diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 533c2f9151..6140babecd 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -10,6 +10,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](acorn/acorn.d.ts) [Acorn](https://github.com/marijnh/acorn) by [RReverser](https://github.com/RReverser)
 * [:link:](rails-actioncable/rails-actioncable.d.ts) [ActionCable](https://github.com/rails/rails/tree/master/actioncable) by [Vincent Zhu](https://github.com/zhu1230)
 * [:link:](cordova-plugin-ms-adal/cordova-plugin-ms-adal.d.ts) [Active Directory Authentication Library plugin for Apache Cordova](https://github.com/AzureAD/azure-activedirectory-library-for-cordova) by [Kai Walter](https://github.com/KaiWalter)
+* [:link:](adal-angular/adal-angular.d.ts) [ADAL.JS](https://github.com/AzureAD/azure-activedirectory-library-for-js) by [mmaitre314](https://github.com/mmaitre314)
+* [:link:](adal-angular/adal.d.ts) [ADAL.JS](https://github.com/AzureAD/azure-activedirectory-library-for-js) by [mmaitre314](https://github.com/mmaitre314)
 * [:link:](add2home/add2home.d.ts) [add2home](http://cubiq.org/add-to-home-screen) by [James Wilkins](http://www.codeplex.com/site/users/view/jamesnw)
 * [:link:](adm-zip/adm-zip.d.ts) [adm-zip](https://github.com/cthackers/adm-zip) by [John Vilk](https://github.com/jvilk), [Abner Oliveira](https://github.com/abner)
 * [:link:](ag-grid/ag-grid.d.ts) [ag-grid](http://www.ag-grid.com) by [Niall Crosby](https://github.com/ceolter)
@@ -38,6 +40,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](angularjs/angular-component-router.d.ts) [Angular JS 1.5 component router](http://angularjs.org) by [David Reher](http://github.com/davidreher)
 * [:link:](angular-meteor/angular-meteor.d.ts) [Angular JS Meteor (angular.meteor module)](https://github.com/Urigo/angular-meteor) by [Peter Grman](https://github.com/pgrm)
 * [:link:](angular-locker/angular-locker.d.ts) [Angular Locker](https://github.com/tymondesigns/angular-locker) by [Niko Kovačič](https://github.com/nkovacic)
+* [:link:](angular-media-queries/match-media.d.ts) [Angular matchMedia (angular.matchMedia module)](https://github.com/jacopotarantino/angular-match-media) by [Joao Monteiro](https://github.com/jpmnteiro)
 * [:link:](angular-material/angular-material.d.ts) [Angular Material (angular.material module)](https://github.com/angular/material) by [Matt Traynham](https://github.com/mtraynham)
 * [:link:](angular-protractor/angular-protractor.d.ts) [Angular Protractor](https://github.com/angular/protractor) by [Bill Armstrong](https://github.com/BillArmstrong)
 * [:link:](angular-scenario/angular-scenario.d.ts) [Angular Scenario Testing (ngScenario module)](http://angularjs.org) by [RomanoLindano](https://github.com/RomanoLindano)
@@ -55,8 +58,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](angular-environment/angular-environment.d.ts) [angular-environment](https://github.com/juanpablob/angular-environment) by [Matt Wheatley](https://github.com/terrawheat)
 * [:link:](angular-formly/angular-formly.d.ts) [angular-formly](https://github.com/formly-js/angular-formly) by [Scott Hatcher](https://github.com/scatcher)
 * [:link:](angular-gettext/angular-gettext.d.ts) [angular-gettext](https://angular-gettext.rocketeer.be) by [Ákos Lukács](https://github.com/AkosLukacs)
-* [:link:](angular-google-analytics/angular-google-analytics-service.d.ts) [angular-google-analytics](https://github.com/revolunet/angular-google-analytics) by [Matt Wheatley](https://github.com/terrawheat)
 * [:link:](angular-google-analytics/angular-google-analytics.d.ts) [angular-google-analytics](https://github.com/revolunet/angular-google-analytics) by [Cyril Schumacher](https://github.com/cyrilschumacher)
+* [:link:](angular-google-analytics/angular-google-analytics-service.d.ts) [angular-google-analytics](https://github.com/revolunet/angular-google-analytics) by [Matt Wheatley](https://github.com/terrawheat)
 * [:link:](angular-hotkeys/angular-hotkeys.d.ts) [angular-hotkeys](https://github.com/chieffancypants/angular-hotkeys) by [Jason Zhao](https://github.com/jlz27), [Stefan Steinhart](https://github.com/reppners)
 * [:link:](angular-http-auth/angular-http-auth.d.ts) [angular-http-auth](https://github.com/witoldsz/angular-http-auth) by [vvakame](https://github.com/vvakame)
 * [:link:](angular-httpi/angular-httpi.d.ts) [angular-httpi](https://github.com/bennadel/httpi) by [Andrew Camilleri](https://github.com/Kukks)
@@ -68,6 +71,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](angular-modal/angular-modal.d.ts) [angular-modal](https://github.com/btford/angular-modal) by [Paul Lessing](https://github.com/paullessing)
 * [:link:](angular-notifications/angular-notifications.d.ts) [angular-notifications](https://github.com/DerekRies/angular-notifications) by [Tomasz Ducin](https://github.com/ducin/DefinitelyTyped)
 * [:link:](angular-notify/angular-notify.d.ts) [angular-notify](https://github.com/cgross/angular-notify) by [Suwato](https://github.com/Suwato/DefinitelyTyped)
+* [:link:](angular-permission/angular-permission.d.ts) [angular-permission](https://github.com/Narzerus/angular-permission) by [Voislav Mishevski](https://github.com/vmishevski)
 * [:link:](angular-scroll/angular-scroll.d.ts) [angular-scroll](https://github.com/oblador/angular-scroll) by [Sam Herrmann](https://github.com/samherrmann)
 * [:link:](angular-signalr-hub/angular-signalr-hub.d.ts) [angular-signalr-hub](https://github.com/JustMaier/angular-signalr-hub) by [Adam Santaniello](https://github.com/AdamSantaniello)
 * [:link:](angular-spinner/angular-spinner.d.ts) [angular-spinner.js](https://github.com/urish/angular-spinner) by [Marcin Biegała](https://github.com/Biegal)
@@ -86,11 +90,12 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](animation-frame/animation-frame.d.ts) [animation-frame](https://github.com/kof/animation-frame) by [Qinfeng Chen](https://github.com/qinfchen)
 * [:link:](ansi-styles/ansi-styles.d.ts) [ansi-styles](https://github.com/sindresorhus/ansi-styles) by [bryn austin bellomy](https://github.com/brynbellomy)
 * [:link:](ansicolors/ansicolors.d.ts) [ansicolors](https://github.com/thlorenz/ansicolors) by [rogierschouten](https://github.com/rogierschouten)
-* [:link:](antd/antd.d.ts) [Antd](http://ant.design) by [bang88](https://github.com/bang88)
+* [:link:](antd/antd.d.ts) [Antd](http://ant.design) by [bang88](https://github.com/bang88), [Bruce Mitchener](https://github.com/waywardmonkeys)
 * [:link:](any-db/any-db.d.ts) [any-db](https://github.com/grncdr/node-any-db) by [Rogier Schouten](https://github.com/rogierschouten)
 * [:link:](any-db-transaction/any-db-transaction.d.ts) [any-db-transaction](https://github.com/grncdr/node-any-db-transaction) by [Rogier Schouten](https://github.com/rogierschouten)
 * [:link:](anydb-sql/anydb-sql.d.ts) [anydb-sql](https://github.com/doxout/anydb-sql) by [Gorgi Kosev](https://github.com/spion)
 * [:link:](anydb-sql-migrations/anydb-sql-migrations.d.ts) [anydb-sql-migrations](https://github.com/spion/anydb-sql-migrations) by [Gorgi Kosev](https://github.com/spion)
+* [:link:](cordova-plugin-background-mode/cordova-plugin-background-mode.d.ts) [Apache Background Mode plugin](https://github.com/katzer/cordova-plugin-background-mode) by [Paul Thiel](https://github.com/Lordnoname)
 * [:link:](cordova/cordova.d.ts) [Apache Cordova](http://cordova.apache.org) by [Microsoft Open Technologies Inc.](http://msopentech.com)
 * [:link:](cordova-plugin-email-composer/cordova-plugin-email-composer.d.ts) [Apache Cordova Email Composer plugin](https://github.com/katzer/cordova-plugin-email-composer) by [Dave Taylor](http://davetayls.me)
 * [:link:](api-error-handler/api-error-handler.d.ts) [api-error-handler](https://github.com/expressjs/api-error-handler) by [Tanguy Krotoff](https://github.com/tkrotoff)
@@ -244,19 +249,20 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](circular-json/circular-json.d.ts) [circular-json](https://github.com/WebReflection/circular-json) by [Jonathan Pevarnek](https://github.com/jpevarnek)
 * [:link:](ckeditor/ckeditor.d.ts) [CKEditor](http://ckeditor.com) by [Ondrej Sevcik](https://github.com/ondrejsevcik)
 * [:link:](classnames/classnames.d.ts) [classnames](https://github.com/JedWatson/classnames) by [Dave Keen](http://www.keendevelopment.ch), [Adi Dahiya](https://github.com/adidahiya), [Jason Killian](https://github.com/JKillian)
+* [:link:](cldr.js/cldr.js-event.d.ts) [Cldr.js](https://github.com/rxaviers/cldrjs) by [Raman But-Husaim](https://github.com/RamanBut-Husaim)
 * [:link:](cldr.js/cldr.js-supplemental.d.ts) [Cldr.js](https://github.com/rxaviers/cldrjs) by [Raman But-Husaim](https://github.com/RamanBut-Husaim)
 * [:link:](cldr.js/cldr.js.d.ts) [Cldr.js](https://github.com/rxaviers/cldrjs) by [Raman But-Husaim](https://github.com/RamanBut-Husaim), [Grégoire Castre](https://github.com/gcastre)
-* [:link:](cldr.js/cldr.js-event.d.ts) [Cldr.js](https://github.com/rxaviers/cldrjs) by [Raman But-Husaim](https://github.com/RamanBut-Husaim)
 * [:link:](clean-css/clean-css.d.ts) [clean-css](https://github.com/jakubpawlowicz/clean-css) by [Tanguy Krotoff](https://github.com/tkrotoff)
+* [:link:](cli/cli.d.ts) [cli](https://www.npmjs.com/package/cli) by [Klaus Reimer](https://github.com/kayahr)
 * [:link:](cli-color/cli-color.d.ts) [cli-color](https://github.com/medikoo/cli-color) by [Joel Spadin](https://github.com/ChaosinaCan)
 * [:link:](clipboard/clipboard.d.ts) [clipboard.js](https://github.com/zenorocha/clipboard.js) by [Andrei Kurosh](https://github.com/impworks)
 * [:link:](clone/clone.d.ts) [clone](https://github.com/pvorb/node-clone) by [Kieran Simpson](https://github.com/kierans/DefinitelyTyped)
 * [:link:](closure-compiler/closure-compiler.d.ts) [closure-compiler](https://github.com/tim-smart/node-closure) by [Martin Probst](https://github.com/mprobst)
+* [:link:](codemirror/codemirror-showhint.d.ts) [CodeMirror](https://github.com/marijnh/CodeMirror) by [jacqt](https://github.com/jacqt), [basarat](https://github.com/basarat)
+* [:link:](codemirror/codemirror-matchbrackets.d.ts) [CodeMirror](https://github.com/marijnh/CodeMirror) by [Sixin Li](https://github.com/sixinli)
 * [:link:](codemirror/codemirror-runmode.d.ts) [CodeMirror](https://github.com/marijnh/CodeMirror) by [Joseph Vaughan](https://github.com/Joev-)
 * [:link:](codemirror/searchcursor.d.ts) [CodeMirror](https://github.com/marijnh/CodeMirror) by [jacqt](https://github.com/jacqt)
 * [:link:](codemirror/codemirror.d.ts) [CodeMirror](https://github.com/marijnh/CodeMirror) by [mihailik](https://github.com/mihailik)
-* [:link:](codemirror/codemirror-showhint.d.ts) [CodeMirror](https://github.com/marijnh/CodeMirror) by [jacqt](https://github.com/jacqt), [basarat](https://github.com/basarat)
-* [:link:](codemirror/codemirror-matchbrackets.d.ts) [CodeMirror](https://github.com/marijnh/CodeMirror) by [Sixin Li](https://github.com/sixinli)
 * [:link:](coffeeify/coffeeify.d.ts) [coffeeify](https://github.com/jnordberg/coffeeify) by [Qubo](https://github.com/tkQubo)
 * [:link:](colorbrewer/colorbrewer.d.ts) [colorbrewer](https://github.com/jeanlauliac/colorbrewer) by [Matt Traynham](https://github.com/mtraynham)
 * [:link:](colors/colors.d.ts) [Colors.js 0.6.0-1](https://github.com/Marak/colors.js) by [Bart van der Schoor](https://github.com/Bartvds)
@@ -308,6 +314,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](createjs/createjs.d.ts) [CreateJS](http://www.createjs.com) by [Pedro Ferreira](https://bitbucket.org/drk4), [Chris Smith](https://github.com/evilangelist), [Satoru Kimura](https://github.com/gyohk)
 * [:link:](credential/credential.d.ts) [credential](https://github.com/ericelliott/credential) by [Phú](https://github.com/phuvo)
 * [:link:](cron/cron.d.ts) [cron](https://www.npmjs.com/package/cron) by [Hiroki Horiuchi](https://github.com/horiuchi)
+* [:link:](cropperjs/cropperjs.d.ts) [cropperjs](https://github.com/fengyuanchen/cropperjs) by [Stepan Mikhaylyuk](https://github.com/stepancar)
 * [:link:](cross-storage/cross-storage.d.ts) [cross-storage](https://github.com/zendesk/cross-storage) by [Daniel Chao](http://dchao.co)
 * [:link:](crossfilter/crossfilter.d.ts) [CrossFilter](https://github.com/square/crossfilter) by [Schmulik Raskin](https://github.com/schmuli)
 * [:link:](crossroads/crossroads.d.ts) [Crossroads.js](http://millermedeiros.github.io/crossroads.js) by [Diullei Gomes](https://github.com/diullei)
@@ -369,13 +376,14 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](dot-case/dot-case.d.ts) [dot-case](https://github.com/blakeembrey/dot-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
 * [:link:](dot-prop/dot-prop.d.ts) [dot-prop](https://github.com/sindresorhus/dot-prop) by [Sam Verschueren](https://github.com/samverschueren)
 * [:link:](dotdotdot/dotdotdot.d.ts) [dotdotdot](http://dotdotdot.frebsite.nl) by [Milan Jaros](https://github.com/milanjaros)
+* [:link:](dotenv/dotenv.d.ts) [dotenv](https://github.com/motdotla/dotenv) by [Jussi Kinnula](https://github.com/jussikinnula)
 * [:link:](doublearray/doublearray.d.ts) [doublearray](https://github.com/takuyaa/doublearray) by [MIZUSHIMA Junki](https://github.com/mzsm)
 * [:link:](draft-js/draft-js.d.ts) [draft-js](https://github.com/facebook/draft-js) by [Pavel Evsegneev](https://github.com/Ahineya)
-* [:link:](hystrixjs/hystrixjs.d.ts) [dragula](https://bitbucket.org/igor_sechyn/hystrixjs) by [Igor Sechyn](https://github.com/igorsechyn)
 * [:link:](dragula/dragula.d.ts) [dragula](http://bevacqua.github.io/dragula) by [Paul Welter](https://github.com/pwelter34)
+* [:link:](hystrixjs/hystrixjs.d.ts) [dragula](https://bitbucket.org/igor_sechyn/hystrixjs) by [Igor Sechyn](https://github.com/igorsechyn)
 * [:link:](drop/drop.d.ts) [Drop](http://github.hubspot.com/drop) by [Adi Dahiya](https://github.com/adidahiya)
 * [:link:](dropboxjs/dropboxjs.d.ts) [dropbox-js](https://github.com/dropbox/dropbox-js) by [Steve Fenton](https://github.com/Steve-Fenton), [Pedro Casaubon](https://github.com/xperiments)
-* [:link:](dropzone/dropzone.d.ts) [Dropzone](http://www.dropzonejs.com) by [Natan Vivo](https://github.com/nvivo), [Andy Hawkins](https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com), [Vasya Aksyonov](https://github.com/outring)
+* [:link:](dropzone/dropzone.d.ts) [Dropzone](http://www.dropzonejs.com) by [Natan Vivo](https://github.com/nvivo), [Andy Hawkins](https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com), [Vasya Aksyonov](https://github.com/outring), [Simon Huber](https://github.com/renuo)
 * [:link:](dsv/dsv.d.ts) [dsv](https://www.npmjs.com/package/dsv) by [Jason Swearingen](https://jasonswearingen.github.io)
 * [:link:](dts-bundle/dts-bundle.d.ts) [dts-bundle](https://github.com/TypeStrong/dts-bundle) by [Asana](https://asana.com)
 * [:link:](durandal/durandal.d.ts) [Durandal](http://durandaljs.com) by [Blue Spire](https://github.com/BlueSpire)
@@ -394,8 +402,9 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](ejs-locals/ejs-locals.d.ts) [ejs-locals](https://github.com/randometc/ejs-locals) by [jt000](https://github.com/jt000)
 * [:link:](ejs/ejs.d.ts) [ejs.js](http://ejs.co) by [Ben Liddicott](https://github.com/benliddicott/DefinitelyTyped)
 * [:link:](jquery.elang/jquery.elang.d.ts) [eLang](https://github.com/sumegizoltan/ELang) by [Zoltan Sumegi](https://github.com/sumegizoltan)
-* [:link:](github-electron/github-electron.d.ts) [Electron](http://electron.atom.io) by [jedmao](https://github.com/jedmao), [rhysd](https://rhysd.github.io)
+* [:link:](github-electron/github-electron.d.ts) [Electron](http://electron.atom.io) by [jedmao](https://github.com/jedmao), [rhysd](https://rhysd.github.io), [Milan Burda](https://github.com/miniak)
 * [:link:](electron-builder/electron-builder.d.ts) [electron-builder](https://github.com/loopline-systems/electron-builder) by [Maxime LUCE](https://github.com/SomaticIT)
+* [:link:](electron-json-storage/electron-json-storage.d.ts) [electron-json-storage](https://github.com/jviotti/electron-json-storage) by [Sam Saint-Pettersen](https://github.com/stpettersens)
 * [:link:](electron-packager/electron-packager.d.ts) [electron-packager](https://github.com/maxogden/electron-packager) by [Maxime LUCE](https://github.com/SomaticIT)
 * [:link:](github-electron/electron-prebuilt.d.ts) [electron-prebuilt](https://github.com/mafintosh/electron-prebuilt) by [rhysd](https://github.com/rhysd)
 * [:link:](electron-window-state/electron-window-state.d.ts) [electron-window-state](https://github.com/mawie81/electron-window-state) by [rhysd](https://github.com/rhysd)
@@ -407,19 +416,23 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](emissary/emissary.d.ts) [emissary](https://github.com/atom/emissary) by [vvakame](https://github.com/vvakame)
 * [:link:](empower/empower.d.ts) [empower](https://github.com/twada/empower) by [vvakame](https://github.com/vvakame)
 * [:link:](emscripten/emscripten.d.ts) [Emscripten](http://kripken.github.io/emscripten-site/index.html) by [Kensuke Matsuzaki](https://github.com/zakki)
+* [:link:](encoding-japanese/encoding-japanese.d.ts) [encoding-japanese](https://github.com/polygonplanet/encoding.js) by [rhysd](https://rhysd.github.io)
 * [:link:](envify/envify.d.ts) [envify](https://github.com/hughsk/envify) by [Qubo](https://github.com/tkQubo)
 * [:link:](enzyme/enzyme.d.ts) [Enzyme](https://github.com/airbnb/enzyme) by [Marian Palkus](https://github.com/MarianPalkus), [Cap3](http://www.cap3.de)
 * [:link:](epiceditor/epiceditor.d.ts) [EpicEditor](http://epiceditor.com) by [Boris Yankov](https://github.com/borisyankov)
 * [:link:](eq.js/eq.js.d.ts) [eq.js](https://github.com/Snugug/eq.js) by [Stephen Lautier](https://github.com/stephenlautier)
 * [:link:](errorhandler/errorhandler.d.ts) [errorhandler](https://github.com/expressjs/errorhandler) by [Santi Albo](https://github.com/santialbo)
+* [:link:](error-stack-parser/error-stack-parser.d.ts) [ErrorStackParser](https://github.com/stacktracejs/error-stack-parser) by [Eric Wendelin](https://www.eriwen.com)
 * [:link:](es6-collections/es6-collections.d.ts) [es6-collections](https://github.com/WebReflection/es6-collections) by [Ron Buckton](http://github.com/rbuckton)
 * [:link:](es6-promise/es6-promise.d.ts) [es6-promise](https://github.com/jakearchibald/ES6-Promise) by [François de Campredon](https://github.com/fdecampredon), [vvakame](https://github.com/vvakame)
 * [:link:](es6-shim/es6-shim.d.ts) [es6-shim](https://github.com/paulmillr/es6-shim) by [Ron Buckton](http://github.com/rbuckton)
+* [:link:](escape-html/escape-html.d.ts) [escape-html](https://github.com/component/escape-html) by [Elisée MAURER](https://github.com/elisee)
 * [:link:](escape-latex/escape-latex.d.ts) [escape-latex](https://github.com/dangmai/escape-latex) by [Oliver Schneider](https://github.com/olsio)
 * [:link:](escape-string-regexp/escape-string-regexp.d.ts) [escape-string-regexp](https://github.com/sindresorhus/escape-string-regexp) by [kruncher](https://github.com/kruncher)
 * [:link:](esprima/esprima.d.ts) [Esprima](http://esprima.org) by [teppeis](https://github.com/teppeis), [RReverser](https://github.com/RReverser)
 * [:link:](estree/flow.d.ts) [ESTree AST extensions for Facebook Flow](https://github.com/estree/estree) by [RReverser](https://github.com/RReverser)
 * [:link:](estree/estree.d.ts) [ESTree AST specification](https://github.com/estree/estree) by [RReverser](https://github.com/RReverser)
+* [:link:](evaporate/evaporate.d.ts) [EvaporateJS](https://github.com/TTLabs/EvaporateJS) by [Andrew Kuklewicz](https://github.com/kookster), [Chris Rhoden](https://github.com/chrisrhoden)
 * [:link:](event-kit/event-kit.d.ts) [event-kit](https://github.com/atom/event-kit) by [Vadim Macagon](https://github.com/enlight)
 * [:link:](event-loop-lag/event-loop-lag.d.ts) [event-loop-lag](https://github.com/pebble/event-loop-lag) by [Rogier Schouten](https://github.com/rogierschouten)
 * [:link:](event-stream/event-stream.d.ts) [event-stream](https://github.com/dominictarr/event-stream) by [David Gardiner](https://github.com/flcdrg)
@@ -430,8 +443,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](expect/expect.d.ts) [Expect](https://github.com/mjackson/expect) by [Justin Reidy](https://github.com/jmreidy)
 * [:link:](expect.js/expect.js.d.ts) [expect.js](https://github.com/Automattic/expect.js) by [Teppei Sato](https://github.com/teppeis)
 * [:link:](expectations/expectations.d.ts) [expectations.js](https://github.com/spmason/expectations) by [vvakame](https://github.com/vvakame)
-* [:link:](express/express.d.ts) [Express 4.x](http://expressjs.com) by [Boris Yankov](https://github.com/borisyankov)
 * [:link:](express-serve-static-core/express-serve-static-core.d.ts) [Express 4.x](http://expressjs.com) by [Boris Yankov](https://github.com/borisyankov)
+* [:link:](express/express.d.ts) [Express 4.x](http://expressjs.com) by [Boris Yankov](https://github.com/borisyankov)
 * [:link:](express-brute/express-brute.d.ts) [express-brute](https://github.com/AdamPflug/express-brute) by [Cyril Schumacher](https://github.com/cyrilschumacher)
 * [:link:](express-brute-memcached/express-brute-memcached.d.ts) [express-brute-memcached](https://github.com/AdamPflug/express-brute-memcached) by [Cyril Schumacher](https://github.com/cyrilschumacher)
 * [:link:](express-brute-mongo/express-brute-mongo.d.ts) [express-brute-mongo](https://github.com/auth0/express-brute-mongo) by [Cyril Schumacher](https://github.com/cyrilschumacher)
@@ -447,6 +460,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](express-route-fs/express-route-fs.d.ts) [express-route-fs](https://github.com/kripod/express-route-fs) by [Kristóf Poduszló](https://github.com/kripod)
 * [:link:](express-session/express-session.d.ts) [express-session](https://www.npmjs.org/package/express-session) by [Hiroki Horiuchi](https://github.com/horiuchi)
 * [:link:](express-unless/express-unless.d.ts) [express-unless](https://www.npmjs.org/package/express-unless) by [Wonshik Kim](https://github.com/wokim)
+* [:link:](express-useragent/express-useragent.d.ts) [express-useragent](https://www.npmjs.org/package/express-useragent) by [Isman Usoh](https://github.com/isman-usoh)
 * [:link:](express-validator/express-validator.d.ts) [express-validator](https://github.com/ctavan/express-validator) by [Nathan Ridley](https://github.com/axefrog), [Jonathan Häberle](http://dreampulse.de)
 * [:link:](extend/extend.d.ts) [extend](https://www.npmjs.com/package/extend) by [Stefan Steinhart](https://github.com/reppners)
 * [:link:](wiiu/wiiu.d.ts) [Extended Functionality of Wii U Internet Browser](https://www.nintendo.co.jp/wiiu/hardware/internetbrowser/extended_functionality.html) by [MIZUSHIMA Junki](https://github.com/mzsm)
@@ -457,6 +471,12 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](fbsdk/fbsdk.d.ts) [Facebook Javascript SDK](https://developers.facebook.com/docs/javascript) by [Joshua Strobl](https://github.com/JoshStrobl)
 * [:link:](fbemitter/fbemitter.d.ts) [Facebook's EventEmitter](https://github.com/facebook/emitter) by [kmxz](https://github.com/kmxz)
 * [:link:](faker/faker.d.ts) [faker](http://marak.com/faker.js) by [Bas Pennings](https://github.com/basp), [Yuki Kokubun](https://github.com/Kuniwak)
+* [:link:](falcor/falcor-browser.d.ts) [falcor](http://netflix.github.io/falcor) by [Quramy](https://github.com/Quramy)
+* [:link:](falcor/falcor.d.ts) [falcor](http://netflix.github.io/falcor) by [Quramy](https://github.com/Quramy)
+* [:link:](falcor-express/falcor-express.d.ts) [falcor-express](https://github.com/Netflix/falcor-express) by [Quramy](https://github.com/Quramy)
+* [:link:](falcor-http-datasource/falcor-http-datasource.d.ts) [falcor-http-datasource](https://github.com/Netflix/falcor-http-datasource) by [Quramy](https://github.com/Quramy)
+* [:link:](falcor-json-graph/falcor-json-graph.d.ts) [falcor-json-graph](https://github.com/Netflix/falcor-json-graph) by [Quramy](https://github.com/Quramy)
+* [:link:](falcor-router/falcor-router.d.ts) [falcor-router](https://github.com/Netflix/falcor-router) by [Quramy](https://github.com/Quramy)
 * [:link:](famous/famous.d.ts) [Famous Engine](http://famous.org) by [Boris Vasilenko](https://github.com/borisvasilenko)
 * [:link:](fancybox/fancybox.d.ts) [fancyBox](https://github.com/fancyapps/fancyBox) by [Boris Yankov](https://github.com/borisyankov)
 * [:link:](farbtastic/farbtastic.d.ts) [Farbtastic: jQuery Color Wheel](http://mattfarina.github.io/farbtastic) by [Matt Brooks](https://github.com/EnableSoftware)
@@ -472,6 +492,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](filesystem/filesystem.d.ts) [File System API](http://www.w3.org/TR/file-system-api) by [Kon](http://phyzkit.net)
 * [:link:](file-url/file-url.d.ts) [file-url](https://github.com/sindresorhus/file-url) by [MEDIA CHECK s.r.o.](http://www.mediacheck.cz)
 * [:link:](FileSaver/FileSaver.d.ts) [FileSaver.js](https://github.com/eligrey/FileSaver.js) by [Cyril Schumacher](https://github.com/cyrilschumacher)
+* [:link:](filesize/filesize.d.ts) [filesize](https://github.com/avoidwork/filesize.js) by [Giedrius Grabauskas](https://github.com/GiedriusGrabauskas)
 * [:link:](finalhandler/finalhandler.d.ts) [finalhandler](https://github.com/pillarjs/finalhandler) by [Ilya Mochalov](https://github.com/chrootsu)
 * [:link:](Finch/Finch.d.ts) [Finch](https://github.com/stoodder/finchjs) by [David Sichau](https://github.com/DavidSichau)
 * [:link:](findup-sync/findup-sync.d.ts) [findup-sync](https://github.com/cowboy/node-findup-sync) by [Bart van der Schoor](https://github.com/Bartvds), [Nathan Brown](https://github.com/ngbrown)
@@ -507,8 +528,9 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](foundation-sites/foundation-sites.d.ts) [Foundation Sites](http://foundation.zurb.com) by [Sam Vloeberghs](https://github.com/samvloeberghs)
 * [:link:](fpsmeter/FPSMeter.d.ts) [FPSmeter](http://darsa.in/fpsmeter) by [Aaron Lampros](http://github.com/alampros)
 * [:link:](freedom/freedom-core-env.d.ts) [freedom](https://github.com/freedomjs/freedom) by [Jonathan Pevarnek](https://github.com/jpevarnek)
-* [:link:](freedom/freedom-module-env.d.ts) [freedom](https://github.com/freedomjs/freedom) by [Jonathan Pevarnek](https://github.com/jpevarnek)
 * [:link:](freedom/freedom.d.ts) [freedom](https://github.com/freedomjs/freedom) by [Jonathan Pevarnek](https://github.com/jpevarnek)
+* [:link:](freedom/freedom-module-env.d.ts) [freedom](https://github.com/freedomjs/freedom) by [Jonathan Pevarnek](https://github.com/jpevarnek)
+* [:link:](freeport/freeport.d.ts) [freeport](https://github.com/daaku/nodejs-freeport) by [Arne Schubert](https://github.com/atd-schubert)
 * [:link:](from/from.d.ts) [from](https://github.com/dominictarr/from) by [Bart van der Schoor](https://github.com/Bartvds)
 * [:link:](fromjs/fromjs.d.ts) [fromjs](https://github.com/suckgamony/fromjs) by [Glenn Dierckx](https://github.com/glenndierckx)
 * [:link:](fromnow/fromnow.d.ts) [fromnow](https://github.com/lukeed/fromNow) by [Martin Bukovics](https://github.com/marinewater)
@@ -544,33 +566,33 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](goJS/goJS.d.ts) [GoJS](http://gojs.net) by [Northwoods Software](https://github.com/NorthwoodsSoftware)
 * [:link:](google.analytics/ga.d.ts) [Google Analytics (Classic and Universal)](https://developers.google.com/analytics/devguides/collection/gajs) by [Ronnie Haakon Hegelund](http://ronniehegelund.blogspot.dk), [Pat Kujawa](http://patkujawa.com)
 * [:link:](gapi/gapi.d.ts) [Google API Client](https://code.google.com/p/google-api-javascript-client) by [Frank M](https://github.com/sgtfrankieboy)
-* [:link:](google-apps-script/google-apps-script.document.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
 * [:link:](google-apps-script/google-apps-script.content.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
+* [:link:](google-apps-script/google-apps-script.maps.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
+* [:link:](google-apps-script/google-apps-script.mail.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
+* [:link:](google-apps-script/google-apps-script.lock.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
+* [:link:](google-apps-script/google-apps-script.language.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
 * [:link:](google-apps-script/google-apps-script.contacts.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
 * [:link:](google-apps-script/google-apps-script.charts.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.optimization.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.maps.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
+* [:link:](google-apps-script/google-apps-script.calendar.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
+* [:link:](google-apps-script/google-apps-script.cache.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
+* [:link:](google-apps-script/google-apps-script.base.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
+* [:link:](google-apps-script/google-apps-script.script.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
+* [:link:](google-apps-script/google-apps-script.jdbc.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
+* [:link:](google-apps-script/google-apps-script.gmail.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
+* [:link:](google-apps-script/google-apps-script.forms.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
+* [:link:](google-apps-script/google-apps-script.html.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
+* [:link:](google-apps-script/google-apps-script.xml-service.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
 * [:link:](google-apps-script/google-apps-script.utilities.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
 * [:link:](google-apps-script/google-apps-script.url-fetch.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.script.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
 * [:link:](google-apps-script/google-apps-script.ui.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.jdbc.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.drive.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.spreadsheet.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.mail.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.html.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.groups.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.gmail.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
 * [:link:](google-apps-script/google-apps-script.types.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.properties.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.language.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.forms.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
+* [:link:](google-apps-script/google-apps-script.spreadsheet.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
 * [:link:](google-apps-script/google-apps-script.sites.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.xml-service.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.base.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.cache.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.calendar.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
-* [:link:](google-apps-script/google-apps-script.lock.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
+* [:link:](google-apps-script/google-apps-script.properties.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
+* [:link:](google-apps-script/google-apps-script.document.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
+* [:link:](google-apps-script/google-apps-script.optimization.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
+* [:link:](google-apps-script/google-apps-script.groups.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
+* [:link:](google-apps-script/google-apps-script.drive.d.ts) [Google Apps Script 2015-11-12](https://developers.google.com/apps-script) by [motemen](https://github.com/motemen)
 * [:link:](google.feeds/google.feed.api.d.ts) [Google Feed Apis](https://developers.google.com/feed) by [RodneyJT](https://github.com/RodneyJT)
 * [:link:](google.geolocation/google.geolocation.d.ts) [Google Geolocation](https://code.google.com/p/geo-location-javascript) by [Vincent Bortone](https://github.com/vbortone)
 * [:link:](googlemaps/google.maps.d.ts) [Google Maps JavaScript API](https://developers.google.com/maps) by [Folia A/S](http://www.folia.dk), [Chris Wrench](https://github.com/cgwrench)
@@ -583,6 +605,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](gapi.translate/gapi.translate.d.ts) [Google Translate API](https://developers.google.com/translate) by [Frank M](https://github.com/sgtfrankieboy)
 * [:link:](gapi.urlshortener/gapi.urlshortener.d.ts) [Google Url Shortener API](https://developers.google.com/url-shortener) by [Frank M](https://github.com/sgtfrankieboy)
 * [:link:](google.visualization/google.visualization.d.ts) [Google Visualisation Apis](https://developers.google.com/chart) by [Dan Ludwig](https://github.com/danludwig)
+* [:link:](google-closure-compiler/google-closure-compiler.d.ts) [google-closure-compiler](https://github.com/chadkillingsworth/closure-compiler-npm) by [Evan Martin](http://neugierig.org)
 * [:link:](google-maps/google-maps.d.ts) [google-maps](https://www.npmjs.com/package/google-maps) by [Deividas Bakanas](https://github.com/DeividasBakanas), [Giedrius Grabauskas](https://github.com/GiedriusGrabauskas)
 * [:link:](gae.channel.api/gae.channel.api.d.ts) [GoogleAppEngine's Channel API](https://developers.google.com/appengine/docs/java/channel/javascript) by [vvakame](https://github.com/vvakame)
 * [:link:](graceful-fs/graceful-fs.d.ts) [graceful-fs](https://github.com/cowboy/graceful-fs) by [Bart van der Schoor](https://github.com/Bartvds)
@@ -590,13 +613,14 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](graphene-pk11/graphene-pk11.d.ts) [graphene-pk11](https://github.com/PeculiarVentures/graphene) by [Stepan Miroshin](https://github.com/microshine)
 * [:link:](graphviz/graphviz.d.ts) [Graphviz](https://github.com/glejeune/node-graphviz) by [Matt Frantz](https://github.com/mhfrantz)
 * [:link:](gravatar/gravatar.d.ts) [gravatar](https://github.com/emerleite/node-gravatar) by [Denis Sokolov](https://github.com/denis-sokolov)
+* [:link:](qrcode-generator/qrcode-generator.d.ts) [grcode-generator](https://github.com/kazuhikoarase/qrcode-generator) by [Stefan Huber](https://github.com/stefanhuber)
 * [:link:](greasemonkey/greasemonkey.d.ts) [Greasemonkey](http://www.greasespot.net) by [Kota Saito](https://github.com/kotas)
 * [:link:](greensock/greensock.d.ts) [GreenSock Animation Platform](http://www.greensock.com/get-started-js) by [Robert S](https://github.com/codebelt)
 * [:link:](gridfs-stream/gridfs-stream.d.ts) [gridfs-stream](https://github.com/aheckmann/gridfs-stream) by [Lior Mualem](https://github.com/liorm)
 * [:link:](gridstack/gridstack.d.ts) [Gridstack](http://troolee.github.io/gridstack.js) by [Pascal Senn](https://github.com/PascalSenn)
 * [:link:](gruntjs/gruntjs.d.ts) [Grunt 0.4.x](http://gruntjs.com) by [Jeff May](https://github.com/jeffmay), [Basarat Ali Syed](https://github.com/basarat)
-* [:link:](gsap/Core.d.ts) [GSAP](http://greensock.com) by [VILIC VANE](https://vilic.github.io)
 * [:link:](gsap/Ease.d.ts) [GSAP](http://greensock.com) by [VILIC VANE](https://vilic.github.io)
+* [:link:](gsap/Core.d.ts) [GSAP](http://greensock.com) by [VILIC VANE](https://vilic.github.io)
 * [:link:](gsap/TweenLite.d.ts) [GSAP](http://greensock.com) by [VILIC VANE](https://vilic.github.io)
 * [:link:](gulp/gulp.d.ts) [Gulp v3.8.x](http://gulpjs.com) by [Drew Noakes](https://drewnoakes.com)
 * [:link:](gulp-autoprefixer/gulp-autoprefixer.d.ts) [gulp-autoprefixer](https://github.com/sindresorhus/gulp-autoprefixer) by [Asana](https://asana.com)
@@ -660,6 +684,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](gulp-watch/gulp-watch.d.ts) [gulp-watch](https://github.com/floatdrop/gulp-watch) by [Tanguy Krotoff](https://github.com/tkrotoff)
 * [:link:](hammerjs/hammerjs.d.ts) [Hammer.js](http://hammerjs.github.io) by [Philip Bulley](https://github.com/milkisevil), [Han Lin Yap](https://github.com/codler)
 * [:link:](handlebars/handlebars.d.ts) [Handlebars](http://handlebarsjs.com) by [Boris Yankov](https://github.com/borisyankov)
+* [:link:](handsontable/handsontable.d.ts) [Handsontable](https://handsontable.com) by [Handsoncode sp. z o.o.](http://handsoncode.net)
 * [:link:](hapi/hapi.d.ts) [hapi](http://github.com/spumko/hapi) by [Jason Swearingen](http://github.com/jasonswearingen)
 * [:link:](harmony-proxy/harmony-proxy.d.ts) [harmony-proxy](https://www.npmjs.com/package/harmony-proxy) by [Remo Jansen](https://github.com/remojansen)
 * [:link:](hasher/hasher.d.ts) [Hasher.js](https://github.com/millermedeiros/hasher) by [flyfishMT](https://github.com/flyfishMT)
@@ -681,6 +706,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](hopscotch/hopscotch.d.ts) [Hopscotch](http://linkedin.github.io/hopscotch) by [Tim Perry](https://github.com/pimterry)
 * [:link:](howlerjs/howler.d.ts) [howler.js](https://github.com/goldfire/howler.js) by [Pedro Casaubon](https://github.com/xperiments)
 * [:link:](touch-events/touch-events.d.ts) [HTML Touch Events](http://www.w3.org/TR/touch-events) by [Kevin Barabash](https://github.com/kevinb7)
+* [:link:](html-entities/html-entities.d.ts) [html-entities](https://www.npmjs.com/package/html-entities) by [Xavier Stouder](https://github.com/xstoudi)
 * [:link:](html-to-text/html-to-text.d.ts) [html-to-text](https://github.com/werk85/node-html-to-text) by [Eryk Warren](https://github.com/erykwarren)
 * [:link:](html2canvas/html2canvas.d.ts) [html2canvas.js](https://github.com/niklasvh/html2canvas) by [Richard Hepburn](https://github.com/rwhepburn)
 * [:link:](html-minifier/html-minifier.d.ts) [HTMLMinifier](https://github.com/kangax/html-minifier) by [Tanguy Krotoff](https://github.com/tkrotoff)
@@ -693,8 +719,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](humane/humane.d.ts) [Humane](http://wavded.github.com/humane-js) by [jmvrbanac](https://github.com/jmvrbanac)
 * [:link:](hypertext-application-language/hypertext-application-language.d.ts) [Hypertext Application Language Draft 6](https://tools.ietf.org/html/draft-kelly-json-hal-06) by [Maks3w](https://github.com/maks3w)
 * [:link:](i18n-node/i18n-node.d.ts) [i18n-node](https://github.com/mashpie/i18n-node) by [Maxime LUCE](https://github.com/SomaticIT)
+* [:link:](i18next/i18next.d.ts) [i18next](http://i18next.com) by [Michael Ledin](https://github.com/mxl)
 * [:link:](ng-i18next/ng-i18next.d.ts) [i18next](https://github.com/i18next/ng-i18next) by [Cyril Schumacher](https://github.com/cyrilschumacher)
-* [:link:](i18next/i18next.d.ts) [i18next](http://i18next.com) by [Maarten Docter](https://github.com/mdocter)
 * [:link:](i18next-browser-languagedetector/i18next-browser-languagedetector.d.ts) [i18next-browser-languagedetector](http://i18next.com) by [Cyril Schumacher](https://github.com/cyrilschumacher)
 * [:link:](i18next-express-middleware/i18next-express-middleware.d.ts) [i18next-express-middleware](http://i18next.com) by [Cyril Schumacher](https://github.com/cyrilschumacher)
 * [:link:](i18next-node-fs-backend/i18next-node-fs-backend.d.ts) [i18next-node-fs-backend](https://github.com/i18next/i18next-node-fs-backend) by [Cyril Schumacher](https://github.com/cyrilschumacher)
@@ -703,14 +729,16 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](ibm-mobilefirst/ibm-mobilefirst.d.ts) [IBM MobileFirst Platform Foundation](http://www.ibm.com/software/products/en/mobilefirstfoundation) by [Guillermo Ignacio Enriquez Gutierrez](https://github.com/nacho4d)
 * [:link:](icepick/icepick.d.ts) [icepick](https://github.com/aearly/icepick) by [Nathan Brown](https://github.com/ngbrown)
 * [:link:](icheck/icheck.d.ts) [iCheck](http://damirfoy.com/iCheck) by [Dániel Tar](https://github.com/qcz)
+* [:link:](iconv/iconv.d.ts) [iconv](https://github.com/bnoordhuis/node-iconv) by [delphinus](https://github.com/delphinus35)
 * [:link:](image-size/image-size.d.ts) [image-size](https://github.com/image-size/image-size) by [Elisée MAURER](https://github.com/elisee)
 * [:link:](imagemagick/imagemagick.d.ts) [imagemagick](http://github.com/rsms/node-imagemagick) by [Carlos Ballesteros Velasco](https://github.com/soywiz)
 * [:link:](imagemagick-native/imagemagick-native.d.ts) [imagemagick-native](https://www.npmjs.org/package/imagemagick-native) by [Hiroki Horiuchi](https://github.com/horiuchi)
 * [:link:](imagesloaded/imagesloaded.d.ts) [imagesLoaded](https://github.com/desandro/imagesloaded) by [Chris Charabaruk](http://github.com/coldacid)
 * [:link:](imap/imap.d.ts) [imap](https://www.npmjs.com/package/imap) by [Peter Snider](https://github.com/psnider)
 * [:link:](imgur-rest-api/imgur-rest-api.d.ts) [Imgur REST API v3](https://api.imgur.com) by [Luke William Westby](http://github.com/lukewestby)
+* [:link:](immutability-helper/immutability-helper.d.ts) [immutability-helper](https://github.com/kolodny/immutability-helper) by [Sean Kelley](https://github.com/seansfkelley)
 * [:link:](impress/impress.d.ts) [Impress.js](https://github.com/bartaz/impress.js) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](incremental-dom/incremental-dom.d.ts) [Incremetal DOM](https://github.com/google/incremental-dom) by [Basarat Ali Syed](https://github.com/basarat)
+* [:link:](incremental-dom/incremental-dom.d.ts) [Incremetal DOM](https://github.com/google/incremental-dom) by [Basarat Ali Syed](https://github.com/basarat), [Markus Lanthaler](https://github.com/lanthaler)
 * [:link:](inflected/inflected.d.ts) [inflected](https://github.com/martinandert/inflected) by [Daniel Schmidt](https://github.com/dsci)
 * [:link:](inflection/inflection.d.ts) [inflection](https://github.com/dreamerslab/node.inflection) by [Shogo Iwano](https://github.com/shiwano)
 * [:link:](inherits/inherits.d.ts) [inherits](https://github.com/isaacs/inherits) by [Ilya Mochalov](https://github.com/chrootsu)
@@ -727,6 +755,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](inversify/inversify.d.ts) [inversify](https://github.com/inversify/InversifyJS) by [inversify](https://github.com/inversify)
 * [:link:](ionic/ionic.d.ts) [Ionic](http://ionicframework.com) by [Spencer Williams](https://github.com/spencerwi)
 * [:link:](cordova-ionic/cordova-ionic.d.ts) [Ionic Cordova plugins](https://github.com/driftyco) by [Hendrik Maus](https://github.com/hendrikmaus)
+* [:link:](ioredis/ioredis.d.ts) [ioredis](https://github.com/luin/ioredis) by [York Yao](https://github.com/plantain-00)
 * [:link:](irc/irc.d.ts) [irc](https://github.com/martynsmith/node-irc) by [phillips1012](https://github.com/phillips1012)
 * [:link:](is-lower-case/is-lower-case.d.ts) [is-lower-case](https://github.com/blakeembrey/is-lower-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
 * [:link:](is-my-json-valid/is-my-json-valid.d.ts) [is-my-json-valid](https://github.com/mafintosh/is-my-json-valid) by [kruncher](https://github.com/kruncher)
@@ -877,6 +906,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](js-data-angular/js-data-angular.d.ts) [JSDataAngular](https://github.com/js-data/js-data-angular) by [Stefan Steinhart](https://github.com/reppners)
 * [:link:](jsdeferred/jsdeferred.d.ts) [JSDeferred](https://github.com/cho45/jsdeferred) by [Daisuke Mino](https://github.com/minodisk)
 * [:link:](jsdom/jsdom.d.ts) [jsdom](https://github.com/tmpvar/jsdom) by [Asana](https://asana.com)
+* [:link:](jsen/jsen.d.ts) [jsen (JSON Sentinel)](https://github.com/bugventure/jsen) by [Vladimir Đokić](https://github.com/vladeck)
 * [:link:](jsend/jsend.d.ts) [jsend](https://github.com/Prestaul/jsend) by [Federico Caselli](https://github.com/CaselIT)
 * [:link:](jsesc/jsesc.d.ts) [jsesc](https://github.com/mathiasbynens/jsesc) by [Bart van der Schoor](https://github.com/Bartvds)
 * [:link:](jsfl/jsfl.d.ts) [JSFL](https://adobe.com) by [soywiz](https://github.com/soywiz)
@@ -888,6 +918,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](jsnox/jsnox.d.ts) [JSnoX](https://github.com/af/jsnox) by [Steve Baker](https://github.com/stkb)
 * [:link:](json-patch/json-patch.d.ts) [json-patch](https://github.com/bruth/jsonpatch-js) by [vvakame](https://github.com/vvakame)
 * [:link:](json-pointer/json-pointer.d.ts) [json-pointer 1.0 l](https://www.npmjs.org/package/json-pointer) by [Bart van der Schoor](https://github.com/Bartvds)
+* [:link:](json-socket/json-socket.d.ts) [json-socket](https://github.com/sebastianseilund/node-json-socket) by [Sven Reglitzki](https://github.com/svi3c)
 * [:link:](json-stable-stringify/json-stable-stringify.d.ts) [json-stable-stringify](https://github.com/substack/json-stable-stringify) by [Matt Frantz](https://github.com/mhfrantz)
 * [:link:](json5/json5.d.ts) [JSON5](http://json5.org) by [Jason Swearingen](https://jasonswearingen.github.io)
 * [:link:](jsoneditoronline/jsoneditoronline.d.ts) [JSONEditorOnline](https://github.com/josdejong/jsoneditoronline) by [Vincent Bortone](https://github.com/vbortone)
@@ -904,6 +935,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](jsts/jsts.d.ts) [jsts](https://github.com/bjornharrtell/jsts) by [Stephane Alie](https://github.com/StephaneAlie)
 * [:link:](jsuri/jsuri.d.ts) [jsUri](https://github.com/derek-watson/jsUri) by [Chris Charabaruk](http://github.com/coldacid), [Florian Wagner](http://github.com/flqw)
 * [:link:](jsurl/jsurl.d.ts) [jsurl](https://github.com/Mikhus/jsurl) by [Alexey Gorshkov](https://github.com/agorshkov23)
+* [:link:](jsx-chai/jsx-chai.d.ts) [jsx-chai](https://github.com/bkonkle/jsx-chai) by [Philipp Holzer](https://github.com/nupplaphil)
 * [:link:](jszip/jszip.d.ts) [JSZip](http://stuk.github.com/jszip) by [mzeiher](https://github.com/mzeiher)
 * [:link:](jug/jug.d.ts) [jug](https://github.com/kaiquewdev/Graph) by [yevt](https://github.com/yevt)
 * [:link:](jwplayer/jwplayer.d.ts) [JW Player](http://developer.longtailvideo.com/trac) by [Martin Duparc](https://github.com/martinduparc)
@@ -947,17 +979,22 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](ko.plus/ko.plus.d.ts) [ko.plus](https://github.com/stevegreatrex/ko.plus) by [Howard Richards](https://github.com/conficient)
 * [:link:](koa-compose/koa-compose.d.ts) [koa](https://github.com/koajs/compose) by [jKey Lu](https://github.com/jkeylu)
 * [:link:](koa/koa.d.ts) [Koa 2.x](http://koajs.com) by [DavidCai1993](https://github.com/DavidCai1993)
+* [:link:](koa-bodyparser/koa-bodyparser.d.ts) [koa-bodyparser v3.x](https://github.com/koajs/bodyparser) by [Jerry Chin](https://github.com/hellopao)
+* [:link:](koa-favicon/koa-favicon.d.ts) [koa-favicon v2.x](https://github.com/koajs/favicon) by [Jerry Chin](https://github.com/hellopao)
+* [:link:](koa-json/koa-json.d.ts) [koa-json v2.x](https://github.com/koajs/json) by [Alex Friedman](https://github.com/brooklyndev)
 * [:link:](koa-router/koa-router.d.ts) [koa-router v7.x](https://github.com/alexmingoia/koa-router) by [Jerry Chin](https://github.com/hellopao)
-* [:link:](kolite/knockout.dirtyFlag.d.ts) [KoLite](https://github.com/CodeSeven/kolite) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](kolite/knockout.command.d.ts) [KoLite](https://github.com/CodeSeven/kolite) by [Boris Yankov](https://github.com/borisyankov)
-* [:link:](kolite/knockout.activity.d.ts) [KoLite](https://github.com/CodeSeven/kolite) by [Boris Yankov](https://github.com/borisyankov)
+* [:link:](koa-static/koa-static.d.ts) [koa-static v2.x](https://github.com/koajs/static) by [Jerry Chin](https://github.com/hellopao)
 * [:link:](kolite/kolite.d.ts) [KoLite](https://github.com/CodeSeven/kolite) by [Boris Yankov](https://github.com/borisyankov)
+* [:link:](kolite/knockout.activity.d.ts) [KoLite](https://github.com/CodeSeven/kolite) by [Boris Yankov](https://github.com/borisyankov)
+* [:link:](kolite/knockout.command.d.ts) [KoLite](https://github.com/CodeSeven/kolite) by [Boris Yankov](https://github.com/borisyankov)
+* [:link:](kolite/knockout.dirtyFlag.d.ts) [KoLite](https://github.com/CodeSeven/kolite) by [Boris Yankov](https://github.com/borisyankov)
 * [:link:](konami.js/konami.d.ts) [Konami-js](https://github.com/snaptortoise/konami-js) by [Matthieu Mourisson](https://github.com/mareek)
 * [:link:](kue/kue.d.ts) [kue 0.9.x](https://github.com/Automattic/kue) by [Nicholas Penree](http://github.com/drudge)
 * [:link:](kuromoji/kuromoji.d.ts) [kuromoji.js](https://github.com/takuyaa/kuromoji.js) by [MIZUSHIMA Junki](https://github.com/mzsm)
 * [:link:](ladda/ladda.d.ts) [Ladda](https://github.com/hakimel/Ladda) by [Danil Flores](https://github.com/dflor003), [Michael Lee](https://github.com/leemicw)
 * [:link:](lls/lls.d.ts) [LargeLocalStorage](https://github.com/tantaman/LargeLocalStorage) by [Borislav Zhivkov](https://github.com/borislavjivkov)
 * [:link:](later/later.d.ts) [LaterJS](http://bunkat.github.io/later) by [Jason D Dryhurst-Smith](http://jasonds.co.uk)
+* [:link:](latinize/latinize.d.ts) [latinize](https://github.com/dundalek/latinize) by [Giedrius Grabauskas](https://github.com/GiedriusGrabauskas)
 * [:link:](lazy.js/lazy.js.d.ts) [Lazy.js](https://github.com/dtao/lazy.js) by [Bart van der Schoor](https://github.com/Bartvds)
 * [:link:](lazypipe/lazypipe.d.ts) [lazypipe](https://github.com/OverZealous/lazypipe) by [Thomas Corbière](https://github.com/tomc974)
 * [:link:](leaflet-curve/leaflet-curve.d.ts) [leaflet-curve](https://github.com/onikiienko/Leaflet.curve) by [Onikiienko](https://github.com/onikiienko)
@@ -992,7 +1029,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](log4js/log4js.d.ts) [log4js](https://github.com/nomiddlename/log4js-node) by [Kentaro Okuno](http://github.com/armorik83)
 * [:link:](logg/logg.d.ts) [logg](https://github.com/dpup/node-logg) by [Bret Little](https://github.com/blittle)
 * [:link:](loggly/loggly.d.ts) [loggly](https://github.com/nodejitsu/node-loggly) by [Ray Martone](https://github.com/rmartone)
-* [:link:](loglevel/loglevel.d.ts) [loglevel](https://github.com/pimterry/loglevel) by [Stefan Profanter](https://github.com/Pro), [Florian Wagner](https://github.com/flqw)
+* [:link:](loglevel/loglevel.d.ts) [loglevel](https://github.com/pimterry/loglevel) by [Stefan Profanter](https://github.com/Pro), [Florian Wagner](https://github.com/flqw), [Gabor Szmetanko](https://github.com/szmeti)
 * [:link:](logrotate-stream/logrotate-stream.d.ts) [logrotate-stream](https://github.com/dstokes/logrotate-stream) by [Rogier Schouten](https://github.com/rogierschouten)
 * [:link:](lokijs/lokijs.d.ts) [lokijs](https://github.com/techfort/LokiJS) by [TeamworkGuy2](https://github.com/TeamworkGuy2)
 * [:link:](lolex/lolex.d.ts) [lolex](https://github.com/sinonjs/lolex) by [Wim Looman](https://github.com/Nemo157)
@@ -1044,6 +1081,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](node-mysql-wrapper/my-meteor.d.ts) [meteorjs for node-mysql-wrapper which helps in development](https://github.com/nodets/node-mysql-wrapper) by [Makis Maropoulos](https://github.com/kataras)
 * [:link:](method-override/method-override.d.ts) [method-override](https://github.com/expressjs/method-override) by [Santi Albo](https://github.com/santialbo)
 * [:link:](metismenu/metismenu.d.ts) [metisMenu](http://github.com/onokumus/metisMenu) by [onokums](https://github.com/onokumus)
+* [:link:](microgears/microgears.d.ts) [microgears](http://github.com/marcusdb/microgears) by [Marcus David Bronstein](https://github.com/marcusdb)
 * [:link:](micromatch/micromatch.d.ts) [micromatch](https://github.com/jonschlinkert/micromatch) by [glen-84](https://github.com/glen-84)
 * [:link:](microsoft-ajax/microsoft.ajax.d.ts) [Microsoft ASP.NET Ajax client side library](http://msdn.microsoft.com/en-us/library/ee341002(v=vs.100).aspx) by [Patrick Magee](https://github.com/pjmagee)
 * [:link:](xrm/xrm.d.ts) [Microsoft Dynamics xRM API](http://www.microsoft.com/en-us/download/details.aspx?id=44567) by [David Berry](https://github.com/6ix4our), [Matt Ngan](https://github.com/mattngan), [Markus Mauch](https://github.com/markusmauch)
@@ -1072,8 +1110,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](mkpath/mkpath.d.ts) [mkpath](https://www.npmjs.com/package/mkpath) by [Jared Klopper](https://github.com/optical)
 * [:link:](mmmagic/mmmagic.d.ts) [mmmagic](https://github.com/mscdex/mmmagic) by [Andrei Sebastian Cîmpean](http://andreime.com)
 * [:link:](mobile-detect/mobile-detect.d.ts) [mobile-detect](http://hgoebl.github.io/mobile-detect.js) by [Martin McWhorter](https://github.com/martinmcwhorter)
-* [:link:](mobservable-react/mobservable-react.d.ts) [mobservable](https://github.com/mweststrate/mobservable-react) by [Michel Weststrate](https://github.com/mweststrate)
 * [:link:](mobservable/mobservable.d.ts) [mobservable](https://mweststrate.github.io/mobservable) by [Michel Weststrate](https://github.com/mweststrate)
+* [:link:](mobservable-react/mobservable-react.d.ts) [mobservable](https://github.com/mweststrate/mobservable-react) by [Michel Weststrate](https://github.com/mweststrate)
 * [:link:](mocha/mocha-node.d.ts) [mocha](http://mochajs.org) by [Vadim Macagon](https://github.com/enlight), [vvakame](https://github.com/vvakame)
 * [:link:](mocha/mocha.d.ts) [mocha](http://mochajs.org) by [Kazi Manzur Rashid](https://github.com/kazimanzurrashid), [otiai10](https://github.com/otiai10), [jt000](https://github.com/jt000), [Vadim Macagon](https://github.com/enlight)
 * [:link:](mocha-phantomjs/mocha-phantomjs.d.ts) [mocha-phantomjs](http://metaskills.net/mocha-phantomjs) by [Erik Schierboom](https://github.com/ErikSchierboom)
@@ -1081,9 +1119,9 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](mockery/mockery.d.ts) [mockery](https://github.com/mfncooper/mockery) by [jt000](https://github.com/jt000)
 * [:link:](modernizr/modernizr.d.ts) [Modernizr](http://modernizr.com) by [Boris Yankov](https://github.com/borisyankov), [Theodore Brown](https://github.com/theodorejb), [Leon Yu](https://github.com/leonyu)
 * [:link:](moment-timezone/moment-timezone.d.ts) [moment-timezone.js](http://momentjs.com/timezone) by [Michel Salib](https://github.com/michelsalib)
-* [:link:](moment-range/moment-range.d.ts) [Moment.js](https://github.com/gf3/moment-range) by [Bart van den Burg](https://github.com/Burgov), [Wilgert Velinga](https://github.com/wilgert)
-* [:link:](moment/moment.d.ts) [Moment.js](https://github.com/timrwood/moment) by [Michael Lakerveld](https://github.com/Lakerfield), [Aaron King](https://github.com/kingdango), [Hiroki Horiuchi](https://github.com/horiuchi), [Dick van den Brink](https://github.com/DickvdBrink), [Adi Dahiya](https://github.com/adidahiya), [Matt Brooks](https://github.com/EnableSoftware)
 * [:link:](moment/moment-node.d.ts) [Moment.js](https://github.com/timrwood/moment) by [Michael Lakerveld](https://github.com/Lakerfield), [Aaron King](https://github.com/kingdango), [Hiroki Horiuchi](https://github.com/horiuchi), [Dick van den Brink](https://github.com/DickvdBrink), [Adi Dahiya](https://github.com/adidahiya), [Matt Brooks](https://github.com/EnableSoftware), [Gal Talmor](https://github.com/galtalmor)
+* [:link:](moment/moment.d.ts) [Moment.js](https://github.com/timrwood/moment) by [Michael Lakerveld](https://github.com/Lakerfield), [Aaron King](https://github.com/kingdango), [Hiroki Horiuchi](https://github.com/horiuchi), [Dick van den Brink](https://github.com/DickvdBrink), [Adi Dahiya](https://github.com/adidahiya), [Matt Brooks](https://github.com/EnableSoftware)
+* [:link:](moment-range/moment-range.d.ts) [Moment.js](https://github.com/gf3/moment-range) by [Bart van den Burg](https://github.com/Burgov), [Wilgert Velinga](https://github.com/wilgert)
 * [:link:](mongodb/mongodb.d.ts) [MongoDB](https://github.com/mongodb/node-mongodb-native/tree/2.1) by [Federico Caselli](https://github.com/CaselIT)
 * [:link:](mongoose/mongoose.d.ts) [Mongoose](http://mongoosejs.com) by [horiuchi](https://github.com/horiuchi)
 * [:link:](mongoose-auto-increment/mongoose-auto-increment.d.ts) [mongoose-auto-increment](https://github.com/codetunnel/mongoose-auto-increment) by [Aya Morisawa](https://github.com/AyaMorisawa)
@@ -1101,7 +1139,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](msgpack/msgpack.d.ts) [msgpack.js - MessagePack JavaScript Implementation](https://github.com/uupaa/msgpack.js) by [Shinya Mochizuki](https://github.com/enrapt-mochizuki)
 * [:link:](msnodesql/msnodesql.d.ts) [msnodesql](https://github.com/WindowsAzure/node-sqlserver) by [Boris Yankov](https://github.com/borisyankov), [Maxime LUCE](https://github.com/SomaticIT)
 * [:link:](msportalfx-test/msportalfx-test.d.ts) [msportalfx-test](https://msazure.visualstudio.com/DefaultCollection/AzureUX/_git/portalfx-msportalfx-test) by [Julio Casal](https://github.com/julioct)
-* [:link:](mssql/mssql.d.ts) [mssql](https://www.npmjs.com/package/mssql) by [COLSA Corporation](http://www.colsa.com), [Ben Farr](https://github.com/jaminfarr)
+* [:link:](mssql/mssql.d.ts) [mssql](https://www.npmjs.com/package/mssql) by [COLSA Corporation](http://www.colsa.com), [Ben Farr](https://github.com/jaminfarr), [Vitor Buzinaro](https://github.com/buzinas)
 * [:link:](mu2/mu2.d.ts) [mu2](http://github.com/raycmorgan/mu) by [Jeff Goddard](https://github.com/jedigo)
 * [:link:](multer/multer.d.ts) [multer](https://github.com/expressjs/multer) by [jt000](https://github.com/jt000), [vilicvane](https://vilic.github.io), [David Broder-Rodgers](https://github.com/DavidBR-SW)
 * [:link:](multiplexjs/multiplexjs.d.ts) [Multiplex.js](http://github.com/multiplex/multiplex.js) by [Kamyar Nazeri](http://github.com/KamyarNazeri)
@@ -1109,6 +1147,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](mz/mz.d.ts) [mz](https://github.com/normalize/mz) by [Thomas Hickman](https://github.com/ThomasHickman)
 * [:link:](nanoajax/nanoajax.d.ts) [nanoajax](https://github.com/yanatan16/nanoajax) by [Nathan Cahill](https://github.com/nathancahill)
 * [:link:](natural/natural.d.ts) [Natural](https://github.com/NaturalNode/natural) by [Dylan R. E. Moonfire](https://github.com/dmoonfire)
+* [:link:](natural-sort/natural-sort.d.ts) [NaturalSort](https://github.com/studio-b12/natural-sort) by [Antonio Morales](https://github.com/a-morales)
 * [:link:](navigation/navigation.d.ts) [Navigation](http://grahammendick.github.io/navigation) by [Graham Mendick](https://github.com/grahammendick)
 * [:link:](nconf/nconf.d.ts) [nconf](https://github.com/flatiron/nconf) by [Jeff Goddard](https://github.com/jedigo), [Jean-Martin Thibault](https://github.com/jmthibault)
 * [:link:](ncp/ncp.d.ts) [ncp](https://github.com/AvianFlu/ncp) by [Bart van der Schoor](https://github.com/bartvds)
@@ -1117,6 +1156,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](netmask/netmask.d.ts) [Netmask](https://github.com/rs/node-netmask) by [Matt Frantz](https://github.com/mhfrantz)
 * [:link:](nexpect/nexpect.d.ts) [nexpect](https://github.com/nodejitsu/nexpect) by [vvakame](http://github.com/vvakame)
 * [:link:](ng-command/ng-command.d.ts) [ng-command](https://github.com/stephenlautier/ng-command) by [Stephen Lautier](https://github.com/stephenlautier)
+* [:link:](ng-facebook/ng-facebook.d.ts) [ng-facebook](https://github.com/GoDisco/ngFacebook) by [Crevil](https://github.com/Crevil)
 * [:link:](ng-flow/ng-flow.d.ts) [ng-flow](https://github.com/flowjs/ng-flow) by [Ryan McNamara](https://github.com/ryan10132)
 * [:link:](ng-grid/ng-grid.d.ts) [ng-grid](http://angular-ui.github.io/ng-grid) by [Ken Smith](https://github.com/smithkl42), [Roland Zwaga](https://github.com/rolandzwaga), [Kent Cooper](https://github.com/kentcooper)
 * [:link:](angular-idle/angular-idle.d.ts) [ng-idle](http://hackedbychinese.github.io/ng-idle) by [mthamil](https://github.com/mthamil)
@@ -1147,7 +1187,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](ng-stomp/ng-stomp.d.ts) [ngStomp](https://github.com/beevelop/ng-stomp) by [Lukasz Potapczuk](https://github.com/lpotapczuk)
 * [:link:](ngstorage/ngstorage.d.ts) [ngstorage](https://github.com/gsklee/ngStorage) by [Jakub Pistek](https://github.com/kubiq)
 * [:link:](nightmare/nightmare.d.ts) [Nightmare](https://github.com/segmentio/nightmare) by [horiuchi](https://github.com/horiuchi)
-* [:link:](noble/noble.d.ts) [noble](https://github.com/sandeepmistry/noble) by [Seon-Wook Park](https://github.com/swook)
+* [:link:](noble/noble.d.ts) [noble](https://github.com/sandeepmistry/noble) by [Seon-Wook Park](https://github.com/swook), [Hans Bakker](https://github.com/wind-rider)
 * [:link:](nock/nock.d.ts) [nock](https://github.com/pgte/nock) by [bonnici](https://github.com/bonnici)
 * [:link:](node-imap/imap.d.ts) [node imap](https://github.com/mscdex/node-imap) by [Steve Fenton](https://github.com/Steve-Fenton)
 * [:link:](oauth2-server/oauth2-server.d.ts) [Node OAuth2 Server](https://github.com/thomseddon/node-oauth2-server) by [Robbie Van Gorkom](https://github.com/vangorra)
@@ -1189,12 +1229,13 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](node-sass-middleware/node-sass-middleware.d.ts) [node-sass-middleware](https://github.com/sass/node-sass-middleware) by [Pascal Garber](http://www.jumplink.eu)
 * [:link:](node-schedule/node-schedule.d.ts) [node-schedule](https://github.com/tejasmanohar/node-schedule) by [Cyril Schumacher](https://github.com/cyrilschumacher)
 * [:link:](node-slack/node-slack.d.ts) [node-slack](https://github.com/xoxco/node-slack) by [Qubo](https://github.com/tkQubo)
+* [:link:](node-snap7/node-snap7.d.ts) [node-snap7](https://github.com/mathiask88/node-snap7) by [Heilingbrunner](https://github.com/heilingbrunner)
 * [:link:](srp/srp.d.ts) [node-srp](https://github.com/mozilla/node-srp) by [Pat Smuk](https://github.com/Patman64)
 * [:link:](stack-trace/stack-trace.d.ts) [node-stack-trace](https://github.com/felixge/node-stack-trace) by [Exceptionless](https://github.com/exceptionless)
 * [:link:](node-uuid/node-uuid-global.d.ts) [node-uuid.js](https://github.com/broofa/node-uuid) by [Jeff May](https://github.com/jeffmay)
-* [:link:](node-uuid/node-uuid.d.ts) [node-uuid.js](https://github.com/broofa/node-uuid) by [Jeff May](https://github.com/jeffmay)
-* [:link:](node-uuid/node-uuid-base.d.ts) [node-uuid.js](https://github.com/broofa/node-uuid) by [Jeff May](https://github.com/jeffmay)
 * [:link:](node-uuid/node-uuid-cjs.d.ts) [node-uuid.js](https://github.com/broofa/node-uuid) by [Jeff May](https://github.com/jeffmay)
+* [:link:](node-uuid/node-uuid-base.d.ts) [node-uuid.js](https://github.com/broofa/node-uuid) by [Jeff May](https://github.com/jeffmay)
+* [:link:](node-uuid/node-uuid.d.ts) [node-uuid.js](https://github.com/broofa/node-uuid) by [Jeff May](https://github.com/jeffmay)
 * [:link:](node-validator/node-validator.d.ts) [node-validator](https://www.npmjs.com/package/node-validator) by [Ken Gorab](https://github.com/kengorab)
 * [:link:](node-webkit/node-webkit.d.ts) [node-webkit](https://github.com/rogerwang/node-webkit) by [Pedro Casaubon](https://github.com/xperiments)
 * [:link:](xml2js/xml2js.d.ts) [node-xml2js](https://github.com/Leonidas-from-XIV/node-xml2js) by [Michel Salib](https://github.com/michelsalib), [Jason McNeil](https://github.com/jasonrm), [Christopher Currens](https://github.com/ccurrens)
@@ -1242,8 +1283,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](once/once.d.ts) [once](https://github.com/isaacs/once) by [Denis Sokolov](https://github.com/denis-sokolov)
 * [:link:](onoff/onoff.d.ts) [onoff](https://github.com/fivdi/onoff) by [Marcel Ernst](https://github.com/marcel-ernst)
 * [:link:](onsenui/onsenui.d.ts) [Onsen UI](http://onsen.io) by [Fran Dios](https://github.com/frankdiox)
-* [:link:](deep-extend/deep-extend.d.ts) [open](https://github.com/unclechu/node-deep-extend) by [rhysd](https://github.com/rhysd)
 * [:link:](open/open.d.ts) [open](https://github.com/jjrdn/node-open) by [Bart van der Schoor](https://github.com/Bartvds)
+* [:link:](deep-extend/deep-extend.d.ts) [open](https://github.com/unclechu/node-deep-extend) by [rhysd](https://github.com/rhysd)
 * [:link:](OpenJsCad/openjscad.d.ts) [OpenJsCad.js](https://github.com/joostn/OpenJsCad) by [Dan Marshall](https://github.com/danmarshall)
 * [:link:](openlayers/openlayers.d.ts) [OpenLayers](http://openlayers.org) by [Wouter Goedhart](https://github.com/woutergd)
 * [:link:](openpgp/openpgp.d.ts) [openpgpjs](http://openpgpjs.org) by [Guillaume Lacasa](https://blog.lacasa.fr)
@@ -1271,12 +1312,14 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](pascal-case/pascal-case.d.ts) [pascal-case](https://github.com/blakeembrey/pascal-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
 * [:link:](passport/passport.d.ts) [Passport](http://passportjs.org) by [Horiuchi_H](https://github.com/horiuchi)
 * [:link:](passport-strategy/passport-strategy.d.ts) [Passport Strategy module](https://github.com/jaredhanson/passport-strategy) by [Lior Mualem](https://github.com/liorm)
-* [:link:](passport-twitter/passport-twitter.d.ts) [passport-facebook](https://github.com/jaredhanson/passport-facebook) by [James Roland Cabresos](https://github.com/staticfunction)
 * [:link:](passport-facebook/passport-facebook.d.ts) [passport-facebook](https://github.com/jaredhanson/passport-facebook) by [James Roland Cabresos](https://github.com/staticfunction)
 * [:link:](passport-google-oauth/passport-google-oauth.d.ts) [passport-facebook](https://github.com/jaredhanson/passport-facebook) by [James Roland Cabresos](https://github.com/staticfunction)
+* [:link:](passport-twitter/passport-twitter.d.ts) [passport-facebook](https://github.com/jaredhanson/passport-facebook) by [James Roland Cabresos](https://github.com/staticfunction)
 * [:link:](passport-facebook-token/passport-facebook-token.d.ts) [passport-facebook-token](https://github.com/drudge/passport-facebook-token) by [Ray Martone](https://github.com/rmartone)
 * [:link:](passport-http-bearer/passport-http-bearer.d.ts) [passport-http-bearer](https://github.com/jaredhanson/passport-http-bearer) by [Isman Usoh](https://github.com/isman-usoh)
+* [:link:](passport-jwt/passport-jwt.d.ts) [passport-jwt](https://github.com/themikenicholson/passport-jwt) by [TANAKA Koichi](https://github.com/mugeso)
 * [:link:](passport-local/passport-local.d.ts) [passport-local](https://github.com/jaredhanson/passport-local) by [Maxime LUCE](https://github.com/SomaticIT)
+* [:link:](password-hash/password-hash.d.ts) [password-hash 1.2.x](https://github.com/davidwood/node-password-hash) by [TANAKA Koichi](https://github.com/mugeso)
 * [:link:](path-case/path-case.d.ts) [path-case](https://github.com/blakeembrey/path-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
 * [:link:](path-exists/path-exists.d.ts) [path-exists](https://github.com/sindresorhus/path-exists) by [Shogo Iwano](https://github.com/shiwano)
 * [:link:](path-parse/path-parse.d.ts) [path-parse](https://github.com/jbgutierrez/path-parse) by [Dan Chao](http://dchao.co)
@@ -1291,7 +1334,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](pegjs/pegjs.d.ts) [PEG.js](http://pegjs.org) by [vvakame](https://github.com/vvakame), [Tobias Kahlert](https://github.com/SrTobi)
 * [:link:](persona/persona.d.ts) [Persona](http://www.mozilla.org/en-US/persona) by [James Frasca](https://github.com/Nycto)
 * [:link:](pg/pg.d.ts) [pg](https://github.com/brianc/node-postgres) by [Phips Peter](http://pspeter3.com)
-* [:link:](pg-promise/pg-promise.d.ts) [pg-promise](https://github.com/vitaly-t/pg-promise) by [Jörg Dotzki](https://github.com/ISO50)
+* [:link:](pg-promise/pg-promise.d.ts) [pg-promise](https://github.com/vitaly-t/pg-promise) by [vvakame](https://github.com/vvakame)
 * [:link:](pgwmodal/pgwmodal.d.ts) [PgwModal](http://pgwjs.com/pgwmodal) by [Pine Mizune](https://github.com/pine613)
 * [:link:](phantomcss/phantomcss.d.ts) [PhantomCSS](https://github.com/Huddle/PhantomCSS) by [Amaury Bauzac](https://github.com/abauzac)
 * [:link:](phantom/phantom.d.ts) [PhantomJS bridge for NodeJS](https://github.com/sgentle/phantomjs-node) by [horiuchi](https://github.com/horiuchi), [Random](https://github.com/llRandom)
@@ -1336,9 +1379,11 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](prelude-ls/prelude-ls.d.ts) [prelude.ls](http://www.preludels.com) by [Aya Morisawa](https://github.com/AyaMorisawa)
 * [:link:](prettyjson/prettyjson.d.ts) [prettyjson](https://github.com/rafeca/prettyjson) by [Wael BEN ZID EL GUEBSI](https://github.com/benzid-wael)
 * [:link:](meteor-prime8consulting-oauth2/meteor-prime8consulting-oauth2.d.ts) [prime8consulting:meteor-oauth2](https://github.com/prime-8-consulting/meteor-oauth2) by [Robbie Van Gorkom](https://github.com/vangorra)
+* [:link:](prismjs/prism.d.ts) [prism](http://prismjs.com) by [Erik Lieben](https://github.com/eriklieben)
 * [:link:](progressjs/progress.d.ts) [ProgressJs](http://usablica.github.io/progress.js) by [Shunsuke Ohtani](https://github.com/zaneli)
 * [:link:](project-oxford/project-oxford.d.ts) [project-oxford](https://github.com/felixrieseberg/project-oxford) by [Scott Southwood](https://github.com/scsouthw)
 * [:link:](promise/promise.d.ts) [promise](https://www.promisejs.org) by [Manuel Rueda](https://github.com/ManRueda)
+* [:link:](promise-pg/promise-pg.d.ts) [promise-pg](https://bitbucket.org/lplabs/promise-pg) by [Chris Charabaruk](http://github.com/coldacid)
 * [:link:](promise-pool/promise-pool.d.ts) [promise-pool](https://github.com/vilic/promise-pool) by [VILIC VANE](https://github.com/vilic)
 * [:link:](promises-a-plus/promises-a-plus.d.ts) [promises-a-plus](http://promisesaplus.com) by [Igor Oleinikov](https://github.com/Igorbek)
 * [:link:](promisify-supertest/promisify-supertest.d.ts) [promisify-supertest](https://www.npmjs.com/package/promisify-supertest) by [Leo Liang](https://github.com/aleung)
@@ -1364,6 +1409,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](qwest/qwest.d.ts) [qwest](https://github.com/pyrsmk/qwest) by [Lindsay Evans](https://github.com/lindsayevans)
 * [:link:](rabbit.js/rabbit.js.d.ts) [rabbit.js](https://github.com/squaremo/rabbit.js) by [Wonshik Kim](https://github.com/wokim)
 * [:link:](ractive/ractive.d.ts) [Ractive](http://ractivejs.org) by [Han Lin Yap](http://yap.nu)
+* [:link:](radium/radium.d.ts) [radium](https://github.com/formidablelabs/radium) by [Alex Gorbatchev](https://github.com/alexgorbatchev), [Philipp Holzer](https://github.com/nupplaphil)
 * [:link:](random-js/random-js.d.ts) [random-js](https://github.com/ckknight/random-js) by [Gustavo Di Pietro](https://github.com/pistacchio)
 * [:link:](random-string/random-string.d.ts) [random-string](https://github.com/valiton/node-random-string) by [Sam Saint-Pettersen](https://github.com/stpettersens)
 * [:link:](rangy/rangy.d.ts) [Rangy](https://github.com/timdown/rangy) by [Rudolph Gottesheim](http://www.midnight-design.at)
@@ -1390,6 +1436,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](rc-select/rc-select.d.ts) [React Select](https://github.com/react-component/select) by [Denis Tirilis](https://github.com/DenisTirilis)
 * [:link:](react-bootstrap/react-bootstrap.d.ts) [react-bootstrap](https://github.com/react-bootstrap/react-bootstrap) by [Walker Burgin](https://github.com/walkerburgin), [Vincent Siao](https://github.com/vsiao)
 * [:link:](react-bootstrap-table/react-bootstrap-table.d.ts) [react-bootstrap-table](https://github.com/AllenFang/react-bootstrap-table) by [Frank Laub](https://github.com/flaub)
+* [:link:](react-cropper/react-cropper.d.ts) [react-cropper](https://github.com/roadmanfong/react-cropper) by [Stepan Mikhaylyuk](https://github.com/stepancar)
 * [:link:](react-datagrid/react-datagrid.d.ts) [react-datagrid](https://github.com/zippyui/react-datagrid.git) by [Stephen Jelfs](https://github.com/stephenjelfs)
 * [:link:](react-day-picker/react-day-picker.d.ts) [react-day-picker](https://github.com/gpbl/react-day-picker) by [Giampaolo Bellavite](https://github.com/gpbl), [Jason Killian](https://github.com/jkillian)
 * [:link:](react-dropzone/react-dropzone.d.ts) [react-dropzone](https://github.com/paramaggarwal/react-dropzone) by [Mathieu Larouche Dube](https://github.com/matdube)
@@ -1400,9 +1447,10 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](react-input-calendar/react-input-calendar.d.ts) [react-input-calendar](https://github.com/Rudeg/react-input-calendar) by [Stepan Mikhaylyuk](https://github.com/stepancar)
 * [:link:](react-intl/react-intl.d.ts) [react-intl](http://formatjs.io/react) by [Bruno Grieder](https://github.com/bgrieder), [Christian Droulers](https://github.com/cdroulers)
 * [:link:](react-mixin/react-mixin.d.ts) [react-mixin](https://github.com/brigand/react-mixin) by [Qubo](https://github.com/tkqubo)
+* [:link:](react-motion/react-motion.d.ts) [react-motion](https://github.com/chenglou/react-motion) by [Stepan Mikhaylyuk](https://github.com/stepancar)
 * [:link:](react-native/react-native.d.ts) [react-native](https://github.com/facebook/react-native) by [Bruno Grieder](https://github.com/bgrieder)
 * [:link:](react-props-decorators/react-props-decorators.d.ts) [react-props-decorators](https://github.com/popkirby/react-props-decorators) by [Qubo](https://github.com/tkqubo)
-* [:link:](react-redux/react-redux.d.ts) [react-redux](https://github.com/rackt/react-redux) by [Qubo](https://github.com/tkqubo)
+* [:link:](react-redux/react-redux.d.ts) [react-redux](https://github.com/rackt/react-redux) by [Qubo](https://github.com/tkqubo), [Sean Kelley](https://github.com/seansfkelley)
 * [:link:](react-router/react-router.d.ts) [react-router](https://github.com/rackt/react-router) by [Sergey Buturlakin](https://github.com/sergey-buturlakin), [Yuichi Murata](https://github.com/mrk21), [Václav Ostrožlík](https://github.com/vasek17), [Nathan Brown](https://github.com/ngbrown)
 * [:link:](react-router-bootstrap/react-router-bootstrap.d.ts) [react-router-bootstrap](https://github.com/react-bootstrap/react-router-bootstrap) by [Vincent Lesierse](https://github.com/vlesierse)
 * [:link:](react-router-redux/react-router-redux.d.ts) [react-router-redux](https://github.com/rackt/react-router-redux) by [Isman Usoh](http://github.com/isman-usoh), [Noah Shipley](https://github.com/noah79), [Dimitri Rosenberg](https://github.com/rosendi)
@@ -1411,15 +1459,20 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](react-spinkit/react-spinkit.d.ts) [react-spinkit](https://github.com/KyleAMathews/react-spinkit) by [Qubo](https://github.com/tkqubo)
 * [:link:](react-swf/react-swf.d.ts) [react-swf](https://github.com/syranide/react-swf) by [Stepan Mikhaylyuk](https://github.com/stepancar)
 * [:link:](react-swipeable-views/react-swipeable-views.d.ts) [react-swipeable-views](https://github.com/oliviertassinari/react-swipeable-views) by [Michael Ledin](https://github.com/mxl)
+* [:link:](react-tabs/react-tabs.d.ts) [react-tabs](https://github.com/reactjs/react-tabs) by [Yuu Igarashi](https://github.com/yu-i9)
+* [:link:](react-tagcloud/react-tagcloud.d.ts) [react-tagcloud](https://github.com/madox2/react-tagcloud) by [wassname](https://github.com/wassname)
 * [:link:](react-tap-event-plugin/react-tap-event-plugin.d.ts) [react-tap-event-plugin](https://github.com/zilverline/react-tap-event-plugin) by [Michael Ledin](https://github.com/mxl)
+* [:link:](react-widgets/react-widgets.d.ts) [react-widgets](https://github.com/jquense/react-widgets) by [Rogier Schouten](https://github.com/rogierschouten)
 * [:link:](read/read.d.ts) [read](https://github.com/isaacs/read) by [Tim JK](https://github.com/timjk)
 * [:link:](readdir-stream/readdir-stream.d.ts) [readdir-stream](https://github.com/logicalparadox/readdir-stream) by [Bart van der Schoor](https://github.com/Bartvds)
+* [:link:](rebass/rebass.d.ts) [Rebass](https://github.com/jxnblk/rebass) by [rhysd](https://rhysd.github.io)
 * [:link:](recursive-readdir/recursive-readdir.d.ts) [recursive-readdir](https://github.com/jergason/recursive-readdir) by [Elisée Maurer](https://github.com/elisee)
 * [:link:](redis/redis.d.ts) [redis](https://github.com/mranney/node_redis) by [Carlos Ballesteros Velasco](https://github.com/soywiz), [Peter Harris](https://github.com/CodeAnimal), [TANAKA Koichi](https://github.com/MugeSo)
 * [:link:](redlock/redlock.d.ts) [Redlock](https://github.com/mike-marcacci/node-redlock) by [Ilya Mochalov](https://github.com/chrootsu)
 * [:link:](redux/redux.d.ts) [Redux](https://github.com/rackt/redux) by [William Buchwalter](https://github.com/wbuchwalter), [Vincent Prouillet](https://github.com/Keats)
 * [:link:](redux-action-utils/redux-action-utils.d.ts) [redux-action-utils](https://github.com/insin/redux-action-utils) by [Qubo](https://github.com/tkqubo)
 * [:link:](redux-actions/redux-actions.d.ts) [redux-actions](https://github.com/acdlite/redux-actions) by [Jack Hsu](https://github.com/jaysoo)
+* [:link:](redux-debounced/redux-debounced.d.ts) [redux-debounced](https://github.com/ryanseddon/redux-debounced) by [Sean Kelley](https://github.com/seansfkelley)
 * [:link:](redux-devtools/redux-devtools.d.ts) [redux-devtools](https://github.com/gaearon/redux-devtools) by [Petryshyn Sergii](https://github.com/mc-petry)
 * [:link:](redux-devtools-dock-monitor/redux-devtools-dock-monitor.d.ts) [redux-devtools-dock-monitor](https://github.com/gaearon/redux-devtools-dock-monitor) by [Petryshyn Sergii](https://github.com/mc-petry)
 * [:link:](redux-devtools-log-monitor/redux-devtools-log-monitor.d.ts) [redux-devtools-log-monitor](https://github.com/gaearon/redux-devtools-log-monitor) by [Petryshyn Sergii](https://github.com/mc-petry)
@@ -1427,6 +1480,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](react-scroll/react-scroll.d.ts) [redux-immutable](https://github.com/fisshy/react-scroll) by [Pedro Pereira](https://github.com/oizie)
 * [:link:](redux-immutable/redux-immutable.d.ts) [redux-immutable](https://github.com/gajus/redux-immutable) by [Pedro Pereira](https://github.com/oizie)
 * [:link:](redux-logger/redux-logger.d.ts) [redux-logger](https://github.com/fcomb/redux-logger) by [Alexander Rusakov](https://github.com/arusakov)
+* [:link:](redux-promise/redux-promise.d.ts) [redux-promise](https://github.com/acdlite/redux-promise) by [Rogelio Morrell Caballero](https://github.com/molekilla)
 * [:link:](redux-router/redux-router.d.ts) [redux-router](https://github.com/rackt/redux-router) by [Stepan Mikhaylyuk](http://github.com/stepancar)
 * [:link:](redux-saga/redux-saga.d.ts) [redux-saga](https://github.com/yelouafi/redux-saga) by [Daniel Lytkin](https://github.com/aikoven), [Dimitri Rosenberg](https://github.com/rosendi)
 * [:link:](redux-thunk/redux-thunk.d.ts) [redux-thunk](https://github.com/gaearon/redux-thunk) by [Qubo](https://github.com/tkqubo)
@@ -1443,6 +1497,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](requirejs/require.d.ts) [RequireJS](http://requirejs.org) by [Josh Baldwin](https://github.com/jbaldwin)
 * [:link:](reselect/reselect.d.ts) [reselect](https://github.com/rackt/reselect) by [Ian Ker-Seymer](https://github.com/ianks)
 * [:link:](resemblejs/resemblejs.d.ts) [Resemble.js](http://huddle.github.io/Resemble.js) by [Tim Perry](https://github.com/pimterry)
+* [:link:](resolve-from/resolve-from.d.ts) [resolve-from](https://github.com/sindresorhus/resolve-from) by [unional](https://github.com/unional)
 * [:link:](response-time/response-time.d.ts) [response-time](https://github.com/expressjs/response-time) by [Uros Smolnik](https://github.com/urossmolnik)
 * [:link:](rest-io/rest-io.d.ts) [rest-io](https://github.com/EnoF/rest-io) by [Andy Tang](https://github.com/EnoF), [Stefan Schacherl](https://github.com/TheBay0r)
 * [:link:](rest/rest.d.ts) [rest.js](https://github.com/cujojs/rest) by [Wim Looman](https://github.com/Nemo157)
@@ -1469,6 +1524,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](rtree/rtree.d.ts) [rtree](https://github.com/leaflet-extras/RTree) by [Omede Firouz](https://github.com/oefirouz)
 * [:link:](run-sequence/run-sequence.d.ts) [run-sequence](https://github.com/OverZealous/run-sequence) by [Keita Kagurazaka](https://github.com/k-kagurazaka)
 * [:link:](rx/rx.d.ts) [RxJS](http://rx.codeplex.com) by [gsino](http://www.codeplex.com/site/users/view/gsino), [Igor Oleinikov](https://github.com/Igorbek)
+* [:link:](rx-dom/rx-dom.d.ts) [RxJS](https://github.com/Reactive-Extensions/RxJS-DOM) by [oliver Weichhold](https://github.com/oliverw)
 * [:link:](rx/rx.aggregates.d.ts) [RxJS-Aggregates](http://rx.codeplex.com) by [Carl de Billy](http://carl.debilly.net), [Igor Oleinikov](https://github.com/Igorbek)
 * [:link:](rx/rx.all.d.ts) [RxJS-All](http://rx.codeplex.com) by [Carl de Billy](http://carl.debilly.net), [Igor Oleinikov](https://github.com/Igorbek)
 * [:link:](rx/rx.async.d.ts) [RxJS-Async](http://rx.codeplex.com) by [zoetrope](https://github.com/zoetrope), [Igor Oleinikov](https://github.com/Igorbek)
@@ -1511,8 +1567,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](sentence-case/sentence-case.d.ts) [sentence-case](https://github.com/blakeembrey/sentence-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
 * [:link:](sequelize/sequelize.d.ts) [Sequelize](http://sequelizejs.com) by [samuelneff](https://github.com/samuelneff), [Peter Harris](https://github.com/codeanimal), [Ivan Drinchev](https://github.com/drinchev)
 * [:link:](sequelize-fixtures/sequelize-fixtures.d.ts) [Sequelize-Fixtures](https://github.com/domasx2/sequelize-fixtures) by [Christian Schwarz](https://github.com/cschwarz)
-* [:link:](serve-favicon/serve-favicon.d.ts) [serve-favicon](https://github.com/expressjs/serve-favicon) by [Uros Smolnik](https://github.com/urossmolnik)
 * [:link:](on-headers/on-headers.d.ts) [serve-favicon](https://github.com/jshttp/on-headers) by [John Jeffery](https://github.com/jjeffery)
+* [:link:](serve-favicon/serve-favicon.d.ts) [serve-favicon](https://github.com/expressjs/serve-favicon) by [Uros Smolnik](https://github.com/urossmolnik)
 * [:link:](serve-index/serve-index.d.ts) [serve-index](https://github.com/expressjs/serve-index) by [Tanguy Krotoff](https://github.com/tkrotoff)
 * [:link:](serve-static/serve-static.d.ts) [serve-static](https://github.com/expressjs/serve-static) by [Uros Smolnik](https://github.com/urossmolnik)
 * [:link:](ss-utils/ss-utils.d.ts) [ServiceStack Utils](https://servicestack.net) by [Demis Bellot](https://github.com/mythz)
@@ -1546,13 +1602,16 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](slickgrid/slick.autotooltips.d.ts) [SlickGrid AutoToolTips Plugin](https://github.com/mleibman/SlickGrid) by [Ryo Iwamoto](https://github.com/ryiwamoto)
 * [:link:](slickgrid/slick.headerbuttons.d.ts) [SlickGrid HeaderButtons Plugin](https://github.com/mleibman/SlickGrid) by [Derek Cicerone](https://github.com/derekcicerone)
 * [:link:](slickgrid/slick.rowselectionmodel.d.ts) [SlickGrid RowSelectionModel Plugin](https://github.com/mleibman/SlickGrid) by [Derek Cicerone](https://github.com/derekcicerone)
+* [:link:](slideout/slideout.d.ts) [Slideout](https://github.com/mango/slideout) by [Markus Peloso](https://github.com/ToastHawaii)
 * [:link:](smoothie/smoothie.d.ts) [Smoothie Charts](https://github.com/joewalnes/smoothie) by [Drew Noakes](https://drewnoakes.com), [Mike H. Hawley](https://github.com/mikehhawley)
 * [:link:](smtpapi/smtpapi.d.ts) [smtpapi-nodejs](https://github.com/sendgrid/smtpapi-nodejs) by [Antonio Morales](https://github.com/a-morales)
 * [:link:](snake-case/snake-case.d.ts) [snake-case](https://github.com/blakeembrey/snake-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
 * [:link:](snapsvg/snapsvg.d.ts) [Snap-SVG](https://github.com/adobe-webplatform/Snap.svg) by [Lars Klein](https://github.com/lhk), [Mattanja Kern](https://github.com/mattanja)
 * [:link:](soap/soap.d.ts) [soap](https://www.npmjs.com/package/soap) by [Nicole Wang](https://github.com/nicoleWjie)
+* [:link:](cordova-plugin-x-socialsharing/cordova-plugin-x-socialsharing.d.ts) [SocialSharing-PhoneGap-Plugin](https://github.com/EddyVerbruggen/SocialSharing-PhoneGap-Plugin) by [Markus Wagner](https://github.com/Ritzlgrmft)
 * [:link:](socket.io/socket.io.d.ts) [socket.io](http://socket.io) by [PROGRE](https://github.com/progre), [Damian Connolly](https://github.com/divillysausages), [Florent Poujol](https://github.com/florentpoujol)
 * [:link:](socket.io-client/socket.io-client.d.ts) [socket.io-client](http://socket.io) by [PROGRE](https://github.com/progre), [Damian Connolly](https://github.com/divillysausages), [Florent Poujol](https://github.com/florentpoujol)
+* [:link:](socket.io-redis/socket.io-redis.d.ts) [socket.io-redis](https://github.com/socketio/socket.io-redis) by [Philipp Holzer](https://github.com/nupplaphil)
 * [:link:](socket.io.users/socket.io.users.d.ts) [socket.io.users](https://github.com/nodets/socket.io.users) by [Makis Maropoulos](https://github.com/kataras)
 * [:link:](socketty/socketty.d.ts) [Socketty](https://www.npmjs.com/package/socketty) by [Nax](https://github.com/Nax)
 * [:link:](sockjs/sockjs.d.ts) [SockJS 0.3.x](https://github.com/sockjs/sockjs-client) by [Emil Ivanov](https://github.com/vladev)
@@ -1586,6 +1645,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](steam/steam.d.ts) [steam](https://github.com/seishun/node-steam) by [Andrey Kurdyumov](https://github.com/kant2002)
 * [:link:](slick-carousel/slick-carousel.d.ts) [stick](http://kenwheeler.github.io/slick) by [John Gouigouix](https://github.com/orchestra-ts/DefinitelyTyped)
 * [:link:](storejs/storejs.d.ts) [store.js](https://github.com/marcuswestin/store.js) by [Vincent Bortone](https://github.com/vbortone)
+* [:link:](stream-meter/stream-meter.d.ts) [stream-meter](https://github.com/brycebaril/node-stream-meter) by [TANAKA Koichi](https://github.com/mugeso)
 * [:link:](stream-series/stream-series.d.ts) [stream-series](https://github.com/rschmukler/stream-series) by [Keita Kagurazaka](https://github.com/k-kagurazaka)
 * [:link:](stream-to-array/stream-to-array.d.ts) [stream-to-array](https://github.com/stream-utils/stream-to-array) by [Bart van der Schoor](https://github.com/Bartvds)
 * [:link:](streamjs/streamjs.d.ts) [streamjs](http://winterbe.github.io/streamjs) by [Bence Eros](https://github.com/erosb)
@@ -1594,7 +1654,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](strip-json-comments/strip-json-comments.d.ts) [strip-json-comments](https://github.com/sindresorhus/strip-json-comments) by [Dylan R. E. Moonfire](https://github.com/dmoonfire)
 * [:link:](stripe/stripe.d.ts) [stripe](https://stripe.com) by [Andy Hawkins](https://github.com/a904guy/,http://a904guy.com), [Eric J. Smith](https://github.com/ejsmith), [Amrit Kahlon](https://github.com/amritk)
 * [:link:](stripe-checkout/stripe-checkout.d.ts) [Stripe Checkout](https://stripe.com/checkout) by [Chris Wrench](https://github.com/cgwrench)
-* [:link:](stripe/stripe-node.d.ts) [stripe-node](https://github.com/stripe/stripe-node) by [William Johnston](https://github.com/wjohnsto)
+* [:link:](stripe/stripe-node.d.ts) [stripe-node](https://github.com/stripe/stripe-node) by [William Johnston](https://github.com/wjohnsto), [Peter Harris](https://github.com/codeanimal)
 * [:link:](strophe/strophe.d.ts) [Strophe.js](http://strophe.im/strophejs) by [David Deutsch](https://github.com/DavidKDeutsch)
 * [:link:](stylus/stylus.d.ts) [stylus](https://github.com/LearnBoost/stylus) by [Maxime LUCE](https://github.com/SomaticIT)
 * [:link:](sugar/sugar.d.ts) [Sugar](http://sugarjs.com) by [Josh Baldwin](https://github.com/jbaldwin)
@@ -1637,6 +1697,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](text-buffer/text-buffer.d.ts) [text-buffer](https://github.com/atom/text-buffer) by [vvakame](https://github.com/vvakame)
 * [:link:](text-encoding/text-encoding.d.ts) [text-encoding](https://github.com/inexorabletash/text-encoding) by [MIZUNE Pine](https://github.com/pine613)
 * [:link:](facebook-js-sdk/facebook-js-sdk.d.ts) [the Facebook Javascript SDK](https://developers.facebook.com/docs/javascript) by [Amrit Kahlon](https://github.com/amritk)
+* [:link:](facebook-pixel/facebook-pixel.d.ts) [the Facebook Pixel Tag API](https://developers.facebook.com/docs/ads-for-websites/tag-api) by [Noctis Hsu](https://github.com/noctishsu)
 * [:link:](spotify-api/spotify-api.d.ts) [The Spotify Web API](https://developer.spotify.com/web-api) by [Niels Kristian Hansen Skovmand](https://github.com/skovmand)
 * [:link:](threejs/three-FirstPersonControls.d.ts) [three.js](http://mrdoob.github.com/three.js) by [Poul Kjeldager Sørensen](https://github.com/s093294)
 * [:link:](threejs/three-canvasrenderer.d.ts) [three.js (CanvasRenderer.js)](https://github.com/mrdoob/three.js/blob/master/examples/js/renderers/CanvasRenderer.js) by [Satoru Kimura](https://github.com/gyohk)
@@ -1655,7 +1716,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](threejs/three-transformcontrols.d.ts) [three.js (TransformControls.js)](https://github.com/mrdoob/three.js/blob/master/examples/js/controls/TransformControls.js) by [Stefan Profanter](https://github.com/Pro)
 * [:link:](threejs/three-vrcontrols.d.ts) [three.js (VRControls.js)](https://github.com/mrdoob/three.js/blob/master/examples/js/controls/VRControls.js) by [Toshiya Nakakura](https://github.com/nakakura)
 * [:link:](threejs/three-vreffect.d.ts) [three.js (VREffect.js)](https://github.com/mrdoob/three.js/blob/master/examples/js/effects/VREffect.js) by [Toshiya Nakakura](https://github.com/nakakura)
-* [:link:](threejs/three.d.ts) [three.js r73](http://mrdoob.github.com/three.js) by [Kon](http://phyzkit.net), [Satoru Kimura](https://github.com/gyohk)
+* [:link:](threejs/three.d.ts) [three.js r75](http://mrdoob.github.com/three.js) by [Kon](http://phyzkit.net), [Satoru Kimura](https://github.com/gyohk), [Florent Poujol](https://github.com/florentpoujol), [SereznoKot](https://github.com/SereznoKot)
 * [:link:](thrift/thrift.d.ts) [thrift](https://www.npmjs.com/package/thrift) by [Zachary Collins](https://github.com/corps)
 * [:link:](through/through.d.ts) [through](https://github.com/dominictarr/through) by [Andrew Gaspar](https://github.com/AndrewGaspar)
 * [:link:](through2/through2.d.ts) [through2 v](https://github.com/rvagg/through2) by [Bart van der Schoor](https://github.com/Bartvds), [jedmao](https://github.com/jedmao), [Georgios Valotasios](https://github.com/valotas)
@@ -1684,14 +1745,15 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](twig/twig.d.ts) [twig](https://github.com/justjohn/twig.js) by [Carlos Ballesteros Velasco](https://github.com/soywiz)
 * [:link:](twitter/twitter.d.ts) [Twitter for Websites](https://dev.twitter.com/web) by [Chitoku](https://github.com/chitoku-k)
 * [:link:](jquery.bootstrap.wizard/jquery.bootstrap.wizard.d.ts) [twitter-bootstrap-wizard](https://github.com/VinceG/twitter-bootstrap-wizard) by [Blake Niemyjski](https://github.com/niemyjski)
+* [:link:](twitter-text/twitter-text.d.ts) [twitter-text](https://github.com/twitter/twitter-text) by [rhysd](https://rhysd.github.io)
 * [:link:](twix/twix.d.ts) [twix.js](https://github.com/icambron/twix.js) by [j3ko](https://github.com/j3ko)
 * [:link:](type-check/type-check.d.ts) [type-check](https://github.com/gkz/type-check) by [Hans Windhoff](https://github.com/hansrwindhoff)
 * [:link:](type-detect/type-detect.d.ts) [type-detect](https://github.com/chaijs/type-detect) by [Bart van der Schoor](https://github.com/Bartvds)
 * [:link:](type-name/type-name.d.ts) [type-name](https://github.com/twada/type-name) by [OKUNOKENTARO](https://github.com/armorik83)
 * [:link:](typeahead/typeahead.d.ts) [typeahead.js](http://twitter.github.io/typeahead.js) by [Ivaylo Gochkov](https://github.com/igochkov), [Gidon Junge](https://github.com/gjunge)
 * [:link:](webfontloader/webfontloader.d.ts) [typekit-webfontloader](https://github.com/typekit/webfontloader) by [doskallemaskin](https://github.com/doskallemaskin)
-* [:link:](typescript/typescript.d.ts) [TypeScript API](http://www.typescriptlang.org) by [Microsoft TypeScript](http://typescriptlang.org)
 * [:link:](typescript-services/typescriptServices.d.ts) [TypeScript API](http://www.typescriptlang.org) by [Microsoft TypeScript](http://typescriptlang.org)
+* [:link:](typescript/typescript.d.ts) [TypeScript API](http://www.typescriptlang.org) by [Microsoft TypeScript](http://typescriptlang.org)
 * [:link:](typescript-deferred/typescript-deferred.d.ts) [typescript-deferred](https://github.com/DirtyHairy/typescript-deferred) by [Christian Speckner](https://github.com/DirtyHairy)
 * [:link:](meteor-persistent-session/meteor-persistent-session.d.ts) [u2622:persistent-session](https://github.com/okgrow/meteor-persistent-session) by [Robbie Van Gorkom](https://github.com/vangorra)
 * [:link:](ua-parser-js/ua-parser-js.d.ts) [ua-parser-js](https://github.com/faisalman/ua-parser-js) by [Viktor Miroshnikov](https://github.com/superduper), [Lucas Woo](https://github.com/legendecas)
@@ -1701,8 +1763,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](ui-router-extras/ui-router-extras.d.ts) [UI-Router Extras (ct.ui.router.extras module)](https://github.com/christopherthielen/ui-router-extras) by [Michael Putters](https://github.com/mputters), [Marcel van de Kamp](https://github.com/marcel-k)
 * [:link:](ui-select/ui-select.d.ts) [ui-select](https://github.com/angular-ui/ui-select) by [Niko Kovačič](https://github.com/nkovacic)
 * [:link:](uikit/uikit.d.ts) [uikit](http://getuikit.org) by [Giovanni Silva](https://github.com/giovannicandido)
-* [:link:](umbraco/umbraco-services.d.ts) [Umbraco](https://github.com/umbraco) by [DeCareSystemsIreland](https://github.com/DeCareSystemsIreland)
 * [:link:](umbraco/umbraco-resources.d.ts) [Umbraco](https://github.com/umbraco) by [DeCareSystemsIreland](https://github.com/DeCareSystemsIreland)
+* [:link:](umbraco/umbraco-services.d.ts) [Umbraco](https://github.com/umbraco) by [DeCareSystemsIreland](https://github.com/DeCareSystemsIreland)
 * [:link:](umbraco/umbraco.d.ts) [Umbraco](https://github.com/umbraco) by [DeCareSystemsIreland](https://github.com/DeCareSystemsIreland)
 * [:link:](umzug/umzug.d.ts) [Umzug](https://github.com/sequelize/umzug) by [Ivan Drinchev](https://github.com/drinchev)
 * [:link:](underscore/underscore.d.ts) [Underscore](http://underscorejs.org) by [Boris Yankov](https://github.com/borisyankov), [Josh Baldwin](https://github.com/jbaldwin), [Christopher Currens](https://github.com/ccurrens)
@@ -1727,6 +1789,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](usage/usage.d.ts) [usage](https://github.com/arunoda/node-usage) by [Pascal Vomhoff](https://github.com/pvomhoff)
 * [:link:](username/username.d.ts) [username](https://www.npmjs.com/package/username) by [Klaus Reimer](https://github.com/kayahr)
 * [:link:](utils-merge/utils-merge.d.ts) [utils-merge](https://github.com/jaredhanson/utils-merge) by [Ilya Mochalov](https://github.com/chrootsu)
+* [:link:](uuid-1345/uuid-1345.d.ts) [uuid-1345](https://github.com/scravy/uuid-1345) by [TANAKA Koichi](https://github.com/mugeso)
 * [:link:](uuid/UUID.d.ts) [UUID.js](https://github.com/LiosK/UUID.js) by [Jason Jarrett](https://github.com/staxmanade)
 * [:link:](valerie/valerie.d.ts) [valerie](https://github.com/davewatts/valerie) by [Howard Richards](https://github.com/conficient)
 * [:link:](validator/validator.d.ts) [validator.js](https://github.com/chriso/validator.js) by [tgfjt](https://github.com/tgfjt), [Ilya Mochalov](https://github.com/chrootsu)
@@ -1753,6 +1816,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](vue/vue.d.ts) [vuejs](https://github.com/vuejs/vue) by [odangosan](https://github.com/odangosan), [kaorun343](https://github.com/kaorun343)
 * [:link:](w2ui/w2ui.d.ts) [w2ui](http://w2ui.com) by [Valentin Robert](https://github.com/Ptival)
 * [:link:](wake_on_lan/wake_on_lan.d.ts) [wake_on_lan](https://github.com/agnat/node_wake_on_lan) by [Tobias Kahlert](https://github.com/SrTobi)
+* [:link:](wampy/wampy.d.ts) [wampy.js](https://github.com/KSDaemon/wampy.js) by [Konstantin Burkalev](https://github.com/KSDaemon)
 * [:link:](watch/watch.d.ts) [watch](https://github.com/mikeal/watch) by [Carlos Ballesteros Velasco](https://github.com/soywiz)
 * [:link:](jquery.watermark/jquery.watermark.d.ts) [Watermark plugin for jQuery](http://jquery-watermark.googlecode.com) by [Anwar Javed](https://github.com/anwarjaved)
 * [:link:](webaudioapi/waa.d.ts) [Web Audio API](http://www.w3.org/TR/webaudio) by [Baruch Berger](https://github.com/bbss), [Kon](http://phyzkit.net), [kubosho](https://github.com/kubosho)
@@ -1775,6 +1839,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](when/when.d.ts) [When](https://github.com/cujojs/when) by [Derek Cicerone](https://github.com/derekcicerone), [Wim Looman](https://github.com/Nemo157)
 * [:link:](which/which.d.ts) [which](https://github.com/isaacs/node-which) by [vvakame](https://github.com/vvakame)
 * [:link:](jquery.window/jquery.window.d.ts) [Window plugin for jQuery](http://fstoke.me/jquery/window) by [Ryan Graham](https://github.com/ryan-codingintrigue)
+* [:link:](windows-1251/windows-1251.d.ts) [windows-1251](https://github.com/mathiasbynens/windows-1251) by [RomanGolovanov](https://github.com/RomanGolovanov)
 * [:link:](windows-service/windows-service.d.ts) [windows-service](https://bitbucket.org/stephenwvickers/node-windows-service) by [Rogier Schouten](https://github.com/rogierschouten)
 * [:link:](winjs/winjs.d.ts) [WinJS](http://try.buildwinjs.com) by [TypeScript samples](https://www.typescriptlang.org), [Adam Hewitt](https://github.com/adamhewitt627), [Craig Treasure](https://github.com/craigktreasure), [Jeff Fisher](https://github.com/xirzec)
 * [:link:](winreg/winreg.d.ts) [Winreg](https://github.com/fresc81/node-winreg) by [RX14](https://github.com/RX14)
diff --git a/DataStream.js/DataStream.js-tests.ts b/DataStream.js/DataStream.js-tests.ts
index 71bb08537e..733809254b 100644
--- a/DataStream.js/DataStream.js-tests.ts
+++ b/DataStream.js/DataStream.js-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="DataStream.js.d.ts" />
+
 
 var buf = new ArrayBuffer(100);
 var ds = new DataStream(buf);
diff --git a/DataStream.js/DataStream.js.d.ts b/DataStream.js/index.d.ts
similarity index 100%
rename from DataStream.js/DataStream.js.d.ts
rename to DataStream.js/index.d.ts
diff --git a/DataStream.js/tsconfig.json b/DataStream.js/tsconfig.json
new file mode 100644
index 0000000000..33d822391f
--- /dev/null
+++ b/DataStream.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "DataStream.js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/FileSaver/FileSaver-tests.ts b/FileSaver/FileSaver-tests.ts
index 4cfae373e3..7495a85d8b 100644
--- a/FileSaver/FileSaver-tests.ts
+++ b/FileSaver/FileSaver-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="FileSaver.d.ts" />
+
 
 /**
  * @summary Test for "saveAs" function.
diff --git a/FileSaver/FileSaver.d.ts b/FileSaver/index.d.ts
similarity index 100%
rename from FileSaver/FileSaver.d.ts
rename to FileSaver/index.d.ts
diff --git a/FileSaver/tsconfig.json b/FileSaver/tsconfig.json
new file mode 100644
index 0000000000..c96374453b
--- /dev/null
+++ b/FileSaver/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "FileSaver-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/Finch/Finch-tests.ts b/Finch/Finch-tests.ts
index ec15bcb88e..5200d3be10 100644
--- a/Finch/Finch-tests.ts
+++ b/Finch/Finch-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="Finch.d.ts" />
+
 
 function test_Finch() {
 
diff --git a/Finch/Finch.d.ts b/Finch/index.d.ts
similarity index 100%
rename from Finch/Finch.d.ts
rename to Finch/index.d.ts
diff --git a/Finch/tsconfig.json b/Finch/tsconfig.json
new file mode 100644
index 0000000000..0d67632f25
--- /dev/null
+++ b/Finch/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "Finch-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/Headroom/headroom-tests.ts b/Headroom/headroom-tests.ts
index e0e83449eb..292406b8ef 100644
--- a/Headroom/headroom-tests.ts
+++ b/Headroom/headroom-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="headroom.d.ts" />
+
 
 new Headroom(document.getElementById('siteHead'));
 
diff --git a/Headroom/headroom.d.ts b/Headroom/index.d.ts
similarity index 100%
rename from Headroom/headroom.d.ts
rename to Headroom/index.d.ts
diff --git a/Headroom/tsconfig.json b/Headroom/tsconfig.json
new file mode 100644
index 0000000000..7513e87fe9
--- /dev/null
+++ b/Headroom/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "Headroom-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/HubSpot-pace/HubSpot-pace-tests.ts b/HubSpot-pace/HubSpot-pace-tests.ts
index 1c1daa2a68..034a1e4cc9 100644
--- a/HubSpot-pace/HubSpot-pace-tests.ts
+++ b/HubSpot-pace/HubSpot-pace-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="HubSpot-pace.d.ts" />
+
 
 pace.start({
     document: false
diff --git a/HubSpot-pace/HubSpot-pace.d.ts b/HubSpot-pace/index.d.ts
similarity index 100%
rename from HubSpot-pace/HubSpot-pace.d.ts
rename to HubSpot-pace/index.d.ts
diff --git a/HubSpot-pace/tsconfig.json b/HubSpot-pace/tsconfig.json
new file mode 100644
index 0000000000..2df41bdaf7
--- /dev/null
+++ b/HubSpot-pace/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "HubSpot-pace-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/JSONStream/JSONStream-tests.ts b/JSONStream/JSONStream-tests.ts
index ea7eb64ff9..00884c8857 100644
--- a/JSONStream/JSONStream-tests.ts
+++ b/JSONStream/JSONStream-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="JSONStream.d.ts" />
 
 import json = require('JSONStream');
 
diff --git a/JSONStream/JSONStream.d.ts b/JSONStream/JSONStream.d.ts
deleted file mode 100644
index 029e5b8e9c..0000000000
--- a/JSONStream/JSONStream.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// Type definitions for JSONStream v0.8.0
-// Project: http://github.com/dominictarr/JSONStream
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'JSONStream' {
-
-	export interface Options {
-		recurse: boolean;
-	}
-
-	export function parse(pattern: any): NodeJS.ReadWriteStream;
-	export function parse(patterns: any[]): NodeJS.ReadWriteStream;
-
-	export function stringify(): NodeJS.ReadWriteStream;
-	export function stringify(open: string, sep: string, close: string): NodeJS.ReadWriteStream;
-
-	export function stringifyObject(): NodeJS.ReadWriteStream;
-	export function stringifyObject(open: string, sep: string, close: string): NodeJS.ReadWriteStream;
-}
diff --git a/JSONStream/index.d.ts b/JSONStream/index.d.ts
new file mode 100644
index 0000000000..f405e284ba
--- /dev/null
+++ b/JSONStream/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for JSONStream v0.8.0
+// Project: http://github.com/dominictarr/JSONStream
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+export interface Options {
+    recurse: boolean;
+}
+
+export declare function parse(pattern: any): NodeJS.ReadWriteStream;
+export declare function parse(patterns: any[]): NodeJS.ReadWriteStream;
+
+export declare function stringify(): NodeJS.ReadWriteStream;
+export declare function stringify(open: string, sep: string, close: string): NodeJS.ReadWriteStream;
+
+export declare function stringifyObject(): NodeJS.ReadWriteStream;
+export declare function stringifyObject(open: string, sep: string, close: string): NodeJS.ReadWriteStream;
diff --git a/JSONStream/tsconfig.json b/JSONStream/tsconfig.json
new file mode 100644
index 0000000000..3509029bd0
--- /dev/null
+++ b/JSONStream/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "JSONStream-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/OpenJsCad/index.d.ts b/OpenJsCad/index.d.ts
new file mode 100644
index 0000000000..c6cae5d5cc
--- /dev/null
+++ b/OpenJsCad/index.d.ts
@@ -0,0 +1,917 @@
+// Type definitions for OpenJsCad.js
+// Project: https://github.com/joostn/OpenJsCad
+// Definitions by: Dan Marshall <https://github.com/danmarshall>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="three" />
+
+declare namespace THREE {
+    var CSG: {
+        fromCSG: (csg: CSG, defaultColor: any) => {
+            colorMesh: Mesh;
+            wireframe: Mesh;
+            boundLen: number;
+        };
+        getGeometryVertex: (geometry: any, vertex_position: any) => number;
+    };
+    /*
+    function OrbitControls(object: any, domElement: any): void;
+    function SpriteCanvasMaterial(parameters?: any): void;
+    */
+    interface ICanvasRendererOptions {
+        canvas?: HTMLCanvasElement;
+        alpha?: boolean;
+    }
+    /*
+    class CanvasRenderer implements Renderer {
+        domElement: HTMLCanvasElement;
+        private pixelRatio;
+        private autoClear;
+        private sortObjects;
+        private sortElements;
+        private info;
+        private _projector;
+        private _renderData;
+        private _elements;
+        private _lights;
+        private _canvas;
+        private _canvasWidth;
+        private _canvasHeight;
+        private _canvasWidthHalf;
+        private _canvasHeightHalf;
+        private _viewportX;
+        private _viewportY;
+        private _viewportWidth;
+        private _viewportHeight;
+        private _context;
+        private _clearColor;
+        private _clearAlpha;
+        private _contextGlobalAlpha;
+        private _contextGlobalCompositeOperation;
+        private _contextStrokeStyle;
+        private _camera;
+        private _contextFillStyle;
+        private _contextLineWidth;
+        private _contextLineCap;
+        private _contextLineJoin;
+        private _contextLineDash;
+        private _v1;
+        private _v2;
+        private _v3;
+        private _v4;
+        private _v5;
+        private _v6;
+        private _v1x;
+        private _v1y;
+        private _v2x;
+        private _v2y;
+        private _v3x;
+        private _v3y;
+        private _v4x;
+        private _v4y;
+        private _v5x;
+        private _v5y;
+        private _v6x;
+        private _v6y;
+        private _color;
+        private _color1;
+        private _color2;
+        private _color3;
+        private _color4;
+        private _diffuseColor;
+        private _emissiveColor;
+        private _lightColor;
+        private _patterns;
+        private _image;
+        private _uvs;
+        private _uv1x;
+        private _uv1y;
+        private _uv2x;
+        private _uv2y;
+        private _uv3x;
+        private _uv3y;
+        private _clipBox;
+        private _clearBox;
+        private _elemBox;
+        private _ambientLight;
+        private _directionalLights;
+        private _pointLights;
+        private _vector3;
+        private _centroid;
+        private _normal;
+        private _normalViewMatrix;
+        constructor(parameters: ICanvasRendererOptions);
+        supportsVertexTextures(): void;
+        setFaceCulling: () => void;
+        getPixelRatio(): number;
+        setPixelRatio(value: any): void;
+        setSize(width: any, height: any, updateStyle: any): void;
+        setViewport(x: any, y: any, width: any, height: any): void;
+        setScissor(): void;
+        enableScissorTest(): void;
+        setClearColor(color: any, alpha: any): void;
+        setClearColorHex(hex: any, alpha: any): void;
+        getClearColor(): Color;
+        getClearAlpha(): number;
+        getMaxAnisotropy(): number;
+        clear(): void;
+        clearColor(): void;
+        clearDepth(): void;
+        clearStencil(): void;
+        render(scene: Scene, camera: Camera, renderTarget?: RenderTarget, forceClear?: boolean): void;
+        calculateLights(): void;
+        calculateLight(position: any, normal: any, color: any): void;
+        renderSprite(v1: any, element: any, material: any): void;
+        renderLine(v1: any, v2: any, element: any, material: any): void;
+        renderFace3(v1: any, v2: any, v3: any, uv1: any, uv2: any, uv3: any, element: any, material: any): void;
+        drawTriangle(x0: any, y0: any, x1: any, y1: any, x2: any, y2: any): void;
+        strokePath(color: any, linewidth: any, linecap: any, linejoin: any): void;
+        fillPath(color: any): void;
+        onTextureUpdate(event: any): void;
+        textureToPattern(texture: any): void;
+        patternPath(x0: any, y0: any, x1: any, y1: any, x2: any, y2: any, u0: any, v0: any, u1: any, v1: any, u2: any, v2: any, texture: any): void;
+        clipImage(x0: any, y0: any, x1: any, y1: any, x2: any, y2: any, u0: any, v0: any, u1: any, v1: any, u2: any, v2: any, image: any): void;
+        expand(v1: any, v2: any, pixels: any): void;
+        setOpacity(value: any): void;
+        setBlending(value: any): void;
+        setLineWidth(value: any): void;
+        setLineCap(value: any): void;
+        setLineJoin(value: any): void;
+        setStrokeStyle(value: any): void;
+        setFillStyle(value: any): void;
+        setLineDash(value: any): void;
+    }
+    function RenderableObject(): void;
+    function RenderableFace(): void;
+    function RenderableVertex(): void;
+    function RenderableLine(): void;
+    function RenderableSprite(): void;
+    function Projector(): void;
+    */
+}
+declare namespace OpenJsCad {
+    interface ILog {
+        (x: string): void;
+        prevLogTime?: number;
+    }
+    var log: ILog;
+    interface IViewerOptions {
+        drawLines?: boolean;
+        drawFaces?: boolean;
+        color?: number[];
+        bgColor?: number;
+        noWebGL?: boolean;
+    }
+    interface ProcessorOptions extends IViewerOptions {
+        verbose?: boolean;
+        viewerwidth?: number;
+        viewerheight?: number;
+        viewerheightratio?: number;
+    }
+    class Viewer {
+        private perspective;
+        private drawOptions;
+        private size;
+        private defaultColor_;
+        private bgColor_;
+        private containerElm_;
+        private scene_;
+        private camera_;
+        private controls_;
+        private renderer_;
+        private canvas;
+        private pauseRender_;
+        private requestID_;
+        constructor(containerElm: any, size: any, options: IViewerOptions);
+        createScene(drawAxes: any, axLen: any): void;
+        createCamera(): void;
+        createControls(canvas: any): void;
+        webGLAvailable(): boolean;
+        createRenderer(bool_noWebGL: any): void;
+        render(): void;
+        animate(): void;
+        cancelAnimate(): void;
+        refreshRenderer(bool_noWebGL: any): void;
+        drawAxes(axLen: any): void;
+        setCsg(csg: any, resetZoom: any): void;
+        applyDrawOptions(): void;
+        clear(): void;
+        getUserMeshes(str?: any): THREE.Object3D[];
+        resetZoom(r: any): void;
+        parseSizeParams(): void;
+        handleResize(): void;
+    }
+    function makeAbsoluteUrl(url: any, baseurl: any): any;
+    function isChrome(): boolean;
+    function runMainInWorker(mainParameters: any): void;
+    function expandResultObjectArray(result: any): any;
+    function checkResult(result: any): void;
+    function resultToCompactBinary(resultin: any): any;
+    function resultFromCompactBinary(resultin: any): any;
+    function parseJsCadScriptSync(script: any, mainParameters: any, debugging: any): any;
+    function parseJsCadScriptASync(script: any, mainParameters: any, options: any, callback: any): Worker;
+    function getWindowURL(): URL;
+    function textToBlobUrl(txt: any): string;
+    function revokeBlobUrl(url: any): void;
+    function FileSystemApiErrorHandler(fileError: any, operation: any): void;
+    function AlertUserOfUncaughtExceptions(): void;
+    function getParamDefinitions(script: any): any[];
+    interface EventHandler {
+        (ev?: Event): any;
+    }
+    /**
+     * options parameter:
+     * - drawLines: display wireframe lines
+     * - drawFaces: display surfaces
+     * - bgColor: canvas background color
+     * - color: object color
+     * - viewerwidth, viewerheight: set rendering size. Works with any css unit.
+     *     viewerheight can also be specified as a ratio to width, ie number e (0, 1]
+     * - noWebGL: force render without webGL
+     * - verbose: show additional info (currently only time used for rendering)
+     */
+    interface ViewerSize {
+        widthDefault: string;
+        heightDefault: string;
+        width: number;
+        height: number;
+        heightratio: number;
+    }
+    class Processor {
+        private containerdiv;
+        private options;
+        private onchange;
+        private static widthDefault;
+        private static heightDefault;
+        private viewerdiv;
+        private viewer;
+        private viewerSize;
+        private processing;
+        private currentObject;
+        private hasValidCurrentObject;
+        private hasOutputFile;
+        private worker;
+        private paramDefinitions;
+        private paramControls;
+        private script;
+        private hasError;
+        private debugging;
+        private errordiv;
+        private errorpre;
+        private statusdiv;
+        private controldiv;
+        private statusspan;
+        private statusbuttons;
+        private abortbutton;
+        private renderedElementDropdown;
+        private formatDropdown;
+        private generateOutputFileButton;
+        private downloadOutputFileLink;
+        private parametersdiv;
+        private parameterstable;
+        private currentFormat;
+        private filename;
+        private currentObjects;
+        private currentObjectIndex;
+        private isFirstRender_;
+        private outputFileDirEntry;
+        private outputFileBlobUrl;
+        constructor(containerdiv: HTMLDivElement, options?: ProcessorOptions, onchange?: EventHandler);
+        static convertToSolid(obj: any): any;
+        cleanOption(option: any, deflt: any): any;
+        toggleDrawOption(str: any): boolean;
+        setDrawOption(str: any, bool: any): void;
+        handleResize(): void;
+        createElements(): void;
+        getFilenameForRenderedObject(): string;
+        setRenderedObjects(obj: any): void;
+        setSelectedObjectIndex(index: number): void;
+        selectedFormat(): any;
+        selectedFormatInfo(): any;
+        updateDownloadLink(): void;
+        clearViewer(): void;
+        abort(): void;
+        enableItems(): void;
+        setOpenJsCadPath(path: string): void;
+        addLibrary(lib: any): void;
+        setError(txt: string): void;
+        setDebugging(debugging: boolean): void;
+        setJsCad(script: string, filename?: string): void;
+        getParamValues(): {};
+        rebuildSolid(): void;
+        hasSolid(): boolean;
+        isProcessing(): boolean;
+        clearOutputFile(): void;
+        generateOutputFile(): void;
+        currentObjectToBlob(): any;
+        supportedFormatsForCurrentObject(): string[];
+        formatInfo(format: any): any;
+        downloadLinkTextForCurrentObject(): string;
+        generateOutputFileBlobUrl(): void;
+        generateOutputFileFileSystem(): void;
+        createParamControls(): void;
+    }
+}
+interface Window {
+    Worker: Worker;
+//    URL: URL;
+    webkitURL: URL;
+    requestFileSystem: any;
+    webkitRequestFileSystem: any;
+}
+interface IAMFStringOptions {
+    unit: string;
+}
+declare class CxG {
+    toStlString(): string;
+    toStlBinary(): void;
+    toAMFString(AMFStringOptions?: IAMFStringOptions): void;
+    getBounds(): CxG[];
+    transform(matrix4x4: CSG.Matrix4x4): CxG;
+    mirrored(plane: CSG.Plane): CxG;
+    mirroredX(): CxG;
+    mirroredY(): CxG;
+    mirroredZ(): CxG;
+    translate(v: number[]): CxG;
+    translate(v: CSG.Vector3D): CxG;
+    scale(f: CSG.Vector3D): CxG;
+    rotateX(deg: number): CxG;
+    rotateY(deg: number): CxG;
+    rotateZ(deg: number): CxG;
+    rotate(rotationCenter: CSG.Vector3D, rotationAxis: CSG.Vector3D, degrees: number): CxG;
+    rotateEulerAngles(alpha: number, beta: number, gamma: number, position: number[]): CxG;
+}
+interface ICenter {
+    center(cAxes: string[]): CxG;
+}
+declare class CSG extends CxG implements ICenter {
+    polygons: CSG.Polygon[];
+    properties: CSG.Properties;
+    isCanonicalized: boolean;
+    isRetesselated: boolean;
+    cachedBoundingBox: CSG.Vector3D[];
+    static defaultResolution2D: number;
+    static defaultResolution3D: number;
+    static fromPolygons(polygons: CSG.Polygon[]): CSG;
+    static fromSlices(options: any): CSG;
+    static fromObject(obj: any): CSG;
+    static fromCompactBinary(bin: any): CSG;
+    toPolygons(): CSG.Polygon[];
+    union(csg: CSG[]): CSG;
+    union(csg: CSG): CSG;
+    unionSub(csg: CSG, retesselate?: boolean, canonicalize?: boolean): CSG;
+    unionForNonIntersecting(csg: CSG): CSG;
+    subtract(csg: CSG[]): CSG;
+    subtract(csg: CSG): CSG;
+    subtractSub(csg: CSG, retesselate: boolean, canonicalize: boolean): CSG;
+    intersect(csg: CSG[]): CSG;
+    intersect(csg: CSG): CSG;
+    intersectSub(csg: CSG, retesselate?: boolean, canonicalize?: boolean): CSG;
+    invert(): CSG;
+    transform1(matrix4x4: CSG.Matrix4x4): CSG;
+    transform(matrix4x4: CSG.Matrix4x4): CSG;
+    toString(): string;
+    expand(radius: number, resolution: number): CSG;
+    contract(radius: number, resolution: number): CSG;
+    stretchAtPlane(normal: number[], point: number[], length: number): CSG;
+    expandedShell(radius: number, resolution: number, unionWithThis: boolean): CSG;
+    canonicalized(): CSG;
+    reTesselated(): CSG;
+    getBounds(): CSG.Vector3D[];
+    mayOverlap(csg: CSG): boolean;
+    cutByPlane(plane: CSG.Plane): CSG;
+    connectTo(myConnector: CSG.Connector, otherConnector: CSG.Connector, mirror: boolean, normalrotation: number): CSG;
+    setShared(shared: CSG.Polygon.Shared): CSG;
+    setColor(args: any): CSG;
+    toCompactBinary(): {
+        "class": string;
+        numPolygons: number;
+        numVerticesPerPolygon: Uint32Array;
+        polygonPlaneIndexes: Uint32Array;
+        polygonSharedIndexes: Uint32Array;
+        polygonVertices: Uint32Array;
+        vertexData: Float64Array;
+        planeData: Float64Array;
+        shared: CSG.Polygon.Shared[];
+    };
+    toPointCloud(cuberadius: any): CSG;
+    getTransformationAndInverseTransformationToFlatLying(): any;
+    getTransformationToFlatLying(): any;
+    lieFlat(): CSG;
+    projectToOrthoNormalBasis(orthobasis: CSG.OrthoNormalBasis): CAG;
+    sectionCut(orthobasis: CSG.OrthoNormalBasis): CAG;
+    fixTJunctions(): CSG;
+    toTriangles(): any[];
+    getFeatures(features: any): any;
+    center(cAxes: string[]): CxG;
+    toX3D(): Blob;
+    toStlBinary(): Blob;
+    toStlString(): string;
+    toAMFString(m: IAMFStringOptions): Blob;
+}
+declare namespace CSG {
+    function fnNumberSort(a: any, b: any): number;
+    function parseOption(options: any, optionname: any, defaultvalue: any): any;
+    function parseOptionAs3DVector(options: any, optionname: any, defaultvalue: any): Vector3D;
+    function parseOptionAs3DVectorList(options: any, optionname: any, defaultvalue: any): any;
+    function parseOptionAs2DVector(options: any, optionname: any, defaultvalue: any): any;
+    function parseOptionAsFloat(options: any, optionname: any, defaultvalue: any): any;
+    function parseOptionAsInt(options: any, optionname: any, defaultvalue: any): any;
+    function parseOptionAsBool(options: any, optionname: any, defaultvalue: any): any;
+    function cube(options: any): CSG;
+    function sphere(options: any): CSG;
+    function cylinder(options: any): CSG;
+    function roundedCylinder(options: any): CSG;
+    function roundedCube(options: any): CSG;
+    /**
+     * polyhedron accepts openscad style arguments. I.e. define face vertices clockwise looking from outside
+     */
+    function polyhedron(options: any): CSG;
+    function IsFloat(n: any): boolean;
+    function solve2Linear(a: any, b: any, c: any, d: any, u: any, v: any): number[];
+    class Vector3D extends CxG {
+        x: number;
+        y: number;
+        z: number;
+        constructor(v3: Vector3D);
+        constructor(v2: Vector2D);
+        constructor(v2: number[]);
+        constructor(x: number, y: number);
+        constructor(x: number, y: number, z: number);
+        static Create(x: number, y: number, z: number): Vector3D;
+        clone(): Vector3D;
+        negated(): Vector3D;
+        abs(): Vector3D;
+        plus(a: Vector3D): Vector3D;
+        minus(a: Vector3D): Vector3D;
+        times(a: number): Vector3D;
+        dividedBy(a: number): Vector3D;
+        dot(a: Vector3D): number;
+        lerp(a: Vector3D, t: number): Vector3D;
+        lengthSquared(): number;
+        length(): number;
+        unit(): Vector3D;
+        cross(a: Vector3D): Vector3D;
+        distanceTo(a: Vector3D): number;
+        distanceToSquared(a: Vector3D): number;
+        equals(a: Vector3D): boolean;
+        multiply4x4(matrix4x4: Matrix4x4): Vector3D;
+        transform(matrix4x4: Matrix4x4): Vector3D;
+        toString(): string;
+        randomNonParallelVector(): Vector3D;
+        min(p: Vector3D): Vector3D;
+        max(p: Vector3D): Vector3D;
+        toStlString(): string;
+        toAMFString(): string;
+    }
+    class Vertex extends CxG {
+        pos: Vector3D;
+        tag: number;
+        constructor(pos: Vector3D);
+        static fromObject(obj: any): Vertex;
+        flipped(): Vertex;
+        getTag(): number;
+        interpolate(other: Vertex, t: number): Vertex;
+        transform(matrix4x4: Matrix4x4): Vertex;
+        toString(): string;
+        toStlString(): string;
+        toAMFString(): string;
+    }
+    class Plane extends CxG {
+        normal: Vector3D;
+        w: number;
+        tag: number;
+        constructor(normal: Vector3D, w: number);
+        static fromObject(obj: any): Plane;
+        static EPSILON: number;
+        static fromVector3Ds(a: Vector3D, b: Vector3D, c: Vector3D): Plane;
+        static anyPlaneFromVector3Ds(a: Vector3D, b: Vector3D, c: Vector3D): Plane;
+        static fromPoints(a: Vector3D, b: Vector3D, c: Vector3D): Plane;
+        static fromNormalAndPoint(normal: Vector3D, point: Vector3D): Plane;
+        static fromNormalAndPoint(normal: number[], point: number[]): Plane;
+        flipped(): Plane;
+        getTag(): number;
+        equals(n: Plane): boolean;
+        transform(matrix4x4: Matrix4x4): Plane;
+        splitPolygon(polygon: Polygon): {
+            type: any;
+            front: any;
+            back: any;
+        };
+        splitLineBetweenPoints(p1: Vector3D, p2: Vector3D): Vector3D;
+        intersectWithLine(line3d: Line3D): Vector3D;
+        intersectWithPlane(plane: Plane): Line3D;
+        signedDistanceToPoint(point: Vector3D): number;
+        toString(): string;
+        mirrorPoint(point3d: Vector3D): Vector3D;
+    }
+    class Polygon extends CxG {
+        vertices: Vertex[];
+        shared: Polygon.Shared;
+        plane: Plane;
+        cachedBoundingSphere: any;
+        cachedBoundingBox: Vector3D[];
+        static defaultShared: CSG.Polygon.Shared;
+        constructor(vertices: Vector3D, shared?: Polygon.Shared, plane?: Plane);
+        constructor(vertices: Vertex[], shared?: Polygon.Shared, plane?: Plane);
+        static fromObject(obj: any): Polygon;
+        checkIfConvex(): void;
+        setColor(args: any): Polygon;
+        getSignedVolume(): number;
+        getArea(): number;
+        getTetraFeatures(features: any): any[];
+        extrude(offsetvector: any): CSG;
+        boundingSphere(): any;
+        boundingBox(): Vector3D[];
+        flipped(): Polygon;
+        transform(matrix4x4: Matrix4x4): Polygon;
+        toString(): string;
+        projectToOrthoNormalBasis(orthobasis: OrthoNormalBasis): CAG;
+        /**
+            * Creates solid from slices (CSG.Polygon) by generating walls
+            * @param {Object} options Solid generating options
+            *  - numslices {Number} Number of slices to be generated
+            *  - callback(t, slice) {Function} Callback function generating slices.
+            *          arguments: t = [0..1], slice = [0..numslices - 1]
+            *          return: CSG.Polygon or null to skip
+            *  - loop {Boolean} no flats, only walls, it's used to generate solids like a tor
+            */
+        solidFromSlices(options: any): CSG;
+        /**
+            *
+            * @param walls Array of wall polygons
+            * @param bottom Bottom polygon
+            * @param top Top polygon
+            */
+        private _addWalls(walls, bottom, top, bFlipped);
+        static verticesConvex(vertices: Vertex[], planenormal: any): boolean;
+        static createFromPoints(points: number[][], shared?: CSG.Polygon.Shared, plane?: Plane): Polygon;
+        static isConvexPoint(prevpoint: any, point: any, nextpoint: any, normal: any): boolean;
+        static isStrictlyConvexPoint(prevpoint: any, point: any, nextpoint: any, normal: any): boolean;
+        toStlString(): string;
+    }
+}
+declare namespace CSG.Polygon {
+    class Shared {
+        color: any;
+        tag: any;
+        constructor(color: any);
+        static fromObject(obj: any): Shared;
+        static fromColor(args: any): Shared;
+        getTag(): any;
+        getHash(): any;
+    }
+}
+declare namespace CSG {
+    class PolygonTreeNode {
+        parent: any;
+        children: any;
+        polygon: Polygon;
+        removed: boolean;
+        constructor();
+        addPolygons(polygons: any): void;
+        remove(): void;
+        isRemoved(): boolean;
+        isRootNode(): boolean;
+        invert(): void;
+        getPolygon(): Polygon;
+        getPolygons(result: Polygon[]): void;
+        splitByPlane(plane: any, coplanarfrontnodes: any, coplanarbacknodes: any, frontnodes: any, backnodes: any): void;
+        _splitByPlane(plane: any, coplanarfrontnodes: any, coplanarbacknodes: any, frontnodes: any, backnodes: any): void;
+        addChild(polygon: Polygon): PolygonTreeNode;
+        invertSub(): void;
+        recursivelyInvalidatePolygon(): void;
+    }
+    class Tree {
+        polygonTree: PolygonTreeNode;
+        rootnode: Node;
+        constructor(polygons: Polygon[]);
+        invert(): void;
+        clipTo(tree: Tree, alsoRemovecoplanarFront?: boolean): void;
+        allPolygons(): Polygon[];
+        addPolygons(polygons: Polygon[]): void;
+    }
+    class Node {
+        parent: Node;
+        plane: Plane;
+        front: any;
+        back: any;
+        polygontreenodes: PolygonTreeNode[];
+        constructor(parent: Node);
+        invert(): void;
+        clipPolygons(polygontreenodes: PolygonTreeNode[], alsoRemovecoplanarFront: boolean): void;
+        clipTo(tree: Tree, alsoRemovecoplanarFront: boolean): void;
+        addPolygonTreeNodes(polygontreenodes: PolygonTreeNode[]): void;
+        getParentPlaneNormals(normals: Vector3D[], maxdepth: number): void;
+    }
+    class Matrix4x4 {
+        elements: number[];
+        constructor(elements?: number[]);
+        plus(m: Matrix4x4): Matrix4x4;
+        minus(m: Matrix4x4): Matrix4x4;
+        multiply(m: Matrix4x4): Matrix4x4;
+        clone(): Matrix4x4;
+        rightMultiply1x3Vector(v: Vector3D): Vector3D;
+        leftMultiply1x3Vector(v: Vector3D): Vector3D;
+        rightMultiply1x2Vector(v: Vector2D): Vector2D;
+        leftMultiply1x2Vector(v: Vector2D): Vector2D;
+        isMirroring(): boolean;
+        static unity(): Matrix4x4;
+        static rotationX(degrees: number): Matrix4x4;
+        static rotationY(degrees: number): Matrix4x4;
+        static rotationZ(degrees: number): Matrix4x4;
+        static rotation(rotationCenter: CSG.Vector3D, rotationAxis: CSG.Vector3D, degrees: number): Matrix4x4;
+        static translation(v: number[]): Matrix4x4;
+        static translation(v: Vector3D): Matrix4x4;
+        static mirroring(plane: Plane): Matrix4x4;
+        static scaling(v: number[]): Matrix4x4;
+        static scaling(v: Vector3D): Matrix4x4;
+    }
+    class Vector2D extends CxG {
+        x: number;
+        y: number;
+        constructor(x: number, y: number);
+        constructor(x: number[]);
+        constructor(x: Vector2D);
+        static fromAngle(radians: number): Vector2D;
+        static fromAngleDegrees(degrees: number): Vector2D;
+        static fromAngleRadians(radians: number): Vector2D;
+        static Create(x: number, y: number): Vector2D;
+        toVector3D(z: number): Vector3D;
+        equals(a: Vector2D): boolean;
+        clone(): Vector2D;
+        negated(): Vector2D;
+        plus(a: Vector2D): Vector2D;
+        minus(a: Vector2D): Vector2D;
+        times(a: number): Vector2D;
+        dividedBy(a: number): Vector2D;
+        dot(a: Vector2D): number;
+        lerp(a: Vector2D, t: number): Vector2D;
+        length(): number;
+        distanceTo(a: Vector2D): number;
+        distanceToSquared(a: Vector2D): number;
+        lengthSquared(): number;
+        unit(): Vector2D;
+        cross(a: Vector2D): number;
+        normal(): Vector2D;
+        multiply4x4(matrix4x4: Matrix4x4): Vector2D;
+        transform(matrix4x4: Matrix4x4): Vector2D;
+        angle(): number;
+        angleDegrees(): number;
+        angleRadians(): number;
+        min(p: Vector2D): Vector2D;
+        max(p: Vector2D): Vector2D;
+        toString(): string;
+        abs(): Vector2D;
+    }
+    class Line2D extends CxG {
+        normal: Vector2D;
+        w: number;
+        constructor(normal: Vector2D, w: number);
+        static fromPoints(p1: Vector2D, p2: Vector2D): Line2D;
+        reverse(): Line2D;
+        equals(l: Line2D): boolean;
+        origin(): Vector2D;
+        direction(): Vector2D;
+        xAtY(y: number): number;
+        absDistanceToPoint(point: Vector2D): number;
+        intersectWithLine(line2d: Line2D): Vector2D;
+        transform(matrix4x4: Matrix4x4): Line2D;
+    }
+    class Line3D extends CxG {
+        point: Vector3D;
+        direction: Vector3D;
+        constructor(point: Vector3D, direction: Vector3D);
+        static fromPoints(p1: Vector3D, p2: Vector3D): Line3D;
+        static fromPlanes(p1: Plane, p2: Plane): Line3D;
+        intersectWithPlane(plane: Plane): Vector3D;
+        clone(): Line3D;
+        reverse(): Line3D;
+        transform(matrix4x4: Matrix4x4): Line3D;
+        closestPointOnLine(point: Vector3D): Vector3D;
+        distanceToPoint(point: Vector3D): number;
+        equals(line3d: Line3D): boolean;
+    }
+    class OrthoNormalBasis extends CxG {
+        v: Vector3D;
+        u: Vector3D;
+        plane: Plane;
+        planeorigin: Vector3D;
+        constructor(plane: Plane, rightvector?: Vector3D);
+        static GetCartesian(xaxisid: string, yaxisid: string): OrthoNormalBasis;
+        static Z0Plane(): OrthoNormalBasis;
+        getProjectionMatrix(): Matrix4x4;
+        getInverseProjectionMatrix(): Matrix4x4;
+        to2D(vec3: Vector3D): Vector2D;
+        to3D(vec2: Vector2D): Vector3D;
+        line3Dto2D(line3d: Line3D): Line2D;
+        line2Dto3D(line2d: Line2D): Line3D;
+        transform(matrix4x4: Matrix4x4): OrthoNormalBasis;
+    }
+    function interpolateBetween2DPointsForY(point1: Vector2D, point2: Vector2D, y: number): number;
+    function reTesselateCoplanarPolygons(sourcepolygons: CSG.Polygon[], destpolygons: CSG.Polygon[]): void;
+    class fuzzyFactory {
+        multiplier: number;
+        lookuptable: any;
+        constructor(numdimensions: number, tolerance: number);
+        lookupOrCreate(els: any, creatorCallback: any): any;
+    }
+    class fuzzyCSGFactory {
+        vertexfactory: fuzzyFactory;
+        planefactory: fuzzyFactory;
+        polygonsharedfactory: any;
+        constructor();
+        getPolygonShared(sourceshared: Polygon.Shared): Polygon.Shared;
+        getVertex(sourcevertex: Vertex): Vertex;
+        getPlane(sourceplane: Plane): Plane;
+        getPolygon(sourcepolygon: Polygon): Polygon;
+        getCSG(sourcecsg: CSG): CSG;
+    }
+    var staticTag: number;
+    function getTag(): number;
+    class Properties {
+        cube: Properties;
+        center: any;
+        facecenters: any[];
+        roundedCube: Properties;
+        cylinder: Properties;
+        start: any;
+        end: any;
+        facepointH: any;
+        facepointH90: any;
+        sphere: Properties;
+        facepoint: any;
+        roundedCylinder: any;
+        _transform(matrix4x4: Matrix4x4): Properties;
+        _merge(otherproperties: Properties): Properties;
+        static transformObj(source: any, result: any, matrix4x4: Matrix4x4): void;
+        static cloneObj(source: any, result: any): void;
+        static addFrom(result: any, otherproperties: Properties): void;
+    }
+    class Connector extends CxG {
+        point: Vector3D;
+        axisvector: Vector3D;
+        normalvector: Vector3D;
+        constructor(point: number[], axisvector: Vector3D, normalvector: number[]);
+        constructor(point: number[], axisvector: number[], normalvector: number[]);
+        constructor(point: number[], axisvector: number[], normalvector: Vector3D);
+        constructor(point: Vector3D, axisvector: number[], normalvector: Vector3D);
+        constructor(point: Vector3D, axisvector: number[], normalvector: number[]);
+        constructor(point: Vector3D, axisvector: Vector3D, normalvector: Vector3D);
+        normalized(): Connector;
+        transform(matrix4x4: Matrix4x4): Connector;
+        getTransformationTo(other: Connector, mirror: boolean, normalrotation: number): Matrix4x4;
+        axisLine(): Line3D;
+        extend(distance: number): Connector;
+    }
+    class ConnectorList {
+        connectors_: Connector[];
+        closed: boolean;
+        constructor(connectors: Connector[]);
+        static defaultNormal: number[];
+        static fromPath2D(path2D: CSG.Path2D, arg1: any, arg2: any): ConnectorList;
+        static _fromPath2DTangents(path2D: any, start: any, end: any): ConnectorList;
+        static _fromPath2DExplicit(path2D: any, angleIsh: any): ConnectorList;
+        setClosed(bool: boolean): void;
+        appendConnector(conn: Connector): void;
+        followWith(cagish: any): CSG;
+        verify(): void;
+    }
+    interface IRadiusOptions {
+        radius?: number;
+        resolution?: number;
+    }
+    interface ICircleOptions extends IRadiusOptions {
+        center?: Vector2D | number[];
+    }
+    interface IArcOptions extends ICircleOptions {
+        startangle?: number;
+        endangle?: number;
+        maketangent?: boolean;
+    }
+    interface IEllpiticalArcOptions extends IRadiusOptions {
+        clockwise?: boolean;
+        large?: boolean;
+        xaxisrotation?: number;
+        xradius?: number;
+        yradius?: number;
+    }
+    interface IRectangleOptions {
+        center?: Vector2D;
+        corner1?: Vector2D;
+        corner2?: Vector2D;
+        radius?: Vector2D;
+    }
+    interface IRoundRectangleOptions {
+        roundradius: number;
+        resolution?: number;
+    }
+    class Path2D extends CxG {
+        closed: boolean;
+        points: Vector2D[];
+        lastBezierControlPoint: Vector2D;
+        constructor(points: number[], closed?: boolean);
+        constructor(points: Vector2D[], closed?: boolean);
+        static arc(options: IArcOptions): Path2D;
+        concat(otherpath: Path2D): Path2D;
+        appendPoint(point: Vector2D): Path2D;
+        appendPoints(points: Vector2D[]): Path2D;
+        close(): Path2D;
+        rectangularExtrude(width: number, height: number, resolution: number): CSG;
+        expandToCAG(pathradius: number, resolution: number): CAG;
+        innerToCAG(): CAG;
+        transform(matrix4x4: Matrix4x4): Path2D;
+        appendBezier(controlpoints: any, options: any): Path2D;
+        appendArc(endpoint: Vector2D, options: IEllpiticalArcOptions): Path2D;
+    }
+}
+declare class CAG extends CxG implements ICenter {
+    sides: CAG.Side[];
+    isCanonicalized: boolean;
+    constructor();
+    static fromSides(sides: CAG.Side[]): CAG;
+    static fromPoints(points: CSG.Vector2D[]): CAG;
+    static fromPointsNoCheck(points: CSG.Vector2D[]): CAG;
+    static fromFakeCSG(csg: CSG): CAG;
+    static linesIntersect(p0start: CSG.Vector2D, p0end: CSG.Vector2D, p1start: CSG.Vector2D, p1end: CSG.Vector2D): boolean;
+    static circle(options: CSG.ICircleOptions): CAG;
+    static rectangle(options: CSG.IRectangleOptions): CAG;
+    static roundedRectangle(options: any): CAG;
+    static fromCompactBinary(bin: any): CAG;
+    toString(): string;
+    _toCSGWall(z0: any, z1: any): CSG;
+    _toVector3DPairs(m: CSG.Matrix4x4): CSG.Vector3D[][];
+    _toPlanePolygons(options: any): CSG.Polygon[];
+    _toWallPolygons(options: any): any[];
+    union(cag: CAG[]): CAG;
+    union(cag: CAG): CAG;
+    subtract(cag: CAG[]): CAG;
+    subtract(cag: CAG): CAG;
+    intersect(cag: CAG[]): CAG;
+    intersect(cag: CAG): CAG;
+    transform(matrix4x4: CSG.Matrix4x4): CAG;
+    area(): number;
+    flipped(): CAG;
+    getBounds(): CSG.Vector2D[];
+    isSelfIntersecting(): boolean;
+    expandedShell(radius: number, resolution: number): CAG;
+    expand(radius: number, resolution: number): CAG;
+    contract(radius: number, resolution: number): CAG;
+    extrudeInOrthonormalBasis(orthonormalbasis: CSG.OrthoNormalBasis, depth: number, options?: any): CSG;
+    extrudeInPlane(axis1: any, axis2: any, depth: any, options: any): CSG;
+    extrude(options: CAG_extrude_options): CSG;
+    rotateExtrude(options: any): CSG;
+    check(): void;
+    canonicalized(): CAG;
+    toCompactBinary(): {
+        'class': string;
+        sideVertexIndices: Uint32Array;
+        vertexData: Float64Array;
+    };
+    getOutlinePaths(): CSG.Path2D[];
+    overCutInsideCorners(cutterradius: any): CAG;
+    center(cAxes: string[]): CxG;
+    toDxf(): Blob;
+    static PathsToDxf(paths: CSG.Path2D[]): Blob;
+}
+declare namespace CAG {
+    class Vertex {
+        pos: CSG.Vector2D;
+        tag: number;
+        constructor(pos: CSG.Vector2D);
+        toString(): string;
+        getTag(): number;
+    }
+    class Side extends CxG {
+        vertex0: Vertex;
+        vertex1: Vertex;
+        tag: number;
+        constructor(vertex0: Vertex, vertex1: Vertex);
+        static _fromFakePolygon(polygon: CSG.Polygon): Side;
+        toString(): string;
+        toPolygon3D(z0: any, z1: any): CSG.Polygon;
+        transform(matrix4x4: CSG.Matrix4x4): Side;
+        flipped(): Side;
+        direction(): CSG.Vector2D;
+        getTag(): number;
+        lengthSquared(): number;
+        length(): number;
+    }
+    class fuzzyCAGFactory {
+        vertexfactory: CSG.fuzzyFactory;
+        constructor();
+        getVertex(sourcevertex: Vertex): Vertex;
+        getSide(sourceside: Side): Side;
+        getCAG(sourcecag: CAG): CAG;
+    }
+}
+interface CAG_extrude_options {
+    offset?: number[];
+    twistangle?: number;
+    twiststeps?: number;
+}
+declare namespace CSG {
+    class Polygon2D extends CAG {
+        constructor(points: Vector2D[]);
+    }
+}
diff --git a/OpenJsCad/openjscad-tests.ts b/OpenJsCad/openjscad-tests.ts
index fd13f0dbb4..60ffefff1e 100644
--- a/OpenJsCad/openjscad-tests.ts
+++ b/OpenJsCad/openjscad-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./openjscad.d.ts" />
+
 
 function test() {
 
diff --git a/OpenJsCad/openjscad.d.ts b/OpenJsCad/openjscad.d.ts
deleted file mode 100644
index c0bdbdc1f9..0000000000
--- a/OpenJsCad/openjscad.d.ts
+++ /dev/null
@@ -1,912 +0,0 @@
-// Type definitions for OpenJsCad.js
-// Project: https://github.com/joostn/OpenJsCad
-// Definitions by: Dan Marshall <https://github.com/danmarshall>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/// <reference path="../threejs/three.d.ts" />
-
-declare namespace THREE {
-    var CSG: {
-        fromCSG: (csg: CSG, defaultColor: any) => {
-            colorMesh: Mesh;
-            wireframe: Mesh;
-            boundLen: number;
-        };
-        getGeometryVertex: (geometry: any, vertex_position: any) => number;
-    };
-    function OrbitControls(object: any, domElement: any): void;
-    function SpriteCanvasMaterial(parameters?: any): void;
-    interface ICanvasRendererOptions {
-        canvas?: HTMLCanvasElement;
-        alpha?: boolean;
-    }
-    class CanvasRenderer implements Renderer {
-        domElement: HTMLCanvasElement;
-        private pixelRatio;
-        private autoClear;
-        private sortObjects;
-        private sortElements;
-        private info;
-        private _projector;
-        private _renderData;
-        private _elements;
-        private _lights;
-        private _canvas;
-        private _canvasWidth;
-        private _canvasHeight;
-        private _canvasWidthHalf;
-        private _canvasHeightHalf;
-        private _viewportX;
-        private _viewportY;
-        private _viewportWidth;
-        private _viewportHeight;
-        private _context;
-        private _clearColor;
-        private _clearAlpha;
-        private _contextGlobalAlpha;
-        private _contextGlobalCompositeOperation;
-        private _contextStrokeStyle;
-        private _camera;
-        private _contextFillStyle;
-        private _contextLineWidth;
-        private _contextLineCap;
-        private _contextLineJoin;
-        private _contextLineDash;
-        private _v1;
-        private _v2;
-        private _v3;
-        private _v4;
-        private _v5;
-        private _v6;
-        private _v1x;
-        private _v1y;
-        private _v2x;
-        private _v2y;
-        private _v3x;
-        private _v3y;
-        private _v4x;
-        private _v4y;
-        private _v5x;
-        private _v5y;
-        private _v6x;
-        private _v6y;
-        private _color;
-        private _color1;
-        private _color2;
-        private _color3;
-        private _color4;
-        private _diffuseColor;
-        private _emissiveColor;
-        private _lightColor;
-        private _patterns;
-        private _image;
-        private _uvs;
-        private _uv1x;
-        private _uv1y;
-        private _uv2x;
-        private _uv2y;
-        private _uv3x;
-        private _uv3y;
-        private _clipBox;
-        private _clearBox;
-        private _elemBox;
-        private _ambientLight;
-        private _directionalLights;
-        private _pointLights;
-        private _vector3;
-        private _centroid;
-        private _normal;
-        private _normalViewMatrix;
-        constructor(parameters: ICanvasRendererOptions);
-        supportsVertexTextures(): void;
-        setFaceCulling: () => void;
-        getPixelRatio(): number;
-        setPixelRatio(value: any): void;
-        setSize(width: any, height: any, updateStyle: any): void;
-        setViewport(x: any, y: any, width: any, height: any): void;
-        setScissor(): void;
-        enableScissorTest(): void;
-        setClearColor(color: any, alpha: any): void;
-        setClearColorHex(hex: any, alpha: any): void;
-        getClearColor(): Color;
-        getClearAlpha(): number;
-        getMaxAnisotropy(): number;
-        clear(): void;
-        clearColor(): void;
-        clearDepth(): void;
-        clearStencil(): void;
-        render(scene: Scene, camera: Camera, renderTarget?: RenderTarget, forceClear?: boolean): void;
-        calculateLights(): void;
-        calculateLight(position: any, normal: any, color: any): void;
-        renderSprite(v1: any, element: any, material: any): void;
-        renderLine(v1: any, v2: any, element: any, material: any): void;
-        renderFace3(v1: any, v2: any, v3: any, uv1: any, uv2: any, uv3: any, element: any, material: any): void;
-        drawTriangle(x0: any, y0: any, x1: any, y1: any, x2: any, y2: any): void;
-        strokePath(color: any, linewidth: any, linecap: any, linejoin: any): void;
-        fillPath(color: any): void;
-        onTextureUpdate(event: any): void;
-        textureToPattern(texture: any): void;
-        patternPath(x0: any, y0: any, x1: any, y1: any, x2: any, y2: any, u0: any, v0: any, u1: any, v1: any, u2: any, v2: any, texture: any): void;
-        clipImage(x0: any, y0: any, x1: any, y1: any, x2: any, y2: any, u0: any, v0: any, u1: any, v1: any, u2: any, v2: any, image: any): void;
-        expand(v1: any, v2: any, pixels: any): void;
-        setOpacity(value: any): void;
-        setBlending(value: any): void;
-        setLineWidth(value: any): void;
-        setLineCap(value: any): void;
-        setLineJoin(value: any): void;
-        setStrokeStyle(value: any): void;
-        setFillStyle(value: any): void;
-        setLineDash(value: any): void;
-    }
-    function RenderableObject(): void;
-    function RenderableFace(): void;
-    function RenderableVertex(): void;
-    function RenderableLine(): void;
-    function RenderableSprite(): void;
-    function Projector(): void;
-}
-declare namespace OpenJsCad {
-    interface ILog {
-        (x: string): void;
-        prevLogTime?: number;
-    }
-    var log: ILog;
-    interface IViewerOptions {
-        drawLines?: boolean;
-        drawFaces?: boolean;
-        color?: number[];
-        bgColor?: number;
-        noWebGL?: boolean;
-    }
-    interface ProcessorOptions extends IViewerOptions {
-        verbose?: boolean;
-        viewerwidth?: number;
-        viewerheight?: number;
-        viewerheightratio?: number;
-    }
-    class Viewer {
-        private perspective;
-        private drawOptions;
-        private size;
-        private defaultColor_;
-        private bgColor_;
-        private containerElm_;
-        private scene_;
-        private camera_;
-        private controls_;
-        private renderer_;
-        private canvas;
-        private pauseRender_;
-        private requestID_;
-        constructor(containerElm: any, size: any, options: IViewerOptions);
-        createScene(drawAxes: any, axLen: any): void;
-        createCamera(): void;
-        createControls(canvas: any): void;
-        webGLAvailable(): boolean;
-        createRenderer(bool_noWebGL: any): void;
-        render(): void;
-        animate(): void;
-        cancelAnimate(): void;
-        refreshRenderer(bool_noWebGL: any): void;
-        drawAxes(axLen: any): void;
-        setCsg(csg: any, resetZoom: any): void;
-        applyDrawOptions(): void;
-        clear(): void;
-        getUserMeshes(str?: any): THREE.Object3D[];
-        resetZoom(r: any): void;
-        parseSizeParams(): void;
-        handleResize(): void;
-    }
-    function makeAbsoluteUrl(url: any, baseurl: any): any;
-    function isChrome(): boolean;
-    function runMainInWorker(mainParameters: any): void;
-    function expandResultObjectArray(result: any): any;
-    function checkResult(result: any): void;
-    function resultToCompactBinary(resultin: any): any;
-    function resultFromCompactBinary(resultin: any): any;
-    function parseJsCadScriptSync(script: any, mainParameters: any, debugging: any): any;
-    function parseJsCadScriptASync(script: any, mainParameters: any, options: any, callback: any): Worker;
-    function getWindowURL(): URL;
-    function textToBlobUrl(txt: any): string;
-    function revokeBlobUrl(url: any): void;
-    function FileSystemApiErrorHandler(fileError: any, operation: any): void;
-    function AlertUserOfUncaughtExceptions(): void;
-    function getParamDefinitions(script: any): any[];
-    interface EventHandler {
-        (ev?: Event): any;
-    }
-    /**
-     * options parameter:
-     * - drawLines: display wireframe lines
-     * - drawFaces: display surfaces
-     * - bgColor: canvas background color
-     * - color: object color
-     * - viewerwidth, viewerheight: set rendering size. Works with any css unit.
-     *     viewerheight can also be specified as a ratio to width, ie number e (0, 1]
-     * - noWebGL: force render without webGL
-     * - verbose: show additional info (currently only time used for rendering)
-     */
-    interface ViewerSize {
-        widthDefault: string;
-        heightDefault: string;
-        width: number;
-        height: number;
-        heightratio: number;
-    }
-    class Processor {
-        private containerdiv;
-        private options;
-        private onchange;
-        private static widthDefault;
-        private static heightDefault;
-        private viewerdiv;
-        private viewer;
-        private viewerSize;
-        private processing;
-        private currentObject;
-        private hasValidCurrentObject;
-        private hasOutputFile;
-        private worker;
-        private paramDefinitions;
-        private paramControls;
-        private script;
-        private hasError;
-        private debugging;
-        private errordiv;
-        private errorpre;
-        private statusdiv;
-        private controldiv;
-        private statusspan;
-        private statusbuttons;
-        private abortbutton;
-        private renderedElementDropdown;
-        private formatDropdown;
-        private generateOutputFileButton;
-        private downloadOutputFileLink;
-        private parametersdiv;
-        private parameterstable;
-        private currentFormat;
-        private filename;
-        private currentObjects;
-        private currentObjectIndex;
-        private isFirstRender_;
-        private outputFileDirEntry;
-        private outputFileBlobUrl;
-        constructor(containerdiv: HTMLDivElement, options?: ProcessorOptions, onchange?: EventHandler);
-        static convertToSolid(obj: any): any;
-        cleanOption(option: any, deflt: any): any;
-        toggleDrawOption(str: any): boolean;
-        setDrawOption(str: any, bool: any): void;
-        handleResize(): void;
-        createElements(): void;
-        getFilenameForRenderedObject(): string;
-        setRenderedObjects(obj: any): void;
-        setSelectedObjectIndex(index: number): void;
-        selectedFormat(): any;
-        selectedFormatInfo(): any;
-        updateDownloadLink(): void;
-        clearViewer(): void;
-        abort(): void;
-        enableItems(): void;
-        setOpenJsCadPath(path: string): void;
-        addLibrary(lib: any): void;
-        setError(txt: string): void;
-        setDebugging(debugging: boolean): void;
-        setJsCad(script: string, filename?: string): void;
-        getParamValues(): {};
-        rebuildSolid(): void;
-        hasSolid(): boolean;
-        isProcessing(): boolean;
-        clearOutputFile(): void;
-        generateOutputFile(): void;
-        currentObjectToBlob(): any;
-        supportedFormatsForCurrentObject(): string[];
-        formatInfo(format: any): any;
-        downloadLinkTextForCurrentObject(): string;
-        generateOutputFileBlobUrl(): void;
-        generateOutputFileFileSystem(): void;
-        createParamControls(): void;
-    }
-}
-interface Window {
-    Worker: Worker;
-//    URL: URL;
-    webkitURL: URL;
-    requestFileSystem: any;
-    webkitRequestFileSystem: any;
-}
-interface IAMFStringOptions {
-    unit: string;
-}
-declare class CxG {
-    toStlString(): string;
-    toStlBinary(): void;
-    toAMFString(AMFStringOptions?: IAMFStringOptions): void;
-    getBounds(): CxG[];
-    transform(matrix4x4: CSG.Matrix4x4): CxG;
-    mirrored(plane: CSG.Plane): CxG;
-    mirroredX(): CxG;
-    mirroredY(): CxG;
-    mirroredZ(): CxG;
-    translate(v: number[]): CxG;
-    translate(v: CSG.Vector3D): CxG;
-    scale(f: CSG.Vector3D): CxG;
-    rotateX(deg: number): CxG;
-    rotateY(deg: number): CxG;
-    rotateZ(deg: number): CxG;
-    rotate(rotationCenter: CSG.Vector3D, rotationAxis: CSG.Vector3D, degrees: number): CxG;
-    rotateEulerAngles(alpha: number, beta: number, gamma: number, position: number[]): CxG;
-}
-interface ICenter {
-    center(cAxes: string[]): CxG;
-}
-declare class CSG extends CxG implements ICenter {
-    polygons: CSG.Polygon[];
-    properties: CSG.Properties;
-    isCanonicalized: boolean;
-    isRetesselated: boolean;
-    cachedBoundingBox: CSG.Vector3D[];
-    static defaultResolution2D: number;
-    static defaultResolution3D: number;
-    static fromPolygons(polygons: CSG.Polygon[]): CSG;
-    static fromSlices(options: any): CSG;
-    static fromObject(obj: any): CSG;
-    static fromCompactBinary(bin: any): CSG;
-    toPolygons(): CSG.Polygon[];
-    union(csg: CSG[]): CSG;
-    union(csg: CSG): CSG;
-    unionSub(csg: CSG, retesselate?: boolean, canonicalize?: boolean): CSG;
-    unionForNonIntersecting(csg: CSG): CSG;
-    subtract(csg: CSG[]): CSG;
-    subtract(csg: CSG): CSG;
-    subtractSub(csg: CSG, retesselate: boolean, canonicalize: boolean): CSG;
-    intersect(csg: CSG[]): CSG;
-    intersect(csg: CSG): CSG;
-    intersectSub(csg: CSG, retesselate?: boolean, canonicalize?: boolean): CSG;
-    invert(): CSG;
-    transform1(matrix4x4: CSG.Matrix4x4): CSG;
-    transform(matrix4x4: CSG.Matrix4x4): CSG;
-    toString(): string;
-    expand(radius: number, resolution: number): CSG;
-    contract(radius: number, resolution: number): CSG;
-    stretchAtPlane(normal: number[], point: number[], length: number): CSG;
-    expandedShell(radius: number, resolution: number, unionWithThis: boolean): CSG;
-    canonicalized(): CSG;
-    reTesselated(): CSG;
-    getBounds(): CSG.Vector3D[];
-    mayOverlap(csg: CSG): boolean;
-    cutByPlane(plane: CSG.Plane): CSG;
-    connectTo(myConnector: CSG.Connector, otherConnector: CSG.Connector, mirror: boolean, normalrotation: number): CSG;
-    setShared(shared: CSG.Polygon.Shared): CSG;
-    setColor(args: any): CSG;
-    toCompactBinary(): {
-        "class": string;
-        numPolygons: number;
-        numVerticesPerPolygon: Uint32Array;
-        polygonPlaneIndexes: Uint32Array;
-        polygonSharedIndexes: Uint32Array;
-        polygonVertices: Uint32Array;
-        vertexData: Float64Array;
-        planeData: Float64Array;
-        shared: CSG.Polygon.Shared[];
-    };
-    toPointCloud(cuberadius: any): CSG;
-    getTransformationAndInverseTransformationToFlatLying(): any;
-    getTransformationToFlatLying(): any;
-    lieFlat(): CSG;
-    projectToOrthoNormalBasis(orthobasis: CSG.OrthoNormalBasis): CAG;
-    sectionCut(orthobasis: CSG.OrthoNormalBasis): CAG;
-    fixTJunctions(): CSG;
-    toTriangles(): any[];
-    getFeatures(features: any): any;
-    center(cAxes: string[]): CxG;
-    toX3D(): Blob;
-    toStlBinary(): Blob;
-    toStlString(): string;
-    toAMFString(m: IAMFStringOptions): Blob;
-}
-declare namespace CSG {
-    function fnNumberSort(a: any, b: any): number;
-    function parseOption(options: any, optionname: any, defaultvalue: any): any;
-    function parseOptionAs3DVector(options: any, optionname: any, defaultvalue: any): Vector3D;
-    function parseOptionAs3DVectorList(options: any, optionname: any, defaultvalue: any): any;
-    function parseOptionAs2DVector(options: any, optionname: any, defaultvalue: any): any;
-    function parseOptionAsFloat(options: any, optionname: any, defaultvalue: any): any;
-    function parseOptionAsInt(options: any, optionname: any, defaultvalue: any): any;
-    function parseOptionAsBool(options: any, optionname: any, defaultvalue: any): any;
-    function cube(options: any): CSG;
-    function sphere(options: any): CSG;
-    function cylinder(options: any): CSG;
-    function roundedCylinder(options: any): CSG;
-    function roundedCube(options: any): CSG;
-    /**
-     * polyhedron accepts openscad style arguments. I.e. define face vertices clockwise looking from outside
-     */
-    function polyhedron(options: any): CSG;
-    function IsFloat(n: any): boolean;
-    function solve2Linear(a: any, b: any, c: any, d: any, u: any, v: any): number[];
-    class Vector3D extends CxG {
-        x: number;
-        y: number;
-        z: number;
-        constructor(v3: Vector3D);
-        constructor(v2: Vector2D);
-        constructor(v2: number[]);
-        constructor(x: number, y: number);
-        constructor(x: number, y: number, z: number);
-        static Create(x: number, y: number, z: number): Vector3D;
-        clone(): Vector3D;
-        negated(): Vector3D;
-        abs(): Vector3D;
-        plus(a: Vector3D): Vector3D;
-        minus(a: Vector3D): Vector3D;
-        times(a: number): Vector3D;
-        dividedBy(a: number): Vector3D;
-        dot(a: Vector3D): number;
-        lerp(a: Vector3D, t: number): Vector3D;
-        lengthSquared(): number;
-        length(): number;
-        unit(): Vector3D;
-        cross(a: Vector3D): Vector3D;
-        distanceTo(a: Vector3D): number;
-        distanceToSquared(a: Vector3D): number;
-        equals(a: Vector3D): boolean;
-        multiply4x4(matrix4x4: Matrix4x4): Vector3D;
-        transform(matrix4x4: Matrix4x4): Vector3D;
-        toString(): string;
-        randomNonParallelVector(): Vector3D;
-        min(p: Vector3D): Vector3D;
-        max(p: Vector3D): Vector3D;
-        toStlString(): string;
-        toAMFString(): string;
-    }
-    class Vertex extends CxG {
-        pos: Vector3D;
-        tag: number;
-        constructor(pos: Vector3D);
-        static fromObject(obj: any): Vertex;
-        flipped(): Vertex;
-        getTag(): number;
-        interpolate(other: Vertex, t: number): Vertex;
-        transform(matrix4x4: Matrix4x4): Vertex;
-        toString(): string;
-        toStlString(): string;
-        toAMFString(): string;
-    }
-    class Plane extends CxG {
-        normal: Vector3D;
-        w: number;
-        tag: number;
-        constructor(normal: Vector3D, w: number);
-        static fromObject(obj: any): Plane;
-        static EPSILON: number;
-        static fromVector3Ds(a: Vector3D, b: Vector3D, c: Vector3D): Plane;
-        static anyPlaneFromVector3Ds(a: Vector3D, b: Vector3D, c: Vector3D): Plane;
-        static fromPoints(a: Vector3D, b: Vector3D, c: Vector3D): Plane;
-        static fromNormalAndPoint(normal: Vector3D, point: Vector3D): Plane;
-        static fromNormalAndPoint(normal: number[], point: number[]): Plane;
-        flipped(): Plane;
-        getTag(): number;
-        equals(n: Plane): boolean;
-        transform(matrix4x4: Matrix4x4): Plane;
-        splitPolygon(polygon: Polygon): {
-            type: any;
-            front: any;
-            back: any;
-        };
-        splitLineBetweenPoints(p1: Vector3D, p2: Vector3D): Vector3D;
-        intersectWithLine(line3d: Line3D): Vector3D;
-        intersectWithPlane(plane: Plane): Line3D;
-        signedDistanceToPoint(point: Vector3D): number;
-        toString(): string;
-        mirrorPoint(point3d: Vector3D): Vector3D;
-    }
-    class Polygon extends CxG {
-        vertices: Vertex[];
-        shared: Polygon.Shared;
-        plane: Plane;
-        cachedBoundingSphere: any;
-        cachedBoundingBox: Vector3D[];
-        static defaultShared: CSG.Polygon.Shared;
-        constructor(vertices: Vector3D, shared?: Polygon.Shared, plane?: Plane);
-        constructor(vertices: Vertex[], shared?: Polygon.Shared, plane?: Plane);
-        static fromObject(obj: any): Polygon;
-        checkIfConvex(): void;
-        setColor(args: any): Polygon;
-        getSignedVolume(): number;
-        getArea(): number;
-        getTetraFeatures(features: any): any[];
-        extrude(offsetvector: any): CSG;
-        boundingSphere(): any;
-        boundingBox(): Vector3D[];
-        flipped(): Polygon;
-        transform(matrix4x4: Matrix4x4): Polygon;
-        toString(): string;
-        projectToOrthoNormalBasis(orthobasis: OrthoNormalBasis): CAG;
-        /**
-            * Creates solid from slices (CSG.Polygon) by generating walls
-            * @param {Object} options Solid generating options
-            *  - numslices {Number} Number of slices to be generated
-            *  - callback(t, slice) {Function} Callback function generating slices.
-            *          arguments: t = [0..1], slice = [0..numslices - 1]
-            *          return: CSG.Polygon or null to skip
-            *  - loop {Boolean} no flats, only walls, it's used to generate solids like a tor
-            */
-        solidFromSlices(options: any): CSG;
-        /**
-            *
-            * @param walls Array of wall polygons
-            * @param bottom Bottom polygon
-            * @param top Top polygon
-            */
-        private _addWalls(walls, bottom, top, bFlipped);
-        static verticesConvex(vertices: Vertex[], planenormal: any): boolean;
-        static createFromPoints(points: number[][], shared?: CSG.Polygon.Shared, plane?: Plane): Polygon;
-        static isConvexPoint(prevpoint: any, point: any, nextpoint: any, normal: any): boolean;
-        static isStrictlyConvexPoint(prevpoint: any, point: any, nextpoint: any, normal: any): boolean;
-        toStlString(): string;
-    }
-}
-declare namespace CSG.Polygon {
-    class Shared {
-        color: any;
-        tag: any;
-        constructor(color: any);
-        static fromObject(obj: any): Shared;
-        static fromColor(args: any): Shared;
-        getTag(): any;
-        getHash(): any;
-    }
-}
-declare namespace CSG {
-    class PolygonTreeNode {
-        parent: any;
-        children: any;
-        polygon: Polygon;
-        removed: boolean;
-        constructor();
-        addPolygons(polygons: any): void;
-        remove(): void;
-        isRemoved(): boolean;
-        isRootNode(): boolean;
-        invert(): void;
-        getPolygon(): Polygon;
-        getPolygons(result: Polygon[]): void;
-        splitByPlane(plane: any, coplanarfrontnodes: any, coplanarbacknodes: any, frontnodes: any, backnodes: any): void;
-        _splitByPlane(plane: any, coplanarfrontnodes: any, coplanarbacknodes: any, frontnodes: any, backnodes: any): void;
-        addChild(polygon: Polygon): PolygonTreeNode;
-        invertSub(): void;
-        recursivelyInvalidatePolygon(): void;
-    }
-    class Tree {
-        polygonTree: PolygonTreeNode;
-        rootnode: Node;
-        constructor(polygons: Polygon[]);
-        invert(): void;
-        clipTo(tree: Tree, alsoRemovecoplanarFront?: boolean): void;
-        allPolygons(): Polygon[];
-        addPolygons(polygons: Polygon[]): void;
-    }
-    class Node {
-        parent: Node;
-        plane: Plane;
-        front: any;
-        back: any;
-        polygontreenodes: PolygonTreeNode[];
-        constructor(parent: Node);
-        invert(): void;
-        clipPolygons(polygontreenodes: PolygonTreeNode[], alsoRemovecoplanarFront: boolean): void;
-        clipTo(tree: Tree, alsoRemovecoplanarFront: boolean): void;
-        addPolygonTreeNodes(polygontreenodes: PolygonTreeNode[]): void;
-        getParentPlaneNormals(normals: Vector3D[], maxdepth: number): void;
-    }
-    class Matrix4x4 {
-        elements: number[];
-        constructor(elements?: number[]);
-        plus(m: Matrix4x4): Matrix4x4;
-        minus(m: Matrix4x4): Matrix4x4;
-        multiply(m: Matrix4x4): Matrix4x4;
-        clone(): Matrix4x4;
-        rightMultiply1x3Vector(v: Vector3D): Vector3D;
-        leftMultiply1x3Vector(v: Vector3D): Vector3D;
-        rightMultiply1x2Vector(v: Vector2D): Vector2D;
-        leftMultiply1x2Vector(v: Vector2D): Vector2D;
-        isMirroring(): boolean;
-        static unity(): Matrix4x4;
-        static rotationX(degrees: number): Matrix4x4;
-        static rotationY(degrees: number): Matrix4x4;
-        static rotationZ(degrees: number): Matrix4x4;
-        static rotation(rotationCenter: CSG.Vector3D, rotationAxis: CSG.Vector3D, degrees: number): Matrix4x4;
-        static translation(v: number[]): Matrix4x4;
-        static translation(v: Vector3D): Matrix4x4;
-        static mirroring(plane: Plane): Matrix4x4;
-        static scaling(v: number[]): Matrix4x4;
-        static scaling(v: Vector3D): Matrix4x4;
-    }
-    class Vector2D extends CxG {
-        x: number;
-        y: number;
-        constructor(x: number, y: number);
-        constructor(x: number[]);
-        constructor(x: Vector2D);
-        static fromAngle(radians: number): Vector2D;
-        static fromAngleDegrees(degrees: number): Vector2D;
-        static fromAngleRadians(radians: number): Vector2D;
-        static Create(x: number, y: number): Vector2D;
-        toVector3D(z: number): Vector3D;
-        equals(a: Vector2D): boolean;
-        clone(): Vector2D;
-        negated(): Vector2D;
-        plus(a: Vector2D): Vector2D;
-        minus(a: Vector2D): Vector2D;
-        times(a: number): Vector2D;
-        dividedBy(a: number): Vector2D;
-        dot(a: Vector2D): number;
-        lerp(a: Vector2D, t: number): Vector2D;
-        length(): number;
-        distanceTo(a: Vector2D): number;
-        distanceToSquared(a: Vector2D): number;
-        lengthSquared(): number;
-        unit(): Vector2D;
-        cross(a: Vector2D): number;
-        normal(): Vector2D;
-        multiply4x4(matrix4x4: Matrix4x4): Vector2D;
-        transform(matrix4x4: Matrix4x4): Vector2D;
-        angle(): number;
-        angleDegrees(): number;
-        angleRadians(): number;
-        min(p: Vector2D): Vector2D;
-        max(p: Vector2D): Vector2D;
-        toString(): string;
-        abs(): Vector2D;
-    }
-    class Line2D extends CxG {
-        normal: Vector2D;
-        w: number;
-        constructor(normal: Vector2D, w: number);
-        static fromPoints(p1: Vector2D, p2: Vector2D): Line2D;
-        reverse(): Line2D;
-        equals(l: Line2D): boolean;
-        origin(): Vector2D;
-        direction(): Vector2D;
-        xAtY(y: number): number;
-        absDistanceToPoint(point: Vector2D): number;
-        intersectWithLine(line2d: Line2D): Vector2D;
-        transform(matrix4x4: Matrix4x4): Line2D;
-    }
-    class Line3D extends CxG {
-        point: Vector3D;
-        direction: Vector3D;
-        constructor(point: Vector3D, direction: Vector3D);
-        static fromPoints(p1: Vector3D, p2: Vector3D): Line3D;
-        static fromPlanes(p1: Plane, p2: Plane): Line3D;
-        intersectWithPlane(plane: Plane): Vector3D;
-        clone(): Line3D;
-        reverse(): Line3D;
-        transform(matrix4x4: Matrix4x4): Line3D;
-        closestPointOnLine(point: Vector3D): Vector3D;
-        distanceToPoint(point: Vector3D): number;
-        equals(line3d: Line3D): boolean;
-    }
-    class OrthoNormalBasis extends CxG {
-        v: Vector3D;
-        u: Vector3D;
-        plane: Plane;
-        planeorigin: Vector3D;
-        constructor(plane: Plane, rightvector?: Vector3D);
-        static GetCartesian(xaxisid: string, yaxisid: string): OrthoNormalBasis;
-        static Z0Plane(): OrthoNormalBasis;
-        getProjectionMatrix(): Matrix4x4;
-        getInverseProjectionMatrix(): Matrix4x4;
-        to2D(vec3: Vector3D): Vector2D;
-        to3D(vec2: Vector2D): Vector3D;
-        line3Dto2D(line3d: Line3D): Line2D;
-        line2Dto3D(line2d: Line2D): Line3D;
-        transform(matrix4x4: Matrix4x4): OrthoNormalBasis;
-    }
-    function interpolateBetween2DPointsForY(point1: Vector2D, point2: Vector2D, y: number): number;
-    function reTesselateCoplanarPolygons(sourcepolygons: CSG.Polygon[], destpolygons: CSG.Polygon[]): void;
-    class fuzzyFactory {
-        multiplier: number;
-        lookuptable: any;
-        constructor(numdimensions: number, tolerance: number);
-        lookupOrCreate(els: any, creatorCallback: any): any;
-    }
-    class fuzzyCSGFactory {
-        vertexfactory: fuzzyFactory;
-        planefactory: fuzzyFactory;
-        polygonsharedfactory: any;
-        constructor();
-        getPolygonShared(sourceshared: Polygon.Shared): Polygon.Shared;
-        getVertex(sourcevertex: Vertex): Vertex;
-        getPlane(sourceplane: Plane): Plane;
-        getPolygon(sourcepolygon: Polygon): Polygon;
-        getCSG(sourcecsg: CSG): CSG;
-    }
-    var staticTag: number;
-    function getTag(): number;
-    class Properties {
-        cube: Properties;
-        center: any;
-        facecenters: any[];
-        roundedCube: Properties;
-        cylinder: Properties;
-        start: any;
-        end: any;
-        facepointH: any;
-        facepointH90: any;
-        sphere: Properties;
-        facepoint: any;
-        roundedCylinder: any;
-        _transform(matrix4x4: Matrix4x4): Properties;
-        _merge(otherproperties: Properties): Properties;
-        static transformObj(source: any, result: any, matrix4x4: Matrix4x4): void;
-        static cloneObj(source: any, result: any): void;
-        static addFrom(result: any, otherproperties: Properties): void;
-    }
-    class Connector extends CxG {
-        point: Vector3D;
-        axisvector: Vector3D;
-        normalvector: Vector3D;
-        constructor(point: number[], axisvector: Vector3D, normalvector: number[]);
-        constructor(point: number[], axisvector: number[], normalvector: number[]);
-        constructor(point: number[], axisvector: number[], normalvector: Vector3D);
-        constructor(point: Vector3D, axisvector: number[], normalvector: Vector3D);
-        constructor(point: Vector3D, axisvector: number[], normalvector: number[]);
-        constructor(point: Vector3D, axisvector: Vector3D, normalvector: Vector3D);
-        normalized(): Connector;
-        transform(matrix4x4: Matrix4x4): Connector;
-        getTransformationTo(other: Connector, mirror: boolean, normalrotation: number): Matrix4x4;
-        axisLine(): Line3D;
-        extend(distance: number): Connector;
-    }
-    class ConnectorList {
-        connectors_: Connector[];
-        closed: boolean;
-        constructor(connectors: Connector[]);
-        static defaultNormal: number[];
-        static fromPath2D(path2D: CSG.Path2D, arg1: any, arg2: any): ConnectorList;
-        static _fromPath2DTangents(path2D: any, start: any, end: any): ConnectorList;
-        static _fromPath2DExplicit(path2D: any, angleIsh: any): ConnectorList;
-        setClosed(bool: boolean): void;
-        appendConnector(conn: Connector): void;
-        followWith(cagish: any): CSG;
-        verify(): void;
-    }
-    interface IRadiusOptions {
-        radius?: number;
-        resolution?: number;
-    }
-    interface ICircleOptions extends IRadiusOptions {
-        center?: Vector2D | number[];
-    }
-    interface IArcOptions extends ICircleOptions {
-        startangle?: number;
-        endangle?: number;
-        maketangent?: boolean;
-    }
-    interface IEllpiticalArcOptions extends IRadiusOptions {
-        clockwise?: boolean;
-        large?: boolean;
-        xaxisrotation?: number;
-        xradius?: number;
-        yradius?: number;
-    }
-    interface IRectangleOptions {
-        center?: Vector2D;
-        corner1?: Vector2D;
-        corner2?: Vector2D;
-        radius?: Vector2D;
-    }
-    interface IRoundRectangleOptions {
-        roundradius: number;
-        resolution?: number;
-    }
-    class Path2D extends CxG {
-        closed: boolean;
-        points: Vector2D[];
-        lastBezierControlPoint: Vector2D;
-        constructor(points: number[], closed?: boolean);
-        constructor(points: Vector2D[], closed?: boolean);
-        static arc(options: IArcOptions): Path2D;
-        concat(otherpath: Path2D): Path2D;
-        appendPoint(point: Vector2D): Path2D;
-        appendPoints(points: Vector2D[]): Path2D;
-        close(): Path2D;
-        rectangularExtrude(width: number, height: number, resolution: number): CSG;
-        expandToCAG(pathradius: number, resolution: number): CAG;
-        innerToCAG(): CAG;
-        transform(matrix4x4: Matrix4x4): Path2D;
-        appendBezier(controlpoints: any, options: any): Path2D;
-        appendArc(endpoint: Vector2D, options: IEllpiticalArcOptions): Path2D;
-    }
-}
-declare class CAG extends CxG implements ICenter {
-    sides: CAG.Side[];
-    isCanonicalized: boolean;
-    constructor();
-    static fromSides(sides: CAG.Side[]): CAG;
-    static fromPoints(points: CSG.Vector2D[]): CAG;
-    static fromPointsNoCheck(points: CSG.Vector2D[]): CAG;
-    static fromFakeCSG(csg: CSG): CAG;
-    static linesIntersect(p0start: CSG.Vector2D, p0end: CSG.Vector2D, p1start: CSG.Vector2D, p1end: CSG.Vector2D): boolean;
-    static circle(options: CSG.ICircleOptions): CAG;
-    static rectangle(options: CSG.IRectangleOptions): CAG;
-    static roundedRectangle(options: any): CAG;
-    static fromCompactBinary(bin: any): CAG;
-    toString(): string;
-    _toCSGWall(z0: any, z1: any): CSG;
-    _toVector3DPairs(m: CSG.Matrix4x4): CSG.Vector3D[][];
-    _toPlanePolygons(options: any): CSG.Polygon[];
-    _toWallPolygons(options: any): any[];
-    union(cag: CAG[]): CAG;
-    union(cag: CAG): CAG;
-    subtract(cag: CAG[]): CAG;
-    subtract(cag: CAG): CAG;
-    intersect(cag: CAG[]): CAG;
-    intersect(cag: CAG): CAG;
-    transform(matrix4x4: CSG.Matrix4x4): CAG;
-    area(): number;
-    flipped(): CAG;
-    getBounds(): CSG.Vector2D[];
-    isSelfIntersecting(): boolean;
-    expandedShell(radius: number, resolution: number): CAG;
-    expand(radius: number, resolution: number): CAG;
-    contract(radius: number, resolution: number): CAG;
-    extrudeInOrthonormalBasis(orthonormalbasis: CSG.OrthoNormalBasis, depth: number, options?: any): CSG;
-    extrudeInPlane(axis1: any, axis2: any, depth: any, options: any): CSG;
-    extrude(options: CAG_extrude_options): CSG;
-    rotateExtrude(options: any): CSG;
-    check(): void;
-    canonicalized(): CAG;
-    toCompactBinary(): {
-        'class': string;
-        sideVertexIndices: Uint32Array;
-        vertexData: Float64Array;
-    };
-    getOutlinePaths(): CSG.Path2D[];
-    overCutInsideCorners(cutterradius: any): CAG;
-    center(cAxes: string[]): CxG;
-    toDxf(): Blob;
-    static PathsToDxf(paths: CSG.Path2D[]): Blob;
-}
-declare namespace CAG {
-    class Vertex {
-        pos: CSG.Vector2D;
-        tag: number;
-        constructor(pos: CSG.Vector2D);
-        toString(): string;
-        getTag(): number;
-    }
-    class Side extends CxG {
-        vertex0: Vertex;
-        vertex1: Vertex;
-        tag: number;
-        constructor(vertex0: Vertex, vertex1: Vertex);
-        static _fromFakePolygon(polygon: CSG.Polygon): Side;
-        toString(): string;
-        toPolygon3D(z0: any, z1: any): CSG.Polygon;
-        transform(matrix4x4: CSG.Matrix4x4): Side;
-        flipped(): Side;
-        direction(): CSG.Vector2D;
-        getTag(): number;
-        lengthSquared(): number;
-        length(): number;
-    }
-    class fuzzyCAGFactory {
-        vertexfactory: CSG.fuzzyFactory;
-        constructor();
-        getVertex(sourcevertex: Vertex): Vertex;
-        getSide(sourceside: Side): Side;
-        getCAG(sourcecag: CAG): CAG;
-    }
-}
-interface CAG_extrude_options {
-    offset?: number[];
-    twistangle?: number;
-    twiststeps?: number;
-}
-declare namespace CSG {
-    class Polygon2D extends CAG {
-        constructor(points: Vector2D[]);
-    }
-}
diff --git a/OpenJsCad/tsconfig.json b/OpenJsCad/tsconfig.json
new file mode 100644
index 0000000000..bce64cbc97
--- /dev/null
+++ b/OpenJsCad/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "OpenJsCad-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/PayPal-Cordova-Plugin/PayPal-Cordova-Plugin-tests.ts b/PayPal-Cordova-Plugin/PayPal-Cordova-Plugin-tests.ts
index dca1f93120..e83b94ea5b 100644
--- a/PayPal-Cordova-Plugin/PayPal-Cordova-Plugin-tests.ts
+++ b/PayPal-Cordova-Plugin/PayPal-Cordova-Plugin-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference path="PayPal-Cordova-Plugin.d.ts"/>
-
 var item: PayPalItem;
 item = new PayPalItem("name", 10, "25.00", "USD");
 item = new PayPalItem("name", 10, "25.00", "USD", null);
diff --git a/PayPal-Cordova-Plugin/PayPal-Cordova-Plugin.d.ts b/PayPal-Cordova-Plugin/index.d.ts
similarity index 100%
rename from PayPal-Cordova-Plugin/PayPal-Cordova-Plugin.d.ts
rename to PayPal-Cordova-Plugin/index.d.ts
diff --git a/PayPal-Cordova-Plugin/tsconfig.json b/PayPal-Cordova-Plugin/tsconfig.json
new file mode 100644
index 0000000000..1cd4daf266
--- /dev/null
+++ b/PayPal-Cordova-Plugin/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "PayPal-Cordova-Plugin-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/_debugger/_debugger-tests.ts b/_debugger/_debugger-tests.ts
index e6d7cf9980..a44777bd9e 100644
--- a/_debugger/_debugger-tests.ts
+++ b/_debugger/_debugger-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="_debugger.d.ts"/>
 import _debugger = require("_debugger");
 var {Client} = _debugger;
 
diff --git a/_debugger/_debugger.d.ts b/_debugger/_debugger.d.ts
deleted file mode 100644
index 14bf5d49c7..0000000000
--- a/_debugger/_debugger.d.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-// Type definitions for Node.js debugger API
-// Project: http://nodejs.org/
-// Definitions by: Basarat Ali Syed <https://github.com/basarat>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare namespace NodeJS {
-    export module _debugger {
-        export interface Packet {
-            raw: string;
-            headers: string[];
-            body: Message;
-        }
-
-        export interface Message {
-            seq: number;
-            type: string;
-        }
-
-        export interface RequestInfo {
-            command: string;
-            arguments: any;
-        }
-
-        export interface Request extends Message, RequestInfo {
-        }
-
-        export interface Event extends Message {
-            event: string;
-            body?: any;
-        }
-
-        export interface Response extends Message {
-            request_seq: number;
-            success: boolean;
-            /** Contains error message if success === false. */
-            message?: string;
-            /** Contains message body if success === true. */
-            body?: any;
-        }
-
-        export interface BreakpointMessageBody {
-            type: string;
-            target: number;
-            line: number;
-        }
-
-        export class Protocol {
-            res: Packet;
-            state: string;
-            execute(data: string): void;
-            serialize(rq: Request): string;
-            onResponse: (pkt: Packet) => void;
-        }
-
-        export var NO_FRAME: number;
-        export var port: number;
-
-        export interface ScriptDesc {
-            name: string;
-            id: number;
-            isNative?: boolean;
-            handle?: number;
-            type: string;
-            lineOffset?: number;
-            columnOffset?: number;
-            lineCount?: number;
-        }
-
-        export interface Breakpoint {
-            id: number;
-            scriptId: number;
-            script: ScriptDesc;
-            line: number;
-            condition?: string;
-            scriptReq?: string;
-        }
-
-        export interface RequestHandler {
-            (err: boolean, body: Message, res: Packet): void;
-            request_seq?: number;
-        }
-
-        export interface ResponseBodyHandler {
-            (err: boolean, body?: any): void;
-            request_seq?: number;
-        }
-
-        export interface ExceptionInfo {
-            text: string;
-        }
-
-        export interface BreakResponse {
-            script?: ScriptDesc;
-            exception?: ExceptionInfo;
-            sourceLine: number;
-            sourceLineText: string;
-            sourceColumn: number;
-        }
-
-        export function SourceInfo(body: BreakResponse): string;
-
-        export interface ClientInstance extends EventEmitter {
-            protocol: Protocol;
-            scripts: ScriptDesc[];
-            handles: ScriptDesc[];
-            breakpoints: Breakpoint[];
-            currentSourceLine: number;
-            currentSourceColumn: number;
-            currentSourceLineText: string;
-            currentFrame: number;
-            currentScript: string;
-
-            connect(port: number, host: string): void;
-            req(req: any, cb: RequestHandler): void;
-            reqFrameEval(code: string, frame: number, cb: RequestHandler): void;
-            mirrorObject(obj: any, depth: number, cb: ResponseBodyHandler): void;
-            setBreakpoint(rq: BreakpointMessageBody, cb: RequestHandler): void;
-            clearBreakpoint(rq: Request, cb: RequestHandler): void;
-            listbreakpoints(cb: RequestHandler): void;
-            reqSource(from: number, to: number, cb: RequestHandler): void;
-            reqScripts(cb: any): void;
-            reqContinue(cb: RequestHandler): void;
-        }
-
-        export var Client : {
-            new (): ClientInstance
-        }
-    }
-}
-
-declare module "_debugger"{
-    export = NodeJS._debugger;
-}
diff --git a/_debugger/index.d.ts b/_debugger/index.d.ts
new file mode 100644
index 0000000000..324a875eba
--- /dev/null
+++ b/_debugger/index.d.ts
@@ -0,0 +1,135 @@
+// Type definitions for Node.js debugger API
+// Project: http://nodejs.org/
+// Definitions by: Basarat Ali Syed <https://github.com/basarat>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+declare namespace NodeJS {
+    export module _debugger {
+        export interface Packet {
+            raw: string;
+            headers: string[];
+            body: Message;
+        }
+
+        export interface Message {
+            seq: number;
+            type: string;
+        }
+
+        export interface RequestInfo {
+            command: string;
+            arguments: any;
+        }
+
+        export interface Request extends Message, RequestInfo {
+        }
+
+        export interface Event extends Message {
+            event: string;
+            body?: any;
+        }
+
+        export interface Response extends Message {
+            request_seq: number;
+            success: boolean;
+            /** Contains error message if success === false. */
+            message?: string;
+            /** Contains message body if success === true. */
+            body?: any;
+        }
+
+        export interface BreakpointMessageBody {
+            type: string;
+            target: number;
+            line: number;
+        }
+
+        export class Protocol {
+            res: Packet;
+            state: string;
+            execute(data: string): void;
+            serialize(rq: Request): string;
+            onResponse: (pkt: Packet) => void;
+        }
+
+        export var NO_FRAME: number;
+        export var port: number;
+
+        export interface ScriptDesc {
+            name: string;
+            id: number;
+            isNative?: boolean;
+            handle?: number;
+            type: string;
+            lineOffset?: number;
+            columnOffset?: number;
+            lineCount?: number;
+        }
+
+        export interface Breakpoint {
+            id: number;
+            scriptId: number;
+            script: ScriptDesc;
+            line: number;
+            condition?: string;
+            scriptReq?: string;
+        }
+
+        export interface RequestHandler {
+            (err: boolean, body: Message, res: Packet): void;
+            request_seq?: number;
+        }
+
+        export interface ResponseBodyHandler {
+            (err: boolean, body?: any): void;
+            request_seq?: number;
+        }
+
+        export interface ExceptionInfo {
+            text: string;
+        }
+
+        export interface BreakResponse {
+            script?: ScriptDesc;
+            exception?: ExceptionInfo;
+            sourceLine: number;
+            sourceLineText: string;
+            sourceColumn: number;
+        }
+
+        export function SourceInfo(body: BreakResponse): string;
+
+        export interface ClientInstance extends EventEmitter {
+            protocol: Protocol;
+            scripts: ScriptDesc[];
+            handles: ScriptDesc[];
+            breakpoints: Breakpoint[];
+            currentSourceLine: number;
+            currentSourceColumn: number;
+            currentSourceLineText: string;
+            currentFrame: number;
+            currentScript: string;
+
+            connect(port: number, host: string): void;
+            req(req: any, cb: RequestHandler): void;
+            reqFrameEval(code: string, frame: number, cb: RequestHandler): void;
+            mirrorObject(obj: any, depth: number, cb: ResponseBodyHandler): void;
+            setBreakpoint(rq: BreakpointMessageBody, cb: RequestHandler): void;
+            clearBreakpoint(rq: Request, cb: RequestHandler): void;
+            listbreakpoints(cb: RequestHandler): void;
+            reqSource(from: number, to: number, cb: RequestHandler): void;
+            reqScripts(cb: any): void;
+            reqContinue(cb: RequestHandler): void;
+        }
+
+        export var Client : {
+            new (): ClientInstance
+        }
+    }
+}
+
+declare module "_debugger"{
+    export = NodeJS._debugger;
+}
diff --git a/_debugger/tsconfig.json b/_debugger/tsconfig.json
new file mode 100644
index 0000000000..be1ad95ec4
--- /dev/null
+++ b/_debugger/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "_debugger-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/abs/abs-tests.ts b/abs/abs-tests.ts
index 80f52f8ffd..45445bbbb6 100644
--- a/abs/abs-tests.ts
+++ b/abs/abs-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./abs.d.ts" />
-
 import Abs from 'abs';
 
 const x: string = Abs('/foo');
diff --git a/abs/abs.d.ts b/abs/abs.d.ts
deleted file mode 100644
index 58a5335283..0000000000
--- a/abs/abs.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// Type definitions for abs 1.1.0
-// Project: https://github.com/IonicaBizau/node-abs
-// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "abs" {
-	/**
-	 * Compute the absolute path of an input.
-	 * @param input The input path.
-	 */
-	function Abs(input: string): string;
-
-	export default Abs;
-}
diff --git a/abs/index.d.ts b/abs/index.d.ts
new file mode 100644
index 0000000000..b5182da9e6
--- /dev/null
+++ b/abs/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for abs 1.1.0
+// Project: https://github.com/IonicaBizau/node-abs
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/**
+ * Compute the absolute path of an input.
+ * @param input The input path.
+ */
+declare function Abs(input: string): string;
+
+export default Abs;
diff --git a/abs/tsconfig.json b/abs/tsconfig.json
new file mode 100644
index 0000000000..2f5b6004be
--- /dev/null
+++ b/abs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "abs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/absolute/absolute-tests.ts b/absolute/absolute-tests.ts
index 5c2514450a..b2eceda474 100644
--- a/absolute/absolute-tests.ts
+++ b/absolute/absolute-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./absolute.d.ts" />
 
 import absolute from 'absolute';
 
diff --git a/absolute/absolute.d.ts b/absolute/absolute.d.ts
deleted file mode 100644
index c0e8e9bd6e..0000000000
--- a/absolute/absolute.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Type definitions for absolute 0.0.1
-// Project: https://github.com/bahamas10/node-absolute
-// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "absolute" {
-	/**
-	 * Test if a path is absolute
-	 */
-	function absolute(path: string): boolean;
-
-	export default absolute;
-}
diff --git a/absolute/index.d.ts b/absolute/index.d.ts
new file mode 100644
index 0000000000..acbcddfc4a
--- /dev/null
+++ b/absolute/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for absolute 0.0.1
+// Project: https://github.com/bahamas10/node-absolute
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Test if a path is absolute
+ */
+declare function absolute(path: string): boolean;
+
+export default absolute;
diff --git a/absolute/tsconfig.json b/absolute/tsconfig.json
new file mode 100644
index 0000000000..b82b939f49
--- /dev/null
+++ b/absolute/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "absolute-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/acc-wizard/acc-wizard-tests.ts b/acc-wizard/acc-wizard-tests.ts
index 9cf089b44a..74f8df765a 100644
--- a/acc-wizard/acc-wizard-tests.ts
+++ b/acc-wizard/acc-wizard-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="acc-wizard.d.ts" />
+/// <reference types="jquery"/>
+
 
 /**
  * @summary Test for "accwizard" without options.
diff --git a/acc-wizard/acc-wizard.d.ts b/acc-wizard/index.d.ts
similarity index 100%
rename from acc-wizard/acc-wizard.d.ts
rename to acc-wizard/index.d.ts
diff --git a/acc-wizard/tsconfig.json b/acc-wizard/tsconfig.json
new file mode 100644
index 0000000000..425a39e6b6
--- /dev/null
+++ b/acc-wizard/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "acc-wizard-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/accounting/accounting-tests.ts b/accounting/accounting-tests.ts
index bc9b74eaad..eff00e33b9 100644
--- a/accounting/accounting-tests.ts
+++ b/accounting/accounting-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="accounting.d.ts"/>
-
-// formatMoney
+// formatMoney
 
 // Default usage:
 accounting.formatMoney(12345678); // $12,345,678.00
diff --git a/accounting/accounting.d.ts b/accounting/index.d.ts
similarity index 100%
rename from accounting/accounting.d.ts
rename to accounting/index.d.ts
diff --git a/accounting/tsconfig.json b/accounting/tsconfig.json
new file mode 100644
index 0000000000..69ee4cf52f
--- /dev/null
+++ b/accounting/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "accounting-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ace/all-tests.ts b/ace/all-tests.ts
index 80717ac5da..7a7ef50a75 100644
--- a/ace/all-tests.ts
+++ b/ace/all-tests.ts
@@ -1,9 +1,9 @@
-/// <reference path="ace.d.ts" />
+
 
 var exports: any;
 var assert: any;
-var MockRenderer = null;
-var JavaScriptMode = null;
+var MockRenderer: any = null;
+var JavaScriptMode: any = null;
 
 /// <reference path="tests/ace-default-tests.ts" />
 /// <reference path="tests/ace-background_tokenizer-tests.ts" />
diff --git a/ace/all-tests.ts.tscparams b/ace/all-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/ace/all-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ace/ace.d.ts b/ace/index.d.ts
similarity index 100%
rename from ace/ace.d.ts
rename to ace/index.d.ts
diff --git a/ace/tests/ace-anchor-tests.ts b/ace/tests/ace-anchor-tests.ts
index 08ca8f43fc..2cec45ce1d 100644
--- a/ace/tests/ace-anchor-tests.ts
+++ b/ace/tests/ace-anchor-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../ace.d.ts" />
+
 
 var assert: any;
 var exports = {
diff --git a/ace/tests/ace-anchor-tests.ts.tscparams b/ace/tests/ace-anchor-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/ace/tests/ace-anchor-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ace/tests/ace-background_tokenizer-tests.ts b/ace/tests/ace-background_tokenizer-tests.ts
index 8f54bae51c..b77a9e0072 100644
--- a/ace/tests/ace-background_tokenizer-tests.ts
+++ b/ace/tests/ace-background_tokenizer-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../ace.d.ts" />
+
 
 var assert: any;
 
diff --git a/ace/tests/ace-background_tokenizer-tests.ts.tscparams b/ace/tests/ace-background_tokenizer-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/ace/tests/ace-background_tokenizer-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ace/tests/ace-default-tests.ts b/ace/tests/ace-default-tests.ts
index f8a280c1a2..eed0e42c5b 100644
--- a/ace/tests/ace-default-tests.ts
+++ b/ace/tests/ace-default-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../ace.d.ts" />
+
 
 var assert: any;
 var editor = ace.edit("editor");
diff --git a/ace/tests/ace-default-tests.ts.tscparams b/ace/tests/ace-default-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/ace/tests/ace-default-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ace/tests/ace-document-tests.ts b/ace/tests/ace-document-tests.ts
index 7fc342f746..8760717d61 100644
--- a/ace/tests/ace-document-tests.ts
+++ b/ace/tests/ace-document-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../ace.d.ts" />
+
 
 var assert: any;
 var exports = {
diff --git a/ace/tests/ace-document-tests.ts.tscparams b/ace/tests/ace-document-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/ace/tests/ace-document-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ace/tests/ace-edit_session-tests.ts b/ace/tests/ace-edit_session-tests.ts
index caa2f1729a..c057cb1297 100644
--- a/ace/tests/ace-edit_session-tests.ts
+++ b/ace/tests/ace-edit_session-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../ace.d.ts" />
+
 
 var lang: any;
 var assert: any;
diff --git a/ace/tests/ace-edit_session-tests.ts.tscparams b/ace/tests/ace-edit_session-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/ace/tests/ace-edit_session-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ace/tests/ace-editor1-tests.ts b/ace/tests/ace-editor1-tests.ts
index 78d3aff044..c14d344dae 100644
--- a/ace/tests/ace-editor1-tests.ts
+++ b/ace/tests/ace-editor1-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../ace.d.ts" />
+
 
 var assert: any;
 var exports = {
diff --git a/ace/tests/ace-editor1-tests.ts.tscparams b/ace/tests/ace-editor1-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/ace/tests/ace-editor1-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ace/tests/ace-editor_highlight_selected_word-tests.ts b/ace/tests/ace-editor_highlight_selected_word-tests.ts
index e02f32366a..da17d37c81 100644
--- a/ace/tests/ace-editor_highlight_selected_word-tests.ts
+++ b/ace/tests/ace-editor_highlight_selected_word-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../ace.d.ts" />
+
 
 var lipsum = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. " +
              "Mauris at arcu mi, eu lobortis mauris. Quisque ut libero eget " +
diff --git a/ace/tests/ace-editor_highlight_selected_word-tests.ts.tscparams b/ace/tests/ace-editor_highlight_selected_word-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/ace/tests/ace-editor_highlight_selected_word-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ace/tests/ace-editor_navigation-tests.ts b/ace/tests/ace-editor_navigation-tests.ts
index b68ae9b9dc..407b1af5de 100644
--- a/ace/tests/ace-editor_navigation-tests.ts
+++ b/ace/tests/ace-editor_navigation-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../ace.d.ts" />
+
 
 var assert: any;
 var renderer: AceAjax.VirtualRenderer;
diff --git a/ace/tests/ace-editor_navigation-tests.ts.tscparams b/ace/tests/ace-editor_navigation-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/ace/tests/ace-editor_navigation-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ace/tests/ace-editor_text_edit-tests.ts b/ace/tests/ace-editor_text_edit-tests.ts
index 6231830163..b170fd051c 100644
--- a/ace/tests/ace-editor_text_edit-tests.ts
+++ b/ace/tests/ace-editor_text_edit-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../ace.d.ts" />
+
 
 var assert: any;
 var renderer: AceAjax.VirtualRenderer;
diff --git a/ace/tests/ace-multi_select-tests.ts b/ace/tests/ace-multi_select-tests.ts
index 68c7d1af95..cc571cfee3 100644
--- a/ace/tests/ace-multi_select-tests.ts
+++ b/ace/tests/ace-multi_select-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../ace.d.ts" />
+
 
 var assert: any;
 var editor: any;
diff --git a/ace/tests/ace-multi_select-tests.ts.tscparams b/ace/tests/ace-multi_select-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/ace/tests/ace-multi_select-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ace/tests/ace-placeholder-tests.ts b/ace/tests/ace-placeholder-tests.ts
index b9693da372..ba0b27ca88 100644
--- a/ace/tests/ace-placeholder-tests.ts
+++ b/ace/tests/ace-placeholder-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../ace.d.ts" />
+
 
 var assert: any;
 var renderer: AceAjax.VirtualRenderer;
diff --git a/ace/tests/ace-placeholder-tests.ts.tscparams b/ace/tests/ace-placeholder-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/ace/tests/ace-placeholder-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ace/tests/ace-range-tests.ts b/ace/tests/ace-range-tests.ts
index 8e560e8d22..a32c74fbde 100644
--- a/ace/tests/ace-range-tests.ts
+++ b/ace/tests/ace-range-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../ace.d.ts" />
+
 
 var assert: any;
 var exports = {
diff --git a/ace/tests/ace-range_list-tests.ts b/ace/tests/ace-range_list-tests.ts
index 3a531579eb..f1f06214f9 100644
--- a/ace/tests/ace-range_list-tests.ts
+++ b/ace/tests/ace-range_list-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../ace.d.ts" />
+
 
 var assert: any;
 function flatten(rangeList) {
diff --git a/ace/tests/ace-range_list-tests.ts.tscparams b/ace/tests/ace-range_list-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/ace/tests/ace-range_list-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ace/tests/ace-search-tests.ts b/ace/tests/ace-search-tests.ts
index 14b53397bb..4857d5bfdc 100644
--- a/ace/tests/ace-search-tests.ts
+++ b/ace/tests/ace-search-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../ace.d.ts" />
+
 
 var assert: any;
 var exports = {
diff --git a/ace/tests/ace-selection-tests.ts b/ace/tests/ace-selection-tests.ts
index 884631085e..ab151b88bc 100644
--- a/ace/tests/ace-selection-tests.ts
+++ b/ace/tests/ace-selection-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../ace.d.ts" />
+
 
 var assert: any;
 var exports = {
diff --git a/ace/tests/ace-selection-tests.ts.tscparams b/ace/tests/ace-selection-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/ace/tests/ace-selection-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ace/tests/ace-token_iterator-tests.ts b/ace/tests/ace-token_iterator-tests.ts
index 892d781b95..27856a7434 100644
--- a/ace/tests/ace-token_iterator-tests.ts
+++ b/ace/tests/ace-token_iterator-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../ace.d.ts" />
+
 
 var assert: any;
 var mode: any;
diff --git a/ace/tests/ace-token_iterator-tests.ts.tscparams b/ace/tests/ace-token_iterator-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/ace/tests/ace-token_iterator-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ace/tests/ace-virtual_renderer-tests.ts b/ace/tests/ace-virtual_renderer-tests.ts
index 51f349dad3..71b1d86bf1 100644
--- a/ace/tests/ace-virtual_renderer-tests.ts
+++ b/ace/tests/ace-virtual_renderer-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../ace.d.ts" />
+
 
 var assert: any;
 var exports = {
diff --git a/ace/tests/ace-virtual_renderer-tests.ts.tscparams b/ace/tests/ace-virtual_renderer-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/ace/tests/ace-virtual_renderer-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ace/tsconfig.json b/ace/tsconfig.json
new file mode 100644
index 0000000000..c76f465da5
--- /dev/null
+++ b/ace/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "all-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/acl/acl-mongodbBackend-tests.ts b/acl/acl-mongodbBackend-tests.ts
index 01c9af9082..ae3b1d03c9 100644
--- a/acl/acl-mongodbBackend-tests.ts
+++ b/acl/acl-mongodbBackend-tests.ts
@@ -1,10 +1,8 @@
-/// <reference path='acl.d.ts'/>
-
 // https://github.com/OptimalBits/node_acl/blob/master/Readme.md
 import Acl = require('acl');
 import mongodb = require('mongodb');
 
-var db: mongodb.Db;
+declare var db: mongodb.Db;
 
 // Using the mongo db backend
 var acl = new Acl(new Acl.mongodbBackend(db, 'acl_', true));
diff --git a/acl/acl-redisBackend-tests.ts b/acl/acl-redisBackend-tests.ts
index 273aeab3b7..ec1924cce6 100644
--- a/acl/acl-redisBackend-tests.ts
+++ b/acl/acl-redisBackend-tests.ts
@@ -1,10 +1,8 @@
-/// <reference path='acl.d.ts'/>
-
 // https://github.com/OptimalBits/node_acl/blob/master/Readme.md
 import Acl = require('acl');
 import redis = require('redis');
 
-var client: redis.RedisClient;
+declare var client: redis.RedisClient;
 
 // Using the redis backend
 var acl = new Acl(new Acl.redisBackend(client, 'acl_'));
diff --git a/acl/acl-tests.ts b/acl/acl-tests.ts
index 551ad9c1cd..07dc401891 100644
--- a/acl/acl-tests.ts
+++ b/acl/acl-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path='acl.d.ts'/>
-
 // Sample code from
 // https://github.com/OptimalBits/node_acl/blob/master/Readme.md
 import Acl = require('acl');
diff --git a/acl/acl.d.ts b/acl/acl.d.ts
deleted file mode 100644
index 06defa2449..0000000000
--- a/acl/acl.d.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-// Type definitions for node_acl 0.4.7
-// Project: https://github.com/optimalbits/node_acl
-// Definitions by: Qubo <https://github.com/tkQubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../bluebird/bluebird.d.ts" />
-/// <reference path='../node/node.d.ts'/>
-
-/// <reference path='../redis/redis.d.ts'/>
-/// <reference path="../mongodb/mongodb-1.4.9.d.ts" />
-
-declare module "acl" {
-  import http = require('http');
-  import Promise = require("bluebird");
-
-  type strings = string|string[];
-  type Value = string|number;
-  type Values = Value|Value[];
-  type Action = () => any;
-  type Callback = (err: Error) => any;
-  type AnyCallback = (err: Error, obj: any) => any;
-  type AllowedCallback = (err: Error, allowed: boolean) => any;
-  type GetUserId = (req: http.ServerRequest, res: http.ServerResponse) => Value;
-
-  interface AclStatic {
-    new (backend: Backend<any>, logger: Logger, options: Option): Acl;
-    new (backend: Backend<any>, logger: Logger): Acl;
-    new (backend: Backend<any>): Acl;
-    memoryBackend: MemoryBackendStatic;
-  }
-
-  interface Logger {
-    debug: (msg: string)=>any;
-  }
-
-  interface Acl {
-    addUserRoles: (userId: Value, roles: strings, cb?: Callback) => Promise<void>;
-    removeUserRoles: (userId: Value, roles: strings, cb?: Callback) => Promise<void>;
-    userRoles: (userId: Value, cb?: (err: Error, roles: string[])=>any) => Promise<string[]>;
-    roleUsers: (role: Value, cb?: (err: Error, users: Values)=>any) => Promise<any>;
-    hasRole: (userId: Value, role: string, cb?: (err: Error, isInRole: boolean)=>any) => Promise<boolean>;
-    addRoleParents: (role: string, parents: Values, cb?: Callback) => Promise<void>;
-    removeRole: (role: string, cb?: Callback) => Promise<void>;
-    removeResource: (resource: string, cb?: Callback) => Promise<void>;
-    allow: {
-      (roles: Values, resources: strings, permissions: strings, cb?: Callback): Promise<void>;
-      (aclSets: AclSet|AclSet[]): Promise<void>;
-    }
-    removeAllow: (role: string, resources: strings, permissions: strings, cb?: Callback) => Promise<void>;
-    removePermissions: (role: string, resources: strings, permissions: strings, cb?: Function) => Promise<void>;
-    allowedPermissions: (userId: Value, resources: strings, cb?: AnyCallback) => Promise<void>;
-    isAllowed: (userId: Value, resources: strings, permissions: strings, cb?: AllowedCallback) => Promise<boolean>;
-    areAnyRolesAllowed: (roles: strings, resource: strings, permissions: strings, cb?: AllowedCallback) => Promise<any>;
-    whatResources: (roles: strings, permissions: strings, cb?: AnyCallback) => Promise<any>;
-    permittedResources: (roles: strings, permissions: strings, cb?: Function) => Promise<void>;
-    middleware: (numPathComponents: number, userId: Value|GetUserId, actions: strings) => Promise<any>;
-  }
-
-  interface Option {
-    buckets?: BucketsOption;
-  }
-
-  interface BucketsOption {
-    meta?: string;
-    parents?: string;
-    permissions?: string;
-    resources?: string;
-    roles?: string;
-    users?: string;
-  }
-
-  interface AclSet {
-    roles: strings;
-    allows: AclAllow[];
-  }
-
-  interface AclAllow {
-    resources: strings;
-    permissions: strings;
-  }
-
-  interface MemoryBackend extends Backend<Action[]> { }
-  interface MemoryBackendStatic {
-    new(): MemoryBackend;
-  }
-
-  //
-  // For internal use
-  //
-  interface Backend<T> {
-    begin: () => T;
-    end: (transaction: T, cb?: Action) => void;
-    clean: (cb?: Action) => void;
-    get: (bucket: string, key: Value, cb?: Action) => void;
-    union: (bucket: string, keys: Value[], cb?: Action) => void;
-    add: (transaction: T, bucket: string, key: Value, values: Values) => void;
-    del: (transaction: T, bucket: string, keys: Value[]) => void;
-    remove: (transaction: T, bucket: string, key: Value, values: Values) => void;
-
-    endAsync: Function; //TODO: Give more specific function signature
-    getAsync: Function;
-    cleanAsync: Function;
-    unionAsync: Function;
-  }
-
-  interface Contract {
-    (args: IArguments): Contract|NoOp;
-    debug: boolean;
-    fulfilled: boolean;
-    args: any[];
-    checkedParams: string[];
-    params: (...types: string[]) => Contract|NoOp;
-    end: () => void;
-  }
-
-  interface NoOp {
-    params: (...types: string[]) => NoOp;
-    end: () => void;
-  }
-
-  // for redis backend
-  import redis = require('redis');
-
-  interface AclStatic {
-    redisBackend: RedisBackendStatic;
-  }
-
-  interface RedisBackend extends Backend<redis.RedisClient> { }
-  interface RedisBackendStatic {
-    new(redis: redis.RedisClient, prefix: string): RedisBackend;
-    new(redis: redis.RedisClient): RedisBackend;
-  }
-
-  // for mongodb backend
-  import mongo = require('mongodb');
-
-  interface AclStatic {
-    mongodbBackend: MongodbBackendStatic;
-  }
-
-  interface MongodbBackend extends Backend<Callback> { }
-  interface MongodbBackendStatic {
-    new(db: mongo.Db, prefix: string, useSingle: boolean): MongodbBackend;
-    new(db: mongo.Db, prefix: string): MongodbBackend;
-    new(db: mongo.Db): MongodbBackend;
-  }
-
-  var _: AclStatic;
-  export = _;
-}
diff --git a/acl/index.d.ts b/acl/index.d.ts
new file mode 100644
index 0000000000..6939c9ce9f
--- /dev/null
+++ b/acl/index.d.ts
@@ -0,0 +1,145 @@
+// Type definitions for node_acl 0.4.7
+// Project: https://github.com/optimalbits/node_acl
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="bluebird" />
+/// <reference types="node"/>
+
+import http = require('http');
+import Promise = require("bluebird");
+
+type strings = string | string[];
+type Value = string | number;
+type Values = Value | Value[];
+type Action = () => any;
+type Callback = (err: Error) => any;
+type AnyCallback = (err: Error, obj: any) => any;
+type AllowedCallback = (err: Error, allowed: boolean) => any;
+type GetUserId = (req: http.ServerRequest, res: http.ServerResponse) => Value;
+
+interface AclStatic {
+    new (backend: Backend<any>, logger: Logger, options: Option): Acl;
+    new (backend: Backend<any>, logger: Logger): Acl;
+    new (backend: Backend<any>): Acl;
+    memoryBackend: MemoryBackendStatic;
+}
+
+interface Logger {
+    debug: (msg: string) => any;
+}
+
+interface Acl {
+    addUserRoles: (userId: Value, roles: strings, cb?: Callback) => Promise<void>;
+    removeUserRoles: (userId: Value, roles: strings, cb?: Callback) => Promise<void>;
+    userRoles: (userId: Value, cb?: (err: Error, roles: string[]) => any) => Promise<string[]>;
+    roleUsers: (role: Value, cb?: (err: Error, users: Values) => any) => Promise<any>;
+    hasRole: (userId: Value, role: string, cb?: (err: Error, isInRole: boolean) => any) => Promise<boolean>;
+    addRoleParents: (role: string, parents: Values, cb?: Callback) => Promise<void>;
+    removeRole: (role: string, cb?: Callback) => Promise<void>;
+    removeResource: (resource: string, cb?: Callback) => Promise<void>;
+    allow: {
+        (roles: Values, resources: strings, permissions: strings, cb?: Callback): Promise<void>;
+        (aclSets: AclSet | AclSet[]): Promise<void>;
+    }
+    removeAllow: (role: string, resources: strings, permissions: strings, cb?: Callback) => Promise<void>;
+    removePermissions: (role: string, resources: strings, permissions: strings, cb?: Function) => Promise<void>;
+    allowedPermissions: (userId: Value, resources: strings, cb?: AnyCallback) => Promise<void>;
+    isAllowed: (userId: Value, resources: strings, permissions: strings, cb?: AllowedCallback) => Promise<boolean>;
+    areAnyRolesAllowed: (roles: strings, resource: strings, permissions: strings, cb?: AllowedCallback) => Promise<any>;
+    whatResources: (roles: strings, permissions: strings, cb?: AnyCallback) => Promise<any>;
+    permittedResources: (roles: strings, permissions: strings, cb?: Function) => Promise<void>;
+    middleware: (numPathComponents: number, userId: Value | GetUserId, actions: strings) => Promise<any>;
+}
+
+interface Option {
+    buckets?: BucketsOption;
+}
+
+interface BucketsOption {
+    meta?: string;
+    parents?: string;
+    permissions?: string;
+    resources?: string;
+    roles?: string;
+    users?: string;
+}
+
+interface AclSet {
+    roles: strings;
+    allows: AclAllow[];
+}
+
+interface AclAllow {
+    resources: strings;
+    permissions: strings;
+}
+
+interface MemoryBackend extends Backend<Action[]> { }
+interface MemoryBackendStatic {
+    new (): MemoryBackend;
+}
+
+//
+// For internal use
+//
+interface Backend<T> {
+    begin: () => T;
+    end: (transaction: T, cb?: Action) => void;
+    clean: (cb?: Action) => void;
+    get: (bucket: string, key: Value, cb?: Action) => void;
+    union: (bucket: string, keys: Value[], cb?: Action) => void;
+    add: (transaction: T, bucket: string, key: Value, values: Values) => void;
+    del: (transaction: T, bucket: string, keys: Value[]) => void;
+    remove: (transaction: T, bucket: string, key: Value, values: Values) => void;
+
+    endAsync: Function; //TODO: Give more specific function signature
+    getAsync: Function;
+    cleanAsync: Function;
+    unionAsync: Function;
+}
+
+interface Contract {
+    (args: IArguments): Contract | NoOp;
+    debug: boolean;
+    fulfilled: boolean;
+    args: any[];
+    checkedParams: string[];
+    params: (...types: string[]) => Contract | NoOp;
+    end: () => void;
+}
+
+interface NoOp {
+    params: (...types: string[]) => NoOp;
+    end: () => void;
+}
+
+// for redis backend
+import redis = require('redis');
+
+interface AclStatic {
+    redisBackend: RedisBackendStatic;
+}
+
+interface RedisBackend extends Backend<redis.RedisClient> { }
+interface RedisBackendStatic {
+    new (redis: redis.RedisClient, prefix: string): RedisBackend;
+    new (redis: redis.RedisClient): RedisBackend;
+}
+
+// for mongodb backend
+import mongo = require('mongodb');
+
+interface AclStatic {
+    mongodbBackend: MongodbBackendStatic;
+}
+
+interface MongodbBackend extends Backend<Callback> { }
+interface MongodbBackendStatic {
+    new (db: mongo.Db, prefix: string, useSingle: boolean): MongodbBackend;
+    new (db: mongo.Db, prefix: string): MongodbBackend;
+    new (db: mongo.Db): MongodbBackend;
+}
+
+declare var _: AclStatic;
+export = _;
diff --git a/acl/tsconfig.json b/acl/tsconfig.json
new file mode 100644
index 0000000000..3c28b25610
--- /dev/null
+++ b/acl/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "acl-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/acorn/acorn-tests.ts b/acorn/acorn-tests.ts
index 796ffc3eed..3b2a116897 100644
--- a/acorn/acorn-tests.ts
+++ b/acorn/acorn-tests.ts
@@ -1,13 +1,12 @@
-/// <reference path="../estree/estree.d.ts" />
-/// <reference path="acorn.d.ts" />
+/// <reference types="estree" />
 
 import acorn = require('acorn');
 
-var token: acorn.Token;
-var tokens: acorn.Token[];
-var comment: acorn.Comment;
-var comments: acorn.Comment[];
-var program: ESTree.Program;
+declare var token: acorn.Token;
+declare var tokens: acorn.Token[];
+declare var comment: acorn.Comment;
+declare var comments: acorn.Comment[];
+declare var program: ESTree.Program;
 var any: any;
 var string: string;
 
diff --git a/acorn/acorn.d.ts b/acorn/acorn.d.ts
deleted file mode 100644
index 755aab2a54..0000000000
--- a/acorn/acorn.d.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-// Type definitions for Acorn v1.0.1
-// Project: https://github.com/marijnh/acorn
-// Definitions by: RReverser <https://github.com/RReverser>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../estree/estree.d.ts" />
-
-declare namespace acorn {
-    var version: string;
-    function parse(input: string, options?: Options): ESTree.Program;
-    function parseExpressionAt(input: string, pos: number, options?: Options): ESTree.Expression;
-    function getLineInfo(input: string, offset: number): ESTree.Position;
-    var defaultOptions: Options;
-
-    interface TokenType {
-        label: string;
-        keyword: string;
-        beforeExpr: boolean;
-        startsExpr: boolean;
-        isLoop: boolean;
-        isAssign: boolean;
-        prefix: boolean;
-        postfix: boolean;
-        binop: number;
-        updateContext: (prevType: TokenType) => any;
-    }
-
-    interface AbstractToken {
-        start: number;
-        end: number;
-        loc: ESTree.SourceLocation;
-        range: [number, number];
-    }
-
-    interface Token extends AbstractToken {
-        type: TokenType;
-        value: any;
-    }
-
-    interface Comment extends AbstractToken {
-        type: string;
-        value: string;
-    }
-
-    interface Options {
-        ecmaVersion?: number;
-        sourceType?: string;
-        onInsertedSemicolon?: (lastTokEnd: number, lastTokEndLoc?: ESTree.Position) => any;
-        onTrailingComma?: (lastTokEnd: number, lastTokEndLoc?: ESTree.Position) => any;
-        allowReserved?: boolean;
-        allowReturnOutsideFunction?: boolean;
-        allowImportExportEverywhere?: boolean;
-        allowHashBang?: boolean;
-        locations?: boolean;
-        onToken?: ((token: Token) => any) | Token[];
-        onComment?: ((isBlock: boolean, text: string, start: number, end: number, startLoc?: ESTree.Position, endLoc?: ESTree.Position) => any) | Comment[];
-        ranges?: boolean;
-        program?: ESTree.Program;
-        sourceFile?: string;
-        directSourceFile?: string;
-        preserveParens?: boolean;
-        plugins?: { [name: string]: Function; };
-    }
-}
-
-declare module "acorn" {
-    export = acorn
-}
diff --git a/acorn/index.d.ts b/acorn/index.d.ts
new file mode 100644
index 0000000000..c7b76692c6
--- /dev/null
+++ b/acorn/index.d.ts
@@ -0,0 +1,67 @@
+// Type definitions for Acorn v1.0.1
+// Project: https://github.com/marijnh/acorn
+// Definitions by: RReverser <https://github.com/RReverser>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="estree" />
+
+export as namespace acorn;
+export = acorn;
+
+declare namespace acorn {
+    var version: string;
+    function parse(input: string, options?: Options): ESTree.Program;
+    function parseExpressionAt(input: string, pos: number, options?: Options): ESTree.Expression;
+    function getLineInfo(input: string, offset: number): ESTree.Position;
+    var defaultOptions: Options;
+
+    interface TokenType {
+        label: string;
+        keyword: string;
+        beforeExpr: boolean;
+        startsExpr: boolean;
+        isLoop: boolean;
+        isAssign: boolean;
+        prefix: boolean;
+        postfix: boolean;
+        binop: number;
+        updateContext: (prevType: TokenType) => any;
+    }
+
+    interface AbstractToken {
+        start: number;
+        end: number;
+        loc: ESTree.SourceLocation;
+        range: [number, number];
+    }
+
+    interface Token extends AbstractToken {
+        type: TokenType;
+        value: any;
+    }
+
+    interface Comment extends AbstractToken {
+        type: string;
+        value: string;
+    }
+
+    interface Options {
+        ecmaVersion?: number;
+        sourceType?: string;
+        onInsertedSemicolon?: (lastTokEnd: number, lastTokEndLoc?: ESTree.Position) => any;
+        onTrailingComma?: (lastTokEnd: number, lastTokEndLoc?: ESTree.Position) => any;
+        allowReserved?: boolean;
+        allowReturnOutsideFunction?: boolean;
+        allowImportExportEverywhere?: boolean;
+        allowHashBang?: boolean;
+        locations?: boolean;
+        onToken?: ((token: Token) => any) | Token[];
+        onComment?: ((isBlock: boolean, text: string, start: number, end: number, startLoc?: ESTree.Position, endLoc?: ESTree.Position) => any) | Comment[];
+        ranges?: boolean;
+        program?: ESTree.Program;
+        sourceFile?: string;
+        directSourceFile?: string;
+        preserveParens?: boolean;
+        plugins?: { [name: string]: Function; };
+    }
+}
diff --git a/acorn/tsconfig.json b/acorn/tsconfig.json
new file mode 100644
index 0000000000..7c27170693
--- /dev/null
+++ b/acorn/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "acorn-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/adal-angular/adal-angular-tests.ts b/adal/adal-angular-tests.ts
similarity index 97%
rename from adal-angular/adal-angular-tests.ts
rename to adal/adal-angular-tests.ts
index 930d94388f..64ab64c898 100644
--- a/adal-angular/adal-angular-tests.ts
+++ b/adal/adal-angular-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="adal-angular.d.ts" />
+
 
 // Code samples from:
 //  - https://github.com/AzureAD/azure-activedirectory-library-for-js
diff --git a/adal-angular/adal-angular.d.ts b/adal/adal-angular.d.ts
similarity index 92%
rename from adal-angular/adal-angular.d.ts
rename to adal/adal-angular.d.ts
index 1d0b88d55a..7b8cbb849e 100644
--- a/adal-angular/adal-angular.d.ts
+++ b/adal/adal-angular.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: mmaitre314 <https://github.com/mmaitre314>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="adal.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
+
+/// <reference types="angularjs" />
 
 declare namespace adal {
 
diff --git a/adal-angular/adal-tests.ts b/adal/adal-tests.ts
similarity index 92%
rename from adal-angular/adal-tests.ts
rename to adal/adal-tests.ts
index 598134d0a0..4931a7befb 100644
--- a/adal-angular/adal-tests.ts
+++ b/adal/adal-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="adal.d.ts" />
+
 
 var endpoints = {
     "https://yourhost/api": "b6a68585-5287-45b2-ba82-383ba1f60932",
diff --git a/adal-angular/adal.d.ts b/adal/index.d.ts
similarity index 100%
rename from adal-angular/adal.d.ts
rename to adal/index.d.ts
diff --git a/adal/tsconfig.json b/adal/tsconfig.json
new file mode 100644
index 0000000000..af9df9e110
--- /dev/null
+++ b/adal/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "adal-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/add2home/add2home-tests.ts b/add2home/add2home-tests.ts
index 371a8f752a..aeb14a1d18 100644
--- a/add2home/add2home-tests.ts
+++ b/add2home/add2home-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="add2home.d.ts" />
+
 
 addToHome.show(false);
 addToHome.close();
diff --git a/add2home/add2home.d.ts b/add2home/index.d.ts
similarity index 100%
rename from add2home/add2home.d.ts
rename to add2home/index.d.ts
diff --git a/add2home/tsconfig.json b/add2home/tsconfig.json
new file mode 100644
index 0000000000..9403be7717
--- /dev/null
+++ b/add2home/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "add2home-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/adm-zip/adm-zip-tests.ts b/adm-zip/adm-zip-tests.ts
index 8637751bfa..2418597087 100644
--- a/adm-zip/adm-zip-tests.ts
+++ b/adm-zip/adm-zip-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="adm-zip.d.ts" />
+
 import AdmZip = require("adm-zip");
 
 // reading archives
diff --git a/adm-zip/adm-zip.d.ts b/adm-zip/adm-zip.d.ts
deleted file mode 100644
index 19298149c3..0000000000
--- a/adm-zip/adm-zip.d.ts
+++ /dev/null
@@ -1,307 +0,0 @@
-// Type definitions for adm-zip v0.4.4
-// Project: https://github.com/cthackers/adm-zip
-// Definitions by: John Vilk <https://github.com/jvilk>, Abner Oliveira <https://github.com/abner>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "adm-zip" {
-    class AdmZip {
-        /**
-         * Create a new, empty archive.
-         */
-        constructor();
-        /**
-         * Read an existing archive.
-         */
-        constructor(fileName: string);
-        /**
-         * Extracts the given entry from the archive and returns the content as a
-         * Buffer object.
-         * @param entry String with the full path of the entry
-         * @return Buffer or Null in case of error
-         */
-        readFile(entry: string): Buffer;
-        /**
-         * Extracts the given entry from the archive and returns the content as a
-         * Buffer object.
-         * @param entry ZipEntry object
-         * @return Buffer or Null in case of error
-         */
-        readFile(entry: AdmZip.IZipEntry): Buffer;
-        /**
-         * Asynchronous readFile
-         * @param entry String with the full path of the entry
-         * @param callback Called with a Buffer or Null in case of error
-         */
-        readFileAsync(entry: string, callback: (data: Buffer, err: string) => any): void;
-        /**
-         * Asynchronous readFile
-         * @param entry ZipEntry object
-         * @param callback Called with a Buffer or Null in case of error
-         * @return Buffer or Null in case of error
-         */
-        readFileAsync(entry: AdmZip.IZipEntry, callback: (data: Buffer, err: string) => any): void;
-        /**
-         * Extracts the given entry from the archive and returns the content as
-         * plain text in the given encoding
-         * @param entry String with the full path of the entry
-         * @param encoding Optional. If no encoding is specified utf8 is used
-         * @return String
-         */
-        readAsText(fileName: string, encoding?: string): string;
-        /**
-         * Extracts the given entry from the archive and returns the content as
-         * plain text in the given encoding
-         * @param entry ZipEntry object
-         * @param encoding Optional. If no encoding is specified utf8 is used
-         * @return String
-         */
-        readAsText(fileName: AdmZip.IZipEntry, encoding?: string): string;
-        /**
-         * Asynchronous readAsText
-         * @param entry String with the full path of the entry
-         * @param callback Called with the resulting string.
-         * @param encoding Optional. If no encoding is specified utf8 is used
-         */
-        readAsTextAsync(fileName: string, callback: (data: string) => any, encoding?: string): void;
-        /**
-         * Asynchronous readAsText
-         * @param entry ZipEntry object
-         * @param callback Called with the resulting string.
-         * @param encoding Optional. If no encoding is specified utf8 is used
-         */
-        readAsTextAsync(fileName: AdmZip.IZipEntry, callback: (data: string) => any, encoding?: string): void;
-        /**
-         * Remove the entry from the file or the entry and all its nested directories
-         * and files if the given entry is a directory
-         * @param entry String with the full path of the entry
-         */
-        deleteFile(entry: string): void;
-        /**
-         * Remove the entry from the file or the entry and all its nested directories
-         * and files if the given entry is a directory
-         * @param entry A ZipEntry object.
-         */
-        deleteFile(entry: AdmZip.IZipEntry): void;
-        /**
-         * Adds a comment to the zip. The zip must be rewritten after
-         * adding the comment.
-         * @param comment Content of the comment.
-         */
-        addZipComment(comment: string): void;
-        /**
-         * Returns the zip comment
-         * @return The zip comment.
-         */
-        getZipComment(): string;
-        /**
-         * Adds a comment to a specified zipEntry. The zip must be rewritten after
-         * adding the comment.
-         * The comment cannot exceed 65535 characters in length.
-         * @param entry String with the full path of the entry
-         * @param comment The comment to add to the entry.
-         */
-        addZipEntryComment(entry: string, comment: string): void;
-        /**
-         * Adds a comment to a specified zipEntry. The zip must be rewritten after
-         * adding the comment.
-         * The comment cannot exceed 65535 characters in length.
-         * @param entry ZipEntry object.
-         * @param comment The comment to add to the entry.
-         */
-        addZipEntryComment(entry: AdmZip.IZipEntry, comment: string): void;
-        /**
-         * Returns the comment of the specified entry.
-         * @param entry String with the full path of the entry.
-         * @return String The comment of the specified entry.
-         */
-        getZipEntryComment(entry: string): string;
-        /**
-         * Returns the comment of the specified entry
-         * @param entry ZipEntry object.
-         * @return String The comment of the specified entry.
-         */
-        getZipEntryComment(entry: AdmZip.IZipEntry): string;
-        /**
-         * Updates the content of an existing entry inside the archive. The zip
-         * must be rewritten after updating the content
-         * @param entry String with the full path of the entry.
-         * @param content The entry's new contents.
-         */
-        updateFile(entry: string, content: Buffer): void;
-        /**
-         * Updates the content of an existing entry inside the archive. The zip
-         * must be rewritten after updating the content
-         * @param entry ZipEntry object.
-         * @param content The entry's new contents.
-         */
-        updateFile(entry: AdmZip.IZipEntry, content: Buffer): void;
-        /**
-         * Adds a file from the disk to the archive.
-         * @param localPath Path to a file on disk.
-         * @param zipPath Path to a directory in the archive. Defaults to the empty
-         *   string.
-         */
-        addLocalFile(localPath: string, zipPath?: string): void;
-        /**
-         * Adds a local directory and all its nested files and directories to the
-         * archive.
-         * @param localPath Path to a folder on disk.
-         * @param zipPath Path to a folder in the archive. Defaults to an empty
-         *   string.
-         */
-        addLocalFolder(localPath: string, zipPath?: string): void;
-        /**
-         * Allows you to create a entry (file or directory) in the zip file.
-         * If you want to create a directory the entryName must end in / and a null
-         * buffer should be provided.
-         * @param entryName Entry path
-         * @param content Content to add to the entry; must be a 0-length buffer
-         *   for a directory.
-         * @param comment Comment to add to the entry.
-         * @param attr Attribute to add to the entry.
-         */
-        addFile(entryName: string, data: Buffer, comment?: string, attr?: number): void;
-        /**
-         * Returns an array of ZipEntry objects representing the files and folders
-         * inside the archive
-         */
-        getEntries(): AdmZip.IZipEntry[];
-        /**
-         * Returns a ZipEntry object representing the file or folder specified by
-         * ``name``.
-         * @param name Name of the file or folder to retrieve.
-         * @return ZipEntry The entry corresponding to the name.
-         */
-        getEntry(name: string): AdmZip.IZipEntry;
-        /**
-         * Extracts the given entry to the given targetPath.
-         * If the entry is a directory inside the archive, the entire directory and
-         * its subdirectories will be extracted.
-         * @param entry String with the full path of the entry
-         * @param targetPath Target folder where to write the file
-         * @param maintainEntryPath If maintainEntryPath is true and the entry is
-         *   inside a folder, the entry folder will be created in targetPath as
-         *   well. Default is TRUE
-         * @param overwrite If the file already exists at the target path, the file
-         *   will be overwriten if this is true. Default is FALSE
-         *
-         * @return Boolean
-         */
-        extractEntryTo(entryPath: string, targetPath: string, maintainEntryPath?: boolean, overwrite?: boolean): boolean;
-        /**
-         * Extracts the given entry to the given targetPath.
-         * If the entry is a directory inside the archive, the entire directory and
-         * its subdirectories will be extracted.
-         * @param entry ZipEntry object
-         * @param targetPath Target folder where to write the file
-         * @param maintainEntryPath If maintainEntryPath is true and the entry is
-         *   inside a folder, the entry folder will be created in targetPath as
-         *   well. Default is TRUE
-         * @param overwrite If the file already exists at the target path, the file
-         *   will be overwriten if this is true. Default is FALSE
-         * @return Boolean
-         */
-        extractEntryTo(entryPath: AdmZip.IZipEntry, targetPath: string, maintainEntryPath?: boolean, overwrite?: boolean): boolean;
-        /**
-         * Extracts the entire archive to the given location
-         * @param targetPath Target location
-         * @param overwrite If the file already exists at the target path, the file
-         *   will be overwriten if this is true. Default is FALSE
-         */
-        extractAllTo(targetPath: string, overwrite?: boolean): void;
-        /**
-         * Extracts the entire archive to the given location
-         * @param targetPath Target location
-         * @param overwrite If the file already exists at the target path, the file
-         *   will be overwriten if this is true. Default is FALSE
-         * @param callback The callback function will be called afeter extraction
-         */
-        extractAllToAsync(targetPath: string, overwrite: boolean, callback: (error: Error) => void): void;
-        /**
-         * Writes the newly created zip file to disk at the specified location or
-         * if a zip was opened and no ``targetFileName`` is provided, it will
-         * overwrite the opened zip
-         * @param targetFileName
-         */
-        writeZip(targetPath?: string): void;
-        /**
-         * Returns the content of the entire zip file as a Buffer object
-         * @return Buffer
-         */
-        toBuffer(): Buffer;
-    }
-
-    namespace AdmZip {
-        /**
-         * The ZipEntry is more than a structure representing the entry inside the
-         * zip file. Beside the normal attributes and headers a entry can have, the
-         * class contains a reference to the part of the file where the compressed
-         * data resides and decompresses it when requested. It also compresses the
-         * data and creates the headers required to write in the zip file.
-         */
-        interface IZipEntry {
-            /**
-             * Represents the full name and path of the file
-             */
-            entryName: string;
-            rawEntryName: Buffer;
-            /**
-             * Extra data associated with this entry.
-             */
-            extra: Buffer;
-            /**
-             * Entry comment.
-             */
-            comment: string;
-            name: string;
-            /**
-             * Read-Only property that indicates the type of the entry.
-             */
-            isDirectory: boolean;
-            /**
-             * Get the header associated with this ZipEntry.
-             */
-            header: Buffer;
-            /**
-             * Retrieve the compressed data for this entry. Note that this may trigger
-             * compression if any properties were modified.
-             */
-            getCompressedData(): Buffer;
-            /**
-             * Asynchronously retrieve the compressed data for this entry. Note that
-             * this may trigger compression if any properties were modified.
-             */
-            getCompressedDataAsync(callback: (data: Buffer) => void): void;
-            /**
-             * Set the (uncompressed) data to be associated with this entry.
-             */
-            setData(value: string): void;
-            /**
-             * Set the (uncompressed) data to be associated with this entry.
-             */
-            setData(value: Buffer): void;
-            /**
-             * Get the decompressed data associated with this entry.
-             */
-            getData(): Buffer;
-            /**
-             * Asynchronously get the decompressed data associated with this entry.
-             */
-            getDataAsync(callback: (data: Buffer) => void): void;
-            /**
-             * Returns the CEN Entry Header to be written to the output zip file, plus
-             * the extra data and the entry comment.
-             */
-            packHeader(): Buffer;
-            /**
-             * Returns a nicely formatted string with the most important properties of
-             * the ZipEntry.
-             */
-            toString(): string;
-        }
-    }
-
-    export = AdmZip;
-}
diff --git a/adm-zip/index.d.ts b/adm-zip/index.d.ts
new file mode 100644
index 0000000000..f22b929b76
--- /dev/null
+++ b/adm-zip/index.d.ts
@@ -0,0 +1,306 @@
+// Type definitions for adm-zip v0.4.4
+// Project: https://github.com/cthackers/adm-zip
+// Definitions by: John Vilk <https://github.com/jvilk>, Abner Oliveira <https://github.com/abner>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+declare class AdmZip {
+    /**
+     * Create a new, empty archive.
+     */
+    constructor();
+    /**
+     * Read an existing archive.
+     */
+    constructor(fileName: string);
+    /**
+     * Extracts the given entry from the archive and returns the content as a
+     * Buffer object.
+     * @param entry String with the full path of the entry
+     * @return Buffer or Null in case of error
+     */
+    readFile(entry: string): Buffer;
+    /**
+     * Extracts the given entry from the archive and returns the content as a
+     * Buffer object.
+     * @param entry ZipEntry object
+     * @return Buffer or Null in case of error
+     */
+    readFile(entry: AdmZip.IZipEntry): Buffer;
+    /**
+     * Asynchronous readFile
+     * @param entry String with the full path of the entry
+     * @param callback Called with a Buffer or Null in case of error
+     */
+    readFileAsync(entry: string, callback: (data: Buffer, err: string) => any): void;
+    /**
+     * Asynchronous readFile
+     * @param entry ZipEntry object
+     * @param callback Called with a Buffer or Null in case of error
+     * @return Buffer or Null in case of error
+     */
+    readFileAsync(entry: AdmZip.IZipEntry, callback: (data: Buffer, err: string) => any): void;
+    /**
+     * Extracts the given entry from the archive and returns the content as
+     * plain text in the given encoding
+     * @param entry String with the full path of the entry
+     * @param encoding Optional. If no encoding is specified utf8 is used
+     * @return String
+     */
+    readAsText(fileName: string, encoding?: string): string;
+    /**
+     * Extracts the given entry from the archive and returns the content as
+     * plain text in the given encoding
+     * @param entry ZipEntry object
+     * @param encoding Optional. If no encoding is specified utf8 is used
+     * @return String
+     */
+    readAsText(fileName: AdmZip.IZipEntry, encoding?: string): string;
+    /**
+     * Asynchronous readAsText
+     * @param entry String with the full path of the entry
+     * @param callback Called with the resulting string.
+     * @param encoding Optional. If no encoding is specified utf8 is used
+     */
+    readAsTextAsync(fileName: string, callback: (data: string) => any, encoding?: string): void;
+    /**
+     * Asynchronous readAsText
+     * @param entry ZipEntry object
+     * @param callback Called with the resulting string.
+     * @param encoding Optional. If no encoding is specified utf8 is used
+     */
+    readAsTextAsync(fileName: AdmZip.IZipEntry, callback: (data: string) => any, encoding?: string): void;
+    /**
+     * Remove the entry from the file or the entry and all its nested directories
+     * and files if the given entry is a directory
+     * @param entry String with the full path of the entry
+     */
+    deleteFile(entry: string): void;
+    /**
+     * Remove the entry from the file or the entry and all its nested directories
+     * and files if the given entry is a directory
+     * @param entry A ZipEntry object.
+     */
+    deleteFile(entry: AdmZip.IZipEntry): void;
+    /**
+     * Adds a comment to the zip. The zip must be rewritten after
+     * adding the comment.
+     * @param comment Content of the comment.
+     */
+    addZipComment(comment: string): void;
+    /**
+     * Returns the zip comment
+     * @return The zip comment.
+     */
+    getZipComment(): string;
+    /**
+     * Adds a comment to a specified zipEntry. The zip must be rewritten after
+     * adding the comment.
+     * The comment cannot exceed 65535 characters in length.
+     * @param entry String with the full path of the entry
+     * @param comment The comment to add to the entry.
+     */
+    addZipEntryComment(entry: string, comment: string): void;
+    /**
+     * Adds a comment to a specified zipEntry. The zip must be rewritten after
+     * adding the comment.
+     * The comment cannot exceed 65535 characters in length.
+     * @param entry ZipEntry object.
+     * @param comment The comment to add to the entry.
+     */
+    addZipEntryComment(entry: AdmZip.IZipEntry, comment: string): void;
+    /**
+     * Returns the comment of the specified entry.
+     * @param entry String with the full path of the entry.
+     * @return String The comment of the specified entry.
+     */
+    getZipEntryComment(entry: string): string;
+    /**
+     * Returns the comment of the specified entry
+     * @param entry ZipEntry object.
+     * @return String The comment of the specified entry.
+     */
+    getZipEntryComment(entry: AdmZip.IZipEntry): string;
+    /**
+     * Updates the content of an existing entry inside the archive. The zip
+     * must be rewritten after updating the content
+     * @param entry String with the full path of the entry.
+     * @param content The entry's new contents.
+     */
+    updateFile(entry: string, content: Buffer): void;
+    /**
+     * Updates the content of an existing entry inside the archive. The zip
+     * must be rewritten after updating the content
+     * @param entry ZipEntry object.
+     * @param content The entry's new contents.
+     */
+    updateFile(entry: AdmZip.IZipEntry, content: Buffer): void;
+    /**
+     * Adds a file from the disk to the archive.
+     * @param localPath Path to a file on disk.
+     * @param zipPath Path to a directory in the archive. Defaults to the empty
+     *   string.
+     */
+    addLocalFile(localPath: string, zipPath?: string): void;
+    /**
+     * Adds a local directory and all its nested files and directories to the
+     * archive.
+     * @param localPath Path to a folder on disk.
+     * @param zipPath Path to a folder in the archive. Defaults to an empty
+     *   string.
+     */
+    addLocalFolder(localPath: string, zipPath?: string): void;
+    /**
+     * Allows you to create a entry (file or directory) in the zip file.
+     * If you want to create a directory the entryName must end in / and a null
+     * buffer should be provided.
+     * @param entryName Entry path
+     * @param content Content to add to the entry; must be a 0-length buffer
+     *   for a directory.
+     * @param comment Comment to add to the entry.
+     * @param attr Attribute to add to the entry.
+     */
+    addFile(entryName: string, data: Buffer, comment?: string, attr?: number): void;
+    /**
+     * Returns an array of ZipEntry objects representing the files and folders
+     * inside the archive
+     */
+    getEntries(): AdmZip.IZipEntry[];
+    /**
+     * Returns a ZipEntry object representing the file or folder specified by
+     * ``name``.
+     * @param name Name of the file or folder to retrieve.
+     * @return ZipEntry The entry corresponding to the name.
+     */
+    getEntry(name: string): AdmZip.IZipEntry;
+    /**
+     * Extracts the given entry to the given targetPath.
+     * If the entry is a directory inside the archive, the entire directory and
+     * its subdirectories will be extracted.
+     * @param entry String with the full path of the entry
+     * @param targetPath Target folder where to write the file
+     * @param maintainEntryPath If maintainEntryPath is true and the entry is
+     *   inside a folder, the entry folder will be created in targetPath as
+     *   well. Default is TRUE
+     * @param overwrite If the file already exists at the target path, the file
+     *   will be overwriten if this is true. Default is FALSE
+     *
+     * @return Boolean
+     */
+    extractEntryTo(entryPath: string, targetPath: string, maintainEntryPath?: boolean, overwrite?: boolean): boolean;
+    /**
+     * Extracts the given entry to the given targetPath.
+     * If the entry is a directory inside the archive, the entire directory and
+     * its subdirectories will be extracted.
+     * @param entry ZipEntry object
+     * @param targetPath Target folder where to write the file
+     * @param maintainEntryPath If maintainEntryPath is true and the entry is
+     *   inside a folder, the entry folder will be created in targetPath as
+     *   well. Default is TRUE
+     * @param overwrite If the file already exists at the target path, the file
+     *   will be overwriten if this is true. Default is FALSE
+     * @return Boolean
+     */
+    extractEntryTo(entryPath: AdmZip.IZipEntry, targetPath: string, maintainEntryPath?: boolean, overwrite?: boolean): boolean;
+    /**
+     * Extracts the entire archive to the given location
+     * @param targetPath Target location
+     * @param overwrite If the file already exists at the target path, the file
+     *   will be overwriten if this is true. Default is FALSE
+     */
+    extractAllTo(targetPath: string, overwrite?: boolean): void;
+    /**
+     * Extracts the entire archive to the given location
+     * @param targetPath Target location
+     * @param overwrite If the file already exists at the target path, the file
+     *   will be overwriten if this is true. Default is FALSE
+     * @param callback The callback function will be called afeter extraction
+     */
+    extractAllToAsync(targetPath: string, overwrite: boolean, callback: (error: Error) => void): void;
+    /**
+     * Writes the newly created zip file to disk at the specified location or
+     * if a zip was opened and no ``targetFileName`` is provided, it will
+     * overwrite the opened zip
+     * @param targetFileName
+     */
+    writeZip(targetPath?: string): void;
+    /**
+     * Returns the content of the entire zip file as a Buffer object
+     * @return Buffer
+     */
+    toBuffer(): Buffer;
+}
+
+declare namespace AdmZip {
+    /**
+     * The ZipEntry is more than a structure representing the entry inside the
+     * zip file. Beside the normal attributes and headers a entry can have, the
+     * class contains a reference to the part of the file where the compressed
+     * data resides and decompresses it when requested. It also compresses the
+     * data and creates the headers required to write in the zip file.
+     */
+    interface IZipEntry {
+        /**
+         * Represents the full name and path of the file
+         */
+        entryName: string;
+        rawEntryName: Buffer;
+        /**
+         * Extra data associated with this entry.
+         */
+        extra: Buffer;
+        /**
+         * Entry comment.
+         */
+        comment: string;
+        name: string;
+        /**
+         * Read-Only property that indicates the type of the entry.
+         */
+        isDirectory: boolean;
+        /**
+         * Get the header associated with this ZipEntry.
+         */
+        header: Buffer;
+        /**
+         * Retrieve the compressed data for this entry. Note that this may trigger
+         * compression if any properties were modified.
+         */
+        getCompressedData(): Buffer;
+        /**
+         * Asynchronously retrieve the compressed data for this entry. Note that
+         * this may trigger compression if any properties were modified.
+         */
+        getCompressedDataAsync(callback: (data: Buffer) => void): void;
+        /**
+         * Set the (uncompressed) data to be associated with this entry.
+         */
+        setData(value: string): void;
+        /**
+         * Set the (uncompressed) data to be associated with this entry.
+         */
+        setData(value: Buffer): void;
+        /**
+         * Get the decompressed data associated with this entry.
+         */
+        getData(): Buffer;
+        /**
+         * Asynchronously get the decompressed data associated with this entry.
+         */
+        getDataAsync(callback: (data: Buffer) => void): void;
+        /**
+         * Returns the CEN Entry Header to be written to the output zip file, plus
+         * the extra data and the entry comment.
+         */
+        packHeader(): Buffer;
+        /**
+         * Returns a nicely formatted string with the most important properties of
+         * the ZipEntry.
+         */
+        toString(): string;
+    }
+}
+
+export = AdmZip;
diff --git a/adm-zip/tsconfig.json b/adm-zip/tsconfig.json
new file mode 100644
index 0000000000..3f3e89e027
--- /dev/null
+++ b/adm-zip/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "adm-zip-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ag-grid/ag-grid-tests.ts b/ag-grid/ag-grid-tests.ts
index 67b98f9f33..7c4ebb0c8c 100644
--- a/ag-grid/ag-grid-tests.ts
+++ b/ag-grid/ag-grid-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="ag-grid" />
 
 checkGridOptions(<ag.grid.GridOptions>{});
 checkColDef(<ag.grid.ColDef>{});
diff --git a/ag-grid/ag-grid.d.ts b/ag-grid/index.d.ts
similarity index 100%
rename from ag-grid/ag-grid.d.ts
rename to ag-grid/index.d.ts
diff --git a/ag-grid/tsconfig.json b/ag-grid/tsconfig.json
new file mode 100644
index 0000000000..af7b7c89c6
--- /dev/null
+++ b/ag-grid/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "ag-grid-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/agenda/agenda-tests.ts b/agenda/agenda-tests.ts
index 6be618e59d..8c5e3e19bb 100644
--- a/agenda/agenda-tests.ts
+++ b/agenda/agenda-tests.ts
@@ -1,8 +1,5 @@
-///<reference path="agenda.d.ts"/>
-
 import * as Agenda from "agenda";
 
-
 var mongoConnectionString = "mongodb://127.0.0.1/agenda";
 
 var agenda = new Agenda({ db: { address: mongoConnectionString } });
diff --git a/agenda/agenda.d.ts b/agenda/agenda.d.ts
deleted file mode 100644
index 011676bc86..0000000000
--- a/agenda/agenda.d.ts
+++ /dev/null
@@ -1,443 +0,0 @@
-// Type definitions for Agenda v0.8.9
-// Project: https://github.com/rschmukler/agenda
-// Definitions by: Meir Gottlieb <https://github.com/meirgottlieb>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path='../node/node.d.ts' />
-/// <reference path='../mongodb/mongodb.d.ts' />
-
-declare module "agenda" {
-
-    import {EventEmitter} from "events";
-    import {Db, Collection, ObjectID} from "mongodb";
-
-    interface Callback {
-        (err?: Error): void;
-    }
-
-    interface ResultCallback<T> {
-        (err?: Error, result?: T): void;
-    }
-
-    /**
-     * Agenda Configuration.
-     */
-    interface AgendaConfiguration {
-
-        /**
-         * Sets the interval with which the queue is checked. A number in milliseconds or a frequency string.
-         */
-        processEvery?: string | number;
-
-        /**
-         * Takes a number which specifies the default number of a specific job that can be running at any given moment.
-         * By default it is 5.
-         */
-        defaultConcurrency?: number;
-
-        /**
-         * Takes a number which specifies the max number of jobs that can be running at any given moment. By default it
-         * is 20.
-         */
-        maxConcurrency?: number;
-
-        /**
-         * Takes a number which specifies the default number of a specific job that can be locked at any given moment.
-         * By default it is 0 for no max.
-         */
-        defaultLockLimit?: number;
-
-        /**
-         * Takes a number shich specifies the max number jobs that can be locked at any given moment. By default it is
-         * 0 for no max.
-         */
-        lockLimit?: number;
-
-        /**
-         * Takes a number which specifies the default lock lifetime in milliseconds. By default it is 10 minutes. This
-         * can be overridden by specifying the lockLifetime option to a defined job.
-         */
-        defaultLockLifetime?: number;
-
-        /**
-         * Specifies that Agenda should be initialized using and existing MongoDB connection.
-         */
-        mongo?: {
-            /**
-             * The MongoDB database connection to use.
-             */
-            db: Db;
-
-            /**
-             * The name of the collection to use.
-             */
-            collection?: string;
-        }
-
-        /**
-         * Specifies that Agenda should connect to MongoDB.
-         */
-        db?: {
-            /**
-             * The connection URL.
-             */
-            address: string;
-
-            /**
-             * The name of the collection to use.
-             */
-            collection?: string;
-
-            /**
-             * Connection options to pass to MongoDB.
-             */
-            options?: any;
-        }
-    }
-
-    /**
-     * The database record associated with a job.
-     */
-    interface JobAttributes {
-        /**
-         * The record identity.
-         */
-        _id: ObjectID;
-
-        /**
-         * The name of the job.
-         */
-        name: string;
-
-        /**
-         * The type of the job (single|normal).
-         */
-        type: string;
-
-        /**
-         * The job details.
-         */
-        data: { [name: string]: any };
-
-        /**
-         * The priority of the job.
-         */
-        priority: number;
-
-        /**
-         * How often the job is repeated using a human-readable or cron format.
-         */
-        repeatInterval: string | number;
-
-        /**
-         * The timezone that conforms to [moment-timezone](http://momentjs.com/timezone/).
-         */
-        repeatTimezone: string;
-
-        /**
-         * Date/time the job was las modified.
-         */
-        lastModifiedBy: string;
-
-        /**
-         * Date/time the job will run next.
-         */
-        nextRunAt: Date;
-
-        /**
-         * Date/time the job was locked.
-         */
-        lockedAt: Date;
-
-        /**
-         * Date/time the job was last run.
-         */
-        lastRunAt: Date;
-
-        /**
-         * Date/time the job last finished running.
-         */
-        lastFinishedAt: Date;
-
-        /**
-         * The reason the job failed.
-         */
-        failReason: string;
-
-        /**
-         * The number of times the job has failed.
-         */
-        failCount: number;
-
-        /**
-         * The date/time the job last failed.
-         */
-        failedAt: Date;
-    }
-
-    /**
-     * A scheduled job.
-     */
-    interface Job {
-
-        /**
-         * The database record associated with the job.
-         */
-        attrs: JobAttributes;
-
-        /**
-         * Specifies an interval on which the job should repeat.
-         * @param interval A human-readable format String, a cron format String, or a Number.
-         * @param options An optional argument that can include a timezone field. The timezone should be a string as
-         * accepted by moment-timezone and is considered when using an interval in the cron string format.
-         */
-        repeatEvery(interval: string | number, options?: { timezone?: string }): Job
-
-        /**
-         * Specifies a time when the job should repeat. [Possible values](https://github.com/matthewmueller/date#examples).
-         * @param time
-         */
-        repeatAt(time: string): Job
-
-        /**
-         * Disables the job.
-         */
-        disable(): Job;
-
-        /**
-         * Enables the job.
-         */
-        enable(): Job;
-
-        /**
-         * Ensure that only one instance of this job exists with the specified properties
-         * @param value The properties associated with the job that must be unqiue.
-         * @param opts
-         */
-        unique(value: any, opts?: { insertOnly?: boolean }): Job;
-
-        /**
-         * Specifies the next time at which the job should run.
-         * @param time The next time at which the job should run.
-         */
-        schedule(time: string | Date): Job;
-
-        /**
-         * Specifies the priority weighting of the job.
-         * @param value The priority of the job (lowest|low|normal|high|highest|number).
-         */
-        priority(value: string | number): Job;
-
-        /**
-         * Sets job.attrs.failedAt to now, and sets job.attrs.failReason to reason.
-         * @param reason A message or Error object that indicates why the job failed.
-         */
-        fail(reason: string | Error): Job;
-
-        /**
-         * Runs the given job and calls callback(err, job) upon completion. Normally you never need to call this manually
-         * @param cb Called when the job is completed.
-         */
-        run(cb?: ResultCallback<Job>): Job;
-
-        /**
-         * Returns true if the job is running; otherwise, returns false.
-         */
-        isRunning(): boolean;
-
-        /**
-         * Saves the job into the database.
-         * @param cb  Called when the job is saved.
-         */
-        save(cb?: ResultCallback<Job>): Job;
-
-        /**
-         * Removes the job from the database and cancels the job.
-         * @param cb Called after the job has beeb removed from the database.
-         */
-        remove(cb?: Callback): void;
-
-        /**
-         * Resets the lock on the job. Useful to indicate that the job hasn't timed out when you have very long running
-         * jobs.
-         * @param cb Called after the job has been saved to the database.
-         */
-        touch(cb?: Callback): void;
-    }
-
-    interface JobOptions {
-
-        /**
-         * Maximum number of that job that can be running at once (per instance of agenda)
-         */
-        concurrency?: number;
-
-        /**
-         * Maximum number of that job that can be locked at once (per instance of agenda)
-         */
-        lockLimit?: number;
-
-        /**
-         * Interval in ms of how long the job stays locked for (see multiple job processors for more info). A job will
-         * automatically unlock if done() is called.
-         */
-        lockLifetime?: number;
-
-        /**
-         * (lowest|low|normal|high|highest|number) specifies the priority of the job. Higher priority jobs will run
-         * first.
-         */
-        priority?: string | number;
-    }
-
-    class Agenda extends EventEmitter {
-
-        /**
-         * Constructs a new Agenda object.
-         * @param config Optional configuration to initialize the Agenda.
-         * @param cb Optional callback called with the MongoDB colleciton.
-         */
-        constructor(config?: AgendaConfiguration, cb?: ResultCallback<Collection>);
-
-        /**
-         * Connect to the specified MongoDB server and database.
-         */
-        database(url: string, collection?: string, options?: any, cb?: ResultCallback<Collection>): Agenda;
-
-        /**
-         * Initialize agenda with an existing MongoDB connection.
-         */
-        mongo(db: Db, collection?: string, cb?: ResultCallback<Collection>): Agenda;
-
-        /**
-         * Sets the agenda name.
-         */
-        name(value: string): Agenda;
-
-        /**
-         * Sets the interval with which the queue is checked. A number in milliseconds or a frequency string.
-         */
-        processEvery(interval: string | number): Agenda;
-
-        /**
-         * Takes a number which specifies the max number of jobs that can be running at any given moment. By default it
-         * is 20.
-         * @param value The value to set.
-         */
-        maxConcurrency(value: number): Agenda;
-
-        /**
-         * Takes a number which specifies the default number of a specific job that can be running at any given moment.
-         * By default it is 5.
-         * @param value The value to set.
-         */
-        defaultConcurrency(value: number): Agenda;
-
-        /**
-         * Takes a number shich specifies the max number jobs that can be locked at any given moment. By default it is
-         * 0 for no max.
-         * @param value The value to set.
-         */
-        lockLimit(value: number): Agenda;
-
-        /**
-         * Takes a number which specifies the default number of a specific job that can be locked at any given moment.
-         * By default it is 0 for no max.
-         * @param value The value to set.
-         */
-        defaultLockLimit(value: number): Agenda;
-
-        /**
-         * Takes a number which specifies the default lock lifetime in milliseconds. By default it is 10 minutes. This
-         * can be overridden by specifying the lockLifetime option to a defined job.
-         * @param value The value to set.
-         */
-        defaultLockLifetime(value: number): Agenda;
-
-        /**
-         * Returns an instance of a jobName with data. This does NOT save the job in the database. See below to learn
-         * how to manually work with jobs.
-         * @param name The name of the job.
-         * @param data Data to associated with the job.
-         */
-        create(name: string, data?: any): Job;
-
-        /**
-         * Find all Jobs matching `query` and pass same back in cb().
-         * @param query
-         * @param cb
-         */
-        jobs(query: any, cb: ResultCallback<Job[]>): void;
-
-        /**
-         * Removes all jobs in the database without defined behaviors. Useful if you change a definition name and want
-         * to remove old jobs.
-         * @param cb Called with the number of jobs removed.
-         */
-        purge(cb?: ResultCallback<number>): void;
-
-        /**
-         * Defines a job with the name of jobName. When a job of job name gets run, it will be passed to fn(job, done).
-         * To maintain asynchronous behavior, you must call done() when you are processing the job. If your function is
-         * synchronous, you may omit done from the signature.
-         * @param name The name of the jobs.
-         * @param options The options for the job.
-         * @param handler The handler to execute.
-         */
-        define(name: string, handler: (job?: Job, done?: (err?: Error) => void) => void): void;
-        define(name: string, options: JobOptions, handler: (job?: Job, done?: (err?: Error) => void) => void): void;
-
-        /**
-         * Runs job name at the given interval. Optionally, data and options can be passed in.
-         * @param interval Can be a human-readable format String, a cron format String, or a Number.
-         * @param names The name or names of the job(s) to run.
-         * @param data An optional argument that will be passed to the processing function under job.attrs.data.
-         * @param options An optional argument that will be passed to job.repeatEvery.
-         * @param cb An optional callback function which will be called when the job has been persisted in the database.
-         */
-        every(interval: number | string, names: string, data?: any, options?: any, cb?: ResultCallback<Job>): Job;
-        every(interval: number | string, names: string[], data?: any, options?: any, cb?: ResultCallback<Job[]>): Job[];
-
-        /**
-         * Schedules a job to run name once at a given time.
-         * @param when A Date or a String such as tomorrow at 5pm.
-         * @param names The name or names of the job(s) to run.
-         * @param data An optional argument that will be passed to the processing function under job.attrs.data.
-         * @param cb An optional callback function which will be called when the job has been persisted in the database.
-         */
-        schedule(when: Date | string, names: string, data?: any, cb?: ResultCallback<Job>): Job;
-        schedule(when: Date | string, names: string[], data?: any, cb?: ResultCallback<Job[]>): Job[];
-
-        /**
-         * Schedules a job to run name once immediately.
-         * @param name The name of the job to run.
-         * @param data An optional argument that will be passed to the processing function under job.attrs.data.
-         * @param cb An optional callback function which will be called when the job has been persisted in the database.
-         */
-        now(name: string, data?: any, cb?: ResultCallback<Job>): Job;
-
-        /**
-         * Cancels any jobs matching the passed mongodb-native query, and removes them from the database.
-         * @param query Mongodb native query.
-         * @param cb Called with the number of jobs removed.
-         */
-        cancel(query: any, cb?: ResultCallback<number>): void;
-
-        /**
-         * Starts the job queue processing, checking processEvery time to see if there are new jobs.
-         */
-        start(): void;
-
-        /**
-         * Stops the job queue processing. Unlocks currently running jobs.
-         * @param cb Called after the job processing queue shuts down and unlocks all jobs.
-         */
-        stop(cb: Callback): void;
-    }
-
-    namespace Agenda {
-
-    }
-
-    export = Agenda;
-}
diff --git a/agenda/index.d.ts b/agenda/index.d.ts
new file mode 100644
index 0000000000..dc252af65a
--- /dev/null
+++ b/agenda/index.d.ts
@@ -0,0 +1,439 @@
+// Type definitions for Agenda v0.8.9
+// Project: https://github.com/rschmukler/agenda
+// Definitions by: Meir Gottlieb <https://github.com/meirgottlieb>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import {EventEmitter} from "events";
+import {Db, Collection, ObjectID} from "mongodb";
+
+interface Callback {
+    (err?: Error): void;
+}
+
+interface ResultCallback<T> {
+    (err?: Error, result?: T): void;
+}
+
+/**
+ * Agenda Configuration.
+ */
+interface AgendaConfiguration {
+
+    /**
+     * Sets the interval with which the queue is checked. A number in milliseconds or a frequency string.
+     */
+    processEvery?: string | number;
+
+    /**
+     * Takes a number which specifies the default number of a specific job that can be running at any given moment.
+     * By default it is 5.
+     */
+    defaultConcurrency?: number;
+
+    /**
+     * Takes a number which specifies the max number of jobs that can be running at any given moment. By default it
+     * is 20.
+     */
+    maxConcurrency?: number;
+
+    /**
+     * Takes a number which specifies the default number of a specific job that can be locked at any given moment.
+     * By default it is 0 for no max.
+     */
+    defaultLockLimit?: number;
+
+    /**
+     * Takes a number shich specifies the max number jobs that can be locked at any given moment. By default it is
+     * 0 for no max.
+     */
+    lockLimit?: number;
+
+    /**
+     * Takes a number which specifies the default lock lifetime in milliseconds. By default it is 10 minutes. This
+     * can be overridden by specifying the lockLifetime option to a defined job.
+     */
+    defaultLockLifetime?: number;
+
+    /**
+     * Specifies that Agenda should be initialized using and existing MongoDB connection.
+     */
+    mongo?: {
+        /**
+         * The MongoDB database connection to use.
+         */
+        db: Db;
+
+        /**
+         * The name of the collection to use.
+         */
+        collection?: string;
+    }
+
+    /**
+     * Specifies that Agenda should connect to MongoDB.
+     */
+    db?: {
+        /**
+         * The connection URL.
+         */
+        address: string;
+
+        /**
+         * The name of the collection to use.
+         */
+        collection?: string;
+
+        /**
+         * Connection options to pass to MongoDB.
+         */
+        options?: any;
+    }
+}
+
+/**
+ * The database record associated with a job.
+ */
+interface JobAttributes {
+    /**
+     * The record identity.
+     */
+    _id: ObjectID;
+
+    /**
+     * The name of the job.
+     */
+    name: string;
+
+    /**
+     * The type of the job (single|normal).
+     */
+    type: string;
+
+    /**
+     * The job details.
+     */
+    data: { [name: string]: any };
+
+    /**
+     * The priority of the job.
+     */
+    priority: number;
+
+    /**
+     * How often the job is repeated using a human-readable or cron format.
+     */
+    repeatInterval: string | number;
+
+    /**
+     * The timezone that conforms to [moment-timezone](http://momentjs.com/timezone/).
+     */
+    repeatTimezone: string;
+
+    /**
+     * Date/time the job was las modified.
+     */
+    lastModifiedBy: string;
+
+    /**
+     * Date/time the job will run next.
+     */
+    nextRunAt: Date;
+
+    /**
+     * Date/time the job was locked.
+     */
+    lockedAt: Date;
+
+    /**
+     * Date/time the job was last run.
+     */
+    lastRunAt: Date;
+
+    /**
+     * Date/time the job last finished running.
+     */
+    lastFinishedAt: Date;
+
+    /**
+     * The reason the job failed.
+     */
+    failReason: string;
+
+    /**
+     * The number of times the job has failed.
+     */
+    failCount: number;
+
+    /**
+     * The date/time the job last failed.
+     */
+    failedAt: Date;
+}
+
+/**
+ * A scheduled job.
+ */
+interface Job {
+
+    /**
+     * The database record associated with the job.
+     */
+    attrs: JobAttributes;
+
+    /**
+     * Specifies an interval on which the job should repeat.
+     * @param interval A human-readable format String, a cron format String, or a Number.
+     * @param options An optional argument that can include a timezone field. The timezone should be a string as
+     * accepted by moment-timezone and is considered when using an interval in the cron string format.
+     */
+    repeatEvery(interval: string | number, options?: { timezone?: string }): Job
+
+    /**
+     * Specifies a time when the job should repeat. [Possible values](https://github.com/matthewmueller/date#examples).
+     * @param time
+     */
+    repeatAt(time: string): Job
+
+    /**
+     * Disables the job.
+     */
+    disable(): Job;
+
+    /**
+     * Enables the job.
+     */
+    enable(): Job;
+
+    /**
+     * Ensure that only one instance of this job exists with the specified properties
+     * @param value The properties associated with the job that must be unqiue.
+     * @param opts
+     */
+    unique(value: any, opts?: { insertOnly?: boolean }): Job;
+
+    /**
+     * Specifies the next time at which the job should run.
+     * @param time The next time at which the job should run.
+     */
+    schedule(time: string | Date): Job;
+
+    /**
+     * Specifies the priority weighting of the job.
+     * @param value The priority of the job (lowest|low|normal|high|highest|number).
+     */
+    priority(value: string | number): Job;
+
+    /**
+     * Sets job.attrs.failedAt to now, and sets job.attrs.failReason to reason.
+     * @param reason A message or Error object that indicates why the job failed.
+     */
+    fail(reason: string | Error): Job;
+
+    /**
+     * Runs the given job and calls callback(err, job) upon completion. Normally you never need to call this manually
+     * @param cb Called when the job is completed.
+     */
+    run(cb?: ResultCallback<Job>): Job;
+
+    /**
+     * Returns true if the job is running; otherwise, returns false.
+     */
+    isRunning(): boolean;
+
+    /**
+     * Saves the job into the database.
+     * @param cb  Called when the job is saved.
+     */
+    save(cb?: ResultCallback<Job>): Job;
+
+    /**
+     * Removes the job from the database and cancels the job.
+     * @param cb Called after the job has beeb removed from the database.
+     */
+    remove(cb?: Callback): void;
+
+    /**
+     * Resets the lock on the job. Useful to indicate that the job hasn't timed out when you have very long running
+     * jobs.
+     * @param cb Called after the job has been saved to the database.
+     */
+    touch(cb?: Callback): void;
+}
+
+interface JobOptions {
+
+    /**
+     * Maximum number of that job that can be running at once (per instance of agenda)
+     */
+    concurrency?: number;
+
+    /**
+     * Maximum number of that job that can be locked at once (per instance of agenda)
+     */
+    lockLimit?: number;
+
+    /**
+     * Interval in ms of how long the job stays locked for (see multiple job processors for more info). A job will
+     * automatically unlock if done() is called.
+     */
+    lockLifetime?: number;
+
+    /**
+     * (lowest|low|normal|high|highest|number) specifies the priority of the job. Higher priority jobs will run
+     * first.
+     */
+    priority?: string | number;
+}
+
+declare class Agenda extends EventEmitter {
+
+    /**
+     * Constructs a new Agenda object.
+     * @param config Optional configuration to initialize the Agenda.
+     * @param cb Optional callback called with the MongoDB colleciton.
+     */
+    constructor(config?: AgendaConfiguration, cb?: ResultCallback<Collection>);
+
+    /**
+     * Connect to the specified MongoDB server and database.
+     */
+    database(url: string, collection?: string, options?: any, cb?: ResultCallback<Collection>): Agenda;
+
+    /**
+     * Initialize agenda with an existing MongoDB connection.
+     */
+    mongo(db: Db, collection?: string, cb?: ResultCallback<Collection>): Agenda;
+
+    /**
+     * Sets the agenda name.
+     */
+    name(value: string): Agenda;
+
+    /**
+     * Sets the interval with which the queue is checked. A number in milliseconds or a frequency string.
+     */
+    processEvery(interval: string | number): Agenda;
+
+    /**
+     * Takes a number which specifies the max number of jobs that can be running at any given moment. By default it
+     * is 20.
+     * @param value The value to set.
+     */
+    maxConcurrency(value: number): Agenda;
+
+    /**
+     * Takes a number which specifies the default number of a specific job that can be running at any given moment.
+     * By default it is 5.
+     * @param value The value to set.
+     */
+    defaultConcurrency(value: number): Agenda;
+
+    /**
+     * Takes a number shich specifies the max number jobs that can be locked at any given moment. By default it is
+     * 0 for no max.
+     * @param value The value to set.
+     */
+    lockLimit(value: number): Agenda;
+
+    /**
+     * Takes a number which specifies the default number of a specific job that can be locked at any given moment.
+     * By default it is 0 for no max.
+     * @param value The value to set.
+     */
+    defaultLockLimit(value: number): Agenda;
+
+    /**
+     * Takes a number which specifies the default lock lifetime in milliseconds. By default it is 10 minutes. This
+     * can be overridden by specifying the lockLifetime option to a defined job.
+     * @param value The value to set.
+     */
+    defaultLockLifetime(value: number): Agenda;
+
+    /**
+     * Returns an instance of a jobName with data. This does NOT save the job in the database. See below to learn
+     * how to manually work with jobs.
+     * @param name The name of the job.
+     * @param data Data to associated with the job.
+     */
+    create(name: string, data?: any): Job;
+
+    /**
+     * Find all Jobs matching `query` and pass same back in cb().
+     * @param query
+     * @param cb
+     */
+    jobs(query: any, cb: ResultCallback<Job[]>): void;
+
+    /**
+     * Removes all jobs in the database without defined behaviors. Useful if you change a definition name and want
+     * to remove old jobs.
+     * @param cb Called with the number of jobs removed.
+     */
+    purge(cb?: ResultCallback<number>): void;
+
+    /**
+     * Defines a job with the name of jobName. When a job of job name gets run, it will be passed to fn(job, done).
+     * To maintain asynchronous behavior, you must call done() when you are processing the job. If your function is
+     * synchronous, you may omit done from the signature.
+     * @param name The name of the jobs.
+     * @param options The options for the job.
+     * @param handler The handler to execute.
+     */
+    define(name: string, handler: (job?: Job, done?: (err?: Error) => void) => void): void;
+    define(name: string, options: JobOptions, handler: (job?: Job, done?: (err?: Error) => void) => void): void;
+
+    /**
+     * Runs job name at the given interval. Optionally, data and options can be passed in.
+     * @param interval Can be a human-readable format String, a cron format String, or a Number.
+     * @param names The name or names of the job(s) to run.
+     * @param data An optional argument that will be passed to the processing function under job.attrs.data.
+     * @param options An optional argument that will be passed to job.repeatEvery.
+     * @param cb An optional callback function which will be called when the job has been persisted in the database.
+     */
+    every(interval: number | string, names: string, data?: any, options?: any, cb?: ResultCallback<Job>): Job;
+    every(interval: number | string, names: string[], data?: any, options?: any, cb?: ResultCallback<Job[]>): Job[];
+
+    /**
+     * Schedules a job to run name once at a given time.
+     * @param when A Date or a String such as tomorrow at 5pm.
+     * @param names The name or names of the job(s) to run.
+     * @param data An optional argument that will be passed to the processing function under job.attrs.data.
+     * @param cb An optional callback function which will be called when the job has been persisted in the database.
+     */
+    schedule(when: Date | string, names: string, data?: any, cb?: ResultCallback<Job>): Job;
+    schedule(when: Date | string, names: string[], data?: any, cb?: ResultCallback<Job[]>): Job[];
+
+    /**
+     * Schedules a job to run name once immediately.
+     * @param name The name of the job to run.
+     * @param data An optional argument that will be passed to the processing function under job.attrs.data.
+     * @param cb An optional callback function which will be called when the job has been persisted in the database.
+     */
+    now(name: string, data?: any, cb?: ResultCallback<Job>): Job;
+
+    /**
+     * Cancels any jobs matching the passed mongodb-native query, and removes them from the database.
+     * @param query Mongodb native query.
+     * @param cb Called with the number of jobs removed.
+     */
+    cancel(query: any, cb?: ResultCallback<number>): void;
+
+    /**
+     * Starts the job queue processing, checking processEvery time to see if there are new jobs.
+     */
+    start(): void;
+
+    /**
+     * Stops the job queue processing. Unlocks currently running jobs.
+     * @param cb Called after the job processing queue shuts down and unlocks all jobs.
+     */
+    stop(cb: Callback): void;
+}
+
+declare namespace Agenda {
+
+}
+
+export = Agenda;
diff --git a/agenda/tsconfig.json b/agenda/tsconfig.json
new file mode 100644
index 0000000000..bfcc028e47
--- /dev/null
+++ b/agenda/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "agenda-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/alertify/alertify-tests.ts b/alertify/alertify-tests.ts
index 9f6c0cd860..61903e86ff 100644
--- a/alertify/alertify-tests.ts
+++ b/alertify/alertify-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="alertify.d.ts" />
+
 
 alertify.init();
 
diff --git a/alertify/alertify.d.ts b/alertify/index.d.ts
similarity index 100%
rename from alertify/alertify.d.ts
rename to alertify/index.d.ts
diff --git a/alertify/tsconfig.json b/alertify/tsconfig.json
new file mode 100644
index 0000000000..c45376926c
--- /dev/null
+++ b/alertify/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "alertify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/alt/alt-tests.ts b/alt/alt-tests.ts
index fad079b020..8d1108ada3 100644
--- a/alt/alt-tests.ts
+++ b/alt/alt-tests.ts
@@ -1,8 +1,6 @@
 /**
  * Created by shearerbeard on 6/28/15.
  */
-///<reference path="alt.d.ts"/>
-
 import Alt = require("alt");
 
 //New alt instance
@@ -74,7 +72,7 @@ var testSource:AltJS.Source = {
             remote() {
                 return new Promise<string>((res:any, rej:any) => {
                     setTimeout(() => {
-                        if(true) {
+                        if(!!true) {
                             res("stuff");
                         } else {
                             rej("Things have broken");
diff --git a/alt/alt.d.ts b/alt/alt.d.ts
deleted file mode 100644
index 20da159f35..0000000000
--- a/alt/alt.d.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-// Type definitions for Alt 0.16.10
-// Project: https://github.com/goatslacker/alt
-// Definitions by: Michael Shearer <https://github.com/Shearerbeard>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../react/react.d.ts"/>
-
-declare namespace AltJS {
-
-  interface StoreReduce {
-    action:any;
-    data: any;
-  }
-
-  export interface StoreModel<S> {
-    //Actions
-    bindAction?( action:Action<any>, handler:ActionHandler):void;
-    bindActions?(actions:ActionsClass):void;
-
-    //Methods/Listeners
-    exportPublicMethods?(exportConfig:any):void;
-    bindListeners?(config:{[methodName:string]:Action<any> | Actions}):void;
-    exportAsync?(source:Source):void;
-    registerAsync?(datasource:Source):void;
-
-    //state
-    setState?(state:S):void;
-    setState?(stateFn:(currentState:S, nextState:S) => S):void;
-    getState?():S;
-    waitFor?(store:AltStore<any>):void;
-
-    //events
-    onSerialize?(fn:(data:any) => any):void;
-    onDeserialize?(fn:(data:any) => any):void;
-    on?(event:AltJS.lifeCycleEvents, callback:() => any):void;
-    emitChange?():void;
-    waitFor?(storeOrStores:AltStore<any> | Array<AltStore<any>>):void;
-    otherwise?(data:any, action:AltJS.Action<any>):void;
-    observe?(alt:Alt):any;
-    reduce?(state:any, config:StoreReduce):Object;
-    preventDefault?():void;
-    afterEach?(payload:Object, state:Object):void;
-    beforeEach?(payload:Object, state:Object):void;
-    // TODO: Embed dispatcher interface in def
-    dispatcher?:any;
-
-    //instance
-    getInstance?():AltJS.AltStore<S>;
-    alt?:Alt;
-    displayName?:string;
-  }
-
-  export type Source = {[name:string]: () => SourceModel<any>};
-
-  export interface SourceModel<S> {
-    local(state:any):any;
-    remote(state:any):Promise<S>;
-    shouldFetch?(fetchFn:(...args:Array<any>) => boolean):void;
-    loading?:(args:any) => void;
-    success?:(state:S) => void;
-    error?:(args:any) => void;
-    interceptResponse?(response:any, action:Action<any>, ...args:Array<any>):any;
-  }
-
-  export interface AltStore<S> {
-    getState():S;
-    listen(handler:(state:S) => any):() => void;
-    unlisten(handler:(state:S) => any):void;
-    emitChange():void;
-  }
-
-  export enum lifeCycleEvents {
-    bootstrap,
-    snapshot,
-    init,
-    rollback,
-    error
-  }
-
-  export type Actions = {[action:string]:Action<any>};
-
-  export interface Action<T> {
-    ( args:T):void;
-    defer(data:any):void;
-  }
-
-  export interface ActionsClass {
-    generateActions?( ...action:Array<string>):void;
-    dispatch( ...payload:Array<any>):void;
-    actions?:Actions;
-  }
-
-  type StateTransform = (store:StoreModel<any>) => AltJS.AltStore<any>;
-
-  interface AltConfig {
-    dispatcher?:any;
-    serialize?:(serializeFn:(data:Object) => string) => void;
-    deserialize?:(deserializeFn:(serialData:string) => Object) => void;
-    storeTransforms?:Array<StateTransform>;
-    batchingFunction?:(callback:( ...data:Array<any>) => any) => void;
-  }
-
-  class Alt {
-    constructor(config?:AltConfig);
-    actions:Actions;
-    bootstrap(jsonData:string):void;
-    takeSnapshot( ...storeNames:Array<string>):string;
-    flush():Object;
-    recycle( ...stores:Array<AltJS.AltStore<any>>):void;
-    rollback():void;
-    dispatch(action?:AltJS.Action<any>, data?:Object, details?:any):void;
-
-    //Actions methods
-    addActions(actionsName:string, ActionsClass: ActionsClassConstructor):void;
-    createActions<T>(ActionsClass: ActionsClassConstructor, exportObj?: Object):T;
-    createActions<T>(ActionsClass: ActionsClassConstructor, exportObj?: Object, ...constructorArgs:Array<any>):T;
-    generateActions<T>( ...actions:Array<string>):T;
-    getActions(actionsName:string):AltJS.Actions;
-
-    //Stores methods
-    addStore(name:string, store:StoreModel<any>, saveStore?:boolean):void;
-    createStore<S>(store:StoreModel<S>, name?:string):AltJS.AltStore<S>;
-    getStore(name:string):AltJS.AltStore<any>;
-  }
-
-  export interface AltFactory {
-    new(config?:AltConfig):Alt;
-  }
-
-  type ActionsClassConstructor = new (alt:Alt) => AltJS.ActionsClass;
-
-  type ActionHandler = ( ...data:Array<any>) => any;
-  type ExportConfig = {[key:string]:(...args:Array<any>) => any};
-}
-
-declare module "alt/utils/chromeDebug" {
-  function chromeDebug(alt:AltJS.Alt):void;
-  export = chromeDebug;
-}
-
-declare module "alt/AltContainer" {
-
-  import React = require("react");
-
-  interface ContainerProps {
-    store?:AltJS.AltStore<any>;
-    stores?:Array<AltJS.AltStore<any>>;
-    inject?:{[key:string]:any};
-    actions?:{[key:string]:Object};
-    render?:(...props:Array<any>) => React.ReactElement<any>;
-    flux?:AltJS.Alt;
-    transform?:(store:AltJS.AltStore<any>, actions:any) => any;
-    shouldComponentUpdate?:(props:any) => boolean;
-    component?:React.Component<any, any>;
-  }
-
-  type AltContainer = React.ReactElement<ContainerProps>;
-  var AltContainer:React.ComponentClass<ContainerProps>;
-
-  export = AltContainer;
-}
-
-declare module "alt" {
-  var alt:AltJS.AltFactory;
-  export = alt;
-}
diff --git a/alt/index.d.ts b/alt/index.d.ts
new file mode 100644
index 0000000000..1e084131a0
--- /dev/null
+++ b/alt/index.d.ts
@@ -0,0 +1,166 @@
+// Type definitions for Alt 0.16.10
+// Project: https://github.com/goatslacker/alt
+// Definitions by: Michael Shearer <https://github.com/Shearerbeard>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="react"/>
+
+declare namespace AltJS {
+
+  interface StoreReduce {
+    action:any;
+    data: any;
+  }
+
+  export interface StoreModel<S> {
+    //Actions
+    bindAction?( action:Action<any>, handler:ActionHandler):void;
+    bindActions?(actions:ActionsClass):void;
+
+    //Methods/Listeners
+    exportPublicMethods?(exportConfig:any):void;
+    bindListeners?(config:{[methodName:string]:Action<any> | Actions}):void;
+    exportAsync?(source:Source):void;
+    registerAsync?(datasource:Source):void;
+
+    //state
+    setState?(state:S):void;
+    setState?(stateFn:(currentState:S, nextState:S) => S):void;
+    getState?():S;
+    waitFor?(store:AltStore<any>):void;
+
+    //events
+    onSerialize?(fn:(data:any) => any):void;
+    onDeserialize?(fn:(data:any) => any):void;
+    on?(event:AltJS.lifeCycleEvents, callback:() => any):void;
+    emitChange?():void;
+    waitFor?(storeOrStores:AltStore<any> | Array<AltStore<any>>):void;
+    otherwise?(data:any, action:AltJS.Action<any>):void;
+    observe?(alt:Alt):any;
+    reduce?(state:any, config:StoreReduce):Object;
+    preventDefault?():void;
+    afterEach?(payload:Object, state:Object):void;
+    beforeEach?(payload:Object, state:Object):void;
+    // TODO: Embed dispatcher interface in def
+    dispatcher?:any;
+
+    //instance
+    getInstance?():AltJS.AltStore<S>;
+    alt?:Alt;
+    displayName?:string;
+  }
+
+  export type Source = {[name:string]: () => SourceModel<any>};
+
+  export interface SourceModel<S> {
+    local(state:any):any;
+    remote(state:any):Promise<S>;
+    shouldFetch?(fetchFn:(...args:Array<any>) => boolean):void;
+    loading?:(args:any) => void;
+    success?:(state:S) => void;
+    error?:(args:any) => void;
+    interceptResponse?(response:any, action:Action<any>, ...args:Array<any>):any;
+  }
+
+  export interface AltStore<S> {
+    getState():S;
+    listen(handler:(state:S) => any):() => void;
+    unlisten(handler:(state:S) => any):void;
+    emitChange():void;
+  }
+
+  export enum lifeCycleEvents {
+    bootstrap,
+    snapshot,
+    init,
+    rollback,
+    error
+  }
+
+  export type Actions = {[action:string]:Action<any>};
+
+  export interface Action<T> {
+    ( args:T):void;
+    defer(data:any):void;
+  }
+
+  export interface ActionsClass {
+    generateActions?( ...action:Array<string>):void;
+    dispatch( ...payload:Array<any>):void;
+    actions?:Actions;
+  }
+
+  type StateTransform = (store:StoreModel<any>) => AltJS.AltStore<any>;
+
+  interface AltConfig {
+    dispatcher?:any;
+    serialize?:(serializeFn:(data:Object) => string) => void;
+    deserialize?:(deserializeFn:(serialData:string) => Object) => void;
+    storeTransforms?:Array<StateTransform>;
+    batchingFunction?:(callback:( ...data:Array<any>) => any) => void;
+  }
+
+  class Alt {
+    constructor(config?:AltConfig);
+    actions:Actions;
+    bootstrap(jsonData:string):void;
+    takeSnapshot( ...storeNames:Array<string>):string;
+    flush():Object;
+    recycle( ...stores:Array<AltJS.AltStore<any>>):void;
+    rollback():void;
+    dispatch(action?:AltJS.Action<any>, data?:Object, details?:any):void;
+
+    //Actions methods
+    addActions(actionsName:string, ActionsClass: ActionsClassConstructor):void;
+    createActions<T>(ActionsClass: ActionsClassConstructor, exportObj?: Object):T;
+    createActions<T>(ActionsClass: ActionsClassConstructor, exportObj?: Object, ...constructorArgs:Array<any>):T;
+    generateActions<T>( ...actions:Array<string>):T;
+    getActions(actionsName:string):AltJS.Actions;
+
+    //Stores methods
+    addStore(name:string, store:StoreModel<any>, saveStore?:boolean):void;
+    createStore<S>(store:StoreModel<S>, name?:string):AltJS.AltStore<S>;
+    getStore(name:string):AltJS.AltStore<any>;
+  }
+
+  export interface AltFactory {
+    new(config?:AltConfig):Alt;
+  }
+
+  type ActionsClassConstructor = new (alt:Alt) => AltJS.ActionsClass;
+
+  type ActionHandler = ( ...data:Array<any>) => any;
+  type ExportConfig = {[key:string]:(...args:Array<any>) => any};
+}
+
+declare module "alt/utils/chromeDebug" {
+  function chromeDebug(alt:AltJS.Alt):void;
+  export = chromeDebug;
+}
+
+declare module "alt/AltContainer" {
+
+  import React = require("react");
+
+  interface ContainerProps {
+    store?:AltJS.AltStore<any>;
+    stores?:Array<AltJS.AltStore<any>>;
+    inject?:{[key:string]:any};
+    actions?:{[key:string]:Object};
+    render?:(...props:Array<any>) => React.ReactElement<any>;
+    flux?:AltJS.Alt;
+    transform?:(store:AltJS.AltStore<any>, actions:any) => any;
+    shouldComponentUpdate?:(props:any) => boolean;
+    component?:React.Component<any, any>;
+  }
+
+  type AltContainer = React.ReactElement<ContainerProps>;
+  var AltContainer:React.ComponentClass<ContainerProps>;
+
+  export = AltContainer;
+}
+
+declare module "alt" {
+  var alt:AltJS.AltFactory;
+  export = alt;
+}
diff --git a/alt/tsconfig.json b/alt/tsconfig.json
new file mode 100644
index 0000000000..1587b6ba1a
--- /dev/null
+++ b/alt/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "alt-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/amazon-product-api/amazon-product-api-tests.ts b/amazon-product-api/amazon-product-api-tests.ts
index b98e15710f..e173d76f36 100644
--- a/amazon-product-api/amazon-product-api-tests.ts
+++ b/amazon-product-api/amazon-product-api-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="./amazon-product-api.d.ts" />
-/// <reference path="../node/node.d.ts"/>
+
+/// <reference types="node"/>
 
 import amazon = require('amazon-product-api');
 
diff --git a/amazon-product-api/amazon-product-api.d.ts b/amazon-product-api/amazon-product-api.d.ts
deleted file mode 100644
index f7ccf905e5..0000000000
--- a/amazon-product-api/amazon-product-api.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-// Type definitions for amazon-product-api
-// Project: https://github.com/t3chnoboy/amazon-product-api
-// Definitions by: Matti Lehtinen <https://github.com/MattiLehtinen/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "amazon-product-api" {
-
-    interface ICredentials {
-        awsId: string,
-        awsSecret: string,
-        awsTag: string
-    }
-
-    interface IAmazonProductQueryCallback {
-        (err: string, results: Object[]): void;
-    }
-
-    interface IAmazonProductClient {
-        itemSearch(query: any, callback?: IAmazonProductQueryCallback) : Promise<Object[]>;
-        itemLookup(query: any, callback?: IAmazonProductQueryCallback) : Promise<Object[]>;
-        browseNodeLookup(query: any, callback?: IAmazonProductQueryCallback) : Promise<Object[]>;
-    }
-
-    export function createClient(credentials:ICredentials) : IAmazonProductClient;
-}
diff --git a/amazon-product-api/index.d.ts b/amazon-product-api/index.d.ts
new file mode 100644
index 0000000000..6cb7389c73
--- /dev/null
+++ b/amazon-product-api/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for amazon-product-api
+// Project: https://github.com/t3chnoboy/amazon-product-api
+// Definitions by: Matti Lehtinen <https://github.com/MattiLehtinen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+interface ICredentials {
+    awsId: string,
+    awsSecret: string,
+    awsTag: string
+}
+
+interface IAmazonProductQueryCallback {
+    (err: string, results: Object[]): void;
+}
+
+interface IAmazonProductClient {
+    itemSearch(query: any, callback?: IAmazonProductQueryCallback): Promise<Object[]>;
+    itemLookup(query: any, callback?: IAmazonProductQueryCallback): Promise<Object[]>;
+    browseNodeLookup(query: any, callback?: IAmazonProductQueryCallback): Promise<Object[]>;
+}
+
+export declare function createClient(credentials: ICredentials): IAmazonProductClient;
diff --git a/amazon-product-api/tsconfig.json b/amazon-product-api/tsconfig.json
new file mode 100644
index 0000000000..af7dd3eb8a
--- /dev/null
+++ b/amazon-product-api/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "amazon-product-api-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/amcharts/AmCharts.d.ts b/amcharts/AmCharts.d.ts
deleted file mode 100644
index 02d2c540a0..0000000000
--- a/amcharts/AmCharts.d.ts
+++ /dev/null
@@ -1,2558 +0,0 @@
-// Type definitions for amCharts
-// Project: http://www.amcharts.com/
-// Definitions by: aleksey-bykov <https://github.com/aleksey-bykov>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// AmCharts object (it's not a class) is create automatically when amcharts.js or amstock.js file is included in a web page.
-declare namespace AmCharts {
-
-    /** Set it to true if you have base href set for your page. This will fix rendering problems in Firefox caused by base href. */
-    var baseHref: boolean;
-
-    /** Array of day names, used when formatting dates (if categoryAxis.parseDates is set to true) ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'] */
-    var dayNames: string[];
-
-    /** Array of month names, used when formatting dates (if categoryAxis.parseDates is set to true) ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'] */
-    var monthNames: string[];
-
-    /** Array of short versions of day names, used when formatting dates (if categoryAxis.parseDates is set to true) ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'] */
-    var shortDayNames: string[];
-
-    /** Array of short versions of month names, used when formatting dates (if categoryAxis.parseDates is set to true) ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'] */
-    var shortMonthNames: string[];
-
-    /** Set it to true if you want UTC time to be used instead of local time. */
-    var useUTC: boolean;
-
-    /** Clears all the charts on page, removes listeners and intervals. */
-    function clear();
-
-    /** AmPieChart class creates pie/donut chart. In order to display pie chart you need to set at least three properties - dataProvider, titleField and valueField.
-        @example
-            var chartData = [{title:"Pie I have eaten",value:70},{title:"Pie I haven\'t eaten",value:30}];
-            var chart = new AmCharts.AmPieChart();
-            chart.valueField = "value";
-            chart.titleField = "title";
-            chart.dataProvider = chartData;
-            chart.write("chartdiv");
-    */
-    class AmPieChart {
-        /** Name of the field in chart's dataProvider which holds slice's alpha. */
-        alphaField: string;
-        /** Pie lean angle (for 3D effect). Valid range is 0 - 90. */
-        angle: number;
-        /** Balloon text. The following tags can be used: [[value]], [[title]], [[percents]], [[description]]. [[title]]: [[percents]]% ([[value]])\n[[description]] */
-        balloonText: string;
-        /** Read-only. Array of Slice objects. */
-        chartData: any[];
-        /** Name of the field in chart's dataProvider which holds slice's color. */
-        colorField: string;
-        /** Specifies the colors of the slices, if the slice color is not set. If there are more slices than colors in this array, the chart picks random color. ["#FF0F00", "#FF6600", "#FF9E01", "#FCD202", "#F8FF01", "#B0DE09", "#04D215", "#0D8ECF", "#0D52D1", "#2A0CD0", "#8A0CCF", "#CD0D74", "#754DEB", "#DDDDDD", "#999999", "#333333", "#000000", "#57032A", "#CA9726", "#990000", "#4B0C25"] */
-        colors: any[];
-        /** Depth of the pie (for 3D effect). */
-        depth3D: number;
-        /** Name of the field in chart's dataProvider which holds a string with description. */
-        descriptionField: string;
-        /** Example: [-0.2,0.2]. Will make slices to be filled with color gradients. */
-        gradientRatio: number[];
-        /** Opacity of the group slice. Value range is 0 - 1.
-            @default 1
-        */
-        groupedAlpha: number;
-        /** Color of the group slice. The default value is not set - this means the next available color from "colors" array will be used. */
-        groupedColor: string;
-        /** Description of the group slice. */
-        groupedDescription: string;
-        /** If this is set to true, the group slice will be pulled out when the chart loads. */
-        groupedPulled: boolean;
-        /** Title of the group slice. Other */
-        groupedTitle: string;
-        /** If there is more than one slice whose percentage of the pie is less than this number, those slices will be grouped together into one slice. This is the "other" slice. It will always be the last slice in a pie. */
-        groupPercent: number;
-        /** Slices with percent less then hideLabelsPercent won't display labels This is useful to avoid cluttering up the chart, if you have a lot of small slices. 0 means all labels will be shown. */
-        hideLabelsPercent: number;
-        /** Opacity of a hovered slice. Value range is 0 - 1.
-            @default 1
-        */
-        hoverAlpha: number;
-        /** Inner radius of the pie, in pixels or percents. */
-        innerRadius: any;
-        /** The distance between the label and the slice, in pixels. You can use negative values to put the label on the slice.
-            @default 30
-        */
-        labelRadius: number;
-        /** Name of the field in dataProvider which specifies the length of a tick. Note, the chart will not try to arrange labels automatically if this property is set. */
-        labelRadiusField: string;
-        /** Specifies whether data labels are visible.
-            @default true
-        */
-        labelsEnabled: boolean;
-        /** Label text. The following tags can be used: [[value]], [[title]], [[percents]], [[description]]. [[title]]: [[percents]]% */
-        labelText: string;
-        /** Label tick opacity. Value range is 0 - 1. 0.2 */
-        labelTickAlpha: number;
-        /** Label tick color. #000000 */
-        labelTickColor: string;
-        /** Bottom margin of the chart.
-            @default 5
-        */
-        marginBottom: number;
-        /** Left margin of the chart. */
-        marginLeft: number;
-        /** Right margin of the chart. */
-        marginRight: number;
-        /** Top margin of the chart.
-            @default 5
-        */
-        marginTop: number;
-        /** Minimum radius of the pie, in pixels.
-            @default 10
-        */
-        minRadius: number;
-        /** Pie outline opacity. Value range is 0 - 1. */
-        outlineAlpha: number;
-        /** Pie outline color. #FFFFFF */
-        outlineColor: string;
-        /** Pie outline thickness.
-            @default 1
-        */
-        outlineThickness: number;
-        /** Opacity of the slices. You can set the opacity of individual slice too.
-            @default 1
-        */
-        pieAlpha: number;
-        /** Color of the first slice. All the other will be colored with darker or brighter colors. */
-        pieBaseColor: string;
-        /** Lightness increase of each subsequent slice. This is only useful if pieBaseColor is set. Use negative values for darker colors. Value range is from -255 to 255.
-            @default 30*/
-        pieBrightnessStep: number;
-        /** You can set fixed position of a pie center, in pixels or in percents. */
-        pieX: any;
-        /** You can set fixed position of a pie center, in pixels or in percents. */
-        pieY: any;
-        /** Name of the field in chart's dataProvider which holds a boolean value telling the chart whether this slice must be pulled or not. */
-        pulledField: string;
-        /** Pull out duration, in seconds.
-            @default 1
-        */
-        pullOutDuration: number;
-        /** Pull out effect. Possible values are ">", "<", elastic" and "bounce". bounce */
-        pullOutEffect: string;
-        /** If this is set to true, only one slice can be pulled out at a time. If the viewer clicks on a slice, any other pulled-out slice will be pulled in. */
-        pullOutOnlyOne: boolean;
-        /** Pull out radius, in pixels or percents 0.2 */
-        pullOutRadius: any;
-        /** Radius of a pie, in pixels or percents. By default, radius is calculated automatically. */
-        radius: any;
-        /** Specifies whether the animation should be sequenced or all slices should appear at once. */
-        sequencedAnimation: boolean;
-        /** Initial opacity of all slices. If you set startDuration higher than 0, slices will fade in from startAlpha.
-            @default 1
-        */
-        startAlpha: number;
-        /** Angle of the first slice, in degrees. This will work properly only if "depth3D" is set to 0. If "depth3D" is greater than 0, then there can be two angles only: 90 and 270. Value range is 0-360.
-            @default 90
-        */
-        startAngle: number;
-        /** Duration of the animation, in seconds.
-            @default 1
-        */
-        startDuration: number;
-        /** Animation effect. Possible values are ">", "<", "elastic" and "bounce". bounce */
-        startEffect: string;
-        /** Radius of the positions from which the slices will fly in.
-            default 5
-        */
-        startRadius: any;
-        /** Name of the field in chart's dataProvider which holds slice's title. */
-        titleField: string;
-        /** Name of the field in chart's dataProvider which holds url which would be accessed if the user clicks on a slice. */
-        urlField: string;
-        /** If url is specified for a slice, it will be opened when user clicks on it. urlTarget specifies target of this url. Use _blank if you want url to be opened in a new window. _self */
-        urlTarget: string;
-        /** Name of the field in chart's dataProvider which holds slice's value. */
-        valueField: string;
-        /** Name of the field in chart's dataProvider which holds boolean variable defining whether this data item should have an entry in the legend. */
-        visibleInLegendField: string;
-
-        /** You can trigger the animation of the pie chart. */
-        animateAgain();
-        /** You can trigger the click on a slice from outside. index - the number of a slice or Slice object. */
-        clickSlice(index: number);
-        /** Hides slice. index - the number of a slice or Slice object. */
-        hideSlice(index: number);
-        /** You can simulate roll-out of a slice from outside. index - the number of a slice or Slice object. */
-        rollOutSlice(index: number);
-        /** You can simulate roll-over a slice from outside. index - the number of a slice or Slice object. */
-        rollOverSlice(index: number);
-        /** Shows slice. index - the number of a slice or Slice object. */
-        showSlice(index: number);
-
-        /** Adds event listener of the type "clickSlice" or "pullInSlice" or "pullOutSlice" to the object.
-            @param type Always "clickSlice" or "pullInSlice" or "pullOutSlice".
-            @param handler
-                If the type is "clickSlice", dispatched when user clicks on a slice.
-                If the type is "pullInSlice", dispatched when user clicks on a slice and the slice is pulled-in.
-                If the type is "pullOutSlice", dispatched when user clicks on a slice and the slice is pulled-out.
-                If the type is "rollOutSlice", dispatched when user rolls-out of the slice.
-                If the type is "rollOverSlice", dispatched when user rolls-over the slice.
-        */
-        addListener(type: string, handler: (e: {/** Always "rollOverSlice". */
-            type: string; dataItem: Slice;
-        }) => void );
-    }
-
-    /** AmRadarChart is the class you have to use for radar and polar chart types.
-        @example
-    var chart;
-    var chartData = [
-        {country:"Czech Republic",litres:156.90},
-        {country:"Ireland",litres:131.10},
-        {country:"Germany",litres:115.80},
-        {country:"Australia",litres:109.90},
-        {country:"Austria",litres:108.30},
-        {country:"UK",litres:99.00}
-    ];
-
-    window.onload = function() {
-      chart = new AmCharts.AmRadarChart();
-      chart.dataProvider = chartData;
-      chart.categoryField = "country";
-      chart.startDuration = 2;
-
-      var valueAxis = new AmCharts.ValueAxis();
-      valueAxis.axisAlpha = 0.15;
-      valueAxis.minimum = 0;
-      valueAxis.dashLength = 3;
-      valueAxis.axisTitleOffset = 20;
-      valueAxis.gridCount = 5;
-      chart.addValueAxis(valueAxis);
-
-      var graph = new AmCharts.AmGraph();
-      graph.valueField = "litres";
-      graph.bullet = "round";
-      graph.balloonText = "[[value]] litres of beer per year"
-      chart.addGraph(graph);
-
-      chart.write("chartdiv");
-    }
-    */
-    class AmRadarChart extends AmCoordinateChart {
-        /** Bottom margin of the chart. */
-        marginBottom: number;
-        /** Left margin of the chart. */
-        marginLeft: number;
-        /** Right margin of the chart. */
-        marginRight: number;
-        /** Top margin of the chart. */
-        marginTop: number;
-        /** Radius of a radar. 0.35 */
-        radius: any;
-    }
-
-    /** AmXYChart is the class you have to use for XY/Bubble/Scatter chart types. The chart supports simple and logarithmic scales, it can have multiple value axes.
-        @example
-            var chartData = [
-                {x:10, y:14, value:59},
-                {x:5, y:3, value:50},
-                {x:-10, y:-3, value:19},
-                {x:-6, y:5, value:65},
-                {x:15, y:-4, value:92},
-                {x:13, y:1, value:8},
-                {x:1, y:6, value:35}
-            ];
-
-            var chart = new AmCharts.AmXYChart();
-            chart.pathToImages = "../../amcharts/javascript/images/";
-            chart.dataProvider = chartData;
-            chart.marginLeft = 35;
-            chart.startDuration = 1.5;
-
-            var xAxis = new AmCharts.ValueAxis();
-            xAxis.position = "left";
-            xAxis.autoGridCount = true;
-            chart.addValueAxis(xAxis);
-
-            var yAxis = new AmCharts.ValueAxis();
-            yAxis.position = "bottom";
-            yAxis.autoGridCount = true;
-            chart.addValueAxis(yAxis);
-
-            var graph = new AmCharts.AmGraph();
-            graph.valueField = "value";
-            graph.xField = "x";
-            graph.yField = "y";
-            graph.lineAlpha = 0;
-            graph.bullet = "round";
-            chart.addGraph(graph);
-
-            var chartCursor = new AmCharts.ChartCursor();
-            chart.addChartCursor(chartCursor);
-
-            var chartScrollbar = new AmCharts.ChartScrollbar();
-            chartScrollbar.hideResizeGrips = false;
-            chart.addChartScrollbar(chartScrollbar);
-
-            chart.write("chartdiv);
-    */
-    class AmXYChart extends AmRectangularChart {
-        /** Specifies if Scrollbar of X axis (horizontal) should be hidden. */
-        hideXScrollbar: boolean;
-        /** Specifies if Scrollbar of Y axis (vertical) should be hidden. */
-        hideYScrollbar: boolean;
-        /** Maximum zoom factor of the chart.
-            @default 20
-        */
-        maxZoomFactor: number;
-        /** Zooms out, charts shows all available data.*/
-        zoomOut();
-    }
-    /** Guides are straight vertical or horizontal lines or areas supported by AmSerialChart, AmXYChart and AmRadarChart. You can have guides both on value and category axes. To add/remove a guide to an axis, use axis.addGuide(guide)/axis.removeGuide(guide) methods.
-
-If you do not set properties such as dashLength, lineAlpha, lineColor, etc - values of the axis are used.*/
-    class Guide {
-        /** If you set it to true, the guide will be displayed above the graphs. */
-        above: boolean;
-        /** Radar chart only. Specifies angle at which guide should start. Affects only fills, not lines. */
-        angle: number;
-        /** Baloon fill color. */
-        balloonColor: string;
-        /** The text which will be displayed if the user rolls-over the guide. */
-        balloonText: string;
-        /** Specifies if label should be bold or not. */
-        boldLabel: boolean;
-        /** Category of the guide (in case the guide is for category axis). */
-        category: string;
-        /** Dash length. */
-        dashLength: number;
-        /** Date of the guide (in case the guide is for category axis and parseDates is set to true). */
-        date: Date;
-        /** Works if a guide is added to CategoryAxis and this axis is non-date-based. If you set it to true, the guide will start (or be placed, if it's not a fill) on the beginning of the category cell and will end at the end of toCategory cell. */
-        expand: boolean;
-        /** Fill opacity. Value range is 0 - 1. */
-        fillAlpha: number;
-        /** Fill color. */
-        fillColor: string;
-        /** Font size of guide label. */
-        fontSize: string;
-        /** Unique id of a Guide. You don't need to set it, unless you want to. */
-        id: string;
-        /** Specifies whether label should be placed inside or outside plot area. */
-        inside: boolean;
-        /** The label which will be displayed near the guide. */
-        label: string;
-        /** Rotation angle of a guide label. */
-        labelRotation: number;
-        /** Line opacity. */
-        lineAlpha: number;
-        /** Line color. */
-        lineColor: string;
-        /** Line thickness. */
-        lineThickness: number;
-        /** Position of guide label. Possible values are "left" or "right" for horizontal axis and "top" or "bottom" for vertical axis.  */
-        position: string;
-        /** Tick length. */
-        tickLength: number;
-        /** Radar chart only. Specifies angle at which guide should end. Affects only fills, not lines. */
-        toAngle: number;
-        /** To category of the guide (in case the guide is for category axis). */
-        toCategory: string;
-        /** To date of the guide (in case the guide is for category axis and parseDates is set to true) If you have both date and toDate, the space between these two dates can be filled with color. */
-        toDate: Date;
-        /** To value of the guide (in case the guide is for value axis). */
-        toValue: number;
-        /** Value of the guide (in case the guide is for value axis). */
-        value: number;
-        /** Value axis of a guide. As you can add guides directly to the chart, you might need to specify which which value axis should be used. */
-        valueAxis: ValueAxis;
-    }
-    /** ImagesSettings is a class which holds common settings of all MapImage objects. */
-    class ImagesSettings {
-        /** Opacity of the image.
-            @default 1
-        */
-        alpha: number;
-        /** Text which is displayed in a roll-over balloon. You can use the following tags: [[title]], [[description]], [[value]] and [[percent]]. [[title]] */
-        balloonText: string;
-        /** Specifies if the image's center should be placed in the provided coordinates. If false, top-left corner will be at provided coordinates.
-            @default true
-        */
-        centered: boolean;
-        /** Color of image. This will affect only predefined images (with "type" property set) and images with svgPath set. This property won't affect bitmap images and loaded SVG images. #000000 */
-        color: string;
-        /** Height of a description window. */
-        descriptionWindowHeight: number;
-        /** Width of a description window.
-            @default 250
-        */
-        descriptionWindowWidth: number;
-        /** X position of a description window. */
-        descriptionWindowX: number;
-        /** Y position of a description window. */
-        descriptionWindowY: number;
-        /** Label color. #000000 */
-        labelColor: string;
-        /** Font size of a label.
-            @default 11
-        */
-        labelfontSize: string;
-        /** Position of the label. Allowed values are: left, right, top, bottom and middle. right */
-        labelPosition: string;
-        /** Label roll-over color. #00CC00 */
-        labelRollOverColor: string;
-        /** Opacity of image outline. This will affect only predefined images (with "type" property set) and images with svgPath set. This property won't affect bitmap images and loaded SVG images. */
-        outlineAlpha: number;
-        /** Color of image outline. This will affect only predefined images (with "type" property set) and images with svgPath set. This property won't affect bitmap images and loaded SVG images. */
-        outlineColor: string;
-        /** Thickness of image outline. This will affect only predefined images (with "type" property set) and images with svgPath set. This property won't affect bitmap images and loaded SVG images.
-            @default 1
-        */
-        outlineThickness: number;
-        /** Color of image when hovered. This will affect only predefined images (with "type" property set) and images with svgPath set. This property won't affect bitmap images and loaded SVG images. */
-        rollOverColor: string;
-        /** Scale of the image when hovered. Use value like 1.5 - 2 to enlarge image when user rolls-over it.
-            @default 1
-        */
-        rollOverScale: number;
-        /** Scale of the image if it is selected. Use value like 1.5 - 2 to enlarge selected image.
-            @default 1
-        */
-        selectedScale: number;
-    }
-
-    /** AreasSettings is a class which holds common settings of all MapArea objects. */
-    class AreasSettings {
-        /** Opacity of areas.
-            @default 1
-        */
-        alpha: number;
-        /** Specifies if the areas should be zoomed-in when user clicks on them, event if zoom properties are not set. */
-        autoZoom: boolean;
-        /** Text which is displayed in a roll-over balloon. You can use the following tags: [[title]], [[description]], [[value]] and [[percent]] [[title]] */
-        balloonText: string;
-        /** Color of the areas. #FFCC00 */
-        color: string;
-        /** Color of area with highest value. Colors for areas with values less then highest will be colored with intermediate colors between color and colorSolid. Use colorSteps property of AmMap to change the number of intermediate colors. #990000 */
-        colorSolid: string;
-        /** Height of a description window. */
-        descriptionWindowHeight: number;
-        /** Width of a description window.
-            @default 250
-        */
-        descriptionWindowWidth: number;
-        /** X position of a description window. */
-        descriptionWindowX: number;
-        /** Y position of a description window. */
-        descriptionWindowY: number;
-        /** Opacity of area's outline.
-            @default 1
-        */
-        outlineAlpha: number;
-        /** Color of area's outline. #FFFFFF */
-        outlineColor: string;
-        /** Thickness of area's outline. 0.5 */
-        outlineThickness: number;
-        /** Color of area when user rolls-over it. undefined */
-        rollOverColor: string;
-        /** Color of area's outline when user rolls-over it. #CC0000 */
-        rollOverOutlineColor: string;
-        /** Color of area which is currently selected. #CC0000 */
-        selectedColor: string;
-        /** Opacity of all areas which are in the map svg file, but not listed as areas in DataSet.
-            @default 1
-        */
-        unlistedAreasAlpha: number;
-        /** Color of all areas which are in the map svg file, but not listed as areas in DataSet. #DDDDDD */
-        unlistedAreasColor: string;
-        /** Opacity of all areas' outline which are in the map svg file, but not listed as areas in DataSet.
-            @default 1
-        */
-        unlistedAreasOutlineAlpha: number;
-        /** Color of all areas' outline which are in the map svg file, but not listed as areas in DataSet. #FFFFFF */
-        unlistedAreasOutlineColor: string;
-    }
-
-    /** Slice is an item of AmPieChart's chartData Array and holds all the information about the slice. When working with a pie chart, you do not create slices or change it's properties directly, instead you set array of data using dataProvider property. Consider properties of a Slice read-only - change values in chart's data provider if you need to. */
-    class Slice {
-        /** Opacity of a slice. */
-        alpha: number;
-        /** Color of a slice. */
-        color: string;
-        /** Original object from data provider. */
-        dataContext: Object;
-        /** Slice description. */
-        description: string;
-        /** Specifies whether the slice is hidden */
-        hidden: boolean;
-        /** Percent value of a slice. */
-        percents: number;
-        /** Specifies whether the slice is pulled or not. */
-        pulled: boolean;
-        /** Slice title */
-        title: string;
-        /** Url of a slice */
-        url: string;
-        /** Value of a slice */
-        value: number;
-        /** specifies whether this slice has a legend entry */
-        visibleInLegend: boolean;
-    }
-
-
-    /** AmStockChart is a main class Stock chart. */
-    class AmStockChart {
-        /** Specifies if animation was already played. Animation is only played once, when chart is rendered for the first time. If you want the animation to be repeated, set this property to false. */
-        animationPlayed: boolean;
-        /** Balloon object. */
-        balloon: AmBalloon;
-        /** Settings for category axes. */
-        categoryAxesSettings: CategoryAxesSettings;
-        /** Indicates if the chart is created. */
-        chartCreated: boolean;
-        /** Chart cursor settings. */
-        chartCursorSettings: ChartCursorSettings;
-        /** Chart scrollbar settings. */
-        chartScrollbarSettings: ChartScrollbarSettings;
-        /** Array of colors used by data sets if no color was set explicitly on data set itself. #FF6600, "#FCD202", "#B0DE09", "#0D8ECF", "#2A0CD0", "#CD0D74", "#CC0000", "#00CC00", "#0000CC", "#DDDDDD", "#999999", "#333333", "#990000" */
-        colors: any[];
-        /** Array of data sets selected for comparing. */
-        comparedDataSets: any[];
-        /** Array of DataSets. */
-        dataSets: any[];
-        /** DataSetSelector object. You can add it if you have more than one data set and want users to be able to select/compare them. */
-        dataSetSelector: DataSetSelector;
-        /** Current end date of the selected period, get only. To set start/end dates, use stockChart.zoom(startDate, endDate) method. */
-        endDate: Date;
-        /** Defines on which day week starts. 0 - Sunday, 1 - Monday..
-            @default 1 */
-        firstDayOfWeek: number;
-        /** If set to true the scope of the data view will be set to the end after data update. */
-        glueToTheEnd: boolean;
-        /** Legend settings. */
-        legendSettings: LegendSettings;
-        /** Data set selected as main. */
-        mainDataSet: DataSet;
-        /** Array of StockPanels (charts). */
-        panels: any[];
-        /** Settings for stock panels. */
-        panelsSettings: PanelsSettings;
-        /** Period selector object. You can add it if you want user's to be able to enter date ranges or zoom chart with predefined period buttons. */
-        periodSelector: PeriodSelector;
-        /** Scrollbar's chart object, get only. */
-        scrollbarChart: AmSerialChart;
-        /** Current start date of the selected period, get only. To set start/end dates, use stockChart.zoom(startDate, endDate) method. */
-        startDate: Date;
-        /** Settings for stock events. */
-        stockEventsSettings: any;
-        /** Settings for value axes. */
-        valueAxesSettings: ValueAxesSettings;
-        /** read-only. Indicates current version of a script. */
-        version: string;
-        /** Specifies whether the chart should zoom-out when main data set is changed. */
-        zoomOutOnDataSetChange: boolean;
-
-        /** Adds panel to the stock chart. Requires stockChart.validateNow() method to be called after this action. */
-        addPanel(panel: StockPanel);
-        /** Adds panel to the stock chart at a specified index. Requires stockChart.validateNow() method to be called after this action. */
-        addPanelAt(panel: StockPanel, index: number);
-        /** Destroys chart, all timeouts and listeners. */
-        clear();
-        /** Hides event bullets. */
-        hideStockEvents();
-        /** Removes event listener from the object. */
-        removeListener(obj: any, type: string, handler: any);
-        /** Removes panel from the stock chart. Requires stockChart.validateNow() method to be called after this action. */
-        removePanel(panel: StockPanel);
-        /** Shows event bullets. */
-        showStockEvents();
-        /** Method which should be called after data was changed. */
-        validateData();
-        /** Method which forces the stock chart to rebuild. Should be called after properties are changed. */
-        validateNow();
-        /** Zooms chart to specified dates. startDate, endDate - Date objects. */
-        zoom(startDate: Date, endDate: Date);
-        /** Zooms out the chart. */
-        zoomOut();
-
-        /** Adds event listener of the type "dataUpdated" or "init" or "rendered" to the object.
-            @param type Always "dataUpdated" or "init" or "rendered".
-            @param handler
-                If the type is "dataUpdated", dispatched when the chart was updated with new data.
-                If the type is "init", dispatched when the chart is initialized for the first time. In case you want it to fire again after validateNow() method is called, set chart.chartCreated = false.
-                If the type is "rendered", dispatched each when chart is rendered.
-        */
-        addListener(type: string, handler: (e: {
-            /** Either "dataUpdated" or "init". */
-            type: string;
-            chart: AmStockChart;
-        }) => void );
-
-        /** Adds event listener of the type "rollOutStockEvent" or "rollOverStockEvent" or "clickStockEvent" to the object.
-            @param type     // Either "rollOutStockEvent" or "rollOverStockEvent" or "clickStockEvent".
-            @param handler
-                If the type is "rollOutStockEvent", dispatched when the user rolls-out of the Stock event (bullet).
-                If the type is "rollOverStockEvent", dispatched when the user rolls-over of the Stock event (bullet).
-                If the type is "clickStockEvent", dispatched when the user clicks on the Stock event (bullet).
-        */
-
-        addListener(type: string, handler: (e: {
-            /** Always "rollOverStockEvent". */
-            type: string;
-            eventObject: any;
-            graph: AmGraph;
-            date: Date;
-            chart: AmStockChart;
-        }) => void );
-
-        /** Adds event listener of the type "zoomed" to the object.
-            @param type Always "zoomed".
-            @param handler Dispatched when the chart is zoomed (even for the first time, when chart is initialized).*/
-        addListener(type: string, handler: (e: {
-            /** Always "zoomed". */
-            type: string;
-            startDate: Date;
-            endDate: Date;
-            period: string;
-            chart: AmStockChart;
-        }) => void );
-
-        /** Adds event listener of the type "panelRemoved" to the object.
-            @param type Always "panelRemoved".
-            @param handler Dispatched when the StockPanel is removed.*/
-        addListener(type: string, handler: (e: {
-            /** Always "panelRemoved". */
-
-            type: string;
-            panel: StockPanel;
-            chart: AmStockChart;
-        }) => void );
-
-        /** Removes event listener from chart object. */
-        removeListener(chart: AmChart, type: string, handler: any);
-    }
-
-    /** ValueAxesSettings settings set 's settings for all ValueAxes. If you change a property after the chart is initialized, you should call stockChart.validateNow() method in order for it to work. If there is no default value specified, default value of ValueAxis class will be used. */
-    class ValueAxesSettings {
-        /** Specifies whether number for gridCount is specified automatically, according to the axis size.
-            @default true
-        */
-        autoGridCount: boolean;
-        /** Axis opacity. */
-        axisAlpha: number;
-        /** Axis color.  */
-        axisColor: string;
-        /** Thickness of the axis. */
-        axisThickness: number;
-        /** Label color. */
-        color: string;
-        /** Length of a dash. By default, the grid line is not dashed. */
-        dashLength: number;
-        /** Fill opacity. Every second space between grid lines can be filled with color. */
-        fillAlpha: number;
-        /** Fill color. Every second space between grid lines can be filled with color. Set fillAlpha to a value greater than 0 to see the fills. */
-        fillColor: string;
-        /** Opacity of grid lines. */
-        gridAlpha: number;
-        /** Color of grid lines. */
-        gridColor: string;
-        /** Approximate number of grid lines. autoGridCount should be set to false, otherwise this property will be ignored. */
-        gridCount: number;
-        /** Thickness of grid lines. */
-        gridThickness: number;
-        /** Specifies whether guide values should be included when calculating min and max of the axis. */
-        includeGuidesInMinMax: boolean;
-        /** If true, the axis will include hidden graphs when calculating min and max values. */
-        includeHidden: boolean;
-        /** Specifies whether values should be placed inside or outside plot area. In case you set this to false, you'll have to adjust marginLeft or marginRight in [[PanelsSettings]] in order labels to be visible.
-            @default true
-        */
-        inside: boolean;
-        /** Specifies whether values on axis can only be integers or both integers and doubles. */
-        integersOnly: boolean;
-        /** Frequency at which labels should be placed.  */
-        labelFrequency: number;
-        /** Specifies whether value labels are displayed. */
-        labelsEnabled: boolean;
-        /** Set to true if value axis is logarithmic, false otherwise. */
-        logarithmic: boolean;
-        /** The distance of the axis to the plot area, in pixels. Useful if you have more then one axis on the same side.  */
-        offset: number;
-        /** Position of the value axis. Possible values are "left" and "right". */
-        position: string;
-        /** Set to true if value axis is reversed (smaller values on top), false otherwise. */
-        reversed: boolean;
-        /** Specifies if first label of value axis should be displayed. */
-        showFirstLabel: boolean;
-        /** Specifies if last label of value axis should be displayed. */
-        showLastLabel: boolean;
-        /** Stacking mode of the axis. Possible values are: "none", "regular", "100%", "3d". */
-        stackType: string;
-        /** Tick length. */
-        tickLength: number;
-        /** Unit which will be added to the value label.  */
-        unit: string;
-        /** Position of the unit. Possible values are "left" or "right". */
-        unitPosition: string;
-
-    }
-
-
-    /** AmLegend is the class that displays legend of the chart. Legend to the chart should be added using chart.addLegend(legend) method.
-        @example
-            var chart = new AmCharts.AmSerialChart();
-            var legend = new AmCharts.AmLegend();
-            chart.addLegend(legend);
-    */
-    class AmLegend {
-
-        /** Alignment of legend entries. Possible values are: "left", "center", "right". left */
-        align: string;
-        /** Used if chart is Serial or XY. In case true, margins of the legend are adjusted and made equal to chart's margins.
-            @default true
-        */
-        autoMargins: boolean;
-        /** Opacity of legend's background. Value range is 0 - 1 */
-        backgroundAlpha: number;
-        /** Background color. You should set backgroundAlpha to >0 vallue in order background to be visible. #FFFFFF */
-        backgroundColor: string;
-        /** Opacity of chart's border. Value range is 0 - 1. */
-        borderAlpha: number;
-        /** Color of legend's border. You should set borderAlpha >0 in order border to be visible. #000000 */
-        borderColor: string;
-        /** In case legend position is set to "absolute", you can set distance from bottom of the chart, in pixels.  */
-        bottom: number;
-        /** Text color. Will use chart's color if not set. */
-        color: string;
-        /** This can be used by AmMap only. You can pass array of objects with title, color, markerType values, for example: [{title: "One", color: "#3366CC"},{title: "Two", color: "#FFCC33"}] */
-        data: any[];
-        /** Specifies if each of legend entry should be equal to the most wide entry. Won't look good if legend has more than one line.
-            @default true
-        */
-        equalWidths: boolean;
-        /** Font size. Will use chart's font size if not set. */
-        fontSize: string;
-        /** Horizontal space between legend item and left/right border. */
-        horizontalGap: number;
-        /** The text which will be displayed in the legend. Tag [[title]] will be replaced with the title of the graph. [[title]] */
-        labelText: string;
-        /** In case legend position is set to "absolute", you can set distance from left side of the chart, in pixels. */
-        left: number;
-        /** Bottom margin.  */
-        marginBottom: number;
-        /** Left margin. This property will be ignored if chart is Serial or XY and autoMargins property of the legend is true (default).
-            @default 20
-        */
-        marginLeft: number;
-        /** Right margin. This property will be ignored if chart is Serial or XY and autoMargins property of the legend is true (default).
-            @default 20
-        */
-        marginRight: number;
-        /** Top margin. */
-        marginTop: number;
-        /** Marker border opacity 1. */
-        markerBorderAlpha: number;
-        /** Marker border color. If not set, will use the same color as marker. */
-        markerBorderColor: string;
-        /** Thickness of the legend border. The default value (0) means the line will be a "hairline" (1 px). In case marker type is line, this style will be used for line thickness.
-            @default 1
-        */
-        markerBorderThickness: number;
-        /** The color of the disabled marker (when the graph is hidden). #AAB3B3 */
-        markerDisabledColor: string;
-        /** Space between legend marker and legend text, in pixels.
-            @default 5
-        */
-        markerLabelGap: number;
-        /** Size of the legend marker (key).
-            @default 16
-        */
-        markerSize: number;
-        /** Shape of the legend marker (key). Possible values are: "square", "circle", "line", "dashedLine", "triangleUp", "triangleDown", "bubble", "none". square */
-        markerType: string;
-        /** Maximum number of columns in the legend. If Legend's position is set to "right" or "left", maxColumns is automatically set to 1. */
-        maxColumns: number;
-        /** Position of a legend. Possible values are: "bottom", "top", "left", "right" and "absolute". In case "absolute", you should set left and top properties too. (this setting is ignored in Stock charts). In case legend is used with AmMap, position is set to "absolute" automatically.  bottom */
-        position: string;
-        /** Specifies whether legend entries should be placed in reversed order. */
-        reversedOrder: boolean;
-        /** In case legend position is set to "absolute", you can set distance from right side of the chart, in pixels. */
-        right: number;
-        /** Legend item text color on roll-over.  #CC0000 */
-        rollOverColor: string;
-        /** When you roll-over the legend entry, all other graphs can reduce their opacity, so that the graph you rolled-over would be distinguished. This style specifies the opacity of the graphs.
-            @default 1
-        */
-        rollOverGraphAlpha: number;
-        /** You can use this property to turn all the legend entries off.
-            @default true
-        */
-        showEntries: boolean;
-        /** Horizontal space between legend items, in pixels.
-            @default 10
-        */
-        spacing: number;
-        /** Whether showing/hiding of graphs by clicking on the legend marker is enabled or not. In case legend is used with AmMap, this is set to false automatically.
-            @default true
-        */
-        switchable: boolean;
-        /** Legend switch color. #FFFFFF */
-        switchColor: string;
-        /** Legend switch type (in case the legend is switchable). Possible values are "x" and "v". x */
-        switchType: string;
-        /** If true, clicking on the text will show/hide balloon of the graph. Otherwise it will show/hide graph/slice, if switchable is set to true.  */
-        textClickEnabled: boolean;
-        /** In case legend position is set to "absolute", you can set distance from top of the chart, in pixels. */
-        top: number;
-        /** Specifies if legend labels should be use same color as corresponding markers. */
-        useMarkerColorForLabels: boolean;
-        /** Alignment of the value text. Possible values are "left" and "right". right */
-        valueAlign: string;
-        /** The text which will be displayed in the value portion of the legend. You can use tags like [[value]], [[open]], [[high]], [[low]], [[close]], [[percents]], [[description]]. [[value]] */
-        valueText: string;
-        /** Width of the value text.
-            @default 80
-        */
-        valueWidth: number;
-        /** Vertical space between legend items also between legend border and first and last legend row.  10 */
-        verticalGap: number;
-        /** Adds event listener of the type "clickLabel" or "clickMarker" or "hideItem" to the object.
-            @param type Either "clickLabel" or "clickMarker" or "hideItem".
-            @param handler
-                If the type is "clickLabel", dispatched when legend label is clicked.
-                If the type is "clickMarker", dispatched when legend marker is clicked.
-                If the type is "hideItem", dispatched when user clicks on a legend item marker and hides corresponding object.
-                If the type is "rollOutItem", dispatched when user rolls-out of the legend item label (or whole item, if switchable is set to false).
-                If the type if "rollOverItem", dispatched when user rolls-over the legend item label (or whole item, if switchable is set to false).
-                If the type is "rollOutMarker", dispatched when user clicks out of a legend item marker and shows corresponding object.
-                If the type if "rollOverMarker", dispatched when user clicks on a legend item marker and shows corresponding object.
-        */
-
-        /** Adds event listener of the type "showItem" to the object.
-            @param type Always "showItem".
-            @param handler
-        */
-        addListener(type: string, handler: (e: {/** Always "showItem". */
-            type: string; dataItem: Object; chart: AmChart;
-        }) => void );
-
-        /** Removes event listener from chart object. */
-        removeListener(chart: AmChart, type: string, handler: any);
-    }
-
-    /** StockLegend is a legend of StockPanel. */
-
-    class StockLegend extends AmLegend {
-        /** The text which will be displayed in the value portion of the legend when graph is comparable and at least one dataSet is selected for comparing. You can use tags like [[value]], [[open]], [[high]], [[low]], [[close]], [[percents.value/open/close/low/high]], [[description]]. [[percents.value]]% */
-
-        valueTextComparing: string;
-        /** The text which will be displayed in the value portion of the legend. You can use tags like [[value]], [[open]], [[high]], [[low]], [[close]], [[percents]], [[description]].  [[value]] */
-
-        valueTextRegular: string;
-    }
-
-    /** StockPanel class creates stock panels (charts). AmStockChart can have multiple Stock panels. */
-
-    class StockPanel extends AmSerialChart {
-        /** Specifies whether x button will be displayed near the panel. This button allows turning panel off. */
-        allowTurningOff: boolean;
-        /** If true, drawing icons will be displayed in top-right corner. */
-        drawingIconsEnabled: boolean;
-        /** Specifies on which value axis user can draw trend lines. Set drawingIconsEnabled to true if you want drawing icons to be visible. First value axis will be used if not set here. */
-        drawOnAxis: ValueAxis;
-        /** Specifies if all trend lines should be erased when erase button is clicked. If false, trend lines can be erased one by one. */
-        eraseAll: boolean;
-        /** Size of trend line drawing icons. If you change this size, you should update icon images if you want them to look properly.
-            @default 18
-        */
-        iconSize: number;
-        /** Relative height of panel. Possible values 0 - 100. */
-        percentHeight: number;
-        /** Specifies when values should be recalculated to percents. Possible values are: "never", "always", "whenComparing".  whenComparing */
-        recalculateToPercents: string;
-        /** Specifies whether this panel will show category axis.
-            @default true
-        */
-        showCategoryAxis: boolean;
-        /**  */
-        stockGraphs: StockGraph[];
-        /** Stock chart legend. */
-        stockLegend: StockLegend;
-        /** Title of a panel. Note, StockLegend should be added in order title to be displayed. */
-        title: string;
-        /** Trend line opacity.
-            @default 1
-        */
-        trendLineAlpha: number;
-        /** Trend line color. #00CC00 */
-        trendLineColor: string;
-        /** Trend line dash length. */
-        trendLineDashLength: number;
-        /** Trend line thickness.
-            @default 2
-        */
-        trendLineThickness: number;
-        /** Adds a graph to the panel. */
-        addStockGraph(graph: StockGraph);
-        /** Removes graph from the panel. */
-        removeStockGraph(graph: StockGraph);
-    }
-
-    /** AmChart is a base class of all charts. It can not be instantiated explicitly. AmCoordinateChart, AmPieChart and AmMap extend AmChart class. */
-    class AmChart {
-    	/** used when constructing a chart with a theme */
-    	constructor(theme?: any);
-    	/** Specifies, if class names should be added to chart elements. */
-        addClassNames: boolean;
-        /** Array of Labels. Example of label object, with all possible properties:
-{"x": 20, "y": 20, "text": "this is label", "align": "left", "size": 12, "color": "#CC0000", "alpha": 1, "rotation": 0, "bold": true, "url": "http://www.amcharts.com"} */
-        allLabels: Label[];
-        /**  Set this to false if you don't want chart to resize itself whenever its parent container size changes. */
-        autoResize: boolean;
-        /** Opacity of background. Set it to >0 value if you want backgroundColor to work. However we recommend changing div's background-color style for changing background color. */
-        backgroundAlpha: number;
-        /** Background color. You should set backgroundAlpha to >0 value in order background to be visible. We recommend setting background color directly on a chart's DIV instead of using this property. #FFFFFF */
-        backgroundColor: string;
-        /** The chart creates AmBalloon class itself. If you want to customize balloon, get balloon instance using this property, and then change balloon's properties.  AmBalloon */
-        balloon: AmBalloon;
-        /** Opacity of chart's border. Value range is 0 - 1. */
-        borderAlpha: number;
-        /** Color of chart's border. You should set borderAlpha >0 in order border to be visible. We recommend setting border color directly on a chart's DIV instead of using this property. #000000 */
-        borderColor: string;
-        /** This prefix is added to all class names which are added to all visual elements of a chart in case addClassNames is set to true. */
-        classNamePrefix: string;
-        /** Text color. #000000 */
-        color: string;
-        /** Non-commercial version only. Specifies position of link to amCharts site. Allowed values are: top-left, top-right, bottom-left and bottom-right.
-            @default 'top-left'
-        */
-        creditsPosition: string;
-        /** Array of data objects, for example: [{country:"US", value:524},{country:"UK", value:624},{country:"Lithuania", value:824}]. You can have any number of fields and use any field names. In case of AmMap, data provider should be MapData object. */
-        dataProvider: any[];
-        /** Decimal separator.
-            @Default . */
-        decimalSeparator: string;
-        /** Using this property you can add any additional information to SVG, like SVG filters or clip paths. The structure of this object should be identical to XML structure of a object you are adding, only in JSON format. */
-        defs: any;
-        /** Export config. Specifies how export to image/data export/print/annotate menu will look and behave. You can find a lot of examples in amcharts/plugins/export folder. */
-        export: ExportSettings;
-        /** Font family. Verdana */
-        fontFamily: string;
-        /** Font size.
-            @default 11
-        */
-        fontSize: string;
-        /** If you set this to true, the lines of the chart will be distorted and will produce hand-drawn effect. Try to adjust chart.handDrawScatter and chart.handDrawThickness properties for a more scattered result.
-            @Default false
-        */
-        handDrawn: boolean;
-        /** Defines by how many pixels hand-drawn line (when handDrawn is set to true) will fluctuate.
-            @Default 2
-        */
-        handDrawScatter: number;
-        /** Defines by how many pixels line thickness will fluctuate (when handDrawn is set to true).
-            @Default 1
-        */
-        handDrawThickness: number;
-        /** Time, in milliseconds after which balloon is hidden if the user rolls-out of the object. Might be useful for AmMap to avoid balloon flickering while moving mouse over the areas. Note, this is not duration of fade-out. Duration of fade-out is set in AmBalloon class.
-            @Default 150
-        */
-        hideBalloonTime: number;
-        /** Legend of a chart. */
-        legend: AmLegend;
-        /** Reference to the div of the legend. */
-        legendDiv: HTMLElement;
-        /** You can add listeners of events using this property. Example: listeners = [{"event":"dataUpdated", "method":handleEvent}]; */
-        listerns: Object[];
-        /** This setting affects touch-screen devices only. If a chart is on a page, and panEventsEnabled are set to true, the page won't move if the user touches the chart first. If a chart is big enough and occupies all the screen of your touch device, the user won’t be able to move the page at all. That's why the default value is "false". If you think that selecting/panning the chart or moving/pinching the map is a primary purpose of your users, you should set panEventsEnabled to true. */
-        panEventsEnabled: boolean;
-        /**  Specifies absolute or relative path to amCharts files, i.e. "amcharts/". (where all .js files are located)
-            If relative URLs are used, they will be relative to the current web page, displaying the chart.
-            You can also set path globally, using global JavaScript variable AmCharts_path. If this variable is set, and "path" is not set in chart config, the chart will assume the path from the global variable. This allows setting amCharts path globally. I.e.:
-            var AmCharts_path = "/libs/amcharts/";
-            "path" parameter will be used by the charts to locate it's files, like images, plugins or patterns.*/
-        path: string;
-        /** Specifies path to the folder where images like resize grips, lens and similar are.
-            IMPORTANT: Since V3.14.12, you should use "path" to point to amCharts directory instead. The "pathToImages" will be automatically set and does not need to be in the chart config, unless you keep your images separately from other amCharts files. */
-        pathToImages: string;
-        /** Precision of percent values. -1 means percent values won't be rounded at all and show as they are.
-            @default 2
-        */
-        percentPrecision: number;
-        /** Precision of values. -1 means values won't be rounded at all and show as they are.
-            @Default 1*/
-        precision: number;
-        /** Prefixes which are used to make big numbers shorter: 2M instead of 2000000, etc. Prefixes are used on value axes and in the legend. To enable prefixes, set usePrefixes property to true. [{number:1e+3,prefix:"k"},{number:1e+6,prefix:"M"},{number:1e+9,prefix:"G"},{number:1e+12,prefix:"T"},{number:1e+15,prefix:"P"},{number:1e+18,prefix:"E"},{number:1e+21,prefix:"Z"},{number:1e+24,prefix:"Y"}] */
-        prefixesOfBigNumbers: any[];
-        /** Prefixes which are used to make small numbers shorter: 2μ instead of 0.000002, etc. Prefixes are used on value axes and in the legend. To enable prefixes, set usePrefixes property to true. [{number:1e-24, prefix:"y"},{number:1e-21, prefix:"z"},{number:1e-18, prefix:"a"},{number:1e-15, prefix:"f"},{number:1e-12, prefix:"p"},{number:1e-9, prefix:"n"},{number:1e-6, prefix:"μ"},{number:1e-3, prefix:"m"}] */
-        prefixesOfSmallNumbers: any[];
-        /** Theme of a chart. Config files of themes can be found in amcharts/themes/ folder. More info about using themes. */
-        theme: string;
-        /** Thousands separator.
-            @default .
-        */
-        thousandsSeparator: string;
-        /** Array of Title objects. */
-        titles: Title[];
-        /** Type of a chart. Required when creating chart using JSON. Possible types are: serial, pie, xy, radar, funnel, gauge, map, stock. */
-        type: string;
-        /** If true, prefixes will be used for big and small numbers. You can set arrays of prefixes via prefixesOfSmallNumbers and prefixesOfBigNumbers properties. */
-        usePrefixes: boolean;
-        /** Read-only. Indicates current version of a script. */
-        version: string;
-        /** Adds a label on a chart.
-            You can use it for labeling axes, adding chart title, etc. x and y coordinates can be set in number, percent, or a number with ! in front of it - coordinate will be calculated from right or bottom instead of left or top.
-            x - horizontal coordinate
-            y - vertical coordinate
-            text - label's text
-            align - alignment (left/right/center)
-            size - text size
-            color - text color
-            rotation - angle of rotation
-            alpha - label alpha
-            bold - specifies if text is bold (true/false),
-            url - url
-        */
-        addLabel(x: number, y: number, text: string, align: string, size: number, color: string, rotation: number, alpha: number, bold: boolean, url: string);
-        /** Adds a legend to the chart.
-            By default, you don't need to create div for your legend, however if you want it to be positioned in some different way, you can create div anywhere you want and pass id or reference to your div as a second parameter.
-            (NOTE: This method will not work on StockPanel.)
-            @param legend
-            @param legendDivId - Id of the legend div (optional).
-        */
-        addLegend(legend: AmLegend, legendDivId?: string);
-        /** Adds a legend to the chart.
-            By default, you don't need to create div for your legend, however if you want it to be positioned in some different way, you can create div anywhere you want and pass id or reference to your div as a second parameter.
-            (NOTE: This method will not work on StockPanel.)
-            @param legend
-            @param legendDiv - Legend div (optional).
-        */
-        addLegend(legend: AmLegend, legendDiv: HTMLElement);
-
-        /**   Adds title to the top of the chart. Pie, Radar positions are updated so that they won't overlap. Plot area of Serial/XY chart is also updated unless autoMargins property is set to false. You can add any number of titles - each of them will be placed in a new line. To remove titles, simply clear titles array: chart.titles = []; and call chart.validateNow() method. text - text of a title size - font size color - title color alpha - title opacity bold - boolean value indicating if title should be bold. */
-        addTitle(text: string, size: number, color: string, alpha: number, bold: boolean);
-        /** Clears the chart area, intervals, etc. */
-        clear();
-        /** Removes all labels added to the chart. */
-        clearLabels();
-        /** Use this method to force the chart to resize to it's current container size. */
-        invalidateSize();
-        /** Removes chart's legend. */
-        removeLegend();
-        /** This method should be called after data in your data provider changed or a new array was set to dataProvider. After calling this method the chart will parse data and redraw. */
-        validateData();
-        /** This method should be called after you changed one or more properties of any class. The chart will redraw after this method is called. */
-        validateNow();
-
-        /** Adds chart to the specified DIV.
-            @param container DIV object which will hold the chart. */
-        write(container: HTMLElement): void;
-        /** Adds chart to the specified DIV.
-            @param container Id of a DIV which will hold the chart. */
-        write(container: string): void;
-
-        /** Adds event listener of the type "dataUpdated" or "init" to the object.
-            @param type "dataUpdated" or "init".
-            @param handler
-                If the type is "dataUpdated".
-                    Dispatched when chart is build for the first time or after validateData() method was called.
-                If the type is "init".
-                    Dispatched when chart is build for the first time.
-        */
-        addListener(type: string, handler: (e: {
-            /** Either "dataUpdated" or "init". */
-            type: string;
-            chart: AmChart;
-        }) => void );
-        /** Removes event listener from chart object. */
-        removeListener(chart: AmChart, type: string, handler: any);
-    }
-
-    /** AmCoordinateChart is a base class of AmRectangularChart. It can not be instantiated explicitly. */
-
-    class AmCoordinateChart extends AmChart {
-        /** Read-only. Array, holding processed chart's data. */
-        chartData: Object[];
-        /** Specifies the colors of the graphs if the lineColor of a graph is not set.
-            It there are more graphs then colors in this array, the chart picks random color.
-            @default ['#FF6600', '#FCD202', '#B0DE09', '#0D8ECF', '#2A0CD0', '#CD0D74', '#CC0000', '#00CC00', '#0000CC', '#DDDDDD', '#999999', '#333333', '#990000'] */
-        colors: string[];
-        /** The array of graphs belonging to this chart.
-            To add/remove graph use addGraph/removeGraph methods instead of adding/removing graphs directly to array.
-        */
-        graphs: AmGraph[];
-        /** Specifies if grid should be drawn above the graphs or below. Will not work properly with 3D charts.
-            @default false
-        */
-        gridAboveGraphs: boolean;
-        /** Instead of adding guides to the axes, you can push all of them to this array. In case guide has category or date defined, it will automatically will be assigned to the category axis. Otherwise to first value axis, unless you specify a different valueAxis for the guide. */
-        guides: Guide[];
-        /** Specifies whether the animation should be sequenced or all objects should appear at once.
-            @default true
-        */
-        sequencedAnimation: boolean;
-        /** The initial opacity of the column/line.
-            If you set startDuration to a value higher than 0, the columns/lines will fade in from startAlpha.
-            Value range is 0 - 1.
-            @default 1
-        */
-        startAlpha: number;
-        /** Duration of the animation, in seconds. */
-        startDuration: number;
-        /** Animation effect.
-            Possible values are ">", "<", elastic" and "bounce".
-            @default "elastic"
-        */
-        startEffect: string;
-        /** Target of url.
-            @default this
-        */
-        urlTarget: any;
-        /** The array of value axes.
-            To add/remove value axis use addValueAxis/removeValueAxis methods instead of adding/removing axes directly to array.
-            Chart creates one value axis automatically, so if you need only one value axis, you don't need to create it.
-        */
-        valueAxes: any[];
-        /**  Adds a graph to the chart.
-         */
-        addGraph(graph: AmGraph);
-        /** Adds a legend to the chart. By default, you don't need to create div for your legend, however if you want it to be positioned in some different way, you can create div anywhere you want and pass id or reference to your div as a second parameter. (NOTE: This method will not work on StockPanel.) */
-        /** Adds value axis to the chart.
-            One value axis is created automatically, so if you don't want to change anything or add more value axes, you don't need to add it.
-        */
-        addValueAxis(axis: ValueAxis);
-        /** You can trigger the animation of the chart. */
-        animateAgain();
-
-        /** AmGraph Returns graph by id. */
-        getGraphById(graphId: string): AmGraph;
-
-        /**  Returns value axis by id.*/
-        getValueAxisById(axisId: string): ValueAxis;
-
-        /** Hide the graph (if it is visible). Usually this method is called from the Legend, when you click on the legend marker.
-        */
-        hideGraph(graph: AmGraph);
-
-        /** Hide value balloon of a graph. Usually this method is called from the Legend, when you click on the legend text.*/
-        hideGraphsBalloon(graph: AmGraph);
-
-        /** Highlight the graph. Usually this method is called from the Legend, when you roll-over the legend entry.*/
-        highlightGraph(graph: AmGraph);
-
-        /** Removes graph from the chart.*/
-        removeGraph(graph: AmGraph);
-
-        /** Removes value axis from the chart. When you remove value axis, all graphs assigned to this axis are also removed. */
-        removeValueAxis(axis: ValueAxis);
-
-        /** Show the graph (if it is hidden). Usually this method is called from the Legend, when you click on the legend marker.*/
-        showGraph(graph: AmGraph);
-
-        /** Show value balloon of a graph. Usually this method is called from the Legend, when you click on the legend text.*/
-        showGraphsBalloon(graph: AmGraph);
-
-        /** UnhighlightGraph the graph. Usually this method is called from the Legend, when you roll-out the legend entry.*/
-        unhighlightGraph(graph: AmGraph);
-        /** Adds event listener of the type "clickGraphItem" or "doubleClickGraphItem" or "rightClickGraphItem" or "rollOutGraphItem" or "rollOverGraphItem" to the object.
-            @param type Either "clickGraphItem" or "doubleClickGraphItem" or "rightClickGraphItem" or "rollOutGraphItem" or "rollOverGraphItem".
-            @param handler Dispatched when user clicks on the data item (column/bullet)
-        */
-        addListener(type: string, handler: (e: {
-            /** Either "clickGraphItem" or "doubleClickGraphItem" or "rightClickGraphItem" or "rollOutGraphItem" or "rollOverGraphItem". */
-            type: string;
-            graph: AmGraph;
-            item: GraphDataItem;
-            index: number;
-            chart: AmChart;
-        }) => void );
-    }
-
-    /** GraphDataItem holds all the information about the graph's data item. When working with a chart, you do not create GraphDataItem objects or change it's properties directly. GraphDataItem is passed to you by events when user interacts with data item on the chart. The list of properties below will help you to extract data item's value/coordinate/etc. */
-    class GraphDataItem {
-        /** Opacity of the data item. */
-        alpha: number;
-        /** Bullet type. */
-        bullet: string;
-        /** Bullet size.  */
-        bulletSize: number;
-        /** Category value. */
-        category: string;
-        /** Color of the data item. */
-        color: string;
-        /** Custom bullet (path to file name). */
-        customBullet: string;
-        /** Original object from data provider. */
-        dataContext: Object;
-        /** Description. */
-        description: string;
-        /** Array of colors of the data item, used by column and candlestick chart only. */
-        fillColors: any[];
-        /** Object which holds percents when recalculateToPercents is set to true. */
-        percents: Object;
-        /** SerialDataItem of this graphDataItem */
-        serialDataItem: SerialDataItem;
-        /** url */
-        url: string;
-        /** Object which holds values of the data item (value, open, close, low, high). */
-        values: Object;
-        /** x coordinate of the data item. */
-        x: number;
-        /** y coordinate of the data item. */
-        y: number;
-    }
-
-    /** SerialDataItem holds all the information about each series. When working with a chart, you do not create SerialDataItem objects or change it's properties directly. Consider properties of a SerialDataItem read-only - change values in chart's data provider if you need to. When serial chart parses dataProvider, it generates "chartData" array. Objects of this array are SerialDataItem objects. */
-    class SerialDataItem {
-
-        /** You can access each GraphDataItem using this object. The data structure is: graphDataItem = serialDataItem.axes[axisId].graphs[graphId]. */
-        axes: Object;
-
-        /** category value. String if parseDates is false, Date if true. */
-        category: any;
-
-        /** Timestamp of a series date. Avalable only if parseDates property of CategoryAxis is set to true. */
-        time: number;
-
-        /** Coordinate (horizontal or vertical, depends on chart's rotate property) of the series. */
-        x: number;
-    }
-
-    class CategoryAxis extends AxisBase {
-
-        /** When parse dates is on for the category axis, the chart will try to highlight the beginning of the periods, like month, in bold. Set this to false to disable the functionality.
-            @default true
-        */
-        boldPeriodBeginning: boolean;
-
-        /** Date formats of different periods. Possible period values: fff - milliseconds, ss - seconds, mm - minutes, hh - hours, DD - days, MM - months, WW - weeks, YYYY - years. Check this page for date formatting strings. [{period:'fff',format:'JJ:NN:SS'},{period:'ss',format:'JJ:NN:SS'},{period:'mm',format:'JJ:NN'},{period:'hh',format:'JJ:NN'},{period:'DD',format:'MMM DD'},{period:'WW',format:'MMM DD'},{period:'MM',format:'MMM'},{period:'YYYY',format:'YYYY'}] */
-        dateFormats: any[];
-
-        /** In case your category axis values are Date objects and parseDates is set to true, the chart will parse dates and will place your data points at irregular intervals. However if you want dates to be parsed (displayed on the axis, baloons, etc), but data points to be placed at equal intervals (omiting dates with no data), set equalSpacing to true. */
-        equalSpacing: boolean;
-
-        /** Field in data provider which specifies if the category value should always be shown. For example: categoryAxis.forceShowField = "forceShow"; Field in data provider which specifies if the category value should always be shown. For example: categoryAxis.forceShowField = "forceShow";
-        And in data:
-        {category:"one", forceShow:true, value:100}
-        Note, this works only when parseDates is set to false.*/
-        forceShowField: string;
-
-        /** Specifies if a grid line is placed on the center of a cell or on the beginning of a cell. Possible values are: "start" and "middle" This setting doesn't work if parseDates is set to true. middle */
-        gridPosition: string;
-
-        /** Specifies the shortest period of your data. This should be set only if parseDates is set to "true". Possible period values: fff - milliseconds, ss - seconds, mm - minutes, hh - hours, DD - days, MM - months, YYYY - years. DD */
-        minPeriod: string;
-
-        /** In case your category axis values are Date objects, set this to true. In this case the chart will parse dates and will place your data points at irregular intervals. If you want dates to be parsed, but data points to be placed at equal intervals, set both parseDates and equalSpacing to true. */
-        parseDates: boolean;
-
-        /** Specifies whether the graph should start on axis or not. In case you display columns, it is recommended to set this to false. If parseDates is set to true, startOnAxis will allways be false, unless equalSpacing is set to true. */
-        startOnAxis: boolean;
-
-        /** Number returns coordinate of a category. Works only if parseDates is false. If parseDates is true, use dateToCoordinate method. category - String */
-        categoryToCoordinate(category: string);
-
-        /** date - Date object Returns Date of the coordinate, in case parseDates is set to true and equalSpacing is set to false.  coordinate - Number */
-        coordinateToDate(coordinate: number);
-
-        /** Number Returns coordinate of the date, in case parseDates is set to true. if parseDates is false, use categoryToCoordinate method. date - Date object */
-        dateToCoordinate(date: Date);
-
-        /** Number Returns index of the category which is most close to specified coordinate. x - coordinate */
-        xToIndex(x: number);
-    }
-
-    /** ChartScrollbar class displays chart scrollbar. Supported by AmSerialChart and AmXYChart.
-        @example
-            var chart = new AmCharts.AmSerialChart();
-            var chartScrollbar = new AmCharts.ChartScrollbar();
-            chart.addChartScrollbar(chartScrollbar);
-    */
-    class ChartScrollbar {
-        /** Specifies whether number of gridCount is specified automatically, acoarding to the axis size. */
-        autoGridCount: boolean;
-        /** Background opacity.
-            @default 1
-        */
-        backgroundAlpha: number;
-        /** Background color of the scrollbar.
-            @default #D4D4D4
-        */
-        backgroundColor: string;
-        /** Read-only. Category axis of the scrollbar. */
-        categoryAxis: CategoryAxis;
-        /** Text color. Will use chart's color if not set. */
-        color: string;
-        /** Specifies which graph will be displayed in the scrollbar. Only Serial chart's scrollbar can display a graph. */
-        graph: AmGraph;
-        /** Graph fill opacity. Value range is 0 - 1.  0.1 */
-        graphFillAlpha: number;
-        /** Graph fill color. #000000 */
-        graphFillColor: string;
-        /** Graph line opacity. Value range is 0 - 1. */
-        graphLineAlpha: number;
-        /** Graph line color. #000000 */
-        graphLineColor: string;
-        /** by default the graph type is the same as the original graph's type, however in case of candlestick or ohlc you might want to show line graph in the scrollbar. Possible values are: "line", "column", "step", "smoothedLine", "candlestick", "ohlc". */
-        graphType: string;
-        /** Grid opacity. Value range is 0 - 1. 0.7 */
-        gridAlpha: number;
-        /** Grid color. #FFFFFF */
-        gridColor: string;
-        /** The number of grid lines. */
-        gridCount: number;
-        /** Specifies whether resize grips are hidden when mouse is away from the scrollbar. */
-        hideResizeGrips: boolean;
-        /** Specifies whether scrollbar has a resize feature.
-            @default true
-        */
-        resizeEnabled: boolean;
-        /** Height (width, if chart is rotated) of a scrollbar.  20 */
-        scrollbarHeight: number;
-        /** Duration of scrolling, when the user clicks on scrollbar's background, in seconds.
-            @default 2
-        3*/
-        scrollDuration: number;
-        /** Selected backround opacity.
-            @default 1
-        */
-        selectedBackgroundAlpha: number;
-        /** Selected background color. #EFEFEF */
-        selectedBackgroundColor: string;
-        /** Selected graph's fill opacity. Value range is 0 - 1. 0.5 */
-        selectedGraphFillAlpha: number;
-        /** Selected graph's fill color. #000000 */
-        selectedGraphFillColor: string;
-        /** Selected graph's line opacity. Value range is 0 - 1. */
-        selectedGraphLineAlpha: number;
-        /** Selected graph's line color. #000000 */
-        selectedGraphLineColor: string;
-        /** Specifies if the chart should be updated while dragging/resizing the scrollbar or only at the moment when user releases mouse button. */
-        updateOnReleaseOnly: boolean;
-    }
-
-    /** AmRectangularChart is a base class of AmSerialChart and AmXYChart. It can not be instantiated explicitly.*/
-    class AmRectangularChart extends AmCoordinateChart {
-        /** The angle of the 3D part of plot area. This creates a 3D effect (if the "depth3D" is > 0).
-            @default 0
-        */
-        angle: number;
-        /** Space left from axis labels/title to the chart's outside border, if autoMargins set to true.
-            @default 10
-        */
-        autoMarginOffset: number;
-        /** Specifies if margins of a chart should be calculated automatically so that labels of axes would fit. The chart will adjust only margins with axes. Other margins will use values set with marginRight, marginTop, marginLeft and marginBottom properties.
-            @default true
-        */
-        autoMargins: boolean;
-        /** Cursor of a chart. */
-        chartCursor: ChartCursor;
-        /** Chart scrollbar. */
-        chartScrollbar: ChartScrollbar;
-        /** The depth of the 3D part of plot area. This creates a 3D effect (if the "angle" is > 0).
-            @default 0*/
-        depth3D: number;
-        /** Number of pixels between the container's bottom border and plot area. This space can be used for bottom axis' values. If autoMargin is true and bottom side has axis, this property is ignored.
-            @default 20
-        */
-        marginBottom: number;
-        /** Number of pixels between the container's left border and plot area. This space can be used for left axis' values. If autoMargin is true and left side has axis, this property is ignored.
-            @default 20
-        */
-        marginLeft: number;
-        /** Number of pixels between the container's right border and plot area. This space can be used for Right axis' values. If autoMargin is true and right side has axis, this property is ignored.
-            @default 20
-        */
-        marginRight: number;
-        /** Flag which should be set to false if you need margins to be recalculated on next chart.validateNow() call.
-            @default false
-        */
-        marginsUpdated: boolean;
-        /** Number of pixels between the container's top border and plot area. This space can be used for top axis' values. If autoMargin is true and top side has axis, this property is ignored.
-            @default 20
-        */
-        marginTop: number;
-        /** The opacity of plot area's border. Value range is 0 - 1.
-            @default 0
-         */
-        plotAreaBorderAlpha: number;
-        /** The color of the plot area's border. Note, the it is invisible by default, as plotAreaBorderAlpha default value is 0. Set it to a value higher than 0 to make it visible.
-            @default '#000000'*/
-        plotAreaBorderColor: string;
-        /** Opacity of plot area. Plural form is used to keep the same property names as our Flex charts'. Flex charts can accept array of numbers to generate gradients. Although you can set array here, only first value of this array will be used.
-            @default 0
-        */
-        plotAreaFillAlphas: number;
-        /** You can set both one color if you need a solid color or array of colors to generate gradients, for example: ["#000000", "#0000CC"]
-            @default '#FFFFFF'
-        */
-        plotAreaFillColors: any;
-        /** If you are using gradients to fill the plot area, you can use this property to set gradient angle. The only allowed values are horizontal and vertical: 0, 90, 180, 270.
-            @default 0
-        */
-        plotAreaGradientAngle: number;
-        /** Array of trend lines added to a chart. You can add trend lines to a chart using this array or access already existing trend lines */
-        trendLines: TrendLine[];
-        /** Opacity of zoom-out button background.
-            @default 0
-        */
-        zoomOutButtonAlpha: number;
-        /** Zoom-out button background color.
-            @default '#e5e5e5'
-        */
-        zoomOutButtonColor: string;
-        /** Name of zoom-out button image. In the images folder there is another lens image, called lensWhite.png. You might want to have white lens when background is dark. Or you can simply use your own image.
-            @default lens.png
-        */
-        zoomOutButtonImage: string;
-        /** Size of zoom-out button image
-            @default: 17
-        */
-        zoomOutButtonImageSize: number;
-        /** Padding around the text and image.
-            @default: 8
-        */
-        zoomOutButtonPadding: number;
-        /** Opacity of zoom-out button background when mouse is over it.
-            @default: 1
-        */
-        zoomOutButtonRollOverAlpha: number;
-        /** Text in the zoom-out button. Show all */
-        zoomOutText: string;
-
-        /** Adds a ChartCursor object to a chart */
-        addChartCursor(cursor: ChartCursor);
-        /** Adds a ChartScrollbar to a chart */
-        addChartScrollbar(scrollbar: ChartScrollbar);
-        /** Adds a TrendLine to a chart.
-            You should call chart.validateNow() after this method is called in order the trend line to be visible. */
-        addTrendLine(trendLine: TrendLine);
-        /** Removes cursor from the chart */
-        removeChartCursor();
-        /** Removes scrollbar from the chart */
-        removeChartScrollbar();
-        /** Removes a trend line from a chart.
-            You should call chart.validateNow() in order the changes to be visible. */
-        removeTrendLine(trendLine: TrendLine);
-    }
-
-    /* Trend lines are straight lines indicating trends, might also be used for some different purposes. Can be used by Serial and XY charts. To add/remove trend line, use chart.addTrendLine(trendLine)/chart.removeTrendLine(trendLine) methods or simply pass array of trend lines: chart.trendLines = [trendLine1, trendLine2].
-        @example
-            var trendLine = new AmCharts.TrendLine();
-            trendLine.initialDate = new Date(2012, 0, 2, 12); // 12 is hour - to start trend line in the middle of the day
-            trendLine.finalDate = new Date(2012, 0, 11, 12);
-            trendLine.initialValue = 10;
-            trendLine.finalValue = 19;
-            trendLine.lineColor = "#CC0000";
-            chart.addTrendLine(trendLine);
-    */
-    class TrendLine {
-
-    }
-
-    /** ChartCursor is a class which displays a cursor which follows the mouse. In case of Serial chart it also shows value and category balloons.
-        @example
-            var chart = new AmCharts.AmSerialChart();
-            var chartCursor = new AmCharts.ChartCursor();
-            chart.addChartCursor(chartCursor);
-    */
-    class ChartCursor {
-        /** Specifies if bullet for each graph will follow the cursor. */
-        bulletsEnabled: boolean;
-        /** Size of bullets, following the cursor.
-            @default 8
-        */
-        bulletSize: number;
-        /** Opacity of the category balloon.
-            @default 1
-        */
-        categoryBalloonAlpha: number;
-        /** Color of the category balloon. cursorColor is used if not set. */
-        categoryBalloonColor: string;
-        /** Category balloon date format (used only if category axis parses dates). Check this page for instructions on how to format dates. MMM DD, YYYY */
-        categoryBalloonDateFormat: string;
-        /** Specifies whether category balloon is enabled.
-            @default true
-        */
-        categoryBalloonEnabled: boolean;
-        /** Text color. #FFFFFF */
-        color: string;
-        /** Opacity of the cursor line.  1 */
-        cursorAlpha: number;
-        /** Color of the cursor line. #CC0000 */
-        cursorColor: string;
-        /** Specifies where the cursor line should be placed - on the beginning of the period (day, hour, etc) or in the middle (only when parseDates property of categoryAxis is set to true). If you want the cursor to follow mouse and not to glue to the nearest data point, set "mouse" here. Possible values are: "start", "middle", "mouse". */
-        cursorPosition: string;
-        /** Specifies whether cursor is enabled.
-            @default true
-        */
-        enabled: boolean;
-        /** If this is set to true, only one balloon at a time will be displayed. Note, this is quite CPU consuming. */
-        oneBalloonOnly: boolean;
-        /** If this is set to true, the user will be able to pan the chart (Serial only) instead of zooming. */
-        pan: boolean;
-        /** Opacity of the selection. */
-        selectionAlpha: number;
-        /** Specifies if cursor should only mark selected area but not zoom-in after user releases mouse button. */
-        selectWithoutZooming: boolean;
-        /** Specifies whether value balloons are enabled. In case they are not, the balloons might be displayed anyway, when the user rolls-over the column or bullet.
-            @default true
-        */
-        valueBalloonsEnabled: boolean;
-        /** Specifies if the user can zoom-in the chart. If pan is set to true, zoomable is switched to false automatically.
-            @default true
-        */
-        zoomable: boolean;
-        /** Indicates if currently user is selecting some chart area to zoom-in. */
-        zooming: boolean;
-
-
-        /** Hides cursor. */
-        hideCursor();
-        /** You can force cursor to appear at specified cateogry or date. */
-        showCursorAt(category: string);
-        /** Adds event listener of the type "changed" to the object.
-            @param type Always "changed".
-            @param handler Dispatched when cursor position is changed. "index" is a series index over which chart cursors currently is. "zooming" specifies if user is currently zooming (is selecting) the chart. mostCloseGraph property is set only when oneBalloonOnly is set to true.*/
-        addListener(type: string, handler: (e: {/** Always "changed". */
-            type: string; index: number; zooming: boolean; mostCloseGraph: AmGraph; chart: AmChart;
-        }) => void );
-        /** Adds event listener of the type "onHideCursor" to the object.
-            @param type Always "onHideCursor".
-            @param handler Dispatched when cursor is hidden.*/
-        addListener(type: string, handler: (e: {/** Always "onHideCursor". */
-            type: string; chart: AmChart;
-        }) => void );
-        /** Adds event listener of the type "selected" or "zoomed" to the object.
-            @param type "selected" or "zoomed".
-            @param handler
-                If the type is "selected". Dispatched if selectWithoutZooming is set to true and when user selects some period. start and end are indices or timestamp (when categoryAxis.parseDates is true) of selection start/end.
-                If the type is "zoomed". Dispatched when user zooms to some period. start and end are indices or timestamp (when categoryAxis.parseDates is true) of selection start/end.
-        */
-        addListener(type: string, handler: (e: {/** Always "zoomed". */
-            type: string; index: number; zooming: boolean; chart: AmChart;
-        }) => void );
-
-        /** Removes event listener from chart object. */
-        removeListener(chart: AmChart, type: string, handler: any);
-    }
-
-    /** AmSerialChart is the class you have to use for majority of chart types. The supported chart types are: line, area, column, bar, step line, smoothed line, candlestick and OHLC. The chart can be rotated by 90 degrees so the column chart becomes bar chart. The chart supports simple and logarithmic scales, it can have multiple value axes. The chart can place data points at equal intervals or can parse dates and place data points at irregular intervals.
-        @example
-            var chartData = [{title:"sample 1",value:130},{title:"sample 2",value:26}];
-
-            var chart = new AmCharts.AmSerialChart();
-            chart.categoryField = "title";
-            chart.dataProvider = chartData;
-
-            var graph = new AmCharts.AmGraph();
-            graph.valueField = "value";
-            graph.type = "column";
-            graph.fillAlphas = 1;
-            chart.addGraph(graph);
-
-            chart.write("chartdiv");
-    */
-    class AmSerialChart extends AmRectangularChart {
-    	/** Date format of the graph balloon (if chart parses dates and you don't use chartCursor).
-            @default 'MMM DD, YYYY'
-        */
-        balloonDateFormat: string;
-        /** Read-only. Chart creates category axis itself. If you want to change some properties, you should get this axis from the chart and set properties to this object. */
-        categoryAxis: CategoryAxis;
-        /** Category field name tells the chart the name of the field in your dataProvider object which will be used for category axis values. */
-        categoryField: string;
-        /** The gap in pixels between two columns of the same category.
-            @default 5
-        */
-        columnSpacing: number;
-        /** Space between 3D stacked columns.
-            @default 0
-        */
-        columnSpacing3D: number;
-        /** Relative width of columns. Value range is 0 - 1.
-            @default 0.8
-        */
-        columnWidth: number;
-        /** Read-only. If category axis parses dates endDate indicates date to which the chart is currently displayed. */
-        endDate: Date;
-        /** Read-only. Category index to which the chart is currently displayed. */
-        endIndex: number;
-        /** Maximum number of series allowed to select. */
-        maxSelectedSeries: number;
-        /** The longest time span allowed to select (in milliseconds) for example, 259200000 will limit selection to 3 days. */
-        maxSelectedTime: number;
-        /** The shortest time span allowed to select (in milliseconds) for example, 1000 will limit selection to 1 second.
-            @default 0
-        */
-        minSelectedTime: number;
-        /** Specifies if scrolling of a chart with mouse wheel is enabled. If you press shift while rotating mouse wheel, the chart will zoom-in/out. */
-        mouseWheelScrollEnabled: boolean;
-        /** Specifies if zooming of a chart with mouse wheel is enabled. If you press shift while rotating mouse wheel, the chart will scroll. */
-        mouseWheelZoomEnabled: boolean;
-        /** If you set this to true, the chart will be rotated by 90 degrees (the columns will become bars). */
-        rotate: boolean;
-        /** Read-only. If category axis parses dates startDate indicates date from which the chart is currently displayed. */
-        startDate: Date;
-        /** Read-only. Category index from which the chart is currently displayed. */
-        startIndex: number;
-        /** Specifies if chart should zoom-out when data is updated.
-            @default true
-         */
-        zoomOutOnDataUpdate: boolean;
-
-        /** Number Returns index of the specified category value. value - series (category value) which index you want to find. */
-        getCategoryIndexByValue(value: number);
-        /** Zooms out, charts shows all available data. */
-        zoomOut();
-        /** Zooms the chart by the value of the category axis. start - category value, String \\ end - category value, String */
-        zoomToCategoryValues(start: Date, end: Date);
-        /** Zooms the chart from one date to another. start - start date, Date object \\ end - end date, Date object */
-        zoomToDates(start: Date, end: Date);
-        /** Zooms the chart by the index of the category. start - start index, Number \\ end - end index, Number */
-        zoomToIndexes(start: Date, end: Date);
-    }
-
-    class PeriodSelector {
-        /** Date format of date input fields. Check [[http://help.adobe.com/en_US/FlashPlatform/reference/actionscript/3/mx/formatters/DateFormatter.html DD-MM-YYYY */
-        dateFormat: string;
-        /** Text displayed next to "from" date input field. From: */
-        fromText: string;
-        /** Specifies if period buttons with date range bigger than available data should be hidden.
-            @default true
-        */
-        hideOutOfScopePeriods: boolean;
-        /** Specifies whether period selector displays "from" and "to" date input fields.
-            @default true
-        */
-        inputFieldsEnabled: boolean;
-        /** Width of date input fields, in pixels. Works only if period selector is horizontal.
-            @default 100
-        */
-        inputFieldWidth: number;
-        /** Array of predefined period objects. Period object has 4 properties - period, count, label and selected. Possible period values are: "ss" - seconds, "mm" - minutes, "hh" - hours, "DD" - days, "MM" - months and "YYYY" - years. property "count" specifies how many periods this button will select. "label" will be displayed on a button and "selected" is a boolean which specifies if this button is selected when chart is initialized or not. Example: {period:"DD", count:10, label:"10 days", selected:false}. */
-        periods: any[];
-        /** Text displayed next to predefined period buttons. Zoom: */
-        periodsText: string;
-        /** Possible values: "right", "left", "top", "bottom". bottom */
-        position: string;
-        /** Specifies whether predefined period buttons should select a period from the beginning or the end of the data. */
-        selectFromStart: boolean;
-        /** Text displayed next to "to" date input field. To: */
-        toText: string;
-        /** Width of a period selector, when position is "left" or "right".
-            @default 180
-        */
-        width: number;
-
-        /** Adds event listener to the object.
-       .
-@param handler - Dispatched when dates in period selector input fields are changed or user clicks on one of the predefined period buttons. */
-
-        addListener(type: string, handler: (e: {
-            /** Always: "changed" */
-
-            type: string;
-            startDate: Date;
-            endDate: Date;
-            predefinedPeriod: string;
-            count: number;
-        }) => void );
-
-        /** Removes event listener from chart object. */
-        removeListener(chart: AmChart, type: string, handler: any);
-    }
-
-    /** PanelsSettings settings set's settings for all StockPanels. If you change a property after the chart is initialized, you should call stockChart.validateNow() method in order for it to work. If there is no default value specified, default value of StockPanel class will be used. */
-
-    class PanelsSettings {
-        /** The angle of the 3D part of plot area. This creates a 3D effect (if the "depth3D" is > 0). */
-        angle: number;
-        /** Opacity of panel background. Possible values are 1 and 0. Values like 0.5 will not make it half-transparent. */
-        backgroundAlpha: number;
-        /** Background color of panels. Set backgroundAlpha to > 0 value in order to make background visible. #FFFFFF */
-        backgroundColor: string;
-        /** The gap in pixels between two columns of the same category. */
-        columnSpacing: number;
-        /** Relative width of columns. Valid values 0 - 1. */
-        columnWidth: number;
-        /** The depth of the 3D part of plot area. This creates a 3D effect (if the "angle" is > 0). */
-        depth3D: number;
-        /** Font family. */
-        fontFamily: string;
-        /** Font size. */
-        fontSize: string;
-        /** Number of pixels between the container's bottom border and plot area.
-            @default 1
-        */
-        marginBottom: number;
-        /** Number of pixels between the container's left border and plot area. If your left valueAxis values ar not placed inside the plot area, you should set marginLeft to 80 or some close value. */
-        marginLeft: number;
-        /** Number of pixels between the container's left border and plot area. If your right valueAxis values ar not placed inside the plot area, you should set marginRight to 80 or some close value. */
-        marginRight: number;
-        /** Number of pixels between the container's top border and plot area. */
-        marginTop: number;
-        /** Gap between panels.
-            @default 8
-        */
-        panelSpacing: number;
-        /** This setting affects touch-screen devices only. If a chart is on a page, and panEventsEnabled are set to true, the page won't move if the user touches the chart first. If a chart is big enough and occupies all the screen of your touch device, the user won’t be able to move the page at all. That's why the default value is "false". If you think that selecting or or panning the chart is a primary purpose of your chart users, you should set panEventsEnabled to true. */
-        panEventsEnabled: boolean;
-        /** The opacity of plot area's border. */
-        plotAreaBorderAlpha: number;
-        /** The color of the plot area's border. */
-        plotAreaBorderColor: string;
-        /** Opacity of plot area fill. */
-        plotAreaFillAlphas: number;
-        /** Specifies the colors used to tint the background gradient fill of the plot area. String or Array of Strings */
-        plotAreaFillColors: any;
-        /** Prefixes which are used to make big numbers shorter: 2M instead of 2000000, etc. Prefixes are used on value axes and in the legend. To enable prefixes, set usePrefixes property to true. [{number:1e+3,prefix:"k"},{number:1e+6,prefix:"M"},{number:1e+9,prefix:"G"},{number:1e+12,prefix:"T"},{number:1e+15,prefix:"P"},{number:1e+18,prefix:"E"},{number:1e+21,prefix:"Z"},{number:1e+24,prefix:"Y"}] */
-        prefixesOfBigNumbers: any[];
-        /** Prefixes which are used to make small numbers shorter: 2μ instead of 0.000002, etc. Prefixes are used on value axes and in the legend. To enable prefixes, set usePrefixes property to true. [{number:1e-24, prefix:"y"},{number:1e-21, prefix:"z"},{number:1e-18, prefix:"a"},{number:1e-15, prefix:"f"},{number:1e-12, prefix:"p"},{number:1e-9, prefix:"n"},{number:1e-6, prefix:"μ"},{number:1e-3, prefix:"m"}] */
-        prefixesOfSmallNumbers: any[];
-        /** Specifies whether the animation should be sequenced or all objects should appear at once. */
-        sequencedAnimation: boolean;
-        /** The initial opacity of the column/line. If you set startDuration to a value higher than 0, the columns/lines will fade in from startAlpha. */
-        startAlpha: number;
-        /** Duration of the animation, in seconds. */
-        startDuration: number;
-        /** Possible values are: "linear", "<", ">" "<>", "elastic", "bounce". */
-        startEffect: string;
-        /** If true, prefixes will be used for big and small numbers. */
-        usePrefixes: boolean;
-    }
-
-    /** DataSet is objects which holds all information about data. */
-
-    class DataSet {
-        /** Category field name in your dataProvider. */
-        categoryField: string;
-        /** Color of the data set. One of colors from AmStockChart.colors array will be used if not set. */
-        color: string;
-        /** Whether this data set is selected for comparing. If you change this property, you should call stockChart.validateData() method in order the changes to be applied. */
-        compared: boolean;
-        /** Data provider of the data set. */
-        dataProvider: any[];
-        /** Array of field mappings. Field mapping is an object with fromField and toField properties. fromField is a name of your value field in dataProvider. toField might be chosen freely, it will be used to set value/open/close/high/low fields for the StockGraph. Example: {fromField:"val1", toField:"value"}. */
-        fieldMappings: any[];
-        /** Specifies whether this data set should be visible in "compare to" list.
-            @default true
-        */
-        showInCompare: boolean;
-        /** Specifies whether this data set should be visible in "select" dropdown.
-            @default true
-         */
-        showInSelect: boolean;
-        /** Array of StockEvent objects. */
-        stockEvents: StockEvent[];
-        /** DataSet title. */
-        title: string;
-    }
-
-    class StockGraph extends AmGraph {
-        /** Specifies whether this graph will be compared if some data set is selected for comparing. */
-        comparable: boolean;
-        /** Specifies a field to be used to generate comparing graph. Note, this field is not the one used in your dataProvider, but toField from FieldMapping object. */
-        compareField: string;
-        /** Balloon color of comparing graph. */
-        compareGraphBalloonColor: string;
-        /** Balloon text of comparing graph. */
-        compareGraphBalloonText: string;
-        /** Bullet of comparing graph. Possible values are: "square", "round", "line", "triangleUp", "triangleDown", "dashedLine", "bubble". */
-        compareGraphBullet: string;
-        /** Bullet size of comparing graph. */
-        compareGraphBulletSize: number;
-        /** Corner radius of comparing graph (if type is "column"). */
-        compareGraphCornerRadiusTop: number;
-        /** Dash length of compare graph. */
-        compareGraphDashLength: number;
-        /** Fill alpha of comparing graph. */
-        compareGraphFillAlphas: number;
-        /** Fill color of comparing graph. */
-        compareGraphFillColors: string;
-        /** Opacity of comparing graph line. */
-        compareGraphLineAlpha: number;
-        /** Thickness of compare graph. */
-        compareGraphLineThickness: number;
-        /** Type of comparing graph. Possible values are: "line", "column", "step", "smoothedLine." line */
-        compareGraphType: string;
-        /** Specifies if compare graph is visible in legend.
-            @default true
-        */
-        compareGraphVisibleInLegend: boolean;
-        /** When data is grouped to periods, the graph must know which period value should be used. Possible values are: "Open", "Low", "High", "Close", "Average" and "Sum". Close */
-        periodValue: string;
-        /** Specifies whether data set color should be used as this graph's lineColor.
-            @default true
-        */
-        useDataSetColors: boolean;
-    }
-
-    /** StockEvent is object which holds information about event(bullet).Values from StockEventsSettings will be used if not set.Stock event bullet's size depends on it's graphs fontSize.When user rolls - over, clicks or rolls - out of the event bullet, AmStockChart dispatches events.*/
-    class StockEvent {
-        /** Opacity of bullet background.
-            @default 1
-        */
-        backgroundAlpha: number;
-        /** Color of bullet background. #DADADA */
-        backgroundColor: string;
-        /** Opacity of bullet border.
-            @default 1
-        */
-        borderAlpha: number;
-        /** Bullet border color. #888888 */
-        borderColor: string;
-        /** The color of the event text. #000000 */
-        color: string;
-        /** Date of an event. Must be Date object, not a string. */
-        date: Date;
-        /** graph on which event will be displayed. */
-        graph: StockGraph;
-        /** Roll-over background color. #CC0000 */
-        rollOverColor: string;
-        /** Specifies if the event should be displayed on category axis */
-        showOnAxis: boolean;
-        /** Letter which will be displayed on the event. Not all types can display letters. "text" type can display longer texts. */
-        text: string;
-        /** Type of bullet. Possible values are: "flag", "sign", "pin", "triangleUp", "triangleDown", "triangleLeft", "triangleRight", "text", "arrowUp", "arrowDown". sign */
-        type: string;
-        /** A URL to go to when user clicks the event. */
-        url: string;
-        /** target of url, "_blank" for example. */
-        urlTarget: string;
-    }
-
-    /** Creates a label on the chart which can be placed anywhere, multiple can be assigned. */
-    class Label {
-        /** @Default 'left' */
-        align: string;
-        /** @Default 1 */
-        alpha: number;
-        /** Specifies if label is bold or not. */
-        bold: boolean;
-        /** Color of a label */
-        color: string;
-        /** Unique id of a Label. You don't need to set it, unless you want to. */
-        id: string;
-        /** Rotation angle. */
-        rotation: number;
-        /** Text size */
-        size: number;
-        /** Text of a label */
-        text: string;
-        /** URL which will be access if user clicks on a label. */
-        url: string;
-        /** X position of a label. */
-        x: number|string;
-        /** y position of a label. */
-        y: number|string;
-    }
-    /** Common settings of legends. If you change a property after the chart is initialized, you should call stockChart.validateNow() method in order for it to work. If there is no default value specified, default value of StockLegend class will be used. */
-    class LegendSettings {
-        /** Alignment of legend entries. Possible values are: "left", "right" and "center". */
-        align: string;
-        /** Specifies if each legend entry should take the same space as the longest legend entry. */
-        equalWidths: boolean;
-        /** Horizontal space between legend item and left/right border. */
-        horizontalGap: number;
-        /** The text which will be displayed in the legend. Tag [[title]] will be replaced with the title of the graph. */
-        labelText: string;
-        /** Space below the last row of the legend, in pixels. */
-        marginBottom: number;
-        /** Space above the first row of the legend, in pixels. */
-        marginTop: number;
-        /** Opacity of marker border. */
-        markerBorderAlpha: number;
-        /** Marker border color. */
-        markerBorderColor: string;
-        /** Thickness of the legend border. */
-        markerBorderThickness: number;
-        /** The color of the disabled marker (when the graph is hidden). */
-        markerDisabledColor: string;
-        /** Space between legend marker and legend text, in pixels. */
-        markerLabelGap: number;
-        /** Size of the legend marker (key). */
-        markerSize: number;
-        /** Shape of the legend marker (key). Possible values are: "square", "circle", "line", "dashedLine", "triangleUp", "triangleDown", "bubble", "none". */
-        markerType: string;
-        /** Specifies whether legend entries should be placed in reversed order. */
-        reversedOrder: boolean;
-        /** Legend item text color on roll-over. */
-        rollOverColor: string;
-        /** When you roll-over the legend entry, all other graphs can reduce their opacity, so that the graph you rolled-over would be distinguished. This property specifies the opacity of the graphs. */
-        rollOverGraphAlpha: number;
-        /** Whether showing/hiding of graphs by clicking on the legend marker is enabled or not. */
-        switchable: boolean;
-        /** Legend switch color. */
-        switchColor: string;
-        /** Legend switch type (in case the legend is switchable). Possible values are: "x" and "v". */
-        switchType: string;
-        /** Specifies whether the legend text is clickable or not. Clicking on legend text can show/hide value balloons if they are enabled. */
-        textClickEnabled: boolean;
-        /** Specifies if legend labels should be use same color as corresponding markers. */
-        useMarkerColorForLabels: boolean;
-        /** The text which will be displayed in the value portion of the legend when graph is comparable and at least one dataSet is selected for comparing. You can use tags like [[value]], [[open]], [[high]], [[low]], [[close]], [[percents]], [[description]]. */
-        valueTextComparing: string;
-        /** The text which will be displayed in the value portion of the legend. You can use tags like [[value]], [[open]], [[high]], [[low]], [[close]], [[percents]], [[description]]. */
-        valueTextRegular: string;
-        /** Width of the value text. Increase this value if your values do not fit in the allocated space. */
-        valueWidth: number;
-        /** Vertical space between legend items, in pixels. */
-        verticalGap: number;
-
-    }
-
-    /** DataSetSelector is a tool for selecting data set's as main and for comparing with main data set. */
-    class DataSetSelector {
-        /** Text displayed in the "compare to" combobox (when position is "top" or "bottom"). Select... */
-        comboBoxSelectText: string;
-        /** Text displayed near "compare to" list. Compare to: */
-        compareText: string;
-        /** The maximum height of the Compare to field in pixels.
-            @default 150
-        */
-        listHeight: number;
-        /** Possible values: "right", "left", "top", "bottom". "top" and "bottom" positions has a limitation - only one data set can be selected for comparing. left */
-        position: string;
-        /** Text displayed near "Select" dropDown. Select: */
-        selectText: string;
-        /** Width of a Data set selector, when position is "left" or "right".
-            @default 180
-        */
-        width: number;
-    }
-
-    /** AmBalloon is the class which generates balloons (datatips). Balloon follows the mouse when you roll-over the pie slice/line bullet/column/etc, chart indicator of serial charts displays value balloons and category balloon. Balloon instance is created by the chart automatically and can be accessed via "balloon" property of AmChart. Chart shows/hides and sets position for every balloon automatically, so all you need to do is to change balloon appearance, if you want to.
-        @example
-            var chart = new AmCharts.AmSerialChart();
-            // get balloon intance
-            var balloon = chart.balloon;
-            // set properties
-            balloon.adjustBorderColor = true;
-            balloon.color = "#000000";
-            balloon.cornerRadius = 5;
-            balloon.fillColor = "#FFFFFF";
-    */
-    class AmBalloon {
-        /** If this is set to true, border color instead of background color will be changed when user rolls-over the slice, graph, etc. */
-        adjustBorderColor: boolean;
-        /** Balloon border opacity. Value range is 0 - 1.
-            @default 1
-        */
-        borderAlpha: number;
-        /** Balloon border color. #FFFFFF */
-        borderColor: string;
-        /** Balloon border thickness.
-            @default 2
-        */
-        borderThickness: number;
-        /** Color of text in the balloon. #FFFFFF */
-        color: string;
-        /** Balloon corner radius.
-            @default 6
-        */
-        cornerRadius: number;
-        /** Balloon background opacity.
-            @default 1
-        */
-        fillAlpha: number;
-        /** Balloon background color. Usually balloon background color is set by the chart. Only if "adjustBorderColor" is "true" this color will be used. #CC0000 */
-        fillColor: string;
-        /** Size of text in the balloon. Chart's fontSize is used by default. */
-        fontSize: string;
-        /** Horizontal padding of the balloon.
-            @default 8
-        3*/
-        horizontalPadding: number;
-        /** The width of the pointer (arrow) "root". Only used if cornerRadius is 0.
-            @default 10
-        */
-        pointerWidth: number;
-        /** If cornerRadius of a balloon is >0, showBullet is set to true for value balloons when ChartCursor is used. If you don't want the bullet near the balloon, set it to false: chart.balloon.showBullet = false */
-        showBullet: boolean;
-        /** Text alignment, possible values "left", "middle" and "right" middle */
-        textAlign: string;
-        /** Color of the text shadow. #000000 */
-        textShadowColor: string;
-        /** Vertical padding of the balloon.
-            @default 5
-        */
-        verticalPadding: number;
-        /** Hides balloon. */
-        hide();
-        /** Defines a square within which the balloon should appear. Bounds are set by chart class, you don't need to call this method yourself. */
-        setBounds(left: number, top: number, right: number, bottom: number);
-        /** Sets coordinates the balloon should point to. */
-        setPosition(x: number, y: number);
-        /** Specifies the text which should be displayed. */
-        show(value: string);
-    }
-
-    /** CategoryAxesSettings settings set's settings common for all CategoryAxes of StockPanels. If you change a property after the chart is initialized, you should call stockChart.validateNow() method in order for it to work. If there is no default value specified, default value of CategoryAxis class will be used. */
-    class CategoryAxesSettings {
-        /** Specifies whether number of gridCount is specified automatically, according to the axis size.
-            @default true
-        */
-        autoGridCount: boolean;
-        /** Axis opacity. */
-        axisAlpha: number;
-        /** Axis color. */
-        axisColor: string;
-        /** Height of category axes. Set it to 0 if you set inside property to true.
-            @default 28
-        */
-        axisHeight: number;
-        /** Thickness of the axis. */
-        axisThickness: number;
-        /** Text color. */
-        color: string;
-        /** Length of a dash. */
-        dashLength: number;
-        /** Date formats of different periods. Possible period values: fff - milliseconds, ss - seconds, mm - minutes, hh - hours, DD - days, MM - months, WW - weeks, YYYY - years. Check this page for date formatting strings. */
-        dateFormats: any[];
-        /** If you want data points to be placed at equal intervals (omiting dates with no data), set equalSpacing to true. */
-        equalSpacing: boolean;
-        /** Fill opacity. Every second space between grid lines can be filled with fillColor. */
-        fillAlpha: number;
-        /** Fill color. Every second space between grid lines can be filled with color. Set fillAlpha to a value greater than 0 to see the fills. */
-        fillColor: string;
-        /** Text size. */
-        fontSize: string;
-        /** Opacity of grid lines. */
-        gridAlpha: number;
-        /** Color of grid lines. */
-        gridColor: string;
-        /** Approximate number of grid lines. You should set autoGridCount to false in order this property not to be ignored.
-            @default 10
-        */
-        gridCount: number;
-        /** Thickness of grid lines. */
-        gridThickness: number;
-        /** Periods to which data will be gruoped in case there are more data items in the selected period than specified in maxSeries property. ["ss", "10ss", "30ss", "mm", "10mm", "30mm", "hh", "DD", "WW", "MM", "YYYY"] */
-        groupToPeriods: any[];
-        /** Specifies whether values should be placed inside or outside of plot area. */
-        inside: boolean;
-        /** Rotation angle of a label. */
-        labelRotation: number;
-        /** Maximum series shown at a time. In case there are more data points in the selection than maxSeries, the chart will group data to longer periods, for example - you have 250 days in the selection, and maxSeries is 150 - the chart will group data to weeks.
-            @default 150
-        */
-        maxSeries: number;
-        /** Specifies the shortest period of your data. fff - millisecond, ss - second, mm - minute, hh - hour, DD - day, MM - month, YYYY - year. DD */
-        minPeriod: string;
-        /** top or "bottom". */
-        position: string;
-        /** Specifies whether the graph should start on axis or not. In case you display columns, it is recommended to set this to false. startOnAxis can be set to true only if equalSpacing is set to true. */
-        startOnAxis: boolean;
-        /** Tick length. */
-        tickLength: number;
-    }
-
-    /** ChartCursorSettings settings set's settings for chart cursor. If you change a property after the chart is initialized, you should call stockChart.validateNow() method in order for it to work. If there is no default value specified, default value of ChartCursor class will be used. */
-    class ChartCursorSettings {
-        /** Specifies if bullet for each graph will follow the cursor. */
-        bulletsEnabled: boolean;
-        /** Size of bullets, following the cursor. */
-        bulletSize: number;
-        /** Opacity of the category balloon. */
-        categoryBalloonAlpha: number;
-        /** Color of the category balloon. */
-        categoryBalloonColor: string;
-        /** Array of date format objects. Date format object must have "period" and "format" items. Available periods are: fff - millisecond, ss - second, mm - minute, hh - hour, DD - date, WW - week, MM - month, YYYY - year. [{period:"YYYY", format:"YYYY"}, {period:"MM", format:"MMM, YYYY"}, {period:"WW", format:"MMM DD, YYYY"}, {period:"DD", format:"MMM DD, YYYY"}, {period:"hh", format:"JJ:NN"}, {period:"mm", format:"JJ:NN"}, {period:"ss", format:"JJ:NN:SS"}, {period:"fff", format:"JJ:NN:SS"}] */
-        categoryBalloonDateFormats: any[];
-        /** Specifies whether category balloon is enabled. */
-        categoryBalloonEnabled: boolean;
-        /** Opacity of the cursor line. */
-        cursorAlpha: number;
-        /** Color of the cursor line. */
-        cursorColor: string;
-        /** Possible values: "start", "middle" and "mouse". */
-        cursorPosition: string;
-        /** Set this to "false" if you don't want chart cursor to appear in your charts.
-            @default true
-        */
-        enabled: boolean;
-        /** If this is set to true, the user will be able to pan the chart instead of zooming. */
-        pan: boolean;
-        /** Specifies whether value balloons are enabled. In case they are not, the balloons might be displayed anyway, when the user rolls-over the column or bullet. */
-        valueBalloonsEnabled: boolean;
-        /** Specifies if the user can zoom-in the chart. If pan is set to true, zoomable is switched to false automatically. */
-        zoomable: boolean;
-    }
-
-    /* ChartScrollbarSettings settings set's settings for chart scrollbar. If you change a property after the chart is initialized, you should call stockChart.validateNow() method in order for it to work. If there is no default value specified, default value of ChartScrollbar class will be used.*/
-    class ChartScrollbarSettings {
-        /** Specifies whether number of gridCount is specified automatically, according to the axis size.
-            @default true
-        */
-        autoGridCount: boolean;
-        /** Background opacity. */
-        backgroundAlpha: number;
-        /** Background color of the scrollbar. */
-        backgroundColor: string;
-        /** Text color. */
-        color: string;
-        /** Set false if you don't need scrollbar.
-            @default true
-        */
-        enabled: boolean;
-        /** Font size. */
-        fontSize: string;
-        /** Specifies which graph will be displayed in the scrollbar. */
-        graph: AmGraph;
-        /** Graph fill opacity. */
-        graphFillAlpha: number;
-        /** Graph fill color. */
-        graphFillColor: string;
-        /** Graph line opacity. */
-        graphLineAlpha: number;
-        /** Graph line color. */
-        graphLineColor: string;
-        /** Type of chart scrollbar's graph. By default the graph type is the same as the original graph's type, however in case of candlestick or ohlc you might want to show line graph in the scrollbar. Possible values are: line, column, step, smoothedLine, candlestick, ohlc. */
-        graphType: string;
-        /** Grid opacity. */
-        gridAlpha: number;
-        /** Grid color. */
-        gridColor: string;
-        /** Grid count. You should set autoGridCount to false in order this property to work. */
-        gridCount: number;
-        /** Height of scrollbar, in pixels.
-            @default 40
-        */
-        height: number;
-        /** Specifies whether resize grips are hidden when mouse is away from the scrollbar. */
-        hideResizeGrips: boolean;
-        /** Duration of scrolling, when the user clicks on scrollbar's background, in seconds. */
-        scrollDuration: number;
-        /** Selected background opacity. */
-        selectedBackgroundAlpha: number;
-        /** Selected background color. */
-        selectedBackgroundColor: string;
-        /** Selected graph'sfill opacity. */
-        selectedGraphFillAlpha: number;
-        /** Selected graph'sfill color. */
-        selectedGraphFillColor: string;
-        /** Selected graph'sline opacity. */
-        selectedGraphLineAlpha: number;
-        /** Selected graph's line color. */
-        selectedGraphLineColor: string;
-        /** Specifies if the chart should be updated while dragging/resizing the scrollbar or only at the moment when user releases mouse button. Usefull when working with large data sets.
-            @default true
-        */
-        updateOnReleaseOnly: boolean;
-    }
-
-    /** AmGraph class displays all types of graphs - line, column, step line, smoothed line, ohlc and candlestick.
-        @example
-            var chart = new AmCharts.AmSerialChart();
-            var graph = new AmCharts.AmGraph();
-            graph.valueField = 'value';
-            graph.type = 'column';
-            graph.fillAlphas = 1;
-            chart.addGraph(graph);
-    */
-    class AmGraph {
-        /** Name of the alpha field in your dataProvider. */
-        alphaField: string;
-        /** Value balloon color. Will use graph or data item color if not set. */
-        balloonColor: string;
-        /**	If you set some function, the graph will call it and pass GraphDataItem and AmGraph object to it. This function should return a string which will be displayed in a balloon.  */
-        balloonFunction(graphDataItem: GraphDataItem, amGraph: AmGraph): string;
-        /** Balloon text. You can use tags like [[value]], [[description]], [[percents]], [[open]], [[category]] [[value]] */
-        balloonText: string;
-        /** Specifies if the line graph should be placed behind column graphs */
-        behindColumns: boolean;
-        /** Type of the bullets. Possible values are: "none", "round", "square", "triangleUp", "triangleDown", "bubble", "custom". none */
-        bullet: string;
-        /** Opacity of bullets. Value range is 0 - 1.
-            @default 1
-        */
-        bulletAlpha: number;
-        /** Bullet border opacity.
-            @default 1
-        */
-        bulletBorderAlpha: number;
-        /** Bullet border color. Will use lineColor if not set.   */
-        bulletBorderColor: string;
-        /** Bullet border thickness.
-            @default 2
-        */
-        bulletBorderThickness: number;
-        /** Bullet color. Will use lineColor if not set. */
-        bulletColor: string;
-        /** Name of the bullet field in your dataProvider. */
-        bulletField: string;
-        /** Bullet offset. Distance from the actual data point to the bullet. Can be used to place custom bullets above the columns. */
-        bulletOffset: number;
-        /** Bullet size.
-            @default 8
-        */
-        bulletSize: number;
-        /** Name of the bullet size field in your dataProvider. */
-        bulletSizeField: string;
-        /** Name of the close field (used by candlesticks and ohlc) in your dataProvider. */
-        closeField: string;
-        /** Color of value labels. Will use chart's color if not set. */
-        color: string;
-        /** Name of the color field in your dataProvider. */
-        colorField: string;
-        /** Specifies whether to connect data points if data is missing. The default value is true.
-            @default true
-        */
-        connect: boolean;
-        /** Corner radius of column. It can be set both in pixels or in percents. The chart's depth and angle styles must be set to 0. The default value is 0. Note, cornerRadiusTop will be applied for all corners of the column, JavaScript charts do not have a possibility to set separate corner radius for top and bottom. As we want all the property names to be the same both on JS and Flex, we didn't change this too. */
-        cornerRadiusTop: number;
-        /** If bulletsEnabled of ChartCurosor is true, a bullet on each graph follows the cursor. You can set opacity of each graphs bullet. In case you want to disable these bullets for a certain graph, set opacity to 0.
-            @default 1
-        */
-        cursorBulletAlpha: number;
-        /** Path to the image of custom bullet. */
-        customBullet: string;
-        /** Name of the custom bullet field in your dataProvider. */
-        customBulletField: string;
-        /** Dash length. If you set it to a value greater than 0, the graph line will be dashed. */
-        dashLength: number;
-        /** Name of the description field in your dataProvider. */
-        descriptionField: string;
-        /** Opacity of fill. Plural form is used to keep the same property names as our Flex charts'. Flex charts can accept array of numbers to generate gradients. Although you can set array here, only first value of this array will be used. */
-        fillAlphas: number;
-        /** Fill color. Will use lineColor if not set. */
-        fillColors: any;
-        /** Name of the fill colors field in your dataProvider. */
-        fillColorsField: string;
-        /** You can set another graph here and if fillAlpha is >0, the area from this graph to fillToGraph will be filled (instead of filling the area to the X axis). */
-        fillToGraph: AmGraph;
-        /** Size of value labels text. Will use chart's fontSize if not set. */
-        fontSize: string;
-        /** Orientation of the gradient fills (only for "column" graph type). Possible values are "vertical" and "horizontal". vertical */
-        gradientOrientation: string;
-        /** Specifies whether the graph is hidden. Do not use this to show/hide the graph, use hideGraph(graph) and showGraph(graph) methods instead. */
-        hidden: boolean;
-        /** If there are more data points than hideBulletsCount, the bullets will not be shown. 0 means the bullets will always be visible. */
-        hideBulletsCount: number;
-        /** Name of the high field (used by candlesticks and ohlc) in your dataProvider. */
-        highField: string;
-        /** Whether to include this graph when calculating min and max value of the axis.
-            @default true
-        */
-        includeInMinMax: boolean;
-        /** Name of label color field in data provider. */
-        labelColorField: string;
-        /** Position of value label. Possible values are: "bottom", "top", "right", "left", "inside", "middle". Sometimes position is changed by the chart, depending on a graph type, rotation, etc. top */
-        labelPosition: string;
-        /** Value label text. You can use tags like [[value]], [[description]], [[percents]], [[open]], [[category]]. */
-        labelText: string;
-        /** Legend marker opacity. Will use lineAlpha if not set. Value range is 0 - 1. */
-        legendAlpha: number;
-        /** Legend marker color. Will use lineColor if not set. */
-        legendColor: string;
-        /** Legend value text. You can use tags like [[value]], [[description]], [[percents]], [[open]], [[category]] You can also use custom fields from your dataProvider. If not set, uses Legend's valueText. */
-        legendValueText: string;
-        /** Opacity of the line (or column border). Value range is 0 - 1.
-            @default 1
-        */
-        lineAlpha: number;
-        /** Color of the line (or column border). If you do not set any, the color from [[AmCoordinateChart */
-        lineColor: string;
-        /** Name of the line color field (used by columns and candlesticks only) in your dataProvider. */
-        lineColorField: string;
-        /** Specifies thickness of the graph line (or column border).
-            @default 1
-        */
-        lineThickness: number;
-        /** Name of the low field (used by candlesticks and ohlc) in your dataProvider. */
-        lowField: string;
-        /** Legend marker type. You can set legend marker (key) type for individual graphs. Possible values are: "square", "circle", "line", "dashedLine", "triangleUp", "triangleDown", "bubble". */
-        markerType: string;
-        /** Specifies size of the bullet which value is the biggest (XY chart).
-            @default 50
-        */
-        maxBulletSize: number;
-        /** Specifies minimum size of the bullet (XY chart). */
-        minBulletSize: number;
-        /** If you use different colors for your negative values, a graph below zero line is filled with negativeColor. With this property you can define a different base value at which colors should be changed to negative colors. */
-        negativeBase: number;
-        /** Fill opacity of negative part of the graph. Will use fillAlphas if not set. */
-        negativeFillAlphas: number;
-        /** Fill color of negative part of the graph. Will use fillColors if not set. */
-        negativeFillColors: any; //String /Array;
-        /** Color of the line (or column) when the values are negative. In case the graph type is candlestick or ohlc, negativeLineColor is used when close value is less then open value. */
-        negativeLineColor: string;
-        /** Example: {precision:-1, decimalSeparator:'.', thousandsSeparator:','}. The graph uses this object's values to format the numbers. Uses chart's numberFormatter if not defined. */
-        numberFormatter: Object;
-        /** Name of the open field (used by floating columns, candlesticks and ohlc) in your dataProvider. */
-        openField: string;
-        /** Specifies where data points should be placed - on the beginning of the period (day, hour, etc) or in the middle (only when parseDates property of categoryAxis is set to true). This setting affects Serial chart only. Possible values are "start" and "middle". middle */
-        pointPosition: string;
-        /** If graph's type is column and labelText is set, graph hides labels which do not fit into the column's space. If you don't want these labels to be hidden, set this to true. */
-        showAllValueLabels: boolean;
-        /** Specifies whether the value balloon of this graph is shown when mouse is over data item or chart's indicator is over some series.
-            @default true
-        */
-        showBalloon: boolean;
-        /** Specifies graphs value at which cursor is showed. This is only important for candlestick and ohlc charts, also if column chart has "open" value. Possible values are: "open", "close", "high", "low". close */
-        showBalloonAt: string;
-        /** If the value axis of this graph has stack types like "regular" or "100%" You can exclude this graph from stacking.
-            @default true
-        */
-        stackable: boolean;
-        /** Graph title. */
-        title: string;
-        /** Type of the graph. Possible values are: "line", "column", "step", "smoothedLine", "candlestick", "ohlc". XY and Radar charts can only display "line" type graphs. line */
-        type: string;
-        /** Name of the url field in your dataProvider. */
-        urlField: string;
-        /** Target to open URLs in, i.e. _blank, _top, etc. */
-        urlTarget: string;
-        /** Specifies which value axis the graph will use. Will use the first value axis if not set. */
-        valueAxis: ValueAxis;
-        /** Name of the value field in your dataProvider. */
-        valueField: string;
-        /** Specifies whether this graph should be shown in the Legend.
-            @default true
-        */
-        visibleInLegend: boolean;
-        /** XY chart only. A horizontal value axis object to attach graph to. */
-        xAxis: ValueAxis;
-        /** XY chart only. Name of the x field in your dataProvider. */
-        xField: string;
-        /** XY chart only. A vertical value axis object to attach graph to. */
-        yAxis: ValueAxis;
-        /** XY chart only. Name of the y field in your dataProvider. */
-        yField: string;
-    }
-
-    /** AxisBase is the base class for ValueAxis and CategoryAxis. It can not be instantiated explicitly. */
-    class AxisBase {
-        /** Specifies whether number of gridCount is specified automatically, acoarding to the axis size.
-            @default true
-        */
-        autoGridCount: boolean;
-        /** Axis opacity. Value range is 0 - 1.
-            @default 1
-        */
-        axisAlpha: number;
-        /** Axis color.  #000000 */
-        axisColor: string;
-        /** Thickness of the axis.
-            @default 1
-        */
-        axisThickness: number;
-        /** Color of axis value labels. Will use chart's color if not set. */
-        color: string;
-        /** Length of a dash. 0 means line is not dashed. */
-        dashLength: number;
-        /** Fill opacity. Every second space between grid lines can be filled with color. Set fillAlpha to a value greater than 0 to see the fills.  */
-        fillAlpha: number;
-        /** Fill color. Every second space between grid lines can be filled with color. Set fillAlpha to a value greater than 0 to see the fills. #FFFFFF */
-        fillColor: string;
-        /** Size of value labels text. Will use chart's fontSize if not set. */
-        fontSize: string;
-        /** Opacity of grid lines. 0.2 */
-        gridAlpha: number;
-        /** Color of grid lines. #000000 */
-        gridColor: string;
-        /** Number of grid lines. In case this is value axis, or your categoryAxis parses dates, the number is approximate. The default value is 5. If you set autoGridCount to true, this property is ignored.
-            @default 5
-        */
-        gridCount: number;
-        /** Thickness of grid lines.
-            @default 1
-        */
-        gridThickness: number;
-        /** The array of guides belonging to this axis. */
-        guides: any[];
-        /** If autoMargins of a chart is set to true, but you want this axis not to be measured when calculating margin, set ignoreAxisWidth to true.  */
-        ignoreAxisWidth: boolean;
-        /** Specifies whether values should be placed inside or outside plot area. */
-        inside: boolean;
-        /** Frequency at which labels should be placed. Doesn't work for CategoryAxis if parseDates is set to true.
-            @default 1
-        */
-        labelFrequency: number;
-        /** Rotation angle of a label. Only horizontal axis' values can be rotated. If you set this for vertical axis, the setting will be ignored. */
-        labelRotation: number;
-        /** Specifies whether axis displays category axis' labels and value axis' values.
-            @default true
-        */
-        labelsEnabled: boolean;
-        /** The distance of the axis to the plot area, in pixels. Negative values can also be used.  */
-        offset: number;
-        /** Possible values are: "top", "bottom", "left", "right". If axis is vertical, default position is "left". If axis is horizontal, default position is "bottom".  */
-        position: string;
-        /** Whether to show first axis label or not.
-            @default true
-        */
-        showFirstLabel: boolean;
-        /** Whether to show last axis label or not.
-            @default true
-        */
-        showLastLabel: boolean;
-        /** Length of the tick marks.
-            @default 5
-        */
-        tickLength: number;
-        /** Title of the axis. */
-        title: string;
-        /** Specifies if title should be bold or not.
-            @default true
-        */
-        titleBold: boolean;
-        /** Color of axis title. Will use text color of chart if not set any. */
-        titleColor: string;
-        /** Font size of axis title. Will use font size of chart plus two pixels if not set any. */
-        titlefontSize: string;
-
-        /** Adds guide to the axis. */
-        addGuide(guide:Guide);
-        /** Removes guide from the axis. */
-        removeGuide(guide:Guide);
-    }
-
-    /** ValueAxis is the class which displays value axis for the chart. The chart can have any number of value axes. For Serial chart one value axis is created automatically. For XY Chart two value axes (horizontal and vertical) are created automatically. */
-    class ValueAxis extends AxisBase {
-        /** Radar chart only. Specifies distance from axis to the axis title (category)  10 */
-        axisTitleOffset: number;
-        /** Read-only. Coordinate of the base value. */
-        baseCoord: number;
-        /** Specifies base value of the axis. */
-        baseValue: number;
-        /** If your values represents time units, and you want value axis labels to be formatted as duration, you have to set the duration unit. Possible values are: "ss", "mm", "hh" and "DD". */
-        duration: string;
-        /** If duration property is set, you can specify what string should be displayed next to day, hour, minute and second. {DD:"d. ", hh:":", mm:":",ss:""} */
-        durationUnits: Object;
-        /** Radar chart only. Possible values are: "polygons" and "circles". Set "circles" for polar charts. polygons */
-        gridType: string;
-        /** Unique id of value axis. It is not required to set it, unless you need to tell the graph which exact value axis it should use. */
-        id: string;
-        /** Specifies whether guide values should be included when calculating min and max of the axis. */
-        includeGuidesInMinMax: boolean;
-        /** If true, the axis will include hidden graphs when calculating min and max values. */
-        includeHidden: boolean;
-        /** Specifies whether values on axis can only be integers or both integers and doubles. */
-        integersOnly: boolean;
-        /** You can use this function to format Value axis labels. This function is called and these parameters are passed: labelFunction(value, valueText, valueAxis);
-Where value is numeric value, valueText is formatted string and valueAxis is a reference to valueAxis object.
-
-If axis type is "date", labelFunction will pass different arguments:
-labelFunction(valueText, date, valueAxis)
-
-Your function should return string.*/
-        labelFunction(value: number, valueText: string, valueAxis: ValueAxis): string;
-        labelFunction(valueText: string, data: Date, valueAxis: ValueAxis): string;
-        /** Specifies if this value axis' scale should be logarithmic. */
-        logarithmic: boolean;
-        /** Read-only. Maximum value of the axis. */
-        max: number;
-        /** If you don't want max value to be calculated by the chart, set it using this property. This value might still be adjusted so that it would be possible to draw grid at rounded intervals. */
-        maximum: number;
-        /** If your value axis is date-based, you can specify maximum date of the axis. Can be set as date object, timestamp number or string if dataDateFormat is set. */
-        maximumData: Date;
-        /** Read-only. Minimum value of the axis. */
-        min: number;
-        /** If you don't want min value to be calculated by the chart, set it using this property. This value might still be adjusted so that it would be possible to draw grid at rounded intervals. */
-        minimum: number;
-        /** If your value axis is date-based, you can specify minimum date of the axis. Can be set as date object, timestamp number or string if dataDateFormat is set. */
-        minimumDate: Date;
-        /** If set value axis scale (min and max numbers) will be multiplied by it. I.e. if set to 1.2 the scope of values will increase by 20%. */
-        minMaxMultiplier: number;
-        /** Works with radar charts only. If you set it to “middle”, labels and data points will be placed in the middle between axes. */
-        pointPosition: string;
-        /** Possible values are: "top", "bottom", "left", "right". If axis is vertical, default position is "left". If axis is horizontal, default position is "bottom". */
-        position: string;
-        /** Precision (number of decimals) of values. */
-        precision: number;
-        /** Radar chart only. Specifies if categories (axes' titles) should be displayed near axes)
-            @default true
-        */
-        radarCategoriesEnabled: boolean;
-        /** pecifies if graphs's values should be recalculated to percents. */
-        recalculateToPercents: boolean;
-        /** Specifies if value axis should be reversed (smaller values on top).  */
-        reversed: boolean;
-        /** Stacking mode of the axis. Possible values are: "none", "regular", "100%", "3d". none Note, only graphs of one type will be stacked. */
-        stackType: string;
-        /** Read-only. Value difference between two grid lines. */
-        step: number;
-        /** If you set minimum and maximum for your axis, chart adjusts them so that grid would start and end on the beginning and end of plot area and grid would be at equal intervals. If you set strictMinMax to true, the chart will not adjust minimum and maximum of value axis. */
-        strictMinMax: boolean;
-        /** In case you synchronize one value axis with another, you need to set the synchronization multiplier. Use synchronizeWithAxis method to set with which axis it should be synced. */
-        synchronizationMultiplier: number;
-        /** One value axis can be synchronized with another value axis. You can use both reference to your axis or id of the axis here. You should set synchronizationMultiplyer in order for this to work. */
-        synchronizeWith: ValueAxis;
-        /** If this value axis is stacked and has columns, setting valueAxis.totalText = "[[total]]" will make it to display total value above the most-top column. */
-        totalText: string;
-        /** Color of total text. */
-        totalTextColor: string;
-        /** Distance from data point to total text. */
-        totalTextOffset: number;
-        /** This allows you to have logarithmic value axis and have zero values in the data. You must set it to >0 value in order to work. */
-        treatZeroAs: number;
-        /** Type of value axis. If your values in data provider are dates and you want this axis to show dates instead of numbers, set it to "date". */
-        type: string;
-        /** Unit which will be added to the value label. */
-        unit: string;
-        /** Position of the unit. Possible values are "left" and "right". right */
-        unitPosition: string;
-        /** If true, prefixes will be used for big and small numbers. You can set arrays of prefixes directly to the chart object via prefixesOfSmallNumbers and prefixesOfBigNumbers. */
-        usePrefixes: boolean;
-        /** If true, values will always be formatted using scientific notation (5e+8, 5e-8...) Otherwise only values bigger then 1e+21 and smaller then 1e-7 will be displayed in scientific notation. */
-        useScientificNotation: boolean;
-
-        /** Adds guide to the axis. */
-        addGuide(guide: Guide);
-        /** Adds event listener to the object.  type - string like 'axisChanged' (should be listed in 'events' section of this class or classes which extend this class). handler - function which is called when event happens */
-        addListener(type: string, handler: any);
-        /** Number, - value of coordinate. Returns value of the coordinate.  coordinate - y or x coordinate, in pixels. */
-        coordinateToValue(coordinate: number);
-        /** Number - coordinate Returns coordinate of the value in pixels. value - Number */
-        getCoordinate(value: number);
-        /** Removes guide from the axis.*/
-        removeGuide(guide: Guide);
-        /** Removes event listener from the object. */
-        removeListener(obj: any, type: string, handler: any);
-
-        /** One value axis can be synchronized with another value axis. You should set synchronizationMultiplyer in order for this to work. */
-        synchronizeWithAxis(axis:ValueAxis);
-        /** XY Chart only. Zooms-in the axis to the provided values. */
-        zoomToValues(startValue: number, endValue: number);
-
-        /** Adds event listener of the type "axisZoomed" to the object.
-            @param type Always "axisZoomed".
-            @param handler XY chart only. Dispatched when axis is zoomed.*/
-        addListener(type: string, handler: (e: {
-            /** Always "axisZoomed". */
-            type: string; startValue: Date; endValue: Date; chart: AmChart;
-        }) => void );
-        /** Adds event listener of the type "logarithmicAxisFailed" to the object.
-            @param type Always "logarithmicAxisFailed".
-            @param handler Dispatched when valueAxis is logarithmic and values equal or less then zero were found in data.*/
-        addListener(type: string, handler: (e: {
-            /** Always "logarithmicAxisFailed". */
-            type: string; chart: AmChart;
-        }) => void );
-
-        /** Removes event listener from chart object. */
-        removeListener(chart: AmChart, type: string, handler: any);
-    }
-
-    class Title {
-        /** @default 1 */
-        alpha: number;
-        /** Specifies if the tile is bold or not.
-            @default false*/
-        bold: boolean;
-        /** Text color of a title. */
-        color: string;
-        /** Unique id of a Title. You don't need to set it, unless you want to. */
-        id: string;
-        /** Text size */
-        size: number;
-        /** Text of a label */
-        text: string;
-    }
-    class ExportSettings {
-        enabled: boolean;
-        libs: Object;
-        menu: Object;
-    }
-}
diff --git a/amcharts/AmCharts.d.ts.tscparams b/amcharts/AmCharts.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/amcharts/AmCharts.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/amcharts/index.d.ts b/amcharts/index.d.ts
new file mode 100644
index 0000000000..a54ed5d515
--- /dev/null
+++ b/amcharts/index.d.ts
@@ -0,0 +1,2579 @@
+// Type definitions for amCharts
+// Project: http://www.amcharts.com/
+// Definitions by: aleksey-bykov <https://github.com/aleksey-bykov>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// AmCharts object (it's not a class) is create automatically when amcharts.js or amstock.js file is included in a web page.
+declare namespace AmCharts {
+
+    /** Set it to true if you have base href set for your page. This will fix rendering problems in Firefox caused by base href. */
+    var baseHref: boolean;
+
+    /** Array of day names, used when formatting dates (if categoryAxis.parseDates is set to true) ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'] */
+    var dayNames: string[];
+
+    /** Array of month names, used when formatting dates (if categoryAxis.parseDates is set to true) ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'] */
+    var monthNames: string[];
+
+    /** Array of short versions of day names, used when formatting dates (if categoryAxis.parseDates is set to true) ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'] */
+    var shortDayNames: string[];
+
+    /** Array of short versions of month names, used when formatting dates (if categoryAxis.parseDates is set to true) ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'] */
+    var shortMonthNames: string[];
+
+    /** Set it to true if you want UTC time to be used instead of local time. */
+    var useUTC: boolean;
+
+    /** Clears all the charts on page, removes listeners and intervals. */
+    function clear();
+
+    /** AmPieChart class creates pie/donut chart. In order to display pie chart you need to set at least three properties - dataProvider, titleField and valueField.
+        @example
+            var chartData = [{title:"Pie I have eaten",value:70},{title:"Pie I haven\'t eaten",value:30}];
+            var chart = new AmCharts.AmPieChart();
+            chart.valueField = "value";
+            chart.titleField = "title";
+            chart.dataProvider = chartData;
+            chart.write("chartdiv");
+    */
+    class AmPieChart {
+        /** Name of the field in chart's dataProvider which holds slice's alpha. */
+        alphaField: string;
+        /** Pie lean angle (for 3D effect). Valid range is 0 - 90. */
+        angle: number;
+        /** Balloon text. The following tags can be used: [[value]], [[title]], [[percents]], [[description]]. [[title]]: [[percents]]% ([[value]])\n[[description]] */
+        balloonText: string;
+        /** Read-only. Array of Slice objects. */
+        chartData: any[];
+        /** Name of the field in chart's dataProvider which holds slice's color. */
+        colorField: string;
+        /** Specifies the colors of the slices, if the slice color is not set. If there are more slices than colors in this array, the chart picks random color. ["#FF0F00", "#FF6600", "#FF9E01", "#FCD202", "#F8FF01", "#B0DE09", "#04D215", "#0D8ECF", "#0D52D1", "#2A0CD0", "#8A0CCF", "#CD0D74", "#754DEB", "#DDDDDD", "#999999", "#333333", "#000000", "#57032A", "#CA9726", "#990000", "#4B0C25"] */
+        colors: any[];
+        /** Depth of the pie (for 3D effect). */
+        depth3D: number;
+        /** Name of the field in chart's dataProvider which holds a string with description. */
+        descriptionField: string;
+        /** Example: [-0.2,0.2]. Will make slices to be filled with color gradients. */
+        gradientRatio: number[];
+        /** Opacity of the group slice. Value range is 0 - 1.
+            @default 1
+        */
+        groupedAlpha: number;
+        /** Color of the group slice. The default value is not set - this means the next available color from "colors" array will be used. */
+        groupedColor: string;
+        /** Description of the group slice. */
+        groupedDescription: string;
+        /** If this is set to true, the group slice will be pulled out when the chart loads. */
+        groupedPulled: boolean;
+        /** Title of the group slice. Other */
+        groupedTitle: string;
+        /** If there is more than one slice whose percentage of the pie is less than this number, those slices will be grouped together into one slice. This is the "other" slice. It will always be the last slice in a pie. */
+        groupPercent: number;
+        /** Slices with percent less then hideLabelsPercent won't display labels This is useful to avoid cluttering up the chart, if you have a lot of small slices. 0 means all labels will be shown. */
+        hideLabelsPercent: number;
+        /** Opacity of a hovered slice. Value range is 0 - 1.
+            @default 1
+        */
+        hoverAlpha: number;
+        /** Inner radius of the pie, in pixels or percents. */
+        innerRadius: any;
+        /** The distance between the label and the slice, in pixels. You can use negative values to put the label on the slice.
+            @default 30
+        */
+        labelRadius: number;
+        /** Name of the field in dataProvider which specifies the length of a tick. Note, the chart will not try to arrange labels automatically if this property is set. */
+        labelRadiusField: string;
+        /** Specifies whether data labels are visible.
+            @default true
+        */
+        labelsEnabled: boolean;
+        /** Label text. The following tags can be used: [[value]], [[title]], [[percents]], [[description]]. [[title]]: [[percents]]% */
+        labelText: string;
+        /** Label tick opacity. Value range is 0 - 1. 0.2 */
+        labelTickAlpha: number;
+        /** Label tick color. #000000 */
+        labelTickColor: string;
+        /** Bottom margin of the chart.
+            @default 5
+        */
+        marginBottom: number;
+        /** Left margin of the chart. */
+        marginLeft: number;
+        /** Right margin of the chart. */
+        marginRight: number;
+        /** Top margin of the chart.
+            @default 5
+        */
+        marginTop: number;
+        /** Minimum radius of the pie, in pixels.
+            @default 10
+        */
+        minRadius: number;
+        /** Pie outline opacity. Value range is 0 - 1. */
+        outlineAlpha: number;
+        /** Pie outline color. #FFFFFF */
+        outlineColor: string;
+        /** Pie outline thickness.
+            @default 1
+        */
+        outlineThickness: number;
+        /** Opacity of the slices. You can set the opacity of individual slice too.
+            @default 1
+        */
+        pieAlpha: number;
+        /** Color of the first slice. All the other will be colored with darker or brighter colors. */
+        pieBaseColor: string;
+        /** Lightness increase of each subsequent slice. This is only useful if pieBaseColor is set. Use negative values for darker colors. Value range is from -255 to 255.
+            @default 30*/
+        pieBrightnessStep: number;
+        /** You can set fixed position of a pie center, in pixels or in percents. */
+        pieX: any;
+        /** You can set fixed position of a pie center, in pixels or in percents. */
+        pieY: any;
+        /** Name of the field in chart's dataProvider which holds a boolean value telling the chart whether this slice must be pulled or not. */
+        pulledField: string;
+        /** Pull out duration, in seconds.
+            @default 1
+        */
+        pullOutDuration: number;
+        /** Pull out effect. Possible values are ">", "<", elastic" and "bounce". bounce */
+        pullOutEffect: string;
+        /** If this is set to true, only one slice can be pulled out at a time. If the viewer clicks on a slice, any other pulled-out slice will be pulled in. */
+        pullOutOnlyOne: boolean;
+        /** Pull out radius, in pixels or percents 0.2 */
+        pullOutRadius: any;
+        /** Radius of a pie, in pixels or percents. By default, radius is calculated automatically. */
+        radius: any;
+        /** Specifies whether the animation should be sequenced or all slices should appear at once. */
+        sequencedAnimation: boolean;
+        /** Initial opacity of all slices. If you set startDuration higher than 0, slices will fade in from startAlpha.
+            @default 1
+        */
+        startAlpha: number;
+        /** Angle of the first slice, in degrees. This will work properly only if "depth3D" is set to 0. If "depth3D" is greater than 0, then there can be two angles only: 90 and 270. Value range is 0-360.
+            @default 90
+        */
+        startAngle: number;
+        /** Duration of the animation, in seconds.
+            @default 1
+        */
+        startDuration: number;
+        /** Animation effect. Possible values are ">", "<", "elastic" and "bounce". bounce */
+        startEffect: string;
+        /** Radius of the positions from which the slices will fly in.
+            default 5
+        */
+        startRadius: any;
+        /** Name of the field in chart's dataProvider which holds slice's title. */
+        titleField: string;
+        /** Name of the field in chart's dataProvider which holds url which would be accessed if the user clicks on a slice. */
+        urlField: string;
+        /** If url is specified for a slice, it will be opened when user clicks on it. urlTarget specifies target of this url. Use _blank if you want url to be opened in a new window. _self */
+        urlTarget: string;
+        /** Name of the field in chart's dataProvider which holds slice's value. */
+        valueField: string;
+        /** Name of the field in chart's dataProvider which holds boolean variable defining whether this data item should have an entry in the legend. */
+        visibleInLegendField: string;
+
+        /** You can trigger the animation of the pie chart. */
+        animateAgain();
+        /** You can trigger the click on a slice from outside. index - the number of a slice or Slice object. */
+        clickSlice(index: number);
+        /** Hides slice. index - the number of a slice or Slice object. */
+        hideSlice(index: number);
+        /** You can simulate roll-out of a slice from outside. index - the number of a slice or Slice object. */
+        rollOutSlice(index: number);
+        /** You can simulate roll-over a slice from outside. index - the number of a slice or Slice object. */
+        rollOverSlice(index: number);
+        /** Shows slice. index - the number of a slice or Slice object. */
+        showSlice(index: number);
+
+        /** Adds event listener of the type "clickSlice" or "pullInSlice" or "pullOutSlice" to the object.
+            @param type Always "clickSlice" or "pullInSlice" or "pullOutSlice".
+            @param handler
+                If the type is "clickSlice", dispatched when user clicks on a slice.
+                If the type is "pullInSlice", dispatched when user clicks on a slice and the slice is pulled-in.
+                If the type is "pullOutSlice", dispatched when user clicks on a slice and the slice is pulled-out.
+                If the type is "rollOutSlice", dispatched when user rolls-out of the slice.
+                If the type is "rollOverSlice", dispatched when user rolls-over the slice.
+        */
+        addListener(type: string, handler: (e: {/** Always "rollOverSlice". */
+            type: string; dataItem: Slice;
+        }) => void );
+    }
+
+    /** AmRadarChart is the class you have to use for radar and polar chart types.
+        @example
+    var chart;
+    var chartData = [
+        {country:"Czech Republic",litres:156.90},
+        {country:"Ireland",litres:131.10},
+        {country:"Germany",litres:115.80},
+        {country:"Australia",litres:109.90},
+        {country:"Austria",litres:108.30},
+        {country:"UK",litres:99.00}
+    ];
+
+    window.onload = function() {
+      chart = new AmCharts.AmRadarChart();
+      chart.dataProvider = chartData;
+      chart.categoryField = "country";
+      chart.startDuration = 2;
+
+      var valueAxis = new AmCharts.ValueAxis();
+      valueAxis.axisAlpha = 0.15;
+      valueAxis.minimum = 0;
+      valueAxis.dashLength = 3;
+      valueAxis.axisTitleOffset = 20;
+      valueAxis.gridCount = 5;
+      chart.addValueAxis(valueAxis);
+
+      var graph = new AmCharts.AmGraph();
+      graph.valueField = "litres";
+      graph.bullet = "round";
+      graph.balloonText = "[[value]] litres of beer per year"
+      chart.addGraph(graph);
+
+      chart.write("chartdiv");
+    }
+    */
+    class AmRadarChart extends AmCoordinateChart {
+        /** Bottom margin of the chart. */
+        marginBottom: number;
+        /** Left margin of the chart. */
+        marginLeft: number;
+        /** Right margin of the chart. */
+        marginRight: number;
+        /** Top margin of the chart. */
+        marginTop: number;
+        /** Radius of a radar. 0.35 */
+        radius: any;
+    }
+
+    /** AmXYChart is the class you have to use for XY/Bubble/Scatter chart types. The chart supports simple and logarithmic scales, it can have multiple value axes.
+        @example
+            var chartData = [
+                {x:10, y:14, value:59},
+                {x:5, y:3, value:50},
+                {x:-10, y:-3, value:19},
+                {x:-6, y:5, value:65},
+                {x:15, y:-4, value:92},
+                {x:13, y:1, value:8},
+                {x:1, y:6, value:35}
+            ];
+
+            var chart = new AmCharts.AmXYChart();
+            chart.pathToImages = "../../amcharts/javascript/images/";
+            chart.dataProvider = chartData;
+            chart.marginLeft = 35;
+            chart.startDuration = 1.5;
+
+            var xAxis = new AmCharts.ValueAxis();
+            xAxis.position = "left";
+            xAxis.autoGridCount = true;
+            chart.addValueAxis(xAxis);
+
+            var yAxis = new AmCharts.ValueAxis();
+            yAxis.position = "bottom";
+            yAxis.autoGridCount = true;
+            chart.addValueAxis(yAxis);
+
+            var graph = new AmCharts.AmGraph();
+            graph.valueField = "value";
+            graph.xField = "x";
+            graph.yField = "y";
+            graph.lineAlpha = 0;
+            graph.bullet = "round";
+            chart.addGraph(graph);
+
+            var chartCursor = new AmCharts.ChartCursor();
+            chart.addChartCursor(chartCursor);
+
+            var chartScrollbar = new AmCharts.ChartScrollbar();
+            chartScrollbar.hideResizeGrips = false;
+            chart.addChartScrollbar(chartScrollbar);
+
+            chart.write("chartdiv);
+    */
+    class AmXYChart extends AmRectangularChart {
+        /** Specifies if Scrollbar of X axis (horizontal) should be hidden. */
+        hideXScrollbar: boolean;
+        /** Specifies if Scrollbar of Y axis (vertical) should be hidden. */
+        hideYScrollbar: boolean;
+        /** Maximum zoom factor of the chart.
+            @default 20
+        */
+        maxZoomFactor: number;
+        /** Zooms out, charts shows all available data.*/
+        zoomOut();
+    }
+    /** Guides are straight vertical or horizontal lines or areas supported by AmSerialChart, AmXYChart and AmRadarChart. You can have guides both on value and category axes. To add/remove a guide to an axis, use axis.addGuide(guide)/axis.removeGuide(guide) methods.
+
+If you do not set properties such as dashLength, lineAlpha, lineColor, etc - values of the axis are used.*/
+    class Guide {
+        /** If you set it to true, the guide will be displayed above the graphs. */
+        above: boolean;
+        /** Radar chart only. Specifies angle at which guide should start. Affects only fills, not lines. */
+        angle: number;
+        /** Baloon fill color. */
+        balloonColor: string;
+        /** The text which will be displayed if the user rolls-over the guide. */
+        balloonText: string;
+        /** Specifies if label should be bold or not. */
+        boldLabel: boolean;
+        /** Category of the guide (in case the guide is for category axis). */
+        category: string;
+        /** Dash length. */
+        dashLength: number;
+        /** Date of the guide (in case the guide is for category axis and parseDates is set to true). */
+        date: Date;
+        /** Works if a guide is added to CategoryAxis and this axis is non-date-based. If you set it to true, the guide will start (or be placed, if it's not a fill) on the beginning of the category cell and will end at the end of toCategory cell. */
+        expand: boolean;
+        /** Fill opacity. Value range is 0 - 1. */
+        fillAlpha: number;
+        /** Fill color. */
+        fillColor: string;
+        /** Font size of guide label. */
+        fontSize: string;
+        /** Unique id of a Guide. You don't need to set it, unless you want to. */
+        id: string;
+        /** Specifies whether label should be placed inside or outside plot area. */
+        inside: boolean;
+        /** The label which will be displayed near the guide. */
+        label: string;
+        /** Rotation angle of a guide label. */
+        labelRotation: number;
+        /** Line opacity. */
+        lineAlpha: number;
+        /** Line color. */
+        lineColor: string;
+        /** Line thickness. */
+        lineThickness: number;
+        /** Position of guide label. Possible values are "left" or "right" for horizontal axis and "top" or "bottom" for vertical axis.  */
+        position: string;
+        /** Tick length. */
+        tickLength: number;
+        /** Radar chart only. Specifies angle at which guide should end. Affects only fills, not lines. */
+        toAngle: number;
+        /** To category of the guide (in case the guide is for category axis). */
+        toCategory: string;
+        /** To date of the guide (in case the guide is for category axis and parseDates is set to true) If you have both date and toDate, the space between these two dates can be filled with color. */
+        toDate: Date;
+        /** To value of the guide (in case the guide is for value axis). */
+        toValue: number;
+        /** Value of the guide (in case the guide is for value axis). */
+        value: number;
+        /** Value axis of a guide. As you can add guides directly to the chart, you might need to specify which which value axis should be used. */
+        valueAxis: ValueAxis;
+    }
+    /** ImagesSettings is a class which holds common settings of all MapImage objects. */
+    class ImagesSettings {
+        /** Opacity of the image.
+            @default 1
+        */
+        alpha: number;
+        /** Text which is displayed in a roll-over balloon. You can use the following tags: [[title]], [[description]], [[value]] and [[percent]]. [[title]] */
+        balloonText: string;
+        /** Specifies if the image's center should be placed in the provided coordinates. If false, top-left corner will be at provided coordinates.
+            @default true
+        */
+        centered: boolean;
+        /** Color of image. This will affect only predefined images (with "type" property set) and images with svgPath set. This property won't affect bitmap images and loaded SVG images. #000000 */
+        color: string;
+        /** Height of a description window. */
+        descriptionWindowHeight: number;
+        /** Width of a description window.
+            @default 250
+        */
+        descriptionWindowWidth: number;
+        /** X position of a description window. */
+        descriptionWindowX: number;
+        /** Y position of a description window. */
+        descriptionWindowY: number;
+        /** Label color. #000000 */
+        labelColor: string;
+        /** Font size of a label.
+            @default 11
+        */
+        labelfontSize: string;
+        /** Position of the label. Allowed values are: left, right, top, bottom and middle. right */
+        labelPosition: string;
+        /** Label roll-over color. #00CC00 */
+        labelRollOverColor: string;
+        /** Opacity of image outline. This will affect only predefined images (with "type" property set) and images with svgPath set. This property won't affect bitmap images and loaded SVG images. */
+        outlineAlpha: number;
+        /** Color of image outline. This will affect only predefined images (with "type" property set) and images with svgPath set. This property won't affect bitmap images and loaded SVG images. */
+        outlineColor: string;
+        /** Thickness of image outline. This will affect only predefined images (with "type" property set) and images with svgPath set. This property won't affect bitmap images and loaded SVG images.
+            @default 1
+        */
+        outlineThickness: number;
+        /** Color of image when hovered. This will affect only predefined images (with "type" property set) and images with svgPath set. This property won't affect bitmap images and loaded SVG images. */
+        rollOverColor: string;
+        /** Scale of the image when hovered. Use value like 1.5 - 2 to enlarge image when user rolls-over it.
+            @default 1
+        */
+        rollOverScale: number;
+        /** Scale of the image if it is selected. Use value like 1.5 - 2 to enlarge selected image.
+            @default 1
+        */
+        selectedScale: number;
+    }
+
+    /** AreasSettings is a class which holds common settings of all MapArea objects. */
+    class AreasSettings {
+        /** Opacity of areas.
+            @default 1
+        */
+        alpha: number;
+        /** Specifies if the areas should be zoomed-in when user clicks on them, event if zoom properties are not set. */
+        autoZoom: boolean;
+        /** Text which is displayed in a roll-over balloon. You can use the following tags: [[title]], [[description]], [[value]] and [[percent]] [[title]] */
+        balloonText: string;
+        /** Color of the areas. #FFCC00 */
+        color: string;
+        /** Color of area with highest value. Colors for areas with values less then highest will be colored with intermediate colors between color and colorSolid. Use colorSteps property of AmMap to change the number of intermediate colors. #990000 */
+        colorSolid: string;
+        /** Height of a description window. */
+        descriptionWindowHeight: number;
+        /** Width of a description window.
+            @default 250
+        */
+        descriptionWindowWidth: number;
+        /** X position of a description window. */
+        descriptionWindowX: number;
+        /** Y position of a description window. */
+        descriptionWindowY: number;
+        /** Opacity of area's outline.
+            @default 1
+        */
+        outlineAlpha: number;
+        /** Color of area's outline. #FFFFFF */
+        outlineColor: string;
+        /** Thickness of area's outline. 0.5 */
+        outlineThickness: number;
+        /** Color of area when user rolls-over it. undefined */
+        rollOverColor: string;
+        /** Color of area's outline when user rolls-over it. #CC0000 */
+        rollOverOutlineColor: string;
+        /** Color of area which is currently selected. #CC0000 */
+        selectedColor: string;
+        /** Opacity of all areas which are in the map svg file, but not listed as areas in DataSet.
+            @default 1
+        */
+        unlistedAreasAlpha: number;
+        /** Color of all areas which are in the map svg file, but not listed as areas in DataSet. #DDDDDD */
+        unlistedAreasColor: string;
+        /** Opacity of all areas' outline which are in the map svg file, but not listed as areas in DataSet.
+            @default 1
+        */
+        unlistedAreasOutlineAlpha: number;
+        /** Color of all areas' outline which are in the map svg file, but not listed as areas in DataSet. #FFFFFF */
+        unlistedAreasOutlineColor: string;
+    }
+
+    /** Slice is an item of AmPieChart's chartData Array and holds all the information about the slice. When working with a pie chart, you do not create slices or change it's properties directly, instead you set array of data using dataProvider property. Consider properties of a Slice read-only - change values in chart's data provider if you need to. */
+    class Slice {
+        /** Opacity of a slice. */
+        alpha: number;
+        /** Color of a slice. */
+        color: string;
+        /** Original object from data provider. */
+        dataContext: Object;
+        /** Slice description. */
+        description: string;
+        /** Specifies whether the slice is hidden */
+        hidden: boolean;
+        /** Percent value of a slice. */
+        percents: number;
+        /** Specifies whether the slice is pulled or not. */
+        pulled: boolean;
+        /** Slice title */
+        title: string;
+        /** Url of a slice */
+        url: string;
+        /** Value of a slice */
+        value: number;
+        /** specifies whether this slice has a legend entry */
+        visibleInLegend: boolean;
+    }
+
+
+    /** AmStockChart is a main class Stock chart. */
+    class AmStockChart {
+        /** Specifies if animation was already played. Animation is only played once, when chart is rendered for the first time. If you want the animation to be repeated, set this property to false. */
+        animationPlayed: boolean;
+        /** Balloon object. */
+        balloon: AmBalloon;
+        /** Settings for category axes. */
+        categoryAxesSettings: CategoryAxesSettings;
+        /** Indicates if the chart is created. */
+        chartCreated: boolean;
+        /** Chart cursor settings. */
+        chartCursorSettings: ChartCursorSettings;
+        /** Chart scrollbar settings. */
+        chartScrollbarSettings: ChartScrollbarSettings;
+        /** Array of colors used by data sets if no color was set explicitly on data set itself. #FF6600, "#FCD202", "#B0DE09", "#0D8ECF", "#2A0CD0", "#CD0D74", "#CC0000", "#00CC00", "#0000CC", "#DDDDDD", "#999999", "#333333", "#990000" */
+        colors: any[];
+        /** Array of data sets selected for comparing. */
+        comparedDataSets: any[];
+        /** Array of DataSets. */
+        dataSets: any[];
+        /** DataSetSelector object. You can add it if you have more than one data set and want users to be able to select/compare them. */
+        dataSetSelector: DataSetSelector;
+        /** Current end date of the selected period, get only. To set start/end dates, use stockChart.zoom(startDate, endDate) method. */
+        endDate: Date;
+        /** Defines on which day week starts. 0 - Sunday, 1 - Monday..
+            @default 1 */
+        firstDayOfWeek: number;
+        /** If set to true the scope of the data view will be set to the end after data update. */
+        glueToTheEnd: boolean;
+        /** Legend settings. */
+        legendSettings: LegendSettings;
+        /** Data set selected as main. */
+        mainDataSet: DataSet;
+        /** Array of StockPanels (charts). */
+        panels: any[];
+        /** Settings for stock panels. */
+        panelsSettings: PanelsSettings;
+        /** Period selector object. You can add it if you want user's to be able to enter date ranges or zoom chart with predefined period buttons. */
+        periodSelector: PeriodSelector;
+        /** Scrollbar's chart object, get only. */
+        scrollbarChart: AmSerialChart;
+        /** Current start date of the selected period, get only. To set start/end dates, use stockChart.zoom(startDate, endDate) method. */
+        startDate: Date;
+        /** Settings for stock events. */
+        stockEventsSettings: any;
+        /** Settings for value axes. */
+        valueAxesSettings: ValueAxesSettings;
+        /** read-only. Indicates current version of a script. */
+        version: string;
+        /** Specifies whether the chart should zoom-out when main data set is changed. */
+        zoomOutOnDataSetChange: boolean;
+
+        /** Adds panel to the stock chart. Requires stockChart.validateNow() method to be called after this action. */
+        addPanel(panel: StockPanel);
+        /** Adds panel to the stock chart at a specified index. Requires stockChart.validateNow() method to be called after this action. */
+        addPanelAt(panel: StockPanel, index: number);
+        /** Destroys chart, all timeouts and listeners. */
+        clear();
+        /** Hides event bullets. */
+        hideStockEvents();
+        /** Removes event listener from the object. */
+        removeListener(obj: any, type: string, handler: any);
+        /** Removes panel from the stock chart. Requires stockChart.validateNow() method to be called after this action. */
+        removePanel(panel: StockPanel);
+        /** Shows event bullets. */
+        showStockEvents();
+        /** Method which should be called after data was changed. */
+        validateData();
+        /** Method which forces the stock chart to rebuild. Should be called after properties are changed. */
+        validateNow();
+        /** Zooms chart to specified dates. startDate, endDate - Date objects. */
+        zoom(startDate: Date, endDate: Date);
+        /** Zooms out the chart. */
+        zoomOut();
+
+        /** Adds event listener of the type "dataUpdated" or "init" or "rendered" to the object.
+            @param type Always "dataUpdated" or "init" or "rendered".
+            @param handler
+                If the type is "dataUpdated", dispatched when the chart was updated with new data.
+                If the type is "init", dispatched when the chart is initialized for the first time. In case you want it to fire again after validateNow() method is called, set chart.chartCreated = false.
+                If the type is "rendered", dispatched each when chart is rendered.
+        */
+        addListener(type: string, handler: (e: {
+            /** Either "dataUpdated" or "init". */
+            type: string;
+            chart: AmStockChart;
+        }) => void );
+
+        /** Adds event listener of the type "rollOutStockEvent" or "rollOverStockEvent" or "clickStockEvent" to the object.
+            @param type     // Either "rollOutStockEvent" or "rollOverStockEvent" or "clickStockEvent".
+            @param handler
+                If the type is "rollOutStockEvent", dispatched when the user rolls-out of the Stock event (bullet).
+                If the type is "rollOverStockEvent", dispatched when the user rolls-over of the Stock event (bullet).
+                If the type is "clickStockEvent", dispatched when the user clicks on the Stock event (bullet).
+        */
+
+        addListener(type: string, handler: (e: {
+            /** Always "rollOverStockEvent". */
+            type: string;
+            eventObject: any;
+            graph: AmGraph;
+            date: Date;
+            chart: AmStockChart;
+        }) => void );
+
+        /** Adds event listener of the type "zoomed" to the object.
+            @param type Always "zoomed".
+            @param handler Dispatched when the chart is zoomed (even for the first time, when chart is initialized).*/
+        addListener(type: string, handler: (e: {
+            /** Always "zoomed". */
+            type: string;
+            startDate: Date;
+            endDate: Date;
+            period: string;
+            chart: AmStockChart;
+        }) => void );
+
+        /** Adds event listener of the type "panelRemoved" to the object.
+            @param type Always "panelRemoved".
+            @param handler Dispatched when the StockPanel is removed.*/
+        addListener(type: string, handler: (e: {
+            /** Always "panelRemoved". */
+
+            type: string;
+            panel: StockPanel;
+            chart: AmStockChart;
+        }) => void );
+
+        /** Removes event listener from chart object. */
+        removeListener(chart: AmChart, type: string, handler: any);
+    }
+
+    /** ValueAxesSettings settings set 's settings for all ValueAxes. If you change a property after the chart is initialized, you should call stockChart.validateNow() method in order for it to work. If there is no default value specified, default value of ValueAxis class will be used. */
+    class ValueAxesSettings {
+        /** Specifies whether number for gridCount is specified automatically, according to the axis size.
+            @default true
+        */
+        autoGridCount: boolean;
+        /** Axis opacity. */
+        axisAlpha: number;
+        /** Axis color.  */
+        axisColor: string;
+        /** Thickness of the axis. */
+        axisThickness: number;
+        /** Label color. */
+        color: string;
+        /** Length of a dash. By default, the grid line is not dashed. */
+        dashLength: number;
+        /** Fill opacity. Every second space between grid lines can be filled with color. */
+        fillAlpha: number;
+        /** Fill color. Every second space between grid lines can be filled with color. Set fillAlpha to a value greater than 0 to see the fills. */
+        fillColor: string;
+        /** Opacity of grid lines. */
+        gridAlpha: number;
+        /** Color of grid lines. */
+        gridColor: string;
+        /** Approximate number of grid lines. autoGridCount should be set to false, otherwise this property will be ignored. */
+        gridCount: number;
+        /** Thickness of grid lines. */
+        gridThickness: number;
+        /** Specifies whether guide values should be included when calculating min and max of the axis. */
+        includeGuidesInMinMax: boolean;
+        /** If true, the axis will include hidden graphs when calculating min and max values. */
+        includeHidden: boolean;
+        /** Specifies whether values should be placed inside or outside plot area. In case you set this to false, you'll have to adjust marginLeft or marginRight in [[PanelsSettings]] in order labels to be visible.
+            @default true
+        */
+        inside: boolean;
+        /** Specifies whether values on axis can only be integers or both integers and doubles. */
+        integersOnly: boolean;
+        /** Frequency at which labels should be placed.  */
+        labelFrequency: number;
+        /** Specifies whether value labels are displayed. */
+        labelsEnabled: boolean;
+        /** Set to true if value axis is logarithmic, false otherwise. */
+        logarithmic: boolean;
+        /** The distance of the axis to the plot area, in pixels. Useful if you have more then one axis on the same side.  */
+        offset: number;
+        /** Position of the value axis. Possible values are "left" and "right". */
+        position: string;
+        /** Set to true if value axis is reversed (smaller values on top), false otherwise. */
+        reversed: boolean;
+        /** Specifies if first label of value axis should be displayed. */
+        showFirstLabel: boolean;
+        /** Specifies if last label of value axis should be displayed. */
+        showLastLabel: boolean;
+        /** Stacking mode of the axis. Possible values are: "none", "regular", "100%", "3d". */
+        stackType: string;
+        /** Tick length. */
+        tickLength: number;
+        /** Unit which will be added to the value label.  */
+        unit: string;
+        /** Position of the unit. Possible values are "left" or "right". */
+        unitPosition: string;
+
+    }
+
+
+    /** AmLegend is the class that displays legend of the chart. Legend to the chart should be added using chart.addLegend(legend) method.
+        @example
+            var chart = new AmCharts.AmSerialChart();
+            var legend = new AmCharts.AmLegend();
+            chart.addLegend(legend);
+    */
+    class AmLegend {
+
+        /** Alignment of legend entries. Possible values are: "left", "center", "right". left */
+        align: string;
+        /** Used if chart is Serial or XY. In case true, margins of the legend are adjusted and made equal to chart's margins.
+            @default true
+        */
+        autoMargins: boolean;
+        /** Opacity of legend's background. Value range is 0 - 1 */
+        backgroundAlpha: number;
+        /** Background color. You should set backgroundAlpha to >0 vallue in order background to be visible. #FFFFFF */
+        backgroundColor: string;
+        /** Opacity of chart's border. Value range is 0 - 1. */
+        borderAlpha: number;
+        /** Color of legend's border. You should set borderAlpha >0 in order border to be visible. #000000 */
+        borderColor: string;
+        /** In case legend position is set to "absolute", you can set distance from bottom of the chart, in pixels.  */
+        bottom: number;
+        /** Text color. Will use chart's color if not set. */
+        color: string;
+        /** This can be used by AmMap only. You can pass array of objects with title, color, markerType values, for example: [{title: "One", color: "#3366CC"},{title: "Two", color: "#FFCC33"}] */
+        data: any[];
+        /** Specifies if each of legend entry should be equal to the most wide entry. Won't look good if legend has more than one line.
+            @default true
+        */
+        equalWidths: boolean;
+        /** Font size. Will use chart's font size if not set. */
+        fontSize: string;
+        /** Horizontal space between legend item and left/right border. */
+        horizontalGap: number;
+        /** The text which will be displayed in the legend. Tag [[title]] will be replaced with the title of the graph. [[title]] */
+        labelText: string;
+        /** In case legend position is set to "absolute", you can set distance from left side of the chart, in pixels. */
+        left: number;
+        /** Bottom margin.  */
+        marginBottom: number;
+        /** Left margin. This property will be ignored if chart is Serial or XY and autoMargins property of the legend is true (default).
+            @default 20
+        */
+        marginLeft: number;
+        /** Right margin. This property will be ignored if chart is Serial or XY and autoMargins property of the legend is true (default).
+            @default 20
+        */
+        marginRight: number;
+        /** Top margin. */
+        marginTop: number;
+        /** Marker border opacity 1. */
+        markerBorderAlpha: number;
+        /** Marker border color. If not set, will use the same color as marker. */
+        markerBorderColor: string;
+        /** Thickness of the legend border. The default value (0) means the line will be a "hairline" (1 px). In case marker type is line, this style will be used for line thickness.
+            @default 1
+        */
+        markerBorderThickness: number;
+        /** The color of the disabled marker (when the graph is hidden). #AAB3B3 */
+        markerDisabledColor: string;
+        /** Space between legend marker and legend text, in pixels.
+            @default 5
+        */
+        markerLabelGap: number;
+        /** Size of the legend marker (key).
+            @default 16
+        */
+        markerSize: number;
+        /** Shape of the legend marker (key). Possible values are: "square", "circle", "line", "dashedLine", "triangleUp", "triangleDown", "bubble", "none". square */
+        markerType: string;
+        /** Maximum number of columns in the legend. If Legend's position is set to "right" or "left", maxColumns is automatically set to 1. */
+        maxColumns: number;
+        /** Position of a legend. Possible values are: "bottom", "top", "left", "right" and "absolute". In case "absolute", you should set left and top properties too. (this setting is ignored in Stock charts). In case legend is used with AmMap, position is set to "absolute" automatically.  bottom */
+        position: string;
+        /** Specifies whether legend entries should be placed in reversed order. */
+        reversedOrder: boolean;
+        /** In case legend position is set to "absolute", you can set distance from right side of the chart, in pixels. */
+        right: number;
+        /** Legend item text color on roll-over.  #CC0000 */
+        rollOverColor: string;
+        /** When you roll-over the legend entry, all other graphs can reduce their opacity, so that the graph you rolled-over would be distinguished. This style specifies the opacity of the graphs.
+            @default 1
+        */
+        rollOverGraphAlpha: number;
+        /** You can use this property to turn all the legend entries off.
+            @default true
+        */
+        showEntries: boolean;
+        /** Horizontal space between legend items, in pixels.
+            @default 10
+        */
+        spacing: number;
+        /** Whether showing/hiding of graphs by clicking on the legend marker is enabled or not. In case legend is used with AmMap, this is set to false automatically.
+            @default true
+        */
+        switchable: boolean;
+        /** Legend switch color. #FFFFFF */
+        switchColor: string;
+        /** Legend switch type (in case the legend is switchable). Possible values are "x" and "v". x */
+        switchType: string;
+        /** If true, clicking on the text will show/hide balloon of the graph. Otherwise it will show/hide graph/slice, if switchable is set to true.  */
+        textClickEnabled: boolean;
+        /** In case legend position is set to "absolute", you can set distance from top of the chart, in pixels. */
+        top: number;
+        /** Legend markers can mirror graph’s settings, displaying a line and a real bullet as in the graph itself.
+        Set this property to true if you want to enable this feature. Note, if you set graph colors in dataProvider, they will not be reflected in the marker.
+        @default false*/
+        useGraphSettings: boolean;
+        /** Specifies if legend labels should be use same color as corresponding markers. */
+        useMarkerColorForLabels: boolean;
+        /** Alignment of the value text. Possible values are "left" and "right". right */
+        valueAlign: string;
+        /** The text which will be displayed in the value portion of the legend. You can use tags like [[value]], [[open]], [[high]], [[low]], [[close]], [[percents]], [[description]]. [[value]] */
+        valueText: string;
+        /** Width of the value text.
+            @default 80
+        */
+        valueWidth: number;
+        /** Vertical space between legend items also between legend border and first and last legend row.  10 */
+        verticalGap: number;
+        /** Adds event listener of the type "clickLabel" or "clickMarker" or "hideItem" to the object.
+            @param type Either "clickLabel" or "clickMarker" or "hideItem".
+            @param handler
+                If the type is "clickLabel", dispatched when legend label is clicked.
+                If the type is "clickMarker", dispatched when legend marker is clicked.
+                If the type is "hideItem", dispatched when user clicks on a legend item marker and hides corresponding object.
+                If the type is "rollOutItem", dispatched when user rolls-out of the legend item label (or whole item, if switchable is set to false).
+                If the type if "rollOverItem", dispatched when user rolls-over the legend item label (or whole item, if switchable is set to false).
+                If the type is "rollOutMarker", dispatched when user clicks out of a legend item marker and shows corresponding object.
+                If the type if "rollOverMarker", dispatched when user clicks on a legend item marker and shows corresponding object.
+        */
+
+        /** Adds event listener of the type "showItem" to the object.
+            @param type Always "showItem".
+            @param handler
+        */
+        addListener(type: string, handler: (e: {/** Always "showItem". */
+            type: string; dataItem: Object; chart: AmChart;
+        }) => void );
+
+        /** Removes event listener from chart object. */
+        removeListener(chart: AmChart, type: string, handler: any);
+    }
+
+    /** StockLegend is a legend of StockPanel. */
+
+    class StockLegend extends AmLegend {
+        /** The text which will be displayed in the value portion of the legend when graph is comparable and at least one dataSet is selected for comparing. You can use tags like [[value]], [[open]], [[high]], [[low]], [[close]], [[percents.value/open/close/low/high]], [[description]]. [[percents.value]]% */
+
+        valueTextComparing: string;
+        /** The text which will be displayed in the value portion of the legend. You can use tags like [[value]], [[open]], [[high]], [[low]], [[close]], [[percents]], [[description]].  [[value]] */
+
+        valueTextRegular: string;
+    }
+
+    /** StockPanel class creates stock panels (charts). AmStockChart can have multiple Stock panels. */
+
+    class StockPanel extends AmSerialChart {
+        /** Specifies whether x button will be displayed near the panel. This button allows turning panel off. */
+        allowTurningOff: boolean;
+        /** If true, drawing icons will be displayed in top-right corner. */
+        drawingIconsEnabled: boolean;
+        /** Specifies on which value axis user can draw trend lines. Set drawingIconsEnabled to true if you want drawing icons to be visible. First value axis will be used if not set here. */
+        drawOnAxis: ValueAxis;
+        /** Specifies if all trend lines should be erased when erase button is clicked. If false, trend lines can be erased one by one. */
+        eraseAll: boolean;
+        /** Size of trend line drawing icons. If you change this size, you should update icon images if you want them to look properly.
+            @default 18
+        */
+        iconSize: number;
+        /** Relative height of panel. Possible values 0 - 100. */
+        percentHeight: number;
+        /** Specifies when values should be recalculated to percents. Possible values are: "never", "always", "whenComparing".  whenComparing */
+        recalculateToPercents: string;
+        /** Specifies whether this panel will show category axis.
+            @default true
+        */
+        showCategoryAxis: boolean;
+        /**  */
+        stockGraphs: StockGraph[];
+        /** Stock chart legend. */
+        stockLegend: StockLegend;
+        /** Title of a panel. Note, StockLegend should be added in order title to be displayed. */
+        title: string;
+        /** Trend line opacity.
+            @default 1
+        */
+        trendLineAlpha: number;
+        /** Trend line color. #00CC00 */
+        trendLineColor: string;
+        /** Trend line dash length. */
+        trendLineDashLength: number;
+        /** Trend line thickness.
+            @default 2
+        */
+        trendLineThickness: number;
+        /** Adds a graph to the panel. */
+        addStockGraph(graph: StockGraph);
+        /** Removes graph from the panel. */
+        removeStockGraph(graph: StockGraph);
+    }
+
+    /** AmChart is a base class of all charts. It can not be instantiated explicitly. AmCoordinateChart, AmPieChart and AmMap extend AmChart class. */
+    class AmChart {
+    	/** used when constructing a chart with a theme */
+    	constructor(theme?: any);
+    	/** Specifies, if class names should be added to chart elements. */
+        addClassNames: boolean;
+        /** Array of Labels. Example of label object, with all possible properties:
+{"x": 20, "y": 20, "text": "this is label", "align": "left", "size": 12, "color": "#CC0000", "alpha": 1, "rotation": 0, "bold": true, "url": "http://www.amcharts.com"} */
+        allLabels: Label[];
+        /**  Set this to false if you don't want chart to resize itself whenever its parent container size changes. */
+        autoResize: boolean;
+        /** Opacity of background. Set it to >0 value if you want backgroundColor to work. However we recommend changing div's background-color style for changing background color. */
+        backgroundAlpha: number;
+        /** Background color. You should set backgroundAlpha to >0 value in order background to be visible. We recommend setting background color directly on a chart's DIV instead of using this property. #FFFFFF */
+        backgroundColor: string;
+        /** The chart creates AmBalloon class itself. If you want to customize balloon, get balloon instance using this property, and then change balloon's properties.  AmBalloon */
+        balloon: AmBalloon;
+        /** Opacity of chart's border. Value range is 0 - 1. */
+        borderAlpha: number;
+        /** Color of chart's border. You should set borderAlpha >0 in order border to be visible. We recommend setting border color directly on a chart's DIV instead of using this property. #000000 */
+        borderColor: string;
+        /** This prefix is added to all class names which are added to all visual elements of a chart in case addClassNames is set to true. */
+        classNamePrefix: string;
+        /** Text color. #000000 */
+        color: string;
+        /** Non-commercial version only. Specifies position of link to amCharts site. Allowed values are: top-left, top-right, bottom-left and bottom-right.
+            @default 'top-left'
+        */
+        creditsPosition: string;
+        /** Array of data objects, for example: [{country:"US", value:524},{country:"UK", value:624},{country:"Lithuania", value:824}]. You can have any number of fields and use any field names. In case of AmMap, data provider should be MapData object. */
+        dataProvider: any[];
+        /** Decimal separator.
+            @Default . */
+        decimalSeparator: string;
+        /** Using this property you can add any additional information to SVG, like SVG filters or clip paths. The structure of this object should be identical to XML structure of a object you are adding, only in JSON format. */
+        defs: any;
+        /** Export config. Specifies how export to image/data export/print/annotate menu will look and behave. You can find a lot of examples in amcharts/plugins/export folder. */
+        export: ExportSettings;
+        /** Font family. Verdana */
+        fontFamily: string;
+        /** Font size.
+            @default 11
+        */
+        fontSize: string;
+        /** If you set this to true, the lines of the chart will be distorted and will produce hand-drawn effect. Try to adjust chart.handDrawScatter and chart.handDrawThickness properties for a more scattered result.
+            @Default false
+        */
+        handDrawn: boolean;
+        /** Defines by how many pixels hand-drawn line (when handDrawn is set to true) will fluctuate.
+            @Default 2
+        */
+        handDrawScatter: number;
+        /** Defines by how many pixels line thickness will fluctuate (when handDrawn is set to true).
+            @Default 1
+        */
+        handDrawThickness: number;
+        /** Time, in milliseconds after which balloon is hidden if the user rolls-out of the object. Might be useful for AmMap to avoid balloon flickering while moving mouse over the areas. Note, this is not duration of fade-out. Duration of fade-out is set in AmBalloon class.
+            @Default 150
+        */
+        hideBalloonTime: number;
+        /** Legend of a chart. */
+        legend: AmLegend;
+        /** Reference to the div of the legend. */
+        legendDiv: HTMLElement;
+        /** You can add listeners of events using this property. Example: listeners = [{"event":"dataUpdated", "method":handleEvent}]; */
+        listerns: Object[];
+        /** This setting affects touch-screen devices only. If a chart is on a page, and panEventsEnabled are set to true, the page won't move if the user touches the chart first. If a chart is big enough and occupies all the screen of your touch device, the user won’t be able to move the page at all. That's why the default value is "false". If you think that selecting/panning the chart or moving/pinching the map is a primary purpose of your users, you should set panEventsEnabled to true. */
+        panEventsEnabled: boolean;
+        /**  Specifies absolute or relative path to amCharts files, i.e. "amcharts/". (where all .js files are located)
+            If relative URLs are used, they will be relative to the current web page, displaying the chart.
+            You can also set path globally, using global JavaScript variable AmCharts_path. If this variable is set, and "path" is not set in chart config, the chart will assume the path from the global variable. This allows setting amCharts path globally. I.e.:
+            var AmCharts_path = "/libs/amcharts/";
+            "path" parameter will be used by the charts to locate it's files, like images, plugins or patterns.*/
+        path: string;
+        /** Specifies path to the folder where images like resize grips, lens and similar are.
+            IMPORTANT: Since V3.14.12, you should use "path" to point to amCharts directory instead. The "pathToImages" will be automatically set and does not need to be in the chart config, unless you keep your images separately from other amCharts files. */
+        pathToImages: string;
+        /** Precision of percent values. -1 means percent values won't be rounded at all and show as they are.
+            @default 2
+        */
+        percentPrecision: number;
+        /** Precision of values. -1 means values won't be rounded at all and show as they are.
+            @Default 1*/
+        precision: number;
+        /** Prefixes which are used to make big numbers shorter: 2M instead of 2000000, etc. Prefixes are used on value axes and in the legend. To enable prefixes, set usePrefixes property to true. [{number:1e+3,prefix:"k"},{number:1e+6,prefix:"M"},{number:1e+9,prefix:"G"},{number:1e+12,prefix:"T"},{number:1e+15,prefix:"P"},{number:1e+18,prefix:"E"},{number:1e+21,prefix:"Z"},{number:1e+24,prefix:"Y"}] */
+        prefixesOfBigNumbers: any[];
+        /** Prefixes which are used to make small numbers shorter: 2μ instead of 0.000002, etc. Prefixes are used on value axes and in the legend. To enable prefixes, set usePrefixes property to true. [{number:1e-24, prefix:"y"},{number:1e-21, prefix:"z"},{number:1e-18, prefix:"a"},{number:1e-15, prefix:"f"},{number:1e-12, prefix:"p"},{number:1e-9, prefix:"n"},{number:1e-6, prefix:"μ"},{number:1e-3, prefix:"m"}] */
+        prefixesOfSmallNumbers: any[];
+        /** Theme of a chart. Config files of themes can be found in amcharts/themes/ folder. More info about using themes. */
+        theme: string;
+        /** Thousands separator.
+            @default .
+        */
+        thousandsSeparator: string;
+        /** Array of Title objects. */
+        titles: Title[];
+        /** Type of a chart. Required when creating chart using JSON. Possible types are: serial, pie, xy, radar, funnel, gauge, map, stock. */
+        type: string;
+        /** If true, prefixes will be used for big and small numbers. You can set arrays of prefixes via prefixesOfSmallNumbers and prefixesOfBigNumbers properties. */
+        usePrefixes: boolean;
+        /** Read-only. Indicates current version of a script. */
+        version: string;
+        /** Adds a label on a chart.
+            You can use it for labeling axes, adding chart title, etc. x and y coordinates can be set in number, percent, or a number with ! in front of it - coordinate will be calculated from right or bottom instead of left or top.
+            x - horizontal coordinate
+            y - vertical coordinate
+            text - label's text
+            align - alignment (left/right/center)
+            size - text size
+            color - text color
+            rotation - angle of rotation
+            alpha - label alpha
+            bold - specifies if text is bold (true/false),
+            url - url
+        */
+        addLabel(x: number, y: number, text: string, align: string, size: number, color: string, rotation: number, alpha: number, bold: boolean, url: string);
+        /** Adds a legend to the chart.
+            By default, you don't need to create div for your legend, however if you want it to be positioned in some different way, you can create div anywhere you want and pass id or reference to your div as a second parameter.
+            (NOTE: This method will not work on StockPanel.)
+            @param legend
+            @param legendDivId - Id of the legend div (optional).
+        */
+        addLegend(legend: AmLegend, legendDivId?: string);
+        /** Adds a legend to the chart.
+            By default, you don't need to create div for your legend, however if you want it to be positioned in some different way, you can create div anywhere you want and pass id or reference to your div as a second parameter.
+            (NOTE: This method will not work on StockPanel.)
+            @param legend
+            @param legendDiv - Legend div (optional).
+        */
+        addLegend(legend: AmLegend, legendDiv: HTMLElement);
+
+        /**   Adds title to the top of the chart. Pie, Radar positions are updated so that they won't overlap. Plot area of Serial/XY chart is also updated unless autoMargins property is set to false. You can add any number of titles - each of them will be placed in a new line. To remove titles, simply clear titles array: chart.titles = []; and call chart.validateNow() method. text - text of a title size - font size color - title color alpha - title opacity bold - boolean value indicating if title should be bold. */
+        addTitle(text: string, size: number, color: string, alpha: number, bold: boolean);
+        /** Clears the chart area, intervals, etc. */
+        clear();
+        /** Removes all labels added to the chart. */
+        clearLabels();
+        /** Use this method to force the chart to resize to it's current container size. */
+        invalidateSize();
+        /** Removes chart's legend. */
+        removeLegend();
+        /** This method should be called after data in your data provider changed or a new array was set to dataProvider. After calling this method the chart will parse data and redraw. */
+        validateData();
+        /** This method should be called after you changed one or more properties of any class. The chart will redraw after this method is called. */
+        validateNow();
+
+        /** Adds chart to the specified DIV.
+            @param container DIV object which will hold the chart. */
+        write(container: HTMLElement): void;
+        /** Adds chart to the specified DIV.
+            @param container Id of a DIV which will hold the chart. */
+        write(container: string): void;
+
+        /** Adds event listener of the type "dataUpdated" or "init" to the object.
+            @param type "dataUpdated" or "init".
+            @param handler
+                If the type is "dataUpdated".
+                    Dispatched when chart is build for the first time or after validateData() method was called.
+                If the type is "init".
+                    Dispatched when chart is build for the first time.
+        */
+        addListener(type: string, handler: (e: {
+            /** Either "dataUpdated" or "init". */
+            type: string;
+            chart: AmChart;
+        }) => void );
+        /** Removes event listener from chart object. */
+        removeListener(chart: AmChart, type: string, handler: any);
+    }
+
+    /** AmCoordinateChart is a base class of AmRectangularChart. It can not be instantiated explicitly. */
+
+    class AmCoordinateChart extends AmChart {
+        /** Read-only. Array, holding processed chart's data. */
+        chartData: Object[];
+        /** Specifies the colors of the graphs if the lineColor of a graph is not set.
+            It there are more graphs then colors in this array, the chart picks random color.
+            @default ['#FF6600', '#FCD202', '#B0DE09', '#0D8ECF', '#2A0CD0', '#CD0D74', '#CC0000', '#00CC00', '#0000CC', '#DDDDDD', '#999999', '#333333', '#990000'] */
+        colors: string[];
+        /** The array of graphs belonging to this chart.
+            To add/remove graph use addGraph/removeGraph methods instead of adding/removing graphs directly to array.
+        */
+        graphs: AmGraph[];
+        /** Specifies if grid should be drawn above the graphs or below. Will not work properly with 3D charts.
+            @default false
+        */
+        gridAboveGraphs: boolean;
+        /** Instead of adding guides to the axes, you can push all of them to this array. In case guide has category or date defined, it will automatically will be assigned to the category axis. Otherwise to first value axis, unless you specify a different valueAxis for the guide. */
+        guides: Guide[];
+        /** Specifies whether the animation should be sequenced or all objects should appear at once.
+            @default true
+        */
+        sequencedAnimation: boolean;
+        /** The initial opacity of the column/line.
+            If you set startDuration to a value higher than 0, the columns/lines will fade in from startAlpha.
+            Value range is 0 - 1.
+            @default 1
+        */
+        startAlpha: number;
+        /** Duration of the animation, in seconds. */
+        startDuration: number;
+        /** Animation effect.
+            Possible values are ">", "<", elastic" and "bounce".
+            @default "elastic"
+        */
+        startEffect: string;
+        /** Target of url.
+            @default this
+        */
+        urlTarget: any;
+        /** The array of value axes.
+            To add/remove value axis use addValueAxis/removeValueAxis methods instead of adding/removing axes directly to array.
+            Chart creates one value axis automatically, so if you need only one value axis, you don't need to create it.
+        */
+        valueAxes: any[];
+        /**  Adds a graph to the chart.
+         */
+        addGraph(graph: AmGraph);
+        /** Adds a legend to the chart. By default, you don't need to create div for your legend, however if you want it to be positioned in some different way, you can create div anywhere you want and pass id or reference to your div as a second parameter. (NOTE: This method will not work on StockPanel.) */
+        /** Adds value axis to the chart.
+            One value axis is created automatically, so if you don't want to change anything or add more value axes, you don't need to add it.
+        */
+        addValueAxis(axis: ValueAxis);
+        /** You can trigger the animation of the chart. */
+        animateAgain();
+
+        /** AmGraph Returns graph by id. */
+        getGraphById(graphId: string): AmGraph;
+
+        /**  Returns value axis by id.*/
+        getValueAxisById(axisId: string): ValueAxis;
+
+        /** Hide the graph (if it is visible). Usually this method is called from the Legend, when you click on the legend marker.
+        */
+        hideGraph(graph: AmGraph);
+
+        /** Hide value balloon of a graph. Usually this method is called from the Legend, when you click on the legend text.*/
+        hideGraphsBalloon(graph: AmGraph);
+
+        /** Highlight the graph. Usually this method is called from the Legend, when you roll-over the legend entry.*/
+        highlightGraph(graph: AmGraph);
+
+        /** Removes graph from the chart.*/
+        removeGraph(graph: AmGraph);
+
+        /** Removes value axis from the chart. When you remove value axis, all graphs assigned to this axis are also removed. */
+        removeValueAxis(axis: ValueAxis);
+
+        /** Show the graph (if it is hidden). Usually this method is called from the Legend, when you click on the legend marker.*/
+        showGraph(graph: AmGraph);
+
+        /** Show value balloon of a graph. Usually this method is called from the Legend, when you click on the legend text.*/
+        showGraphsBalloon(graph: AmGraph);
+
+        /** UnhighlightGraph the graph. Usually this method is called from the Legend, when you roll-out the legend entry.*/
+        unhighlightGraph(graph: AmGraph);
+        /** Adds event listener of the type "clickGraphItem" or "doubleClickGraphItem" or "rightClickGraphItem" or "rollOutGraphItem" or "rollOverGraphItem" to the object.
+            @param type Either "clickGraphItem" or "doubleClickGraphItem" or "rightClickGraphItem" or "rollOutGraphItem" or "rollOverGraphItem".
+            @param handler Dispatched when user clicks on the data item (column/bullet)
+        */
+        addListener(type: string, handler: (e: {
+            /** Either "clickGraphItem" or "doubleClickGraphItem" or "rightClickGraphItem" or "rollOutGraphItem" or "rollOverGraphItem". */
+            type: string;
+            graph: AmGraph;
+            item: GraphDataItem;
+            index: number;
+            chart: AmChart;
+        }) => void );
+    }
+
+    /** GraphDataItem holds all the information about the graph's data item. When working with a chart, you do not create GraphDataItem objects or change it's properties directly. GraphDataItem is passed to you by events when user interacts with data item on the chart. The list of properties below will help you to extract data item's value/coordinate/etc. */
+    class GraphDataItem {
+        /** Opacity of the data item. */
+        alpha: number;
+        /** Bullet type. */
+        bullet: string;
+        /** Bullet size.  */
+        bulletSize: number;
+        /** Category value. */
+        category: string;
+        /** Color of the data item. */
+        color: string;
+        /** Custom bullet (path to file name). */
+        customBullet: string;
+        /** Original object from data provider. */
+        dataContext: Object;
+        /** Description. */
+        description: string;
+        /** Array of colors of the data item, used by column and candlestick chart only. */
+        fillColors: any[];
+        /** Object which holds percents when recalculateToPercents is set to true. */
+        percents: Object;
+        /** SerialDataItem of this graphDataItem */
+        serialDataItem: SerialDataItem;
+        /** url */
+        url: string;
+        /** Object which holds values of the data item (value, open, close, low, high). */
+        values: Object;
+        /** x coordinate of the data item. */
+        x: number;
+        /** y coordinate of the data item. */
+        y: number;
+    }
+
+    /** SerialDataItem holds all the information about each series. When working with a chart, you do not create SerialDataItem objects or change it's properties directly. Consider properties of a SerialDataItem read-only - change values in chart's data provider if you need to. When serial chart parses dataProvider, it generates "chartData" array. Objects of this array are SerialDataItem objects. */
+    class SerialDataItem {
+
+        /** You can access each GraphDataItem using this object. The data structure is: graphDataItem = serialDataItem.axes[axisId].graphs[graphId]. */
+        axes: Object;
+
+        /** category value. String if parseDates is false, Date if true. */
+        category: any;
+
+        /** Timestamp of a series date. Avalable only if parseDates property of CategoryAxis is set to true. */
+        time: number;
+
+        /** Coordinate (horizontal or vertical, depends on chart's rotate property) of the series. */
+        x: number;
+    }
+
+    class CategoryAxis extends AxisBase {
+
+        /** When parse dates is on for the category axis, the chart will try to highlight the beginning of the periods, like month, in bold. Set this to false to disable the functionality.
+            @default true
+        */
+        boldPeriodBeginning: boolean;
+
+        /** Date formats of different periods. Possible period values: fff - milliseconds, ss - seconds, mm - minutes, hh - hours, DD - days, MM - months, WW - weeks, YYYY - years. Check this page for date formatting strings. [{period:'fff',format:'JJ:NN:SS'},{period:'ss',format:'JJ:NN:SS'},{period:'mm',format:'JJ:NN'},{period:'hh',format:'JJ:NN'},{period:'DD',format:'MMM DD'},{period:'WW',format:'MMM DD'},{period:'MM',format:'MMM'},{period:'YYYY',format:'YYYY'}] */
+        dateFormats: any[];
+
+        /** In case your category axis values are Date objects and parseDates is set to true, the chart will parse dates and will place your data points at irregular intervals. However if you want dates to be parsed (displayed on the axis, baloons, etc), but data points to be placed at equal intervals (omiting dates with no data), set equalSpacing to true. */
+        equalSpacing: boolean;
+
+        /** Field in data provider which specifies if the category value should always be shown. For example: categoryAxis.forceShowField = "forceShow"; Field in data provider which specifies if the category value should always be shown. For example: categoryAxis.forceShowField = "forceShow";
+        And in data:
+        {category:"one", forceShow:true, value:100}
+        Note, this works only when parseDates is set to false.*/
+        forceShowField: string;
+
+        /** Specifies if a grid line is placed on the center of a cell or on the beginning of a cell. Possible values are: "start" and "middle" This setting doesn't work if parseDates is set to true. middle */
+        gridPosition: string;
+
+        /**   Specifies if minor grid should be displayed.
+        NOTE: If equalSpacing is set to true, this setting will be ignored.
+        @default false*/
+        minorGridEnabled: boolean;
+
+        /** Specifies the shortest period of your data. This should be set only if parseDates is set to "true". Possible period values: fff - milliseconds, ss - seconds, mm - minutes, hh - hours, DD - days, MM - months, YYYY - years. DD */
+        minPeriod: string;
+
+        /** In case your category axis values are Date objects, set this to true. In this case the chart will parse dates and will place your data points at irregular intervals. If you want dates to be parsed, but data points to be placed at equal intervals, set both parseDates and equalSpacing to true. */
+        parseDates: boolean;
+
+        /** Specifies whether the graph should start on axis or not. In case you display columns, it is recommended to set this to false. If parseDates is set to true, startOnAxis will allways be false, unless equalSpacing is set to true. */
+        startOnAxis: boolean;
+
+        /** Works only when parseDates is set to true and equalSpacing is false. If you set it to true, at the position where bigger period changes,
+        category axis will display date strings of bot small and big period, in two rows.
+        @default false*/
+        twoLineMode: boolean;
+
+        /** Use line color for bullet
+        @default false*/
+        useLineColorForBulletBorder: boolean;
+        /** Number returns coordinate of a category. Works only if parseDates is false. If parseDates is true, use dateToCoordinate method. category - String */
+        categoryToCoordinate(category: string);
+
+        /** date - Date object Returns Date of the coordinate, in case parseDates is set to true and equalSpacing is set to false.  coordinate - Number */
+        coordinateToDate(coordinate: number);
+
+        /** Number Returns coordinate of the date, in case parseDates is set to true. if parseDates is false, use categoryToCoordinate method. date - Date object */
+        dateToCoordinate(date: Date);
+
+        /** Number Returns index of the category which is most close to specified coordinate. x - coordinate */
+        xToIndex(x: number);
+    }
+
+    /** ChartScrollbar class displays chart scrollbar. Supported by AmSerialChart and AmXYChart.
+        @example
+            var chart = new AmCharts.AmSerialChart();
+            var chartScrollbar = new AmCharts.ChartScrollbar();
+            chart.addChartScrollbar(chartScrollbar);
+    */
+    class ChartScrollbar {
+        /** Specifies whether number of gridCount is specified automatically, acoarding to the axis size. */
+        autoGridCount: boolean;
+        /** Background opacity.
+            @default 1
+        */
+        backgroundAlpha: number;
+        /** Background color of the scrollbar.
+            @default #D4D4D4
+        */
+        backgroundColor: string;
+        /** Read-only. Category axis of the scrollbar. */
+        categoryAxis: CategoryAxis;
+        /** Text color. Will use chart's color if not set. */
+        color: string;
+        /** Specifies which graph will be displayed in the scrollbar. Only Serial chart's scrollbar can display a graph. */
+        graph: AmGraph;
+        /** Graph fill opacity. Value range is 0 - 1.  0.1 */
+        graphFillAlpha: number;
+        /** Graph fill color. #000000 */
+        graphFillColor: string;
+        /** Graph line opacity. Value range is 0 - 1. */
+        graphLineAlpha: number;
+        /** Graph line color. #000000 */
+        graphLineColor: string;
+        /** by default the graph type is the same as the original graph's type, however in case of candlestick or ohlc you might want to show line graph in the scrollbar. Possible values are: "line", "column", "step", "smoothedLine", "candlestick", "ohlc". */
+        graphType: string;
+        /** Grid opacity. Value range is 0 - 1. 0.7 */
+        gridAlpha: number;
+        /** Grid color. #FFFFFF */
+        gridColor: string;
+        /** The number of grid lines. */
+        gridCount: number;
+        /** Specifies whether resize grips are hidden when mouse is away from the scrollbar. */
+        hideResizeGrips: boolean;
+        /** Specifies whether scrollbar has a resize feature.
+            @default true
+        */
+        resizeEnabled: boolean;
+        /** Height (width, if chart is rotated) of a scrollbar.  20 */
+        scrollbarHeight: number;
+        /** Duration of scrolling, when the user clicks on scrollbar's background, in seconds.
+            @default 2
+        3*/
+        scrollDuration: number;
+        /** Selected backround opacity.
+            @default 1
+        */
+        selectedBackgroundAlpha: number;
+        /** Selected background color. #EFEFEF */
+        selectedBackgroundColor: string;
+        /** Selected graph's fill opacity. Value range is 0 - 1. 0.5 */
+        selectedGraphFillAlpha: number;
+        /** Selected graph's fill color. #000000 */
+        selectedGraphFillColor: string;
+        /** Selected graph's line opacity. Value range is 0 - 1. */
+        selectedGraphLineAlpha: number;
+        /** Selected graph's line color. #000000 */
+        selectedGraphLineColor: string;
+        /** Specifies if the chart should be updated while dragging/resizing the scrollbar or only at the moment when user releases mouse button. */
+        updateOnReleaseOnly: boolean;
+    }
+
+    /** AmRectangularChart is a base class of AmSerialChart and AmXYChart. It can not be instantiated explicitly.*/
+    class AmRectangularChart extends AmCoordinateChart {
+        /** The angle of the 3D part of plot area. This creates a 3D effect (if the "depth3D" is > 0).
+            @default 0
+        */
+        angle: number;
+        /** Space left from axis labels/title to the chart's outside border, if autoMargins set to true.
+            @default 10
+        */
+        autoMarginOffset: number;
+        /** Specifies if margins of a chart should be calculated automatically so that labels of axes would fit. The chart will adjust only margins with axes. Other margins will use values set with marginRight, marginTop, marginLeft and marginBottom properties.
+            @default true
+        */
+        autoMargins: boolean;
+        /** Cursor of a chart. */
+        chartCursor: ChartCursor;
+        /** Chart scrollbar. */
+        chartScrollbar: ChartScrollbar;
+        /** The depth of the 3D part of plot area. This creates a 3D effect (if the "angle" is > 0).
+            @default 0*/
+        depth3D: number;
+        /** Number of pixels between the container's bottom border and plot area. This space can be used for bottom axis' values. If autoMargin is true and bottom side has axis, this property is ignored.
+            @default 20
+        */
+        marginBottom: number;
+        /** Number of pixels between the container's left border and plot area. This space can be used for left axis' values. If autoMargin is true and left side has axis, this property is ignored.
+            @default 20
+        */
+        marginLeft: number;
+        /** Number of pixels between the container's right border and plot area. This space can be used for Right axis' values. If autoMargin is true and right side has axis, this property is ignored.
+            @default 20
+        */
+        marginRight: number;
+        /** Flag which should be set to false if you need margins to be recalculated on next chart.validateNow() call.
+            @default false
+        */
+        marginsUpdated: boolean;
+        /** Number of pixels between the container's top border and plot area. This space can be used for top axis' values. If autoMargin is true and top side has axis, this property is ignored.
+            @default 20
+        */
+        marginTop: number;
+        /** The opacity of plot area's border. Value range is 0 - 1.
+            @default 0
+         */
+        plotAreaBorderAlpha: number;
+        /** The color of the plot area's border. Note, the it is invisible by default, as plotAreaBorderAlpha default value is 0. Set it to a value higher than 0 to make it visible.
+            @default '#000000'*/
+        plotAreaBorderColor: string;
+        /** Opacity of plot area. Plural form is used to keep the same property names as our Flex charts'. Flex charts can accept array of numbers to generate gradients. Although you can set array here, only first value of this array will be used.
+            @default 0
+        */
+        plotAreaFillAlphas: number;
+        /** You can set both one color if you need a solid color or array of colors to generate gradients, for example: ["#000000", "#0000CC"]
+            @default '#FFFFFF'
+        */
+        plotAreaFillColors: any;
+        /** If you are using gradients to fill the plot area, you can use this property to set gradient angle. The only allowed values are horizontal and vertical: 0, 90, 180, 270.
+            @default 0
+        */
+        plotAreaGradientAngle: number;
+        /** Array of trend lines added to a chart. You can add trend lines to a chart using this array or access already existing trend lines */
+        trendLines: TrendLine[];
+        /** Opacity of zoom-out button background.
+            @default 0
+        */
+        zoomOutButtonAlpha: number;
+        /** Zoom-out button background color.
+            @default '#e5e5e5'
+        */
+        zoomOutButtonColor: string;
+        /** Name of zoom-out button image. In the images folder there is another lens image, called lensWhite.png. You might want to have white lens when background is dark. Or you can simply use your own image.
+            @default lens.png
+        */
+        zoomOutButtonImage: string;
+        /** Size of zoom-out button image
+            @default: 17
+        */
+        zoomOutButtonImageSize: number;
+        /** Padding around the text and image.
+            @default: 8
+        */
+        zoomOutButtonPadding: number;
+        /** Opacity of zoom-out button background when mouse is over it.
+            @default: 1
+        */
+        zoomOutButtonRollOverAlpha: number;
+        /** Text in the zoom-out button. Show all */
+        zoomOutText: string;
+
+        /** Adds a ChartCursor object to a chart */
+        addChartCursor(cursor: ChartCursor);
+        /** Adds a ChartScrollbar to a chart */
+        addChartScrollbar(scrollbar: ChartScrollbar);
+        /** Adds a TrendLine to a chart.
+            You should call chart.validateNow() after this method is called in order the trend line to be visible. */
+        addTrendLine(trendLine: TrendLine);
+        /** Removes cursor from the chart */
+        removeChartCursor();
+        /** Removes scrollbar from the chart */
+        removeChartScrollbar();
+        /** Removes a trend line from a chart.
+            You should call chart.validateNow() in order the changes to be visible. */
+        removeTrendLine(trendLine: TrendLine);
+    }
+
+    /* Trend lines are straight lines indicating trends, might also be used for some different purposes. Can be used by Serial and XY charts. To add/remove trend line, use chart.addTrendLine(trendLine)/chart.removeTrendLine(trendLine) methods or simply pass array of trend lines: chart.trendLines = [trendLine1, trendLine2].
+        @example
+            var trendLine = new AmCharts.TrendLine();
+            trendLine.initialDate = new Date(2012, 0, 2, 12); // 12 is hour - to start trend line in the middle of the day
+            trendLine.finalDate = new Date(2012, 0, 11, 12);
+            trendLine.initialValue = 10;
+            trendLine.finalValue = 19;
+            trendLine.lineColor = "#CC0000";
+            chart.addTrendLine(trendLine);
+    */
+    class TrendLine {
+
+    }
+
+    /** ChartCursor is a class which displays a cursor which follows the mouse. In case of Serial chart it also shows value and category balloons.
+        @example
+            var chart = new AmCharts.AmSerialChart();
+            var chartCursor = new AmCharts.ChartCursor();
+            chart.addChartCursor(chartCursor);
+    */
+    class ChartCursor {
+        /** Specifies if bullet for each graph will follow the cursor. */
+        bulletsEnabled: boolean;
+        /** Size of bullets, following the cursor.
+            @default 8
+        */
+        bulletSize: number;
+        /** Opacity of the category balloon.
+            @default 1
+        */
+        categoryBalloonAlpha: number;
+        /** Color of the category balloon. cursorColor is used if not set. */
+        categoryBalloonColor: string;
+        /** Category balloon date format (used only if category axis parses dates). Check this page for instructions on how to format dates. MMM DD, YYYY */
+        categoryBalloonDateFormat: string;
+        /** Specifies whether category balloon is enabled.
+            @default true
+        */
+        categoryBalloonEnabled: boolean;
+        /** Text color. #FFFFFF */
+        color: string;
+        /** Opacity of the cursor line.  1 */
+        cursorAlpha: number;
+        /** Color of the cursor line. #CC0000 */
+        cursorColor: string;
+        /** Specifies where the cursor line should be placed - on the beginning of the period (day, hour, etc) or in the middle (only when parseDates property of categoryAxis is set to true). If you want the cursor to follow mouse and not to glue to the nearest data point, set "mouse" here. Possible values are: "start", "middle", "mouse". */
+        cursorPosition: string;
+        /** Specifies whether cursor is enabled.
+            @default true
+        */
+        enabled: boolean;
+        /** If set to true, instead of a cursor line user will see a fill which width will always be equal to the width of one data item.
+        Recommend setting cursorAlpha to 0.1 or some other small number if using this feature.
+        @default false*/
+        fullWidth: boolean;
+        /** If this is set to true, only one balloon at a time will be displayed. Note, this is quite CPU consuming. */
+        oneBalloonOnly: boolean;
+        /** If this is set to true, the user will be able to pan the chart (Serial only) instead of zooming. */
+        pan: boolean;
+        /** Opacity of the selection. */
+        selectionAlpha: number;
+        /** Specifies if cursor should only mark selected area but not zoom-in after user releases mouse button. */
+        selectWithoutZooming: boolean;
+        /** Specifies whether value balloons are enabled. In case they are not, the balloons might be displayed anyway, when the user rolls-over the column or bullet.
+            @default true
+        */
+        valueBalloonsEnabled: boolean;
+        /** Specifies if the user can zoom-in the chart. If pan is set to true, zoomable is switched to false automatically.
+            @default true
+        */
+        zoomable: boolean;
+        /** Indicates if currently user is selecting some chart area to zoom-in. */
+        zooming: boolean;
+
+
+        /** Hides cursor. */
+        hideCursor();
+        /** You can force cursor to appear at specified cateogry or date. */
+        showCursorAt(category: string);
+        /** Adds event listener of the type "changed" to the object.
+            @param type Always "changed".
+            @param handler Dispatched when cursor position is changed. "index" is a series index over which chart cursors currently is. "zooming" specifies if user is currently zooming (is selecting) the chart. mostCloseGraph property is set only when oneBalloonOnly is set to true.*/
+        addListener(type: string, handler: (e: {/** Always "changed". */
+            type: string; index: number; zooming: boolean; mostCloseGraph: AmGraph; chart: AmChart;
+        }) => void );
+        /** Adds event listener of the type "onHideCursor" to the object.
+            @param type Always "onHideCursor".
+            @param handler Dispatched when cursor is hidden.*/
+        addListener(type: string, handler: (e: {/** Always "onHideCursor". */
+            type: string; chart: AmChart;
+        }) => void );
+        /** Adds event listener of the type "selected" or "zoomed" to the object.
+            @param type "selected" or "zoomed".
+            @param handler
+                If the type is "selected". Dispatched if selectWithoutZooming is set to true and when user selects some period. start and end are indices or timestamp (when categoryAxis.parseDates is true) of selection start/end.
+                If the type is "zoomed". Dispatched when user zooms to some period. start and end are indices or timestamp (when categoryAxis.parseDates is true) of selection start/end.
+        */
+        addListener(type: string, handler: (e: {/** Always "zoomed". */
+            type: string; index: number; zooming: boolean; chart: AmChart;
+        }) => void );
+
+        /** Removes event listener from chart object. */
+        removeListener(chart: AmChart, type: string, handler: any);
+    }
+
+    /** AmSerialChart is the class you have to use for majority of chart types. The supported chart types are: line, area, column, bar, step line, smoothed line, candlestick and OHLC. The chart can be rotated by 90 degrees so the column chart becomes bar chart. The chart supports simple and logarithmic scales, it can have multiple value axes. The chart can place data points at equal intervals or can parse dates and place data points at irregular intervals.
+        @example
+            var chartData = [{title:"sample 1",value:130},{title:"sample 2",value:26}];
+
+            var chart = new AmCharts.AmSerialChart();
+            chart.categoryField = "title";
+            chart.dataProvider = chartData;
+
+            var graph = new AmCharts.AmGraph();
+            graph.valueField = "value";
+            graph.type = "column";
+            graph.fillAlphas = 1;
+            chart.addGraph(graph);
+
+            chart.write("chartdiv");
+    */
+    class AmSerialChart extends AmRectangularChart {
+    	/** Date format of the graph balloon (if chart parses dates and you don't use chartCursor).
+            @default 'MMM DD, YYYY'
+        */
+        balloonDateFormat: string;
+        /** Read-only. Chart creates category axis itself. If you want to change some properties, you should get this axis from the chart and set properties to this object. */
+        categoryAxis: CategoryAxis;
+        /** Category field name tells the chart the name of the field in your dataProvider object which will be used for category axis values. */
+        categoryField: string;
+        /** The gap in pixels between two columns of the same category.
+            @default 5
+        */
+        columnSpacing: number;
+        /** Space between 3D stacked columns.
+            @default 0
+        */
+        columnSpacing3D: number;
+        /** Relative width of columns. Value range is 0 - 1.
+            @default 0.8
+        */
+        columnWidth: number;
+        /** Read-only. If category axis parses dates endDate indicates date to which the chart is currently displayed. */
+        endDate: Date;
+        /** Read-only. Category index to which the chart is currently displayed. */
+        endIndex: number;
+        /** Maximum number of series allowed to select. */
+        maxSelectedSeries: number;
+        /** The longest time span allowed to select (in milliseconds) for example, 259200000 will limit selection to 3 days. */
+        maxSelectedTime: number;
+        /** The shortest time span allowed to select (in milliseconds) for example, 1000 will limit selection to 1 second.
+            @default 0
+        */
+        minSelectedTime: number;
+        /** Specifies if scrolling of a chart with mouse wheel is enabled. If you press shift while rotating mouse wheel, the chart will zoom-in/out. */
+        mouseWheelScrollEnabled: boolean;
+        /** Specifies if zooming of a chart with mouse wheel is enabled. If you press shift while rotating mouse wheel, the chart will scroll. */
+        mouseWheelZoomEnabled: boolean;
+        /** If you set this to true, the chart will be rotated by 90 degrees (the columns will become bars). */
+        rotate: boolean;
+        /** Read-only. If category axis parses dates startDate indicates date from which the chart is currently displayed. */
+        startDate: Date;
+        /** Read-only. Category index from which the chart is currently displayed. */
+        startIndex: number;
+        /** Specifies if chart should zoom-out when data is updated.
+            @default true
+         */
+        zoomOutOnDataUpdate: boolean;
+
+        /** Number Returns index of the specified category value. value - series (category value) which index you want to find. */
+        getCategoryIndexByValue(value: number);
+        /** Zooms out, charts shows all available data. */
+        zoomOut();
+        /** Zooms the chart by the value of the category axis. start - category value, String \\ end - category value, String */
+        zoomToCategoryValues(start: Date, end: Date);
+        /** Zooms the chart from one date to another. start - start date, Date object \\ end - end date, Date object */
+        zoomToDates(start: Date, end: Date);
+        /** Zooms the chart by the index of the category. start - start index, Number \\ end - end index, Number */
+        zoomToIndexes(start: Date, end: Date);
+    }
+
+    class PeriodSelector {
+        /** Date format of date input fields. Check [[http://help.adobe.com/en_US/FlashPlatform/reference/actionscript/3/mx/formatters/DateFormatter.html DD-MM-YYYY */
+        dateFormat: string;
+        /** Text displayed next to "from" date input field. From: */
+        fromText: string;
+        /** Specifies if period buttons with date range bigger than available data should be hidden.
+            @default true
+        */
+        hideOutOfScopePeriods: boolean;
+        /** Specifies whether period selector displays "from" and "to" date input fields.
+            @default true
+        */
+        inputFieldsEnabled: boolean;
+        /** Width of date input fields, in pixels. Works only if period selector is horizontal.
+            @default 100
+        */
+        inputFieldWidth: number;
+        /** Array of predefined period objects. Period object has 4 properties - period, count, label and selected. Possible period values are: "ss" - seconds, "mm" - minutes, "hh" - hours, "DD" - days, "MM" - months and "YYYY" - years. property "count" specifies how many periods this button will select. "label" will be displayed on a button and "selected" is a boolean which specifies if this button is selected when chart is initialized or not. Example: {period:"DD", count:10, label:"10 days", selected:false}. */
+        periods: any[];
+        /** Text displayed next to predefined period buttons. Zoom: */
+        periodsText: string;
+        /** Possible values: "right", "left", "top", "bottom". bottom */
+        position: string;
+        /** Specifies whether predefined period buttons should select a period from the beginning or the end of the data. */
+        selectFromStart: boolean;
+        /** Text displayed next to "to" date input field. To: */
+        toText: string;
+        /** Width of a period selector, when position is "left" or "right".
+            @default 180
+        */
+        width: number;
+
+        /** Adds event listener to the object.
+       .
+@param handler - Dispatched when dates in period selector input fields are changed or user clicks on one of the predefined period buttons. */
+
+        addListener(type: string, handler: (e: {
+            /** Always: "changed" */
+
+            type: string;
+            startDate: Date;
+            endDate: Date;
+            predefinedPeriod: string;
+            count: number;
+        }) => void );
+
+        /** Removes event listener from chart object. */
+        removeListener(chart: AmChart, type: string, handler: any);
+    }
+
+    /** PanelsSettings settings set's settings for all StockPanels. If you change a property after the chart is initialized, you should call stockChart.validateNow() method in order for it to work. If there is no default value specified, default value of StockPanel class will be used. */
+
+    class PanelsSettings {
+        /** The angle of the 3D part of plot area. This creates a 3D effect (if the "depth3D" is > 0). */
+        angle: number;
+        /** Opacity of panel background. Possible values are 1 and 0. Values like 0.5 will not make it half-transparent. */
+        backgroundAlpha: number;
+        /** Background color of panels. Set backgroundAlpha to > 0 value in order to make background visible. #FFFFFF */
+        backgroundColor: string;
+        /** The gap in pixels between two columns of the same category. */
+        columnSpacing: number;
+        /** Relative width of columns. Valid values 0 - 1. */
+        columnWidth: number;
+        /** The depth of the 3D part of plot area. This creates a 3D effect (if the "angle" is > 0). */
+        depth3D: number;
+        /** Font family. */
+        fontFamily: string;
+        /** Font size. */
+        fontSize: string;
+        /** Number of pixels between the container's bottom border and plot area.
+            @default 1
+        */
+        marginBottom: number;
+        /** Number of pixels between the container's left border and plot area. If your left valueAxis values ar not placed inside the plot area, you should set marginLeft to 80 or some close value. */
+        marginLeft: number;
+        /** Number of pixels between the container's left border and plot area. If your right valueAxis values ar not placed inside the plot area, you should set marginRight to 80 or some close value. */
+        marginRight: number;
+        /** Number of pixels between the container's top border and plot area. */
+        marginTop: number;
+        /** Gap between panels.
+            @default 8
+        */
+        panelSpacing: number;
+        /** This setting affects touch-screen devices only. If a chart is on a page, and panEventsEnabled are set to true, the page won't move if the user touches the chart first. If a chart is big enough and occupies all the screen of your touch device, the user won’t be able to move the page at all. That's why the default value is "false". If you think that selecting or or panning the chart is a primary purpose of your chart users, you should set panEventsEnabled to true. */
+        panEventsEnabled: boolean;
+        /** The opacity of plot area's border. */
+        plotAreaBorderAlpha: number;
+        /** The color of the plot area's border. */
+        plotAreaBorderColor: string;
+        /** Opacity of plot area fill. */
+        plotAreaFillAlphas: number;
+        /** Specifies the colors used to tint the background gradient fill of the plot area. String or Array of Strings */
+        plotAreaFillColors: any;
+        /** Prefixes which are used to make big numbers shorter: 2M instead of 2000000, etc. Prefixes are used on value axes and in the legend. To enable prefixes, set usePrefixes property to true. [{number:1e+3,prefix:"k"},{number:1e+6,prefix:"M"},{number:1e+9,prefix:"G"},{number:1e+12,prefix:"T"},{number:1e+15,prefix:"P"},{number:1e+18,prefix:"E"},{number:1e+21,prefix:"Z"},{number:1e+24,prefix:"Y"}] */
+        prefixesOfBigNumbers: any[];
+        /** Prefixes which are used to make small numbers shorter: 2μ instead of 0.000002, etc. Prefixes are used on value axes and in the legend. To enable prefixes, set usePrefixes property to true. [{number:1e-24, prefix:"y"},{number:1e-21, prefix:"z"},{number:1e-18, prefix:"a"},{number:1e-15, prefix:"f"},{number:1e-12, prefix:"p"},{number:1e-9, prefix:"n"},{number:1e-6, prefix:"μ"},{number:1e-3, prefix:"m"}] */
+        prefixesOfSmallNumbers: any[];
+        /** Specifies whether the animation should be sequenced or all objects should appear at once. */
+        sequencedAnimation: boolean;
+        /** The initial opacity of the column/line. If you set startDuration to a value higher than 0, the columns/lines will fade in from startAlpha. */
+        startAlpha: number;
+        /** Duration of the animation, in seconds. */
+        startDuration: number;
+        /** Possible values are: "linear", "<", ">" "<>", "elastic", "bounce". */
+        startEffect: string;
+        /** If true, prefixes will be used for big and small numbers. */
+        usePrefixes: boolean;
+    }
+
+    /** DataSet is objects which holds all information about data. */
+
+    class DataSet {
+        /** Category field name in your dataProvider. */
+        categoryField: string;
+        /** Color of the data set. One of colors from AmStockChart.colors array will be used if not set. */
+        color: string;
+        /** Whether this data set is selected for comparing. If you change this property, you should call stockChart.validateData() method in order the changes to be applied. */
+        compared: boolean;
+        /** Data provider of the data set. */
+        dataProvider: any[];
+        /** Array of field mappings. Field mapping is an object with fromField and toField properties. fromField is a name of your value field in dataProvider. toField might be chosen freely, it will be used to set value/open/close/high/low fields for the StockGraph. Example: {fromField:"val1", toField:"value"}. */
+        fieldMappings: any[];
+        /** Specifies whether this data set should be visible in "compare to" list.
+            @default true
+        */
+        showInCompare: boolean;
+        /** Specifies whether this data set should be visible in "select" dropdown.
+            @default true
+         */
+        showInSelect: boolean;
+        /** Array of StockEvent objects. */
+        stockEvents: StockEvent[];
+        /** DataSet title. */
+        title: string;
+    }
+
+    class StockGraph extends AmGraph {
+        /** Specifies whether this graph will be compared if some data set is selected for comparing. */
+        comparable: boolean;
+        /** Specifies a field to be used to generate comparing graph. Note, this field is not the one used in your dataProvider, but toField from FieldMapping object. */
+        compareField: string;
+        /** Balloon color of comparing graph. */
+        compareGraphBalloonColor: string;
+        /** Balloon text of comparing graph. */
+        compareGraphBalloonText: string;
+        /** Bullet of comparing graph. Possible values are: "square", "round", "line", "triangleUp", "triangleDown", "dashedLine", "bubble". */
+        compareGraphBullet: string;
+        /** Bullet size of comparing graph. */
+        compareGraphBulletSize: number;
+        /** Corner radius of comparing graph (if type is "column"). */
+        compareGraphCornerRadiusTop: number;
+        /** Dash length of compare graph. */
+        compareGraphDashLength: number;
+        /** Fill alpha of comparing graph. */
+        compareGraphFillAlphas: number;
+        /** Fill color of comparing graph. */
+        compareGraphFillColors: string;
+        /** Opacity of comparing graph line. */
+        compareGraphLineAlpha: number;
+        /** Thickness of compare graph. */
+        compareGraphLineThickness: number;
+        /** Type of comparing graph. Possible values are: "line", "column", "step", "smoothedLine." line */
+        compareGraphType: string;
+        /** Specifies if compare graph is visible in legend.
+            @default true
+        */
+        compareGraphVisibleInLegend: boolean;
+        /** When data is grouped to periods, the graph must know which period value should be used. Possible values are: "Open", "Low", "High", "Close", "Average" and "Sum". Close */
+        periodValue: string;
+        /** Specifies whether data set color should be used as this graph's lineColor.
+            @default true
+        */
+        useDataSetColors: boolean;
+    }
+
+    /** StockEvent is object which holds information about event(bullet).Values from StockEventsSettings will be used if not set.Stock event bullet's size depends on it's graphs fontSize.When user rolls - over, clicks or rolls - out of the event bullet, AmStockChart dispatches events.*/
+    class StockEvent {
+        /** Opacity of bullet background.
+            @default 1
+        */
+        backgroundAlpha: number;
+        /** Color of bullet background. #DADADA */
+        backgroundColor: string;
+        /** Opacity of bullet border.
+            @default 1
+        */
+        borderAlpha: number;
+        /** Bullet border color. #888888 */
+        borderColor: string;
+        /** The color of the event text. #000000 */
+        color: string;
+        /** Date of an event. Must be Date object, not a string. */
+        date: Date;
+        /** graph on which event will be displayed. */
+        graph: StockGraph;
+        /** Roll-over background color. #CC0000 */
+        rollOverColor: string;
+        /** Specifies if the event should be displayed on category axis */
+        showOnAxis: boolean;
+        /** Letter which will be displayed on the event. Not all types can display letters. "text" type can display longer texts. */
+        text: string;
+        /** Type of bullet. Possible values are: "flag", "sign", "pin", "triangleUp", "triangleDown", "triangleLeft", "triangleRight", "text", "arrowUp", "arrowDown". sign */
+        type: string;
+        /** A URL to go to when user clicks the event. */
+        url: string;
+        /** target of url, "_blank" for example. */
+        urlTarget: string;
+    }
+
+    /** Creates a label on the chart which can be placed anywhere, multiple can be assigned. */
+    class Label {
+        /** @Default 'left' */
+        align: string;
+        /** @Default 1 */
+        alpha: number;
+        /** Specifies if label is bold or not. */
+        bold: boolean;
+        /** Color of a label */
+        color: string;
+        /** Unique id of a Label. You don't need to set it, unless you want to. */
+        id: string;
+        /** Rotation angle. */
+        rotation: number;
+        /** Text size */
+        size: number;
+        /** Text of a label */
+        text: string;
+        /** URL which will be access if user clicks on a label. */
+        url: string;
+        /** X position of a label. */
+        x: number|string;
+        /** y position of a label. */
+        y: number|string;
+    }
+    /** Common settings of legends. If you change a property after the chart is initialized, you should call stockChart.validateNow() method in order for it to work. If there is no default value specified, default value of StockLegend class will be used. */
+    class LegendSettings {
+        /** Alignment of legend entries. Possible values are: "left", "right" and "center". */
+        align: string;
+        /** Specifies if each legend entry should take the same space as the longest legend entry. */
+        equalWidths: boolean;
+        /** Horizontal space between legend item and left/right border. */
+        horizontalGap: number;
+        /** The text which will be displayed in the legend. Tag [[title]] will be replaced with the title of the graph. */
+        labelText: string;
+        /** Space below the last row of the legend, in pixels. */
+        marginBottom: number;
+        /** Space above the first row of the legend, in pixels. */
+        marginTop: number;
+        /** Opacity of marker border. */
+        markerBorderAlpha: number;
+        /** Marker border color. */
+        markerBorderColor: string;
+        /** Thickness of the legend border. */
+        markerBorderThickness: number;
+        /** The color of the disabled marker (when the graph is hidden). */
+        markerDisabledColor: string;
+        /** Space between legend marker and legend text, in pixels. */
+        markerLabelGap: number;
+        /** Size of the legend marker (key). */
+        markerSize: number;
+        /** Shape of the legend marker (key). Possible values are: "square", "circle", "line", "dashedLine", "triangleUp", "triangleDown", "bubble", "none". */
+        markerType: string;
+        /** Specifies whether legend entries should be placed in reversed order. */
+        reversedOrder: boolean;
+        /** Legend item text color on roll-over. */
+        rollOverColor: string;
+        /** When you roll-over the legend entry, all other graphs can reduce their opacity, so that the graph you rolled-over would be distinguished. This property specifies the opacity of the graphs. */
+        rollOverGraphAlpha: number;
+        /** Whether showing/hiding of graphs by clicking on the legend marker is enabled or not. */
+        switchable: boolean;
+        /** Legend switch color. */
+        switchColor: string;
+        /** Legend switch type (in case the legend is switchable). Possible values are: "x" and "v". */
+        switchType: string;
+        /** Specifies whether the legend text is clickable or not. Clicking on legend text can show/hide value balloons if they are enabled. */
+        textClickEnabled: boolean;
+        /** Specifies if legend labels should be use same color as corresponding markers. */
+        useMarkerColorForLabels: boolean;
+        /** The text which will be displayed in the value portion of the legend when graph is comparable and at least one dataSet is selected for comparing. You can use tags like [[value]], [[open]], [[high]], [[low]], [[close]], [[percents]], [[description]]. */
+        valueTextComparing: string;
+        /** The text which will be displayed in the value portion of the legend. You can use tags like [[value]], [[open]], [[high]], [[low]], [[close]], [[percents]], [[description]]. */
+        valueTextRegular: string;
+        /** Width of the value text. Increase this value if your values do not fit in the allocated space. */
+        valueWidth: number;
+        /** Vertical space between legend items, in pixels. */
+        verticalGap: number;
+
+    }
+
+    /** DataSetSelector is a tool for selecting data set's as main and for comparing with main data set. */
+    class DataSetSelector {
+        /** Text displayed in the "compare to" combobox (when position is "top" or "bottom"). Select... */
+        comboBoxSelectText: string;
+        /** Text displayed near "compare to" list. Compare to: */
+        compareText: string;
+        /** The maximum height of the Compare to field in pixels.
+            @default 150
+        */
+        listHeight: number;
+        /** Possible values: "right", "left", "top", "bottom". "top" and "bottom" positions has a limitation - only one data set can be selected for comparing. left */
+        position: string;
+        /** Text displayed near "Select" dropDown. Select: */
+        selectText: string;
+        /** Width of a Data set selector, when position is "left" or "right".
+            @default 180
+        */
+        width: number;
+    }
+
+    /** AmBalloon is the class which generates balloons (datatips). Balloon follows the mouse when you roll-over the pie slice/line bullet/column/etc, chart indicator of serial charts displays value balloons and category balloon. Balloon instance is created by the chart automatically and can be accessed via "balloon" property of AmChart. Chart shows/hides and sets position for every balloon automatically, so all you need to do is to change balloon appearance, if you want to.
+        @example
+            var chart = new AmCharts.AmSerialChart();
+            // get balloon intance
+            var balloon = chart.balloon;
+            // set properties
+            balloon.adjustBorderColor = true;
+            balloon.color = "#000000";
+            balloon.cornerRadius = 5;
+            balloon.fillColor = "#FFFFFF";
+    */
+    class AmBalloon {
+        /** If this is set to true, border color instead of background color will be changed when user rolls-over the slice, graph, etc. */
+        adjustBorderColor: boolean;
+        /** Balloon border opacity. Value range is 0 - 1.
+            @default 1
+        */
+        borderAlpha: number;
+        /** Balloon border color. #FFFFFF */
+        borderColor: string;
+        /** Balloon border thickness.
+            @default 2
+        */
+        borderThickness: number;
+        /** Color of text in the balloon. #FFFFFF */
+        color: string;
+        /** Balloon corner radius.
+            @default 6
+        */
+        cornerRadius: number;
+        /** Balloon background opacity.
+            @default 1
+        */
+        fillAlpha: number;
+        /** Balloon background color. Usually balloon background color is set by the chart. Only if "adjustBorderColor" is "true" this color will be used. #CC0000 */
+        fillColor: string;
+        /** Size of text in the balloon. Chart's fontSize is used by default. */
+        fontSize: string;
+        /** Horizontal padding of the balloon.
+            @default 8
+        3*/
+        horizontalPadding: number;
+        /** The width of the pointer (arrow) "root". Only used if cornerRadius is 0.
+            @default 10
+        */
+        pointerWidth: number;
+        /** If cornerRadius of a balloon is >0, showBullet is set to true for value balloons when ChartCursor is used. If you don't want the bullet near the balloon, set it to false: chart.balloon.showBullet = false */
+        showBullet: boolean;
+        /** Text alignment, possible values "left", "middle" and "right" middle */
+        textAlign: string;
+        /** Color of the text shadow. #000000 */
+        textShadowColor: string;
+        /** Vertical padding of the balloon.
+            @default 5
+        */
+        verticalPadding: number;
+        /** Hides balloon. */
+        hide();
+        /** Defines a square within which the balloon should appear. Bounds are set by chart class, you don't need to call this method yourself. */
+        setBounds(left: number, top: number, right: number, bottom: number);
+        /** Sets coordinates the balloon should point to. */
+        setPosition(x: number, y: number);
+        /** Specifies the text which should be displayed. */
+        show(value: string);
+    }
+
+    /** CategoryAxesSettings settings set's settings common for all CategoryAxes of StockPanels. If you change a property after the chart is initialized, you should call stockChart.validateNow() method in order for it to work. If there is no default value specified, default value of CategoryAxis class will be used. */
+    class CategoryAxesSettings {
+        /** Specifies whether number of gridCount is specified automatically, according to the axis size.
+            @default true
+        */
+        autoGridCount: boolean;
+        /** Axis opacity. */
+        axisAlpha: number;
+        /** Axis color. */
+        axisColor: string;
+        /** Height of category axes. Set it to 0 if you set inside property to true.
+            @default 28
+        */
+        axisHeight: number;
+        /** Thickness of the axis. */
+        axisThickness: number;
+        /** Text color. */
+        color: string;
+        /** Length of a dash. */
+        dashLength: number;
+        /** Date formats of different periods. Possible period values: fff - milliseconds, ss - seconds, mm - minutes, hh - hours, DD - days, MM - months, WW - weeks, YYYY - years. Check this page for date formatting strings. */
+        dateFormats: any[];
+        /** If you want data points to be placed at equal intervals (omiting dates with no data), set equalSpacing to true. */
+        equalSpacing: boolean;
+        /** Fill opacity. Every second space between grid lines can be filled with fillColor. */
+        fillAlpha: number;
+        /** Fill color. Every second space between grid lines can be filled with color. Set fillAlpha to a value greater than 0 to see the fills. */
+        fillColor: string;
+        /** Text size. */
+        fontSize: string;
+        /** Opacity of grid lines. */
+        gridAlpha: number;
+        /** Color of grid lines. */
+        gridColor: string;
+        /** Approximate number of grid lines. You should set autoGridCount to false in order this property not to be ignored.
+            @default 10
+        */
+        gridCount: number;
+        /** Thickness of grid lines. */
+        gridThickness: number;
+        /** Periods to which data will be gruoped in case there are more data items in the selected period than specified in maxSeries property. ["ss", "10ss", "30ss", "mm", "10mm", "30mm", "hh", "DD", "WW", "MM", "YYYY"] */
+        groupToPeriods: any[];
+        /** Specifies whether values should be placed inside or outside of plot area. */
+        inside: boolean;
+        /** Rotation angle of a label. */
+        labelRotation: number;
+        /** Maximum series shown at a time. In case there are more data points in the selection than maxSeries, the chart will group data to longer periods, for example - you have 250 days in the selection, and maxSeries is 150 - the chart will group data to weeks.
+            @default 150
+        */
+        maxSeries: number;
+        /** Specifies the shortest period of your data. fff - millisecond, ss - second, mm - minute, hh - hour, DD - day, MM - month, YYYY - year. DD */
+        minPeriod: string;
+        /** top or "bottom". */
+        position: string;
+        /** Specifies whether the graph should start on axis or not. In case you display columns, it is recommended to set this to false. startOnAxis can be set to true only if equalSpacing is set to true. */
+        startOnAxis: boolean;
+        /** Tick length. */
+        tickLength: number;
+    }
+
+    /** ChartCursorSettings settings set's settings for chart cursor. If you change a property after the chart is initialized, you should call stockChart.validateNow() method in order for it to work. If there is no default value specified, default value of ChartCursor class will be used. */
+    class ChartCursorSettings {
+        /** Specifies if bullet for each graph will follow the cursor. */
+        bulletsEnabled: boolean;
+        /** Size of bullets, following the cursor. */
+        bulletSize: number;
+        /** Opacity of the category balloon. */
+        categoryBalloonAlpha: number;
+        /** Color of the category balloon. */
+        categoryBalloonColor: string;
+        /** Array of date format objects. Date format object must have "period" and "format" items. Available periods are: fff - millisecond, ss - second, mm - minute, hh - hour, DD - date, WW - week, MM - month, YYYY - year. [{period:"YYYY", format:"YYYY"}, {period:"MM", format:"MMM, YYYY"}, {period:"WW", format:"MMM DD, YYYY"}, {period:"DD", format:"MMM DD, YYYY"}, {period:"hh", format:"JJ:NN"}, {period:"mm", format:"JJ:NN"}, {period:"ss", format:"JJ:NN:SS"}, {period:"fff", format:"JJ:NN:SS"}] */
+        categoryBalloonDateFormats: any[];
+        /** Specifies whether category balloon is enabled. */
+        categoryBalloonEnabled: boolean;
+        /** Opacity of the cursor line. */
+        cursorAlpha: number;
+        /** Color of the cursor line. */
+        cursorColor: string;
+        /** Possible values: "start", "middle" and "mouse". */
+        cursorPosition: string;
+        /** Set this to "false" if you don't want chart cursor to appear in your charts.
+            @default true
+        */
+        enabled: boolean;
+        /** If this is set to true, the user will be able to pan the chart instead of zooming. */
+        pan: boolean;
+        /** Specifies whether value balloons are enabled. In case they are not, the balloons might be displayed anyway, when the user rolls-over the column or bullet. */
+        valueBalloonsEnabled: boolean;
+        /** Specifies if the user can zoom-in the chart. If pan is set to true, zoomable is switched to false automatically. */
+        zoomable: boolean;
+    }
+
+    /* ChartScrollbarSettings settings set's settings for chart scrollbar. If you change a property after the chart is initialized, you should call stockChart.validateNow() method in order for it to work. If there is no default value specified, default value of ChartScrollbar class will be used.*/
+    class ChartScrollbarSettings {
+        /** Specifies whether number of gridCount is specified automatically, according to the axis size.
+            @default true
+        */
+        autoGridCount: boolean;
+        /** Background opacity. */
+        backgroundAlpha: number;
+        /** Background color of the scrollbar. */
+        backgroundColor: string;
+        /** Text color. */
+        color: string;
+        /** Set false if you don't need scrollbar.
+            @default true
+        */
+        enabled: boolean;
+        /** Font size. */
+        fontSize: string;
+        /** Specifies which graph will be displayed in the scrollbar. */
+        graph: AmGraph;
+        /** Graph fill opacity. */
+        graphFillAlpha: number;
+        /** Graph fill color. */
+        graphFillColor: string;
+        /** Graph line opacity. */
+        graphLineAlpha: number;
+        /** Graph line color. */
+        graphLineColor: string;
+        /** Type of chart scrollbar's graph. By default the graph type is the same as the original graph's type, however in case of candlestick or ohlc you might want to show line graph in the scrollbar. Possible values are: line, column, step, smoothedLine, candlestick, ohlc. */
+        graphType: string;
+        /** Grid opacity. */
+        gridAlpha: number;
+        /** Grid color. */
+        gridColor: string;
+        /** Grid count. You should set autoGridCount to false in order this property to work. */
+        gridCount: number;
+        /** Height of scrollbar, in pixels.
+            @default 40
+        */
+        height: number;
+        /** Specifies whether resize grips are hidden when mouse is away from the scrollbar. */
+        hideResizeGrips: boolean;
+        /** Duration of scrolling, when the user clicks on scrollbar's background, in seconds. */
+        scrollDuration: number;
+        /** Selected background opacity. */
+        selectedBackgroundAlpha: number;
+        /** Selected background color. */
+        selectedBackgroundColor: string;
+        /** Selected graph'sfill opacity. */
+        selectedGraphFillAlpha: number;
+        /** Selected graph'sfill color. */
+        selectedGraphFillColor: string;
+        /** Selected graph'sline opacity. */
+        selectedGraphLineAlpha: number;
+        /** Selected graph's line color. */
+        selectedGraphLineColor: string;
+        /** Specifies if the chart should be updated while dragging/resizing the scrollbar or only at the moment when user releases mouse button. Usefull when working with large data sets.
+            @default true
+        */
+        updateOnReleaseOnly: boolean;
+    }
+
+    /** AmGraph class displays all types of graphs - line, column, step line, smoothed line, ohlc and candlestick.
+        @example
+            var chart = new AmCharts.AmSerialChart();
+            var graph = new AmCharts.AmGraph();
+            graph.valueField = 'value';
+            graph.type = 'column';
+            graph.fillAlphas = 1;
+            chart.addGraph(graph);
+    */
+    class AmGraph {
+        /** Name of the alpha field in your dataProvider. */
+        alphaField: string;
+        /** Value balloon color. Will use graph or data item color if not set. */
+        balloonColor: string;
+        /**	If you set some function, the graph will call it and pass GraphDataItem and AmGraph object to it. This function should return a string which will be displayed in a balloon.  */
+        balloonFunction(graphDataItem: GraphDataItem, amGraph: AmGraph): string;
+        /** Balloon text. You can use tags like [[value]], [[description]], [[percents]], [[open]], [[category]] [[value]] */
+        balloonText: string;
+        /** Specifies if the line graph should be placed behind column graphs */
+        behindColumns: boolean;
+        /** Type of the bullets. Possible values are: "none", "round", "square", "triangleUp", "triangleDown", "bubble", "custom". none */
+        bullet: string;
+        /** Opacity of bullets. Value range is 0 - 1.
+            @default 1
+        */
+        bulletAlpha: number;
+        /** Bullet border opacity.
+            @default 1
+        */
+        bulletBorderAlpha: number;
+        /** Bullet border color. Will use lineColor if not set.   */
+        bulletBorderColor: string;
+        /** Bullet border thickness.
+            @default 2
+        */
+        bulletBorderThickness: number;
+        /** Bullet color. Will use lineColor if not set. */
+        bulletColor: string;
+        /** Name of the bullet field in your dataProvider. */
+        bulletField: string;
+        /** Bullet offset. Distance from the actual data point to the bullet. Can be used to place custom bullets above the columns. */
+        bulletOffset: number;
+        /** Bullet size.
+            @default 8
+        */
+        bulletSize: number;
+        /** Name of the bullet size field in your dataProvider. */
+        bulletSizeField: string;
+        /** Name of the close field (used by candlesticks and ohlc) in your dataProvider. */
+        closeField: string;
+        /** Color of value labels. Will use chart's color if not set. */
+        color: string;
+        /** Name of the color field in your dataProvider. */
+        colorField: string;
+        /** Specifies whether to connect data points if data is missing. The default value is true.
+            @default true
+        */
+        connect: boolean;
+        /** Corner radius of column. It can be set both in pixels or in percents. The chart's depth and angle styles must be set to 0. The default value is 0. Note, cornerRadiusTop will be applied for all corners of the column, JavaScript charts do not have a possibility to set separate corner radius for top and bottom. As we want all the property names to be the same both on JS and Flex, we didn't change this too. */
+        cornerRadiusTop: number;
+        /** If bulletsEnabled of ChartCurosor is true, a bullet on each graph follows the cursor. You can set opacity of each graphs bullet. In case you want to disable these bullets for a certain graph, set opacity to 0.
+            @default 1
+        */
+        cursorBulletAlpha: number;
+        /** Path to the image of custom bullet. */
+        customBullet: string;
+        /** Name of the custom bullet field in your dataProvider. */
+        customBulletField: string;
+        /** Dash length. If you set it to a value greater than 0, the graph line will be dashed. */
+        dashLength: number;
+        /** Name of the description field in your dataProvider. */
+        descriptionField: string;
+        /** Opacity of fill. Plural form is used to keep the same property names as our Flex charts'. Flex charts can accept array of numbers to generate gradients. Although you can set array here, only first value of this array will be used. */
+        fillAlphas: number;
+        /** Fill color. Will use lineColor if not set. */
+        fillColors: any;
+        /** Name of the fill colors field in your dataProvider. */
+        fillColorsField: string;
+        /** You can set another graph here and if fillAlpha is >0, the area from this graph to fillToGraph will be filled (instead of filling the area to the X axis). */
+        fillToGraph: AmGraph;
+        /** Size of value labels text. Will use chart's fontSize if not set. */
+        fontSize: string;
+        /** Orientation of the gradient fills (only for "column" graph type). Possible values are "vertical" and "horizontal". vertical */
+        gradientOrientation: string;
+        /** Specifies whether the graph is hidden. Do not use this to show/hide the graph, use hideGraph(graph) and showGraph(graph) methods instead. */
+        hidden: boolean;
+        /** If there are more data points than hideBulletsCount, the bullets will not be shown. 0 means the bullets will always be visible. */
+        hideBulletsCount: number;
+        /** Name of the high field (used by candlesticks and ohlc) in your dataProvider. */
+        highField: string;
+        /** Whether to include this graph when calculating min and max value of the axis.
+            @default true
+        */
+        includeInMinMax: boolean;
+        /** Name of label color field in data provider. */
+        labelColorField: string;
+        /** Position of value label. Possible values are: "bottom", "top", "right", "left", "inside", "middle". Sometimes position is changed by the chart, depending on a graph type, rotation, etc. top */
+        labelPosition: string;
+        /** Value label text. You can use tags like [[value]], [[description]], [[percents]], [[open]], [[category]]. */
+        labelText: string;
+        /** Legend marker opacity. Will use lineAlpha if not set. Value range is 0 - 1. */
+        legendAlpha: number;
+        /** Legend marker color. Will use lineColor if not set. */
+        legendColor: string;
+        /** Legend value text. You can use tags like [[value]], [[description]], [[percents]], [[open]], [[category]] You can also use custom fields from your dataProvider. If not set, uses Legend's valueText. */
+        legendValueText: string;
+        /** Opacity of the line (or column border). Value range is 0 - 1.
+            @default 1
+        */
+        lineAlpha: number;
+        /** Color of the line (or column border). If you do not set any, the color from [[AmCoordinateChart */
+        lineColor: string;
+        /** Name of the line color field (used by columns and candlesticks only) in your dataProvider. */
+        lineColorField: string;
+        /** Specifies thickness of the graph line (or column border).
+            @default 1
+        */
+        lineThickness: number;
+        /** Name of the low field (used by candlesticks and ohlc) in your dataProvider. */
+        lowField: string;
+        /** Legend marker type. You can set legend marker (key) type for individual graphs. Possible values are: "square", "circle", "line", "dashedLine", "triangleUp", "triangleDown", "bubble". */
+        markerType: string;
+        /** Specifies size of the bullet which value is the biggest (XY chart).
+            @default 50
+        */
+        maxBulletSize: number;
+        /** Specifies minimum size of the bullet (XY chart). */
+        minBulletSize: number;
+        /** If you use different colors for your negative values, a graph below zero line is filled with negativeColor. With this property you can define a different base value at which colors should be changed to negative colors. */
+        negativeBase: number;
+        /** Fill opacity of negative part of the graph. Will use fillAlphas if not set. */
+        negativeFillAlphas: number;
+        /** Fill color of negative part of the graph. Will use fillColors if not set. */
+        negativeFillColors: any; //String /Array;
+        /** Color of the line (or column) when the values are negative. In case the graph type is candlestick or ohlc, negativeLineColor is used when close value is less then open value. */
+        negativeLineColor: string;
+        /** Example: {precision:-1, decimalSeparator:'.', thousandsSeparator:','}. The graph uses this object's values to format the numbers. Uses chart's numberFormatter if not defined. */
+        numberFormatter: Object;
+        /** Name of the open field (used by floating columns, candlesticks and ohlc) in your dataProvider. */
+        openField: string;
+        /** Specifies where data points should be placed - on the beginning of the period (day, hour, etc) or in the middle (only when parseDates property of categoryAxis is set to true). This setting affects Serial chart only. Possible values are "start" and "middle". middle */
+        pointPosition: string;
+        /** If graph's type is column and labelText is set, graph hides labels which do not fit into the column's space. If you don't want these labels to be hidden, set this to true. */
+        showAllValueLabels: boolean;
+        /** Specifies whether the value balloon of this graph is shown when mouse is over data item or chart's indicator is over some series.
+            @default true
+        */
+        showBalloon: boolean;
+        /** Specifies graphs value at which cursor is showed. This is only important for candlestick and ohlc charts, also if column chart has "open" value. Possible values are: "open", "close", "high", "low". close */
+        showBalloonAt: string;
+        /** If the value axis of this graph has stack types like "regular" or "100%" You can exclude this graph from stacking.
+            @default true
+        */
+        stackable: boolean;
+        /** Graph title. */
+        title: string;
+        /** Type of the graph. Possible values are: "line", "column", "step", "smoothedLine", "candlestick", "ohlc". XY and Radar charts can only display "line" type graphs. line */
+        type: string;
+        /** Name of the url field in your dataProvider. */
+        urlField: string;
+        /** Target to open URLs in, i.e. _blank, _top, etc. */
+        urlTarget: string;
+        /** Specifies which value axis the graph will use. Will use the first value axis if not set. */
+        valueAxis: ValueAxis;
+        /** Name of the value field in your dataProvider. */
+        valueField: string;
+        /** Specifies whether this graph should be shown in the Legend.
+            @default true
+        */
+        visibleInLegend: boolean;
+        /** XY chart only. A horizontal value axis object to attach graph to. */
+        xAxis: ValueAxis;
+        /** XY chart only. Name of the x field in your dataProvider. */
+        xField: string;
+        /** XY chart only. A vertical value axis object to attach graph to. */
+        yAxis: ValueAxis;
+        /** XY chart only. Name of the y field in your dataProvider. */
+        yField: string;
+    }
+
+    /** AxisBase is the base class for ValueAxis and CategoryAxis. It can not be instantiated explicitly. */
+    class AxisBase {
+        /** Specifies whether number of gridCount is specified automatically, acoarding to the axis size.
+            @default true
+        */
+        autoGridCount: boolean;
+        /** Axis opacity. Value range is 0 - 1.
+            @default 1
+        */
+        axisAlpha: number;
+        /** Axis color.  #000000 */
+        axisColor: string;
+        /** Thickness of the axis.
+            @default 1
+        */
+        axisThickness: number;
+        /** Color of axis value labels. Will use chart's color if not set. */
+        color: string;
+        /** Length of a dash. 0 means line is not dashed. */
+        dashLength: number;
+        /** Fill opacity. Every second space between grid lines can be filled with color. Set fillAlpha to a value greater than 0 to see the fills.  */
+        fillAlpha: number;
+        /** Fill color. Every second space between grid lines can be filled with color. Set fillAlpha to a value greater than 0 to see the fills. #FFFFFF */
+        fillColor: string;
+        /** Size of value labels text. Will use chart's fontSize if not set. */
+        fontSize: string;
+        /** Opacity of grid lines. 0.2 */
+        gridAlpha: number;
+        /** Color of grid lines. #000000 */
+        gridColor: string;
+        /** Number of grid lines. In case this is value axis, or your categoryAxis parses dates, the number is approximate. The default value is 5. If you set autoGridCount to true, this property is ignored.
+            @default 5
+        */
+        gridCount: number;
+        /** Thickness of grid lines.
+            @default 1
+        */
+        gridThickness: number;
+        /** The array of guides belonging to this axis. */
+        guides: any[];
+        /** If autoMargins of a chart is set to true, but you want this axis not to be measured when calculating margin, set ignoreAxisWidth to true.  */
+        ignoreAxisWidth: boolean;
+        /** Specifies whether values should be placed inside or outside plot area. */
+        inside: boolean;
+        /** Frequency at which labels should be placed. Doesn't work for CategoryAxis if parseDates is set to true.
+            @default 1
+        */
+        labelFrequency: number;
+        /** Rotation angle of a label. Only horizontal axis' values can be rotated. If you set this for vertical axis, the setting will be ignored. */
+        labelRotation: number;
+        /** Specifies whether axis displays category axis' labels and value axis' values.
+            @default true
+        */
+        labelsEnabled: boolean;
+        /** The distance of the axis to the plot area, in pixels. Negative values can also be used.  */
+        offset: number;
+        /** Possible values are: "top", "bottom", "left", "right". If axis is vertical, default position is "left". If axis is horizontal, default position is "bottom".  */
+        position: string;
+        /** Whether to show first axis label or not.
+            @default true
+        */
+        showFirstLabel: boolean;
+        /** Whether to show last axis label or not.
+            @default true
+        */
+        showLastLabel: boolean;
+        /** Length of the tick marks.
+            @default 5
+        */
+        tickLength: number;
+        /** Title of the axis. */
+        title: string;
+        /** Specifies if title should be bold or not.
+            @default true
+        */
+        titleBold: boolean;
+        /** Color of axis title. Will use text color of chart if not set any. */
+        titleColor: string;
+        /** Font size of axis title. Will use font size of chart plus two pixels if not set any. */
+        titlefontSize: string;
+
+        /** Adds guide to the axis. */
+        addGuide(guide:Guide);
+        /** Removes guide from the axis. */
+        removeGuide(guide:Guide);
+    }
+
+    /** ValueAxis is the class which displays value axis for the chart. The chart can have any number of value axes. For Serial chart one value axis is created automatically. For XY Chart two value axes (horizontal and vertical) are created automatically. */
+    class ValueAxis extends AxisBase {
+        /** Radar chart only. Specifies distance from axis to the axis title (category)  10 */
+        axisTitleOffset: number;
+        /** Read-only. Coordinate of the base value. */
+        baseCoord: number;
+        /** Specifies base value of the axis. */
+        baseValue: number;
+        /** If your values represents time units, and you want value axis labels to be formatted as duration, you have to set the duration unit. Possible values are: "ss", "mm", "hh" and "DD". */
+        duration: string;
+        /** If duration property is set, you can specify what string should be displayed next to day, hour, minute and second. {DD:"d. ", hh:":", mm:":",ss:""} */
+        durationUnits: Object;
+        /** Radar chart only. Possible values are: "polygons" and "circles". Set "circles" for polar charts. polygons */
+        gridType: string;
+        /** Unique id of value axis. It is not required to set it, unless you need to tell the graph which exact value axis it should use. */
+        id: string;
+        /** Specifies whether guide values should be included when calculating min and max of the axis. */
+        includeGuidesInMinMax: boolean;
+        /** If true, the axis will include hidden graphs when calculating min and max values. */
+        includeHidden: boolean;
+        /** Specifies whether values on axis can only be integers or both integers and doubles. */
+        integersOnly: boolean;
+        /** You can use this function to format Value axis labels. This function is called and these parameters are passed: labelFunction(value, valueText, valueAxis);
+Where value is numeric value, valueText is formatted string and valueAxis is a reference to valueAxis object.
+
+If axis type is "date", labelFunction will pass different arguments:
+labelFunction(valueText, date, valueAxis)
+
+Your function should return string.*/
+        labelFunction(value: number, valueText: string, valueAxis: ValueAxis): string;
+        labelFunction(valueText: string, data: Date, valueAxis: ValueAxis): string;
+        /** Specifies if this value axis' scale should be logarithmic. */
+        logarithmic: boolean;
+        /** Read-only. Maximum value of the axis. */
+        max: number;
+        /** If you don't want max value to be calculated by the chart, set it using this property. This value might still be adjusted so that it would be possible to draw grid at rounded intervals. */
+        maximum: number;
+        /** If your value axis is date-based, you can specify maximum date of the axis. Can be set as date object, timestamp number or string if dataDateFormat is set. */
+        maximumData: Date;
+        /** Read-only. Minimum value of the axis. */
+        min: number;
+        /** If you don't want min value to be calculated by the chart, set it using this property. This value might still be adjusted so that it would be possible to draw grid at rounded intervals. */
+        minimum: number;
+        /** If your value axis is date-based, you can specify minimum date of the axis. Can be set as date object, timestamp number or string if dataDateFormat is set. */
+        minimumDate: Date;
+        /** If set value axis scale (min and max numbers) will be multiplied by it. I.e. if set to 1.2 the scope of values will increase by 20%. */
+        minMaxMultiplier: number;
+        /** Works with radar charts only. If you set it to “middle”, labels and data points will be placed in the middle between axes. */
+        pointPosition: string;
+        /** Possible values are: "top", "bottom", "left", "right". If axis is vertical, default position is "left". If axis is horizontal, default position is "bottom". */
+        position: string;
+        /** Precision (number of decimals) of values. */
+        precision: number;
+        /** Radar chart only. Specifies if categories (axes' titles) should be displayed near axes)
+            @default true
+        */
+        radarCategoriesEnabled: boolean;
+        /** pecifies if graphs's values should be recalculated to percents. */
+        recalculateToPercents: boolean;
+        /** Specifies if value axis should be reversed (smaller values on top).  */
+        reversed: boolean;
+        /** Stacking mode of the axis. Possible values are: "none", "regular", "100%", "3d". none Note, only graphs of one type will be stacked. */
+        stackType: string;
+        /** Read-only. Value difference between two grid lines. */
+        step: number;
+        /** If you set minimum and maximum for your axis, chart adjusts them so that grid would start and end on the beginning and end of plot area and grid would be at equal intervals. If you set strictMinMax to true, the chart will not adjust minimum and maximum of value axis. */
+        strictMinMax: boolean;
+        /** In case you synchronize one value axis with another, you need to set the synchronization multiplier. Use synchronizeWithAxis method to set with which axis it should be synced. */
+        synchronizationMultiplier: number;
+        /** One value axis can be synchronized with another value axis. You can use both reference to your axis or id of the axis here. You should set synchronizationMultiplyer in order for this to work. */
+        synchronizeWith: ValueAxis;
+        /** If this value axis is stacked and has columns, setting valueAxis.totalText = "[[total]]" will make it to display total value above the most-top column. */
+        totalText: string;
+        /** Color of total text. */
+        totalTextColor: string;
+        /** Distance from data point to total text. */
+        totalTextOffset: number;
+        /** This allows you to have logarithmic value axis and have zero values in the data. You must set it to >0 value in order to work. */
+        treatZeroAs: number;
+        /** Type of value axis. If your values in data provider are dates and you want this axis to show dates instead of numbers, set it to "date". */
+        type: string;
+        /** Unit which will be added to the value label. */
+        unit: string;
+        /** Position of the unit. Possible values are "left" and "right". right */
+        unitPosition: string;
+        /** If true, prefixes will be used for big and small numbers. You can set arrays of prefixes directly to the chart object via prefixesOfSmallNumbers and prefixesOfBigNumbers. */
+        usePrefixes: boolean;
+        /** If true, values will always be formatted using scientific notation (5e+8, 5e-8...) Otherwise only values bigger then 1e+21 and smaller then 1e-7 will be displayed in scientific notation. */
+        useScientificNotation: boolean;
+
+        /** Adds guide to the axis. */
+        addGuide(guide: Guide);
+        /** Adds event listener to the object.  type - string like 'axisChanged' (should be listed in 'events' section of this class or classes which extend this class). handler - function which is called when event happens */
+        addListener(type: string, handler: any);
+        /** Number, - value of coordinate. Returns value of the coordinate.  coordinate - y or x coordinate, in pixels. */
+        coordinateToValue(coordinate: number);
+        /** Number - coordinate Returns coordinate of the value in pixels. value - Number */
+        getCoordinate(value: number);
+        /** Removes guide from the axis.*/
+        removeGuide(guide: Guide);
+        /** Removes event listener from the object. */
+        removeListener(obj: any, type: string, handler: any);
+
+        /** One value axis can be synchronized with another value axis. You should set synchronizationMultiplyer in order for this to work. */
+        synchronizeWithAxis(axis:ValueAxis);
+        /** XY Chart only. Zooms-in the axis to the provided values. */
+        zoomToValues(startValue: number, endValue: number);
+
+        /** Adds event listener of the type "axisZoomed" to the object.
+            @param type Always "axisZoomed".
+            @param handler XY chart only. Dispatched when axis is zoomed.*/
+        addListener(type: string, handler: (e: {
+            /** Always "axisZoomed". */
+            type: string; startValue: Date; endValue: Date; chart: AmChart;
+        }) => void );
+        /** Adds event listener of the type "logarithmicAxisFailed" to the object.
+            @param type Always "logarithmicAxisFailed".
+            @param handler Dispatched when valueAxis is logarithmic and values equal or less then zero were found in data.*/
+        addListener(type: string, handler: (e: {
+            /** Always "logarithmicAxisFailed". */
+            type: string; chart: AmChart;
+        }) => void );
+
+        /** Removes event listener from chart object. */
+        removeListener(chart: AmChart, type: string, handler: any);
+    }
+
+    class Title {
+        /** @default 1 */
+        alpha: number;
+        /** Specifies if the tile is bold or not.
+            @default false*/
+        bold: boolean;
+        /** Text color of a title. */
+        color: string;
+        /** Unique id of a Title. You don't need to set it, unless you want to. */
+        id: string;
+        /** Text size */
+        size: number;
+        /** Text of a label */
+        text: string;
+    }
+    class ExportSettings {
+        enabled: boolean;
+        libs: Object;
+        menu: Object;
+    }
+}
diff --git a/amcharts/tsconfig.json b/amcharts/tsconfig.json
new file mode 100644
index 0000000000..af6755830c
--- /dev/null
+++ b/amcharts/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/amplify-deferred/amplify-deferred-tests.ts b/amplify-deferred/amplify-deferred-tests.ts
index 957941cd29..9482a8ef02 100644
--- a/amplify-deferred/amplify-deferred-tests.ts
+++ b/amplify-deferred/amplify-deferred-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="amplify-deferred.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+
+/// <reference types="jquery" />
 
 // Copied examples directly from AmplifyJs site
 
diff --git a/amplify-deferred/amplify-deferred-tests.ts.tscparams b/amplify-deferred/amplify-deferred-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/amplify-deferred/amplify-deferred-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/amplify-deferred/amplify-deferred.d.ts b/amplify-deferred/amplify-deferred.d.ts
deleted file mode 100644
index b8c1142899..0000000000
--- a/amplify-deferred/amplify-deferred.d.ts
+++ /dev/null
@@ -1,182 +0,0 @@
-// Type definitions for AmplifyJs 1.1.0 using JQuery Deferred
-// Project: http://amplifyjs.com/
-// Definitions by: Jonas Eriksson <https://github.com/joeriks/>, Laurentiu Stamate <https://github.com/laurentiustamate94>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface amplifyRequestSettings {
-    resourceId: string;
-    data?: any;
-    success?: (...args: any[]) => void;
-    error?: (...args: any[]) => void;
-}
-
-interface amplifyDecoder {
-    (
-        data?: any,
-        status?: string,
-        xhr?: JQueryXHR,
-        success?: (...args: any[]) => void,
-        error?: (...args: any[]) => void
-        ): void
-}
-
-interface amplifyDecoders {
-    [decoderName: string]: amplifyDecoder;
-    jsSend: amplifyDecoder;
-}
-
-interface amplifyAjaxSettings extends JQueryAjaxSettings {
-    cache?: any;
-    dataMap?: {} | ((data: any) => {});
-    decoder?: any /* string or amplifyDecoder */;
-}
-
-interface amplifyRequest {
-
-    /***
-    * Request a resource.
-    * resourceId: Identifier string for the resource.
-    * data: A set of key/value pairs of data to be sent to the resource.
-    * callback: A function to invoke if the resource is retrieved successfully.
-    */
-    (resourceId: string, hash?: any, callback?: Function): JQueryPromise<any>;
-
-    /***
-    * Request a resource.
-    * settings: A set of key/value pairs of settings for the request.
-    *   resourceId: Identifier string for the resource.
-    *   data (optional): Data associated with the request.
-    *   success (optional): Function to invoke on success.
-    *   error (optional): Function to invoke on error.
-    */
-    (settings: amplifyRequestSettings): JQueryPromise<any>;
-
-    /***
-    * Define a resource.
-    * resourceId: Identifier string for the resource.
-    * requestType: The type of data retrieval method from the server. See the request types sections for more information.
-    * settings: A set of key/value pairs that relate to the server communication technology. The following settings are available:
-    *   Any settings found in jQuery.ajax().
-    *   cache: See the cache section for more details.
-    *   decoder: See the decoder section for more details.
-    */
-    define(resourceId: string, requestType: string, settings?: amplifyAjaxSettings): void;
-
-    /***
-    * Define a custom request.
-    * resourceId: Identifier string for the resource.
-    * resource: Function to handle requests. Receives a hash with the following properties:
-    *   resourceId: Identifier string for the resource.
-    *   data: Data provided by the user.
-    *   success: Callback to invoke on success.
-    *   error: Callback to invoke on error.
-    */
-    define(resourceId: string, resource: (settings: amplifyRequestSettings) => void): void;
-
-    decoders: amplifyDecoders;
-    cache: any;
-}
-
-interface amplifySubscribe {
-    /***
-    * Subscribe to a message.
-    * topic: Name of the message to subscribe to.
-    * callback: Function to invoke when the message is published.
-    */
-    (topic: string, callback: Function): void;
-    /***
-    * Subscribe to a message.
-    * topic: Name of the message to subscribe to.
-    * context: What this will be when the callback is invoked.
-    * callback: Function to invoke when the message is published.
-    * [priority]: Priority relative to other subscriptions for the same message. Lower values have higher priority. Default is 10.
-    */
-    (topic: string, context: any, callback: Function, priority?: number): void;
-    /***
-    * Subscribe to a message.
-    * topic: Name of the message to subscribe to.
-    * callback: Function to invoke when the message is published.
-    * [priority]: Priority relative to other subscriptions for the same message. Lower values have higher priority. Default is 10.
-    */
-    (topic: string, callback: Function, priority?: number): void;
-}
-interface amplifyStorageTypeStore {
-    /***
-    * Stores a value for a given key using the default storage type.
-    * 
-    * key: Identifier for the value being stored.
-    * value: The value to store. The value can be anything that can be serialized as JSON.
-    * [options]: A set of key/value pairs that relate to settings for storing the value.
-    */
-    (key: string, value: any, options?: any): void;
-
-    /***
-    * Gets a stored value based on the key.
-    */
-    (key: string): any;
-
-    /***
-    * Gets a hash of all stored values.
-    */
-    (): any;
-}
-
-interface amplifyStore extends amplifyStorageTypeStore {
-
-    /*** 
-    * IE 8+, Firefox 3.5+, Safari 4+, Chrome, Opera 10.5+, iPhone 2+, Android 2+
-    */
-    localStorage: amplifyStorageTypeStore;
-
-    /*** 
-    * IE 8+, Firefox 2+, Safari 4+, Chrome, Opera 10.5+, iPhone 2+, Android 2+
-    */
-    sessionStorage: amplifyStorageTypeStore;
-
-    /***
-    * Firefox 2+
-    */
-    globalStorage: amplifyStorageTypeStore;
-    
-    /***
-    * IE 5 - 7
-    */
-    userData: amplifyStorageTypeStore;
-
-    /***
-    * An in-memory store is provided as a fallback if none of the other storage types are available.
-    */
-    memory: amplifyStorageTypeStore;
-
-
-}
-
-interface amplifyStatic {
-
-    subscribe: amplifySubscribe;
-
-    /***
-    * Remove a subscription.
-    * topic: The topic being unsubscribed from.
-    * callback: The callback that was originally subscribed.
-    */
-    unsubscribe(topic: string, callback: Function): void;
-
-    /***
-    * Publish a message.
-    * topic: The name of the message to publish.
-    * Any additional parameters will be passed to the subscriptions.
-    * amplify.publish returns a boolean indicating whether any subscriptions returned false. The return value is true if none of the subscriptions returned false, and false otherwise. Note that only one subscription can return false because doing so will prevent additional subscriptions from being invoked.
-    */
-    publish(topic: string, ...args: any[]): boolean;
-
-    store: amplifyStore;
-
-    request: amplifyRequest;
-
-}
-
-declare var amplify: amplifyStatic;
-
diff --git a/amplify-deferred/index.d.ts b/amplify-deferred/index.d.ts
new file mode 100644
index 0000000000..3736a6644b
--- /dev/null
+++ b/amplify-deferred/index.d.ts
@@ -0,0 +1,182 @@
+// Type definitions for AmplifyJs 1.1.0 using JQuery Deferred
+// Project: http://amplifyjs.com/
+// Definitions by: Jonas Eriksson <https://github.com/joeriks/>, Laurentiu Stamate <https://github.com/laurentiustamate94>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface amplifyRequestSettings {
+    resourceId: string;
+    data?: any;
+    success?: (...args: any[]) => void;
+    error?: (...args: any[]) => void;
+}
+
+interface amplifyDecoder {
+    (
+        data?: any,
+        status?: string,
+        xhr?: JQueryXHR,
+        success?: (...args: any[]) => void,
+        error?: (...args: any[]) => void
+        ): void
+}
+
+interface amplifyDecoders {
+    [decoderName: string]: amplifyDecoder;
+    jsSend: amplifyDecoder;
+}
+
+interface amplifyAjaxSettings extends JQueryAjaxSettings {
+    cache?: any;
+    dataMap?: {} | ((data: any) => {});
+    decoder?: any /* string or amplifyDecoder */;
+}
+
+interface amplifyRequest {
+
+    /***
+    * Request a resource.
+    * resourceId: Identifier string for the resource.
+    * data: A set of key/value pairs of data to be sent to the resource.
+    * callback: A function to invoke if the resource is retrieved successfully.
+    */
+    (resourceId: string, hash?: any, callback?: Function): JQueryPromise<any>;
+
+    /***
+    * Request a resource.
+    * settings: A set of key/value pairs of settings for the request.
+    *   resourceId: Identifier string for the resource.
+    *   data (optional): Data associated with the request.
+    *   success (optional): Function to invoke on success.
+    *   error (optional): Function to invoke on error.
+    */
+    (settings: amplifyRequestSettings): JQueryPromise<any>;
+
+    /***
+    * Define a resource.
+    * resourceId: Identifier string for the resource.
+    * requestType: The type of data retrieval method from the server. See the request types sections for more information.
+    * settings: A set of key/value pairs that relate to the server communication technology. The following settings are available:
+    *   Any settings found in jQuery.ajax().
+    *   cache: See the cache section for more details.
+    *   decoder: See the decoder section for more details.
+    */
+    define(resourceId: string, requestType: string, settings?: amplifyAjaxSettings): void;
+
+    /***
+    * Define a custom request.
+    * resourceId: Identifier string for the resource.
+    * resource: Function to handle requests. Receives a hash with the following properties:
+    *   resourceId: Identifier string for the resource.
+    *   data: Data provided by the user.
+    *   success: Callback to invoke on success.
+    *   error: Callback to invoke on error.
+    */
+    define(resourceId: string, resource: (settings: amplifyRequestSettings) => void): void;
+
+    decoders: amplifyDecoders;
+    cache: any;
+}
+
+interface amplifySubscribe {
+    /***
+    * Subscribe to a message.
+    * topic: Name of the message to subscribe to.
+    * callback: Function to invoke when the message is published.
+    */
+    (topic: string, callback: Function): void;
+    /***
+    * Subscribe to a message.
+    * topic: Name of the message to subscribe to.
+    * context: What this will be when the callback is invoked.
+    * callback: Function to invoke when the message is published.
+    * [priority]: Priority relative to other subscriptions for the same message. Lower values have higher priority. Default is 10.
+    */
+    (topic: string, context: any, callback: Function, priority?: number): void;
+    /***
+    * Subscribe to a message.
+    * topic: Name of the message to subscribe to.
+    * callback: Function to invoke when the message is published.
+    * [priority]: Priority relative to other subscriptions for the same message. Lower values have higher priority. Default is 10.
+    */
+    (topic: string, callback: Function, priority?: number): void;
+}
+interface amplifyStorageTypeStore {
+    /***
+    * Stores a value for a given key using the default storage type.
+    * 
+    * key: Identifier for the value being stored.
+    * value: The value to store. The value can be anything that can be serialized as JSON.
+    * [options]: A set of key/value pairs that relate to settings for storing the value.
+    */
+    (key: string, value: any, options?: any): void;
+
+    /***
+    * Gets a stored value based on the key.
+    */
+    (key: string): any;
+
+    /***
+    * Gets a hash of all stored values.
+    */
+    (): any;
+}
+
+interface amplifyStore extends amplifyStorageTypeStore {
+
+    /*** 
+    * IE 8+, Firefox 3.5+, Safari 4+, Chrome, Opera 10.5+, iPhone 2+, Android 2+
+    */
+    localStorage: amplifyStorageTypeStore;
+
+    /*** 
+    * IE 8+, Firefox 2+, Safari 4+, Chrome, Opera 10.5+, iPhone 2+, Android 2+
+    */
+    sessionStorage: amplifyStorageTypeStore;
+
+    /***
+    * Firefox 2+
+    */
+    globalStorage: amplifyStorageTypeStore;
+    
+    /***
+    * IE 5 - 7
+    */
+    userData: amplifyStorageTypeStore;
+
+    /***
+    * An in-memory store is provided as a fallback if none of the other storage types are available.
+    */
+    memory: amplifyStorageTypeStore;
+
+
+}
+
+interface amplifyStatic {
+
+    subscribe: amplifySubscribe;
+
+    /***
+    * Remove a subscription.
+    * topic: The topic being unsubscribed from.
+    * callback: The callback that was originally subscribed.
+    */
+    unsubscribe(topic: string, callback: Function): void;
+
+    /***
+    * Publish a message.
+    * topic: The name of the message to publish.
+    * Any additional parameters will be passed to the subscriptions.
+    * amplify.publish returns a boolean indicating whether any subscriptions returned false. The return value is true if none of the subscriptions returned false, and false otherwise. Note that only one subscription can return false because doing so will prevent additional subscriptions from being invoked.
+    */
+    publish(topic: string, ...args: any[]): boolean;
+
+    store: amplifyStore;
+
+    request: amplifyRequest;
+
+}
+
+declare var amplify: amplifyStatic;
+
diff --git a/amplify-deferred/tsconfig.json b/amplify-deferred/tsconfig.json
new file mode 100644
index 0000000000..3d0d08164f
--- /dev/null
+++ b/amplify-deferred/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "amplify-deferred-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/amplifyjs/amplifyjs-tests.ts b/amplify/amplifyjs-tests.ts
similarity index 98%
rename from amplifyjs/amplifyjs-tests.ts
rename to amplify/amplifyjs-tests.ts
index a104d4a7cc..ec3807435d 100644
--- a/amplifyjs/amplifyjs-tests.ts
+++ b/amplify/amplifyjs-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="amplifyjs.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+
+/// <reference types="jquery" />
 
 // Copied examples directly from AmplifyJs site
 
diff --git a/amplify/index.d.ts b/amplify/index.d.ts
new file mode 100644
index 0000000000..8955fdc7de
--- /dev/null
+++ b/amplify/index.d.ts
@@ -0,0 +1,182 @@
+// Type definitions for AmplifyJs 1.1.0
+// Project: http://amplifyjs.com/
+// Definitions by: Jonas Eriksson <https://github.com/joeriks/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface amplifyRequestSettings {
+    resourceId: string;
+    data?: any;
+    success?: (...args: any[]) => void;
+    error?: (...args: any[]) => void;
+}
+
+interface amplifyDecoder {
+    (   
+        data?: any, 
+        status?: string, 
+        xhr?: JQueryXHR, 
+        success?: (...args: any[]) => void,
+        error?: (...args: any[]) => void
+    ): void
+}
+
+interface amplifyDecoders {
+    [decoderName: string]: amplifyDecoder;
+    jsSend: amplifyDecoder;
+}
+
+interface amplifyAjaxSettings extends JQueryAjaxSettings  {
+    cache?: any;
+    dataMap?: {} | ((data: any) => {});
+    decoder?: any /* string or amplifyDecoder */;
+}
+
+interface amplifyRequest {
+
+    /***
+    * Request a resource.
+    * resourceId: Identifier string for the resource.
+    * data: A set of key/value pairs of data to be sent to the resource.
+    * callback: A function to invoke if the resource is retrieved successfully.
+    */
+    (resourceId: string, hash?: any, callback?: Function): void;
+
+    /***
+    * Request a resource.
+    * settings: A set of key/value pairs of settings for the request.
+    *   resourceId: Identifier string for the resource.
+    *   data (optional): Data associated with the request.
+    *   success (optional): Function to invoke on success.
+    *   error (optional): Function to invoke on error.
+    */
+    (settings: amplifyRequestSettings): any;
+
+    /***
+    * Define a resource.
+    * resourceId: Identifier string for the resource.
+    * requestType: The type of data retrieval method from the server. See the request types sections for more information.
+    * settings: A set of key/value pairs that relate to the server communication technology. The following settings are available:
+    *   Any settings found in jQuery.ajax().
+    *   cache: See the cache section for more details.
+    *   decoder: See the decoder section for more details.
+    */
+    define(resourceId: string, requestType: string, settings?: amplifyAjaxSettings): void;
+
+    /***
+    * Define a custom request.
+    * resourceId: Identifier string for the resource.
+    * resource: Function to handle requests. Receives a hash with the following properties:
+    *   resourceId: Identifier string for the resource.
+    *   data: Data provided by the user.
+    *   success: Callback to invoke on success.
+    *   error: Callback to invoke on error.
+    */
+    define(resourceId: string, resource: (settings: amplifyRequestSettings) => void): void;
+    
+    decoders: amplifyDecoders;
+    cache: any;
+}
+
+interface amplifySubscribe {
+    /***
+    * Subscribe to a message.
+    * topic: Name of the message to subscribe to.
+    * callback: Function to invoke when the message is published.
+    */
+    (topic: string, callback: Function): void;
+    /***
+    * Subscribe to a message.
+    * topic: Name of the message to subscribe to.
+    * context: What this will be when the callback is invoked.
+    * callback: Function to invoke when the message is published.
+    * [priority]: Priority relative to other subscriptions for the same message. Lower values have higher priority. Default is 10.
+    */
+    (topic: string, context: any, callback: Function, priority?: number): void;
+    /***
+    * Subscribe to a message.
+    * topic: Name of the message to subscribe to.
+    * callback: Function to invoke when the message is published.
+    * [priority]: Priority relative to other subscriptions for the same message. Lower values have higher priority. Default is 10.
+    */
+    (topic: string, callback: Function, priority?: number): void;
+}
+interface amplifyStorageTypeStore {
+    /***
+    * Stores a value for a given key using the default storage type.
+    * 
+    * key: Identifier for the value being stored.
+    * value: The value to store. The value can be anything that can be serialized as JSON.
+    * [options]: A set of key/value pairs that relate to settings for storing the value.
+    */
+    (key: string, value: any, options?: any): void;
+
+    /***
+    * Gets a stored value based on the key.
+    */
+    (key: string): any;
+
+    /***
+    * Gets a hash of all stored values.
+    */
+    (): any;
+}
+
+interface amplifyStore extends amplifyStorageTypeStore{
+
+    /*** 
+    * IE 8+, Firefox 3.5+, Safari 4+, Chrome, Opera 10.5+, iPhone 2+, Android 2+
+    */
+    localStorage: amplifyStorageTypeStore;
+
+    /*** 
+    * IE 8+, Firefox 2+, Safari 4+, Chrome, Opera 10.5+, iPhone 2+, Android 2+
+    */
+    sessionStorage: amplifyStorageTypeStore;
+
+    /***
+    * Firefox 2+
+    */
+    globalStorage: amplifyStorageTypeStore;
+    
+    /***
+    * IE 5 - 7
+    */
+    userData: amplifyStorageTypeStore;
+
+    /***
+    * An in-memory store is provided as a fallback if none of the other storage types are available.
+    */
+    memory: amplifyStorageTypeStore;
+    
+    
+}
+
+interface amplifyStatic {
+
+    subscribe: amplifySubscribe;
+
+    /***
+    * Remove a subscription.
+    * topic: The topic being unsubscribed from.
+    * callback: The callback that was originally subscribed.
+    */
+    unsubscribe(topic: string, callback: Function): void;
+
+    /***
+    * Publish a message.
+    * topic: The name of the message to publish.
+    * Any additional parameters will be passed to the subscriptions.
+    * amplify.publish returns a boolean indicating whether any subscriptions returned false. The return value is true if none of the subscriptions returned false, and false otherwise. Note that only one subscription can return false because doing so will prevent additional subscriptions from being invoked.
+    */
+    publish(topic: string, ...args: any[]): boolean;
+
+    store: amplifyStore;
+
+    request: amplifyRequest;
+
+}
+
+declare var amplify: amplifyStatic;
+declare module "amplify" { export =amplify; }
diff --git a/amplify/tsconfig.json b/amplify/tsconfig.json
new file mode 100644
index 0000000000..3fb579d728
--- /dev/null
+++ b/amplify/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "amplifyjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/amplifyjs/amplifyjs-tests.ts.tscparams b/amplifyjs/amplifyjs-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/amplifyjs/amplifyjs-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/amplifyjs/amplifyjs.d.ts b/amplifyjs/amplifyjs.d.ts
deleted file mode 100644
index 555c9a378e..0000000000
--- a/amplifyjs/amplifyjs.d.ts
+++ /dev/null
@@ -1,182 +0,0 @@
-// Type definitions for AmplifyJs 1.1.0
-// Project: http://amplifyjs.com/
-// Definitions by: Jonas Eriksson <https://github.com/joeriks/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface amplifyRequestSettings {
-    resourceId: string;
-    data?: any;
-    success?: (...args: any[]) => void;
-    error?: (...args: any[]) => void;
-}
-
-interface amplifyDecoder {
-    (   
-        data?: any, 
-        status?: string, 
-        xhr?: JQueryXHR, 
-        success?: (...args: any[]) => void,
-        error?: (...args: any[]) => void
-    ): void
-}
-
-interface amplifyDecoders {
-    [decoderName: string]: amplifyDecoder;
-    jsSend: amplifyDecoder;
-}
-
-interface amplifyAjaxSettings extends JQueryAjaxSettings  {
-    cache?: any;
-    dataMap?: {} | ((data: any) => {});
-    decoder?: any /* string or amplifyDecoder */;
-}
-
-interface amplifyRequest {
-
-    /***
-    * Request a resource.
-    * resourceId: Identifier string for the resource.
-    * data: A set of key/value pairs of data to be sent to the resource.
-    * callback: A function to invoke if the resource is retrieved successfully.
-    */
-    (resourceId: string, hash?: any, callback?: Function): void;
-
-    /***
-    * Request a resource.
-    * settings: A set of key/value pairs of settings for the request.
-    *   resourceId: Identifier string for the resource.
-    *   data (optional): Data associated with the request.
-    *   success (optional): Function to invoke on success.
-    *   error (optional): Function to invoke on error.
-    */
-    (settings: amplifyRequestSettings): any;
-
-    /***
-    * Define a resource.
-    * resourceId: Identifier string for the resource.
-    * requestType: The type of data retrieval method from the server. See the request types sections for more information.
-    * settings: A set of key/value pairs that relate to the server communication technology. The following settings are available:
-    *   Any settings found in jQuery.ajax().
-    *   cache: See the cache section for more details.
-    *   decoder: See the decoder section for more details.
-    */
-    define(resourceId: string, requestType: string, settings?: amplifyAjaxSettings): void;
-
-    /***
-    * Define a custom request.
-    * resourceId: Identifier string for the resource.
-    * resource: Function to handle requests. Receives a hash with the following properties:
-    *   resourceId: Identifier string for the resource.
-    *   data: Data provided by the user.
-    *   success: Callback to invoke on success.
-    *   error: Callback to invoke on error.
-    */
-    define(resourceId: string, resource: (settings: amplifyRequestSettings) => void): void;
-    
-    decoders: amplifyDecoders;
-    cache: any;
-}
-
-interface amplifySubscribe {
-    /***
-    * Subscribe to a message.
-    * topic: Name of the message to subscribe to.
-    * callback: Function to invoke when the message is published.
-    */
-    (topic: string, callback: Function): void;
-    /***
-    * Subscribe to a message.
-    * topic: Name of the message to subscribe to.
-    * context: What this will be when the callback is invoked.
-    * callback: Function to invoke when the message is published.
-    * [priority]: Priority relative to other subscriptions for the same message. Lower values have higher priority. Default is 10.
-    */
-    (topic: string, context: any, callback: Function, priority?: number): void;
-    /***
-    * Subscribe to a message.
-    * topic: Name of the message to subscribe to.
-    * callback: Function to invoke when the message is published.
-    * [priority]: Priority relative to other subscriptions for the same message. Lower values have higher priority. Default is 10.
-    */
-    (topic: string, callback: Function, priority?: number): void;
-}
-interface amplifyStorageTypeStore {
-    /***
-    * Stores a value for a given key using the default storage type.
-    * 
-    * key: Identifier for the value being stored.
-    * value: The value to store. The value can be anything that can be serialized as JSON.
-    * [options]: A set of key/value pairs that relate to settings for storing the value.
-    */
-    (key: string, value: any, options?: any): void;
-
-    /***
-    * Gets a stored value based on the key.
-    */
-    (key: string): any;
-
-    /***
-    * Gets a hash of all stored values.
-    */
-    (): any;
-}
-
-interface amplifyStore extends amplifyStorageTypeStore{
-
-    /*** 
-    * IE 8+, Firefox 3.5+, Safari 4+, Chrome, Opera 10.5+, iPhone 2+, Android 2+
-    */
-    localStorage: amplifyStorageTypeStore;
-
-    /*** 
-    * IE 8+, Firefox 2+, Safari 4+, Chrome, Opera 10.5+, iPhone 2+, Android 2+
-    */
-    sessionStorage: amplifyStorageTypeStore;
-
-    /***
-    * Firefox 2+
-    */
-    globalStorage: amplifyStorageTypeStore;
-    
-    /***
-    * IE 5 - 7
-    */
-    userData: amplifyStorageTypeStore;
-
-    /***
-    * An in-memory store is provided as a fallback if none of the other storage types are available.
-    */
-    memory: amplifyStorageTypeStore;
-    
-    
-}
-
-interface amplifyStatic {
-
-    subscribe: amplifySubscribe;
-
-    /***
-    * Remove a subscription.
-    * topic: The topic being unsubscribed from.
-    * callback: The callback that was originally subscribed.
-    */
-    unsubscribe(topic: string, callback: Function): void;
-
-    /***
-    * Publish a message.
-    * topic: The name of the message to publish.
-    * Any additional parameters will be passed to the subscriptions.
-    * amplify.publish returns a boolean indicating whether any subscriptions returned false. The return value is true if none of the subscriptions returned false, and false otherwise. Note that only one subscription can return false because doing so will prevent additional subscriptions from being invoked.
-    */
-    publish(topic: string, ...args: any[]): boolean;
-
-    store: amplifyStore;
-
-    request: amplifyRequest;
-
-}
-
-declare var amplify: amplifyStatic;
-declare module "amplify" { export =amplify; }
diff --git a/amqp-rpc/amqp-rpc-tests.ts b/amqp-rpc/amqp-rpc-tests.ts
index 71df096a8d..eb101188ab 100644
--- a/amqp-rpc/amqp-rpc-tests.ts
+++ b/amqp-rpc/amqp-rpc-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./amqp-rpc.d.ts" />
+
 import amqp_rpc = require('amqp-rpc');
 var rpc = amqp_rpc.factory();
 
diff --git a/amqp-rpc/amqp-rpc.d.ts b/amqp-rpc/amqp-rpc.d.ts
deleted file mode 100644
index b2eee1d2ca..0000000000
--- a/amqp-rpc/amqp-rpc.d.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-// Type definitions for amqp-rpc v0.0.8
-// Project: https://github.com/demchenkoe/node-amqp-rpc/
-// Definitions by: Wonshik Kim <https://github.com/wokim/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "amqp-rpc" {
-
-  export interface Options {
-    connection?: any;
-    url?: string;
-    exchangeInstance?: any;
-    exchange?: string;
-    exchange_options?: {
-      exclusive?: boolean;
-      autoDelete?: boolean;
-    };
-    ipml_options?: {
-      defaultExchangeName?: string;
-    }
-    conn_options?: any;
-  }
-
-  export interface CallOptions {
-    correlationId?: string;
-    autoDeleteCallback?: any;
-  }
-
-  export interface HandlerOptions {
-    queueName?: string;
-    durable?: boolean;
-    exclusive?: boolean;
-    autoDelete?: boolean;
-  }
-
-  export interface BroadcastOptions {
-    ttl?: number;
-    onResponse?: any;
-    context?: any;
-    onComplete?: any;
-  }
-
-  export interface CommandInfo {
-    cmd?: string;
-    exchange?: string;
-    contentType?: string;
-    size?: number;
-  }
-
-  export interface Callback {
-    (...args: any[]): void;
-  }
-
-  export interface CallbackWithError {
-    (err: any, ...args: any[]): void;
-  }
-
-  export function factory(opt?: Options): amqpRPC;
-
-  export class amqpRPC {
-    constructor(opt?: Options);
-    generateQueueName(type: string): string;
-    disconnect(): void;
-    call<T>(cmd: string, params: T, cb?: Callback, context?: any, options?: CallOptions): string;
-    on<T>(cmd: string, cb: (param?: T, cb?: Callback, info?: CommandInfo) => void, context?: any, options?: HandlerOptions): boolean;
-    off(cmd: string): boolean;
-    callBroadcast<T>(cmd: string, params: T, options?: BroadcastOptions): void;
-    onBroadcast<T>(cmd: string, cb?: (params?: T, cb?: CallbackWithError) => void, context?: any, options?: any): boolean;
-    offBroadcast(cmd: string): boolean;
-  }
-}
diff --git a/amqp-rpc/index.d.ts b/amqp-rpc/index.d.ts
new file mode 100644
index 0000000000..337f8d8a16
--- /dev/null
+++ b/amqp-rpc/index.d.ts
@@ -0,0 +1,71 @@
+// Type definitions for amqp-rpc v0.0.8
+// Project: https://github.com/demchenkoe/node-amqp-rpc/
+// Definitions by: Wonshik Kim <https://github.com/wokim/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+export interface Options {
+    connection?: any;
+    url?: string;
+    exchangeInstance?: any;
+    exchange?: string;
+    exchange_options?: {
+        exclusive?: boolean;
+        autoDelete?: boolean;
+    };
+    ipml_options?: {
+        defaultExchangeName?: string;
+    }
+    conn_options?: any;
+}
+
+export interface CallOptions {
+    correlationId?: string;
+    autoDeleteCallback?: any;
+}
+
+export interface HandlerOptions {
+    queueName?: string;
+    durable?: boolean;
+    exclusive?: boolean;
+    autoDelete?: boolean;
+}
+
+export interface BroadcastOptions {
+    ttl?: number;
+    onResponse?: any;
+    context?: any;
+    onComplete?: any;
+}
+
+export interface CommandInfo {
+    cmd?: string;
+    exchange?: string;
+    contentType?: string;
+    size?: number;
+}
+
+export interface Callback {
+    (...args: any[]): void;
+}
+
+export interface CallbackWithError {
+    (err: any, ...args: any[]): void;
+}
+
+export declare function factory(opt?: Options): amqpRPC;
+
+export declare class amqpRPC {
+    constructor(opt?: Options);
+    generateQueueName(type: string): string;
+    disconnect(): void;
+    call<T>(cmd: string, params: T, cb?: Callback, context?: any, options?: CallOptions): string;
+    on<T>(cmd: string, cb: (param?: T, cb?: Callback, info?: CommandInfo) => void, context?: any, options?: HandlerOptions): boolean;
+    off(cmd: string): boolean;
+    callBroadcast<T>(cmd: string, params: T, options?: BroadcastOptions): void;
+    onBroadcast<T>(cmd: string, cb?: (params?: T, cb?: CallbackWithError) => void, context?: any, options?: any): boolean;
+    offBroadcast(cmd: string): boolean;
+}
diff --git a/amqp-rpc/tsconfig.json b/amqp-rpc/tsconfig.json
new file mode 100644
index 0000000000..cd51029de4
--- /dev/null
+++ b/amqp-rpc/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "amqp-rpc-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/amqplib/amqplib-tests.ts b/amqplib/amqplib-tests.ts
index 85763c9ee1..07b9ec5402 100644
--- a/amqplib/amqplib-tests.ts
+++ b/amqplib/amqplib-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="amqplib.d.ts" />
+
 
 // promise api tests
 import amqp = require("amqplib");
diff --git a/amqplib/amqplib.d.ts b/amqplib/amqplib.d.ts
deleted file mode 100644
index 6c393014f9..0000000000
--- a/amqplib/amqplib.d.ts
+++ /dev/null
@@ -1,219 +0,0 @@
-// Type definitions for amqplib 0.3.x
-// Project: https://github.com/squaremo/amqp.node
-// Definitions by: Michael Nahkies <https://github.com/mnahkies>, Ab Reitsma <https://github.com/abreits>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../when/when.d.ts" />
-/// <reference path="../node/node.d.ts" />
-
-declare module "amqplib/properties" {
-    namespace Replies {
-        interface Empty {
-        }
-        interface AssertQueue {
-            queue: string;
-            messageCount: number;
-            consumerCount: number;
-        }
-        interface PurgeQueue {
-            messageCount: number;
-        }
-        interface DeleteQueue {
-            messageCount: number;
-        }
-        interface AssertExchange {
-            exchange: string;
-        }
-        interface Consume {
-            consumerTag: string;
-        }
-    }
-
-    namespace Options {
-        interface AssertQueue {
-            exclusive?: boolean;
-            durable?: boolean;
-            autoDelete?: boolean;
-            arguments?: any;
-            messageTtl?: number;
-            expires?: number;
-            deadLetterExchange?: string;
-            deadLetterRoutingKey?: string;
-            maxLength?: number;
-        }
-        interface DeleteQueue {
-            ifUnused?: boolean;
-            ifEmpty?: boolean;
-        }
-        interface AssertExchange {
-            durable?: boolean;
-            internal?: boolean;
-            autoDelete?: boolean;
-            alternateExchange?: string;
-            arguments?: any;
-        }
-        interface DeleteExchange {
-            ifUnused?: boolean;
-        }
-        interface Publish {
-            expiration?: string;
-            userId?: string;
-            CC?: string | string[];
-
-            mandatory?: boolean;
-            persistent?: boolean;
-            deliveryMode?: boolean | number;
-            BCC?: string | string[];
-
-            contentType?: string;
-            contentEncoding?: string;
-            headers?: any;
-            priority?: number;
-            correlationId?: string;
-            replyTo?: string;
-            messageId?: string;
-            timestamp?: number;
-            type?: string;
-            appId?: string;
-        }
-        interface Consume {
-            consumerTag?: string;
-            noLocal?: boolean;
-            noAck?: boolean;
-            exclusive?: boolean;
-            priority?: number;
-            arguments?: any;
-        }
-        interface Get {
-            noAck?: boolean;
-        }
-    }
-
-    interface Message {
-        content: Buffer;
-        fields: any;
-        properties: any;
-    }
-}
-
-declare module "amqplib" {
-
-    import events = require("events");
-    import when = require("when");
-    import shared = require("amqplib/properties")
-    export import Replies = shared.Replies;
-    export import Options = shared.Options;
-    export import Message = shared.Message;
-
-    interface Connection extends events.EventEmitter {
-        close(): when.Promise<void>;
-        createChannel(): when.Promise<Channel>;
-        createConfirmChannel(): when.Promise<Channel>;
-    }
-
-    interface Channel extends events.EventEmitter {
-        close(): when.Promise<void>;
-
-        assertQueue(queue: string, options?: Options.AssertQueue): when.Promise<Replies.AssertQueue>;
-        checkQueue(queue: string): when.Promise<Replies.AssertQueue>;
-
-        deleteQueue(queue: string, options?: Options.DeleteQueue): when.Promise<Replies.DeleteQueue>;
-        purgeQueue(queue: string): when.Promise<Replies.PurgeQueue>;
-
-        bindQueue(queue: string, source: string, pattern: string, args?: any): when.Promise<Replies.Empty>;
-        unbindQueue(queue: string, source: string, pattern: string, args?: any): when.Promise<Replies.Empty>;
-
-        assertExchange(exchange: string, type: string, options?: Options.AssertExchange): when.Promise<Replies.AssertExchange>;
-        checkExchange(exchange: string): when.Promise<Replies.Empty>;
-
-        deleteExchange(exchange: string, options?: Options.DeleteExchange): when.Promise<Replies.Empty>;
-
-        bindExchange(destination: string, source: string, pattern: string, args?: any): when.Promise<Replies.Empty>;
-        unbindExchange(destination: string, source: string, pattern: string, args?: any): when.Promise<Replies.Empty>;
-
-        publish(exchange: string, routingKey: string, content: Buffer, options?: Options.Publish): boolean;
-        sendToQueue(queue: string, content: Buffer, options?: Options.Publish): boolean;
-
-        consume(queue: string, onMessage: (msg: Message) => any, options?: Options.Consume): when.Promise<Replies.Consume>;
-
-        cancel(consumerTag: string): when.Promise<Replies.Empty>;
-        get(queue: string, options?: Options.Get): when.Promise<Message | boolean>;
-
-        ack(message: Message, allUpTo?: boolean): void;
-        ackAll(): void;
-
-        nack(message: Message, allUpTo?: boolean, requeue?: boolean): void;
-        nackAll(requeue?: boolean): void;
-        reject(message: Message, requeue?: boolean): void;
-
-        prefetch(count: number, global?: boolean): when.Promise<Replies.Empty>;
-        recover(): when.Promise<Replies.Empty>;
-    }
-
-    function connect(url: string, socketOptions?: any): when.Promise<Connection>;
-}
-
-declare module "amqplib/callback_api" {
-
-    import events = require("events");
-    import shared = require("amqplib/properties")
-    export import Replies = shared.Replies;
-    export import Options = shared.Options;
-    export import Message = shared.Message;
-
-    interface Connection extends events.EventEmitter {
-        close(callback?: (err: any) => void): void;
-        createChannel(callback: (err: any, channel: Channel) => void): void;
-        createConfirmChannel(callback: (err: any, confirmChannel: ConfirmChannel) => void): void;
-    }
-
-    interface Channel extends events.EventEmitter {
-        close(callback: (err: any) => void): void;
-
-        assertQueue(queue?: string, options?: Options.AssertQueue, callback?: (err:any, ok: Replies.AssertQueue) => void): void;
-        checkQueue(queue: string, callback?: (err: any, ok: Replies.AssertQueue) => void): void;
-
-        deleteQueue(queue: string, options?: Options.DeleteQueue, callback?: (err:any, ok: Replies.DeleteQueue) => void): void;
-        purgeQueue(queue: string, callback?: (err:any, ok: Replies.PurgeQueue) => void): void;
-
-        bindQueue(queue: string, source: string, pattern: string, args?: any, callback?: (err: any, ok: Replies.Empty) => void): void;
-        unbindQueue(queue: string, source: string, pattern: string, args?: any, callback?: (err: any, ok: Replies.Empty) => void): void;
-
-        assertExchange(exchange: string, type: string, options?: Options.AssertExchange, callback?: (err: any, ok: Replies.AssertExchange) => void): void;
-        checkExchange(exchange: string, callback?: (err: any, ok: Replies.Empty) => void): void;
-
-        deleteExchange(exchange: string, options?: Options.DeleteExchange, callback?: (err: any, ok: Replies.Empty) => void): void;
-
-        bindExchange(destination: string, source: string, pattern: string, args?: any, callback?: (err: any, ok: Replies.Empty) => void): void;
-        unbindExchange(destination: string, source: string, pattern: string, args?: any, callback?: (err: any, ok: Replies.Empty) => void): void;
-
-        publish(exchange: string, routingKey: string, content: Buffer, options?: Options.Publish): boolean;
-        sendToQueue(queue: string, content: Buffer, options?: Options.Publish): boolean;
-
-        consume(queue: string, onMessage: (msg: Message) => any, options?: Options.Consume, callback?: (err: any, ok: Replies.Consume) => void): void;
-
-        cancel(consumerTag: string, callback?: (err: any, ok: Replies.Empty) => void): void;
-        get(queue: string, options?: Options.Get, callback?: (err: any, ok: Message | boolean) => void): void;
-
-        ack(message: Message, allUpTo?: boolean): void;
-        ackAll(): void;
-
-        nack(message: Message, allUpTo?: boolean, requeue?: boolean): void;
-        nackAll(requeue?: boolean): void;
-        reject(message: Message, requeue?: boolean): void;
-
-        prefetch(count: number, global?: boolean): void;
-        recover(callback?: (err: any, ok: Replies.Empty) => void): void;
-    }
-
-    interface ConfirmChannel extends Channel {
-        publish(exchange: string, routingKey: string, content: Buffer, options?: Options.Publish, callback?: (err: any, ok: Replies.Empty) => void): boolean;
-        sendToQueue(queue: string, content: Buffer, options?: Options.Publish, callback?: (err: any, ok: Replies.Empty) => void): boolean;
-
-        waitForConfirms(callback?: (err: any) => void): void;
-    }
-
-    function connect(callback: (err: any, connection: Connection) => void): void;
-    function connect(url: string, callback: (err: any, connection: Connection) => void): void;
-    function connect(url: string, socketOptions: any, callback: (err: any, connection: Connection) => void): void;
-}
diff --git a/amqplib/index.d.ts b/amqplib/index.d.ts
new file mode 100644
index 0000000000..3138f7494e
--- /dev/null
+++ b/amqplib/index.d.ts
@@ -0,0 +1,219 @@
+// Type definitions for amqplib 0.3.x
+// Project: https://github.com/squaremo/amqp.node
+// Definitions by: Michael Nahkies <https://github.com/mnahkies>, Ab Reitsma <https://github.com/abreits>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="when" />
+/// <reference types="node" />
+
+declare module "amqplib/properties" {
+    namespace Replies {
+        interface Empty {
+        }
+        interface AssertQueue {
+            queue: string;
+            messageCount: number;
+            consumerCount: number;
+        }
+        interface PurgeQueue {
+            messageCount: number;
+        }
+        interface DeleteQueue {
+            messageCount: number;
+        }
+        interface AssertExchange {
+            exchange: string;
+        }
+        interface Consume {
+            consumerTag: string;
+        }
+    }
+
+    namespace Options {
+        interface AssertQueue {
+            exclusive?: boolean;
+            durable?: boolean;
+            autoDelete?: boolean;
+            arguments?: any;
+            messageTtl?: number;
+            expires?: number;
+            deadLetterExchange?: string;
+            deadLetterRoutingKey?: string;
+            maxLength?: number;
+        }
+        interface DeleteQueue {
+            ifUnused?: boolean;
+            ifEmpty?: boolean;
+        }
+        interface AssertExchange {
+            durable?: boolean;
+            internal?: boolean;
+            autoDelete?: boolean;
+            alternateExchange?: string;
+            arguments?: any;
+        }
+        interface DeleteExchange {
+            ifUnused?: boolean;
+        }
+        interface Publish {
+            expiration?: string;
+            userId?: string;
+            CC?: string | string[];
+
+            mandatory?: boolean;
+            persistent?: boolean;
+            deliveryMode?: boolean | number;
+            BCC?: string | string[];
+
+            contentType?: string;
+            contentEncoding?: string;
+            headers?: any;
+            priority?: number;
+            correlationId?: string;
+            replyTo?: string;
+            messageId?: string;
+            timestamp?: number;
+            type?: string;
+            appId?: string;
+        }
+        interface Consume {
+            consumerTag?: string;
+            noLocal?: boolean;
+            noAck?: boolean;
+            exclusive?: boolean;
+            priority?: number;
+            arguments?: any;
+        }
+        interface Get {
+            noAck?: boolean;
+        }
+    }
+
+    interface Message {
+        content: Buffer;
+        fields: any;
+        properties: any;
+    }
+}
+
+declare module "amqplib" {
+
+    import events = require("events");
+    import when = require("when");
+    import shared = require("amqplib/properties")
+    export import Replies = shared.Replies;
+    export import Options = shared.Options;
+    export import Message = shared.Message;
+
+    interface Connection extends events.EventEmitter {
+        close(): when.Promise<void>;
+        createChannel(): when.Promise<Channel>;
+        createConfirmChannel(): when.Promise<Channel>;
+    }
+
+    interface Channel extends events.EventEmitter {
+        close(): when.Promise<void>;
+
+        assertQueue(queue: string, options?: Options.AssertQueue): when.Promise<Replies.AssertQueue>;
+        checkQueue(queue: string): when.Promise<Replies.AssertQueue>;
+
+        deleteQueue(queue: string, options?: Options.DeleteQueue): when.Promise<Replies.DeleteQueue>;
+        purgeQueue(queue: string): when.Promise<Replies.PurgeQueue>;
+
+        bindQueue(queue: string, source: string, pattern: string, args?: any): when.Promise<Replies.Empty>;
+        unbindQueue(queue: string, source: string, pattern: string, args?: any): when.Promise<Replies.Empty>;
+
+        assertExchange(exchange: string, type: string, options?: Options.AssertExchange): when.Promise<Replies.AssertExchange>;
+        checkExchange(exchange: string): when.Promise<Replies.Empty>;
+
+        deleteExchange(exchange: string, options?: Options.DeleteExchange): when.Promise<Replies.Empty>;
+
+        bindExchange(destination: string, source: string, pattern: string, args?: any): when.Promise<Replies.Empty>;
+        unbindExchange(destination: string, source: string, pattern: string, args?: any): when.Promise<Replies.Empty>;
+
+        publish(exchange: string, routingKey: string, content: Buffer, options?: Options.Publish): boolean;
+        sendToQueue(queue: string, content: Buffer, options?: Options.Publish): boolean;
+
+        consume(queue: string, onMessage: (msg: Message) => any, options?: Options.Consume): when.Promise<Replies.Consume>;
+
+        cancel(consumerTag: string): when.Promise<Replies.Empty>;
+        get(queue: string, options?: Options.Get): when.Promise<Message | boolean>;
+
+        ack(message: Message, allUpTo?: boolean): void;
+        ackAll(): void;
+
+        nack(message: Message, allUpTo?: boolean, requeue?: boolean): void;
+        nackAll(requeue?: boolean): void;
+        reject(message: Message, requeue?: boolean): void;
+
+        prefetch(count: number, global?: boolean): when.Promise<Replies.Empty>;
+        recover(): when.Promise<Replies.Empty>;
+    }
+
+    function connect(url: string, socketOptions?: any): when.Promise<Connection>;
+}
+
+declare module "amqplib/callback_api" {
+
+    import events = require("events");
+    import shared = require("amqplib/properties")
+    export import Replies = shared.Replies;
+    export import Options = shared.Options;
+    export import Message = shared.Message;
+
+    interface Connection extends events.EventEmitter {
+        close(callback?: (err: any) => void): void;
+        createChannel(callback: (err: any, channel: Channel) => void): void;
+        createConfirmChannel(callback: (err: any, confirmChannel: ConfirmChannel) => void): void;
+    }
+
+    interface Channel extends events.EventEmitter {
+        close(callback: (err: any) => void): void;
+
+        assertQueue(queue?: string, options?: Options.AssertQueue, callback?: (err:any, ok: Replies.AssertQueue) => void): void;
+        checkQueue(queue: string, callback?: (err: any, ok: Replies.AssertQueue) => void): void;
+
+        deleteQueue(queue: string, options?: Options.DeleteQueue, callback?: (err:any, ok: Replies.DeleteQueue) => void): void;
+        purgeQueue(queue: string, callback?: (err:any, ok: Replies.PurgeQueue) => void): void;
+
+        bindQueue(queue: string, source: string, pattern: string, args?: any, callback?: (err: any, ok: Replies.Empty) => void): void;
+        unbindQueue(queue: string, source: string, pattern: string, args?: any, callback?: (err: any, ok: Replies.Empty) => void): void;
+
+        assertExchange(exchange: string, type: string, options?: Options.AssertExchange, callback?: (err: any, ok: Replies.AssertExchange) => void): void;
+        checkExchange(exchange: string, callback?: (err: any, ok: Replies.Empty) => void): void;
+
+        deleteExchange(exchange: string, options?: Options.DeleteExchange, callback?: (err: any, ok: Replies.Empty) => void): void;
+
+        bindExchange(destination: string, source: string, pattern: string, args?: any, callback?: (err: any, ok: Replies.Empty) => void): void;
+        unbindExchange(destination: string, source: string, pattern: string, args?: any, callback?: (err: any, ok: Replies.Empty) => void): void;
+
+        publish(exchange: string, routingKey: string, content: Buffer, options?: Options.Publish): boolean;
+        sendToQueue(queue: string, content: Buffer, options?: Options.Publish): boolean;
+
+        consume(queue: string, onMessage: (msg: Message) => any, options?: Options.Consume, callback?: (err: any, ok: Replies.Consume) => void): void;
+
+        cancel(consumerTag: string, callback?: (err: any, ok: Replies.Empty) => void): void;
+        get(queue: string, options?: Options.Get, callback?: (err: any, ok: Message | boolean) => void): void;
+
+        ack(message: Message, allUpTo?: boolean): void;
+        ackAll(): void;
+
+        nack(message: Message, allUpTo?: boolean, requeue?: boolean): void;
+        nackAll(requeue?: boolean): void;
+        reject(message: Message, requeue?: boolean): void;
+
+        prefetch(count: number, global?: boolean): void;
+        recover(callback?: (err: any, ok: Replies.Empty) => void): void;
+    }
+
+    interface ConfirmChannel extends Channel {
+        publish(exchange: string, routingKey: string, content: Buffer, options?: Options.Publish, callback?: (err: any, ok: Replies.Empty) => void): boolean;
+        sendToQueue(queue: string, content: Buffer, options?: Options.Publish, callback?: (err: any, ok: Replies.Empty) => void): boolean;
+
+        waitForConfirms(callback?: (err: any) => void): void;
+    }
+
+    function connect(callback: (err: any, connection: Connection) => void): void;
+    function connect(url: string, callback: (err: any, connection: Connection) => void): void;
+    function connect(url: string, socketOptions: any, callback: (err: any, connection: Connection) => void): void;
+}
diff --git a/amqplib/tsconfig.json b/amqplib/tsconfig.json
new file mode 100644
index 0000000000..0757eb2ef7
--- /dev/null
+++ b/amqplib/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "amqplib-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/analytics-node/analytics-node-tests.ts b/analytics-node/analytics-node-tests.ts
index 57c48252ff..594c15fae6 100644
--- a/analytics-node/analytics-node-tests.ts
+++ b/analytics-node/analytics-node-tests.ts
@@ -1,10 +1,8 @@
-/// <reference path="./analytics-node.d.ts" />
-
+import AnalyticsNode = require("analytics-node");
 var analytics: AnalyticsNode.Analytics;
-import Analytics = require("analytics-node");
 
 function testConfig(): void {
-  analytics = new Analytics('YOUR_WRITE_KEY', {
+  analytics = new AnalyticsNode.Analytics('YOUR_WRITE_KEY', {
     flushAt: 20,
     flushAfter: 10000
   });
diff --git a/analytics-node/analytics-node.d.ts b/analytics-node/analytics-node.d.ts
deleted file mode 100644
index aed257c9cc..0000000000
--- a/analytics-node/analytics-node.d.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-// Type definitions for Segment's analytics.js for Node.js
-// Project: https://segment.com/docs/libraries/node/
-// Definitions by: Andrew Fong <https://github.com/fongandrew>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace AnalyticsNode {
-
-  interface Integrations {
-    [index: string]: boolean;
-  }
-
-  export class Analytics {
-    constructor(writeKey: string, opts?: {
-      flushAt?: number,
-      flushAfter?: number
-    });
-
-    /* The identify method lets you tie a user to their actions and record
-       traits about them. */
-    identify(message: {
-      userId: string | number;
-      traits?: Object;
-      timestamp?: Date;
-      context?: Object;
-      integrations?: Integrations;
-    }): Analytics;
-
-    /* The track method lets you record the actions your users perform. */
-    track(message: {
-      userId: string | number;
-      event: string;
-      properties?: Object;
-      timestamp?: Date;
-      context?: Object;
-      integrations?: Integrations;
-    }): Analytics;
-
-    /* The page method lets you record page views on your website, along with
-       optional extra information about the page being viewed. */
-    page(message: {
-      userId: string | number;
-      category?: string;
-      name?: string;
-      properties?: Object;
-      timestamp?: Date;
-      context?: Object;
-      integrations?: Integrations;
-    }): Analytics;
-
-    /* alias is how you associate one identity with another. */
-    alias(message: {
-      previousId: string | number;
-      userId: string | number;
-      integrations?: Integrations;
-    }): Analytics;
-
-    /* Group calls can be used to associate individual users with shared
-       accounts or companies. */
-    group(message: {
-      userId: string | number;
-      groupId: string | number;
-      traits?: Object;
-      context?: Object;
-      timestamp?: Date;
-      anonymous_id?: string | number;
-      integrations?: Integrations;
-    }): Analytics;
-
-    /* Flush batched calls to make sure nothing is left in the queue */
-    flush(fn?: (err: Error, batch: {
-      batch: Array<{
-        type: string;
-      }>;
-      messageId: string;
-      sentAt: Date;
-      timestamp: Date;
-    }) => void): Analytics;
-  }
-}
-
-declare module "analytics-node" {
-  export = AnalyticsNode.Analytics;
-}
diff --git a/analytics-node/index.d.ts b/analytics-node/index.d.ts
new file mode 100644
index 0000000000..455b13c92b
--- /dev/null
+++ b/analytics-node/index.d.ts
@@ -0,0 +1,81 @@
+// Type definitions for Segment's analytics.js for Node.js
+// Project: https://segment.com/docs/libraries/node/
+// Definitions by: Andrew Fong <https://github.com/fongandrew>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = AnalyticsNode;
+
+declare namespace AnalyticsNode {
+
+  interface Integrations {
+    [index: string]: boolean;
+  }
+
+  export class Analytics {
+    constructor(writeKey: string, opts?: {
+      flushAt?: number,
+      flushAfter?: number
+    });
+
+    /* The identify method lets you tie a user to their actions and record
+       traits about them. */
+    identify(message: {
+      userId: string | number;
+      traits?: Object;
+      timestamp?: Date;
+      context?: Object;
+      integrations?: Integrations;
+    }): Analytics;
+
+    /* The track method lets you record the actions your users perform. */
+    track(message: {
+      userId: string | number;
+      event: string;
+      properties?: Object;
+      timestamp?: Date;
+      context?: Object;
+      integrations?: Integrations;
+    }): Analytics;
+
+    /* The page method lets you record page views on your website, along with
+       optional extra information about the page being viewed. */
+    page(message: {
+      userId: string | number;
+      category?: string;
+      name?: string;
+      properties?: Object;
+      timestamp?: Date;
+      context?: Object;
+      integrations?: Integrations;
+    }): Analytics;
+
+    /* alias is how you associate one identity with another. */
+    alias(message: {
+      previousId: string | number;
+      userId: string | number;
+      integrations?: Integrations;
+    }): Analytics;
+
+    /* Group calls can be used to associate individual users with shared
+       accounts or companies. */
+    group(message: {
+      userId: string | number;
+      groupId: string | number;
+      traits?: Object;
+      context?: Object;
+      timestamp?: Date;
+      anonymous_id?: string | number;
+      integrations?: Integrations;
+    }): Analytics;
+
+    /* Flush batched calls to make sure nothing is left in the queue */
+    flush(fn?: (err: Error, batch: {
+      batch: Array<{
+        type: string;
+      }>;
+      messageId: string;
+      sentAt: Date;
+      timestamp: Date;
+    }) => void): Analytics;
+  }
+}
diff --git a/analytics-node/tsconfig.json b/analytics-node/tsconfig.json
new file mode 100644
index 0000000000..ec22377baf
--- /dev/null
+++ b/analytics-node/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "analytics-node-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-agility/angular-agility-tests.ts b/angular-agility/angular-agility-tests.ts
index 1e8eea478b..985eb368a0 100644
--- a/angular-agility/angular-agility-tests.ts
+++ b/angular-agility/angular-agility-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="angular-agility.d.ts" />
-/// <reference path='../angularjs/angular.d.ts' />
+
 
 var validIconStrategy:aa.IValidIconStrategy = <aa.IValidIconStrategy>{};
 validIconStrategy.validIcon = "";
diff --git a/angular-agility/angular-agility.d.ts b/angular-agility/angular-agility.d.ts
deleted file mode 100644
index 33a8c3b8a4..0000000000
--- a/angular-agility/angular-agility.d.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-// Type definitions for AngularAgility
-// Project: https://github.com/AngularAgility/AngularAgility
-// Definitions by: Roland Zwaga <https://github.com/rolandzwaga>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path='../angularjs/angular.d.ts' />
-
-declare namespace aa {
-
-	export interface ILabelStrategies  {
-		[strategyName: string]: (element:ng.IAugmentedJQueryStatic, labelText:string, isRequired:boolean)=>void;
-	}
-
-	export interface IFieldGroupStrategies {
-		[strategyName: string]: (element:ng.IAugmentedJQueryStatic)=>void;
-	}
-
-	export interface IValMsgPlacementStrategies {
-		[strategyName: string]: (formFieldElement:ng.IAugmentedJQueryStatic, formName:string, formFieldName:string)=>void;
-	}
-
-	export interface IValidIconStrategy {
-		validIcon:string;
-		invalidIcon:string;
-		getContainer(element:ng.IAugmentedJQueryStatic):void;
-	}
-
-	export interface ISpinnerClickStrategies {
-		[strategyName: string]: (element:ng.IAugmentedJQueryStatic)=>void;
-	}
-
-	export interface IOnNavigateAwayStrategies {
-		[strategyName: string]: (rootFormScope:ng.IScope, rootForm:ng.IAugmentedJQueryStatic, $injector:ng.auto.IInjectorService)=>void;
-	}
-
-	export interface IValidationMessages {
-		[validationKey: string]: string;
-	}
-
-	export interface IGlobalSettings {
-		[settingName: string]: any;
-	}
-
-	export interface IFormExtensionsProvider extends ng.IServiceProvider {
-		defaultLabelStrategy:string;
-		defaultFieldGroupStrategy:string;
-		defaultValMsgPlacementStrategy:string;
-		validIconStrategy:IValidIconStrategy;
-		defaultSpinnerClickStrategy:string;
-		defaultNotifyTarget:string;
-		defaultOnNavigateAwayStrategy:string;
-		validationMessages:IValidationMessages;
-		valMsgForTemplate:string;
-		confirmResetStrategy:()=>boolean;
-		globalSettings:IGlobalSettings;
-
-		labelStrategies:ILabelStrategies;
-		fieldGroupStrategies:IFieldGroupStrategies;
-		valMsgPlacementStrategies:IValMsgPlacementStrategies;
-		spinnerClickStrategies:ISpinnerClickStrategies;
-		onNavigateAwayStrategies:IOnNavigateAwayStrategies;
-	}
-
-	export interface INotifyPredicate {
-		(message:string, options:any, notifier:any):any;
-	}
-
-	export interface INotifyDefaults {
-		success: INotifyPredicate;
-		info: INotifyPredicate;
-		warning: INotifyPredicate;
-		danger: INotifyPredicate;
-		error: INotifyPredicate;
-	}
-
-	export interface INotifyConfig {
-		name:string;
-		template?:string;
-		templateName?:string;
-		options:INotifyOptions;
-		namedDefaults:INotifyDefaults;
-	}
-
-	export interface INotifyOptions {
-		cssClasses?:string;
-		messageType:string;
-		allowHtml:boolean;
-		message:string;
-	}
-
-	export interface INotifyConfigProvider extends ng.IServiceProvider {
-		notifyConfigs:any;
-		defaultTargetContainerName:string;
-		defaultNotifyConfig:string;
-		addOrUpdateNotifyConfig(name:string, opts:INotifyConfig):void;
-		optionsTransformer(options:INotifyOptions, $sce:ng.ISCEService):void;
-	}
-
-	export interface IExternalFormValidationConfig {
-		validations:any;
-		ignore?:any;
-		globals?:any;
-		resolve?:any;
-		resolveFn?:(modelValue:string)=>string;
-	}
-}
diff --git a/angular-agility/index.d.ts b/angular-agility/index.d.ts
new file mode 100644
index 0000000000..c27792498f
--- /dev/null
+++ b/angular-agility/index.d.ts
@@ -0,0 +1,106 @@
+// Type definitions for AngularAgility
+// Project: https://github.com/AngularAgility/AngularAgility
+// Definitions by: Roland Zwaga <https://github.com/rolandzwaga>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare namespace aa {
+
+	export interface ILabelStrategies  {
+		[strategyName: string]: (element:ng.IAugmentedJQueryStatic, labelText:string, isRequired:boolean)=>void;
+	}
+
+	export interface IFieldGroupStrategies {
+		[strategyName: string]: (element:ng.IAugmentedJQueryStatic)=>void;
+	}
+
+	export interface IValMsgPlacementStrategies {
+		[strategyName: string]: (formFieldElement:ng.IAugmentedJQueryStatic, formName:string, formFieldName:string)=>void;
+	}
+
+	export interface IValidIconStrategy {
+		validIcon:string;
+		invalidIcon:string;
+		getContainer(element:ng.IAugmentedJQueryStatic):void;
+	}
+
+	export interface ISpinnerClickStrategies {
+		[strategyName: string]: (element:ng.IAugmentedJQueryStatic)=>void;
+	}
+
+	export interface IOnNavigateAwayStrategies {
+		[strategyName: string]: (rootFormScope:ng.IScope, rootForm:ng.IAugmentedJQueryStatic, $injector:ng.auto.IInjectorService)=>void;
+	}
+
+	export interface IValidationMessages {
+		[validationKey: string]: string;
+	}
+
+	export interface IGlobalSettings {
+		[settingName: string]: any;
+	}
+
+	export interface IFormExtensionsProvider extends ng.IServiceProvider {
+		defaultLabelStrategy:string;
+		defaultFieldGroupStrategy:string;
+		defaultValMsgPlacementStrategy:string;
+		validIconStrategy:IValidIconStrategy;
+		defaultSpinnerClickStrategy:string;
+		defaultNotifyTarget:string;
+		defaultOnNavigateAwayStrategy:string;
+		validationMessages:IValidationMessages;
+		valMsgForTemplate:string;
+		confirmResetStrategy:()=>boolean;
+		globalSettings:IGlobalSettings;
+
+		labelStrategies:ILabelStrategies;
+		fieldGroupStrategies:IFieldGroupStrategies;
+		valMsgPlacementStrategies:IValMsgPlacementStrategies;
+		spinnerClickStrategies:ISpinnerClickStrategies;
+		onNavigateAwayStrategies:IOnNavigateAwayStrategies;
+	}
+
+	export interface INotifyPredicate {
+		(message:string, options:any, notifier:any):any;
+	}
+
+	export interface INotifyDefaults {
+		success: INotifyPredicate;
+		info: INotifyPredicate;
+		warning: INotifyPredicate;
+		danger: INotifyPredicate;
+		error: INotifyPredicate;
+	}
+
+	export interface INotifyConfig {
+		name:string;
+		template?:string;
+		templateName?:string;
+		options:INotifyOptions;
+		namedDefaults:INotifyDefaults;
+	}
+
+	export interface INotifyOptions {
+		cssClasses?:string;
+		messageType:string;
+		allowHtml:boolean;
+		message:string;
+	}
+
+	export interface INotifyConfigProvider extends ng.IServiceProvider {
+		notifyConfigs:any;
+		defaultTargetContainerName:string;
+		defaultNotifyConfig:string;
+		addOrUpdateNotifyConfig(name:string, opts:INotifyConfig):void;
+		optionsTransformer(options:INotifyOptions, $sce:ng.ISCEService):void;
+	}
+
+	export interface IExternalFormValidationConfig {
+		validations:any;
+		ignore?:any;
+		globals?:any;
+		resolve?:any;
+		resolveFn?:(modelValue:string)=>string;
+	}
+}
diff --git a/angular-agility/tsconfig.json b/angular-agility/tsconfig.json
new file mode 100644
index 0000000000..464333d396
--- /dev/null
+++ b/angular-agility/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-agility-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-bootstrap-calendar/angular-bootstrap-calendar-tests.ts b/angular-bootstrap-calendar/angular-bootstrap-calendar-tests.ts
index a704ced3b2..53d74f0800 100644
--- a/angular-bootstrap-calendar/angular-bootstrap-calendar-tests.ts
+++ b/angular-bootstrap-calendar/angular-bootstrap-calendar-tests.ts
@@ -1,5 +1,5 @@
-///<reference path='angular-bootstrap-calendar.d.ts'/>
-///<reference path='../angularjs/angular.d.ts'/>
+///<reference path='index.d.ts'/>
+///<reference types="angularjs"/>
 
 var myApp = angular.module('testModule');
 
diff --git a/angular-bootstrap-calendar/angular-bootstrap-calendar.d.ts b/angular-bootstrap-calendar/angular-bootstrap-calendar.d.ts
deleted file mode 100644
index e32dcfca68..0000000000
--- a/angular-bootstrap-calendar/angular-bootstrap-calendar.d.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-// Type definitions for angular-bootstrap-calendar
-// Project: https://github.com/mattlewis92/angular-bootstrap-calendar
-// Definitions by: Egor Komarov <https://github.com/Odrin>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../moment/moment.d.ts" />
-
-declare namespace angular.bootstrap.calendar {
-    interface IEvent {
-        /**
-         * The title of the event
-         */
-        title: string;
-        /**
-         * The type of the event (determines its color). Can be important, warning, info, inverse, success or special
-         */
-        type: string;
-        /**
-         * A javascript date object for when the event starts
-         */
-        startsAt: Date;
-        /**
-         * Optional - a javascript date object for when the event ends
-         */
-        endsAt?: Date;
-        /**
-         * If edit-event-html is set and this field is explicitly set to false then dont make it editable.
-         */
-        editable?: boolean;
-        /**
-         * If delete-event-html is set and this field is explicitly set to false then dont make it deleteable
-         */
-        deletable?: boolean;
-        /**
-         * Allow an event to be dragged and dropped
-         */
-        draggable?: boolean;
-        /**
-         * Allow an event to be resizable
-         */
-        resizable?: boolean;
-        /**
-         * If set to false then will not count towards the badge total amount on the month and year view
-         */
-        incrementsBadgeTotal?: boolean;
-        /**
-         * If set the event will recur on the given period. Valid values are year or month
-         */
-        recursOn?: string;
-        /**
-         * A CSS class (or more, just separate with spaces) that will be added to the event when it is displayed on each view. Useful for marking an event as selected / active etc
-         */
-        cssClass?: string;
-    }
-
-    interface ICalendarConfig {
-        allDateFormats: {
-            angular: IFormats;
-            moment: IFormats;
-        };
-        dateFormats: IDateFormats;
-        titleFormats: ITitleFormats;
-        dateFormatter: string;
-        displayEventEndTimes: boolean;
-        showTimesOnWeekView: boolean;
-        displayAllMonthEvents: boolean;
-        i18nStrings: { weekNumber: string; };
-        templates: {
-            calendarDayView: string;
-            calendarHourList: string;
-            calendarMonthCell: string;
-            calendarMonthCellEvents: string;
-            calendarMonthView: string;
-            calendarSlideBox: string;
-            calendarWeekView: string;
-            calendarYearView: string;
-        };
-    }
-
-    interface IFormats {
-        date: IDateFormats;
-        title: ITitleFormats;
-    }
-
-    interface IDateFormats {
-        hour: string;
-        day: string;
-        month: string;
-        weekDay: string;
-        time: string;
-        datetime: string;
-    }
-
-    interface ITitleFormats {
-        day: string;
-        week: string;
-        month: string;
-        year: string;
-    }
-
-    interface ICalendarCell {
-        label: number;
-        date: moment.Moment;
-        inMonth: boolean;
-        isPast: boolean;
-        isToday: boolean;
-        isFuture: boolean;
-        isWeekend: boolean;
-        events: IEvent[];
-        badgeTotal: number;
-    }
-
-    namespace events {
-        interface IOnEventClick {
-            (calendarEvent: IEvent): void;
-        }
-
-        interface IOnEventTimesChanged {
-            (calendarEvent: IEvent, calendarNewEventStart: Date, calendarNewEventEnd: Date): void;
-        }
-
-        interface IOnEditEventClick {
-            (calendarEvent: IEvent): void;
-        }
-
-        interface IOnDeleteEventClick {
-            (calendarEvent: IEvent): void;
-        }
-
-        interface IOnTimespanClick {
-            (calendarDate: Date, calendarCell: ICalendarCell): void;
-        }
-
-        interface IOnViewChangeClick {
-            (calendarDate: Date, calendarNextView: string): void;
-        }
-    }
-}
diff --git a/angular-bootstrap-calendar/index.d.ts b/angular-bootstrap-calendar/index.d.ts
new file mode 100644
index 0000000000..bb529e706b
--- /dev/null
+++ b/angular-bootstrap-calendar/index.d.ts
@@ -0,0 +1,140 @@
+// Type definitions for angular-bootstrap-calendar
+// Project: https://github.com/mattlewis92/angular-bootstrap-calendar
+// Definitions by: Egor Komarov <https://github.com/Odrin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as moment from '../moment';
+
+declare global {
+    namespace angular.bootstrap.calendar {
+        interface IEvent {
+            /**
+             * The title of the event
+             */
+            title: string;
+            /**
+             * The type of the event (determines its color). Can be important, warning, info, inverse, success or special
+             */
+            type: string;
+            /**
+             * A javascript date object for when the event starts
+             */
+            startsAt: Date;
+            /**
+             * Optional - a javascript date object for when the event ends
+             */
+            endsAt?: Date;
+            /**
+             * If edit-event-html is set and this field is explicitly set to false then dont make it editable.
+             */
+            editable?: boolean;
+            /**
+             * If delete-event-html is set and this field is explicitly set to false then dont make it deleteable
+             */
+            deletable?: boolean;
+            /**
+             * Allow an event to be dragged and dropped
+             */
+            draggable?: boolean;
+            /**
+             * Allow an event to be resizable
+             */
+            resizable?: boolean;
+            /**
+             * If set to false then will not count towards the badge total amount on the month and year view
+             */
+            incrementsBadgeTotal?: boolean;
+            /**
+             * If set the event will recur on the given period. Valid values are year or month
+             */
+            recursOn?: string;
+            /**
+             * A CSS class (or more, just separate with spaces) that will be added to the event when it is displayed on each view. Useful for marking an event as selected / active etc
+             */
+            cssClass?: string;
+        }
+
+        interface ICalendarConfig {
+            allDateFormats: {
+                angular: IFormats;
+                moment: IFormats;
+            };
+            dateFormats: IDateFormats;
+            titleFormats: ITitleFormats;
+            dateFormatter: string;
+            displayEventEndTimes: boolean;
+            showTimesOnWeekView: boolean;
+            displayAllMonthEvents: boolean;
+            i18nStrings: { weekNumber: string; };
+            templates: {
+                calendarDayView: string;
+                calendarHourList: string;
+                calendarMonthCell: string;
+                calendarMonthCellEvents: string;
+                calendarMonthView: string;
+                calendarSlideBox: string;
+                calendarWeekView: string;
+                calendarYearView: string;
+            };
+        }
+
+        interface IFormats {
+            date: IDateFormats;
+            title: ITitleFormats;
+        }
+
+        interface IDateFormats {
+            hour: string;
+            day: string;
+            month: string;
+            weekDay: string;
+            time: string;
+            datetime: string;
+        }
+
+        interface ITitleFormats {
+            day: string;
+            week: string;
+            month: string;
+            year: string;
+        }
+
+        interface ICalendarCell {
+            label: number;
+            date: moment.Moment;
+            inMonth: boolean;
+            isPast: boolean;
+            isToday: boolean;
+            isFuture: boolean;
+            isWeekend: boolean;
+            events: IEvent[];
+            badgeTotal: number;
+        }
+
+        namespace events {
+            interface IOnEventClick {
+                (calendarEvent: IEvent): void;
+            }
+
+            interface IOnEventTimesChanged {
+                (calendarEvent: IEvent, calendarNewEventStart: Date, calendarNewEventEnd: Date): void;
+            }
+
+            interface IOnEditEventClick {
+                (calendarEvent: IEvent): void;
+            }
+
+            interface IOnDeleteEventClick {
+                (calendarEvent: IEvent): void;
+            }
+
+            interface IOnTimespanClick {
+                (calendarDate: Date, calendarCell: ICalendarCell): void;
+            }
+
+            interface IOnViewChangeClick {
+                (calendarDate: Date, calendarNextView: string): void;
+            }
+        }
+    }
+}
diff --git a/angular-bootstrap-calendar/tsconfig.json b/angular-bootstrap-calendar/tsconfig.json
new file mode 100644
index 0000000000..d16259ef3f
--- /dev/null
+++ b/angular-bootstrap-calendar/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-bootstrap-calendar-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-bootstrap-lightbox/angular-bootstrap-lightbox-tests.ts b/angular-bootstrap-lightbox/angular-bootstrap-lightbox-tests.ts
index 21e9b2ce98..a2373785ce 100644
--- a/angular-bootstrap-lightbox/angular-bootstrap-lightbox-tests.ts
+++ b/angular-bootstrap-lightbox/angular-bootstrap-lightbox-tests.ts
@@ -1,5 +1,3 @@
-///<reference path='angular-bootstrap-lightbox.d.ts'/>
-
 var imageList:angular.bootstrap.lightbox.ILightboxImageInfo[] = [];
 imageList.push({
 	url: 'url1',
diff --git a/angular-bootstrap-lightbox/angular-bootstrap-lightbox.d.ts b/angular-bootstrap-lightbox/index.d.ts
similarity index 100%
rename from angular-bootstrap-lightbox/angular-bootstrap-lightbox.d.ts
rename to angular-bootstrap-lightbox/index.d.ts
diff --git a/angular-bootstrap-lightbox/tsconfig.json b/angular-bootstrap-lightbox/tsconfig.json
new file mode 100644
index 0000000000..f9004cb8c8
--- /dev/null
+++ b/angular-bootstrap-lightbox/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-bootstrap-lightbox-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-breadcrumb/angular-breadcrumb.d.ts b/angular-breadcrumb/angular-breadcrumb.d.ts
deleted file mode 100644
index 7df33ddef5..0000000000
--- a/angular-breadcrumb/angular-breadcrumb.d.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-// Type definitions for angular-breadcrumb 0.4.1
-// Project: https://github.com/ncuillery/angular-breadcrumb
-// Definitions by: Marc Talary <https://github.com/marctalary>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angular-ui-router/angular-ui-router.d.ts" />
-declare namespace angular.ui {
-    export interface IState {
-        ncyBreadcrumb?: {
-            /**
-             * Contains the label for the step in the breadcrumb. The state name is used if not defined.
-             **/
-            label?: string;
-            /**
-             * Override the parent state (only for the breadcrumb)
-             **/
-            parent?: string;
-            /**
-            * When defined to true, the state is never included in the chain of states and never appears in the breadcrumb
-            **/
-            skip?: boolean;
-        },
-        ncyBreadcrumbLabel?: string;
-        ncyBreadcrumbLink?: string;
-    }
-}
-
-declare namespace ncy {
-	
-    /**
-    * Provider that returns an instance of $breadcrumb service. It contains the global configuration of the module.
-    **/
-    export interface $breadcrumbProvider {
-        /**
-        * Setter for options defined in a module.config block
-        **/
-        setOptions(options: breadcrumbProviderOptions): void;
-    }
-	
-    /**
-    * Global configuration options for angular-breadcrumb
-    **/
-    export interface breadcrumbProviderOptions {
-        /**
-        * An existing state's name to be the state is the first step of the breadcrumb
-        **/
-        prefixStateName?: string;
-
-        /**
-        * Contains a predefined template's name; 'bootstrap3' (default), 'bootstrap2' or HTML for a custom template. This property is ignored if templateUrl is defined.
-        **/
-        template?: string;
-
-        /** 
-        * Contains the path to a template file. This property takes precedence over the template property.
-        **/
-        templateUrl?: string;
-
-        /**
-        * If true, abstract states are included in the breadcrumb. This option has a lower priority than the state-specific option skip
-        **/
-        includeAbstract?: boolean;
-    }
-
-    /**
-    * Service responsible for access to $state and for directive configuration.
-    **/
-    export interface $breadcrumbService {
-        /**
-        * Returns the state chain to the current state (i.e. all the steps of the breadcrumb). It's an array of state object enriched with the module-specific property ncyBreadcrumbLink (the href for the breadcrumb step).
-        **/
-        getStatesChain(): angular.ui.IState[];
-
-        /**
-        * Return the last step of the breadcrumb, generally the one relative to the current state, expect if it is configured as skipped (the method returns its parent). As getStatesChain, the state object is enriched with ncyBreadcrumbLink.
-        **/
-        getLastStep(): angular.ui.IState;
-    }
-}
\ No newline at end of file
diff --git a/angular-breadcrumb/index.d.ts b/angular-breadcrumb/index.d.ts
new file mode 100644
index 0000000000..cc3da7fff4
--- /dev/null
+++ b/angular-breadcrumb/index.d.ts
@@ -0,0 +1,79 @@
+// Type definitions for angular-breadcrumb 0.4.1
+// Project: https://github.com/ncuillery/angular-breadcrumb
+// Definitions by: Marc Talary <https://github.com/marctalary>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angular-ui-router" />
+declare namespace angular.ui {
+    export interface IState {
+        ncyBreadcrumb?: {
+            /**
+             * Contains the label for the step in the breadcrumb. The state name is used if not defined.
+             **/
+            label?: string;
+            /**
+             * Override the parent state (only for the breadcrumb)
+             **/
+            parent?: string;
+            /**
+            * When defined to true, the state is never included in the chain of states and never appears in the breadcrumb
+            **/
+            skip?: boolean;
+        },
+        ncyBreadcrumbLabel?: string;
+        ncyBreadcrumbLink?: string;
+    }
+}
+
+declare namespace ncy {
+	
+    /**
+    * Provider that returns an instance of $breadcrumb service. It contains the global configuration of the module.
+    **/
+    export interface $breadcrumbProvider {
+        /**
+        * Setter for options defined in a module.config block
+        **/
+        setOptions(options: breadcrumbProviderOptions): void;
+    }
+	
+    /**
+    * Global configuration options for angular-breadcrumb
+    **/
+    export interface breadcrumbProviderOptions {
+        /**
+        * An existing state's name to be the state is the first step of the breadcrumb
+        **/
+        prefixStateName?: string;
+
+        /**
+        * Contains a predefined template's name; 'bootstrap3' (default), 'bootstrap2' or HTML for a custom template. This property is ignored if templateUrl is defined.
+        **/
+        template?: string;
+
+        /** 
+        * Contains the path to a template file. This property takes precedence over the template property.
+        **/
+        templateUrl?: string;
+
+        /**
+        * If true, abstract states are included in the breadcrumb. This option has a lower priority than the state-specific option skip
+        **/
+        includeAbstract?: boolean;
+    }
+
+    /**
+    * Service responsible for access to $state and for directive configuration.
+    **/
+    export interface $breadcrumbService {
+        /**
+        * Returns the state chain to the current state (i.e. all the steps of the breadcrumb). It's an array of state object enriched with the module-specific property ncyBreadcrumbLink (the href for the breadcrumb step).
+        **/
+        getStatesChain(): angular.ui.IState[];
+
+        /**
+        * Return the last step of the breadcrumb, generally the one relative to the current state, expect if it is configured as skipped (the method returns its parent). As getStatesChain, the state object is enriched with ncyBreadcrumbLink.
+        **/
+        getLastStep(): angular.ui.IState;
+    }
+}
\ No newline at end of file
diff --git a/angular-breadcrumb/tsconfig.json b/angular-breadcrumb/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/angular-breadcrumb/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-cookie/angular-cookie-tests.ts b/angular-cookie/angular-cookie-tests.ts
index e6280fbeba..7600762086 100644
--- a/angular-cookie/angular-cookie-tests.ts
+++ b/angular-cookie/angular-cookie-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path='../angularjs/angular.d.ts' />
-/// <reference path='angular-cookie.d.ts' />
-
 angular.module('myApp', ['ipCookie'])
     .controller('cookieController', ['ipCookie', function(ipCookie: angular.cookie.CookieService) {
         ipCookie('key', 'value');
diff --git a/angular-cookie/angular-cookie.d.ts b/angular-cookie/angular-cookie.d.ts
deleted file mode 100644
index 02700ea1bd..0000000000
--- a/angular-cookie/angular-cookie.d.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-// Type definitions for angular-cookie v4.1.0
-// Project: https://github.com/ivpusic/angular-cookie
-// Definitions by: Borislav Zhivkov <https://github.com/borislavjivkov>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace angular.cookie {
-    interface CookieService {
-        /**
-         * Get all cookies
-         */
-        (): any;
-
-        /**
-         * Get a cookie with a specific key
-         */
-        (key: string): any;
-
-        /**
-         * Create a cookie
-         */
-        (key: string, value: any, options?: CookieOptions): any;
-
-        /**
-         * Remove a cookie
-         */
-        remove(key: string, options?: CookieOptions): void;
-    }
-
-    interface CookieOptions {
-        /**
-         * The domain tells the browser to which domain the cookie should be sent. If you don't specify it, it becomes the domain of the page that sets the cookie.
-         */
-        domain?: string;
-
-        /**
-         * The path gives you the chance to specify a directory where the cookie is active.
-         */
-        path?: string;
-
-        /**
-         * Each cookie has an expiry date after which it is trashed. If you don't specify the expiry date the cookie is trashed when you close the browser.
-         */
-        expires?: number;
-
-        /**
-         * Allows you to set the expiration time in hours, minutes, seconds, or `milliseconds. If this is not specified, any expiration time specified will default to days.
-         */
-        expirationUnit?: string;
-
-        /**
-         * The Secure attribute is meant to keep cookie communication limited to encrypted transmission, directing browsers to use cookies only via secure/encrypted connections.
-         */
-        secure?: boolean;
-
-        /**
-         * The method that will be used to encode the cookie value (should be passed when using Set).
-         */
-        encode?: (value: any) => any;
-
-        /**
-         * The method that will be used to decode extracted cookie values (should be passed when using Get).
-         */
-        decode?: (value: any) => any;
-    }
-}
diff --git a/angular-cookie/index.d.ts b/angular-cookie/index.d.ts
new file mode 100644
index 0000000000..0296a91b60
--- /dev/null
+++ b/angular-cookie/index.d.ts
@@ -0,0 +1,67 @@
+// Type definitions for angular-cookie v4.1.0
+// Project: https://github.com/ivpusic/angular-cookie
+// Definitions by: Borislav Zhivkov <https://github.com/borislavjivkov>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare namespace angular.cookie {
+    interface CookieService {
+        /**
+         * Get all cookies
+         */
+        (): any;
+
+        /**
+         * Get a cookie with a specific key
+         */
+        (key: string): any;
+
+        /**
+         * Create a cookie
+         */
+        (key: string, value: any, options?: CookieOptions): any;
+
+        /**
+         * Remove a cookie
+         */
+        remove(key: string, options?: CookieOptions): void;
+    }
+
+    interface CookieOptions {
+        /**
+         * The domain tells the browser to which domain the cookie should be sent. If you don't specify it, it becomes the domain of the page that sets the cookie.
+         */
+        domain?: string;
+
+        /**
+         * The path gives you the chance to specify a directory where the cookie is active.
+         */
+        path?: string;
+
+        /**
+         * Each cookie has an expiry date after which it is trashed. If you don't specify the expiry date the cookie is trashed when you close the browser.
+         */
+        expires?: number;
+
+        /**
+         * Allows you to set the expiration time in hours, minutes, seconds, or `milliseconds. If this is not specified, any expiration time specified will default to days.
+         */
+        expirationUnit?: string;
+
+        /**
+         * The Secure attribute is meant to keep cookie communication limited to encrypted transmission, directing browsers to use cookies only via secure/encrypted connections.
+         */
+        secure?: boolean;
+
+        /**
+         * The method that will be used to encode the cookie value (should be passed when using Set).
+         */
+        encode?: (value: any) => any;
+
+        /**
+         * The method that will be used to decode extracted cookie values (should be passed when using Get).
+         */
+        decode?: (value: any) => any;
+    }
+}
diff --git a/angular-cookie/tsconfig.json b/angular-cookie/tsconfig.json
new file mode 100644
index 0000000000..daef4f499a
--- /dev/null
+++ b/angular-cookie/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-cookie-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-dialog-service/angular-dialog-service-tests.ts b/angular-dialog-service/angular-dialog-service-tests.ts
index 8142a3a713..bdacb26da2 100644
--- a/angular-dialog-service/angular-dialog-service-tests.ts
+++ b/angular-dialog-service/angular-dialog-service-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-dialog-service.d.ts" />
+
 
 
 var options : angular.dialogservice.IDialogOptions = {};
diff --git a/angular-dialog-service/angular-dialog-service.d.ts b/angular-dialog-service/angular-dialog-service.d.ts
deleted file mode 100644
index 3d75e32222..0000000000
--- a/angular-dialog-service/angular-dialog-service.d.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-// Type definitions for Angular Dialog Service 5.2.8
-// Project: https://github.com/m-e-conroy/angular-dialog-service
-// Definitions by: William Comartin <https://github.com/wcomartin>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts"/>
-/// <reference path="../angular-ui-bootstrap/angular-ui-bootstrap.d.ts"/>
-
-declare namespace angular.dialogservice {
-
-  interface IDialogOptions {
-    /**
-     * Set to false to disable animations on new modal/backdrop. Does not toggle animations for modals/backdrops that are already displayed.
-     *
-     * @default false
-     */
-    animation?: boolean;
-
-    /**
-     * controls the presence of a backdrop
-     * Allowed values:
-     *   - true (default)
-     *   - false (no backdrop)
-     *   - 'static' backdrop is present but modal window is not closed when clicking outside of the modal window
-     *
-     * @default true
-     */
-    backdrop?: boolean | string;
-
-    /**
-     * indicates whether the dialog should be closable by hitting the ESC key
-     *
-     * @default true
-     */
-    keyboard?: boolean;
-
-    /**
-     * additional CSS class(es) to be added to a modal backdrop template
-     *
-     * @default 'dialogs-backdrop-default'
-     */
-    backdropClass?: string;
-
-    /**
-     * additional CSS class(es) to be added to a modal window template
-     *
-     * @default 'dialogs-default'
-     */
-    windowClass?: string;
-
-    /**
-     * Optional suffix of modal window class. The value used is appended to the `modal-` class, i.e. a value of `sm` gives `modal-sm`.
-     *
-     * @default 'lg'
-     */
-    size?: string;
-  }
-
-  interface IDialogService {
-    /**
-     * Opens a new error modal instance.
-     */
-    error(header: string, msg: string, opts?: IDialogOptions): ng.ui.bootstrap.IModalServiceInstance
-    /**
-     * Opens a new wait modal instance.
-     */
-    wait(header: string, msg: string, progress: number, opts?: IDialogOptions): ng.ui.bootstrap.IModalServiceInstance
-    /**
-     * Opens a new notify modal instance.
-     */
-    notify(header: string, msg: string, opts?: IDialogOptions): ng.ui.bootstrap.IModalServiceInstance
-    /**
-     * Opens a new confirm modal instance.
-     */
-    confirm(header: string, msg: string, opts?: IDialogOptions): ng.ui.bootstrap.IModalServiceInstance
-    /**
-     * Opens a new custom modal instance.
-     */
-    create(url: string, ctrlr: string, data: any, opts?: IDialogOptions): ng.ui.bootstrap.IModalServiceInstance
-  }
-
-}
diff --git a/angular-dialog-service/index.d.ts b/angular-dialog-service/index.d.ts
new file mode 100644
index 0000000000..1b5bd031c4
--- /dev/null
+++ b/angular-dialog-service/index.d.ts
@@ -0,0 +1,82 @@
+// Type definitions for Angular Dialog Service 5.2.8
+// Project: https://github.com/m-e-conroy/angular-dialog-service
+// Definitions by: William Comartin <https://github.com/wcomartin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs"/>
+/// <reference types="angular-ui-bootstrap"/>
+
+declare namespace angular.dialogservice {
+
+  interface IDialogOptions {
+    /**
+     * Set to false to disable animations on new modal/backdrop. Does not toggle animations for modals/backdrops that are already displayed.
+     *
+     * @default false
+     */
+    animation?: boolean;
+
+    /**
+     * controls the presence of a backdrop
+     * Allowed values:
+     *   - true (default)
+     *   - false (no backdrop)
+     *   - 'static' backdrop is present but modal window is not closed when clicking outside of the modal window
+     *
+     * @default true
+     */
+    backdrop?: boolean | string;
+
+    /**
+     * indicates whether the dialog should be closable by hitting the ESC key
+     *
+     * @default true
+     */
+    keyboard?: boolean;
+
+    /**
+     * additional CSS class(es) to be added to a modal backdrop template
+     *
+     * @default 'dialogs-backdrop-default'
+     */
+    backdropClass?: string;
+
+    /**
+     * additional CSS class(es) to be added to a modal window template
+     *
+     * @default 'dialogs-default'
+     */
+    windowClass?: string;
+
+    /**
+     * Optional suffix of modal window class. The value used is appended to the `modal-` class, i.e. a value of `sm` gives `modal-sm`.
+     *
+     * @default 'lg'
+     */
+    size?: string;
+  }
+
+  interface IDialogService {
+    /**
+     * Opens a new error modal instance.
+     */
+    error(header: string, msg: string, opts?: IDialogOptions): ng.ui.bootstrap.IModalServiceInstance
+    /**
+     * Opens a new wait modal instance.
+     */
+    wait(header: string, msg: string, progress: number, opts?: IDialogOptions): ng.ui.bootstrap.IModalServiceInstance
+    /**
+     * Opens a new notify modal instance.
+     */
+    notify(header: string, msg: string, opts?: IDialogOptions): ng.ui.bootstrap.IModalServiceInstance
+    /**
+     * Opens a new confirm modal instance.
+     */
+    confirm(header: string, msg: string, opts?: IDialogOptions): ng.ui.bootstrap.IModalServiceInstance
+    /**
+     * Opens a new custom modal instance.
+     */
+    create(url: string, ctrlr: string, data: any, opts?: IDialogOptions): ng.ui.bootstrap.IModalServiceInstance
+  }
+
+}
diff --git a/angular-dialog-service/tsconfig.json b/angular-dialog-service/tsconfig.json
new file mode 100644
index 0000000000..d3a707034f
--- /dev/null
+++ b/angular-dialog-service/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-dialog-service-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-dynamic-locale/angular-dynamic-locale-tests.ts b/angular-dynamic-locale/angular-dynamic-locale-tests.ts
index a42d0c4460..968d4995e8 100644
--- a/angular-dynamic-locale/angular-dynamic-locale-tests.ts
+++ b/angular-dynamic-locale/angular-dynamic-locale-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path='../angularjs/angular.d.ts' />
-/// <reference path='angular-dynamic-locale.d.ts' />
-
+import * as angular from 'angularjs';
 var app = angular.module('testModule', ['tmh.dynamicLocale']);
 app.config((localStorageServiceProvider: angular.dynamicLocale.tmhDynamicLocaleProvider) => {
 	localStorageServiceProvider
diff --git a/angular-dynamic-locale/angular-dynamic-locale.d.ts b/angular-dynamic-locale/angular-dynamic-locale.d.ts
deleted file mode 100644
index 4b7a1f9656..0000000000
--- a/angular-dynamic-locale/angular-dynamic-locale.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// Type definitions for angular-dynamic-locale v0.1.27
-// Project: https://github.com/lgalfaso/angular-dynamic-locale
-// Definitions by: Stephen Lautier <https://github.com/stephenlautier>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare module "angular-dynamic-locale" {
-	import ng = angular.dynamicLocale;
-	export = ng;
-}
-
-declare namespace angular.dynamicLocale {
-
-	interface tmhDynamicLocaleService {
-		set(locale: string): void;
-		get(): string;
-	}
-
-	interface tmhDynamicLocaleProvider extends angular.IServiceProvider {
-		localeLocationPattern(location: string): tmhDynamicLocaleProvider;
-		localeLocationPattern(): string;
-		useStorage(storageName: string): void;
-		useCookieStorage(): void;
-	}
-}
diff --git a/angular-dynamic-locale/index.d.ts b/angular-dynamic-locale/index.d.ts
new file mode 100644
index 0000000000..13bf9d795f
--- /dev/null
+++ b/angular-dynamic-locale/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for angular-dynamic-locale v0.1.27
+// Project: https://github.com/lgalfaso/angular-dynamic-locale
+// Definitions by: Stephen Lautier <https://github.com/stephenlautier>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+import * as angular from 'angularjs';
+
+declare module 'angularjs' {
+	export namespace dynamicLocale {
+
+		interface tmhDynamicLocaleService {
+			set(locale: string): void;
+			get(): string;
+		}
+
+		interface tmhDynamicLocaleProvider extends angular.IServiceProvider {
+			localeLocationPattern(location: string): tmhDynamicLocaleProvider;
+			localeLocationPattern(): string;
+			useStorage(storageName: string): void;
+			useCookieStorage(): void;
+		}
+	}
+}
+
+
diff --git a/angular-dynamic-locale/tsconfig.json b/angular-dynamic-locale/tsconfig.json
new file mode 100644
index 0000000000..d67e7e4e4d
--- /dev/null
+++ b/angular-dynamic-locale/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-dynamic-locale-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-environment/angular-environment-tests.ts b/angular-environment/angular-environment-tests.ts
index e7c077fafe..3b63095202 100644
--- a/angular-environment/angular-environment-tests.ts
+++ b/angular-environment/angular-environment-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-environment.d.ts" />
+
 var envServiceProvider: angular.environment.ServiceProvider;
 var envService: angular.environment.Service;
 
diff --git a/angular-environment/angular-environment.d.ts b/angular-environment/index.d.ts
similarity index 100%
rename from angular-environment/angular-environment.d.ts
rename to angular-environment/index.d.ts
diff --git a/angular-environment/tsconfig.json b/angular-environment/tsconfig.json
new file mode 100644
index 0000000000..2cef36a142
--- /dev/null
+++ b/angular-environment/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-environment-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-file-upload/angular-file-upload.d.ts b/angular-file-upload/angular-file-upload.d.ts
deleted file mode 100644
index c79f6b5528..0000000000
--- a/angular-file-upload/angular-file-upload.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Type definitions for Angular File Upload 4.2.1
-// Project: https://github.com/danialfarid/ng-file-upload
-// Definitions by: John Reilly <https://github.com/johnnyreilly>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../ng-file-upload/ng-file-upload.d.ts" />
-
-// THIS FILE WILL REMOVE IF angular-file-upload.d.ts incoming.
diff --git a/angular-file-upload/index.d.ts b/angular-file-upload/index.d.ts
new file mode 100644
index 0000000000..6a5d821a91
--- /dev/null
+++ b/angular-file-upload/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for Angular File Upload 4.2.1
+// Project: https://github.com/danialfarid/ng-file-upload
+// Definitions by: John Reilly <https://github.com/johnnyreilly>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="ng-file-upload" />
+
+// THIS FILE WILL REMOVE IF angular-file-upload.d.ts incoming.
diff --git a/angular-file-upload/tsconfig.json b/angular-file-upload/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/angular-file-upload/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-formly/angular-formly-tests.ts b/angular-formly/angular-formly-tests.ts
index 01449aa4b7..83f13af2d4 100644
--- a/angular-formly/angular-formly-tests.ts
+++ b/angular-formly/angular-formly-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-formly.d.ts" />
+
 
 var app = angular.module('app', ['formly']);
 
diff --git a/angular-formly/angular-formly.d.ts b/angular-formly/angular-formly.d.ts
deleted file mode 100644
index 206d3294f9..0000000000
--- a/angular-formly/angular-formly.d.ts
+++ /dev/null
@@ -1,637 +0,0 @@
-// Type definitions for angular-formly 7.2.3
-// Project: https://github.com/formly-js/angular-formly
-// Definitions by: Scott Hatcher <https://github.com/scatcher>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare module 'AngularFormly' {
-	export = AngularFormly;
-}
-
-declare module 'angular-formly' {
-	var angularFormlyDefaultExport: string;
-	export = angularFormlyDefaultExport;
-}
-
-declare namespace AngularFormly {
-
-	interface IFieldArray extends Array<IFieldConfigurationObject | IFieldGroup> {
-
-	}
-
-	interface IFieldGroup {
-		data?: {
-			[key: string]: any;
-		};
-		className?: string;
-		elementAttributes?: string;
-		fieldGroup?: IFieldArray;
-		form?: Object;
-		hide?: boolean;
-		hideExpression?: string | IExpressionFunction;
-		key?: string | number;
-		model?: string | {
-			[key: string]: any;
-		};
-		options?: IFormOptionsAPI;
-		templateOptions?: ITemplateOptions;
-		wrapper?: string | string[];
-	}
-
-
-	interface IFormOptionsAPI {
-		data?: {
-			[key: string]: any;
-		};
-		fieldTransform?: Function;
-		formState?: Object;
-		removeChromeAutoComplete?: boolean;
-		resetModel?: Function;
-		templateManipulators?: ITemplateManipulators;
-		updateInitialValue?: Function;
-		wrapper?: string | string[];
-	}
-
-
-	/**
-	 * see http://docs.angular-formly.com/docs/formly-expressions#expressionproperties-validators--messages
-	 */
-	interface IExpressionFunction {
-		($viewValue: any, $modelValue: any, scope: ITemplateScope): any;
-	}
-
-
-	interface IModelOptions {
-		updateOn?: string;
-		debounce?: number;
-		allowInvalid?: boolean;
-		getterSetter?: string;
-		timezone?: string;
-	}
-
-
-	interface ITemplateManipulator {
-		(template: string | HTMLElement, options: Object, scope: ITemplateScope): string | HTMLElement;
-	}
-
-
-	interface ITemplateManipulators {
-		preWrapper?: ITemplateManipulator[];
-		postWrapper?: ITemplateManipulator[];
-	}
-
-	interface ISelectOption {
-		name: string;
-		value?: string;
-		group?: string;
-	}
-
-	/**
-	 * see http://docs.angular-formly.com/docs/ngmodelattrstemplatemanipulator
-	 */
-	interface ITemplateOptions {
-
-		// both attribute or regular attribute
-		disabled?: boolean;
-		maxlength?: number;
-		minlength?: number;
-		pattern?: string;
-		required?: boolean;
-
-		//attribute only
-		max?: number;
-		min?: number;
-		placeholder?: number | string;
-		tabindex?: number;
-		type?: string;
-
-		//expression types
-		onBlur?: string | IExpressionFunction;
-		onChange?: string | IExpressionFunction;
-		onClick?: string | IExpressionFunction;
-		onFocus?: string | IExpressionFunction;
-		onKeydown?: string | IExpressionFunction;
-		onKeypress?: string | IExpressionFunction;
-		onKeyup?: string | IExpressionFunction;
-
-		//Bootstrap types
-		label?: string;
-		description?: string;
-		[key: string]: any;
-
-		// types for select/radio fields
-		options?: Array<ISelectOption>;
-		groupProp?: string;  // default: group
-		valueProp?: string;  // default: value
-		labelProp?: string;  // default: name
-
-	}
-
-
-	/**
-	 * see http://docs.angular-formly.com/docs/field-configuration-object#validators-object
-	 */
-	interface IValidator {
-		expression: string | IExpressionFunction;
-		message?: string | IExpressionFunction;
-	}
-
-
-	/**
-	 * An object which has at least two properties called expression and listener. The watch.expression
-	 * is added to the formly-form directive's scope (to allow it to run even when hide is true). You
-	 * can specify a type ($watchCollection or $watchGroup) via the watcher.type property (defaults to
-	 * $watch) and whether you want it to be a deep watch via the watcher.deep property (defaults to false).
-	 *
-	 * see http://docs.angular-formly.com/docs/field-configuration-object#watcher-objectarray-of-watches
-	 */
-	interface IWatcher {
-		deep?: boolean; //Defaults to false
-		expression?: string | { (field: string, scope: ITemplateScope): boolean };
-		listener: (field: string, newValue: any, oldValue: any, scope: ITemplateScope, stopWatching: Function) => void;
-		type?: string; //Defaults to $watch but can be set to $watchCollection or $watchGroup
-	}
-
-
-	// see http://docs.angular-formly.com/docs/field-configuration-object
-	interface IFieldConfigurationObject {
-
-
-		/**
-		 * Added in 6.18.0
-		 *
-		 * Demo
-		 * see http://angular-formly.com/#/example/other/unique-value-async-validation
-		 */
-		asyncValidators?: {
-			[key: string]: string | IExpressionFunction | IValidator;
-		};
-
-		/**
-		 * This is a great way to add custom behavior to a specific field. It is injectable with the $scope of the
-		 * field, and anything else you have in your injector.
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#controller-controller-name-as-string--controller-f
-		 */
-		controller?: string | Function;
-
-
-		/**
-		 * This is reserved for the developer. You have our guarantee to be able to use this and not worry about
-		 * future versions of formly overriding your usage and preventing you from upgrading :-)
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#data-object
-		 */
-		data?: {
-			[key: string]: any;
-		};
-
-
-		/**
-		 * Use defaultValue to initialize it the model. If this is provided and the value of the
-		 * model at compile-time is undefined, then the value of the model will be assigned to defaultValue.
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#defaultvalue-any
-		 */
-		defaultValue?: any;
-
-
-		/**
-		 * You can specify your own class that will be applied to the formly-field directive (or ng-form of
-		 * a fieldGroup).
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#classname-string
-		 */
-		className?: string;
-
-
-		elementAttributes?: {
-			[key: string]: string;
-		};
-
-
-		/**
-		 * An object where the key is a property to be set on the main field config and the value is an
-		 * expression used to assign that property. The value is a formly expressions. The returned value is
-		 * wrapped in $q.when so you can return a promise from your function :-)
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#expressionproperties-object
-		 */
-		expressionProperties?: {
-			[key: string]: string | IExpressionFunction | IValidator;
-		};
-
-
-		/**
-		 * Uses ng-if. Whether to hide the field. Defaults to false. If you wish this to be conditional, use
-		 * hideExpression. See below.
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#hide-boolean
-		 */
-		hide?: boolean;
-
-
-		/**
-		 * This is similar to expressionProperties with a slight difference. You should (hopefully) never
-		 * notice the difference with the most common use case. This is available due to limitations with
-		 * expressionProperties and ng-if not working together very nicely.
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#hideexpression-string--function
-		 */
-		hideExpression?: string | IExpressionFunction;
-
-
-		/**
-		 * This allows you to specify the id of your field (which will be used for its name as well unless
-		 * a name is provided). Note, you can also override the id generation code using the formlyConfig
-		 * extra called getFieldId.
-		 *
-		 * AVOID THIS
-		 * If you don't have to do this, don't. Specifying IDs makes it harder to re-use things and it's
-		 * just extra work. Part of the beauty that angular-formly provides is the fact that you don't need
-		 * to concern yourself with making sure that this is unique.
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#id-string
-		 */
-		id?: string;
-
-
-		initialValue?: any;
-
-
-		/**
-		 * Can be set instead of type or template to use a custom html template form field. Works
-		 * just like a directive templateUrl and uses the $templateCache
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#key-string
-		 */
-		key?: string | number;
-
-
-		/**
-		 * This allows you to specify a link function. It is invoked after your template has finished compiling.
-		 * You are passed the normal arguments for a normal link function.
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#link-link-function
-		 */
-		link?: ng.IDirectiveLinkFn;
-
-
-		/**
-		 * By default, the model passed to the formly-field directive is the same as the model passed to the
-		 * formly-form. However, if the field has a model specified, then it is used for that field (and that
-		 * field only). In addition, a deep watch is added to the formly-field directive's scope to run the
-		 * expressionProperties when the specified model changes.
-		 *
-		 * Note, the formly-form directive will allow you to specify a string which is an (almost) formly
-		 * expression which allows you to define the model as relative to the scope of the form.
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#model-object--string
-		 */
-		model?: string | {
-			[key: string]: any;
-		};
-
-
-		/**
-		 * Allows you to take advantage of ng-model-options directive. Formly's built-in templateManipulator (see
-		 * below) will add this attribute to your ng-model element automatically if this property exists. Note,
-		 * if you use the getter/setter option, formly's templateManipulator will change the value of ng-model
-		 * to options.value which is a getterSetter that formly adds to field options.
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#modeloptions
-		 */
-		modelOptions?: IModelOptions;
-
-
-		/**
-		 * If you wish to, you can specify a specific name for your ng-model. This is useful if you're posting
-		 * the form to a server using techniques of yester-year.
-		 *
-		 * AVOID THIS
-		 * If you don't have to do this, don't. It's just extra work. Part of the beauty that angular-formly
-		 * provides is the fact that you don't need to concern yourself with stuff like this.
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#name-string
-		 */
-		name?: string;
-
-
-		/**
-		 * This is used by ngModelAttrsTemplateManipulator to automatically add attributes to the ng-model element
-		 * of field templates. You will likely not use this often. This object is a little complex, but extremely
-		 * powerful. It's best to explain this api via an example. For more information, see the guide on ngModelAttrs.
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#ngmodelattrs-object
-		 */
-		ngModelAttrs?: {
-			attribute?: any;
-			bound?: any;
-			expression?: any;
-			value?: any;
-			[key: string]: any;
-		};
-
-
-		/**
-		 * This allows you to place attributes with string values on the ng-model element.
-		 * Easy to use alternative to ngModelAttrs option.
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#ngmodelelattrs-object
-		 */
-		ngModelElAttrs?: {
-			[key: string]: string;
-		};
-
-
-		/**
-		 * Used to tell angular-formly to not attempt to add the formControl property to your object. This is useful
-		 * for things like validation, but not necessary if your "field" doesn't use ng-model (if it's just a horizontal
-		 * line for example). Defaults to undefined.
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#noformcontrol-boolean
-		 */
-		noFormControl?: boolean;
-
-
-		/**
-		 * Allows you to specify extra types to get options from. Duplicate options are overridden in later priority
-		 * (index 1 will override index 0 properties). Also, these are applied after the type's defaultOptions and
-		 * hence will override any duplicates of those properties as well.
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#optionstypes-string--array-of-strings
-		 */
-		optionsTypes?: string | string[];
-
-
-		/**
-		 * Can be set instead of type or templateUrl to use a custom html
-		 * template form field. Recommended to be used with one-liners mostly
-		 * (like a directive), or if you're using webpack with the ability to require templates :-)
-		 *
-		 * If a function is passed, it is invoked with the field configuration object and can return
-		 * either a string for the template or a promise that resolves to a string.
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#template-string--function
-		 */
-		template?: string | { (fieldConfiguration: IFieldConfigurationObject): string | ng.IPromise<string> };
-
-
-		/**
-		 * Allows you to specify custom template manipulators for this specific field. (use defaultOptions in a
-		 * type configuration if you want it to apply to all fields of a certain type).
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#templatemanipulator-object-of-arrays-of-functions
-		 */
-		templateManipulators?: ITemplateManipulators;
-
-
-		/**
-		 * This is reserved for the templates. Any template-specific options go in here. Look at your specific
-		 * template implementation to know the options required for this.
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#templateoptions-object
-		 */
-		templateOptions?: ITemplateOptions;
-
-
-		/**
-		 * Can be set instead of type or template to use a custom html template form field. Works
-		 * just like a directive templateUrl and uses the $templateCache
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#templateurl-string--function
-		 */
-		templateUrl?: string | { (fieldConfiguration: IFieldConfigurationObject): string | ng.IPromise<string> };
-
-
-		/**
-		 * The type of field to be rendered. This is the recommended method
-		 * for defining fields. Types must be pre-defined using formlyConfig.
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#type-string
-		 */
-		type?: string;
-
-
-		/**
-		 * An object with a few useful properties mostly handy when used in combination with ng-messages
-		 */
-		validation?: {
-
-			/**
-			 * This is set by angular-formly. This is a boolean indicating whether an error message should be shown. Because
-			 * you generally only want to show error messages when the user has interacted with a specific field, this value
-			 * is set to true based on this rule: field invalid && (field touched || validation.show) (with slight difference
-			 * for pre-angular 1.3 because it doesn't have touched support).
-			 */
-			errorExistsAndShouldBeVisible?: boolean;
-
-
-			/**
-			 * A map of Formly Expressions mapped to message names. This is really useful when you're using ng-messages
-			 * like in this example.
-			 */
-			messages?: {
-				[key: string]: IExpressionFunction | string;
-			}
-
-
-			/**
-			 * A boolean you as the developer can set to specify to force options.validation.errorExistsAndShouldBeVisible
-			 * to be set to true when there are $errors. This is useful when you're trying to call the user's attention to
-			 * some fields for some reason.
-			 */
-			show?: boolean;
-
-		};
-
-
-		/**
-		 * An object where the keys are the name of the validator and the values are Formly Expressions;
-		 *
-		 * Async Validation
-		 * All function validators can return true/false/Promise. A validator passes if it returns true or a promise
-		 * that is resolved. A validator fails if it returns false or a promise that is rejected.
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#validators-object
-		 */
-		validators?: {
-			[key: string]: string | IExpressionFunction | IValidator;
-		};
-
-
-		/**
-		 * This is a getter/setter function for the value that your field is representing. Useful when using getterSetter: true
-		 * in the modelOptions (in fact, if you don't disable the ngModelAttrsTemplateManipulator that comes built-in with formly,
-		 * it will automagically change your field's ng-model attribute to use options.value.
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#value-gettersetter-function
-		 */
-		value?(): any; //Getter
-		value?(val: any): void; //Setter
-
-
-		/**
-		 * An object which has at least two properties called expression and listener. The watch.expression is added
-		 * to the formly-form directive's scope (to allow it to run even when hide is true). You can specify a type
-		 * ($watchCollection or $watchGroup) via the watcher.type property (defaults to $watch) and whether you want
-		 * it to be a deep watch via the watcher.deep property (defaults to false).
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#watcher-objectarray-of-watches
-		 */
-		watcher?: IWatcher | IWatcher[];
-
-
-		/**
-		 * This makes reference to setWrapper in formlyConfig. It is expected to be the name of the wrapper. If
-		 * given an array, the formly field template will be wrapped by the first wrapper, then the second, then
-		 * the third, etc. You can also specify these as part of a type (which is the recommended approach).
-		 * Specifying this property will override the wrappers for the type for this field.
-		 *
-		 * http://docs.angular-formly.com/docs/field-configuration-object#wrapper-string--array-of-strings
-		 */
-		wrapper?: string | string[];
-
-
-		//ALL PROPERTIES BELOW ARE ADDED (So you should not be setting them yourself.)
-
-
-		/**
-		 * This is the NgModelController for the field. It provides you with awesome stuff like $errors :-)
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#formcontrol-ngmodelcontroller
-		 */
-		formControl?: ng.IFormController | ng.IFormController[];
-
-
-		/**
-		 * Will reset the field's model and the field control to the last initialValue. This is used by the
-		 * formly-form's options.resetModel function.
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#resetmodel-function
-		 */
-		resetModel?: () => void;
-
-
-		/**
-		 * It is not likely that you'll ever want to invoke this function. It simply runs the expressionProperties expressions.
-		 * It is used internally and you shouldn't have to use it, but you can if you want to, and any breaking changes to the
-		 * way it works will result in a major version change, so you can rely on its api.
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#runexpressions-function
-		 */
-		runExpressions?: () => void;
-
-
-		/**
-		 * Will reset the field's initialValue to the current state of the model. Useful if you load the model asynchronously.
-		 * Invoke this when the model gets set. This is used by the formly-form's options.updateInitialValue function.
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#updateinitialvalue-function
-		 */
-		updateInitialValue?: () => void;
-
-	}
-
-	/**
-	 *
-	 *
-	 * see http://docs.angular-formly.com/docs/custom-templates#section-formlyconfig-settype-options
-	 */
-	interface ITypeOptions {
-		apiCheck?: { [key: string]: Function };
-		apiCheckFunction?: string; //'throw' or 'warn
-		apiCheckInstance?: any;
-		apiCheckOptions?: Object;
-		defaultOptions?: IFieldConfigurationObject | Function;
-		controller?: Function | string | any[];
-		data?: {
-			[key: string]: any;
-		};
-		extends?: string;
-		link?: ng.IDirectiveLinkFn;
-		overwriteOk?: boolean;
-		name: string;
-		template?: Function | string;
-		templateUrl?: Function | string;
-		validateOptions?: Function;
-		wrapper?: string | string[];
-	}
-
-	interface IWrapperOptions {
-		apiCheck?: { [key: string]: Function };
-		apiCheckFunction?: string; //'throw' or 'warn
-		apiCheckInstance?: any;
-		apiCheckOptions?: Object;
-		overwriteOk?: boolean;
-		name?: string;
-		template?: string;
-		templateUrl?: string;
-		types?: string[];
-		validateOptions?: Function;
-	}
-
-	interface IFormlyConfigExtras {
-		disableNgModelAttrsManipulator: boolean;
-		apiCheckInstance: any;
-		ngModelAttrsManipulatorPreferUnbound: boolean;
-		removeChromeAutoComplete: boolean;
-		defaultHideDirective: string;
-		errorExistsAndShouldBeVisibleExpression: any;
-		getFieldId: Function;
-		fieldTransform: Function;
-		explicitAsync: boolean;
-	}
-
-	interface IFormlyConfig {
-		disableWarnings: boolean;
-		extras: IFormlyConfigExtras;
-		setType(typeOptions: ITypeOptions): void;
-		setWrapper(wrapperOptions: IWrapperOptions): void;
-		templateManipulators: ITemplateManipulators;
-	}
-
-	interface ITemplateScopeOptions {
-		formControl: ng.IFormController | ng.IFormController[];
-		templateOptions: ITemplateOptions;
-		validation: Object;
-	}
-
-	/**
-	 * see http://docs.angular-formly.com/docs/custom-templates#templates-scope
-	 */
-	interface ITemplateScope {
-		options: ITemplateScopeOptions;
-		//Shortcut to options.formControl
-		fc: ng.IFormController | ng.IFormController[];
-		//all the fields for the form
-		fields: IFieldArray;
-		//the form controller the field is in
-		form: any;
-		//The object passed as options.formState to the formly-form directive. Use this to share state between fields.
-		formState: Object;
-		//The id of the field. You shouldn't have to use this.
-		id: string;
-		//The index of the field the form is on (in ng-repeat)
-		index: number;
-		//the model of the form (or the model specified by the field if it was specified).
-		model?: string | {
-			[key: string]: any;
-		};
-		//Shortcut to options.validation.errorExistsAndShouldBeVisible
-		showError: boolean;
-		//Shortcut to options.templateOptions
-		to: ITemplateOptions;
-	}
-
-	/**
-	 * see http://docs.angular-formly.com/docs/formlyvalidationmessages#addtemplateoptionvaluemessage
-	 */
-	interface IValidationMessages {
-		addTemplateOptionValueMessage(name: string, prop: string, prefix: string, suffix: string, alternate: string): void;
-		addStringMessage(name: string, string: string): void;
-		messages: { [key: string]: ($viewValue: any, $modelValue: any, scope: ITemplateScope) => string };
-	}
-
-}
diff --git a/angular-formly/index.d.ts b/angular-formly/index.d.ts
new file mode 100644
index 0000000000..8d06554ed2
--- /dev/null
+++ b/angular-formly/index.d.ts
@@ -0,0 +1,637 @@
+// Type definitions for angular-formly 7.2.3
+// Project: https://github.com/formly-js/angular-formly
+// Definitions by: Scott Hatcher <https://github.com/scatcher>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare module 'AngularFormly' {
+	export = AngularFormly;
+}
+
+declare module 'angular-formly' {
+	var angularFormlyDefaultExport: string;
+	export = angularFormlyDefaultExport;
+}
+
+declare namespace AngularFormly {
+
+	interface IFieldArray extends Array<IFieldConfigurationObject | IFieldGroup> {
+
+	}
+
+	interface IFieldGroup {
+		data?: {
+			[key: string]: any;
+		};
+		className?: string;
+		elementAttributes?: string;
+		fieldGroup?: IFieldArray;
+		form?: Object;
+		hide?: boolean;
+		hideExpression?: string | IExpressionFunction;
+		key?: string | number;
+		model?: string | {
+			[key: string]: any;
+		};
+		options?: IFormOptionsAPI;
+		templateOptions?: ITemplateOptions;
+		wrapper?: string | string[];
+	}
+
+
+	interface IFormOptionsAPI {
+		data?: {
+			[key: string]: any;
+		};
+		fieldTransform?: Function;
+		formState?: Object;
+		removeChromeAutoComplete?: boolean;
+		resetModel?: Function;
+		templateManipulators?: ITemplateManipulators;
+		updateInitialValue?: Function;
+		wrapper?: string | string[];
+	}
+
+
+	/**
+	 * see http://docs.angular-formly.com/docs/formly-expressions#expressionproperties-validators--messages
+	 */
+	interface IExpressionFunction {
+		($viewValue: any, $modelValue: any, scope: ITemplateScope): any;
+	}
+
+
+	interface IModelOptions {
+		updateOn?: string;
+		debounce?: number;
+		allowInvalid?: boolean;
+		getterSetter?: string;
+		timezone?: string;
+	}
+
+
+	interface ITemplateManipulator {
+		(template: string | HTMLElement, options: Object, scope: ITemplateScope): string | HTMLElement;
+	}
+
+
+	interface ITemplateManipulators {
+		preWrapper?: ITemplateManipulator[];
+		postWrapper?: ITemplateManipulator[];
+	}
+
+	interface ISelectOption {
+		name: string;
+		value?: string;
+		group?: string;
+	}
+
+	/**
+	 * see http://docs.angular-formly.com/docs/ngmodelattrstemplatemanipulator
+	 */
+	interface ITemplateOptions {
+
+		// both attribute or regular attribute
+		disabled?: boolean;
+		maxlength?: number;
+		minlength?: number;
+		pattern?: string;
+		required?: boolean;
+
+		//attribute only
+		max?: number;
+		min?: number;
+		placeholder?: number | string;
+		tabindex?: number;
+		type?: string;
+
+		//expression types
+		onBlur?: string | IExpressionFunction;
+		onChange?: string | IExpressionFunction;
+		onClick?: string | IExpressionFunction;
+		onFocus?: string | IExpressionFunction;
+		onKeydown?: string | IExpressionFunction;
+		onKeypress?: string | IExpressionFunction;
+		onKeyup?: string | IExpressionFunction;
+
+		//Bootstrap types
+		label?: string;
+		description?: string;
+		[key: string]: any;
+
+		// types for select/radio fields
+		options?: Array<ISelectOption>;
+		groupProp?: string;  // default: group
+		valueProp?: string;  // default: value
+		labelProp?: string;  // default: name
+
+	}
+
+
+	/**
+	 * see http://docs.angular-formly.com/docs/field-configuration-object#validators-object
+	 */
+	interface IValidator {
+		expression: string | IExpressionFunction;
+		message?: string | IExpressionFunction;
+	}
+
+
+	/**
+	 * An object which has at least two properties called expression and listener. The watch.expression
+	 * is added to the formly-form directive's scope (to allow it to run even when hide is true). You
+	 * can specify a type ($watchCollection or $watchGroup) via the watcher.type property (defaults to
+	 * $watch) and whether you want it to be a deep watch via the watcher.deep property (defaults to false).
+	 *
+	 * see http://docs.angular-formly.com/docs/field-configuration-object#watcher-objectarray-of-watches
+	 */
+	interface IWatcher {
+		deep?: boolean; //Defaults to false
+		expression?: string | { (field: string, scope: ITemplateScope): boolean };
+		listener: (field: string, newValue: any, oldValue: any, scope: ITemplateScope, stopWatching: Function) => void;
+		type?: string; //Defaults to $watch but can be set to $watchCollection or $watchGroup
+	}
+
+
+	// see http://docs.angular-formly.com/docs/field-configuration-object
+	interface IFieldConfigurationObject {
+
+
+		/**
+		 * Added in 6.18.0
+		 *
+		 * Demo
+		 * see http://angular-formly.com/#/example/other/unique-value-async-validation
+		 */
+		asyncValidators?: {
+			[key: string]: string | IExpressionFunction | IValidator;
+		};
+
+		/**
+		 * This is a great way to add custom behavior to a specific field. It is injectable with the $scope of the
+		 * field, and anything else you have in your injector.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#controller-controller-name-as-string--controller-f
+		 */
+		controller?: string | Function;
+
+
+		/**
+		 * This is reserved for the developer. You have our guarantee to be able to use this and not worry about
+		 * future versions of formly overriding your usage and preventing you from upgrading :-)
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#data-object
+		 */
+		data?: {
+			[key: string]: any;
+		};
+
+
+		/**
+		 * Use defaultValue to initialize it the model. If this is provided and the value of the
+		 * model at compile-time is undefined, then the value of the model will be assigned to defaultValue.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#defaultvalue-any
+		 */
+		defaultValue?: any;
+
+
+		/**
+		 * You can specify your own class that will be applied to the formly-field directive (or ng-form of
+		 * a fieldGroup).
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#classname-string
+		 */
+		className?: string;
+
+
+		elementAttributes?: {
+			[key: string]: string;
+		};
+
+
+		/**
+		 * An object where the key is a property to be set on the main field config and the value is an
+		 * expression used to assign that property. The value is a formly expressions. The returned value is
+		 * wrapped in $q.when so you can return a promise from your function :-)
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#expressionproperties-object
+		 */
+		expressionProperties?: {
+			[key: string]: string | IExpressionFunction | IValidator;
+		};
+
+
+		/**
+		 * Uses ng-if. Whether to hide the field. Defaults to false. If you wish this to be conditional, use
+		 * hideExpression. See below.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#hide-boolean
+		 */
+		hide?: boolean;
+
+
+		/**
+		 * This is similar to expressionProperties with a slight difference. You should (hopefully) never
+		 * notice the difference with the most common use case. This is available due to limitations with
+		 * expressionProperties and ng-if not working together very nicely.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#hideexpression-string--function
+		 */
+		hideExpression?: string | IExpressionFunction;
+
+
+		/**
+		 * This allows you to specify the id of your field (which will be used for its name as well unless
+		 * a name is provided). Note, you can also override the id generation code using the formlyConfig
+		 * extra called getFieldId.
+		 *
+		 * AVOID THIS
+		 * If you don't have to do this, don't. Specifying IDs makes it harder to re-use things and it's
+		 * just extra work. Part of the beauty that angular-formly provides is the fact that you don't need
+		 * to concern yourself with making sure that this is unique.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#id-string
+		 */
+		id?: string;
+
+
+		initialValue?: any;
+
+
+		/**
+		 * Can be set instead of type or template to use a custom html template form field. Works
+		 * just like a directive templateUrl and uses the $templateCache
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#key-string
+		 */
+		key?: string | number;
+
+
+		/**
+		 * This allows you to specify a link function. It is invoked after your template has finished compiling.
+		 * You are passed the normal arguments for a normal link function.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#link-link-function
+		 */
+		link?: ng.IDirectiveLinkFn;
+
+
+		/**
+		 * By default, the model passed to the formly-field directive is the same as the model passed to the
+		 * formly-form. However, if the field has a model specified, then it is used for that field (and that
+		 * field only). In addition, a deep watch is added to the formly-field directive's scope to run the
+		 * expressionProperties when the specified model changes.
+		 *
+		 * Note, the formly-form directive will allow you to specify a string which is an (almost) formly
+		 * expression which allows you to define the model as relative to the scope of the form.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#model-object--string
+		 */
+		model?: string | {
+			[key: string]: any;
+		};
+
+
+		/**
+		 * Allows you to take advantage of ng-model-options directive. Formly's built-in templateManipulator (see
+		 * below) will add this attribute to your ng-model element automatically if this property exists. Note,
+		 * if you use the getter/setter option, formly's templateManipulator will change the value of ng-model
+		 * to options.value which is a getterSetter that formly adds to field options.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#modeloptions
+		 */
+		modelOptions?: IModelOptions;
+
+
+		/**
+		 * If you wish to, you can specify a specific name for your ng-model. This is useful if you're posting
+		 * the form to a server using techniques of yester-year.
+		 *
+		 * AVOID THIS
+		 * If you don't have to do this, don't. It's just extra work. Part of the beauty that angular-formly
+		 * provides is the fact that you don't need to concern yourself with stuff like this.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#name-string
+		 */
+		name?: string;
+
+
+		/**
+		 * This is used by ngModelAttrsTemplateManipulator to automatically add attributes to the ng-model element
+		 * of field templates. You will likely not use this often. This object is a little complex, but extremely
+		 * powerful. It's best to explain this api via an example. For more information, see the guide on ngModelAttrs.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#ngmodelattrs-object
+		 */
+		ngModelAttrs?: {
+			attribute?: any;
+			bound?: any;
+			expression?: any;
+			value?: any;
+			[key: string]: any;
+		};
+
+
+		/**
+		 * This allows you to place attributes with string values on the ng-model element.
+		 * Easy to use alternative to ngModelAttrs option.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#ngmodelelattrs-object
+		 */
+		ngModelElAttrs?: {
+			[key: string]: string;
+		};
+
+
+		/**
+		 * Used to tell angular-formly to not attempt to add the formControl property to your object. This is useful
+		 * for things like validation, but not necessary if your "field" doesn't use ng-model (if it's just a horizontal
+		 * line for example). Defaults to undefined.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#noformcontrol-boolean
+		 */
+		noFormControl?: boolean;
+
+
+		/**
+		 * Allows you to specify extra types to get options from. Duplicate options are overridden in later priority
+		 * (index 1 will override index 0 properties). Also, these are applied after the type's defaultOptions and
+		 * hence will override any duplicates of those properties as well.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#optionstypes-string--array-of-strings
+		 */
+		optionsTypes?: string | string[];
+
+
+		/**
+		 * Can be set instead of type or templateUrl to use a custom html
+		 * template form field. Recommended to be used with one-liners mostly
+		 * (like a directive), or if you're using webpack with the ability to require templates :-)
+		 *
+		 * If a function is passed, it is invoked with the field configuration object and can return
+		 * either a string for the template or a promise that resolves to a string.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#template-string--function
+		 */
+		template?: string | { (fieldConfiguration: IFieldConfigurationObject): string | ng.IPromise<string> };
+
+
+		/**
+		 * Allows you to specify custom template manipulators for this specific field. (use defaultOptions in a
+		 * type configuration if you want it to apply to all fields of a certain type).
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#templatemanipulator-object-of-arrays-of-functions
+		 */
+		templateManipulators?: ITemplateManipulators;
+
+
+		/**
+		 * This is reserved for the templates. Any template-specific options go in here. Look at your specific
+		 * template implementation to know the options required for this.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#templateoptions-object
+		 */
+		templateOptions?: ITemplateOptions;
+
+
+		/**
+		 * Can be set instead of type or template to use a custom html template form field. Works
+		 * just like a directive templateUrl and uses the $templateCache
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#templateurl-string--function
+		 */
+		templateUrl?: string | { (fieldConfiguration: IFieldConfigurationObject): string | ng.IPromise<string> };
+
+
+		/**
+		 * The type of field to be rendered. This is the recommended method
+		 * for defining fields. Types must be pre-defined using formlyConfig.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#type-string
+		 */
+		type?: string;
+
+
+		/**
+		 * An object with a few useful properties mostly handy when used in combination with ng-messages
+		 */
+		validation?: {
+
+			/**
+			 * This is set by angular-formly. This is a boolean indicating whether an error message should be shown. Because
+			 * you generally only want to show error messages when the user has interacted with a specific field, this value
+			 * is set to true based on this rule: field invalid && (field touched || validation.show) (with slight difference
+			 * for pre-angular 1.3 because it doesn't have touched support).
+			 */
+			errorExistsAndShouldBeVisible?: boolean;
+
+
+			/**
+			 * A map of Formly Expressions mapped to message names. This is really useful when you're using ng-messages
+			 * like in this example.
+			 */
+			messages?: {
+				[key: string]: IExpressionFunction | string;
+			}
+
+
+			/**
+			 * A boolean you as the developer can set to specify to force options.validation.errorExistsAndShouldBeVisible
+			 * to be set to true when there are $errors. This is useful when you're trying to call the user's attention to
+			 * some fields for some reason.
+			 */
+			show?: boolean;
+
+		};
+
+
+		/**
+		 * An object where the keys are the name of the validator and the values are Formly Expressions;
+		 *
+		 * Async Validation
+		 * All function validators can return true/false/Promise. A validator passes if it returns true or a promise
+		 * that is resolved. A validator fails if it returns false or a promise that is rejected.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#validators-object
+		 */
+		validators?: {
+			[key: string]: string | IExpressionFunction | IValidator;
+		};
+
+
+		/**
+		 * This is a getter/setter function for the value that your field is representing. Useful when using getterSetter: true
+		 * in the modelOptions (in fact, if you don't disable the ngModelAttrsTemplateManipulator that comes built-in with formly,
+		 * it will automagically change your field's ng-model attribute to use options.value.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#value-gettersetter-function
+		 */
+		value?(): any; //Getter
+		value?(val: any): void; //Setter
+
+
+		/**
+		 * An object which has at least two properties called expression and listener. The watch.expression is added
+		 * to the formly-form directive's scope (to allow it to run even when hide is true). You can specify a type
+		 * ($watchCollection or $watchGroup) via the watcher.type property (defaults to $watch) and whether you want
+		 * it to be a deep watch via the watcher.deep property (defaults to false).
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#watcher-objectarray-of-watches
+		 */
+		watcher?: IWatcher | IWatcher[];
+
+
+		/**
+		 * This makes reference to setWrapper in formlyConfig. It is expected to be the name of the wrapper. If
+		 * given an array, the formly field template will be wrapped by the first wrapper, then the second, then
+		 * the third, etc. You can also specify these as part of a type (which is the recommended approach).
+		 * Specifying this property will override the wrappers for the type for this field.
+		 *
+		 * http://docs.angular-formly.com/docs/field-configuration-object#wrapper-string--array-of-strings
+		 */
+		wrapper?: string | string[];
+
+
+		//ALL PROPERTIES BELOW ARE ADDED (So you should not be setting them yourself.)
+
+
+		/**
+		 * This is the NgModelController for the field. It provides you with awesome stuff like $errors :-)
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#formcontrol-ngmodelcontroller
+		 */
+		formControl?: ng.IFormController | ng.IFormController[];
+
+
+		/**
+		 * Will reset the field's model and the field control to the last initialValue. This is used by the
+		 * formly-form's options.resetModel function.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#resetmodel-function
+		 */
+		resetModel?: () => void;
+
+
+		/**
+		 * It is not likely that you'll ever want to invoke this function. It simply runs the expressionProperties expressions.
+		 * It is used internally and you shouldn't have to use it, but you can if you want to, and any breaking changes to the
+		 * way it works will result in a major version change, so you can rely on its api.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#runexpressions-function
+		 */
+		runExpressions?: () => void;
+
+
+		/**
+		 * Will reset the field's initialValue to the current state of the model. Useful if you load the model asynchronously.
+		 * Invoke this when the model gets set. This is used by the formly-form's options.updateInitialValue function.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#updateinitialvalue-function
+		 */
+		updateInitialValue?: () => void;
+
+	}
+
+	/**
+	 *
+	 *
+	 * see http://docs.angular-formly.com/docs/custom-templates#section-formlyconfig-settype-options
+	 */
+	interface ITypeOptions {
+		apiCheck?: { [key: string]: Function };
+		apiCheckFunction?: string; //'throw' or 'warn
+		apiCheckInstance?: any;
+		apiCheckOptions?: Object;
+		defaultOptions?: IFieldConfigurationObject | Function;
+		controller?: Function | string | any[];
+		data?: {
+			[key: string]: any;
+		};
+		extends?: string;
+		link?: ng.IDirectiveLinkFn;
+		overwriteOk?: boolean;
+		name: string;
+		template?: Function | string;
+		templateUrl?: Function | string;
+		validateOptions?: Function;
+		wrapper?: string | string[];
+	}
+
+	interface IWrapperOptions {
+		apiCheck?: { [key: string]: Function };
+		apiCheckFunction?: string; //'throw' or 'warn
+		apiCheckInstance?: any;
+		apiCheckOptions?: Object;
+		overwriteOk?: boolean;
+		name?: string;
+		template?: string;
+		templateUrl?: string;
+		types?: string[];
+		validateOptions?: Function;
+	}
+
+	interface IFormlyConfigExtras {
+		disableNgModelAttrsManipulator: boolean;
+		apiCheckInstance: any;
+		ngModelAttrsManipulatorPreferUnbound: boolean;
+		removeChromeAutoComplete: boolean;
+		defaultHideDirective: string;
+		errorExistsAndShouldBeVisibleExpression: any;
+		getFieldId: Function;
+		fieldTransform: Function;
+		explicitAsync: boolean;
+	}
+
+	interface IFormlyConfig {
+		disableWarnings: boolean;
+		extras: IFormlyConfigExtras;
+		setType(typeOptions: ITypeOptions): void;
+		setWrapper(wrapperOptions: IWrapperOptions): void;
+		templateManipulators: ITemplateManipulators;
+	}
+
+	interface ITemplateScopeOptions {
+		formControl: ng.IFormController | ng.IFormController[];
+		templateOptions: ITemplateOptions;
+		validation: Object;
+	}
+
+	/**
+	 * see http://docs.angular-formly.com/docs/custom-templates#templates-scope
+	 */
+	interface ITemplateScope {
+		options: ITemplateScopeOptions;
+		//Shortcut to options.formControl
+		fc: ng.IFormController | ng.IFormController[];
+		//all the fields for the form
+		fields: IFieldArray;
+		//the form controller the field is in
+		form: any;
+		//The object passed as options.formState to the formly-form directive. Use this to share state between fields.
+		formState: Object;
+		//The id of the field. You shouldn't have to use this.
+		id: string;
+		//The index of the field the form is on (in ng-repeat)
+		index: number;
+		//the model of the form (or the model specified by the field if it was specified).
+		model?: string | {
+			[key: string]: any;
+		};
+		//Shortcut to options.validation.errorExistsAndShouldBeVisible
+		showError: boolean;
+		//Shortcut to options.templateOptions
+		to: ITemplateOptions;
+	}
+
+	/**
+	 * see http://docs.angular-formly.com/docs/formlyvalidationmessages#addtemplateoptionvaluemessage
+	 */
+	interface IValidationMessages {
+		addTemplateOptionValueMessage(name: string, prop: string, prefix: string, suffix: string, alternate: string): void;
+		addStringMessage(name: string, string: string): void;
+		messages: { [key: string]: ($viewValue: any, $modelValue: any, scope: ITemplateScope) => string };
+	}
+
+}
diff --git a/angular-formly/tsconfig.json b/angular-formly/tsconfig.json
new file mode 100644
index 0000000000..40e004021f
--- /dev/null
+++ b/angular-formly/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-formly-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-fullscreen/angular-fullscreen-tests.ts b/angular-fullscreen/angular-fullscreen-tests.ts
index f45202c0db..ea7c9821f8 100644
--- a/angular-fullscreen/angular-fullscreen-tests.ts
+++ b/angular-fullscreen/angular-fullscreen-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-fullscreen.d.ts" />
+
 
 angular
   .module('TestApp', ['FBAngular'])
diff --git a/angular-fullscreen/angular-fullscreen.d.ts b/angular-fullscreen/angular-fullscreen.d.ts
deleted file mode 100644
index 414754db43..0000000000
--- a/angular-fullscreen/angular-fullscreen.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// Type definitions for AngularJS HTML5 Fullscreen v1.0.1
-// Project: https://github.com/fabiobiondi/angular-fullscreen
-// Definitions by: Julien Paroche <https://github.com/julienpa>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/angular-fullscreen
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace angular.fullscreen {
-
-  /**
-   * Prefixing interface name with "I" is not recommended: http://www.typescriptlang.org/Handbook#writing-dts-files
-   * However, we let it here to keep consistency with all the other Angular-related definitions
-   */
-  interface IFullscreen {
-    // enable document fullscreen
-    all(): void;
-
-    // enable or disable the document fullscreen
-    toggleAll(): void;
-
-    // enable fullscreen to a specific element
-    enable(element: Element|HTMLElement): void;
-
-    // disable fullscreen
-    cancel(): void;
-
-    // return true if fullscreen is enabled, otherwise false
-    isEnabled(): boolean;
-
-    // return true if fullscreen API is supported by your browser
-    isSupported(): boolean;
-  }
-
-}
diff --git a/angular-fullscreen/index.d.ts b/angular-fullscreen/index.d.ts
new file mode 100644
index 0000000000..b58830952b
--- /dev/null
+++ b/angular-fullscreen/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for AngularJS HTML5 Fullscreen v1.0.1
+// Project: https://github.com/fabiobiondi/angular-fullscreen
+// Definitions by: Julien Paroche <https://github.com/julienpa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/angular-fullscreen
+
+/// <reference types="angularjs" />
+
+declare namespace angular.fullscreen {
+
+  /**
+   * Prefixing interface name with "I" is not recommended: http://www.typescriptlang.org/Handbook#writing-dts-files
+   * However, we let it here to keep consistency with all the other Angular-related definitions
+   */
+  interface IFullscreen {
+    // enable document fullscreen
+    all(): void;
+
+    // enable or disable the document fullscreen
+    toggleAll(): void;
+
+    // enable fullscreen to a specific element
+    enable(element: Element|HTMLElement): void;
+
+    // disable fullscreen
+    cancel(): void;
+
+    // return true if fullscreen is enabled, otherwise false
+    isEnabled(): boolean;
+
+    // return true if fullscreen API is supported by your browser
+    isSupported(): boolean;
+  }
+
+}
diff --git a/angular-fullscreen/tsconfig.json b/angular-fullscreen/tsconfig.json
new file mode 100644
index 0000000000..88eccf263d
--- /dev/null
+++ b/angular-fullscreen/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-fullscreen-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-gettext/angular-gettext-tests.ts b/angular-gettext/angular-gettext-tests.ts
index d15924331d..4529b97e4c 100644
--- a/angular-gettext/angular-gettext-tests.ts
+++ b/angular-gettext/angular-gettext-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-gettext.d.ts" />
+
 
 namespace angular_gettext_tests {
 
diff --git a/angular-gettext/angular-gettext.d.ts b/angular-gettext/angular-gettext.d.ts
deleted file mode 100644
index 48734d4433..0000000000
--- a/angular-gettext/angular-gettext.d.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-// Type definitions for angular-gettext v2.1.0
-// Project: https://angular-gettext.rocketeer.be/
-// Definitions by: Ákos Lukács <https://github.com/AkosLukacs>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace angular.gettext {
-  interface gettextCatalog {
-
-    //////////////
-    /// Fields ///
-    //////////////
-
-    /** (default: false): Whether or not to prefix untranslated strings with [MISSING]: or a custom prefix. */
-    debug: boolean;
-    /** (default: [MISSING]:): Custom prefix for untranslated strings. */
-    debugPrefix: string;
-    /** (default: false): Whether or not to wrap all processed text with markers.Example output: [Welcome] */
-    showTranslatedMarkers: boolean;
-    /** (default: [): Custom prefix to mark strings that have been run through angular-gettext. */
-    translatedMarkerPrefix: string;
-    /** (default: ]): Custom suffix to mark strings that have been run through angular-gettext. */
-    translatedMarkerSuffix: string;
-    /** An object of loaded translation strings.Shouldn't be used directly. */
-    strings: {};
-    /** The default language, in which you're application is written. This defaults to English and it's generally a bad idea to use anything else: if your language has different pluralization rules you'll end up with incorrect translations. Deprecated
-     * @deprecreated
-     */
-    baseLanguage: string;
-
-
-    ///////////////
-    /// Methods ///
-    ///////////////
-
-    /** Sets the current language and makes sure that all translations get updated correctly. */
-    setCurrentLanguage(lang: string): void;
-
-    /** Returns the current language. */
-    getCurrentLanguage(): string;
-
-    /** Processes an object of string definitions. More details https://angular-gettext.rocketeer.be/dev-guide/manual-setstrings/
-     * @param language A language code.
-     * @param strings A dictionary of strings. The format of this dictionary is:
-     *                   - Keys: Singular English strings (as defined in the source files)
-     *                   - Values: Either a single string for signular-only strings or an array of plural forms.
-     */
-    setStrings(language: string, strings: { [key: string]: string|string[] }): void;
-
-    /** Get the correct pluralized (but untranslated) string for the value of n. */
-    getStringForm(string: string, n: number): string;
-
-    /** Translate a string with the given context. Uses Angular.JS interpolation, so something like this will do what you expect:
-     * var hello = gettextCatalog.getString("Hello {{name}}!", { name: "Ruben" });
-     * // var hello will be "Hallo Ruben!" in Dutch.
-     * The context parameter is optional: pass null (or don't pass anything) if you're not using it: this skips interpolation and is a lot faster.
-     */
-    getString(string: string, context?: any): string;
-
-    /** Translate a plural string with the given context. */
-    getPlural(n: number, string: string, stringPlural: string, context?: any): string;
-
-    /** Load a set of translation strings from a given URL.This should be a JSON catalog generated with grunt-angular-gettext. More details https://angular-gettext.rocketeer.be/dev-guide/lazy-loading/ */
-    loadRemote(url: string): ng.IHttpPromise<any>;
-  }
-
-  /** If you have text that should be translated in your JavaScript code, wrap it with a call to a function named gettext. This module provides an injectable function to do so */
-  interface gettextFunction {
-    (dummyString: string): string;
-  }
-}
-
diff --git a/angular-gettext/index.d.ts b/angular-gettext/index.d.ts
new file mode 100644
index 0000000000..7db351cfd1
--- /dev/null
+++ b/angular-gettext/index.d.ts
@@ -0,0 +1,73 @@
+// Type definitions for angular-gettext v2.1.0
+// Project: https://angular-gettext.rocketeer.be/
+// Definitions by: Ákos Lukács <https://github.com/AkosLukacs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare namespace angular.gettext {
+  interface gettextCatalog {
+
+    //////////////
+    /// Fields ///
+    //////////////
+
+    /** (default: false): Whether or not to prefix untranslated strings with [MISSING]: or a custom prefix. */
+    debug: boolean;
+    /** (default: [MISSING]:): Custom prefix for untranslated strings. */
+    debugPrefix: string;
+    /** (default: false): Whether or not to wrap all processed text with markers.Example output: [Welcome] */
+    showTranslatedMarkers: boolean;
+    /** (default: [): Custom prefix to mark strings that have been run through angular-gettext. */
+    translatedMarkerPrefix: string;
+    /** (default: ]): Custom suffix to mark strings that have been run through angular-gettext. */
+    translatedMarkerSuffix: string;
+    /** An object of loaded translation strings.Shouldn't be used directly. */
+    strings: {};
+    /** The default language, in which you're application is written. This defaults to English and it's generally a bad idea to use anything else: if your language has different pluralization rules you'll end up with incorrect translations. Deprecated
+     * @deprecreated
+     */
+    baseLanguage: string;
+
+
+    ///////////////
+    /// Methods ///
+    ///////////////
+
+    /** Sets the current language and makes sure that all translations get updated correctly. */
+    setCurrentLanguage(lang: string): void;
+
+    /** Returns the current language. */
+    getCurrentLanguage(): string;
+
+    /** Processes an object of string definitions. More details https://angular-gettext.rocketeer.be/dev-guide/manual-setstrings/
+     * @param language A language code.
+     * @param strings A dictionary of strings. The format of this dictionary is:
+     *                   - Keys: Singular English strings (as defined in the source files)
+     *                   - Values: Either a single string for signular-only strings or an array of plural forms.
+     */
+    setStrings(language: string, strings: { [key: string]: string|string[] }): void;
+
+    /** Get the correct pluralized (but untranslated) string for the value of n. */
+    getStringForm(string: string, n: number): string;
+
+    /** Translate a string with the given context. Uses Angular.JS interpolation, so something like this will do what you expect:
+     * var hello = gettextCatalog.getString("Hello {{name}}!", { name: "Ruben" });
+     * // var hello will be "Hallo Ruben!" in Dutch.
+     * The context parameter is optional: pass null (or don't pass anything) if you're not using it: this skips interpolation and is a lot faster.
+     */
+    getString(string: string, context?: any): string;
+
+    /** Translate a plural string with the given context. */
+    getPlural(n: number, string: string, stringPlural: string, context?: any): string;
+
+    /** Load a set of translation strings from a given URL.This should be a JSON catalog generated with grunt-angular-gettext. More details https://angular-gettext.rocketeer.be/dev-guide/lazy-loading/ */
+    loadRemote(url: string): ng.IHttpPromise<any>;
+  }
+
+  /** If you have text that should be translated in your JavaScript code, wrap it with a call to a function named gettext. This module provides an injectable function to do so */
+  interface gettextFunction {
+    (dummyString: string): string;
+  }
+}
+
diff --git a/angular-gettext/tsconfig.json b/angular-gettext/tsconfig.json
new file mode 100644
index 0000000000..16c1ecdbf7
--- /dev/null
+++ b/angular-gettext/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-gettext-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-google-analytics/angular-google-analytics-tests.ts b/angular-google-analytics/angular-google-analytics-tests.ts
index b8c40d64f5..42c7e1506c 100644
--- a/angular-google-analytics/angular-google-analytics-tests.ts
+++ b/angular-google-analytics/angular-google-analytics-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="angular-google-analytics.d.ts" />
-/// <reference path="angular-google-analytics-service.d.ts" />
-
 function ConfigurationMethodChaining(AnalyticsProvider: angular.google.analytics.AnalyticsProvider) {
     AnalyticsProvider
         .logAllCalls(true)
diff --git a/angular-google-analytics/angular-google-analytics.d.ts b/angular-google-analytics/angular-google-analytics.d.ts
deleted file mode 100644
index 03ef64ba75..0000000000
--- a/angular-google-analytics/angular-google-analytics.d.ts
+++ /dev/null
@@ -1,173 +0,0 @@
-// Type definitions for angular-google-analytics v1.1.0
-// Project: https://github.com/revolunet/angular-google-analytics
-// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace angular.google.analytics {
-    /**
-     * @summary Interface for {@link AnalysticsProvider}.
-     * @interface
-     */
-    interface AnalyticsProvider {
-        /**
-         * @summary Use Delay Script Tag Insertion.
-         * @param {boolean} val If true, the delay script tag is inserted.
-         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
-         */
-        delayScriptTag(val: boolean): AnalyticsProvider;
-
-        /**
-         * @summary Activates the test mode.
-         */
-        enterTestMode(): void;
-
-        /**
-         * @summary Gets the global cookie configuration.
-         * @return {Object} The global cookie configuration.
-         */
-        getCookieConfig(): Object;
-
-        /**
-         * @summary Ignore first page view.
-         * @param {boolean} val If true, the first page view is ignored.
-         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
-         */
-        ignoreFirstPageLoad(val: boolean): AnalyticsProvider;
-
-        /**
-         * @summary Enable Service Logging.
-         * @param {boolean} val If true, log all outbound calls to an in-memory array accessible.
-         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
-         */
-        logAllCalls(val: boolean): AnalyticsProvider;
-
-        /**
-         * @summary Set Google Analytics Accounts.
-         * @param {Object} tracker The account identifier(s).
-         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
-         */
-        setAccount(tracker: string|Object|Array<Object>): AnalyticsProvider;
-
-        /**
-         * @summary Set Cookie Configuration.
-         * @param {Object} config The custom cookie parameters.
-         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
-         * @deprecated
-         */
-        setCookieConfig(config: Object): AnalyticsProvider;
-
-        /**
-         * @summary Set cross-linked domains.
-         * @param {Array<string>} domains The domains.
-         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
-         */
-        setCrossLinkDomains(domains: Array<string>): AnalyticsProvider;
-
-        /**
-         * @summary Set currency.
-         * @param {string} currencyCode The currency code.
-         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
-         */
-        setCurrency(currencyCode: string): AnalyticsProvider;
-
-        /**
-         * @summary Set Domain Name.
-         * @param {string} domain The domain name.
-         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
-         */
-        setDomainName(domain: string): AnalyticsProvider;
-
-        /**
-         * @summary Enable Experiment (universal analytics only).
-         * @param {string} id The experiment identifier.
-         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
-         */
-        setExperimentId(id: string): AnalyticsProvider;
-
-        /**
-         * @summary Support Hybrid Mobile Applications.
-         * @param {boolean} val If true, each account object will disable protocol checking and all injected scripts will use the HTTPS protocol.
-         */
-        setHybridMobileSupport(val: boolean): AnalyticsProvider;
-
-        /**
-         * @summary Set the default page event name.
-         * @param {string} name The default page event name.
-         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
-         */
-        setPageEvent(name: string): AnalyticsProvider;
-
-        /**
-         * @summary Sets the regex to scrub location before sending to analytics.
-         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
-         * @param {RegExp} regex The regex.
-         */
-        setRemoveRegExp(regex: RegExp): AnalyticsProvider;
-
-        /**
-         * @summary Starts the offline mode.
-         * @param {boolean} val If true, the offline mode is started.
-         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
-         */
-        startOffline(val: boolean): AnalyticsProvider;
-
-        /**
-         * @summary Track all routes.
-         * @param {boolean} val If true, all routes are tracked.
-         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
-         */
-        trackPages(doTrack: boolean): AnalyticsProvider;
-
-        /**
-         * @summary Sets the URL prefix.
-         * @param {string} prefix The URL prefix.
-         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
-         */
-        trackPrefix(prefix: string): AnalyticsProvider;
-
-        /**
-         * @summary Track all URL query parameters.
-         * @param {boolean} val If true, all URL query parameters are tracked.
-         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
-         */
-        trackUrlParams(val: boolean): AnalyticsProvider;
-
-        /**
-         * @summary Use Classic Analytics.
-         * @param {boolean} val If true, use classic analytics.
-         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
-         */
-        useAnalytics(val: boolean): AnalyticsProvider;
-
-        /**
-         * @summary Use Cross Domain Linking.
-         * @param {boolean} val If true, the cross-linked domains are registered with Google Analytics.
-         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
-         */
-        useCrossDomainLinker(val: boolean): AnalyticsProvider;
-
-        /**
-         * @summary Use Display Features.
-         * @param {boolean} val If true, the display features module is loaded with Google Analytics.
-         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
-         */
-        useDisplayFeatures(val: boolean): AnalyticsProvider;
-
-        /**
-         * @summary Enable enhanced e-commerce module.
-         * @param {boolean} val If true, the enhanced e-commerce module is enabled.
-         * @param {boolean} enhanced If true, the "ec.js" file is used, otherwises, the "ecommerce.js" is used.
-         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
-         */
-        useECommerce(val: boolean, enhanced: boolean): AnalyticsProvider;
-
-        /**
-         * @summary Use Enhanced Link Attribution.
-         * @param {boolean} val If true, the enhanced link attribution module is loaded with Google Analytics.
-         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
-         */
-        useEnhancedLinkAttribution(val: boolean): AnalyticsProvider;
-    }
-}
diff --git a/angular-google-analytics/index.d.ts b/angular-google-analytics/index.d.ts
new file mode 100644
index 0000000000..403391f2e4
--- /dev/null
+++ b/angular-google-analytics/index.d.ts
@@ -0,0 +1,174 @@
+// Type definitions for angular-google-analytics v1.1.0
+// Project: https://github.com/revolunet/angular-google-analytics
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+/// <reference path="angular-google-analytics-service.d.ts" />
+
+declare namespace angular.google.analytics {
+    /**
+     * @summary Interface for {@link AnalysticsProvider}.
+     * @interface
+     */
+    interface AnalyticsProvider {
+        /**
+         * @summary Use Delay Script Tag Insertion.
+         * @param {boolean} val If true, the delay script tag is inserted.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        delayScriptTag(val: boolean): AnalyticsProvider;
+
+        /**
+         * @summary Activates the test mode.
+         */
+        enterTestMode(): void;
+
+        /**
+         * @summary Gets the global cookie configuration.
+         * @return {Object} The global cookie configuration.
+         */
+        getCookieConfig(): Object;
+
+        /**
+         * @summary Ignore first page view.
+         * @param {boolean} val If true, the first page view is ignored.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        ignoreFirstPageLoad(val: boolean): AnalyticsProvider;
+
+        /**
+         * @summary Enable Service Logging.
+         * @param {boolean} val If true, log all outbound calls to an in-memory array accessible.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        logAllCalls(val: boolean): AnalyticsProvider;
+
+        /**
+         * @summary Set Google Analytics Accounts.
+         * @param {Object} tracker The account identifier(s).
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        setAccount(tracker: string|Object|Array<Object>): AnalyticsProvider;
+
+        /**
+         * @summary Set Cookie Configuration.
+         * @param {Object} config The custom cookie parameters.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         * @deprecated
+         */
+        setCookieConfig(config: Object): AnalyticsProvider;
+
+        /**
+         * @summary Set cross-linked domains.
+         * @param {Array<string>} domains The domains.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        setCrossLinkDomains(domains: Array<string>): AnalyticsProvider;
+
+        /**
+         * @summary Set currency.
+         * @param {string} currencyCode The currency code.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        setCurrency(currencyCode: string): AnalyticsProvider;
+
+        /**
+         * @summary Set Domain Name.
+         * @param {string} domain The domain name.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        setDomainName(domain: string): AnalyticsProvider;
+
+        /**
+         * @summary Enable Experiment (universal analytics only).
+         * @param {string} id The experiment identifier.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        setExperimentId(id: string): AnalyticsProvider;
+
+        /**
+         * @summary Support Hybrid Mobile Applications.
+         * @param {boolean} val If true, each account object will disable protocol checking and all injected scripts will use the HTTPS protocol.
+         */
+        setHybridMobileSupport(val: boolean): AnalyticsProvider;
+
+        /**
+         * @summary Set the default page event name.
+         * @param {string} name The default page event name.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        setPageEvent(name: string): AnalyticsProvider;
+
+        /**
+         * @summary Sets the regex to scrub location before sending to analytics.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         * @param {RegExp} regex The regex.
+         */
+        setRemoveRegExp(regex: RegExp): AnalyticsProvider;
+
+        /**
+         * @summary Starts the offline mode.
+         * @param {boolean} val If true, the offline mode is started.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        startOffline(val: boolean): AnalyticsProvider;
+
+        /**
+         * @summary Track all routes.
+         * @param {boolean} val If true, all routes are tracked.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        trackPages(doTrack: boolean): AnalyticsProvider;
+
+        /**
+         * @summary Sets the URL prefix.
+         * @param {string} prefix The URL prefix.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        trackPrefix(prefix: string): AnalyticsProvider;
+
+        /**
+         * @summary Track all URL query parameters.
+         * @param {boolean} val If true, all URL query parameters are tracked.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        trackUrlParams(val: boolean): AnalyticsProvider;
+
+        /**
+         * @summary Use Classic Analytics.
+         * @param {boolean} val If true, use classic analytics.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        useAnalytics(val: boolean): AnalyticsProvider;
+
+        /**
+         * @summary Use Cross Domain Linking.
+         * @param {boolean} val If true, the cross-linked domains are registered with Google Analytics.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        useCrossDomainLinker(val: boolean): AnalyticsProvider;
+
+        /**
+         * @summary Use Display Features.
+         * @param {boolean} val If true, the display features module is loaded with Google Analytics.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        useDisplayFeatures(val: boolean): AnalyticsProvider;
+
+        /**
+         * @summary Enable enhanced e-commerce module.
+         * @param {boolean} val If true, the enhanced e-commerce module is enabled.
+         * @param {boolean} enhanced If true, the "ec.js" file is used, otherwises, the "ecommerce.js" is used.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        useECommerce(val: boolean, enhanced: boolean): AnalyticsProvider;
+
+        /**
+         * @summary Use Enhanced Link Attribution.
+         * @param {boolean} val If true, the enhanced link attribution module is loaded with Google Analytics.
+         * @return {angular.google.analytics.IAnalyticsProvider} The object instance.
+         */
+        useEnhancedLinkAttribution(val: boolean): AnalyticsProvider;
+    }
+}
diff --git a/angular-google-analytics/tsconfig.json b/angular-google-analytics/tsconfig.json
new file mode 100644
index 0000000000..f53eeaec05
--- /dev/null
+++ b/angular-google-analytics/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-google-analytics-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-growl-v2/angular-growl-v2-tests.ts b/angular-growl-v2/angular-growl-v2-tests.ts
index 13c7cad2e5..b02c768add 100644
--- a/angular-growl-v2/angular-growl-v2-tests.ts
+++ b/angular-growl-v2/angular-growl-v2-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-growl-v2.d.ts" />
+
 
 var app = angular.module("ag", ["pascalprecht.translate", "$httpProvider"]);
 
diff --git a/angular-growl-v2/angular-growl-v2.d.ts b/angular-growl-v2/angular-growl-v2.d.ts
deleted file mode 100644
index 7b67678b85..0000000000
--- a/angular-growl-v2/angular-growl-v2.d.ts
+++ /dev/null
@@ -1,259 +0,0 @@
-// Type definitions for Angular Growl 2 v.0.7.5
-// Project: http://janstevens.github.io/angular-growl-2
-// Definitions by: Tadeusz Hucal <https://github.com/mkp05>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace angular.growl {
-
-    /**
-     * Global Time-To-Leave configuration.
-     */
-    interface IGrowlTTLConfig {
-        success?: number;
-        error?: number;
-        warning?: number;
-        info?: number;
-    }
-
-    /**
-     * Custom configuration used in single message call.
-     */
-    interface IGrowlMessageConfig {
-        title?: string;
-        ttl?: number;
-        disableCountDown?: boolean;
-        disableIcons?: boolean;
-        disableCloseButton?: boolean;
-        onclose?: Function;
-        onopen?: Function;
-        position?: string;
-        referenceId?: number;
-        translateMessage?: boolean;
-        variables?: { [variable: string]: any; };
-    }
-
-    /**
-     * Growl message with configuration.
-     */
-    interface IGrowlMessage extends IGrowlMessageConfig {
-        text: string;
-
-        /**
-         * Destroy the message.
-         */
-        destroy(): void;
-        /**
-         * Update the message body.
-         * @param newText new message body
-         */
-        setText(newText: string): void;
-    }
-
-    /**
-     * Growl service provider.
-     */
-    interface IGrowlProvider extends angular.IServiceProvider {
-        /**
-         * Pre-defined server error interceptor.
-         */
-        serverMessagesInterceptor: (string|IHttpInterceptorFactory)[];
-
-        /**
-         * Set default TTL settings.
-         * @param ttl configuration of TTL for different type of message
-         */
-        globalTimeToLive(ttl: IGrowlTTLConfig): IGrowlProvider;
-        /**
-         * Set default TTL settings.
-         * @param ttl ttl in milliseconds
-         */
-        globalTimeToLive(ttl: number): IGrowlProvider;
-        /**
-         * Set default setting for disabling close button.
-         * @param disableCloseButton
-         */
-        globalDisableCloseButton(disableCloseButton: boolean): IGrowlProvider;
-        /**
-         * Set default setting for disabling icons.
-         * @param disableIcons
-         */
-        globalDisableIcons(disableIcons: boolean): IGrowlProvider;
-        /**
-         * Set reversing order of displaying new messages.
-         * @param reverseOrder
-         */
-        globalReversedOrder(reverseOrder: boolean): IGrowlProvider;
-        /**
-         * Set default setting for displaying message disappear countdown.
-         * @param disableCountDown
-         */
-        globalDisableCountDown(disableCountDown: boolean): IGrowlProvider;
-        /**
-         * Set default allowance for inline messages.
-         * @param inline
-         */
-        globalInlineMessages(inline: boolean): IGrowlProvider;
-        /**
-         * Set default message position.
-         * @param position
-         */
-        globalPosition(position: string): IGrowlProvider;
-        /**
-         * Enable/disable displaying only unique messages.
-         * @param onlyUniqueMessages
-         */
-        onlyUniqueMessages(onlyUniqueMessages: boolean): IGrowlProvider;
-
-        /**
-         * Set key where messages are stored (for http interceptor).
-         * @param messageVariableKey
-         */
-        messagesKey(messageKey: string): IGrowlProvider;
-        /**
-         * Set key where message text is stored (for http interceptor).
-         * @param messageVariableKey
-         */
-        messageTextKey(messageTextKey: string): IGrowlProvider;
-        /**
-         * Set key where title of message is stored (for http interceptor).
-         * @param messageVariableKey
-         */
-        messageTitleKey(messageTitleKey: string): IGrowlProvider;
-        /**
-         * Set key where severity of message is stored (for http interceptor).
-         * @param messageVariableKey
-         */
-        messageSeverityKey(messageSeverityKey: string): IGrowlProvider;
-        /**
-         * Set key where variables for message are stored (for http interceptor).
-         * @param messageVariableKey
-         */
-        messageVariableKey(messageVariableKey: string): IGrowlProvider;
-    }
-
-    /**
-     * Growl service.
-     */
-    interface IGrowlService {
-        /**
-         * Show warning message.
-         * @param message text to display (or code for angular-translate)
-         */
-        warning(message: string): IGrowlMessage;
-        /**
-         * Show warning message.
-         * @param message text to display (or code for angular-translate)
-         * @param config additional message configuration
-         */
-        warning(message: string, config: IGrowlMessageConfig): IGrowlMessage;
-
-        /**
-         * Show error message.
-         * @param message text to display (or code for angular-translate)
-         */
-        error(message: string): IGrowlMessage;
-        /**
-         * Show error message.
-         * @param message text to display (or code for angular-translate)
-         * @param config additional message configuration
-         */
-        error(message: string, config: IGrowlMessageConfig): IGrowlMessage;
-
-        /**
-         * Show information message.
-         * @param message text to display (or code for angular-translate)
-         */
-        info(message: string): IGrowlMessage;
-        /**
-         * Show information message.
-         * @param message text to display (or code for angular-translate)
-         * @param config additional message configuration
-         */
-        info(message: string, config: IGrowlMessageConfig): IGrowlMessage;
-
-        /**
-         * Show success message.
-         * @param message text to display (or code for angular-translate)
-         * @param config additional message configuration
-         */
-        success(message: string): IGrowlMessage;
-        /**
-         * Show success message.
-         * @param message text to display (or code for angular-translate)
-         */
-        success(message: string, config: IGrowlMessageConfig): IGrowlMessage;
-
-        /**
-         * Show message (generic).
-         * @param message text to display (or code for angular-translate)
-         */
-        general(message: string): IGrowlMessage;
-        /**
-         * Show message (generic).
-         * @param message text to display (or code for angular-translate)
-         * @param config additional message configuration
-         */
-        general(message: string, config: IGrowlMessageConfig): IGrowlMessage;
-        /**
-         * Show message (generic).
-         * @param message text to display (or code for angular-translate)
-         * @param config additional message configuration
-         * @param severity message severity (error, warning, success, info).
-         */
-        general(message: string, config: IGrowlMessageConfig, severity: string): IGrowlMessage;
-
-        /**
-         * Get current setting for displaying only unique messages.
-         */
-        onlyUnique(): boolean;
-        /**
-         * Get current setting for reversing messages order.
-         */
-        reverseOrder(): boolean;
-        /**
-         * Get current allowance for inline messages.
-         */
-        inlineMessages(): boolean;
-        /**
-         * Get current messages position.
-         */
-        position(): string;
-    }
-
-    /**
-     * GrowlMessages service.
-     */
-    interface IGrowlMessagesService {
-        /**
-         * Initialize a directive
-         * We look at the preloaded directive and use this else we
-         * create a new blank object
-         * @param referenceId
-         * @param limitMessages
-         */
-        initDirective(referenceId: number, limitMessages: number): angular.IDirective;
-
-        /**
-         * Get current messages
-         */
-        getAllMessages(referenceId?: number): IGrowlMessage[];
-
-        /**
-         * Destroy all messages
-         */
-        destroyAllMessages(referenceId?: number): void;
-
-        /**
-         * Add a message
-         */
-        addMessage(message: IGrowlMessage): IGrowlMessage;
-
-        /**
-         * Delete a message
-         */
-        deleteMessage(message: IGrowlMessage): void;
-
-    }
-}
diff --git a/angular-growl-v2/index.d.ts b/angular-growl-v2/index.d.ts
new file mode 100644
index 0000000000..4f1eeb16b8
--- /dev/null
+++ b/angular-growl-v2/index.d.ts
@@ -0,0 +1,259 @@
+// Type definitions for Angular Growl 2 v.0.7.5
+// Project: http://janstevens.github.io/angular-growl-2
+// Definitions by: Tadeusz Hucal <https://github.com/mkp05>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare namespace angular.growl {
+
+    /**
+     * Global Time-To-Leave configuration.
+     */
+    interface IGrowlTTLConfig {
+        success?: number;
+        error?: number;
+        warning?: number;
+        info?: number;
+    }
+
+    /**
+     * Custom configuration used in single message call.
+     */
+    interface IGrowlMessageConfig {
+        title?: string;
+        ttl?: number;
+        disableCountDown?: boolean;
+        disableIcons?: boolean;
+        disableCloseButton?: boolean;
+        onclose?: Function;
+        onopen?: Function;
+        position?: string;
+        referenceId?: number;
+        translateMessage?: boolean;
+        variables?: { [variable: string]: any; };
+    }
+
+    /**
+     * Growl message with configuration.
+     */
+    interface IGrowlMessage extends IGrowlMessageConfig {
+        text: string;
+
+        /**
+         * Destroy the message.
+         */
+        destroy(): void;
+        /**
+         * Update the message body.
+         * @param newText new message body
+         */
+        setText(newText: string): void;
+    }
+
+    /**
+     * Growl service provider.
+     */
+    interface IGrowlProvider extends angular.IServiceProvider {
+        /**
+         * Pre-defined server error interceptor.
+         */
+        serverMessagesInterceptor: (string|IHttpInterceptorFactory)[];
+
+        /**
+         * Set default TTL settings.
+         * @param ttl configuration of TTL for different type of message
+         */
+        globalTimeToLive(ttl: IGrowlTTLConfig): IGrowlProvider;
+        /**
+         * Set default TTL settings.
+         * @param ttl ttl in milliseconds
+         */
+        globalTimeToLive(ttl: number): IGrowlProvider;
+        /**
+         * Set default setting for disabling close button.
+         * @param disableCloseButton
+         */
+        globalDisableCloseButton(disableCloseButton: boolean): IGrowlProvider;
+        /**
+         * Set default setting for disabling icons.
+         * @param disableIcons
+         */
+        globalDisableIcons(disableIcons: boolean): IGrowlProvider;
+        /**
+         * Set reversing order of displaying new messages.
+         * @param reverseOrder
+         */
+        globalReversedOrder(reverseOrder: boolean): IGrowlProvider;
+        /**
+         * Set default setting for displaying message disappear countdown.
+         * @param disableCountDown
+         */
+        globalDisableCountDown(disableCountDown: boolean): IGrowlProvider;
+        /**
+         * Set default allowance for inline messages.
+         * @param inline
+         */
+        globalInlineMessages(inline: boolean): IGrowlProvider;
+        /**
+         * Set default message position.
+         * @param position
+         */
+        globalPosition(position: string): IGrowlProvider;
+        /**
+         * Enable/disable displaying only unique messages.
+         * @param onlyUniqueMessages
+         */
+        onlyUniqueMessages(onlyUniqueMessages: boolean): IGrowlProvider;
+
+        /**
+         * Set key where messages are stored (for http interceptor).
+         * @param messageVariableKey
+         */
+        messagesKey(messageKey: string): IGrowlProvider;
+        /**
+         * Set key where message text is stored (for http interceptor).
+         * @param messageVariableKey
+         */
+        messageTextKey(messageTextKey: string): IGrowlProvider;
+        /**
+         * Set key where title of message is stored (for http interceptor).
+         * @param messageVariableKey
+         */
+        messageTitleKey(messageTitleKey: string): IGrowlProvider;
+        /**
+         * Set key where severity of message is stored (for http interceptor).
+         * @param messageVariableKey
+         */
+        messageSeverityKey(messageSeverityKey: string): IGrowlProvider;
+        /**
+         * Set key where variables for message are stored (for http interceptor).
+         * @param messageVariableKey
+         */
+        messageVariableKey(messageVariableKey: string): IGrowlProvider;
+    }
+
+    /**
+     * Growl service.
+     */
+    interface IGrowlService {
+        /**
+         * Show warning message.
+         * @param message text to display (or code for angular-translate)
+         */
+        warning(message: string): IGrowlMessage;
+        /**
+         * Show warning message.
+         * @param message text to display (or code for angular-translate)
+         * @param config additional message configuration
+         */
+        warning(message: string, config: IGrowlMessageConfig): IGrowlMessage;
+
+        /**
+         * Show error message.
+         * @param message text to display (or code for angular-translate)
+         */
+        error(message: string): IGrowlMessage;
+        /**
+         * Show error message.
+         * @param message text to display (or code for angular-translate)
+         * @param config additional message configuration
+         */
+        error(message: string, config: IGrowlMessageConfig): IGrowlMessage;
+
+        /**
+         * Show information message.
+         * @param message text to display (or code for angular-translate)
+         */
+        info(message: string): IGrowlMessage;
+        /**
+         * Show information message.
+         * @param message text to display (or code for angular-translate)
+         * @param config additional message configuration
+         */
+        info(message: string, config: IGrowlMessageConfig): IGrowlMessage;
+
+        /**
+         * Show success message.
+         * @param message text to display (or code for angular-translate)
+         * @param config additional message configuration
+         */
+        success(message: string): IGrowlMessage;
+        /**
+         * Show success message.
+         * @param message text to display (or code for angular-translate)
+         */
+        success(message: string, config: IGrowlMessageConfig): IGrowlMessage;
+
+        /**
+         * Show message (generic).
+         * @param message text to display (or code for angular-translate)
+         */
+        general(message: string): IGrowlMessage;
+        /**
+         * Show message (generic).
+         * @param message text to display (or code for angular-translate)
+         * @param config additional message configuration
+         */
+        general(message: string, config: IGrowlMessageConfig): IGrowlMessage;
+        /**
+         * Show message (generic).
+         * @param message text to display (or code for angular-translate)
+         * @param config additional message configuration
+         * @param severity message severity (error, warning, success, info).
+         */
+        general(message: string, config: IGrowlMessageConfig, severity: string): IGrowlMessage;
+
+        /**
+         * Get current setting for displaying only unique messages.
+         */
+        onlyUnique(): boolean;
+        /**
+         * Get current setting for reversing messages order.
+         */
+        reverseOrder(): boolean;
+        /**
+         * Get current allowance for inline messages.
+         */
+        inlineMessages(): boolean;
+        /**
+         * Get current messages position.
+         */
+        position(): string;
+    }
+
+    /**
+     * GrowlMessages service.
+     */
+    interface IGrowlMessagesService {
+        /**
+         * Initialize a directive
+         * We look at the preloaded directive and use this else we
+         * create a new blank object
+         * @param referenceId
+         * @param limitMessages
+         */
+        initDirective(referenceId: number, limitMessages: number): angular.IDirective;
+
+        /**
+         * Get current messages
+         */
+        getAllMessages(referenceId?: number): IGrowlMessage[];
+
+        /**
+         * Destroy all messages
+         */
+        destroyAllMessages(referenceId?: number): void;
+
+        /**
+         * Add a message
+         */
+        addMessage(message: IGrowlMessage): IGrowlMessage;
+
+        /**
+         * Delete a message
+         */
+        deleteMessage(message: IGrowlMessage): void;
+
+    }
+}
diff --git a/angular-growl-v2/tsconfig.json b/angular-growl-v2/tsconfig.json
new file mode 100644
index 0000000000..b3c499263e
--- /dev/null
+++ b/angular-growl-v2/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-growl-v2-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-hotkeys/angular-hotkeys-tests.ts b/angular-hotkeys/angular-hotkeys-tests.ts
index c683540a3a..098c84d710 100644
--- a/angular-hotkeys/angular-hotkeys-tests.ts
+++ b/angular-hotkeys/angular-hotkeys-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="angular-hotkeys.d.ts" />
+/// <reference types="angularjs" />
+
 
 var scope: ng.IScope;
 var hotkeyProvider: ng.hotkeys.HotkeysProvider;
diff --git a/angular-hotkeys/angular-hotkeys.d.ts b/angular-hotkeys/angular-hotkeys.d.ts
deleted file mode 100644
index 407d1c7313..0000000000
--- a/angular-hotkeys/angular-hotkeys.d.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-// Type definitions for angular-hotkeys
-// Project: https://github.com/chieffancypants/angular-hotkeys
-// Definitions by: Jason Zhao <https://github.com/jlz27>, Stefan Steinhart <https://github.com/reppners>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace angular.hotkeys {
-
-    interface HotkeysProvider {
-        template: string;
-        templateTitle:string;
-        includeCheatSheet: boolean;
-        cheatSheetHotkey: string;
-        cheatSheetDescription: string;
-
-        add(combo: string|string[], callback: (event: Event, hotkey?: Hotkey) => void, action?: string, allowIn?: Array<string>, persistent?: boolean): ng.hotkeys.Hotkey;
-
-        add(combo: string|string[], description: string, callback: (event: Event, hotkey?: Hotkey) => void, action?: string, allowIn?: Array<string>, persistent?: boolean): ng.hotkeys.Hotkey;
-
-        add(hotkeyObj: ng.hotkeys.Hotkey): ng.hotkeys.Hotkey;
-
-        bindTo(scope : ng.IScope): ng.hotkeys.HotkeysProviderChained;
-
-        del(combo: string|string[]): void;
-
-        del(hotkeyObj: ng.hotkeys.Hotkey): void;
-
-        get(combo: string|string[]): ng.hotkeys.Hotkey;
-
-        toggleCheatSheet(): void;
-
-        purgeHotkeys(): void;
-    }
-
-    interface HotkeysProviderChained {
-        add(combo: string|string[], description: string, callback: (event: Event, hotkeys: ng.hotkeys.Hotkey) => void): HotkeysProviderChained;
-
-        add(hotkeyObj: ng.hotkeys.Hotkey): HotkeysProviderChained;
-    }
-
-    interface Hotkey {
-        combo: string|string[];
-        description?: string;
-        callback: (event: Event, hotkey: ng.hotkeys.Hotkey) => void;
-        action?: string;
-        allowIn?: Array<string>;
-        persistent?: boolean;
-    }
-}
diff --git a/angular-hotkeys/index.d.ts b/angular-hotkeys/index.d.ts
new file mode 100644
index 0000000000..81bb773925
--- /dev/null
+++ b/angular-hotkeys/index.d.ts
@@ -0,0 +1,50 @@
+// Type definitions for angular-hotkeys
+// Project: https://github.com/chieffancypants/angular-hotkeys
+// Definitions by: Jason Zhao <https://github.com/jlz27>, Stefan Steinhart <https://github.com/reppners>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare namespace angular.hotkeys {
+
+    interface HotkeysProvider {
+        template: string;
+        templateTitle:string;
+        includeCheatSheet: boolean;
+        cheatSheetHotkey: string;
+        cheatSheetDescription: string;
+
+        add(combo: string|string[], callback: (event: Event, hotkey?: Hotkey) => void, action?: string, allowIn?: Array<string>, persistent?: boolean): ng.hotkeys.Hotkey;
+
+        add(combo: string|string[], description: string, callback: (event: Event, hotkey?: Hotkey) => void, action?: string, allowIn?: Array<string>, persistent?: boolean): ng.hotkeys.Hotkey;
+
+        add(hotkeyObj: ng.hotkeys.Hotkey): ng.hotkeys.Hotkey;
+
+        bindTo(scope : ng.IScope): ng.hotkeys.HotkeysProviderChained;
+
+        del(combo: string|string[]): void;
+
+        del(hotkeyObj: ng.hotkeys.Hotkey): void;
+
+        get(combo: string|string[]): ng.hotkeys.Hotkey;
+
+        toggleCheatSheet(): void;
+
+        purgeHotkeys(): void;
+    }
+
+    interface HotkeysProviderChained {
+        add(combo: string|string[], description: string, callback: (event: Event, hotkeys: ng.hotkeys.Hotkey) => void): HotkeysProviderChained;
+
+        add(hotkeyObj: ng.hotkeys.Hotkey): HotkeysProviderChained;
+    }
+
+    interface Hotkey {
+        combo: string|string[];
+        description?: string;
+        callback: (event: Event, hotkey: ng.hotkeys.Hotkey) => void;
+        action?: string;
+        allowIn?: Array<string>;
+        persistent?: boolean;
+    }
+}
diff --git a/angular-hotkeys/tsconfig.json b/angular-hotkeys/tsconfig.json
new file mode 100644
index 0000000000..879a86030b
--- /dev/null
+++ b/angular-hotkeys/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-hotkeys-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-http-auth/angular-http-auth-tests.ts b/angular-http-auth/angular-http-auth-tests.ts
index 4d246d1907..e27c0199c5 100644
--- a/angular-http-auth/angular-http-auth-tests.ts
+++ b/angular-http-auth/angular-http-auth-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./angular-http-auth.d.ts" />
+
 
 (function () {
     'use strict';
diff --git a/angular-http-auth/angular-http-auth.d.ts b/angular-http-auth/angular-http-auth.d.ts
deleted file mode 100644
index d5fb52fd6c..0000000000
--- a/angular-http-auth/angular-http-auth.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Type definitions for angular-http-auth 1.2.1
-// Project: https://github.com/witoldsz/angular-http-auth
-// Definitions by: vvakame <https://github.com/vvakame>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace angular.httpAuth {
-    interface IAuthService {
-        loginConfirmed(data?:any, configUpdater?:Function):void;
-        loginCancelled(data?:any, reason?:any):void;
-    }
-
-    interface IHttpBuffer {
-        append(config:ng.IRequestConfig, deferred:{resolve(data:any):void; reject(data:any):void;}):void;
-        rejectAll(reason?:any):void;
-        retryAll(updater?:Function):void;
-    }
-}
diff --git a/angular-http-auth/index.d.ts b/angular-http-auth/index.d.ts
new file mode 100644
index 0000000000..4918c5f4df
--- /dev/null
+++ b/angular-http-auth/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for angular-http-auth 1.2.1
+// Project: https://github.com/witoldsz/angular-http-auth
+// Definitions by: vvakame <https://github.com/vvakame>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare namespace angular.httpAuth {
+    interface IAuthService {
+        loginConfirmed(data?:any, configUpdater?:Function):void;
+        loginCancelled(data?:any, reason?:any):void;
+    }
+
+    interface IHttpBuffer {
+        append(config:ng.IRequestConfig, deferred:{resolve(data:any):void; reject(data:any):void;}):void;
+        rejectAll(reason?:any):void;
+        retryAll(updater?:Function):void;
+    }
+}
diff --git a/angular-http-auth/tsconfig.json b/angular-http-auth/tsconfig.json
new file mode 100644
index 0000000000..0085a9e38a
--- /dev/null
+++ b/angular-http-auth/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-http-auth-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-httpi/angular-httpi-tests.ts b/angular-httpi/angular-httpi-tests.ts
index 47ac25228c..ff3caa0537 100644
--- a/angular-httpi/angular-httpi-tests.ts
+++ b/angular-httpi/angular-httpi-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./angular-httpi.d.ts" />
+
 
 (function() {
     'use strict';
diff --git a/angular-httpi/angular-httpi.d.ts b/angular-httpi/angular-httpi.d.ts
deleted file mode 100644
index d9aa2b5609..0000000000
--- a/angular-httpi/angular-httpi.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// Type definitions for angular-httpi
-// Project: https://github.com/bennadel/httpi
-// Definitions by: Andrew Camilleri <https://github.com/Kukks>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace Httpi {
-    export interface HttpiPayload extends ng.IRequestShortcutConfig {
-        method?: string;
-        url?: string;
-        params?: {};
-        data?: {};
-        keepTrailingSlash?: boolean;
-    }
-
-    export interface HttpiFactory {
-
-        (config: HttpiPayload): ng.IHttpPromise<{}>;
-
-        resource(url: string): HttpiResource;
-    }
-
-    export class HttpiResource {
-
-        constructor(http: ng.IHttpService, url: string);
-
-        delete<T>(config: HttpiPayload): ng.IHttpPromise<T>;
-
-        get<T>(config: HttpiPayload): ng.IHttpPromise<T>;
-
-        head<T>(config: HttpiPayload): ng.IHttpPromise<T>;
-
-        jsonp<T>(config: HttpiPayload): ng.IHttpPromise<T>;
-
-        post<T>(config: HttpiPayload): ng.IHttpPromise<T>;
-
-        put<T>(config: HttpiPayload): ng.IHttpPromise<T>;
-
-        setKeepTrailingSlash(newKeepTrailingSlash: boolean): HttpiResource;
-    }
-}
diff --git a/angular-httpi/index.d.ts b/angular-httpi/index.d.ts
new file mode 100644
index 0000000000..f41fd76382
--- /dev/null
+++ b/angular-httpi/index.d.ts
@@ -0,0 +1,42 @@
+// Type definitions for angular-httpi
+// Project: https://github.com/bennadel/httpi
+// Definitions by: Andrew Camilleri <https://github.com/Kukks>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare namespace Httpi {
+    export interface HttpiPayload extends ng.IRequestShortcutConfig {
+        method?: string;
+        url?: string;
+        params?: {};
+        data?: {};
+        keepTrailingSlash?: boolean;
+    }
+
+    export interface HttpiFactory {
+
+        (config: HttpiPayload): ng.IHttpPromise<{}>;
+
+        resource(url: string): HttpiResource;
+    }
+
+    export class HttpiResource {
+
+        constructor(http: ng.IHttpService, url: string);
+
+        delete<T>(config: HttpiPayload): ng.IHttpPromise<T>;
+
+        get<T>(config: HttpiPayload): ng.IHttpPromise<T>;
+
+        head<T>(config: HttpiPayload): ng.IHttpPromise<T>;
+
+        jsonp<T>(config: HttpiPayload): ng.IHttpPromise<T>;
+
+        post<T>(config: HttpiPayload): ng.IHttpPromise<T>;
+
+        put<T>(config: HttpiPayload): ng.IHttpPromise<T>;
+
+        setKeepTrailingSlash(newKeepTrailingSlash: boolean): HttpiResource;
+    }
+}
diff --git a/angular-httpi/tsconfig.json b/angular-httpi/tsconfig.json
new file mode 100644
index 0000000000..5d635609b7
--- /dev/null
+++ b/angular-httpi/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-httpi-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-idle/angular-idle-tests.ts b/angular-idle/angular-idle-tests.ts
index e6eb1a9f29..9f13f828a9 100644
--- a/angular-idle/angular-idle-tests.ts
+++ b/angular-idle/angular-idle-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./angular-idle.d.ts" />
+
 
 angular.module('app', ['ngIdle'])
 	.config(['KeepaliveProvider', 'IdleProvider', 'TitleProvider',
diff --git a/angular-idle/angular-idle.d.ts b/angular-idle/angular-idle.d.ts
deleted file mode 100644
index 0a980204cb..0000000000
--- a/angular-idle/angular-idle.d.ts
+++ /dev/null
@@ -1,263 +0,0 @@
-// Type definitions for ng-idle v1.1.1
-// Project: http://hackedbychinese.github.io/ng-idle/
-// Definitions by: mthamil <https://github.com/mthamil>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace angular.idle {
-
-    /**
-     * Used to configure the Title service.
-     */
-    interface ITitleProvider extends IServiceProvider {
-
-        /**
-         * Enables or disables the Title functionality.
-         *
-         * @param enabled Boolean, default is true.
-         */
-        enabled(enabled: boolean): void;
-    }
-
-    interface ITitleService {
-
-        /**
-         * Allows the title functionality to be enabled or disabled on the fly.
-         */
-        setEnabled(enabled: boolean): void;
-
-        /**
-         * Returns whether or not the title functionality has been enabled.
-         */
-        isEnabled(): boolean;
-
-        /**
-         * Will store val as the "original" title of the document.
-         *
-         * Tracking the original title is important when restoring the title after displaying, for example, the idle warning message.
-         */
-        original(val: string): void;
-
-        /**
-         * Returns the "original" title value that has been previously set.
-         *
-         * Tracking the original title is important when restoring the title after displaying, for example, the idle warning message.
-         */
-        original(): string;
-
-        /**
-         * Changes the actual title of the document.
-         */
-        value(val: string): void;
-
-        /**
-         * Returns the current document title.
-         */
-        value(): string;
-
-        /**
-         * If overwrite is false or unspecified, updates the "original" title with the current document title
-         * if it has not already been stored. If overwrite is true, the current document title is stored regardless.
-         */
-        store(overwrite?: boolean): void;
-
-        /**
-         * Sets the title to the original value (if it was stored or set previously).
-         */
-        restore(): void;
-
-        /**
-         * Sets the text to use as the message displayed when the user is idle.
-         */
-        idleMessage(val: string): void;
-
-        /**
-         * Gets the text to use as the message displayed when the user is idle.
-         */
-        idleMessage(): string;
-
-        /**
-         * Sets the text to use as the message displayed when the user is timed out.
-         */
-        timedOutMessage(val: string): void;
-
-        /**
-         * Gets the text to use as the message displayed when the user is timed out.
-         */
-        timedOutMessage(): string;
-
-        /**
-         * Stores the original title if it hasn't been already, determines the number minutes, seconds,
-         * and total seconds from countdown, and displays the idleMessage with the aforementioned values interpolated.
-         */
-        setAsIdle(countdown: number): void;
-
-        /**
-         * Stores the original title if it hasn't been already, and displays the timedOutMessage.
-         */
-        setAsTimedOut(): void;
-    }
-
-    /**
-     * Used to configure the Keepalive service.
-     */
-    interface IKeepAliveProvider extends IServiceProvider {
-
-        /**
-         * If configured, options will be used to issue a request using $http.
-         * If the value is null, no HTTP request will be issued.
-         * You can specify a string, which it will assume to be a URL to a simple GET request.
-         * Otherwise, you can use the same options $http takes. However, cache will always be false.
-         *
-         * @param value May be string or IRequestConfig, default is null.
-         */
-        http(value: string | IRequestConfig): void;
-
-        /**
-         * This specifies how often the keepalive event is triggered and the
-         * HTTP request is issued.
-         *
-         * @param seconds Integer, default is 10 minutes. Must be greater than 0.
-         */
-        interval(seconds: number): void;
-    }
-
-    /**
-     * Keepalive will use a timeout to periodically wake, broadcast a Keepalive event on the root scope,
-     * and optionally make an $http request. By default, the Idle service will stop and start Keepalive
-     * when a user becomes idle or returns from idle, respectively. It is also started automatically when
-     * Idle.watch() is called. This can be disabled by configuring the IdleProvider.
-     */
-    interface IKeepAliveService {
-
-        /**
-         * Starts pinging periodically until stop() is called.
-         */
-        start(): void;
-
-        /**
-         * Stops pinging.
-         */
-        stop(): void;
-
-        /**
-         * Performs one ping only.
-         */
-        ping(): void;
-
-        /**
-         * Changes the interval value at runtime.
-         * You will need to restart the pinging process by calling start() manually for the changes to be reflected.
-         */
-        setInterval(seconds: number): void;
-    }
-
-    /**
-     * Used to configure the Idle service.
-     */
-    interface IIdleProvider extends IServiceProvider {
-        /**
-         * Specifies the DOM events the service will watch to reset the idle timeout.
-         * Multiple events should be separated by a space.
-         *
-         * @param events string, default 'mousemove keydown DOMMouseScroll mousewheel mousedown'
-         */
-        interrupt(events: string): void;
-
-        /**
-         * The idle timeout duration in seconds. After this amount of time passes without the user
-         * performing an action that triggers one of the watched DOM events, the user is considered
-         * idle.
-         *
-         * @param seconds integer, default is 20min
-         */
-        idle(seconds: number): void;
-
-        /**
-         * The amount of time the user has to respond (in seconds) before they have been considered
-         * timed out.
-         *
-         * @param seconds integer, default is 30s
-         */
-        timeout(seconds: number): void;
-
-        /**
-         * When true or idle, user activity will automatically interrupt the warning countdown
-         * and reset the idle state. If false or off, you will need to manually call watch()
-         * when you want to start watching for idleness again. If notIdle, user activity will
-         * only automatically interrupt if the user is not yet idle.
-         *
-         * @param enabled boolean or string, possible values: off/false, idle/true, or notIdle
-         */
-        autoResume(enabled: boolean | string): void;
-
-        /**
-         * When true, the Keepalive service is automatically stopped and started as needed.
-         *
-         * @param enabled boolean, default is true
-         */
-        keepalive(enabled: boolean): void;
-    }
-
-    /**
-     * Idle, once watch() is called, will start a timeout which if expires, will enter a warning state
-     * countdown. Once the countdown reaches zero, idle will broadcast a timeout event indicating the
-     * user has timed out (where your app should log them out or whatever you like). If the user performs
-     * an action that triggers a watched DOM event that bubbles up to document.body, this will reset the
-     * idle/warning state and start the process over again.
-     */
-    interface IIdleService {
-        /**
-         * Gets the current idle value
-         */
-        getIdle(): number;
-
-        /**
-         * Gets the current timeout value
-         */
-        getTimeout(): number;
-
-        /**
-         * Updates the idle value (see IdleProvider.idle()) and
-         * restarts the watch if its running.
-         */
-        setIdle(idle: number): void;
-
-        /**
-         * Updates the timeout value (see IdleProvider.timeout()) and
-         * restarts the watch if its running.
-         */
-        setTimeout(timeout: number): void;
-
-        /**
-         * Whether user has timed out (meaning idleDuration + timeout has passed without any activity)
-         */
-        isExpired(): boolean;
-
-        /**
-         * Whether or not the watch() has been called and it is watching for idleness.
-         */
-        running(): boolean;
-
-        /**
-         * Whether or not the user appears to be idle.
-         */
-        idling(): boolean;
-
-        /**
-         * Starts watching for idleness, or resets the idle/warning state and continues watching.
-         */
-        watch(): void;
-
-        /**
-         * Stops watching for idleness, and resets the idle/warning state.
-         */
-        unwatch(): void;
-
-        /**
-         * Manually trigger the idle interrupt that normally occurs during user activity.
-         */
-        interrupt(): any;
-    }
-}
diff --git a/angular-idle/index.d.ts b/angular-idle/index.d.ts
new file mode 100644
index 0000000000..2e1d132708
--- /dev/null
+++ b/angular-idle/index.d.ts
@@ -0,0 +1,263 @@
+// Type definitions for ng-idle v1.1.1
+// Project: http://hackedbychinese.github.io/ng-idle/
+// Definitions by: mthamil <https://github.com/mthamil>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare namespace angular.idle {
+
+    /**
+     * Used to configure the Title service.
+     */
+    interface ITitleProvider extends IServiceProvider {
+
+        /**
+         * Enables or disables the Title functionality.
+         *
+         * @param enabled Boolean, default is true.
+         */
+        enabled(enabled: boolean): void;
+    }
+
+    interface ITitleService {
+
+        /**
+         * Allows the title functionality to be enabled or disabled on the fly.
+         */
+        setEnabled(enabled: boolean): void;
+
+        /**
+         * Returns whether or not the title functionality has been enabled.
+         */
+        isEnabled(): boolean;
+
+        /**
+         * Will store val as the "original" title of the document.
+         *
+         * Tracking the original title is important when restoring the title after displaying, for example, the idle warning message.
+         */
+        original(val: string): void;
+
+        /**
+         * Returns the "original" title value that has been previously set.
+         *
+         * Tracking the original title is important when restoring the title after displaying, for example, the idle warning message.
+         */
+        original(): string;
+
+        /**
+         * Changes the actual title of the document.
+         */
+        value(val: string): void;
+
+        /**
+         * Returns the current document title.
+         */
+        value(): string;
+
+        /**
+         * If overwrite is false or unspecified, updates the "original" title with the current document title
+         * if it has not already been stored. If overwrite is true, the current document title is stored regardless.
+         */
+        store(overwrite?: boolean): void;
+
+        /**
+         * Sets the title to the original value (if it was stored or set previously).
+         */
+        restore(): void;
+
+        /**
+         * Sets the text to use as the message displayed when the user is idle.
+         */
+        idleMessage(val: string): void;
+
+        /**
+         * Gets the text to use as the message displayed when the user is idle.
+         */
+        idleMessage(): string;
+
+        /**
+         * Sets the text to use as the message displayed when the user is timed out.
+         */
+        timedOutMessage(val: string): void;
+
+        /**
+         * Gets the text to use as the message displayed when the user is timed out.
+         */
+        timedOutMessage(): string;
+
+        /**
+         * Stores the original title if it hasn't been already, determines the number minutes, seconds,
+         * and total seconds from countdown, and displays the idleMessage with the aforementioned values interpolated.
+         */
+        setAsIdle(countdown: number): void;
+
+        /**
+         * Stores the original title if it hasn't been already, and displays the timedOutMessage.
+         */
+        setAsTimedOut(): void;
+    }
+
+    /**
+     * Used to configure the Keepalive service.
+     */
+    interface IKeepAliveProvider extends IServiceProvider {
+
+        /**
+         * If configured, options will be used to issue a request using $http.
+         * If the value is null, no HTTP request will be issued.
+         * You can specify a string, which it will assume to be a URL to a simple GET request.
+         * Otherwise, you can use the same options $http takes. However, cache will always be false.
+         *
+         * @param value May be string or IRequestConfig, default is null.
+         */
+        http(value: string | IRequestConfig): void;
+
+        /**
+         * This specifies how often the keepalive event is triggered and the
+         * HTTP request is issued.
+         *
+         * @param seconds Integer, default is 10 minutes. Must be greater than 0.
+         */
+        interval(seconds: number): void;
+    }
+
+    /**
+     * Keepalive will use a timeout to periodically wake, broadcast a Keepalive event on the root scope,
+     * and optionally make an $http request. By default, the Idle service will stop and start Keepalive
+     * when a user becomes idle or returns from idle, respectively. It is also started automatically when
+     * Idle.watch() is called. This can be disabled by configuring the IdleProvider.
+     */
+    interface IKeepAliveService {
+
+        /**
+         * Starts pinging periodically until stop() is called.
+         */
+        start(): void;
+
+        /**
+         * Stops pinging.
+         */
+        stop(): void;
+
+        /**
+         * Performs one ping only.
+         */
+        ping(): void;
+
+        /**
+         * Changes the interval value at runtime.
+         * You will need to restart the pinging process by calling start() manually for the changes to be reflected.
+         */
+        setInterval(seconds: number): void;
+    }
+
+    /**
+     * Used to configure the Idle service.
+     */
+    interface IIdleProvider extends IServiceProvider {
+        /**
+         * Specifies the DOM events the service will watch to reset the idle timeout.
+         * Multiple events should be separated by a space.
+         *
+         * @param events string, default 'mousemove keydown DOMMouseScroll mousewheel mousedown'
+         */
+        interrupt(events: string): void;
+
+        /**
+         * The idle timeout duration in seconds. After this amount of time passes without the user
+         * performing an action that triggers one of the watched DOM events, the user is considered
+         * idle.
+         *
+         * @param seconds integer, default is 20min
+         */
+        idle(seconds: number): void;
+
+        /**
+         * The amount of time the user has to respond (in seconds) before they have been considered
+         * timed out.
+         *
+         * @param seconds integer, default is 30s
+         */
+        timeout(seconds: number): void;
+
+        /**
+         * When true or idle, user activity will automatically interrupt the warning countdown
+         * and reset the idle state. If false or off, you will need to manually call watch()
+         * when you want to start watching for idleness again. If notIdle, user activity will
+         * only automatically interrupt if the user is not yet idle.
+         *
+         * @param enabled boolean or string, possible values: off/false, idle/true, or notIdle
+         */
+        autoResume(enabled: boolean | string): void;
+
+        /**
+         * When true, the Keepalive service is automatically stopped and started as needed.
+         *
+         * @param enabled boolean, default is true
+         */
+        keepalive(enabled: boolean): void;
+    }
+
+    /**
+     * Idle, once watch() is called, will start a timeout which if expires, will enter a warning state
+     * countdown. Once the countdown reaches zero, idle will broadcast a timeout event indicating the
+     * user has timed out (where your app should log them out or whatever you like). If the user performs
+     * an action that triggers a watched DOM event that bubbles up to document.body, this will reset the
+     * idle/warning state and start the process over again.
+     */
+    interface IIdleService {
+        /**
+         * Gets the current idle value
+         */
+        getIdle(): number;
+
+        /**
+         * Gets the current timeout value
+         */
+        getTimeout(): number;
+
+        /**
+         * Updates the idle value (see IdleProvider.idle()) and
+         * restarts the watch if its running.
+         */
+        setIdle(idle: number): void;
+
+        /**
+         * Updates the timeout value (see IdleProvider.timeout()) and
+         * restarts the watch if its running.
+         */
+        setTimeout(timeout: number): void;
+
+        /**
+         * Whether user has timed out (meaning idleDuration + timeout has passed without any activity)
+         */
+        isExpired(): boolean;
+
+        /**
+         * Whether or not the watch() has been called and it is watching for idleness.
+         */
+        running(): boolean;
+
+        /**
+         * Whether or not the user appears to be idle.
+         */
+        idling(): boolean;
+
+        /**
+         * Starts watching for idleness, or resets the idle/warning state and continues watching.
+         */
+        watch(): void;
+
+        /**
+         * Stops watching for idleness, and resets the idle/warning state.
+         */
+        unwatch(): void;
+
+        /**
+         * Manually trigger the idle interrupt that normally occurs during user activity.
+         */
+        interrupt(): any;
+    }
+}
diff --git a/angular-idle/tsconfig.json b/angular-idle/tsconfig.json
new file mode 100644
index 0000000000..a39a59b57f
--- /dev/null
+++ b/angular-idle/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-idle-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-jwt/angular-jwt-tests.ts b/angular-jwt/angular-jwt-tests.ts
index 7f66f26114..a959992dfc 100644
--- a/angular-jwt/angular-jwt-tests.ts
+++ b/angular-jwt/angular-jwt-tests.ts
@@ -1,16 +1,16 @@
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="angular-jwt.d.ts" />
+/// <reference types="angularjs" />
+
 
 var app = angular.module("angular-jwt-tests", ["angular-jwt"]);
 
-var $jwtHelper: angular.jwt.IJwtHelper;
+var $jwtHelper: ng.jwt.IJwtHelper;
 
 var expToken = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczovL3NhbXBsZXMuYXV0aDAuY29tLyIsInN1YiI6ImZhY2Vib29rfDEwMTU0Mjg3MDI3NTEwMzAyIiwiYXVkIjoiQlVJSlNXOXg2MHNJSEJ3OEtkOUVtQ2JqOGVESUZ4REMiLCJleHAiOjE0MTIyMzQ3MzAsImlhdCI6MTQxMjE5ODczMH0.7M5sAV50fF1-_h9qVbdSgqAnXVF7mz3I6RjS6JiH0H8';
 var tokenPayload = $jwtHelper.decodeToken(expToken);
 var date = $jwtHelper.getTokenExpirationDate(expToken);
 var bool = $jwtHelper.isTokenExpired(expToken);
 
-var $jwtInterceptor: angular.jwt.IJwtInterceptor;
+var $jwtInterceptor: ng.jwt.IJwtInterceptor;
 
 $jwtInterceptor.tokenGetter = () => {
     return expToken;
diff --git a/angular-jwt/angular-jwt.d.ts b/angular-jwt/angular-jwt.d.ts
deleted file mode 100644
index d8c719e2ef..0000000000
--- a/angular-jwt/angular-jwt.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Type definitions for angular-jwt 0.0.8
-// Project: https://github.com/auth0/angular-jwt
-// Definitions by: Reto Rezzonico <https://github.com/rerezz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace angular.jwt {
-
-    interface JwtToken {
-        iss: string;
-        sub: string;
-        aud: string;
-        exp: number;
-        nbf: number;
-        iat: number;
-        jti: string;
-        unique_name: string;
-    }
-
-    interface IJwtHelper {
-        decodeToken(token: string): JwtToken;
-        getTokenExpirationDate(token: any): Date;
-        isTokenExpired(token: any, offsetSeconds?: number): boolean;
-    }
-
-    interface IJwtInterceptor {
-        tokenGetter(...params : any[]): string;
-    }
-}
diff --git a/angular-jwt/index.d.ts b/angular-jwt/index.d.ts
new file mode 100644
index 0000000000..49247b2490
--- /dev/null
+++ b/angular-jwt/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for angular-jwt 0.0.8
+// Project: https://github.com/auth0/angular-jwt
+// Definitions by: Reto Rezzonico <https://github.com/rerezz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare namespace angular.jwt {
+
+    interface JwtToken {
+        iss?: string;
+        sub?: string;
+        aud?: string;
+        exp?: number;
+        nbf?: number;
+        iat?: number;
+        jti?: string;
+        unique_name?: string;
+    }
+
+    interface IJwtHelper {
+        decodeToken(token: string): JwtToken;
+        getTokenExpirationDate(token: any): Date;
+        isTokenExpired(token: any, offsetSeconds?: number): boolean;
+    }
+
+    interface IJwtInterceptor {
+        tokenGetter(...params : any[]): string;
+    }
+}
diff --git a/angular-jwt/tsconfig.json b/angular-jwt/tsconfig.json
new file mode 100644
index 0000000000..139ae337b7
--- /dev/null
+++ b/angular-jwt/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-jwt-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-load/angular-load-tests.ts b/angular-load/angular-load-tests.ts
index 7fea2d7924..ffb30dd4a7 100644
--- a/angular-load/angular-load-tests.ts
+++ b/angular-load/angular-load-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./angular-load.d.ts" />
+
 
 angular.module('app',['angularLoad'])
     .run(['angularLoad',(angularLoad:angular.load.IAngularLoadService)=> {
diff --git a/angular-load/angular-load.d.ts b/angular-load/angular-load.d.ts
deleted file mode 100644
index cd806c31f3..0000000000
--- a/angular-load/angular-load.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Type definitions for angular-load v0.4.1
-// Project: https://github.com/urish/angular-load
-// Definitions by: david-gang <https://github.com/david-gang>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace angular.load {
-
-    interface IAngularLoadService {
-        loadScript(url:string): ng.IPromise<any>;
-        loadCSS(url:string): ng.IPromise<any>;
-    }
-
-}
diff --git a/angular-load/index.d.ts b/angular-load/index.d.ts
new file mode 100644
index 0000000000..14db33b816
--- /dev/null
+++ b/angular-load/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for angular-load v0.4.1
+// Project: https://github.com/urish/angular-load
+// Definitions by: david-gang <https://github.com/david-gang>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare namespace angular.load {
+
+    interface IAngularLoadService {
+        loadScript(url:string): ng.IPromise<any>;
+        loadCSS(url:string): ng.IPromise<any>;
+    }
+
+}
diff --git a/angular-load/tsconfig.json b/angular-load/tsconfig.json
new file mode 100644
index 0000000000..74f2f6d253
--- /dev/null
+++ b/angular-load/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-load-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-loading-bar/angular-loading-bar-tests.ts b/angular-loading-bar/angular-loading-bar-tests.ts
index b8bde9e933..15435381f9 100644
--- a/angular-loading-bar/angular-loading-bar-tests.ts
+++ b/angular-loading-bar/angular-loading-bar-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-loading-bar.d.ts" />
+
 
 var app = angular.module('testModule', ['angular-loading-bar']);
 
diff --git a/angular-loading-bar/angular-loading-bar.d.ts b/angular-loading-bar/angular-loading-bar.d.ts
deleted file mode 100644
index 22a00f9ee7..0000000000
--- a/angular-loading-bar/angular-loading-bar.d.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-// Type definitions for angular-loading-bar
-// Project: https://github.com/chieffancypants/angular-loading-bar
-// Definitions by: Stephen Lautier <https://github.com/stephenlautier>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-
-declare namespace angular {
-
-	interface IRequestShortcutConfig {
-		/**
-		 * Indicates that the loading bar should be hidden.
-		 */
-		ignoreLoadingBar?: boolean;
-	}
-}
-
-declare namespace angular.loadingBar {
-
-	interface ILoadingBarProvider{
-		/**
-		* Turn the spinner on or off
-		*/
-		includeSpinner?: boolean;
-
-		/**
-		* Turn the loading bar on or off
-		*/
-		includeBar?: boolean;
-
-		/**
-		* HTML template
-		*/
-		spinnerTemplate?: string;
-
-		/**
-		* Latency Threshold
-		*/
-		latencyThreshold?: number;
-	}
-
-}
diff --git a/angular-loading-bar/index.d.ts b/angular-loading-bar/index.d.ts
new file mode 100644
index 0000000000..3adca41eba
--- /dev/null
+++ b/angular-loading-bar/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for angular-loading-bar
+// Project: https://github.com/chieffancypants/angular-loading-bar
+// Definitions by: Stephen Lautier <https://github.com/stephenlautier>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+
+declare namespace angular {
+
+	interface IRequestShortcutConfig {
+		/**
+		 * Indicates that the loading bar should be hidden.
+		 */
+		ignoreLoadingBar?: boolean;
+	}
+}
+
+declare namespace angular.loadingBar {
+
+	interface ILoadingBarProvider{
+		/**
+		* Turn the spinner on or off
+		*/
+		includeSpinner?: boolean;
+
+		/**
+		* Turn the loading bar on or off
+		*/
+		includeBar?: boolean;
+
+		/**
+		* HTML template
+		*/
+		spinnerTemplate?: string;
+
+		/**
+		* Latency Threshold
+		*/
+		latencyThreshold?: number;
+	}
+
+}
diff --git a/angular-loading-bar/tsconfig.json b/angular-loading-bar/tsconfig.json
new file mode 100644
index 0000000000..eef6c4a914
--- /dev/null
+++ b/angular-loading-bar/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-loading-bar-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-local-storage/angular-local-storage-tests.ts b/angular-local-storage/angular-local-storage-tests.ts
index 230a32dce1..439de2caff 100644
--- a/angular-local-storage/angular-local-storage-tests.ts
+++ b/angular-local-storage/angular-local-storage-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path='../angularjs/angular.d.ts' />
-/// <reference path='angular-local-storage.d.ts' />
-
 interface TestScope extends ng.IScope {
   submit: (key: string, value: string) => boolean;
   getItem: (key: string) => string;
diff --git a/angular-local-storage/angular-local-storage.d.ts b/angular-local-storage/angular-local-storage.d.ts
deleted file mode 100644
index b2bcf377d2..0000000000
--- a/angular-local-storage/angular-local-storage.d.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-// Type definitions for angular-local-storage v0.1.5
-// Project: https://github.com/grevory/angular-local-storage
-// Definitions by: Ken Fukuyama <https://github.com/kenfdev>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path='../angularjs/angular.d.ts' />
-
-declare namespace angular.local.storage {
-  interface ILocalStorageServiceProvider extends angular.IServiceProvider {
-    /**
-     * Setter for the prefix
-     * You should set a prefix to avoid overwriting any local storage variables from the rest of your app
-     * e.g. localStorageServiceProvider.setPrefix('youAppName');
-     * With provider you can use config as this:
-     * myApp.config(function (localStorageServiceProvider) {
-     *  localStorageServiceProvider.prefix = 'yourAppName';
-     * });
-     * @param prefix default: ls.<your-key>
-     */
-    setPrefix(prefix: string):ILocalStorageServiceProvider;
-    /**
-     * Setter for the storageType
-     * @param storageType localstorage or sessionStorage. default: localStorage
-     */
-    setStorageType(storageType: string):ILocalStorageServiceProvider;
-    /**
-     * Setter for cookie config
-     * @param exp number of days before cookies expire (0 = does not expire). default: 30
-     * @param path the web path the cookie represents. default: '/'
-     */
-    setStorageCookie(exp: number, path: string):ILocalStorageServiceProvider;
-    /**
-     * Set the cookie domain, since this runs inside a the config() block, only providers and constants can be injected. As a result, $location service can't be used here, use a hardcoded string or window.location.
-     * No default value
-     */
-    setStorageCookieDomain(domain: string):ILocalStorageServiceProvider;
-    /**
-     * Send signals for each of the following actions:
-     * @param setItem default: true
-     * @param removeItem default: false
-     */
-    setNotify(setItem: boolean, removeItem: boolean):ILocalStorageServiceProvider;
-  }
-
-  interface ICookie {
-    /**
-     * Checks if cookies are enabled in the browser.
-     * Returns: Boolean
-     */
-    isSupported:boolean;
-    /**
-     * Directly adds a value to cookies.
-     * Note: Typically used as a fallback if local storage is not supported.
-     * Returns: Boolean
-     * @param key
-     * @param val
-     */
-    set(key:string, val:string):boolean;
-    /**
-     * Directly get a value from a cookie.
-     * Returns: value from local storage
-     * @param key
-     */
-    get(key:string):string;
-    /**
-     * Remove directly value from a cookie.
-     * Returns: Boolean
-     * @param key
-     */
-    remove(key:string):boolean;
-    /**
-     * Remove all data for this app from cookie.
-     */
-    clearAll():any;
-
-  }
-
-  interface ILocalStorageService {
-    /**
-     * Checks if the browser support the current storage type(e.g: localStorage, sessionStorage).
-     * Returns: Boolean
-     */
-    isSupported:boolean;
-    /**
-     * Returns: String
-     */
-    getStorageType():string;
-    /**
-     * Directly adds a value to local storage.
-     * If local storage is not supported, use cookies instead.
-     * Returns: Boolean
-     * @param key
-     * @param value
-     */
-    set<T>(key: string, value: T): boolean;
-    /**
-     * Directly get a value from local storage.
-     * If local storage is not supported, use cookies instead.
-     * Returns: value from local storage
-     * @param key
-     */
-    get<T>(key: string): T;
-    /**
-     * Return array of keys for local storage, ignore keys that not owned.
-     * Returns: value from local storage
-     */
-    keys(): string[];
-    /**
-     * Remove an item from local storage by key.
-     * If local storage is not supported, use cookies instead.
-     * Returns: Boolean
-     * @param key
-     */
-    remove(key: string): boolean;
-    /**
-     * Remove all data for this app from local storage.
-     * If local storage is not supported, use cookies instead.
-     * Note: Optionally takes a regular expression string and removes matching.
-     * Returns: Boolean
-     * @param regularExpression
-     */
-    clearAll(regularExpression?:RegExp):boolean;
-    /**
-     * Bind $scope key to localStorageService.
-     * Usage: localStorageService.bind(scope, property, value[optional], key[optional])
-     * Returns: deregistration function for this listener.
-     * @param scope
-     * @param property
-     * @param value optional
-     * @param key The corresponding key used in local storage
-     */
-    bind(scope: angular.IScope, property: string, value?: any, key?: string): Function;
-    /**
-     * Return the derive key
-     * Returns String
-     * @param key
-     */
-    deriveKey(key:string):string;
-    /**
-     * Return localStorageService.length, ignore keys that not owned.
-     * Returns Number
-     */
-    length():number;
-    /**
-     * Deal with browser's cookies directly.
-     */
-    cookie:ICookie;
-  }
-}
diff --git a/angular-local-storage/index.d.ts b/angular-local-storage/index.d.ts
new file mode 100644
index 0000000000..beb4208901
--- /dev/null
+++ b/angular-local-storage/index.d.ts
@@ -0,0 +1,149 @@
+// Type definitions for angular-local-storage v0.1.5
+// Project: https://github.com/grevory/angular-local-storage
+// Definitions by: Ken Fukuyama <https://github.com/kenfdev>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare namespace angular.local.storage {
+  interface ILocalStorageServiceProvider extends angular.IServiceProvider {
+    /**
+     * Setter for the prefix
+     * You should set a prefix to avoid overwriting any local storage variables from the rest of your app
+     * e.g. localStorageServiceProvider.setPrefix('youAppName');
+     * With provider you can use config as this:
+     * myApp.config(function (localStorageServiceProvider) {
+     *  localStorageServiceProvider.prefix = 'yourAppName';
+     * });
+     * @param prefix default: ls.<your-key>
+     */
+    setPrefix(prefix: string):ILocalStorageServiceProvider;
+    /**
+     * Setter for the storageType
+     * @param storageType localstorage or sessionStorage. default: localStorage
+     */
+    setStorageType(storageType: string):ILocalStorageServiceProvider;
+    /**
+     * Setter for cookie config
+     * @param exp number of days before cookies expire (0 = does not expire). default: 30
+     * @param path the web path the cookie represents. default: '/'
+     */
+    setStorageCookie(exp: number, path: string):ILocalStorageServiceProvider;
+    /**
+     * Set the cookie domain, since this runs inside a the config() block, only providers and constants can be injected. As a result, $location service can't be used here, use a hardcoded string or window.location.
+     * No default value
+     */
+    setStorageCookieDomain(domain: string):ILocalStorageServiceProvider;
+    /**
+     * Send signals for each of the following actions:
+     * @param setItem default: true
+     * @param removeItem default: false
+     */
+    setNotify(setItem: boolean, removeItem: boolean):ILocalStorageServiceProvider;
+  }
+
+  interface ICookie {
+    /**
+     * Checks if cookies are enabled in the browser.
+     * Returns: Boolean
+     */
+    isSupported:boolean;
+    /**
+     * Directly adds a value to cookies.
+     * Note: Typically used as a fallback if local storage is not supported.
+     * Returns: Boolean
+     * @param key
+     * @param val
+     */
+    set(key:string, val:string):boolean;
+    /**
+     * Directly get a value from a cookie.
+     * Returns: value from local storage
+     * @param key
+     */
+    get(key:string):string;
+    /**
+     * Remove directly value from a cookie.
+     * Returns: Boolean
+     * @param key
+     */
+    remove(key:string):boolean;
+    /**
+     * Remove all data for this app from cookie.
+     */
+    clearAll():any;
+
+  }
+
+  interface ILocalStorageService {
+    /**
+     * Checks if the browser support the current storage type(e.g: localStorage, sessionStorage).
+     * Returns: Boolean
+     */
+    isSupported:boolean;
+    /**
+     * Returns: String
+     */
+    getStorageType():string;
+    /**
+     * Directly adds a value to local storage.
+     * If local storage is not supported, use cookies instead.
+     * Returns: Boolean
+     * @param key
+     * @param value
+     */
+    set<T>(key: string, value: T): boolean;
+    /**
+     * Directly get a value from local storage.
+     * If local storage is not supported, use cookies instead.
+     * Returns: value from local storage
+     * @param key
+     */
+    get<T>(key: string): T;
+    /**
+     * Return array of keys for local storage, ignore keys that not owned.
+     * Returns: value from local storage
+     */
+    keys(): string[];
+    /**
+     * Remove an item from local storage by key.
+     * If local storage is not supported, use cookies instead.
+     * Returns: Boolean
+     * @param key
+     */
+    remove(key: string): boolean;
+    /**
+     * Remove all data for this app from local storage.
+     * If local storage is not supported, use cookies instead.
+     * Note: Optionally takes a regular expression string and removes matching.
+     * Returns: Boolean
+     * @param regularExpression
+     */
+    clearAll(regularExpression?:RegExp):boolean;
+    /**
+     * Bind $scope key to localStorageService.
+     * Usage: localStorageService.bind(scope, property, value[optional], key[optional])
+     * Returns: deregistration function for this listener.
+     * @param scope
+     * @param property
+     * @param value optional
+     * @param key The corresponding key used in local storage
+     */
+    bind(scope: angular.IScope, property: string, value?: any, key?: string): Function;
+    /**
+     * Return the derive key
+     * Returns String
+     * @param key
+     */
+    deriveKey(key:string):string;
+    /**
+     * Return localStorageService.length, ignore keys that not owned.
+     * Returns Number
+     */
+    length():number;
+    /**
+     * Deal with browser's cookies directly.
+     */
+    cookie:ICookie;
+  }
+}
diff --git a/angular-local-storage/tsconfig.json b/angular-local-storage/tsconfig.json
new file mode 100644
index 0000000000..60ebcbca49
--- /dev/null
+++ b/angular-local-storage/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-local-storage-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-localForage/angular-localForage-tests.ts b/angular-localForage/angular-localForage-tests.ts
index 3ea776ebf8..8f917f5ca6 100644
--- a/angular-localForage/angular-localForage-tests.ts
+++ b/angular-localForage/angular-localForage-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path='../angularjs/angular.d.ts' />
-/// <reference path='angular-localForage.d.ts' />
-
 var app = angular.module('angular-localForage-tests', ['LocalForageModule']);
 app.config(function (localStorageServiceProvider:angular.localForage.ILocalForageProvider) {
 
diff --git a/angular-localForage/angular-localForage.d.ts b/angular-localForage/angular-localForage.d.ts
deleted file mode 100644
index edc4ca268d..0000000000
--- a/angular-localForage/angular-localForage.d.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-// Type definitions for angular-localForage 1.2.2
-// Project: https://github.com/ocombe/angular-localForage
-// Definitions by: Stefan Steinhart <https://github.com/reppners>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../localForage/localForage.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace angular.localForage {
-
-    interface LocalForageConfig {
-        driver?:string;
-        name?:string | number;
-        version?:number;
-        storeName?:string;
-        description?:string;
-    }
-
-    interface ILocalForageProvider {
-        config(config:LocalForageConfig):void;
-        setNotify(onItemSet:boolean, onItemRemove:boolean):void;
-    }
-
-    interface ILocalForageService {
-        driver(): LocalForageDriver;
-        setDriver(name: string | string[]): angular.IPromise<void>;
-
-        setItem(key:string, value:any):angular.IPromise<void>;
-        setItem(keys:Array<string>, values:Array<any>):angular.IPromise<void>;
-
-        getItem(key:string):angular.IPromise<any>;
-        getItem(keys:Array<string>):angular.IPromise<Array<any>>;
-
-        removeItem(key:string | Array<string>):angular.IPromise<void>;
-
-        pull(key:string):angular.IPromise<any>;
-        pull(keys:Array<string>):angular.IPromise<Array<any>>;
-
-        clear():angular.IPromise<void>;
-
-        key(n:number):angular.IPromise<string>;
-
-        keys():angular.IPromise<string>;
-
-        length():angular.IPromise<number>;
-
-        iterate<T>(iteratorCallback:(value:string | number, key:string)=>T):angular.IPromise<T>;
-
-        bind($scope:ng.IScope, key:string):angular.IPromise<any>;
-
-        bind($scope:ng.IScope, config:{
-            key:string;
-            defaultValue?:any;
-            scopeKey?:string;
-            name?:string;
-        }):angular.IPromise<any>;
-
-        unbind($scope:ng.IScope, key:string, scopeKey?:string):void;
-
-        createInstance(config:LocalForageConfig):ILocalForageService;
-        instance(name:string):ILocalForageService;
-    }
-}
diff --git a/angular-localForage/index.d.ts b/angular-localForage/index.d.ts
new file mode 100644
index 0000000000..87d16c96f4
--- /dev/null
+++ b/angular-localForage/index.d.ts
@@ -0,0 +1,63 @@
+// Type definitions for angular-localForage 1.2.2
+// Project: https://github.com/ocombe/angular-localForage
+// Definitions by: Stefan Steinhart <https://github.com/reppners>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="localForage" />
+/// <reference types="angularjs" />
+
+declare namespace angular.localForage {
+
+    interface LocalForageConfig {
+        driver?:string;
+        name?:string | number;
+        version?:number;
+        storeName?:string;
+        description?:string;
+    }
+
+    interface ILocalForageProvider {
+        config(config:LocalForageConfig):void;
+        setNotify(onItemSet:boolean, onItemRemove:boolean):void;
+    }
+
+    interface ILocalForageService {
+        driver(): LocalForageDriver;
+        setDriver(name: string | string[]): angular.IPromise<void>;
+
+        setItem(key:string, value:any):angular.IPromise<void>;
+        setItem(keys:Array<string>, values:Array<any>):angular.IPromise<void>;
+
+        getItem(key:string):angular.IPromise<any>;
+        getItem(keys:Array<string>):angular.IPromise<Array<any>>;
+
+        removeItem(key:string | Array<string>):angular.IPromise<void>;
+
+        pull(key:string):angular.IPromise<any>;
+        pull(keys:Array<string>):angular.IPromise<Array<any>>;
+
+        clear():angular.IPromise<void>;
+
+        key(n:number):angular.IPromise<string>;
+
+        keys():angular.IPromise<string>;
+
+        length():angular.IPromise<number>;
+
+        iterate<T>(iteratorCallback:(value:string | number, key:string)=>T):angular.IPromise<T>;
+
+        bind($scope:ng.IScope, key:string):angular.IPromise<any>;
+
+        bind($scope:ng.IScope, config:{
+            key:string;
+            defaultValue?:any;
+            scopeKey?:string;
+            name?:string;
+        }):angular.IPromise<any>;
+
+        unbind($scope:ng.IScope, key:string, scopeKey?:string):void;
+
+        createInstance(config:LocalForageConfig):ILocalForageService;
+        instance(name:string):ILocalForageService;
+    }
+}
diff --git a/angular-localForage/tsconfig.json b/angular-localForage/tsconfig.json
new file mode 100644
index 0000000000..41d4b4c19f
--- /dev/null
+++ b/angular-localForage/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-localForage-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-locker/angular-locker-tests.ts b/angular-locker/angular-locker-tests.ts
index c3c280e776..e7076d11bd 100644
--- a/angular-locker/angular-locker-tests.ts
+++ b/angular-locker/angular-locker-tests.ts
@@ -1,8 +1,7 @@
-/// <reference path='../angularjs/angular.d.ts' />
-/// <reference path='angular-locker.d.ts' />
+import * as angular from 'angularjs';
 
 angular
-.module('angular-locker-tests', ['angular-locker'])
+    .module('angular-locker-tests', ['angular-locker'])
 .config(['lockerProvider', function config(lockerProvider: angular.locker.ILockerProvider) {
     let lockerSettings: angular.locker.ILockerSettings = {
         driver: 'session',
diff --git a/angular-locker/angular-locker.d.ts b/angular-locker/angular-locker.d.ts
deleted file mode 100644
index 3327521f1a..0000000000
--- a/angular-locker/angular-locker.d.ts
+++ /dev/null
@@ -1,170 +0,0 @@
-// Type definitions for Angular Locker v2.0.3
-// Project: https://github.com/tymondesigns/angular-locker
-// Definitions by: Niko Kovačič <https://github.com/nkovacic>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare module "angular-locker" {
-    var _: string;
-    export = _;
-}
-
-declare namespace angular.locker {
-    interface ILockerServicePutFunction {
-        (current: any): any
-    }
-
-    interface ILockerService {
-        /**
-        * Add an item to storage if it doesn't already exist
-        *
-        * @param  {String}  key    The key to add
-        * @param  {Mixed}  value  The value to add
-        */
-        add(key: string, value: any): boolean;
-        /**
-        * Return all items in storage within the current namespace/driver
-        *
-        */
-        all(): any;
-        /**
-        * Remove all items set within the current namespace/driver
-        */
-        clean(): ILockerService;
-        /**
-        * Get the total number of items within the current namespace
-        */
-        count(): number;
-        /**
-        * Retrieve the specified item from storage
-        *
-        * @param  {String|Array}  key  The key to get
-        * @param  {Mixed}         def  The default value if it does not exist
-        */
-        get(key: string | Array<string>, defaultValue?: any): any;
-        /**
-        * Determine whether the item exists in storage
-        *
-        * @param  {String|Function}  key  -  The key to remove
-        */
-        has(key: string): boolean
-        /**
-        * Get the storage keys as an array
-        */
-        keys(): Array<string>;
-        /**
-        * Add a new item to storage (even if it already exists)
-        *
-        * @param  {Object}  keyValuePairs    Key value object
-        */
-        put(keyValuePairs: Object): ILockerService | boolean;
-        /**
-        * Add a new item to storage (even if it already exists)
-        *
-        * @param  {Mixed}  putFunction    The default to pass to function if doesn't already exist
-        */
-        put(putFunction: Function): ILockerService | boolean;
-        /**
-        * Add a new item to storage (even if it already exists)
-        *
-        * @param  {Mixed}  key    The key to add
-        * @param  {Mixed}  value  The value to add
-        */
-        put(key: string, value: any): ILockerService | boolean;
-        /**
-        * Add a new item to storage (even if it already exists)
-        *
-        * @param  {Mixed}  key    The key to add
-        * @param  {Mixed}  putFunction    The default to pass to function if doesn't already exist
-        * @param  {Mixed}  value  The value to add
-        */
-        put(key: string, putFunction: ILockerServicePutFunction, value: any): ILockerService | boolean;
-        /**
-        * Remove specified item(s) from storage
-        *
-        * @param  {String}  key  The key to remove
-        */
-        forget(key: string): ILockerService;
-        /**
-        * Remove specified item(s) from storage
-        *
-        * @param  {Array}  keys  The array of keys to remove
-        *
-        */
-        forget(keys: Array<string>): ILockerService;
-        /**
-        * Retrieve the specified item from storage and then remove it
-        *
-        * @param  {String|Array}  key  The key to pull from storage
-        * @param  {Mixed}   def  The default value if it does not exist
-        */
-        pull(key: string | Array<string>, defaultValue?: any): any;
-        /**
-        * Bind a storage key to a $scope property
-        *
-        * @param  {Object}  $scope  The angular $scope object
-        * @param  {String}  key     The key in storage to bind to
-        * @param  {Mixed}   def     The default value to initially bind
-        */
-        bind(scope: IScope, property: string, defaultPropertyValue?: any): ILockerService;
-        /**
-        * Set the storage driver on a new instance to enable overriding defaults
-        *
-        * @param  {String}  driver  The driver to switch to
-        */
-        driver(localStorageType: string): ILockerService;
-        /**
-        * Empty the current storage driver completely. careful now.
-        */
-        empty(): ILockerService;
-        /**
-        * Get the currently set namespace
-        */
-        getNamespace(): string;
-        /**
-        * Get a new instance of Locker
-        *
-        * @param  {Object}  options  The config options to instantiate with
-        */
-        instance(lockerSettings: ILockerSettings): ILockerService;
-        /**
-        * Set the namespace on a new instance to enable overriding defaults
-        *
-        * @param  {String}  namespace  The namespace to switch to
-        */
-        'namespace'(name: string): ILockerService;
-        /**
-        * Check browser support
-        *
-        * @see github.com/Modernizr/Modernizr/blob/master/feature-detects/storage/localstorage.js#L38-L47
-        *
-        * @param  {String}  driver  The driver to check support with
-        */
-        supported(): boolean;
-        /**
-        * Unbind a storage key from a $scope property
-        *
-        * @param  {Object}  $scope  The angular $scope object
-        * @param  {String}  key     The key to remove from bindings
-        */
-        unbind(scope: IScope, property: string): ILockerService;
-    }
-
-    interface ILockerSettings {
-        driver?: string;
-        'namespace'?: string | boolean;
-        separator?: string;
-        eventsEnabled?: boolean;
-        extend?: Object;
-    }
-
-    interface ILockerProvider extends angular.IServiceProvider {
-        /**
-        * Allow the defaults to be specified via the `lockerProvider`
-        *
-        * @param {ILockerSettings}  lockerSettings  The defaults to override
-        */
-        defaults(lockerSettings: ILockerSettings): void;
-    }
-}
diff --git a/angular-locker/index.d.ts b/angular-locker/index.d.ts
new file mode 100644
index 0000000000..89816d97dd
--- /dev/null
+++ b/angular-locker/index.d.ts
@@ -0,0 +1,169 @@
+// Type definitions for Angular Locker v2.0.3
+// Project: https://github.com/tymondesigns/angular-locker
+// Definitions by: Niko Kovačič <https://github.com/nkovacic>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+import * as angular from 'angularjs';
+
+declare module 'angularjs' {
+    export namespace locker {
+        interface ILockerServicePutFunction {
+            (current: any): any
+        }
+
+        interface ILockerService {
+            /**
+            * Add an item to storage if it doesn't already exist
+            *
+            * @param  {String}  key    The key to add
+            * @param  {Mixed}  value  The value to add
+            */
+            add(key: string, value: any): boolean;
+            /**
+            * Return all items in storage within the current namespace/driver
+            *
+            */
+            all(): any;
+            /**
+            * Remove all items set within the current namespace/driver
+            */
+            clean(): ILockerService;
+            /**
+            * Get the total number of items within the current namespace
+            */
+            count(): number;
+            /**
+            * Retrieve the specified item from storage
+            *
+            * @param  {String|Array}  key  The key to get
+            * @param  {Mixed}         def  The default value if it does not exist
+            */
+            get(key: string | Array<string>, defaultValue?: any): any;
+            /**
+            * Determine whether the item exists in storage
+            *
+            * @param  {String|Function}  key  -  The key to remove
+            */
+            has(key: string): boolean
+            /**
+            * Get the storage keys as an array
+            */
+            keys(): Array<string>;
+            /**
+            * Add a new item to storage (even if it already exists)
+            *
+            * @param  {Object}  keyValuePairs    Key value object
+            */
+            put(keyValuePairs: Object): ILockerService | boolean;
+            /**
+            * Add a new item to storage (even if it already exists)
+            *
+            * @param  {Mixed}  putFunction    The default to pass to function if doesn't already exist
+            */
+            put(putFunction: Function): ILockerService | boolean;
+            /**
+            * Add a new item to storage (even if it already exists)
+            *
+            * @param  {Mixed}  key    The key to add
+            * @param  {Mixed}  value  The value to add
+            */
+            put(key: string, value: any): ILockerService | boolean;
+            /**
+            * Add a new item to storage (even if it already exists)
+            *
+            * @param  {Mixed}  key    The key to add
+            * @param  {Mixed}  putFunction    The default to pass to function if doesn't already exist
+            * @param  {Mixed}  value  The value to add
+            */
+            put(key: string, putFunction: ILockerServicePutFunction, value: any): ILockerService | boolean;
+            /**
+            * Remove specified item(s) from storage
+            *
+            * @param  {String}  key  The key to remove
+            */
+            forget(key: string): ILockerService;
+            /**
+            * Remove specified item(s) from storage
+            *
+            * @param  {Array}  keys  The array of keys to remove
+            *
+            */
+            forget(keys: Array<string>): ILockerService;
+            /**
+            * Retrieve the specified item from storage and then remove it
+            *
+            * @param  {String|Array}  key  The key to pull from storage
+            * @param  {Mixed}   def  The default value if it does not exist
+            */
+            pull(key: string | Array<string>, defaultValue?: any): any;
+            /**
+            * Bind a storage key to a $scope property
+            *
+            * @param  {Object}  $scope  The angular $scope object
+            * @param  {String}  key     The key in storage to bind to
+            * @param  {Mixed}   def     The default value to initially bind
+            */
+            bind(scope: IScope, property: string, defaultPropertyValue?: any): ILockerService;
+            /**
+            * Set the storage driver on a new instance to enable overriding defaults
+            *
+            * @param  {String}  driver  The driver to switch to
+            */
+            driver(localStorageType: string): ILockerService;
+            /**
+            * Empty the current storage driver completely. careful now.
+            */
+            empty(): ILockerService;
+            /**
+            * Get the currently set namespace
+            */
+            getNamespace(): string;
+            /**
+            * Get a new instance of Locker
+            *
+            * @param  {Object}  options  The config options to instantiate with
+            */
+            instance(lockerSettings: ILockerSettings): ILockerService;
+            /**
+            * Set the namespace on a new instance to enable overriding defaults
+            *
+            * @param  {String}  namespace  The namespace to switch to
+            */
+            'namespace'(name: string): ILockerService;
+            /**
+            * Check browser support
+            *
+            * @see github.com/Modernizr/Modernizr/blob/master/feature-detects/storage/localstorage.js#L38-L47
+            *
+            * @param  {String}  driver  The driver to check support with
+            */
+            supported(): boolean;
+            /**
+            * Unbind a storage key from a $scope property
+            *
+            * @param  {Object}  $scope  The angular $scope object
+            * @param  {String}  key     The key to remove from bindings
+            */
+            unbind(scope: IScope, property: string): ILockerService;
+        }
+
+        interface ILockerSettings {
+            driver?: string;
+            'namespace'?: string | boolean;
+            separator?: string;
+            eventsEnabled?: boolean;
+            extend?: Object;
+        }
+
+        interface ILockerProvider extends angular.IServiceProvider {
+            /**
+            * Allow the defaults to be specified via the `lockerProvider`
+            *
+            * @param {ILockerSettings}  lockerSettings  The defaults to override
+            */
+            defaults(lockerSettings: ILockerSettings): void;
+        }
+    }
+}
diff --git a/angular-locker/tsconfig.json b/angular-locker/tsconfig.json
new file mode 100644
index 0000000000..4ab0e22b04
--- /dev/null
+++ b/angular-locker/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-locker-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-material/angular-material-0.8.3.d.ts b/angular-material/angular-material-0.8.3.d.ts
index 599a39ba9b..9a7359c6cc 100644
--- a/angular-material/angular-material-0.8.3.d.ts
+++ b/angular-material/angular-material-0.8.3.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Matt Traynham <https://github.com/mtraynham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../angularjs/angular.d.ts" />
+/// <reference types="angularjs" />
 declare namespace angular.material {
 
     interface MDBottomSheetOptions {
diff --git a/angular-material/angular-material-0.9.0.d.ts b/angular-material/angular-material-0.9.0.d.ts
index daeedc0085..320e24b438 100644
--- a/angular-material/angular-material-0.9.0.d.ts
+++ b/angular-material/angular-material-0.9.0.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Matt Traynham <https://github.com/mtraynham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../angularjs/angular.d.ts" />
+/// <reference types="angularjs" />
 declare namespace angular.material {
 
     interface MDBottomSheetOptions {
diff --git a/angular-material/angular-material-tests.ts b/angular-material/angular-material-tests.ts
index 3c70dd27e8..740a72d086 100644
--- a/angular-material/angular-material-tests.ts
+++ b/angular-material/angular-material-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-material.d.ts" />
+
 
 var myApp = angular.module('testModule', ['ngMaterial']);
 
diff --git a/angular-material/angular-material.d.ts b/angular-material/angular-material.d.ts
deleted file mode 100644
index 6ba65473ed..0000000000
--- a/angular-material/angular-material.d.ts
+++ /dev/null
@@ -1,253 +0,0 @@
-// Type definitions for Angular Material 1.0.0-rc5+ (angular.material module)
-// Project: https://github.com/angular/material
-// Definitions by: Matt Traynham <https://github.com/mtraynham>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-declare namespace angular.material {
-
-    interface IBottomSheetOptions {
-        templateUrl?: string;
-        template?: string;
-        scope?: angular.IScope; // default: new child scope
-        preserveScope?: boolean; // default: false
-        controller?: string|Function;
-        locals?: {[index: string]: any};
-        targetEvent?: MouseEvent;
-        resolve?: {[index: string]: angular.IPromise<any>}
-        controllerAs?: string;
-        bindToController?: boolean;
-        parent?: string|Element|JQuery; // default: root node
-        disableParentScroll?: boolean; // default: true
-    }
-
-    interface IBottomSheetService {
-        show(options: IBottomSheetOptions): angular.IPromise<any>;
-        hide(response?: any): void;
-        cancel(response?: any): void;
-    }
-
-    interface IPresetDialog<T> {
-        title(title: string): T;
-        textContent(textContent: string): T;
-        htmlContent(htmlContent: string): T;
-        ok(ok: string): T;
-        theme(theme: string): T;
-        templateUrl(templateUrl?: string): T;
-        template(template?: string): T;
-        targetEvent(targetEvent?: MouseEvent): T;
-        scope(scope?: angular.IScope): T; // default: new child scope
-        preserveScope(preserveScope?: boolean): T; // default: false
-        disableParentScroll(disableParentScroll?: boolean): T; // default: true
-        hasBackdrop(hasBackdrop?: boolean): T; // default: true
-        clickOutsideToClose(clickOutsideToClose?: boolean): T; // default: false
-        escapeToClose(escapeToClose?: boolean): T; // default: true
-        focusOnOpen(focusOnOpen?: boolean): T; // default: true
-        controller(controller?: string|Function): T;
-        locals(locals?: {[index: string]: any}): T;
-        bindToController(bindToController?: boolean): T; // default: false
-        resolve(resolve?: {[index: string]: angular.IPromise<any>}): T;
-        controllerAs(controllerAs?: string): T;
-        parent(parent?: string|Element|JQuery): T; // default: root node
-        onComplete(onComplete?: Function): T;
-        ariaLabel(ariaLabel: string): T;
-    }
-
-    interface IAlertDialog extends IPresetDialog<IAlertDialog> {
-    }
-
-    interface IConfirmDialog extends IPresetDialog<IConfirmDialog> {
-        cancel(cancel: string): IConfirmDialog;
-    }
-
-    interface IDialogOptions {
-        templateUrl?: string;
-        template?: string;
-        autoWrap?: boolean; // default: true
-        targetEvent?: MouseEvent;
-        openFrom?: any;
-        closeTo?: any;
-        scope?: angular.IScope; // default: new child scope
-        preserveScope?: boolean; // default: false
-        disableParentScroll?: boolean; // default: true
-        hasBackdrop?: boolean // default: true
-        clickOutsideToClose?: boolean; // default: false
-        escapeToClose?: boolean; // default: true
-        focusOnOpen?: boolean; // default: true
-        controller?: string|Function;
-        locals?: {[index: string]: any};
-        bindToController?: boolean; // default: false
-        resolve?: {[index: string]: angular.IPromise<any>}
-        controllerAs?: string;
-        parent?: string|Element|JQuery; // default: root node
-        onShowing?: Function;
-        onComplete?: Function;
-        onRemoving?: Function;
-        fullscreen?: boolean;
-    }
-
-    interface IDialogService {
-        show(dialog: IDialogOptions|IAlertDialog|IConfirmDialog): angular.IPromise<any>;
-        confirm(): IConfirmDialog;
-        alert(): IAlertDialog;
-        hide(response?: any): angular.IPromise<any>;
-        cancel(response?: any): void;
-    }
-
-    interface IIcon {
-        (id: string): angular.IPromise<Element>; // id is a unique ID or URL
-    }
-
-    interface IIconProvider {
-        icon(id: string, url: string, viewBoxSize?: number): IIconProvider; // viewBoxSize default: 24
-        iconSet(id: string, url: string, viewBoxSize?: number): IIconProvider; // viewBoxSize default: 24
-        defaultIconSet(url: string, viewBoxSize?: number): IIconProvider; // viewBoxSize default: 24
-        defaultViewBoxSize(viewBoxSize: number): IIconProvider; // default: 24
-        defaultFontSet(name: string): IIconProvider;
-    }
-
-    interface IMedia {
-        (media: string): boolean;
-    }
-
-    interface ISidenavObject {
-        toggle(): angular.IPromise<void>;
-        open(): angular.IPromise<void>;
-        close(): angular.IPromise<void>;
-        isOpen(): boolean;
-        isLockedOpen(): boolean;
-    }
-
-    interface ISidenavService {
-        (component: string): ISidenavObject;
-    }
-
-    interface IToastPreset<T> {
-        textContent(content: string): T;
-        action(action: string): T;
-        highlightAction(highlightAction: boolean): T;
-        highlightClass(highlightClass: string): T;
-        capsule(capsule: boolean): T;
-        theme(theme: string): T;
-        hideDelay(delay: number): T;
-        position(position: string): T;
-        parent(parent?: string|Element|JQuery): T; // default: root node
-    }
-
-    interface ISimpleToastPreset extends IToastPreset<ISimpleToastPreset> {
-    }
-
-    interface IToastOptions {
-        templateUrl?: string;
-        template?: string;
-        autoWrap?:boolean;
-        scope?: angular.IScope; // default: new child scope
-        preserveScope?: boolean; // default: false
-        hideDelay?: number; // default (ms): 3000
-        position?: string; // any combination of 'bottom'/'left'/'top'/'right'/'fit'; default: 'bottom left'
-        controller?: string|Function;
-        locals?: {[index: string]: any};
-        bindToController?: boolean; // default: false
-        resolve?: {[index: string]: angular.IPromise<any>}
-        controllerAs?: string;
-        parent?: string|Element|JQuery; // default: root node
-    }
-
-    interface IToastService {
-        show(optionsOrPreset: IToastOptions|IToastPreset<any>): angular.IPromise<any>;
-        showSimple(content: string): angular.IPromise<any>;
-        simple(): ISimpleToastPreset;
-        build(): IToastPreset<any>;
-        updateContent(): void;
-        hide(response?: any): void;
-        cancel(response?: any): void;
-    }
-
-    interface IPalette {
-        0?: string;
-        50?: string;
-        100?: string;
-        200?: string;
-        300?: string;
-        400?: string;
-        500?: string;
-        600?: string;
-        700?: string;
-        800?: string;
-        900?: string;
-        A100?: string;
-        A200?: string;
-        A400?: string;
-        A700?: string;
-        contrastDefaultColor?: string;
-        contrastDarkColors?: string|string[];
-        contrastLightColors?: string|string[];
-    }
-
-    interface IThemeHues {
-        default?: string;
-        'hue-1'?: string;
-        'hue-2'?: string;
-        'hue-3'?: string;
-    }
-
-    interface IThemePalette {
-        name: string;
-        hues: IThemeHues;
-    }
-
-    interface IThemeColors {
-        accent: IThemePalette;
-        background: IThemePalette;
-        primary: IThemePalette;
-        warn: IThemePalette;
-    }
-
-    interface IThemeGrayScalePalette {
-        1: string;
-        2: string;
-        3: string;
-        4: string;
-        name: string;
-    }
-
-    interface ITheme {
-        name: string;
-        isDark: boolean;
-        colors: IThemeColors;
-        foregroundPalette: IThemeGrayScalePalette;
-        foregroundShadow: string;
-        accentPalette(name: string, hues?: IThemeHues): ITheme;
-        primaryPalette(name: string, hues?: IThemeHues): ITheme;
-        warnPalette(name: string, hues?: IThemeHues): ITheme;
-        backgroundPalette(name: string, hues?: IThemeHues): ITheme;
-        dark(isDark?: boolean): ITheme;
-    }
-
-    interface IThemingProvider {
-        theme(name: string, inheritFrom?: string): ITheme;
-        definePalette(name: string, palette: IPalette): IThemingProvider;
-        extendPalette(name: string, palette: IPalette): IPalette;
-        setDefaultTheme(theme: string): void;
-        alwaysWatchTheme(alwaysWatch: boolean): void;
-    }
-
-    interface IDateLocaleProvider {
-        months: string[];
-        shortMonths: string[];
-        days: string[];
-        shortDays: string[];
-        dates: string[];
-        firstDayOfWeek: number;
-        parseDate(dateString: string): Date;
-        formatDate(date: Date): string;
-        monthHeaderFormatter(date: Date): string;
-        weekNumberFormatter(weekNumber: number): string;
-        msgCalendar: string;
-        msgOpenCalendar: string;
-    }
-
-    interface IMenuService {
-        hide(response?: any, options?: any): angular.IPromise<any>;
-    }
-}
diff --git a/angular-material/index.d.ts b/angular-material/index.d.ts
new file mode 100644
index 0000000000..dd4e7c1233
--- /dev/null
+++ b/angular-material/index.d.ts
@@ -0,0 +1,274 @@
+// Type definitions for Angular Material 1.0.0-rc5+ (angular.material module)
+// Project: https://github.com/angular/material
+// Definitions by: Matt Traynham <https://github.com/mtraynham>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+declare namespace angular.material {
+
+    interface IBottomSheetOptions {
+        templateUrl?: string;
+        template?: string;
+        scope?: angular.IScope; // default: new child scope
+        preserveScope?: boolean; // default: false
+        controller?: string|Function;
+        locals?: {[index: string]: any};
+        targetEvent?: MouseEvent;
+        resolve?: {[index: string]: angular.IPromise<any>}
+        controllerAs?: string;
+        bindToController?: boolean;
+        parent?: string|Element|JQuery; // default: root node
+        disableParentScroll?: boolean; // default: true
+    }
+
+    interface IBottomSheetService {
+        show(options: IBottomSheetOptions): angular.IPromise<any>;
+        hide(response?: any): void;
+        cancel(response?: any): void;
+    }
+
+    interface IPresetDialog<T> {
+        title(title: string): T;
+        textContent(textContent: string): T;
+        htmlContent(htmlContent: string): T;
+        ok(ok: string): T;
+        theme(theme: string): T;
+        templateUrl(templateUrl?: string): T;
+        template(template?: string): T;
+        targetEvent(targetEvent?: MouseEvent): T;
+        scope(scope?: angular.IScope): T; // default: new child scope
+        preserveScope(preserveScope?: boolean): T; // default: false
+        disableParentScroll(disableParentScroll?: boolean): T; // default: true
+        hasBackdrop(hasBackdrop?: boolean): T; // default: true
+        clickOutsideToClose(clickOutsideToClose?: boolean): T; // default: false
+        escapeToClose(escapeToClose?: boolean): T; // default: true
+        focusOnOpen(focusOnOpen?: boolean): T; // default: true
+        controller(controller?: string|Function): T;
+        locals(locals?: {[index: string]: any}): T;
+        bindToController(bindToController?: boolean): T; // default: false
+        resolve(resolve?: {[index: string]: angular.IPromise<any>}): T;
+        controllerAs(controllerAs?: string): T;
+        parent(parent?: string|Element|JQuery): T; // default: root node
+        onComplete(onComplete?: Function): T;
+        ariaLabel(ariaLabel: string): T;
+    }
+
+    interface IAlertDialog extends IPresetDialog<IAlertDialog> {
+    }
+
+    interface IConfirmDialog extends IPresetDialog<IConfirmDialog> {
+        cancel(cancel: string): IConfirmDialog;
+    }
+
+    interface IDialogOptions {
+        templateUrl?: string;
+        template?: string;
+        autoWrap?: boolean; // default: true
+        targetEvent?: MouseEvent;
+        openFrom?: any;
+        closeTo?: any;
+        scope?: angular.IScope; // default: new child scope
+        preserveScope?: boolean; // default: false
+        disableParentScroll?: boolean; // default: true
+        hasBackdrop?: boolean // default: true
+        clickOutsideToClose?: boolean; // default: false
+        escapeToClose?: boolean; // default: true
+        focusOnOpen?: boolean; // default: true
+        controller?: string|Function;
+        locals?: {[index: string]: any};
+        bindToController?: boolean; // default: false
+        resolve?: {[index: string]: angular.IPromise<any>}
+        controllerAs?: string;
+        parent?: string|Element|JQuery; // default: root node
+        onShowing?: Function;
+        onComplete?: Function;
+        onRemoving?: Function;
+        fullscreen?: boolean;
+    }
+
+    interface IDialogService {
+        show(dialog: IDialogOptions|IAlertDialog|IConfirmDialog): angular.IPromise<any>;
+        confirm(): IConfirmDialog;
+        alert(): IAlertDialog;
+        hide(response?: any): angular.IPromise<any>;
+        cancel(response?: any): void;
+    }
+
+    interface IIcon {
+        (id: string): angular.IPromise<Element>; // id is a unique ID or URL
+    }
+
+    interface IIconProvider {
+        icon(id: string, url: string, viewBoxSize?: number): IIconProvider; // viewBoxSize default: 24
+        iconSet(id: string, url: string, viewBoxSize?: number): IIconProvider; // viewBoxSize default: 24
+        defaultIconSet(url: string, viewBoxSize?: number): IIconProvider; // viewBoxSize default: 24
+        defaultViewBoxSize(viewBoxSize: number): IIconProvider; // default: 24
+        defaultFontSet(name: string): IIconProvider;
+    }
+
+    interface IMedia {
+        (media: string): boolean;
+    }
+
+    interface ISidenavObject {
+        toggle(): angular.IPromise<void>;
+        open(): angular.IPromise<void>;
+        close(): angular.IPromise<void>;
+        isOpen(): boolean;
+        isLockedOpen(): boolean;
+    }
+
+    interface ISidenavService {
+        (component: string): ISidenavObject;
+    }
+
+    interface IToastPreset<T> {
+        textContent(content: string): T;
+        action(action: string): T;
+        highlightAction(highlightAction: boolean): T;
+        highlightClass(highlightClass: string): T;
+        capsule(capsule: boolean): T;
+        theme(theme: string): T;
+        hideDelay(delay: number): T;
+        position(position: string): T;
+        parent(parent?: string|Element|JQuery): T; // default: root node
+    }
+
+    interface ISimpleToastPreset extends IToastPreset<ISimpleToastPreset> {
+    }
+
+    interface IToastOptions {
+        templateUrl?: string;
+        template?: string;
+        autoWrap?:boolean;
+        scope?: angular.IScope; // default: new child scope
+        preserveScope?: boolean; // default: false
+        hideDelay?: number; // default (ms): 3000
+        position?: string; // any combination of 'bottom'/'left'/'top'/'right'/'fit'; default: 'bottom left'
+        controller?: string|Function;
+        locals?: {[index: string]: any};
+        bindToController?: boolean; // default: false
+        resolve?: {[index: string]: angular.IPromise<any>}
+        controllerAs?: string;
+        parent?: string|Element|JQuery; // default: root node
+    }
+
+    interface IToastService {
+        show(optionsOrPreset: IToastOptions|IToastPreset<any>): angular.IPromise<any>;
+        showSimple(content: string): angular.IPromise<any>;
+        simple(): ISimpleToastPreset;
+        build(): IToastPreset<any>;
+        updateContent(): void;
+        hide(response?: any): void;
+        cancel(response?: any): void;
+    }
+
+    interface IPalette {
+        0?: string;
+        50?: string;
+        100?: string;
+        200?: string;
+        300?: string;
+        400?: string;
+        500?: string;
+        600?: string;
+        700?: string;
+        800?: string;
+        900?: string;
+        A100?: string;
+        A200?: string;
+        A400?: string;
+        A700?: string;
+        contrastDefaultColor?: string;
+        contrastDarkColors?: string|string[];
+        contrastLightColors?: string|string[];
+    }
+
+    interface IThemeHues {
+        default?: string;
+        'hue-1'?: string;
+        'hue-2'?: string;
+        'hue-3'?: string;
+    }
+
+    interface IThemePalette {
+        name: string;
+        hues: IThemeHues;
+    }
+
+    interface IThemeColors {
+        accent: IThemePalette;
+        background: IThemePalette;
+        primary: IThemePalette;
+        warn: IThemePalette;
+    }
+
+    interface IThemeGrayScalePalette {
+        1: string;
+        2: string;
+        3: string;
+        4: string;
+        name: string;
+    }
+
+    interface ITheme {
+        name: string;
+        isDark: boolean;
+        colors: IThemeColors;
+        foregroundPalette: IThemeGrayScalePalette;
+        foregroundShadow: string;
+        accentPalette(name: string, hues?: IThemeHues): ITheme;
+        primaryPalette(name: string, hues?: IThemeHues): ITheme;
+        warnPalette(name: string, hues?: IThemeHues): ITheme;
+        backgroundPalette(name: string, hues?: IThemeHues): ITheme;
+        dark(isDark?: boolean): ITheme;
+    }
+
+    interface IThemingProvider {
+        theme(name: string, inheritFrom?: string): ITheme;
+        definePalette(name: string, palette: IPalette): IThemingProvider;
+        extendPalette(name: string, palette: IPalette): IPalette;
+        setDefaultTheme(theme: string): void;
+        alwaysWatchTheme(alwaysWatch: boolean): void;
+    }
+
+    interface IDateLocaleProvider {
+        months: string[];
+        shortMonths: string[];
+        days: string[];
+        shortDays: string[];
+        dates: string[];
+        firstDayOfWeek: number;
+        parseDate(dateString: string): Date;
+        formatDate(date: Date): string;
+        monthHeaderFormatter(date: Date): string;
+        weekNumberFormatter(weekNumber: number): string;
+        msgCalendar: string;
+        msgOpenCalendar: string;
+    }
+
+    interface IMenuService {
+        hide(response?: any, options?: any): angular.IPromise<any>;
+    }
+
+    interface IColorPalette {
+        red: IPalette;
+        pink: IPalette;
+        'deep-purple': IPalette;
+        indigo: IPalette;
+        blue: IPalette;
+        'light-blue': IPalette;
+        cyan: IPalette;
+        teal: IPalette;
+        green: IPalette;
+        'light-green': IPalette;
+        lime: IPalette;
+        yellow: IPalette;
+        amber: IPalette;
+        orange: IPalette;
+        'deep-orange': IPalette;
+        brown: IPalette;
+        grey: IPalette;
+        'blue-grey': IPalette;
+    }
+}
diff --git a/angular-material/tsconfig.json b/angular-material/tsconfig.json
new file mode 100644
index 0000000000..93ebf9d60b
--- /dev/null
+++ b/angular-material/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "angular-material-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/angular-media-queries/index.d.ts b/angular-media-queries/index.d.ts
new file mode 100644
index 0000000000..e1eb8dffc3
--- /dev/null
+++ b/angular-media-queries/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for Angular matchMedia 0.6.0 (angular.matchMedia module)
+// Project: https://github.com/jacopotarantino/angular-match-media
+// Definitions by: Joao Monteiro <https://github.com/jpmnteiro>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+declare namespace angular.matchmedia {
+
+    interface IScreenSize {
+
+        // Returns a value indicating if the current device has a retina screen
+        isRetina: boolean;
+    
+        is(list: Array<string> | string): boolean;
+
+        // Executes the callback function on window resize with the match truthiness as the first argument.
+        // Returns the current match truthiness.
+        // The 'scope' parameter is optional. If it's not passed in, '$rootScope' is used.
+        on(list: Array<string> | string, callback: (result: boolean) => void, scope?: angular.IScope): boolean;
+
+        // Executes the callback function ONLY when the match differs from previous match.
+        // Returns the current match truthiness.
+        // The 'scope' parameter is required for cleanup reasons (destroy event).
+        onChange(scope: angular.IScope, list: Array<string> | string, callback: (result: boolean) => void): boolean;
+
+        // Executes the callback only when inside of the particular screensize.
+        // The 'scope' parameter is optional. If it's not passed in, '$rootScope' is used.  
+        when(list: Array<string> | string, callback: (result: boolean) => void, scope?: angular.IScope): boolean;
+    }
+}
\ No newline at end of file
diff --git a/angular-media-queries/match-media-tests.ts b/angular-media-queries/match-media-tests.ts
index a9331751ae..e24c43c073 100644
--- a/angular-media-queries/match-media-tests.ts
+++ b/angular-media-queries/match-media-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="match-media.d.ts" />
+
 
 var myApp = angular.module('testModule', ['matchMedia']);
 
diff --git a/angular-media-queries/match-media.d.ts b/angular-media-queries/match-media.d.ts
deleted file mode 100644
index 401c61f46c..0000000000
--- a/angular-media-queries/match-media.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Type definitions for Angular matchMedia 0.6.0 (angular.matchMedia module)
-// Project: https://github.com/jacopotarantino/angular-match-media
-// Definitions by: Joao Monteiro <https://github.com/jpmnteiro>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-declare namespace angular.matchmedia {
-
-    interface IScreenSize {
-
-        // Returns a value indicating if the current device has a retina screen
-        isRetina: boolean;
-    
-        is(list: Array<string> | string): boolean;
-
-        // Executes the callback function on window resize with the match truthiness as the first argument.
-        // Returns the current match truthiness.
-        // The 'scope' parameter is optional. If it's not passed in, '$rootScope' is used.
-        on(list: Array<string> | string, callback: (result: boolean) => void, scope?: angular.IScope): boolean;
-
-        // Executes the callback function ONLY when the match differs from previous match.
-        // Returns the current match truthiness.
-        // The 'scope' parameter is required for cleanup reasons (destroy event).
-        onChange(scope: angular.IScope, list: Array<string> | string, callback: (result: boolean) => void): boolean;
-
-        // Executes the callback only when inside of the particular screensize.
-        // The 'scope' parameter is optional. If it's not passed in, '$rootScope' is used.  
-        when(list: Array<string> | string, callback: (result: boolean) => void, scope?: angular.IScope): boolean;
-    }
-}
\ No newline at end of file
diff --git a/angular-media-queries/tsconfig.json b/angular-media-queries/tsconfig.json
new file mode 100644
index 0000000000..7b8dbc1875
--- /dev/null
+++ b/angular-media-queries/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "match-media-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-meteor/angular-meteor-tests.ts b/angular-meteor/angular-meteor-tests.ts
index cc2a62c8d7..8500a431e8 100644
--- a/angular-meteor/angular-meteor-tests.ts
+++ b/angular-meteor/angular-meteor-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-meteor.d.ts" />
+
 
 interface ITodo {
 	_id?: string;
diff --git a/angular-meteor/angular-meteor.d.ts b/angular-meteor/angular-meteor.d.ts
deleted file mode 100644
index 1e14ae9659..0000000000
--- a/angular-meteor/angular-meteor.d.ts
+++ /dev/null
@@ -1,352 +0,0 @@
-// Type definitions for Angular JS Meteor v0.8.8 (angular.meteor module)
-// Project: https://github.com/Urigo/angular-meteor
-// Definitions by: Peter Grman <https://github.com/pgrm>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../meteor/meteor.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace angular.meteor {
-    interface IRootScopeService extends angular.IRootScopeService {
-        /**
-         * The current logged in user and it's data. it is null if the user is not logged in. A reactive data source.
-         */
-        currentUser: Meteor.User;
-
-        /**
-         * True if a login method (such as Meteor.loginWithPassword, Meteor.loginWithFacebook, or Accounts.createUser) is currently in progress.
-         * A reactive data source. Can be use to display animation while user is logging in.
-         */
-        loggingIn: boolean;
-    }
-
-    interface IScope extends angular.IScope, IRootScopeService {
-        /**
-         * A method to get a $scope variable and watch it reactivly
-         *
-         * @param scopeVariableName - The name of the scope's variable to bind to
-         * @param [objectEquality=false] - Watch the object equality using angular.equals instead of comparing for reference equality, deeper watch but also slower
-         */
-        getReactively(scopeVariableName: string, objectEquality?: boolean): ReactiveResult;
-
-        /**
-         * A service which is a wrapper for Meteor.subscribe. It subscribes to a Meteor.publish method in the client and returns a AngularJS promise when ready.
-         * Calling $scope.subscribe will automatically stop the subscription when the scope is destroyed.
-         *
-         * @param name - Name of the subscription. Matches the name of the server's publish() call.
-         * @param publisherArguments - Optional arguments passed to publisher function on server.
-         *
-         * @return The promise solved successfully when subscription is ready. The success promise holds the subscription handle.
-         */
-        subscribe(name: string, ...publisherArguments: any[]): angular.IPromise<Meteor.SubscriptionHandle>;
-
-        /**
-         * The helpers method is part of the ReactiveContext, and available on every context and $scope.
-         * These method are defined as Object, where each key is the name of the variable that will be available on the context we run, and each value is a function with a return value.
-         * Under the hood, each helper starts a new Tracker.autorun. When its reactive dependencies change, the helper is rerun.
-         * To trigger a rerun every time an specific Angular variable change, use getReactively](/api/1.3.1/get-reactively) to make your Angular variable reactive inside the helper its used in.
-         * Each helper function should return a MongoDB Cursor and the helpers will expose it as a normal array to the context.
-         *
-         * @param definitions - Object containing `name` => `function` definition, where each name is a string and each function is the helper function. Should return a [MongoDB Cursor](http://docs.meteor.com/#/full/mongo_cursor)
-         * @return This method returns this, which the the reactive context, in order to provide the ability to chain the logic.
-         */
-        helpers(definitions : { [helperName : string] : () => Mongo.Cursor<any> }): IScope;
-
-        /**
-         * This method is a wrapper of Tracker.autorun and shares exactly the same API.
-         * The autorun method is part of the ReactiveContext, and available on every context and $scope.
-         * The argument of this method is a callback, which will be called each time Autorun will be used.
-         * The Autorun will stop automatically when when it's context ($scope) is destroyed.
-         *
-         * @param runFunc - The function to run. It receives one argument: the Computation object that will be returned.
-         */
-        autorun(runFunc : () => void) : Tracker.Computation;
-    }
-
-    /**
-     * $meteor in angularjs
-     */
-    interface IMeteorService {
-        /**
-         * A service that wraps the Meteor collections to enable reactivity within AngularJS.
-         *
-         * @param collection - A Meteor Collection or a reactive function to bind to.
-         *                   - Reactive function can be used with $scope.getReactively to add $scope variable as reactive variable to the cursor.
-         * @param [autoClientSave=true] - By default, changes in the Angular collection will automatically update the Meteor collection.
-         *                              - However if set to false, changes in the client won't be automatically propagated back to the Meteor collection.
-         */
-        collection<T>(collection: Mongo.Collection<T>|ReactiveResult|Function|(()=>T), autoClientSave?: boolean): AngularMeteorCollection<T>;
-
-        /**
-         * A service that wraps the Meteor collections to enable reactivity within AngularJS.
-         *
-         * @param collection - A Meteor Collection or a reactive function to bind to.
-         *                   - Reactive function can be used with $scope.getReactively to add $scope variable as reactive variable to the cursor.
-         * @param [autoClientSave=true] - By default, changes in the Angular collection will automatically update the Meteor collection.
-         *                              - However if set to false, changes in the client won't be automatically propagated back to the Meteor collection.
-         * @param [updateCollection] - A collection object which will be used for updates (insert, update, delete).
-         */
-        collection<T, U>(collection: Mongo.Collection<T>|ReactiveResult|Function|(()=>T), autoClientSave: boolean, updateCollection: Mongo.Collection<U>): AngularMeteorCollection2<T, U>;
-
-        /**
-         * A service that wraps a Meteor object to enable reactivity within AngularJS.
-         * Finds the first document that matches the selector, as ordered by sort and skip options. Wraps collection.findOne
-         *
-         * @param collection - A Meteor Collection to bind to.
-         * @param selector - A query describing the documents to find or just the ID of the document.
-         *                 - $meteor.object will find the first document that matches the selector,
-         *                 - as ordered by sort and skip options, exactly like Meteor's collection.findOne
-         * @param [autoClientSave=true] - By default, changes in the Angular object will automatically update the Meteor object.
-         *                              - However if set to false, changes in the client won't be automatically propagated back to the Meteor object.
-         */
-        object<T>(collection: Mongo.Collection<T>, selector: Mongo.Selector|Mongo.ObjectID|string, autoClientSave?: boolean): AngularMeteorObject<T>;
-
-        /**
-         * A service which is a wrapper for Meteor.subscribe. It subscribes to a Meteor.publish method in the client and returns a AngularJS promise when ready.
-         *
-         * @param name - Name of the subscription. Matches the name of the server's publish() call.
-         * @param publisherArguments - Optional arguments passed to publisher function on server.
-         *
-         * @return The promise solved successfully when subscription is ready. The success promise holds the subscription handle.
-         */
-        subscribe(name: string, ...publisherArguments: any[]): angular.IPromise<Meteor.SubscriptionHandle>;
-
-        /**
-         * A service service which wraps up Meteor.methods with AngularJS promises.
-         *
-         * @param name - Name of method to invoke
-         * @param methodArguments - Optional method arguments
-         *
-         * @return The promise solves successfully with the return value of the method or return reject with the error from the method.
-         */
-        call<T>(name: string, ...methodArguments: any[]): angular.IPromise<T>;
-
-        // User Authentication BEGIN ->
-
-        /**
-         * Returns a promise fulfilled with the currentUser when the user subscription is ready.
-         * This is useful when you want to grab the current user before the route is rendered.
-         * If there is no logged in user, it will return null.
-         * See the “Authentication with Routers” section of our tutorial for more information and a full example.
-         */
-        waitForUser(): angular.IPromise<Meteor.User>;
-
-        /**
-         * Resolves the promise successfully if a user is authenticated and rejects otherwise.
-         * This is useful in cases where you want to require a route to have an authenticated user.
-         * You can catch the rejected promise and redirect the unauthenticated user to a different page, such as the login page.
-         * See the “Authentication with Routers” section of our tutorial for more information and a full example.
-         */
-        requireUser(): angular.IPromise<Meteor.User>;
-
-        /**
-         * Resolves the promise successfully if a user is authenticated and the validatorFn returns true; rejects otherwise.
-         * This is useful in cases where you want to require a route to have an authenticated user and do extra validation like the user's role or group.
-         * You can catch the rejected promise and redirect the unauthenticated user to a different page, such as the login page.
-         * See the “Authentication with Routers” section of our tutorial for more information and a full example.
-         *
-         * The mandatory validator function will be called with the authenticated user as the single param and it's expected to return true in order to resolve.
-         * If it returns a string, the promise will be rejected using said string as the reason.
-         * Any other return (false, null, undefined) will be rejected with the default "FORBIDDEN" reason.
-         */
-        requireValidUser(validatorFn: (user: Meteor.User) => boolean|string): angular.IPromise<Meteor.User>;
-
-        /**
-         * Log the user in with a password.
-         *
-         * @param user - Either a string interpreted as a username or an email; or an object with a single key: email, username or id.
-         * @param password - The user's password.
-         */
-        loginWithPassword(user: string|{email: string}|{username: string}|{id: string}, password: string): angular.IPromise<void>;
-
-        /**
-         * Create a new user. More information: http://docs.meteor.com/#/full/accounts_createuser
-         *
-         * @param options.username - A unique name for this user. Either this, or email is required.
-         * @param options.email - The user's email address. Either this, or username is required.
-         * @param options.password - The user's password. This is not sent in plain text over the wire.
-         * @param options.profile - The user's profile, typically including the name field.
-         */
-        createUser(options: {username?: string; email?: string; password: string; profile?: Object}): angular.IPromise<void>;
-
-        /**
-         * Change the current user's password. Must be logged in.
-         *
-         * @param oldPassword - The user's current password. This is not sent in plain text over the wire.
-         * @param newPassword - A new password for the user. This is not sent in plain text over the wire.
-         */
-        changePassword(oldPassword: string, newPassword: string): angular.IPromise<void>;
-
-        /**
-         * Request a forgot password email.
-         *
-         * @param options.email - The email address to send a password reset link.
-         */
-        forgotPassword(options: {email: string}): angular.IPromise<void>;
-
-        /**
-         * Reset the password for a user using a token received in email. Logs the user in afterwards.
-         *
-         * @param token - The token retrieved from the reset password URL.
-         * @param newPassword - A new password for the user. This is not sent in plain text over the wire.
-         */
-        resetPassword(token: string, newPassword: string): angular.IPromise<void>;
-
-        /**
-         * Marks the user's email address as verified. Logs the user in afterwards.
-         *
-         * @param token - The token retrieved from the reset password URL.
-         */
-        verifyEmail(token: string): angular.IPromise<void>;
-
-        loginWithFacebook: ILoginWithExternalService;
-        loginWithTwitter: ILoginWithExternalService;
-        loginWithGoogle: ILoginWithExternalService;
-        loginWithGithub: ILoginWithExternalService;
-        loginWithMeetup: ILoginWithExternalService;
-        loginWithWeibo: ILoginWithExternalService;
-
-        /**
-         * Log the user out.
-         *
-         * @return Resolves with no arguments on success, or reject with a Error argument on failure.
-         */
-        logout(): angular.IPromise<void>;
-
-        /**
-         * Log out other clients logged in as the current user, but does not log out the client that calls this function.
-         * For example, when called in a user's browser, connections in that browser remain logged in,
-         * but any other browsers or DDP clients logged in as that user will be logged out.
-         *
-         * @return Resolves with no arguments on success, or reject with a Error argument on failure.
-         */
-        logoutOtherClients(): angular.IPromise<void>;
-
-        // <- User Authentication END
-        // $meteorUtils BEGIN ->
-
-        /**
-         * @param scope - The AngularJS scope you use the autorun on.
-         * @param fn - The function that will re-run every time a reactive variable changes inside it.
-         */
-        autorun(scope: angular.IScope, fn: Function): void;
-
-        /**
-         * @param collectionName - The name of the collection you want to get back
-         */
-        getCollectionByName<T>(collectionName: string): Mongo.Collection<T>;
-
-        // <- $meteorUtils END
-        // $meteorCamera BEGIN ->
-
-        /**
-         * A helper service for taking pictures across platforms.
-         * Must add mdg:camera package to use! (meteor add mdg:camera)
-         *
-         * @param [options] - options is an optional argument that is an Object with the following possible keys:
-         * @param options.width - An integer that specifies the minimum width of the returned photo.
-         * @param options.height - An integer that specifies the minimum height of the returned photo.
-         * @param options.quality - A number from 0 to 100 specifying the desired quality of JPEG encoding.
-         *
-         * @return The promise solved successfully when the picture is taken with the data as a parameter or rejected with an error as a parameter in case of error.
-         */
-        getPicture(options?: {width?: number; height?: number; quality?: number}): angular.IPromise<any>;
-
-        // <- $meteorCamera END
-
-        /**
-         * A service that binds a scope variable to a Meteor Session variable.
-         *
-         * @param sessionKey - The name of the session variable
-         * @return An object with a single function bind - to bind to that variable.
-         */
-        session(sessionKey: string): {
-            /**
-             * @param scope - The scope the document will be bound to.
-             * @param model - The name of the scope's model variable that the document will be bound to.
-             */
-            bind: (scope: IScope, model: string) => void;
-        };
-    }
-
-    /**
-     * An object that connects a Meteor Object to an AngularJS scope variable.
-     *
-     * The object contains also all the properties from the generic type T,
-     * unfortunately TypeScript doesn't at the moment allow to extend a generic type (see https://github.com/Microsoft/TypeScript/issues/2225 for details and updates).
-     * For a workaround, you'll need to implement an interface which will merge AngularMeteorObject<T> together with T and cast it, like this:
-     *
-     * interface TodoAngularMeteorObject extends ITodo, AngularMeteorObject<ITodo> { }
-     * var todo = <TodoAngularMeteorObject>$meteor.object(TodoCollection, 'TodoID');
-     */
-    interface AngularMeteorObject<T> {
-        /**
-         * @param [doc] - The doc to save to the Meteor Object. If nothing is passed, the method saves everything in the AngularMeteorObject as is.
-         *              - Unchanged properties will be overridden with their existing values, which may trigger hooks.
-         *              - If doc is passed, the method only updates the Meteor Object with the properties passed, and no other changes will be saved.
-         *
-         * @return Returns a promise with an error in case for an error or a number of successful docs changed in case of success.
-         */
-        save(doc?: T): angular.IPromise<number>;
-
-        /**
-         * Reset the current value of the object to the one in the server.
-         */
-        reset(): void;
-
-        /**
-         * Returns a copy of the AngularMeteorObject with all the AngularMeteor-specific internal properties removed.
-         * The returned object is then safe to use as a parameter for method calls, or anywhere else where the data needs to be converted to JSON.
-         */
-        getRawObject(): T;
-
-        /**
-         * A shorten (Syntactic sugar) function for the $meteor.subscribe function.
-         * Takes only one parameter and not returns a promise like $meteor.subscribe does.
-         *
-         * @param subscriptionName - The subscription name to subscribe to. Exactly like the first parameter in $meteor.subscribe service.
-         */
-        subscribe(subscriptionName:string): AngularMeteorObject<T>;
-    }
-
-    /**
-     * An object that connects a Meteor Collection to an AngularJS scope variable
-     */
-    interface AngularMeteorCollection<T> extends AngularMeteorCollection2<T, T> { }
-
-    /**
-     * An object that connects a Meteor Collection to an AngularJS scope variable,
-     * but can use a differen type for updates.
-     */
-    interface AngularMeteorCollection2<T, U> extends Array<T> {
-        /**
-         * @param [docs] - The docs to save to the Meteor Collection.
-         *               - If the docs parameter is empty, the method saves everything in the AngularMeteorCollection as is.
-         *               - If an object is passed, the method pushes that object into the AngularMeteorCollection.
-         *               - If an array is passed, the method pushes all objects in the array into the AngularMeteorCollection.
-         */
-        save(docs?: U|U[]): void;
-
-        /**
-         * @param [keys] - The keys of the object to remove from the Meteor Collection.
-         *               - If nothing is passed, the method removes all the documents from the AngularMeteorCollection.
-         *               - If an object is passed, the method removes the object with that key from the AngularMeteorCollection.
-         *               - If an array is passed, the method removes all objects that matches the keys in the array from the AngularMeteorCollection.
-         */
-        remove(keys?: U|string|number|string[]|number[]): void;
-
-        /**
-         * A shorten (Syntactic sugar) function for the $meteor.subscribe function.
-         * Takes only one parameter and not returns a promise like $meteor.subscribe does.
-         *
-         * @param subscriptionName - The subscription name to subscribe to. Exactly like the first parameter in $meteor.subscribe service.
-         */
-         subscribe(subscriptionName:string): AngularMeteorCollection2<T, U>;
-    }
-
-    interface ILoginWithExternalService {
-        (options: Meteor.LoginWithExternalServiceOptions): angular.IPromise<void>;
-    }
-
-    interface ReactiveResult { }
-}
diff --git a/angular-meteor/index.d.ts b/angular-meteor/index.d.ts
new file mode 100644
index 0000000000..347936e7a6
--- /dev/null
+++ b/angular-meteor/index.d.ts
@@ -0,0 +1,352 @@
+// Type definitions for Angular JS Meteor v0.8.8 (angular.meteor module)
+// Project: https://github.com/Urigo/angular-meteor
+// Definitions by: Peter Grman <https://github.com/pgrm>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="meteor" />
+/// <reference types="angularjs" />
+
+declare namespace angular.meteor {
+    interface IRootScopeService extends angular.IRootScopeService {
+        /**
+         * The current logged in user and it's data. it is null if the user is not logged in. A reactive data source.
+         */
+        currentUser: Meteor.User;
+
+        /**
+         * True if a login method (such as Meteor.loginWithPassword, Meteor.loginWithFacebook, or Accounts.createUser) is currently in progress.
+         * A reactive data source. Can be use to display animation while user is logging in.
+         */
+        loggingIn: boolean;
+    }
+
+    interface IScope extends angular.IScope, IRootScopeService {
+        /**
+         * A method to get a $scope variable and watch it reactivly
+         *
+         * @param scopeVariableName - The name of the scope's variable to bind to
+         * @param [objectEquality=false] - Watch the object equality using angular.equals instead of comparing for reference equality, deeper watch but also slower
+         */
+        getReactively(scopeVariableName: string, objectEquality?: boolean): ReactiveResult;
+
+        /**
+         * A service which is a wrapper for Meteor.subscribe. It subscribes to a Meteor.publish method in the client and returns a AngularJS promise when ready.
+         * Calling $scope.subscribe will automatically stop the subscription when the scope is destroyed.
+         *
+         * @param name - Name of the subscription. Matches the name of the server's publish() call.
+         * @param publisherArguments - Optional arguments passed to publisher function on server.
+         *
+         * @return The promise solved successfully when subscription is ready. The success promise holds the subscription handle.
+         */
+        subscribe(name: string, ...publisherArguments: any[]): angular.IPromise<Meteor.SubscriptionHandle>;
+
+        /**
+         * The helpers method is part of the ReactiveContext, and available on every context and $scope.
+         * These method are defined as Object, where each key is the name of the variable that will be available on the context we run, and each value is a function with a return value.
+         * Under the hood, each helper starts a new Tracker.autorun. When its reactive dependencies change, the helper is rerun.
+         * To trigger a rerun every time an specific Angular variable change, use getReactively](/api/1.3.1/get-reactively) to make your Angular variable reactive inside the helper its used in.
+         * Each helper function should return a MongoDB Cursor and the helpers will expose it as a normal array to the context.
+         *
+         * @param definitions - Object containing `name` => `function` definition, where each name is a string and each function is the helper function. Should return a [MongoDB Cursor](http://docs.meteor.com/#/full/mongo_cursor)
+         * @return This method returns this, which the the reactive context, in order to provide the ability to chain the logic.
+         */
+        helpers(definitions : { [helperName : string] : () => Mongo.Cursor<any> }): IScope;
+
+        /**
+         * This method is a wrapper of Tracker.autorun and shares exactly the same API.
+         * The autorun method is part of the ReactiveContext, and available on every context and $scope.
+         * The argument of this method is a callback, which will be called each time Autorun will be used.
+         * The Autorun will stop automatically when when it's context ($scope) is destroyed.
+         *
+         * @param runFunc - The function to run. It receives one argument: the Computation object that will be returned.
+         */
+        autorun(runFunc : () => void) : Tracker.Computation;
+    }
+
+    /**
+     * $meteor in angularjs
+     */
+    interface IMeteorService {
+        /**
+         * A service that wraps the Meteor collections to enable reactivity within AngularJS.
+         *
+         * @param collection - A Meteor Collection or a reactive function to bind to.
+         *                   - Reactive function can be used with $scope.getReactively to add $scope variable as reactive variable to the cursor.
+         * @param [autoClientSave=true] - By default, changes in the Angular collection will automatically update the Meteor collection.
+         *                              - However if set to false, changes in the client won't be automatically propagated back to the Meteor collection.
+         */
+        collection<T>(collection: Mongo.Collection<T>|ReactiveResult|Function|(()=>T), autoClientSave?: boolean): AngularMeteorCollection<T>;
+
+        /**
+         * A service that wraps the Meteor collections to enable reactivity within AngularJS.
+         *
+         * @param collection - A Meteor Collection or a reactive function to bind to.
+         *                   - Reactive function can be used with $scope.getReactively to add $scope variable as reactive variable to the cursor.
+         * @param [autoClientSave=true] - By default, changes in the Angular collection will automatically update the Meteor collection.
+         *                              - However if set to false, changes in the client won't be automatically propagated back to the Meteor collection.
+         * @param [updateCollection] - A collection object which will be used for updates (insert, update, delete).
+         */
+        collection<T, U>(collection: Mongo.Collection<T>|ReactiveResult|Function|(()=>T), autoClientSave: boolean, updateCollection: Mongo.Collection<U>): AngularMeteorCollection2<T, U>;
+
+        /**
+         * A service that wraps a Meteor object to enable reactivity within AngularJS.
+         * Finds the first document that matches the selector, as ordered by sort and skip options. Wraps collection.findOne
+         *
+         * @param collection - A Meteor Collection to bind to.
+         * @param selector - A query describing the documents to find or just the ID of the document.
+         *                 - $meteor.object will find the first document that matches the selector,
+         *                 - as ordered by sort and skip options, exactly like Meteor's collection.findOne
+         * @param [autoClientSave=true] - By default, changes in the Angular object will automatically update the Meteor object.
+         *                              - However if set to false, changes in the client won't be automatically propagated back to the Meteor object.
+         */
+        object<T>(collection: Mongo.Collection<T>, selector: Mongo.Selector|Mongo.ObjectID|string, autoClientSave?: boolean): AngularMeteorObject<T>;
+
+        /**
+         * A service which is a wrapper for Meteor.subscribe. It subscribes to a Meteor.publish method in the client and returns a AngularJS promise when ready.
+         *
+         * @param name - Name of the subscription. Matches the name of the server's publish() call.
+         * @param publisherArguments - Optional arguments passed to publisher function on server.
+         *
+         * @return The promise solved successfully when subscription is ready. The success promise holds the subscription handle.
+         */
+        subscribe(name: string, ...publisherArguments: any[]): angular.IPromise<Meteor.SubscriptionHandle>;
+
+        /**
+         * A service service which wraps up Meteor.methods with AngularJS promises.
+         *
+         * @param name - Name of method to invoke
+         * @param methodArguments - Optional method arguments
+         *
+         * @return The promise solves successfully with the return value of the method or return reject with the error from the method.
+         */
+        call<T>(name: string, ...methodArguments: any[]): angular.IPromise<T>;
+
+        // User Authentication BEGIN ->
+
+        /**
+         * Returns a promise fulfilled with the currentUser when the user subscription is ready.
+         * This is useful when you want to grab the current user before the route is rendered.
+         * If there is no logged in user, it will return null.
+         * See the “Authentication with Routers” section of our tutorial for more information and a full example.
+         */
+        waitForUser(): angular.IPromise<Meteor.User>;
+
+        /**
+         * Resolves the promise successfully if a user is authenticated and rejects otherwise.
+         * This is useful in cases where you want to require a route to have an authenticated user.
+         * You can catch the rejected promise and redirect the unauthenticated user to a different page, such as the login page.
+         * See the “Authentication with Routers” section of our tutorial for more information and a full example.
+         */
+        requireUser(): angular.IPromise<Meteor.User>;
+
+        /**
+         * Resolves the promise successfully if a user is authenticated and the validatorFn returns true; rejects otherwise.
+         * This is useful in cases where you want to require a route to have an authenticated user and do extra validation like the user's role or group.
+         * You can catch the rejected promise and redirect the unauthenticated user to a different page, such as the login page.
+         * See the “Authentication with Routers” section of our tutorial for more information and a full example.
+         *
+         * The mandatory validator function will be called with the authenticated user as the single param and it's expected to return true in order to resolve.
+         * If it returns a string, the promise will be rejected using said string as the reason.
+         * Any other return (false, null, undefined) will be rejected with the default "FORBIDDEN" reason.
+         */
+        requireValidUser(validatorFn: (user: Meteor.User) => boolean|string): angular.IPromise<Meteor.User>;
+
+        /**
+         * Log the user in with a password.
+         *
+         * @param user - Either a string interpreted as a username or an email; or an object with a single key: email, username or id.
+         * @param password - The user's password.
+         */
+        loginWithPassword(user: string|{email: string}|{username: string}|{id: string}, password: string): angular.IPromise<void>;
+
+        /**
+         * Create a new user. More information: http://docs.meteor.com/#/full/accounts_createuser
+         *
+         * @param options.username - A unique name for this user. Either this, or email is required.
+         * @param options.email - The user's email address. Either this, or username is required.
+         * @param options.password - The user's password. This is not sent in plain text over the wire.
+         * @param options.profile - The user's profile, typically including the name field.
+         */
+        createUser(options: {username?: string; email?: string; password: string; profile?: Object}): angular.IPromise<void>;
+
+        /**
+         * Change the current user's password. Must be logged in.
+         *
+         * @param oldPassword - The user's current password. This is not sent in plain text over the wire.
+         * @param newPassword - A new password for the user. This is not sent in plain text over the wire.
+         */
+        changePassword(oldPassword: string, newPassword: string): angular.IPromise<void>;
+
+        /**
+         * Request a forgot password email.
+         *
+         * @param options.email - The email address to send a password reset link.
+         */
+        forgotPassword(options: {email: string}): angular.IPromise<void>;
+
+        /**
+         * Reset the password for a user using a token received in email. Logs the user in afterwards.
+         *
+         * @param token - The token retrieved from the reset password URL.
+         * @param newPassword - A new password for the user. This is not sent in plain text over the wire.
+         */
+        resetPassword(token: string, newPassword: string): angular.IPromise<void>;
+
+        /**
+         * Marks the user's email address as verified. Logs the user in afterwards.
+         *
+         * @param token - The token retrieved from the reset password URL.
+         */
+        verifyEmail(token: string): angular.IPromise<void>;
+
+        loginWithFacebook: ILoginWithExternalService;
+        loginWithTwitter: ILoginWithExternalService;
+        loginWithGoogle: ILoginWithExternalService;
+        loginWithGithub: ILoginWithExternalService;
+        loginWithMeetup: ILoginWithExternalService;
+        loginWithWeibo: ILoginWithExternalService;
+
+        /**
+         * Log the user out.
+         *
+         * @return Resolves with no arguments on success, or reject with a Error argument on failure.
+         */
+        logout(): angular.IPromise<void>;
+
+        /**
+         * Log out other clients logged in as the current user, but does not log out the client that calls this function.
+         * For example, when called in a user's browser, connections in that browser remain logged in,
+         * but any other browsers or DDP clients logged in as that user will be logged out.
+         *
+         * @return Resolves with no arguments on success, or reject with a Error argument on failure.
+         */
+        logoutOtherClients(): angular.IPromise<void>;
+
+        // <- User Authentication END
+        // $meteorUtils BEGIN ->
+
+        /**
+         * @param scope - The AngularJS scope you use the autorun on.
+         * @param fn - The function that will re-run every time a reactive variable changes inside it.
+         */
+        autorun(scope: angular.IScope, fn: Function): void;
+
+        /**
+         * @param collectionName - The name of the collection you want to get back
+         */
+        getCollectionByName<T>(collectionName: string): Mongo.Collection<T>;
+
+        // <- $meteorUtils END
+        // $meteorCamera BEGIN ->
+
+        /**
+         * A helper service for taking pictures across platforms.
+         * Must add mdg:camera package to use! (meteor add mdg:camera)
+         *
+         * @param [options] - options is an optional argument that is an Object with the following possible keys:
+         * @param options.width - An integer that specifies the minimum width of the returned photo.
+         * @param options.height - An integer that specifies the minimum height of the returned photo.
+         * @param options.quality - A number from 0 to 100 specifying the desired quality of JPEG encoding.
+         *
+         * @return The promise solved successfully when the picture is taken with the data as a parameter or rejected with an error as a parameter in case of error.
+         */
+        getPicture(options?: {width?: number; height?: number; quality?: number}): angular.IPromise<any>;
+
+        // <- $meteorCamera END
+
+        /**
+         * A service that binds a scope variable to a Meteor Session variable.
+         *
+         * @param sessionKey - The name of the session variable
+         * @return An object with a single function bind - to bind to that variable.
+         */
+        session(sessionKey: string): {
+            /**
+             * @param scope - The scope the document will be bound to.
+             * @param model - The name of the scope's model variable that the document will be bound to.
+             */
+            bind: (scope: IScope, model: string) => void;
+        };
+    }
+
+    /**
+     * An object that connects a Meteor Object to an AngularJS scope variable.
+     *
+     * The object contains also all the properties from the generic type T,
+     * unfortunately TypeScript doesn't at the moment allow to extend a generic type (see https://github.com/Microsoft/TypeScript/issues/2225 for details and updates).
+     * For a workaround, you'll need to implement an interface which will merge AngularMeteorObject<T> together with T and cast it, like this:
+     *
+     * interface TodoAngularMeteorObject extends ITodo, AngularMeteorObject<ITodo> { }
+     * var todo = <TodoAngularMeteorObject>$meteor.object(TodoCollection, 'TodoID');
+     */
+    interface AngularMeteorObject<T> {
+        /**
+         * @param [doc] - The doc to save to the Meteor Object. If nothing is passed, the method saves everything in the AngularMeteorObject as is.
+         *              - Unchanged properties will be overridden with their existing values, which may trigger hooks.
+         *              - If doc is passed, the method only updates the Meteor Object with the properties passed, and no other changes will be saved.
+         *
+         * @return Returns a promise with an error in case for an error or a number of successful docs changed in case of success.
+         */
+        save(doc?: T): angular.IPromise<number>;
+
+        /**
+         * Reset the current value of the object to the one in the server.
+         */
+        reset(): void;
+
+        /**
+         * Returns a copy of the AngularMeteorObject with all the AngularMeteor-specific internal properties removed.
+         * The returned object is then safe to use as a parameter for method calls, or anywhere else where the data needs to be converted to JSON.
+         */
+        getRawObject(): T;
+
+        /**
+         * A shorten (Syntactic sugar) function for the $meteor.subscribe function.
+         * Takes only one parameter and not returns a promise like $meteor.subscribe does.
+         *
+         * @param subscriptionName - The subscription name to subscribe to. Exactly like the first parameter in $meteor.subscribe service.
+         */
+        subscribe(subscriptionName:string): AngularMeteorObject<T>;
+    }
+
+    /**
+     * An object that connects a Meteor Collection to an AngularJS scope variable
+     */
+    interface AngularMeteorCollection<T> extends AngularMeteorCollection2<T, T> { }
+
+    /**
+     * An object that connects a Meteor Collection to an AngularJS scope variable,
+     * but can use a differen type for updates.
+     */
+    interface AngularMeteorCollection2<T, U> extends Array<T> {
+        /**
+         * @param [docs] - The docs to save to the Meteor Collection.
+         *               - If the docs parameter is empty, the method saves everything in the AngularMeteorCollection as is.
+         *               - If an object is passed, the method pushes that object into the AngularMeteorCollection.
+         *               - If an array is passed, the method pushes all objects in the array into the AngularMeteorCollection.
+         */
+        save(docs?: U|U[]): void;
+
+        /**
+         * @param [keys] - The keys of the object to remove from the Meteor Collection.
+         *               - If nothing is passed, the method removes all the documents from the AngularMeteorCollection.
+         *               - If an object is passed, the method removes the object with that key from the AngularMeteorCollection.
+         *               - If an array is passed, the method removes all objects that matches the keys in the array from the AngularMeteorCollection.
+         */
+        remove(keys?: U|string|number|string[]|number[]): void;
+
+        /**
+         * A shorten (Syntactic sugar) function for the $meteor.subscribe function.
+         * Takes only one parameter and not returns a promise like $meteor.subscribe does.
+         *
+         * @param subscriptionName - The subscription name to subscribe to. Exactly like the first parameter in $meteor.subscribe service.
+         */
+         subscribe(subscriptionName:string): AngularMeteorCollection2<T, U>;
+    }
+
+    interface ILoginWithExternalService {
+        (options: Meteor.LoginWithExternalServiceOptions): angular.IPromise<void>;
+    }
+
+    interface ReactiveResult { }
+}
diff --git a/angular-meteor/tsconfig.json b/angular-meteor/tsconfig.json
new file mode 100644
index 0000000000..af97c65dfb
--- /dev/null
+++ b/angular-meteor/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-meteor-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-modal/angular-modal-tests.ts b/angular-modal/angular-modal-tests.ts
index cbb090cee9..45b64debc8 100644
--- a/angular-modal/angular-modal-tests.ts
+++ b/angular-modal/angular-modal-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="angular-modal.d.ts" />
+/// <reference types="jquery" />
+/// <reference types="angularjs" />
+
 
 var btfModal: angularModal.AngularModalFactory;
 
diff --git a/angular-modal/angular-modal.d.ts b/angular-modal/angular-modal.d.ts
deleted file mode 100644
index 0bc46ee1f1..0000000000
--- a/angular-modal/angular-modal.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// Type definitions for angular-modal 0.5.0
-// Project: https://github.com/btford/angular-modal
-// Definitions by: Paul Lessing <https://github.com/paullessing>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace angularModal {
-
-    type AngularModalControllerDefinition = (new (...args: any[]) => any) | Function | string; // Possible arguments to IControllerService
-
-    type AngularModalJQuerySelector = string | Element | Element[] | JQuery | Function | any[] | {}; // Possible arguments to IAugmentedJQueryStatic
-
-    interface AngularModalSettings {
-        controller?: AngularModalControllerDefinition;
-        controllerAs?: string;
-        container?: AngularModalJQuerySelector;
-    }
-
-    export interface AngularModalSettingsWithTemplate extends AngularModalSettings {
-        template: any;
-    }
-
-    export interface AngularModalSettingsWithTemplateUrl extends AngularModalSettings {
-        templateUrl: string;
-    }
-
-    export interface AngularModal {
-        activate(): angular.IPromise<void>;
-        deactivate(): angular.IPromise<void>;
-        active(): boolean;
-    }
-
-    export interface AngularModalFactory {
-        (settings: AngularModalSettingsWithTemplate | AngularModalSettingsWithTemplateUrl): AngularModal;
-    }
-}
diff --git a/angular-modal/index.d.ts b/angular-modal/index.d.ts
new file mode 100644
index 0000000000..c6f4ca8085
--- /dev/null
+++ b/angular-modal/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for angular-modal 0.5.0
+// Project: https://github.com/btford/angular-modal
+// Definitions by: Paul Lessing <https://github.com/paullessing>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+/// <reference types="jquery" />
+
+declare namespace angularModal {
+
+    type AngularModalControllerDefinition = (new (...args: any[]) => any) | Function | string; // Possible arguments to IControllerService
+
+    type AngularModalJQuerySelector = string | Element | Element[] | JQuery | Function | any[] | {}; // Possible arguments to IAugmentedJQueryStatic
+
+    interface AngularModalSettings {
+        controller?: AngularModalControllerDefinition;
+        controllerAs?: string;
+        container?: AngularModalJQuerySelector;
+    }
+
+    export interface AngularModalSettingsWithTemplate extends AngularModalSettings {
+        template: any;
+    }
+
+    export interface AngularModalSettingsWithTemplateUrl extends AngularModalSettings {
+        templateUrl: string;
+    }
+
+    export interface AngularModal {
+        activate(): angular.IPromise<void>;
+        deactivate(): angular.IPromise<void>;
+        active(): boolean;
+    }
+
+    export interface AngularModalFactory {
+        (settings: AngularModalSettingsWithTemplate | AngularModalSettingsWithTemplateUrl): AngularModal;
+    }
+}
diff --git a/angular-modal/tsconfig.json b/angular-modal/tsconfig.json
new file mode 100644
index 0000000000..860eb1ef78
--- /dev/null
+++ b/angular-modal/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-modal-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-notifications/angular-notifications-tests.ts b/angular-notifications/angular-notifications-tests.ts
index 1632ff1e7d..668f0fb82f 100644
--- a/angular-notifications/angular-notifications-tests.ts
+++ b/angular-notifications/angular-notifications-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-notifications.d.ts" />
+
 
 var myapp = angular.module("myapp", ["notifications"]);
 
diff --git a/angular-notifications/angular-notifications.d.ts b/angular-notifications/angular-notifications.d.ts
deleted file mode 100644
index 58a388e580..0000000000
--- a/angular-notifications/angular-notifications.d.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-// Type definitions for angular-notifications
-// Project: https://github.com/DerekRies/angular-notifications
-// Definitions by: Tomasz Ducin <https://github.com/ducin/DefinitelyTyped>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace angular.notifications {
-
-  interface IAnimation {
-    duration: number;
-    enabled: boolean;
-  }
-
-  interface ISettings {
-    info: IAnimation;
-    warning: IAnimation;
-    error: IAnimation;
-    success: IAnimation;
-    progress: IAnimation;
-    custom: IAnimation;
-    details: boolean;
-    localStorage: boolean;
-    html5Mode: boolean;
-    html5DefaultIcon: string;
-  }
-
-  interface INotification {
-    type: string;
-    image: string;
-    icon: string;
-    title: string;
-    content: string;
-    timestamp: string;
-    userData: string;
-  }
-
-  interface INotificationFactory extends angular.IModule {
-
-    /* ========== SETTINGS RELATED METHODS =============*/
-
-    disableHtml5Mode(): void;
-    disableType(notificationType: string): void;
-    enableHtml5Mode(): void;
-    enableType(notificationType: string): void;
-    getSettings(): ISettings;
-    toggleType(notificationType: string): void;
-    toggleHtml5Mode(): void;
-    requestHtml5ModePermissions(): boolean;
-
-    /* ============ QUERYING RELATED METHODS ============*/
-
-    getAll(): Array<INotification>;
-    getQueue(): Array<INotification>;
-
-    /* ============== NOTIFICATION METHODS ==============*/
-
-    info(title: string): INotification;
-    info(title: string, content: string): INotification;
-    info(title: string, content: string, userData: any): INotification;
-    error(title: string): INotification;
-    error(title: string, content: string): INotification;
-    error(title: string, content: string, userData: any): INotification;
-    success(title: string): INotification;
-    success(title: string, content: string): INotification;
-    success(title: string, content: string, userData: any): INotification;
-    warning(title: string): INotification;
-    warning(title: string, content: string): INotification;
-    warning(title: string, content: string, userData: any): INotification;
-    awesomeNotify(type: string, icon: string, title: string, content: string, userData: any): INotification;
-    notify(image: string, title: string, content: string, userData: any): INotification;
-    makeNotification(type: string, image: string, icon: string, title: string, content: string, userData: any): INotification;
-
-    /* ============ PERSISTENCE METHODS ============ */
-
-    save(): void;
-    restore(): void;
-    clear(): void;
-  }
-
-}
-
diff --git a/angular-notifications/index.d.ts b/angular-notifications/index.d.ts
new file mode 100644
index 0000000000..72ceff3f96
--- /dev/null
+++ b/angular-notifications/index.d.ts
@@ -0,0 +1,82 @@
+// Type definitions for angular-notifications
+// Project: https://github.com/DerekRies/angular-notifications
+// Definitions by: Tomasz Ducin <https://github.com/ducin/DefinitelyTyped>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare namespace angular.notifications {
+
+  interface IAnimation {
+    duration: number;
+    enabled: boolean;
+  }
+
+  interface ISettings {
+    info: IAnimation;
+    warning: IAnimation;
+    error: IAnimation;
+    success: IAnimation;
+    progress: IAnimation;
+    custom: IAnimation;
+    details: boolean;
+    localStorage: boolean;
+    html5Mode: boolean;
+    html5DefaultIcon: string;
+  }
+
+  interface INotification {
+    type: string;
+    image: string;
+    icon: string;
+    title: string;
+    content: string;
+    timestamp: string;
+    userData: string;
+  }
+
+  interface INotificationFactory extends angular.IModule {
+
+    /* ========== SETTINGS RELATED METHODS =============*/
+
+    disableHtml5Mode(): void;
+    disableType(notificationType: string): void;
+    enableHtml5Mode(): void;
+    enableType(notificationType: string): void;
+    getSettings(): ISettings;
+    toggleType(notificationType: string): void;
+    toggleHtml5Mode(): void;
+    requestHtml5ModePermissions(): boolean;
+
+    /* ============ QUERYING RELATED METHODS ============*/
+
+    getAll(): Array<INotification>;
+    getQueue(): Array<INotification>;
+
+    /* ============== NOTIFICATION METHODS ==============*/
+
+    info(title: string): INotification;
+    info(title: string, content: string): INotification;
+    info(title: string, content: string, userData: any): INotification;
+    error(title: string): INotification;
+    error(title: string, content: string): INotification;
+    error(title: string, content: string, userData: any): INotification;
+    success(title: string): INotification;
+    success(title: string, content: string): INotification;
+    success(title: string, content: string, userData: any): INotification;
+    warning(title: string): INotification;
+    warning(title: string, content: string): INotification;
+    warning(title: string, content: string, userData: any): INotification;
+    awesomeNotify(type: string, icon: string, title: string, content: string, userData: any): INotification;
+    notify(image: string, title: string, content: string, userData: any): INotification;
+    makeNotification(type: string, image: string, icon: string, title: string, content: string, userData: any): INotification;
+
+    /* ============ PERSISTENCE METHODS ============ */
+
+    save(): void;
+    restore(): void;
+    clear(): void;
+  }
+
+}
+
diff --git a/angular-notifications/tsconfig.json b/angular-notifications/tsconfig.json
new file mode 100644
index 0000000000..c52cf81112
--- /dev/null
+++ b/angular-notifications/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-notifications-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-notify/angular-notify-tests.ts b/angular-notify/angular-notify-tests.ts
index d5e52b1d17..06dd1a6014 100644
--- a/angular-notify/angular-notify-tests.ts
+++ b/angular-notify/angular-notify-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-notify.d.ts" />
+
 
 var myapp = angular.module("myapp", ["cgNotify"]);
 
diff --git a/angular-notify/angular-notify.d.ts b/angular-notify/angular-notify.d.ts
deleted file mode 100644
index 541d06d720..0000000000
--- a/angular-notify/angular-notify.d.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-// Type definitions for angular-notify 2.5.0
-// Project: https://github.com/cgross/angular-notify
-// Definitions by: Suwato <https://github.com/Suwato/DefinitelyTyped>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../angularjs/angular.d.ts" />
-
-declare namespace angular.cgNotify {
-
-    interface INotifyService {
-
-        /**
-         * The notify function can either be passed a string or an object.
-         * This function will return an object with a close() method and a message property.
-         * @param message
-         */
-        (message:string):INotify;
-
-        /**
-         * When passing an object, the object parameters can be:
-         * @param option
-         */
-        (option:{
-            /**
-             * Required. The message to show.
-             */
-            message : string;
-
-            /**
-             * Optional. A custom template for the UI of the message.
-             */
-            templateUrl? : string;
-
-            /**
-             * Optional. A list of custom CSS classes to apply to the message element.
-             */
-            classes? : string;
-
-            /**
-             * Optional. A string containing any valid Angular HTML which will be shown instead of the regular message text.
-             * The string must contain one root element like all valid Angular HTML templates (so wrap everything in a <span>).
-             */
-            messageTemplate? : string;
-
-            /**
-             * Optional. A valid Angular scope object. The scope of the template will be created by calling $new() on this scope.
-             */
-            $scope? : ng.IScope;
-
-            /**
-             * Optional. Currently center and right are the only acceptable values.
-             */
-            position? : string;
-
-            /**
-             * Optional. The duration (in milliseconds) of the message. A duration of 0 will prevent the message from closing automatically.
-             */
-            duration? : number;
-
-            /**
-             * Optional. Element that contains each notification. Defaults to document.body.
-             */
-            container? : any;
-        }):INotify;
-
-
-        /**
-         * Call config to set the default configuration options for angular-notify.
-         * The following options may be specified in the given object:
-         * @param option
-         */
-        config(option:{
-            /**
-             * The default duration (in milliseconds) of each message. A duration of 0 will prevent messages from closing automatically.
-             */
-            duration? : number;
-
-            /**
-             * The Y pixel value where messages will be shown.
-             */
-            startTop? : number;
-
-            /**
-             * The number of pixels that should be reserved between messages vertically.
-             */
-            verticalSpacing? : number;
-
-            /**
-             * The default message template.
-             */
-            templateUrl? : string;
-
-            /**
-             * The default position of each message. Currently only center and right are the supported values.
-             */
-            position? : string;
-
-            /**
-             * The default element that contains each notification. Defaults to document.body.
-             */
-            container? : any;
-
-            /**
-             * The maximum number of total notifications that can be visible at one time. Older notifications will be closed when the maximum is reached.
-             */
-            maximumOpen? : number;
-        }):void;
-
-        /**
-         * Closes all currently open notifications.
-         */
-        closeAll():void;
-    }
-
-    interface INotify{
-        /**
-         * The message to show.
-         */
-        message:string;
-
-        /**
-         * Close this open notifications.
-         */
-        close():void;
-    }
-}
diff --git a/angular-notify/index.d.ts b/angular-notify/index.d.ts
new file mode 100644
index 0000000000..58f680a09b
--- /dev/null
+++ b/angular-notify/index.d.ts
@@ -0,0 +1,126 @@
+// Type definitions for angular-notify 2.5.0
+// Project: https://github.com/cgross/angular-notify
+// Definitions by: Suwato <https://github.com/Suwato/DefinitelyTyped>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="angularjs" />
+
+declare namespace angular.cgNotify {
+
+    interface INotifyService {
+
+        /**
+         * The notify function can either be passed a string or an object.
+         * This function will return an object with a close() method and a message property.
+         * @param message
+         */
+        (message:string):INotify;
+
+        /**
+         * When passing an object, the object parameters can be:
+         * @param option
+         */
+        (option:{
+            /**
+             * Required. The message to show.
+             */
+            message : string;
+
+            /**
+             * Optional. A custom template for the UI of the message.
+             */
+            templateUrl? : string;
+
+            /**
+             * Optional. A list of custom CSS classes to apply to the message element.
+             */
+            classes? : string;
+
+            /**
+             * Optional. A string containing any valid Angular HTML which will be shown instead of the regular message text.
+             * The string must contain one root element like all valid Angular HTML templates (so wrap everything in a <span>).
+             */
+            messageTemplate? : string;
+
+            /**
+             * Optional. A valid Angular scope object. The scope of the template will be created by calling $new() on this scope.
+             */
+            $scope? : ng.IScope;
+
+            /**
+             * Optional. Currently center and right are the only acceptable values.
+             */
+            position? : string;
+
+            /**
+             * Optional. The duration (in milliseconds) of the message. A duration of 0 will prevent the message from closing automatically.
+             */
+            duration? : number;
+
+            /**
+             * Optional. Element that contains each notification. Defaults to document.body.
+             */
+            container? : any;
+        }):INotify;
+
+
+        /**
+         * Call config to set the default configuration options for angular-notify.
+         * The following options may be specified in the given object:
+         * @param option
+         */
+        config(option:{
+            /**
+             * The default duration (in milliseconds) of each message. A duration of 0 will prevent messages from closing automatically.
+             */
+            duration? : number;
+
+            /**
+             * The Y pixel value where messages will be shown.
+             */
+            startTop? : number;
+
+            /**
+             * The number of pixels that should be reserved between messages vertically.
+             */
+            verticalSpacing? : number;
+
+            /**
+             * The default message template.
+             */
+            templateUrl? : string;
+
+            /**
+             * The default position of each message. Currently only center and right are the supported values.
+             */
+            position? : string;
+
+            /**
+             * The default element that contains each notification. Defaults to document.body.
+             */
+            container? : any;
+
+            /**
+             * The maximum number of total notifications that can be visible at one time. Older notifications will be closed when the maximum is reached.
+             */
+            maximumOpen? : number;
+        }):void;
+
+        /**
+         * Closes all currently open notifications.
+         */
+        closeAll():void;
+    }
+
+    interface INotify{
+        /**
+         * The message to show.
+         */
+        message:string;
+
+        /**
+         * Close this open notifications.
+         */
+        close():void;
+    }
+}
diff --git a/angular-notify/tsconfig.json b/angular-notify/tsconfig.json
new file mode 100644
index 0000000000..8d8eb60b9f
--- /dev/null
+++ b/angular-notify/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-notify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-odata-resources/angular-odata-resources-tests.ts b/angular-odata-resources/angular-odata-resources-tests.ts
index a9194b0067..15c6bd1540 100644
--- a/angular-odata-resources/angular-odata-resources-tests.ts
+++ b/angular-odata-resources/angular-odata-resources-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-odata-resources.d.ts" />
+
 
 interface IMyResource extends OData.IResource<IMyResource> { };
 interface IMyResourceClass extends OData.IResourceClass<IMyResource> { };
diff --git a/angular-odata-resources/angular-odata-resources.d.ts b/angular-odata-resources/angular-odata-resources.d.ts
deleted file mode 100644
index 04c9ef3cfe..0000000000
--- a/angular-odata-resources/angular-odata-resources.d.ts
+++ /dev/null
@@ -1,327 +0,0 @@
-// Type definitions for OData Angular Resources
-// Project: https://github.com/devnixs/ODataAngularResources
-// Definitions by: Raphael ATALLAH <http://raphael.atallah.me>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace OData {
-
-    /**
-     * Currently supported options for the $resource factory options argument.
-     */
-    interface IResourceOptions {
-        /**
-         * If true then the trailing slashes from any calculated URL will be stripped (defaults to true)
-         */
-        stripTrailingSlashes?: boolean;
-        odata?: {
-            url?: string;
-            method?: string;
-        };
-        isodatav4?: boolean;
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////
-    // ResourceService
-    // see http://docs.angularjs.org/api/ngResource.$resource
-    // Most part of the following definitions were achieved by analyzing the
-    // actual implementation, since the documentation doesn't seem to cover
-    // that deeply.
-    ///////////////////////////////////////////////////////////////////////////
-    interface IResourceService {
-        (url: string, paramDefaults?: any,
-            /** example:  {update: { method: 'PUT' }, delete: deleteDescriptor }
-             where deleteDescriptor : IActionDescriptor */
-            actions?: any, options?: IResourceOptions): IResourceClass<IResource<any>>;
-        <T, U>(url: string, paramDefaults?: any,
-            /** example:  {update: { method: 'PUT' }, delete: deleteDescriptor }
-             where deleteDescriptor : IActionDescriptor */
-            actions?: any, options?: IResourceOptions): U;
-        <T>(url: string, paramDefaults?: any,
-            /** example:  {update: { method: 'PUT' }, delete: deleteDescriptor }
-             where deleteDescriptor : IActionDescriptor */
-            actions?: any, options?: IResourceOptions): IResourceClass<T>;
-    }
-
-    // Just a reference to facilitate describing new actions
-    interface IActionDescriptor {
-        url?: string;
-        method: string;
-        isArray?: boolean;
-        params?: any;
-        headers?: any;
-    }
-
-    // Baseclass for everyresource with default actions.
-    // If you define your new actions for the resource, you will need
-    // to extend this interface and typecast the ResourceClass to it.
-    //
-    // In case of passing the first argument as anything but a function,
-    // it's gonna be considered data if the action method is POST, PUT or
-    // PATCH (in other words, methods with body). Otherwise, it's going
-    // to be considered as parameters to the request.
-    // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L461-L465
-    //
-    // Only those methods with an HTTP body do have 'data' as first parameter:
-    // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L463
-    // More specifically, those methods are POST, PUT and PATCH:
-    // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L432
-    //
-    // Also, static calls always return the IResource (or IResourceArray) retrieved
-    // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L538-L549
-    interface IResourceClass<T> {
-        new(dataOrParams? : any) : IResource<T>;
-        get(): IResource<T>;
-        get(params: Object): IResource<T>;
-        get(success: Function, error?: Function): IResource<T>;
-        get(params: Object, success: Function, error?: Function): IResource<T>;
-        get(params: Object, data: Object, success?: Function, error?: Function): IResource<T>;
-
-        query(): IResourceArray<T>;
-        query(params: Object): IResourceArray<T>;
-        query(success: Function, error?: Function): IResourceArray<T>;
-        query(params: Object, success: Function, error?: Function): IResourceArray<T>;
-        query(params: Object, data: Object, success?: Function, error?: Function): IResourceArray<T>;
-
-        save(): IResource<T>;
-        save(data: Object): IResource<T>;
-        save(success: Function, error?: Function): IResource<T>;
-        save(data: Object, success: Function, error?: Function): IResource<T>;
-        save(params: Object, data: Object, success?: Function, error?: Function): IResource<T>;
-
-        update(): IResource<T>;
-        update(data: Object): IResource<T>;
-        update(success: Function, error?: Function): IResource<T>;
-        update(data: Object, success: Function, error?: Function): IResource<T>;
-        update(params: Object, data: Object, success?: Function, error?: Function): IResource<T>;
-
-        remove(): IResource<T>;
-        remove(params: Object): IResource<T>;
-        remove(success: Function, error?: Function): IResource<T>;
-        remove(params: Object, success: Function, error?: Function): IResource<T>;
-        remove(params: Object, data: Object, success?: Function, error?: Function): IResource<T>;
-
-        delete(): IResource<T>;
-        delete(params: Object): IResource<T>;
-        delete(success: Function, error?: Function): IResource<T>;
-        delete(params: Object, success: Function, error?: Function): IResource<T>;
-        delete(params: Object, data: Object, success?: Function, error?: Function): IResource<T>;
-
-        odata(): OData.Provider<T>;
-    }
-
-    // Instance calls always return the the promise of the request which retrieved the object
-    // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L538-L546
-    interface IResource<T> {
-        $get(): angular.IPromise<T>;
-        $get(params?: Object, success?: Function, error?: Function): angular.IPromise<T>;
-        $get(success: Function, error?: Function): angular.IPromise<T>;
-
-        $query(): angular.IPromise<IResourceArray<T>>;
-        $query(params?: Object, success?: Function, error?: Function): angular.IPromise<IResourceArray<T>>;
-        $query(success: Function, error?: Function): angular.IPromise<IResourceArray<T>>;
-
-        $save(): angular.IPromise<T>;
-        $save(params?: Object, success?: Function, error?: Function): angular.IPromise<T>;
-        $save(success: Function, error?: Function): angular.IPromise<T>;
-
-        $update(): angular.IPromise<T>;
-        $update(params?: Object, success?: Function, error?: Function): angular.IPromise<T>;
-        $update(success: Function, error?: Function): angular.IPromise<T>;
-
-        $remove(): angular.IPromise<T>;
-        $remove(params?: Object, success?: Function, error?: Function): angular.IPromise<T>;
-        $remove(success: Function, error?: Function): angular.IPromise<T>;
-
-        $delete(): angular.IPromise<T>;
-        $delete(params?: Object, success?: Function, error?: Function): angular.IPromise<T>;
-        $delete(success: Function, error?: Function): angular.IPromise<T>;
-
-        /** the promise of the original server interaction that created this instance. **/
-        $promise: angular.IPromise<T>;
-        $resolved: boolean;
-    }
-
-    /**
-     * Really just a regular Array object with $promise and $resolve attached to it
-     */
-    interface IResourceArray<T> extends Array<T> {
-        /** the promise of the original server interaction that created this collection. **/
-        $promise: angular.IPromise<IResourceArray<T>>;
-        $resolved: boolean;
-    }
-
-    /** when creating a resource factory via IModule.factory */
-    interface IResourceServiceFactoryFunction<T> {
-        ($resource: OData.IResourceService): IResourceClass<T>;
-        <U extends IResourceClass<T>>($resource: OData.IResourceService): U;
-    }
-
-    // IResourceServiceProvider used to configure global settings
-    interface IResourceServiceProvider extends angular.IServiceProvider {
-
-        defaults: IResourceOptions;
-    }
-
-
-    interface IExecutable {
-        execute(noParenthesis?: any): string;
-    }
-    class Global {
-        static $inject: string[];
-        constructor(ODataBinaryOperation: any, ODataProvider: any, ODataValue: any, ODataProperty: any, ODataMethodCall: any, ODataPredicate: any, ODataOrderByStatement: any);
-        Provider: Provider<any>;
-        BinaryOperation: typeof BinaryOperation;
-        Value: typeof Value;
-        Property: typeof Property;
-        Func: typeof MethodCall;
-        Predicate: typeof Predicate;
-        OrderBy: typeof OrderByStatement;
-    }
-
-    interface BinaryOperationFactory {
-        new (propertyOrPredicate: any, valueOrOperator?: any, value?: any): BinaryOperation;
-    }
-    class BinaryOperation implements IExecutable {
-        private operandA;
-        private operandB;
-        private filterOperator;
-        constructor(propertyOrPredicate: any, valueOrOperator?: any, value?: any);
-        execute(noParenthesis?: any): string;
-        or(propertyOrPredicate: any, operatorOrValue?: any, value?: any): BinaryOperation;
-        and(propertyOrPredicate: any, operatorOrValue?: any, value?: any): BinaryOperation;
-    }
-
-    interface MethodCallFactory {
-        new (methodName: string, ...args: any[]): MethodCall;
-    }
-    class MethodCall implements IExecutable {
-        private methodName;
-        private params;
-        execute(): string;
-        constructor(methodName: string, ...args: any[]);
-    }
-
-    class Operators {
-        operators: {
-            'eq': string[];
-            'ne': string[];
-            'gt': string[];
-            'ge': string[];
-            'lt': string[];
-            'le': string[];
-            'and': string[];
-            'or': string[];
-            'not': string[];
-            'add': string[];
-            'sub': string[];
-            'mul': string[];
-            'div': string[];
-            'mod': string[];
-        };
-        private rtrim;
-        private trim(value);
-        convert(from: string): any;
-    }
-
-    interface OrderByStatementFactory {
-        new (propertyName: string, sortOrder?: string): OrderByStatement;
-    }
-    class OrderByStatement implements IExecutable {
-        private propertyName;
-        private direction;
-        execute(): string;
-        constructor(propertyName: string, sortOrder?: string);
-    }
-
-    interface PredicateFactory {
-        new (propertyOrValueOrPredicate: any, valueOrOperator?: any, value?: any): Predicate;
-        or(orStatements: any[]): IExecutable;
-        create(propertyOrPredicate: any, operatorOrValue?: any, value?: any): IExecutable;
-        and(andStatements: any): IExecutable;
-    }
-    class Predicate extends BinaryOperation {
-        constructor(propertyOrValueOrPredicate: any, valueOrOperator?: any, value?: any);
-        static or(orStatements: any[]): IExecutable;
-        static create(propertyOrPredicate: any, operatorOrValue?: any, value?: any): IExecutable;
-        static and(andStatements: any): IExecutable;
-    }
-
-    interface PropertyFactory {
-        new (value: string): Property;
-    }
-    class Property implements IExecutable {
-        private value;
-        constructor(value: string);
-        execute(): string;
-    }
-
-    interface ProviderFactory {
-        new <T>(callback: ProviderCallback<T>): Provider<T>;
-    }
-    interface ProviderCallback<T> {
-        (queryString: string, success: () => any, error: () => any): T[];
-        (queryString: string, success: () => any, error: () => any, isSingleElement?: boolean, forceSingleElement?: boolean): T;
-    }
-
-    interface ICountResult{
-        result: number;
-        $promise: angular.IPromise<any>;
-    }
-
-    class Provider<T> {
-        private callback;
-        private filters;
-        private sortOrders;
-        private takeAmount;
-        private skipAmount;
-        private expandables;
-        constructor(callback: ProviderCallback<T>);
-        filter(operand1: any, operand2?: any, operand3?: any): Provider<T>;
-        orderBy(arg1: string, arg2?: string): Provider<T>;
-        transformUrl(transformMethod : (url:string)=>string): Provider<T>;
-        take(amount: number): Provider<T>;
-        skip(amount: number): Provider<T>;
-        private execute();
-        query(success?: ((p:T[])=>void), error?: (()=>void)): T[];
-        single(success?: ((p:T)=>void), error?: (()=>void)): T;
-        get(key: any, success?: ((p:T)=>void), error?: (()=>void)): T;
-        expand(...params: string[]): Provider<T>;
-        expand(params: string[]): Provider<T>;
-        select(...params: string[]): Provider<T>;
-        select(params: string[]): Provider<T>;
-        count(success?: (result: ICountResult) => any, error?: () => any):ICountResult;
-        withInlineCount(): Provider<T>;
-    }
-
-    interface ValueFactory {
-        new (value: any, type?: string): Value;
-    }
-    class ValueTypes {
-        static Boolean: string;
-        static Byte: string;
-        static DateTime: string;
-        static Decimal: string;
-        static Double: string;
-        static Single: string;
-        static Guid: string;
-        static Int32: string;
-        static String: string;
-    }
-    class Value {
-        private value;
-        private type;
-        private illegalChars;
-        private escapeIllegalChars(haystack);
-        private generateDate(date);
-        executeWithUndefinedType(): any;
-        executeWithType(): any;
-        execute(): string;
-        constructor(value: any, type?: string);
-    }
-
-
-
-}
diff --git a/angular-odata-resources/index.d.ts b/angular-odata-resources/index.d.ts
new file mode 100644
index 0000000000..894e801796
--- /dev/null
+++ b/angular-odata-resources/index.d.ts
@@ -0,0 +1,327 @@
+// Type definitions for OData Angular Resources
+// Project: https://github.com/devnixs/ODataAngularResources
+// Definitions by: Raphael ATALLAH <http://raphael.atallah.me>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare namespace OData {
+
+    /**
+     * Currently supported options for the $resource factory options argument.
+     */
+    interface IResourceOptions {
+        /**
+         * If true then the trailing slashes from any calculated URL will be stripped (defaults to true)
+         */
+        stripTrailingSlashes?: boolean;
+        odata?: {
+            url?: string;
+            method?: string;
+        };
+        isodatav4?: boolean;
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // ResourceService
+    // see http://docs.angularjs.org/api/ngResource.$resource
+    // Most part of the following definitions were achieved by analyzing the
+    // actual implementation, since the documentation doesn't seem to cover
+    // that deeply.
+    ///////////////////////////////////////////////////////////////////////////
+    interface IResourceService {
+        (url: string, paramDefaults?: any,
+            /** example:  {update: { method: 'PUT' }, delete: deleteDescriptor }
+             where deleteDescriptor : IActionDescriptor */
+            actions?: any, options?: IResourceOptions): IResourceClass<IResource<any>>;
+        <T, U>(url: string, paramDefaults?: any,
+            /** example:  {update: { method: 'PUT' }, delete: deleteDescriptor }
+             where deleteDescriptor : IActionDescriptor */
+            actions?: any, options?: IResourceOptions): U;
+        <T>(url: string, paramDefaults?: any,
+            /** example:  {update: { method: 'PUT' }, delete: deleteDescriptor }
+             where deleteDescriptor : IActionDescriptor */
+            actions?: any, options?: IResourceOptions): IResourceClass<T>;
+    }
+
+    // Just a reference to facilitate describing new actions
+    interface IActionDescriptor {
+        url?: string;
+        method: string;
+        isArray?: boolean;
+        params?: any;
+        headers?: any;
+    }
+
+    // Baseclass for everyresource with default actions.
+    // If you define your new actions for the resource, you will need
+    // to extend this interface and typecast the ResourceClass to it.
+    //
+    // In case of passing the first argument as anything but a function,
+    // it's gonna be considered data if the action method is POST, PUT or
+    // PATCH (in other words, methods with body). Otherwise, it's going
+    // to be considered as parameters to the request.
+    // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L461-L465
+    //
+    // Only those methods with an HTTP body do have 'data' as first parameter:
+    // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L463
+    // More specifically, those methods are POST, PUT and PATCH:
+    // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L432
+    //
+    // Also, static calls always return the IResource (or IResourceArray) retrieved
+    // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L538-L549
+    interface IResourceClass<T> {
+        new(dataOrParams? : any) : IResource<T>;
+        get(): IResource<T>;
+        get(params: Object): IResource<T>;
+        get(success: Function, error?: Function): IResource<T>;
+        get(params: Object, success: Function, error?: Function): IResource<T>;
+        get(params: Object, data: Object, success?: Function, error?: Function): IResource<T>;
+
+        query(): IResourceArray<T>;
+        query(params: Object): IResourceArray<T>;
+        query(success: Function, error?: Function): IResourceArray<T>;
+        query(params: Object, success: Function, error?: Function): IResourceArray<T>;
+        query(params: Object, data: Object, success?: Function, error?: Function): IResourceArray<T>;
+
+        save(): IResource<T>;
+        save(data: Object): IResource<T>;
+        save(success: Function, error?: Function): IResource<T>;
+        save(data: Object, success: Function, error?: Function): IResource<T>;
+        save(params: Object, data: Object, success?: Function, error?: Function): IResource<T>;
+
+        update(): IResource<T>;
+        update(data: Object): IResource<T>;
+        update(success: Function, error?: Function): IResource<T>;
+        update(data: Object, success: Function, error?: Function): IResource<T>;
+        update(params: Object, data: Object, success?: Function, error?: Function): IResource<T>;
+
+        remove(): IResource<T>;
+        remove(params: Object): IResource<T>;
+        remove(success: Function, error?: Function): IResource<T>;
+        remove(params: Object, success: Function, error?: Function): IResource<T>;
+        remove(params: Object, data: Object, success?: Function, error?: Function): IResource<T>;
+
+        delete(): IResource<T>;
+        delete(params: Object): IResource<T>;
+        delete(success: Function, error?: Function): IResource<T>;
+        delete(params: Object, success: Function, error?: Function): IResource<T>;
+        delete(params: Object, data: Object, success?: Function, error?: Function): IResource<T>;
+
+        odata(): OData.Provider<T>;
+    }
+
+    // Instance calls always return the the promise of the request which retrieved the object
+    // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L538-L546
+    interface IResource<T> {
+        $get(): angular.IPromise<T>;
+        $get(params?: Object, success?: Function, error?: Function): angular.IPromise<T>;
+        $get(success: Function, error?: Function): angular.IPromise<T>;
+
+        $query(): angular.IPromise<IResourceArray<T>>;
+        $query(params?: Object, success?: Function, error?: Function): angular.IPromise<IResourceArray<T>>;
+        $query(success: Function, error?: Function): angular.IPromise<IResourceArray<T>>;
+
+        $save(): angular.IPromise<T>;
+        $save(params?: Object, success?: Function, error?: Function): angular.IPromise<T>;
+        $save(success: Function, error?: Function): angular.IPromise<T>;
+
+        $update(): angular.IPromise<T>;
+        $update(params?: Object, success?: Function, error?: Function): angular.IPromise<T>;
+        $update(success: Function, error?: Function): angular.IPromise<T>;
+
+        $remove(): angular.IPromise<T>;
+        $remove(params?: Object, success?: Function, error?: Function): angular.IPromise<T>;
+        $remove(success: Function, error?: Function): angular.IPromise<T>;
+
+        $delete(): angular.IPromise<T>;
+        $delete(params?: Object, success?: Function, error?: Function): angular.IPromise<T>;
+        $delete(success: Function, error?: Function): angular.IPromise<T>;
+
+        /** the promise of the original server interaction that created this instance. **/
+        $promise: angular.IPromise<T>;
+        $resolved: boolean;
+    }
+
+    /**
+     * Really just a regular Array object with $promise and $resolve attached to it
+     */
+    interface IResourceArray<T> extends Array<T> {
+        /** the promise of the original server interaction that created this collection. **/
+        $promise: angular.IPromise<IResourceArray<T>>;
+        $resolved: boolean;
+    }
+
+    /** when creating a resource factory via IModule.factory */
+    interface IResourceServiceFactoryFunction<T> {
+        ($resource: OData.IResourceService): IResourceClass<T>;
+        <U extends IResourceClass<T>>($resource: OData.IResourceService): U;
+    }
+
+    // IResourceServiceProvider used to configure global settings
+    interface IResourceServiceProvider extends angular.IServiceProvider {
+
+        defaults: IResourceOptions;
+    }
+
+
+    interface IExecutable {
+        execute(noParenthesis?: any): string;
+    }
+    class Global {
+        static $inject: string[];
+        constructor(ODataBinaryOperation: any, ODataProvider: any, ODataValue: any, ODataProperty: any, ODataMethodCall: any, ODataPredicate: any, ODataOrderByStatement: any);
+        Provider: Provider<any>;
+        BinaryOperation: typeof BinaryOperation;
+        Value: typeof Value;
+        Property: typeof Property;
+        Func: typeof MethodCall;
+        Predicate: typeof Predicate;
+        OrderBy: typeof OrderByStatement;
+    }
+
+    interface BinaryOperationFactory {
+        new (propertyOrPredicate: any, valueOrOperator?: any, value?: any): BinaryOperation;
+    }
+    class BinaryOperation implements IExecutable {
+        private operandA;
+        private operandB;
+        private filterOperator;
+        constructor(propertyOrPredicate: any, valueOrOperator?: any, value?: any);
+        execute(noParenthesis?: any): string;
+        or(propertyOrPredicate: any, operatorOrValue?: any, value?: any): BinaryOperation;
+        and(propertyOrPredicate: any, operatorOrValue?: any, value?: any): BinaryOperation;
+    }
+
+    interface MethodCallFactory {
+        new (methodName: string, ...args: any[]): MethodCall;
+    }
+    class MethodCall implements IExecutable {
+        private methodName;
+        private params;
+        execute(): string;
+        constructor(methodName: string, ...args: any[]);
+    }
+
+    class Operators {
+        operators: {
+            'eq': string[];
+            'ne': string[];
+            'gt': string[];
+            'ge': string[];
+            'lt': string[];
+            'le': string[];
+            'and': string[];
+            'or': string[];
+            'not': string[];
+            'add': string[];
+            'sub': string[];
+            'mul': string[];
+            'div': string[];
+            'mod': string[];
+        };
+        private rtrim;
+        private trim(value);
+        convert(from: string): any;
+    }
+
+    interface OrderByStatementFactory {
+        new (propertyName: string, sortOrder?: string): OrderByStatement;
+    }
+    class OrderByStatement implements IExecutable {
+        private propertyName;
+        private direction;
+        execute(): string;
+        constructor(propertyName: string, sortOrder?: string);
+    }
+
+    interface PredicateFactory {
+        new (propertyOrValueOrPredicate: any, valueOrOperator?: any, value?: any): Predicate;
+        or(orStatements: any[]): IExecutable;
+        create(propertyOrPredicate: any, operatorOrValue?: any, value?: any): IExecutable;
+        and(andStatements: any): IExecutable;
+    }
+    class Predicate extends BinaryOperation {
+        constructor(propertyOrValueOrPredicate: any, valueOrOperator?: any, value?: any);
+        static or(orStatements: any[]): IExecutable;
+        static create(propertyOrPredicate: any, operatorOrValue?: any, value?: any): IExecutable;
+        static and(andStatements: any): IExecutable;
+    }
+
+    interface PropertyFactory {
+        new (value: string): Property;
+    }
+    class Property implements IExecutable {
+        private value;
+        constructor(value: string);
+        execute(): string;
+    }
+
+    interface ProviderFactory {
+        new <T>(callback: ProviderCallback<T>): Provider<T>;
+    }
+    interface ProviderCallback<T> {
+        (queryString: string, success: () => any, error: () => any): T[];
+        (queryString: string, success: () => any, error: () => any, isSingleElement?: boolean, forceSingleElement?: boolean): T;
+    }
+
+    interface ICountResult{
+        result: number;
+        $promise: angular.IPromise<any>;
+    }
+
+    class Provider<T> {
+        private callback;
+        private filters;
+        private sortOrders;
+        private takeAmount;
+        private skipAmount;
+        private expandables;
+        constructor(callback: ProviderCallback<T>);
+        filter(operand1: any, operand2?: any, operand3?: any): Provider<T>;
+        orderBy(arg1: string, arg2?: string): Provider<T>;
+        transformUrl(transformMethod : (url:string)=>string): Provider<T>;
+        take(amount: number): Provider<T>;
+        skip(amount: number): Provider<T>;
+        private execute();
+        query(success?: ((p:T[])=>void), error?: (()=>void)): T[];
+        single(success?: ((p:T)=>void), error?: (()=>void)): T;
+        get(key: any, success?: ((p:T)=>void), error?: (()=>void)): T;
+        expand(...params: string[]): Provider<T>;
+        expand(params: string[]): Provider<T>;
+        select(...params: string[]): Provider<T>;
+        select(params: string[]): Provider<T>;
+        count(success?: (result: ICountResult) => any, error?: () => any):ICountResult;
+        withInlineCount(): Provider<T>;
+    }
+
+    interface ValueFactory {
+        new (value: any, type?: string): Value;
+    }
+    class ValueTypes {
+        static Boolean: string;
+        static Byte: string;
+        static DateTime: string;
+        static Decimal: string;
+        static Double: string;
+        static Single: string;
+        static Guid: string;
+        static Int32: string;
+        static String: string;
+    }
+    class Value {
+        private value;
+        private type;
+        private illegalChars;
+        private escapeIllegalChars(haystack);
+        private generateDate(date);
+        executeWithUndefinedType(): any;
+        executeWithType(): any;
+        execute(): string;
+        constructor(value: any, type?: string);
+    }
+
+
+
+}
diff --git a/angular-odata-resources/tsconfig.json b/angular-odata-resources/tsconfig.json
new file mode 100644
index 0000000000..f790a82c4f
--- /dev/null
+++ b/angular-odata-resources/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-odata-resources-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-permission/angular-permission-2.3.1-tests.ts b/angular-permission/angular-permission-2.3.1-tests.ts
new file mode 100644
index 0000000000..f0a3176d97
--- /dev/null
+++ b/angular-permission/angular-permission-2.3.1-tests.ts
@@ -0,0 +1,92 @@
+
+
+import permission = angular.permission;
+
+angular
+  .module('fooModule', ['permission', 'user'])
+  .run(function (PermissionStore: permission.PermissionStore, User: any) {
+    // Define anonymous permission
+    PermissionStore
+      .definePermission('anonymous', function (stateParams) {
+        // If the returned value is *truthy* then the user has the permission, otherwise they don't
+        if (!User) {
+          return true; // Is anonymous
+        }
+        return false;
+      });
+  });
+
+  interface BackendUserService {
+    checkSession(): angular.IPromise<any>;
+    getAccessLevel(): angular.IPromise<{accessLevel: string}>;
+    hasPermissionDefinition(permission: string) : angular.IPromise<any>;
+  }
+
+  angular.module('barModule', ['permission', 'user'])
+  .run(function (PermissionStore: permission.PermissionStore, User: BackendUserService, $q: angular.IQService) {
+    PermissionStore
+      // Define user permission calling back-end
+      .definePermission('user', function (stateParams) {
+        // This time we will return a promise
+        // If the promise *resolves* then the user has the permission, if it *rejects* (you guessed it)
+
+        // Let's assume this returns a promise that resolves or rejects if session is active
+        return User.checkSession();
+      });
+
+    PermissionStore
+      // A different example for admin
+      .definePermission('admin', function (stateParams) {
+        var deferred = $q.defer();
+
+        User.getAccessLevel()
+          .then(function (data) {
+            if (data.accessLevel === 'admin') {
+              deferred.resolve();
+            } else {
+              deferred.reject();
+            }
+          })
+          .catch(function () {
+            // Error with request
+            deferred.reject();
+          });
+
+        return deferred.promise;
+      });
+
+    let arrayOfPermissionNames = ['p1', 'p2'];
+    PermissionStore.defineManyPermissions(arrayOfPermissionNames, function (stateParams: angular.ui.IStateParamsService, permissionName: string) {
+      return User.hasPermissionDefinition(permissionName);
+    });
+
+    PermissionStore.clearStore();
+
+    PermissionStore.removePermissionDefinition('user');
+
+    let permissions: Array<permission.Permission> = PermissionStore.getStore();
+
+
+  });
+
+angular
+  .module('fooModule', ['permission', 'user'])
+  .run(function (RoleStore: permission.RoleStore, User: any) {
+    RoleStore
+      // Permission array validated role
+      // Library will internally validate if 'user' and 'editor' permissions are valid when checking if role is valid
+      .defineRole('admin', ['user', 'editor']);
+
+    RoleStore
+      // Server side validated role
+      .defineRole('accountant', [], function (stateParams) {
+        // Let's assume that we are making a request to server here and return response as promise
+        return User.hasRole('accountant');
+      });
+
+    RoleStore.clearStore();
+
+    RoleStore.removeRoleDefinition('user');
+
+    let roles: Array<permission.Role> = RoleStore.getStore();
+  });
diff --git a/angular-permission/angular-permission-2.3.1.d.ts b/angular-permission/angular-permission-2.3.1.d.ts
new file mode 100644
index 0000000000..015ee62801
--- /dev/null
+++ b/angular-permission/angular-permission-2.3.1.d.ts
@@ -0,0 +1,165 @@
+// Type definitions for angular-permission 2.3.1
+// Project: https://github.com/Narzerus/angular-permission
+// Definitions by: Voislav Mishevski <https://github.com/vmishevski>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="angular-ui-router" />
+
+declare namespace angular.permission {
+
+  export interface PermissionStore {
+    /**
+     * Allows to define permission on application configuration
+     * @method
+     *
+     * @param permissionName {String} Name of defined permission
+     * @param validationFunction {Function} Function used to validate if permission is valid
+     */
+    definePermission(
+      name: string,
+      validationFunction: (stateParams?: angular.ui.IStateParamsService, permission?: string) => boolean | angular.IPromise<any>
+    ): void;
+
+    /**
+     * Allows to define set of permissionNames with shared validation function on application configuration
+     * @method
+     * @throws {TypeError}
+     *
+     * @param permissionNames {Array} Set of permission names
+     * @param validationFunction {Function} Function used to validate if permission is valid
+     */
+    defineManyPermissions(
+      permissions: string[],
+      validationFunction: (stateParams?: angular.ui.IStateParamsService, permission?: string) => boolean | angular.IPromise<any>
+    ): void;
+
+    clearStore(): void;
+
+    /**
+     * Deletes permission
+     * @method
+     *
+     * @param permissionName {String} Name of defined permission
+     */
+    removePermissionDefinition(permission: string): void;
+
+    /**
+     * Checks if permission exists
+     * @method
+     *
+     * @param permissionName {String} Name of defined permission
+     * @returns {Boolean}
+     */
+    hasPermissionDefinition(permissionName: string): boolean;
+
+    /**
+     * Returns all permissions
+     * @method
+     *
+     * @returns {Object} Permissions collection
+     */
+    getStore(): Permission[];
+  }
+
+  export interface RoleStore {
+    /**
+     * Allows to define role
+     * @method
+     *
+     * @param roleName {String} Name of defined role
+     * @param permissions {Array} Set of permission names
+     * @param [validationFunction] {Function} Function used to validate if permissions in role are valid
+     */
+    defineRole(
+      role: string,
+      permissions: Array<string>,
+      validationFunction: RoleValidationFunction
+    ): void;
+
+    /**
+     * Allows to define role
+     * @method
+     *
+     * @param roleName {String} Name of defined role
+     * @param permissions {Array} Set of permission names
+     */
+    defineRole(role: string, permissions: Array<string>): void;
+
+    /**
+     * Checks if role is defined in store
+     * @method
+     *
+     * @param roleName {String} Name of role
+     * @returns {Boolean}
+     */
+    hasRoleDefinition(role: string): boolean;
+
+    /**
+     * Returns role definition object by it's name
+     * @method
+     *
+     * @returns {permission.Role} Role definition object
+     */
+    getRoleDefinition(roleName: string): Role;
+
+    /**
+     * Removes all role definitions
+     * @method
+     */
+    clearStore(): void;
+
+    /**
+     * Deletes role from store
+     * @method
+     *
+     * @param roleName {String} Name of defined permission
+     */
+    removeRoleDefinition(roleName: string): void;
+
+    /**
+     * Returns all role definitions
+     * @method
+     *
+     * @returns {Object} Defined roles collection
+     */
+    getStore(): Role[];
+  }
+
+  export interface Role {
+    roleName: string;
+    permissionNames: string[];
+    validationFunction?: RoleValidationFunction;
+  }
+
+  export interface Permission {
+    permissionName: string;
+    validationFunction?: PermissionValidationFunction;
+  }
+
+  interface RoleValidationFunction {
+    (stateParams?: angular.ui.IStateParamsService, permission?: string): boolean | angular.IPromise<any>;
+  }
+
+  interface PermissionValidationFunction {
+    (stateParams?: angular.ui.IStateParamsService, permission?: string): boolean | angular.IPromise<any>;
+  }
+
+  export interface IPermissionState extends angular.ui.IState {
+    data?: any | DataWithPermissions;
+  }
+
+  export interface DataWithPermissions {
+    permissions?: {
+      only?: (() => void) | Array<string> | angular.IPromise<any>;
+      except?: (() => void) | Array<string> | angular.IPromise<any>;
+      redirectTo: string | (() => string) | (() => PermissionRedirectConfigation) | {[index: string]: PermissionRedirectConfigation}
+    };
+  }
+
+  export interface PermissionRedirectConfigation {
+    state: string;
+    params?: {};
+    options?: angular.ui.IStateOptions;
+  }
+}
diff --git a/angular-permission/angular-permission-tests.ts b/angular-permission/angular-permission-tests.ts
index d14f7ac7e3..674b07340c 100644
--- a/angular-permission/angular-permission-tests.ts
+++ b/angular-permission/angular-permission-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="./angular-permission.d.ts" />
 
-import * as permission from 'angular-permission';
+
+import permission = angular.permission;
 
 angular
   .module('fooModule', ['permission', 'user'])
@@ -36,7 +36,7 @@ angular
 
     PermissionStore
       // A different example for admin
-      .definePermission('admin', function (stateParams) {
+      .definePermission('admin', function (permission: string, stateParams: angular.permission.TransitionProperties) {
         var deferred = $q.defer();
 
         User.getAccessLevel()
@@ -56,7 +56,7 @@ angular
       });
 
     let arrayOfPermissionNames = ['p1', 'p2'];
-    PermissionStore.defineManyPermissions(arrayOfPermissionNames, function (stateParams: angular.ui.IStateParamsService, permissionName: string) {
+    PermissionStore.defineManyPermissions(arrayOfPermissionNames, function (permissionName: string, stateParams: angular.permission.TransitionProperties) {
       return User.hasPermissionDefinition(permissionName);
     });
 
@@ -79,7 +79,7 @@ angular
 
     RoleStore
       // Server side validated role
-      .defineRole('accountant', [], function (stateParams) {
+      .defineRole('accountant', [], function (permission, stateParams) {
         // Let's assume that we are making a request to server here and return response as promise
         return User.hasRole('accountant');
       });
diff --git a/angular-permission/angular-permission.d.ts b/angular-permission/angular-permission.d.ts
deleted file mode 100644
index 0a1a28188f..0000000000
--- a/angular-permission/angular-permission.d.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-// Type definitions for angular-permission 2.3.1
-// Project: https://github.com/Narzerus/angular-permission
-// Definitions by: Voislav Mishevski <https://github.com/vmishevski>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="../angular-ui-router/angular-ui-router.d.ts" />
-
-declare module 'angular-permission' {
-  export interface PermissionStore {
-    /**
-     * Allows to define permission on application configuration
-     * @method
-     *
-     * @param permissionName {String} Name of defined permission
-     * @param validationFunction {Function} Function used to validate if permission is valid
-     */
-    definePermission(
-      name: string,
-      validationFunction: (stateParams?: angular.ui.IStateParamsService, permission?: string) => boolean | angular.IPromise<any>
-    ): void;
-
-    /**
-     * Allows to define set of permissionNames with shared validation function on application configuration
-     * @method
-     * @throws {TypeError}
-     *
-     * @param permissionNames {Array} Set of permission names
-     * @param validationFunction {Function} Function used to validate if permission is valid
-     */
-    defineManyPermissions(
-      permissions: string[],
-      validationFunction: (stateParams?: angular.ui.IStateParamsService, permission?: string) => boolean | angular.IPromise<any>
-    ): void;
-
-    clearStore(): void;
-
-    /**
-     * Deletes permission
-     * @method
-     *
-     * @param permissionName {String} Name of defined permission
-     */
-    removePermissionDefinition(permission: string): void;
-
-    /**
-     * Checks if permission exists
-     * @method
-     *
-     * @param permissionName {String} Name of defined permission
-     * @returns {Boolean}
-     */
-    hasPermissionDefinition(permissionName: string): boolean;
-
-    /**
-     * Returns all permissions
-     * @method
-     *
-     * @returns {Object} Permissions collection
-     */
-    getStore(): Permission[];
-  }
-
-  export interface RoleStore {
-    /**
-     * Allows to define role
-     * @method
-     *
-     * @param roleName {String} Name of defined role
-     * @param permissions {Array} Set of permission names
-     * @param [validationFunction] {Function} Function used to validate if permissions in role are valid
-     */
-    defineRole(
-      role: string,
-      permissions: Array<string>,
-      validationFunction: RoleValidationFunction
-    ): void;
-
-    /**
-     * Allows to define role
-     * @method
-     *
-     * @param roleName {String} Name of defined role
-     * @param permissions {Array} Set of permission names
-     */
-    defineRole(role: string, permissions: Array<string>): void;
-
-    /**
-     * Checks if role is defined in store
-     * @method
-     *
-     * @param roleName {String} Name of role
-     * @returns {Boolean}
-     */
-    hasRoleDefinition(role: string): boolean;
-
-    /**
-     * Returns role definition object by it's name
-     * @method
-     *
-     * @returns {permission.Role} Role definition object
-     */
-    getRoleDefinition(roleName: string): Role;
-
-    /**
-     * Removes all role definitions
-     * @method
-     */
-    clearStore(): void;
-
-    /**
-     * Deletes role from store
-     * @method
-     *
-     * @param roleName {String} Name of defined permission
-     */
-    removeRoleDefinition(roleName: string): void;
-
-    /**
-     * Returns all role definitions
-     * @method
-     *
-     * @returns {Object} Defined roles collection
-     */
-    getStore(): Role[];
-  }
-
-  export interface Role {
-    roleName: string;
-    permissionNames: string[];
-    validationFunction?: RoleValidationFunction;
-  }
-
-  export interface Permission {
-    permissionName: string;
-    validationFunction?: PermissionValidationFunction;
-  }
-
-  interface RoleValidationFunction {
-    (stateParams?: angular.ui.IStateParamsService, permission?: string): boolean | angular.IPromise<any>;
-  }
-
-  interface PermissionValidationFunction {
-    (stateParams?: angular.ui.IStateParamsService, permission?: string): boolean | angular.IPromise<any>;
-  }
-
-  export interface IPermissionState extends angular.ui.IState {
-    data?: any | DataWithPermissions;
-  }
-
-  export interface DataWithPermissions {
-    permissions?: {
-      only?: (() => void) | Array<string> | angular.IPromise<any>;
-      except?: (() => void) | Array<string> | angular.IPromise<any>;
-      redirectTo: string | (() => string) | (() => PermissionRedirectConfigation) | {[index: string]: PermissionRedirectConfigation}
-    };
-  }
-
-  export interface PermissionRedirectConfigation {
-    state: string;
-    params?: {};
-    options?: angular.ui.IStateOptions;
-  }
-}
diff --git a/angular-permission/index.d.ts b/angular-permission/index.d.ts
new file mode 100644
index 0000000000..a32366b218
--- /dev/null
+++ b/angular-permission/index.d.ts
@@ -0,0 +1,175 @@
+// Type definitions for angular-permission 2.3.6
+// Project: https://github.com/Narzerus/angular-permission
+// Definitions by: Voislav Mishevski <https://github.com/vmishevski>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+/// <reference types="angular-ui-router" />
+
+declare namespace angular.permission {
+  /**
+   * Used as optional parameter provided on definitions of permissions and roles
+   */
+  export interface TransitionProperties {
+    fromState?: angular.ui.IState;
+    fromParams?: angular.ui.IStateParamsService;
+    toState?: angular.ui.IState;
+    toParams?: angular.ui.IStateParamsService;
+    options?: angular.ui.IStateOptions;
+  }
+
+  export interface PermissionStore {
+    /**
+     * Allows to define permission on application configuration
+     * @method
+     *
+     * @param permissionName {String} Name of defined permission
+     * @param validationFunction {Function} Function used to validate if permission is valid
+     */
+    definePermission(
+      name: string,
+      validationFunction: (permission?: string, transitionProperties?: TransitionProperties) => boolean | angular.IPromise<any>
+    ): void;
+
+    /**
+     * Allows to define set of permissionNames with shared validation function on application configuration
+     * @method
+     * @throws {TypeError}
+     *
+     * @param permissionNames {Array} Set of permission names
+     * @param validationFunction {Function} Function used to validate if permission is valid
+     */
+    defineManyPermissions(
+      permissions: string[],
+      validationFunction: (permission?: string, transitionProperties?: TransitionProperties) => boolean | angular.IPromise<any>
+    ): void;
+
+    clearStore(): void;
+
+    /**
+     * Deletes permission
+     * @method
+     *
+     * @param permissionName {String} Name of defined permission
+     */
+    removePermissionDefinition(permission: string): void;
+
+    /**
+     * Checks if permission exists
+     * @method
+     *
+     * @param permissionName {String} Name of defined permission
+     * @returns {Boolean}
+     */
+    hasPermissionDefinition(permissionName: string): boolean;
+
+    /**
+     * Returns all permissions
+     * @method
+     *
+     * @returns {Object} Permissions collection
+     */
+    getStore(): Permission[];
+  }
+
+  export interface RoleStore {
+    /**
+     * Allows to define role
+     * @method
+     *
+     * @param roleName {String} Name of defined role
+     * @param permissions {Array} Set of permission names
+     * @param [validationFunction] {Function} Function used to validate if permissions in role are valid
+     */
+    defineRole(
+      role: string,
+      permissions: Array<string>,
+      validationFunction: RoleValidationFunction
+    ): void;
+
+    /**
+     * Allows to define role
+     * @method
+     *
+     * @param roleName {String} Name of defined role
+     * @param permissions {Array} Set of permission names
+     */
+    defineRole(role: string, permissions: Array<string>): void;
+
+    /**
+     * Checks if role is defined in store
+     * @method
+     *
+     * @param roleName {String} Name of role
+     * @returns {Boolean}
+     */
+    hasRoleDefinition(role: string): boolean;
+
+    /**
+     * Returns role definition object by it's name
+     * @method
+     *
+     * @returns {permission.Role} Role definition object
+     */
+    getRoleDefinition(roleName: string): Role;
+
+    /**
+     * Removes all role definitions
+     * @method
+     */
+    clearStore(): void;
+
+    /**
+     * Deletes role from store
+     * @method
+     *
+     * @param roleName {String} Name of defined permission
+     */
+    removeRoleDefinition(roleName: string): void;
+
+    /**
+     * Returns all role definitions
+     * @method
+     *
+     * @returns {Object} Defined roles collection
+     */
+    getStore(): Role[];
+  }
+
+  export interface Role {
+    roleName: string;
+    permissionNames: string[];
+    validationFunction?: RoleValidationFunction;
+  }
+
+  export interface Permission {
+    permissionName: string;
+    validationFunction?: PermissionValidationFunction;
+  }
+
+  interface RoleValidationFunction {
+    (permission?: string, transitionProperties?: TransitionProperties): boolean | angular.IPromise<any>;
+  }
+
+  interface PermissionValidationFunction {
+    (permission?: string, transitionProperties?: TransitionProperties): boolean | angular.IPromise<any>;
+  }
+
+  export interface IPermissionState extends angular.ui.IState {
+    data?: any | DataWithPermissions;
+  }
+
+  export interface DataWithPermissions {
+    permissions?: {
+      only?: (() => void) | Array<string> | angular.IPromise<any>;
+      except?: (() => void) | Array<string> | angular.IPromise<any>;
+      redirectTo: string | (() => string) | (() => PermissionRedirectConfigation) | {[index: string]: PermissionRedirectConfigation}
+    };
+  }
+
+  export interface PermissionRedirectConfigation {
+    state: string;
+    params?: {};
+    options?: angular.ui.IStateOptions;
+  }
+}
diff --git a/angular-permission/tsconfig.json b/angular-permission/tsconfig.json
new file mode 100644
index 0000000000..18277a0408
--- /dev/null
+++ b/angular-permission/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "angular-permission-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/angular-protractor/angular-protractor.d.ts b/angular-protractor/angular-protractor.d.ts
deleted file mode 100644
index fa2928c136..0000000000
--- a/angular-protractor/angular-protractor.d.ts
+++ /dev/null
@@ -1,1849 +0,0 @@
-// Type definitions for Angular Protractor 1.5.0
-// Project: https://github.com/angular/protractor
-// Definitions by: Bill Armstrong <https://github.com/BillArmstrong>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../selenium-webdriver/selenium-webdriver.d.ts" />
-
-declare namespace protractor {
-    //region Wrapped webdriver Items
-
-    class ActionSequence extends webdriver.ActionSequence {}
-    class Builder extends webdriver.Builder {}
-    class Capabilities extends webdriver.Capabilities {}
-    class Command extends webdriver.Command {}
-    class EventEmitter extends webdriver.EventEmitter {}
-    class Session extends webdriver.Session {}
-    class WebDriver extends webdriver.WebDriver {}
-    class WebElement extends webdriver.WebElement {}
-    class WebElementPromise extends webdriver.WebElementPromise { }
-
-    var Browser: webdriver.IBrowser;
-    var Button: webdriver.IButton;
-    var Capability: webdriver.ICapability;
-    var CommandName: webdriver.ICommandName;
-    var Key: webdriver.IKey;
-
-    namespace error {
-        class Error extends webdriver.error.Error {}
-        var ErrorCode: webdriver.error.IErrorCode;
-    }
-
-    namespace logging {
-        class Preferences extends webdriver.logging.Preferences { }
-        class Entry extends webdriver.logging.Entry { }
-
-        var Type: webdriver.logging.IType;
-        var Level: webdriver.logging.ILevelValues;
-
-        function getLevel(nameOrValue: string): webdriver.logging.ILevel;
-        function getLevel(nameOrValue: number): webdriver.logging.ILevel;
-    }
-
-    namespace promise {
-        class Thenable<T> extends webdriver.promise.Thenable<T> { }
-        class Promise<T> extends webdriver.promise.Promise<T> { }
-        class Deferred<T> extends webdriver.promise.Deferred<T> { }
-        class ControlFlow extends webdriver.promise.ControlFlow { }
-        class CancellationError extends webdriver.promise.CancellationError { }
-
-        /**
-         * Given an array of promises, will return a promise that will be fulfilled
-         * with the fulfillment values of the input array's values. If any of the
-         * input array's promises are rejected, the returned promise will be rejected
-         * with the same reason.
-         *
-         * @param {!Array.<(T|!webdriver.promise.Promise.<T>)>} arr An array of
-         *     promises to wait on.
-         * @return {!webdriver.promise.Promise.<!Array.<T>>} A promise that is
-         *     fulfilled with an array containing the fulfilled values of the
-         *     input array, or rejected with the same reason as the first
-         *     rejected value.
-         * @template T
-         */
-        function all(arr: webdriver.promise.Promise<any>[]): webdriver.promise.Promise<any[]>;
-
-        /**
-         * Invokes the appropriate callback function as soon as a promised
-         * {@code value} is resolved. This function is similar to
-         * {@link webdriver.promise.when}, except it does not return a new promise.
-         * @param {*} value The value to observe.
-         * @param {Function} callback The function to call when the value is
-         *     resolved successfully.
-         * @param {Function=} opt_errback The function to call when the value is
-         *     rejected.
-         */
-        function asap(value: any, callback: Function, opt_errback?: Function): void;
-
-        /**
-         * @return {!webdriver.promise.ControlFlow} The currently active control flow.
-         */
-        function controlFlow(): webdriver.promise.ControlFlow;
-
-        /**
-         * Creates a new control flow. The provided callback will be invoked as the
-         * first task within the new flow, with the flow as its sole argument. Returns
-         * a promise that resolves to the callback result.
-         * @param {function(!webdriver.promise.ControlFlow)} callback The entry point
-         *     to the newly created flow.
-         * @return {!webdriver.promise.Promise} A promise that resolves to the callback
-         *     result.
-         */
-        function createFlow<R>(callback: (flow: webdriver.promise.ControlFlow) => R): webdriver.promise.Promise<R>;
-
-        /**
-         * Determines whether a {@code value} should be treated as a promise.
-         * Any object whose "then" property is a function will be considered a promise.
-         *
-         * @param {*} value The value to test.
-         * @return {boolean} Whether the value is a promise.
-         */
-        function isPromise(value: any): boolean;
-
-        /**
-         * Tests is a function is a generator.
-         * @param {!Function} fn The function to test.
-         * @return {boolean} Whether the function is a generator.
-         */
-        function isGenerator(fn: Function): boolean;
-
-        /**
-         * Creates a promise that will be resolved at a set time in the future.
-         * @param {number} ms The amount of time, in milliseconds, to wait before
-         *     resolving the promise.
-         * @return {!webdriver.promise.Promise} The promise.
-         */
-        function delayed(ms: number): webdriver.promise.Promise<void>;
-
-        /**
-         * Calls a function for each element in an array, and if the function returns
-         * true adds the element to a new array.
-         *
-         * <p>If the return value of the filter function is a promise, this function
-         * will wait for it to be fulfilled before determining whether to insert the
-         * element into the new array.
-         *
-         * <p>If the filter function throws or returns a rejected promise, the promise
-         * returned by this function will be rejected with the same reason. Only the
-         * first failure will be reported; all subsequent errors will be silently
-         * ignored.
-         *
-         * @param {!(Array.<TYPE>|webdriver.promise.Promise.<!Array.<TYPE>>)} arr The
-         *     array to iterator over, or a promise that will resolve to said array.
-         * @param {function(this: SELF, TYPE, number, !Array.<TYPE>): (
-         *             boolean|webdriver.promise.Promise.<boolean>)} fn The function
-         *     to call for each element in the array.
-         * @param {SELF=} opt_self The object to be used as the value of 'this' within
-         *     {@code fn}.
-         * @template TYPE, SELF
-         */
-        function filter<T>(arr: T[], fn: (element: T, index: number, array: T[]) => any, opt_self?: any): webdriver.promise.Promise<T[]>;
-        function filter<T>(arr: webdriver.promise.Promise<T[]>, fn: (element: T, index: number, array: T[]) => any, opt_self?: any): webdriver.promise.Promise<T[]>
-
-        /**
-         * Creates a new deferred object.
-         * @return {!webdriver.promise.Deferred} The new deferred object.
-         */
-        function defer<T>(): webdriver.promise.Deferred<T>;
-
-        /**
-         * Creates a promise that has been resolved with the given value.
-         * @param {*=} opt_value The resolved value.
-         * @return {!webdriver.promise.Promise} The resolved promise.
-         */
-        function fulfilled<T>(opt_value?: T): webdriver.promise.Promise<T>;
-
-        /**
-         * Calls a function for each element in an array and inserts the result into a
-         * new array, which is used as the fulfillment value of the promise returned
-         * by this function.
-         *
-         * <p>If the return value of the mapping function is a promise, this function
-         * will wait for it to be fulfilled before inserting it into the new array.
-         *
-         * <p>If the mapping function throws or returns a rejected promise, the
-         * promise returned by this function will be rejected with the same reason.
-         * Only the first failure will be reported; all subsequent errors will be
-         * silently ignored.
-         *
-         * @param {!(Array.<TYPE>|webdriver.promise.Promise.<!Array.<TYPE>>)} arr The
-         *     array to iterator over, or a promise that will resolve to said array.
-         * @param {function(this: SELF, TYPE, number, !Array.<TYPE>): ?} fn The
-         *     function to call for each element in the array. This function should
-         *     expect three arguments (the element, the index, and the array itself.
-         * @param {SELF=} opt_self The object to be used as the value of 'this' within
-         *     {@code fn}.
-         * @template TYPE, SELF
-         */
-        function map<T>(arr: T[], fn: (element: T, index: number, array: T[]) => any, opt_self?: any): webdriver.promise.Promise<T[]>
-        function map<T>(arr: webdriver.promise.Promise<T[]>, fn: (element: T, index: number, array: T[]) => any, opt_self?: any): webdriver.promise.Promise<T[]>
-
-        /**
-         * Creates a promise that has been rejected with the given reason.
-         * @param {*=} opt_reason The rejection reason; may be any value, but is
-         *     usually an Error or a string.
-         * @return {!webdriver.promise.Promise} The rejected promise.
-         */
-        function rejected(opt_reason?: any): webdriver.promise.Promise<void>;
-
-        /**
-         * Wraps a function that is assumed to be a node-style callback as its final
-         * argument. This callback takes two arguments: an error value (which will be
-         * null if the call succeeded), and the success value as the second argument.
-         * If the call fails, the returned promise will be rejected, otherwise it will
-         * be resolved with the result.
-         * @param {!Function} fn The function to wrap.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
-         *     result of the provided function's callback.
-         */
-        function checkedNodeCall<T>(fn: Function, ...var_args: any[]): webdriver.promise.Promise<T>;
-
-        /**
-         * Consumes a {@code GeneratorFunction}. Each time the generator yields a
-         * promise, this function will wait for it to be fulfilled before feeding the
-         * fulfilled value back into {@code next}. Likewise, if a yielded promise is
-         * rejected, the rejection error will be passed to {@code throw}.
-         *
-         * <p>Example 1: the Fibonacci Sequence.
-         * <pre><code>
-         * webdriver.promise.consume(function* fibonacci() {
-         *   var n1 = 1, n2 = 1;
-         *   for (var i = 0; i < 4; ++i) {
-         *     var tmp = yield n1 + n2;
-         *     n1 = n2;
-         *     n2 = tmp;
-         *   }
-         *   return n1 + n2;
-         * }).then(function(result) {
-         *   console.log(result);  // 13
-         * });
-         * </code></pre>
-         *
-         * <p>Example 2: a generator that throws.
-         * <pre><code>
-         * webdriver.promise.consume(function* () {
-         *   yield webdriver.promise.delayed(250).then(function() {
-         *     throw Error('boom');
-         *   });
-         * }).thenCatch(function(e) {
-         *   console.log(e.toString());  // Error: boom
-         * });
-         * </code></pre>
-         *
-         * @param {!Function} generatorFn The generator function to execute.
-         * @param {Object=} opt_self The object to use as "this" when invoking the
-         *     initial generator.
-         * @param {...*} var_args Any arguments to pass to the initial generator.
-         * @return {!webdriver.promise.Promise.<?>} A promise that will resolve to the
-         *     generator's final result.
-         * @throws {TypeError} If the given function is not a generator.
-         */
-        function consume<T>(generatorFn: Function, opt_self?: any, ...var_args: any[]): webdriver.promise.Promise<T>;
-
-        /**
-         * Registers an observer on a promised {@code value}, returning a new promise
-         * that will be resolved when the value is. If {@code value} is not a promise,
-         * then the return promise will be immediately resolved.
-         * @param {*} value The value to observe.
-         * @param {Function=} opt_callback The function to call when the value is
-         *     resolved successfully.
-         * @param {Function=} opt_errback The function to call when the value is
-         *     rejected.
-         * @return {!webdriver.promise.Promise} A new promise.
-         */
-        function when<T, R>(value: T, opt_callback?: (value: T) => any, opt_errback?: (error: any) => any): webdriver.promise.Promise<R>;
-        function when<T, R>(value: webdriver.promise.Promise<T>, opt_callback?: (value: T) => any, opt_errback?: (error: any) => any): webdriver.promise.Promise<R>;
-
-        /**
-         * Returns a promise that will be resolved with the input value in a
-         * fully-resolved state. If the value is an array, each element will be fully
-         * resolved. Likewise, if the value is an object, all keys will be fully
-         * resolved. In both cases, all nested arrays and objects will also be
-         * fully resolved.  All fields are resolved in place; the returned promise will
-         * resolve on {@code value} and not a copy.
-         *
-         * Warning: This function makes no checks against objects that contain
-         * cyclical references:
-         *
-         *   var value = {};
-         *   value['self'] = value;
-         *   webdriver.promise.fullyResolved(value);  // Stack overflow.
-         *
-         * @param {*} value The value to fully resolve.
-         * @return {!webdriver.promise.Promise} A promise for a fully resolved version
-         *     of the input value.
-         */
-        function fullyResolved<T>(value: any): webdriver.promise.Promise<T>;
-
-        /**
-         * Changes the default flow to use when no others are active.
-         * @param {!webdriver.promise.ControlFlow} flow The new default flow.
-         * @throws {Error} If the default flow is not currently active.
-         */
-        function setDefaultFlow(flow: webdriver.promise.ControlFlow): void;
-    }
-
-    namespace stacktrace {
-        class Frame extends webdriver.stacktrace.Frame { }
-        class Snapshot extends webdriver.stacktrace.Snapshot { }
-
-        /**
-         * Formats an error's stack trace.
-         * @param {!(Error|goog.testing.JsUnitException)} error The error to format.
-         * @return {!(Error|goog.testing.JsUnitException)} The formatted error.
-         */
-        function format(error: any): any;
-
-        /**
-         * Gets the native stack trace if available otherwise follows the call chain.
-         * The generated trace will exclude all frames up to and including the call to
-         * this function.
-         * @return {!Array.<!webdriver.stacktrace.Frame>} The frames of the stack trace.
-         */
-        function get(): webdriver.stacktrace.Frame[];
-
-        /**
-         * Whether the current browser supports stack traces.
-         *
-         * @type {boolean}
-         * @const
-         */
-        var BROWSER_SUPPORTED: boolean;
-    }
-
-    namespace until {
-        class Condition<T> extends webdriver.until.Condition<T> { }
-
-        /**
-         * Creates a condition that will wait until the input driver is able to switch
-         * to the designated frame. The target frame may be specified as:
-         * <ol>
-         *   <li>A numeric index into {@code window.frames} for the currently selected
-         *       frame.
-         *   <li>A {@link webdriver.WebElement}, which must reference a FRAME or IFRAME
-         *       element on the current page.
-         *   <li>A locator which may be used to first locate a FRAME or IFRAME on the
-         *       current page before attempting to switch to it.
-         * </ol>
-         *
-         * <p>Upon successful resolution of this condition, the driver will be left
-         * focused on the new frame.
-         *
-         * @param {!(number|webdriver.WebElement|
-         *           webdriver.Locator|webdriver.By.Hash|
-         *           function(!webdriver.WebDriver): !webdriver.WebElement)} frame
-         *     The frame identifier.
-         * @return {!until.Condition.<boolean>} A new condition.
-         */
-        function ableToSwitchToFrame(frame: number): webdriver.until.Condition<boolean>;
-        function ableToSwitchToFrame(frame: webdriver.IWebElement): webdriver.until.Condition<boolean>;
-        function ableToSwitchToFrame(frame: webdriver.Locator): webdriver.until.Condition<boolean>;
-        function ableToSwitchToFrame(frame: (webdriver: webdriver.WebDriver) => webdriver.IWebElement): webdriver.until.Condition<boolean>;
-        function ableToSwitchToFrame(frame: any): webdriver.until.Condition<boolean>;
-
-        /**
-         * Creates a condition that waits for an alert to be opened. Upon success, the
-         * returned promise will be fulfilled with the handle for the opened alert.
-         *
-         * @return {!until.Condition.<!webdriver.Alert>} The new condition.
-         */
-        function alertIsPresent(): webdriver.until.Condition<webdriver.Alert>;
-
-        /**
-         * Creates a condition that will wait for the given element to be disabled.
-         *
-         * @param {!webdriver.WebElement} element The element to test.
-         * @return {!until.Condition.<boolean>} The new condition.
-         * @see webdriver.WebDriver#isEnabled
-         */
-        function elementIsDisabled(element: webdriver.IWebElement): webdriver.until.Condition<boolean>;
-
-        /**
-         * Creates a condition that will wait for the given element to be enabled.
-         *
-         * @param {!webdriver.WebElement} element The element to test.
-         * @return {!until.Condition.<boolean>} The new condition.
-         * @see webdriver.WebDriver#isEnabled
-         */
-        function elementIsEnabled(element: webdriver.IWebElement): webdriver.until.Condition<boolean>;
-
-        /**
-         * Creates a condition that will wait for the given element to be deselected.
-         *
-         * @param {!webdriver.WebElement} element The element to test.
-         * @return {!until.Condition.<boolean>} The new condition.
-         * @see webdriver.WebDriver#isSelected
-         */
-        function elementIsNotSelected(element: webdriver.IWebElement): webdriver.until.Condition<boolean>;
-
-        /**
-         * Creates a condition that will wait for the given element to be in the DOM,
-         * yet not visible to the user.
-         *
-         * @param {!webdriver.WebElement} element The element to test.
-         * @return {!until.Condition.<boolean>} The new condition.
-         * @see webdriver.WebDriver#isDisplayed
-         */
-        function elementIsNotVisible(element: webdriver.IWebElement): webdriver.until.Condition<boolean>;
-
-        /**
-         * Creates a condition that will wait for the given element to be selected.
-         * @param {!webdriver.WebElement} element The element to test.
-         * @return {!until.Condition.<boolean>} The new condition.
-         * @see webdriver.WebDriver#isSelected
-         */
-        function elementIsSelected(element: webdriver.IWebElement): webdriver.until.Condition<boolean>;
-
-        /**
-         * Creates a condition that will wait for the given element to become visible.
-         *
-         * @param {!webdriver.WebElement} element The element to test.
-         * @return {!until.Condition.<boolean>} The new condition.
-         * @see webdriver.WebDriver#isDisplayed
-         */
-        function elementIsVisible(element: webdriver.IWebElement): webdriver.until.Condition<boolean>;
-
-        /**
-         * Creates a condition that will loop until an element is
-         * {@link webdriver.WebDriver#findElement found} with the given locator.
-         *
-         * @param {!(webdriver.Locator|webdriver.By.Hash|Function)} locator The locator
-         *     to use.
-         * @return {!until.Condition.<!webdriver.WebElement>} The new condition.
-         */
-        function elementLocated(locator: webdriver.Locator): webdriver.until.Condition<webdriver.IWebElement>;
-        function elementLocated(locator: any): webdriver.until.Condition<webdriver.IWebElement>;
-
-        /**
-         * Creates a condition that will wait for the given element's
-         * {@link webdriver.WebDriver#getText visible text} to contain the given
-         * substring.
-         *
-         * @param {!webdriver.WebElement} element The element to test.
-         * @param {string} substr The substring to search for.
-         * @return {!until.Condition.<boolean>} The new condition.
-         * @see webdriver.WebDriver#getText
-         */
-        function elementTextContains(element: webdriver.IWebElement, substr: string): webdriver.until.Condition<boolean>;
-
-        /**
-         * Creates a condition that will wait for the given element's
-         * {@link webdriver.WebDriver#getText visible text} to match the given
-         * {@code text} exactly.
-         *
-         * @param {!webdriver.WebElement} element The element to test.
-         * @param {string} text The expected text.
-         * @return {!until.Condition.<boolean>} The new condition.
-         * @see webdriver.WebDriver#getText
-         */
-        function elementTextIs(element: webdriver.IWebElement, text: string): webdriver.until.Condition<boolean>;
-
-        /**
-         * Creates a condition that will wait for the given element's
-         * {@link webdriver.WebDriver#getText visible text} to match a regular
-         * expression.
-         *
-         * @param {!webdriver.WebElement} element The element to test.
-         * @param {!RegExp} regex The regular expression to test against.
-         * @return {!until.Condition.<boolean>} The new condition.
-         * @see webdriver.WebDriver#getText
-         */
-        function elementTextMatches(element: webdriver.IWebElement, regex: RegExp): webdriver.until.Condition<boolean>;
-
-        /**
-         * Creates a condition that will loop until at least one element is
-         * {@link webdriver.WebDriver#findElement found} with the given locator.
-         *
-         * @param {!(webdriver.Locator|webdriver.By.Hash|Function)} locator The locator
-         *     to use.
-         * @return {!until.Condition.<!Array.<!webdriver.WebElement>>} The new
-         *     condition.
-         */
-        function elementsLocated(locator: webdriver.Locator): webdriver.until.Condition<webdriver.IWebElement[]>;
-        function elementsLocated(locator: any): webdriver.until.Condition<webdriver.IWebElement[]>;
-
-        /**
-         * Creates a condition that will wait for the given element to become stale. An
-         * element is considered stale once it is removed from the DOM, or a new page
-         * has loaded.
-         *
-         * @param {!webdriver.WebElement} element The element that should become stale.
-         * @return {!until.Condition.<boolean>} The new condition.
-         */
-        function stalenessOf(element: webdriver.IWebElement): webdriver.until.Condition<boolean>;
-
-        /**
-         * Creates a condition that will wait for the current page's title to contain
-         * the given substring.
-         *
-         * @param {string} substr The substring that should be present in the page
-         *     title.
-         * @return {!until.Condition.<boolean>} The new condition.
-         */
-        function titleContains(substr: string): webdriver.until.Condition<boolean>;
-
-        /**
-         * Creates a condition that will wait for the current page's title to match the
-         * given value.
-         *
-         * @param {string} title The expected page title.
-         * @return {!until.Condition.<boolean>} The new condition.
-         */
-        function titleIs(title: string): webdriver.until.Condition<boolean>;
-
-        /**
-         * Creates a condition that will wait for the current page's title to match the
-         * given regular expression.
-         *
-         * @param {!RegExp} regex The regular expression to test against.
-         * @return {!until.Condition.<boolean>} The new condition.
-         */
-        function titleMatches(regex: RegExp): webdriver.until.Condition<boolean>;
-    }
-
-    namespace ExpectedConditions {
-        /**
-         * Negates the result of a promise.
-         *
-         * @param {webdriver.until.Condition<boolean>} expectedCondition
-         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns the negated value.
-         */
-        function not<T>(expectedCondition: webdriver.until.Condition<T>): webdriver.until.Condition<T>;
-
-        /**
-         * Chain a number of expected conditions using logical_and, short circuiting at the
-         * first expected condition that evaluates to false.
-         *
-         * @param {...webdriver.until.Condition<boolean>[]} fns An array of expected conditions to 'and' together.
-         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise which evaluates
-         * to the result of the logical and.
-         */
-        function and<T>(...fns: webdriver.until.Condition<T>[]): webdriver.until.Condition<T>;
-
-        /**
-         * Chain a number of expected conditions using logical_or, short circuiting at the
-         * first expected condition that evaluates to true.
-         *
-         * @param {...webdriver.until.Condition<boolean>[]} fns An array of expected conditions to 'or' together.
-         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise which
-         * evaluates to the result of the logical or.
-         */
-        function or<T>(...fns: webdriver.until.Condition<T>[]): webdriver.until.Condition<T>;
-
-        /**
-         * Expect an alert to be present.
-         *
-         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise representing
-         * whether an alert is present.
-         */
-        function alertIsPresent<T>(): webdriver.until.Condition<T>;
-
-        /**
-         * An Expectation for checking an element is visible and enabled such that you can click it.
-         *
-         * @param {ElementFinder} element The element to check
-         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise representing
-         * whether the element is clickable.
-         */
-        function elementToBeClickable<T>(element: ElementFinder): webdriver.until.Condition<T>;
-
-        /**
-         * An expectation for checking if the given text is present in the element.
-         * Returns false if the elementFinder does not find an element.
-         *
-         * @param {ElementFinder} element The element to check
-         * @param {string} text The text to verify against
-         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise representing
-         * whether the text is present in the element.
-         */
-        function textToBePresentInElement<T>(element: ElementFinder, text: string): webdriver.until.Condition<T>;
-
-        /**
-         * An expectation for checking if the given text is present in the element’s value.
-         * Returns false if the elementFinder does not find an element.
-         *
-         * @param {ElementFinder} element The element to check
-         * @param {string} text The text to verify against
-         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise representing
-         * whether the text is present in the element's value.
-         */
-        function textToBePresentInElementValue<T>(
-          element: ElementFinder, text: string
-        ): webdriver.until.Condition<T>;
-
-        /**
-         * An expectation for checking that the title contains a case-sensitive substring.
-         *
-         * @param {string} title The fragment of title expected
-         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise representing
-         * whether the title contains the string.
-         */
-        function titleContains<T>(title: string): webdriver.until.Condition<T>;
-
-        /**
-         * An expectation for checking the title of a page.
-         *
-         * @param {string} title The expected title, which must be an exact match.
-         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise representing
-         * whether the title equals the string.
-         */
-        function titleIs<T>(title: string): webdriver.until.Condition<T>;
-
-        /**
-         * An expectation for checking that an element is present on the DOM of a page. This does not necessarily
-         * mean that the element is visible. This is the opposite of 'stalenessOf'.
-         *
-         * @param {ElementFinder} elementFinder The element to check
-         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise
-         * representing whether the element is present.
-         */
-        function presenceOf<T>(element: ElementFinder): webdriver.until.Condition<T>;
-
-        /**
-         * An expectation for checking that an element is not attached to the DOM of a page.
-         * This is the opposite of 'presenceOf'.
-         *
-         * @param {ElementFinder} elementFinder The element to check
-         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise representing
-         * whether the element is stale.
-         */
-        function stalenessOf<T>(element: ElementFinder): webdriver.until.Condition<T>;
-
-        /**
-         * An expectation for checking that an element is present on the DOM of a page and visible.
-         * Visibility means that the element is not only displayed but also has a height and width that is
-         * greater than 0. This is the opposite of 'invisibilityOf'.
-         *
-         * @param {ElementFinder} elementFinder The element to check
-         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise representing
-         * whether the element is visible.
-         */
-        function visibilityOf<T>(element: ElementFinder): webdriver.until.Condition<T>;
-
-        /**
-         * An expectation for checking that an element is present on the DOM of a page. This does not necessarily
-         * mean that the element is visible. This is the opposite of 'stalenessOf'.
-         *
-         * @param {ElementFinder} elementFinder The element to check
-         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise representing
-         * whether the element is invisible.
-         */
-        function invisibilityOf<T>(element: ElementFinder): webdriver.until.Condition<T>;
-
-        /**
-         * An expectation for checking the selection is selected.
-         *
-         * @param {ElementFinder} elementFinder The element to check
-         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise representing
-         * whether the element is selected.
-         */
-        function elementToBeSelected<T>(element: ElementFinder): webdriver.until.Condition<T>;
-    }
-
-    //endregion
-
-    /**
-    * Use as: element(locator)
-    *
-    * The ElementFinder can be treated as a WebElement for most purposes, in
-    * particular, you may perform actions (i.e. click, getText) on them as you
-    * would a WebElement. ElementFinders extend Promise, and once an action
-    * is performed on an ElementFinder, the latest result from the chain can be
-    * accessed using then. Unlike a WebElement, an ElementFinder will wait for
-    * angular to settle before performing finds or actions.
-    *
-    * ElementFinder can be used to build a chain of locators that is used to find
-    * an element. An ElementFinder does not actually attempt to find the element
-    * until an action is called, which means they can be set up in helper files
-    * before the page is available.
-    *
-    * @param {webdriver.Locator} locator An element locator.
-    * @return {ElementFinder}
-    */
-    interface Element {
-        (locator: webdriver.Locator): ElementFinder;
-
-         /**
-          * ElementArrayFinder is used for operations on an array of elements (as opposed
-          * to a single element).
-          *
-          * @param {webdriver.Locator} locator An element locator.
-          * @return {ElementArrayFinder}
-          */
-        all(locator: webdriver.Locator): ElementArrayFinder;
-    }
-
-    interface ElementFinder extends webdriver.IWebElement, webdriver.promise.IThenable<any> {
-        /**
-        * Calls to element may be chained to find elements within a parent.
-        *
-        * @alias element(locator).element(locator)
-        * @view
-        * <div class="parent">
-        *   <div class="child">
-        *     Child text
-        *     <div>{{person.phone}}</div>
-        *   </div>
-        * </div>
-        *
-        * @example
-        * // Chain 2 element calls.
-        * var child = element(by.css('.parent')).
-        *     element(by.css('.child'));
-        * expect(child.getText()).toBe('Child text\n555-123-4567');
-        *
-        * // Chain 3 element calls.
-        * var triple = element(by.css('.parent')).
-        *     element(by.css('.child')).
-        *     element(by.binding('person.phone'));
-        * expect(triple.getText()).toBe('555-123-4567');
-        *
-        * @param {webdriver.Locator} subLocator
-        * @return {ElementFinder}
-        */
-        element(subLocator: webdriver.Locator): ElementFinder;
-
-        /**
-        * Calls to element may be chained to find an array of elements within a parent.
-        *
-        * @alias element(locator).all(locator)
-        * @view
-        * <div class="parent">
-        *   <ul>
-        *     <li class="one">First</li>
-        *     <li class="two">Second</li>
-        *     <li class="three">Third</li>
-        *   </ul>
-        * </div>
-        *
-        * @example
-        * var items = element(by.css('.parent')).all(by.tagName('li'))
-        *
-        * @param {webdriver.Locator} subLocator
-        * @return {ElementArrayFinder}
-        */
-        all(subLocator: webdriver.Locator): ElementArrayFinder;
-
-        /**
-        * Shortcut for querying the document directly with css.
-        *
-        * @alias $(cssSelector)
-        * @view
-        * <div class="count">
-        *   <span class="one">First</span>
-        *   <span class="two">Second</span>
-        * </div>
-        *
-        * @example
-        * var item = $('.count .two');
-        * expect(item.getText()).toBe('Second');
-        *
-        * @param {string} selector A css selector
-        * @return {ElementFinder} which identifies the located
-        *     {@link webdriver.WebElement}
-        */
-        $(selector: string): ElementFinder;
-
-        /**
-        * Shortcut for querying the document directly with css.
-        *
-        * @alias $$(cssSelector)
-        * @view
-        * <div class="count">
-        *   <span class="one">First</span>
-        *   <span class="two">Second</span>
-        * </div>
-        *
-        * @example
-        * // The following protractor expressions are equivalent.
-        * var list = element.all(by.css('.count span'));
-        * expect(list.count()).toBe(2);
-        *
-        * list = $$('.count span');
-        * expect(list.count()).toBe(2);
-        * expect(list.get(0).getText()).toBe('First');
-        * expect(list.get(1).getText()).toBe('Second');
-        *
-        * @param {string} selector a css selector
-        * @return {ElementArrayFinder} which identifies the
-        *     array of the located {@link webdriver.WebElement}s.
-        */
-        $$(selector: string): ElementArrayFinder;
-
-        /**
-        * Determine whether the element is present on the page.
-        *
-        * @view
-        * <span>{{person.name}}</span>
-        *
-        * @example
-        * // Element exists.
-        * expect(element(by.binding('person.name')).isPresent()).toBe(true);
-        *
-        * // Element not present.
-        * expect(element(by.binding('notPresent')).isPresent()).toBe(false);
-        *
-        * @return {ElementFinder} which resolves to whether
-        *     the element is present on the page.
-        */
-        isPresent(): webdriver.promise.Promise<boolean>;
-
-        /**
-        * Override for WebElement.prototype.isElementPresent so that protractor waits
-        * for Angular to settle before making the check.
-        *
-        * @see ElementFinder.isPresent
-        *
-        * @param {webdriver.Locator} subLocator Locator for element to look for.
-        * @return {ElementFinder} which resolves to whether
-        *     the element is present on the page.
-        */
-        isElementPresent(subLocator: webdriver.Locator): webdriver.promise.Promise<boolean>;
-
-        /**
-        * @see ElementArrayFinder.prototype.locator
-        *
-        * @return {webdriver.Locator}
-        */
-        locator(): webdriver.Locator;
-
-        /**
-        * Returns the WebElement represented by this ElementFinder.
-        * Throws the WebDriver error if the element doesn't exist.
-        *
-        * @example
-        *  The following three expressions are equivalent.
-        *  element(by.css('.parent')).getWebElement();
-        *  browser.waitForAngular(); browser.driver.findElement(by.css('.parent'));
-        *  browser.findElement(by.css('.parent'));
-        *
-        * @alias element(locator).getWebElement()
-        * @return {webdriver.WebElement}
-        */
-        getWebElement(): webdriver.WebElement;
-
-        /**
-        * Evaluates the input as if it were on the scope of the current element.
-        * @see ElementArrayFinder.evaluate
-        *
-        * @param {string} expression
-        *
-        * @return {ElementFinder} which resolves to the evaluated expression.
-        */
-        evaluate(expression: string): ElementFinder;
-
-        /**
-        * @see ElementArrayFinder.prototype.allowAnimations.
-        * @param {string} value
-        *
-        * @return {ElementFinder} which resolves to whether animation is allowed.
-        */
-        allowAnimations(value: string): ElementFinder;
-
-        /**
-        * Create a shallow copy of ElementFinder.
-        *
-        * @return {!ElementFinder} A shallow copy of this.
-        */
-        clone(): ElementFinder;
-    }
-
-    interface ElementArrayFinder extends webdriver.promise.IThenable<ElementFinder[]> {
-        /**
-         * Returns the elements as an array of WebElements.
-         */
-        getWebElements(): webdriver.WebElement[];
-
-
-        /**
-        * Get an element within the ElementArrayFinder by index. The index starts at 0.
-        * Negative indices are wrapped (i.e. -i means ith element from last)
-        * This does not actually retrieve the underlying element.
-        *
-        * @alias element.all(locator).get(index)
-        * @view
-        * <ul class="items">
-        *   <li>First</li>
-        *   <li>Second</li>
-        *   <li>Third</li>
-        * </ul>
-        *
-        * @example
-        * var list = element.all(by.css('.items li'));
-        * expect(list.get(0).getText()).toBe('First');
-        * expect(list.get(1).getText()).toBe('Second');
-        *
-        * @param {number} index Element index.
-        * @return {ElementFinder} finder representing element at the given index.
-        */
-        get(index: number): ElementFinder;
-
-        /**
-        * Get the first matching element for the ElementArrayFinder. This does not
-        * actually retrieve the underlying element.
-        *
-        * @alias element.all(locator).first()
-        * @view
-        * <ul class="items">
-        *   <li>First</li>
-        *   <li>Second</li>
-        *   <li>Third</li>
-        * </ul>
-        *
-        * @example
-        * var first = element.all(by.css('.items li')).first();
-        * expect(first.getText()).toBe('First');
-        *
-        * @return {ElementFinder} finder representing the first matching element
-        */
-        first(): ElementFinder;
-
-        /**
-        * Get the last matching element for the ElementArrayFinder. This does not
-        * actually retrieve the underlying element.
-        *
-        * @alias element.all(locator).last()
-        * @view
-        * <ul class="items">
-        *   <li>First</li>
-        *   <li>Second</li>
-        *   <li>Third</li>
-        * </ul>
-        *
-        * @example
-        * var last = element.all(by.css('.items li')).last();
-        * expect(last.getText()).toBe('Third');
-        *
-        * @return {ElementFinder} finder representing the last matching element
-        */
-        last(): ElementFinder;
-
-        /**
-        * Count the number of elements represented by the ElementArrayFinder.
-        *
-        * @alias element.all(locator).count()
-        * @view
-        * <ul class="items">
-        *   <li>First</li>
-        *   <li>Second</li>
-        *   <li>Third</li>
-        * </ul>
-        *
-        * @example
-        * var list = element.all(by.css('.items li'));
-        * expect(list.count()).toBe(3);
-        *
-        * @return {!webdriver.promise.Promise} A promise which resolves to the
-        *     number of elements matching the locator.
-        */
-        count(): webdriver.promise.Promise<number>;
-
-        /**
-        * Calls the input function on each ElementFinder represented by the ElementArrayFinder.
-        *
-        * @alias element.all(locator).each(eachFunction)
-        * @view
-        * <ul class="items">
-        *   <li>First</li>
-        *   <li>Second</li>
-        *   <li>Third</li>
-        * </ul>
-        *
-        * @example
-        * element.all(by.css('.items li')).each(function(element) {
-        *   // Will print First, Second, Third.
-        *   element.getText().then(console.log);
-        * });
-        *
-        * @param {function(ElementFinder)} fn Input function
-        */
-        each(fn: (element: ElementFinder, index: number) => void): void;
-
-        /**
-        * Apply a map function to each element within the ElementArrayFinder. The
-        * callback receives the ElementFinder as the first argument and the index as
-        * a second arg.
-        *
-        * @alias element.all(locator).map(mapFunction)
-        * @view
-        * <ul class="items">
-        *   <li class="one">First</li>
-        *   <li class="two">Second</li>
-        *   <li class="three">Third</li>
-        * </ul>
-        *
-        * @example
-        * var items = element.all(by.css('.items li')).map(function(elm, index) {
-        *   return {
-        *     index: index,
-        *     text: elm.getText(),
-        *     class: elm.getAttribute('class')
-        *   };
-        * });
-        * expect(items).toEqual([
-        *   {index: 0, text: 'First', class: 'one'},
-        *   {index: 1, text: 'Second', class: 'two'},
-        *   {index: 2, text: 'Third', class: 'three'}
-        * ]);
-        *
-        * @param {function(ElementFinder, number)} mapFn Map function that
-        *     will be applied to each element.
-        * @return {!webdriver.promise.Promise} A promise that resolves to an array
-        *     of values returned by the map function.
-        */
-        map<T>(mapFn: (element: ElementFinder, index: number) => T): webdriver.promise.Promise<T[]>;
-        map<T, T2>(mapFn: (element: ElementFinder, index: number) => T2): webdriver.promise.Promise<T[]>;
-
-        /**
-        * Apply a filter function to each element within the ElementArrayFinder. Returns
-        * a new ElementArrayFinder with all elements that pass the filter function. The
-        * filter function receives the ElementFinder as the first argument
-        * and the index as a second arg.
-        * This does not actually retrieve the underlying list of elements, so it can
-        * be used in page objects.
-        *
-        * @alias element.all(locator).filter(filterFn)
-        * @view
-        * <ul class="items">
-        *   <li class="one">First</li>
-        *   <li class="two">Second</li>
-        *   <li class="three">Third</li>
-        * </ul>
-        *
-        * @example
-        * element.all(by.css('.items li')).filter(function(elem, index) {
-        *   return elem.getText().then(function(text) {
-        *     return text === 'Third';
-        *   });
-        * }).then(function(filteredElements) {
-        *   filteredElements[0].click();
-        * });
-        *
-        * @param {function(ElementFinder, number): webdriver.WebElement.Promise} filterFn
-        *     Filter function that will test if an element should be returned.
-        *     filterFn can either return a boolean or a promise that resolves to a boolean.
-        * @return {!ElementArrayFinder} A ElementArrayFinder that represents an array
-        *     of element that satisfy the filter function.
-        */
-        filter(filterFn: (element: ElementFinder, index: number) => any): ElementArrayFinder;
-
-        /**
-        * Apply a reduce function against an accumulator and every element found
-        * using the locator (from left-to-right). The reduce function has to reduce
-        * every element into a single value (the accumulator). Returns promise of
-        * the accumulator. The reduce function receives the accumulator, current
-        * ElementFinder, the index, and the entire array of ElementFinders,
-        * respectively.
-        *
-        * @alias element.all(locator).reduce(reduceFn)
-        * @view
-        * <ul class="items">
-        *   <li class="one">First</li>
-        *   <li class="two">Second</li>
-        *   <li class="three">Third</li>
-        * </ul>
-        *
-        * @example
-        * var value = element.all(by.css('.items li')).reduce(function(acc, elem) {
-        *   return elem.getText().then(function(text) {
-        *     return acc + text + ' ';
-        *   });
-        * });
-        *
-        * expect(value).toEqual('First Second Third ');
-        *
-        * @param {function(number, ElementFinder, number, Array.<ElementFinder>)}
-        *     reduceFn Reduce function that reduces every element into a single value.
-        * @param {*} initialValue Initial value of the accumulator.
-        * @return {!webdriver.promise.Promise} A promise that resolves to the final
-        *     value of the accumulator.
-        */
-        reduce<T>(reduceFn: (acc: T, element: ElementFinder, index: number, arr: ElementFinder[]) => webdriver.promise.Promise<T>, initialValue: T): webdriver.promise.Promise<T>;
-        reduce<T>(reduceFn: (acc: T, element: ElementFinder, index: number, arr: ElementFinder[]) => T, initialValue: T): webdriver.promise.Promise<T>;
-
-        /**
-        * Represents the ElementArrayFinder as an array of ElementFinders.
-        *
-        * @return {Array.<ElementFinder>} Return a promise, which resolves to a list
-        *     of ElementFinders specified by the locator.
-        */
-        asElementFinders_(): webdriver.promise.Promise<ElementFinder[]>;
-
-        /**
-        * Create a shallow copy of ElementArrayFinder.
-        *
-        * @return {!ElementArrayFinder} A shallow copy of this.
-        */
-        clone(): ElementArrayFinder;
-
-        /**
-        * Calls to ElementArrayFinder may be chained to find an array of elements
-        * using the current elements in this ElementArrayFinder as the starting point.
-        * This function returns a new ElementArrayFinder which would contain the
-        * children elements found (and could also be empty).
-        *
-        * @alias element.all(locator).all(locator)
-        * @view
-        * <div id='id1' class="parent">
-        *   <ul>
-        *     <li class="foo">1a</li>
-        *     <li class="baz">1b</li>
-        *   </ul>
-        * </div>
-        * <div id='id2' class="parent">
-        *   <ul>
-        *     <li class="foo">2a</li>
-        *     <li class="bar">2b</li>
-        *   </ul>
-        * </div>
-        *
-        * @example
-        * var foo = element.all(by.css('.parent')).all(by.css('.foo'))
-        * expect(foo.getText()).toEqual(['1a', '2a'])
-        * var baz = element.all(by.css('.parent')).all(by.css('.baz'))
-        * expect(baz.getText()).toEqual(['1b'])
-        * var nonexistent = element.all(by.css('.parent')).all(by.css('.NONEXISTENT'))
-        * expect(nonexistent.getText()).toEqual([''])
-        *
-        * @param {webdriver.Locator} subLocator
-        * @return {ElementArrayFinder}
-        */
-        all(locator: webdriver.Locator): ElementArrayFinder;
-
-        /**
-        * Shorthand function for finding arrays of elements by css.
-        *
-        * @type {function(string): ElementArrayFinder}
-        */
-        $$(selector: string): ElementArrayFinder;
-
-        /**
-        * Returns an ElementFinder representation of ElementArrayFinder. It ensures
-        * that the ElementArrayFinder resolves to one and only one underlying element.
-        *
-        * @return {ElementFinder} An ElementFinder representation
-        * @private
-        */
-        toElementFinder_(): ElementFinder;
-
-        /**
-        * Returns the most relevant locator.
-        *
-        * @example
-        * $('#ID1').locator() // returns by.css('#ID1')
-        * $('#ID1').$('#ID2').locator() // returns by.css('#ID2')
-        * $$('#ID1').filter(filterFn).get(0).click().locator() // returns by.css('#ID1')
-        *
-        * @return {webdriver.Locator}
-        */
-        locator(): webdriver.Locator;
-
-        /**
-         * Evaluates the input as if it were on the scope of the current underlying
-         * elements.
-         *
-         * @view
-         * <span id="foo">{{variableInScope}}</span>
-         *
-         * @example
-         * var value = element(by.id('foo')).evaluate('variableInScope');
-         *
-         * @param {string} expression
-         *
-         * @return {ElementArrayFinder} which resolves to the
-         *     evaluated expression for each underlying element.
-         *     The result will be resolved as in
-         *     {@link webdriver.WebDriver.executeScript}. In summary - primitives will
-         *     be resolved as is, functions will be converted to string, and elements
-         *     will be returned as a WebElement.
-         */
-        evaluate(expression: string): ElementArrayFinder;
-
-        /**
-         * Determine if animation is allowed on the current underlying elements.
-         * @param {string} value
-         *
-         * @example
-         * // Turns off ng-animate animations for all elements in the <body>
-         * element(by.css('body')).allowAnimations(false);
-         *
-         * @return {ElementArrayFinder} which resolves to whether animation is allowed.
-         */
-        allowAnimations(value: boolean): ElementArrayFinder;
-
-        /**
-         * Schedules a command to click on this element.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved when
-         *     the click command has completed.
-         */
-        click(): webdriver.promise.Promise<void>;
-
-        /**
-         * Schedules a command to type a sequence on the DOM element represented by this
-         * instance.
-         * <p/>
-         * Modifier keys (SHIFT, CONTROL, ALT, META) are stateful; once a modifier is
-         * processed in the keysequence, that key state is toggled until one of the
-         * following occurs:
-         * <ul>
-         * <li>The modifier key is encountered again in the sequence. At this point the
-         * state of the key is toggled (along with the appropriate keyup/down events).
-         * </li>
-         * <li>The {@code webdriver.Key.NULL} key is encountered in the sequence. When
-         * this key is encountered, all modifier keys current in the down state are
-         * released (with accompanying keyup events). The NULL key can be used to
-         * simulate common keyboard shortcuts:
-         * <code>
-         *     element.sendKeys("text was",
-         *                      webdriver.Key.CONTROL, "a", webdriver.Key.NULL,
-         *                      "now text is");
-         *     // Alternatively:
-         *     element.sendKeys("text was",
-         *                      webdriver.Key.chord(webdriver.Key.CONTROL, "a"),
-         *                      "now text is");
-         * </code></li>
-         * <li>The end of the keysequence is encountered. When there are no more keys
-         * to type, all depressed modifier keys are released (with accompanying keyup
-         * events).
-         * </li>
-         * </ul>
-         * <strong>Note:</strong> On browsers where native keyboard events are not yet
-         * supported (e.g. Firefox on OS X), key events will be synthesized. Special
-         * punctionation keys will be synthesized according to a standard QWERTY en-us
-         * keyboard layout.
-         *
-         * @param {...string} var_args The sequence of keys to
-         *     type. All arguments will be joined into a single sequence (var_args is
-         *     permitted for convenience).
-         * @return {!webdriver.promise.Promise} A promise that will be resolved when all
-         *     keys have been typed.
-         */
-        sendKeys(...var_args: string[]): webdriver.promise.Promise<void>;
-
-        /**
-         * Schedules a command to query for the tag/node name of this element.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
-         *     element's tag name.
-         */
-        getTagName(): webdriver.promise.Promise<string[]>;
-
-        /**
-         * Schedules a command to query for the computed style of the element
-         * represented by this instance. If the element inherits the named style from
-         * its parent, the parent will be queried for its value.  Where possible, color
-         * values will be converted to their hex representation (e.g. #00ff00 instead of
-         * rgb(0, 255, 0)).
-         * <p/>
-         * <em>Warning:</em> the value returned will be as the browser interprets it, so
-         * it may be tricky to form a proper assertion.
-         *
-         * @param {string} cssStyleProperty The name of the CSS style property to look
-         *     up.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
-         *     requested CSS value.
-         */
-        getCssValue(cssStyleProperty: string): webdriver.promise.Promise<string[]>;
-
-        /**
-         * Schedules a command to query for the value of the given attribute of the
-         * element. Will return the current value even if it has been modified after the
-         * page has been loaded. More exactly, this method will return the value of the
-         * given attribute, unless that attribute is not present, in which case the
-         * value of the property with the same name is returned. If neither value is
-         * set, null is returned. The "style" attribute is converted as best can be to a
-         * text representation with a trailing semi-colon. The following are deemed to
-         * be "boolean" attributes and will be returned as thus:
-         *
-         * <p>async, autofocus, autoplay, checked, compact, complete, controls, declare,
-         * defaultchecked, defaultselected, defer, disabled, draggable, ended,
-         * formnovalidate, hidden, indeterminate, iscontenteditable, ismap, itemscope,
-         * loop, multiple, muted, nohref, noresize, noshade, novalidate, nowrap, open,
-         * paused, pubdate, readonly, required, reversed, scoped, seamless, seeking,
-         * selected, spellcheck, truespeed, willvalidate
-         *
-         * <p>Finally, the following commonly mis-capitalized attribute/property names
-         * are evaluated as expected:
-         * <ul>
-         *   <li>"class"
-         *   <li>"readonly"
-         * </ul>
-         * @param {string} attributeName The name of the attribute to query.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
-         *     attribute's value.
-         */
-        getAttribute(attributeName: string): webdriver.promise.Promise<string[]>;
-
-        /**
-         * Get the visible (i.e. not hidden by CSS) innerText of this element, including
-         * sub-elements, without any leading or trailing whitespace.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
-         *     element's visible text.
-         */
-        getText(): webdriver.promise.Promise<string[]>;
-
-        /**
-         * Schedules a command to compute the size of this element's bounding box, in
-         * pixels.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
-         *     element's size as a {@code {width:number, height:number}} object.
-         */
-        getSize(): webdriver.promise.Promise<webdriver.ISize[]>;
-
-        /**
-         * Schedules a command to compute the location of this element in page space.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved to the
-         *     element's location as a {@code {x:number, y:number}} object.
-         */
-        getLocation(): webdriver.promise.Promise<webdriver.ILocation[]>;
-
-        /**
-         * Schedules a command to query whether the DOM element represented by this
-         * instance is enabled, as dicted by the {@code disabled} attribute.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with
-         *     whether this element is currently enabled.
-         */
-        isEnabled(): webdriver.promise.Promise<boolean[]>;
-
-        /**
-         * Schedules a command to query whether this element is selected.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with
-         *     whether this element is currently selected.
-         */
-        isSelected(): webdriver.promise.Promise<boolean[]>;
-
-        /**
-         * Schedules a command to submit the form containing this element (or this
-         * element if it is a FORM element). This command is a no-op if the element is
-         * not contained in a form.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved when
-         *     the form has been submitted.
-         */
-        submit(): webdriver.promise.Promise<void>;
-
-        /**
-         * Schedules a command to clear the {@code value} of this element. This command
-         * has no effect if the underlying DOM element is neither a text INPUT element
-         * nor a TEXTAREA element.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved when
-         *     the element has been cleared.
-         */
-        clear(): webdriver.promise.Promise<void>;
-
-        /**
-         * Schedules a command to test whether this element is currently displayed.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with
-         *     whether this element is currently visible on the page.
-         */
-        isDisplayed(): webdriver.promise.Promise<boolean[]>;
-
-        /**
-         * Schedules a command to retrieve the outer HTML of this element.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with
-         *     the element's outer HTML.
-         */
-        getOuterHtml(): webdriver.promise.Promise<string[]>;
-
-        /**
-         * @return {!webdriver.promise.Promise.<webdriver.WebElement.Id>} A promise
-         *     that resolves to this element's JSON representation as defined by the
-         *     WebDriver wire protocol.
-         * @see http://code.google.com/p/selenium/wiki/JsonWireProtocol
-         */
-        getId(): webdriver.promise.Promise<webdriver.IWebElementId[]>
-
-        /**
-         * Schedules a command to retrieve the inner HTML of this element.
-         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
-         *     element's inner HTML.
-         */
-        getInnerHtml(): webdriver.promise.Promise<string[]>;
-    }
-
-    interface LocatorWithColumn extends webdriver.Locator {
-        column(index: number): webdriver.Locator;
-        column(name: string): webdriver.Locator;
-    }
-
-    interface RepeaterLocator extends LocatorWithColumn {
-        row(index: number): LocatorWithColumn;
-    }
-
-    interface IProtractorLocatorStrategy {
-        /**
-         * webdriver's By is an enum of locator functions, so we must set it to
-         * a prototype before inheriting from it.
-         */
-        className: typeof webdriver.By.className;
-        css: typeof webdriver.By.css;
-        id: typeof webdriver.By.id;
-        linkText: typeof webdriver.By.linkText;
-        js: typeof webdriver.By.js;
-        name: typeof webdriver.By.name;
-        partialLinkText: typeof webdriver.By.partialLinkText;
-        tagName: typeof webdriver.By.tagName;
-        xpath: typeof webdriver.By.xpath;
-
-        /**
-         * Add a locator to this instance of ProtractorBy. This locator can then be
-         * used with element(by.locatorName(args)).
-         *
-         * @view
-         * <button ng-click="doAddition()">Go!</button>
-         *
-         * @example
-         * // Add the custom locator.
-         * by.addLocator('buttonTextSimple',
-         *     function(buttonText, opt_parentElement, opt_rootSelector) {
-         *   // This function will be serialized as a string and will execute in the
-         *   // browser. The first argument is the text for the button. The second
-         *   // argument is the parent element, if any.
-         *   var using = opt_parentElement,
-         *       buttons = using.querySelectorAll('button');
-         *
-         *   // Return an array of buttons with the text.
-         *   return Array.prototype.filter.call(buttons, function(button) {
-         *     return button.textContent === buttonText;
-         *   });
-         * });
-         *
-         * // Use the custom locator.
-         * element(by.buttonTextSimple('Go!')).click();
-         *
-         * @alias by.addLocator(locatorName, functionOrScript)
-         * @param {string} name The name of the new locator.
-         * @param {Function|string} script A script to be run in the context of
-         *     the browser. This script will be passed an array of arguments
-         *     that contains any args passed into the locator followed by the
-         *     element scoping the search and the css selector for the root angular
-         *     element. It should return an array of elements.
-         */
-        addLocator(name: string, script: string): void;
-        addLocator(name: string, script: Function): void;
-
-        /**
-         * Find an element by binding.
-         *
-         * @view
-         * <span>{{person.name}}</span>
-         * <span ng-bind="person.email"></span>
-         *
-         * @example
-         * var span1 = element(by.binding('person.name'));
-         * expect(span1.getText()).toBe('Foo');
-         *
-         * var span2 = element(by.binding('person.email'));
-         * expect(span2.getText()).toBe('foo@bar.com');
-         *
-         * @param {string} bindingDescriptor
-         * @return {{findElementsOverride: findElementsOverride, toString: Function|string}}
-         */
-        binding(bindingDescriptor: string): webdriver.Locator;
-
-        /**
-         * Find an element by exact binding.
-         *
-         * @view
-         * <span>{{ person.name }}</span>
-         * <span ng-bind="person-email"></span>
-         * <span>{{person_phone|uppercase}}</span>
-         *
-         * @example
-         * expect(element(by.exactBinding('person.name')).isPresent()).toBe(true);
-         * expect(element(by.exactBinding('person-email')).isPresent()).toBe(true);
-         * expect(element(by.exactBinding('person')).isPresent()).toBe(false);
-         * expect(element(by.exactBinding('person_phone')).isPresent()).toBe(true);
-         * expect(element(by.exactBinding('person_phone|uppercase')).isPresent()).toBe(true);
-         * expect(element(by.exactBinding('phone')).isPresent()).toBe(false);
-         *
-         * @param {string} bindingDescriptor
-         * @return {{findElementsOverride: findElementsOverride, toString: Function|string}}
-         */
-        exactBinding(bindingDescriptor: string): webdriver.Locator;
-
-        /**
-         * Find an element by ng-model expression.
-         *
-         * @alias by.model(modelName)
-         * @view
-         * <input type="text" ng-model="person.name"/>
-         *
-         * @example
-         * var input = element(by.model('person.name'));
-         * input.sendKeys('123');
-         * expect(input.getAttribute('value')).toBe('Foo123');
-         *
-         * @param {string} model ng-model expression.
-         */
-        model(model: string): webdriver.Locator;
-
-        /**
-         * Find a button by text.
-         *
-         * @view
-         * <button>Save</button>
-         *
-         * @example
-         * element(by.buttonText('Save'));
-         *
-         * @param {string} searchText
-         * @return {{findElementsOverride: findElementsOverride, toString: Function|string}}
-         */
-        buttonText(searchText: string): webdriver.Locator;
-
-        /**
-         * Find a button by partial text.
-         *
-         * @view
-         * <button>Save my file</button>
-         *
-         * @example
-         * element(by.partialButtonText('Save'));
-         *
-         * @param {string} searchText
-         * @return {{findElementsOverride: findElementsOverride, toString: Function|string}}
-         */
-        partialButtonText(searchText: string): webdriver.Locator;
-
-
-        /**
-         * Find elements inside an ng-repeat.
-         *
-         * @view
-         * <div ng-repeat="cat in pets">
-         *   <span>{{cat.name}}</span>
-         *   <span>{{cat.age}}</span>
-         * </div>
-         *
-         * <div class="book-img" ng-repeat-start="book in library">
-         *   <span>{{$index}}</span>
-         * </div>
-         * <div class="book-info" ng-repeat-end>
-         *   <h4>{{book.name}}</h4>
-         *   <p>{{book.blurb}}</p>
-         * </div>
-         *
-         * @example
-         * // Returns the DIV for the second cat.
-         * var secondCat = element(by.repeater('cat in pets').row(1));
-         *
-         * // Returns the SPAN for the first cat's name.
-         * var firstCatName = element(by.repeater('cat in pets').
-         *     row(0).column('{{cat.name}}'));
-         *
-         * // Returns a promise that resolves to an array of WebElements from a column
-         * var ages = element.all(
-         *     by.repeater('cat in pets').column('{{cat.age}}'));
-         *
-         * // Returns a promise that resolves to an array of WebElements containing
-         * // all top level elements repeated by the repeater. For 2 pets rows resolves
-         * // to an array of 2 elements.
-         * var rows = element.all(by.repeater('cat in pets'));
-         *
-         * // Returns a promise that resolves to an array of WebElements containing all
-         * // the elements with a binding to the book's name.
-         * var divs = element.all(by.repeater('book in library').column('book.name'));
-         *
-         * // Returns a promise that resolves to an array of WebElements containing
-         * // the DIVs for the second book.
-         * var bookInfo = element.all(by.repeater('book in library').row(1));
-         *
-         * // Returns the H4 for the first book's name.
-         * var firstBookName = element(by.repeater('book in library').
-         *     row(0).column('{{book.name}}'));
-         *
-         * // Returns a promise that resolves to an array of WebElements containing
-         * // all top level elements repeated by the repeater. For 2 books divs
-         * // resolves to an array of 4 elements.
-         * var divs = element.all(by.repeater('book in library'));
-         */
-        repeater(repeatDescriptor: string): RepeaterLocator;
-
-        /**
-         * Find elements by CSS which contain a certain string.
-         *
-         * @view
-         * <ul>
-         *   <li class="pet">Dog</li>
-         *   <li class="pet">Cat</li>
-         * </ul>
-         *
-         * @example
-         * // Returns the DIV for the dog, but not cat.
-         * var dog = element(by.cssContainingText('.pet', 'Dog'));
-         */
-        cssContainingText(cssSelector: string, searchText: string): webdriver.Locator;
-
-        /**
-         * Find an element by ng-options expression.
-         *
-         * @alias by.options(optionsDescriptor)
-         * @view
-         * <select ng-model="color" ng-options="c for c in colors">
-         *   <option value="0" selected="selected">red</option>
-         *   <option value="1">green</option>
-         * </select>
-         *
-         * @example
-         * var allOptions = element.all(by.options('c for c in colors'));
-         * expect(allOptions.count()).toEqual(2);
-         * var firstOption = allOptions.first();
-         * expect(firstOption.getText()).toEqual('red');
-         *
-         * @param {string} optionsDescriptor ng-options expression.
-         */
-        options(optionsDescriptor: string): webdriver.Locator;
-    }
-
-    var By: IProtractorLocatorStrategy;
-
-    interface Protractor extends webdriver.WebDriver {
-
-        /**
-        * The wrapped webdriver instance. Use this to interact with pages that do
-        * not contain Angular (such as a log-in screen).
-        *
-        * @type {webdriver.WebDriver}
-        */
-        driver: webdriver.WebDriver;
-
-        /**
-        * Helper function for finding elements.
-        *
-        * @type {function(webdriver.Locator): ElementFinder}
-        */
-        element(locator: webdriver.Locator): ElementFinder;
-
-        /**
-        * Shorthand function for finding elements by css.
-        *
-        * @type {function(string): ElementFinder}
-        */
-        $(selector: string): ElementFinder;
-
-        /**
-        * Shorthand function for finding arrays of elements by css.
-        *
-        * @type {function(string): ElementArrayFinder}
-        */
-        $$(selector: string): ElementArrayFinder;
-
-        /**
-        * All get methods will be resolved against this base URL. Relative URLs are =
-        * resolved the way anchor tags resolve.
-        *
-        * @type {string}
-        */
-        baseUrl: string;
-
-        /**
-        * The css selector for an element on which to find Angular. This is usually
-        * 'body' but if your ng-app is on a subsection of the page it may be
-        * a subelement.
-        *
-        * @type {string}
-        */
-        rootEl: string;
-
-        /**
-        * If true, Protractor will not attempt to synchronize with the page before
-        * performing actions. This can be harmful because Protractor will not wait
-        * until $timeouts and $http calls have been processed, which can cause
-        * tests to become flaky. This should be used only when necessary, such as
-        * when a page continuously polls an API using $timeout.
-        *
-        * @type {boolean}
-        */
-        ignoreSynchronization: boolean;
-
-        /**
-        * Timeout in milliseconds to wait for pages to load when calling `get`.
-        *
-        * @type {number}
-        */
-        getPageTimeout: number;
-
-        /**
-        * An object that holds custom test parameters.
-        *
-        * @type {Object}
-        */
-        params: any;
-
-        /**
-        * The reset URL to use between page loads.
-        *
-        * @type {string}
-        */
-        resetUrl: string;
-
-        /**
-         * Instruct webdriver to wait until Angular has finished rendering and has
-         * no outstanding $http calls before continuing.
-         *
-         * @return {!webdriver.promise.Promise} A promise that will resolve to the
-         *    scripts return value.
-         */
-        waitForAngular(): webdriver.promise.Promise<void>;
-
-        /**
-         * Add a module to load before Angular whenever Protractor.get is called.
-         * Modules will be registered after existing modules already on the page,
-         * so any module registered here will override preexisting modules with the same
-         * name.
-         *
-         * @example
-         * browser.addMockModule('modName', function() {
-         *   angular.module('modName', []).value('foo', 'bar');
-         * });
-         *
-         * @param {!string} name The name of the module to load or override.
-         * @param {!string|Function} script The JavaScript to load the module.
-         * @param {...*} varArgs Any additional arguments will be provided to
-         *     the script and may be referenced using the `arguments` object.
-         */
-        addMockModule(name: string, script: string, ...varArgs: any[]): void;
-        addMockModule(name: string, script: Function, ...varArgs: any[]): void;
-
-        /**
-         * Clear the list of registered mock modules.
-         */
-        clearMockModules(): void;
-
-        /**
-         * Remove a registered mock module.
-         *
-         * @example
-         * browser.removeMockModule('modName');
-         *
-         * @param {!string} name The name of the module to remove.
-         */
-        removeMockModule(name: string): void;
-
-        /**
-         * @see webdriver.WebDriver.get
-         *
-         * Navigate to the given destination and loads mock modules before
-         * Angular. Assumes that the page being loaded uses Angular.
-         * If you need to access a page which does not have Angular on load, use
-         * the wrapped webdriver directly.
-         *
-         * @param {string} destination Destination URL.
-         * @param {number=} opt_timeout Number of milliseconds to wait for Angular to
-         *     start.
-         */
-        get(destination: string, opt_timeout?: number): webdriver.promise.Promise<void>;
-
-        /**
-         * See webdriver.WebDriver.refresh
-         *
-         * Makes a full reload of the current page and loads mock modules before
-         * Angular. Assumes that the page being loaded uses Angular.
-         * If you need to access a page which does not have Angular on load, use
-         * the wrapped webdriver directly.
-         *
-         * @param {number=} opt_timeout Number of seconds to wait for Angular to start.
-         */
-        refresh(opt_timeout?: number): webdriver.promise.Promise<void>;
-
-        /**
-         * Browse to another page using in-page navigation.
-         *
-         * @param {string} url In page URL using the same syntax as $location.url()
-         * @returns {!webdriver.promise.Promise} A promise that will resolve once
-         *    page has been changed.
-         */
-        setLocation(url: string): webdriver.promise.Promise<void>;
-
-        /**
-         * Returns the current absolute url from AngularJS.
-         */
-        getLocationAbsUrl(): webdriver.promise.Promise<string>;
-
-        /**
-         * Pauses the test and injects some helper functions into the browser, so that
-         * debugging may be done in the browser console.
-         *
-         * This should be used under node in debug mode, i.e. with
-         * protractor debug <configuration.js>
-         *
-         * @example
-         * While in the debugger, commands can be scheduled through webdriver by
-         * entering the repl:
-         *   debug> repl
-         *   Press Ctrl + C to leave rdebug repl
-         *   > ptor.findElement(protractor.By.input('user').sendKeys('Laura'));
-         *   > ptor.debugger();
-         *   debug> c
-         *
-         * This will run the sendKeys command as the next task, then re-enter the
-         * debugger.
-         */
-        debugger(): void;
-
-        /**
-         * Beta (unstable) pause function for debugging webdriver tests. Use
-         * browser.pause() in your test to enter the protractor debugger from that
-         * point in the control flow.
-         * Does not require changes to the command line (no need to add 'debug').
-         *
-         * @example
-         * element(by.id('foo')).click();
-         * browser.pause();
-         * // Execution will stop before the next click action.
-         * element(by.id('bar')).click();
-         *
-         * @param {number=} opt_debugPort Optional port to use for the debugging process
-         */
-        pause(opt_debugPort?: number): void;
-    }
-
-    // Interface for the global browser object.
-    interface IBrowser extends Protractor {
-        /**
-        * Fork another instance of protractor for use in interactive tests.
-        *
-        * @param {boolean} opt_useSameUrl Whether to navigate to current url on creation
-        * @param {boolean} opt_copyMockModules Whether to apply same mock modules on creation
-        * @return {Protractor} a protractor instance.
-        */
-        forkNewDriverInstance(opt_useSameUrl?: boolean, opt_copyMockModules?: boolean): Protractor;
-
-        /**
-        * Get the processed configuration object that is currently being run. This will contain
-        * the specs and capabilities properties of the current runner instance.
-        *
-        * Set by the runner.
-        *
-        * @return {webdriver.promise.Promise<any>} A promise which resolves to the capabilities object.
-        */
-        getProcessedConfig(): webdriver.promise.Promise<any>;
-    }
-
-    /**
-     * Create a new instance of Protractor by wrapping a webdriver instance.
-     *
-     * @param {webdriver.WebDriver} webdriver The configured webdriver instance.
-     * @param {string=} opt_baseUrl A URL to prepend to relative gets.
-     * @return {Protractor}
-     */
-    function wrapDriver(webdriver: webdriver.WebDriver, opt_baseUrl?: string, opt_rootElement?: string): Protractor;
-}
-
-interface cssSelectorHelper {
-    (cssLocator: string): protractor.ElementFinder;
-}
-
-interface cssArraySelectorHelper {
-    (cssLocator: string): protractor.ElementArrayFinder;
-}
-
-declare var browser: protractor.IBrowser;
-declare var by: protractor.IProtractorLocatorStrategy;
-declare var By: protractor.IProtractorLocatorStrategy;
-declare var element: protractor.Element;
-declare var $: cssSelectorHelper;
-declare var $$: cssArraySelectorHelper;
-
-declare module 'protractor' {
-    export = protractor;
-}
diff --git a/angular-scenario/angular-scenario.d.ts b/angular-scenario/angular-scenario.d.ts
deleted file mode 100644
index f405a0a9c0..0000000000
--- a/angular-scenario/angular-scenario.d.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-// Type definitions for Angular Scenario Testing 1.3 (ngScenario module)
-// Project: http://angularjs.org
-// Definitions by: RomanoLindano <https://github.com/RomanoLindano>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace ng {
-    export interface IAngularStatic {
-        scenario: any;
-    }
-}
-
-declare namespace angularScenario {
-
-    export interface RunFunction {
-        (functionToRun: any): any;
-    }
-    export interface RunFunctionWithDescription {
-        (description: string, functionToRun: any): any;
-    }
-
-    export interface PauseFunction {
-        (): any;
-    }
-
-    export interface SleepFunction {
-        (seconds: number): any;
-    }
-
-    export interface Future {
-    }
-
-    export interface testWindow {
-        href(): Future;
-        path(): Future;
-        search(): Future;
-        hash(): Future;
-    }
-
-    export interface testLocation {
-        url(): Future;
-        path(): Future;
-        search(): Future;
-        hash(): Future;
-    }
-
-    export interface Browser {
-        navigateTo(url: string): void;
-        navigateTo(urlDescription: string, urlFunction: () => string): void;
-        reload(): void;
-        window(): testWindow;
-        location(): testLocation;
-    }
-
-    export interface Matchers {
-        toEqual(value: any): void;
-        toBe(value: any): void;
-        toBeDefined(): void;
-        toBeTruthy(): void;
-        toBeFalsy(): void;
-        toMatch(regularExpression: any): void;
-        toBeNull(): void;
-        toContain(value: any): void;
-        toBeLessThan(value: any): void;
-        toBeGreaterThan(value: any): void;
-    }
-
-    export interface CustomMatchers extends Matchers {
-    }
-
-    export interface Expect extends CustomMatchers {
-        not(): angularScenario.CustomMatchers;
-    }
-
-    export interface UsingFunction {
-        (selector: string, selectorDescription?: string): void;
-    }
-
-    export interface BindingFunction {
-        (bracketBindingExpression: string): Future;
-    }
-
-    export interface Input {
-        enter(value: any): any;
-        check(): any;
-        select(radioButtonValue: any): any;
-        val(): Future;
-    }
-
-    export interface Repeater {
-        count(): Future;
-        row(index: number): Future;
-        column(ngBindingExpression: string): Future;
-    }
-
-    export interface Select {
-        option(value: any): any;
-        option(...listOfValues: any[]): any;
-    }
-
-    export interface Element {
-        count(): Future;
-        click(): any;
-        dblclick(): any;
-        mouseover(): any;
-        mousedown(): any;
-        mouseup(): any;
-        query(callback: (selectedDOMElements: JQuery, callbackWhenDone: (objNull: any, futureValue: any) => any) => any): any;
-        val(): Future;
-        text(): Future;
-        html(): Future;
-        height(): Future;
-        innerHeight(): Future;
-        outerHeight(): Future;
-        width(): Future;
-        innerWidth(): Future;
-        outerWidth(): Future;
-        position(): Future;
-        scrollLeft(): Future;
-        scrollTop(): Future;
-        offset(): Future;
-
-        val(value: any): void;
-        text(value: any): void;
-        html(value: any): void;
-        height(value: any): void;
-        innerHeight(value: any): void;
-        outerHeight(value: any): void;
-        width(value: any): void;
-        innerWidth(value: any): void;
-        outerWidth(value: any): void;
-        position(value: any): void;
-        scrollLeft(value: any): void;
-        scrollTop(value: any): void;
-        offset(value: any): void;
-
-        attr(key: any): Future;
-        prop(key: any): Future;
-        css(key: any): Future;
-
-        attr(key: any, value: any): void;
-        prop(key: any, value: any): void;
-        css(key: any, value: any): void;
-    }
-}
-
-declare var describe: angularScenario.RunFunctionWithDescription;
-declare var ddescribe: angularScenario.RunFunctionWithDescription;
-declare var xdescribe: angularScenario.RunFunctionWithDescription;
-declare var beforeEach: angularScenario.RunFunction;
-declare var afterEach: angularScenario.RunFunction;
-declare var it: angularScenario.RunFunctionWithDescription;
-declare var iit: angularScenario.RunFunctionWithDescription;
-declare var xit: angularScenario.RunFunctionWithDescription;
-declare var pause: angularScenario.PauseFunction;
-declare var sleep: angularScenario.SleepFunction;
-declare function browser(): angularScenario.Browser;
-declare function expect(expectation: angularScenario.Future): angularScenario.Expect;
-declare var using: angularScenario.UsingFunction;
-declare var binding: angularScenario.BindingFunction;
-declare function input(ngModelBinding: string): angularScenario.Input;
-declare function repeater(selector: string, repeaterDescription?: string): angularScenario.Repeater;
-declare function select(ngModelBinding: string): angularScenario.Select;
-declare function element(selector: string, elementDescription?: string): angularScenario.Element;
-declare var angular: ng.IAngularStatic;
diff --git a/angular-scenario/index.d.ts b/angular-scenario/index.d.ts
new file mode 100644
index 0000000000..698649a8d8
--- /dev/null
+++ b/angular-scenario/index.d.ts
@@ -0,0 +1,166 @@
+// Type definitions for Angular Scenario Testing 1.3 (ngScenario module)
+// Project: http://angularjs.org
+// Definitions by: RomanoLindano <https://github.com/RomanoLindano>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace ng {
+    export interface IAngularStatic {
+        scenario: any;
+    }
+}
+
+declare namespace angularScenario {
+
+    export interface RunFunction {
+        (functionToRun: any): any;
+    }
+    export interface RunFunctionWithDescription {
+        (description: string, functionToRun: any): any;
+    }
+
+    export interface PauseFunction {
+        (): any;
+    }
+
+    export interface SleepFunction {
+        (seconds: number): any;
+    }
+
+    export interface Future {
+    }
+
+    export interface testWindow {
+        href(): Future;
+        path(): Future;
+        search(): Future;
+        hash(): Future;
+    }
+
+    export interface testLocation {
+        url(): Future;
+        path(): Future;
+        search(): Future;
+        hash(): Future;
+    }
+
+    export interface Browser {
+        navigateTo(url: string): void;
+        navigateTo(urlDescription: string, urlFunction: () => string): void;
+        reload(): void;
+        window(): testWindow;
+        location(): testLocation;
+    }
+
+    export interface Matchers {
+        toEqual(value: any): void;
+        toBe(value: any): void;
+        toBeDefined(): void;
+        toBeTruthy(): void;
+        toBeFalsy(): void;
+        toMatch(regularExpression: any): void;
+        toBeNull(): void;
+        toContain(value: any): void;
+        toBeLessThan(value: any): void;
+        toBeGreaterThan(value: any): void;
+    }
+
+    export interface CustomMatchers extends Matchers {
+    }
+
+    export interface Expect extends CustomMatchers {
+        not(): angularScenario.CustomMatchers;
+    }
+
+    export interface UsingFunction {
+        (selector: string, selectorDescription?: string): void;
+    }
+
+    export interface BindingFunction {
+        (bracketBindingExpression: string): Future;
+    }
+
+    export interface Input {
+        enter(value: any): any;
+        check(): any;
+        select(radioButtonValue: any): any;
+        val(): Future;
+    }
+
+    export interface Repeater {
+        count(): Future;
+        row(index: number): Future;
+        column(ngBindingExpression: string): Future;
+    }
+
+    export interface Select {
+        option(value: any): any;
+        option(...listOfValues: any[]): any;
+    }
+
+    export interface Element {
+        count(): Future;
+        click(): any;
+        dblclick(): any;
+        mouseover(): any;
+        mousedown(): any;
+        mouseup(): any;
+        query(callback: (selectedDOMElements: JQuery, callbackWhenDone: (objNull: any, futureValue: any) => any) => any): any;
+        val(): Future;
+        text(): Future;
+        html(): Future;
+        height(): Future;
+        innerHeight(): Future;
+        outerHeight(): Future;
+        width(): Future;
+        innerWidth(): Future;
+        outerWidth(): Future;
+        position(): Future;
+        scrollLeft(): Future;
+        scrollTop(): Future;
+        offset(): Future;
+
+        val(value: any): void;
+        text(value: any): void;
+        html(value: any): void;
+        height(value: any): void;
+        innerHeight(value: any): void;
+        outerHeight(value: any): void;
+        width(value: any): void;
+        innerWidth(value: any): void;
+        outerWidth(value: any): void;
+        position(value: any): void;
+        scrollLeft(value: any): void;
+        scrollTop(value: any): void;
+        offset(value: any): void;
+
+        attr(key: any): Future;
+        prop(key: any): Future;
+        css(key: any): Future;
+
+        attr(key: any, value: any): void;
+        prop(key: any, value: any): void;
+        css(key: any, value: any): void;
+    }
+}
+
+declare var describe: angularScenario.RunFunctionWithDescription;
+declare var ddescribe: angularScenario.RunFunctionWithDescription;
+declare var xdescribe: angularScenario.RunFunctionWithDescription;
+declare var beforeEach: angularScenario.RunFunction;
+declare var afterEach: angularScenario.RunFunction;
+declare var it: angularScenario.RunFunctionWithDescription;
+declare var iit: angularScenario.RunFunctionWithDescription;
+declare var xit: angularScenario.RunFunctionWithDescription;
+declare var pause: angularScenario.PauseFunction;
+declare var sleep: angularScenario.SleepFunction;
+declare function browser(): angularScenario.Browser;
+declare function expect(expectation: angularScenario.Future): angularScenario.Expect;
+declare var using: angularScenario.UsingFunction;
+declare var binding: angularScenario.BindingFunction;
+declare function input(ngModelBinding: string): angularScenario.Input;
+declare function repeater(selector: string, repeaterDescription?: string): angularScenario.Repeater;
+declare function select(ngModelBinding: string): angularScenario.Select;
+declare function element(selector: string, elementDescription?: string): angularScenario.Element;
+declare var angular: ng.IAngularStatic;
diff --git a/angular-scenario/tsconfig.json b/angular-scenario/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/angular-scenario/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-scroll/angular-scroll-tests.ts b/angular-scroll/angular-scroll-tests.ts
index d7c319df9a..fbc1c01642 100644
--- a/angular-scroll/angular-scroll-tests.ts
+++ b/angular-scroll/angular-scroll-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-scroll.d.ts" />
+
 
 namespace TestApp {
 
diff --git a/angular-scroll/angular-scroll.d.ts b/angular-scroll/angular-scroll.d.ts
deleted file mode 100644
index 1c96194e8b..0000000000
--- a/angular-scroll/angular-scroll.d.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-// Type definitions for angular-scroll
-// Project: https://github.com/oblador/angular-scroll
-// Definitions by: Sam Herrmann <https://github.com/samherrmann>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace duScroll {
-
-    /**
-     * Extends the angular.element object returned by the $document sercive with a few jQuery like functions.
-     * see https://github.com/oblador/angular-scroll#angularelement-scroll-api
-     */
-    interface IDocumentService extends ng.IDocumentService {
-
-        duScrollTo(left: number, top: number): void;
-        duScrollTo(left: number, top: number, duration: number, easing?: Function): ng.IPromise<void>;
-
-        duScrollTo(element: ng.IAugmentedJQuery, offset?: number): void;
-        duScrollTo(element: ng.IAugmentedJQuery, offset: number, duration: number, easing?: Function): ng.IPromise<void>;
-
-        duScrollToElement(element: ng.IAugmentedJQuery, offset?: number): void;
-        duScrollToElement(element: ng.IAugmentedJQuery, offset: number, duration: number, easing?: Function): ng.IPromise<void>;
-
-        duScrollToElementAnimated(element: ng.IAugmentedJQuery, offset?: number): ng.IPromise<void>;
-        duScrollToElementAnimated(element: ng.IAugmentedJQuery, offset: number, duration: number, easing?: Function): ng.IPromise<void>;
-
-        duScrollTop(top: number): void;
-        duScrollTop(top: number, duration: number, easing?: Function): ng.IPromise<void>;
-
-        duScrollTopAnimated(top: number): ng.IPromise<void>;
-        duScrollTopAnimated(top: number, duration: number, easing?: Function): ng.IPromise<void>;
-
-        duScrollLeft(left: number): void;
-        duScrollLeft(left: number, duration: number, easing?: Function): ng.IPromise<void>;
-
-        duScrollLeftAnimated(left: number): ng.IPromise<void>;
-        duScrollLeftAnimated(left: number, duration: number, easing?: Function): ng.IPromise<void>;
-
-        duScrollTop(): number;
-        duScrollLeft(): number;
-    }
-}
diff --git a/angular-scroll/index.d.ts b/angular-scroll/index.d.ts
new file mode 100644
index 0000000000..22f98a0ee4
--- /dev/null
+++ b/angular-scroll/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for angular-scroll
+// Project: https://github.com/oblador/angular-scroll
+// Definitions by: Sam Herrmann <https://github.com/samherrmann>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="angularjs" />
+
+declare namespace duScroll {
+
+    /**
+     * Extends the angular.element object returned by the $document sercive with a few jQuery like functions.
+     * see https://github.com/oblador/angular-scroll#angularelement-scroll-api
+     */
+    interface IDocumentService extends ng.IDocumentService {
+
+        duScrollTo(left: number, top: number): void;
+        duScrollTo(left: number, top: number, duration: number, easing?: Function): ng.IPromise<void>;
+
+        duScrollTo(element: ng.IAugmentedJQuery, offset?: number): void;
+        duScrollTo(element: ng.IAugmentedJQuery, offset: number, duration: number, easing?: Function): ng.IPromise<void>;
+
+        duScrollToElement(element: ng.IAugmentedJQuery, offset?: number): void;
+        duScrollToElement(element: ng.IAugmentedJQuery, offset: number, duration: number, easing?: Function): ng.IPromise<void>;
+
+        duScrollToElementAnimated(element: ng.IAugmentedJQuery, offset?: number): ng.IPromise<void>;
+        duScrollToElementAnimated(element: ng.IAugmentedJQuery, offset: number, duration: number, easing?: Function): ng.IPromise<void>;
+
+        duScrollTop(top: number): void;
+        duScrollTop(top: number, duration: number, easing?: Function): ng.IPromise<void>;
+
+        duScrollTopAnimated(top: number): ng.IPromise<void>;
+        duScrollTopAnimated(top: number, duration: number, easing?: Function): ng.IPromise<void>;
+
+        duScrollLeft(left: number): void;
+        duScrollLeft(left: number, duration: number, easing?: Function): ng.IPromise<void>;
+
+        duScrollLeftAnimated(left: number): ng.IPromise<void>;
+        duScrollLeftAnimated(left: number, duration: number, easing?: Function): ng.IPromise<void>;
+
+        duScrollTop(): number;
+        duScrollLeft(): number;
+    }
+}
diff --git a/angular-scroll/tsconfig.json b/angular-scroll/tsconfig.json
new file mode 100644
index 0000000000..9452024e8b
--- /dev/null
+++ b/angular-scroll/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-scroll-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-signalr-hub/angular-signalr-hub-tests.ts b/angular-signalr-hub/angular-signalr-hub-tests.ts
index d20457bcdc..771e49cdff 100644
--- a/angular-signalr-hub/angular-signalr-hub-tests.ts
+++ b/angular-signalr-hub/angular-signalr-hub-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path='angular-signalr-hub.d.ts' />
-/// <reference path='../angularjs/angular.d.ts' />
-
 angular
     .module('app', ['SignalR'])
     .factory('Employees', ngSignalrTest.EmployeesFactory);
diff --git a/angular-signalr-hub/angular-signalr-hub.d.ts b/angular-signalr-hub/angular-signalr-hub.d.ts
deleted file mode 100644
index 03fa6427eb..0000000000
--- a/angular-signalr-hub/angular-signalr-hub.d.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-// Type definitions for angular-signalr-hub v1.5.0
-// Project: https://github.com/JustMaier/angular-signalr-hub
-// Definitions by: Adam Santaniello <https://github.com/AdamSantaniello>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path='../signalr/signalr.d.ts' />
-
-declare namespace ngSignalr {
-    interface HubFactory {
-        /**
-         * Creates a new Hub connection
-         */
-        new (hubName: string, options: HubOptions): Hub
-    }
-
-    class Hub {
-        hubName: string;
-        connection: SignalR.Connection;
-        proxy: SignalR.Hub.Proxy;
-
-        on(event: string, fn: (...args: any[]) => void): void;
-        invoke(method: string, ...args: any[]): JQueryDeferred<any>;
-        disconnect(): void;
-        connect(): JQueryPromise<any>;
-    }
-
-    interface HubOptions {
-        /**
-         * Collection of client side callbacks
-         */
-        listeners?: { [index: string]: (...args: any[]) => void };
-
-        /**
-         * String array of server side methods which the client can call
-         */
-        methods?: Array<string>;
-
-        /**
-         * Sets the root path for the SignalR web service
-         */
-        rootPath?: string;
-
-        /**
-         * Object representing additional query params to be sent on connection
-         */
-        queryParams?: { [index: string]: string };
-
-        /**
-         * Function to handle hub connection errors
-         */
-        errorHandler?: (error: string) => void;
-
-        /**
-         * Enable/disable logging
-         */
-        logging?: boolean;
-
-        /**
-         * Use a shared global connection or create a new one just for this hub, defaults to true
-         */
-        useSharedConnection?: boolean;
-
-        /**
-         * Sets transport method (e.g    'longPolling'    or    ['webSockets', 'longPolling'] )
-         */
-        transport?: any;
-
-        /**
-         * Function to handle hub connection state changed event
-         */
-        stateChanged?: (state: SignalR.StateChanged) => void;
-    }
-}
diff --git a/angular-signalr-hub/index.d.ts b/angular-signalr-hub/index.d.ts
new file mode 100644
index 0000000000..9fe894afa6
--- /dev/null
+++ b/angular-signalr-hub/index.d.ts
@@ -0,0 +1,74 @@
+// Type definitions for angular-signalr-hub v1.5.0
+// Project: https://github.com/JustMaier/angular-signalr-hub
+// Definitions by: Adam Santaniello <https://github.com/AdamSantaniello>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="signalr" />
+/// <reference types="angularjs" />
+
+declare namespace ngSignalr {
+    interface HubFactory {
+        /**
+         * Creates a new Hub connection
+         */
+        new (hubName: string, options: HubOptions): Hub
+    }
+
+    class Hub {
+        hubName: string;
+        connection: SignalR.Connection;
+        proxy: SignalR.Hub.Proxy;
+
+        on(event: string, fn: (...args: any[]) => void): void;
+        invoke(method: string, ...args: any[]): JQueryDeferred<any>;
+        disconnect(): void;
+        connect(): JQueryPromise<any>;
+    }
+
+    interface HubOptions {
+        /**
+         * Collection of client side callbacks
+         */
+        listeners?: { [index: string]: (...args: any[]) => void };
+
+        /**
+         * String array of server side methods which the client can call
+         */
+        methods?: Array<string>;
+
+        /**
+         * Sets the root path for the SignalR web service
+         */
+        rootPath?: string;
+
+        /**
+         * Object representing additional query params to be sent on connection
+         */
+        queryParams?: { [index: string]: string };
+
+        /**
+         * Function to handle hub connection errors
+         */
+        errorHandler?: (error: string) => void;
+
+        /**
+         * Enable/disable logging
+         */
+        logging?: boolean;
+
+        /**
+         * Use a shared global connection or create a new one just for this hub, defaults to true
+         */
+        useSharedConnection?: boolean;
+
+        /**
+         * Sets transport method (e.g    'longPolling'    or    ['webSockets', 'longPolling'] )
+         */
+        transport?: any;
+
+        /**
+         * Function to handle hub connection state changed event
+         */
+        stateChanged?: (state: SignalR.StateChanged) => void;
+    }
+}
diff --git a/angular-signalr-hub/tsconfig.json b/angular-signalr-hub/tsconfig.json
new file mode 100644
index 0000000000..04501eb594
--- /dev/null
+++ b/angular-signalr-hub/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-signalr-hub-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-spinner/angular-spinner-tests.ts b/angular-spinner/angular-spinner-tests.ts
index 4f3f870233..9ac20eed0c 100644
--- a/angular-spinner/angular-spinner-tests.ts
+++ b/angular-spinner/angular-spinner-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-spinner.d.ts" />
+
 
 var myApp = angular.module('testModule');
 
diff --git a/angular-spinner/angular-spinner.d.ts b/angular-spinner/angular-spinner.d.ts
deleted file mode 100644
index ba85d0e53c..0000000000
--- a/angular-spinner/angular-spinner.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// Type definitions for angular-spinner.js 0.5.1
-// Project: https://github.com/urish/angular-spinner
-// Definitions by: Marcin Biegała <https://github.com/Biegal>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-/**
-* SpinnerService 
-* see https://github.com/urish/angular-spinner
-*/
-interface ISpinnerService {
-    /**
-     * Start selected spinner
-     * 
-     * @param spinner key
-     */
-    spin(key: string): void;
-
-    /**
-     * Stop selected spinner
-     * 
-     * @param spinner key
-     */
-    stop(key: string): void;
-}
diff --git a/angular-spinner/index.d.ts b/angular-spinner/index.d.ts
new file mode 100644
index 0000000000..ac0efa0cc4
--- /dev/null
+++ b/angular-spinner/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for angular-spinner.js 0.5.1
+// Project: https://github.com/urish/angular-spinner
+// Definitions by: Marcin Biegała <https://github.com/Biegal>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+/**
+* SpinnerService 
+* see https://github.com/urish/angular-spinner
+*/
+interface ISpinnerService {
+    /**
+     * Start selected spinner
+     * 
+     * @param spinner key
+     */
+    spin(key: string): void;
+
+    /**
+     * Stop selected spinner
+     * 
+     * @param spinner key
+     */
+    stop(key: string): void;
+}
diff --git a/angular-spinner/tsconfig.json b/angular-spinner/tsconfig.json
new file mode 100644
index 0000000000..94f2479cce
--- /dev/null
+++ b/angular-spinner/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-spinner-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-storage/angular-storage-tests.ts b/angular-storage/angular-storage-tests.ts
index 1455bbd643..0b5a48f12c 100644
--- a/angular-storage/angular-storage-tests.ts
+++ b/angular-storage/angular-storage-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path='../angularjs/angular.d.ts' />
-/// <reference path='angular-storage.d.ts' />
-
 // Samples taken from the a0-angular-storage Readme.md
 
 var app = angular.module('angular-storage-tests', ['angular-storage']);
diff --git a/angular-storage/angular-storage.d.ts b/angular-storage/angular-storage.d.ts
deleted file mode 100644
index cb46cd1d7c..0000000000
--- a/angular-storage/angular-storage.d.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-// Type definitions for angular-storage v0.0.11
-// Project: https://github.com/auth0/angular-storage
-// Definitions by: Matthew DeKrey <https://github.com/mdekrey>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace angular.a0.storage {
-	interface IStoreService extends INamespacedStoreService {
-		/**
-		 * Returns a namespaced store
-		 *
-		 * @param {String} namespace - The namespace
-		 * @param {String} storage - The name of the storage service. Defaults to local storage.
-		 * @param {String} delimiter - The delimiter to use to separate the namespace and the keys.
-		 * @returns {INamespacedStoreService}
-		 */
-		getNamespacedStore(namespace: string, storage?: string, delimiter?: string): INamespacedStoreService;
-	}
-
-	interface INamespacedStoreService {
-		/**
-		 * Sets a new value to the storage with the key name. It can be any object.
-		 *
-		 * @param {String} name - The key name for the location of the value
-		 * @param value - The value to store
-		 */
-		set(name: string, value: any): void;
-
-		/**
-		 * Returns the saved value with they key name.
-		 *
-		 * @param {String} name - The key name for the location of the value
-		 * @returns The saved value; if you saved an object, you get an object
-		 */
-		get(name: string): any;
-
-		/**
-		 * Deletes the saved value with the key name
-		 *
-		 * @param {String} name - The key name for the location of the value to remove
-		 */
-		remove(name: string): void;
-	}
-
-	interface IStoreProvider {
-
-	    /**
-	     * Sets the storage.
-	     *
-	     * @param {String} storage - The storage name
-	     */
-		setStore(storage: string): void;
-	}
-}
diff --git a/angular-storage/index.d.ts b/angular-storage/index.d.ts
new file mode 100644
index 0000000000..b9e57edf26
--- /dev/null
+++ b/angular-storage/index.d.ts
@@ -0,0 +1,55 @@
+// Type definitions for angular-storage v0.0.11
+// Project: https://github.com/auth0/angular-storage
+// Definitions by: Matthew DeKrey <https://github.com/mdekrey>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare namespace angular.a0.storage {
+	interface IStoreService extends INamespacedStoreService {
+		/**
+		 * Returns a namespaced store
+		 *
+		 * @param {String} namespace - The namespace
+		 * @param {String} storage - The name of the storage service. Defaults to local storage.
+		 * @param {String} delimiter - The delimiter to use to separate the namespace and the keys.
+		 * @returns {INamespacedStoreService}
+		 */
+		getNamespacedStore(namespace: string, storage?: string, delimiter?: string): INamespacedStoreService;
+	}
+
+	interface INamespacedStoreService {
+		/**
+		 * Sets a new value to the storage with the key name. It can be any object.
+		 *
+		 * @param {String} name - The key name for the location of the value
+		 * @param value - The value to store
+		 */
+		set(name: string, value: any): void;
+
+		/**
+		 * Returns the saved value with they key name.
+		 *
+		 * @param {String} name - The key name for the location of the value
+		 * @returns The saved value; if you saved an object, you get an object
+		 */
+		get(name: string): any;
+
+		/**
+		 * Deletes the saved value with the key name
+		 *
+		 * @param {String} name - The key name for the location of the value to remove
+		 */
+		remove(name: string): void;
+	}
+
+	interface IStoreProvider {
+
+	    /**
+	     * Sets the storage.
+	     *
+	     * @param {String} storage - The storage name
+	     */
+		setStore(storage: string): void;
+	}
+}
diff --git a/angular-storage/tsconfig.json b/angular-storage/tsconfig.json
new file mode 100644
index 0000000000..c81578da03
--- /dev/null
+++ b/angular-storage/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-storage-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-strap/angular-strap-tests.ts b/angular-strap/angular-strap-tests.ts
index c052ffad4f..c37d6d103b 100644
--- a/angular-strap/angular-strap-tests.ts
+++ b/angular-strap/angular-strap-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../angularjs/angular.d.ts"/>
-/// <reference path="./angular-strap.d.ts"/>
+/// <reference types="angularjs"/>
 
 namespace angularStrapTests {
 
diff --git a/angular-strap/angular-strap.d.ts b/angular-strap/angular-strap.d.ts
deleted file mode 100644
index 5b85f77de1..0000000000
--- a/angular-strap/angular-strap.d.ts
+++ /dev/null
@@ -1,600 +0,0 @@
-// Type definitions for angular-strap v2.2.x
-// Project: http://mgcrea.github.io/angular-strap/
-// Definitions by: Sam Herrmann <https://github.com/samherrmann>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace mgcrea.ngStrap {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Modal
-    // see http://mgcrea.github.io/angular-strap/#/modals
-    ///////////////////////////////////////////////////////////////////////////
-
-    namespace modal {
-
-        interface IModalService {
-            (config?: IModalOptions): IModal;
-        }
-
-        interface IModalProvider {
-            defaults: IModalOptions;
-        }
-
-        interface IModal {
-            $promise: ng.IPromise<void>;
-            show: () => void;
-            hide: () => void;
-            toggle: () => void;
-        }
-
-        interface IModalOptions {
-            animation?: string;
-            backdropAnimation?: string;
-            placement?: string;
-            title?: string;
-            content?: string;
-            html?: boolean;
-            backdrop?: boolean | string;
-            keyboard?: boolean;
-            show?: boolean;
-            container?: string | boolean;
-            template?: string;
-            contentTemplate?: string;
-            prefixEvent?: string;
-            id?: string;
-            scope?: ng.IScope;
-        }
-
-        interface IModalScope extends ng.IScope {
-            $show: () => void;
-            $hide: () => void;
-            $toggle: () => void;
-        }
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Aside
-    // see http://mgcrea.github.io/angular-strap/#/asides
-    ///////////////////////////////////////////////////////////////////////////
-
-    namespace aside {
-
-        interface IAsideService {
-            (config?: IAsideOptions): IAside;
-        }
-
-        interface IAsideProvider {
-            defaults: IAsideOptions;
-        }
-
-        interface IAside {
-            $promise: ng.IPromise<void>;
-            show: () => void;
-            hide: () => void;
-            toggle: () => void;
-        }
-
-        interface IAsideOptions {
-            animation?: string;
-            placement?: string;
-            title?: string;
-            content?: string;
-            html?: boolean;
-            backdrop?: boolean | string;
-            keyboard?: boolean;
-            show?: boolean;
-            container?: string | boolean;
-            template?: string;
-            contentTemplate?: string;
-            scope?: ng.IScope;
-        }
-
-        interface IAsideScope extends ng.IScope {
-            $show: () => void;
-            $hide: () => void;
-            $toggle: () => void;
-        }
-    }
-
-
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Alert
-    // see http://mgcrea.github.io/angular-strap/#/alerts
-    ///////////////////////////////////////////////////////////////////////////
-
-    namespace alert {
-
-        interface IAlertService {
-            (config?: IAlertOptions): IAlert;
-        }
-
-        interface IAlertProvider {
-            defaults: IAlertOptions;
-        }
-
-        interface IAlert {
-            $promise: ng.IPromise<void>;
-            show: () => void;
-            hide: () => void;
-            toggle: () => void;
-        }
-
-        interface IAlertOptions {
-            animation?: string;
-            placement?: string;
-            title?: string;
-            content?: string;
-            type?: string;
-            keyboard?: boolean;
-            show?: boolean;
-            container?: string | boolean;
-            template?: string;
-            duration?: number | boolean;
-            dismissable?: boolean;
-        }
-
-        interface IAlertScope extends ng.IScope {
-            $show: () => void;
-            $hide: () => void;
-            $toggle: () => void;
-        }
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Tooltip
-    // see http://mgcrea.github.io/angular-strap/#/tooltips
-    ///////////////////////////////////////////////////////////////////////////
-
-    namespace tooltip {
-
-        interface ITooltipService {
-            (element: ng.IAugmentedJQuery, config?: ITooltipOptions): ITooltip;
-        }
-
-        interface ITooltipProvider {
-            defaults: ITooltipOptions;
-        }
-
-        interface ITooltip {
-            $promise: ng.IPromise<void>;
-            show: () => void;
-            hide: () => void;
-            toggle: () => void;
-        }
-
-        interface ITooltipOptions {
-            animation?: string;
-            placement?: string;
-            trigger?: string;
-            title?: string;
-            html?: boolean;
-            delay?: number | { show: number; hide: number};
-            container?: string | boolean;
-            target?: string | ng.IAugmentedJQuery | boolean;
-            template?: string;
-            contentTemplate?: string;
-            prefixEvent?: string;
-            id?: string;
-            viewport?: string | { selector: string; padding: string | number };
-        }
-
-        interface ITooltipScope extends ng.IScope {
-            $show: () => void;
-            $hide: () => void;
-            $toggle: () => void;
-            $setEnabled: (isEnabled: boolean) => void;
-        }
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Popover
-    // see http://mgcrea.github.io/angular-strap/#/popovers
-    ///////////////////////////////////////////////////////////////////////////
-
-    namespace popover {
-
-        interface IPopoverService {
-            (element: ng.IAugmentedJQuery, config?: IPopoverOptions): IPopover;
-        }
-
-        interface IPopoverProvider {
-            defaults: IPopoverOptions;
-        }
-
-        interface IPopover {
-            $promise: ng.IPromise<void>;
-            show: () => void;
-            hide: () => void;
-            toggle: () => void;
-        }
-
-        interface IPopoverOptions {
-            animation?: string;
-            placement?: string;
-            trigger?: string;
-            title?: string;
-            content?: string;
-            html?: boolean;
-            delay?: number | { show: number; hide: number };
-            container?: string | boolean;
-            target?: string | ng.IAugmentedJQuery | boolean;
-            template?: string;
-            contentTemplate?: string;
-            autoClose?: boolean;
-            id?: string;
-            viewport?: string | { selector: string; padding: string | number };
-        }
-
-        interface IPopoverScope extends ng.IScope {
-            $show: () => void;
-            $hide: () => void;
-            $toggle: () => void;
-        }
-    }
-
-
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Typeahead
-    // see http://mgcrea.github.io/angular-strap/#/typeaheads
-    ///////////////////////////////////////////////////////////////////////////
-
-    namespace typeahead {
-
-        interface ITypeaheadService {
-            (element: ng.IAugmentedJQuery, controller: any, config?: ITypeaheadOptions): ITypeahead;
-        }
-
-        interface ITypeaheadProvider {
-            defaults: ITypeaheadOptions;
-        }
-
-        interface ITypeahead {
-            $promise: ng.IPromise<void>;
-            show: () => void;
-            hide: () => void;
-            toggle: () => void;
-        }
-
-        interface ITypeaheadOptions {
-            animation?: string;
-            placement?: string;
-            trigger?: string;
-            html?: boolean;
-            delay?: number | { show: number; hide: number };
-            container?: string | boolean;
-            template?: string;
-            limit?: number;
-            minLength?: number;
-            autoSelect?: boolean;
-            comparator?: string;
-            id?: string;
-            watchOptions?: boolean;
-        }
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Datepicker
-    // see http://mgcrea.github.io/angular-strap/#/datepickers
-    ///////////////////////////////////////////////////////////////////////////
-
-    namespace datepicker {
-
-        interface IDatepickerService {
-            (element: ng.IAugmentedJQuery, controller: any, config?: IDatepickerOptions): IDatepicker;
-        }
-
-        interface IDatepickerProvider {
-            defaults: IDatepickerOptions;
-        }
-
-        interface IDatepicker {
-            update: (date: Date) => void;
-            updateDisabledDates: (dateRanges: IDatepickerDateRange[]) => void;
-            select: (dateConstructorArg: string | number | number[], keep: boolean) => void;
-            setMode: (mode: any) => void;
-            int: () => void;
-            destroy: () => void;
-            show: () => void;
-            hide: () => void;
-        }
-
-        interface IDatepickerDateRange {
-            start: Date;
-            end: Date;
-        }
-
-        interface IDatepickerOptions {
-            animation?: string;
-            placement?: string;
-            trigger?: string;
-            html?: boolean;
-            delay?: number | { show: number; hide: number };
-            container?: string | boolean;
-            template?: string;
-            dateFormat?: string;
-            modelDateFormat?: string;
-            dateType?: string;
-            timezone?: string;
-            autoclose?: boolean;
-            useNative?: boolean;
-            minDate?: Date;
-            maxDate?: Date;
-            startView?: number;
-            minView?: number;
-            startWeek?: number;
-            startDate?: Date;
-            iconLeft?: string;
-            iconRight?: string;
-            daysOfWeekDisabled?: string;
-            disabledDates?: IDatepickerDateRange[];
-        }
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Timepicker
-    // see http://mgcrea.github.io/angular-strap/#/timepickers
-    ///////////////////////////////////////////////////////////////////////////
-
-    namespace timepicker {
-
-        interface ITimepickerService {
-            (element: ng.IAugmentedJQuery, controller: any, config?: ITimepickerOptions): ITimepicker;
-        }
-
-        interface ITimepickerProvider {
-            defaults: ITimepickerOptions;
-        }
-
-        interface ITimepicker {
-
-        }
-
-        interface ITimepickerOptions {
-            animation?: string;
-            placement?: string;
-            trigger?: string;
-            html?: boolean;
-            delay?: number | { show: number; hide: number; };
-            container?: string | boolean;
-            template?: string;
-            timeFormat?: string;
-            modelTimeFormat?: string;
-            timeType?: string;
-            autoclose?: boolean;
-            useNative?: boolean;
-            minTime?: Date; // TODO
-            maxTime?: Date; // TODO
-            length?: number;
-            hourStep?: number;
-            minuteStep?: number;
-            secondStep?: number;
-            roundDisplay?: boolean;
-            iconUp?: string;
-            iconDown?: string;
-            arrowBehaviour?: string;
-        }
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Button
-    // see http://mgcrea.github.io/angular-strap/#/buttons
-    ///////////////////////////////////////////////////////////////////////////
-
-    // No definitions for this module
-
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Select
-    // see http://mgcrea.github.io/angular-strap/#/selects
-    ///////////////////////////////////////////////////////////////////////////
-
-    namespace select {
-
-        interface ISelectService {
-            (element: ng.IAugmentedJQuery, controller: any, config: ISelectOptions): ISelect;
-        }
-
-        interface ISelectProvider {
-            defaults: ISelectOptions;
-        }
-
-        interface ISelect {
-            update: (matches: any) => void;
-            active: (index: number) => number;
-            select: (index: number) => void;
-            show: () => void;
-            hide: () => void;
-        }
-
-        interface ISelectOptions {
-          animation?: string;
-          placement?: string;
-          trigger?: string;
-          html?: boolean;
-          delay?: number | { show: number; hide: number; };
-          container?: string | boolean;
-          template?: string;
-          multiple?: boolean;
-          allNoneButtons?: boolean;
-          allText?: string;
-          noneText?: string;
-          maxLength?: number;
-          maxLengthHtml?: string;
-          sort?: boolean;
-          placeholder?: string;
-          iconCheckmark?: string;
-          id?: string;
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Tabs
-    // see http://mgcrea.github.io/angular-strap/#/tabs
-    ///////////////////////////////////////////////////////////////////////////
-
-    namespace tab {
-
-        interface ITabProvider {
-            defaults: ITabOptions;
-        }
-
-        interface ITabService {
-            defaults: ITabOptions;
-            controller: any;
-        }
-
-        interface ITabOptions {
-            animation?: string;
-            template?: string;
-            navClass?: string;
-            activeClass?: string;
-        }
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Collapses
-    // see http://mgcrea.github.io/angular-strap/#/collapses
-    ///////////////////////////////////////////////////////////////////////////
-
-    namespace collapse {
-
-        interface ICollapseProvider {
-            defaults: ICollapseOptions;
-        }
-
-        interface ICollapseOptions {
-            animation?: string;
-            activeClass?: string;
-            disallowToggle?: boolean;
-            startCollapsed?: boolean;
-            allowMultiple?: boolean;
-        }
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Dropdowsn
-    // see http://mgcrea.github.io/angular-strap/#/dropdowns
-    ///////////////////////////////////////////////////////////////////////////
-
-    namespace dropdown {
-
-        interface IDropdownProvider {
-            defaults: IDropdownOptions;
-        }
-
-        interface IDropdownService {
-            (element: ng.IAugmentedJQuery, config: IDropdownOptions): IDropdown;
-        }
-
-        interface IDropdown {
-            show: () => void;
-            hide: () => void;
-            destroy: () => void;
-        }
-
-        interface IDropdownOptions {
-          animation?: string;
-          placement?: string;
-          trigger?: string;
-          html?: boolean;
-          delay?: number | { show: number; hide: number; };
-          container?: string | boolean;
-          template?: string;
-        }
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Navbar
-    // see http://mgcrea.github.io/angular-strap/#/navbars
-    ///////////////////////////////////////////////////////////////////////////
-
-    namespace navbar {
-
-        interface INavbarProvider {
-            defaults: INavbarOptions;
-        }
-
-        interface INavbarOptions {
-            activeClass?: string;
-            routeAttr?: string;
-        }
-
-        interface INavbarService {
-            defaults: INavbarOptions;
-        }
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Scrollspy
-    // see http://mgcrea.github.io/angular-strap/#/scrollspy
-    ///////////////////////////////////////////////////////////////////////////
-
-    namespace scrollspy {
-
-        interface IScrollspyProvider {
-            defaults: IScrollspyOptions;
-        }
-
-        interface IScrollspyService {
-            (element: ng.IAugmentedJQuery, options: IScrollspyOptions): IScrollspy;
-        }
-
-        interface IScrollspy {
-            checkOffsets: () => void;
-            trackElement: (target: any, source: any) => void;
-            untrackElement: (target: any, source: any) => void;
-            activate: (index: number)  => void;
-        }
-
-        interface IScrollspyOptions {
-            target?: string;
-            offset?: number;
-        }
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Affix
-    // see http://mgcrea.github.io/angular-strap/#/affix
-    ///////////////////////////////////////////////////////////////////////////
-
-    namespace affix {
-
-        interface IAffixProvider {
-            defaults: IAffixOptions;
-        }
-
-        interface IAffixService {
-            (element: ng.IAugmentedJQuery, options: IAffixOptions): IAffix;
-        }
-
-        interface IAffix {
-            init: () => void;
-            destroy: () => void;
-            checkPositionWithEventLoop: () => void;
-            checkPosition: () => void;
-        }
-
-        interface IAffixOptions {
-            offsetTop?: number;
-            offsetBottom?: number;
-            offsetParent?: number;
-            offsetUnpin?: number;
-        }
-    }
-}
diff --git a/angular-strap/index.d.ts b/angular-strap/index.d.ts
new file mode 100644
index 0000000000..d23a2f4fa8
--- /dev/null
+++ b/angular-strap/index.d.ts
@@ -0,0 +1,600 @@
+// Type definitions for angular-strap v2.2.x
+// Project: http://mgcrea.github.io/angular-strap/
+// Definitions by: Sam Herrmann <https://github.com/samherrmann>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="angularjs" />
+
+declare namespace mgcrea.ngStrap {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Modal
+    // see http://mgcrea.github.io/angular-strap/#/modals
+    ///////////////////////////////////////////////////////////////////////////
+
+    namespace modal {
+
+        interface IModalService {
+            (config?: IModalOptions): IModal;
+        }
+
+        interface IModalProvider {
+            defaults: IModalOptions;
+        }
+
+        interface IModal {
+            $promise: ng.IPromise<void>;
+            show: () => void;
+            hide: () => void;
+            toggle: () => void;
+        }
+
+        interface IModalOptions {
+            animation?: string;
+            backdropAnimation?: string;
+            placement?: string;
+            title?: string;
+            content?: string;
+            html?: boolean;
+            backdrop?: boolean | string;
+            keyboard?: boolean;
+            show?: boolean;
+            container?: string | boolean;
+            template?: string;
+            contentTemplate?: string;
+            prefixEvent?: string;
+            id?: string;
+            scope?: ng.IScope;
+        }
+
+        interface IModalScope extends ng.IScope {
+            $show: () => void;
+            $hide: () => void;
+            $toggle: () => void;
+        }
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Aside
+    // see http://mgcrea.github.io/angular-strap/#/asides
+    ///////////////////////////////////////////////////////////////////////////
+
+    namespace aside {
+
+        interface IAsideService {
+            (config?: IAsideOptions): IAside;
+        }
+
+        interface IAsideProvider {
+            defaults: IAsideOptions;
+        }
+
+        interface IAside {
+            $promise: ng.IPromise<void>;
+            show: () => void;
+            hide: () => void;
+            toggle: () => void;
+        }
+
+        interface IAsideOptions {
+            animation?: string;
+            placement?: string;
+            title?: string;
+            content?: string;
+            html?: boolean;
+            backdrop?: boolean | string;
+            keyboard?: boolean;
+            show?: boolean;
+            container?: string | boolean;
+            template?: string;
+            contentTemplate?: string;
+            scope?: ng.IScope;
+        }
+
+        interface IAsideScope extends ng.IScope {
+            $show: () => void;
+            $hide: () => void;
+            $toggle: () => void;
+        }
+    }
+
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Alert
+    // see http://mgcrea.github.io/angular-strap/#/alerts
+    ///////////////////////////////////////////////////////////////////////////
+
+    namespace alert {
+
+        interface IAlertService {
+            (config?: IAlertOptions): IAlert;
+        }
+
+        interface IAlertProvider {
+            defaults: IAlertOptions;
+        }
+
+        interface IAlert {
+            $promise: ng.IPromise<void>;
+            show: () => void;
+            hide: () => void;
+            toggle: () => void;
+        }
+
+        interface IAlertOptions {
+            animation?: string;
+            placement?: string;
+            title?: string;
+            content?: string;
+            type?: string;
+            keyboard?: boolean;
+            show?: boolean;
+            container?: string | boolean;
+            template?: string;
+            duration?: number | boolean;
+            dismissable?: boolean;
+        }
+
+        interface IAlertScope extends ng.IScope {
+            $show: () => void;
+            $hide: () => void;
+            $toggle: () => void;
+        }
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Tooltip
+    // see http://mgcrea.github.io/angular-strap/#/tooltips
+    ///////////////////////////////////////////////////////////////////////////
+
+    namespace tooltip {
+
+        interface ITooltipService {
+            (element: ng.IAugmentedJQuery, config?: ITooltipOptions): ITooltip;
+        }
+
+        interface ITooltipProvider {
+            defaults: ITooltipOptions;
+        }
+
+        interface ITooltip {
+            $promise: ng.IPromise<void>;
+            show: () => void;
+            hide: () => void;
+            toggle: () => void;
+        }
+
+        interface ITooltipOptions {
+            animation?: string;
+            placement?: string;
+            trigger?: string;
+            title?: string;
+            html?: boolean;
+            delay?: number | { show: number; hide: number};
+            container?: string | boolean;
+            target?: string | ng.IAugmentedJQuery | boolean;
+            template?: string;
+            contentTemplate?: string;
+            prefixEvent?: string;
+            id?: string;
+            viewport?: string | { selector: string; padding: string | number };
+        }
+
+        interface ITooltipScope extends ng.IScope {
+            $show: () => void;
+            $hide: () => void;
+            $toggle: () => void;
+            $setEnabled: (isEnabled: boolean) => void;
+        }
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Popover
+    // see http://mgcrea.github.io/angular-strap/#/popovers
+    ///////////////////////////////////////////////////////////////////////////
+
+    namespace popover {
+
+        interface IPopoverService {
+            (element: ng.IAugmentedJQuery, config?: IPopoverOptions): IPopover;
+        }
+
+        interface IPopoverProvider {
+            defaults: IPopoverOptions;
+        }
+
+        interface IPopover {
+            $promise: ng.IPromise<void>;
+            show: () => void;
+            hide: () => void;
+            toggle: () => void;
+        }
+
+        interface IPopoverOptions {
+            animation?: string;
+            placement?: string;
+            trigger?: string;
+            title?: string;
+            content?: string;
+            html?: boolean;
+            delay?: number | { show: number; hide: number };
+            container?: string | boolean;
+            target?: string | ng.IAugmentedJQuery | boolean;
+            template?: string;
+            contentTemplate?: string;
+            autoClose?: boolean;
+            id?: string;
+            viewport?: string | { selector: string; padding: string | number };
+        }
+
+        interface IPopoverScope extends ng.IScope {
+            $show: () => void;
+            $hide: () => void;
+            $toggle: () => void;
+        }
+    }
+
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Typeahead
+    // see http://mgcrea.github.io/angular-strap/#/typeaheads
+    ///////////////////////////////////////////////////////////////////////////
+
+    namespace typeahead {
+
+        interface ITypeaheadService {
+            (element: ng.IAugmentedJQuery, controller: any, config?: ITypeaheadOptions): ITypeahead;
+        }
+
+        interface ITypeaheadProvider {
+            defaults: ITypeaheadOptions;
+        }
+
+        interface ITypeahead {
+            $promise: ng.IPromise<void>;
+            show: () => void;
+            hide: () => void;
+            toggle: () => void;
+        }
+
+        interface ITypeaheadOptions {
+            animation?: string;
+            placement?: string;
+            trigger?: string;
+            html?: boolean;
+            delay?: number | { show: number; hide: number };
+            container?: string | boolean;
+            template?: string;
+            limit?: number;
+            minLength?: number;
+            autoSelect?: boolean;
+            comparator?: string;
+            id?: string;
+            watchOptions?: boolean;
+        }
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Datepicker
+    // see http://mgcrea.github.io/angular-strap/#/datepickers
+    ///////////////////////////////////////////////////////////////////////////
+
+    namespace datepicker {
+
+        interface IDatepickerService {
+            (element: ng.IAugmentedJQuery, controller: any, config?: IDatepickerOptions): IDatepicker;
+        }
+
+        interface IDatepickerProvider {
+            defaults: IDatepickerOptions;
+        }
+
+        interface IDatepicker {
+            update: (date: Date) => void;
+            updateDisabledDates: (dateRanges: IDatepickerDateRange[]) => void;
+            select: (dateConstructorArg: string | number | number[], keep: boolean) => void;
+            setMode: (mode: any) => void;
+            int: () => void;
+            destroy: () => void;
+            show: () => void;
+            hide: () => void;
+        }
+
+        interface IDatepickerDateRange {
+            start: Date;
+            end: Date;
+        }
+
+        interface IDatepickerOptions {
+            animation?: string;
+            placement?: string;
+            trigger?: string;
+            html?: boolean;
+            delay?: number | { show: number; hide: number };
+            container?: string | boolean;
+            template?: string;
+            dateFormat?: string;
+            modelDateFormat?: string;
+            dateType?: string;
+            timezone?: string;
+            autoclose?: boolean;
+            useNative?: boolean;
+            minDate?: Date;
+            maxDate?: Date;
+            startView?: number;
+            minView?: number;
+            startWeek?: number;
+            startDate?: Date;
+            iconLeft?: string;
+            iconRight?: string;
+            daysOfWeekDisabled?: string;
+            disabledDates?: IDatepickerDateRange[];
+        }
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Timepicker
+    // see http://mgcrea.github.io/angular-strap/#/timepickers
+    ///////////////////////////////////////////////////////////////////////////
+
+    namespace timepicker {
+
+        interface ITimepickerService {
+            (element: ng.IAugmentedJQuery, controller: any, config?: ITimepickerOptions): ITimepicker;
+        }
+
+        interface ITimepickerProvider {
+            defaults: ITimepickerOptions;
+        }
+
+        interface ITimepicker {
+
+        }
+
+        interface ITimepickerOptions {
+            animation?: string;
+            placement?: string;
+            trigger?: string;
+            html?: boolean;
+            delay?: number | { show: number; hide: number; };
+            container?: string | boolean;
+            template?: string;
+            timeFormat?: string;
+            modelTimeFormat?: string;
+            timeType?: string;
+            autoclose?: boolean;
+            useNative?: boolean;
+            minTime?: Date; // TODO
+            maxTime?: Date; // TODO
+            length?: number;
+            hourStep?: number;
+            minuteStep?: number;
+            secondStep?: number;
+            roundDisplay?: boolean;
+            iconUp?: string;
+            iconDown?: string;
+            arrowBehaviour?: string;
+        }
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Button
+    // see http://mgcrea.github.io/angular-strap/#/buttons
+    ///////////////////////////////////////////////////////////////////////////
+
+    // No definitions for this module
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Select
+    // see http://mgcrea.github.io/angular-strap/#/selects
+    ///////////////////////////////////////////////////////////////////////////
+
+    namespace select {
+
+        interface ISelectService {
+            (element: ng.IAugmentedJQuery, controller: any, config: ISelectOptions): ISelect;
+        }
+
+        interface ISelectProvider {
+            defaults: ISelectOptions;
+        }
+
+        interface ISelect {
+            update: (matches: any) => void;
+            active: (index: number) => number;
+            select: (index: number) => void;
+            show: () => void;
+            hide: () => void;
+        }
+
+        interface ISelectOptions {
+          animation?: string;
+          placement?: string;
+          trigger?: string;
+          html?: boolean;
+          delay?: number | { show: number; hide: number; };
+          container?: string | boolean;
+          template?: string;
+          multiple?: boolean;
+          allNoneButtons?: boolean;
+          allText?: string;
+          noneText?: string;
+          maxLength?: number;
+          maxLengthHtml?: string;
+          sort?: boolean;
+          placeholder?: string;
+          iconCheckmark?: string;
+          id?: string;
+        }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Tabs
+    // see http://mgcrea.github.io/angular-strap/#/tabs
+    ///////////////////////////////////////////////////////////////////////////
+
+    namespace tab {
+
+        interface ITabProvider {
+            defaults: ITabOptions;
+        }
+
+        interface ITabService {
+            defaults: ITabOptions;
+            controller: any;
+        }
+
+        interface ITabOptions {
+            animation?: string;
+            template?: string;
+            navClass?: string;
+            activeClass?: string;
+        }
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Collapses
+    // see http://mgcrea.github.io/angular-strap/#/collapses
+    ///////////////////////////////////////////////////////////////////////////
+
+    namespace collapse {
+
+        interface ICollapseProvider {
+            defaults: ICollapseOptions;
+        }
+
+        interface ICollapseOptions {
+            animation?: string;
+            activeClass?: string;
+            disallowToggle?: boolean;
+            startCollapsed?: boolean;
+            allowMultiple?: boolean;
+        }
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Dropdowsn
+    // see http://mgcrea.github.io/angular-strap/#/dropdowns
+    ///////////////////////////////////////////////////////////////////////////
+
+    namespace dropdown {
+
+        interface IDropdownProvider {
+            defaults: IDropdownOptions;
+        }
+
+        interface IDropdownService {
+            (element: ng.IAugmentedJQuery, config: IDropdownOptions): IDropdown;
+        }
+
+        interface IDropdown {
+            show: () => void;
+            hide: () => void;
+            destroy: () => void;
+        }
+
+        interface IDropdownOptions {
+          animation?: string;
+          placement?: string;
+          trigger?: string;
+          html?: boolean;
+          delay?: number | { show: number; hide: number; };
+          container?: string | boolean;
+          template?: string;
+        }
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Navbar
+    // see http://mgcrea.github.io/angular-strap/#/navbars
+    ///////////////////////////////////////////////////////////////////////////
+
+    namespace navbar {
+
+        interface INavbarProvider {
+            defaults: INavbarOptions;
+        }
+
+        interface INavbarOptions {
+            activeClass?: string;
+            routeAttr?: string;
+        }
+
+        interface INavbarService {
+            defaults: INavbarOptions;
+        }
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Scrollspy
+    // see http://mgcrea.github.io/angular-strap/#/scrollspy
+    ///////////////////////////////////////////////////////////////////////////
+
+    namespace scrollspy {
+
+        interface IScrollspyProvider {
+            defaults: IScrollspyOptions;
+        }
+
+        interface IScrollspyService {
+            (element: ng.IAugmentedJQuery, options: IScrollspyOptions): IScrollspy;
+        }
+
+        interface IScrollspy {
+            checkOffsets: () => void;
+            trackElement: (target: any, source: any) => void;
+            untrackElement: (target: any, source: any) => void;
+            activate: (index: number)  => void;
+        }
+
+        interface IScrollspyOptions {
+            target?: string;
+            offset?: number;
+        }
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Affix
+    // see http://mgcrea.github.io/angular-strap/#/affix
+    ///////////////////////////////////////////////////////////////////////////
+
+    namespace affix {
+
+        interface IAffixProvider {
+            defaults: IAffixOptions;
+        }
+
+        interface IAffixService {
+            (element: ng.IAugmentedJQuery, options: IAffixOptions): IAffix;
+        }
+
+        interface IAffix {
+            init: () => void;
+            destroy: () => void;
+            checkPositionWithEventLoop: () => void;
+            checkPosition: () => void;
+        }
+
+        interface IAffixOptions {
+            offsetTop?: number;
+            offsetBottom?: number;
+            offsetParent?: number;
+            offsetUnpin?: number;
+        }
+    }
+}
diff --git a/angular-strap/tsconfig.json b/angular-strap/tsconfig.json
new file mode 100644
index 0000000000..8b426c8c0e
--- /dev/null
+++ b/angular-strap/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-strap-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-toastr/angular-toastr-tests.ts b/angular-toastr/angular-toastr-tests.ts
index e5701746f7..ba11179df0 100644
--- a/angular-toastr/angular-toastr-tests.ts
+++ b/angular-toastr/angular-toastr-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path='../angularjs/angular.d.ts' />
-/// <reference path='angular-toastr.d.ts' />
-
+import * as angular from 'angularjs';
 
 angular
     .module('toastr-tests', ['toastr'])
diff --git a/angular-toastr/angular-toastr.d.ts b/angular-toastr/angular-toastr.d.ts
deleted file mode 100644
index 698ced16cc..0000000000
--- a/angular-toastr/angular-toastr.d.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-// Type definitions for Angular Toastr v1.6.0
-// Project: https://github.com/Foxandxss/angular-toastr
-// Definitions by: Niko Kovačič <https://github.com/nkovacic>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare module "angular-toastr" {
-    var _: string;
-    export = _;
-}
-
-declare namespace angular.toastr {
-    interface IToastBaseConfig {
-        allowHtml?: boolean;
-        closeButton?: boolean;
-        closeHtml?: string;
-        extendedTimeOut?: number;
-        messageClass?: string;
-        onHidden?: Function;
-        onShown?: Function;
-        onTap?: Function;
-        progressBar?: boolean;
-        tapToDismiss?: boolean;
-        templates?: {
-            toast?: string;
-            progressbar?: string;
-        };
-        timeOut?: number;
-        titleClass?: string;
-        toastClass?: string;
-    }
-
-    interface IToastContainerConfig {
-        autoDismiss?: boolean;
-        containerId?: string;
-        maxOpened?: number;
-        newestOnTop?: boolean;
-        positionClass?: string;
-        preventDuplicates?: boolean;
-        preventOpenDuplicates?: boolean;
-        target?: string;
-    }
-
-    interface IToastConfig extends IToastBaseConfig {
-        iconClasses?: {
-            error?: string;
-            info?: string;
-            success?: string;
-            warning?: string;
-        };
-    }
-
-    interface IToastrConfig extends IToastContainerConfig, IToastConfig { }
-
-    interface IToastScope extends angular.IScope {
-        message: string;
-        options: IToastConfig;
-        title: string;
-        toastId: number;
-        toastType: string;
-    }
-
-    interface IToast {
-        el: angular.IAugmentedJQuery;
-        iconClass: string;
-        isOpened: boolean;
-        open: angular.IPromise<any>;
-        scope: IToastScope;
-        toastId: number;
-    }
-
-    interface IToastOptions extends IToastBaseConfig {
-        iconClass?: string;
-        target?: string;
-    }
-
-    interface IToastrService {
-        /**
-         * Return the number of active toasts in screen.
-         */
-        active(): number;
-        /**
-         * Remove toast from screen. If no toast is passed in, all toasts will be closed.
-         *
-         * @param {IToast} toast Optional toast object to delete
-         */
-        clear(toast?: IToast): void;
-        /**
-         * Create error toast notification message.
-         *
-         * @param {String} message Message to show on toast
-         * @param {String} title Title to show on toast
-         * @param {IToastOptions} options Override default toast options
-         */
-        error(message: string, title?: string, options?: IToastOptions): IToast;
-        /**
-         * Create info toast notification message.
-         *
-         * @param {String} message Message to show on toast
-         * @param {String} title Title to show on toast
-         * @param {IToastOptions} options Override default toast options
-         */
-        info(message: string, title?: string, options?: IToastOptions): IToast;
-        /**
-         * Create success toast notification message.
-         *
-         * @param {String} message Message to show on toast
-         * @param {String} title Title to show on toast
-         * @param {IToastOptions} options Override default toast options
-         */
-        success(message: string, title?: string, options?: IToastOptions): IToast;
-        /**
-         * Create warning toast notification message.
-         *
-         * @param {String} message Message to show on toast
-         * @param {String} title Title to show on toast
-         * @param {IToastOptions} options Override default toast options
-         */
-        warning(message: string, title?: string, options?: IToastOptions): IToast;
-    }
-}
diff --git a/angular-toastr/index.d.ts b/angular-toastr/index.d.ts
new file mode 100644
index 0000000000..7c9e40a420
--- /dev/null
+++ b/angular-toastr/index.d.ts
@@ -0,0 +1,121 @@
+// Type definitions for Angular Toastr v1.6.0
+// Project: https://github.com/Foxandxss/angular-toastr
+// Definitions by: Niko Kovačič <https://github.com/nkovacic>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+import * as angular from 'angularjs';
+
+declare module 'angularjs' {
+    export namespace toastr {
+        interface IToastBaseConfig {
+            allowHtml?: boolean;
+            closeButton?: boolean;
+            closeHtml?: string;
+            extendedTimeOut?: number;
+            messageClass?: string;
+            onHidden?: Function;
+            onShown?: Function;
+            onTap?: Function;
+            progressBar?: boolean;
+            tapToDismiss?: boolean;
+            templates?: {
+                toast?: string;
+                progressbar?: string;
+            };
+            timeOut?: number;
+            titleClass?: string;
+            toastClass?: string;
+        }
+
+        interface IToastContainerConfig {
+            autoDismiss?: boolean;
+            containerId?: string;
+            maxOpened?: number;
+            newestOnTop?: boolean;
+            positionClass?: string;
+            preventDuplicates?: boolean;
+            preventOpenDuplicates?: boolean;
+            target?: string;
+        }
+
+        interface IToastConfig extends IToastBaseConfig {
+            iconClasses?: {
+                error?: string;
+                info?: string;
+                success?: string;
+                warning?: string;
+            };
+        }
+
+        interface IToastrConfig extends IToastContainerConfig, IToastConfig { }
+
+        interface IToastScope extends angular.IScope {
+            message: string;
+            options: IToastConfig;
+            title: string;
+            toastId: number;
+            toastType: string;
+        }
+
+        interface IToast {
+            el: angular.IAugmentedJQuery;
+            iconClass: string;
+            isOpened: boolean;
+            open: angular.IPromise<any>;
+            scope: IToastScope;
+            toastId: number;
+        }
+
+        interface IToastOptions extends IToastBaseConfig {
+            iconClass?: string;
+            target?: string;
+        }
+
+        interface IToastrService {
+            /**
+             * Return the number of active toasts in screen.
+             */
+            active(): number;
+            /**
+             * Remove toast from screen. If no toast is passed in, all toasts will be closed.
+             *
+             * @param {IToast} toast Optional toast object to delete
+             */
+            clear(toast?: IToast): void;
+            /**
+             * Create error toast notification message.
+             *
+             * @param {String} message Message to show on toast
+             * @param {String} title Title to show on toast
+             * @param {IToastOptions} options Override default toast options
+             */
+            error(message: string, title?: string, options?: IToastOptions): IToast;
+            /**
+             * Create info toast notification message.
+             *
+             * @param {String} message Message to show on toast
+             * @param {String} title Title to show on toast
+             * @param {IToastOptions} options Override default toast options
+             */
+            info(message: string, title?: string, options?: IToastOptions): IToast;
+            /**
+             * Create success toast notification message.
+             *
+             * @param {String} message Message to show on toast
+             * @param {String} title Title to show on toast
+             * @param {IToastOptions} options Override default toast options
+             */
+            success(message: string, title?: string, options?: IToastOptions): IToast;
+            /**
+             * Create warning toast notification message.
+             *
+             * @param {String} message Message to show on toast
+             * @param {String} title Title to show on toast
+             * @param {IToastOptions} options Override default toast options
+             */
+            warning(message: string, title?: string, options?: IToastOptions): IToast;
+        }
+    }
+}
diff --git a/angular-toastr/tsconfig.json b/angular-toastr/tsconfig.json
new file mode 100644
index 0000000000..569756aadd
--- /dev/null
+++ b/angular-toastr/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-toastr-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-toasty/angular-toasty-tests.ts b/angular-toasty/angular-toasty-tests.ts
index 017d821720..ac636e75f6 100644
--- a/angular-toasty/angular-toasty-tests.ts
+++ b/angular-toasty/angular-toasty-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-toasty.d.ts" />
+
 
 interface AngularToastyTestControllerScope extends ng.IScope {
     button:string;
diff --git a/angular-toasty/angular-toasty.d.ts b/angular-toasty/angular-toasty.d.ts
deleted file mode 100644
index bec5bb32f1..0000000000
--- a/angular-toasty/angular-toasty.d.ts
+++ /dev/null
@@ -1,251 +0,0 @@
-// Type definitions for Angular Toasty v1.0.2
-// Project: https://github.com/invertase/angular-toasty
-// Definitions by: Dominik Muench <https://github.com/muenchdo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace toasty {
-
-    interface IToastyService {
-        /**
-         * Create a toast with the given options and type.
-         * @param options
-         * @param type
-         */
-        (options: IToastyConfig, type?: string): void;
-
-        /**
-         * Create a default "quick toast" with the given title.
-         * @param title
-         */
-        (title: string|number): void;
-
-        /**
-         * Create a default toast with the given options.
-         * @param options
-         */
-        default(options: IToastyConfig): void;
-
-        /**
-         * Create a default "quick toast" with the given title.
-         * @param title
-         */
-        default(title: string|number): void;
-
-        /**
-         * Create an info toast with the given options.
-         * @param options
-         */
-        info(options: IToastyConfig): void;
-
-        /**
-         * Create an info "quick toast" with the given title.
-         * @param title
-         */
-        info(title: string|number): void;
-
-        /**
-         * Create a wait toast with the given options.
-         * @param options
-         */
-        wait(options: IToastyConfig): void;
-
-        /**
-         * Create a wait "quick toast" with the given title.
-         * @param title
-         */
-        wait(title: string|number): void;
-
-        /**
-         * Create a success toast with the given options.
-         * @param options
-         */
-        success(options: IToastyConfig): void;
-
-        /**
-         * Create a success "quick toast" with the given title.
-         * @param title
-         */
-        success(title: string|number): void;
-
-        /**
-         * Create an error toast with the given options.
-         * @param options
-         */
-        error(options: IToastyConfig): void;
-
-        /**
-         * Create an error "quick toast" with the given title.
-         * @param title
-         */
-        error(title: string|number): void;
-
-        /**
-         * Create a warning toast with the given options.
-         * @param options
-         */
-        warning(options: IToastyConfig): void;
-
-        /**
-         * Create a warning "quick toast" with the given title.
-         * @param title
-         */
-        warning(title: string|number): void;
-
-        /**
-         * Clear toast(s).
-         * @param id Optional ID to clear a specific toast.
-         */
-        clear(id?: number): void;
-
-        /**
-         * Get the global config.
-         */
-        getGlobalConfig(): IGlobalConfig;
-
-    }
-
-    interface IToastyConfig {
-        /**
-         * The toast's title.
-         */
-        title: string;
-
-        /**
-         * The toast's message.
-         */
-        msg?: string;
-
-        /**
-         * Whether to show the 'X' icon to close the toast.
-         */
-        showClose?: boolean;
-
-        /**
-         * Whether clicking the toast closes it.
-         */
-        clickToClose?: boolean;
-
-        /**
-         * How long (in milliseconds) the toast shows before it's removed. Set to false to disable.
-         */
-        timeout?: number;
-
-        /**
-         * Whether to play a sound when a toast is added.
-         */
-        sound?: boolean;
-
-        /**
-         * Whether HTML is allowed in toasts.
-         */
-        html?: boolean;
-
-        /**
-         * Whether to shake the toasts.
-         */
-        shake?: boolean;
-
-        /**
-         * What theme to use.
-         * - 'default'
-         * - 'material'
-         * - 'bootstrap'
-         */
-        theme?: string;
-
-        /**
-         * The toast's type:
-         * - 'default'
-         * - 'info'
-         * - 'success'
-         * - 'wait'
-         * - 'error'
-         * - 'warning'
-         */
-        type?: string;
-
-        /**
-         * Add event handler.
-         */
-        onAdd?: Function;
-
-        /**
-         * Remove event handler.
-         */
-        onRemove?: Function;
-
-        /**
-         * Click event handler.
-         */
-        onClick?: Function;
-    }
-
-    interface IGlobalConfig {
-
-        /**
-         * Maximum number of toasts to show at once.
-         */
-        limit?: number;
-
-        /**
-         * The toast's title.
-         */
-        title?: string;
-
-        /**
-         * The toast's message.
-         */
-        msg?: string;
-
-        /**
-         * Whether to show the 'X' icon to close the toast.
-         */
-        showClose?: boolean;
-
-        /**
-         * Whether clicking the toast closes it.
-         */
-        clickToClose?: boolean;
-
-        /**
-         * The window position where the toast pops up.
-         *
-         */
-        position?: string;
-
-        /**
-         * How long (in miliseconds) the toast shows before it's removed. Set to false to disable.
-         */
-        timeout?: number|boolean;
-
-        /**
-         * Whether to play a sound when a toast is added.
-         */
-        sound?: boolean;
-
-        /**
-         * Whether HTML is allowed in toast.
-         */
-        html?: boolean;
-
-        /**
-         * Whether to shake the toast.
-         */
-        shake?: boolean;
-
-        /**
-         * What theme to use.
-         * - 'default'
-         * - 'material'
-         * - 'bootstrap'
-         */
-        theme?: string;
-    }
-
-    interface IToastyConfigProvider {
-        setConfig(override: IGlobalConfig): void;
-        $get(): IGlobalConfig;
-    }
-}
diff --git a/angular-toasty/index.d.ts b/angular-toasty/index.d.ts
new file mode 100644
index 0000000000..a57574b29d
--- /dev/null
+++ b/angular-toasty/index.d.ts
@@ -0,0 +1,251 @@
+// Type definitions for Angular Toasty v1.0.2
+// Project: https://github.com/invertase/angular-toasty
+// Definitions by: Dominik Muench <https://github.com/muenchdo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare namespace toasty {
+
+    interface IToastyService {
+        /**
+         * Create a toast with the given options and type.
+         * @param options
+         * @param type
+         */
+        (options: IToastyConfig, type?: string): void;
+
+        /**
+         * Create a default "quick toast" with the given title.
+         * @param title
+         */
+        (title: string|number): void;
+
+        /**
+         * Create a default toast with the given options.
+         * @param options
+         */
+        default(options: IToastyConfig): void;
+
+        /**
+         * Create a default "quick toast" with the given title.
+         * @param title
+         */
+        default(title: string|number): void;
+
+        /**
+         * Create an info toast with the given options.
+         * @param options
+         */
+        info(options: IToastyConfig): void;
+
+        /**
+         * Create an info "quick toast" with the given title.
+         * @param title
+         */
+        info(title: string|number): void;
+
+        /**
+         * Create a wait toast with the given options.
+         * @param options
+         */
+        wait(options: IToastyConfig): void;
+
+        /**
+         * Create a wait "quick toast" with the given title.
+         * @param title
+         */
+        wait(title: string|number): void;
+
+        /**
+         * Create a success toast with the given options.
+         * @param options
+         */
+        success(options: IToastyConfig): void;
+
+        /**
+         * Create a success "quick toast" with the given title.
+         * @param title
+         */
+        success(title: string|number): void;
+
+        /**
+         * Create an error toast with the given options.
+         * @param options
+         */
+        error(options: IToastyConfig): void;
+
+        /**
+         * Create an error "quick toast" with the given title.
+         * @param title
+         */
+        error(title: string|number): void;
+
+        /**
+         * Create a warning toast with the given options.
+         * @param options
+         */
+        warning(options: IToastyConfig): void;
+
+        /**
+         * Create a warning "quick toast" with the given title.
+         * @param title
+         */
+        warning(title: string|number): void;
+
+        /**
+         * Clear toast(s).
+         * @param id Optional ID to clear a specific toast.
+         */
+        clear(id?: number): void;
+
+        /**
+         * Get the global config.
+         */
+        getGlobalConfig(): IGlobalConfig;
+
+    }
+
+    interface IToastyConfig {
+        /**
+         * The toast's title.
+         */
+        title: string;
+
+        /**
+         * The toast's message.
+         */
+        msg?: string;
+
+        /**
+         * Whether to show the 'X' icon to close the toast.
+         */
+        showClose?: boolean;
+
+        /**
+         * Whether clicking the toast closes it.
+         */
+        clickToClose?: boolean;
+
+        /**
+         * How long (in milliseconds) the toast shows before it's removed. Set to false to disable.
+         */
+        timeout?: number;
+
+        /**
+         * Whether to play a sound when a toast is added.
+         */
+        sound?: boolean;
+
+        /**
+         * Whether HTML is allowed in toasts.
+         */
+        html?: boolean;
+
+        /**
+         * Whether to shake the toasts.
+         */
+        shake?: boolean;
+
+        /**
+         * What theme to use.
+         * - 'default'
+         * - 'material'
+         * - 'bootstrap'
+         */
+        theme?: string;
+
+        /**
+         * The toast's type:
+         * - 'default'
+         * - 'info'
+         * - 'success'
+         * - 'wait'
+         * - 'error'
+         * - 'warning'
+         */
+        type?: string;
+
+        /**
+         * Add event handler.
+         */
+        onAdd?: Function;
+
+        /**
+         * Remove event handler.
+         */
+        onRemove?: Function;
+
+        /**
+         * Click event handler.
+         */
+        onClick?: Function;
+    }
+
+    interface IGlobalConfig {
+
+        /**
+         * Maximum number of toasts to show at once.
+         */
+        limit?: number;
+
+        /**
+         * The toast's title.
+         */
+        title?: string;
+
+        /**
+         * The toast's message.
+         */
+        msg?: string;
+
+        /**
+         * Whether to show the 'X' icon to close the toast.
+         */
+        showClose?: boolean;
+
+        /**
+         * Whether clicking the toast closes it.
+         */
+        clickToClose?: boolean;
+
+        /**
+         * The window position where the toast pops up.
+         *
+         */
+        position?: string;
+
+        /**
+         * How long (in miliseconds) the toast shows before it's removed. Set to false to disable.
+         */
+        timeout?: number|boolean;
+
+        /**
+         * Whether to play a sound when a toast is added.
+         */
+        sound?: boolean;
+
+        /**
+         * Whether HTML is allowed in toast.
+         */
+        html?: boolean;
+
+        /**
+         * Whether to shake the toast.
+         */
+        shake?: boolean;
+
+        /**
+         * What theme to use.
+         * - 'default'
+         * - 'material'
+         * - 'bootstrap'
+         */
+        theme?: string;
+    }
+
+    interface IToastyConfigProvider {
+        setConfig(override: IGlobalConfig): void;
+        $get(): IGlobalConfig;
+    }
+}
diff --git a/angular-toasty/tsconfig.json b/angular-toasty/tsconfig.json
new file mode 100644
index 0000000000..83f62ee2fb
--- /dev/null
+++ b/angular-toasty/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-toasty-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-touchspin/angular-touchspin-tests.ts b/angular-touchspin/angular-touchspin-tests.ts
index c6e229c7f5..ed7fd0a2ca 100644
--- a/angular-touchspin/angular-touchspin-tests.ts
+++ b/angular-touchspin/angular-touchspin-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path='../angularjs/angular.d.ts' />
-/// <reference path='angular-touchspin.d.ts' />
+import angularTouchSpin = require("angular-touchspin");
 
 angular
     .module('touchspin-tests', ['lm.touchspin'])
diff --git a/angular-touchspin/angular-touchspin.d.ts b/angular-touchspin/angular-touchspin.d.ts
deleted file mode 100644
index 5423b17e55..0000000000
--- a/angular-touchspin/angular-touchspin.d.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-// Type definitions for Angular Touchspin v1.0.0
-// Project: https://github.com/nkovacic/angular-touchspin
-// Definitions by: Niko Kovačič <https://github.com/nkovacic>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-//// <reference path="../angularjs/angular.d.ts" />
-
-
-declare module "angular-touchspin" {
-    let _: string;
-    export = _;
-}
-
-declare namespace angularTouchSpin {
-    interface ITouchSpinOptions {
-        min?: number;
-        max?: number;
-        step?: number;
-        decimals?: number;
-        stepInterval?: number;
-        forceStepDivisibility?: string; // none | floor | round | ceil
-        stepIntervalDelay?: number;
-        verticalButtons?: boolean;
-        verticalUpClass?: string;
-        verticalDownClass?: string;
-        initVal?: number;
-        prefix?: string;
-        postfix?: string;
-        prefixExtraClass?: string;
-        postfixExtraClass?: string;
-        mousewheel?: boolean;
-        buttonDownClass?: string;
-        buttonUpClass?: string;
-        buttonDownTxt?: string;
-        buttonUpTxt?: string;
-    }
-
-    interface ITouchSpinConfig extends ITouchSpinOptions { }
-
-    interface ITouchSpinConfigProvider {
-        defaults(touchSpinOptions: ITouchSpinOptions): void;
-    }
-}
diff --git a/angular-touchspin/index.d.ts b/angular-touchspin/index.d.ts
new file mode 100644
index 0000000000..f4ad318a77
--- /dev/null
+++ b/angular-touchspin/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for Angular Touchspin v1.0.0
+// Project: https://github.com/nkovacic/angular-touchspin
+// Definitions by: Niko Kovačič <https://github.com/nkovacic>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare let angularTouchSpin: string;
+export = angularTouchSpin;
+
+declare namespace angularTouchSpin {
+    interface ITouchSpinOptions {
+        min?: number;
+        max?: number;
+        step?: number;
+        decimals?: number;
+        stepInterval?: number;
+        forceStepDivisibility?: string; // none | floor | round | ceil
+        stepIntervalDelay?: number;
+        verticalButtons?: boolean;
+        verticalUpClass?: string;
+        verticalDownClass?: string;
+        initVal?: number;
+        prefix?: string;
+        postfix?: string;
+        prefixExtraClass?: string;
+        postfixExtraClass?: string;
+        mousewheel?: boolean;
+        buttonDownClass?: string;
+        buttonUpClass?: string;
+        buttonDownTxt?: string;
+        buttonUpTxt?: string;
+    }
+
+    interface ITouchSpinConfig extends ITouchSpinOptions { }
+
+    interface ITouchSpinConfigProvider {
+        defaults(touchSpinOptions: ITouchSpinOptions): void;
+    }
+}
diff --git a/angular-touchspin/tsconfig.json b/angular-touchspin/tsconfig.json
new file mode 100644
index 0000000000..9473c51847
--- /dev/null
+++ b/angular-touchspin/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-touchspin-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-translate/angular-translate-tests.ts b/angular-translate/angular-translate-tests.ts
index 8ef1ab2e39..cc1d65afe9 100644
--- a/angular-translate/angular-translate-tests.ts
+++ b/angular-translate/angular-translate-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-translate.d.ts" />
+
 
 var app = angular.module('at', ['pascalprecht.translate']);
 
@@ -35,7 +35,11 @@ interface Scope extends ng.IScope {
 
 app.controller('Ctrl', ($scope: Scope, $translate: angular.translate.ITranslateService) => {
     $scope['changeLanguage'] = function (key: any) {
-        $translate.use(key);
+		$translate.onReady().then(() => {
+			if($translate.isReady()) {
+				$translate.use(key);
+			}
+		});
     };
 }).run(($filter: ng.IFilterService) => {
     var x: string;
diff --git a/angular-translate/angular-translate.d.ts b/angular-translate/angular-translate.d.ts
deleted file mode 100644
index 9d9eeb98a1..0000000000
--- a/angular-translate/angular-translate.d.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-// Type definitions for Angular Translate v2.4.0 (pascalprecht.translate module)
-// Project: https://github.com/PascalPrecht/angular-translate
-// Definitions by: Michel Salib <https://github.com/michelsalib>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare module "angular-translate" {
-    import ngt = angular.translate;
-    export = ngt;
-}
-
-declare namespace angular.translate {
-
-    interface ITranslationTable {
-        [key: string]: any;
-    }
-
-    interface ILanguageKeyAlias {
-        [key: string]: string;
-    }
-
-    interface IStorage {
-        get(name: string): string;
-        put(name: string, value: string): void;
-    }
-
-    interface IStaticFilesLoaderOptions {
-        prefix: string;
-        suffix: string;
-        key?: string;
-    }
-
-    interface IPartialLoader<T> {
-        addPart(name : string, priority? : number) : T;
-        deletePart(name : string) : T;
-        isPartAvailable(name : string) : boolean;
-    }
-
-    interface ITranslatePartialLoaderService extends IPartialLoader<ITranslatePartialLoaderService> {
-        getRegisteredParts() : Array<string>;
-        isPartLoaded(name : string, lang : string) : boolean;
-    }
-
-    interface ITranslatePartialLoaderProvider extends angular.IServiceProvider, IPartialLoader<ITranslatePartialLoaderProvider> {
-        setPart(lang : string, part : string, table : ITranslationTable) : ITranslatePartialLoaderProvider;
-    }
-
-    interface ITranslateService {
-        (translationId: string, interpolateParams?: any, interpolationId?: string): angular.IPromise<string>;
-        (translationId: string[], interpolateParams?: any, interpolationId?: string): angular.IPromise<{ [key: string]: string }>;
-        cloakClassName(): string;
-        cloakClassName(name: string): ITranslateProvider;
-        fallbackLanguage(langKey?: string): string;
-        fallbackLanguage(langKey?: string[]): string;
-        instant(translationId: string, interpolateParams?: any, interpolationId?: string): string;
-        instant(translationId: string[], interpolateParams?: any, interpolationId?: string): { [key: string]: string };
-        isPostCompilingEnabled(): boolean;
-        preferredLanguage(langKey?: string): string;
-        proposedLanguage(): string;
-        refresh(langKey?: string): angular.IPromise<void>;
-        storage(): IStorage;
-        storageKey(): string;
-        use(): string;
-        use(key: string): angular.IPromise<string>;
-        useFallbackLanguage(langKey?: string): void;
-        versionInfo(): string;
-        loaderCache(): any;
-    }
-
-    interface ITranslateProvider extends angular.IServiceProvider {
-        translations(): ITranslationTable;
-        translations(key: string, translationTable: ITranslationTable): ITranslateProvider;
-        cloakClassName(): string;
-        cloakClassName(name: string): ITranslateProvider;
-        addInterpolation(factory: any): ITranslateProvider;
-        useMessageFormatInterpolation(): ITranslateProvider;
-        useInterpolation(factory: string): ITranslateProvider;
-        useSanitizeValueStrategy(value: string): ITranslateProvider;
-        preferredLanguage(): ITranslateProvider;
-        preferredLanguage(language: string): ITranslateProvider;
-        translationNotFoundIndicator(indicator: string): ITranslateProvider;
-        translationNotFoundIndicatorLeft(): string;
-        translationNotFoundIndicatorLeft(indicator: string): ITranslateProvider;
-        translationNotFoundIndicatorRight(): string;
-        translationNotFoundIndicatorRight(indicator: string): ITranslateProvider;
-        fallbackLanguage(): ITranslateProvider;
-        fallbackLanguage(language: string): ITranslateProvider;
-        fallbackLanguage(languages: string[]): ITranslateProvider;
-        forceAsyncReload(value: boolean): ITranslateProvider;
-        use(): string;
-        use(key: string): ITranslateProvider;
-        storageKey(): string;
-        storageKey(key: string): void; // JeroMiya - the library should probably return ITranslateProvider but it doesn't here
-        useUrlLoader(url: string): ITranslateProvider;
-        useStaticFilesLoader(options: IStaticFilesLoaderOptions): ITranslateProvider;
-        useLoader(loaderFactory: string, options?: any): ITranslateProvider;
-        useLocalStorage(): ITranslateProvider;
-        useCookieStorage(): ITranslateProvider;
-        useStorage(storageFactory: any): ITranslateProvider;
-        storagePrefix(): string;
-        storagePrefix(prefix: string): ITranslateProvider;
-        useMissingTranslationHandlerLog(): ITranslateProvider;
-        useMissingTranslationHandler(factory: string): ITranslateProvider;
-        usePostCompiling(value: boolean): ITranslateProvider;
-        directivePriority(): number;
-        directivePriority(priority: number): ITranslateProvider;
-        determinePreferredLanguage(fn?: () => void): ITranslateProvider;
-        registerAvailableLanguageKeys(): string[];
-        registerAvailableLanguageKeys(languageKeys: string[], aliases?: ILanguageKeyAlias): ITranslateProvider;
-        useLoaderCache(cache?: any): ITranslateProvider;
-    }
-}
-
-declare namespace angular {
-    interface IFilterService {
-        (name:'translate'): {
-            (translationId: string, interpolateParams?: any, interpolation?: string): string;
-        };
-    }
-}
diff --git a/angular-translate/index.d.ts b/angular-translate/index.d.ts
new file mode 100644
index 0000000000..e2e72cced9
--- /dev/null
+++ b/angular-translate/index.d.ts
@@ -0,0 +1,123 @@
+// Type definitions for Angular Translate v2.4.0 (pascalprecht.translate module)
+// Project: https://github.com/PascalPrecht/angular-translate
+// Definitions by: Michel Salib <https://github.com/michelsalib>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare module "angular-translate" {
+    import ngt = angular.translate;
+    export = ngt;
+}
+
+declare namespace angular.translate {
+
+    interface ITranslationTable {
+        [key: string]: any;
+    }
+
+    interface ILanguageKeyAlias {
+        [key: string]: string;
+    }
+
+    interface IStorage {
+        get(name: string): string;
+        put(name: string, value: string): void;
+    }
+
+    interface IStaticFilesLoaderOptions {
+        prefix: string;
+        suffix: string;
+        key?: string;
+    }
+
+    interface IPartialLoader<T> {
+        addPart(name : string, priority? : number) : T;
+        deletePart(name : string) : T;
+        isPartAvailable(name : string) : boolean;
+    }
+
+    interface ITranslatePartialLoaderService extends IPartialLoader<ITranslatePartialLoaderService> {
+        getRegisteredParts() : Array<string>;
+        isPartLoaded(name : string, lang : string) : boolean;
+    }
+
+    interface ITranslatePartialLoaderProvider extends angular.IServiceProvider, IPartialLoader<ITranslatePartialLoaderProvider> {
+        setPart(lang : string, part : string, table : ITranslationTable) : ITranslatePartialLoaderProvider;
+    }
+
+    interface ITranslateService {
+        (translationId: string, interpolateParams?: any, interpolationId?: string): angular.IPromise<string>;
+        (translationId: string[], interpolateParams?: any, interpolationId?: string): angular.IPromise<{ [key: string]: string }>;
+        cloakClassName(): string;
+        cloakClassName(name: string): ITranslateProvider;
+        fallbackLanguage(langKey?: string): string;
+        fallbackLanguage(langKey?: string[]): string;
+        instant(translationId: string, interpolateParams?: any, interpolationId?: string): string;
+        instant(translationId: string[], interpolateParams?: any, interpolationId?: string): { [key: string]: string };
+        isPostCompilingEnabled(): boolean;
+        preferredLanguage(langKey?: string): string;
+        proposedLanguage(): string;
+        refresh(langKey?: string): angular.IPromise<void>;
+        storage(): IStorage;
+        storageKey(): string;
+        use(): string;
+        use(key: string): angular.IPromise<string>;
+        useFallbackLanguage(langKey?: string): void;
+        versionInfo(): string;
+        loaderCache(): any;
+        isReady(): boolean;
+        onReady(): angular.IPromise<void>;
+    }
+
+    interface ITranslateProvider extends angular.IServiceProvider {
+        translations(): ITranslationTable;
+        translations(key: string, translationTable: ITranslationTable): ITranslateProvider;
+        cloakClassName(): string;
+        cloakClassName(name: string): ITranslateProvider;
+        addInterpolation(factory: any): ITranslateProvider;
+        useMessageFormatInterpolation(): ITranslateProvider;
+        useInterpolation(factory: string): ITranslateProvider;
+        useSanitizeValueStrategy(value: string): ITranslateProvider;
+        preferredLanguage(): ITranslateProvider;
+        preferredLanguage(language: string): ITranslateProvider;
+        translationNotFoundIndicator(indicator: string): ITranslateProvider;
+        translationNotFoundIndicatorLeft(): string;
+        translationNotFoundIndicatorLeft(indicator: string): ITranslateProvider;
+        translationNotFoundIndicatorRight(): string;
+        translationNotFoundIndicatorRight(indicator: string): ITranslateProvider;
+        fallbackLanguage(): ITranslateProvider;
+        fallbackLanguage(language: string): ITranslateProvider;
+        fallbackLanguage(languages: string[]): ITranslateProvider;
+        forceAsyncReload(value: boolean): ITranslateProvider;
+        use(): string;
+        use(key: string): ITranslateProvider;
+        storageKey(): string;
+        storageKey(key: string): void; // JeroMiya - the library should probably return ITranslateProvider but it doesn't here
+        useUrlLoader(url: string): ITranslateProvider;
+        useStaticFilesLoader(options: IStaticFilesLoaderOptions): ITranslateProvider;
+        useLoader(loaderFactory: string, options?: any): ITranslateProvider;
+        useLocalStorage(): ITranslateProvider;
+        useCookieStorage(): ITranslateProvider;
+        useStorage(storageFactory: any): ITranslateProvider;
+        storagePrefix(): string;
+        storagePrefix(prefix: string): ITranslateProvider;
+        useMissingTranslationHandlerLog(): ITranslateProvider;
+        useMissingTranslationHandler(factory: string): ITranslateProvider;
+        usePostCompiling(value: boolean): ITranslateProvider;
+        directivePriority(): number;
+        directivePriority(priority: number): ITranslateProvider;
+        determinePreferredLanguage(fn?: () => void): ITranslateProvider;
+        registerAvailableLanguageKeys(): string[];
+        registerAvailableLanguageKeys(languageKeys: string[], aliases?: ILanguageKeyAlias): ITranslateProvider;
+        useLoaderCache(cache?: any): ITranslateProvider;
+    }
+}
+
+declare namespace angular {
+    interface IFilterService {
+        (name:'translate'): {
+            (translationId: string, interpolateParams?: any, interpolation?: string): string;
+        };
+    }
+}
diff --git a/angular-translate/tsconfig.json b/angular-translate/tsconfig.json
new file mode 100644
index 0000000000..12dd2b5342
--- /dev/null
+++ b/angular-translate/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-translate-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-ui-bootstrap/angular-ui-bootstrap-tests.ts b/angular-ui-bootstrap/angular-ui-bootstrap-tests.ts
index 7851d2da37..499078fa19 100644
--- a/angular-ui-bootstrap/angular-ui-bootstrap-tests.ts
+++ b/angular-ui-bootstrap/angular-ui-bootstrap-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-ui-bootstrap.d.ts" />
+
 
 var testApp = angular.module('testApp');
 
diff --git a/angular-ui-bootstrap/angular-ui-bootstrap.d.ts b/angular-ui-bootstrap/angular-ui-bootstrap.d.ts
deleted file mode 100644
index 29ad03485b..0000000000
--- a/angular-ui-bootstrap/angular-ui-bootstrap.d.ts
+++ /dev/null
@@ -1,752 +0,0 @@
-// Type definitions for Angular UI Bootstrap 0.13.3
-// Project: https://github.com/angular-ui/bootstrap
-// Definitions by: Brian Surowiec <https://github.com/xt0rted>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-// Support for AMD require
-declare module 'angular-bootstrap' {
-    let _: string;
-    export = _;
-}
-
-declare module 'angular-ui-bootstrap' {
-    let _: string;
-    export = _;
-}
-
-declare namespace angular.ui.bootstrap {
-
-    interface IAccordionConfig {
-        /**
-         * Controls whether expanding an item will cause the other items to close.
-         *
-         * @default true
-         */
-        closeOthers?: boolean;
-    }
-
-
-    interface IButtonConfig {
-        /**
-         * @default: 'active'
-         */
-        activeClass?: string;
-
-        /**
-         * @default: 'Click'
-         */
-        toggleEvent?: string;
-    }
-
-
-    interface IDatepickerConfig {
-        /**
-         * Format of day in month.
-         *
-         * @default 'dd'
-         */
-        formatDay?: string;
-
-        /**
-         * Format of month in year.
-         *
-         * @default 'MMM'
-         */
-        formatMonth?: string;
-
-        /**
-         * Format of year in year range.
-         *
-         * @default 'yyyy'
-         */
-        formatYear?: string;
-
-        /**
-         * Format of day in week header.
-         *
-         * @default 'EEE'
-         */
-        formatDayHeader?: string;
-
-        /**
-         * Format of title when selecting day.
-         *
-         * @default 'MMM yyyy'
-         */
-        formatDayTitle?: string;
-
-        /**
-         * Format of title when selecting month.
-         *
-         * @default 'yyyy'
-         */
-        formatMonthTitle?: string;
-
-        /**
-         * Current mode of the datepicker (day|month|year). Can be used to initialize datepicker to specific mode.
-         *
-         * @default 'day'
-         */
-        datepickerMode?: string;
-
-        /**
-         * Set a lower limit for mode.
-         *
-         * @default 'day'
-         */
-        minMode?: string;
-
-        /**
-         * Set an upper limit for mode.
-         *
-         * @default 'year'
-         */
-        maxMode?: string;
-
-        /**
-         * Whether to display week numbers.
-         *
-         * @default true
-         */
-        showWeeks?: boolean;
-
-        /**
-         * Starting day of the week from 0-6 where 0=Sunday and 6=Saturday.
-         *
-         * @default 0
-         */
-        startingDay?: number;
-
-        /**
-         * Number of years displayed in year selection.
-         *
-         * @default 20
-         */
-        yearRange?: number;
-
-        /**
-         * Defines the minimum available date.
-         *
-         * @default null
-         */
-        minDate?: any;
-
-        /**
-         * Defines the maximum available date.
-         *
-         * @default null
-         */
-        maxDate?: any;
-
-        /**
-         * An option to disable or enable shortcut's event propagation
-         *
-         * @default false
-         */
-        shortcutPropagation?: boolean;
-    }
-
-    interface IDatepickerPopupConfig {
-        /**
-         * The format for displayed dates.
-         *
-         * @default 'yyyy-MM-dd'
-         */
-        datepickerPopup?: string;
-
-        /**
-         * Allows overriding of default template of the popup.
-         *
-         * @default 'template/datepicker/popup.html'
-         */
-        datepickerPopupTemplateUrl?: string;
-
-        /**
-         * Allows overriding of default template of the datepicker used in popup.
-         *
-         * @default 'template/datepicker/popup.html'
-         */
-        datepickerTemplateUrl?: string;
-
-        /**
-         * Allows overriding of the default format for html5 date inputs.
-         */
-        html5Types?: {
-            date?: string;
-            'datetime-local'?: string;
-            month?: string;
-        };
-
-        /**
-         * The text to display for the current day button.
-         *
-         * @default 'Today'
-         */
-        currentText?: string;
-
-        /**
-         * The text to display for the clear button.
-         *
-         * @default 'Clear'
-         */
-        clearText?: string;
-
-        /**
-         * The text to display for the close button.
-         *
-         * @default 'Done'
-         */
-        closeText?: string;
-
-        /**
-         * Whether to close calendar when a date is chosen.
-         *
-         * @default true
-         */
-        closeOnDateSelection?: boolean;
-
-        /**
-         * Append the datepicker popup element to `body`, rather than inserting after `datepicker-popup`.
-         *
-         * @default false
-         */
-        appendToBody?: boolean;
-
-        /**
-         * Whether to display a button bar underneath the datepicker.
-         *
-         * @default true
-         */
-        showButtonBar?: boolean;
-
-        /**
-         * Whether to focus the datepicker popup upon opening.
-         *
-         * @default true
-         */
-        onOpenFocus?: boolean;
-    }
-
-
-    interface IModalProvider {
-        /**
-         * Default options all modals will use.
-         */
-        options: IModalSettings;
-    }
-
-    interface IModalService {
-        /**
-         * @param {IModalSettings} options
-         * @returns {IModalServiceInstance}
-         */
-        open(options: IModalSettings): IModalServiceInstance;
-    }
-
-    interface IModalServiceInstance {
-        /**
-         * A method that can be used to close a modal, passing a result. If `preventDefault` is called on the `modal.closing` event then the modal will remain open.
-         */
-        close(result?: any): void;
-
-        /**
-         * A method that can be used to dismiss a modal, passing a reason. If `preventDefault` is called on the `modal.closing` event then the modal will remain open.
-         */
-        dismiss(reason?: any): void;
-
-        /**
-         * A promise that is resolved when a modal is closed and rejected when a modal is dismissed.
-         */
-        result: angular.IPromise<any>;
-
-        /**
-         * A promise that is resolved when a modal gets opened after downloading content's template and resolving all variables.
-         */
-        opened: angular.IPromise<any>;
-
-        /**
-         * A promise that is resolved when a modal is rendered.
-         */
-        rendered: angular.IPromise<any>;
-    }
-
-    interface IModalScope extends angular.IScope {
-        /**
-         * Dismiss the dialog without assigning a value to the promise output. If `preventDefault` is called on the `modal.closing` event then the modal will remain open.
-         *
-         * @returns true if the modal was closed; otherwise false
-         */
-        $dismiss(reason?: any): boolean;
-
-        /**
-         * Close the dialog resolving the promise to the given value. If `preventDefault` is called on the `modal.closing` event then the modal will remain open.
-         *
-         * @returns true if the modal was closed; otherwise false
-         */
-        $close(result?: any): boolean;
-    }
-
-    interface IModalSettings {
-        /**
-         * a path to a template representing modal's content
-         */
-        templateUrl?: string | (() => string);
-
-        /**
-         * inline template representing the modal's content
-         */
-        template?: string;
-
-        /**
-         * a scope instance to be used for the modal's content (actually the $modal service is going to create a child scope of a provided scope).
-         * Defaults to `$rootScope`.
-         */
-        scope?: angular.IScope|IModalScope;
-
-        /**
-         * a controller for a modal instance - it can initialize scope used by modal.
-         * A controller can be injected with `$modalInstance`
-         * If value is an array, it must be in Inline Array Annotation format for injection (strings followed by factory method)
-         */
-        controller?: string | Function | Array<string | Function>;
-
-        /**
-         *  an alternative to the controller-as syntax, matching the API of directive definitions.
-         *  Requires the controller option to be provided as well
-         */
-        controllerAs?: string;
-
-        /**
-         * When used with controllerAs and set to true, it will bind the controller properties onto the $scope directly.
-         *
-         * @default false
-         */
-        bindToController?: boolean;
-
-        /**
-         * members that will be resolved and passed to the controller as locals; it is equivalent of the `resolve` property for AngularJS routes
-         * If property value is an array, it must be in Inline Array Annotation format for injection (strings followed by factory method)
-         */
-        resolve?: { [ key: string ]: string | Function | Array<string | Function> | Object };
-
-        /**
-         * Set to false to disable animations on new modal/backdrop. Does not toggle animations for modals/backdrops that are already displayed.
-         *
-         * @default true
-         */
-        animation?: boolean;
-
-        /**
-         * controls the presence of a backdrop
-         * Allowed values:
-         *   - true (default)
-         *   - false (no backdrop)
-         *   - 'static' backdrop is present but modal window is not closed when clicking outside of the modal window
-         *
-         * @default true
-         */
-        backdrop?: boolean | string;
-
-        /**
-         * indicates whether the dialog should be closable by hitting the ESC key
-         *
-         * @default true
-         */
-        keyboard?: boolean;
-
-        /**
-         * additional CSS class(es) to be added to a modal backdrop template
-         */
-        backdropClass?: string;
-
-        /**
-         * additional CSS class(es) to be added to a modal window template
-         */
-        windowClass?: string;
-
-        /**
-         * Optional suffix of modal window class. The value used is appended to the `modal-` class, i.e. a value of `sm` gives `modal-sm`.
-         */
-        size?: string;
-
-        /**
-         * a path to a template overriding modal's window template
-         */
-        windowTemplateUrl?: string;
-
-        /**
-         * The  class added to the body element when the modal is opened.
-         *
-         * @default 'model-open'
-         */
-        openedClass?: string;
-    }
-
-    interface IModalStackService {
-        /**
-         * Opens a new modal instance.
-         */
-        open(modalInstance: IModalServiceInstance, modal: any): void;
-
-        /**
-         * Closes a modal instance with an optional result.
-         */
-        close(modalInstance: IModalServiceInstance, result?: any): void;
-
-        /**
-         * Dismisses a modal instance with an optional reason.
-         */
-        dismiss(modalInstance: IModalServiceInstance, reason?: any): void;
-
-        /**
-         * Dismiss all open modal instances with an optional reason that will be passed to each instance.
-         */
-        dismissAll(reason?: any): void;
-
-        /**
-         * Gets the topmost modal instance that is open.
-         */
-        getTop(): IModalStackedMapKeyValuePair;
-    }
-
-    interface IModalStackedMapKeyValuePair {
-        key: IModalServiceInstance;
-        value: any;
-    }
-
-
-    interface IPaginationConfig {
-        /**
-         * Total number of items in all pages.
-         */
-        totalItems?: number;
-
-        /**
-         * Maximum number of items per page. A value less than one indicates all items on one page.
-         *
-         * @default 10
-         */
-        itemsPerPage?: number;
-
-        /**
-         * Limit number for pagination size.
-         *
-         * @default: null
-         */
-        maxSize?: number;
-
-        /**
-         * An optional expression assigned the total number of pages to display.
-         *
-         * @default angular.noop
-         */
-        numPages?: number;
-
-        /**
-         * Whether to keep current page in the middle of the visible ones.
-         *
-         * @default true
-         */
-        rotate?: boolean;
-
-        /**
-         * Whether to display Previous / Next buttons.
-         *
-         * @default true
-         */
-        directionLinks?: boolean;
-
-        /**
-         * Text for Previous button.
-         *
-         * @default 'Previous'
-         */
-        previousText?: string;
-
-        /**
-         * Text for Next button.
-         *
-         * @default 'Next'
-         */
-        nextText?: string;
-
-        /**
-         * Whether to display First / Last buttons.
-         *
-         * @default false
-         */
-        boundaryLinks?: boolean;
-
-        /**
-         * Text for First button.
-         *
-         * @default 'First'
-         */
-        firstText?: string;
-
-        /**
-         * Text for Last button.
-         *
-         * @default 'Last'
-         */
-        lastText?: string;
-
-        /**
-         * Override the template for the component with a custom provided template.
-         *
-         * @default  'template/pagination/pagination.html'
-         */
-        templateUrl?: string;
-    }
-
-    interface IPagerConfig {
-        /**
-         * Whether to align each link to the sides.
-         *
-         * @default true
-         */
-        align?: boolean;
-
-        /**
-         * Maximum number of items per page. A value less than one indicates all items on one page.
-         *
-         * @default 10
-         */
-        itemsPerPage?: number;
-
-        /**
-         * Text for Previous button.
-         *
-         * @default '« Previous'
-         */
-        previousText?: string;
-
-        /**
-         * Text for Next button.
-         *
-         * @default 'Next »'
-         */
-        nextText?: string;
-    }
-
-
-    interface IPositionCoordinates {
-        width?: number;
-        height?: number;
-        top?: number;
-        left?: number;
-    }
-
-    interface IPositionService {
-        /**
-         * Provides a read-only equivalent of jQuery's position function.
-         */
-        position(element: JQuery): IPositionCoordinates;
-
-        /**
-         * Provides a read-only equivalent of jQuery's offset function.
-         */
-        offset(element: JQuery): IPositionCoordinates;
-    }
-
-
-    interface IProgressConfig {
-        /**
-         * Whether bars use transitions to achieve the width change.
-         *
-         * @default: true
-         */
-        animate?: boolean;
-
-        /**
-         * A number that specifies the total value of bars that is required.
-         *
-         * @default: 100
-         */
-        max?: number;
-    }
-
-
-    interface IRatingConfig {
-        /**
-         * Changes the number of icons.
-         *
-         * @default: 5
-         */
-        max?: number;
-
-        /**
-         * A variable used in the template to specify the state for selected icons.
-         *
-         * @default: null
-         */
-        stateOn?: string;
-
-        /**
-         * A variable used in the template to specify the state for unselected icons.
-         *
-         * @default: null
-         */
-        stateOff?: string;
-
-        /**
-         * An array of strings defining titles for all icons.
-         *
-         * @default: ["one", "two", "three", "four", "five"]
-         */
-        titles?: Array<string>;
-    }
-
-
-    interface ITimepickerConfig {
-        /**
-         * Number of hours to increase or decrease when using a button.
-         *
-         * @default 1
-         */
-        hourStep?: number;
-
-        /**
-         * Number of minutes to increase or decrease when using a button.
-         *
-         * @default 1
-         */
-        minuteStep?: number;
-
-        /**
-         * Whether to display 12H or 24H mode.
-         *
-         * @default true
-         */
-        showMeridian?: boolean;
-
-        /**
-         * Meridian labels based on locale. To override you must supply an array like ['AM', 'PM'].
-         *
-         * @default null
-         */
-        meridians?: Array<string>;
-
-        /**
-         * Whether the user can type inside the hours & minutes input.
-         *
-         * @default false
-         */
-        readonlyInput?: boolean;
-
-        /**
-         * Whether the user can scroll inside the hours & minutes input to increase or decrease it's values.
-         *
-         * @default true
-         */
-        mousewheel?: boolean;
-
-        /**
-         * Whether the user can use up/down arrowkeys inside the hours & minutes input to increase or decrease it's values.
-         *
-         * @default true
-         */
-        arrowkeys?: boolean;
-
-        /**
-         * Shows spinner arrows above and below the inputs.
-         *
-         * @default true
-         */
-        showSpinners?: boolean;
-    }
-
-
-    interface ITooltipOptions {
-        /**
-         * Where to place it? Defaults to 'top', but also accepts 'right', 'bottom', or 'left'.
-         *
-         * @default 'top'
-         */
-        placement?: string;
-
-        /**
-         * Should the modal fade in and out?
-         *
-         * @default true
-         */
-        animation?: boolean;
-
-        /**
-         * For how long should the user have to have the mouse over the element before the tooltip shows (in milliseconds)?
-         *
-         * @default 0
-         */
-        popupDelay?: number;
-
-        /**
-         * Should the tooltip be appended to `$body` instead of the parent element?
-         *
-         * @default false
-         */
-        appendToBody?: boolean;
-
-        /**
-         * What should trigger a show of the tooltip? Supports a space separated list of event names.
-         *
-         * @default 'mouseenter' for tooltip, 'click' for popover
-         */
-        trigger?: string;
-
-        /**
-         * Should an expression on the scope be used to load the content?
-         *
-         * @default false
-         */
-        useContentExp?: boolean;
-    }
-
-    interface ITooltipProvider {
-        /**
-         * Provide a set of defaults for certain tooltip and popover attributes.
-         */
-        options(value: ITooltipOptions): void;
-
-        /**
-         * Extends the default trigger mappings with mappings of your own. E.g. `{ 'openTrigger': 'closeTrigger' }`.
-         */
-        setTriggers(triggers: Object): void;
-    }
-
-
-    /**
-     * WARNING: $transition is now deprecated. Use $animate from ngAnimate instead.
-     */
-    interface ITransitionService {
-        /**
-         * The browser specific animation event name.
-         */
-        animationEndEventName: string;
-
-        /**
-         * The browser specific transition event name.
-         */
-        transitionEndEventName: string;
-
-        /**
-         * Provides a consistent interface to trigger CSS 3 transitions and to be informed when they complete.
-         *
-         * @param element The DOMElement that will be animated
-         * @param trigger The thing that will cause the transition to start:
-         *   - As a string, it represents the css class to be added to the element.
-         *   - As an object, it represents a hash of style attributes to be applied to the element.
-         *   - As a function, it represents a function to be called that will cause the transition to occur.
-         * @param options Optional settings for the transition.
-         *
-         * @return A promise that is resolved when the transition finishes.
-         */
-        (element: angular.IAugmentedJQuery, trigger: any, options?: ITransitionServiceOptions): angular.IPromise<angular.IAugmentedJQuery>;
-    }
-
-    interface ITransitionServiceOptions {
-        animation?: boolean;
-    }
-
-}
diff --git a/angular-ui-bootstrap/index.d.ts b/angular-ui-bootstrap/index.d.ts
new file mode 100644
index 0000000000..65dee80e5a
--- /dev/null
+++ b/angular-ui-bootstrap/index.d.ts
@@ -0,0 +1,752 @@
+// Type definitions for Angular UI Bootstrap 0.13.3
+// Project: https://github.com/angular-ui/bootstrap
+// Definitions by: Brian Surowiec <https://github.com/xt0rted>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+// Support for AMD require
+declare module 'angular-bootstrap' {
+    let _: string;
+    export = _;
+}
+
+declare module 'angular-ui-bootstrap' {
+    let _: string;
+    export = _;
+}
+
+declare namespace angular.ui.bootstrap {
+
+    interface IAccordionConfig {
+        /**
+         * Controls whether expanding an item will cause the other items to close.
+         *
+         * @default true
+         */
+        closeOthers?: boolean;
+    }
+
+
+    interface IButtonConfig {
+        /**
+         * @default: 'active'
+         */
+        activeClass?: string;
+
+        /**
+         * @default: 'Click'
+         */
+        toggleEvent?: string;
+    }
+
+
+    interface IDatepickerConfig {
+        /**
+         * Format of day in month.
+         *
+         * @default 'dd'
+         */
+        formatDay?: string;
+
+        /**
+         * Format of month in year.
+         *
+         * @default 'MMM'
+         */
+        formatMonth?: string;
+
+        /**
+         * Format of year in year range.
+         *
+         * @default 'yyyy'
+         */
+        formatYear?: string;
+
+        /**
+         * Format of day in week header.
+         *
+         * @default 'EEE'
+         */
+        formatDayHeader?: string;
+
+        /**
+         * Format of title when selecting day.
+         *
+         * @default 'MMM yyyy'
+         */
+        formatDayTitle?: string;
+
+        /**
+         * Format of title when selecting month.
+         *
+         * @default 'yyyy'
+         */
+        formatMonthTitle?: string;
+
+        /**
+         * Current mode of the datepicker (day|month|year). Can be used to initialize datepicker to specific mode.
+         *
+         * @default 'day'
+         */
+        datepickerMode?: string;
+
+        /**
+         * Set a lower limit for mode.
+         *
+         * @default 'day'
+         */
+        minMode?: string;
+
+        /**
+         * Set an upper limit for mode.
+         *
+         * @default 'year'
+         */
+        maxMode?: string;
+
+        /**
+         * Whether to display week numbers.
+         *
+         * @default true
+         */
+        showWeeks?: boolean;
+
+        /**
+         * Starting day of the week from 0-6 where 0=Sunday and 6=Saturday.
+         *
+         * @default 0
+         */
+        startingDay?: number;
+
+        /**
+         * Number of years displayed in year selection.
+         *
+         * @default 20
+         */
+        yearRange?: number;
+
+        /**
+         * Defines the minimum available date.
+         *
+         * @default null
+         */
+        minDate?: any;
+
+        /**
+         * Defines the maximum available date.
+         *
+         * @default null
+         */
+        maxDate?: any;
+
+        /**
+         * An option to disable or enable shortcut's event propagation
+         *
+         * @default false
+         */
+        shortcutPropagation?: boolean;
+    }
+
+    interface IDatepickerPopupConfig {
+        /**
+         * The format for displayed dates.
+         *
+         * @default 'yyyy-MM-dd'
+         */
+        datepickerPopup?: string;
+
+        /**
+         * Allows overriding of default template of the popup.
+         *
+         * @default 'template/datepicker/popup.html'
+         */
+        datepickerPopupTemplateUrl?: string;
+
+        /**
+         * Allows overriding of default template of the datepicker used in popup.
+         *
+         * @default 'template/datepicker/popup.html'
+         */
+        datepickerTemplateUrl?: string;
+
+        /**
+         * Allows overriding of the default format for html5 date inputs.
+         */
+        html5Types?: {
+            date?: string;
+            'datetime-local'?: string;
+            month?: string;
+        };
+
+        /**
+         * The text to display for the current day button.
+         *
+         * @default 'Today'
+         */
+        currentText?: string;
+
+        /**
+         * The text to display for the clear button.
+         *
+         * @default 'Clear'
+         */
+        clearText?: string;
+
+        /**
+         * The text to display for the close button.
+         *
+         * @default 'Done'
+         */
+        closeText?: string;
+
+        /**
+         * Whether to close calendar when a date is chosen.
+         *
+         * @default true
+         */
+        closeOnDateSelection?: boolean;
+
+        /**
+         * Append the datepicker popup element to `body`, rather than inserting after `datepicker-popup`.
+         *
+         * @default false
+         */
+        appendToBody?: boolean;
+
+        /**
+         * Whether to display a button bar underneath the datepicker.
+         *
+         * @default true
+         */
+        showButtonBar?: boolean;
+
+        /**
+         * Whether to focus the datepicker popup upon opening.
+         *
+         * @default true
+         */
+        onOpenFocus?: boolean;
+    }
+
+
+    interface IModalProvider {
+        /**
+         * Default options all modals will use.
+         */
+        options: IModalSettings;
+    }
+
+    interface IModalService {
+        /**
+         * @param {IModalSettings} options
+         * @returns {IModalServiceInstance}
+         */
+        open(options: IModalSettings): IModalServiceInstance;
+    }
+
+    interface IModalServiceInstance {
+        /**
+         * A method that can be used to close a modal, passing a result. If `preventDefault` is called on the `modal.closing` event then the modal will remain open.
+         */
+        close(result?: any): void;
+
+        /**
+         * A method that can be used to dismiss a modal, passing a reason. If `preventDefault` is called on the `modal.closing` event then the modal will remain open.
+         */
+        dismiss(reason?: any): void;
+
+        /**
+         * A promise that is resolved when a modal is closed and rejected when a modal is dismissed.
+         */
+        result: angular.IPromise<any>;
+
+        /**
+         * A promise that is resolved when a modal gets opened after downloading content's template and resolving all variables.
+         */
+        opened: angular.IPromise<any>;
+
+        /**
+         * A promise that is resolved when a modal is rendered.
+         */
+        rendered: angular.IPromise<any>;
+    }
+
+    interface IModalScope extends angular.IScope {
+        /**
+         * Dismiss the dialog without assigning a value to the promise output. If `preventDefault` is called on the `modal.closing` event then the modal will remain open.
+         *
+         * @returns true if the modal was closed; otherwise false
+         */
+        $dismiss(reason?: any): boolean;
+
+        /**
+         * Close the dialog resolving the promise to the given value. If `preventDefault` is called on the `modal.closing` event then the modal will remain open.
+         *
+         * @returns true if the modal was closed; otherwise false
+         */
+        $close(result?: any): boolean;
+    }
+
+    interface IModalSettings {
+        /**
+         * a path to a template representing modal's content
+         */
+        templateUrl?: string | (() => string);
+
+        /**
+         * inline template representing the modal's content
+         */
+        template?: string;
+
+        /**
+         * a scope instance to be used for the modal's content (actually the $modal service is going to create a child scope of a provided scope).
+         * Defaults to `$rootScope`.
+         */
+        scope?: angular.IScope|IModalScope;
+
+        /**
+         * a controller for a modal instance - it can initialize scope used by modal.
+         * A controller can be injected with `$modalInstance`
+         * If value is an array, it must be in Inline Array Annotation format for injection (strings followed by factory method)
+         */
+        controller?: string | Function | Array<string | Function>;
+
+        /**
+         *  an alternative to the controller-as syntax, matching the API of directive definitions.
+         *  Requires the controller option to be provided as well
+         */
+        controllerAs?: string;
+
+        /**
+         * When used with controllerAs and set to true, it will bind the controller properties onto the $scope directly.
+         *
+         * @default false
+         */
+        bindToController?: boolean;
+
+        /**
+         * members that will be resolved and passed to the controller as locals; it is equivalent of the `resolve` property for AngularJS routes
+         * If property value is an array, it must be in Inline Array Annotation format for injection (strings followed by factory method)
+         */
+        resolve?: { [ key: string ]: string | Function | Array<string | Function> | Object };
+
+        /**
+         * Set to false to disable animations on new modal/backdrop. Does not toggle animations for modals/backdrops that are already displayed.
+         *
+         * @default true
+         */
+        animation?: boolean;
+
+        /**
+         * controls the presence of a backdrop
+         * Allowed values:
+         *   - true (default)
+         *   - false (no backdrop)
+         *   - 'static' backdrop is present but modal window is not closed when clicking outside of the modal window
+         *
+         * @default true
+         */
+        backdrop?: boolean | string;
+
+        /**
+         * indicates whether the dialog should be closable by hitting the ESC key
+         *
+         * @default true
+         */
+        keyboard?: boolean;
+
+        /**
+         * additional CSS class(es) to be added to a modal backdrop template
+         */
+        backdropClass?: string;
+
+        /**
+         * additional CSS class(es) to be added to a modal window template
+         */
+        windowClass?: string;
+
+        /**
+         * Optional suffix of modal window class. The value used is appended to the `modal-` class, i.e. a value of `sm` gives `modal-sm`.
+         */
+        size?: string;
+
+        /**
+         * a path to a template overriding modal's window template
+         */
+        windowTemplateUrl?: string;
+
+        /**
+         * The  class added to the body element when the modal is opened.
+         *
+         * @default 'model-open'
+         */
+        openedClass?: string;
+    }
+
+    interface IModalStackService {
+        /**
+         * Opens a new modal instance.
+         */
+        open(modalInstance: IModalServiceInstance, modal: any): void;
+
+        /**
+         * Closes a modal instance with an optional result.
+         */
+        close(modalInstance: IModalServiceInstance, result?: any): void;
+
+        /**
+         * Dismisses a modal instance with an optional reason.
+         */
+        dismiss(modalInstance: IModalServiceInstance, reason?: any): void;
+
+        /**
+         * Dismiss all open modal instances with an optional reason that will be passed to each instance.
+         */
+        dismissAll(reason?: any): void;
+
+        /**
+         * Gets the topmost modal instance that is open.
+         */
+        getTop(): IModalStackedMapKeyValuePair;
+    }
+
+    interface IModalStackedMapKeyValuePair {
+        key: IModalServiceInstance;
+        value: any;
+    }
+
+
+    interface IPaginationConfig {
+        /**
+         * Total number of items in all pages.
+         */
+        totalItems?: number;
+
+        /**
+         * Maximum number of items per page. A value less than one indicates all items on one page.
+         *
+         * @default 10
+         */
+        itemsPerPage?: number;
+
+        /**
+         * Limit number for pagination size.
+         *
+         * @default: null
+         */
+        maxSize?: number;
+
+        /**
+         * An optional expression assigned the total number of pages to display.
+         *
+         * @default angular.noop
+         */
+        numPages?: number;
+
+        /**
+         * Whether to keep current page in the middle of the visible ones.
+         *
+         * @default true
+         */
+        rotate?: boolean;
+
+        /**
+         * Whether to display Previous / Next buttons.
+         *
+         * @default true
+         */
+        directionLinks?: boolean;
+
+        /**
+         * Text for Previous button.
+         *
+         * @default 'Previous'
+         */
+        previousText?: string;
+
+        /**
+         * Text for Next button.
+         *
+         * @default 'Next'
+         */
+        nextText?: string;
+
+        /**
+         * Whether to display First / Last buttons.
+         *
+         * @default false
+         */
+        boundaryLinks?: boolean;
+
+        /**
+         * Text for First button.
+         *
+         * @default 'First'
+         */
+        firstText?: string;
+
+        /**
+         * Text for Last button.
+         *
+         * @default 'Last'
+         */
+        lastText?: string;
+
+        /**
+         * Override the template for the component with a custom provided template.
+         *
+         * @default  'template/pagination/pagination.html'
+         */
+        templateUrl?: string;
+    }
+
+    interface IPagerConfig {
+        /**
+         * Whether to align each link to the sides.
+         *
+         * @default true
+         */
+        align?: boolean;
+
+        /**
+         * Maximum number of items per page. A value less than one indicates all items on one page.
+         *
+         * @default 10
+         */
+        itemsPerPage?: number;
+
+        /**
+         * Text for Previous button.
+         *
+         * @default '« Previous'
+         */
+        previousText?: string;
+
+        /**
+         * Text for Next button.
+         *
+         * @default 'Next »'
+         */
+        nextText?: string;
+    }
+
+
+    interface IPositionCoordinates {
+        width?: number;
+        height?: number;
+        top?: number;
+        left?: number;
+    }
+
+    interface IPositionService {
+        /**
+         * Provides a read-only equivalent of jQuery's position function.
+         */
+        position(element: JQuery): IPositionCoordinates;
+
+        /**
+         * Provides a read-only equivalent of jQuery's offset function.
+         */
+        offset(element: JQuery): IPositionCoordinates;
+    }
+
+
+    interface IProgressConfig {
+        /**
+         * Whether bars use transitions to achieve the width change.
+         *
+         * @default: true
+         */
+        animate?: boolean;
+
+        /**
+         * A number that specifies the total value of bars that is required.
+         *
+         * @default: 100
+         */
+        max?: number;
+    }
+
+
+    interface IRatingConfig {
+        /**
+         * Changes the number of icons.
+         *
+         * @default: 5
+         */
+        max?: number;
+
+        /**
+         * A variable used in the template to specify the state for selected icons.
+         *
+         * @default: null
+         */
+        stateOn?: string;
+
+        /**
+         * A variable used in the template to specify the state for unselected icons.
+         *
+         * @default: null
+         */
+        stateOff?: string;
+
+        /**
+         * An array of strings defining titles for all icons.
+         *
+         * @default: ["one", "two", "three", "four", "five"]
+         */
+        titles?: Array<string>;
+    }
+
+
+    interface ITimepickerConfig {
+        /**
+         * Number of hours to increase or decrease when using a button.
+         *
+         * @default 1
+         */
+        hourStep?: number;
+
+        /**
+         * Number of minutes to increase or decrease when using a button.
+         *
+         * @default 1
+         */
+        minuteStep?: number;
+
+        /**
+         * Whether to display 12H or 24H mode.
+         *
+         * @default true
+         */
+        showMeridian?: boolean;
+
+        /**
+         * Meridian labels based on locale. To override you must supply an array like ['AM', 'PM'].
+         *
+         * @default null
+         */
+        meridians?: Array<string>;
+
+        /**
+         * Whether the user can type inside the hours & minutes input.
+         *
+         * @default false
+         */
+        readonlyInput?: boolean;
+
+        /**
+         * Whether the user can scroll inside the hours & minutes input to increase or decrease it's values.
+         *
+         * @default true
+         */
+        mousewheel?: boolean;
+
+        /**
+         * Whether the user can use up/down arrowkeys inside the hours & minutes input to increase or decrease it's values.
+         *
+         * @default true
+         */
+        arrowkeys?: boolean;
+
+        /**
+         * Shows spinner arrows above and below the inputs.
+         *
+         * @default true
+         */
+        showSpinners?: boolean;
+    }
+
+
+    interface ITooltipOptions {
+        /**
+         * Where to place it? Defaults to 'top', but also accepts 'right', 'bottom', or 'left'.
+         *
+         * @default 'top'
+         */
+        placement?: string;
+
+        /**
+         * Should the modal fade in and out?
+         *
+         * @default true
+         */
+        animation?: boolean;
+
+        /**
+         * For how long should the user have to have the mouse over the element before the tooltip shows (in milliseconds)?
+         *
+         * @default 0
+         */
+        popupDelay?: number;
+
+        /**
+         * Should the tooltip be appended to `$body` instead of the parent element?
+         *
+         * @default false
+         */
+        appendToBody?: boolean;
+
+        /**
+         * What should trigger a show of the tooltip? Supports a space separated list of event names.
+         *
+         * @default 'mouseenter' for tooltip, 'click' for popover
+         */
+        trigger?: string;
+
+        /**
+         * Should an expression on the scope be used to load the content?
+         *
+         * @default false
+         */
+        useContentExp?: boolean;
+    }
+
+    interface ITooltipProvider {
+        /**
+         * Provide a set of defaults for certain tooltip and popover attributes.
+         */
+        options(value: ITooltipOptions): void;
+
+        /**
+         * Extends the default trigger mappings with mappings of your own. E.g. `{ 'openTrigger': 'closeTrigger' }`.
+         */
+        setTriggers(triggers: Object): void;
+    }
+
+
+    /**
+     * WARNING: $transition is now deprecated. Use $animate from ngAnimate instead.
+     */
+    interface ITransitionService {
+        /**
+         * The browser specific animation event name.
+         */
+        animationEndEventName: string;
+
+        /**
+         * The browser specific transition event name.
+         */
+        transitionEndEventName: string;
+
+        /**
+         * Provides a consistent interface to trigger CSS 3 transitions and to be informed when they complete.
+         *
+         * @param element The DOMElement that will be animated
+         * @param trigger The thing that will cause the transition to start:
+         *   - As a string, it represents the css class to be added to the element.
+         *   - As an object, it represents a hash of style attributes to be applied to the element.
+         *   - As a function, it represents a function to be called that will cause the transition to occur.
+         * @param options Optional settings for the transition.
+         *
+         * @return A promise that is resolved when the transition finishes.
+         */
+        (element: angular.IAugmentedJQuery, trigger: any, options?: ITransitionServiceOptions): angular.IPromise<angular.IAugmentedJQuery>;
+    }
+
+    interface ITransitionServiceOptions {
+        animation?: boolean;
+    }
+
+}
diff --git a/angular-ui-bootstrap/tsconfig.json b/angular-ui-bootstrap/tsconfig.json
new file mode 100644
index 0000000000..e76f1b5c61
--- /dev/null
+++ b/angular-ui-bootstrap/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-ui-bootstrap-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-ui-router/angular-ui-router-tests.ts b/angular-ui-router/angular-ui-router-tests.ts
index ba42f16cf4..f1ab855e63 100644
--- a/angular-ui-router/angular-ui-router-tests.ts
+++ b/angular-ui-router/angular-ui-router-tests.ts
@@ -1,4 +1,5 @@
-/// <reference path="angular-ui-router.d.ts" />
+import * as ng from 'angularjs';
+import * as angular from 'angularjs';
 
 var myApp = angular.module('testModule');
 
@@ -141,6 +142,8 @@ class UrlLocatorTestService implements IUrlLocatorTestService {
         private $state: ng.ui.IStateService
     ) {
         $rootScope.$on("$locationChangeSuccess", (event: ng.IAngularEvent) => this.onLocationChangeSuccess(event));
+        $rootScope.$on('$stateNotFound', (event: ng.IAngularEvent, unfoundState: ng.ui.IUnfoundState, fromState: ng.ui.IState, fromParams: {}) => 
+                                              this.onStateNotFound(event, unfoundState, fromState, fromParams));
     }
 
     public currentUser: any;
@@ -162,6 +165,15 @@ class UrlLocatorTestService implements IUrlLocatorTestService {
             });
         }
     }
+    
+     private onStateNotFound(event: ng.IAngularEvent,
+                             unfoundState: ng.ui.IUnfoundState,
+                             fromState: ng.ui.IState,
+                             fromParams: {}) {
+        var unfoundTo: string = unfoundState.to;
+        var unfoundToParams: {} = unfoundState.toParams;
+        var unfoundOptions: ng.ui.IStateOptions = unfoundState.options 
+    }
 
     private stateServiceTest() {
         this.$state.go("myState");
diff --git a/angular-ui-router/angular-ui-router.d.ts b/angular-ui-router/angular-ui-router.d.ts
deleted file mode 100644
index 17d1570983..0000000000
--- a/angular-ui-router/angular-ui-router.d.ts
+++ /dev/null
@@ -1,363 +0,0 @@
-// Type definitions for Angular JS 1.1.5+ (ui.router module)
-// Project: https://github.com/angular-ui/ui-router
-// Definitions by: Michel Salib <https://github.com/michelsalib>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-// Support for AMD require and CommonJS
-declare module 'angular-ui-router' {
-    // Since angular-ui-router adds providers for a bunch of
-    // injectable dependencies, it doesn't really return any
-    // actual data except the plain string 'ui.router'.
-    //
-    // As such, I don't think anybody will ever use the actual
-    // default value of the module.  So I've only included the
-    // the types. (@xogeny)
-    export type IState = angular.ui.IState;
-    export type IStateProvider = angular.ui.IStateProvider;
-    export type IUrlMatcher = angular.ui.IUrlMatcher;
-    export type IUrlRouterProvider = angular.ui.IUrlRouterProvider;
-    export type IStateOptions = angular.ui.IStateOptions;
-    export type IHrefOptions = angular.ui.IHrefOptions;
-    export type IStateService = angular.ui.IStateService;
-    export type IResolvedState = angular.ui.IResolvedState;
-    export type IStateParamsService = angular.ui.IStateParamsService;
-    export type IUrlRouterService = angular.ui.IUrlRouterService;
-    export type IUiViewScrollProvider = angular.ui.IUiViewScrollProvider;
-    export type IType = angular.ui.IType;
-}
-
-declare namespace angular.ui {
-
-    interface IState {
-        name?: string;
-        /**
-         * String HTML content, or function that returns an HTML string
-         */
-        template?: string | {(): string};
-        /**
-         * String URL path to template file OR Function, returns URL path string
-         */
-        templateUrl?: string | {(params: IStateParamsService): string};
-        /**
-         * Function, returns HTML content string
-         */
-        templateProvider?: Function | Array<string|Function>;
-        /**
-         * A controller paired to the state. Function, annotated array or name as String
-         */
-        controller?: Function|string|Array<string|Function>;
-        controllerAs?: string;
-        /**
-         * Function (injectable), returns the actual controller function or string.
-         */
-        controllerProvider?: Function|Array<string|Function>;
-
-        /**
-         * Specifies the parent state of this state
-         */
-        parent?: string | IState;
-
-
-        resolve?: { [name:string]: any };
-        /**
-         * A url with optional parameters. When a state is navigated or transitioned to, the $stateParams service will be populated with any parameters that were passed.
-         */
-        url?: string | IUrlMatcher;
-        /**
-         * A map which optionally configures parameters declared in the url, or defines additional non-url parameters. Only use this within a state if you are not using url. Otherwise you can specify your parameters within the url. When a state is navigated or transitioned to, the $stateParams service will be populated with any parameters that were passed.
-         */
-        params?: any;
-        /**
-         * Use the views property to set up multiple views. If you don't need multiple views within a single state this property is not needed. Tip: remember that often nested views are more useful and powerful than multiple sibling views.
-         */
-        views?: { [name:string]: IState };
-        abstract?: boolean;
-        /**
-         * Callback function for when a state is entered. Good way to trigger an action or dispatch an event, such as opening a dialog.
-         * If minifying your scripts, make sure to explicitly annotate this function, because it won't be automatically annotated by your build tools.
-         */
-        onEnter?: Function|Array<string|Function>;
-        /**
-         * Callback functions for when a state is entered and exited. Good way to trigger an action or dispatch an event, such as opening a dialog.
-         * If minifying your scripts, make sure to explicitly annotate this function, because it won't be automatically annotated by your build tools.
-         */
-        onExit?: Function|Array<string|Function>;
-        /**
-         * Arbitrary data object, useful for custom configuration.
-         */
-        data?: any;
-
-        /**
-         * Boolean (default true). If false will not re-trigger the same state just because a search/query parameter has changed. Useful for when you'd like to modify $location.search() without triggering a reload.
-         */
-        reloadOnSearch?: boolean;
-
-        /**
-         * Boolean (default true). If false will reload state on everytransitions. Useful for when you'd like to restore all data  to its initial state.
-         */
-        cache?: boolean;
-    }
-
-    interface IStateProvider extends angular.IServiceProvider {
-        state(name:string, config:IState): IStateProvider;
-        state(config:IState): IStateProvider;
-        decorator(name?: string, decorator?: (state: IState, parent: Function) => any): any;
-    }
-
-    interface IUrlMatcher {
-        concat(pattern: string): IUrlMatcher;
-        exec(path: string, searchParams: {}): {};
-        parameters(): string[];
-        format(values: {}): string;
-    }
-
-    interface IUrlMatcherFactory {
-        /**
-         * Creates a UrlMatcher for the specified pattern.
-         *
-         * @param pattern {string} The URL pattern.
-         *
-         * @returns {IUrlMatcher} The UrlMatcher.
-         */
-        compile(pattern: string): IUrlMatcher;
-        /**
-         * Returns true if the specified object is a UrlMatcher, or false otherwise.
-         *
-         * @param o {any} The object to perform the type check against.
-         *
-         * @returns {boolean} Returns true if the object matches the IUrlMatcher interface, by implementing all the same methods.
-         */
-        isMatcher(o: any): boolean;
-        /**
-         * Returns a type definition for the specified name
-         *
-         * @param name {string} The type definition name
-         *
-         * @returns {IType} The type definition
-         */
-        type(name: string): IType;
-        /**
-         * Registers a custom Type object that can be used to generate URLs with typed parameters.
-         *
-         * @param {IType} definition The type definition.
-         * @param {any[]} inlineAnnotedDefinitionFn A function that is injected before the app runtime starts. The result of this function is merged into the existing definition.
-         *
-         * @returns {IUrlMatcherFactory} Returns $urlMatcherFactoryProvider.
-         */
-        type(name: string, definition: IType, inlineAnnotedDefinitionFn?: any[]): IUrlMatcherFactory;
-        /**
-         * Registers a custom Type object that can be used to generate URLs with typed parameters.
-         *
-         * @param {IType} definition The type definition.
-         * @param {any[]} inlineAnnotedDefinitionFn A function that is injected before the app runtime starts. The result of this function is merged into the existing definition.
-         *
-         * @returns {IUrlMatcherFactory} Returns $urlMatcherFactoryProvider.
-         */
-        type(name: string, definition: IType, definitionFn?: (...args:any[]) => IType): IUrlMatcherFactory;
-        /**
-         * Defines whether URL matching should be case sensitive (the default behavior), or not.
-         *
-         * @param value {boolean} false to match URL in a case sensitive manner; otherwise true;
-         *
-         * @returns {boolean} the current value of caseInsensitive
-         */
-        caseInsensitive(value?: boolean): boolean;
-        /**
-         * Sets the default behavior when generating or matching URLs with default parameter values
-         *
-         * @param value {string} A string that defines the default parameter URL squashing behavior. nosquash: When generating an href with a default parameter value, do not squash the parameter value from the URL slash: When generating an href with a default parameter value, squash (remove) the parameter value, and, if the parameter is surrounded by slashes, squash (remove) one slash from the URL any other string, e.g. "~": When generating an href with a default parameter value, squash (remove) the parameter value from the URL and replace it with this string.
-         */
-        defaultSquashPolicy(value: string): void;
-        /**
-         * Defines whether URLs should match trailing slashes, or not (the default behavior).
-         *
-         * @param value {boolean} false to match trailing slashes in URLs, otherwise true.
-         *
-         * @returns {boolean} the current value of strictMode
-         */
-        strictMode(value?: boolean): boolean;
-    }
-
-    interface IUrlRouterProvider extends angular.IServiceProvider {
-        when(whenPath: RegExp, handler: Function): IUrlRouterProvider;
-        when(whenPath: RegExp, handler: any[]): IUrlRouterProvider;
-        when(whenPath: RegExp, toPath: string): IUrlRouterProvider;
-        when(whenPath: IUrlMatcher, hanlder: Function): IUrlRouterProvider;
-        when(whenPath: IUrlMatcher, handler: any[]): IUrlRouterProvider;
-        when(whenPath: IUrlMatcher, toPath: string): IUrlRouterProvider;
-        when(whenPath: string, handler: Function): IUrlRouterProvider;
-        when(whenPath: string, handler: any[]): IUrlRouterProvider;
-        when(whenPath: string, toPath: string): IUrlRouterProvider;
-        otherwise(handler: Function): IUrlRouterProvider;
-        otherwise(handler: any[]): IUrlRouterProvider;
-        otherwise(path: string): IUrlRouterProvider;
-        rule(handler: Function): IUrlRouterProvider;
-        rule(handler: any[]): IUrlRouterProvider;
-        /**
-         * Disables (or enables) deferring location change interception.
-         *
-         * If you wish to customize the behavior of syncing the URL (for example, if you wish to defer a transition but maintain the current URL), call this method at configuration time. Then, at run time, call $urlRouter.listen() after you have configured your own $locationChangeSuccess event handler.
-         *
-         * @param {boolean} defer Indicates whether to defer location change interception. Passing no parameter is equivalent to true.
-         */
-        deferIntercept(defer?: boolean): void;
-    }
-
-    interface IStateOptions {
-        /**
-         * {boolean=true|string=} - If true will update the url in the location bar, if false will not. If string, must be "replace", which will update url and also replace last history record.
-         */
-        location?: boolean | string;
-        /**
-         *  {boolean=true}, If true will inherit url parameters from current url.
-         */
-        inherit?: boolean;
-        /**
-         * {object=$state.$current}, When transitioning with relative path (e.g '^'), defines which state to be relative from.
-         */
-        relative?: IState;
-        /**
-         * {boolean=true}, If true will broadcast $stateChangeStart and $stateChangeSuccess events.
-         */
-        notify?: boolean;
-        /**
-         * {boolean=false}, If true will force transition even if the state or params have not changed, aka a reload of the same state. It differs from reloadOnSearch because you'd use this when you want to force a reload when everything is the same, including search params.
-         */
-        reload?: boolean;
-    }
-
-    interface IHrefOptions {
-        lossy?: boolean;
-        inherit?: boolean;
-        relative?: IState;
-        absolute?: boolean;
-    }
-
-    interface IStateService {
-        /**
-         * Convenience method for transitioning to a new state. $state.go calls $state.transitionTo internally but automatically sets options to { location: true, inherit: true, relative: $state.$current, notify: true }. This allows you to easily use an absolute or relative to path and specify only the parameters you'd like to update (while letting unspecified parameters inherit from the currently active ancestor states).
-         *
-         * @param to Absolute state name or relative state path. Some examples:
-         *
-         * $state.go('contact.detail') - will go to the contact.detail state
-         * $state.go('^') - will go to a parent state
-         * $state.go('^.sibling') - will go to a sibling state
-         * $state.go('.child.grandchild') - will go to grandchild state
-         *
-         * @param params A map of the parameters that will be sent to the state, will populate $stateParams. Any parameters that are not specified will be inherited from currently defined parameters. This allows, for example, going to a sibling state that shares parameters specified in a parent state. Parameter inheritance only works between common ancestor states, I.e. transitioning to a sibling will get you the parameters for all parents, transitioning to a child will get you all current parameters, etc.
-         *
-         * @param options Options object.
-         */
-        go(to: string, params?: {}, options?: IStateOptions): angular.IPromise<any>;
-        go(to: IState, params?: {}, options?: IStateOptions): angular.IPromise<any>;
-        transitionTo(state: string, params?: {}, updateLocation?: boolean): angular.IPromise<any>;
-        transitionTo(state: IState, params?: {}, updateLocation?: boolean): angular.IPromise<any>;
-        transitionTo(state: string, params?: {}, options?: IStateOptions): angular.IPromise<any>;
-        transitionTo(state: IState, params?: {}, options?: IStateOptions): angular.IPromise<any>;
-        includes(state: string, params?: {}): boolean;
-        includes(state: string, params?: {}, options?:any): boolean;
-        is(state:string, params?: {}): boolean;
-        is(state: IState, params?: {}): boolean;
-        href(state: IState, params?: {}, options?: IHrefOptions): string;
-        href(state: string, params?: {}, options?: IHrefOptions): string;
-        get(state: string, context?: string): IState;
-        get(state: IState, context?: string): IState;
-        get(state: string, context?: IState): IState;
-        get(state: IState, context?: IState): IState;
-        get(): IState[];
-        /** A reference to the state's config object. However you passed it in. Useful for accessing custom data. */
-        current: IState;
-        /** A param object, e.g. {sectionId: section.id)}, that you'd like to test against the current active state. */
-        params: IStateParamsService;
-        reload(): angular.IPromise<any>;
-
-        /** Currently pending transition. A promise that'll resolve or reject. */
-        transition: angular.IPromise<{}>;
-
-        $current: IResolvedState;
-    }
-
-    interface IResolvedState {
-        locals: {
-            /**
-             * Currently resolved "resolve" values from the current state
-             */
-            globals: { [key: string]: any; };
-        };
-    }
-
-    interface IStateParamsService {
-        [key: string]: any;
-    }
-
-    interface IUrlRouterService {
-    	/*
-    	 * Triggers an update; the same update that happens when the address bar
-    	 * url changes, aka $locationChangeSuccess.
-    	 *
-    	 * This method is useful when you need to use preventDefault() on the
-    	 * $locationChangeSuccess event, perform some custom logic (route protection,
-    	 * auth, config, redirection, etc) and then finally proceed with the transition
-    	 * by calling $urlRouter.sync().
-    	 *
-    	 */
-        sync(): void;
-        listen(): Function;
-        href(urlMatcher: IUrlMatcher, params?: IStateParamsService, options?: IHrefOptions): string;
-        update(read?: boolean): void;
-        push(urlMatcher: IUrlMatcher, params?: IStateParamsService, options?: IHrefOptions): void;
-    }
-
-    interface IUiViewScrollProvider {
-        /*
-         * Reverts back to using the core $anchorScroll service for scrolling
-         * based on the url anchor.
-         */
-        useAnchorScroll(): void;
-    }
-
-    interface IType {
-        /**
-         * Converts a parameter value (from URL string or transition param) to a custom/native value.
-         *
-         * @param val {string} The URL parameter value to decode.
-         * @param key {string} The name of the parameter in which val is stored. Can be used for meta-programming of Type objects.
-         *
-         * @returns {any} Returns a custom representation of the URL parameter value.
-         */
-        decode(val: string, key: string): any;
-        /**
-         * Encodes a custom/native type value to a string that can be embedded in a URL. Note that the return value does not need to be URL-safe (i.e. passed through encodeURIComponent()), it only needs to be a representation of val that has been coerced to a string.
-         *
-         * @param val {any} The value to encode.
-         * @param key {string} The name of the parameter in which val is stored. Can be used for meta-programming of Type objects.
-         *
-         * @returns {string} Returns a string representation of val that can be encoded in a URL.
-         */
-        encode(val: any, key: string): string;
-        /**
-         * Determines whether two decoded values are equivalent.
-         *
-         * @param a {any} A value to compare against.
-         * @param b {any} A value to compare against.
-         *
-         * @returns {boolean} Returns true if the values are equivalent/equal, otherwise false.
-         */
-        equals? (a: any, b: any): boolean;
-        /**
-         * Detects whether a value is of a particular type. Accepts a native (decoded) value and determines whether it matches the current Type object.
-         *
-         * @param val {any} The value to check.
-         * @param key {any} Optional. If the type check is happening in the context of a specific UrlMatcher object, this is the name of the parameter in which val is stored. Can be used for meta-programming of Type objects.
-         *
-         * @returns {boolean} Returns true if the value matches the type, otherwise false.
-         */
-        is(val: any, key: string): boolean;
-        /**
-         * The regular expression pattern used to match values of this type when coming from a substring of a URL.
-         */
-        pattern?: RegExp;
-    }
-}
diff --git a/angular-ui-router/index.d.ts b/angular-ui-router/index.d.ts
new file mode 100644
index 0000000000..7d36968165
--- /dev/null
+++ b/angular-ui-router/index.d.ts
@@ -0,0 +1,370 @@
+// Type definitions for Angular JS 1.1.5+ (ui.router module)
+// Project: https://github.com/angular-ui/ui-router
+// Definitions by: Michel Salib <https://github.com/michelsalib>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as angular from 'angularjs';
+
+// Support for AMD require and CommonJS
+// Since angular-ui-router adds providers for a bunch of
+// injectable dependencies, it doesn't really return any
+// actual data except the plain string 'ui.router'.
+//
+// As such, I don't think anybody will ever use the actual
+// default value of the module.  So I've only included the
+// the types. (@xogeny)
+export type IState = angular.ui.IState;
+export type IStateProvider = angular.ui.IStateProvider;
+export type IUrlMatcher = angular.ui.IUrlMatcher;
+export type IUrlRouterProvider = angular.ui.IUrlRouterProvider;
+export type IStateOptions = angular.ui.IStateOptions;
+export type IHrefOptions = angular.ui.IHrefOptions;
+export type IStateService = angular.ui.IStateService;
+export type IResolvedState = angular.ui.IResolvedState;
+export type IStateParamsService = angular.ui.IStateParamsService;
+export type IUrlRouterService = angular.ui.IUrlRouterService;
+export type IUiViewScrollProvider = angular.ui.IUiViewScrollProvider;
+export type IType = angular.ui.IType;
+
+declare module 'angularjs' {
+    export namespace ui {
+        interface IState {
+            name?: string;
+            /**
+             * String HTML content, or function that returns an HTML string
+             */
+            template?: string | {(): string};
+            /**
+             * String URL path to template file OR Function, returns URL path string
+             */
+            templateUrl?: string | {(params: IStateParamsService): string};
+            /**
+             * Function, returns HTML content string
+             */
+            templateProvider?: Function | Array<string|Function>;
+            /**
+             * A controller paired to the state. Function, annotated array or name as String
+             */
+            controller?: Function|string|Array<string|Function>;
+            controllerAs?: string;
+            /**
+             * Function (injectable), returns the actual controller function or string.
+             */
+            controllerProvider?: Function|Array<string|Function>;
+
+            /**
+             * Specifies the parent state of this state
+             */
+            parent?: string | IState;
+
+
+            resolve?: { [name:string]: any };
+            /**
+             * A url with optional parameters. When a state is navigated or transitioned to, the $stateParams service will be populated with any parameters that were passed.
+             */
+            url?: string | IUrlMatcher;
+            /**
+             * A map which optionally configures parameters declared in the url, or defines additional non-url parameters. Only use this within a state if you are not using url. Otherwise you can specify your parameters within the url. When a state is navigated or transitioned to, the $stateParams service will be populated with any parameters that were passed.
+             */
+            params?: any;
+            /**
+             * Use the views property to set up multiple views. If you don't need multiple views within a single state this property is not needed. Tip: remember that often nested views are more useful and powerful than multiple sibling views.
+             */
+            views?: { [name:string]: IState };
+            abstract?: boolean;
+            /**
+             * Callback function for when a state is entered. Good way to trigger an action or dispatch an event, such as opening a dialog.
+             * If minifying your scripts, make sure to explicitly annotate this function, because it won't be automatically annotated by your build tools.
+             */
+            onEnter?: Function|Array<string|Function>;
+            /**
+             * Callback functions for when a state is entered and exited. Good way to trigger an action or dispatch an event, such as opening a dialog.
+             * If minifying your scripts, make sure to explicitly annotate this function, because it won't be automatically annotated by your build tools.
+             */
+            onExit?: Function|Array<string|Function>;
+            /**
+             * Arbitrary data object, useful for custom configuration.
+             */
+            data?: any;
+
+            /**
+             * Boolean (default true). If false will not re-trigger the same state just because a search/query parameter has changed. Useful for when you'd like to modify $location.search() without triggering a reload.
+             */
+            reloadOnSearch?: boolean;
+
+            /**
+             * Boolean (default true). If false will reload state on everytransitions. Useful for when you'd like to restore all data  to its initial state.
+             */
+            cache?: boolean;
+        }
+
+        interface IUnfoundState {
+            to: string,
+            toParams: {},
+            options: IStateOptions
+        }
+        
+        interface IStateProvider extends angular.IServiceProvider {
+            state(name:string, config:IState): IStateProvider;
+            state(config:IState): IStateProvider;
+            decorator(name?: string, decorator?: (state: IState, parent: Function) => any): any;
+        }
+
+        interface IUrlMatcher {
+            concat(pattern: string): IUrlMatcher;
+            exec(path: string, searchParams: {}): {};
+            parameters(): string[];
+            format(values: {}): string;
+        }
+
+        interface IUrlMatcherFactory {
+            /**
+             * Creates a UrlMatcher for the specified pattern.
+             *
+             * @param pattern {string} The URL pattern.
+             *
+             * @returns {IUrlMatcher} The UrlMatcher.
+             */
+            compile(pattern: string): IUrlMatcher;
+            /**
+             * Returns true if the specified object is a UrlMatcher, or false otherwise.
+             *
+             * @param o {any} The object to perform the type check against.
+             *
+             * @returns {boolean} Returns true if the object matches the IUrlMatcher interface, by implementing all the same methods.
+             */
+            isMatcher(o: any): boolean;
+            /**
+             * Returns a type definition for the specified name
+             *
+             * @param name {string} The type definition name
+             *
+             * @returns {IType} The type definition
+             */
+            type(name: string): IType;
+            /**
+             * Registers a custom Type object that can be used to generate URLs with typed parameters.
+             *
+             * @param {IType} definition The type definition.
+             * @param {any[]} inlineAnnotedDefinitionFn A function that is injected before the app runtime starts. The result of this function is merged into the existing definition.
+             *
+             * @returns {IUrlMatcherFactory} Returns $urlMatcherFactoryProvider.
+             */
+            type(name: string, definition: IType, inlineAnnotedDefinitionFn?: any[]): IUrlMatcherFactory;
+            /**
+             * Registers a custom Type object that can be used to generate URLs with typed parameters.
+             *
+             * @param {IType} definition The type definition.
+             * @param {any[]} inlineAnnotedDefinitionFn A function that is injected before the app runtime starts. The result of this function is merged into the existing definition.
+             *
+             * @returns {IUrlMatcherFactory} Returns $urlMatcherFactoryProvider.
+             */
+            type(name: string, definition: IType, definitionFn?: (...args:any[]) => IType): IUrlMatcherFactory;
+            /**
+             * Defines whether URL matching should be case sensitive (the default behavior), or not.
+             *
+             * @param value {boolean} false to match URL in a case sensitive manner; otherwise true;
+             *
+             * @returns {boolean} the current value of caseInsensitive
+             */
+            caseInsensitive(value?: boolean): boolean;
+            /**
+             * Sets the default behavior when generating or matching URLs with default parameter values
+             *
+             * @param value {string} A string that defines the default parameter URL squashing behavior. nosquash: When generating an href with a default parameter value, do not squash the parameter value from the URL slash: When generating an href with a default parameter value, squash (remove) the parameter value, and, if the parameter is surrounded by slashes, squash (remove) one slash from the URL any other string, e.g. "~": When generating an href with a default parameter value, squash (remove) the parameter value from the URL and replace it with this string.
+             */
+            defaultSquashPolicy(value: string): void;
+            /**
+             * Defines whether URLs should match trailing slashes, or not (the default behavior).
+             *
+             * @param value {boolean} false to match trailing slashes in URLs, otherwise true.
+             *
+             * @returns {boolean} the current value of strictMode
+             */
+            strictMode(value?: boolean): boolean;
+        }
+
+        interface IUrlRouterProvider extends angular.IServiceProvider {
+            when(whenPath: RegExp, handler: Function): IUrlRouterProvider;
+            when(whenPath: RegExp, handler: any[]): IUrlRouterProvider;
+            when(whenPath: RegExp, toPath: string): IUrlRouterProvider;
+            when(whenPath: IUrlMatcher, hanlder: Function): IUrlRouterProvider;
+            when(whenPath: IUrlMatcher, handler: any[]): IUrlRouterProvider;
+            when(whenPath: IUrlMatcher, toPath: string): IUrlRouterProvider;
+            when(whenPath: string, handler: Function): IUrlRouterProvider;
+            when(whenPath: string, handler: any[]): IUrlRouterProvider;
+            when(whenPath: string, toPath: string): IUrlRouterProvider;
+            otherwise(handler: Function): IUrlRouterProvider;
+            otherwise(handler: any[]): IUrlRouterProvider;
+            otherwise(path: string): IUrlRouterProvider;
+            rule(handler: Function): IUrlRouterProvider;
+            rule(handler: any[]): IUrlRouterProvider;
+            /**
+             * Disables (or enables) deferring location change interception.
+             *
+             * If you wish to customize the behavior of syncing the URL (for example, if you wish to defer a transition but maintain the current URL), call this method at configuration time. Then, at run time, call $urlRouter.listen() after you have configured your own $locationChangeSuccess event handler.
+             *
+             * @param {boolean} defer Indicates whether to defer location change interception. Passing no parameter is equivalent to true.
+             */
+            deferIntercept(defer?: boolean): void;
+        }
+
+        interface IStateOptions {
+            /**
+             * {boolean=true|string=} - If true will update the url in the location bar, if false will not. If string, must be "replace", which will update url and also replace last history record.
+             */
+            location?: boolean | string;
+            /**
+             *  {boolean=true}, If true will inherit url parameters from current url.
+             */
+            inherit?: boolean;
+            /**
+             * {object=$state.$current}, When transitioning with relative path (e.g '^'), defines which state to be relative from.
+             */
+            relative?: IState;
+            /**
+             * {boolean=true}, If true will broadcast $stateChangeStart and $stateChangeSuccess events.
+             */
+            notify?: boolean;
+            /**
+             * {boolean=false}, If true will force transition even if the state or params have not changed, aka a reload of the same state. It differs from reloadOnSearch because you'd use this when you want to force a reload when everything is the same, including search params.
+             */
+            reload?: boolean;
+        }
+
+        interface IHrefOptions {
+            lossy?: boolean;
+            inherit?: boolean;
+            relative?: IState;
+            absolute?: boolean;
+        }
+
+        interface IStateService {
+            /**
+             * Convenience method for transitioning to a new state. $state.go calls $state.transitionTo internally but automatically sets options to { location: true, inherit: true, relative: $state.$current, notify: true }. This allows you to easily use an absolute or relative to path and specify only the parameters you'd like to update (while letting unspecified parameters inherit from the currently active ancestor states).
+             *
+             * @param to Absolute state name or relative state path. Some examples:
+             *
+             * $state.go('contact.detail') - will go to the contact.detail state
+             * $state.go('^') - will go to a parent state
+             * $state.go('^.sibling') - will go to a sibling state
+             * $state.go('.child.grandchild') - will go to grandchild state
+             *
+             * @param params A map of the parameters that will be sent to the state, will populate $stateParams. Any parameters that are not specified will be inherited from currently defined parameters. This allows, for example, going to a sibling state that shares parameters specified in a parent state. Parameter inheritance only works between common ancestor states, I.e. transitioning to a sibling will get you the parameters for all parents, transitioning to a child will get you all current parameters, etc.
+             *
+             * @param options Options object.
+             */
+            go(to: string, params?: {}, options?: IStateOptions): angular.IPromise<any>;
+            go(to: IState, params?: {}, options?: IStateOptions): angular.IPromise<any>;
+            transitionTo(state: string, params?: {}, updateLocation?: boolean): angular.IPromise<any>;
+            transitionTo(state: IState, params?: {}, updateLocation?: boolean): angular.IPromise<any>;
+            transitionTo(state: string, params?: {}, options?: IStateOptions): angular.IPromise<any>;
+            transitionTo(state: IState, params?: {}, options?: IStateOptions): angular.IPromise<any>;
+            includes(state: string, params?: {}): boolean;
+            includes(state: string, params?: {}, options?:any): boolean;
+            is(state:string, params?: {}): boolean;
+            is(state: IState, params?: {}): boolean;
+            href(state: IState, params?: {}, options?: IHrefOptions): string;
+            href(state: string, params?: {}, options?: IHrefOptions): string;
+            get(state: string, context?: string): IState;
+            get(state: IState, context?: string): IState;
+            get(state: string, context?: IState): IState;
+            get(state: IState, context?: IState): IState;
+            get(): IState[];
+            /** A reference to the state's config object. However you passed it in. Useful for accessing custom data. */
+            current: IState;
+            /** A param object, e.g. {sectionId: section.id)}, that you'd like to test against the current active state. */
+            params: IStateParamsService;
+            reload(): angular.IPromise<any>;
+
+            /** Currently pending transition. A promise that'll resolve or reject. */
+            transition: angular.IPromise<{}>;
+
+            $current: IResolvedState;
+        }
+
+        interface IResolvedState {
+            locals: {
+                /**
+                 * Currently resolved "resolve" values from the current state
+                 */
+                globals: { [key: string]: any; };
+            };
+        }
+
+        interface IStateParamsService {
+            [key: string]: any;
+        }
+
+        interface IUrlRouterService {
+            /*
+             * Triggers an update; the same update that happens when the address bar
+             * url changes, aka $locationChangeSuccess.
+             *
+             * This method is useful when you need to use preventDefault() on the
+             * $locationChangeSuccess event, perform some custom logic (route protection,
+             * auth, config, redirection, etc) and then finally proceed with the transition
+             * by calling $urlRouter.sync().
+             *
+             */
+            sync(): void;
+            listen(): Function;
+            href(urlMatcher: IUrlMatcher, params?: IStateParamsService, options?: IHrefOptions): string;
+            update(read?: boolean): void;
+            push(urlMatcher: IUrlMatcher, params?: IStateParamsService, options?: IHrefOptions): void;
+        }
+
+        interface IUiViewScrollProvider {
+            /*
+             * Reverts back to using the core $anchorScroll service for scrolling
+             * based on the url anchor.
+             */
+            useAnchorScroll(): void;
+        }
+
+        interface IType {
+            /**
+             * Converts a parameter value (from URL string or transition param) to a custom/native value.
+             *
+             * @param val {string} The URL parameter value to decode.
+             * @param key {string} The name of the parameter in which val is stored. Can be used for meta-programming of Type objects.
+             *
+             * @returns {any} Returns a custom representation of the URL parameter value.
+             */
+            decode(val: string, key: string): any;
+            /**
+             * Encodes a custom/native type value to a string that can be embedded in a URL. Note that the return value does not need to be URL-safe (i.e. passed through encodeURIComponent()), it only needs to be a representation of val that has been coerced to a string.
+             *
+             * @param val {any} The value to encode.
+             * @param key {string} The name of the parameter in which val is stored. Can be used for meta-programming of Type objects.
+             *
+             * @returns {string} Returns a string representation of val that can be encoded in a URL.
+             */
+            encode(val: any, key: string): string;
+            /**
+             * Determines whether two decoded values are equivalent.
+             *
+             * @param a {any} A value to compare against.
+             * @param b {any} A value to compare against.
+             *
+             * @returns {boolean} Returns true if the values are equivalent/equal, otherwise false.
+             */
+            equals? (a: any, b: any): boolean;
+            /**
+             * Detects whether a value is of a particular type. Accepts a native (decoded) value and determines whether it matches the current Type object.
+             *
+             * @param val {any} The value to check.
+             * @param key {any} Optional. If the type check is happening in the context of a specific UrlMatcher object, this is the name of the parameter in which val is stored. Can be used for meta-programming of Type objects.
+             *
+             * @returns {boolean} Returns true if the value matches the type, otherwise false.
+             */
+            is(val: any, key: string): boolean;
+            /**
+             * The regular expression pattern used to match values of this type when coming from a substring of a URL.
+             */
+            pattern?: RegExp;
+        }
+    }
+
+}
+
diff --git a/angular-ui-router/tsconfig.json b/angular-ui-router/tsconfig.json
new file mode 100644
index 0000000000..a09480fa34
--- /dev/null
+++ b/angular-ui-router/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-ui-router-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-ui-scroll/angular-ui-scroll-tests.ts b/angular-ui-scroll/angular-ui-scroll-tests.ts
index 528d39e552..e226b664bc 100644
--- a/angular-ui-scroll/angular-ui-scroll-tests.ts
+++ b/angular-ui-scroll/angular-ui-scroll-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-ui-scroll.d.ts" />
+
 var myApp = angular.module('application', ['ui.scroll', 'ui.scroll.jqlite']);
 
 namespace application {
diff --git a/angular-ui-scroll/angular-ui-scroll.d.ts b/angular-ui-scroll/angular-ui-scroll.d.ts
deleted file mode 100644
index 168c6ba271..0000000000
--- a/angular-ui-scroll/angular-ui-scroll.d.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-// Type definitions for Angular JS 1.3.1+ (ui.scroll module)
-// Project: https://github.com/angular-ui/ui-scroll
-// Definitions by: Mark Nadig <https://github.com/marknadig>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace angular.ui {
-    interface IScrollDatasource<T> {
-        /**
-         * The datasource object implements methods and properties to be used by the directive to access the data
-         *
-         * @param index indicates the first data row requested
-         *
-         * @param count indicates number of data rows requested
-         *
-         * @param success function to call when the data are retrieved. The implementation of the service has to call
-         * this function when the data are retrieved and pass it an array of the items retrieved. If no items are
-         * retrieved, an empty array has to be passed.
-         *
-         * Important: Make sure to respect the index and count parameters of the request. The array passed to the
-         * success method should have exactly count elements unless it hit eof/bof
-         */
-        get(index: number, count: number, success: (results: Array<T>) => any): void;
-    }
-
-    interface IScrollAdapter {
-        /**
-         * a boolean value indicating whether there are any pending load requests.
-         */
-        isLoading: boolean;
-        /**
-         * a reference to the item currently in the topmost visible position.
-         */
-        topVisible: any;
-        /**
-         * a reference to the DOM element currently in the topmost visible position.
-         */
-        topVisibleElement: ng.IAugmentedJQueryStatic;
-        /**
-         * a reference to the scope created for the item currently in the topmost visible position.
-         */
-        topVisibleScope: ng.IRepeatScope;
-        /**
-         * calling this method reinitializes and reloads the scroller content.
-         */
-        reload(): void;
-        /**
-         * Replaces the item in the buffer at the given index with the new items.
-         *
-         * @param index provides position of the item to be affected in the dataset (not in the buffer). If the item with
-         * the given index currently is not in the buffer no updates will be applied. $index property of the item $scope
-         * can be used to access the index value for a given item
-         *
-         * @param newItems is an array of items to replace the affected item. If the array is empty ([]) the item will
-         * be deleted, otherwise the items in the array replace the item. If the newItem array contains the old item,
-         * the old item stays in place.
-         */
-        applyUpdates(index: number, newItems: any[]): void;
-        /**
-         * Replaces the item in the buffer at the given index with the new items.
-         *
-         * @param updater is a function to be applied to every item currently in the buffer. The function will receive
-         * 3 parameters: item, scope, and element. Here item is the item to be affected, scope is the item $scope, and
-         * element is the html element for the item. The return value of the function should be an array of items.
-         * Similarly to the newItem parameter (see above), if the array is empty([]), the item is deleted, otherwise
-         * the item is replaced by the items in the array. If the return value is not an array, the item remains
-         * unaffected, unless some updates were made to the item in the updater function. This can be thought of as
-         * in place update.
-         */
-        applyUpdates(updater: (item: any, scope: ng.IRepeatScope) => any): void;
-        /**
-         * Adds new items after the last item in the buffer
-         *
-         * @param newItems provides an array of items to be appended.
-         */
-        append(newItems: any[]): void;
-        /**
-         * Adds new items before the first item in the buffer
-         *
-         * @param newItems provides an array of items to be prepended.
-         */
-        prepend(newItems: any[]): void;
-    }
-}
diff --git a/angular-ui-scroll/index.d.ts b/angular-ui-scroll/index.d.ts
new file mode 100644
index 0000000000..e8a04c4eeb
--- /dev/null
+++ b/angular-ui-scroll/index.d.ts
@@ -0,0 +1,85 @@
+// Type definitions for Angular JS 1.3.1+ (ui.scroll module)
+// Project: https://github.com/angular-ui/ui-scroll
+// Definitions by: Mark Nadig <https://github.com/marknadig>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare namespace angular.ui {
+    interface IScrollDatasource<T> {
+        /**
+         * The datasource object implements methods and properties to be used by the directive to access the data
+         *
+         * @param index indicates the first data row requested
+         *
+         * @param count indicates number of data rows requested
+         *
+         * @param success function to call when the data are retrieved. The implementation of the service has to call
+         * this function when the data are retrieved and pass it an array of the items retrieved. If no items are
+         * retrieved, an empty array has to be passed.
+         *
+         * Important: Make sure to respect the index and count parameters of the request. The array passed to the
+         * success method should have exactly count elements unless it hit eof/bof
+         */
+        get(index: number, count: number, success: (results: Array<T>) => any): void;
+    }
+
+    interface IScrollAdapter {
+        /**
+         * a boolean value indicating whether there are any pending load requests.
+         */
+        isLoading: boolean;
+        /**
+         * a reference to the item currently in the topmost visible position.
+         */
+        topVisible: any;
+        /**
+         * a reference to the DOM element currently in the topmost visible position.
+         */
+        topVisibleElement: ng.IAugmentedJQueryStatic;
+        /**
+         * a reference to the scope created for the item currently in the topmost visible position.
+         */
+        topVisibleScope: ng.IRepeatScope;
+        /**
+         * calling this method reinitializes and reloads the scroller content.
+         */
+        reload(): void;
+        /**
+         * Replaces the item in the buffer at the given index with the new items.
+         *
+         * @param index provides position of the item to be affected in the dataset (not in the buffer). If the item with
+         * the given index currently is not in the buffer no updates will be applied. $index property of the item $scope
+         * can be used to access the index value for a given item
+         *
+         * @param newItems is an array of items to replace the affected item. If the array is empty ([]) the item will
+         * be deleted, otherwise the items in the array replace the item. If the newItem array contains the old item,
+         * the old item stays in place.
+         */
+        applyUpdates(index: number, newItems: any[]): void;
+        /**
+         * Replaces the item in the buffer at the given index with the new items.
+         *
+         * @param updater is a function to be applied to every item currently in the buffer. The function will receive
+         * 3 parameters: item, scope, and element. Here item is the item to be affected, scope is the item $scope, and
+         * element is the html element for the item. The return value of the function should be an array of items.
+         * Similarly to the newItem parameter (see above), if the array is empty([]), the item is deleted, otherwise
+         * the item is replaced by the items in the array. If the return value is not an array, the item remains
+         * unaffected, unless some updates were made to the item in the updater function. This can be thought of as
+         * in place update.
+         */
+        applyUpdates(updater: (item: any, scope: ng.IRepeatScope) => any): void;
+        /**
+         * Adds new items after the last item in the buffer
+         *
+         * @param newItems provides an array of items to be appended.
+         */
+        append(newItems: any[]): void;
+        /**
+         * Adds new items before the first item in the buffer
+         *
+         * @param newItems provides an array of items to be prepended.
+         */
+        prepend(newItems: any[]): void;
+    }
+}
diff --git a/angular-ui-scroll/tsconfig.json b/angular-ui-scroll/tsconfig.json
new file mode 100644
index 0000000000..259649411d
--- /dev/null
+++ b/angular-ui-scroll/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-ui-scroll-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-ui-sortable/angular-ui-sortable-tests.ts b/angular-ui-sortable/angular-ui-sortable-tests.ts
index 836dc71e9a..70a2745289 100644
--- a/angular-ui-sortable/angular-ui-sortable-tests.ts
+++ b/angular-ui-sortable/angular-ui-sortable-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="angular-ui-sortable.d.ts" />
+/// <reference types="angularjs" />
+
 
 var myApp = angular.module('testModule');
 
diff --git a/angular-ui-sortable/angular-ui-sortable.d.ts b/angular-ui-sortable/angular-ui-sortable.d.ts
deleted file mode 100644
index ac3ac89fc7..0000000000
--- a/angular-ui-sortable/angular-ui-sortable.d.ts
+++ /dev/null
@@ -1,210 +0,0 @@
-// Type definitions for angular.ui.sortable module v0.13+
-// Project: https://github.com/angular-ui/ui-sortable
-// Definitions by: Thodoris Greasidis <https://github.com/thgreasi>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace angular.ui {
-
-    interface UISortableOptions<T> extends SortableOptions<T> {
-        'ui-floating'?: string|boolean;
-    }
-
-    interface UISortableProperties<T> {
-        /**
-         * Holds the index of the drop target that the dragged item was dropped.
-         */
-        dropindex: number;
-
-        /**
-         * Holds the ui-sortable element that the dragged item was dropped on.
-         */
-        droptarget: number;
-
-        /**
-         * Holds the array that is specified by the `ng-model` attribute of the [`droptarget`](#droptarget) ui-sortable element.
-         */
-        droptargetModel: Array<T>;
-
-        /**
-         * Holds the original index of the item dragged.
-         */
-        index: number;
-
-        /**
-         * Holds the JavaScript object that is used as the model of the dragged item, as specified by the ng-repeat of the [`source`](#source) ui-sortable element and the item's [`index`](#index).
-         */
-        model: T;
-
-        /**
-         * Holds the model of the dragged item only when a sorting happens between two connected ui-sortable elements.
-         * In other words: `'moved' in ui.item.sortable` will return false only when a sorting is withing the same ui-sortable element ([`source`](#source) equals to the [`droptarget`](#droptarget)).
-         */
-        moved?: T;
-
-        /**
-         * When sorting between two connected sortables, it will be set to true inside the `update` callback of the [`droptarget`](#droptarget).
-         */
-        received: Boolean;
-
-        /**
-         * Holds the ui-sortable element that the dragged item originated from.
-         */
-        source: ng.IAugmentedJQuery
-
-        /**
-         * Holds the array that is specified by the `ng-model` of the [`source`](#source) ui-sortable element.
-         */
-        sourceModel: Array<T>;
-
-        /**
-         * Can be called inside the `update` callback, in order to prevent/revert a sorting.
-         * Should be used instead of the [jquery-ui-sortable cancel()](http://api.jqueryui.com/sortable/#method-cancel) method.
-         */
-        cancel(): void;
-
-        /**
-         * Returns whether the current sorting is marked as canceled, by an earlier call to [`ui.item.sortable.cancel()`](#cancel).
-         */
-        isCanceled(): Boolean;
-
-        /**
-         * Returns whether the [`helper`](http://api.jqueryui.com/sortable/#option-helper) element used for the current sorting, is one of the original ui-sortable list elements.
-         */
-        isCustomHelperUsed(): Boolean;
-    }
-
-    interface UISortableUIItem<T> extends ng.IAugmentedJQuery {
-        sortable: UISortableProperties<T>;
-    }
-
-    interface UISortableUIParams<T> extends SortableUIParams {
-        item: UISortableUIItem<T>;
-    }
-
-    // Base Sortable //////////////////////////////////////////////////
-
-    interface SortableCursorAtOptions {
-        top?: number;
-        left?: number;
-        right?: number;
-        bottom?: number;
-    }
-
-    interface SortableHelperFunctionOption {
-        (event: JQueryEventObject, ui: ng.IAugmentedJQuery): JQuery;
-    }
-
-    interface SortableOptions<T> extends SortableEvents<T> {
-        /**
-         * jQuery, Element, Selector or string
-         * Default: "parent"
-         */
-        appendTo?: any;
-        /**
-         * "X", "Y" or false
-         * Default: false
-         */
-        axis?: string|boolean;
-        /**
-         * Selector
-         * Default: "input,textarea,button,select,option"
-         */
-        cancel?: string;
-        /**
-         * Selector or false
-         * Default: false
-         */
-        connectWith?: string|boolean;
-        /**
-         * Element, Selector, string or false
-         * Default: false
-         */
-        containment?: any;
-        cursor?: string;
-        /**
-         * Moves the sorting element or helper so the cursor always appears to drag from the same position. Coordinates can be given as a hash using a combination of one or two keys SortableCursorAtOptions: { top, left, right, bottom }
-         * Default: false
-         */
-        cursorAt?: SortableCursorAtOptions|boolean;
-        delay?: number;
-        disabled?: boolean;
-        distance?: number;
-        dropOnEmpty?: boolean;
-        forceHelperSize?: boolean;
-        forcePlaceholderSize?: boolean;
-        /**
-         * Array of numbers or false
-         * Default: false
-         */
-        grid?: number[]|boolean;
-        /**
-         * Selector or Element
-         */
-        handle?: any;
-        /**
-         * "original", "clone" or Function()
-         * Default: "original"
-         */
-        helper?: string|SortableHelperFunctionOption;
-        /**
-         * Selector
-         */
-        items?: string;
-        /**
-         * Number or false
-         * Default: false
-         */
-        opacity?: number|boolean;
-        /**
-         * string or false
-         * Default: false
-         */
-        placeholder?: string|boolean;
-        /**
-         * boolean or number
-         * Default: false
-         */
-        revert?: number|boolean;
-        scroll?: boolean;
-        scrollSensitivity?: number;
-        scrollSpeed?: number;
-        /**
-         * "intersect" or "pointer"
-         * Default: "intersect"
-         */
-        tolerance?: string;
-        zIndex?: number;
-    }
-
-    interface SortableUIParams {
-        helper: ng.IAugmentedJQuery;
-        item: ng.IAugmentedJQuery;
-        offset: any;
-        position: any;
-        originalPosition: any;
-        sender: ng.IAugmentedJQuery;
-        placeholder: ng.IAugmentedJQuery;
-    }
-
-    interface SortableEvent<T> {
-        (event: JQueryEventObject, ui: UISortableUIParams<T>): void;
-    }
-
-    interface SortableEvents<T> {
-        activate?: SortableEvent<T>;
-        beforeStop?: SortableEvent<T>;
-        change?: SortableEvent<T>;
-        deactivate?: SortableEvent<T>;
-        out?: SortableEvent<T>;
-        over?: SortableEvent<T>;
-        receive?: SortableEvent<T>;
-        remove?: SortableEvent<T>;
-        sort?: SortableEvent<T>;
-        start?: SortableEvent<T>;
-        stop?: SortableEvent<T>;
-        update?: SortableEvent<T>;
-    }
-
-}
diff --git a/angular-ui-sortable/index.d.ts b/angular-ui-sortable/index.d.ts
new file mode 100644
index 0000000000..1b3508143d
--- /dev/null
+++ b/angular-ui-sortable/index.d.ts
@@ -0,0 +1,210 @@
+// Type definitions for angular.ui.sortable module v0.13+
+// Project: https://github.com/angular-ui/ui-sortable
+// Definitions by: Thodoris Greasidis <https://github.com/thgreasi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare namespace angular.ui {
+
+    interface UISortableOptions<T> extends SortableOptions<T> {
+        'ui-floating'?: string|boolean;
+    }
+
+    interface UISortableProperties<T> {
+        /**
+         * Holds the index of the drop target that the dragged item was dropped.
+         */
+        dropindex: number;
+
+        /**
+         * Holds the ui-sortable element that the dragged item was dropped on.
+         */
+        droptarget: number;
+
+        /**
+         * Holds the array that is specified by the `ng-model` attribute of the [`droptarget`](#droptarget) ui-sortable element.
+         */
+        droptargetModel: Array<T>;
+
+        /**
+         * Holds the original index of the item dragged.
+         */
+        index: number;
+
+        /**
+         * Holds the JavaScript object that is used as the model of the dragged item, as specified by the ng-repeat of the [`source`](#source) ui-sortable element and the item's [`index`](#index).
+         */
+        model: T;
+
+        /**
+         * Holds the model of the dragged item only when a sorting happens between two connected ui-sortable elements.
+         * In other words: `'moved' in ui.item.sortable` will return false only when a sorting is withing the same ui-sortable element ([`source`](#source) equals to the [`droptarget`](#droptarget)).
+         */
+        moved?: T;
+
+        /**
+         * When sorting between two connected sortables, it will be set to true inside the `update` callback of the [`droptarget`](#droptarget).
+         */
+        received: Boolean;
+
+        /**
+         * Holds the ui-sortable element that the dragged item originated from.
+         */
+        source: ng.IAugmentedJQuery
+
+        /**
+         * Holds the array that is specified by the `ng-model` of the [`source`](#source) ui-sortable element.
+         */
+        sourceModel: Array<T>;
+
+        /**
+         * Can be called inside the `update` callback, in order to prevent/revert a sorting.
+         * Should be used instead of the [jquery-ui-sortable cancel()](http://api.jqueryui.com/sortable/#method-cancel) method.
+         */
+        cancel(): void;
+
+        /**
+         * Returns whether the current sorting is marked as canceled, by an earlier call to [`ui.item.sortable.cancel()`](#cancel).
+         */
+        isCanceled(): Boolean;
+
+        /**
+         * Returns whether the [`helper`](http://api.jqueryui.com/sortable/#option-helper) element used for the current sorting, is one of the original ui-sortable list elements.
+         */
+        isCustomHelperUsed(): Boolean;
+    }
+
+    interface UISortableUIItem<T> extends ng.IAugmentedJQuery {
+        sortable: UISortableProperties<T>;
+    }
+
+    interface UISortableUIParams<T> extends SortableUIParams {
+        item: UISortableUIItem<T>;
+    }
+
+    // Base Sortable //////////////////////////////////////////////////
+
+    interface SortableCursorAtOptions {
+        top?: number;
+        left?: number;
+        right?: number;
+        bottom?: number;
+    }
+
+    interface SortableHelperFunctionOption {
+        (event: JQueryEventObject, ui: ng.IAugmentedJQuery): JQuery;
+    }
+
+    interface SortableOptions<T> extends SortableEvents<T> {
+        /**
+         * jQuery, Element, Selector or string
+         * Default: "parent"
+         */
+        appendTo?: any;
+        /**
+         * "X", "Y" or false
+         * Default: false
+         */
+        axis?: string|boolean;
+        /**
+         * Selector
+         * Default: "input,textarea,button,select,option"
+         */
+        cancel?: string;
+        /**
+         * Selector or false
+         * Default: false
+         */
+        connectWith?: string|boolean;
+        /**
+         * Element, Selector, string or false
+         * Default: false
+         */
+        containment?: any;
+        cursor?: string;
+        /**
+         * Moves the sorting element or helper so the cursor always appears to drag from the same position. Coordinates can be given as a hash using a combination of one or two keys SortableCursorAtOptions: { top, left, right, bottom }
+         * Default: false
+         */
+        cursorAt?: SortableCursorAtOptions|boolean;
+        delay?: number;
+        disabled?: boolean;
+        distance?: number;
+        dropOnEmpty?: boolean;
+        forceHelperSize?: boolean;
+        forcePlaceholderSize?: boolean;
+        /**
+         * Array of numbers or false
+         * Default: false
+         */
+        grid?: number[]|boolean;
+        /**
+         * Selector or Element
+         */
+        handle?: any;
+        /**
+         * "original", "clone" or Function()
+         * Default: "original"
+         */
+        helper?: string|SortableHelperFunctionOption;
+        /**
+         * Selector
+         */
+        items?: string;
+        /**
+         * Number or false
+         * Default: false
+         */
+        opacity?: number|boolean;
+        /**
+         * string or false
+         * Default: false
+         */
+        placeholder?: string|boolean;
+        /**
+         * boolean or number
+         * Default: false
+         */
+        revert?: number|boolean;
+        scroll?: boolean;
+        scrollSensitivity?: number;
+        scrollSpeed?: number;
+        /**
+         * "intersect" or "pointer"
+         * Default: "intersect"
+         */
+        tolerance?: string;
+        zIndex?: number;
+    }
+
+    interface SortableUIParams {
+        helper: ng.IAugmentedJQuery;
+        item: ng.IAugmentedJQuery;
+        offset: any;
+        position: any;
+        originalPosition: any;
+        sender: ng.IAugmentedJQuery;
+        placeholder: ng.IAugmentedJQuery;
+    }
+
+    interface SortableEvent<T> {
+        (event: JQueryEventObject, ui: UISortableUIParams<T>): void;
+    }
+
+    interface SortableEvents<T> {
+        activate?: SortableEvent<T>;
+        beforeStop?: SortableEvent<T>;
+        change?: SortableEvent<T>;
+        deactivate?: SortableEvent<T>;
+        out?: SortableEvent<T>;
+        over?: SortableEvent<T>;
+        receive?: SortableEvent<T>;
+        remove?: SortableEvent<T>;
+        sort?: SortableEvent<T>;
+        start?: SortableEvent<T>;
+        stop?: SortableEvent<T>;
+        update?: SortableEvent<T>;
+    }
+
+}
diff --git a/angular-ui-sortable/tsconfig.json b/angular-ui-sortable/tsconfig.json
new file mode 100644
index 0000000000..56343d3c56
--- /dev/null
+++ b/angular-ui-sortable/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-ui-sortable-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-ui-tree/angular-ui-tree-tests.ts b/angular-ui-tree/angular-ui-tree-tests.ts
index 718fada2ce..d3c1bad2cb 100644
--- a/angular-ui-tree/angular-ui-tree-tests.ts
+++ b/angular-ui-tree/angular-ui-tree-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-ui-tree.d.ts" />
+
 
 var treeNode: AngularUITree.ITreeNode = {
     id: 0,
diff --git a/angular-ui-tree/angular-ui-tree.d.ts b/angular-ui-tree/angular-ui-tree.d.ts
deleted file mode 100644
index 66909cf90f..0000000000
--- a/angular-ui-tree/angular-ui-tree.d.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-// Type definitions for angular-ui-tree v2.8.0
-// Project: https://github.com/angular-ui-tree/angular-ui-tree
-// Definitions by: Calvin Fernandez <https://github.com/CalvinFernandez>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path='../angularjs/angular.d.ts' />
-
-declare namespace AngularUITree {
-    interface IEventSourceInfo {
-        cloneModel: any;
-        index: number;
-        nodeScope: ITreeNodeScope;
-        nodesScope: ITreeNodeScope;
-    }
-
-    interface IPosition {
-        dirAx: number;
-        dirX: number;
-        dirY: number;
-        distAxX: number;
-        distAxY: number;
-        distX: number;
-        distY: number;
-        lastDirX: number;
-        lastDirY: number;
-        lastX: number;
-        lastY: number;
-        moving: boolean;
-        nowX: number;
-        nowY: number;
-        offsetX: number;
-        offsetY: number;
-        startX: number;
-        startY: number;
-    }
-
-    interface IEventInfo {
-        dest: {
-            index: number;
-            nodesScope: IParentTreeNodeScope;
-        };
-        elements: any;
-        pos: IPosition;
-        source: IEventSourceInfo;
-    }
-
-    interface IAcceptCallback {
-        (source: ITreeNodeScope, destination: ITreeNodeScope, destinationIndex: number): boolean;
-    }
-
-    interface IDroppedCallback {
-        (eventInfo: IEventInfo): void;
-    }
-
-    interface ICallbacks {
-        accept: IAcceptCallback;
-        dragStart: IDroppedCallback;
-        dropped: IDroppedCallback;
-    }
-
-    /**
-     * Internal representation of node in the UI
-     */
-    interface ITreeNodeScope extends ng.IScope {
-        node: ITreeNode;
-    }
-
-    interface IParentTreeNodeScope extends ITreeNodeScope {
-        isParent(nodeScope: ITreeNodeScope): boolean;
-    }
-
-    /**
-      * Node in list
-      */
-    interface ITreeNode {
-        id: number | string;
-        nodes: ITreeNode[];
-        title: string;
-    }
-}
diff --git a/angular-ui-tree/index.d.ts b/angular-ui-tree/index.d.ts
new file mode 100644
index 0000000000..1cededaa53
--- /dev/null
+++ b/angular-ui-tree/index.d.ts
@@ -0,0 +1,80 @@
+// Type definitions for angular-ui-tree v2.8.0
+// Project: https://github.com/angular-ui-tree/angular-ui-tree
+// Definitions by: Calvin Fernandez <https://github.com/CalvinFernandez>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare namespace AngularUITree {
+    interface IEventSourceInfo {
+        cloneModel: any;
+        index: number;
+        nodeScope: ITreeNodeScope;
+        nodesScope: ITreeNodeScope;
+    }
+
+    interface IPosition {
+        dirAx: number;
+        dirX: number;
+        dirY: number;
+        distAxX: number;
+        distAxY: number;
+        distX: number;
+        distY: number;
+        lastDirX: number;
+        lastDirY: number;
+        lastX: number;
+        lastY: number;
+        moving: boolean;
+        nowX: number;
+        nowY: number;
+        offsetX: number;
+        offsetY: number;
+        startX: number;
+        startY: number;
+    }
+
+    interface IEventInfo {
+        dest: {
+            index: number;
+            nodesScope: IParentTreeNodeScope;
+        };
+        elements: any;
+        pos: IPosition;
+        source: IEventSourceInfo;
+    }
+
+    interface IAcceptCallback {
+        (source: ITreeNodeScope, destination: ITreeNodeScope, destinationIndex: number): boolean;
+    }
+
+    interface IDroppedCallback {
+        (eventInfo: IEventInfo): void;
+    }
+
+    interface ICallbacks {
+        accept: IAcceptCallback;
+        dragStart: IDroppedCallback;
+        dropped: IDroppedCallback;
+    }
+
+    /**
+     * Internal representation of node in the UI
+     */
+    interface ITreeNodeScope extends ng.IScope {
+        node: ITreeNode;
+    }
+
+    interface IParentTreeNodeScope extends ITreeNodeScope {
+        isParent(nodeScope: ITreeNodeScope): boolean;
+    }
+
+    /**
+      * Node in list
+      */
+    interface ITreeNode {
+        id: number | string;
+        nodes: ITreeNode[];
+        title: string;
+    }
+}
diff --git a/angular-ui-tree/tsconfig.json b/angular-ui-tree/tsconfig.json
new file mode 100644
index 0000000000..66c0316b4c
--- /dev/null
+++ b/angular-ui-tree/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-ui-tree-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-wizard/angular-wizard-tests.ts b/angular-wizard/angular-wizard-tests.ts
index 05a5d574f1..71cd1cbbc2 100644
--- a/angular-wizard/angular-wizard-tests.ts
+++ b/angular-wizard/angular-wizard-tests.ts
@@ -1,8 +1,5 @@
-/// <reference path="../jasmine/jasmine.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="../angularjs/angular-mocks.d.ts" />
-
-/// <reference path="angular-wizard.d.ts" />
+/// <reference types="jasmine" />
+/// <reference types="angularjs" />
 
 // test file taken from https://github.com/mgonto/angular-wizard
 
diff --git a/angular-wizard/angular-wizard.d.ts b/angular-wizard/index.d.ts
similarity index 100%
rename from angular-wizard/angular-wizard.d.ts
rename to angular-wizard/index.d.ts
diff --git a/angular-wizard/tsconfig.json b/angular-wizard/tsconfig.json
new file mode 100644
index 0000000000..951b5e0e0e
--- /dev/null
+++ b/angular-wizard/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-wizard-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular.throttle/angular.throttle-tests.ts b/angular.throttle/angular.throttle-tests.ts
index 2234adbc37..5bc81cebca 100644
--- a/angular.throttle/angular.throttle-tests.ts
+++ b/angular.throttle/angular.throttle-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="angular.throttle.d.ts" />
-/// <reference path='../angularjs/angular.d.ts' />
+
 
 var throttledFn = angular.throttle(function (someArg:any) {
     return someArg;
diff --git a/angular.throttle/angular.throttle.d.ts b/angular.throttle/angular.throttle.d.ts
deleted file mode 100644
index 354d6b3f98..0000000000
--- a/angular.throttle/angular.throttle.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for angular.throttle
-// Project: https://github.com/BaggersIO/angular.throttle
-// Definitions by: Stefan Steinhart <https://github.com/reppners>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path='../angularjs/angular.d.ts' />
-
-declare namespace angular {
-	interface IAngularStatic {
-		throttle:( fn:Function, throttle:number, options?:{leading?:boolean; trailing?:boolean;} ) => Function;
-	}
-}
diff --git a/angular.throttle/index.d.ts b/angular.throttle/index.d.ts
new file mode 100644
index 0000000000..ee70e42eb8
--- /dev/null
+++ b/angular.throttle/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for angular.throttle
+// Project: https://github.com/BaggersIO/angular.throttle
+// Definitions by: Stefan Steinhart <https://github.com/reppners>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare namespace angular {
+	interface IAngularStatic {
+		throttle:( fn:Function, throttle:number, options?:{leading?:boolean; trailing?:boolean;} ) => Function;
+	}
+}
diff --git a/angular.throttle/tsconfig.json b/angular.throttle/tsconfig.json
new file mode 100644
index 0000000000..59cc3ee465
--- /dev/null
+++ b/angular.throttle/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular.throttle-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angularLocalStorage/angularLocalStorage-tests.ts b/angularLocalStorage/angularLocalStorage-tests.ts
index 366ab6e44a..409dcde292 100644
--- a/angularLocalStorage/angularLocalStorage-tests.ts
+++ b/angularLocalStorage/angularLocalStorage-tests.ts
@@ -1,5 +1,4 @@
-///<reference path="../angularjs/angular.d.ts" />
-///<reference path="./angularLocalStorage.d.ts" />
+/// <reference types="angularjs" />
 
 interface TestScope extends ng.IScope {
   viewType: string;
diff --git a/angularLocalStorage/angularLocalStorage.d.ts b/angularLocalStorage/angularLocalStorage.d.ts
deleted file mode 100644
index 35bb5928c1..0000000000
--- a/angularLocalStorage/angularLocalStorage.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// Type definitions for AngularLocalStorage 0.1.7
-// Project: https://github.com/agrublev/angularLocalStorage
-// Definitions by: Horiuchi_H <https://github.com/horiuchi/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts"/>
-
-declare namespace angular.localStorage {
-  interface ILocalStorageService {
-    set(key: string, value: any): any;
-    get(key: string): any;
-    remove(key: string): boolean;
-    clearAll(): void;
-
-    bind($scope: ng.IScope, key: string, opts?: {
-      defaultValue?: any;
-      storeName?: string;
-    }): any;
-    unbind($scope: ng.IScope, key: string, storeName?: string): void;
-  }
-}
-
diff --git a/angularLocalStorage/index.d.ts b/angularLocalStorage/index.d.ts
new file mode 100644
index 0000000000..84ecc42e5e
--- /dev/null
+++ b/angularLocalStorage/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for AngularLocalStorage 0.1.7
+// Project: https://github.com/agrublev/angularLocalStorage
+// Definitions by: Horiuchi_H <https://github.com/horiuchi/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs"/>
+
+declare namespace angular.localStorage {
+  interface ILocalStorageService {
+    set(key: string, value: any): any;
+    get(key: string): any;
+    remove(key: string): boolean;
+    clearAll(): void;
+
+    bind($scope: ng.IScope, key: string, opts?: {
+      defaultValue?: any;
+      storeName?: string;
+    }): any;
+    unbind($scope: ng.IScope, key: string, storeName?: string): void;
+  }
+}
+
diff --git a/angularLocalStorage/tsconfig.json b/angularLocalStorage/tsconfig.json
new file mode 100644
index 0000000000..6384fa3f7e
--- /dev/null
+++ b/angularLocalStorage/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angularLocalStorage-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angularfire/angularfire-tests.ts b/angularfire/angularfire-tests.ts
index c649301e37..38020c0f7c 100644
--- a/angularfire/angularfire-tests.ts
+++ b/angularfire/angularfire-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="angularfire.d.ts"/>
-
 var myapp = angular.module("myapp", ["firebase"]);
 
 interface AngularFireScope extends ng.IScope {
diff --git a/angularfire/angularfire.d.ts b/angularfire/angularfire.d.ts
deleted file mode 100644
index e60fcad361..0000000000
--- a/angularfire/angularfire.d.ts
+++ /dev/null
@@ -1,479 +0,0 @@
-// Type definitions for AngularFire 0.8.2
-// Project: http://angularfire.com
-// Definitions by: Dénes Harmath <http://github.com/thSoft>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts"/>
-/// <reference path="../firebase/firebase.d.ts"/>
-
-interface AngularFireService {
-	(firebase: Firebase, config?: any): AngularFire;
-}
-
-/**
- * @deprecated. Not possible with AngularFire 1.0+
- */
-interface AngularFire {
-	$asArray(): AngularFireArray;
-	$asObject(): AngularFireObject;
-	$ref(): Firebase;
-	$push(data: any): ng.IPromise<Firebase>;
-	$set(key: string, data: any): ng.IPromise<Firebase>;
-	$set(data: any): ng.IPromise<Firebase>;
-	$remove(key?: string): ng.IPromise<Firebase>;
-	$update(key: string, data: Object): ng.IPromise<Firebase>;
-	$update(data: any): ng.IPromise<Firebase>;
-	$transaction(updateFn: (currentData: any) => any, applyLocally?: boolean): ng.IPromise<FirebaseDataSnapshot>;
-	$transaction(key:string, updateFn: (currentData: any) => any, applyLocally?: boolean): ng.IPromise<FirebaseDataSnapshot>;
-}
-
-/**
- * Creates and maintains a synchronized object, with 2-way bindings between Angular and Firebase.
- */
-interface AngularFireObject extends AngularFireSimpleObject {
-	$id: string;
-	$priority: number;
-	$value: any;
-
-	/**
-	 * Removes all keys from the FirebaseObject and also removes
-	 * the remote data from the server.
-	 *
-	 * @returns a promise which will resolve after the op completes
-	 */
-
-	$remove(): ng.IPromise<Firebase>;
-	/**
-	 * Saves all data on the FirebaseObject back to Firebase.
-	 * @returns a promise which will resolve after the save is completed.
-	 */
-	$save(): ng.IPromise<Firebase>;
-
-	/**
-	 * The loaded method is invoked after the initial batch of data arrives from the server.
-	 * When this resolves, all data which existed prior to calling $asObject() is now cached
-	 * locally in the object.
-	 *
-	 * As a shortcut is also possible to pass resolve/reject methods directly into this
-	 * method just as they would be passed to .then()
-	 *
-	 * @param {Function} resolve
-	 * @param {Function} reject
-	 * @returns a promise which resolves after initial data is downloaded from Firebase
-	 */
-	$loaded(resolve?: (x: AngularFireObject) => ng.IHttpPromise<{}>, reject?: (err: any) => any): ng.IPromise<AngularFireObject>;
-
-	/**
-	 * The loaded method is invoked after the initial batch of data arrives from the server.
-	 * When this resolves, all data which existed prior to calling $asObject() is now cached
-	 * locally in the object.
-	 *
-	 * As a shortcut is also possible to pass resolve/reject methods directly into this
-	 * method just as they would be passed to .then()
-	 *
-	 * @param {Function} resolve
-	 * @param {Function} reject
-	 * @returns a promise which resolves after initial data is downloaded from Firebase
-	 */
-	$loaded(resolve?: (x: AngularFireObject) => ng.IPromise<{}>, reject?: (err: any) => any): ng.IPromise<AngularFireObject>;
-
-	/**
-	 * The loaded method is invoked after the initial batch of data arrives from the server.
-	 * When this resolves, all data which existed prior to calling $asObject() is now cached
-	 * locally in the object.
-	 *
-	 * As a shortcut is also possible to pass resolve/reject methods directly into this
-	 * method just as they would be passed to .then()
-	 *
-	 * @param {Function} resolve
-	 * @param {Function} reject
-	 * @returns a promise which resolves after initial data is downloaded from Firebase
-	 */
-	$loaded(resolve?: (x: AngularFireObject) => void, reject?: (err: any) => any): ng.IPromise<AngularFireObject>;
-
-	/**
-	 * @returns {Firebase} the original Firebase instance used to create this object.
-	 */
-	$ref(): Firebase;
-
-	/**
-	 * Creates a 3-way data sync between this object, the Firebase server, and a
-	 * scope variable. This means that any changes made to the scope variable are
-	 * pushed to Firebase, and vice versa.
-	 *
-	 * If scope emits a $destroy event, the binding is automatically severed. Otherwise,
-	 * it is possible to unbind the scope variable by using the `unbind` function
-	 * passed into the resolve method.
-	 *
-	 * Can only be bound to one scope variable at a time. If a second is attempted,
-	 * the promise will be rejected with an error.
-	 *
-	 * @param {object} scope
-	 * @param {string} varName
-	 * @returns a promise which resolves to an unbind method after data is set in scope
-	 */	
-	$bindTo(scope: ng.IScope, varName: string): ng.IPromise<any>;
-
-	/**
-	 * Listeners passed into this method are notified whenever a new change is received
-	 * from the server. Each invocation is sent an object containing
-	 * <code>{ type: 'value', key: 'my_firebase_id' }</code>
-	 *
-	 * This method returns an unbind function that can be used to detach the listener.
-	 *
-	 * @param {Function} cb
-	 * @param {Object} [context]
-	 * @returns {Function} invoke to stop observing events
-	 */	
-	$watch(callback: Function, context?: any): Function;
-
-	/**
-	 * Informs $firebase to stop sending events and clears memory being used
-	 * by this object (delete's its local content).
-	 */
-	$destroy(): void;
-}
-interface AngularFireObjectService {
-	/**
-	 * Creates a synchronized object with 2-way bindings between Angular and Firebase.
-	 *
-	 * @param {Firebase} ref
-	 * @returns {FirebaseObject}
-	 */
-	(firebase: Firebase): AngularFireObject;
-	$extend(ChildClass: Object, methods?: Object): Object;
-}
-
-/**
- * Creates and maintains a synchronized list of data. This is a pseudo-read-only array. One should
- * not call splice(), push(), pop(), et al directly on this array, but should instead use the
- * $remove and $add methods.
- *
- * It is acceptable to .sort() this array, but it is important to use this in conjunction with
- * $watch(), so that it will be re-sorted any time the server data changes. Examples of this are
- * included in the $watch documentation.
- */
-interface AngularFireArray extends Array<AngularFireSimpleObject> {
-	/**
-	 * Create a new record with a unique ID and add it to the end of the array.
-	 * This should be used instead of Array.prototype.push, since those changes will not be
-	 * synchronized with the server.
-	 *
-	 * Any value, including a primitive, can be added in this way. Note that when the record
-	 * is created, the primitive value would be stored in $value (records are always objects
-	 * by default).
-	 *
-	 * Returns a future which is resolved when the data has successfully saved to the server.
-	 * The resolve callback will be passed a Firebase ref representing the new data element.
-	 *
-	 * @param data
-	 * @returns a promise resolved after data is added
-	 */
-	$add(newData: any): ng.IPromise<Firebase>;
-
-	/**
-	 * Pass either an item in the array or the index of an item and it will be saved back
-	 * to Firebase. While the array is read-only and its structure should not be changed,
-	 * it is okay to modify properties on the objects it contains and then save those back
-	 * individually.
-	 *
-	 * Returns a future which is resolved when the data has successfully saved to the server.
-	 * The resolve callback will be passed a Firebase ref representing the saved element.
-	 * If passed an invalid index or an object which is not a record in this array,
-	 * the promise will be rejected.
-	 *
-	 * @param {int|object} indexOrItem
-	 * @returns a promise resolved after data is saved
-	 */
-	$save(recordOrIndex: any): ng.IPromise<Firebase>;
-
-	/**
-	 * Pass either an existing item in this array or the index of that item and it will
-	 * be removed both locally and in Firebase. This should be used in place of
-	 * Array.prototype.splice for removing items out of the array, as calling splice
-	 * will not update the value on the server.
-	 *
-	 * Returns a future which is resolved when the data has successfully removed from the
-	 * server. The resolve callback will be passed a Firebase ref representing the deleted
-	 * element. If passed an invalid index or an object which is not a record in this array,
-	 * the promise will be rejected.
-	 *
-	 * @param {int|object} indexOrItem
-	 * @returns a promise which resolves after data is removed
-	 */
-	$remove(recordOrIndex: any): ng.IPromise<Firebase>;
-
-	/**
-	 * Returns the record for a given Firebase key (record.$id). If the record is not found
-	 * then returns null.
-	 *
-	 * @param {string} key
-	 * @returns {Object|null} a record in this array
-	 */
-	$getRecord(key: string): AngularFireSimpleObject;
-
-	/**
-	 * Given an item in this array or the index of an item in the array, this returns the
-	 * Firebase key (record.$id) for that record. If passed an invalid key or an item which
-	 * does not exist in this array, it will return null.
-	 *
-	 * @param {int|object} indexOrItem
-	 * @returns {null|string}
-	 */
-	$keyAt(recordOrIndex: any): string;
-
-	/**
-	 * The inverse of $keyAt, this method takes a Firebase key (record.$id) and returns the
-	 * index in the array where that record is stored. If the record is not in the array,
-	 * this method returns -1.
-	 *
-	 * @param {String} key
-	 * @returns {int} -1 if not found
-	 */
-	$indexFor(key: string): number;
-
-	/**
-	 * The loaded method is invoked after the initial batch of data arrives from the server.
-	 * When this resolves, all data which existed prior to calling $asArray() is now cached
-	 * locally in the array.
-	 *
-	 * As a shortcut is also possible to pass resolve/reject methods directly into this
-	 * method just as they would be passed to .then()
-	 *
-	 * @param {Function} [resolve]
-	 * @param {Function} [reject]
-	 * @returns a promise
-	 */
-	$loaded(resolve?: (x: AngularFireArray) => ng.IHttpPromise<{}>, reject?: (err: any) => any): ng.IPromise<AngularFireArray>;
-
-	/**
-	 * The loaded method is invoked after the initial batch of data arrives from the server.
-	 * When this resolves, all data which existed prior to calling $asArray() is now cached
-	 * locally in the array.
-	 *
-	 * As a shortcut is also possible to pass resolve/reject methods directly into this
-	 * method just as they would be passed to .then()
-	 *
-	 * @param {Function} [resolve]
-	 * @param {Function} [reject]
-	 * @returns a promise
-	 */
-	$loaded(resolve?: (x: AngularFireArray) => ng.IPromise<{}>, reject?: (err: any) => any): ng.IPromise<AngularFireArray>;
-
-	/**
-	 * The loaded method is invoked after the initial batch of data arrives from the server.
-	 * When this resolves, all data which existed prior to calling $asArray() is now cached
-	 * locally in the array.
-	 *
-	 * As a shortcut is also possible to pass resolve/reject methods directly into this
-	 * method just as they would be passed to .then()
-	 *
-	 * @param {Function} [resolve]
-	 * @param {Function} [reject]
-	 * @returns a promise
-	 */
-	$loaded(resolve?: (x: AngularFireArray) => void, reject?: (err: any) => any): ng.IPromise<AngularFireArray>;
-
-	/**
-	 * @returns {Firebase} the original Firebase ref used to create this object.
-	 */
-	$ref(): Firebase;
-
-	/**
-	 * Listeners passed into this method are notified whenever a new change (add, updated,
-	 * move, remove) is received from the server. Each invocation is sent an object
-	 * containing <code>{ type: 'child_added|child_updated|child_moved|child_removed',
-	 * key: 'key_of_item_affected'}</code>
-	 *
-	 * Additionally, added and moved events receive a prevChild parameter, containing the
-	 * key of the item before this one in the array.
-	 *
-	 * This method returns a function which can be invoked to stop observing events.
-	 *
-	 * @param {Function} cb
-	 * @param {Object} [context]
-	 * @returns {Function} used to stop observing
-	 */
-	$watch(cb: (event: string, key: string, prevChild: string) => void, context?: any): Function;
-
-	/**
-	 * Informs $firebase to stop sending events and clears memory being used
-	 * by this array (delete's its local content).
-	 */
-	$destroy(): void;
-}
-interface AngularFireArrayService {
-	(firebase: Firebase): AngularFireArray;
-	$extend(ChildClass: Object, methods?: Object): Object;
-}
-
-interface AngularFireSimpleObject {
-	$id: string;
-	$priority: number;
-	$value: any;
-	[key: string]: any;
-}
-
-
-interface AngularFireAuthService {
-	(firebase: Firebase): AngularFireAuth;
-}
-
-interface AngularFireAuth {
-	/**
-	 * Authenticates the Firebase reference with a custom authentication token.
-	 *
-	 * @param {string} authToken An authentication token or a Firebase Secret. A Firebase Secret
-	 * should only be used for authenticating a server process and provides full read / write
-	 * access to the entire Firebase.
-	 * @param {Object} [options] An object containing optional client arguments, such as configuring
-	 * session persistence.
-	 * @return {Promise<Object>} A promise fulfilled with an object containing authentication data.
-	 */
-	$authWithCustomToken(authToken: string, options?: Object): ng.IPromise<any>;
-
-	/**
-	 * Authenticates the Firebase reference anonymously.
-	 *
-	 * @param {Object} [options] An object containing optional client arguments, such as configuring
-	 * session persistence.
-	 * @return {Promise<Object>} A promise fulfilled with an object containing authentication data.
-	 */
-	$authAnonymously(options?: Object): ng.IPromise<any>;
-
-	/**
-	 * Authenticates the Firebase reference with an email/password user.
-	 *
-	 * @param {Object} credentials An object containing email and password attributes corresponding
-	 * to the user account.
-	 * @param {Object} [options] An object containing optional client arguments, such as configuring
-	 * session persistence.
-	 * @return {Promise<Object>} A promise fulfilled with an object containing authentication data.
-	 */
-	$authWithPassword(credentials: FirebaseCredentials, options?: Object): ng.IPromise<any>;
-
-	/**
-	 * Authenticates the Firebase reference with the OAuth popup flow.
-	 *
-	 * @param {string} provider The unique string identifying the OAuth provider to authenticate
-	 * with, e.g. google.
-	 * @param {Object} [options] An object containing optional client arguments, such as configuring
-	 * session persistence.
-	 * @return {Promise<Object>} A promise fulfilled with an object containing authentication data.
-	 */
-	$authWithOAuthPopup(provider: string, options?: Object): ng.IPromise<any>;
-
-	/**
-	 * Authenticates the Firebase reference with the OAuth redirect flow.
-	 *
-	 * @param {string} provider The unique string identifying the OAuth provider to authenticate
-	 * with, e.g. google.
-	 * @param {Object} [options] An object containing optional client arguments, such as configuring
-	 * session persistence.
-	 * @return {Promise<Object>} A promise fulfilled with an object containing authentication data.
-	 */
-	$authWithOAuthRedirect(provider: string, options?: Object): ng.IPromise<any>;
-
-	/**
-	 * Authenticates the Firebase reference with an OAuth token.
-	 *
-	 * @param {string} provider The unique string identifying the OAuth provider to authenticate
-	 * with, e.g. google.
-	 * @param {string|Object} credentials Either a string, such as an OAuth 2.0 access token, or an
-	 * Object of key / value pairs, such as a set of OAuth 1.0a credentials.
-	 * @param {Object} [options] An object containing optional client arguments, such as configuring
-	 * session persistence.
-	 * @return {Promise<Object>} A promise fulfilled with an object containing authentication data.
-	 */
-	$authWithOAuthToken(provider: string, credentials: Object|string, options?: Object): ng.IPromise<any>;
-
-	/**
-	 * Synchronously retrieves the current authentication data.
-	 *
-	 * @return {Object} The client's authentication data.
-	 */
-	$getAuth(): FirebaseAuthData;
-
-	/**
-	 * Asynchronously fires the provided callback with the current authentication data every time
-	 * the authentication data changes. It also fires as soon as the authentication data is
-	 * retrieved from the server.
-	 *
-	 * @param {function} callback A callback that fires when the client's authenticate state
-	 * changes. If authenticated, the callback will be passed an object containing authentication
-	 * data according to the provider used to authenticate. Otherwise, it will be passed null.
-	 * @param {string} [context] If provided, this object will be used as this when calling your
-	 * callback.
-	 * @return {function} A function which can be used to deregister the provided callback.
-	 */
-	$onAuth(callback: Function, context?: any): Function;
-
-	/**
-	 * Unauthenticates the Firebase reference.
-	 */
-	$unauth(): void;
-
-	/**
-	 * Utility method which can be used in a route's resolve() method to grab the current
-	 * authentication data.
-	 *
-	 * @returns {Promise<Object|null>} A promise fulfilled with the client's current authentication
-	 * state, which will be null if the client is not authenticated.
-	 */
-	$waitForAuth(): ng.IPromise<any>;
-
-	/**
-	 * Utility method which can be used in a route's resolve() method to require that a route has
-	 * a logged in client.
-	 *
-	 * @returns {Promise<Object>} A promise fulfilled with the client's current authentication
-	 * state or rejected if the client is not authenticated.
-	 */
-	$requireAuth(): ng.IPromise<any>;
-
-	/**
-	 * Creates a new email/password user. Note that this function only creates the user, if you
-	 * wish to log in as the newly created user, call $authWithPassword() after the promise for
-	 * this method has been resolved.
-	 *
-	 * @param {Object} credentials An object containing the email and password of the user to create.
-	 * @return {Promise<Object>} A promise fulfilled with the user object, which contains the
-	 * uid of the created user.
-	 */
-	$createUser(credentials: FirebaseCredentials): ng.IPromise<any>;
-
-	/**
-	 * Removes an email/password user.
-	 *
-	 * @param {Object} credentials An object containing the email and password of the user to remove.
-	 * @return {Promise<>} An empty promise fulfilled once the user is removed.
-	 */
-	$removeUser(credentials: FirebaseCredentials): ng.IPromise<any>;
-
-	/**
-	 * Changes the email for an email/password user.
-	 *
-	 * @param {Object} credentials An object containing the old email, new email, and password of
-	 * the user whose email is to change.
-	 * @return {Promise<>} An empty promise fulfilled once the email change is complete.
-	 */
-	$changeEmail(credentials: FirebaseChangeEmailCredentials): ng.IPromise<any>;
-
-	/**
-	 * Changes the password for an email/password user.
-	 *
-	 * @param {Object} credentials An object containing the email, old password, and new password of
-	 * the user whose password is to change.
-	 * @return {Promise<>} An empty promise fulfilled once the password change is complete.
-	 */
-	$changePassword(credentials: FirebaseChangePasswordCredentials): ng.IPromise<any>;
-
-	/**
-	 * Sends a password reset email to an email/password user.
-	 *
-	 * @param {Object} credentials An object containing the email of the user to send a reset
-	 * password email to.
-	 * @return {Promise<>} An empty promise fulfilled once the reset password email is sent.
-	 */
-	$resetPassword(credentials: FirebaseResetPasswordCredentials): ng.IPromise<any>;
-}
diff --git a/angularfire/index.d.ts b/angularfire/index.d.ts
new file mode 100644
index 0000000000..11f806a9ec
--- /dev/null
+++ b/angularfire/index.d.ts
@@ -0,0 +1,479 @@
+// Type definitions for AngularFire 0.8.2
+// Project: http://angularfire.com
+// Definitions by: Dénes Harmath <http://github.com/thSoft>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs"/>
+/// <reference types="firebase"/>
+
+interface AngularFireService {
+	(firebase: Firebase, config?: any): AngularFire;
+}
+
+/**
+ * @deprecated. Not possible with AngularFire 1.0+
+ */
+interface AngularFire {
+	$asArray(): AngularFireArray;
+	$asObject(): AngularFireObject;
+	$ref(): Firebase;
+	$push(data: any): ng.IPromise<Firebase>;
+	$set(key: string, data: any): ng.IPromise<Firebase>;
+	$set(data: any): ng.IPromise<Firebase>;
+	$remove(key?: string): ng.IPromise<Firebase>;
+	$update(key: string, data: Object): ng.IPromise<Firebase>;
+	$update(data: any): ng.IPromise<Firebase>;
+	$transaction(updateFn: (currentData: any) => any, applyLocally?: boolean): ng.IPromise<FirebaseDataSnapshot>;
+	$transaction(key:string, updateFn: (currentData: any) => any, applyLocally?: boolean): ng.IPromise<FirebaseDataSnapshot>;
+}
+
+/**
+ * Creates and maintains a synchronized object, with 2-way bindings between Angular and Firebase.
+ */
+interface AngularFireObject extends AngularFireSimpleObject {
+	$id: string;
+	$priority: number;
+	$value: any;
+
+	/**
+	 * Removes all keys from the FirebaseObject and also removes
+	 * the remote data from the server.
+	 *
+	 * @returns a promise which will resolve after the op completes
+	 */
+
+	$remove(): ng.IPromise<Firebase>;
+	/**
+	 * Saves all data on the FirebaseObject back to Firebase.
+	 * @returns a promise which will resolve after the save is completed.
+	 */
+	$save(): ng.IPromise<Firebase>;
+
+	/**
+	 * The loaded method is invoked after the initial batch of data arrives from the server.
+	 * When this resolves, all data which existed prior to calling $asObject() is now cached
+	 * locally in the object.
+	 *
+	 * As a shortcut is also possible to pass resolve/reject methods directly into this
+	 * method just as they would be passed to .then()
+	 *
+	 * @param {Function} resolve
+	 * @param {Function} reject
+	 * @returns a promise which resolves after initial data is downloaded from Firebase
+	 */
+	$loaded(resolve?: (x: AngularFireObject) => ng.IHttpPromise<{}>, reject?: (err: any) => any): ng.IPromise<AngularFireObject>;
+
+	/**
+	 * The loaded method is invoked after the initial batch of data arrives from the server.
+	 * When this resolves, all data which existed prior to calling $asObject() is now cached
+	 * locally in the object.
+	 *
+	 * As a shortcut is also possible to pass resolve/reject methods directly into this
+	 * method just as they would be passed to .then()
+	 *
+	 * @param {Function} resolve
+	 * @param {Function} reject
+	 * @returns a promise which resolves after initial data is downloaded from Firebase
+	 */
+	$loaded(resolve?: (x: AngularFireObject) => ng.IPromise<{}>, reject?: (err: any) => any): ng.IPromise<AngularFireObject>;
+
+	/**
+	 * The loaded method is invoked after the initial batch of data arrives from the server.
+	 * When this resolves, all data which existed prior to calling $asObject() is now cached
+	 * locally in the object.
+	 *
+	 * As a shortcut is also possible to pass resolve/reject methods directly into this
+	 * method just as they would be passed to .then()
+	 *
+	 * @param {Function} resolve
+	 * @param {Function} reject
+	 * @returns a promise which resolves after initial data is downloaded from Firebase
+	 */
+	$loaded(resolve?: (x: AngularFireObject) => void, reject?: (err: any) => any): ng.IPromise<AngularFireObject>;
+
+	/**
+	 * @returns {Firebase} the original Firebase instance used to create this object.
+	 */
+	$ref(): Firebase;
+
+	/**
+	 * Creates a 3-way data sync between this object, the Firebase server, and a
+	 * scope variable. This means that any changes made to the scope variable are
+	 * pushed to Firebase, and vice versa.
+	 *
+	 * If scope emits a $destroy event, the binding is automatically severed. Otherwise,
+	 * it is possible to unbind the scope variable by using the `unbind` function
+	 * passed into the resolve method.
+	 *
+	 * Can only be bound to one scope variable at a time. If a second is attempted,
+	 * the promise will be rejected with an error.
+	 *
+	 * @param {object} scope
+	 * @param {string} varName
+	 * @returns a promise which resolves to an unbind method after data is set in scope
+	 */	
+	$bindTo(scope: ng.IScope, varName: string): ng.IPromise<any>;
+
+	/**
+	 * Listeners passed into this method are notified whenever a new change is received
+	 * from the server. Each invocation is sent an object containing
+	 * <code>{ type: 'value', key: 'my_firebase_id' }</code>
+	 *
+	 * This method returns an unbind function that can be used to detach the listener.
+	 *
+	 * @param {Function} cb
+	 * @param {Object} [context]
+	 * @returns {Function} invoke to stop observing events
+	 */	
+	$watch(callback: Function, context?: any): Function;
+
+	/**
+	 * Informs $firebase to stop sending events and clears memory being used
+	 * by this object (delete's its local content).
+	 */
+	$destroy(): void;
+}
+interface AngularFireObjectService {
+	/**
+	 * Creates a synchronized object with 2-way bindings between Angular and Firebase.
+	 *
+	 * @param {Firebase} ref
+	 * @returns {FirebaseObject}
+	 */
+	(firebase: Firebase): AngularFireObject;
+	$extend(ChildClass: Object, methods?: Object): Object;
+}
+
+/**
+ * Creates and maintains a synchronized list of data. This is a pseudo-read-only array. One should
+ * not call splice(), push(), pop(), et al directly on this array, but should instead use the
+ * $remove and $add methods.
+ *
+ * It is acceptable to .sort() this array, but it is important to use this in conjunction with
+ * $watch(), so that it will be re-sorted any time the server data changes. Examples of this are
+ * included in the $watch documentation.
+ */
+interface AngularFireArray extends Array<AngularFireSimpleObject> {
+	/**
+	 * Create a new record with a unique ID and add it to the end of the array.
+	 * This should be used instead of Array.prototype.push, since those changes will not be
+	 * synchronized with the server.
+	 *
+	 * Any value, including a primitive, can be added in this way. Note that when the record
+	 * is created, the primitive value would be stored in $value (records are always objects
+	 * by default).
+	 *
+	 * Returns a future which is resolved when the data has successfully saved to the server.
+	 * The resolve callback will be passed a Firebase ref representing the new data element.
+	 *
+	 * @param data
+	 * @returns a promise resolved after data is added
+	 */
+	$add(newData: any): ng.IPromise<Firebase>;
+
+	/**
+	 * Pass either an item in the array or the index of an item and it will be saved back
+	 * to Firebase. While the array is read-only and its structure should not be changed,
+	 * it is okay to modify properties on the objects it contains and then save those back
+	 * individually.
+	 *
+	 * Returns a future which is resolved when the data has successfully saved to the server.
+	 * The resolve callback will be passed a Firebase ref representing the saved element.
+	 * If passed an invalid index or an object which is not a record in this array,
+	 * the promise will be rejected.
+	 *
+	 * @param {int|object} indexOrItem
+	 * @returns a promise resolved after data is saved
+	 */
+	$save(recordOrIndex: any): ng.IPromise<Firebase>;
+
+	/**
+	 * Pass either an existing item in this array or the index of that item and it will
+	 * be removed both locally and in Firebase. This should be used in place of
+	 * Array.prototype.splice for removing items out of the array, as calling splice
+	 * will not update the value on the server.
+	 *
+	 * Returns a future which is resolved when the data has successfully removed from the
+	 * server. The resolve callback will be passed a Firebase ref representing the deleted
+	 * element. If passed an invalid index or an object which is not a record in this array,
+	 * the promise will be rejected.
+	 *
+	 * @param {int|object} indexOrItem
+	 * @returns a promise which resolves after data is removed
+	 */
+	$remove(recordOrIndex: any): ng.IPromise<Firebase>;
+
+	/**
+	 * Returns the record for a given Firebase key (record.$id). If the record is not found
+	 * then returns null.
+	 *
+	 * @param {string} key
+	 * @returns {Object|null} a record in this array
+	 */
+	$getRecord(key: string): AngularFireSimpleObject;
+
+	/**
+	 * Given an item in this array or the index of an item in the array, this returns the
+	 * Firebase key (record.$id) for that record. If passed an invalid key or an item which
+	 * does not exist in this array, it will return null.
+	 *
+	 * @param {int|object} indexOrItem
+	 * @returns {null|string}
+	 */
+	$keyAt(recordOrIndex: any): string;
+
+	/**
+	 * The inverse of $keyAt, this method takes a Firebase key (record.$id) and returns the
+	 * index in the array where that record is stored. If the record is not in the array,
+	 * this method returns -1.
+	 *
+	 * @param {String} key
+	 * @returns {int} -1 if not found
+	 */
+	$indexFor(key: string): number;
+
+	/**
+	 * The loaded method is invoked after the initial batch of data arrives from the server.
+	 * When this resolves, all data which existed prior to calling $asArray() is now cached
+	 * locally in the array.
+	 *
+	 * As a shortcut is also possible to pass resolve/reject methods directly into this
+	 * method just as they would be passed to .then()
+	 *
+	 * @param {Function} [resolve]
+	 * @param {Function} [reject]
+	 * @returns a promise
+	 */
+	$loaded(resolve?: (x: AngularFireArray) => ng.IHttpPromise<{}>, reject?: (err: any) => any): ng.IPromise<AngularFireArray>;
+
+	/**
+	 * The loaded method is invoked after the initial batch of data arrives from the server.
+	 * When this resolves, all data which existed prior to calling $asArray() is now cached
+	 * locally in the array.
+	 *
+	 * As a shortcut is also possible to pass resolve/reject methods directly into this
+	 * method just as they would be passed to .then()
+	 *
+	 * @param {Function} [resolve]
+	 * @param {Function} [reject]
+	 * @returns a promise
+	 */
+	$loaded(resolve?: (x: AngularFireArray) => ng.IPromise<{}>, reject?: (err: any) => any): ng.IPromise<AngularFireArray>;
+
+	/**
+	 * The loaded method is invoked after the initial batch of data arrives from the server.
+	 * When this resolves, all data which existed prior to calling $asArray() is now cached
+	 * locally in the array.
+	 *
+	 * As a shortcut is also possible to pass resolve/reject methods directly into this
+	 * method just as they would be passed to .then()
+	 *
+	 * @param {Function} [resolve]
+	 * @param {Function} [reject]
+	 * @returns a promise
+	 */
+	$loaded(resolve?: (x: AngularFireArray) => void, reject?: (err: any) => any): ng.IPromise<AngularFireArray>;
+
+	/**
+	 * @returns {Firebase} the original Firebase ref used to create this object.
+	 */
+	$ref(): Firebase;
+
+	/**
+	 * Listeners passed into this method are notified whenever a new change (add, updated,
+	 * move, remove) is received from the server. Each invocation is sent an object
+	 * containing <code>{ type: 'child_added|child_updated|child_moved|child_removed',
+	 * key: 'key_of_item_affected'}</code>
+	 *
+	 * Additionally, added and moved events receive a prevChild parameter, containing the
+	 * key of the item before this one in the array.
+	 *
+	 * This method returns a function which can be invoked to stop observing events.
+	 *
+	 * @param {Function} cb
+	 * @param {Object} [context]
+	 * @returns {Function} used to stop observing
+	 */
+	$watch(cb: (event: string, key: string, prevChild: string) => void, context?: any): Function;
+
+	/**
+	 * Informs $firebase to stop sending events and clears memory being used
+	 * by this array (delete's its local content).
+	 */
+	$destroy(): void;
+}
+interface AngularFireArrayService {
+	(firebase: Firebase): AngularFireArray;
+	$extend(ChildClass: Object, methods?: Object): Object;
+}
+
+interface AngularFireSimpleObject {
+	$id: string;
+	$priority: number;
+	$value: any;
+	[key: string]: any;
+}
+
+
+interface AngularFireAuthService {
+	(firebase: Firebase): AngularFireAuth;
+}
+
+interface AngularFireAuth {
+	/**
+	 * Authenticates the Firebase reference with a custom authentication token.
+	 *
+	 * @param {string} authToken An authentication token or a Firebase Secret. A Firebase Secret
+	 * should only be used for authenticating a server process and provides full read / write
+	 * access to the entire Firebase.
+	 * @param {Object} [options] An object containing optional client arguments, such as configuring
+	 * session persistence.
+	 * @return {Promise<Object>} A promise fulfilled with an object containing authentication data.
+	 */
+	$authWithCustomToken(authToken: string, options?: Object): ng.IPromise<any>;
+
+	/**
+	 * Authenticates the Firebase reference anonymously.
+	 *
+	 * @param {Object} [options] An object containing optional client arguments, such as configuring
+	 * session persistence.
+	 * @return {Promise<Object>} A promise fulfilled with an object containing authentication data.
+	 */
+	$authAnonymously(options?: Object): ng.IPromise<any>;
+
+	/**
+	 * Authenticates the Firebase reference with an email/password user.
+	 *
+	 * @param {Object} credentials An object containing email and password attributes corresponding
+	 * to the user account.
+	 * @param {Object} [options] An object containing optional client arguments, such as configuring
+	 * session persistence.
+	 * @return {Promise<Object>} A promise fulfilled with an object containing authentication data.
+	 */
+	$authWithPassword(credentials: FirebaseCredentials, options?: Object): ng.IPromise<any>;
+
+	/**
+	 * Authenticates the Firebase reference with the OAuth popup flow.
+	 *
+	 * @param {string} provider The unique string identifying the OAuth provider to authenticate
+	 * with, e.g. google.
+	 * @param {Object} [options] An object containing optional client arguments, such as configuring
+	 * session persistence.
+	 * @return {Promise<Object>} A promise fulfilled with an object containing authentication data.
+	 */
+	$authWithOAuthPopup(provider: string, options?: Object): ng.IPromise<any>;
+
+	/**
+	 * Authenticates the Firebase reference with the OAuth redirect flow.
+	 *
+	 * @param {string} provider The unique string identifying the OAuth provider to authenticate
+	 * with, e.g. google.
+	 * @param {Object} [options] An object containing optional client arguments, such as configuring
+	 * session persistence.
+	 * @return {Promise<Object>} A promise fulfilled with an object containing authentication data.
+	 */
+	$authWithOAuthRedirect(provider: string, options?: Object): ng.IPromise<any>;
+
+	/**
+	 * Authenticates the Firebase reference with an OAuth token.
+	 *
+	 * @param {string} provider The unique string identifying the OAuth provider to authenticate
+	 * with, e.g. google.
+	 * @param {string|Object} credentials Either a string, such as an OAuth 2.0 access token, or an
+	 * Object of key / value pairs, such as a set of OAuth 1.0a credentials.
+	 * @param {Object} [options] An object containing optional client arguments, such as configuring
+	 * session persistence.
+	 * @return {Promise<Object>} A promise fulfilled with an object containing authentication data.
+	 */
+	$authWithOAuthToken(provider: string, credentials: Object|string, options?: Object): ng.IPromise<any>;
+
+	/**
+	 * Synchronously retrieves the current authentication data.
+	 *
+	 * @return {Object} The client's authentication data.
+	 */
+	$getAuth(): FirebaseAuthData;
+
+	/**
+	 * Asynchronously fires the provided callback with the current authentication data every time
+	 * the authentication data changes. It also fires as soon as the authentication data is
+	 * retrieved from the server.
+	 *
+	 * @param {function} callback A callback that fires when the client's authenticate state
+	 * changes. If authenticated, the callback will be passed an object containing authentication
+	 * data according to the provider used to authenticate. Otherwise, it will be passed null.
+	 * @param {string} [context] If provided, this object will be used as this when calling your
+	 * callback.
+	 * @return {function} A function which can be used to deregister the provided callback.
+	 */
+	$onAuth(callback: Function, context?: any): Function;
+
+	/**
+	 * Unauthenticates the Firebase reference.
+	 */
+	$unauth(): void;
+
+	/**
+	 * Utility method which can be used in a route's resolve() method to grab the current
+	 * authentication data.
+	 *
+	 * @returns {Promise<Object|null>} A promise fulfilled with the client's current authentication
+	 * state, which will be null if the client is not authenticated.
+	 */
+	$waitForAuth(): ng.IPromise<any>;
+
+	/**
+	 * Utility method which can be used in a route's resolve() method to require that a route has
+	 * a logged in client.
+	 *
+	 * @returns {Promise<Object>} A promise fulfilled with the client's current authentication
+	 * state or rejected if the client is not authenticated.
+	 */
+	$requireAuth(): ng.IPromise<any>;
+
+	/**
+	 * Creates a new email/password user. Note that this function only creates the user, if you
+	 * wish to log in as the newly created user, call $authWithPassword() after the promise for
+	 * this method has been resolved.
+	 *
+	 * @param {Object} credentials An object containing the email and password of the user to create.
+	 * @return {Promise<Object>} A promise fulfilled with the user object, which contains the
+	 * uid of the created user.
+	 */
+	$createUser(credentials: FirebaseCredentials): ng.IPromise<any>;
+
+	/**
+	 * Removes an email/password user.
+	 *
+	 * @param {Object} credentials An object containing the email and password of the user to remove.
+	 * @return {Promise<>} An empty promise fulfilled once the user is removed.
+	 */
+	$removeUser(credentials: FirebaseCredentials): ng.IPromise<any>;
+
+	/**
+	 * Changes the email for an email/password user.
+	 *
+	 * @param {Object} credentials An object containing the old email, new email, and password of
+	 * the user whose email is to change.
+	 * @return {Promise<>} An empty promise fulfilled once the email change is complete.
+	 */
+	$changeEmail(credentials: FirebaseChangeEmailCredentials): ng.IPromise<any>;
+
+	/**
+	 * Changes the password for an email/password user.
+	 *
+	 * @param {Object} credentials An object containing the email, old password, and new password of
+	 * the user whose password is to change.
+	 * @return {Promise<>} An empty promise fulfilled once the password change is complete.
+	 */
+	$changePassword(credentials: FirebaseChangePasswordCredentials): ng.IPromise<any>;
+
+	/**
+	 * Sends a password reset email to an email/password user.
+	 *
+	 * @param {Object} credentials An object containing the email of the user to send a reset
+	 * password email to.
+	 * @return {Promise<>} An empty promise fulfilled once the reset password email is sent.
+	 */
+	$resetPassword(credentials: FirebaseResetPasswordCredentials): ng.IPromise<any>;
+}
diff --git a/angularfire/tsconfig.json b/angularfire/tsconfig.json
new file mode 100644
index 0000000000..21e145d582
--- /dev/null
+++ b/angularfire/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angularfire-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angularjs-toaster/angularjs-toaster.d.ts b/angularjs-toaster/angularjs-toaster.d.ts
deleted file mode 100644
index ee184620ae..0000000000
--- a/angularjs-toaster/angularjs-toaster.d.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-// Type definitions for angularjs-toaster v0.4.13
-// Project: https://github.com/jirikavi/AngularJS-Toaster
-// Definitions by: Ben Tesser <https://github.com/btesser>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace ngtoaster {
-  interface IToasterService {
-    pop(params:IPopParams): void
-    /**
-     * @param {string} type Type of toaster  -- 'error', 'info', 'wait', 'success', and 'warning'
-     */
-    pop(type?:string, title?:string, body?:string, timeout?:number, bodyOutputType?:string, clickHandler?:EventListener,
-        toasterId?:number, showCloseButton?:boolean): void
-    error(params: IPopParams): void
-    error(title?:string, body?:string, timeout?:number, bodyOutputType?:string, clickHandler?:EventListener,
-        toasterId?:number): void
-    info(params: IPopParams): void
-    info(title?:string, body?:string, timeout?:number, bodyOutputType?:string, clickHandler?:EventListener,
-        toasterId?:number): void
-    wait(params: IPopParams): void
-    wait(title?:string, body?:string, timeout?:number, bodyOutputType?:string, clickHandler?:EventListener,
-        toasterId?:number): void
-    success(params: IPopParams): void
-    success(title?:string, body?:string, timeout?:number, bodyOutputType?:string, clickHandler?:EventListener,
-        toasterId?:number): void
-    warning(params: IPopParams): void
-    warning(title?:string, body?:string, timeout?:number, bodyOutputType?:string, clickHandler?:EventListener,
-        toasterId?:number): void
-    clear(): void
-    toast:IToast;
-  }
-
-  interface IToasterEventRegistry {
-    setup(): void
-    subscribeToNewToastEvent(onNewToast:IToastEventListener): void
-    subscribeToClearToastsEvent(onClearToasts:IToastEventListener): void
-    unsubscribeToNewToastEvent(onNewToast:IToastEventListener): void
-    unsubscribeToClearToastsEvent(onClearToasts:IToastEventListener): void
-  }
-
-  interface IPopParams extends IToast{
-    toasterId?: number;
-  }
-
-  interface IToastEventListener {
-    (event:Event, toasterId: number): void;
-  }
-
-  interface IToast {
-    /**
-     * Acceptable types are:
-     * 'error', 'info', 'wait', 'success', and 'warning'
-     */
-    type?: string;
-    title?: string;
-    body?: string;
-    timeout?: number;
-    bodyOutputType?: string;
-    clickHandler?: EventListener;
-    showCloseButton?: boolean;
-  }
-
-  interface IToasterConfig {
-    /**
-     * limits max number of toasts
-     */
-    limit?: number;
-    'tap-to-dismiss'?: boolean;
-    'close-button'?: boolean;
-    'newest-on-top'?: boolean;
-    'time-out'?: number;
-    'icon-classes'?: IIconClasses;
-    /**
-     * Options include:
-     * '', 'trustedHtml', 'template', 'templateWithData'
-     */
-    'body-output-type'?: string;
-    'body-template'?: string;
-    'icon-class'?: string;
-    /**
-     * Options include:
-     * 'toast-top-full-width', 'toast-bottom-full-width', 'toast-center',
-     * 'toast-top-left', 'toast-top-center', 'toast-top-rigt',
-     * 'toast-bottom-left', 'toast-bottom-center', 'toast-bottom-rigt',
-     */
-    'position-class'?: string;
-    'title-class'?: string;
-    'message-class'?: string;
-    'prevent-duplicates'?: boolean;
-    /**
-     * stop timeout on mouseover and restart timer on mouseout
-     */
-    'mouseover-timer-stop'?: boolean;
-  }
-
-  interface IIconClasses {
-    error: string;
-    info: string;
-    wait: string;
-    success: string;
-    warning: string;
-  }
-}
-
-declare module "ngtoaster" {
-  export = ngtoaster
-}
diff --git a/angularjs/README.md b/angularjs/README.md
index 94dc303ae4..1b3affc92c 100644
--- a/angularjs/README.md
+++ b/angularjs/README.md
@@ -2,14 +2,14 @@
 
 ## Referencing AngularJS definition files in your code
 
-To do that, simply add `/// <reference path="angular.d.ts" />` at the top of your code.
+To do that, simply add `` at the top of your code.
 
 That will make available to your code all interfaces AngularJS' main module **ng** implements, as well as the **AUTO** module.
 
 If you are including other AngularJS' modules in your code, like **ngResource**, just like you needed to include the additional module implementation file in your code, _angular-resource.js_, you will also need to reference the definitions file related to that module. Your code would then have the following definitions files reference:
 
-    /// <reference path="angular.d.ts" />
-    /// <reference path="angular-resource.d.ts" />
+    
+    
 
 Having these modules in separated files is actually good because they sometimes either augment or modify some of **ng**'s interfaces, and thus those differences should only be available to you when you really need them. Also, it forces you to explicit what you're going to be using.
 
@@ -107,8 +107,8 @@ function Controller($scope: ICustomScope) {
 
 ### Working with $resource
 ```ts
-/// <reference path="angular.d.ts" />
-/// <reference path="angular-resource.d.ts" />
+
+
 
 // We have the option to define arguments for a custom resource
 interface IArticleParameters {
@@ -177,8 +177,8 @@ function MainController($resource: ng.resource.IResourceService) {
 
 ### Working with $resource in angular-1.0 definitions
 ```ts
-/// <reference path="angular-1.0.d.ts" />
-/// <reference path="angular-resource-1.0.d.ts" />
+
+
 
 // Let's define a custom resource
 interface IArticleResourceClass extends ng.resource.IResourceClass {
diff --git a/angularjs/angular-amd-tests.ts b/angularjs/angular-amd-tests.ts
deleted file mode 100644
index 2ce75cc22d..0000000000
--- a/angularjs/angular-amd-tests.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/// <reference path="angular.d.ts" />
-
-import localName = require('angular');
-var mod: localName.IModule = localName.module('mod', []);
-
-// Remain compatible with the ambient version 
-var mod2: angular.IModule = mod;
diff --git a/angularjs/angular-animate.d.ts b/angularjs/angular-animate.d.ts
index 2f3cbc0f18..57eb619405 100644
--- a/angularjs/angular-animate.d.ts
+++ b/angularjs/angular-animate.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Michel Salib <https://github.com/michelsalib>, Adi Dahiya <https://github.com/adidahiya>, Raphael Schweizer <https://github.com/rasch>, Cody Schaaf <https://github.com/codyschaaf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="angular.d.ts" />
 
 declare module "angular-animate" {
     var _: string;
diff --git a/angularjs/angular-component-router.d.ts b/angularjs/angular-component-router.d.ts
index 2c56ef3a21..d1c2a7e373 100644
--- a/angularjs/angular-component-router.d.ts
+++ b/angularjs/angular-component-router.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: David Reher <http://github.com/davidreher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./angular.d.ts" />
 
 declare namespace angular {
     /**
diff --git a/angularjs/angular-cookies.d.ts b/angularjs/angular-cookies.d.ts
index e96ae7a671..1577ea6fef 100644
--- a/angularjs/angular-cookies.d.ts
+++ b/angularjs/angular-cookies.d.ts
@@ -4,7 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="angular.d.ts" />
 
 declare module "angular-cookies" {
     var _: string;
diff --git a/angularjs/angular-mocks-tests.ts b/angularjs/angular-mocks-tests.ts
index 86bbe6c945..fd925016c2 100644
--- a/angularjs/angular-mocks-tests.ts
+++ b/angularjs/angular-mocks-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-mocks.d.ts" />
+
 
 ///////////////////////////////////////
 // IAngularStatic
@@ -36,6 +36,7 @@ mock.module(
     function () { return 2; }
     );
 mock.module({ module1: function () { return 1; } });
+mock.module.sharedInjector();
 
 date = mock.TzDate(-7, '2013-1-1T15:00:00Z');
 date = mock.TzDate(-8, 12345678);
@@ -87,6 +88,15 @@ logCall = logService.warn;
 
 logs = logCall.logs;
 
+///////////////////////////////////////
+// ControllerService mock
+///////////////////////////////////////
+var $controller: ng.IControllerService;
+$controller(class TestController {}, {}, {myBinding: 'works!'});
+$controller(function TestController() {}, {someLocal: 42}, {myBinding: 'works!'});
+$controller('TestController', {}, {myBinding: 'works!'});
+
+
 ///////////////////////////////////////
 // IComponentControllerService
 ///////////////////////////////////////
diff --git a/angularjs/angular-mocks.d.ts b/angularjs/angular-mocks.d.ts
index 429c7b5269..3d8a6e8926 100644
--- a/angularjs/angular-mocks.d.ts
+++ b/angularjs/angular-mocks.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Diego Vilar <http://github.com/diegovilar>, Tony Curtis <http://github.com/daltin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="angular.d.ts" />
 
 declare module "angular-mocks/ngMock" {
     var _: string;
@@ -47,7 +46,10 @@ declare namespace angular {
         inject: IInjectStatic
 
         // see https://docs.angularjs.org/api/ngMock/function/angular.mock.module
-        module(...modules: any[]): any;
+        module: {
+          (...modules: any[]): any;
+          sharedInjector(): void;
+        }
 
         // see https://docs.angularjs.org/api/ngMock/type/angular.mock.TzDate
         TzDate(offset: number, timestamp: number): Date;
@@ -97,6 +99,18 @@ declare namespace angular {
         logs: string[];
     }
 
+    ///////////////////////////////////////////////////////////////////////////
+    // ControllerService mock
+    // see https://docs.angularjs.org/api/ngMock/service/$controller
+    // This interface extends http://docs.angularjs.org/api/ng.$controller
+    ///////////////////////////////////////////////////////////////////////////
+    interface IControllerService {
+      // Although the documentation doesn't state this, locals are optional
+      <T>(controllerConstructor: new (...args: any[]) => T, locals?: any, bindings?: any): T;
+      <T>(controllerConstructor: Function, locals?: any, bindings?: any): T;
+      <T>(controllerName: string, locals?: any, bindings?: any): T;
+    }
+
     ///////////////////////////////////////////////////////////////////////////
     // ComponentControllerService
     // see https://docs.angularjs.org/api/ngMock/service/$componentController
diff --git a/angularjs/angular-resource-tests.ts b/angularjs/angular-resource-tests.ts
index 5a9963b14c..3aa202d0e8 100644
--- a/angularjs/angular-resource-tests.ts
+++ b/angularjs/angular-resource-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-resource.d.ts" />
+
 
 
 import IHttpPromiseCallbackArg = angular.IHttpPromiseCallbackArg;
@@ -98,9 +98,7 @@ resource = resourceClass.save({ key: 'value' }, { key: 'value' }, function () {
 
 var promise : angular.IPromise<IMyResource>;
 var arrayPromise : angular.IPromise<IMyResource[]>;
-var json: {
-  [index: string]: any;
-};
+var json: IMyResource;
 
 promise = resource.$delete();
 promise = resource.$delete({ key: 'value' });
diff --git a/angularjs/angular-resource.d.ts b/angularjs/angular-resource.d.ts
index caae65ccb2..bf9c8030cd 100644
--- a/angularjs/angular-resource.d.ts
+++ b/angularjs/angular-resource.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Diego Vilar <http://github.com/diegovilar>, Michael Jess <http://github.com/miffels>
 // Definitions: https://github.com/daptiv/DefinitelyTyped
 
-/// <reference path="angular.d.ts" />
 
 declare module 'angular-resource' {
     var _: string;
@@ -153,9 +152,7 @@ declare namespace angular.resource {
         /** the promise of the original server interaction that created this instance. **/
         $promise : angular.IPromise<T>;
         $resolved : boolean;
-        toJSON: () => {
-          [index: string]: any;
-        }
+        toJSON(): T;
     }
 
     /**
diff --git a/angularjs/angular-route-tests.ts b/angularjs/angular-route-tests.ts
index ab5fba0b62..0fefab51f7 100644
--- a/angularjs/angular-route-tests.ts
+++ b/angularjs/angular-route-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="angular.d.ts" />
-/// <reference path="angular-route.d.ts" />
+
+
 
 /**
  * @license HTTP Auth Interceptor Module for AngularJS
diff --git a/angularjs/angular-route.d.ts b/angularjs/angular-route.d.ts
index 19dbf04896..569abc9df5 100644
--- a/angularjs/angular-route.d.ts
+++ b/angularjs/angular-route.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Jonathan Park <https://github.com/park9140>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="angular.d.ts" />
 
 declare module "angular-route" {
     var _: string;
diff --git a/angularjs/angular-sanitize-tests.ts b/angularjs/angular-sanitize-tests.ts
index d065392c79..94bb6615ec 100644
--- a/angularjs/angular-sanitize-tests.ts
+++ b/angularjs/angular-sanitize-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-sanitize.d.ts" />
+
 
 var shouldBeString: string;
 
diff --git a/angularjs/angular-sanitize.d.ts b/angularjs/angular-sanitize.d.ts
index d87515adca..d677af7b2f 100644
--- a/angularjs/angular-sanitize.d.ts
+++ b/angularjs/angular-sanitize.d.ts
@@ -4,7 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="angular.d.ts" />
 
 declare module "angular-sanitize" {
     var _: string;
diff --git a/angularjs/angular-tests.ts b/angularjs/angular-tests.ts
index 0539ae62ac..1f7bd6d492 100644
--- a/angularjs/angular-tests.ts
+++ b/angularjs/angular-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="angular.d.ts" />
 
 // issue: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/369
 // https://github.com/witoldsz/angular-http-auth/blob/master/src/angular-http-auth.js
diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts
deleted file mode 100644
index e86fd37052..0000000000
--- a/angularjs/angular.d.ts
+++ /dev/null
@@ -1,1932 +0,0 @@
-// Type definitions for Angular JS 1.5
-// Project: http://angularjs.org
-// Definitions by: Diego Vilar <http://github.com/diegovilar>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare var angular: angular.IAngularStatic;
-
-// Support for painless dependency injection
-interface Function {
-    $inject?: string[];
-}
-
-// Collapse angular into ng
-import ng = angular;
-// Support AMD require
-declare module 'angular' {
-    export = angular;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// ng module (angular.js)
-///////////////////////////////////////////////////////////////////////////////
-declare namespace angular {
-
-    // not directly implemented, but ensures that constructed class implements $get
-    interface IServiceProviderClass {
-        new (...args: any[]): IServiceProvider;
-    }
-
-    interface IServiceProviderFactory {
-        (...args: any[]): IServiceProvider;
-    }
-
-    // All service providers extend this interface
-    interface IServiceProvider {
-        $get: any;
-    }
-
-    interface IAngularBootstrapConfig {
-        strictDi?: boolean;
-        debugInfoEnabled?: boolean;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // AngularStatic
-    // see http://docs.angularjs.org/api
-    ///////////////////////////////////////////////////////////////////////////
-    interface IAngularStatic {
-        bind(context: any, fn: Function, ...args: any[]): Function;
-
-        /**
-         * Use this function to manually start up angular application.
-         *
-         * @param element DOM element which is the root of angular application.
-         * @param modules An array of modules to load into the application.
-         *     Each item in the array should be the name of a predefined module or a (DI annotated)
-         *     function that will be invoked by the injector as a config block.
-         * @param config an object for defining configuration options for the application. The following keys are supported:
-         *     - `strictDi`: disable automatic function annotation for the application. This is meant to assist in finding bugs which break minified code.
-         */
-        bootstrap(element: string|Element|JQuery|Document, modules?: (string|Function|any[])[], config?: IAngularBootstrapConfig): auto.IInjectorService;
-
-        /**
-         * Creates a deep copy of source, which should be an object or an array.
-         *
-         * - If no destination is supplied, a copy of the object or array is created.
-         * - If a destination is provided, all of its elements (for array) or properties (for objects) are deleted and then all elements/properties from the source are copied to it.
-         * - If source is not an object or array (inc. null and undefined), source is returned.
-         * - If source is identical to 'destination' an exception will be thrown.
-         *
-         * @param source The source that will be used to make a copy. Can be any type, including primitives, null, and undefined.
-         * @param destination Destination into which the source is copied. If provided, must be of the same type as source.
-         */
-        copy<T>(source: T, destination?: T): T;
-
-        /**
-         * Wraps a raw DOM element or HTML string as a jQuery element.
-         *
-         * If jQuery is available, angular.element is an alias for the jQuery function. If jQuery is not available, angular.element delegates to Angular's built-in subset of jQuery, called "jQuery lite" or "jqLite."
-         */
-        element: IAugmentedJQueryStatic;
-        equals(value1: any, value2: any): boolean;
-        extend(destination: any, ...sources: any[]): any;
-
-        /**
-         * Invokes the iterator function once for each item in obj collection, which can be either an object or an array. The iterator function is invoked with iterator(value, key), where value is the value of an object property or an array element and key is the object property key or array element index. Specifying a context for the function is optional.
-         *
-         * It is worth noting that .forEach does not iterate over inherited properties because it filters using the hasOwnProperty method.
-         *
-         * @param obj Object to iterate over.
-         * @param iterator Iterator function.
-         * @param context Object to become context (this) for the iterator function.
-         */
-        forEach<T>(obj: T[], iterator: (value: T, key: number) => any, context?: any): any;
-        /**
-         * Invokes the iterator function once for each item in obj collection, which can be either an object or an array. The iterator function is invoked with iterator(value, key), where value is the value of an object property or an array element and key is the object property key or array element index. Specifying a context for the function is optional.
-         *
-         * It is worth noting that .forEach does not iterate over inherited properties because it filters using the hasOwnProperty method.
-         *
-         * @param obj Object to iterate over.
-         * @param iterator Iterator function.
-         * @param context Object to become context (this) for the iterator function.
-         */
-        forEach<T>(obj: { [index: string]: T; }, iterator: (value: T, key: string) => any, context?: any): any;
-        /**
-         * Invokes the iterator function once for each item in obj collection, which can be either an object or an array. The iterator function is invoked with iterator(value, key), where value is the value of an object property or an array element and key is the object property key or array element index. Specifying a context for the function is optional.
-         *
-         * It is worth noting that .forEach does not iterate over inherited properties because it filters using the hasOwnProperty method.
-         *
-         * @param obj Object to iterate over.
-         * @param iterator Iterator function.
-         * @param context Object to become context (this) for the iterator function.
-         */
-        forEach(obj: any, iterator: (value: any, key: any) => any, context?: any): any;
-
-        fromJson(json: string): any;
-        identity<T>(arg?: T): T;
-        injector(modules?: any[], strictDi?: boolean): auto.IInjectorService;
-        isArray(value: any): boolean;
-        isDate(value: any): boolean;
-        isDefined(value: any): boolean;
-        isElement(value: any): boolean;
-        isFunction(value: any): boolean;
-        isNumber(value: any): boolean;
-        isObject(value: any): boolean;
-        isString(value: any): boolean;
-        isUndefined(value: any): boolean;
-        lowercase(str: string): string;
-
-        /**
-         * Deeply extends the destination object dst by copying own enumerable properties from the src object(s) to dst. You can specify multiple src objects. If you want to preserve original objects, you can do so by passing an empty object as the target: var object = angular.merge({}, object1, object2).
-         *
-         * Unlike extend(), merge() recursively descends into object properties of source objects, performing a deep copy.
-         *
-         * @param dst Destination object.
-         * @param src Source object(s).
-         */
-        merge(dst: any, ...src: any[]): any;
-
-        /**
-         * The angular.module is a global place for creating, registering and retrieving Angular modules. All modules (angular core or 3rd party) that should be available to an application must be registered using this mechanism.
-         *
-         * When passed two or more arguments, a new module is created. If passed only one argument, an existing module (the name passed as the first argument to module) is retrieved.
-         *
-         * @param name The name of the module to create or retrieve.
-         * @param requires The names of modules this module depends on. If specified then new module is being created. If unspecified then the module is being retrieved for further configuration.
-         * @param configFn Optional configuration function for the module.
-         */
-        module(
-            name: string,
-            requires?: string[],
-            configFn?: Function): IModule;
-
-        noop(...args: any[]): void;
-        reloadWithDebugInfo(): void;
-        toJson(obj: any, pretty?: boolean): string;
-        uppercase(str: string): string;
-        version: {
-            full: string;
-            major: number;
-            minor: number;
-            dot: number;
-            codeName: string;
-        };
-
-        /**
-         * If window.name contains prefix NG_DEFER_BOOTSTRAP! when angular.bootstrap is called, the bootstrap process will be paused until angular.resumeBootstrap() is called.
-         * @param extraModules An optional array of modules that should be added to the original list of modules that the app was about to be bootstrapped with.
-         */
-        resumeBootstrap?(extraModules?: string[]): ng.auto.IInjectorService;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Module
-    // see http://docs.angularjs.org/api/angular.Module
-    ///////////////////////////////////////////////////////////////////////////
-    interface IModule {
-        /**
-         * Use this method to register a component.
-         *
-         * @param name The name of the component.
-         * @param options A definition object passed into the component.
-         */
-        component(name: string, options: IComponentOptions): IModule;
-        /**
-         * Use this method to register work which needs to be performed on module loading.
-         *
-         * @param configFn Execute this function on module load. Useful for service configuration.
-         */
-        config(configFn: Function): IModule;
-        /**
-         * Use this method to register work which needs to be performed on module loading.
-         *
-         * @param inlineAnnotatedFunction Execute this function on module load. Useful for service configuration.
-         */
-        config(inlineAnnotatedFunction: any[]): IModule;
-        config(object: Object): IModule;
-        /**
-         * Register a constant service, such as a string, a number, an array, an object or a function, with the $injector. Unlike value it can be injected into a module configuration function (see config) and it cannot be overridden by an Angular decorator.
-         *
-         * @param name The name of the constant.
-         * @param value The constant value.
-         */
-        constant(name: string, value: any): IModule;
-        constant(object: Object): IModule;
-        /**
-         * The $controller service is used by Angular to create new controllers.
-         *
-         * This provider allows controller registration via the register method.
-         *
-         * @param name Controller name, or an object map of controllers where the keys are the names and the values are the constructors.
-         * @param controllerConstructor Controller constructor fn (optionally decorated with DI annotations in the array notation).
-         */
-        controller(name: string, controllerConstructor: Function): IModule;
-        /**
-         * The $controller service is used by Angular to create new controllers.
-         *
-         * This provider allows controller registration via the register method.
-         *
-         * @param name Controller name, or an object map of controllers where the keys are the names and the values are the constructors.
-         * @param controllerConstructor Controller constructor fn (optionally decorated with DI annotations in the array notation).
-         */
-        controller(name: string, inlineAnnotatedConstructor: any[]): IModule;
-        controller(object: Object): IModule;
-        /**
-         * Register a new directive with the compiler.
-         *
-         * @param name Name of the directive in camel-case (i.e. ngBind which will match as ng-bind)
-         * @param directiveFactory An injectable directive factory function.
-         */
-        directive(name: string, directiveFactory: IDirectiveFactory): IModule;
-        /**
-         * Register a new directive with the compiler.
-         *
-         * @param name Name of the directive in camel-case (i.e. ngBind which will match as ng-bind)
-         * @param directiveFactory An injectable directive factory function.
-         */
-        directive(name: string, inlineAnnotatedFunction: any[]): IModule;
-        directive(object: Object): IModule;
-        /**
-         * Register a service factory, which will be called to return the service instance. This is short for registering a service where its provider consists of only a $get property, which is the given service factory function. You should use $provide.factory(getFn) if you do not need to configure your service in a provider.
-         *
-         * @param name The name of the instance.
-         * @param $getFn The $getFn for the instance creation. Internally this is a short hand for $provide.provider(name, {$get: $getFn}).
-         */
-        factory(name: string, $getFn: Function): IModule;
-        /**
-         * Register a service factory, which will be called to return the service instance. This is short for registering a service where its provider consists of only a $get property, which is the given service factory function. You should use $provide.factory(getFn) if you do not need to configure your service in a provider.
-         *
-         * @param name The name of the instance.
-         * @param inlineAnnotatedFunction The $getFn for the instance creation. Internally this is a short hand for $provide.provider(name, {$get: $getFn}).
-         */
-        factory(name: string, inlineAnnotatedFunction: any[]): IModule;
-        factory(object: Object): IModule;
-        filter(name: string, filterFactoryFunction: Function): IModule;
-        filter(name: string, inlineAnnotatedFunction: any[]): IModule;
-        filter(object: Object): IModule;
-        provider(name: string, serviceProviderFactory: IServiceProviderFactory): IModule;
-        provider(name: string, serviceProviderConstructor: IServiceProviderClass): IModule;
-        provider(name: string, inlineAnnotatedConstructor: any[]): IModule;
-        provider(name: string, providerObject: IServiceProvider): IModule;
-        provider(object: Object): IModule;
-        /**
-         * Run blocks are the closest thing in Angular to the main method. A run block is the code which needs to run to kickstart the application. It is executed after all of the service have been configured and the injector has been created. Run blocks typically contain code which is hard to unit-test, and for this reason should be declared in isolated modules, so that they can be ignored in the unit-tests.
-         */
-        run(initializationFunction: Function): IModule;
-        /**
-         * Run blocks are the closest thing in Angular to the main method. A run block is the code which needs to run to kickstart the application. It is executed after all of the service have been configured and the injector has been created. Run blocks typically contain code which is hard to unit-test, and for this reason should be declared in isolated modules, so that they can be ignored in the unit-tests.
-         */
-        run(inlineAnnotatedFunction: any[]): IModule;
-        /**
-         * Register a service constructor, which will be invoked with new to create the service instance. This is short for registering a service where its provider's $get property is a factory function that returns an instance instantiated by the injector from the service constructor function.
-         *
-         * @param name The name of the instance.
-         * @param serviceConstructor An injectable class (constructor function) that will be instantiated.
-         */
-        service(name: string, serviceConstructor: Function): IModule;
-        /**
-         * Register a service constructor, which will be invoked with new to create the service instance. This is short for registering a service where its provider's $get property is a factory function that returns an instance instantiated by the injector from the service constructor function.
-         *
-         * @param name The name of the instance.
-         * @param inlineAnnotatedConstructor An injectable class (constructor function) that will be instantiated.
-         */
-        service(name: string, inlineAnnotatedConstructor: any[]): IModule;
-        service(object: Object): IModule;
-        /**
-         * Register a value service with the $injector, such as a string, a number, an array, an object or a function. This is short for registering a service where its provider's $get property is a factory function that takes no arguments and returns the value service.
-
-           Value services are similar to constant services, except that they cannot be injected into a module configuration function (see config) but they can be overridden by an Angular decorator.
-         *
-         * @param name The name of the instance.
-         * @param value The value.
-         */
-        value(name: string, value: any): IModule;
-        value(object: Object): IModule;
-
-        /**
-         * Register a service decorator with the $injector. A service decorator intercepts the creation of a service, allowing it to override or modify the behaviour of the service. The object returned by the decorator may be the original service, or a new service object which replaces or wraps and delegates to the original service.
-         * @param name The name of the service to decorate
-         * @param decorator This function will be invoked when the service needs to be instantiated and should return the decorated service instance. The function is called using the injector.invoke method and is therefore fully injectable. Local injection arguments: $delegate - The original service instance, which can be monkey patched, configured, decorated or delegated to.
-         */
-        decorator(name:string, decoratorConstructor: Function): IModule;
-        decorator(name:string, inlineAnnotatedConstructor: any[]): IModule;
-
-        // Properties
-        name: string;
-        requires: string[];
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Attributes
-    // see http://docs.angularjs.org/api/ng.$compile.directive.Attributes
-    ///////////////////////////////////////////////////////////////////////////
-    interface IAttributes {
-        /**
-         * this is necessary to be able to access the scoped attributes. it's not very elegant
-         * because you have to use attrs['foo'] instead of attrs.foo but I don't know of a better way
-         * this should really be limited to return string but it creates this problem: http://stackoverflow.com/q/17201854/165656
-         */
-        [name: string]: any;
-
-        /**
-         * Converts an attribute name (e.g. dash/colon/underscore-delimited string, optionally prefixed with x- or data-) to its normalized, camelCase form.
-         *
-         * Also there is special case for Moz prefix starting with upper case letter.
-         *
-         * For further information check out the guide on @see https://docs.angularjs.org/guide/directive#matching-directives
-         */
-        $normalize(name: string): string;
-
-        /**
-         * Adds the CSS class value specified by the classVal parameter to the
-         * element. If animations are enabled then an animation will be triggered
-         * for the class addition.
-         */
-        $addClass(classVal: string): void;
-
-        /**
-         * Removes the CSS class value specified by the classVal parameter from the
-         * element. If animations are enabled then an animation will be triggered for
-         * the class removal.
-         */
-        $removeClass(classVal: string): void;
-
-        /**
-         * Adds and removes the appropriate CSS class values to the element based on the difference between
-         * the new and old CSS class values (specified as newClasses and oldClasses).
-         */
-        $updateClass(newClasses: string, oldClasses: string): void;
-
-        /**
-         * Set DOM element attribute value.
-         */
-        $set(key: string, value: any): void;
-
-        /**
-         * Observes an interpolated attribute.
-         * The observer function will be invoked once during the next $digest
-         * following compilation. The observer is then invoked whenever the
-         * interpolated value changes.
-         */
-        $observe<T>(name: string, fn: (value?: T) => any): Function;
-
-        /**
-         * A map of DOM element attribute names to the normalized name. This is needed
-         * to do reverse lookup from normalized name back to actual name.
-         */
-        $attr: Object;
-    }
-
-    /**
-     * form.FormController - type in module ng
-     * see https://docs.angularjs.org/api/ng/type/form.FormController
-     */
-    interface IFormController {
-
-        /**
-         * Indexer which should return ng.INgModelController for most properties but cannot because of "All named properties must be assignable to string indexer type" constraint - see https://github.com/Microsoft/TypeScript/issues/272
-         */
-        [name: string]: any;
-
-        $pristine: boolean;
-        $dirty: boolean;
-        $valid: boolean;
-        $invalid: boolean;
-        $submitted: boolean;
-        $error: any;
-        $pending: any;
-        $addControl(control: INgModelController): void;
-        $removeControl(control: INgModelController): void;
-        $setValidity(validationErrorKey: string, isValid: boolean, control: INgModelController): void;
-        $setDirty(): void;
-        $setPristine(): void;
-        $commitViewValue(): void;
-        $rollbackViewValue(): void;
-        $setSubmitted(): void;
-        $setUntouched(): void;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // NgModelController
-    // see http://docs.angularjs.org/api/ng.directive:ngModel.NgModelController
-    ///////////////////////////////////////////////////////////////////////////
-    interface INgModelController {
-        $render(): void;
-        $setValidity(validationErrorKey: string, isValid: boolean): void;
-        // Documentation states viewValue and modelValue to be a string but other
-        // types do work and it's common to use them.
-        $setViewValue(value: any, trigger?: string): void;
-        $setPristine(): void;
-        $setDirty(): void;
-        $validate(): void;
-        $setTouched(): void;
-        $setUntouched(): void;
-        $rollbackViewValue(): void;
-        $commitViewValue(): void;
-        $isEmpty(value: any): boolean;
-
-        $viewValue: any;
-
-        $modelValue: any;
-
-        $parsers: IModelParser[];
-        $formatters: IModelFormatter[];
-        $viewChangeListeners: IModelViewChangeListener[];
-        $error: any;
-        $name: string;
-
-        $touched: boolean;
-        $untouched: boolean;
-
-        $validators: IModelValidators;
-        $asyncValidators: IAsyncModelValidators;
-
-        $pending: any;
-        $pristine: boolean;
-        $dirty: boolean;
-        $valid: boolean;
-        $invalid: boolean;
-    }
-
-    //Allows tuning how model updates are done.
-    //https://docs.angularjs.org/api/ng/directive/ngModelOptions
-    interface INgModelOptions {
-        updateOn?: string;
-        debounce?: any;
-        allowInvalid?: boolean;
-        getterSetter?: boolean;
-        timezone?: string;
-    }
-
-    interface IModelValidators {
-        /**
-         * viewValue is any because it can be an object that is called in the view like $viewValue.name:$viewValue.subName
-         */
-        [index: string]: (modelValue: any, viewValue: any) => boolean;
-    }
-
-    interface IAsyncModelValidators {
-        [index: string]: (modelValue: any, viewValue: any) => IPromise<any>;
-    }
-
-    interface IModelParser {
-        (value: any): any;
-    }
-
-    interface IModelFormatter {
-        (value: any): any;
-    }
-
-    interface IModelViewChangeListener {
-        (): void;
-    }
-
-    /**
-     * $rootScope - $rootScopeProvider - service in module ng
-     * see https://docs.angularjs.org/api/ng/type/$rootScope.Scope and https://docs.angularjs.org/api/ng/service/$rootScope
-     */
-    interface IRootScopeService {
-        [index: string]: any;
-
-        $apply(): any;
-        $apply(exp: string): any;
-        $apply(exp: (scope: IScope) => any): any;
-
-        $applyAsync(): any;
-        $applyAsync(exp: string): any;
-        $applyAsync(exp: (scope: IScope) => any): any;
-
-        /**
-         * Dispatches an event name downwards to all child scopes (and their children) notifying the registered $rootScope.Scope listeners.
-         *
-         * The event life cycle starts at the scope on which $broadcast was called. All listeners listening for name event on this scope get notified. Afterwards, the event propagates to all direct and indirect scopes of the current scope and calls all registered listeners along the way. The event cannot be canceled.
-         *
-         * Any exception emitted from the listeners will be passed onto the $exceptionHandler service.
-         *
-         * @param name Event name to broadcast.
-         * @param args Optional one or more arguments which will be passed onto the event listeners.
-         */
-        $broadcast(name: string, ...args: any[]): IAngularEvent;
-        $destroy(): void;
-        $digest(): void;
-        /**
-         * Dispatches an event name upwards through the scope hierarchy notifying the registered $rootScope.Scope listeners.
-         *
-         * The event life cycle starts at the scope on which $emit was called. All listeners listening for name event on this scope get notified. Afterwards, the event traverses upwards toward the root scope and calls all registered listeners along the way. The event will stop propagating if one of the listeners cancels it.
-         *
-         * Any exception emitted from the listeners will be passed onto the $exceptionHandler service.
-         *
-         * @param name Event name to emit.
-         * @param args Optional one or more arguments which will be passed onto the event listeners.
-         */
-        $emit(name: string, ...args: any[]): IAngularEvent;
-
-        $eval(): any;
-        $eval(expression: string, locals?: Object): any;
-        $eval(expression: (scope: IScope) => any, locals?: Object): any;
-
-        $evalAsync(): void;
-        $evalAsync(expression: string): void;
-        $evalAsync(expression: (scope: IScope) => any): void;
-
-        // Defaults to false by the implementation checking strategy
-        $new(isolate?: boolean, parent?: IScope): IScope;
-
-        /**
-         * Listens on events of a given type. See $emit for discussion of event life cycle.
-         *
-         * The event listener function format is: function(event, args...).
-         *
-         * @param name Event name to listen on.
-         * @param listener Function to call when the event is emitted.
-         */
-        $on(name: string, listener: (event: IAngularEvent, ...args: any[]) => any): () => void;
-
-        $watch(watchExpression: string, listener?: string, objectEquality?: boolean): () => void;
-        $watch<T>(watchExpression: string, listener?: (newValue: T, oldValue: T, scope: IScope) => any, objectEquality?: boolean): () => void;
-        $watch(watchExpression: (scope: IScope) => any, listener?: string, objectEquality?: boolean): () => void;
-        $watch<T>(watchExpression: (scope: IScope) => T, listener?: (newValue: T, oldValue: T, scope: IScope) => any, objectEquality?: boolean): () => void;
-
-        $watchCollection<T>(watchExpression: string, listener: (newValue: T, oldValue: T, scope: IScope) => any): () => void;
-        $watchCollection<T>(watchExpression: (scope: IScope) => T, listener: (newValue: T, oldValue: T, scope: IScope) => any): () => void;
-
-        $watchGroup(watchExpressions: any[], listener: (newValue: any, oldValue: any, scope: IScope) => any): () => void;
-        $watchGroup(watchExpressions: { (scope: IScope): any }[], listener: (newValue: any, oldValue: any, scope: IScope) => any): () => void;
-
-        $parent: IScope;
-        $root: IRootScopeService;
-        $id: number;
-
-        // Hidden members
-        $$isolateBindings: any;
-        $$phase: any;
-    }
-
-    interface IScope extends IRootScopeService { }
-
-    /**
-     * $scope for ngRepeat directive.
-     * see https://docs.angularjs.org/api/ng/directive/ngRepeat
-     */
-    interface IRepeatScope extends IScope {
-
-        /**
-         * iterator offset of the repeated element (0..length-1).
-         */
-        $index: number;
-
-        /**
-         * true if the repeated element is first in the iterator.
-         */
-        $first: boolean;
-
-        /**
-         * true if the repeated element is between the first and last in the iterator.
-         */
-        $middle: boolean;
-
-        /**
-         * true if the repeated element is last in the iterator.
-         */
-        $last: boolean;
-
-        /**
-         * true if the iterator position $index is even (otherwise false).
-         */
-        $even: boolean;
-
-        /**
-         * true if the iterator position $index is odd (otherwise false).
-         */
-        $odd: boolean;
-
-    }
-
-    interface IAngularEvent {
-        /**
-         * the scope on which the event was $emit-ed or $broadcast-ed.
-         */
-        targetScope: IScope;
-        /**
-         * the scope that is currently handling the event. Once the event propagates through the scope hierarchy, this property is set to null.
-         */
-        currentScope: IScope;
-        /**
-         * name of the event.
-         */
-        name: string;
-        /**
-         * calling stopPropagation function will cancel further event propagation (available only for events that were $emit-ed).
-         */
-        stopPropagation?: Function;
-        /**
-         * calling preventDefault sets defaultPrevented flag to true.
-         */
-        preventDefault: Function;
-        /**
-         * true if preventDefault was called.
-         */
-        defaultPrevented: boolean;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // WindowService
-    // see http://docs.angularjs.org/api/ng.$window
-    ///////////////////////////////////////////////////////////////////////////
-    interface IWindowService extends Window {
-        [key: string]: any;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // TimeoutService
-    // see http://docs.angularjs.org/api/ng.$timeout
-    ///////////////////////////////////////////////////////////////////////////
-    interface ITimeoutService {
-        (delay?: number, invokeApply?: boolean): IPromise<void>;
-        <T>(fn: (...args: any[]) => T, delay?: number, invokeApply?: boolean, ...args: any[]): IPromise<T>;
-        cancel(promise?: IPromise<any>): boolean;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // IntervalService
-    // see http://docs.angularjs.org/api/ng.$interval
-    ///////////////////////////////////////////////////////////////////////////
-    interface IIntervalService {
-        (func: Function, delay: number, count?: number, invokeApply?: boolean, ...args: any[]): IPromise<any>;
-        cancel(promise: IPromise<any>): boolean;
-    }
-
-    /**
-     * $filter - $filterProvider - service in module ng
-     *
-     * Filters are used for formatting data displayed to the user.
-     *
-     * see https://docs.angularjs.org/api/ng/service/$filter
-     */
-    interface IFilterService {
-        (name: 'filter'): IFilterFilter;
-        (name: 'currency'): IFilterCurrency;
-        (name: 'number'): IFilterNumber;
-        (name: 'date'): IFilterDate;
-        (name: 'json'): IFilterJson;
-        (name: 'lowercase'): IFilterLowercase;
-        (name: 'uppercase'): IFilterUppercase;
-        (name: 'limitTo'): IFilterLimitTo;
-        (name: 'orderBy'): IFilterOrderBy;
-        /**
-         * Usage:
-         * $filter(name);
-         *
-         * @param name Name of the filter function to retrieve
-         */
-        <T>(name: string): T;
-    }
-
-    interface IFilterFilter {
-        <T>(array: T[], expression: string | IFilterFilterPatternObject | IFilterFilterPredicateFunc<T>, comparator?: IFilterFilterComparatorFunc<T>|boolean): T[];
-    }
-
-    interface IFilterFilterPatternObject {
-        [name: string]: any;
-    }
-
-    interface IFilterFilterPredicateFunc<T> {
-        (value: T, index: number, array: T[]): boolean;
-    }
-
-    interface IFilterFilterComparatorFunc<T> {
-        (actual: T, expected: T): boolean;
-    }
-
-    interface IFilterCurrency {
-        /**
-         * Formats a number as a currency (ie $1,234.56). When no currency symbol is provided, default symbol for current locale is used.
-         * @param amount Input to filter.
-         * @param symbol Currency symbol or identifier to be displayed.
-         * @param fractionSize Number of decimal places to round the amount to, defaults to default max fraction size for current locale
-         * @return Formatted number
-         */
-        (amount: number, symbol?: string, fractionSize?: number): string;
-    }
-
-    interface IFilterNumber {
-        /**
-         * Formats a number as text.
-         * @param number Number to format.
-         * @param fractionSize Number of decimal places to round the number to. If this is not provided then the fraction size is computed from the current locale's number formatting pattern. In the case of the default locale, it will be 3.
-         * @return Number rounded to decimalPlaces and places a “,” after each third digit.
-         */
-        (value: number|string, fractionSize?: number|string): string;
-    }
-
-    interface IFilterDate {
-        /**
-         * Formats date to a string based on the requested format.
-         *
-         * @param date Date to format either as Date object, milliseconds (string or number) or various ISO 8601 datetime string formats (e.g. yyyy-MM-ddTHH:mm:ss.sssZ and its shorter versions like yyyy-MM-ddTHH:mmZ, yyyy-MM-dd or yyyyMMddTHHmmssZ). If no timezone is specified in the string input, the time is considered to be in the local timezone.
-         * @param format Formatting rules (see Description). If not specified, mediumDate is used.
-         * @param timezone Timezone to be used for formatting. It understands UTC/GMT and the continental US time zone abbreviations, but for general use, use a time zone offset, for example, '+0430' (4 hours, 30 minutes east of the Greenwich meridian) If not specified, the timezone of the browser will be used.
-         * @return Formatted string or the input if input is not recognized as date/millis.
-         */
-        (date: Date | number | string, format?: string, timezone?: string): string;
-    }
-
-    interface IFilterJson {
-        /**
-         * Allows you to convert a JavaScript object into JSON string.
-         * @param object Any JavaScript object (including arrays and primitive types) to filter.
-         * @param spacing The number of spaces to use per indentation, defaults to 2.
-         * @return JSON string.
-         */
-        (object: any, spacing?: number): string;
-    }
-
-    interface IFilterLowercase {
-        /**
-         * Converts string to lowercase.
-         */
-        (value: string): string;
-    }
-
-    interface IFilterUppercase {
-        /**
-         * Converts string to uppercase.
-         */
-        (value: string): string;
-    }
-
-    interface IFilterLimitTo {
-        /**
-         * Creates a new array containing only a specified number of elements. The elements are taken from either the beginning or the end of the source array, string or number, as specified by the value and sign (positive or negative) of limit.
-         * @param input Source array to be limited.
-         * @param limit The length of the returned array. If the limit number is positive, limit number of items from the beginning of the source array/string are copied. If the number is negative, limit number of items from the end of the source array are copied. The limit will be trimmed if it exceeds array.length. If limit is undefined, the input will be returned unchanged.
-         * @param begin Index at which to begin limitation. As a negative index, begin indicates an offset from the end of input. Defaults to 0.
-         * @return A new sub-array of length limit or less if input array had less than limit elements.
-         */
-        <T>(input: T[], limit: string|number, begin?: string|number): T[];
-        /**
-         * Creates a new string containing only a specified number of elements. The elements are taken from either the beginning or the end of the source string or number, as specified by the value and sign (positive or negative) of limit. If a number is used as input, it is converted to a string.
-         * @param input Source string or number to be limited.
-         * @param limit The length of the returned string. If the limit number is positive, limit number of items from the beginning of the source string are copied. If the number is negative, limit number of items from the end of the source string are copied. The limit will be trimmed if it exceeds input.length. If limit is undefined, the input will be returned unchanged.
-         * @param begin Index at which to begin limitation. As a negative index, begin indicates an offset from the end of input. Defaults to 0.
-         * @return A new substring of length limit or less if input had less than limit elements.
-         */
-        (input: string|number, limit: string|number, begin?: string|number): string;
-    }
-
-    interface IFilterOrderBy {
-        /**
-         * Orders a specified array by the expression predicate. It is ordered alphabetically for strings and numerically for numbers. Note: if you notice numbers are not being sorted as expected, make sure they are actually being saved as numbers and not strings.
-         * @param array The array to sort.
-         * @param expression A predicate to be used by the comparator to determine the order of elements.
-         * @param reverse Reverse the order of the array.
-         * @return Reverse the order of the array.
-         */
-        <T>(array: T[], expression: string|((value: T) => any)|(((value: T) => any)|string)[], reverse?: boolean): T[];
-    }
-
-    /**
-     * $filterProvider - $filter - provider in module ng
-     *
-     * Filters are just functions which transform input to an output. However filters need to be Dependency Injected. To achieve this a filter definition consists of a factory function which is annotated with dependencies and is responsible for creating a filter function.
-     *
-     * see https://docs.angularjs.org/api/ng/provider/$filterProvider
-     */
-    interface IFilterProvider extends IServiceProvider {
-        /**
-         * register(name);
-         *
-         * @param name Name of the filter function, or an object map of filters where the keys are the filter names and the values are the filter factories. Note: Filter names must be valid angular Expressions identifiers, such as uppercase or orderBy. Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace your filters, then you can use capitalization (myappSubsectionFilterx) or underscores (myapp_subsection_filterx).
-         */
-        register(name: string | {}): IServiceProvider;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // LocaleService
-    // see http://docs.angularjs.org/api/ng.$locale
-    ///////////////////////////////////////////////////////////////////////////
-    interface ILocaleService {
-        id: string;
-
-        // These are not documented
-        // Check angular's i18n files for exemples
-        NUMBER_FORMATS: ILocaleNumberFormatDescriptor;
-        DATETIME_FORMATS: ILocaleDateTimeFormatDescriptor;
-        pluralCat: (num: any) => string;
-    }
-
-    interface ILocaleNumberFormatDescriptor {
-        DECIMAL_SEP: string;
-        GROUP_SEP: string;
-        PATTERNS: ILocaleNumberPatternDescriptor[];
-        CURRENCY_SYM: string;
-    }
-
-    interface ILocaleNumberPatternDescriptor {
-        minInt: number;
-        minFrac: number;
-        maxFrac: number;
-        posPre: string;
-        posSuf: string;
-        negPre: string;
-        negSuf: string;
-        gSize: number;
-        lgSize: number;
-    }
-
-    interface ILocaleDateTimeFormatDescriptor {
-        MONTH: string[];
-        SHORTMONTH: string[];
-        DAY: string[];
-        SHORTDAY: string[];
-        AMPMS: string[];
-        medium: string;
-        short: string;
-        fullDate: string;
-        longDate: string;
-        mediumDate: string;
-        shortDate: string;
-        mediumTime: string;
-        shortTime: string;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // LogService
-    // see http://docs.angularjs.org/api/ng.$log
-    // see http://docs.angularjs.org/api/ng.$logProvider
-    ///////////////////////////////////////////////////////////////////////////
-    interface ILogService {
-        debug: ILogCall;
-        error: ILogCall;
-        info: ILogCall;
-        log: ILogCall;
-        warn: ILogCall;
-    }
-
-    interface ILogProvider extends IServiceProvider {
-        debugEnabled(): boolean;
-        debugEnabled(enabled: boolean): ILogProvider;
-    }
-
-    // We define this as separate interface so we can reopen it later for
-    // the ngMock module.
-    interface ILogCall {
-        (...args: any[]): void;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // ParseService
-    // see http://docs.angularjs.org/api/ng.$parse
-    // see http://docs.angularjs.org/api/ng.$parseProvider
-    ///////////////////////////////////////////////////////////////////////////
-    interface IParseService {
-        (expression: string): ICompiledExpression;
-    }
-
-    interface IParseProvider {
-        logPromiseWarnings(): boolean;
-        logPromiseWarnings(value: boolean): IParseProvider;
-
-        unwrapPromises(): boolean;
-        unwrapPromises(value: boolean): IParseProvider;
-    }
-
-    interface ICompiledExpression {
-        (context: any, locals?: any): any;
-
-        literal: boolean;
-        constant: boolean;
-
-        // If value is not provided, undefined is gonna be used since the implementation
-        // does not check the parameter. Let's force a value for consistency. If consumer
-        // whants to undefine it, pass the undefined value explicitly.
-        assign(context: any, value: any): any;
-    }
-
-    /**
-     * $location - $locationProvider - service in module ng
-     * see https://docs.angularjs.org/api/ng/service/$location
-     */
-    interface ILocationService {
-        absUrl(): string;
-        hash(): string;
-        hash(newHash: string): ILocationService;
-        host(): string;
-
-        /**
-         * Return path of current url
-         */
-        path(): string;
-
-        /**
-         * Change path when called with parameter and return $location.
-         * Note: Path should always begin with forward slash (/), this method will add the forward slash if it is missing.
-         *
-         * @param path New path
-         */
-        path(path: string): ILocationService;
-
-        port(): number;
-        protocol(): string;
-        replace(): ILocationService;
-
-        /**
-         * Return search part (as object) of current url
-         */
-        search(): any;
-
-        /**
-         * Change search part when called with parameter and return $location.
-         *
-         * @param search When called with a single argument the method acts as a setter, setting the search component of $location to the specified value.
-         *
-         * If the argument is a hash object containing an array of values, these values will be encoded as duplicate search parameters in the url.
-         */
-        search(search: any): ILocationService;
-
-        /**
-         * Change search part when called with parameter and return $location.
-         *
-         * @param search New search params
-         * @param paramValue If search is a string or a Number, then paramValue will override only a single search property. If paramValue is null, the property specified via the first argument will be deleted. If paramValue is an array, it will override the property of the search component of $location specified via the first argument. If paramValue is true, the property specified via the first argument will be added with no value nor trailing equal sign.
-         */
-        search(search: string, paramValue: string|number|string[]|boolean): ILocationService;
-
-        state(): any;
-        state(state: any): ILocationService;
-        url(): string;
-        url(url: string): ILocationService;
-    }
-
-    interface ILocationProvider extends IServiceProvider {
-        hashPrefix(): string;
-        hashPrefix(prefix: string): ILocationProvider;
-        html5Mode(): boolean;
-
-        // Documentation states that parameter is string, but
-        // implementation tests it as boolean, which makes more sense
-        // since this is a toggler
-        html5Mode(active: boolean): ILocationProvider;
-        html5Mode(mode: { enabled?: boolean; requireBase?: boolean; rewriteLinks?: boolean; }): ILocationProvider;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // DocumentService
-    // see http://docs.angularjs.org/api/ng.$document
-    ///////////////////////////////////////////////////////////////////////////
-    interface IDocumentService extends IAugmentedJQuery {}
-
-    ///////////////////////////////////////////////////////////////////////////
-    // ExceptionHandlerService
-    // see http://docs.angularjs.org/api/ng.$exceptionHandler
-    ///////////////////////////////////////////////////////////////////////////
-    interface IExceptionHandlerService {
-        (exception: Error, cause?: string): void;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // RootElementService
-    // see http://docs.angularjs.org/api/ng.$rootElement
-    ///////////////////////////////////////////////////////////////////////////
-    interface IRootElementService extends JQuery {}
-
-    interface IQResolveReject<T> {
-        (): void;
-        (value: T): void;
-    }
-    /**
-     * $q - service in module ng
-     * A promise/deferred implementation inspired by Kris Kowal's Q.
-     * See http://docs.angularjs.org/api/ng/service/$q
-     */
-    interface IQService {
-        new <T>(resolver: (resolve: IQResolveReject<T>) => any): IPromise<T>;
-        new <T>(resolver: (resolve: IQResolveReject<T>, reject: IQResolveReject<any>) => any): IPromise<T>;
-        <T>(resolver: (resolve: IQResolveReject<T>) => any): IPromise<T>;
-        <T>(resolver: (resolve: IQResolveReject<T>, reject: IQResolveReject<any>) => any): IPromise<T>;
-
-        /**
-         * Combines multiple promises into a single promise that is resolved when all of the input promises are resolved.
-         *
-         * Returns a single promise that will be resolved with an array of values, each value corresponding to the promise at the same index in the promises array. If any of the promises is resolved with a rejection, this resulting promise will be rejected with the same rejection value.
-         *
-         * @param promises An array of promises.
-         */
-        all<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>, T4 | IPromise <T4>, T5 | IPromise<T5>, T6 | IPromise<T6>, T7 | IPromise<T7>, T8 | IPromise<T8>, T9 | IPromise<T9>, T10 | IPromise<T10>]): IPromise<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>;
-        all<T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>, T4 | IPromise <T4>, T5 | IPromise<T5>, T6 | IPromise<T6>, T7 | IPromise<T7>, T8 | IPromise<T8>, T9 | IPromise<T9>]): IPromise<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>;
-        all<T1, T2, T3, T4, T5, T6, T7, T8>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>, T4 | IPromise <T4>, T5 | IPromise<T5>, T6 | IPromise<T6>, T7 | IPromise<T7>, T8 | IPromise<T8>]): IPromise<[T1, T2, T3, T4, T5, T6, T7, T8]>;
-        all<T1, T2, T3, T4, T5, T6, T7>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>, T4 | IPromise <T4>, T5 | IPromise<T5>, T6 | IPromise<T6>, T7 | IPromise<T7>]): IPromise<[T1, T2, T3, T4, T5, T6, T7]>;
-        all<T1, T2, T3, T4, T5, T6>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>, T4 | IPromise <T4>, T5 | IPromise<T5>, T6 | IPromise<T6>]): IPromise<[T1, T2, T3, T4, T5, T6]>;
-        all<T1, T2, T3, T4, T5>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>, T4 | IPromise <T4>, T5 | IPromise<T5>]): IPromise<[T1, T2, T3, T4, T5]>;
-        all<T1, T2, T3, T4>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>, T4 | IPromise <T4>]): IPromise<[T1, T2, T3, T4]>;
-        all<T1, T2, T3>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>]): IPromise<[T1, T2, T3]>;
-        all<T1, T2>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>]): IPromise<[T1, T2]>;
-        all<TAll>(promises: IPromise<TAll>[]): IPromise<TAll[]>;
-        /**
-         * Combines multiple promises into a single promise that is resolved when all of the input promises are resolved.
-         *
-         * Returns a single promise that will be resolved with a hash of values, each value corresponding to the promise at the same key in the promises hash. If any of the promises is resolved with a rejection, this resulting promise will be rejected with the same rejection value.
-         *
-         * @param promises A hash of promises.
-         */
-        all(promises: { [id: string]: IPromise<any>; }): IPromise<{ [id: string]: any; }>;
-        all<T extends {}>(promises: { [id: string]: IPromise<any>; }): IPromise<T>;
-        /**
-         * Creates a Deferred object which represents a task which will finish in the future.
-         */
-        defer<T>(): IDeferred<T>;
-        /**
-         * Creates a promise that is resolved as rejected with the specified reason. This api should be used to forward rejection in a chain of promises. If you are dealing with the last promise in a promise chain, you don't need to worry about it.
-         *
-         * When comparing deferreds/promises to the familiar behavior of try/catch/throw, think of reject as the throw keyword in JavaScript. This also means that if you "catch" an error via a promise error callback and you want to forward the error to the promise derived from the current promise, you have to "rethrow" the error by returning a rejection constructed via reject.
-         *
-         * @param reason Constant, message, exception or an object representing the rejection reason.
-         */
-        reject(reason?: any): IPromise<any>;
-        /**
-         * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted.
-         *
-         * @param value Value or a promise
-         */
-        resolve<T>(value: IPromise<T>|T): IPromise<T>;
-        /**
-         * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted.
-         */
-        resolve(): IPromise<void>;
-        /**
-         * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted.
-         *
-         * @param value Value or a promise
-         */
-        when<T>(value: IPromise<T>|T): IPromise<T>;
-        /**
-         * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted.
-         */
-        when(): IPromise<void>;
-    }
-
-    interface IPromise<T> {
-        /**
-         * Regardless of when the promise was or will be resolved or rejected, then calls one of the success or error callbacks asynchronously as soon as the result is available. The callbacks are called with a single argument: the result or rejection reason. Additionally, the notify callback may be called zero or more times to provide a progress indication, before the promise is resolved or rejected.
-         * The successCallBack may return IPromise<void> for when a $q.reject() needs to be returned
-         * This method returns a new promise which is resolved or rejected via the return value of the successCallback, errorCallback. It also notifies via the return value of the notifyCallback method. The promise can not be resolved or rejected from the notifyCallback method.
-         */
-        then<TResult>(successCallback: (promiseValue: T) => IPromise<TResult>|TResult, errorCallback?: (reason: any) => any, notifyCallback?: (state: any) => any): IPromise<TResult>;
-
-        /**
-         * Shorthand for promise.then(null, errorCallback)
-         */
-        catch<TResult>(onRejected: (reason: any) => IPromise<TResult>|TResult): IPromise<TResult>;
-
-        /**
-         * Allows you to observe either the fulfillment or rejection of a promise, but to do so without modifying the final value. This is useful to release resources or do some clean-up that needs to be done whether the promise was rejected or resolved. See the full specification for more information.
-         *
-         * Because finally is a reserved word in JavaScript and reserved keywords are not supported as property names by ES3, you'll need to invoke the method like promise['finally'](callback) to make your code IE8 and Android 2.x compatible.
-         */
-        finally(finallyCallback: () => any): IPromise<T>;
-    }
-
-    interface IDeferred<T> {
-        resolve(value?: T|IPromise<T>): void;
-        reject(reason?: any): void;
-        notify(state?: any): void;
-        promise: IPromise<T>;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // AnchorScrollService
-    // see http://docs.angularjs.org/api/ng.$anchorScroll
-    ///////////////////////////////////////////////////////////////////////////
-    interface IAnchorScrollService {
-        (): void;
-        (hash: string): void;
-        yOffset: any;
-    }
-
-    interface IAnchorScrollProvider extends IServiceProvider {
-        disableAutoScrolling(): void;
-    }
-
-    /**
-     * $cacheFactory - service in module ng
-     *
-     * Factory that constructs Cache objects and gives access to them.
-     *
-     * see https://docs.angularjs.org/api/ng/service/$cacheFactory
-     */
-    interface ICacheFactoryService {
-        /**
-         * Factory that constructs Cache objects and gives access to them.
-         *
-         * @param cacheId Name or id of the newly created cache.
-         * @param optionsMap Options object that specifies the cache behavior. Properties:
-         *
-         * capacity — turns the cache into LRU cache.
-         */
-        (cacheId: string, optionsMap?: { capacity?: number; }): ICacheObject;
-
-        /**
-         * Get information about all the caches that have been created.
-         * @returns key-value map of cacheId to the result of calling cache#info
-         */
-        info(): any;
-
-        /**
-         * Get access to a cache object by the cacheId used when it was created.
-         *
-         * @param cacheId Name or id of a cache to access.
-         */
-        get(cacheId: string): ICacheObject;
-    }
-
-    /**
-     * $cacheFactory.Cache - type in module ng
-     *
-     * A cache object used to store and retrieve data, primarily used by $http and the script directive to cache templates and other data.
-     *
-     * see https://docs.angularjs.org/api/ng/type/$cacheFactory.Cache
-     */
-    interface ICacheObject {
-        /**
-         * Retrieve information regarding a particular Cache.
-         */
-        info(): {
-            /**
-             * the id of the cache instance
-             */
-            id: string;
-
-            /**
-             * the number of entries kept in the cache instance
-             */
-            size: number;
-
-            //...: any additional properties from the options object when creating the cache.
-        };
-
-        /**
-         * Inserts a named entry into the Cache object to be retrieved later, and incrementing the size of the cache if the key was not already present in the cache. If behaving like an LRU cache, it will also remove stale entries from the set.
-         *
-         * It will not insert undefined values into the cache.
-         *
-         * @param key the key under which the cached data is stored.
-         * @param value the value to store alongside the key. If it is undefined, the key will not be stored.
-         */
-        put<T>(key: string, value?: T): T;
-
-        /**
-         * Retrieves named data stored in the Cache object.
-         *
-         * @param key the key of the data to be retrieved
-         */
-        get<T>(key: string): T;
-
-        /**
-         * Removes an entry from the Cache object.
-         *
-         * @param key the key of the entry to be removed
-         */
-        remove(key: string): void;
-
-        /**
-         * Clears the cache object of any entries.
-         */
-        removeAll(): void;
-
-        /**
-         * Destroys the Cache object entirely, removing it from the $cacheFactory set.
-         */
-        destroy(): void;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // CompileService
-    // see http://docs.angularjs.org/api/ng.$compile
-    // see http://docs.angularjs.org/api/ng.$compileProvider
-    ///////////////////////////////////////////////////////////////////////////
-    interface ICompileService {
-        (element: string, transclude?: ITranscludeFunction, maxPriority?: number): ITemplateLinkingFunction;
-        (element: Element, transclude?: ITranscludeFunction, maxPriority?: number): ITemplateLinkingFunction;
-        (element: JQuery, transclude?: ITranscludeFunction, maxPriority?: number): ITemplateLinkingFunction;
-    }
-
-    interface ICompileProvider extends IServiceProvider {
-        directive(name: string, directiveFactory: Function): ICompileProvider;
-        directive(directivesMap: Object, directiveFactory: Function): ICompileProvider;
-        directive(name: string, inlineAnnotatedFunction: any[]): ICompileProvider;
-        directive(directivesMap: Object, inlineAnnotatedFunction: any[]): ICompileProvider;
-
-        // Undocumented, but it is there...
-        directive(directivesMap: any): ICompileProvider;
-
-        component(name: string, options: IComponentOptions): ICompileProvider;
-
-        aHrefSanitizationWhitelist(): RegExp;
-        aHrefSanitizationWhitelist(regexp: RegExp): ICompileProvider;
-
-        imgSrcSanitizationWhitelist(): RegExp;
-        imgSrcSanitizationWhitelist(regexp: RegExp): ICompileProvider;
-
-        debugInfoEnabled(enabled?: boolean): any;
-    }
-
-    interface ICloneAttachFunction {
-        // Let's hint but not force cloneAttachFn's signature
-        (clonedElement?: JQuery, scope?: IScope): any;
-    }
-
-    // This corresponds to the "publicLinkFn" returned by $compile.
-    interface ITemplateLinkingFunction {
-        (scope: IScope, cloneAttachFn?: ICloneAttachFunction): IAugmentedJQuery;
-    }
-
-    // This corresponds to $transclude (and also the transclude function passed to link).
-    interface ITranscludeFunction {
-        // If the scope is provided, then the cloneAttachFn must be as well.
-        (scope: IScope, cloneAttachFn: ICloneAttachFunction): IAugmentedJQuery;
-        // If one argument is provided, then it's assumed to be the cloneAttachFn.
-        (cloneAttachFn?: ICloneAttachFunction): IAugmentedJQuery;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // ControllerService
-    // see http://docs.angularjs.org/api/ng.$controller
-    // see http://docs.angularjs.org/api/ng.$controllerProvider
-    ///////////////////////////////////////////////////////////////////////////
-    interface IControllerService {
-        // Although the documentation doesn't state this, locals are optional
-        <T>(controllerConstructor: new (...args: any[]) => T, locals?: any, later?: boolean, ident?: string): T;
-        <T>(controllerConstructor: Function, locals?: any, later?: boolean, ident?: string): T;
-        <T>(controllerName: string, locals?: any, later?: boolean, ident?: string): T;
-    }
-
-    interface IControllerProvider extends IServiceProvider {
-        register(name: string, controllerConstructor: Function): void;
-        register(name: string, dependencyAnnotatedConstructor: any[]): void;
-        allowGlobals(): void;
-    }
-
-    /**
-     * xhrFactory
-     * Replace or decorate this service to create your own custom XMLHttpRequest objects.
-     * see https://docs.angularjs.org/api/ng/service/$xhrFactory
-     */
-    interface IXhrFactory<T> {
-        (method: string, url: string): T;
-    }
-
-    /**
-     * HttpService
-     * see http://docs.angularjs.org/api/ng/service/$http
-     */
-    interface IHttpService {
-        /**
-         * Object describing the request to be made and how it should be processed.
-         */
-        <T>(config: IRequestConfig): IHttpPromise<T>;
-
-        /**
-         * Shortcut method to perform GET request.
-         *
-         * @param url Relative or absolute URL specifying the destination of the request
-         * @param config Optional configuration object
-         */
-        get<T>(url: string, config?: IRequestShortcutConfig): IHttpPromise<T>;
-
-        /**
-         * Shortcut method to perform DELETE request.
-         *
-         * @param url Relative or absolute URL specifying the destination of the request
-         * @param config Optional configuration object
-         */
-        delete<T>(url: string, config?: IRequestShortcutConfig): IHttpPromise<T>;
-
-        /**
-         * Shortcut method to perform HEAD request.
-         *
-         * @param url Relative or absolute URL specifying the destination of the request
-         * @param config Optional configuration object
-         */
-        head<T>(url: string, config?: IRequestShortcutConfig): IHttpPromise<T>;
-
-        /**
-         * Shortcut method to perform JSONP request.
-         *
-         * @param url Relative or absolute URL specifying the destination of the request
-         * @param config Optional configuration object
-         */
-        jsonp<T>(url: string, config?: IRequestShortcutConfig): IHttpPromise<T>;
-
-        /**
-         * Shortcut method to perform POST request.
-         *
-         * @param url Relative or absolute URL specifying the destination of the request
-         * @param data Request content
-         * @param config Optional configuration object
-         */
-        post<T>(url: string, data: any, config?: IRequestShortcutConfig): IHttpPromise<T>;
-
-        /**
-         * Shortcut method to perform PUT request.
-         *
-         * @param url Relative or absolute URL specifying the destination of the request
-         * @param data Request content
-         * @param config Optional configuration object
-         */
-        put<T>(url: string, data: any, config?: IRequestShortcutConfig): IHttpPromise<T>;
-
-        /**
-         * Shortcut method to perform PATCH request.
-         *
-         * @param url Relative or absolute URL specifying the destination of the request
-         * @param data Request content
-         * @param config Optional configuration object
-         */
-        patch<T>(url: string, data: any, config?: IRequestShortcutConfig): IHttpPromise<T>;
-
-        /**
-         * Runtime equivalent of the $httpProvider.defaults property. Allows configuration of default headers, withCredentials as well as request and response transformations.
-         */
-        defaults: IHttpProviderDefaults;
-
-        /**
-         * Array of config objects for currently pending requests. This is primarily meant to be used for debugging purposes.
-         */
-        pendingRequests: IRequestConfig[];
-    }
-
-    /**
-     * Object describing the request to be made and how it should be processed.
-     * see http://docs.angularjs.org/api/ng/service/$http#usage
-     */
-    interface IRequestShortcutConfig extends IHttpProviderDefaults {
-        /**
-         * {Object.<string|Object>}
-         * Map of strings or objects which will be turned to ?key1=value1&key2=value2 after the url. If the value is not a string, it will be JSONified.
-         */
-        params?: any;
-
-        /**
-         * {string|Object}
-         * Data to be sent as the request message data.
-         */
-        data?: any;
-
-        /**
-         * Timeout in milliseconds, or promise that should abort the request when resolved.
-         */
-        timeout?: number|IPromise<any>;
-
-        /**
-         * See [XMLHttpRequest.responseType]https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest#xmlhttprequest-responsetype
-         */
-        responseType?: string;
-    }
-
-    /**
-     * Object describing the request to be made and how it should be processed.
-     * see http://docs.angularjs.org/api/ng/service/$http#usage
-     */
-    interface IRequestConfig extends IRequestShortcutConfig {
-        /**
-         * HTTP method (e.g. 'GET', 'POST', etc)
-         */
-        method: string;
-        /**
-         * Absolute or relative URL of the resource that is being requested.
-         */
-        url: string;
-    }
-
-    interface IHttpHeadersGetter {
-        (): { [name: string]: string; };
-        (headerName: string): string;
-    }
-
-    interface IHttpPromiseCallback<T> {
-        (data: T, status: number, headers: IHttpHeadersGetter, config: IRequestConfig): void;
-    }
-
-    interface IHttpPromiseCallbackArg<T> {
-        data?: T;
-        status?: number;
-        headers?: IHttpHeadersGetter;
-        config?: IRequestConfig;
-        statusText?: string;
-    }
-
-    interface IHttpPromise<T> extends IPromise<IHttpPromiseCallbackArg<T>> {
-        /**
-         * The $http legacy promise methods success and error have been deprecated. Use the standard then method instead.
-         * If $httpProvider.useLegacyPromiseExtensions is set to false then these methods will throw $http/legacy error.
-         * @deprecated
-         */
-        success?(callback: IHttpPromiseCallback<T>): IHttpPromise<T>;
-        /**
-         * The $http legacy promise methods success and error have been deprecated. Use the standard then method instead.
-         * If $httpProvider.useLegacyPromiseExtensions is set to false then these methods will throw $http/legacy error.
-         * @deprecated
-         */
-        error?(callback: IHttpPromiseCallback<any>): IHttpPromise<T>;
-    }
-
-    // See the jsdoc for transformData() at https://github.com/angular/angular.js/blob/master/src/ng/http.js#L228
-    interface IHttpRequestTransformer {
-        (data: any, headersGetter: IHttpHeadersGetter): any;
-    }
-
-    // The definition of fields are the same as IHttpPromiseCallbackArg
-    interface IHttpResponseTransformer {
-        (data: any, headersGetter: IHttpHeadersGetter, status: number): any;
-    }
-
-    type HttpHeaderType = {[requestType: string]:string|((config:IRequestConfig) => string)};
-
-    interface IHttpRequestConfigHeaders {
-        [requestType: string]: any;
-        common?: any;
-        get?: any;
-        post?: any;
-        put?: any;
-        patch?: any;
-    }
-
-    /**
-    * Object that controls the defaults for $http provider. Not all fields of IRequestShortcutConfig can be configured
-    * via defaults and the docs do not say which. The following is based on the inspection of the source code.
-    * https://docs.angularjs.org/api/ng/service/$http#defaults
-    * https://docs.angularjs.org/api/ng/service/$http#usage
-    * https://docs.angularjs.org/api/ng/provider/$httpProvider The properties section
-    */
-    interface IHttpProviderDefaults {
-        /**
-         * {boolean|Cache}
-         * If true, a default $http cache will be used to cache the GET request, otherwise if a cache instance built with $cacheFactory, this cache will be used for caching.
-         */
-        cache?: any;
-
-        /**
-         * Transform function or an array of such functions. The transform function takes the http request body and
-         * headers and returns its transformed (typically serialized) version.
-         * @see {@link https://docs.angularjs.org/api/ng/service/$http#transforming-requests-and-responses}
-         */
-        transformRequest?: IHttpRequestTransformer |IHttpRequestTransformer[];
-
-        /**
-         * Transform function or an array of such functions. The transform function takes the http response body and
-         * headers and returns its transformed (typically deserialized) version.
-         */
-        transformResponse?: IHttpResponseTransformer | IHttpResponseTransformer[];
-
-        /**
-         * Map of strings or functions which return strings representing HTTP headers to send to the server. If the
-         * return value of a function is null, the header will not be sent.
-         * The key of the map is the request verb in lower case. The "common" key applies to all requests.
-         * @see {@link https://docs.angularjs.org/api/ng/service/$http#setting-http-headers}
-         */
-        headers?: IHttpRequestConfigHeaders;
-
-        /** Name of HTTP header to populate with the XSRF token. */
-        xsrfHeaderName?: string;
-
-        /** Name of cookie containing the XSRF token. */
-        xsrfCookieName?: string;
-
-        /**
-         * whether to to set the withCredentials flag on the XHR object. See [requests with credentials]https://developer.mozilla.org/en/http_access_control#section_5 for more information.
-         */
-        withCredentials?: boolean;
-
-        /**
-        * A function used to the prepare string representation of request parameters (specified as an object). If
-        * specified as string, it is interpreted as a function registered with the $injector. Defaults to
-        * $httpParamSerializer.
-        */
-        paramSerializer?: string | ((obj: any) => string);
-    }
-
-    interface IHttpInterceptor {
-        request?: (config: IRequestConfig) => IRequestConfig|IPromise<IRequestConfig>;
-        requestError?: (rejection: any) => any;
-        response?: <T>(response: IHttpPromiseCallbackArg<T>) => IPromise<IHttpPromiseCallbackArg<T>>|IHttpPromiseCallbackArg<T>;
-        responseError?: (rejection: any) => any;
-    }
-
-    interface IHttpInterceptorFactory {
-        (...args: any[]): IHttpInterceptor;
-    }
-
-    interface IHttpProvider extends IServiceProvider {
-        defaults: IHttpProviderDefaults;
-
-        /**
-         * Register service factories (names or implementations) for interceptors which are called before and after
-         * each request.
-         */
-        interceptors: (string|IHttpInterceptorFactory|(string|IHttpInterceptorFactory)[])[];
-        useApplyAsync(): boolean;
-        useApplyAsync(value: boolean): IHttpProvider;
-
-        /**
-         *
-         * @param {boolean=} value If true, `$http` will return a normal promise without the `success` and `error` methods.
-         * @returns {boolean|Object} If a value is specified, returns the $httpProvider for chaining.
-         *    otherwise, returns the current configured value.
-         */
-        useLegacyPromiseExtensions(value:boolean) : boolean | IHttpProvider;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // HttpBackendService
-    // see http://docs.angularjs.org/api/ng.$httpBackend
-    // You should never need to use this service directly.
-    ///////////////////////////////////////////////////////////////////////////
-    interface IHttpBackendService {
-        // XXX Perhaps define callback signature in the future
-        (method: string, url: string, post?: any, callback?: Function, headers?: any, timeout?: number, withCredentials?: boolean): void;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // InterpolateService
-    // see http://docs.angularjs.org/api/ng.$interpolate
-    // see http://docs.angularjs.org/api/ng.$interpolateProvider
-    ///////////////////////////////////////////////////////////////////////////
-    interface IInterpolateService {
-        (text: string, mustHaveExpression?: boolean, trustedContext?: string, allOrNothing?: boolean): IInterpolationFunction;
-        endSymbol(): string;
-        startSymbol(): string;
-    }
-
-    interface IInterpolationFunction {
-        (context: any): string;
-    }
-
-    interface IInterpolateProvider extends IServiceProvider {
-        startSymbol(): string;
-        startSymbol(value: string): IInterpolateProvider;
-        endSymbol(): string;
-        endSymbol(value: string): IInterpolateProvider;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // TemplateCacheService
-    // see http://docs.angularjs.org/api/ng.$templateCache
-    ///////////////////////////////////////////////////////////////////////////
-    interface ITemplateCacheService extends ICacheObject {}
-
-    ///////////////////////////////////////////////////////////////////////////
-    // SCEService
-    // see http://docs.angularjs.org/api/ng.$sce
-    ///////////////////////////////////////////////////////////////////////////
-    interface ISCEService {
-        getTrusted(type: string, mayBeTrusted: any): any;
-        getTrustedCss(value: any): any;
-        getTrustedHtml(value: any): any;
-        getTrustedJs(value: any): any;
-        getTrustedResourceUrl(value: any): any;
-        getTrustedUrl(value: any): any;
-        parse(type: string, expression: string): (context: any, locals: any) => any;
-        parseAsCss(expression: string): (context: any, locals: any) => any;
-        parseAsHtml(expression: string): (context: any, locals: any) => any;
-        parseAsJs(expression: string): (context: any, locals: any) => any;
-        parseAsResourceUrl(expression: string): (context: any, locals: any) => any;
-        parseAsUrl(expression: string): (context: any, locals: any) => any;
-        trustAs(type: string, value: any): any;
-        trustAsHtml(value: any): any;
-        trustAsJs(value: any): any;
-        trustAsResourceUrl(value: any): any;
-        trustAsUrl(value: any): any;
-        isEnabled(): boolean;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // SCEProvider
-    // see http://docs.angularjs.org/api/ng.$sceProvider
-    ///////////////////////////////////////////////////////////////////////////
-    interface ISCEProvider extends IServiceProvider {
-        enabled(value: boolean): void;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // SCEDelegateService
-    // see http://docs.angularjs.org/api/ng.$sceDelegate
-    ///////////////////////////////////////////////////////////////////////////
-    interface ISCEDelegateService {
-        getTrusted(type: string, mayBeTrusted: any): any;
-        trustAs(type: string, value: any): any;
-        valueOf(value: any): any;
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////
-    // SCEDelegateProvider
-    // see http://docs.angularjs.org/api/ng.$sceDelegateProvider
-    ///////////////////////////////////////////////////////////////////////////
-    interface ISCEDelegateProvider extends IServiceProvider {
-        resourceUrlBlacklist(blacklist: any[]): void;
-        resourceUrlWhitelist(whitelist: any[]): void;
-        resourceUrlBlacklist(): any[];
-        resourceUrlWhitelist(): any[];
-    }
-
-    /**
-     * $templateRequest service
-     * see http://docs.angularjs.org/api/ng/service/$templateRequest
-     */
-    interface ITemplateRequestService {
-        /**
-         * Downloads a template using $http and, upon success, stores the
-         * contents inside of $templateCache.
-         *
-         * If the HTTP request fails or the response data of the HTTP request is
-         * empty then a $compile error will be thrown (unless
-         * {ignoreRequestError} is set to true).
-         *
-         * @param tpl                  The template URL.
-         * @param ignoreRequestError   Whether or not to ignore the exception
-         *                             when the request fails or the template is
-         *                             empty.
-         *
-         * @return   A promise whose value is the template content.
-         */
-        (tpl: string, ignoreRequestError?: boolean): IPromise<string>;
-        /**
-         * total amount of pending template requests being downloaded.
-         * @type {number}
-         */
-        totalPendingRequests: number;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Component
-    // see http://angularjs.blogspot.com.br/2015/11/angularjs-15-beta2-and-14-releases.html
-    // and http://toddmotto.com/exploring-the-angular-1-5-component-method/
-    ///////////////////////////////////////////////////////////////////////////
-    /**
-     * Runtime representation a type that a Component or other object is instances of.
-     *
-     * An example of a `Type` is `MyCustomComponent` class, which in JavaScript is be represented by
-     * the `MyCustomComponent` constructor function.
-     */
-    interface Type extends Function {
-    }
-
-    /**
-     * `RouteDefinition` defines a route within a {@link RouteConfig} decorator.
-     *
-     * Supported keys:
-     * - `path` or `aux` (requires exactly one of these)
-     * - `component`, `loader`,  `redirectTo` (requires exactly one of these)
-     * - `name` or `as` (optional) (requires exactly one of these)
-     * - `data` (optional)
-     *
-     * See also {@link Route}, {@link AsyncRoute}, {@link AuxRoute}, and {@link Redirect}.
-     */
-    interface RouteDefinition {
-        path?: string;
-        aux?: string;
-        component?: Type | ComponentDefinition | string;
-        loader?: Function;
-        redirectTo?: any[];
-        as?: string;
-        name?: string;
-        data?: any;
-        useAsDefault?: boolean;
-    }
-
-    /**
-     * Represents either a component type (`type` is `component`) or a loader function
-     * (`type` is `loader`).
-     *
-     * See also {@link RouteDefinition}.
-     */
-    interface ComponentDefinition {
-        type: string;
-        loader?: Function;
-        component?: Type;
-    }
-
-    /**
-     * Component definition object (a simplified directive definition object)
-     */
-    interface IComponentOptions {
-        /**
-         * Controller constructor function that should be associated with newly created scope or the name of a registered
-         * controller if passed as a string. Empty function by default.
-         * Use the array form to define dependencies (necessary if strictDi is enabled and you require dependency injection)
-         */
-        controller?: string | Function | (string | Function)[];
-        /**
-         * An identifier name for a reference to the controller. If present, the controller will be published to scope under
-         * the controllerAs name. If not present, this will default to be the same as the component name.
-         * @default "$ctrl"
-         */
-        controllerAs?: string;
-        /**
-         * html template as a string or a function that returns an html template as a string which should be used as the
-         * contents of this component. Empty string by default.
-         * If template is a function, then it is injected with the following locals:
-         * $element - Current element
-         * $attrs - Current attributes object for the element
-         * Use the array form to define dependencies (necessary if strictDi is enabled and you require dependency injection)
-         */
-        template?: string | Function | (string | Function)[];
-        /**
-         * path or function that returns a path to an html template that should be used as the contents of this component.
-         * If templateUrl is a function, then it is injected with the following locals:
-         * $element - Current element
-         * $attrs - Current attributes object for the element
-         * Use the array form to define dependencies (necessary if strictDi is enabled and you require dependency injection)
-         */
-        templateUrl?: string | Function | (string | Function)[];
-        /**
-         * Define DOM attribute binding to component properties. Component properties are always bound to the component
-         * controller and not to the scope.
-         */
-        bindings?: {[binding: string]: string};
-        /**
-         * Whether transclusion is enabled. Enabled by default.
-         */
-        transclude?: boolean | string | {[slot: string]: string};
-        require?: string | string[] | {[controller: string]: string};
-    }
-
-    interface IComponentTemplateFn {
-        ( $element?: IAugmentedJQuery, $attrs?: IAttributes ): string;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Directive
-    // see http://docs.angularjs.org/api/ng.$compileProvider#directive
-    // and http://docs.angularjs.org/guide/directive
-    ///////////////////////////////////////////////////////////////////////////
-
-    interface IDirectiveFactory {
-        (...args: any[]): IDirective;
-    }
-
-    interface IDirectiveLinkFn {
-        (
-            scope: IScope,
-            instanceElement: IAugmentedJQuery,
-            instanceAttributes: IAttributes,
-            controller: {},
-            transclude: ITranscludeFunction
-        ): void;
-    }
-
-    interface IDirectivePrePost {
-        pre?: IDirectiveLinkFn;
-        post?: IDirectiveLinkFn;
-    }
-
-    interface IDirectiveCompileFn {
-        (
-            templateElement: IAugmentedJQuery,
-            templateAttributes: IAttributes,
-            /**
-             * @deprecated
-             * Note: The transclude function that is passed to the compile function is deprecated,
-             * as it e.g. does not know about the right outer scope. Please use the transclude function
-             * that is passed to the link function instead.
-             */
-            transclude: ITranscludeFunction
-        ): IDirectivePrePost;
-    }
-
-    interface IDirective {
-        compile?: IDirectiveCompileFn;
-        controller?: any;
-        controllerAs?: string;
-        /**
-         * @deprecated
-         * Deprecation warning: although bindings for non-ES6 class controllers are currently bound to this before
-         * the controller constructor is called, this use is now deprecated. Please place initialization code that
-         * relies upon bindings inside a $onInit method on the controller, instead.
-         */
-        bindToController?: boolean | Object;
-        link?: IDirectiveLinkFn | IDirectivePrePost;
-        multiElement?: boolean;
-        name?: string;
-        priority?: number;
-        /**
-         * @deprecated
-         */
-        replace?: boolean;
-        require?: string | string[] | {[controller: string]: string};
-        restrict?: string;
-        scope?: boolean | Object;
-        template?: string | Function;
-        templateNamespace?: string;
-        templateUrl?: string | Function;
-        terminal?: boolean;
-        transclude?: boolean | string | {[slot: string]: string};
-    }
-
-    /**
-     * angular.element
-     * when calling angular.element, angular returns a jQuery object,
-     * augmented with additional methods like e.g. scope.
-     * see: http://docs.angularjs.org/api/angular.element
-     */
-    interface IAugmentedJQueryStatic extends JQueryStatic {
-        (selector: string, context?: any): IAugmentedJQuery;
-        (element: Element): IAugmentedJQuery;
-        (object: {}): IAugmentedJQuery;
-        (elementArray: Element[]): IAugmentedJQuery;
-        (object: JQuery): IAugmentedJQuery;
-        (func: Function): IAugmentedJQuery;
-        (array: any[]): IAugmentedJQuery;
-        (): IAugmentedJQuery;
-    }
-
-    interface IAugmentedJQuery extends JQuery {
-        // TODO: events, how to define?
-        //$destroy
-
-        find(selector: string): IAugmentedJQuery;
-        find(element: any): IAugmentedJQuery;
-        find(obj: JQuery): IAugmentedJQuery;
-        controller(): any;
-        controller(name: string): any;
-        injector(): any;
-        scope(): IScope;
-        
-        /**
-        *   Overload for custom scope interfaces
-        */
-        scope<T extends IScope>(): T;
-        isolateScope(): IScope;
-
-        inheritedData(key: string, value: any): JQuery;
-        inheritedData(obj: { [key: string]: any; }): JQuery;
-        inheritedData(key?: string): any;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // AUTO module (angular.js)
-    ///////////////////////////////////////////////////////////////////////////
-    export module auto {
-
-        ///////////////////////////////////////////////////////////////////////
-        // InjectorService
-        // see http://docs.angularjs.org/api/AUTO.$injector
-        ///////////////////////////////////////////////////////////////////////
-        interface IInjectorService {
-            annotate(fn: Function, strictDi?: boolean): string[];
-            annotate(inlineAnnotatedFunction: any[]): string[];
-            get<T>(name: string, caller?: string): T;
-            has(name: string): boolean;
-            instantiate<T>(typeConstructor: Function, locals?: any): T;
-            invoke(inlineAnnotatedFunction: any[]): any;
-            invoke(func: Function, context?: any, locals?: any): any;
-            strictDi: boolean;
-        }
-
-        ///////////////////////////////////////////////////////////////////////
-        // ProvideService
-        // see http://docs.angularjs.org/api/AUTO.$provide
-        ///////////////////////////////////////////////////////////////////////
-        interface IProvideService {
-            // Documentation says it returns the registered instance, but actual
-            // implementation does not return anything.
-            // constant(name: string, value: any): any;
-            /**
-             * Register a constant service, such as a string, a number, an array, an object or a function, with the $injector. Unlike value it can be injected into a module configuration function (see config) and it cannot be overridden by an Angular decorator.
-             *
-             * @param name The name of the constant.
-             * @param value The constant value.
-             */
-            constant(name: string, value: any): void;
-
-            /**
-             * Register a service decorator with the $injector. A service decorator intercepts the creation of a service, allowing it to override or modify the behaviour of the service. The object returned by the decorator may be the original service, or a new service object which replaces or wraps and delegates to the original service.
-             *
-             * @param name The name of the service to decorate.
-             * @param decorator This function will be invoked when the service needs to be instantiated and should return the decorated service instance. The function is called using the injector.invoke method and is therefore fully injectable. Local injection arguments:
-             *
-             * $delegate - The original service instance, which can be monkey patched, configured, decorated or delegated to.
-             */
-            decorator(name: string, decorator: Function): void;
-            /**
-             * Register a service decorator with the $injector. A service decorator intercepts the creation of a service, allowing it to override or modify the behaviour of the service. The object returned by the decorator may be the original service, or a new service object which replaces or wraps and delegates to the original service.
-             *
-             * @param name The name of the service to decorate.
-             * @param inlineAnnotatedFunction This function will be invoked when the service needs to be instantiated and should return the decorated service instance. The function is called using the injector.invoke method and is therefore fully injectable. Local injection arguments:
-             *
-             * $delegate - The original service instance, which can be monkey patched, configured, decorated or delegated to.
-             */
-            decorator(name: string, inlineAnnotatedFunction: any[]): void;
-            factory(name: string, serviceFactoryFunction: Function): IServiceProvider;
-            factory(name: string, inlineAnnotatedFunction: any[]): IServiceProvider;
-            provider(name: string, provider: IServiceProvider): IServiceProvider;
-            provider(name: string, serviceProviderConstructor: Function): IServiceProvider;
-            service(name: string, constructor: Function): IServiceProvider;
-            service(name: string, inlineAnnotatedFunction: any[]): IServiceProvider;
-            value(name: string, value: any): IServiceProvider;
-        }
-
-    }
-
-    /**
-     * $http params serializer that converts objects to strings
-     * see https://docs.angularjs.org/api/ng/service/$httpParamSerializer
-     */
-    interface IHttpParamSerializer {
-        (obj: Object): string;
-    }
-}
diff --git a/angularjs/index.d.ts b/angularjs/index.d.ts
new file mode 100644
index 0000000000..1d2f37e281
--- /dev/null
+++ b/angularjs/index.d.ts
@@ -0,0 +1,1934 @@
+// Type definitions for Angular JS 1.5
+// Project: http://angularjs.org
+// Definitions by: Diego Vilar <http://github.com/diegovilar>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="angular-mocks.d.ts" />
+
+/// <reference types="jquery" />
+
+declare var angular: angular.IAngularStatic;
+
+// Support for painless dependency injection
+interface Function {
+    $inject?: string[];
+}
+
+export as namespace angular;
+export as namespace ng;
+
+// Support AMD require
+export = angular;
+
+import ng = angular;
+
+///////////////////////////////////////////////////////////////////////////////
+// ng module (angular.js)
+///////////////////////////////////////////////////////////////////////////////
+declare namespace angular {
+
+    // not directly implemented, but ensures that constructed class implements $get
+    interface IServiceProviderClass {
+        new (...args: any[]): IServiceProvider;
+    }
+
+    interface IServiceProviderFactory {
+        (...args: any[]): IServiceProvider;
+    }
+
+    // All service providers extend this interface
+    interface IServiceProvider {
+        $get: any;
+    }
+
+    interface IAngularBootstrapConfig {
+        strictDi?: boolean;
+        debugInfoEnabled?: boolean;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // AngularStatic
+    // see http://docs.angularjs.org/api
+    ///////////////////////////////////////////////////////////////////////////
+    interface IAngularStatic {
+        bind(context: any, fn: Function, ...args: any[]): Function;
+
+        /**
+         * Use this function to manually start up angular application.
+         *
+         * @param element DOM element which is the root of angular application.
+         * @param modules An array of modules to load into the application.
+         *     Each item in the array should be the name of a predefined module or a (DI annotated)
+         *     function that will be invoked by the injector as a config block.
+         * @param config an object for defining configuration options for the application. The following keys are supported:
+         *     - `strictDi`: disable automatic function annotation for the application. This is meant to assist in finding bugs which break minified code.
+         */
+        bootstrap(element: string|Element|JQuery|Document, modules?: (string|Function|any[])[], config?: IAngularBootstrapConfig): auto.IInjectorService;
+
+        /**
+         * Creates a deep copy of source, which should be an object or an array.
+         *
+         * - If no destination is supplied, a copy of the object or array is created.
+         * - If a destination is provided, all of its elements (for array) or properties (for objects) are deleted and then all elements/properties from the source are copied to it.
+         * - If source is not an object or array (inc. null and undefined), source is returned.
+         * - If source is identical to 'destination' an exception will be thrown.
+         *
+         * @param source The source that will be used to make a copy. Can be any type, including primitives, null, and undefined.
+         * @param destination Destination into which the source is copied. If provided, must be of the same type as source.
+         */
+        copy<T>(source: T, destination?: T): T;
+
+        /**
+         * Wraps a raw DOM element or HTML string as a jQuery element.
+         *
+         * If jQuery is available, angular.element is an alias for the jQuery function. If jQuery is not available, angular.element delegates to Angular's built-in subset of jQuery, called "jQuery lite" or "jqLite."
+         */
+        element: IAugmentedJQueryStatic;
+        equals(value1: any, value2: any): boolean;
+        extend(destination: any, ...sources: any[]): any;
+
+        /**
+         * Invokes the iterator function once for each item in obj collection, which can be either an object or an array. The iterator function is invoked with iterator(value, key), where value is the value of an object property or an array element and key is the object property key or array element index. Specifying a context for the function is optional.
+         *
+         * It is worth noting that .forEach does not iterate over inherited properties because it filters using the hasOwnProperty method.
+         *
+         * @param obj Object to iterate over.
+         * @param iterator Iterator function.
+         * @param context Object to become context (this) for the iterator function.
+         */
+        forEach<T>(obj: T[], iterator: (value: T, key: number) => any, context?: any): any;
+        /**
+         * Invokes the iterator function once for each item in obj collection, which can be either an object or an array. The iterator function is invoked with iterator(value, key), where value is the value of an object property or an array element and key is the object property key or array element index. Specifying a context for the function is optional.
+         *
+         * It is worth noting that .forEach does not iterate over inherited properties because it filters using the hasOwnProperty method.
+         *
+         * @param obj Object to iterate over.
+         * @param iterator Iterator function.
+         * @param context Object to become context (this) for the iterator function.
+         */
+        forEach<T>(obj: { [index: string]: T; }, iterator: (value: T, key: string) => any, context?: any): any;
+        /**
+         * Invokes the iterator function once for each item in obj collection, which can be either an object or an array. The iterator function is invoked with iterator(value, key), where value is the value of an object property or an array element and key is the object property key or array element index. Specifying a context for the function is optional.
+         *
+         * It is worth noting that .forEach does not iterate over inherited properties because it filters using the hasOwnProperty method.
+         *
+         * @param obj Object to iterate over.
+         * @param iterator Iterator function.
+         * @param context Object to become context (this) for the iterator function.
+         */
+        forEach(obj: any, iterator: (value: any, key: any) => any, context?: any): any;
+
+        fromJson(json: string): any;
+        identity<T>(arg?: T): T;
+        injector(modules?: any[], strictDi?: boolean): auto.IInjectorService;
+        isArray(value: any): boolean;
+        isDate(value: any): boolean;
+        isDefined(value: any): boolean;
+        isElement(value: any): boolean;
+        isFunction(value: any): boolean;
+        isNumber(value: any): boolean;
+        isObject(value: any): boolean;
+        isString(value: any): boolean;
+        isUndefined(value: any): boolean;
+        lowercase(str: string): string;
+
+        /**
+         * Deeply extends the destination object dst by copying own enumerable properties from the src object(s) to dst. You can specify multiple src objects. If you want to preserve original objects, you can do so by passing an empty object as the target: var object = angular.merge({}, object1, object2).
+         *
+         * Unlike extend(), merge() recursively descends into object properties of source objects, performing a deep copy.
+         *
+         * @param dst Destination object.
+         * @param src Source object(s).
+         */
+        merge(dst: any, ...src: any[]): any;
+
+        /**
+         * The angular.module is a global place for creating, registering and retrieving Angular modules. All modules (angular core or 3rd party) that should be available to an application must be registered using this mechanism.
+         *
+         * When passed two or more arguments, a new module is created. If passed only one argument, an existing module (the name passed as the first argument to module) is retrieved.
+         *
+         * @param name The name of the module to create or retrieve.
+         * @param requires The names of modules this module depends on. If specified then new module is being created. If unspecified then the module is being retrieved for further configuration.
+         * @param configFn Optional configuration function for the module.
+         */
+        module(
+            name: string,
+            requires?: string[],
+            configFn?: Function): IModule;
+
+        noop(...args: any[]): void;
+        reloadWithDebugInfo(): void;
+        toJson(obj: any, pretty?: boolean): string;
+        uppercase(str: string): string;
+        version: {
+            full: string;
+            major: number;
+            minor: number;
+            dot: number;
+            codeName: string;
+        };
+
+        /**
+         * If window.name contains prefix NG_DEFER_BOOTSTRAP! when angular.bootstrap is called, the bootstrap process will be paused until angular.resumeBootstrap() is called.
+         * @param extraModules An optional array of modules that should be added to the original list of modules that the app was about to be bootstrapped with.
+         */
+        resumeBootstrap?(extraModules?: string[]): ng.auto.IInjectorService;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Module
+    // see http://docs.angularjs.org/api/angular.Module
+    ///////////////////////////////////////////////////////////////////////////
+    interface IModule {
+        /**
+         * Use this method to register a component.
+         *
+         * @param name The name of the component.
+         * @param options A definition object passed into the component.
+         */
+        component(name: string, options: IComponentOptions): IModule;
+        /**
+         * Use this method to register work which needs to be performed on module loading.
+         *
+         * @param configFn Execute this function on module load. Useful for service configuration.
+         */
+        config(configFn: Function): IModule;
+        /**
+         * Use this method to register work which needs to be performed on module loading.
+         *
+         * @param inlineAnnotatedFunction Execute this function on module load. Useful for service configuration.
+         */
+        config(inlineAnnotatedFunction: any[]): IModule;
+        config(object: Object): IModule;
+        /**
+         * Register a constant service, such as a string, a number, an array, an object or a function, with the $injector. Unlike value it can be injected into a module configuration function (see config) and it cannot be overridden by an Angular decorator.
+         *
+         * @param name The name of the constant.
+         * @param value The constant value.
+         */
+        constant<T>(name: string, value: T): IModule;
+        constant(object: Object): IModule;
+        /**
+         * The $controller service is used by Angular to create new controllers.
+         *
+         * This provider allows controller registration via the register method.
+         *
+         * @param name Controller name, or an object map of controllers where the keys are the names and the values are the constructors.
+         * @param controllerConstructor Controller constructor fn (optionally decorated with DI annotations in the array notation).
+         */
+        controller(name: string, controllerConstructor: Function): IModule;
+        /**
+         * The $controller service is used by Angular to create new controllers.
+         *
+         * This provider allows controller registration via the register method.
+         *
+         * @param name Controller name, or an object map of controllers where the keys are the names and the values are the constructors.
+         * @param controllerConstructor Controller constructor fn (optionally decorated with DI annotations in the array notation).
+         */
+        controller(name: string, inlineAnnotatedConstructor: any[]): IModule;
+        controller(object: Object): IModule;
+        /**
+         * Register a new directive with the compiler.
+         *
+         * @param name Name of the directive in camel-case (i.e. ngBind which will match as ng-bind)
+         * @param directiveFactory An injectable directive factory function.
+         */
+        directive(name: string, directiveFactory: IDirectiveFactory): IModule;
+        /**
+         * Register a new directive with the compiler.
+         *
+         * @param name Name of the directive in camel-case (i.e. ngBind which will match as ng-bind)
+         * @param directiveFactory An injectable directive factory function.
+         */
+        directive(name: string, inlineAnnotatedFunction: any[]): IModule;
+        directive(object: Object): IModule;
+        /**
+         * Register a service factory, which will be called to return the service instance. This is short for registering a service where its provider consists of only a $get property, which is the given service factory function. You should use $provide.factory(getFn) if you do not need to configure your service in a provider.
+         *
+         * @param name The name of the instance.
+         * @param $getFn The $getFn for the instance creation. Internally this is a short hand for $provide.provider(name, {$get: $getFn}).
+         */
+        factory(name: string, $getFn: Function): IModule;
+        /**
+         * Register a service factory, which will be called to return the service instance. This is short for registering a service where its provider consists of only a $get property, which is the given service factory function. You should use $provide.factory(getFn) if you do not need to configure your service in a provider.
+         *
+         * @param name The name of the instance.
+         * @param inlineAnnotatedFunction The $getFn for the instance creation. Internally this is a short hand for $provide.provider(name, {$get: $getFn}).
+         */
+        factory(name: string, inlineAnnotatedFunction: any[]): IModule;
+        factory(object: Object): IModule;
+        filter(name: string, filterFactoryFunction: Function): IModule;
+        filter(name: string, inlineAnnotatedFunction: any[]): IModule;
+        filter(object: Object): IModule;
+        provider(name: string, serviceProviderFactory: IServiceProviderFactory): IModule;
+        provider(name: string, serviceProviderConstructor: IServiceProviderClass): IModule;
+        provider(name: string, inlineAnnotatedConstructor: any[]): IModule;
+        provider(name: string, providerObject: IServiceProvider): IModule;
+        provider(object: Object): IModule;
+        /**
+         * Run blocks are the closest thing in Angular to the main method. A run block is the code which needs to run to kickstart the application. It is executed after all of the service have been configured and the injector has been created. Run blocks typically contain code which is hard to unit-test, and for this reason should be declared in isolated modules, so that they can be ignored in the unit-tests.
+         */
+        run(initializationFunction: Function): IModule;
+        /**
+         * Run blocks are the closest thing in Angular to the main method. A run block is the code which needs to run to kickstart the application. It is executed after all of the service have been configured and the injector has been created. Run blocks typically contain code which is hard to unit-test, and for this reason should be declared in isolated modules, so that they can be ignored in the unit-tests.
+         */
+        run(inlineAnnotatedFunction: any[]): IModule;
+        /**
+         * Register a service constructor, which will be invoked with new to create the service instance. This is short for registering a service where its provider's $get property is a factory function that returns an instance instantiated by the injector from the service constructor function.
+         *
+         * @param name The name of the instance.
+         * @param serviceConstructor An injectable class (constructor function) that will be instantiated.
+         */
+        service(name: string, serviceConstructor: Function): IModule;
+        /**
+         * Register a service constructor, which will be invoked with new to create the service instance. This is short for registering a service where its provider's $get property is a factory function that returns an instance instantiated by the injector from the service constructor function.
+         *
+         * @param name The name of the instance.
+         * @param inlineAnnotatedConstructor An injectable class (constructor function) that will be instantiated.
+         */
+        service(name: string, inlineAnnotatedConstructor: any[]): IModule;
+        service(object: Object): IModule;
+        /**
+         * Register a value service with the $injector, such as a string, a number, an array, an object or a function. This is short for registering a service where its provider's $get property is a factory function that takes no arguments and returns the value service.
+
+           Value services are similar to constant services, except that they cannot be injected into a module configuration function (see config) but they can be overridden by an Angular decorator.
+         *
+         * @param name The name of the instance.
+         * @param value The value.
+         */
+        value<T>(name: string, value: T): IModule;
+        value(object: Object): IModule;
+
+        /**
+         * Register a service decorator with the $injector. A service decorator intercepts the creation of a service, allowing it to override or modify the behaviour of the service. The object returned by the decorator may be the original service, or a new service object which replaces or wraps and delegates to the original service.
+         * @param name The name of the service to decorate
+         * @param decorator This function will be invoked when the service needs to be instantiated and should return the decorated service instance. The function is called using the injector.invoke method and is therefore fully injectable. Local injection arguments: $delegate - The original service instance, which can be monkey patched, configured, decorated or delegated to.
+         */
+        decorator(name:string, decoratorConstructor: Function): IModule;
+        decorator(name:string, inlineAnnotatedConstructor: any[]): IModule;
+
+        // Properties
+        name: string;
+        requires: string[];
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Attributes
+    // see http://docs.angularjs.org/api/ng.$compile.directive.Attributes
+    ///////////////////////////////////////////////////////////////////////////
+    interface IAttributes {
+        /**
+         * this is necessary to be able to access the scoped attributes. it's not very elegant
+         * because you have to use attrs['foo'] instead of attrs.foo but I don't know of a better way
+         * this should really be limited to return string but it creates this problem: http://stackoverflow.com/q/17201854/165656
+         */
+        [name: string]: any;
+
+        /**
+         * Converts an attribute name (e.g. dash/colon/underscore-delimited string, optionally prefixed with x- or data-) to its normalized, camelCase form.
+         *
+         * Also there is special case for Moz prefix starting with upper case letter.
+         *
+         * For further information check out the guide on @see https://docs.angularjs.org/guide/directive#matching-directives
+         */
+        $normalize(name: string): string;
+
+        /**
+         * Adds the CSS class value specified by the classVal parameter to the
+         * element. If animations are enabled then an animation will be triggered
+         * for the class addition.
+         */
+        $addClass(classVal: string): void;
+
+        /**
+         * Removes the CSS class value specified by the classVal parameter from the
+         * element. If animations are enabled then an animation will be triggered for
+         * the class removal.
+         */
+        $removeClass(classVal: string): void;
+
+        /**
+         * Adds and removes the appropriate CSS class values to the element based on the difference between
+         * the new and old CSS class values (specified as newClasses and oldClasses).
+         */
+        $updateClass(newClasses: string, oldClasses: string): void;
+
+        /**
+         * Set DOM element attribute value.
+         */
+        $set(key: string, value: any): void;
+
+        /**
+         * Observes an interpolated attribute.
+         * The observer function will be invoked once during the next $digest
+         * following compilation. The observer is then invoked whenever the
+         * interpolated value changes.
+         */
+        $observe<T>(name: string, fn: (value?: T) => any): Function;
+
+        /**
+         * A map of DOM element attribute names to the normalized name. This is needed
+         * to do reverse lookup from normalized name back to actual name.
+         */
+        $attr: Object;
+    }
+
+    /**
+     * form.FormController - type in module ng
+     * see https://docs.angularjs.org/api/ng/type/form.FormController
+     */
+    interface IFormController {
+
+        /**
+         * Indexer which should return ng.INgModelController for most properties but cannot because of "All named properties must be assignable to string indexer type" constraint - see https://github.com/Microsoft/TypeScript/issues/272
+         */
+        [name: string]: any;
+
+        $pristine: boolean;
+        $dirty: boolean;
+        $valid: boolean;
+        $invalid: boolean;
+        $submitted: boolean;
+        $error: any;
+        $pending: any;
+        $addControl(control: INgModelController): void;
+        $removeControl(control: INgModelController): void;
+        $setValidity(validationErrorKey: string, isValid: boolean, control: INgModelController): void;
+        $setDirty(): void;
+        $setPristine(): void;
+        $commitViewValue(): void;
+        $rollbackViewValue(): void;
+        $setSubmitted(): void;
+        $setUntouched(): void;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // NgModelController
+    // see http://docs.angularjs.org/api/ng.directive:ngModel.NgModelController
+    ///////////////////////////////////////////////////////////////////////////
+    interface INgModelController {
+        $render(): void;
+        $setValidity(validationErrorKey: string, isValid: boolean): void;
+        // Documentation states viewValue and modelValue to be a string but other
+        // types do work and it's common to use them.
+        $setViewValue(value: any, trigger?: string): void;
+        $setPristine(): void;
+        $setDirty(): void;
+        $validate(): void;
+        $setTouched(): void;
+        $setUntouched(): void;
+        $rollbackViewValue(): void;
+        $commitViewValue(): void;
+        $isEmpty(value: any): boolean;
+
+        $viewValue: any;
+
+        $modelValue: any;
+
+        $parsers: IModelParser[];
+        $formatters: IModelFormatter[];
+        $viewChangeListeners: IModelViewChangeListener[];
+        $error: any;
+        $name: string;
+
+        $touched: boolean;
+        $untouched: boolean;
+
+        $validators: IModelValidators;
+        $asyncValidators: IAsyncModelValidators;
+
+        $pending: any;
+        $pristine: boolean;
+        $dirty: boolean;
+        $valid: boolean;
+        $invalid: boolean;
+    }
+
+    //Allows tuning how model updates are done.
+    //https://docs.angularjs.org/api/ng/directive/ngModelOptions
+    interface INgModelOptions {
+        updateOn?: string;
+        debounce?: any;
+        allowInvalid?: boolean;
+        getterSetter?: boolean;
+        timezone?: string;
+    }
+
+    interface IModelValidators {
+        /**
+         * viewValue is any because it can be an object that is called in the view like $viewValue.name:$viewValue.subName
+         */
+        [index: string]: (modelValue: any, viewValue: any) => boolean;
+    }
+
+    interface IAsyncModelValidators {
+        [index: string]: (modelValue: any, viewValue: any) => IPromise<any>;
+    }
+
+    interface IModelParser {
+        (value: any): any;
+    }
+
+    interface IModelFormatter {
+        (value: any): any;
+    }
+
+    interface IModelViewChangeListener {
+        (): void;
+    }
+
+    /**
+     * $rootScope - $rootScopeProvider - service in module ng
+     * see https://docs.angularjs.org/api/ng/type/$rootScope.Scope and https://docs.angularjs.org/api/ng/service/$rootScope
+     */
+    interface IRootScopeService {
+        [index: string]: any;
+
+        $apply(): any;
+        $apply(exp: string): any;
+        $apply(exp: (scope: IScope) => any): any;
+
+        $applyAsync(): any;
+        $applyAsync(exp: string): any;
+        $applyAsync(exp: (scope: IScope) => any): any;
+
+        /**
+         * Dispatches an event name downwards to all child scopes (and their children) notifying the registered $rootScope.Scope listeners.
+         *
+         * The event life cycle starts at the scope on which $broadcast was called. All listeners listening for name event on this scope get notified. Afterwards, the event propagates to all direct and indirect scopes of the current scope and calls all registered listeners along the way. The event cannot be canceled.
+         *
+         * Any exception emitted from the listeners will be passed onto the $exceptionHandler service.
+         *
+         * @param name Event name to broadcast.
+         * @param args Optional one or more arguments which will be passed onto the event listeners.
+         */
+        $broadcast(name: string, ...args: any[]): IAngularEvent;
+        $destroy(): void;
+        $digest(): void;
+        /**
+         * Dispatches an event name upwards through the scope hierarchy notifying the registered $rootScope.Scope listeners.
+         *
+         * The event life cycle starts at the scope on which $emit was called. All listeners listening for name event on this scope get notified. Afterwards, the event traverses upwards toward the root scope and calls all registered listeners along the way. The event will stop propagating if one of the listeners cancels it.
+         *
+         * Any exception emitted from the listeners will be passed onto the $exceptionHandler service.
+         *
+         * @param name Event name to emit.
+         * @param args Optional one or more arguments which will be passed onto the event listeners.
+         */
+        $emit(name: string, ...args: any[]): IAngularEvent;
+
+        $eval(): any;
+        $eval(expression: string, locals?: Object): any;
+        $eval(expression: (scope: IScope) => any, locals?: Object): any;
+
+        $evalAsync(): void;
+        $evalAsync(expression: string): void;
+        $evalAsync(expression: (scope: IScope) => any): void;
+
+        // Defaults to false by the implementation checking strategy
+        $new(isolate?: boolean, parent?: IScope): IScope;
+
+        /**
+         * Listens on events of a given type. See $emit for discussion of event life cycle.
+         *
+         * The event listener function format is: function(event, args...).
+         *
+         * @param name Event name to listen on.
+         * @param listener Function to call when the event is emitted.
+         */
+        $on(name: string, listener: (event: IAngularEvent, ...args: any[]) => any): () => void;
+
+        $watch(watchExpression: string, listener?: string, objectEquality?: boolean): () => void;
+        $watch<T>(watchExpression: string, listener?: (newValue: T, oldValue: T, scope: IScope) => any, objectEquality?: boolean): () => void;
+        $watch(watchExpression: (scope: IScope) => any, listener?: string, objectEquality?: boolean): () => void;
+        $watch<T>(watchExpression: (scope: IScope) => T, listener?: (newValue: T, oldValue: T, scope: IScope) => any, objectEquality?: boolean): () => void;
+
+        $watchCollection<T>(watchExpression: string, listener: (newValue: T, oldValue: T, scope: IScope) => any): () => void;
+        $watchCollection<T>(watchExpression: (scope: IScope) => T, listener: (newValue: T, oldValue: T, scope: IScope) => any): () => void;
+
+        $watchGroup(watchExpressions: any[], listener: (newValue: any, oldValue: any, scope: IScope) => any): () => void;
+        $watchGroup(watchExpressions: { (scope: IScope): any }[], listener: (newValue: any, oldValue: any, scope: IScope) => any): () => void;
+
+        $parent: IScope;
+        $root: IRootScopeService;
+        $id: number;
+
+        // Hidden members
+        $$isolateBindings: any;
+        $$phase: any;
+    }
+
+    interface IScope extends IRootScopeService { }
+
+    /**
+     * $scope for ngRepeat directive.
+     * see https://docs.angularjs.org/api/ng/directive/ngRepeat
+     */
+    interface IRepeatScope extends IScope {
+
+        /**
+         * iterator offset of the repeated element (0..length-1).
+         */
+        $index: number;
+
+        /**
+         * true if the repeated element is first in the iterator.
+         */
+        $first: boolean;
+
+        /**
+         * true if the repeated element is between the first and last in the iterator.
+         */
+        $middle: boolean;
+
+        /**
+         * true if the repeated element is last in the iterator.
+         */
+        $last: boolean;
+
+        /**
+         * true if the iterator position $index is even (otherwise false).
+         */
+        $even: boolean;
+
+        /**
+         * true if the iterator position $index is odd (otherwise false).
+         */
+        $odd: boolean;
+
+    }
+
+    interface IAngularEvent {
+        /**
+         * the scope on which the event was $emit-ed or $broadcast-ed.
+         */
+        targetScope: IScope;
+        /**
+         * the scope that is currently handling the event. Once the event propagates through the scope hierarchy, this property is set to null.
+         */
+        currentScope: IScope;
+        /**
+         * name of the event.
+         */
+        name: string;
+        /**
+         * calling stopPropagation function will cancel further event propagation (available only for events that were $emit-ed).
+         */
+        stopPropagation?: Function;
+        /**
+         * calling preventDefault sets defaultPrevented flag to true.
+         */
+        preventDefault(): void;
+        /**
+         * true if preventDefault was called.
+         */
+        defaultPrevented: boolean;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // WindowService
+    // see http://docs.angularjs.org/api/ng.$window
+    ///////////////////////////////////////////////////////////////////////////
+    interface IWindowService extends Window {
+        [key: string]: any;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // TimeoutService
+    // see http://docs.angularjs.org/api/ng.$timeout
+    ///////////////////////////////////////////////////////////////////////////
+    interface ITimeoutService {
+        (delay?: number, invokeApply?: boolean): IPromise<void>;
+        <T>(fn: (...args: any[]) => T, delay?: number, invokeApply?: boolean, ...args: any[]): IPromise<T>;
+        cancel(promise?: IPromise<any>): boolean;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // IntervalService
+    // see http://docs.angularjs.org/api/ng.$interval
+    ///////////////////////////////////////////////////////////////////////////
+    interface IIntervalService {
+        (func: Function, delay: number, count?: number, invokeApply?: boolean, ...args: any[]): IPromise<any>;
+        cancel(promise: IPromise<any>): boolean;
+    }
+
+    /**
+     * $filter - $filterProvider - service in module ng
+     *
+     * Filters are used for formatting data displayed to the user.
+     *
+     * see https://docs.angularjs.org/api/ng/service/$filter
+     */
+    interface IFilterService {
+        (name: 'filter'): IFilterFilter;
+        (name: 'currency'): IFilterCurrency;
+        (name: 'number'): IFilterNumber;
+        (name: 'date'): IFilterDate;
+        (name: 'json'): IFilterJson;
+        (name: 'lowercase'): IFilterLowercase;
+        (name: 'uppercase'): IFilterUppercase;
+        (name: 'limitTo'): IFilterLimitTo;
+        (name: 'orderBy'): IFilterOrderBy;
+        /**
+         * Usage:
+         * $filter(name);
+         *
+         * @param name Name of the filter function to retrieve
+         */
+        <T>(name: string): T;
+    }
+
+    interface IFilterFilter {
+        <T>(array: T[], expression: string | IFilterFilterPatternObject | IFilterFilterPredicateFunc<T>, comparator?: IFilterFilterComparatorFunc<T>|boolean): T[];
+    }
+
+    interface IFilterFilterPatternObject {
+        [name: string]: any;
+    }
+
+    interface IFilterFilterPredicateFunc<T> {
+        (value: T, index: number, array: T[]): boolean;
+    }
+
+    interface IFilterFilterComparatorFunc<T> {
+        (actual: T, expected: T): boolean;
+    }
+
+    interface IFilterCurrency {
+        /**
+         * Formats a number as a currency (ie $1,234.56). When no currency symbol is provided, default symbol for current locale is used.
+         * @param amount Input to filter.
+         * @param symbol Currency symbol or identifier to be displayed.
+         * @param fractionSize Number of decimal places to round the amount to, defaults to default max fraction size for current locale
+         * @return Formatted number
+         */
+        (amount: number, symbol?: string, fractionSize?: number): string;
+    }
+
+    interface IFilterNumber {
+        /**
+         * Formats a number as text.
+         * @param number Number to format.
+         * @param fractionSize Number of decimal places to round the number to. If this is not provided then the fraction size is computed from the current locale's number formatting pattern. In the case of the default locale, it will be 3.
+         * @return Number rounded to decimalPlaces and places a “,” after each third digit.
+         */
+        (value: number|string, fractionSize?: number|string): string;
+    }
+
+    interface IFilterDate {
+        /**
+         * Formats date to a string based on the requested format.
+         *
+         * @param date Date to format either as Date object, milliseconds (string or number) or various ISO 8601 datetime string formats (e.g. yyyy-MM-ddTHH:mm:ss.sssZ and its shorter versions like yyyy-MM-ddTHH:mmZ, yyyy-MM-dd or yyyyMMddTHHmmssZ). If no timezone is specified in the string input, the time is considered to be in the local timezone.
+         * @param format Formatting rules (see Description). If not specified, mediumDate is used.
+         * @param timezone Timezone to be used for formatting. It understands UTC/GMT and the continental US time zone abbreviations, but for general use, use a time zone offset, for example, '+0430' (4 hours, 30 minutes east of the Greenwich meridian) If not specified, the timezone of the browser will be used.
+         * @return Formatted string or the input if input is not recognized as date/millis.
+         */
+        (date: Date | number | string, format?: string, timezone?: string): string;
+    }
+
+    interface IFilterJson {
+        /**
+         * Allows you to convert a JavaScript object into JSON string.
+         * @param object Any JavaScript object (including arrays and primitive types) to filter.
+         * @param spacing The number of spaces to use per indentation, defaults to 2.
+         * @return JSON string.
+         */
+        (object: any, spacing?: number): string;
+    }
+
+    interface IFilterLowercase {
+        /**
+         * Converts string to lowercase.
+         */
+        (value: string): string;
+    }
+
+    interface IFilterUppercase {
+        /**
+         * Converts string to uppercase.
+         */
+        (value: string): string;
+    }
+
+    interface IFilterLimitTo {
+        /**
+         * Creates a new array containing only a specified number of elements. The elements are taken from either the beginning or the end of the source array, string or number, as specified by the value and sign (positive or negative) of limit.
+         * @param input Source array to be limited.
+         * @param limit The length of the returned array. If the limit number is positive, limit number of items from the beginning of the source array/string are copied. If the number is negative, limit number of items from the end of the source array are copied. The limit will be trimmed if it exceeds array.length. If limit is undefined, the input will be returned unchanged.
+         * @param begin Index at which to begin limitation. As a negative index, begin indicates an offset from the end of input. Defaults to 0.
+         * @return A new sub-array of length limit or less if input array had less than limit elements.
+         */
+        <T>(input: T[], limit: string|number, begin?: string|number): T[];
+        /**
+         * Creates a new string containing only a specified number of elements. The elements are taken from either the beginning or the end of the source string or number, as specified by the value and sign (positive or negative) of limit. If a number is used as input, it is converted to a string.
+         * @param input Source string or number to be limited.
+         * @param limit The length of the returned string. If the limit number is positive, limit number of items from the beginning of the source string are copied. If the number is negative, limit number of items from the end of the source string are copied. The limit will be trimmed if it exceeds input.length. If limit is undefined, the input will be returned unchanged.
+         * @param begin Index at which to begin limitation. As a negative index, begin indicates an offset from the end of input. Defaults to 0.
+         * @return A new substring of length limit or less if input had less than limit elements.
+         */
+        (input: string|number, limit: string|number, begin?: string|number): string;
+    }
+
+    interface IFilterOrderBy {
+        /**
+         * Orders a specified array by the expression predicate. It is ordered alphabetically for strings and numerically for numbers. Note: if you notice numbers are not being sorted as expected, make sure they are actually being saved as numbers and not strings.
+         * @param array The array to sort.
+         * @param expression A predicate to be used by the comparator to determine the order of elements.
+         * @param reverse Reverse the order of the array.
+         * @return Reverse the order of the array.
+         */
+        <T>(array: T[], expression: string|((value: T) => any)|(((value: T) => any)|string)[], reverse?: boolean): T[];
+    }
+
+    /**
+     * $filterProvider - $filter - provider in module ng
+     *
+     * Filters are just functions which transform input to an output. However filters need to be Dependency Injected. To achieve this a filter definition consists of a factory function which is annotated with dependencies and is responsible for creating a filter function.
+     *
+     * see https://docs.angularjs.org/api/ng/provider/$filterProvider
+     */
+    interface IFilterProvider extends IServiceProvider {
+        /**
+         * register(name);
+         *
+         * @param name Name of the filter function, or an object map of filters where the keys are the filter names and the values are the filter factories. Note: Filter names must be valid angular Expressions identifiers, such as uppercase or orderBy. Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace your filters, then you can use capitalization (myappSubsectionFilterx) or underscores (myapp_subsection_filterx).
+         */
+        register(name: string | {}): IServiceProvider;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // LocaleService
+    // see http://docs.angularjs.org/api/ng.$locale
+    ///////////////////////////////////////////////////////////////////////////
+    interface ILocaleService {
+        id: string;
+
+        // These are not documented
+        // Check angular's i18n files for exemples
+        NUMBER_FORMATS: ILocaleNumberFormatDescriptor;
+        DATETIME_FORMATS: ILocaleDateTimeFormatDescriptor;
+        pluralCat: (num: any) => string;
+    }
+
+    interface ILocaleNumberFormatDescriptor {
+        DECIMAL_SEP: string;
+        GROUP_SEP: string;
+        PATTERNS: ILocaleNumberPatternDescriptor[];
+        CURRENCY_SYM: string;
+    }
+
+    interface ILocaleNumberPatternDescriptor {
+        minInt: number;
+        minFrac: number;
+        maxFrac: number;
+        posPre: string;
+        posSuf: string;
+        negPre: string;
+        negSuf: string;
+        gSize: number;
+        lgSize: number;
+    }
+
+    interface ILocaleDateTimeFormatDescriptor {
+        MONTH: string[];
+        SHORTMONTH: string[];
+        DAY: string[];
+        SHORTDAY: string[];
+        AMPMS: string[];
+        medium: string;
+        short: string;
+        fullDate: string;
+        longDate: string;
+        mediumDate: string;
+        shortDate: string;
+        mediumTime: string;
+        shortTime: string;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // LogService
+    // see http://docs.angularjs.org/api/ng.$log
+    // see http://docs.angularjs.org/api/ng.$logProvider
+    ///////////////////////////////////////////////////////////////////////////
+    interface ILogService {
+        debug: ILogCall;
+        error: ILogCall;
+        info: ILogCall;
+        log: ILogCall;
+        warn: ILogCall;
+    }
+
+    interface ILogProvider extends IServiceProvider {
+        debugEnabled(): boolean;
+        debugEnabled(enabled: boolean): ILogProvider;
+    }
+
+    // We define this as separate interface so we can reopen it later for
+    // the ngMock module.
+    interface ILogCall {
+        (...args: any[]): void;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // ParseService
+    // see http://docs.angularjs.org/api/ng.$parse
+    // see http://docs.angularjs.org/api/ng.$parseProvider
+    ///////////////////////////////////////////////////////////////////////////
+    interface IParseService {
+        (expression: string): ICompiledExpression;
+    }
+
+    interface IParseProvider {
+        logPromiseWarnings(): boolean;
+        logPromiseWarnings(value: boolean): IParseProvider;
+
+        unwrapPromises(): boolean;
+        unwrapPromises(value: boolean): IParseProvider;
+    }
+
+    interface ICompiledExpression {
+        (context: any, locals?: any): any;
+
+        literal: boolean;
+        constant: boolean;
+
+        // If value is not provided, undefined is gonna be used since the implementation
+        // does not check the parameter. Let's force a value for consistency. If consumer
+        // whants to undefine it, pass the undefined value explicitly.
+        assign(context: any, value: any): any;
+    }
+
+    /**
+     * $location - $locationProvider - service in module ng
+     * see https://docs.angularjs.org/api/ng/service/$location
+     */
+    interface ILocationService {
+        absUrl(): string;
+        hash(): string;
+        hash(newHash: string): ILocationService;
+        host(): string;
+
+        /**
+         * Return path of current url
+         */
+        path(): string;
+
+        /**
+         * Change path when called with parameter and return $location.
+         * Note: Path should always begin with forward slash (/), this method will add the forward slash if it is missing.
+         *
+         * @param path New path
+         */
+        path(path: string): ILocationService;
+
+        port(): number;
+        protocol(): string;
+        replace(): ILocationService;
+
+        /**
+         * Return search part (as object) of current url
+         */
+        search(): any;
+
+        /**
+         * Change search part when called with parameter and return $location.
+         *
+         * @param search When called with a single argument the method acts as a setter, setting the search component of $location to the specified value.
+         *
+         * If the argument is a hash object containing an array of values, these values will be encoded as duplicate search parameters in the url.
+         */
+        search(search: any): ILocationService;
+
+        /**
+         * Change search part when called with parameter and return $location.
+         *
+         * @param search New search params
+         * @param paramValue If search is a string or a Number, then paramValue will override only a single search property. If paramValue is null, the property specified via the first argument will be deleted. If paramValue is an array, it will override the property of the search component of $location specified via the first argument. If paramValue is true, the property specified via the first argument will be added with no value nor trailing equal sign.
+         */
+        search(search: string, paramValue: string|number|string[]|boolean): ILocationService;
+
+        state(): any;
+        state(state: any): ILocationService;
+        url(): string;
+        url(url: string): ILocationService;
+    }
+
+    interface ILocationProvider extends IServiceProvider {
+        hashPrefix(): string;
+        hashPrefix(prefix: string): ILocationProvider;
+        html5Mode(): boolean;
+
+        // Documentation states that parameter is string, but
+        // implementation tests it as boolean, which makes more sense
+        // since this is a toggler
+        html5Mode(active: boolean): ILocationProvider;
+        html5Mode(mode: { enabled?: boolean; requireBase?: boolean; rewriteLinks?: boolean; }): ILocationProvider;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // DocumentService
+    // see http://docs.angularjs.org/api/ng.$document
+    ///////////////////////////////////////////////////////////////////////////
+    interface IDocumentService extends IAugmentedJQuery {}
+
+    ///////////////////////////////////////////////////////////////////////////
+    // ExceptionHandlerService
+    // see http://docs.angularjs.org/api/ng.$exceptionHandler
+    ///////////////////////////////////////////////////////////////////////////
+    interface IExceptionHandlerService {
+        (exception: Error, cause?: string): void;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // RootElementService
+    // see http://docs.angularjs.org/api/ng.$rootElement
+    ///////////////////////////////////////////////////////////////////////////
+    interface IRootElementService extends JQuery {}
+
+    interface IQResolveReject<T> {
+        (): void;
+        (value: T): void;
+    }
+    /**
+     * $q - service in module ng
+     * A promise/deferred implementation inspired by Kris Kowal's Q.
+     * See http://docs.angularjs.org/api/ng/service/$q
+     */
+    interface IQService {
+        new <T>(resolver: (resolve: IQResolveReject<T>) => any): IPromise<T>;
+        new <T>(resolver: (resolve: IQResolveReject<T>, reject: IQResolveReject<any>) => any): IPromise<T>;
+        <T>(resolver: (resolve: IQResolveReject<T>) => any): IPromise<T>;
+        <T>(resolver: (resolve: IQResolveReject<T>, reject: IQResolveReject<any>) => any): IPromise<T>;
+
+        /**
+         * Combines multiple promises into a single promise that is resolved when all of the input promises are resolved.
+         *
+         * Returns a single promise that will be resolved with an array of values, each value corresponding to the promise at the same index in the promises array. If any of the promises is resolved with a rejection, this resulting promise will be rejected with the same rejection value.
+         *
+         * @param promises An array of promises.
+         */
+        all<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>, T4 | IPromise <T4>, T5 | IPromise<T5>, T6 | IPromise<T6>, T7 | IPromise<T7>, T8 | IPromise<T8>, T9 | IPromise<T9>, T10 | IPromise<T10>]): IPromise<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>;
+        all<T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>, T4 | IPromise <T4>, T5 | IPromise<T5>, T6 | IPromise<T6>, T7 | IPromise<T7>, T8 | IPromise<T8>, T9 | IPromise<T9>]): IPromise<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>;
+        all<T1, T2, T3, T4, T5, T6, T7, T8>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>, T4 | IPromise <T4>, T5 | IPromise<T5>, T6 | IPromise<T6>, T7 | IPromise<T7>, T8 | IPromise<T8>]): IPromise<[T1, T2, T3, T4, T5, T6, T7, T8]>;
+        all<T1, T2, T3, T4, T5, T6, T7>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>, T4 | IPromise <T4>, T5 | IPromise<T5>, T6 | IPromise<T6>, T7 | IPromise<T7>]): IPromise<[T1, T2, T3, T4, T5, T6, T7]>;
+        all<T1, T2, T3, T4, T5, T6>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>, T4 | IPromise <T4>, T5 | IPromise<T5>, T6 | IPromise<T6>]): IPromise<[T1, T2, T3, T4, T5, T6]>;
+        all<T1, T2, T3, T4, T5>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>, T4 | IPromise <T4>, T5 | IPromise<T5>]): IPromise<[T1, T2, T3, T4, T5]>;
+        all<T1, T2, T3, T4>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>, T4 | IPromise <T4>]): IPromise<[T1, T2, T3, T4]>;
+        all<T1, T2, T3>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>]): IPromise<[T1, T2, T3]>;
+        all<T1, T2>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>]): IPromise<[T1, T2]>;
+        all<TAll>(promises: IPromise<TAll>[]): IPromise<TAll[]>;
+        /**
+         * Combines multiple promises into a single promise that is resolved when all of the input promises are resolved.
+         *
+         * Returns a single promise that will be resolved with a hash of values, each value corresponding to the promise at the same key in the promises hash. If any of the promises is resolved with a rejection, this resulting promise will be rejected with the same rejection value.
+         *
+         * @param promises A hash of promises.
+         */
+        all(promises: { [id: string]: IPromise<any>; }): IPromise<{ [id: string]: any; }>;
+        all<T extends {}>(promises: { [id: string]: IPromise<any>; }): IPromise<T>;
+        /**
+         * Creates a Deferred object which represents a task which will finish in the future.
+         */
+        defer<T>(): IDeferred<T>;
+        /**
+         * Creates a promise that is resolved as rejected with the specified reason. This api should be used to forward rejection in a chain of promises. If you are dealing with the last promise in a promise chain, you don't need to worry about it.
+         *
+         * When comparing deferreds/promises to the familiar behavior of try/catch/throw, think of reject as the throw keyword in JavaScript. This also means that if you "catch" an error via a promise error callback and you want to forward the error to the promise derived from the current promise, you have to "rethrow" the error by returning a rejection constructed via reject.
+         *
+         * @param reason Constant, message, exception or an object representing the rejection reason.
+         */
+        reject(reason?: any): IPromise<any>;
+        /**
+         * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted.
+         *
+         * @param value Value or a promise
+         */
+        resolve<T>(value: IPromise<T>|T): IPromise<T>;
+        /**
+         * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted.
+         */
+        resolve(): IPromise<void>;
+        /**
+         * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted.
+         *
+         * @param value Value or a promise
+         */
+        when<T>(value: IPromise<T>|T): IPromise<T>;
+        /**
+         * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted.
+         */
+        when(): IPromise<void>;
+    }
+
+    interface IPromise<T> {
+        /**
+         * Regardless of when the promise was or will be resolved or rejected, then calls one of the success or error callbacks asynchronously as soon as the result is available. The callbacks are called with a single argument: the result or rejection reason. Additionally, the notify callback may be called zero or more times to provide a progress indication, before the promise is resolved or rejected.
+         * The successCallBack may return IPromise<void> for when a $q.reject() needs to be returned
+         * This method returns a new promise which is resolved or rejected via the return value of the successCallback, errorCallback. It also notifies via the return value of the notifyCallback method. The promise can not be resolved or rejected from the notifyCallback method.
+         */
+        then<TResult>(successCallback: (promiseValue: T) => IPromise<TResult>|TResult, errorCallback?: (reason: any) => any, notifyCallback?: (state: any) => any): IPromise<TResult>;
+
+        /**
+         * Shorthand for promise.then(null, errorCallback)
+         */
+        catch<TResult>(onRejected: (reason: any) => IPromise<TResult>|TResult): IPromise<TResult>;
+
+        /**
+         * Allows you to observe either the fulfillment or rejection of a promise, but to do so without modifying the final value. This is useful to release resources or do some clean-up that needs to be done whether the promise was rejected or resolved. See the full specification for more information.
+         *
+         * Because finally is a reserved word in JavaScript and reserved keywords are not supported as property names by ES3, you'll need to invoke the method like promise['finally'](callback) to make your code IE8 and Android 2.x compatible.
+         */
+        finally(finallyCallback: () => any): IPromise<T>;
+    }
+
+    interface IDeferred<T> {
+        resolve(value?: T|IPromise<T>): void;
+        reject(reason?: any): void;
+        notify(state?: any): void;
+        promise: IPromise<T>;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // AnchorScrollService
+    // see http://docs.angularjs.org/api/ng.$anchorScroll
+    ///////////////////////////////////////////////////////////////////////////
+    interface IAnchorScrollService {
+        (): void;
+        (hash: string): void;
+        yOffset: any;
+    }
+
+    interface IAnchorScrollProvider extends IServiceProvider {
+        disableAutoScrolling(): void;
+    }
+
+    /**
+     * $cacheFactory - service in module ng
+     *
+     * Factory that constructs Cache objects and gives access to them.
+     *
+     * see https://docs.angularjs.org/api/ng/service/$cacheFactory
+     */
+    interface ICacheFactoryService {
+        /**
+         * Factory that constructs Cache objects and gives access to them.
+         *
+         * @param cacheId Name or id of the newly created cache.
+         * @param optionsMap Options object that specifies the cache behavior. Properties:
+         *
+         * capacity — turns the cache into LRU cache.
+         */
+        (cacheId: string, optionsMap?: { capacity?: number; }): ICacheObject;
+
+        /**
+         * Get information about all the caches that have been created.
+         * @returns key-value map of cacheId to the result of calling cache#info
+         */
+        info(): any;
+
+        /**
+         * Get access to a cache object by the cacheId used when it was created.
+         *
+         * @param cacheId Name or id of a cache to access.
+         */
+        get(cacheId: string): ICacheObject;
+    }
+
+    /**
+     * $cacheFactory.Cache - type in module ng
+     *
+     * A cache object used to store and retrieve data, primarily used by $http and the script directive to cache templates and other data.
+     *
+     * see https://docs.angularjs.org/api/ng/type/$cacheFactory.Cache
+     */
+    interface ICacheObject {
+        /**
+         * Retrieve information regarding a particular Cache.
+         */
+        info(): {
+            /**
+             * the id of the cache instance
+             */
+            id: string;
+
+            /**
+             * the number of entries kept in the cache instance
+             */
+            size: number;
+
+            //...: any additional properties from the options object when creating the cache.
+        };
+
+        /**
+         * Inserts a named entry into the Cache object to be retrieved later, and incrementing the size of the cache if the key was not already present in the cache. If behaving like an LRU cache, it will also remove stale entries from the set.
+         *
+         * It will not insert undefined values into the cache.
+         *
+         * @param key the key under which the cached data is stored.
+         * @param value the value to store alongside the key. If it is undefined, the key will not be stored.
+         */
+        put<T>(key: string, value?: T): T;
+
+        /**
+         * Retrieves named data stored in the Cache object.
+         *
+         * @param key the key of the data to be retrieved
+         */
+        get<T>(key: string): T;
+
+        /**
+         * Removes an entry from the Cache object.
+         *
+         * @param key the key of the entry to be removed
+         */
+        remove(key: string): void;
+
+        /**
+         * Clears the cache object of any entries.
+         */
+        removeAll(): void;
+
+        /**
+         * Destroys the Cache object entirely, removing it from the $cacheFactory set.
+         */
+        destroy(): void;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // CompileService
+    // see http://docs.angularjs.org/api/ng.$compile
+    // see http://docs.angularjs.org/api/ng.$compileProvider
+    ///////////////////////////////////////////////////////////////////////////
+    interface ICompileService {
+        (element: string, transclude?: ITranscludeFunction, maxPriority?: number): ITemplateLinkingFunction;
+        (element: Element, transclude?: ITranscludeFunction, maxPriority?: number): ITemplateLinkingFunction;
+        (element: JQuery, transclude?: ITranscludeFunction, maxPriority?: number): ITemplateLinkingFunction;
+    }
+
+    interface ICompileProvider extends IServiceProvider {
+        directive(name: string, directiveFactory: Function): ICompileProvider;
+        directive(directivesMap: Object, directiveFactory: Function): ICompileProvider;
+        directive(name: string, inlineAnnotatedFunction: any[]): ICompileProvider;
+        directive(directivesMap: Object, inlineAnnotatedFunction: any[]): ICompileProvider;
+
+        // Undocumented, but it is there...
+        directive(directivesMap: any): ICompileProvider;
+
+        component(name: string, options: IComponentOptions): ICompileProvider;
+
+        aHrefSanitizationWhitelist(): RegExp;
+        aHrefSanitizationWhitelist(regexp: RegExp): ICompileProvider;
+
+        imgSrcSanitizationWhitelist(): RegExp;
+        imgSrcSanitizationWhitelist(regexp: RegExp): ICompileProvider;
+
+        debugInfoEnabled(enabled?: boolean): any;
+    }
+
+    interface ICloneAttachFunction {
+        // Let's hint but not force cloneAttachFn's signature
+        (clonedElement?: JQuery, scope?: IScope): any;
+    }
+
+    // This corresponds to the "publicLinkFn" returned by $compile.
+    interface ITemplateLinkingFunction {
+        (scope: IScope, cloneAttachFn?: ICloneAttachFunction): IAugmentedJQuery;
+    }
+
+    // This corresponds to $transclude (and also the transclude function passed to link).
+    interface ITranscludeFunction {
+        // If the scope is provided, then the cloneAttachFn must be as well.
+        (scope: IScope, cloneAttachFn: ICloneAttachFunction): IAugmentedJQuery;
+        // If one argument is provided, then it's assumed to be the cloneAttachFn.
+        (cloneAttachFn?: ICloneAttachFunction): IAugmentedJQuery;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // ControllerService
+    // see http://docs.angularjs.org/api/ng.$controller
+    // see http://docs.angularjs.org/api/ng.$controllerProvider
+    ///////////////////////////////////////////////////////////////////////////
+    interface IControllerService {
+        // Although the documentation doesn't state this, locals are optional
+        <T>(controllerConstructor: new (...args: any[]) => T, locals?: any, later?: boolean, ident?: string): T;
+        <T>(controllerConstructor: Function, locals?: any, later?: boolean, ident?: string): T;
+        <T>(controllerName: string, locals?: any, later?: boolean, ident?: string): T;
+    }
+
+    interface IControllerProvider extends IServiceProvider {
+        register(name: string, controllerConstructor: Function): void;
+        register(name: string, dependencyAnnotatedConstructor: any[]): void;
+        allowGlobals(): void;
+    }
+
+    /**
+     * xhrFactory
+     * Replace or decorate this service to create your own custom XMLHttpRequest objects.
+     * see https://docs.angularjs.org/api/ng/service/$xhrFactory
+     */
+    interface IXhrFactory<T> {
+        (method: string, url: string): T;
+    }
+
+    /**
+     * HttpService
+     * see http://docs.angularjs.org/api/ng/service/$http
+     */
+    interface IHttpService {
+        /**
+         * Object describing the request to be made and how it should be processed.
+         */
+        <T>(config: IRequestConfig): IHttpPromise<T>;
+
+        /**
+         * Shortcut method to perform GET request.
+         *
+         * @param url Relative or absolute URL specifying the destination of the request
+         * @param config Optional configuration object
+         */
+        get<T>(url: string, config?: IRequestShortcutConfig): IHttpPromise<T>;
+
+        /**
+         * Shortcut method to perform DELETE request.
+         *
+         * @param url Relative or absolute URL specifying the destination of the request
+         * @param config Optional configuration object
+         */
+        delete<T>(url: string, config?: IRequestShortcutConfig): IHttpPromise<T>;
+
+        /**
+         * Shortcut method to perform HEAD request.
+         *
+         * @param url Relative or absolute URL specifying the destination of the request
+         * @param config Optional configuration object
+         */
+        head<T>(url: string, config?: IRequestShortcutConfig): IHttpPromise<T>;
+
+        /**
+         * Shortcut method to perform JSONP request.
+         *
+         * @param url Relative or absolute URL specifying the destination of the request
+         * @param config Optional configuration object
+         */
+        jsonp<T>(url: string, config?: IRequestShortcutConfig): IHttpPromise<T>;
+
+        /**
+         * Shortcut method to perform POST request.
+         *
+         * @param url Relative or absolute URL specifying the destination of the request
+         * @param data Request content
+         * @param config Optional configuration object
+         */
+        post<T>(url: string, data: any, config?: IRequestShortcutConfig): IHttpPromise<T>;
+
+        /**
+         * Shortcut method to perform PUT request.
+         *
+         * @param url Relative or absolute URL specifying the destination of the request
+         * @param data Request content
+         * @param config Optional configuration object
+         */
+        put<T>(url: string, data: any, config?: IRequestShortcutConfig): IHttpPromise<T>;
+
+        /**
+         * Shortcut method to perform PATCH request.
+         *
+         * @param url Relative or absolute URL specifying the destination of the request
+         * @param data Request content
+         * @param config Optional configuration object
+         */
+        patch<T>(url: string, data: any, config?: IRequestShortcutConfig): IHttpPromise<T>;
+
+        /**
+         * Runtime equivalent of the $httpProvider.defaults property. Allows configuration of default headers, withCredentials as well as request and response transformations.
+         */
+        defaults: IHttpProviderDefaults;
+
+        /**
+         * Array of config objects for currently pending requests. This is primarily meant to be used for debugging purposes.
+         */
+        pendingRequests: IRequestConfig[];
+    }
+
+    /**
+     * Object describing the request to be made and how it should be processed.
+     * see http://docs.angularjs.org/api/ng/service/$http#usage
+     */
+    interface IRequestShortcutConfig extends IHttpProviderDefaults {
+        /**
+         * {Object.<string|Object>}
+         * Map of strings or objects which will be turned to ?key1=value1&key2=value2 after the url. If the value is not a string, it will be JSONified.
+         */
+        params?: any;
+
+        /**
+         * {string|Object}
+         * Data to be sent as the request message data.
+         */
+        data?: any;
+
+        /**
+         * Timeout in milliseconds, or promise that should abort the request when resolved.
+         */
+        timeout?: number|IPromise<any>;
+
+        /**
+         * See [XMLHttpRequest.responseType]https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest#xmlhttprequest-responsetype
+         */
+        responseType?: string;
+    }
+
+    /**
+     * Object describing the request to be made and how it should be processed.
+     * see http://docs.angularjs.org/api/ng/service/$http#usage
+     */
+    interface IRequestConfig extends IRequestShortcutConfig {
+        /**
+         * HTTP method (e.g. 'GET', 'POST', etc)
+         */
+        method: string;
+        /**
+         * Absolute or relative URL of the resource that is being requested.
+         */
+        url: string;
+    }
+
+    interface IHttpHeadersGetter {
+        (): { [name: string]: string; };
+        (headerName: string): string;
+    }
+
+    interface IHttpPromiseCallback<T> {
+        (data: T, status: number, headers: IHttpHeadersGetter, config: IRequestConfig): void;
+    }
+
+    interface IHttpPromiseCallbackArg<T> {
+        data?: T;
+        status?: number;
+        headers?: IHttpHeadersGetter;
+        config?: IRequestConfig;
+        statusText?: string;
+    }
+
+    interface IHttpPromise<T> extends IPromise<IHttpPromiseCallbackArg<T>> {
+        /**
+         * The $http legacy promise methods success and error have been deprecated. Use the standard then method instead.
+         * If $httpProvider.useLegacyPromiseExtensions is set to false then these methods will throw $http/legacy error.
+         * @deprecated
+         */
+        success?(callback: IHttpPromiseCallback<T>): IHttpPromise<T>;
+        /**
+         * The $http legacy promise methods success and error have been deprecated. Use the standard then method instead.
+         * If $httpProvider.useLegacyPromiseExtensions is set to false then these methods will throw $http/legacy error.
+         * @deprecated
+         */
+        error?(callback: IHttpPromiseCallback<any>): IHttpPromise<T>;
+    }
+
+    // See the jsdoc for transformData() at https://github.com/angular/angular.js/blob/master/src/ng/http.js#L228
+    interface IHttpRequestTransformer {
+        (data: any, headersGetter: IHttpHeadersGetter): any;
+    }
+
+    // The definition of fields are the same as IHttpPromiseCallbackArg
+    interface IHttpResponseTransformer {
+        (data: any, headersGetter: IHttpHeadersGetter, status: number): any;
+    }
+
+    type HttpHeaderType = {[requestType: string]:string|((config:IRequestConfig) => string)};
+
+    interface IHttpRequestConfigHeaders {
+        [requestType: string]: any;
+        common?: any;
+        get?: any;
+        post?: any;
+        put?: any;
+        patch?: any;
+    }
+
+    /**
+    * Object that controls the defaults for $http provider. Not all fields of IRequestShortcutConfig can be configured
+    * via defaults and the docs do not say which. The following is based on the inspection of the source code.
+    * https://docs.angularjs.org/api/ng/service/$http#defaults
+    * https://docs.angularjs.org/api/ng/service/$http#usage
+    * https://docs.angularjs.org/api/ng/provider/$httpProvider The properties section
+    */
+    interface IHttpProviderDefaults {
+        /**
+         * {boolean|Cache}
+         * If true, a default $http cache will be used to cache the GET request, otherwise if a cache instance built with $cacheFactory, this cache will be used for caching.
+         */
+        cache?: any;
+
+        /**
+         * Transform function or an array of such functions. The transform function takes the http request body and
+         * headers and returns its transformed (typically serialized) version.
+         * @see {@link https://docs.angularjs.org/api/ng/service/$http#transforming-requests-and-responses}
+         */
+        transformRequest?: IHttpRequestTransformer |IHttpRequestTransformer[];
+
+        /**
+         * Transform function or an array of such functions. The transform function takes the http response body and
+         * headers and returns its transformed (typically deserialized) version.
+         */
+        transformResponse?: IHttpResponseTransformer | IHttpResponseTransformer[];
+
+        /**
+         * Map of strings or functions which return strings representing HTTP headers to send to the server. If the
+         * return value of a function is null, the header will not be sent.
+         * The key of the map is the request verb in lower case. The "common" key applies to all requests.
+         * @see {@link https://docs.angularjs.org/api/ng/service/$http#setting-http-headers}
+         */
+        headers?: IHttpRequestConfigHeaders;
+
+        /** Name of HTTP header to populate with the XSRF token. */
+        xsrfHeaderName?: string;
+
+        /** Name of cookie containing the XSRF token. */
+        xsrfCookieName?: string;
+
+        /**
+         * whether to to set the withCredentials flag on the XHR object. See [requests with credentials]https://developer.mozilla.org/en/http_access_control#section_5 for more information.
+         */
+        withCredentials?: boolean;
+
+        /**
+        * A function used to the prepare string representation of request parameters (specified as an object). If
+        * specified as string, it is interpreted as a function registered with the $injector. Defaults to
+        * $httpParamSerializer.
+        */
+        paramSerializer?: string | ((obj: any) => string);
+    }
+
+    interface IHttpInterceptor {
+        request?: (config: IRequestConfig) => IRequestConfig|IPromise<IRequestConfig>;
+        requestError?: (rejection: any) => any;
+        response?: <T>(response: IHttpPromiseCallbackArg<T>) => IPromise<IHttpPromiseCallbackArg<T>>|IHttpPromiseCallbackArg<T>;
+        responseError?: (rejection: any) => any;
+    }
+
+    interface IHttpInterceptorFactory {
+        (...args: any[]): IHttpInterceptor;
+    }
+
+    interface IHttpProvider extends IServiceProvider {
+        defaults: IHttpProviderDefaults;
+
+        /**
+         * Register service factories (names or implementations) for interceptors which are called before and after
+         * each request.
+         */
+        interceptors: (string|IHttpInterceptorFactory|(string|IHttpInterceptorFactory)[])[];
+        useApplyAsync(): boolean;
+        useApplyAsync(value: boolean): IHttpProvider;
+
+        /**
+         *
+         * @param {boolean=} value If true, `$http` will return a normal promise without the `success` and `error` methods.
+         * @returns {boolean|Object} If a value is specified, returns the $httpProvider for chaining.
+         *    otherwise, returns the current configured value.
+         */
+        useLegacyPromiseExtensions(value:boolean) : boolean | IHttpProvider;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // HttpBackendService
+    // see http://docs.angularjs.org/api/ng.$httpBackend
+    // You should never need to use this service directly.
+    ///////////////////////////////////////////////////////////////////////////
+    interface IHttpBackendService {
+        // XXX Perhaps define callback signature in the future
+        (method: string, url: string, post?: any, callback?: Function, headers?: any, timeout?: number, withCredentials?: boolean): void;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // InterpolateService
+    // see http://docs.angularjs.org/api/ng.$interpolate
+    // see http://docs.angularjs.org/api/ng.$interpolateProvider
+    ///////////////////////////////////////////////////////////////////////////
+    interface IInterpolateService {
+        (text: string, mustHaveExpression?: boolean, trustedContext?: string, allOrNothing?: boolean): IInterpolationFunction;
+        endSymbol(): string;
+        startSymbol(): string;
+    }
+
+    interface IInterpolationFunction {
+        (context: any): string;
+    }
+
+    interface IInterpolateProvider extends IServiceProvider {
+        startSymbol(): string;
+        startSymbol(value: string): IInterpolateProvider;
+        endSymbol(): string;
+        endSymbol(value: string): IInterpolateProvider;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // TemplateCacheService
+    // see http://docs.angularjs.org/api/ng.$templateCache
+    ///////////////////////////////////////////////////////////////////////////
+    interface ITemplateCacheService extends ICacheObject {}
+
+    ///////////////////////////////////////////////////////////////////////////
+    // SCEService
+    // see http://docs.angularjs.org/api/ng.$sce
+    ///////////////////////////////////////////////////////////////////////////
+    interface ISCEService {
+        getTrusted(type: string, mayBeTrusted: any): any;
+        getTrustedCss(value: any): any;
+        getTrustedHtml(value: any): any;
+        getTrustedJs(value: any): any;
+        getTrustedResourceUrl(value: any): any;
+        getTrustedUrl(value: any): any;
+        parse(type: string, expression: string): (context: any, locals: any) => any;
+        parseAsCss(expression: string): (context: any, locals: any) => any;
+        parseAsHtml(expression: string): (context: any, locals: any) => any;
+        parseAsJs(expression: string): (context: any, locals: any) => any;
+        parseAsResourceUrl(expression: string): (context: any, locals: any) => any;
+        parseAsUrl(expression: string): (context: any, locals: any) => any;
+        trustAs(type: string, value: any): any;
+        trustAsHtml(value: any): any;
+        trustAsJs(value: any): any;
+        trustAsResourceUrl(value: any): any;
+        trustAsUrl(value: any): any;
+        isEnabled(): boolean;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // SCEProvider
+    // see http://docs.angularjs.org/api/ng.$sceProvider
+    ///////////////////////////////////////////////////////////////////////////
+    interface ISCEProvider extends IServiceProvider {
+        enabled(value: boolean): void;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // SCEDelegateService
+    // see http://docs.angularjs.org/api/ng.$sceDelegate
+    ///////////////////////////////////////////////////////////////////////////
+    interface ISCEDelegateService {
+        getTrusted(type: string, mayBeTrusted: any): any;
+        trustAs(type: string, value: any): any;
+        valueOf(value: any): any;
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // SCEDelegateProvider
+    // see http://docs.angularjs.org/api/ng.$sceDelegateProvider
+    ///////////////////////////////////////////////////////////////////////////
+    interface ISCEDelegateProvider extends IServiceProvider {
+        resourceUrlBlacklist(blacklist: any[]): void;
+        resourceUrlWhitelist(whitelist: any[]): void;
+        resourceUrlBlacklist(): any[];
+        resourceUrlWhitelist(): any[];
+    }
+
+    /**
+     * $templateRequest service
+     * see http://docs.angularjs.org/api/ng/service/$templateRequest
+     */
+    interface ITemplateRequestService {
+        /**
+         * Downloads a template using $http and, upon success, stores the
+         * contents inside of $templateCache.
+         *
+         * If the HTTP request fails or the response data of the HTTP request is
+         * empty then a $compile error will be thrown (unless
+         * {ignoreRequestError} is set to true).
+         *
+         * @param tpl                  The template URL.
+         * @param ignoreRequestError   Whether or not to ignore the exception
+         *                             when the request fails or the template is
+         *                             empty.
+         *
+         * @return   A promise whose value is the template content.
+         */
+        (tpl: string, ignoreRequestError?: boolean): IPromise<string>;
+        /**
+         * total amount of pending template requests being downloaded.
+         * @type {number}
+         */
+        totalPendingRequests: number;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Component
+    // see http://angularjs.blogspot.com.br/2015/11/angularjs-15-beta2-and-14-releases.html
+    // and http://toddmotto.com/exploring-the-angular-1-5-component-method/
+    ///////////////////////////////////////////////////////////////////////////
+    /**
+     * Runtime representation a type that a Component or other object is instances of.
+     *
+     * An example of a `Type` is `MyCustomComponent` class, which in JavaScript is be represented by
+     * the `MyCustomComponent` constructor function.
+     */
+    interface Type extends Function {
+    }
+
+    /**
+     * `RouteDefinition` defines a route within a {@link RouteConfig} decorator.
+     *
+     * Supported keys:
+     * - `path` or `aux` (requires exactly one of these)
+     * - `component`, `loader`,  `redirectTo` (requires exactly one of these)
+     * - `name` or `as` (optional) (requires exactly one of these)
+     * - `data` (optional)
+     *
+     * See also {@link Route}, {@link AsyncRoute}, {@link AuxRoute}, and {@link Redirect}.
+     */
+    interface RouteDefinition {
+        path?: string;
+        aux?: string;
+        component?: Type | ComponentDefinition | string;
+        loader?: Function;
+        redirectTo?: any[];
+        as?: string;
+        name?: string;
+        data?: any;
+        useAsDefault?: boolean;
+    }
+
+    /**
+     * Represents either a component type (`type` is `component`) or a loader function
+     * (`type` is `loader`).
+     *
+     * See also {@link RouteDefinition}.
+     */
+    interface ComponentDefinition {
+        type: string;
+        loader?: Function;
+        component?: Type;
+    }
+
+    /**
+     * Component definition object (a simplified directive definition object)
+     */
+    interface IComponentOptions {
+        /**
+         * Controller constructor function that should be associated with newly created scope or the name of a registered
+         * controller if passed as a string. Empty function by default.
+         * Use the array form to define dependencies (necessary if strictDi is enabled and you require dependency injection)
+         */
+        controller?: string | Function | (string | Function)[];
+        /**
+         * An identifier name for a reference to the controller. If present, the controller will be published to scope under
+         * the controllerAs name. If not present, this will default to be the same as the component name.
+         * @default "$ctrl"
+         */
+        controllerAs?: string;
+        /**
+         * html template as a string or a function that returns an html template as a string which should be used as the
+         * contents of this component. Empty string by default.
+         * If template is a function, then it is injected with the following locals:
+         * $element - Current element
+         * $attrs - Current attributes object for the element
+         * Use the array form to define dependencies (necessary if strictDi is enabled and you require dependency injection)
+         */
+        template?: string | Function | (string | Function)[];
+        /**
+         * path or function that returns a path to an html template that should be used as the contents of this component.
+         * If templateUrl is a function, then it is injected with the following locals:
+         * $element - Current element
+         * $attrs - Current attributes object for the element
+         * Use the array form to define dependencies (necessary if strictDi is enabled and you require dependency injection)
+         */
+        templateUrl?: string | Function | (string | Function)[];
+        /**
+         * Define DOM attribute binding to component properties. Component properties are always bound to the component
+         * controller and not to the scope.
+         */
+        bindings?: {[binding: string]: string};
+        /**
+         * Whether transclusion is enabled. Enabled by default.
+         */
+        transclude?: boolean | string | {[slot: string]: string};
+        require?: string | string[] | {[controller: string]: string};
+    }
+
+    interface IComponentTemplateFn {
+        ( $element?: IAugmentedJQuery, $attrs?: IAttributes ): string;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Directive
+    // see http://docs.angularjs.org/api/ng.$compileProvider#directive
+    // and http://docs.angularjs.org/guide/directive
+    ///////////////////////////////////////////////////////////////////////////
+
+    interface IDirectiveFactory {
+        (...args: any[]): IDirective;
+    }
+
+    interface IDirectiveLinkFn {
+        (
+            scope: IScope,
+            instanceElement: IAugmentedJQuery,
+            instanceAttributes: IAttributes,
+            controller: {},
+            transclude: ITranscludeFunction
+        ): void;
+    }
+
+    interface IDirectivePrePost {
+        pre?: IDirectiveLinkFn;
+        post?: IDirectiveLinkFn;
+    }
+
+    interface IDirectiveCompileFn {
+        (
+            templateElement: IAugmentedJQuery,
+            templateAttributes: IAttributes,
+            /**
+             * @deprecated
+             * Note: The transclude function that is passed to the compile function is deprecated,
+             * as it e.g. does not know about the right outer scope. Please use the transclude function
+             * that is passed to the link function instead.
+             */
+            transclude: ITranscludeFunction
+        ): IDirectivePrePost;
+    }
+
+    interface IDirective {
+        compile?: IDirectiveCompileFn;
+        controller?: any;
+        controllerAs?: string;
+        /**
+         * @deprecated
+         * Deprecation warning: although bindings for non-ES6 class controllers are currently bound to this before
+         * the controller constructor is called, this use is now deprecated. Please place initialization code that
+         * relies upon bindings inside a $onInit method on the controller, instead.
+         */
+        bindToController?: boolean | Object;
+        link?: IDirectiveLinkFn | IDirectivePrePost;
+        multiElement?: boolean;
+        name?: string;
+        priority?: number;
+        /**
+         * @deprecated
+         */
+        replace?: boolean;
+        require?: string | string[] | {[controller: string]: string};
+        restrict?: string;
+        scope?: boolean | Object;
+        template?: string | Function;
+        templateNamespace?: string;
+        templateUrl?: string | Function;
+        terminal?: boolean;
+        transclude?: boolean | string | {[slot: string]: string};
+    }
+
+    /**
+     * angular.element
+     * when calling angular.element, angular returns a jQuery object,
+     * augmented with additional methods like e.g. scope.
+     * see: http://docs.angularjs.org/api/angular.element
+     */
+    interface IAugmentedJQueryStatic extends JQueryStatic {
+        (selector: string, context?: any): IAugmentedJQuery;
+        (element: Element): IAugmentedJQuery;
+        (object: {}): IAugmentedJQuery;
+        (elementArray: Element[]): IAugmentedJQuery;
+        (object: JQuery): IAugmentedJQuery;
+        (func: Function): IAugmentedJQuery;
+        (array: any[]): IAugmentedJQuery;
+        (): IAugmentedJQuery;
+    }
+
+    interface IAugmentedJQuery extends JQuery {
+        // TODO: events, how to define?
+        //$destroy
+
+        find(selector: string): IAugmentedJQuery;
+        find(element: any): IAugmentedJQuery;
+        find(obj: JQuery): IAugmentedJQuery;
+        controller(): any;
+        controller(name: string): any;
+        injector(): any;
+        scope(): IScope;
+        
+        /**
+        *   Overload for custom scope interfaces
+        */
+        scope<T extends IScope>(): T;
+        isolateScope(): IScope;
+
+        inheritedData(key: string, value: any): JQuery;
+        inheritedData(obj: { [key: string]: any; }): JQuery;
+        inheritedData(key?: string): any;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // AUTO module (angular.js)
+    ///////////////////////////////////////////////////////////////////////////
+    export module auto {
+
+        ///////////////////////////////////////////////////////////////////////
+        // InjectorService
+        // see http://docs.angularjs.org/api/AUTO.$injector
+        ///////////////////////////////////////////////////////////////////////
+        interface IInjectorService {
+            annotate(fn: Function, strictDi?: boolean): string[];
+            annotate(inlineAnnotatedFunction: any[]): string[];
+            get<T>(name: string, caller?: string): T;
+            has(name: string): boolean;
+            instantiate<T>(typeConstructor: Function, locals?: any): T;
+            invoke(inlineAnnotatedFunction: any[]): any;
+            invoke(func: Function, context?: any, locals?: any): any;
+            strictDi: boolean;
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        // ProvideService
+        // see http://docs.angularjs.org/api/AUTO.$provide
+        ///////////////////////////////////////////////////////////////////////
+        interface IProvideService {
+            // Documentation says it returns the registered instance, but actual
+            // implementation does not return anything.
+            // constant(name: string, value: any): any;
+            /**
+             * Register a constant service, such as a string, a number, an array, an object or a function, with the $injector. Unlike value it can be injected into a module configuration function (see config) and it cannot be overridden by an Angular decorator.
+             *
+             * @param name The name of the constant.
+             * @param value The constant value.
+             */
+            constant(name: string, value: any): void;
+
+            /**
+             * Register a service decorator with the $injector. A service decorator intercepts the creation of a service, allowing it to override or modify the behaviour of the service. The object returned by the decorator may be the original service, or a new service object which replaces or wraps and delegates to the original service.
+             *
+             * @param name The name of the service to decorate.
+             * @param decorator This function will be invoked when the service needs to be instantiated and should return the decorated service instance. The function is called using the injector.invoke method and is therefore fully injectable. Local injection arguments:
+             *
+             * $delegate - The original service instance, which can be monkey patched, configured, decorated or delegated to.
+             */
+            decorator(name: string, decorator: Function): void;
+            /**
+             * Register a service decorator with the $injector. A service decorator intercepts the creation of a service, allowing it to override or modify the behaviour of the service. The object returned by the decorator may be the original service, or a new service object which replaces or wraps and delegates to the original service.
+             *
+             * @param name The name of the service to decorate.
+             * @param inlineAnnotatedFunction This function will be invoked when the service needs to be instantiated and should return the decorated service instance. The function is called using the injector.invoke method and is therefore fully injectable. Local injection arguments:
+             *
+             * $delegate - The original service instance, which can be monkey patched, configured, decorated or delegated to.
+             */
+            decorator(name: string, inlineAnnotatedFunction: any[]): void;
+            factory(name: string, serviceFactoryFunction: Function): IServiceProvider;
+            factory(name: string, inlineAnnotatedFunction: any[]): IServiceProvider;
+            provider(name: string, provider: IServiceProvider): IServiceProvider;
+            provider(name: string, serviceProviderConstructor: Function): IServiceProvider;
+            service(name: string, constructor: Function): IServiceProvider;
+            service(name: string, inlineAnnotatedFunction: any[]): IServiceProvider;
+            value(name: string, value: any): IServiceProvider;
+        }
+
+    }
+
+    /**
+     * $http params serializer that converts objects to strings
+     * see https://docs.angularjs.org/api/ng/service/$httpParamSerializer
+     */
+    interface IHttpParamSerializer {
+        (obj: Object): string;
+    }
+}
diff --git a/angularjs/legacy/angular-1.0-tests.ts b/angularjs/legacy/angular-1.0-tests.ts
index 33138c0c2f..b0e7ed692c 100644
--- a/angularjs/legacy/angular-1.0-tests.ts
+++ b/angularjs/legacy/angular-1.0-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-1.0.d.ts" />
+
 
 // issue: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/369
 https://github.com/witoldsz/angular-http-auth/blob/master/src/angular-http-auth.js
diff --git a/angularjs/legacy/angular-1.0-tests.ts.tscparams b/angularjs/legacy/angular-1.0-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/angularjs/legacy/angular-1.0-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/angularjs/legacy/angular-1.0.d.ts b/angularjs/legacy/angular-1.0.d.ts
index 6e8420b9d2..8c3fbca20a 100644
--- a/angularjs/legacy/angular-1.0.d.ts
+++ b/angularjs/legacy/angular-1.0.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="../../jquery/jquery.d.ts" />
+/// <reference types="jquery" />
 
 declare var angular: ng.IAngularStatic;
 
diff --git a/angularjs/legacy/angular-1.2-tests.ts b/angularjs/legacy/angular-1.2-tests.ts
index 71e96d0804..d618fa8d25 100644
--- a/angularjs/legacy/angular-1.2-tests.ts
+++ b/angularjs/legacy/angular-1.2-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-1.2.d.ts" />
+
 
 // issue: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/369
 // https://github.com/witoldsz/angular-http-auth/blob/master/src/angular-http-auth.js
diff --git a/angularjs/legacy/angular-1.2.d.ts b/angularjs/legacy/angular-1.2.d.ts
index fe018ba989..2c4fd8d014 100644
--- a/angularjs/legacy/angular-1.2.d.ts
+++ b/angularjs/legacy/angular-1.2.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="../../jquery/jquery.d.ts" />
+/// <reference types="jquery" />
 
 declare var angular: ng.IAngularStatic;
 
diff --git a/angularjs/legacy/angular-1.4.d.ts b/angularjs/legacy/angular-1.4.d.ts
index 22c504712e..da16c30920 100644
--- a/angularjs/legacy/angular-1.4.d.ts
+++ b/angularjs/legacy/angular-1.4.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="../../jquery/jquery.d.ts" />
+/// <reference types="jquery" />
 
 declare var angular: angular.IAngularStatic;
 
diff --git a/angularjs/legacy/angular-animate-1.2.d.ts b/angularjs/legacy/angular-animate-1.2.d.ts
index f4928bd0ca..0a74608c27 100644
--- a/angularjs/legacy/angular-animate-1.2.d.ts
+++ b/angularjs/legacy/angular-animate-1.2.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michel Salib <https://github.com/michelsalib>, Adi Dahiya <https://github.com/adidahiya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="angular-1.2.d.ts" />
+
 
 ///////////////////////////////////////////////////////////////////////////////
 // ngAnimate module (angular-animate.js)
diff --git a/angularjs/legacy/angular-animate-1.3.d.ts b/angularjs/legacy/angular-animate-1.3.d.ts
index c689203ff3..6f103bc83c 100644
--- a/angularjs/legacy/angular-animate-1.3.d.ts
+++ b/angularjs/legacy/angular-animate-1.3.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michel Salib <https://github.com/michelsalib>, Adi Dahiya <https://github.com/adidahiya>, Raphael Schweizer <https://github.com/rasch>, Cody Schaaf <https://github.com/codyschaaf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="angular-1.4.d.ts" />
+
 
 declare module "angular-animate" {
     var _: string;
diff --git a/angularjs/legacy/angular-cookies-1.0.d.ts b/angularjs/legacy/angular-cookies-1.0.d.ts
index 0b53de186b..78c8bd4229 100644
--- a/angularjs/legacy/angular-cookies-1.0.d.ts
+++ b/angularjs/legacy/angular-cookies-1.0.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="angular-1.0.d.ts" />
+
 
 ///////////////////////////////////////////////////////////////////////////////
 // ngCookies module (angular-cookies.js)
diff --git a/angularjs/legacy/angular-cookies-1.2.d.ts b/angularjs/legacy/angular-cookies-1.2.d.ts
index aaf08327e2..662bf11662 100644
--- a/angularjs/legacy/angular-cookies-1.2.d.ts
+++ b/angularjs/legacy/angular-cookies-1.2.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="angular-1.2.d.ts" />
+
 
 ///////////////////////////////////////////////////////////////////////////////
 // ngCookies module (angular-cookies.js)
diff --git a/angularjs/legacy/angular-mocks-1.0.d.ts b/angularjs/legacy/angular-mocks-1.0.d.ts
index 340f58e3c6..7ffa97f0ee 100644
--- a/angularjs/legacy/angular-mocks-1.0.d.ts
+++ b/angularjs/legacy/angular-mocks-1.0.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="angular-1.0.d.ts" />
+
 
 ///////////////////////////////////////////////////////////////////////////////
 // functions attached to global object (window)
diff --git a/angularjs/legacy/angular-mocks-1.2-tests.ts b/angularjs/legacy/angular-mocks-1.2-tests.ts
index 6f359a67c4..34e29addc0 100644
--- a/angularjs/legacy/angular-mocks-1.2-tests.ts
+++ b/angularjs/legacy/angular-mocks-1.2-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-mocks-1.2.d.ts" />
+
 
 ///////////////////////////////////////
 // IAngularStatic
diff --git a/angularjs/legacy/angular-mocks-1.2.d.ts b/angularjs/legacy/angular-mocks-1.2.d.ts
index 2a1ce25196..3b4f7e0405 100644
--- a/angularjs/legacy/angular-mocks-1.2.d.ts
+++ b/angularjs/legacy/angular-mocks-1.2.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Diego Vilar <http://github.com/diegovilar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="angular-1.2.d.ts" />
+
 
 ///////////////////////////////////////////////////////////////////////////////
 // functions attached to global object (window)
diff --git a/angularjs/legacy/angular-resource-1.0.d.ts b/angularjs/legacy/angular-resource-1.0.d.ts
index 07f5f7e0ff..88ea0adcd8 100644
--- a/angularjs/legacy/angular-resource-1.0.d.ts
+++ b/angularjs/legacy/angular-resource-1.0.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Diego Vilar <http://github.com/diegovilar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="angular-1.0.d.ts" />
+
 
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/angularjs/legacy/angular-resource-1.2-tests.ts b/angularjs/legacy/angular-resource-1.2-tests.ts
index ca970f5c40..f79b4752d3 100644
--- a/angularjs/legacy/angular-resource-1.2-tests.ts
+++ b/angularjs/legacy/angular-resource-1.2-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-resource-1.2.d.ts" />
+
 
 interface IMyResource extends ng.resource.IResource<IMyResource> { };
 interface IMyResourceClass extends ng.resource.IResourceClass<IMyResource> { };
diff --git a/angularjs/legacy/angular-resource-1.2.d.ts b/angularjs/legacy/angular-resource-1.2.d.ts
index b0ccb5e7e6..5270037426 100644
--- a/angularjs/legacy/angular-resource-1.2.d.ts
+++ b/angularjs/legacy/angular-resource-1.2.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Diego Vilar <http://github.com/diegovilar>, Michael Jess <http://github.com/miffels>
 // Definitions: https://github.com/daptiv/DefinitelyTyped
 
-/// <reference path="angular-1.2.d.ts" />
+
 
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/angularjs/legacy/angular-resource-1.3.d.ts b/angularjs/legacy/angular-resource-1.3.d.ts
index 798bc0a581..7390570991 100644
--- a/angularjs/legacy/angular-resource-1.3.d.ts
+++ b/angularjs/legacy/angular-resource-1.3.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Diego Vilar <http://github.com/diegovilar>, Michael Jess <http://github.com/miffels>
 // Definitions: https://github.com/daptiv/DefinitelyTyped
 
-/// <reference path="angular-1.4.d.ts" />
+
 
 declare module 'angular-resource' {
     var _: string;
diff --git a/angularjs/legacy/angular-route-1.2-tests.ts b/angularjs/legacy/angular-route-1.2-tests.ts
index 0b82110ef2..d076c148c2 100644
--- a/angularjs/legacy/angular-route-1.2-tests.ts
+++ b/angularjs/legacy/angular-route-1.2-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-route-1.2.d.ts" />
+
 
 /**
  * @license HTTP Auth Interceptor Module for AngularJS
diff --git a/angularjs/legacy/angular-route-1.2.d.ts b/angularjs/legacy/angular-route-1.2.d.ts
index 9c1dd4aa25..29b57a39b4 100644
--- a/angularjs/legacy/angular-route-1.2.d.ts
+++ b/angularjs/legacy/angular-route-1.2.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Jonathan Park <https://github.com/park9140>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="angular-1.2.d.ts" />
+
 
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/angularjs/legacy/angular-sanitize-1.0.d.ts b/angularjs/legacy/angular-sanitize-1.0.d.ts
index 510a7bc82b..e883621105 100644
--- a/angularjs/legacy/angular-sanitize-1.0.d.ts
+++ b/angularjs/legacy/angular-sanitize-1.0.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="angular-1.0.d.ts" />
+
 
 ///////////////////////////////////////////////////////////////////////////////
 // ngSanitize module (angular-sanitize.js)
diff --git a/angularjs/legacy/angular-sanitize-1.2-tests.ts b/angularjs/legacy/angular-sanitize-1.2-tests.ts
index 853bbf3495..94bb6615ec 100644
--- a/angularjs/legacy/angular-sanitize-1.2-tests.ts
+++ b/angularjs/legacy/angular-sanitize-1.2-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-sanitize-1.2.d.ts" />
+
 
 var shouldBeString: string;
 
diff --git a/angularjs/legacy/angular-sanitize-1.2.d.ts b/angularjs/legacy/angular-sanitize-1.2.d.ts
index cbd559688a..88c3eec39e 100644
--- a/angularjs/legacy/angular-sanitize-1.2.d.ts
+++ b/angularjs/legacy/angular-sanitize-1.2.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="angular-1.2.d.ts" />
+
 
 ///////////////////////////////////////////////////////////////////////////////
 // ngSanitize module (angular-sanitize.js)
diff --git a/angularjs/legacy/angular-scenario-1.0.d.ts.tscparams b/angularjs/legacy/angular-scenario-1.0.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/angularjs/legacy/angular-scenario-1.0.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/angularjs/legacy/angular-scenario-1.2.d.ts b/angularjs/legacy/angular-scenario-1.2.d.ts
index 75490855bf..5dfa36fc5f 100644
--- a/angularjs/legacy/angular-scenario-1.2.d.ts
+++ b/angularjs/legacy/angular-scenario-1.2.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: RomanoLindano <https://github.com/RomanoLindano>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../../jquery/jquery.d.ts" />
+/// <reference types="jquery" />
 
 declare namespace ng {
     export interface IAngularStatic {
diff --git a/angularjs/tsconfig.json b/angularjs/tsconfig.json
new file mode 100644
index 0000000000..8653344dce
--- /dev/null
+++ b/angularjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "angular-mocks-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/angulartics/angulartics-tests.ts b/angulartics/angulartics-tests.ts
index f5a7190bd6..36ad8f46cf 100644
--- a/angulartics/angulartics-tests.ts
+++ b/angulartics/angulartics-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="angulartics.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
+
+/// <reference types="angularjs" />
 
 namespace Analytics {
     angular.module("angulartics.app", ["angulartics"])
diff --git a/angulartics/angulartics.d.ts b/angulartics/angulartics.d.ts
deleted file mode 100644
index 8714e1a903..0000000000
--- a/angulartics/angulartics.d.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-// Type definitions for Angulartics v0.20.2
-// Project: http://luisfarzati.github.io/angulartics/
-// Definitions by: Steven Fan <https://github.com/stevenfan>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-declare namespace angulartics {
-
-    interface IAngularticsStatic {
-        waitForVendorApi(objectName:string, delay:number, containsField?:any, registerFn?:any, onTimeout?:boolean): void;
-    }
-
-    interface IAnalyticsService {
-        eventTrack(eventName: string, properties?: any): any;
-        pageTrack(path:string, location?:angular.ILocationService): any;
-        setAlias(alias: string): any;
-        setUsername(username: string): any;
-        setUserProperties(properties: any): any;
-        setSuperProperties(properties: any): any;
-    }
-
-    interface IAnalyticsServiceProvider extends angular.IServiceProvider {
-        virtualPageviews(value: boolean): void;
-        excludeRoutes(value: string[]): void;
-        firstPageview(value: boolean): void;
-        withBase(value: boolean): void;
-        withAutoBase(value: boolean): void;
-        developerMode(value: boolean): void;
-
-        registerPageTrack(callback:(path:string, location?:angular.ILocationService) => any): void;
-        registerEventTrack(callback: (eventName: string, properties?: any) => any): void;
-        registerSetAlias(callback: (alias: string) => any): void
-        registerSetUsername(callback: (username: string) => any): void
-        registerSetUserProperties(callback: (userProperties: any) => any): void
-        registerSetSuperProperties(callback: (superProperties: any) => any): void
-
-        settings: {
-            pageTracking: {
-                autoTrackingVirtualPages: boolean,
-                autoTrackingFirstPage: boolean,
-                basePath: string,
-                autoBasePath: boolean
-            },
-            developerMode: boolean
-        }
-    }
-}
-
-declare var angulartics:angulartics.IAngularticsStatic;
diff --git a/angulartics/index.d.ts b/angulartics/index.d.ts
new file mode 100644
index 0000000000..28976019f1
--- /dev/null
+++ b/angulartics/index.d.ts
@@ -0,0 +1,49 @@
+// Type definitions for Angulartics v0.20.2
+// Project: http://luisfarzati.github.io/angulartics/
+// Definitions by: Steven Fan <https://github.com/stevenfan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+declare namespace angulartics {
+
+    interface IAngularticsStatic {
+        waitForVendorApi(objectName:string, delay:number, containsField?:any, registerFn?:any, onTimeout?:boolean): void;
+    }
+
+    interface IAnalyticsService {
+        eventTrack(eventName: string, properties?: any): any;
+        pageTrack(path:string, location?:angular.ILocationService): any;
+        setAlias(alias: string): any;
+        setUsername(username: string): any;
+        setUserProperties(properties: any): any;
+        setSuperProperties(properties: any): any;
+    }
+
+    interface IAnalyticsServiceProvider extends angular.IServiceProvider {
+        virtualPageviews(value: boolean): void;
+        excludeRoutes(value: string[]): void;
+        firstPageview(value: boolean): void;
+        withBase(value: boolean): void;
+        withAutoBase(value: boolean): void;
+        developerMode(value: boolean): void;
+
+        registerPageTrack(callback:(path:string, location?:angular.ILocationService) => any): void;
+        registerEventTrack(callback: (eventName: string, properties?: any) => any): void;
+        registerSetAlias(callback: (alias: string) => any): void
+        registerSetUsername(callback: (username: string) => any): void
+        registerSetUserProperties(callback: (userProperties: any) => any): void
+        registerSetSuperProperties(callback: (superProperties: any) => any): void
+
+        settings: {
+            pageTracking: {
+                autoTrackingVirtualPages: boolean,
+                autoTrackingFirstPage: boolean,
+                basePath: string,
+                autoBasePath: boolean
+            },
+            developerMode: boolean
+        }
+    }
+}
+
+declare var angulartics:angulartics.IAngularticsStatic;
diff --git a/angulartics/tsconfig.json b/angulartics/tsconfig.json
new file mode 100644
index 0000000000..48e13b9a7a
--- /dev/null
+++ b/angulartics/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angulartics-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/animation-frame/animation-frame-tests.ts b/animation-frame/animation-frame-tests.ts
index f7b1648303..2e0486f6ab 100644
--- a/animation-frame/animation-frame-tests.ts
+++ b/animation-frame/animation-frame-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="animation-frame.d.ts"/>
 namespace AnimationFrameTests {
   var animation = new AnimationFrame();
   function frame() {
diff --git a/animation-frame/animation-frame.d.ts b/animation-frame/index.d.ts
similarity index 100%
rename from animation-frame/animation-frame.d.ts
rename to animation-frame/index.d.ts
diff --git a/animation-frame/tsconfig.json b/animation-frame/tsconfig.json
new file mode 100644
index 0000000000..0ca71ed844
--- /dev/null
+++ b/animation-frame/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "animation-frame-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ansi-styles/ansi-styles-tests.ts b/ansi-styles/ansi-styles-tests.ts
index dc3187ef5b..235f98dce1 100644
--- a/ansi-styles/ansi-styles-tests.ts
+++ b/ansi-styles/ansi-styles-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="ansi-styles.d.ts" />
 
 import ansi = require('ansi-styles');
 
diff --git a/ansi-styles/ansi-styles.d.ts b/ansi-styles/ansi-styles.d.ts
deleted file mode 100644
index e5c01c6a5a..0000000000
--- a/ansi-styles/ansi-styles.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// Type definitions for ansi-styles 2.0.1
-// Project: https://github.com/sindresorhus/ansi-styles
-// Definitions by: bryn austin bellomy <https://github.com/brynbellomy>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-declare module "ansi-styles"
-{
-    export interface EscapeCodePair {
-        open: string;
-        close: string;
-    }
-
-    export var reset: EscapeCodePair;
-
-    export var bold: EscapeCodePair;
-    export var dim: EscapeCodePair;
-    export var italic: EscapeCodePair;
-    export var underline: EscapeCodePair;
-    export var inverse: EscapeCodePair;
-    export var hidden: EscapeCodePair;
-    export var strikethrough: EscapeCodePair;
-
-    export var black: EscapeCodePair;
-    export var red: EscapeCodePair;
-    export var green: EscapeCodePair;
-    export var yellow: EscapeCodePair;
-    export var blue: EscapeCodePair;
-    export var magenta: EscapeCodePair;
-    export var cyan: EscapeCodePair;
-    export var white: EscapeCodePair;
-    export var gray: EscapeCodePair;
-
-    export var bgBlack: EscapeCodePair;
-    export var bgRed: EscapeCodePair;
-    export var bgGreen: EscapeCodePair;
-    export var bgYellow: EscapeCodePair;
-    export var bgBlue: EscapeCodePair;
-    export var bgMagenta: EscapeCodePair;
-    export var bgCyan: EscapeCodePair;
-    export var bgWhite: EscapeCodePair;
-}
\ No newline at end of file
diff --git a/ansi-styles/index.d.ts b/ansi-styles/index.d.ts
new file mode 100644
index 0000000000..4522ece77a
--- /dev/null
+++ b/ansi-styles/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for ansi-styles 2.0.1
+// Project: https://github.com/sindresorhus/ansi-styles
+// Definitions by: bryn austin bellomy <https://github.com/brynbellomy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+export interface EscapeCodePair {
+    open: string;
+    close: string;
+}
+
+export declare var reset: EscapeCodePair;
+
+export declare var bold: EscapeCodePair;
+export declare var dim: EscapeCodePair;
+export declare var italic: EscapeCodePair;
+export declare var underline: EscapeCodePair;
+export declare var inverse: EscapeCodePair;
+export declare var hidden: EscapeCodePair;
+export declare var strikethrough: EscapeCodePair;
+
+export declare var black: EscapeCodePair;
+export declare var red: EscapeCodePair;
+export declare var green: EscapeCodePair;
+export declare var yellow: EscapeCodePair;
+export declare var blue: EscapeCodePair;
+export declare var magenta: EscapeCodePair;
+export declare var cyan: EscapeCodePair;
+export declare var white: EscapeCodePair;
+export declare var gray: EscapeCodePair;
+
+export declare var bgBlack: EscapeCodePair;
+export declare var bgRed: EscapeCodePair;
+export declare var bgGreen: EscapeCodePair;
+export declare var bgYellow: EscapeCodePair;
+export declare var bgBlue: EscapeCodePair;
+export declare var bgMagenta: EscapeCodePair;
+export declare var bgCyan: EscapeCodePair;
+export declare var bgWhite: EscapeCodePair;
diff --git a/ansi-styles/tsconfig.json b/ansi-styles/tsconfig.json
new file mode 100644
index 0000000000..a633f70d76
--- /dev/null
+++ b/ansi-styles/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ansi-styles-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ansicolors/ansicolors.d.ts b/ansicolors/ansicolors.d.ts
deleted file mode 100644
index 2bbfcafc6e..0000000000
--- a/ansicolors/ansicolors.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for ansicolors
-// Project: https://github.com/thlorenz/ansicolors
-// Definitions by: rogierschouten <https://github.com/rogierschouten>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "ansicolors" {
-	var colors: {[index: string]: (s: string) => string;};
-	export = colors;
-}
diff --git a/ansicolors/index.d.ts b/ansicolors/index.d.ts
new file mode 100644
index 0000000000..6750283895
--- /dev/null
+++ b/ansicolors/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for ansicolors
+// Project: https://github.com/thlorenz/ansicolors
+// Definitions by: rogierschouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare var colors: { [index: string]: (s: string) => string; };
+export = colors;
diff --git a/ansicolors/tsconfig.json b/ansicolors/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/ansicolors/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/antd/antd-tests.tsx b/antd/antd-tests.tsx
index 6655862723..142ca6ccdd 100644
--- a/antd/antd-tests.tsx
+++ b/antd/antd-tests.tsx
@@ -1,6 +1,4 @@
-/// <reference path="../react/react.d.ts" />
-/// <reference path="./antd.d.ts" />
-import React = __React
+/// <reference types="react" />
 /*import {
     Affix,
     Button,
diff --git a/antd/antd.d.ts b/antd/antd.d.ts
deleted file mode 100644
index 62288af91b..0000000000
--- a/antd/antd.d.ts
+++ /dev/null
@@ -1,2085 +0,0 @@
-// Type definitions for Antd v0.12.10
-// Project: http://ant.design
-// Definitions by: bang88 <https://github.com/bang88>, Bruce Mitchener <https://github.com/waywardmonkeys/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../react/react.d.ts" />
-declare namespace Antd {
-
-    import React = __React
-
-    // Affix
-    interface AffixProps {
-        /**
-         * 达到指定偏移量后触发
-         */
-        offset?: number
-    }
-    /**
-     * # Affix
-     * 将页面元素钉在可视范围。
-     * ## 何时使用
-     * 当内容区域比较长，需要滚动页面时，这部分内容对应的操作或者导航需要在滚动范围内始终展现。常用于侧边菜单和按钮组合。
-     * 页面可视范围过小时，慎用此功能以免遮挡页面内容。
-     */
-    export class Affix extends React.Component<AffixProps, {}> {
-        render(): JSX.Element
-    }
-
-
-    // Alert
-    interface AlertProps {
-        /**
-         * 必选参数，指定警告提示的样式，有四种选择`success`、`info`、`warn`、`error`
-         */
-        type: string,
-        /**可选参数，默认不显示关闭按钮 */
-        closable?: boolean,
-        /**可选参数，自定义关闭按钮 */
-        closeText?: React.ReactNode,
-        /**必选参数，警告提示内容 */
-        message: React.ReactNode,
-        /**可选参数，警告提示的辅助性文字介绍 */
-        description?: React.ReactNode,
-        /**可选参数，关闭时触发的回调函数 */
-        onClose?: Function,
-        /**可选参数，是否显示辅助图标 */
-        showIcon?: boolean
-    }
-
-
-    /**
-     *  # Alert
-     *  警告提示，展现需要关注的信息。
-
-     * ## 何时使用
-
-     * - 当某个页面需要向用户显示警告的信息时。
-     * - 非浮层的静态展现形式，始终展现，不会自动消失，用户可以点击关闭。
-     * */
-    export class Alert extends React.Component<AlertProps, {}> {
-        render(): JSX.Element
-    }
-
-
-    // Badge
-    /**
-     * #Badge
-     *
-     * 图标右上角的圆形徽标数字。
-
-     * ## 何时使用
-
-     * 一般出现在通知图标或头像的右上角，用于显示需要处理的消息条数，通过醒目视觉形式吸引用户处理。
-     *
-    */
-    export class Badge extends React.Component<BadgeProps, {}> {
-        render(): JSX.Element
-    }
-    interface BadgeProps {
-        /** 展示的数字，大于 overflowCount 时显示为 `${overflowCount}+`，为 0 时隐藏*/
-        count: number,
-        /** 展示封顶的数字值*/
-        overflowCount?: number,
-        /** 不展示数字，只有一个小红点*/
-        dot?: boolean
-    }
-
-
-    // Button
-    interface ButtonProps {
-        /** 设置按钮类型，可选值为 `primary` `ghost` 或者不设 */
-        type?: ButtonType | string,
-        /** 设置按钮形状，可选值为 `circle` `circle-outline` 或者不设*/
-        shape?: string,
-        /** 设置按钮大小，可选值为 `small` `large` 或者不设*/
-        size?: string,
-        /** 设置 `button` 原生的 `type` 值，可选值请参考 HTML标准*/
-        htmlType?: string,
-        /** `click` 事件的 handler*/
-        onClick?: Function,
-        /** 设置按钮载入状态*/
-        loading?: boolean,
-        /** 样式名*/
-        className?: string,
-    }
-
-
-    enum ButtonType {
-        primary,
-        ghost,
-        dashed
-    }
-
-    interface ButtonGroupProps {
-        /** 设置按钮大小，可选值为 `small` `large` 或者不设*/
-        size?: string
-
-    }
-
-    /**
-    可以将多个 `Button` 放入 `Button.Group` 的容器中。
-
-    通过设置 `size` 为 `large` `small` 分别把按钮组合设为大、小尺寸。若不设置 `size`，则尺寸为中。*/
-    class ButtonGroup extends React.Component<ButtonGroupProps, {}> {
-        render(): JSX.Element
-    }
-
-    /**
-     * #Button
-    按钮用于开始一个即时操作。
-
-    ## 何时使用
-
-    标记了一个（或封装一组）操作命令，响应用户点击行为，触发相应的业务逻辑。*/
-    export class Button extends React.Component<ButtonProps, {}> {
-        static Group: typeof ButtonGroup
-        render(): JSX.Element
-    }
-
-
-
-    // Breadcrumb
-
-    interface BreadcrumbItemProps {
-        /** 链接，如不传则不可点击   */
-        href?: string
-    }
-    export class BreadcrumbItem extends React.Component<BreadcrumbItemProps, {}> {
-        render(): JSX.Element
-    }
-
-    interface BreadcrumbProps {
-        /** router 的路由栈信息 */
-        routes?: Array<React.ReactNode>,
-        /** 路由的参数*/
-        params?: Object,
-        /** 分隔符自定义*/
-        separator?: string | React.ReactNode
-    }
-    /**
-     * #Breadcrumb
-    显示当前页面在系统层级结构中的位置，并能向上返回。
-
-    ## 何时使用
-
-    - 当系统拥有超过两级以上的层级结构时；
-    - 当需要告知用户“你在哪里”时；
-    - 当需要向上导航的功能时。*/
-    export class Breadcrumb extends React.Component<BreadcrumbProps, {}> {
-        static Item: typeof BreadcrumbItem
-        render(): JSX.Element
-    }
-
-
-    // Calendar
-    interface CalendarProps {
-        /** 自定义渲染月单元格*/
-        monthCellRender?: Function,
-        /** 自定义渲染日期单元格*/
-        dateCellRender?: Function,
-        /** 是否全屏显示*/
-        fullscreen?: boolean,
-        /** 国际化配置*/
-        locale?: Object,
-        prefixCls?: string,
-        className?: string,
-        style?: Object,
-        /** 日期面板变化回调*/
-        onPanelChange?: Function,
-        /** 展示日期*/
-        value?: Date,
-        /** 默认展示日期*/
-        defaultValue?: Date,
-        /** 初始模式，`month/year`*/
-        mode?: string
-    }
-    /**
-     * #Calendar
-    按照日历形式展示数据的容器。
-
-    ## 何时使用
-
-    当数据是日期或按照日期划分时，例如日程、课表、价格日历等，农历等。目前支持年/月切换。
-    */
-    export class Calendar extends React.Component<CalendarProps, {}> {
-        render(): JSX.Element
-    }
-
-
-    // Carousel
-    interface CarouselProps {
-        /** 动画效果函数，可取 scrollx, fade*/
-        effect?: string,
-        /** 是否显示面板指示点*/
-        dots?: boolean,
-        /** 垂直显示*/
-        vertical?: boolean,
-        /** 是否自动切换*/
-        autoplay?: boolean,
-        /** 动画效果*/
-        easing?: string,
-        /** 切换面板的回调*/
-        beforeChange?: Function,
-        /** 切换面板的回调*/
-        afterChange?: Function
-    }
-    /**
-     * #Carousel
-    旋转木马，一组轮播的区域。
-
-    ## 何时使用
-
-    - 当有一组平级的内容。
-    - 当内容空间不足时，可以用走马灯的形式进行收纳，进行轮播展现。
-    - 常用于一组图片或卡片轮播。
-    */
-    export class Carousel extends React.Component<CarouselProps, {}> {
-        render(): JSX.Element
-    }
-
-
-
-    // Cascader
-    interface CascaderProps {
-        /** 可选项数据源*/
-        options: Object,
-        /** 默认的选中项*/
-        defaultValue?: Array<any>,
-        /** 指定选中项*/
-        value?: Array<any>,
-        /** 选择完成后的回调*/
-        onChange?: Function,
-        /** 选择后展示的渲染函数*/
-        displayRender?: Function,
-        /** 自定义样式*/
-        style?: Object,
-        /** 自定义类名*/
-        className?: string,
-        /** 自定义浮层类名*/
-        popupClassName?: string,
-        /** 浮层预设位置：`bottomLeft` `bottomRight` `topLeft` `topRight` */
-        popupPlacement?: string,
-        /** 输入框占位文本*/
-        placeholder?: string,
-        /** 输入框大小，可选 `large` `default` `small` */
-        size?: string,
-        /** 禁用*/
-        disabled?: boolean,
-        /** 是否支持清除*/
-        allowClear?: boolean
-
-    }
-    /**
-     * #Cascader
-    级联选择框。
-
-
-    ## 何时使用
-
-    - 需要从一组相关联的数据集合进行选择，例如省市区，公司层级，事物分类等。
-    - 从一个较大的数据集合中进行选择时，用多级分类进行分隔，方便选择。
-    - 比起 Select 组件，可以在同一个浮层中完成选择，有较好的体验。*/
-    export class Cascader extends React.Component<CascaderProps, {}> {
-        render(): JSX.Element
-    }
-
-
-
-
-    // Checkbox
-    interface CheckboxProps {
-        /** 指定当前是否选中*/
-        checked?: boolean,
-        /** 初始是否选中*/
-        defaultChecked?: boolean,
-        /** 变化时回调函数*/
-        onChange?: Function
-    }
-
-    interface CheckboxGroupProps {
-        /** 默认选中的选项*/
-        defaultValue?: Array<any>,
-        /** 指定选中的选项*/
-        value?: Array<any>,
-        /** 指定可选项*/
-        options?: Array<any>,
-        /** 变化时回调函数*/
-        onChange?: Function
-    }
-    /** Checkbox 组*/
-    class CheckboxGroup extends React.Component<CheckboxGroupProps, {}> {
-        render(): JSX.Element
-    }
-    /**
-     * #Checkbox
-    多选框。
-
-    ## 何时使用
-
-    - 在一组可选项中进行多项选择时；
-    - 单独使用可以表示两种状态之间的切换，和 `switch` 类似。区别在于切换 `switch` 会直接触发状态改变，而 `checkbox` 一般用于状态标记，需要和提交操作配合。
-    */
-    export class Checkbox extends React.Component<CheckboxProps, {}> {
-        static Group: typeof CheckboxGroup
-        render(): JSX.Element
-    }
-
-
-
-    // Collapse
-
-    interface CollapseProps {
-        /** 当前激活 tab 面板的 key*/
-        activeKey?: Array<any> | string,
-        /** 初始化选中面板的key */
-        defaultActiveKey?: Array<string>,
-        /** 切换面板的回调*/
-        onChange?: Function
-
-    }
-    class CollapsePanel extends React.Component<{
-        /** 对应 activeKey */
-        key: string,
-        /** 面板头内容*/
-        header: React.ReactNode | string
-    }, {}> {
-        render(): JSX.Element
-    }
-    /**
-     * #Collapse
-    可以折叠/展开的内容区域。
-
-    ## 何时使用
-
-    - 对复杂区域进行分组和隐藏，保持页面的整洁。
-    - `手风琴` 是一种特殊的折叠面板，只允许单个内容区域展开。*/
-    export class Collapse extends React.Component<CollapseProps, {}> {
-        static Panel: typeof CollapsePanel
-        render(): JSX.Element
-    }
-
-
-
-    // DatePicker
-    interface DatePickerProps<T> {
-
-        value?: string | Date,
-        defaultValue?: string | Date,
-        /** 展示的日期格式，配置参考 [GregorianCalendarFormat](https://github.com/yiminghe/gregorian-calendar-format)*/
-        format?: string,
-        /** 不可选择的日期*/
-        disabledDate?: Function,
-        /** 时间发生变化的回调，发生在用户选择时间时*/
-        onChange?: Function,
-        /** 禁用*/
-        disabled?: boolean,
-        style?: Object,
-        /** 格外的弹出日历样式*/
-        popupStyle?: Object,
-        /** 输入框大小，`large` 高度为 32px，`small` 为 22px，默认是 28px*/
-        size?: string,
-        /** 国际化配置*/
-        locale?: Object,
-        /** 增加时间选择功能*/
-        showTime?: boolean,
-        /** 点击确定按钮的回调*/
-        onOk?: Function,
-        /** 定义浮层的容器，默认为 body 上新建 div*/
-        getCalendarContainer?: Function
-
-    }
-    interface RangePickProps extends DatePickerProps<RangePicker> {
-
-    }
-    class RangePicker extends React.Component<RangePickProps, {}> {
-        render(): JSX.Element
-    }
-    class MonthPicker extends React.Component<RangePickProps, {}> {
-        render(): JSX.Element
-    }
-    /**
-     * #DatePicker
-    输入或选择日期的控件。
-
-    ## 何时使用
-
-    当用户需要输入一个日期，可以点击标准输入框，弹出日期面板进行选择。*/
-    export class DatePicker extends React.Component<DatePickerProps<any>, {}> {
-        static RangePicker: typeof RangePicker
-        static MonthPicker: typeof MonthPicker
-        render(): JSX.Element
-    }
-
-
-
-
-    // Dropdown
-
-    interface DropdownProps {
-        /** 触发下拉的行为  ['click'] or ['hover']*/
-        trigger?: Array<string>,
-        /** 菜单节点*/
-        overlay: React.ReactNode
-
-    }
-
-    class DropdownButton extends React.Component<{
-        /**  按钮类型*/
-        type?: string,
-        /** 点击左侧按钮的回调*/
-        onClick?: Function,
-        /** 触发下拉的行为*/
-        trigger?: string,
-        /** 菜单节点*/
-        overlay: React.ReactNode
-    }, {}> {
-        render(): JSX.Element
-    }
-    /**
-     * #Dropdown
-    向下弹出的列表。
-
-    ## 何时使用
-
-    当页面上的操作命令过多时，用此组件可以收纳操作元素。点击或移入触点，会出现一个下拉菜单。可在列表中进行选择，并执行相应的命令。
-    */
-    export class Dropdown extends React.Component<DropdownProps, {}> {
-        static Button: typeof DropdownButton
-        render(): JSX.Element
-    }
-
-
-
-    // Form
-
-    interface FormItemProps {
-        prefixCls?: string,
-        /**  label 标签的文本*/
-        label?: React.ReactNode,
-        /** label 标签布局，通 `<Col>` 组件，设置 `span` `offset` 值，如 `{span: 3, offset: 12}`*/
-        labelCol?: Object,
-        /** 提示信息，如不设置，则会根据校验规则自动生成 */
-        help?: React.ReactNode | boolean,
-        /** 额外的提示信息，和 help 类似，当需要错误信息和提示文案同时出现时，可以使用这个。*/
-        extra?: string,
-        /** 是否必填，如不设置，则会根据校验规则自动生成 */
-        validateStatus?: string,
-        /** 配合 validateStatus 属性使用，是否展示校验状态图标 */
-        hasFeedback?: boolean,
-        /** 需要为输入控件设置布局样式时，使用该属性，用法同 labelCol*/
-        wrapperCol?: Object,
-        className?: string,
-        required?: boolean,
-        id?: string
-    }
-    /**
-    表单一定会包含表单域，表单域可以是输入控件，标准表单域，标签，下拉菜单，文本域等。
-
-    这里我们分别封装了表单域 `<Form.Item />` 和输入控件 `<Input />`。*/
-    export class FormItem extends React.Component<FormItemProps, {}> {
-        render(): JSX.Element
-    }
-    interface FormComponentProps {
-        form: CreateFormOptions
-    }
-    export class FormComponent extends React.Component<FormComponentProps, {}> {
-        render(): JSX.Element
-    }
-
-    // function  create
-    type CreateFormOptions = {
-        /** 获取一组输入控件的值，如不传入参数，则获取全部组件的值*/
-        getFieldsValue(): (fieldNames?: Array<string>) => any
-        /** 获取一个输入控件的值*/
-        getFieldValue(): (fieldName: string) => any
-        /** 设置一组输入控件的值*/
-        setFieldsValue(): (obj: Object) => void
-        /** 设置一组输入控件的值*/
-        setFields(): (obj: Object) => void
-        /** 校验并获取一组输入域的值与 Error*/
-        validateFields(): (fieldNames?: Array<string>, options?: Object, callback?: (erros: any, values: any) => void) => any
-        /** 与 `validateFields` 相似，但校验完后，如果校验不通过的菜单域不在可见范围内，则自动滚动进可见范围 */
-        validateFieldsAndScroll(): (fieldNames?: Array<string>, options?: Object, callback?: (erros: any, values: any) => void) => any
-        /** 获取某个输入控件的 Error */
-        getFieldError(): (name: string) => Object
-        /** 判断一个输入控件是否在校验状态*/
-        isFieldValidating(): (name: string) => Object
-        /**重置一组输入控件的值与状态，如不传入参数，则重置所有组件*/
-        resetFields(): (names?: Array<string>) => void
-
-        getFieldsValue(): (id: string, options: {
-            /** 子节点的值的属性，如 Checkbox 的是 'checked'*/
-            valuePropName?: string,
-            /** 子节点的初始值，类型、可选值均由子节点决定*/
-            initialValue?: any,
-            /** 收集子节点的值的时机*/
-            trigger?: string,
-            /** 校验子节点值的时机*/
-            validateTrigger?: string,
-            /** 校验规则，参见 [async-validator](https://github.com/yiminghe/async-validator) */
-            rules?: Array<any>,
-            /** 必填输入控件唯一标志*/
-            id?: string
-        }) => Array<any>
-
-
-    }
-
-    interface ComponentDecorator {
-        <T extends (typeof FormComponent)>(component: T): T;
-    }
-    interface FormProps {
-        prefixCls?: string,
-        /** 水平排列布局*/
-        horizontal?: boolean,
-        /** 行内排列布局*/
-        inline?: boolean,
-        /** 经 `Form.create()` 包装过的组件会自带 `this.props.form` 属性，直接传给 Form 即可*/
-        form?: Object,
-        /** 数据验证成功后回调事件*/
-        onSubmit?: (e: React.FormEvent) => void,
-    }
-    /**
-     * #Form
-    具有数据收集、校验和提交功能的表单，包含复选框、单选框、输入框、下拉选择框等元素。
-
-    ## 表单
-
-    我们为 `form` 提供了以下两种排列方式：
-
-    - 水平排列：可以实现 `label` 标签和表单控件的水平排列;
-    - 行内排列：使其表现为 `inline-block` 级别的控件。
-    */
-    export class Form extends React.Component<FormProps, {}> {
-        static Item: typeof FormItem
-        static create(options?: {
-            /**
-             *   当 `Form.Item` 子节点的值发生改变时触发，可以把对应的值转存到 Redux store
-             */
-            onFieldsChange?: (props: Object, fields: Array<any>) => void,
-            /**  把 props 转为对应的值，可用于把 Redux store 中的值读出 */
-            mapPropsToFields?: (props: Object) => void
-        }): ComponentDecorator
-        render(): JSX.Element
-    }
-
-
-
-
-
-    // Icon
-    interface IconProps {
-        /** 图标类型*/
-        type: string
-    }
-    /**
-     * #Icon
-    有含义的矢量图形，每一个图标打倒一个敌人。
-
-    ## 图标的命名规范
-
-    我们为每个图标赋予了语义化的命名，命名规则如下:
-
-    - 实心和描线图标保持同名，用 `-o` 来区分，比如 `question-circle`(实心) 和 `question-circle-o`(描线)；
-
-    - 命名顺序：`[icon名]-[形状可选]-[描线与否]-[方向可选]`。
-
-    ## 如何使用
-
-    使用 `<Icon />` 标签声明组件，指定图标对应的 type 属性，示例代码如下:
-
-    ```html
-    <Icon type="link" />
-    ```
-
-    最终会渲染为：
-
-    ```html
-    <i class="anticon anticon-${type}"></i>
-    ```*/
-    export class Icon extends React.Component<IconProps, {}> {
-        render(): JSX.Element
-    }
-
-
-
-
-    // Input
-    interface InputProps {
-        /**  【必须】声明 input 类型，同原生 input 标签的 type 属性*/
-        type?: string,
-        id: string | number,
-        /** 控件大小，默认值为 default 。注：标准表单内的输入框大小限制为 large。 {'large','default','small'}*/
-        size?: string,
-        /** 是否禁用状态，默认为 false*/
-        disabled?: boolean,
-        value?: any,
-        /** 设置初始默认值*/
-        defaultValue?: any,
-        className?: string,
-        /** 带标签的 input，设置前置标签*/
-        addonBefore?: React.ReactNode,
-        /** 带标签的 input，设置后置标签*/
-        addonAfter?: React.ReactNode,
-        prefixCls?: string,
-        placeholder?: string
-    }
-    export class Input extends React.Component<InputProps, {}> {
-        render(): JSX.Element
-    }
-
-
-
-
-    // InputNumber
-    interface InputNumberProps {
-        /** 最小值*/
-        min: number,
-        /** 最大值*/
-        max: number,
-        /** 当前值*/
-        value?: number,
-        /** 每次改变步数*/
-        step?: number,
-        /** 初始值*/
-        defaultValue?: number,
-        /** 变化回调*/
-        onChange?: Function,
-        /** 禁用*/
-        disabled?: boolean,
-        /** 输入框大小*/
-        size?: string
-
-    }
-    /**
-     * #InputNumber
-    通过鼠标或键盘，输入范围内的数值。
-
-    ## 何时使用
-
-    当需要获取标准数值时。*/
-    export class InputNumber extends React.Component<InputNumberProps, {}> {
-        render(): JSX.Element
-    }
-
-
-    // Layout
-    // Row
-    interface RowProps {
-        type?: string,
-        align?: string,
-        justify?: string,
-        className?: string
-    }
-    export class Row extends React.Component<RowProps, {}> {
-        render(): JSX.Element
-    }
-
-    // Col
-    interface ColProps {
-        span?: string,
-        order?: string,
-        offset?: string,
-        push?: string,
-        pull?: string,
-        className?: string
-    }
-    /**
-    在多数业务情况下，Ant Design需要在设计区域内解决大量信息收纳的问题，因此在12栅格系统的基础上，我们将整个设计建议区域按照24等分的原则进行划分。
-
-    划分之后的信息区块我们称之为“盒子”。建议横向排列的盒子数量最多四个，最少一个。“盒子”在整个屏幕上占比见上图。设计部分基于盒子的单位定制盒子内部的排版规则，以保证视觉层面的舒适感。
-
-    ## 概述
-
-    布局的栅格化系统，我们是基于行（row）和列（col）来定义信息区块的外部框架，以保证页面的每个区域能够稳健地排布起来。下面简单介绍一下它的工作原理：
-
-    * 通过`row`在水平方向建立一组`column`（简写col）
-    * 你的内容应当放置于`col`内，并且，只有`col`可以作为`row`的直接元素
-    * 栅格系统中的列是指1到24的值来表示其跨越的范围。例如，三个等宽的列可以使用`.col-8`来创建
-    * 如果一个`row`中的`col`总和超过24，那么多余的`col`会作为一个整体另起一行排列
-
-    ## Flex 布局
-
-    我们的栅格化系统支持 Flex 布局，允许子元素在父节点内的水平对齐方式 - 居左、居中、居右、等宽排列、分散排列。子元素与子元素之间，支持顶部对齐、垂直居中对齐、底部对齐的方式。同时，支持使用 order 来定义元素的排列顺序。
-
-    Flex 布局是基于 24 栅格来定义每一个“盒子”的宽度，但排版则不拘泥于栅格。*/
-    export class Col extends React.Component<ColProps, {}> {
-        render(): JSX.Element
-    }
-
-
-
-
-    // Menu
-    interface MenuItemProps {
-        /**
-         * (是否禁用)
-         *
-         * @type {boolean}
-         */
-        disabled?: boolean,
-        key: string
-    }
-    export class MenuItem extends React.Component<MenuItemProps, {}> {
-        render(): JSX.Element
-    }
-
-    interface MenuSubMenuProps {
-        /**
-         * (子菜单项值)
-         *
-         * @type {(string | React.ReactNode)}
-         */
-        title: string | React.ReactNode,
-        /**
-         * (子菜单的菜单项)
-         *
-         * @type {(MenuItem | MenuSubMenu)}
-         */
-        children?: JSX.Element[]
-    }
-    export class MenuSubMenu extends React.Component<MenuSubMenuProps, {}> {
-        render(): JSX.Element
-    }
-
-    interface MenuItemGroupProps {
-        /**
-         * (分组标题)
-         *
-         * @type {(string | React.ReactNode)}
-         */
-        title: string | React.ReactNode,
-        /**
-         * (分组的菜单项)
-         *
-         * @type {MenuItem}
-         */
-        children?: JSX.Element[]
-    }
-    export class MenuItemGroup extends React.Component<MenuItemGroupProps, {}> {
-        render(): JSX.Element
-    }
-
-
-    // enum
-    enum MenuTheme {
-        light,
-        dark
-    }
-    enum MenuMode {
-        vertical,
-        horizontal,
-        inline
-    }
-    interface MenuProps {
-        /** 主题颜色*/
-        theme?: MenuTheme | string,
-        /** 菜单类型  enum: `vertical` `horizontal` `inline`*/
-        mode?: MenuMode | string,
-        /** 当前选中的菜单项 key 数组*/
-        selectedKeys?: Array<string>,
-        /** 初始选中的菜单项 key 数组*/
-        defaultSelectedKeys?: Array<string>,
-        /** 当前展开的菜单项 key 数组*/
-        openKeys?: Array<string>,
-        /** 初始展开的菜单项 key 数组*/
-        defaultOpenKeys?: Array<string>,
-        /**
-         * 被选中时调用
-         *
-         * @type {(item: any, key: string, selectedKeys: Array<string>) => void}
-         */
-        onSelect?: (item: any, key: string, selectedKeys: Array<string>) => void,
-        /** 取消选中时调用*/
-        onDeselect?: (item: any, key: string, selectedKeys: Array<string>) => void,
-        /** 点击 menuitem 调用此函数*/
-        onClick?: (item: any, key: string) => void,
-        /** 根节点样式*/
-        style?: Object
-    }
-    /**
-    # Menu
-    为页面和功能提供导航的菜单列表。
-
-    ## 何时使用
-
-    导航菜单是一个网站的灵魂，用户依赖导航在各个页面中进行跳转。一般分为顶部导航和侧边导航，顶部导航提供全局性的类目和功能，侧边导航提供多级结构来收纳和排列网站架构。
-
-    更多布局和导航的范例可以参考：[常用布局](/spec/layout)。*/
-    export class Menu extends React.Component<MenuProps, {}> {
-        static Item: typeof MenuItem
-        static SubMenu: typeof MenuSubMenu
-        static ItemGroup: typeof MenuItemGroup
-        static Divider: typeof React.Component
-        render(): JSX.Element
-    }
-
-
-
-    // Message
-    type MessageFunc = (
-        /** 提示内容*/
-        content: string,
-        /** 自动关闭的延时*/
-        duration?: number
-    ) => void
-    /**
-     * #Message
-    全局展示操作反馈信息。
-
-    ## 何时使用
-
-    - 可提供成功、警告和错误等反馈信息。
-    - 顶部居中显示并自动消失，是一种不打断用户操作的轻量级提示方式。*/
-    export const message: {
-
-        success: MessageFunc
-        error: MessageFunc
-        info: MessageFunc
-        loading: MessageFunc
-        config: (options: {
-            /**
-             * 消息距离顶部的位置
-             *
-             * @type {number}
-             */
-            top: number
-        }) => void
-        destroy: () => void
-    }
-
-    // Modal
-    type ModalFunc = (options: {
-        visible?: boolean,
-        title?: React.ReactNode | string,
-        onOk?: Function,
-        onCancel?: Function,
-        width?: string | number,
-        iconClassName?: string,
-        okText?: string,
-        cancelText?: string
-    }) => void
-
-    interface ModalProps {
-        /** 对话框是否可见*/
-        visible?: boolean,
-        /** 确定按钮 loading*/
-        confirmLoading?: boolean,
-        /** 标题*/
-        title?: React.ReactNode | string,
-        /** 是否显示右上角的关闭按钮*/
-        closable?: boolean,
-        /** 点击确定回调*/
-        onOk?: Function,
-        /** 点击遮罩层或右上角叉或取消按钮的回调*/
-        onCancel?: Function,
-        /** 宽度*/
-        width?: string | number,
-        /** 底部内容*/
-        footer?: React.ReactNode | string,
-        /** 确认按钮文字*/
-        okText?: string,
-        /** 取消按钮文字*/
-        cancelText?: string,
-        /** 点击蒙层是否允许关闭*/
-        maskClosable?: boolean
-    }
-
-    /**
-    # Modal
-    模态对话框。
-
-    ## 何时使用
-
-    需要用户处理事务，又不希望跳转页面以致打断工作流程时，可以使用 `Modal` 在当前页面正中打开一个浮层，承载相应的操作。
-
-    另外当需要一个简洁的确认框询问用户时，可以使用精心封装好的 `ant.Modal.confirm()` 等方法。*/
-    export class Modal extends React.Component<ModalProps, {}> {
-        static info: ModalFunc
-        static success: ModalFunc
-        static error: ModalFunc
-        static confirm: ModalFunc
-        render(): JSX.Element
-    }
-
-
-
-
-    // Notification
-    type NotificationFunc = (
-        config: {
-            /** 通知提醒标题，必选 */
-            message: React.ReactNode | string,
-            /** 通知提醒内容，必选*/
-            description: React.ReactNode | string,
-            /** 自定义关闭按钮*/
-            btn?: React.ReactNode | string,
-            /** 当前通知唯一标志*/
-            key?: string,
-            /** 点击默认关闭按钮时触发的回调函数*/
-            onClose?: Function,
-            /** 默认 4.5 秒后自动关闭，配置为 null 则不自动关闭*/
-            duration?: number
-        }) => void
-    /**
-     * #notification
-    全局展示通知提醒信息。
-
-    ## 何时使用
-
-    在系统右上角显示通知提醒信息。经常用于以下情况：
-
-    - 较为复杂的通知内容。
-    - 带有交互的通知，给出用户下一步的行动点。
-    - 系统主动推送。*/
-    export const notification: {
-        success: NotificationFunc
-        error: NotificationFunc
-        info: NotificationFunc
-        warn: NotificationFunc
-        close: (key: string) => void
-        destroy: () => void
-        config: (options: {
-            /** 消息距离顶部的位置*/
-            top: number
-        }) => void
-
-    }
-
-
-
-
-    // Pagination
-    interface PaginationProps {
-        /** 当前页数*/
-        current?: number,
-        /** 默认的当前页数*/
-        defaultCurrent?: number,
-        /** 数据总数*/
-        total: number,
-        /** 初始的每页条数*/
-        defaultPageSize?: number,
-        /** 每页条数*/
-        pageSize?: number,
-        /** 页码改变的回调，参数是改变后的页码*/
-        onChange?: Function,
-        /** 是否可以改变 pageSize */
-        showSizeChanger?: boolean,
-        /** 指定每页可以显示多少条*/
-        pageSizeOptions?: Array<number>
-        /** pageSize 变化的回调  */
-        onShowSizeChange?: Function,
-        /** 是否可以快速跳转至某页*/
-        showQuickJumper?: boolean,
-        /** 当为「small」时，是小尺寸分页 */
-        size?: string,
-        /** 当添加该属性时，显示为简单分页*/
-        simple?: Object,
-        /** 用于显示总共有多少条数据*/
-        showTotal?: Function
-    }
-    /**
-     * #Pagination
-    采用分页的形式分隔长列表，每次只加载一个页面。
-
-    ## 何时使用
-
-    - 当加载/渲染所有数据将花费很多时间时；
-    - 可切换页码浏览数据。*/
-    export class Pagination extends React.Component<PaginationProps, {}> {
-        render(): JSX.Element
-    }
-
-
-
-
-    // Popconfirm
-    enum Placement {
-        top, left, right, bottom
-    }
-    interface PopconfirmProps {
-        /**
-         * 气泡框位置，可选 `top/left/right/bottom`
-         *
-         * @type {(Placement | string)}
-         */
-        placement?: Placement | string,
-        /** 确认框的描述*/
-        title?: string,
-        /** 点击确认的回调*/
-        onConfirm?: Function,
-        onCancel?: Function,
-        /** 显示隐藏的回调*/
-        onVisibleChange?: (visible: boolean) => void,
-        /** 确认按钮文字*/
-        okText?: string,
-        /** 取消按钮文字*/
-        cancelText?: string
-    }
-    /**
-     * #Popconfirm
-    点击元素，弹出气泡式的确认框。
-
-    ## 何时使用
-
-    目标元素的操作需要用户进一步的确认时，在目标元素附近弹出浮层提示，询问用户。
-
-    和 `confirm` 弹出的全屏居中模态对话框相比，交互形式更轻量。
-    */
-    export class Popconfirm extends React.Component<PopconfirmProps, {}> {
-        render(): JSX.Element
-    }
-
-
-
-
-    // Popover
-    enum Trigger {
-        hover, focus, click
-    }
-    enum PopoverPlacement {
-        top,
-        left, right, bottom,
-        topLeft, topRight, bottomLeft, bottomRight,
-        leftTop, leftBottom, rightTop, rightBottom
-    }
-    interface PopoverProps {
-        /** 触发行为，可选 `hover/focus/click` */
-        trigger?: Trigger | string,
-        /** 气泡框位置，可选 `top/left/right/bottom` `topLeft/topRight/bottomLeft/bottomRight` `leftTop/leftBottom/rightTop/rightBottom`*/
-        placement?: PopoverPlacement | string,
-        /** 卡片标题*/
-        title?: React.ReactNode | string,
-        /** 卡片内容*/
-        overlay?: React.ReactNode | string,
-        prefixCls?: string,
-        /** 用于手动控制浮层显隐*/
-        visible?: boolean,
-        /** 显示隐藏改变的回调*/
-        onVisibleChange?: Function
-    }
-    /**
-     * #Popover
-    点击/鼠标移入元素，弹出气泡式的卡片浮层。
-
-    ## 何时使用
-
-    当目标元素有进一步的描述和相关操作时，可以收纳到卡片中，根据用户的操作行为进行展现。
-
-    和 `Tooltip` 的区别是，用户可以对浮层上的元素进行操作，因此它可以承载更复杂的内容，比如链接或按钮等。
-    */
-    export class Popover extends React.Component<PopoverProps, {}> {
-        render(): JSX.Element
-    }
-
-
-
-
-    // Progress
-    enum ProgressStatus {
-        normal,
-        exception,
-        active
-    }
-
-    interface LineProps {
-        /** 百分比*/
-        percent: number,
-        /** 内容的模板函数*/
-        format?: (percent: any) => void,
-        /** 状态，可选：normal、exception、active*/
-        status?: ProgressStatus | string,
-        /** 进度条线的宽度，单位是px*/
-        strokeWidth?: number,
-        /** 是否显示进度数值和状态图标*/
-        showInfo?: boolean
-    }
-    export class Line extends React.Component<LineProps, {}> {
-        render(): JSX.Element
-    }
-
-    interface CircleProps {
-        /** 百分比*/
-        percent: number,
-        /** 内容的模板函数*/
-        format?: (percent: any) => void,
-        /** 状态，可选：normal、exception*/
-        status?: ProgressStatus | string,
-        /** 进度条线的宽度，单位是进度条画布宽度的百分比*/
-        strokeWidth?: number,
-        /** 必填，进度条画布宽度，单位px。这里没有提供height属性设置，Line型高度就是strokeWidth，Circle型高度等于width*/
-        width?: number
-    }
-    export class Circle extends React.Component<CircleProps, {}> {
-        render(): JSX.Element
-    }
-    /**
-     * #Progress
-    展示操作的当前进度。
-
-    ## 何时使用
-
-    在操作需要较长时间才能完成时，为用户显示该操作的当前进度和状态。
-
-    * 当一个操作会打断当前界面，或者需要在后台运行，且耗时可能超过2秒时；
-    * 当需要显示一个操作完成的百分比时。*/
-    export const Progress: {
-        Line: typeof Line,
-        Circle: typeof Circle
-    }
-
-
-    // QueueAnim
-    interface QueueAnimProps {
-        /** 动画内置参数 `left` `right` `top` `bottom` `scale` `scaleBig` `scaleX` `scaleY`*/
-        type?: string | Array<string>,
-        /** 配置动画参数 如 `{opacity:[1, 0],translateY:[0, -30]}` 具体参考 [velocity](http://julian.com/research/velocity) 的写法*/
-        animConfig?: Object | Array<any>,
-        /** 整个动画的延时,以毫秒为单位*/
-        delay?: number | Array<any>,
-        /** 每个动画的时间,以毫秒为单位*/
-        duration?: number | Array<any>,
-        /** 每个动画的间隔时间,以毫秒为单位*/
-        interval?: number | Array<any>,
-        /** 出场时是否倒放,从最后一个 dom 开始往上播放 */
-        leaveReverse?: boolean,
-        /** 动画的缓动函数,[查看详细](http://julian.com/research/velocity/#easing)*/
-        ease?: string | Array<any>,
-        /** 进出场动画进行中的类名*/
-        animatingClassName?: Array<string>,
-        /** QueueAnim 替换的标签名*/
-        component?: string
-    }
-    /**
-     * #QueueAnim
-    通过简单的配置对一组元素添加串行的进场动画效果。
-
-    ## 何时使用
-
-    - 从内容A到内容B的转变过程时能有效的吸引用户注意力，突出视觉中心，提高整体视觉效果。
-
-    - 小的信息元素排布或块状较多的情况下，根据一定的路径层次依次进场，区分维度层级，来凸显量级，使页面转场更加流畅和舒适，提高整体视觉效果和产品的质感。
-
-    - 特别适合首页和需要视觉展示效果的宣传页，以及单页应用的切换页面动效。
-    */
-    export class QueueAnim extends React.Component<QueueAnimProps, {}> {
-        render(): JSX.Element
-    }
-
-
-
-
-    // Radio
-    enum RadioGroupSize {
-        large,
-        default,
-        small
-    }
-    interface RadioGroupProps {
-        /** 选项变化时的回调函数*/
-        onChange?: (e: Event) => void,
-        /** 用于设置当前选中的值*/
-        value?: string,
-        /** 默认选中的值*/
-        defaultValue?: string,
-        /**  大小，只对按钮样式生效*/
-        size?: RadioGroupSize | string
-    }
-    export class RadioGroup extends React.Component<RadioGroupProps, {}> {
-        render(): JSX.Element
-    }
-
-
-    interface RadioProps {
-        /** 指定当前是否选中*/
-        checked?: boolean,
-        /** 初始是否选中*/
-        defaultChecked?: boolean,
-        /** 根据 value 进行比较，判断是否选中  */
-        value?: any
-    }
-    /**
-     * #Radio
-    单选框。
-
-    ## 何时使用
-
-    - 用于在多个备选项中选中单个状态。
-    - 和 Select 的区别是，Radio 所有选项默认可见，方便用户在比较中选择，因此选项不宜过多。
-    */
-    export class Radio extends React.Component<RadioProps, {}> {
-        static Group: typeof RadioGroup
-        static Button: typeof Button
-        render(): JSX.Element
-    }
-
-
-
-    // Select
-    interface SelectOptionProps {
-        /** 是否禁用*/
-        disabled?: boolean,
-        /** 如果 react 需要你设置此项，此项值与 value 的值相同，然后可以省略 value 设置*/
-        key?: string,
-        /** 默认根据此属性值进行筛选*/
-        value: string
-    }
-    export class SelectOption extends React.Component<SelectOptionProps, {}> {
-        render(): JSX.Element
-    }
-
-    interface SelectOptGroupProps {
-        /** 组名*/
-        label: string | React.ReactNode,
-        key?: string
-    }
-    export class SelectOptGroup extends React.Component<SelectOptGroupProps, {}> {
-        render(): JSX.Element
-    }
-
-    interface SelectProps {
-        /** 指定当前选中的条目*/
-        value?: string | Array<any>,
-        /** 指定默认选中的条目*/
-        defaultValue?: string | Array<any>,
-        /** 支持多选*/
-        multiple?: boolean,
-        /** 支持清除, 单选模式有效*/
-        allowClear?: boolean,
-        /** 是否根据输入项进行筛选，可为一个函数，返回满足要求的 option 即可*/
-        filterOption?: boolean | Function,
-        /** 可以把随意输入的条目作为 tag，输入项不需要与下拉选项匹配*/
-        tags?: boolean,
-        /** 被选中时调用，参数为选中项的 value 值 */
-        onSelect?: (value: any, option: any) => void,
-        /** 取消选中时调用，参数为选中项的 option value 值，仅在 multiple 或 tags 模式下生效*/
-        onDeselect?: (value: any, option: any) => void,
-        /** 选中option，或input的value变化(combobox 模式下)时，调用此函数*/
-        onChange?: (value: any, label: any) => void,
-        /** 文本框值变化时回调*/
-        onSearch?: (value: string) => void,
-        /** 选择框默认文字*/
-        placeholder?: string,
-        /** 搜索框默认文字*/
-        searchPlaceholder?: string,
-        /** 当下拉列表为空时显示的内容*/
-        notFoundContent?: string,
-        /** 下拉菜单和选择器同宽*/
-        dropdownMatchSelectWidth?: boolean,
-        /** 搜索时过滤对应的 option 属性，如设置为 children 表示对内嵌内容进行搜索*/
-        optionFilterProp?: string,
-        /** 输入框自动提示模式*/
-        combobox?: SVGSymbolElement,
-        /** 选择框大小，可选 `large` `small` */
-        size?: string,
-        /** 在下拉中显示搜索框*/
-        showSearch?: boolean,
-        /** 是否禁用*/
-        disabled?: boolean,
-        style?: Object
-    }
-    /**
-     * #Select
-    类似 Select2 的选择器。
-
-    ## 何时使用
-
-    弹出一个下拉菜单给用户选择操作，用于代替原生的选择器，或者需要一个更优雅的多选器时。*/
-    export class Select extends React.Component<SelectProps, {}> {
-        static Option: typeof SelectOption
-        static OptGroup: typeof SelectOptGroup
-        render(): JSX.Element
-    }
-
-
-
-    // Slider
-    interface SliderProps {
-        /** 最小值*/
-        min?: number,
-        /** 最大值*/
-        max?: number,
-        /** 步长，取值必须大于 0，并且可被 (max - min) 整除。当 `marks` 不为空对象时，可以设置 `step` 为 `null`，此时 Slider 的可选值仅有 marks 标出来的部分。*/
-        step?: number,
-        /** 分段标记，key 的类型必须为 `Number` 且取值在闭区间 [min, max] 内*/
-        marks?: { key: number, value: any },
-        /**  设置当前取值。当 `range` 为 `false` 时，使用 `Number`，否则用 `[Number, Number]`*/
-        value?: number | Array<number>,
-        /**  设置当前取值。当 `range` 为 `false` 时，使用 `Number`，否则用 `[Number, Number]`*/
-        defaultValue?: number | Array<number>,
-        /** `marks` 不为空对象时有效，值为 true 时表示值为包含关系，false 表示并列*/
-        included?: boolean,
-        /** 值为 `true` 时，滑块为禁用状态*/
-        disabled?: boolean,
-        /** 当 `range` 为 `true` 时，该属性可以设置是否允许两个滑块交换位置。*/
-        allowCross?: boolean,
-        /** 当 Slider 的值发生改变时，会触发 onChange 事件，并把改变后的值作为参数传入。*/
-        onChange?: Function,
-        /** 与 `onmouseup` 触发时机一致，把当前值作为参数传入。*/
-        onAfterChange?: Function,
-        /** Slider 会把当前值传给 `tipFormatter`，并在 Tooltip 中显示 `tipFormatter` 的返回值，若为 null，则隐藏 Tooltip。*/
-        tipFormatter?: Function | any,
-        range?: boolean
-    }
-    /**
-     * #Slider
-    滑动型输入器，展示当前值和可选范围。
-
-    ## 何时使用
-
-    当用户需要在数值区间/自定义区间内进行选择时，可为连续或离散值。*/
-    export class Slider extends React.Component<SliderProps, {}> {
-        render(): JSX.Element
-    }
-
-
-
-
-    // Spin
-    interface SpinProps {
-        /** spin组件中点的大小，可选值为 small default large*/
-        size?: string,
-        /** 用于内嵌其他组件的模式，可以关闭 loading 效果*/
-        spining?: boolean
-    }
-    /**
-     * #Spin
-    用于页面和区块的加载中状态。
-
-    ## 何时使用
-
-    页面局部处于等待异步数据或正在渲染过程时，合适的加载动效会有效缓解用户的焦虑。
-    */
-    export class Spin extends React.Component<SpinProps, {}> {
-        render(): JSX.Element
-    }
-
-
-
-
-    // Steps
-    enum StepStatus {
-        wait, process, finish
-    }
-    interface StepProps {
-        /** 可选参数，指定状态。当不配置该属性时，会使用父Steps元素的current来自动指定状态。*/
-        status?: StepStatus | string,
-        /** 必要参数，标题。*/
-        title: string | React.ReactNode,
-        /**  可选参数，步骤的详情描述。*/
-        description?: string | React.ReactNode,
-        /** 可选参数，步骤的Icon。如果不指定，则使用默认的样式。*/
-        icon?: string | React.ReactNode
-    }
-    export class Step extends React.Component<StepProps, {}> {
-        render(): JSX.Element
-    }
-
-    interface StepsProps {
-        /** 可选参数，指定当前处理正在执行状态的步骤，从0开始记数。在子Step元素中，可以通过status属性覆盖状态。*/
-        current?: number,
-        /** 可选参数，指定大小（目前只支持普通和迷你两种大小）。 small, default */
-        size?: string,
-        /** 可选参数，指定步骤条方向（目前支持水平和竖直两种方向，默认水平方向）。*/
-        direction?: string,
-        /** 可选参数，指定步骤的详细描述文字的最大宽度。*/
-        maxDescriptionWidth?: number
-
-    }
-    /**
-     * #Steps
-    引导用户按照流程完成任务的导航条。
-
-    ## 何时使用
-
-    当任务复杂或者存在先后关系时，将其分解成一系列步骤，从而简化任务。*/
-    export class Steps extends React.Component<StepsProps, {}> {
-        static Step: typeof Step
-        render(): JSX.Element
-    }
-
-
-
-    // Switch
-    interface SwitchProps {
-        /** 指定当前是否选中*/
-        checked?: boolean,
-        /** 初始是否选中*/
-        defaultChecked?: boolean,
-        /** 变化时回调函数*/
-        onChange?: (checked: boolean) => void,
-        /** 选中时的内容*/
-        checkedChildren?: React.ReactNode,
-        /** 非选中时的内容*/
-        unCheckedChildren?: React.ReactNode,
-        /** 开关大小*/
-        size?: string
-    }
-    /**
-     * #Switch
-    开关选择器。
-
-    ## 何时使用
-
-    - 需要表示开关状态/两种状态之间的切换时；
-    - 和 `checkbox `的区别是，切换 `switch` 会直接触发状态改变，而 `checkbox` 一般用于状态标记，需要和提交操作配合。
-    */
-    export class Switch extends React.Component<SwitchProps, {}> {
-        render(): JSX.Element
-    }
-
-
-
-
-    // Table
-    enum RowSelectionType {
-        checkbox,
-        radio
-    }
-    type SelectedRowKeys = Array<any>
-    interface RowSelection {
-        type?: RowSelectionType | string,
-        selectedRowKeys?: SelectedRowKeys,
-        onChange?: (selectedRowKeys: SelectedRowKeys, selectedRows: any) => void,
-        getCheckboxProps?: (record: any) => void,
-        onSelect?: (record: any, selected: any, selectedRows: any) => void,
-        onSelectAll?: (rselectedecord: any, selectedRows: any, changeRows: any) => void
-    }
-    interface Columns {
-        /** React 需要的 key，建议设置*/
-        key?: string,
-        /** 列头显示文字*/
-        title?: string | React.ReactNode,
-        /** 列数据在数据项中对应的 key*/
-        dataIndex?: string,
-        /** 生成复杂数据的渲染函数，参数分别为当前列的值，当前列数据，列索引，@return里面可以设置表格[行/列合并](#demo-colspan-rowspan)*/
-        render?: (text?: any, record?: any, index?: number) => React.ReactNode,
-        /** 表头的筛选菜单项*/
-        filters?: Array<any>,
-        /** 本地模式下，确定筛选的运行函数*/
-        onFilter?: Function,
-        /** 是否多选*/
-        filterMultiple?: boolean,
-        /** 排序函数，本地排序使用一个函数，需要服务端排序可设为 true */
-        sorter?: boolean | Function,
-        /** 表头列合并,设置为 0 时，不渲染*/
-        colSpan?: number,
-        /** 列宽度*/
-        width?: string | number,
-        /** 列的 className*/
-        className?: string
-    }
-    interface TableProps {
-        /** 列表项是否可选择*/
-        rowSelection?: RowSelection,
-        /** 分页器*/
-        pagination?: Object,
-        /** 正常或迷你类型 : `default` or `small` */
-        size?: string,
-        /** 数据数组*/
-        dataSource: Array<any>,
-        /** 表格列的配置描述*/
-        columns: Columns,
-        /** 表格行 key 的取值*/
-        rowKey?: (record: any, index: number) => string,
-        /** 额外的展开行*/
-        expandedRowRender?: Function,
-        /** 默认展开的行*/
-        defaultExpandedRowKeys?: Array<string>,
-        /** 分页、排序、筛选变化时触发*/
-        onChange?: (pagination: Object, filters: any, sorter: any) => void,
-        /** 页面是否加载中*/
-        loading?: boolean,
-        /** 默认文案设置，目前包括排序、过滤、空数据文案: `{ filterConfirm: '确定', filterReset: '重置', emptyText: '暂无数据' }` */
-        locale?: Object,
-        /** 展示树形数据时，每层缩进的宽度，以 px 为单位*/
-        indentSize?: number,
-        /** 处理行点击事件*/
-        onRowClick?: (record: any, index: number) => void,
-        /** 是否固定表头*/
-        useFixedHeader?: boolean,
-        /** 是否展示外边框和列边框*/
-        bordered?: boolean,
-        /** 是否显示表头*/
-        showHeader?: boolean,
-        /** 表格底部自定义渲染函数*/
-        footer?: (currentPageData: Object) => void
-
-    }
-    /**
-     * #Table
-    展示行列数据。
-
-    ## 何时使用
-
-    - 当有大量结构化的数据需要展现时；
-    - 当需要对数据进行排序、搜索、分页、自定义操作等复杂行为时。*/
-    export class Table extends React.Component<TableProps, {}> {
-        render(): JSX.Element
-    }
-
-
-
-    // Tabs
-    interface TabPaneProps {
-        /** 选项卡头显示文字*/
-        tab: React.ReactNode | string
-    }
-    export class TabPane extends React.Component<TabPaneProps, {}> {
-        render(): JSX.Element
-    }
-
-    enum TabsType {
-        line, card, 'editable-card'
-    }
-    enum TabsPosition {
-        top,
-        right,
-        bottom,
-        left
-    }
-    interface TabsProps {
-        /** 当前激活 tab 面板的 key    */
-        activeKey?: string,
-        /** 初始化选中面板的 key，如果没有设置 activeKey*/
-        defaultActiveKey?: string,
-        /** 切换面板的回调*/
-        onChange?: Function,
-        /** tab 被点击的回调 */
-        onTabClick?: Function,
-        /** tab bar 上额外的元素  */
-        tabBarExtraContent?: React.ReactNode,
-        /** 页签的基本样式，可选 `line`、`card` `editable-card` 类型*/
-        type?: TabsType | string,
-        /** 页签位置，可选值有 `top` `right` `bottom` `left`*/
-        tabPosition?: TabsPosition | string,
-        /** 新增和删除页签的回调，在 `type="editable-card"` 时有效*/
-        onEdit?: (targetKey: string, action: any) => void
-    }
-    /**
-     * #Tabs
-    选项卡切换组件。
-
-    ## 何时使用
-    
-    提供平级的区域将大块内容进行收纳和展现，保持界面整洁。
-    
-    Ant Design 依次提供了三级选项卡，分别用于不同的场景。
-    
-    - 卡片式的页签，提供可关闭的样式，常用于容器顶部。
-    - 标准线条式页签，用于容器内部的主功能切换，这是最常用的 Tabs。
-    - [RadioButton](/components/radio/#demo-radiobutton) 可作为更次级的页签来使用。*/
-    export class Tabs extends React.Component<TabsProps, {}> {
-        static TabPane: typeof TabPane
-        render(): JSX.Element
-    }
-
-
-
-
-    // Tag
-    interface TagProps {
-        /** 标签是否可以关闭*/
-        closable?: boolean,
-        /** 关闭时的回调*/
-        onClose?: Function,
-        /** 动画关闭后的回调*/
-        afterClose?: Function,
-        /** 标签的色彩*/
-        color?: string
-    }
-    /**
-     * #Tag
-    进行标记和分类的小标签。
-    
-    ## 何时使用
-    
-    - 用于标记事物的属性和维度。
-    - 进行分类。*/
-    export class Tag extends React.Component<TagProps, {}> {
-        render(): JSX.Element
-    }
-
-
-
-
-
-
-    // TimePicker
-    interface TimePickerProps {
-        /** 默认时间*/
-        value?: string | Date,
-        /** 初始默认时间*/
-        defaultValue?: string | Date,
-        /** 展示的时间格式 : "HH:mm:ss"、"HH:mm"、"mm:ss" */
-        format?: string,
-        /** 时间发生变化的回调*/
-        onChange?: (Date: Date) => void,
-        /** 禁用全部操作*/
-        disabled?: boolean,
-        /** 没有值的时候显示的内容*/
-        placeholder?: string,
-        /** 国际化配置*/
-        locale?: Object,
-        /** 隐藏禁止选择的选项*/
-        hideDisabledOptions?: boolean,
-        /** 禁止选择部分小时选项*/
-        disabledHours?: Function,
-        /** 禁止选择部分分钟选项*/
-        disabledMinutes?: Function,
-        /** 禁止选择部分秒选项*/
-        disabledSeconds?: Function
-
-    }
-    /**
-     * #TimePicker
-    输入或选择时间的控件。
-    
-    何时使用
-    --------
-    
-    当用户需要输入一个时间，可以点击标准输入框，弹出时间面板进行选择。
-    */
-    export class TimePicker extends React.Component<TimePickerProps, {}> {
-        render(): JSX.Element
-    }
-
-
-
-
-    // Timeline
-    interface TimeLineItemProps {
-        /** 指定圆圈颜色。*/
-        color?: string
-    }
-    export class TimeLineItem extends React.Component<TimeLineItemProps, {}> {
-        render(): JSX.Element
-    }
-
-    interface TimelineProps {
-        /** 指定最后一个幽灵节点是否存在或内容*/
-        pending?: boolean | React.ReactNode
-    }
-    /**
-     * #Timeline
-    垂直展示的时间流信息。
-    
-    ## 何时使用
-    
-    - 当有一系列信息需要从上至下按时间排列时；
-    - 需要有一条时间轴进行视觉上的串联时；*/
-    export class Timeline extends React.Component<TimelineProps, {}> {
-        static Item: typeof TimeLineItem
-        render(): JSX.Element
-    }
-
-
-
-    // Tooltip
-
-    interface TooltipProps {
-        /** 气泡框位置，可选 `top` `left` `right` `bottom` `topLeft` `topRight` `bottomLeft` `bottomRight` `leftTop` `leftBottom` `rightTop` `rightBottom`*/
-        placement?: PopoverPlacement | string,
-        /** 提示文字*/
-        title?: string | React.ReactNode
-    }
-    /**
-     * #Tooltip
-    简单的文字提示气泡框。
-    
-    ## 何时使用
-    
-    鼠标移入则显示提示，移出消失，气泡浮层不承载复杂文本和操作。
-    
-    可用来代替系统默认的 `title` 提示，提供一个`按钮/文字/操作`的文案解释。*/
-    export class Tooltip extends React.Component<TooltipProps, {}> {
-        render(): JSX.Element
-    }
-
-
-
-
-
-    // Transfer
-    interface TransferProps {
-        /** 数据源*/
-        dataSource: Array<any>,
-        /** 每行数据渲染函数*/
-        render?: (record: Object) => any,
-        /** 显示在右侧框数据的key集合*/
-        targetKeys: Array<string>,
-        /** 变化时回调函数*/
-        onChange?: (targetKeys: any, direction: string, moveKeys: any) => void,
-        /** 两个穿梭框的自定义样式*/
-        listStyle?: Object,
-        /** 自定义类*/
-        className?: string,
-        /** 标题集合,顺序从左至右*/
-        titles?: Array<string>,
-        /** 操作文案集合,顺序从上至下*/
-        operations?: Array<string>,
-        /** 是否显示搜索框*/
-        showSearch?: boolean,
-        /** 搜索框的默认值*/
-        searchPlaceholder?: string,
-        /** 当列表为空时显示的内容*/
-        notFoundContent?: React.ReactNode | string
-        /** 底部渲染函数*/
-        footer?: (props: any) => any
-    }
-    /**
-     * #Transfer
-    双栏穿梭选择框。
-    
-    ## 何时使用
-    
-    用直观的方式在两栏中移动元素，完成选择行为。
-    */
-    export class Transfer extends React.Component<TransferProps, {}> {
-        render(): JSX.Element
-    }
-
-
-
-
-
-    // Tree
-    interface TreeNodeProps {
-        disabled?: boolean,
-        disableCheckbox?: boolean,
-        title?: string | React.ReactNode,
-        key?: string,
-        isLeaf?: boolean
-    }
-    export class TreeNode extends React.Component<TreeNodeProps, {}> {
-        render(): JSX.Element
-    }
-
-    interface TreeProps {
-        showLine?: boolean,
-        className?: string,
-        /** 是否支持多选*/
-        multiple?: boolean,
-        /** 是否支持选中*/
-        checkable?: boolean,
-        /** 默认展开所有树节点*/
-        defaultExpandAll?: boolean,
-        /** 默认展开指定的树节点*/
-        defaultExpandedKeys?: Array<string>,
-        /** （受控）展开指定的树节点*/
-        expandedKeys?: Array<string>,
-        /** （受控）选中复选框的树节点*/
-        checkedKeys?: Array<string>,
-        /** 默认选中复选框的树节点*/
-        defaultCheckedKeys?: Array<string>,
-        /** （受控）设置选中的树节点*/
-        selectedKeys?: Array<string>,
-        /** 默认选中的树节点*/
-        defaultSelectedKeys?: Array<string>,
-        /** 展开/收起节点时触发 */
-        onExpand?: (node: any, expanded: any, expandedKeys: any) => void,
-        /** 点击复选框触发*/
-        onCheck?: (checkedKeys: any, e: { checked: boolean, checkedNodes: any, node: any, event: Event }) => void,
-        /** 点击树节点触发*/
-        onSelect?: (selectedKeys: any, e: { selected: boolean, selectedNodes: any, node: any, event: Event }) => void,
-        /** filter some treeNodes as you need. it should return true */
-        filterTreeNode?: (node: any) => boolean,
-        /** 异步加载数据*/
-        loadData?: (node: any) => void,
-        /** 响应右键点击*/
-        onRightClick?: (options: { event: Event, node: any }) => void,
-        /** 设置节点可拖拽（IE>8）*/
-        draggable?: boolean,
-        /** 开始拖拽时调用*/
-        onDragStart?: (options: { event: Event, node: any }) => void,
-        /** dragenter 触发时调用*/
-        onDragEnter?: (options: { event: Event, node: any, expandedKeys: any }) => void,
-        /** dragover 触发时调用 */
-        onDragOver?: (options: { event: Event, node: any }) => void,
-        /** dragleave 触发时调用*/
-        onDragLeave?: (options: { event: Event, node: any }) => void,
-        /** drop 触发时调用*/
-        onDrop?: (options: { event: Event, node: any, dragNode: any, dragNodesKeys: any }) => void,
-    }
-    /**
-     * #Tree
-     * 文件夹、组织架构、生物分类、国家地区等等，世间万物的大多数结构都是树形结构。使用`树控件`可以完整展现其中的层级关系，并具有展开收起选择等交互功能。
-    */
-    export class Tree extends React.Component<TreeProps, {}> {
-        static TreeNode: typeof TreeNode
-        render(): JSX.Element
-    }
-
-
-
-
-
-    // TreeSelect
-    interface TreeSelectTreeNodeProps {
-        disabled?: boolean,
-        /** 此项必须设置（其值在整个树范围内唯一）*/
-        key: string,
-        /** 默认根据此属性值进行筛选*/
-        value?: string,
-        /** 树节点显示的内容*/
-        title?: React.ReactNode | string,
-        /** 是否是叶子节点*/
-        isLeaf?: boolean
-    }
-    export class TreeSelectTreeNode extends React.Component<TreeSelectTreeNodeProps, {}> {
-        render(): JSX.Element
-    }
-
-    type TreeData = Array<{ value: any, label: string, children: TreeData }>
-    interface TreeSelectProps {
-        style?: Object,
-        /** 指定当前选中的条目*/
-        value?: string | Array<any>,
-        /** 指定默认选中的条目*/
-        defaultValue?: string | Array<any>,
-        /** 支持多选*/
-        multiple?: boolean,
-        /** 可以把随意输入的条目作为 tag，输入项不需要与下拉选项匹配*/
-        tags?: boolean,
-        /** 被选中时调用，参数为选中项的 value 值*/
-        onSelect?: (value: any) => void,
-        /** 选中option，或input的value变化(combobox 模式下)时，调用此函数*/
-        onChange?: (value: any, label: any) => void,
-        /** 显示清除按钮*/
-        allowClear?: boolean,
-        /** 文本框值变化时回调*/
-        onSearch?: (value: any) => void,
-        /** 选择框默认文字*/
-        placeholder?: string,
-        /** 搜索框默认文字*/
-        searchPlaceholder?: string,
-        /** 下拉菜单的样式*/
-        dropdownStyle?: Object,
-        /** 下拉菜单和选择器同宽*/
-        dropdownMatchSelectWidth?: boolean,
-        /** 输入框自动提示模式*/
-        combobox?: boolean,
-        /** 选择框大小，可选 `large` `small`*/
-        size?: string,
-        /** 在下拉中显示搜索框*/
-        showSearch?: boolean,
-        /** 是否禁用*/
-        disabled?: boolean,
-        /** 默认展开所有树节点*/
-        treeDefaultExpandAll?: boolean,
-        /** 显示checkbox*/
-        treeCheckable?: boolean,
-        /** 是否根据输入项进行筛选，返回值true*/
-        filterTreeNode?: (treeNode: any) => boolean,
-        /**  输入项过滤对应的 treeNode 属性*/
-        treeNodeFilterProp?: string,
-        /** 作为显示的prop设置*/
-        treeNodeLabelProp?: string,
-        /** treeNodes数据，如果设置则不需要手动构造TreeNode节点（如果value在整个树范围内不唯一，需要设置`key`其值为整个树范围内的唯一id*/
-        treeData?: TreeData,
-        /** 异步加载数据*/
-        loadData?: (node: any) => void
-    }
-    /**
-     * #TreeSelect
-    树型选择控件。
-    
-    ## 何时使用
-    
-    类似 Select 的选择控件，可选择的数据结构是一个树形结构时，可以使用 TreeSelect，例如公司层级、学科系统、分类目录等等。
-    */
-    export class TreeSelect extends React.Component<TreeSelectProps, {}> {
-        static TreeNode: typeof TreeSelectTreeNode
-        render(): JSX.Element
-    }
-
-
-
-
-
-
-    // Upload
-    interface UploadProps {
-        /** 可选参数, 上传的文件  */
-        name?: string,
-        /** 必选参数, 上传的地址   */
-        action: string,
-        /** 可选参数, 上传所需参数    */
-        data?: Object,
-        /** 可选参数, 设置上传的请求头部，IE10 以上有效*/
-        headers?: Object,
-        /** 可选参数, 是否展示 uploadList, 默认开启     */
-        showUploadList?: boolean,
-        /** 可选参数, 是否支持多选文件，`ie10+` 支持。开启后按住 ctrl 可选择多个文件。*/
-        multiple?: boolean,
-        /** 可选参数, 接受上传的文件类型, 详见 input accept Attribute */
-        accept?: string,
-        /** 可选参数, 上传文件之前的钩子，参数为上传的文件，若返回 `false` 或者 Promise 则停止上传。**注意：该方法不支持老 IE**。*/
-        beforeUpload?: Function,
-        /** 可选参数, 上传文件改变时的状态，详见 onChange   */
-        onChange?: (info: Object) => void,
-        /** 上传列表的内建样式，支持两种基本样式 `text` or `picture`   */
-        listType?: string,
-        /** 自定义类名*/
-        className?: string
-
-    }
-    /**
-     * #Upload
-    文件选择上传和拖拽上传控件。
-    
-    ## 何时使用
-    
-    上传是将信息（网页、文字、图片、视频等）通过网页或者上传工具发布到远程服务器上的过程。
-    
-    - 当需要上传一个或一些文件时。
-    - 当需要展现上传的进度时。
-    - 当需要使用拖拽交互时。*/
-    export class Upload extends React.Component<UploadProps, {}> {
-        render(): JSX.Element
-    }
-
-
-
-
-
-
-}
-
-
-// export all antd
-declare module 'antd' {
-    export = Antd
-}
-// single export point
-declare module 'antd/lib/Affix' {
-    export default Antd.Affix
-}
-declare module 'antd/lib/Button' {
-    export default Antd.Button
-}
-declare module 'antd/lib/Alert' {
-    export default Antd.Alert
-}
-declare module 'antd/lib/Badge' {
-    export default Antd.Badge
-}
-declare module 'antd/lib/Breadcrumb' {
-    export default Antd.Breadcrumb
-}
-declare module 'antd/lib/Calendar' {
-    export default Antd.Calendar
-}
-declare module 'antd/lib/Carousel' {
-    export default Antd.Carousel
-}
-declare module 'antd/lib/Cascader' {
-    export default Antd.Cascader
-}
-declare module 'antd/lib/Checkbox' {
-    export default Antd.Checkbox
-}
-declare module 'antd/lib/Collapse' {
-    export default Antd.Collapse
-}
-declare module 'antd/lib/DatePicker' {
-    export default Antd.DatePicker
-}
-declare module 'antd/lib/Dropdown' {
-    export default Antd.Dropdown
-}
-declare module 'antd/lib/Icon' {
-    export default Antd.Icon
-}
-declare module 'antd/lib/Form' {
-    export default Antd.Form
-}
-declare module 'antd/lib/Input' {
-    export default Antd.Input
-}
-declare module 'antd/lib/InputNumber' {
-    export default Antd.InputNumber
-}
-declare module 'antd/lib/Row' {
-    export default Antd.Row
-}
-declare module 'antd/lib/Col' {
-    export default Antd.Col
-}
-declare module 'antd/lib/Menu' {
-    export default Antd.Menu
-}
-declare module 'antd/lib/message' {
-    export default Antd.message
-}
-declare module 'antd/lib/Modal' {
-    export default Antd.Modal
-}
-declare module 'antd/lib/notification' {
-    export default Antd.notification
-}
-declare module 'antd/lib/Pagination' {
-    export default Antd.Pagination
-}
-declare module 'antd/lib/Popconfirm' {
-    export default Antd.Popconfirm
-}
-declare module 'antd/lib/Popover' {
-    export default Antd.Popover
-}
-declare module 'antd/lib/Progress' {
-    export default Antd.Progress
-}
-declare module 'antd/lib/QueueAnim' {
-    export default Antd.QueueAnim
-}
-declare module 'antd/lib/Radio' {
-    export default Antd.Radio
-}
-declare module 'antd/lib/Select' {
-    export default Antd.Select
-}
-declare module 'antd/lib/Slider' {
-    export default Antd.Slider
-}
-declare module 'antd/lib/Spin' {
-    export default Antd.Spin
-}
-declare module 'antd/lib/Steps' {
-    export default Antd.Steps
-}
-declare module 'antd/lib/Switch' {
-    export default Antd.Switch
-}
-declare module 'antd/lib/Table' {
-    export default Antd.Table
-}
-declare module 'antd/lib/Tabs' {
-    export default Antd.Tabs
-}
-declare module 'antd/lib/Tag' {
-    export default Antd.Tag
-}
-declare module 'antd/lib/TimePicker' {
-    export default Antd.TimePicker
-}
-declare module 'antd/lib/Timeline' {
-    export default Antd.Timeline
-}
-declare module 'antd/lib/Tooltip' {
-    export default Antd.Tooltip
-}
-declare module 'antd/lib/Transfer' {
-    export default Antd.Transfer
-}
-declare module 'antd/lib/Tree' {
-    export default Antd.Tree
-}
-declare module 'antd/lib/TreeSelect' {
-    export default Antd.TreeSelect
-}
-declare module 'antd/lib/Upload' {
-    export default Antd.Upload
-}
diff --git a/antd/index.d.ts b/antd/index.d.ts
new file mode 100644
index 0000000000..0f14303a19
--- /dev/null
+++ b/antd/index.d.ts
@@ -0,0 +1,2082 @@
+// Type definitions for Antd v0.12.10
+// Project: http://ant.design
+// Definitions by: bang88 <https://github.com/bang88>, Bruce Mitchener <https://github.com/waywardmonkeys/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react" />
+
+declare namespace Antd {
+    // Affix
+    interface AffixProps {
+        /**
+         * 达到指定偏移量后触发
+         */
+        offset?: number
+    }
+    /**
+     * # Affix
+     * 将页面元素钉在可视范围。
+     * ## 何时使用
+     * 当内容区域比较长，需要滚动页面时，这部分内容对应的操作或者导航需要在滚动范围内始终展现。常用于侧边菜单和按钮组合。
+     * 页面可视范围过小时，慎用此功能以免遮挡页面内容。
+     */
+    export class Affix extends React.Component<AffixProps, {}> {
+        render(): JSX.Element
+    }
+
+
+    // Alert
+    interface AlertProps {
+        /**
+         * 必选参数，指定警告提示的样式，有四种选择`success`、`info`、`warn`、`error`
+         */
+        type: string,
+        /**可选参数，默认不显示关闭按钮 */
+        closable?: boolean,
+        /**可选参数，自定义关闭按钮 */
+        closeText?: React.ReactNode,
+        /**必选参数，警告提示内容 */
+        message: React.ReactNode,
+        /**可选参数，警告提示的辅助性文字介绍 */
+        description?: React.ReactNode,
+        /**可选参数，关闭时触发的回调函数 */
+        onClose?: Function,
+        /**可选参数，是否显示辅助图标 */
+        showIcon?: boolean
+    }
+
+
+    /**
+     *  # Alert
+     *  警告提示，展现需要关注的信息。
+
+     * ## 何时使用
+
+     * - 当某个页面需要向用户显示警告的信息时。
+     * - 非浮层的静态展现形式，始终展现，不会自动消失，用户可以点击关闭。
+     * */
+    export class Alert extends React.Component<AlertProps, {}> {
+        render(): JSX.Element
+    }
+
+
+    // Badge
+    /**
+     * #Badge
+     *
+     * 图标右上角的圆形徽标数字。
+
+     * ## 何时使用
+
+     * 一般出现在通知图标或头像的右上角，用于显示需要处理的消息条数，通过醒目视觉形式吸引用户处理。
+     *
+    */
+    export class Badge extends React.Component<BadgeProps, {}> {
+        render(): JSX.Element
+    }
+    interface BadgeProps {
+        /** 展示的数字，大于 overflowCount 时显示为 `${overflowCount}+`，为 0 时隐藏*/
+        count: number,
+        /** 展示封顶的数字值*/
+        overflowCount?: number,
+        /** 不展示数字，只有一个小红点*/
+        dot?: boolean
+    }
+
+
+    // Button
+    interface ButtonProps {
+        /** 设置按钮类型，可选值为 `primary` `ghost` 或者不设 */
+        type?: ButtonType | string,
+        /** 设置按钮形状，可选值为 `circle` `circle-outline` 或者不设*/
+        shape?: string,
+        /** 设置按钮大小，可选值为 `small` `large` 或者不设*/
+        size?: string,
+        /** 设置 `button` 原生的 `type` 值，可选值请参考 HTML标准*/
+        htmlType?: string,
+        /** `click` 事件的 handler*/
+        onClick?: Function,
+        /** 设置按钮载入状态*/
+        loading?: boolean,
+        /** 样式名*/
+        className?: string,
+    }
+
+
+    enum ButtonType {
+        primary,
+        ghost,
+        dashed
+    }
+
+    interface ButtonGroupProps {
+        /** 设置按钮大小，可选值为 `small` `large` 或者不设*/
+        size?: string
+
+    }
+
+    /**
+    可以将多个 `Button` 放入 `Button.Group` 的容器中。
+
+    通过设置 `size` 为 `large` `small` 分别把按钮组合设为大、小尺寸。若不设置 `size`，则尺寸为中。*/
+    class ButtonGroup extends React.Component<ButtonGroupProps, {}> {
+        render(): JSX.Element
+    }
+
+    /**
+     * #Button
+    按钮用于开始一个即时操作。
+
+    ## 何时使用
+
+    标记了一个（或封装一组）操作命令，响应用户点击行为，触发相应的业务逻辑。*/
+    export class Button extends React.Component<ButtonProps, {}> {
+        static Group: typeof ButtonGroup
+        render(): JSX.Element
+    }
+
+
+
+    // Breadcrumb
+
+    interface BreadcrumbItemProps {
+        /** 链接，如不传则不可点击   */
+        href?: string
+    }
+    export class BreadcrumbItem extends React.Component<BreadcrumbItemProps, {}> {
+        render(): JSX.Element
+    }
+
+    interface BreadcrumbProps {
+        /** router 的路由栈信息 */
+        routes?: Array<React.ReactNode>,
+        /** 路由的参数*/
+        params?: Object,
+        /** 分隔符自定义*/
+        separator?: string | React.ReactNode
+    }
+    /**
+     * #Breadcrumb
+    显示当前页面在系统层级结构中的位置，并能向上返回。
+
+    ## 何时使用
+
+    - 当系统拥有超过两级以上的层级结构时；
+    - 当需要告知用户“你在哪里”时；
+    - 当需要向上导航的功能时。*/
+    export class Breadcrumb extends React.Component<BreadcrumbProps, {}> {
+        static Item: typeof BreadcrumbItem
+        render(): JSX.Element
+    }
+
+
+    // Calendar
+    interface CalendarProps {
+        /** 自定义渲染月单元格*/
+        monthCellRender?: Function,
+        /** 自定义渲染日期单元格*/
+        dateCellRender?: Function,
+        /** 是否全屏显示*/
+        fullscreen?: boolean,
+        /** 国际化配置*/
+        locale?: Object,
+        prefixCls?: string,
+        className?: string,
+        style?: Object,
+        /** 日期面板变化回调*/
+        onPanelChange?: Function,
+        /** 展示日期*/
+        value?: Date,
+        /** 默认展示日期*/
+        defaultValue?: Date,
+        /** 初始模式，`month/year`*/
+        mode?: string
+    }
+    /**
+     * #Calendar
+    按照日历形式展示数据的容器。
+
+    ## 何时使用
+
+    当数据是日期或按照日期划分时，例如日程、课表、价格日历等，农历等。目前支持年/月切换。
+    */
+    export class Calendar extends React.Component<CalendarProps, {}> {
+        render(): JSX.Element
+    }
+
+
+    // Carousel
+    interface CarouselProps {
+        /** 动画效果函数，可取 scrollx, fade*/
+        effect?: string,
+        /** 是否显示面板指示点*/
+        dots?: boolean,
+        /** 垂直显示*/
+        vertical?: boolean,
+        /** 是否自动切换*/
+        autoplay?: boolean,
+        /** 动画效果*/
+        easing?: string,
+        /** 切换面板的回调*/
+        beforeChange?: Function,
+        /** 切换面板的回调*/
+        afterChange?: Function
+    }
+    /**
+     * #Carousel
+    旋转木马，一组轮播的区域。
+
+    ## 何时使用
+
+    - 当有一组平级的内容。
+    - 当内容空间不足时，可以用走马灯的形式进行收纳，进行轮播展现。
+    - 常用于一组图片或卡片轮播。
+    */
+    export class Carousel extends React.Component<CarouselProps, {}> {
+        render(): JSX.Element
+    }
+
+
+
+    // Cascader
+    interface CascaderProps {
+        /** 可选项数据源*/
+        options: Object,
+        /** 默认的选中项*/
+        defaultValue?: Array<any>,
+        /** 指定选中项*/
+        value?: Array<any>,
+        /** 选择完成后的回调*/
+        onChange?: Function,
+        /** 选择后展示的渲染函数*/
+        displayRender?: Function,
+        /** 自定义样式*/
+        style?: Object,
+        /** 自定义类名*/
+        className?: string,
+        /** 自定义浮层类名*/
+        popupClassName?: string,
+        /** 浮层预设位置：`bottomLeft` `bottomRight` `topLeft` `topRight` */
+        popupPlacement?: string,
+        /** 输入框占位文本*/
+        placeholder?: string,
+        /** 输入框大小，可选 `large` `default` `small` */
+        size?: string,
+        /** 禁用*/
+        disabled?: boolean,
+        /** 是否支持清除*/
+        allowClear?: boolean
+
+    }
+    /**
+     * #Cascader
+    级联选择框。
+
+
+    ## 何时使用
+
+    - 需要从一组相关联的数据集合进行选择，例如省市区，公司层级，事物分类等。
+    - 从一个较大的数据集合中进行选择时，用多级分类进行分隔，方便选择。
+    - 比起 Select 组件，可以在同一个浮层中完成选择，有较好的体验。*/
+    export class Cascader extends React.Component<CascaderProps, {}> {
+        render(): JSX.Element
+    }
+
+
+
+
+    // Checkbox
+    interface CheckboxProps {
+        /** 指定当前是否选中*/
+        checked?: boolean,
+        /** 初始是否选中*/
+        defaultChecked?: boolean,
+        /** 变化时回调函数*/
+        onChange?: Function
+    }
+
+    interface CheckboxGroupProps {
+        /** 默认选中的选项*/
+        defaultValue?: Array<any>,
+        /** 指定选中的选项*/
+        value?: Array<any>,
+        /** 指定可选项*/
+        options?: Array<any>,
+        /** 变化时回调函数*/
+        onChange?: Function
+    }
+    /** Checkbox 组*/
+    class CheckboxGroup extends React.Component<CheckboxGroupProps, {}> {
+        render(): JSX.Element
+    }
+    /**
+     * #Checkbox
+    多选框。
+
+    ## 何时使用
+
+    - 在一组可选项中进行多项选择时；
+    - 单独使用可以表示两种状态之间的切换，和 `switch` 类似。区别在于切换 `switch` 会直接触发状态改变，而 `checkbox` 一般用于状态标记，需要和提交操作配合。
+    */
+    export class Checkbox extends React.Component<CheckboxProps, {}> {
+        static Group: typeof CheckboxGroup
+        render(): JSX.Element
+    }
+
+
+
+    // Collapse
+
+    interface CollapseProps {
+        /** 当前激活 tab 面板的 key*/
+        activeKey?: Array<any> | string,
+        /** 初始化选中面板的key */
+        defaultActiveKey?: Array<string>,
+        /** 切换面板的回调*/
+        onChange?: Function
+
+    }
+    class CollapsePanel extends React.Component<{
+        /** 对应 activeKey */
+        key: string,
+        /** 面板头内容*/
+        header: React.ReactNode | string
+    }, {}> {
+        render(): JSX.Element
+    }
+    /**
+     * #Collapse
+    可以折叠/展开的内容区域。
+
+    ## 何时使用
+
+    - 对复杂区域进行分组和隐藏，保持页面的整洁。
+    - `手风琴` 是一种特殊的折叠面板，只允许单个内容区域展开。*/
+    export class Collapse extends React.Component<CollapseProps, {}> {
+        static Panel: typeof CollapsePanel
+        render(): JSX.Element
+    }
+
+
+
+    // DatePicker
+    interface DatePickerProps<T> {
+
+        value?: string | Date,
+        defaultValue?: string | Date,
+        /** 展示的日期格式，配置参考 [GregorianCalendarFormat](https://github.com/yiminghe/gregorian-calendar-format)*/
+        format?: string,
+        /** 不可选择的日期*/
+        disabledDate?: Function,
+        /** 时间发生变化的回调，发生在用户选择时间时*/
+        onChange?: Function,
+        /** 禁用*/
+        disabled?: boolean,
+        style?: Object,
+        /** 格外的弹出日历样式*/
+        popupStyle?: Object,
+        /** 输入框大小，`large` 高度为 32px，`small` 为 22px，默认是 28px*/
+        size?: string,
+        /** 国际化配置*/
+        locale?: Object,
+        /** 增加时间选择功能*/
+        showTime?: boolean,
+        /** 点击确定按钮的回调*/
+        onOk?: Function,
+        /** 定义浮层的容器，默认为 body 上新建 div*/
+        getCalendarContainer?: Function
+
+    }
+    interface RangePickProps extends DatePickerProps<RangePicker> {
+
+    }
+    class RangePicker extends React.Component<RangePickProps, {}> {
+        render(): JSX.Element
+    }
+    class MonthPicker extends React.Component<RangePickProps, {}> {
+        render(): JSX.Element
+    }
+    /**
+     * #DatePicker
+    输入或选择日期的控件。
+
+    ## 何时使用
+
+    当用户需要输入一个日期，可以点击标准输入框，弹出日期面板进行选择。*/
+    export class DatePicker extends React.Component<DatePickerProps<any>, {}> {
+        static RangePicker: typeof RangePicker
+        static MonthPicker: typeof MonthPicker
+        render(): JSX.Element
+    }
+
+
+
+
+    // Dropdown
+
+    interface DropdownProps {
+        /** 触发下拉的行为  ['click'] or ['hover']*/
+        trigger?: Array<string>,
+        /** 菜单节点*/
+        overlay: React.ReactNode
+
+    }
+
+    class DropdownButton extends React.Component<{
+        /**  按钮类型*/
+        type?: string,
+        /** 点击左侧按钮的回调*/
+        onClick?: Function,
+        /** 触发下拉的行为*/
+        trigger?: string,
+        /** 菜单节点*/
+        overlay: React.ReactNode
+    }, {}> {
+        render(): JSX.Element
+    }
+    /**
+     * #Dropdown
+    向下弹出的列表。
+
+    ## 何时使用
+
+    当页面上的操作命令过多时，用此组件可以收纳操作元素。点击或移入触点，会出现一个下拉菜单。可在列表中进行选择，并执行相应的命令。
+    */
+    export class Dropdown extends React.Component<DropdownProps, {}> {
+        static Button: typeof DropdownButton
+        render(): JSX.Element
+    }
+
+
+
+    // Form
+
+    interface FormItemProps {
+        prefixCls?: string,
+        /**  label 标签的文本*/
+        label?: React.ReactNode,
+        /** label 标签布局，通 `<Col>` 组件，设置 `span` `offset` 值，如 `{span: 3, offset: 12}`*/
+        labelCol?: Object,
+        /** 提示信息，如不设置，则会根据校验规则自动生成 */
+        help?: React.ReactNode | boolean,
+        /** 额外的提示信息，和 help 类似，当需要错误信息和提示文案同时出现时，可以使用这个。*/
+        extra?: string,
+        /** 是否必填，如不设置，则会根据校验规则自动生成 */
+        validateStatus?: string,
+        /** 配合 validateStatus 属性使用，是否展示校验状态图标 */
+        hasFeedback?: boolean,
+        /** 需要为输入控件设置布局样式时，使用该属性，用法同 labelCol*/
+        wrapperCol?: Object,
+        className?: string,
+        required?: boolean,
+        id?: string
+    }
+    /**
+    表单一定会包含表单域，表单域可以是输入控件，标准表单域，标签，下拉菜单，文本域等。
+
+    这里我们分别封装了表单域 `<Form.Item />` 和输入控件 `<Input />`。*/
+    export class FormItem extends React.Component<FormItemProps, {}> {
+        render(): JSX.Element
+    }
+    interface FormComponentProps {
+        form: CreateFormOptions
+    }
+    export class FormComponent extends React.Component<FormComponentProps, {}> {
+        render(): JSX.Element
+    }
+
+    // function  create
+    type CreateFormOptions = {
+        /** 获取一组输入控件的值，如不传入参数，则获取全部组件的值*/
+        getFieldsValue(): (fieldNames?: Array<string>) => any
+        /** 获取一个输入控件的值*/
+        getFieldValue(): (fieldName: string) => any
+        /** 设置一组输入控件的值*/
+        setFieldsValue(): (obj: Object) => void
+        /** 设置一组输入控件的值*/
+        setFields(): (obj: Object) => void
+        /** 校验并获取一组输入域的值与 Error*/
+        validateFields(): (fieldNames?: Array<string>, options?: Object, callback?: (erros: any, values: any) => void) => any
+        /** 与 `validateFields` 相似，但校验完后，如果校验不通过的菜单域不在可见范围内，则自动滚动进可见范围 */
+        validateFieldsAndScroll(): (fieldNames?: Array<string>, options?: Object, callback?: (erros: any, values: any) => void) => any
+        /** 获取某个输入控件的 Error */
+        getFieldError(): (name: string) => Object
+        /** 判断一个输入控件是否在校验状态*/
+        isFieldValidating(): (name: string) => Object
+        /**重置一组输入控件的值与状态，如不传入参数，则重置所有组件*/
+        resetFields(): (names?: Array<string>) => void
+
+        getFieldsValue(): (id: string, options: {
+            /** 子节点的值的属性，如 Checkbox 的是 'checked'*/
+            valuePropName?: string,
+            /** 子节点的初始值，类型、可选值均由子节点决定*/
+            initialValue?: any,
+            /** 收集子节点的值的时机*/
+            trigger?: string,
+            /** 校验子节点值的时机*/
+            validateTrigger?: string,
+            /** 校验规则，参见 [async-validator](https://github.com/yiminghe/async-validator) */
+            rules?: Array<any>,
+            /** 必填输入控件唯一标志*/
+            id?: string
+        }) => Array<any>
+
+
+    }
+
+    interface ComponentDecorator {
+        <T extends (typeof FormComponent)>(component: T): T;
+    }
+    interface FormProps {
+        prefixCls?: string,
+        /** 水平排列布局*/
+        horizontal?: boolean,
+        /** 行内排列布局*/
+        inline?: boolean,
+        /** 经 `Form.create()` 包装过的组件会自带 `this.props.form` 属性，直接传给 Form 即可*/
+        form?: Object,
+        /** 数据验证成功后回调事件*/
+        onSubmit?: (e: React.FormEvent) => void,
+    }
+    /**
+     * #Form
+    具有数据收集、校验和提交功能的表单，包含复选框、单选框、输入框、下拉选择框等元素。
+
+    ## 表单
+
+    我们为 `form` 提供了以下两种排列方式：
+
+    - 水平排列：可以实现 `label` 标签和表单控件的水平排列;
+    - 行内排列：使其表现为 `inline-block` 级别的控件。
+    */
+    export class Form extends React.Component<FormProps, {}> {
+        static Item: typeof FormItem
+        static create(options?: {
+            /**
+             *   当 `Form.Item` 子节点的值发生改变时触发，可以把对应的值转存到 Redux store
+             */
+            onFieldsChange?: (props: Object, fields: Array<any>) => void,
+            /**  把 props 转为对应的值，可用于把 Redux store 中的值读出 */
+            mapPropsToFields?: (props: Object) => void
+        }): ComponentDecorator
+        render(): JSX.Element
+    }
+
+
+
+
+
+    // Icon
+    interface IconProps {
+        /** 图标类型*/
+        type: string
+    }
+    /**
+     * #Icon
+    有含义的矢量图形，每一个图标打倒一个敌人。
+
+    ## 图标的命名规范
+
+    我们为每个图标赋予了语义化的命名，命名规则如下:
+
+    - 实心和描线图标保持同名，用 `-o` 来区分，比如 `question-circle`(实心) 和 `question-circle-o`(描线)；
+
+    - 命名顺序：`[icon名]-[形状可选]-[描线与否]-[方向可选]`。
+
+    ## 如何使用
+
+    使用 `<Icon />` 标签声明组件，指定图标对应的 type 属性，示例代码如下:
+
+    ```html
+    <Icon type="link" />
+    ```
+
+    最终会渲染为：
+
+    ```html
+    <i class="anticon anticon-${type}"></i>
+    ```*/
+    export class Icon extends React.Component<IconProps, {}> {
+        render(): JSX.Element
+    }
+
+
+
+
+    // Input
+    interface InputProps {
+        /**  【必须】声明 input 类型，同原生 input 标签的 type 属性*/
+        type?: string,
+        id: string | number,
+        /** 控件大小，默认值为 default 。注：标准表单内的输入框大小限制为 large。 {'large','default','small'}*/
+        size?: string,
+        /** 是否禁用状态，默认为 false*/
+        disabled?: boolean,
+        value?: any,
+        /** 设置初始默认值*/
+        defaultValue?: any,
+        className?: string,
+        /** 带标签的 input，设置前置标签*/
+        addonBefore?: React.ReactNode,
+        /** 带标签的 input，设置后置标签*/
+        addonAfter?: React.ReactNode,
+        prefixCls?: string,
+        placeholder?: string
+    }
+    export class Input extends React.Component<InputProps, {}> {
+        render(): JSX.Element
+    }
+
+
+
+
+    // InputNumber
+    interface InputNumberProps {
+        /** 最小值*/
+        min: number,
+        /** 最大值*/
+        max: number,
+        /** 当前值*/
+        value?: number,
+        /** 每次改变步数*/
+        step?: number,
+        /** 初始值*/
+        defaultValue?: number,
+        /** 变化回调*/
+        onChange?: Function,
+        /** 禁用*/
+        disabled?: boolean,
+        /** 输入框大小*/
+        size?: string
+
+    }
+    /**
+     * #InputNumber
+    通过鼠标或键盘，输入范围内的数值。
+
+    ## 何时使用
+
+    当需要获取标准数值时。*/
+    export class InputNumber extends React.Component<InputNumberProps, {}> {
+        render(): JSX.Element
+    }
+
+
+    // Layout
+    // Row
+    interface RowProps {
+        type?: string,
+        align?: string,
+        justify?: string,
+        className?: string
+    }
+    export class Row extends React.Component<RowProps, {}> {
+        render(): JSX.Element
+    }
+
+    // Col
+    interface ColProps {
+        span?: string,
+        order?: string,
+        offset?: string,
+        push?: string,
+        pull?: string,
+        className?: string
+    }
+    /**
+    在多数业务情况下，Ant Design需要在设计区域内解决大量信息收纳的问题，因此在12栅格系统的基础上，我们将整个设计建议区域按照24等分的原则进行划分。
+
+    划分之后的信息区块我们称之为“盒子”。建议横向排列的盒子数量最多四个，最少一个。“盒子”在整个屏幕上占比见上图。设计部分基于盒子的单位定制盒子内部的排版规则，以保证视觉层面的舒适感。
+
+    ## 概述
+
+    布局的栅格化系统，我们是基于行（row）和列（col）来定义信息区块的外部框架，以保证页面的每个区域能够稳健地排布起来。下面简单介绍一下它的工作原理：
+
+    * 通过`row`在水平方向建立一组`column`（简写col）
+    * 你的内容应当放置于`col`内，并且，只有`col`可以作为`row`的直接元素
+    * 栅格系统中的列是指1到24的值来表示其跨越的范围。例如，三个等宽的列可以使用`.col-8`来创建
+    * 如果一个`row`中的`col`总和超过24，那么多余的`col`会作为一个整体另起一行排列
+
+    ## Flex 布局
+
+    我们的栅格化系统支持 Flex 布局，允许子元素在父节点内的水平对齐方式 - 居左、居中、居右、等宽排列、分散排列。子元素与子元素之间，支持顶部对齐、垂直居中对齐、底部对齐的方式。同时，支持使用 order 来定义元素的排列顺序。
+
+    Flex 布局是基于 24 栅格来定义每一个“盒子”的宽度，但排版则不拘泥于栅格。*/
+    export class Col extends React.Component<ColProps, {}> {
+        render(): JSX.Element
+    }
+
+
+
+
+    // Menu
+    interface MenuItemProps {
+        /**
+         * (是否禁用)
+         *
+         * @type {boolean}
+         */
+        disabled?: boolean,
+        key: string
+    }
+    export class MenuItem extends React.Component<MenuItemProps, {}> {
+        render(): JSX.Element
+    }
+
+    interface MenuSubMenuProps {
+        /**
+         * (子菜单项值)
+         *
+         * @type {(string | React.ReactNode)}
+         */
+        title: string | React.ReactNode,
+        /**
+         * (子菜单的菜单项)
+         *
+         * @type {(MenuItem | MenuSubMenu)}
+         */
+        children?: JSX.Element[]
+    }
+    export class MenuSubMenu extends React.Component<MenuSubMenuProps, {}> {
+        render(): JSX.Element
+    }
+
+    interface MenuItemGroupProps {
+        /**
+         * (分组标题)
+         *
+         * @type {(string | React.ReactNode)}
+         */
+        title: string | React.ReactNode,
+        /**
+         * (分组的菜单项)
+         *
+         * @type {MenuItem}
+         */
+        children?: JSX.Element[]
+    }
+    export class MenuItemGroup extends React.Component<MenuItemGroupProps, {}> {
+        render(): JSX.Element
+    }
+
+
+    // enum
+    enum MenuTheme {
+        light,
+        dark
+    }
+    enum MenuMode {
+        vertical,
+        horizontal,
+        inline
+    }
+    interface MenuProps {
+        /** 主题颜色*/
+        theme?: MenuTheme | string,
+        /** 菜单类型  enum: `vertical` `horizontal` `inline`*/
+        mode?: MenuMode | string,
+        /** 当前选中的菜单项 key 数组*/
+        selectedKeys?: Array<string>,
+        /** 初始选中的菜单项 key 数组*/
+        defaultSelectedKeys?: Array<string>,
+        /** 当前展开的菜单项 key 数组*/
+        openKeys?: Array<string>,
+        /** 初始展开的菜单项 key 数组*/
+        defaultOpenKeys?: Array<string>,
+        /**
+         * 被选中时调用
+         *
+         * @type {(item: any, key: string, selectedKeys: Array<string>) => void}
+         */
+        onSelect?: (item: any, key: string, selectedKeys: Array<string>) => void,
+        /** 取消选中时调用*/
+        onDeselect?: (item: any, key: string, selectedKeys: Array<string>) => void,
+        /** 点击 menuitem 调用此函数*/
+        onClick?: (item: any, key: string) => void,
+        /** 根节点样式*/
+        style?: Object
+    }
+    /**
+    # Menu
+    为页面和功能提供导航的菜单列表。
+
+    ## 何时使用
+
+    导航菜单是一个网站的灵魂，用户依赖导航在各个页面中进行跳转。一般分为顶部导航和侧边导航，顶部导航提供全局性的类目和功能，侧边导航提供多级结构来收纳和排列网站架构。
+
+    更多布局和导航的范例可以参考：[常用布局](/spec/layout)。*/
+    export class Menu extends React.Component<MenuProps, {}> {
+        static Item: typeof MenuItem
+        static SubMenu: typeof MenuSubMenu
+        static ItemGroup: typeof MenuItemGroup
+        static Divider: typeof React.Component
+        render(): JSX.Element
+    }
+
+
+
+    // Message
+    type MessageFunc = (
+        /** 提示内容*/
+        content: string,
+        /** 自动关闭的延时*/
+        duration?: number
+    ) => void
+    /**
+     * #Message
+    全局展示操作反馈信息。
+
+    ## 何时使用
+
+    - 可提供成功、警告和错误等反馈信息。
+    - 顶部居中显示并自动消失，是一种不打断用户操作的轻量级提示方式。*/
+    export const message: {
+
+        success: MessageFunc
+        error: MessageFunc
+        info: MessageFunc
+        loading: MessageFunc
+        config: (options: {
+            /**
+             * 消息距离顶部的位置
+             *
+             * @type {number}
+             */
+            top: number
+        }) => void
+        destroy: () => void
+    }
+
+    // Modal
+    type ModalFunc = (options: {
+        visible?: boolean,
+        title?: React.ReactNode | string,
+        onOk?: Function,
+        onCancel?: Function,
+        width?: string | number,
+        iconClassName?: string,
+        okText?: string,
+        cancelText?: string
+    }) => void
+
+    interface ModalProps {
+        /** 对话框是否可见*/
+        visible?: boolean,
+        /** 确定按钮 loading*/
+        confirmLoading?: boolean,
+        /** 标题*/
+        title?: React.ReactNode | string,
+        /** 是否显示右上角的关闭按钮*/
+        closable?: boolean,
+        /** 点击确定回调*/
+        onOk?: Function,
+        /** 点击遮罩层或右上角叉或取消按钮的回调*/
+        onCancel?: Function,
+        /** 宽度*/
+        width?: string | number,
+        /** 底部内容*/
+        footer?: React.ReactNode | string,
+        /** 确认按钮文字*/
+        okText?: string,
+        /** 取消按钮文字*/
+        cancelText?: string,
+        /** 点击蒙层是否允许关闭*/
+        maskClosable?: boolean
+    }
+
+    /**
+    # Modal
+    模态对话框。
+
+    ## 何时使用
+
+    需要用户处理事务，又不希望跳转页面以致打断工作流程时，可以使用 `Modal` 在当前页面正中打开一个浮层，承载相应的操作。
+
+    另外当需要一个简洁的确认框询问用户时，可以使用精心封装好的 `ant.Modal.confirm()` 等方法。*/
+    export class Modal extends React.Component<ModalProps, {}> {
+        static info: ModalFunc
+        static success: ModalFunc
+        static error: ModalFunc
+        static confirm: ModalFunc
+        render(): JSX.Element
+    }
+
+
+
+
+    // Notification
+    type NotificationFunc = (
+        config: {
+            /** 通知提醒标题，必选 */
+            message: React.ReactNode | string,
+            /** 通知提醒内容，必选*/
+            description: React.ReactNode | string,
+            /** 自定义关闭按钮*/
+            btn?: React.ReactNode | string,
+            /** 当前通知唯一标志*/
+            key?: string,
+            /** 点击默认关闭按钮时触发的回调函数*/
+            onClose?: Function,
+            /** 默认 4.5 秒后自动关闭，配置为 null 则不自动关闭*/
+            duration?: number
+        }) => void
+    /**
+     * #notification
+    全局展示通知提醒信息。
+
+    ## 何时使用
+
+    在系统右上角显示通知提醒信息。经常用于以下情况：
+
+    - 较为复杂的通知内容。
+    - 带有交互的通知，给出用户下一步的行动点。
+    - 系统主动推送。*/
+    export const notification: {
+        success: NotificationFunc
+        error: NotificationFunc
+        info: NotificationFunc
+        warn: NotificationFunc
+        close: (key: string) => void
+        destroy: () => void
+        config: (options: {
+            /** 消息距离顶部的位置*/
+            top: number
+        }) => void
+
+    }
+
+
+
+
+    // Pagination
+    interface PaginationProps {
+        /** 当前页数*/
+        current?: number,
+        /** 默认的当前页数*/
+        defaultCurrent?: number,
+        /** 数据总数*/
+        total: number,
+        /** 初始的每页条数*/
+        defaultPageSize?: number,
+        /** 每页条数*/
+        pageSize?: number,
+        /** 页码改变的回调，参数是改变后的页码*/
+        onChange?: Function,
+        /** 是否可以改变 pageSize */
+        showSizeChanger?: boolean,
+        /** 指定每页可以显示多少条*/
+        pageSizeOptions?: Array<number>
+        /** pageSize 变化的回调  */
+        onShowSizeChange?: Function,
+        /** 是否可以快速跳转至某页*/
+        showQuickJumper?: boolean,
+        /** 当为「small」时，是小尺寸分页 */
+        size?: string,
+        /** 当添加该属性时，显示为简单分页*/
+        simple?: Object,
+        /** 用于显示总共有多少条数据*/
+        showTotal?: Function
+    }
+    /**
+     * #Pagination
+    采用分页的形式分隔长列表，每次只加载一个页面。
+
+    ## 何时使用
+
+    - 当加载/渲染所有数据将花费很多时间时；
+    - 可切换页码浏览数据。*/
+    export class Pagination extends React.Component<PaginationProps, {}> {
+        render(): JSX.Element
+    }
+
+
+
+
+    // Popconfirm
+    enum Placement {
+        top, left, right, bottom
+    }
+    interface PopconfirmProps {
+        /**
+         * 气泡框位置，可选 `top/left/right/bottom`
+         *
+         * @type {(Placement | string)}
+         */
+        placement?: Placement | string,
+        /** 确认框的描述*/
+        title?: string,
+        /** 点击确认的回调*/
+        onConfirm?: Function,
+        onCancel?: Function,
+        /** 显示隐藏的回调*/
+        onVisibleChange?: (visible: boolean) => void,
+        /** 确认按钮文字*/
+        okText?: string,
+        /** 取消按钮文字*/
+        cancelText?: string
+    }
+    /**
+     * #Popconfirm
+    点击元素，弹出气泡式的确认框。
+
+    ## 何时使用
+
+    目标元素的操作需要用户进一步的确认时，在目标元素附近弹出浮层提示，询问用户。
+
+    和 `confirm` 弹出的全屏居中模态对话框相比，交互形式更轻量。
+    */
+    export class Popconfirm extends React.Component<PopconfirmProps, {}> {
+        render(): JSX.Element
+    }
+
+
+
+
+    // Popover
+    enum Trigger {
+        hover, focus, click
+    }
+    enum PopoverPlacement {
+        top,
+        left, right, bottom,
+        topLeft, topRight, bottomLeft, bottomRight,
+        leftTop, leftBottom, rightTop, rightBottom
+    }
+    interface PopoverProps {
+        /** 触发行为，可选 `hover/focus/click` */
+        trigger?: Trigger | string,
+        /** 气泡框位置，可选 `top/left/right/bottom` `topLeft/topRight/bottomLeft/bottomRight` `leftTop/leftBottom/rightTop/rightBottom`*/
+        placement?: PopoverPlacement | string,
+        /** 卡片标题*/
+        title?: React.ReactNode | string,
+        /** 卡片内容*/
+        overlay?: React.ReactNode | string,
+        prefixCls?: string,
+        /** 用于手动控制浮层显隐*/
+        visible?: boolean,
+        /** 显示隐藏改变的回调*/
+        onVisibleChange?: Function
+    }
+    /**
+     * #Popover
+    点击/鼠标移入元素，弹出气泡式的卡片浮层。
+
+    ## 何时使用
+
+    当目标元素有进一步的描述和相关操作时，可以收纳到卡片中，根据用户的操作行为进行展现。
+
+    和 `Tooltip` 的区别是，用户可以对浮层上的元素进行操作，因此它可以承载更复杂的内容，比如链接或按钮等。
+    */
+    export class Popover extends React.Component<PopoverProps, {}> {
+        render(): JSX.Element
+    }
+
+
+
+
+    // Progress
+    enum ProgressStatus {
+        normal,
+        exception,
+        active
+    }
+
+    interface LineProps {
+        /** 百分比*/
+        percent: number,
+        /** 内容的模板函数*/
+        format?: (percent: any) => void,
+        /** 状态，可选：normal、exception、active*/
+        status?: ProgressStatus | string,
+        /** 进度条线的宽度，单位是px*/
+        strokeWidth?: number,
+        /** 是否显示进度数值和状态图标*/
+        showInfo?: boolean
+    }
+    export class Line extends React.Component<LineProps, {}> {
+        render(): JSX.Element
+    }
+
+    interface CircleProps {
+        /** 百分比*/
+        percent: number,
+        /** 内容的模板函数*/
+        format?: (percent: any) => void,
+        /** 状态，可选：normal、exception*/
+        status?: ProgressStatus | string,
+        /** 进度条线的宽度，单位是进度条画布宽度的百分比*/
+        strokeWidth?: number,
+        /** 必填，进度条画布宽度，单位px。这里没有提供height属性设置，Line型高度就是strokeWidth，Circle型高度等于width*/
+        width?: number
+    }
+    export class Circle extends React.Component<CircleProps, {}> {
+        render(): JSX.Element
+    }
+    /**
+     * #Progress
+    展示操作的当前进度。
+
+    ## 何时使用
+
+    在操作需要较长时间才能完成时，为用户显示该操作的当前进度和状态。
+
+    * 当一个操作会打断当前界面，或者需要在后台运行，且耗时可能超过2秒时；
+    * 当需要显示一个操作完成的百分比时。*/
+    export const Progress: {
+        Line: typeof Line,
+        Circle: typeof Circle
+    }
+
+
+    // QueueAnim
+    interface QueueAnimProps {
+        /** 动画内置参数 `left` `right` `top` `bottom` `scale` `scaleBig` `scaleX` `scaleY`*/
+        type?: string | Array<string>,
+        /** 配置动画参数 如 `{opacity:[1, 0],translateY:[0, -30]}` 具体参考 [velocity](http://julian.com/research/velocity) 的写法*/
+        animConfig?: Object | Array<any>,
+        /** 整个动画的延时,以毫秒为单位*/
+        delay?: number | Array<any>,
+        /** 每个动画的时间,以毫秒为单位*/
+        duration?: number | Array<any>,
+        /** 每个动画的间隔时间,以毫秒为单位*/
+        interval?: number | Array<any>,
+        /** 出场时是否倒放,从最后一个 dom 开始往上播放 */
+        leaveReverse?: boolean,
+        /** 动画的缓动函数,[查看详细](http://julian.com/research/velocity/#easing)*/
+        ease?: string | Array<any>,
+        /** 进出场动画进行中的类名*/
+        animatingClassName?: Array<string>,
+        /** QueueAnim 替换的标签名*/
+        component?: string
+    }
+    /**
+     * #QueueAnim
+    通过简单的配置对一组元素添加串行的进场动画效果。
+
+    ## 何时使用
+
+    - 从内容A到内容B的转变过程时能有效的吸引用户注意力，突出视觉中心，提高整体视觉效果。
+
+    - 小的信息元素排布或块状较多的情况下，根据一定的路径层次依次进场，区分维度层级，来凸显量级，使页面转场更加流畅和舒适，提高整体视觉效果和产品的质感。
+
+    - 特别适合首页和需要视觉展示效果的宣传页，以及单页应用的切换页面动效。
+    */
+    export class QueueAnim extends React.Component<QueueAnimProps, {}> {
+        render(): JSX.Element
+    }
+
+
+
+
+    // Radio
+    enum RadioGroupSize {
+        large,
+        default,
+        small
+    }
+    interface RadioGroupProps {
+        /** 选项变化时的回调函数*/
+        onChange?: (e: Event) => void,
+        /** 用于设置当前选中的值*/
+        value?: string,
+        /** 默认选中的值*/
+        defaultValue?: string,
+        /**  大小，只对按钮样式生效*/
+        size?: RadioGroupSize | string
+    }
+    export class RadioGroup extends React.Component<RadioGroupProps, {}> {
+        render(): JSX.Element
+    }
+
+
+    interface RadioProps {
+        /** 指定当前是否选中*/
+        checked?: boolean,
+        /** 初始是否选中*/
+        defaultChecked?: boolean,
+        /** 根据 value 进行比较，判断是否选中  */
+        value?: any
+    }
+    /**
+     * #Radio
+    单选框。
+
+    ## 何时使用
+
+    - 用于在多个备选项中选中单个状态。
+    - 和 Select 的区别是，Radio 所有选项默认可见，方便用户在比较中选择，因此选项不宜过多。
+    */
+    export class Radio extends React.Component<RadioProps, {}> {
+        static Group: typeof RadioGroup
+        static Button: typeof Button
+        render(): JSX.Element
+    }
+
+
+
+    // Select
+    interface SelectOptionProps {
+        /** 是否禁用*/
+        disabled?: boolean,
+        /** 如果 react 需要你设置此项，此项值与 value 的值相同，然后可以省略 value 设置*/
+        key?: string,
+        /** 默认根据此属性值进行筛选*/
+        value: string
+    }
+    export class SelectOption extends React.Component<SelectOptionProps, {}> {
+        render(): JSX.Element
+    }
+
+    interface SelectOptGroupProps {
+        /** 组名*/
+        label: string | React.ReactNode,
+        key?: string
+    }
+    export class SelectOptGroup extends React.Component<SelectOptGroupProps, {}> {
+        render(): JSX.Element
+    }
+
+    interface SelectProps {
+        /** 指定当前选中的条目*/
+        value?: string | Array<any>,
+        /** 指定默认选中的条目*/
+        defaultValue?: string | Array<any>,
+        /** 支持多选*/
+        multiple?: boolean,
+        /** 支持清除, 单选模式有效*/
+        allowClear?: boolean,
+        /** 是否根据输入项进行筛选，可为一个函数，返回满足要求的 option 即可*/
+        filterOption?: boolean | Function,
+        /** 可以把随意输入的条目作为 tag，输入项不需要与下拉选项匹配*/
+        tags?: boolean,
+        /** 被选中时调用，参数为选中项的 value 值 */
+        onSelect?: (value: any, option: any) => void,
+        /** 取消选中时调用，参数为选中项的 option value 值，仅在 multiple 或 tags 模式下生效*/
+        onDeselect?: (value: any, option: any) => void,
+        /** 选中option，或input的value变化(combobox 模式下)时，调用此函数*/
+        onChange?: (value: any, label: any) => void,
+        /** 文本框值变化时回调*/
+        onSearch?: (value: string) => void,
+        /** 选择框默认文字*/
+        placeholder?: string,
+        /** 搜索框默认文字*/
+        searchPlaceholder?: string,
+        /** 当下拉列表为空时显示的内容*/
+        notFoundContent?: string,
+        /** 下拉菜单和选择器同宽*/
+        dropdownMatchSelectWidth?: boolean,
+        /** 搜索时过滤对应的 option 属性，如设置为 children 表示对内嵌内容进行搜索*/
+        optionFilterProp?: string,
+        /** 输入框自动提示模式*/
+        combobox?: SVGSymbolElement,
+        /** 选择框大小，可选 `large` `small` */
+        size?: string,
+        /** 在下拉中显示搜索框*/
+        showSearch?: boolean,
+        /** 是否禁用*/
+        disabled?: boolean,
+        style?: Object
+    }
+    /**
+     * #Select
+    类似 Select2 的选择器。
+
+    ## 何时使用
+
+    弹出一个下拉菜单给用户选择操作，用于代替原生的选择器，或者需要一个更优雅的多选器时。*/
+    export class Select extends React.Component<SelectProps, {}> {
+        static Option: typeof SelectOption
+        static OptGroup: typeof SelectOptGroup
+        render(): JSX.Element
+    }
+
+
+
+    // Slider
+    interface SliderProps {
+        /** 最小值*/
+        min?: number,
+        /** 最大值*/
+        max?: number,
+        /** 步长，取值必须大于 0，并且可被 (max - min) 整除。当 `marks` 不为空对象时，可以设置 `step` 为 `null`，此时 Slider 的可选值仅有 marks 标出来的部分。*/
+        step?: number,
+        /** 分段标记，key 的类型必须为 `Number` 且取值在闭区间 [min, max] 内*/
+        marks?: { key: number, value: any },
+        /**  设置当前取值。当 `range` 为 `false` 时，使用 `Number`，否则用 `[Number, Number]`*/
+        value?: number | Array<number>,
+        /**  设置当前取值。当 `range` 为 `false` 时，使用 `Number`，否则用 `[Number, Number]`*/
+        defaultValue?: number | Array<number>,
+        /** `marks` 不为空对象时有效，值为 true 时表示值为包含关系，false 表示并列*/
+        included?: boolean,
+        /** 值为 `true` 时，滑块为禁用状态*/
+        disabled?: boolean,
+        /** 当 `range` 为 `true` 时，该属性可以设置是否允许两个滑块交换位置。*/
+        allowCross?: boolean,
+        /** 当 Slider 的值发生改变时，会触发 onChange 事件，并把改变后的值作为参数传入。*/
+        onChange?: Function,
+        /** 与 `onmouseup` 触发时机一致，把当前值作为参数传入。*/
+        onAfterChange?: Function,
+        /** Slider 会把当前值传给 `tipFormatter`，并在 Tooltip 中显示 `tipFormatter` 的返回值，若为 null，则隐藏 Tooltip。*/
+        tipFormatter?: Function | any,
+        range?: boolean
+    }
+    /**
+     * #Slider
+    滑动型输入器，展示当前值和可选范围。
+
+    ## 何时使用
+
+    当用户需要在数值区间/自定义区间内进行选择时，可为连续或离散值。*/
+    export class Slider extends React.Component<SliderProps, {}> {
+        render(): JSX.Element
+    }
+
+
+
+
+    // Spin
+    interface SpinProps {
+        /** spin组件中点的大小，可选值为 small default large*/
+        size?: string,
+        /** 用于内嵌其他组件的模式，可以关闭 loading 效果*/
+        spining?: boolean
+    }
+    /**
+     * #Spin
+    用于页面和区块的加载中状态。
+
+    ## 何时使用
+
+    页面局部处于等待异步数据或正在渲染过程时，合适的加载动效会有效缓解用户的焦虑。
+    */
+    export class Spin extends React.Component<SpinProps, {}> {
+        render(): JSX.Element
+    }
+
+
+
+
+    // Steps
+    enum StepStatus {
+        wait, process, finish
+    }
+    interface StepProps {
+        /** 可选参数，指定状态。当不配置该属性时，会使用父Steps元素的current来自动指定状态。*/
+        status?: StepStatus | string,
+        /** 必要参数，标题。*/
+        title: string | React.ReactNode,
+        /**  可选参数，步骤的详情描述。*/
+        description?: string | React.ReactNode,
+        /** 可选参数，步骤的Icon。如果不指定，则使用默认的样式。*/
+        icon?: string | React.ReactNode
+    }
+    export class Step extends React.Component<StepProps, {}> {
+        render(): JSX.Element
+    }
+
+    interface StepsProps {
+        /** 可选参数，指定当前处理正在执行状态的步骤，从0开始记数。在子Step元素中，可以通过status属性覆盖状态。*/
+        current?: number,
+        /** 可选参数，指定大小（目前只支持普通和迷你两种大小）。 small, default */
+        size?: string,
+        /** 可选参数，指定步骤条方向（目前支持水平和竖直两种方向，默认水平方向）。*/
+        direction?: string,
+        /** 可选参数，指定步骤的详细描述文字的最大宽度。*/
+        maxDescriptionWidth?: number
+
+    }
+    /**
+     * #Steps
+    引导用户按照流程完成任务的导航条。
+
+    ## 何时使用
+
+    当任务复杂或者存在先后关系时，将其分解成一系列步骤，从而简化任务。*/
+    export class Steps extends React.Component<StepsProps, {}> {
+        static Step: typeof Step
+        render(): JSX.Element
+    }
+
+
+
+    // Switch
+    interface SwitchProps {
+        /** 指定当前是否选中*/
+        checked?: boolean,
+        /** 初始是否选中*/
+        defaultChecked?: boolean,
+        /** 变化时回调函数*/
+        onChange?: (checked: boolean) => void,
+        /** 选中时的内容*/
+        checkedChildren?: React.ReactNode,
+        /** 非选中时的内容*/
+        unCheckedChildren?: React.ReactNode,
+        /** 开关大小*/
+        size?: string
+    }
+    /**
+     * #Switch
+    开关选择器。
+
+    ## 何时使用
+
+    - 需要表示开关状态/两种状态之间的切换时；
+    - 和 `checkbox `的区别是，切换 `switch` 会直接触发状态改变，而 `checkbox` 一般用于状态标记，需要和提交操作配合。
+    */
+    export class Switch extends React.Component<SwitchProps, {}> {
+        render(): JSX.Element
+    }
+
+
+
+
+    // Table
+    enum RowSelectionType {
+        checkbox,
+        radio
+    }
+    type SelectedRowKeys = Array<any>
+    interface RowSelection {
+        type?: RowSelectionType | string,
+        selectedRowKeys?: SelectedRowKeys,
+        onChange?: (selectedRowKeys: SelectedRowKeys, selectedRows: any) => void,
+        getCheckboxProps?: (record: any) => void,
+        onSelect?: (record: any, selected: any, selectedRows: any) => void,
+        onSelectAll?: (rselectedecord: any, selectedRows: any, changeRows: any) => void
+    }
+    interface Columns {
+        /** React 需要的 key，建议设置*/
+        key?: string,
+        /** 列头显示文字*/
+        title?: string | React.ReactNode,
+        /** 列数据在数据项中对应的 key*/
+        dataIndex?: string,
+        /** 生成复杂数据的渲染函数，参数分别为当前列的值，当前列数据，列索引，@return里面可以设置表格[行/列合并](#demo-colspan-rowspan)*/
+        render?: (text?: any, record?: any, index?: number) => React.ReactNode,
+        /** 表头的筛选菜单项*/
+        filters?: Array<any>,
+        /** 本地模式下，确定筛选的运行函数*/
+        onFilter?: Function,
+        /** 是否多选*/
+        filterMultiple?: boolean,
+        /** 排序函数，本地排序使用一个函数，需要服务端排序可设为 true */
+        sorter?: boolean | Function,
+        /** 表头列合并,设置为 0 时，不渲染*/
+        colSpan?: number,
+        /** 列宽度*/
+        width?: string | number,
+        /** 列的 className*/
+        className?: string
+    }
+    interface TableProps {
+        /** 列表项是否可选择*/
+        rowSelection?: RowSelection,
+        /** 分页器*/
+        pagination?: Object,
+        /** 正常或迷你类型 : `default` or `small` */
+        size?: string,
+        /** 数据数组*/
+        dataSource: Array<any>,
+        /** 表格列的配置描述*/
+        columns: Columns,
+        /** 表格行 key 的取值*/
+        rowKey?: (record: any, index: number) => string,
+        /** 额外的展开行*/
+        expandedRowRender?: Function,
+        /** 默认展开的行*/
+        defaultExpandedRowKeys?: Array<string>,
+        /** 分页、排序、筛选变化时触发*/
+        onChange?: (pagination: Object, filters: any, sorter: any) => void,
+        /** 页面是否加载中*/
+        loading?: boolean,
+        /** 默认文案设置，目前包括排序、过滤、空数据文案: `{ filterConfirm: '确定', filterReset: '重置', emptyText: '暂无数据' }` */
+        locale?: Object,
+        /** 展示树形数据时，每层缩进的宽度，以 px 为单位*/
+        indentSize?: number,
+        /** 处理行点击事件*/
+        onRowClick?: (record: any, index: number) => void,
+        /** 是否固定表头*/
+        useFixedHeader?: boolean,
+        /** 是否展示外边框和列边框*/
+        bordered?: boolean,
+        /** 是否显示表头*/
+        showHeader?: boolean,
+        /** 表格底部自定义渲染函数*/
+        footer?: (currentPageData: Object) => void
+
+    }
+    /**
+     * #Table
+    展示行列数据。
+
+    ## 何时使用
+
+    - 当有大量结构化的数据需要展现时；
+    - 当需要对数据进行排序、搜索、分页、自定义操作等复杂行为时。*/
+    export class Table extends React.Component<TableProps, {}> {
+        render(): JSX.Element
+    }
+
+
+
+    // Tabs
+    interface TabPaneProps {
+        /** 选项卡头显示文字*/
+        tab: React.ReactNode | string
+    }
+    export class TabPane extends React.Component<TabPaneProps, {}> {
+        render(): JSX.Element
+    }
+
+    enum TabsType {
+        line, card, 'editable-card'
+    }
+    enum TabsPosition {
+        top,
+        right,
+        bottom,
+        left
+    }
+    interface TabsProps {
+        /** 当前激活 tab 面板的 key    */
+        activeKey?: string,
+        /** 初始化选中面板的 key，如果没有设置 activeKey*/
+        defaultActiveKey?: string,
+        /** 切换面板的回调*/
+        onChange?: Function,
+        /** tab 被点击的回调 */
+        onTabClick?: Function,
+        /** tab bar 上额外的元素  */
+        tabBarExtraContent?: React.ReactNode,
+        /** 页签的基本样式，可选 `line`、`card` `editable-card` 类型*/
+        type?: TabsType | string,
+        /** 页签位置，可选值有 `top` `right` `bottom` `left`*/
+        tabPosition?: TabsPosition | string,
+        /** 新增和删除页签的回调，在 `type="editable-card"` 时有效*/
+        onEdit?: (targetKey: string, action: any) => void
+    }
+    /**
+     * #Tabs
+    选项卡切换组件。
+
+    ## 何时使用
+    
+    提供平级的区域将大块内容进行收纳和展现，保持界面整洁。
+    
+    Ant Design 依次提供了三级选项卡，分别用于不同的场景。
+    
+    - 卡片式的页签，提供可关闭的样式，常用于容器顶部。
+    - 标准线条式页签，用于容器内部的主功能切换，这是最常用的 Tabs。
+    - [RadioButton](/components/radio/#demo-radiobutton) 可作为更次级的页签来使用。*/
+    export class Tabs extends React.Component<TabsProps, {}> {
+        static TabPane: typeof TabPane
+        render(): JSX.Element
+    }
+
+
+
+
+    // Tag
+    interface TagProps {
+        /** 标签是否可以关闭*/
+        closable?: boolean,
+        /** 关闭时的回调*/
+        onClose?: Function,
+        /** 动画关闭后的回调*/
+        afterClose?: Function,
+        /** 标签的色彩*/
+        color?: string
+    }
+    /**
+     * #Tag
+    进行标记和分类的小标签。
+    
+    ## 何时使用
+    
+    - 用于标记事物的属性和维度。
+    - 进行分类。*/
+    export class Tag extends React.Component<TagProps, {}> {
+        render(): JSX.Element
+    }
+
+
+
+
+
+
+    // TimePicker
+    interface TimePickerProps {
+        /** 默认时间*/
+        value?: string | Date,
+        /** 初始默认时间*/
+        defaultValue?: string | Date,
+        /** 展示的时间格式 : "HH:mm:ss"、"HH:mm"、"mm:ss" */
+        format?: string,
+        /** 时间发生变化的回调*/
+        onChange?: (Date: Date) => void,
+        /** 禁用全部操作*/
+        disabled?: boolean,
+        /** 没有值的时候显示的内容*/
+        placeholder?: string,
+        /** 国际化配置*/
+        locale?: Object,
+        /** 隐藏禁止选择的选项*/
+        hideDisabledOptions?: boolean,
+        /** 禁止选择部分小时选项*/
+        disabledHours?: Function,
+        /** 禁止选择部分分钟选项*/
+        disabledMinutes?: Function,
+        /** 禁止选择部分秒选项*/
+        disabledSeconds?: Function
+
+    }
+    /**
+     * #TimePicker
+    输入或选择时间的控件。
+    
+    何时使用
+    --------
+    
+    当用户需要输入一个时间，可以点击标准输入框，弹出时间面板进行选择。
+    */
+    export class TimePicker extends React.Component<TimePickerProps, {}> {
+        render(): JSX.Element
+    }
+
+
+
+
+    // Timeline
+    interface TimeLineItemProps {
+        /** 指定圆圈颜色。*/
+        color?: string
+    }
+    export class TimeLineItem extends React.Component<TimeLineItemProps, {}> {
+        render(): JSX.Element
+    }
+
+    interface TimelineProps {
+        /** 指定最后一个幽灵节点是否存在或内容*/
+        pending?: boolean | React.ReactNode
+    }
+    /**
+     * #Timeline
+    垂直展示的时间流信息。
+    
+    ## 何时使用
+    
+    - 当有一系列信息需要从上至下按时间排列时；
+    - 需要有一条时间轴进行视觉上的串联时；*/
+    export class Timeline extends React.Component<TimelineProps, {}> {
+        static Item: typeof TimeLineItem
+        render(): JSX.Element
+    }
+
+
+
+    // Tooltip
+
+    interface TooltipProps {
+        /** 气泡框位置，可选 `top` `left` `right` `bottom` `topLeft` `topRight` `bottomLeft` `bottomRight` `leftTop` `leftBottom` `rightTop` `rightBottom`*/
+        placement?: PopoverPlacement | string,
+        /** 提示文字*/
+        title?: string | React.ReactNode
+    }
+    /**
+     * #Tooltip
+    简单的文字提示气泡框。
+    
+    ## 何时使用
+    
+    鼠标移入则显示提示，移出消失，气泡浮层不承载复杂文本和操作。
+    
+    可用来代替系统默认的 `title` 提示，提供一个`按钮/文字/操作`的文案解释。*/
+    export class Tooltip extends React.Component<TooltipProps, {}> {
+        render(): JSX.Element
+    }
+
+
+
+
+
+    // Transfer
+    interface TransferProps {
+        /** 数据源*/
+        dataSource: Array<any>,
+        /** 每行数据渲染函数*/
+        render?: (record: Object) => any,
+        /** 显示在右侧框数据的key集合*/
+        targetKeys: Array<string>,
+        /** 变化时回调函数*/
+        onChange?: (targetKeys: any, direction: string, moveKeys: any) => void,
+        /** 两个穿梭框的自定义样式*/
+        listStyle?: Object,
+        /** 自定义类*/
+        className?: string,
+        /** 标题集合,顺序从左至右*/
+        titles?: Array<string>,
+        /** 操作文案集合,顺序从上至下*/
+        operations?: Array<string>,
+        /** 是否显示搜索框*/
+        showSearch?: boolean,
+        /** 搜索框的默认值*/
+        searchPlaceholder?: string,
+        /** 当列表为空时显示的内容*/
+        notFoundContent?: React.ReactNode | string
+        /** 底部渲染函数*/
+        footer?: (props: any) => any
+    }
+    /**
+     * #Transfer
+    双栏穿梭选择框。
+    
+    ## 何时使用
+    
+    用直观的方式在两栏中移动元素，完成选择行为。
+    */
+    export class Transfer extends React.Component<TransferProps, {}> {
+        render(): JSX.Element
+    }
+
+
+
+
+
+    // Tree
+    interface TreeNodeProps {
+        disabled?: boolean,
+        disableCheckbox?: boolean,
+        title?: string | React.ReactNode,
+        key?: string,
+        isLeaf?: boolean
+    }
+    export class TreeNode extends React.Component<TreeNodeProps, {}> {
+        render(): JSX.Element
+    }
+
+    interface TreeProps {
+        showLine?: boolean,
+        className?: string,
+        /** 是否支持多选*/
+        multiple?: boolean,
+        /** 是否支持选中*/
+        checkable?: boolean,
+        /** 默认展开所有树节点*/
+        defaultExpandAll?: boolean,
+        /** 默认展开指定的树节点*/
+        defaultExpandedKeys?: Array<string>,
+        /** （受控）展开指定的树节点*/
+        expandedKeys?: Array<string>,
+        /** （受控）选中复选框的树节点*/
+        checkedKeys?: Array<string>,
+        /** 默认选中复选框的树节点*/
+        defaultCheckedKeys?: Array<string>,
+        /** （受控）设置选中的树节点*/
+        selectedKeys?: Array<string>,
+        /** 默认选中的树节点*/
+        defaultSelectedKeys?: Array<string>,
+        /** 展开/收起节点时触发 */
+        onExpand?: (node: any, expanded: any, expandedKeys: any) => void,
+        /** 点击复选框触发*/
+        onCheck?: (checkedKeys: any, e: { checked: boolean, checkedNodes: any, node: any, event: Event }) => void,
+        /** 点击树节点触发*/
+        onSelect?: (selectedKeys: any, e: { selected: boolean, selectedNodes: any, node: any, event: Event }) => void,
+        /** filter some treeNodes as you need. it should return true */
+        filterTreeNode?: (node: any) => boolean,
+        /** 异步加载数据*/
+        loadData?: (node: any) => void,
+        /** 响应右键点击*/
+        onRightClick?: (options: { event: Event, node: any }) => void,
+        /** 设置节点可拖拽（IE>8）*/
+        draggable?: boolean,
+        /** 开始拖拽时调用*/
+        onDragStart?: (options: { event: Event, node: any }) => void,
+        /** dragenter 触发时调用*/
+        onDragEnter?: (options: { event: Event, node: any, expandedKeys: any }) => void,
+        /** dragover 触发时调用 */
+        onDragOver?: (options: { event: Event, node: any }) => void,
+        /** dragleave 触发时调用*/
+        onDragLeave?: (options: { event: Event, node: any }) => void,
+        /** drop 触发时调用*/
+        onDrop?: (options: { event: Event, node: any, dragNode: any, dragNodesKeys: any }) => void,
+    }
+    /**
+     * #Tree
+     * 文件夹、组织架构、生物分类、国家地区等等，世间万物的大多数结构都是树形结构。使用`树控件`可以完整展现其中的层级关系，并具有展开收起选择等交互功能。
+    */
+    export class Tree extends React.Component<TreeProps, {}> {
+        static TreeNode: typeof TreeNode
+        render(): JSX.Element
+    }
+
+
+
+
+
+    // TreeSelect
+    interface TreeSelectTreeNodeProps {
+        disabled?: boolean,
+        /** 此项必须设置（其值在整个树范围内唯一）*/
+        key: string,
+        /** 默认根据此属性值进行筛选*/
+        value?: string,
+        /** 树节点显示的内容*/
+        title?: React.ReactNode | string,
+        /** 是否是叶子节点*/
+        isLeaf?: boolean
+    }
+    export class TreeSelectTreeNode extends React.Component<TreeSelectTreeNodeProps, {}> {
+        render(): JSX.Element
+    }
+
+    type TreeData = Array<{ value: any, label: string, children: TreeData }>
+    interface TreeSelectProps {
+        style?: Object,
+        /** 指定当前选中的条目*/
+        value?: string | Array<any>,
+        /** 指定默认选中的条目*/
+        defaultValue?: string | Array<any>,
+        /** 支持多选*/
+        multiple?: boolean,
+        /** 可以把随意输入的条目作为 tag，输入项不需要与下拉选项匹配*/
+        tags?: boolean,
+        /** 被选中时调用，参数为选中项的 value 值*/
+        onSelect?: (value: any) => void,
+        /** 选中option，或input的value变化(combobox 模式下)时，调用此函数*/
+        onChange?: (value: any, label: any) => void,
+        /** 显示清除按钮*/
+        allowClear?: boolean,
+        /** 文本框值变化时回调*/
+        onSearch?: (value: any) => void,
+        /** 选择框默认文字*/
+        placeholder?: string,
+        /** 搜索框默认文字*/
+        searchPlaceholder?: string,
+        /** 下拉菜单的样式*/
+        dropdownStyle?: Object,
+        /** 下拉菜单和选择器同宽*/
+        dropdownMatchSelectWidth?: boolean,
+        /** 输入框自动提示模式*/
+        combobox?: boolean,
+        /** 选择框大小，可选 `large` `small`*/
+        size?: string,
+        /** 在下拉中显示搜索框*/
+        showSearch?: boolean,
+        /** 是否禁用*/
+        disabled?: boolean,
+        /** 默认展开所有树节点*/
+        treeDefaultExpandAll?: boolean,
+        /** 显示checkbox*/
+        treeCheckable?: boolean,
+        /** 是否根据输入项进行筛选，返回值true*/
+        filterTreeNode?: (treeNode: any) => boolean,
+        /**  输入项过滤对应的 treeNode 属性*/
+        treeNodeFilterProp?: string,
+        /** 作为显示的prop设置*/
+        treeNodeLabelProp?: string,
+        /** treeNodes数据，如果设置则不需要手动构造TreeNode节点（如果value在整个树范围内不唯一，需要设置`key`其值为整个树范围内的唯一id*/
+        treeData?: TreeData,
+        /** 异步加载数据*/
+        loadData?: (node: any) => void
+    }
+    /**
+     * #TreeSelect
+    树型选择控件。
+    
+    ## 何时使用
+    
+    类似 Select 的选择控件，可选择的数据结构是一个树形结构时，可以使用 TreeSelect，例如公司层级、学科系统、分类目录等等。
+    */
+    export class TreeSelect extends React.Component<TreeSelectProps, {}> {
+        static TreeNode: typeof TreeSelectTreeNode
+        render(): JSX.Element
+    }
+
+
+
+
+
+
+    // Upload
+    interface UploadProps {
+        /** 可选参数, 上传的文件  */
+        name?: string,
+        /** 必选参数, 上传的地址   */
+        action: string,
+        /** 可选参数, 上传所需参数    */
+        data?: Object,
+        /** 可选参数, 设置上传的请求头部，IE10 以上有效*/
+        headers?: Object,
+        /** 可选参数, 是否展示 uploadList, 默认开启     */
+        showUploadList?: boolean,
+        /** 可选参数, 是否支持多选文件，`ie10+` 支持。开启后按住 ctrl 可选择多个文件。*/
+        multiple?: boolean,
+        /** 可选参数, 接受上传的文件类型, 详见 input accept Attribute */
+        accept?: string,
+        /** 可选参数, 上传文件之前的钩子，参数为上传的文件，若返回 `false` 或者 Promise 则停止上传。**注意：该方法不支持老 IE**。*/
+        beforeUpload?: Function,
+        /** 可选参数, 上传文件改变时的状态，详见 onChange   */
+        onChange?: (info: Object) => void,
+        /** 上传列表的内建样式，支持两种基本样式 `text` or `picture`   */
+        listType?: string,
+        /** 自定义类名*/
+        className?: string
+
+    }
+    /**
+     * #Upload
+    文件选择上传和拖拽上传控件。
+    
+    ## 何时使用
+    
+    上传是将信息（网页、文字、图片、视频等）通过网页或者上传工具发布到远程服务器上的过程。
+    
+    - 当需要上传一个或一些文件时。
+    - 当需要展现上传的进度时。
+    - 当需要使用拖拽交互时。*/
+    export class Upload extends React.Component<UploadProps, {}> {
+        render(): JSX.Element
+    }
+
+
+
+
+
+
+}
+
+
+// export all antd
+declare module 'antd' {
+    export = Antd
+}
+// single export point
+declare module 'antd/lib/Affix' {
+    export default Antd.Affix
+}
+declare module 'antd/lib/Button' {
+    export default Antd.Button
+}
+declare module 'antd/lib/Alert' {
+    export default Antd.Alert
+}
+declare module 'antd/lib/Badge' {
+    export default Antd.Badge
+}
+declare module 'antd/lib/Breadcrumb' {
+    export default Antd.Breadcrumb
+}
+declare module 'antd/lib/Calendar' {
+    export default Antd.Calendar
+}
+declare module 'antd/lib/Carousel' {
+    export default Antd.Carousel
+}
+declare module 'antd/lib/Cascader' {
+    export default Antd.Cascader
+}
+declare module 'antd/lib/Checkbox' {
+    export default Antd.Checkbox
+}
+declare module 'antd/lib/Collapse' {
+    export default Antd.Collapse
+}
+declare module 'antd/lib/DatePicker' {
+    export default Antd.DatePicker
+}
+declare module 'antd/lib/Dropdown' {
+    export default Antd.Dropdown
+}
+declare module 'antd/lib/Icon' {
+    export default Antd.Icon
+}
+declare module 'antd/lib/Form' {
+    export default Antd.Form
+}
+declare module 'antd/lib/Input' {
+    export default Antd.Input
+}
+declare module 'antd/lib/InputNumber' {
+    export default Antd.InputNumber
+}
+declare module 'antd/lib/Row' {
+    export default Antd.Row
+}
+declare module 'antd/lib/Col' {
+    export default Antd.Col
+}
+declare module 'antd/lib/Menu' {
+    export default Antd.Menu
+}
+declare module 'antd/lib/message' {
+    export default Antd.message
+}
+declare module 'antd/lib/Modal' {
+    export default Antd.Modal
+}
+declare module 'antd/lib/notification' {
+    export default Antd.notification
+}
+declare module 'antd/lib/Pagination' {
+    export default Antd.Pagination
+}
+declare module 'antd/lib/Popconfirm' {
+    export default Antd.Popconfirm
+}
+declare module 'antd/lib/Popover' {
+    export default Antd.Popover
+}
+declare module 'antd/lib/Progress' {
+    export default Antd.Progress
+}
+declare module 'antd/lib/QueueAnim' {
+    export default Antd.QueueAnim
+}
+declare module 'antd/lib/Radio' {
+    export default Antd.Radio
+}
+declare module 'antd/lib/Select' {
+    export default Antd.Select
+}
+declare module 'antd/lib/Slider' {
+    export default Antd.Slider
+}
+declare module 'antd/lib/Spin' {
+    export default Antd.Spin
+}
+declare module 'antd/lib/Steps' {
+    export default Antd.Steps
+}
+declare module 'antd/lib/Switch' {
+    export default Antd.Switch
+}
+declare module 'antd/lib/Table' {
+    export default Antd.Table
+}
+declare module 'antd/lib/Tabs' {
+    export default Antd.Tabs
+}
+declare module 'antd/lib/Tag' {
+    export default Antd.Tag
+}
+declare module 'antd/lib/TimePicker' {
+    export default Antd.TimePicker
+}
+declare module 'antd/lib/Timeline' {
+    export default Antd.Timeline
+}
+declare module 'antd/lib/Tooltip' {
+    export default Antd.Tooltip
+}
+declare module 'antd/lib/Transfer' {
+    export default Antd.Transfer
+}
+declare module 'antd/lib/Tree' {
+    export default Antd.Tree
+}
+declare module 'antd/lib/TreeSelect' {
+    export default Antd.TreeSelect
+}
+declare module 'antd/lib/Upload' {
+    export default Antd.Upload
+}
diff --git a/antd/tsconfig.json b/antd/tsconfig.json
new file mode 100644
index 0000000000..197d812c22
--- /dev/null
+++ b/antd/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "antd-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/any-db-transaction/any-db-transaction-tests.ts b/any-db-transaction/any-db-transaction-tests.ts
index 8e38fe5a3c..8e96f43883 100644
--- a/any-db-transaction/any-db-transaction-tests.ts
+++ b/any-db-transaction/any-db-transaction-tests.ts
@@ -1,7 +1,3 @@
-
-/// <reference path="../any-db/any-db.d.ts" />
-/// <reference path="any-db-transaction.d.ts" />
-
 "use strict";
 
 import anyDB = require("any-db");
diff --git a/any-db-transaction/any-db-transaction.d.ts b/any-db-transaction/any-db-transaction.d.ts
deleted file mode 100644
index 675f18e9cc..0000000000
--- a/any-db-transaction/any-db-transaction.d.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-// Type definitions for any-db-transaction 2.2.1
-// Project: https://github.com/grncdr/node-any-db-transaction
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../any-db/any-db.d.ts" />
-
-declare module "any-db-transaction" {
-    import anyDB = require("any-db");
-
-	namespace begin {
-		/**
-		 * Transaction objects are are simple wrappers around a Connection that also implement the Queryable API,
-		 * but guarantee that all queries take place within a single database transaction or not at all. Note that
-		 * begin also understands how to acquire (and release) a connection from a ConnectionPool as well, so you
-		 * can simply pass a pool to it: var tx = begin(pool)
-		 *
-		 * By default, any queries that error during a transaction will cause an automatic rollback. If a query has
-		 * no callback, the transaction will also handle (and re-emit) 'error' events for the Query instance.
-		 * This enables handling errors for an entire transaction in a single place.
-		 *
-		 * Transactions may also be nested by passing a Transaction to begin and these nested transactions can
-		 * safely error and rollback without rolling back their parent transaction
-		 *
-		 * Transaction events:
-		 * 'query', query - emitted immediately after .query is called on a connection via tx.query. The argument is a query object.
-		 * 'commit:start' - Emitted when .commit() is called.
-		 * 'commit:complete' - Emitted after the transaction has committed.
-		 * 'rollback:start' - Emitted when .rollback() is called.
-		 * 'rollback:complete' - Emitted after the transaction has rolled back.
-		 * 'close' - Emitted after rollback or commit completes.
-		 * 'error', err - Emitted under three conditions:
-		 * There was an error acquiring a connection.
-		 * Any query performed in this transaction emits an error that would otherwise go unhandled.
-		 * Any of query, begin, commit, or rollback are called after the connection has already been committed or rolled back.
-		 * Note that the 'error' event may be emitted multiple times! depending on the callback you are registering, you way want to wrap it using [once][].
-		 */
-		interface Transaction extends anyDB.Queryable {
-
-			/**
-			 * Issue a COMMIT (or RELEASE ... in the case of nested transactions) statement to the database.
-			 * If a continuation is provided it will be called (possibly with an error) after the COMMIT
-			 * statement completes. The transaction object itself will be unusable after calling commit().
-			 */
-			commit(callback?: (error: Error) => void): void;
-
-			/**
-			 * The same as Transaction.commit but issues a ROLLBACK. Again, the transaction will be unusable after calling this method.
-			 */
-			rollback(callback?: (error: Error) => void): void;
-		}
-
-		interface TransactionOptions {
-			/**
-			 * Adapter name e.g. 'mysql'
-			 */
-			adapter?: anyDB.Adapter;
-			/**
-			 * SQL statement for beginning a transaction, default 'BEGIN'
-			 */
-			begin?: string;
-			/**
-			 * SQL statement for committing a transaction, default 'COMMIT'
-			 */
-			commit?: string;
-			/**
-			 * SQL statement for rolling back a transaction, default 'ROLLBACK'
-			 */
-			rollback?: string;
-			/**
-			 * Callback for transaction
-			 */
-			callback?: (error: Error, transaction: Transaction) => void;
-			/**
-			 * Rollback automatically on error, default true
-			 */
-			autoRollback?: boolean;
-		}
-	}
-
-	/**
-	 * Start a transaction
-	 */
-	function begin(q: anyDB.Queryable, options?: begin.TransactionOptions, callback?: (error: Error, transaction: begin.Transaction) => void): begin.Transaction;
-	function begin(q: anyDB.Queryable, callback?: (error: Error, transaction: begin.Transaction) => void): begin.Transaction;
-	function begin(q: anyDB.Queryable, beginStatement?: string, callback?: (error: Error, transaction: begin.Transaction) => void): begin.Transaction;
-	function begin(q: anyDB.Queryable, options?: begin.TransactionOptions, beginStatement?: string, callback?: (error: Error, transaction: begin.Transaction) => void): begin.Transaction;
-
-	export = begin;
-}
-
-
-
diff --git a/any-db-transaction/index.d.ts b/any-db-transaction/index.d.ts
new file mode 100644
index 0000000000..8428e7640f
--- /dev/null
+++ b/any-db-transaction/index.d.ts
@@ -0,0 +1,88 @@
+// Type definitions for any-db-transaction 2.2.1
+// Project: https://github.com/grncdr/node-any-db-transaction
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import anyDB = require("any-db");
+
+declare namespace begin {
+    /**
+     * Transaction objects are are simple wrappers around a Connection that also implement the Queryable API,
+     * but guarantee that all queries take place within a single database transaction or not at all. Note that
+     * begin also understands how to acquire (and release) a connection from a ConnectionPool as well, so you
+     * can simply pass a pool to it: var tx = begin(pool)
+     *
+     * By default, any queries that error during a transaction will cause an automatic rollback. If a query has
+     * no callback, the transaction will also handle (and re-emit) 'error' events for the Query instance.
+     * This enables handling errors for an entire transaction in a single place.
+     *
+     * Transactions may also be nested by passing a Transaction to begin and these nested transactions can
+     * safely error and rollback without rolling back their parent transaction
+     *
+     * Transaction events:
+     * 'query', query - emitted immediately after .query is called on a connection via tx.query. The argument is a query object.
+     * 'commit:start' - Emitted when .commit() is called.
+     * 'commit:complete' - Emitted after the transaction has committed.
+     * 'rollback:start' - Emitted when .rollback() is called.
+     * 'rollback:complete' - Emitted after the transaction has rolled back.
+     * 'close' - Emitted after rollback or commit completes.
+     * 'error', err - Emitted under three conditions:
+     * There was an error acquiring a connection.
+     * Any query performed in this transaction emits an error that would otherwise go unhandled.
+     * Any of query, begin, commit, or rollback are called after the connection has already been committed or rolled back.
+     * Note that the 'error' event may be emitted multiple times! depending on the callback you are registering, you way want to wrap it using [once][].
+     */
+    interface Transaction extends anyDB.Queryable {
+
+        /**
+         * Issue a COMMIT (or RELEASE ... in the case of nested transactions) statement to the database.
+         * If a continuation is provided it will be called (possibly with an error) after the COMMIT
+         * statement completes. The transaction object itself will be unusable after calling commit().
+         */
+        commit(callback?: (error: Error) => void): void;
+
+        /**
+         * The same as Transaction.commit but issues a ROLLBACK. Again, the transaction will be unusable after calling this method.
+         */
+        rollback(callback?: (error: Error) => void): void;
+    }
+
+    interface TransactionOptions {
+        /**
+         * Adapter name e.g. 'mysql'
+         */
+        adapter?: anyDB.Adapter;
+        /**
+         * SQL statement for beginning a transaction, default 'BEGIN'
+         */
+        begin?: string;
+        /**
+         * SQL statement for committing a transaction, default 'COMMIT'
+         */
+        commit?: string;
+        /**
+         * SQL statement for rolling back a transaction, default 'ROLLBACK'
+         */
+        rollback?: string;
+        /**
+         * Callback for transaction
+         */
+        callback?: (error: Error, transaction: Transaction) => void;
+        /**
+         * Rollback automatically on error, default true
+         */
+        autoRollback?: boolean;
+    }
+}
+
+/**
+ * Start a transaction
+ */
+declare function begin(q: anyDB.Queryable, options?: begin.TransactionOptions, callback?: (error: Error, transaction: begin.Transaction) => void): begin.Transaction;
+declare function begin(q: anyDB.Queryable, callback?: (error: Error, transaction: begin.Transaction) => void): begin.Transaction;
+declare function begin(q: anyDB.Queryable, beginStatement?: string, callback?: (error: Error, transaction: begin.Transaction) => void): begin.Transaction;
+declare function begin(q: anyDB.Queryable, options?: begin.TransactionOptions, beginStatement?: string, callback?: (error: Error, transaction: begin.Transaction) => void): begin.Transaction;
+
+export = begin;
diff --git a/any-db-transaction/tsconfig.json b/any-db-transaction/tsconfig.json
new file mode 100644
index 0000000000..312f073285
--- /dev/null
+++ b/any-db-transaction/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "any-db-transaction-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/any-db/any-db-tests.ts b/any-db/any-db-tests.ts
index 41744c452c..ca173cc4d2 100644
--- a/any-db/any-db-tests.ts
+++ b/any-db/any-db-tests.ts
@@ -1,5 +1,4 @@
 
-/// <reference path="any-db.d.ts" />
 
 "use strict";
 
diff --git a/any-db/any-db.d.ts b/any-db/any-db.d.ts
deleted file mode 100644
index 8a64b6f323..0000000000
--- a/any-db/any-db.d.ts
+++ /dev/null
@@ -1,303 +0,0 @@
-// Type definitions for any-db 2.1.0
-// Project: https://github.com/grncdr/node-any-db
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "any-db" {
-    import events = require("events");
-	import stream = require("stream");
-
-	export interface ConnectOpts {
-		adapter: string;
-	}
-
-	export interface Adapter {
-		name: string;
-		/**
-		 * Create a new connection object. In common usage, config will be created by parse-db-url and passed to the adapter by any-db.
-		 * If a continuation is given, it must be called, either with an error or the established connection.
-		 */
-		createConnection(opts: ConnectOpts, callback?: (error: Error, result: Connection) => void): Connection;
-
-		/**
-		 * Create a Query that may eventually be executed later on by a Connection. While this function is rarely needed by user code,
-		 * it makes it possible for ConnectionPool.query and Transaction.query to fulfill the Queryable.query contract
-		 * by synchronously returning a Query stream
-		 */
-		createQuery(text: string, params?: any[], callback?: (error: Error, result: ResultSet) => void): Query;
-		createQuery(query: Query): Query;
-	}
-	/**
-	 * Other properties are driver specific
-	 */
-	export interface Field {
-		name: string;
-	}
-
-	/**
-	 * ResultSet objects are just plain data that collect results of a query when a continuation
-	 * is provided to Queryable.query. The lastInsertId is optional, and currently supported by
-	 * sqlite3 and mysql but not postgres, because it is not supported by Postgres itself.
-	 */
-	export interface ResultSet {
-		/**
-		 * Affected rows. Note e.g. for INSERT queries the rows property is not filled even
-		 * though rowCount is non-zero.
-		 */
-		rowCount: number;
-		/**
-		 * Result rows
-		 */
-		rows: any[];
-		/**
-		 * Result field descriptions
-		 */
-		fields: Field[];
-
-		/**
-		 * Not supported by all drivers.
-		 */
-		fieldCount?: number;
-		/**
-		 * Not supported by all drivers.
-		 */
-		lastInsertId?: any;
-		/**
-		 * Not supported by all drivers.
-		 */
-		affectedRows?: number;
-		/**
-		 * Not supported by all drivers.
-		 */
-		changedRows?: number;
-	}
-
-	/**
-	 * Query objects are returned by the Queryable.query method, available on connections,
-	 * pools, and transactions. Queries are instances of Readable, and as such can be piped
-	 * through transforms and support backpressure for more efficient memory-usage on very
-	 * large results sets. (Note: at this time the sqlite3 driver does not support backpressure)
-	 *
-	 * Internally, Query instances are created by a database Adapter and may have more methods,
-	 * properties, and events than are described here. Consult the documentation for your
-	 * specific adapter to find out about any extensions.
-	 *
-	 * Events:
-	 *
-	 * Error event
-	 * The 'error' event is emitted at most once per query. Note that this event will be
-	 * emitted for errors even if a callback was provided, the callback will
-	 * simply be subscribed to the 'error' event.
-	 * One argument is passed to event listeners:
-	 * error - the error object.
-	 *
-	 * Fields event
-	 * A 'fields' event is emmitted before any 'data' events.
-	 * One argument is passed to event listeners:
-	 * fields - an array of [Field][ResultSet] objects.
-	 *
-	 * The following events are part of the stream.Readable interface which is implemented by Query:
-	 *
-	 * Data event
-	 * A 'data' event is emitted for each row in the query result set.
-	 * One argument is passed to event listeners:
-	 * row contains the contents of a single row in the query result
-	 *
-	 * Close event
-	 * A 'close' event is emitted when the query completes.
-	 * No arguments are passed to event listeners.
-	 *
-	 * End event
-	 * An 'end' event is emitted after all query results have been consumed.
-	 * No arguments are passed to event listeners.
-	 */
-	export interface Query extends stream.Readable {
-		/**
-		 * The SQL query as a string. If you are using MySQL this will contain
-		 * interpolated values after the query has been enqueued by a connection.
-		 */
-		text: string;
-
-		/**
-		 * The array of parameter values.
-		 */
-		values: any[];
-
-		/**
-		 * The callback (if any) that was provided to Queryable.query. Note that
-		 * Query objects must not use a closed over reference to their callback,
-		 * as other any-db libraries may rely on modifying the callback property
-		 * of a Query they did not create.
-		 */
-		callback: (error: Error, results: ResultSet) => void;
-	}
-
-	/**
-	 * Events:
-	 * The 'query' event is emitted immediately before a query is executed. One argument is passed to event handlers:
-	 * - query:	a Query object
-	 */
-	export interface Queryable extends events.EventEmitter {
-		/**
-		 * The Adapter instance that will be used by this Queryable for creating Query instances and/or connections.
-		 */
-		adapter:  Adapter;
-
-		/**
-		 * Execute a SQL statement using bound parameters (if they are provided) and return a Query object
-		 * that is a Readable stream of the resulting rows. If a Continuation<ResultSet> is provided the rows
-		 * returned by the database will be aggregated into a [ResultSet][] which will be passed to the
-		 * continuation after the query has completed.
-		 * The second form is not needed for normal use, but must be implemented by adapters to work correctly
-		 * with ConnectionPool and Transaction. See Adapter.createQuery for more details.
-		 */
-		query(text: string, params?: any[], callback?: (error: Error, results: ResultSet) => void): Query
-
-		/**
-		 * The second form is not needed for normal use, but must be implemented by adapters to work correctly
-		 * with ConnectionPool and Transaction. See Adapter.createQuery for more details.
-		 */
-		// query(query: Query): Query;
-	}
-
-	/**
-	 * Connection objects are obtained using createConnection from Any-DB or ConnectionPool.acquire,
-	 * both of which delegate to the createConnection implementation of the specified adapter.
-	 * While all Connection objects implement the Queryable interface, the implementations in
-	 * each adapter may add additional methods or emit additional events. If you need to access a
-	 * feature of your database that is not  described here (such as Postgres' server-side prepared
-	 * statements), consult the documentation for your adapter.
-	 *
-	 * Events:
-	 * Error event
-	 * The 'error' event is emitted when there is a connection-level error.
-	 * No arguments are passed to event listeners.
-	 *
-	 * Open event
-	 * The 'open' event is emitted when the connection has been established and is ready to query.
-	 * No arguments are passed to event listeners.
-	 *
-	 * Close event
-	 * The 'close' event is emitted when the connection has been closed.
-	 * No arguments are passed to event listeners.
-	 */
-	export interface Connection extends Queryable {
-		/**
-		 * Close the database connection. If a continuation is provided it
-		 * will be called after the connection has closed.
-		 */
-		end(callback?: (error: Error) => void): void;
-	}
-
-	export interface ConnectionStatic {
-		new(): Connection;
-
-		name: string;
-		createConnection(): void;
-		createPool(): void;
-	}
-
-	/**
-	 * ConnectionPool events
-	 * 'acquire' - emitted whenever pool.acquire is called
-	 * 'release' - emitted whenever pool.release is called
-	 * 'query', query - emitted immediately after .query is called on a
-	 * 		connection via pool.query. The argument is a Query object.
-	 * 'close' - emitted when the connection pool has closed all of it
-	 * 		connections after a call to close().
-	 */
-	export interface ConnectionPool extends Queryable {
-		/**
-		 * Implements Queryable.query by automatically acquiring a connection
-		 * and releasing it when the query completes.
-		 */
-		query(text: string, params?: any[], callback?: (error: Error, results: ResultSet) => void): Query;
-
-		/**
-		 * Remove a connection from the pool. If you use this method you must
-		 * return the connection back to the pool using ConnectionPool.release
-		 */
-		acquire(callback: (error: Error, result: Connection) => void): void;
-
-		/**
-		 * Return a connection to the pool. This should only be called with connections
-		 * you've manually acquired. You must not continue to use the connection after releasing it.
-		 */
-		release(connection: Connection): void;
-
-		/**
-		 * Stop giving out new connections, and close all existing database connections as they
-		 * are returned to the pool.
-		 */
-		close(callback?: (error: Error) => void): void;
-	}
-
-	/**
-	 * A PoolConfig is generally a plain object with any of the following properties (they are all optional):
-	 */
-	export interface PoolConfig {
-		/**
-		 * min (default 0) The minimum number of connections to keep open in the pool.
-		 */
-		min?: number;
-		/**
-		 * max (default 10) The maximum number of connections to keep open in the pool.
-		 * When this limit is reached further requests for connections will queue waiting
-		 * for an existing connection to be released back into the pool.
-		 */
-		max?: number;
-		/**
-		 * (default 30000) The maximum amount of time a connection can sit idle in the pool before being reaped
-		 */
-		idleTimeout?: number;
-		/**
-		 *  (default 1000) How frequently the pool should check for connections that are old enough to be reaped.
-		 */
-		reapInterval?: number;
-		/**
-		 * (default true) When this is true, the pool will reap connections that
-		 * have been idle for more than idleTimeout milliseconds.
-		 */
-		refreshIdle?: boolean;
-		/**
-		 * Called immediately after a connection is first established. Use this to do one-time setup of new connections.
-		 * The supplied Connection will not be added to the pool until you pass it to the done continuation.
-		 */
-		onConnect?: (connection: Connection, ready: (error: Error, result: Connection) => void) => void;
-		/**
-		 * Called each time a connection is returned to the pool. Use this to restore a connection to
-		 * it's original state (e.g. rollback transactions, set the database session vars). If reset
-		 * fails to call the done continuation the connection will be lost in limbo.
-		 */
-		reset?: (connection: Connection, done: (error: Error) => void) => void;
-		/**
-		 * (default function (err) { return true }) - Called when an error is encountered
-		 * by pool.query or emitted by an idle connection. If shouldDestroyConnection(error)
-		 * is truthy the connection will be destroyed, otherwise it will be reset.
-		 */
-		shouldDestroyConnection?: (error: Error) => boolean;
-	}
-
-	/**
-	 * Create a database connection.
-	 * @param url	String of the form adapter://user:password@host/database
-	 * @param callback
-	 * @returns	Connection object.
-	 */
-	export function createConnection(url: string, callback?: (error: Error, connection: Connection) => void): Connection;
-
-	/**
-	 * Create a database connection.
-	 * @param opts	Object with adapter name and any properties that the given adapter requires
-	 * @param callback
-	 * @returns	Connection object.
-	 */
-	export function createConnection(opts: ConnectOpts, callback?: (error: Error, connection: Connection) => void): Connection;
-
-
-	export function createPool(url: string, config: PoolConfig): ConnectionPool;
-	export function createPool(opts: ConnectOpts, config: PoolConfig): ConnectionPool;
-
-}
diff --git a/any-db/index.d.ts b/any-db/index.d.ts
new file mode 100644
index 0000000000..47265e1f53
--- /dev/null
+++ b/any-db/index.d.ts
@@ -0,0 +1,301 @@
+// Type definitions for any-db 2.1.0
+// Project: https://github.com/grncdr/node-any-db
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import events = require("events");
+import stream = require("stream");
+
+export interface ConnectOpts {
+    adapter: string;
+}
+
+export interface Adapter {
+    name: string;
+    /**
+     * Create a new connection object. In common usage, config will be created by parse-db-url and passed to the adapter by any-db.
+     * If a continuation is given, it must be called, either with an error or the established connection.
+     */
+    createConnection(opts: ConnectOpts, callback?: (error: Error, result: Connection) => void): Connection;
+
+    /**
+     * Create a Query that may eventually be executed later on by a Connection. While this function is rarely needed by user code,
+     * it makes it possible for ConnectionPool.query and Transaction.query to fulfill the Queryable.query contract
+     * by synchronously returning a Query stream
+     */
+    createQuery(text: string, params?: any[], callback?: (error: Error, result: ResultSet) => void): Query;
+    createQuery(query: Query): Query;
+}
+/**
+ * Other properties are driver specific
+ */
+export interface Field {
+    name: string;
+}
+
+/**
+ * ResultSet objects are just plain data that collect results of a query when a continuation
+ * is provided to Queryable.query. The lastInsertId is optional, and currently supported by
+ * sqlite3 and mysql but not postgres, because it is not supported by Postgres itself.
+ */
+export interface ResultSet {
+    /**
+     * Affected rows. Note e.g. for INSERT queries the rows property is not filled even
+     * though rowCount is non-zero.
+     */
+    rowCount: number;
+    /**
+     * Result rows
+     */
+    rows: any[];
+    /**
+     * Result field descriptions
+     */
+    fields: Field[];
+
+    /**
+     * Not supported by all drivers.
+     */
+    fieldCount?: number;
+    /**
+     * Not supported by all drivers.
+     */
+    lastInsertId?: any;
+    /**
+     * Not supported by all drivers.
+     */
+    affectedRows?: number;
+    /**
+     * Not supported by all drivers.
+     */
+    changedRows?: number;
+}
+
+/**
+ * Query objects are returned by the Queryable.query method, available on connections,
+ * pools, and transactions. Queries are instances of Readable, and as such can be piped
+ * through transforms and support backpressure for more efficient memory-usage on very
+ * large results sets. (Note: at this time the sqlite3 driver does not support backpressure)
+ *
+ * Internally, Query instances are created by a database Adapter and may have more methods,
+ * properties, and events than are described here. Consult the documentation for your
+ * specific adapter to find out about any extensions.
+ *
+ * Events:
+ *
+ * Error event
+ * The 'error' event is emitted at most once per query. Note that this event will be
+ * emitted for errors even if a callback was provided, the callback will
+ * simply be subscribed to the 'error' event.
+ * One argument is passed to event listeners:
+ * error - the error object.
+ *
+ * Fields event
+ * A 'fields' event is emmitted before any 'data' events.
+ * One argument is passed to event listeners:
+ * fields - an array of [Field][ResultSet] objects.
+ *
+ * The following events are part of the stream.Readable interface which is implemented by Query:
+ *
+ * Data event
+ * A 'data' event is emitted for each row in the query result set.
+ * One argument is passed to event listeners:
+ * row contains the contents of a single row in the query result
+ *
+ * Close event
+ * A 'close' event is emitted when the query completes.
+ * No arguments are passed to event listeners.
+ *
+ * End event
+ * An 'end' event is emitted after all query results have been consumed.
+ * No arguments are passed to event listeners.
+ */
+export interface Query extends stream.Readable {
+    /**
+     * The SQL query as a string. If you are using MySQL this will contain
+     * interpolated values after the query has been enqueued by a connection.
+     */
+    text: string;
+
+    /**
+     * The array of parameter values.
+     */
+    values: any[];
+
+    /**
+     * The callback (if any) that was provided to Queryable.query. Note that
+     * Query objects must not use a closed over reference to their callback,
+     * as other any-db libraries may rely on modifying the callback property
+     * of a Query they did not create.
+     */
+    callback: (error: Error, results: ResultSet) => void;
+}
+
+/**
+ * Events:
+ * The 'query' event is emitted immediately before a query is executed. One argument is passed to event handlers:
+ * - query:	a Query object
+ */
+export interface Queryable extends events.EventEmitter {
+    /**
+     * The Adapter instance that will be used by this Queryable for creating Query instances and/or connections.
+     */
+    adapter: Adapter;
+
+    /**
+     * Execute a SQL statement using bound parameters (if they are provided) and return a Query object
+     * that is a Readable stream of the resulting rows. If a Continuation<ResultSet> is provided the rows
+     * returned by the database will be aggregated into a [ResultSet][] which will be passed to the
+     * continuation after the query has completed.
+     * The second form is not needed for normal use, but must be implemented by adapters to work correctly
+     * with ConnectionPool and Transaction. See Adapter.createQuery for more details.
+     */
+    query(text: string, params?: any[], callback?: (error: Error, results: ResultSet) => void): Query
+
+    /**
+     * The second form is not needed for normal use, but must be implemented by adapters to work correctly
+     * with ConnectionPool and Transaction. See Adapter.createQuery for more details.
+     */
+    // query(query: Query): Query;
+}
+
+/**
+ * Connection objects are obtained using createConnection from Any-DB or ConnectionPool.acquire,
+ * both of which delegate to the createConnection implementation of the specified adapter.
+ * While all Connection objects implement the Queryable interface, the implementations in
+ * each adapter may add additional methods or emit additional events. If you need to access a
+ * feature of your database that is not  described here (such as Postgres' server-side prepared
+ * statements), consult the documentation for your adapter.
+ *
+ * Events:
+ * Error event
+ * The 'error' event is emitted when there is a connection-level error.
+ * No arguments are passed to event listeners.
+ *
+ * Open event
+ * The 'open' event is emitted when the connection has been established and is ready to query.
+ * No arguments are passed to event listeners.
+ *
+ * Close event
+ * The 'close' event is emitted when the connection has been closed.
+ * No arguments are passed to event listeners.
+ */
+export interface Connection extends Queryable {
+    /**
+     * Close the database connection. If a continuation is provided it
+     * will be called after the connection has closed.
+     */
+    end(callback?: (error: Error) => void): void;
+}
+
+export interface ConnectionStatic {
+    new (): Connection;
+
+    name: string;
+    createConnection(): void;
+    createPool(): void;
+}
+
+/**
+ * ConnectionPool events
+ * 'acquire' - emitted whenever pool.acquire is called
+ * 'release' - emitted whenever pool.release is called
+ * 'query', query - emitted immediately after .query is called on a
+ * 		connection via pool.query. The argument is a Query object.
+ * 'close' - emitted when the connection pool has closed all of it
+ * 		connections after a call to close().
+ */
+export interface ConnectionPool extends Queryable {
+    /**
+     * Implements Queryable.query by automatically acquiring a connection
+     * and releasing it when the query completes.
+     */
+    query(text: string, params?: any[], callback?: (error: Error, results: ResultSet) => void): Query;
+
+    /**
+     * Remove a connection from the pool. If you use this method you must
+     * return the connection back to the pool using ConnectionPool.release
+     */
+    acquire(callback: (error: Error, result: Connection) => void): void;
+
+    /**
+     * Return a connection to the pool. This should only be called with connections
+     * you've manually acquired. You must not continue to use the connection after releasing it.
+     */
+    release(connection: Connection): void;
+
+    /**
+     * Stop giving out new connections, and close all existing database connections as they
+     * are returned to the pool.
+     */
+    close(callback?: (error: Error) => void): void;
+}
+
+/**
+ * A PoolConfig is generally a plain object with any of the following properties (they are all optional):
+ */
+export interface PoolConfig {
+    /**
+     * min (default 0) The minimum number of connections to keep open in the pool.
+     */
+    min?: number;
+    /**
+     * max (default 10) The maximum number of connections to keep open in the pool.
+     * When this limit is reached further requests for connections will queue waiting
+     * for an existing connection to be released back into the pool.
+     */
+    max?: number;
+    /**
+     * (default 30000) The maximum amount of time a connection can sit idle in the pool before being reaped
+     */
+    idleTimeout?: number;
+    /**
+     *  (default 1000) How frequently the pool should check for connections that are old enough to be reaped.
+     */
+    reapInterval?: number;
+    /**
+     * (default true) When this is true, the pool will reap connections that
+     * have been idle for more than idleTimeout milliseconds.
+     */
+    refreshIdle?: boolean;
+    /**
+     * Called immediately after a connection is first established. Use this to do one-time setup of new connections.
+     * The supplied Connection will not be added to the pool until you pass it to the done continuation.
+     */
+    onConnect?: (connection: Connection, ready: (error: Error, result: Connection) => void) => void;
+    /**
+     * Called each time a connection is returned to the pool. Use this to restore a connection to
+     * it's original state (e.g. rollback transactions, set the database session vars). If reset
+     * fails to call the done continuation the connection will be lost in limbo.
+     */
+    reset?: (connection: Connection, done: (error: Error) => void) => void;
+    /**
+     * (default function (err) { return true }) - Called when an error is encountered
+     * by pool.query or emitted by an idle connection. If shouldDestroyConnection(error)
+     * is truthy the connection will be destroyed, otherwise it will be reset.
+     */
+    shouldDestroyConnection?: (error: Error) => boolean;
+}
+
+/**
+ * Create a database connection.
+ * @param url	String of the form adapter://user:password@host/database
+ * @param callback
+ * @returns	Connection object.
+ */
+export declare function createConnection(url: string, callback?: (error: Error, connection: Connection) => void): Connection;
+
+/**
+ * Create a database connection.
+ * @param opts	Object with adapter name and any properties that the given adapter requires
+ * @param callback
+ * @returns	Connection object.
+ */
+export declare function createConnection(opts: ConnectOpts, callback?: (error: Error, connection: Connection) => void): Connection;
+
+
+export declare function createPool(url: string, config: PoolConfig): ConnectionPool;
+export declare function createPool(opts: ConnectOpts, config: PoolConfig): ConnectionPool;
diff --git a/any-db/tsconfig.json b/any-db/tsconfig.json
new file mode 100644
index 0000000000..80cbf86eb6
--- /dev/null
+++ b/any-db/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "any-db-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/anydb-sql-migrations/anydb-sql-migrations-tests.ts b/anydb-sql-migrations/anydb-sql-migrations-tests.ts
index f9c3da03a2..ed79ace368 100644
--- a/anydb-sql-migrations/anydb-sql-migrations-tests.ts
+++ b/anydb-sql-migrations/anydb-sql-migrations-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="../anydb-sql/anydb-sql.d.ts" />
-/// <reference path="anydb-sql-migrations" />
 import anydbsql = require('anydb-sql');
 import { Table, Column } from 'anydb-sql'
 import migrator = require('anydb-sql-migrations');
diff --git a/anydb-sql-migrations/anydb-sql-migrations.d.ts b/anydb-sql-migrations/anydb-sql-migrations.d.ts
deleted file mode 100644
index 9ab421c3ac..0000000000
--- a/anydb-sql-migrations/anydb-sql-migrations.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// Type definitions for anydb-sql-migrations
-// Project: https://github.com/spion/anydb-sql-migrations
-// Definitions by: Gorgi Kosev <https://github.com/spion>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../bluebird/bluebird.d.ts" />
-/// <reference path="../anydb-sql/anydb-sql.d.ts" />
-
-declare module "anydb-sql-migrations" {
-    import Promise = require('bluebird');
-    import { Column, Table, Transaction, AnydbSql } from 'anydb-sql';
-    export interface Migration {
-        version: string;
-    }
-    export interface MigrationsTable extends Table<Migration> {
-        version: Column<string>;
-    }
-    export interface MigFn {
-        (tx: Transaction): Promise<any>;
-    }
-    export interface MigrationTask {
-        up: MigFn;
-        down: MigFn;
-        name: string;
-    }
-    export function create(db: AnydbSql, tasks: any): {
-        run: () => Promise<any>;
-        migrateTo: (target?: string) => Promise<any>;
-        check: (f: (m: {
-            type: string;
-            items: MigrationTask[];
-        }) => any) => Promise<any>;
-    };
-}
\ No newline at end of file
diff --git a/anydb-sql-migrations/index.d.ts b/anydb-sql-migrations/index.d.ts
new file mode 100644
index 0000000000..a72271ebb5
--- /dev/null
+++ b/anydb-sql-migrations/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for anydb-sql-migrations
+// Project: https://github.com/spion/anydb-sql-migrations
+// Definitions by: Gorgi Kosev <https://github.com/spion>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="bluebird" />
+
+import Promise = require('bluebird');
+import { Column, Table, Transaction, AnydbSql } from 'anydb-sql';
+export interface Migration {
+    version: string;
+}
+export interface MigrationsTable extends Table<Migration> {
+    version: Column<string>;
+}
+export interface MigFn {
+    (tx: Transaction): Promise<any>;
+}
+export interface MigrationTask {
+    up: MigFn;
+    down: MigFn;
+    name: string;
+}
+export declare function create(db: AnydbSql, tasks: any): {
+    run: () => Promise<any>;
+    migrateTo: (target?: string) => Promise<any>;
+    check: (f: (m: {
+        type: string;
+        items: MigrationTask[];
+    }) => any) => Promise<any>;
+};
diff --git a/anydb-sql-migrations/tsconfig.json b/anydb-sql-migrations/tsconfig.json
new file mode 100644
index 0000000000..6f219e28f4
--- /dev/null
+++ b/anydb-sql-migrations/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "anydb-sql-migrations-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/anydb-sql/anydb-sql-tests.ts b/anydb-sql/anydb-sql-tests.ts
index 9e0264f7bb..745431d857 100644
--- a/anydb-sql/anydb-sql-tests.ts
+++ b/anydb-sql/anydb-sql-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="anydb-sql.d.ts" />
+
 import anydbsql = require('anydb-sql');
 import { Table, Column } from 'anydb-sql'
 
diff --git a/anydb-sql/anydb-sql.d.ts b/anydb-sql/anydb-sql.d.ts
deleted file mode 100644
index 6b5f0b2cd6..0000000000
--- a/anydb-sql/anydb-sql.d.ts
+++ /dev/null
@@ -1,190 +0,0 @@
-// Type definitions for anydb-sql
-// Project: https://github.com/doxout/anydb-sql
-// Definitions by: Gorgi Kosev <https://github.com/spion>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "anydb-sql" {
-    interface AnyDBPool extends anydbSQL.DatabaseConnection {
-        query:(text:string, values:any[], callback:(err:Error, result:any)=>void)=>void
-        begin:()=>anydbSQL.Transaction
-        close:(err:Error)=>void
-    }
-
-    interface Dictionary<T> { [key:string]:T; }
-
-    namespace anydbSQL {
-        export interface OrderByValueNode {}
-        export interface ColumnDefinition {
-            primaryKey?:boolean;
-            dataType?:string;
-            references?: {table:string; column: string}
-            notNull?:boolean
-        }
-
-        export interface TableDefinition {
-            name:string
-            columns:Dictionary<ColumnDefinition>
-            has?:Dictionary<{from:string; many?:boolean}>
-        }
-
-
-        export interface QueryLike {
-            query:string;
-            values: any[]
-            text:string
-        }
-        export interface DatabaseConnection {
-            queryAsync<T>(query:string, ...params:any[]):Promise<{rowCount:number;rows:T[]}>
-            queryAsync<T>(query:QueryLike):Promise<{rowCount:number;rows:T[]}>
-        }
-
-        export interface Transaction extends DatabaseConnection {
-            rollback():void
-            commitAsync():Promise<void>
-        }
-
-        export interface SubQuery<T> {
-            select(node:Column<T>):SubQuery<T>
-            where(...nodes:any[]):SubQuery<T>
-            from(table:TableNode):SubQuery<T>
-            group(...nodes:any[]):SubQuery<T>
-            order(criteria:OrderByValueNode):SubQuery<T>
-            notExists(subQuery:SubQuery<any>):SubQuery<T>
-        }
-
-        interface Executable<T> {
-            get():Promise<T>
-            getWithin(tx:DatabaseConnection):Promise<T>
-            exec():Promise<void>
-            all():Promise<T[]>
-            execWithin(tx:DatabaseConnection):Promise<void>
-            allWithin(tx:DatabaseConnection):Promise<T[]>
-            toQuery():QueryLike;
-        }
-
-        interface Queryable<T> {
-            where(...nodes:any[]):Query<T>
-            delete():ModifyingQuery
-            select<U>(...nodes:any[]):Query<U>
-            selectDeep<U>(table: Table<T>): Query<T>
-            selectDeep<U>(...nodesOrTables:any[]):Query<U>
-        }
-
-        export interface Query<T> extends Executable<T>, Queryable<T> {
-            from(table:TableNode):Query<T>
-            update(o:Dictionary<any>):ModifyingQuery
-            update(o:{}):ModifyingQuery
-            group(...nodes:any[]):Query<T>
-            order(...criteria:OrderByValueNode[]):Query<T>
-            limit(l:number):Query<T>
-            offset(o:number):Query<T>
-        }
-
-        export interface ModifyingQuery extends Executable<void> {
-            returning<U>(...nodes:any[]):Query<U>
-            where(...nodes:any[]):ModifyingQuery
-        }
-
-        export interface TableNode {
-            join(table:TableNode):JoinTableNode
-            leftJoin(table:TableNode):JoinTableNode
-        }
-
-        export interface JoinTableNode extends TableNode {
-            on(filter:BinaryNode):TableNode
-            on(filter:string):TableNode
-        }
-
-        interface CreateQuery extends Executable<void> {
-            ifNotExists():Executable<void>
-        }
-        interface DropQuery extends Executable<void> {
-            ifExists():Executable<void>
-        }
-        export interface Table<T> extends TableNode, Queryable<T> {
-            create():CreateQuery
-            drop():DropQuery
-            as(name:string):Table<T>
-            update(o:any):ModifyingQuery
-            insert(row:T):ModifyingQuery
-            insert(rows:T[]):ModifyingQuery
-            select():Query<T>
-            select<U>(...nodes:any[]):Query<U>
-            from<U>(table:TableNode):Query<U>
-            star():Column<any>
-            subQuery<U>():SubQuery<U>
-            eventEmitter:{emit:(type:string, ...args:any[])=>void
-                          on:(eventName:string, handler:Function)=>void}
-            columns:Column<any>[]
-            sql: SQL;
-            alter():AlterQuery<T>
-        }
-        export interface AlterQuery<T> extends Executable<void> {
-            addColumn(column:Column<any>): AlterQuery<T>;
-            addColumn(name: string, options:string): AlterQuery<T>;
-            dropColumn(column: Column<any>): AlterQuery<T>;
-            renameColumn(column: Column<any>, newColumn: Column<any>):AlterQuery<T>;
-            renameColumn(column: Column<any>, newName: string):AlterQuery<T>;
-            renameColumn(name: string, newName: string):AlterQuery<T>;
-            rename(newName: string): AlterQuery<T>
-        }
-
-        export interface SQL {
-            functions: {
-                LOWER(c:Column<string>):Column<string>
-            }
-        }
-
-        export interface BinaryNode {
-            and(node:BinaryNode):BinaryNode
-            or(node:BinaryNode):BinaryNode
-        }
-
-        export interface Column<T> {
-            in(arr:T[]):BinaryNode
-            in(subQuery:SubQuery<T>):BinaryNode
-            notIn(arr:T[]):BinaryNode
-            equals(node:any):BinaryNode
-            notEquals(node:any):BinaryNode
-            gte(node:any):BinaryNode
-            lte(node:any):BinaryNode
-            gt(node:any):BinaryNode
-            lt(node:any):BinaryNode
-            like(str:string):BinaryNode
-            multiply:{
-                (node:Column<T>):Column<T>
-                (n:number):Column<number>
-            }
-            isNull():BinaryNode
-            isNotNull():BinaryNode
-            sum():Column<number>
-            count():Column<number>
-            count(name:string):Column<number>
-            distinct():Column<T>
-            as(name:string):Column<T>
-            ascending:OrderByValueNode
-            descending:OrderByValueNode
-            asc:OrderByValueNode
-            desc:OrderByValueNode
-        }
-
-        export interface AnydbSql extends DatabaseConnection {
-            define<T>(map:TableDefinition):Table<T>;
-            transaction<T>(fn:(tx:Transaction)=>Promise<T>):Promise<T>
-            allOf(...tables:Table<any>[]):any
-            models:Dictionary<Table<any>>
-            functions:{LOWER:(name:Column<string>)=>Column<string>
-                       RTRIM:(name:Column<string>)=>Column<string>}
-            makeFunction(name:string):Function
-            begin():Transaction
-            open():void;
-            close():void;
-            getPool():AnyDBPool;
-            dialect():string;
-        }
-    }
-
-    function anydbSQL(config:Object):anydbSQL.AnydbSql;
-
-    export = anydbSQL;
-}
diff --git a/anydb-sql/index.d.ts b/anydb-sql/index.d.ts
new file mode 100644
index 0000000000..367ade6ff9
--- /dev/null
+++ b/anydb-sql/index.d.ts
@@ -0,0 +1,193 @@
+// Type definitions for anydb-sql
+// Project: https://github.com/doxout/anydb-sql
+// Definitions by: Gorgi Kosev <https://github.com/spion>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface AnyDBPool extends anydbSQL.DatabaseConnection {
+    query: (text: string, values: any[], callback: (err: Error, result: any) => void) => void
+    begin: () => anydbSQL.Transaction
+    close: (err: Error) => void
+}
+
+interface Dictionary<T> { [key: string]: T; }
+
+declare namespace anydbSQL {
+    export interface OrderByValueNode { }
+    export interface ColumnDefinition {
+        primaryKey?: boolean;
+        dataType?: string;
+        references?: { table: string; column: string }
+        notNull?: boolean
+    }
+
+    export interface TableDefinition {
+        name: string
+        columns: Dictionary<ColumnDefinition>
+        has?: Dictionary<{ from: string; many?: boolean }>
+    }
+
+
+    export interface QueryLike {
+        query: string;
+        values: any[]
+        text: string
+    }
+    export interface DatabaseConnection {
+        queryAsync<T>(query: string, ...params: any[]): Promise<{ rowCount: number; rows: T[] }>
+        queryAsync<T>(query: QueryLike): Promise<{ rowCount: number; rows: T[] }>
+    }
+
+    export interface Transaction extends DatabaseConnection {
+        rollback(): void
+        commitAsync(): Promise<void>
+    }
+
+    export interface SubQuery<T> {
+        select(node: Column<T>): SubQuery<T>
+        where(...nodes: any[]): SubQuery<T>
+        from(table: TableNode): SubQuery<T>
+        group(...nodes: any[]): SubQuery<T>
+        order(criteria: OrderByValueNode): SubQuery<T>
+        notExists(subQuery: SubQuery<any>): SubQuery<T>
+    }
+
+    interface Executable<T> {
+        get(): Promise<T>
+        getWithin(tx: DatabaseConnection): Promise<T>
+        exec(): Promise<void>
+        all(): Promise<T[]>
+        execWithin(tx: DatabaseConnection): Promise<void>
+        allWithin(tx: DatabaseConnection): Promise<T[]>
+        toQuery(): QueryLike;
+    }
+
+    interface Queryable<T> {
+        where(...nodes: any[]): Query<T>
+        delete(): ModifyingQuery
+        select<U>(...nodes: any[]): Query<U>
+        selectDeep<U>(table: Table<T>): Query<T>
+        selectDeep<U>(...nodesOrTables: any[]): Query<U>
+    }
+
+    export interface Query<T> extends Executable<T>, Queryable<T> {
+        from(table: TableNode): Query<T>
+        update(o: Dictionary<any>): ModifyingQuery
+        update(o: {}): ModifyingQuery
+        group(...nodes: any[]): Query<T>
+        order(...criteria: OrderByValueNode[]): Query<T>
+        limit(l: number): Query<T>
+        offset(o: number): Query<T>
+    }
+
+    export interface ModifyingQuery extends Executable<void> {
+        returning<U>(...nodes: any[]): Query<U>
+        where(...nodes: any[]): ModifyingQuery
+    }
+
+    export interface TableNode {
+        join(table: TableNode): JoinTableNode
+        leftJoin(table: TableNode): JoinTableNode
+    }
+
+    export interface JoinTableNode extends TableNode {
+        on(filter: BinaryNode): TableNode
+        on(filter: string): TableNode
+    }
+
+    interface CreateQuery extends Executable<void> {
+        ifNotExists(): Executable<void>
+    }
+    interface DropQuery extends Executable<void> {
+        ifExists(): Executable<void>
+    }
+    export interface Table<T> extends TableNode, Queryable<T> {
+        create(): CreateQuery
+        drop(): DropQuery
+        as(name: string): Table<T>
+        update(o: any): ModifyingQuery
+        insert(row: T): ModifyingQuery
+        insert(rows: T[]): ModifyingQuery
+        select(): Query<T>
+        select<U>(...nodes: any[]): Query<U>
+        from<U>(table: TableNode): Query<U>
+        star(): Column<any>
+        subQuery<U>(): SubQuery<U>
+        eventEmitter: {
+            emit: (type: string, ...args: any[]) => void
+            on: (eventName: string, handler: Function) => void
+        }
+        columns: Column<any>[]
+        sql: SQL;
+        alter(): AlterQuery<T>
+    }
+    export interface AlterQuery<T> extends Executable<void> {
+        addColumn(column: Column<any>): AlterQuery<T>;
+        addColumn(name: string, options: string): AlterQuery<T>;
+        dropColumn(column: Column<any>): AlterQuery<T>;
+        renameColumn(column: Column<any>, newColumn: Column<any>): AlterQuery<T>;
+        renameColumn(column: Column<any>, newName: string): AlterQuery<T>;
+        renameColumn(name: string, newName: string): AlterQuery<T>;
+        rename(newName: string): AlterQuery<T>
+    }
+
+    export interface SQL {
+        functions: {
+            LOWER(c: Column<string>): Column<string>
+        }
+    }
+
+    export interface BinaryNode {
+        and(node: BinaryNode): BinaryNode
+        or(node: BinaryNode): BinaryNode
+    }
+
+    export interface Column<T> {
+        in(arr: T[]): BinaryNode
+        in(subQuery: SubQuery<T>): BinaryNode
+        notIn(arr: T[]): BinaryNode
+        equals(node: any): BinaryNode
+        notEquals(node: any): BinaryNode
+        gte(node: any): BinaryNode
+        lte(node: any): BinaryNode
+        gt(node: any): BinaryNode
+        lt(node: any): BinaryNode
+        like(str: string): BinaryNode
+        multiply: {
+            (node: Column<T>): Column<T>
+            (n: number): Column<number>
+        }
+        isNull(): BinaryNode
+        isNotNull(): BinaryNode
+        sum(): Column<number>
+        count(): Column<number>
+        count(name: string): Column<number>
+        distinct(): Column<T>
+        as(name: string): Column<T>
+        ascending: OrderByValueNode
+        descending: OrderByValueNode
+        asc: OrderByValueNode
+        desc: OrderByValueNode
+    }
+
+    export interface AnydbSql extends DatabaseConnection {
+        define<T>(map: TableDefinition): Table<T>;
+        transaction<T>(fn: (tx: Transaction) => Promise<T>): Promise<T>
+        allOf(...tables: Table<any>[]): any
+        models: Dictionary<Table<any>>
+        functions: {
+            LOWER: (name: Column<string>) => Column<string>
+            RTRIM: (name: Column<string>) => Column<string>
+        }
+        makeFunction(name: string): Function
+        begin(): Transaction
+        open(): void;
+        close(): void;
+        getPool(): AnyDBPool;
+        dialect(): string;
+    }
+}
+
+declare function anydbSQL(config: Object): anydbSQL.AnydbSql;
+
+export = anydbSQL;
diff --git a/anydb-sql/tsconfig.json b/anydb-sql/tsconfig.json
new file mode 100644
index 0000000000..7d21e01799
--- /dev/null
+++ b/anydb-sql/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "anydb-sql-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/api-error-handler/api-error-handler-tests.ts b/api-error-handler/api-error-handler-tests.ts
index fc92cf9a70..3bc39c4a7b 100644
--- a/api-error-handler/api-error-handler-tests.ts
+++ b/api-error-handler/api-error-handler-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="api-error-handler.d.ts" />
 
 import * as errorHandler from 'api-error-handler';
 import * as express from 'express';
diff --git a/api-error-handler/api-error-handler.d.ts b/api-error-handler/api-error-handler.d.ts
deleted file mode 100644
index 96fbb16b29..0000000000
--- a/api-error-handler/api-error-handler.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Type definitions for api-error-handler v1.0.0
-// Project: https://github.com/expressjs/api-error-handler
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare module 'api-error-handler' {
-    import * as express from 'express';
-
-    namespace apiErrorHandler {
-
-      // Body response: the JSON returned by api-error-handler
-      // See https://github.com/expressjs/api-error-handler/blob/1.0.0/index.js
-      interface Response {
-          status: number;
-          stack?: string;
-          message: string;
-
-          // Client errors
-          code?: any;
-          name?: string;
-          type?: any;
-      }
-    }
-
-    function apiErrorHandler(options?: any): express.ErrorRequestHandler;
-
-    export = apiErrorHandler;
-}
diff --git a/api-error-handler/index.d.ts b/api-error-handler/index.d.ts
new file mode 100644
index 0000000000..e9337cc448
--- /dev/null
+++ b/api-error-handler/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for api-error-handler v1.0.0
+// Project: https://github.com/expressjs/api-error-handler
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+
+import * as express from 'express';
+
+declare namespace apiErrorHandler {
+
+    // Body response: the JSON returned by api-error-handler
+    // See https://github.com/expressjs/api-error-handler/blob/1.0.0/index.js
+    interface Response {
+        status: number;
+        stack?: string;
+        message: string;
+
+        // Client errors
+        code?: any;
+        name?: string;
+        type?: any;
+    }
+}
+
+declare function apiErrorHandler(options?: any): express.ErrorRequestHandler;
+
+export = apiErrorHandler;
diff --git a/api-error-handler/tsconfig.json b/api-error-handler/tsconfig.json
new file mode 100644
index 0000000000..331888b947
--- /dev/null
+++ b/api-error-handler/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "api-error-handler-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/apn/apn-tests.ts b/apn/apn-tests.ts
index b47259d76b..ea4bb34ae3 100644
--- a/apn/apn-tests.ts
+++ b/apn/apn-tests.ts
@@ -1,4 +1,3 @@
-///<reference path="apn.d.ts"/>
 import apn = require("apn");
 
 //Hand made TypeScript tests
diff --git a/apn/apn.d.ts b/apn/apn.d.ts
deleted file mode 100644
index cf11b13c0e..0000000000
--- a/apn/apn.d.ts
+++ /dev/null
@@ -1,364 +0,0 @@
-// Type definitions for node-apn
-// Project: https://github.com/argon/node-apn
-// Definitions by: Zenorbi <https://github.com/zenorbi>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../node/node.d.ts"/>
-declare module "apn" {
-	import events = require("events");
-	import net = require("net");
-	export interface ConnectionOptions {
-		/**
-		 * The filename of the connection certificate to load from disk, or a Buffer/String containing the certificate data. (Defaults to: `cert.pem`)
-		 */
-		cert?:string|Buffer;
-		/**
-		 * The filename of the connection key to load from disk, or a Buffer/String containing the key data. (Defaults to: `key.pem`)
-		 */
-		key?:string|Buffer;
-		/**
-		 * An array of trusted certificates. Each element should contain either a filename to load, or a Buffer/String (in PEM format) to be used directly. If this is omitted several well known "root" CAs will be used. - You may need to use this as some environments don't include the CA used by Apple (entrust_2048).
-		 */
-		ca?:(string|Buffer)[];
-		/**
-		 * File path for private key, certificate and CA certs in PFX or PKCS12 format, or a Buffer containing the PFX data. If supplied will always be used instead of certificate and key above.
-		 */
-		pfx?:string|Buffer;
-		/**
-		 * The passphrase for the connection key, if required
-		 */
-		passphrase?:string;
-		/**
-		 * Specifies which environment to connect to: Production (if true) or Sandbox - The hostname will be set automatically. (Defaults to NODE_ENV == "production", i.e. false unless the NODE_ENV environment variable is set accordingly)
-		 */
-		production?:boolean;
-		/**
-		 * Enable when you are using a VoIP certificate to enable paylods up to 4096 bytes.
-		 */
-		voip?:boolean;
-		/**
-		 * Gateway port (Defaults to: `2195`)
-		 */
-		port?:number;
-		/**
-		 * Reject Unauthorized property to be passed through to tls.connect() (Defaults to `true`)
-		 */
-		rejectUnauthorized?:boolean;
-		/**
-		 * Number of notifications to cache for error purposes (See "Handling Errors" below, (Defaults to: `1000`)
-		 */
-		cacheLength?:number;
-		/**
-		 * Whether the cache should grow in response to messages being lost after errors. (Will still emit a 'cacheTooSmall' event) (Defaults to: `true`)
-		 */
-		autoAdjustCache?:boolean;
-		/**
-		 * The maximum number of connections to create for sending messages. (Defaults to: `1`)
-		 */
-		maxConnections?:number;
-		/**
-		 * The duration of time the module should wait, in milliseconds, when trying to establish a connection to Apple before failing. 0 = Disabled. {Defaults to: `10000`}
-		 */
-		connectTimeout?:number;
-		/**
-		 * The duration the socket should stay alive with no activity in milliseconds. 0 = Disabled. (Defaults to: `3600000` - 1h)
-		 */
-		connectionTimeout?:number;
-		/**
-		 * The maximum number of connection failures that will be tolerated before `apn` will "terminate". (Defaults to: 10)
-		 */
-		connectionRetryLimit?:number;
-		/**
-		 * Whether to buffer notifications and resend them after failure. (Defaults to: `true`)
-		 */
-		buffersNotifications?:number;
-		/**
-		 * Whether to aggresively empty the notification buffer while connected - if set to true node-apn may enter a tight loop under heavy load while delivering notifications. (Defaults to: `false`)
-		 */
-		fastMode?:boolean;
-	}
-	export class Connection extends events.EventEmitter {
-		constructor(options:ConnectionOptions);
-		/**
-		 * This is the business end of the module. Create a `Notification` object and pass it in, along with a single recipient or an array of them and node-apn will take care of the rest, delivering the notification to each recipient.
-		 * 
-		 * A "recipient" is either a `Device` object, a `String`, or a `Buffer` containing the device token. `Device` objects are used internally and will be created if necessary. Where applicable, all events will return a `Device` regardless of the type passed to this method.
-		 */
-		pushNotification(notification:Notification, recipient:Device|string|Buffer|(Device|string|Buffer)[]):void;
-		/**
-		 * Used to manually adjust the "cacheLength" property in the options. This is ideal if you choose to use the `cacheTooSmall` event to tweak your environment. It is safe for increasing and reducing cache size.
-		 */
-		setCacheLength(newLength:number):void;
-		/**
-		 * Indicate to node-apn that when the queue of pending notifications is fully drained that it should close all open connections. This will mean that if there are no other pending resources (open sockets, running timers, etc.) the application will terminate. If notifications are pushed after the connection has completely shutdown a new connection will be established and, if applicable, `shutdown` will need to be called again.
-		 */
-		shutdown():void;
-		/**
-		 * Emitted when an error occurs during initialisation of the module, usually due to a problem with the keys and certificates.
-		 */
-		on(event: "error", listener: (error:Error) => void):this;
-		/**
-		 * Emitted when the connection socket experiences an error. This may be useful for debugging but no action should be necessary.
-		 */
-		on(event: "socketError", listener: (error:Error) => void):this;
-		/**
-		 * Emitted when a notification has been sent to Apple - not a guarantee that it has been accepted by Apple, an error relating to it may occur later on. A notification may also be "transmitted" several times if a preceding notification caused an error requiring retransmission.
-		 */
-		on(event: "transmitted", listener: (notification:Notification, decive:Device) => void):this;
-		/**
-		 * Emitted when all pending notifications have been transmitted to Apple and the pending queue is empty. This may be called more than once if a notification error occurs and notifications must be re-sent.
-		 */
-		on(event: "completed", listener: () => void):this;
-		/**
-		 * Emitted when Apple returns a notification as invalid but the notification has already been expunged from the cache - usually due to high throughput and indicates that notifications will be getting lost. The parameter is an estimate of how many notifications have been lost. You should experiment with increasing the cache size or enabling ```autoAdjustCache``` if you see this frequently.
-		 * 
-		 * **Note**: With ```autoAdjustCache``` enabled this event will still be emitted when an adjustment is triggered.
-		 */
-		on(event: "cacheTooSmall", listener: (sizeDifference:number) => void):this;
-		/**
-		 * Emitted when a connection to Apple is successfully established. The parameter indicates the number of open connections. No action is required as the connection is managed internally.
-		 */
-		on(event: "connected", listener: (openSockets:net.Socket[]) => void):this;
-		/**
-		 * Emitted when the connection to Apple has been closed, this could be for numerous reasons, for example an error has occurred or the connection has timed out. The parameter is the same as for `connected` and again, no action is required.
-		 */
-		on(event: "disconnected", listener: (openSockets:net.Socket[]) => void):this;
-		/**
-		 * Emitted when the connectionTimeout option has been specified and no activity has occurred on a socket for a specified duration. The socket will be closed immediately after this event and a `disconnected` event will also be emitted.
-		 */
-		on(event: "timeout", listener: () => void):this;
-		/**
-		 * Emitted when a message has been received from Apple stating that a notification was invalid or if an internal error occurred before that notification could be pushed to Apple. If the notification is still in the cache it will be passed as the second argument, otherwise null. Where possible the associated `Device` object will be passed as a third parameter, however in cases where the token supplied to the module cannot be parsed into a `Buffer` the supplied value will be returned.
-
-		 * Error codes smaller than 512 correspond to those returned by Apple as per their [docs][errors]. Other errors are applicable to `node-apn` itself. Definitions can be found in `lib/errors.js`.
-		 */
-		on(event: "transmissionError", listener: (errorCode:number, notification:Notification, device:Device|Buffer) => void):this;
-		on(event: string, listener: Function):this;
-	}
-	export interface NotificationAlertOptions {
-		title?:string;
-		body:string;
-		"title-loc-key"?:string;
-		"title-loc-args"?:string[];
-		"action-loc-key"?:string;
-		"loc-key"?:string;
-		"loc-args"?:string[];
-		"launch-image"?:string;
-	}
-	export class Notification {
-		/**
-		 * The maximum number of retries which should be performed when sending a notification if an error occurs. A value of 0 will only allow one attempt at sending (0 retries). Set to -1 to disable (default).
-		 */
-		public retryLimit:number;
-		/**
-		 * The UNIX timestamp representing when the notification should expire. This does not contribute to the 2048 byte payload size limit. An expiry of 0 indicates that the notification expires immediately.
-		 */
-		public expiry:number;
-		/**
-		 * From Apple's Documentation, Provide one of the following values:
-		 * 
-		 * - 10 - The push message is sent immediately. (Default)
-		 *   > The push notification must trigger an alert, sound, or badge on the device. It is an error use this priority for a push that contains only the content-available key.
-		 * - 5 - The push message is sent at a time that conserves power on the device receiving it.
-		 */
-		public priority:number;
-		/**
-		 * The encoding to use when transmitting the notification to APNS, defaults to `utf8`. `utf16le` is also possible but as each character is represented by a minimum of 2 bytes, will at least halve the possible payload size. If in doubt leave as default.
-		 */
-		public encoding:string;
-		/**
-		 * This object represents the root JSON object that you can add custom information for your application to. The properties below will only be added to the payload (under `aps`) when the notification is prepared for sending.
-		 */
-		public payload:any;
-		/**
-		 * The value to specify for `payload.aps.badge`
-		 */
-		public badge:number;
-		/**
-		 * The value to specify for `payload.aps.sound`
-		 */
-		public sound:string;
-		/**
-		 * The value to specify for `payload.aps.alert` can be either a `String` or an `Object` as outlined by the payload documentation.
-		 */
-		public alert:string|NotificationAlertOptions;
-		/**
-		 * Setting this to true will specify "content-available" in the payload when it is compiled.
-		 */
-		public newsstandAvailable:boolean;
-		/**
-		 * Setting this to true will specify "content-available" in the payload when it is compiled.
-		 */
-		public contentAvailable:boolean;
-		/**
-		 * The value to specify for the `mdm` field where applicable.
-		 */
-		public mdm:string|Object;
-		/**
-		 * The value to specify for `payload.aps['url-args']`. This used for Safari Push NOtifications and should be an array of values in accordance with the Web Payload Documentation.
-		 */
-		public urlArgs:string[];
-		/**
-		 * When this parameter is set and `notification#trim()` is called it will attempt to truncate the string at the nearest space.
-		 */
-		public truncateAtWordEnd:boolean;
-		/**
-		 * You can optionally pass in an object representing the payload, or configure properties on the returned object.
-		 */
-		constructor(payload?:any);
-		/**
-		 * Set the `aps.alert` text body. This will use the most space-efficient means.
-		 */
-		setAlertText(alertText:string):Notification;
-		/**
-		 * Set the `title` property of the `aps.alert` object - used with Safari Push Notifications
-		 */
-		setAlertTitle(alertTitle:string):Notification;
-		/**
-		 * Set the `action` property of the `aps.alert` object - used with Safari Push Notifications
-		 */
-		setAlertAction(alertAction:string):Notification;
-		/**
-		 * Set the `action-loc-key` property of the `aps.alert` object.
-		 */
-		setActionLocKey(key:string):Notification;
-		/**
-		 * Set the `loc-key` property of the `aps.alert` object.
-		 */
-		setLocKey(key:string):Notification;
-		/**
-		 * Set the `loc-args` property of the `aps.alert` object.
-		 */
-		setLocArgs(args:string[]):Notification;
-		/**
-		 * Set the `launch-image` property of the `aps.alert` object.
-		 */
-		setLaunchImage(image:string):Notification;
-		/**
-		 * Set the `mdm` property on the payload.
-		 */
-		setMDM(mdm:string|Object):Notification;
-		/**
-		 * Set the `content-available` property of the `aps` object.
-		 */
-		setNewsstandAvailable(available:boolean):Notification;
-		/**
-		 * Set the `content-available` property of the `aps` object.
-		 */
-		setContentAvailable(available:boolean):Notification;
-		/**
-		 * Set the `url-args` property of the `aps` object.
-		 */
-		setUrlArgs(urlArgs:string[]):Notification;
-		/**
-		 * Attempt to automatically trim the notification alert text body to meet the payload size limit of 2048 bytes.
-		 */
-		trim():number;
-	}
-	export class Device {
-		public token:Buffer;
-		/**
-		 * `deviceToken` can be a `Buffer` or a `String` containing a "hex" representation of the token. Throws an error if the deviceToken supplied is invalid.
-		 */
-		constructor(deviceToken:string|Buffer);
-	}
-	
-	export interface FeedbackOptions {
-		/**
-		 * The filename of the connection certificate to load from disk, or a Buffer/String containing the certificate data. (Defaults to: `cert.pem`)
-		 */
-		cert?:string|Buffer;
-		/**
-		 * The filename of the connection key to load from disk, or a Buffer/String containing the key data. (Defaults to: `key.pem`)
-		 */
-		key?:string|Buffer;
-		/**
-		 * An array of trusted certificates. Each element should contain either a filename to load, or a Buffer/String (in PEM format) to be used directly. If this is omitted several well known "root" CAs will be used. - You may need to use this as some environments don't include the CA used by Apple (entrust_2048).
-		 */
-		ca?:(string|Buffer)[];
-		/**
-		 * File path for private key, certificate and CA certs in PFX or PKCS12 format, or a Buffer containing the PFX data. If supplied will be used instead of certificate and key above.
-		 */
-		pfx?:string|Buffer;
-		/**
-		 * The passphrase for the connection key, if required
-		 */
-		passphrase?:string;
-		/**
-		 * Specifies which environment to connect to: Production (if true) or Sandbox - The hostname will be set automatically. (Defaults to NODE_ENV == "production", i.e. false unless the NODE_ENV environment variable is set accordingly)
-		 */
-		production?:boolean;
-		/**
-		 * Feedback server port (Defaults to: `2196`)
-		 */
-		port?:number;
-		/**
-		 * Sets the behaviour for triggering the `feedback` event. When `true` the event will be triggered once per connection with an array of timestamp and device token tuples. Otherwise a `feedback` event will be emitted once per token received. (Defaults to: true)
-		 */
-		batchFeedback?:boolean;
-		/**
-		 * The maximum number of tokens to pass when emitting the event - a value of 0 will cause all tokens to be passed after connection is reset. After this number of tokens are received the `feedback` event will be emitted. (Only applies when `batchFeedback` is enabled)
-		 */
-		batchSize?:number;
-		/**
-		 * How often to automatically poll the feedback service. Set to `0` to disable. (Defaults to: `3600`)
-		 */
-		interval?:number;
-	}
-	export interface FeedbackData {
-		time:number;
-		device:Device;
-	}
-	/**
-	 * Connection to the Apple Push Notification Feedback Service and if `interval` isn't disabled automatically begins polling the service. Many of the options are the same as `apn.Connection()`
-	 */
-	export class Feedback {
-		constructor(options:FeedbackOptions);
-		/**
-		 * Trigger a query of the feedback service. If `interval` is non-zero then this method will be called automatically.
-		 */
-		start():void;
-		/**
-		 * You can cancel the interval by calling `feedback.cancel()`. If you do not wish to have the service automatically queried then set `interval` to 0 and use `feedback.start()` to manually invoke it one time.
-		 */
-		cancel():void;
-		/**
-		 * Emitted when an error occurs initialising the module. Usually caused by failing to load the certificates.
-		 */
-		on(event: "error", listener: (error:Error) => void):Feedback;
-		/**
-		 * Emitted when an error occurs receiving or processing the feedback and in the case of a socket error occurring. These errors are usually informational and node-apn will automatically recover.
-		 */
-		on(event: "feedbackError", listener: (error:Error) => void):Feedback;
-		/**
-		 * Emitted when data has been received from the feedback service, typically once per connection. `feedbackData` is an array of objects, each containing the `time` returned by the server (epoch time) and the `device` a `Buffer` containing the device token.
-		 */
-		on(event: "feedback", listener: (feedbackData:FeedbackData[]) => void):Feedback;
-		on(event: string, listener: Function):Feedback;
-	}
-	
-	export enum Errors {
-		"noErrorsEncountered"= 0,
-		"processingError"= 1,
-		"missingDeviceToken"= 2,
-		"missingTopic"= 3,
-		"missingPayload"= 4,
-		"invalidTokenSize"= 5,
-		"invalidTopicSize"= 6,
-		"invalidPayloadSize"= 7,
-		"invalidToken"= 8,
-		"apnsShutdown"= 10,
-		"none"= 255,
-		"retryLimitExceeded"= 512,
-		"moduleInitialisationFailed"= 513,
-		"connectionRetryLimitExceeded"= 514, // When a connection is unable to be established. Usually because of a network / SSL error this will be emitted
-		"connectionTerminated"= 515
-	}
-	
-	//Lowercase aliases
-	export {Connection as connection};
-	export {Device as device};
-	export {Errors as error};
-	export {Feedback as feedback};
-	export {Notification as notification};
-}
diff --git a/apn/index.d.ts b/apn/index.d.ts
new file mode 100644
index 0000000000..7a36c396b4
--- /dev/null
+++ b/apn/index.d.ts
@@ -0,0 +1,363 @@
+// Type definitions for node-apn
+// Project: https://github.com/argon/node-apn
+// Definitions by: Zenorbi <https://github.com/zenorbi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="node"/>
+
+import events = require("events");
+import net = require("net");
+export interface ConnectionOptions {
+    /**
+     * The filename of the connection certificate to load from disk, or a Buffer/String containing the certificate data. (Defaults to: `cert.pem`)
+     */
+    cert?: string | Buffer;
+    /**
+     * The filename of the connection key to load from disk, or a Buffer/String containing the key data. (Defaults to: `key.pem`)
+     */
+    key?: string | Buffer;
+    /**
+     * An array of trusted certificates. Each element should contain either a filename to load, or a Buffer/String (in PEM format) to be used directly. If this is omitted several well known "root" CAs will be used. - You may need to use this as some environments don't include the CA used by Apple (entrust_2048).
+     */
+    ca?: (string | Buffer)[];
+    /**
+     * File path for private key, certificate and CA certs in PFX or PKCS12 format, or a Buffer containing the PFX data. If supplied will always be used instead of certificate and key above.
+     */
+    pfx?: string | Buffer;
+    /**
+     * The passphrase for the connection key, if required
+     */
+    passphrase?: string;
+    /**
+     * Specifies which environment to connect to: Production (if true) or Sandbox - The hostname will be set automatically. (Defaults to NODE_ENV == "production", i.e. false unless the NODE_ENV environment variable is set accordingly)
+     */
+    production?: boolean;
+    /**
+     * Enable when you are using a VoIP certificate to enable paylods up to 4096 bytes.
+     */
+    voip?: boolean;
+    /**
+     * Gateway port (Defaults to: `2195`)
+     */
+    port?: number;
+    /**
+     * Reject Unauthorized property to be passed through to tls.connect() (Defaults to `true`)
+     */
+    rejectUnauthorized?: boolean;
+    /**
+     * Number of notifications to cache for error purposes (See "Handling Errors" below, (Defaults to: `1000`)
+     */
+    cacheLength?: number;
+    /**
+     * Whether the cache should grow in response to messages being lost after errors. (Will still emit a 'cacheTooSmall' event) (Defaults to: `true`)
+     */
+    autoAdjustCache?: boolean;
+    /**
+     * The maximum number of connections to create for sending messages. (Defaults to: `1`)
+     */
+    maxConnections?: number;
+    /**
+     * The duration of time the module should wait, in milliseconds, when trying to establish a connection to Apple before failing. 0 = Disabled. {Defaults to: `10000`}
+     */
+    connectTimeout?: number;
+    /**
+     * The duration the socket should stay alive with no activity in milliseconds. 0 = Disabled. (Defaults to: `3600000` - 1h)
+     */
+    connectionTimeout?: number;
+    /**
+     * The maximum number of connection failures that will be tolerated before `apn` will "terminate". (Defaults to: 10)
+     */
+    connectionRetryLimit?: number;
+    /**
+     * Whether to buffer notifications and resend them after failure. (Defaults to: `true`)
+     */
+    buffersNotifications?: number;
+    /**
+     * Whether to aggresively empty the notification buffer while connected - if set to true node-apn may enter a tight loop under heavy load while delivering notifications. (Defaults to: `false`)
+     */
+    fastMode?: boolean;
+}
+export declare class Connection extends events.EventEmitter {
+    constructor(options: ConnectionOptions);
+    /**
+     * This is the business end of the module. Create a `Notification` object and pass it in, along with a single recipient or an array of them and node-apn will take care of the rest, delivering the notification to each recipient.
+     * 
+     * A "recipient" is either a `Device` object, a `String`, or a `Buffer` containing the device token. `Device` objects are used internally and will be created if necessary. Where applicable, all events will return a `Device` regardless of the type passed to this method.
+     */
+    pushNotification(notification: Notification, recipient: Device | string | Buffer | (Device | string | Buffer)[]): void;
+    /**
+     * Used to manually adjust the "cacheLength" property in the options. This is ideal if you choose to use the `cacheTooSmall` event to tweak your environment. It is safe for increasing and reducing cache size.
+     */
+    setCacheLength(newLength: number): void;
+    /**
+     * Indicate to node-apn that when the queue of pending notifications is fully drained that it should close all open connections. This will mean that if there are no other pending resources (open sockets, running timers, etc.) the application will terminate. If notifications are pushed after the connection has completely shutdown a new connection will be established and, if applicable, `shutdown` will need to be called again.
+     */
+    shutdown(): void;
+    /**
+     * Emitted when an error occurs during initialisation of the module, usually due to a problem with the keys and certificates.
+     */
+    on(event: "error", listener: (error: Error) => void): this;
+    /**
+     * Emitted when the connection socket experiences an error. This may be useful for debugging but no action should be necessary.
+     */
+    on(event: "socketError", listener: (error: Error) => void): this;
+    /**
+     * Emitted when a notification has been sent to Apple - not a guarantee that it has been accepted by Apple, an error relating to it may occur later on. A notification may also be "transmitted" several times if a preceding notification caused an error requiring retransmission.
+     */
+    on(event: "transmitted", listener: (notification: Notification, decive: Device) => void): this;
+    /**
+     * Emitted when all pending notifications have been transmitted to Apple and the pending queue is empty. This may be called more than once if a notification error occurs and notifications must be re-sent.
+     */
+    on(event: "completed", listener: () => void): this;
+    /**
+     * Emitted when Apple returns a notification as invalid but the notification has already been expunged from the cache - usually due to high throughput and indicates that notifications will be getting lost. The parameter is an estimate of how many notifications have been lost. You should experiment with increasing the cache size or enabling ```autoAdjustCache``` if you see this frequently.
+     * 
+     * **Note**: With ```autoAdjustCache``` enabled this event will still be emitted when an adjustment is triggered.
+     */
+    on(event: "cacheTooSmall", listener: (sizeDifference: number) => void): this;
+    /**
+     * Emitted when a connection to Apple is successfully established. The parameter indicates the number of open connections. No action is required as the connection is managed internally.
+     */
+    on(event: "connected", listener: (openSockets: net.Socket[]) => void): this;
+    /**
+     * Emitted when the connection to Apple has been closed, this could be for numerous reasons, for example an error has occurred or the connection has timed out. The parameter is the same as for `connected` and again, no action is required.
+     */
+    on(event: "disconnected", listener: (openSockets: net.Socket[]) => void): this;
+    /**
+     * Emitted when the connectionTimeout option has been specified and no activity has occurred on a socket for a specified duration. The socket will be closed immediately after this event and a `disconnected` event will also be emitted.
+     */
+    on(event: "timeout", listener: () => void): this;
+    /**
+     * Emitted when a message has been received from Apple stating that a notification was invalid or if an internal error occurred before that notification could be pushed to Apple. If the notification is still in the cache it will be passed as the second argument, otherwise null. Where possible the associated `Device` object will be passed as a third parameter, however in cases where the token supplied to the module cannot be parsed into a `Buffer` the supplied value will be returned.
+
+     * Error codes smaller than 512 correspond to those returned by Apple as per their [docs][errors]. Other errors are applicable to `node-apn` itself. Definitions can be found in `lib/errors.js`.
+     */
+    on(event: "transmissionError", listener: (errorCode: number, notification: Notification, device: Device | Buffer) => void): this;
+    on(event: string, listener: Function): this;
+}
+export interface NotificationAlertOptions {
+    title?: string;
+    body: string;
+    "title-loc-key"?: string;
+    "title-loc-args"?: string[];
+    "action-loc-key"?: string;
+    "loc-key"?: string;
+    "loc-args"?: string[];
+    "launch-image"?: string;
+}
+export declare class Notification {
+    /**
+     * The maximum number of retries which should be performed when sending a notification if an error occurs. A value of 0 will only allow one attempt at sending (0 retries). Set to -1 to disable (default).
+     */
+    public retryLimit: number;
+    /**
+     * The UNIX timestamp representing when the notification should expire. This does not contribute to the 2048 byte payload size limit. An expiry of 0 indicates that the notification expires immediately.
+     */
+    public expiry: number;
+    /**
+     * From Apple's Documentation, Provide one of the following values:
+     * 
+     * - 10 - The push message is sent immediately. (Default)
+     *   > The push notification must trigger an alert, sound, or badge on the device. It is an error use this priority for a push that contains only the content-available key.
+     * - 5 - The push message is sent at a time that conserves power on the device receiving it.
+     */
+    public priority: number;
+    /**
+     * The encoding to use when transmitting the notification to APNS, defaults to `utf8`. `utf16le` is also possible but as each character is represented by a minimum of 2 bytes, will at least halve the possible payload size. If in doubt leave as default.
+     */
+    public encoding: string;
+    /**
+     * This object represents the root JSON object that you can add custom information for your application to. The properties below will only be added to the payload (under `aps`) when the notification is prepared for sending.
+     */
+    public payload: any;
+    /**
+     * The value to specify for `payload.aps.badge`
+     */
+    public badge: number;
+    /**
+     * The value to specify for `payload.aps.sound`
+     */
+    public sound: string;
+    /**
+     * The value to specify for `payload.aps.alert` can be either a `String` or an `Object` as outlined by the payload documentation.
+     */
+    public alert: string | NotificationAlertOptions;
+    /**
+     * Setting this to true will specify "content-available" in the payload when it is compiled.
+     */
+    public newsstandAvailable: boolean;
+    /**
+     * Setting this to true will specify "content-available" in the payload when it is compiled.
+     */
+    public contentAvailable: boolean;
+    /**
+     * The value to specify for the `mdm` field where applicable.
+     */
+    public mdm: string | Object;
+    /**
+     * The value to specify for `payload.aps['url-args']`. This used for Safari Push NOtifications and should be an array of values in accordance with the Web Payload Documentation.
+     */
+    public urlArgs: string[];
+    /**
+     * When this parameter is set and `notification#trim()` is called it will attempt to truncate the string at the nearest space.
+     */
+    public truncateAtWordEnd: boolean;
+    /**
+     * You can optionally pass in an object representing the payload, or configure properties on the returned object.
+     */
+    constructor(payload?: any);
+    /**
+     * Set the `aps.alert` text body. This will use the most space-efficient means.
+     */
+    setAlertText(alertText: string): Notification;
+    /**
+     * Set the `title` property of the `aps.alert` object - used with Safari Push Notifications
+     */
+    setAlertTitle(alertTitle: string): Notification;
+    /**
+     * Set the `action` property of the `aps.alert` object - used with Safari Push Notifications
+     */
+    setAlertAction(alertAction: string): Notification;
+    /**
+     * Set the `action-loc-key` property of the `aps.alert` object.
+     */
+    setActionLocKey(key: string): Notification;
+    /**
+     * Set the `loc-key` property of the `aps.alert` object.
+     */
+    setLocKey(key: string): Notification;
+    /**
+     * Set the `loc-args` property of the `aps.alert` object.
+     */
+    setLocArgs(args: string[]): Notification;
+    /**
+     * Set the `launch-image` property of the `aps.alert` object.
+     */
+    setLaunchImage(image: string): Notification;
+    /**
+     * Set the `mdm` property on the payload.
+     */
+    setMDM(mdm: string | Object): Notification;
+    /**
+     * Set the `content-available` property of the `aps` object.
+     */
+    setNewsstandAvailable(available: boolean): Notification;
+    /**
+     * Set the `content-available` property of the `aps` object.
+     */
+    setContentAvailable(available: boolean): Notification;
+    /**
+     * Set the `url-args` property of the `aps` object.
+     */
+    setUrlArgs(urlArgs: string[]): Notification;
+    /**
+     * Attempt to automatically trim the notification alert text body to meet the payload size limit of 2048 bytes.
+     */
+    trim(): number;
+}
+export declare class Device {
+    public token: Buffer;
+    /**
+     * `deviceToken` can be a `Buffer` or a `String` containing a "hex" representation of the token. Throws an error if the deviceToken supplied is invalid.
+     */
+    constructor(deviceToken: string | Buffer);
+}
+
+export interface FeedbackOptions {
+    /**
+     * The filename of the connection certificate to load from disk, or a Buffer/String containing the certificate data. (Defaults to: `cert.pem`)
+     */
+    cert?: string | Buffer;
+    /**
+     * The filename of the connection key to load from disk, or a Buffer/String containing the key data. (Defaults to: `key.pem`)
+     */
+    key?: string | Buffer;
+    /**
+     * An array of trusted certificates. Each element should contain either a filename to load, or a Buffer/String (in PEM format) to be used directly. If this is omitted several well known "root" CAs will be used. - You may need to use this as some environments don't include the CA used by Apple (entrust_2048).
+     */
+    ca?: (string | Buffer)[];
+    /**
+     * File path for private key, certificate and CA certs in PFX or PKCS12 format, or a Buffer containing the PFX data. If supplied will be used instead of certificate and key above.
+     */
+    pfx?: string | Buffer;
+    /**
+     * The passphrase for the connection key, if required
+     */
+    passphrase?: string;
+    /**
+     * Specifies which environment to connect to: Production (if true) or Sandbox - The hostname will be set automatically. (Defaults to NODE_ENV == "production", i.e. false unless the NODE_ENV environment variable is set accordingly)
+     */
+    production?: boolean;
+    /**
+     * Feedback server port (Defaults to: `2196`)
+     */
+    port?: number;
+    /**
+     * Sets the behaviour for triggering the `feedback` event. When `true` the event will be triggered once per connection with an array of timestamp and device token tuples. Otherwise a `feedback` event will be emitted once per token received. (Defaults to: true)
+     */
+    batchFeedback?: boolean;
+    /**
+     * The maximum number of tokens to pass when emitting the event - a value of 0 will cause all tokens to be passed after connection is reset. After this number of tokens are received the `feedback` event will be emitted. (Only applies when `batchFeedback` is enabled)
+     */
+    batchSize?: number;
+    /**
+     * How often to automatically poll the feedback service. Set to `0` to disable. (Defaults to: `3600`)
+     */
+    interval?: number;
+}
+export interface FeedbackData {
+    time: number;
+    device: Device;
+}
+/**
+ * Connection to the Apple Push Notification Feedback Service and if `interval` isn't disabled automatically begins polling the service. Many of the options are the same as `apn.Connection()`
+ */
+export declare class Feedback {
+    constructor(options: FeedbackOptions);
+    /**
+     * Trigger a query of the feedback service. If `interval` is non-zero then this method will be called automatically.
+     */
+    start(): void;
+    /**
+     * You can cancel the interval by calling `feedback.cancel()`. If you do not wish to have the service automatically queried then set `interval` to 0 and use `feedback.start()` to manually invoke it one time.
+     */
+    cancel(): void;
+    /**
+     * Emitted when an error occurs initialising the module. Usually caused by failing to load the certificates.
+     */
+    on(event: "error", listener: (error: Error) => void): Feedback;
+    /**
+     * Emitted when an error occurs receiving or processing the feedback and in the case of a socket error occurring. These errors are usually informational and node-apn will automatically recover.
+     */
+    on(event: "feedbackError", listener: (error: Error) => void): Feedback;
+    /**
+     * Emitted when data has been received from the feedback service, typically once per connection. `feedbackData` is an array of objects, each containing the `time` returned by the server (epoch time) and the `device` a `Buffer` containing the device token.
+     */
+    on(event: "feedback", listener: (feedbackData: FeedbackData[]) => void): Feedback;
+    on(event: string, listener: Function): Feedback;
+}
+
+export declare enum Errors {
+    "noErrorsEncountered" = 0,
+    "processingError" = 1,
+    "missingDeviceToken" = 2,
+    "missingTopic" = 3,
+    "missingPayload" = 4,
+    "invalidTokenSize" = 5,
+    "invalidTopicSize" = 6,
+    "invalidPayloadSize" = 7,
+    "invalidToken" = 8,
+    "apnsShutdown" = 10,
+    "none" = 255,
+    "retryLimitExceeded" = 512,
+    "moduleInitialisationFailed" = 513,
+    "connectionRetryLimitExceeded" = 514, // When a connection is unable to be established. Usually because of a network / SSL error this will be emitted
+    "connectionTerminated" = 515
+}
+
+//Lowercase aliases
+export {Connection as connection};
+export {Device as device};
+export {Errors as error};
+export {Feedback as feedback};
+export {Notification as notification};
diff --git a/apn/tsconfig.json b/apn/tsconfig.json
new file mode 100644
index 0000000000..b71212927a
--- /dev/null
+++ b/apn/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "apn-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/appframework/appframework-tests.ts b/appframework/appframework-tests.ts
index 16cfe9802f..4e5932334a 100644
--- a/appframework/appframework-tests.ts
+++ b/appframework/appframework-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="appframework.d.ts" />
+
 
 af(($: appFrameworkStatic) => {});
 
diff --git a/appframework/appframework.d.ts b/appframework/index.d.ts
similarity index 100%
rename from appframework/appframework.d.ts
rename to appframework/index.d.ts
diff --git a/appframework/tsconfig.json b/appframework/tsconfig.json
new file mode 100644
index 0000000000..c3c50199f7
--- /dev/null
+++ b/appframework/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "appframework-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/appletvjs/README.md b/appletvjs/README.md
index 161282ed69..5d5b7f43ed 100644
--- a/appletvjs/README.md
+++ b/appletvjs/README.md
@@ -2,7 +2,7 @@
 
 ## Referencing AppleTVJS definition files in your code
 
-To do that, simply add `/// <reference path="appletvjs.d.ts" />` at the top of your code.
+To do that, simply add `` at the top of your code.
 
 This will allow you to have intellisense in your AppleTVJS typescript code.
 
diff --git a/appletvjs/appletvjs-tests.ts b/appletvjs/appletvjs-tests.ts
index 8bdda9c633..55f720e26d 100644
--- a/appletvjs/appletvjs-tests.ts
+++ b/appletvjs/appletvjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="appletvjs.d.ts" />
+
 
 //test the global app events and functions
 function test_AppEvents() {
diff --git a/appletvjs/appletvjs.d.ts b/appletvjs/index.d.ts
similarity index 100%
rename from appletvjs/appletvjs.d.ts
rename to appletvjs/index.d.ts
diff --git a/appletvjs/tsconfig.json b/appletvjs/tsconfig.json
new file mode 100644
index 0000000000..3371d6b973
--- /dev/null
+++ b/appletvjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "appletvjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/applicationinsights/applicationinsights-tests.ts b/applicationinsights/applicationinsights-tests.ts
index eb9d5e7019..00c303eff4 100644
--- a/applicationinsights/applicationinsights-tests.ts
+++ b/applicationinsights/applicationinsights-tests.ts
@@ -1,4 +1,3 @@
-///<reference path='applicationinsights.d.ts' />
 import * as appInsights from "applicationinsights";
 
 // basic use
diff --git a/applicationinsights/applicationinsights.d.ts b/applicationinsights/index.d.ts
similarity index 100%
rename from applicationinsights/applicationinsights.d.ts
rename to applicationinsights/index.d.ts
diff --git a/applicationinsights/tsconfig.json b/applicationinsights/tsconfig.json
new file mode 100644
index 0000000000..7769102d83
--- /dev/null
+++ b/applicationinsights/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "applicationinsights-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/arbiter/Arbiter-tests.ts b/arbiter/Arbiter-tests.ts
index fbdbe5b94a..ce7659e76f 100644
--- a/arbiter/Arbiter-tests.ts
+++ b/arbiter/Arbiter-tests.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // May 22 2013
 
-/// <reference path="Arbiter.d.ts" />
+
 
 
 
diff --git a/arbiter/Arbiter.d.ts b/arbiter/index.d.ts
similarity index 100%
rename from arbiter/Arbiter.d.ts
rename to arbiter/index.d.ts
diff --git a/arbiter/tsconfig.json b/arbiter/tsconfig.json
new file mode 100644
index 0000000000..8e4258a8f9
--- /dev/null
+++ b/arbiter/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "arbiter-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/arcgis-js-api/arcgis-js-api-tests.ts b/arcgis-js-api/arcgis-js-api-tests.ts
index bf13a1a0a3..33b7d44960 100644
--- a/arcgis-js-api/arcgis-js-api-tests.ts
+++ b/arcgis-js-api/arcgis-js-api-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="arcgis-js-api.d.ts" />
+
 
 import esri = require("esri");
 import Map = require("esri/map");
diff --git a/arcgis-js-api/arcgis-js-api.d.ts b/arcgis-js-api/index.d.ts
similarity index 100%
rename from arcgis-js-api/arcgis-js-api.d.ts
rename to arcgis-js-api/index.d.ts
diff --git a/arcgis-js-api/tsconfig.json b/arcgis-js-api/tsconfig.json
new file mode 100644
index 0000000000..b7534290e0
--- /dev/null
+++ b/arcgis-js-api/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "arcgis-js-api-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/archiver/archiver-tests.ts b/archiver/archiver-tests.ts
index dcd71ca905..3bef66a44c 100644
--- a/archiver/archiver-tests.ts
+++ b/archiver/archiver-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="archiver.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import Archiver = require('archiver');
 import FS = require('fs');
diff --git a/archiver/archiver.d.ts b/archiver/archiver.d.ts
deleted file mode 100644
index d5133555a4..0000000000
--- a/archiver/archiver.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// Type definitions for archiver v0.15.0
-// Project: https://github.com/archiverjs/node-archiver
-// Definitions by: Esri <https://github.com/archiverjs/node-archiver>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/* =================== USAGE ===================
-
-    import Archiver = require('archiver);
-    var archiver = Archiver.create('zip');
-    archiver.pipe(FS.createWriteStream('xxx'));
-    archiver.append(FS.createReadStream('xxx'));
-    archiver.finalize();
-
- =============================================== */
-
-/// <reference path="../node/node.d.ts" />
-declare module "archiver" {
-    import * as FS from 'fs';
-    import * as STREAM from 'stream';
-    
-    interface nameInterface {
-        name?: string;
-    }
-        
-    interface Archiver extends STREAM.Transform {
-        pipe(writeStream: FS.WriteStream): void;
-        append(readStream: FS.ReadStream, name: nameInterface): void;
-        finalize(): void;
-    }
-    
-    interface Options {
-        
-    }
-    
-    function archiver(format: string, options?: Options): Archiver;
-    
-    namespace archiver {
-        function create(format: string, options?: Options): Archiver;
-    }
-    
-    export = archiver;
-}
diff --git a/archiver/index.d.ts b/archiver/index.d.ts
new file mode 100644
index 0000000000..74a3351b99
--- /dev/null
+++ b/archiver/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for archiver v0.15.0
+// Project: https://github.com/archiverjs/node-archiver
+// Definitions by: Esri <https://github.com/archiverjs/node-archiver>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* =================== USAGE ===================
+
+    import Archiver = require('archiver);
+    var archiver = Archiver.create('zip');
+    archiver.pipe(FS.createWriteStream('xxx'));
+    archiver.append(FS.createReadStream('xxx'));
+    archiver.finalize();
+
+ =============================================== */
+
+/// <reference types="node" />
+
+import * as FS from 'fs';
+import * as STREAM from 'stream';
+
+interface nameInterface {
+    name?: string;
+}
+
+interface Archiver extends STREAM.Transform {
+    pipe(writeStream: FS.WriteStream): void;
+    append(readStream: FS.ReadStream, name: nameInterface): void;
+    finalize(): void;
+}
+
+interface Options {
+
+}
+
+declare function archiver(format: string, options?: Options): Archiver;
+
+declare namespace archiver {
+    function create(format: string, options?: Options): Archiver;
+}
+
+export = archiver;
diff --git a/archiver/tsconfig.json b/archiver/tsconfig.json
new file mode 100644
index 0000000000..f04152848c
--- /dev/null
+++ b/archiver/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "archiver-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/archy/archy-tests.ts b/archy/archy-tests.ts
index b2f62384ff..dba85bafea 100644
--- a/archy/archy-tests.ts
+++ b/archy/archy-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./archy.d.ts" />
 
 import archy = require("archy");
 
diff --git a/archy/archy.d.ts b/archy/archy.d.ts
deleted file mode 100644
index f4e13ef8a9..0000000000
--- a/archy/archy.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Type definitions for archy
-// Project: https://github.com/substack/node-archy
-// Definitions by: vvakame <https://github.com/vvakame/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "archy" {
-    function archy(obj: archy.Data, prefix?: string, opts?: archy.Options): string;
-    function archy(obj: string, prefix?: string, opts?: archy.Options): string;
-
-    namespace archy {
-        interface Data {
-            label: string;
-            nodes?: (Data | string)[];
-        }
-        interface Options {
-            unicode?: boolean;
-        }
-    }
-
-    export = archy;
-}
diff --git a/archy/index.d.ts b/archy/index.d.ts
new file mode 100644
index 0000000000..82b101236c
--- /dev/null
+++ b/archy/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for archy
+// Project: https://github.com/substack/node-archy
+// Definitions by: vvakame <https://github.com/vvakame/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function archy(obj: archy.Data, prefix?: string, opts?: archy.Options): string;
+declare function archy(obj: string, prefix?: string, opts?: archy.Options): string;
+
+declare namespace archy {
+    interface Data {
+        label: string;
+        nodes?: (Data | string)[];
+    }
+    interface Options {
+        unicode?: boolean;
+    }
+}
+
+export = archy;
diff --git a/archy/tsconfig.json b/archy/tsconfig.json
new file mode 100644
index 0000000000..672e65a0ac
--- /dev/null
+++ b/archy/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "archy-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/argparse/argparse-tests.ts b/argparse/argparse-tests.ts
index bf565c5f54..cec1ece95b 100644
--- a/argparse/argparse-tests.ts
+++ b/argparse/argparse-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="argparse.d.ts" />
+
 // near copy of each of the tests from https://github.com/nodeca/argparse/tree/master/examples
 
 import {ArgumentParser, RawDescriptionHelpFormatter} from 'argparse';
diff --git a/argparse/argparse.d.ts b/argparse/argparse.d.ts
deleted file mode 100644
index 886fef8cc9..0000000000
--- a/argparse/argparse.d.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-// Type definitions for argparse v1.0.3
-// Project: https://github.com/nodeca/argparse
-// Definitions by: Andrew Schurman <http://github.com/arcticwaters>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "argparse" {
-	export class ArgumentParser extends ArgumentGroup {
-		constructor(options? : ArgumentParserOptions);
-
-		addSubparsers(options? : SubparserOptions) : SubParser;
-		parseArgs(args? : string[], ns? : Namespace|Object) : any;
-		printUsage() : void;
-		printHelp() : void;
-		formatUsage() : string;
-		formatHelp() : string;
-		parseKnownArgs(args? : string[], ns? : Namespace|Object) : any[];
-		convertArgLineToArg(argLine : string) : string[];
-		exit(status : number, message : string) : void;
-		error(err : string|Error) : void;
-	}
-	
-	interface Namespace {}
-	
-	class SubParser {
-		addParser(name : string, options? : SubArgumentParserOptions) : ArgumentParser;
-	}
-	
-	class ArgumentGroup {
-		addArgument(args : string[], options? : ArgumentOptions) : void;
-		addArgumentGroup(options? : ArgumentGroupOptions) : ArgumentGroup;
-		addMutuallyExclusiveGroup(options? : {required : boolean}) : ArgumentGroup;
-		setDefaults(options? : {}) : void;
-		getDefault(dest : string) : any;
-	}
-	
-	interface SubparserOptions {
-		title? : string;
-		description? : string;
-		prog? : string;
-		parserClass? : {new() : any};
-		action? : string;
-		dest? : string;
-		help? : string;
-		metavar? : string;
-	}
-	
-	interface SubArgumentParserOptions extends ArgumentParserOptions {
-		aliases? : string[];
-		help? : string;
-	}
-	
-	interface ArgumentParserOptions {
-		description? : string;
-		epilog? : string;
-		addHelp? : boolean;
-		argumentDefault? : any;
-		parents? : ArgumentParser[];
-		prefixChars? : string;
-		formatterClass? : {new() : HelpFormatter|ArgumentDefaultsHelpFormatter|RawDescriptionHelpFormatter|RawTextHelpFormatter};
-		prog? : string;
-		usage? : string;
-		version? : string;
-	}
-	
-	interface ArgumentGroupOptions {
-		prefixChars? : string;
-		argumentDefault? : any;
-		title? : string;
-		description? : string;
-	}
-
-	export class HelpFormatter {} 	
-	export class ArgumentDefaultsHelpFormatter {}
-	export class RawDescriptionHelpFormatter {}
-	export class RawTextHelpFormatter {}
-
-	interface ArgumentOptions {
-		action? : string;
-		optionStrings? : string[];
-		dest? : string;
-		nargs? : string|number;
-		constant? : any;
-		defaultValue? : any;
-		type? : string|Function;
-		choices? : string|string[];
-		required? : boolean;
-		help? : string;
-		metavar? : string;
-	}
-}
diff --git a/argparse/index.d.ts b/argparse/index.d.ts
new file mode 100644
index 0000000000..845d5d8fd3
--- /dev/null
+++ b/argparse/index.d.ts
@@ -0,0 +1,89 @@
+// Type definitions for argparse v1.0.3
+// Project: https://github.com/nodeca/argparse
+// Definitions by: Andrew Schurman <http://github.com/arcticwaters>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export declare class ArgumentParser extends ArgumentGroup {
+    constructor(options?: ArgumentParserOptions);
+
+    addSubparsers(options?: SubparserOptions): SubParser;
+    parseArgs(args?: string[], ns?: Namespace | Object): any;
+    printUsage(): void;
+    printHelp(): void;
+    formatUsage(): string;
+    formatHelp(): string;
+    parseKnownArgs(args?: string[], ns?: Namespace | Object): any[];
+    convertArgLineToArg(argLine: string): string[];
+    exit(status: number, message: string): void;
+    error(err: string | Error): void;
+}
+
+interface Namespace { }
+
+declare class SubParser {
+    addParser(name: string, options?: SubArgumentParserOptions): ArgumentParser;
+}
+
+declare class ArgumentGroup {
+    addArgument(args: string[], options?: ArgumentOptions): void;
+    addArgumentGroup(options?: ArgumentGroupOptions): ArgumentGroup;
+    addMutuallyExclusiveGroup(options?: { required: boolean }): ArgumentGroup;
+    setDefaults(options?: {}): void;
+    getDefault(dest: string): any;
+}
+
+interface SubparserOptions {
+    title?: string;
+    description?: string;
+    prog?: string;
+    parserClass?: { new (): any };
+    action?: string;
+    dest?: string;
+    help?: string;
+    metavar?: string;
+}
+
+interface SubArgumentParserOptions extends ArgumentParserOptions {
+    aliases?: string[];
+    help?: string;
+}
+
+interface ArgumentParserOptions {
+    description?: string;
+    epilog?: string;
+    addHelp?: boolean;
+    argumentDefault?: any;
+    parents?: ArgumentParser[];
+    prefixChars?: string;
+    formatterClass?: { new (): HelpFormatter | ArgumentDefaultsHelpFormatter | RawDescriptionHelpFormatter | RawTextHelpFormatter };
+    prog?: string;
+    usage?: string;
+    version?: string;
+}
+
+interface ArgumentGroupOptions {
+    prefixChars?: string;
+    argumentDefault?: any;
+    title?: string;
+    description?: string;
+}
+
+export declare class HelpFormatter { }
+export declare class ArgumentDefaultsHelpFormatter { }
+export declare class RawDescriptionHelpFormatter { }
+export declare class RawTextHelpFormatter { }
+
+interface ArgumentOptions {
+    action?: string;
+    optionStrings?: string[];
+    dest?: string;
+    nargs?: string | number;
+    constant?: any;
+    defaultValue?: any;
+    type?: string | Function;
+    choices?: string | string[];
+    required?: boolean;
+    help?: string;
+    metavar?: string;
+}
diff --git a/argparse/tsconfig.json b/argparse/tsconfig.json
new file mode 100644
index 0000000000..ea8bcd979a
--- /dev/null
+++ b/argparse/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "argparse-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/asana/asana-tests.ts b/asana/asana-tests.ts
index c1531ec9dd..3bef3e2c07 100644
--- a/asana/asana-tests.ts
+++ b/asana/asana-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="asana.d.ts" />
-/// <reference path="../request/request.d.ts" />
+/// <reference types="node" />
 
 import * as asana from 'asana';
 import * as util from 'util';
diff --git a/asana/asana.d.ts b/asana/asana.d.ts
deleted file mode 100644
index 61cb54d26f..0000000000
--- a/asana/asana.d.ts
+++ /dev/null
@@ -1,2476 +0,0 @@
-// Type definitions for node-asana 0.14.0
-// Project: https://github.com/Asana/node-asana
-// Definitions by: Qubo <https://github.com/tkqubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../bluebird/bluebird.d.ts" />
-/// <reference path="../request/request.d.ts" />
-
-declare module "asana" {
-  import * as Promise from 'bluebird';
-
-  namespace asana {
-    var Client: ClientStatic;
-
-    interface ClientStatic {
-      /**
-       * Constructs a Client with instances of all the resources using the dispatcher.
-       * It also keeps a reference to the dispatcher so that way the end user can have
-       * access to it.
-       * @class
-       * @classdesc A wrapper for the Asana API which is authenticated for one user
-       * @param {Dispatcher} dispatcher The request dispatcher to use
-       * @param {Object} options        Options to configure the client
-       * @param {String} [clientId]     ID of the client, required for Oauth
-       * @param {String} [clientSecret] Secret key, for some Oauth flows
-       * @param {String} [redirectUri]  Default redirect URI for this client
-       * @param {String} [asanaBaseUrl] Base URL for Asana, for debugging
-       */
-      (dispatcher: Dispatcher, options?: ClientOptions): asana.Client;
-      /**
-       * Creates a new client.
-       * @param {Object} options Options for specifying the client, see constructor.
-       */
-      create(options?: ClientOptions): Client;
-    }
-
-    /** Options to configure the client */
-    interface ClientOptions extends DispatcherOptions {
-      clientId?: string|number;
-      clientSecret?: string;
-      redirectUri?: string;
-      asanaBaseUrl?: string;
-    }
-
-    interface Client {
-      /**
-       * Ensures the client is authorized to make requests. Kicks off the
-       * configured Oauth flow, if any.
-       *
-       * @returns {Promise<Client>} A promise that resolves to this client when
-       *     authorization is complete.
-       */
-      authorize(): Promise<Client>;
-
-      /**
-       * Configure the Client to use a user's API Key and then authenticate
-       * through HTTP Basic Authentication. This should only be done for testing,
-       * as requests using Oauth can provide more security, higher rate limits, and
-       * more features.
-       * @param  {String} apiKey The Asana Api Key of the user
-       * @return {Client}        this
-       * @param apiKey
-       * @return
-       */
-      useBasicAuth(apiKey: string): this;
-
-      /**
-       * Configure the client to authenticate using a Personal Access Token.
-       * @param  {String} accessToken The Personal Access Token to use for
-       * authenticating requests.
-       * @return {Client}             this
-       * @param accessToken
-       * @return
-       */
-      useAccessToken(accessToken: string): this;
-
-      /**
-       * Configure the client to authenticate via Oauth. Credentials can be
-       * supplied, or they can be obtained by running an Oauth flow.
-       * @param  {Object} options Options for Oauth. Includes any options for
-       *     the selected flow.
-       * @option {Function} [flowType]  Type of OauthFlow to use to obtain user
-       *     authorization. Defaults to autodetect based on environment.
-       * @option {Object} [credentials] Credentials to use; no flow required to
-       *     obtain authorization. This object should at a minimum contain an
-       *     `access_token` string field.
-       * @return {Client} this
-       * @param options
-       * @return
-       */
-      useOauth(options?: auth.OauthAuthenticatorOptions): this;
-
-      /**
-       * The internal dispatcher. This is mostly used by the resources but provided
-       * for custom requests to the API or API features that have not yet been added
-       * to the client.
-       * @type {Dispatcher}
-       */
-      dispatcher: Dispatcher;
-      /**
-       * An instance of the Attachments resource.
-       * @type {Attachments}
-       */
-      attachments: resources.Attachments;
-      /**
-       * An instance of the Events resource.
-       * @type {Events}
-       */
-      events: resources.Events;
-      /**
-       * An instance of the Projects resource.
-       * @type {Projects}
-       */
-      projects: resources.Projects;
-      /**
-       * An instance of the Stories resource.
-       * @type {Stories}
-       */
-      stories: resources.Stories;
-      /**
-       * An instance of the Tags resource.
-       * @type {Tags}
-       */
-      tags: resources.Tags;
-      /**
-       * An instance of the Tasks resource.
-       * @type {Tasks}
-       */
-      tasks: resources.Tasks;
-      /**
-       * An instance of the Teams resource.
-       * @type {Teams}
-       */
-      teams: resources.Teams;
-      /**
-       * An instance of the Users resource.
-       * @type {Users}
-       */
-      users: resources.Users;
-      /**
-       * An instance of the Workspaces resource.
-       * @type {Workspaces}
-       */
-      workspaces: resources.Workspaces;
-      /**
-       * Store off Oauth info.
-       */
-      app: auth.App;
-    }
-
-    var Dispatcher: DispatcherStatic;
-
-    interface DispatcherStatic {
-      /**
-       * Creates a dispatcher which will act as a basic wrapper for making HTTP
-       * requests to the API, and handle authentication.
-       * @class
-       * @classdesc A HTTP wrapper for the Asana API
-       * @param {Object} options for default behavior of the Dispatcher
-       * @option {Authenticator} [authenticator] Object to use for authentication.
-       *     Can also be set later with `setAuthenticator`.
-       * @option {String} [retryOnRateLimit] Automatically handle `RateLimitEnforced`
-       *     errors by sleeping and retrying after the waiting period.
-       * @option {Function} [handleUnauthorized] Automatically handle
-       *     `NoAuthorization` with the callback. If the callback returns `true`
-       *     (or a promise resolving to `true), will retry the request.
-       * @option {String} [asanaBaseUrl] Base URL for Asana, for debugging
-       * @option {Number} [requestTimeout] Timeout (in milliseconds) to wait for the
-       *     request to finish.
-       */
-      new (options?: DispatcherOptions): Dispatcher;
-
-      /**
-       * Default handler for requests that are considered unauthorized.
-       * Requests that the authenticator try to refresh its credentials if
-       * possible.
-       * @return {Promise<boolean>} True iff refresh was successful, false if not.
-       * @return
-       */
-      maybeReauthorize(): Promise<boolean>;
-
-      /**
-       * The relative API path for the current version of the Asana API.
-       * @type {String}
-       */
-      API_PATH : string;
-    }
-
-    interface DispatcherOptions {
-      authenticator?: auth.Authenticator;
-      retryOnRateLimit?: boolean;
-      handleUnauthorized?: () => boolean|Promise<boolean>;
-      requestTimeout?: string;
-    }
-
-    interface Dispatcher {
-      /**
-       * Creates an Asana API Url by concatenating the ROOT_URL with path provided.
-       * @param  {String} path The path
-       * @return {String}      The url
-       * @param path
-       * @return
-       */
-      url(path: string): string;
-
-      /**
-       * Configure the authentication mechanism to use.
-       * @returns {Dispatcher} this
-       * @param authenticator
-       * @return
-       */
-      setAuthenticator(authenticator: auth.Authenticator): this;
-
-      /**
-       * Ensure the dispatcher is authorized to make requests. Call this before
-       * making any API requests.
-       *
-       * @returns {Promise} Resolves when the dispatcher is authorized, rejected if
-       *     there was a problem authorizing.
-       * @return
-       */
-      authorize(): Promise<void>;
-
-      /**
-       * Dispatches a request to the Asana API. The request parameters are passed to
-       * the request module.
-       * @param  {Object}  params The params for request
-       * @param  {Object}  [dispatchOptions] Options for handling request/response
-       * @return {Promise}        The response for the request
-       * @param params
-       * @param dispatchOptions?
-       * @return
-       */
-      dispatch(params: any, dispatchOptions?: any): Promise<any>;
-
-      /**
-       * Dispatches a GET request to the Asana API.
-       * @param  {String}  path    The path of the API
-       * @param  {Object}  [query] The query params
-       * @param  {Object}  [dispatchOptions] Options for handling the request and
-       *     response. See `dispatch`.
-       * @return {Promise}         The response for the request
-       * @param path
-       * @param query?
-       * @param dispatchOptions?
-       * @return
-       */
-      get(path: string, query?: any, dispatchOptions?: any): Promise<any>;
-
-      /**
-       * Dispatches a POST request to the Asana API.
-       * @param  {String} path The path of the API
-       * @param  {Object} data The data to be sent
-       * @param  {Object}  [dispatchOptions] Options for handling the request and
-       *     response. See `dispatch`.
-       * @return {Promise}     The response for the request
-       * @param path
-       * @param data
-       * @param dispatchOptions?
-       * @return
-       */
-      post(path: string, data: any, dispatchOptions?: any): Promise<any>;
-
-      /**
-       * Dispatches a PUT request to the Asana API.
-       * @param  {String} path The path of the API
-       * @param  {Object} data The data to be sent
-       * @param  {Object}  [dispatchOptions] Options for handling the request and
-       *     response. See `dispatch`.
-       * @return {Promise}     The response for the request
-       * @param path
-       * @param data
-       * @param dispatchOptions?
-       * @return
-       */
-      put(path: string, data: any, dispatchOptions?: any): Promise<any>;
-
-      /**
-       * Dispatches a DELETE request to the Asana API.
-       * @param  {String} path The path of the API
-       * @param  {Object}  [dispatchOptions] Options for handling the request and
-       *     response. See `dispatch`.
-       * @return {Promise}     The response for the request
-       * @param path
-       * @param dispatchOptions?
-       * @return
-       */
-      delete(path: string, dispatchOptions?: any): Promise<any>;
-
-      /**
-       * The base URL for Asana
-       * @type {String}
-       */
-      asanaBaseUrl : string;
-
-      /**
-       * Whether requests should be automatically retried if rate limited.
-       * @type {Boolean}
-       */
-      retryOnRateLimit : boolean;
-
-      /**
-       * Handler for unauthorized requests which may seek reauthorization.
-       * Default behavior is available if configured with an Oauth authenticator
-       * that has a refresh token, and will refresh the current access token.
-       * @type {Function}
-       */
-      handleUnauthorized : () => boolean|Promise<boolean>;
-
-      /**
-       * The amount of time in milliseconds to wait for a request to finish.
-       * @type {Number}
-       */
-      requestTimeout : number;
-    }
-
-    namespace auth {
-      var BasicAuthenticator: BasicAuthenticatorStatic;
-
-      interface BasicAuthenticatorStatic {
-        /**
-         * @param apiKey
-         */
-        new (apiKey: string): BasicAuthenticator;
-      }
-
-      interface BasicAuthenticator extends Authenticator {
-        /**
-         * @param {Object} request The request to modify, for the `request` library.
-         * @return {Object} The `request` parameter, modified to include authentication
-         *     information using the stored credentials.
-         * @param request
-         * @return
-         */
-        authenticateRequest(request: BasicAuthenticatorRequest): BasicAuthenticatorRequest;
-      }
-
-      interface BasicAuthenticatorRequest {
-        auth : {
-          username : string;
-          password : string;
-        }
-      }
-
-      var OauthAuthenticator: OauthAuthenticatorStatic;
-
-      interface OauthAuthenticatorStatic {
-        /**
-         * Creates an authenticator that uses Oauth for authentication.
-         *
-         * @param {Object} options Configure the authenticator; must specify one
-         *     of `flow` or `credentials`.
-         * @option {App}           app           The app being authenticated for.
-         * @option {OauthFlow}     [flow]        The flow to use to get credentials
-         *     when needed.
-         * @option {String|Object} [credentials] Initial credentials to use. This can
-         *     be either the object returned from an access token request (which
-         *     contains the token and some other metadata) or just the `access_token`
-         *     field.
-         * @constructor
-         */
-        new (options: OauthAuthenticatorOptions): OauthAuthenticator;
-      }
-
-      interface OauthAuthenticatorOptions {
-        flowType?: auth.FlowType;
-        credentials?: Credentials|string;
-      }
-
-      interface Credentials {
-        access_token?: string;
-        refresh_token?: string;
-      }
-
-      interface OauthAuthenticator extends Authenticator {
-        /**
-         * @param {Object} request The request to modify, for the `request` library.
-         * @return {Object} The `request` parameter, modified to include authentication
-         *     information using the stored credentials.
-         * @param request
-         * @return
-         */
-        authenticateRequest(request: OauthAuthenticatorRequest): OauthAuthenticatorRequest;
-      }
-
-      interface OauthAuthenticatorRequest {
-        /**
-         * When browserify-d, the `auth` component of the `request` library
-         * doesn't work so well, so we just manually set the bearer token instead.
-         */
-        headers : {
-          Authorization : string;
-        }
-      }
-
-      /**
-       * A layer to abstract the differences between using different types of
-       * authentication (Oauth vs. Basic). The Authenticator is responsible for
-       * establishing credentials and applying them to outgoing requests.
-       * @constructor
-       */
-      interface Authenticator {
-        /**
-         * Establishes credentials.
-         *
-         * @return {Promise} Resolves when initial credentials have been
-         *     completed and `authenticateRequest` calls can expect to succeed.
-         * @return
-         */
-        establishCredentials(): Promise<void>;
-
-        /**
-         * Attempts to refresh credentials, if possible, given the current credentials.
-         *
-         * @return {Promise} Resolves to `true` if credentials have been successfully
-         *     established and `authenticateRequests` can expect to succeed, else
-         *     resolves to `false`.
-         * @return
-         */
-        refreshCredentials(): Promise<boolean>;
-      }
-
-      var App: AppStatic;
-
-      interface AppStatic {
-        /**
-         * An abstraction around an App used with Asana.
-         *
-         * @options {Object} Options to construct the app
-         * @option {String} clientId       The ID of the app
-         * @option {String} [clientSecret] The secret key, if available here
-         * @option {String} [redirectUri]  The default redirect URI
-         * @option {String} [scope]        Scope to use, supports `default` and `scim`
-         * @option {String} [asanaBaseUrl] Base URL to use for Asana, for debugging
-         * @constructor
-         */
-        new (options: AppOptions): App;
-      }
-
-      interface AppOptions extends AsanaAuthorizeUrlOptions {
-        clientId?: string|number;
-        clientSecret?: string;
-        scope?: string;
-      }
-
-      interface App {
-        /**
-         * @param {Object} options  Overrides to the app's defaults
-         * @option {String} asanaBaseUrl
-         * @option {String} redirectUri
-         * @returns {String} The URL used to authorize a user for the app.
-         * @param options
-         * @return
-         */
-        asanaAuthorizeUrl(options?: AsanaAuthorizeUrlOptions): string;
-
-        /**
-         * @param {Object} options  Overrides to the app's defaults
-         * @option {String} asanaBaseUrl
-         * @option {String} redirectUri
-         * @returns {String} The URL used to acquire an access token.
-         * @param options
-         * @return
-         */
-        asanaTokenUrl(options?: AsanaAuthorizeUrlOptions): string;
-
-        /**
-         * @param {String} code An authorization code obtained via `asanaAuthorizeUrl`.
-         * @param {Object} options  Overrides to the app's defaults
-         * @option {String} asanaBaseUrl
-         * @option {String} redirectUri
-         * @return {Promise<Object>} The token, which will include the `access_token`
-         *     used for API access, as well as a `refresh_token` which can be stored
-         *     to get a new access token without going through the flow again.
-         * @param code
-         * @param options
-         * @return
-         */
-        accessTokenFromCode(code: string, options?: AsanaAuthorizeUrlOptions): Promise<Credentials>;
-
-        /**
-         * @param {String} refreshToken A refresh token obtained via Oauth.
-         * @param {Object} options Overrides to the app's defaults
-         * @option {String} asanaBaseUrl
-         * @option {String} redirectUri
-         * @return {Promise<Object>} The token, which will include the `access_token`
-         *     used for API access.
-         * @param refreshToken
-         * @param options
-         * @return
-         */
-        accessTokenFromRefreshToken(refreshToken: string, options: AsanaAuthorizeUrlOptions): Promise<Credentials>;
-
-        scope : string;
-
-        asanaBaseUrl : string;
-      }
-
-      interface AsanaAuthorizeUrlOptions {
-        redirectUri?: string;
-        asanaBaseUrl?: string;
-      }
-
-      var OauthError: OauthErrorStatic;
-
-      interface OauthErrorStatic {
-        /**
-         * @param options {Object} A data blob parsed from a query string or JSON
-         * response from the Asana API
-         * @option {String} error The string code identifying the error.
-         * @option {String} [error_uri] A link to help and information about the error.
-         * @option {String} [error_description] A description of the error.
-         * @constructor
-         */
-        new (options: OauthErrorOptions): OauthError;
-      }
-
-      interface OauthErrorOptions {
-        error?: string;
-        error_uri?: string;
-        error_description?: string;
-      }
-
-      interface OauthError extends Error {
-      }
-
-      /**
-       * Auto-detects the type of Oauth flow to use that's appropriate to the
-       * environment.
-       *
-       * @returns {Function|null} The type of Oauth flow to use, or null if no
-       *     appropriate type could be determined.
-       * @param env
-       * @return
-       */
-      function autoDetect(env: any): Function;
-
-      var RedirectFlow: RedirectFlowStatic;
-
-      interface RedirectFlowStatic extends FlowType {
-        /**
-         * An Oauth flow that runs in the browser and requests user authorization by
-         * redirecting to an authorization page on Asana, and redirecting back with
-         * the credentials.
-         * @param {Object} options See `BaseBrowserFlow` for options.
-         * @constructor
-         */
-        new (options: any): RedirectFlow;
-      }
-
-      interface RedirectFlow extends BaseBrowserFlow {
-      }
-
-      var PopupFlow: PopupFlowStatic;
-
-      interface PopupFlowStatic extends FlowType {
-        /**
-         * An Oauth flow that runs in the browser and requests user authorization by
-         * popping up a window and prompting the user.
-         * @param {Object} options See `BaseBrowserFlow` for options.
-         * @constructor
-         */
-        new (options: any): PopupFlow;
-      }
-
-      interface PopupFlow extends BaseBrowserFlow {
-        /**
-         * @param popupWidth
-         * @param popupHeight
-         */
-        _popupParams(popupWidth: number, popupHeight: number): void;
-
-        runReceiver(): void;
-      }
-
-      var NativeFlow: NativeFlowStatic;
-
-      interface NativeFlowStatic extends FlowType {
-        /**
-         * An Oauth flow that can be run from the console or an app that does
-         * not have the ability to open and manage a browser on its own.
-         * @param {Object} options
-         * @option {App} app App to authenticate for
-         * @option {String function(String)} [instructions] Function returning the
-         *     instructions to output to the user. Passed the authorize url.
-         * @option {String function()} [prompt] String to output immediately before
-         *     waiting for a line from stdin.
-         * @constructor
-         */
-        new (options: any): NativeFlow;
-      }
-
-      interface NativeFlow extends Flow {
-        /**
-         * Run the Oauth flow, prompting the user to go to the authorization URL
-         * and enter the code it displays when finished.
-         *
-         * @return {Promise<Object>} The access token object, which will include
-         *     `access_token` and `refresh_token`.
-         */
-        run(): void;
-
-        /**
-         * @param {String} code An authorization code obtained via `asanaAuthorizeUrl`.
-         * @return {Promise<Object>} The token, which will include the `access_token`
-         *     used for API access, as well as a `refresh_token` which can be stored
-         *     to get a new access token without going through the flow again.
-         * @param code
-         */
-        accessToken(code: string): void;
-
-        /**
-         * @return {Promise} The access token, which will include a refresh token
-         *     that can be stored in the future to create a client without going
-         *     through the Oauth flow.
-         * @param url
-         * @return
-         */
-        promptForCode(url: string): any;
-      }
-
-      var ChromeExtensionFlow: ChromeExtensionFlowStatic;
-
-      interface ChromeExtensionFlowStatic extends FlowType {
-        /**
-         * An Oauth flow that runs in a Chrome browser extension and requests user
-         * authorization by opening a temporary tab to prompt the user.
-         * @param {Object} options See `BaseBrowserFlow` for options, plus the below:
-         * @options {String} [receiverPath] Full path and filename from the base
-         *     directory of the extension to the receiver page. This is an HTML file
-         *     that has been made web-accessible, and that calls the receiver method
-         *     `Asana.auth.ChromeExtensionFlow.runReceiver();`.
-         * @constructor
-         */
-        new (options: any): ChromeExtensionFlow;
-      }
-
-      interface ChromeExtensionFlow extends BaseBrowserFlow {
-        /**
-         * Runs the receiver code to send the Oauth result to the requesting tab.
-         */
-        runReceiver(): void;
-      }
-
-      var BaseBrowserFlow: BaseBrowserFlowStatic;
-
-      interface BaseBrowserFlowStatic extends FlowType {
-        /**
-         * A base class for any flow that runs in the browser. All subclasses use the
-         * "implicit grant" flow to authenticate via the browser.
-         * @param {Object} options
-         * @option {App} app The app this flow is for
-         * @option {String} [redirectUri] The URL that Asana should redirect to once
-         *     user authorization is complete. Defaults to the URL configured in
-         *     the app, and if none then the current page URL.
-         * @constructor
-         */
-        new (options: any): BaseBrowserFlow;
-      }
-
-      interface BaseBrowserFlow extends Flow {
-        /**
-         * @param {String} authUrl The URL the user should be navigated to in order
-         *     to authorize the app.
-         * @param {String} state   The unique state generated for this auth request.
-         * @return {Promise} Resolved when authorization has successfully started,
-         *     i.e. the user has been navigated to a page requesting authorization.
-         * @param authUrl
-         * @param state
-         * @return
-         */
-        startAuthorization(authUrl: string, state: string): any;
-
-        /**
-         * @return {Promise<Object>} Credentials returned from Oauth.
-         * @param state
-         */
-        finishAuthorization(state: string): void;
-
-        /**
-         * @return {String} The URL to redirect to that will receive the
-         * @return
-         */
-        receiverUrl(): string;
-
-        /**
-         * @return {String} The URL to redirect to that will receive the
-         * @return
-         */
-        asanaBaseUrl(): string;
-
-        /**
-         * @returns {String} Generate a new unique state parameter for a request.
-         * @return
-         */
-        getStateParam(): string;
-      }
-
-      interface FlowType {
-        new (options: any): Flow;
-      }
-
-      interface Flow {
-        /**
-         * @returns {String} The URL used to authorize the user for the app.
-         * @return
-         */
-        authorizeUrl(): string;
-
-        /**
-         * Run the appropriate parts of the Oauth flow, attempting to establish user
-         * authorization.
-         * @returns {Promise<Object>} A promise that resolves to the Oauth credentials.
-         */
-        run(): void;
-      }
-    }
-
-    namespace errors {
-      class AsanaError extends Error {
-        /**
-         * @param message
-         * @return
-         */
-        constructor(message: any);
-
-        code: number;
-        value: any;
-      }
-
-      class Forbidden extends AsanaError {
-        /**
-         * @param value
-         * @return
-         */
-        constructor(value: any);
-      }
-
-
-      class InvalidRequest extends AsanaError {
-        /**
-         * @param value
-         * @return
-         */
-        constructor(value: any);
-      }
-
-      class NoAuthorization extends AsanaError {
-        /**
-         * @param value
-         * @return
-         */
-        constructor(value: any);
-      }
-
-      class NotFound extends AsanaError {
-        /**
-         * @param value
-         * @return
-         */
-        constructor(value: any);
-      }
-
-      class RateLimitEnforced extends AsanaError {
-        /**
-         * @param value
-         * @return
-         */
-        constructor(value: any);
-      }
-
-      class ServerError extends AsanaError {
-        /**
-         * @param value
-         * @return
-         */
-        constructor(value: any);
-      }
-    }
-
-    namespace resources {
-      interface AttachmentsStatic {
-        /**
-         * @param dispatcher
-         */
-        new (dispatcher: Dispatcher): Attachments;
-      }
-
-      namespace Attachments {
-        interface Type extends Resource {
-          created_at: string;
-          permanent_url: string;
-          download_url: string;
-          view_url: string;
-          host: string;
-          parent: Resource;
-        }
-      }
-
-      var Attachments: AttachmentsStatic;
-
-      /**
-       * An _attachment_ object represents any file attached to a task in Asana,
-       * whether it's an uploaded file or one associated via a third-party service
-       * such as Dropbox or Google Drive.
-       * @class
-       * @param {Dispatcher} dispatcher The API dispatcher
-       */
-      interface Attachments extends Resource {
-        /**
-         * * Returns the full record for a single attachment.
-         *   * @param {Number} attachment Globally unique identifier for the attachment.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The requested resource
-         * @param attachment
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findById(attachment: number, params?: Params, dispatchOptions?: any): Promise<Attachments.Type>;
-
-        /**
-         * * Returns the compact records for all attachments on the task.
-         *   * @param {Number} task Globally unique identifier for the task.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findByTask(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Attachments.Type>>;
-      }
-
-      interface EventsStatic {
-        /**
-         * @param dispatcher
-         * @return
-         */
-        new (dispatcher: Dispatcher): Events;
-      }
-
-      var Events: EventsStatic;
-
-      /**
-       * An _event_ is an object representing a change to a resource that was observed
-       * by an event subscription.
-       *
-       * In general, requesting events on a resource is faster and subject to higher
-       * rate limits than requesting the resource itself. Additionally, change events
-       * bubble up - listening to events on a project would include when stories are
-       * added to tasks in the project, even on subtasks.
-       *
-       * Establish an initial sync token by making a request with no sync token.
-       * The response will be a `412` error - the same as if the sync token had
-       * expired.
-       *
-       * Subsequent requests should always provide the sync token from the immediately
-       * preceding call.
-       *
-       * Sync tokens may not be valid if you attempt to go 'backward' in the history
-       * by requesting previous tokens, though re-requesting the current sync token
-       * is generally safe, and will always return the same results.
-       *
-       * When you receive a `412 Precondition Failed` error, it means that the
-       * sync token is either invalid or expired. If you are attempting to keep a set
-       * of data in sync, this signals you may need to re-crawl the data.
-       *
-       * Sync tokens always expire after 24 hours, but may expire sooner, depending on
-       * load on the service.
-       * @class
-       * @param {Dispatcher} dispatcher The API dispatcher
-       */
-      interface Events extends Resource { }
-
-      interface ProjectsStatic {
-        /**
-         * @param dispatcher
-         */
-        new (dispatcher: Dispatcher): Projects;
-      }
-
-      namespace Projects {
-        interface Type extends Resource {
-          created_at: string;
-          modified_at: string;
-          due_date: string;
-          current_status: Status;
-          public: boolean;
-          archived: boolean;
-          notes: string;
-          color: string;
-          workspace: Resource;
-          team: Resource;
-          members: Resource[];
-          followers: Resource[];
-        }
-
-        interface CreateParams {
-          name?: string;
-          team?: number;
-          public?: boolean;
-          due_date: string;
-          notes?: string;
-          color?: string;
-        }
-
-        interface FollowersParams {
-          followers: (number|string)[];
-        }
-
-        interface MembersParams {
-          members: (number|string)[];
-        }
-
-        interface Status {
-          color: string;
-          text: string;
-          html_text: string;
-          modified_at: string;
-          author: Resource;
-        }
-
-        interface FindAllParams extends PaginationParams {
-          team?: number;
-          archived?: boolean;
-        }
-
-        interface FindByParams extends PaginationParams {
-          archived?: boolean;
-        }
-      }
-
-      var Projects: ProjectsStatic;
-
-      /**
-       * A _project_ represents a prioritized list of tasks in Asana. It exists in a
-       * single workspace or organization and is accessible to a subset of users in
-       * that workspace or organization, depending on its permissions.
-       *
-       * Projects in organizations are shared with a single team. You cannot currently
-       * change the team of a project via the API. Non-organization workspaces do not
-       * have teams and so you should not specify the team of project in a
-       * regular workspace.
-       * @class
-       * @param {Dispatcher} dispatcher The API dispatcher
-       */
-      interface Projects extends Resource {
-        /**
-         * * Creates a new project in a workspace or team.
-         * *
-         * * Every project is required to be created in a specific workspace or
-         * * organization, and this cannot be changed once set. Note that you can use
-         * * the `workspace` parameter regardless of whether or not it is an
-         * * organization.
-         * *
-         * * If the workspace for your project _is_ an organization, you must also
-         * * supply a `team` to share the project with.
-         * *
-         * * Returns the full record of the newly created project.
-         *   * @param {Object} data Data for the request
-         *   * @param {String} data.workspace The workspace or organization to create the project in.
-         *   * @param {String} [data.team] If creating in an organization, the specific team to create the
-         *   * project in.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        create(data: Projects.CreateParams & { workspace: number }, dispatchOptions?: any): Promise<Projects.Type>;
-
-        /**
-         * * If the workspace for your project _is_ an organization, you must also
-         * * supply a `team` to share the project with.
-         * *
-         * * Returns the full record of the newly created project.
-         *   * @param {Number} workspace The workspace or organization to create the project in.
-         *   * @param {Object} data Data for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param workspace
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        createInWorkspace(workspace: number, data: Projects.CreateParams, dispatchOptions?: any): Promise<Projects.Type>;
-
-        /**
-         * * Creates a project shared with the given team.
-         * *
-         * * Returns the full record of the newly created project.
-         *   * @param {Number} team The team to create the project in.
-         *   * @param {Object} data Data for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param team
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        createInTeam(team: number, data: Projects.CreateParams, dispatchOptions?: any): Promise<Projects.Type>;
-
-        /**
-         * * Returns the complete project record for a single project.
-         *   * @param {Number} project The project to get.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The requested resource
-         * @param project
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findById(project: number, params?: Params, dispatchOptions?: any): Promise<Projects.Type>;
-
-        /**
-         * * A specific, existing project can be updated by making a PUT request on the
-         * * URL for that project. Only the fields provided in the `data` block will be
-         * * updated; any unspecified fields will remain unchanged.
-         * *
-         * * When using this method, it is best to specify only those fields you wish
-         * * to change, or else you may overwrite changes made by another user since
-         * * you last retrieved the task.
-         * *
-         * * Returns the complete updated project record.
-         *   * @param {Number} project The project to update.
-         *   * @param {Object} data Data for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param project
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        update(project: number, data: Projects.CreateParams, dispatchOptions?: any): Promise<Projects.Type>;
-
-        /**
-         * * A specific, existing project can be deleted by making a DELETE request
-         * * on the URL for that project.
-         * *
-         * * Returns an empty data record.
-         *   * @param {Number} project The project to delete.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param project
-         * @param dispatchOptions?
-         * @return
-         */
-        delete(project: number, dispatchOptions?: any): Promise<void>;
-
-        /**
-         * * Returns the compact project records for some filtered set of projects.
-         * * Use one or more of the parameters provided to filter the projects returned.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {String} [params.workspace] The workspace or organization to filter projects on.
-         *   * @param {String} [params.team] The team to filter projects on.
-         *   * @param {Boolean} [params.archived] Only return projects whose `archived` field takes on the value of
-         *   * this parameter.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findAll(params?: Projects.FindAllParams, dispatchOptions?: any): Promise<ResourceList<Projects.Type>>;
-
-        /**
-         * * Returns the compact project records for all projects in the workspace.
-         *   * @param {Number} workspace The workspace or organization to find projects in.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Boolean} [params.archived] Only return projects whose `archived` field takes on the value of
-         *   * this parameter.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param workspace
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findByWorkspace(workspace: number, params?: Projects.FindByParams, dispatchOptions?: any): Promise<ResourceList<Projects.Type>>;
-
-        /**
-         * * Returns the compact project records for all projects in the team.
-         *   * @param {Number} team The team to find projects in.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Boolean} [params.archived] Only return projects whose `archived` field takes on the value of
-         *   * this parameter.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param team
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findByTeam(team: number, params?: Projects.FindByParams, dispatchOptions?: any): Promise<ResourceList<Projects.Type>>;
-
-        /**
-         * * Returns compact records for all sections in the specified project.
-         *   * @param {Number} project The project to get sections from.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param project
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        sections(project: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
-
-        /**
-         * * Returns the compact task records for all tasks within the given project,
-         * * ordered by their priority within the project. Tasks can exist in more than one project at a time.
-         *   * @param {Number} project The project in which to search for tasks.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param project
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        tasks(project: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
-
-        /**
-         * * Adds the specified list of users as followers to the project. Followers are a subset of members, therefore if
-         * * the users are not already members of the project they will also become members as a result of this operation.
-         * * Returns the updated project record.
-         *   * @param {Number} project The project to add followers to.
-         *   * @param {Object} data Data for the request
-         *   * @param {Array} data.followers An array of followers to add to the project.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param project
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        addFollowers(project: number, data: Projects.FollowersParams, dispatchOptions?: any): Promise<Projects.Type>;
-
-        /**
-         * * Removes the specified list of users from following the project, this will not affect project membership status.
-         * * Returns the updated project record.
-         *   * @param {Number} project The project to remove followers from.
-         *   * @param {Object} data Data for the request
-         *   * @param {Array} data.followers An array of followers to remove from the project.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param project
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        removeFollowers(project: number, data: Projects.FollowersParams, dispatchOptions?: any): Promise<Projects.Type>;
-
-        /**
-         * * Adds the specified list of users as members of the project. Returns the updated project record.
-         *   * @param {Number} project The project to add members to.
-         *   * @param {Object} data Data for the request
-         *   * @param {Array} data.members An array of members to add to the project.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param project
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        addMembers(project: number, data: Projects.MembersParams, dispatchOptions?: any): Promise<Projects.Type>;
-
-        /**
-         * * Removes the specified list of members from the project. Returns the updated project record.
-         *   * @param {Number} project The project to remove members from.
-         *   * @param {Object} data Data for the request
-         *   * @param {Array} data.members An array of members to remove from the project.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param project
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        removeMembers(project: number, data: Projects.MembersParams, dispatchOptions?: any): Promise<Projects.Type>;
-      }
-
-      interface StoriesStatic {
-        /**
-         * @param dispatcher
-         */
-        new (dispatcher: Dispatcher): Stories;
-      }
-
-      namespace Stories {
-        interface ShortType extends Resource {
-          created_at: string;
-          created_by: Resource;
-          type: string;
-          text: string;
-        }
-
-        interface Type extends ShortType {
-          html_text: string;
-          source: string;
-          target: Resource;
-          hearts: Type[];
-        }
-      }
-
-      var Stories: StoriesStatic;
-
-      /**
-       * A _story_ represents an activity associated with an object in the Asana
-       * system. Stories are generated by the system whenever users take actions such
-       * as creating or assigning tasks, or moving tasks between projects. _Comments_
-       * are also a form of user-generated story.
-       *
-       * Stories are a form of history in the system, and as such they are read-only.
-       * Once generated, it is not possible to modify a story.
-       * @class
-       * @param {Dispatcher} dispatcher The API dispatcher
-       */
-      interface Stories extends Resource {
-        /**
-         * * Returns the compact records for all stories on the task.
-         *   * @param {Number} task Globally unique identifier for the task.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findByTask(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Stories.Type>>;
-
-        /**
-         * * Returns the full record for a single story.
-         *   * @param {Number} story Globally unique identifier for the story.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The requested resource
-         * @param story
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findById(story: number, params?: Params, dispatchOptions?: any): Promise<Stories.Type>;
-
-        /**
-         * * Adds a comment to a task. The comment will be authored by the
-         * * currently authenticated user, and timestamped when the server receives
-         * * the request.
-         * *
-         * * Returns the full record for the new story added to the task.
-         *   * @param {Number} task Globally unique identifier for the task.
-         *   * @param {Object} data Data for the request
-         *   * @param {String} data.text The plain text of the comment to add.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        createOnTask(task: number, data: any, dispatchOptions?: any): Promise<ResourceList<Stories.ShortType>>;
-      }
-
-      interface TagsStatic {
-        /**
-         * @param dispatcher
-         */
-        new (dispatcher: Dispatcher): Tags;
-      }
-
-      namespace Tags {
-        interface Type extends Resource {
-          created_at: string;
-          notes: string;
-          workspace: Resource;
-          color: string;
-          followers: Resource[];
-        }
-
-        interface FindAllParams extends PaginationParams {
-          team?: number;
-          archived?: boolean;
-        }
-      }
-
-      var Tags: TagsStatic;
-
-      /**
-       * A _tag_ is a label that can be attached to any task in Asana. It exists in a
-       * single workspace or organization.
-       *
-       * Tags have some metadata associated with them, but it is possible that we will
-       * simplify them in the future so it is not encouraged to rely too heavily on it.
-       * Unlike projects, tags do not provide any ordering on the tasks they
-       * are associated with.
-       * @class
-       * @param {Dispatcher} dispatcher The API dispatcher
-       */
-      interface Tags extends Resource {
-        /**
-         * * Creates a new tag in a workspace or organization.
-         * *
-         * * Every tag is required to be created in a specific workspace or
-         * * organization, and this cannot be changed once set. Note that you can use
-         * * the `workspace` parameter regardless of whether or not it is an
-         * * organization.
-         * *
-         * * Returns the full record of the newly created tag.
-         *   * @param {Object} data Data for the request
-         *   * @param {String} data.workspace The workspace or organization to create the tag in.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        create(data: Tags.Type & { workspace: string }, dispatchOptions?: any): Promise<Tags.Type>;
-
-        /**
-         * * Creates a new tag in a workspace or organization.
-         * *
-         * * Every tag is required to be created in a specific workspace or
-         * * organization, and this cannot be changed once set. Note that you can use
-         * * the `workspace` parameter regardless of whether or not it is an
-         * * organization.
-         * *
-         * * Returns the full record of the newly created tag.
-         *   * @param {Number} workspace The workspace or organization to create the tag in.
-         *   * @param {Object} data Data for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param workspace
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        createInWorkspace(workspace: number, data: Tags.Type, dispatchOptions?: any): Promise<Tags.Type>;
-
-        /**
-         * * Returns the complete tag record for a single tag.
-         *   * @param {Number} tag The tag to get.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The requested resource
-         * @param tag
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findById(tag: number, params?: Params, dispatchOptions?: any): Promise<Tags.Type>;
-
-        /**
-         * * Updates the properties of a tag. Only the fields provided in the `data`
-         * * block will be updated; any unspecified fields will remain unchanged.
-         * *
-         * * When using this method, it is best to specify only those fields you wish
-         * * to change, or else you may overwrite changes made by another user since
-         * * you last retrieved the task.
-         * *
-         * * Returns the complete updated tag record.
-         *   * @param {Number} tag The tag to update.
-         *   * @param {Object} data Data for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param tag
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        update(tag: number, data: Tags.Type, dispatchOptions?: any): Promise<Tags.Type>;
-
-        /**
-         * * A specific, existing tag can be deleted by making a DELETE request
-         * * on the URL for that tag.
-         * *
-         * * Returns an empty data record.
-         *   * @param {Number} tag The tag to delete.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param tag
-         * @param dispatchOptions?
-         * @return
-         */
-        delete(tag: number, dispatchOptions?: any): Promise<void>;
-
-        /**
-         * * Returns the compact tag records for some filtered set of tags.
-         * * Use one or more of the parameters provided to filter the tags returned.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {String} [params.workspace] The workspace or organization to filter tags on.
-         *   * @param {String} [params.team] The team to filter tags on.
-         *   * @param {Boolean} [params.archived] Only return tags whose `archived` field takes on the value of
-         *   * this parameter.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findAll(params?: Tags.FindAllParams, dispatchOptions?: any): Promise<ResourceList<Tags.Type>>;
-
-        /**
-         * * Returns the compact tag records for all tags in the workspace.
-         *   * @param {Number} workspace The workspace or organization to find tags in.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param workspace
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findByWorkspace(workspace: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tags.Type>>;
-
-        /**
-         * * Returns the compact task records for all tasks with the given tag.
-         * * Tasks can have more than one tag at a time.
-         *   * @param {Number} tag The tag to fetch tasks from.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param tag
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        getTasksWithTag(tag: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
-      }
-
-      interface TasksStatic {
-        /**
-         * @param dispatcher
-         */
-        new (dispatcher: Dispatcher): Tasks;
-      }
-
-      namespace Tasks {
-        interface Type extends Resource {
-          created_at: string;
-          modified_at: string;
-          completed_at: string;
-          completed: boolean;
-          due_on: string;
-          due_at: string;
-          assignee_status: string;
-          assignee: Resource;
-          notes: string;
-          workspace: Resource;
-          num_hearts: number;
-          hearted: boolean;
-          parent: Resource;
-          tags: Resource[];
-          projects: Resource[];
-          memberships: Membership[];
-          followers: Resource[];
-        }
-
-        interface CreateParams {
-          name: string;
-          completed?: boolean;
-          hearted?: boolean;
-          notes?: string;
-        }
-
-        interface FollowersParams {
-          followers: (number|string)[];
-        }
-
-        interface AddProjectParams {
-          project: number;
-          insertBefore?: number;
-          insertAfter?: number;
-          section?: number;
-        }
-
-        interface RemoveProjectParams {
-          project: number;
-        }
-
-        interface TagParams {
-          tag: string;
-        }
-
-        interface CommentParams {
-          text: string;
-        }
-
-        interface FindAllParams extends PaginationParams {
-          assignee?: number;
-          workspace: number;
-          completed_since?: string;
-          modified_since?: string;
-        }
-      }
-
-      var Tasks: TasksStatic;
-
-      /**
-       * The _task_ is the basic object around which many operations in Asana are
-       * centered. In the Asana application, multiple tasks populate the middle pane
-       * according to some view parameters, and the set of selected tasks determines
-       * the more detailed information presented in the details pane.
-       * @class
-       * @param {Dispatcher} dispatcher The API dispatcher
-       */
-      interface Tasks extends Resource {
-        /**
-         * * Creating a new task is as easy as POSTing to the `/tasks` endpoint
-         * * with a data block containing the fields you'd like to set on the task.
-         * * Any unspecified fields will take on default values.
-         * *
-         * * Every task is required to be created in a specific workspace, and this
-         * * workspace cannot be changed once set. The workspace need not be set
-         * * explicitly if you specify a `project` or a `parent` task instead.
-         *   * @param {Object} data Data for the request
-         *   * @param {Number} [data.workspace] The workspace to create a task in.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        create(data: Tasks.CreateParams & { workspace: string }, dispatchOptions?: any): Promise<Tasks.Type>;
-
-        /**
-         * * Creating a new task is as easy as POSTing to the `/tasks` endpoint
-         * * with a data block containing the fields you'd like to set on the task.
-         * * Any unspecified fields will take on default values.
-         * *
-         * * Every task is required to be created in a specific workspace, and this
-         * * workspace cannot be changed once set. The workspace need not be set
-         * * explicitly if you specify a `project` or a `parent` task instead.
-         *   * @param {Number} workspace The workspace to create a task in.
-         *   * @param {Object} data Data for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param workspace
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        createInWorkspace(workspace: number, data: Tasks.CreateParams, dispatchOptions?: any): Promise<Tasks.Type>;
-
-        /**
-         * * Returns the complete task record for a single task.
-         *   * @param {Number} task The task to get.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The requested resource
-         * @param task
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findById(task: number, params?: Params, dispatchOptions?: any): Promise<Tasks.Type>;
-
-        /**
-         * * A specific, existing task can be updated by making a PUT request on the
-         * * URL for that task. Only the fields provided in the `data` block will be
-         * * updated; any unspecified fields will remain unchanged.
-         * *
-         * * When using this method, it is best to specify only those fields you wish
-         * * to change, or else you may overwrite changes made by another user since
-         * * you last retrieved the task.
-         * *
-         * * Returns the complete updated task record.
-         *   * @param {Number} task The task to update.
-         *   * @param {Object} data Data for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        update(task: number, data: Tasks.CreateParams, dispatchOptions?: any): Promise<Tasks.Type>;
-
-        /**
-         * * A specific, existing task can be deleted by making a DELETE request on the
-         * * URL for that task. Deleted tasks go into the "trash" of the user making
-         * * the delete request. Tasks can be recovered from the trash within a period
-         * * of 30 days; afterward they are completely removed from the system.
-         * *
-         * * Returns an empty data record.
-         *   * @param {Number} task The task to delete.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param dispatchOptions?
-         * @return
-         */
-        delete(task: number, dispatchOptions?: any): Promise<void>;
-
-        /**
-         * * Returns the compact task records for all tasks within the given project,
-         * * ordered by their priority within the project.
-         *   * @param {Number} projectId The project in which to search for tasks.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param projectId
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findByProject(projectId: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
-
-        /**
-         * * Returns the compact task records for all tasks with the given tag.
-         *   * @param {Number} tag The tag in which to search for tasks.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param tag
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findByTag(tag: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
-
-        /**
-         * * Returns the compact task records for some filtered set of tasks. Use one
-         * * or more of the parameters provided to filter the tasks returned.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Number} [params.assignee] The assignee to filter tasks on.
-         *   * @param {Number} [params.workspace] The workspace or organization to filter tasks on.
-         *   * @param {Number} [params.completed_since] Only return tasks that are either incomplete or that have been
-         *   * completed since this time.
-         *   * @param {Number} [params.modified_since] Only return tasks that have been modified since the given time.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findAll(params?: Tasks.FindAllParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
-
-        /**
-         * * Adds each of the specified followers to the task, if they are not already
-         * * following. Returns the complete, updated record for the affected task.
-         *   * @param {Number} task The task to add followers to.
-         *   * @param {Object} data Data for the request
-         *   * @param {Array} data.followers An array of followers to add to the task.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        addFollowers(task: number, data: Tasks.FollowersParams, dispatchOptions?: any): Promise<Tasks.Type>;
-
-        /**
-         * * Removes each of the specified followers from the task if they are
-         * * following. Returns the complete, updated record for the affected task.
-         *   * @param {Number} task The task to remove followers from.
-         *   * @param {Object} data Data for the request
-         *   * @param {Array} data.followers An array of followers to remove from the task.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        removeFollowers(task: number, data: Tasks.FollowersParams, dispatchOptions?: any): Promise<Tasks.Type>;
-
-        /**
-         * * Returns a compact representation of all of the projects the task is in.
-         *   * @param {Number} task The task to get projects on.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        projects(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Projects.Type>>;
-
-        /**
-         * * Adds the task to the specified project, in the optional location
-         * * specified. If no location arguments are given, the task will be added to
-         * * the beginning of the project.
-         * *
-         * * `addProject` can also be used to reorder a task within a project that
-         * * already contains it.
-         * *
-         * * Returns an empty data block.
-         *   * @param {Number} task The task to add to a project.
-         *   * @param {Object} data Data for the request
-         *   * @param {Number} data.project The project to add the task to.
-         *   * @param {Number} [data.insertAfter] A task in the project to insert the task after, or `null` to
-         *   * insert at the beginning of the list.
-         *   * @param {Number} [data.insertBefore] A task in the project to insert the task before, or `null` to
-         *   * insert at the end of the list.
-         *   * @param {Number} [data.section] A section in the project to insert the task into. The task will be
-         *   * inserted at the top of the section.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        addProject(task: number, data: Tasks.AddProjectParams, dispatchOptions?: any): Promise<{}>;
-
-        /**
-         * * Removes the task from the specified project. The task will still exist
-         * * in the system, but it will not be in the project anymore.
-         * *
-         * * Returns an empty data block.
-         *   * @param {Number} task The task to remove from a project.
-         *   * @param {Object} data Data for the request
-         *   * @param {Number} data.project The project to remove the task from.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        removeProject(task: number, data: Tasks.RemoveProjectParams, dispatchOptions?: any): Promise<{}>;
-
-        /**
-         * * Returns a compact representation of all of the tags the task has.
-         *   * @param {Number} task The task to get tags on.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        tags(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tags.Type>>;
-
-        /**
-         * * Adds a tag to a task. Returns an empty data block.
-         *   * @param {Number} task The task to add a tag to.
-         *   * @param {Object} data Data for the request
-         *   * @param {Number} data.tag The tag to add to the task.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        addTag(task: number, data: Tasks.TagParams, dispatchOptions?: any): Promise<{}>;
-
-        /**
-         * * Removes a tag from the task. Returns an empty data block.
-         *   * @param {Number} task The task to remove a tag from.
-         *   * @param {Object} data Data for the request
-         *   * @param {String} data.tag The tag to remove from the task.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        removeTag(task: number, data: Tasks.TagParams, dispatchOptions?: any): Promise<{}>;
-
-        /**
-         * * Returns a compact representation of all of the subtasks of a task.
-         *   * @param {Number} task The task to get the subtasks of.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        subtasks(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
-
-        /**
-         * * Creates a new subtask and adds it to the parent task. Returns the full record
-         * * for the newly created subtask.
-         *   * @param {Number} task The task to add a subtask to.
-         *   * @param {Object} data Data for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        addSubtask(task: number, data: Tasks.CreateParams, dispatchOptions?: any): Promise<Tasks.Type>;
-
-        /**
-         * * Returns a compact representation of all of the stories on the task.
-         *   * @param {Number} task The task containing the stories to get.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        stories(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Stories.Type>>;
-
-        /**
-         * * Adds a comment to a task. The comment will be authored by the
-         * * currently authenticated user, and timestamped when the server receives
-         * * the request.
-         * *
-         * * Returns the full record for the new story added to the task.
-         *   * @param {Number} task Globally unique identifier for the task.
-         *   * @param {Object} data Data for the request
-         *   * @param {String} data.text The plain text of the comment to add.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        addComment(task: number, data: Tasks.CommentParams, dispatchOptions?: any): Promise<Stories.Type>;
-      }
-
-      interface TeamsStatic {
-        /**
-         * @param dispatcher
-         */
-        new (dispatcher: Dispatcher): Teams;
-      }
-
-      namespace Teams {
-        interface Type extends Resource {
-          organization: Resource;
-        }
-      }
-
-      var Teams: TeamsStatic;
-
-      /**
-       * A _team_ is used to group related projects and people together within an
-       * organization. Each project in an organization is associated with a team.
-       * @class
-       * @param {Dispatcher} dispatcher The API dispatcher
-       */
-      interface Teams extends Resource {
-        /**
-         * * Returns the full record for a single team.
-         *   * @param {Number} team Globally unique identifier for the team.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The requested resource
-         * @param team
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findById(team: number, params?: Params, dispatchOptions?: any): Promise<Teams.Type>;
-
-        /**
-         * * Returns the compact records for all teams in the organization visible to
-         * * the authorized user.
-         *   * @param {Number} organization Globally unique identifier for the workspace or organization.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param organization
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findByOrganization(organization: number, params?: Params, dispatchOptions?: any): Promise<SimpleResourceList>;
-
-        /**
-         * * Returns the compact records for all users that are members of the team.
-         *   * @param {Number} team Globally unique identifier for the team.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param team
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        users(team: number, params?: Params, dispatchOptions?: any): Promise<SimpleResourceList>;
-
-        /**
-         * * The user making this call must be a member of the team in order to add others.
-         * * The user to add must exist in the same organization as the team in order to be added.
-         * * The user to add can be referenced by their globally unique user ID or their email address.
-         * * Returns the full user record for the added user.
-         *   * @param {Number} team Globally unique identifier for the team.
-         *   * @param {Object} data Data for the request
-         *   * @param {Number|String} data.user An identifier for the user. Can be one of an email address,
-         *   * the globally unique identifier for the user, or the keyword `me`
-         *   * to indicate the current user making the request.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param team
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        addUser(team: number, data: UserParams, dispatchOptions?: any): Promise<any>;
-
-        /**
-         * * The user to remove can be referenced by their globally unique user ID or their email address.
-         * * Removes the user from the specified team. Returns an empty data record.
-         *   * @param {Number} team Globally unique identifier for the team.
-         *   * @param {Object} data Data for the request
-         *   * @param {Number|String} data.user An identifier for the user. Can be one of an email address,
-         *   * the globally unique identifier for the user, or the keyword `me`
-         *   * to indicate the current user making the request.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param team
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        removeUser(team: number, data: UserParams, dispatchOptions?: any): Promise<any>;
-      }
-
-      interface UsersStatic {
-        /**
-         * @param dispatcher
-         */
-        new (dispatcher: Dispatcher): Users;
-      }
-
-      namespace Users {
-        interface FindAllParams extends PaginationParams {
-          workspace: number;
-        }
-
-        interface Type extends Resource {
-          email: string;
-          workspaces: Resource[];
-          photo: { [key: string]: string };
-        }
-      }
-
-      var Users: UsersStatic;
-
-      /**
-       * A _user_ object represents an account in Asana that can be given access to
-       * various workspaces, projects, and tasks.
-       *
-       * Like other objects in the system, users are referred to by numerical IDs.
-       * However, the special string identifier `me` can be used anywhere
-       * a user ID is accepted, to refer to the current authenticated user.
-       * @class
-       * @param {Dispatcher} dispatcher The API dispatcher
-       */
-      interface Users extends Resource {
-        /**
-         * * Returns the full user record for the currently authenticated user.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The requested resource
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        me(params?: Params, dispatchOptions?: any): Promise<Users.Type>;
-
-        /**
-         * * Returns the full user record for the single user with the provided ID.
-         *   * @param {Number|String} user An identifier for the user. Can be one of an email address,
-         *   * the globally unique identifier for the user, or the keyword `me`
-         *   * to indicate the current user making the request.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The requested resource
-         * @param user
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findById(user: string|number, params?: Params, dispatchOptions?: any): Promise<Users.Type>;
-
-        /**
-         * * Returns the user records for all users in the specified workspace or
-         * * organization.
-         *   * @param {Number} workspace The workspace in which to get users.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param workspace
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findByWorkspace(workspace: number, params?: Params, dispatchOptions?: any): Promise<ResourceList<Users.Type>>;
-
-        /**
-         * * Returns the user records for all users in all workspaces and organizations
-         * * accessible to the authenticated user. Accepts an optional workspace ID
-         * * parameter.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Number} [params.workspace] The workspace or organization to filter users on.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param params
-         * @param dispatchOptions?
-         * @return
-         */
-        findAll(params: Users.FindAllParams, dispatchOptions?: any): Promise<SimpleResourceList>;
-      }
-
-      /**
-       * **Webhooks are currently in BETA - The information here may change.**
-       *
-       * Webhooks allow an application to be notified of changes. This is in addition
-       * to the ability to fetch those changes directly as
-       * [Events](/developers/api-reference/events) - in fact, Webhooks are just a way
-       * to receive Events via HTTP POST at the time they occur instead of polling for
-       * them. For services accessible via HTTP this is often vastly more convenient,
-       * and if events are not too frequent can be significantly more efficient.
-       *
-       * In both cases, however, changes are represented as Event objects - refer to
-       * the [Events documentation](/developers/api-reference/events) for more
-       * information on what data these events contain.
-       *
-       * **NOTE:** While Webhooks send arrays of Event objects to their target, the
-       * Event objects themselves contain *only IDs*, rather than the actual resource
-       * they are referencing. So while a normal event you receive via GET /events
-       * would look like this:
-       *
-       *     {\
-       *       "resource": {\
-       *         "id": 1337,\
-       *         "name": "My Task"\
-       *       },\
-       *       "parent": null,\
-       *       "created_at": "2013-08-21T18:20:37.972Z",\
-       *       "user": {\
-       *         "id": 1123,\
-       *         "name": "Tom Bizarro"\
-       *       },\
-       *       "action": "changed",\
-       *       "type": "task"\
-       *     }
-       *
-       * In a Webhook payload you would instead receive this:
-       *
-       *     {\
-       *       "resource": 1337,\
-       *       "parent": null,\
-       *       "created_at": "2013-08-21T18:20:37.972Z",\
-       *       "user": 1123,\
-       *       "action": "changed",\
-       *       "type": "task"\
-       *     }
-       *
-       * Webhooks themselves contain only the information necessary to deliver the
-       * events to the desired target as they are generated.
-       * @class
-       * @param {Dispatcher} dispatcher The API dispatcher
-       */
-      class Webhooks extends Resource {
-        /**
-         * @param dispatcher
-         */
-        constructor(dispatcher: Dispatcher);
-
-        /**
-         * * Establishing a webhook is a two-part process. First, a simple HTTP POST
-         * * similar to any other resource creation. Since you could have multiple
-         * * webhooks we recommend specifying a unique local id for each target.
-         * *
-         * * Next comes the confirmation handshake. When a webhook is created, we will
-         * * send a test POST to the `target` with an `X-Hook-Secret` header as
-         * * described in the
-         * * [Resthooks Security documentation](http://resthooks.org/docs/security/).
-         * * The target must respond with a `200 OK` and a matching `X-Hook-Secret`
-         * * header to confirm that this webhook subscription is indeed expected.
-         * *
-         * * If you do not acknowledge the webhook's confirmation handshake it will
-         * * fail to setup, and you will receive an error in response to your attempt
-         * * to create it. This means you need to be able to receive and complete the
-         * * webhook *while* the POST request is in-flight.
-         *   * @param {Number} resource A resource ID to subscribe to. The resource can be a task or project.
-         *   * @param {String} target The URL to receive the HTTP POST.
-         *   * @param {Object} data Data for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param resource
-         * @param target
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        create(resource: number, target: string, data: any, dispatchOptions?: any): Promise<any>;
-
-        /**
-         * * Returns the compact representation of all webhooks your app has
-         * * registered for the authenticated user in the given workspace.
-         *   * @param {Number} workspace The workspace to query for webhooks in.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Number} [params.resource] Only return webhooks for the given resource.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param workspace
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        getAll(workspace: number, params?: any, dispatchOptions?: any): Promise<any>;
-
-        /**
-         * * Returns the full record for the given webhook.
-         *   * @param {String} webhook The webhook to get.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The requested resource
-         * @param webhook
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        getById(webhook: string, params?: any, dispatchOptions?: any): Promise<any>;
-
-        /**
-         * * This method permanently removes a webhook. Note that it may be possible
-         * * to receive a request that was already in flight after deleting the
-         * * webhook, but no further requests will be issued.
-         *   * @param {String} webhook The webhook to delete.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param webhook
-         * @param dispatchOptions?
-         * @return
-         */
-        deleteById(webhook: string, dispatchOptions?: any): Promise<any>;
-      }
-
-      interface WorkspacesStatic {
-        /**
-         * @param dispatcher
-         */
-        new (dispatcher: Dispatcher): Workspaces;
-      }
-
-      namespace Workspaces {
-        interface ShortType extends Resource {
-          id_organization?: boolean;
-        }
-
-        interface Type extends Resource {
-          id_organization: boolean;
-          email_domains: string[];
-        }
-
-        interface TypeaheadParams {
-          type: string;
-          query?: string;
-          count?: number;
-        }
-      }
-
-      var Workspaces: WorkspacesStatic;
-
-      /**
-       * A _workspace_ is the highest-level organizational unit in Asana. All projects
-       * and tasks have an associated workspace.
-       *
-       * An _organization_ is a special kind of workspace that represents a company.
-       * In an organization, you can group your projects into teams. You can read
-       * more about how organizations work on the Asana Guide.
-       * To tell if your workspace is an organization or not, check its
-       * `is_organization` property.
-       *
-       * Over time, we intend to migrate most workspaces into organizations and to
-       * release more organization-specific functionality. We may eventually deprecate
-       * using workspace-based APIs for organizations. Currently, and until after
-       * some reasonable grace period following any further announcements, you can
-       * still reference organizations in any `workspace` parameter.
-       * @class
-       * @param {Dispatcher} dispatcher The API dispatcher
-       */
-      interface Workspaces extends Resource {
-        /**
-         * * Returns the full workspace record for a single workspace.
-         *   * @param {Number} workspace Globally unique identifier for the workspace or organization.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The requested resource
-         * @param workspace
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findById(workspace: number, params?: Params, dispatchOptions?: any): Promise<Workspaces.Type>;
-
-        /**
-         * * Returns the compact records for all workspaces visible to the authorized user.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findAll(params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Workspaces.ShortType>>;
-
-        /**
-         * * A specific, existing workspace can be updated by making a PUT request on
-         * * the URL for that workspace. Only the fields provided in the data block
-         * * will be updated; any unspecified fields will remain unchanged.
-         * *
-         * * Currently the only field that can be modified for a workspace is its `name`.
-         * *
-         * * Returns the complete, updated workspace record.
-         *   * @param {Number} workspace The workspace to update.
-         *   * @param {Object} data Data for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param workspace
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        update(workspace: number, data: { name?: string }, dispatchOptions?: any): Promise<Workspaces.Type>;
-
-        /**
-         * * Retrieves objects in the workspace based on an auto-completion/typeahead
-         * * search algorithm. This feature is meant to provide results quickly, so do
-         * * not rely on this API to provide extremely accurate search results. The
-         * * result set is limited to a single page of results with a maximum size,
-         * * so you won't be able to fetch large numbers of results.
-         *   * @param {Number} workspace The workspace to fetch objects from.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {String} params.type The type of values the typeahead should return.
-         *   * Note that unlike in the names of endpoints, the types listed here are
-         *   * in singular form (e.g. `task`). Using multiple types is not yet supported.
-         *   * @param {String} [params.query] The string that will be used to search for relevant objects. If an
-         *   * empty string is passed in, the API will currently return an empty
-         *   * result set.
-         *   * @param {Number} [params.count] The number of results to return. The default is `20` if this
-         *   * parameter is omitted, with a minimum of `1` and a maximum of `100`.
-         *   * If there are fewer results found than requested, all will be returned.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param workspace
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        typeahead(workspace: number, params?: Workspaces.TypeaheadParams, dispatchOptions?: any): Promise<SimpleResourceList>;
-
-        /**
-         * * The user can be referenced by their globally unique user ID or their email address.
-         * * Returns the full user record for the invited user.
-         *   * @param {Number} workspace The workspace or organization to invite the user to.
-         *   * @param {Object} data Data for the request
-         *   * @param {Number|String} data.user An identifier for the user. Can be one of an email address,
-         *   * the globally unique identifier for the user, or the keyword `me`
-         *   * to indicate the current user making the request.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param workspace
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        addUser(workspace: number, data: UserParams, dispatchOptions?: any): Promise<Users.Type>;
-
-        /**
-         * * The user making this call must be an admin in the workspace.
-         * * Returns an empty data record.
-         *   * @param {Number} workspace The workspace or organization to invite the user to.
-         *   * @param {Object} data Data for the request
-         *   * @param {Number|String} data.user An identifier for the user. Can be one of an email address,
-         *   * the globally unique identifier for the user, or the keyword `me`
-         *   * to indicate the current user making the request.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param workspace
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        removeUser(workspace: number, data: UserParams, dispatchOptions?: any): Promise<any>;
-      }
-
-      interface ResourceStatic {
-        /**
-         * @param dispatcher
-         */
-        new (dispatcher: Dispatcher): Resource;
-
-        /**
-         * @type {number} Default number of items to get per page.
-         */
-        DEFAULT_PAGE_LIMIT: number;
-
-        /**
-         * Helper method that dispatches a GET request to the API, where the expected
-         * result is a collection.
-         * @param  {Dispatcher} dispatcher
-         * @param  {String}     path    The path of the API
-         * @param  {Object}     [query] The query params
-         * @param  {Object}     [dispatchOptions] Options for handling the request and
-         *     response. See `Dispatcher.dispatch`.
-         * @return {Promise<SimpleResourceList>} The Collection response for the request
-         * @param dispatcher
-         * @param path
-         * @param query?
-         * @param dispatchOptions?
-         */
-        getCollection(dispatcher: any, path: string, query?: any, dispatchOptions?: any): Promise<any>;
-
-        /**
-         * Helper method for any request Promise from the Dispatcher, unwraps the `data`
-         * value from the payload.
-         * @param  {Promise} promise A promise returned from a `Dispatcher` request.
-         * @return {Promise}         The `data` portion of the response payload.
-         * @param promise
-         * @return
-         */
-        unwrap(promise: any): Promise<any>;
-      }
-
-      var Resource: ResourceStatic;
-
-      /**
-       * Base class for a resource accessible via the API. Uses a `Dispatcher` to
-       * access the resources.
-       * @param {Dispatcher} dispatcher
-       * @constructor
-       */
-      interface Resource {
-        /**
-         * Dispatches a GET request to the API, where the expected result is a
-         * single resource.
-         * @param  {String}     path    The path of the API
-         * @param  {Object}     [query] The query params
-         * @param  {Object}     [dispatchOptions] Options for handling the request and
-         *     response. See `Dispatcher.dispatch`.
-         * @return {Promise}            The response for the request
-         * @param path
-         * @param query?
-         * @param dispatchOptions?
-         * @return
-         */
-        dispatchGet(path: string, query?: any, dispatchOptions?: any): Promise<any>;
-
-        /**
-         * Dispatches a GET request to the API, where the expected result is a
-         * collection.
-         * @param  {String}     path    The path of the API
-         * @param  {Object}     [query] The query params
-         * @param  {Object}     [dispatchOptions] Options for handling the request and
-         *     response. See `Dispatcher.dispatch`.
-         * @return {Promise}            The response for the request
-         * @param path
-         * @param query?
-         * @param dispatchOptions?
-         * @return
-         */
-        dispatchGetCollection(path: string, query?: any, dispatchOptions?: any): Promise<any>;
-
-        /**
-         * Dispatches a POST request to the API, where the expected response is a
-         * single resource.
-         * @param  {String}     path    The path of the API
-         * @param  {Object}     [query] The query params
-         * @param  {Object}     [dispatchOptions] Options for handling the request and
-         *     response. See `Dispatcher.dispatch`.
-         * @return {Promise}            The response for the request
-         * @param path
-         * @param query?
-         * @param dispatchOptions?
-         * @return
-         */
-        dispatchPost(path: string, query?: any, dispatchOptions?: any): Promise<any>;
-
-        /**
-         * Dispatches a POST request to the API, where the expected response is a
-         * single resource.
-         * @param  {String}     path    The path of the API
-         * @param  {Object}     [query] The query params
-         * @param  {Object}     [dispatchOptions] Options for handling the request and
-         *     response. See `Dispatcher.dispatch`.
-         * @return {Promise}            The response for the request
-         * @param path
-         * @param query?
-         * @param dispatchOptions?
-         * @return
-         */
-        dispatchPut(path: string, query?: any, dispatchOptions?: any): Promise<any>;
-
-        /**
-         * Dispatches a DELETE request to the API. The expected response is an
-         * empty resource.
-         * @param  {String}     path    The path of the API
-         * @param  {Object}     [dispatchOptions] Options for handling the request and
-         *     response. See `Dispatcher.dispatch`.
-         * @return {Promise}            The response for the request
-         * @param path
-         * @param dispatchOptions?
-         * @return
-         */
-        dispatchDelete(path: string, dispatchOptions?: any): Promise<any>;
-      }
-
-      interface ResourceList<T extends Resource> {
-        data: T[];
-        _response: {
-          data: T[];
-          next_page?: NextPage;
-        };
-        _dispatcher: {
-          authenticator: {
-            apiKey: string;
-          };
-          asanaBaseUrl: string;
-          retryOnRateLimit: boolean;
-          requestTimeout: number;
-          _cachedVersionInfo: VersionInfo;
-        }
-      }
-
-      type SimpleResourceList = ResourceList<Resource>;
-
-      interface NextPage {
-        offset: string;
-        uri: string;
-        path: string;
-      }
-
-      interface VersionInfo {
-        version: string;
-        language: string;
-        language_version: string;
-        os: string;
-        os_version: string;
-      }
-
-      interface Resource {
-        id: number;
-        name: string;
-      }
-
-      interface PaginationParams extends Params {
-        limit?: number;
-        offset?: string;
-      }
-
-      interface Params {
-        opt_fields?: string;
-        opt_expand?: string;
-      }
-
-      interface UserParams {
-        user: string|number;
-      }
-
-      interface Membership {
-        project: Resource;
-        section: Resource;
-      }
-    }
-
-    var VERSION: string;
-  }
-
-  export = asana;
-}
-
diff --git a/asana/index.d.ts b/asana/index.d.ts
new file mode 100644
index 0000000000..364980b66c
--- /dev/null
+++ b/asana/index.d.ts
@@ -0,0 +1,2472 @@
+// Type definitions for node-asana 0.14.0
+// Project: https://github.com/Asana/node-asana
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="bluebird" />
+
+import * as Promise from 'bluebird';
+
+declare namespace asana {
+    var Client: ClientStatic;
+
+    interface ClientStatic {
+        /**
+         * Constructs a Client with instances of all the resources using the dispatcher.
+         * It also keeps a reference to the dispatcher so that way the end user can have
+         * access to it.
+         * @class
+         * @classdesc A wrapper for the Asana API which is authenticated for one user
+         * @param {Dispatcher} dispatcher The request dispatcher to use
+         * @param {Object} options        Options to configure the client
+         * @param {String} [clientId]     ID of the client, required for Oauth
+         * @param {String} [clientSecret] Secret key, for some Oauth flows
+         * @param {String} [redirectUri]  Default redirect URI for this client
+         * @param {String} [asanaBaseUrl] Base URL for Asana, for debugging
+         */
+        (dispatcher: Dispatcher, options?: ClientOptions): asana.Client;
+        /**
+         * Creates a new client.
+         * @param {Object} options Options for specifying the client, see constructor.
+         */
+        create(options?: ClientOptions): Client;
+    }
+
+    /** Options to configure the client */
+    interface ClientOptions extends DispatcherOptions {
+        clientId?: string | number;
+        clientSecret?: string;
+        redirectUri?: string;
+        asanaBaseUrl?: string;
+    }
+
+    interface Client {
+        /**
+         * Ensures the client is authorized to make requests. Kicks off the
+         * configured Oauth flow, if any.
+         *
+         * @returns {Promise<Client>} A promise that resolves to this client when
+         *     authorization is complete.
+         */
+        authorize(): Promise<Client>;
+
+        /**
+         * Configure the Client to use a user's API Key and then authenticate
+         * through HTTP Basic Authentication. This should only be done for testing,
+         * as requests using Oauth can provide more security, higher rate limits, and
+         * more features.
+         * @param  {String} apiKey The Asana Api Key of the user
+         * @return {Client}        this
+         * @param apiKey
+         * @return
+         */
+        useBasicAuth(apiKey: string): this;
+
+        /**
+         * Configure the client to authenticate using a Personal Access Token.
+         * @param  {String} accessToken The Personal Access Token to use for
+         * authenticating requests.
+         * @return {Client}             this
+         * @param accessToken
+         * @return
+         */
+        useAccessToken(accessToken: string): this;
+
+        /**
+         * Configure the client to authenticate via Oauth. Credentials can be
+         * supplied, or they can be obtained by running an Oauth flow.
+         * @param  {Object} options Options for Oauth. Includes any options for
+         *     the selected flow.
+         * @option {Function} [flowType]  Type of OauthFlow to use to obtain user
+         *     authorization. Defaults to autodetect based on environment.
+         * @option {Object} [credentials] Credentials to use; no flow required to
+         *     obtain authorization. This object should at a minimum contain an
+         *     `access_token` string field.
+         * @return {Client} this
+         * @param options
+         * @return
+         */
+        useOauth(options?: auth.OauthAuthenticatorOptions): this;
+
+        /**
+         * The internal dispatcher. This is mostly used by the resources but provided
+         * for custom requests to the API or API features that have not yet been added
+         * to the client.
+         * @type {Dispatcher}
+         */
+        dispatcher: Dispatcher;
+        /**
+         * An instance of the Attachments resource.
+         * @type {Attachments}
+         */
+        attachments: resources.Attachments;
+        /**
+         * An instance of the Events resource.
+         * @type {Events}
+         */
+        events: resources.Events;
+        /**
+         * An instance of the Projects resource.
+         * @type {Projects}
+         */
+        projects: resources.Projects;
+        /**
+         * An instance of the Stories resource.
+         * @type {Stories}
+         */
+        stories: resources.Stories;
+        /**
+         * An instance of the Tags resource.
+         * @type {Tags}
+         */
+        tags: resources.Tags;
+        /**
+         * An instance of the Tasks resource.
+         * @type {Tasks}
+         */
+        tasks: resources.Tasks;
+        /**
+         * An instance of the Teams resource.
+         * @type {Teams}
+         */
+        teams: resources.Teams;
+        /**
+         * An instance of the Users resource.
+         * @type {Users}
+         */
+        users: resources.Users;
+        /**
+         * An instance of the Workspaces resource.
+         * @type {Workspaces}
+         */
+        workspaces: resources.Workspaces;
+        /**
+         * Store off Oauth info.
+         */
+        app: auth.App;
+    }
+
+    var Dispatcher: DispatcherStatic;
+
+    interface DispatcherStatic {
+        /**
+         * Creates a dispatcher which will act as a basic wrapper for making HTTP
+         * requests to the API, and handle authentication.
+         * @class
+         * @classdesc A HTTP wrapper for the Asana API
+         * @param {Object} options for default behavior of the Dispatcher
+         * @option {Authenticator} [authenticator] Object to use for authentication.
+         *     Can also be set later with `setAuthenticator`.
+         * @option {String} [retryOnRateLimit] Automatically handle `RateLimitEnforced`
+         *     errors by sleeping and retrying after the waiting period.
+         * @option {Function} [handleUnauthorized] Automatically handle
+         *     `NoAuthorization` with the callback. If the callback returns `true`
+         *     (or a promise resolving to `true), will retry the request.
+         * @option {String} [asanaBaseUrl] Base URL for Asana, for debugging
+         * @option {Number} [requestTimeout] Timeout (in milliseconds) to wait for the
+         *     request to finish.
+         */
+        new (options?: DispatcherOptions): Dispatcher;
+
+        /**
+         * Default handler for requests that are considered unauthorized.
+         * Requests that the authenticator try to refresh its credentials if
+         * possible.
+         * @return {Promise<boolean>} True iff refresh was successful, false if not.
+         * @return
+         */
+        maybeReauthorize(): Promise<boolean>;
+
+        /**
+         * The relative API path for the current version of the Asana API.
+         * @type {String}
+         */
+        API_PATH: string;
+    }
+
+    interface DispatcherOptions {
+        authenticator?: auth.Authenticator;
+        retryOnRateLimit?: boolean;
+        handleUnauthorized?: () => boolean | Promise<boolean>;
+        requestTimeout?: string;
+    }
+
+    interface Dispatcher {
+        /**
+         * Creates an Asana API Url by concatenating the ROOT_URL with path provided.
+         * @param  {String} path The path
+         * @return {String}      The url
+         * @param path
+         * @return
+         */
+        url(path: string): string;
+
+        /**
+         * Configure the authentication mechanism to use.
+         * @returns {Dispatcher} this
+         * @param authenticator
+         * @return
+         */
+        setAuthenticator(authenticator: auth.Authenticator): this;
+
+        /**
+         * Ensure the dispatcher is authorized to make requests. Call this before
+         * making any API requests.
+         *
+         * @returns {Promise} Resolves when the dispatcher is authorized, rejected if
+         *     there was a problem authorizing.
+         * @return
+         */
+        authorize(): Promise<void>;
+
+        /**
+         * Dispatches a request to the Asana API. The request parameters are passed to
+         * the request module.
+         * @param  {Object}  params The params for request
+         * @param  {Object}  [dispatchOptions] Options for handling request/response
+         * @return {Promise}        The response for the request
+         * @param params
+         * @param dispatchOptions?
+         * @return
+         */
+        dispatch(params: any, dispatchOptions?: any): Promise<any>;
+
+        /**
+         * Dispatches a GET request to the Asana API.
+         * @param  {String}  path    The path of the API
+         * @param  {Object}  [query] The query params
+         * @param  {Object}  [dispatchOptions] Options for handling the request and
+         *     response. See `dispatch`.
+         * @return {Promise}         The response for the request
+         * @param path
+         * @param query?
+         * @param dispatchOptions?
+         * @return
+         */
+        get(path: string, query?: any, dispatchOptions?: any): Promise<any>;
+
+        /**
+         * Dispatches a POST request to the Asana API.
+         * @param  {String} path The path of the API
+         * @param  {Object} data The data to be sent
+         * @param  {Object}  [dispatchOptions] Options for handling the request and
+         *     response. See `dispatch`.
+         * @return {Promise}     The response for the request
+         * @param path
+         * @param data
+         * @param dispatchOptions?
+         * @return
+         */
+        post(path: string, data: any, dispatchOptions?: any): Promise<any>;
+
+        /**
+         * Dispatches a PUT request to the Asana API.
+         * @param  {String} path The path of the API
+         * @param  {Object} data The data to be sent
+         * @param  {Object}  [dispatchOptions] Options for handling the request and
+         *     response. See `dispatch`.
+         * @return {Promise}     The response for the request
+         * @param path
+         * @param data
+         * @param dispatchOptions?
+         * @return
+         */
+        put(path: string, data: any, dispatchOptions?: any): Promise<any>;
+
+        /**
+         * Dispatches a DELETE request to the Asana API.
+         * @param  {String} path The path of the API
+         * @param  {Object}  [dispatchOptions] Options for handling the request and
+         *     response. See `dispatch`.
+         * @return {Promise}     The response for the request
+         * @param path
+         * @param dispatchOptions?
+         * @return
+         */
+        delete(path: string, dispatchOptions?: any): Promise<any>;
+
+        /**
+         * The base URL for Asana
+         * @type {String}
+         */
+        asanaBaseUrl: string;
+
+        /**
+         * Whether requests should be automatically retried if rate limited.
+         * @type {Boolean}
+         */
+        retryOnRateLimit: boolean;
+
+        /**
+         * Handler for unauthorized requests which may seek reauthorization.
+         * Default behavior is available if configured with an Oauth authenticator
+         * that has a refresh token, and will refresh the current access token.
+         * @type {Function}
+         */
+        handleUnauthorized: () => boolean | Promise<boolean>;
+
+        /**
+         * The amount of time in milliseconds to wait for a request to finish.
+         * @type {Number}
+         */
+        requestTimeout: number;
+    }
+
+    namespace auth {
+        var BasicAuthenticator: BasicAuthenticatorStatic;
+
+        interface BasicAuthenticatorStatic {
+            /**
+             * @param apiKey
+             */
+            new (apiKey: string): BasicAuthenticator;
+        }
+
+        interface BasicAuthenticator extends Authenticator {
+            /**
+             * @param {Object} request The request to modify, for the `request` library.
+             * @return {Object} The `request` parameter, modified to include authentication
+             *     information using the stored credentials.
+             * @param request
+             * @return
+             */
+            authenticateRequest(request: BasicAuthenticatorRequest): BasicAuthenticatorRequest;
+        }
+
+        interface BasicAuthenticatorRequest {
+            auth: {
+                username: string;
+                password: string;
+            }
+        }
+
+        var OauthAuthenticator: OauthAuthenticatorStatic;
+
+        interface OauthAuthenticatorStatic {
+            /**
+             * Creates an authenticator that uses Oauth for authentication.
+             *
+             * @param {Object} options Configure the authenticator; must specify one
+             *     of `flow` or `credentials`.
+             * @option {App}           app           The app being authenticated for.
+             * @option {OauthFlow}     [flow]        The flow to use to get credentials
+             *     when needed.
+             * @option {String|Object} [credentials] Initial credentials to use. This can
+             *     be either the object returned from an access token request (which
+             *     contains the token and some other metadata) or just the `access_token`
+             *     field.
+             * @constructor
+             */
+            new (options: OauthAuthenticatorOptions): OauthAuthenticator;
+        }
+
+        interface OauthAuthenticatorOptions {
+            flowType?: auth.FlowType;
+            credentials?: Credentials | string;
+        }
+
+        interface Credentials {
+            access_token?: string;
+            refresh_token?: string;
+        }
+
+        interface OauthAuthenticator extends Authenticator {
+            /**
+             * @param {Object} request The request to modify, for the `request` library.
+             * @return {Object} The `request` parameter, modified to include authentication
+             *     information using the stored credentials.
+             * @param request
+             * @return
+             */
+            authenticateRequest(request: OauthAuthenticatorRequest): OauthAuthenticatorRequest;
+        }
+
+        interface OauthAuthenticatorRequest {
+            /**
+             * When browserify-d, the `auth` component of the `request` library
+             * doesn't work so well, so we just manually set the bearer token instead.
+             */
+            headers: {
+                Authorization: string;
+            }
+        }
+
+        /**
+         * A layer to abstract the differences between using different types of
+         * authentication (Oauth vs. Basic). The Authenticator is responsible for
+         * establishing credentials and applying them to outgoing requests.
+         * @constructor
+         */
+        interface Authenticator {
+            /**
+             * Establishes credentials.
+             *
+             * @return {Promise} Resolves when initial credentials have been
+             *     completed and `authenticateRequest` calls can expect to succeed.
+             * @return
+             */
+            establishCredentials(): Promise<void>;
+
+            /**
+             * Attempts to refresh credentials, if possible, given the current credentials.
+             *
+             * @return {Promise} Resolves to `true` if credentials have been successfully
+             *     established and `authenticateRequests` can expect to succeed, else
+             *     resolves to `false`.
+             * @return
+             */
+            refreshCredentials(): Promise<boolean>;
+        }
+
+        var App: AppStatic;
+
+        interface AppStatic {
+            /**
+             * An abstraction around an App used with Asana.
+             *
+             * @options {Object} Options to construct the app
+             * @option {String} clientId       The ID of the app
+             * @option {String} [clientSecret] The secret key, if available here
+             * @option {String} [redirectUri]  The default redirect URI
+             * @option {String} [scope]        Scope to use, supports `default` and `scim`
+             * @option {String} [asanaBaseUrl] Base URL to use for Asana, for debugging
+             * @constructor
+             */
+            new (options: AppOptions): App;
+        }
+
+        interface AppOptions extends AsanaAuthorizeUrlOptions {
+            clientId?: string | number;
+            clientSecret?: string;
+            scope?: string;
+        }
+
+        interface App {
+            /**
+             * @param {Object} options  Overrides to the app's defaults
+             * @option {String} asanaBaseUrl
+             * @option {String} redirectUri
+             * @returns {String} The URL used to authorize a user for the app.
+             * @param options
+             * @return
+             */
+            asanaAuthorizeUrl(options?: AsanaAuthorizeUrlOptions): string;
+
+            /**
+             * @param {Object} options  Overrides to the app's defaults
+             * @option {String} asanaBaseUrl
+             * @option {String} redirectUri
+             * @returns {String} The URL used to acquire an access token.
+             * @param options
+             * @return
+             */
+            asanaTokenUrl(options?: AsanaAuthorizeUrlOptions): string;
+
+            /**
+             * @param {String} code An authorization code obtained via `asanaAuthorizeUrl`.
+             * @param {Object} options  Overrides to the app's defaults
+             * @option {String} asanaBaseUrl
+             * @option {String} redirectUri
+             * @return {Promise<Object>} The token, which will include the `access_token`
+             *     used for API access, as well as a `refresh_token` which can be stored
+             *     to get a new access token without going through the flow again.
+             * @param code
+             * @param options
+             * @return
+             */
+            accessTokenFromCode(code: string, options?: AsanaAuthorizeUrlOptions): Promise<Credentials>;
+
+            /**
+             * @param {String} refreshToken A refresh token obtained via Oauth.
+             * @param {Object} options Overrides to the app's defaults
+             * @option {String} asanaBaseUrl
+             * @option {String} redirectUri
+             * @return {Promise<Object>} The token, which will include the `access_token`
+             *     used for API access.
+             * @param refreshToken
+             * @param options
+             * @return
+             */
+            accessTokenFromRefreshToken(refreshToken: string, options: AsanaAuthorizeUrlOptions): Promise<Credentials>;
+
+            scope: string;
+
+            asanaBaseUrl: string;
+        }
+
+        interface AsanaAuthorizeUrlOptions {
+            redirectUri?: string;
+            asanaBaseUrl?: string;
+        }
+
+        var OauthError: OauthErrorStatic;
+
+        interface OauthErrorStatic {
+            /**
+             * @param options {Object} A data blob parsed from a query string or JSON
+             * response from the Asana API
+             * @option {String} error The string code identifying the error.
+             * @option {String} [error_uri] A link to help and information about the error.
+             * @option {String} [error_description] A description of the error.
+             * @constructor
+             */
+            new (options: OauthErrorOptions): OauthError;
+        }
+
+        interface OauthErrorOptions {
+            error?: string;
+            error_uri?: string;
+            error_description?: string;
+        }
+
+        interface OauthError extends Error {
+        }
+
+        /**
+         * Auto-detects the type of Oauth flow to use that's appropriate to the
+         * environment.
+         *
+         * @returns {Function|null} The type of Oauth flow to use, or null if no
+         *     appropriate type could be determined.
+         * @param env
+         * @return
+         */
+        function autoDetect(env: any): Function;
+
+        var RedirectFlow: RedirectFlowStatic;
+
+        interface RedirectFlowStatic extends FlowType {
+            /**
+             * An Oauth flow that runs in the browser and requests user authorization by
+             * redirecting to an authorization page on Asana, and redirecting back with
+             * the credentials.
+             * @param {Object} options See `BaseBrowserFlow` for options.
+             * @constructor
+             */
+            new (options: any): RedirectFlow;
+        }
+
+        interface RedirectFlow extends BaseBrowserFlow {
+        }
+
+        var PopupFlow: PopupFlowStatic;
+
+        interface PopupFlowStatic extends FlowType {
+            /**
+             * An Oauth flow that runs in the browser and requests user authorization by
+             * popping up a window and prompting the user.
+             * @param {Object} options See `BaseBrowserFlow` for options.
+             * @constructor
+             */
+            new (options: any): PopupFlow;
+        }
+
+        interface PopupFlow extends BaseBrowserFlow {
+            /**
+             * @param popupWidth
+             * @param popupHeight
+             */
+            _popupParams(popupWidth: number, popupHeight: number): void;
+
+            runReceiver(): void;
+        }
+
+        var NativeFlow: NativeFlowStatic;
+
+        interface NativeFlowStatic extends FlowType {
+            /**
+             * An Oauth flow that can be run from the console or an app that does
+             * not have the ability to open and manage a browser on its own.
+             * @param {Object} options
+             * @option {App} app App to authenticate for
+             * @option {String function(String)} [instructions] Function returning the
+             *     instructions to output to the user. Passed the authorize url.
+             * @option {String function()} [prompt] String to output immediately before
+             *     waiting for a line from stdin.
+             * @constructor
+             */
+            new (options: any): NativeFlow;
+        }
+
+        interface NativeFlow extends Flow {
+            /**
+             * Run the Oauth flow, prompting the user to go to the authorization URL
+             * and enter the code it displays when finished.
+             *
+             * @return {Promise<Object>} The access token object, which will include
+             *     `access_token` and `refresh_token`.
+             */
+            run(): void;
+
+            /**
+             * @param {String} code An authorization code obtained via `asanaAuthorizeUrl`.
+             * @return {Promise<Object>} The token, which will include the `access_token`
+             *     used for API access, as well as a `refresh_token` which can be stored
+             *     to get a new access token without going through the flow again.
+             * @param code
+             */
+            accessToken(code: string): void;
+
+            /**
+             * @return {Promise} The access token, which will include a refresh token
+             *     that can be stored in the future to create a client without going
+             *     through the Oauth flow.
+             * @param url
+             * @return
+             */
+            promptForCode(url: string): any;
+        }
+
+        var ChromeExtensionFlow: ChromeExtensionFlowStatic;
+
+        interface ChromeExtensionFlowStatic extends FlowType {
+            /**
+             * An Oauth flow that runs in a Chrome browser extension and requests user
+             * authorization by opening a temporary tab to prompt the user.
+             * @param {Object} options See `BaseBrowserFlow` for options, plus the below:
+             * @options {String} [receiverPath] Full path and filename from the base
+             *     directory of the extension to the receiver page. This is an HTML file
+             *     that has been made web-accessible, and that calls the receiver method
+             *     `Asana.auth.ChromeExtensionFlow.runReceiver();`.
+             * @constructor
+             */
+            new (options: any): ChromeExtensionFlow;
+        }
+
+        interface ChromeExtensionFlow extends BaseBrowserFlow {
+            /**
+             * Runs the receiver code to send the Oauth result to the requesting tab.
+             */
+            runReceiver(): void;
+        }
+
+        var BaseBrowserFlow: BaseBrowserFlowStatic;
+
+        interface BaseBrowserFlowStatic extends FlowType {
+            /**
+             * A base class for any flow that runs in the browser. All subclasses use the
+             * "implicit grant" flow to authenticate via the browser.
+             * @param {Object} options
+             * @option {App} app The app this flow is for
+             * @option {String} [redirectUri] The URL that Asana should redirect to once
+             *     user authorization is complete. Defaults to the URL configured in
+             *     the app, and if none then the current page URL.
+             * @constructor
+             */
+            new (options: any): BaseBrowserFlow;
+        }
+
+        interface BaseBrowserFlow extends Flow {
+            /**
+             * @param {String} authUrl The URL the user should be navigated to in order
+             *     to authorize the app.
+             * @param {String} state   The unique state generated for this auth request.
+             * @return {Promise} Resolved when authorization has successfully started,
+             *     i.e. the user has been navigated to a page requesting authorization.
+             * @param authUrl
+             * @param state
+             * @return
+             */
+            startAuthorization(authUrl: string, state: string): any;
+
+            /**
+             * @return {Promise<Object>} Credentials returned from Oauth.
+             * @param state
+             */
+            finishAuthorization(state: string): void;
+
+            /**
+             * @return {String} The URL to redirect to that will receive the
+             * @return
+             */
+            receiverUrl(): string;
+
+            /**
+             * @return {String} The URL to redirect to that will receive the
+             * @return
+             */
+            asanaBaseUrl(): string;
+
+            /**
+             * @returns {String} Generate a new unique state parameter for a request.
+             * @return
+             */
+            getStateParam(): string;
+        }
+
+        interface FlowType {
+            new (options: any): Flow;
+        }
+
+        interface Flow {
+            /**
+             * @returns {String} The URL used to authorize the user for the app.
+             * @return
+             */
+            authorizeUrl(): string;
+
+            /**
+             * Run the appropriate parts of the Oauth flow, attempting to establish user
+             * authorization.
+             * @returns {Promise<Object>} A promise that resolves to the Oauth credentials.
+             */
+            run(): void;
+        }
+    }
+
+    namespace errors {
+        class AsanaError extends Error {
+            /**
+             * @param message
+             * @return
+             */
+            constructor(message: any);
+
+            code: number;
+            value: any;
+        }
+
+        class Forbidden extends AsanaError {
+            /**
+             * @param value
+             * @return
+             */
+            constructor(value: any);
+        }
+
+
+        class InvalidRequest extends AsanaError {
+            /**
+             * @param value
+             * @return
+             */
+            constructor(value: any);
+        }
+
+        class NoAuthorization extends AsanaError {
+            /**
+             * @param value
+             * @return
+             */
+            constructor(value: any);
+        }
+
+        class NotFound extends AsanaError {
+            /**
+             * @param value
+             * @return
+             */
+            constructor(value: any);
+        }
+
+        class RateLimitEnforced extends AsanaError {
+            /**
+             * @param value
+             * @return
+             */
+            constructor(value: any);
+        }
+
+        class ServerError extends AsanaError {
+            /**
+             * @param value
+             * @return
+             */
+            constructor(value: any);
+        }
+    }
+
+    namespace resources {
+        interface AttachmentsStatic {
+            /**
+             * @param dispatcher
+             */
+            new (dispatcher: Dispatcher): Attachments;
+        }
+
+        namespace Attachments {
+            interface Type extends Resource {
+                created_at: string;
+                permanent_url: string;
+                download_url: string;
+                view_url: string;
+                host: string;
+                parent: Resource;
+            }
+        }
+
+        var Attachments: AttachmentsStatic;
+
+        /**
+         * An _attachment_ object represents any file attached to a task in Asana,
+         * whether it's an uploaded file or one associated via a third-party service
+         * such as Dropbox or Google Drive.
+         * @class
+         * @param {Dispatcher} dispatcher The API dispatcher
+         */
+        interface Attachments extends Resource {
+            /**
+             * * Returns the full record for a single attachment.
+             *   * @param {Number} attachment Globally unique identifier for the attachment.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The requested resource
+             * @param attachment
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findById(attachment: number, params?: Params, dispatchOptions?: any): Promise<Attachments.Type>;
+
+            /**
+             * * Returns the compact records for all attachments on the task.
+             *   * @param {Number} task Globally unique identifier for the task.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findByTask(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Attachments.Type>>;
+        }
+
+        interface EventsStatic {
+            /**
+             * @param dispatcher
+             * @return
+             */
+            new (dispatcher: Dispatcher): Events;
+        }
+
+        var Events: EventsStatic;
+
+        /**
+         * An _event_ is an object representing a change to a resource that was observed
+         * by an event subscription.
+         *
+         * In general, requesting events on a resource is faster and subject to higher
+         * rate limits than requesting the resource itself. Additionally, change events
+         * bubble up - listening to events on a project would include when stories are
+         * added to tasks in the project, even on subtasks.
+         *
+         * Establish an initial sync token by making a request with no sync token.
+         * The response will be a `412` error - the same as if the sync token had
+         * expired.
+         *
+         * Subsequent requests should always provide the sync token from the immediately
+         * preceding call.
+         *
+         * Sync tokens may not be valid if you attempt to go 'backward' in the history
+         * by requesting previous tokens, though re-requesting the current sync token
+         * is generally safe, and will always return the same results.
+         *
+         * When you receive a `412 Precondition Failed` error, it means that the
+         * sync token is either invalid or expired. If you are attempting to keep a set
+         * of data in sync, this signals you may need to re-crawl the data.
+         *
+         * Sync tokens always expire after 24 hours, but may expire sooner, depending on
+         * load on the service.
+         * @class
+         * @param {Dispatcher} dispatcher The API dispatcher
+         */
+        interface Events extends Resource { }
+
+        interface ProjectsStatic {
+            /**
+             * @param dispatcher
+             */
+            new (dispatcher: Dispatcher): Projects;
+        }
+
+        namespace Projects {
+            interface Type extends Resource {
+                created_at: string;
+                modified_at: string;
+                due_date: string;
+                current_status: Status;
+                public: boolean;
+                archived: boolean;
+                notes: string;
+                color: string;
+                workspace: Resource;
+                team: Resource;
+                members: Resource[];
+                followers: Resource[];
+            }
+
+            interface CreateParams {
+                name?: string;
+                team?: number;
+                public?: boolean;
+                due_date: string;
+                notes?: string;
+                color?: string;
+            }
+
+            interface FollowersParams {
+                followers: (number | string)[];
+            }
+
+            interface MembersParams {
+                members: (number | string)[];
+            }
+
+            interface Status {
+                color: string;
+                text: string;
+                html_text: string;
+                modified_at: string;
+                author: Resource;
+            }
+
+            interface FindAllParams extends PaginationParams {
+                team?: number;
+                archived?: boolean;
+            }
+
+            interface FindByParams extends PaginationParams {
+                archived?: boolean;
+            }
+        }
+
+        var Projects: ProjectsStatic;
+
+        /**
+         * A _project_ represents a prioritized list of tasks in Asana. It exists in a
+         * single workspace or organization and is accessible to a subset of users in
+         * that workspace or organization, depending on its permissions.
+         *
+         * Projects in organizations are shared with a single team. You cannot currently
+         * change the team of a project via the API. Non-organization workspaces do not
+         * have teams and so you should not specify the team of project in a
+         * regular workspace.
+         * @class
+         * @param {Dispatcher} dispatcher The API dispatcher
+         */
+        interface Projects extends Resource {
+            /**
+             * * Creates a new project in a workspace or team.
+             * *
+             * * Every project is required to be created in a specific workspace or
+             * * organization, and this cannot be changed once set. Note that you can use
+             * * the `workspace` parameter regardless of whether or not it is an
+             * * organization.
+             * *
+             * * If the workspace for your project _is_ an organization, you must also
+             * * supply a `team` to share the project with.
+             * *
+             * * Returns the full record of the newly created project.
+             *   * @param {Object} data Data for the request
+             *   * @param {String} data.workspace The workspace or organization to create the project in.
+             *   * @param {String} [data.team] If creating in an organization, the specific team to create the
+             *   * project in.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            create(data: Projects.CreateParams & { workspace: number }, dispatchOptions?: any): Promise<Projects.Type>;
+
+            /**
+             * * If the workspace for your project _is_ an organization, you must also
+             * * supply a `team` to share the project with.
+             * *
+             * * Returns the full record of the newly created project.
+             *   * @param {Number} workspace The workspace or organization to create the project in.
+             *   * @param {Object} data Data for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param workspace
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            createInWorkspace(workspace: number, data: Projects.CreateParams, dispatchOptions?: any): Promise<Projects.Type>;
+
+            /**
+             * * Creates a project shared with the given team.
+             * *
+             * * Returns the full record of the newly created project.
+             *   * @param {Number} team The team to create the project in.
+             *   * @param {Object} data Data for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param team
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            createInTeam(team: number, data: Projects.CreateParams, dispatchOptions?: any): Promise<Projects.Type>;
+
+            /**
+             * * Returns the complete project record for a single project.
+             *   * @param {Number} project The project to get.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The requested resource
+             * @param project
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findById(project: number, params?: Params, dispatchOptions?: any): Promise<Projects.Type>;
+
+            /**
+             * * A specific, existing project can be updated by making a PUT request on the
+             * * URL for that project. Only the fields provided in the `data` block will be
+             * * updated; any unspecified fields will remain unchanged.
+             * *
+             * * When using this method, it is best to specify only those fields you wish
+             * * to change, or else you may overwrite changes made by another user since
+             * * you last retrieved the task.
+             * *
+             * * Returns the complete updated project record.
+             *   * @param {Number} project The project to update.
+             *   * @param {Object} data Data for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param project
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            update(project: number, data: Projects.CreateParams, dispatchOptions?: any): Promise<Projects.Type>;
+
+            /**
+             * * A specific, existing project can be deleted by making a DELETE request
+             * * on the URL for that project.
+             * *
+             * * Returns an empty data record.
+             *   * @param {Number} project The project to delete.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param project
+             * @param dispatchOptions?
+             * @return
+             */
+            delete(project: number, dispatchOptions?: any): Promise<void>;
+
+            /**
+             * * Returns the compact project records for some filtered set of projects.
+             * * Use one or more of the parameters provided to filter the projects returned.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {String} [params.workspace] The workspace or organization to filter projects on.
+             *   * @param {String} [params.team] The team to filter projects on.
+             *   * @param {Boolean} [params.archived] Only return projects whose `archived` field takes on the value of
+             *   * this parameter.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findAll(params?: Projects.FindAllParams, dispatchOptions?: any): Promise<ResourceList<Projects.Type>>;
+
+            /**
+             * * Returns the compact project records for all projects in the workspace.
+             *   * @param {Number} workspace The workspace or organization to find projects in.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Boolean} [params.archived] Only return projects whose `archived` field takes on the value of
+             *   * this parameter.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param workspace
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findByWorkspace(workspace: number, params?: Projects.FindByParams, dispatchOptions?: any): Promise<ResourceList<Projects.Type>>;
+
+            /**
+             * * Returns the compact project records for all projects in the team.
+             *   * @param {Number} team The team to find projects in.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Boolean} [params.archived] Only return projects whose `archived` field takes on the value of
+             *   * this parameter.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param team
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findByTeam(team: number, params?: Projects.FindByParams, dispatchOptions?: any): Promise<ResourceList<Projects.Type>>;
+
+            /**
+             * * Returns compact records for all sections in the specified project.
+             *   * @param {Number} project The project to get sections from.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param project
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            sections(project: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
+
+            /**
+             * * Returns the compact task records for all tasks within the given project,
+             * * ordered by their priority within the project. Tasks can exist in more than one project at a time.
+             *   * @param {Number} project The project in which to search for tasks.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param project
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            tasks(project: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
+
+            /**
+             * * Adds the specified list of users as followers to the project. Followers are a subset of members, therefore if
+             * * the users are not already members of the project they will also become members as a result of this operation.
+             * * Returns the updated project record.
+             *   * @param {Number} project The project to add followers to.
+             *   * @param {Object} data Data for the request
+             *   * @param {Array} data.followers An array of followers to add to the project.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param project
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            addFollowers(project: number, data: Projects.FollowersParams, dispatchOptions?: any): Promise<Projects.Type>;
+
+            /**
+             * * Removes the specified list of users from following the project, this will not affect project membership status.
+             * * Returns the updated project record.
+             *   * @param {Number} project The project to remove followers from.
+             *   * @param {Object} data Data for the request
+             *   * @param {Array} data.followers An array of followers to remove from the project.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param project
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            removeFollowers(project: number, data: Projects.FollowersParams, dispatchOptions?: any): Promise<Projects.Type>;
+
+            /**
+             * * Adds the specified list of users as members of the project. Returns the updated project record.
+             *   * @param {Number} project The project to add members to.
+             *   * @param {Object} data Data for the request
+             *   * @param {Array} data.members An array of members to add to the project.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param project
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            addMembers(project: number, data: Projects.MembersParams, dispatchOptions?: any): Promise<Projects.Type>;
+
+            /**
+             * * Removes the specified list of members from the project. Returns the updated project record.
+             *   * @param {Number} project The project to remove members from.
+             *   * @param {Object} data Data for the request
+             *   * @param {Array} data.members An array of members to remove from the project.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param project
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            removeMembers(project: number, data: Projects.MembersParams, dispatchOptions?: any): Promise<Projects.Type>;
+        }
+
+        interface StoriesStatic {
+            /**
+             * @param dispatcher
+             */
+            new (dispatcher: Dispatcher): Stories;
+        }
+
+        namespace Stories {
+            interface ShortType extends Resource {
+                created_at: string;
+                created_by: Resource;
+                type: string;
+                text: string;
+            }
+
+            interface Type extends ShortType {
+                html_text: string;
+                source: string;
+                target: Resource;
+                hearts: Type[];
+            }
+        }
+
+        var Stories: StoriesStatic;
+
+        /**
+         * A _story_ represents an activity associated with an object in the Asana
+         * system. Stories are generated by the system whenever users take actions such
+         * as creating or assigning tasks, or moving tasks between projects. _Comments_
+         * are also a form of user-generated story.
+         *
+         * Stories are a form of history in the system, and as such they are read-only.
+         * Once generated, it is not possible to modify a story.
+         * @class
+         * @param {Dispatcher} dispatcher The API dispatcher
+         */
+        interface Stories extends Resource {
+            /**
+             * * Returns the compact records for all stories on the task.
+             *   * @param {Number} task Globally unique identifier for the task.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findByTask(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Stories.Type>>;
+
+            /**
+             * * Returns the full record for a single story.
+             *   * @param {Number} story Globally unique identifier for the story.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The requested resource
+             * @param story
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findById(story: number, params?: Params, dispatchOptions?: any): Promise<Stories.Type>;
+
+            /**
+             * * Adds a comment to a task. The comment will be authored by the
+             * * currently authenticated user, and timestamped when the server receives
+             * * the request.
+             * *
+             * * Returns the full record for the new story added to the task.
+             *   * @param {Number} task Globally unique identifier for the task.
+             *   * @param {Object} data Data for the request
+             *   * @param {String} data.text The plain text of the comment to add.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            createOnTask(task: number, data: any, dispatchOptions?: any): Promise<ResourceList<Stories.ShortType>>;
+        }
+
+        interface TagsStatic {
+            /**
+             * @param dispatcher
+             */
+            new (dispatcher: Dispatcher): Tags;
+        }
+
+        namespace Tags {
+            interface Type extends Resource {
+                created_at: string;
+                notes: string;
+                workspace: Resource;
+                color: string;
+                followers: Resource[];
+            }
+
+            interface FindAllParams extends PaginationParams {
+                team?: number;
+                archived?: boolean;
+            }
+        }
+
+        var Tags: TagsStatic;
+
+        /**
+         * A _tag_ is a label that can be attached to any task in Asana. It exists in a
+         * single workspace or organization.
+         *
+         * Tags have some metadata associated with them, but it is possible that we will
+         * simplify them in the future so it is not encouraged to rely too heavily on it.
+         * Unlike projects, tags do not provide any ordering on the tasks they
+         * are associated with.
+         * @class
+         * @param {Dispatcher} dispatcher The API dispatcher
+         */
+        interface Tags extends Resource {
+            /**
+             * * Creates a new tag in a workspace or organization.
+             * *
+             * * Every tag is required to be created in a specific workspace or
+             * * organization, and this cannot be changed once set. Note that you can use
+             * * the `workspace` parameter regardless of whether or not it is an
+             * * organization.
+             * *
+             * * Returns the full record of the newly created tag.
+             *   * @param {Object} data Data for the request
+             *   * @param {String} data.workspace The workspace or organization to create the tag in.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            create(data: Tags.Type & { workspace: string }, dispatchOptions?: any): Promise<Tags.Type>;
+
+            /**
+             * * Creates a new tag in a workspace or organization.
+             * *
+             * * Every tag is required to be created in a specific workspace or
+             * * organization, and this cannot be changed once set. Note that you can use
+             * * the `workspace` parameter regardless of whether or not it is an
+             * * organization.
+             * *
+             * * Returns the full record of the newly created tag.
+             *   * @param {Number} workspace The workspace or organization to create the tag in.
+             *   * @param {Object} data Data for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param workspace
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            createInWorkspace(workspace: number, data: Tags.Type, dispatchOptions?: any): Promise<Tags.Type>;
+
+            /**
+             * * Returns the complete tag record for a single tag.
+             *   * @param {Number} tag The tag to get.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The requested resource
+             * @param tag
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findById(tag: number, params?: Params, dispatchOptions?: any): Promise<Tags.Type>;
+
+            /**
+             * * Updates the properties of a tag. Only the fields provided in the `data`
+             * * block will be updated; any unspecified fields will remain unchanged.
+             * *
+             * * When using this method, it is best to specify only those fields you wish
+             * * to change, or else you may overwrite changes made by another user since
+             * * you last retrieved the task.
+             * *
+             * * Returns the complete updated tag record.
+             *   * @param {Number} tag The tag to update.
+             *   * @param {Object} data Data for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param tag
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            update(tag: number, data: Tags.Type, dispatchOptions?: any): Promise<Tags.Type>;
+
+            /**
+             * * A specific, existing tag can be deleted by making a DELETE request
+             * * on the URL for that tag.
+             * *
+             * * Returns an empty data record.
+             *   * @param {Number} tag The tag to delete.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param tag
+             * @param dispatchOptions?
+             * @return
+             */
+            delete(tag: number, dispatchOptions?: any): Promise<void>;
+
+            /**
+             * * Returns the compact tag records for some filtered set of tags.
+             * * Use one or more of the parameters provided to filter the tags returned.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {String} [params.workspace] The workspace or organization to filter tags on.
+             *   * @param {String} [params.team] The team to filter tags on.
+             *   * @param {Boolean} [params.archived] Only return tags whose `archived` field takes on the value of
+             *   * this parameter.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findAll(params?: Tags.FindAllParams, dispatchOptions?: any): Promise<ResourceList<Tags.Type>>;
+
+            /**
+             * * Returns the compact tag records for all tags in the workspace.
+             *   * @param {Number} workspace The workspace or organization to find tags in.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param workspace
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findByWorkspace(workspace: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tags.Type>>;
+
+            /**
+             * * Returns the compact task records for all tasks with the given tag.
+             * * Tasks can have more than one tag at a time.
+             *   * @param {Number} tag The tag to fetch tasks from.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param tag
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            getTasksWithTag(tag: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
+        }
+
+        interface TasksStatic {
+            /**
+             * @param dispatcher
+             */
+            new (dispatcher: Dispatcher): Tasks;
+        }
+
+        namespace Tasks {
+            interface Type extends Resource {
+                created_at: string;
+                modified_at: string;
+                completed_at: string;
+                completed: boolean;
+                due_on: string;
+                due_at: string;
+                assignee_status: string;
+                assignee: Resource;
+                notes: string;
+                workspace: Resource;
+                num_hearts: number;
+                hearted: boolean;
+                parent: Resource;
+                tags: Resource[];
+                projects: Resource[];
+                memberships: Membership[];
+                followers: Resource[];
+            }
+
+            interface CreateParams {
+                name: string;
+                completed?: boolean;
+                hearted?: boolean;
+                notes?: string;
+            }
+
+            interface FollowersParams {
+                followers: (number | string)[];
+            }
+
+            interface AddProjectParams {
+                project: number;
+                insertBefore?: number;
+                insertAfter?: number;
+                section?: number;
+            }
+
+            interface RemoveProjectParams {
+                project: number;
+            }
+
+            interface TagParams {
+                tag: string;
+            }
+
+            interface CommentParams {
+                text: string;
+            }
+
+            interface FindAllParams extends PaginationParams {
+                assignee?: number;
+                workspace: number;
+                completed_since?: string;
+                modified_since?: string;
+            }
+        }
+
+        var Tasks: TasksStatic;
+
+        /**
+         * The _task_ is the basic object around which many operations in Asana are
+         * centered. In the Asana application, multiple tasks populate the middle pane
+         * according to some view parameters, and the set of selected tasks determines
+         * the more detailed information presented in the details pane.
+         * @class
+         * @param {Dispatcher} dispatcher The API dispatcher
+         */
+        interface Tasks extends Resource {
+            /**
+             * * Creating a new task is as easy as POSTing to the `/tasks` endpoint
+             * * with a data block containing the fields you'd like to set on the task.
+             * * Any unspecified fields will take on default values.
+             * *
+             * * Every task is required to be created in a specific workspace, and this
+             * * workspace cannot be changed once set. The workspace need not be set
+             * * explicitly if you specify a `project` or a `parent` task instead.
+             *   * @param {Object} data Data for the request
+             *   * @param {Number} [data.workspace] The workspace to create a task in.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            create(data: Tasks.CreateParams & { workspace: string }, dispatchOptions?: any): Promise<Tasks.Type>;
+
+            /**
+             * * Creating a new task is as easy as POSTing to the `/tasks` endpoint
+             * * with a data block containing the fields you'd like to set on the task.
+             * * Any unspecified fields will take on default values.
+             * *
+             * * Every task is required to be created in a specific workspace, and this
+             * * workspace cannot be changed once set. The workspace need not be set
+             * * explicitly if you specify a `project` or a `parent` task instead.
+             *   * @param {Number} workspace The workspace to create a task in.
+             *   * @param {Object} data Data for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param workspace
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            createInWorkspace(workspace: number, data: Tasks.CreateParams, dispatchOptions?: any): Promise<Tasks.Type>;
+
+            /**
+             * * Returns the complete task record for a single task.
+             *   * @param {Number} task The task to get.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The requested resource
+             * @param task
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findById(task: number, params?: Params, dispatchOptions?: any): Promise<Tasks.Type>;
+
+            /**
+             * * A specific, existing task can be updated by making a PUT request on the
+             * * URL for that task. Only the fields provided in the `data` block will be
+             * * updated; any unspecified fields will remain unchanged.
+             * *
+             * * When using this method, it is best to specify only those fields you wish
+             * * to change, or else you may overwrite changes made by another user since
+             * * you last retrieved the task.
+             * *
+             * * Returns the complete updated task record.
+             *   * @param {Number} task The task to update.
+             *   * @param {Object} data Data for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            update(task: number, data: Tasks.CreateParams, dispatchOptions?: any): Promise<Tasks.Type>;
+
+            /**
+             * * A specific, existing task can be deleted by making a DELETE request on the
+             * * URL for that task. Deleted tasks go into the "trash" of the user making
+             * * the delete request. Tasks can be recovered from the trash within a period
+             * * of 30 days; afterward they are completely removed from the system.
+             * *
+             * * Returns an empty data record.
+             *   * @param {Number} task The task to delete.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param dispatchOptions?
+             * @return
+             */
+            delete(task: number, dispatchOptions?: any): Promise<void>;
+
+            /**
+             * * Returns the compact task records for all tasks within the given project,
+             * * ordered by their priority within the project.
+             *   * @param {Number} projectId The project in which to search for tasks.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param projectId
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findByProject(projectId: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
+
+            /**
+             * * Returns the compact task records for all tasks with the given tag.
+             *   * @param {Number} tag The tag in which to search for tasks.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param tag
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findByTag(tag: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
+
+            /**
+             * * Returns the compact task records for some filtered set of tasks. Use one
+             * * or more of the parameters provided to filter the tasks returned.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Number} [params.assignee] The assignee to filter tasks on.
+             *   * @param {Number} [params.workspace] The workspace or organization to filter tasks on.
+             *   * @param {Number} [params.completed_since] Only return tasks that are either incomplete or that have been
+             *   * completed since this time.
+             *   * @param {Number} [params.modified_since] Only return tasks that have been modified since the given time.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findAll(params?: Tasks.FindAllParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
+
+            /**
+             * * Adds each of the specified followers to the task, if they are not already
+             * * following. Returns the complete, updated record for the affected task.
+             *   * @param {Number} task The task to add followers to.
+             *   * @param {Object} data Data for the request
+             *   * @param {Array} data.followers An array of followers to add to the task.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            addFollowers(task: number, data: Tasks.FollowersParams, dispatchOptions?: any): Promise<Tasks.Type>;
+
+            /**
+             * * Removes each of the specified followers from the task if they are
+             * * following. Returns the complete, updated record for the affected task.
+             *   * @param {Number} task The task to remove followers from.
+             *   * @param {Object} data Data for the request
+             *   * @param {Array} data.followers An array of followers to remove from the task.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            removeFollowers(task: number, data: Tasks.FollowersParams, dispatchOptions?: any): Promise<Tasks.Type>;
+
+            /**
+             * * Returns a compact representation of all of the projects the task is in.
+             *   * @param {Number} task The task to get projects on.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            projects(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Projects.Type>>;
+
+            /**
+             * * Adds the task to the specified project, in the optional location
+             * * specified. If no location arguments are given, the task will be added to
+             * * the beginning of the project.
+             * *
+             * * `addProject` can also be used to reorder a task within a project that
+             * * already contains it.
+             * *
+             * * Returns an empty data block.
+             *   * @param {Number} task The task to add to a project.
+             *   * @param {Object} data Data for the request
+             *   * @param {Number} data.project The project to add the task to.
+             *   * @param {Number} [data.insertAfter] A task in the project to insert the task after, or `null` to
+             *   * insert at the beginning of the list.
+             *   * @param {Number} [data.insertBefore] A task in the project to insert the task before, or `null` to
+             *   * insert at the end of the list.
+             *   * @param {Number} [data.section] A section in the project to insert the task into. The task will be
+             *   * inserted at the top of the section.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            addProject(task: number, data: Tasks.AddProjectParams, dispatchOptions?: any): Promise<{}>;
+
+            /**
+             * * Removes the task from the specified project. The task will still exist
+             * * in the system, but it will not be in the project anymore.
+             * *
+             * * Returns an empty data block.
+             *   * @param {Number} task The task to remove from a project.
+             *   * @param {Object} data Data for the request
+             *   * @param {Number} data.project The project to remove the task from.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            removeProject(task: number, data: Tasks.RemoveProjectParams, dispatchOptions?: any): Promise<{}>;
+
+            /**
+             * * Returns a compact representation of all of the tags the task has.
+             *   * @param {Number} task The task to get tags on.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            tags(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tags.Type>>;
+
+            /**
+             * * Adds a tag to a task. Returns an empty data block.
+             *   * @param {Number} task The task to add a tag to.
+             *   * @param {Object} data Data for the request
+             *   * @param {Number} data.tag The tag to add to the task.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            addTag(task: number, data: Tasks.TagParams, dispatchOptions?: any): Promise<{}>;
+
+            /**
+             * * Removes a tag from the task. Returns an empty data block.
+             *   * @param {Number} task The task to remove a tag from.
+             *   * @param {Object} data Data for the request
+             *   * @param {String} data.tag The tag to remove from the task.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            removeTag(task: number, data: Tasks.TagParams, dispatchOptions?: any): Promise<{}>;
+
+            /**
+             * * Returns a compact representation of all of the subtasks of a task.
+             *   * @param {Number} task The task to get the subtasks of.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            subtasks(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
+
+            /**
+             * * Creates a new subtask and adds it to the parent task. Returns the full record
+             * * for the newly created subtask.
+             *   * @param {Number} task The task to add a subtask to.
+             *   * @param {Object} data Data for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            addSubtask(task: number, data: Tasks.CreateParams, dispatchOptions?: any): Promise<Tasks.Type>;
+
+            /**
+             * * Returns a compact representation of all of the stories on the task.
+             *   * @param {Number} task The task containing the stories to get.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            stories(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Stories.Type>>;
+
+            /**
+             * * Adds a comment to a task. The comment will be authored by the
+             * * currently authenticated user, and timestamped when the server receives
+             * * the request.
+             * *
+             * * Returns the full record for the new story added to the task.
+             *   * @param {Number} task Globally unique identifier for the task.
+             *   * @param {Object} data Data for the request
+             *   * @param {String} data.text The plain text of the comment to add.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            addComment(task: number, data: Tasks.CommentParams, dispatchOptions?: any): Promise<Stories.Type>;
+        }
+
+        interface TeamsStatic {
+            /**
+             * @param dispatcher
+             */
+            new (dispatcher: Dispatcher): Teams;
+        }
+
+        namespace Teams {
+            interface Type extends Resource {
+                organization: Resource;
+            }
+        }
+
+        var Teams: TeamsStatic;
+
+        /**
+         * A _team_ is used to group related projects and people together within an
+         * organization. Each project in an organization is associated with a team.
+         * @class
+         * @param {Dispatcher} dispatcher The API dispatcher
+         */
+        interface Teams extends Resource {
+            /**
+             * * Returns the full record for a single team.
+             *   * @param {Number} team Globally unique identifier for the team.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The requested resource
+             * @param team
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findById(team: number, params?: Params, dispatchOptions?: any): Promise<Teams.Type>;
+
+            /**
+             * * Returns the compact records for all teams in the organization visible to
+             * * the authorized user.
+             *   * @param {Number} organization Globally unique identifier for the workspace or organization.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param organization
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findByOrganization(organization: number, params?: Params, dispatchOptions?: any): Promise<SimpleResourceList>;
+
+            /**
+             * * Returns the compact records for all users that are members of the team.
+             *   * @param {Number} team Globally unique identifier for the team.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param team
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            users(team: number, params?: Params, dispatchOptions?: any): Promise<SimpleResourceList>;
+
+            /**
+             * * The user making this call must be a member of the team in order to add others.
+             * * The user to add must exist in the same organization as the team in order to be added.
+             * * The user to add can be referenced by their globally unique user ID or their email address.
+             * * Returns the full user record for the added user.
+             *   * @param {Number} team Globally unique identifier for the team.
+             *   * @param {Object} data Data for the request
+             *   * @param {Number|String} data.user An identifier for the user. Can be one of an email address,
+             *   * the globally unique identifier for the user, or the keyword `me`
+             *   * to indicate the current user making the request.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param team
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            addUser(team: number, data: UserParams, dispatchOptions?: any): Promise<any>;
+
+            /**
+             * * The user to remove can be referenced by their globally unique user ID or their email address.
+             * * Removes the user from the specified team. Returns an empty data record.
+             *   * @param {Number} team Globally unique identifier for the team.
+             *   * @param {Object} data Data for the request
+             *   * @param {Number|String} data.user An identifier for the user. Can be one of an email address,
+             *   * the globally unique identifier for the user, or the keyword `me`
+             *   * to indicate the current user making the request.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param team
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            removeUser(team: number, data: UserParams, dispatchOptions?: any): Promise<any>;
+        }
+
+        interface UsersStatic {
+            /**
+             * @param dispatcher
+             */
+            new (dispatcher: Dispatcher): Users;
+        }
+
+        namespace Users {
+            interface FindAllParams extends PaginationParams {
+                workspace: number;
+            }
+
+            interface Type extends Resource {
+                email: string;
+                workspaces: Resource[];
+                photo: { [key: string]: string };
+            }
+        }
+
+        var Users: UsersStatic;
+
+        /**
+         * A _user_ object represents an account in Asana that can be given access to
+         * various workspaces, projects, and tasks.
+         *
+         * Like other objects in the system, users are referred to by numerical IDs.
+         * However, the special string identifier `me` can be used anywhere
+         * a user ID is accepted, to refer to the current authenticated user.
+         * @class
+         * @param {Dispatcher} dispatcher The API dispatcher
+         */
+        interface Users extends Resource {
+            /**
+             * * Returns the full user record for the currently authenticated user.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The requested resource
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            me(params?: Params, dispatchOptions?: any): Promise<Users.Type>;
+
+            /**
+             * * Returns the full user record for the single user with the provided ID.
+             *   * @param {Number|String} user An identifier for the user. Can be one of an email address,
+             *   * the globally unique identifier for the user, or the keyword `me`
+             *   * to indicate the current user making the request.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The requested resource
+             * @param user
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findById(user: string | number, params?: Params, dispatchOptions?: any): Promise<Users.Type>;
+
+            /**
+             * * Returns the user records for all users in the specified workspace or
+             * * organization.
+             *   * @param {Number} workspace The workspace in which to get users.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param workspace
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findByWorkspace(workspace: number, params?: Params, dispatchOptions?: any): Promise<ResourceList<Users.Type>>;
+
+            /**
+             * * Returns the user records for all users in all workspaces and organizations
+             * * accessible to the authenticated user. Accepts an optional workspace ID
+             * * parameter.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Number} [params.workspace] The workspace or organization to filter users on.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param params
+             * @param dispatchOptions?
+             * @return
+             */
+            findAll(params: Users.FindAllParams, dispatchOptions?: any): Promise<SimpleResourceList>;
+        }
+
+        /**
+         * **Webhooks are currently in BETA - The information here may change.**
+         *
+         * Webhooks allow an application to be notified of changes. This is in addition
+         * to the ability to fetch those changes directly as
+         * [Events](/developers/api-reference/events) - in fact, Webhooks are just a way
+         * to receive Events via HTTP POST at the time they occur instead of polling for
+         * them. For services accessible via HTTP this is often vastly more convenient,
+         * and if events are not too frequent can be significantly more efficient.
+         *
+         * In both cases, however, changes are represented as Event objects - refer to
+         * the [Events documentation](/developers/api-reference/events) for more
+         * information on what data these events contain.
+         *
+         * **NOTE:** While Webhooks send arrays of Event objects to their target, the
+         * Event objects themselves contain *only IDs*, rather than the actual resource
+         * they are referencing. So while a normal event you receive via GET /events
+         * would look like this:
+         *
+         *     {\
+         *       "resource": {\
+         *         "id": 1337,\
+         *         "name": "My Task"\
+         *       },\
+         *       "parent": null,\
+         *       "created_at": "2013-08-21T18:20:37.972Z",\
+         *       "user": {\
+         *         "id": 1123,\
+         *         "name": "Tom Bizarro"\
+         *       },\
+         *       "action": "changed",\
+         *       "type": "task"\
+         *     }
+         *
+         * In a Webhook payload you would instead receive this:
+         *
+         *     {\
+         *       "resource": 1337,\
+         *       "parent": null,\
+         *       "created_at": "2013-08-21T18:20:37.972Z",\
+         *       "user": 1123,\
+         *       "action": "changed",\
+         *       "type": "task"\
+         *     }
+         *
+         * Webhooks themselves contain only the information necessary to deliver the
+         * events to the desired target as they are generated.
+         * @class
+         * @param {Dispatcher} dispatcher The API dispatcher
+         */
+        class Webhooks extends Resource {
+            /**
+             * @param dispatcher
+             */
+            constructor(dispatcher: Dispatcher);
+
+            /**
+             * * Establishing a webhook is a two-part process. First, a simple HTTP POST
+             * * similar to any other resource creation. Since you could have multiple
+             * * webhooks we recommend specifying a unique local id for each target.
+             * *
+             * * Next comes the confirmation handshake. When a webhook is created, we will
+             * * send a test POST to the `target` with an `X-Hook-Secret` header as
+             * * described in the
+             * * [Resthooks Security documentation](http://resthooks.org/docs/security/).
+             * * The target must respond with a `200 OK` and a matching `X-Hook-Secret`
+             * * header to confirm that this webhook subscription is indeed expected.
+             * *
+             * * If you do not acknowledge the webhook's confirmation handshake it will
+             * * fail to setup, and you will receive an error in response to your attempt
+             * * to create it. This means you need to be able to receive and complete the
+             * * webhook *while* the POST request is in-flight.
+             *   * @param {Number} resource A resource ID to subscribe to. The resource can be a task or project.
+             *   * @param {String} target The URL to receive the HTTP POST.
+             *   * @param {Object} data Data for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param resource
+             * @param target
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            create(resource: number, target: string, data: any, dispatchOptions?: any): Promise<any>;
+
+            /**
+             * * Returns the compact representation of all webhooks your app has
+             * * registered for the authenticated user in the given workspace.
+             *   * @param {Number} workspace The workspace to query for webhooks in.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Number} [params.resource] Only return webhooks for the given resource.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param workspace
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            getAll(workspace: number, params?: any, dispatchOptions?: any): Promise<any>;
+
+            /**
+             * * Returns the full record for the given webhook.
+             *   * @param {String} webhook The webhook to get.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The requested resource
+             * @param webhook
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            getById(webhook: string, params?: any, dispatchOptions?: any): Promise<any>;
+
+            /**
+             * * This method permanently removes a webhook. Note that it may be possible
+             * * to receive a request that was already in flight after deleting the
+             * * webhook, but no further requests will be issued.
+             *   * @param {String} webhook The webhook to delete.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param webhook
+             * @param dispatchOptions?
+             * @return
+             */
+            deleteById(webhook: string, dispatchOptions?: any): Promise<any>;
+        }
+
+        interface WorkspacesStatic {
+            /**
+             * @param dispatcher
+             */
+            new (dispatcher: Dispatcher): Workspaces;
+        }
+
+        namespace Workspaces {
+            interface ShortType extends Resource {
+                id_organization?: boolean;
+            }
+
+            interface Type extends Resource {
+                id_organization: boolean;
+                email_domains: string[];
+            }
+
+            interface TypeaheadParams {
+                type: string;
+                query?: string;
+                count?: number;
+            }
+        }
+
+        var Workspaces: WorkspacesStatic;
+
+        /**
+         * A _workspace_ is the highest-level organizational unit in Asana. All projects
+         * and tasks have an associated workspace.
+         *
+         * An _organization_ is a special kind of workspace that represents a company.
+         * In an organization, you can group your projects into teams. You can read
+         * more about how organizations work on the Asana Guide.
+         * To tell if your workspace is an organization or not, check its
+         * `is_organization` property.
+         *
+         * Over time, we intend to migrate most workspaces into organizations and to
+         * release more organization-specific functionality. We may eventually deprecate
+         * using workspace-based APIs for organizations. Currently, and until after
+         * some reasonable grace period following any further announcements, you can
+         * still reference organizations in any `workspace` parameter.
+         * @class
+         * @param {Dispatcher} dispatcher The API dispatcher
+         */
+        interface Workspaces extends Resource {
+            /**
+             * * Returns the full workspace record for a single workspace.
+             *   * @param {Number} workspace Globally unique identifier for the workspace or organization.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The requested resource
+             * @param workspace
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findById(workspace: number, params?: Params, dispatchOptions?: any): Promise<Workspaces.Type>;
+
+            /**
+             * * Returns the compact records for all workspaces visible to the authorized user.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findAll(params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Workspaces.ShortType>>;
+
+            /**
+             * * A specific, existing workspace can be updated by making a PUT request on
+             * * the URL for that workspace. Only the fields provided in the data block
+             * * will be updated; any unspecified fields will remain unchanged.
+             * *
+             * * Currently the only field that can be modified for a workspace is its `name`.
+             * *
+             * * Returns the complete, updated workspace record.
+             *   * @param {Number} workspace The workspace to update.
+             *   * @param {Object} data Data for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param workspace
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            update(workspace: number, data: { name?: string }, dispatchOptions?: any): Promise<Workspaces.Type>;
+
+            /**
+             * * Retrieves objects in the workspace based on an auto-completion/typeahead
+             * * search algorithm. This feature is meant to provide results quickly, so do
+             * * not rely on this API to provide extremely accurate search results. The
+             * * result set is limited to a single page of results with a maximum size,
+             * * so you won't be able to fetch large numbers of results.
+             *   * @param {Number} workspace The workspace to fetch objects from.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {String} params.type The type of values the typeahead should return.
+             *   * Note that unlike in the names of endpoints, the types listed here are
+             *   * in singular form (e.g. `task`). Using multiple types is not yet supported.
+             *   * @param {String} [params.query] The string that will be used to search for relevant objects. If an
+             *   * empty string is passed in, the API will currently return an empty
+             *   * result set.
+             *   * @param {Number} [params.count] The number of results to return. The default is `20` if this
+             *   * parameter is omitted, with a minimum of `1` and a maximum of `100`.
+             *   * If there are fewer results found than requested, all will be returned.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param workspace
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            typeahead(workspace: number, params?: Workspaces.TypeaheadParams, dispatchOptions?: any): Promise<SimpleResourceList>;
+
+            /**
+             * * The user can be referenced by their globally unique user ID or their email address.
+             * * Returns the full user record for the invited user.
+             *   * @param {Number} workspace The workspace or organization to invite the user to.
+             *   * @param {Object} data Data for the request
+             *   * @param {Number|String} data.user An identifier for the user. Can be one of an email address,
+             *   * the globally unique identifier for the user, or the keyword `me`
+             *   * to indicate the current user making the request.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param workspace
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            addUser(workspace: number, data: UserParams, dispatchOptions?: any): Promise<Users.Type>;
+
+            /**
+             * * The user making this call must be an admin in the workspace.
+             * * Returns an empty data record.
+             *   * @param {Number} workspace The workspace or organization to invite the user to.
+             *   * @param {Object} data Data for the request
+             *   * @param {Number|String} data.user An identifier for the user. Can be one of an email address,
+             *   * the globally unique identifier for the user, or the keyword `me`
+             *   * to indicate the current user making the request.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param workspace
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            removeUser(workspace: number, data: UserParams, dispatchOptions?: any): Promise<any>;
+        }
+
+        interface ResourceStatic {
+            /**
+             * @param dispatcher
+             */
+            new (dispatcher: Dispatcher): Resource;
+
+            /**
+             * @type {number} Default number of items to get per page.
+             */
+            DEFAULT_PAGE_LIMIT: number;
+
+            /**
+             * Helper method that dispatches a GET request to the API, where the expected
+             * result is a collection.
+             * @param  {Dispatcher} dispatcher
+             * @param  {String}     path    The path of the API
+             * @param  {Object}     [query] The query params
+             * @param  {Object}     [dispatchOptions] Options for handling the request and
+             *     response. See `Dispatcher.dispatch`.
+             * @return {Promise<SimpleResourceList>} The Collection response for the request
+             * @param dispatcher
+             * @param path
+             * @param query?
+             * @param dispatchOptions?
+             */
+            getCollection(dispatcher: any, path: string, query?: any, dispatchOptions?: any): Promise<any>;
+
+            /**
+             * Helper method for any request Promise from the Dispatcher, unwraps the `data`
+             * value from the payload.
+             * @param  {Promise} promise A promise returned from a `Dispatcher` request.
+             * @return {Promise}         The `data` portion of the response payload.
+             * @param promise
+             * @return
+             */
+            unwrap(promise: any): Promise<any>;
+        }
+
+        var Resource: ResourceStatic;
+
+        /**
+         * Base class for a resource accessible via the API. Uses a `Dispatcher` to
+         * access the resources.
+         * @param {Dispatcher} dispatcher
+         * @constructor
+         */
+        interface Resource {
+            /**
+             * Dispatches a GET request to the API, where the expected result is a
+             * single resource.
+             * @param  {String}     path    The path of the API
+             * @param  {Object}     [query] The query params
+             * @param  {Object}     [dispatchOptions] Options for handling the request and
+             *     response. See `Dispatcher.dispatch`.
+             * @return {Promise}            The response for the request
+             * @param path
+             * @param query?
+             * @param dispatchOptions?
+             * @return
+             */
+            dispatchGet(path: string, query?: any, dispatchOptions?: any): Promise<any>;
+
+            /**
+             * Dispatches a GET request to the API, where the expected result is a
+             * collection.
+             * @param  {String}     path    The path of the API
+             * @param  {Object}     [query] The query params
+             * @param  {Object}     [dispatchOptions] Options for handling the request and
+             *     response. See `Dispatcher.dispatch`.
+             * @return {Promise}            The response for the request
+             * @param path
+             * @param query?
+             * @param dispatchOptions?
+             * @return
+             */
+            dispatchGetCollection(path: string, query?: any, dispatchOptions?: any): Promise<any>;
+
+            /**
+             * Dispatches a POST request to the API, where the expected response is a
+             * single resource.
+             * @param  {String}     path    The path of the API
+             * @param  {Object}     [query] The query params
+             * @param  {Object}     [dispatchOptions] Options for handling the request and
+             *     response. See `Dispatcher.dispatch`.
+             * @return {Promise}            The response for the request
+             * @param path
+             * @param query?
+             * @param dispatchOptions?
+             * @return
+             */
+            dispatchPost(path: string, query?: any, dispatchOptions?: any): Promise<any>;
+
+            /**
+             * Dispatches a POST request to the API, where the expected response is a
+             * single resource.
+             * @param  {String}     path    The path of the API
+             * @param  {Object}     [query] The query params
+             * @param  {Object}     [dispatchOptions] Options for handling the request and
+             *     response. See `Dispatcher.dispatch`.
+             * @return {Promise}            The response for the request
+             * @param path
+             * @param query?
+             * @param dispatchOptions?
+             * @return
+             */
+            dispatchPut(path: string, query?: any, dispatchOptions?: any): Promise<any>;
+
+            /**
+             * Dispatches a DELETE request to the API. The expected response is an
+             * empty resource.
+             * @param  {String}     path    The path of the API
+             * @param  {Object}     [dispatchOptions] Options for handling the request and
+             *     response. See `Dispatcher.dispatch`.
+             * @return {Promise}            The response for the request
+             * @param path
+             * @param dispatchOptions?
+             * @return
+             */
+            dispatchDelete(path: string, dispatchOptions?: any): Promise<any>;
+        }
+
+        interface ResourceList<T extends Resource> {
+            data: T[];
+            _response: {
+                data: T[];
+                next_page?: NextPage;
+            };
+            _dispatcher: {
+                authenticator: {
+                    apiKey: string;
+                };
+                asanaBaseUrl: string;
+                retryOnRateLimit: boolean;
+                requestTimeout: number;
+                _cachedVersionInfo: VersionInfo;
+            }
+        }
+
+        type SimpleResourceList = ResourceList<Resource>;
+
+        interface NextPage {
+            offset: string;
+            uri: string;
+            path: string;
+        }
+
+        interface VersionInfo {
+            version: string;
+            language: string;
+            language_version: string;
+            os: string;
+            os_version: string;
+        }
+
+        interface Resource {
+            id: number;
+            name: string;
+        }
+
+        interface PaginationParams extends Params {
+            limit?: number;
+            offset?: string;
+        }
+
+        interface Params {
+            opt_fields?: string;
+            opt_expand?: string;
+        }
+
+        interface UserParams {
+            user: string | number;
+        }
+
+        interface Membership {
+            project: Resource;
+            section: Resource;
+        }
+    }
+
+    var VERSION: string;
+}
+
+export = asana;
diff --git a/asana/tsconfig.json b/asana/tsconfig.json
new file mode 100644
index 0000000000..b9320b76f5
--- /dev/null
+++ b/asana/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "asana-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/asciify/asciify-tests.ts b/asciify/asciify-tests.ts
index c95b9c6993..aaee5866e3 100644
--- a/asciify/asciify-tests.ts
+++ b/asciify/asciify-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./asciify.d.ts" />
+
 
 import asciify = require('asciify');
 
diff --git a/asciify/asciify.d.ts b/asciify/asciify.d.ts
deleted file mode 100644
index 4cef1bcc5c..0000000000
--- a/asciify/asciify.d.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// Type definitions for asciify 1.3.5
-// Project: https://www.npmjs.org/package/asciify
-// Definitions by: Alan Norbauer <http://alan.norbauer.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-interface AsciifyOptions {
-    font?: string;
-    maxWidth?: number;
-    color?: string;
-}
-
-interface AsciifyCallback {
-    // err is sometimes a string and sometimes an Error
-    (err: any, asciifiedText: string): void
-}
-
-declare module "asciify" {
-    function asciify(text: string, callback: AsciifyCallback): void;
-    function asciify(text: string, options: string, callback: AsciifyCallback): void;
-    function asciify(text: string, options: AsciifyOptions, callback: AsciifyCallback): void;
-
-    namespace asciify {
-        function getFonts(callback: (err: Error, fonts: string[]) => void): void;
-    }
-
-    export = asciify
-}
diff --git a/asciify/asciify.ts.tscparams b/asciify/asciify.ts.tscparams
deleted file mode 100644
index 85542607d1..0000000000
--- a/asciify/asciify.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---noImplicitAny --module commonjs
diff --git a/asciify/index.d.ts b/asciify/index.d.ts
new file mode 100644
index 0000000000..7d55062213
--- /dev/null
+++ b/asciify/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for asciify 1.3.5
+// Project: https://www.npmjs.org/package/asciify
+// Definitions by: Alan Norbauer <http://alan.norbauer.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+interface AsciifyOptions {
+    font?: string;
+    maxWidth?: number;
+    color?: string;
+}
+
+interface AsciifyCallback {
+    // err is sometimes a string and sometimes an Error
+    (err: any, asciifiedText: string): void
+}
+
+declare module "asciify" {
+    function asciify(text: string, callback: AsciifyCallback): void;
+    function asciify(text: string, options: string, callback: AsciifyCallback): void;
+    function asciify(text: string, options: AsciifyOptions, callback: AsciifyCallback): void;
+
+    namespace asciify {
+        function getFonts(callback: (err: Error, fonts: string[]) => void): void;
+    }
+
+    export = asciify
+}
diff --git a/asciify/tsconfig.json b/asciify/tsconfig.json
new file mode 100644
index 0000000000..290b21526e
--- /dev/null
+++ b/asciify/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "asciify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/aspnet-identity-pw/aspnet-identity-pw-tests.ts b/aspnet-identity-pw/aspnet-identity-pw-tests.ts
index 83fb6878ab..235d39dc5a 100644
--- a/aspnet-identity-pw/aspnet-identity-pw-tests.ts
+++ b/aspnet-identity-pw/aspnet-identity-pw-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="aspnet-identity-pw.d.ts" />
 
 import passwordHasher = require('aspnet-identity-pw');
 
diff --git a/aspnet-identity-pw/aspnet-identity-pw.d.ts b/aspnet-identity-pw/aspnet-identity-pw.d.ts
deleted file mode 100644
index 390033602b..0000000000
--- a/aspnet-identity-pw/aspnet-identity-pw.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Type definitions for aspnet-identity-pw 1.0.0
-// Project: https://github.com/Syncbak-Git/aspnet-identity-pw
-// Definitions by: jt000 <https://github.com/jt000>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "aspnet-identity-pw" {
-
-	export function hashPassword(password: string): string;
-	export function hashPassword(password: string, callback: (err: any, result: string)=>void): void;
-
-	export function validatePassword(password: string, hashedPass: string): boolean;
-	export function validatePassword(password: string, hashedPass: string, callback: (err: any, result: boolean) => void): void; 
-}
diff --git a/aspnet-identity-pw/index.d.ts b/aspnet-identity-pw/index.d.ts
new file mode 100644
index 0000000000..cadffeef1a
--- /dev/null
+++ b/aspnet-identity-pw/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for aspnet-identity-pw 1.0.0
+// Project: https://github.com/Syncbak-Git/aspnet-identity-pw
+// Definitions by: jt000 <https://github.com/jt000>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+export declare function hashPassword(password: string): string;
+export declare function hashPassword(password: string, callback: (err: any, result: string) => void): void;
+
+export declare function validatePassword(password: string, hashedPass: string): boolean;
+export declare function validatePassword(password: string, hashedPass: string, callback: (err: any, result: boolean) => void): void;
diff --git a/aspnet-identity-pw/tsconfig.json b/aspnet-identity-pw/tsconfig.json
new file mode 100644
index 0000000000..55b4805ec9
--- /dev/null
+++ b/aspnet-identity-pw/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "aspnet-identity-pw-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/assert/assert-tests.ts b/assert/assert-tests.ts
index b01703e4d3..4b194e8700 100644
--- a/assert/assert-tests.ts
+++ b/assert/assert-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./assert.d.ts" />
+
 
 assert(1 + 1 - 2 === 0, "The universe isn't how it should.");
 
@@ -13,7 +13,7 @@ assert.throws(() => {
 }, undefined, "DODGED IT");
 
 assert.doesNotThrow(() => {
-    if (false) {
+    if (!!false) {
         throw "a hammer at your face";
     }
 }, undefined, "What the...*crunch*");
diff --git a/assert/assert.d.ts b/assert/assert.d.ts
deleted file mode 100644
index d7cb02eb38..0000000000
--- a/assert/assert.d.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-// Type definitions for assert and power-assert
-// Project: https://github.com/Jxck/assert
-// Project: https://github.com/twada/power-assert
-// Definitions by: vvakame <https://github.com/vvakame>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// copy from assert external module in node.d.ts
-
-declare function assert(value:any, message?:string):void;
-declare namespace assert {
-    export class AssertionError implements Error {
-        name:string;
-        message:string;
-        actual:any;
-        expected:any;
-        operator:string;
-        generatedMessage:boolean;
-
-        constructor(options?:{message?: string; actual?: any; expected?: any; operator?: string; stackStartFunction?: Function});
-    }
-
-    export function fail(actual?:any, expected?:any, message?:string, operator?:string):void;
-
-    export function ok(value:any, message?:string):void;
-
-    export function equal(actual:any, expected:any, message?:string):void;
-
-    export function notEqual(actual:any, expected:any, message?:string):void;
-
-    export function deepEqual(actual:any, expected:any, message?:string):void;
-
-    export function notDeepEqual(acutal:any, expected:any, message?:string):void;
-
-    export function strictEqual(actual:any, expected:any, message?:string):void;
-
-    export function notStrictEqual(actual:any, expected:any, message?:string):void;
-
-    export var throws:{
-        (block:Function, message?:string): void;
-        (block:Function, error:Function, message?:string): void;
-        (block:Function, error:RegExp, message?:string): void;
-        (block:Function, error:(err:any) => boolean, message?:string): void;
-    };
-
-    export var doesNotThrow:{
-        (block:Function, message?:string): void;
-        (block:Function, error:Function, message?:string): void;
-        (block:Function, error:RegExp, message?:string): void;
-        (block:Function, error:(err:any) => boolean, message?:string): void;
-    };
-
-    export function ifError(value:any):void;
-}
-
-// duplicate to node.d.ts
-// declare module "assert" {
-//     export = assert;
-// }
-
-// move to power-assert.d.ts. do not use this definition file.
-declare module "power-assert" {
-    export = assert;
-}
diff --git a/assert/index.d.ts b/assert/index.d.ts
new file mode 100644
index 0000000000..abd31688f1
--- /dev/null
+++ b/assert/index.d.ts
@@ -0,0 +1,53 @@
+// Type definitions for assert and power-assert
+// Project: https://github.com/Jxck/assert
+// Project: https://github.com/twada/power-assert
+// Definitions by: vvakame <https://github.com/vvakame>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// copy from assert external module in node.d.ts
+
+declare function assert(value:any, message?:string):void;
+declare namespace assert {
+    export class AssertionError implements Error {
+        name:string;
+        message:string;
+        actual:any;
+        expected:any;
+        operator:string;
+        generatedMessage:boolean;
+
+        constructor(options?:{message?: string; actual?: any; expected?: any; operator?: string; stackStartFunction?: Function});
+    }
+
+    export function fail(actual?:any, expected?:any, message?:string, operator?:string):void;
+
+    export function ok(value:any, message?:string):void;
+
+    export function equal(actual:any, expected:any, message?:string):void;
+
+    export function notEqual(actual:any, expected:any, message?:string):void;
+
+    export function deepEqual(actual:any, expected:any, message?:string):void;
+
+    export function notDeepEqual(acutal:any, expected:any, message?:string):void;
+
+    export function strictEqual(actual:any, expected:any, message?:string):void;
+
+    export function notStrictEqual(actual:any, expected:any, message?:string):void;
+
+    export var throws:{
+        (block:Function, message?:string): void;
+        (block:Function, error:Function, message?:string): void;
+        (block:Function, error:RegExp, message?:string): void;
+        (block:Function, error:(err:any) => boolean, message?:string): void;
+    };
+
+    export var doesNotThrow:{
+        (block:Function, message?:string): void;
+        (block:Function, error:Function, message?:string): void;
+        (block:Function, error:RegExp, message?:string): void;
+        (block:Function, error:(err:any) => boolean, message?:string): void;
+    };
+
+    export function ifError(value:any):void;
+}
diff --git a/assert/tsconfig.json b/assert/tsconfig.json
new file mode 100644
index 0000000000..5c08e1ed04
--- /dev/null
+++ b/assert/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "assert-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/assertion-error/assertion-error-tests.ts b/assertion-error/assertion-error-tests.ts
index f03e9cb52e..96eb520f1c 100644
--- a/assertion-error/assertion-error-tests.ts
+++ b/assertion-error/assertion-error-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="assertion-error.d.ts" />
 
 import AssertionError = require('assertion-error');
 
diff --git a/assertion-error/assertion-error.d.ts b/assertion-error/assertion-error.d.ts
deleted file mode 100644
index a0295bd8b3..0000000000
--- a/assertion-error/assertion-error.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Type definitions for assertion-error 1.0.0
-// Project: https://github.com/chaijs/assertion-error
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'assertion-error' {
-	class AssertionError implements Error {
-		constructor(message: string, props?: any, ssf?: Function);
-		name: string;
-		message: string;
-		showDiff: boolean;
-		stack: string;
-	}
-	export = AssertionError;
-}
diff --git a/assertion-error/index.d.ts b/assertion-error/index.d.ts
new file mode 100644
index 0000000000..8663df799d
--- /dev/null
+++ b/assertion-error/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for assertion-error 1.0.0
+// Project: https://github.com/chaijs/assertion-error
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare class AssertionError implements Error {
+    constructor(message: string, props?: any, ssf?: Function);
+    name: string;
+    message: string;
+    showDiff: boolean;
+    stack: string;
+}
+export = AssertionError;
diff --git a/assertion-error/tsconfig.json b/assertion-error/tsconfig.json
new file mode 100644
index 0000000000..f96d0c19a2
--- /dev/null
+++ b/assertion-error/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "assertion-error-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/assertsharp/assertsharp-tests.ts b/assertsharp/assertsharp-tests.ts
index 484e3ac774..7616725f8f 100644
--- a/assertsharp/assertsharp-tests.ts
+++ b/assertsharp/assertsharp-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./assertsharp.d.ts" />
-
 import Assert from "assertsharp";
 
 Assert.AreEqual(0, 0, "Pass");
diff --git a/assertsharp/assertsharp.d.ts b/assertsharp/assertsharp.d.ts
deleted file mode 100644
index c4cf80e867..0000000000
--- a/assertsharp/assertsharp.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Type definitions for assertsharp
-// Project: https://www.npmjs.com/package/assertsharp
-// Definitions by: Bruno Leonardo Michels <https://github.com/brunolm>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "assertsharp" {
-    export default class Assert {
-        static AreEqual<T>(expected: T, actual: T, message?: string): void;
-        static AreNotEqual<T>(notExpected: T, actual: T, message?: string): void;
-        static AreNotSame<T>(notExpected: T, actual: T, message?: string): void;
-        static AreSequenceEqual<T>(expected: T[], actual: T[], equals?: (x: any, y: any) => boolean, message?: string): void;
-        static Fail(message?: string): void;
-        static IsFalse(actual: boolean, message?: string): void;
-        static IsInstanceOfType(actual: any, expectedType: Function, message?: string): void;
-        static IsNotInstanceOfType(actual: any, wrongType: Function, message?: string): void;
-        static IsNotNull(actual: any, message?: string): void;
-        static IsNull(actual: any, message?: string): void;
-        static IsTrue(actual: boolean, message?: string): void;
-        static Throws(fn: () => void, message?: string): void;
-    }
-}
diff --git a/assertsharp/index.d.ts b/assertsharp/index.d.ts
new file mode 100644
index 0000000000..a424b28944
--- /dev/null
+++ b/assertsharp/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for assertsharp
+// Project: https://www.npmjs.com/package/assertsharp
+// Definitions by: Bruno Leonardo Michels <https://github.com/brunolm>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export default class Assert {
+    static AreEqual<T>(expected: T, actual: T, message?: string): void;
+    static AreNotEqual<T>(notExpected: T, actual: T, message?: string): void;
+    static AreNotSame<T>(notExpected: T, actual: T, message?: string): void;
+    static AreSequenceEqual<T>(expected: T[], actual: T[], equals?: (x: any, y: any) => boolean, message?: string): void;
+    static Fail(message?: string): void;
+    static IsFalse(actual: boolean, message?: string): void;
+    static IsInstanceOfType(actual: any, expectedType: Function, message?: string): void;
+    static IsNotInstanceOfType(actual: any, wrongType: Function, message?: string): void;
+    static IsNotNull(actual: any, message?: string): void;
+    static IsNull(actual: any, message?: string): void;
+    static IsTrue(actual: boolean, message?: string): void;
+    static Throws(fn: () => void, message?: string): void;
+}
diff --git a/assertsharp/tsconfig.json b/assertsharp/tsconfig.json
new file mode 100644
index 0000000000..88a78ef144
--- /dev/null
+++ b/assertsharp/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "assertsharp-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/async-lock/async-lock-tests.ts b/async-lock/async-lock-tests.ts
index d3eedf2fda..259749d4f0 100644
--- a/async-lock/async-lock-tests.ts
+++ b/async-lock/async-lock-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="async-lock.d.ts" />
 
 import * as AsyncLock from "async-lock";
 const lock = new AsyncLock();
diff --git a/async-lock/async-lock.d.ts b/async-lock/async-lock.d.ts
deleted file mode 100644
index e5f8613c73..0000000000
--- a/async-lock/async-lock.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Type definitions for async-lock
-// Project: https://github.com/rain1017/async-lock
-// Definitions by: Elisée MAURER <https://github.com/elisee/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "async-lock" {
-  interface AsyncLockDoneCallback {
-    (err?: Error, ret?: any): void;
-  }
-
-  interface AsyncLockOptions {
-    timeout?: number;
-    maxPending?: number;
-    domainReentrant?: boolean;
-    Promise?: any;
-  }
-
-  class AsyncLock {
-    constructor(options?: AsyncLockOptions);
-
-    acquire(key: string|string[], fn: (done: AsyncLockDoneCallback) => any, cb: AsyncLockDoneCallback, opts?: AsyncLockOptions): void;
-    acquire(key: string|string[], fn: (done: AsyncLockDoneCallback) => any, opts?: AsyncLockOptions): PromiseLike<any>;
-
-    isBusy(): boolean;
-  }
-
-  namespace AsyncLock {}
-
-  export = AsyncLock;
-}
diff --git a/async-lock/index.d.ts b/async-lock/index.d.ts
new file mode 100644
index 0000000000..296307300c
--- /dev/null
+++ b/async-lock/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for async-lock
+// Project: https://github.com/rain1017/async-lock
+// Definitions by: Elisée MAURER <https://github.com/elisee/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface AsyncLockDoneCallback {
+    (err?: Error, ret?: any): void;
+}
+
+interface AsyncLockOptions {
+    timeout?: number;
+    maxPending?: number;
+    domainReentrant?: boolean;
+    Promise?: any;
+}
+
+declare class AsyncLock {
+    constructor(options?: AsyncLockOptions);
+
+    acquire(key: string | string[], fn: (done: AsyncLockDoneCallback) => any, cb: AsyncLockDoneCallback, opts?: AsyncLockOptions): void;
+    acquire(key: string | string[], fn: (done: AsyncLockDoneCallback) => any, opts?: AsyncLockOptions): PromiseLike<any>;
+
+    isBusy(): boolean;
+}
+
+declare namespace AsyncLock { }
+
+export = AsyncLock;
diff --git a/async-lock/tsconfig.json b/async-lock/tsconfig.json
new file mode 100644
index 0000000000..180eaf7446
--- /dev/null
+++ b/async-lock/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "async-lock-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/async-writer/async-writer-tests.ts b/async-writer/async-writer-tests.ts
index c26e31495c..855242c703 100644
--- a/async-writer/async-writer-tests.ts
+++ b/async-writer/async-writer-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="async-writer.d.ts" />
 
 import asyncWriter = require('async-writer');
 import stream = require('stream');
diff --git a/async-writer/async-writer.d.ts b/async-writer/async-writer.d.ts
deleted file mode 100644
index 56c5bb898b..0000000000
--- a/async-writer/async-writer.d.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-// Type definitions for async-writer 1.4.1
-// Project: https://github.com/marko-js/async-writer
-// Definitions by: Yuce Tekol <http://yuce.me/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'async-writer' {
-	import stream = require('stream');
-	import events = require('events');
-
-	namespace async_writer {
-		interface EventFunction {
-			(event: string, callback: Function): void;
-		}
-
-		class StringWriter {
-			constructor(events: events.EventEmitter);
-			end(): void;
-			write(what: string): StringWriter;
-			toString(): string;
-		}
-
-		class BufferedWriter {
-			constructor(wrappedStream: stream.Stream);
-			flush(): void;
-			on(event: string, callback: Function): BufferedWriter;
-			once(event: string, callback: Function): BufferedWriter;
-			clear(): void;
-			end(): void;
-			write(what: string): BufferedWriter;
-		}
-
-		interface BeginAsyncOptions {
-			last?: boolean;
-			timeout?: number;
-			name?: string;
-		}
-
-		class AsyncWriter {
-			static enableAsyncStackTrace():void;
-
-			constructor(writer?: any, global?: {[s: string]: any}, async?: boolean, buffer?: boolean);
-			isAsyncWriter: AsyncWriter;
-			sync(): void;
-			getAttributes(): {[s: string]: any};
-			getAttribute(): any;
-			write(str: string): AsyncWriter;
-			getOutput(): string;
-			captureString(func: Function, thisObj: Object): string;
-			swapWriter(newWriter: StringWriter | BufferedWriter, func: Function, thisObj: Object): void;
-			createNestedWriter(writer: StringWriter | BufferedWriter): AsyncWriter;
-			beginAsync(options?: number | BeginAsyncOptions): AsyncWriter;
-			handleBeginAsync(options: number | BeginAsyncOptions, parent: AsyncWriter): void;
-			on(event: string, callback: Function): AsyncWriter;
-			once(event: string, callback: Function): AsyncWriter;
-			onLast(callback: Function): AsyncWriter;
-			emit(arg: any): AsyncWriter;
-			removeListener(): AsyncWriter;
-			pipe(stream: stream.Stream): AsyncWriter;
-			error(e: Error): void;
-			end(data?: any): AsyncWriter;
-			handleEnd(isAsync: boolean): void;
-			_finish(): void;
-			flush(): void;
-		}
-
-		interface AsyncWriterOptions {
-			global?: {[s: string]: any};
-			buffer?: boolean;
-		}
-
-		function create(writer?: any, options?: AsyncWriterOptions): AsyncWriter;
-		function enableAsyncStackTrace(): void;
-	}
-
-	export = async_writer;
-}
diff --git a/async-writer/index.d.ts b/async-writer/index.d.ts
new file mode 100644
index 0000000000..278800f24a
--- /dev/null
+++ b/async-writer/index.d.ts
@@ -0,0 +1,77 @@
+// Type definitions for async-writer 1.4.1
+// Project: https://github.com/marko-js/async-writer
+// Definitions by: Yuce Tekol <http://yuce.me/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import stream = require('stream');
+import events = require('events');
+
+declare namespace async_writer {
+    interface EventFunction {
+        (event: string, callback: Function): void;
+    }
+
+    class StringWriter {
+        constructor(events: events.EventEmitter);
+        end(): void;
+        write(what: string): StringWriter;
+        toString(): string;
+    }
+
+    class BufferedWriter {
+        constructor(wrappedStream: stream.Stream);
+        flush(): void;
+        on(event: string, callback: Function): BufferedWriter;
+        once(event: string, callback: Function): BufferedWriter;
+        clear(): void;
+        end(): void;
+        write(what: string): BufferedWriter;
+    }
+
+    interface BeginAsyncOptions {
+        last?: boolean;
+        timeout?: number;
+        name?: string;
+    }
+
+    class AsyncWriter {
+        static enableAsyncStackTrace(): void;
+
+        constructor(writer?: any, global?: { [s: string]: any }, async?: boolean, buffer?: boolean);
+        isAsyncWriter: AsyncWriter;
+        sync(): void;
+        getAttributes(): { [s: string]: any };
+        getAttribute(): any;
+        write(str: string): AsyncWriter;
+        getOutput(): string;
+        captureString(func: Function, thisObj: Object): string;
+        swapWriter(newWriter: StringWriter | BufferedWriter, func: Function, thisObj: Object): void;
+        createNestedWriter(writer: StringWriter | BufferedWriter): AsyncWriter;
+        beginAsync(options?: number | BeginAsyncOptions): AsyncWriter;
+        handleBeginAsync(options: number | BeginAsyncOptions, parent: AsyncWriter): void;
+        on(event: string, callback: Function): AsyncWriter;
+        once(event: string, callback: Function): AsyncWriter;
+        onLast(callback: Function): AsyncWriter;
+        emit(arg: any): AsyncWriter;
+        removeListener(): AsyncWriter;
+        pipe(stream: stream.Stream): AsyncWriter;
+        error(e: Error): void;
+        end(data?: any): AsyncWriter;
+        handleEnd(isAsync: boolean): void;
+        _finish(): void;
+        flush(): void;
+    }
+
+    interface AsyncWriterOptions {
+        global?: { [s: string]: any };
+        buffer?: boolean;
+    }
+
+    function create(writer?: any, options?: AsyncWriterOptions): AsyncWriter;
+    function enableAsyncStackTrace(): void;
+}
+
+export = async_writer;
diff --git a/async-writer/tsconfig.json b/async-writer/tsconfig.json
new file mode 100644
index 0000000000..654b8d9a85
--- /dev/null
+++ b/async-writer/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "async-writer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/async/async-explicit-tests.ts b/async/async-explicit-tests.ts
index 10d8f0bd24..80343cf6b1 100644
--- a/async/async-explicit-tests.ts
+++ b/async/async-explicit-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="async.d.ts" />
+
 
 interface StringCallback { (err: Error, result: string): void; }
 interface AsyncStringGetter { (callback: StringCallback): void; }
diff --git a/async/async-tests.ts b/async/async-tests.ts
index 037481b6fa..cc8061a468 100644
--- a/async/async-tests.ts
+++ b/async/async-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="async.d.ts" />
+
 
 var fs, path;
 
diff --git a/async/async-tests.ts.tscparams b/async/async-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/async/async-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/async/asyncamd-tests.ts b/async/asyncamd-tests.ts
index 3aa8ab92b5..4bf6c2789d 100644
--- a/async/asyncamd-tests.ts
+++ b/async/asyncamd-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./async.d.ts" />
+
 
 import async = require("async");
 
diff --git a/async/async.d.ts b/async/index.d.ts
similarity index 100%
rename from async/async.d.ts
rename to async/index.d.ts
diff --git a/async/tsconfig.json b/async/tsconfig.json
new file mode 100644
index 0000000000..16ce023eb9
--- /dev/null
+++ b/async/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "async-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/asyncblock/asyncblock-tests.ts b/asyncblock/asyncblock-tests.ts
index 35707e81ec..472ec80a1b 100644
--- a/asyncblock/asyncblock-tests.ts
+++ b/asyncblock/asyncblock-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="asyncblock.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import asyncblock = require('asyncblock');
 import fs = require('fs');
diff --git a/asyncblock/asyncblock.d.ts b/asyncblock/asyncblock.d.ts
deleted file mode 100644
index 6ec1ad1579..0000000000
--- a/asyncblock/asyncblock.d.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-// Type definitions for asyncblock 2.1.23
-// Project: https://github.com/scriby/asyncblock
-// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-declare module "asyncblock" {
-  function asyncblock<T>(f: (flow: asyncblock.IFlow) => void, callback?: (err: any, res: T) => void): void;
-
-  namespace asyncblock {
-    export function nostack<T>(f: (flow: asyncblock.IFlow) => void, callback?: (err: any, res: T) => void): void;
-
-    export interface IFlow {
-      add(responseFormat?: string[]): IExecuteFunction;
-      add(key: string, responseFormat?: string[]): IExecuteFunction;
-      add(key: number, responseFormat?: string[]): IExecuteFunction;
-      add(options: IFlowOptions): IExecuteFunction;
-      callback(responseFormat?: string[]): IExecuteFunction;
-      callback(key: string, responseFormat?: string[]): IExecuteFunction;
-      callback(key: number, responseFormat?: string[]): IExecuteFunction;
-      callback(options: IFlowOptions): IExecuteFunction;
-      wait<T>(key?: string): T;
-      wait<T>(key?: number): T;
-
-      get<T>(key: string): T;
-      set(key: string, responseFormat?: string[]): IExecuteFunction;
-      set(options: IFlowOptions): IExecuteFunction;
-      del(key: string): void;
-
-      sync<T>(task: any): T;
-      queue(toExecute: IExecuteFunction): void;
-      queue(key: string, toExecute: IExecuteFunction): void;
-      queue(key: number, toExecute: IExecuteFunction): void;
-      queue(responseFormat: string[], toExecute: IExecuteFunction): void;
-      queue(key: string, responseFormat: string[], toExecute: IExecuteFunction): void;
-      queue(key: number, responseFormat: string[], toExecute: IExecuteFunction): void;
-      queue(options: IFlowOptions, toExecute: IExecuteFunction): void;
-      doneAdding(): void;
-      forceWait<T>(): T;
-
-      maxParallel: number;
-      errorCallback: (err: any) => void;
-      taskTimeout: number;
-      timeoutIsError: boolean;
-    }
-
-    export interface IFlowOptions {
-      ignoreError?: boolean;  // default false
-      key?: string;  // string | number
-      responseFormat?: string[];
-      timeout?: number;
-      timeoutIsError?: boolean;
-      dontWait?: boolean;
-      firstArgIsError?: boolean;  // default true
-    }
-
-    export interface IExecuteFunction {
-      <T1, T2, T3>(err: any, res1: T1, res2: T2, res3: T3): any;
-      <T1, T2>(err: any, res1: T1, res2: T2): any;
-      <T>(err: any, res: T): any;
-      (err: any): any;
-
-      // firstArgIsError === false
-      <T1, T2, T3>(res1: T1, res2: T2, res3: T3): any;
-      <T1, T2>(res1: T1, res2: T2): any;
-      <T>(res: T): any;
-    }
-
-  }
-
-  export = asyncblock;
-}
-
diff --git a/asyncblock/index.d.ts b/asyncblock/index.d.ts
new file mode 100644
index 0000000000..c4f8d3da21
--- /dev/null
+++ b/asyncblock/index.d.ts
@@ -0,0 +1,71 @@
+// Type definitions for asyncblock 2.1.23
+// Project: https://github.com/scriby/asyncblock
+// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare function asyncblock<T>(f: (flow: asyncblock.IFlow) => void, callback?: (err: any, res: T) => void): void;
+
+declare namespace asyncblock {
+    export function nostack<T>(f: (flow: asyncblock.IFlow) => void, callback?: (err: any, res: T) => void): void;
+
+    export interface IFlow {
+        add(responseFormat?: string[]): IExecuteFunction;
+        add(key: string, responseFormat?: string[]): IExecuteFunction;
+        add(key: number, responseFormat?: string[]): IExecuteFunction;
+        add(options: IFlowOptions): IExecuteFunction;
+        callback(responseFormat?: string[]): IExecuteFunction;
+        callback(key: string, responseFormat?: string[]): IExecuteFunction;
+        callback(key: number, responseFormat?: string[]): IExecuteFunction;
+        callback(options: IFlowOptions): IExecuteFunction;
+        wait<T>(key?: string): T;
+        wait<T>(key?: number): T;
+
+        get<T>(key: string): T;
+        set(key: string, responseFormat?: string[]): IExecuteFunction;
+        set(options: IFlowOptions): IExecuteFunction;
+        del(key: string): void;
+
+        sync<T>(task: any): T;
+        queue(toExecute: IExecuteFunction): void;
+        queue(key: string, toExecute: IExecuteFunction): void;
+        queue(key: number, toExecute: IExecuteFunction): void;
+        queue(responseFormat: string[], toExecute: IExecuteFunction): void;
+        queue(key: string, responseFormat: string[], toExecute: IExecuteFunction): void;
+        queue(key: number, responseFormat: string[], toExecute: IExecuteFunction): void;
+        queue(options: IFlowOptions, toExecute: IExecuteFunction): void;
+        doneAdding(): void;
+        forceWait<T>(): T;
+
+        maxParallel: number;
+        errorCallback: (err: any) => void;
+        taskTimeout: number;
+        timeoutIsError: boolean;
+    }
+
+    export interface IFlowOptions {
+        ignoreError?: boolean;  // default false
+        key?: string;  // string | number
+        responseFormat?: string[];
+        timeout?: number;
+        timeoutIsError?: boolean;
+        dontWait?: boolean;
+        firstArgIsError?: boolean;  // default true
+    }
+
+    export interface IExecuteFunction {
+        <T1, T2, T3>(err: any, res1: T1, res2: T2, res3: T3): any;
+        <T1, T2>(err: any, res1: T1, res2: T2): any;
+        <T>(err: any, res: T): any;
+        (err: any): any;
+
+        // firstArgIsError === false
+        <T1, T2, T3>(res1: T1, res2: T2, res3: T3): any;
+        <T1, T2>(res1: T1, res2: T2): any;
+        <T>(res: T): any;
+    }
+
+}
+
+export = asyncblock;
diff --git a/asyncblock/tsconfig.json b/asyncblock/tsconfig.json
new file mode 100644
index 0000000000..227b776c55
--- /dev/null
+++ b/asyncblock/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "asyncblock-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/atmosphere/atmosphere-tests.ts b/atmosphere/atmosphere-tests.ts
index 44c2880a35..b353c2c947 100644
--- a/atmosphere/atmosphere-tests.ts
+++ b/atmosphere/atmosphere-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="atmosphere.d.ts" />
+
 
 var socket = atmosphere;
 
diff --git a/atmosphere/atmosphere.d.ts b/atmosphere/index.d.ts
similarity index 100%
rename from atmosphere/atmosphere.d.ts
rename to atmosphere/index.d.ts
diff --git a/atmosphere/tsconfig.json b/atmosphere/tsconfig.json
new file mode 100644
index 0000000000..d185cf16e2
--- /dev/null
+++ b/atmosphere/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "atmosphere-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/atom-keymap/atom-keymap-tests.ts b/atom-keymap/atom-keymap-tests.ts
index 8882f5b38b..1c92bff5c9 100644
--- a/atom-keymap/atom-keymap-tests.ts
+++ b/atom-keymap/atom-keymap-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./atom-keymap.d.ts" />
+
 
 import { KeymapManager, ICompleteMatchEvent } from "atom-keymap";
 
diff --git a/atom-keymap/atom-keymap.d.ts b/atom-keymap/atom-keymap.d.ts
deleted file mode 100644
index 89b022a67a..0000000000
--- a/atom-keymap/atom-keymap.d.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-// Type definitions for atom-keymap v5.1.5
-// Project: https://github.com/atom/atom-keymap/
-// Definitions by: Vadim Macagon <https://github.com/enlight/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../event-kit/event-kit.d.ts" />
-
-declare namespace AtomKeymap {
-	type Disposable = AtomEventKit.Disposable;
-
-	/** Instance side of KeyBinding class. */
-	interface KeyBinding {
-		enabled: boolean;
-		source: string;
-		command: string;
-		keystrokes: string;
-		keystrokeCount: number;
-		selector: string;
-		specificity: number;
-
-		matches(keystroke: string): boolean;
-		compare(keyBinding: KeyBinding): number;
-	}
-
-	interface ICompleteMatchEvent {
-		/** Keystrokes that matched the binding. */
-		keystrokes: string;
-		/** Binding that was matched to the keystrokes. */
-		binding: KeyBinding;
-		/** DOM element that was the target of the most recent `KeyboardEvent`. */
-		keyboardEventTarget: Element;
-	}
-
-	interface IPartialMatchEvent {
-		/** Keystrokes that matched the binding. */
-		keystrokes: string;
-		/** Bindings that were partially matched to the keystrokes. */
-		partiallyMatchedBindings: KeyBinding[];
-		/** DOM element that was the target of the most recent `KeyboardEvent`. */
-		keyboardEventTarget: Element;
-	}
-
-	interface IFailedMatchEvent {
-		/** Keystrokes that failed to match a binding. */
-		keystrokes: string;
-		/** DOM element that was the target of the most recent `KeyboardEvent`. */
-		keyboardEventTarget: Element;
-	}
-
-	interface IKeymapLoadEvent {
-		/** Path to a keymap file. */
-		path: string;
-	}
-
-  /** Static side of KeymapManager class. */
-  interface KeymapManagerStatic {
-    prototype: KeymapManager;
-    new (options?: { defaultTarget?: Element }): KeymapManager;
-  }
-
-	/** Instance side of KeymapManager class. */
-	interface KeymapManager {
-		constructor: KeymapManagerStatic;
-		/** Unwatches all watched paths. */
-		destroy(): void;
-
-		// Event Subscription
-
-		/** Sets callback to invoke when one or more keystrokes completely match a key binding. */
-		onDidMatchBinding(callback: (event: ICompleteMatchEvent) => void): Disposable;
-		/** Sets callback to invoke when one or more keystrokes partially match a binding. */
-		onDidPartiallyMatchBindings(callback: (event: IPartialMatchEvent) => void): Disposable;
-		/** Sets callback to invoke when one or more keystrokes fail to match any bindings. */
-		onDidFailToMatchBinding(callback: (event: IFailedMatchEvent) => void): Disposable;
-		/** Sets callback to invoke when a keymap file is reloaded. */
-		onDidReloadKeymap(callback: (event: IKeymapLoadEvent) => void): Disposable;
-		/** Sets callback to invoke when a keymap file is unloaded. */
-		onDidUnloadKeymap(callback: (event: IKeymapLoadEvent) => void): Disposable;
-		/** Sets callback to invoke when a keymap file could not to be loaded. */
-		onDidFailToReadFile(callback: (error: Error) => void): Disposable;
-
-		// Adding and Removing Bindings
-
-		/** Adds sets of key bindings grouped by CSS selector. */
-		add(source: string, keyBindingsBySelector: any): Disposable;
-
-		// Accessing Bindings
-
-		getKeyBindings(): KeyBinding[];
-		findKeyBindings(params?: {
-			keystrokes: string; // e.g. 'ctrl-x ctrl-s'
-			command: string; // e.g. 'editor:backspace'
-			target?: Element;
-		}): KeyBinding[];
-
-		// Managing Keymap Files
-
-		/**
-		 * Loads the key bindings from the given path.
-		 *
-		 * @param bindingsPath A path to a file or a directory. If the path is a directory all files
-		 *                     inside it will be loaded.
-		 */
-		loadKeymap(bindingsPath: string, options?: { watch: boolean }): void;
-		/**
-		 * Starts watching the given file/directory for changes, reloading any keymaps at that location
-		 * when changes are detected.
-		 *
-		 * @param filePath A path to a file or a directory.
-		 */
-		watchKeymap(filePath: string): void;
-
-		// Managing Keyboard Events
-
-		/**
-		 * Dispatches a custom event associated with the matching key binding for the given
-		 * `KeyboardEvent` if one can be found.
-		 */
-		handleKeyboardEvent(event: KeyboardEvent): void;
-		/** Translates a keydown event to a keystroke string. */
-		keystrokeForKeyboardEvent(event: KeyboardEvent): string;
-		/**
-		 * @return The number of milliseconds allowed before pending states caused by partial matches of
-		 *         multi-keystroke bindings are terminated.
-		 */
-		getPartialMatchTimeout(): number;
-	}
-
-	/** Allows commands to be associated with keystrokes in a context-sensitive way.*/
-	var KeymapManager: KeymapManagerStatic;
-}
-
-declare module 'atom-keymap' {
-	export = AtomKeymap;
-}
diff --git a/atom-keymap/index.d.ts b/atom-keymap/index.d.ts
new file mode 100644
index 0000000000..0b425c83d9
--- /dev/null
+++ b/atom-keymap/index.d.ts
@@ -0,0 +1,133 @@
+// Type definitions for atom-keymap v5.1.5
+// Project: https://github.com/atom/atom-keymap/
+// Definitions by: Vadim Macagon <https://github.com/enlight/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="event-kit" />
+
+export = AtomKeymap;
+
+declare namespace AtomKeymap {
+	type Disposable = AtomEventKit.Disposable;
+
+	/** Instance side of KeyBinding class. */
+	interface KeyBinding {
+		enabled: boolean;
+		source: string;
+		command: string;
+		keystrokes: string;
+		keystrokeCount: number;
+		selector: string;
+		specificity: number;
+
+		matches(keystroke: string): boolean;
+		compare(keyBinding: KeyBinding): number;
+	}
+
+	interface ICompleteMatchEvent {
+		/** Keystrokes that matched the binding. */
+		keystrokes: string;
+		/** Binding that was matched to the keystrokes. */
+		binding: KeyBinding;
+		/** DOM element that was the target of the most recent `KeyboardEvent`. */
+		keyboardEventTarget: Element;
+	}
+
+	interface IPartialMatchEvent {
+		/** Keystrokes that matched the binding. */
+		keystrokes: string;
+		/** Bindings that were partially matched to the keystrokes. */
+		partiallyMatchedBindings: KeyBinding[];
+		/** DOM element that was the target of the most recent `KeyboardEvent`. */
+		keyboardEventTarget: Element;
+	}
+
+	interface IFailedMatchEvent {
+		/** Keystrokes that failed to match a binding. */
+		keystrokes: string;
+		/** DOM element that was the target of the most recent `KeyboardEvent`. */
+		keyboardEventTarget: Element;
+	}
+
+	interface IKeymapLoadEvent {
+		/** Path to a keymap file. */
+		path: string;
+	}
+
+  /** Static side of KeymapManager class. */
+  interface KeymapManagerStatic {
+    prototype: KeymapManager;
+    new (options?: { defaultTarget?: Element }): KeymapManager;
+  }
+
+	/** Instance side of KeymapManager class. */
+	interface KeymapManager {
+		constructor: KeymapManagerStatic;
+		/** Unwatches all watched paths. */
+		destroy(): void;
+
+		// Event Subscription
+
+		/** Sets callback to invoke when one or more keystrokes completely match a key binding. */
+		onDidMatchBinding(callback: (event: ICompleteMatchEvent) => void): Disposable;
+		/** Sets callback to invoke when one or more keystrokes partially match a binding. */
+		onDidPartiallyMatchBindings(callback: (event: IPartialMatchEvent) => void): Disposable;
+		/** Sets callback to invoke when one or more keystrokes fail to match any bindings. */
+		onDidFailToMatchBinding(callback: (event: IFailedMatchEvent) => void): Disposable;
+		/** Sets callback to invoke when a keymap file is reloaded. */
+		onDidReloadKeymap(callback: (event: IKeymapLoadEvent) => void): Disposable;
+		/** Sets callback to invoke when a keymap file is unloaded. */
+		onDidUnloadKeymap(callback: (event: IKeymapLoadEvent) => void): Disposable;
+		/** Sets callback to invoke when a keymap file could not to be loaded. */
+		onDidFailToReadFile(callback: (error: Error) => void): Disposable;
+
+		// Adding and Removing Bindings
+
+		/** Adds sets of key bindings grouped by CSS selector. */
+		add(source: string, keyBindingsBySelector: any): Disposable;
+
+		// Accessing Bindings
+
+		getKeyBindings(): KeyBinding[];
+		findKeyBindings(params?: {
+			keystrokes: string; // e.g. 'ctrl-x ctrl-s'
+			command: string; // e.g. 'editor:backspace'
+			target?: Element;
+		}): KeyBinding[];
+
+		// Managing Keymap Files
+
+		/**
+		 * Loads the key bindings from the given path.
+		 *
+		 * @param bindingsPath A path to a file or a directory. If the path is a directory all files
+		 *                     inside it will be loaded.
+		 */
+		loadKeymap(bindingsPath: string, options?: { watch: boolean }): void;
+		/**
+		 * Starts watching the given file/directory for changes, reloading any keymaps at that location
+		 * when changes are detected.
+		 *
+		 * @param filePath A path to a file or a directory.
+		 */
+		watchKeymap(filePath: string): void;
+
+		// Managing Keyboard Events
+
+		/**
+		 * Dispatches a custom event associated with the matching key binding for the given
+		 * `KeyboardEvent` if one can be found.
+		 */
+		handleKeyboardEvent(event: KeyboardEvent): void;
+		/** Translates a keydown event to a keystroke string. */
+		keystrokeForKeyboardEvent(event: KeyboardEvent): string;
+		/**
+		 * @return The number of milliseconds allowed before pending states caused by partial matches of
+		 *         multi-keystroke bindings are terminated.
+		 */
+		getPartialMatchTimeout(): number;
+	}
+
+	/** Allows commands to be associated with keystrokes in a context-sensitive way.*/
+	var KeymapManager: KeymapManagerStatic;
+}
diff --git a/atom-keymap/tsconfig.json b/atom-keymap/tsconfig.json
new file mode 100644
index 0000000000..7b54753234
--- /dev/null
+++ b/atom-keymap/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "atom-keymap-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/atom/atom-tests.ts b/atom/atom-tests.ts
index 29dde2d89e..7ce49d23bd 100644
--- a/atom/atom-tests.ts
+++ b/atom/atom-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="../node/node.d.ts" />
-/// <reference path="./atom.d.ts" />
-/// <reference path="../pathwatcher/pathwatcher.d.ts" />
+/// <reference types="node" />
+
+/// <reference types="pathwatcher" />
 
 import path = require("path");
 import _atom = require("atom");
diff --git a/atom/atom.d.ts b/atom/atom.d.ts
deleted file mode 100644
index 31fa76eb4a..0000000000
--- a/atom/atom.d.ts
+++ /dev/null
@@ -1,1887 +0,0 @@
-// Type definitions for Atom
-// Project: https://atom.io/
-// Definitions by: vvakame <https://github.com/vvakame/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../q/Q.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../space-pen/space-pen.d.ts" />
-/// <reference path="../emissary/emissary.d.ts" />
-/// <reference path="../pathwatcher/pathwatcher.d.ts" />
-/// <reference path="../text-buffer/text-buffer.d.ts" />
-/// <reference path="../status-bar/status-bar.d.ts" />
-
-// Policy: this definition file only declare element related to `atom`.
-// if js file include to another npm package (e.g. "space-pen", "mixto" and "emissary").
-// you should create a separate file.
-
-// API documentation : https://atom.io/docs/api/v0.106.0/api/docs/README.md.html
-
-interface Window {
-	atom: AtomCore.IAtom;
-	measure(description:string, fn:Function):any; // return fn result
-	profile(description:string, fn:Function):any; // return fn result
-}
-
-declare namespace AtomCore {
-
-	// https://atom.io/docs/v0.84.0/advanced/view-system
-	interface IWorkspaceViewStatic {
-		new ():IWorkspaceView;
-		version: number;
-		configDefaults:any;
-		content():any;
-	}
-
-	interface Decoration {
-		destroy(): void;
-	}
-
-	/**
-	 * Represents a buffer annotation that remains logically stationary even as the buffer changes. This is used
-	 * to represent cursors, folds, snippet targets, misspelled words, any anything else that needs to track a
-	 * logical location in the buffer over time.
-	 */
-	interface Marker {
-		/**
-		 * Destroys the marker, causing it to emit the 'destroyed' event. Once destroyed, a marker cannot be
-		 * restored by undo/redo operations.
-		 */
-		destroy(): void;
-
-		/**
-		 * Gets the screen range of the display marker.
-		 */
-		getScreenRange(): Range;
-	}
-
-	interface IWorkspaceView extends View {
-		// Delegator.includeInto(WorkspaceView);
-
-		// delegate to model property's property
-		fullScreen:boolean;
-
-		// delegate to model property's method
-		open(uri:string, options:any):Q.Promise<View>;
-		openSync(uri:string, options?:any):any;
-		saveActivePaneItem():any;
-		saveActivePaneItemAs():any;
-		saveAll():void;
-		destroyActivePaneItem():any;
-		destroyActivePane():any;
-		increaseFontSize():void;
-		decreaseFontSize():void;
-
-		// own property & methods
-		initialize(model:IWorkspace):any;
-		initialize(view:View, args:any):void; // do not use
-		model:IWorkspace;
-		panes: IPaneContainerView;
-		getModel():IWorkspace;
-		installShellCommands():any;
-		handleFocus():any;
-		afterAttach(onDom?:any):any;
-		confirmClose():boolean;
-		updateTitle():any;
-		setTitle(title:string):any;
-		getEditorViews():any[]; // atom.EditorView
-		prependToTop(element:any):any;
-		appendToTop(element:any):any;
-		prependToBottom(element:any):any;
-		appendToBottom(element:any):any;
-		prependToLeft(element:any):any;
-		appendToLeft(element:any):any;
-		prependToRight(element:any):any;
-		appendToRight(element:any):any;
-		getActivePaneView():IPaneView;
-		getActiveView():View;
-		focusPreviousPaneView():any;
-		focusNextPaneView():any;
-		focusPaneViewAbove():any;
-		focusPaneViewBelow():any;
-		focusPaneViewOnLeft():any;
-		focusPaneViewOnRight():any;
-		eachPaneView(callback:(paneView:IPaneView)=>any):{ off():any; };
-		getPaneViews():IPaneView[];
-		eachEditorView(callback:(editorView:any /* EditorView */)=>any):{ off():any; };
-		beforeRemove():any;
-
-		command(eventName:string, handler:Function):any;
-		command(eventName:string, selector:Function, handler:Function):any;
-		command(eventName:string, options:any, handler:Function):any;
-		command(eventName:string, selector:Function, options:any, handler:Function):any;
-
-		statusBar:StatusBar.IStatusBarView;
-	}
-
-	interface IPanes {
-		// TBD
-	}
-
-	interface IPaneView {
-		// TBD
-	}
-
-	interface IPaneContainerView {
-		// TBD
-	}
-
-	interface ITreeView {
-		// TBD
-	}
-
-	interface IGutterViewStatic {
-		new(): IGutterView;
-		content():any;
-	}
-
-	interface IGutterView extends View {
-		firstScreenRow:any;
-		lastScreenRow:any;
-		initialize():void;
-		initialize(view:View, args:any):void; // do not use
-		afterAttach(onDom?:any):any;
-		beforeRemove():any;
-		handleMouseEvents(e:JQueryMouseEventObject):any;
-		getEditorView():any; /* EditorView */
-		getEditor():IEditor;
-		getLineNumberElements():HTMLCollection;
-		getLineNumberElementsForClass(klass:string):NodeList;
-		getLineNumberElement(bufferRow:number):NodeList;
-		addClassToAllLines(klass:string):boolean;
-		removeClassFromAllLines(klass:string):boolean;
-		addClassToLine(bufferRow:number, klass:string):boolean;
-		removeClassFromLine(bufferRow:number, klass:string):boolean;
-		updateLineNumbers(changes:any[], startScreenRow?:number, endScreenRow?:number):any;
-		prependLineElements(lineElements:any):void;
-		appendLineElements(lineElements:any):void;
-		removeLineElements(numberOfElements:number):void;
-		buildLineElements(startScreenRow:any, endScreenRow:any):any;
-		buildLineElementsHtml(startScreenRow:any, endScreenRow:any):any;
-		updateFoldableClasses(changes:any[]):any;
-		removeLineHighlights():void;
-		addLineHighlight(row:number, emptySelection?:boolean):any;
-		highlightLines():boolean;
-	}
-
-	interface ICommandRegistry {
-		add(target: string, commandName: Object, callback?: (event: any) => void): any; // selector:'atom-editor'|'atom-workspace'
-		findCommands(params: Object): Object[];
-		dispatch(selector: any, name:string): void;
-	}
-
-	interface ICommandPanel {
-		// TBD
-	}
-
-	interface IDisplayBufferStatic {
-		new(_arg?:any):IDisplayBuffer;
-	}
-
-	interface IDisplayBuffer /* extends Theorist.Model */ {
-		// Serializable.includeInto(Editor);
-
-		constructor:IDisplayBufferStatic;
-
-		verticalScrollMargin:number;
-		horizontalScrollMargin:number;
-
-		declaredPropertyValues:any;
-		tokenizedBuffer: ITokenizedBuffer;
-		buffer: TextBuffer.ITextBuffer;
-		charWidthsByScope:any;
-		markers:{ [index:number]:IDisplayBufferMarker; };
-		foldsByMarkerId:any;
-		maxLineLength:number;
-		screenLines:ITokenizedLine[];
-		rowMap:any; // return type are RowMap
-		longestScreenRow:number;
-		subscriptions:Emissary.ISubscription[];
-		subscriptionsByObject:any; // return type are WeakMap
-		behaviors:any;
-		subscriptionCounts:any;
-		eventHandlersByEventName:any;
-		pendingChangeEvent:any;
-
-		softWrap:boolean;
-
-		serializeParams():{id:number; softWrap:boolean; editorWidthInChars: number; scrollTop: number; scrollLeft: number; tokenizedBuffer: any; };
-		deserializeParams(params:any):any;
-		copy():IDisplayBuffer;
-		updateAllScreenLines():any;
-		emitChanged(eventProperties:any, refreshMarkers?:boolean):any;
-		updateWrappedScreenLines():any;
-		setVisible(visible:any):any;
-		getVerticalScrollMargin():number;
-		setVerticalScrollMargin(verticalScrollMargin:number):number;
-		getHorizontalScrollMargin():number;
-		setHorizontalScrollMargin(horizontalScrollMargin:number):number;
-		getHeight():any;
-		setHeight(height:any):any;
-		getWidth():any;
-		setWidth(newWidth:any):any;
-		getScrollTop():number;
-		setScrollTop(scrollTop:number):number;
-		getScrollBottom():number;
-		setScrollBottom(scrollBottom:number):number;
-		getScrollLeft():number;
-		setScrollLeft(scrollLeft:number):number;
-		getScrollRight():number;
-		setScrollRight(scrollRight:number):number;
-		getLineHeight():any;
-		setLineHeight(lineHeight:any):any;
-		getDefaultCharWidth():any;
-		setDefaultCharWidth(defaultCharWidth:any):any;
-		getScopedCharWidth(scopeNames:any, char:any):any;
-		getScopedCharWidths(scopeNames:any):any;
-		setScopedCharWidth(scopeNames:any, char:any, width:any):any;
-		setScopedCharWidths(scopeNames:any, charWidths:any):any;
-		clearScopedCharWidths():any;
-		getScrollHeight():number;
-		getScrollWidth():number;
-		getVisibleRowRange():number[];
-		intersectsVisibleRowRange(startRow:any, endRow:any):any;
-		selectionIntersectsVisibleRowRange(selection:any):any;
-		scrollToScreenRange(screenRange:any):any;
-		scrollToScreenPosition(screenPosition:any):any;
-		scrollToBufferPosition(bufferPosition:any):any;
-		pixelRectForScreenRange(screenRange:TextBuffer.IRange):any;
-		getTabLength():number;
-		setTabLength(tabLength:number):any;
-		setSoftWrap(softWrap:boolean):boolean;
-		getSoftWrap():boolean;
-		setEditorWidthInChars(editorWidthInChars:number):any;
-		getEditorWidthInChars():number;
-		getSoftWrapColumn():number;
-		lineForRow(row:number):any;
-		linesForRows(startRow:number, endRow:number):any;
-		getLines():any[];
-		indentLevelForLine(line:any):any;
-		bufferRowsForScreenRows(startScreenRow:any, endScreenRow:any):any;
-		createFold(startRow:number, endRow:number):IFold;
-		isFoldedAtBufferRow(bufferRow:number):boolean;
-		isFoldedAtScreenRow(screenRow:number):boolean;
-		destroyFoldWithId(id:number):any;
-		unfoldBufferRow(bufferRow:number):any[];
-		largestFoldStartingAtBufferRow(bufferRow:number):any;
-		foldsStartingAtBufferRow(bufferRow:number):any;
-		largestFoldStartingAtScreenRow(screenRow:any):any;
-		largestFoldContainingBufferRow(bufferRow:any):any;
-		outermostFoldsInBufferRowRange(startRow:any, endRow:any):any[];
-		foldsContainingBufferRow(bufferRow:any):any[];
-		screenRowForBufferRow(bufferRow:number):number;
-		lastScreenRowForBufferRow(bufferRow:number):number;
-		bufferRowForScreenRow(screenRow:number):number;
-
-		screenRangeForBufferRange(bufferRange:TextBuffer.IPoint[]):TextBuffer.IRange;
-
-		screenRangeForBufferRange(bufferRange:TextBuffer.IRange):TextBuffer.IRange;
-
-		screenRangeForBufferRange(bufferRange:{start: TextBuffer.IPoint; end: TextBuffer.IPoint}):TextBuffer.IRange;
-		screenRangeForBufferRange(bufferRange:{start: number[]; end: TextBuffer.IPoint}):TextBuffer.IRange;
-		screenRangeForBufferRange(bufferRange:{start: {row:number; col:number;}; end: TextBuffer.IPoint}):TextBuffer.IRange;
-
-		screenRangeForBufferRange(bufferRange:{start: TextBuffer.IPoint; end: number[]}):TextBuffer.IRange;
-		screenRangeForBufferRange(bufferRange:{start: number[]; end: number[]}):TextBuffer.IRange;
-		screenRangeForBufferRange(bufferRange:{start: {row:number; col:number;}; end: number[]}):TextBuffer.IRange;
-
-		screenRangeForBufferRange(bufferRange:{start: TextBuffer.IPoint; end: {row:number; col:number;}}):TextBuffer.IRange;
-		screenRangeForBufferRange(bufferRange:{start: number[]; end: {row:number; col:number;}}):TextBuffer.IRange;
-		screenRangeForBufferRange(bufferRange:{start: {row:number; col:number;}; end: {row:number; col:number;}}):TextBuffer.IRange;
-
-		bufferRangeForScreenRange(screenRange:TextBuffer.IPoint[]):TextBuffer.IRange;
-
-		bufferRangeForScreenRange(screenRange:TextBuffer.IRange):TextBuffer.IRange;
-
-		bufferRangeForScreenRange(screenRange:{start: TextBuffer.IPoint; end: TextBuffer.IPoint}):TextBuffer.IRange;
-		bufferRangeForScreenRange(screenRange:{start: number[]; end: TextBuffer.IPoint}):TextBuffer.IRange;
-		bufferRangeForScreenRange(screenRange:{start: {row:number; col:number;}; end: TextBuffer.IPoint}):TextBuffer.IRange;
-
-		bufferRangeForScreenRange(screenRange:{start: TextBuffer.IPoint; end: number[]}):TextBuffer.IRange;
-		bufferRangeForScreenRange(screenRange:{start: number[]; end: number[]}):TextBuffer.IRange;
-		bufferRangeForScreenRange(screenRange:{start: {row:number; col:number;}; end: number[]}):TextBuffer.IRange;
-
-		bufferRangeForScreenRange(screenRange:{start: TextBuffer.IPoint; end: {row:number; col:number;}}):TextBuffer.IRange;
-		bufferRangeForScreenRange(screenRange:{start: number[]; end: {row:number; col:number;}}):TextBuffer.IRange;
-		bufferRangeForScreenRange(screenRange:{start: {row:number; col:number;}; end: {row:number; col:number;}}):TextBuffer.IRange;
-
-		pixelRangeForScreenRange(screenRange:TextBuffer.IPoint[], clip?:boolean):TextBuffer.IRange;
-
-		pixelRangeForScreenRange(screenRange:TextBuffer.IRange, clip?:boolean):TextBuffer.IRange;
-
-		pixelRangeForScreenRange(screenRange:{start: TextBuffer.IPoint; end: TextBuffer.IPoint}, clip?:boolean):TextBuffer.IRange;
-		pixelRangeForScreenRange(screenRange:{start: number[]; end: TextBuffer.IPoint}, clip?:boolean):TextBuffer.IRange;
-		pixelRangeForScreenRange(screenRange:{start: {row:number; col:number;}; end: TextBuffer.IPoint}, clip?:boolean):TextBuffer.IRange;
-
-		pixelRangeForScreenRange(screenRange:{start: TextBuffer.IPoint; end: number[]}, clip?:boolean):TextBuffer.IRange;
-		pixelRangeForScreenRange(screenRange:{start: number[]; end: number[]}, clip?:boolean):TextBuffer.IRange;
-		pixelRangeForScreenRange(screenRange:{start: {row:number; col:number;}; end: number[]}, clip?:boolean):TextBuffer.IRange;
-
-		pixelRangeForScreenRange(screenRange:{start: TextBuffer.IPoint; end: {row:number; col:number;}}, clip?:boolean):TextBuffer.IRange;
-		pixelRangeForScreenRange(screenRange:{start: number[]; end: {row:number; col:number;}}, clip?:boolean):TextBuffer.IRange;
-		pixelRangeForScreenRange(screenRange:{start: {row:number; col:number;}; end: {row:number; col:number;}}, clip?:boolean):TextBuffer.IRange;
-
-		pixelPositionForScreenPosition(screenPosition:TextBuffer.IPoint, clip?:boolean):TextBuffer.IPoint;
-		pixelPositionForScreenPosition(screenPosition:number[], clip?:boolean):TextBuffer.IPoint;
-		pixelPositionForScreenPosition(screenPosition:{row:number; col:number;}, clip?:boolean):TextBuffer.IPoint;
-
-		screenPositionForPixelPosition(pixelPosition:any):TextBuffer.IPoint;
-
-		pixelPositionForBufferPosition(bufferPosition:any):any;
-		getLineCount():number;
-		getLastRow():number;
-		getMaxLineLength():number;
-		screenPositionForBufferPosition(bufferPosition:any, options:any):any;
-		bufferPositionForScreenPosition(bufferPosition:any, options:any):any;
-		scopesForBufferPosition(bufferPosition:any):any;
-		bufferRangeForScopeAtPosition(selector:any, position:any):any;
-		tokenForBufferPosition(bufferPosition:any):any;
-		getGrammar():IGrammar;
-		setGrammar(grammar:IGrammar):any;
-		reloadGrammar():any;
-		clipScreenPosition(screenPosition:any, options:any):any;
-		findWrapColumn(line:any, softWrapColumn:any):any;
-		rangeForAllLines():TextBuffer.IRange;
-		getMarker(id:number):IDisplayBufferMarker;
-		getMarkers():IDisplayBufferMarker[];
-		getMarkerCount():number;
-		markScreenRange(range:TextBuffer.IRange, ...args:any[]):IDisplayBufferMarker;
-		markBufferRange(range:TextBuffer.IRange, options?:any):IDisplayBufferMarker;
-		markScreenPosition(screenPosition:TextBuffer.IPoint, options?:any):IDisplayBufferMarker;
-		markBufferPosition(bufferPosition:TextBuffer.IPoint, options?:any):IDisplayBufferMarker;
-		destroyMarker(id:number):any;
-		findMarker(params?:any):IDisplayBufferMarker;
-		findMarkers(params?:any):IDisplayBufferMarker[];
-		translateToBufferMarkerParams(params?:any):any;
-		findFoldMarker(attributes:any):IMarker;
-		findFoldMarkers(attributes:any):IMarker[];
-		getFoldMarkerAttributes(attributes?:any):any;
-		pauseMarkerObservers():any;
-		resumeMarkerObservers():any;
-		refreshMarkerScreenPositions():any;
-		destroy():any;
-		logLines(start:number, end:number):any[];
-		handleTokenizedBufferChange(tokenizedBufferChange:any):any;
-		updateScreenLines(startBufferRow:any, endBufferRow:any, bufferDelta?:number, options?:any):any;
-		buildScreenLines(startBufferRow:any, endBufferRow:any):any;
-		findMaxLineLength(startScreenRow:any, endScreenRow:any, newScreenLines:any):any;
-		handleBufferMarkersUpdated():any;
-		handleBufferMarkerCreated(marker:any):any;
-		createFoldForMarker(maker:any):IFold;
-		foldForMarker(marker:any):any;
-	}
-
-	interface IViewRegistry {
-		getView(selector:any):any;
-	}
-
-	interface ICursorStatic {
-		new (arg:{editor:IEditor; marker:IDisplayBufferMarker; id: number;}):ICursor;
-	}
-
-	interface ScopeDescriptor {
-		scopes: string[];
-	}
-
-	interface ICursor /* extends Theorist.Model */ {
-		getScopeDescriptor(): ScopeDescriptor;
-		screenPosition:any;
-		bufferPosition:any;
-		goalColumn:any;
-		visible:boolean;
-		needsAutoscroll:boolean;
-
-		editor:IEditor;
-		marker:IDisplayBufferMarker;
-		id: number;
-
-		destroy():any;
-		changePosition(options:any, fn:Function):any;
-		getPixelRect():any;
-		setScreenPosition(screenPosition:any, options?:any):any;
-		getScreenPosition():TextBuffer.IPoint;
-		getScreenRange():TextBuffer.IRange;
-		setBufferPosition(bufferPosition:any, options?:any):any;
-		getBufferPosition():TextBuffer.IPoint;
-		autoscroll():any;
-		updateVisibility():any;
-		setVisible(visible:boolean):any;
-		isVisible():boolean;
-		wordRegExp(arg?:any):any;
-		isLastCursor():boolean;
-		isSurroundedByWhitespace():boolean;
-		isBetweenWordAndNonWord():boolean;
-		isInsideWord():boolean;
-		clearAutoscroll():void;
-		clearSelection():void;
-		getScreenRow():number;
-		getScreenColumn():number;
-		getBufferRow():number;
-		getBufferColumn():number;
-		getCurrentBufferLine():string;
-		moveUp(rowCount:number, arg?:any):any;
-		moveDown(rowCount:number, arg?:any):any;
-		moveLeft(arg?:any):any;
-		moveRight(arg?:any):any;
-		moveToTop():any;
-		moveToBottom():void;
-		moveToBeginningOfScreenLine():void;
-		moveToBeginningOfLine():void;
-		moveToFirstCharacterOfLine():void;
-		moveToEndOfScreenLine():void;
-		moveToEndOfLine():void;
-		moveToBeginningOfWord():void;
-		moveToEndOfWord():void;
-		moveToBeginningOfNextWord():void;
-		moveToPreviousWordBoundary():void;
-		moveToNextWordBoundary():void;
-		getBeginningOfCurrentWordBufferPosition(options?:any):TextBuffer.IPoint;
-		getPreviousWordBoundaryBufferPosition(options?:any):TextBuffer.IPoint;
-		getMoveNextWordBoundaryBufferPosition(options?:any):TextBuffer.IPoint;
-		getEndOfCurrentWordBufferPosition(options?:any):TextBuffer.IPoint;
-		getBeginningOfNextWordBufferPosition(options?:any):TextBuffer.IPoint;
-		getCurrentWordBufferRange(options?:any):TextBuffer.IPoint;
-		getCurrentLineBufferRange(options?:any):TextBuffer.IPoint;
-		getCurrentParagraphBufferRange():any;
-		getCurrentWordPrefix():string;
-		isAtBeginningOfLine():boolean;
-		getIndentLevel():number;
-		isAtEndOfLine():boolean;
-		getScopes():string[];
-		hasPrecedingCharactersOnLine():boolean;
-		getMarker(): Marker;
-	}
-
-	interface ILanguageMode {
-		// TBD
-	}
-
-	interface ISelection /* extends Theorist.Model */ {
-		cursor:ICursor;
-		marker:IDisplayBufferMarker;
-		editor:IEditor;
-		initialScreenRange:any;
-		wordwise:boolean;
-		needsAutoscroll:boolean;
-		retainSelection:boolean;
-		subscriptionCounts:any;
-
-		destroy():any;
-		finalize():any;
-		clearAutoscroll():any;
-		isEmpty():boolean;
-		isReversed():boolean;
-		isSingleScreenLine():boolean;
-		getScreenRange():TextBuffer.IRange;
-		setScreenRange(screenRange:any, options:any):any;
-		getBufferRange():TextBuffer.IRange;
-		setBufferRange(bufferRange:any, options:any):any;
-		getBufferRowRange():number[];
-		autoscroll():void;
-		getText():string;
-		clear():boolean;
-		selectWord():TextBuffer.IRange;
-		expandOverWord():any;
-		selectLine(row?:any):TextBuffer.IRange;
-		expandOverLine():boolean;
-		selectToScreenPosition(position:any):any;
-		selectToBufferPosition(position:any):any;
-		selectRight():boolean;
-		selectLeft():boolean;
-		selectUp(rowCount?:any):boolean;
-		selectDown(rowCount?:any):boolean;
-		selectToTop():any;
-		selectToBottom():any;
-		selectAll():any;
-		selectToBeginningOfLine():any;
-		selectToFirstCharacterOfLine():any;
-		selectToEndOfLine():any;
-		selectToBeginningOfWord():any;
-		selectToEndOfWord():any;
-		selectToBeginningOfNextWord():any;
-		selectToPreviousWordBoundary():any;
-		selectToNextWordBoundary():any;
-		addSelectionBelow():any;
-		getGoalBufferRange():any;
-		addSelectionAbove():any[];
-		insertText(text:string, options?:any):any;
-		normalizeIndents(text:string, indentBasis:number):any;
-		indent(_arg?:any):any;
-		indentSelectedRows():TextBuffer.IRange[];
-		setIndentationForLine(line:string, indentLevel:number):any;
-		backspace():any;
-		backspaceToBeginningOfWord():any;
-		backspaceToBeginningOfLine():any;
-		delete():any;
-		deleteToEndOfWord():any;
-		deleteSelectedText():any;
-		deleteLine():any;
-		joinLines():any;
-		outdentSelectedRows():any[];
-		autoIndentSelectedRows():any;
-		toggleLineComments():any;
-		cutToEndOfLine(maintainClipboard:any):any;
-		cut(maintainClipboard:any):any;
-		copy(maintainClipboard:any):any;
-		fold():any;
-		modifySelection(fn:()=>any):any;
-		plantTail():any;
-		intersectsBufferRange(bufferRange:any):any;
-		intersectsWith(otherSelection:any):any;
-		merge(otherSelection:any, options:any):any;
-		compare(otherSelection:any):any;
-		getRegionRects():any[];
-		screenRangeChanged():any;
-	}
-
-	interface IDecorationParams {
-		id?: number;
-		class: string;
-		type: any /* string or string[] */;
-	}
-
-	interface IDecorationStatic {
-		isType(decorationParams:IDecorationParams, type:any /* string or string[] */):boolean;
-		new (marker:IDisplayBufferMarker, displayBuffer:IDisplayBuffer, params: IDecorationParams): IDecoration;
-	}
-
-	interface IDecoration extends Emissary.IEmitter {
-		marker: IDisplayBufferMarker;
-		displayBuffer: IDisplayBuffer;
-		params: IDecorationParams
-		id: number;
-		flashQueue: any[];
-		isDestroyed: boolean;
-
-		destroy():void;
-		update(newParams:IDecorationParams):void;
-		getMarker():IDisplayBufferMarker;
-		getParams():IDecorationParams;
-		isType(type:string):boolean;
-		matchesPattern(decorationPattern:{[key:string]:IDecorationParams;}):boolean;
-		flash(klass:string, duration?:number):void;
-		consumeNextFlash():any;
-	}
-
-	interface IEditor {
-		// Serializable.includeInto(Editor);
-		// Delegator.includeInto(Editor);
-
-		deserializing:boolean;
-		callDisplayBufferCreatedHook:boolean;
-		registerEditor:boolean;
-		buffer:TextBuffer.ITextBuffer;
-		languageMode: ILanguageMode;
-		cursors:ICursor[];
-		selections: ISelection[];
-		suppressSelectionMerging:boolean;
-		updateBatchDepth: number;
-		selectionFlashDuration: number;
-		softTabs: boolean;
-		displayBuffer: IDisplayBuffer;
-
-		id:number;
-		behaviors:any;
-		declaredPropertyValues: any;
-		eventHandlersByEventName: any;
-		eventHandlersByNamespace: any;
-		lastOpened: number;
-		subscriptionCounts: any;
-		subscriptionsByObject: any; /* WeakMap */
-		subscriptions: Emissary.ISubscription[];
-		destroy():void;
-
-		mini: any;
-
-		serializeParams():{id:number; softTabs:boolean; scrollTop:number; scrollLeft:number; displayBuffer:any;};
-		deserializeParams(params:any):any;
-		subscribeToBuffer():void;
-		subscribeToDisplayBuffer():void;
-		getViewClass():any; // return type are EditorView
-		destroyed():void;
-		isDestroyed():boolean;
-		copy():IEditor;
-		getTitle():string;
-		getLongTitle():string;
-		setVisible(visible:boolean):void;
-		setMini(mini:any):void;
-		setScrollTop(scrollTop:any):void;
-		getScrollTop():number;
-		setScrollLeft(scrollLeft:any):void;
-		getScrollLeft():number;
-		setEditorWidthInChars(editorWidthInChars:any):void;
-		getSoftWrapColumn():number;
-		getSoftTabs():boolean;
-		setSoftTabs(softTabs:boolean):void;
-		getSoftWrap():boolean;
-		setSoftWrap(softWrap:any):void;
-		getTabText():string;
-		getTabLength():number;
-		setTabLength(tabLength:any):void;
-		usesSoftTabs():boolean;
-		clipBufferPosition(bufferPosition:any):void;
-		clipBufferRange(range:any):void;
-		indentationForBufferRow(bufferRow:any):void;
-		setIndentationForBufferRow(bufferRow:any, newLevel:any, _arg:any):void;
-		indentLevelForLine(line:any):number;
-		buildIndentString(number:any):string;
-		save():void;
-		saveAs(filePath:any):void;
-		copyPathToClipboard():void;
-		getPath():string;
-		getText():string;
-		setText(text:any):void;
-		getTextInRange(range:any):any;
-		getLineCount():number;
-		getBuffer():TextBuffer.ITextBuffer;
-		getURI():string;
-		isBufferRowBlank(bufferRow:any):boolean;
-		isBufferRowCommented(bufferRow:any):void;
-		nextNonBlankBufferRow(bufferRow:any):void;
-		getEofBufferPosition():TextBuffer.IPoint;
-		getLastBufferRow():number;
-		bufferRangeForBufferRow(row:any, options:any):TextBuffer.IRange;
-		lineForBufferRow(row:number):string;
-		lineLengthForBufferRow(row:number):number;
-		scan():any;
-		scanInBufferRange():any;
-		backwardsScanInBufferRange():any;
-		isModified():boolean;
-		isEmpty():boolean;
-		shouldPromptToSave():boolean;
-		screenPositionForBufferPosition(bufferPosition:any, options?:any):TextBuffer.IPoint;
-		bufferPositionForScreenPosition(screenPosition:any, options?:any):TextBuffer.IPoint;
-		screenRangeForBufferRange(bufferRange:any):TextBuffer.IRange;
-		bufferRangeForScreenRange(screenRange:any):TextBuffer.IRange;
-		clipScreenPosition(screenPosition:any, options:any):TextBuffer.IRange;
-		lineForScreenRow(row:any):ITokenizedLine;
-		linesForScreenRows(start?:any, end?:any):ITokenizedLine[];
-		getScreenLineCount():number;
-		getMaxScreenLineLength():number;
-		getLastScreenRow():number;
-		bufferRowsForScreenRows(startRow:any, endRow:any):any[];
-		bufferRowForScreenRow(row:any):number;
-		scopesForBufferPosition(bufferPosition:any):string[];
-		bufferRangeForScopeAtCursor(selector:string):any;
-		tokenForBufferPosition(bufferPosition:any):IToken;
-		getCursorScopes():string[];
-		logCursorScope():void;
-		insertText(text:string, options?:any):TextBuffer.IRange[];
-		insertNewline():TextBuffer.IRange[];
-		insertNewlineBelow():TextBuffer.IRange[];
-		insertNewlineAbove():any;
-		indent(options?:any):any;
-		backspace():any[];
-		// deprecated backspaceToBeginningOfWord():any[];
-		// deprecated backspaceToBeginningOfLine():any[];
-		deleteToBeginningOfWord():any[];
-		deleteToBeginningOfLine():any[];
-		delete():any[];
-		deleteToEndOfLine():any[];
-		deleteToEndOfWord():any[];
-		deleteLine():TextBuffer.IRange[];
-		indentSelectedRows():TextBuffer.IRange[][];
-		outdentSelectedRows():TextBuffer.IRange[][];
-		toggleLineCommentsInSelection():TextBuffer.IRange[];
-		autoIndentSelectedRows():TextBuffer.IRange[][];
-		normalizeTabsInBufferRange(bufferRange:any):any;
-		cutToEndOfLine():boolean[];
-		cutSelectedText():boolean[];
-		copySelectedText():boolean[];
-		pasteText(options?:any):TextBuffer.IRange[];
-		undo():any[];
-		redo():any[];
-		foldCurrentRow():any;
-		unfoldCurrentRow():any[];
-		foldSelectedLines():any[];
-		foldAll():any[];
-		unfoldAll():any[];
-		foldAllAtIndentLevel(level:any):any;
-		foldBufferRow(bufferRow:any):any;
-		unfoldBufferRow(bufferRow:any):any;
-		isFoldableAtBufferRow(bufferRow:any):boolean;
-		isFoldableAtScreenRow(screenRow:any):boolean;
-		createFold(startRow:any, endRow:any):IFold;
-		destroyFoldWithId(id:any):any;
-		destroyFoldsIntersectingBufferRange(bufferRange:any):any;
-		toggleFoldAtBufferRow(bufferRow:any):any;
-		isFoldedAtCursorRow():boolean;
-		isFoldedAtBufferRow(bufferRow:any):boolean;
-		isFoldedAtScreenRow(screenRow:any):boolean;
-		largestFoldContainingBufferRow(bufferRow:any):boolean;
-		largestFoldStartingAtScreenRow(screenRow:any):any;
-		outermostFoldsInBufferRowRange(startRow:any, endRow:any):any[];
-		moveLineUp():ISelection[];
-		moveLineDown():ISelection[];
-		duplicateLines():any[][];
-		// duprecated duplicateLine():any[][];
-		mutateSelectedText(fn:(selection:ISelection)=>any):any;
-		replaceSelectedText(options:any, fn:(selection:string)=>any):any;
-		decorationsForScreenRowRange(startScreenRow:any, endScreenRow:any):{[id:number]: IDecoration[]};
-		decorateMarker(marker:IDisplayBufferMarker, decorationParams: {type:string; class: string;}):IDecoration;
-		decorationForId(id:number):IDecoration;
-		getMarker(id:number):IDisplayBufferMarker;
-		getMarkers():IDisplayBufferMarker[];
-		findMarkers(...args:any[]):IDisplayBufferMarker[];
-		markScreenRange(...args:any[]):IDisplayBufferMarker;
-		markBufferRange(...args:any[]):IDisplayBufferMarker;
-		markScreenPosition(...args:any[]):IDisplayBufferMarker;
-		markBufferPosition(...args:any[]):IDisplayBufferMarker;
-		destroyMarker(...args:any[]):boolean;
-		getMarkerCount():number;
-		hasMultipleCursors():boolean;
-		getCursors():ICursor[];
-		getCursor():ICursor;
-		addCursorAtScreenPosition(screenPosition:any):ICursor;
-		addCursorAtBufferPosition(bufferPosition:any):ICursor;
-		addCursor(marker:any):ICursor;
-		removeCursor(cursor:any):ICursor[];
-		addSelection(marker:any, options:any):ISelection;
-		addSelectionForBufferRange(bufferRange:any, options:any):ISelection;
-		setSelectedBufferRange(bufferRange:any, options:any):any;
-		setSelectedBufferRanges(bufferRanges:any, options:any):any;
-		removeSelection(selection:ISelection):any;
-		clearSelections():boolean;
-		consolidateSelections():boolean;
-		selectionScreenRangeChanged(selection:any):void;
-		getSelections():ISelection[];
-		getSelection(index?:number):ISelection;
-		getLastSelection():ISelection;
-		getSelectionsOrderedByBufferPosition():ISelection[];
-		getLastSelectionInBuffer():ISelection;
-		selectionIntersectsBufferRange(bufferRange:any):any;
-		setCursorScreenPosition(position:TextBuffer.IPoint, options?:any):any;
-		getCursorScreenPosition():TextBuffer.IPoint;
-		getCursorScreenRow():number;
-		setCursorBufferPosition(position:any, options?:any):any;
-		getCursorBufferPosition():TextBuffer.IPoint;
-		getSelectedScreenRange():TextBuffer.IRange;
-		getSelectedBufferRange():TextBuffer.IRange;
-		getSelectedBufferRanges():TextBuffer.IRange[];
-		getSelectedText():string;
-		getTextInBufferRange(range:TextBuffer.IRange):string;
-		setTextInBufferRange(range:TextBuffer.IRange | any[], text:string):any;
-		getCurrentParagraphBufferRange():TextBuffer.IRange;
-		getWordUnderCursor(options?:any):string;
-		moveCursorUp(lineCount?:number):void;
-		moveCursorDown(lineCount?:number):void;
-		moveCursorLeft():void;
-		moveCursorRight():void;
-		moveCursorToTop():void;
-		moveCursorToBottom():void;
-		moveCursorToBeginningOfScreenLine():void;
-		moveCursorToBeginningOfLine():void;
-		moveCursorToFirstCharacterOfLine():void;
-		moveCursorToEndOfScreenLine():void;
-		moveCursorToEndOfLine():void;
-		moveCursorToBeginningOfWord():void;
-		moveCursorToEndOfWord():void;
-		moveCursorToBeginningOfNextWord():void;
-		moveCursorToPreviousWordBoundary():void;
-		moveCursorToNextWordBoundary():void;
-		moveCursorToBeginningOfNextParagraph():void;
-		moveCursorToBeginningOfPreviousParagraph():void;
-		moveToBottom():void;
-		scrollToCursorPosition(options:any):any;
-		pageUp():void;
-		pageDown():void;
-		selectPageUp():void;
-		selectPageDown():void;
-		getRowsPerPage():number;
-		moveCursors(fn:(cursor:ICursor)=>any):any;
-		cursorMoved(event:any):void;
-		selectToScreenPosition(position:TextBuffer.IPoint):any;
-		selectRight():ISelection[];
-		selectLeft():ISelection[];
-		selectUp(rowCount?:number):ISelection[];
-		selectDown(rowCount?:number):ISelection[];
-		selectToTop():ISelection[];
-		selectAll():ISelection[];
-		selectToBottom():ISelection[];
-		selectToBeginningOfLine():ISelection[];
-		selectToFirstCharacterOfLine():ISelection[];
-		selectToEndOfLine():ISelection[];
-		selectToPreviousWordBoundary():ISelection[];
-		selectToNextWordBoundary():ISelection[];
-		selectLine():ISelection[];
-		selectLinesContainingCursors():ISelection[];
-		addSelectionBelow():ISelection[];
-		addSelectionAbove():ISelection[];
-		splitSelectionsIntoLines():any[];
-		transpose():TextBuffer.IRange[];
-		upperCase():boolean[];
-		lowerCase():boolean[];
-		joinLines():any[];
-		selectToBeginningOfWord():ISelection[];
-		selectToEndOfWord():ISelection[];
-		selectToBeginningOfNextWord():ISelection[];
-		selectWord():ISelection[];
-		selectToBeginningOfNextParagraph():ISelection[];
-		selectToBeginningOfPreviousParagraph():ISelection[];
-		selectMarker(marker:any):any;
-		mergeCursors():number[];
-		expandSelectionsForward():any;
-		expandSelectionsBackward(fn:(selection:ISelection)=>any):ISelection[];
-		finalizeSelections():boolean[];
-		mergeIntersectingSelections():any;
-		preserveCursorPositionOnBufferReload():Emissary.ISubscription;
-		getGrammar(): IGrammar;
-		setGrammar(grammer:IGrammar):void;
-		reloadGrammar():any;
-		shouldAutoIndent():boolean;
-		shouldShowInvisibles():boolean;
-		updateInvisibles():void;
-		transact(fn:Function):any;
-		beginTransaction():ITransaction;
-		commitTransaction():any;
-		abortTransaction():any[];
-		inspect():string;
-		logScreenLines(start:number, end:number):any[];
-		handleTokenization():void;
-		handleGrammarChange():void;
-		handleMarkerCreated(marker:any):any;
-		getSelectionMarkerAttributes():{type: string; editorId: number; invalidate: string; };
-		getVerticalScrollMargin():number;
-		setVerticalScrollMargin(verticalScrollMargin:number):void;
-		getHorizontalScrollMargin():number;
-		setHorizontalScrollMargin(horizontalScrollMargin:number):void;
-		getLineHeightInPixels():number;
-		setLineHeightInPixels(lineHeightInPixels:number):void;
-		batchCharacterMeasurement(fn:Function):void;
-		getScopedCharWidth(scopeNames:any, char:any):any;
-		setScopedCharWidth(scopeNames:any, char:any, width:any):any;
-		getScopedCharWidths(scopeNames:any):any;
-		clearScopedCharWidths():any;
-		getDefaultCharWidth():number;
-		setDefaultCharWidth(defaultCharWidth:number):void;
-		setHeight(height:number):void;
-		getHeight():number;
-		getClientHeight():number;
-		setWidth(width:number):void;
-		getWidth():number;
-		getScrollTop():number;
-		setScrollTop(scrollTop:number):void;
-		getScrollBottom():number;
-		setScrollBottom(scrollBottom:number):void;
-		getScrollLeft():number;
-		setScrollLeft(scrollLeft:number):void;
-		getScrollRight():number;
-		setScrollRight(scrollRight:number):void;
-		getScrollHeight():number;
-		getScrollWidth():number;
-		getVisibleRowRange():number;
-		intersectsVisibleRowRange(startRow:any, endRow:any):any;
-		selectionIntersectsVisibleRowRange(selection:any):any;
-		pixelPositionForScreenPosition(screenPosition:any):any;
-		pixelPositionForBufferPosition(bufferPosition:any):any;
-		screenPositionForPixelPosition(pixelPosition:any):any;
-		pixelRectForScreenRange(screenRange:any):any;
-		scrollToScreenRange(screenRange:any, options:any):any;
-		scrollToScreenPosition(screenPosition:any, options:any):any;
-		scrollToBufferPosition(bufferPosition:any, options:any):any;
-		horizontallyScrollable():any;
-		verticallyScrollable():any;
-		getHorizontalScrollbarHeight():any;
-		setHorizontalScrollbarHeight(height:any):any;
-		getVerticalScrollbarWidth():any;
-		setVerticalScrollbarWidth(width:any):any;
-		// deprecated joinLine():any;
-
-		onDidChange(callback: Function): Disposable;
-		onDidDestroy(callback: Function): Disposable;
-		onDidStopChanging(callback: Function): Disposable;
-		onDidChangeCursorPosition(callback: Function): Disposable;
-		onDidSave(callback: (event: { path: string }) => void): Disposable;
-
-		decorateMarker(marker: Marker, options: any): Decoration;
-		getLastCursor(): ICursor;
-	}
-
-	interface IGrammar {
-		bundledPackage: boolean;
-		emitter: any;
-		fileTypes: [string];
-		firstLineRegex: any;
-		foldingStopMarker: any;
-		includedGrammarScopes: [any];
-		initialRule: any;
-		injectionSelector: any;
-		injections: any;
-		maxTokensPerLine: Number;
-		name: string;
-		packageName: string;
-		path: string;
-		rawPatterns: [any];
-		rawRepository: any;
-		registration: Disposable;
-		registry: any;
-		repository: Object;
-		scopeName: string;
-		// TBD
-
-	}
-
-	interface IPane /* extends Theorist.Model */ {
-		itemForURI: (uri:string)=>IEditor;
-		items:any[];
-		activeItem:any;
-
-		serializeParams():any;
-		deserializeParams(params:any):any;
-		getViewClass():any; // return type are PaneView
-		isActive():boolean;
-		isDestroyed():boolean;
-		focus():void;
-		blur():void;
-		activate():void;
-		getPanes():IPane[];
-		getItems():any[];
-		getActiveItem():any;
-		getActiveEditor():any;
-		itemAtIndex(index:number):any;
-		activateNextItem():any;
-		activatePreviousItem():any;
-		getActiveItemIndex():number;
-		activateItemAtIndex(index:number):any;
-		activateItem(item:any):any;
-		addItem(item:any, index:number):any;
-		addItems(items:any[], index:number):any[];
-		removeItem(item:any, destroying:any):void;
-		moveItem(item:any, newIndex:number):void;
-		moveItemToPane(item:any, pane:IPane, index:number):void;
-		destroyActiveItem():boolean; // always return false
-		destroyItem(item:any):boolean;
-		destroyItems():any[];
-		destroyInactiveItems():any[];
-		destroy():void;
-		destroyed():any[];
-		promptToSaveItem(item:any):boolean;
-		saveActiveItem():void;
-		saveActiveItemAs():void;
-		saveItem(item:any, nextAction:Function):void;
-		saveItemAs(item:any, nextAction:Function):void;
-		saveItems():any[];
-		activateItemForURI(uri:any):any;
-		copyActiveItem():void;
-		splitLeft(params:any):IPane;
-		splitRight(params:any):IPane;
-		splitUp(params:any):IPane;
-		splitDown(params:any):IPane;
-		split(orientation:string, side:string, params:any):IPane;
-		findLeftmostSibling():IPane;
-		findOrCreateRightmostSibling():IPane;
-	}
-
-	// https://atom.io/docs/v0.84.0/advanced/serialization
-	interface ISerializationStatic<T> {
-		deserialize(data:ISerializationInfo):T;
-		new (data:T): ISerialization;
-	}
-
-	interface ISerialization {
-		serialize():ISerializationInfo;
-	}
-
-	interface ISerializationInfo {
-		deserializer: string;
-	}
-
-	interface IBrowserWindow {
-		getPosition():number[];
-		getSize():number[];
-	}
-
-	interface IAtomWindowDimentions {
-		x:number;
-		y:number;
-		width:number;
-		height:number;
-	}
-
-	interface IProjectStatic {
-		pathForRepositoryUrl(repoUrl:string):string;
-
-		new (arg?:{path:any; buffers:any[];}):IProject;
-	}
-
-	interface IProject /* extends Theorist.Model */ {
-		// Serializable.includeInto(Project);
-
-		path:string;
-		/** deprecated */
-		rootDirectory?:PathWatcher.IDirectory;
-		rootDirectories:PathWatcher.IDirectory[];
-
-		serializeParams():any;
-		deserializeParams(params:any):any;
-		destroyed():any;
-		destroyRepo():any;
-		destroyUnretainedBuffers():any;
-		getRepo():IGit;
-		getPath():string;
-		setPath(projectPath:string):any;
-		getRootDirectory():PathWatcher.IDirectory;
-		resolve(uri:string):string;
-		relativize(fullPath:string):string;
-		contains(pathToCheck:string):boolean;
-		open(filePath:string, options?:any):Q.Promise<IEditor>;
-		openSync(filePath:string, options?:any):IEditor;
-		getBuffers():TextBuffer.ITextBuffer;
-		isPathModified(filePath:string):boolean;
-		findBufferForPath(filePath:string):TextBuffer.ITextBuffer;
-		bufferForPathSync(filePath:string):TextBuffer.ITextBuffer;
-		bufferForPath(filePath:string):Q.Promise<TextBuffer.ITextBuffer>;
-		bufferForId(id:any):TextBuffer.ITextBuffer;
-		buildBufferSync(absoluteFilePath:string):TextBuffer.ITextBuffer;
-		buildBuffer(absoluteFilePath:string):Q.Promise<TextBuffer.ITextBuffer>;
-		addBuffer(buffer:TextBuffer.ITextBuffer, options?:any):any;
-		addBufferAtIndex(buffer:TextBuffer.ITextBuffer, index:number, options?:any):any;
-		scan(regex:any, options:any, iterator:any):Q.Promise<any>;
-		replace(regex:any, replacementText:any, filePaths:any, iterator:any):Q.Promise<any>;
-		buildEditorForBuffer(buffer:any, editorOptions:any):IEditor;
-		eachBuffer(...args:any[]):any;
-
-		onDidChangePaths(callback: Function): Disposable;
-	}
-
-	interface IWorkspaceStatic {
-		new():IWorkspace;
-	}
-
-	interface IWorkspacePanelOptions{
-		item:any;
-		visible?:boolean;
-		priority?:number;
-	}
-
-	interface Panel{
-		getItem():any;
-		getPriority():any;
-		isVisible():boolean;
-		show():void;
-		hide():void;
-	}
-
-	interface IWorkspace {
-		addBottomPanel(options:IWorkspacePanelOptions):Panel;
-		addLeftPanel(options:IWorkspacePanelOptions):Panel;
-		addRightPanel(options:IWorkspacePanelOptions):Panel;
-		addTopPanel(options:IWorkspacePanelOptions):Panel;
-		addModalPanel(options:IWorkspacePanelOptions):Panel;
-		addOpener(opener: Function): any;
-
-		deserializeParams(params:any):any;
-		serializeParams():{paneContainer:any;fullScreen:boolean;};
-		eachEditor(callback: Function): void;
-		getTextEditors():IEditor[];
-		open(uri:string, options:any):Q.Promise<View>;
-		openLicense():void;
-		openSync(uri:string, options:any):any;
-		openUriInPane(uri: string, pane: any, options: any): Q.Promise<View>;
-		observeTextEditors(callback: Function): Disposable;
-		reopenItemSync():any;
-		registerOpener(opener:(urlToOpen:string)=>any):void;
-		unregisterOpener(opener:Function):void;
-		getOpeners():any;
-		getActivePane(): IPane;
-		getActivePaneItem(): IPane;
-		getActiveTextEditor(): IEditor;
-		getPanes():any;
-		saveAll():void;
-		activateNextPane():any;
-		activatePreviousPane():any;
-		paneForURI: (uri:string) => IPane;
-		saveActivePaneItem():any;
-		saveActivePaneItemAs():any;
-		destroyActivePaneItem():any;
-		destroyActivePane():any;
-		getActiveEditor():IEditor;
-		increaseFontSize():void;
-		decreaseFontSize():void;
-		resetFontSize():void;
-		itemOpened(item:any):void;
-		onPaneItemDestroyed(item:any):void;
-		destroyed():void;
-		isTextEditor(object: any): boolean;
-
-		onDidChangeActivePaneItem(item:any):Disposable;
-	}
-
-	interface IAtomSettings {
-		appVersion: string;
-		bootstrapScript: string;
-		devMode: boolean;
-		initialPath: string;
-		pathToOpen: string;
-		resourcePath: string;
-		shellLoadTime: number;
-		windowState:string;
-	}
-
-	interface IAtomState {
-		mode:string;
-		packageStates:any;
-		project:any;
-		syntax:any;
-		version:number;
-		windowDimensions:any;
-		workspace:any;
-	}
-
-	interface IDeserializerManager {
-		deserializers:Function;
-		add:Function;
-		remove:Function;
-		deserialize:Function;
-		get:Function;
-	}
-
-	interface IConfig {
-		get(keyPath:string):any;
-		// TBD
-	}
-
-	interface IKeymapManager {
-		defaultTarget:HTMLElement;
-		// TBD
-	}
-
-	interface IPackage {
-		mainModulePath: string;
-		mainModule: any;
-		enable(): void;
-		disable(): void;
-		isTheme(): boolean;
-		getType(): string;
-		getStylesheetType(): string;
-		load(): IPackage;
-		reset(): void;
-		activate(): Q.Promise<any[]>;
-		activateNow(): void;
-		// TBD
-	}
-
-	interface IPackageManager extends Emissary.IEmitter {
-		packageDirPaths:string[];
-		loadedPackages:any;
-		activePackages:any;
-		packageStates:any;
-		packageActivators:any[];
-
-		getApmPath():string;
-		getPackageDirPaths():string;
-		getPackageState(name:string):any;
-		setPackageState(name:string, state:any):void;
-		enablePackage(name:string):any;
-		disablePackage(name:string):any;
-		activate():void;
-		registerPackageActivator(activator:any, types:any):void;
-		activatePackages(packages:any):void;
-		activatePackage(name:string):Q.Promise<IPackage>;
-		deactivatePackages():void;
-		deactivatePackage(name:string):void;
-		getActivePackages():any;
-		getActivePackage(name:string):any;
-		isPackageActive(name:string):boolean;
-		unobserveDisabledPackages():void;
-		observeDisabledPackages():void;
-		loadPackages():void;
-		loadPackage(nameOrPath:string):void;
-		unloadPackages():void;
-		unloadPackage(name:string):void;
-		getLoadedPackage(name:string):any;
-		isPackageLoaded(name:string):boolean;
-		getLoadedPackages():any;
-		getLoadedPackagesForTypes(types:any):any[];
-		resolvePackagePath(name:string):string;
-		isPackageDisabled(name:string):boolean;
-		hasAtomEngine(packagePath:string):boolean;
-		isBundledPackage(name:string):boolean;
-		getPackageDependencies():any;
-		getAvailablePackagePaths():any[];
-		getAvailablePackageNames():any[];
-		getAvailablePackageMetadata():any[];
-	}
-
-	interface INotifications {
-		addInfo: Function;
-		addError: Function;
-		addSuccess: Function;
-		addWarning: Function;
-	}
-
-	interface IThemeManager {
-		// TBD
-	}
-
-	interface IContextMenuManager {
-		// TBD
-	}
-
-	interface IMenuManager {
-		// TBD
-	}
-
-	interface IClipboard {
-		write(text:string, metadata?:any):any;
-		read():string;
-	}
-
-	interface ISyntax {
-		// TBD
-	}
-
-	interface IWindowEventHandler {
-		// TBD
-	}
-
-	interface IAtomStatic extends ISerializationStatic<IAtom> {
-		version: number;
-		loadSettings: IAtomSettings;
-
-		/* Load or create the Atom environment in the given mode */
-		loadOrCreate(mode:'editor'):IAtom;
-		/* Load or create the Atom environment in the given mode */
-		loadOrCreate(mode:'spec'):IAtom;
-		/* Load or create the Atom environment in the given mode */
-		loadOrCreate(mode:string):IAtom;
-
-		loadState(mode:any):void;
-		getStatePath(mode:any):string;
-		getConfigDirPath():string;
-		getStorageDirPath():string;
-		getLoadSettings():IAtomSettings;
-		getCurrentWindow():IBrowserWindow;
-		getVersion():string;
-		isReleasedVersion():boolean;
-
-		new(state:IAtomState):IAtom;
-	}
-
-	class Disposable {
-		constructor(disposalAction:any)
-		dispose():void
-	}
-
-	// https://atom.io/docs/api/v0.106.0/api/classes/Atom.html
-	/* Global Atom class : instance members */
-	interface IAtom {
-		constructor:IAtomStatic;
-
-		state:IAtomState;
-		mode:string;
-		deserializers:IDeserializerManager;
-		config: IConfig;
-		commands: ICommandRegistry;
-		keymaps: IKeymapManager;
-		keymap: IKeymapManager;
-		packages: IPackageManager;
-		themes: IThemeManager;
-		contextManu: IContextMenuManager;
-		menu: IMenuManager;
-		notifications: INotifications; // https://github.com/atom/notifications
-		clipboard:IClipboard;
-		syntax:ISyntax;
-		views: IViewRegistry;
-		windowEventHandler: IWindowEventHandler;
-
-		// really exists? start
-		subscribe:Function;
-		unsubscribe:Function;
-		loadTime:number;
-		workspaceViewParentSelector:string;
-
-		project: IProject;
-		workspaceView: IWorkspaceView;
-		workspace: IWorkspace;
-		// really exists? end
-
-		initialize:Function;
-		// registerRepresentationClass:Function;
-		// registerRepresentationClasses:Function;
-		setBodyPlatformClass:Function;
-		getCurrentWindow():IBrowserWindow;
-		getWindowDimensions:Function;
-		setWindowDimensions:Function;
-		restoreWindowDimensions:Function;
-		storeWindowDimensions:Function;
-		getLoadSettings:Function;
-		deserializeProject: Function;
-		deserializeWorkspaceView:Function;
-		deserializePackageStates:Function;
-		deserializeEditorWindow:Function;
-		startEditorWindow:Function;
-		unloadEditorWindow:Function;
-		loadThemes:Function;
-		watchThemes:Function;
-		open:Function;
-		confirm:Function;
-		showSaveDialog:Function;
-		showSaveDialogSync:Function;
-		openDevTools:Function;
-		toggleDevTools:Function;
-		executeJavaScriptInDevTools:Function;
-		reload:Function;
-		focus:Function;
-		show:Function;
-		hide:Function;
-		setSize:Function;
-		setPosition:Function;
-		center:Function;
-		displayWindow:Function;
-		close:Function;
-		exit:Function;
-		inDevMode:Function;
-		inSpecMode:Function;
-		toggleFullScreen:Function;
-		setFullScreen:Function;
-		isFullScreen:Function;
-		getVersion:Function;
-		isReleasedVersion:Function;
-		getGitHubAuthTokenName:Function;
-		setGitHubAuthToken:Function;
-		getGitHubAuthToken:Function;
-		getConfigDirPath:Function;
-		saveSync:Function;
-		getWindowLoadTime():number;
-		crashMainProcess:Function;
-		crashRenderProcess:Function;
-		beep:Function;
-		getUserInitScriptPath:Function;
-		requireUserInitScript:Function;
-		requireWithGlobals:Function;
-
-		services: any; // TODO: New services api
-	}
-
-	interface IBufferedNodeProcessStatic {
-		new (arg:any):IBufferedNodeProcess;
-	}
-
-	interface IBufferedNodeProcess extends IBufferedProcess {
-	}
-
-	interface IBufferedProcessStatic {
-		new (arg:any):IBufferedProcess;
-	}
-
-	interface IBufferedProcess {
-		process:Function;
-		killed:boolean;
-
-		bufferStream:Function;
-		kill:Function;
-	}
-
-	interface IGitStatic {
-		new(path:any, options:any):IGit;
-	}
-
-	interface IGit {
-	}
-
-	interface ITokenizedBuffer {
-		// TBD
-	}
-
-	interface ITokenizedLine {
-		// TBD
-	}
-
-	interface IToken {
-		// TBD
-	}
-
-	interface IFoldStatic {
-		new (displayBuffer:IDisplayBuffer, marker:IMarker):IFold;
-		// TBD
-	}
-
-	interface IFold {
-		id:number;
-		displayBuffer:IDisplayBuffer;
-		marker:IMarker;
-
-		// TBD
-	}
-
-	interface IDisplayBufferMarkerStatic {
-		new (_arg:{bufferMarker:IMarker; displayBuffer: IDisplayBuffer}):IDisplayBufferMarker;
-	}
-
-	interface IDisplayBufferMarker extends Emissary.IEmitter, Emissary.ISubscriber {
-		constructor:IDisplayBufferMarkerStatic;
-
-		id: number;
-
-		bufferMarkerSubscription:any;
-		oldHeadBufferPosition:TextBuffer.IPoint;
-		oldHeadScreenPosition:TextBuffer.IPoint;
-		oldTailBufferPosition:TextBuffer.IPoint;
-		oldTailScreenPosition:TextBuffer.IPoint;
-		wasValid:boolean;
-
-		bufferMarker: IMarker;
-		displayBuffer: IDisplayBuffer;
-		globalPauseCount:number;
-		globalQueuedEvents:any;
-
-		subscriptions:Emissary.ISubscription[];
-		subscriptionsByObject:any; // WeakMap
-
-		copy(attributes?:any /* maybe IMarker */):IDisplayBufferMarker;
-		getScreenRange():TextBuffer.IRange;
-		setScreenRange(screenRange:any, options:any):any;
-		getBufferRange():TextBuffer.IRange;
-		setBufferRange(bufferRange:any, options:any):any;
-		getPixelRange():any;
-		getHeadScreenPosition():TextBuffer.IPoint;
-		setHeadScreenPosition(screenPosition:any, options:any):any;
-		getHeadBufferPosition():TextBuffer.IPoint;
-		setHeadBufferPosition(bufferPosition:any):any;
-		getTailScreenPosition():TextBuffer.IPoint;
-		setTailScreenPosition(screenPosition:any, options:any):any;
-		getTailBufferPosition():TextBuffer.IPoint;
-		setTailBufferPosition(bufferPosition:any):any;
-		plantTail():boolean;
-		clearTail():boolean;
-		hasTail():boolean;
-		isReversed():boolean;
-		isValid():boolean;
-		isDestroyed():boolean;
-		getAttributes():any;
-		setAttributes(attributes:any):any;
-		matchesAttributes(attributes:any):any;
-		destroy():any;
-		isEqual(other:IDisplayBufferMarker):boolean;
-		compare(other:IDisplayBufferMarker):boolean;
-		inspect():string;
-		destroyed():any;
-		notifyObservers(_arg:any):any;
-	}
-
-	interface ITransaction {
-		// TBD
-	}
-
-	interface IMarker extends Emissary.IEmitter {
-		// Serializable.includeInto(Editor);
-		// Delegator.includeInto(Editor);
-
-		// TBD
-	}
-
-	interface ITaskStatic {
-		new(taskPath:any):ITask;
-	}
-
-	interface ITask {
-		// TBD
-	}
-}
-
-declare var atom:AtomCore.IAtom;
-
-declare module "atom" {
-	import spacePen = require("space-pen");
-
-	var $:typeof spacePen.$;
-	var $$:typeof spacePen.$$;
-	var $$$:typeof spacePen.$$$;
-
-	var BufferedNodeProcess:AtomCore.IBufferedNodeProcessStatic;
-	var BufferedProcess:AtomCore.IBufferedProcessStatic;
-	var Git:AtomCore.IGitStatic;
-	var Point:TextBuffer.IPointStatic;
-	var Range:TextBuffer.IRangeStatic;
-
-	class View extends spacePen.View implements Emissary.ISubscriber {
-		// Subscriber.includeInto(spacePen.View);
-
-		// inherit from Subscriber
-		subscribeWith(eventEmitter:any, methodName:string, args:any):any;
-
-		addSubscription(subscription:any):any;
-
-		subscribe(eventEmitterOrSubscription:any, ...args:any[]):any;
-
-		subscribeToCommand(eventEmitter:any, ...args:any[]):any;
-
-		unsubscribe(object?:any):any;
-	}
-
-	class EditorView extends View {
-		static characterWidthCache:any;
-		static configDefaults:any;
-		static nextEditorId:number;
-
-		static content(params:any):void;
-
-		static classes(_arg?:{mini?:any}):string;
-
-		vScrollMargin:number;
-		hScrollMargin:number;
-		lineHeight:any;
-		charWidth:any;
-		charHeight:any;
-		cursorViews:any[];
-		selectionViews:any[];
-		lineCache:any[];
-		isFocused:any;
-		editor:AtomCore.IEditor;
-		attached:any;
-		lineOverdraw:number;
-		pendingChanges:any[];
-		newCursors:any[];
-		newSelections:any[];
-		redrawOnReattach:any;
-		bottomPaddingInLines:number;
-		active:boolean;
-
-		id:number;
-
-		gutter:AtomCore.IGutterView;
-		overlayer:JQuery;
-		scrollView:JQuery;
-		renderedLines:JQuery;
-		underlayer:JQuery;
-		hiddenInput:JQuery;
-		verticalScrollbar:JQuery;
-		verticalScrollbarContent:JQuery;
-
-		constructor(editor:AtomCore.IEditor);
-
-		initialize(editorOrOptions:AtomCore.IEditor):void; // return type are same as editor method.
-		initialize(editorOrOptions?:{editor: AtomCore.IEditor; mini:any; placeholderText:any}):void;
-
-		initialize(editorOrOptions:{}):void; // compatible for spacePen.View
-
-		bindKeys():void;
-
-		getEditor():AtomCore.IEditor;
-
-		getText():string;
-
-		setText(text:string):void;
-
-		insertText(text:string, options?:any):TextBuffer.IRange[];
-
-		setHeightInLines(heightInLines:number):number;
-
-		setWidthInChars(widthInChars:number):number;
-
-		pageDown():void;
-
-		pageUp():void;
-
-		getPageRows():number;
-
-		setShowInvisibles(showInvisibles:boolean):void;
-
-		setInvisibles(invisibles:{ eol:string; space: string; tab: string; cr: string; }):void;
-
-		setShowIndentGuide(showIndentGuide:boolean):void;
-
-		setPlaceholderText(placeholderText:string):void;
-
-		getPlaceholderText():string;
-
-		checkoutHead():boolean;
-
-		configure():Emissary.ISubscription;
-
-		handleEvents():void;
-
-		handleInputEvents():void;
-
-		bringHiddenInputIntoView():JQuery;
-
-		selectOnMousemoveUntilMouseup():any;
-
-		afterAttach(onDom:any):any;
-
-		edit(editor:AtomCore.IEditor):any;
-
-		getModel():AtomCore.IEditor;
-
-		setModel(editor:AtomCore.IEditor):any;
-
-		showBufferConflictAlert(editor:AtomCore.IEditor):any;
-
-		scrollTop(scrollTop:number, options?:any):any;
-
-		scrollBottom(scrollBottom?:number):any;
-
-		scrollLeft(scrollLeft?:number):number;
-
-		scrollRight(scrollRight?:number):any;
-
-		scrollToBottom():any;
-
-		scrollToCursorPosition():any;
-
-		scrollToBufferPosition(bufferPosition:any, options:any):any;
-
-		scrollToScreenPosition(screenPosition:any, options:any):any;
-
-		scrollToPixelPosition(pixelPosition:any, options:any):any;
-
-		highlightFoldsContainingBufferRange(bufferRange:any):any;
-
-		saveScrollPositionForEditor():any;
-
-		toggleSoftTabs():any;
-
-		toggleSoftWrap():any;
-
-		calculateWidthInChars():number;
-
-		calculateHeightInLines():number;
-
-		getScrollbarWidth():number;
-
-		setSoftWrap(softWrap:boolean):any;
-
-		setFontSize(fontSize:number):any;
-
-		getFontSize():number;
-
-		setFontFamily(fontFamily?:string):any;
-
-		getFontFamily():string;
-
-		setLineHeight(lineHeight:number):any;
-
-		redraw():any;
-
-		splitLeft():any;
-
-		splitRight():any;
-
-		splitUp():any;
-
-		splitDown():any;
-
-		getPane():any; // return type are PaneView
-
-		remove(selector:any, keepData:any):any;
-
-		beforeRemove():any;
-
-		getCursorView(index?:number):any; // return type are CursorView
-
-		getCursorViews():any[]; // return type are CursorView[]
-
-		addCursorView(cursor:any, options:any):any; // return type are CursorView
-
-		removeCursorView(cursorView:any):any;
-
-		getSelectionView(index?:number):any; // return type are SelectionView
-
-		getSelectionViews():any[]; // return type are SelectionView[]
-
-		addSelectionView(selection:any):any;
-
-		removeSelectionView(selectionView:any):any;
-
-		removeAllCursorAndSelectionViews():any[];
-
-		appendToLinesView(view:any):any;
-
-		scrollVertically(pixelPosition:any, _arg:any):any;
-
-		scrollHorizontally(pixelPosition:any):any;
-
-		calculateDimensions():number;
-
-		recalculateDimensions():any;
-
-		updateLayerDimensions():any;
-
-		isHidden():boolean;
-
-		clearRenderedLines():void;
-
-		resetDisplay():any;
-
-		requestDisplayUpdate():any;
-
-		updateDisplay(options?:any):any;
-
-		updateCursorViews():any;
-
-		shouldUpdateCursor(cursorView:any):any;
-
-		updateSelectionViews():any[];
-
-		shouldUpdateSelection(selectionView:any):any;
-
-		syncCursorAnimations():any[];
-
-		autoscroll(suppressAutoscroll?:any):any[];
-
-		updatePlaceholderText():any;
-
-		updateRenderedLines(scrollViewWidth:any):any;
-
-		computeSurroundingEmptyLineChanges(change:any):any;
-
-		computeIntactRanges(renderFrom:any, renderTo:any):any;
-
-		truncateIntactRanges(intactRanges:any, renderFrom:any, renderTo:any):any;
-
-		clearDirtyRanges(intactRanges:any):any;
-
-		clearLine(lineElement:any):any;
-
-		fillDirtyRanges(intactRanges:any, renderFrom:any, renderTo:any):any;
-
-		updatePaddingOfRenderedLines():any;
-
-		getFirstVisibleScreenRow():number;
-
-		getLastVisibleScreenRow():number;
-
-		isScreenRowVisible():boolean;
-
-		handleScreenLinesChange(change:any):any;
-
-		buildLineElementForScreenRow(screenRow:any):any;
-
-		buildLineElementsForScreenRows(startRow:any, endRow:any):any;
-
-		htmlForScreenRows(startRow:any, endRow:any):any;
-
-		htmlForScreenLine(screenLine:any, screenRow:any):any;
-
-		buildIndentation(screenRow:any, editor:any):any;
-
-		buildHtmlEndOfLineInvisibles(screenLine:any):any;
-
-		getEndOfLineInvisibles(screenLine:any):any;
-
-		lineElementForScreenRow(screenRow:any):any;
-
-		toggleLineCommentsInSelection():any;
-
-		pixelPositionForBufferPosition(position:any):any;
-
-		pixelPositionForScreenPosition(position:any):any;
-
-		positionLeftForLineAndColumn(lineElement:any, screenRow:any, screenColumn:any):any;
-
-		measureToColumn(lineElement:any, tokenizedLine:any, screenColumn:any):any;
-
-		getCharacterWidthCache(scopes:any, char:any):any;
-
-		setCharacterWidthCache(scopes:any, char:any, val:any):any;
-
-		clearCharacterWidthCache():any;
-
-		pixelOffsetForScreenPosition(position:any):any;
-
-		screenPositionFromMouseEvent(e:any):any;
-
-		highlightCursorLine():any;
-
-		copyPathToClipboard():any;
-
-		buildLineHtml(_arg:any):any;
-
-		updateScopeStack(line:any, scopeStack:any, desiredScopes:any):any;
-
-		pushScope(line:any, scopeStack:any, scope:any):any;
-
-		popScope(line:any, scopeStack:any):any;
-
-		buildEmptyLineHtml(showIndentGuide:any, eolInvisibles:any, htmlEolInvisibles:any, indentation:any, editor:any, mini:any):any;
-
-		replaceSelectedText(replaceFn:(str:string)=>string):any;
-
-		consolidateSelections(e:any):any;
-
-		logCursorScope():any;
-
-		logScreenLines(start:any, end:any):any;
-
-		logRenderedLines():any;
-	}
-
-	class ScrollView extends View {
-		// TBD
-	}
-
-	interface ISelectListItem {
-		/** e.g. application:about */
-		eventName:string;
-		/** e.g. Application: About */
-		eventDescription:string;
-	}
-
-	class SelectListView extends View {
-		static content():any;
-
-		maxItems:number;
-		scheduleTimeout:any;
-		inputThrottle:number;
-		cancelling:boolean;
-		items:any[];
-		list:JQuery;
-		filterEditorView: JQuery;
-
-		previouslyFocusedElement:JQuery;
-
-		initialize():any;
-
-		schedulePopulateList():number;
-
-		setItems(items:any[]):any;
-
-		setError(message?:string):any;
-
-		setLoading(message?:string):any;
-
-		getFilterQuery():string;
-
-		populateList():any;
-
-		getEmptyMessage(itemCount?:any, filteredItemCount?:any):string;
-
-		setMaxItems(maxItems:number):void;
-
-		selectPreviousItemView():any;
-
-		selectNextItemView():any;
-
-		selectItemView(view:any):any;
-
-		scrollToItemView(view:any):any;
-
-		getSelectedItemView():any;
-
-		getSelectedItem():any;
-
-		confirmSelection():any;
-
-		viewForItem(item:any):JQuery|string|HTMLElement|View; // You must override this method!
-		confirmed(item:any):any; // You must override this method!
-		getFilterKey():any;
-
-		focusFilterEditor():any;
-
-		storeFocusedElement():any;
-
-		restoreFocus():any;
-
-		cancelled():any;
-
-		cancel():any;
-	}
-
-
-
-	var WorkspaceView:AtomCore.IWorkspaceViewStatic;
-
-	var Task:AtomCore.ITaskStatic;
-	var Workspace:AtomCore.IWorkspaceStatic;
-}
diff --git a/atom/index.d.ts b/atom/index.d.ts
new file mode 100644
index 0000000000..fe243bf33b
--- /dev/null
+++ b/atom/index.d.ts
@@ -0,0 +1,1887 @@
+// Type definitions for Atom
+// Project: https://atom.io/
+// Definitions by: vvakame <https://github.com/vvakame/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="Q" />
+/// <reference types="jquery" />
+/// <reference types="space-pen" />
+/// <reference types="emissary" />
+/// <reference types="pathwatcher" />
+/// <reference types="text-buffer" />
+/// <reference types="status-bar" />
+
+// Policy: this definition file only declare element related to `atom`.
+// if js file include to another npm package (e.g. "space-pen", "mixto" and "emissary").
+// you should create a separate file.
+
+// API documentation : https://atom.io/docs/api/v0.106.0/api/docs/README.md.html
+
+interface Window {
+	atom: AtomCore.IAtom;
+	measure(description:string, fn:Function):any; // return fn result
+	profile(description:string, fn:Function):any; // return fn result
+}
+
+declare namespace AtomCore {
+
+	// https://atom.io/docs/v0.84.0/advanced/view-system
+	interface IWorkspaceViewStatic {
+		new ():IWorkspaceView;
+		version: number;
+		configDefaults:any;
+		content():any;
+	}
+
+	interface Decoration {
+		destroy(): void;
+	}
+
+	/**
+	 * Represents a buffer annotation that remains logically stationary even as the buffer changes. This is used
+	 * to represent cursors, folds, snippet targets, misspelled words, any anything else that needs to track a
+	 * logical location in the buffer over time.
+	 */
+	interface Marker {
+		/**
+		 * Destroys the marker, causing it to emit the 'destroyed' event. Once destroyed, a marker cannot be
+		 * restored by undo/redo operations.
+		 */
+		destroy(): void;
+
+		/**
+		 * Gets the screen range of the display marker.
+		 */
+		getScreenRange(): Range;
+	}
+
+	interface IWorkspaceView extends View {
+		// Delegator.includeInto(WorkspaceView);
+
+		// delegate to model property's property
+		fullScreen:boolean;
+
+		// delegate to model property's method
+		open(uri:string, options:any):Q.Promise<View>;
+		openSync(uri:string, options?:any):any;
+		saveActivePaneItem():any;
+		saveActivePaneItemAs():any;
+		saveAll():void;
+		destroyActivePaneItem():any;
+		destroyActivePane():any;
+		increaseFontSize():void;
+		decreaseFontSize():void;
+
+		// own property & methods
+		initialize(model:IWorkspace):any;
+		initialize(view:View, args:any):void; // do not use
+		model:IWorkspace;
+		panes: IPaneContainerView;
+		getModel():IWorkspace;
+		installShellCommands():any;
+		handleFocus():any;
+		afterAttach(onDom?:any):any;
+		confirmClose():boolean;
+		updateTitle():any;
+		setTitle(title:string):any;
+		getEditorViews():any[]; // atom.EditorView
+		prependToTop(element:any):any;
+		appendToTop(element:any):any;
+		prependToBottom(element:any):any;
+		appendToBottom(element:any):any;
+		prependToLeft(element:any):any;
+		appendToLeft(element:any):any;
+		prependToRight(element:any):any;
+		appendToRight(element:any):any;
+		getActivePaneView():IPaneView;
+		getActiveView():View;
+		focusPreviousPaneView():any;
+		focusNextPaneView():any;
+		focusPaneViewAbove():any;
+		focusPaneViewBelow():any;
+		focusPaneViewOnLeft():any;
+		focusPaneViewOnRight():any;
+		eachPaneView(callback:(paneView:IPaneView)=>any):{ off():any; };
+		getPaneViews():IPaneView[];
+		eachEditorView(callback:(editorView:any /* EditorView */)=>any):{ off():any; };
+		beforeRemove():any;
+
+		command(eventName:string, handler:Function):any;
+		command(eventName:string, selector:Function, handler:Function):any;
+		command(eventName:string, options:any, handler:Function):any;
+		command(eventName:string, selector:Function, options:any, handler:Function):any;
+
+		statusBar:StatusBar.IStatusBarView;
+	}
+
+	interface IPanes {
+		// TBD
+	}
+
+	interface IPaneView {
+		// TBD
+	}
+
+	interface IPaneContainerView {
+		// TBD
+	}
+
+	interface ITreeView {
+		// TBD
+	}
+
+	interface IGutterViewStatic {
+		new(): IGutterView;
+		content():any;
+	}
+
+	interface IGutterView extends View {
+		firstScreenRow:any;
+		lastScreenRow:any;
+		initialize():void;
+		initialize(view:View, args:any):void; // do not use
+		afterAttach(onDom?:any):any;
+		beforeRemove():any;
+		handleMouseEvents(e:JQueryMouseEventObject):any;
+		getEditorView():any; /* EditorView */
+		getEditor():IEditor;
+		getLineNumberElements():HTMLCollection;
+		getLineNumberElementsForClass(klass:string):NodeList;
+		getLineNumberElement(bufferRow:number):NodeList;
+		addClassToAllLines(klass:string):boolean;
+		removeClassFromAllLines(klass:string):boolean;
+		addClassToLine(bufferRow:number, klass:string):boolean;
+		removeClassFromLine(bufferRow:number, klass:string):boolean;
+		updateLineNumbers(changes:any[], startScreenRow?:number, endScreenRow?:number):any;
+		prependLineElements(lineElements:any):void;
+		appendLineElements(lineElements:any):void;
+		removeLineElements(numberOfElements:number):void;
+		buildLineElements(startScreenRow:any, endScreenRow:any):any;
+		buildLineElementsHtml(startScreenRow:any, endScreenRow:any):any;
+		updateFoldableClasses(changes:any[]):any;
+		removeLineHighlights():void;
+		addLineHighlight(row:number, emptySelection?:boolean):any;
+		highlightLines():boolean;
+	}
+
+	interface ICommandRegistry {
+		add(target: string, commandName: Object, callback?: (event: any) => void): any; // selector:'atom-editor'|'atom-workspace'
+		findCommands(params: Object): Object[];
+		dispatch(selector: any, name:string): void;
+	}
+
+	interface ICommandPanel {
+		// TBD
+	}
+
+	interface IDisplayBufferStatic {
+		new(_arg?:any):IDisplayBuffer;
+	}
+
+	interface IDisplayBuffer /* extends Theorist.Model */ {
+		// Serializable.includeInto(Editor);
+
+		constructor:IDisplayBufferStatic;
+
+		verticalScrollMargin:number;
+		horizontalScrollMargin:number;
+
+		declaredPropertyValues:any;
+		tokenizedBuffer: ITokenizedBuffer;
+		buffer: TextBuffer.ITextBuffer;
+		charWidthsByScope:any;
+		markers:{ [index:number]:IDisplayBufferMarker; };
+		foldsByMarkerId:any;
+		maxLineLength:number;
+		screenLines:ITokenizedLine[];
+		rowMap:any; // return type are RowMap
+		longestScreenRow:number;
+		subscriptions:Emissary.ISubscription[];
+		subscriptionsByObject:any; // return type are WeakMap
+		behaviors:any;
+		subscriptionCounts:any;
+		eventHandlersByEventName:any;
+		pendingChangeEvent:any;
+
+		softWrap:boolean;
+
+		serializeParams():{id:number; softWrap:boolean; editorWidthInChars: number; scrollTop: number; scrollLeft: number; tokenizedBuffer: any; };
+		deserializeParams(params:any):any;
+		copy():IDisplayBuffer;
+		updateAllScreenLines():any;
+		emitChanged(eventProperties:any, refreshMarkers?:boolean):any;
+		updateWrappedScreenLines():any;
+		setVisible(visible:any):any;
+		getVerticalScrollMargin():number;
+		setVerticalScrollMargin(verticalScrollMargin:number):number;
+		getHorizontalScrollMargin():number;
+		setHorizontalScrollMargin(horizontalScrollMargin:number):number;
+		getHeight():any;
+		setHeight(height:any):any;
+		getWidth():any;
+		setWidth(newWidth:any):any;
+		getScrollTop():number;
+		setScrollTop(scrollTop:number):number;
+		getScrollBottom():number;
+		setScrollBottom(scrollBottom:number):number;
+		getScrollLeft():number;
+		setScrollLeft(scrollLeft:number):number;
+		getScrollRight():number;
+		setScrollRight(scrollRight:number):number;
+		getLineHeight():any;
+		setLineHeight(lineHeight:any):any;
+		getDefaultCharWidth():any;
+		setDefaultCharWidth(defaultCharWidth:any):any;
+		getScopedCharWidth(scopeNames:any, char:any):any;
+		getScopedCharWidths(scopeNames:any):any;
+		setScopedCharWidth(scopeNames:any, char:any, width:any):any;
+		setScopedCharWidths(scopeNames:any, charWidths:any):any;
+		clearScopedCharWidths():any;
+		getScrollHeight():number;
+		getScrollWidth():number;
+		getVisibleRowRange():number[];
+		intersectsVisibleRowRange(startRow:any, endRow:any):any;
+		selectionIntersectsVisibleRowRange(selection:any):any;
+		scrollToScreenRange(screenRange:any):any;
+		scrollToScreenPosition(screenPosition:any):any;
+		scrollToBufferPosition(bufferPosition:any):any;
+		pixelRectForScreenRange(screenRange:TextBuffer.IRange):any;
+		getTabLength():number;
+		setTabLength(tabLength:number):any;
+		setSoftWrap(softWrap:boolean):boolean;
+		getSoftWrap():boolean;
+		setEditorWidthInChars(editorWidthInChars:number):any;
+		getEditorWidthInChars():number;
+		getSoftWrapColumn():number;
+		lineForRow(row:number):any;
+		linesForRows(startRow:number, endRow:number):any;
+		getLines():any[];
+		indentLevelForLine(line:any):any;
+		bufferRowsForScreenRows(startScreenRow:any, endScreenRow:any):any;
+		createFold(startRow:number, endRow:number):IFold;
+		isFoldedAtBufferRow(bufferRow:number):boolean;
+		isFoldedAtScreenRow(screenRow:number):boolean;
+		destroyFoldWithId(id:number):any;
+		unfoldBufferRow(bufferRow:number):any[];
+		largestFoldStartingAtBufferRow(bufferRow:number):any;
+		foldsStartingAtBufferRow(bufferRow:number):any;
+		largestFoldStartingAtScreenRow(screenRow:any):any;
+		largestFoldContainingBufferRow(bufferRow:any):any;
+		outermostFoldsInBufferRowRange(startRow:any, endRow:any):any[];
+		foldsContainingBufferRow(bufferRow:any):any[];
+		screenRowForBufferRow(bufferRow:number):number;
+		lastScreenRowForBufferRow(bufferRow:number):number;
+		bufferRowForScreenRow(screenRow:number):number;
+
+		screenRangeForBufferRange(bufferRange:TextBuffer.IPoint[]):TextBuffer.IRange;
+
+		screenRangeForBufferRange(bufferRange:TextBuffer.IRange):TextBuffer.IRange;
+
+		screenRangeForBufferRange(bufferRange:{start: TextBuffer.IPoint; end: TextBuffer.IPoint}):TextBuffer.IRange;
+		screenRangeForBufferRange(bufferRange:{start: number[]; end: TextBuffer.IPoint}):TextBuffer.IRange;
+		screenRangeForBufferRange(bufferRange:{start: {row:number; col:number;}; end: TextBuffer.IPoint}):TextBuffer.IRange;
+
+		screenRangeForBufferRange(bufferRange:{start: TextBuffer.IPoint; end: number[]}):TextBuffer.IRange;
+		screenRangeForBufferRange(bufferRange:{start: number[]; end: number[]}):TextBuffer.IRange;
+		screenRangeForBufferRange(bufferRange:{start: {row:number; col:number;}; end: number[]}):TextBuffer.IRange;
+
+		screenRangeForBufferRange(bufferRange:{start: TextBuffer.IPoint; end: {row:number; col:number;}}):TextBuffer.IRange;
+		screenRangeForBufferRange(bufferRange:{start: number[]; end: {row:number; col:number;}}):TextBuffer.IRange;
+		screenRangeForBufferRange(bufferRange:{start: {row:number; col:number;}; end: {row:number; col:number;}}):TextBuffer.IRange;
+
+		bufferRangeForScreenRange(screenRange:TextBuffer.IPoint[]):TextBuffer.IRange;
+
+		bufferRangeForScreenRange(screenRange:TextBuffer.IRange):TextBuffer.IRange;
+
+		bufferRangeForScreenRange(screenRange:{start: TextBuffer.IPoint; end: TextBuffer.IPoint}):TextBuffer.IRange;
+		bufferRangeForScreenRange(screenRange:{start: number[]; end: TextBuffer.IPoint}):TextBuffer.IRange;
+		bufferRangeForScreenRange(screenRange:{start: {row:number; col:number;}; end: TextBuffer.IPoint}):TextBuffer.IRange;
+
+		bufferRangeForScreenRange(screenRange:{start: TextBuffer.IPoint; end: number[]}):TextBuffer.IRange;
+		bufferRangeForScreenRange(screenRange:{start: number[]; end: number[]}):TextBuffer.IRange;
+		bufferRangeForScreenRange(screenRange:{start: {row:number; col:number;}; end: number[]}):TextBuffer.IRange;
+
+		bufferRangeForScreenRange(screenRange:{start: TextBuffer.IPoint; end: {row:number; col:number;}}):TextBuffer.IRange;
+		bufferRangeForScreenRange(screenRange:{start: number[]; end: {row:number; col:number;}}):TextBuffer.IRange;
+		bufferRangeForScreenRange(screenRange:{start: {row:number; col:number;}; end: {row:number; col:number;}}):TextBuffer.IRange;
+
+		pixelRangeForScreenRange(screenRange:TextBuffer.IPoint[], clip?:boolean):TextBuffer.IRange;
+
+		pixelRangeForScreenRange(screenRange:TextBuffer.IRange, clip?:boolean):TextBuffer.IRange;
+
+		pixelRangeForScreenRange(screenRange:{start: TextBuffer.IPoint; end: TextBuffer.IPoint}, clip?:boolean):TextBuffer.IRange;
+		pixelRangeForScreenRange(screenRange:{start: number[]; end: TextBuffer.IPoint}, clip?:boolean):TextBuffer.IRange;
+		pixelRangeForScreenRange(screenRange:{start: {row:number; col:number;}; end: TextBuffer.IPoint}, clip?:boolean):TextBuffer.IRange;
+
+		pixelRangeForScreenRange(screenRange:{start: TextBuffer.IPoint; end: number[]}, clip?:boolean):TextBuffer.IRange;
+		pixelRangeForScreenRange(screenRange:{start: number[]; end: number[]}, clip?:boolean):TextBuffer.IRange;
+		pixelRangeForScreenRange(screenRange:{start: {row:number; col:number;}; end: number[]}, clip?:boolean):TextBuffer.IRange;
+
+		pixelRangeForScreenRange(screenRange:{start: TextBuffer.IPoint; end: {row:number; col:number;}}, clip?:boolean):TextBuffer.IRange;
+		pixelRangeForScreenRange(screenRange:{start: number[]; end: {row:number; col:number;}}, clip?:boolean):TextBuffer.IRange;
+		pixelRangeForScreenRange(screenRange:{start: {row:number; col:number;}; end: {row:number; col:number;}}, clip?:boolean):TextBuffer.IRange;
+
+		pixelPositionForScreenPosition(screenPosition:TextBuffer.IPoint, clip?:boolean):TextBuffer.IPoint;
+		pixelPositionForScreenPosition(screenPosition:number[], clip?:boolean):TextBuffer.IPoint;
+		pixelPositionForScreenPosition(screenPosition:{row:number; col:number;}, clip?:boolean):TextBuffer.IPoint;
+
+		screenPositionForPixelPosition(pixelPosition:any):TextBuffer.IPoint;
+
+		pixelPositionForBufferPosition(bufferPosition:any):any;
+		getLineCount():number;
+		getLastRow():number;
+		getMaxLineLength():number;
+		screenPositionForBufferPosition(bufferPosition:any, options:any):any;
+		bufferPositionForScreenPosition(bufferPosition:any, options:any):any;
+		scopesForBufferPosition(bufferPosition:any):any;
+		bufferRangeForScopeAtPosition(selector:any, position:any):any;
+		tokenForBufferPosition(bufferPosition:any):any;
+		getGrammar():IGrammar;
+		setGrammar(grammar:IGrammar):any;
+		reloadGrammar():any;
+		clipScreenPosition(screenPosition:any, options:any):any;
+		findWrapColumn(line:any, softWrapColumn:any):any;
+		rangeForAllLines():TextBuffer.IRange;
+		getMarker(id:number):IDisplayBufferMarker;
+		getMarkers():IDisplayBufferMarker[];
+		getMarkerCount():number;
+		markScreenRange(range:TextBuffer.IRange, ...args:any[]):IDisplayBufferMarker;
+		markBufferRange(range:TextBuffer.IRange, options?:any):IDisplayBufferMarker;
+		markScreenPosition(screenPosition:TextBuffer.IPoint, options?:any):IDisplayBufferMarker;
+		markBufferPosition(bufferPosition:TextBuffer.IPoint, options?:any):IDisplayBufferMarker;
+		destroyMarker(id:number):any;
+		findMarker(params?:any):IDisplayBufferMarker;
+		findMarkers(params?:any):IDisplayBufferMarker[];
+		translateToBufferMarkerParams(params?:any):any;
+		findFoldMarker(attributes:any):IMarker;
+		findFoldMarkers(attributes:any):IMarker[];
+		getFoldMarkerAttributes(attributes?:any):any;
+		pauseMarkerObservers():any;
+		resumeMarkerObservers():any;
+		refreshMarkerScreenPositions():any;
+		destroy():any;
+		logLines(start:number, end:number):any[];
+		handleTokenizedBufferChange(tokenizedBufferChange:any):any;
+		updateScreenLines(startBufferRow:any, endBufferRow:any, bufferDelta?:number, options?:any):any;
+		buildScreenLines(startBufferRow:any, endBufferRow:any):any;
+		findMaxLineLength(startScreenRow:any, endScreenRow:any, newScreenLines:any):any;
+		handleBufferMarkersUpdated():any;
+		handleBufferMarkerCreated(marker:any):any;
+		createFoldForMarker(maker:any):IFold;
+		foldForMarker(marker:any):any;
+	}
+
+	interface IViewRegistry {
+		getView(selector:any):any;
+	}
+
+	interface ICursorStatic {
+		new (arg:{editor:IEditor; marker:IDisplayBufferMarker; id: number;}):ICursor;
+	}
+
+	interface ScopeDescriptor {
+		scopes: string[];
+	}
+
+	interface ICursor /* extends Theorist.Model */ {
+		getScopeDescriptor(): ScopeDescriptor;
+		screenPosition:any;
+		bufferPosition:any;
+		goalColumn:any;
+		visible:boolean;
+		needsAutoscroll:boolean;
+
+		editor:IEditor;
+		marker:IDisplayBufferMarker;
+		id: number;
+
+		destroy():any;
+		changePosition(options:any, fn:Function):any;
+		getPixelRect():any;
+		setScreenPosition(screenPosition:any, options?:any):any;
+		getScreenPosition():TextBuffer.IPoint;
+		getScreenRange():TextBuffer.IRange;
+		setBufferPosition(bufferPosition:any, options?:any):any;
+		getBufferPosition():TextBuffer.IPoint;
+		autoscroll():any;
+		updateVisibility():any;
+		setVisible(visible:boolean):any;
+		isVisible():boolean;
+		wordRegExp(arg?:any):any;
+		isLastCursor():boolean;
+		isSurroundedByWhitespace():boolean;
+		isBetweenWordAndNonWord():boolean;
+		isInsideWord():boolean;
+		clearAutoscroll():void;
+		clearSelection():void;
+		getScreenRow():number;
+		getScreenColumn():number;
+		getBufferRow():number;
+		getBufferColumn():number;
+		getCurrentBufferLine():string;
+		moveUp(rowCount:number, arg?:any):any;
+		moveDown(rowCount:number, arg?:any):any;
+		moveLeft(arg?:any):any;
+		moveRight(arg?:any):any;
+		moveToTop():any;
+		moveToBottom():void;
+		moveToBeginningOfScreenLine():void;
+		moveToBeginningOfLine():void;
+		moveToFirstCharacterOfLine():void;
+		moveToEndOfScreenLine():void;
+		moveToEndOfLine():void;
+		moveToBeginningOfWord():void;
+		moveToEndOfWord():void;
+		moveToBeginningOfNextWord():void;
+		moveToPreviousWordBoundary():void;
+		moveToNextWordBoundary():void;
+		getBeginningOfCurrentWordBufferPosition(options?:any):TextBuffer.IPoint;
+		getPreviousWordBoundaryBufferPosition(options?:any):TextBuffer.IPoint;
+		getMoveNextWordBoundaryBufferPosition(options?:any):TextBuffer.IPoint;
+		getEndOfCurrentWordBufferPosition(options?:any):TextBuffer.IPoint;
+		getBeginningOfNextWordBufferPosition(options?:any):TextBuffer.IPoint;
+		getCurrentWordBufferRange(options?:any):TextBuffer.IPoint;
+		getCurrentLineBufferRange(options?:any):TextBuffer.IPoint;
+		getCurrentParagraphBufferRange():any;
+		getCurrentWordPrefix():string;
+		isAtBeginningOfLine():boolean;
+		getIndentLevel():number;
+		isAtEndOfLine():boolean;
+		getScopes():string[];
+		hasPrecedingCharactersOnLine():boolean;
+		getMarker(): Marker;
+	}
+
+	interface ILanguageMode {
+		// TBD
+	}
+
+	interface ISelection /* extends Theorist.Model */ {
+		cursor:ICursor;
+		marker:IDisplayBufferMarker;
+		editor:IEditor;
+		initialScreenRange:any;
+		wordwise:boolean;
+		needsAutoscroll:boolean;
+		retainSelection:boolean;
+		subscriptionCounts:any;
+
+		destroy():any;
+		finalize():any;
+		clearAutoscroll():any;
+		isEmpty():boolean;
+		isReversed():boolean;
+		isSingleScreenLine():boolean;
+		getScreenRange():TextBuffer.IRange;
+		setScreenRange(screenRange:any, options:any):any;
+		getBufferRange():TextBuffer.IRange;
+		setBufferRange(bufferRange:any, options:any):any;
+		getBufferRowRange():number[];
+		autoscroll():void;
+		getText():string;
+		clear():boolean;
+		selectWord():TextBuffer.IRange;
+		expandOverWord():any;
+		selectLine(row?:any):TextBuffer.IRange;
+		expandOverLine():boolean;
+		selectToScreenPosition(position:any):any;
+		selectToBufferPosition(position:any):any;
+		selectRight():boolean;
+		selectLeft():boolean;
+		selectUp(rowCount?:any):boolean;
+		selectDown(rowCount?:any):boolean;
+		selectToTop():any;
+		selectToBottom():any;
+		selectAll():any;
+		selectToBeginningOfLine():any;
+		selectToFirstCharacterOfLine():any;
+		selectToEndOfLine():any;
+		selectToBeginningOfWord():any;
+		selectToEndOfWord():any;
+		selectToBeginningOfNextWord():any;
+		selectToPreviousWordBoundary():any;
+		selectToNextWordBoundary():any;
+		addSelectionBelow():any;
+		getGoalBufferRange():any;
+		addSelectionAbove():any[];
+		insertText(text:string, options?:any):any;
+		normalizeIndents(text:string, indentBasis:number):any;
+		indent(_arg?:any):any;
+		indentSelectedRows():TextBuffer.IRange[];
+		setIndentationForLine(line:string, indentLevel:number):any;
+		backspace():any;
+		backspaceToBeginningOfWord():any;
+		backspaceToBeginningOfLine():any;
+		delete():any;
+		deleteToEndOfWord():any;
+		deleteSelectedText():any;
+		deleteLine():any;
+		joinLines():any;
+		outdentSelectedRows():any[];
+		autoIndentSelectedRows():any;
+		toggleLineComments():any;
+		cutToEndOfLine(maintainClipboard:any):any;
+		cut(maintainClipboard:any):any;
+		copy(maintainClipboard:any):any;
+		fold():any;
+		modifySelection(fn:()=>any):any;
+		plantTail():any;
+		intersectsBufferRange(bufferRange:any):any;
+		intersectsWith(otherSelection:any):any;
+		merge(otherSelection:any, options:any):any;
+		compare(otherSelection:any):any;
+		getRegionRects():any[];
+		screenRangeChanged():any;
+	}
+
+	interface IDecorationParams {
+		id?: number;
+		class: string;
+		type: any /* string or string[] */;
+	}
+
+	interface IDecorationStatic {
+		isType(decorationParams:IDecorationParams, type:any /* string or string[] */):boolean;
+		new (marker:IDisplayBufferMarker, displayBuffer:IDisplayBuffer, params: IDecorationParams): IDecoration;
+	}
+
+	interface IDecoration extends Emissary.IEmitter {
+		marker: IDisplayBufferMarker;
+		displayBuffer: IDisplayBuffer;
+		params: IDecorationParams
+		id: number;
+		flashQueue: any[];
+		isDestroyed: boolean;
+
+		destroy():void;
+		update(newParams:IDecorationParams):void;
+		getMarker():IDisplayBufferMarker;
+		getParams():IDecorationParams;
+		isType(type:string):boolean;
+		matchesPattern(decorationPattern:{[key:string]:IDecorationParams;}):boolean;
+		flash(klass:string, duration?:number):void;
+		consumeNextFlash():any;
+	}
+
+	interface IEditor {
+		// Serializable.includeInto(Editor);
+		// Delegator.includeInto(Editor);
+
+		deserializing:boolean;
+		callDisplayBufferCreatedHook:boolean;
+		registerEditor:boolean;
+		buffer:TextBuffer.ITextBuffer;
+		languageMode: ILanguageMode;
+		cursors:ICursor[];
+		selections: ISelection[];
+		suppressSelectionMerging:boolean;
+		updateBatchDepth: number;
+		selectionFlashDuration: number;
+		softTabs: boolean;
+		displayBuffer: IDisplayBuffer;
+
+		id:number;
+		behaviors:any;
+		declaredPropertyValues: any;
+		eventHandlersByEventName: any;
+		eventHandlersByNamespace: any;
+		lastOpened: number;
+		subscriptionCounts: any;
+		subscriptionsByObject: any; /* WeakMap */
+		subscriptions: Emissary.ISubscription[];
+		destroy():void;
+
+		mini: any;
+
+		serializeParams():{id:number; softTabs:boolean; scrollTop:number; scrollLeft:number; displayBuffer:any;};
+		deserializeParams(params:any):any;
+		subscribeToBuffer():void;
+		subscribeToDisplayBuffer():void;
+		getViewClass():any; // return type are EditorView
+		destroyed():void;
+		isDestroyed():boolean;
+		copy():IEditor;
+		getTitle():string;
+		getLongTitle():string;
+		setVisible(visible:boolean):void;
+		setMini(mini:any):void;
+		setScrollTop(scrollTop:any):void;
+		getScrollTop():number;
+		setScrollLeft(scrollLeft:any):void;
+		getScrollLeft():number;
+		setEditorWidthInChars(editorWidthInChars:any):void;
+		getSoftWrapColumn():number;
+		getSoftTabs():boolean;
+		setSoftTabs(softTabs:boolean):void;
+		getSoftWrap():boolean;
+		setSoftWrap(softWrap:any):void;
+		getTabText():string;
+		getTabLength():number;
+		setTabLength(tabLength:any):void;
+		usesSoftTabs():boolean;
+		clipBufferPosition(bufferPosition:any):void;
+		clipBufferRange(range:any):void;
+		indentationForBufferRow(bufferRow:any):void;
+		setIndentationForBufferRow(bufferRow:any, newLevel:any, _arg:any):void;
+		indentLevelForLine(line:any):number;
+		buildIndentString(number:any):string;
+		save():void;
+		saveAs(filePath:any):void;
+		copyPathToClipboard():void;
+		getPath():string;
+		getText():string;
+		setText(text:any):void;
+		getTextInRange(range:any):any;
+		getLineCount():number;
+		getBuffer():TextBuffer.ITextBuffer;
+		getURI():string;
+		isBufferRowBlank(bufferRow:any):boolean;
+		isBufferRowCommented(bufferRow:any):void;
+		nextNonBlankBufferRow(bufferRow:any):void;
+		getEofBufferPosition():TextBuffer.IPoint;
+		getLastBufferRow():number;
+		bufferRangeForBufferRow(row:any, options:any):TextBuffer.IRange;
+		lineForBufferRow(row:number):string;
+		lineLengthForBufferRow(row:number):number;
+		scan():any;
+		scanInBufferRange():any;
+		backwardsScanInBufferRange():any;
+		isModified():boolean;
+		isEmpty():boolean;
+		shouldPromptToSave():boolean;
+		screenPositionForBufferPosition(bufferPosition:any, options?:any):TextBuffer.IPoint;
+		bufferPositionForScreenPosition(screenPosition:any, options?:any):TextBuffer.IPoint;
+		screenRangeForBufferRange(bufferRange:any):TextBuffer.IRange;
+		bufferRangeForScreenRange(screenRange:any):TextBuffer.IRange;
+		clipScreenPosition(screenPosition:any, options:any):TextBuffer.IRange;
+		lineForScreenRow(row:any):ITokenizedLine;
+		linesForScreenRows(start?:any, end?:any):ITokenizedLine[];
+		getScreenLineCount():number;
+		getMaxScreenLineLength():number;
+		getLastScreenRow():number;
+		bufferRowsForScreenRows(startRow:any, endRow:any):any[];
+		bufferRowForScreenRow(row:any):number;
+		scopesForBufferPosition(bufferPosition:any):string[];
+		bufferRangeForScopeAtCursor(selector:string):any;
+		tokenForBufferPosition(bufferPosition:any):IToken;
+		getCursorScopes():string[];
+		logCursorScope():void;
+		insertText(text:string, options?:any):TextBuffer.IRange[];
+		insertNewline():TextBuffer.IRange[];
+		insertNewlineBelow():TextBuffer.IRange[];
+		insertNewlineAbove():any;
+		indent(options?:any):any;
+		backspace():any[];
+		// deprecated backspaceToBeginningOfWord():any[];
+		// deprecated backspaceToBeginningOfLine():any[];
+		deleteToBeginningOfWord():any[];
+		deleteToBeginningOfLine():any[];
+		delete():any[];
+		deleteToEndOfLine():any[];
+		deleteToEndOfWord():any[];
+		deleteLine():TextBuffer.IRange[];
+		indentSelectedRows():TextBuffer.IRange[][];
+		outdentSelectedRows():TextBuffer.IRange[][];
+		toggleLineCommentsInSelection():TextBuffer.IRange[];
+		autoIndentSelectedRows():TextBuffer.IRange[][];
+		normalizeTabsInBufferRange(bufferRange:any):any;
+		cutToEndOfLine():boolean[];
+		cutSelectedText():boolean[];
+		copySelectedText():boolean[];
+		pasteText(options?:any):TextBuffer.IRange[];
+		undo():any[];
+		redo():any[];
+		foldCurrentRow():any;
+		unfoldCurrentRow():any[];
+		foldSelectedLines():any[];
+		foldAll():any[];
+		unfoldAll():any[];
+		foldAllAtIndentLevel(level:any):any;
+		foldBufferRow(bufferRow:any):any;
+		unfoldBufferRow(bufferRow:any):any;
+		isFoldableAtBufferRow(bufferRow:any):boolean;
+		isFoldableAtScreenRow(screenRow:any):boolean;
+		createFold(startRow:any, endRow:any):IFold;
+		destroyFoldWithId(id:any):any;
+		destroyFoldsIntersectingBufferRange(bufferRange:any):any;
+		toggleFoldAtBufferRow(bufferRow:any):any;
+		isFoldedAtCursorRow():boolean;
+		isFoldedAtBufferRow(bufferRow:any):boolean;
+		isFoldedAtScreenRow(screenRow:any):boolean;
+		largestFoldContainingBufferRow(bufferRow:any):boolean;
+		largestFoldStartingAtScreenRow(screenRow:any):any;
+		outermostFoldsInBufferRowRange(startRow:any, endRow:any):any[];
+		moveLineUp():ISelection[];
+		moveLineDown():ISelection[];
+		duplicateLines():any[][];
+		// duprecated duplicateLine():any[][];
+		mutateSelectedText(fn:(selection:ISelection)=>any):any;
+		replaceSelectedText(options:any, fn:(selection:string)=>any):any;
+		decorationsForScreenRowRange(startScreenRow:any, endScreenRow:any):{[id:number]: IDecoration[]};
+		decorateMarker(marker:IDisplayBufferMarker, decorationParams: {type:string; class: string;}):IDecoration;
+		decorationForId(id:number):IDecoration;
+		getMarker(id:number):IDisplayBufferMarker;
+		getMarkers():IDisplayBufferMarker[];
+		findMarkers(...args:any[]):IDisplayBufferMarker[];
+		markScreenRange(...args:any[]):IDisplayBufferMarker;
+		markBufferRange(...args:any[]):IDisplayBufferMarker;
+		markScreenPosition(...args:any[]):IDisplayBufferMarker;
+		markBufferPosition(...args:any[]):IDisplayBufferMarker;
+		destroyMarker(...args:any[]):boolean;
+		getMarkerCount():number;
+		hasMultipleCursors():boolean;
+		getCursors():ICursor[];
+		getCursor():ICursor;
+		addCursorAtScreenPosition(screenPosition:any):ICursor;
+		addCursorAtBufferPosition(bufferPosition:any):ICursor;
+		addCursor(marker:any):ICursor;
+		removeCursor(cursor:any):ICursor[];
+		addSelection(marker:any, options:any):ISelection;
+		addSelectionForBufferRange(bufferRange:any, options:any):ISelection;
+		setSelectedBufferRange(bufferRange:any, options:any):any;
+		setSelectedBufferRanges(bufferRanges:any, options:any):any;
+		removeSelection(selection:ISelection):any;
+		clearSelections():boolean;
+		consolidateSelections():boolean;
+		selectionScreenRangeChanged(selection:any):void;
+		getSelections():ISelection[];
+		getSelection(index?:number):ISelection;
+		getLastSelection():ISelection;
+		getSelectionsOrderedByBufferPosition():ISelection[];
+		getLastSelectionInBuffer():ISelection;
+		selectionIntersectsBufferRange(bufferRange:any):any;
+		setCursorScreenPosition(position:TextBuffer.IPoint, options?:any):any;
+		getCursorScreenPosition():TextBuffer.IPoint;
+		getCursorScreenRow():number;
+		setCursorBufferPosition(position:any, options?:any):any;
+		getCursorBufferPosition():TextBuffer.IPoint;
+		getSelectedScreenRange():TextBuffer.IRange;
+		getSelectedBufferRange():TextBuffer.IRange;
+		getSelectedBufferRanges():TextBuffer.IRange[];
+		getSelectedText():string;
+		getTextInBufferRange(range:TextBuffer.IRange):string;
+		setTextInBufferRange(range:TextBuffer.IRange | any[], text:string):any;
+		getCurrentParagraphBufferRange():TextBuffer.IRange;
+		getWordUnderCursor(options?:any):string;
+		moveCursorUp(lineCount?:number):void;
+		moveCursorDown(lineCount?:number):void;
+		moveCursorLeft():void;
+		moveCursorRight():void;
+		moveCursorToTop():void;
+		moveCursorToBottom():void;
+		moveCursorToBeginningOfScreenLine():void;
+		moveCursorToBeginningOfLine():void;
+		moveCursorToFirstCharacterOfLine():void;
+		moveCursorToEndOfScreenLine():void;
+		moveCursorToEndOfLine():void;
+		moveCursorToBeginningOfWord():void;
+		moveCursorToEndOfWord():void;
+		moveCursorToBeginningOfNextWord():void;
+		moveCursorToPreviousWordBoundary():void;
+		moveCursorToNextWordBoundary():void;
+		moveCursorToBeginningOfNextParagraph():void;
+		moveCursorToBeginningOfPreviousParagraph():void;
+		moveToBottom():void;
+		scrollToCursorPosition(options:any):any;
+		pageUp():void;
+		pageDown():void;
+		selectPageUp():void;
+		selectPageDown():void;
+		getRowsPerPage():number;
+		moveCursors(fn:(cursor:ICursor)=>any):any;
+		cursorMoved(event:any):void;
+		selectToScreenPosition(position:TextBuffer.IPoint):any;
+		selectRight():ISelection[];
+		selectLeft():ISelection[];
+		selectUp(rowCount?:number):ISelection[];
+		selectDown(rowCount?:number):ISelection[];
+		selectToTop():ISelection[];
+		selectAll():ISelection[];
+		selectToBottom():ISelection[];
+		selectToBeginningOfLine():ISelection[];
+		selectToFirstCharacterOfLine():ISelection[];
+		selectToEndOfLine():ISelection[];
+		selectToPreviousWordBoundary():ISelection[];
+		selectToNextWordBoundary():ISelection[];
+		selectLine():ISelection[];
+		selectLinesContainingCursors():ISelection[];
+		addSelectionBelow():ISelection[];
+		addSelectionAbove():ISelection[];
+		splitSelectionsIntoLines():any[];
+		transpose():TextBuffer.IRange[];
+		upperCase():boolean[];
+		lowerCase():boolean[];
+		joinLines():any[];
+		selectToBeginningOfWord():ISelection[];
+		selectToEndOfWord():ISelection[];
+		selectToBeginningOfNextWord():ISelection[];
+		selectWord():ISelection[];
+		selectToBeginningOfNextParagraph():ISelection[];
+		selectToBeginningOfPreviousParagraph():ISelection[];
+		selectMarker(marker:any):any;
+		mergeCursors():number[];
+		expandSelectionsForward():any;
+		expandSelectionsBackward(fn:(selection:ISelection)=>any):ISelection[];
+		finalizeSelections():boolean[];
+		mergeIntersectingSelections():any;
+		preserveCursorPositionOnBufferReload():Emissary.ISubscription;
+		getGrammar(): IGrammar;
+		setGrammar(grammer:IGrammar):void;
+		reloadGrammar():any;
+		shouldAutoIndent():boolean;
+		shouldShowInvisibles():boolean;
+		updateInvisibles():void;
+		transact(fn:Function):any;
+		beginTransaction():ITransaction;
+		commitTransaction():any;
+		abortTransaction():any[];
+		inspect():string;
+		logScreenLines(start:number, end:number):any[];
+		handleTokenization():void;
+		handleGrammarChange():void;
+		handleMarkerCreated(marker:any):any;
+		getSelectionMarkerAttributes():{type: string; editorId: number; invalidate: string; };
+		getVerticalScrollMargin():number;
+		setVerticalScrollMargin(verticalScrollMargin:number):void;
+		getHorizontalScrollMargin():number;
+		setHorizontalScrollMargin(horizontalScrollMargin:number):void;
+		getLineHeightInPixels():number;
+		setLineHeightInPixels(lineHeightInPixels:number):void;
+		batchCharacterMeasurement(fn:Function):void;
+		getScopedCharWidth(scopeNames:any, char:any):any;
+		setScopedCharWidth(scopeNames:any, char:any, width:any):any;
+		getScopedCharWidths(scopeNames:any):any;
+		clearScopedCharWidths():any;
+		getDefaultCharWidth():number;
+		setDefaultCharWidth(defaultCharWidth:number):void;
+		setHeight(height:number):void;
+		getHeight():number;
+		getClientHeight():number;
+		setWidth(width:number):void;
+		getWidth():number;
+		getScrollTop():number;
+		setScrollTop(scrollTop:number):void;
+		getScrollBottom():number;
+		setScrollBottom(scrollBottom:number):void;
+		getScrollLeft():number;
+		setScrollLeft(scrollLeft:number):void;
+		getScrollRight():number;
+		setScrollRight(scrollRight:number):void;
+		getScrollHeight():number;
+		getScrollWidth():number;
+		getVisibleRowRange():number;
+		intersectsVisibleRowRange(startRow:any, endRow:any):any;
+		selectionIntersectsVisibleRowRange(selection:any):any;
+		pixelPositionForScreenPosition(screenPosition:any):any;
+		pixelPositionForBufferPosition(bufferPosition:any):any;
+		screenPositionForPixelPosition(pixelPosition:any):any;
+		pixelRectForScreenRange(screenRange:any):any;
+		scrollToScreenRange(screenRange:any, options:any):any;
+		scrollToScreenPosition(screenPosition:any, options:any):any;
+		scrollToBufferPosition(bufferPosition:any, options:any):any;
+		horizontallyScrollable():any;
+		verticallyScrollable():any;
+		getHorizontalScrollbarHeight():any;
+		setHorizontalScrollbarHeight(height:any):any;
+		getVerticalScrollbarWidth():any;
+		setVerticalScrollbarWidth(width:any):any;
+		// deprecated joinLine():any;
+
+		onDidChange(callback: Function): Disposable;
+		onDidDestroy(callback: Function): Disposable;
+		onDidStopChanging(callback: Function): Disposable;
+		onDidChangeCursorPosition(callback: Function): Disposable;
+		onDidSave(callback: (event: { path: string }) => void): Disposable;
+
+		decorateMarker(marker: Marker, options: any): Decoration;
+		getLastCursor(): ICursor;
+	}
+
+	interface IGrammar {
+		bundledPackage: boolean;
+		emitter: any;
+		fileTypes: [string];
+		firstLineRegex: any;
+		foldingStopMarker: any;
+		includedGrammarScopes: [any];
+		initialRule: any;
+		injectionSelector: any;
+		injections: any;
+		maxTokensPerLine: Number;
+		name: string;
+		packageName: string;
+		path: string;
+		rawPatterns: [any];
+		rawRepository: any;
+		registration: Disposable;
+		registry: any;
+		repository: Object;
+		scopeName: string;
+		// TBD
+
+	}
+
+	interface IPane /* extends Theorist.Model */ {
+		itemForURI: (uri:string)=>IEditor;
+		items:any[];
+		activeItem:any;
+
+		serializeParams():any;
+		deserializeParams(params:any):any;
+		getViewClass():any; // return type are PaneView
+		isActive():boolean;
+		isDestroyed():boolean;
+		focus():void;
+		blur():void;
+		activate():void;
+		getPanes():IPane[];
+		getItems():any[];
+		getActiveItem():any;
+		getActiveEditor():any;
+		itemAtIndex(index:number):any;
+		activateNextItem():any;
+		activatePreviousItem():any;
+		getActiveItemIndex():number;
+		activateItemAtIndex(index:number):any;
+		activateItem(item:any):any;
+		addItem(item:any, index:number):any;
+		addItems(items:any[], index:number):any[];
+		removeItem(item:any, destroying:any):void;
+		moveItem(item:any, newIndex:number):void;
+		moveItemToPane(item:any, pane:IPane, index:number):void;
+		destroyActiveItem():boolean; // always return false
+		destroyItem(item:any):boolean;
+		destroyItems():any[];
+		destroyInactiveItems():any[];
+		destroy():void;
+		destroyed():any[];
+		promptToSaveItem(item:any):boolean;
+		saveActiveItem():void;
+		saveActiveItemAs():void;
+		saveItem(item:any, nextAction:Function):void;
+		saveItemAs(item:any, nextAction:Function):void;
+		saveItems():any[];
+		activateItemForURI(uri:any):any;
+		copyActiveItem():void;
+		splitLeft(params:any):IPane;
+		splitRight(params:any):IPane;
+		splitUp(params:any):IPane;
+		splitDown(params:any):IPane;
+		split(orientation:string, side:string, params:any):IPane;
+		findLeftmostSibling():IPane;
+		findOrCreateRightmostSibling():IPane;
+	}
+
+	// https://atom.io/docs/v0.84.0/advanced/serialization
+	interface ISerializationStatic<T> {
+		deserialize(data:ISerializationInfo):T;
+		new (data:T): ISerialization;
+	}
+
+	interface ISerialization {
+		serialize():ISerializationInfo;
+	}
+
+	interface ISerializationInfo {
+		deserializer: string;
+	}
+
+	interface IBrowserWindow {
+		getPosition():number[];
+		getSize():number[];
+	}
+
+	interface IAtomWindowDimentions {
+		x:number;
+		y:number;
+		width:number;
+		height:number;
+	}
+
+	interface IProjectStatic {
+		pathForRepositoryUrl(repoUrl:string):string;
+
+		new (arg?:{path:any; buffers:any[];}):IProject;
+	}
+
+	interface IProject /* extends Theorist.Model */ {
+		// Serializable.includeInto(Project);
+
+		path:string;
+		/** deprecated */
+		rootDirectory?:PathWatcher.IDirectory;
+		rootDirectories:PathWatcher.IDirectory[];
+
+		serializeParams():any;
+		deserializeParams(params:any):any;
+		destroyed():any;
+		destroyRepo():any;
+		destroyUnretainedBuffers():any;
+		getRepo():IGit;
+		getPath():string;
+		setPath(projectPath:string):any;
+		getRootDirectory():PathWatcher.IDirectory;
+		resolve(uri:string):string;
+		relativize(fullPath:string):string;
+		contains(pathToCheck:string):boolean;
+		open(filePath:string, options?:any):Q.Promise<IEditor>;
+		openSync(filePath:string, options?:any):IEditor;
+		getBuffers():TextBuffer.ITextBuffer;
+		isPathModified(filePath:string):boolean;
+		findBufferForPath(filePath:string):TextBuffer.ITextBuffer;
+		bufferForPathSync(filePath:string):TextBuffer.ITextBuffer;
+		bufferForPath(filePath:string):Q.Promise<TextBuffer.ITextBuffer>;
+		bufferForId(id:any):TextBuffer.ITextBuffer;
+		buildBufferSync(absoluteFilePath:string):TextBuffer.ITextBuffer;
+		buildBuffer(absoluteFilePath:string):Q.Promise<TextBuffer.ITextBuffer>;
+		addBuffer(buffer:TextBuffer.ITextBuffer, options?:any):any;
+		addBufferAtIndex(buffer:TextBuffer.ITextBuffer, index:number, options?:any):any;
+		scan(regex:any, options:any, iterator:any):Q.Promise<any>;
+		replace(regex:any, replacementText:any, filePaths:any, iterator:any):Q.Promise<any>;
+		buildEditorForBuffer(buffer:any, editorOptions:any):IEditor;
+		eachBuffer(...args:any[]):any;
+
+		onDidChangePaths(callback: Function): Disposable;
+	}
+
+	interface IWorkspaceStatic {
+		new():IWorkspace;
+	}
+
+	interface IWorkspacePanelOptions{
+		item:any;
+		visible?:boolean;
+		priority?:number;
+	}
+
+	interface Panel{
+		getItem():any;
+		getPriority():any;
+		isVisible():boolean;
+		show():void;
+		hide():void;
+	}
+
+	interface IWorkspace {
+		addBottomPanel(options:IWorkspacePanelOptions):Panel;
+		addLeftPanel(options:IWorkspacePanelOptions):Panel;
+		addRightPanel(options:IWorkspacePanelOptions):Panel;
+		addTopPanel(options:IWorkspacePanelOptions):Panel;
+		addModalPanel(options:IWorkspacePanelOptions):Panel;
+		addOpener(opener: Function): any;
+
+		deserializeParams(params:any):any;
+		serializeParams():{paneContainer:any;fullScreen:boolean;};
+		eachEditor(callback: Function): void;
+		getTextEditors():IEditor[];
+		open(uri:string, options:any):Q.Promise<View>;
+		openLicense():void;
+		openSync(uri:string, options:any):any;
+		openUriInPane(uri: string, pane: any, options: any): Q.Promise<View>;
+		observeTextEditors(callback: Function): Disposable;
+		reopenItemSync():any;
+		registerOpener(opener:(urlToOpen:string)=>any):void;
+		unregisterOpener(opener:Function):void;
+		getOpeners():any;
+		getActivePane(): IPane;
+		getActivePaneItem(): IPane;
+		getActiveTextEditor(): IEditor;
+		getPanes():any;
+		saveAll():void;
+		activateNextPane():any;
+		activatePreviousPane():any;
+		paneForURI: (uri:string) => IPane;
+		saveActivePaneItem():any;
+		saveActivePaneItemAs():any;
+		destroyActivePaneItem():any;
+		destroyActivePane():any;
+		getActiveEditor():IEditor;
+		increaseFontSize():void;
+		decreaseFontSize():void;
+		resetFontSize():void;
+		itemOpened(item:any):void;
+		onPaneItemDestroyed(item:any):void;
+		destroyed():void;
+		isTextEditor(object: any): boolean;
+
+		onDidChangeActivePaneItem(item:any):Disposable;
+	}
+
+	interface IAtomSettings {
+		appVersion: string;
+		bootstrapScript: string;
+		devMode: boolean;
+		initialPath: string;
+		pathToOpen: string;
+		resourcePath: string;
+		shellLoadTime: number;
+		windowState:string;
+	}
+
+	interface IAtomState {
+		mode:string;
+		packageStates:any;
+		project:any;
+		syntax:any;
+		version:number;
+		windowDimensions:any;
+		workspace:any;
+	}
+
+	interface IDeserializerManager {
+		deserializers:Function;
+		add:Function;
+		remove:Function;
+		deserialize:Function;
+		get:Function;
+	}
+
+	interface IConfig {
+		get(keyPath:string):any;
+		// TBD
+	}
+
+	interface IKeymapManager {
+		defaultTarget:HTMLElement;
+		// TBD
+	}
+
+	interface IPackage {
+		mainModulePath: string;
+		mainModule: any;
+		enable(): void;
+		disable(): void;
+		isTheme(): boolean;
+		getType(): string;
+		getStylesheetType(): string;
+		load(): IPackage;
+		reset(): void;
+		activate(): Q.Promise<any[]>;
+		activateNow(): void;
+		// TBD
+	}
+
+	interface IPackageManager extends Emissary.IEmitter {
+		packageDirPaths:string[];
+		loadedPackages:any;
+		activePackages:any;
+		packageStates:any;
+		packageActivators:any[];
+
+		getApmPath():string;
+		getPackageDirPaths():string;
+		getPackageState(name:string):any;
+		setPackageState(name:string, state:any):void;
+		enablePackage(name:string):any;
+		disablePackage(name:string):any;
+		activate():void;
+		registerPackageActivator(activator:any, types:any):void;
+		activatePackages(packages:any):void;
+		activatePackage(name:string):Q.Promise<IPackage>;
+		deactivatePackages():void;
+		deactivatePackage(name:string):void;
+		getActivePackages():any;
+		getActivePackage(name:string):any;
+		isPackageActive(name:string):boolean;
+		unobserveDisabledPackages():void;
+		observeDisabledPackages():void;
+		loadPackages():void;
+		loadPackage(nameOrPath:string):void;
+		unloadPackages():void;
+		unloadPackage(name:string):void;
+		getLoadedPackage(name:string):any;
+		isPackageLoaded(name:string):boolean;
+		getLoadedPackages():any;
+		getLoadedPackagesForTypes(types:any):any[];
+		resolvePackagePath(name:string):string;
+		isPackageDisabled(name:string):boolean;
+		hasAtomEngine(packagePath:string):boolean;
+		isBundledPackage(name:string):boolean;
+		getPackageDependencies():any;
+		getAvailablePackagePaths():any[];
+		getAvailablePackageNames():any[];
+		getAvailablePackageMetadata():any[];
+	}
+
+	interface INotifications {
+		addInfo: Function;
+		addError: Function;
+		addSuccess: Function;
+		addWarning: Function;
+	}
+
+	interface IThemeManager {
+		// TBD
+	}
+
+	interface IContextMenuManager {
+		// TBD
+	}
+
+	interface IMenuManager {
+		// TBD
+	}
+
+	interface IClipboard {
+		write(text:string, metadata?:any):any;
+		read():string;
+	}
+
+	interface ISyntax {
+		// TBD
+	}
+
+	interface IWindowEventHandler {
+		// TBD
+	}
+
+	interface IAtomStatic extends ISerializationStatic<IAtom> {
+		version: number;
+		loadSettings: IAtomSettings;
+
+		/* Load or create the Atom environment in the given mode */
+		loadOrCreate(mode:'editor'):IAtom;
+		/* Load or create the Atom environment in the given mode */
+		loadOrCreate(mode:'spec'):IAtom;
+		/* Load or create the Atom environment in the given mode */
+		loadOrCreate(mode:string):IAtom;
+
+		loadState(mode:any):void;
+		getStatePath(mode:any):string;
+		getConfigDirPath():string;
+		getStorageDirPath():string;
+		getLoadSettings():IAtomSettings;
+		getCurrentWindow():IBrowserWindow;
+		getVersion():string;
+		isReleasedVersion():boolean;
+
+		new(state:IAtomState):IAtom;
+	}
+
+	class Disposable {
+		constructor(disposalAction:any)
+		dispose():void
+	}
+
+	// https://atom.io/docs/api/v0.106.0/api/classes/Atom.html
+	/* Global Atom class : instance members */
+	interface IAtom {
+		constructor:IAtomStatic;
+
+		state:IAtomState;
+		mode:string;
+		deserializers:IDeserializerManager;
+		config: IConfig;
+		commands: ICommandRegistry;
+		keymaps: IKeymapManager;
+		keymap: IKeymapManager;
+		packages: IPackageManager;
+		themes: IThemeManager;
+		contextManu: IContextMenuManager;
+		menu: IMenuManager;
+		notifications: INotifications; // https://github.com/atom/notifications
+		clipboard:IClipboard;
+		syntax:ISyntax;
+		views: IViewRegistry;
+		windowEventHandler: IWindowEventHandler;
+
+		// really exists? start
+		subscribe:Function;
+		unsubscribe:Function;
+		loadTime:number;
+		workspaceViewParentSelector:string;
+
+		project: IProject;
+		workspaceView: IWorkspaceView;
+		workspace: IWorkspace;
+		// really exists? end
+
+		initialize:Function;
+		// registerRepresentationClass:Function;
+		// registerRepresentationClasses:Function;
+		setBodyPlatformClass:Function;
+		getCurrentWindow():IBrowserWindow;
+		getWindowDimensions:Function;
+		setWindowDimensions:Function;
+		restoreWindowDimensions:Function;
+		storeWindowDimensions:Function;
+		getLoadSettings:Function;
+		deserializeProject: Function;
+		deserializeWorkspaceView:Function;
+		deserializePackageStates:Function;
+		deserializeEditorWindow:Function;
+		startEditorWindow:Function;
+		unloadEditorWindow:Function;
+		loadThemes:Function;
+		watchThemes:Function;
+		open:Function;
+		confirm:Function;
+		showSaveDialog:Function;
+		showSaveDialogSync:Function;
+		openDevTools:Function;
+		toggleDevTools:Function;
+		executeJavaScriptInDevTools:Function;
+		reload:Function;
+		focus:Function;
+		show:Function;
+		hide:Function;
+		setSize:Function;
+		setPosition:Function;
+		center:Function;
+		displayWindow:Function;
+		close:Function;
+		exit:Function;
+		inDevMode:Function;
+		inSpecMode:Function;
+		toggleFullScreen:Function;
+		setFullScreen:Function;
+		isFullScreen:Function;
+		getVersion:Function;
+		isReleasedVersion:Function;
+		getGitHubAuthTokenName:Function;
+		setGitHubAuthToken:Function;
+		getGitHubAuthToken:Function;
+		getConfigDirPath:Function;
+		saveSync:Function;
+		getWindowLoadTime():number;
+		crashMainProcess:Function;
+		crashRenderProcess:Function;
+		beep:Function;
+		getUserInitScriptPath:Function;
+		requireUserInitScript:Function;
+		requireWithGlobals:Function;
+
+		services: any; // TODO: New services api
+	}
+
+	interface IBufferedNodeProcessStatic {
+		new (arg:any):IBufferedNodeProcess;
+	}
+
+	interface IBufferedNodeProcess extends IBufferedProcess {
+	}
+
+	interface IBufferedProcessStatic {
+		new (arg:any):IBufferedProcess;
+	}
+
+	interface IBufferedProcess {
+		process:Function;
+		killed:boolean;
+
+		bufferStream:Function;
+		kill:Function;
+	}
+
+	interface IGitStatic {
+		new(path:any, options:any):IGit;
+	}
+
+	interface IGit {
+	}
+
+	interface ITokenizedBuffer {
+		// TBD
+	}
+
+	interface ITokenizedLine {
+		// TBD
+	}
+
+	interface IToken {
+		// TBD
+	}
+
+	interface IFoldStatic {
+		new (displayBuffer:IDisplayBuffer, marker:IMarker):IFold;
+		// TBD
+	}
+
+	interface IFold {
+		id:number;
+		displayBuffer:IDisplayBuffer;
+		marker:IMarker;
+
+		// TBD
+	}
+
+	interface IDisplayBufferMarkerStatic {
+		new (_arg:{bufferMarker:IMarker; displayBuffer: IDisplayBuffer}):IDisplayBufferMarker;
+	}
+
+	interface IDisplayBufferMarker extends Emissary.IEmitter, Emissary.ISubscriber {
+		constructor:IDisplayBufferMarkerStatic;
+
+		id: number;
+
+		bufferMarkerSubscription:any;
+		oldHeadBufferPosition:TextBuffer.IPoint;
+		oldHeadScreenPosition:TextBuffer.IPoint;
+		oldTailBufferPosition:TextBuffer.IPoint;
+		oldTailScreenPosition:TextBuffer.IPoint;
+		wasValid:boolean;
+
+		bufferMarker: IMarker;
+		displayBuffer: IDisplayBuffer;
+		globalPauseCount:number;
+		globalQueuedEvents:any;
+
+		subscriptions:Emissary.ISubscription[];
+		subscriptionsByObject:any; // WeakMap
+
+		copy(attributes?:any /* maybe IMarker */):IDisplayBufferMarker;
+		getScreenRange():TextBuffer.IRange;
+		setScreenRange(screenRange:any, options:any):any;
+		getBufferRange():TextBuffer.IRange;
+		setBufferRange(bufferRange:any, options:any):any;
+		getPixelRange():any;
+		getHeadScreenPosition():TextBuffer.IPoint;
+		setHeadScreenPosition(screenPosition:any, options:any):any;
+		getHeadBufferPosition():TextBuffer.IPoint;
+		setHeadBufferPosition(bufferPosition:any):any;
+		getTailScreenPosition():TextBuffer.IPoint;
+		setTailScreenPosition(screenPosition:any, options:any):any;
+		getTailBufferPosition():TextBuffer.IPoint;
+		setTailBufferPosition(bufferPosition:any):any;
+		plantTail():boolean;
+		clearTail():boolean;
+		hasTail():boolean;
+		isReversed():boolean;
+		isValid():boolean;
+		isDestroyed():boolean;
+		getAttributes():any;
+		setAttributes(attributes:any):any;
+		matchesAttributes(attributes:any):any;
+		destroy():any;
+		isEqual(other:IDisplayBufferMarker):boolean;
+		compare(other:IDisplayBufferMarker):boolean;
+		inspect():string;
+		destroyed():any;
+		notifyObservers(_arg:any):any;
+	}
+
+	interface ITransaction {
+		// TBD
+	}
+
+	interface IMarker extends Emissary.IEmitter {
+		// Serializable.includeInto(Editor);
+		// Delegator.includeInto(Editor);
+
+		// TBD
+	}
+
+	interface ITaskStatic {
+		new(taskPath:any):ITask;
+	}
+
+	interface ITask {
+		// TBD
+	}
+}
+
+declare var atom:AtomCore.IAtom;
+
+declare module "atom" {
+	import spacePen = require("space-pen");
+
+	var $:typeof spacePen.$;
+	var $$:typeof spacePen.$$;
+	var $$$:typeof spacePen.$$$;
+
+	var BufferedNodeProcess:AtomCore.IBufferedNodeProcessStatic;
+	var BufferedProcess:AtomCore.IBufferedProcessStatic;
+	var Git:AtomCore.IGitStatic;
+	var Point:TextBuffer.IPointStatic;
+	var Range:TextBuffer.IRangeStatic;
+
+	class View extends spacePen.View implements Emissary.ISubscriber {
+		// Subscriber.includeInto(spacePen.View);
+
+		// inherit from Subscriber
+		subscribeWith(eventEmitter:any, methodName:string, args:any):any;
+
+		addSubscription(subscription:any):any;
+
+		subscribe(eventEmitterOrSubscription:any, ...args:any[]):any;
+
+		subscribeToCommand(eventEmitter:any, ...args:any[]):any;
+
+		unsubscribe(object?:any):any;
+	}
+
+	class EditorView extends View {
+		static characterWidthCache:any;
+		static configDefaults:any;
+		static nextEditorId:number;
+
+		static content(params:any):void;
+
+		static classes(_arg?:{mini?:any}):string;
+
+		vScrollMargin:number;
+		hScrollMargin:number;
+		lineHeight:any;
+		charWidth:any;
+		charHeight:any;
+		cursorViews:any[];
+		selectionViews:any[];
+		lineCache:any[];
+		isFocused:any;
+		editor:AtomCore.IEditor;
+		attached:any;
+		lineOverdraw:number;
+		pendingChanges:any[];
+		newCursors:any[];
+		newSelections:any[];
+		redrawOnReattach:any;
+		bottomPaddingInLines:number;
+		active:boolean;
+
+		id:number;
+
+		gutter:AtomCore.IGutterView;
+		overlayer:JQuery;
+		scrollView:JQuery;
+		renderedLines:JQuery;
+		underlayer:JQuery;
+		hiddenInput:JQuery;
+		verticalScrollbar:JQuery;
+		verticalScrollbarContent:JQuery;
+
+		constructor(editor:AtomCore.IEditor);
+
+		initialize(editorOrOptions:AtomCore.IEditor):void; // return type are same as editor method.
+		initialize(editorOrOptions?:{editor: AtomCore.IEditor; mini:any; placeholderText:any}):void;
+
+		initialize(editorOrOptions:{}):void; // compatible for spacePen.View
+
+		bindKeys():void;
+
+		getEditor():AtomCore.IEditor;
+
+		getText():string;
+
+		setText(text:string):void;
+
+		insertText(text:string, options?:any):TextBuffer.IRange[];
+
+		setHeightInLines(heightInLines:number):number;
+
+		setWidthInChars(widthInChars:number):number;
+
+		pageDown():void;
+
+		pageUp():void;
+
+		getPageRows():number;
+
+		setShowInvisibles(showInvisibles:boolean):void;
+
+		setInvisibles(invisibles:{ eol:string; space: string; tab: string; cr: string; }):void;
+
+		setShowIndentGuide(showIndentGuide:boolean):void;
+
+		setPlaceholderText(placeholderText:string):void;
+
+		getPlaceholderText():string;
+
+		checkoutHead():boolean;
+
+		configure():Emissary.ISubscription;
+
+		handleEvents():void;
+
+		handleInputEvents():void;
+
+		bringHiddenInputIntoView():JQuery;
+
+		selectOnMousemoveUntilMouseup():any;
+
+		afterAttach(onDom:any):any;
+
+		edit(editor:AtomCore.IEditor):any;
+
+		getModel():AtomCore.IEditor;
+
+		setModel(editor:AtomCore.IEditor):any;
+
+		showBufferConflictAlert(editor:AtomCore.IEditor):any;
+
+		scrollTop(scrollTop:number, options?:any):any;
+
+		scrollBottom(scrollBottom?:number):any;
+
+		scrollLeft(scrollLeft?:number):number;
+
+		scrollRight(scrollRight?:number):any;
+
+		scrollToBottom():any;
+
+		scrollToCursorPosition():any;
+
+		scrollToBufferPosition(bufferPosition:any, options:any):any;
+
+		scrollToScreenPosition(screenPosition:any, options:any):any;
+
+		scrollToPixelPosition(pixelPosition:any, options:any):any;
+
+		highlightFoldsContainingBufferRange(bufferRange:any):any;
+
+		saveScrollPositionForEditor():any;
+
+		toggleSoftTabs():any;
+
+		toggleSoftWrap():any;
+
+		calculateWidthInChars():number;
+
+		calculateHeightInLines():number;
+
+		getScrollbarWidth():number;
+
+		setSoftWrap(softWrap:boolean):any;
+
+		setFontSize(fontSize:number):any;
+
+		getFontSize():number;
+
+		setFontFamily(fontFamily?:string):any;
+
+		getFontFamily():string;
+
+		setLineHeight(lineHeight:number):any;
+
+		redraw():any;
+
+		splitLeft():any;
+
+		splitRight():any;
+
+		splitUp():any;
+
+		splitDown():any;
+
+		getPane():any; // return type are PaneView
+
+		remove(selector:any, keepData:any):any;
+
+		beforeRemove():any;
+
+		getCursorView(index?:number):any; // return type are CursorView
+
+		getCursorViews():any[]; // return type are CursorView[]
+
+		addCursorView(cursor:any, options:any):any; // return type are CursorView
+
+		removeCursorView(cursorView:any):any;
+
+		getSelectionView(index?:number):any; // return type are SelectionView
+
+		getSelectionViews():any[]; // return type are SelectionView[]
+
+		addSelectionView(selection:any):any;
+
+		removeSelectionView(selectionView:any):any;
+
+		removeAllCursorAndSelectionViews():any[];
+
+		appendToLinesView(view:any):any;
+
+		scrollVertically(pixelPosition:any, _arg:any):any;
+
+		scrollHorizontally(pixelPosition:any):any;
+
+		calculateDimensions():number;
+
+		recalculateDimensions():any;
+
+		updateLayerDimensions():any;
+
+		isHidden():boolean;
+
+		clearRenderedLines():void;
+
+		resetDisplay():any;
+
+		requestDisplayUpdate():any;
+
+		updateDisplay(options?:any):any;
+
+		updateCursorViews():any;
+
+		shouldUpdateCursor(cursorView:any):any;
+
+		updateSelectionViews():any[];
+
+		shouldUpdateSelection(selectionView:any):any;
+
+		syncCursorAnimations():any[];
+
+		autoscroll(suppressAutoscroll?:any):any[];
+
+		updatePlaceholderText():any;
+
+		updateRenderedLines(scrollViewWidth:any):any;
+
+		computeSurroundingEmptyLineChanges(change:any):any;
+
+		computeIntactRanges(renderFrom:any, renderTo:any):any;
+
+		truncateIntactRanges(intactRanges:any, renderFrom:any, renderTo:any):any;
+
+		clearDirtyRanges(intactRanges:any):any;
+
+		clearLine(lineElement:any):any;
+
+		fillDirtyRanges(intactRanges:any, renderFrom:any, renderTo:any):any;
+
+		updatePaddingOfRenderedLines():any;
+
+		getFirstVisibleScreenRow():number;
+
+		getLastVisibleScreenRow():number;
+
+		isScreenRowVisible():boolean;
+
+		handleScreenLinesChange(change:any):any;
+
+		buildLineElementForScreenRow(screenRow:any):any;
+
+		buildLineElementsForScreenRows(startRow:any, endRow:any):any;
+
+		htmlForScreenRows(startRow:any, endRow:any):any;
+
+		htmlForScreenLine(screenLine:any, screenRow:any):any;
+
+		buildIndentation(screenRow:any, editor:any):any;
+
+		buildHtmlEndOfLineInvisibles(screenLine:any):any;
+
+		getEndOfLineInvisibles(screenLine:any):any;
+
+		lineElementForScreenRow(screenRow:any):any;
+
+		toggleLineCommentsInSelection():any;
+
+		pixelPositionForBufferPosition(position:any):any;
+
+		pixelPositionForScreenPosition(position:any):any;
+
+		positionLeftForLineAndColumn(lineElement:any, screenRow:any, screenColumn:any):any;
+
+		measureToColumn(lineElement:any, tokenizedLine:any, screenColumn:any):any;
+
+		getCharacterWidthCache(scopes:any, char:any):any;
+
+		setCharacterWidthCache(scopes:any, char:any, val:any):any;
+
+		clearCharacterWidthCache():any;
+
+		pixelOffsetForScreenPosition(position:any):any;
+
+		screenPositionFromMouseEvent(e:any):any;
+
+		highlightCursorLine():any;
+
+		copyPathToClipboard():any;
+
+		buildLineHtml(_arg:any):any;
+
+		updateScopeStack(line:any, scopeStack:any, desiredScopes:any):any;
+
+		pushScope(line:any, scopeStack:any, scope:any):any;
+
+		popScope(line:any, scopeStack:any):any;
+
+		buildEmptyLineHtml(showIndentGuide:any, eolInvisibles:any, htmlEolInvisibles:any, indentation:any, editor:any, mini:any):any;
+
+		replaceSelectedText(replaceFn:(str:string)=>string):any;
+
+		consolidateSelections(e:any):any;
+
+		logCursorScope():any;
+
+		logScreenLines(start:any, end:any):any;
+
+		logRenderedLines():any;
+	}
+
+	class ScrollView extends View {
+		// TBD
+	}
+
+	interface ISelectListItem {
+		/** e.g. application:about */
+		eventName:string;
+		/** e.g. Application: About */
+		eventDescription:string;
+	}
+
+	class SelectListView extends View {
+		static content():any;
+
+		maxItems:number;
+		scheduleTimeout:any;
+		inputThrottle:number;
+		cancelling:boolean;
+		items:any[];
+		list:JQuery;
+		filterEditorView: JQuery;
+
+		previouslyFocusedElement:JQuery;
+
+		initialize():any;
+
+		schedulePopulateList():number;
+
+		setItems(items:any[]):any;
+
+		setError(message?:string):any;
+
+		setLoading(message?:string):any;
+
+		getFilterQuery():string;
+
+		populateList():any;
+
+		getEmptyMessage(itemCount?:any, filteredItemCount?:any):string;
+
+		setMaxItems(maxItems:number):void;
+
+		selectPreviousItemView():any;
+
+		selectNextItemView():any;
+
+		selectItemView(view:any):any;
+
+		scrollToItemView(view:any):any;
+
+		getSelectedItemView():any;
+
+		getSelectedItem():any;
+
+		confirmSelection():any;
+
+		viewForItem(item:any):JQuery|string|HTMLElement|View; // You must override this method!
+		confirmed(item:any):any; // You must override this method!
+		getFilterKey():any;
+
+		focusFilterEditor():any;
+
+		storeFocusedElement():any;
+
+		restoreFocus():any;
+
+		cancelled():any;
+
+		cancel():any;
+	}
+
+
+
+	var WorkspaceView:AtomCore.IWorkspaceViewStatic;
+
+	var Task:AtomCore.ITaskStatic;
+	var Workspace:AtomCore.IWorkspaceStatic;
+}
diff --git a/atom/tsconfig.json b/atom/tsconfig.json
new file mode 100644
index 0000000000..eeea2c90a3
--- /dev/null
+++ b/atom/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "atom-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/atpl/atpl-tests.ts b/atpl/atpl-tests.ts
index f1751d9015..287c75ed38 100644
--- a/atpl/atpl-tests.ts
+++ b/atpl/atpl-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="atpl.d.ts" />
 
 import atpl = require('atpl');
 
diff --git a/atpl/atpl.d.ts b/atpl/atpl.d.ts
deleted file mode 100644
index a966a8383f..0000000000
--- a/atpl/atpl.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Type definitions for atpl
-// Project: https://github.com/soywiz/atpl.js
-// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/atpl.d.ts
-
-declare module "atpl" {
-	export function compile(templateString: string, options: any): (context:any) => string;
-	export function __express(filename: string, options: any, callback: Function): any;
-
-	export function registerExtension(items: any): void;
-	export function registerTags(items: any): void;
-	export function registerFunctions(items: any): void;
-	export function registerFilters(items: any): void;
-	export function registerTests(items: any): void;
-
-	export function renderFileSync(viewsPath: string, filename: string, parameters: any, cache: boolean ): string;
-	export function renderFile(viewsPath: string, filename: string, parameters: any, cache: boolean, done: (err: Error, result?: string) => void): void;
-}
diff --git a/atpl/index.d.ts b/atpl/index.d.ts
new file mode 100644
index 0000000000..1a97a957ff
--- /dev/null
+++ b/atpl/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for atpl
+// Project: https://github.com/soywiz/atpl.js
+// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/atpl.d.ts
+
+
+export declare function compile(templateString: string, options: any): (context: any) => string;
+export declare function __express(filename: string, options: any, callback: Function): any;
+
+export declare function registerExtension(items: any): void;
+export declare function registerTags(items: any): void;
+export declare function registerFunctions(items: any): void;
+export declare function registerFilters(items: any): void;
+export declare function registerTests(items: any): void;
+
+export declare function renderFileSync(viewsPath: string, filename: string, parameters: any, cache: boolean): string;
+export declare function renderFile(viewsPath: string, filename: string, parameters: any, cache: boolean, done: (err: Error, result?: string) => void): void;
diff --git a/atpl/tsconfig.json b/atpl/tsconfig.json
new file mode 100644
index 0000000000..131c3604ae
--- /dev/null
+++ b/atpl/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "atpl-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/auth0-angular/auth0-angular-tests.ts b/auth0-angular/auth0-angular-tests.ts
index 1abd9fdc3d..f9700c1410 100644
--- a/auth0-angular/auth0-angular-tests.ts
+++ b/auth0-angular/auth0-angular-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="auth0-angular.d.ts" />
+
 
 var authProvider: auth0.angular.IAuth0ServiceProvider;
 
diff --git a/auth0-angular/auth0-angular.d.ts b/auth0-angular/auth0-angular.d.ts
deleted file mode 100644
index fef9dbd3ef..0000000000
--- a/auth0-angular/auth0-angular.d.ts
+++ /dev/null
@@ -1,167 +0,0 @@
-// Type definitions for auth0-angular
-// Project: https://github.com/auth0/auth0-angular
-// Definitions by: Matt Emory <https://github.com/homesar>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace auth0.angular {
-
-    interface IAuth0ClientOptions {
-        /**
-        * Login url if you're using ngRoute
-        */
-        loginUrl?: string;
-
-        /**
-        * Login state if you're using ui-router
-        */
-        loginState?: string;
-
-        /**
-        * Client identifier of your Auth0 application
-        */
-        clientID: string;
-
-        /**
-        * Domain of your Auth0 account
-        */
-        domain: string;
-
-        /**
-        * Use single signon
-        */
-        sso?: boolean;
-    }
-
-    interface ITokenOptions {
-
-        targetClientId?: string;
-        api?: string;
-    }
-
-    interface IAuth0Options {
-        /**
-        * Connection name
-        */
-        connection?: string;
-
-        /**
-        * Username
-        */
-        username?: string;
-
-        /**
-        * Email address
-        */
-        email?: string;
-    }
-
-    interface ISuccessCallback {
-        (profile?: string, idToken?: string, accessToken?: string, state?: string, refreshToken?: string): void;
-    }
-
-    interface IErrorCallback {
-        (error: any): void;
-    }
-
-    interface IAuth0Service {
-        /**
-        * Hooks to internal Angular events so that a user will be redirected to the login page if trying to visit a restricted resource
-        */
-        hookEvents(): void;
-
-        /**
-        * Performs a token delegation request exchanging th ecurrent token for another one.
-        * @param options Token options
-        */
-        getToken(options?: ITokenOptions): ng.IPromise<any>;
-
-        /**
-        * Refreshes the Id token
-        * @param refreshToken Refresh token to use when renewing
-        */
-        refreshIdToken(refreshToken: string): ng.IPromise<any>;
-
-        /**
-        * Renews the Id Token with the same scopes as the original token
-        * @param id_token Id Token
-        */
-        renewIdToken(id_token: string): ng.IPromise<any>;
-
-        /**
-        * Logs in a user, returning tokens and profile information
-        * @param options Options to bypass displaying the Lock UI
-        * @param successCallback Callback on successful login
-        * @param errorCallback Callback on failed login
-        */
-        signin(options?: IAuth0Options, successCallback?: ISuccessCallback, errorCallback?: IErrorCallback): void;
-
-        /**
-        * Displays Lock in signup mode, and logs the user in immediately after a successful signup.
-        * @param options Options to bypass displaying the Lock UI
-        * @param successCallback Callback on successful signup
-        * @param errorCallback Callback on failed signup
-        */
-        signup(options?: IAuth0Options, successCallback?: ISuccessCallback, errorCallback?: IErrorCallback): void;
-
-        /**
-        * Performs the "forgot your password" flow.
-        * @param options Options to bypass displaying the Lock UI
-        * @param successCallback Callback on successful reset
-        * @param errorCallback Callback on failed reset
-        */
-        reset(options?: IAuth0Options, successCallback?: ISuccessCallback, errorCallback?: IErrorCallback): void;
-
-        /**
-        * Validates the user
-        * @param options Options to bypass displaying the Lock UI
-        * @param successCallback Callback on successful validation
-        * @param errorCallback Callback on failed validation
-        */
-        validateUser(options: IAuth0Options, successCallback?: ISuccessCallback, errorCallback?: IErrorCallback): void;
-
-        /**
-        * Logs the user out locally by deleting their token from local storage.
-        */
-        signout(): void;
-
-        /**
-        * Reauthenticates the user by using a stored profile and token without going through the login flow.
-        * @param profile Profile of the user
-        * @param idToken Id token
-        * @param accessToken Access token
-        * @param state State
-        * @param refreshToken Flag to indicate refreshing the token
-        */
-        authenticate(profile?: any, idToken?: string, accessToken?: string, state?: any, refreshToken?: boolean): ng.IPromise<any>;
-
-        /**
-        * Gets the user's profile
-        * @param idToken Id token
-        */
-        getProfile(idToken?: string): ng.IPromise<any>;
-
-        // Properties
-
-        accessToken: string;
-        idToken: string;
-        profile: any;
-        isAuthenticated: boolean;
-        config: any;
-    }
-
-    interface IAuth0ServiceProvider {
-        /**
-        * Configures the auth service
-        * @param options Client options passed into Auth0
-        */
-        init(options: IAuth0ClientOptions): void;
-
-        /**
-        * @param event Name of the event to handle.
-        * @param handler Event handler
-        */
-        on(event: string, handler: (...args: any[]) => any): void;
-    }
-}
diff --git a/auth0-angular/index.d.ts b/auth0-angular/index.d.ts
new file mode 100644
index 0000000000..0ecca371bd
--- /dev/null
+++ b/auth0-angular/index.d.ts
@@ -0,0 +1,167 @@
+// Type definitions for auth0-angular
+// Project: https://github.com/auth0/auth0-angular
+// Definitions by: Matt Emory <https://github.com/homesar>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare namespace auth0.angular {
+
+    interface IAuth0ClientOptions {
+        /**
+        * Login url if you're using ngRoute
+        */
+        loginUrl?: string;
+
+        /**
+        * Login state if you're using ui-router
+        */
+        loginState?: string;
+
+        /**
+        * Client identifier of your Auth0 application
+        */
+        clientID: string;
+
+        /**
+        * Domain of your Auth0 account
+        */
+        domain: string;
+
+        /**
+        * Use single signon
+        */
+        sso?: boolean;
+    }
+
+    interface ITokenOptions {
+
+        targetClientId?: string;
+        api?: string;
+    }
+
+    interface IAuth0Options {
+        /**
+        * Connection name
+        */
+        connection?: string;
+
+        /**
+        * Username
+        */
+        username?: string;
+
+        /**
+        * Email address
+        */
+        email?: string;
+    }
+
+    interface ISuccessCallback {
+        (profile?: string, idToken?: string, accessToken?: string, state?: string, refreshToken?: string): void;
+    }
+
+    interface IErrorCallback {
+        (error: any): void;
+    }
+
+    interface IAuth0Service {
+        /**
+        * Hooks to internal Angular events so that a user will be redirected to the login page if trying to visit a restricted resource
+        */
+        hookEvents(): void;
+
+        /**
+        * Performs a token delegation request exchanging th ecurrent token for another one.
+        * @param options Token options
+        */
+        getToken(options?: ITokenOptions): ng.IPromise<any>;
+
+        /**
+        * Refreshes the Id token
+        * @param refreshToken Refresh token to use when renewing
+        */
+        refreshIdToken(refreshToken: string): ng.IPromise<any>;
+
+        /**
+        * Renews the Id Token with the same scopes as the original token
+        * @param id_token Id Token
+        */
+        renewIdToken(id_token: string): ng.IPromise<any>;
+
+        /**
+        * Logs in a user, returning tokens and profile information
+        * @param options Options to bypass displaying the Lock UI
+        * @param successCallback Callback on successful login
+        * @param errorCallback Callback on failed login
+        */
+        signin(options?: IAuth0Options, successCallback?: ISuccessCallback, errorCallback?: IErrorCallback): void;
+
+        /**
+        * Displays Lock in signup mode, and logs the user in immediately after a successful signup.
+        * @param options Options to bypass displaying the Lock UI
+        * @param successCallback Callback on successful signup
+        * @param errorCallback Callback on failed signup
+        */
+        signup(options?: IAuth0Options, successCallback?: ISuccessCallback, errorCallback?: IErrorCallback): void;
+
+        /**
+        * Performs the "forgot your password" flow.
+        * @param options Options to bypass displaying the Lock UI
+        * @param successCallback Callback on successful reset
+        * @param errorCallback Callback on failed reset
+        */
+        reset(options?: IAuth0Options, successCallback?: ISuccessCallback, errorCallback?: IErrorCallback): void;
+
+        /**
+        * Validates the user
+        * @param options Options to bypass displaying the Lock UI
+        * @param successCallback Callback on successful validation
+        * @param errorCallback Callback on failed validation
+        */
+        validateUser(options: IAuth0Options, successCallback?: ISuccessCallback, errorCallback?: IErrorCallback): void;
+
+        /**
+        * Logs the user out locally by deleting their token from local storage.
+        */
+        signout(): void;
+
+        /**
+        * Reauthenticates the user by using a stored profile and token without going through the login flow.
+        * @param profile Profile of the user
+        * @param idToken Id token
+        * @param accessToken Access token
+        * @param state State
+        * @param refreshToken Flag to indicate refreshing the token
+        */
+        authenticate(profile?: any, idToken?: string, accessToken?: string, state?: any, refreshToken?: boolean): ng.IPromise<any>;
+
+        /**
+        * Gets the user's profile
+        * @param idToken Id token
+        */
+        getProfile(idToken?: string): ng.IPromise<any>;
+
+        // Properties
+
+        accessToken: string;
+        idToken: string;
+        profile: any;
+        isAuthenticated: boolean;
+        config: any;
+    }
+
+    interface IAuth0ServiceProvider {
+        /**
+        * Configures the auth service
+        * @param options Client options passed into Auth0
+        */
+        init(options: IAuth0ClientOptions): void;
+
+        /**
+        * @param event Name of the event to handle.
+        * @param handler Event handler
+        */
+        on(event: string, handler: (...args: any[]) => any): void;
+    }
+}
diff --git a/auth0-angular/tsconfig.json b/auth0-angular/tsconfig.json
new file mode 100644
index 0000000000..2fa462742c
--- /dev/null
+++ b/auth0-angular/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "auth0-angular-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/auth0.lock/auth0.lock-tests.ts b/auth0-lock/auth0.lock-tests.ts
similarity index 79%
rename from auth0.lock/auth0.lock-tests.ts
rename to auth0-lock/auth0.lock-tests.ts
index fd646ee1bb..070ef984df 100644
--- a/auth0.lock/auth0.lock-tests.ts
+++ b/auth0-lock/auth0.lock-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../auth0/auth0.d.ts" />
-/// <reference path="auth0.lock.d.ts" />
+/// <reference types="auth0" />
+
 
 var lock: Auth0LockStatic = new Auth0Lock("dsa7d77dsa7d7", "mine.auth0.com");
 
diff --git a/auth0-lock/index.d.ts b/auth0-lock/index.d.ts
new file mode 100644
index 0000000000..9d95bed3e2
--- /dev/null
+++ b/auth0-lock/index.d.ts
@@ -0,0 +1,83 @@
+// Type definitions for Auth0Widget.js
+// Project: http://auth0.com
+// Definitions by: Robert McLaws <https://github.com/advancedrei>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="auth0" />
+
+interface Auth0LockPopupOptions {
+    width: number;
+    height: number;
+    left: number;
+    top: number;
+}
+
+interface Auth0LockOptions {
+    authParams?: any;
+    callbackURL?: string;
+    connections?: string[];
+    container?: string;
+    closable?: boolean;
+    dict?: any;
+    defaultUserPasswordConnection?: string;
+    defaultADUsernameFromEmailPrefix?: boolean;
+    disableResetAction?: boolean;
+    disableSignupAction?: boolean;
+    focusInput?: boolean;
+    forceJSONP?: boolean;
+    gravatar?: boolean;
+    integratedWindowsLogin?: boolean;
+    icon?: string;
+    loginAfterSignup?: boolean;
+    popup?: boolean;
+    popupOptions?: Auth0LockPopupOptions;
+    rememberLastLogin?: boolean;
+    resetLink?: string;
+    responseType?: string;
+    signupLink?: string;
+    socialBigButtons?: boolean;
+    sso?: boolean;
+    theme?: string;
+    usernameStyle?: any;
+}
+
+interface Auth0LockConstructorOptions {
+    cdn?: string;
+    assetsUrl?: string;
+    useCordovaSocialPlugins?: boolean;
+}
+
+interface Auth0LockStatic {
+    new (clientId: string, domain: string, options?: Auth0LockConstructorOptions): Auth0LockStatic;
+
+    show(): void;
+    show(options: Auth0LockOptions): void;
+    show(callback: (error?: Auth0Error, profile?: Auth0UserProfile, token?: string) => void) : void;
+    show(options: Auth0LockOptions, callback: (error?: Auth0Error, profile?: Auth0UserProfile, token?: string) => void) : void;
+
+    showSignin(): void;
+    showSignin(options: Auth0LockOptions): void;
+    showSignin(callback: (error?: Auth0Error, profile?: Auth0UserProfile, token?: string) => void) : void;
+    showSignin(options: Auth0LockOptions, callback: (error?: Auth0Error, profile?: Auth0UserProfile, token?: string) => void) : void;
+
+    showSignup(): void;
+    showSignup(options: Auth0LockOptions): void;
+    showSignup(callback: (error?: Auth0Error) => void) : void;
+    showSignup(options: Auth0LockOptions, callback: (error?: Auth0Error) => void) : void;
+
+    showReset(): void;
+    showReset(options: Auth0LockOptions): void;
+    showReset(callback: (error?: Auth0Error) => void) : void;
+    showReset(options: Auth0LockOptions, callback: (error?: Auth0Error) => void) : void;
+
+    hide(callback: () => void): void;
+    logout(callback: () => void): void;
+
+    getClient(): Auth0Static;
+}
+
+declare var Auth0Lock: Auth0LockStatic;
+
+declare module "auth0-lock" {
+    export = Auth0Lock;
+}
diff --git a/auth0-lock/tsconfig.json b/auth0-lock/tsconfig.json
new file mode 100644
index 0000000000..d6afa58500
--- /dev/null
+++ b/auth0-lock/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "auth0.lock-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/auth0.lock/auth0.lock.d.ts b/auth0.lock/auth0.lock.d.ts
deleted file mode 100644
index 15f767984b..0000000000
--- a/auth0.lock/auth0.lock.d.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-// Type definitions for Auth0Widget.js
-// Project: http://auth0.com
-// Definitions by: Robert McLaws <https://github.com/advancedrei>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../auth0/auth0.d.ts" />
-
-interface Auth0LockPopupOptions {
-    width: number;
-    height: number;
-    left: number;
-    top: number;
-}
-
-interface Auth0LockOptions {
-    authParams?: any;
-    callbackURL?: string;
-    connections?: string[];
-    container?: string;
-    closable?: boolean;
-    dict?: any;
-    defaultUserPasswordConnection?: string;
-    defaultADUsernameFromEmailPrefix?: boolean;
-    disableResetAction?: boolean;
-    disableSignupAction?: boolean;
-    focusInput?: boolean;
-    forceJSONP?: boolean;
-    gravatar?: boolean;
-    integratedWindowsLogin?: boolean;
-    icon?: string;
-    loginAfterSignup?: boolean;
-    popup?: boolean;
-    popupOptions?: Auth0LockPopupOptions;
-    rememberLastLogin?: boolean;
-    resetLink?: string;
-    responseType?: string;
-    signupLink?: string;
-    socialBigButtons?: boolean;
-    sso?: boolean;
-    theme?: string;
-    usernameStyle?: any;
-}
-
-interface Auth0LockConstructorOptions {
-    cdn?: string;
-    assetsUrl?: string;
-    useCordovaSocialPlugins?: boolean;
-}
-
-interface Auth0LockStatic {
-    new (clientId: string, domain: string, options?: Auth0LockConstructorOptions): Auth0LockStatic;
-
-    show(): void;
-    show(options: Auth0LockOptions): void;
-    show(callback: (error?: Auth0Error, profile?: Auth0UserProfile, token?: string) => void) : void;
-    show(options: Auth0LockOptions, callback: (error?: Auth0Error, profile?: Auth0UserProfile, token?: string) => void) : void;
-
-    showSignin(): void;
-    showSignin(options: Auth0LockOptions): void;
-    showSignin(callback: (error?: Auth0Error, profile?: Auth0UserProfile, token?: string) => void) : void;
-    showSignin(options: Auth0LockOptions, callback: (error?: Auth0Error, profile?: Auth0UserProfile, token?: string) => void) : void;
-
-    showSignup(): void;
-    showSignup(options: Auth0LockOptions): void;
-    showSignup(callback: (error?: Auth0Error) => void) : void;
-    showSignup(options: Auth0LockOptions, callback: (error?: Auth0Error) => void) : void;
-
-    showReset(): void;
-    showReset(options: Auth0LockOptions): void;
-    showReset(callback: (error?: Auth0Error) => void) : void;
-    showReset(options: Auth0LockOptions, callback: (error?: Auth0Error) => void) : void;
-
-    hide(callback: () => void): void;
-    logout(callback: () => void): void;
-
-    getClient(): Auth0Static;
-}
-
-declare var Auth0Lock: Auth0LockStatic;
-
-declare module "auth0-lock" {
-    export = Auth0Lock;
-}
diff --git a/auth0.widget/auth0.widget-tests.ts b/auth0.widget/auth0.widget-tests.ts
index 012e9b9769..79f1a2a7a7 100644
--- a/auth0.widget/auth0.widget-tests.ts
+++ b/auth0.widget/auth0.widget-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../auth0/auth0.d.ts" />
-/// <reference path="auth0.widget.d.ts" />
+/// <reference types="auth0" />
+
 
 var widget: Auth0WidgetStatic = new Auth0Widget({
     domain: 'mine.auth0.com',
diff --git a/auth0.widget/auth0.widget.d.ts b/auth0.widget/auth0.widget.d.ts
deleted file mode 100644
index 20694526c3..0000000000
--- a/auth0.widget/auth0.widget.d.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-// Type definitions for Auth0Widget.js
-// Project: http://auth0.com
-// Definitions by: Robert McLaws <https://github.com/advancedrei>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../auth0/auth0.d.ts" />
-
-
-interface Auth0WidgetStatic {
-    new(params: Auth0Constructor): Auth0WidgetStatic;
-
-    getClient(): Auth0Static;
-    getProfile(token: string, callback: Function): Auth0UserProfile;
-    parseHash(hash: string): Auth0DecodedHash;
-    reset(options: Auth0Options, callback?: Function): Auth0WidgetStatic;
-    signin(options: Auth0Options, widgetLoadedCallback?: Function, popupCallback?: Function): Auth0WidgetStatic;
-    signup(options: Auth0Options, callback: (error?: Auth0Error, profile?: Auth0UserProfile, id_token?: string, access_token?: string, state?: string) => any): Auth0WidgetStatic;
- }
-
-interface Auth0Constructor extends Auth0ClientOptions {
-     assetsUrl?: string;
-     cdn?: string;
-     dict?: any;
- }
-
-interface Auth0Options {
-     access_token?: string;
-     connections?: string[];
-     container?: string;
-     enableReturnUserExperience?: boolean;
-     extraParameters?: any;
-     icon?: string;
-     protocol?: string;
-     request_id?: string;
-     scope?: string;
-     showIcon?: boolean;
-     showForgot?: boolean;
-     showSignup?: boolean;
-     state?: any;
-     userPwdConnectionName?: string;
-     username_style?: string;
-}
-
-declare var Auth0Widget: Auth0WidgetStatic;
-
-declare module "Auth0Widget" {
-    export = Auth0Widget
-}
diff --git a/auth0.widget/index.d.ts b/auth0.widget/index.d.ts
new file mode 100644
index 0000000000..ed6a2f341b
--- /dev/null
+++ b/auth0.widget/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for Auth0Widget.js
+// Project: http://auth0.com
+// Definitions by: Robert McLaws <https://github.com/advancedrei>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="auth0" />
+
+
+interface Auth0WidgetStatic {
+    new(params: Auth0Constructor): Auth0WidgetStatic;
+
+    getClient(): Auth0Static;
+    getProfile(token: string, callback: Function): Auth0UserProfile;
+    parseHash(hash: string): Auth0DecodedHash;
+    reset(options: Auth0Options, callback?: Function): Auth0WidgetStatic;
+    signin(options: Auth0Options, widgetLoadedCallback?: Function, popupCallback?: Function): Auth0WidgetStatic;
+    signup(options: Auth0Options, callback: (error?: Auth0Error, profile?: Auth0UserProfile, id_token?: string, access_token?: string, state?: string) => any): Auth0WidgetStatic;
+ }
+
+interface Auth0Constructor extends Auth0ClientOptions {
+     assetsUrl?: string;
+     cdn?: string;
+     dict?: any;
+ }
+
+interface Auth0Options {
+     access_token?: string;
+     connections?: string[];
+     container?: string;
+     enableReturnUserExperience?: boolean;
+     extraParameters?: any;
+     icon?: string;
+     protocol?: string;
+     request_id?: string;
+     scope?: string;
+     showIcon?: boolean;
+     showForgot?: boolean;
+     showSignup?: boolean;
+     state?: any;
+     userPwdConnectionName?: string;
+     username_style?: string;
+}
+
+declare var Auth0Widget: Auth0WidgetStatic;
diff --git a/auth0.widget/tsconfig.json b/auth0.widget/tsconfig.json
new file mode 100644
index 0000000000..df978e1482
--- /dev/null
+++ b/auth0.widget/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "auth0.widget-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/auth0/auth0-tests.ts b/auth0/auth0-tests.ts
index 9cd903b306..7f48274eaf 100644
--- a/auth0/auth0-tests.ts
+++ b/auth0/auth0-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../auth0/auth0.d.ts" />
+/// <reference types="auth0" />
 
 var auth0 = new Auth0({
     domain: 'mine.auth0.com',
diff --git a/auth0/auth0.d.ts b/auth0/index.d.ts
similarity index 100%
rename from auth0/auth0.d.ts
rename to auth0/index.d.ts
diff --git a/auth0/tsconfig.json b/auth0/tsconfig.json
new file mode 100644
index 0000000000..0a16ee2b8f
--- /dev/null
+++ b/auth0/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "auth0-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/auto-launch/auto-launch-tests.ts b/auto-launch/auto-launch-tests.ts
index 24d6aad14a..ae6ace9620 100644
--- a/auto-launch/auto-launch-tests.ts
+++ b/auto-launch/auto-launch-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="auto-launch.d.ts" />
+
 
 import AutoLaunch = require('auto-launch');
 
diff --git a/auto-launch/auto-launch.d.ts b/auto-launch/index.d.ts
similarity index 100%
rename from auto-launch/auto-launch.d.ts
rename to auto-launch/index.d.ts
diff --git a/auto-launch/tsconfig.json b/auto-launch/tsconfig.json
new file mode 100644
index 0000000000..369ba5cc5c
--- /dev/null
+++ b/auto-launch/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "auto-launch-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/autobahn/autobahn-tests.ts b/autobahn/autobahn-tests.ts
index 5cdc4f95c6..141a43547e 100644
--- a/autobahn/autobahn-tests.ts
+++ b/autobahn/autobahn-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="autobahn.d.ts"/>
-
 import autobahn = require("autobahn");
 
 class MyClass {
diff --git a/autobahn/autobahn.d.ts b/autobahn/autobahn.d.ts
deleted file mode 100644
index 9ca4c562cc..0000000000
--- a/autobahn/autobahn.d.ts
+++ /dev/null
@@ -1,268 +0,0 @@
-// Type definitions for AutobahnJS v0.9.6
-// Project: http://autobahn.ws/js/
-// Definitions by: Elad Zelingher <https://github.com/darkl/>, Andy Hawkins <https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../when/when.d.ts" />
-
-declare namespace autobahn {
-
-    export class Session {
-        id: number;
-        realm: string;
-        isOpen: boolean;
-        features: any;
-        caller_disclose_me: boolean;
-        publisher_disclose_me: boolean;
-        subscriptions: ISubscription[][];
-        registrations: IRegistration[];
-
-        constructor(transport: ITransport, defer: DeferFactory, challenge: OnChallengeHandler);
-
-        join(realm: string, authmethods: string[], authid: string): void;
-
-        leave(reason: string, message: string): void;
-
-        call<TResult>(procedure: string, args?: any[], kwargs?: any, options?: ICallOptions): When.Promise<TResult>;
-
-        publish(topic: string, args?: any[], kwargs?: any, options?: IPublishOptions): When.Promise<IPublication>;
-
-        subscribe(topic: string, handler: SubscribeHandler, options?: ISubscribeOptions): When.Promise<ISubscription>;
-
-        register(procedure: string, endpoint: RegisterEndpoint, options?: IRegisterOptions): When.Promise<IRegistration>;
-
-        unsubscribe(subscription: ISubscription): When.Promise<any>;
-
-        unregister(registration: IRegistration): When.Promise<any>;
-
-        prefix(prefix: string, uri: string): void;
-
-        resolve(curie: string): string;
-
-        onjoin: (roleFeatures: any) => void;
-        onleave: (reason: string, details: any) => void;
-    }
-
-    interface IInvocation {
-        caller?: number;
-        progress?: boolean;
-        procedure: string;
-    }
-
-    class Invocation implements IInvocation {
-        constructor(caller?: number, progress?: boolean, procedure?: string);
-
-        procedure: string;
-    }
-
-    interface IEvent {
-        publication: number;
-        publisher?: number;
-        topic: string;
-    }
-
-    class Event implements IEvent {
-        constructor(publication?: number, publisher?: string, topic?: string);
-
-        publication: number;
-        topic: string;
-    }
-
-    interface IResult {
-        args: any[];
-        kwargs: any;
-    }
-
-    class Result implements IResult {
-        constructor(args?: any[], kwargs?: any);
-
-        args: any[];
-        kwargs: any;
-    }
-
-    interface IError {
-        error: string;
-        args: any[];
-        kwargs: any;
-    }
-
-    class Error implements IError {
-        constructor(error?: string, args?: any[], kwargs?: any);
-
-        error: string;
-        args: any[];
-        kwargs: any;
-    }
-
-    type SubscribeHandler = (args?: any[], kwargs?: any, details?: IEvent) => void;
-
-    interface ISubscription {
-        topic: string;
-        handler: SubscribeHandler;
-        options: ISubscribeOptions;
-        session: Session;
-        id: number;
-        active: boolean;
-        unsubscribe(): When.Promise<any>;
-    }
-
-    class Subscription implements ISubscription {
-        constructor(topic? : string, handler?: SubscribeHandler, options?: ISubscribeOptions, session?: Session, id?: number);
-
-        handler: SubscribeHandler;
-
-        unsubscribe(): When.Promise<any>;
-
-        topic: string;
-        options: ISubscribeOptions;
-        session: Session;
-        id: number;
-        active: boolean;
-    }
-
-    type RegisterEndpoint = (args?: any[], kwargs?: any, details?: IInvocation) => void;
-
-    interface IRegistration {
-        procedure: string;
-        endpoint: RegisterEndpoint;
-        options: IRegisterOptions;
-        session: Session;
-        id: number;
-        active: boolean;
-        unregister(): When.Promise<any>;
-    }
-
-    class Registration implements IRegistration {
-        constructor(procedure?: string, endpoint?: RegisterEndpoint, options?: IRegisterOptions, session?: Session, id?: number);
-
-        endpoint: RegisterEndpoint;
-
-        unregister(): When.Promise<any>;
-
-        procedure: string;
-        options: IRegisterOptions;
-        session: Session;
-        id: number;
-        active: boolean;
-    }
-
-    interface IPublication {
-        id: number;
-    }
-
-    class Publication implements IPublication {
-        constructor(id: number);
-
-        id: number;
-    }
-
-    interface ICallOptions {
-        timeout?: number;
-        receive_progress?: boolean;
-        disclose_me?: boolean;
-    }
-
-    interface IPublishOptions {
-        exclude?: number[];
-        eligible?: number[];
-        disclose_me?: Boolean;
-    }
-
-    interface ISubscribeOptions {
-        match?: string;
-    }
-
-    interface IRegisterOptions {
-        disclose_caller?: boolean;
-    }
-
-    export class Connection {
-        constructor(options?: IConnectionOptions);
-
-        open(): void;
-
-        close(reason: string, message: string): void;
-
-        onopen: (session: Session, details: any) => void;
-        onclose: (reason: string, details: any) => boolean;
-    }
-
-    interface ITransportDefinition {
-        url?: string;
-        protocols?: string[];
-        type: string;
-    }
-
-    type DeferFactory = () => When.Promise<any>;
-
-    type OnChallengeHandler = (session: Session, method: string, extra: any) => When.Promise<string>;
-
-    interface IConnectionOptions {
-        use_es6_promises?: boolean;
-        // use explicit deferred factory, e.g. jQuery.Deferred or Q.defer
-        use_deferred?: DeferFactory;
-        transports?: ITransportDefinition[];
-        retry_if_unreachable?: boolean;
-        max_retries?: number;
-        initial_retry_delay?: number;
-        max_retry_delay?: number;
-        retry_delay_growth?: number;
-        retry_delay_jitter?: number;
-        url?: string;
-        protocols?: string[];
-        onchallenge?: (session: Session, method: string, extra: any) => OnChallengeHandler;
-        realm?: string;
-        authmethods?: string[];
-        authid?: string;
-    }
-
-    interface ICloseEventDetails {
-        wasClean: boolean;
-        reason: string;
-        code: number;
-    }
-
-    interface ITransport {
-        onopen: () => void;
-        onmessage: (message: any[]) => void;
-        onclose: (details: ICloseEventDetails) => void;
-
-        send(message: any[]): void;
-        close(errorCode: number, reason?: string): void;
-    }
-
-    interface ITransportFactory {
-        // constructor(options: any);
-        type: string;
-        create(): ITransport;
-    }
-
-    interface ITransports {
-        register(name: string, factory: any): void;
-        isRegistered(name: string): boolean;
-        get(name: string): any;
-        list(): string[];
-    }
-
-    interface ILog {
-        debug(...args: any[]): void;
-    }
-
-    interface IUtil {
-        assert(condition: boolean, message: string): void;
-    }
-
-    interface IAuthCra {
-        derive_key(secret: string, salt: string, iterations: number, keylen: number): string;
-        sign(key: string, challenge: string): string;
-    }
-
-    var util: IUtil;
-    var log: ILog;
-    var transports: ITransports;
-    var auth_cra: IAuthCra;
-}
-
-declare module "autobahn" {
-    export = autobahn;
-}
diff --git a/autobahn/index.d.ts b/autobahn/index.d.ts
new file mode 100644
index 0000000000..29c8217d10
--- /dev/null
+++ b/autobahn/index.d.ts
@@ -0,0 +1,266 @@
+// Type definitions for AutobahnJS v0.9.6
+// Project: http://autobahn.ws/js/
+// Definitions by: Elad Zelingher <https://github.com/darkl/>, Andy Hawkins <https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="when" />
+
+export = autobahn;
+
+declare namespace autobahn {
+
+    export class Session {
+        id: number;
+        realm: string;
+        isOpen: boolean;
+        features: any;
+        caller_disclose_me: boolean;
+        publisher_disclose_me: boolean;
+        subscriptions: ISubscription[][];
+        registrations: IRegistration[];
+
+        constructor(transport: ITransport, defer: DeferFactory, challenge: OnChallengeHandler);
+
+        join(realm: string, authmethods: string[], authid: string): void;
+
+        leave(reason: string, message: string): void;
+
+        call<TResult>(procedure: string, args?: any[], kwargs?: any, options?: ICallOptions): When.Promise<TResult>;
+
+        publish(topic: string, args?: any[], kwargs?: any, options?: IPublishOptions): When.Promise<IPublication>;
+
+        subscribe(topic: string, handler: SubscribeHandler, options?: ISubscribeOptions): When.Promise<ISubscription>;
+
+        register(procedure: string, endpoint: RegisterEndpoint, options?: IRegisterOptions): When.Promise<IRegistration>;
+
+        unsubscribe(subscription: ISubscription): When.Promise<any>;
+
+        unregister(registration: IRegistration): When.Promise<any>;
+
+        prefix(prefix: string, uri: string): void;
+
+        resolve(curie: string): string;
+
+        onjoin: (roleFeatures: any) => void;
+        onleave: (reason: string, details: any) => void;
+    }
+
+    interface IInvocation {
+        caller?: number;
+        progress?: boolean;
+        procedure: string;
+    }
+
+    class Invocation implements IInvocation {
+        constructor(caller?: number, progress?: boolean, procedure?: string);
+
+        procedure: string;
+    }
+
+    interface IEvent {
+        publication: number;
+        publisher?: number;
+        topic: string;
+    }
+
+    class Event implements IEvent {
+        constructor(publication?: number, publisher?: string, topic?: string);
+
+        publication: number;
+        topic: string;
+    }
+
+    interface IResult {
+        args: any[];
+        kwargs: any;
+    }
+
+    class Result implements IResult {
+        constructor(args?: any[], kwargs?: any);
+
+        args: any[];
+        kwargs: any;
+    }
+
+    interface IError {
+        error: string;
+        args: any[];
+        kwargs: any;
+    }
+
+    class Error implements IError {
+        constructor(error?: string, args?: any[], kwargs?: any);
+
+        error: string;
+        args: any[];
+        kwargs: any;
+    }
+
+    type SubscribeHandler = (args?: any[], kwargs?: any, details?: IEvent) => void;
+
+    interface ISubscription {
+        topic: string;
+        handler: SubscribeHandler;
+        options: ISubscribeOptions;
+        session: Session;
+        id: number;
+        active: boolean;
+        unsubscribe(): When.Promise<any>;
+    }
+
+    class Subscription implements ISubscription {
+        constructor(topic? : string, handler?: SubscribeHandler, options?: ISubscribeOptions, session?: Session, id?: number);
+
+        handler: SubscribeHandler;
+
+        unsubscribe(): When.Promise<any>;
+
+        topic: string;
+        options: ISubscribeOptions;
+        session: Session;
+        id: number;
+        active: boolean;
+    }
+
+    type RegisterEndpoint = (args?: any[], kwargs?: any, details?: IInvocation) => void;
+
+    interface IRegistration {
+        procedure: string;
+        endpoint: RegisterEndpoint;
+        options: IRegisterOptions;
+        session: Session;
+        id: number;
+        active: boolean;
+        unregister(): When.Promise<any>;
+    }
+
+    class Registration implements IRegistration {
+        constructor(procedure?: string, endpoint?: RegisterEndpoint, options?: IRegisterOptions, session?: Session, id?: number);
+
+        endpoint: RegisterEndpoint;
+
+        unregister(): When.Promise<any>;
+
+        procedure: string;
+        options: IRegisterOptions;
+        session: Session;
+        id: number;
+        active: boolean;
+    }
+
+    interface IPublication {
+        id: number;
+    }
+
+    class Publication implements IPublication {
+        constructor(id: number);
+
+        id: number;
+    }
+
+    interface ICallOptions {
+        timeout?: number;
+        receive_progress?: boolean;
+        disclose_me?: boolean;
+    }
+
+    interface IPublishOptions {
+        exclude?: number[];
+        eligible?: number[];
+        disclose_me?: Boolean;
+    }
+
+    interface ISubscribeOptions {
+        match?: string;
+    }
+
+    interface IRegisterOptions {
+        disclose_caller?: boolean;
+    }
+
+    export class Connection {
+        constructor(options?: IConnectionOptions);
+
+        open(): void;
+
+        close(reason: string, message: string): void;
+
+        onopen: (session: Session, details: any) => void;
+        onclose: (reason: string, details: any) => boolean;
+    }
+
+    interface ITransportDefinition {
+        url?: string;
+        protocols?: string[];
+        type: string;
+    }
+
+    type DeferFactory = () => When.Promise<any>;
+
+    type OnChallengeHandler = (session: Session, method: string, extra: any) => When.Promise<string>;
+
+    interface IConnectionOptions {
+        use_es6_promises?: boolean;
+        // use explicit deferred factory, e.g. jQuery.Deferred or Q.defer
+        use_deferred?: DeferFactory;
+        transports?: ITransportDefinition[];
+        retry_if_unreachable?: boolean;
+        max_retries?: number;
+        initial_retry_delay?: number;
+        max_retry_delay?: number;
+        retry_delay_growth?: number;
+        retry_delay_jitter?: number;
+        url?: string;
+        protocols?: string[];
+        onchallenge?: (session: Session, method: string, extra: any) => OnChallengeHandler;
+        realm?: string;
+        authmethods?: string[];
+        authid?: string;
+    }
+
+    interface ICloseEventDetails {
+        wasClean: boolean;
+        reason: string;
+        code: number;
+    }
+
+    interface ITransport {
+        onopen: () => void;
+        onmessage: (message: any[]) => void;
+        onclose: (details: ICloseEventDetails) => void;
+
+        send(message: any[]): void;
+        close(errorCode: number, reason?: string): void;
+    }
+
+    interface ITransportFactory {
+        // constructor(options: any);
+        type: string;
+        create(): ITransport;
+    }
+
+    interface ITransports {
+        register(name: string, factory: any): void;
+        isRegistered(name: string): boolean;
+        get(name: string): any;
+        list(): string[];
+    }
+
+    interface ILog {
+        debug(...args: any[]): void;
+    }
+
+    interface IUtil {
+        assert(condition: boolean, message: string): void;
+    }
+
+    interface IAuthCra {
+        derive_key(secret: string, salt: string, iterations: number, keylen: number): string;
+        sign(key: string, challenge: string): string;
+    }
+
+    var util: IUtil;
+    var log: ILog;
+    var transports: ITransports;
+    var auth_cra: IAuthCra;
+}
diff --git a/autobahn/tsconfig.json b/autobahn/tsconfig.json
new file mode 100644
index 0000000000..f7e6072fce
--- /dev/null
+++ b/autobahn/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "autobahn-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/autolinker/autolinker-tests.ts b/autolinker/autolinker-tests.ts
index c25bedbbc4..afd7e1d629 100644
--- a/autolinker/autolinker-tests.ts
+++ b/autolinker/autolinker-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="./autolinker.d.ts"/>
-
 import AutolinkerCJS = require('autolinker');
 
 () => {
diff --git a/autolinker/autolinker.d.ts b/autolinker/index.d.ts
similarity index 100%
rename from autolinker/autolinker.d.ts
rename to autolinker/index.d.ts
diff --git a/autolinker/tsconfig.json b/autolinker/tsconfig.json
new file mode 100644
index 0000000000..be87717ae2
--- /dev/null
+++ b/autolinker/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "autolinker-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/autoprefixer-core/autoprefixer-core-tests.ts b/autoprefixer-core/autoprefixer-core-tests.ts
index 9ff4e7695f..906514e9c9 100644
--- a/autoprefixer-core/autoprefixer-core-tests.ts
+++ b/autoprefixer-core/autoprefixer-core-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="autoprefixer-core.d.ts" />
+
 import autoprefixer = require("autoprefixer-core");
 
 var css: string;
diff --git a/autoprefixer-core/autoprefixer-core.d.ts b/autoprefixer-core/autoprefixer-core.d.ts
deleted file mode 100644
index 2463880441..0000000000
--- a/autoprefixer-core/autoprefixer-core.d.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-// Type definitions for Autoprefixer Core 5.1.11
-// Project: https://github.com/postcss/autoprefixer-core
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "autoprefixer-core" {
-    interface Config {
-        browsers?: string[];
-        cascade?: boolean;
-        remove?: boolean;
-    }
-
-    interface Options {
-        from?: string;
-        to?: string;
-        safe?: boolean;
-        map?: {
-            inline?: boolean;
-            prev?: string | Object;
-        }
-    }
-
-    interface Result {
-        css: string;
-        map: string;
-        opts: Options;
-    }
-
-    interface Processor {
-        postcss: any;
-        info(): string;
-        process(css: string, opts?: Options): Result;
-    }
-
-    interface Exports {
-        (config: Config): Processor;
-        postcss: any;
-        info(): string;
-        process(css: string, opts?: Options): Result;
-    }
-
-    var exports: Exports;
-    export = exports;
-}
diff --git a/autoprefixer-core/index.d.ts b/autoprefixer-core/index.d.ts
new file mode 100644
index 0000000000..1b04092a71
--- /dev/null
+++ b/autoprefixer-core/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for Autoprefixer Core 5.1.11
+// Project: https://github.com/postcss/autoprefixer-core
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface Config {
+    browsers?: string[];
+    cascade?: boolean;
+    remove?: boolean;
+}
+
+interface Options {
+    from?: string;
+    to?: string;
+    safe?: boolean;
+    map?: {
+        inline?: boolean;
+        prev?: string | Object;
+    }
+}
+
+interface Result {
+    css: string;
+    map: string;
+    opts: Options;
+}
+
+interface Processor {
+    postcss: any;
+    info(): string;
+    process(css: string, opts?: Options): Result;
+}
+
+interface Exports {
+    (config: Config): Processor;
+    postcss: any;
+    info(): string;
+    process(css: string, opts?: Options): Result;
+}
+
+declare var exports: Exports;
+export = exports;
diff --git a/autoprefixer-core/tsconfig.json b/autoprefixer-core/tsconfig.json
new file mode 100644
index 0000000000..c66535de52
--- /dev/null
+++ b/autoprefixer-core/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "autoprefixer-core-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/aws-sdk/aws-sdk-tests.ts b/aws-sdk/aws-sdk-tests.ts
index 7411beb930..7ec672ae4b 100644
--- a/aws-sdk/aws-sdk-tests.ts
+++ b/aws-sdk/aws-sdk-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="aws-sdk.d.ts" />
 
 import AWS = require('aws-sdk');
 
diff --git a/aws-sdk/aws-sdk.d.ts b/aws-sdk/aws-sdk.d.ts
deleted file mode 100644
index eb54a5991d..0000000000
--- a/aws-sdk/aws-sdk.d.ts
+++ /dev/null
@@ -1,1197 +0,0 @@
-// Type definitions for aws-sdk
-// Project: https://github.com/aws/aws-sdk-js
-// Definitions by: midknight41 <https://github.com/midknight41>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/aws-sdk.d.ts
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "aws-sdk" {
-
-	export var config: ClientConfig;
-
-	export function Config(json: any): void;
-
-	export class Credentials {
-		constructor(accessKeyId: string, secretAccessKey: string, sessionToken?: string);
-		accessKeyId: string;
-	}
-
-	export interface Logger {
-		write?: (chunk: any, encoding?: string, callback?: () => void) => void;
-		log?: (...messages: any[]) => void;
-	}
-
-	export interface HttpOptions {
-		proxy?: string;
-		agent?: any;
-		timeout?: number;
-		xhrAsync?: boolean;
-		xhrWithCredentials?: boolean;
-	}
-	
-	export class Endpoint {
-		constructor(endpoint:string);
-		
-		host:string;
-		hostname:string;
-		href:string;
-		port:number;
-		protocol:string;
-	}
-
-	export interface Services {
-		autoscaling?: any;
-		cloudformation?: any;
-		cloudfront?: any;
-		cloudsearch?: any;
-		cloudsearchdomain?: any;
-		cloudtrail?: any;
-		cloudwatch?: any;
-		cloudwatchlogs?: any;
-		cognitoidentity?: any;
-		cognitosync?: any;
-		datapipeline?: any;
-		directconnect?: any;
-		dynamodb?: any;
-		ec2?: any;
-		ecs?: any;
-		elasticache?: any;
-		elasticbeanstalk?: any;
-		elastictranscoder?: any;
-		elb?: any;
-		emr?: any;
-		glacier?: any;
-		httpOptions?: HttpOptions;
-		iam?: any;
-		importexport?: any;
-		kinesis?: any;
-		opsworks?: any;
-		rds?: any;
-		redshift?: any;
-		route53?: any;
-		route53domains?: any;
-		s3?: any;
-		ses?: any;
-		simpledb?: any;
-		sns?: any;
-		sqs?: any;
-		storagegateway?: any;
-		sts?: any;
-		support?: any;
-		swf?: any;
-	}
-
-	export interface ClientConfigPartial extends Services {
-		credentials?: Credentials;
-		region?: string;
-		computeChecksums?: boolean;
-		convertResponseTypes?: boolean;
-		logger?: Logger;
-		maxRedirects?: number;
-		maxRetries?: number;
-		paramValidation?: boolean;
-		s3ForcePathStyle?: boolean;
-		apiVersion?: any;
-		apiVersions?: Services;
-		signatureVersion?: string;
-		sslEnabled?: boolean;
-		systemClockOffset?: number;
-	}
-
-	export interface ClientConfig extends ClientConfigPartial {
-		update?: (options: ClientConfigPartial, allUnknownKeys?: boolean) => void;
-		getCredentials?: (callback: (err?: any) => void) => void ;
-		loadFromPath?: (path: string) => void;
-		credentials: Credentials;
-		region: string;
-	}
-
-	export class SQS {
-		constructor(options?: any);
-		endpoint:Endpoint;
-		
-		addPermission(params: SQS.AddPermissionParams, callback: (err:Error, data:any) => void): void;
-		changeMessageVisibility(params: SQS.ChangeMessageVisibilityParams, callback: (err:Error, data:any) => void): void;
-		changeMessageVisibilityBatch(params: SQS.ChangeMessageVisibilityBatchParams, callback: (err:Error, data:SQS.ChangeMessageVisibilityBatchResponse) => void): void;
-		createQueue(params: SQS.CreateQueueParams, callback: (err: Error, data: SQS.CreateQueueResult) => void): void;
-		deleteMessage(params: SQS.DeleteMessageParams, callback: (err: Error, data: any) => void): void;
-		deleteMessageBatch(params: SQS.DeleteMessageBatchParams, callback: (err: Error, data: SQS.DeleteMessageBatchResult) => void): void;
-		deleteQueue(params: { QueueUrl: string; }, callback: (err: Error, data: any) => void): void;
-		getQueueAttributes(params: SQS.GetQueueAttributesParams, callback: (err: Error, data: SQS.GetQueueAttributesResult) => void): void;
-		getQueueUrl(params: SQS.GetQueueUrlParams, callback: (err: Error, data: { QueueUrl: string; }) => void): void;
-		listDeadLetterSourceQueues(params: {QueueUrl:string}, callback: (err: Error, data: {queueUrls: string[]}) => void): void;
-		listQueues(params: {QueueNamePrefix?:string}, callback: (err: Error, data: {QueueUrls: string[]}) => void): void;
-		purgeQueue(params: {QueueUrl: string}, callback: (err: Error, data: any) => void): void;
-		receiveMessage(params: SQS.ReceiveMessageParams, callback: (err: Error, data: SQS.ReceiveMessageResult) => void): void;
-		removePermission(params: {QueueUrl: string, Label: string}, callback: (err: Error, data: any) => void): void;
-		sendMessage(params: SQS.SendMessageParams, callback: (err: Error, data: SQS.SendMessageResult) => void): void;
-		sendMessageBatch(params: SQS.SendMessageBatchParams, callback: (err: Error, data: SQS.SendMessageBatchResult) => void): void;
-		setQueueAttributes(params: SQS.SetQueueAttributesParams, callback: (err: Error, data: any) => void): void;			
-	}
-
-	export class SES {
-		constructor(options?: any);
-		public client: Ses.Client;
-	}
-
-	export class SNS {
-		constructor(options?: any);
-		public client: Sns.Client;
-	}
-
-	export class SimpleWorkflow {
-		constructor(options?: any);
-		public client: Swf.Client;
-	}
-
-	export class S3 {
-		constructor(options?: any);
-		putObject(params: s3.PutObjectRequest, callback: (err: any, data: any) => void): void;
-		getObject(params: s3.GetObjectRequest, callback: (err: any, data: any) => void): void;
-	}
-
-	export class ECS {
-		constructor(options?: any);
-
-		createService(params: ecs.CreateServicesParams, callback: (err: any, data: any) => void): void;
-		describeServices(params: ecs.DescribeServicesParams, callback: (err: any, data: any) => void): void;
-		describeTaskDefinition(params: ecs.DescribeTaskDefinitionParams, callback: (err: any, data: any) => void): void;
-		registerTaskDefinition(params: ecs.RegisterTaskDefinitionParams, callback: (err: any, data: any) => void): void;
-		updateService(params: ecs.UpdateServiceParams, callback: (err: any, data: any) => void): void;
-	}
-
-	export class DynamoDB {
-		constructor(options?: any);
-	}
-
-	export module DynamoDB {
-		export class DocumentClient {
-			constructor(options?: any);
-		}
-	}
-
-	export module SQS {
-		
-		export interface SqsOptions {
-			params?: any;
-			endpoint?: string;
-			accessKeyId?: string;
-			secretAccessKey?: string;
-			sessionToken?: Credentials;
-			credentials?: Credentials;
-			credentialProvider?: any;
-			region?: string;
-			maxRetries?: number;
-			maxRedirects?: number;
-			sslEnabled?: boolean;
-			paramValidation?: boolean;
-			computeChecksums?: boolean;
-			convertResponseTypes?: boolean;
-			correctClockSkew?: boolean;
-			s3ForcePathStyle?: boolean;
-			s3BucketEndpoint?: boolean;
-			httpOptions?: HttpOptions;
-			apiVersion?: string;
-			apiVersions?: { [serviceName:string]: string};
-			logger?: Logger;
-			systemClockOffset?: number;
-			signatureVersion?: string;
-			signatureCache?: boolean;
-		}
-		
-		export interface AddPermissionParams {
-			QueueUrl: string;
-			Label: string;
-			AWSAccountIds:string[];
-			Actions:string[];
-		}
-		
-		export interface ChangeMessageVisibilityParams { 
-			QueueUrl: string, 
-			ReceiptHandle: string, 
-			VisibilityTimeout: number 
-		}
-		
-		export interface ChangeMessageVisibilityBatchParams { 
-			QueueUrl: string, 
-			Entries: { Id: string; ReceiptHandle: string; VisibilityTimeout?: number; }[]
-		}
-		
-		export interface ChangeMessageVisibilityBatchResponse {
-			Successful: { Id:string }[];
-			Failed: BatchResultErrorEntry[];
-		}
-
-		export interface SendMessageParams {
-			QueueUrl: string;
-			MessageBody: string;
-			DelaySeconds?: number;
-			MessageAttributes?: { [name:string]: MessageAttribute; }
-		}
-
-		export interface ReceiveMessageParams {
-			QueueUrl: string;
-			MaxNumberOfMessages?: number;
-			VisibilityTimeout?: number;
-			AttributeNames?: string[];
-			MessageAttributeNames?: string[];
-			WaitTimeSeconds?:number;
-		}
-
-		export interface DeleteMessageBatchParams {
-			QueueUrl: string;
-			Entries: DeleteMessageBatchRequestEntry[];
-		}
-
-		export interface DeleteMessageBatchRequestEntry {
-			Id: string;
-			ReceiptHandle: string;
-		}
-
-		export interface DeleteMessageParams {
-			QueueUrl: string;
-			ReceiptHandle: string;
-		}
-
-		export interface SendMessageBatchParams {
-			QueueUrl: string;
-			Entries: SendMessageBatchRequestEntry[];
-		}
-
-		export interface SendMessageBatchRequestEntry {
-			Id: string;
-			MessageBody: string;
-			DelaySeconds?: number;
-			MessageAttributes?: { [name:string]: MessageAttribute; }
-		}
-
-		export interface CreateQueueParams {
-			QueueName: string;
-			Attributes: QueueAttributes;
-		}
-		
-		export interface QueueAttributes {
-			[name:string]: any;
-			DelaySeconds?: number;
-			MaximumMessageSize?: number;
-			MessageRetentionPeriod?: number;
-			Policy?: any;
-			ReceiveMessageWaitTimeSeconds?: number;
-			VisibilityTimeout?: number;
-			RedrivePolicy?: any;
-		}
-		
-		export interface GetQueueAttributesParams {
-			QueueUrl: string;
-			AttributeNames: string[];
-		}
-		
-		export interface GetQueueAttributesResult {
-			Attributes: {[name:string]: string};
-		}
-		
-		export interface GetQueueUrlParams {
-			QueueName: string;
-			QueueOwnerAWSAccountId?: string;
-		}
-		
-		export interface SendMessageResult {
-			MessageId: string;
-			MD5OfMessageBody: string;
-			MD5OfMessageAttributes: string;
-		}
-
-		export interface ReceiveMessageResult {
-			Messages: Message[];
-		}
-
-		export interface Message {
-			MessageId: string;
-			ReceiptHandle: string;
-			MD5OfBody: string;
-			Body: string;
-			Attributes: { [name:string]:any };
-			MD5OfMessageAttributes:string;
-			MessageAttributes: { [name:string]: MessageAttribute; }
-		}
-
-		export interface MessageAttribute {
-			StringValue?: string;
-			BinaryValue?: any; //(Buffer, Typed Array, Blob, String) 
-			StringListValues?: string[];
-			BinaryListValues?: any[];
-			DataType: string;
-		}
-				
-		export interface DeleteMessageBatchResult {
-			Successful: DeleteMessageBatchResultEntry[];
-			Failed: BatchResultErrorEntry[];
-		}
-
-		export interface DeleteMessageBatchResultEntry {
-			Id: string;
-		}
-
-		export interface BatchResultErrorEntry {
-			Id: string;
-			Code: string;
-			Message?: string;
-			SenderFault: boolean;
-		}
-
-		export interface SendMessageBatchResult {
-			Successful: SendMessageBatchResultEntry[];
-			Failed: BatchResultErrorEntry[];
-		}
-
-		export interface SendMessageBatchResultEntry {
-			Id: string;
-			MessageId: string;
-			MD5OfMessageBody: string;
-			MD5OfMessageAttributes:string;
-		}
-
-		export interface CreateQueueResult {
-			QueueUrl: string;
-		}
-		
-		export interface SetQueueAttributesParams {
-			QueueUrl: string;
-			Attributes: QueueAttributes;
-		}
-
-	}
-
-	export module Ses {
-
-		export interface Client {
-			config: ClientConfig;
-
-			sendEmail(params: any, callback: (err: any, data: SendEmailResult) => void): void;
-		}
-
-		export interface SendEmailRequest {
-			Source: string;
-			Destination: Destination;
-			Message: Message;
-			ReplyToAddresses: string[];
-			ReturnPath: string;
-		}
-
-		export class Destination {
-			ToAddresses: string[];
-			CcAddresses: string[];
-			BccAddresses: string[];
-		}
-
-		export class Message {
-			Subject: Content;
-			Body: Body;
-		}
-
-		export class Content {
-			Data: string;
-			Charset: string;
-		}
-
-		export class Body {
-			Text: Content;
-			Html: Content;
-		}
-
-		export class SendEmailResult {
-			MessageId: string;
-		}
-
-	}
-
-	export module Swf {
-
-		export class Client {
-			//constructor(options?: any);
-			public config: ClientConfig;
-
-			countClosedWorkflowExecutions(params: any, callback: (err: any, data: any) => void): void;
-			countOpenWorkflowExecutions(params: any, callback: (err: any, data: any) => void): void;
-			countPendingActivityTasks(params: any, callback: (err: any, data: any) => void): void;
-			countPendingDecisionTasks(params: any, callback: (err: any, data: any) => void): void;
-			deprecateActivityType(params: any, callback: (err: any, data: any) => void): void;
-			deprecateDomain(params: any, callback: (err: any, data: any) => void): void;
-			deprecateWorkflowType(params: any, callback: (err: any, data: any) => void): void;
-			describeActivityType(params: any, callback: (err: any, data: any) => void): void;
-			describeDomain(params: any, callback: (err: any, data: any) => void): void;
-			describeWorkflowExecution(params: any, callback: (err: any, data: any) => void): void;
-			describeWorkflowType(params: any, callback: (err: any, data: any) => void): void;
-			getWorkflowExecutionHistory(params: any, callback: (err: any, data: any) => void): void;
-			listActivityTypes(params: any, callback: (err: any, data: any) => void): void;
-			listClosedWorkflowExecutions(params: any, callback: (err: any, data: any) => void): void;
-			listDomains(params: any, callback: (err: any, data: any) => void): void;
-			listOpenWorkflowExecutions(params: any, callback: (err: any, data: any) => void): void;
-			listWorkflowTypes(params: any, callback: (err: any, data: any) => void): void;
-			pollForActivityTask(params: any, callback: (err: any, data: ActivityTask) => void): void;
-			pollForDecisionTask(params: any, callback: (err: any, data: DecisionTask) => void): void;
-			recordActivityTaskHeartbeat(params: any, callback: (err: any, data: any) => void): void;
-			registerActivityType(params: any, callback: (err: any, data: any) => void): void;
-			registerDomain(params: any, callback: (err: any, data: any) => void): void;
-			registerWorkflowType(params: any, callback: (err: any, data: any) => void): void;
-			requestCancelWorkflowExecution(params: any, callback: (err: any, data: any) => void): void;
-			respondActivityTaskCanceled(params: RespondActivityTaskCanceledRequest, callback: (err: any, data: any) => void): void;
-			respondActivityTaskCompleted(params: RespondActivityTaskCompletedRequest, callback: (err: any, data: any) => void): void;
-			respondActivityTaskFailed(params: RespondActivityTaskFailedRequest, callback: (err: any, data: any) => void): void;
-			respondDecisionTaskCompleted(params: RespondDecisionTaskCompletedRequest, callback: (err: any, data: any) => void): void;
-			signalWorkflowExecution(params: any, callback: (err: any, data: any) => void): void;
-			startWorkflowExecution(params: any, callback: (err: any, data: StartWorkflowExecutionResult) => void): void;
-			terminateWorkflowExecution(params: any, callback: (err: any, data: any) => void): void;
-		}
-
-		export interface PollForActivityTaskRequest {
-			domain?: string;
-			taskList?: TaskList;
-			identity?: string;
-		}
-
-		export interface TaskList {
-			name?: string;
-		}
-
-		export interface PollForDecisionTaskRequest {
-			domain?: string;
-			taskList?: TaskList;
-			identity?: string;
-			nextPageToken?: string;
-			maximumPageSize?: number;
-			reverseOrder?: Boolean;
-		}
-
-		export interface StartWorkflowExecutionRequest {
-			domain?: string;
-			workflowId?: string;
-			workflowType?: WorkflowType;
-			taskList?: TaskList;
-			input?: string;
-			executionStartToCloseTimeout?: string;
-			tagList?: string[];
-			taskStartToCloseTimeout?: string;
-			childPolicy?: string;
-		}
-
-		export interface WorkflowType {
-			name?: string;
-			version?: string;
-		}
-
-		export interface RespondDecisionTaskCompletedRequest {
-			taskToken?: string;
-			decisions?: Decision[];
-			executionContext?: string;
-		}
-
-		export interface Decision {
-			decisionType?: string;
-			scheduleActivityTaskDecisionAttributes?: ScheduleActivityTaskDecisionAttributes;
-			requestCancelActivityTaskDecisionAttributes?: RequestCancelActivityTaskDecisionAttributes;
-			completeWorkflowExecutionDecisionAttributes?: CompleteWorkflowExecutionDecisionAttributes;
-			failWorkflowExecutionDecisionAttributes?: FailWorkflowExecutionDecisionAttributes;
-			cancelWorkflowExecutionDecisionAttributes?: CancelWorkflowExecutionDecisionAttributes;
-			continueAsNewWorkflowExecutionDecisionAttributes?: ContinueAsNewWorkflowExecutionDecisionAttributes;
-			recordMarkerDecisionAttributes?: RecordMarkerDecisionAttributes;
-			startTimerDecisionAttributes?: StartTimerDecisionAttributes;
-			cancelTimerDecisionAttributes?: CancelTimerDecisionAttributes;
-			signalExternalWorkflowExecutionDecisionAttributes?: SignalExternalWorkflowExecutionDecisionAttributes;
-			requestCancelExternalWorkflowExecutionDecisionAttributes?: RequestCancelExternalWorkflowExecutionDecisionAttributes;
-			startChildWorkflowExecutionDecisionAttributes?: StartChildWorkflowExecutionDecisionAttributes;
-		}
-
-		export interface ScheduleActivityTaskDecisionAttributes {
-			activityType?: ActivityType;
-			activityId?: string;
-			control?: string;
-			input?: string;
-			scheduleToCloseTimeout?: string;
-			taskList?: TaskList;
-			scheduleToStartTimeout?: string;
-			startToCloseTimeout?: string;
-			heartbeatTimeout?: string;
-		}
-
-		export interface ActivityType {
-			name?: string;
-			version?: string;
-		}
-
-		export interface RequestCancelActivityTaskDecisionAttributes {
-			activityId?: string;
-		}
-
-		export interface CompleteWorkflowExecutionDecisionAttributes {
-			result?: string;
-		}
-
-		export interface FailWorkflowExecutionDecisionAttributes {
-			reason?: string;
-			details?: string;
-		}
-
-		export interface CancelWorkflowExecutionDecisionAttributes {
-			details?: string;
-		}
-
-		export interface ContinueAsNewWorkflowExecutionDecisionAttributes {
-			input?: string;
-			executionStartToCloseTimeout?: string;
-			taskList?: TaskList;
-			taskStartToCloseTimeout?: string;
-			childPolicy?: string;
-			tagList?: string[];
-			workflowTypeVersion?: string;
-		}
-
-		export interface RecordMarkerDecisionAttributes {
-			markerName?: string;
-			details?: string;
-		}
-
-		export interface StartTimerDecisionAttributes {
-			timerId?: string;
-			control?: string;
-			startToFireTimeout?: string;
-		}
-
-		export interface CancelTimerDecisionAttributes {
-			timerId?: string;
-		}
-
-		export interface SignalExternalWorkflowExecutionDecisionAttributes {
-			workflowId?: string;
-			runId?: string;
-			signalName?: string;
-			input?: string;
-			control?: string;
-		}
-
-		export interface RequestCancelExternalWorkflowExecutionDecisionAttributes {
-			workflowId?: string;
-			runId?: string;
-			control?: string;
-		}
-
-		export interface StartChildWorkflowExecutionDecisionAttributes {
-			workflowType?: WorkflowType;
-			workflowId?: string;
-			control?: string;
-			input?: string;
-			executionStartToCloseTimeout?: string;
-			taskList?: TaskList;
-			taskStartToCloseTimeout?: string;
-			childPolicy?: string;
-			tagList?: string[];
-		}
-
-		export interface RespondActivityTaskCompletedRequest {
-			taskToken?: string;
-			result?: string;
-		}
-
-		export interface RespondActivityTaskFailedRequest {
-			taskToken?: string;
-			reason?: string;
-			details?: string;
-		}
-
-		export interface RespondActivityTaskCanceledRequest {
-			taskToken?: string;
-			details?: string;
-		}
-
-		export interface DecisionTask {
-			taskToken?: string;
-			startedEventId?: number;
-			workflowExecution?: WorkflowExecution;
-			workflowType?: WorkflowType;
-			events?: HistoryEvent[];
-			nextPageToken?: string;
-			previousStartedEventId?: number;
-		}
-
-		export interface WorkflowExecution {
-			workflowId?: string;
-			runId?: string;
-		}
-
-		export interface HistoryEvent {
-			eventTimestamp?: any;
-			eventType?: string;
-			eventId?: number;
-			workflowExecutionStartedEventAttributes?: WorkflowExecutionStartedEventAttributes;
-			workflowExecutionCompletedEventAttributes?: WorkflowExecutionCompletedEventAttributes;
-			completeWorkflowExecutionFailedEventAttributes?: CompleteWorkflowExecutionFailedEventAttributes;
-			workflowExecutionFailedEventAttributes?: WorkflowExecutionFailedEventAttributes;
-			failWorkflowExecutionFailedEventAttributes?: FailWorkflowExecutionFailedEventAttributes;
-			workflowExecutionTimedOutEventAttributes?: WorkflowExecutionTimedOutEventAttributes;
-			workflowExecutionCanceledEventAttributes?: WorkflowExecutionCanceledEventAttributes;
-			cancelWorkflowExecutionFailedEventAttributes?: CancelWorkflowExecutionFailedEventAttributes;
-			workflowExecutionContinuedAsNewEventAttributes?: WorkflowExecutionContinuedAsNewEventAttributes;
-			continueAsNewWorkflowExecutionFailedEventAttributes?: ContinueAsNewWorkflowExecutionFailedEventAttributes;
-			workflowExecutionTerminatedEventAttributes?: WorkflowExecutionTerminatedEventAttributes;
-			workflowExecutionCancelRequestedEventAttributes?: WorkflowExecutionCancelRequestedEventAttributes;
-			decisionTaskScheduledEventAttributes?: DecisionTaskScheduledEventAttributes;
-			decisionTaskStartedEventAttributes?: DecisionTaskStartedEventAttributes;
-			decisionTaskCompletedEventAttributes?: DecisionTaskCompletedEventAttributes;
-			decisionTaskTimedOutEventAttributes?: DecisionTaskTimedOutEventAttributes;
-			activityTaskScheduledEventAttributes?: ActivityTaskScheduledEventAttributes;
-			activityTaskStartedEventAttributes?: ActivityTaskStartedEventAttributes;
-			activityTaskCompletedEventAttributes?: ActivityTaskCompletedEventAttributes;
-			activityTaskFailedEventAttributes?: ActivityTaskFailedEventAttributes;
-			activityTaskTimedOutEventAttributes?: ActivityTaskTimedOutEventAttributes;
-			activityTaskCanceledEventAttributes?: ActivityTaskCanceledEventAttributes;
-			activityTaskCancelRequestedEventAttributes?: ActivityTaskCancelRequestedEventAttributes;
-			workflowExecutionSignaledEventAttributes?: WorkflowExecutionSignaledEventAttributes;
-			markerRecordedEventAttributes?: MarkerRecordedEventAttributes;
-			timerStartedEventAttributes?: TimerStartedEventAttributes;
-			timerFiredEventAttributes?: TimerFiredEventAttributes;
-			timerCanceledEventAttributes?: TimerCanceledEventAttributes;
-			startChildWorkflowExecutionInitiatedEventAttributes?: StartChildWorkflowExecutionInitiatedEventAttributes;
-			childWorkflowExecutionStartedEventAttributes?: ChildWorkflowExecutionStartedEventAttributes;
-			childWorkflowExecutionCompletedEventAttributes?: ChildWorkflowExecutionCompletedEventAttributes;
-			childWorkflowExecutionFailedEventAttributes?: ChildWorkflowExecutionFailedEventAttributes;
-			childWorkflowExecutionTimedOutEventAttributes?: ChildWorkflowExecutionTimedOutEventAttributes;
-			childWorkflowExecutionCanceledEventAttributes?: ChildWorkflowExecutionCanceledEventAttributes;
-			childWorkflowExecutionTerminatedEventAttributes?: ChildWorkflowExecutionTerminatedEventAttributes;
-			signalExternalWorkflowExecutionInitiatedEventAttributes?: SignalExternalWorkflowExecutionInitiatedEventAttributes;
-			externalWorkflowExecutionSignaledEventAttributes?: ExternalWorkflowExecutionSignaledEventAttributes;
-			signalExternalWorkflowExecutionFailedEventAttributes?: SignalExternalWorkflowExecutionFailedEventAttributes;
-			externalWorkflowExecutionCancelRequestedEventAttributes?: ExternalWorkflowExecutionCancelRequestedEventAttributes;
-			requestCancelExternalWorkflowExecutionInitiatedEventAttributes?: RequestCancelExternalWorkflowExecutionInitiatedEventAttributes;
-			requestCancelExternalWorkflowExecutionFailedEventAttributes?: RequestCancelExternalWorkflowExecutionFailedEventAttributes;
-			scheduleActivityTaskFailedEventAttributes?: ScheduleActivityTaskFailedEventAttributes;
-			requestCancelActivityTaskFailedEventAttributes?: RequestCancelActivityTaskFailedEventAttributes;
-			startTimerFailedEventAttributes?: StartTimerFailedEventAttributes;
-			cancelTimerFailedEventAttributes?: CancelTimerFailedEventAttributes;
-			startChildWorkflowExecutionFailedEventAttributes?: StartChildWorkflowExecutionFailedEventAttributes;
-		}
-
-		export interface WorkflowExecutionStartedEventAttributes {
-			input?: string;
-			executionStartToCloseTimeout?: string;
-			taskStartToCloseTimeout?: string;
-			childPolicy?: string;
-			taskList?: TaskList;
-			workflowType?: WorkflowType;
-			tagList?: string[];
-			continuedExecutionRunId?: string;
-			parentWorkflowExecution?: WorkflowExecution;
-			parentInitiatedEventId?: number;
-		}
-
-		export interface WorkflowExecutionCompletedEventAttributes {
-			result?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface CompleteWorkflowExecutionFailedEventAttributes {
-			cause?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface WorkflowExecutionFailedEventAttributes {
-			reason?: string;
-			details?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface FailWorkflowExecutionFailedEventAttributes {
-			cause?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface WorkflowExecutionTimedOutEventAttributes {
-			timeoutType?: string;
-			childPolicy?: string;
-		}
-
-		export interface WorkflowExecutionCanceledEventAttributes {
-			details?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface CancelWorkflowExecutionFailedEventAttributes {
-			cause?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface WorkflowExecutionContinuedAsNewEventAttributes {
-			input?: string;
-			decisionTaskCompletedEventId?: number;
-			newExecutionRunId?: string;
-			executionStartToCloseTimeout?: string;
-			taskList?: TaskList;
-			taskStartToCloseTimeout?: string;
-			childPolicy?: string;
-			tagList?: string[];
-			workflowType?: WorkflowType;
-		}
-
-		export interface ContinueAsNewWorkflowExecutionFailedEventAttributes {
-			cause?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface WorkflowExecutionTerminatedEventAttributes {
-			reason?: string;
-			details?: string;
-			childPolicy?: string;
-			cause?: string;
-		}
-
-		export interface WorkflowExecutionCancelRequestedEventAttributes {
-			externalWorkflowExecution?: WorkflowExecution;
-			externalInitiatedEventId?: number;
-			cause?: string;
-		}
-
-		export interface DecisionTaskScheduledEventAttributes {
-			taskList?: TaskList;
-			startToCloseTimeout?: string;
-		}
-
-		export interface DecisionTaskStartedEventAttributes {
-			identity?: string;
-			scheduledEventId?: number;
-		}
-
-		export interface DecisionTaskCompletedEventAttributes {
-			executionContext?: string;
-			scheduledEventId?: number;
-			startedEventId?: number;
-		}
-
-		export interface DecisionTaskTimedOutEventAttributes {
-			timeoutType?: string;
-			scheduledEventId?: number;
-			startedEventId?: number;
-		}
-
-		export interface ActivityTaskScheduledEventAttributes {
-			activityType?: ActivityType;
-			activityId?: string;
-			input?: string;
-			control?: string;
-			scheduleToStartTimeout?: string;
-			scheduleToCloseTimeout?: string;
-			startToCloseTimeout?: string;
-			taskList?: TaskList;
-			decisionTaskCompletedEventId?: number;
-			heartbeatTimeout?: string;
-		}
-
-		export interface ActivityTaskStartedEventAttributes {
-			identity?: string;
-			scheduledEventId?: number;
-		}
-
-		export interface ActivityTaskCompletedEventAttributes {
-			result?: string;
-			scheduledEventId?: number;
-			startedEventId?: number;
-		}
-
-		export interface ActivityTaskFailedEventAttributes {
-			reason?: string;
-			details?: string;
-			scheduledEventId?: number;
-			startedEventId?: number;
-		}
-
-		export interface ActivityTaskTimedOutEventAttributes {
-			timeoutType?: string;
-			scheduledEventId?: number;
-			startedEventId?: number;
-			details?: string;
-		}
-
-		export interface ActivityTaskCanceledEventAttributes {
-			details?: string;
-			scheduledEventId?: number;
-			startedEventId?: number;
-			latestCancelRequestedEventId?: number;
-		}
-
-		export interface ActivityTaskCancelRequestedEventAttributes {
-			decisionTaskCompletedEventId?: number;
-			activityId?: string;
-		}
-
-		export interface WorkflowExecutionSignaledEventAttributes {
-			signalName?: string;
-			input?: string;
-			externalWorkflowExecution?: WorkflowExecution;
-			externalInitiatedEventId?: number;
-		}
-
-		export interface MarkerRecordedEventAttributes {
-			markerName?: string;
-			details?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface TimerStartedEventAttributes {
-			timerId?: string;
-			control?: string;
-			startToFireTimeout?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface TimerFiredEventAttributes {
-			timerId?: string;
-			startedEventId?: number;
-		}
-
-		export interface TimerCanceledEventAttributes {
-			timerId?: string;
-			startedEventId?: number;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface StartChildWorkflowExecutionInitiatedEventAttributes {
-			workflowId?: string;
-			workflowType?: WorkflowType;
-			control?: string;
-			input?: string;
-			executionStartToCloseTimeout?: string;
-			taskList?: TaskList;
-			decisionTaskCompletedEventId?: number;
-			childPolicy?: string;
-			taskStartToCloseTimeout?: string;
-			tagList?: string[];
-		}
-
-		export interface ChildWorkflowExecutionStartedEventAttributes {
-			workflowExecution?: WorkflowExecution;
-			workflowType?: WorkflowType;
-			initiatedEventId?: number;
-		}
-
-		export interface ChildWorkflowExecutionCompletedEventAttributes {
-			workflowExecution?: WorkflowExecution;
-			workflowType?: WorkflowType;
-			result?: string;
-			initiatedEventId?: number;
-			startedEventId?: number;
-		}
-
-		export interface ChildWorkflowExecutionFailedEventAttributes {
-			workflowExecution?: WorkflowExecution;
-			workflowType?: WorkflowType;
-			reason?: string;
-			details?: string;
-			initiatedEventId?: number;
-			startedEventId?: number;
-		}
-
-		export interface ChildWorkflowExecutionTimedOutEventAttributes {
-			workflowExecution?: WorkflowExecution;
-			workflowType?: WorkflowType;
-			timeoutType?: string;
-			initiatedEventId?: number;
-			startedEventId?: number;
-		}
-
-		export interface ChildWorkflowExecutionCanceledEventAttributes {
-			workflowExecution?: WorkflowExecution;
-			workflowType?: WorkflowType;
-			details?: string;
-			initiatedEventId?: number;
-			startedEventId?: number;
-		}
-
-		export interface ChildWorkflowExecutionTerminatedEventAttributes {
-			workflowExecution?: WorkflowExecution;
-			workflowType?: WorkflowType;
-			initiatedEventId?: number;
-			startedEventId?: number;
-		}
-
-		export interface SignalExternalWorkflowExecutionInitiatedEventAttributes {
-			workflowId?: string;
-			runId?: string;
-			signalName?: string;
-			input?: string;
-			decisionTaskCompletedEventId?: number;
-			control?: string;
-		}
-
-		export interface ExternalWorkflowExecutionSignaledEventAttributes {
-			workflowExecution?: WorkflowExecution;
-			initiatedEventId?: number;
-		}
-
-		export interface SignalExternalWorkflowExecutionFailedEventAttributes {
-			workflowId?: string;
-			runId?: string;
-			cause?: string;
-			initiatedEventId?: number;
-			decisionTaskCompletedEventId?: number;
-			control?: string;
-		}
-
-		export interface ExternalWorkflowExecutionCancelRequestedEventAttributes {
-			workflowExecution?: WorkflowExecution;
-			initiatedEventId?: number;
-		}
-
-		export interface RequestCancelExternalWorkflowExecutionInitiatedEventAttributes {
-			workflowId?: string;
-			runId?: string;
-			decisionTaskCompletedEventId?: number;
-			control?: string;
-		}
-
-		export interface RequestCancelExternalWorkflowExecutionFailedEventAttributes {
-			workflowId?: string;
-			runId?: string;
-			cause?: string;
-			initiatedEventId?: number;
-			decisionTaskCompletedEventId?: number;
-			control?: string;
-		}
-
-		export interface ScheduleActivityTaskFailedEventAttributes {
-			activityType?: ActivityType;
-			activityId?: string;
-			cause?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface RequestCancelActivityTaskFailedEventAttributes {
-			activityId?: string;
-			cause?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface StartTimerFailedEventAttributes {
-			timerId?: string;
-			cause?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface CancelTimerFailedEventAttributes {
-			timerId?: string;
-			cause?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface StartChildWorkflowExecutionFailedEventAttributes {
-			workflowType?: WorkflowType;
-			cause?: string;
-			workflowId?: string;
-			initiatedEventId?: number;
-			decisionTaskCompletedEventId?: number;
-			control?: string;
-		}
-
-		export interface ActivityTask {
-			taskToken?: string;
-			activityId?: string;
-			startedEventId?: number;
-			workflowExecution?: WorkflowExecution;
-			activityType?: ActivityType;
-			input?: string;
-		}
-
-		export interface PollForActivityTaskResult {
-			activityTask?: ActivityTask;
-		}
-
-		export interface PollForDecisionTaskResult {
-			decisionTask?: DecisionTask;
-		}
-
-		export interface StartWorkflowExecutionResult {
-			run?: Run;
-		}
-
-		export interface Run {
-			runId?: string;
-		}
-
-	}
-
-	export module Sns {
-
-		export interface Client {
-			config: ClientConfig;
-
-			publicTopic(params: PublishRequest, callback: (err: any, data: PublishResult) => void): void;
-			createTopic(params: CreateTopicRequest, callback: (err: any, data: CreateTopicResult) => void): void;
-			deleteTopic(params: DeleteTopicRequest, callback: (err: any, data: any) => void): void;
-		}
-
-		export interface PublishRequest {
-			TopicArn?: string;
-			Message?: string;
-			MessageStructure?: string;
-			Subject?: string;
-		}
-
-		export interface PublishResult {
-			MessageId?: string;
-		}
-
-		export interface CreateTopicRequest {
-			Name?: string;
-		}
-
-		export interface CreateTopicResult {
-			TopicArn?: string;
-		}
-
-		export interface DeleteTopicRequest {
-			TopicArn?: string;
-		}
-
-	}
-
-	export module s3 {
-		
-		export interface PutObjectRequest {
-			ACL?: string;
-			Body?: any;
-			Bucket: string;
-			CacheControl?: string;
-			ContentDisposition?: string;
-			ContentEncoding?: string;
-			ContentLanguage?: string;
-			ContentLength?: string;
-			ContentMD5?: string;
-			ContentType?: string;
-			Expires?: any;
-			GrantFullControl?: string;
-			GrantRead?: string;
-			GrantReadACP?: string;
-			GrantWriteACP?: string;
-			Key: string;
-			Metadata?: string[];
-			ServerSideEncryption?: string;
-			StorageClass?: string;
-			WebsiteRedirectLocation?: string;
-		}
-
-		export interface GetObjectRequest {
-			Bucket: string;
-			IfMatch?: string;
-			IfModifiedSince?: any;
-			IfNoneMatch?: string;
-			IfUnmodifiedSince?: any;
-			Key: string;
-			Range?: string;
-			ResponseCacheControl?: string;
-			ResponseContentDisposition?: string;
-			ResponseContentEncoding?: string;
-			ResponseContentLanguage?: string;
-			ResponseContentType?: string;
-			ResponseExpires?: any;
-			VersionId?: string;
-		}
-
-	}
-
-	export module ecs {
-		export interface CreateServicesParams {
-			desiredCount: number;
-			serviceName: string;
-			taskDefinition: string;
-			clientToken?: string;
-			cluster?: string;
-			deploymentConfiguration?: {
-				maximumPercent?: number;
-				minimumHealthyPercent?: number;
-			};
-			loadBalancers?: {
-				containerName?: string;
-				containerPort?: number;
-				loadBalancerName?: string;
-			}[];
-			role?: string;
-		}
-
-		export interface DescribeServicesParams {
-			services: string[];
-			cluster: string;
-		}
-
-		export interface DescribeTaskDefinitionParams {
-			taskDefinition: string;
-		}
-
-		export interface RegisterTaskDefinitionParams {
-			containerDefinitions: {
-				command?: string[],
-				cpu?: number,
-				disableNetworking?: boolean,
-				dnsSearchDomains?: string[],
-				dnsServers?: string[],
-				dockerLabels?: any,
-				dockerSecurityOptions?: string[],
-				entryPoint?: string[],
-				environment?: any[],
-				essential?: boolean,
-				extraHosts?: {
-					hostName: string,
-					ipAddress: string
-				}[];
-				hostname?: string,
-				image?: string,
-				links?: string[],
-				logConfiguration?: {
-					logDriver: string,
-					options: any
-				}[],
-				memory?: number,
-				mountPoints?: {
-					containerPath: string,
-					readOnly: boolean,
-					sourceVolume: string
-				}[];
-				name?: string,
-				portMappings?: {
-					containerPort?: number,
-					hostPort?: number,
-					protocol: string
-				}[];
-				privileged?: boolean,
-				readonlyRootFilesystem?: boolean,
-				ulimits?: {
-					hardLimit: number,
-					name: string,
-					softLimit: number
-				}[];
-				user?: string,
-				volumesFrom?: {
-					readOnly?: boolean,
-					sourceContainer?: string
-				}[],
-				workingDirectory?: string
-			}[];
-			family: string;
-			volumes?: {
-				host: {
-					sourcePath: string
-				},
-				name: string
-			}[];
-		}
-
-		export interface UpdateServiceParams {
-			service: string;
-			cluster?: string;
-			deploymentConfiguration?: {
-				maximumPercent: number;
-				minimumHealthyPercent: number;
-			};
-			desiredCount?: number;
-			taskDefinition: string;
-		}
-	}
-}
diff --git a/aws-sdk/index.d.ts b/aws-sdk/index.d.ts
new file mode 100644
index 0000000000..89b6cfa2f6
--- /dev/null
+++ b/aws-sdk/index.d.ts
@@ -0,0 +1,1196 @@
+// Type definitions for aws-sdk
+// Project: https://github.com/aws/aws-sdk-js
+// Definitions by: midknight41 <https://github.com/midknight41>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/aws-sdk.d.ts
+
+/// <reference types="node" />
+
+
+
+export declare var config: ClientConfig;
+
+export declare function Config(json: any): void;
+
+export declare class Credentials {
+    constructor(accessKeyId: string, secretAccessKey: string, sessionToken?: string);
+    accessKeyId: string;
+}
+
+export interface Logger {
+    write?: (chunk: any, encoding?: string, callback?: () => void) => void;
+    log?: (...messages: any[]) => void;
+}
+
+export interface HttpOptions {
+    proxy?: string;
+    agent?: any;
+    timeout?: number;
+    xhrAsync?: boolean;
+    xhrWithCredentials?: boolean;
+}
+
+export declare class Endpoint {
+    constructor(endpoint: string);
+
+    host: string;
+    hostname: string;
+    href: string;
+    port: number;
+    protocol: string;
+}
+
+export interface Services {
+    autoscaling?: any;
+    cloudformation?: any;
+    cloudfront?: any;
+    cloudsearch?: any;
+    cloudsearchdomain?: any;
+    cloudtrail?: any;
+    cloudwatch?: any;
+    cloudwatchlogs?: any;
+    cognitoidentity?: any;
+    cognitosync?: any;
+    datapipeline?: any;
+    directconnect?: any;
+    dynamodb?: any;
+    ec2?: any;
+    ecs?: any;
+    elasticache?: any;
+    elasticbeanstalk?: any;
+    elastictranscoder?: any;
+    elb?: any;
+    emr?: any;
+    glacier?: any;
+    httpOptions?: HttpOptions;
+    iam?: any;
+    importexport?: any;
+    kinesis?: any;
+    opsworks?: any;
+    rds?: any;
+    redshift?: any;
+    route53?: any;
+    route53domains?: any;
+    s3?: any;
+    ses?: any;
+    simpledb?: any;
+    sns?: any;
+    sqs?: any;
+    storagegateway?: any;
+    sts?: any;
+    support?: any;
+    swf?: any;
+}
+
+export interface ClientConfigPartial extends Services {
+    credentials?: Credentials;
+    region?: string;
+    computeChecksums?: boolean;
+    convertResponseTypes?: boolean;
+    logger?: Logger;
+    maxRedirects?: number;
+    maxRetries?: number;
+    paramValidation?: boolean;
+    s3ForcePathStyle?: boolean;
+    apiVersion?: any;
+    apiVersions?: Services;
+    signatureVersion?: string;
+    sslEnabled?: boolean;
+    systemClockOffset?: number;
+}
+
+export interface ClientConfig extends ClientConfigPartial {
+    update?: (options: ClientConfigPartial, allUnknownKeys?: boolean) => void;
+    getCredentials?: (callback: (err?: any) => void) => void;
+    loadFromPath?: (path: string) => void;
+    credentials: Credentials;
+    region: string;
+}
+
+export declare class SQS {
+    constructor(options?: any);
+    endpoint: Endpoint;
+
+    addPermission(params: SQS.AddPermissionParams, callback: (err: Error, data: any) => void): void;
+    changeMessageVisibility(params: SQS.ChangeMessageVisibilityParams, callback: (err: Error, data: any) => void): void;
+    changeMessageVisibilityBatch(params: SQS.ChangeMessageVisibilityBatchParams, callback: (err: Error, data: SQS.ChangeMessageVisibilityBatchResponse) => void): void;
+    createQueue(params: SQS.CreateQueueParams, callback: (err: Error, data: SQS.CreateQueueResult) => void): void;
+    deleteMessage(params: SQS.DeleteMessageParams, callback: (err: Error, data: any) => void): void;
+    deleteMessageBatch(params: SQS.DeleteMessageBatchParams, callback: (err: Error, data: SQS.DeleteMessageBatchResult) => void): void;
+    deleteQueue(params: { QueueUrl: string; }, callback: (err: Error, data: any) => void): void;
+    getQueueAttributes(params: SQS.GetQueueAttributesParams, callback: (err: Error, data: SQS.GetQueueAttributesResult) => void): void;
+    getQueueUrl(params: SQS.GetQueueUrlParams, callback: (err: Error, data: { QueueUrl: string; }) => void): void;
+    listDeadLetterSourceQueues(params: { QueueUrl: string }, callback: (err: Error, data: { queueUrls: string[] }) => void): void;
+    listQueues(params: { QueueNamePrefix?: string }, callback: (err: Error, data: { QueueUrls: string[] }) => void): void;
+    purgeQueue(params: { QueueUrl: string }, callback: (err: Error, data: any) => void): void;
+    receiveMessage(params: SQS.ReceiveMessageParams, callback: (err: Error, data: SQS.ReceiveMessageResult) => void): void;
+    removePermission(params: { QueueUrl: string, Label: string }, callback: (err: Error, data: any) => void): void;
+    sendMessage(params: SQS.SendMessageParams, callback: (err: Error, data: SQS.SendMessageResult) => void): void;
+    sendMessageBatch(params: SQS.SendMessageBatchParams, callback: (err: Error, data: SQS.SendMessageBatchResult) => void): void;
+    setQueueAttributes(params: SQS.SetQueueAttributesParams, callback: (err: Error, data: any) => void): void;
+}
+
+export declare class SES {
+    constructor(options?: any);
+    public client: Ses.Client;
+}
+
+export declare class SNS {
+    constructor(options?: any);
+    public client: Sns.Client;
+}
+
+export declare class SimpleWorkflow {
+    constructor(options?: any);
+    public client: Swf.Client;
+}
+
+export declare class S3 {
+    constructor(options?: any);
+    putObject(params: s3.PutObjectRequest, callback: (err: any, data: any) => void): void;
+    getObject(params: s3.GetObjectRequest, callback: (err: any, data: any) => void): void;
+}
+
+export declare class ECS {
+    constructor(options?: any);
+
+    createService(params: ecs.CreateServicesParams, callback: (err: any, data: any) => void): void;
+    describeServices(params: ecs.DescribeServicesParams, callback: (err: any, data: any) => void): void;
+    describeTaskDefinition(params: ecs.DescribeTaskDefinitionParams, callback: (err: any, data: any) => void): void;
+    registerTaskDefinition(params: ecs.RegisterTaskDefinitionParams, callback: (err: any, data: any) => void): void;
+    updateService(params: ecs.UpdateServiceParams, callback: (err: any, data: any) => void): void;
+}
+
+export declare class DynamoDB {
+    constructor(options?: any);
+}
+
+export declare module DynamoDB {
+    export class DocumentClient {
+        constructor(options?: any);
+    }
+}
+
+export declare module SQS {
+
+    export interface SqsOptions {
+        params?: any;
+        endpoint?: string;
+        accessKeyId?: string;
+        secretAccessKey?: string;
+        sessionToken?: Credentials;
+        credentials?: Credentials;
+        credentialProvider?: any;
+        region?: string;
+        maxRetries?: number;
+        maxRedirects?: number;
+        sslEnabled?: boolean;
+        paramValidation?: boolean;
+        computeChecksums?: boolean;
+        convertResponseTypes?: boolean;
+        correctClockSkew?: boolean;
+        s3ForcePathStyle?: boolean;
+        s3BucketEndpoint?: boolean;
+        httpOptions?: HttpOptions;
+        apiVersion?: string;
+        apiVersions?: { [serviceName: string]: string };
+        logger?: Logger;
+        systemClockOffset?: number;
+        signatureVersion?: string;
+        signatureCache?: boolean;
+    }
+
+    export interface AddPermissionParams {
+        QueueUrl: string;
+        Label: string;
+        AWSAccountIds: string[];
+        Actions: string[];
+    }
+
+    export interface ChangeMessageVisibilityParams {
+        QueueUrl: string,
+        ReceiptHandle: string,
+        VisibilityTimeout: number
+    }
+
+    export interface ChangeMessageVisibilityBatchParams {
+        QueueUrl: string,
+        Entries: { Id: string; ReceiptHandle: string; VisibilityTimeout?: number; }[]
+    }
+
+    export interface ChangeMessageVisibilityBatchResponse {
+        Successful: { Id: string }[];
+        Failed: BatchResultErrorEntry[];
+    }
+
+    export interface SendMessageParams {
+        QueueUrl: string;
+        MessageBody: string;
+        DelaySeconds?: number;
+        MessageAttributes?: { [name: string]: MessageAttribute; }
+    }
+
+    export interface ReceiveMessageParams {
+        QueueUrl: string;
+        MaxNumberOfMessages?: number;
+        VisibilityTimeout?: number;
+        AttributeNames?: string[];
+        MessageAttributeNames?: string[];
+        WaitTimeSeconds?: number;
+    }
+
+    export interface DeleteMessageBatchParams {
+        QueueUrl: string;
+        Entries: DeleteMessageBatchRequestEntry[];
+    }
+
+    export interface DeleteMessageBatchRequestEntry {
+        Id: string;
+        ReceiptHandle: string;
+    }
+
+    export interface DeleteMessageParams {
+        QueueUrl: string;
+        ReceiptHandle: string;
+    }
+
+    export interface SendMessageBatchParams {
+        QueueUrl: string;
+        Entries: SendMessageBatchRequestEntry[];
+    }
+
+    export interface SendMessageBatchRequestEntry {
+        Id: string;
+        MessageBody: string;
+        DelaySeconds?: number;
+        MessageAttributes?: { [name: string]: MessageAttribute; }
+    }
+
+    export interface CreateQueueParams {
+        QueueName: string;
+        Attributes: QueueAttributes;
+    }
+
+    export interface QueueAttributes {
+        [name: string]: any;
+        DelaySeconds?: number;
+        MaximumMessageSize?: number;
+        MessageRetentionPeriod?: number;
+        Policy?: any;
+        ReceiveMessageWaitTimeSeconds?: number;
+        VisibilityTimeout?: number;
+        RedrivePolicy?: any;
+    }
+
+    export interface GetQueueAttributesParams {
+        QueueUrl: string;
+        AttributeNames: string[];
+    }
+
+    export interface GetQueueAttributesResult {
+        Attributes: { [name: string]: string };
+    }
+
+    export interface GetQueueUrlParams {
+        QueueName: string;
+        QueueOwnerAWSAccountId?: string;
+    }
+
+    export interface SendMessageResult {
+        MessageId: string;
+        MD5OfMessageBody: string;
+        MD5OfMessageAttributes: string;
+    }
+
+    export interface ReceiveMessageResult {
+        Messages: Message[];
+    }
+
+    export interface Message {
+        MessageId: string;
+        ReceiptHandle: string;
+        MD5OfBody: string;
+        Body: string;
+        Attributes: { [name: string]: any };
+        MD5OfMessageAttributes: string;
+        MessageAttributes: { [name: string]: MessageAttribute; }
+    }
+
+    export interface MessageAttribute {
+        StringValue?: string;
+        BinaryValue?: any; //(Buffer, Typed Array, Blob, String) 
+        StringListValues?: string[];
+        BinaryListValues?: any[];
+        DataType: string;
+    }
+
+    export interface DeleteMessageBatchResult {
+        Successful: DeleteMessageBatchResultEntry[];
+        Failed: BatchResultErrorEntry[];
+    }
+
+    export interface DeleteMessageBatchResultEntry {
+        Id: string;
+    }
+
+    export interface BatchResultErrorEntry {
+        Id: string;
+        Code: string;
+        Message?: string;
+        SenderFault: boolean;
+    }
+
+    export interface SendMessageBatchResult {
+        Successful: SendMessageBatchResultEntry[];
+        Failed: BatchResultErrorEntry[];
+    }
+
+    export interface SendMessageBatchResultEntry {
+        Id: string;
+        MessageId: string;
+        MD5OfMessageBody: string;
+        MD5OfMessageAttributes: string;
+    }
+
+    export interface CreateQueueResult {
+        QueueUrl: string;
+    }
+
+    export interface SetQueueAttributesParams {
+        QueueUrl: string;
+        Attributes: QueueAttributes;
+    }
+
+}
+
+export declare module Ses {
+
+    export interface Client {
+        config: ClientConfig;
+
+        sendEmail(params: any, callback: (err: any, data: SendEmailResult) => void): void;
+    }
+
+    export interface SendEmailRequest {
+        Source: string;
+        Destination: Destination;
+        Message: Message;
+        ReplyToAddresses: string[];
+        ReturnPath: string;
+    }
+
+    export class Destination {
+        ToAddresses: string[];
+        CcAddresses: string[];
+        BccAddresses: string[];
+    }
+
+    export class Message {
+        Subject: Content;
+        Body: Body;
+    }
+
+    export class Content {
+        Data: string;
+        Charset: string;
+    }
+
+    export class Body {
+        Text: Content;
+        Html: Content;
+    }
+
+    export class SendEmailResult {
+        MessageId: string;
+    }
+
+}
+
+export declare module Swf {
+
+    export class Client {
+        //constructor(options?: any);
+        public config: ClientConfig;
+
+        countClosedWorkflowExecutions(params: any, callback: (err: any, data: any) => void): void;
+        countOpenWorkflowExecutions(params: any, callback: (err: any, data: any) => void): void;
+        countPendingActivityTasks(params: any, callback: (err: any, data: any) => void): void;
+        countPendingDecisionTasks(params: any, callback: (err: any, data: any) => void): void;
+        deprecateActivityType(params: any, callback: (err: any, data: any) => void): void;
+        deprecateDomain(params: any, callback: (err: any, data: any) => void): void;
+        deprecateWorkflowType(params: any, callback: (err: any, data: any) => void): void;
+        describeActivityType(params: any, callback: (err: any, data: any) => void): void;
+        describeDomain(params: any, callback: (err: any, data: any) => void): void;
+        describeWorkflowExecution(params: any, callback: (err: any, data: any) => void): void;
+        describeWorkflowType(params: any, callback: (err: any, data: any) => void): void;
+        getWorkflowExecutionHistory(params: any, callback: (err: any, data: any) => void): void;
+        listActivityTypes(params: any, callback: (err: any, data: any) => void): void;
+        listClosedWorkflowExecutions(params: any, callback: (err: any, data: any) => void): void;
+        listDomains(params: any, callback: (err: any, data: any) => void): void;
+        listOpenWorkflowExecutions(params: any, callback: (err: any, data: any) => void): void;
+        listWorkflowTypes(params: any, callback: (err: any, data: any) => void): void;
+        pollForActivityTask(params: any, callback: (err: any, data: ActivityTask) => void): void;
+        pollForDecisionTask(params: any, callback: (err: any, data: DecisionTask) => void): void;
+        recordActivityTaskHeartbeat(params: any, callback: (err: any, data: any) => void): void;
+        registerActivityType(params: any, callback: (err: any, data: any) => void): void;
+        registerDomain(params: any, callback: (err: any, data: any) => void): void;
+        registerWorkflowType(params: any, callback: (err: any, data: any) => void): void;
+        requestCancelWorkflowExecution(params: any, callback: (err: any, data: any) => void): void;
+        respondActivityTaskCanceled(params: RespondActivityTaskCanceledRequest, callback: (err: any, data: any) => void): void;
+        respondActivityTaskCompleted(params: RespondActivityTaskCompletedRequest, callback: (err: any, data: any) => void): void;
+        respondActivityTaskFailed(params: RespondActivityTaskFailedRequest, callback: (err: any, data: any) => void): void;
+        respondDecisionTaskCompleted(params: RespondDecisionTaskCompletedRequest, callback: (err: any, data: any) => void): void;
+        signalWorkflowExecution(params: any, callback: (err: any, data: any) => void): void;
+        startWorkflowExecution(params: any, callback: (err: any, data: StartWorkflowExecutionResult) => void): void;
+        terminateWorkflowExecution(params: any, callback: (err: any, data: any) => void): void;
+    }
+
+    export interface PollForActivityTaskRequest {
+        domain?: string;
+        taskList?: TaskList;
+        identity?: string;
+    }
+
+    export interface TaskList {
+        name?: string;
+    }
+
+    export interface PollForDecisionTaskRequest {
+        domain?: string;
+        taskList?: TaskList;
+        identity?: string;
+        nextPageToken?: string;
+        maximumPageSize?: number;
+        reverseOrder?: Boolean;
+    }
+
+    export interface StartWorkflowExecutionRequest {
+        domain?: string;
+        workflowId?: string;
+        workflowType?: WorkflowType;
+        taskList?: TaskList;
+        input?: string;
+        executionStartToCloseTimeout?: string;
+        tagList?: string[];
+        taskStartToCloseTimeout?: string;
+        childPolicy?: string;
+    }
+
+    export interface WorkflowType {
+        name?: string;
+        version?: string;
+    }
+
+    export interface RespondDecisionTaskCompletedRequest {
+        taskToken?: string;
+        decisions?: Decision[];
+        executionContext?: string;
+    }
+
+    export interface Decision {
+        decisionType?: string;
+        scheduleActivityTaskDecisionAttributes?: ScheduleActivityTaskDecisionAttributes;
+        requestCancelActivityTaskDecisionAttributes?: RequestCancelActivityTaskDecisionAttributes;
+        completeWorkflowExecutionDecisionAttributes?: CompleteWorkflowExecutionDecisionAttributes;
+        failWorkflowExecutionDecisionAttributes?: FailWorkflowExecutionDecisionAttributes;
+        cancelWorkflowExecutionDecisionAttributes?: CancelWorkflowExecutionDecisionAttributes;
+        continueAsNewWorkflowExecutionDecisionAttributes?: ContinueAsNewWorkflowExecutionDecisionAttributes;
+        recordMarkerDecisionAttributes?: RecordMarkerDecisionAttributes;
+        startTimerDecisionAttributes?: StartTimerDecisionAttributes;
+        cancelTimerDecisionAttributes?: CancelTimerDecisionAttributes;
+        signalExternalWorkflowExecutionDecisionAttributes?: SignalExternalWorkflowExecutionDecisionAttributes;
+        requestCancelExternalWorkflowExecutionDecisionAttributes?: RequestCancelExternalWorkflowExecutionDecisionAttributes;
+        startChildWorkflowExecutionDecisionAttributes?: StartChildWorkflowExecutionDecisionAttributes;
+    }
+
+    export interface ScheduleActivityTaskDecisionAttributes {
+        activityType?: ActivityType;
+        activityId?: string;
+        control?: string;
+        input?: string;
+        scheduleToCloseTimeout?: string;
+        taskList?: TaskList;
+        scheduleToStartTimeout?: string;
+        startToCloseTimeout?: string;
+        heartbeatTimeout?: string;
+    }
+
+    export interface ActivityType {
+        name?: string;
+        version?: string;
+    }
+
+    export interface RequestCancelActivityTaskDecisionAttributes {
+        activityId?: string;
+    }
+
+    export interface CompleteWorkflowExecutionDecisionAttributes {
+        result?: string;
+    }
+
+    export interface FailWorkflowExecutionDecisionAttributes {
+        reason?: string;
+        details?: string;
+    }
+
+    export interface CancelWorkflowExecutionDecisionAttributes {
+        details?: string;
+    }
+
+    export interface ContinueAsNewWorkflowExecutionDecisionAttributes {
+        input?: string;
+        executionStartToCloseTimeout?: string;
+        taskList?: TaskList;
+        taskStartToCloseTimeout?: string;
+        childPolicy?: string;
+        tagList?: string[];
+        workflowTypeVersion?: string;
+    }
+
+    export interface RecordMarkerDecisionAttributes {
+        markerName?: string;
+        details?: string;
+    }
+
+    export interface StartTimerDecisionAttributes {
+        timerId?: string;
+        control?: string;
+        startToFireTimeout?: string;
+    }
+
+    export interface CancelTimerDecisionAttributes {
+        timerId?: string;
+    }
+
+    export interface SignalExternalWorkflowExecutionDecisionAttributes {
+        workflowId?: string;
+        runId?: string;
+        signalName?: string;
+        input?: string;
+        control?: string;
+    }
+
+    export interface RequestCancelExternalWorkflowExecutionDecisionAttributes {
+        workflowId?: string;
+        runId?: string;
+        control?: string;
+    }
+
+    export interface StartChildWorkflowExecutionDecisionAttributes {
+        workflowType?: WorkflowType;
+        workflowId?: string;
+        control?: string;
+        input?: string;
+        executionStartToCloseTimeout?: string;
+        taskList?: TaskList;
+        taskStartToCloseTimeout?: string;
+        childPolicy?: string;
+        tagList?: string[];
+    }
+
+    export interface RespondActivityTaskCompletedRequest {
+        taskToken?: string;
+        result?: string;
+    }
+
+    export interface RespondActivityTaskFailedRequest {
+        taskToken?: string;
+        reason?: string;
+        details?: string;
+    }
+
+    export interface RespondActivityTaskCanceledRequest {
+        taskToken?: string;
+        details?: string;
+    }
+
+    export interface DecisionTask {
+        taskToken?: string;
+        startedEventId?: number;
+        workflowExecution?: WorkflowExecution;
+        workflowType?: WorkflowType;
+        events?: HistoryEvent[];
+        nextPageToken?: string;
+        previousStartedEventId?: number;
+    }
+
+    export interface WorkflowExecution {
+        workflowId?: string;
+        runId?: string;
+    }
+
+    export interface HistoryEvent {
+        eventTimestamp?: any;
+        eventType?: string;
+        eventId?: number;
+        workflowExecutionStartedEventAttributes?: WorkflowExecutionStartedEventAttributes;
+        workflowExecutionCompletedEventAttributes?: WorkflowExecutionCompletedEventAttributes;
+        completeWorkflowExecutionFailedEventAttributes?: CompleteWorkflowExecutionFailedEventAttributes;
+        workflowExecutionFailedEventAttributes?: WorkflowExecutionFailedEventAttributes;
+        failWorkflowExecutionFailedEventAttributes?: FailWorkflowExecutionFailedEventAttributes;
+        workflowExecutionTimedOutEventAttributes?: WorkflowExecutionTimedOutEventAttributes;
+        workflowExecutionCanceledEventAttributes?: WorkflowExecutionCanceledEventAttributes;
+        cancelWorkflowExecutionFailedEventAttributes?: CancelWorkflowExecutionFailedEventAttributes;
+        workflowExecutionContinuedAsNewEventAttributes?: WorkflowExecutionContinuedAsNewEventAttributes;
+        continueAsNewWorkflowExecutionFailedEventAttributes?: ContinueAsNewWorkflowExecutionFailedEventAttributes;
+        workflowExecutionTerminatedEventAttributes?: WorkflowExecutionTerminatedEventAttributes;
+        workflowExecutionCancelRequestedEventAttributes?: WorkflowExecutionCancelRequestedEventAttributes;
+        decisionTaskScheduledEventAttributes?: DecisionTaskScheduledEventAttributes;
+        decisionTaskStartedEventAttributes?: DecisionTaskStartedEventAttributes;
+        decisionTaskCompletedEventAttributes?: DecisionTaskCompletedEventAttributes;
+        decisionTaskTimedOutEventAttributes?: DecisionTaskTimedOutEventAttributes;
+        activityTaskScheduledEventAttributes?: ActivityTaskScheduledEventAttributes;
+        activityTaskStartedEventAttributes?: ActivityTaskStartedEventAttributes;
+        activityTaskCompletedEventAttributes?: ActivityTaskCompletedEventAttributes;
+        activityTaskFailedEventAttributes?: ActivityTaskFailedEventAttributes;
+        activityTaskTimedOutEventAttributes?: ActivityTaskTimedOutEventAttributes;
+        activityTaskCanceledEventAttributes?: ActivityTaskCanceledEventAttributes;
+        activityTaskCancelRequestedEventAttributes?: ActivityTaskCancelRequestedEventAttributes;
+        workflowExecutionSignaledEventAttributes?: WorkflowExecutionSignaledEventAttributes;
+        markerRecordedEventAttributes?: MarkerRecordedEventAttributes;
+        timerStartedEventAttributes?: TimerStartedEventAttributes;
+        timerFiredEventAttributes?: TimerFiredEventAttributes;
+        timerCanceledEventAttributes?: TimerCanceledEventAttributes;
+        startChildWorkflowExecutionInitiatedEventAttributes?: StartChildWorkflowExecutionInitiatedEventAttributes;
+        childWorkflowExecutionStartedEventAttributes?: ChildWorkflowExecutionStartedEventAttributes;
+        childWorkflowExecutionCompletedEventAttributes?: ChildWorkflowExecutionCompletedEventAttributes;
+        childWorkflowExecutionFailedEventAttributes?: ChildWorkflowExecutionFailedEventAttributes;
+        childWorkflowExecutionTimedOutEventAttributes?: ChildWorkflowExecutionTimedOutEventAttributes;
+        childWorkflowExecutionCanceledEventAttributes?: ChildWorkflowExecutionCanceledEventAttributes;
+        childWorkflowExecutionTerminatedEventAttributes?: ChildWorkflowExecutionTerminatedEventAttributes;
+        signalExternalWorkflowExecutionInitiatedEventAttributes?: SignalExternalWorkflowExecutionInitiatedEventAttributes;
+        externalWorkflowExecutionSignaledEventAttributes?: ExternalWorkflowExecutionSignaledEventAttributes;
+        signalExternalWorkflowExecutionFailedEventAttributes?: SignalExternalWorkflowExecutionFailedEventAttributes;
+        externalWorkflowExecutionCancelRequestedEventAttributes?: ExternalWorkflowExecutionCancelRequestedEventAttributes;
+        requestCancelExternalWorkflowExecutionInitiatedEventAttributes?: RequestCancelExternalWorkflowExecutionInitiatedEventAttributes;
+        requestCancelExternalWorkflowExecutionFailedEventAttributes?: RequestCancelExternalWorkflowExecutionFailedEventAttributes;
+        scheduleActivityTaskFailedEventAttributes?: ScheduleActivityTaskFailedEventAttributes;
+        requestCancelActivityTaskFailedEventAttributes?: RequestCancelActivityTaskFailedEventAttributes;
+        startTimerFailedEventAttributes?: StartTimerFailedEventAttributes;
+        cancelTimerFailedEventAttributes?: CancelTimerFailedEventAttributes;
+        startChildWorkflowExecutionFailedEventAttributes?: StartChildWorkflowExecutionFailedEventAttributes;
+    }
+
+    export interface WorkflowExecutionStartedEventAttributes {
+        input?: string;
+        executionStartToCloseTimeout?: string;
+        taskStartToCloseTimeout?: string;
+        childPolicy?: string;
+        taskList?: TaskList;
+        workflowType?: WorkflowType;
+        tagList?: string[];
+        continuedExecutionRunId?: string;
+        parentWorkflowExecution?: WorkflowExecution;
+        parentInitiatedEventId?: number;
+    }
+
+    export interface WorkflowExecutionCompletedEventAttributes {
+        result?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface CompleteWorkflowExecutionFailedEventAttributes {
+        cause?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface WorkflowExecutionFailedEventAttributes {
+        reason?: string;
+        details?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface FailWorkflowExecutionFailedEventAttributes {
+        cause?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface WorkflowExecutionTimedOutEventAttributes {
+        timeoutType?: string;
+        childPolicy?: string;
+    }
+
+    export interface WorkflowExecutionCanceledEventAttributes {
+        details?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface CancelWorkflowExecutionFailedEventAttributes {
+        cause?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface WorkflowExecutionContinuedAsNewEventAttributes {
+        input?: string;
+        decisionTaskCompletedEventId?: number;
+        newExecutionRunId?: string;
+        executionStartToCloseTimeout?: string;
+        taskList?: TaskList;
+        taskStartToCloseTimeout?: string;
+        childPolicy?: string;
+        tagList?: string[];
+        workflowType?: WorkflowType;
+    }
+
+    export interface ContinueAsNewWorkflowExecutionFailedEventAttributes {
+        cause?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface WorkflowExecutionTerminatedEventAttributes {
+        reason?: string;
+        details?: string;
+        childPolicy?: string;
+        cause?: string;
+    }
+
+    export interface WorkflowExecutionCancelRequestedEventAttributes {
+        externalWorkflowExecution?: WorkflowExecution;
+        externalInitiatedEventId?: number;
+        cause?: string;
+    }
+
+    export interface DecisionTaskScheduledEventAttributes {
+        taskList?: TaskList;
+        startToCloseTimeout?: string;
+    }
+
+    export interface DecisionTaskStartedEventAttributes {
+        identity?: string;
+        scheduledEventId?: number;
+    }
+
+    export interface DecisionTaskCompletedEventAttributes {
+        executionContext?: string;
+        scheduledEventId?: number;
+        startedEventId?: number;
+    }
+
+    export interface DecisionTaskTimedOutEventAttributes {
+        timeoutType?: string;
+        scheduledEventId?: number;
+        startedEventId?: number;
+    }
+
+    export interface ActivityTaskScheduledEventAttributes {
+        activityType?: ActivityType;
+        activityId?: string;
+        input?: string;
+        control?: string;
+        scheduleToStartTimeout?: string;
+        scheduleToCloseTimeout?: string;
+        startToCloseTimeout?: string;
+        taskList?: TaskList;
+        decisionTaskCompletedEventId?: number;
+        heartbeatTimeout?: string;
+    }
+
+    export interface ActivityTaskStartedEventAttributes {
+        identity?: string;
+        scheduledEventId?: number;
+    }
+
+    export interface ActivityTaskCompletedEventAttributes {
+        result?: string;
+        scheduledEventId?: number;
+        startedEventId?: number;
+    }
+
+    export interface ActivityTaskFailedEventAttributes {
+        reason?: string;
+        details?: string;
+        scheduledEventId?: number;
+        startedEventId?: number;
+    }
+
+    export interface ActivityTaskTimedOutEventAttributes {
+        timeoutType?: string;
+        scheduledEventId?: number;
+        startedEventId?: number;
+        details?: string;
+    }
+
+    export interface ActivityTaskCanceledEventAttributes {
+        details?: string;
+        scheduledEventId?: number;
+        startedEventId?: number;
+        latestCancelRequestedEventId?: number;
+    }
+
+    export interface ActivityTaskCancelRequestedEventAttributes {
+        decisionTaskCompletedEventId?: number;
+        activityId?: string;
+    }
+
+    export interface WorkflowExecutionSignaledEventAttributes {
+        signalName?: string;
+        input?: string;
+        externalWorkflowExecution?: WorkflowExecution;
+        externalInitiatedEventId?: number;
+    }
+
+    export interface MarkerRecordedEventAttributes {
+        markerName?: string;
+        details?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface TimerStartedEventAttributes {
+        timerId?: string;
+        control?: string;
+        startToFireTimeout?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface TimerFiredEventAttributes {
+        timerId?: string;
+        startedEventId?: number;
+    }
+
+    export interface TimerCanceledEventAttributes {
+        timerId?: string;
+        startedEventId?: number;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface StartChildWorkflowExecutionInitiatedEventAttributes {
+        workflowId?: string;
+        workflowType?: WorkflowType;
+        control?: string;
+        input?: string;
+        executionStartToCloseTimeout?: string;
+        taskList?: TaskList;
+        decisionTaskCompletedEventId?: number;
+        childPolicy?: string;
+        taskStartToCloseTimeout?: string;
+        tagList?: string[];
+    }
+
+    export interface ChildWorkflowExecutionStartedEventAttributes {
+        workflowExecution?: WorkflowExecution;
+        workflowType?: WorkflowType;
+        initiatedEventId?: number;
+    }
+
+    export interface ChildWorkflowExecutionCompletedEventAttributes {
+        workflowExecution?: WorkflowExecution;
+        workflowType?: WorkflowType;
+        result?: string;
+        initiatedEventId?: number;
+        startedEventId?: number;
+    }
+
+    export interface ChildWorkflowExecutionFailedEventAttributes {
+        workflowExecution?: WorkflowExecution;
+        workflowType?: WorkflowType;
+        reason?: string;
+        details?: string;
+        initiatedEventId?: number;
+        startedEventId?: number;
+    }
+
+    export interface ChildWorkflowExecutionTimedOutEventAttributes {
+        workflowExecution?: WorkflowExecution;
+        workflowType?: WorkflowType;
+        timeoutType?: string;
+        initiatedEventId?: number;
+        startedEventId?: number;
+    }
+
+    export interface ChildWorkflowExecutionCanceledEventAttributes {
+        workflowExecution?: WorkflowExecution;
+        workflowType?: WorkflowType;
+        details?: string;
+        initiatedEventId?: number;
+        startedEventId?: number;
+    }
+
+    export interface ChildWorkflowExecutionTerminatedEventAttributes {
+        workflowExecution?: WorkflowExecution;
+        workflowType?: WorkflowType;
+        initiatedEventId?: number;
+        startedEventId?: number;
+    }
+
+    export interface SignalExternalWorkflowExecutionInitiatedEventAttributes {
+        workflowId?: string;
+        runId?: string;
+        signalName?: string;
+        input?: string;
+        decisionTaskCompletedEventId?: number;
+        control?: string;
+    }
+
+    export interface ExternalWorkflowExecutionSignaledEventAttributes {
+        workflowExecution?: WorkflowExecution;
+        initiatedEventId?: number;
+    }
+
+    export interface SignalExternalWorkflowExecutionFailedEventAttributes {
+        workflowId?: string;
+        runId?: string;
+        cause?: string;
+        initiatedEventId?: number;
+        decisionTaskCompletedEventId?: number;
+        control?: string;
+    }
+
+    export interface ExternalWorkflowExecutionCancelRequestedEventAttributes {
+        workflowExecution?: WorkflowExecution;
+        initiatedEventId?: number;
+    }
+
+    export interface RequestCancelExternalWorkflowExecutionInitiatedEventAttributes {
+        workflowId?: string;
+        runId?: string;
+        decisionTaskCompletedEventId?: number;
+        control?: string;
+    }
+
+    export interface RequestCancelExternalWorkflowExecutionFailedEventAttributes {
+        workflowId?: string;
+        runId?: string;
+        cause?: string;
+        initiatedEventId?: number;
+        decisionTaskCompletedEventId?: number;
+        control?: string;
+    }
+
+    export interface ScheduleActivityTaskFailedEventAttributes {
+        activityType?: ActivityType;
+        activityId?: string;
+        cause?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface RequestCancelActivityTaskFailedEventAttributes {
+        activityId?: string;
+        cause?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface StartTimerFailedEventAttributes {
+        timerId?: string;
+        cause?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface CancelTimerFailedEventAttributes {
+        timerId?: string;
+        cause?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface StartChildWorkflowExecutionFailedEventAttributes {
+        workflowType?: WorkflowType;
+        cause?: string;
+        workflowId?: string;
+        initiatedEventId?: number;
+        decisionTaskCompletedEventId?: number;
+        control?: string;
+    }
+
+    export interface ActivityTask {
+        taskToken?: string;
+        activityId?: string;
+        startedEventId?: number;
+        workflowExecution?: WorkflowExecution;
+        activityType?: ActivityType;
+        input?: string;
+    }
+
+    export interface PollForActivityTaskResult {
+        activityTask?: ActivityTask;
+    }
+
+    export interface PollForDecisionTaskResult {
+        decisionTask?: DecisionTask;
+    }
+
+    export interface StartWorkflowExecutionResult {
+        run?: Run;
+    }
+
+    export interface Run {
+        runId?: string;
+    }
+
+}
+
+export declare module Sns {
+
+    export interface Client {
+        config: ClientConfig;
+
+        publicTopic(params: PublishRequest, callback: (err: any, data: PublishResult) => void): void;
+        createTopic(params: CreateTopicRequest, callback: (err: any, data: CreateTopicResult) => void): void;
+        deleteTopic(params: DeleteTopicRequest, callback: (err: any, data: any) => void): void;
+    }
+
+    export interface PublishRequest {
+        TopicArn?: string;
+        Message?: string;
+        MessageStructure?: string;
+        Subject?: string;
+    }
+
+    export interface PublishResult {
+        MessageId?: string;
+    }
+
+    export interface CreateTopicRequest {
+        Name?: string;
+    }
+
+    export interface CreateTopicResult {
+        TopicArn?: string;
+    }
+
+    export interface DeleteTopicRequest {
+        TopicArn?: string;
+    }
+
+}
+
+export declare module s3 {
+
+    export interface PutObjectRequest {
+        ACL?: string;
+        Body?: any;
+        Bucket: string;
+        CacheControl?: string;
+        ContentDisposition?: string;
+        ContentEncoding?: string;
+        ContentLanguage?: string;
+        ContentLength?: string;
+        ContentMD5?: string;
+        ContentType?: string;
+        Expires?: any;
+        GrantFullControl?: string;
+        GrantRead?: string;
+        GrantReadACP?: string;
+        GrantWriteACP?: string;
+        Key: string;
+        Metadata?: string[];
+        ServerSideEncryption?: string;
+        StorageClass?: string;
+        WebsiteRedirectLocation?: string;
+    }
+
+    export interface GetObjectRequest {
+        Bucket: string;
+        IfMatch?: string;
+        IfModifiedSince?: any;
+        IfNoneMatch?: string;
+        IfUnmodifiedSince?: any;
+        Key: string;
+        Range?: string;
+        ResponseCacheControl?: string;
+        ResponseContentDisposition?: string;
+        ResponseContentEncoding?: string;
+        ResponseContentLanguage?: string;
+        ResponseContentType?: string;
+        ResponseExpires?: any;
+        VersionId?: string;
+    }
+
+}
+
+export declare module ecs {
+    export interface CreateServicesParams {
+        desiredCount: number;
+        serviceName: string;
+        taskDefinition: string;
+        clientToken?: string;
+        cluster?: string;
+        deploymentConfiguration?: {
+            maximumPercent?: number;
+            minimumHealthyPercent?: number;
+        };
+        loadBalancers?: {
+            containerName?: string;
+            containerPort?: number;
+            loadBalancerName?: string;
+        }[];
+        role?: string;
+    }
+
+    export interface DescribeServicesParams {
+        services: string[];
+        cluster: string;
+    }
+
+    export interface DescribeTaskDefinitionParams {
+        taskDefinition: string;
+    }
+
+    export interface RegisterTaskDefinitionParams {
+        containerDefinitions: {
+            command?: string[],
+            cpu?: number,
+            disableNetworking?: boolean,
+            dnsSearchDomains?: string[],
+            dnsServers?: string[],
+            dockerLabels?: any,
+            dockerSecurityOptions?: string[],
+            entryPoint?: string[],
+            environment?: any[],
+            essential?: boolean,
+            extraHosts?: {
+                hostName: string,
+                ipAddress: string
+            }[];
+            hostname?: string,
+            image?: string,
+            links?: string[],
+            logConfiguration?: {
+                logDriver: string,
+                options: any
+            }[],
+            memory?: number,
+            mountPoints?: {
+                containerPath: string,
+                readOnly: boolean,
+                sourceVolume: string
+            }[];
+            name?: string,
+            portMappings?: {
+                containerPort?: number,
+                hostPort?: number,
+                protocol: string
+            }[];
+            privileged?: boolean,
+            readonlyRootFilesystem?: boolean,
+            ulimits?: {
+                hardLimit: number,
+                name: string,
+                softLimit: number
+            }[];
+            user?: string,
+            volumesFrom?: {
+                readOnly?: boolean,
+                sourceContainer?: string
+            }[],
+            workingDirectory?: string
+        }[];
+        family: string;
+        volumes?: {
+            host: {
+                sourcePath: string
+            },
+            name: string
+        }[];
+    }
+
+    export interface UpdateServiceParams {
+        service: string;
+        cluster?: string;
+        deploymentConfiguration?: {
+            maximumPercent: number;
+            minimumHealthyPercent: number;
+        };
+        desiredCount?: number;
+        taskDefinition: string;
+    }
+}
diff --git a/aws-sdk/tsconfig.json b/aws-sdk/tsconfig.json
new file mode 100644
index 0000000000..62ac20f152
--- /dev/null
+++ b/aws-sdk/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "aws-sdk-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/axios/axios-tests.ts b/axios/axios-tests.ts
index 040994531b..9c39031ae5 100644
--- a/axios/axios-tests.ts
+++ b/axios/axios-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="axios.d.ts" />
+
 
 enum HttpMethod { GET, PUT, POST, DELETE, CONNECT, HEAD, OPTIONS, TRACE, PATCH }
 enum ResponseType { arraybuffer, blob, document, json, text }
diff --git a/axios/axios.d.ts b/axios/index.d.ts
similarity index 100%
rename from axios/axios.d.ts
rename to axios/index.d.ts
diff --git a/axios/tsconfig.json b/axios/tsconfig.json
new file mode 100644
index 0000000000..25612e2961
--- /dev/null
+++ b/axios/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "axios-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/azure-mobile-apps/azure-mobile-apps-tests.ts b/azure-mobile-apps/azure-mobile-apps-tests.ts
index 093932c2fb..b20ea37773 100644
--- a/azure-mobile-apps/azure-mobile-apps-tests.ts
+++ b/azure-mobile-apps/azure-mobile-apps-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="azure-mobile-apps.d.ts" />
+
 
 import express = require('express');
 import mobileApps = require('azure-mobile-apps');
diff --git a/azure-mobile-apps/azure-mobile-apps.d.ts b/azure-mobile-apps/azure-mobile-apps.d.ts
deleted file mode 100644
index 0a42fa9ecf..0000000000
--- a/azure-mobile-apps/azure-mobile-apps.d.ts
+++ /dev/null
@@ -1,279 +0,0 @@
-// Type definitions for azure-mobile-apps v2.0.0-beta3
-// Project: https://github.com/Azure/azure-mobile-apps-node/
-// Definitions by: Microsoft Azure <https://github.com/Azure/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-/// <reference path="../azure-sb/azure-sb.d.ts" />
-
-declare module "azure-mobile-apps" {
-    interface AzureMobileApps {
-        (configuration?: Azure.MobileApps.Configuration): Azure.MobileApps.Platforms.Express.MobileApp;
-        table(): Azure.MobileApps.Platforms.Express.Table;
-        logger: Azure.MobileApps.Logger;
-        query: Azure.MobileApps.Query;
-    }
-
-    var out: AzureMobileApps;
-    export = out;
-}
-declare module "azure-mobile-apps/src/logger" {
-    var logger: Azure.MobileApps.Logger;
-    export = logger;
-}
-
-declare module "azure-mobile-apps/src/query" {
-    var query: Azure.MobileApps.Query;
-    export = query;
-}
-
-declare namespace Azure.MobileApps {
-    // the additional Platforms namespace is required to avoid collisions with the main Express namespace
-    export module Platforms {
-        export module Express {
-            interface MobileApp {
-                configuration: Configuration;
-                tables: Tables;
-                table(): Table;
-                api: Api;
-                use(...middleware: Middleware[]): MobileApp;
-                use(middleware: Middleware[]): MobileApp;
-            }
-
-            interface Api {
-                add(name: string, definition: ApiDefinition): void;
-                import(fileOrFolder: string): void;
-            }
-
-            interface Table {
-                authorize?: boolean;
-                autoIncrement?: boolean;
-                dynamicSchema?: boolean;
-                name: string;
-                columns?: any;
-                schema: string;
-
-                use(...middleware: Middleware[]): Table;
-                use(middleware: Middleware[]): Table;
-                read: TableOperation;
-                update: TableOperation;
-                insert: TableOperation;
-                delete: TableOperation;
-                undelete: TableOperation;
-            }
-
-            interface TableOperation {
-                (operationHandler: (context: Context) => void): Table;
-                use(...middleware: Middleware[]): Table;
-                use(middleware: Middleware[]): Table;
-            }
-
-            interface Tables {
-                configuration: Configuration;
-                add(name: string, definition?: Table | TableDefinition): void;
-                import(fileOrFolder: string): void;
-                initialize(): Thenable<any>;
-            }
-        }
-    }
-
-    export module Data {
-        interface Table {
-            read(query: QueryJs): Thenable<any[]>;
-            update(item: any, query: QueryJs): Thenable<any>;
-            insert(item: any): Thenable<any>;
-            delete(query: QueryJs, version: string): Thenable<any>;
-            undelete(query: QueryJs, version: string): Thenable<any>;
-            truncate(): Thenable<void>;
-            initialize(): Thenable<void>;
-            schema(): Thenable<Column[]>;
-        }
-
-        interface Column {
-            name: string;
-            type: string;
-        }
-    }
-
-    // auth
-    interface User {
-        id: string;
-        claims: any[];
-        token: string;
-        getIdentity(provider: string): Thenable<any>;
-    }
-
-    interface Auth {
-        validate(token: string): Thenable<User>;
-        decode(token: string): User;
-        sign(payload: any): string;
-    }
-
-    // configuration
-    interface Configuration {
-        platform?: string;
-        basePath?: string;
-        configFile?: string;
-        promiseConstructor?: (resolve: (result: any) => void, reject: (error: any) => void) => Thenable<any>;
-        apiRootPath?: string;
-        tableRootPath?: string;
-        notificationRootPath?: string;
-        swaggerPath?: string;
-        authStubRoute?: string;
-        debug?: boolean;
-        version?: string;
-        apiVersion?: string;
-        homePage?: boolean;
-        swagger?: boolean;
-        maxTop?: number;
-        pageSize?: number;
-        logging?: Configuration.Logging;
-        data?: Configuration.Data;
-        auth?: Configuration.Auth;
-        cors?: Configuration.Cors;
-        notifications?: Configuration.Notifications;
-    }
-
-    export module Configuration {
-        // it would be nice to have the config for various providers in separate interfaces,
-        // but this is the simplest solution to support variations of the current setup
-        interface Data {
-            provider: string;
-            user?: string;
-            password?: string;
-            server?: string;
-            port?: number;
-            database?: string;
-            connectionTimeout?: string;
-            options?: { encrypt: boolean };
-            schema?: string;
-            dynamicSchema?: boolean;
-        }
-
-        interface Auth {
-            secret: string;
-            validateTokens?: boolean;
-        }
-
-        interface Logging {
-            level?: string;
-            transports?: LoggingTransport[];
-        }
-
-        interface LoggingTransport { }
-
-        interface Cors {
-            maxAge?: number;
-            origins: string[];
-        }
-
-        interface Notifications {
-            hubName: string;
-            connectionString?: string;
-            endpoint?: string;
-            sharedAccessKeyName?: string;
-            sharedAccessKeyValue?: string;
-        }
-    }
-
-    // query
-    interface Query {
-        create(tableName: string): QueryJs;
-        fromRequest(req: Express.Request): QueryJs;
-        toOData(query: QueryJs): OData;
-    }
-
-    interface QueryJs {
-        includeTotalCount?: boolean;
-        orderBy(properties: string): QueryJs;
-        orderByDescending(properties: string): QueryJs;
-        select(properties: string): QueryJs;
-        skip(count: number): QueryJs;
-        take(count: number): QueryJs;
-        where(filter: any): QueryJs;
-        // these are properties added by the SDK
-        id?: string | number;
-        single?: boolean;
-    }
-
-    interface OData {
-        table: string;
-        filters?: string;
-        ordering?: string;
-        orderClauses?: string;
-        skip?: number;
-        take?: number;
-        selections?: string;
-        includeTotalCount?: boolean;
-    }
-
-    // general
-    var nh: Azure.ServiceBus.NotificationHubService;
-    interface Context {
-        query: QueryJs;
-        id: string | number;
-        item: any;
-        req: Express.Request;
-        res: Express.Response;
-        data: (table: TableDefinition) => Data.Table;
-        tables: (tableName: string) => Data.Table;
-        user: User;
-        push: typeof nh;
-        logger: Logger;
-        execute(): Thenable<any>;
-    }
-
-    interface TableDefinition {
-        authorize?: boolean;
-        autoIncrement?: boolean;
-        dynamicSchema?: boolean;
-        name?: string;
-        columns?: any;
-        schema?: string;
-    }
-
-    interface ApiDefinition {
-        authorize?: boolean;
-        get?: Middleware | Middleware[];
-        post?: Middleware | Middleware[];
-        patch?: Middleware | Middleware[];
-        put?: Middleware | Middleware[];
-        delete?: Middleware | Middleware[];
-    }
-
-    interface Thenable<R> {
-        then<U>(onFulfilled?: (value: R) => U | Thenable<U>, onRejected?: (error: any) => U | Thenable<U>): Thenable<U>;
-        then<U>(onFulfilled?: (value: R) => U | Thenable<U>, onRejected?: (error: any) => void): Thenable<U>;
-        catch<U>(onRejected?: (error: any) => U | Thenable<U>): Thenable<U>;
-        catch<U>(onRejected?: (error: any) => void): Thenable<U>;
-    }
-
-    interface Logger {
-        log(level: string, ...message: any[]): void;
-        silly(...message: any[]): void;
-        debug(...message: any[]): void;
-        verbose(...message: any[]): void;
-        info(...message: any[]): void;
-        warn(...message: any[]): void;
-        error(...message: any[]): void;
-    }
-
-    interface Middleware {
-        (req: Express.Request, res: Express.Response, next: NextMiddleware): void;
-    }
-
-    interface NextMiddleware {
-        (error?: any): void;
-    }
-}
-
-// additions to the Express modules
-declare namespace Express {
-    interface Request {
-        azureMobile: Azure.MobileApps.Context
-    }
-
-    interface Response {
-        results?: any;
-    }
-}
diff --git a/azure-mobile-apps/index.d.ts b/azure-mobile-apps/index.d.ts
new file mode 100644
index 0000000000..956418d158
--- /dev/null
+++ b/azure-mobile-apps/index.d.ts
@@ -0,0 +1,279 @@
+// Type definitions for azure-mobile-apps v2.0.0-beta3
+// Project: https://github.com/Azure/azure-mobile-apps-node/
+// Definitions by: Microsoft Azure <https://github.com/Azure/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="azure-sb" />
+
+declare module "azure-mobile-apps" {
+    interface AzureMobileApps {
+        (configuration?: Azure.MobileApps.Configuration): Azure.MobileApps.Platforms.Express.MobileApp;
+        table(): Azure.MobileApps.Platforms.Express.Table;
+        logger: Azure.MobileApps.Logger;
+        query: Azure.MobileApps.Query;
+    }
+
+    var out: AzureMobileApps;
+    export = out;
+}
+declare module "azure-mobile-apps/src/logger" {
+    var logger: Azure.MobileApps.Logger;
+    export = logger;
+}
+
+declare module "azure-mobile-apps/src/query" {
+    var query: Azure.MobileApps.Query;
+    export = query;
+}
+
+declare namespace Azure.MobileApps {
+    // the additional Platforms namespace is required to avoid collisions with the main Express namespace
+    export module Platforms {
+        export module Express {
+            interface MobileApp {
+                configuration: Configuration;
+                tables: Tables;
+                table(): Table;
+                api: Api;
+                use(...middleware: Middleware[]): MobileApp;
+                use(middleware: Middleware[]): MobileApp;
+            }
+
+            interface Api {
+                add(name: string, definition: ApiDefinition): void;
+                import(fileOrFolder: string): void;
+            }
+
+            interface Table {
+                authorize?: boolean;
+                autoIncrement?: boolean;
+                dynamicSchema?: boolean;
+                name: string;
+                columns?: any;
+                schema: string;
+
+                use(...middleware: Middleware[]): Table;
+                use(middleware: Middleware[]): Table;
+                read: TableOperation;
+                update: TableOperation;
+                insert: TableOperation;
+                delete: TableOperation;
+                undelete: TableOperation;
+            }
+
+            interface TableOperation {
+                (operationHandler: (context: Context) => void): Table;
+                use(...middleware: Middleware[]): Table;
+                use(middleware: Middleware[]): Table;
+            }
+
+            interface Tables {
+                configuration: Configuration;
+                add(name: string, definition?: Table | TableDefinition): void;
+                import(fileOrFolder: string): void;
+                initialize(): Thenable<any>;
+            }
+        }
+    }
+
+    export module Data {
+        interface Table {
+            read(query: QueryJs): Thenable<any[]>;
+            update(item: any, query: QueryJs): Thenable<any>;
+            insert(item: any): Thenable<any>;
+            delete(query: QueryJs, version: string): Thenable<any>;
+            undelete(query: QueryJs, version: string): Thenable<any>;
+            truncate(): Thenable<void>;
+            initialize(): Thenable<void>;
+            schema(): Thenable<Column[]>;
+        }
+
+        interface Column {
+            name: string;
+            type: string;
+        }
+    }
+
+    // auth
+    interface User {
+        id: string;
+        claims: any[];
+        token: string;
+        getIdentity(provider: string): Thenable<any>;
+    }
+
+    interface Auth {
+        validate(token: string): Thenable<User>;
+        decode(token: string): User;
+        sign(payload: any): string;
+    }
+
+    // configuration
+    interface Configuration {
+        platform?: string;
+        basePath?: string;
+        configFile?: string;
+        promiseConstructor?: (resolve: (result: any) => void, reject: (error: any) => void) => Thenable<any>;
+        apiRootPath?: string;
+        tableRootPath?: string;
+        notificationRootPath?: string;
+        swaggerPath?: string;
+        authStubRoute?: string;
+        debug?: boolean;
+        version?: string;
+        apiVersion?: string;
+        homePage?: boolean;
+        swagger?: boolean;
+        maxTop?: number;
+        pageSize?: number;
+        logging?: Configuration.Logging;
+        data?: Configuration.Data;
+        auth?: Configuration.Auth;
+        cors?: Configuration.Cors;
+        notifications?: Configuration.Notifications;
+    }
+
+    export module Configuration {
+        // it would be nice to have the config for various providers in separate interfaces,
+        // but this is the simplest solution to support variations of the current setup
+        interface Data {
+            provider: string;
+            user?: string;
+            password?: string;
+            server?: string;
+            port?: number;
+            database?: string;
+            connectionTimeout?: string;
+            options?: { encrypt: boolean };
+            schema?: string;
+            dynamicSchema?: boolean;
+        }
+
+        interface Auth {
+            secret: string;
+            validateTokens?: boolean;
+        }
+
+        interface Logging {
+            level?: string;
+            transports?: LoggingTransport[];
+        }
+
+        interface LoggingTransport { }
+
+        interface Cors {
+            maxAge?: number;
+            origins: string[];
+        }
+
+        interface Notifications {
+            hubName: string;
+            connectionString?: string;
+            endpoint?: string;
+            sharedAccessKeyName?: string;
+            sharedAccessKeyValue?: string;
+        }
+    }
+
+    // query
+    interface Query {
+        create(tableName: string): QueryJs;
+        fromRequest(req: Express.Request): QueryJs;
+        toOData(query: QueryJs): OData;
+    }
+
+    interface QueryJs {
+        includeTotalCount?: boolean;
+        orderBy(properties: string): QueryJs;
+        orderByDescending(properties: string): QueryJs;
+        select(properties: string): QueryJs;
+        skip(count: number): QueryJs;
+        take(count: number): QueryJs;
+        where(filter: any): QueryJs;
+        // these are properties added by the SDK
+        id?: string | number;
+        single?: boolean;
+    }
+
+    interface OData {
+        table: string;
+        filters?: string;
+        ordering?: string;
+        orderClauses?: string;
+        skip?: number;
+        take?: number;
+        selections?: string;
+        includeTotalCount?: boolean;
+    }
+
+    // general
+    var nh: Azure.ServiceBus.NotificationHubService;
+    interface Context {
+        query: QueryJs;
+        id: string | number;
+        item: any;
+        req: Express.Request;
+        res: Express.Response;
+        data: (table: TableDefinition) => Data.Table;
+        tables: (tableName: string) => Data.Table;
+        user: User;
+        push: typeof nh;
+        logger: Logger;
+        execute(): Thenable<any>;
+    }
+
+    interface TableDefinition {
+        authorize?: boolean;
+        autoIncrement?: boolean;
+        dynamicSchema?: boolean;
+        name?: string;
+        columns?: any;
+        schema?: string;
+    }
+
+    interface ApiDefinition {
+        authorize?: boolean;
+        get?: Middleware | Middleware[];
+        post?: Middleware | Middleware[];
+        patch?: Middleware | Middleware[];
+        put?: Middleware | Middleware[];
+        delete?: Middleware | Middleware[];
+    }
+
+    interface Thenable<R> {
+        then<U>(onFulfilled?: (value: R) => U | Thenable<U>, onRejected?: (error: any) => U | Thenable<U>): Thenable<U>;
+        then<U>(onFulfilled?: (value: R) => U | Thenable<U>, onRejected?: (error: any) => void): Thenable<U>;
+        catch<U>(onRejected?: (error: any) => U | Thenable<U>): Thenable<U>;
+        catch<U>(onRejected?: (error: any) => void): Thenable<U>;
+    }
+
+    interface Logger {
+        log(level: string, ...message: any[]): void;
+        silly(...message: any[]): void;
+        debug(...message: any[]): void;
+        verbose(...message: any[]): void;
+        info(...message: any[]): void;
+        warn(...message: any[]): void;
+        error(...message: any[]): void;
+    }
+
+    interface Middleware {
+        (req: Express.Request, res: Express.Response, next: NextMiddleware): void;
+    }
+
+    interface NextMiddleware {
+        (error?: any): void;
+    }
+}
+
+// additions to the Express modules
+declare namespace Express {
+    interface Request {
+        azureMobile: Azure.MobileApps.Context
+    }
+
+    interface Response {
+        results?: any;
+    }
+}
diff --git a/azure-mobile-apps/tsconfig.json b/azure-mobile-apps/tsconfig.json
new file mode 100644
index 0000000000..b17f58aae2
--- /dev/null
+++ b/azure-mobile-apps/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "azure-mobile-apps-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/azure-mobile-services-client/AzureMobileServicesClient-tests.ts b/azure-mobile-services-client/AzureMobileServicesClient-tests.ts
index 7a3b9b9561..d86667fe98 100644
--- a/azure-mobile-services-client/AzureMobileServicesClient-tests.ts
+++ b/azure-mobile-services-client/AzureMobileServicesClient-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="AzureMobileServicesClient.d.ts" />
+
 
 
 //create base client istance and read properties
@@ -32,8 +32,8 @@ tableTodoItems.read()
 
 
 //define simple handler used in callback calls for insert/update and delete 
-function handlerInsUpd(e, i) { if (!e) data.push(<TodoItem> i); };
-function handlerDelErr(e) { if (e) alert("ERROR: " + e); }
+function handlerInsUpd(e: any, i: any) { if (!e) data.push(<TodoItem> i); };
+function handlerDelErr(e: any) { if (e) alert("ERROR: " + e); }
 
 
 //insert one data passing info in POST + custom data in QueryString + simple callback handler
diff --git a/azure-mobile-services-client/AzureMobileServicesClient-tests.ts.tscparams b/azure-mobile-services-client/AzureMobileServicesClient-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/azure-mobile-services-client/AzureMobileServicesClient-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/azure-mobile-services-client/AzureMobileServicesClient.d.ts b/azure-mobile-services-client/AzureMobileServicesClient.d.ts
deleted file mode 100644
index f93ca868c7..0000000000
--- a/azure-mobile-services-client/AzureMobileServicesClient.d.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-// Type definitions for Microsoft Windows AzureMobile Service 1.0.0
-// Project: http://www.windowsazure.com/en-us/develop/mobile/
-// Definitions by: Morosinotto Daniele <https://github.com/dmorosinotto/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace Microsoft.WindowsAzure {
-
-    // MobileServiceClient object based on Microsoft Azure documentation: http://msdn.microsoft.com/en-us/library/windowsazure/jj554219.aspx
-    interface MobileServiceClient {
-        new (applicationUrl: string, applicationKey: string): MobileServiceClient;
-        applicationUrl: string;
-        applicationKey: string;
-        currentUser: User;
-        //for provider:string use one of ProviderEnum: 'microsoftaccount', 'facebook', 'twitter', 'google'
-        login(provider: string, token: string, callback: (error: any, user: User) => void ): void;
-        login(provider: string, token: string): asyncPromise;
-        login(provider: string, callback: (error: any, user: User) => void ): void;
-        login(provider: string): asyncPromise;
-        logout(): void;
-        getTable(tableName: string): MobileServiceTable;
-        withFilter(serviceFilter: (request: any, next: (request: any, callback: (error:any, response: any) => void ) => void, callback: (error: any, response: any) => void ) => void ) : MobileServiceClient;
-        invokeApi(apiName: string, options?:InvokeApiOptions): asyncPromise;
-    }
-
-    interface InvokeApiOptions
-	{
-		method?: string;
-		body?: any;
-		headers?: Object;
-		parameters?: Object;
-	}
-
-    // User object based on Microsoft Azure documentation: http://msdn.microsoft.com/en-us/library/windowsazure/jj554220.aspx
-    interface User {
-        getIdentities(): any;// { [providerName: string]: { userId: string, accessToken: string, accessTokenSecret?: string }; };
-        accessTokens: any;   // { [providerName: string]: string; }
-        level: string; //for level:string use one of LevelEnum: 'admin','anonymous','authenticated'
-        userId: string;
-    }
-
-
-    // Interface to Platform.async(func) => Platform.Promise based on code MobileServices.Web-1.0.0.js
-    interface asyncPromise {
-        then(onSuccess: (result: any) => any, onError?: (error: any) => any): asyncPromise;
-        done(onSuccess?: (result: any) => void , onError?: (error: any) => void ): void;
-    }
-
-    // MobileServiceTable object based on Microsoft Azure documentation: http://msdn.microsoft.com/en-us/library/windowsazure/jj554239.aspx
-    interface MobileServiceTable extends IQuery {
-        new (tableName: string, client: MobileServiceClient): MobileServiceTable;
-        getTableName(): string;
-        getMobileServiceClient(): MobileServiceClient;
-
-        insert(instance: any, paramsQS: Object, callback: (error: any, retInserted: any) => any): void;
-        insert(instance: any, paramsQS: Object): asyncPromise;
-        insert(instance: any): asyncPromise;
-
-        update(instance: any, paramsQS: Object, callback: (error: any, retUpdated: any) => any): void;
-        update(instance: any, paramsQS: Object): asyncPromise;
-        update(instance: any): asyncPromise;
-
-        lookup(id: number, paramsQS: Object, callback: (error: any, retValue: any) => any): void;
-        lookup(id: number, paramsQS: Object): asyncPromise;
-        lookup(id: number): asyncPromise;
-
-        del(instance: any, paramsQS: Object, callback: (error?: any) => void ): void;
-        del(instance: any, paramsQS: Object): asyncPromise;
-        del(instance: any): asyncPromise;
-
-
-        read(query: IQuery, paramsQS: Object, callback: (error: any, retValues: any) => any): void;
-        read(query: IQuery, paramsQS: Object): asyncPromise;
-        read(query: IQuery): asyncPromise;
-        read(): asyncPromise;
-    }
-
-
-    // Interface to describe Query object fluent creation based on Microsoft Azure documentation: http://msdn.microsoft.com/en-us/library/windowsazure/jj613353.aspx
-    interface IQuery {
-        read(paramsQS?: Object): asyncPromise;
-
-        orderBy(...propName: string[]): IQuery;
-        orderByDescending(...propName: string[]): IQuery;
-        select(...propNameSelected: string[]): IQuery;
-        select(funcProjectionFromThis: () => any): IQuery;
-        where(mapObjFilterCriteria: any): IQuery;
-        where(funcPredicateOnThis: (...qParams: any[]) => boolean, ...qValues: any[]): IQuery;
-        skip(n: number): IQuery;
-        take(n: number): IQuery;
-        includeTotalCount(): IQuery;
-
-        //internals found looking into code MobileServices.Web-1.0.0.js
-        //new (tableName: string, context: any): IQuery;
-        //getComponents(): any;
-        //toOData(): string;
-    }
-
-    interface WindowsAzureStatic {
-        MobileServiceClient: MobileServiceClient;
-    }
-}
-
-declare module "WindowsAzure" {
-    export = WindowsAzure;
-}
-
-declare var WindowsAzure: Microsoft.WindowsAzure.WindowsAzureStatic;
diff --git a/azure-mobile-services-client/index.d.ts b/azure-mobile-services-client/index.d.ts
new file mode 100644
index 0000000000..f1605d634f
--- /dev/null
+++ b/azure-mobile-services-client/index.d.ts
@@ -0,0 +1,103 @@
+// Type definitions for Microsoft Windows AzureMobile Service 1.0.0
+// Project: http://www.windowsazure.com/en-us/develop/mobile/
+// Definitions by: Morosinotto Daniele <https://github.com/dmorosinotto/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace Microsoft.WindowsAzure {
+
+    // MobileServiceClient object based on Microsoft Azure documentation: http://msdn.microsoft.com/en-us/library/windowsazure/jj554219.aspx
+    interface MobileServiceClient {
+        new (applicationUrl: string, applicationKey: string): MobileServiceClient;
+        applicationUrl: string;
+        applicationKey: string;
+        currentUser: User;
+        //for provider:string use one of ProviderEnum: 'microsoftaccount', 'facebook', 'twitter', 'google'
+        login(provider: string, token: string, callback: (error: any, user: User) => void ): void;
+        login(provider: string, token: string): asyncPromise;
+        login(provider: string, callback: (error: any, user: User) => void ): void;
+        login(provider: string): asyncPromise;
+        logout(): void;
+        getTable(tableName: string): MobileServiceTable;
+        withFilter(serviceFilter: (request: any, next: (request: any, callback: (error:any, response: any) => void ) => void, callback: (error: any, response: any) => void ) => void ) : MobileServiceClient;
+        invokeApi(apiName: string, options?:InvokeApiOptions): asyncPromise;
+    }
+
+    interface InvokeApiOptions
+	{
+		method?: string;
+		body?: any;
+		headers?: Object;
+		parameters?: Object;
+	}
+
+    // User object based on Microsoft Azure documentation: http://msdn.microsoft.com/en-us/library/windowsazure/jj554220.aspx
+    interface User {
+        getIdentities(): any;// { [providerName: string]: { userId: string, accessToken: string, accessTokenSecret?: string }; };
+        accessTokens: any;   // { [providerName: string]: string; }
+        level: string; //for level:string use one of LevelEnum: 'admin','anonymous','authenticated'
+        userId: string;
+    }
+
+
+    // Interface to Platform.async(func) => Platform.Promise based on code MobileServices.Web-1.0.0.js
+    interface asyncPromise {
+        then(onSuccess: (result: any) => any, onError?: (error: any) => any): asyncPromise;
+        done(onSuccess?: (result: any) => void , onError?: (error: any) => void ): void;
+    }
+
+    // MobileServiceTable object based on Microsoft Azure documentation: http://msdn.microsoft.com/en-us/library/windowsazure/jj554239.aspx
+    interface MobileServiceTable extends IQuery {
+        new (tableName: string, client: MobileServiceClient): MobileServiceTable;
+        getTableName(): string;
+        getMobileServiceClient(): MobileServiceClient;
+
+        insert(instance: any, paramsQS: Object, callback: (error: any, retInserted: any) => any): void;
+        insert(instance: any, paramsQS: Object): asyncPromise;
+        insert(instance: any): asyncPromise;
+
+        update(instance: any, paramsQS: Object, callback: (error: any, retUpdated: any) => any): void;
+        update(instance: any, paramsQS: Object): asyncPromise;
+        update(instance: any): asyncPromise;
+
+        lookup(id: number, paramsQS: Object, callback: (error: any, retValue: any) => any): void;
+        lookup(id: number, paramsQS: Object): asyncPromise;
+        lookup(id: number): asyncPromise;
+
+        del(instance: any, paramsQS: Object, callback: (error?: any) => void ): void;
+        del(instance: any, paramsQS: Object): asyncPromise;
+        del(instance: any): asyncPromise;
+
+
+        read(query: IQuery, paramsQS: Object, callback: (error: any, retValues: any) => any): void;
+        read(query: IQuery, paramsQS: Object): asyncPromise;
+        read(query: IQuery): asyncPromise;
+        read(): asyncPromise;
+    }
+
+
+    // Interface to describe Query object fluent creation based on Microsoft Azure documentation: http://msdn.microsoft.com/en-us/library/windowsazure/jj613353.aspx
+    interface IQuery {
+        read(paramsQS?: Object): asyncPromise;
+
+        orderBy(...propName: string[]): IQuery;
+        orderByDescending(...propName: string[]): IQuery;
+        select(...propNameSelected: string[]): IQuery;
+        select(funcProjectionFromThis: () => any): IQuery;
+        where(mapObjFilterCriteria: any): IQuery;
+        where(funcPredicateOnThis: (...qParams: any[]) => boolean, ...qValues: any[]): IQuery;
+        skip(n: number): IQuery;
+        take(n: number): IQuery;
+        includeTotalCount(): IQuery;
+
+        //internals found looking into code MobileServices.Web-1.0.0.js
+        //new (tableName: string, context: any): IQuery;
+        //getComponents(): any;
+        //toOData(): string;
+    }
+
+    interface WindowsAzureStatic {
+        MobileServiceClient: MobileServiceClient;
+    }
+}
+
+declare var WindowsAzure: Microsoft.WindowsAzure.WindowsAzureStatic;
diff --git a/azure-mobile-services-client/tsconfig.json b/azure-mobile-services-client/tsconfig.json
new file mode 100644
index 0000000000..cfb5ee9f10
--- /dev/null
+++ b/azure-mobile-services-client/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "AzureMobileServicesClient-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/azure-sb/azure-sb-tests.ts b/azure-sb/azure-sb-tests.ts
index 5086851815..68b0fc8df7 100644
--- a/azure-sb/azure-sb-tests.ts
+++ b/azure-sb/azure-sb-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./azure-sb.d.ts" />
+
 
 var nh = new Azure.ServiceBus.NotificationHubService();
 nh.send('tag', '<payload></payload>', function (error, result) {});
diff --git a/azure-sb/azure-sb.d.ts b/azure-sb/index.d.ts
similarity index 100%
rename from azure-sb/azure-sb.d.ts
rename to azure-sb/index.d.ts
diff --git a/azure-sb/tsconfig.json b/azure-sb/tsconfig.json
new file mode 100644
index 0000000000..762e71f4a2
--- /dev/null
+++ b/azure-sb/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "azure-sb-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-azure/azure-tests.ts b/azure/azure-tests.ts
similarity index 87%
rename from node-azure/azure-tests.ts
rename to azure/azure-tests.ts
index be81b87947..2d60803d3b 100644
--- a/node-azure/azure-tests.ts
+++ b/azure/azure-tests.ts
@@ -1,7 +1,4 @@
-/// <reference path="azure.d.ts" />
-
-
-import Azure = require("azure");
+import Azure = require("azure");
 
 var ts = new Azure.TableService();
 
diff --git a/azure/index.d.ts b/azure/index.d.ts
new file mode 100644
index 0000000000..59d1b9d114
--- /dev/null
+++ b/azure/index.d.ts
@@ -0,0 +1,1881 @@
+// Type definitions for Azure SDK for Node v0.9.16
+// Project: https://github.com/WindowsAzure/azure-sdk-for-node
+// Definitions by: Andrew Gaspar <https://github.com/AndrewGaspar>,
+//                 Anti Veeranna <https://github.com/antiveeranna>,
+//                 Maxime LUCE <https://github.com/SomaticIT>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+/**
+* TODO
+*/
+
+import events = require("events");
+import stream = require("stream");
+import url = require("url");
+
+//#region Services
+export declare class TableService extends BatchServiceClient {
+    static incorrectTableNameErr: string;
+    static incorrectCallbackErr: string;
+    static incorrectTableQuery: string;
+    static incorrectPartitionErr: string;
+
+    //#region Constructors
+
+    /**
+    * Creates a new TableService object.
+    * Uses the AZURE_STORAGE_ACCOUNT and AZURE_STORAGE_ACCESS_KEY environment variables.
+    *
+    * @constructor
+    * @extends {ServiceClient}
+    */
+    constructor();
+    /**
+    * Creates a new TableService object.
+    * Uses a connectionString to connect
+    *
+    * @constructor
+    * @extends {ServiceClient}
+    * @param {string} connectionString The connection string.
+    */
+    constructor(connectionString: string);
+    /**
+    * Creates a new TableService object.
+    * Uses a storage account and an access key.
+    *
+    * @constructor
+    * @extends {ServiceClient}
+    * @param {string} storageAccount                    The storage account or the connection string.
+    * @param {string} storageAccessKey                  The storage access key.
+    * @param {string} host                              The host address.
+    * @param {object} authenticationProvider            The authentication provider.
+    */
+    constructor(storageAccount: string, storageAccessKey: string, host?: string, authenticationProvider?: string);
+
+    //#endregion
+
+    //#region Service Methods
+
+    getServiceProperties(callback: StorageServicePropertiesCallback): void;
+    getServiceProperties(options: TimeoutIntervalOptions, callback: StorageServicePropertiesCallback): void;
+
+    setServiceProperties(serviceProperties: StorageServiceProperties, callback: StorageCallbackVoid): void;
+    setServiceProperties(serviceProperties: StorageServiceProperties, options: TimeoutIntervalOptions, callback: StorageCallbackVoid): void;
+
+    //#endregion
+
+    //#region Table Methods
+
+    getTable(table: string, callback?: TableRequestCallback): void;
+    getTable(table: string, options: TimeoutIntervalOptions, callback?: TableRequestCallback): void;
+
+    createTable(table: string, callback?: TableRequestCallback): void;
+    createTable(table: string, options: TimeoutIntervalOptions, callback?: TableRequestCallback): void;
+
+    createTableIfNotExists(table: string, callback?: CreateTableIfNotExistsCallback): void;
+    createTableIfNotExists(table: string, options: TimeoutIntervalOptions, callback?: CreateTableIfNotExistsCallback): void;
+
+    deleteTable(table: string, callback?: DeleteTableCallback): void;
+    deleteTable(table: string, options: TimeoutIntervalOptions, callback?: DeleteTableCallback): void;
+
+    queryTables(callback?: QueryTablesCallback): void;
+    queryTables(options: QueryTablesOptions, callback?: QueryTablesCallback): void;
+
+    //#endregion
+
+    //#region Entities Methods
+
+    queryEntity(table: string, partitionKey: string, rowKey: string, callback?: QueryEntityCallback): void;
+    queryEntity(table: string, partitionKey: string, rowKey: string, options: TimeoutIntervalOptions, callback?: QueryEntityCallback): void;
+
+    queryEntities(tableQuery: TableQuery, callback?: QueryEntitiesCallback): void;
+    queryEntities(tableQuery: TableQuery, options: TimeoutIntervalOptions, callback?: QueryEntitiesCallback): void;
+
+    insertEntity(tableName: string, entityDescriptor: Entity, callback?: ModifyEntityCallback): void;
+    insertEntity(tableName: string, entityDescriptor: Entity, options: TimeoutIntervalOptions, callback?: ModifyEntityCallback): void;
+
+    insertOrReplaceEntity(tableName: string, entityDescriptor: Entity, callback?: ModifyEntityCallback): void;
+    insertOrReplaceEntity(tableName: string, entityDescriptor: Entity, options: TimeoutIntervalOptions, callback?: ModifyEntityCallback): void;
+
+    updateEntity(tableName: string, entityDescriptor: Entity, callback?: ModifyEntityCallback): void;
+    updateEntity(tableName: string, entityDescriptor: Entity, options: UpdateEntityOptions, callback?: ModifyEntityCallback): void;
+
+    mergeEntity(tableName: string, entityDescriptor: Entity, callback?: ModifyEntityCallback): void;
+    mergeEntity(tableName: string, entityDescriptor: Entity, options: UpdateEntityOptions, callback?: ModifyEntityCallback): void;
+
+    insertOrMergeEntity(tableName: string, entityDescriptor: Entity, callback?: ModifyEntityCallback): void;
+    insertOrMergeEntity(tableName: string, entityDescriptor: Entity, options: UpdateEntityOptions, callback?: ModifyEntityCallback): void;
+
+    deleteEntity(tableName: string, entityDescriptor: Entity, callback?: DeleteEntityCallback): void;
+    deleteEntity(tableName: string, entityDescriptor: Entity, options: UpdateEntityOptions, callback?: DeleteEntityCallback): void;
+
+    //#endregion
+}
+
+export declare class BlobService extends StorageServiceClient {
+    singleBlobPutThresholdInBytes: number;
+    parallelOperationThreadCount: number;
+
+    SpeedSummary: typeof SpeedSummary;
+
+    //#region Constructors
+
+    /**
+    * Creates a new BlobService object.
+    * Uses the AZURE_STORAGE_ACCOUNT and AZURE_STORAGE_ACCESS_KEY environment variables.
+    *
+    * @constructor
+    * @extends {StorageServiceClient}
+    */
+    constructor();
+
+    /**
+    * Creates a new BlobService object.
+    * Uses a connectionString to connect
+    *
+    * @constructor
+    * @extends {StorageServiceClient}
+    * @param {string} connectionString The connection string.
+    */
+    constructor(connectionString: string);
+
+    /**
+    * Creates a new BlobService object.
+    * Uses a storage account and an access key.
+    *
+    * @constructor
+    * @extends {StorageServiceClient}
+    * @param {string} storageAccount                    The storage account or the connection string.
+    * @param {string} storageAccessKey                  The storage access key.
+    * @param {string} host                              The host address.
+    * @param {object} sasToken                          The Shared Access Signature token.
+    */
+    constructor(storageAccount: string, storageAccessKey: string, host?: string, sasToken?: string);
+
+    //#endregion
+
+    //#region Service Methods
+
+    /**
+    * Gets the properties of a storage account�s Blob service, including Azure Storage Analytics.
+    */
+    getServiceProperties(callback: StorageServicePropertiesCallback): void;
+    getServiceProperties(options: TimeoutIntervalOptions, callback: StorageServicePropertiesCallback): void;
+
+    /**
+    * Sets the properties of a storage account�s Blob service, including Azure Storage Analytics.
+    * You can also use this operation to set the default request version for all incoming requests that do not have a version specified.
+    */
+    setServiceProperties(serviceProperties: StorageServiceProperties, callback: StorageCallbackVoid): void;
+    setServiceProperties(serviceProperties: StorageServiceProperties, options: TimeoutIntervalOptions, callback: StorageCallbackVoid): void;
+
+    //#endregion
+
+    //#region Containers Methods
+
+    /**
+    * Lists a segment containing a collection of container items under the specified account.
+    */
+    listContainers(callback: ListContainersCallback): void;
+    listContainers(options: ListContainersOptions, callback: ListContainersCallback): void;
+
+    /**
+     * Creates a new container under the specified account.
+     * If a container with the same name already exists, the operation fails.
+     */
+    createContainer(container: string, callback: StorageCallback<ContainerResult>): void;
+    createContainer(container: string, options: CreateContainerOptions, callback: StorageCallback<ContainerResult>): void;
+
+    /**
+     * Creates a new container under the specified account if the container does not exists.
+     */
+    createContainerIfNotExists(container: string, callback: StorageCallback<boolean>): void;
+    createContainerIfNotExists(container: string, options: CreateContainerOptions, callback: StorageCallback<boolean>): void;
+
+    /**
+     * Retrieves a container and its properties from a specified account.
+     */
+    getContainerProperties(container: string, callback: StorageCallback<ContainerResult>): void;
+    getContainerProperties(container: string, options: GetContainerPropertiesOptions, callback: StorageCallback<ContainerResult>): void;
+
+    /**
+     * Returns all user-defined metadata for the container.
+     */
+    getContainerMetadata(container: string, callback: StorageCallback<ContainerResult>): void;
+    getContainerMetadata(container: string, options: GetContainerPropertiesOptions, callback: StorageCallback<ContainerResult>): void;
+
+    /**
+     * Sets the container's metadata.
+     */
+    setContainerMetadata(container: string, metadata: StorageMetadata, callback: StorageCallback<ContainerResult>): void;
+    setContainerMetadata(container: string, metadata: StorageMetadata, options: AccessConditionsOptions, callback: StorageCallback<ContainerResult>): void;
+
+    /**
+     * Gets the container's ACL.
+     */
+    getContainerAcl(container: string, callback: StorageCallback<ContainerResult>): void;
+    getContainerAcl(container: string, options: GetContainerPropertiesOptions, callback: StorageCallback<ContainerResult>): void;
+
+    /**
+     * Updates the container's ACL.
+     */
+    setContainerAcl(container: string, publicAccessLevel: string, callback: StorageCallback<ContainerResult>): void;
+    setContainerAcl(container: string, publicAccessLevel: string, options: StorageAclOptions, callback: StorageCallback<ContainerResult>): void;
+
+    /**
+     * Marks the specified container for deletion.
+     * The container and any blobs contained within it are later deleted during garbage collection.
+     */
+    deleteContainer(container: string, callback: StorageCallbackVoid): void;
+    deleteContainer(container: string, options: LeaseIdOptions, callback: StorageCallbackVoid): void;
+
+    //#endregion
+
+    //#region Blob Methods
+
+    /**
+    * Lists all of the blobs in the given container.
+    */
+    listBlobs(container: string, callback: ListBlobsCallback): void;
+    listBlobs(container: string, options: ListBlobsOptions, callback: ListBlobsCallback): void;
+
+    /**
+     * Returns all user-defined metadata, standard HTTP properties, and system properties for the blob.
+     * It does not return or modify the content of the blob.
+     */
+    getBlobProperties(container: string, blob: string, callback: StorageCallback<BlobResult>): void;
+    getBlobProperties(container: string, blob: string, options: GetBlobPropertiesOptions, callback: StorageCallback<BlobResult>): void;
+
+    /**
+     * Sets user-defined properties for the specified blob or snapshot.
+     * It does not return or modify the content of the blob.
+     */
+    setBlobProperties(container: string, blob: string, callback: StorageCallback<BlobResult>): void;
+    setBlobProperties(container: string, blob: string, options: SetBlobPropertiesOptions, callback: StorageCallback<BlobResult>): void;
+
+    /**
+     * Sets user-defined metadata for the specified blob or snapshot as one or more name-value pairs 
+     * It does not return or modify the content of the blob.
+     */
+    setBlobMetadata(container: string, blob: string, metadata: StorageMetadata, callback: StorageCallback<BlobResult>): void;
+    setBlobMetadata(container: string, blob: string, metadata: StorageMetadata, options: GetBlobPropertiesOptions, callback: StorageCallback<BlobResult>): void;
+
+    /**
+     * Provides a stream to read from a blob.
+     */
+    getBlob(container: string, blob: string, callback: StorageCallback<BlobResult>): stream.Readable;
+    getBlob(container: string, blob: string, options: ReadBlobOptions, callback: StorageCallback<BlobResult>): stream.Readable;
+
+    /**
+     * Downloads a blob into a file.
+     */
+    getBlobToFile(container: string, blob: string, localFileName: string, callback: StorageCallback<BlobResult>): void;
+    getBlobToFile(container: string, blob: string, localFileName: string, options: ReadBlobOptions, callback: StorageCallback<BlobResult>): void;
+
+    /**
+     * Downloads a blob into a stream.
+     */
+    getBlobToStream(container: string, blob: string, stream: stream.Writable, callback: StorageCallback<BlobResult>): void;
+    getBlobToStream(container: string, blob: string, stream: stream.Writable, options: ReadBlobOptions, callback: StorageCallback<BlobResult>): void;
+
+    /**
+     * Downloads a blob into a text string.
+     */
+    getBlobToText(container: string, blob: string, callback: GetBlobToTextCallback): void;
+    getBlobToText(container: string, blob: string, options: ReadBlobOptions, callback: GetBlobToTextCallback): void;
+
+    /**
+     * Marks the specified blob or snapshot for deletion. The blob is later deleted during garbage collection.
+     * If a blob has snapshots, you must delete them when deleting the blob. Using the deleteSnapshots option, you can choose either to delete both the blob and its snapshots, 
+     * or to delete only the snapshots but not the blob itself. If the blob has snapshots, you must include the deleteSnapshots option or the blob service will return an error
+     * and nothing will be deleted. 
+     * If you are deleting a specific snapshot using the snapshotId option, the deleteSnapshots option must NOT be included.
+     */
+    deleteBlob(container: string, blob: string, callback: StorageCallback<boolean>): void;
+    deleteBlob(container: string, blob: string, options: DeleteBlobOptions, callback: StorageCallback<boolean>): void;
+
+    /**
+     * Creates a read-only snapshot of a blob.
+     */
+    createBlobSnapshot(container: string, blob: string, callback: StorageCallback<string>): void;
+    createBlobSnapshot(container: string, blob: string, options: BlobSnapshotOptions, callback: StorageCallback<string>): void;
+
+    /**
+     * Starts to copy a blob to a destination within the storage account. The Copy Blob operation copies the entire committed blob.
+     */
+    copyBlob(sourceUri: string, targetContainer: string, targetBlob: string, callback: StorageCallback<BlobResult>): void;
+    copyBlob(sourceUri: string, targetContainer: string, targetBlob: string, options: CopyBlobOptions, callback: StorageCallback<BlobResult>): void;
+
+    /**
+     * Creates a read-only snapshot of a blob.
+     */
+    abortCopyBlob(container: string, blob: string, copyId: string, callback: StorageCallbackVoid): void;
+    abortCopyBlob(container: string, blob: string, copyId: string, options: LeaseIdOptions, callback: StorageCallbackVoid): void;
+
+    /**
+     * Retrieves a shared access signature token.
+     */
+    generateSharedAccessSignature(container: string, blob: string, sharedAccessPolicy: SharedAccessPolicy): SharedAccessSignatureResult;
+
+    /**
+     * Retrieves a blob or container URL.
+     */
+    getBlobUrl(container: string): string;
+    getBlobUrl(container: string, blob: string): string;
+    getBlobUrl(container: string, blob: string, sharedAccessPolicy: SharedAccessPolicy): string;
+
+    /**
+     * Uploads a blob.
+     */
+    createBlob(container: string, blob: string, blobType: string, callback: StorageCallback<string>): stream.Writable;
+    createBlob(container: string, blob: string, blobType: string, options: UploadBlockBlobOptions, callback: StorageCallback<string>): stream.Writable;
+
+    //#endregion
+
+    //#region Page Blob Methods
+
+    /**
+     * Creates a page blob of the specified length.
+     */
+    createPageBlob(container: string, blob: string, length: number, callback: StorageCallbackVoid): void;
+    createPageBlob(container: string, blob: string, length: number, options: SetBlobPropertiesOptions, callback: StorageCallbackVoid): void;
+
+    /**
+     * Updates a page blob from a stream.
+     */
+    createBlobPagesFromStream(container: string, blob: string, readStream: stream.Readable, rangeStart: number, rangeEnd: number, callback: StorageCallback<BlobResult>): void;
+    createBlobPagesFromStream(container: string, blob: string, readStream: stream.Readable, rangeStart: number, rangeEnd: number, options: CreatePagesOptions, callback: StorageCallback<BlobResult>): void;
+
+    /**
+     * Updates a page blob from a text string.
+     */
+    createBlobPagesFromText(container: string, blob: string, text: string, rangeStart: number, rangeEnd: number, callback: StorageCallback<BlobResult>): void;
+    createBlobPagesFromText(container: string, blob: string, text: string, rangeStart: number, rangeEnd: number, options: CreatePagesOptions, callback: StorageCallback<BlobResult>): void;
+
+    /**
+     * Lists page ranges.
+     * Lists all of the page ranges by default, or only the page ranges over a specific range of bytes if rangeStart and rangeEnd are specified.
+     */
+    listBlobRegions(container: string, blob: string, callback: StorageCallback<PageRange[]>): void;
+    listBlobRegions(container: string, blob: string, options: PageRangeOptions, callback: StorageCallback<PageRange[]>): void;
+
+    /**
+     * Clears a range of pages.
+     */
+    clearBlobPages(container: string, blob: string, rangeStart: number, rangeEnd: number, callback: StorageCallbackVoid): void;
+    clearBlobPages(container: string, blob: string, rangeStart: number, rangeEnd: number, options: LeaseAccessConditionsOptions, callback: StorageCallbackVoid): void;
+
+    /**
+     * Resizes a page blob.
+     */
+    resizePageBlob(container: string, blob: string, size: number, callback: StorageCallback<BlobResult>): void;
+    resizePageBlob(container: string, blob: string, size: number, options: LeaseAccessConditionsOptions, callback: StorageCallback<BlobResult>): void;
+
+    /**
+     * Sets the page blob's sequence number.
+     */
+    setPageBlobSequenceNumber(container: string, blob: string, sequenceNumberAction: string, sequenceNumber: string, callback: StorageCallback<BlobResult>): void;
+    setPageBlobSequenceNumber(container: string, blob: string, sequenceNumberAction: string, sequenceNumber: string, options: AccessConditionsOptions, callback: StorageCallback<BlobResult>): void;
+
+    //#endregion
+
+    //#region Block Blob Methods
+
+    /**
+     * Uploads a block blob from file.
+     */
+    putBlockBlobFromFile(container: string, blob: string, localFileName: string, callback: StorageCallback<BlobResult>): SpeedSummary;
+    putBlockBlobFromFile(container: string, blob: string, localFileName: string, options: UploadBlockBlobOptions, callback: StorageCallback<BlobResult>): SpeedSummary;
+    createBlockBlobFromFile(container: string, blob: string, localFileName: string, callback: StorageCallback<BlobResult>): SpeedSummary;
+    createBlockBlobFromFile(container: string, blob: string, localFileName: string, options: UploadBlockBlobOptions, callback: StorageCallback<BlobResult>): SpeedSummary;
+
+    /**
+     * Uploads a block blob from a stream.
+     */
+    putBlockBlobFromStream(container: string, blob: string, stream: stream.Stream, streamLength: number, callback: StorageCallback<BlobResult>): SpeedSummary;
+    putBlockBlobFromStream(container: string, blob: string, stream: stream.Stream, streamLength: number, options: UploadBlockBlobOptions, callback: StorageCallback<BlobResult>): SpeedSummary;
+    createBlockBlobFromStream(container: string, blob: string, stream: stream.Stream, streamLength: number, callback: StorageCallback<BlobResult>): SpeedSummary;
+    createBlockBlobFromStream(container: string, blob: string, stream: stream.Stream, streamLength: number, options: UploadBlockBlobOptions, callback: StorageCallback<BlobResult>): SpeedSummary;
+
+    /**
+     * Uploads a block blob from a text string.
+     */
+    createBlockBlobFromText(container: string, blob: string, text: string, callback: StorageCallback<BlobResult>): SpeedSummary;
+    createBlockBlobFromText(container: string, blob: string, text: string, options: UploadBlockBlobOptions, callback: StorageCallback<BlobResult>): SpeedSummary;
+
+    /**
+     * Creates a new block to be committed as part of a blob.
+     */
+    createBlobBlockFromStream(blockId: string, container: string, blob: string, readStream: stream.Stream, streamLength: number, callback: StorageCallbackVoid): void;
+    createBlobBlockFromStream(blockId: string, container: string, blob: string, readStream: stream.Stream, streamLength: number, options: CreateBlockOptions, callback: StorageCallbackVoid): void;
+
+    /**
+     * Creates a new block to be committed as part of a blob.
+     */
+    createBlobBlockFromText(blockId: string, container: string, blob: string, text: string, callback: StorageCallbackVoid): void;
+    createBlobBlockFromText(blockId: string, container: string, blob: string, text: string, options: CreateBlockOptions, callback: StorageCallbackVoid): void;
+
+    /**
+     * Writes a blob by specifying the list of block IDs that make up the blob.
+     * In order to be written as part of a blob, a block must have been successfully written to the server in a prior
+     * createBlock operation.
+     */
+    commitBlobBlocks(container: string, blob: string, blockList: BlockList, callback: StorageCallback<BlockList>): void;
+    commitBlobBlocks(container: string, blob: string, blockList: BlockList, options: CreateBlockOptions, callback: StorageCallback<BlockList>): void;
+
+    /**
+     * Retrieves the list of blocks that have been uploaded as part of a block blob.
+     */
+    listBlobBlocks(container: string, blob: string, blockListType: string, callback: StorageCallback<BlockList>): void;
+    listBlobBlocks(container: string, blob: string, blockListType: string, options: GetBlobPropertiesOptions, callback: StorageCallback<BlockList>): void;
+
+    /**
+     * Generate a random block id prefix.
+     */
+    generateBlockIdPrefix(): string;
+    /**
+     * Get a block id according to prefix and block number.
+     */
+    getBlockId(prefix: string, number: number): string;
+
+    //#endregion
+
+    //#region Lease Methods
+
+    /**
+     * Acquires a new lease. 
+     * If container and blob are specified, acquires a blob lease. 
+     * Otherwise, if only container is specified and blob is null, acquires a container lease.
+     */
+    acquireLease(container: string, blob: string, callback: StorageCallback<LeaseResult>): void;
+    acquireLease(container: string, blob: string, options: LeaseOptions, callback: StorageCallback<LeaseResult>): void;
+
+    /**
+     * Renews an existing lease.
+     * If container and blob are specified, renews the blob lease.
+     * Otherwise, if only container is specified and blob is null, renews the container lease.
+     */
+    renewLease(container: string, blob: string, leaseId: string, callback: StorageCallback<LeaseResult>): void;
+    renewLease(container: string, blob: string, leaseId: string, options: AccessConditionsOptions, callback: StorageCallback<LeaseResult>): void;
+
+    /**
+     * Releases the lease.
+     * If container and blob are specified, releases the blob lease.
+     * Otherwise, if only container is specified and blob is null, releases the container lease.
+     */
+    releaseLease(container: string, blob: string, leaseId: string, callback: StorageCallback<LeaseResult>): void;
+    releaseLease(container: string, blob: string, leaseId: string, options: AccessConditionsOptions, callback: StorageCallback<LeaseResult>): void;
+
+    /**
+     * Breaks the lease but ensures that another client cannot acquire a new lease until the current lease period has expired.
+     * If container and blob are specified, breaks the blob lease.
+     * Otherwise, if only container is specified and blob is null, breaks the container lease.
+     */
+    breakLease(container: string, blob: string, leaseId: string, callback: StorageCallback<LeaseResult>): void;
+    breakLease(container: string, blob: string, leaseId: string, options: BreakLeaseOptions, callback: StorageCallback<LeaseResult>): void;
+
+    //#endregion
+}
+
+export declare class QueueService extends StorageServiceClient {
+    authenticationProvider: SharedKey;
+
+    //#region Constructors
+
+    /**
+    * Creates a new BlobService object.
+    * Uses the AZURE_STORAGE_ACCOUNT and AZURE_STORAGE_ACCESS_KEY environment variables.
+    *
+    * @constructor
+    * @extends {StorageServiceClient}
+    */
+    constructor();
+
+    /**
+    * Creates a new BlobService object.
+    * Uses a connectionString to connect
+    *
+    * @constructor
+    * @extends {StorageServiceClient}
+    * @param {string} connectionString The connection string.
+    */
+    constructor(connectionString: string);
+
+    /**
+    * Creates a new BlobService object.
+    * Uses a storage account and an access key.
+    *
+    * @constructor
+    * @extends {StorageServiceClient}
+    * @param {string} storageAccount                    The storage account or the connection string.
+    * @param {string} storageAccessKey                  The storage access key.
+    * @param {string} host                              The host address.
+    * @param {object} sasToken                          The Shared Access Signature token.
+    */
+    constructor(storageAccount: string, storageAccessKey: string, host?: string, sasToken?: string);
+
+    //#endregion
+
+    //#region Service Methods
+
+    /**
+    * Gets the properties of a storage account�s Blob service, including Azure Storage Analytics.
+    */
+    getServiceProperties(callback: StorageServicePropertiesCallback): void;
+    getServiceProperties(options: TimeoutIntervalOptions, callback: StorageServicePropertiesCallback): void;
+
+    /**
+    * Sets the properties of a storage account�s Blob service, including Azure Storage Analytics.
+    * You can also use this operation to set the default request version for all incoming requests that do not have a version specified.
+    */
+    setServiceProperties(serviceProperties: StorageServiceProperties, callback: StorageCallbackVoid): void;
+    setServiceProperties(serviceProperties: StorageServiceProperties, options: TimeoutIntervalOptions, callback: StorageCallbackVoid): void;
+
+    //#endregion
+
+    //#region Queue Methods
+
+    /**
+     * Lists all queues under the given account.
+     */
+    listQueues(callback: ListQueuesCallback): void;
+    listQueues(options: ListQueuesOptions, callback: ListQueuesCallback): void;
+
+    /**
+     * Creates a new queue under the given account.
+     */
+    createQueue(queue: string, callback: StorageCallback<QueueResult>): void;
+    createQueue(queue: string, options: MetadataOptions, callback: StorageCallback<QueueResult>): void;
+
+    /**
+     * Creates a new queue under the given account if it doesn't exist.
+     */
+    createQueueIfNotExists(queue: string, callback: StorageCallback<boolean>): void;
+    createQueueIfNotExists(queue: string, options: MetadataOptions, callback: StorageCallback<boolean>): void;
+
+    /**
+     * Permanently deletes the specified queue.
+     */
+    deleteQueue(queue: string, callback: StorageCallback<boolean>): void;
+    deleteQueue(queue: string, options: TimeoutIntervalOptions, callback: StorageCallback<boolean>): void;
+
+    /**
+     * Returns queue properties, including user-defined metadata.
+     */
+    getQueueMetadata(queue: string, callback: StorageCallback<QueueResult>): void;
+    getQueueMetadata(queue: string, options: TimeoutIntervalOptions, callback: StorageCallback<QueueResult>): void;
+
+    /**
+     * Sets user-defined metadata on the specified queue. Metadata is associated with the queue as name-value pairs.
+     */
+    setQueueMetadata(queue: string, metadata: StorageMetadata, callback: StorageCallback<QueueResult>): void;
+    setQueueMetadata(queue: string, metadata: StorageMetadata, options: TimeoutIntervalOptions, callback: StorageCallback<QueueResult>): void;
+
+    //#endregion
+
+    //#region Message Methods
+
+    /**
+     * Adds a new message to the back of the message queue. A visibility timeout can also be specified to make the message
+     * invisible until the visibility timeout expires. A message must be in a format that can be included in an XML request
+     * with UTF-8 encoding. The encoded message can be up to 64KB in size for versions 2011-08-18 and newer, or 8KB in size
+     * for previous versions.
+     */
+    createMessage(queue: string, messageText: string, callback: StorageCallback<QueueMessageResult>): void
+    createMessage(queue: string, messageText: string, options: CreateQueueMessageOptions, callback: StorageCallback<QueueMessageResult>): void
+
+    /**
+     * Retrieves a message from the queue and makes it invisible to other consumers.
+     */
+    getMessages(queue: string, callback: StorageCallback<QueueMessageResult[]>): void;
+    getMessages(queue: string, options: GetQueueMessagesOptions, callback: StorageCallback<QueueMessageResult[]>): void;
+
+    /**
+     * Retrieves a message from the front of the queue, without changing the message visibility.
+     */
+    peekMessages(queue: string, callback: StorageCallback<QueueMessageResult[]>): void;
+    peekMessages(queue: string, options: PeekQueueMessagesOptions, callback: StorageCallback<QueueMessageResult[]>): void;
+
+    /**
+     * Deletes a specified message from the queue.
+     */
+    deleteMessage(queue: string, messageId: string, popreceipt: string, callback: StorageCallback<boolean>): void
+    deleteMessage(queue: string, messageId: string, popreceipt: string, options: TimeoutIntervalOptions, callback: StorageCallback<boolean>): void
+
+    /**
+     * Clears all messages from the queue.
+     */
+    clearMessages(queue: string, callback: StorageCallbackVoid): void;
+    clearMessages(queue: string, options: TimeoutIntervalOptions, callback: StorageCallbackVoid): void;
+
+    /**
+     * Deletes a specified message from the queue.
+     */
+    updateMessage(queue: string, messageId: string, popreceipt: string, visibilitytimeout: number, callback: StorageCallback<QueueMessageResult>): void
+    updateMessage(queue: string, messageId: string, popreceipt: string, visibilitytimeout: number, options: UpdateQueueMessagesOptions, callback: StorageCallback<QueueMessageResult>): void
+
+    //#endregion
+}
+
+export declare class ServiceBusService {
+
+}
+
+export declare class SqlService {
+
+}
+
+export declare class ServiceManagementService {
+
+}
+
+export declare class SqlManagementService {
+}
+//#endregion
+
+//#region Service Creators
+export declare function createTableService(): TableService;
+export declare function createTableService(connectionString: string): TableService;
+export declare function createTableService(storageAccount: string, storageAccessKey: string, host?: string, authenticationProvider?: string): TableService;
+
+export declare function createBlobService(): BlobService;
+export declare function createBlobService(connectionString: string): BlobService;
+export declare function createBlobService(storageAccount: string, storageAccessKey: string, host?: string, authenticationProvider?: string): BlobService;
+
+export declare function createQueueService(): QueueService;
+export declare function createQueueService(connectionString: string): QueueService;
+export declare function createQueueService(storageAccount: string, storageAccessKey: string, host?: string, authenticationProvider?: string): QueueService;
+
+export declare function createServiceBusService(): ServiceBusService;
+export declare function createServiceBusService(connectionString: string): ServiceBusService;
+export declare function createServiceBusService(namespace: string, accessKey?: string, issuer?: string, acsNamespace?: string, host?: string, authenticationProvider?: string): ServiceBusService;
+
+export declare function createSqlService(serverName: string, administratorLogin: string, administratorLoginPassword: string, host?: string, acsHost?: string, authenticationProvider?: string): SqlService;
+
+export declare function createServiceManagementService(subscriptionId: string, authentication: string, hostOptions: string): ServiceManagementService;
+
+export declare function createSqlManagementService(subscriptionId: string, authentication: string, hostOptions: string): SqlManagementService;
+//#endregion
+
+//#region RoleEnvironment
+
+interface RoleEnvironmentInterface extends events.EventEmitter {
+    incorrectCallbackErr: string;
+    clientId: string;
+    VersionEndpointFixedPath: string;
+    EnvironmentVariables: {
+        [key: string]: string;
+        VersionEndpointEnvironmentName: string;
+    };
+
+    /**
+     * Returns a RoleInstance object that represents the role instance
+     * in which this code is currently executing.
+     */
+    getCurrentRoleInstance(callback: SimpleCallback<RoleInstance>): void;
+
+    /**
+     * Returns the deployment ID that uniquely identifies the deployment in
+     * which this role instance is running.
+     */
+    getDeploymentId(callback: SimpleCallback<string>): void;
+
+    /**
+     * Indicates whether the role instance is running in the Microsoft Azure
+     * environment.  It is good practice to enclose any code that uses 
+     * service runtime in the isAvailable callback.
+     */
+    isAvailable(callback: SimpleCallback<boolean>): void;
+
+    /**
+     * Indicates whether the role instance is running in the development fabric.
+     */
+    isEmulated(callback: SimpleCallback<boolean>): void;
+
+    /**
+     * Returns the set of Role objects defined for your service.
+     * Roles are defined in the service definition file.
+     */
+    getRoles(callback: SimpleCallback<Dictionary<Role>>): void;
+
+    /**
+     * Retrieves the settings in the service configuration file.
+     * 
+     * A role's configuration settings are defined in the service definition file.
+     * Values for configuration settings are set in the service configuration file.
+     * For more information on configuration settings, see the [Service Definition Schema](http://msdn.microsoft.com/en-us/library/windowsazure/ee758711.aspx)
+     * and [Service Configuration Schema](http://msdn.microsoft.com/en-us/library/windowsazure/ee758710.aspx).
+     */
+    getConfigurationSettings(callback: SimpleCallback<Dictionary<string>>): void;
+
+    /**
+     * Retrieves the set of named local storage resources, along with the path.
+     * For example, the DiagnosticStore resource which is defined for every role
+     * provides a location for runtime diagnostics and logs.
+     */
+    getLocalResources(callback: SimpleCallback<Dictionary<RoleLocalResource>>): void;
+
+    /**
+     * Requests that the current role instance be stopped and restarted.
+     * 
+     * Before the role instance is recycled, the Microsoft Azure load balancer takes the role instance out of rotation.
+     * This ensures that no new requests are routed to the instance while it is restarting.
+     * 
+     * A call to `RequestRecycle` initiates the normal shutdown cycle. Microsoft Azure raises the
+     * `Stopping` event and calls the `OnStop` method so that you can run the necessary code to
+     * prepare the instance to be recycled.
+     */
+    requestRecycle(callback: ErrorCallback): void;
+
+    /**
+     * Sets the status of the role instance.
+     * 
+     * An instance may indicate that it is in one of two states: Ready or Busy. If an instance's state is Ready, it is
+     * prepared to receive requests from the load balancer. If the instance's state is Busy, it will not receive
+     * requests from the load balancer.
+     */
+    setStatus(roleInstanceStatus: string, expirationUtc: Date, callback: ErrorCallback): void;
+
+    /**
+     * Clears the status of the role instance.
+     * An instance may indicate that it has completed communicating status by calling this method.
+     */
+    clearStatus(callback: ErrorCallback): void;
+}
+
+export declare var RoleEnvironment: RoleEnvironmentInterface;
+
+//#endregion
+
+//#region Export of internal classes
+export declare class WebResource {
+    rawResponse: boolean;
+    queryString: Dictionary<string>;
+
+    constructor();
+
+    get(path: string): WebResource;
+    put(path: string): WebResource;
+    post(path: string): WebResource;
+    merge(path: string): WebResource;
+    head(path: string): WebResource;
+    del(path: string): WebResource;
+
+    withProperty(name: string, value: string): WebResource;
+    withRawResponse(rawResponse: boolean): WebResource;
+    withHeadersOnly(headersOnly: boolean): WebResource;
+    withQueryOption(name: string, value: string, defaultValue: string): WebResource;
+    withQueryOptions(queryOptions: Dictionary<string>): WebResource;
+    withHeader(name: string, value: string): WebResource;
+    withHeaders(headers: Dictionary<string>): WebResource;
+    withBody(body: any): WebResource;
+    addOptionalMetadataHeaders(metadata: StorageMetadata): WebResource;
+
+    validResponse(statusCode: number): boolean;
+    pipeInput(inputStream: stream.Stream, destStream: stream.Stream): stream.Stream;
+}
+
+export declare class ServiceClient extends events.EventEmitter {
+    static EnvironmentVariables: any;
+    static DEVSTORE_STORAGE_ACCOUNT: string;
+    static DEVSTORE_STORAGE_ACCESS_KEY: string;
+    static DEVSTORE_BLOB_HOST: string;
+    static DEVSTORE_QUEUE_HOST: string;
+    static DEVSTORE_TABLE_HOST: string;
+    static CLOUD_BLOB_HOST: string;
+    static CLOUD_QUEUE_HOST: string;
+    static CLOUD_TABLE_HOST: string;
+    static CLOUD_SERVICEBUS_HOST: string;
+    static CLOUD_ACCESS_CONTROL_HOST: string;
+    static CLOUD_SERVICE_MANAGEMENT_HOST: string;
+    static CLOUD_DATABASE_HOST: string;
+    static DEFAULT_SERVICEBUS_ISSUER: string;
+    static DEFAULT_WRAP_NAMESPACE_SUFFIX: string;
+    static DEFAULT_PROTOCOL: string;
+
+    constructor(host: string, authenticationProvider: any);
+
+    setHost(host: string): void;
+    performRequest(webResource: WebResource, outputData: string, options: any, callback: Function): void;
+    performRequestOutputStream(webResource: WebResource, outputStream: any, options: any, callback: Function): void;
+    performRequestInputStream(webResource: WebResource, outputData: string, inputStream: any, options: any, callback: Function): void;
+    withFilter(newFilter: Filter): ServiceClient;
+    parseMetadataHeaders(headers: any): any;
+    isEmulated(): boolean;
+    setProxy(proxyUrl: string, proxyPort: number): void;
+}
+
+export declare class BatchServiceClient extends StorageServiceClient {
+    operations: any[];
+
+    constructor(storageAccount: string, storageAccessKey: string, host: string, usePathstyleUri: boolean, authenticationProvider: any);
+    beginBatch(): void;
+    isInBatch(): boolean;
+    rollback(): void;
+    hasOperations(): boolean;
+    addOperation(webResource: WebResource, outputData: any): void;
+    commitBatch(callback: (error: any, operationResponses: any[], response: any) => void): void;
+    commitBatch(options: any, callback: (error: any, operationResponses: any[], response: any) => void): void;
+    processResponse(responseObject: any, requestOperations: any[]): any[];
+    processOperation(webResource: WebResource, rawResponse: string): any;
+}
+
+export declare class ServiceManagementClient {
+
+}
+
+export declare class TableQuery {
+    static select(...fields: string[]): TableQuery;
+    from(table: string): TableQuery;
+    whereKeys(partitionKey: string, rowKey: string): TableQuery;
+    whereNextKeys(partitionKey: string, rowKey: string): TableQuery;
+    where(condition: string, ...values: string[]): TableQuery;
+    and(condition: string, ...args: string[]): TableQuery;
+    or(condition: string, ...args: string[]): TableQuery;
+    top(integer: number): TableQuery;
+    toQueryObject(): any;
+    toPath(): string;
+}
+
+export declare class BlobResult {
+    blob: string;
+    container: string;
+
+    etag: string;
+    lastModified: string;
+    contentType: string;
+    contentEncoding: string;
+    contentLanguage: string;
+    contentMD5: string;
+    cacheControl: string;
+    contentRange: string;
+    contentTypeHeader: string;
+    contentEncodingHeader: string;
+    contentLanguageHeader: string;
+    contentMD5Header: string;
+    cacheControlHeader: string;
+    contentLength: number;
+    contentLengthHeader: number;
+    contentDisposition: string;
+    contentDispositionHeader: string;
+    range: string;
+    rangeHeader: string;
+    getContentMd5: string;
+    acceptRanges: string;
+    blobType: string;
+    leaseStatus: string;
+    leaseId: string;
+    leaseDuration: string;
+    leaseState: string;
+    sequenceNumber: string;
+    copyStatus: string;
+    copyCompletionTime: string;
+    copyStatusDescription: string;
+    copyId: string;
+    copyProgress: number;
+    requestId: string;
+
+    metadata: StorageMetadata;
+
+    constructor();
+    constructor(container: string);
+    constructor(container: string, blob: string);
+
+    static parse(blobXml: any): BlobResult;
+    static setHeadersFromBlob(webResource: WebResource, blob: BlobResult): void;
+
+    getPropertiesFromHeaders(headers: any): void;
+}
+
+export declare class ContainerResult {
+    name: string;
+    publicAccessLevel: string;
+
+    etag: string;
+    lastModified: string;
+    leaseStatus: string;
+    leaseDuration: string;
+    leaseState: string;
+    requestId: string;
+
+    metadata: StorageMetadata;
+    signedIdentifiers: SignedIdentifier[];
+
+    constructor();
+    constructor(name: string);
+    constructor(name: string, publicAccessLevel: string);
+
+    static parse(containerXml: any): ContainerResult;
+
+    getPropertiesFromHeaders(headers: any): void;
+}
+
+export declare class LeaseResult {
+    container: string;
+    blob: string;
+    id: string;
+    time: string;
+    etag: string;
+    lastModified: string;
+
+    constructor();
+    constructor(container: string);
+    constructor(container: string, blob: string);
+    constructor(container: string, blob: string, id: string);
+    constructor(container: string, blob: string, id: string, time: string);
+
+    getPropertiesFromHeaders(header: any): void;
+}
+
+export declare class QueueResult {
+    name: string;
+    metadata: StorageMetadata;
+    approximatemessagecount: number;
+
+    constructor();
+    constructor(name: string);
+    constructor(name: string, metadata: StorageMetadata);
+
+    static parse(messageXml: any): QueueResult;
+
+    getPropertiesFromHeaders(headers: any): void;
+}
+
+export declare class QueueMessageResult {
+    queue: string;
+    insertiontime: string;
+    expirationtime: string;
+    timenextvisible: string;
+    messagetext: string;
+    dequeuecount: string;
+    messageid: string;
+    popreceipt: string;
+    metadata: StorageMetadata;
+
+    constructor();
+    constructor(queue: string);
+    constructor(queue: string, messageid: string);
+    constructor(queue: string, messageid: string, popreceipt: string);
+    constructor(queue: string, messageid: string, popreceipt: string, metadata: StorageMetadata);
+
+    static serialize(messageJs: string): string;
+    static parse(messageXml: any): QueueMessageResult;
+
+    getPropertiesFromHeaders(headers: any): void;
+}
+
+export declare class SpeedSummary {
+    name: string;
+    totalSize: number;
+    completeSize: number;
+
+    _startTime: Date;
+    _timeWindowInSeconds: number;
+    _timeWindow: number;
+    _totalWindowSize: number;
+    _speedTracks: number[];
+    _speedTrackPtr: number;
+
+    constructor(name: string);
+
+    /**
+     * Get running seconds
+     */
+    getElapsedSeconds(): string;
+    getElapsedSeconds(humanReadable: boolean): number;
+
+    /**
+     * Get complete percentage
+     */
+    getCompletePercent(): number;
+    getCompletePercent(len: number): number;
+
+    /**
+     * Get average upload/download speed
+     */
+    getAverageSpeed(): string;
+    getAverageSpeed(humanReadable: boolean): number;
+
+    /**
+     * Get internal speed
+     */
+    getSpeed(): string;
+    getSpeed(humanReadable: boolean): number;
+
+    /**
+     * Get auto increment function
+     */
+    getSpeed(size: number): (error: Error, value: any) => void;
+
+    /**
+     * Get total size
+     */
+    getTotalSize(): string;
+    getTotalSize(humanReadable: boolean): number;
+
+    /**
+     * Get completed data size
+     */
+    getCompleteSize(): string;
+    getCompleteSize(humanReadable: boolean): number;
+}
+
+export declare module Constants {
+
+}
+
+export interface Filter {
+    handle(requestOptions: any, next: Function): void;
+}
+
+export declare class LinearRetryPolicyFilter implements Filter {
+    constructor(retryCount?: number, retryInterval?: number);
+    retryCount: number;
+    retryInterval: number;
+    handle(requestOptions: any, next: Function): void;
+}
+
+export declare class ExponentialRetryPolicyFilter implements Filter {
+    constructor(retryCount?: number, retryInterval?: number, minRetryInterval?: number, maxRetryInterval?: number);
+    retryCount: number;
+    retryInterval: number;
+    minRetryInterval: number;
+    maxRetryInterval: number;
+    handle(requestOptions: any, next: Function): void;
+}
+
+export declare class HmacSha256Sign {
+
+}
+
+export declare class SharedAccessSignature {
+    storageAccount: string;
+    storageAccessKey: string;
+    permissionSet: string[];
+    signer: HmacSha256Sign;
+
+    constructor(storageAccount: string, storageAccessKey: string, permissionSet: string[])
+
+    /**
+     * Generates the query string for a shared access signature signing.
+     */
+    generateSignedQueryString(path: string, queryString: Dictionary<string>, resourceType: string, sharedAccessPolicy: SharedAccessPolicy): Dictionary<string>;
+
+    /**
+     * Signs a request with the signature header.
+     */
+    signRequest(webResource: WebResource, callback: ErrorCallback): void;
+
+    /**
+     * Generates the shared access signature for a resource.
+     */
+    _generateSignature(path: string, resourceType: string, sharedAccessPolicy: SharedAccessPolicy): string;
+
+    /**
+     * Generates the query string for a shared access signature signing.
+     */
+    _permissionMatchesRequest(sharedAccessSignature: string, webResource: WebResource, resourceType: string, requiredPermissions: string[]): string;
+}
+
+export declare class SharedKey {
+    storageAccount: string;
+    storageAccessKey: string;
+    usePathStyleUri: string;
+    signer: HmacSha256Sign;
+
+    constructor(storageAccount: string, storageAccessKey: string, usePathStyleUri: boolean);
+
+    /**
+     * Signs a request with the Authentication header.
+     */
+    signRequest(webResource: WebResource, callback: ErrorCallback): void;
+
+    /**
+     * Retrieves the webresource's canonicalized resource string.
+     */
+    _getCanonicalizedResource(webResource: WebResource): string;
+
+    /**
+     * Constructs the Canonicalized Headers string.
+     *
+     * To construct the CanonicalizedHeaders portion of the signature string,
+     * follow these steps: 1. Retrieve all headers for the resource that begin
+     * with x-ms-, including the x-ms-date header. 2. Convert each HTTP header
+     * name to lowercase. 3. Sort the headers lexicographically by header name,
+     * in ascending order. Each header may appear only once in the
+     * string. 4. Unfold the string by replacing any breaking white space with a
+     * single space. 5. Trim any white space around the colon in the header. 6.
+     * Finally, append a new line character to each canonicalized header in the
+     * resulting list. Construct the CanonicalizedHeaders string by
+     * concatenating all headers in this list into a single string.
+     */
+    _getCanonicalizedHeaders(webResource: WebResource): string;
+}
+
+export declare class SharedKeyLite {
+    storageAccount: string;
+    storageAccessKey: string;
+    usePathStyleUri: string;
+    signer: HmacSha256Sign;
+
+    constructor(storageAccount: string, storageAccessKey: string, usePathStyleUri: boolean);
+
+    /**
+     * Signs a request with the Authentication header.
+     */
+    signRequest(webResource: WebResource, callback: ErrorCallback): void;
+
+    /**
+     * Retrieves the webresource's canonicalized resource string.
+     */
+    _getCanonicalizedResource(webResource: WebResource): string;
+
+    /**
+     * Constructs the Canonicalized Headers string.
+     *
+     * To construct the CanonicalizedHeaders portion of the signature string,
+     * follow these steps: 1. Retrieve all headers for the resource that begin
+     * with x-ms-, including the x-ms-date header. 2. Convert each HTTP header
+     * name to lowercase. 3. Sort the headers lexicographically by header name,
+     * in ascending order. Each header may appear only once in the
+     * string. 4. Unfold the string by replacing any breaking white space with a
+     * single space. 5. Trim any white space around the colon in the header. 6.
+     * Finally, append a new line character to each canonicalized header in the
+     * resulting list. Construct the CanonicalizedHeaders string by
+     * concatenating all headers in this list into a single string.
+     */
+    _getCanonicalizedHeaders(webResource: WebResource): string;
+}
+
+export declare class SharedKeyTable {
+    storageAccount: string;
+    storageAccessKey: string;
+    usePathStyleUri: string;
+    signer: HmacSha256Sign;
+
+    constructor(storageAccount: string, storageAccessKey: string, usePathStyleUri: boolean);
+
+    /**
+     * Signs a request with the Authentication header.
+     */
+    signRequest(webResource: WebResource, callback: ErrorCallback): void;
+
+    /**
+     * Retrieves the webresource's canonicalized resource string.
+     */
+    _getCanonicalizedResource(webResource: WebResource): string;
+}
+
+export declare class SharedKeyLiteTable {
+    torageAccount: string;
+    storageAccessKey: string;
+    usePathStyleUri: string;
+    signer: HmacSha256Sign;
+
+    constructor(storageAccount: string, storageAccessKey: string, usePathStyleUri: boolean);
+
+    /**
+     * Signs a request with the Authentication header.
+     */
+    signRequest(webResource: WebResource, callback: ErrorCallback): void;
+
+    /**
+     * Retrieves the webresource's canonicalized resource string.
+     */
+    _getCanonicalizedResource(webResource: WebResource): string;
+}
+
+export declare module ISO8061Date {
+    /**
+     * Formats a date into an iso 8061 string.
+     */
+    export function format(date: Date): string;
+
+    /**
+     * Parses an ISO 8061 date string into a date object.
+     */
+    export function parse(stringDateTime: string): Date;
+}
+
+export declare class Logger {
+    level: string;
+    loggerFunction: (level: string, message: string) => void;
+
+    static LogLevels: {
+        EMERGENCY: string;
+        ALERT: string;
+        CRITICAL: string;
+        ERROR: string;
+        WARNING: string;
+        NOTICE: string;
+        INFO: string;
+        DEBUG: string;
+    };
+    static logPriority: string[];
+
+    log(level: string, message: string): void;
+    emergency(message: string): void;
+    alert(message: string): void;
+    critical(message: string): void;
+    error(message: string): void;
+    warning(message: string): void;
+    notice(message: string): void;
+    info(message: string): void;
+    debug(message: string): void;
+
+    defaultLoggerFunction(level: string, message: string): void;
+}
+
+export declare class ConnectionStringParser {
+    _value: string;
+    _pos: number;
+    _state: string;
+
+    constructor(connectionString: string);
+
+    _parse(options: ConnectionStringParseOptions): Dictionary<string>;
+
+    _extractKey(): string;
+    _extractString(quote: string): string;
+    _extractValue(): string;
+
+    _skipWhitespaces(): void;
+    _skipOperator(operator: string): void;
+
+    static parse(connectionString: string): Dictionary<string>;
+}
+
+export declare module ServiceSettings {
+    export var DEFAULT_PROTOCOL: string;
+
+    export class NoMatchError implements Error {
+        name: string;
+        message: string;
+        constr: any;
+
+        constructor();
+        constructor(message: string);
+        constructor(message: string, constr: any);
+    }
+
+    /**
+     * Throws an exception if the connection string format does not match any of the
+     * available formats.
+     */
+    export function noMatchConnectionString(connectionString: string): void;
+
+    /**
+     * Throws an exception if the settings dont match any of the available formats.
+     */
+    export function noMatchSettings(settings: any): void;
+
+    /**
+     * Parses the connection string and then validate that the parsed keys belong to
+     * the validSettingKeys
+     */
+    export function parseAndValidateKeys(connectionString: string, validKeys: string[]): string[];
+
+    /**
+     * Creates an anonymous function that acts as predicate to perform a validation.
+     */
+    export function getValidator(requirements: Dictionary<Requirement>, isRequired: boolean, atLeastOne: boolean): ValidatorFunction;
+
+    /**
+     * Creates a setting value condition that validates it is one of the passed valid values.
+     */
+    export function setting(name: string): string[];
+
+    /**
+     * Creates an "at least one" predicate for the provided list of requirements.
+     */
+    export function atLeastOne(...args: any[]): ValidatorFunction;
+
+    /**
+     * Creates an optional predicate for the provided list of requirements.
+     */
+    export function optional(...args: any[]): ValidatorFunction;
+
+    /**
+     * Creates an required predicate for the provided list of requirements.
+     */
+    export function allRequired(...args: any[]): ValidatorFunction;
+
+    /**
+     * Creates a setting value condition using the passed predicate.
+     */
+    export function settingWithFunc(name: string, predicate: Function): Requirement[];
+
+    /**
+     * Tests to see if a given list of settings matches a set of filters exactly.
+     */
+    export function matchedSpecification(settings: Dictionary<any>): boolean;
+
+    /**
+     * Tests to see if a given list of settings matches a set of filters exactly.
+     */
+    export function parseHost(uri: string): url.Url;
+}
+
+export declare class StorageServiceSettings {
+    _name: string;
+    _key: string;
+    _blobEndpointUri: string;
+    _queueEndpointUri: string;
+    _tableEndpointUri: string;
+    _usePathStyleUri: boolean;
+
+    constructor(name: string, key: string, blobEndpointUri: string, queueEndpointUri: string, tableEndpointUri: string, usePathStyleUri: boolean);
+
+    /**
+     * Returns a StorageServiceSettings with development storage credentials using
+     * the specified proxy Uri.
+     */
+    static _getDevelopmentStorageAccount(): StorageServiceSettings;
+    static _getDevelopmentStorageAccount(proxy: string): StorageServiceSettings;
+
+    /**
+     * Gets a StorageServiceSettings object that references the development storage
+     * account.
+     */
+    static getDevelopmentStorageAccountSettings(): StorageServiceSettings;
+
+    /**
+     * Gets the default service endpoint using the specified protocol and account
+     * name.
+     */
+    static _getDefaultServiceEndpoint(settings: Dictionary<string>, dns: string): string;
+
+    /**
+     * Creates StorageServiceSettings object given endpoints uri.
+     */
+    static _createStorageServiceSettings(settings: Dictionary<string>, blobEndpointUri: string, queueEndpointUri: string, tableEndpointUri: string): StorageServiceSettings;
+
+    /**
+     * Creates a ServiceBusSettings object from a set of settings.
+     */
+    static createFromSettings(settings: Dictionary<string>): StorageServiceSettings;
+
+    /**
+     * Creates a StorageServiceSettings object from the given connection string.
+     */
+    static createFromConnectionString(connectionString: string): StorageServiceSettings;
+
+    static createExplicitlyOrFromEnvironment(storageAccount: string, storageAccessKey: string, host: string): StorageServiceSettings;
+
+    static isDevelopmentStorage(storageAccount: string, storageAccessKey: string, parsedHost: string): boolean;
+
+    static createFromConfig(config: any): StorageServiceSettings;
+
+    static customizeConfig(config: any): void;
+}
+
+export declare class ServiceBusSettings {
+
+}
+
+export declare class ServiceManagementSettinsg {
+
+}
+
+export declare module Validate {
+    /**
+     * Checks if the given uri is valid or not.
+     */
+    export function isValidUri(uri: string): boolean;
+
+    /**
+     * Validates that a clusterCreationObject is properly formed.
+     */
+    export function isValidHDInsightCreationObject(clusterCreationObject: ClusterCreationOptions): void;
+    export function isValidHDInsightCreationObject(clusterCreationObject: ClusterCreationOptions, callback: ErrorCallback): void;
+
+    export function isValidUuid(uuid: string): void;
+    export function isValidUuid(uuid: string, callback: ErrorCallback): void;
+
+    /**
+     * Creates a anonymous function that check if a given key is base 64 encoded.
+     */
+    export function isBase64Encoded(key: string): boolean;
+
+    /**
+     * Validates a function.
+     */
+    export function isValidFunction(functionObject: any, functionName: string): void;
+
+    /**
+     * Validates that a Service Bus namespace name
+     * is legally allowable. Does not check availability.
+     */
+    export function namespaceNameIsValid(name: string): boolean;
+    export function namespaceNameIsValid(name: string, callback: ErrorCallback): boolean;
+
+    /**
+     * Validates a container name.
+     */
+    export function containerNameIsValid(containerName: string): boolean;
+    export function containerNameIsValid(containerName: string, callback: ErrorCallback): boolean;
+
+    /**
+     * Validates a blob name.
+     */
+    export function blobNameIsValid(containerName: string, blob: string): boolean;
+    export function blobNameIsValid(containerName: string, blob: string, callback: ErrorCallback): boolean;
+
+    /**
+     * Validates a table name.
+     */
+    export function tableNameIsValid(tableName: string): boolean;
+    export function tableNameIsValid(tableName: string, callback: ErrorCallback): boolean;
+
+    /**
+     * Validates a queue name.
+     */
+    export function queueNameIsValid(queueName: string): boolean;
+    export function queueNameIsValid(queueName: string, callback: ErrorCallback): boolean;
+
+    export function pageRangesAreValid(rangeStart: number, rangeEnd: number, writeBlockSizeInBytes: number): boolean;
+    export function pageRangesAreValid(rangeStart: number, rangeEnd: number, writeBlockSizeInBytes: number, callback: ErrorCallback): boolean;
+
+    export function validateArgs(functionName: string, validationRules: Function): boolean;
+}
+
+export declare module date {
+    /**
+     * Generates a Date object which is in the given days from now.
+     */
+    export function daysFromNow(days: number): Date;
+
+    /**
+     * Generates a Date object which is in the given hours from now.
+     */
+    export function hoursFromNow(hours: number): Date;
+
+    /**
+     * Generates a Date object which is in the given minutes from now.
+     */
+    export function minutesFromNow(minutes: number): Date;
+
+    /**
+     * Generates a Date object which is in the given seconds from now.
+     */
+    export function secondsFromNow(seconds: number): Date;
+}
+//#endregion
+
+//#region Non-explicit, undeclared interfaces
+export interface WebResponse {
+    isSuccessful: boolean;
+    statusCode: number;
+    body: {
+        entry: {
+            id: string;
+            title: any;
+            updated: string;
+            author: {
+                name: any;
+            };
+            link: any;
+            category: any;
+            content: any;
+        };
+    };
+    headers: any;
+    md5: any;
+}
+
+//#region Common Interfaces
+export interface SimpleCallback<T> {
+    (error: Error, result: T): void;
+}
+export interface ErrorCallback {
+    (error: Error): void;
+}
+export interface StorageCallbackVoid {
+    (err: Error, response: WebResponse): void;
+}
+export interface StorageCallback<T> {
+    (err: Error, result: T, response: WebResponse): void;
+}
+export interface StorageServiceStatsCallback extends StorageCallback<StorageServiceStats> { }
+export interface StorageServicePropertiesCallback extends StorageCallback<StorageServiceProperties> { }
+
+export interface TimeoutIntervalOptions {
+    locationMode?: string;
+    timeoutIntervalInMs?: number;
+    maximumExecutionTimeInMs?: number;
+}
+export interface MetadataOptions extends TimeoutIntervalOptions {
+    metadata?: StorageMetadata;
+}
+export interface StorageAclOptions extends TimeoutIntervalOptions {
+    leaseId?: string;
+    signedIdentifiers: SignedIdentifier[]
+}
+
+export interface Dictionary<T> {
+    [key: string]: T;
+}
+export interface StorageServiceProperties {
+    Logging: {
+        Version: number;
+        Delete: boolean;
+        Read: boolean;
+        Write: boolean;
+        RetentionPolicy: {
+            Enabled: boolean;
+            Days: number;
+        };
+    };
+    Metrics: {
+        Version: number;
+        Enabled: boolean;
+        IncludeAPIs: boolean;
+        RetentionPolicy: {
+            Enabled: boolean;
+            Days: number;
+        };
+    };
+    DefaultServiceVersion: string;
+}
+export interface StorageServiceStats {
+    GeoReplication: {
+        Status: string;
+        LastSyncTime: Date;
+    }
+}
+export interface SignedIdentifier {
+    Id: string;
+    AccessPolicy: SharedAccessPolicy;
+}
+export interface StorageMetadata {
+    [key: string]: string;
+}
+export interface ContinuationToken {
+    nextMarker: string;
+    targetLocation: string;
+}
+export interface SharedAccessPolicy {
+    Id?: string;
+    AccessPolicy: {
+        Start?: Date;
+        Expiry: Date;
+        Permission?: string;
+    }
+}
+//#endregion
+//#region TableService Interfaces
+export interface TableRequestCallback {
+    (error: Error, tableResult: { TableName: string; }, response: WebResponse): void;
+}
+
+export interface CreateTableIfNotExistsCallback {
+    (error: Error, created: boolean, response: WebResponse): void;
+}
+
+export interface DeleteTableCallback {
+    (error: Error, successful: boolean, response: WebResponse): void;
+}
+
+export interface QueryTablesCallback {
+    (error: Error, queryTablesResult: TableResult[], resultsContinuation: QueryResultContinuation, response: WebResponse): void;
+}
+
+export interface QueryResultContinuation {
+    tableService: TableService;
+}
+
+export interface QueryTablesOptions extends TimeoutIntervalOptions {
+    nextTableName?: string;
+}
+
+export interface TableResult {
+    TableName: string;
+}
+
+export interface QueryEntityCallback {
+    (error: Error, entity: Entity, response: WebResponse): void;
+}
+
+export interface QueryEntitiesCallback {
+    (error: Error, entities: Entity[], resultContinuation: QueryEntitiesResultContinuation, response: WebResponse): void;
+}
+
+export interface QueryEntitiesResultContinuation extends QueryResultContinuation {
+    tableQuery: TableQuery;
+    nextPartitionKey: string;
+    nextRowKey: string;
+    getNextPage(callback?: QueryEntitiesCallback): void;
+    hasNextPage(): boolean;
+}
+
+export interface ModifyEntityCallback {
+    (error: Error, entity: Entity, response: WebResponse): void;
+}
+
+export interface DeleteEntityCallback {
+    (error: Error, successful: boolean, response: WebResponse): void;
+}
+
+export interface UpdateEntityOptions extends TimeoutIntervalOptions {
+    checkEtag?: boolean;
+}
+
+export interface Entity {
+    PartitionKey: string;
+    RowKey: string;
+    Timestamp?: Date;
+    etag?: string;
+    [property: string]: string | number | boolean | Date;
+}
+//#endregion
+//#region BlobService Interfaces
+export interface LeaseIdOptions extends TimeoutIntervalOptions {
+    leaseId?: string;
+}
+export interface AccessConditionsOptions extends TimeoutIntervalOptions {
+    accessConditions?: StorageAccessCondition;
+}
+export interface LeaseAccessConditionsOptions extends LeaseIdOptions {
+    accessConditions?: StorageAccessCondition;
+}
+
+export interface ListContainersOptions extends TimeoutIntervalOptions {
+    prefix?: string;
+    maxresults?: number;
+    marker: string;
+    include?: string;
+}
+export interface ListContainersCallback {
+    (err: Error, containers: ContainerResult[], continuationToken: ContinuationToken, response: WebResponse): void;
+}
+export interface CreateContainerOptions extends TimeoutIntervalOptions {
+    metadata?: StorageMetadata;
+    publicAccessLevel?: string;
+}
+export interface GetContainerPropertiesOptions extends TimeoutIntervalOptions {
+    leaseId?: string;
+}
+export interface GetContainerMetadataOptions extends GetContainerPropertiesOptions {
+    accessConditions?: StorageAccessCondition;
+}
+
+export interface ListBlobsOptions extends ListContainersOptions {
+    prefix?: string;
+    delimiter?: string;
+}
+export interface ListBlobsCallback {
+    (err: Error, blobs: BlobResult[], continuationToken: ContinuationToken, response: WebResponse): void;
+}
+export interface GetBlobPropertiesOptions extends LeaseAccessConditionsOptions {
+    snapshotId?: string;
+}
+export interface SetBlobPropertiesOptions extends LeaseAccessConditionsOptions {
+    contentType?: string;
+    contentEncoding?: string;
+    contentLanguage?: string;
+    contentMD5?: string;
+    cacheControl?: string;
+    contentDisposition?: string;
+}
+export interface ReadBlobOptions extends GetBlobPropertiesOptions {
+    rangeStart?: string;
+    rangeEnd?: string;
+    useTransactionalMD5?: boolean;
+    disableContentMD5Validation?: boolean;
+}
+export interface GetBlobToTextCallback {
+    (err: Error, text: string, result: BlobResult, response: WebResponse): void;
+}
+export interface DeleteBlobOptions extends GetBlobPropertiesOptions {
+    deleteSnapshots?: string;
+}
+export interface BlobSnapshotOptions extends GetBlobPropertiesOptions {
+    metadata?: StorageMetadata;
+}
+export interface CopyBlobOptions extends BlobSnapshotOptions {
+    sourceLeaseId?: string;
+    sourceAccessConditions: StorageAccessCondition;
+}
+
+export interface UploadBlobOptions extends SetBlobPropertiesOptions {
+    metadata?: StorageMetadata;
+    speedSummary?: SpeedSummary;
+    parallelOperationThreadCount?: number;
+    storeBlobContentMD5?: boolean;
+    useTransactionalMD5?: boolean;
+}
+export interface CreatePagesOptions extends LeaseAccessConditionsOptions {
+    contentMD5?: string;
+    useTransactionalMD5?: boolean;
+}
+export interface PageRangeOptions extends LeaseIdOptions {
+    snapshotId?: string;
+    rangeStart?: number;
+    rangeEnd?: number;
+}
+
+export interface UploadBlockBlobOptions extends UploadBlobOptions {
+    blockIdPrefix?: string;
+}
+export interface CreateBlockOptions extends LeaseAccessConditionsOptions {
+    contentMD5?: string;
+    useTransactionalMD5?: boolean;
+}
+
+export interface LeaseOptions extends AccessConditionsOptions {
+    leaseDuration?: string;
+    proposedLeaseId?: string;
+}
+export interface BreakLeaseOptions extends AccessConditionsOptions {
+    leaseBreakPeriod?: number;
+}
+
+export interface SharedAccessSignatureResult {
+    baseUrl: string;
+    path: string;
+    queryString: {
+        se: string;
+        sp: string;
+        sr: string;
+        sv: string;
+        sig: string;
+    };
+    url: () => string;
+}
+export interface BlobHeaders {
+    cacheControl?: string;
+    contentType?: string;
+    contentEncoding?: string;
+    contentLanguage?: string;
+    contentDisposition?: string;
+}
+export interface PageRange {
+    start: number;
+    end: number;
+}
+export interface BlockList {
+    LatestBlocks: string[];
+    CommittedBlocks: string[];
+    UncommittedBlocks: string[];
+}
+export interface StorageAccessCondition {
+    "If-Modified-Since": Date;
+    "If-Unmodified-Since": Date;
+    "If-Match": string;
+    "If-None-Match": string;
+}
+//#endregion
+//#region QueueService Interfaces
+export interface ListQueuesOptions extends TimeoutIntervalOptions {
+    prefix?: string;
+    maxresults?: number;
+    marker: string;
+    include?: string;
+}
+export interface ListQueuesCallback {
+    (err: Error, queues: QueueResult[], continuationToken: ContinuationToken, response: WebResponse): void;
+}
+
+export interface CreateQueueMessageOptions extends TimeoutIntervalOptions {
+    messagettl?: number;
+    visibilitytimeout?: number;
+}
+export interface PeekQueueMessagesOptions extends TimeoutIntervalOptions {
+    numofmessages?: number;
+}
+export interface GetQueueMessagesOptions extends PeekQueueMessagesOptions {
+    peekonly?: boolean;
+    visibilitytimeout?: number;
+}
+export interface UpdateQueueMessagesOptions extends TimeoutIntervalOptions {
+    messagetext?: string;
+}
+//#endregion
+
+//#region RoleEnvironment Interfaces
+export interface Role {
+    name: string;
+    instances: {
+        [instanceId: string]: RoleInstance;
+    };
+}
+export interface RoleInstance {
+    id: string;
+    faultDomain: string;
+    updateDomain: string;
+    endpoints: {
+        [endpoint: string]: RoleInstanceEndpoint
+    };
+}
+export interface RoleInstanceEndpoint {
+    protocol: string;
+    address: string;
+    port: number;
+}
+export interface RoleLocalResource {
+    name: string;
+    path: string;
+    maximumSizeInMegabytes: number;
+}
+//#endregion
+//#region ConnectionStringParser Interfaces
+export interface ConnectionStringParseOptions {
+    skipLowerCase: boolean;
+}
+//#endregion
+//#region Validate Interfaces
+export interface ClusterCreationOptions {
+    name: string;
+    location: string;
+    defaultStorageAccountName: string;
+    defaultStorageAccountKey: string;
+    defaultStorageContainer: string;
+    user: string;
+    password: string;
+    nodes: number;
+    additionalStorageAccounts?: {
+        name: string;
+        key: string;
+    }[];
+    oozieMetastore?: {
+        server: string;
+        database: string;
+        user: string;
+        password: string;
+    };
+    hiveMetastore?: {
+        server: string;
+        database: string;
+        user: string;
+        password: string;
+    };
+}
+//#endregion
+//#region ServiceSettings Interfaces
+export interface Requirement {
+    SettingName: string;
+    SettingPredicate: Function;
+}
+export interface ValidatorFunction {
+    (userSettings: Dictionary<any>): any;
+}
+//#endregion
+//#endregion
+
+//#region Un-exported internal classes
+declare class StorageServiceClient extends ServiceClient {
+    static incorrectStorageAccountErr: string;
+    static incorrectStorageAccessKeyErr: string;
+    static getStorageSettings(connectionString: string): StorageServiceSettings;
+    static getStorageSettings(storageAccount?: string, storageAccessKey?: string, host?: string): StorageServiceSettings;
+
+    apiVersion: string;
+    usePathStyleUri: string;
+
+    constructor(storageAccount: string, storageAccessKey: string, host: string, usePathStyleUri: boolean, authenticationProvider: any);
+}
+//#endregion
+
+export declare function isEmulated(): boolean;
diff --git a/azure/tsconfig.json b/azure/tsconfig.json
new file mode 100644
index 0000000000..dce73524a2
--- /dev/null
+++ b/azure/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "azure-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/babel-core/babel-core-tests.ts b/babel-core/babel-core-tests.ts
new file mode 100644
index 0000000000..4c62d3c2f5
--- /dev/null
+++ b/babel-core/babel-core-tests.ts
@@ -0,0 +1,32 @@
+
+import * as babel from "babel-core";
+
+
+// Example from https://github.com/babel/babel/tree/master/packages/babel-core
+const code = `class Example {}`;
+const result = babel.transform(code, { /* options */ });
+result.code; // Generated code
+result.map; // Sourcemap
+result.ast; // AST
+
+
+// Examples from http://babeljs.io/docs/usage/api/
+let options: babel.TransformOptions = {
+    plugins: [
+        "es2015-arrow-functions",
+        "es2015-block-scoped-functions",
+        "es2015-block-scoping",
+        "es2015-classes",
+    ],
+    only: /.*\.js/,
+    ast: false,
+    sourceMaps: true
+};
+
+babel.transformFile("filename.js", options, function (err, result) {
+    result.code;
+    result.map;
+    result.ast;
+});
+
+babel.transformFileSync("filename.js", options).code;
diff --git a/babel-core/index.d.ts b/babel-core/index.d.ts
new file mode 100644
index 0000000000..a3cd7019ab
--- /dev/null
+++ b/babel-core/index.d.ts
@@ -0,0 +1,144 @@
+// Type definitions for babel-core v6.7
+// Project: https://github.com/babel/babel/tree/master/packages/babel-core
+// Definitions by: Troy Gerwien <https://github.com/yortus>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="babel-template" />
+/// <reference types="babel-traverse" />
+/// <reference types="babel-types" />
+
+import * as t from 'babel-types';
+export {t as types};
+type Node = t.Node;
+export import template = require('babel-template');
+export var version: string;
+import traverse, {Visitor} from "babel-traverse";
+export {traverse, Visitor};
+
+
+/** Transforms the passed in `code`. Returning an object with the generated code, source map, and AST. */
+export function transform(code: string, opts?: TransformOptions): BabelFileResult;
+
+/** Asynchronously transforms the entire contents of a file. */
+export function transformFile(filename: string, opts: TransformOptions, callback: (err: any, result: BabelFileResult) => void): void;
+
+/** Synchronous version of `babel.transformFile`. Returns the transformed contents of the `filename`. */
+export function transformFileSync(filename: string, opts?: TransformOptions): BabelFileResult;
+
+export function transformFromAst(ast: Node, code?: string, opts?: TransformOptions): BabelFileResult;
+
+export interface TransformOptions {
+
+    /** Filename to use when reading from stdin - this will be used in source-maps, errors etc. Default: "unknown". */
+    filename?: string;
+
+    /** Filename relative to `sourceRoot`. */
+    filenameRelative?: string;
+
+    /** A source map object that the output source map will be based on. */
+    inputSourceMap?: Object;
+
+    /**
+     * This is an object of keys that represent different environments. For example, you may have:
+     * `{ env: { production: { / * specific options * / } } }`
+     * which will use those options when the enviroment variable `BABEL_ENV` is set to `"production"`.
+     * If `BABEL_ENV` isn't set then `NODE_ENV` will be used, if it's not set then it defaults to `"development"`.
+     */
+    env?: Object;
+
+    /** Retain line numbers - will result in really ugly code. Default: `false` */
+    retainLines?: boolean;
+
+    /** Enable/disable ANSI syntax highlighting of code frames. Default: `true`. */
+    highlightCode?: boolean;
+
+    /** List of presets (a set of plugins) to load and use. */
+    presets?: any[];
+
+    /** List of plugins to load and use. */
+    plugins?: any[];
+
+    /** list of glob paths to **not** compile. Opposite to the `only` option. */
+    ignore?: string[];
+
+    /**
+     * A glob, regex, or mixed array of both, matching paths to only compile. Can also be an array of arrays containing
+     * paths to explicitly match. When attempting to compile a non-matching file it's returned verbatim.
+     */
+    only?: string | RegExp | Array<string | RegExp>;
+
+    /** Enable code generation. Default: `true`. */
+    code?: boolean;
+
+    /** Include the AST in the returned object. Default: `true`. */
+    ast?: boolean;
+
+    /** A path to an .babelrc file to extend. */
+    extends?: string;
+
+    /** write comments to generated output. Default: `true`. */
+    comments?: boolean;
+
+    /**
+     * An optional callback that controls whether a comment should be output or not. Called as
+     * `shouldPrintComment(commentContents)`. **NOTE**: This overrides the `comments` option when used.
+     */
+    shouldPrintComment?: (comment: string) => boolean;
+
+    /**
+     * Do not include superfluous whitespace characters and line terminators. When set to `"auto"`, `compact` is set to
+     * `true` on input sizes of >100KB.
+     */
+    compact?: boolean | "auto";
+
+    /**
+     * If truthy, adds a `map` property to returned output. If set to `"inline"`, a comment with a `sourceMappingURL`
+     * directive is added to the bottom of the returned code. If set to `"both"` then a map property is returned as well
+     * as a source map comment appended.
+     */
+    sourceMaps?: boolean | "inline" | "both";
+
+    /** Set `file` on returned source map. */
+    sourceMapTarget?: string;
+
+    /** Set `sources[0]` on returned source map. */
+    sourceFileName?: string;
+
+    /** The root from which all sources are relative. */
+    sourceRoot?: string;
+
+    /** Specify whether or not to use `.babelrc` and `.babelignore` files. Default: `true`. */
+    babelrc?: boolean;
+
+    /** Attach a comment before all non-user injected code. */
+    auxiliaryCommentBefore?: string;
+
+    /** Attach a comment after all non-user injected code. */
+    auxiliaryCommentAfter?: string;
+
+    /**
+     * Specify a custom callback to generate a module id with. Called as `getModuleId(moduleName)`.
+     * If falsy value is returned then the generated module id is used.
+     */
+    getModuleId?: (moduleName: string) => string;
+
+    /** Optional prefix for the AMD module formatter that will be prepend to the filename on module definitions. */
+    moduleRoot?: string;
+
+    /**
+     * If truthy, insert an explicit id for modules. By default, all modules are anonymous.
+     * (Not available for `common` modules).
+     */
+    moduleIds?: boolean;
+
+    /** Specify a custom name for module ids. */
+    moduleId?: string;
+}
+
+export interface BabelFileResult {
+    ast?: Node;
+    code?: string;
+    map?: Object;
+}
+export as namespace babel;
+
diff --git a/babel-core/tsconfig.json b/babel-core/tsconfig.json
new file mode 100644
index 0000000000..70c1c077d6
--- /dev/null
+++ b/babel-core/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "babel-core-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/babel-generator/babel-generator-tests.ts b/babel-generator/babel-generator-tests.ts
new file mode 100644
index 0000000000..a27fba50c5
--- /dev/null
+++ b/babel-generator/babel-generator-tests.ts
@@ -0,0 +1,27 @@
+/// <reference types="babylon" />
+
+
+
+// Example from https://github.com/babel/babel/tree/master/packages/babel-generator
+import {parse} from 'babylon';
+import generate from 'babel-generator';
+
+const code = 'class Example {}';
+const ast = parse(code);
+
+ast.type;
+ast.loc.start;
+
+const output = generate(ast, { /* options */ }, code);
+
+
+// Example from https://github.com/thejameskyle/babel-handbook/blob/master/translations/en/plugin-handbook.md#babel-generator
+let result = generate(ast, {
+    retainLines: false,
+    compact: "auto",
+    concise: false,
+    quotes: "double",
+    // ...
+}, code);
+result.code;
+result.map;
diff --git a/babel-generator/index.d.ts b/babel-generator/index.d.ts
new file mode 100644
index 0000000000..f30505623f
--- /dev/null
+++ b/babel-generator/index.d.ts
@@ -0,0 +1,101 @@
+// Type definitions for babel-generator v6.7
+// Project: https://github.com/babel/babel/tree/master/packages/babel-generator
+// Definitions by: Troy Gerwien <https://github.com/yortus>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="babel-types" />
+
+import * as t from 'babel-types';
+type Node = t.Node;
+
+/**
+ * Turns an AST into code, maintaining sourcemaps, user preferences, and valid output.
+ * @param ast - the abstract syntax tree from which to generate output code.
+ * @param opts - used for specifying options for code generation.
+ * @param code - the original source code, used for source maps.
+ * @returns - an object containing the output code and source map.
+ */
+export default function generate(ast: Node, opts?: GeneratorOptions, code?: string | {[filename: string]: string}): GeneratorResult;
+
+export interface GeneratorOptions {
+
+    /**
+     * Optional string to add as a block comment at the start of the output file.
+    */
+    auxiliaryCommentBefore?: string;
+
+    /**
+     * Optional string to add as a block comment at the end of the output file.
+    */
+    auxiliaryCommentAfter?: string;
+
+    /**
+     * Function that takes a comment (as a string) and returns true if the comment should be included in the output.
+     * By default, comments are included if `opts.comments` is `true` or if `opts.minifed` is `false` and the comment
+     * contains `@preserve` or `@license`.
+     */
+    shouldPrintComment?: (comment: string) => boolean;
+
+    /**
+     * Attempt to use the same line numbers in the output code as in the source code (helps preserve stack traces).
+     * Defaults to `false`.
+     */
+    retainLines?: boolean;
+
+    /**
+     * Should comments be included in output? Defaults to `true`.
+     */
+    comments?: boolean;
+
+    /**
+     * Set to true to avoid adding whitespace for formatting. Defaults to the value of `opts.minified`.
+     */
+    compact?: boolean | 'auto';
+
+    /**
+     * Should the output be minified. Defaults to `false`.
+     */
+    minified?: boolean;
+
+    /**
+     * Set to true to reduce whitespace (but not as much as opts.compact). Defaults to `false`.
+     */
+    concise?: boolean;        
+
+    /**
+     * The type of quote to use in the output. If omitted, autodetects based on `ast.tokens`.
+     */
+    quotes?: 'single' | 'double';
+
+    /**
+     * Used in warning messages
+     */
+    filename?: string;        
+
+    /**
+     * Enable generating source maps. Defaults to `false`.
+     */
+    sourceMaps?: boolean;
+
+    /**
+     * The filename of the generated code that the source map will be associated with.
+     */
+    sourceMapTarget?: string;
+
+    /**
+     * A root for all relative URLs in the source map.
+     */
+    sourceRoot?: string;
+
+    /**
+     * The filename for the source code (i.e. the code in the `code` argument).
+     * This will only be used if `code` is a string.
+     */
+    sourceFileName?: string;
+}
+
+export interface GeneratorResult {
+    map: Object;
+    code: string;
+}
+
diff --git a/babel-generator/tsconfig.json b/babel-generator/tsconfig.json
new file mode 100644
index 0000000000..e46a9e956c
--- /dev/null
+++ b/babel-generator/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "babel-generator-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/babel-template/babel-template-tests.ts b/babel-template/babel-template-tests.ts
new file mode 100644
index 0000000000..b5d4547188
--- /dev/null
+++ b/babel-template/babel-template-tests.ts
@@ -0,0 +1,21 @@
+
+/// <reference types="babel-generator" />
+/// <reference types="babel-types" />
+
+
+// Example from https://github.com/babel/babel/tree/master/packages/babel-template
+import template = require('babel-template');
+import generate from 'babel-generator';
+import * as t from 'babel-types';
+
+const buildRequire = template(`
+    var IMPORT_NAME = require(SOURCE);
+`);
+
+const ast = buildRequire({
+    IMPORT_NAME: t.identifier('myModule'),
+    SOURCE: t.stringLiteral('my-module')
+});
+
+console.log(generate(ast).code);
+// var myModule = require('my-module');
diff --git a/babel-template/index.d.ts b/babel-template/index.d.ts
new file mode 100644
index 0000000000..7d73adc466
--- /dev/null
+++ b/babel-template/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for babel-template v6.7
+// Project: https://github.com/babel/babel/tree/master/packages/babel-template
+// Definitions by: Troy Gerwien <https://github.com/yortus>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="babylon" />
+/// <reference types="babel-types" />
+
+
+import {BabylonOptions} from 'babylon';
+import * as t from 'babel-types';
+type Node = t.Node;
+
+// NB: This export doesn't match the handbook example, where `template` is the default export.
+// But it does match the runtime behaviour (at least at the time of this writing). For some reason,
+// babel-template/lib/index.js has this line at the bottom: module.exports = exports["default"];
+export = template;
+declare function template(code: string, opts?: BabylonOptions): UseTemplate;
+
+type UseTemplate = (nodes?: {[placeholder: string]: Node}) => Node;
+
diff --git a/babel-template/tsconfig.json b/babel-template/tsconfig.json
new file mode 100644
index 0000000000..55e2331c8c
--- /dev/null
+++ b/babel-template/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "babel-template-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/babel-traverse/babel-traverse-tests.ts b/babel-traverse/babel-traverse-tests.ts
new file mode 100644
index 0000000000..c02efe44ad
--- /dev/null
+++ b/babel-traverse/babel-traverse-tests.ts
@@ -0,0 +1,111 @@
+
+/// <reference types="babel-types" />
+/// <reference types="babylon" />
+
+
+import * as babylon from "babylon";
+import traverse, {Visitor} from 'babel-traverse';
+import * as t from 'babel-types';
+
+
+// Examples from: https://github.com/thejameskyle/babel-handbook/blob/master/translations/en/plugin-handbook.md
+const MyVisitor: Visitor = {
+    Identifier: {
+        enter() {
+            console.log("Entered!");
+        },
+        exit() {
+            console.log("Exited!");
+        }
+    }
+};
+
+const MyVisitor2: Visitor = {
+    Identifier(path) {
+        console.log("Visiting: " + path.node.name);
+    }
+};
+
+
+// Example from https://github.com/thejameskyle/babel-handbook/blob/master/translations/en/plugin-handbook.md#babel-traverse
+const code = `function square(n) {
+    return n * n;
+}`;
+
+const ast = babylon.parse(code);
+
+traverse(ast, {
+    enter(path) {
+        let node = path.node;
+        if (t.isIdentifier(node) && node.name === "n") {
+            node.name = "x";
+        }
+    }
+});
+
+
+// Examples from https://github.com/thejameskyle/babel-handbook/blob/master/translations/en/plugin-handbook.md#writing-your-first-babel-plugin
+
+const v1: Visitor = {
+
+    BinaryExpression(path) {
+        if (t.isIdentifier(path.node.left)) {
+            // ...
+        }
+        path.replaceWith(
+            t.binaryExpression("**", path.node.left, t.numericLiteral(2))
+        );
+        path.parentPath.replaceWith(
+            t.expressionStatement(t.stringLiteral("Anyway the wind blows, doesn't really matter to me, to me."))
+        );
+        path.parentPath.remove();
+    },
+
+    Identifier(path) {
+        if (path.isReferencedIdentifier()) {
+            // ...
+        }
+        if (t.isReferenced(path.node, path.parent)) {
+            // ...
+        }
+    },
+
+    ReturnStatement(path) {
+        path.replaceWithMultiple([
+            t.expressionStatement(t.stringLiteral("Is this the real life?")),
+            t.expressionStatement(t.stringLiteral("Is this just fantasy?")),
+            t.expressionStatement(t.stringLiteral("(Enjoy singing the rest of the song in your head)")),
+        ]);
+    },
+
+    FunctionDeclaration(path, state) {
+        path.replaceWithSourceString(`function add(a, b) {
+            return a + b;
+        }`);
+
+        path.insertBefore(t.expressionStatement(t.stringLiteral("Because I'm easy come, easy go.")));
+        path.insertAfter(t.expressionStatement(t.stringLiteral("A little high, little low.")));
+        path.remove();
+
+        if (path.scope.hasBinding("n")) {
+            // ...
+        }
+        if (path.scope.hasOwnBinding("n")) {
+            // ...
+        }
+
+        let id1 = path.scope.generateUidIdentifier("uid");
+        id1.type;
+        id1.name;
+        let id2 = path.scope.generateUidIdentifier("uid");
+        id2.type;
+        id2.name;
+
+        const id = path.scope.generateUidIdentifierBasedOnNode(path.node.id);
+        path.remove();
+        path.scope.parent.push({ id, init: path.node });
+
+        path.scope.rename("n", "x");
+        path.scope.rename("n");
+    }
+};
diff --git a/babel-traverse/index.d.ts b/babel-traverse/index.d.ts
new file mode 100644
index 0000000000..11d51dc2cb
--- /dev/null
+++ b/babel-traverse/index.d.ts
@@ -0,0 +1,966 @@
+// Type definitions for babel-traverse v6.7
+// Project: https://github.com/babel/babel/tree/master/packages/babel-traverse
+// Definitions by: Troy Gerwien <https://github.com/yortus>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="babel-types" />
+
+
+import * as t from 'babel-types';
+type Node = t.Node;
+
+export default function traverse(parent: Node | Node[], opts?: TraverseOptions, scope?: Scope, state?: any, parentPath?: NodePath<Node>): void;
+
+export interface TraverseOptions extends Visitor {
+    scope?: Scope;
+    noScope?: boolean;
+}
+
+export class Scope {
+    constructor(path: NodePath<Node>, parentScope?: Scope);
+    path: NodePath<Node>;
+    block: Node;
+    parentBlock: Node;
+    parent: Scope;
+    hub: Hub;
+    bindings: { [name: string]: Binding; };
+
+    /** Traverse node with current scope and path. */
+    traverse(node: Node | Node[], opts?: TraverseOptions, state?: any): void;
+
+    /** Generate a unique identifier and add it to the current scope. */
+    generateDeclaredUidIdentifier(name?: string): t.Identifier;
+
+    /** Generate a unique identifier. */
+    generateUidIdentifier(name?: string): t.Identifier;
+
+    /** Generate a unique `_id1` binding. */
+    generateUid(name?: string): string;
+
+    /** Generate a unique identifier based on a node. */
+    generateUidIdentifierBasedOnNode(parent: Node, defaultName?: string): t.Identifier;
+
+    /**
+     * Determine whether evaluating the specific input `node` is a consequenceless reference. ie.
+     * evaluating it wont result in potentially arbitrary code from being ran. The following are
+     * whitelisted and determined not to cause side effects:
+     *
+     *  - `this` expressions
+     *  - `super` expressions
+     *  - Bound identifiers
+     */
+    isStatic(node: Node): boolean;
+
+    /** Possibly generate a memoised identifier if it is not static and has consequences. */
+    maybeGenerateMemoised(node: Node, dontPush?: boolean): t.Identifier;
+
+    checkBlockScopedCollisions(local: Node, kind: string, name: string, id: Object): void;
+
+    rename(oldName: string, newName?: string, block?: Node): void;
+
+    dump(): void;
+
+    toArray(node: Node, i?: number): Node;
+
+    registerDeclaration(path: NodePath<Node>): void;
+
+    buildUndefinedNode(): Node;
+
+    registerConstantViolation(path: NodePath<Node>): void;
+
+    registerBinding(kind: string, path: NodePath<Node>, bindingPath?: NodePath<Node>): void;
+
+    addGlobal(node: Node): void;
+
+    hasUid(name: string): boolean;
+
+    hasGlobal(name: string): boolean;
+
+    hasReference(name: string): boolean;
+
+    isPure(node: Node, constantsOnly?: boolean): boolean;
+
+    setData(key: string, val: any): any;
+
+    getData(key: string): any;
+
+    removeData(key: string): void;
+
+    push(opts: any): void;
+
+    getProgramParent(): Scope;
+
+    getFunctionParent(): Scope;
+
+    getBlockParent(): Scope;
+
+    /** Walks the scope tree and gathers **all** bindings. */
+    getAllBindings(...kinds: string[]): Object;
+
+    bindingIdentifierEquals(name: string, node: Node): boolean;
+
+    getBinding(name: string): Binding;
+
+    getOwnBinding(name: string): Binding;
+
+    getBindingIdentifier(name: string): t.Identifier;
+
+    getOwnBindingIdentifier(name: string): t.Identifier;
+
+    hasOwnBinding(name: string): boolean;
+
+    hasBinding(name: string, noGlobals?: boolean): boolean;
+
+    parentHasBinding(name: string, noGlobals?: boolean): boolean;
+
+    /** Move a binding of `name` to another `scope`. */
+    moveBindingTo(name: string, scope: Scope): void;
+
+    removeOwnBinding(name: string): void;
+
+    removeBinding(name: string): void;
+}
+
+export class Binding {
+    constructor(opts: { existing: Binding; identifier: t.Identifier; scope: Scope; path: NodePath<Node>; kind: 'var' | 'let' | 'const'; });
+    identifier: t.Identifier;
+    scope: Scope;
+    path: NodePath<Node>;
+    kind: 'var' | 'let' | 'const';
+    referenced: boolean;
+    references: number;
+    referencePaths: NodePath<Node>[];
+    constant: boolean;
+    constantViolations: NodePath<Node>[];
+}
+
+export interface Visitor extends VisitNodeObject<Node> {
+    ArrayExpression?: VisitNode<t.ArrayExpression>;
+    AssignmentExpression?: VisitNode<t.AssignmentExpression>;
+    LVal?: VisitNode<t.LVal>;
+    Expression?: VisitNode<t.Expression>;
+    BinaryExpression?: VisitNode<t.BinaryExpression>;
+    Directive?: VisitNode<t.Directive>;
+    DirectiveLiteral?: VisitNode<t.DirectiveLiteral>;
+    BlockStatement?: VisitNode<t.BlockStatement>;
+    BreakStatement?: VisitNode<t.BreakStatement>;
+    Identifier?: VisitNode<t.Identifier>;
+    CallExpression?: VisitNode<t.CallExpression>;
+    CatchClause?: VisitNode<t.CatchClause>;
+    ConditionalExpression?: VisitNode<t.ConditionalExpression>;
+    ContinueStatement?: VisitNode<t.ContinueStatement>;
+    DebuggerStatement?: VisitNode<t.DebuggerStatement>;
+    DoWhileStatement?: VisitNode<t.DoWhileStatement>;
+    Statement?: VisitNode<t.Statement>;
+    EmptyStatement?: VisitNode<t.EmptyStatement>;
+    ExpressionStatement?: VisitNode<t.ExpressionStatement>;
+    File?: VisitNode<t.File>;
+    Program?: VisitNode<t.Program>;
+    ForInStatement?: VisitNode<t.ForInStatement>;
+    VariableDeclaration?: VisitNode<t.VariableDeclaration>;
+    ForStatement?: VisitNode<t.ForStatement>;
+    FunctionDeclaration?: VisitNode<t.FunctionDeclaration>;
+    FunctionExpression?: VisitNode<t.FunctionExpression>;
+    IfStatement?: VisitNode<t.IfStatement>;
+    LabeledStatement?: VisitNode<t.LabeledStatement>;
+    StringLiteral?: VisitNode<t.StringLiteral>;
+    NumericLiteral?: VisitNode<t.NumericLiteral>;
+    NullLiteral?: VisitNode<t.NullLiteral>;
+    BooleanLiteral?: VisitNode<t.BooleanLiteral>;
+    RegExpLiteral?: VisitNode<t.RegExpLiteral>;
+    LogicalExpression?: VisitNode<t.LogicalExpression>;
+    MemberExpression?: VisitNode<t.MemberExpression>;
+    NewExpression?: VisitNode<t.NewExpression>;
+    ObjectExpression?: VisitNode<t.ObjectExpression>;
+    ObjectMethod?: VisitNode<t.ObjectMethod>;
+    ObjectProperty?: VisitNode<t.ObjectProperty>;
+    RestElement?: VisitNode<t.RestElement>;
+    ReturnStatement?: VisitNode<t.ReturnStatement>;
+    SequenceExpression?: VisitNode<t.SequenceExpression>;
+    SwitchCase?: VisitNode<t.SwitchCase>;
+    SwitchStatement?: VisitNode<t.SwitchStatement>;
+    ThisExpression?: VisitNode<t.ThisExpression>;
+    ThrowStatement?: VisitNode<t.ThrowStatement>;
+    TryStatement?: VisitNode<t.TryStatement>;
+    UnaryExpression?: VisitNode<t.UnaryExpression>;
+    UpdateExpression?: VisitNode<t.UpdateExpression>;
+    VariableDeclarator?: VisitNode<t.VariableDeclarator>;
+    WhileStatement?: VisitNode<t.WhileStatement>;
+    WithStatement?: VisitNode<t.WithStatement>;
+    AssignmentPattern?: VisitNode<t.AssignmentPattern>;
+    ArrayPattern?: VisitNode<t.ArrayPattern>;
+    ArrowFunctionExpression?: VisitNode<t.ArrowFunctionExpression>;
+    ClassBody?: VisitNode<t.ClassBody>;
+    ClassDeclaration?: VisitNode<t.ClassDeclaration>;
+    ClassExpression?: VisitNode<t.ClassExpression>;
+    ExportAllDeclaration?: VisitNode<t.ExportAllDeclaration>;
+    ExportDefaultDeclaration?: VisitNode<t.ExportDefaultDeclaration>;
+    ExportNamedDeclaration?: VisitNode<t.ExportNamedDeclaration>;
+    Declaration?: VisitNode<t.Declaration>;
+    ExportSpecifier?: VisitNode<t.ExportSpecifier>;
+    ForOfStatement?: VisitNode<t.ForOfStatement>;
+    ImportDeclaration?: VisitNode<t.ImportDeclaration>;
+    ImportDefaultSpecifier?: VisitNode<t.ImportDefaultSpecifier>;
+    ImportNamespaceSpecifier?: VisitNode<t.ImportNamespaceSpecifier>;
+    ImportSpecifier?: VisitNode<t.ImportSpecifier>;
+    MetaProperty?: VisitNode<t.MetaProperty>;
+    ClassMethod?: VisitNode<t.ClassMethod>;
+    ObjectPattern?: VisitNode<t.ObjectPattern>;
+    SpreadElement?: VisitNode<t.SpreadElement>;
+    Super?: VisitNode<t.Super>;
+    TaggedTemplateExpression?: VisitNode<t.TaggedTemplateExpression>;
+    TemplateLiteral?: VisitNode<t.TemplateLiteral>;
+    TemplateElement?: VisitNode<t.TemplateElement>;
+    YieldExpression?: VisitNode<t.YieldExpression>;
+    AnyTypeAnnotation?: VisitNode<t.AnyTypeAnnotation>;
+    ArrayTypeAnnotation?: VisitNode<t.ArrayTypeAnnotation>;
+    BooleanTypeAnnotation?: VisitNode<t.BooleanTypeAnnotation>;
+    BooleanLiteralTypeAnnotation?: VisitNode<t.BooleanLiteralTypeAnnotation>;
+    NullLiteralTypeAnnotation?: VisitNode<t.NullLiteralTypeAnnotation>;
+    ClassImplements?: VisitNode<t.ClassImplements>;
+    ClassProperty?: VisitNode<t.ClassProperty>;
+    DeclareClass?: VisitNode<t.DeclareClass>;
+    DeclareFunction?: VisitNode<t.DeclareFunction>;
+    DeclareInterface?: VisitNode<t.DeclareInterface>;
+    DeclareModule?: VisitNode<t.DeclareModule>;
+    DeclareTypeAlias?: VisitNode<t.DeclareTypeAlias>;
+    DeclareVariable?: VisitNode<t.DeclareVariable>;
+    ExistentialTypeParam?: VisitNode<t.ExistentialTypeParam>;
+    FunctionTypeAnnotation?: VisitNode<t.FunctionTypeAnnotation>;
+    FunctionTypeParam?: VisitNode<t.FunctionTypeParam>;
+    GenericTypeAnnotation?: VisitNode<t.GenericTypeAnnotation>;
+    InterfaceExtends?: VisitNode<t.InterfaceExtends>;
+    InterfaceDeclaration?: VisitNode<t.InterfaceDeclaration>;
+    IntersectionTypeAnnotation?: VisitNode<t.IntersectionTypeAnnotation>;
+    MixedTypeAnnotation?: VisitNode<t.MixedTypeAnnotation>;
+    NullableTypeAnnotation?: VisitNode<t.NullableTypeAnnotation>;
+    NumericLiteralTypeAnnotation?: VisitNode<t.NumericLiteralTypeAnnotation>;
+    NumberTypeAnnotation?: VisitNode<t.NumberTypeAnnotation>;
+    StringLiteralTypeAnnotation?: VisitNode<t.StringLiteralTypeAnnotation>;
+    StringTypeAnnotation?: VisitNode<t.StringTypeAnnotation>;
+    ThisTypeAnnotation?: VisitNode<t.ThisTypeAnnotation>;
+    TupleTypeAnnotation?: VisitNode<t.TupleTypeAnnotation>;
+    TypeofTypeAnnotation?: VisitNode<t.TypeofTypeAnnotation>;
+    TypeAlias?: VisitNode<t.TypeAlias>;
+    TypeAnnotation?: VisitNode<t.TypeAnnotation>;
+    TypeCastExpression?: VisitNode<t.TypeCastExpression>;
+    TypeParameterDeclaration?: VisitNode<t.TypeParameterDeclaration>;
+    TypeParameterInstantiation?: VisitNode<t.TypeParameterInstantiation>;
+    ObjectTypeAnnotation?: VisitNode<t.ObjectTypeAnnotation>;
+    ObjectTypeCallProperty?: VisitNode<t.ObjectTypeCallProperty>;
+    ObjectTypeIndexer?: VisitNode<t.ObjectTypeIndexer>;
+    ObjectTypeProperty?: VisitNode<t.ObjectTypeProperty>;
+    QualifiedTypeIdentifier?: VisitNode<t.QualifiedTypeIdentifier>;
+    UnionTypeAnnotation?: VisitNode<t.UnionTypeAnnotation>;
+    VoidTypeAnnotation?: VisitNode<t.VoidTypeAnnotation>;
+    JSXAttribute?: VisitNode<t.JSXAttribute>;
+    JSXIdentifier?: VisitNode<t.JSXIdentifier>;
+    JSXNamespacedName?: VisitNode<t.JSXNamespacedName>;
+    JSXElement?: VisitNode<t.JSXElement>;
+    JSXExpressionContainer?: VisitNode<t.JSXExpressionContainer>;
+    JSXClosingElement?: VisitNode<t.JSXClosingElement>;
+    JSXMemberExpression?: VisitNode<t.JSXMemberExpression>;
+    JSXOpeningElement?: VisitNode<t.JSXOpeningElement>;
+    JSXEmptyExpression?: VisitNode<t.JSXEmptyExpression>;
+    JSXSpreadAttribute?: VisitNode<t.JSXSpreadAttribute>;
+    JSXText?: VisitNode<t.JSXText>;
+    Noop?: VisitNode<t.Noop>;
+    ParenthesizedExpression?: VisitNode<t.ParenthesizedExpression>;
+    AwaitExpression?: VisitNode<t.AwaitExpression>;
+    BindExpression?: VisitNode<t.BindExpression>;
+    Decorator?: VisitNode<t.Decorator>;
+    DoExpression?: VisitNode<t.DoExpression>;
+    ExportDefaultSpecifier?: VisitNode<t.ExportDefaultSpecifier>;
+    ExportNamespaceSpecifier?: VisitNode<t.ExportNamespaceSpecifier>;
+    RestProperty?: VisitNode<t.RestProperty>;
+    SpreadProperty?: VisitNode<t.SpreadProperty>;
+    Binary?: VisitNode<t.Binary>;
+    Scopable?: VisitNode<t.Scopable>;
+    BlockParent?: VisitNode<t.BlockParent>;
+    Block?: VisitNode<t.Block>;
+    Terminatorless?: VisitNode<t.Terminatorless>;
+    CompletionStatement?: VisitNode<t.CompletionStatement>;
+    Conditional?: VisitNode<t.Conditional>;
+    Loop?: VisitNode<t.Loop>;
+    While?: VisitNode<t.While>;
+    ExpressionWrapper?: VisitNode<t.ExpressionWrapper>;
+    For?: VisitNode<t.For>;
+    ForXStatement?: VisitNode<t.ForXStatement>;
+    Function?: VisitNode<t.Function>;
+    FunctionParent?: VisitNode<t.FunctionParent>;
+    Pureish?: VisitNode<t.Pureish>;
+    Literal?: VisitNode<t.Literal>;
+    Immutable?: VisitNode<t.Immutable>;
+    UserWhitespacable?: VisitNode<t.UserWhitespacable>;
+    Method?: VisitNode<t.Method>;
+    ObjectMember?: VisitNode<t.ObjectMember>;
+    Property?: VisitNode<t.Property>;
+    UnaryLike?: VisitNode<t.UnaryLike>;
+    Pattern?: VisitNode<t.Pattern>;
+    Class?: VisitNode<t.Class>;
+    ModuleDeclaration?: VisitNode<t.ModuleDeclaration>;
+    ExportDeclaration?: VisitNode<t.ExportDeclaration>;
+    ModuleSpecifier?: VisitNode<t.ModuleSpecifier>;
+    Flow?: VisitNode<t.Flow>;
+    FlowBaseAnnotation?: VisitNode<t.FlowBaseAnnotation>;
+    FlowDeclaration?: VisitNode<t.FlowDeclaration>;
+    JSX?: VisitNode<t.JSX>;
+}
+
+export type VisitNode<T> = VisitNodeFunction<T> | VisitNodeObject<T>;
+
+export type VisitNodeFunction<T> = (path: NodePath<T>, state: any) => void;
+
+export interface VisitNodeObject<T> {
+    enter?(path: NodePath<T>, state: any): void;
+    exit?(path: NodePath<T>, state: any): void;
+}
+
+export class NodePath<T> {
+    constructor(hub: Hub, parent: Node);
+    parent: Node;
+    hub: Hub;
+    contexts: TraversalContext[];
+    data: Object;
+    shouldSkip: boolean;
+    shouldStop: boolean;
+    removed: boolean;
+    state: any;
+    opts: Object;
+    skipKeys: Object;
+    parentPath: NodePath<Node>;
+    context: TraversalContext;
+    container: Object | Object[];
+    listKey: string;
+    inList: boolean;
+    parentKey: string;
+    key: string;
+    node: T;
+    scope: Scope;
+    type: string;
+    typeAnnotation: Object;
+
+    getScope(scope: Scope): Scope;
+
+    setData(key: string, val: any): any;
+
+    getData(key: string, def?: any): any;
+
+    buildCodeFrameError(msg: string, Error: Error): Error;
+
+    traverse(visitor: Visitor, state?: any): void;
+
+    set(key: string, node: Node): void;
+
+    getPathLocation(): string;
+
+    debug(buildMessage: Function): void;
+
+    // ------------------------- ancestry -------------------------
+    /**
+     * Call the provided `callback` with the `NodePath`s of all the parents.
+     * When the `callback` returns a truthy value, we return that node path.
+     */
+    findParent(callback: (path: NodePath<Node>) => boolean): NodePath<Node>;
+
+    find(callback: (path: NodePath<Node>) => boolean): NodePath<Node>;
+
+    /** Get the parent function of the current path. */
+    getFunctionParent(): NodePath<Node>;
+
+    /** Walk up the tree until we hit a parent node path in a list. */
+    getStatementParent(): NodePath<Node>;
+
+    /**
+     * Get the deepest common ancestor and then from it, get the earliest relationship path
+     * to that ancestor.
+     *
+     * Earliest is defined as being "before" all the other nodes in terms of list container
+     * position and visiting key.
+     */
+    getEarliestCommonAncestorFrom(paths: NodePath<Node>[]): NodePath<Node>;
+
+    /** Get the earliest path in the tree where the provided `paths` intersect. */
+    getDeepestCommonAncestorFrom(paths: NodePath<Node>[], filter?: Function): NodePath<Node>;        
+
+    /**
+     * Build an array of node paths containing the entire ancestry of the current node path.
+     *
+     * NOTE: The current node path is included in this.
+     */
+    getAncestry(): NodePath<Node>[];
+
+    inType(...candidateTypes: string[]): boolean;
+
+    // ------------------------- inference -------------------------
+    /** Infer the type of the current `NodePath`. */
+    getTypeAnnotation(): t.FlowTypeAnnotation;
+
+    isBaseType(baseName: string, soft?: boolean): boolean;
+
+    couldBeBaseType(name: string): boolean;
+
+    baseTypeStrictlyMatches(right: NodePath<Node>): boolean;
+
+    isGenericType(genericName: string): boolean;
+
+    // ------------------------- replacement -------------------------
+    /**
+     * Replace a node with an array of multiple. This method performs the following steps:
+     *
+     *  - Inherit the comments of first provided node with that of the current node.
+     *  - Insert the provided nodes after the current node.
+     *  - Remove the current node.
+     */
+    replaceWithMultiple(nodes: Node[]): void;
+
+    /**
+     * Parse a string as an expression and replace the current node with the result.
+     *
+     * NOTE: This is typically not a good idea to use. Building source strings when
+     * transforming ASTs is an antipattern and SHOULD NOT be encouraged. Even if it's
+     * easier to use, your transforms will be extremely brittle.
+     */
+    replaceWithSourceString(replacement: any): void;
+
+    /** Replace the current node with another. */
+    replaceWith(replacement: Node | NodePath<Node>): void;
+
+    /**
+     * This method takes an array of statements nodes and then explodes it
+     * into expressions. This method retains completion records which is
+     * extremely important to retain original semantics.
+     */
+    replaceExpressionWithStatements(nodes: Node[]): Node;
+
+    replaceInline(nodes: Node | Node[]): void;
+
+    // ------------------------- evaluation -------------------------
+    /**
+     * Walk the input `node` and statically evaluate if it's truthy.
+     *
+     * Returning `true` when we're sure that the expression will evaluate to a
+     * truthy value, `false` if we're sure that it will evaluate to a falsy
+     * value and `undefined` if we aren't sure. Because of this please do not
+     * rely on coercion when using this method and check with === if it's false.
+     */
+    evaluateTruthy(): boolean;
+
+    /**
+     * Walk the input `node` and statically evaluate it.
+     *
+     * Returns an object in the form `{ confident, value }`. `confident` indicates
+     * whether or not we had to drop out of evaluating the expression because of
+     * hitting an unknown node that we couldn't confidently find the value of.
+     *
+     * Example:
+     *
+     *   t.evaluate(parse("5 + 5")) // { confident: true, value: 10 }
+     *   t.evaluate(parse("!true")) // { confident: true, value: false }
+     *   t.evaluate(parse("foo + foo")) // { confident: false, value: undefined }
+     */
+    evaluate(): { confident: boolean; value: any };
+
+    // ------------------------- introspection -------------------------
+    /**
+     * Match the current node if it matches the provided `pattern`.
+     *
+     * For example, given the match `React.createClass` it would match the
+     * parsed nodes of `React.createClass` and `React["createClass"]`.
+     */
+    matchesPattern(pattern: string, allowPartial?: boolean): boolean;
+
+    /**
+     * Check whether we have the input `key`. If the `key` references an array then we check
+     * if the array has any items, otherwise we just check if it's falsy.
+     */
+    has(key: string): boolean;
+
+    isStatic(): boolean;
+
+    /** Alias of `has`. */
+    is(key: string): boolean;
+
+    /** Opposite of `has`. */
+    isnt(key: string): boolean;
+
+    /** Check whether the path node `key` strict equals `value`. */
+    equals(key: string, value: any): boolean;
+
+    /**
+     * Check the type against our stored internal type of the node. This is handy when a node has
+     * been removed yet we still internally know the type and need it to calculate node replacement.
+     */
+    isNodeType(type: string): boolean;
+
+    /**
+     * This checks whether or not we're in one of the following positions:
+     *
+     *   for (KEY in right);
+     *   for (KEY;;);
+     *
+     * This is because these spots allow VariableDeclarations AND normal expressions so we need
+     * to tell the path replacement that it's ok to replace this with an expression.
+     */
+    canHaveVariableDeclarationOrExpression(): boolean;
+
+    /**
+     * This checks whether we are swapping an arrow function's body between an
+     * expression and a block statement (or vice versa).
+     *
+     * This is because arrow functions may implicitly return an expression, which
+     * is the same as containing a block statement.
+     */
+    canSwapBetweenExpressionAndStatement(replacement: Node): boolean;
+
+    /** Check whether the current path references a completion record */
+    isCompletionRecord(allowInsideFunction?: boolean): boolean;
+
+    /**
+     * Check whether or not the current `key` allows either a single statement or block statement
+     * so we can explode it if necessary.
+     */
+    isStatementOrBlock(): boolean;
+
+    /** Check if the currently assigned path references the `importName` of `moduleSource`. */
+    referencesImport(moduleSource: string, importName: string): boolean;
+
+    /** Get the source code associated with this node. */
+    getSource(): string;
+
+    // ------------------------- context -------------------------
+    call(key: string): boolean;
+
+    isBlacklisted(): boolean;
+
+    visit(): boolean;
+
+    skip(): void;
+
+    skipKey(key: string): void;
+
+    stop(): void;
+
+    setScope(): void;
+
+    setContext(context: TraversalContext): NodePath<T>;
+
+    popContext(): void;
+
+    pushContext(context: TraversalContext): void;
+
+    // ------------------------- removal -------------------------
+    remove(): void;
+
+    // ------------------------- modification -------------------------
+    /** Insert the provided nodes before the current one. */
+    insertBefore(nodes: Node | Node[]): any;
+
+    /**
+     * Insert the provided nodes after the current one. When inserting nodes after an
+     * expression, ensure that the completion record is correct by pushing the current node.
+     */
+    insertAfter(nodes: Node | Node[]): any;
+
+    /** Update all sibling node paths after `fromIndex` by `incrementBy`. */
+    updateSiblingKeys(fromIndex: number, incrementBy: number): void;
+
+    /** Hoist the current node to the highest scope possible and return a UID referencing it. */
+    hoist(scope: Scope): void;
+
+    // ------------------------- family -------------------------
+    getStatementParent(): NodePath<Node>;
+
+    getOpposite(): NodePath<Node>;
+
+    getCompletionRecords(): NodePath<Node>[];
+
+    getSibling(key: string): NodePath<Node>;
+
+    get(key: string, context?: boolean | TraversalContext): NodePath<Node>;
+
+    getBindingIdentifiers(duplicates?: boolean): Node[];
+
+    getOuterBindingIdentifiers(duplicates?: boolean): Node[];
+
+    // ------------------------- comments -------------------------
+    /** Share comments amongst siblings. */
+    shareCommentsWithSiblings(): void;
+
+    addComment(type: string, content: string, line?: boolean): void;
+
+    /** Give node `comments` of the specified `type`. */
+    addComments(type: string, comments: any[]): void;
+
+    // ------------------------- isXXX -------------------------
+    isArrayExpression(opts?: Object): boolean;
+    isAssignmentExpression(opts?: Object): boolean;
+    isBinaryExpression(opts?: Object): boolean;
+    isDirective(opts?: Object): boolean;
+    isDirectiveLiteral(opts?: Object): boolean;
+    isBlockStatement(opts?: Object): boolean;
+    isBreakStatement(opts?: Object): boolean;
+    isCallExpression(opts?: Object): boolean;
+    isCatchClause(opts?: Object): boolean;
+    isConditionalExpression(opts?: Object): boolean;
+    isContinueStatement(opts?: Object): boolean;
+    isDebuggerStatement(opts?: Object): boolean;
+    isDoWhileStatement(opts?: Object): boolean;
+    isEmptyStatement(opts?: Object): boolean;
+    isExpressionStatement(opts?: Object): boolean;
+    isFile(opts?: Object): boolean;
+    isForInStatement(opts?: Object): boolean;
+    isForStatement(opts?: Object): boolean;
+    isFunctionDeclaration(opts?: Object): boolean;
+    isFunctionExpression(opts?: Object): boolean;
+    isIdentifier(opts?: Object): boolean;
+    isIfStatement(opts?: Object): boolean;
+    isLabeledStatement(opts?: Object): boolean;
+    isStringLiteral(opts?: Object): boolean;
+    isNumericLiteral(opts?: Object): boolean;
+    isNullLiteral(opts?: Object): boolean;
+    isBooleanLiteral(opts?: Object): boolean;
+    isRegExpLiteral(opts?: Object): boolean;
+    isLogicalExpression(opts?: Object): boolean;
+    isMemberExpression(opts?: Object): boolean;
+    isNewExpression(opts?: Object): boolean;
+    isProgram(opts?: Object): boolean;
+    isObjectExpression(opts?: Object): boolean;
+    isObjectMethod(opts?: Object): boolean;
+    isObjectProperty(opts?: Object): boolean;
+    isRestElement(opts?: Object): boolean;
+    isReturnStatement(opts?: Object): boolean;
+    isSequenceExpression(opts?: Object): boolean;
+    isSwitchCase(opts?: Object): boolean;
+    isSwitchStatement(opts?: Object): boolean;
+    isThisExpression(opts?: Object): boolean;
+    isThrowStatement(opts?: Object): boolean;
+    isTryStatement(opts?: Object): boolean;
+    isUnaryExpression(opts?: Object): boolean;
+    isUpdateExpression(opts?: Object): boolean;
+    isVariableDeclaration(opts?: Object): boolean;
+    isVariableDeclarator(opts?: Object): boolean;
+    isWhileStatement(opts?: Object): boolean;
+    isWithStatement(opts?: Object): boolean;
+    isAssignmentPattern(opts?: Object): boolean;
+    isArrayPattern(opts?: Object): boolean;
+    isArrowFunctionExpression(opts?: Object): boolean;
+    isClassBody(opts?: Object): boolean;
+    isClassDeclaration(opts?: Object): boolean;
+    isClassExpression(opts?: Object): boolean;
+    isExportAllDeclaration(opts?: Object): boolean;
+    isExportDefaultDeclaration(opts?: Object): boolean;
+    isExportNamedDeclaration(opts?: Object): boolean;
+    isExportSpecifier(opts?: Object): boolean;
+    isForOfStatement(opts?: Object): boolean;
+    isImportDeclaration(opts?: Object): boolean;
+    isImportDefaultSpecifier(opts?: Object): boolean;
+    isImportNamespaceSpecifier(opts?: Object): boolean;
+    isImportSpecifier(opts?: Object): boolean;
+    isMetaProperty(opts?: Object): boolean;
+    isClassMethod(opts?: Object): boolean;
+    isObjectPattern(opts?: Object): boolean;
+    isSpreadElement(opts?: Object): boolean;
+    isSuper(opts?: Object): boolean;
+    isTaggedTemplateExpression(opts?: Object): boolean;
+    isTemplateElement(opts?: Object): boolean;
+    isTemplateLiteral(opts?: Object): boolean;
+    isYieldExpression(opts?: Object): boolean;
+    isAnyTypeAnnotation(opts?: Object): boolean;
+    isArrayTypeAnnotation(opts?: Object): boolean;
+    isBooleanTypeAnnotation(opts?: Object): boolean;
+    isBooleanLiteralTypeAnnotation(opts?: Object): boolean;
+    isNullLiteralTypeAnnotation(opts?: Object): boolean;
+    isClassImplements(opts?: Object): boolean;
+    isClassProperty(opts?: Object): boolean;
+    isDeclareClass(opts?: Object): boolean;
+    isDeclareFunction(opts?: Object): boolean;
+    isDeclareInterface(opts?: Object): boolean;
+    isDeclareModule(opts?: Object): boolean;
+    isDeclareTypeAlias(opts?: Object): boolean;
+    isDeclareVariable(opts?: Object): boolean;
+    isExistentialTypeParam(opts?: Object): boolean;
+    isFunctionTypeAnnotation(opts?: Object): boolean;
+    isFunctionTypeParam(opts?: Object): boolean;
+    isGenericTypeAnnotation(opts?: Object): boolean;
+    isInterfaceExtends(opts?: Object): boolean;
+    isInterfaceDeclaration(opts?: Object): boolean;
+    isIntersectionTypeAnnotation(opts?: Object): boolean;
+    isMixedTypeAnnotation(opts?: Object): boolean;
+    isNullableTypeAnnotation(opts?: Object): boolean;
+    isNumericLiteralTypeAnnotation(opts?: Object): boolean;
+    isNumberTypeAnnotation(opts?: Object): boolean;
+    isStringLiteralTypeAnnotation(opts?: Object): boolean;
+    isStringTypeAnnotation(opts?: Object): boolean;
+    isThisTypeAnnotation(opts?: Object): boolean;
+    isTupleTypeAnnotation(opts?: Object): boolean;
+    isTypeofTypeAnnotation(opts?: Object): boolean;
+    isTypeAlias(opts?: Object): boolean;
+    isTypeAnnotation(opts?: Object): boolean;
+    isTypeCastExpression(opts?: Object): boolean;
+    isTypeParameterDeclaration(opts?: Object): boolean;
+    isTypeParameterInstantiation(opts?: Object): boolean;
+    isObjectTypeAnnotation(opts?: Object): boolean;
+    isObjectTypeCallProperty(opts?: Object): boolean;
+    isObjectTypeIndexer(opts?: Object): boolean;
+    isObjectTypeProperty(opts?: Object): boolean;
+    isQualifiedTypeIdentifier(opts?: Object): boolean;
+    isUnionTypeAnnotation(opts?: Object): boolean;
+    isVoidTypeAnnotation(opts?: Object): boolean;
+    isJSXAttribute(opts?: Object): boolean;
+    isJSXClosingElement(opts?: Object): boolean;
+    isJSXElement(opts?: Object): boolean;
+    isJSXEmptyExpression(opts?: Object): boolean;
+    isJSXExpressionContainer(opts?: Object): boolean;
+    isJSXIdentifier(opts?: Object): boolean;
+    isJSXMemberExpression(opts?: Object): boolean;
+    isJSXNamespacedName(opts?: Object): boolean;
+    isJSXOpeningElement(opts?: Object): boolean;
+    isJSXSpreadAttribute(opts?: Object): boolean;
+    isJSXText(opts?: Object): boolean;
+    isNoop(opts?: Object): boolean;
+    isParenthesizedExpression(opts?: Object): boolean;
+    isAwaitExpression(opts?: Object): boolean;
+    isBindExpression(opts?: Object): boolean;
+    isDecorator(opts?: Object): boolean;
+    isDoExpression(opts?: Object): boolean;
+    isExportDefaultSpecifier(opts?: Object): boolean;
+    isExportNamespaceSpecifier(opts?: Object): boolean;
+    isRestProperty(opts?: Object): boolean;
+    isSpreadProperty(opts?: Object): boolean;
+    isExpression(opts?: Object): boolean;
+    isBinary(opts?: Object): boolean;
+    isScopable(opts?: Object): boolean;
+    isBlockParent(opts?: Object): boolean;
+    isBlock(opts?: Object): boolean;
+    isStatement(opts?: Object): boolean;
+    isTerminatorless(opts?: Object): boolean;
+    isCompletionStatement(opts?: Object): boolean;
+    isConditional(opts?: Object): boolean;
+    isLoop(opts?: Object): boolean;
+    isWhile(opts?: Object): boolean;
+    isExpressionWrapper(opts?: Object): boolean;
+    isFor(opts?: Object): boolean;
+    isForXStatement(opts?: Object): boolean;
+    isFunction(opts?: Object): boolean;
+    isFunctionParent(opts?: Object): boolean;
+    isPureish(opts?: Object): boolean;
+    isDeclaration(opts?: Object): boolean;
+    isLVal(opts?: Object): boolean;
+    isLiteral(opts?: Object): boolean;
+    isImmutable(opts?: Object): boolean;
+    isUserWhitespacable(opts?: Object): boolean;
+    isMethod(opts?: Object): boolean;
+    isObjectMember(opts?: Object): boolean;
+    isProperty(opts?: Object): boolean;
+    isUnaryLike(opts?: Object): boolean;
+    isPattern(opts?: Object): boolean;
+    isClass(opts?: Object): boolean;
+    isModuleDeclaration(opts?: Object): boolean;
+    isExportDeclaration(opts?: Object): boolean;
+    isModuleSpecifier(opts?: Object): boolean;
+    isFlow(opts?: Object): boolean;
+    isFlowBaseAnnotation(opts?: Object): boolean;
+    isFlowDeclaration(opts?: Object): boolean;
+    isJSX(opts?: Object): boolean;
+    isNumberLiteral(opts?: Object): boolean;
+    isRegexLiteral(opts?: Object): boolean;
+    isReferencedIdentifier(opts?: Object): boolean;
+    isReferencedMemberExpression(opts?: Object): boolean;
+    isBindingIdentifier(opts?: Object): boolean;
+    isScope(opts?: Object): boolean;
+    isReferenced(opts?: Object): boolean;
+    isBlockScoped(opts?: Object): boolean;
+    isVar(opts?: Object): boolean;
+    isUser(opts?: Object): boolean;
+    isGenerated(opts?: Object): boolean;
+    isPure(opts?: Object): boolean;
+
+    // ------------------------- assertXXX -------------------------
+    assertArrayExpression(opts?: Object): void;
+    assertAssignmentExpression(opts?: Object): void;
+    assertBinaryExpression(opts?: Object): void;
+    assertDirective(opts?: Object): void;
+    assertDirectiveLiteral(opts?: Object): void;
+    assertBlockStatement(opts?: Object): void;
+    assertBreakStatement(opts?: Object): void;
+    assertCallExpression(opts?: Object): void;
+    assertCatchClause(opts?: Object): void;
+    assertConditionalExpression(opts?: Object): void;
+    assertContinueStatement(opts?: Object): void;
+    assertDebuggerStatement(opts?: Object): void;
+    assertDoWhileStatement(opts?: Object): void;
+    assertEmptyStatement(opts?: Object): void;
+    assertExpressionStatement(opts?: Object): void;
+    assertFile(opts?: Object): void;
+    assertForInStatement(opts?: Object): void;
+    assertForStatement(opts?: Object): void;
+    assertFunctionDeclaration(opts?: Object): void;
+    assertFunctionExpression(opts?: Object): void;
+    assertIdentifier(opts?: Object): void;
+    assertIfStatement(opts?: Object): void;
+    assertLabeledStatement(opts?: Object): void;
+    assertStringLiteral(opts?: Object): void;
+    assertNumericLiteral(opts?: Object): void;
+    assertNullLiteral(opts?: Object): void;
+    assertBooleanLiteral(opts?: Object): void;
+    assertRegExpLiteral(opts?: Object): void;
+    assertLogicalExpression(opts?: Object): void;
+    assertMemberExpression(opts?: Object): void;
+    assertNewExpression(opts?: Object): void;
+    assertProgram(opts?: Object): void;
+    assertObjectExpression(opts?: Object): void;
+    assertObjectMethod(opts?: Object): void;
+    assertObjectProperty(opts?: Object): void;
+    assertRestElement(opts?: Object): void;
+    assertReturnStatement(opts?: Object): void;
+    assertSequenceExpression(opts?: Object): void;
+    assertSwitchCase(opts?: Object): void;
+    assertSwitchStatement(opts?: Object): void;
+    assertThisExpression(opts?: Object): void;
+    assertThrowStatement(opts?: Object): void;
+    assertTryStatement(opts?: Object): void;
+    assertUnaryExpression(opts?: Object): void;
+    assertUpdateExpression(opts?: Object): void;
+    assertVariableDeclaration(opts?: Object): void;
+    assertVariableDeclarator(opts?: Object): void;
+    assertWhileStatement(opts?: Object): void;
+    assertWithStatement(opts?: Object): void;
+    assertAssignmentPattern(opts?: Object): void;
+    assertArrayPattern(opts?: Object): void;
+    assertArrowFunctionExpression(opts?: Object): void;
+    assertClassBody(opts?: Object): void;
+    assertClassDeclaration(opts?: Object): void;
+    assertClassExpression(opts?: Object): void;
+    assertExportAllDeclaration(opts?: Object): void;
+    assertExportDefaultDeclaration(opts?: Object): void;
+    assertExportNamedDeclaration(opts?: Object): void;
+    assertExportSpecifier(opts?: Object): void;
+    assertForOfStatement(opts?: Object): void;
+    assertImportDeclaration(opts?: Object): void;
+    assertImportDefaultSpecifier(opts?: Object): void;
+    assertImportNamespaceSpecifier(opts?: Object): void;
+    assertImportSpecifier(opts?: Object): void;
+    assertMetaProperty(opts?: Object): void;
+    assertClassMethod(opts?: Object): void;
+    assertObjectPattern(opts?: Object): void;
+    assertSpreadElement(opts?: Object): void;
+    assertSuper(opts?: Object): void;
+    assertTaggedTemplateExpression(opts?: Object): void;
+    assertTemplateElement(opts?: Object): void;
+    assertTemplateLiteral(opts?: Object): void;
+    assertYieldExpression(opts?: Object): void;
+    assertAnyTypeAnnotation(opts?: Object): void;
+    assertArrayTypeAnnotation(opts?: Object): void;
+    assertBooleanTypeAnnotation(opts?: Object): void;
+    assertBooleanLiteralTypeAnnotation(opts?: Object): void;
+    assertNullLiteralTypeAnnotation(opts?: Object): void;
+    assertClassImplements(opts?: Object): void;
+    assertClassProperty(opts?: Object): void;
+    assertDeclareClass(opts?: Object): void;
+    assertDeclareFunction(opts?: Object): void;
+    assertDeclareInterface(opts?: Object): void;
+    assertDeclareModule(opts?: Object): void;
+    assertDeclareTypeAlias(opts?: Object): void;
+    assertDeclareVariable(opts?: Object): void;
+    assertExistentialTypeParam(opts?: Object): void;
+    assertFunctionTypeAnnotation(opts?: Object): void;
+    assertFunctionTypeParam(opts?: Object): void;
+    assertGenericTypeAnnotation(opts?: Object): void;
+    assertInterfaceExtends(opts?: Object): void;
+    assertInterfaceDeclaration(opts?: Object): void;
+    assertIntersectionTypeAnnotation(opts?: Object): void;
+    assertMixedTypeAnnotation(opts?: Object): void;
+    assertNullableTypeAnnotation(opts?: Object): void;
+    assertNumericLiteralTypeAnnotation(opts?: Object): void;
+    assertNumberTypeAnnotation(opts?: Object): void;
+    assertStringLiteralTypeAnnotation(opts?: Object): void;
+    assertStringTypeAnnotation(opts?: Object): void;
+    assertThisTypeAnnotation(opts?: Object): void;
+    assertTupleTypeAnnotation(opts?: Object): void;
+    assertTypeofTypeAnnotation(opts?: Object): void;
+    assertTypeAlias(opts?: Object): void;
+    assertTypeAnnotation(opts?: Object): void;
+    assertTypeCastExpression(opts?: Object): void;
+    assertTypeParameterDeclaration(opts?: Object): void;
+    assertTypeParameterInstantiation(opts?: Object): void;
+    assertObjectTypeAnnotation(opts?: Object): void;
+    assertObjectTypeCallProperty(opts?: Object): void;
+    assertObjectTypeIndexer(opts?: Object): void;
+    assertObjectTypeProperty(opts?: Object): void;
+    assertQualifiedTypeIdentifier(opts?: Object): void;
+    assertUnionTypeAnnotation(opts?: Object): void;
+    assertVoidTypeAnnotation(opts?: Object): void;
+    assertJSXAttribute(opts?: Object): void;
+    assertJSXClosingElement(opts?: Object): void;
+    assertJSXElement(opts?: Object): void;
+    assertJSXEmptyExpression(opts?: Object): void;
+    assertJSXExpressionContainer(opts?: Object): void;
+    assertJSXIdentifier(opts?: Object): void;
+    assertJSXMemberExpression(opts?: Object): void;
+    assertJSXNamespacedName(opts?: Object): void;
+    assertJSXOpeningElement(opts?: Object): void;
+    assertJSXSpreadAttribute(opts?: Object): void;
+    assertJSXText(opts?: Object): void;
+    assertNoop(opts?: Object): void;
+    assertParenthesizedExpression(opts?: Object): void;
+    assertAwaitExpression(opts?: Object): void;
+    assertBindExpression(opts?: Object): void;
+    assertDecorator(opts?: Object): void;
+    assertDoExpression(opts?: Object): void;
+    assertExportDefaultSpecifier(opts?: Object): void;
+    assertExportNamespaceSpecifier(opts?: Object): void;
+    assertRestProperty(opts?: Object): void;
+    assertSpreadProperty(opts?: Object): void;
+    assertExpression(opts?: Object): void;
+    assertBinary(opts?: Object): void;
+    assertScopable(opts?: Object): void;
+    assertBlockParent(opts?: Object): void;
+    assertBlock(opts?: Object): void;
+    assertStatement(opts?: Object): void;
+    assertTerminatorless(opts?: Object): void;
+    assertCompletionStatement(opts?: Object): void;
+    assertConditional(opts?: Object): void;
+    assertLoop(opts?: Object): void;
+    assertWhile(opts?: Object): void;
+    assertExpressionWrapper(opts?: Object): void;
+    assertFor(opts?: Object): void;
+    assertForXStatement(opts?: Object): void;
+    assertFunction(opts?: Object): void;
+    assertFunctionParent(opts?: Object): void;
+    assertPureish(opts?: Object): void;
+    assertDeclaration(opts?: Object): void;
+    assertLVal(opts?: Object): void;
+    assertLiteral(opts?: Object): void;
+    assertImmutable(opts?: Object): void;
+    assertUserWhitespacable(opts?: Object): void;
+    assertMethod(opts?: Object): void;
+    assertObjectMember(opts?: Object): void;
+    assertProperty(opts?: Object): void;
+    assertUnaryLike(opts?: Object): void;
+    assertPattern(opts?: Object): void;
+    assertClass(opts?: Object): void;
+    assertModuleDeclaration(opts?: Object): void;
+    assertExportDeclaration(opts?: Object): void;
+    assertModuleSpecifier(opts?: Object): void;
+    assertFlow(opts?: Object): void;
+    assertFlowBaseAnnotation(opts?: Object): void;
+    assertFlowDeclaration(opts?: Object): void;
+    assertJSX(opts?: Object): void;
+    assertNumberLiteral(opts?: Object): void;
+    assertRegexLiteral(opts?: Object): void;
+}
+
+export class Hub {
+    constructor(file: any, options: any);
+    file: any;
+    options: any;
+}
+
+interface TraversalContext {
+    parentPath: NodePath<Node>;
+    scope: Scope;
+    state: any;
+    opts: any;
+}
+
diff --git a/babel-traverse/tsconfig.json b/babel-traverse/tsconfig.json
new file mode 100644
index 0000000000..5afbcffaad
--- /dev/null
+++ b/babel-traverse/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "babel-traverse-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/babel-types/babel-types-tests.ts b/babel-types/babel-types-tests.ts
new file mode 100644
index 0000000000..cb02d11ee1
--- /dev/null
+++ b/babel-types/babel-types-tests.ts
@@ -0,0 +1,26 @@
+
+/// <reference types="babel-traverse" />
+
+
+// Examples from https://github.com/thejameskyle/babel-handbook/blob/master/translations/en/plugin-handbook.md#babel-types
+import traverse from "babel-traverse";
+import * as t from "babel-types";
+
+let ast: t.Node;
+
+traverse(ast, {
+    enter(path) {
+        let node = path.node;
+        if (t.isIdentifier(node, { name: "n" })) {
+            node.name = "x";
+        }
+    }
+});
+
+if (t.isBinaryExpression(ast)) {
+    ast.left;
+    ast.right;
+    ast.operator;
+}
+t.assertBinaryExpression(ast);
+t.assertBinaryExpression(ast, { operator: "*" });
diff --git a/babel-types/index.d.ts b/babel-types/index.d.ts
new file mode 100644
index 0000000000..b3b0f966c6
--- /dev/null
+++ b/babel-types/index.d.ts
@@ -0,0 +1,1401 @@
+// Type definitions for babel-types v6.7
+// Project: https://github.com/babel/babel/tree/master/packages/babel-types
+// Definitions by: Troy Gerwien <https://github.com/yortus>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface Comment {
+    value: string;
+    start: number;
+    end: number;
+    loc: SourceLocation;
+}
+
+export interface CommentBlock extends Comment {
+    type: "CommentBlock";
+}
+
+export interface CommentLine extends Comment {
+    type: "CommentLine";
+}
+
+export interface SourceLocation {
+    start: {
+        line: number;
+        column: number;
+    };
+
+    end: {
+        line: number;
+        column: number;
+    };
+}
+
+export interface Node {
+    type: string;
+    leadingComments?: Array<Comment>;
+    innerComments?: Array<Comment>;
+    trailingComments?: Array<Comment>;
+    start: number;
+    end: number;
+    loc: SourceLocation;
+}
+
+export interface ArrayExpression extends Node {
+    type: "ArrayExpression";
+    elements: Array<Expression | SpreadElement>;
+}
+
+export interface AssignmentExpression extends Node {
+    type: "AssignmentExpression";
+    operator: "=" | "+=" | "-=" | "*=" | "/=" | "%=" | "<<=" | ">>=" | ">>>=" | "|=" | "^=" | "&=";
+    left: LVal;
+    right: Expression;
+}
+
+export interface BinaryExpression extends Node {
+    type: "BinaryExpression";
+    operator: "+" | "-" | "/" | "%" | "*" | "**" | "&" | "|" | ">>" | ">>>" | "<<" | "^" | "==" | "===" | "!=" | "!==" | "in" | "instanceof" | ">" | "<" | ">=" | "<=";
+    left: Expression;
+    right: Expression;
+}
+
+export interface Directive extends Node {
+    type: "Directive";
+    value: DirectiveLiteral;
+}
+
+export interface DirectiveLiteral extends Node {
+    type: "DirectiveLiteral";
+    value: string;
+}
+
+export interface BlockStatement extends Node {
+    type: "BlockStatement";
+    directives?: Directive[];
+    body: Statement[];
+}
+
+export interface BreakStatement extends Node {
+    type: "BreakStatement";
+    label: Identifier;
+}
+
+export interface CallExpression extends Node {
+    type: "CallExpression";
+    callee: Expression | Super;
+    arguments: Array<Expression | SpreadElement>;
+}
+
+export interface CatchClause extends Node {
+    type: "CatchClause";
+    param: Pattern;
+    body: BlockStatement;
+}
+
+export interface ConditionalExpression extends Node {
+    type: "ConditionalExpression";
+    test: Expression;
+    consequent: Expression;
+    alternate: Expression;
+}
+
+export interface ContinueStatement extends Node {
+    type: "ContinueStatement";
+    label: Identifier;
+}
+
+export interface DebuggerStatement extends Node {
+    type: "DebuggerStatement";
+}
+
+export interface DoWhileStatement extends Node {
+    type: "DoWhileStatement";
+    test: Expression;
+    body: Statement;
+}
+
+export interface EmptyStatement extends Node {
+    type: "EmptyStatement";
+}
+
+export interface ExpressionStatement extends Node {
+    type: "ExpressionStatement";
+    expression: Expression;
+}
+
+export interface File extends Node {
+    type: "File";
+    program: Program;
+    comments: Comment[];
+    tokens: any[];
+}
+
+export interface ForInStatement extends Node {
+    type: "ForInStatement";
+    left: VariableDeclaration | LVal;
+    right: Expression;
+    body: Statement;
+}
+
+export interface ForStatement extends Node {
+    type: "ForStatement";
+    init: VariableDeclaration | Expression;
+    test: Expression;
+    update: Expression;
+    body: Statement;
+}
+
+export interface FunctionDeclaration extends Node {
+    type: "FunctionDeclaration";
+    id: Identifier;
+    params: Pattern[];
+    body: BlockStatement;
+    generator: boolean;
+    async: boolean;
+    returnType?: TypeAnnotation;
+    typeParameters?: TypeParameterDeclaration;
+}
+
+export interface FunctionExpression extends Node {
+    type: "FunctionExpression";
+    id: Identifier;
+    params: Pattern[];
+    body: BlockStatement;
+    generator: boolean;
+    async: boolean;
+    returnType?: TypeAnnotation;
+    typeParameters?: TypeParameterDeclaration;
+}
+
+export interface Identifier extends Node {
+    type: "Identifier";
+    name: string;
+    typeAnnotation?: TypeAnnotation;
+}
+
+export interface IfStatement extends Node {
+    type: "IfStatement";
+    test: Expression;
+    consequent: Statement;
+    alternate: Statement;
+}
+
+export interface LabeledStatement extends Node {
+    type: "LabeledStatement";
+    label: Identifier;
+    body: Statement;
+}
+
+export interface StringLiteral extends Node {
+    type: "StringLiteral";
+    value: string;
+}
+
+export interface NumericLiteral extends Node {
+    type: "NumericLiteral";
+    value: number;
+}
+
+export interface NullLiteral extends Node {
+    type: "NullLiteral";
+}
+
+export interface BooleanLiteral extends Node {
+    type: "BooleanLiteral";
+    value: boolean;
+}
+
+export interface RegExpLiteral extends Node {
+    type: "RegExpLiteral";
+    pattern: string;
+    flags?: string;
+}
+
+export interface LogicalExpression extends Node {
+    type: "LogicalExpression";
+    operator: "||" | "&&";
+    left: Expression;
+    right: Expression;
+}
+
+export interface MemberExpression extends Node {
+    type: "MemberExpression";
+    object: Expression | Super;
+    property: Expression;
+    computed: boolean;
+}
+
+export interface NewExpression extends Node {
+    type: "NewExpression";
+    callee: Expression | Super;
+    arguments: Array<Expression | SpreadElement>;
+}
+
+export interface Program extends Node {
+    type: "Program";
+    sourceType: "script" | "module";
+    directives?: Directive[];
+    body: Array<Statement | ModuleDeclaration>;
+}
+
+export interface ObjectExpression extends Node {
+    type: "ObjectExpression";
+    properties: Array<ObjectProperty | ObjectMethod | SpreadProperty>;
+}
+
+export interface ObjectMethod extends Node {
+    type: "ObjectMethod";
+    key: Expression;
+    kind: "get" | "set" | "method";
+    shorthand: boolean;
+    computed: boolean;
+    value: Expression;
+    decorators?: Decorator[];
+    id: Identifier;
+    params: Pattern[];
+    body: BlockStatement;
+    generator: boolean;
+    async: boolean;
+    returnType?: TypeAnnotation;
+    typeParameters?: TypeParameterDeclaration;
+}
+
+export interface ObjectProperty extends Node {
+    type: "ObjectProperty";
+    key: Expression;
+    computed: boolean;
+    value: Expression;
+    decorators?: Decorator[];
+    shorthand: boolean;
+}
+
+export interface RestElement extends Node {
+    type: "RestElement";
+    argument: LVal;
+    typeAnnotation?: TypeAnnotation;
+}
+
+export interface ReturnStatement extends Node {
+    type: "ReturnStatement";
+    argument: Expression;
+}
+
+export interface SequenceExpression extends Node {
+    type: "SequenceExpression";
+    expressions: Expression[];
+}
+
+export interface SwitchCase extends Node {
+    type: "SwitchCase";
+    test: Expression;
+    consequent: Statement[];
+}
+
+export interface SwitchStatement extends Node {
+    type: "SwitchStatement";
+    discriminant: Expression;
+    cases: SwitchCase[];
+}
+
+export interface ThisExpression extends Node {
+    type: "ThisExpression";
+}
+
+export interface ThrowStatement extends Node {
+    type: "ThrowStatement";
+    argument: Expression;
+}
+
+export interface TryStatement extends Node {
+    type: "TryStatement";
+    block: BlockStatement;
+    handler: CatchClause;
+    finalizer: BlockStatement;
+}
+
+export interface UnaryExpression extends Node {
+    type: "UnaryExpression";
+    operator: "-" | "+" | "!" | "~" | "typeof" | "void" | "delete";
+    prefix: boolean;
+    argument: Expression;
+}
+
+export interface UpdateExpression extends Node {
+    type: "UpdateExpression";
+    operator: "++" | "--";
+    prefix: boolean;
+    argument: Expression;
+}
+
+export interface VariableDeclaration extends Node {
+    type: "VariableDeclaration";
+    declarations: VariableDeclarator[];
+    kind: "var" | "let" | "const";
+}
+
+export interface VariableDeclarator extends Node {
+    type: "VariableDeclarator";
+    id: LVal;
+    init: Expression;
+}
+
+export interface WhileStatement extends Node {
+    type: "WhileStatement";
+    test: Expression;
+    body: Statement;
+}
+
+export interface WithStatement extends Node {
+    type: "WithStatement";
+    object: Expression;
+    body: BlockStatement | Statement;
+}
+
+export interface AssignmentPattern extends Node {
+    type: "AssignmentPattern";
+    left: Pattern;
+    right: Expression;
+}
+
+export interface ArrayPattern extends Node {
+    type: "ArrayPattern";
+    elements: Array<Pattern>;
+    typeAnnotation?: TypeAnnotation;
+}
+
+export interface ArrowFunctionExpression extends Node {
+    type: "ArrowFunctionExpression";
+    id: Identifier;
+    params: Pattern[];
+    body: BlockStatement | Expression;
+    generator: boolean;
+    async: boolean;
+    expression: boolean;
+    returnType?: TypeAnnotation;
+    typeParameters?: TypeParameterDeclaration;
+}
+
+export interface ClassBody extends Node {
+    type: "ClassBody";
+    body: Array<ClassMethod | ClassProperty>;
+}
+
+export interface ClassDeclaration extends Node {
+    type: "ClassDeclaration";
+    id: Identifier;
+    superClass: Expression;
+    body: ClassBody;
+    decorators?: Decorator[];
+    implements?: ClassImplements[];
+    mixins?: any[];
+    typeParameters?: TypeParameterDeclaration;
+    superTypeParameters?: TypeParameterInstantiation;
+}
+
+export interface ClassExpression extends Node {
+    type: "ClassExpression";
+    id: Identifier;
+    superClass: Expression;
+    body: ClassBody;
+    decorators?: Decorator[];
+    implements?: ClassImplements[];
+    mixins?: any[];
+    typeParameters?: TypeParameterDeclaration;
+    superTypeParameters?: TypeParameterInstantiation;
+}
+
+export interface ExportAllDeclaration extends Node {
+    type: "ExportAllDeclaration";
+    source: StringLiteral;
+}
+
+export interface ExportDefaultDeclaration extends Node {
+    type: "ExportDefaultDeclaration";
+    declaration: Declaration | Expression;
+}
+
+export interface ExportNamedDeclaration extends Node {
+    type: "ExportNamedDeclaration";
+    declaration: Declaration;
+    specifiers: ExportSpecifier[];
+    source: StringLiteral;
+}
+
+export interface ExportSpecifier extends Node {
+    type: "ExportSpecifier";
+    local: Identifier;
+    imported: Identifier;
+    exported: Identifier;
+}
+
+export interface ForOfStatement extends Node {
+    type: "ForOfStatement";
+    left: VariableDeclaration | LVal;
+    right: Expression;
+    body: Statement;
+}
+
+export interface ImportDeclaration extends Node {
+    type: "ImportDeclaration";
+    specifiers: Array<ImportSpecifier | ImportDefaultSpecifier | ImportNamespaceSpecifier>;
+    source: StringLiteral;
+}
+
+export interface ImportDefaultSpecifier extends Node {
+    type: "ImportDefaultSpecifier";
+    local: Identifier;
+}
+
+export interface ImportNamespaceSpecifier extends Node {
+    type: "ImportNamespaceSpecifier";
+    local: Identifier;
+}
+
+export interface ImportSpecifier extends Node {
+    type: "ImportSpecifier";
+    local: Identifier;
+    imported: Identifier;
+}
+
+export interface MetaProperty extends Node {
+    type: "MetaProperty";
+    meta: Identifier;
+    property: Identifier;
+}
+
+export interface ClassMethod extends Node {
+    type: "ClassMethod";
+    key: Expression;
+    value?: FunctionExpression;
+    kind: "constructor" | "method" | "get" | "set";
+    computed: boolean;
+    static: boolean;
+    decorators?: Decorator[];
+    id: Identifier;
+    params: Pattern[];
+    body: BlockStatement;
+    generator: boolean;
+    async: boolean;
+    expression: boolean;
+    returnType?: TypeAnnotation;
+    typeParameters?: TypeParameterDeclaration;
+}
+
+// See: https://github.com/babel/babel/blob/master/doc/ast/spec.md#objectpattern
+export interface AssignmentProperty extends Node {
+    type: "ObjectProperty";
+    key: Expression;
+    computed: boolean;
+    value: Pattern;
+    decorators?: Decorator[];
+    shorthand: boolean;
+}
+
+export interface ObjectPattern extends Node {
+    type: "ObjectPattern";
+    properties: Array<AssignmentProperty | RestProperty>;
+    typeAnnotation?: TypeAnnotation;
+}
+
+export interface SpreadElement extends Node {
+    type: "SpreadElement";
+    argument: Expression;
+}
+
+export interface Super extends Node {
+    type: "Super";
+}
+
+export interface TaggedTemplateExpression extends Node {
+    type: "TaggedTemplateExpression";
+    tag: Expression;
+    quasi: TemplateLiteral;
+}
+
+export interface TemplateElement extends Node {
+    type: "TemplateElement";
+    tail: boolean;
+    value: {
+        cooked: string;
+        raw: string;
+    };
+}
+
+export interface TemplateLiteral extends Node {
+    type: "TemplateLiteral";
+    quasis: TemplateElement[];
+    expressions: Expression[];
+}
+
+export interface YieldExpression extends Node {
+    type: "YieldExpression";
+    argument: Expression;
+    delegate: boolean;
+}
+
+export interface AnyTypeAnnotation extends Node {
+    type: "AnyTypeAnnotation";
+}
+
+export interface ArrayTypeAnnotation extends Node {
+    type: "ArrayTypeAnnotation";
+    elementType: FlowTypeAnnotation;
+}
+
+export interface BooleanTypeAnnotation extends Node {
+    type: "BooleanTypeAnnotation";
+}
+
+export interface BooleanLiteralTypeAnnotation extends Node {
+    type: "BooleanLiteralTypeAnnotation";
+}
+
+export interface NullLiteralTypeAnnotation extends Node {
+    type: "NullLiteralTypeAnnotation";
+}
+
+export interface ClassImplements extends Node {
+    type: "ClassImplements";
+    id: Identifier;
+    typeParameters: TypeParameterInstantiation;
+}
+
+export interface ClassProperty extends Node {
+    type: "ClassProperty";
+    key: Identifier;
+    value: Expression;
+    decorators?: Decorator[];
+    typeAnnotation?: TypeAnnotation;
+}
+
+export interface DeclareClass extends Node {
+    type: "DeclareClass";
+    id: Identifier;
+    typeParameters: TypeParameterDeclaration;
+    extends: InterfaceExtends[];
+    body: ObjectTypeAnnotation;
+}
+
+export interface DeclareFunction extends Node {
+    type: "DeclareFunction";
+    id: Identifier;
+}
+
+export interface DeclareInterface extends Node {
+    type: "DeclareInterface";
+    id: Identifier;
+    typeParameters: TypeParameterDeclaration;
+    extends: InterfaceExtends[];
+    body: ObjectTypeAnnotation;
+}
+
+export interface DeclareModule extends Node {
+    type: "DeclareModule";
+    id: StringLiteral | Identifier;
+    body: BlockStatement;
+}
+
+export interface DeclareTypeAlias extends Node {
+    type: "DeclareTypeAlias";
+    id: Identifier;
+    typeParameters: TypeParameterDeclaration;
+    right: FlowTypeAnnotation;
+}
+
+export interface DeclareVariable extends Node {
+    type: "DeclareVariable";
+    id: Identifier;
+}
+
+export interface ExistentialTypeParam extends Node {
+    type: "ExistentialTypeParam";
+}
+
+export interface FunctionTypeAnnotation extends Node {
+    type: "FunctionTypeAnnotation";
+    typeParameters: TypeParameterDeclaration;
+    params: FunctionTypeParam[];
+    rest: FunctionTypeParam;
+    returnType: FlowTypeAnnotation;
+}
+
+export interface FunctionTypeParam extends Node {
+    type: "FunctionTypeParam";
+    name: Identifier;
+    typeAnnotation: FlowTypeAnnotation;
+}
+
+export interface GenericTypeAnnotation extends Node {
+    type: "GenericTypeAnnotation";
+    id: Identifier;
+    typeParameters: TypeParameterInstantiation;
+}
+
+export interface InterfaceExtends extends Node {
+    type: "InterfaceExtends";
+    id: Identifier;
+    typeParameters: TypeParameterInstantiation;
+}
+
+export interface InterfaceDeclaration extends Node {
+    type: "InterfaceDeclaration";
+    id: Identifier;
+    typeParameters: TypeParameterDeclaration;
+    extends: InterfaceExtends[];
+    mixins?: any[];
+    body: ObjectTypeAnnotation;
+}
+
+export interface IntersectionTypeAnnotation extends Node {
+    type: "IntersectionTypeAnnotation";
+    types: FlowTypeAnnotation[];
+}
+
+export interface MixedTypeAnnotation extends Node {
+    type: "MixedTypeAnnotation";
+}
+
+export interface NullableTypeAnnotation extends Node {
+    type: "NullableTypeAnnotation";
+    typeAnnotation: FlowTypeAnnotation;
+}
+
+export interface NumericLiteralTypeAnnotation extends Node {
+    type: "NumericLiteralTypeAnnotation";
+}
+
+export interface NumberTypeAnnotation extends Node {
+    type: "NumberTypeAnnotation";
+}
+
+export interface StringLiteralTypeAnnotation extends Node {
+    type: "StringLiteralTypeAnnotation";
+}
+
+export interface StringTypeAnnotation extends Node {
+    type: "StringTypeAnnotation";
+}
+
+export interface ThisTypeAnnotation extends Node {
+    type: "ThisTypeAnnotation";
+}
+
+export interface TupleTypeAnnotation extends Node {
+    type: "TupleTypeAnnotation";
+    types: FlowTypeAnnotation[];
+}
+
+export interface TypeofTypeAnnotation extends Node {
+    type: "TypeofTypeAnnotation";
+    argument: FlowTypeAnnotation;
+}
+
+export interface TypeAlias extends Node {
+    type: "TypeAlias";
+    id: Identifier;
+    typeParameters: TypeParameterDeclaration;
+    right: FlowTypeAnnotation;
+}
+
+export interface TypeAnnotation extends Node {
+    type: "TypeAnnotation";
+    typeAnnotation: FlowTypeAnnotation;
+}
+
+export interface TypeCastExpression extends Node {
+    type: "TypeCastExpression";
+    expression: Expression;
+    typeAnnotation: FlowTypeAnnotation;
+}
+
+export interface TypeParameterDeclaration extends Node {
+    type: "TypeParameterDeclaration";
+    params: Identifier[];
+}
+
+export interface TypeParameterInstantiation extends Node {
+    type: "TypeParameterInstantiation";
+    params: FlowTypeAnnotation[];
+}
+
+export interface ObjectTypeAnnotation extends Node {
+    type: "ObjectTypeAnnotation";
+    properties: ObjectTypeProperty[];
+    indexers: ObjectTypeIndexer[];
+    callProperties: ObjectTypeCallProperty[];
+}
+
+export interface ObjectTypeCallProperty extends Node {
+    type: "ObjectTypeCallProperty";
+    value: FlowTypeAnnotation;
+}
+
+export interface ObjectTypeIndexer extends Node {
+    type: "ObjectTypeIndexer";
+    id: Expression;
+    key: FlowTypeAnnotation;
+    value: FlowTypeAnnotation;
+}
+
+export interface ObjectTypeProperty extends Node {
+    type: "ObjectTypeProperty";
+    key: Expression;
+    value: FlowTypeAnnotation;
+}
+
+export interface QualifiedTypeIdentifier extends Node {
+    type: "QualifiedTypeIdentifier";
+    id: Identifier;
+    qualification: Identifier | QualifiedTypeIdentifier;
+}
+
+export interface UnionTypeAnnotation extends Node {
+    type: "UnionTypeAnnotation";
+    types: FlowTypeAnnotation[];
+}
+
+export interface VoidTypeAnnotation extends Node {
+    type: "VoidTypeAnnotation";
+}
+
+export interface JSXAttribute extends Node {
+    type: "JSXAttribute";
+    name: JSXIdentifier | JSXNamespacedName;
+    value: JSXElement | StringLiteral | JSXExpressionContainer;
+}
+
+export interface JSXClosingElement extends Node {
+    type: "JSXClosingElement";
+    name: JSXIdentifier | JSXMemberExpression;
+}
+
+export interface JSXElement extends Node {
+    type: "JSXElement";
+    openingElement: JSXOpeningElement;
+    closingElement: JSXClosingElement;
+    children: Array<JSXElement | JSXExpressionContainer | JSXText>;
+    selfClosing?: boolean;
+}
+
+export interface JSXEmptyExpression extends Node {
+    type: "JSXEmptyExpression";
+}
+
+export interface JSXExpressionContainer extends Node {
+    type: "JSXExpressionContainer";
+    expression: Expression;
+}
+
+export interface JSXIdentifier extends Node {
+    type: "JSXIdentifier";
+    name: string;
+}
+
+export interface JSXMemberExpression extends Node {
+    type: "JSXMemberExpression";
+    object: JSXMemberExpression | JSXIdentifier;
+    property: JSXIdentifier;
+}
+
+export interface JSXNamespacedName extends Node {
+    type: "JSXNamespacedName";
+    namespace: JSXIdentifier;
+    name: JSXIdentifier;
+}
+
+export interface JSXOpeningElement extends Node {
+    type: "JSXOpeningElement";
+    name: JSXIdentifier | JSXMemberExpression;
+    selfClosing: boolean;
+    attributes: JSXAttribute[];
+}
+
+export interface JSXSpreadAttribute extends Node {
+    type: "JSXSpreadAttribute";
+    argument: Expression;
+}
+
+export interface JSXText extends Node {
+    type: "JSXText";
+    value: string;
+}
+
+export interface Noop extends Node {
+    type: "Noop";
+}
+
+export interface ParenthesizedExpression extends Node {
+    type: "ParenthesizedExpression";
+    expression: Expression;
+}
+
+export interface AwaitExpression extends Node {
+    type: "AwaitExpression";
+    argument: Expression;
+}
+
+export interface BindExpression extends Node {
+    type: "BindExpression";
+    object: Expression;
+    callee: Expression;
+}
+
+export interface Decorator extends Node {
+    type: "Decorator";
+    expression: Expression;
+}
+
+export interface DoExpression extends Node {
+    type: "DoExpression";
+    body: BlockStatement;
+}
+
+export interface ExportDefaultSpecifier extends Node {
+    type: "ExportDefaultSpecifier";
+    exported: Identifier;
+}
+
+export interface ExportNamespaceSpecifier extends Node {
+    type: "ExportNamespaceSpecifier";
+    exported: Identifier;
+}
+
+export interface RestProperty extends Node {
+    type: "RestProperty";
+    argument: LVal;
+}
+
+export interface SpreadProperty extends Node {
+    type: "SpreadProperty";
+    argument: Expression;
+}
+
+export type Expression = ArrayExpression | AssignmentExpression | BinaryExpression | CallExpression | ConditionalExpression | FunctionExpression | Identifier | StringLiteral | NumericLiteral | BooleanLiteral | RegExpLiteral | LogicalExpression | MemberExpression | NewExpression | ObjectExpression | SequenceExpression | ThisExpression | UnaryExpression | UpdateExpression | ArrowFunctionExpression | ClassExpression | MetaProperty | Super | TaggedTemplateExpression | TemplateLiteral | YieldExpression | TypeCastExpression | JSXElement | JSXEmptyExpression | JSXIdentifier | JSXMemberExpression | ParenthesizedExpression | AwaitExpression | BindExpression | DoExpression;
+export type Binary = BinaryExpression | LogicalExpression;
+export type Scopable = BlockStatement | CatchClause | DoWhileStatement | ForInStatement | ForStatement | FunctionDeclaration | FunctionExpression | Program | ObjectMethod | SwitchStatement | WhileStatement | ArrowFunctionExpression | ClassDeclaration | ClassExpression | ForOfStatement | ClassMethod;
+export type BlockParent = BlockStatement | DoWhileStatement | ForInStatement | ForStatement | FunctionDeclaration | FunctionExpression | Program | ObjectMethod | SwitchStatement | WhileStatement | ArrowFunctionExpression | ForOfStatement | ClassMethod;
+export type Block = BlockStatement | Program;
+export type Statement = BlockStatement | BreakStatement | ContinueStatement | DebuggerStatement | DoWhileStatement | EmptyStatement | ExpressionStatement | ForInStatement | ForStatement | FunctionDeclaration | IfStatement | LabeledStatement | ReturnStatement | SwitchStatement | ThrowStatement | TryStatement | VariableDeclaration | WhileStatement | WithStatement | ClassDeclaration | ExportAllDeclaration | ExportDefaultDeclaration | ExportNamedDeclaration | ForOfStatement | ImportDeclaration | DeclareClass | DeclareFunction | DeclareInterface | DeclareModule | DeclareTypeAlias | DeclareVariable | InterfaceDeclaration | TypeAlias;
+export type Terminatorless = BreakStatement | ContinueStatement | ReturnStatement | ThrowStatement | YieldExpression | AwaitExpression;
+export type CompletionStatement = BreakStatement | ContinueStatement | ReturnStatement | ThrowStatement;
+export type Conditional = ConditionalExpression | IfStatement;
+export type Loop = DoWhileStatement | ForInStatement | ForStatement | WhileStatement | ForOfStatement;
+export type While = DoWhileStatement | WhileStatement;
+export type ExpressionWrapper = ExpressionStatement | TypeCastExpression | ParenthesizedExpression;
+export type For = ForInStatement | ForStatement | ForOfStatement;
+export type ForXStatement = ForInStatement | ForOfStatement;
+export type Function = FunctionDeclaration | FunctionExpression | ObjectMethod | ArrowFunctionExpression | ClassMethod;
+export type FunctionParent = FunctionDeclaration | FunctionExpression | Program | ObjectMethod | ArrowFunctionExpression | ClassMethod;
+export type Pureish = FunctionDeclaration | FunctionExpression | StringLiteral | NumericLiteral | BooleanLiteral | ArrowFunctionExpression | ClassDeclaration | ClassExpression;
+export type Declaration = FunctionDeclaration | VariableDeclaration | ClassDeclaration | ExportAllDeclaration | ExportDefaultDeclaration | ExportNamedDeclaration | ImportDeclaration | DeclareClass | DeclareFunction | DeclareInterface | DeclareModule | DeclareTypeAlias | DeclareVariable | InterfaceDeclaration | TypeAlias;
+export type LVal = Identifier | MemberExpression | RestElement | AssignmentPattern | ArrayPattern | ObjectPattern;
+export type Literal = StringLiteral | NumericLiteral | BooleanLiteral | RegExpLiteral | TemplateLiteral;
+export type Immutable = StringLiteral | NumericLiteral | BooleanLiteral | JSXAttribute | JSXClosingElement | JSXElement | JSXExpressionContainer | JSXOpeningElement;
+export type UserWhitespacable = ObjectMethod | ObjectProperty | ObjectTypeCallProperty | ObjectTypeIndexer | ObjectTypeProperty;
+export type Method = ObjectMethod | ClassMethod;
+export type ObjectMember = ObjectMethod | ObjectProperty;
+export type Property = ObjectProperty | ClassProperty;
+export type UnaryLike = UnaryExpression | SpreadElement | RestProperty | SpreadProperty;
+export type Pattern = AssignmentPattern | ArrayPattern | ObjectPattern;
+export type Class = ClassDeclaration | ClassExpression;
+export type ModuleDeclaration = ExportAllDeclaration | ExportDefaultDeclaration | ExportNamedDeclaration | ImportDeclaration;
+export type ExportDeclaration = ExportAllDeclaration | ExportDefaultDeclaration | ExportNamedDeclaration;
+export type ModuleSpecifier = ExportSpecifier | ImportDefaultSpecifier | ImportNamespaceSpecifier | ImportSpecifier | ExportDefaultSpecifier | ExportNamespaceSpecifier;
+export type Flow = AnyTypeAnnotation | ArrayTypeAnnotation | BooleanTypeAnnotation | BooleanLiteralTypeAnnotation | ClassImplements | ClassProperty | DeclareClass | DeclareFunction | DeclareInterface | DeclareModule | DeclareTypeAlias | DeclareVariable | ExistentialTypeParam | FunctionTypeAnnotation | FunctionTypeParam | GenericTypeAnnotation | InterfaceExtends | InterfaceDeclaration | IntersectionTypeAnnotation | MixedTypeAnnotation | NullableTypeAnnotation | NumericLiteralTypeAnnotation | NumberTypeAnnotation | StringLiteralTypeAnnotation | StringTypeAnnotation | ThisTypeAnnotation | TupleTypeAnnotation | TypeofTypeAnnotation | TypeAlias | TypeAnnotation | TypeCastExpression | TypeParameterDeclaration | TypeParameterInstantiation | ObjectTypeAnnotation | ObjectTypeCallProperty | ObjectTypeIndexer | ObjectTypeProperty | QualifiedTypeIdentifier | UnionTypeAnnotation | VoidTypeAnnotation;
+export type FlowTypeAnnotation = AnyTypeAnnotation | ArrayTypeAnnotation | BooleanTypeAnnotation | BooleanLiteralTypeAnnotation | FunctionTypeAnnotation | GenericTypeAnnotation | IntersectionTypeAnnotation | MixedTypeAnnotation | NullableTypeAnnotation | NumericLiteralTypeAnnotation | NumberTypeAnnotation | StringLiteralTypeAnnotation | StringTypeAnnotation | ThisTypeAnnotation | TupleTypeAnnotation | TypeofTypeAnnotation | TypeAnnotation | ObjectTypeAnnotation | UnionTypeAnnotation | VoidTypeAnnotation;
+export type FlowBaseAnnotation = AnyTypeAnnotation | BooleanTypeAnnotation | MixedTypeAnnotation | NumberTypeAnnotation | StringTypeAnnotation | ThisTypeAnnotation | VoidTypeAnnotation;
+export type FlowDeclaration = DeclareClass | DeclareFunction | DeclareInterface | DeclareModule | DeclareTypeAlias | DeclareVariable | InterfaceDeclaration | TypeAlias;
+export type JSX = JSXAttribute | JSXClosingElement | JSXElement | JSXEmptyExpression | JSXExpressionContainer | JSXIdentifier | JSXMemberExpression | JSXNamespacedName | JSXOpeningElement | JSXSpreadAttribute | JSXText;
+
+export function arrayExpression(elements?: Array<Expression | SpreadElement>): ArrayExpression;
+export function assignmentExpression(operator?: string, left?: LVal, right?: Expression): AssignmentExpression;
+export function binaryExpression(operator?: "+" | "-" | "/" | "%" | "*" | "**" | "&" | "|" | ">>" | ">>>" | "<<" | "^" | "==" | "===" | "!=" | "!==" | "in" | "instanceof" | ">" | "<" | ">=" | "<=", left?: Expression, right?: Expression): BinaryExpression;
+export function directive(value?: DirectiveLiteral): Directive;
+export function directiveLiteral(value?: string): DirectiveLiteral;
+export function blockStatement(body?: Statement[], directives?: Directive[]): BlockStatement;
+export function breakStatement(label?: Identifier): BreakStatement;
+export function callExpression(callee?: Expression, _arguments?: Array<Expression | SpreadElement>): CallExpression;
+export function catchClause(param?: Identifier, body?: BlockStatement): CatchClause;
+export function conditionalExpression(test?: Expression, consequent?: Expression, alternate?: Expression): ConditionalExpression;
+export function continueStatement(label?: Identifier): ContinueStatement;
+export function debuggerStatement(): DebuggerStatement;
+export function doWhileStatement(test?: Expression, body?: Statement): DoWhileStatement;
+export function emptyStatement(): EmptyStatement;
+export function expressionStatement(expression?: Expression): ExpressionStatement;
+export function file(program?: Program, comments?: Comment[], tokens?: any[]): File;
+export function forInStatement(left?: VariableDeclaration | LVal, right?: Expression, body?: Statement): ForInStatement;
+export function forStatement(init?: VariableDeclaration | Expression, test?: Expression, update?: Expression, body?: Statement): ForStatement;
+export function functionDeclaration(id?: Identifier, params?: Pattern[], body?: BlockStatement, generator?: boolean, async?: boolean): FunctionDeclaration;
+export function functionExpression(id?: Identifier, params?: Pattern[], body?: BlockStatement, generator?: boolean, async?: boolean): FunctionExpression;
+export function identifier(name?: string): Identifier;
+export function ifStatement(test?: Expression, consequent?: Statement, alternate?: Statement): IfStatement;
+export function labeledStatement(label?: Identifier, body?: Statement): LabeledStatement;
+export function stringLiteral(value?: string): StringLiteral;
+export function numericLiteral(value?: number): NumericLiteral;
+export function nullLiteral(): NullLiteral;
+export function booleanLiteral(value?: boolean): BooleanLiteral;
+export function regExpLiteral(pattern?: string, flags?: string): RegExpLiteral;
+export function logicalExpression(operator?: "||" | "&&", left?: Expression, right?: Expression): LogicalExpression;
+export function memberExpression(object?: Expression | Super, property?: Expression, computed?: boolean): MemberExpression;
+export function newExpression(callee?: Expression | Super, _arguments?: Array<Expression | SpreadElement>): NewExpression;
+export function program(body?: Array<Statement | ModuleDeclaration>, directives?: Directive[]): Program;
+export function objectExpression(properties?: Array<ObjectProperty | ObjectMethod | SpreadProperty>): ObjectExpression;
+export function objectMethod(kind?: "get" | "set" | "method", key?: Expression, params?: Pattern[], body?: BlockStatement, computed?: boolean): ObjectMethod;
+export function objectProperty(key?: Expression, value?: Expression, computed?: boolean, shorthand?: boolean, decorators?: Decorator[]): ObjectProperty;
+export function restElement(argument?: LVal, typeAnnotation?: TypeAnnotation): RestElement;
+export function returnStatement(argument?: Expression): ReturnStatement;
+export function sequenceExpression(expressions?: Expression[]): SequenceExpression;
+export function switchCase(test?: Expression, consequent?: Statement[]): SwitchCase;
+export function switchStatement(discriminant?: Expression, cases?: SwitchCase[]): SwitchStatement;
+export function thisExpression(): ThisExpression;
+export function throwStatement(argument?: Expression): ThrowStatement;
+export function tryStatement(block?: BlockStatement, handler?: CatchClause, finalizer?: BlockStatement): TryStatement;
+export function unaryExpression(operator?: "void" | "delete" | "!" | "+" | "-" | "++" | "--" | "~" | "typeof", argument?: Expression, prefix?: boolean): UnaryExpression;
+export function updateExpression(operator?: "++" | "--", argument?: Expression, prefix?: boolean): UpdateExpression;
+export function variableDeclaration(kind?: "var" | "let" | "const", declarations?: VariableDeclarator[]): VariableDeclaration;
+export function variableDeclarator(id?: LVal, init?: Expression): VariableDeclarator;
+export function whileStatement(test?: Expression, body?: BlockStatement | Statement): WhileStatement;
+export function withStatement(object?: Expression, body?: BlockStatement | Statement): WithStatement;
+export function assignmentPattern(left?: Identifier, right?: Expression): AssignmentPattern;
+export function arrayPattern(elements?: Array<Pattern>, typeAnnotation?: TypeAnnotation): ArrayPattern;
+export function arrowFunctionExpression(params?: Pattern[], body?: BlockStatement | Expression, async?: boolean): ArrowFunctionExpression;
+export function classBody(body?: Array<ClassMethod | ClassProperty>): ClassBody;
+export function classDeclaration(id?: Identifier, superClass?: Expression, body?: ClassBody, decorators?: Decorator[]): ClassDeclaration;
+export function classExpression(id?: Identifier, superClass?: Expression, body?: ClassBody, decorators?: Decorator[]): ClassExpression;
+export function exportAllDeclaration(source?: StringLiteral): ExportAllDeclaration;
+export function exportDefaultDeclaration(declaration?: FunctionDeclaration | ClassDeclaration | Expression): ExportDefaultDeclaration;
+export function exportNamedDeclaration(declaration?: Declaration, specifiers?: ExportSpecifier[], source?: StringLiteral): ExportNamedDeclaration;
+export function exportSpecifier(local?: Identifier, exported?: Identifier): ExportSpecifier;
+export function forOfStatement(left?: VariableDeclaration | LVal, right?: Expression, body?: Statement): ForOfStatement;
+export function importDeclaration(specifiers?: Array<ImportSpecifier | ImportDefaultSpecifier | ImportNamespaceSpecifier>, source?: StringLiteral): ImportDeclaration;
+export function importDefaultSpecifier(local?: Identifier): ImportDefaultSpecifier;
+export function importNamespaceSpecifier(local?: Identifier): ImportNamespaceSpecifier;
+export function importSpecifier(local?: Identifier, imported?: Identifier): ImportSpecifier;
+export function metaProperty(meta?: string, property?: string): MetaProperty;
+export function classMethod(kind?: "constructor" | "method" | "get" | "set", key?: Expression, params?: Pattern[], body?: BlockStatement, computed?: boolean, _static?: boolean): ClassMethod;
+export function objectPattern(properties?: Array<AssignmentProperty | RestProperty>, typeAnnotation?: TypeAnnotation): ObjectPattern;
+export function spreadElement(argument?: Expression): SpreadElement;
+export function taggedTemplateExpression(tag?: Expression, quasi?: TemplateLiteral): TaggedTemplateExpression;
+export function templateElement(value?: {cooked?: string; raw?: string;}, tail?: boolean): TemplateElement;
+export function templateLiteral(quasis?: TemplateElement[], expressions?: Expression[]): TemplateLiteral;
+export function yieldExpression(argument?: Expression, delegate?: boolean): YieldExpression;
+export function anyTypeAnnotation(): AnyTypeAnnotation;
+export function arrayTypeAnnotation(elementType?: FlowTypeAnnotation): ArrayTypeAnnotation;
+export function booleanTypeAnnotation(): BooleanTypeAnnotation;
+export function booleanLiteralTypeAnnotation(): BooleanLiteralTypeAnnotation;
+export function nullLiteralTypeAnnotation(): NullLiteralTypeAnnotation;
+export function classImplements(id?: Identifier, typeParameters?: TypeParameterInstantiation): ClassImplements;
+export function classProperty(key?: Identifier, value?: Expression, typeAnnotation?: TypeAnnotation, decorators?: Decorator[]): ClassProperty;
+export function declareClass(id?: Identifier, typeParameters?: TypeParameterDeclaration, _extends?: InterfaceExtends[], body?: ObjectTypeAnnotation): DeclareClass;
+export function declareFunction(id?: Identifier): DeclareFunction;
+export function declareInterface(id?: Identifier, typeParameters?: TypeParameterDeclaration, _extends?: InterfaceExtends[], body?: ObjectTypeAnnotation): DeclareInterface;
+export function declareModule(id?: StringLiteral | Identifier, body?: BlockStatement): DeclareModule;
+export function declareTypeAlias(id?: Identifier, typeParameters?: TypeParameterDeclaration, right?: FlowTypeAnnotation): DeclareTypeAlias;
+export function declareVariable(id?: Identifier): DeclareVariable;
+export function existentialTypeParam(): ExistentialTypeParam;
+export function functionTypeAnnotation(typeParameters?: TypeParameterDeclaration, params?: FunctionTypeParam[], rest?: FunctionTypeParam, returnType?: FlowTypeAnnotation): FunctionTypeAnnotation;
+export function functionTypeParam(name?: Identifier, typeAnnotation?: FlowTypeAnnotation): FunctionTypeParam;
+export function genericTypeAnnotation(id?: Identifier, typeParameters?: TypeParameterInstantiation): GenericTypeAnnotation;
+export function interfaceExtends(id?: Identifier, typeParameters?: TypeParameterInstantiation): InterfaceExtends;
+export function interfaceDeclaration(id?: Identifier, typeParameters?: TypeParameterDeclaration, _extends?: InterfaceExtends[], body?: ObjectTypeAnnotation): InterfaceDeclaration;
+export function intersectionTypeAnnotation(types?: FlowTypeAnnotation[]): IntersectionTypeAnnotation;
+export function mixedTypeAnnotation(): MixedTypeAnnotation;
+export function nullableTypeAnnotation(typeAnnotation?: FlowTypeAnnotation): NullableTypeAnnotation;
+export function numericLiteralTypeAnnotation(): NumericLiteralTypeAnnotation;
+export function numberTypeAnnotation(): NumberTypeAnnotation;
+export function stringLiteralTypeAnnotation(): StringLiteralTypeAnnotation;
+export function stringTypeAnnotation(): StringTypeAnnotation;
+export function thisTypeAnnotation(): ThisTypeAnnotation;
+export function tupleTypeAnnotation(types?: FlowTypeAnnotation[]): TupleTypeAnnotation;
+export function typeofTypeAnnotation(argument?: FlowTypeAnnotation): TypeofTypeAnnotation;
+export function typeAlias(id?: Identifier, typeParameters?: TypeParameterDeclaration, right?: FlowTypeAnnotation): TypeAlias;
+export function typeAnnotation(typeAnnotation?: FlowTypeAnnotation): TypeAnnotation;
+export function typeCastExpression(expression?: Expression, typeAnnotation?: FlowTypeAnnotation): TypeCastExpression;
+export function typeParameterDeclaration(params?: Identifier[]): TypeParameterDeclaration;
+export function typeParameterInstantiation(params?: FlowTypeAnnotation[]): TypeParameterInstantiation;
+export function objectTypeAnnotation(properties?: ObjectTypeProperty[], indexers?: ObjectTypeIndexer[], callProperties?: ObjectTypeCallProperty[]): ObjectTypeAnnotation;
+export function objectTypeCallProperty(value?: FlowTypeAnnotation): ObjectTypeCallProperty;
+export function objectTypeIndexer(id?: Expression, key?: FlowTypeAnnotation, value?: FlowTypeAnnotation): ObjectTypeIndexer;
+export function objectTypeProperty(key?: Expression, value?: FlowTypeAnnotation): ObjectTypeProperty;
+export function qualifiedTypeIdentifier(id?: Identifier, qualification?: Identifier | QualifiedTypeIdentifier): QualifiedTypeIdentifier;
+export function unionTypeAnnotation(types?: FlowTypeAnnotation[]): UnionTypeAnnotation;
+export function voidTypeAnnotation(): VoidTypeAnnotation;
+export function jSXAttribute(name?: JSXIdentifier | JSXNamespacedName, value?: JSXElement | StringLiteral | JSXExpressionContainer): JSXAttribute;
+export function jSXClosingElement(name?: JSXIdentifier | JSXMemberExpression): JSXClosingElement;
+export function jSXElement(openingElement?: JSXOpeningElement, closingElement?: JSXClosingElement, children?: Array<JSXElement | JSXExpressionContainer | JSXText>, selfClosing?: boolean): JSXElement;
+export function jSXEmptyExpression(): JSXEmptyExpression;
+export function jSXExpressionContainer(expression?: Expression): JSXExpressionContainer;
+export function jSXIdentifier(name?: string): JSXIdentifier;
+export function jSXMemberExpression(object?: JSXMemberExpression | JSXIdentifier, property?: JSXIdentifier): JSXMemberExpression;
+export function jSXNamespacedName(namespace?: JSXIdentifier, name?: JSXIdentifier): JSXNamespacedName;
+export function jSXOpeningElement(name?: JSXIdentifier | JSXMemberExpression, attributes?: JSXAttribute[], selfClosing?: boolean): JSXOpeningElement;
+export function jSXSpreadAttribute(argument?: Expression): JSXSpreadAttribute;
+export function jSXText(value?: string): JSXText;
+export function noop(): Noop;
+export function parenthesizedExpression(expression?: Expression): ParenthesizedExpression;
+export function awaitExpression(argument?: Expression): AwaitExpression;
+export function bindExpression(object?: Expression, callee?: Expression): BindExpression;
+export function decorator(expression?: Expression): Decorator;
+export function doExpression(body?: BlockStatement): DoExpression;
+export function exportDefaultSpecifier(exported?: Identifier): ExportDefaultSpecifier;
+export function exportNamespaceSpecifier(exported?: Identifier): ExportNamespaceSpecifier;
+export function restProperty(argument?: LVal): RestProperty;
+export function spreadProperty(argument?: Expression): SpreadProperty;
+
+export function isArrayExpression(node: Object, opts?: Object): node is ArrayExpression;
+export function isAssignmentExpression(node: Object, opts?: Object): node is AssignmentExpression;
+export function isBinaryExpression(node: Object, opts?: Object): node is BinaryExpression;
+export function isDirective(node: Object, opts?: Object): node is Directive;
+export function isDirectiveLiteral(node: Object, opts?: Object): node is DirectiveLiteral;
+export function isBlockStatement(node: Object, opts?: Object): node is BlockStatement;
+export function isBreakStatement(node: Object, opts?: Object): node is BreakStatement;
+export function isCallExpression(node: Object, opts?: Object): node is CallExpression;
+export function isCatchClause(node: Object, opts?: Object): node is CatchClause;
+export function isConditionalExpression(node: Object, opts?: Object): node is ConditionalExpression;
+export function isContinueStatement(node: Object, opts?: Object): node is ContinueStatement;
+export function isDebuggerStatement(node: Object, opts?: Object): node is DebuggerStatement;
+export function isDoWhileStatement(node: Object, opts?: Object): node is DoWhileStatement;
+export function isEmptyStatement(node: Object, opts?: Object): node is EmptyStatement;
+export function isExpressionStatement(node: Object, opts?: Object): node is ExpressionStatement;
+export function isFile(node: Object, opts?: Object): node is File;
+export function isForInStatement(node: Object, opts?: Object): node is ForInStatement;
+export function isForStatement(node: Object, opts?: Object): node is ForStatement;
+export function isFunctionDeclaration(node: Object, opts?: Object): node is FunctionDeclaration;
+export function isFunctionExpression(node: Object, opts?: Object): node is FunctionExpression;
+export function isIdentifier(node: Object, opts?: Object): node is Identifier;
+export function isIfStatement(node: Object, opts?: Object): node is IfStatement;
+export function isLabeledStatement(node: Object, opts?: Object): node is LabeledStatement;
+export function isStringLiteral(node: Object, opts?: Object): node is StringLiteral;
+export function isNumericLiteral(node: Object, opts?: Object): node is NumericLiteral;
+export function isNullLiteral(node: Object, opts?: Object): node is NullLiteral;
+export function isBooleanLiteral(node: Object, opts?: Object): node is BooleanLiteral;
+export function isRegExpLiteral(node: Object, opts?: Object): node is RegExpLiteral;
+export function isLogicalExpression(node: Object, opts?: Object): node is LogicalExpression;
+export function isMemberExpression(node: Object, opts?: Object): node is MemberExpression;
+export function isNewExpression(node: Object, opts?: Object): node is NewExpression;
+export function isProgram(node: Object, opts?: Object): node is Program;
+export function isObjectExpression(node: Object, opts?: Object): node is ObjectExpression;
+export function isObjectMethod(node: Object, opts?: Object): node is ObjectMethod;
+export function isObjectProperty(node: Object, opts?: Object): node is ObjectProperty;
+export function isRestElement(node: Object, opts?: Object): node is RestElement;
+export function isReturnStatement(node: Object, opts?: Object): node is ReturnStatement;
+export function isSequenceExpression(node: Object, opts?: Object): node is SequenceExpression;
+export function isSwitchCase(node: Object, opts?: Object): node is SwitchCase;
+export function isSwitchStatement(node: Object, opts?: Object): node is SwitchStatement;
+export function isThisExpression(node: Object, opts?: Object): node is ThisExpression;
+export function isThrowStatement(node: Object, opts?: Object): node is ThrowStatement;
+export function isTryStatement(node: Object, opts?: Object): node is TryStatement;
+export function isUnaryExpression(node: Object, opts?: Object): node is UnaryExpression;
+export function isUpdateExpression(node: Object, opts?: Object): node is UpdateExpression;
+export function isVariableDeclaration(node: Object, opts?: Object): node is VariableDeclaration;
+export function isVariableDeclarator(node: Object, opts?: Object): node is VariableDeclarator;
+export function isWhileStatement(node: Object, opts?: Object): node is WhileStatement;
+export function isWithStatement(node: Object, opts?: Object): node is WithStatement;
+export function isAssignmentPattern(node: Object, opts?: Object): node is AssignmentPattern;
+export function isArrayPattern(node: Object, opts?: Object): node is ArrayPattern;
+export function isArrowFunctionExpression(node: Object, opts?: Object): node is ArrowFunctionExpression;
+export function isClassBody(node: Object, opts?: Object): node is ClassBody;
+export function isClassDeclaration(node: Object, opts?: Object): node is ClassDeclaration;
+export function isClassExpression(node: Object, opts?: Object): node is ClassExpression;
+export function isExportAllDeclaration(node: Object, opts?: Object): node is ExportAllDeclaration;
+export function isExportDefaultDeclaration(node: Object, opts?: Object): node is ExportDefaultDeclaration;
+export function isExportNamedDeclaration(node: Object, opts?: Object): node is ExportNamedDeclaration;
+export function isExportSpecifier(node: Object, opts?: Object): node is ExportSpecifier;
+export function isForOfStatement(node: Object, opts?: Object): node is ForOfStatement;
+export function isImportDeclaration(node: Object, opts?: Object): node is ImportDeclaration;
+export function isImportDefaultSpecifier(node: Object, opts?: Object): node is ImportDefaultSpecifier;
+export function isImportNamespaceSpecifier(node: Object, opts?: Object): node is ImportNamespaceSpecifier;
+export function isImportSpecifier(node: Object, opts?: Object): node is ImportSpecifier;
+export function isMetaProperty(node: Object, opts?: Object): node is MetaProperty;
+export function isClassMethod(node: Object, opts?: Object): node is ClassMethod;
+export function isObjectPattern(node: Object, opts?: Object): node is ObjectPattern;
+export function isSpreadElement(node: Object, opts?: Object): node is SpreadElement;
+export function isSuper(node: Object, opts?: Object): node is Super;
+export function isTaggedTemplateExpression(node: Object, opts?: Object): node is TaggedTemplateExpression;
+export function isTemplateElement(node: Object, opts?: Object): node is TemplateElement;
+export function isTemplateLiteral(node: Object, opts?: Object): node is TemplateLiteral;
+export function isYieldExpression(node: Object, opts?: Object): node is YieldExpression;
+export function isAnyTypeAnnotation(node: Object, opts?: Object): node is AnyTypeAnnotation;
+export function isArrayTypeAnnotation(node: Object, opts?: Object): node is ArrayTypeAnnotation;
+export function isBooleanTypeAnnotation(node: Object, opts?: Object): node is BooleanTypeAnnotation;
+export function isBooleanLiteralTypeAnnotation(node: Object, opts?: Object): node is BooleanLiteralTypeAnnotation;
+export function isNullLiteralTypeAnnotation(node: Object, opts?: Object): node is NullLiteralTypeAnnotation;
+export function isClassImplements(node: Object, opts?: Object): node is ClassImplements;
+export function isClassProperty(node: Object, opts?: Object): node is ClassProperty;
+export function isDeclareClass(node: Object, opts?: Object): node is DeclareClass;
+export function isDeclareFunction(node: Object, opts?: Object): node is DeclareFunction;
+export function isDeclareInterface(node: Object, opts?: Object): node is DeclareInterface;
+export function isDeclareModule(node: Object, opts?: Object): node is DeclareModule;
+export function isDeclareTypeAlias(node: Object, opts?: Object): node is DeclareTypeAlias;
+export function isDeclareVariable(node: Object, opts?: Object): node is DeclareVariable;
+export function isExistentialTypeParam(node: Object, opts?: Object): node is ExistentialTypeParam;
+export function isFunctionTypeAnnotation(node: Object, opts?: Object): node is FunctionTypeAnnotation;
+export function isFunctionTypeParam(node: Object, opts?: Object): node is FunctionTypeParam;
+export function isGenericTypeAnnotation(node: Object, opts?: Object): node is GenericTypeAnnotation;
+export function isInterfaceExtends(node: Object, opts?: Object): node is InterfaceExtends;
+export function isInterfaceDeclaration(node: Object, opts?: Object): node is InterfaceDeclaration;
+export function isIntersectionTypeAnnotation(node: Object, opts?: Object): node is IntersectionTypeAnnotation;
+export function isMixedTypeAnnotation(node: Object, opts?: Object): node is MixedTypeAnnotation;
+export function isNullableTypeAnnotation(node: Object, opts?: Object): node is NullableTypeAnnotation;
+export function isNumericLiteralTypeAnnotation(node: Object, opts?: Object): node is NumericLiteralTypeAnnotation;
+export function isNumberTypeAnnotation(node: Object, opts?: Object): node is NumberTypeAnnotation;
+export function isStringLiteralTypeAnnotation(node: Object, opts?: Object): node is StringLiteralTypeAnnotation;
+export function isStringTypeAnnotation(node: Object, opts?: Object): node is StringTypeAnnotation;
+export function isThisTypeAnnotation(node: Object, opts?: Object): node is ThisTypeAnnotation;
+export function isTupleTypeAnnotation(node: Object, opts?: Object): node is TupleTypeAnnotation;
+export function isTypeofTypeAnnotation(node: Object, opts?: Object): node is TypeofTypeAnnotation;
+export function isTypeAlias(node: Object, opts?: Object): node is TypeAlias;
+export function isTypeAnnotation(node: Object, opts?: Object): node is TypeAnnotation;
+export function isTypeCastExpression(node: Object, opts?: Object): node is TypeCastExpression;
+export function isTypeParameterDeclaration(node: Object, opts?: Object): node is TypeParameterDeclaration;
+export function isTypeParameterInstantiation(node: Object, opts?: Object): node is TypeParameterInstantiation;
+export function isObjectTypeAnnotation(node: Object, opts?: Object): node is ObjectTypeAnnotation;
+export function isObjectTypeCallProperty(node: Object, opts?: Object): node is ObjectTypeCallProperty;
+export function isObjectTypeIndexer(node: Object, opts?: Object): node is ObjectTypeIndexer;
+export function isObjectTypeProperty(node: Object, opts?: Object): node is ObjectTypeProperty;
+export function isQualifiedTypeIdentifier(node: Object, opts?: Object): node is QualifiedTypeIdentifier;
+export function isUnionTypeAnnotation(node: Object, opts?: Object): node is UnionTypeAnnotation;
+export function isVoidTypeAnnotation(node: Object, opts?: Object): node is VoidTypeAnnotation;
+export function isJSXAttribute(node: Object, opts?: Object): node is JSXAttribute;
+export function isJSXClosingElement(node: Object, opts?: Object): node is JSXClosingElement;
+export function isJSXElement(node: Object, opts?: Object): node is JSXElement;
+export function isJSXEmptyExpression(node: Object, opts?: Object): node is JSXEmptyExpression;
+export function isJSXExpressionContainer(node: Object, opts?: Object): node is JSXExpressionContainer;
+export function isJSXIdentifier(node: Object, opts?: Object): node is JSXIdentifier;
+export function isJSXMemberExpression(node: Object, opts?: Object): node is JSXMemberExpression;
+export function isJSXNamespacedName(node: Object, opts?: Object): node is JSXNamespacedName;
+export function isJSXOpeningElement(node: Object, opts?: Object): node is JSXOpeningElement;
+export function isJSXSpreadAttribute(node: Object, opts?: Object): node is JSXSpreadAttribute;
+export function isJSXText(node: Object, opts?: Object): node is JSXText;
+export function isNoop(node: Object, opts?: Object): node is Noop;
+export function isParenthesizedExpression(node: Object, opts?: Object): node is ParenthesizedExpression;
+export function isAwaitExpression(node: Object, opts?: Object): node is AwaitExpression;
+export function isBindExpression(node: Object, opts?: Object): node is BindExpression;
+export function isDecorator(node: Object, opts?: Object): node is Decorator;
+export function isDoExpression(node: Object, opts?: Object): node is DoExpression;
+export function isExportDefaultSpecifier(node: Object, opts?: Object): node is ExportDefaultSpecifier;
+export function isExportNamespaceSpecifier(node: Object, opts?: Object): node is ExportNamespaceSpecifier;
+export function isRestProperty(node: Object, opts?: Object): node is RestProperty;
+export function isSpreadProperty(node: Object, opts?: Object): node is SpreadProperty;
+export function isExpression(node: Object, opts?: Object): node is Expression;
+export function isBinary(node: Object, opts?: Object): node is Binary;
+export function isScopable(node: Object, opts?: Object): node is Scopable;
+export function isBlockParent(node: Object, opts?: Object): node is BlockParent;
+export function isBlock(node: Object, opts?: Object): node is Block;
+export function isStatement(node: Object, opts?: Object): node is Statement;
+export function isTerminatorless(node: Object, opts?: Object): node is Terminatorless;
+export function isCompletionStatement(node: Object, opts?: Object): node is CompletionStatement;
+export function isConditional(node: Object, opts?: Object): node is Conditional;
+export function isLoop(node: Object, opts?: Object): node is Loop;
+export function isWhile(node: Object, opts?: Object): node is While;
+export function isExpressionWrapper(node: Object, opts?: Object): node is ExpressionWrapper;
+export function isFor(node: Object, opts?: Object): node is For;
+export function isForXStatement(node: Object, opts?: Object): node is ForXStatement;
+export function isFunction(node: Object, opts?: Object): node is Function;
+export function isFunctionParent(node: Object, opts?: Object): node is FunctionParent;
+export function isPureish(node: Object, opts?: Object): node is Pureish;
+export function isDeclaration(node: Object, opts?: Object): node is Declaration;
+export function isLVal(node: Object, opts?: Object): node is LVal;
+export function isLiteral(node: Object, opts?: Object): node is Literal;
+export function isImmutable(node: Object, opts?: Object): node is Immutable;
+export function isUserWhitespacable(node: Object, opts?: Object): node is UserWhitespacable;
+export function isMethod(node: Object, opts?: Object): node is Method;
+export function isObjectMember(node: Object, opts?: Object): node is ObjectMember;
+export function isProperty(node: Object, opts?: Object): node is Property;
+export function isUnaryLike(node: Object, opts?: Object): node is UnaryLike;
+export function isPattern(node: Object, opts?: Object): node is Pattern;
+export function isClass(node: Object, opts?: Object): node is Class;
+export function isModuleDeclaration(node: Object, opts?: Object): node is ModuleDeclaration;
+export function isExportDeclaration(node: Object, opts?: Object): node is ExportDeclaration;
+export function isModuleSpecifier(node: Object, opts?: Object): node is ModuleSpecifier;
+export function isFlow(node: Object, opts?: Object): node is Flow;
+export function isFlowBaseAnnotation(node: Object, opts?: Object): node is FlowBaseAnnotation;
+export function isFlowDeclaration(node: Object, opts?: Object): node is FlowDeclaration;
+export function isJSX(node: Object, opts?: Object): node is JSX;
+export function isNumberLiteral(node: Object, opts?: Object): node is NumericLiteral;
+export function isRegexLiteral(node: Object, opts?: Object): node is RegExpLiteral;
+
+export function isReferencedIdentifier(node: Object, opts?: Object): boolean;
+export function isReferencedMemberExpression(node: Object, opts?: Object): boolean;
+export function isBindingIdentifier(node: Object, opts?: Object): boolean;
+export function isScope(node: Object, opts?: Object): boolean;
+export function isReferenced(node: Object, opts?: Object): boolean;
+export function isBlockScoped(node: Object, opts?: Object): boolean;
+export function isVar(node: Object, opts?: Object): boolean;
+export function isUser(node: Object, opts?: Object): boolean;
+export function isGenerated(node: Object, opts?: Object): boolean;
+export function isPure(node: Object, opts?: Object): boolean;
+
+export function assertArrayExpression(node: Object, opts?: Object): void;
+export function assertAssignmentExpression(node: Object, opts?: Object): void;
+export function assertBinaryExpression(node: Object, opts?: Object): void;
+export function assertDirective(node: Object, opts?: Object): void;
+export function assertDirectiveLiteral(node: Object, opts?: Object): void;
+export function assertBlockStatement(node: Object, opts?: Object): void;
+export function assertBreakStatement(node: Object, opts?: Object): void;
+export function assertCallExpression(node: Object, opts?: Object): void;
+export function assertCatchClause(node: Object, opts?: Object): void;
+export function assertConditionalExpression(node: Object, opts?: Object): void;
+export function assertContinueStatement(node: Object, opts?: Object): void;
+export function assertDebuggerStatement(node: Object, opts?: Object): void;
+export function assertDoWhileStatement(node: Object, opts?: Object): void;
+export function assertEmptyStatement(node: Object, opts?: Object): void;
+export function assertExpressionStatement(node: Object, opts?: Object): void;
+export function assertFile(node: Object, opts?: Object): void;
+export function assertForInStatement(node: Object, opts?: Object): void;
+export function assertForStatement(node: Object, opts?: Object): void;
+export function assertFunctionDeclaration(node: Object, opts?: Object): void;
+export function assertFunctionExpression(node: Object, opts?: Object): void;
+export function assertIdentifier(node: Object, opts?: Object): void;
+export function assertIfStatement(node: Object, opts?: Object): void;
+export function assertLabeledStatement(node: Object, opts?: Object): void;
+export function assertStringLiteral(node: Object, opts?: Object): void;
+export function assertNumericLiteral(node: Object, opts?: Object): void;
+export function assertNullLiteral(node: Object, opts?: Object): void;
+export function assertBooleanLiteral(node: Object, opts?: Object): void;
+export function assertRegExpLiteral(node: Object, opts?: Object): void;
+export function assertLogicalExpression(node: Object, opts?: Object): void;
+export function assertMemberExpression(node: Object, opts?: Object): void;
+export function assertNewExpression(node: Object, opts?: Object): void;
+export function assertProgram(node: Object, opts?: Object): void;
+export function assertObjectExpression(node: Object, opts?: Object): void;
+export function assertObjectMethod(node: Object, opts?: Object): void;
+export function assertObjectProperty(node: Object, opts?: Object): void;
+export function assertRestElement(node: Object, opts?: Object): void;
+export function assertReturnStatement(node: Object, opts?: Object): void;
+export function assertSequenceExpression(node: Object, opts?: Object): void;
+export function assertSwitchCase(node: Object, opts?: Object): void;
+export function assertSwitchStatement(node: Object, opts?: Object): void;
+export function assertThisExpression(node: Object, opts?: Object): void;
+export function assertThrowStatement(node: Object, opts?: Object): void;
+export function assertTryStatement(node: Object, opts?: Object): void;
+export function assertUnaryExpression(node: Object, opts?: Object): void;
+export function assertUpdateExpression(node: Object, opts?: Object): void;
+export function assertVariableDeclaration(node: Object, opts?: Object): void;
+export function assertVariableDeclarator(node: Object, opts?: Object): void;
+export function assertWhileStatement(node: Object, opts?: Object): void;
+export function assertWithStatement(node: Object, opts?: Object): void;
+export function assertAssignmentPattern(node: Object, opts?: Object): void;
+export function assertArrayPattern(node: Object, opts?: Object): void;
+export function assertArrowFunctionExpression(node: Object, opts?: Object): void;
+export function assertClassBody(node: Object, opts?: Object): void;
+export function assertClassDeclaration(node: Object, opts?: Object): void;
+export function assertClassExpression(node: Object, opts?: Object): void;
+export function assertExportAllDeclaration(node: Object, opts?: Object): void;
+export function assertExportDefaultDeclaration(node: Object, opts?: Object): void;
+export function assertExportNamedDeclaration(node: Object, opts?: Object): void;
+export function assertExportSpecifier(node: Object, opts?: Object): void;
+export function assertForOfStatement(node: Object, opts?: Object): void;
+export function assertImportDeclaration(node: Object, opts?: Object): void;
+export function assertImportDefaultSpecifier(node: Object, opts?: Object): void;
+export function assertImportNamespaceSpecifier(node: Object, opts?: Object): void;
+export function assertImportSpecifier(node: Object, opts?: Object): void;
+export function assertMetaProperty(node: Object, opts?: Object): void;
+export function assertClassMethod(node: Object, opts?: Object): void;
+export function assertObjectPattern(node: Object, opts?: Object): void;
+export function assertSpreadElement(node: Object, opts?: Object): void;
+export function assertSuper(node: Object, opts?: Object): void;
+export function assertTaggedTemplateExpression(node: Object, opts?: Object): void;
+export function assertTemplateElement(node: Object, opts?: Object): void;
+export function assertTemplateLiteral(node: Object, opts?: Object): void;
+export function assertYieldExpression(node: Object, opts?: Object): void;
+export function assertAnyTypeAnnotation(node: Object, opts?: Object): void;
+export function assertArrayTypeAnnotation(node: Object, opts?: Object): void;
+export function assertBooleanTypeAnnotation(node: Object, opts?: Object): void;
+export function assertBooleanLiteralTypeAnnotation(node: Object, opts?: Object): void;
+export function assertNullLiteralTypeAnnotation(node: Object, opts?: Object): void;
+export function assertClassImplements(node: Object, opts?: Object): void;
+export function assertClassProperty(node: Object, opts?: Object): void;
+export function assertDeclareClass(node: Object, opts?: Object): void;
+export function assertDeclareFunction(node: Object, opts?: Object): void;
+export function assertDeclareInterface(node: Object, opts?: Object): void;
+export function assertDeclareModule(node: Object, opts?: Object): void;
+export function assertDeclareTypeAlias(node: Object, opts?: Object): void;
+export function assertDeclareVariable(node: Object, opts?: Object): void;
+export function assertExistentialTypeParam(node: Object, opts?: Object): void;
+export function assertFunctionTypeAnnotation(node: Object, opts?: Object): void;
+export function assertFunctionTypeParam(node: Object, opts?: Object): void;
+export function assertGenericTypeAnnotation(node: Object, opts?: Object): void;
+export function assertInterfaceExtends(node: Object, opts?: Object): void;
+export function assertInterfaceDeclaration(node: Object, opts?: Object): void;
+export function assertIntersectionTypeAnnotation(node: Object, opts?: Object): void;
+export function assertMixedTypeAnnotation(node: Object, opts?: Object): void;
+export function assertNullableTypeAnnotation(node: Object, opts?: Object): void;
+export function assertNumericLiteralTypeAnnotation(node: Object, opts?: Object): void;
+export function assertNumberTypeAnnotation(node: Object, opts?: Object): void;
+export function assertStringLiteralTypeAnnotation(node: Object, opts?: Object): void;
+export function assertStringTypeAnnotation(node: Object, opts?: Object): void;
+export function assertThisTypeAnnotation(node: Object, opts?: Object): void;
+export function assertTupleTypeAnnotation(node: Object, opts?: Object): void;
+export function assertTypeofTypeAnnotation(node: Object, opts?: Object): void;
+export function assertTypeAlias(node: Object, opts?: Object): void;
+export function assertTypeAnnotation(node: Object, opts?: Object): void;
+export function assertTypeCastExpression(node: Object, opts?: Object): void;
+export function assertTypeParameterDeclaration(node: Object, opts?: Object): void;
+export function assertTypeParameterInstantiation(node: Object, opts?: Object): void;
+export function assertObjectTypeAnnotation(node: Object, opts?: Object): void;
+export function assertObjectTypeCallProperty(node: Object, opts?: Object): void;
+export function assertObjectTypeIndexer(node: Object, opts?: Object): void;
+export function assertObjectTypeProperty(node: Object, opts?: Object): void;
+export function assertQualifiedTypeIdentifier(node: Object, opts?: Object): void;
+export function assertUnionTypeAnnotation(node: Object, opts?: Object): void;
+export function assertVoidTypeAnnotation(node: Object, opts?: Object): void;
+export function assertJSXAttribute(node: Object, opts?: Object): void;
+export function assertJSXClosingElement(node: Object, opts?: Object): void;
+export function assertJSXElement(node: Object, opts?: Object): void;
+export function assertJSXEmptyExpression(node: Object, opts?: Object): void;
+export function assertJSXExpressionContainer(node: Object, opts?: Object): void;
+export function assertJSXIdentifier(node: Object, opts?: Object): void;
+export function assertJSXMemberExpression(node: Object, opts?: Object): void;
+export function assertJSXNamespacedName(node: Object, opts?: Object): void;
+export function assertJSXOpeningElement(node: Object, opts?: Object): void;
+export function assertJSXSpreadAttribute(node: Object, opts?: Object): void;
+export function assertJSXText(node: Object, opts?: Object): void;
+export function assertNoop(node: Object, opts?: Object): void;
+export function assertParenthesizedExpression(node: Object, opts?: Object): void;
+export function assertAwaitExpression(node: Object, opts?: Object): void;
+export function assertBindExpression(node: Object, opts?: Object): void;
+export function assertDecorator(node: Object, opts?: Object): void;
+export function assertDoExpression(node: Object, opts?: Object): void;
+export function assertExportDefaultSpecifier(node: Object, opts?: Object): void;
+export function assertExportNamespaceSpecifier(node: Object, opts?: Object): void;
+export function assertRestProperty(node: Object, opts?: Object): void;
+export function assertSpreadProperty(node: Object, opts?: Object): void;
+export function assertExpression(node: Object, opts?: Object): void;
+export function assertBinary(node: Object, opts?: Object): void;
+export function assertScopable(node: Object, opts?: Object): void;
+export function assertBlockParent(node: Object, opts?: Object): void;
+export function assertBlock(node: Object, opts?: Object): void;
+export function assertStatement(node: Object, opts?: Object): void;
+export function assertTerminatorless(node: Object, opts?: Object): void;
+export function assertCompletionStatement(node: Object, opts?: Object): void;
+export function assertConditional(node: Object, opts?: Object): void;
+export function assertLoop(node: Object, opts?: Object): void;
+export function assertWhile(node: Object, opts?: Object): void;
+export function assertExpressionWrapper(node: Object, opts?: Object): void;
+export function assertFor(node: Object, opts?: Object): void;
+export function assertForXStatement(node: Object, opts?: Object): void;
+export function assertFunction(node: Object, opts?: Object): void;
+export function assertFunctionParent(node: Object, opts?: Object): void;
+export function assertPureish(node: Object, opts?: Object): void;
+export function assertDeclaration(node: Object, opts?: Object): void;
+export function assertLVal(node: Object, opts?: Object): void;
+export function assertLiteral(node: Object, opts?: Object): void;
+export function assertImmutable(node: Object, opts?: Object): void;
+export function assertUserWhitespacable(node: Object, opts?: Object): void;
+export function assertMethod(node: Object, opts?: Object): void;
+export function assertObjectMember(node: Object, opts?: Object): void;
+export function assertProperty(node: Object, opts?: Object): void;
+export function assertUnaryLike(node: Object, opts?: Object): void;
+export function assertPattern(node: Object, opts?: Object): void;
+export function assertClass(node: Object, opts?: Object): void;
+export function assertModuleDeclaration(node: Object, opts?: Object): void;
+export function assertExportDeclaration(node: Object, opts?: Object): void;
+export function assertModuleSpecifier(node: Object, opts?: Object): void;
+export function assertFlow(node: Object, opts?: Object): void;
+export function assertFlowBaseAnnotation(node: Object, opts?: Object): void;
+export function assertFlowDeclaration(node: Object, opts?: Object): void;
+export function assertJSX(node: Object, opts?: Object): void;
+export function assertNumberLiteral(node: Object, opts?: Object): void;
+export function assertRegexLiteral(node: Object, opts?: Object): void;
+
diff --git a/babel-types/tsconfig.json b/babel-types/tsconfig.json
new file mode 100644
index 0000000000..11601b0c36
--- /dev/null
+++ b/babel-types/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "babel-types-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/babylon/babylon-tests.ts b/babylon/babylon-tests.ts
new file mode 100644
index 0000000000..bb95625935
--- /dev/null
+++ b/babylon/babylon-tests.ts
@@ -0,0 +1,24 @@
+
+/// <reference types="babel-types" />
+/// <reference types="babel-types" />
+
+
+// Example from https://github.com/thejameskyle/babel-handbook/blob/master/translations/en/plugin-handbook.md#babylon
+import * as babylon from "babylon";
+declare function assert(expr: boolean): void;
+
+const code = `function square(n) {
+  return n * n;
+}`;
+
+let node = babylon.parse(code);
+assert(node.type === "File");
+assert(node.start === 0);
+assert(node.end === 38);
+assert(node.loc.start > node.loc.end);
+
+
+babylon.parse(code, {
+  sourceType: "module", // default: "script"
+  plugins: ["jsx"] // default: []
+});
diff --git a/babylon/index.d.ts b/babylon/index.d.ts
new file mode 100644
index 0000000000..112e6be7be
--- /dev/null
+++ b/babylon/index.d.ts
@@ -0,0 +1,47 @@
+// Type definitions for babylon v6.7
+// Project: https://github.com/babel/babylon
+// Definitions by: Troy Gerwien <https://github.com/yortus>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="babel-types" />
+
+import * as t from 'babel-types';
+type Node = t.Node;
+
+export function parse(code: string, opts?: BabylonOptions): Node;
+
+export interface BabylonOptions {
+    /**
+     * By default, import and export declarations can only appear at a program's top level.
+     * Setting this option to true allows them anywhere where a statement is allowed.
+     */
+    allowImportExportEverywhere?: boolean;
+
+    /**
+     * By default, a return statement at the top level raises an error. Set this to true to accept such code.
+     */
+    allowReturnOutsideFunction?: boolean;
+
+    allowSuperOutsideMethod?: boolean;
+
+    /**
+     * Indicate the mode the code should be parsed in. Can be either "script" or "module".
+     */
+    sourceType?: 'script' | 'module';
+
+    /**
+     * Correlate output AST nodes with their source filename. Useful when
+     * generating code and source maps from the ASTs of multiple input files.
+     */
+    sourceFilename?: string;
+
+    /**
+     * Array containing the plugins that you want to enable.
+     */
+    plugins?: PluginName[];
+}
+
+export type PluginName = 'jsx' | 'flow' | 'asyncFunctions' | 'classConstructorCall' | 'doExpressions'
+    | 'trailingFunctionCommas' | 'objectRestSpread' | 'decorators' | 'classProperties' | 'exportExtensions'
+    | 'exponentiationOperator' | 'asyncGenerators' | 'functionBind' | 'functionSent';
+
diff --git a/babylon/tsconfig.json b/babylon/tsconfig.json
new file mode 100644
index 0000000000..c4a777d01c
--- /dev/null
+++ b/babylon/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "babylon-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/babylonjs/babylon-tests.ts b/babylonjs/babylon-tests.ts
index 142d3840f5..8b13789179 100644
--- a/babylonjs/babylon-tests.ts
+++ b/babylonjs/babylon-tests.ts
@@ -1 +1 @@
-/// <reference path="babylon.d.ts" />
+
diff --git a/babylonjs/babylon.d.ts b/babylonjs/babylon.d.ts
deleted file mode 100644
index 7e129ee4a7..0000000000
--- a/babylonjs/babylon.d.ts
+++ /dev/null
@@ -1,7260 +0,0 @@
-// Type definitions for BabylonJS v2.3
-// Project: http://www.babylonjs.com/
-// Definitions by: David Catuhe <https://github.com/deltakosh/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace BABYLON {
-    class _DepthCullingState {
-        private _isDepthTestDirty;
-        private _isDepthMaskDirty;
-        private _isDepthFuncDirty;
-        private _isCullFaceDirty;
-        private _isCullDirty;
-        private _isZOffsetDirty;
-        private _depthTest;
-        private _depthMask;
-        private _depthFunc;
-        private _cull;
-        private _cullFace;
-        private _zOffset;
-        isDirty: boolean;
-        zOffset: number;
-        cullFace: number;
-        cull: boolean;
-        depthFunc: number;
-        depthMask: boolean;
-        depthTest: boolean;
-        reset(): void;
-        apply(gl: WebGLRenderingContext): void;
-    }
-    class _AlphaState {
-        private _isAlphaBlendDirty;
-        private _isBlendFunctionParametersDirty;
-        private _alphaBlend;
-        private _blendFunctionParameters;
-        isDirty: boolean;
-        alphaBlend: boolean;
-        setAlphaBlendFunctionParameters(value0: number, value1: number, value2: number, value3: number): void;
-        reset(): void;
-        apply(gl: WebGLRenderingContext): void;
-    }
-    class EngineCapabilities {
-        maxTexturesImageUnits: number;
-        maxTextureSize: number;
-        maxCubemapTextureSize: number;
-        maxRenderTextureSize: number;
-        standardDerivatives: boolean;
-        s3tc: any;
-        textureFloat: boolean;
-        textureAnisotropicFilterExtension: any;
-        maxAnisotropy: number;
-        instancedArrays: any;
-        uintIndices: boolean;
-        highPrecisionShaderSupported: boolean;
-        fragmentDepthSupported: boolean;
-        drawBuffersExtension: any;
-    }
-    /**
-     * The engine class is responsible for interfacing with all lower-level APIs such as WebGL and Audio.
-     */
-    class Engine {
-        private static _ALPHA_DISABLE;
-        private static _ALPHA_ADD;
-        private static _ALPHA_COMBINE;
-        private static _ALPHA_SUBTRACT;
-        private static _ALPHA_MULTIPLY;
-        private static _ALPHA_MAXIMIZED;
-        private static _ALPHA_ONEONE;
-        private static _DELAYLOADSTATE_NONE;
-        private static _DELAYLOADSTATE_LOADED;
-        private static _DELAYLOADSTATE_LOADING;
-        private static _DELAYLOADSTATE_NOTLOADED;
-        private static _TEXTUREFORMAT_ALPHA;
-        private static _TEXTUREFORMAT_LUMINANCE;
-        private static _TEXTUREFORMAT_LUMINANCE_ALPHA;
-        private static _TEXTUREFORMAT_RGB;
-        private static _TEXTUREFORMAT_RGBA;
-        private static _TEXTURETYPE_UNSIGNED_INT;
-        private static _TEXTURETYPE_FLOAT;
-        static ALPHA_DISABLE: number;
-        static ALPHA_ONEONE: number;
-        static ALPHA_ADD: number;
-        static ALPHA_COMBINE: number;
-        static ALPHA_SUBTRACT: number;
-        static ALPHA_MULTIPLY: number;
-        static ALPHA_MAXIMIZED: number;
-        static DELAYLOADSTATE_NONE: number;
-        static DELAYLOADSTATE_LOADED: number;
-        static DELAYLOADSTATE_LOADING: number;
-        static DELAYLOADSTATE_NOTLOADED: number;
-        static TEXTUREFORMAT_ALPHA: number;
-        static TEXTUREFORMAT_LUMINANCE: number;
-        static TEXTUREFORMAT_LUMINANCE_ALPHA: number;
-        static TEXTUREFORMAT_RGB: number;
-        static TEXTUREFORMAT_RGBA: number;
-        static TEXTURETYPE_UNSIGNED_INT: number;
-        static TEXTURETYPE_FLOAT: number;
-        static Version: string;
-        static Epsilon: number;
-        static CollisionsEpsilon: number;
-        static CodeRepository: string;
-        static ShadersRepository: string;
-        isFullscreen: boolean;
-        isPointerLock: boolean;
-        cullBackFaces: boolean;
-        renderEvenInBackground: boolean;
-        enableOfflineSupport: boolean;
-        scenes: Scene[];
-        _gl: WebGLRenderingContext;
-        private _renderingCanvas;
-        private _windowIsBackground;
-        private _webGLVersion;
-        static audioEngine: AudioEngine;
-        private _onBlur;
-        private _onFocus;
-        private _onFullscreenChange;
-        private _onPointerLockChange;
-        private _hardwareScalingLevel;
-        private _caps;
-        private _pointerLockRequested;
-        private _alphaTest;
-        private _loadingScreen;
-        private _drawCalls;
-        private _glVersion;
-        private _glRenderer;
-        private _glVendor;
-        private _videoTextureSupported;
-        private _renderingQueueLaunched;
-        private _activeRenderLoops;
-        private fpsRange;
-        private previousFramesDuration;
-        private fps;
-        private deltaTime;
-        private _depthCullingState;
-        private _alphaState;
-        private _alphaMode;
-        private _loadedTexturesCache;
-        private _maxTextureChannels;
-        private _activeTexturesCache;
-        private _currentEffect;
-        private _compiledEffects;
-        private _vertexAttribArrays;
-        private _cachedViewport;
-        private _cachedVertexBuffers;
-        private _cachedIndexBuffer;
-        private _cachedEffectForVertexBuffers;
-        private _currentRenderTarget;
-        private _uintIndicesCurrentlySet;
-        private _workingCanvas;
-        private _workingContext;
-        private _bindedRenderFunction;
-        /**
-         * @constructor
-         * @param {HTMLCanvasElement} canvas - the canvas to be used for rendering
-         * @param {boolean} [antialias] - enable antialias
-         * @param options - further options to be sent to the getContext function
-         */
-        constructor(canvas: HTMLCanvasElement, antialias?: boolean, options?: {
-            antialias?: boolean;
-            preserveDrawingBuffer?: boolean;
-        }, adaptToDeviceRatio?: boolean);
-        webGLVersion: string;
-        private _prepareWorkingCanvas();
-        resetTextureCache(): void;
-        getGlInfo(): {
-            vendor: string;
-            renderer: string;
-            version: string;
-        };
-        getAspectRatio(camera: Camera, useScreen?: boolean): number;
-        getRenderWidth(useScreen?: boolean): number;
-        getRenderHeight(useScreen?: boolean): number;
-        getRenderingCanvas(): HTMLCanvasElement;
-        getRenderingCanvasClientRect(): ClientRect;
-        setHardwareScalingLevel(level: number): void;
-        getHardwareScalingLevel(): number;
-        getLoadedTexturesCache(): WebGLTexture[];
-        getCaps(): EngineCapabilities;
-        drawCalls: number;
-        resetDrawCalls(): void;
-        setDepthFunctionToGreater(): void;
-        setDepthFunctionToGreaterOrEqual(): void;
-        setDepthFunctionToLess(): void;
-        setDepthFunctionToLessOrEqual(): void;
-        /**
-         * stop executing a render loop function and remove it from the execution array
-         * @param {Function} [renderFunction] the function to be removed. If not provided all functions will be removed.
-         */
-        stopRenderLoop(renderFunction?: () => void): void;
-        _renderLoop(): void;
-        /**
-         * Register and execute a render loop. The engine can have more than one render function.
-         * @param {Function} renderFunction - the function to continuesly execute starting the next render loop.
-         * @example
-         * engine.runRenderLoop(function () {
-         *      scene.render()
-         * })
-         */
-        runRenderLoop(renderFunction: () => void): void;
-        /**
-         * Toggle full screen mode.
-         * @param {boolean} requestPointerLock - should a pointer lock be requested from the user
-         */
-        switchFullscreen(requestPointerLock: boolean): void;
-        clear(color: any, backBuffer: boolean, depthStencil: boolean): void;
-        /**
-         * Set the WebGL's viewport
-         * @param {BABYLON.Viewport} viewport - the viewport element to be used.
-         * @param {number} [requiredWidth] - the width required for rendering. If not provided the rendering canvas' width is used.
-         * @param {number} [requiredHeight] - the height required for rendering. If not provided the rendering canvas' height is used.
-         */
-        setViewport(viewport: Viewport, requiredWidth?: number, requiredHeight?: number): void;
-        setDirectViewport(x: number, y: number, width: number, height: number): void;
-        beginFrame(): void;
-        endFrame(): void;
-        /**
-         * resize the view according to the canvas' size.
-         * @example
-         *   window.addEventListener("resize", function () {
-         *      engine.resize();
-         *   });
-         */
-        resize(): void;
-        /**
-         * force a specific size of the canvas
-         * @param {number} width - the new canvas' width
-         * @param {number} height - the new canvas' height
-         */
-        setSize(width: number, height: number): void;
-        bindFramebuffer(texture: WebGLTexture, faceIndex?: number): void;
-        unBindFramebuffer(texture: WebGLTexture, disableGenerateMipMaps?: boolean): void;
-        generateMipMapsForCubemap(texture: WebGLTexture): void;
-        flushFramebuffer(): void;
-        restoreDefaultFramebuffer(): void;
-        private _resetVertexBufferBinding();
-        createVertexBuffer(vertices: number[] | Float32Array): WebGLBuffer;
-        createDynamicVertexBuffer(capacity: number): WebGLBuffer;
-        updateDynamicVertexBuffer(vertexBuffer: WebGLBuffer, vertices: number[] | Float32Array, offset?: number): void;
-        private _resetIndexBufferBinding();
-        createIndexBuffer(indices: number[] | Int32Array): WebGLBuffer;
-        bindBuffers(vertexBuffer: WebGLBuffer, indexBuffer: WebGLBuffer, vertexDeclaration: number[], vertexStrideSize: number, effect: Effect): void;
-        bindMultiBuffers(vertexBuffers: VertexBuffer[], indexBuffer: WebGLBuffer, effect: Effect): void;
-        _releaseBuffer(buffer: WebGLBuffer): boolean;
-        createInstancesBuffer(capacity: number): WebGLBuffer;
-        deleteInstancesBuffer(buffer: WebGLBuffer): void;
-        updateAndBindInstancesBuffer(instancesBuffer: WebGLBuffer, data: Float32Array, offsetLocations: number[]): void;
-        unBindInstancesBuffer(instancesBuffer: WebGLBuffer, offsetLocations: number[]): void;
-        applyStates(): void;
-        draw(useTriangles: boolean, indexStart: number, indexCount: number, instancesCount?: number): void;
-        drawPointClouds(verticesStart: number, verticesCount: number, instancesCount?: number): void;
-        drawUnIndexed(useTriangles: boolean, verticesStart: number, verticesCount: number, instancesCount?: number): void;
-        _releaseEffect(effect: Effect): void;
-        createEffect(baseName: any, attributesNames: string[], uniformsNames: string[], samplers: string[], defines: string, fallbacks?: EffectFallbacks, onCompiled?: (effect: Effect) => void, onError?: (effect: Effect, errors: string) => void): Effect;
-        createEffectForParticles(fragmentName: string, uniformsNames?: string[], samplers?: string[], defines?: string, fallbacks?: EffectFallbacks, onCompiled?: (effect: Effect) => void, onError?: (effect: Effect, errors: string) => void): Effect;
-        createShaderProgram(vertexCode: string, fragmentCode: string, defines: string): WebGLProgram;
-        getUniforms(shaderProgram: WebGLProgram, uniformsNames: string[]): WebGLUniformLocation[];
-        getAttributes(shaderProgram: WebGLProgram, attributesNames: string[]): number[];
-        enableEffect(effect: Effect): void;
-        setArray(uniform: WebGLUniformLocation, array: number[]): void;
-        setArray2(uniform: WebGLUniformLocation, array: number[]): void;
-        setArray3(uniform: WebGLUniformLocation, array: number[]): void;
-        setArray4(uniform: WebGLUniformLocation, array: number[]): void;
-        setMatrices(uniform: WebGLUniformLocation, matrices: Float32Array): void;
-        setMatrix(uniform: WebGLUniformLocation, matrix: Matrix): void;
-        setMatrix3x3(uniform: WebGLUniformLocation, matrix: Float32Array): void;
-        setMatrix2x2(uniform: WebGLUniformLocation, matrix: Float32Array): void;
-        setFloat(uniform: WebGLUniformLocation, value: number): void;
-        setFloat2(uniform: WebGLUniformLocation, x: number, y: number): void;
-        setFloat3(uniform: WebGLUniformLocation, x: number, y: number, z: number): void;
-        setBool(uniform: WebGLUniformLocation, bool: number): void;
-        setFloat4(uniform: WebGLUniformLocation, x: number, y: number, z: number, w: number): void;
-        setColor3(uniform: WebGLUniformLocation, color3: Color3): void;
-        setColor4(uniform: WebGLUniformLocation, color3: Color3, alpha: number): void;
-        setState(culling: boolean, zOffset?: number, force?: boolean, reverseSide?: boolean): void;
-        setDepthBuffer(enable: boolean): void;
-        getDepthWrite(): boolean;
-        setDepthWrite(enable: boolean): void;
-        setColorWrite(enable: boolean): void;
-        setAlphaMode(mode: number): void;
-        getAlphaMode(): number;
-        setAlphaTesting(enable: boolean): void;
-        getAlphaTesting(): boolean;
-        wipeCaches(): void;
-        setSamplingMode(texture: WebGLTexture, samplingMode: number): void;
-        createTexture(url: string, noMipmap: boolean, invertY: boolean, scene: Scene, samplingMode?: number, onLoad?: () => void, onError?: () => void, buffer?: any): WebGLTexture;
-        updateRawTexture(texture: WebGLTexture, data: ArrayBufferView, format: number, invertY: boolean, compression?: string): void;
-        createRawTexture(data: ArrayBufferView, width: number, height: number, format: number, generateMipMaps: boolean, invertY: boolean, samplingMode: number, compression?: string): WebGLTexture;
-        createDynamicTexture(width: number, height: number, generateMipMaps: boolean, samplingMode: number, forceExponantOfTwo?: boolean): WebGLTexture;
-        updateTextureSamplingMode(samplingMode: number, texture: WebGLTexture): void;
-        updateDynamicTexture(texture: WebGLTexture, canvas: HTMLCanvasElement, invertY: boolean): void;
-        updateVideoTexture(texture: WebGLTexture, video: HTMLVideoElement, invertY: boolean): void;
-        createRenderTargetTexture(size: any, options: any): WebGLTexture;
-        createRenderTargetCubeTexture(size: number, options?: any): WebGLTexture;
-        createCubeTexture(rootUrl: string, scene: Scene, files: string[], noMipmap?: boolean): WebGLTexture;
-        _releaseTexture(texture: WebGLTexture): void;
-        bindSamplers(effect: Effect): void;
-        _bindTexture(channel: number, texture: WebGLTexture): void;
-        setTextureFromPostProcess(channel: number, postProcess: PostProcess): void;
-        unbindAllTextures(): void;
-        setTexture(channel: number, texture: BaseTexture): void;
-        _setAnisotropicLevel(key: number, texture: BaseTexture): void;
-        readPixels(x: number, y: number, width: number, height: number): Uint8Array;
-        releaseInternalTexture(texture: WebGLTexture): void;
-        dispose(): void;
-        displayLoadingUI(): void;
-        hideLoadingUI(): void;
-        loadingScreen: ILoadingScreen;
-        loadingUIText: string;
-        loadingUIBackgroundColor: string;
-        getFps(): number;
-        getDeltaTime(): number;
-        private _measureFps();
-        static isSupported(): boolean;
-    }
-}
-
-interface Window {
-    mozIndexedDB(func: any): any;
-    webkitIndexedDB(func: any): any;
-    IDBTransaction(func: any): any;
-    webkitIDBTransaction(func: any): any;
-    msIDBTransaction(func: any): any;
-    IDBKeyRange(func: any): any;
-    webkitIDBKeyRange(func: any): any;
-    msIDBKeyRange(func: any): any;
-    webkitURL: HTMLURL;
-    webkitRequestAnimationFrame(func: any): any;
-    mozRequestAnimationFrame(func: any): any;
-    oRequestAnimationFrame(func: any): any;
-    WebGLRenderingContext: WebGLRenderingContext;
-    MSGesture: MSGesture;
-    CANNON: any;
-    SIMD: any;
-    AudioContext: AudioContext;
-    webkitAudioContext: AudioContext;
-    PointerEvent: any;
-}
-interface HTMLURL {
-    createObjectURL(param1: any, param2?: any): any;
-}
-interface Document {
-    exitFullscreen(): void;
-    webkitCancelFullScreen(): void;
-    mozCancelFullScreen(): void;
-    msCancelFullScreen(): void;
-    mozFullScreen: boolean;
-    msIsFullScreen: boolean;
-    fullscreen: boolean;
-    mozPointerLockElement: HTMLElement;
-    msPointerLockElement: HTMLElement;
-    webkitPointerLockElement: HTMLElement;
-}
-interface HTMLCanvasElement {
-    requestPointerLock(): void;
-    msRequestPointerLock(): void;
-    mozRequestPointerLock(): void;
-    webkitRequestPointerLock(): void;
-}
-interface CanvasRenderingContext2D {
-    imageSmoothingEnabled: boolean;
-    mozImageSmoothingEnabled: boolean;
-    oImageSmoothingEnabled: boolean;
-    webkitImageSmoothingEnabled: boolean;
-}
-interface WebGLTexture {
-    isReady: boolean;
-    isCube: boolean;
-    url: string;
-    noMipmap: boolean;
-    samplingMode: number;
-    references: number;
-    generateMipMaps: boolean;
-    _size: number;
-    _baseWidth: number;
-    _baseHeight: number;
-    _width: number;
-    _height: number;
-    _workingCanvas: HTMLCanvasElement;
-    _workingContext: CanvasRenderingContext2D;
-    _framebuffer: WebGLFramebuffer;
-    _depthBuffer: WebGLRenderbuffer;
-    _cachedCoordinatesMode: number;
-    _cachedWrapU: number;
-    _cachedWrapV: number;
-    _isDisabled: boolean;
-}
-interface WebGLBuffer {
-    references: number;
-    capacity: number;
-    is32Bits: boolean;
-}
-interface MouseEvent {
-    mozMovementX: number;
-    mozMovementY: number;
-    webkitMovementX: number;
-    webkitMovementY: number;
-    msMovementX: number;
-    msMovementY: number;
-}
-interface MSStyleCSSProperties {
-    webkitTransform: string;
-    webkitTransition: string;
-}
-interface Navigator {
-    getVRDevices: () => any;
-    mozGetVRDevices: (any: any) => any;
-    isCocoonJS: boolean;
-}
-interface Screen {
-    orientation: string;
-    mozOrientation: string;
-}
-interface HTMLMediaElement {
-    crossOrigin: string;
-}
-
-declare namespace BABYLON {
-    /**
-     * Node is the basic class for all scene objects (Mesh, Light Camera).
-     */
-    class Node {
-        parent: Node;
-        name: string;
-        id: string;
-        uniqueId: number;
-        state: string;
-        animations: Animation[];
-        private _ranges;
-        onReady: (node: Node) => void;
-        private _childrenFlag;
-        private _isEnabled;
-        private _isReady;
-        _currentRenderId: number;
-        private _parentRenderId;
-        _waitingParentId: string;
-        private _scene;
-        _cache: any;
-        /**
-         * @constructor
-         * @param {string} name - the name and id to be given to this node
-         * @param {BABYLON.Scene} the scene this node will be added to
-         */
-        constructor(name: string, scene: Scene);
-        getScene(): Scene;
-        getEngine(): Engine;
-        getWorldMatrix(): Matrix;
-        _initCache(): void;
-        updateCache(force?: boolean): void;
-        _updateCache(ignoreParentClass?: boolean): void;
-        _isSynchronized(): boolean;
-        _markSyncedWithParent(): void;
-        isSynchronizedWithParent(): boolean;
-        isSynchronized(updateCache?: boolean): boolean;
-        hasNewParent(update?: boolean): boolean;
-        /**
-         * Is this node ready to be used/rendered
-         * @return {boolean} is it ready
-         */
-        isReady(): boolean;
-        /**
-         * Is this node enabled.
-         * If the node has a parent and is enabled, the parent will be inspected as well.
-         * @return {boolean} whether this node (and its parent) is enabled.
-         * @see setEnabled
-         */
-        isEnabled(): boolean;
-        /**
-         * Set the enabled state of this node.
-         * @param {boolean} value - the new enabled state
-         * @see isEnabled
-         */
-        setEnabled(value: boolean): void;
-        /**
-         * Is this node a descendant of the given node.
-         * The function will iterate up the hierarchy until the ancestor was found or no more parents defined.
-         * @param {BABYLON.Node} ancestor - The parent node to inspect
-         * @see parent
-         */
-        isDescendantOf(ancestor: Node): boolean;
-        _getDescendants(list: Node[], results: Node[]): void;
-        /**
-         * Will return all nodes that have this node as parent.
-         * @return {BABYLON.Node[]} all children nodes of all types.
-         */
-        getDescendants(): Node[];
-        _setReady(state: boolean): void;
-        getAnimationByName(name: string): Animation;
-        createAnimationRange(name: string, from: number, to: number): void;
-        deleteAnimationRange(name: string, deleteFrames?: boolean): void;
-        getAnimationRange(name: string): AnimationRange;
-        beginAnimation(name: string, loop?: boolean, speedRatio?: number, onAnimationEnd?: () => void): void;
-        serializeAnimationRanges(): any;
-        static ParseAnimationRanges(node: Node, parsedNode: any, scene: Scene): void;
-    }
-}
-
-declare namespace BABYLON {
-    interface IDisposable {
-        dispose(): void;
-    }
-    /**
-     * Represents a scene to be rendered by the engine.
-     * @see http://doc.babylonjs.com/page.php?p=21911
-     */
-    class Scene {
-        private static _FOGMODE_NONE;
-        private static _FOGMODE_EXP;
-        private static _FOGMODE_EXP2;
-        private static _FOGMODE_LINEAR;
-        static MinDeltaTime: number;
-        static MaxDeltaTime: number;
-        static FOGMODE_NONE: number;
-        static FOGMODE_EXP: number;
-        static FOGMODE_EXP2: number;
-        static FOGMODE_LINEAR: number;
-        autoClear: boolean;
-        clearColor: any;
-        ambientColor: Color3;
-        /**
-        * A function to be executed before rendering this scene
-        * @type {Function}
-        */
-        beforeRender: () => void;
-        /**
-        * A function to be executed after rendering this scene
-        * @type {Function}
-        */
-        afterRender: () => void;
-        /**
-        * A function to be executed when this scene is disposed.
-        * @type {Function}
-        */
-        onDispose: () => void;
-        beforeCameraRender: (camera: Camera) => void;
-        afterCameraRender: (camera: Camera) => void;
-        forceWireframe: boolean;
-        forcePointsCloud: boolean;
-        forceShowBoundingBoxes: boolean;
-        clipPlane: Plane;
-        animationsEnabled: boolean;
-        constantlyUpdateMeshUnderPointer: boolean;
-        private _onPointerMove;
-        private _onPointerDown;
-        private _onPointerUp;
-        onPointerMove: (evt: PointerEvent, pickInfo: PickingInfo) => void;
-        onPointerDown: (evt: PointerEvent, pickInfo: PickingInfo) => void;
-        onPointerUp: (evt: PointerEvent, pickInfo: PickingInfo) => void;
-        onPointerPick: (evt: PointerEvent, pickInfo: PickingInfo) => void;
-        cameraToUseForPointers: Camera;
-        private _pointerX;
-        private _pointerY;
-        private _meshUnderPointer;
-        private _startingPointerPosition;
-        private _startingPointerTime;
-        _mirroredCameraPosition: Vector3;
-        private _onKeyDown;
-        private _onKeyUp;
-        /**
-        * is fog enabled on this scene.
-        * @type {boolean}
-        */
-        fogEnabled: boolean;
-        fogMode: number;
-        fogColor: Color3;
-        fogDensity: number;
-        fogStart: number;
-        fogEnd: number;
-        /**
-        * is shadow enabled on this scene.
-        * @type {boolean}
-        */
-        shadowsEnabled: boolean;
-        /**
-        * is light enabled on this scene.
-        * @type {boolean}
-        */
-        lightsEnabled: boolean;
-        /**
-        * All of the lights added to this scene.
-        * @see BABYLON.Light
-        * @type {BABYLON.Light[]}
-        */
-        lights: Light[];
-        onNewLightAdded: (newLight?: Light, positionInArray?: number, scene?: Scene) => void;
-        onLightRemoved: (removedLight?: Light) => void;
-        /**
-        * All of the cameras added to this scene.
-        * @see BABYLON.Camera
-        * @type {BABYLON.Camera[]}
-        */
-        cameras: Camera[];
-        onNewCameraAdded: (newCamera?: Camera, positionInArray?: number, scene?: Scene) => void;
-        onCameraRemoved: (removedCamera?: Camera) => void;
-        activeCameras: Camera[];
-        activeCamera: Camera;
-        /**
-        * All of the (abstract) meshes added to this scene.
-        * @see BABYLON.AbstractMesh
-        * @type {BABYLON.AbstractMesh[]}
-        */
-        meshes: AbstractMesh[];
-        onNewMeshAdded: (newMesh?: AbstractMesh, positionInArray?: number, scene?: Scene) => void;
-        onMeshRemoved: (removedMesh?: AbstractMesh) => void;
-        private _geometries;
-        onGeometryAdded: (newGeometry?: Geometry) => void;
-        onGeometryRemoved: (removedGeometry?: Geometry) => void;
-        materials: Material[];
-        multiMaterials: MultiMaterial[];
-        defaultMaterial: StandardMaterial;
-        texturesEnabled: boolean;
-        textures: BaseTexture[];
-        particlesEnabled: boolean;
-        particleSystems: ParticleSystem[];
-        spritesEnabled: boolean;
-        spriteManagers: SpriteManager[];
-        layers: Layer[];
-        skeletonsEnabled: boolean;
-        skeletons: Skeleton[];
-        lensFlaresEnabled: boolean;
-        lensFlareSystems: LensFlareSystem[];
-        collisionsEnabled: boolean;
-        private _workerCollisions;
-        collisionCoordinator: ICollisionCoordinator;
-        gravity: Vector3;
-        postProcessesEnabled: boolean;
-        postProcessManager: PostProcessManager;
-        postProcessRenderPipelineManager: PostProcessRenderPipelineManager;
-        renderTargetsEnabled: boolean;
-        dumpNextRenderTargets: boolean;
-        customRenderTargets: RenderTargetTexture[];
-        useDelayedTextureLoading: boolean;
-        importedMeshesFiles: String[];
-        probesEnabled: boolean;
-        reflectionProbes: ReflectionProbe[];
-        database: any;
-        /**
-         * This scene's action manager
-         * @type {BABYLON.ActionManager}
-         */
-        actionManager: ActionManager;
-        _actionManagers: ActionManager[];
-        private _meshesForIntersections;
-        proceduralTexturesEnabled: boolean;
-        _proceduralTextures: ProceduralTexture[];
-        mainSoundTrack: SoundTrack;
-        soundTracks: SoundTrack[];
-        private _audioEnabled;
-        private _headphone;
-        simplificationQueue: SimplificationQueue;
-        private _engine;
-        private _totalVertices;
-        _activeIndices: number;
-        _activeParticles: number;
-        private _lastFrameDuration;
-        private _evaluateActiveMeshesDuration;
-        private _renderTargetsDuration;
-        _particlesDuration: number;
-        private _renderDuration;
-        _spritesDuration: number;
-        private _animationRatio;
-        private _animationStartDate;
-        _cachedMaterial: Material;
-        private _renderId;
-        private _executeWhenReadyTimeoutId;
-        _toBeDisposed: SmartArray<IDisposable>;
-        private _onReadyCallbacks;
-        private _pendingData;
-        private _onBeforeRenderCallbacks;
-        private _onAfterRenderCallbacks;
-        private _activeMeshes;
-        private _processedMaterials;
-        private _renderTargets;
-        _activeParticleSystems: SmartArray<ParticleSystem>;
-        private _activeSkeletons;
-        private _softwareSkinnedMeshes;
-        _activeBones: number;
-        private _renderingManager;
-        private _physicsEngine;
-        _activeAnimatables: Animatable[];
-        private _transformMatrix;
-        private _pickWithRayInverseMatrix;
-        private _edgesRenderers;
-        private _boundingBoxRenderer;
-        private _outlineRenderer;
-        private _viewMatrix;
-        private _projectionMatrix;
-        private _frustumPlanes;
-        private _selectionOctree;
-        private _pointerOverMesh;
-        private _debugLayer;
-        private _depthRenderer;
-        private _uniqueIdCounter;
-        private _pickedMeshName;
-        /**
-         * @constructor
-         * @param {BABYLON.Engine} engine - the engine to be used to render this scene.
-         */
-        constructor(engine: Engine);
-        debugLayer: DebugLayer;
-        workerCollisions: boolean;
-        SelectionOctree: Octree<AbstractMesh>;
-        /**
-         * The mesh that is currently under the pointer.
-         * @return {BABYLON.AbstractMesh} mesh under the pointer/mouse cursor or null if none.
-         */
-        meshUnderPointer: AbstractMesh;
-        /**
-         * Current on-screen X position of the pointer
-         * @return {number} X position of the pointer
-         */
-        pointerX: number;
-        /**
-         * Current on-screen Y position of the pointer
-         * @return {number} Y position of the pointer
-         */
-        pointerY: number;
-        getCachedMaterial(): Material;
-        getBoundingBoxRenderer(): BoundingBoxRenderer;
-        getOutlineRenderer(): OutlineRenderer;
-        getEngine(): Engine;
-        getTotalVertices(): number;
-        getActiveIndices(): number;
-        getActiveParticles(): number;
-        getActiveBones(): number;
-        getLastFrameDuration(): number;
-        getEvaluateActiveMeshesDuration(): number;
-        getActiveMeshes(): SmartArray<Mesh>;
-        getRenderTargetsDuration(): number;
-        getRenderDuration(): number;
-        getParticlesDuration(): number;
-        getSpritesDuration(): number;
-        getAnimationRatio(): number;
-        getRenderId(): number;
-        incrementRenderId(): void;
-        private _updatePointerPosition(evt);
-        attachControl(): void;
-        detachControl(): void;
-        isReady(): boolean;
-        resetCachedMaterial(): void;
-        registerBeforeRender(func: () => void): void;
-        unregisterBeforeRender(func: () => void): void;
-        registerAfterRender(func: () => void): void;
-        unregisterAfterRender(func: () => void): void;
-        _addPendingData(data: any): void;
-        _removePendingData(data: any): void;
-        getWaitingItemsCount(): number;
-        /**
-         * Registers a function to be executed when the scene is ready.
-         * @param {Function} func - the function to be executed.
-         */
-        executeWhenReady(func: () => void): void;
-        _checkIsReady(): void;
-        /**
-         * Will start the animation sequence of a given target
-         * @param target - the target
-         * @param {number} from - from which frame should animation start
-         * @param {number} to - till which frame should animation run.
-         * @param {boolean} [loop] - should the animation loop
-         * @param {number} [speedRatio] - the speed in which to run the animation
-         * @param {Function} [onAnimationEnd] function to be executed when the animation ended.
-         * @param {BABYLON.Animatable} [animatable] an animatable object. If not provided a new one will be created from the given params.
-         * @return {BABYLON.Animatable} the animatable object created for this animation
-         * @see BABYLON.Animatable
-         * @see http://doc.babylonjs.com/page.php?p=22081
-         */
-        beginAnimation(target: any, from: number, to: number, loop?: boolean, speedRatio?: number, onAnimationEnd?: () => void, animatable?: Animatable): Animatable;
-        beginDirectAnimation(target: any, animations: Animation[], from: number, to: number, loop?: boolean, speedRatio?: number, onAnimationEnd?: () => void): Animatable;
-        getAnimatableByTarget(target: any): Animatable;
-        Animatables: Animatable[];
-        /**
-         * Will stop the animation of the given target
-         * @param target - the target
-         * @see beginAnimation
-         */
-        stopAnimation(target: any): void;
-        private _animate();
-        getViewMatrix(): Matrix;
-        getProjectionMatrix(): Matrix;
-        getTransformMatrix(): Matrix;
-        setTransformMatrix(view: Matrix, projection: Matrix): void;
-        addMesh(newMesh: AbstractMesh): void;
-        removeMesh(toRemove: AbstractMesh): number;
-        removeSkeleton(toRemove: Skeleton): number;
-        removeLight(toRemove: Light): number;
-        removeCamera(toRemove: Camera): number;
-        addLight(newLight: Light): void;
-        addCamera(newCamera: Camera): void;
-        /**
-         * Switch active camera
-         * @param {Camera} newCamera - new active camera
-         * @param {boolean} attachControl - call attachControl for the new active camera (default: true)
-         */
-        swithActiveCamera(newCamera: Camera, attachControl?: boolean): void;
-        /**
-         * sets the active camera of the scene using its ID
-         * @param {string} id - the camera's ID
-         * @return {BABYLON.Camera|null} the new active camera or null if none found.
-         * @see activeCamera
-         */
-        setActiveCameraByID(id: string): Camera;
-        /**
-         * sets the active camera of the scene using its name
-         * @param {string} name - the camera's name
-         * @return {BABYLON.Camera|null} the new active camera or null if none found.
-         * @see activeCamera
-         */
-        setActiveCameraByName(name: string): Camera;
-        /**
-         * get a material using its id
-         * @param {string} the material's ID
-         * @return {BABYLON.Material|null} the material or null if none found.
-         */
-        getMaterialByID(id: string): Material;
-        /**
-         * get a material using its name
-         * @param {string} the material's name
-         * @return {BABYLON.Material|null} the material or null if none found.
-         */
-        getMaterialByName(name: string): Material;
-        getLensFlareSystemByName(name: string): LensFlareSystem;
-        getCameraByID(id: string): Camera;
-        getCameraByUniqueID(uniqueId: number): Camera;
-        /**
-         * get a camera using its name
-         * @param {string} the camera's name
-         * @return {BABYLON.Camera|null} the camera or null if none found.
-         */
-        getCameraByName(name: string): Camera;
-        /**
-         * get a bone using its id
-         * @param {string} the bone's id
-         * @return {BABYLON.Bone|null} the bone or null if not found
-         */
-        getBoneByID(id: string): Bone;
-        /**
-        * get a bone using its id
-        * @param {string} the bone's name
-        * @return {BABYLON.Bone|null} the bone or null if not found
-        */
-        getBoneByName(name: string): Bone;
-        /**
-         * get a light node using its name
-         * @param {string} the light's name
-         * @return {BABYLON.Light|null} the light or null if none found.
-         */
-        getLightByName(name: string): Light;
-        /**
-         * get a light node using its ID
-         * @param {string} the light's id
-         * @return {BABYLON.Light|null} the light or null if none found.
-         */
-        getLightByID(id: string): Light;
-        /**
-         * get a light node using its scene-generated unique ID
-         * @param {number} the light's unique id
-         * @return {BABYLON.Light|null} the light or null if none found.
-         */
-        getLightByUniqueID(uniqueId: number): Light;
-        /**
-         * get a particle system by id
-         * @param id {number} the particle system id
-         * @return {BABYLON.ParticleSystem|null} the corresponding system or null if none found.
-         */
-        getParticleSystemByID(id: string): ParticleSystem;
-        /**
-         * get a geometry using its ID
-         * @param {string} the geometry's id
-         * @return {BABYLON.Geometry|null} the geometry or null if none found.
-         */
-        getGeometryByID(id: string): Geometry;
-        /**
-         * add a new geometry to this scene.
-         * @param {BABYLON.Geometry} geometry - the geometry to be added to the scene.
-         * @param {boolean} [force] - force addition, even if a geometry with this ID already exists
-         * @return {boolean} was the geometry added or not
-         */
-        pushGeometry(geometry: Geometry, force?: boolean): boolean;
-        /**
-         * Removes an existing geometry
-         * @param {BABYLON.Geometry} geometry - the geometry to be removed from the scene.
-         * @return {boolean} was the geometry removed or not
-         */
-        removeGeometry(geometry: Geometry): boolean;
-        getGeometries(): Geometry[];
-        /**
-         * Get the first added mesh found of a given ID
-         * @param {string} id - the id to search for
-         * @return {BABYLON.AbstractMesh|null} the mesh found or null if not found at all.
-         */
-        getMeshByID(id: string): AbstractMesh;
-        /**
-         * Get a mesh with its auto-generated unique id
-         * @param {number} uniqueId - the unique id to search for
-         * @return {BABYLON.AbstractMesh|null} the mesh found or null if not found at all.
-         */
-        getMeshByUniqueID(uniqueId: number): AbstractMesh;
-        /**
-         * Get a the last added mesh found of a given ID
-         * @param {string} id - the id to search for
-         * @return {BABYLON.AbstractMesh|null} the mesh found or null if not found at all.
-         */
-        getLastMeshByID(id: string): AbstractMesh;
-        /**
-         * Get a the last added node (Mesh, Camera, Light) found of a given ID
-         * @param {string} id - the id to search for
-         * @return {BABYLON.Node|null} the node found or null if not found at all.
-         */
-        getLastEntryByID(id: string): Node;
-        getNodeByID(id: string): Node;
-        getNodeByName(name: string): Node;
-        getMeshByName(name: string): AbstractMesh;
-        getSoundByName(name: string): Sound;
-        getLastSkeletonByID(id: string): Skeleton;
-        getSkeletonById(id: string): Skeleton;
-        getSkeletonByName(name: string): Skeleton;
-        isActiveMesh(mesh: Mesh): boolean;
-        private _evaluateSubMesh(subMesh, mesh);
-        private _evaluateActiveMeshes();
-        private _activeMesh(mesh);
-        updateTransformMatrix(force?: boolean): void;
-        private _renderForCamera(camera);
-        private _processSubCameras(camera);
-        private _checkIntersections();
-        render(): void;
-        private _updateAudioParameters();
-        audioEnabled: boolean;
-        private _disableAudio();
-        private _enableAudio();
-        headphone: boolean;
-        private _switchAudioModeForHeadphones();
-        private _switchAudioModeForNormalSpeakers();
-        enableDepthRenderer(): DepthRenderer;
-        disableDepthRenderer(): void;
-        freezeMaterials(): void;
-        unfreezeMaterials(): void;
-        dispose(): void;
-        disposeSounds(): void;
-        getWorldExtends(): {
-            min: Vector3;
-            max: Vector3;
-        };
-        createOrUpdateSelectionOctree(maxCapacity?: number, maxDepth?: number): Octree<AbstractMesh>;
-        createPickingRay(x: number, y: number, world: Matrix, camera: Camera, cameraViewSpace?: boolean): Ray;
-        createPickingRayInCameraSpace(x: number, y: number, camera: Camera): Ray;
-        private _internalPick(rayFunction, predicate, fastCheck?);
-        private _internalPickSprites(ray, predicate?, fastCheck?, camera?);
-        pick(x: number, y: number, predicate?: (mesh: AbstractMesh) => boolean, fastCheck?: boolean, camera?: Camera): PickingInfo;
-        pickSprite(x: number, y: number, predicate?: (sprite: Sprite) => boolean, fastCheck?: boolean, camera?: Camera): PickingInfo;
-        pickWithRay(ray: Ray, predicate: (mesh: Mesh) => boolean, fastCheck?: boolean): PickingInfo;
-        setPointerOverMesh(mesh: AbstractMesh): void;
-        getPointerOverMesh(): AbstractMesh;
-        getPhysicsEngine(): PhysicsEngine;
-        /**
-         * Enables physics to the current scene
-         * @param {BABYLON.Vector3} [gravity] - the scene's gravity for the physics engine
-         * @param {BABYLON.IPhysicsEnginePlugin} [plugin] - The physics engine to be used. defaults to OimoJS.
-         * @return {boolean} was the physics engine initialized
-         */
-        enablePhysics(gravity?: Vector3, plugin?: IPhysicsEnginePlugin): boolean;
-        disablePhysicsEngine(): void;
-        isPhysicsEnabled(): boolean;
-        /**
-         * Sets the gravity of the physics engine (and NOT of the scene)
-         * @param {BABYLON.Vector3} [gravity] - the new gravity to be used
-         */
-        setGravity(gravity: Vector3): void;
-        createCompoundImpostor(parts: any, options: PhysicsBodyCreationOptions): any;
-        deleteCompoundImpostor(compound: any): void;
-        createDefaultCameraOrLight(): void;
-        private _getByTags(list, tagsQuery, forEach?);
-        getMeshesByTags(tagsQuery: string, forEach?: (mesh: AbstractMesh) => void): Mesh[];
-        getCamerasByTags(tagsQuery: string, forEach?: (camera: Camera) => void): Camera[];
-        getLightsByTags(tagsQuery: string, forEach?: (light: Light) => void): Light[];
-        getMaterialByTags(tagsQuery: string, forEach?: (material: Material) => void): Material[];
-    }
-}
-
-declare namespace BABYLON {
-    class Action {
-        triggerOptions: any;
-        trigger: number;
-        _actionManager: ActionManager;
-        private _nextActiveAction;
-        private _child;
-        private _condition;
-        private _triggerParameter;
-        constructor(triggerOptions: any, condition?: Condition);
-        _prepare(): void;
-        getTriggerParameter(): any;
-        _executeCurrent(evt: ActionEvent): void;
-        execute(evt: ActionEvent): void;
-        skipToNextActiveAction(): void;
-        then(action: Action): Action;
-        _getProperty(propertyPath: string): string;
-        _getEffectiveTarget(target: any, propertyPath: string): any;
-    }
-}
-
-declare namespace BABYLON {
-    /**
-     * ActionEvent is the event beint sent when an action is triggered.
-     */
-    class ActionEvent {
-        source: any;
-        pointerX: number;
-        pointerY: number;
-        meshUnderPointer: AbstractMesh;
-        sourceEvent: any;
-        additionalData: any;
-        /**
-         * @constructor
-         * @param source The mesh or sprite that triggered the action.
-         * @param pointerX The X mouse cursor position at the time of the event
-         * @param pointerY The Y mouse cursor position at the time of the event
-         * @param meshUnderPointer The mesh that is currently pointed at (can be null)
-         * @param sourceEvent the original (browser) event that triggered the ActionEvent
-         */
-        constructor(source: any, pointerX: number, pointerY: number, meshUnderPointer: AbstractMesh, sourceEvent?: any, additionalData?: any);
-        /**
-         * Helper function to auto-create an ActionEvent from a source mesh.
-         * @param source The source mesh that triggered the event
-         * @param evt {Event} The original (browser) event
-         */
-        static CreateNew(source: AbstractMesh, evt?: Event, additionalData?: any): ActionEvent;
-        /**
-         * Helper function to auto-create an ActionEvent from a source mesh.
-         * @param source The source sprite that triggered the event
-         * @param scene Scene associated with the sprite
-         * @param evt {Event} The original (browser) event
-         */
-        static CreateNewFromSprite(source: Sprite, scene: Scene, evt?: Event, additionalData?: any): ActionEvent;
-        /**
-         * Helper function to auto-create an ActionEvent from a scene. If triggered by a mesh use ActionEvent.CreateNew
-         * @param scene the scene where the event occurred
-         * @param evt {Event} The original (browser) event
-         */
-        static CreateNewFromScene(scene: Scene, evt: Event): ActionEvent;
-    }
-    /**
-     * Action Manager manages all events to be triggered on a given mesh or the global scene.
-     * A single scene can have many Action Managers to handle predefined actions on specific meshes.
-     */
-    class ActionManager {
-        private static _NothingTrigger;
-        private static _OnPickTrigger;
-        private static _OnLeftPickTrigger;
-        private static _OnRightPickTrigger;
-        private static _OnCenterPickTrigger;
-        private static _OnPickDownTrigger;
-        private static _OnPickUpTrigger;
-        private static _OnLongPressTrigger;
-        private static _OnPointerOverTrigger;
-        private static _OnPointerOutTrigger;
-        private static _OnEveryFrameTrigger;
-        private static _OnIntersectionEnterTrigger;
-        private static _OnIntersectionExitTrigger;
-        private static _OnKeyDownTrigger;
-        private static _OnKeyUpTrigger;
-        static NothingTrigger: number;
-        static OnPickTrigger: number;
-        static OnLeftPickTrigger: number;
-        static OnRightPickTrigger: number;
-        static OnCenterPickTrigger: number;
-        static OnPickDownTrigger: number;
-        static OnPickUpTrigger: number;
-        static OnLongPressTrigger: number;
-        static OnPointerOverTrigger: number;
-        static OnPointerOutTrigger: number;
-        static OnEveryFrameTrigger: number;
-        static OnIntersectionEnterTrigger: number;
-        static OnIntersectionExitTrigger: number;
-        static OnKeyDownTrigger: number;
-        static OnKeyUpTrigger: number;
-        static DragMovementThreshold: number;
-        static LongPressDelay: number;
-        actions: Action[];
-        private _scene;
-        constructor(scene: Scene);
-        dispose(): void;
-        getScene(): Scene;
-        /**
-         * Does this action manager handles actions of any of the given triggers
-         * @param {number[]} triggers - the triggers to be tested
-         * @return {boolean} whether one (or more) of the triggers is handeled
-         */
-        hasSpecificTriggers(triggers: number[]): boolean;
-        /**
-         * Does this action manager handles actions of a given trigger
-         * @param {number} trigger - the trigger to be tested
-         * @return {boolean} whether the trigger is handeled
-         */
-        hasSpecificTrigger(trigger: number): boolean;
-        /**
-         * Does this action manager has pointer triggers
-         * @return {boolean} whether or not it has pointer triggers
-         */
-        hasPointerTriggers: boolean;
-        /**
-         * Does this action manager has pick triggers
-         * @return {boolean} whether or not it has pick triggers
-         */
-        hasPickTriggers: boolean;
-        /**
-         * Registers an action to this action manager
-         * @param {BABYLON.Action} action - the action to be registered
-         * @return {BABYLON.Action} the action amended (prepared) after registration
-         */
-        registerAction(action: Action): Action;
-        /**
-         * Process a specific trigger
-         * @param {number} trigger - the trigger to process
-         * @param evt {BABYLON.ActionEvent} the event details to be processed
-         */
-        processTrigger(trigger: number, evt: ActionEvent): void;
-        _getEffectiveTarget(target: any, propertyPath: string): any;
-        _getProperty(propertyPath: string): string;
-        static Parse(parsedActions: any, object: AbstractMesh, scene: Scene): void;
-    }
-}
-
-declare namespace BABYLON {
-    class Condition {
-        _actionManager: ActionManager;
-        _evaluationId: number;
-        _currentResult: boolean;
-        constructor(actionManager: ActionManager);
-        isValid(): boolean;
-        _getProperty(propertyPath: string): string;
-        _getEffectiveTarget(target: any, propertyPath: string): any;
-    }
-    class ValueCondition extends Condition {
-        propertyPath: string;
-        value: any;
-        operator: number;
-        private static _IsEqual;
-        private static _IsDifferent;
-        private static _IsGreater;
-        private static _IsLesser;
-        static IsEqual: number;
-        static IsDifferent: number;
-        static IsGreater: number;
-        static IsLesser: number;
-        _actionManager: ActionManager;
-        private _target;
-        private _property;
-        constructor(actionManager: ActionManager, target: any, propertyPath: string, value: any, operator?: number);
-        isValid(): boolean;
-    }
-    class PredicateCondition extends Condition {
-        predicate: () => boolean;
-        _actionManager: ActionManager;
-        constructor(actionManager: ActionManager, predicate: () => boolean);
-        isValid(): boolean;
-    }
-    class StateCondition extends Condition {
-        value: string;
-        _actionManager: ActionManager;
-        private _target;
-        constructor(actionManager: ActionManager, target: any, value: string);
-        isValid(): boolean;
-    }
-}
-
-declare namespace BABYLON {
-    class SwitchBooleanAction extends Action {
-        propertyPath: string;
-        private _target;
-        private _property;
-        constructor(triggerOptions: any, target: any, propertyPath: string, condition?: Condition);
-        _prepare(): void;
-        execute(): void;
-    }
-    class SetStateAction extends Action {
-        value: string;
-        private _target;
-        constructor(triggerOptions: any, target: any, value: string, condition?: Condition);
-        execute(): void;
-    }
-    class SetValueAction extends Action {
-        propertyPath: string;
-        value: any;
-        private _target;
-        private _property;
-        constructor(triggerOptions: any, target: any, propertyPath: string, value: any, condition?: Condition);
-        _prepare(): void;
-        execute(): void;
-    }
-    class IncrementValueAction extends Action {
-        propertyPath: string;
-        value: any;
-        private _target;
-        private _property;
-        constructor(triggerOptions: any, target: any, propertyPath: string, value: any, condition?: Condition);
-        _prepare(): void;
-        execute(): void;
-    }
-    class PlayAnimationAction extends Action {
-        from: number;
-        to: number;
-        loop: boolean;
-        private _target;
-        constructor(triggerOptions: any, target: any, from: number, to: number, loop?: boolean, condition?: Condition);
-        _prepare(): void;
-        execute(): void;
-    }
-    class StopAnimationAction extends Action {
-        private _target;
-        constructor(triggerOptions: any, target: any, condition?: Condition);
-        _prepare(): void;
-        execute(): void;
-    }
-    class DoNothingAction extends Action {
-        constructor(triggerOptions?: any, condition?: Condition);
-        execute(): void;
-    }
-    class CombineAction extends Action {
-        children: Action[];
-        constructor(triggerOptions: any, children: Action[], condition?: Condition);
-        _prepare(): void;
-        execute(evt: ActionEvent): void;
-    }
-    class ExecuteCodeAction extends Action {
-        func: (evt: ActionEvent) => void;
-        constructor(triggerOptions: any, func: (evt: ActionEvent) => void, condition?: Condition);
-        execute(evt: ActionEvent): void;
-    }
-    class SetParentAction extends Action {
-        private _parent;
-        private _target;
-        constructor(triggerOptions: any, target: any, parent: any, condition?: Condition);
-        _prepare(): void;
-        execute(): void;
-    }
-    class PlaySoundAction extends Action {
-        private _sound;
-        constructor(triggerOptions: any, sound: Sound, condition?: Condition);
-        _prepare(): void;
-        execute(): void;
-    }
-    class StopSoundAction extends Action {
-        private _sound;
-        constructor(triggerOptions: any, sound: Sound, condition?: Condition);
-        _prepare(): void;
-        execute(): void;
-    }
-}
-
-declare namespace BABYLON {
-    class InterpolateValueAction extends Action {
-        propertyPath: string;
-        value: any;
-        duration: number;
-        stopOtherAnimations: boolean;
-        onInterpolationDone: () => void;
-        private _target;
-        private _property;
-        constructor(triggerOptions: any, target: any, propertyPath: string, value: any, duration?: number, condition?: Condition, stopOtherAnimations?: boolean, onInterpolationDone?: () => void);
-        _prepare(): void;
-        execute(): void;
-    }
-}
-
-declare namespace BABYLON {
-    class Animatable {
-        target: any;
-        fromFrame: number;
-        toFrame: number;
-        loopAnimation: boolean;
-        speedRatio: number;
-        onAnimationEnd: any;
-        private _localDelayOffset;
-        private _pausedDelay;
-        private _animations;
-        private _paused;
-        private _scene;
-        animationStarted: boolean;
-        constructor(scene: Scene, target: any, fromFrame?: number, toFrame?: number, loopAnimation?: boolean, speedRatio?: number, onAnimationEnd?: any, animations?: any);
-        getAnimations(): Animation[];
-        appendAnimations(target: any, animations: Animation[]): void;
-        getAnimationByTargetProperty(property: string): Animation;
-        reset(): void;
-        goToFrame(frame: number): void;
-        pause(): void;
-        restart(): void;
-        stop(): void;
-        _animate(delay: number): boolean;
-    }
-}
-
-declare namespace BABYLON {
-    class AnimationRange {
-        name: string;
-        from: number;
-        to: number;
-        constructor(name: string, from: number, to: number);
-    }
-    /**
-     * Composed of a frame, and an action function
-     */
-    class AnimationEvent {
-        frame: number;
-        action: () => void;
-        onlyOnce: boolean;
-        isDone: boolean;
-        constructor(frame: number, action: () => void, onlyOnce?: boolean);
-    }
-    class Animation {
-        name: string;
-        targetProperty: string;
-        framePerSecond: number;
-        dataType: number;
-        loopMode: number;
-        private _keys;
-        private _offsetsCache;
-        private _highLimitsCache;
-        private _stopped;
-        _target: any;
-        private _easingFunction;
-        private _events;
-        targetPropertyPath: string[];
-        currentFrame: number;
-        allowMatricesInterpolation: boolean;
-        private _ranges;
-        static _PrepareAnimation(name: string, targetProperty: string, framePerSecond: number, totalFrame: number, from: any, to: any, loopMode?: number, easingFunction?: EasingFunction): Animation;
-        static CreateAndStartAnimation(name: string, node: Node, targetProperty: string, framePerSecond: number, totalFrame: number, from: any, to: any, loopMode?: number, easingFunction?: EasingFunction, onAnimationEnd?: () => void): Animatable;
-        static CreateMergeAndStartAnimation(name: string, node: Node, targetProperty: string, framePerSecond: number, totalFrame: number, from: any, to: any, loopMode?: number, easingFunction?: EasingFunction, onAnimationEnd?: () => void): Animatable;
-        constructor(name: string, targetProperty: string, framePerSecond: number, dataType: number, loopMode?: number);
-        /**
-         * Add an event to this animation.
-         */
-        addEvent(event: AnimationEvent): void;
-        /**
-         * Remove all events found at the given frame
-         * @param frame
-         */
-        removeEvents(frame: number): void;
-        createRange(name: string, from: number, to: number): void;
-        deleteRange(name: string, deleteFrames?: boolean): void;
-        getRange(name: string): AnimationRange;
-        reset(): void;
-        isStopped(): boolean;
-        getKeys(): any[];
-        getHighestFrame(): number;
-        getEasingFunction(): IEasingFunction;
-        setEasingFunction(easingFunction: EasingFunction): void;
-        floatInterpolateFunction(startValue: number, endValue: number, gradient: number): number;
-        quaternionInterpolateFunction(startValue: Quaternion, endValue: Quaternion, gradient: number): Quaternion;
-        vector3InterpolateFunction(startValue: Vector3, endValue: Vector3, gradient: number): Vector3;
-        vector2InterpolateFunction(startValue: Vector2, endValue: Vector2, gradient: number): Vector2;
-        color3InterpolateFunction(startValue: Color3, endValue: Color3, gradient: number): Color3;
-        matrixInterpolateFunction(startValue: Matrix, endValue: Matrix, gradient: number): Matrix;
-        clone(): Animation;
-        setKeys(values: Array<any>): void;
-        private _getKeyValue(value);
-        private _interpolate(currentFrame, repeatCount, loopMode, offsetValue?, highLimitValue?);
-        setValue(currentValue: any): void;
-        goToFrame(frame: number): void;
-        animate(delay: number, from: number, to: number, loop: boolean, speedRatio: number): boolean;
-        serialize(): any;
-        private static _ANIMATIONTYPE_FLOAT;
-        private static _ANIMATIONTYPE_VECTOR3;
-        private static _ANIMATIONTYPE_QUATERNION;
-        private static _ANIMATIONTYPE_MATRIX;
-        private static _ANIMATIONTYPE_COLOR3;
-        private static _ANIMATIONTYPE_VECTOR2;
-        private static _ANIMATIONLOOPMODE_RELATIVE;
-        private static _ANIMATIONLOOPMODE_CYCLE;
-        private static _ANIMATIONLOOPMODE_CONSTANT;
-        static ANIMATIONTYPE_FLOAT: number;
-        static ANIMATIONTYPE_VECTOR3: number;
-        static ANIMATIONTYPE_VECTOR2: number;
-        static ANIMATIONTYPE_QUATERNION: number;
-        static ANIMATIONTYPE_MATRIX: number;
-        static ANIMATIONTYPE_COLOR3: number;
-        static ANIMATIONLOOPMODE_RELATIVE: number;
-        static ANIMATIONLOOPMODE_CYCLE: number;
-        static ANIMATIONLOOPMODE_CONSTANT: number;
-        static Parse(parsedAnimation: any): Animation;
-        static AppendSerializedAnimations(source: IAnimatable, destination: any): any;
-    }
-}
-
-declare namespace BABYLON {
-    interface IEasingFunction {
-        ease(gradient: number): number;
-    }
-    class EasingFunction implements IEasingFunction {
-        private static _EASINGMODE_EASEIN;
-        private static _EASINGMODE_EASEOUT;
-        private static _EASINGMODE_EASEINOUT;
-        static EASINGMODE_EASEIN: number;
-        static EASINGMODE_EASEOUT: number;
-        static EASINGMODE_EASEINOUT: number;
-        private _easingMode;
-        setEasingMode(easingMode: number): void;
-        getEasingMode(): number;
-        easeInCore(gradient: number): number;
-        ease(gradient: number): number;
-    }
-    class CircleEase extends EasingFunction implements IEasingFunction {
-        easeInCore(gradient: number): number;
-    }
-    class BackEase extends EasingFunction implements IEasingFunction {
-        amplitude: number;
-        constructor(amplitude?: number);
-        easeInCore(gradient: number): number;
-    }
-    class BounceEase extends EasingFunction implements IEasingFunction {
-        bounces: number;
-        bounciness: number;
-        constructor(bounces?: number, bounciness?: number);
-        easeInCore(gradient: number): number;
-    }
-    class CubicEase extends EasingFunction implements IEasingFunction {
-        easeInCore(gradient: number): number;
-    }
-    class ElasticEase extends EasingFunction implements IEasingFunction {
-        oscillations: number;
-        springiness: number;
-        constructor(oscillations?: number, springiness?: number);
-        easeInCore(gradient: number): number;
-    }
-    class ExponentialEase extends EasingFunction implements IEasingFunction {
-        exponent: number;
-        constructor(exponent?: number);
-        easeInCore(gradient: number): number;
-    }
-    class PowerEase extends EasingFunction implements IEasingFunction {
-        power: number;
-        constructor(power?: number);
-        easeInCore(gradient: number): number;
-    }
-    class QuadraticEase extends EasingFunction implements IEasingFunction {
-        easeInCore(gradient: number): number;
-    }
-    class QuarticEase extends EasingFunction implements IEasingFunction {
-        easeInCore(gradient: number): number;
-    }
-    class QuinticEase extends EasingFunction implements IEasingFunction {
-        easeInCore(gradient: number): number;
-    }
-    class SineEase extends EasingFunction implements IEasingFunction {
-        easeInCore(gradient: number): number;
-    }
-    class BezierCurveEase extends EasingFunction implements IEasingFunction {
-        x1: number;
-        y1: number;
-        x2: number;
-        y2: number;
-        constructor(x1?: number, y1?: number, x2?: number, y2?: number);
-        easeInCore(gradient: number): number;
-    }
-}
-
-declare namespace BABYLON {
-    class Analyser {
-        SMOOTHING: number;
-        FFT_SIZE: number;
-        BARGRAPHAMPLITUDE: number;
-        DEBUGCANVASPOS: {
-            x: number;
-            y: number;
-        };
-        DEBUGCANVASSIZE: {
-            width: number;
-            height: number;
-        };
-        private _byteFreqs;
-        private _byteTime;
-        private _floatFreqs;
-        private _webAudioAnalyser;
-        private _debugCanvas;
-        private _debugCanvasContext;
-        private _scene;
-        private _registerFunc;
-        private _audioEngine;
-        constructor(scene: Scene);
-        getFrequencyBinCount(): number;
-        getByteFrequencyData(): Uint8Array;
-        getByteTimeDomainData(): Uint8Array;
-        getFloatFrequencyData(): Uint8Array;
-        drawDebugCanvas(): void;
-        stopDebugCanvas(): void;
-        connectAudioNodes(inputAudioNode: AudioNode, outputAudioNode: AudioNode): void;
-        dispose(): void;
-    }
-}
-
-declare namespace BABYLON {
-    class AudioEngine {
-        private _audioContext;
-        private _audioContextInitialized;
-        canUseWebAudio: boolean;
-        masterGain: GainNode;
-        private _connectedAnalyser;
-        WarnedWebAudioUnsupported: boolean;
-        unlocked: boolean;
-        onAudioUnlocked: () => any;
-        audioContext: AudioContext;
-        constructor();
-        private _unlockiOSaudio();
-        private _initializeAudioContext();
-        dispose(): void;
-        getGlobalVolume(): number;
-        setGlobalVolume(newVolume: number): void;
-        connectToAnalyser(analyser: Analyser): void;
-    }
-}
-
-declare namespace BABYLON {
-    class Sound {
-        name: string;
-        autoplay: boolean;
-        loop: boolean;
-        useCustomAttenuation: boolean;
-        soundTrackId: number;
-        spatialSound: boolean;
-        refDistance: number;
-        rolloffFactor: number;
-        maxDistance: number;
-        distanceModel: string;
-        private _panningModel;
-        onended: () => any;
-        private _playbackRate;
-        private _streaming;
-        private _startTime;
-        private _startOffset;
-        private _position;
-        private _localDirection;
-        private _volume;
-        private _isLoaded;
-        private _isReadyToPlay;
-        isPlaying: boolean;
-        isPaused: boolean;
-        private _isDirectional;
-        private _readyToPlayCallback;
-        private _audioBuffer;
-        private _soundSource;
-        private _streamingSource;
-        private _soundPanner;
-        private _soundGain;
-        private _inputAudioNode;
-        private _ouputAudioNode;
-        private _coneInnerAngle;
-        private _coneOuterAngle;
-        private _coneOuterGain;
-        private _scene;
-        private _connectedMesh;
-        private _customAttenuationFunction;
-        private _registerFunc;
-        private _isOutputConnected;
-        private _htmlAudioElement;
-        /**
-        * Create a sound and attach it to a scene
-        * @param name Name of your sound
-        * @param urlOrArrayBuffer Url to the sound to load async or ArrayBuffer
-        * @param readyToPlayCallback Provide a callback function if you'd like to load your code once the sound is ready to be played
-        * @param options Objects to provide with the current available options: autoplay, loop, volume, spatialSound, maxDistance, rolloffFactor, refDistance, distanceModel, panningModel, streaming
-        */
-        constructor(name: string, urlOrArrayBuffer: any, scene: Scene, readyToPlayCallback?: () => void, options?: any);
-        dispose(): void;
-        private _soundLoaded(audioData);
-        setAudioBuffer(audioBuffer: AudioBuffer): void;
-        updateOptions(options: any): void;
-        private _createSpatialParameters();
-        private _updateSpatialParameters();
-        switchPanningModelToHRTF(): void;
-        switchPanningModelToEqualPower(): void;
-        private _switchPanningModel();
-        connectToSoundTrackAudioNode(soundTrackAudioNode: AudioNode): void;
-        /**
-        * Transform this sound into a directional source
-        * @param coneInnerAngle Size of the inner cone in degree
-        * @param coneOuterAngle Size of the outer cone in degree
-        * @param coneOuterGain Volume of the sound outside the outer cone (between 0.0 and 1.0)
-        */
-        setDirectionalCone(coneInnerAngle: number, coneOuterAngle: number, coneOuterGain: number): void;
-        setPosition(newPosition: Vector3): void;
-        setLocalDirectionToMesh(newLocalDirection: Vector3): void;
-        private _updateDirection();
-        updateDistanceFromListener(): void;
-        setAttenuationFunction(callback: (currentVolume: number, currentDistance: number, maxDistance: number, refDistance: number, rolloffFactor: number) => number): void;
-        /**
-        * Play the sound
-        * @param time (optional) Start the sound after X seconds. Start immediately (0) by default.
-        */
-        play(time?: number): void;
-        private _onended();
-        /**
-        * Stop the sound
-        * @param time (optional) Stop the sound after X seconds. Stop immediately (0) by default.
-        */
-        stop(time?: number): void;
-        pause(): void;
-        setVolume(newVolume: number, time?: number): void;
-        setPlaybackRate(newPlaybackRate: number): void;
-        getVolume(): number;
-        attachToMesh(meshToConnectTo: AbstractMesh): void;
-        private _onRegisterAfterWorldMatrixUpdate(connectedMesh);
-        clone(): Sound;
-        getAudioBuffer(): AudioBuffer;
-        static Parse(parsedSound: any, scene: Scene, rootUrl: string, sourceSound?: Sound): Sound;
-    }
-}
-
-declare namespace BABYLON {
-    class SoundTrack {
-        private _outputAudioNode;
-        private _inputAudioNode;
-        private _trackConvolver;
-        private _scene;
-        id: number;
-        soundCollection: Array<Sound>;
-        private _isMainTrack;
-        private _connectedAnalyser;
-        private _options;
-        private _isInitialized;
-        constructor(scene: Scene, options?: any);
-        private _initializeSoundTrackAudioGraph();
-        dispose(): void;
-        AddSound(sound: Sound): void;
-        RemoveSound(sound: Sound): void;
-        setVolume(newVolume: number): void;
-        switchPanningModelToHRTF(): void;
-        switchPanningModelToEqualPower(): void;
-        connectToAnalyser(analyser: Analyser): void;
-    }
-}
-
-declare namespace BABYLON {
-    class Bone extends Node {
-        name: string;
-        children: Bone[];
-        animations: Animation[];
-        length: number;
-        private _skeleton;
-        _matrix: Matrix;
-        private _restPose;
-        private _baseMatrix;
-        private _worldTransform;
-        private _absoluteTransform;
-        private _invertedAbsoluteTransform;
-        private _parent;
-        constructor(name: string, skeleton: Skeleton, parentBone: Bone, matrix: Matrix, restPose?: Matrix);
-        getParent(): Bone;
-        getLocalMatrix(): Matrix;
-        getBaseMatrix(): Matrix;
-        getRestPose(): Matrix;
-        returnToRest(): void;
-        getWorldMatrix(): Matrix;
-        getInvertedAbsoluteTransform(): Matrix;
-        getAbsoluteTransform(): Matrix;
-        updateMatrix(matrix: Matrix): void;
-        _updateDifferenceMatrix(rootMatrix?: Matrix): void;
-        markAsDirty(): void;
-        copyAnimationRange(source: Bone, rangeName: string, frameOffset: number, rescaleAsRequired?: boolean): boolean;
-    }
-}
-
-declare namespace BABYLON {
-    class Skeleton {
-        name: string;
-        id: string;
-        bones: Bone[];
-        needInitialSkinMatrix: boolean;
-        private _scene;
-        private _isDirty;
-        private _transformMatrices;
-        private _meshesWithPoseMatrix;
-        private _animatables;
-        private _identity;
-        private _ranges;
-        constructor(name: string, id: string, scene: Scene);
-        getTransformMatrices(mesh: AbstractMesh): Float32Array;
-        getScene(): Scene;
-        createAnimationRange(name: string, from: number, to: number): void;
-        deleteAnimationRange(name: string, deleteFrames?: boolean): void;
-        getAnimationRange(name: string): AnimationRange;
-        /**
-         *  note: This is not for a complete retargeting, only between very similar skeleton's with only possible bone length differences
-         */
-        copyAnimationRange(source: Skeleton, name: string, rescaleAsRequired?: boolean): boolean;
-        returnToRest(): void;
-        private _getHighestAnimationFrame();
-        beginAnimation(name: string, loop?: boolean, speedRatio?: number, onAnimationEnd?: () => void): void;
-        _markAsDirty(): void;
-        _registerMeshWithPoseMatrix(mesh: AbstractMesh): void;
-        _unregisterMeshWithPoseMatrix(mesh: AbstractMesh): void;
-        _computeTransformMatrices(targetMatrix: Float32Array, initialSkinMatrix: Matrix): void;
-        prepare(): void;
-        getAnimatables(): IAnimatable[];
-        clone(name: string, id: string): Skeleton;
-        dispose(): void;
-        serialize(): any;
-        static Parse(parsedSkeleton: any, scene: Scene): Skeleton;
-    }
-}
-
-declare namespace BABYLON {
-    class ArcRotateCamera extends TargetCamera {
-        alpha: number;
-        beta: number;
-        radius: number;
-        target: any;
-        inertialAlphaOffset: number;
-        inertialBetaOffset: number;
-        inertialRadiusOffset: number;
-        lowerAlphaLimit: any;
-        upperAlphaLimit: any;
-        lowerBetaLimit: number;
-        upperBetaLimit: number;
-        lowerRadiusLimit: any;
-        upperRadiusLimit: any;
-        angularSensibilityX: number;
-        angularSensibilityY: number;
-        wheelPrecision: number;
-        pinchPrecision: number;
-        panningSensibility: number;
-        inertialPanningX: number;
-        inertialPanningY: number;
-        keysUp: number[];
-        keysDown: number[];
-        keysLeft: number[];
-        keysRight: number[];
-        zoomOnFactor: number;
-        targetScreenOffset: Vector2;
-        pinchInwards: boolean;
-        allowUpsideDown: boolean;
-        private _keys;
-        _viewMatrix: Matrix;
-        private _attachedElement;
-        private _onContextMenu;
-        private _onPointerDown;
-        private _onPointerUp;
-        private _onPointerMove;
-        private _wheel;
-        private _onMouseMove;
-        private _onKeyDown;
-        private _onKeyUp;
-        private _onLostFocus;
-        _reset: () => void;
-        private _onGestureStart;
-        private _onGesture;
-        private _MSGestureHandler;
-        panningAxis: Vector3;
-        private _localDirection;
-        private _transformedDirection;
-        private _isRightClick;
-        private _isCtrlPushed;
-        onCollide: (collidedMesh: AbstractMesh) => void;
-        checkCollisions: boolean;
-        collisionRadius: Vector3;
-        private _collider;
-        private _previousPosition;
-        private _collisionVelocity;
-        private _newPosition;
-        private _previousAlpha;
-        private _previousBeta;
-        private _previousRadius;
-        private _collisionTriggered;
-        angularSensibility: number;
-        constructor(name: string, alpha: number, beta: number, radius: number, target: any, scene: Scene);
-        _getTargetPosition(): Vector3;
-        _initCache(): void;
-        _updateCache(ignoreParentClass?: boolean): void;
-        _isSynchronizedViewMatrix(): boolean;
-        attachControl(element: HTMLElement, noPreventDefault?: boolean, useCtrlForPanning?: boolean): void;
-        detachControl(element: HTMLElement): void;
-        _checkInputs(): void;
-        private _checkLimits();
-        setPosition(position: Vector3): void;
-        setTarget(target: Vector3): void;
-        _getViewMatrix(): Matrix;
-        private _onCollisionPositionChange;
-        zoomOn(meshes?: AbstractMesh[], doNotUpdateMaxZ?: boolean): void;
-        focusOn(meshesOrMinMaxVectorAndDistance: any, doNotUpdateMaxZ?: boolean): void;
-        /**
-         * @override
-         * Override Camera.createRigCamera
-         */
-        createRigCamera(name: string, cameraIndex: number): Camera;
-        /**
-         * @override
-         * Override Camera._updateRigCameras
-         */
-        _updateRigCameras(): void;
-        serialize(): any;
-    }
-}
-
-declare namespace BABYLON {
-    class VRCameraMetrics {
-        hResolution: number;
-        vResolution: number;
-        hScreenSize: number;
-        vScreenSize: number;
-        vScreenCenter: number;
-        eyeToScreenDistance: number;
-        lensSeparationDistance: number;
-        interpupillaryDistance: number;
-        distortionK: number[];
-        chromaAbCorrection: number[];
-        postProcessScaleFactor: number;
-        lensCenterOffset: number;
-        compensateDistortion: boolean;
-        aspectRatio: number;
-        aspectRatioFov: number;
-        leftHMatrix: Matrix;
-        rightHMatrix: Matrix;
-        leftPreViewMatrix: Matrix;
-        rightPreViewMatrix: Matrix;
-        static GetDefault(): VRCameraMetrics;
-    }
-    class Camera extends Node {
-        position: Vector3;
-        private static _PERSPECTIVE_CAMERA;
-        private static _ORTHOGRAPHIC_CAMERA;
-        private static _FOVMODE_VERTICAL_FIXED;
-        private static _FOVMODE_HORIZONTAL_FIXED;
-        private static _RIG_MODE_NONE;
-        private static _RIG_MODE_STEREOSCOPIC_ANAGLYPH;
-        private static _RIG_MODE_STEREOSCOPIC_SIDEBYSIDE_PARALLEL;
-        private static _RIG_MODE_STEREOSCOPIC_SIDEBYSIDE_CROSSEYED;
-        private static _RIG_MODE_STEREOSCOPIC_OVERUNDER;
-        private static _RIG_MODE_VR;
-        static PERSPECTIVE_CAMERA: number;
-        static ORTHOGRAPHIC_CAMERA: number;
-        static FOVMODE_VERTICAL_FIXED: number;
-        static FOVMODE_HORIZONTAL_FIXED: number;
-        static RIG_MODE_NONE: number;
-        static RIG_MODE_STEREOSCOPIC_ANAGLYPH: number;
-        static RIG_MODE_STEREOSCOPIC_SIDEBYSIDE_PARALLEL: number;
-        static RIG_MODE_STEREOSCOPIC_SIDEBYSIDE_CROSSEYED: number;
-        static RIG_MODE_STEREOSCOPIC_OVERUNDER: number;
-        static RIG_MODE_VR: number;
-        upVector: Vector3;
-        orthoLeft: any;
-        orthoRight: any;
-        orthoBottom: any;
-        orthoTop: any;
-        fov: number;
-        minZ: number;
-        maxZ: number;
-        inertia: number;
-        mode: number;
-        isIntermediate: boolean;
-        viewport: Viewport;
-        layerMask: number;
-        fovMode: number;
-        cameraRigMode: number;
-        _cameraRigParams: any;
-        _rigCameras: Camera[];
-        private _computedViewMatrix;
-        _projectionMatrix: Matrix;
-        private _worldMatrix;
-        _postProcesses: PostProcess[];
-        _postProcessesTakenIndices: any[];
-        _activeMeshes: SmartArray<Mesh>;
-        private _globalPosition;
-        constructor(name: string, position: Vector3, scene: Scene);
-        globalPosition: Vector3;
-        getActiveMeshes(): SmartArray<Mesh>;
-        isActiveMesh(mesh: Mesh): boolean;
-        _initCache(): void;
-        _updateCache(ignoreParentClass?: boolean): void;
-        _updateFromScene(): void;
-        _isSynchronized(): boolean;
-        _isSynchronizedViewMatrix(): boolean;
-        _isSynchronizedProjectionMatrix(): boolean;
-        attachControl(element: HTMLElement): void;
-        detachControl(element: HTMLElement): void;
-        _update(): void;
-        _checkInputs(): void;
-        attachPostProcess(postProcess: PostProcess, insertAt?: number): number;
-        detachPostProcess(postProcess: PostProcess, atIndices?: any): number[];
-        getWorldMatrix(): Matrix;
-        _getViewMatrix(): Matrix;
-        getViewMatrix(force?: boolean): Matrix;
-        _computeViewMatrix(force?: boolean): Matrix;
-        getProjectionMatrix(force?: boolean): Matrix;
-        dispose(): void;
-        setCameraRigMode(mode: number, rigParams: any): void;
-        private _getVRProjectionMatrix();
-        setCameraRigParameter(name: string, value: any): void;
-        /**
-         * May needs to be overridden by children so sub has required properties to be copied
-         */
-        createRigCamera(name: string, cameraIndex: number): Camera;
-        /**
-         * May needs to be overridden by children
-         */
-        _updateRigCameras(): void;
-        serialize(): any;
-        static Parse(parsedCamera: any, scene: Scene): Camera;
-    }
-}
-
-declare namespace BABYLON {
-    class DeviceOrientationCamera extends FreeCamera {
-        private _offsetX;
-        private _offsetY;
-        private _orientationGamma;
-        private _orientationBeta;
-        private _initialOrientationGamma;
-        private _initialOrientationBeta;
-        private _attachedCanvas;
-        private _orientationChanged;
-        angularSensibility: number;
-        moveSensibility: number;
-        constructor(name: string, position: Vector3, scene: Scene);
-        attachControl(canvas: HTMLCanvasElement, noPreventDefault: boolean): void;
-        detachControl(canvas: HTMLCanvasElement): void;
-        _checkInputs(): void;
-    }
-}
-
-declare namespace BABYLON {
-    class FollowCamera extends TargetCamera {
-        radius: number;
-        rotationOffset: number;
-        heightOffset: number;
-        cameraAcceleration: number;
-        maxCameraSpeed: number;
-        target: AbstractMesh;
-        constructor(name: string, position: Vector3, scene: Scene);
-        private getRadians(degrees);
-        private follow(cameraTarget);
-        _checkInputs(): void;
-        serialize(): any;
-    }
-    class ArcFollowCamera extends TargetCamera {
-        alpha: number;
-        beta: number;
-        radius: number;
-        target: AbstractMesh;
-        private _cartesianCoordinates;
-        constructor(name: string, alpha: number, beta: number, radius: number, target: AbstractMesh, scene: Scene);
-        private follow();
-        _checkInputs(): void;
-        serialize(): any;
-    }
-}
-
-declare namespace BABYLON {
-    class FreeCamera extends TargetCamera {
-        ellipsoid: Vector3;
-        keysUp: number[];
-        keysDown: number[];
-        keysLeft: number[];
-        keysRight: number[];
-        checkCollisions: boolean;
-        applyGravity: boolean;
-        angularSensibility: number;
-        onCollide: (collidedMesh: AbstractMesh) => void;
-        private _keys;
-        private _collider;
-        private _needMoveForGravity;
-        private _oldPosition;
-        private _diffPosition;
-        private _newPosition;
-        private _attachedElement;
-        private _localDirection;
-        private _transformedDirection;
-        private _onMouseDown;
-        private _onMouseUp;
-        private _onMouseOut;
-        private _onMouseMove;
-        private _onKeyDown;
-        private _onKeyUp;
-        _waitingLockedTargetId: string;
-        constructor(name: string, position: Vector3, scene: Scene);
-        _onLostFocus(e: FocusEvent): void;
-        attachControl(element: HTMLElement, noPreventDefault?: boolean): void;
-        detachControl(element: HTMLElement): void;
-        _collideWithWorld(velocity: Vector3): void;
-        private _onCollisionPositionChange;
-        _checkInputs(): void;
-        _decideIfNeedsToMove(): boolean;
-        _updatePosition(): void;
-        serialize(): any;
-    }
-}
-
-declare namespace BABYLON {
-    class GamepadCamera extends UniversalCamera {
-        constructor(name: string, position: Vector3, scene: Scene);
-    }
-}
-
-declare namespace BABYLON {
-    class AnaglyphFreeCamera extends FreeCamera {
-        interaxialDistance: number;
-        constructor(name: string, position: Vector3, interaxialDistance: number, scene: Scene);
-    }
-    class AnaglyphArcRotateCamera extends ArcRotateCamera {
-        constructor(name: string, alpha: number, beta: number, radius: number, target: any, interaxialDistance: number, scene: Scene);
-    }
-    class AnaglyphGamepadCamera extends GamepadCamera {
-        constructor(name: string, position: Vector3, interaxialDistance: number, scene: Scene);
-    }
-    class StereoscopicFreeCamera extends FreeCamera {
-        constructor(name: string, position: Vector3, interaxialDistance: number, isSideBySide: boolean, scene: Scene);
-    }
-    class StereoscopicArcRotateCamera extends ArcRotateCamera {
-        constructor(name: string, alpha: number, beta: number, radius: number, target: any, interaxialDistance: number, isSideBySide: boolean, scene: Scene);
-    }
-    class StereoscopicGamepadCamera extends GamepadCamera {
-        constructor(name: string, position: Vector3, interaxialDistance: number, isSideBySide: boolean, scene: Scene);
-    }
-}
-
-declare namespace BABYLON {
-    class TargetCamera extends Camera {
-        cameraDirection: Vector3;
-        cameraRotation: Vector2;
-        rotation: Vector3;
-        speed: number;
-        noRotationConstraint: boolean;
-        lockedTarget: any;
-        _currentTarget: Vector3;
-        _viewMatrix: Matrix;
-        _camMatrix: Matrix;
-        _cameraTransformMatrix: Matrix;
-        _cameraRotationMatrix: Matrix;
-        private _rigCamTransformMatrix;
-        _referencePoint: Vector3;
-        _transformedReferencePoint: Vector3;
-        _lookAtTemp: Matrix;
-        _tempMatrix: Matrix;
-        _reset: () => void;
-        _waitingLockedTargetId: string;
-        constructor(name: string, position: Vector3, scene: Scene);
-        getFrontPosition(distance: number): Vector3;
-        _getLockedTargetPosition(): Vector3;
-        _initCache(): void;
-        _updateCache(ignoreParentClass?: boolean): void;
-        _isSynchronizedViewMatrix(): boolean;
-        _computeLocalCameraSpeed(): number;
-        setTarget(target: Vector3): void;
-        getTarget(): Vector3;
-        _decideIfNeedsToMove(): boolean;
-        _updatePosition(): void;
-        _checkInputs(): void;
-        _getViewMatrix(): Matrix;
-        _getVRViewMatrix(): Matrix;
-        /**
-         * @override
-         * Override Camera.createRigCamera
-         */
-        createRigCamera(name: string, cameraIndex: number): Camera;
-        /**
-         * @override
-         * Override Camera._updateRigCameras
-         */
-        _updateRigCameras(): void;
-        private _getRigCamPosition(halfSpace, result);
-        serialize(): any;
-    }
-}
-
-declare namespace BABYLON {
-    class TouchCamera extends FreeCamera {
-        private _offsetX;
-        private _offsetY;
-        private _pointerCount;
-        private _pointerPressed;
-        private _attachedCanvas;
-        private _onPointerDown;
-        private _onPointerUp;
-        private _onPointerMove;
-        touchAngularSensibility: number;
-        touchMoveSensibility: number;
-        constructor(name: string, position: Vector3, scene: Scene);
-        _onLostFocus(e: FocusEvent): void;
-        attachControl(canvas: HTMLCanvasElement, noPreventDefault: boolean): void;
-        detachControl(canvas: HTMLCanvasElement): void;
-        _checkInputs(): void;
-    }
-}
-
-declare namespace BABYLON {
-    class UniversalCamera extends TouchCamera {
-        gamepad: Gamepad;
-        private _gamepads;
-        gamepadAngularSensibility: number;
-        gamepadMoveSensibility: number;
-        constructor(name: string, position: Vector3, scene: Scene);
-        private _onNewGameConnected(gamepad);
-        attachControl(canvas: HTMLCanvasElement, noPreventDefault: boolean): void;
-        detachControl(canvas: HTMLCanvasElement): void;
-        _checkInputs(): void;
-        dispose(): void;
-    }
-}
-
-declare namespace BABYLON {
-    class VirtualJoysticksCamera extends FreeCamera {
-        private _leftjoystick;
-        private _rightjoystick;
-        constructor(name: string, position: Vector3, scene: Scene);
-        getLeftJoystick(): VirtualJoystick;
-        getRightJoystick(): VirtualJoystick;
-        _checkInputs(): void;
-        dispose(): void;
-    }
-}
-
-declare namespace BABYLON {
-    class Collider {
-        radius: Vector3;
-        retry: number;
-        velocity: Vector3;
-        basePoint: Vector3;
-        epsilon: number;
-        collisionFound: boolean;
-        velocityWorldLength: number;
-        basePointWorld: Vector3;
-        velocityWorld: Vector3;
-        normalizedVelocity: Vector3;
-        initialVelocity: Vector3;
-        initialPosition: Vector3;
-        nearestDistance: number;
-        intersectionPoint: Vector3;
-        collidedMesh: AbstractMesh;
-        private _collisionPoint;
-        private _planeIntersectionPoint;
-        private _tempVector;
-        private _tempVector2;
-        private _tempVector3;
-        private _tempVector4;
-        private _edge;
-        private _baseToVertex;
-        private _destinationPoint;
-        private _slidePlaneNormal;
-        private _displacementVector;
-        _initialize(source: Vector3, dir: Vector3, e: number): void;
-        _checkPointInTriangle(point: Vector3, pa: Vector3, pb: Vector3, pc: Vector3, n: Vector3): boolean;
-        _canDoCollision(sphereCenter: Vector3, sphereRadius: number, vecMin: Vector3, vecMax: Vector3): boolean;
-        _testTriangle(faceIndex: number, trianglePlaneArray: Array<Plane>, p1: Vector3, p2: Vector3, p3: Vector3, hasMaterial: boolean): void;
-        _collide(trianglePlaneArray: Array<Plane>, pts: Vector3[], indices: number[] | Int32Array, indexStart: number, indexEnd: number, decal: number, hasMaterial: boolean): void;
-        _getResponse(pos: Vector3, vel: Vector3): void;
-    }
-}
-
-declare namespace BABYLON {
-    var CollisionWorker: string;
-    interface ICollisionCoordinator {
-        getNewPosition(position: Vector3, velocity: Vector3, collider: Collider, maximumRetry: number, excludedMesh: AbstractMesh, onNewPosition: (collisionIndex: number, newPosition: Vector3, collidedMesh?: AbstractMesh) => void, collisionIndex: number): void;
-        init(scene: Scene): void;
-        destroy(): void;
-        onMeshAdded(mesh: AbstractMesh): any;
-        onMeshUpdated(mesh: AbstractMesh): any;
-        onMeshRemoved(mesh: AbstractMesh): any;
-        onGeometryAdded(geometry: Geometry): any;
-        onGeometryUpdated(geometry: Geometry): any;
-        onGeometryDeleted(geometry: Geometry): any;
-    }
-    interface SerializedMesh {
-        id: string;
-        name: string;
-        uniqueId: number;
-        geometryId: string;
-        sphereCenter: Array<number>;
-        sphereRadius: number;
-        boxMinimum: Array<number>;
-        boxMaximum: Array<number>;
-        worldMatrixFromCache: any;
-        subMeshes: Array<SerializedSubMesh>;
-        checkCollisions: boolean;
-    }
-    interface SerializedSubMesh {
-        position: number;
-        verticesStart: number;
-        verticesCount: number;
-        indexStart: number;
-        indexCount: number;
-        hasMaterial: boolean;
-        sphereCenter: Array<number>;
-        sphereRadius: number;
-        boxMinimum: Array<number>;
-        boxMaximum: Array<number>;
-    }
-    interface SerializedGeometry {
-        id: string;
-        positions: Float32Array;
-        indices: Int32Array;
-        normals: Float32Array;
-    }
-    interface BabylonMessage {
-        taskType: WorkerTaskType;
-        payload: InitPayload | CollidePayload | UpdatePayload;
-    }
-    interface SerializedColliderToWorker {
-        position: Array<number>;
-        velocity: Array<number>;
-        radius: Array<number>;
-    }
-    enum WorkerTaskType {
-        INIT = 0,
-        UPDATE = 1,
-        COLLIDE = 2,
-    }
-    interface WorkerReply {
-        error: WorkerReplyType;
-        taskType: WorkerTaskType;
-        payload?: any;
-    }
-    interface CollisionReplyPayload {
-        newPosition: Array<number>;
-        collisionId: number;
-        collidedMeshUniqueId: number;
-    }
-    interface InitPayload {
-    }
-    interface CollidePayload {
-        collisionId: number;
-        collider: SerializedColliderToWorker;
-        maximumRetry: number;
-        excludedMeshUniqueId?: number;
-    }
-    interface UpdatePayload {
-        updatedMeshes: {
-            [n: number]: SerializedMesh;
-        };
-        updatedGeometries: {
-            [s: string]: SerializedGeometry;
-        };
-        removedMeshes: Array<number>;
-        removedGeometries: Array<string>;
-    }
-    enum WorkerReplyType {
-        SUCCESS = 0,
-        UNKNOWN_ERROR = 1,
-    }
-    class CollisionCoordinatorWorker implements ICollisionCoordinator {
-        private _scene;
-        private _scaledPosition;
-        private _scaledVelocity;
-        private _collisionsCallbackArray;
-        private _init;
-        private _runningUpdated;
-        private _runningCollisionTask;
-        private _worker;
-        private _addUpdateMeshesList;
-        private _addUpdateGeometriesList;
-        private _toRemoveMeshesArray;
-        private _toRemoveGeometryArray;
-        constructor();
-        static SerializeMesh: (mesh: AbstractMesh) => SerializedMesh;
-        static SerializeGeometry: (geometry: Geometry) => SerializedGeometry;
-        getNewPosition(position: Vector3, velocity: Vector3, collider: Collider, maximumRetry: number, excludedMesh: AbstractMesh, onNewPosition: (collisionIndex: number, newPosition: Vector3, collidedMesh?: AbstractMesh) => void, collisionIndex: number): void;
-        init(scene: Scene): void;
-        destroy(): void;
-        onMeshAdded(mesh: AbstractMesh): void;
-        onMeshUpdated: (mesh: AbstractMesh) => void;
-        onMeshRemoved(mesh: AbstractMesh): void;
-        onGeometryAdded(geometry: Geometry): void;
-        onGeometryUpdated: (geometry: Geometry) => void;
-        onGeometryDeleted(geometry: Geometry): void;
-        private _afterRender;
-        private _onMessageFromWorker;
-    }
-    class CollisionCoordinatorLegacy implements ICollisionCoordinator {
-        private _scene;
-        private _scaledPosition;
-        private _scaledVelocity;
-        private _finalPosition;
-        getNewPosition(position: Vector3, velocity: Vector3, collider: Collider, maximumRetry: number, excludedMesh: AbstractMesh, onNewPosition: (collisionIndex: number, newPosition: Vector3, collidedMesh?: AbstractMesh) => void, collisionIndex: number): void;
-        init(scene: Scene): void;
-        destroy(): void;
-        onMeshAdded(mesh: AbstractMesh): void;
-        onMeshUpdated(mesh: AbstractMesh): void;
-        onMeshRemoved(mesh: AbstractMesh): void;
-        onGeometryAdded(geometry: Geometry): void;
-        onGeometryUpdated(geometry: Geometry): void;
-        onGeometryDeleted(geometry: Geometry): void;
-        private _collideWithWorld(position, velocity, collider, maximumRetry, finalPosition, excludedMesh?);
-    }
-}
-
-declare namespace BABYLON {
-    var WorkerIncluded: boolean;
-    class CollisionCache {
-        private _meshes;
-        private _geometries;
-        getMeshes(): {
-            [n: number]: SerializedMesh;
-        };
-        getGeometries(): {
-            [s: number]: SerializedGeometry;
-        };
-        getMesh(id: any): SerializedMesh;
-        addMesh(mesh: SerializedMesh): void;
-        removeMesh(uniqueId: number): void;
-        getGeometry(id: string): SerializedGeometry;
-        addGeometry(geometry: SerializedGeometry): void;
-        removeGeometry(id: string): void;
-    }
-    class CollideWorker {
-        collider: Collider;
-        private _collisionCache;
-        private finalPosition;
-        private collisionsScalingMatrix;
-        private collisionTranformationMatrix;
-        constructor(collider: Collider, _collisionCache: CollisionCache, finalPosition: Vector3);
-        collideWithWorld(position: Vector3, velocity: Vector3, maximumRetry: number, excludedMeshUniqueId?: number): void;
-        private checkCollision(mesh);
-        private processCollisionsForSubMeshes(transformMatrix, mesh);
-        private collideForSubMesh(subMesh, transformMatrix, meshGeometry);
-        private checkSubmeshCollision(subMesh);
-    }
-    interface ICollisionDetector {
-        onInit(payload: InitPayload): void;
-        onUpdate(payload: UpdatePayload): void;
-        onCollision(payload: CollidePayload): void;
-    }
-    class CollisionDetectorTransferable implements ICollisionDetector {
-        private _collisionCache;
-        onInit(payload: InitPayload): void;
-        onUpdate(payload: UpdatePayload): void;
-        onCollision(payload: CollidePayload): void;
-    }
-}
-
-declare namespace BABYLON {
-    class IntersectionInfo {
-        bu: number;
-        bv: number;
-        distance: number;
-        faceId: number;
-        subMeshId: number;
-        constructor(bu: number, bv: number, distance: number);
-    }
-    class PickingInfo {
-        hit: boolean;
-        distance: number;
-        pickedPoint: Vector3;
-        pickedMesh: AbstractMesh;
-        bu: number;
-        bv: number;
-        faceId: number;
-        subMeshId: number;
-        pickedSprite: Sprite;
-        getNormal(useWorldCoordinates?: boolean, useVerticesNormals?: boolean): Vector3;
-        getTextureCoordinates(): Vector2;
-    }
-}
-
-declare namespace BABYLON {
-    class DebugLayer {
-        private _scene;
-        private _camera;
-        private _transformationMatrix;
-        private _enabled;
-        private _labelsEnabled;
-        private _displayStatistics;
-        private _displayTree;
-        private _displayLogs;
-        private _globalDiv;
-        private _statsDiv;
-        private _statsSubsetDiv;
-        private _optionsDiv;
-        private _optionsSubsetDiv;
-        private _logDiv;
-        private _logSubsetDiv;
-        private _treeDiv;
-        private _treeSubsetDiv;
-        private _drawingCanvas;
-        private _drawingContext;
-        private _rootElement;
-        _syncPositions: () => void;
-        private _syncData;
-        private _syncUI;
-        private _onCanvasClick;
-        private _clickPosition;
-        private _ratio;
-        private _identityMatrix;
-        private _showUI;
-        private _needToRefreshMeshesTree;
-        shouldDisplayLabel: (node: Node) => boolean;
-        shouldDisplayAxis: (mesh: Mesh) => boolean;
-        axisRatio: number;
-        accentColor: string;
-        customStatsFunction: () => string;
-        constructor(scene: Scene);
-        private _refreshMeshesTreeContent();
-        private _renderSingleAxis(zero, unit, unitText, label, color);
-        private _renderAxis(projectedPosition, mesh, globalViewport);
-        private _renderLabel(text, projectedPosition, labelOffset, onClick, getFillStyle);
-        private _isClickInsideRect(x, y, width, height);
-        isVisible(): boolean;
-        hide(): void;
-        show(showUI?: boolean, camera?: Camera, rootElement?: HTMLElement): void;
-        private _clearLabels();
-        private _generateheader(root, text);
-        private _generateTexBox(root, title, color);
-        private _generateAdvancedCheckBox(root, leftTitle, rightTitle, initialState, task, tag?);
-        private _generateCheckBox(root, title, initialState, task, tag?);
-        private _generateButton(root, title, task, tag?);
-        private _generateRadio(root, title, name, initialState, task, tag?);
-        private _generateDOMelements();
-        private _displayStats();
-    }
-}
-
-declare namespace BABYLON {
-    class BoundingBox {
-        minimum: Vector3;
-        maximum: Vector3;
-        vectors: Vector3[];
-        center: Vector3;
-        extendSize: Vector3;
-        directions: Vector3[];
-        vectorsWorld: Vector3[];
-        minimumWorld: Vector3;
-        maximumWorld: Vector3;
-        private _worldMatrix;
-        constructor(minimum: Vector3, maximum: Vector3);
-        getWorldMatrix(): Matrix;
-        _update(world: Matrix): void;
-        isInFrustum(frustumPlanes: Plane[]): boolean;
-        isCompletelyInFrustum(frustumPlanes: Plane[]): boolean;
-        intersectsPoint(point: Vector3): boolean;
-        intersectsSphere(sphere: BoundingSphere): boolean;
-        intersectsMinMax(min: Vector3, max: Vector3): boolean;
-        static Intersects(box0: BoundingBox, box1: BoundingBox): boolean;
-        static IntersectsSphere(minPoint: Vector3, maxPoint: Vector3, sphereCenter: Vector3, sphereRadius: number): boolean;
-        static IsCompletelyInFrustum(boundingVectors: Vector3[], frustumPlanes: Plane[]): boolean;
-        static IsInFrustum(boundingVectors: Vector3[], frustumPlanes: Plane[]): boolean;
-    }
-}
-
-declare namespace BABYLON {
-    class BoundingInfo {
-        minimum: Vector3;
-        maximum: Vector3;
-        boundingBox: BoundingBox;
-        boundingSphere: BoundingSphere;
-        private _isLocked;
-        constructor(minimum: Vector3, maximum: Vector3);
-        isLocked: boolean;
-        update(world: Matrix): void;
-        isInFrustum(frustumPlanes: Plane[]): boolean;
-        isCompletelyInFrustum(frustumPlanes: Plane[]): boolean;
-        _checkCollision(collider: Collider): boolean;
-        intersectsPoint(point: Vector3): boolean;
-        intersects(boundingInfo: BoundingInfo, precise: boolean): boolean;
-    }
-}
-
-declare namespace BABYLON {
-    class BoundingSphere {
-        minimum: Vector3;
-        maximum: Vector3;
-        center: Vector3;
-        radius: number;
-        centerWorld: Vector3;
-        radiusWorld: number;
-        private _tempRadiusVector;
-        constructor(minimum: Vector3, maximum: Vector3);
-        _update(world: Matrix): void;
-        isInFrustum(frustumPlanes: Plane[]): boolean;
-        intersectsPoint(point: Vector3): boolean;
-        static Intersects(sphere0: BoundingSphere, sphere1: BoundingSphere): boolean;
-    }
-}
-
-declare namespace BABYLON {
-    class Layer {
-        name: string;
-        texture: Texture;
-        isBackground: boolean;
-        color: Color4;
-        scale: Vector2;
-        offset: Vector2;
-        onDispose: () => void;
-        alphaBlendingMode: number;
-        private _scene;
-        private _vertexDeclaration;
-        private _vertexStrideSize;
-        private _vertexBuffer;
-        private _indexBuffer;
-        private _effect;
-        constructor(name: string, imgUrl: string, scene: Scene, isBackground?: boolean, color?: Color4);
-        render(): void;
-        dispose(): void;
-    }
-}
-
-declare namespace BABYLON {
-    class LensFlare {
-        size: number;
-        position: number;
-        color: Color3;
-        texture: Texture;
-        private _system;
-        constructor(size: number, position: number, color: any, imgUrl: string, system: LensFlareSystem);
-        dispose: () => void;
-    }
-}
-
-declare namespace BABYLON {
-    class LensFlareSystem {
-        name: string;
-        lensFlares: LensFlare[];
-        borderLimit: number;
-        meshesSelectionPredicate: (mesh: Mesh) => boolean;
-        layerMask: number;
-        private _scene;
-        private _emitter;
-        private _vertexDeclaration;
-        private _vertexStrideSize;
-        private _vertexBuffer;
-        private _indexBuffer;
-        private _effect;
-        private _positionX;
-        private _positionY;
-        private _isEnabled;
-        constructor(name: string, emitter: any, scene: Scene);
-        isEnabled: boolean;
-        getScene(): Scene;
-        getEmitter(): any;
-        setEmitter(newEmitter: any): void;
-        getEmitterPosition(): Vector3;
-        computeEffectivePosition(globalViewport: Viewport): boolean;
-        _isVisible(): boolean;
-        render(): boolean;
-        dispose(): void;
-        static Parse(parsedLensFlareSystem: any, scene: Scene, rootUrl: string): LensFlareSystem;
-        serialize(): any;
-    }
-}
-
-declare namespace BABYLON {
-    class DirectionalLight extends Light implements IShadowLight {
-        direction: Vector3;
-        position: Vector3;
-        private _transformedDirection;
-        transformedPosition: Vector3;
-        private _worldMatrix;
-        shadowOrthoScale: number;
-        autoUpdateExtends: boolean;
-        private _orthoLeft;
-        private _orthoRight;
-        private _orthoTop;
-        private _orthoBottom;
-        constructor(name: string, direction: Vector3, scene: Scene);
-        getAbsolutePosition(): Vector3;
-        setDirectionToTarget(target: Vector3): Vector3;
-        setShadowProjectionMatrix(matrix: Matrix, viewMatrix: Matrix, renderList: Array<AbstractMesh>): void;
-        supportsVSM(): boolean;
-        needRefreshPerFrame(): boolean;
-        needCube(): boolean;
-        getShadowDirection(faceIndex?: number): Vector3;
-        computeTransformedPosition(): boolean;
-        transferToEffect(effect: Effect, directionUniformName: string): void;
-        _getWorldMatrix(): Matrix;
-        serialize(): any;
-    }
-}
-
-declare namespace BABYLON {
-    class HemisphericLight extends Light {
-        direction: Vector3;
-        groundColor: Color3;
-        private _worldMatrix;
-        constructor(name: string, direction: Vector3, scene: Scene);
-        setDirectionToTarget(target: Vector3): Vector3;
-        getShadowGenerator(): ShadowGenerator;
-        transferToEffect(effect: Effect, directionUniformName: string, groundColorUniformName: string): void;
-        _getWorldMatrix(): Matrix;
-        serialize(): any;
-    }
-}
-
-declare namespace BABYLON {
-    interface IShadowLight {
-        id: string;
-        position: Vector3;
-        transformedPosition: Vector3;
-        name: string;
-        computeTransformedPosition(): boolean;
-        getScene(): Scene;
-        setShadowProjectionMatrix(matrix: Matrix, viewMatrix: Matrix, renderList: Array<AbstractMesh>): void;
-        supportsVSM(): boolean;
-        needRefreshPerFrame(): boolean;
-        needCube(): boolean;
-        getShadowDirection(faceIndex?: number): Vector3;
-        _shadowGenerator: ShadowGenerator;
-    }
-    class Light extends Node {
-        diffuse: Color3;
-        specular: Color3;
-        intensity: number;
-        range: number;
-        includeOnlyWithLayerMask: number;
-        includedOnlyMeshes: AbstractMesh[];
-        excludedMeshes: AbstractMesh[];
-        excludeWithLayerMask: number;
-        _shadowGenerator: ShadowGenerator;
-        private _parentedWorldMatrix;
-        _excludedMeshesIds: string[];
-        _includedOnlyMeshesIds: string[];
-        constructor(name: string, scene: Scene);
-        getShadowGenerator(): ShadowGenerator;
-        getAbsolutePosition(): Vector3;
-        transferToEffect(effect: Effect, uniformName0?: string, uniformName1?: string): void;
-        _getWorldMatrix(): Matrix;
-        canAffectMesh(mesh: AbstractMesh): boolean;
-        getWorldMatrix(): Matrix;
-        dispose(): void;
-        serialize(): any;
-        static Parse(parsedLight: any, scene: Scene): Light;
-    }
-}
-
-declare namespace BABYLON {
-    class PointLight extends Light implements IShadowLight {
-        position: Vector3;
-        private _worldMatrix;
-        transformedPosition: Vector3;
-        constructor(name: string, position: Vector3, scene: Scene);
-        getAbsolutePosition(): Vector3;
-        computeTransformedPosition(): boolean;
-        transferToEffect(effect: Effect, positionUniformName: string): void;
-        needCube(): boolean;
-        supportsVSM(): boolean;
-        needRefreshPerFrame(): boolean;
-        getShadowDirection(faceIndex?: number): Vector3;
-        setShadowProjectionMatrix(matrix: Matrix, viewMatrix: Matrix, renderList: Array<AbstractMesh>): void;
-        _getWorldMatrix(): Matrix;
-        serialize(): any;
-    }
-}
-
-declare namespace BABYLON {
-    class SpotLight extends Light implements IShadowLight {
-        position: Vector3;
-        direction: Vector3;
-        angle: number;
-        exponent: number;
-        transformedPosition: Vector3;
-        private _transformedDirection;
-        private _worldMatrix;
-        constructor(name: string, position: Vector3, direction: Vector3, angle: number, exponent: number, scene: Scene);
-        getAbsolutePosition(): Vector3;
-        setShadowProjectionMatrix(matrix: Matrix, viewMatrix: Matrix, renderList: Array<AbstractMesh>): void;
-        needCube(): boolean;
-        supportsVSM(): boolean;
-        needRefreshPerFrame(): boolean;
-        getShadowDirection(faceIndex?: number): Vector3;
-        setDirectionToTarget(target: Vector3): Vector3;
-        computeTransformedPosition(): boolean;
-        transferToEffect(effect: Effect, positionUniformName: string, directionUniformName: string): void;
-        _getWorldMatrix(): Matrix;
-        serialize(): any;
-    }
-}
-
-declare namespace BABYLON {
-    interface ISceneLoaderPlugin {
-        extensions: string;
-        importMesh: (meshesNames: any, scene: Scene, data: any, rootUrl: string, meshes: AbstractMesh[], particleSystems: ParticleSystem[], skeletons: Skeleton[]) => boolean;
-        load: (scene: Scene, data: string, rootUrl: string) => boolean;
-    }
-    class SceneLoader {
-        private static _ForceFullSceneLoadingForIncremental;
-        private static _ShowLoadingScreen;
-        static ForceFullSceneLoadingForIncremental: boolean;
-        static ShowLoadingScreen: boolean;
-        private static _registeredPlugins;
-        private static _getPluginForFilename(sceneFilename);
-        static RegisterPlugin(plugin: ISceneLoaderPlugin): void;
-        static ImportMesh(meshesNames: any, rootUrl: string, sceneFilename: string, scene: Scene, onsuccess?: (meshes: AbstractMesh[], particleSystems: ParticleSystem[], skeletons: Skeleton[]) => void, progressCallBack?: () => void, onerror?: (scene: Scene, e: any) => void): void;
-        /**
-        * Load a scene
-        * @param rootUrl a string that defines the root url for scene and resources
-        * @param sceneFilename a string that defines the name of the scene file. can start with "data:" following by the stringified version of the scene
-        * @param engine is the instance of BABYLON.Engine to use to create the scene
-        */
-        static Load(rootUrl: string, sceneFilename: any, engine: Engine, onsuccess?: (scene: Scene) => void, progressCallBack?: any, onerror?: (scene: Scene) => void): void;
-        /**
-        * Append a scene
-        * @param rootUrl a string that defines the root url for scene and resources
-        * @param sceneFilename a string that defines the name of the scene file. can start with "data:" following by the stringified version of the scene
-        * @param scene is the instance of BABYLON.Scene to append to
-        */
-        static Append(rootUrl: string, sceneFilename: any, scene: Scene, onsuccess?: (scene: Scene) => void, progressCallBack?: any, onerror?: (scene: Scene) => void): void;
-    }
-}
-
-declare namespace BABYLON {
-    class SIMDVector3 {
-        static TransformCoordinatesToRefSIMD(vector: Vector3, transformation: Matrix, result: Vector3): void;
-        static TransformCoordinatesFromFloatsToRefSIMD(x: number, y: number, z: number, transformation: Matrix, result: Vector3): void;
-    }
-    class SIMDMatrix {
-        multiplyToArraySIMD(other: Matrix, result: Matrix, offset?: number): void;
-        invertToRefSIMD(other: Matrix): Matrix;
-        static LookAtLHToRefSIMD(eyeRef: Vector3, targetRef: Vector3, upRef: Vector3, result: Matrix): void;
-    }
-    class SIMDHelper {
-        private static _isEnabled;
-        static IsEnabled: boolean;
-        static DisableSIMD(): void;
-        static EnableSIMD(): void;
-    }
-}
-
-declare namespace BABYLON {
-    class Color3 {
-        r: number;
-        g: number;
-        b: number;
-        constructor(r?: number, g?: number, b?: number);
-        toString(): string;
-        toArray(array: number[], index?: number): Color3;
-        toColor4(alpha?: number): Color4;
-        asArray(): number[];
-        toLuminance(): number;
-        multiply(otherColor: Color3): Color3;
-        multiplyToRef(otherColor: Color3, result: Color3): Color3;
-        equals(otherColor: Color3): boolean;
-        equalsFloats(r: number, g: number, b: number): boolean;
-        scale(scale: number): Color3;
-        scaleToRef(scale: number, result: Color3): Color3;
-        add(otherColor: Color3): Color3;
-        addToRef(otherColor: Color3, result: Color3): Color3;
-        subtract(otherColor: Color3): Color3;
-        subtractToRef(otherColor: Color3, result: Color3): Color3;
-        clone(): Color3;
-        copyFrom(source: Color3): Color3;
-        copyFromFloats(r: number, g: number, b: number): Color3;
-        toHexString(): string;
-        toLinearSpace(): Color3;
-        toLinearSpaceToRef(convertedColor: Color3): Color3;
-        toGammaSpace(): Color3;
-        toGammaSpaceToRef(convertedColor: Color3): Color3;
-        static FromHexString(hex: string): Color3;
-        static FromArray(array: number[], offset?: number): Color3;
-        static FromInts(r: number, g: number, b: number): Color3;
-        static Lerp(start: Color3, end: Color3, amount: number): Color3;
-        static Red(): Color3;
-        static Green(): Color3;
-        static Blue(): Color3;
-        static Black(): Color3;
-        static White(): Color3;
-        static Purple(): Color3;
-        static Magenta(): Color3;
-        static Yellow(): Color3;
-        static Gray(): Color3;
-    }
-    class Color4 {
-        r: number;
-        g: number;
-        b: number;
-        a: number;
-        constructor(r: number, g: number, b: number, a: number);
-        addInPlace(right: any): Color4;
-        asArray(): number[];
-        toArray(array: number[], index?: number): Color4;
-        add(right: Color4): Color4;
-        subtract(right: Color4): Color4;
-        subtractToRef(right: Color4, result: Color4): Color4;
-        scale(scale: number): Color4;
-        scaleToRef(scale: number, result: Color4): Color4;
-        toString(): string;
-        clone(): Color4;
-        copyFrom(source: Color4): Color4;
-        toHexString(): string;
-        static FromHexString(hex: string): Color4;
-        static Lerp(left: Color4, right: Color4, amount: number): Color4;
-        static LerpToRef(left: Color4, right: Color4, amount: number, result: Color4): void;
-        static FromArray(array: number[], offset?: number): Color4;
-        static FromInts(r: number, g: number, b: number, a: number): Color4;
-        static CheckColors4(colors: number[], count: number): number[];
-    }
-    class Vector2 {
-        x: number;
-        y: number;
-        constructor(x: number, y: number);
-        toString(): string;
-        toArray(array: number[], index?: number): Vector2;
-        asArray(): number[];
-        copyFrom(source: Vector2): Vector2;
-        copyFromFloats(x: number, y: number): Vector2;
-        add(otherVector: Vector2): Vector2;
-        addVector3(otherVector: Vector3): Vector2;
-        subtract(otherVector: Vector2): Vector2;
-        subtractInPlace(otherVector: Vector2): Vector2;
-        multiplyInPlace(otherVector: Vector2): Vector2;
-        multiply(otherVector: Vector2): Vector2;
-        multiplyToRef(otherVector: Vector2, result: Vector2): Vector2;
-        multiplyByFloats(x: number, y: number): Vector2;
-        divide(otherVector: Vector2): Vector2;
-        divideToRef(otherVector: Vector2, result: Vector2): Vector2;
-        negate(): Vector2;
-        scaleInPlace(scale: number): Vector2;
-        scale(scale: number): Vector2;
-        equals(otherVector: Vector2): boolean;
-        equalsWithEpsilon(otherVector: Vector2, epsilon?: number): boolean;
-        length(): number;
-        lengthSquared(): number;
-        normalize(): Vector2;
-        clone(): Vector2;
-        static Zero(): Vector2;
-        static FromArray(array: number[] | Float32Array, offset?: number): Vector2;
-        static FromArrayToRef(array: number[] | Float32Array, offset: number, result: Vector2): void;
-        static CatmullRom(value1: Vector2, value2: Vector2, value3: Vector2, value4: Vector2, amount: number): Vector2;
-        static Clamp(value: Vector2, min: Vector2, max: Vector2): Vector2;
-        static Hermite(value1: Vector2, tangent1: Vector2, value2: Vector2, tangent2: Vector2, amount: number): Vector2;
-        static Lerp(start: Vector2, end: Vector2, amount: number): Vector2;
-        static Dot(left: Vector2, right: Vector2): number;
-        static Normalize(vector: Vector2): Vector2;
-        static Minimize(left: Vector2, right: Vector2): Vector2;
-        static Maximize(left: Vector2, right: Vector2): Vector2;
-        static Transform(vector: Vector2, transformation: Matrix): Vector2;
-        static Distance(value1: Vector2, value2: Vector2): number;
-        static DistanceSquared(value1: Vector2, value2: Vector2): number;
-    }
-    class Vector3 {
-        x: number;
-        y: number;
-        z: number;
-        constructor(x: number, y: number, z: number);
-        toString(): string;
-        asArray(): number[];
-        toArray(array: number[] | Float32Array, index?: number): Vector3;
-        toQuaternion(): Quaternion;
-        addInPlace(otherVector: Vector3): Vector3;
-        add(otherVector: Vector3): Vector3;
-        addToRef(otherVector: Vector3, result: Vector3): Vector3;
-        subtractInPlace(otherVector: Vector3): Vector3;
-        subtract(otherVector: Vector3): Vector3;
-        subtractToRef(otherVector: Vector3, result: Vector3): Vector3;
-        subtractFromFloats(x: number, y: number, z: number): Vector3;
-        subtractFromFloatsToRef(x: number, y: number, z: number, result: Vector3): Vector3;
-        negate(): Vector3;
-        scaleInPlace(scale: number): Vector3;
-        scale(scale: number): Vector3;
-        scaleToRef(scale: number, result: Vector3): void;
-        equals(otherVector: Vector3): boolean;
-        equalsWithEpsilon(otherVector: Vector3, epsilon?: number): boolean;
-        equalsToFloats(x: number, y: number, z: number): boolean;
-        multiplyInPlace(otherVector: Vector3): Vector3;
-        multiply(otherVector: Vector3): Vector3;
-        multiplyToRef(otherVector: Vector3, result: Vector3): Vector3;
-        multiplyByFloats(x: number, y: number, z: number): Vector3;
-        divide(otherVector: Vector3): Vector3;
-        divideToRef(otherVector: Vector3, result: Vector3): Vector3;
-        MinimizeInPlace(other: Vector3): Vector3;
-        MaximizeInPlace(other: Vector3): Vector3;
-        length(): number;
-        lengthSquared(): number;
-        normalize(): Vector3;
-        clone(): Vector3;
-        copyFrom(source: Vector3): Vector3;
-        copyFromFloats(x: number, y: number, z: number): Vector3;
-        static GetClipFactor(vector0: Vector3, vector1: Vector3, axis: Vector3, size: any): number;
-        static FromArray(array: number[] | Float32Array, offset?: number): Vector3;
-        static FromFloatArray(array: Float32Array, offset?: number): Vector3;
-        static FromArrayToRef(array: number[] | Float32Array, offset: number, result: Vector3): void;
-        static FromFloatArrayToRef(array: Float32Array, offset: number, result: Vector3): void;
-        static FromFloatsToRef(x: number, y: number, z: number, result: Vector3): void;
-        static Zero(): Vector3;
-        static Up(): Vector3;
-        static TransformCoordinates(vector: Vector3, transformation: Matrix): Vector3;
-        static TransformCoordinatesToRef(vector: Vector3, transformation: Matrix, result: Vector3): void;
-        static TransformCoordinatesFromFloatsToRef(x: number, y: number, z: number, transformation: Matrix, result: Vector3): void;
-        static TransformNormal(vector: Vector3, transformation: Matrix): Vector3;
-        static TransformNormalToRef(vector: Vector3, transformation: Matrix, result: Vector3): void;
-        static TransformNormalFromFloatsToRef(x: number, y: number, z: number, transformation: Matrix, result: Vector3): void;
-        static CatmullRom(value1: Vector3, value2: Vector3, value3: Vector3, value4: Vector3, amount: number): Vector3;
-        static Clamp(value: Vector3, min: Vector3, max: Vector3): Vector3;
-        static Hermite(value1: Vector3, tangent1: Vector3, value2: Vector3, tangent2: Vector3, amount: number): Vector3;
-        static Lerp(start: Vector3, end: Vector3, amount: number): Vector3;
-        static Dot(left: Vector3, right: Vector3): number;
-        static Cross(left: Vector3, right: Vector3): Vector3;
-        static CrossToRef(left: Vector3, right: Vector3, result: Vector3): void;
-        static Normalize(vector: Vector3): Vector3;
-        static NormalizeToRef(vector: Vector3, result: Vector3): void;
-        static Project(vector: Vector3, world: Matrix, transform: Matrix, viewport: Viewport): Vector3;
-        static UnprojectFromTransform(source: Vector3, viewportWidth: number, viewportHeight: number, world: Matrix, transform: Matrix): Vector3;
-        static Unproject(source: Vector3, viewportWidth: number, viewportHeight: number, world: Matrix, view: Matrix, projection: Matrix): Vector3;
-        static Minimize(left: Vector3, right: Vector3): Vector3;
-        static Maximize(left: Vector3, right: Vector3): Vector3;
-        static Distance(value1: Vector3, value2: Vector3): number;
-        static DistanceSquared(value1: Vector3, value2: Vector3): number;
-        static Center(value1: Vector3, value2: Vector3): Vector3;
-        /**
-         * Given three orthogonal normalized left-handed oriented Vector3 axis in space (target system),
-         * RotationFromAxis() returns the rotation Euler angles (ex : rotation.x, rotation.y, rotation.z) to apply
-         * to something in order to rotate it from its local system to the given target system.
-         */
-        static RotationFromAxis(axis1: Vector3, axis2: Vector3, axis3: Vector3): Vector3;
-        /**
-         * The same than RotationFromAxis but updates the passed ref Vector3 parameter.
-         */
-        static RotationFromAxisToRef(axis1: Vector3, axis2: Vector3, axis3: Vector3, ref: Vector3): void;
-    }
-    class Vector4 {
-        x: number;
-        y: number;
-        z: number;
-        w: number;
-        constructor(x: number, y: number, z: number, w: number);
-        toString(): string;
-        asArray(): number[];
-        toArray(array: number[], index?: number): Vector4;
-        addInPlace(otherVector: Vector4): Vector4;
-        add(otherVector: Vector4): Vector4;
-        addToRef(otherVector: Vector4, result: Vector4): Vector4;
-        subtractInPlace(otherVector: Vector4): Vector4;
-        subtract(otherVector: Vector4): Vector4;
-        subtractToRef(otherVector: Vector4, result: Vector4): Vector4;
-        subtractFromFloats(x: number, y: number, z: number, w: number): Vector4;
-        subtractFromFloatsToRef(x: number, y: number, z: number, w: number, result: Vector4): Vector4;
-        negate(): Vector4;
-        scaleInPlace(scale: number): Vector4;
-        scale(scale: number): Vector4;
-        scaleToRef(scale: number, result: Vector4): void;
-        equals(otherVector: Vector4): boolean;
-        equalsWithEpsilon(otherVector: Vector4, epsilon?: number): boolean;
-        equalsToFloats(x: number, y: number, z: number, w: number): boolean;
-        multiplyInPlace(otherVector: Vector4): Vector4;
-        multiply(otherVector: Vector4): Vector4;
-        multiplyToRef(otherVector: Vector4, result: Vector4): Vector4;
-        multiplyByFloats(x: number, y: number, z: number, w: number): Vector4;
-        divide(otherVector: Vector4): Vector4;
-        divideToRef(otherVector: Vector4, result: Vector4): Vector4;
-        MinimizeInPlace(other: Vector4): Vector4;
-        MaximizeInPlace(other: Vector4): Vector4;
-        length(): number;
-        lengthSquared(): number;
-        normalize(): Vector4;
-        clone(): Vector4;
-        copyFrom(source: Vector4): Vector4;
-        copyFromFloats(x: number, y: number, z: number, w: number): Vector4;
-        static FromArray(array: number[], offset?: number): Vector4;
-        static FromArrayToRef(array: number[], offset: number, result: Vector4): void;
-        static FromFloatArrayToRef(array: Float32Array, offset: number, result: Vector4): void;
-        static FromFloatsToRef(x: number, y: number, z: number, w: number, result: Vector4): void;
-        static Zero(): Vector4;
-        static Normalize(vector: Vector4): Vector4;
-        static NormalizeToRef(vector: Vector4, result: Vector4): void;
-        static Minimize(left: Vector4, right: Vector4): Vector4;
-        static Maximize(left: Vector4, right: Vector4): Vector4;
-        static Distance(value1: Vector4, value2: Vector4): number;
-        static DistanceSquared(value1: Vector4, value2: Vector4): number;
-        static Center(value1: Vector4, value2: Vector4): Vector4;
-    }
-    class Quaternion {
-        x: number;
-        y: number;
-        z: number;
-        w: number;
-        constructor(x?: number, y?: number, z?: number, w?: number);
-        toString(): string;
-        asArray(): number[];
-        equals(otherQuaternion: Quaternion): boolean;
-        clone(): Quaternion;
-        copyFrom(other: Quaternion): Quaternion;
-        copyFromFloats(x: number, y: number, z: number, w: number): Quaternion;
-        add(other: Quaternion): Quaternion;
-        subtract(other: Quaternion): Quaternion;
-        scale(value: number): Quaternion;
-        multiply(q1: Quaternion): Quaternion;
-        multiplyToRef(q1: Quaternion, result: Quaternion): Quaternion;
-        multiplyInPlace(q1: Quaternion): Quaternion;
-        length(): number;
-        normalize(): Quaternion;
-        toEulerAngles(order?: string): Vector3;
-        toEulerAnglesToRef(result: Vector3, order?: string): Quaternion;
-        toRotationMatrix(result: Matrix): Quaternion;
-        fromRotationMatrix(matrix: Matrix): Quaternion;
-        static FromRotationMatrix(matrix: Matrix): Quaternion;
-        static FromRotationMatrixToRef(matrix: Matrix, result: Quaternion): void;
-        static Inverse(q: Quaternion): Quaternion;
-        static Identity(): Quaternion;
-        static RotationAxis(axis: Vector3, angle: number): Quaternion;
-        static FromArray(array: number[], offset?: number): Quaternion;
-        static RotationYawPitchRoll(yaw: number, pitch: number, roll: number): Quaternion;
-        static RotationYawPitchRollToRef(yaw: number, pitch: number, roll: number, result: Quaternion): void;
-        static RotationAlphaBetaGamma(alpha: number, beta: number, gamma: number): Quaternion;
-        static RotationAlphaBetaGammaToRef(alpha: number, beta: number, gamma: number, result: Quaternion): void;
-        static Slerp(left: Quaternion, right: Quaternion, amount: number): Quaternion;
-    }
-    class Matrix {
-        private static _tempQuaternion;
-        private static _xAxis;
-        private static _yAxis;
-        private static _zAxis;
-        m: Float32Array;
-        isIdentity(): boolean;
-        determinant(): number;
-        toArray(): Float32Array;
-        asArray(): Float32Array;
-        invert(): Matrix;
-        reset(): Matrix;
-        add(other: Matrix): Matrix;
-        addToRef(other: Matrix, result: Matrix): Matrix;
-        addToSelf(other: Matrix): Matrix;
-        invertToRef(other: Matrix): Matrix;
-        setTranslation(vector3: Vector3): Matrix;
-        multiply(other: Matrix): Matrix;
-        copyFrom(other: Matrix): Matrix;
-        copyToArray(array: Float32Array, offset?: number): Matrix;
-        multiplyToRef(other: Matrix, result: Matrix): Matrix;
-        multiplyToArray(other: Matrix, result: Float32Array, offset: number): Matrix;
-        equals(value: Matrix): boolean;
-        clone(): Matrix;
-        decompose(scale: Vector3, rotation: Quaternion, translation: Vector3): boolean;
-        static FromArray(array: number[], offset?: number): Matrix;
-        static FromArrayToRef(array: number[], offset: number, result: Matrix): void;
-        static FromFloat32ArrayToRefScaled(array: Float32Array, offset: number, scale: number, result: Matrix): void;
-        static FromValuesToRef(initialM11: number, initialM12: number, initialM13: number, initialM14: number, initialM21: number, initialM22: number, initialM23: number, initialM24: number, initialM31: number, initialM32: number, initialM33: number, initialM34: number, initialM41: number, initialM42: number, initialM43: number, initialM44: number, result: Matrix): void;
-        static FromValues(initialM11: number, initialM12: number, initialM13: number, initialM14: number, initialM21: number, initialM22: number, initialM23: number, initialM24: number, initialM31: number, initialM32: number, initialM33: number, initialM34: number, initialM41: number, initialM42: number, initialM43: number, initialM44: number): Matrix;
-        static Compose(scale: Vector3, rotation: Quaternion, translation: Vector3): Matrix;
-        static Identity(): Matrix;
-        static IdentityToRef(result: Matrix): void;
-        static Zero(): Matrix;
-        static RotationX(angle: number): Matrix;
-        static Invert(source: Matrix): Matrix;
-        static RotationXToRef(angle: number, result: Matrix): void;
-        static RotationY(angle: number): Matrix;
-        static RotationYToRef(angle: number, result: Matrix): void;
-        static RotationZ(angle: number): Matrix;
-        static RotationZToRef(angle: number, result: Matrix): void;
-        static RotationAxis(axis: Vector3, angle: number): Matrix;
-        static RotationAxisToRef(axis: Vector3, angle: number, result: Matrix): void;
-        static RotationYawPitchRoll(yaw: number, pitch: number, roll: number): Matrix;
-        static RotationYawPitchRollToRef(yaw: number, pitch: number, roll: number, result: Matrix): void;
-        static Scaling(x: number, y: number, z: number): Matrix;
-        static ScalingToRef(x: number, y: number, z: number, result: Matrix): void;
-        static Translation(x: number, y: number, z: number): Matrix;
-        static TranslationToRef(x: number, y: number, z: number, result: Matrix): void;
-        static Lerp(startValue: Matrix, endValue: Matrix, gradient: number): Matrix;
-        static LookAtLH(eye: Vector3, target: Vector3, up: Vector3): Matrix;
-        static LookAtLHToRef(eye: Vector3, target: Vector3, up: Vector3, result: Matrix): void;
-        static OrthoLH(width: number, height: number, znear: number, zfar: number): Matrix;
-        static OrthoLHToRef(width: number, height: number, znear: number, zfar: number, result: Matrix): void;
-        static OrthoOffCenterLH(left: number, right: number, bottom: number, top: number, znear: number, zfar: number): Matrix;
-        static OrthoOffCenterLHToRef(left: number, right: any, bottom: number, top: number, znear: number, zfar: number, result: Matrix): void;
-        static PerspectiveLH(width: number, height: number, znear: number, zfar: number): Matrix;
-        static PerspectiveFovLH(fov: number, aspect: number, znear: number, zfar: number): Matrix;
-        static PerspectiveFovLHToRef(fov: number, aspect: number, znear: number, zfar: number, result: Matrix, fovMode?: number): void;
-        static GetFinalMatrix(viewport: Viewport, world: Matrix, view: Matrix, projection: Matrix, zmin: number, zmax: number): Matrix;
-        static GetAsMatrix2x2(matrix: Matrix): Float32Array;
-        static GetAsMatrix3x3(matrix: Matrix): Float32Array;
-        static Transpose(matrix: Matrix): Matrix;
-        static Reflection(plane: Plane): Matrix;
-        static ReflectionToRef(plane: Plane, result: Matrix): void;
-    }
-    class Plane {
-        normal: Vector3;
-        d: number;
-        constructor(a: number, b: number, c: number, d: number);
-        asArray(): number[];
-        clone(): Plane;
-        normalize(): Plane;
-        transform(transformation: Matrix): Plane;
-        dotCoordinate(point: any): number;
-        copyFromPoints(point1: Vector3, point2: Vector3, point3: Vector3): Plane;
-        isFrontFacingTo(direction: Vector3, epsilon: number): boolean;
-        signedDistanceTo(point: Vector3): number;
-        static FromArray(array: number[]): Plane;
-        static FromPoints(point1: any, point2: any, point3: any): Plane;
-        static FromPositionAndNormal(origin: Vector3, normal: Vector3): Plane;
-        static SignedDistanceToPlaneFromPositionAndNormal(origin: Vector3, normal: Vector3, point: Vector3): number;
-    }
-    class Viewport {
-        x: number;
-        y: number;
-        width: number;
-        height: number;
-        constructor(x: number, y: number, width: number, height: number);
-        toGlobal(engine: Engine): Viewport;
-        toScreenGlobal(engine: Engine): Viewport;
-    }
-    class Frustum {
-        static GetPlanes(transform: Matrix): Plane[];
-        static GetPlanesToRef(transform: Matrix, frustumPlanes: Plane[]): void;
-    }
-    class Ray {
-        origin: Vector3;
-        direction: Vector3;
-        length: number;
-        private _edge1;
-        private _edge2;
-        private _pvec;
-        private _tvec;
-        private _qvec;
-        constructor(origin: Vector3, direction: Vector3, length?: number);
-        intersectsBoxMinMax(minimum: Vector3, maximum: Vector3): boolean;
-        intersectsBox(box: BoundingBox): boolean;
-        intersectsSphere(sphere: any): boolean;
-        intersectsTriangle(vertex0: Vector3, vertex1: Vector3, vertex2: Vector3): IntersectionInfo;
-        static CreateNew(x: number, y: number, viewportWidth: number, viewportHeight: number, world: Matrix, view: Matrix, projection: Matrix): Ray;
-        /**
-        * Function will create a new transformed ray starting from origin and ending at the end point. Ray's length will be set, and ray will be
-        * transformed to the given world matrix.
-        * @param origin The origin point
-        * @param end The end point
-        * @param world a matrix to transform the ray to. Default is the identity matrix.
-        */
-        static CreateNewFromTo(origin: Vector3, end: Vector3, world?: Matrix): Ray;
-        static Transform(ray: Ray, matrix: Matrix): Ray;
-    }
-    enum Space {
-        LOCAL = 0,
-        WORLD = 1,
-    }
-    class Axis {
-        static X: Vector3;
-        static Y: Vector3;
-        static Z: Vector3;
-    }
-    class BezierCurve {
-        static interpolate(t: number, x1: number, y1: number, x2: number, y2: number): number;
-    }
-    enum Orientation {
-        CW = 0,
-        CCW = 1,
-    }
-    class Angle {
-        private _radians;
-        constructor(radians: number);
-        degrees: () => number;
-        radians: () => number;
-        static BetweenTwoPoints(a: Vector2, b: Vector2): Angle;
-        static FromRadians(radians: number): Angle;
-        static FromDegrees(degrees: number): Angle;
-    }
-    class Arc2 {
-        startPoint: Vector2;
-        midPoint: Vector2;
-        endPoint: Vector2;
-        centerPoint: Vector2;
-        radius: number;
-        angle: Angle;
-        startAngle: Angle;
-        orientation: Orientation;
-        constructor(startPoint: Vector2, midPoint: Vector2, endPoint: Vector2);
-    }
-    class PathCursor {
-        private path;
-        private _onchange;
-        value: number;
-        animations: Animation[];
-        constructor(path: Path2);
-        getPoint(): Vector3;
-        moveAhead(step?: number): PathCursor;
-        moveBack(step?: number): PathCursor;
-        move(step: number): PathCursor;
-        private ensureLimits();
-        private markAsDirty(propertyName);
-        private raiseOnChange();
-        onchange(f: (cursor: PathCursor) => void): PathCursor;
-    }
-    class Path2 {
-        private _points;
-        private _length;
-        closed: boolean;
-        constructor(x: number, y: number);
-        addLineTo(x: number, y: number): Path2;
-        addArcTo(midX: number, midY: number, endX: number, endY: number, numberOfSegments?: number): Path2;
-        close(): Path2;
-        length(): number;
-        getPoints(): Vector2[];
-        getPointAtLengthPosition(normalizedLengthPosition: number): Vector2;
-        static StartingAt(x: number, y: number): Path2;
-    }
-    class Path3D {
-        path: Vector3[];
-        private _curve;
-        private _distances;
-        private _tangents;
-        private _normals;
-        private _binormals;
-        private _raw;
-        /**
-        * new Path3D(path, normal, raw)
-        * path : an array of Vector3, the curve axis of the Path3D
-        * normal (optional) : Vector3, the first wanted normal to the curve. Ex (0, 1, 0) for a vertical normal.
-        * raw (optional, default false) : boolean, if true the returned Path3D isn't normalized. Useful to depict path acceleration or speed.
-        */
-        constructor(path: Vector3[], firstNormal?: Vector3, raw?: boolean);
-        getCurve(): Vector3[];
-        getTangents(): Vector3[];
-        getNormals(): Vector3[];
-        getBinormals(): Vector3[];
-        getDistances(): number[];
-        update(path: Vector3[], firstNormal?: Vector3): Path3D;
-        private _compute(firstNormal);
-        private _getFirstNonNullVector(index);
-        private _getLastNonNullVector(index);
-        private _normalVector(v0, vt, va);
-    }
-    class Curve3 {
-        private _points;
-        private _length;
-        static CreateQuadraticBezier(v0: Vector3, v1: Vector3, v2: Vector3, nbPoints: number): Curve3;
-        static CreateCubicBezier(v0: Vector3, v1: Vector3, v2: Vector3, v3: Vector3, nbPoints: number): Curve3;
-        static CreateHermiteSpline(p1: Vector3, t1: Vector3, p2: Vector3, t2: Vector3, nbPoints: number): Curve3;
-        constructor(points: Vector3[]);
-        getPoints(): Vector3[];
-        length(): number;
-        continue(curve: Curve3): Curve3;
-        private _computeLength(path);
-    }
-    class PositionNormalVertex {
-        position: Vector3;
-        normal: Vector3;
-        constructor(position?: Vector3, normal?: Vector3);
-        clone(): PositionNormalVertex;
-    }
-    class PositionNormalTextureVertex {
-        position: Vector3;
-        normal: Vector3;
-        uv: Vector2;
-        constructor(position?: Vector3, normal?: Vector3, uv?: Vector2);
-        clone(): PositionNormalTextureVertex;
-    }
-    class Tmp {
-        static Vector2: Vector2[];
-        static Vector3: Vector3[];
-        static Vector4: Vector4[];
-        static Quaternion: Quaternion[];
-        static Matrix: Matrix[];
-    }
-}
-
-declare namespace BABYLON {
-    class EffectFallbacks {
-        private _defines;
-        private _currentRank;
-        private _maxRank;
-        private _mesh;
-        private _meshRank;
-        addFallback(rank: number, define: string): void;
-        addCPUSkinningFallback(rank: number, mesh: BABYLON.AbstractMesh): void;
-        isMoreFallbacks: boolean;
-        reduce(currentDefines: string): string;
-    }
-    class Effect {
-        name: any;
-        defines: string;
-        onCompiled: (effect: Effect) => void;
-        onError: (effect: Effect, errors: string) => void;
-        onBind: (effect: Effect) => void;
-        private _engine;
-        private _uniformsNames;
-        private _samplers;
-        private _isReady;
-        private _compilationError;
-        private _attributesNames;
-        private _attributes;
-        private _uniforms;
-        _key: string;
-        private _program;
-        private _valueCache;
-        constructor(baseName: any, attributesNames: string[], uniformsNames: string[], samplers: string[], engine: any, defines?: string, fallbacks?: EffectFallbacks, onCompiled?: (effect: Effect) => void, onError?: (effect: Effect, errors: string) => void);
-        isReady(): boolean;
-        getProgram(): WebGLProgram;
-        getAttributesNames(): string[];
-        getAttributeLocation(index: number): number;
-        getAttributeLocationByName(name: string): number;
-        getAttributesCount(): number;
-        getUniformIndex(uniformName: string): number;
-        getUniform(uniformName: string): WebGLUniformLocation;
-        getSamplers(): string[];
-        getCompilationError(): string;
-        _loadVertexShader(vertex: any, callback: (data: any) => void): void;
-        _loadFragmentShader(fragment: any, callback: (data: any) => void): void;
-        private _dumpShadersName();
-        private _prepareEffect(vertexSourceCode, fragmentSourceCode, attributesNames, defines, fallbacks?);
-        isSupported: boolean;
-        _bindTexture(channel: string, texture: WebGLTexture): void;
-        setTexture(channel: string, texture: BaseTexture): void;
-        setTextureFromPostProcess(channel: string, postProcess: PostProcess): void;
-        _cacheMatrix(uniformName: any, matrix: any): void;
-        _cacheFloat2(uniformName: string, x: number, y: number): void;
-        _cacheFloat3(uniformName: string, x: number, y: number, z: number): void;
-        _cacheFloat4(uniformName: string, x: number, y: number, z: number, w: number): void;
-        setArray(uniformName: string, array: number[]): Effect;
-        setArray2(uniformName: string, array: number[]): Effect;
-        setArray3(uniformName: string, array: number[]): Effect;
-        setArray4(uniformName: string, array: number[]): Effect;
-        setMatrices(uniformName: string, matrices: Float32Array): Effect;
-        setMatrix(uniformName: string, matrix: Matrix): Effect;
-        setMatrix3x3(uniformName: string, matrix: Float32Array): Effect;
-        setMatrix2x2(uniformname: string, matrix: Float32Array): Effect;
-        setFloat(uniformName: string, value: number): Effect;
-        setBool(uniformName: string, bool: boolean): Effect;
-        setVector2(uniformName: string, vector2: Vector2): Effect;
-        setFloat2(uniformName: string, x: number, y: number): Effect;
-        setVector3(uniformName: string, vector3: Vector3): Effect;
-        setFloat3(uniformName: string, x: number, y: number, z: number): Effect;
-        setVector4(uniformName: string, vector4: Vector4): Effect;
-        setFloat4(uniformName: string, x: number, y: number, z: number, w: number): Effect;
-        setColor3(uniformName: string, color3: Color3): Effect;
-        setColor4(uniformName: string, color3: Color3, alpha: number): Effect;
-        static ShadersStore: {};
-    }
-}
-
-declare namespace BABYLON {
-    class MaterialDefines {
-        _keys: string[];
-        isEqual(other: MaterialDefines): boolean;
-        cloneTo(other: MaterialDefines): void;
-        reset(): void;
-        toString(): string;
-    }
-    class Material {
-        name: string;
-        private static _TriangleFillMode;
-        private static _WireFrameFillMode;
-        private static _PointFillMode;
-        static TriangleFillMode: number;
-        static WireFrameFillMode: number;
-        static PointFillMode: number;
-        private static _ClockWiseSideOrientation;
-        private static _CounterClockWiseSideOrientation;
-        static ClockWiseSideOrientation: number;
-        static CounterClockWiseSideOrientation: number;
-        id: string;
-        checkReadyOnEveryCall: boolean;
-        checkReadyOnlyOnce: boolean;
-        state: string;
-        alpha: number;
-        backFaceCulling: boolean;
-        sideOrientation: number;
-        onCompiled: (effect: Effect) => void;
-        onError: (effect: Effect, errors: string) => void;
-        onDispose: () => void;
-        onBind: (material: Material, mesh: Mesh) => void;
-        getRenderTargetTextures: () => SmartArray<RenderTargetTexture>;
-        alphaMode: number;
-        disableDepthWrite: boolean;
-        fogEnabled: boolean;
-        _effect: Effect;
-        _wasPreviouslyReady: boolean;
-        private _scene;
-        private _fillMode;
-        private _cachedDepthWriteState;
-        pointSize: number;
-        zOffset: number;
-        wireframe: boolean;
-        pointsCloud: boolean;
-        fillMode: number;
-        constructor(name: string, scene: Scene, doNotAdd?: boolean);
-        isFrozen: boolean;
-        freeze(): void;
-        unfreeze(): void;
-        isReady(mesh?: AbstractMesh, useInstances?: boolean): boolean;
-        getEffect(): Effect;
-        getScene(): Scene;
-        needAlphaBlending(): boolean;
-        needAlphaTesting(): boolean;
-        getAlphaTestTexture(): BaseTexture;
-        trackCreation(onCompiled: (effect: Effect) => void, onError: (effect: Effect, errors: string) => void): void;
-        markDirty(): void;
-        _preBind(): void;
-        bind(world: Matrix, mesh?: Mesh): void;
-        bindOnlyWorldMatrix(world: Matrix): void;
-        unbind(): void;
-        clone(name: string): Material;
-        getBindedMeshes(): AbstractMesh[];
-        dispose(forceDisposeEffect?: boolean): void;
-        copyTo(other: Material): void;
-        serialize(): any;
-        static ParseMultiMaterial(parsedMultiMaterial: any, scene: Scene): MultiMaterial;
-        static Parse(parsedMaterial: any, scene: Scene, rootUrl: string): any;
-    }
-}
-
-declare namespace BABYLON {
-    class MultiMaterial extends Material {
-        subMaterials: Material[];
-        constructor(name: string, scene: Scene);
-        getSubMaterial(index: any): Material;
-        isReady(mesh?: AbstractMesh): boolean;
-        clone(name: string, cloneChildren?: boolean): MultiMaterial;
-        serialize(): any;
-    }
-}
-
-declare namespace BABYLON {
-    class ShaderMaterial extends Material {
-        private _shaderPath;
-        private _options;
-        private _textures;
-        private _floats;
-        private _floatsArrays;
-        private _colors3;
-        private _colors4;
-        private _vectors2;
-        private _vectors3;
-        private _vectors4;
-        private _matrices;
-        private _matrices3x3;
-        private _matrices2x2;
-        private _cachedWorldViewMatrix;
-        private _renderId;
-        constructor(name: string, scene: Scene, shaderPath: any, options: any);
-        needAlphaBlending(): boolean;
-        needAlphaTesting(): boolean;
-        private _checkUniform(uniformName);
-        setTexture(name: string, texture: Texture): ShaderMaterial;
-        setFloat(name: string, value: number): ShaderMaterial;
-        setFloats(name: string, value: number[]): ShaderMaterial;
-        setColor3(name: string, value: Color3): ShaderMaterial;
-        setColor4(name: string, value: Color4): ShaderMaterial;
-        setVector2(name: string, value: Vector2): ShaderMaterial;
-        setVector3(name: string, value: Vector3): ShaderMaterial;
-        setVector4(name: string, value: Vector4): ShaderMaterial;
-        setMatrix(name: string, value: Matrix): ShaderMaterial;
-        setMatrix3x3(name: string, value: Float32Array): ShaderMaterial;
-        setMatrix2x2(name: string, value: Float32Array): ShaderMaterial;
-        isReady(mesh?: AbstractMesh, useInstances?: boolean): boolean;
-        bindOnlyWorldMatrix(world: Matrix): void;
-        bind(world: Matrix, mesh?: Mesh): void;
-        clone(name: string): ShaderMaterial;
-        dispose(forceDisposeEffect?: boolean): void;
-        serialize(): any;
-        static Parse(source: any, scene: Scene, rootUrl: string): ShaderMaterial;
-    }
-}
-
-declare namespace BABYLON {
-    class FresnelParameters {
-        isEnabled: boolean;
-        leftColor: Color3;
-        rightColor: Color3;
-        bias: number;
-        power: number;
-        clone(): FresnelParameters;
-        serialize(): any;
-        static Parse(parsedFresnelParameters: any): FresnelParameters;
-    }
-    class StandardMaterial extends Material {
-        diffuseTexture: BaseTexture;
-        ambientTexture: BaseTexture;
-        opacityTexture: BaseTexture;
-        reflectionTexture: BaseTexture;
-        emissiveTexture: BaseTexture;
-        specularTexture: BaseTexture;
-        bumpTexture: BaseTexture;
-        lightmapTexture: BaseTexture;
-        ambientColor: Color3;
-        diffuseColor: Color3;
-        specularColor: Color3;
-        specularPower: number;
-        emissiveColor: Color3;
-        useAlphaFromDiffuseTexture: boolean;
-        useEmissiveAsIllumination: boolean;
-        linkEmissiveWithDiffuse: boolean;
-        useReflectionFresnelFromSpecular: boolean;
-        useSpecularOverAlpha: boolean;
-        disableLighting: boolean;
-        roughness: number;
-        useLightmapAsShadowmap: boolean;
-        diffuseFresnelParameters: FresnelParameters;
-        opacityFresnelParameters: FresnelParameters;
-        reflectionFresnelParameters: FresnelParameters;
-        emissiveFresnelParameters: FresnelParameters;
-        useGlossinessFromSpecularMapAlpha: boolean;
-        private _renderTargets;
-        private _worldViewProjectionMatrix;
-        private _globalAmbientColor;
-        private _renderId;
-        private _defines;
-        private _cachedDefines;
-        private _useLogarithmicDepth;
-        constructor(name: string, scene: Scene);
-        useLogarithmicDepth: boolean;
-        needAlphaBlending(): boolean;
-        needAlphaTesting(): boolean;
-        private _shouldUseAlphaFromDiffuseTexture();
-        getAlphaTestTexture(): BaseTexture;
-        private _checkCache(scene, mesh?, useInstances?);
-        static PrepareDefinesForLights(scene: Scene, mesh: AbstractMesh, defines: MaterialDefines): boolean;
-        private static _scaledDiffuse;
-        private static _scaledSpecular;
-        static BindLights(scene: Scene, mesh: AbstractMesh, effect: Effect, defines: MaterialDefines): void;
-        isReady(mesh?: AbstractMesh, useInstances?: boolean): boolean;
-        unbind(): void;
-        bindOnlyWorldMatrix(world: Matrix): void;
-        bind(world: Matrix, mesh?: Mesh): void;
-        getAnimatables(): IAnimatable[];
-        dispose(forceDisposeEffect?: boolean): void;
-        clone(name: string): StandardMaterial;
-        serialize(): any;
-        static DiffuseTextureEnabled: boolean;
-        static AmbientTextureEnabled: boolean;
-        static OpacityTextureEnabled: boolean;
-        static ReflectionTextureEnabled: boolean;
-        static EmissiveTextureEnabled: boolean;
-        static SpecularTextureEnabled: boolean;
-        static BumpTextureEnabled: boolean;
-        static FresnelEnabled: boolean;
-        static LightmapEnabled: boolean;
-        static Parse(source: any, scene: Scene, rootUrl: string): StandardMaterial;
-    }
-}
-
-declare namespace BABYLON {
-    class AbstractMesh extends Node implements IDisposable {
-        private static _BILLBOARDMODE_NONE;
-        private static _BILLBOARDMODE_X;
-        private static _BILLBOARDMODE_Y;
-        private static _BILLBOARDMODE_Z;
-        private static _BILLBOARDMODE_ALL;
-        static BILLBOARDMODE_NONE: number;
-        static BILLBOARDMODE_X: number;
-        static BILLBOARDMODE_Y: number;
-        static BILLBOARDMODE_Z: number;
-        static BILLBOARDMODE_ALL: number;
-        definedFacingForward: boolean;
-        position: Vector3;
-        rotation: Vector3;
-        rotationQuaternion: Quaternion;
-        scaling: Vector3;
-        billboardMode: number;
-        visibility: number;
-        alphaIndex: number;
-        infiniteDistance: boolean;
-        isVisible: boolean;
-        isPickable: boolean;
-        showBoundingBox: boolean;
-        showSubMeshesBoundingBox: boolean;
-        onDispose: any;
-        isBlocker: boolean;
-        renderingGroupId: number;
-        material: Material;
-        receiveShadows: boolean;
-        actionManager: ActionManager;
-        renderOutline: boolean;
-        outlineColor: Color3;
-        outlineWidth: number;
-        renderOverlay: boolean;
-        overlayColor: Color3;
-        overlayAlpha: number;
-        hasVertexAlpha: boolean;
-        useVertexColors: boolean;
-        applyFog: boolean;
-        computeBonesUsingShaders: boolean;
-        scalingDeterminant: number;
-        numBoneInfluencers: number;
-        useOctreeForRenderingSelection: boolean;
-        useOctreeForPicking: boolean;
-        useOctreeForCollisions: boolean;
-        layerMask: number;
-        alwaysSelectAsActiveMesh: boolean;
-        _physicImpostor: number;
-        _physicsMass: number;
-        _physicsFriction: number;
-        _physicRestitution: number;
-        onPhysicsCollide: (collidedMesh: AbstractMesh, contact: any) => void;
-        private _checkCollisions;
-        ellipsoid: Vector3;
-        ellipsoidOffset: Vector3;
-        private _collider;
-        private _oldPositionForCollisions;
-        private _diffPositionForCollisions;
-        private _newPositionForCollisions;
-        onCollide: (collidedMesh: AbstractMesh) => void;
-        onCollisionPositionChange: (newPosition: Vector3) => void;
-        private _meshToBoneReferal;
-        edgesWidth: number;
-        edgesColor: Color4;
-        _edgesRenderer: EdgesRenderer;
-        private _localWorld;
-        _worldMatrix: Matrix;
-        private _rotateYByPI;
-        private _absolutePosition;
-        private _collisionsTransformMatrix;
-        private _collisionsScalingMatrix;
-        _positions: Vector3[];
-        private _isDirty;
-        _masterMesh: AbstractMesh;
-        _materialDefines: MaterialDefines;
-        _boundingInfo: BoundingInfo;
-        private _pivotMatrix;
-        _isDisposed: boolean;
-        _renderId: number;
-        subMeshes: SubMesh[];
-        _submeshesOctree: Octree<SubMesh>;
-        _intersectionsInProgress: AbstractMesh[];
-        private _onAfterWorldMatrixUpdate;
-        private _isWorldMatrixFrozen;
-        _unIndexed: boolean;
-        _poseMatrix: Matrix;
-        _waitingActions: any;
-        _waitingFreezeWorldMatrix: boolean;
-        private _skeleton;
-        _bonesTransformMatrices: Float32Array;
-        skeleton: Skeleton;
-        constructor(name: string, scene: Scene);
-        updatePoseMatrix(matrix: Matrix): void;
-        getPoseMatrix(): Matrix;
-        disableEdgesRendering(): void;
-        enableEdgesRendering(epsilon?: number, checkVerticesInsteadOfIndices?: boolean): void;
-        isBlocked: boolean;
-        getLOD(camera: Camera): AbstractMesh;
-        getTotalVertices(): number;
-        getIndices(): number[] | Int32Array;
-        getVerticesData(kind: string): number[] | Float32Array;
-        isVerticesDataPresent(kind: string): boolean;
-        getBoundingInfo(): BoundingInfo;
-        useBones: boolean;
-        _preActivate(): void;
-        _activate(renderId: number): void;
-        getWorldMatrix(): Matrix;
-        worldMatrixFromCache: Matrix;
-        absolutePosition: Vector3;
-        freezeWorldMatrix(): void;
-        unfreezeWorldMatrix(): void;
-        isWorldMatrixFrozen: boolean;
-        rotate(axis: Vector3, amount: number, space?: Space): void;
-        translate(axis: Vector3, distance: number, space?: Space): void;
-        getAbsolutePosition(): Vector3;
-        setAbsolutePosition(absolutePosition: Vector3): void;
-        /**
-         * Perform relative position change from the point of view of behind the front of the mesh.
-         * This is performed taking into account the meshes current rotation, so you do not have to care.
-         * Supports definition of mesh facing forward or backward.
-         * @param {number} amountRight
-         * @param {number} amountUp
-         * @param {number} amountForward
-         */
-        movePOV(amountRight: number, amountUp: number, amountForward: number): void;
-        /**
-         * Calculate relative position change from the point of view of behind the front of the mesh.
-         * This is performed taking into account the meshes current rotation, so you do not have to care.
-         * Supports definition of mesh facing forward or backward.
-         * @param {number} amountRight
-         * @param {number} amountUp
-         * @param {number} amountForward
-         */
-        calcMovePOV(amountRight: number, amountUp: number, amountForward: number): Vector3;
-        /**
-         * Perform relative rotation change from the point of view of behind the front of the mesh.
-         * Supports definition of mesh facing forward or backward.
-         * @param {number} flipBack
-         * @param {number} twirlClockwise
-         * @param {number} tiltRight
-         */
-        rotatePOV(flipBack: number, twirlClockwise: number, tiltRight: number): void;
-        /**
-         * Calculate relative rotation change from the point of view of behind the front of the mesh.
-         * Supports definition of mesh facing forward or backward.
-         * @param {number} flipBack
-         * @param {number} twirlClockwise
-         * @param {number} tiltRight
-         */
-        calcRotatePOV(flipBack: number, twirlClockwise: number, tiltRight: number): Vector3;
-        setPivotMatrix(matrix: Matrix): void;
-        getPivotMatrix(): Matrix;
-        _isSynchronized(): boolean;
-        _initCache(): void;
-        markAsDirty(property: string): void;
-        _updateBoundingInfo(): void;
-        _updateSubMeshesBoundingInfo(matrix: Matrix): void;
-        computeWorldMatrix(force?: boolean): Matrix;
-        /**
-        * If you'd like to be callbacked after the mesh position, rotation or scaling has been updated
-        * @param func: callback function to add
-        */
-        registerAfterWorldMatrixUpdate(func: (mesh: AbstractMesh) => void): void;
-        unregisterAfterWorldMatrixUpdate(func: (mesh: AbstractMesh) => void): void;
-        setPositionWithLocalVector(vector3: Vector3): void;
-        getPositionExpressedInLocalSpace(): Vector3;
-        locallyTranslate(vector3: Vector3): void;
-        lookAt(targetPoint: Vector3, yawCor: number, pitchCor: number, rollCor: number): void;
-        attachToBone(bone: Bone, affectedMesh: AbstractMesh): void;
-        detachFromBone(): void;
-        isInFrustum(frustumPlanes: Plane[]): boolean;
-        isCompletelyInFrustum(camera?: Camera): boolean;
-        intersectsMesh(mesh: AbstractMesh, precise?: boolean): boolean;
-        intersectsPoint(point: Vector3): boolean;
-        setPhysicsState(impostor?: any, options?: PhysicsBodyCreationOptions): any;
-        getPhysicsImpostor(): number;
-        getPhysicsMass(): number;
-        getPhysicsFriction(): number;
-        getPhysicsRestitution(): number;
-        getPositionInCameraSpace(camera?: Camera): Vector3;
-        getDistanceToCamera(camera?: Camera): number;
-        applyImpulse(force: Vector3, contactPoint: Vector3): void;
-        setPhysicsLinkWith(otherMesh: Mesh, pivot1: Vector3, pivot2: Vector3, options?: any): void;
-        updatePhysicsBodyPosition(): void;
-        checkCollisions: boolean;
-        moveWithCollisions(velocity: Vector3): void;
-        private _onCollisionPositionChange;
-        /**
-        * This function will create an octree to help select the right submeshes for rendering, picking and collisions
-        * Please note that you must have a decent number of submeshes to get performance improvements when using octree
-        */
-        createOrUpdateSubmeshesOctree(maxCapacity?: number, maxDepth?: number): Octree<SubMesh>;
-        _collideForSubMesh(subMesh: SubMesh, transformMatrix: Matrix, collider: Collider): void;
-        _processCollisionsForSubMeshes(collider: Collider, transformMatrix: Matrix): void;
-        _checkCollision(collider: Collider): void;
-        _generatePointsArray(): boolean;
-        intersects(ray: Ray, fastCheck?: boolean): PickingInfo;
-        clone(name: string, newParent: Node, doNotCloneChildren?: boolean): AbstractMesh;
-        releaseSubMeshes(): void;
-        dispose(doNotRecurse?: boolean): void;
-    }
-}
-
-declare namespace BABYLON {
-    class CSG {
-        private polygons;
-        matrix: Matrix;
-        position: Vector3;
-        rotation: Vector3;
-        rotationQuaternion: Quaternion;
-        scaling: Vector3;
-        static FromMesh(mesh: Mesh): CSG;
-        private static FromPolygons(polygons);
-        clone(): CSG;
-        private toPolygons();
-        union(csg: CSG): CSG;
-        unionInPlace(csg: CSG): void;
-        subtract(csg: CSG): CSG;
-        subtractInPlace(csg: CSG): void;
-        intersect(csg: CSG): CSG;
-        intersectInPlace(csg: CSG): void;
-        inverse(): CSG;
-        inverseInPlace(): void;
-        copyTransformAttributes(csg: CSG): CSG;
-        buildMeshGeometry(name: string, scene: Scene, keepSubMeshes: boolean): Mesh;
-        toMesh(name: string, material: Material, scene: Scene, keepSubMeshes: boolean): Mesh;
-    }
-}
-
-declare namespace BABYLON {
-    class Geometry implements IGetSetVerticesData {
-        id: string;
-        delayLoadState: number;
-        delayLoadingFile: string;
-        onGeometryUpdated: (geometry: Geometry, kind?: string) => void;
-        private _scene;
-        private _engine;
-        private _meshes;
-        private _totalVertices;
-        private _indices;
-        private _vertexBuffers;
-        private _isDisposed;
-        private _extend;
-        _delayInfo: any;
-        private _indexBuffer;
-        _boundingInfo: BoundingInfo;
-        _delayLoadingFunction: (any: any, geometry: Geometry) => void;
-        _softwareSkinningRenderId: number;
-        constructor(id: string, scene: Scene, vertexData?: VertexData, updatable?: boolean, mesh?: Mesh);
-        extend: {
-            minimum: Vector3;
-            maximum: Vector3;
-        };
-        getScene(): Scene;
-        getEngine(): Engine;
-        isReady(): boolean;
-        setAllVerticesData(vertexData: VertexData, updatable?: boolean): void;
-        setVerticesData(kind: string, data: number[] | Float32Array, updatable?: boolean, stride?: number): void;
-        updateVerticesDataDirectly(kind: string, data: Float32Array, offset: number): void;
-        updateVerticesData(kind: string, data: number[] | Float32Array, updateExtends?: boolean): void;
-        getTotalVertices(): number;
-        getVerticesData(kind: string, copyWhenShared?: boolean): number[] | Float32Array;
-        getVertexBuffer(kind: string): VertexBuffer;
-        getVertexBuffers(): VertexBuffer[];
-        isVerticesDataPresent(kind: string): boolean;
-        getVerticesDataKinds(): string[];
-        setIndices(indices: number[] | Int32Array, totalVertices?: number): void;
-        getTotalIndices(): number;
-        getIndices(copyWhenShared?: boolean): number[] | Int32Array;
-        getIndexBuffer(): any;
-        releaseForMesh(mesh: Mesh, shouldDispose?: boolean): void;
-        applyToMesh(mesh: Mesh): void;
-        private _applyToMesh(mesh);
-        private notifyUpdate(kind?);
-        load(scene: Scene, onLoaded?: () => void): void;
-        isDisposed(): boolean;
-        dispose(): void;
-        copy(id: string): Geometry;
-        serialize(): any;
-        serializeVerticeData(): any;
-        static ExtractFromMesh(mesh: Mesh, id: string): Geometry;
-        static RandomId(): string;
-        static ImportGeometry(parsedGeometry: any, mesh: Mesh): void;
-        static Parse(parsedVertexData: any, scene: Scene, rootUrl: string): Geometry;
-    }
-    namespace Geometry.Primitives {
-        class _Primitive extends Geometry {
-            private _beingRegenerated;
-            private _canBeRegenerated;
-            constructor(id: string, scene: Scene, vertexData?: VertexData, canBeRegenerated?: boolean, mesh?: Mesh);
-            canBeRegenerated(): boolean;
-            regenerate(): void;
-            asNewGeometry(id: string): Geometry;
-            setAllVerticesData(vertexData: VertexData, updatable?: boolean): void;
-            setVerticesData(kind: string, data: number[] | Int32Array | Float32Array, updatable?: boolean): void;
-            _regenerateVertexData(): VertexData;
-            copy(id: string): Geometry;
-            serialize(): any;
-        }
-        class Ribbon extends _Primitive {
-            pathArray: Vector3[][];
-            closeArray: boolean;
-            closePath: boolean;
-            offset: number;
-            side: number;
-            constructor(id: string, scene: Scene, pathArray: Vector3[][], closeArray: boolean, closePath: boolean, offset: number, canBeRegenerated?: boolean, mesh?: Mesh, side?: number);
-            _regenerateVertexData(): VertexData;
-            copy(id: string): Geometry;
-        }
-        class Box extends _Primitive {
-            size: number;
-            side: number;
-            constructor(id: string, scene: Scene, size: number, canBeRegenerated?: boolean, mesh?: Mesh, side?: number);
-            _regenerateVertexData(): VertexData;
-            copy(id: string): Geometry;
-            serialize(): any;
-            static Parse(parsedBox: any, scene: Scene): Box;
-        }
-        class Sphere extends _Primitive {
-            segments: number;
-            diameter: number;
-            side: number;
-            constructor(id: string, scene: Scene, segments: number, diameter: number, canBeRegenerated?: boolean, mesh?: Mesh, side?: number);
-            _regenerateVertexData(): VertexData;
-            copy(id: string): Geometry;
-            serialize(): any;
-            static Parse(parsedSphere: any, scene: Scene): Geometry.Primitives.Sphere;
-        }
-        class Disc extends _Primitive {
-            radius: number;
-            tessellation: number;
-            side: number;
-            constructor(id: string, scene: Scene, radius: number, tessellation: number, canBeRegenerated?: boolean, mesh?: Mesh, side?: number);
-            _regenerateVertexData(): VertexData;
-            copy(id: string): Geometry;
-        }
-        class Cylinder extends _Primitive {
-            height: number;
-            diameterTop: number;
-            diameterBottom: number;
-            tessellation: number;
-            subdivisions: number;
-            side: number;
-            constructor(id: string, scene: Scene, height: number, diameterTop: number, diameterBottom: number, tessellation: number, subdivisions?: number, canBeRegenerated?: boolean, mesh?: Mesh, side?: number);
-            _regenerateVertexData(): VertexData;
-            copy(id: string): Geometry;
-            serialize(): any;
-            static Parse(parsedCylinder: any, scene: Scene): Geometry.Primitives.Cylinder;
-        }
-        class Torus extends _Primitive {
-            diameter: number;
-            thickness: number;
-            tessellation: number;
-            side: number;
-            constructor(id: string, scene: Scene, diameter: number, thickness: number, tessellation: number, canBeRegenerated?: boolean, mesh?: Mesh, side?: number);
-            _regenerateVertexData(): VertexData;
-            copy(id: string): Geometry;
-            serialize(): any;
-            static Parse(parsedTorus: any, scene: Scene): Geometry.Primitives.Torus;
-        }
-        class Ground extends _Primitive {
-            width: number;
-            height: number;
-            subdivisions: number;
-            constructor(id: string, scene: Scene, width: number, height: number, subdivisions: number, canBeRegenerated?: boolean, mesh?: Mesh);
-            _regenerateVertexData(): VertexData;
-            copy(id: string): Geometry;
-            serialize(): any;
-            static Parse(parsedGround: any, scene: Scene): Geometry.Primitives.Ground;
-        }
-        class TiledGround extends _Primitive {
-            xmin: number;
-            zmin: number;
-            xmax: number;
-            zmax: number;
-            subdivisions: {
-                w: number;
-                h: number;
-            };
-            precision: {
-                w: number;
-                h: number;
-            };
-            constructor(id: string, scene: Scene, xmin: number, zmin: number, xmax: number, zmax: number, subdivisions: {
-                w: number;
-                h: number;
-            }, precision: {
-                w: number;
-                h: number;
-            }, canBeRegenerated?: boolean, mesh?: Mesh);
-            _regenerateVertexData(): VertexData;
-            copy(id: string): Geometry;
-        }
-        class Plane extends _Primitive {
-            size: number;
-            side: number;
-            constructor(id: string, scene: Scene, size: number, canBeRegenerated?: boolean, mesh?: Mesh, side?: number);
-            _regenerateVertexData(): VertexData;
-            copy(id: string): Geometry;
-            serialize(): any;
-            static Parse(parsedPlane: any, scene: Scene): Geometry.Primitives.Plane;
-        }
-        class TorusKnot extends _Primitive {
-            radius: number;
-            tube: number;
-            radialSegments: number;
-            tubularSegments: number;
-            p: number;
-            q: number;
-            side: number;
-            constructor(id: string, scene: Scene, radius: number, tube: number, radialSegments: number, tubularSegments: number, p: number, q: number, canBeRegenerated?: boolean, mesh?: Mesh, side?: number);
-            _regenerateVertexData(): VertexData;
-            copy(id: string): Geometry;
-            serialize(): any;
-            static Parse(parsedTorusKnot: any, scene: Scene): Geometry.Primitives.TorusKnot;
-        }
-    }
-}
-
-declare namespace BABYLON {
-    class GroundMesh extends Mesh {
-        generateOctree: boolean;
-        private _worldInverse;
-        private _heightQuads;
-        _subdivisions: number;
-        _width: number;
-        _height: number;
-        _minX: number;
-        _maxX: number;
-        _minZ: number;
-        _maxZ: number;
-        constructor(name: string, scene: Scene);
-        subdivisions: number;
-        optimize(chunksCount: number, octreeBlocksSize?: number): void;
-        /**
-         * Returns a height (y) value in the Worl system :
-         * the ground altitude at the coordinates (x, z) expressed in the World system.
-         * Returns the ground y position if (x, z) are outside the ground surface.
-         * Not pertinent if the ground is rotated.
-         */
-        getHeightAtCoordinates(x: number, z: number): number;
-        /**
-         * Returns a normalized vector (Vector3) orthogonal to the ground
-         * at the ground coordinates (x, z) expressed in the World system.
-         * Returns Vector3(0, 1, 0) if (x, z) are outside the ground surface.
-         * Not pertinent if the ground is rotated.
-         */
-        getNormalAtCoordinates(x: number, z: number): Vector3;
-        /**
-         * Updates the Vector3 passed a reference with a normalized vector orthogonal to the ground
-         * at the ground coordinates (x, z) expressed in the World system.
-         * Doesn't uptade the reference Vector3 if (x, z) are outside the ground surface.
-         * Not pertinent if the ground is rotated.
-         */
-        getNormalAtCoordinatesToRef(x: number, z: number, ref: Vector3): void;
-        private _getFacetAt(x, z);
-        private _computeHeightQuads();
-    }
-}
-
-declare namespace BABYLON {
-    /**
-     * Creates an instance based on a source mesh.
-     */
-    class InstancedMesh extends AbstractMesh {
-        private _sourceMesh;
-        private _currentLOD;
-        constructor(name: string, source: Mesh);
-        receiveShadows: boolean;
-        material: Material;
-        visibility: number;
-        skeleton: Skeleton;
-        renderingGroupId: number;
-        getTotalVertices(): number;
-        sourceMesh: Mesh;
-        getVerticesData(kind: string, copyWhenShared?: boolean): number[] | Float32Array;
-        isVerticesDataPresent(kind: string): boolean;
-        getIndices(): number[] | Int32Array;
-        _positions: Vector3[];
-        refreshBoundingInfo(): void;
-        _preActivate(): void;
-        _activate(renderId: number): void;
-        getLOD(camera: Camera): AbstractMesh;
-        _syncSubMeshes(): void;
-        _generatePointsArray(): boolean;
-        clone(name: string, newParent: Node, doNotCloneChildren?: boolean): InstancedMesh;
-        dispose(doNotRecurse?: boolean): void;
-    }
-}
-
-declare namespace BABYLON {
-    class LinesMesh extends Mesh {
-        color: Color3;
-        alpha: number;
-        private _colorShader;
-        constructor(name: string, scene: Scene, parent?: Node, source?: Mesh, doNotCloneChildren?: boolean);
-        material: Material;
-        isPickable: boolean;
-        checkCollisions: boolean;
-        _bind(subMesh: SubMesh, effect: Effect, fillMode: number): void;
-        _draw(subMesh: SubMesh, fillMode: number, instancesCount?: number): void;
-        intersects(ray: Ray, fastCheck?: boolean): any;
-        dispose(doNotRecurse?: boolean): void;
-        clone(name: string, newParent?: Node, doNotCloneChildren?: boolean): LinesMesh;
-    }
-}
-
-declare namespace BABYLON {
-    class _InstancesBatch {
-        mustReturn: boolean;
-        visibleInstances: InstancedMesh[][];
-        renderSelf: boolean[];
-    }
-    class Mesh extends AbstractMesh implements IGetSetVerticesData {
-        static _FRONTSIDE: number;
-        static _BACKSIDE: number;
-        static _DOUBLESIDE: number;
-        static _DEFAULTSIDE: number;
-        static _NO_CAP: number;
-        static _CAP_START: number;
-        static _CAP_END: number;
-        static _CAP_ALL: number;
-        static FRONTSIDE: number;
-        static BACKSIDE: number;
-        static DOUBLESIDE: number;
-        static DEFAULTSIDE: number;
-        static NO_CAP: number;
-        static CAP_START: number;
-        static CAP_END: number;
-        static CAP_ALL: number;
-        delayLoadState: number;
-        instances: InstancedMesh[];
-        delayLoadingFile: string;
-        _binaryInfo: any;
-        private _LODLevels;
-        onLODLevelSelection: (distance: number, mesh: Mesh, selectedLevel: Mesh) => void;
-        onBeforeDraw: () => void;
-        _geometry: Geometry;
-        private _onBeforeRenderCallbacks;
-        private _onAfterRenderCallbacks;
-        _delayInfo: any;
-        _delayLoadingFunction: (any: any, mesh: Mesh) => void;
-        _visibleInstances: any;
-        private _renderIdForInstances;
-        private _batchCache;
-        private _worldMatricesInstancesBuffer;
-        private _worldMatricesInstancesArray;
-        private _instancesBufferSize;
-        _shouldGenerateFlatShading: boolean;
-        private _preActivateId;
-        private _sideOrientation;
-        private _areNormalsFrozen;
-        private _sourcePositions;
-        private _sourceNormals;
-        /**
-         * @constructor
-         * @param {string} name - The value used by scene.getMeshByName() to do a lookup.
-         * @param {Scene} scene - The scene to add this mesh to.
-         * @param {Node} parent - The parent of this mesh, if it has one
-         * @param {Mesh} source - An optional Mesh from which geometry is shared, cloned.
-         * @param {boolean} doNotCloneChildren - When cloning, skip cloning child meshes of source, default False.
-         *                  When false, achieved by calling a clone(), also passing False.
-         *                  This will make creation of children, recursive.
-         */
-        constructor(name: string, scene: Scene, parent?: Node, source?: Mesh, doNotCloneChildren?: boolean);
-        hasLODLevels: boolean;
-        private _sortLODLevels();
-        /**
-         * Add a mesh as LOD level triggered at the given distance.
-         * @param {number} distance - the distance from the center of the object to show this level
-         * @param {Mesh} mesh - the mesh to be added as LOD level
-         * @return {Mesh} this mesh (for chaining)
-         */
-        addLODLevel(distance: number, mesh: Mesh): Mesh;
-        getLODLevelAtDistance(distance: number): Mesh;
-        /**
-         * Remove a mesh from the LOD array
-         * @param {Mesh} mesh - the mesh to be removed.
-         * @return {Mesh} this mesh (for chaining)
-         */
-        removeLODLevel(mesh: Mesh): Mesh;
-        getLOD(camera: Camera, boundingSphere?: BoundingSphere): AbstractMesh;
-        geometry: Geometry;
-        getTotalVertices(): number;
-        getVerticesData(kind: string, copyWhenShared?: boolean): number[] | Float32Array;
-        getVertexBuffer(kind: any): VertexBuffer;
-        isVerticesDataPresent(kind: string): boolean;
-        getVerticesDataKinds(): string[];
-        getTotalIndices(): number;
-        getIndices(copyWhenShared?: boolean): number[] | Int32Array;
-        isBlocked: boolean;
-        isReady(): boolean;
-        isDisposed(): boolean;
-        sideOrientation: number;
-        areNormalsFrozen: boolean;
-        /**  This function affects parametric shapes on update only : ribbons, tubes, etc. It has no effect at all on other shapes */
-        freezeNormals(): void;
-        /**  This function affects parametric shapes on update only : ribbons, tubes, etc. It has no effect at all on other shapes */
-        unfreezeNormals(): void;
-        _preActivate(): void;
-        _registerInstanceForRenderId(instance: InstancedMesh, renderId: number): void;
-        refreshBoundingInfo(): void;
-        _createGlobalSubMesh(): SubMesh;
-        subdivide(count: number): void;
-        setVerticesData(kind: string, data: number[] | Float32Array, updatable?: boolean, stride?: number): void;
-        updateVerticesData(kind: string, data: number[] | Float32Array, updateExtends?: boolean, makeItUnique?: boolean): void;
-        updateVerticesDataDirectly(kind: string, data: Float32Array, offset?: number, makeItUnique?: boolean): void;
-        updateMeshPositions(positionFunction: any, computeNormals?: boolean): void;
-        makeGeometryUnique(): void;
-        setIndices(indices: number[] | Int32Array, totalVertices?: number): void;
-        _bind(subMesh: SubMesh, effect: Effect, fillMode: number): void;
-        _draw(subMesh: SubMesh, fillMode: number, instancesCount?: number): void;
-        registerBeforeRender(func: (mesh: AbstractMesh) => void): void;
-        unregisterBeforeRender(func: (mesh: AbstractMesh) => void): void;
-        registerAfterRender(func: (mesh: AbstractMesh) => void): void;
-        unregisterAfterRender(func: (mesh: AbstractMesh) => void): void;
-        _getInstancesRenderList(subMeshId: number): _InstancesBatch;
-        _renderWithInstances(subMesh: SubMesh, fillMode: number, batch: _InstancesBatch, effect: Effect, engine: Engine): void;
-        _processRendering(subMesh: SubMesh, effect: Effect, fillMode: number, batch: _InstancesBatch, hardwareInstancedRendering: boolean, onBeforeDraw: (isInstance: boolean, world: Matrix) => void): void;
-        render(subMesh: SubMesh, enableAlphaMode: boolean): void;
-        getEmittedParticleSystems(): ParticleSystem[];
-        getHierarchyEmittedParticleSystems(): ParticleSystem[];
-        getChildren(): Node[];
-        _checkDelayState(): void;
-        isInFrustum(frustumPlanes: Plane[]): boolean;
-        setMaterialByID(id: string): void;
-        getAnimatables(): IAnimatable[];
-        bakeTransformIntoVertices(transform: Matrix): void;
-        bakeCurrentTransformIntoVertices(): void;
-        _resetPointsArrayCache(): void;
-        _generatePointsArray(): boolean;
-        clone(name: string, newParent?: Node, doNotCloneChildren?: boolean): Mesh;
-        dispose(doNotRecurse?: boolean): void;
-        applyDisplacementMap(url: string, minHeight: number, maxHeight: number, onSuccess?: (mesh: Mesh) => void): void;
-        applyDisplacementMapFromBuffer(buffer: Uint8Array, heightMapWidth: number, heightMapHeight: number, minHeight: number, maxHeight: number): void;
-        convertToFlatShadedMesh(): void;
-        convertToUnIndexedMesh(): void;
-        flipFaces(flipNormals?: boolean): void;
-        createInstance(name: string): InstancedMesh;
-        synchronizeInstances(): void;
-        /**
-         * Simplify the mesh according to the given array of settings.
-         * Function will return immediately and will simplify async.
-         * @param settings a collection of simplification settings.
-         * @param parallelProcessing should all levels calculate parallel or one after the other.
-         * @param type the type of simplification to run.
-         * @param successCallback optional success callback to be called after the simplification finished processing all settings.
-         */
-        simplify(settings: Array<ISimplificationSettings>, parallelProcessing?: boolean, simplificationType?: SimplificationType, successCallback?: (mesh?: Mesh, submeshIndex?: number) => void): void;
-        /**
-         * Optimization of the mesh's indices, in case a mesh has duplicated vertices.
-         * The function will only reorder the indices and will not remove unused vertices to avoid problems with submeshes.
-         * This should be used together with the simplification to avoid disappearing triangles.
-         * @param successCallback an optional success callback to be called after the optimization finished.
-         */
-        optimizeIndices(successCallback?: (mesh?: Mesh) => void): void;
-        static Parse(parsedMesh: any, scene: Scene, rootUrl: string): Mesh;
-        static CreateRibbon(name: string, pathArray: Vector3[][], closeArray: boolean, closePath: boolean, offset: number, scene: Scene, updatable?: boolean, sideOrientation?: number, instance?: Mesh): Mesh;
-        static CreateDisc(name: string, radius: number, tessellation: number, scene: Scene, updatable?: boolean, sideOrientation?: number): Mesh;
-        static CreateBox(name: string, size: number, scene: Scene, updatable?: boolean, sideOrientation?: number): Mesh;
-        static CreateSphere(name: string, segments: number, diameter: number, scene?: Scene, updatable?: boolean, sideOrientation?: number): Mesh;
-        static CreateCylinder(name: string, height: number, diameterTop: number, diameterBottom: number, tessellation: number, subdivisions: any, scene: Scene, updatable?: any, sideOrientation?: number): Mesh;
-        static CreateTorus(name: string, diameter: number, thickness: number, tessellation: number, scene: Scene, updatable?: boolean, sideOrientation?: number): Mesh;
-        static CreateTorusKnot(name: string, radius: number, tube: number, radialSegments: number, tubularSegments: number, p: number, q: number, scene: Scene, updatable?: boolean, sideOrientation?: number): Mesh;
-        static CreateLines(name: string, points: Vector3[], scene: Scene, updatable?: boolean, instance?: LinesMesh): LinesMesh;
-        static CreateDashedLines(name: string, points: Vector3[], dashSize: number, gapSize: number, dashNb: number, scene: Scene, updatable?: boolean, instance?: LinesMesh): LinesMesh;
-        static ExtrudeShape(name: string, shape: Vector3[], path: Vector3[], scale: number, rotation: number, cap: number, scene: Scene, updatable?: boolean, sideOrientation?: number, instance?: Mesh): Mesh;
-        static ExtrudeShapeCustom(name: string, shape: Vector3[], path: Vector3[], scaleFunction: any, rotationFunction: any, ribbonCloseArray: boolean, ribbonClosePath: boolean, cap: number, scene: Scene, updatable?: boolean, sideOrientation?: number, instance?: Mesh): Mesh;
-        static CreateLathe(name: string, shape: Vector3[], radius: number, tessellation: number, scene: Scene, updatable?: boolean, sideOrientation?: number): Mesh;
-        static CreatePlane(name: string, size: number, scene: Scene, updatable?: boolean, sideOrientation?: number): Mesh;
-        static CreateGround(name: string, width: number, height: number, subdivisions: number, scene: Scene, updatable?: boolean): Mesh;
-        static CreateTiledGround(name: string, xmin: number, zmin: number, xmax: number, zmax: number, subdivisions: {
-            w: number;
-            h: number;
-        }, precision: {
-            w: number;
-            h: number;
-        }, scene: Scene, updatable?: boolean): Mesh;
-        static CreateGroundFromHeightMap(name: string, url: string, width: number, height: number, subdivisions: number, minHeight: number, maxHeight: number, scene: Scene, updatable?: boolean, onReady?: (mesh: GroundMesh) => void): GroundMesh;
-        static CreateTube(name: string, path: Vector3[], radius: number, tessellation: number, radiusFunction: {
-            (i: number, distance: number): number;
-        }, cap: number, scene: Scene, updatable?: boolean, sideOrientation?: number, instance?: Mesh): Mesh;
-        static CreatePolyhedron(name: string, options: {
-            type?: number;
-            size?: number;
-            sizeX?: number;
-            sizeY?: number;
-            sizeZ?: number;
-            custom?: any;
-            faceUV?: Vector4[];
-            faceColors?: Color4[];
-            updatable?: boolean;
-            sideOrientation?: number;
-        }, scene: Scene): Mesh;
-        static CreateIcoSphere(name: string, options: {
-            radius?: number;
-            flat?: boolean;
-            subdivisions?: number;
-            sideOrientation?: number;
-            updatable?: boolean;
-        }, scene: Scene): Mesh;
-        static CreateDecal(name: string, sourceMesh: AbstractMesh, position: Vector3, normal: Vector3, size: Vector3, angle: number): Mesh;
-        /**
-         * @returns original positions used for CPU skinning.  Useful for integrating Morphing with skeletons in same mesh.
-         */
-        setPositionsForCPUSkinning(): Float32Array;
-        /**
-         * @returns original normals used for CPU skinning.  Useful for integrating Morphing with skeletons in same mesh.
-         */
-        setNormalsForCPUSkinning(): Float32Array;
-        /**
-         * Update the vertex buffers by applying transformation from the bones
-         * @param {skeleton} skeleton to apply
-         */
-        applySkeleton(skeleton: Skeleton): Mesh;
-        static MinMax(meshes: AbstractMesh[]): {
-            min: Vector3;
-            max: Vector3;
-        };
-        static Center(meshesOrMinMaxVector: any): Vector3;
-        /**
-         * Merge the array of meshes into a single mesh for performance reasons.
-         * @param {Array<Mesh>} meshes - The vertices source.  They should all be of the same material.  Entries can empty
-         * @param {boolean} disposeSource - When true (default), dispose of the vertices from the source meshes
-         * @param {boolean} allow32BitsIndices - When the sum of the vertices > 64k, this must be set to true.
-         * @param {Mesh} meshSubclass - When set, vertices inserted into this Mesh.  Meshes can then be merged into a Mesh sub-class.
-         */
-        static MergeMeshes(meshes: Array<Mesh>, disposeSource?: boolean, allow32BitsIndices?: boolean, meshSubclass?: Mesh): Mesh;
-    }
-}
-
-declare namespace BABYLON {
-    interface IGetSetVerticesData {
-        isVerticesDataPresent(kind: string): boolean;
-        getVerticesData(kind: string, copyWhenShared?: boolean): number[] | Int32Array | Float32Array;
-        getIndices(copyWhenShared?: boolean): number[] | Int32Array;
-        setVerticesData(kind: string, data: number[] | Float32Array, updatable?: boolean): void;
-        updateVerticesData(kind: string, data: number[] | Float32Array, updateExtends?: boolean, makeItUnique?: boolean): void;
-        setIndices(indices: number[] | Int32Array): void;
-    }
-    class VertexData {
-        positions: number[] | Float32Array;
-        normals: number[] | Float32Array;
-        uvs: number[] | Float32Array;
-        uvs2: number[] | Float32Array;
-        uvs3: number[] | Float32Array;
-        uvs4: number[] | Float32Array;
-        uvs5: number[] | Float32Array;
-        uvs6: number[] | Float32Array;
-        colors: number[] | Float32Array;
-        matricesIndices: number[] | Float32Array;
-        matricesWeights: number[] | Float32Array;
-        matricesIndicesExtra: number[] | Float32Array;
-        matricesWeightsExtra: number[] | Float32Array;
-        indices: number[] | Int32Array;
-        set(data: number[] | Float32Array, kind: string): void;
-        applyToMesh(mesh: Mesh, updatable?: boolean): void;
-        applyToGeometry(geometry: Geometry, updatable?: boolean): void;
-        updateMesh(mesh: Mesh, updateExtends?: boolean, makeItUnique?: boolean): void;
-        updateGeometry(geometry: Geometry, updateExtends?: boolean, makeItUnique?: boolean): void;
-        private _applyTo(meshOrGeometry, updatable?);
-        private _update(meshOrGeometry, updateExtends?, makeItUnique?);
-        transform(matrix: Matrix): void;
-        merge(other: VertexData): void;
-        private _mergeElement(source, other);
-        serialize(): any;
-        static ExtractFromMesh(mesh: Mesh, copyWhenShared?: boolean): VertexData;
-        static ExtractFromGeometry(geometry: Geometry, copyWhenShared?: boolean): VertexData;
-        private static _ExtractFrom(meshOrGeometry, copyWhenShared?);
-        static CreateRibbon(options: {
-            pathArray: Vector3[][];
-            closeArray?: boolean;
-            closePath?: boolean;
-            offset?: number;
-            sideOrientation?: number;
-        }): VertexData;
-        static CreateBox(options: {
-            size?: number;
-            width?: number;
-            height?: number;
-            depth?: number;
-            faceUV?: Vector4[];
-            faceColors?: Color4[];
-            sideOrientation?: number;
-        }): VertexData;
-        static CreateSphere(options: {
-            segments?: number;
-            diameter?: number;
-            diameterX?: number;
-            diameterY?: number;
-            diameterZ?: number;
-            arc?: number;
-            slice?: number;
-            sideOrientation?: number;
-        }): VertexData;
-        static CreateCylinder(options: {
-            height?: number;
-            diameterTop?: number;
-            diameterBottom?: number;
-            diameter?: number;
-            tessellation?: number;
-            subdivisions?: number;
-            arc?: number;
-            faceColors?: Color4[];
-            faceUV?: Vector4[];
-            hasRings?: boolean;
-            enclose?: boolean;
-            sideOrientation?: number;
-        }): VertexData;
-        static CreateTorus(options: {
-            diameter?: number;
-            thickness?: number;
-            tessellation?: number;
-            sideOrientation?: number;
-        }): VertexData;
-        static CreateLines(options: {
-            points: Vector3[];
-        }): VertexData;
-        static CreateDashedLines(options: {
-            points: Vector3[];
-            dashSize?: number;
-            gapSize?: number;
-            dashNb?: number;
-        }): VertexData;
-        static CreateGround(options: {
-            width?: number;
-            height?: number;
-            subdivisions?: number;
-        }): VertexData;
-        static CreateTiledGround(options: {
-            xmin: number;
-            zmin: number;
-            xmax: number;
-            zmax: number;
-            subdivisions?: {
-                w: number;
-                h: number;
-            };
-            precision?: {
-                w: number;
-                h: number;
-            };
-        }): VertexData;
-        static CreateGroundFromHeightMap(options: {
-            width: number;
-            height: number;
-            subdivisions: number;
-            minHeight: number;
-            maxHeight: number;
-            buffer: Uint8Array;
-            bufferWidth: number;
-            bufferHeight: number;
-        }): VertexData;
-        static CreatePlane(options: {
-            size?: number;
-            width?: number;
-            height?: number;
-            sideOrientation?: number;
-        }): VertexData;
-        static CreateDisc(options: {
-            radius?: number;
-            tessellation?: number;
-            arc?: number;
-            sideOrientation?: number;
-        }): VertexData;
-        static CreateIcoSphere(options: {
-            radius?: number;
-            radiusX?: number;
-            radiusY?: number;
-            radiusZ?: number;
-            flat?: boolean;
-            subdivisions?: number;
-            sideOrientation?: number;
-        }): VertexData;
-        static CreatePolyhedron(options: {
-            type?: number;
-            size?: number;
-            sizeX?: number;
-            sizeY?: number;
-            sizeZ?: number;
-            custom?: any;
-            faceUV?: Vector4[];
-            faceColors?: Color4[];
-            flat?: boolean;
-            sideOrientation?: number;
-        }): VertexData;
-        static CreateTorusKnot(options: {
-            radius?: number;
-            tube?: number;
-            radialSegments?: number;
-            tubularSegments?: number;
-            p?: number;
-            q?: number;
-            sideOrientation?: number;
-        }): VertexData;
-        /**
-         * @param {any} - positions (number[] or Float32Array)
-         * @param {any} - indices   (number[] or Uint16Array)
-         * @param {any} - normals   (number[] or Float32Array)
-         */
-        static ComputeNormals(positions: any, indices: any, normals: any): void;
-        private static _ComputeSides(sideOrientation, positions, indices, normals, uvs);
-        static ImportVertexData(parsedVertexData: any, geometry: Geometry): void;
-    }
-}
-
-declare namespace BABYLON {
-    class MeshBuilder {
-        static CreateBox(name: string, options: {
-            width?: number;
-            height?: number;
-            depth?: number;
-            faceUV?: Vector4[];
-            faceColors?: Color4[];
-            sideOrientation?: number;
-            updatable?: boolean;
-        }, scene: Scene): Mesh;
-        static CreateSphere(name: string, options: {
-            segments?: number;
-            diameter?: number;
-            diameterX?: number;
-            diameterY?: number;
-            diameterZ?: number;
-            arc?: number;
-            slice?: number;
-            sideOrientation?: number;
-            updatable?: boolean;
-        }, scene: any): Mesh;
-        static CreateDisc(name: string, options: {
-            radius?: number;
-            tessellation?: number;
-            arc?: number;
-            updatable?: boolean;
-            sideOrientation?: number;
-        }, scene: Scene): Mesh;
-        static CreateIcoSphere(name: string, options: {
-            radius?: number;
-            radiusX?: number;
-            radiusY?: number;
-            radiusZ?: number;
-            flat?: boolean;
-            subdivisions?: number;
-            sideOrientation?: number;
-            updatable?: boolean;
-        }, scene: Scene): Mesh;
-        static CreateRibbon(name: string, options: {
-            pathArray: Vector3[][];
-            closeArray?: boolean;
-            closePath?: boolean;
-            offset?: number;
-            updatable?: boolean;
-            sideOrientation?: number;
-            instance?: Mesh;
-        }, scene?: Scene): Mesh;
-        static CreateCylinder(name: string, options: {
-            height?: number;
-            diameterTop?: number;
-            diameterBottom?: number;
-            diameter?: number;
-            tessellation?: number;
-            subdivisions?: number;
-            arc?: number;
-            faceColors?: Color4[];
-            faceUV?: Vector4[];
-            updatable?: boolean;
-            hasRings?: boolean;
-            enclose?: boolean;
-            sideOrientation?: number;
-        }, scene: any): Mesh;
-        static CreateTorus(name: string, options: {
-            diameter?: number;
-            thickness?: number;
-            tessellation?: number;
-            updatable?: boolean;
-            sideOrientation?: number;
-        }, scene: any): Mesh;
-        static CreateTorusKnot(name: string, options: {
-            radius?: number;
-            tube?: number;
-            radialSegments?: number;
-            tubularSegments?: number;
-            p?: number;
-            q?: number;
-            updatable?: boolean;
-            sideOrientation?: number;
-        }, scene: any): Mesh;
-        static CreateLines(name: string, options: {
-            points: Vector3[];
-            updatable?: boolean;
-            instance?: LinesMesh;
-        }, scene: Scene): LinesMesh;
-        static CreateDashedLines(name: string, options: {
-            points: Vector3[];
-            dashSize?: number;
-            gapSize?: number;
-            dashNb?: number;
-            updatable?: boolean;
-            instance?: LinesMesh;
-        }, scene: Scene): LinesMesh;
-        static ExtrudeShape(name: string, options: {
-            shape: Vector3[];
-            path: Vector3[];
-            scale?: number;
-            rotation?: number;
-            cap?: number;
-            updatable?: boolean;
-            sideOrientation?: number;
-            instance?: Mesh;
-        }, scene: Scene): Mesh;
-        static ExtrudeShapeCustom(name: string, options: {
-            shape: Vector3[];
-            path: Vector3[];
-            scaleFunction?:any;
-            rotationFunction?:any;
-            ribbonCloseArray?: boolean;
-            ribbonClosePath?: boolean;
-            cap?: number;
-            updatable?: boolean;
-            sideOrientation?: number;
-            instance?: Mesh;
-        }, scene: Scene): Mesh;
-        static CreateLathe(name: string, options: {
-            shape: Vector3[];
-            radius?: number;
-            tessellation?: number;
-            arc?: number;
-            closed?: boolean;
-            updatable?: boolean;
-            sideOrientation?: number;
-            cap?: number;
-        }, scene: Scene): Mesh;
-        static CreatePlane(name: string, options: {
-            size?: number;
-            width?: number;
-            height?: number;
-            sideOrientation?: number;
-            updatable?: boolean;
-            sourcePlane?: Plane;
-        }, scene: Scene): Mesh;
-        static CreateGround(name: string, options: {
-            width?: number;
-            height?: number;
-            subdivisions?: number;
-            updatable?: boolean;
-        }, scene: any): Mesh;
-        static CreateTiledGround(name: string, options: {
-            xmin: number;
-            zmin: number;
-            xmax: number;
-            zmax: number;
-            subdivisions?: {
-                w: number;
-                h: number;
-            };
-            precision?: {
-                w: number;
-                h: number;
-            };
-            updatable?: boolean;
-        }, scene: Scene): Mesh;
-        static CreateGroundFromHeightMap(name: string, url: string, options: {
-            width?: number;
-            height?: number;
-            subdivisions?: number;
-            minHeight?: number;
-            maxHeight?: number;
-            updatable?: boolean;
-            onReady?: (mesh: GroundMesh) => void;
-        }, scene: Scene): GroundMesh;
-        static CreateTube(name: string, options: {
-            path: Vector3[];
-            radius?: number;
-            tessellation?: number;
-            radiusFunction?: {
-                (i: number, distance: number): number;
-            };
-            cap?: number;
-            arc?: number;
-            updatable?: boolean;
-            sideOrientation?: number;
-            instance?: Mesh;
-        }, scene: Scene): Mesh;
-        static CreatePolyhedron(name: string, options: {
-            type?: number;
-            size?: number;
-            sizeX?: number;
-            sizeY?: number;
-            sizeZ?: number;
-            custom?: any;
-            faceUV?: Vector4[];
-            faceColors?: Color4[];
-            flat?: boolean;
-            updatable?: boolean;
-            sideOrientation?: number;
-        }, scene: Scene): Mesh;
-        static CreateDecal(name: string, sourceMesh: AbstractMesh, options: {
-            position?: Vector3;
-            normal?: Vector3;
-            size?: Vector3;
-            angle?: number;
-        }): Mesh;
-        private static _ExtrudeShapeGeneric(name, shape, curve, scale, rotation, scaleFunction, rotateFunction, rbCA, rbCP, cap, custom, scene, updtbl, side, instance);
-    }
-}
-
-declare namespace BABYLON.Internals {
-    class MeshLODLevel {
-        distance: number;
-        mesh: Mesh;
-        constructor(distance: number, mesh: Mesh);
-    }
-}
-
-declare namespace BABYLON {
-    /**
-     * A simplifier interface for future simplification implementations.
-     */
-    interface ISimplifier {
-        /**
-         * Simplification of a given mesh according to the given settings.
-         * Since this requires computation, it is assumed that the function runs async.
-         * @param settings The settings of the simplification, including quality and distance
-         * @param successCallback A callback that will be called after the mesh was simplified.
-         * @param errorCallback in case of an error, this callback will be called. optional.
-         */
-        simplify(settings: ISimplificationSettings, successCallback: (simplifiedMeshes: Mesh) => void, errorCallback?: () => void): void;
-    }
-    /**
-     * Expected simplification settings.
-     * Quality should be between 0 and 1 (1 being 100%, 0 being 0%);
-     */
-    interface ISimplificationSettings {
-        quality: number;
-        distance: number;
-        optimizeMesh?: boolean;
-    }
-    class SimplificationSettings implements ISimplificationSettings {
-        quality: number;
-        distance: number;
-        optimizeMesh: boolean;
-        constructor(quality: number, distance: number, optimizeMesh?: boolean);
-    }
-    interface ISimplificationTask {
-        settings: Array<ISimplificationSettings>;
-        simplificationType: SimplificationType;
-        mesh: Mesh;
-        successCallback?: () => void;
-        parallelProcessing: boolean;
-    }
-    class SimplificationQueue {
-        private _simplificationArray;
-        running: any;
-        constructor();
-        addTask(task: ISimplificationTask): void;
-        executeNext(): void;
-        runSimplification(task: ISimplificationTask): void;
-        private getSimplifier(task);
-    }
-    /**
-     * The implemented types of simplification.
-     * At the moment only Quadratic Error Decimation is implemented.
-     */
-    enum SimplificationType {
-        QUADRATIC = 0,
-    }
-    class DecimationTriangle {
-        vertices: Array<DecimationVertex>;
-        normal: Vector3;
-        error: Array<number>;
-        deleted: boolean;
-        isDirty: boolean;
-        borderFactor: number;
-        deletePending: boolean;
-        originalOffset: number;
-        constructor(vertices: Array<DecimationVertex>);
-    }
-    class DecimationVertex {
-        position: Vector3;
-        id: any;
-        q: QuadraticMatrix;
-        isBorder: boolean;
-        triangleStart: number;
-        triangleCount: number;
-        originalOffsets: Array<number>;
-        constructor(position: Vector3, id: any);
-        updatePosition(newPosition: Vector3): void;
-    }
-    class QuadraticMatrix {
-        data: Array<number>;
-        constructor(data?: Array<number>);
-        det(a11: any, a12: any, a13: any, a21: any, a22: any, a23: any, a31: any, a32: any, a33: any): number;
-        addInPlace(matrix: QuadraticMatrix): void;
-        addArrayInPlace(data: Array<number>): void;
-        add(matrix: QuadraticMatrix): QuadraticMatrix;
-        static FromData(a: number, b: number, c: number, d: number): QuadraticMatrix;
-        static DataFromNumbers(a: number, b: number, c: number, d: number): number[];
-    }
-    class Reference {
-        vertexId: number;
-        triangleId: number;
-        constructor(vertexId: number, triangleId: number);
-    }
-    /**
-     * An implementation of the Quadratic Error simplification algorithm.
-     * Original paper : http://www1.cs.columbia.edu/~cs4162/html05s/garland97.pdf
-     * Ported mostly from QSlim and http://voxels.blogspot.de/2014/05/quadric-mesh-simplification-with-source.html to babylon JS
-     * @author RaananW
-     */
-    class QuadraticErrorSimplification implements ISimplifier {
-        private _mesh;
-        private triangles;
-        private vertices;
-        private references;
-        private initialized;
-        private _reconstructedMesh;
-        syncIterations: number;
-        aggressiveness: number;
-        decimationIterations: number;
-        boundingBoxEpsilon: number;
-        constructor(_mesh: Mesh);
-        simplify(settings: ISimplificationSettings, successCallback: (simplifiedMesh: Mesh) => void): void;
-        private isTriangleOnBoundingBox(triangle);
-        private runDecimation(settings, submeshIndex, successCallback);
-        private initWithMesh(submeshIndex, callback, optimizeMesh?);
-        private init(callback);
-        private reconstructMesh(submeshIndex);
-        private initDecimatedMesh();
-        private isFlipped(vertex1, vertex2, point, deletedArray, borderFactor, delTr);
-        private updateTriangles(origVertex, vertex, deletedArray, deletedTriangles);
-        private identifyBorder();
-        private updateMesh(identifyBorders?);
-        private vertexError(q, point);
-        private calculateError(vertex1, vertex2, pointResult?, normalResult?, uvResult?, colorResult?);
-    }
-}
-
-declare namespace BABYLON {
-    class Polygon {
-        static Rectangle(xmin: number, ymin: number, xmax: number, ymax: number): Vector2[];
-        static Circle(radius: number, cx?: number, cy?: number, numberOfSides?: number): Vector2[];
-        static Parse(input: string): Vector2[];
-        static StartingAt(x: number, y: number): Path2;
-    }
-    class PolygonMeshBuilder {
-        private _swctx;
-        private _points;
-        private _outlinepoints;
-        private _holes;
-        private _name;
-        private _scene;
-        constructor(name: string, contours: Path2, scene: Scene);
-        constructor(name: string, contours: Vector2[], scene: Scene);
-        addHole(hole: Vector2[]): PolygonMeshBuilder;
-        build(updatable?: boolean, depth?: number): Mesh;
-        private addSide(positions, normals, uvs, indices, bounds, points, depth, flip);
-    }
-}
-
-declare namespace BABYLON {
-    class SubMesh {
-        materialIndex: number;
-        verticesStart: number;
-        verticesCount: number;
-        indexStart: any;
-        indexCount: number;
-        linesIndexCount: number;
-        private _mesh;
-        private _renderingMesh;
-        private _boundingInfo;
-        private _linesIndexBuffer;
-        _lastColliderWorldVertices: Vector3[];
-        _trianglePlanes: Plane[];
-        _lastColliderTransformMatrix: Matrix;
-        _renderId: number;
-        _alphaIndex: number;
-        _distanceToCamera: number;
-        _id: number;
-        constructor(materialIndex: number, verticesStart: number, verticesCount: number, indexStart: any, indexCount: number, mesh: AbstractMesh, renderingMesh?: Mesh, createBoundingBox?: boolean);
-        IsGlobal: boolean;
-        getBoundingInfo(): BoundingInfo;
-        getMesh(): AbstractMesh;
-        getRenderingMesh(): Mesh;
-        getMaterial(): Material;
-        refreshBoundingInfo(): void;
-        _checkCollision(collider: Collider): boolean;
-        updateBoundingInfo(world: Matrix): void;
-        isInFrustum(frustumPlanes: Plane[]): boolean;
-        render(enableAlphaMode: boolean): void;
-        getLinesIndexBuffer(indices: number[] | Int32Array, engine: any): WebGLBuffer;
-        canIntersects(ray: Ray): boolean;
-        intersects(ray: Ray, positions: Vector3[], indices: number[] | Int32Array, fastCheck?: boolean): IntersectionInfo;
-        clone(newMesh: AbstractMesh, newRenderingMesh?: Mesh): SubMesh;
-        dispose(): void;
-        static CreateFromIndices(materialIndex: number, startIndex: number, indexCount: number, mesh: AbstractMesh, renderingMesh?: Mesh): SubMesh;
-    }
-}
-
-declare namespace BABYLON {
-    class VertexBuffer {
-        private _mesh;
-        private _engine;
-        private _buffer;
-        private _data;
-        private _updatable;
-        private _kind;
-        private _strideSize;
-        constructor(engine: any, data: number[] | Float32Array, kind: string, updatable: boolean, postponeInternalCreation?: boolean, stride?: number);
-        isUpdatable(): boolean;
-        getData(): number[] | Float32Array;
-        getBuffer(): WebGLBuffer;
-        getStrideSize(): number;
-        create(data?: number[] | Float32Array): void;
-        update(data: number[] | Float32Array): void;
-        updateDirectly(data: Float32Array, offset: number): void;
-        dispose(): void;
-        private static _PositionKind;
-        private static _NormalKind;
-        private static _UVKind;
-        private static _UV2Kind;
-        private static _UV3Kind;
-        private static _UV4Kind;
-        private static _UV5Kind;
-        private static _UV6Kind;
-        private static _ColorKind;
-        private static _MatricesIndicesKind;
-        private static _MatricesWeightsKind;
-        private static _MatricesIndicesExtraKind;
-        private static _MatricesWeightsExtraKind;
-        static PositionKind: string;
-        static NormalKind: string;
-        static UVKind: string;
-        static UV2Kind: string;
-        static UV3Kind: string;
-        static UV4Kind: string;
-        static UV5Kind: string;
-        static UV6Kind: string;
-        static ColorKind: string;
-        static MatricesIndicesKind: string;
-        static MatricesWeightsKind: string;
-        static MatricesIndicesExtraKind: string;
-        static MatricesWeightsExtraKind: string;
-    }
-}
-
-declare namespace BABYLON {
-    class Particle {
-        position: Vector3;
-        direction: Vector3;
-        color: Color4;
-        colorStep: Color4;
-        lifeTime: number;
-        age: number;
-        size: number;
-        angle: number;
-        angularSpeed: number;
-        copyTo(other: Particle): void;
-    }
-}
-
-declare namespace BABYLON {
-    class ParticleSystem implements IDisposable {
-        name: string;
-        static BLENDMODE_ONEONE: number;
-        static BLENDMODE_STANDARD: number;
-        id: string;
-        renderingGroupId: number;
-        emitter: any;
-        emitRate: number;
-        manualEmitCount: number;
-        updateSpeed: number;
-        targetStopDuration: number;
-        disposeOnStop: boolean;
-        minEmitPower: number;
-        maxEmitPower: number;
-        minLifeTime: number;
-        maxLifeTime: number;
-        minSize: number;
-        maxSize: number;
-        minAngularSpeed: number;
-        maxAngularSpeed: number;
-        particleTexture: Texture;
-        layerMask: number;
-        onDispose: () => void;
-        updateFunction: (particles: Particle[]) => void;
-        blendMode: number;
-        forceDepthWrite: boolean;
-        gravity: Vector3;
-        direction1: Vector3;
-        direction2: Vector3;
-        minEmitBox: Vector3;
-        maxEmitBox: Vector3;
-        color1: Color4;
-        color2: Color4;
-        colorDead: Color4;
-        textureMask: Color4;
-        startDirectionFunction: (emitPower: number, worldMatrix: Matrix, directionToUpdate: Vector3, particle: Particle) => void;
-        startPositionFunction: (worldMatrix: Matrix, positionToUpdate: Vector3, particle: Particle) => void;
-        private particles;
-        private _capacity;
-        private _scene;
-        private _vertexDeclaration;
-        private _vertexStrideSize;
-        private _stockParticles;
-        private _newPartsExcess;
-        private _vertexBuffer;
-        private _indexBuffer;
-        private _vertices;
-        private _effect;
-        private _customEffect;
-        private _cachedDefines;
-        private _scaledColorStep;
-        private _colorDiff;
-        private _scaledDirection;
-        private _scaledGravity;
-        private _currentRenderId;
-        private _alive;
-        private _started;
-        private _stopped;
-        private _actualFrame;
-        private _scaledUpdateSpeed;
-        constructor(name: string, capacity: number, scene: Scene, customEffect?: Effect);
-        recycleParticle(particle: Particle): void;
-        getCapacity(): number;
-        isAlive(): boolean;
-        isStarted(): boolean;
-        start(): void;
-        stop(): void;
-        _appendParticleVertex(index: number, particle: Particle, offsetX: number, offsetY: number): void;
-        private _update(newParticles);
-        private _getEffect();
-        animate(): void;
-        render(): number;
-        dispose(): void;
-        clone(name: string, newEmitter: any): ParticleSystem;
-        serialize(): any;
-        static Parse(parsedParticleSystem: any, scene: Scene, rootUrl: string): ParticleSystem;
-    }
-}
-
-declare namespace BABYLON {
-    class SolidParticle {
-        idx: number;
-        color: Color4;
-        position: Vector3;
-        rotation: Vector3;
-        quaternion: Vector4;
-        scale: Vector3;
-        uvs: Vector4;
-        velocity: Vector3;
-        alive: boolean;
-        _pos: number;
-        _model: ModelShape;
-        shapeId: number;
-        idxInShape: number;
-        constructor(particleIndex: number, positionIndex: number, model: ModelShape, shapeId: number, idxInShape: number);
-    }
-    class ModelShape {
-        shapeID: number;
-        _shape: Vector3[];
-        _shapeUV: number[];
-        _positionFunction: (particle: SolidParticle, i: number, s: number) => void;
-        _vertexFunction: (particle: SolidParticle, vertex: Vector3, i: number) => void;
-        constructor(id: number, shape: Vector3[], shapeUV: number[], posFunction: (particle: SolidParticle, i: number, s: number) => void, vtxFunction: (particle: SolidParticle, vertex: Vector3, i: number) => void);
-    }
-}
-
-declare namespace BABYLON {
-    /**
-    * Full documentation here : http://doc.babylonjs.com/tutorials/Solid_Particle_System
-    */
-    class SolidParticleSystem implements IDisposable {
-        particles: SolidParticle[];
-        nbParticles: number;
-        billboard: boolean;
-        counter: number;
-        name: string;
-        mesh: Mesh;
-        vars: any;
-        pickedParticles: {
-            idx: number;
-            faceId: number;
-        }[];
-        private _scene;
-        private _positions;
-        private _indices;
-        private _normals;
-        private _colors;
-        private _uvs;
-        private _positions32;
-        private _normals32;
-        private _fixedNormal32;
-        private _colors32;
-        private _uvs32;
-        private _index;
-        private _updatable;
-        private _pickable;
-        private _isVisibilityBoxLocked;
-        private _alwaysVisible;
-        private _shapeCounter;
-        private _copy;
-        private _shape;
-        private _shapeUV;
-        private _color;
-        private _computeParticleColor;
-        private _computeParticleTexture;
-        private _computeParticleRotation;
-        private _computeParticleVertex;
-        private _cam_axisZ;
-        private _cam_axisY;
-        private _cam_axisX;
-        private _axisX;
-        private _axisY;
-        private _axisZ;
-        private _camera;
-        private _particle;
-        private _fakeCamPos;
-        private _rotMatrix;
-        private _invertMatrix;
-        private _rotated;
-        private _quaternion;
-        private _vertex;
-        private _normal;
-        private _yaw;
-        private _pitch;
-        private _roll;
-        private _halfroll;
-        private _halfpitch;
-        private _halfyaw;
-        private _sinRoll;
-        private _cosRoll;
-        private _sinPitch;
-        private _cosPitch;
-        private _sinYaw;
-        private _cosYaw;
-        private _w;
-        /**
-        * Creates a SPS (Solid Particle System) object.
-        * @param name the SPS name, this will be the underlying mesh name
-        * @param updatable (default true) if the SPS must be updatable or immutable
-        * @param isPickable (default false) if the solid particles must be pickable
-        */
-        constructor(name: string, scene: Scene, options?: {
-            updatable?: boolean;
-            isPickable?: boolean;
-        });
-        /**
-        * Builds the SPS underlying mesh. Returns a standard Mesh.
-        * If no model shape was added to the SPS, the return mesh is only a single triangular plane.
-        */
-        buildMesh(): Mesh;
-        private _resetCopy();
-        private _meshBuilder(p, shape, positions, meshInd, indices, meshUV, uvs, meshCol, colors, idx, idxInShape, options);
-        private _posToShape(positions);
-        private _uvsToShapeUV(uvs);
-        private _addParticle(idx, idxpos, model, shapeId, idxInShape);
-        /**
-        * Adds some particles to the SPS from the model shape.
-        * Please read the doc : http://doc.babylonjs.com/tutorials/Solid_Particle_System#create-an-immutable-sps
-        * @param mesh any Mesh object that will be used as a model for the solid particles.
-        * @param nb the number of particles to be created from this model
-        * @param positionFunction an optional javascript function to called for each particle on SPS creation
-        * @param vertexFunction an optional javascript function to called for each vertex of each particle on SPS creation
-        */
-        addShape(mesh: Mesh, nb: number, options?: {
-            positionFunction?: any;
-            vertexFunction?: any;
-        }): number;
-        private _rebuildParticle(particle);
-        /**
-        * Rebuilds the whole mesh and updates the VBO : custom positions and vertices are recomputed if needed.
-        */
-        rebuildMesh(): void;
-        /**
-        *  Sets all the particles : this method actually really updates the mesh according to the particle positions, rotations, colors, textures, etc.
-        *  This method calls updateParticle() for each particles of the SPS.
-        *  For an animated SPS, it is usually called within the render loop.
-        * @param start (default 0) the particle index in the particle array where to start to compute the particle property values
-        * @param end (default nbParticle - 1)  the particle index in the particle array where to stop to compute the particle property values
-        * @param update (default true) if the mesh must be finally updated on this call after all the particle computations.
-        */
-        setParticles(start?: number, end?: number, update?: boolean): void;
-        private _quaternionRotationYPR();
-        private _quaternionToRotationMatrix();
-        /**
-        * Disposes the SPS
-        */
-        dispose(): void;
-        /**
-        *  Visibilty helper : Recomputes the visible size according to the mesh bounding box
-        * doc : http://doc.babylonjs.com/tutorials/Solid_Particle_System#sps-visibility
-        */
-        refreshVisibleSize(): void;
-        /** Visibility helper : Sets the size of a visibility box, this sets the underlying mesh bounding box.
-        * @param size the size (float) of the visibility box
-        * note : this doesn't lock the SPS mesh bounding box.
-        * doc : http://doc.babylonjs.com/tutorials/Solid_Particle_System#sps-visibility
-        */
-        setVisibilityBox(size: number): void;
-        /**
-        * True if the SPS is set as always visible
-        */
-        /**
-        * Sets the SPS as always visible or not
-        * doc : http://doc.babylonjs.com/tutorials/Solid_Particle_System#sps-visibility
-        */
-        isAlwaysVisible: boolean;
-        /**
-        * True if the SPS visibility box is locked. The underlying mesh bounding box is then not updatable any more.
-        */
-        /**
-        * Sets the SPS visibility box as locked or not. This enables/disables the underlying mesh bounding box updates.
-        * doc : http://doc.babylonjs.com/tutorials/Solid_Particle_System#sps-visibility
-        */
-        isVisibilityBoxLocked: boolean;
-        /**
-        * Tells to setParticle() to compute the particle rotations or not.
-        * Default value : true. The SPS is faster when it's set to false.
-        * Note : the particle rotations aren't stored values, so setting computeParticleRotation to false will prevents the particle to rotate.
-        */
-        computeParticleRotation: boolean;
-        /**
-        * Tells to setParticle() to compute the particle colors or not.
-        * Default value : true. The SPS is faster when it's set to false.
-        * Note : the particle colors are stored values, so setting computeParticleColor to false will keep yet the last colors set.
-        */
-        computeParticleColor: boolean;
-        /**
-        * Tells to setParticle() to compute the particle textures or not.
-        * Default value : true. The SPS is faster when it's set to false.
-        * Note : the particle textures are stored values, so setting computeParticleTexture to false will keep yet the last colors set.
-        */
-        computeParticleTexture: boolean;
-        /**
-        * Tells to setParticle() to call the vertex function for each vertex of each particle, or not.
-        * Default value : false. The SPS is faster when it's set to false.
-        * Note : the particle custom vertex positions aren't stored values.
-        */
-        computeParticleVertex: boolean;
-        /**
-        * This function does nothing. It may be overwritten to set all the particles first values.
-        * The SPS doesn't call this function, you may have to call it by your own.
-        * doc : http://doc.babylonjs.com/tutorials/Solid_Particle_System#particle-management
-        */
-        initParticles(): void;
-        /**
-        * This function does nothing. It may be overwritten to recycle a particle.
-        * The SPS doesn't call this function, you may have to call it by your own.
-        * doc : http://doc.babylonjs.com/tutorials/Solid_Particle_System#particle-management
-        */
-        recycleParticle(particle: SolidParticle): SolidParticle;
-        /**
-        * Updates a particle : this function should  be overwritten by the user.
-        * It is called on each particle by setParticles(). This is the place to code each particle behavior.
-        * doc : http://doc.babylonjs.com/tutorials/Solid_Particle_System#particle-management
-        * ex : just set a particle position or velocity and recycle conditions
-        */
-        updateParticle(particle: SolidParticle): SolidParticle;
-        /**
-        * Updates a vertex of a particle : it can be overwritten by the user.
-        * This will be called on each vertex particle by setParticles() if computeParticleVertex is set to true only.
-        * @param particle the current particle
-        * @param vertex the current index of the current particle
-        * @param pt the index of the current vertex in the particle shape
-        * doc : http://doc.babylonjs.com/tutorials/Solid_Particle_System#update-each-particle-shape
-        * ex : just set a vertex particle position
-        */
-        updateParticleVertex(particle: SolidParticle, vertex: Vector3, pt: number): Vector3;
-        /**
-        * This will be called before any other treatment by setParticles() and will be passed three parameters.
-        * This does nothing and may be overwritten by the user.
-        * @param start the particle index in the particle array where to stop to iterate, same than the value passed to setParticle()
-        * @param stop the particle index in the particle array where to stop to iterate, same than the value passed to setParticle()
-        * @param update the boolean update value actually passed to setParticles()
-        */
-        beforeUpdateParticles(start?: number, stop?: number, update?: boolean): void;
-        /**
-        * This will be called  by setParticles() after all the other treatments and just before the actual mesh update.
-        * This will be passed three parameters.
-        * This does nothing and may be overwritten by the user.
-        * @param start the particle index in the particle array where to stop to iterate, same than the value passed to setParticle()
-        * @param stop the particle index in the particle array where to stop to iterate, same than the value passed to setParticle()
-        * @param update the boolean update value actually passed to setParticles()
-        */
-        afterUpdateParticles(start?: number, stop?: number, update?: boolean): void;
-    }
-}
-
-declare namespace BABYLON {
-    interface IPhysicsEnginePlugin {
-        name: string;
-        initialize(iterations?: number): any;
-        setGravity(gravity: Vector3): void;
-        getGravity(): Vector3;
-        runOneStep(delta: number): void;
-        registerMesh(mesh: AbstractMesh, impostor: number, options: PhysicsBodyCreationOptions): any;
-        registerMeshesAsCompound(parts: PhysicsCompoundBodyPart[], options: PhysicsBodyCreationOptions): any;
-        unregisterMesh(mesh: AbstractMesh): any;
-        applyImpulse(mesh: AbstractMesh, force: Vector3, contactPoint: Vector3): void;
-        createLink(mesh1: AbstractMesh, mesh2: AbstractMesh, pivot1: Vector3, pivot2: Vector3, options?: any): boolean;
-        dispose(): void;
-        isSupported(): boolean;
-        updateBodyPosition(mesh: AbstractMesh): void;
-        getWorldObject(): any;
-        getPhysicsBodyOfMesh(mesh: AbstractMesh): any;
-    }
-    interface PhysicsBodyCreationOptions {
-        mass: number;
-        friction: number;
-        restitution: number;
-    }
-    interface PhysicsCompoundBodyPart {
-        mesh: Mesh;
-        impostor: number;
-    }
-    class PhysicsEngine {
-        gravity: Vector3;
-        private _currentPlugin;
-        constructor(plugin?: IPhysicsEnginePlugin);
-        _initialize(gravity?: Vector3): void;
-        _runOneStep(delta: number): void;
-        _setGravity(gravity: Vector3): void;
-        _getGravity(): Vector3;
-        _registerMesh(mesh: AbstractMesh, impostor: number, options: PhysicsBodyCreationOptions): any;
-        _registerMeshesAsCompound(parts: PhysicsCompoundBodyPart[], options: PhysicsBodyCreationOptions): any;
-        _unregisterMesh(mesh: AbstractMesh): void;
-        _applyImpulse(mesh: AbstractMesh, force: Vector3, contactPoint: Vector3): void;
-        _createLink(mesh1: AbstractMesh, mesh2: AbstractMesh, pivot1: Vector3, pivot2: Vector3, options?: any): boolean;
-        _updateBodyPosition(mesh: AbstractMesh): void;
-        dispose(): void;
-        isSupported(): boolean;
-        getPhysicsBodyOfMesh(mesh: AbstractMesh): any;
-        getPhysicsPluginName(): string;
-        static NoImpostor: number;
-        static SphereImpostor: number;
-        static BoxImpostor: number;
-        static PlaneImpostor: number;
-        static MeshImpostor: number;
-        static CapsuleImpostor: number;
-        static ConeImpostor: number;
-        static CylinderImpostor: number;
-        static ConvexHullImpostor: number;
-        static HeightmapImpostor: number;
-        static Epsilon: number;
-    }
-}
-
-declare namespace BABYLON {
-    class AnaglyphPostProcess extends PostProcess {
-        constructor(name: string, ratio: number, camera: Camera, samplingMode?: number, engine?: Engine, reusable?: boolean);
-    }
-}
-
-declare namespace BABYLON {
-    class BlackAndWhitePostProcess extends PostProcess {
-        constructor(name: string, ratio: number, camera: Camera, samplingMode?: number, engine?: Engine, reusable?: boolean);
-    }
-}
-
-declare namespace BABYLON {
-    class BlurPostProcess extends PostProcess {
-        direction: Vector2;
-        blurWidth: number;
-        constructor(name: string, direction: Vector2, blurWidth: number, ratio: number, camera: Camera, samplingMode?: number, engine?: Engine, reusable?: boolean);
-    }
-}
-
-declare namespace BABYLON {
-    class ColorCorrectionPostProcess extends PostProcess {
-        private _colorTableTexture;
-        constructor(name: string, colorTableUrl: string, ratio: number, camera: Camera, samplingMode?: number, engine?: Engine, reusable?: boolean);
-    }
-}
-
-declare namespace BABYLON {
-    class ConvolutionPostProcess extends PostProcess {
-        kernel: number[];
-        constructor(name: string, kernel: number[], ratio: number, camera: Camera, samplingMode?: number, engine?: Engine, reusable?: boolean);
-        static EdgeDetect0Kernel: number[];
-        static EdgeDetect1Kernel: number[];
-        static EdgeDetect2Kernel: number[];
-        static SharpenKernel: number[];
-        static EmbossKernel: number[];
-        static GaussianKernel: number[];
-    }
-}
-
-declare namespace BABYLON {
-    class DisplayPassPostProcess extends PostProcess {
-        constructor(name: string, ratio: number, camera: Camera, samplingMode?: number, engine?: Engine, reusable?: boolean);
-    }
-}
-
-declare namespace BABYLON {
-    class FilterPostProcess extends PostProcess {
-        kernelMatrix: Matrix;
-        constructor(name: string, kernelMatrix: Matrix, ratio: number, camera?: Camera, samplingMode?: number, engine?: Engine, reusable?: boolean);
-    }
-}
-
-declare namespace BABYLON {
-    class FxaaPostProcess extends PostProcess {
-        texelWidth: number;
-        texelHeight: number;
-        constructor(name: string, ratio: number, camera: Camera, samplingMode?: number, engine?: Engine, reusable?: boolean);
-    }
-}
-
-declare namespace BABYLON {
-    class HDRRenderingPipeline extends PostProcessRenderPipeline implements IDisposable {
-        /**
-        * Public members
-        */
-        /**
-        * Gaussian blur coefficient
-        * @type {number}
-        */
-        gaussCoeff: number;
-        /**
-        * Gaussian blur mean
-        * @type {number}
-        */
-        gaussMean: number;
-        /**
-        * Gaussian blur standard deviation
-        * @type {number}
-        */
-        gaussStandDev: number;
-        /**
-        * Gaussian blur multiplier. Multiplies the blur effect
-        * @type {number}
-        */
-        gaussMultiplier: number;
-        /**
-        * Exposure, controls the overall intensity of the pipeline
-        * @type {number}
-        */
-        exposure: number;
-        /**
-        * Minimum luminance that the post-process can output. Luminance is >= 0
-        * @type {number}
-        */
-        minimumLuminance: number;
-        /**
-        * Maximum luminance that the post-process can output. Must be suprerior to minimumLuminance
-        * @type {number}
-        */
-        maximumLuminance: number;
-        /**
-        * Increase rate for luminance: eye adaptation speed to dark
-        * @type {number}
-        */
-        luminanceIncreaserate: number;
-        /**
-        * Decrease rate for luminance: eye adaptation speed to bright
-        * @type {number}
-        */
-        luminanceDecreaseRate: number;
-        /**
-        * Minimum luminance needed to compute HDR
-        * @type {number}
-        */
-        brightThreshold: number;
-        /**
-        * Private members
-        */
-        private _guassianBlurHPostProcess;
-        private _guassianBlurVPostProcess;
-        private _brightPassPostProcess;
-        private _textureAdderPostProcess;
-        private _downSampleX4PostProcess;
-        private _originalPostProcess;
-        private _hdrPostProcess;
-        private _hdrCurrentLuminance;
-        private _hdrOutputLuminance;
-        static LUM_STEPS: number;
-        private _downSamplePostProcesses;
-        private _scene;
-        private _needUpdate;
-        /**
-         * @constructor
-         * @param {string} name - The rendering pipeline name
-         * @param {BABYLON.Scene} scene - The scene linked to this pipeline
-         * @param {any} ratio - The size of the postprocesses (0.5 means that your postprocess will have a width = canvas.width 0.5 and a height = canvas.height 0.5)
-         * @param {BABYLON.PostProcess} originalPostProcess - the custom original color post-process. Must be "reusable". Can be null.
-         * @param {BABYLON.Camera[]} cameras - The array of cameras that the rendering pipeline will be attached to
-         */
-        constructor(name: string, scene: Scene, ratio: number, originalPostProcess?: PostProcess, cameras?: Camera[]);
-        /**
-        * Tells the pipeline to update its post-processes
-        */
-        update(): void;
-        /**
-        * Returns the current calculated luminance
-        */
-        getCurrentLuminance(): number;
-        /**
-        * Returns the currently drawn luminance
-        */
-        getOutputLuminance(): number;
-        /**
-        * Releases the rendering pipeline and its internal effects. Detaches pipeline from cameras
-        */
-        dispose(): void;
-        /**
-        * Creates the HDR post-process and computes the luminance adaptation
-        */
-        private _createHDRPostProcess(scene, ratio);
-        /**
-        * Texture Adder post-process
-        */
-        private _createTextureAdderPostProcess(scene, ratio);
-        /**
-        * Down sample X4 post-process
-        */
-        private _createDownSampleX4PostProcess(scene, ratio);
-        /**
-        * Bright pass post-process
-        */
-        private _createBrightPassPostProcess(scene, ratio);
-        /**
-        * Luminance generator. Creates the luminance post-process and down sample post-processes
-        */
-        private _createLuminanceGeneratorPostProcess(scene);
-        /**
-        * Gaussian blur post-processes. Horizontal and Vertical
-        */
-        private _createGaussianBlurPostProcess(scene, ratio);
-    }
-}
-
-declare namespace BABYLON {
-    class LensRenderingPipeline extends PostProcessRenderPipeline {
-        /**
-        * The chromatic aberration PostProcess id in the pipeline
-        * @type {string}
-        */
-        LensChromaticAberrationEffect: string;
-        /**
-        * The highlights enhancing PostProcess id in the pipeline
-        * @type {string}
-        */
-        HighlightsEnhancingEffect: string;
-        /**
-        * The depth-of-field PostProcess id in the pipeline
-        * @type {string}
-        */
-        LensDepthOfFieldEffect: string;
-        private _scene;
-        private _depthTexture;
-        private _grainTexture;
-        private _chromaticAberrationPostProcess;
-        private _highlightsPostProcess;
-        private _depthOfFieldPostProcess;
-        private _edgeBlur;
-        private _grainAmount;
-        private _chromaticAberration;
-        private _distortion;
-        private _highlightsGain;
-        private _highlightsThreshold;
-        private _dofDistance;
-        private _dofAperture;
-        private _dofDarken;
-        private _dofPentagon;
-        private _blurNoise;
-        /**
-         * @constructor
-         *
-         * Effect parameters are as follow:
-         * {
-         *      chromatic_aberration: number;       // from 0 to x (1 for realism)
-         *      edge_blur: number;                  // from 0 to x (1 for realism)
-         *      distortion: number;                 // from 0 to x (1 for realism)
-         *      grain_amount: number;               // from 0 to 1
-         *      grain_texture: BABYLON.Texture;     // texture to use for grain effect; if unset, use random B&W noise
-         *      dof_focus_distance: number;         // depth-of-field: focus distance; unset to disable (disabled by default)
-         *      dof_aperture: number;               // depth-of-field: focus blur bias (default: 1)
-         *      dof_darken: number;                 // depth-of-field: darken that which is out of focus (from 0 to 1, disabled by default)
-         *      dof_pentagon: boolean;              // depth-of-field: makes a pentagon-like "bokeh" effect
-         *      dof_gain: number;                   // depth-of-field: highlights gain; unset to disable (disabled by default)
-         *      dof_threshold: number;              // depth-of-field: highlights threshold (default: 1)
-         *      blur_noise: boolean;                // add a little bit of noise to the blur (default: true)
-         * }
-         * Note: if an effect parameter is unset, effect is disabled
-         *
-         * @param {string} name - The rendering pipeline name
-         * @param {object} parameters - An object containing all parameters (see above)
-         * @param {BABYLON.Scene} scene - The scene linked to this pipeline
-         * @param {number} ratio - The size of the postprocesses (0.5 means that your postprocess will have a width = canvas.width 0.5 and a height = canvas.height 0.5)
-         * @param {BABYLON.Camera[]} cameras - The array of cameras that the rendering pipeline will be attached to
-         */
-        constructor(name: string, parameters: any, scene: Scene, ratio?: number, cameras?: Camera[]);
-        setEdgeBlur(amount: number): void;
-        disableEdgeBlur(): void;
-        setGrainAmount(amount: number): void;
-        disableGrain(): void;
-        setChromaticAberration(amount: number): void;
-        disableChromaticAberration(): void;
-        setEdgeDistortion(amount: number): void;
-        disableEdgeDistortion(): void;
-        setFocusDistance(amount: number): void;
-        disableDepthOfField(): void;
-        setAperture(amount: number): void;
-        setDarkenOutOfFocus(amount: number): void;
-        enablePentagonBokeh(): void;
-        disablePentagonBokeh(): void;
-        enableNoiseBlur(): void;
-        disableNoiseBlur(): void;
-        setHighlightsGain(amount: number): void;
-        setHighlightsThreshold(amount: number): void;
-        disableHighlights(): void;
-        /**
-         * Removes the internal pipeline assets and detaches the pipeline from the scene cameras
-         */
-        dispose(disableDepthRender?: boolean): void;
-        private _createChromaticAberrationPostProcess(ratio);
-        private _createHighlightsPostProcess(ratio);
-        private _createDepthOfFieldPostProcess(ratio);
-        private _createGrainTexture();
-    }
-}
-
-declare namespace BABYLON {
-    class PassPostProcess extends PostProcess {
-        constructor(name: string, ratio: number, camera: Camera, samplingMode?: number, engine?: Engine, reusable?: boolean);
-    }
-}
-
-declare namespace BABYLON {
-    class PostProcess {
-        name: string;
-        onApply: (effect: Effect) => void;
-        onBeforeRender: (effect: Effect) => void;
-        onAfterRender: (effect: Effect) => void;
-        onSizeChanged: () => void;
-        onActivate: (camera: Camera) => void;
-        width: number;
-        height: number;
-        renderTargetSamplingMode: number;
-        clearColor: Color4;
-        private _camera;
-        private _scene;
-        private _engine;
-        private _renderRatio;
-        private _reusable;
-        private _textureType;
-        _textures: SmartArray<WebGLTexture>;
-        _currentRenderTextureInd: number;
-        private _effect;
-        private _samplers;
-        private _fragmentUrl;
-        private _parameters;
-        constructor(name: string, fragmentUrl: string, parameters: string[], samplers: string[], ratio: number | any, camera: Camera, samplingMode?: number, engine?: Engine, reusable?: boolean, defines?: string, textureType?: number);
-        updateEffect(defines?: string): void;
-        isReusable(): boolean;
-        activate(camera: Camera, sourceTexture?: WebGLTexture): void;
-        isSupported: boolean;
-        apply(): Effect;
-        dispose(camera?: Camera): void;
-    }
-}
-
-declare namespace BABYLON {
-    class PostProcessManager {
-        private _scene;
-        private _indexBuffer;
-        private _vertexDeclaration;
-        private _vertexStrideSize;
-        private _vertexBuffer;
-        constructor(scene: Scene);
-        private _prepareBuffers();
-        _prepareFrame(sourceTexture?: WebGLTexture): boolean;
-        directRender(postProcesses: PostProcess[], targetTexture?: WebGLTexture): void;
-        _finalizeFrame(doNotPresent?: boolean, targetTexture?: WebGLTexture, faceIndex?: number, postProcesses?: PostProcess[]): void;
-        dispose(): void;
-    }
-}
-
-declare namespace BABYLON {
-    class RefractionPostProcess extends PostProcess {
-        color: Color3;
-        depth: number;
-        colorLevel: number;
-        private _refRexture;
-        constructor(name: string, refractionTextureUrl: string, color: Color3, depth: number, colorLevel: number, ratio: number, camera: Camera, samplingMode?: number, engine?: Engine, reusable?: boolean);
-        dispose(camera: Camera): void;
-    }
-}
-
-declare namespace BABYLON {
-    class SSAORenderingPipeline extends PostProcessRenderPipeline {
-        /**
-        * The PassPostProcess id in the pipeline that contains the original scene color
-        * @type {string}
-        */
-        SSAOOriginalSceneColorEffect: string;
-        /**
-        * The SSAO PostProcess id in the pipeline
-        * @type {string}
-        */
-        SSAORenderEffect: string;
-        /**
-        * The horizontal blur PostProcess id in the pipeline
-        * @type {string}
-        */
-        SSAOBlurHRenderEffect: string;
-        /**
-        * The vertical blur PostProcess id in the pipeline
-        * @type {string}
-        */
-        SSAOBlurVRenderEffect: string;
-        /**
-        * The PostProcess id in the pipeline that combines the SSAO-Blur output with the original scene color (SSAOOriginalSceneColorEffect)
-        * @type {string}
-        */
-        SSAOCombineRenderEffect: string;
-        /**
-        * The output strength of the SSAO post-process. Default value is 1.0.
-        * @type {number}
-        */
-        totalStrength: number;
-        /**
-        * The radius around the analyzed pixel used by the SSAO post-process. Default value is 0.0006
-        * @type {number}
-        */
-        radius: number;
-        /**
-        * Related to fallOff, used to interpolate SSAO samples (first interpolate function input) based on the occlusion difference of each pixel
-        * Must not be equal to fallOff and superior to fallOff.
-        * Default value is 0.975
-        * @type {number}
-        */
-        area: number;
-        /**
-        * Related to area, used to interpolate SSAO samples (second interpolate function input) based on the occlusion difference of each pixel
-        * Must not be equal to area and inferior to area.
-        * Default value is 0.0
-        * @type {number}
-        */
-        fallOff: number;
-        /**
-        * The base color of the SSAO post-process
-        * The final result is "base + ssao" between [0, 1]
-        * @type {number}
-        */
-        base: number;
-        private _scene;
-        private _depthTexture;
-        private _randomTexture;
-        private _originalColorPostProcess;
-        private _ssaoPostProcess;
-        private _blurHPostProcess;
-        private _blurVPostProcess;
-        private _ssaoCombinePostProcess;
-        private _firstUpdate;
-        /**
-         * @constructor
-         * @param {string} name - The rendering pipeline name
-         * @param {BABYLON.Scene} scene - The scene linked to this pipeline
-         * @param {any} ratio - The size of the postprocesses. Can be a number shared between passes or an object for more precision: { ssaoRatio: 0.5, combineRatio: 1.0 }
-         * @param {BABYLON.Camera[]} cameras - The array of cameras that the rendering pipeline will be attached to
-         */
-        constructor(name: string, scene: Scene, ratio: any, cameras?: Camera[]);
-        /**
-         * Returns the horizontal blur PostProcess
-         * @return {BABYLON.BlurPostProcess} The horizontal blur post-process
-         */
-        getBlurHPostProcess(): BlurPostProcess;
-        /**
-         * Returns the vertical blur PostProcess
-         * @return {BABYLON.BlurPostProcess} The vertical blur post-process
-         */
-        getBlurVPostProcess(): BlurPostProcess;
-        /**
-         * Removes the internal pipeline assets and detatches the pipeline from the scene cameras
-         */
-        dispose(disableDepthRender?: boolean): void;
-        private _createSSAOPostProcess(ratio);
-        private _createSSAOCombinePostProcess(ratio);
-        private _createRandomTexture();
-    }
-}
-
-declare namespace BABYLON {
-    class StereoscopicInterlacePostProcess extends PostProcess {
-        private _stepSize;
-        constructor(name: string, camB: Camera, postProcessA: PostProcess, isStereoscopicHoriz: boolean, samplingMode?: number);
-    }
-}
-
-declare namespace BABYLON {
-    enum TonemappingOperator {
-        Hable = 0,
-        Reinhard = 1,
-        HejiDawson = 2,
-        Photographic = 3,
-    }
-    class TonemapPostProcess extends PostProcess {
-        private _operator;
-        private _exposureAdjustment;
-        constructor(name: string, operator: TonemappingOperator, exposureAdjustment: number, camera: Camera, samplingMode?: number, engine?: Engine, textureFormat?: number);
-    }
-}
-
-declare namespace BABYLON {
-    class VolumetricLightScatteringPostProcess extends PostProcess {
-        private _volumetricLightScatteringPass;
-        private _volumetricLightScatteringRTT;
-        private _viewPort;
-        private _screenCoordinates;
-        private _cachedDefines;
-        private _customMeshPosition;
-        /**
-        * Set if the post-process should use a custom position for the light source (true) or the internal mesh position (false)
-        * @type {boolean}
-        */
-        useCustomMeshPosition: boolean;
-        /**
-        * If the post-process should inverse the light scattering direction
-        * @type {boolean}
-        */
-        invert: boolean;
-        /**
-        * The internal mesh used by the post-process
-        * @type {boolean}
-        */
-        mesh: Mesh;
-        /**
-        * Set to true to use the diffuseColor instead of the diffuseTexture
-        * @type {boolean}
-        */
-        useDiffuseColor: boolean;
-        /**
-        * Array containing the excluded meshes not rendered in the internal pass
-        */
-        excludedMeshes: AbstractMesh[];
-        /**
-        * Controls the overall intensity of the post-process
-        * @type {number}
-        */
-        exposure: number;
-        /**
-        * Dissipates each sample's contribution in range [0, 1]
-        * @type {number}
-        */
-        decay: number;
-        /**
-        * Controls the overall intensity of each sample
-        * @type {number}
-        */
-        weight: number;
-        /**
-        * Controls the density of each sample
-        * @type {number}
-        */
-        density: number;
-        /**
-         * @constructor
-         * @param {string} name - The post-process name
-         * @param {any} ratio - The size of the post-process and/or internal pass (0.5 means that your postprocess will have a width = canvas.width 0.5 and a height = canvas.height 0.5)
-         * @param {BABYLON.Camera} camera - The camera that the post-process will be attached to
-         * @param {BABYLON.Mesh} mesh - The mesh used to create the light scattering
-         * @param {number} samples - The post-process quality, default 100
-         * @param {number} samplingMode - The post-process filtering mode
-         * @param {BABYLON.Engine} engine - The babylon engine
-         * @param {boolean} reusable - If the post-process is reusable
-         * @param {BABYLON.Scene} scene - The constructor needs a scene reference to initialize internal components. If "camera" is null (RenderPipelineà, "scene" must be provided
-         */
-        constructor(name: string, ratio: any, camera: Camera, mesh?: Mesh, samples?: number, samplingMode?: number, engine?: Engine, reusable?: boolean, scene?: Scene);
-        isReady(subMesh: SubMesh, useInstances: boolean): boolean;
-        /**
-         * Sets the new light position for light scattering effect
-         * @param {BABYLON.Vector3} The new custom light position
-         */
-        setCustomMeshPosition(position: Vector3): void;
-        /**
-         * Returns the light position for light scattering effect
-         * @return {BABYLON.Vector3} The custom light position
-         */
-        getCustomMeshPosition(): Vector3;
-        /**
-         * Disposes the internal assets and detaches the post-process from the camera
-         */
-        dispose(camera: Camera): void;
-        /**
-         * Returns the render target texture used by the post-process
-         * @return {BABYLON.RenderTargetTexture} The render target texture used by the post-process
-         */
-        getPass(): RenderTargetTexture;
-        private _meshExcluded(mesh);
-        private _createPass(scene, ratio);
-        private _updateMeshScreenCoordinates(scene);
-        /**
-        * Creates a default mesh for the Volumeric Light Scattering post-process
-        * @param {string} The mesh name
-        * @param {BABYLON.Scene} The scene where to create the mesh
-        * @return {BABYLON.Mesh} the default mesh
-        */
-        static CreateDefaultMesh(name: string, scene: Scene): Mesh;
-    }
-}
-
-declare namespace BABYLON {
-    class VRDistortionCorrectionPostProcess extends PostProcess {
-        aspectRatio: number;
-        private _isRightEye;
-        private _distortionFactors;
-        private _postProcessScaleFactor;
-        private _lensCenterOffset;
-        private _scaleIn;
-        private _scaleFactor;
-        private _lensCenter;
-        constructor(name: string, camera: Camera, isRightEye: boolean, vrMetrics: VRCameraMetrics);
-    }
-}
-
-declare namespace BABYLON {
-    class ReflectionProbe {
-        name: string;
-        private _scene;
-        private _renderTargetTexture;
-        private _projectionMatrix;
-        private _viewMatrix;
-        private _target;
-        private _add;
-        private _attachedMesh;
-        position: Vector3;
-        constructor(name: string, size: number, scene: Scene, generateMipMaps?: boolean);
-        refreshRate: number;
-        getScene(): Scene;
-        cubeTexture: RenderTargetTexture;
-        renderList: AbstractMesh[];
-        attachToMesh(mesh: AbstractMesh): void;
-        dispose(): void;
-    }
-}
-
-declare namespace BABYLON {
-    class BoundingBoxRenderer {
-        frontColor: Color3;
-        backColor: Color3;
-        showBackLines: boolean;
-        renderList: SmartArray<BoundingBox>;
-        private _scene;
-        private _colorShader;
-        private _vb;
-        private _ib;
-        constructor(scene: Scene);
-        private _prepareRessources();
-        reset(): void;
-        render(): void;
-        dispose(): void;
-    }
-}
-
-declare namespace BABYLON {
-    class DepthRenderer {
-        private _scene;
-        private _depthMap;
-        private _effect;
-        private _viewMatrix;
-        private _projectionMatrix;
-        private _transformMatrix;
-        private _worldViewProjection;
-        private _cachedDefines;
-        constructor(scene: Scene, type?: number);
-        isReady(subMesh: SubMesh, useInstances: boolean): boolean;
-        getDepthMap(): RenderTargetTexture;
-        dispose(): void;
-    }
-}
-
-declare namespace BABYLON {
-    class EdgesRenderer {
-        edgesWidthScalerForOrthographic: number;
-        edgesWidthScalerForPerspective: number;
-        private _source;
-        private _linesPositions;
-        private _linesNormals;
-        private _linesIndices;
-        private _epsilon;
-        private _indicesCount;
-        private _lineShader;
-        private _vb0;
-        private _vb1;
-        private _ib;
-        private _buffers;
-        private _checkVerticesInsteadOfIndices;
-        constructor(source: AbstractMesh, epsilon?: number, checkVerticesInsteadOfIndices?: boolean);
-        private _prepareRessources();
-        dispose(): void;
-        private _processEdgeForAdjacencies(pa, pb, p0, p1, p2);
-        private _processEdgeForAdjacenciesWithVertices(pa, pb, p0, p1, p2);
-        private _checkEdge(faceIndex, edge, faceNormals, p0, p1);
-        _generateEdgesLines(): void;
-        render(): void;
-    }
-}
-
-declare namespace BABYLON {
-    class OutlineRenderer {
-        private _scene;
-        private _effect;
-        private _cachedDefines;
-        constructor(scene: Scene);
-        render(subMesh: SubMesh, batch: _InstancesBatch, useOverlay?: boolean): void;
-        isReady(subMesh: SubMesh, useInstances: boolean): boolean;
-    }
-}
-
-declare namespace BABYLON {
-    class RenderingGroup {
-        index: number;
-        private _scene;
-        private _opaqueSubMeshes;
-        private _transparentSubMeshes;
-        private _alphaTestSubMeshes;
-        private _activeVertices;
-        onBeforeTransparentRendering: () => void;
-        constructor(index: number, scene: Scene);
-        render(customRenderFunction: (opaqueSubMeshes: SmartArray<SubMesh>, transparentSubMeshes: SmartArray<SubMesh>, alphaTestSubMeshes: SmartArray<SubMesh>) => void): boolean;
-        prepare(): void;
-        dispatch(subMesh: SubMesh): void;
-    }
-}
-
-declare namespace BABYLON {
-    class RenderingManager {
-        static MAX_RENDERINGGROUPS: number;
-        private _scene;
-        private _renderingGroups;
-        private _depthBufferAlreadyCleaned;
-        private _currentIndex;
-        private _currentActiveMeshes;
-        private _currentRenderParticles;
-        private _currentRenderSprites;
-        constructor(scene: Scene);
-        private _renderParticles(index, activeMeshes);
-        private _renderSprites(index);
-        private _clearDepthBuffer();
-        private _renderSpritesAndParticles();
-        render(customRenderFunction: (opaqueSubMeshes: SmartArray<SubMesh>, transparentSubMeshes: SmartArray<SubMesh>, alphaTestSubMeshes: SmartArray<SubMesh>) => void, activeMeshes: AbstractMesh[], renderParticles: boolean, renderSprites: boolean): void;
-        reset(): void;
-        dispatch(subMesh: SubMesh): void;
-    }
-}
-
-declare namespace BABYLON {
-    class Sprite {
-        name: string;
-        position: Vector3;
-        color: Color4;
-        width: number;
-        height: number;
-        angle: number;
-        cellIndex: number;
-        invertU: number;
-        invertV: number;
-        disposeWhenFinishedAnimating: boolean;
-        animations: Animation[];
-        isPickable: boolean;
-        actionManager: ActionManager;
-        private _animationStarted;
-        private _loopAnimation;
-        private _fromIndex;
-        private _toIndex;
-        private _delay;
-        private _direction;
-        private _frameCount;
-        private _manager;
-        private _time;
-        size: number;
-        constructor(name: string, manager: SpriteManager);
-        playAnimation(from: number, to: number, loop: boolean, delay: number): void;
-        stopAnimation(): void;
-        _animate(deltaTime: number): void;
-        dispose(): void;
-    }
-}
-
-declare namespace BABYLON {
-    class SpriteManager {
-        name: string;
-        cellSize: number;
-        sprites: Sprite[];
-        renderingGroupId: number;
-        layerMask: number;
-        onDispose: () => void;
-        fogEnabled: boolean;
-        isPickable: boolean;
-        private _capacity;
-        private _spriteTexture;
-        private _epsilon;
-        private _scene;
-        private _vertexDeclaration;
-        private _vertexStrideSize;
-        private _vertexBuffer;
-        private _indexBuffer;
-        private _vertices;
-        private _effectBase;
-        private _effectFog;
-        constructor(name: string, imgUrl: string, capacity: number, cellSize: number, scene: Scene, epsilon?: number, samplingMode?: number);
-        private _appendSpriteVertex(index, sprite, offsetX, offsetY, rowSize);
-        intersects(ray: Ray, camera: Camera, predicate?: (sprite: Sprite) => boolean, fastCheck?: boolean): PickingInfo;
-        render(): void;
-        dispose(): void;
-    }
-}
-
-declare namespace BABYLON.Internals {
-    class AndOrNotEvaluator {
-        static Eval(query: string, evaluateCallback: (val: any) => boolean): boolean;
-        private static _HandleParenthesisContent(parenthesisContent, evaluateCallback);
-        private static _SimplifyNegation(booleanString);
-    }
-}
-
-declare namespace BABYLON {
-    interface IAssetTask {
-        onSuccess: (task: IAssetTask) => void;
-        onError: (task: IAssetTask) => void;
-        isCompleted: boolean;
-        run(scene: Scene, onSuccess: () => void, onError: () => void): any;
-    }
-    class MeshAssetTask implements IAssetTask {
-        name: string;
-        meshesNames: any;
-        rootUrl: string;
-        sceneFilename: string;
-        loadedMeshes: Array<AbstractMesh>;
-        loadedParticleSystems: Array<ParticleSystem>;
-        loadedSkeletons: Array<Skeleton>;
-        onSuccess: (task: IAssetTask) => void;
-        onError: (task: IAssetTask) => void;
-        isCompleted: boolean;
-        constructor(name: string, meshesNames: any, rootUrl: string, sceneFilename: string);
-        run(scene: Scene, onSuccess: () => void, onError: () => void): void;
-    }
-    class TextFileAssetTask implements IAssetTask {
-        name: string;
-        url: string;
-        onSuccess: (task: IAssetTask) => void;
-        onError: (task: IAssetTask) => void;
-        isCompleted: boolean;
-        text: string;
-        constructor(name: string, url: string);
-        run(scene: Scene, onSuccess: () => void, onError: () => void): void;
-    }
-    class BinaryFileAssetTask implements IAssetTask {
-        name: string;
-        url: string;
-        onSuccess: (task: IAssetTask) => void;
-        onError: (task: IAssetTask) => void;
-        isCompleted: boolean;
-        data: ArrayBuffer;
-        constructor(name: string, url: string);
-        run(scene: Scene, onSuccess: () => void, onError: () => void): void;
-    }
-    class ImageAssetTask implements IAssetTask {
-        name: string;
-        url: string;
-        onSuccess: (task: IAssetTask) => void;
-        onError: (task: IAssetTask) => void;
-        isCompleted: boolean;
-        image: HTMLImageElement;
-        constructor(name: string, url: string);
-        run(scene: Scene, onSuccess: () => void, onError: () => void): void;
-    }
-    class TextureAssetTask implements IAssetTask {
-        name: string;
-        url: string;
-        noMipmap: boolean;
-        invertY: boolean;
-        samplingMode: number;
-        onSuccess: (task: IAssetTask) => void;
-        onError: (task: IAssetTask) => void;
-        isCompleted: boolean;
-        texture: Texture;
-        constructor(name: string, url: string, noMipmap?: boolean, invertY?: boolean, samplingMode?: number);
-        run(scene: Scene, onSuccess: () => void, onError: () => void): void;
-    }
-    class AssetsManager {
-        private _tasks;
-        private _scene;
-        private _waitingTasksCount;
-        onFinish: (tasks: IAssetTask[]) => void;
-        onTaskSuccess: (task: IAssetTask) => void;
-        onTaskError: (task: IAssetTask) => void;
-        useDefaultLoadingScreen: boolean;
-        constructor(scene: Scene);
-        addMeshTask(taskName: string, meshesNames: any, rootUrl: string, sceneFilename: string): IAssetTask;
-        addTextFileTask(taskName: string, url: string): IAssetTask;
-        addBinaryFileTask(taskName: string, url: string): IAssetTask;
-        addImageTask(taskName: string, url: string): IAssetTask;
-        addTextureTask(taskName: string, url: string, noMipmap?: boolean, invertY?: boolean, samplingMode?: number): IAssetTask;
-        private _decreaseWaitingTasksCount();
-        private _runTask(task);
-        reset(): AssetsManager;
-        load(): AssetsManager;
-    }
-}
-
-declare namespace BABYLON {
-    class Database {
-        private callbackManifestChecked;
-        private currentSceneUrl;
-        private db;
-        private enableSceneOffline;
-        private enableTexturesOffline;
-        private manifestVersionFound;
-        private mustUpdateRessources;
-        private hasReachedQuota;
-        private isSupported;
-        private idbFactory;
-        static IsUASupportingBlobStorage: boolean;
-        static IDBStorageEnabled: boolean;
-        constructor(urlToScene: string, callbackManifestChecked: (checked: boolean) => any);
-        static parseURL: (url: string) => string;
-        static ReturnFullUrlLocation: (url: string) => string;
-        checkManifestFile(): void;
-        openAsync(successCallback: any, errorCallback: any): void;
-        loadImageFromDB(url: string, image: HTMLImageElement): void;
-        private _loadImageFromDBAsync(url, image, notInDBCallback);
-        private _saveImageIntoDBAsync(url, image);
-        private _checkVersionFromDB(url, versionLoaded);
-        private _loadVersionFromDBAsync(url, callback, updateInDBCallback);
-        private _saveVersionIntoDBAsync(url, callback);
-        private loadFileFromDB(url, sceneLoaded, progressCallBack, errorCallback, useArrayBuffer?);
-        private _loadFileFromDBAsync(url, callback, notInDBCallback, useArrayBuffer?);
-        private _saveFileIntoDBAsync(url, callback, progressCallback, useArrayBuffer?);
-    }
-}
-
-declare namespace BABYLON {
-    class FilesInput {
-        private _engine;
-        private _currentScene;
-        private _canvas;
-        private _sceneLoadedCallback;
-        private _progressCallback;
-        private _additionnalRenderLoopLogicCallback;
-        private _textureLoadingCallback;
-        private _startingProcessingFilesCallback;
-        private _elementToMonitor;
-        static FilesTextures: any[];
-        static FilesToLoad: any[];
-        private _sceneFileToLoad;
-        private _filesToLoad;
-        constructor(p_engine: Engine, p_scene: Scene, p_canvas: HTMLCanvasElement, p_sceneLoadedCallback: any, p_progressCallback: any, p_additionnalRenderLoopLogicCallback: any, p_textureLoadingCallback: any, p_startingProcessingFilesCallback: any);
-        monitorElementForDragNDrop(p_elementToMonitor: HTMLElement): void;
-        private renderFunction();
-        private drag(e);
-        private drop(eventDrop);
-        loadFiles(event: any): void;
-        reload(): void;
-    }
-}
-
-declare namespace BABYLON {
-    class Gamepads {
-        private babylonGamepads;
-        private oneGamepadConnected;
-        private isMonitoring;
-        private gamepadEventSupported;
-        private gamepadSupportAvailable;
-        private _callbackGamepadConnected;
-        private static gamepadDOMInfo;
-        constructor(ongamedpadconnected: (gamepad: Gamepad) => void);
-        dispose(): void;
-        private _onGamepadConnected(evt);
-        private _addNewGamepad(gamepad);
-        private _onGamepadDisconnected(evt);
-        private _startMonitoringGamepads();
-        private _stopMonitoringGamepads();
-        private _checkGamepadsStatus();
-        private _updateGamepadObjects();
-    }
-    class StickValues {
-        x: any;
-        y: any;
-        constructor(x: any, y: any);
-    }
-    class Gamepad {
-        id: string;
-        index: number;
-        browserGamepad: any;
-        private _leftStick;
-        private _rightStick;
-        private _onleftstickchanged;
-        private _onrightstickchanged;
-        constructor(id: string, index: number, browserGamepad: any);
-        onleftstickchanged(callback: (values: StickValues) => void): void;
-        onrightstickchanged(callback: (values: StickValues) => void): void;
-        leftStick: StickValues;
-        rightStick: StickValues;
-        update(): void;
-    }
-    class GenericPad extends Gamepad {
-        id: string;
-        index: number;
-        gamepad: any;
-        private _buttons;
-        private _onbuttondown;
-        private _onbuttonup;
-        onbuttondown(callback: (buttonPressed: number) => void): void;
-        onbuttonup(callback: (buttonReleased: number) => void): void;
-        constructor(id: string, index: number, gamepad: any);
-        private _setButtonValue(newValue, currentValue, buttonIndex);
-        update(): void;
-    }
-    enum Xbox360Button {
-        A = 0,
-        B = 1,
-        X = 2,
-        Y = 3,
-        Start = 4,
-        Back = 5,
-        LB = 6,
-        RB = 7,
-        LeftStick = 8,
-        RightStick = 9,
-    }
-    enum Xbox360Dpad {
-        Up = 0,
-        Down = 1,
-        Left = 2,
-        Right = 3,
-    }
-    class Xbox360Pad extends Gamepad {
-        private _leftTrigger;
-        private _rightTrigger;
-        private _onlefttriggerchanged;
-        private _onrighttriggerchanged;
-        private _onbuttondown;
-        private _onbuttonup;
-        private _ondpaddown;
-        private _ondpadup;
-        private _buttonA;
-        private _buttonB;
-        private _buttonX;
-        private _buttonY;
-        private _buttonBack;
-        private _buttonStart;
-        private _buttonLB;
-        private _buttonRB;
-        private _buttonLeftStick;
-        private _buttonRightStick;
-        private _dPadUp;
-        private _dPadDown;
-        private _dPadLeft;
-        private _dPadRight;
-        onlefttriggerchanged(callback: (value: number) => void): void;
-        onrighttriggerchanged(callback: (value: number) => void): void;
-        leftTrigger: number;
-        rightTrigger: number;
-        onbuttondown(callback: (buttonPressed: Xbox360Button) => void): void;
-        onbuttonup(callback: (buttonReleased: Xbox360Button) => void): void;
-        ondpaddown(callback: (dPadPressed: Xbox360Dpad) => void): void;
-        ondpadup(callback: (dPadReleased: Xbox360Dpad) => void): void;
-        private _setButtonValue(newValue, currentValue, buttonType);
-        private _setDPadValue(newValue, currentValue, buttonType);
-        buttonA: number;
-        buttonB: number;
-        buttonX: number;
-        buttonY: number;
-        buttonStart: number;
-        buttonBack: number;
-        buttonLB: number;
-        buttonRB: number;
-        buttonLeftStick: number;
-        buttonRightStick: number;
-        dPadUp: number;
-        dPadDown: number;
-        dPadLeft: number;
-        dPadRight: number;
-        update(): void;
-    }
-}
-interface Navigator {
-    getGamepads(func?: any): any;
-    webkitGetGamepads(func?: any): any;
-    msGetGamepads(func?: any): any;
-    webkitGamepads(func?: any): any;
-}
-
-declare namespace BABYLON {
-    interface ILoadingScreen {
-        displayLoadingUI: () => void;
-        hideLoadingUI: () => void;
-        loadingUIBackgroundColor: string;
-        loadingUIText: string;
-    }
-    class DefaultLoadingScreen implements ILoadingScreen {
-        private _renderingCanvas;
-        private _loadingText;
-        private _loadingDivBackgroundColor;
-        private _loadingDiv;
-        private _loadingTextDiv;
-        constructor(_renderingCanvas: HTMLCanvasElement, _loadingText?: string, _loadingDivBackgroundColor?: string);
-        displayLoadingUI(): void;
-        hideLoadingUI(): void;
-        loadingUIText: string;
-        loadingUIBackgroundColor: string;
-        private _resizeLoadingUI;
-    }
-}
-
-declare namespace BABYLON {
-    class SceneOptimization {
-        priority: number;
-        apply: (scene: Scene) => boolean;
-        constructor(priority?: number);
-    }
-    class TextureOptimization extends SceneOptimization {
-        priority: number;
-        maximumSize: number;
-        constructor(priority?: number, maximumSize?: number);
-        apply: (scene: Scene) => boolean;
-    }
-    class HardwareScalingOptimization extends SceneOptimization {
-        priority: number;
-        maximumScale: number;
-        private _currentScale;
-        constructor(priority?: number, maximumScale?: number);
-        apply: (scene: Scene) => boolean;
-    }
-    class ShadowsOptimization extends SceneOptimization {
-        apply: (scene: Scene) => boolean;
-    }
-    class PostProcessesOptimization extends SceneOptimization {
-        apply: (scene: Scene) => boolean;
-    }
-    class LensFlaresOptimization extends SceneOptimization {
-        apply: (scene: Scene) => boolean;
-    }
-    class ParticlesOptimization extends SceneOptimization {
-        apply: (scene: Scene) => boolean;
-    }
-    class RenderTargetsOptimization extends SceneOptimization {
-        apply: (scene: Scene) => boolean;
-    }
-    class MergeMeshesOptimization extends SceneOptimization {
-        static _UpdateSelectionTree: boolean;
-        static UpdateSelectionTree: boolean;
-        private _canBeMerged;
-        apply: (scene: Scene, updateSelectionTree?: boolean) => boolean;
-    }
-    class SceneOptimizerOptions {
-        targetFrameRate: number;
-        trackerDuration: number;
-        optimizations: SceneOptimization[];
-        constructor(targetFrameRate?: number, trackerDuration?: number);
-        static LowDegradationAllowed(targetFrameRate?: number): SceneOptimizerOptions;
-        static ModerateDegradationAllowed(targetFrameRate?: number): SceneOptimizerOptions;
-        static HighDegradationAllowed(targetFrameRate?: number): SceneOptimizerOptions;
-    }
-    class SceneOptimizer {
-        static _CheckCurrentState(scene: Scene, options: SceneOptimizerOptions, currentPriorityLevel: number, onSuccess?: () => void, onFailure?: () => void): void;
-        static OptimizeAsync(scene: Scene, options?: SceneOptimizerOptions, onSuccess?: () => void, onFailure?: () => void): void;
-    }
-}
-
-declare namespace BABYLON {
-    class SceneSerializer {
-        static Serialize(scene: Scene): any;
-        static SerializeMesh(toSerialize: any, withParents?: boolean, withChildren?: boolean): any;
-    }
-}
-
-declare namespace BABYLON {
-    class SmartArray<T> {
-        data: Array<T>;
-        length: number;
-        private _id;
-        private _duplicateId;
-        constructor(capacity: number);
-        push(value: any): void;
-        pushNoDuplicate(value: any): void;
-        sort(compareFn: any): void;
-        reset(): void;
-        concat(array: any): void;
-        concatWithNoDuplicate(array: any): void;
-        indexOf(value: any): number;
-        private static _GlobalId;
-    }
-}
-
-declare namespace BABYLON {
-    class SmartCollection {
-        count: number;
-        items: any;
-        private _keys;
-        private _initialCapacity;
-        constructor(capacity?: number);
-        add(key: any, item: any): number;
-        remove(key: any): number;
-        removeItemOfIndex(index: number): number;
-        indexOf(key: any): number;
-        item(key: any): any;
-        getAllKeys(): any[];
-        getKeyByIndex(index: number): any;
-        getItemByIndex(index: number): any;
-        empty(): void;
-        forEach(block: (item: any) => void): void;
-    }
-}
-
-declare namespace BABYLON {
-    class Tags {
-        static EnableFor(obj: any): void;
-        static DisableFor(obj: any): void;
-        static HasTags(obj: any): boolean;
-        static GetTags(obj: any, asString?: boolean): any;
-        static AddTagsTo(obj: any, tagsString: string): void;
-        static _AddTagTo(obj: any, tag: string): void;
-        static RemoveTagsFrom(obj: any, tagsString: string): void;
-        static _RemoveTagFrom(obj: any, tag: string): void;
-        static MatchesQuery(obj: any, tagsQuery: string): boolean;
-    }
-}
-
-declare namespace BABYLON.Internals {
-    interface DDSInfo {
-        width: number;
-        height: number;
-        mipmapCount: number;
-        isFourCC: boolean;
-        isRGB: boolean;
-        isLuminance: boolean;
-        isCube: boolean;
-    }
-    class DDSTools {
-        static GetDDSInfo(arrayBuffer: any): DDSInfo;
-        private static GetRGBAArrayBuffer(width, height, dataOffset, dataLength, arrayBuffer);
-        private static GetRGBArrayBuffer(width, height, dataOffset, dataLength, arrayBuffer);
-        private static GetLuminanceArrayBuffer(width, height, dataOffset, dataLength, arrayBuffer);
-        static UploadDDSLevels(gl: WebGLRenderingContext, ext: any, arrayBuffer: any, info: DDSInfo, loadMipmaps: boolean, faces: number): void;
-    }
-}
-
-declare namespace BABYLON.Internals {
-    class TGATools {
-        private static _TYPE_NO_DATA;
-        private static _TYPE_INDEXED;
-        private static _TYPE_RGB;
-        private static _TYPE_GREY;
-        private static _TYPE_RLE_INDEXED;
-        private static _TYPE_RLE_RGB;
-        private static _TYPE_RLE_GREY;
-        private static _ORIGIN_MASK;
-        private static _ORIGIN_SHIFT;
-        private static _ORIGIN_BL;
-        private static _ORIGIN_BR;
-        private static _ORIGIN_UL;
-        private static _ORIGIN_UR;
-        static GetTGAHeader(data: Uint8Array): any;
-        static UploadContent(gl: WebGLRenderingContext, data: Uint8Array): void;
-        static _getImageData8bits(header: any, palettes: Uint8Array, pixel_data: Uint8Array, y_start: number, y_step: number, y_end: number, x_start: number, x_step: number, x_end: number): Uint8Array;
-        static _getImageData16bits(header: any, palettes: Uint8Array, pixel_data: Uint8Array, y_start: number, y_step: number, y_end: number, x_start: number, x_step: number, x_end: number): Uint8Array;
-        static _getImageData24bits(header: any, palettes: Uint8Array, pixel_data: Uint8Array, y_start: number, y_step: number, y_end: number, x_start: number, x_step: number, x_end: number): Uint8Array;
-        static _getImageData32bits(header: any, palettes: Uint8Array, pixel_data: Uint8Array, y_start: number, y_step: number, y_end: number, x_start: number, x_step: number, x_end: number): Uint8Array;
-        static _getImageDataGrey8bits(header: any, palettes: Uint8Array, pixel_data: Uint8Array, y_start: number, y_step: number, y_end: number, x_start: number, x_step: number, x_end: number): Uint8Array;
-        static _getImageDataGrey16bits(header: any, palettes: Uint8Array, pixel_data: Uint8Array, y_start: number, y_step: number, y_end: number, x_start: number, x_step: number, x_end: number): Uint8Array;
-    }
-}
-
-declare namespace BABYLON {
-    interface IAnimatable {
-        animations: Array<Animation>;
-    }
-    interface ISize {
-        width: number;
-        height: number;
-    }
-    class Tools {
-        static BaseUrl: string;
-        static CorsBehavior: any;
-        static UseFallbackTexture: boolean;
-        static Instantiate(className: string): any;
-        static GetConstructorName(obj: any): any;
-        static ToHex(i: number): string;
-        static SetImmediate(action: () => void): void;
-        static IsExponentOfTwo(value: number): boolean;
-        static GetExponentOfTwo(value: number, max: number): number;
-        static GetFilename(path: string): string;
-        static GetDOMTextContent(element: HTMLElement): string;
-        static ToDegrees(angle: number): number;
-        static ToRadians(angle: number): number;
-        static EncodeArrayBufferTobase64(buffer: ArrayBuffer): string;
-        static ExtractMinAndMaxIndexed(positions: number[] | Float32Array, indices: number[] | Int32Array, indexStart: number, indexCount: number): {
-            minimum: Vector3;
-            maximum: Vector3;
-        };
-        static ExtractMinAndMax(positions: number[] | Float32Array, start: number, count: number): {
-            minimum: Vector3;
-            maximum: Vector3;
-        };
-        static MakeArray(obj: any, allowsNullUndefined?: boolean): Array<any>;
-        static GetPointerPrefix(): string;
-        static QueueNewFrame(func: any): void;
-        static RequestFullscreen(element: any): void;
-        static ExitFullscreen(): void;
-        static CleanUrl(url: string): string;
-        static LoadImage(url: any, onload: any, onerror: any, database: any): HTMLImageElement;
-        static LoadFile(url: string, callback: (data: any) => void, progressCallBack?: () => void, database?: any, useArrayBuffer?: boolean, onError?: () => void): void;
-        static ReadFileAsDataURL(fileToLoad: any, callback: any, progressCallback: any): void;
-        static ReadFile(fileToLoad: any, callback: any, progressCallBack: any, useArrayBuffer?: boolean): void;
-        static FileAsURL(content: string): string;
-        static Clamp(value: number, min?: number, max?: number): number;
-        static Sign(value: number): number;
-        static Format(value: number, decimals?: number): string;
-        static CheckExtends(v: Vector3, min: Vector3, max: Vector3): void;
-        static WithinEpsilon(a: number, b: number, epsilon?: number): boolean;
-        static DeepCopy(source: any, destination: any, doNotCopyList?: string[], mustCopyList?: string[]): void;
-        static IsEmpty(obj: any): boolean;
-        static RegisterTopRootEvents(events: {
-            name: string;
-            handler: EventListener;
-        }[]): void;
-        static UnregisterTopRootEvents(events: {
-            name: string;
-            handler: EventListener;
-        }[]): void;
-        static DumpFramebuffer(width: number, height: number, engine: Engine, successCallback?: (data: string) => void): void;
-        static CreateScreenshot(engine: Engine, camera: Camera, size: any, successCallback?: (data: string) => void): void;
-        static ValidateXHRData(xhr: XMLHttpRequest, dataType?: number): boolean;
-        private static _NoneLogLevel;
-        private static _MessageLogLevel;
-        private static _WarningLogLevel;
-        private static _ErrorLogLevel;
-        private static _LogCache;
-        static errorsCount: number;
-        static OnNewCacheEntry: (entry: string) => void;
-        static NoneLogLevel: number;
-        static MessageLogLevel: number;
-        static WarningLogLevel: number;
-        static ErrorLogLevel: number;
-        static AllLogLevel: number;
-        private static _AddLogEntry(entry);
-        private static _FormatMessage(message);
-        static Log: (message: string) => void;
-        private static _LogDisabled(message);
-        private static _LogEnabled(message);
-        static Warn: (message: string) => void;
-        private static _WarnDisabled(message);
-        private static _WarnEnabled(message);
-        static Error: (message: string) => void;
-        private static _ErrorDisabled(message);
-        private static _ErrorEnabled(message);
-        static LogCache: string;
-        static ClearLogCache(): void;
-        static LogLevels: number;
-        private static _PerformanceNoneLogLevel;
-        private static _PerformanceUserMarkLogLevel;
-        private static _PerformanceConsoleLogLevel;
-        private static _performance;
-        static PerformanceNoneLogLevel: number;
-        static PerformanceUserMarkLogLevel: number;
-        static PerformanceConsoleLogLevel: number;
-        static PerformanceLogLevel: number;
-        static _StartPerformanceCounterDisabled(counterName: string, condition?: boolean): void;
-        static _EndPerformanceCounterDisabled(counterName: string, condition?: boolean): void;
-        static _StartUserMark(counterName: string, condition?: boolean): void;
-        static _EndUserMark(counterName: string, condition?: boolean): void;
-        static _StartPerformanceConsole(counterName: string, condition?: boolean): void;
-        static _EndPerformanceConsole(counterName: string, condition?: boolean): void;
-        static StartPerformanceCounter: (counterName: string, condition?: boolean) => void;
-        static EndPerformanceCounter: (counterName: string, condition?: boolean) => void;
-        static Now: number;
-    }
-    /**
-     * An implementation of a loop for asynchronous functions.
-     */
-    class AsyncLoop {
-        iterations: number;
-        private _fn;
-        private _successCallback;
-        index: number;
-        private _done;
-        /**
-         * Constroctor.
-         * @param iterations the number of iterations.
-         * @param _fn the function to run each iteration
-         * @param _successCallback the callback that will be called upon succesful execution
-         * @param offset starting offset.
-         */
-        constructor(iterations: number, _fn: (asyncLoop: AsyncLoop) => void, _successCallback: () => void, offset?: number);
-        /**
-         * Execute the next iteration. Must be called after the last iteration was finished.
-         */
-        executeNext(): void;
-        /**
-         * Break the loop and run the success callback.
-         */
-        breakLoop(): void;
-        /**
-         * Helper function
-         */
-        static Run(iterations: number, _fn: (asyncLoop: AsyncLoop) => void, _successCallback: () => void, offset?: number): AsyncLoop;
-        /**
-         * A for-loop that will run a given number of iterations synchronous and the rest async.
-         * @param iterations total number of iterations
-         * @param syncedIterations number of synchronous iterations in each async iteration.
-         * @param fn the function to call each iteration.
-         * @param callback a success call back that will be called when iterating stops.
-         * @param breakFunction a break condition (optional)
-         * @param timeout timeout settings for the setTimeout function. default - 0.
-         * @constructor
-         */
-        static SyncAsyncForLoop(iterations: number, syncedIterations: number, fn: (iteration: number) => void, callback: () => void, breakFunction?: () => boolean, timeout?: number): void;
-    }
-}
-
-declare namespace BABYLON {
-    enum JoystickAxis {
-        X = 0,
-        Y = 1,
-        Z = 2,
-    }
-    class VirtualJoystick {
-        reverseLeftRight: boolean;
-        reverseUpDown: boolean;
-        deltaPosition: Vector3;
-        pressed: boolean;
-        private static _globalJoystickIndex;
-        private static vjCanvas;
-        private static vjCanvasContext;
-        private static vjCanvasWidth;
-        private static vjCanvasHeight;
-        private static halfWidth;
-        private static halfHeight;
-        private _action;
-        private _axisTargetedByLeftAndRight;
-        private _axisTargetedByUpAndDown;
-        private _joystickSensibility;
-        private _inversedSensibility;
-        private _rotationSpeed;
-        private _inverseRotationSpeed;
-        private _rotateOnAxisRelativeToMesh;
-        private _joystickPointerID;
-        private _joystickColor;
-        private _joystickPointerPos;
-        private _joystickPreviousPointerPos;
-        private _joystickPointerStartPos;
-        private _deltaJoystickVector;
-        private _leftJoystick;
-        private _joystickIndex;
-        private _touches;
-        private _onPointerDownHandlerRef;
-        private _onPointerMoveHandlerRef;
-        private _onPointerUpHandlerRef;
-        private _onPointerOutHandlerRef;
-        private _onResize;
-        constructor(leftJoystick?: boolean);
-        setJoystickSensibility(newJoystickSensibility: number): void;
-        private _onPointerDown(e);
-        private _onPointerMove(e);
-        private _onPointerUp(e);
-        /**
-        * Change the color of the virtual joystick
-        * @param newColor a string that must be a CSS color value (like "red") or the hexa value (like "#FF0000")
-        */
-        setJoystickColor(newColor: string): void;
-        setActionOnTouch(action: () => any): void;
-        setAxisForLeftRight(axis: JoystickAxis): void;
-        setAxisForUpDown(axis: JoystickAxis): void;
-        private _clearCanvas();
-        private _drawVirtualJoystick();
-        releaseCanvas(): void;
-    }
-}
-
-declare namespace BABYLON {
-    class VRDeviceOrientationFreeCamera extends FreeCamera {
-        _alpha: number;
-        _beta: number;
-        _gamma: number;
-        private _offsetOrientation;
-        private _deviceOrientationHandler;
-        constructor(name: string, position: Vector3, scene: Scene, compensateDistortion?: boolean);
-        _onOrientationEvent(evt: DeviceOrientationEvent): void;
-        attachControl(element: HTMLElement, noPreventDefault?: boolean): void;
-        detachControl(element: HTMLElement): void;
-    }
-}
-
-declare var HMDVRDevice: any;
-declare var PositionSensorVRDevice: any;
-declare namespace BABYLON {
-    class WebVRFreeCamera extends FreeCamera {
-        _hmdDevice: any;
-        _sensorDevice: any;
-        _cacheState: any;
-        _cacheQuaternion: Quaternion;
-        _cacheRotation: Vector3;
-        _vrEnabled: boolean;
-        constructor(name: string, position: Vector3, scene: Scene, compensateDistortion?: boolean);
-        private _getWebVRDevices(devices);
-        _checkInputs(): void;
-        attachControl(element: HTMLElement, noPreventDefault?: boolean): void;
-        detachControl(element: HTMLElement): void;
-    }
-}
-
-declare namespace BABYLON {
-    interface IOctreeContainer<T> {
-        blocks: Array<OctreeBlock<T>>;
-    }
-    class Octree<T> {
-        maxDepth: number;
-        blocks: Array<OctreeBlock<T>>;
-        dynamicContent: T[];
-        private _maxBlockCapacity;
-        private _selectionContent;
-        private _creationFunc;
-        constructor(creationFunc: (entry: T, block: OctreeBlock<T>) => void, maxBlockCapacity?: number, maxDepth?: number);
-        update(worldMin: Vector3, worldMax: Vector3, entries: T[]): void;
-        addMesh(entry: T): void;
-        select(frustumPlanes: Plane[], allowDuplicate?: boolean): SmartArray<T>;
-        intersects(sphereCenter: Vector3, sphereRadius: number, allowDuplicate?: boolean): SmartArray<T>;
-        intersectsRay(ray: Ray): SmartArray<T>;
-        static _CreateBlocks<T>(worldMin: Vector3, worldMax: Vector3, entries: T[], maxBlockCapacity: number, currentDepth: number, maxDepth: number, target: IOctreeContainer<T>, creationFunc: (entry: T, block: OctreeBlock<T>) => void): void;
-        static CreationFuncForMeshes: (entry: AbstractMesh, block: OctreeBlock<AbstractMesh>) => void;
-        static CreationFuncForSubMeshes: (entry: SubMesh, block: OctreeBlock<SubMesh>) => void;
-    }
-}
-
-declare namespace BABYLON {
-    class OctreeBlock<T> {
-        entries: T[];
-        blocks: Array<OctreeBlock<T>>;
-        private _depth;
-        private _maxDepth;
-        private _capacity;
-        private _minPoint;
-        private _maxPoint;
-        private _boundingVectors;
-        private _creationFunc;
-        constructor(minPoint: Vector3, maxPoint: Vector3, capacity: number, depth: number, maxDepth: number, creationFunc: (entry: T, block: OctreeBlock<T>) => void);
-        capacity: number;
-        minPoint: Vector3;
-        maxPoint: Vector3;
-        addEntry(entry: T): void;
-        addEntries(entries: T[]): void;
-        select(frustumPlanes: Plane[], selection: SmartArray<T>, allowDuplicate?: boolean): void;
-        intersects(sphereCenter: Vector3, sphereRadius: number, selection: SmartArray<T>, allowDuplicate?: boolean): void;
-        intersectsRay(ray: Ray, selection: SmartArray<T>): void;
-        createInnerBlocks(): void;
-    }
-}
-
-declare namespace BABYLON {
-    class ShadowGenerator {
-        private static _FILTER_NONE;
-        private static _FILTER_VARIANCESHADOWMAP;
-        private static _FILTER_POISSONSAMPLING;
-        private static _FILTER_BLURVARIANCESHADOWMAP;
-        static FILTER_NONE: number;
-        static FILTER_VARIANCESHADOWMAP: number;
-        static FILTER_POISSONSAMPLING: number;
-        static FILTER_BLURVARIANCESHADOWMAP: number;
-        private _filter;
-        blurScale: number;
-        private _blurBoxOffset;
-        private _bias;
-        private _lightDirection;
-        forceBackFacesOnly: boolean;
-        bias: number;
-        blurBoxOffset: number;
-        filter: number;
-        useVarianceShadowMap: boolean;
-        usePoissonSampling: boolean;
-        useBlurVarianceShadowMap: boolean;
-        private _light;
-        private _scene;
-        private _shadowMap;
-        private _shadowMap2;
-        private _darkness;
-        private _transparencyShadow;
-        private _effect;
-        private _viewMatrix;
-        private _projectionMatrix;
-        private _transformMatrix;
-        private _worldViewProjection;
-        private _cachedPosition;
-        private _cachedDirection;
-        private _cachedDefines;
-        private _currentRenderID;
-        private _downSamplePostprocess;
-        private _boxBlurPostprocess;
-        private _mapSize;
-        private _currentFaceIndex;
-        private _currentFaceIndexCache;
-        constructor(mapSize: number, light: IShadowLight);
-        isReady(subMesh: SubMesh, useInstances: boolean): boolean;
-        getShadowMap(): RenderTargetTexture;
-        getShadowMapForRendering(): RenderTargetTexture;
-        getLight(): IShadowLight;
-        getTransformMatrix(): Matrix;
-        getDarkness(): number;
-        setDarkness(darkness: number): void;
-        setTransparencyShadow(hasShadow: boolean): void;
-        private _packHalf(depth);
-        dispose(): void;
-        serialize(): any;
-        static Parse(parsedShadowGenerator: any, scene: Scene): ShadowGenerator;
-    }
-}
-
-declare namespace BABYLON.Internals {
-}
-
-declare namespace BABYLON {
-    class BaseTexture {
-        name: string;
-        delayLoadState: number;
-        hasAlpha: boolean;
-        getAlphaFromRGB: boolean;
-        level: number;
-        isCube: boolean;
-        isRenderTarget: boolean;
-        animations: Animation[];
-        onDispose: () => void;
-        coordinatesIndex: number;
-        coordinatesMode: number;
-        wrapU: number;
-        wrapV: number;
-        anisotropicFilteringLevel: number;
-        _cachedAnisotropicFilteringLevel: number;
-        private _scene;
-        _texture: WebGLTexture;
-        constructor(scene: Scene);
-        getScene(): Scene;
-        getTextureMatrix(): Matrix;
-        getReflectionTextureMatrix(): Matrix;
-        getInternalTexture(): WebGLTexture;
-        isReady(): boolean;
-        getSize(): ISize;
-        getBaseSize(): ISize;
-        scale(ratio: number): void;
-        canRescale: boolean;
-        _removeFromCache(url: string, noMipmap: boolean): void;
-        _getFromCache(url: string, noMipmap: boolean, sampling?: number): WebGLTexture;
-        delayLoad(): void;
-        clone(): BaseTexture;
-        releaseInternalTexture(): void;
-        dispose(): void;
-        serialize(): any;
-    }
-}
-
-declare namespace BABYLON {
-    class CubeTexture extends BaseTexture {
-        url: string;
-        coordinatesMode: number;
-        private _noMipmap;
-        private _files;
-        private _extensions;
-        private _textureMatrix;
-        static CreateFromImages(files: string[], scene: Scene, noMipmap?: boolean): CubeTexture;
-        constructor(rootUrl: string, scene: Scene, extensions?: string[], noMipmap?: boolean, files?: string[]);
-        clone(): CubeTexture;
-        delayLoad(): void;
-        getReflectionTextureMatrix(): Matrix;
-        static Parse(parsedTexture: any, scene: Scene, rootUrl: string): CubeTexture;
-        serialize(): any;
-    }
-}
-
-declare namespace BABYLON {
-    class DynamicTexture extends Texture {
-        private _generateMipMaps;
-        private _canvas;
-        private _context;
-        constructor(name: string, options: any, scene: Scene, generateMipMaps: boolean, samplingMode?: number);
-        canRescale: boolean;
-        scale(ratio: number): void;
-        getContext(): CanvasRenderingContext2D;
-        clear(): void;
-        update(invertY?: boolean): void;
-        drawText(text: string, x: number, y: number, font: string, color: string, clearColor: string, invertY?: boolean, update?: boolean): void;
-        clone(): DynamicTexture;
-    }
-}
-
-declare namespace BABYLON {
-    class MirrorTexture extends RenderTargetTexture {
-        mirrorPlane: Plane;
-        private _transformMatrix;
-        private _mirrorMatrix;
-        private _savedViewMatrix;
-        constructor(name: string, size: number, scene: Scene, generateMipMaps?: boolean);
-        clone(): MirrorTexture;
-        serialize(): any;
-    }
-}
-
-declare namespace BABYLON {
-    class RawTexture extends Texture {
-        format: number;
-        constructor(data: ArrayBufferView, width: number, height: number, format: number, scene: Scene, generateMipMaps?: boolean, invertY?: boolean, samplingMode?: number);
-        update(data: ArrayBufferView): void;
-        static CreateLuminanceTexture(data: ArrayBufferView, width: number, height: number, scene: Scene, generateMipMaps?: boolean, invertY?: boolean, samplingMode?: number): RawTexture;
-        static CreateLuminanceAlphaTexture(data: ArrayBufferView, width: number, height: number, scene: Scene, generateMipMaps?: boolean, invertY?: boolean, samplingMode?: number): RawTexture;
-        static CreateAlphaTexture(data: ArrayBufferView, width: number, height: number, scene: Scene, generateMipMaps?: boolean, invertY?: boolean, samplingMode?: number): RawTexture;
-        static CreateRGBTexture(data: ArrayBufferView, width: number, height: number, scene: Scene, generateMipMaps?: boolean, invertY?: boolean, samplingMode?: number): RawTexture;
-        static CreateRGBATexture(data: ArrayBufferView, width: number, height: number, scene: Scene, generateMipMaps?: boolean, invertY?: boolean, samplingMode?: number): RawTexture;
-    }
-}
-
-declare namespace BABYLON {
-    class RenderTargetTexture extends Texture {
-        isCube: boolean;
-        static _REFRESHRATE_RENDER_ONCE: number;
-        static _REFRESHRATE_RENDER_ONEVERYFRAME: number;
-        static _REFRESHRATE_RENDER_ONEVERYTWOFRAMES: number;
-        static REFRESHRATE_RENDER_ONCE: number;
-        static REFRESHRATE_RENDER_ONEVERYFRAME: number;
-        static REFRESHRATE_RENDER_ONEVERYTWOFRAMES: number;
-        renderList: AbstractMesh[];
-        renderParticles: boolean;
-        renderSprites: boolean;
-        coordinatesMode: number;
-        onBeforeRender: (faceIndex: number) => void;
-        onAfterRender: (faceIndex: number) => void;
-        onAfterUnbind: () => void;
-        onClear: (engine: Engine) => void;
-        activeCamera: Camera;
-        customRenderFunction: (opaqueSubMeshes: SmartArray<SubMesh>, transparentSubMeshes: SmartArray<SubMesh>, alphaTestSubMeshes: SmartArray<SubMesh>, beforeTransparents?: () => void) => void;
-        private _size;
-        _generateMipMaps: boolean;
-        private _renderingManager;
-        _waitingRenderList: string[];
-        private _doNotChangeAspectRatio;
-        private _currentRefreshId;
-        private _refreshRate;
-        private _textureMatrix;
-        constructor(name: string, size: any, scene: Scene, generateMipMaps?: boolean, doNotChangeAspectRatio?: boolean, type?: number, isCube?: boolean);
-        resetRefreshCounter(): void;
-        refreshRate: number;
-        _shouldRender(): boolean;
-        isReady(): boolean;
-        getRenderSize(): number;
-        canRescale: boolean;
-        scale(ratio: number): void;
-        getReflectionTextureMatrix(): Matrix;
-        resize(size: any, generateMipMaps?: boolean): void;
-        render(useCameraPostProcess?: boolean, dumpForDebug?: boolean): void;
-        renderToTarget(faceIndex: number, currentRenderList: AbstractMesh[], useCameraPostProcess: boolean, dumpForDebug: boolean): void;
-        clone(): RenderTargetTexture;
-        serialize(): any;
-    }
-}
-
-declare namespace BABYLON {
-    class Texture extends BaseTexture {
-        static NEAREST_SAMPLINGMODE: number;
-        static BILINEAR_SAMPLINGMODE: number;
-        static TRILINEAR_SAMPLINGMODE: number;
-        static EXPLICIT_MODE: number;
-        static SPHERICAL_MODE: number;
-        static PLANAR_MODE: number;
-        static CUBIC_MODE: number;
-        static PROJECTION_MODE: number;
-        static SKYBOX_MODE: number;
-        static INVCUBIC_MODE: number;
-        static EQUIRECTANGULAR_MODE: number;
-        static FIXED_EQUIRECTANGULAR_MODE: number;
-        static CLAMP_ADDRESSMODE: number;
-        static WRAP_ADDRESSMODE: number;
-        static MIRROR_ADDRESSMODE: number;
-        url: string;
-        uOffset: number;
-        vOffset: number;
-        uScale: number;
-        vScale: number;
-        uAng: number;
-        vAng: number;
-        wAng: number;
-        private _noMipmap;
-        _invertY: boolean;
-        private _rowGenerationMatrix;
-        private _cachedTextureMatrix;
-        private _projectionModeMatrix;
-        private _t0;
-        private _t1;
-        private _t2;
-        private _cachedUOffset;
-        private _cachedVOffset;
-        private _cachedUScale;
-        private _cachedVScale;
-        private _cachedUAng;
-        private _cachedVAng;
-        private _cachedWAng;
-        private _cachedCoordinatesMode;
-        _samplingMode: number;
-        private _buffer;
-        private _deleteBuffer;
-        constructor(url: string, scene: Scene, noMipmap?: boolean, invertY?: boolean, samplingMode?: number, onLoad?: () => void, onError?: () => void, buffer?: any, deleteBuffer?: boolean);
-        delayLoad(): void;
-        updateSamplingMode(samplingMode: number): void;
-        private _prepareRowForTextureGeneration(x, y, z, t);
-        getTextureMatrix(): Matrix;
-        getReflectionTextureMatrix(): Matrix;
-        clone(): Texture;
-        serialize(): any;
-        static CreateFromBase64String(data: string, name: string, scene: Scene, noMipmap?: boolean, invertY?: boolean, samplingMode?: number, onLoad?: () => void, onError?: () => void): Texture;
-        static Parse(parsedTexture: any, scene: Scene, rootUrl: string): BaseTexture;
-    }
-}
-
-declare namespace BABYLON {
-    class VideoTexture extends Texture {
-        video: HTMLVideoElement;
-        private _autoLaunch;
-        private _lastUpdate;
-        constructor(name: string, urls: string[], scene: Scene, generateMipMaps?: boolean, invertY?: boolean, samplingMode?: number);
-        update(): boolean;
-    }
-}
-
-declare namespace BABYLON {
-    class CannonJSPlugin implements IPhysicsEnginePlugin {
-        private _useDeltaForWorldStep;
-        private _world;
-        private _registeredMeshes;
-        private _physicsMaterials;
-        private _gravity;
-        private _fixedTimeStep;
-        name: string;
-        constructor(_useDeltaForWorldStep?: boolean);
-        initialize(iterations?: number): void;
-        private _checkWithEpsilon(value);
-        runOneStep(delta: number): void;
-        setGravity(gravity: Vector3): void;
-        getGravity(): Vector3;
-        registerMesh(mesh: AbstractMesh, impostor: number, options?: PhysicsBodyCreationOptions): any;
-        private _createShape(mesh, impostor);
-        private _createConvexPolyhedron(rawVerts, rawFaces, mesh);
-        private _createHeightmap(mesh, pointDepth?);
-        private _addMaterial(friction, restitution);
-        private _createRigidBodyFromShape(shape, mesh, options);
-        registerMeshesAsCompound(parts: PhysicsCompoundBodyPart[], options: PhysicsBodyCreationOptions): any;
-        private _unbindBody(body);
-        unregisterMesh(mesh: AbstractMesh): void;
-        applyImpulse(mesh: AbstractMesh, force: Vector3, contactPoint: Vector3): void;
-        updateBodyPosition: (mesh: AbstractMesh) => void;
-        createLink(mesh1: AbstractMesh, mesh2: AbstractMesh, pivot1: Vector3, pivot2: Vector3): boolean;
-        dispose(): void;
-        isSupported(): boolean;
-        getWorldObject(): any;
-        getPhysicsBodyOfMesh(mesh: AbstractMesh): any;
-    }
-}
-
-declare namespace BABYLON {
-    class OimoJSPlugin implements IPhysicsEnginePlugin {
-        private _world;
-        private _registeredMeshes;
-        name: string;
-        private _gravity;
-        private _checkWithEpsilon(value);
-        initialize(iterations?: number): void;
-        setGravity(gravity: Vector3): void;
-        getGravity(): Vector3;
-        registerMesh(mesh: AbstractMesh, impostor: number, options: PhysicsBodyCreationOptions): any;
-        registerMeshesAsCompound(parts: PhysicsCompoundBodyPart[], options: PhysicsBodyCreationOptions): any;
-        private _createBodyAsCompound(part, options, initialMesh);
-        unregisterMesh(mesh: AbstractMesh): void;
-        private _unbindBody(body);
-        /**
-         * Update the body position according to the mesh position
-         * @param mesh
-         */
-        updateBodyPosition: (mesh: AbstractMesh) => void;
-        applyImpulse(mesh: AbstractMesh, force: Vector3, contactPoint: Vector3): void;
-        createLink(mesh1: AbstractMesh, mesh2: AbstractMesh, pivot1: Vector3, pivot2: Vector3, options?: any): boolean;
-        dispose(): void;
-        isSupported(): boolean;
-        getWorldObject(): any;
-        getPhysicsBodyOfMesh(mesh: AbstractMesh): any;
-        private _getLastShape(body);
-        runOneStep(time: number): void;
-    }
-}
-
-declare namespace BABYLON {
-    class PostProcessRenderEffect {
-        private _engine;
-        private _postProcesses;
-        private _getPostProcess;
-        private _singleInstance;
-        private _cameras;
-        private _indicesForCamera;
-        private _renderPasses;
-        private _renderEffectAsPasses;
-        _name: string;
-        applyParameters: (postProcess: PostProcess) => void;
-        constructor(engine: Engine, name: string, getPostProcess: () => PostProcess, singleInstance?: boolean);
-        isSupported: boolean;
-        _update(): void;
-        addPass(renderPass: PostProcessRenderPass): void;
-        removePass(renderPass: PostProcessRenderPass): void;
-        addRenderEffectAsPass(renderEffect: PostProcessRenderEffect): void;
-        getPass(passName: string): void;
-        emptyPasses(): void;
-        _attachCameras(cameras: Camera): any;
-        _attachCameras(cameras: Camera[]): any;
-        _detachCameras(cameras: Camera): any;
-        _detachCameras(cameras: Camera[]): any;
-        _enable(cameras: Camera): any;
-        _enable(cameras: Camera[]): any;
-        _disable(cameras: Camera): any;
-        _disable(cameras: Camera[]): any;
-        getPostProcess(camera?: Camera): PostProcess;
-        private _linkParameters();
-        private _linkTextures(effect);
-    }
-}
-
-declare namespace BABYLON {
-    class PostProcessRenderPass {
-        private _enabled;
-        private _renderList;
-        private _renderTexture;
-        private _scene;
-        private _refCount;
-        _name: string;
-        constructor(scene: Scene, name: string, size: number, renderList: Mesh[], beforeRender: () => void, afterRender: () => void);
-        _incRefCount(): number;
-        _decRefCount(): number;
-        _update(): void;
-        setRenderList(renderList: Mesh[]): void;
-        getRenderTexture(): RenderTargetTexture;
-    }
-}
-
-declare namespace BABYLON {
-    class PostProcessRenderPipeline {
-        private _engine;
-        private _renderEffects;
-        private _renderEffectsForIsolatedPass;
-        private _cameras;
-        _name: string;
-        private static PASS_EFFECT_NAME;
-        private static PASS_SAMPLER_NAME;
-        constructor(engine: Engine, name: string);
-        isSupported: boolean;
-        addEffect(renderEffect: PostProcessRenderEffect): void;
-        _enableEffect(renderEffectName: string, cameras: Camera): any;
-        _enableEffect(renderEffectName: string, cameras: Camera[]): any;
-        _disableEffect(renderEffectName: string, cameras: Camera): any;
-        _disableEffect(renderEffectName: string, cameras: Camera[]): any;
-        _attachCameras(cameras: Camera, unique: boolean): any;
-        _attachCameras(cameras: Camera[], unique: boolean): any;
-        _detachCameras(cameras: Camera): any;
-        _detachCameras(cameras: Camera[]): any;
-        _enableDisplayOnlyPass(passName: any, cameras: Camera): any;
-        _enableDisplayOnlyPass(passName: any, cameras: Camera[]): any;
-        _disableDisplayOnlyPass(cameras: Camera): any;
-        _disableDisplayOnlyPass(cameras: Camera[]): any;
-        _update(): void;
-        dispose(): void;
-    }
-}
-
-declare namespace BABYLON {
-    class PostProcessRenderPipelineManager {
-        private _renderPipelines;
-        constructor();
-        addPipeline(renderPipeline: PostProcessRenderPipeline): void;
-        attachCamerasToRenderPipeline(renderPipelineName: string, cameras: Camera, unique?: boolean): any;
-        attachCamerasToRenderPipeline(renderPipelineName: string, cameras: Camera[], unique?: boolean): any;
-        detachCamerasFromRenderPipeline(renderPipelineName: string, cameras: Camera): any;
-        detachCamerasFromRenderPipeline(renderPipelineName: string, cameras: Camera[]): any;
-        enableEffectInPipeline(renderPipelineName: string, renderEffectName: string, cameras: Camera): any;
-        enableEffectInPipeline(renderPipelineName: string, renderEffectName: string, cameras: Camera[]): any;
-        disableEffectInPipeline(renderPipelineName: string, renderEffectName: string, cameras: Camera): any;
-        disableEffectInPipeline(renderPipelineName: string, renderEffectName: string, cameras: Camera[]): any;
-        enableDisplayOnlyPassInPipeline(renderPipelineName: string, passName: string, cameras: Camera): any;
-        enableDisplayOnlyPassInPipeline(renderPipelineName: string, passName: string, cameras: Camera[]): any;
-        disableDisplayOnlyPassInPipeline(renderPipelineName: string, cameras: Camera): any;
-        disableDisplayOnlyPassInPipeline(renderPipelineName: string, cameras: Camera[]): any;
-        update(): void;
-    }
-}
-
-declare namespace BABYLON {
-    class CustomProceduralTexture extends ProceduralTexture {
-        private _animate;
-        private _time;
-        private _config;
-        private _texturePath;
-        constructor(name: string, texturePath: any, size: number, scene: Scene, fallbackTexture?: Texture, generateMipMaps?: boolean);
-        private loadJson(jsonUrl);
-        isReady(): boolean;
-        render(useCameraPostProcess?: boolean): void;
-        updateTextures(): void;
-        updateShaderUniforms(): void;
-        animate: boolean;
-    }
-}
-
-declare namespace BABYLON {
-    class ProceduralTexture extends Texture {
-        isCube: boolean;
-        private _size;
-        _generateMipMaps: boolean;
-        isEnabled: boolean;
-        private _doNotChangeAspectRatio;
-        private _currentRefreshId;
-        private _refreshRate;
-        onGenerated: () => void;
-        private _vertexBuffer;
-        private _indexBuffer;
-        private _effect;
-        private _vertexDeclaration;
-        private _vertexStrideSize;
-        private _uniforms;
-        private _samplers;
-        private _fragment;
-        _textures: Texture[];
-        private _floats;
-        private _floatsArrays;
-        private _colors3;
-        private _colors4;
-        private _vectors2;
-        private _vectors3;
-        private _matrices;
-        private _fallbackTexture;
-        private _fallbackTextureUsed;
-        constructor(name: string, size: any, fragment: any, scene: Scene, fallbackTexture?: Texture, generateMipMaps?: boolean, isCube?: boolean);
-        reset(): void;
-        isReady(): boolean;
-        resetRefreshCounter(): void;
-        setFragment(fragment: any): void;
-        refreshRate: number;
-        _shouldRender(): boolean;
-        getRenderSize(): number;
-        resize(size: any, generateMipMaps: any): void;
-        private _checkUniform(uniformName);
-        setTexture(name: string, texture: Texture): ProceduralTexture;
-        setFloat(name: string, value: number): ProceduralTexture;
-        setFloats(name: string, value: number[]): ProceduralTexture;
-        setColor3(name: string, value: Color3): ProceduralTexture;
-        setColor4(name: string, value: Color4): ProceduralTexture;
-        setVector2(name: string, value: Vector2): ProceduralTexture;
-        setVector3(name: string, value: Vector3): ProceduralTexture;
-        setMatrix(name: string, value: Matrix): ProceduralTexture;
-        render(useCameraPostProcess?: boolean): void;
-        clone(): ProceduralTexture;
-        dispose(): void;
-    }
-}
diff --git a/babylonjs/index.d.ts b/babylonjs/index.d.ts
new file mode 100644
index 0000000000..ad6d1a242f
--- /dev/null
+++ b/babylonjs/index.d.ts
@@ -0,0 +1,7260 @@
+// Type definitions for BabylonJS v2.3
+// Project: http://www.babylonjs.com/
+// Definitions by: David Catuhe <https://github.com/deltakosh/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace BABYLON {
+    class _DepthCullingState {
+        private _isDepthTestDirty;
+        private _isDepthMaskDirty;
+        private _isDepthFuncDirty;
+        private _isCullFaceDirty;
+        private _isCullDirty;
+        private _isZOffsetDirty;
+        private _depthTest;
+        private _depthMask;
+        private _depthFunc;
+        private _cull;
+        private _cullFace;
+        private _zOffset;
+        isDirty: boolean;
+        zOffset: number;
+        cullFace: number;
+        cull: boolean;
+        depthFunc: number;
+        depthMask: boolean;
+        depthTest: boolean;
+        reset(): void;
+        apply(gl: WebGLRenderingContext): void;
+    }
+    class _AlphaState {
+        private _isAlphaBlendDirty;
+        private _isBlendFunctionParametersDirty;
+        private _alphaBlend;
+        private _blendFunctionParameters;
+        isDirty: boolean;
+        alphaBlend: boolean;
+        setAlphaBlendFunctionParameters(value0: number, value1: number, value2: number, value3: number): void;
+        reset(): void;
+        apply(gl: WebGLRenderingContext): void;
+    }
+    class EngineCapabilities {
+        maxTexturesImageUnits: number;
+        maxTextureSize: number;
+        maxCubemapTextureSize: number;
+        maxRenderTextureSize: number;
+        standardDerivatives: boolean;
+        s3tc: any;
+        textureFloat: boolean;
+        textureAnisotropicFilterExtension: any;
+        maxAnisotropy: number;
+        instancedArrays: any;
+        uintIndices: boolean;
+        highPrecisionShaderSupported: boolean;
+        fragmentDepthSupported: boolean;
+        drawBuffersExtension: any;
+    }
+    /**
+     * The engine class is responsible for interfacing with all lower-level APIs such as WebGL and Audio.
+     */
+    class Engine {
+        private static _ALPHA_DISABLE;
+        private static _ALPHA_ADD;
+        private static _ALPHA_COMBINE;
+        private static _ALPHA_SUBTRACT;
+        private static _ALPHA_MULTIPLY;
+        private static _ALPHA_MAXIMIZED;
+        private static _ALPHA_ONEONE;
+        private static _DELAYLOADSTATE_NONE;
+        private static _DELAYLOADSTATE_LOADED;
+        private static _DELAYLOADSTATE_LOADING;
+        private static _DELAYLOADSTATE_NOTLOADED;
+        private static _TEXTUREFORMAT_ALPHA;
+        private static _TEXTUREFORMAT_LUMINANCE;
+        private static _TEXTUREFORMAT_LUMINANCE_ALPHA;
+        private static _TEXTUREFORMAT_RGB;
+        private static _TEXTUREFORMAT_RGBA;
+        private static _TEXTURETYPE_UNSIGNED_INT;
+        private static _TEXTURETYPE_FLOAT;
+        static ALPHA_DISABLE: number;
+        static ALPHA_ONEONE: number;
+        static ALPHA_ADD: number;
+        static ALPHA_COMBINE: number;
+        static ALPHA_SUBTRACT: number;
+        static ALPHA_MULTIPLY: number;
+        static ALPHA_MAXIMIZED: number;
+        static DELAYLOADSTATE_NONE: number;
+        static DELAYLOADSTATE_LOADED: number;
+        static DELAYLOADSTATE_LOADING: number;
+        static DELAYLOADSTATE_NOTLOADED: number;
+        static TEXTUREFORMAT_ALPHA: number;
+        static TEXTUREFORMAT_LUMINANCE: number;
+        static TEXTUREFORMAT_LUMINANCE_ALPHA: number;
+        static TEXTUREFORMAT_RGB: number;
+        static TEXTUREFORMAT_RGBA: number;
+        static TEXTURETYPE_UNSIGNED_INT: number;
+        static TEXTURETYPE_FLOAT: number;
+        static Version: string;
+        static Epsilon: number;
+        static CollisionsEpsilon: number;
+        static CodeRepository: string;
+        static ShadersRepository: string;
+        isFullscreen: boolean;
+        isPointerLock: boolean;
+        cullBackFaces: boolean;
+        renderEvenInBackground: boolean;
+        enableOfflineSupport: boolean;
+        scenes: Scene[];
+        _gl: WebGLRenderingContext;
+        private _renderingCanvas;
+        private _windowIsBackground;
+        private _webGLVersion;
+        static audioEngine: AudioEngine;
+        private _onBlur;
+        private _onFocus;
+        private _onFullscreenChange;
+        private _onPointerLockChange;
+        private _hardwareScalingLevel;
+        private _caps;
+        private _pointerLockRequested;
+        private _alphaTest;
+        private _loadingScreen;
+        private _drawCalls;
+        private _glVersion;
+        private _glRenderer;
+        private _glVendor;
+        private _videoTextureSupported;
+        private _renderingQueueLaunched;
+        private _activeRenderLoops;
+        private fpsRange;
+        private previousFramesDuration;
+        private fps;
+        private deltaTime;
+        private _depthCullingState;
+        private _alphaState;
+        private _alphaMode;
+        private _loadedTexturesCache;
+        private _maxTextureChannels;
+        private _activeTexturesCache;
+        private _currentEffect;
+        private _compiledEffects;
+        private _vertexAttribArrays;
+        private _cachedViewport;
+        private _cachedVertexBuffers;
+        private _cachedIndexBuffer;
+        private _cachedEffectForVertexBuffers;
+        private _currentRenderTarget;
+        private _uintIndicesCurrentlySet;
+        private _workingCanvas;
+        private _workingContext;
+        private _bindedRenderFunction;
+        /**
+         * @constructor
+         * @param {HTMLCanvasElement} canvas - the canvas to be used for rendering
+         * @param {boolean} [antialias] - enable antialias
+         * @param options - further options to be sent to the getContext function
+         */
+        constructor(canvas: HTMLCanvasElement, antialias?: boolean, options?: {
+            antialias?: boolean;
+            preserveDrawingBuffer?: boolean;
+        }, adaptToDeviceRatio?: boolean);
+        webGLVersion: string;
+        private _prepareWorkingCanvas();
+        resetTextureCache(): void;
+        getGlInfo(): {
+            vendor: string;
+            renderer: string;
+            version: string;
+        };
+        getAspectRatio(camera: Camera, useScreen?: boolean): number;
+        getRenderWidth(useScreen?: boolean): number;
+        getRenderHeight(useScreen?: boolean): number;
+        getRenderingCanvas(): HTMLCanvasElement;
+        getRenderingCanvasClientRect(): ClientRect;
+        setHardwareScalingLevel(level: number): void;
+        getHardwareScalingLevel(): number;
+        getLoadedTexturesCache(): WebGLTexture[];
+        getCaps(): EngineCapabilities;
+        drawCalls: number;
+        resetDrawCalls(): void;
+        setDepthFunctionToGreater(): void;
+        setDepthFunctionToGreaterOrEqual(): void;
+        setDepthFunctionToLess(): void;
+        setDepthFunctionToLessOrEqual(): void;
+        /**
+         * stop executing a render loop function and remove it from the execution array
+         * @param {Function} [renderFunction] the function to be removed. If not provided all functions will be removed.
+         */
+        stopRenderLoop(renderFunction?: () => void): void;
+        _renderLoop(): void;
+        /**
+         * Register and execute a render loop. The engine can have more than one render function.
+         * @param {Function} renderFunction - the function to continuesly execute starting the next render loop.
+         * @example
+         * engine.runRenderLoop(function () {
+         *      scene.render()
+         * })
+         */
+        runRenderLoop(renderFunction: () => void): void;
+        /**
+         * Toggle full screen mode.
+         * @param {boolean} requestPointerLock - should a pointer lock be requested from the user
+         */
+        switchFullscreen(requestPointerLock: boolean): void;
+        clear(color: any, backBuffer: boolean, depthStencil: boolean): void;
+        /**
+         * Set the WebGL's viewport
+         * @param {BABYLON.Viewport} viewport - the viewport element to be used.
+         * @param {number} [requiredWidth] - the width required for rendering. If not provided the rendering canvas' width is used.
+         * @param {number} [requiredHeight] - the height required for rendering. If not provided the rendering canvas' height is used.
+         */
+        setViewport(viewport: Viewport, requiredWidth?: number, requiredHeight?: number): void;
+        setDirectViewport(x: number, y: number, width: number, height: number): void;
+        beginFrame(): void;
+        endFrame(): void;
+        /**
+         * resize the view according to the canvas' size.
+         * @example
+         *   window.addEventListener("resize", function () {
+         *      engine.resize();
+         *   });
+         */
+        resize(): void;
+        /**
+         * force a specific size of the canvas
+         * @param {number} width - the new canvas' width
+         * @param {number} height - the new canvas' height
+         */
+        setSize(width: number, height: number): void;
+        bindFramebuffer(texture: WebGLTexture, faceIndex?: number): void;
+        unBindFramebuffer(texture: WebGLTexture, disableGenerateMipMaps?: boolean): void;
+        generateMipMapsForCubemap(texture: WebGLTexture): void;
+        flushFramebuffer(): void;
+        restoreDefaultFramebuffer(): void;
+        private _resetVertexBufferBinding();
+        createVertexBuffer(vertices: number[] | Float32Array): WebGLBuffer;
+        createDynamicVertexBuffer(capacity: number): WebGLBuffer;
+        updateDynamicVertexBuffer(vertexBuffer: WebGLBuffer, vertices: number[] | Float32Array, offset?: number): void;
+        private _resetIndexBufferBinding();
+        createIndexBuffer(indices: number[] | Int32Array): WebGLBuffer;
+        bindBuffers(vertexBuffer: WebGLBuffer, indexBuffer: WebGLBuffer, vertexDeclaration: number[], vertexStrideSize: number, effect: Effect): void;
+        bindMultiBuffers(vertexBuffers: VertexBuffer[], indexBuffer: WebGLBuffer, effect: Effect): void;
+        _releaseBuffer(buffer: WebGLBuffer): boolean;
+        createInstancesBuffer(capacity: number): WebGLBuffer;
+        deleteInstancesBuffer(buffer: WebGLBuffer): void;
+        updateAndBindInstancesBuffer(instancesBuffer: WebGLBuffer, data: Float32Array, offsetLocations: number[]): void;
+        unBindInstancesBuffer(instancesBuffer: WebGLBuffer, offsetLocations: number[]): void;
+        applyStates(): void;
+        draw(useTriangles: boolean, indexStart: number, indexCount: number, instancesCount?: number): void;
+        drawPointClouds(verticesStart: number, verticesCount: number, instancesCount?: number): void;
+        drawUnIndexed(useTriangles: boolean, verticesStart: number, verticesCount: number, instancesCount?: number): void;
+        _releaseEffect(effect: Effect): void;
+        createEffect(baseName: any, attributesNames: string[], uniformsNames: string[], samplers: string[], defines: string, fallbacks?: EffectFallbacks, onCompiled?: (effect: Effect) => void, onError?: (effect: Effect, errors: string) => void): Effect;
+        createEffectForParticles(fragmentName: string, uniformsNames?: string[], samplers?: string[], defines?: string, fallbacks?: EffectFallbacks, onCompiled?: (effect: Effect) => void, onError?: (effect: Effect, errors: string) => void): Effect;
+        createShaderProgram(vertexCode: string, fragmentCode: string, defines: string): WebGLProgram;
+        getUniforms(shaderProgram: WebGLProgram, uniformsNames: string[]): WebGLUniformLocation[];
+        getAttributes(shaderProgram: WebGLProgram, attributesNames: string[]): number[];
+        enableEffect(effect: Effect): void;
+        setArray(uniform: WebGLUniformLocation, array: number[]): void;
+        setArray2(uniform: WebGLUniformLocation, array: number[]): void;
+        setArray3(uniform: WebGLUniformLocation, array: number[]): void;
+        setArray4(uniform: WebGLUniformLocation, array: number[]): void;
+        setMatrices(uniform: WebGLUniformLocation, matrices: Float32Array): void;
+        setMatrix(uniform: WebGLUniformLocation, matrix: Matrix): void;
+        setMatrix3x3(uniform: WebGLUniformLocation, matrix: Float32Array): void;
+        setMatrix2x2(uniform: WebGLUniformLocation, matrix: Float32Array): void;
+        setFloat(uniform: WebGLUniformLocation, value: number): void;
+        setFloat2(uniform: WebGLUniformLocation, x: number, y: number): void;
+        setFloat3(uniform: WebGLUniformLocation, x: number, y: number, z: number): void;
+        setBool(uniform: WebGLUniformLocation, bool: number): void;
+        setFloat4(uniform: WebGLUniformLocation, x: number, y: number, z: number, w: number): void;
+        setColor3(uniform: WebGLUniformLocation, color3: Color3): void;
+        setColor4(uniform: WebGLUniformLocation, color3: Color3, alpha: number): void;
+        setState(culling: boolean, zOffset?: number, force?: boolean, reverseSide?: boolean): void;
+        setDepthBuffer(enable: boolean): void;
+        getDepthWrite(): boolean;
+        setDepthWrite(enable: boolean): void;
+        setColorWrite(enable: boolean): void;
+        setAlphaMode(mode: number): void;
+        getAlphaMode(): number;
+        setAlphaTesting(enable: boolean): void;
+        getAlphaTesting(): boolean;
+        wipeCaches(): void;
+        setSamplingMode(texture: WebGLTexture, samplingMode: number): void;
+        createTexture(url: string, noMipmap: boolean, invertY: boolean, scene: Scene, samplingMode?: number, onLoad?: () => void, onError?: () => void, buffer?: any): WebGLTexture;
+        updateRawTexture(texture: WebGLTexture, data: ArrayBufferView, format: number, invertY: boolean, compression?: string): void;
+        createRawTexture(data: ArrayBufferView, width: number, height: number, format: number, generateMipMaps: boolean, invertY: boolean, samplingMode: number, compression?: string): WebGLTexture;
+        createDynamicTexture(width: number, height: number, generateMipMaps: boolean, samplingMode: number, forceExponantOfTwo?: boolean): WebGLTexture;
+        updateTextureSamplingMode(samplingMode: number, texture: WebGLTexture): void;
+        updateDynamicTexture(texture: WebGLTexture, canvas: HTMLCanvasElement, invertY: boolean): void;
+        updateVideoTexture(texture: WebGLTexture, video: HTMLVideoElement, invertY: boolean): void;
+        createRenderTargetTexture(size: any, options: any): WebGLTexture;
+        createRenderTargetCubeTexture(size: number, options?: any): WebGLTexture;
+        createCubeTexture(rootUrl: string, scene: Scene, files: string[], noMipmap?: boolean): WebGLTexture;
+        _releaseTexture(texture: WebGLTexture): void;
+        bindSamplers(effect: Effect): void;
+        _bindTexture(channel: number, texture: WebGLTexture): void;
+        setTextureFromPostProcess(channel: number, postProcess: PostProcess): void;
+        unbindAllTextures(): void;
+        setTexture(channel: number, texture: BaseTexture): void;
+        _setAnisotropicLevel(key: number, texture: BaseTexture): void;
+        readPixels(x: number, y: number, width: number, height: number): Uint8Array;
+        releaseInternalTexture(texture: WebGLTexture): void;
+        dispose(): void;
+        displayLoadingUI(): void;
+        hideLoadingUI(): void;
+        loadingScreen: ILoadingScreen;
+        loadingUIText: string;
+        loadingUIBackgroundColor: string;
+        getFps(): number;
+        getDeltaTime(): number;
+        private _measureFps();
+        static isSupported(): boolean;
+    }
+}
+
+interface Window {
+    mozIndexedDB(func: any): any;
+    webkitIndexedDB(func: any): any;
+    IDBTransaction(func: any): any;
+    webkitIDBTransaction(func: any): any;
+    msIDBTransaction(func: any): any;
+    IDBKeyRange(func: any): any;
+    webkitIDBKeyRange(func: any): any;
+    msIDBKeyRange(func: any): any;
+    webkitURL: HTMLURL;
+    webkitRequestAnimationFrame(func: any): any;
+    mozRequestAnimationFrame(func: any): any;
+    oRequestAnimationFrame(func: any): any;
+    WebGLRenderingContext: WebGLRenderingContext;
+    MSGesture: MSGesture;
+    CANNON: any;
+    SIMD: any;
+    AudioContext: AudioContext;
+    webkitAudioContext: AudioContext;
+    PointerEvent: any;
+}
+interface HTMLURL {
+    createObjectURL(param1: any, param2?: any): any;
+}
+interface Document {
+    exitFullscreen(): void;
+    webkitCancelFullScreen(): void;
+    mozCancelFullScreen(): void;
+    msCancelFullScreen(): void;
+    mozFullScreen: boolean;
+    msIsFullScreen: boolean;
+    fullscreen: boolean;
+    mozPointerLockElement: HTMLElement;
+    msPointerLockElement: HTMLElement;
+    webkitPointerLockElement: HTMLElement;
+}
+interface HTMLCanvasElement {
+    requestPointerLock(): void;
+    msRequestPointerLock(): void;
+    mozRequestPointerLock(): void;
+    webkitRequestPointerLock(): void;
+}
+interface CanvasRenderingContext2D {
+    imageSmoothingEnabled: boolean;
+    // mozImageSmoothingEnabled: boolean;
+    // oImageSmoothingEnabled: boolean;
+    // webkitImageSmoothingEnabled: boolean;
+}
+interface WebGLTexture {
+    isReady: boolean;
+    isCube: boolean;
+    url: string;
+    noMipmap: boolean;
+    samplingMode: number;
+    references: number;
+    generateMipMaps: boolean;
+    _size: number;
+    _baseWidth: number;
+    _baseHeight: number;
+    _width: number;
+    _height: number;
+    _workingCanvas: HTMLCanvasElement;
+    _workingContext: CanvasRenderingContext2D;
+    _framebuffer: WebGLFramebuffer;
+    _depthBuffer: WebGLRenderbuffer;
+    _cachedCoordinatesMode: number;
+    _cachedWrapU: number;
+    _cachedWrapV: number;
+    _isDisabled: boolean;
+}
+interface WebGLBuffer {
+    references: number;
+    capacity: number;
+    is32Bits: boolean;
+}
+interface MouseEvent {
+    mozMovementX: number;
+    mozMovementY: number;
+    webkitMovementX: number;
+    webkitMovementY: number;
+    msMovementX: number;
+    msMovementY: number;
+}
+interface MSStyleCSSProperties {
+    webkitTransform: string;
+    webkitTransition: string;
+}
+interface Navigator {
+    getVRDevices: () => any;
+    mozGetVRDevices: (any: any) => any;
+    isCocoonJS: boolean;
+}
+interface Screen {
+    orientation: string;
+    mozOrientation: string;
+}
+interface HTMLMediaElement {
+    // crossOrigin: string;
+}
+
+declare namespace BABYLON {
+    /**
+     * Node is the basic class for all scene objects (Mesh, Light Camera).
+     */
+    class Node {
+        parent: Node;
+        name: string;
+        id: string;
+        uniqueId: number;
+        state: string;
+        animations: Animation[];
+        private _ranges;
+        onReady: (node: Node) => void;
+        private _childrenFlag;
+        private _isEnabled;
+        private _isReady;
+        _currentRenderId: number;
+        private _parentRenderId;
+        _waitingParentId: string;
+        private _scene;
+        _cache: any;
+        /**
+         * @constructor
+         * @param {string} name - the name and id to be given to this node
+         * @param {BABYLON.Scene} the scene this node will be added to
+         */
+        constructor(name: string, scene: Scene);
+        getScene(): Scene;
+        getEngine(): Engine;
+        getWorldMatrix(): Matrix;
+        _initCache(): void;
+        updateCache(force?: boolean): void;
+        _updateCache(ignoreParentClass?: boolean): void;
+        _isSynchronized(): boolean;
+        _markSyncedWithParent(): void;
+        isSynchronizedWithParent(): boolean;
+        isSynchronized(updateCache?: boolean): boolean;
+        hasNewParent(update?: boolean): boolean;
+        /**
+         * Is this node ready to be used/rendered
+         * @return {boolean} is it ready
+         */
+        isReady(): boolean;
+        /**
+         * Is this node enabled.
+         * If the node has a parent and is enabled, the parent will be inspected as well.
+         * @return {boolean} whether this node (and its parent) is enabled.
+         * @see setEnabled
+         */
+        isEnabled(): boolean;
+        /**
+         * Set the enabled state of this node.
+         * @param {boolean} value - the new enabled state
+         * @see isEnabled
+         */
+        setEnabled(value: boolean): void;
+        /**
+         * Is this node a descendant of the given node.
+         * The function will iterate up the hierarchy until the ancestor was found or no more parents defined.
+         * @param {BABYLON.Node} ancestor - The parent node to inspect
+         * @see parent
+         */
+        isDescendantOf(ancestor: Node): boolean;
+        _getDescendants(list: Node[], results: Node[]): void;
+        /**
+         * Will return all nodes that have this node as parent.
+         * @return {BABYLON.Node[]} all children nodes of all types.
+         */
+        getDescendants(): Node[];
+        _setReady(state: boolean): void;
+        getAnimationByName(name: string): Animation;
+        createAnimationRange(name: string, from: number, to: number): void;
+        deleteAnimationRange(name: string, deleteFrames?: boolean): void;
+        getAnimationRange(name: string): AnimationRange;
+        beginAnimation(name: string, loop?: boolean, speedRatio?: number, onAnimationEnd?: () => void): void;
+        serializeAnimationRanges(): any;
+        static ParseAnimationRanges(node: Node, parsedNode: any, scene: Scene): void;
+    }
+}
+
+declare namespace BABYLON {
+    interface IDisposable {
+        dispose(): void;
+    }
+    /**
+     * Represents a scene to be rendered by the engine.
+     * @see http://doc.babylonjs.com/page.php?p=21911
+     */
+    class Scene {
+        private static _FOGMODE_NONE;
+        private static _FOGMODE_EXP;
+        private static _FOGMODE_EXP2;
+        private static _FOGMODE_LINEAR;
+        static MinDeltaTime: number;
+        static MaxDeltaTime: number;
+        static FOGMODE_NONE: number;
+        static FOGMODE_EXP: number;
+        static FOGMODE_EXP2: number;
+        static FOGMODE_LINEAR: number;
+        autoClear: boolean;
+        clearColor: any;
+        ambientColor: Color3;
+        /**
+        * A function to be executed before rendering this scene
+        * @type {Function}
+        */
+        beforeRender: () => void;
+        /**
+        * A function to be executed after rendering this scene
+        * @type {Function}
+        */
+        afterRender: () => void;
+        /**
+        * A function to be executed when this scene is disposed.
+        * @type {Function}
+        */
+        onDispose: () => void;
+        beforeCameraRender: (camera: Camera) => void;
+        afterCameraRender: (camera: Camera) => void;
+        forceWireframe: boolean;
+        forcePointsCloud: boolean;
+        forceShowBoundingBoxes: boolean;
+        clipPlane: Plane;
+        animationsEnabled: boolean;
+        constantlyUpdateMeshUnderPointer: boolean;
+        private _onPointerMove;
+        private _onPointerDown;
+        private _onPointerUp;
+        onPointerMove: (evt: PointerEvent, pickInfo: PickingInfo) => void;
+        onPointerDown: (evt: PointerEvent, pickInfo: PickingInfo) => void;
+        onPointerUp: (evt: PointerEvent, pickInfo: PickingInfo) => void;
+        onPointerPick: (evt: PointerEvent, pickInfo: PickingInfo) => void;
+        cameraToUseForPointers: Camera;
+        private _pointerX;
+        private _pointerY;
+        private _meshUnderPointer;
+        private _startingPointerPosition;
+        private _startingPointerTime;
+        _mirroredCameraPosition: Vector3;
+        private _onKeyDown;
+        private _onKeyUp;
+        /**
+        * is fog enabled on this scene.
+        * @type {boolean}
+        */
+        fogEnabled: boolean;
+        fogMode: number;
+        fogColor: Color3;
+        fogDensity: number;
+        fogStart: number;
+        fogEnd: number;
+        /**
+        * is shadow enabled on this scene.
+        * @type {boolean}
+        */
+        shadowsEnabled: boolean;
+        /**
+        * is light enabled on this scene.
+        * @type {boolean}
+        */
+        lightsEnabled: boolean;
+        /**
+        * All of the lights added to this scene.
+        * @see BABYLON.Light
+        * @type {BABYLON.Light[]}
+        */
+        lights: Light[];
+        onNewLightAdded: (newLight?: Light, positionInArray?: number, scene?: Scene) => void;
+        onLightRemoved: (removedLight?: Light) => void;
+        /**
+        * All of the cameras added to this scene.
+        * @see BABYLON.Camera
+        * @type {BABYLON.Camera[]}
+        */
+        cameras: Camera[];
+        onNewCameraAdded: (newCamera?: Camera, positionInArray?: number, scene?: Scene) => void;
+        onCameraRemoved: (removedCamera?: Camera) => void;
+        activeCameras: Camera[];
+        activeCamera: Camera;
+        /**
+        * All of the (abstract) meshes added to this scene.
+        * @see BABYLON.AbstractMesh
+        * @type {BABYLON.AbstractMesh[]}
+        */
+        meshes: AbstractMesh[];
+        onNewMeshAdded: (newMesh?: AbstractMesh, positionInArray?: number, scene?: Scene) => void;
+        onMeshRemoved: (removedMesh?: AbstractMesh) => void;
+        private _geometries;
+        onGeometryAdded: (newGeometry?: Geometry) => void;
+        onGeometryRemoved: (removedGeometry?: Geometry) => void;
+        materials: Material[];
+        multiMaterials: MultiMaterial[];
+        defaultMaterial: StandardMaterial;
+        texturesEnabled: boolean;
+        textures: BaseTexture[];
+        particlesEnabled: boolean;
+        particleSystems: ParticleSystem[];
+        spritesEnabled: boolean;
+        spriteManagers: SpriteManager[];
+        layers: Layer[];
+        skeletonsEnabled: boolean;
+        skeletons: Skeleton[];
+        lensFlaresEnabled: boolean;
+        lensFlareSystems: LensFlareSystem[];
+        collisionsEnabled: boolean;
+        private _workerCollisions;
+        collisionCoordinator: ICollisionCoordinator;
+        gravity: Vector3;
+        postProcessesEnabled: boolean;
+        postProcessManager: PostProcessManager;
+        postProcessRenderPipelineManager: PostProcessRenderPipelineManager;
+        renderTargetsEnabled: boolean;
+        dumpNextRenderTargets: boolean;
+        customRenderTargets: RenderTargetTexture[];
+        useDelayedTextureLoading: boolean;
+        importedMeshesFiles: String[];
+        probesEnabled: boolean;
+        reflectionProbes: ReflectionProbe[];
+        database: any;
+        /**
+         * This scene's action manager
+         * @type {BABYLON.ActionManager}
+         */
+        actionManager: ActionManager;
+        _actionManagers: ActionManager[];
+        private _meshesForIntersections;
+        proceduralTexturesEnabled: boolean;
+        _proceduralTextures: ProceduralTexture[];
+        mainSoundTrack: SoundTrack;
+        soundTracks: SoundTrack[];
+        private _audioEnabled;
+        private _headphone;
+        simplificationQueue: SimplificationQueue;
+        private _engine;
+        private _totalVertices;
+        _activeIndices: number;
+        _activeParticles: number;
+        private _lastFrameDuration;
+        private _evaluateActiveMeshesDuration;
+        private _renderTargetsDuration;
+        _particlesDuration: number;
+        private _renderDuration;
+        _spritesDuration: number;
+        private _animationRatio;
+        private _animationStartDate;
+        _cachedMaterial: Material;
+        private _renderId;
+        private _executeWhenReadyTimeoutId;
+        _toBeDisposed: SmartArray<IDisposable>;
+        private _onReadyCallbacks;
+        private _pendingData;
+        private _onBeforeRenderCallbacks;
+        private _onAfterRenderCallbacks;
+        private _activeMeshes;
+        private _processedMaterials;
+        private _renderTargets;
+        _activeParticleSystems: SmartArray<ParticleSystem>;
+        private _activeSkeletons;
+        private _softwareSkinnedMeshes;
+        _activeBones: number;
+        private _renderingManager;
+        private _physicsEngine;
+        _activeAnimatables: Animatable[];
+        private _transformMatrix;
+        private _pickWithRayInverseMatrix;
+        private _edgesRenderers;
+        private _boundingBoxRenderer;
+        private _outlineRenderer;
+        private _viewMatrix;
+        private _projectionMatrix;
+        private _frustumPlanes;
+        private _selectionOctree;
+        private _pointerOverMesh;
+        private _debugLayer;
+        private _depthRenderer;
+        private _uniqueIdCounter;
+        private _pickedMeshName;
+        /**
+         * @constructor
+         * @param {BABYLON.Engine} engine - the engine to be used to render this scene.
+         */
+        constructor(engine: Engine);
+        debugLayer: DebugLayer;
+        workerCollisions: boolean;
+        SelectionOctree: Octree<AbstractMesh>;
+        /**
+         * The mesh that is currently under the pointer.
+         * @return {BABYLON.AbstractMesh} mesh under the pointer/mouse cursor or null if none.
+         */
+        meshUnderPointer: AbstractMesh;
+        /**
+         * Current on-screen X position of the pointer
+         * @return {number} X position of the pointer
+         */
+        pointerX: number;
+        /**
+         * Current on-screen Y position of the pointer
+         * @return {number} Y position of the pointer
+         */
+        pointerY: number;
+        getCachedMaterial(): Material;
+        getBoundingBoxRenderer(): BoundingBoxRenderer;
+        getOutlineRenderer(): OutlineRenderer;
+        getEngine(): Engine;
+        getTotalVertices(): number;
+        getActiveIndices(): number;
+        getActiveParticles(): number;
+        getActiveBones(): number;
+        getLastFrameDuration(): number;
+        getEvaluateActiveMeshesDuration(): number;
+        getActiveMeshes(): SmartArray<Mesh>;
+        getRenderTargetsDuration(): number;
+        getRenderDuration(): number;
+        getParticlesDuration(): number;
+        getSpritesDuration(): number;
+        getAnimationRatio(): number;
+        getRenderId(): number;
+        incrementRenderId(): void;
+        private _updatePointerPosition(evt);
+        attachControl(): void;
+        detachControl(): void;
+        isReady(): boolean;
+        resetCachedMaterial(): void;
+        registerBeforeRender(func: () => void): void;
+        unregisterBeforeRender(func: () => void): void;
+        registerAfterRender(func: () => void): void;
+        unregisterAfterRender(func: () => void): void;
+        _addPendingData(data: any): void;
+        _removePendingData(data: any): void;
+        getWaitingItemsCount(): number;
+        /**
+         * Registers a function to be executed when the scene is ready.
+         * @param {Function} func - the function to be executed.
+         */
+        executeWhenReady(func: () => void): void;
+        _checkIsReady(): void;
+        /**
+         * Will start the animation sequence of a given target
+         * @param target - the target
+         * @param {number} from - from which frame should animation start
+         * @param {number} to - till which frame should animation run.
+         * @param {boolean} [loop] - should the animation loop
+         * @param {number} [speedRatio] - the speed in which to run the animation
+         * @param {Function} [onAnimationEnd] function to be executed when the animation ended.
+         * @param {BABYLON.Animatable} [animatable] an animatable object. If not provided a new one will be created from the given params.
+         * @return {BABYLON.Animatable} the animatable object created for this animation
+         * @see BABYLON.Animatable
+         * @see http://doc.babylonjs.com/page.php?p=22081
+         */
+        beginAnimation(target: any, from: number, to: number, loop?: boolean, speedRatio?: number, onAnimationEnd?: () => void, animatable?: Animatable): Animatable;
+        beginDirectAnimation(target: any, animations: Animation[], from: number, to: number, loop?: boolean, speedRatio?: number, onAnimationEnd?: () => void): Animatable;
+        getAnimatableByTarget(target: any): Animatable;
+        Animatables: Animatable[];
+        /**
+         * Will stop the animation of the given target
+         * @param target - the target
+         * @see beginAnimation
+         */
+        stopAnimation(target: any): void;
+        private _animate();
+        getViewMatrix(): Matrix;
+        getProjectionMatrix(): Matrix;
+        getTransformMatrix(): Matrix;
+        setTransformMatrix(view: Matrix, projection: Matrix): void;
+        addMesh(newMesh: AbstractMesh): void;
+        removeMesh(toRemove: AbstractMesh): number;
+        removeSkeleton(toRemove: Skeleton): number;
+        removeLight(toRemove: Light): number;
+        removeCamera(toRemove: Camera): number;
+        addLight(newLight: Light): void;
+        addCamera(newCamera: Camera): void;
+        /**
+         * Switch active camera
+         * @param {Camera} newCamera - new active camera
+         * @param {boolean} attachControl - call attachControl for the new active camera (default: true)
+         */
+        swithActiveCamera(newCamera: Camera, attachControl?: boolean): void;
+        /**
+         * sets the active camera of the scene using its ID
+         * @param {string} id - the camera's ID
+         * @return {BABYLON.Camera|null} the new active camera or null if none found.
+         * @see activeCamera
+         */
+        setActiveCameraByID(id: string): Camera;
+        /**
+         * sets the active camera of the scene using its name
+         * @param {string} name - the camera's name
+         * @return {BABYLON.Camera|null} the new active camera or null if none found.
+         * @see activeCamera
+         */
+        setActiveCameraByName(name: string): Camera;
+        /**
+         * get a material using its id
+         * @param {string} the material's ID
+         * @return {BABYLON.Material|null} the material or null if none found.
+         */
+        getMaterialByID(id: string): Material;
+        /**
+         * get a material using its name
+         * @param {string} the material's name
+         * @return {BABYLON.Material|null} the material or null if none found.
+         */
+        getMaterialByName(name: string): Material;
+        getLensFlareSystemByName(name: string): LensFlareSystem;
+        getCameraByID(id: string): Camera;
+        getCameraByUniqueID(uniqueId: number): Camera;
+        /**
+         * get a camera using its name
+         * @param {string} the camera's name
+         * @return {BABYLON.Camera|null} the camera or null if none found.
+         */
+        getCameraByName(name: string): Camera;
+        /**
+         * get a bone using its id
+         * @param {string} the bone's id
+         * @return {BABYLON.Bone|null} the bone or null if not found
+         */
+        getBoneByID(id: string): Bone;
+        /**
+        * get a bone using its id
+        * @param {string} the bone's name
+        * @return {BABYLON.Bone|null} the bone or null if not found
+        */
+        getBoneByName(name: string): Bone;
+        /**
+         * get a light node using its name
+         * @param {string} the light's name
+         * @return {BABYLON.Light|null} the light or null if none found.
+         */
+        getLightByName(name: string): Light;
+        /**
+         * get a light node using its ID
+         * @param {string} the light's id
+         * @return {BABYLON.Light|null} the light or null if none found.
+         */
+        getLightByID(id: string): Light;
+        /**
+         * get a light node using its scene-generated unique ID
+         * @param {number} the light's unique id
+         * @return {BABYLON.Light|null} the light or null if none found.
+         */
+        getLightByUniqueID(uniqueId: number): Light;
+        /**
+         * get a particle system by id
+         * @param id {number} the particle system id
+         * @return {BABYLON.ParticleSystem|null} the corresponding system or null if none found.
+         */
+        getParticleSystemByID(id: string): ParticleSystem;
+        /**
+         * get a geometry using its ID
+         * @param {string} the geometry's id
+         * @return {BABYLON.Geometry|null} the geometry or null if none found.
+         */
+        getGeometryByID(id: string): Geometry;
+        /**
+         * add a new geometry to this scene.
+         * @param {BABYLON.Geometry} geometry - the geometry to be added to the scene.
+         * @param {boolean} [force] - force addition, even if a geometry with this ID already exists
+         * @return {boolean} was the geometry added or not
+         */
+        pushGeometry(geometry: Geometry, force?: boolean): boolean;
+        /**
+         * Removes an existing geometry
+         * @param {BABYLON.Geometry} geometry - the geometry to be removed from the scene.
+         * @return {boolean} was the geometry removed or not
+         */
+        removeGeometry(geometry: Geometry): boolean;
+        getGeometries(): Geometry[];
+        /**
+         * Get the first added mesh found of a given ID
+         * @param {string} id - the id to search for
+         * @return {BABYLON.AbstractMesh|null} the mesh found or null if not found at all.
+         */
+        getMeshByID(id: string): AbstractMesh;
+        /**
+         * Get a mesh with its auto-generated unique id
+         * @param {number} uniqueId - the unique id to search for
+         * @return {BABYLON.AbstractMesh|null} the mesh found or null if not found at all.
+         */
+        getMeshByUniqueID(uniqueId: number): AbstractMesh;
+        /**
+         * Get a the last added mesh found of a given ID
+         * @param {string} id - the id to search for
+         * @return {BABYLON.AbstractMesh|null} the mesh found or null if not found at all.
+         */
+        getLastMeshByID(id: string): AbstractMesh;
+        /**
+         * Get a the last added node (Mesh, Camera, Light) found of a given ID
+         * @param {string} id - the id to search for
+         * @return {BABYLON.Node|null} the node found or null if not found at all.
+         */
+        getLastEntryByID(id: string): Node;
+        getNodeByID(id: string): Node;
+        getNodeByName(name: string): Node;
+        getMeshByName(name: string): AbstractMesh;
+        getSoundByName(name: string): Sound;
+        getLastSkeletonByID(id: string): Skeleton;
+        getSkeletonById(id: string): Skeleton;
+        getSkeletonByName(name: string): Skeleton;
+        isActiveMesh(mesh: Mesh): boolean;
+        private _evaluateSubMesh(subMesh, mesh);
+        private _evaluateActiveMeshes();
+        private _activeMesh(mesh);
+        updateTransformMatrix(force?: boolean): void;
+        private _renderForCamera(camera);
+        private _processSubCameras(camera);
+        private _checkIntersections();
+        render(): void;
+        private _updateAudioParameters();
+        audioEnabled: boolean;
+        private _disableAudio();
+        private _enableAudio();
+        headphone: boolean;
+        private _switchAudioModeForHeadphones();
+        private _switchAudioModeForNormalSpeakers();
+        enableDepthRenderer(): DepthRenderer;
+        disableDepthRenderer(): void;
+        freezeMaterials(): void;
+        unfreezeMaterials(): void;
+        dispose(): void;
+        disposeSounds(): void;
+        getWorldExtends(): {
+            min: Vector3;
+            max: Vector3;
+        };
+        createOrUpdateSelectionOctree(maxCapacity?: number, maxDepth?: number): Octree<AbstractMesh>;
+        createPickingRay(x: number, y: number, world: Matrix, camera: Camera, cameraViewSpace?: boolean): Ray;
+        createPickingRayInCameraSpace(x: number, y: number, camera: Camera): Ray;
+        private _internalPick(rayFunction, predicate, fastCheck?);
+        private _internalPickSprites(ray, predicate?, fastCheck?, camera?);
+        pick(x: number, y: number, predicate?: (mesh: AbstractMesh) => boolean, fastCheck?: boolean, camera?: Camera): PickingInfo;
+        pickSprite(x: number, y: number, predicate?: (sprite: Sprite) => boolean, fastCheck?: boolean, camera?: Camera): PickingInfo;
+        pickWithRay(ray: Ray, predicate: (mesh: Mesh) => boolean, fastCheck?: boolean): PickingInfo;
+        setPointerOverMesh(mesh: AbstractMesh): void;
+        getPointerOverMesh(): AbstractMesh;
+        getPhysicsEngine(): PhysicsEngine;
+        /**
+         * Enables physics to the current scene
+         * @param {BABYLON.Vector3} [gravity] - the scene's gravity for the physics engine
+         * @param {BABYLON.IPhysicsEnginePlugin} [plugin] - The physics engine to be used. defaults to OimoJS.
+         * @return {boolean} was the physics engine initialized
+         */
+        enablePhysics(gravity?: Vector3, plugin?: IPhysicsEnginePlugin): boolean;
+        disablePhysicsEngine(): void;
+        isPhysicsEnabled(): boolean;
+        /**
+         * Sets the gravity of the physics engine (and NOT of the scene)
+         * @param {BABYLON.Vector3} [gravity] - the new gravity to be used
+         */
+        setGravity(gravity: Vector3): void;
+        createCompoundImpostor(parts: any, options: PhysicsBodyCreationOptions): any;
+        deleteCompoundImpostor(compound: any): void;
+        createDefaultCameraOrLight(): void;
+        private _getByTags(list, tagsQuery, forEach?);
+        getMeshesByTags(tagsQuery: string, forEach?: (mesh: AbstractMesh) => void): Mesh[];
+        getCamerasByTags(tagsQuery: string, forEach?: (camera: Camera) => void): Camera[];
+        getLightsByTags(tagsQuery: string, forEach?: (light: Light) => void): Light[];
+        getMaterialByTags(tagsQuery: string, forEach?: (material: Material) => void): Material[];
+    }
+}
+
+declare namespace BABYLON {
+    class Action {
+        triggerOptions: any;
+        trigger: number;
+        _actionManager: ActionManager;
+        private _nextActiveAction;
+        private _child;
+        private _condition;
+        private _triggerParameter;
+        constructor(triggerOptions: any, condition?: Condition);
+        _prepare(): void;
+        getTriggerParameter(): any;
+        _executeCurrent(evt: ActionEvent): void;
+        execute(evt: ActionEvent): void;
+        skipToNextActiveAction(): void;
+        then(action: Action): Action;
+        _getProperty(propertyPath: string): string;
+        _getEffectiveTarget(target: any, propertyPath: string): any;
+    }
+}
+
+declare namespace BABYLON {
+    /**
+     * ActionEvent is the event beint sent when an action is triggered.
+     */
+    class ActionEvent {
+        source: any;
+        pointerX: number;
+        pointerY: number;
+        meshUnderPointer: AbstractMesh;
+        sourceEvent: any;
+        additionalData: any;
+        /**
+         * @constructor
+         * @param source The mesh or sprite that triggered the action.
+         * @param pointerX The X mouse cursor position at the time of the event
+         * @param pointerY The Y mouse cursor position at the time of the event
+         * @param meshUnderPointer The mesh that is currently pointed at (can be null)
+         * @param sourceEvent the original (browser) event that triggered the ActionEvent
+         */
+        constructor(source: any, pointerX: number, pointerY: number, meshUnderPointer: AbstractMesh, sourceEvent?: any, additionalData?: any);
+        /**
+         * Helper function to auto-create an ActionEvent from a source mesh.
+         * @param source The source mesh that triggered the event
+         * @param evt {Event} The original (browser) event
+         */
+        static CreateNew(source: AbstractMesh, evt?: Event, additionalData?: any): ActionEvent;
+        /**
+         * Helper function to auto-create an ActionEvent from a source mesh.
+         * @param source The source sprite that triggered the event
+         * @param scene Scene associated with the sprite
+         * @param evt {Event} The original (browser) event
+         */
+        static CreateNewFromSprite(source: Sprite, scene: Scene, evt?: Event, additionalData?: any): ActionEvent;
+        /**
+         * Helper function to auto-create an ActionEvent from a scene. If triggered by a mesh use ActionEvent.CreateNew
+         * @param scene the scene where the event occurred
+         * @param evt {Event} The original (browser) event
+         */
+        static CreateNewFromScene(scene: Scene, evt: Event): ActionEvent;
+    }
+    /**
+     * Action Manager manages all events to be triggered on a given mesh or the global scene.
+     * A single scene can have many Action Managers to handle predefined actions on specific meshes.
+     */
+    class ActionManager {
+        private static _NothingTrigger;
+        private static _OnPickTrigger;
+        private static _OnLeftPickTrigger;
+        private static _OnRightPickTrigger;
+        private static _OnCenterPickTrigger;
+        private static _OnPickDownTrigger;
+        private static _OnPickUpTrigger;
+        private static _OnLongPressTrigger;
+        private static _OnPointerOverTrigger;
+        private static _OnPointerOutTrigger;
+        private static _OnEveryFrameTrigger;
+        private static _OnIntersectionEnterTrigger;
+        private static _OnIntersectionExitTrigger;
+        private static _OnKeyDownTrigger;
+        private static _OnKeyUpTrigger;
+        static NothingTrigger: number;
+        static OnPickTrigger: number;
+        static OnLeftPickTrigger: number;
+        static OnRightPickTrigger: number;
+        static OnCenterPickTrigger: number;
+        static OnPickDownTrigger: number;
+        static OnPickUpTrigger: number;
+        static OnLongPressTrigger: number;
+        static OnPointerOverTrigger: number;
+        static OnPointerOutTrigger: number;
+        static OnEveryFrameTrigger: number;
+        static OnIntersectionEnterTrigger: number;
+        static OnIntersectionExitTrigger: number;
+        static OnKeyDownTrigger: number;
+        static OnKeyUpTrigger: number;
+        static DragMovementThreshold: number;
+        static LongPressDelay: number;
+        actions: Action[];
+        private _scene;
+        constructor(scene: Scene);
+        dispose(): void;
+        getScene(): Scene;
+        /**
+         * Does this action manager handles actions of any of the given triggers
+         * @param {number[]} triggers - the triggers to be tested
+         * @return {boolean} whether one (or more) of the triggers is handeled
+         */
+        hasSpecificTriggers(triggers: number[]): boolean;
+        /**
+         * Does this action manager handles actions of a given trigger
+         * @param {number} trigger - the trigger to be tested
+         * @return {boolean} whether the trigger is handeled
+         */
+        hasSpecificTrigger(trigger: number): boolean;
+        /**
+         * Does this action manager has pointer triggers
+         * @return {boolean} whether or not it has pointer triggers
+         */
+        hasPointerTriggers: boolean;
+        /**
+         * Does this action manager has pick triggers
+         * @return {boolean} whether or not it has pick triggers
+         */
+        hasPickTriggers: boolean;
+        /**
+         * Registers an action to this action manager
+         * @param {BABYLON.Action} action - the action to be registered
+         * @return {BABYLON.Action} the action amended (prepared) after registration
+         */
+        registerAction(action: Action): Action;
+        /**
+         * Process a specific trigger
+         * @param {number} trigger - the trigger to process
+         * @param evt {BABYLON.ActionEvent} the event details to be processed
+         */
+        processTrigger(trigger: number, evt: ActionEvent): void;
+        _getEffectiveTarget(target: any, propertyPath: string): any;
+        _getProperty(propertyPath: string): string;
+        static Parse(parsedActions: any, object: AbstractMesh, scene: Scene): void;
+    }
+}
+
+declare namespace BABYLON {
+    class Condition {
+        _actionManager: ActionManager;
+        _evaluationId: number;
+        _currentResult: boolean;
+        constructor(actionManager: ActionManager);
+        isValid(): boolean;
+        _getProperty(propertyPath: string): string;
+        _getEffectiveTarget(target: any, propertyPath: string): any;
+    }
+    class ValueCondition extends Condition {
+        propertyPath: string;
+        value: any;
+        operator: number;
+        private static _IsEqual;
+        private static _IsDifferent;
+        private static _IsGreater;
+        private static _IsLesser;
+        static IsEqual: number;
+        static IsDifferent: number;
+        static IsGreater: number;
+        static IsLesser: number;
+        _actionManager: ActionManager;
+        private _target;
+        private _property;
+        constructor(actionManager: ActionManager, target: any, propertyPath: string, value: any, operator?: number);
+        isValid(): boolean;
+    }
+    class PredicateCondition extends Condition {
+        predicate: () => boolean;
+        _actionManager: ActionManager;
+        constructor(actionManager: ActionManager, predicate: () => boolean);
+        isValid(): boolean;
+    }
+    class StateCondition extends Condition {
+        value: string;
+        _actionManager: ActionManager;
+        private _target;
+        constructor(actionManager: ActionManager, target: any, value: string);
+        isValid(): boolean;
+    }
+}
+
+declare namespace BABYLON {
+    class SwitchBooleanAction extends Action {
+        propertyPath: string;
+        private _target;
+        private _property;
+        constructor(triggerOptions: any, target: any, propertyPath: string, condition?: Condition);
+        _prepare(): void;
+        execute(): void;
+    }
+    class SetStateAction extends Action {
+        value: string;
+        private _target;
+        constructor(triggerOptions: any, target: any, value: string, condition?: Condition);
+        execute(): void;
+    }
+    class SetValueAction extends Action {
+        propertyPath: string;
+        value: any;
+        private _target;
+        private _property;
+        constructor(triggerOptions: any, target: any, propertyPath: string, value: any, condition?: Condition);
+        _prepare(): void;
+        execute(): void;
+    }
+    class IncrementValueAction extends Action {
+        propertyPath: string;
+        value: any;
+        private _target;
+        private _property;
+        constructor(triggerOptions: any, target: any, propertyPath: string, value: any, condition?: Condition);
+        _prepare(): void;
+        execute(): void;
+    }
+    class PlayAnimationAction extends Action {
+        from: number;
+        to: number;
+        loop: boolean;
+        private _target;
+        constructor(triggerOptions: any, target: any, from: number, to: number, loop?: boolean, condition?: Condition);
+        _prepare(): void;
+        execute(): void;
+    }
+    class StopAnimationAction extends Action {
+        private _target;
+        constructor(triggerOptions: any, target: any, condition?: Condition);
+        _prepare(): void;
+        execute(): void;
+    }
+    class DoNothingAction extends Action {
+        constructor(triggerOptions?: any, condition?: Condition);
+        execute(): void;
+    }
+    class CombineAction extends Action {
+        children: Action[];
+        constructor(triggerOptions: any, children: Action[], condition?: Condition);
+        _prepare(): void;
+        execute(evt: ActionEvent): void;
+    }
+    class ExecuteCodeAction extends Action {
+        func: (evt: ActionEvent) => void;
+        constructor(triggerOptions: any, func: (evt: ActionEvent) => void, condition?: Condition);
+        execute(evt: ActionEvent): void;
+    }
+    class SetParentAction extends Action {
+        private _parent;
+        private _target;
+        constructor(triggerOptions: any, target: any, parent: any, condition?: Condition);
+        _prepare(): void;
+        execute(): void;
+    }
+    class PlaySoundAction extends Action {
+        private _sound;
+        constructor(triggerOptions: any, sound: Sound, condition?: Condition);
+        _prepare(): void;
+        execute(): void;
+    }
+    class StopSoundAction extends Action {
+        private _sound;
+        constructor(triggerOptions: any, sound: Sound, condition?: Condition);
+        _prepare(): void;
+        execute(): void;
+    }
+}
+
+declare namespace BABYLON {
+    class InterpolateValueAction extends Action {
+        propertyPath: string;
+        value: any;
+        duration: number;
+        stopOtherAnimations: boolean;
+        onInterpolationDone: () => void;
+        private _target;
+        private _property;
+        constructor(triggerOptions: any, target: any, propertyPath: string, value: any, duration?: number, condition?: Condition, stopOtherAnimations?: boolean, onInterpolationDone?: () => void);
+        _prepare(): void;
+        execute(): void;
+    }
+}
+
+declare namespace BABYLON {
+    class Animatable {
+        target: any;
+        fromFrame: number;
+        toFrame: number;
+        loopAnimation: boolean;
+        speedRatio: number;
+        onAnimationEnd: any;
+        private _localDelayOffset;
+        private _pausedDelay;
+        private _animations;
+        private _paused;
+        private _scene;
+        animationStarted: boolean;
+        constructor(scene: Scene, target: any, fromFrame?: number, toFrame?: number, loopAnimation?: boolean, speedRatio?: number, onAnimationEnd?: any, animations?: any);
+        getAnimations(): Animation[];
+        appendAnimations(target: any, animations: Animation[]): void;
+        getAnimationByTargetProperty(property: string): Animation;
+        reset(): void;
+        goToFrame(frame: number): void;
+        pause(): void;
+        restart(): void;
+        stop(): void;
+        _animate(delay: number): boolean;
+    }
+}
+
+declare namespace BABYLON {
+    class AnimationRange {
+        name: string;
+        from: number;
+        to: number;
+        constructor(name: string, from: number, to: number);
+    }
+    /**
+     * Composed of a frame, and an action function
+     */
+    class AnimationEvent {
+        frame: number;
+        action: () => void;
+        onlyOnce: boolean;
+        isDone: boolean;
+        constructor(frame: number, action: () => void, onlyOnce?: boolean);
+    }
+    class Animation {
+        name: string;
+        targetProperty: string;
+        framePerSecond: number;
+        dataType: number;
+        loopMode: number;
+        private _keys;
+        private _offsetsCache;
+        private _highLimitsCache;
+        private _stopped;
+        _target: any;
+        private _easingFunction;
+        private _events;
+        targetPropertyPath: string[];
+        currentFrame: number;
+        allowMatricesInterpolation: boolean;
+        private _ranges;
+        static _PrepareAnimation(name: string, targetProperty: string, framePerSecond: number, totalFrame: number, from: any, to: any, loopMode?: number, easingFunction?: EasingFunction): Animation;
+        static CreateAndStartAnimation(name: string, node: Node, targetProperty: string, framePerSecond: number, totalFrame: number, from: any, to: any, loopMode?: number, easingFunction?: EasingFunction, onAnimationEnd?: () => void): Animatable;
+        static CreateMergeAndStartAnimation(name: string, node: Node, targetProperty: string, framePerSecond: number, totalFrame: number, from: any, to: any, loopMode?: number, easingFunction?: EasingFunction, onAnimationEnd?: () => void): Animatable;
+        constructor(name: string, targetProperty: string, framePerSecond: number, dataType: number, loopMode?: number);
+        /**
+         * Add an event to this animation.
+         */
+        addEvent(event: AnimationEvent): void;
+        /**
+         * Remove all events found at the given frame
+         * @param frame
+         */
+        removeEvents(frame: number): void;
+        createRange(name: string, from: number, to: number): void;
+        deleteRange(name: string, deleteFrames?: boolean): void;
+        getRange(name: string): AnimationRange;
+        reset(): void;
+        isStopped(): boolean;
+        getKeys(): any[];
+        getHighestFrame(): number;
+        getEasingFunction(): IEasingFunction;
+        setEasingFunction(easingFunction: EasingFunction): void;
+        floatInterpolateFunction(startValue: number, endValue: number, gradient: number): number;
+        quaternionInterpolateFunction(startValue: Quaternion, endValue: Quaternion, gradient: number): Quaternion;
+        vector3InterpolateFunction(startValue: Vector3, endValue: Vector3, gradient: number): Vector3;
+        vector2InterpolateFunction(startValue: Vector2, endValue: Vector2, gradient: number): Vector2;
+        color3InterpolateFunction(startValue: Color3, endValue: Color3, gradient: number): Color3;
+        matrixInterpolateFunction(startValue: Matrix, endValue: Matrix, gradient: number): Matrix;
+        clone(): Animation;
+        setKeys(values: Array<any>): void;
+        private _getKeyValue(value);
+        private _interpolate(currentFrame, repeatCount, loopMode, offsetValue?, highLimitValue?);
+        setValue(currentValue: any): void;
+        goToFrame(frame: number): void;
+        animate(delay: number, from: number, to: number, loop: boolean, speedRatio: number): boolean;
+        serialize(): any;
+        private static _ANIMATIONTYPE_FLOAT;
+        private static _ANIMATIONTYPE_VECTOR3;
+        private static _ANIMATIONTYPE_QUATERNION;
+        private static _ANIMATIONTYPE_MATRIX;
+        private static _ANIMATIONTYPE_COLOR3;
+        private static _ANIMATIONTYPE_VECTOR2;
+        private static _ANIMATIONLOOPMODE_RELATIVE;
+        private static _ANIMATIONLOOPMODE_CYCLE;
+        private static _ANIMATIONLOOPMODE_CONSTANT;
+        static ANIMATIONTYPE_FLOAT: number;
+        static ANIMATIONTYPE_VECTOR3: number;
+        static ANIMATIONTYPE_VECTOR2: number;
+        static ANIMATIONTYPE_QUATERNION: number;
+        static ANIMATIONTYPE_MATRIX: number;
+        static ANIMATIONTYPE_COLOR3: number;
+        static ANIMATIONLOOPMODE_RELATIVE: number;
+        static ANIMATIONLOOPMODE_CYCLE: number;
+        static ANIMATIONLOOPMODE_CONSTANT: number;
+        static Parse(parsedAnimation: any): Animation;
+        static AppendSerializedAnimations(source: IAnimatable, destination: any): any;
+    }
+}
+
+declare namespace BABYLON {
+    interface IEasingFunction {
+        ease(gradient: number): number;
+    }
+    class EasingFunction implements IEasingFunction {
+        private static _EASINGMODE_EASEIN;
+        private static _EASINGMODE_EASEOUT;
+        private static _EASINGMODE_EASEINOUT;
+        static EASINGMODE_EASEIN: number;
+        static EASINGMODE_EASEOUT: number;
+        static EASINGMODE_EASEINOUT: number;
+        private _easingMode;
+        setEasingMode(easingMode: number): void;
+        getEasingMode(): number;
+        easeInCore(gradient: number): number;
+        ease(gradient: number): number;
+    }
+    class CircleEase extends EasingFunction implements IEasingFunction {
+        easeInCore(gradient: number): number;
+    }
+    class BackEase extends EasingFunction implements IEasingFunction {
+        amplitude: number;
+        constructor(amplitude?: number);
+        easeInCore(gradient: number): number;
+    }
+    class BounceEase extends EasingFunction implements IEasingFunction {
+        bounces: number;
+        bounciness: number;
+        constructor(bounces?: number, bounciness?: number);
+        easeInCore(gradient: number): number;
+    }
+    class CubicEase extends EasingFunction implements IEasingFunction {
+        easeInCore(gradient: number): number;
+    }
+    class ElasticEase extends EasingFunction implements IEasingFunction {
+        oscillations: number;
+        springiness: number;
+        constructor(oscillations?: number, springiness?: number);
+        easeInCore(gradient: number): number;
+    }
+    class ExponentialEase extends EasingFunction implements IEasingFunction {
+        exponent: number;
+        constructor(exponent?: number);
+        easeInCore(gradient: number): number;
+    }
+    class PowerEase extends EasingFunction implements IEasingFunction {
+        power: number;
+        constructor(power?: number);
+        easeInCore(gradient: number): number;
+    }
+    class QuadraticEase extends EasingFunction implements IEasingFunction {
+        easeInCore(gradient: number): number;
+    }
+    class QuarticEase extends EasingFunction implements IEasingFunction {
+        easeInCore(gradient: number): number;
+    }
+    class QuinticEase extends EasingFunction implements IEasingFunction {
+        easeInCore(gradient: number): number;
+    }
+    class SineEase extends EasingFunction implements IEasingFunction {
+        easeInCore(gradient: number): number;
+    }
+    class BezierCurveEase extends EasingFunction implements IEasingFunction {
+        x1: number;
+        y1: number;
+        x2: number;
+        y2: number;
+        constructor(x1?: number, y1?: number, x2?: number, y2?: number);
+        easeInCore(gradient: number): number;
+    }
+}
+
+declare namespace BABYLON {
+    class Analyser {
+        SMOOTHING: number;
+        FFT_SIZE: number;
+        BARGRAPHAMPLITUDE: number;
+        DEBUGCANVASPOS: {
+            x: number;
+            y: number;
+        };
+        DEBUGCANVASSIZE: {
+            width: number;
+            height: number;
+        };
+        private _byteFreqs;
+        private _byteTime;
+        private _floatFreqs;
+        private _webAudioAnalyser;
+        private _debugCanvas;
+        private _debugCanvasContext;
+        private _scene;
+        private _registerFunc;
+        private _audioEngine;
+        constructor(scene: Scene);
+        getFrequencyBinCount(): number;
+        getByteFrequencyData(): Uint8Array;
+        getByteTimeDomainData(): Uint8Array;
+        getFloatFrequencyData(): Uint8Array;
+        drawDebugCanvas(): void;
+        stopDebugCanvas(): void;
+        connectAudioNodes(inputAudioNode: AudioNode, outputAudioNode: AudioNode): void;
+        dispose(): void;
+    }
+}
+
+declare namespace BABYLON {
+    class AudioEngine {
+        private _audioContext;
+        private _audioContextInitialized;
+        canUseWebAudio: boolean;
+        masterGain: GainNode;
+        private _connectedAnalyser;
+        WarnedWebAudioUnsupported: boolean;
+        unlocked: boolean;
+        onAudioUnlocked: () => any;
+        audioContext: AudioContext;
+        constructor();
+        private _unlockiOSaudio();
+        private _initializeAudioContext();
+        dispose(): void;
+        getGlobalVolume(): number;
+        setGlobalVolume(newVolume: number): void;
+        connectToAnalyser(analyser: Analyser): void;
+    }
+}
+
+declare namespace BABYLON {
+    class Sound {
+        name: string;
+        autoplay: boolean;
+        loop: boolean;
+        useCustomAttenuation: boolean;
+        soundTrackId: number;
+        spatialSound: boolean;
+        refDistance: number;
+        rolloffFactor: number;
+        maxDistance: number;
+        distanceModel: string;
+        private _panningModel;
+        onended: () => any;
+        private _playbackRate;
+        private _streaming;
+        private _startTime;
+        private _startOffset;
+        private _position;
+        private _localDirection;
+        private _volume;
+        private _isLoaded;
+        private _isReadyToPlay;
+        isPlaying: boolean;
+        isPaused: boolean;
+        private _isDirectional;
+        private _readyToPlayCallback;
+        private _audioBuffer;
+        private _soundSource;
+        private _streamingSource;
+        private _soundPanner;
+        private _soundGain;
+        private _inputAudioNode;
+        private _ouputAudioNode;
+        private _coneInnerAngle;
+        private _coneOuterAngle;
+        private _coneOuterGain;
+        private _scene;
+        private _connectedMesh;
+        private _customAttenuationFunction;
+        private _registerFunc;
+        private _isOutputConnected;
+        private _htmlAudioElement;
+        /**
+        * Create a sound and attach it to a scene
+        * @param name Name of your sound
+        * @param urlOrArrayBuffer Url to the sound to load async or ArrayBuffer
+        * @param readyToPlayCallback Provide a callback function if you'd like to load your code once the sound is ready to be played
+        * @param options Objects to provide with the current available options: autoplay, loop, volume, spatialSound, maxDistance, rolloffFactor, refDistance, distanceModel, panningModel, streaming
+        */
+        constructor(name: string, urlOrArrayBuffer: any, scene: Scene, readyToPlayCallback?: () => void, options?: any);
+        dispose(): void;
+        private _soundLoaded(audioData);
+        setAudioBuffer(audioBuffer: AudioBuffer): void;
+        updateOptions(options: any): void;
+        private _createSpatialParameters();
+        private _updateSpatialParameters();
+        switchPanningModelToHRTF(): void;
+        switchPanningModelToEqualPower(): void;
+        private _switchPanningModel();
+        connectToSoundTrackAudioNode(soundTrackAudioNode: AudioNode): void;
+        /**
+        * Transform this sound into a directional source
+        * @param coneInnerAngle Size of the inner cone in degree
+        * @param coneOuterAngle Size of the outer cone in degree
+        * @param coneOuterGain Volume of the sound outside the outer cone (between 0.0 and 1.0)
+        */
+        setDirectionalCone(coneInnerAngle: number, coneOuterAngle: number, coneOuterGain: number): void;
+        setPosition(newPosition: Vector3): void;
+        setLocalDirectionToMesh(newLocalDirection: Vector3): void;
+        private _updateDirection();
+        updateDistanceFromListener(): void;
+        setAttenuationFunction(callback: (currentVolume: number, currentDistance: number, maxDistance: number, refDistance: number, rolloffFactor: number) => number): void;
+        /**
+        * Play the sound
+        * @param time (optional) Start the sound after X seconds. Start immediately (0) by default.
+        */
+        play(time?: number): void;
+        private _onended();
+        /**
+        * Stop the sound
+        * @param time (optional) Stop the sound after X seconds. Stop immediately (0) by default.
+        */
+        stop(time?: number): void;
+        pause(): void;
+        setVolume(newVolume: number, time?: number): void;
+        setPlaybackRate(newPlaybackRate: number): void;
+        getVolume(): number;
+        attachToMesh(meshToConnectTo: AbstractMesh): void;
+        private _onRegisterAfterWorldMatrixUpdate(connectedMesh);
+        clone(): Sound;
+        getAudioBuffer(): AudioBuffer;
+        static Parse(parsedSound: any, scene: Scene, rootUrl: string, sourceSound?: Sound): Sound;
+    }
+}
+
+declare namespace BABYLON {
+    class SoundTrack {
+        private _outputAudioNode;
+        private _inputAudioNode;
+        private _trackConvolver;
+        private _scene;
+        id: number;
+        soundCollection: Array<Sound>;
+        private _isMainTrack;
+        private _connectedAnalyser;
+        private _options;
+        private _isInitialized;
+        constructor(scene: Scene, options?: any);
+        private _initializeSoundTrackAudioGraph();
+        dispose(): void;
+        AddSound(sound: Sound): void;
+        RemoveSound(sound: Sound): void;
+        setVolume(newVolume: number): void;
+        switchPanningModelToHRTF(): void;
+        switchPanningModelToEqualPower(): void;
+        connectToAnalyser(analyser: Analyser): void;
+    }
+}
+
+declare namespace BABYLON {
+    class Bone extends Node {
+        name: string;
+        children: Bone[];
+        animations: Animation[];
+        length: number;
+        private _skeleton;
+        _matrix: Matrix;
+        private _restPose;
+        private _baseMatrix;
+        private _worldTransform;
+        private _absoluteTransform;
+        private _invertedAbsoluteTransform;
+        private _parent;
+        constructor(name: string, skeleton: Skeleton, parentBone: Bone, matrix: Matrix, restPose?: Matrix);
+        getParent(): Bone;
+        getLocalMatrix(): Matrix;
+        getBaseMatrix(): Matrix;
+        getRestPose(): Matrix;
+        returnToRest(): void;
+        getWorldMatrix(): Matrix;
+        getInvertedAbsoluteTransform(): Matrix;
+        getAbsoluteTransform(): Matrix;
+        updateMatrix(matrix: Matrix): void;
+        _updateDifferenceMatrix(rootMatrix?: Matrix): void;
+        markAsDirty(): void;
+        copyAnimationRange(source: Bone, rangeName: string, frameOffset: number, rescaleAsRequired?: boolean): boolean;
+    }
+}
+
+declare namespace BABYLON {
+    class Skeleton {
+        name: string;
+        id: string;
+        bones: Bone[];
+        needInitialSkinMatrix: boolean;
+        private _scene;
+        private _isDirty;
+        private _transformMatrices;
+        private _meshesWithPoseMatrix;
+        private _animatables;
+        private _identity;
+        private _ranges;
+        constructor(name: string, id: string, scene: Scene);
+        getTransformMatrices(mesh: AbstractMesh): Float32Array;
+        getScene(): Scene;
+        createAnimationRange(name: string, from: number, to: number): void;
+        deleteAnimationRange(name: string, deleteFrames?: boolean): void;
+        getAnimationRange(name: string): AnimationRange;
+        /**
+         *  note: This is not for a complete retargeting, only between very similar skeleton's with only possible bone length differences
+         */
+        copyAnimationRange(source: Skeleton, name: string, rescaleAsRequired?: boolean): boolean;
+        returnToRest(): void;
+        private _getHighestAnimationFrame();
+        beginAnimation(name: string, loop?: boolean, speedRatio?: number, onAnimationEnd?: () => void): void;
+        _markAsDirty(): void;
+        _registerMeshWithPoseMatrix(mesh: AbstractMesh): void;
+        _unregisterMeshWithPoseMatrix(mesh: AbstractMesh): void;
+        _computeTransformMatrices(targetMatrix: Float32Array, initialSkinMatrix: Matrix): void;
+        prepare(): void;
+        getAnimatables(): IAnimatable[];
+        clone(name: string, id: string): Skeleton;
+        dispose(): void;
+        serialize(): any;
+        static Parse(parsedSkeleton: any, scene: Scene): Skeleton;
+    }
+}
+
+declare namespace BABYLON {
+    class ArcRotateCamera extends TargetCamera {
+        alpha: number;
+        beta: number;
+        radius: number;
+        target: any;
+        inertialAlphaOffset: number;
+        inertialBetaOffset: number;
+        inertialRadiusOffset: number;
+        lowerAlphaLimit: any;
+        upperAlphaLimit: any;
+        lowerBetaLimit: number;
+        upperBetaLimit: number;
+        lowerRadiusLimit: any;
+        upperRadiusLimit: any;
+        angularSensibilityX: number;
+        angularSensibilityY: number;
+        wheelPrecision: number;
+        pinchPrecision: number;
+        panningSensibility: number;
+        inertialPanningX: number;
+        inertialPanningY: number;
+        keysUp: number[];
+        keysDown: number[];
+        keysLeft: number[];
+        keysRight: number[];
+        zoomOnFactor: number;
+        targetScreenOffset: Vector2;
+        pinchInwards: boolean;
+        allowUpsideDown: boolean;
+        private _keys;
+        _viewMatrix: Matrix;
+        private _attachedElement;
+        private _onContextMenu;
+        private _onPointerDown;
+        private _onPointerUp;
+        private _onPointerMove;
+        private _wheel;
+        private _onMouseMove;
+        private _onKeyDown;
+        private _onKeyUp;
+        private _onLostFocus;
+        _reset: () => void;
+        private _onGestureStart;
+        private _onGesture;
+        private _MSGestureHandler;
+        panningAxis: Vector3;
+        private _localDirection;
+        private _transformedDirection;
+        private _isRightClick;
+        private _isCtrlPushed;
+        onCollide: (collidedMesh: AbstractMesh) => void;
+        checkCollisions: boolean;
+        collisionRadius: Vector3;
+        private _collider;
+        private _previousPosition;
+        private _collisionVelocity;
+        private _newPosition;
+        private _previousAlpha;
+        private _previousBeta;
+        private _previousRadius;
+        private _collisionTriggered;
+        angularSensibility: number;
+        constructor(name: string, alpha: number, beta: number, radius: number, target: any, scene: Scene);
+        _getTargetPosition(): Vector3;
+        _initCache(): void;
+        _updateCache(ignoreParentClass?: boolean): void;
+        _isSynchronizedViewMatrix(): boolean;
+        attachControl(element: HTMLElement, noPreventDefault?: boolean, useCtrlForPanning?: boolean): void;
+        detachControl(element: HTMLElement): void;
+        _checkInputs(): void;
+        private _checkLimits();
+        setPosition(position: Vector3): void;
+        setTarget(target: Vector3): void;
+        _getViewMatrix(): Matrix;
+        private _onCollisionPositionChange;
+        zoomOn(meshes?: AbstractMesh[], doNotUpdateMaxZ?: boolean): void;
+        focusOn(meshesOrMinMaxVectorAndDistance: any, doNotUpdateMaxZ?: boolean): void;
+        /**
+         * @override
+         * Override Camera.createRigCamera
+         */
+        createRigCamera(name: string, cameraIndex: number): Camera;
+        /**
+         * @override
+         * Override Camera._updateRigCameras
+         */
+        _updateRigCameras(): void;
+        serialize(): any;
+    }
+}
+
+declare namespace BABYLON {
+    class VRCameraMetrics {
+        hResolution: number;
+        vResolution: number;
+        hScreenSize: number;
+        vScreenSize: number;
+        vScreenCenter: number;
+        eyeToScreenDistance: number;
+        lensSeparationDistance: number;
+        interpupillaryDistance: number;
+        distortionK: number[];
+        chromaAbCorrection: number[];
+        postProcessScaleFactor: number;
+        lensCenterOffset: number;
+        compensateDistortion: boolean;
+        aspectRatio: number;
+        aspectRatioFov: number;
+        leftHMatrix: Matrix;
+        rightHMatrix: Matrix;
+        leftPreViewMatrix: Matrix;
+        rightPreViewMatrix: Matrix;
+        static GetDefault(): VRCameraMetrics;
+    }
+    class Camera extends Node {
+        position: Vector3;
+        private static _PERSPECTIVE_CAMERA;
+        private static _ORTHOGRAPHIC_CAMERA;
+        private static _FOVMODE_VERTICAL_FIXED;
+        private static _FOVMODE_HORIZONTAL_FIXED;
+        private static _RIG_MODE_NONE;
+        private static _RIG_MODE_STEREOSCOPIC_ANAGLYPH;
+        private static _RIG_MODE_STEREOSCOPIC_SIDEBYSIDE_PARALLEL;
+        private static _RIG_MODE_STEREOSCOPIC_SIDEBYSIDE_CROSSEYED;
+        private static _RIG_MODE_STEREOSCOPIC_OVERUNDER;
+        private static _RIG_MODE_VR;
+        static PERSPECTIVE_CAMERA: number;
+        static ORTHOGRAPHIC_CAMERA: number;
+        static FOVMODE_VERTICAL_FIXED: number;
+        static FOVMODE_HORIZONTAL_FIXED: number;
+        static RIG_MODE_NONE: number;
+        static RIG_MODE_STEREOSCOPIC_ANAGLYPH: number;
+        static RIG_MODE_STEREOSCOPIC_SIDEBYSIDE_PARALLEL: number;
+        static RIG_MODE_STEREOSCOPIC_SIDEBYSIDE_CROSSEYED: number;
+        static RIG_MODE_STEREOSCOPIC_OVERUNDER: number;
+        static RIG_MODE_VR: number;
+        upVector: Vector3;
+        orthoLeft: any;
+        orthoRight: any;
+        orthoBottom: any;
+        orthoTop: any;
+        fov: number;
+        minZ: number;
+        maxZ: number;
+        inertia: number;
+        mode: number;
+        isIntermediate: boolean;
+        viewport: Viewport;
+        layerMask: number;
+        fovMode: number;
+        cameraRigMode: number;
+        _cameraRigParams: any;
+        _rigCameras: Camera[];
+        private _computedViewMatrix;
+        _projectionMatrix: Matrix;
+        private _worldMatrix;
+        _postProcesses: PostProcess[];
+        _postProcessesTakenIndices: any[];
+        _activeMeshes: SmartArray<Mesh>;
+        private _globalPosition;
+        constructor(name: string, position: Vector3, scene: Scene);
+        globalPosition: Vector3;
+        getActiveMeshes(): SmartArray<Mesh>;
+        isActiveMesh(mesh: Mesh): boolean;
+        _initCache(): void;
+        _updateCache(ignoreParentClass?: boolean): void;
+        _updateFromScene(): void;
+        _isSynchronized(): boolean;
+        _isSynchronizedViewMatrix(): boolean;
+        _isSynchronizedProjectionMatrix(): boolean;
+        attachControl(element: HTMLElement): void;
+        detachControl(element: HTMLElement): void;
+        _update(): void;
+        _checkInputs(): void;
+        attachPostProcess(postProcess: PostProcess, insertAt?: number): number;
+        detachPostProcess(postProcess: PostProcess, atIndices?: any): number[];
+        getWorldMatrix(): Matrix;
+        _getViewMatrix(): Matrix;
+        getViewMatrix(force?: boolean): Matrix;
+        _computeViewMatrix(force?: boolean): Matrix;
+        getProjectionMatrix(force?: boolean): Matrix;
+        dispose(): void;
+        setCameraRigMode(mode: number, rigParams: any): void;
+        private _getVRProjectionMatrix();
+        setCameraRigParameter(name: string, value: any): void;
+        /**
+         * May needs to be overridden by children so sub has required properties to be copied
+         */
+        createRigCamera(name: string, cameraIndex: number): Camera;
+        /**
+         * May needs to be overridden by children
+         */
+        _updateRigCameras(): void;
+        serialize(): any;
+        static Parse(parsedCamera: any, scene: Scene): Camera;
+    }
+}
+
+declare namespace BABYLON {
+    class DeviceOrientationCamera extends FreeCamera {
+        private _offsetX;
+        private _offsetY;
+        private _orientationGamma;
+        private _orientationBeta;
+        private _initialOrientationGamma;
+        private _initialOrientationBeta;
+        private _attachedCanvas;
+        private _orientationChanged;
+        angularSensibility: number;
+        moveSensibility: number;
+        constructor(name: string, position: Vector3, scene: Scene);
+        attachControl(canvas: HTMLCanvasElement, noPreventDefault: boolean): void;
+        detachControl(canvas: HTMLCanvasElement): void;
+        _checkInputs(): void;
+    }
+}
+
+declare namespace BABYLON {
+    class FollowCamera extends TargetCamera {
+        radius: number;
+        rotationOffset: number;
+        heightOffset: number;
+        cameraAcceleration: number;
+        maxCameraSpeed: number;
+        target: AbstractMesh;
+        constructor(name: string, position: Vector3, scene: Scene);
+        private getRadians(degrees);
+        private follow(cameraTarget);
+        _checkInputs(): void;
+        serialize(): any;
+    }
+    class ArcFollowCamera extends TargetCamera {
+        alpha: number;
+        beta: number;
+        radius: number;
+        target: AbstractMesh;
+        private _cartesianCoordinates;
+        constructor(name: string, alpha: number, beta: number, radius: number, target: AbstractMesh, scene: Scene);
+        private follow();
+        _checkInputs(): void;
+        serialize(): any;
+    }
+}
+
+declare namespace BABYLON {
+    class FreeCamera extends TargetCamera {
+        ellipsoid: Vector3;
+        keysUp: number[];
+        keysDown: number[];
+        keysLeft: number[];
+        keysRight: number[];
+        checkCollisions: boolean;
+        applyGravity: boolean;
+        angularSensibility: number;
+        onCollide: (collidedMesh: AbstractMesh) => void;
+        private _keys;
+        private _collider;
+        private _needMoveForGravity;
+        private _oldPosition;
+        private _diffPosition;
+        private _newPosition;
+        private _attachedElement;
+        private _localDirection;
+        private _transformedDirection;
+        private _onMouseDown;
+        private _onMouseUp;
+        private _onMouseOut;
+        private _onMouseMove;
+        private _onKeyDown;
+        private _onKeyUp;
+        _waitingLockedTargetId: string;
+        constructor(name: string, position: Vector3, scene: Scene);
+        _onLostFocus(e: FocusEvent): void;
+        attachControl(element: HTMLElement, noPreventDefault?: boolean): void;
+        detachControl(element: HTMLElement): void;
+        _collideWithWorld(velocity: Vector3): void;
+        private _onCollisionPositionChange;
+        _checkInputs(): void;
+        _decideIfNeedsToMove(): boolean;
+        _updatePosition(): void;
+        serialize(): any;
+    }
+}
+
+declare namespace BABYLON {
+    class GamepadCamera extends UniversalCamera {
+        constructor(name: string, position: Vector3, scene: Scene);
+    }
+}
+
+declare namespace BABYLON {
+    class AnaglyphFreeCamera extends FreeCamera {
+        interaxialDistance: number;
+        constructor(name: string, position: Vector3, interaxialDistance: number, scene: Scene);
+    }
+    class AnaglyphArcRotateCamera extends ArcRotateCamera {
+        constructor(name: string, alpha: number, beta: number, radius: number, target: any, interaxialDistance: number, scene: Scene);
+    }
+    class AnaglyphGamepadCamera extends GamepadCamera {
+        constructor(name: string, position: Vector3, interaxialDistance: number, scene: Scene);
+    }
+    class StereoscopicFreeCamera extends FreeCamera {
+        constructor(name: string, position: Vector3, interaxialDistance: number, isSideBySide: boolean, scene: Scene);
+    }
+    class StereoscopicArcRotateCamera extends ArcRotateCamera {
+        constructor(name: string, alpha: number, beta: number, radius: number, target: any, interaxialDistance: number, isSideBySide: boolean, scene: Scene);
+    }
+    class StereoscopicGamepadCamera extends GamepadCamera {
+        constructor(name: string, position: Vector3, interaxialDistance: number, isSideBySide: boolean, scene: Scene);
+    }
+}
+
+declare namespace BABYLON {
+    class TargetCamera extends Camera {
+        cameraDirection: Vector3;
+        cameraRotation: Vector2;
+        rotation: Vector3;
+        speed: number;
+        noRotationConstraint: boolean;
+        lockedTarget: any;
+        _currentTarget: Vector3;
+        _viewMatrix: Matrix;
+        _camMatrix: Matrix;
+        _cameraTransformMatrix: Matrix;
+        _cameraRotationMatrix: Matrix;
+        private _rigCamTransformMatrix;
+        _referencePoint: Vector3;
+        _transformedReferencePoint: Vector3;
+        _lookAtTemp: Matrix;
+        _tempMatrix: Matrix;
+        _reset: () => void;
+        _waitingLockedTargetId: string;
+        constructor(name: string, position: Vector3, scene: Scene);
+        getFrontPosition(distance: number): Vector3;
+        _getLockedTargetPosition(): Vector3;
+        _initCache(): void;
+        _updateCache(ignoreParentClass?: boolean): void;
+        _isSynchronizedViewMatrix(): boolean;
+        _computeLocalCameraSpeed(): number;
+        setTarget(target: Vector3): void;
+        getTarget(): Vector3;
+        _decideIfNeedsToMove(): boolean;
+        _updatePosition(): void;
+        _checkInputs(): void;
+        _getViewMatrix(): Matrix;
+        _getVRViewMatrix(): Matrix;
+        /**
+         * @override
+         * Override Camera.createRigCamera
+         */
+        createRigCamera(name: string, cameraIndex: number): Camera;
+        /**
+         * @override
+         * Override Camera._updateRigCameras
+         */
+        _updateRigCameras(): void;
+        private _getRigCamPosition(halfSpace, result);
+        serialize(): any;
+    }
+}
+
+declare namespace BABYLON {
+    class TouchCamera extends FreeCamera {
+        private _offsetX;
+        private _offsetY;
+        private _pointerCount;
+        private _pointerPressed;
+        private _attachedCanvas;
+        private _onPointerDown;
+        private _onPointerUp;
+        private _onPointerMove;
+        touchAngularSensibility: number;
+        touchMoveSensibility: number;
+        constructor(name: string, position: Vector3, scene: Scene);
+        _onLostFocus(e: FocusEvent): void;
+        attachControl(canvas: HTMLCanvasElement, noPreventDefault: boolean): void;
+        detachControl(canvas: HTMLCanvasElement): void;
+        _checkInputs(): void;
+    }
+}
+
+declare namespace BABYLON {
+    class UniversalCamera extends TouchCamera {
+        gamepad: Gamepad;
+        private _gamepads;
+        gamepadAngularSensibility: number;
+        gamepadMoveSensibility: number;
+        constructor(name: string, position: Vector3, scene: Scene);
+        private _onNewGameConnected(gamepad);
+        attachControl(canvas: HTMLCanvasElement, noPreventDefault: boolean): void;
+        detachControl(canvas: HTMLCanvasElement): void;
+        _checkInputs(): void;
+        dispose(): void;
+    }
+}
+
+declare namespace BABYLON {
+    class VirtualJoysticksCamera extends FreeCamera {
+        private _leftjoystick;
+        private _rightjoystick;
+        constructor(name: string, position: Vector3, scene: Scene);
+        getLeftJoystick(): VirtualJoystick;
+        getRightJoystick(): VirtualJoystick;
+        _checkInputs(): void;
+        dispose(): void;
+    }
+}
+
+declare namespace BABYLON {
+    class Collider {
+        radius: Vector3;
+        retry: number;
+        velocity: Vector3;
+        basePoint: Vector3;
+        epsilon: number;
+        collisionFound: boolean;
+        velocityWorldLength: number;
+        basePointWorld: Vector3;
+        velocityWorld: Vector3;
+        normalizedVelocity: Vector3;
+        initialVelocity: Vector3;
+        initialPosition: Vector3;
+        nearestDistance: number;
+        intersectionPoint: Vector3;
+        collidedMesh: AbstractMesh;
+        private _collisionPoint;
+        private _planeIntersectionPoint;
+        private _tempVector;
+        private _tempVector2;
+        private _tempVector3;
+        private _tempVector4;
+        private _edge;
+        private _baseToVertex;
+        private _destinationPoint;
+        private _slidePlaneNormal;
+        private _displacementVector;
+        _initialize(source: Vector3, dir: Vector3, e: number): void;
+        _checkPointInTriangle(point: Vector3, pa: Vector3, pb: Vector3, pc: Vector3, n: Vector3): boolean;
+        _canDoCollision(sphereCenter: Vector3, sphereRadius: number, vecMin: Vector3, vecMax: Vector3): boolean;
+        _testTriangle(faceIndex: number, trianglePlaneArray: Array<Plane>, p1: Vector3, p2: Vector3, p3: Vector3, hasMaterial: boolean): void;
+        _collide(trianglePlaneArray: Array<Plane>, pts: Vector3[], indices: number[] | Int32Array, indexStart: number, indexEnd: number, decal: number, hasMaterial: boolean): void;
+        _getResponse(pos: Vector3, vel: Vector3): void;
+    }
+}
+
+declare namespace BABYLON {
+    var CollisionWorker: string;
+    interface ICollisionCoordinator {
+        getNewPosition(position: Vector3, velocity: Vector3, collider: Collider, maximumRetry: number, excludedMesh: AbstractMesh, onNewPosition: (collisionIndex: number, newPosition: Vector3, collidedMesh?: AbstractMesh) => void, collisionIndex: number): void;
+        init(scene: Scene): void;
+        destroy(): void;
+        onMeshAdded(mesh: AbstractMesh): any;
+        onMeshUpdated(mesh: AbstractMesh): any;
+        onMeshRemoved(mesh: AbstractMesh): any;
+        onGeometryAdded(geometry: Geometry): any;
+        onGeometryUpdated(geometry: Geometry): any;
+        onGeometryDeleted(geometry: Geometry): any;
+    }
+    interface SerializedMesh {
+        id: string;
+        name: string;
+        uniqueId: number;
+        geometryId: string;
+        sphereCenter: Array<number>;
+        sphereRadius: number;
+        boxMinimum: Array<number>;
+        boxMaximum: Array<number>;
+        worldMatrixFromCache: any;
+        subMeshes: Array<SerializedSubMesh>;
+        checkCollisions: boolean;
+    }
+    interface SerializedSubMesh {
+        position: number;
+        verticesStart: number;
+        verticesCount: number;
+        indexStart: number;
+        indexCount: number;
+        hasMaterial: boolean;
+        sphereCenter: Array<number>;
+        sphereRadius: number;
+        boxMinimum: Array<number>;
+        boxMaximum: Array<number>;
+    }
+    interface SerializedGeometry {
+        id: string;
+        positions: Float32Array;
+        indices: Int32Array;
+        normals: Float32Array;
+    }
+    interface BabylonMessage {
+        taskType: WorkerTaskType;
+        payload: InitPayload | CollidePayload | UpdatePayload;
+    }
+    interface SerializedColliderToWorker {
+        position: Array<number>;
+        velocity: Array<number>;
+        radius: Array<number>;
+    }
+    enum WorkerTaskType {
+        INIT = 0,
+        UPDATE = 1,
+        COLLIDE = 2,
+    }
+    interface WorkerReply {
+        error: WorkerReplyType;
+        taskType: WorkerTaskType;
+        payload?: any;
+    }
+    interface CollisionReplyPayload {
+        newPosition: Array<number>;
+        collisionId: number;
+        collidedMeshUniqueId: number;
+    }
+    interface InitPayload {
+    }
+    interface CollidePayload {
+        collisionId: number;
+        collider: SerializedColliderToWorker;
+        maximumRetry: number;
+        excludedMeshUniqueId?: number;
+    }
+    interface UpdatePayload {
+        updatedMeshes: {
+            [n: number]: SerializedMesh;
+        };
+        updatedGeometries: {
+            [s: string]: SerializedGeometry;
+        };
+        removedMeshes: Array<number>;
+        removedGeometries: Array<string>;
+    }
+    enum WorkerReplyType {
+        SUCCESS = 0,
+        UNKNOWN_ERROR = 1,
+    }
+    class CollisionCoordinatorWorker implements ICollisionCoordinator {
+        private _scene;
+        private _scaledPosition;
+        private _scaledVelocity;
+        private _collisionsCallbackArray;
+        private _init;
+        private _runningUpdated;
+        private _runningCollisionTask;
+        private _worker;
+        private _addUpdateMeshesList;
+        private _addUpdateGeometriesList;
+        private _toRemoveMeshesArray;
+        private _toRemoveGeometryArray;
+        constructor();
+        static SerializeMesh: (mesh: AbstractMesh) => SerializedMesh;
+        static SerializeGeometry: (geometry: Geometry) => SerializedGeometry;
+        getNewPosition(position: Vector3, velocity: Vector3, collider: Collider, maximumRetry: number, excludedMesh: AbstractMesh, onNewPosition: (collisionIndex: number, newPosition: Vector3, collidedMesh?: AbstractMesh) => void, collisionIndex: number): void;
+        init(scene: Scene): void;
+        destroy(): void;
+        onMeshAdded(mesh: AbstractMesh): void;
+        onMeshUpdated: (mesh: AbstractMesh) => void;
+        onMeshRemoved(mesh: AbstractMesh): void;
+        onGeometryAdded(geometry: Geometry): void;
+        onGeometryUpdated: (geometry: Geometry) => void;
+        onGeometryDeleted(geometry: Geometry): void;
+        private _afterRender;
+        private _onMessageFromWorker;
+    }
+    class CollisionCoordinatorLegacy implements ICollisionCoordinator {
+        private _scene;
+        private _scaledPosition;
+        private _scaledVelocity;
+        private _finalPosition;
+        getNewPosition(position: Vector3, velocity: Vector3, collider: Collider, maximumRetry: number, excludedMesh: AbstractMesh, onNewPosition: (collisionIndex: number, newPosition: Vector3, collidedMesh?: AbstractMesh) => void, collisionIndex: number): void;
+        init(scene: Scene): void;
+        destroy(): void;
+        onMeshAdded(mesh: AbstractMesh): void;
+        onMeshUpdated(mesh: AbstractMesh): void;
+        onMeshRemoved(mesh: AbstractMesh): void;
+        onGeometryAdded(geometry: Geometry): void;
+        onGeometryUpdated(geometry: Geometry): void;
+        onGeometryDeleted(geometry: Geometry): void;
+        private _collideWithWorld(position, velocity, collider, maximumRetry, finalPosition, excludedMesh?);
+    }
+}
+
+declare namespace BABYLON {
+    var WorkerIncluded: boolean;
+    class CollisionCache {
+        private _meshes;
+        private _geometries;
+        getMeshes(): {
+            [n: number]: SerializedMesh;
+        };
+        getGeometries(): {
+            [s: number]: SerializedGeometry;
+        };
+        getMesh(id: any): SerializedMesh;
+        addMesh(mesh: SerializedMesh): void;
+        removeMesh(uniqueId: number): void;
+        getGeometry(id: string): SerializedGeometry;
+        addGeometry(geometry: SerializedGeometry): void;
+        removeGeometry(id: string): void;
+    }
+    class CollideWorker {
+        collider: Collider;
+        private _collisionCache;
+        private finalPosition;
+        private collisionsScalingMatrix;
+        private collisionTranformationMatrix;
+        constructor(collider: Collider, _collisionCache: CollisionCache, finalPosition: Vector3);
+        collideWithWorld(position: Vector3, velocity: Vector3, maximumRetry: number, excludedMeshUniqueId?: number): void;
+        private checkCollision(mesh);
+        private processCollisionsForSubMeshes(transformMatrix, mesh);
+        private collideForSubMesh(subMesh, transformMatrix, meshGeometry);
+        private checkSubmeshCollision(subMesh);
+    }
+    interface ICollisionDetector {
+        onInit(payload: InitPayload): void;
+        onUpdate(payload: UpdatePayload): void;
+        onCollision(payload: CollidePayload): void;
+    }
+    class CollisionDetectorTransferable implements ICollisionDetector {
+        private _collisionCache;
+        onInit(payload: InitPayload): void;
+        onUpdate(payload: UpdatePayload): void;
+        onCollision(payload: CollidePayload): void;
+    }
+}
+
+declare namespace BABYLON {
+    class IntersectionInfo {
+        bu: number;
+        bv: number;
+        distance: number;
+        faceId: number;
+        subMeshId: number;
+        constructor(bu: number, bv: number, distance: number);
+    }
+    class PickingInfo {
+        hit: boolean;
+        distance: number;
+        pickedPoint: Vector3;
+        pickedMesh: AbstractMesh;
+        bu: number;
+        bv: number;
+        faceId: number;
+        subMeshId: number;
+        pickedSprite: Sprite;
+        getNormal(useWorldCoordinates?: boolean, useVerticesNormals?: boolean): Vector3;
+        getTextureCoordinates(): Vector2;
+    }
+}
+
+declare namespace BABYLON {
+    class DebugLayer {
+        private _scene;
+        private _camera;
+        private _transformationMatrix;
+        private _enabled;
+        private _labelsEnabled;
+        private _displayStatistics;
+        private _displayTree;
+        private _displayLogs;
+        private _globalDiv;
+        private _statsDiv;
+        private _statsSubsetDiv;
+        private _optionsDiv;
+        private _optionsSubsetDiv;
+        private _logDiv;
+        private _logSubsetDiv;
+        private _treeDiv;
+        private _treeSubsetDiv;
+        private _drawingCanvas;
+        private _drawingContext;
+        private _rootElement;
+        _syncPositions: () => void;
+        private _syncData;
+        private _syncUI;
+        private _onCanvasClick;
+        private _clickPosition;
+        private _ratio;
+        private _identityMatrix;
+        private _showUI;
+        private _needToRefreshMeshesTree;
+        shouldDisplayLabel: (node: Node) => boolean;
+        shouldDisplayAxis: (mesh: Mesh) => boolean;
+        axisRatio: number;
+        accentColor: string;
+        customStatsFunction: () => string;
+        constructor(scene: Scene);
+        private _refreshMeshesTreeContent();
+        private _renderSingleAxis(zero, unit, unitText, label, color);
+        private _renderAxis(projectedPosition, mesh, globalViewport);
+        private _renderLabel(text, projectedPosition, labelOffset, onClick, getFillStyle);
+        private _isClickInsideRect(x, y, width, height);
+        isVisible(): boolean;
+        hide(): void;
+        show(showUI?: boolean, camera?: Camera, rootElement?: HTMLElement): void;
+        private _clearLabels();
+        private _generateheader(root, text);
+        private _generateTexBox(root, title, color);
+        private _generateAdvancedCheckBox(root, leftTitle, rightTitle, initialState, task, tag?);
+        private _generateCheckBox(root, title, initialState, task, tag?);
+        private _generateButton(root, title, task, tag?);
+        private _generateRadio(root, title, name, initialState, task, tag?);
+        private _generateDOMelements();
+        private _displayStats();
+    }
+}
+
+declare namespace BABYLON {
+    class BoundingBox {
+        minimum: Vector3;
+        maximum: Vector3;
+        vectors: Vector3[];
+        center: Vector3;
+        extendSize: Vector3;
+        directions: Vector3[];
+        vectorsWorld: Vector3[];
+        minimumWorld: Vector3;
+        maximumWorld: Vector3;
+        private _worldMatrix;
+        constructor(minimum: Vector3, maximum: Vector3);
+        getWorldMatrix(): Matrix;
+        _update(world: Matrix): void;
+        isInFrustum(frustumPlanes: Plane[]): boolean;
+        isCompletelyInFrustum(frustumPlanes: Plane[]): boolean;
+        intersectsPoint(point: Vector3): boolean;
+        intersectsSphere(sphere: BoundingSphere): boolean;
+        intersectsMinMax(min: Vector3, max: Vector3): boolean;
+        static Intersects(box0: BoundingBox, box1: BoundingBox): boolean;
+        static IntersectsSphere(minPoint: Vector3, maxPoint: Vector3, sphereCenter: Vector3, sphereRadius: number): boolean;
+        static IsCompletelyInFrustum(boundingVectors: Vector3[], frustumPlanes: Plane[]): boolean;
+        static IsInFrustum(boundingVectors: Vector3[], frustumPlanes: Plane[]): boolean;
+    }
+}
+
+declare namespace BABYLON {
+    class BoundingInfo {
+        minimum: Vector3;
+        maximum: Vector3;
+        boundingBox: BoundingBox;
+        boundingSphere: BoundingSphere;
+        private _isLocked;
+        constructor(minimum: Vector3, maximum: Vector3);
+        isLocked: boolean;
+        update(world: Matrix): void;
+        isInFrustum(frustumPlanes: Plane[]): boolean;
+        isCompletelyInFrustum(frustumPlanes: Plane[]): boolean;
+        _checkCollision(collider: Collider): boolean;
+        intersectsPoint(point: Vector3): boolean;
+        intersects(boundingInfo: BoundingInfo, precise: boolean): boolean;
+    }
+}
+
+declare namespace BABYLON {
+    class BoundingSphere {
+        minimum: Vector3;
+        maximum: Vector3;
+        center: Vector3;
+        radius: number;
+        centerWorld: Vector3;
+        radiusWorld: number;
+        private _tempRadiusVector;
+        constructor(minimum: Vector3, maximum: Vector3);
+        _update(world: Matrix): void;
+        isInFrustum(frustumPlanes: Plane[]): boolean;
+        intersectsPoint(point: Vector3): boolean;
+        static Intersects(sphere0: BoundingSphere, sphere1: BoundingSphere): boolean;
+    }
+}
+
+declare namespace BABYLON {
+    class Layer {
+        name: string;
+        texture: Texture;
+        isBackground: boolean;
+        color: Color4;
+        scale: Vector2;
+        offset: Vector2;
+        onDispose: () => void;
+        alphaBlendingMode: number;
+        private _scene;
+        private _vertexDeclaration;
+        private _vertexStrideSize;
+        private _vertexBuffer;
+        private _indexBuffer;
+        private _effect;
+        constructor(name: string, imgUrl: string, scene: Scene, isBackground?: boolean, color?: Color4);
+        render(): void;
+        dispose(): void;
+    }
+}
+
+declare namespace BABYLON {
+    class LensFlare {
+        size: number;
+        position: number;
+        color: Color3;
+        texture: Texture;
+        private _system;
+        constructor(size: number, position: number, color: any, imgUrl: string, system: LensFlareSystem);
+        dispose: () => void;
+    }
+}
+
+declare namespace BABYLON {
+    class LensFlareSystem {
+        name: string;
+        lensFlares: LensFlare[];
+        borderLimit: number;
+        meshesSelectionPredicate: (mesh: Mesh) => boolean;
+        layerMask: number;
+        private _scene;
+        private _emitter;
+        private _vertexDeclaration;
+        private _vertexStrideSize;
+        private _vertexBuffer;
+        private _indexBuffer;
+        private _effect;
+        private _positionX;
+        private _positionY;
+        private _isEnabled;
+        constructor(name: string, emitter: any, scene: Scene);
+        isEnabled: boolean;
+        getScene(): Scene;
+        getEmitter(): any;
+        setEmitter(newEmitter: any): void;
+        getEmitterPosition(): Vector3;
+        computeEffectivePosition(globalViewport: Viewport): boolean;
+        _isVisible(): boolean;
+        render(): boolean;
+        dispose(): void;
+        static Parse(parsedLensFlareSystem: any, scene: Scene, rootUrl: string): LensFlareSystem;
+        serialize(): any;
+    }
+}
+
+declare namespace BABYLON {
+    class DirectionalLight extends Light implements IShadowLight {
+        direction: Vector3;
+        position: Vector3;
+        private _transformedDirection;
+        transformedPosition: Vector3;
+        private _worldMatrix;
+        shadowOrthoScale: number;
+        autoUpdateExtends: boolean;
+        private _orthoLeft;
+        private _orthoRight;
+        private _orthoTop;
+        private _orthoBottom;
+        constructor(name: string, direction: Vector3, scene: Scene);
+        getAbsolutePosition(): Vector3;
+        setDirectionToTarget(target: Vector3): Vector3;
+        setShadowProjectionMatrix(matrix: Matrix, viewMatrix: Matrix, renderList: Array<AbstractMesh>): void;
+        supportsVSM(): boolean;
+        needRefreshPerFrame(): boolean;
+        needCube(): boolean;
+        getShadowDirection(faceIndex?: number): Vector3;
+        computeTransformedPosition(): boolean;
+        transferToEffect(effect: Effect, directionUniformName: string): void;
+        _getWorldMatrix(): Matrix;
+        serialize(): any;
+    }
+}
+
+declare namespace BABYLON {
+    class HemisphericLight extends Light {
+        direction: Vector3;
+        groundColor: Color3;
+        private _worldMatrix;
+        constructor(name: string, direction: Vector3, scene: Scene);
+        setDirectionToTarget(target: Vector3): Vector3;
+        getShadowGenerator(): ShadowGenerator;
+        transferToEffect(effect: Effect, directionUniformName: string, groundColorUniformName: string): void;
+        _getWorldMatrix(): Matrix;
+        serialize(): any;
+    }
+}
+
+declare namespace BABYLON {
+    interface IShadowLight {
+        id: string;
+        position: Vector3;
+        transformedPosition: Vector3;
+        name: string;
+        computeTransformedPosition(): boolean;
+        getScene(): Scene;
+        setShadowProjectionMatrix(matrix: Matrix, viewMatrix: Matrix, renderList: Array<AbstractMesh>): void;
+        supportsVSM(): boolean;
+        needRefreshPerFrame(): boolean;
+        needCube(): boolean;
+        getShadowDirection(faceIndex?: number): Vector3;
+        _shadowGenerator: ShadowGenerator;
+    }
+    class Light extends Node {
+        diffuse: Color3;
+        specular: Color3;
+        intensity: number;
+        range: number;
+        includeOnlyWithLayerMask: number;
+        includedOnlyMeshes: AbstractMesh[];
+        excludedMeshes: AbstractMesh[];
+        excludeWithLayerMask: number;
+        _shadowGenerator: ShadowGenerator;
+        private _parentedWorldMatrix;
+        _excludedMeshesIds: string[];
+        _includedOnlyMeshesIds: string[];
+        constructor(name: string, scene: Scene);
+        getShadowGenerator(): ShadowGenerator;
+        getAbsolutePosition(): Vector3;
+        transferToEffect(effect: Effect, uniformName0?: string, uniformName1?: string): void;
+        _getWorldMatrix(): Matrix;
+        canAffectMesh(mesh: AbstractMesh): boolean;
+        getWorldMatrix(): Matrix;
+        dispose(): void;
+        serialize(): any;
+        static Parse(parsedLight: any, scene: Scene): Light;
+    }
+}
+
+declare namespace BABYLON {
+    class PointLight extends Light implements IShadowLight {
+        position: Vector3;
+        private _worldMatrix;
+        transformedPosition: Vector3;
+        constructor(name: string, position: Vector3, scene: Scene);
+        getAbsolutePosition(): Vector3;
+        computeTransformedPosition(): boolean;
+        transferToEffect(effect: Effect, positionUniformName: string): void;
+        needCube(): boolean;
+        supportsVSM(): boolean;
+        needRefreshPerFrame(): boolean;
+        getShadowDirection(faceIndex?: number): Vector3;
+        setShadowProjectionMatrix(matrix: Matrix, viewMatrix: Matrix, renderList: Array<AbstractMesh>): void;
+        _getWorldMatrix(): Matrix;
+        serialize(): any;
+    }
+}
+
+declare namespace BABYLON {
+    class SpotLight extends Light implements IShadowLight {
+        position: Vector3;
+        direction: Vector3;
+        angle: number;
+        exponent: number;
+        transformedPosition: Vector3;
+        private _transformedDirection;
+        private _worldMatrix;
+        constructor(name: string, position: Vector3, direction: Vector3, angle: number, exponent: number, scene: Scene);
+        getAbsolutePosition(): Vector3;
+        setShadowProjectionMatrix(matrix: Matrix, viewMatrix: Matrix, renderList: Array<AbstractMesh>): void;
+        needCube(): boolean;
+        supportsVSM(): boolean;
+        needRefreshPerFrame(): boolean;
+        getShadowDirection(faceIndex?: number): Vector3;
+        setDirectionToTarget(target: Vector3): Vector3;
+        computeTransformedPosition(): boolean;
+        transferToEffect(effect: Effect, positionUniformName: string, directionUniformName: string): void;
+        _getWorldMatrix(): Matrix;
+        serialize(): any;
+    }
+}
+
+declare namespace BABYLON {
+    interface ISceneLoaderPlugin {
+        extensions: string;
+        importMesh: (meshesNames: any, scene: Scene, data: any, rootUrl: string, meshes: AbstractMesh[], particleSystems: ParticleSystem[], skeletons: Skeleton[]) => boolean;
+        load: (scene: Scene, data: string, rootUrl: string) => boolean;
+    }
+    class SceneLoader {
+        private static _ForceFullSceneLoadingForIncremental;
+        private static _ShowLoadingScreen;
+        static ForceFullSceneLoadingForIncremental: boolean;
+        static ShowLoadingScreen: boolean;
+        private static _registeredPlugins;
+        private static _getPluginForFilename(sceneFilename);
+        static RegisterPlugin(plugin: ISceneLoaderPlugin): void;
+        static ImportMesh(meshesNames: any, rootUrl: string, sceneFilename: string, scene: Scene, onsuccess?: (meshes: AbstractMesh[], particleSystems: ParticleSystem[], skeletons: Skeleton[]) => void, progressCallBack?: () => void, onerror?: (scene: Scene, e: any) => void): void;
+        /**
+        * Load a scene
+        * @param rootUrl a string that defines the root url for scene and resources
+        * @param sceneFilename a string that defines the name of the scene file. can start with "data:" following by the stringified version of the scene
+        * @param engine is the instance of BABYLON.Engine to use to create the scene
+        */
+        static Load(rootUrl: string, sceneFilename: any, engine: Engine, onsuccess?: (scene: Scene) => void, progressCallBack?: any, onerror?: (scene: Scene) => void): void;
+        /**
+        * Append a scene
+        * @param rootUrl a string that defines the root url for scene and resources
+        * @param sceneFilename a string that defines the name of the scene file. can start with "data:" following by the stringified version of the scene
+        * @param scene is the instance of BABYLON.Scene to append to
+        */
+        static Append(rootUrl: string, sceneFilename: any, scene: Scene, onsuccess?: (scene: Scene) => void, progressCallBack?: any, onerror?: (scene: Scene) => void): void;
+    }
+}
+
+declare namespace BABYLON {
+    class SIMDVector3 {
+        static TransformCoordinatesToRefSIMD(vector: Vector3, transformation: Matrix, result: Vector3): void;
+        static TransformCoordinatesFromFloatsToRefSIMD(x: number, y: number, z: number, transformation: Matrix, result: Vector3): void;
+    }
+    class SIMDMatrix {
+        multiplyToArraySIMD(other: Matrix, result: Matrix, offset?: number): void;
+        invertToRefSIMD(other: Matrix): Matrix;
+        static LookAtLHToRefSIMD(eyeRef: Vector3, targetRef: Vector3, upRef: Vector3, result: Matrix): void;
+    }
+    class SIMDHelper {
+        private static _isEnabled;
+        static IsEnabled: boolean;
+        static DisableSIMD(): void;
+        static EnableSIMD(): void;
+    }
+}
+
+declare namespace BABYLON {
+    class Color3 {
+        r: number;
+        g: number;
+        b: number;
+        constructor(r?: number, g?: number, b?: number);
+        toString(): string;
+        toArray(array: number[], index?: number): Color3;
+        toColor4(alpha?: number): Color4;
+        asArray(): number[];
+        toLuminance(): number;
+        multiply(otherColor: Color3): Color3;
+        multiplyToRef(otherColor: Color3, result: Color3): Color3;
+        equals(otherColor: Color3): boolean;
+        equalsFloats(r: number, g: number, b: number): boolean;
+        scale(scale: number): Color3;
+        scaleToRef(scale: number, result: Color3): Color3;
+        add(otherColor: Color3): Color3;
+        addToRef(otherColor: Color3, result: Color3): Color3;
+        subtract(otherColor: Color3): Color3;
+        subtractToRef(otherColor: Color3, result: Color3): Color3;
+        clone(): Color3;
+        copyFrom(source: Color3): Color3;
+        copyFromFloats(r: number, g: number, b: number): Color3;
+        toHexString(): string;
+        toLinearSpace(): Color3;
+        toLinearSpaceToRef(convertedColor: Color3): Color3;
+        toGammaSpace(): Color3;
+        toGammaSpaceToRef(convertedColor: Color3): Color3;
+        static FromHexString(hex: string): Color3;
+        static FromArray(array: number[], offset?: number): Color3;
+        static FromInts(r: number, g: number, b: number): Color3;
+        static Lerp(start: Color3, end: Color3, amount: number): Color3;
+        static Red(): Color3;
+        static Green(): Color3;
+        static Blue(): Color3;
+        static Black(): Color3;
+        static White(): Color3;
+        static Purple(): Color3;
+        static Magenta(): Color3;
+        static Yellow(): Color3;
+        static Gray(): Color3;
+    }
+    class Color4 {
+        r: number;
+        g: number;
+        b: number;
+        a: number;
+        constructor(r: number, g: number, b: number, a: number);
+        addInPlace(right: any): Color4;
+        asArray(): number[];
+        toArray(array: number[], index?: number): Color4;
+        add(right: Color4): Color4;
+        subtract(right: Color4): Color4;
+        subtractToRef(right: Color4, result: Color4): Color4;
+        scale(scale: number): Color4;
+        scaleToRef(scale: number, result: Color4): Color4;
+        toString(): string;
+        clone(): Color4;
+        copyFrom(source: Color4): Color4;
+        toHexString(): string;
+        static FromHexString(hex: string): Color4;
+        static Lerp(left: Color4, right: Color4, amount: number): Color4;
+        static LerpToRef(left: Color4, right: Color4, amount: number, result: Color4): void;
+        static FromArray(array: number[], offset?: number): Color4;
+        static FromInts(r: number, g: number, b: number, a: number): Color4;
+        static CheckColors4(colors: number[], count: number): number[];
+    }
+    class Vector2 {
+        x: number;
+        y: number;
+        constructor(x: number, y: number);
+        toString(): string;
+        toArray(array: number[], index?: number): Vector2;
+        asArray(): number[];
+        copyFrom(source: Vector2): Vector2;
+        copyFromFloats(x: number, y: number): Vector2;
+        add(otherVector: Vector2): Vector2;
+        addVector3(otherVector: Vector3): Vector2;
+        subtract(otherVector: Vector2): Vector2;
+        subtractInPlace(otherVector: Vector2): Vector2;
+        multiplyInPlace(otherVector: Vector2): Vector2;
+        multiply(otherVector: Vector2): Vector2;
+        multiplyToRef(otherVector: Vector2, result: Vector2): Vector2;
+        multiplyByFloats(x: number, y: number): Vector2;
+        divide(otherVector: Vector2): Vector2;
+        divideToRef(otherVector: Vector2, result: Vector2): Vector2;
+        negate(): Vector2;
+        scaleInPlace(scale: number): Vector2;
+        scale(scale: number): Vector2;
+        equals(otherVector: Vector2): boolean;
+        equalsWithEpsilon(otherVector: Vector2, epsilon?: number): boolean;
+        length(): number;
+        lengthSquared(): number;
+        normalize(): Vector2;
+        clone(): Vector2;
+        static Zero(): Vector2;
+        static FromArray(array: number[] | Float32Array, offset?: number): Vector2;
+        static FromArrayToRef(array: number[] | Float32Array, offset: number, result: Vector2): void;
+        static CatmullRom(value1: Vector2, value2: Vector2, value3: Vector2, value4: Vector2, amount: number): Vector2;
+        static Clamp(value: Vector2, min: Vector2, max: Vector2): Vector2;
+        static Hermite(value1: Vector2, tangent1: Vector2, value2: Vector2, tangent2: Vector2, amount: number): Vector2;
+        static Lerp(start: Vector2, end: Vector2, amount: number): Vector2;
+        static Dot(left: Vector2, right: Vector2): number;
+        static Normalize(vector: Vector2): Vector2;
+        static Minimize(left: Vector2, right: Vector2): Vector2;
+        static Maximize(left: Vector2, right: Vector2): Vector2;
+        static Transform(vector: Vector2, transformation: Matrix): Vector2;
+        static Distance(value1: Vector2, value2: Vector2): number;
+        static DistanceSquared(value1: Vector2, value2: Vector2): number;
+    }
+    class Vector3 {
+        x: number;
+        y: number;
+        z: number;
+        constructor(x: number, y: number, z: number);
+        toString(): string;
+        asArray(): number[];
+        toArray(array: number[] | Float32Array, index?: number): Vector3;
+        toQuaternion(): Quaternion;
+        addInPlace(otherVector: Vector3): Vector3;
+        add(otherVector: Vector3): Vector3;
+        addToRef(otherVector: Vector3, result: Vector3): Vector3;
+        subtractInPlace(otherVector: Vector3): Vector3;
+        subtract(otherVector: Vector3): Vector3;
+        subtractToRef(otherVector: Vector3, result: Vector3): Vector3;
+        subtractFromFloats(x: number, y: number, z: number): Vector3;
+        subtractFromFloatsToRef(x: number, y: number, z: number, result: Vector3): Vector3;
+        negate(): Vector3;
+        scaleInPlace(scale: number): Vector3;
+        scale(scale: number): Vector3;
+        scaleToRef(scale: number, result: Vector3): void;
+        equals(otherVector: Vector3): boolean;
+        equalsWithEpsilon(otherVector: Vector3, epsilon?: number): boolean;
+        equalsToFloats(x: number, y: number, z: number): boolean;
+        multiplyInPlace(otherVector: Vector3): Vector3;
+        multiply(otherVector: Vector3): Vector3;
+        multiplyToRef(otherVector: Vector3, result: Vector3): Vector3;
+        multiplyByFloats(x: number, y: number, z: number): Vector3;
+        divide(otherVector: Vector3): Vector3;
+        divideToRef(otherVector: Vector3, result: Vector3): Vector3;
+        MinimizeInPlace(other: Vector3): Vector3;
+        MaximizeInPlace(other: Vector3): Vector3;
+        length(): number;
+        lengthSquared(): number;
+        normalize(): Vector3;
+        clone(): Vector3;
+        copyFrom(source: Vector3): Vector3;
+        copyFromFloats(x: number, y: number, z: number): Vector3;
+        static GetClipFactor(vector0: Vector3, vector1: Vector3, axis: Vector3, size: any): number;
+        static FromArray(array: number[] | Float32Array, offset?: number): Vector3;
+        static FromFloatArray(array: Float32Array, offset?: number): Vector3;
+        static FromArrayToRef(array: number[] | Float32Array, offset: number, result: Vector3): void;
+        static FromFloatArrayToRef(array: Float32Array, offset: number, result: Vector3): void;
+        static FromFloatsToRef(x: number, y: number, z: number, result: Vector3): void;
+        static Zero(): Vector3;
+        static Up(): Vector3;
+        static TransformCoordinates(vector: Vector3, transformation: Matrix): Vector3;
+        static TransformCoordinatesToRef(vector: Vector3, transformation: Matrix, result: Vector3): void;
+        static TransformCoordinatesFromFloatsToRef(x: number, y: number, z: number, transformation: Matrix, result: Vector3): void;
+        static TransformNormal(vector: Vector3, transformation: Matrix): Vector3;
+        static TransformNormalToRef(vector: Vector3, transformation: Matrix, result: Vector3): void;
+        static TransformNormalFromFloatsToRef(x: number, y: number, z: number, transformation: Matrix, result: Vector3): void;
+        static CatmullRom(value1: Vector3, value2: Vector3, value3: Vector3, value4: Vector3, amount: number): Vector3;
+        static Clamp(value: Vector3, min: Vector3, max: Vector3): Vector3;
+        static Hermite(value1: Vector3, tangent1: Vector3, value2: Vector3, tangent2: Vector3, amount: number): Vector3;
+        static Lerp(start: Vector3, end: Vector3, amount: number): Vector3;
+        static Dot(left: Vector3, right: Vector3): number;
+        static Cross(left: Vector3, right: Vector3): Vector3;
+        static CrossToRef(left: Vector3, right: Vector3, result: Vector3): void;
+        static Normalize(vector: Vector3): Vector3;
+        static NormalizeToRef(vector: Vector3, result: Vector3): void;
+        static Project(vector: Vector3, world: Matrix, transform: Matrix, viewport: Viewport): Vector3;
+        static UnprojectFromTransform(source: Vector3, viewportWidth: number, viewportHeight: number, world: Matrix, transform: Matrix): Vector3;
+        static Unproject(source: Vector3, viewportWidth: number, viewportHeight: number, world: Matrix, view: Matrix, projection: Matrix): Vector3;
+        static Minimize(left: Vector3, right: Vector3): Vector3;
+        static Maximize(left: Vector3, right: Vector3): Vector3;
+        static Distance(value1: Vector3, value2: Vector3): number;
+        static DistanceSquared(value1: Vector3, value2: Vector3): number;
+        static Center(value1: Vector3, value2: Vector3): Vector3;
+        /**
+         * Given three orthogonal normalized left-handed oriented Vector3 axis in space (target system),
+         * RotationFromAxis() returns the rotation Euler angles (ex : rotation.x, rotation.y, rotation.z) to apply
+         * to something in order to rotate it from its local system to the given target system.
+         */
+        static RotationFromAxis(axis1: Vector3, axis2: Vector3, axis3: Vector3): Vector3;
+        /**
+         * The same than RotationFromAxis but updates the passed ref Vector3 parameter.
+         */
+        static RotationFromAxisToRef(axis1: Vector3, axis2: Vector3, axis3: Vector3, ref: Vector3): void;
+    }
+    class Vector4 {
+        x: number;
+        y: number;
+        z: number;
+        w: number;
+        constructor(x: number, y: number, z: number, w: number);
+        toString(): string;
+        asArray(): number[];
+        toArray(array: number[], index?: number): Vector4;
+        addInPlace(otherVector: Vector4): Vector4;
+        add(otherVector: Vector4): Vector4;
+        addToRef(otherVector: Vector4, result: Vector4): Vector4;
+        subtractInPlace(otherVector: Vector4): Vector4;
+        subtract(otherVector: Vector4): Vector4;
+        subtractToRef(otherVector: Vector4, result: Vector4): Vector4;
+        subtractFromFloats(x: number, y: number, z: number, w: number): Vector4;
+        subtractFromFloatsToRef(x: number, y: number, z: number, w: number, result: Vector4): Vector4;
+        negate(): Vector4;
+        scaleInPlace(scale: number): Vector4;
+        scale(scale: number): Vector4;
+        scaleToRef(scale: number, result: Vector4): void;
+        equals(otherVector: Vector4): boolean;
+        equalsWithEpsilon(otherVector: Vector4, epsilon?: number): boolean;
+        equalsToFloats(x: number, y: number, z: number, w: number): boolean;
+        multiplyInPlace(otherVector: Vector4): Vector4;
+        multiply(otherVector: Vector4): Vector4;
+        multiplyToRef(otherVector: Vector4, result: Vector4): Vector4;
+        multiplyByFloats(x: number, y: number, z: number, w: number): Vector4;
+        divide(otherVector: Vector4): Vector4;
+        divideToRef(otherVector: Vector4, result: Vector4): Vector4;
+        MinimizeInPlace(other: Vector4): Vector4;
+        MaximizeInPlace(other: Vector4): Vector4;
+        length(): number;
+        lengthSquared(): number;
+        normalize(): Vector4;
+        clone(): Vector4;
+        copyFrom(source: Vector4): Vector4;
+        copyFromFloats(x: number, y: number, z: number, w: number): Vector4;
+        static FromArray(array: number[], offset?: number): Vector4;
+        static FromArrayToRef(array: number[], offset: number, result: Vector4): void;
+        static FromFloatArrayToRef(array: Float32Array, offset: number, result: Vector4): void;
+        static FromFloatsToRef(x: number, y: number, z: number, w: number, result: Vector4): void;
+        static Zero(): Vector4;
+        static Normalize(vector: Vector4): Vector4;
+        static NormalizeToRef(vector: Vector4, result: Vector4): void;
+        static Minimize(left: Vector4, right: Vector4): Vector4;
+        static Maximize(left: Vector4, right: Vector4): Vector4;
+        static Distance(value1: Vector4, value2: Vector4): number;
+        static DistanceSquared(value1: Vector4, value2: Vector4): number;
+        static Center(value1: Vector4, value2: Vector4): Vector4;
+    }
+    class Quaternion {
+        x: number;
+        y: number;
+        z: number;
+        w: number;
+        constructor(x?: number, y?: number, z?: number, w?: number);
+        toString(): string;
+        asArray(): number[];
+        equals(otherQuaternion: Quaternion): boolean;
+        clone(): Quaternion;
+        copyFrom(other: Quaternion): Quaternion;
+        copyFromFloats(x: number, y: number, z: number, w: number): Quaternion;
+        add(other: Quaternion): Quaternion;
+        subtract(other: Quaternion): Quaternion;
+        scale(value: number): Quaternion;
+        multiply(q1: Quaternion): Quaternion;
+        multiplyToRef(q1: Quaternion, result: Quaternion): Quaternion;
+        multiplyInPlace(q1: Quaternion): Quaternion;
+        length(): number;
+        normalize(): Quaternion;
+        toEulerAngles(order?: string): Vector3;
+        toEulerAnglesToRef(result: Vector3, order?: string): Quaternion;
+        toRotationMatrix(result: Matrix): Quaternion;
+        fromRotationMatrix(matrix: Matrix): Quaternion;
+        static FromRotationMatrix(matrix: Matrix): Quaternion;
+        static FromRotationMatrixToRef(matrix: Matrix, result: Quaternion): void;
+        static Inverse(q: Quaternion): Quaternion;
+        static Identity(): Quaternion;
+        static RotationAxis(axis: Vector3, angle: number): Quaternion;
+        static FromArray(array: number[], offset?: number): Quaternion;
+        static RotationYawPitchRoll(yaw: number, pitch: number, roll: number): Quaternion;
+        static RotationYawPitchRollToRef(yaw: number, pitch: number, roll: number, result: Quaternion): void;
+        static RotationAlphaBetaGamma(alpha: number, beta: number, gamma: number): Quaternion;
+        static RotationAlphaBetaGammaToRef(alpha: number, beta: number, gamma: number, result: Quaternion): void;
+        static Slerp(left: Quaternion, right: Quaternion, amount: number): Quaternion;
+    }
+    class Matrix {
+        private static _tempQuaternion;
+        private static _xAxis;
+        private static _yAxis;
+        private static _zAxis;
+        m: Float32Array;
+        isIdentity(): boolean;
+        determinant(): number;
+        toArray(): Float32Array;
+        asArray(): Float32Array;
+        invert(): Matrix;
+        reset(): Matrix;
+        add(other: Matrix): Matrix;
+        addToRef(other: Matrix, result: Matrix): Matrix;
+        addToSelf(other: Matrix): Matrix;
+        invertToRef(other: Matrix): Matrix;
+        setTranslation(vector3: Vector3): Matrix;
+        multiply(other: Matrix): Matrix;
+        copyFrom(other: Matrix): Matrix;
+        copyToArray(array: Float32Array, offset?: number): Matrix;
+        multiplyToRef(other: Matrix, result: Matrix): Matrix;
+        multiplyToArray(other: Matrix, result: Float32Array, offset: number): Matrix;
+        equals(value: Matrix): boolean;
+        clone(): Matrix;
+        decompose(scale: Vector3, rotation: Quaternion, translation: Vector3): boolean;
+        static FromArray(array: number[], offset?: number): Matrix;
+        static FromArrayToRef(array: number[], offset: number, result: Matrix): void;
+        static FromFloat32ArrayToRefScaled(array: Float32Array, offset: number, scale: number, result: Matrix): void;
+        static FromValuesToRef(initialM11: number, initialM12: number, initialM13: number, initialM14: number, initialM21: number, initialM22: number, initialM23: number, initialM24: number, initialM31: number, initialM32: number, initialM33: number, initialM34: number, initialM41: number, initialM42: number, initialM43: number, initialM44: number, result: Matrix): void;
+        static FromValues(initialM11: number, initialM12: number, initialM13: number, initialM14: number, initialM21: number, initialM22: number, initialM23: number, initialM24: number, initialM31: number, initialM32: number, initialM33: number, initialM34: number, initialM41: number, initialM42: number, initialM43: number, initialM44: number): Matrix;
+        static Compose(scale: Vector3, rotation: Quaternion, translation: Vector3): Matrix;
+        static Identity(): Matrix;
+        static IdentityToRef(result: Matrix): void;
+        static Zero(): Matrix;
+        static RotationX(angle: number): Matrix;
+        static Invert(source: Matrix): Matrix;
+        static RotationXToRef(angle: number, result: Matrix): void;
+        static RotationY(angle: number): Matrix;
+        static RotationYToRef(angle: number, result: Matrix): void;
+        static RotationZ(angle: number): Matrix;
+        static RotationZToRef(angle: number, result: Matrix): void;
+        static RotationAxis(axis: Vector3, angle: number): Matrix;
+        static RotationAxisToRef(axis: Vector3, angle: number, result: Matrix): void;
+        static RotationYawPitchRoll(yaw: number, pitch: number, roll: number): Matrix;
+        static RotationYawPitchRollToRef(yaw: number, pitch: number, roll: number, result: Matrix): void;
+        static Scaling(x: number, y: number, z: number): Matrix;
+        static ScalingToRef(x: number, y: number, z: number, result: Matrix): void;
+        static Translation(x: number, y: number, z: number): Matrix;
+        static TranslationToRef(x: number, y: number, z: number, result: Matrix): void;
+        static Lerp(startValue: Matrix, endValue: Matrix, gradient: number): Matrix;
+        static LookAtLH(eye: Vector3, target: Vector3, up: Vector3): Matrix;
+        static LookAtLHToRef(eye: Vector3, target: Vector3, up: Vector3, result: Matrix): void;
+        static OrthoLH(width: number, height: number, znear: number, zfar: number): Matrix;
+        static OrthoLHToRef(width: number, height: number, znear: number, zfar: number, result: Matrix): void;
+        static OrthoOffCenterLH(left: number, right: number, bottom: number, top: number, znear: number, zfar: number): Matrix;
+        static OrthoOffCenterLHToRef(left: number, right: any, bottom: number, top: number, znear: number, zfar: number, result: Matrix): void;
+        static PerspectiveLH(width: number, height: number, znear: number, zfar: number): Matrix;
+        static PerspectiveFovLH(fov: number, aspect: number, znear: number, zfar: number): Matrix;
+        static PerspectiveFovLHToRef(fov: number, aspect: number, znear: number, zfar: number, result: Matrix, fovMode?: number): void;
+        static GetFinalMatrix(viewport: Viewport, world: Matrix, view: Matrix, projection: Matrix, zmin: number, zmax: number): Matrix;
+        static GetAsMatrix2x2(matrix: Matrix): Float32Array;
+        static GetAsMatrix3x3(matrix: Matrix): Float32Array;
+        static Transpose(matrix: Matrix): Matrix;
+        static Reflection(plane: Plane): Matrix;
+        static ReflectionToRef(plane: Plane, result: Matrix): void;
+    }
+    class Plane {
+        normal: Vector3;
+        d: number;
+        constructor(a: number, b: number, c: number, d: number);
+        asArray(): number[];
+        clone(): Plane;
+        normalize(): Plane;
+        transform(transformation: Matrix): Plane;
+        dotCoordinate(point: any): number;
+        copyFromPoints(point1: Vector3, point2: Vector3, point3: Vector3): Plane;
+        isFrontFacingTo(direction: Vector3, epsilon: number): boolean;
+        signedDistanceTo(point: Vector3): number;
+        static FromArray(array: number[]): Plane;
+        static FromPoints(point1: any, point2: any, point3: any): Plane;
+        static FromPositionAndNormal(origin: Vector3, normal: Vector3): Plane;
+        static SignedDistanceToPlaneFromPositionAndNormal(origin: Vector3, normal: Vector3, point: Vector3): number;
+    }
+    class Viewport {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+        constructor(x: number, y: number, width: number, height: number);
+        toGlobal(engine: Engine): Viewport;
+        toScreenGlobal(engine: Engine): Viewport;
+    }
+    class Frustum {
+        static GetPlanes(transform: Matrix): Plane[];
+        static GetPlanesToRef(transform: Matrix, frustumPlanes: Plane[]): void;
+    }
+    class Ray {
+        origin: Vector3;
+        direction: Vector3;
+        length: number;
+        private _edge1;
+        private _edge2;
+        private _pvec;
+        private _tvec;
+        private _qvec;
+        constructor(origin: Vector3, direction: Vector3, length?: number);
+        intersectsBoxMinMax(minimum: Vector3, maximum: Vector3): boolean;
+        intersectsBox(box: BoundingBox): boolean;
+        intersectsSphere(sphere: any): boolean;
+        intersectsTriangle(vertex0: Vector3, vertex1: Vector3, vertex2: Vector3): IntersectionInfo;
+        static CreateNew(x: number, y: number, viewportWidth: number, viewportHeight: number, world: Matrix, view: Matrix, projection: Matrix): Ray;
+        /**
+        * Function will create a new transformed ray starting from origin and ending at the end point. Ray's length will be set, and ray will be
+        * transformed to the given world matrix.
+        * @param origin The origin point
+        * @param end The end point
+        * @param world a matrix to transform the ray to. Default is the identity matrix.
+        */
+        static CreateNewFromTo(origin: Vector3, end: Vector3, world?: Matrix): Ray;
+        static Transform(ray: Ray, matrix: Matrix): Ray;
+    }
+    enum Space {
+        LOCAL = 0,
+        WORLD = 1,
+    }
+    class Axis {
+        static X: Vector3;
+        static Y: Vector3;
+        static Z: Vector3;
+    }
+    class BezierCurve {
+        static interpolate(t: number, x1: number, y1: number, x2: number, y2: number): number;
+    }
+    enum Orientation {
+        CW = 0,
+        CCW = 1,
+    }
+    class Angle {
+        private _radians;
+        constructor(radians: number);
+        degrees: () => number;
+        radians: () => number;
+        static BetweenTwoPoints(a: Vector2, b: Vector2): Angle;
+        static FromRadians(radians: number): Angle;
+        static FromDegrees(degrees: number): Angle;
+    }
+    class Arc2 {
+        startPoint: Vector2;
+        midPoint: Vector2;
+        endPoint: Vector2;
+        centerPoint: Vector2;
+        radius: number;
+        angle: Angle;
+        startAngle: Angle;
+        orientation: Orientation;
+        constructor(startPoint: Vector2, midPoint: Vector2, endPoint: Vector2);
+    }
+    class PathCursor {
+        private path;
+        private _onchange;
+        value: number;
+        animations: Animation[];
+        constructor(path: Path2);
+        getPoint(): Vector3;
+        moveAhead(step?: number): PathCursor;
+        moveBack(step?: number): PathCursor;
+        move(step: number): PathCursor;
+        private ensureLimits();
+        private markAsDirty(propertyName);
+        private raiseOnChange();
+        onchange(f: (cursor: PathCursor) => void): PathCursor;
+    }
+    class Path2 {
+        private _points;
+        private _length;
+        closed: boolean;
+        constructor(x: number, y: number);
+        addLineTo(x: number, y: number): Path2;
+        addArcTo(midX: number, midY: number, endX: number, endY: number, numberOfSegments?: number): Path2;
+        close(): Path2;
+        length(): number;
+        getPoints(): Vector2[];
+        getPointAtLengthPosition(normalizedLengthPosition: number): Vector2;
+        static StartingAt(x: number, y: number): Path2;
+    }
+    class Path3D {
+        path: Vector3[];
+        private _curve;
+        private _distances;
+        private _tangents;
+        private _normals;
+        private _binormals;
+        private _raw;
+        /**
+        * new Path3D(path, normal, raw)
+        * path : an array of Vector3, the curve axis of the Path3D
+        * normal (optional) : Vector3, the first wanted normal to the curve. Ex (0, 1, 0) for a vertical normal.
+        * raw (optional, default false) : boolean, if true the returned Path3D isn't normalized. Useful to depict path acceleration or speed.
+        */
+        constructor(path: Vector3[], firstNormal?: Vector3, raw?: boolean);
+        getCurve(): Vector3[];
+        getTangents(): Vector3[];
+        getNormals(): Vector3[];
+        getBinormals(): Vector3[];
+        getDistances(): number[];
+        update(path: Vector3[], firstNormal?: Vector3): Path3D;
+        private _compute(firstNormal);
+        private _getFirstNonNullVector(index);
+        private _getLastNonNullVector(index);
+        private _normalVector(v0, vt, va);
+    }
+    class Curve3 {
+        private _points;
+        private _length;
+        static CreateQuadraticBezier(v0: Vector3, v1: Vector3, v2: Vector3, nbPoints: number): Curve3;
+        static CreateCubicBezier(v0: Vector3, v1: Vector3, v2: Vector3, v3: Vector3, nbPoints: number): Curve3;
+        static CreateHermiteSpline(p1: Vector3, t1: Vector3, p2: Vector3, t2: Vector3, nbPoints: number): Curve3;
+        constructor(points: Vector3[]);
+        getPoints(): Vector3[];
+        length(): number;
+        continue(curve: Curve3): Curve3;
+        private _computeLength(path);
+    }
+    class PositionNormalVertex {
+        position: Vector3;
+        normal: Vector3;
+        constructor(position?: Vector3, normal?: Vector3);
+        clone(): PositionNormalVertex;
+    }
+    class PositionNormalTextureVertex {
+        position: Vector3;
+        normal: Vector3;
+        uv: Vector2;
+        constructor(position?: Vector3, normal?: Vector3, uv?: Vector2);
+        clone(): PositionNormalTextureVertex;
+    }
+    class Tmp {
+        static Vector2: Vector2[];
+        static Vector3: Vector3[];
+        static Vector4: Vector4[];
+        static Quaternion: Quaternion[];
+        static Matrix: Matrix[];
+    }
+}
+
+declare namespace BABYLON {
+    class EffectFallbacks {
+        private _defines;
+        private _currentRank;
+        private _maxRank;
+        private _mesh;
+        private _meshRank;
+        addFallback(rank: number, define: string): void;
+        addCPUSkinningFallback(rank: number, mesh: BABYLON.AbstractMesh): void;
+        isMoreFallbacks: boolean;
+        reduce(currentDefines: string): string;
+    }
+    class Effect {
+        name: any;
+        defines: string;
+        onCompiled: (effect: Effect) => void;
+        onError: (effect: Effect, errors: string) => void;
+        onBind: (effect: Effect) => void;
+        private _engine;
+        private _uniformsNames;
+        private _samplers;
+        private _isReady;
+        private _compilationError;
+        private _attributesNames;
+        private _attributes;
+        private _uniforms;
+        _key: string;
+        private _program;
+        private _valueCache;
+        constructor(baseName: any, attributesNames: string[], uniformsNames: string[], samplers: string[], engine: any, defines?: string, fallbacks?: EffectFallbacks, onCompiled?: (effect: Effect) => void, onError?: (effect: Effect, errors: string) => void);
+        isReady(): boolean;
+        getProgram(): WebGLProgram;
+        getAttributesNames(): string[];
+        getAttributeLocation(index: number): number;
+        getAttributeLocationByName(name: string): number;
+        getAttributesCount(): number;
+        getUniformIndex(uniformName: string): number;
+        getUniform(uniformName: string): WebGLUniformLocation;
+        getSamplers(): string[];
+        getCompilationError(): string;
+        _loadVertexShader(vertex: any, callback: (data: any) => void): void;
+        _loadFragmentShader(fragment: any, callback: (data: any) => void): void;
+        private _dumpShadersName();
+        private _prepareEffect(vertexSourceCode, fragmentSourceCode, attributesNames, defines, fallbacks?);
+        isSupported: boolean;
+        _bindTexture(channel: string, texture: WebGLTexture): void;
+        setTexture(channel: string, texture: BaseTexture): void;
+        setTextureFromPostProcess(channel: string, postProcess: PostProcess): void;
+        _cacheMatrix(uniformName: any, matrix: any): void;
+        _cacheFloat2(uniformName: string, x: number, y: number): void;
+        _cacheFloat3(uniformName: string, x: number, y: number, z: number): void;
+        _cacheFloat4(uniformName: string, x: number, y: number, z: number, w: number): void;
+        setArray(uniformName: string, array: number[]): Effect;
+        setArray2(uniformName: string, array: number[]): Effect;
+        setArray3(uniformName: string, array: number[]): Effect;
+        setArray4(uniformName: string, array: number[]): Effect;
+        setMatrices(uniformName: string, matrices: Float32Array): Effect;
+        setMatrix(uniformName: string, matrix: Matrix): Effect;
+        setMatrix3x3(uniformName: string, matrix: Float32Array): Effect;
+        setMatrix2x2(uniformname: string, matrix: Float32Array): Effect;
+        setFloat(uniformName: string, value: number): Effect;
+        setBool(uniformName: string, bool: boolean): Effect;
+        setVector2(uniformName: string, vector2: Vector2): Effect;
+        setFloat2(uniformName: string, x: number, y: number): Effect;
+        setVector3(uniformName: string, vector3: Vector3): Effect;
+        setFloat3(uniformName: string, x: number, y: number, z: number): Effect;
+        setVector4(uniformName: string, vector4: Vector4): Effect;
+        setFloat4(uniformName: string, x: number, y: number, z: number, w: number): Effect;
+        setColor3(uniformName: string, color3: Color3): Effect;
+        setColor4(uniformName: string, color3: Color3, alpha: number): Effect;
+        static ShadersStore: {};
+    }
+}
+
+declare namespace BABYLON {
+    class MaterialDefines {
+        _keys: string[];
+        isEqual(other: MaterialDefines): boolean;
+        cloneTo(other: MaterialDefines): void;
+        reset(): void;
+        toString(): string;
+    }
+    class Material {
+        name: string;
+        private static _TriangleFillMode;
+        private static _WireFrameFillMode;
+        private static _PointFillMode;
+        static TriangleFillMode: number;
+        static WireFrameFillMode: number;
+        static PointFillMode: number;
+        private static _ClockWiseSideOrientation;
+        private static _CounterClockWiseSideOrientation;
+        static ClockWiseSideOrientation: number;
+        static CounterClockWiseSideOrientation: number;
+        id: string;
+        checkReadyOnEveryCall: boolean;
+        checkReadyOnlyOnce: boolean;
+        state: string;
+        alpha: number;
+        backFaceCulling: boolean;
+        sideOrientation: number;
+        onCompiled: (effect: Effect) => void;
+        onError: (effect: Effect, errors: string) => void;
+        onDispose: () => void;
+        onBind: (material: Material, mesh: Mesh) => void;
+        getRenderTargetTextures: () => SmartArray<RenderTargetTexture>;
+        alphaMode: number;
+        disableDepthWrite: boolean;
+        fogEnabled: boolean;
+        _effect: Effect;
+        _wasPreviouslyReady: boolean;
+        private _scene;
+        private _fillMode;
+        private _cachedDepthWriteState;
+        pointSize: number;
+        zOffset: number;
+        wireframe: boolean;
+        pointsCloud: boolean;
+        fillMode: number;
+        constructor(name: string, scene: Scene, doNotAdd?: boolean);
+        isFrozen: boolean;
+        freeze(): void;
+        unfreeze(): void;
+        isReady(mesh?: AbstractMesh, useInstances?: boolean): boolean;
+        getEffect(): Effect;
+        getScene(): Scene;
+        needAlphaBlending(): boolean;
+        needAlphaTesting(): boolean;
+        getAlphaTestTexture(): BaseTexture;
+        trackCreation(onCompiled: (effect: Effect) => void, onError: (effect: Effect, errors: string) => void): void;
+        markDirty(): void;
+        _preBind(): void;
+        bind(world: Matrix, mesh?: Mesh): void;
+        bindOnlyWorldMatrix(world: Matrix): void;
+        unbind(): void;
+        clone(name: string): Material;
+        getBindedMeshes(): AbstractMesh[];
+        dispose(forceDisposeEffect?: boolean): void;
+        copyTo(other: Material): void;
+        serialize(): any;
+        static ParseMultiMaterial(parsedMultiMaterial: any, scene: Scene): MultiMaterial;
+        static Parse(parsedMaterial: any, scene: Scene, rootUrl: string): any;
+    }
+}
+
+declare namespace BABYLON {
+    class MultiMaterial extends Material {
+        subMaterials: Material[];
+        constructor(name: string, scene: Scene);
+        getSubMaterial(index: any): Material;
+        isReady(mesh?: AbstractMesh): boolean;
+        clone(name: string, cloneChildren?: boolean): MultiMaterial;
+        serialize(): any;
+    }
+}
+
+declare namespace BABYLON {
+    class ShaderMaterial extends Material {
+        private _shaderPath;
+        private _options;
+        private _textures;
+        private _floats;
+        private _floatsArrays;
+        private _colors3;
+        private _colors4;
+        private _vectors2;
+        private _vectors3;
+        private _vectors4;
+        private _matrices;
+        private _matrices3x3;
+        private _matrices2x2;
+        private _cachedWorldViewMatrix;
+        private _renderId;
+        constructor(name: string, scene: Scene, shaderPath: any, options: any);
+        needAlphaBlending(): boolean;
+        needAlphaTesting(): boolean;
+        private _checkUniform(uniformName);
+        setTexture(name: string, texture: Texture): ShaderMaterial;
+        setFloat(name: string, value: number): ShaderMaterial;
+        setFloats(name: string, value: number[]): ShaderMaterial;
+        setColor3(name: string, value: Color3): ShaderMaterial;
+        setColor4(name: string, value: Color4): ShaderMaterial;
+        setVector2(name: string, value: Vector2): ShaderMaterial;
+        setVector3(name: string, value: Vector3): ShaderMaterial;
+        setVector4(name: string, value: Vector4): ShaderMaterial;
+        setMatrix(name: string, value: Matrix): ShaderMaterial;
+        setMatrix3x3(name: string, value: Float32Array): ShaderMaterial;
+        setMatrix2x2(name: string, value: Float32Array): ShaderMaterial;
+        isReady(mesh?: AbstractMesh, useInstances?: boolean): boolean;
+        bindOnlyWorldMatrix(world: Matrix): void;
+        bind(world: Matrix, mesh?: Mesh): void;
+        clone(name: string): ShaderMaterial;
+        dispose(forceDisposeEffect?: boolean): void;
+        serialize(): any;
+        static Parse(source: any, scene: Scene, rootUrl: string): ShaderMaterial;
+    }
+}
+
+declare namespace BABYLON {
+    class FresnelParameters {
+        isEnabled: boolean;
+        leftColor: Color3;
+        rightColor: Color3;
+        bias: number;
+        power: number;
+        clone(): FresnelParameters;
+        serialize(): any;
+        static Parse(parsedFresnelParameters: any): FresnelParameters;
+    }
+    class StandardMaterial extends Material {
+        diffuseTexture: BaseTexture;
+        ambientTexture: BaseTexture;
+        opacityTexture: BaseTexture;
+        reflectionTexture: BaseTexture;
+        emissiveTexture: BaseTexture;
+        specularTexture: BaseTexture;
+        bumpTexture: BaseTexture;
+        lightmapTexture: BaseTexture;
+        ambientColor: Color3;
+        diffuseColor: Color3;
+        specularColor: Color3;
+        specularPower: number;
+        emissiveColor: Color3;
+        useAlphaFromDiffuseTexture: boolean;
+        useEmissiveAsIllumination: boolean;
+        linkEmissiveWithDiffuse: boolean;
+        useReflectionFresnelFromSpecular: boolean;
+        useSpecularOverAlpha: boolean;
+        disableLighting: boolean;
+        roughness: number;
+        useLightmapAsShadowmap: boolean;
+        diffuseFresnelParameters: FresnelParameters;
+        opacityFresnelParameters: FresnelParameters;
+        reflectionFresnelParameters: FresnelParameters;
+        emissiveFresnelParameters: FresnelParameters;
+        useGlossinessFromSpecularMapAlpha: boolean;
+        private _renderTargets;
+        private _worldViewProjectionMatrix;
+        private _globalAmbientColor;
+        private _renderId;
+        private _defines;
+        private _cachedDefines;
+        private _useLogarithmicDepth;
+        constructor(name: string, scene: Scene);
+        useLogarithmicDepth: boolean;
+        needAlphaBlending(): boolean;
+        needAlphaTesting(): boolean;
+        private _shouldUseAlphaFromDiffuseTexture();
+        getAlphaTestTexture(): BaseTexture;
+        private _checkCache(scene, mesh?, useInstances?);
+        static PrepareDefinesForLights(scene: Scene, mesh: AbstractMesh, defines: MaterialDefines): boolean;
+        private static _scaledDiffuse;
+        private static _scaledSpecular;
+        static BindLights(scene: Scene, mesh: AbstractMesh, effect: Effect, defines: MaterialDefines): void;
+        isReady(mesh?: AbstractMesh, useInstances?: boolean): boolean;
+        unbind(): void;
+        bindOnlyWorldMatrix(world: Matrix): void;
+        bind(world: Matrix, mesh?: Mesh): void;
+        getAnimatables(): IAnimatable[];
+        dispose(forceDisposeEffect?: boolean): void;
+        clone(name: string): StandardMaterial;
+        serialize(): any;
+        static DiffuseTextureEnabled: boolean;
+        static AmbientTextureEnabled: boolean;
+        static OpacityTextureEnabled: boolean;
+        static ReflectionTextureEnabled: boolean;
+        static EmissiveTextureEnabled: boolean;
+        static SpecularTextureEnabled: boolean;
+        static BumpTextureEnabled: boolean;
+        static FresnelEnabled: boolean;
+        static LightmapEnabled: boolean;
+        static Parse(source: any, scene: Scene, rootUrl: string): StandardMaterial;
+    }
+}
+
+declare namespace BABYLON {
+    class AbstractMesh extends Node implements IDisposable {
+        private static _BILLBOARDMODE_NONE;
+        private static _BILLBOARDMODE_X;
+        private static _BILLBOARDMODE_Y;
+        private static _BILLBOARDMODE_Z;
+        private static _BILLBOARDMODE_ALL;
+        static BILLBOARDMODE_NONE: number;
+        static BILLBOARDMODE_X: number;
+        static BILLBOARDMODE_Y: number;
+        static BILLBOARDMODE_Z: number;
+        static BILLBOARDMODE_ALL: number;
+        definedFacingForward: boolean;
+        position: Vector3;
+        rotation: Vector3;
+        rotationQuaternion: Quaternion;
+        scaling: Vector3;
+        billboardMode: number;
+        visibility: number;
+        alphaIndex: number;
+        infiniteDistance: boolean;
+        isVisible: boolean;
+        isPickable: boolean;
+        showBoundingBox: boolean;
+        showSubMeshesBoundingBox: boolean;
+        onDispose: any;
+        isBlocker: boolean;
+        renderingGroupId: number;
+        material: Material;
+        receiveShadows: boolean;
+        actionManager: ActionManager;
+        renderOutline: boolean;
+        outlineColor: Color3;
+        outlineWidth: number;
+        renderOverlay: boolean;
+        overlayColor: Color3;
+        overlayAlpha: number;
+        hasVertexAlpha: boolean;
+        useVertexColors: boolean;
+        applyFog: boolean;
+        computeBonesUsingShaders: boolean;
+        scalingDeterminant: number;
+        numBoneInfluencers: number;
+        useOctreeForRenderingSelection: boolean;
+        useOctreeForPicking: boolean;
+        useOctreeForCollisions: boolean;
+        layerMask: number;
+        alwaysSelectAsActiveMesh: boolean;
+        _physicImpostor: number;
+        _physicsMass: number;
+        _physicsFriction: number;
+        _physicRestitution: number;
+        onPhysicsCollide: (collidedMesh: AbstractMesh, contact: any) => void;
+        private _checkCollisions;
+        ellipsoid: Vector3;
+        ellipsoidOffset: Vector3;
+        private _collider;
+        private _oldPositionForCollisions;
+        private _diffPositionForCollisions;
+        private _newPositionForCollisions;
+        onCollide: (collidedMesh: AbstractMesh) => void;
+        onCollisionPositionChange: (newPosition: Vector3) => void;
+        private _meshToBoneReferal;
+        edgesWidth: number;
+        edgesColor: Color4;
+        _edgesRenderer: EdgesRenderer;
+        private _localWorld;
+        _worldMatrix: Matrix;
+        private _rotateYByPI;
+        private _absolutePosition;
+        private _collisionsTransformMatrix;
+        private _collisionsScalingMatrix;
+        _positions: Vector3[];
+        private _isDirty;
+        _masterMesh: AbstractMesh;
+        _materialDefines: MaterialDefines;
+        _boundingInfo: BoundingInfo;
+        private _pivotMatrix;
+        _isDisposed: boolean;
+        _renderId: number;
+        subMeshes: SubMesh[];
+        _submeshesOctree: Octree<SubMesh>;
+        _intersectionsInProgress: AbstractMesh[];
+        private _onAfterWorldMatrixUpdate;
+        private _isWorldMatrixFrozen;
+        _unIndexed: boolean;
+        _poseMatrix: Matrix;
+        _waitingActions: any;
+        _waitingFreezeWorldMatrix: boolean;
+        private _skeleton;
+        _bonesTransformMatrices: Float32Array;
+        skeleton: Skeleton;
+        constructor(name: string, scene: Scene);
+        updatePoseMatrix(matrix: Matrix): void;
+        getPoseMatrix(): Matrix;
+        disableEdgesRendering(): void;
+        enableEdgesRendering(epsilon?: number, checkVerticesInsteadOfIndices?: boolean): void;
+        isBlocked: boolean;
+        getLOD(camera: Camera): AbstractMesh;
+        getTotalVertices(): number;
+        getIndices(): number[] | Int32Array;
+        getVerticesData(kind: string): number[] | Float32Array;
+        isVerticesDataPresent(kind: string): boolean;
+        getBoundingInfo(): BoundingInfo;
+        useBones: boolean;
+        _preActivate(): void;
+        _activate(renderId: number): void;
+        getWorldMatrix(): Matrix;
+        worldMatrixFromCache: Matrix;
+        absolutePosition: Vector3;
+        freezeWorldMatrix(): void;
+        unfreezeWorldMatrix(): void;
+        isWorldMatrixFrozen: boolean;
+        rotate(axis: Vector3, amount: number, space?: Space): void;
+        translate(axis: Vector3, distance: number, space?: Space): void;
+        getAbsolutePosition(): Vector3;
+        setAbsolutePosition(absolutePosition: Vector3): void;
+        /**
+         * Perform relative position change from the point of view of behind the front of the mesh.
+         * This is performed taking into account the meshes current rotation, so you do not have to care.
+         * Supports definition of mesh facing forward or backward.
+         * @param {number} amountRight
+         * @param {number} amountUp
+         * @param {number} amountForward
+         */
+        movePOV(amountRight: number, amountUp: number, amountForward: number): void;
+        /**
+         * Calculate relative position change from the point of view of behind the front of the mesh.
+         * This is performed taking into account the meshes current rotation, so you do not have to care.
+         * Supports definition of mesh facing forward or backward.
+         * @param {number} amountRight
+         * @param {number} amountUp
+         * @param {number} amountForward
+         */
+        calcMovePOV(amountRight: number, amountUp: number, amountForward: number): Vector3;
+        /**
+         * Perform relative rotation change from the point of view of behind the front of the mesh.
+         * Supports definition of mesh facing forward or backward.
+         * @param {number} flipBack
+         * @param {number} twirlClockwise
+         * @param {number} tiltRight
+         */
+        rotatePOV(flipBack: number, twirlClockwise: number, tiltRight: number): void;
+        /**
+         * Calculate relative rotation change from the point of view of behind the front of the mesh.
+         * Supports definition of mesh facing forward or backward.
+         * @param {number} flipBack
+         * @param {number} twirlClockwise
+         * @param {number} tiltRight
+         */
+        calcRotatePOV(flipBack: number, twirlClockwise: number, tiltRight: number): Vector3;
+        setPivotMatrix(matrix: Matrix): void;
+        getPivotMatrix(): Matrix;
+        _isSynchronized(): boolean;
+        _initCache(): void;
+        markAsDirty(property: string): void;
+        _updateBoundingInfo(): void;
+        _updateSubMeshesBoundingInfo(matrix: Matrix): void;
+        computeWorldMatrix(force?: boolean): Matrix;
+        /**
+        * If you'd like to be callbacked after the mesh position, rotation or scaling has been updated
+        * @param func: callback function to add
+        */
+        registerAfterWorldMatrixUpdate(func: (mesh: AbstractMesh) => void): void;
+        unregisterAfterWorldMatrixUpdate(func: (mesh: AbstractMesh) => void): void;
+        setPositionWithLocalVector(vector3: Vector3): void;
+        getPositionExpressedInLocalSpace(): Vector3;
+        locallyTranslate(vector3: Vector3): void;
+        lookAt(targetPoint: Vector3, yawCor: number, pitchCor: number, rollCor: number): void;
+        attachToBone(bone: Bone, affectedMesh: AbstractMesh): void;
+        detachFromBone(): void;
+        isInFrustum(frustumPlanes: Plane[]): boolean;
+        isCompletelyInFrustum(camera?: Camera): boolean;
+        intersectsMesh(mesh: AbstractMesh, precise?: boolean): boolean;
+        intersectsPoint(point: Vector3): boolean;
+        setPhysicsState(impostor?: any, options?: PhysicsBodyCreationOptions): any;
+        getPhysicsImpostor(): number;
+        getPhysicsMass(): number;
+        getPhysicsFriction(): number;
+        getPhysicsRestitution(): number;
+        getPositionInCameraSpace(camera?: Camera): Vector3;
+        getDistanceToCamera(camera?: Camera): number;
+        applyImpulse(force: Vector3, contactPoint: Vector3): void;
+        setPhysicsLinkWith(otherMesh: Mesh, pivot1: Vector3, pivot2: Vector3, options?: any): void;
+        updatePhysicsBodyPosition(): void;
+        checkCollisions: boolean;
+        moveWithCollisions(velocity: Vector3): void;
+        private _onCollisionPositionChange;
+        /**
+        * This function will create an octree to help select the right submeshes for rendering, picking and collisions
+        * Please note that you must have a decent number of submeshes to get performance improvements when using octree
+        */
+        createOrUpdateSubmeshesOctree(maxCapacity?: number, maxDepth?: number): Octree<SubMesh>;
+        _collideForSubMesh(subMesh: SubMesh, transformMatrix: Matrix, collider: Collider): void;
+        _processCollisionsForSubMeshes(collider: Collider, transformMatrix: Matrix): void;
+        _checkCollision(collider: Collider): void;
+        _generatePointsArray(): boolean;
+        intersects(ray: Ray, fastCheck?: boolean): PickingInfo;
+        clone(name: string, newParent: Node, doNotCloneChildren?: boolean): AbstractMesh;
+        releaseSubMeshes(): void;
+        dispose(doNotRecurse?: boolean): void;
+    }
+}
+
+declare namespace BABYLON {
+    class CSG {
+        private polygons;
+        matrix: Matrix;
+        position: Vector3;
+        rotation: Vector3;
+        rotationQuaternion: Quaternion;
+        scaling: Vector3;
+        static FromMesh(mesh: Mesh): CSG;
+        private static FromPolygons(polygons);
+        clone(): CSG;
+        private toPolygons();
+        union(csg: CSG): CSG;
+        unionInPlace(csg: CSG): void;
+        subtract(csg: CSG): CSG;
+        subtractInPlace(csg: CSG): void;
+        intersect(csg: CSG): CSG;
+        intersectInPlace(csg: CSG): void;
+        inverse(): CSG;
+        inverseInPlace(): void;
+        copyTransformAttributes(csg: CSG): CSG;
+        buildMeshGeometry(name: string, scene: Scene, keepSubMeshes: boolean): Mesh;
+        toMesh(name: string, material: Material, scene: Scene, keepSubMeshes: boolean): Mesh;
+    }
+}
+
+declare namespace BABYLON {
+    class Geometry implements IGetSetVerticesData {
+        id: string;
+        delayLoadState: number;
+        delayLoadingFile: string;
+        onGeometryUpdated: (geometry: Geometry, kind?: string) => void;
+        private _scene;
+        private _engine;
+        private _meshes;
+        private _totalVertices;
+        private _indices;
+        private _vertexBuffers;
+        private _isDisposed;
+        private _extend;
+        _delayInfo: any;
+        private _indexBuffer;
+        _boundingInfo: BoundingInfo;
+        _delayLoadingFunction: (any: any, geometry: Geometry) => void;
+        _softwareSkinningRenderId: number;
+        constructor(id: string, scene: Scene, vertexData?: VertexData, updatable?: boolean, mesh?: Mesh);
+        extend: {
+            minimum: Vector3;
+            maximum: Vector3;
+        };
+        getScene(): Scene;
+        getEngine(): Engine;
+        isReady(): boolean;
+        setAllVerticesData(vertexData: VertexData, updatable?: boolean): void;
+        setVerticesData(kind: string, data: number[] | Float32Array, updatable?: boolean, stride?: number): void;
+        updateVerticesDataDirectly(kind: string, data: Float32Array, offset: number): void;
+        updateVerticesData(kind: string, data: number[] | Float32Array, updateExtends?: boolean): void;
+        getTotalVertices(): number;
+        getVerticesData(kind: string, copyWhenShared?: boolean): number[] | Float32Array;
+        getVertexBuffer(kind: string): VertexBuffer;
+        getVertexBuffers(): VertexBuffer[];
+        isVerticesDataPresent(kind: string): boolean;
+        getVerticesDataKinds(): string[];
+        setIndices(indices: number[] | Int32Array, totalVertices?: number): void;
+        getTotalIndices(): number;
+        getIndices(copyWhenShared?: boolean): number[] | Int32Array;
+        getIndexBuffer(): any;
+        releaseForMesh(mesh: Mesh, shouldDispose?: boolean): void;
+        applyToMesh(mesh: Mesh): void;
+        private _applyToMesh(mesh);
+        private notifyUpdate(kind?);
+        load(scene: Scene, onLoaded?: () => void): void;
+        isDisposed(): boolean;
+        dispose(): void;
+        copy(id: string): Geometry;
+        serialize(): any;
+        serializeVerticeData(): any;
+        static ExtractFromMesh(mesh: Mesh, id: string): Geometry;
+        static RandomId(): string;
+        static ImportGeometry(parsedGeometry: any, mesh: Mesh): void;
+        static Parse(parsedVertexData: any, scene: Scene, rootUrl: string): Geometry;
+    }
+    namespace Geometry.Primitives {
+        class _Primitive extends Geometry {
+            private _beingRegenerated;
+            private _canBeRegenerated;
+            constructor(id: string, scene: Scene, vertexData?: VertexData, canBeRegenerated?: boolean, mesh?: Mesh);
+            canBeRegenerated(): boolean;
+            regenerate(): void;
+            asNewGeometry(id: string): Geometry;
+            setAllVerticesData(vertexData: VertexData, updatable?: boolean): void;
+            setVerticesData(kind: string, data: number[] | Int32Array | Float32Array, updatable?: boolean): void;
+            _regenerateVertexData(): VertexData;
+            copy(id: string): Geometry;
+            serialize(): any;
+        }
+        class Ribbon extends _Primitive {
+            pathArray: Vector3[][];
+            closeArray: boolean;
+            closePath: boolean;
+            offset: number;
+            side: number;
+            constructor(id: string, scene: Scene, pathArray: Vector3[][], closeArray: boolean, closePath: boolean, offset: number, canBeRegenerated?: boolean, mesh?: Mesh, side?: number);
+            _regenerateVertexData(): VertexData;
+            copy(id: string): Geometry;
+        }
+        class Box extends _Primitive {
+            size: number;
+            side: number;
+            constructor(id: string, scene: Scene, size: number, canBeRegenerated?: boolean, mesh?: Mesh, side?: number);
+            _regenerateVertexData(): VertexData;
+            copy(id: string): Geometry;
+            serialize(): any;
+            static Parse(parsedBox: any, scene: Scene): Box;
+        }
+        class Sphere extends _Primitive {
+            segments: number;
+            diameter: number;
+            side: number;
+            constructor(id: string, scene: Scene, segments: number, diameter: number, canBeRegenerated?: boolean, mesh?: Mesh, side?: number);
+            _regenerateVertexData(): VertexData;
+            copy(id: string): Geometry;
+            serialize(): any;
+            static Parse(parsedSphere: any, scene: Scene): Geometry.Primitives.Sphere;
+        }
+        class Disc extends _Primitive {
+            radius: number;
+            tessellation: number;
+            side: number;
+            constructor(id: string, scene: Scene, radius: number, tessellation: number, canBeRegenerated?: boolean, mesh?: Mesh, side?: number);
+            _regenerateVertexData(): VertexData;
+            copy(id: string): Geometry;
+        }
+        class Cylinder extends _Primitive {
+            height: number;
+            diameterTop: number;
+            diameterBottom: number;
+            tessellation: number;
+            subdivisions: number;
+            side: number;
+            constructor(id: string, scene: Scene, height: number, diameterTop: number, diameterBottom: number, tessellation: number, subdivisions?: number, canBeRegenerated?: boolean, mesh?: Mesh, side?: number);
+            _regenerateVertexData(): VertexData;
+            copy(id: string): Geometry;
+            serialize(): any;
+            static Parse(parsedCylinder: any, scene: Scene): Geometry.Primitives.Cylinder;
+        }
+        class Torus extends _Primitive {
+            diameter: number;
+            thickness: number;
+            tessellation: number;
+            side: number;
+            constructor(id: string, scene: Scene, diameter: number, thickness: number, tessellation: number, canBeRegenerated?: boolean, mesh?: Mesh, side?: number);
+            _regenerateVertexData(): VertexData;
+            copy(id: string): Geometry;
+            serialize(): any;
+            static Parse(parsedTorus: any, scene: Scene): Geometry.Primitives.Torus;
+        }
+        class Ground extends _Primitive {
+            width: number;
+            height: number;
+            subdivisions: number;
+            constructor(id: string, scene: Scene, width: number, height: number, subdivisions: number, canBeRegenerated?: boolean, mesh?: Mesh);
+            _regenerateVertexData(): VertexData;
+            copy(id: string): Geometry;
+            serialize(): any;
+            static Parse(parsedGround: any, scene: Scene): Geometry.Primitives.Ground;
+        }
+        class TiledGround extends _Primitive {
+            xmin: number;
+            zmin: number;
+            xmax: number;
+            zmax: number;
+            subdivisions: {
+                w: number;
+                h: number;
+            };
+            precision: {
+                w: number;
+                h: number;
+            };
+            constructor(id: string, scene: Scene, xmin: number, zmin: number, xmax: number, zmax: number, subdivisions: {
+                w: number;
+                h: number;
+            }, precision: {
+                w: number;
+                h: number;
+            }, canBeRegenerated?: boolean, mesh?: Mesh);
+            _regenerateVertexData(): VertexData;
+            copy(id: string): Geometry;
+        }
+        class Plane extends _Primitive {
+            size: number;
+            side: number;
+            constructor(id: string, scene: Scene, size: number, canBeRegenerated?: boolean, mesh?: Mesh, side?: number);
+            _regenerateVertexData(): VertexData;
+            copy(id: string): Geometry;
+            serialize(): any;
+            static Parse(parsedPlane: any, scene: Scene): Geometry.Primitives.Plane;
+        }
+        class TorusKnot extends _Primitive {
+            radius: number;
+            tube: number;
+            radialSegments: number;
+            tubularSegments: number;
+            p: number;
+            q: number;
+            side: number;
+            constructor(id: string, scene: Scene, radius: number, tube: number, radialSegments: number, tubularSegments: number, p: number, q: number, canBeRegenerated?: boolean, mesh?: Mesh, side?: number);
+            _regenerateVertexData(): VertexData;
+            copy(id: string): Geometry;
+            serialize(): any;
+            static Parse(parsedTorusKnot: any, scene: Scene): Geometry.Primitives.TorusKnot;
+        }
+    }
+}
+
+declare namespace BABYLON {
+    class GroundMesh extends Mesh {
+        generateOctree: boolean;
+        private _worldInverse;
+        private _heightQuads;
+        _subdivisions: number;
+        _width: number;
+        _height: number;
+        _minX: number;
+        _maxX: number;
+        _minZ: number;
+        _maxZ: number;
+        constructor(name: string, scene: Scene);
+        subdivisions: number;
+        optimize(chunksCount: number, octreeBlocksSize?: number): void;
+        /**
+         * Returns a height (y) value in the Worl system :
+         * the ground altitude at the coordinates (x, z) expressed in the World system.
+         * Returns the ground y position if (x, z) are outside the ground surface.
+         * Not pertinent if the ground is rotated.
+         */
+        getHeightAtCoordinates(x: number, z: number): number;
+        /**
+         * Returns a normalized vector (Vector3) orthogonal to the ground
+         * at the ground coordinates (x, z) expressed in the World system.
+         * Returns Vector3(0, 1, 0) if (x, z) are outside the ground surface.
+         * Not pertinent if the ground is rotated.
+         */
+        getNormalAtCoordinates(x: number, z: number): Vector3;
+        /**
+         * Updates the Vector3 passed a reference with a normalized vector orthogonal to the ground
+         * at the ground coordinates (x, z) expressed in the World system.
+         * Doesn't uptade the reference Vector3 if (x, z) are outside the ground surface.
+         * Not pertinent if the ground is rotated.
+         */
+        getNormalAtCoordinatesToRef(x: number, z: number, ref: Vector3): void;
+        private _getFacetAt(x, z);
+        private _computeHeightQuads();
+    }
+}
+
+declare namespace BABYLON {
+    /**
+     * Creates an instance based on a source mesh.
+     */
+    class InstancedMesh extends AbstractMesh {
+        private _sourceMesh;
+        private _currentLOD;
+        constructor(name: string, source: Mesh);
+        receiveShadows: boolean;
+        material: Material;
+        visibility: number;
+        skeleton: Skeleton;
+        renderingGroupId: number;
+        getTotalVertices(): number;
+        sourceMesh: Mesh;
+        getVerticesData(kind: string, copyWhenShared?: boolean): number[] | Float32Array;
+        isVerticesDataPresent(kind: string): boolean;
+        getIndices(): number[] | Int32Array;
+        _positions: Vector3[];
+        refreshBoundingInfo(): void;
+        _preActivate(): void;
+        _activate(renderId: number): void;
+        getLOD(camera: Camera): AbstractMesh;
+        _syncSubMeshes(): void;
+        _generatePointsArray(): boolean;
+        clone(name: string, newParent: Node, doNotCloneChildren?: boolean): InstancedMesh;
+        dispose(doNotRecurse?: boolean): void;
+    }
+}
+
+declare namespace BABYLON {
+    class LinesMesh extends Mesh {
+        color: Color3;
+        alpha: number;
+        private _colorShader;
+        constructor(name: string, scene: Scene, parent?: Node, source?: Mesh, doNotCloneChildren?: boolean);
+        material: Material;
+        isPickable: boolean;
+        checkCollisions: boolean;
+        _bind(subMesh: SubMesh, effect: Effect, fillMode: number): void;
+        _draw(subMesh: SubMesh, fillMode: number, instancesCount?: number): void;
+        intersects(ray: Ray, fastCheck?: boolean): any;
+        dispose(doNotRecurse?: boolean): void;
+        clone(name: string, newParent?: Node, doNotCloneChildren?: boolean): LinesMesh;
+    }
+}
+
+declare namespace BABYLON {
+    class _InstancesBatch {
+        mustReturn: boolean;
+        visibleInstances: InstancedMesh[][];
+        renderSelf: boolean[];
+    }
+    class Mesh extends AbstractMesh implements IGetSetVerticesData {
+        static _FRONTSIDE: number;
+        static _BACKSIDE: number;
+        static _DOUBLESIDE: number;
+        static _DEFAULTSIDE: number;
+        static _NO_CAP: number;
+        static _CAP_START: number;
+        static _CAP_END: number;
+        static _CAP_ALL: number;
+        static FRONTSIDE: number;
+        static BACKSIDE: number;
+        static DOUBLESIDE: number;
+        static DEFAULTSIDE: number;
+        static NO_CAP: number;
+        static CAP_START: number;
+        static CAP_END: number;
+        static CAP_ALL: number;
+        delayLoadState: number;
+        instances: InstancedMesh[];
+        delayLoadingFile: string;
+        _binaryInfo: any;
+        private _LODLevels;
+        onLODLevelSelection: (distance: number, mesh: Mesh, selectedLevel: Mesh) => void;
+        onBeforeDraw: () => void;
+        _geometry: Geometry;
+        private _onBeforeRenderCallbacks;
+        private _onAfterRenderCallbacks;
+        _delayInfo: any;
+        _delayLoadingFunction: (any: any, mesh: Mesh) => void;
+        _visibleInstances: any;
+        private _renderIdForInstances;
+        private _batchCache;
+        private _worldMatricesInstancesBuffer;
+        private _worldMatricesInstancesArray;
+        private _instancesBufferSize;
+        _shouldGenerateFlatShading: boolean;
+        private _preActivateId;
+        private _sideOrientation;
+        private _areNormalsFrozen;
+        private _sourcePositions;
+        private _sourceNormals;
+        /**
+         * @constructor
+         * @param {string} name - The value used by scene.getMeshByName() to do a lookup.
+         * @param {Scene} scene - The scene to add this mesh to.
+         * @param {Node} parent - The parent of this mesh, if it has one
+         * @param {Mesh} source - An optional Mesh from which geometry is shared, cloned.
+         * @param {boolean} doNotCloneChildren - When cloning, skip cloning child meshes of source, default False.
+         *                  When false, achieved by calling a clone(), also passing False.
+         *                  This will make creation of children, recursive.
+         */
+        constructor(name: string, scene: Scene, parent?: Node, source?: Mesh, doNotCloneChildren?: boolean);
+        hasLODLevels: boolean;
+        private _sortLODLevels();
+        /**
+         * Add a mesh as LOD level triggered at the given distance.
+         * @param {number} distance - the distance from the center of the object to show this level
+         * @param {Mesh} mesh - the mesh to be added as LOD level
+         * @return {Mesh} this mesh (for chaining)
+         */
+        addLODLevel(distance: number, mesh: Mesh): Mesh;
+        getLODLevelAtDistance(distance: number): Mesh;
+        /**
+         * Remove a mesh from the LOD array
+         * @param {Mesh} mesh - the mesh to be removed.
+         * @return {Mesh} this mesh (for chaining)
+         */
+        removeLODLevel(mesh: Mesh): Mesh;
+        getLOD(camera: Camera, boundingSphere?: BoundingSphere): AbstractMesh;
+        geometry: Geometry;
+        getTotalVertices(): number;
+        getVerticesData(kind: string, copyWhenShared?: boolean): number[] | Float32Array;
+        getVertexBuffer(kind: any): VertexBuffer;
+        isVerticesDataPresent(kind: string): boolean;
+        getVerticesDataKinds(): string[];
+        getTotalIndices(): number;
+        getIndices(copyWhenShared?: boolean): number[] | Int32Array;
+        isBlocked: boolean;
+        isReady(): boolean;
+        isDisposed(): boolean;
+        sideOrientation: number;
+        areNormalsFrozen: boolean;
+        /**  This function affects parametric shapes on update only : ribbons, tubes, etc. It has no effect at all on other shapes */
+        freezeNormals(): void;
+        /**  This function affects parametric shapes on update only : ribbons, tubes, etc. It has no effect at all on other shapes */
+        unfreezeNormals(): void;
+        _preActivate(): void;
+        _registerInstanceForRenderId(instance: InstancedMesh, renderId: number): void;
+        refreshBoundingInfo(): void;
+        _createGlobalSubMesh(): SubMesh;
+        subdivide(count: number): void;
+        setVerticesData(kind: string, data: number[] | Float32Array, updatable?: boolean, stride?: number): void;
+        updateVerticesData(kind: string, data: number[] | Float32Array, updateExtends?: boolean, makeItUnique?: boolean): void;
+        updateVerticesDataDirectly(kind: string, data: Float32Array, offset?: number, makeItUnique?: boolean): void;
+        updateMeshPositions(positionFunction: any, computeNormals?: boolean): void;
+        makeGeometryUnique(): void;
+        setIndices(indices: number[] | Int32Array, totalVertices?: number): void;
+        _bind(subMesh: SubMesh, effect: Effect, fillMode: number): void;
+        _draw(subMesh: SubMesh, fillMode: number, instancesCount?: number): void;
+        registerBeforeRender(func: (mesh: AbstractMesh) => void): void;
+        unregisterBeforeRender(func: (mesh: AbstractMesh) => void): void;
+        registerAfterRender(func: (mesh: AbstractMesh) => void): void;
+        unregisterAfterRender(func: (mesh: AbstractMesh) => void): void;
+        _getInstancesRenderList(subMeshId: number): _InstancesBatch;
+        _renderWithInstances(subMesh: SubMesh, fillMode: number, batch: _InstancesBatch, effect: Effect, engine: Engine): void;
+        _processRendering(subMesh: SubMesh, effect: Effect, fillMode: number, batch: _InstancesBatch, hardwareInstancedRendering: boolean, onBeforeDraw: (isInstance: boolean, world: Matrix) => void): void;
+        render(subMesh: SubMesh, enableAlphaMode: boolean): void;
+        getEmittedParticleSystems(): ParticleSystem[];
+        getHierarchyEmittedParticleSystems(): ParticleSystem[];
+        getChildren(): Node[];
+        _checkDelayState(): void;
+        isInFrustum(frustumPlanes: Plane[]): boolean;
+        setMaterialByID(id: string): void;
+        getAnimatables(): IAnimatable[];
+        bakeTransformIntoVertices(transform: Matrix): void;
+        bakeCurrentTransformIntoVertices(): void;
+        _resetPointsArrayCache(): void;
+        _generatePointsArray(): boolean;
+        clone(name: string, newParent?: Node, doNotCloneChildren?: boolean): Mesh;
+        dispose(doNotRecurse?: boolean): void;
+        applyDisplacementMap(url: string, minHeight: number, maxHeight: number, onSuccess?: (mesh: Mesh) => void): void;
+        applyDisplacementMapFromBuffer(buffer: Uint8Array, heightMapWidth: number, heightMapHeight: number, minHeight: number, maxHeight: number): void;
+        convertToFlatShadedMesh(): void;
+        convertToUnIndexedMesh(): void;
+        flipFaces(flipNormals?: boolean): void;
+        createInstance(name: string): InstancedMesh;
+        synchronizeInstances(): void;
+        /**
+         * Simplify the mesh according to the given array of settings.
+         * Function will return immediately and will simplify async.
+         * @param settings a collection of simplification settings.
+         * @param parallelProcessing should all levels calculate parallel or one after the other.
+         * @param type the type of simplification to run.
+         * @param successCallback optional success callback to be called after the simplification finished processing all settings.
+         */
+        simplify(settings: Array<ISimplificationSettings>, parallelProcessing?: boolean, simplificationType?: SimplificationType, successCallback?: (mesh?: Mesh, submeshIndex?: number) => void): void;
+        /**
+         * Optimization of the mesh's indices, in case a mesh has duplicated vertices.
+         * The function will only reorder the indices and will not remove unused vertices to avoid problems with submeshes.
+         * This should be used together with the simplification to avoid disappearing triangles.
+         * @param successCallback an optional success callback to be called after the optimization finished.
+         */
+        optimizeIndices(successCallback?: (mesh?: Mesh) => void): void;
+        static Parse(parsedMesh: any, scene: Scene, rootUrl: string): Mesh;
+        static CreateRibbon(name: string, pathArray: Vector3[][], closeArray: boolean, closePath: boolean, offset: number, scene: Scene, updatable?: boolean, sideOrientation?: number, instance?: Mesh): Mesh;
+        static CreateDisc(name: string, radius: number, tessellation: number, scene: Scene, updatable?: boolean, sideOrientation?: number): Mesh;
+        static CreateBox(name: string, size: number, scene: Scene, updatable?: boolean, sideOrientation?: number): Mesh;
+        static CreateSphere(name: string, segments: number, diameter: number, scene?: Scene, updatable?: boolean, sideOrientation?: number): Mesh;
+        static CreateCylinder(name: string, height: number, diameterTop: number, diameterBottom: number, tessellation: number, subdivisions: any, scene: Scene, updatable?: any, sideOrientation?: number): Mesh;
+        static CreateTorus(name: string, diameter: number, thickness: number, tessellation: number, scene: Scene, updatable?: boolean, sideOrientation?: number): Mesh;
+        static CreateTorusKnot(name: string, radius: number, tube: number, radialSegments: number, tubularSegments: number, p: number, q: number, scene: Scene, updatable?: boolean, sideOrientation?: number): Mesh;
+        static CreateLines(name: string, points: Vector3[], scene: Scene, updatable?: boolean, instance?: LinesMesh): LinesMesh;
+        static CreateDashedLines(name: string, points: Vector3[], dashSize: number, gapSize: number, dashNb: number, scene: Scene, updatable?: boolean, instance?: LinesMesh): LinesMesh;
+        static ExtrudeShape(name: string, shape: Vector3[], path: Vector3[], scale: number, rotation: number, cap: number, scene: Scene, updatable?: boolean, sideOrientation?: number, instance?: Mesh): Mesh;
+        static ExtrudeShapeCustom(name: string, shape: Vector3[], path: Vector3[], scaleFunction: any, rotationFunction: any, ribbonCloseArray: boolean, ribbonClosePath: boolean, cap: number, scene: Scene, updatable?: boolean, sideOrientation?: number, instance?: Mesh): Mesh;
+        static CreateLathe(name: string, shape: Vector3[], radius: number, tessellation: number, scene: Scene, updatable?: boolean, sideOrientation?: number): Mesh;
+        static CreatePlane(name: string, size: number, scene: Scene, updatable?: boolean, sideOrientation?: number): Mesh;
+        static CreateGround(name: string, width: number, height: number, subdivisions: number, scene: Scene, updatable?: boolean): Mesh;
+        static CreateTiledGround(name: string, xmin: number, zmin: number, xmax: number, zmax: number, subdivisions: {
+            w: number;
+            h: number;
+        }, precision: {
+            w: number;
+            h: number;
+        }, scene: Scene, updatable?: boolean): Mesh;
+        static CreateGroundFromHeightMap(name: string, url: string, width: number, height: number, subdivisions: number, minHeight: number, maxHeight: number, scene: Scene, updatable?: boolean, onReady?: (mesh: GroundMesh) => void): GroundMesh;
+        static CreateTube(name: string, path: Vector3[], radius: number, tessellation: number, radiusFunction: {
+            (i: number, distance: number): number;
+        }, cap: number, scene: Scene, updatable?: boolean, sideOrientation?: number, instance?: Mesh): Mesh;
+        static CreatePolyhedron(name: string, options: {
+            type?: number;
+            size?: number;
+            sizeX?: number;
+            sizeY?: number;
+            sizeZ?: number;
+            custom?: any;
+            faceUV?: Vector4[];
+            faceColors?: Color4[];
+            updatable?: boolean;
+            sideOrientation?: number;
+        }, scene: Scene): Mesh;
+        static CreateIcoSphere(name: string, options: {
+            radius?: number;
+            flat?: boolean;
+            subdivisions?: number;
+            sideOrientation?: number;
+            updatable?: boolean;
+        }, scene: Scene): Mesh;
+        static CreateDecal(name: string, sourceMesh: AbstractMesh, position: Vector3, normal: Vector3, size: Vector3, angle: number): Mesh;
+        /**
+         * @returns original positions used for CPU skinning.  Useful for integrating Morphing with skeletons in same mesh.
+         */
+        setPositionsForCPUSkinning(): Float32Array;
+        /**
+         * @returns original normals used for CPU skinning.  Useful for integrating Morphing with skeletons in same mesh.
+         */
+        setNormalsForCPUSkinning(): Float32Array;
+        /**
+         * Update the vertex buffers by applying transformation from the bones
+         * @param {skeleton} skeleton to apply
+         */
+        applySkeleton(skeleton: Skeleton): Mesh;
+        static MinMax(meshes: AbstractMesh[]): {
+            min: Vector3;
+            max: Vector3;
+        };
+        static Center(meshesOrMinMaxVector: any): Vector3;
+        /**
+         * Merge the array of meshes into a single mesh for performance reasons.
+         * @param {Array<Mesh>} meshes - The vertices source.  They should all be of the same material.  Entries can empty
+         * @param {boolean} disposeSource - When true (default), dispose of the vertices from the source meshes
+         * @param {boolean} allow32BitsIndices - When the sum of the vertices > 64k, this must be set to true.
+         * @param {Mesh} meshSubclass - When set, vertices inserted into this Mesh.  Meshes can then be merged into a Mesh sub-class.
+         */
+        static MergeMeshes(meshes: Array<Mesh>, disposeSource?: boolean, allow32BitsIndices?: boolean, meshSubclass?: Mesh): Mesh;
+    }
+}
+
+declare namespace BABYLON {
+    interface IGetSetVerticesData {
+        isVerticesDataPresent(kind: string): boolean;
+        getVerticesData(kind: string, copyWhenShared?: boolean): number[] | Int32Array | Float32Array;
+        getIndices(copyWhenShared?: boolean): number[] | Int32Array;
+        setVerticesData(kind: string, data: number[] | Float32Array, updatable?: boolean): void;
+        updateVerticesData(kind: string, data: number[] | Float32Array, updateExtends?: boolean, makeItUnique?: boolean): void;
+        setIndices(indices: number[] | Int32Array): void;
+    }
+    class VertexData {
+        positions: number[] | Float32Array;
+        normals: number[] | Float32Array;
+        uvs: number[] | Float32Array;
+        uvs2: number[] | Float32Array;
+        uvs3: number[] | Float32Array;
+        uvs4: number[] | Float32Array;
+        uvs5: number[] | Float32Array;
+        uvs6: number[] | Float32Array;
+        colors: number[] | Float32Array;
+        matricesIndices: number[] | Float32Array;
+        matricesWeights: number[] | Float32Array;
+        matricesIndicesExtra: number[] | Float32Array;
+        matricesWeightsExtra: number[] | Float32Array;
+        indices: number[] | Int32Array;
+        set(data: number[] | Float32Array, kind: string): void;
+        applyToMesh(mesh: Mesh, updatable?: boolean): void;
+        applyToGeometry(geometry: Geometry, updatable?: boolean): void;
+        updateMesh(mesh: Mesh, updateExtends?: boolean, makeItUnique?: boolean): void;
+        updateGeometry(geometry: Geometry, updateExtends?: boolean, makeItUnique?: boolean): void;
+        private _applyTo(meshOrGeometry, updatable?);
+        private _update(meshOrGeometry, updateExtends?, makeItUnique?);
+        transform(matrix: Matrix): void;
+        merge(other: VertexData): void;
+        private _mergeElement(source, other);
+        serialize(): any;
+        static ExtractFromMesh(mesh: Mesh, copyWhenShared?: boolean): VertexData;
+        static ExtractFromGeometry(geometry: Geometry, copyWhenShared?: boolean): VertexData;
+        private static _ExtractFrom(meshOrGeometry, copyWhenShared?);
+        static CreateRibbon(options: {
+            pathArray: Vector3[][];
+            closeArray?: boolean;
+            closePath?: boolean;
+            offset?: number;
+            sideOrientation?: number;
+        }): VertexData;
+        static CreateBox(options: {
+            size?: number;
+            width?: number;
+            height?: number;
+            depth?: number;
+            faceUV?: Vector4[];
+            faceColors?: Color4[];
+            sideOrientation?: number;
+        }): VertexData;
+        static CreateSphere(options: {
+            segments?: number;
+            diameter?: number;
+            diameterX?: number;
+            diameterY?: number;
+            diameterZ?: number;
+            arc?: number;
+            slice?: number;
+            sideOrientation?: number;
+        }): VertexData;
+        static CreateCylinder(options: {
+            height?: number;
+            diameterTop?: number;
+            diameterBottom?: number;
+            diameter?: number;
+            tessellation?: number;
+            subdivisions?: number;
+            arc?: number;
+            faceColors?: Color4[];
+            faceUV?: Vector4[];
+            hasRings?: boolean;
+            enclose?: boolean;
+            sideOrientation?: number;
+        }): VertexData;
+        static CreateTorus(options: {
+            diameter?: number;
+            thickness?: number;
+            tessellation?: number;
+            sideOrientation?: number;
+        }): VertexData;
+        static CreateLines(options: {
+            points: Vector3[];
+        }): VertexData;
+        static CreateDashedLines(options: {
+            points: Vector3[];
+            dashSize?: number;
+            gapSize?: number;
+            dashNb?: number;
+        }): VertexData;
+        static CreateGround(options: {
+            width?: number;
+            height?: number;
+            subdivisions?: number;
+        }): VertexData;
+        static CreateTiledGround(options: {
+            xmin: number;
+            zmin: number;
+            xmax: number;
+            zmax: number;
+            subdivisions?: {
+                w: number;
+                h: number;
+            };
+            precision?: {
+                w: number;
+                h: number;
+            };
+        }): VertexData;
+        static CreateGroundFromHeightMap(options: {
+            width: number;
+            height: number;
+            subdivisions: number;
+            minHeight: number;
+            maxHeight: number;
+            buffer: Uint8Array;
+            bufferWidth: number;
+            bufferHeight: number;
+        }): VertexData;
+        static CreatePlane(options: {
+            size?: number;
+            width?: number;
+            height?: number;
+            sideOrientation?: number;
+        }): VertexData;
+        static CreateDisc(options: {
+            radius?: number;
+            tessellation?: number;
+            arc?: number;
+            sideOrientation?: number;
+        }): VertexData;
+        static CreateIcoSphere(options: {
+            radius?: number;
+            radiusX?: number;
+            radiusY?: number;
+            radiusZ?: number;
+            flat?: boolean;
+            subdivisions?: number;
+            sideOrientation?: number;
+        }): VertexData;
+        static CreatePolyhedron(options: {
+            type?: number;
+            size?: number;
+            sizeX?: number;
+            sizeY?: number;
+            sizeZ?: number;
+            custom?: any;
+            faceUV?: Vector4[];
+            faceColors?: Color4[];
+            flat?: boolean;
+            sideOrientation?: number;
+        }): VertexData;
+        static CreateTorusKnot(options: {
+            radius?: number;
+            tube?: number;
+            radialSegments?: number;
+            tubularSegments?: number;
+            p?: number;
+            q?: number;
+            sideOrientation?: number;
+        }): VertexData;
+        /**
+         * @param {any} - positions (number[] or Float32Array)
+         * @param {any} - indices   (number[] or Uint16Array)
+         * @param {any} - normals   (number[] or Float32Array)
+         */
+        static ComputeNormals(positions: any, indices: any, normals: any): void;
+        private static _ComputeSides(sideOrientation, positions, indices, normals, uvs);
+        static ImportVertexData(parsedVertexData: any, geometry: Geometry): void;
+    }
+}
+
+declare namespace BABYLON {
+    class MeshBuilder {
+        static CreateBox(name: string, options: {
+            width?: number;
+            height?: number;
+            depth?: number;
+            faceUV?: Vector4[];
+            faceColors?: Color4[];
+            sideOrientation?: number;
+            updatable?: boolean;
+        }, scene: Scene): Mesh;
+        static CreateSphere(name: string, options: {
+            segments?: number;
+            diameter?: number;
+            diameterX?: number;
+            diameterY?: number;
+            diameterZ?: number;
+            arc?: number;
+            slice?: number;
+            sideOrientation?: number;
+            updatable?: boolean;
+        }, scene: any): Mesh;
+        static CreateDisc(name: string, options: {
+            radius?: number;
+            tessellation?: number;
+            arc?: number;
+            updatable?: boolean;
+            sideOrientation?: number;
+        }, scene: Scene): Mesh;
+        static CreateIcoSphere(name: string, options: {
+            radius?: number;
+            radiusX?: number;
+            radiusY?: number;
+            radiusZ?: number;
+            flat?: boolean;
+            subdivisions?: number;
+            sideOrientation?: number;
+            updatable?: boolean;
+        }, scene: Scene): Mesh;
+        static CreateRibbon(name: string, options: {
+            pathArray: Vector3[][];
+            closeArray?: boolean;
+            closePath?: boolean;
+            offset?: number;
+            updatable?: boolean;
+            sideOrientation?: number;
+            instance?: Mesh;
+        }, scene?: Scene): Mesh;
+        static CreateCylinder(name: string, options: {
+            height?: number;
+            diameterTop?: number;
+            diameterBottom?: number;
+            diameter?: number;
+            tessellation?: number;
+            subdivisions?: number;
+            arc?: number;
+            faceColors?: Color4[];
+            faceUV?: Vector4[];
+            updatable?: boolean;
+            hasRings?: boolean;
+            enclose?: boolean;
+            sideOrientation?: number;
+        }, scene: any): Mesh;
+        static CreateTorus(name: string, options: {
+            diameter?: number;
+            thickness?: number;
+            tessellation?: number;
+            updatable?: boolean;
+            sideOrientation?: number;
+        }, scene: any): Mesh;
+        static CreateTorusKnot(name: string, options: {
+            radius?: number;
+            tube?: number;
+            radialSegments?: number;
+            tubularSegments?: number;
+            p?: number;
+            q?: number;
+            updatable?: boolean;
+            sideOrientation?: number;
+        }, scene: any): Mesh;
+        static CreateLines(name: string, options: {
+            points: Vector3[];
+            updatable?: boolean;
+            instance?: LinesMesh;
+        }, scene: Scene): LinesMesh;
+        static CreateDashedLines(name: string, options: {
+            points: Vector3[];
+            dashSize?: number;
+            gapSize?: number;
+            dashNb?: number;
+            updatable?: boolean;
+            instance?: LinesMesh;
+        }, scene: Scene): LinesMesh;
+        static ExtrudeShape(name: string, options: {
+            shape: Vector3[];
+            path: Vector3[];
+            scale?: number;
+            rotation?: number;
+            cap?: number;
+            updatable?: boolean;
+            sideOrientation?: number;
+            instance?: Mesh;
+        }, scene: Scene): Mesh;
+        static ExtrudeShapeCustom(name: string, options: {
+            shape: Vector3[];
+            path: Vector3[];
+            scaleFunction?:any;
+            rotationFunction?:any;
+            ribbonCloseArray?: boolean;
+            ribbonClosePath?: boolean;
+            cap?: number;
+            updatable?: boolean;
+            sideOrientation?: number;
+            instance?: Mesh;
+        }, scene: Scene): Mesh;
+        static CreateLathe(name: string, options: {
+            shape: Vector3[];
+            radius?: number;
+            tessellation?: number;
+            arc?: number;
+            closed?: boolean;
+            updatable?: boolean;
+            sideOrientation?: number;
+            cap?: number;
+        }, scene: Scene): Mesh;
+        static CreatePlane(name: string, options: {
+            size?: number;
+            width?: number;
+            height?: number;
+            sideOrientation?: number;
+            updatable?: boolean;
+            sourcePlane?: Plane;
+        }, scene: Scene): Mesh;
+        static CreateGround(name: string, options: {
+            width?: number;
+            height?: number;
+            subdivisions?: number;
+            updatable?: boolean;
+        }, scene: any): Mesh;
+        static CreateTiledGround(name: string, options: {
+            xmin: number;
+            zmin: number;
+            xmax: number;
+            zmax: number;
+            subdivisions?: {
+                w: number;
+                h: number;
+            };
+            precision?: {
+                w: number;
+                h: number;
+            };
+            updatable?: boolean;
+        }, scene: Scene): Mesh;
+        static CreateGroundFromHeightMap(name: string, url: string, options: {
+            width?: number;
+            height?: number;
+            subdivisions?: number;
+            minHeight?: number;
+            maxHeight?: number;
+            updatable?: boolean;
+            onReady?: (mesh: GroundMesh) => void;
+        }, scene: Scene): GroundMesh;
+        static CreateTube(name: string, options: {
+            path: Vector3[];
+            radius?: number;
+            tessellation?: number;
+            radiusFunction?: {
+                (i: number, distance: number): number;
+            };
+            cap?: number;
+            arc?: number;
+            updatable?: boolean;
+            sideOrientation?: number;
+            instance?: Mesh;
+        }, scene: Scene): Mesh;
+        static CreatePolyhedron(name: string, options: {
+            type?: number;
+            size?: number;
+            sizeX?: number;
+            sizeY?: number;
+            sizeZ?: number;
+            custom?: any;
+            faceUV?: Vector4[];
+            faceColors?: Color4[];
+            flat?: boolean;
+            updatable?: boolean;
+            sideOrientation?: number;
+        }, scene: Scene): Mesh;
+        static CreateDecal(name: string, sourceMesh: AbstractMesh, options: {
+            position?: Vector3;
+            normal?: Vector3;
+            size?: Vector3;
+            angle?: number;
+        }): Mesh;
+        private static _ExtrudeShapeGeneric(name, shape, curve, scale, rotation, scaleFunction, rotateFunction, rbCA, rbCP, cap, custom, scene, updtbl, side, instance);
+    }
+}
+
+declare namespace BABYLON.Internals {
+    class MeshLODLevel {
+        distance: number;
+        mesh: Mesh;
+        constructor(distance: number, mesh: Mesh);
+    }
+}
+
+declare namespace BABYLON {
+    /**
+     * A simplifier interface for future simplification implementations.
+     */
+    interface ISimplifier {
+        /**
+         * Simplification of a given mesh according to the given settings.
+         * Since this requires computation, it is assumed that the function runs async.
+         * @param settings The settings of the simplification, including quality and distance
+         * @param successCallback A callback that will be called after the mesh was simplified.
+         * @param errorCallback in case of an error, this callback will be called. optional.
+         */
+        simplify(settings: ISimplificationSettings, successCallback: (simplifiedMeshes: Mesh) => void, errorCallback?: () => void): void;
+    }
+    /**
+     * Expected simplification settings.
+     * Quality should be between 0 and 1 (1 being 100%, 0 being 0%);
+     */
+    interface ISimplificationSettings {
+        quality: number;
+        distance: number;
+        optimizeMesh?: boolean;
+    }
+    class SimplificationSettings implements ISimplificationSettings {
+        quality: number;
+        distance: number;
+        optimizeMesh: boolean;
+        constructor(quality: number, distance: number, optimizeMesh?: boolean);
+    }
+    interface ISimplificationTask {
+        settings: Array<ISimplificationSettings>;
+        simplificationType: SimplificationType;
+        mesh: Mesh;
+        successCallback?: () => void;
+        parallelProcessing: boolean;
+    }
+    class SimplificationQueue {
+        private _simplificationArray;
+        running: any;
+        constructor();
+        addTask(task: ISimplificationTask): void;
+        executeNext(): void;
+        runSimplification(task: ISimplificationTask): void;
+        private getSimplifier(task);
+    }
+    /**
+     * The implemented types of simplification.
+     * At the moment only Quadratic Error Decimation is implemented.
+     */
+    enum SimplificationType {
+        QUADRATIC = 0,
+    }
+    class DecimationTriangle {
+        vertices: Array<DecimationVertex>;
+        normal: Vector3;
+        error: Array<number>;
+        deleted: boolean;
+        isDirty: boolean;
+        borderFactor: number;
+        deletePending: boolean;
+        originalOffset: number;
+        constructor(vertices: Array<DecimationVertex>);
+    }
+    class DecimationVertex {
+        position: Vector3;
+        id: any;
+        q: QuadraticMatrix;
+        isBorder: boolean;
+        triangleStart: number;
+        triangleCount: number;
+        originalOffsets: Array<number>;
+        constructor(position: Vector3, id: any);
+        updatePosition(newPosition: Vector3): void;
+    }
+    class QuadraticMatrix {
+        data: Array<number>;
+        constructor(data?: Array<number>);
+        det(a11: any, a12: any, a13: any, a21: any, a22: any, a23: any, a31: any, a32: any, a33: any): number;
+        addInPlace(matrix: QuadraticMatrix): void;
+        addArrayInPlace(data: Array<number>): void;
+        add(matrix: QuadraticMatrix): QuadraticMatrix;
+        static FromData(a: number, b: number, c: number, d: number): QuadraticMatrix;
+        static DataFromNumbers(a: number, b: number, c: number, d: number): number[];
+    }
+    class Reference {
+        vertexId: number;
+        triangleId: number;
+        constructor(vertexId: number, triangleId: number);
+    }
+    /**
+     * An implementation of the Quadratic Error simplification algorithm.
+     * Original paper : http://www1.cs.columbia.edu/~cs4162/html05s/garland97.pdf
+     * Ported mostly from QSlim and http://voxels.blogspot.de/2014/05/quadric-mesh-simplification-with-source.html to babylon JS
+     * @author RaananW
+     */
+    class QuadraticErrorSimplification implements ISimplifier {
+        private _mesh;
+        private triangles;
+        private vertices;
+        private references;
+        private initialized;
+        private _reconstructedMesh;
+        syncIterations: number;
+        aggressiveness: number;
+        decimationIterations: number;
+        boundingBoxEpsilon: number;
+        constructor(_mesh: Mesh);
+        simplify(settings: ISimplificationSettings, successCallback: (simplifiedMesh: Mesh) => void): void;
+        private isTriangleOnBoundingBox(triangle);
+        private runDecimation(settings, submeshIndex, successCallback);
+        private initWithMesh(submeshIndex, callback, optimizeMesh?);
+        private init(callback);
+        private reconstructMesh(submeshIndex);
+        private initDecimatedMesh();
+        private isFlipped(vertex1, vertex2, point, deletedArray, borderFactor, delTr);
+        private updateTriangles(origVertex, vertex, deletedArray, deletedTriangles);
+        private identifyBorder();
+        private updateMesh(identifyBorders?);
+        private vertexError(q, point);
+        private calculateError(vertex1, vertex2, pointResult?, normalResult?, uvResult?, colorResult?);
+    }
+}
+
+declare namespace BABYLON {
+    class Polygon {
+        static Rectangle(xmin: number, ymin: number, xmax: number, ymax: number): Vector2[];
+        static Circle(radius: number, cx?: number, cy?: number, numberOfSides?: number): Vector2[];
+        static Parse(input: string): Vector2[];
+        static StartingAt(x: number, y: number): Path2;
+    }
+    class PolygonMeshBuilder {
+        private _swctx;
+        private _points;
+        private _outlinepoints;
+        private _holes;
+        private _name;
+        private _scene;
+        constructor(name: string, contours: Path2, scene: Scene);
+        constructor(name: string, contours: Vector2[], scene: Scene);
+        addHole(hole: Vector2[]): PolygonMeshBuilder;
+        build(updatable?: boolean, depth?: number): Mesh;
+        private addSide(positions, normals, uvs, indices, bounds, points, depth, flip);
+    }
+}
+
+declare namespace BABYLON {
+    class SubMesh {
+        materialIndex: number;
+        verticesStart: number;
+        verticesCount: number;
+        indexStart: any;
+        indexCount: number;
+        linesIndexCount: number;
+        private _mesh;
+        private _renderingMesh;
+        private _boundingInfo;
+        private _linesIndexBuffer;
+        _lastColliderWorldVertices: Vector3[];
+        _trianglePlanes: Plane[];
+        _lastColliderTransformMatrix: Matrix;
+        _renderId: number;
+        _alphaIndex: number;
+        _distanceToCamera: number;
+        _id: number;
+        constructor(materialIndex: number, verticesStart: number, verticesCount: number, indexStart: any, indexCount: number, mesh: AbstractMesh, renderingMesh?: Mesh, createBoundingBox?: boolean);
+        IsGlobal: boolean;
+        getBoundingInfo(): BoundingInfo;
+        getMesh(): AbstractMesh;
+        getRenderingMesh(): Mesh;
+        getMaterial(): Material;
+        refreshBoundingInfo(): void;
+        _checkCollision(collider: Collider): boolean;
+        updateBoundingInfo(world: Matrix): void;
+        isInFrustum(frustumPlanes: Plane[]): boolean;
+        render(enableAlphaMode: boolean): void;
+        getLinesIndexBuffer(indices: number[] | Int32Array, engine: any): WebGLBuffer;
+        canIntersects(ray: Ray): boolean;
+        intersects(ray: Ray, positions: Vector3[], indices: number[] | Int32Array, fastCheck?: boolean): IntersectionInfo;
+        clone(newMesh: AbstractMesh, newRenderingMesh?: Mesh): SubMesh;
+        dispose(): void;
+        static CreateFromIndices(materialIndex: number, startIndex: number, indexCount: number, mesh: AbstractMesh, renderingMesh?: Mesh): SubMesh;
+    }
+}
+
+declare namespace BABYLON {
+    class VertexBuffer {
+        private _mesh;
+        private _engine;
+        private _buffer;
+        private _data;
+        private _updatable;
+        private _kind;
+        private _strideSize;
+        constructor(engine: any, data: number[] | Float32Array, kind: string, updatable: boolean, postponeInternalCreation?: boolean, stride?: number);
+        isUpdatable(): boolean;
+        getData(): number[] | Float32Array;
+        getBuffer(): WebGLBuffer;
+        getStrideSize(): number;
+        create(data?: number[] | Float32Array): void;
+        update(data: number[] | Float32Array): void;
+        updateDirectly(data: Float32Array, offset: number): void;
+        dispose(): void;
+        private static _PositionKind;
+        private static _NormalKind;
+        private static _UVKind;
+        private static _UV2Kind;
+        private static _UV3Kind;
+        private static _UV4Kind;
+        private static _UV5Kind;
+        private static _UV6Kind;
+        private static _ColorKind;
+        private static _MatricesIndicesKind;
+        private static _MatricesWeightsKind;
+        private static _MatricesIndicesExtraKind;
+        private static _MatricesWeightsExtraKind;
+        static PositionKind: string;
+        static NormalKind: string;
+        static UVKind: string;
+        static UV2Kind: string;
+        static UV3Kind: string;
+        static UV4Kind: string;
+        static UV5Kind: string;
+        static UV6Kind: string;
+        static ColorKind: string;
+        static MatricesIndicesKind: string;
+        static MatricesWeightsKind: string;
+        static MatricesIndicesExtraKind: string;
+        static MatricesWeightsExtraKind: string;
+    }
+}
+
+declare namespace BABYLON {
+    class Particle {
+        position: Vector3;
+        direction: Vector3;
+        color: Color4;
+        colorStep: Color4;
+        lifeTime: number;
+        age: number;
+        size: number;
+        angle: number;
+        angularSpeed: number;
+        copyTo(other: Particle): void;
+    }
+}
+
+declare namespace BABYLON {
+    class ParticleSystem implements IDisposable {
+        name: string;
+        static BLENDMODE_ONEONE: number;
+        static BLENDMODE_STANDARD: number;
+        id: string;
+        renderingGroupId: number;
+        emitter: any;
+        emitRate: number;
+        manualEmitCount: number;
+        updateSpeed: number;
+        targetStopDuration: number;
+        disposeOnStop: boolean;
+        minEmitPower: number;
+        maxEmitPower: number;
+        minLifeTime: number;
+        maxLifeTime: number;
+        minSize: number;
+        maxSize: number;
+        minAngularSpeed: number;
+        maxAngularSpeed: number;
+        particleTexture: Texture;
+        layerMask: number;
+        onDispose: () => void;
+        updateFunction: (particles: Particle[]) => void;
+        blendMode: number;
+        forceDepthWrite: boolean;
+        gravity: Vector3;
+        direction1: Vector3;
+        direction2: Vector3;
+        minEmitBox: Vector3;
+        maxEmitBox: Vector3;
+        color1: Color4;
+        color2: Color4;
+        colorDead: Color4;
+        textureMask: Color4;
+        startDirectionFunction: (emitPower: number, worldMatrix: Matrix, directionToUpdate: Vector3, particle: Particle) => void;
+        startPositionFunction: (worldMatrix: Matrix, positionToUpdate: Vector3, particle: Particle) => void;
+        private particles;
+        private _capacity;
+        private _scene;
+        private _vertexDeclaration;
+        private _vertexStrideSize;
+        private _stockParticles;
+        private _newPartsExcess;
+        private _vertexBuffer;
+        private _indexBuffer;
+        private _vertices;
+        private _effect;
+        private _customEffect;
+        private _cachedDefines;
+        private _scaledColorStep;
+        private _colorDiff;
+        private _scaledDirection;
+        private _scaledGravity;
+        private _currentRenderId;
+        private _alive;
+        private _started;
+        private _stopped;
+        private _actualFrame;
+        private _scaledUpdateSpeed;
+        constructor(name: string, capacity: number, scene: Scene, customEffect?: Effect);
+        recycleParticle(particle: Particle): void;
+        getCapacity(): number;
+        isAlive(): boolean;
+        isStarted(): boolean;
+        start(): void;
+        stop(): void;
+        _appendParticleVertex(index: number, particle: Particle, offsetX: number, offsetY: number): void;
+        private _update(newParticles);
+        private _getEffect();
+        animate(): void;
+        render(): number;
+        dispose(): void;
+        clone(name: string, newEmitter: any): ParticleSystem;
+        serialize(): any;
+        static Parse(parsedParticleSystem: any, scene: Scene, rootUrl: string): ParticleSystem;
+    }
+}
+
+declare namespace BABYLON {
+    class SolidParticle {
+        idx: number;
+        color: Color4;
+        position: Vector3;
+        rotation: Vector3;
+        quaternion: Vector4;
+        scale: Vector3;
+        uvs: Vector4;
+        velocity: Vector3;
+        alive: boolean;
+        _pos: number;
+        _model: ModelShape;
+        shapeId: number;
+        idxInShape: number;
+        constructor(particleIndex: number, positionIndex: number, model: ModelShape, shapeId: number, idxInShape: number);
+    }
+    class ModelShape {
+        shapeID: number;
+        _shape: Vector3[];
+        _shapeUV: number[];
+        _positionFunction: (particle: SolidParticle, i: number, s: number) => void;
+        _vertexFunction: (particle: SolidParticle, vertex: Vector3, i: number) => void;
+        constructor(id: number, shape: Vector3[], shapeUV: number[], posFunction: (particle: SolidParticle, i: number, s: number) => void, vtxFunction: (particle: SolidParticle, vertex: Vector3, i: number) => void);
+    }
+}
+
+declare namespace BABYLON {
+    /**
+    * Full documentation here : http://doc.babylonjs.com/tutorials/Solid_Particle_System
+    */
+    class SolidParticleSystem implements IDisposable {
+        particles: SolidParticle[];
+        nbParticles: number;
+        billboard: boolean;
+        counter: number;
+        name: string;
+        mesh: Mesh;
+        vars: any;
+        pickedParticles: {
+            idx: number;
+            faceId: number;
+        }[];
+        private _scene;
+        private _positions;
+        private _indices;
+        private _normals;
+        private _colors;
+        private _uvs;
+        private _positions32;
+        private _normals32;
+        private _fixedNormal32;
+        private _colors32;
+        private _uvs32;
+        private _index;
+        private _updatable;
+        private _pickable;
+        private _isVisibilityBoxLocked;
+        private _alwaysVisible;
+        private _shapeCounter;
+        private _copy;
+        private _shape;
+        private _shapeUV;
+        private _color;
+        private _computeParticleColor;
+        private _computeParticleTexture;
+        private _computeParticleRotation;
+        private _computeParticleVertex;
+        private _cam_axisZ;
+        private _cam_axisY;
+        private _cam_axisX;
+        private _axisX;
+        private _axisY;
+        private _axisZ;
+        private _camera;
+        private _particle;
+        private _fakeCamPos;
+        private _rotMatrix;
+        private _invertMatrix;
+        private _rotated;
+        private _quaternion;
+        private _vertex;
+        private _normal;
+        private _yaw;
+        private _pitch;
+        private _roll;
+        private _halfroll;
+        private _halfpitch;
+        private _halfyaw;
+        private _sinRoll;
+        private _cosRoll;
+        private _sinPitch;
+        private _cosPitch;
+        private _sinYaw;
+        private _cosYaw;
+        private _w;
+        /**
+        * Creates a SPS (Solid Particle System) object.
+        * @param name the SPS name, this will be the underlying mesh name
+        * @param updatable (default true) if the SPS must be updatable or immutable
+        * @param isPickable (default false) if the solid particles must be pickable
+        */
+        constructor(name: string, scene: Scene, options?: {
+            updatable?: boolean;
+            isPickable?: boolean;
+        });
+        /**
+        * Builds the SPS underlying mesh. Returns a standard Mesh.
+        * If no model shape was added to the SPS, the return mesh is only a single triangular plane.
+        */
+        buildMesh(): Mesh;
+        private _resetCopy();
+        private _meshBuilder(p, shape, positions, meshInd, indices, meshUV, uvs, meshCol, colors, idx, idxInShape, options);
+        private _posToShape(positions);
+        private _uvsToShapeUV(uvs);
+        private _addParticle(idx, idxpos, model, shapeId, idxInShape);
+        /**
+        * Adds some particles to the SPS from the model shape.
+        * Please read the doc : http://doc.babylonjs.com/tutorials/Solid_Particle_System#create-an-immutable-sps
+        * @param mesh any Mesh object that will be used as a model for the solid particles.
+        * @param nb the number of particles to be created from this model
+        * @param positionFunction an optional javascript function to called for each particle on SPS creation
+        * @param vertexFunction an optional javascript function to called for each vertex of each particle on SPS creation
+        */
+        addShape(mesh: Mesh, nb: number, options?: {
+            positionFunction?: any;
+            vertexFunction?: any;
+        }): number;
+        private _rebuildParticle(particle);
+        /**
+        * Rebuilds the whole mesh and updates the VBO : custom positions and vertices are recomputed if needed.
+        */
+        rebuildMesh(): void;
+        /**
+        *  Sets all the particles : this method actually really updates the mesh according to the particle positions, rotations, colors, textures, etc.
+        *  This method calls updateParticle() for each particles of the SPS.
+        *  For an animated SPS, it is usually called within the render loop.
+        * @param start (default 0) the particle index in the particle array where to start to compute the particle property values
+        * @param end (default nbParticle - 1)  the particle index in the particle array where to stop to compute the particle property values
+        * @param update (default true) if the mesh must be finally updated on this call after all the particle computations.
+        */
+        setParticles(start?: number, end?: number, update?: boolean): void;
+        private _quaternionRotationYPR();
+        private _quaternionToRotationMatrix();
+        /**
+        * Disposes the SPS
+        */
+        dispose(): void;
+        /**
+        *  Visibilty helper : Recomputes the visible size according to the mesh bounding box
+        * doc : http://doc.babylonjs.com/tutorials/Solid_Particle_System#sps-visibility
+        */
+        refreshVisibleSize(): void;
+        /** Visibility helper : Sets the size of a visibility box, this sets the underlying mesh bounding box.
+        * @param size the size (float) of the visibility box
+        * note : this doesn't lock the SPS mesh bounding box.
+        * doc : http://doc.babylonjs.com/tutorials/Solid_Particle_System#sps-visibility
+        */
+        setVisibilityBox(size: number): void;
+        /**
+        * True if the SPS is set as always visible
+        */
+        /**
+        * Sets the SPS as always visible or not
+        * doc : http://doc.babylonjs.com/tutorials/Solid_Particle_System#sps-visibility
+        */
+        isAlwaysVisible: boolean;
+        /**
+        * True if the SPS visibility box is locked. The underlying mesh bounding box is then not updatable any more.
+        */
+        /**
+        * Sets the SPS visibility box as locked or not. This enables/disables the underlying mesh bounding box updates.
+        * doc : http://doc.babylonjs.com/tutorials/Solid_Particle_System#sps-visibility
+        */
+        isVisibilityBoxLocked: boolean;
+        /**
+        * Tells to setParticle() to compute the particle rotations or not.
+        * Default value : true. The SPS is faster when it's set to false.
+        * Note : the particle rotations aren't stored values, so setting computeParticleRotation to false will prevents the particle to rotate.
+        */
+        computeParticleRotation: boolean;
+        /**
+        * Tells to setParticle() to compute the particle colors or not.
+        * Default value : true. The SPS is faster when it's set to false.
+        * Note : the particle colors are stored values, so setting computeParticleColor to false will keep yet the last colors set.
+        */
+        computeParticleColor: boolean;
+        /**
+        * Tells to setParticle() to compute the particle textures or not.
+        * Default value : true. The SPS is faster when it's set to false.
+        * Note : the particle textures are stored values, so setting computeParticleTexture to false will keep yet the last colors set.
+        */
+        computeParticleTexture: boolean;
+        /**
+        * Tells to setParticle() to call the vertex function for each vertex of each particle, or not.
+        * Default value : false. The SPS is faster when it's set to false.
+        * Note : the particle custom vertex positions aren't stored values.
+        */
+        computeParticleVertex: boolean;
+        /**
+        * This function does nothing. It may be overwritten to set all the particles first values.
+        * The SPS doesn't call this function, you may have to call it by your own.
+        * doc : http://doc.babylonjs.com/tutorials/Solid_Particle_System#particle-management
+        */
+        initParticles(): void;
+        /**
+        * This function does nothing. It may be overwritten to recycle a particle.
+        * The SPS doesn't call this function, you may have to call it by your own.
+        * doc : http://doc.babylonjs.com/tutorials/Solid_Particle_System#particle-management
+        */
+        recycleParticle(particle: SolidParticle): SolidParticle;
+        /**
+        * Updates a particle : this function should  be overwritten by the user.
+        * It is called on each particle by setParticles(). This is the place to code each particle behavior.
+        * doc : http://doc.babylonjs.com/tutorials/Solid_Particle_System#particle-management
+        * ex : just set a particle position or velocity and recycle conditions
+        */
+        updateParticle(particle: SolidParticle): SolidParticle;
+        /**
+        * Updates a vertex of a particle : it can be overwritten by the user.
+        * This will be called on each vertex particle by setParticles() if computeParticleVertex is set to true only.
+        * @param particle the current particle
+        * @param vertex the current index of the current particle
+        * @param pt the index of the current vertex in the particle shape
+        * doc : http://doc.babylonjs.com/tutorials/Solid_Particle_System#update-each-particle-shape
+        * ex : just set a vertex particle position
+        */
+        updateParticleVertex(particle: SolidParticle, vertex: Vector3, pt: number): Vector3;
+        /**
+        * This will be called before any other treatment by setParticles() and will be passed three parameters.
+        * This does nothing and may be overwritten by the user.
+        * @param start the particle index in the particle array where to stop to iterate, same than the value passed to setParticle()
+        * @param stop the particle index in the particle array where to stop to iterate, same than the value passed to setParticle()
+        * @param update the boolean update value actually passed to setParticles()
+        */
+        beforeUpdateParticles(start?: number, stop?: number, update?: boolean): void;
+        /**
+        * This will be called  by setParticles() after all the other treatments and just before the actual mesh update.
+        * This will be passed three parameters.
+        * This does nothing and may be overwritten by the user.
+        * @param start the particle index in the particle array where to stop to iterate, same than the value passed to setParticle()
+        * @param stop the particle index in the particle array where to stop to iterate, same than the value passed to setParticle()
+        * @param update the boolean update value actually passed to setParticles()
+        */
+        afterUpdateParticles(start?: number, stop?: number, update?: boolean): void;
+    }
+}
+
+declare namespace BABYLON {
+    interface IPhysicsEnginePlugin {
+        name: string;
+        initialize(iterations?: number): any;
+        setGravity(gravity: Vector3): void;
+        getGravity(): Vector3;
+        runOneStep(delta: number): void;
+        registerMesh(mesh: AbstractMesh, impostor: number, options: PhysicsBodyCreationOptions): any;
+        registerMeshesAsCompound(parts: PhysicsCompoundBodyPart[], options: PhysicsBodyCreationOptions): any;
+        unregisterMesh(mesh: AbstractMesh): any;
+        applyImpulse(mesh: AbstractMesh, force: Vector3, contactPoint: Vector3): void;
+        createLink(mesh1: AbstractMesh, mesh2: AbstractMesh, pivot1: Vector3, pivot2: Vector3, options?: any): boolean;
+        dispose(): void;
+        isSupported(): boolean;
+        updateBodyPosition(mesh: AbstractMesh): void;
+        getWorldObject(): any;
+        getPhysicsBodyOfMesh(mesh: AbstractMesh): any;
+    }
+    interface PhysicsBodyCreationOptions {
+        mass: number;
+        friction: number;
+        restitution: number;
+    }
+    interface PhysicsCompoundBodyPart {
+        mesh: Mesh;
+        impostor: number;
+    }
+    class PhysicsEngine {
+        gravity: Vector3;
+        private _currentPlugin;
+        constructor(plugin?: IPhysicsEnginePlugin);
+        _initialize(gravity?: Vector3): void;
+        _runOneStep(delta: number): void;
+        _setGravity(gravity: Vector3): void;
+        _getGravity(): Vector3;
+        _registerMesh(mesh: AbstractMesh, impostor: number, options: PhysicsBodyCreationOptions): any;
+        _registerMeshesAsCompound(parts: PhysicsCompoundBodyPart[], options: PhysicsBodyCreationOptions): any;
+        _unregisterMesh(mesh: AbstractMesh): void;
+        _applyImpulse(mesh: AbstractMesh, force: Vector3, contactPoint: Vector3): void;
+        _createLink(mesh1: AbstractMesh, mesh2: AbstractMesh, pivot1: Vector3, pivot2: Vector3, options?: any): boolean;
+        _updateBodyPosition(mesh: AbstractMesh): void;
+        dispose(): void;
+        isSupported(): boolean;
+        getPhysicsBodyOfMesh(mesh: AbstractMesh): any;
+        getPhysicsPluginName(): string;
+        static NoImpostor: number;
+        static SphereImpostor: number;
+        static BoxImpostor: number;
+        static PlaneImpostor: number;
+        static MeshImpostor: number;
+        static CapsuleImpostor: number;
+        static ConeImpostor: number;
+        static CylinderImpostor: number;
+        static ConvexHullImpostor: number;
+        static HeightmapImpostor: number;
+        static Epsilon: number;
+    }
+}
+
+declare namespace BABYLON {
+    class AnaglyphPostProcess extends PostProcess {
+        constructor(name: string, ratio: number, camera: Camera, samplingMode?: number, engine?: Engine, reusable?: boolean);
+    }
+}
+
+declare namespace BABYLON {
+    class BlackAndWhitePostProcess extends PostProcess {
+        constructor(name: string, ratio: number, camera: Camera, samplingMode?: number, engine?: Engine, reusable?: boolean);
+    }
+}
+
+declare namespace BABYLON {
+    class BlurPostProcess extends PostProcess {
+        direction: Vector2;
+        blurWidth: number;
+        constructor(name: string, direction: Vector2, blurWidth: number, ratio: number, camera: Camera, samplingMode?: number, engine?: Engine, reusable?: boolean);
+    }
+}
+
+declare namespace BABYLON {
+    class ColorCorrectionPostProcess extends PostProcess {
+        private _colorTableTexture;
+        constructor(name: string, colorTableUrl: string, ratio: number, camera: Camera, samplingMode?: number, engine?: Engine, reusable?: boolean);
+    }
+}
+
+declare namespace BABYLON {
+    class ConvolutionPostProcess extends PostProcess {
+        kernel: number[];
+        constructor(name: string, kernel: number[], ratio: number, camera: Camera, samplingMode?: number, engine?: Engine, reusable?: boolean);
+        static EdgeDetect0Kernel: number[];
+        static EdgeDetect1Kernel: number[];
+        static EdgeDetect2Kernel: number[];
+        static SharpenKernel: number[];
+        static EmbossKernel: number[];
+        static GaussianKernel: number[];
+    }
+}
+
+declare namespace BABYLON {
+    class DisplayPassPostProcess extends PostProcess {
+        constructor(name: string, ratio: number, camera: Camera, samplingMode?: number, engine?: Engine, reusable?: boolean);
+    }
+}
+
+declare namespace BABYLON {
+    class FilterPostProcess extends PostProcess {
+        kernelMatrix: Matrix;
+        constructor(name: string, kernelMatrix: Matrix, ratio: number, camera?: Camera, samplingMode?: number, engine?: Engine, reusable?: boolean);
+    }
+}
+
+declare namespace BABYLON {
+    class FxaaPostProcess extends PostProcess {
+        texelWidth: number;
+        texelHeight: number;
+        constructor(name: string, ratio: number, camera: Camera, samplingMode?: number, engine?: Engine, reusable?: boolean);
+    }
+}
+
+declare namespace BABYLON {
+    class HDRRenderingPipeline extends PostProcessRenderPipeline implements IDisposable {
+        /**
+        * Public members
+        */
+        /**
+        * Gaussian blur coefficient
+        * @type {number}
+        */
+        gaussCoeff: number;
+        /**
+        * Gaussian blur mean
+        * @type {number}
+        */
+        gaussMean: number;
+        /**
+        * Gaussian blur standard deviation
+        * @type {number}
+        */
+        gaussStandDev: number;
+        /**
+        * Gaussian blur multiplier. Multiplies the blur effect
+        * @type {number}
+        */
+        gaussMultiplier: number;
+        /**
+        * Exposure, controls the overall intensity of the pipeline
+        * @type {number}
+        */
+        exposure: number;
+        /**
+        * Minimum luminance that the post-process can output. Luminance is >= 0
+        * @type {number}
+        */
+        minimumLuminance: number;
+        /**
+        * Maximum luminance that the post-process can output. Must be suprerior to minimumLuminance
+        * @type {number}
+        */
+        maximumLuminance: number;
+        /**
+        * Increase rate for luminance: eye adaptation speed to dark
+        * @type {number}
+        */
+        luminanceIncreaserate: number;
+        /**
+        * Decrease rate for luminance: eye adaptation speed to bright
+        * @type {number}
+        */
+        luminanceDecreaseRate: number;
+        /**
+        * Minimum luminance needed to compute HDR
+        * @type {number}
+        */
+        brightThreshold: number;
+        /**
+        * Private members
+        */
+        private _guassianBlurHPostProcess;
+        private _guassianBlurVPostProcess;
+        private _brightPassPostProcess;
+        private _textureAdderPostProcess;
+        private _downSampleX4PostProcess;
+        private _originalPostProcess;
+        private _hdrPostProcess;
+        private _hdrCurrentLuminance;
+        private _hdrOutputLuminance;
+        static LUM_STEPS: number;
+        private _downSamplePostProcesses;
+        private _scene;
+        private _needUpdate;
+        /**
+         * @constructor
+         * @param {string} name - The rendering pipeline name
+         * @param {BABYLON.Scene} scene - The scene linked to this pipeline
+         * @param {any} ratio - The size of the postprocesses (0.5 means that your postprocess will have a width = canvas.width 0.5 and a height = canvas.height 0.5)
+         * @param {BABYLON.PostProcess} originalPostProcess - the custom original color post-process. Must be "reusable". Can be null.
+         * @param {BABYLON.Camera[]} cameras - The array of cameras that the rendering pipeline will be attached to
+         */
+        constructor(name: string, scene: Scene, ratio: number, originalPostProcess?: PostProcess, cameras?: Camera[]);
+        /**
+        * Tells the pipeline to update its post-processes
+        */
+        update(): void;
+        /**
+        * Returns the current calculated luminance
+        */
+        getCurrentLuminance(): number;
+        /**
+        * Returns the currently drawn luminance
+        */
+        getOutputLuminance(): number;
+        /**
+        * Releases the rendering pipeline and its internal effects. Detaches pipeline from cameras
+        */
+        dispose(): void;
+        /**
+        * Creates the HDR post-process and computes the luminance adaptation
+        */
+        private _createHDRPostProcess(scene, ratio);
+        /**
+        * Texture Adder post-process
+        */
+        private _createTextureAdderPostProcess(scene, ratio);
+        /**
+        * Down sample X4 post-process
+        */
+        private _createDownSampleX4PostProcess(scene, ratio);
+        /**
+        * Bright pass post-process
+        */
+        private _createBrightPassPostProcess(scene, ratio);
+        /**
+        * Luminance generator. Creates the luminance post-process and down sample post-processes
+        */
+        private _createLuminanceGeneratorPostProcess(scene);
+        /**
+        * Gaussian blur post-processes. Horizontal and Vertical
+        */
+        private _createGaussianBlurPostProcess(scene, ratio);
+    }
+}
+
+declare namespace BABYLON {
+    class LensRenderingPipeline extends PostProcessRenderPipeline {
+        /**
+        * The chromatic aberration PostProcess id in the pipeline
+        * @type {string}
+        */
+        LensChromaticAberrationEffect: string;
+        /**
+        * The highlights enhancing PostProcess id in the pipeline
+        * @type {string}
+        */
+        HighlightsEnhancingEffect: string;
+        /**
+        * The depth-of-field PostProcess id in the pipeline
+        * @type {string}
+        */
+        LensDepthOfFieldEffect: string;
+        private _scene;
+        private _depthTexture;
+        private _grainTexture;
+        private _chromaticAberrationPostProcess;
+        private _highlightsPostProcess;
+        private _depthOfFieldPostProcess;
+        private _edgeBlur;
+        private _grainAmount;
+        private _chromaticAberration;
+        private _distortion;
+        private _highlightsGain;
+        private _highlightsThreshold;
+        private _dofDistance;
+        private _dofAperture;
+        private _dofDarken;
+        private _dofPentagon;
+        private _blurNoise;
+        /**
+         * @constructor
+         *
+         * Effect parameters are as follow:
+         * {
+         *      chromatic_aberration: number;       // from 0 to x (1 for realism)
+         *      edge_blur: number;                  // from 0 to x (1 for realism)
+         *      distortion: number;                 // from 0 to x (1 for realism)
+         *      grain_amount: number;               // from 0 to 1
+         *      grain_texture: BABYLON.Texture;     // texture to use for grain effect; if unset, use random B&W noise
+         *      dof_focus_distance: number;         // depth-of-field: focus distance; unset to disable (disabled by default)
+         *      dof_aperture: number;               // depth-of-field: focus blur bias (default: 1)
+         *      dof_darken: number;                 // depth-of-field: darken that which is out of focus (from 0 to 1, disabled by default)
+         *      dof_pentagon: boolean;              // depth-of-field: makes a pentagon-like "bokeh" effect
+         *      dof_gain: number;                   // depth-of-field: highlights gain; unset to disable (disabled by default)
+         *      dof_threshold: number;              // depth-of-field: highlights threshold (default: 1)
+         *      blur_noise: boolean;                // add a little bit of noise to the blur (default: true)
+         * }
+         * Note: if an effect parameter is unset, effect is disabled
+         *
+         * @param {string} name - The rendering pipeline name
+         * @param {object} parameters - An object containing all parameters (see above)
+         * @param {BABYLON.Scene} scene - The scene linked to this pipeline
+         * @param {number} ratio - The size of the postprocesses (0.5 means that your postprocess will have a width = canvas.width 0.5 and a height = canvas.height 0.5)
+         * @param {BABYLON.Camera[]} cameras - The array of cameras that the rendering pipeline will be attached to
+         */
+        constructor(name: string, parameters: any, scene: Scene, ratio?: number, cameras?: Camera[]);
+        setEdgeBlur(amount: number): void;
+        disableEdgeBlur(): void;
+        setGrainAmount(amount: number): void;
+        disableGrain(): void;
+        setChromaticAberration(amount: number): void;
+        disableChromaticAberration(): void;
+        setEdgeDistortion(amount: number): void;
+        disableEdgeDistortion(): void;
+        setFocusDistance(amount: number): void;
+        disableDepthOfField(): void;
+        setAperture(amount: number): void;
+        setDarkenOutOfFocus(amount: number): void;
+        enablePentagonBokeh(): void;
+        disablePentagonBokeh(): void;
+        enableNoiseBlur(): void;
+        disableNoiseBlur(): void;
+        setHighlightsGain(amount: number): void;
+        setHighlightsThreshold(amount: number): void;
+        disableHighlights(): void;
+        /**
+         * Removes the internal pipeline assets and detaches the pipeline from the scene cameras
+         */
+        dispose(disableDepthRender?: boolean): void;
+        private _createChromaticAberrationPostProcess(ratio);
+        private _createHighlightsPostProcess(ratio);
+        private _createDepthOfFieldPostProcess(ratio);
+        private _createGrainTexture();
+    }
+}
+
+declare namespace BABYLON {
+    class PassPostProcess extends PostProcess {
+        constructor(name: string, ratio: number, camera: Camera, samplingMode?: number, engine?: Engine, reusable?: boolean);
+    }
+}
+
+declare namespace BABYLON {
+    class PostProcess {
+        name: string;
+        onApply: (effect: Effect) => void;
+        onBeforeRender: (effect: Effect) => void;
+        onAfterRender: (effect: Effect) => void;
+        onSizeChanged: () => void;
+        onActivate: (camera: Camera) => void;
+        width: number;
+        height: number;
+        renderTargetSamplingMode: number;
+        clearColor: Color4;
+        private _camera;
+        private _scene;
+        private _engine;
+        private _renderRatio;
+        private _reusable;
+        private _textureType;
+        _textures: SmartArray<WebGLTexture>;
+        _currentRenderTextureInd: number;
+        private _effect;
+        private _samplers;
+        private _fragmentUrl;
+        private _parameters;
+        constructor(name: string, fragmentUrl: string, parameters: string[], samplers: string[], ratio: number | any, camera: Camera, samplingMode?: number, engine?: Engine, reusable?: boolean, defines?: string, textureType?: number);
+        updateEffect(defines?: string): void;
+        isReusable(): boolean;
+        activate(camera: Camera, sourceTexture?: WebGLTexture): void;
+        isSupported: boolean;
+        apply(): Effect;
+        dispose(camera?: Camera): void;
+    }
+}
+
+declare namespace BABYLON {
+    class PostProcessManager {
+        private _scene;
+        private _indexBuffer;
+        private _vertexDeclaration;
+        private _vertexStrideSize;
+        private _vertexBuffer;
+        constructor(scene: Scene);
+        private _prepareBuffers();
+        _prepareFrame(sourceTexture?: WebGLTexture): boolean;
+        directRender(postProcesses: PostProcess[], targetTexture?: WebGLTexture): void;
+        _finalizeFrame(doNotPresent?: boolean, targetTexture?: WebGLTexture, faceIndex?: number, postProcesses?: PostProcess[]): void;
+        dispose(): void;
+    }
+}
+
+declare namespace BABYLON {
+    class RefractionPostProcess extends PostProcess {
+        color: Color3;
+        depth: number;
+        colorLevel: number;
+        private _refRexture;
+        constructor(name: string, refractionTextureUrl: string, color: Color3, depth: number, colorLevel: number, ratio: number, camera: Camera, samplingMode?: number, engine?: Engine, reusable?: boolean);
+        dispose(camera: Camera): void;
+    }
+}
+
+declare namespace BABYLON {
+    class SSAORenderingPipeline extends PostProcessRenderPipeline {
+        /**
+        * The PassPostProcess id in the pipeline that contains the original scene color
+        * @type {string}
+        */
+        SSAOOriginalSceneColorEffect: string;
+        /**
+        * The SSAO PostProcess id in the pipeline
+        * @type {string}
+        */
+        SSAORenderEffect: string;
+        /**
+        * The horizontal blur PostProcess id in the pipeline
+        * @type {string}
+        */
+        SSAOBlurHRenderEffect: string;
+        /**
+        * The vertical blur PostProcess id in the pipeline
+        * @type {string}
+        */
+        SSAOBlurVRenderEffect: string;
+        /**
+        * The PostProcess id in the pipeline that combines the SSAO-Blur output with the original scene color (SSAOOriginalSceneColorEffect)
+        * @type {string}
+        */
+        SSAOCombineRenderEffect: string;
+        /**
+        * The output strength of the SSAO post-process. Default value is 1.0.
+        * @type {number}
+        */
+        totalStrength: number;
+        /**
+        * The radius around the analyzed pixel used by the SSAO post-process. Default value is 0.0006
+        * @type {number}
+        */
+        radius: number;
+        /**
+        * Related to fallOff, used to interpolate SSAO samples (first interpolate function input) based on the occlusion difference of each pixel
+        * Must not be equal to fallOff and superior to fallOff.
+        * Default value is 0.975
+        * @type {number}
+        */
+        area: number;
+        /**
+        * Related to area, used to interpolate SSAO samples (second interpolate function input) based on the occlusion difference of each pixel
+        * Must not be equal to area and inferior to area.
+        * Default value is 0.0
+        * @type {number}
+        */
+        fallOff: number;
+        /**
+        * The base color of the SSAO post-process
+        * The final result is "base + ssao" between [0, 1]
+        * @type {number}
+        */
+        base: number;
+        private _scene;
+        private _depthTexture;
+        private _randomTexture;
+        private _originalColorPostProcess;
+        private _ssaoPostProcess;
+        private _blurHPostProcess;
+        private _blurVPostProcess;
+        private _ssaoCombinePostProcess;
+        private _firstUpdate;
+        /**
+         * @constructor
+         * @param {string} name - The rendering pipeline name
+         * @param {BABYLON.Scene} scene - The scene linked to this pipeline
+         * @param {any} ratio - The size of the postprocesses. Can be a number shared between passes or an object for more precision: { ssaoRatio: 0.5, combineRatio: 1.0 }
+         * @param {BABYLON.Camera[]} cameras - The array of cameras that the rendering pipeline will be attached to
+         */
+        constructor(name: string, scene: Scene, ratio: any, cameras?: Camera[]);
+        /**
+         * Returns the horizontal blur PostProcess
+         * @return {BABYLON.BlurPostProcess} The horizontal blur post-process
+         */
+        getBlurHPostProcess(): BlurPostProcess;
+        /**
+         * Returns the vertical blur PostProcess
+         * @return {BABYLON.BlurPostProcess} The vertical blur post-process
+         */
+        getBlurVPostProcess(): BlurPostProcess;
+        /**
+         * Removes the internal pipeline assets and detatches the pipeline from the scene cameras
+         */
+        dispose(disableDepthRender?: boolean): void;
+        private _createSSAOPostProcess(ratio);
+        private _createSSAOCombinePostProcess(ratio);
+        private _createRandomTexture();
+    }
+}
+
+declare namespace BABYLON {
+    class StereoscopicInterlacePostProcess extends PostProcess {
+        private _stepSize;
+        constructor(name: string, camB: Camera, postProcessA: PostProcess, isStereoscopicHoriz: boolean, samplingMode?: number);
+    }
+}
+
+declare namespace BABYLON {
+    enum TonemappingOperator {
+        Hable = 0,
+        Reinhard = 1,
+        HejiDawson = 2,
+        Photographic = 3,
+    }
+    class TonemapPostProcess extends PostProcess {
+        private _operator;
+        private _exposureAdjustment;
+        constructor(name: string, operator: TonemappingOperator, exposureAdjustment: number, camera: Camera, samplingMode?: number, engine?: Engine, textureFormat?: number);
+    }
+}
+
+declare namespace BABYLON {
+    class VolumetricLightScatteringPostProcess extends PostProcess {
+        private _volumetricLightScatteringPass;
+        private _volumetricLightScatteringRTT;
+        private _viewPort;
+        private _screenCoordinates;
+        private _cachedDefines;
+        private _customMeshPosition;
+        /**
+        * Set if the post-process should use a custom position for the light source (true) or the internal mesh position (false)
+        * @type {boolean}
+        */
+        useCustomMeshPosition: boolean;
+        /**
+        * If the post-process should inverse the light scattering direction
+        * @type {boolean}
+        */
+        invert: boolean;
+        /**
+        * The internal mesh used by the post-process
+        * @type {boolean}
+        */
+        mesh: Mesh;
+        /**
+        * Set to true to use the diffuseColor instead of the diffuseTexture
+        * @type {boolean}
+        */
+        useDiffuseColor: boolean;
+        /**
+        * Array containing the excluded meshes not rendered in the internal pass
+        */
+        excludedMeshes: AbstractMesh[];
+        /**
+        * Controls the overall intensity of the post-process
+        * @type {number}
+        */
+        exposure: number;
+        /**
+        * Dissipates each sample's contribution in range [0, 1]
+        * @type {number}
+        */
+        decay: number;
+        /**
+        * Controls the overall intensity of each sample
+        * @type {number}
+        */
+        weight: number;
+        /**
+        * Controls the density of each sample
+        * @type {number}
+        */
+        density: number;
+        /**
+         * @constructor
+         * @param {string} name - The post-process name
+         * @param {any} ratio - The size of the post-process and/or internal pass (0.5 means that your postprocess will have a width = canvas.width 0.5 and a height = canvas.height 0.5)
+         * @param {BABYLON.Camera} camera - The camera that the post-process will be attached to
+         * @param {BABYLON.Mesh} mesh - The mesh used to create the light scattering
+         * @param {number} samples - The post-process quality, default 100
+         * @param {number} samplingMode - The post-process filtering mode
+         * @param {BABYLON.Engine} engine - The babylon engine
+         * @param {boolean} reusable - If the post-process is reusable
+         * @param {BABYLON.Scene} scene - The constructor needs a scene reference to initialize internal components. If "camera" is null (RenderPipelineà, "scene" must be provided
+         */
+        constructor(name: string, ratio: any, camera: Camera, mesh?: Mesh, samples?: number, samplingMode?: number, engine?: Engine, reusable?: boolean, scene?: Scene);
+        isReady(subMesh: SubMesh, useInstances: boolean): boolean;
+        /**
+         * Sets the new light position for light scattering effect
+         * @param {BABYLON.Vector3} The new custom light position
+         */
+        setCustomMeshPosition(position: Vector3): void;
+        /**
+         * Returns the light position for light scattering effect
+         * @return {BABYLON.Vector3} The custom light position
+         */
+        getCustomMeshPosition(): Vector3;
+        /**
+         * Disposes the internal assets and detaches the post-process from the camera
+         */
+        dispose(camera: Camera): void;
+        /**
+         * Returns the render target texture used by the post-process
+         * @return {BABYLON.RenderTargetTexture} The render target texture used by the post-process
+         */
+        getPass(): RenderTargetTexture;
+        private _meshExcluded(mesh);
+        private _createPass(scene, ratio);
+        private _updateMeshScreenCoordinates(scene);
+        /**
+        * Creates a default mesh for the Volumeric Light Scattering post-process
+        * @param {string} The mesh name
+        * @param {BABYLON.Scene} The scene where to create the mesh
+        * @return {BABYLON.Mesh} the default mesh
+        */
+        static CreateDefaultMesh(name: string, scene: Scene): Mesh;
+    }
+}
+
+declare namespace BABYLON {
+    class VRDistortionCorrectionPostProcess extends PostProcess {
+        aspectRatio: number;
+        private _isRightEye;
+        private _distortionFactors;
+        private _postProcessScaleFactor;
+        private _lensCenterOffset;
+        private _scaleIn;
+        private _scaleFactor;
+        private _lensCenter;
+        constructor(name: string, camera: Camera, isRightEye: boolean, vrMetrics: VRCameraMetrics);
+    }
+}
+
+declare namespace BABYLON {
+    class ReflectionProbe {
+        name: string;
+        private _scene;
+        private _renderTargetTexture;
+        private _projectionMatrix;
+        private _viewMatrix;
+        private _target;
+        private _add;
+        private _attachedMesh;
+        position: Vector3;
+        constructor(name: string, size: number, scene: Scene, generateMipMaps?: boolean);
+        refreshRate: number;
+        getScene(): Scene;
+        cubeTexture: RenderTargetTexture;
+        renderList: AbstractMesh[];
+        attachToMesh(mesh: AbstractMesh): void;
+        dispose(): void;
+    }
+}
+
+declare namespace BABYLON {
+    class BoundingBoxRenderer {
+        frontColor: Color3;
+        backColor: Color3;
+        showBackLines: boolean;
+        renderList: SmartArray<BoundingBox>;
+        private _scene;
+        private _colorShader;
+        private _vb;
+        private _ib;
+        constructor(scene: Scene);
+        private _prepareRessources();
+        reset(): void;
+        render(): void;
+        dispose(): void;
+    }
+}
+
+declare namespace BABYLON {
+    class DepthRenderer {
+        private _scene;
+        private _depthMap;
+        private _effect;
+        private _viewMatrix;
+        private _projectionMatrix;
+        private _transformMatrix;
+        private _worldViewProjection;
+        private _cachedDefines;
+        constructor(scene: Scene, type?: number);
+        isReady(subMesh: SubMesh, useInstances: boolean): boolean;
+        getDepthMap(): RenderTargetTexture;
+        dispose(): void;
+    }
+}
+
+declare namespace BABYLON {
+    class EdgesRenderer {
+        edgesWidthScalerForOrthographic: number;
+        edgesWidthScalerForPerspective: number;
+        private _source;
+        private _linesPositions;
+        private _linesNormals;
+        private _linesIndices;
+        private _epsilon;
+        private _indicesCount;
+        private _lineShader;
+        private _vb0;
+        private _vb1;
+        private _ib;
+        private _buffers;
+        private _checkVerticesInsteadOfIndices;
+        constructor(source: AbstractMesh, epsilon?: number, checkVerticesInsteadOfIndices?: boolean);
+        private _prepareRessources();
+        dispose(): void;
+        private _processEdgeForAdjacencies(pa, pb, p0, p1, p2);
+        private _processEdgeForAdjacenciesWithVertices(pa, pb, p0, p1, p2);
+        private _checkEdge(faceIndex, edge, faceNormals, p0, p1);
+        _generateEdgesLines(): void;
+        render(): void;
+    }
+}
+
+declare namespace BABYLON {
+    class OutlineRenderer {
+        private _scene;
+        private _effect;
+        private _cachedDefines;
+        constructor(scene: Scene);
+        render(subMesh: SubMesh, batch: _InstancesBatch, useOverlay?: boolean): void;
+        isReady(subMesh: SubMesh, useInstances: boolean): boolean;
+    }
+}
+
+declare namespace BABYLON {
+    class RenderingGroup {
+        index: number;
+        private _scene;
+        private _opaqueSubMeshes;
+        private _transparentSubMeshes;
+        private _alphaTestSubMeshes;
+        private _activeVertices;
+        onBeforeTransparentRendering: () => void;
+        constructor(index: number, scene: Scene);
+        render(customRenderFunction: (opaqueSubMeshes: SmartArray<SubMesh>, transparentSubMeshes: SmartArray<SubMesh>, alphaTestSubMeshes: SmartArray<SubMesh>) => void): boolean;
+        prepare(): void;
+        dispatch(subMesh: SubMesh): void;
+    }
+}
+
+declare namespace BABYLON {
+    class RenderingManager {
+        static MAX_RENDERINGGROUPS: number;
+        private _scene;
+        private _renderingGroups;
+        private _depthBufferAlreadyCleaned;
+        private _currentIndex;
+        private _currentActiveMeshes;
+        private _currentRenderParticles;
+        private _currentRenderSprites;
+        constructor(scene: Scene);
+        private _renderParticles(index, activeMeshes);
+        private _renderSprites(index);
+        private _clearDepthBuffer();
+        private _renderSpritesAndParticles();
+        render(customRenderFunction: (opaqueSubMeshes: SmartArray<SubMesh>, transparentSubMeshes: SmartArray<SubMesh>, alphaTestSubMeshes: SmartArray<SubMesh>) => void, activeMeshes: AbstractMesh[], renderParticles: boolean, renderSprites: boolean): void;
+        reset(): void;
+        dispatch(subMesh: SubMesh): void;
+    }
+}
+
+declare namespace BABYLON {
+    class Sprite {
+        name: string;
+        position: Vector3;
+        color: Color4;
+        width: number;
+        height: number;
+        angle: number;
+        cellIndex: number;
+        invertU: number;
+        invertV: number;
+        disposeWhenFinishedAnimating: boolean;
+        animations: Animation[];
+        isPickable: boolean;
+        actionManager: ActionManager;
+        private _animationStarted;
+        private _loopAnimation;
+        private _fromIndex;
+        private _toIndex;
+        private _delay;
+        private _direction;
+        private _frameCount;
+        private _manager;
+        private _time;
+        size: number;
+        constructor(name: string, manager: SpriteManager);
+        playAnimation(from: number, to: number, loop: boolean, delay: number): void;
+        stopAnimation(): void;
+        _animate(deltaTime: number): void;
+        dispose(): void;
+    }
+}
+
+declare namespace BABYLON {
+    class SpriteManager {
+        name: string;
+        cellSize: number;
+        sprites: Sprite[];
+        renderingGroupId: number;
+        layerMask: number;
+        onDispose: () => void;
+        fogEnabled: boolean;
+        isPickable: boolean;
+        private _capacity;
+        private _spriteTexture;
+        private _epsilon;
+        private _scene;
+        private _vertexDeclaration;
+        private _vertexStrideSize;
+        private _vertexBuffer;
+        private _indexBuffer;
+        private _vertices;
+        private _effectBase;
+        private _effectFog;
+        constructor(name: string, imgUrl: string, capacity: number, cellSize: number, scene: Scene, epsilon?: number, samplingMode?: number);
+        private _appendSpriteVertex(index, sprite, offsetX, offsetY, rowSize);
+        intersects(ray: Ray, camera: Camera, predicate?: (sprite: Sprite) => boolean, fastCheck?: boolean): PickingInfo;
+        render(): void;
+        dispose(): void;
+    }
+}
+
+declare namespace BABYLON.Internals {
+    class AndOrNotEvaluator {
+        static Eval(query: string, evaluateCallback: (val: any) => boolean): boolean;
+        private static _HandleParenthesisContent(parenthesisContent, evaluateCallback);
+        private static _SimplifyNegation(booleanString);
+    }
+}
+
+declare namespace BABYLON {
+    interface IAssetTask {
+        onSuccess: (task: IAssetTask) => void;
+        onError: (task: IAssetTask) => void;
+        isCompleted: boolean;
+        run(scene: Scene, onSuccess: () => void, onError: () => void): any;
+    }
+    class MeshAssetTask implements IAssetTask {
+        name: string;
+        meshesNames: any;
+        rootUrl: string;
+        sceneFilename: string;
+        loadedMeshes: Array<AbstractMesh>;
+        loadedParticleSystems: Array<ParticleSystem>;
+        loadedSkeletons: Array<Skeleton>;
+        onSuccess: (task: IAssetTask) => void;
+        onError: (task: IAssetTask) => void;
+        isCompleted: boolean;
+        constructor(name: string, meshesNames: any, rootUrl: string, sceneFilename: string);
+        run(scene: Scene, onSuccess: () => void, onError: () => void): void;
+    }
+    class TextFileAssetTask implements IAssetTask {
+        name: string;
+        url: string;
+        onSuccess: (task: IAssetTask) => void;
+        onError: (task: IAssetTask) => void;
+        isCompleted: boolean;
+        text: string;
+        constructor(name: string, url: string);
+        run(scene: Scene, onSuccess: () => void, onError: () => void): void;
+    }
+    class BinaryFileAssetTask implements IAssetTask {
+        name: string;
+        url: string;
+        onSuccess: (task: IAssetTask) => void;
+        onError: (task: IAssetTask) => void;
+        isCompleted: boolean;
+        data: ArrayBuffer;
+        constructor(name: string, url: string);
+        run(scene: Scene, onSuccess: () => void, onError: () => void): void;
+    }
+    class ImageAssetTask implements IAssetTask {
+        name: string;
+        url: string;
+        onSuccess: (task: IAssetTask) => void;
+        onError: (task: IAssetTask) => void;
+        isCompleted: boolean;
+        image: HTMLImageElement;
+        constructor(name: string, url: string);
+        run(scene: Scene, onSuccess: () => void, onError: () => void): void;
+    }
+    class TextureAssetTask implements IAssetTask {
+        name: string;
+        url: string;
+        noMipmap: boolean;
+        invertY: boolean;
+        samplingMode: number;
+        onSuccess: (task: IAssetTask) => void;
+        onError: (task: IAssetTask) => void;
+        isCompleted: boolean;
+        texture: Texture;
+        constructor(name: string, url: string, noMipmap?: boolean, invertY?: boolean, samplingMode?: number);
+        run(scene: Scene, onSuccess: () => void, onError: () => void): void;
+    }
+    class AssetsManager {
+        private _tasks;
+        private _scene;
+        private _waitingTasksCount;
+        onFinish: (tasks: IAssetTask[]) => void;
+        onTaskSuccess: (task: IAssetTask) => void;
+        onTaskError: (task: IAssetTask) => void;
+        useDefaultLoadingScreen: boolean;
+        constructor(scene: Scene);
+        addMeshTask(taskName: string, meshesNames: any, rootUrl: string, sceneFilename: string): IAssetTask;
+        addTextFileTask(taskName: string, url: string): IAssetTask;
+        addBinaryFileTask(taskName: string, url: string): IAssetTask;
+        addImageTask(taskName: string, url: string): IAssetTask;
+        addTextureTask(taskName: string, url: string, noMipmap?: boolean, invertY?: boolean, samplingMode?: number): IAssetTask;
+        private _decreaseWaitingTasksCount();
+        private _runTask(task);
+        reset(): AssetsManager;
+        load(): AssetsManager;
+    }
+}
+
+declare namespace BABYLON {
+    class Database {
+        private callbackManifestChecked;
+        private currentSceneUrl;
+        private db;
+        private enableSceneOffline;
+        private enableTexturesOffline;
+        private manifestVersionFound;
+        private mustUpdateRessources;
+        private hasReachedQuota;
+        private isSupported;
+        private idbFactory;
+        static IsUASupportingBlobStorage: boolean;
+        static IDBStorageEnabled: boolean;
+        constructor(urlToScene: string, callbackManifestChecked: (checked: boolean) => any);
+        static parseURL: (url: string) => string;
+        static ReturnFullUrlLocation: (url: string) => string;
+        checkManifestFile(): void;
+        openAsync(successCallback: any, errorCallback: any): void;
+        loadImageFromDB(url: string, image: HTMLImageElement): void;
+        private _loadImageFromDBAsync(url, image, notInDBCallback);
+        private _saveImageIntoDBAsync(url, image);
+        private _checkVersionFromDB(url, versionLoaded);
+        private _loadVersionFromDBAsync(url, callback, updateInDBCallback);
+        private _saveVersionIntoDBAsync(url, callback);
+        private loadFileFromDB(url, sceneLoaded, progressCallBack, errorCallback, useArrayBuffer?);
+        private _loadFileFromDBAsync(url, callback, notInDBCallback, useArrayBuffer?);
+        private _saveFileIntoDBAsync(url, callback, progressCallback, useArrayBuffer?);
+    }
+}
+
+declare namespace BABYLON {
+    class FilesInput {
+        private _engine;
+        private _currentScene;
+        private _canvas;
+        private _sceneLoadedCallback;
+        private _progressCallback;
+        private _additionnalRenderLoopLogicCallback;
+        private _textureLoadingCallback;
+        private _startingProcessingFilesCallback;
+        private _elementToMonitor;
+        static FilesTextures: any[];
+        static FilesToLoad: any[];
+        private _sceneFileToLoad;
+        private _filesToLoad;
+        constructor(p_engine: Engine, p_scene: Scene, p_canvas: HTMLCanvasElement, p_sceneLoadedCallback: any, p_progressCallback: any, p_additionnalRenderLoopLogicCallback: any, p_textureLoadingCallback: any, p_startingProcessingFilesCallback: any);
+        monitorElementForDragNDrop(p_elementToMonitor: HTMLElement): void;
+        private renderFunction();
+        private drag(e);
+        private drop(eventDrop);
+        loadFiles(event: any): void;
+        reload(): void;
+    }
+}
+
+declare namespace BABYLON {
+    class Gamepads {
+        private babylonGamepads;
+        private oneGamepadConnected;
+        private isMonitoring;
+        private gamepadEventSupported;
+        private gamepadSupportAvailable;
+        private _callbackGamepadConnected;
+        private static gamepadDOMInfo;
+        constructor(ongamedpadconnected: (gamepad: Gamepad) => void);
+        dispose(): void;
+        private _onGamepadConnected(evt);
+        private _addNewGamepad(gamepad);
+        private _onGamepadDisconnected(evt);
+        private _startMonitoringGamepads();
+        private _stopMonitoringGamepads();
+        private _checkGamepadsStatus();
+        private _updateGamepadObjects();
+    }
+    class StickValues {
+        x: any;
+        y: any;
+        constructor(x: any, y: any);
+    }
+    class Gamepad {
+        id: string;
+        index: number;
+        browserGamepad: any;
+        private _leftStick;
+        private _rightStick;
+        private _onleftstickchanged;
+        private _onrightstickchanged;
+        constructor(id: string, index: number, browserGamepad: any);
+        onleftstickchanged(callback: (values: StickValues) => void): void;
+        onrightstickchanged(callback: (values: StickValues) => void): void;
+        leftStick: StickValues;
+        rightStick: StickValues;
+        update(): void;
+    }
+    class GenericPad extends Gamepad {
+        id: string;
+        index: number;
+        gamepad: any;
+        private _buttons;
+        private _onbuttondown;
+        private _onbuttonup;
+        onbuttondown(callback: (buttonPressed: number) => void): void;
+        onbuttonup(callback: (buttonReleased: number) => void): void;
+        constructor(id: string, index: number, gamepad: any);
+        private _setButtonValue(newValue, currentValue, buttonIndex);
+        update(): void;
+    }
+    enum Xbox360Button {
+        A = 0,
+        B = 1,
+        X = 2,
+        Y = 3,
+        Start = 4,
+        Back = 5,
+        LB = 6,
+        RB = 7,
+        LeftStick = 8,
+        RightStick = 9,
+    }
+    enum Xbox360Dpad {
+        Up = 0,
+        Down = 1,
+        Left = 2,
+        Right = 3,
+    }
+    class Xbox360Pad extends Gamepad {
+        private _leftTrigger;
+        private _rightTrigger;
+        private _onlefttriggerchanged;
+        private _onrighttriggerchanged;
+        private _onbuttondown;
+        private _onbuttonup;
+        private _ondpaddown;
+        private _ondpadup;
+        private _buttonA;
+        private _buttonB;
+        private _buttonX;
+        private _buttonY;
+        private _buttonBack;
+        private _buttonStart;
+        private _buttonLB;
+        private _buttonRB;
+        private _buttonLeftStick;
+        private _buttonRightStick;
+        private _dPadUp;
+        private _dPadDown;
+        private _dPadLeft;
+        private _dPadRight;
+        onlefttriggerchanged(callback: (value: number) => void): void;
+        onrighttriggerchanged(callback: (value: number) => void): void;
+        leftTrigger: number;
+        rightTrigger: number;
+        onbuttondown(callback: (buttonPressed: Xbox360Button) => void): void;
+        onbuttonup(callback: (buttonReleased: Xbox360Button) => void): void;
+        ondpaddown(callback: (dPadPressed: Xbox360Dpad) => void): void;
+        ondpadup(callback: (dPadReleased: Xbox360Dpad) => void): void;
+        private _setButtonValue(newValue, currentValue, buttonType);
+        private _setDPadValue(newValue, currentValue, buttonType);
+        buttonA: number;
+        buttonB: number;
+        buttonX: number;
+        buttonY: number;
+        buttonStart: number;
+        buttonBack: number;
+        buttonLB: number;
+        buttonRB: number;
+        buttonLeftStick: number;
+        buttonRightStick: number;
+        dPadUp: number;
+        dPadDown: number;
+        dPadLeft: number;
+        dPadRight: number;
+        update(): void;
+    }
+}
+interface Navigator {
+    getGamepads(func?: any): any;
+    webkitGetGamepads(func?: any): any;
+    msGetGamepads(func?: any): any;
+    webkitGamepads(func?: any): any;
+}
+
+declare namespace BABYLON {
+    interface ILoadingScreen {
+        displayLoadingUI: () => void;
+        hideLoadingUI: () => void;
+        loadingUIBackgroundColor: string;
+        loadingUIText: string;
+    }
+    class DefaultLoadingScreen implements ILoadingScreen {
+        private _renderingCanvas;
+        private _loadingText;
+        private _loadingDivBackgroundColor;
+        private _loadingDiv;
+        private _loadingTextDiv;
+        constructor(_renderingCanvas: HTMLCanvasElement, _loadingText?: string, _loadingDivBackgroundColor?: string);
+        displayLoadingUI(): void;
+        hideLoadingUI(): void;
+        loadingUIText: string;
+        loadingUIBackgroundColor: string;
+        private _resizeLoadingUI;
+    }
+}
+
+declare namespace BABYLON {
+    class SceneOptimization {
+        priority: number;
+        apply: (scene: Scene) => boolean;
+        constructor(priority?: number);
+    }
+    class TextureOptimization extends SceneOptimization {
+        priority: number;
+        maximumSize: number;
+        constructor(priority?: number, maximumSize?: number);
+        apply: (scene: Scene) => boolean;
+    }
+    class HardwareScalingOptimization extends SceneOptimization {
+        priority: number;
+        maximumScale: number;
+        private _currentScale;
+        constructor(priority?: number, maximumScale?: number);
+        apply: (scene: Scene) => boolean;
+    }
+    class ShadowsOptimization extends SceneOptimization {
+        apply: (scene: Scene) => boolean;
+    }
+    class PostProcessesOptimization extends SceneOptimization {
+        apply: (scene: Scene) => boolean;
+    }
+    class LensFlaresOptimization extends SceneOptimization {
+        apply: (scene: Scene) => boolean;
+    }
+    class ParticlesOptimization extends SceneOptimization {
+        apply: (scene: Scene) => boolean;
+    }
+    class RenderTargetsOptimization extends SceneOptimization {
+        apply: (scene: Scene) => boolean;
+    }
+    class MergeMeshesOptimization extends SceneOptimization {
+        static _UpdateSelectionTree: boolean;
+        static UpdateSelectionTree: boolean;
+        private _canBeMerged;
+        apply: (scene: Scene, updateSelectionTree?: boolean) => boolean;
+    }
+    class SceneOptimizerOptions {
+        targetFrameRate: number;
+        trackerDuration: number;
+        optimizations: SceneOptimization[];
+        constructor(targetFrameRate?: number, trackerDuration?: number);
+        static LowDegradationAllowed(targetFrameRate?: number): SceneOptimizerOptions;
+        static ModerateDegradationAllowed(targetFrameRate?: number): SceneOptimizerOptions;
+        static HighDegradationAllowed(targetFrameRate?: number): SceneOptimizerOptions;
+    }
+    class SceneOptimizer {
+        static _CheckCurrentState(scene: Scene, options: SceneOptimizerOptions, currentPriorityLevel: number, onSuccess?: () => void, onFailure?: () => void): void;
+        static OptimizeAsync(scene: Scene, options?: SceneOptimizerOptions, onSuccess?: () => void, onFailure?: () => void): void;
+    }
+}
+
+declare namespace BABYLON {
+    class SceneSerializer {
+        static Serialize(scene: Scene): any;
+        static SerializeMesh(toSerialize: any, withParents?: boolean, withChildren?: boolean): any;
+    }
+}
+
+declare namespace BABYLON {
+    class SmartArray<T> {
+        data: Array<T>;
+        length: number;
+        private _id;
+        private _duplicateId;
+        constructor(capacity: number);
+        push(value: any): void;
+        pushNoDuplicate(value: any): void;
+        sort(compareFn: any): void;
+        reset(): void;
+        concat(array: any): void;
+        concatWithNoDuplicate(array: any): void;
+        indexOf(value: any): number;
+        private static _GlobalId;
+    }
+}
+
+declare namespace BABYLON {
+    class SmartCollection {
+        count: number;
+        items: any;
+        private _keys;
+        private _initialCapacity;
+        constructor(capacity?: number);
+        add(key: any, item: any): number;
+        remove(key: any): number;
+        removeItemOfIndex(index: number): number;
+        indexOf(key: any): number;
+        item(key: any): any;
+        getAllKeys(): any[];
+        getKeyByIndex(index: number): any;
+        getItemByIndex(index: number): any;
+        empty(): void;
+        forEach(block: (item: any) => void): void;
+    }
+}
+
+declare namespace BABYLON {
+    class Tags {
+        static EnableFor(obj: any): void;
+        static DisableFor(obj: any): void;
+        static HasTags(obj: any): boolean;
+        static GetTags(obj: any, asString?: boolean): any;
+        static AddTagsTo(obj: any, tagsString: string): void;
+        static _AddTagTo(obj: any, tag: string): void;
+        static RemoveTagsFrom(obj: any, tagsString: string): void;
+        static _RemoveTagFrom(obj: any, tag: string): void;
+        static MatchesQuery(obj: any, tagsQuery: string): boolean;
+    }
+}
+
+declare namespace BABYLON.Internals {
+    interface DDSInfo {
+        width: number;
+        height: number;
+        mipmapCount: number;
+        isFourCC: boolean;
+        isRGB: boolean;
+        isLuminance: boolean;
+        isCube: boolean;
+    }
+    class DDSTools {
+        static GetDDSInfo(arrayBuffer: any): DDSInfo;
+        private static GetRGBAArrayBuffer(width, height, dataOffset, dataLength, arrayBuffer);
+        private static GetRGBArrayBuffer(width, height, dataOffset, dataLength, arrayBuffer);
+        private static GetLuminanceArrayBuffer(width, height, dataOffset, dataLength, arrayBuffer);
+        static UploadDDSLevels(gl: WebGLRenderingContext, ext: any, arrayBuffer: any, info: DDSInfo, loadMipmaps: boolean, faces: number): void;
+    }
+}
+
+declare namespace BABYLON.Internals {
+    class TGATools {
+        private static _TYPE_NO_DATA;
+        private static _TYPE_INDEXED;
+        private static _TYPE_RGB;
+        private static _TYPE_GREY;
+        private static _TYPE_RLE_INDEXED;
+        private static _TYPE_RLE_RGB;
+        private static _TYPE_RLE_GREY;
+        private static _ORIGIN_MASK;
+        private static _ORIGIN_SHIFT;
+        private static _ORIGIN_BL;
+        private static _ORIGIN_BR;
+        private static _ORIGIN_UL;
+        private static _ORIGIN_UR;
+        static GetTGAHeader(data: Uint8Array): any;
+        static UploadContent(gl: WebGLRenderingContext, data: Uint8Array): void;
+        static _getImageData8bits(header: any, palettes: Uint8Array, pixel_data: Uint8Array, y_start: number, y_step: number, y_end: number, x_start: number, x_step: number, x_end: number): Uint8Array;
+        static _getImageData16bits(header: any, palettes: Uint8Array, pixel_data: Uint8Array, y_start: number, y_step: number, y_end: number, x_start: number, x_step: number, x_end: number): Uint8Array;
+        static _getImageData24bits(header: any, palettes: Uint8Array, pixel_data: Uint8Array, y_start: number, y_step: number, y_end: number, x_start: number, x_step: number, x_end: number): Uint8Array;
+        static _getImageData32bits(header: any, palettes: Uint8Array, pixel_data: Uint8Array, y_start: number, y_step: number, y_end: number, x_start: number, x_step: number, x_end: number): Uint8Array;
+        static _getImageDataGrey8bits(header: any, palettes: Uint8Array, pixel_data: Uint8Array, y_start: number, y_step: number, y_end: number, x_start: number, x_step: number, x_end: number): Uint8Array;
+        static _getImageDataGrey16bits(header: any, palettes: Uint8Array, pixel_data: Uint8Array, y_start: number, y_step: number, y_end: number, x_start: number, x_step: number, x_end: number): Uint8Array;
+    }
+}
+
+declare namespace BABYLON {
+    interface IAnimatable {
+        animations: Array<Animation>;
+    }
+    interface ISize {
+        width: number;
+        height: number;
+    }
+    class Tools {
+        static BaseUrl: string;
+        static CorsBehavior: any;
+        static UseFallbackTexture: boolean;
+        static Instantiate(className: string): any;
+        static GetConstructorName(obj: any): any;
+        static ToHex(i: number): string;
+        static SetImmediate(action: () => void): void;
+        static IsExponentOfTwo(value: number): boolean;
+        static GetExponentOfTwo(value: number, max: number): number;
+        static GetFilename(path: string): string;
+        static GetDOMTextContent(element: HTMLElement): string;
+        static ToDegrees(angle: number): number;
+        static ToRadians(angle: number): number;
+        static EncodeArrayBufferTobase64(buffer: ArrayBuffer): string;
+        static ExtractMinAndMaxIndexed(positions: number[] | Float32Array, indices: number[] | Int32Array, indexStart: number, indexCount: number): {
+            minimum: Vector3;
+            maximum: Vector3;
+        };
+        static ExtractMinAndMax(positions: number[] | Float32Array, start: number, count: number): {
+            minimum: Vector3;
+            maximum: Vector3;
+        };
+        static MakeArray(obj: any, allowsNullUndefined?: boolean): Array<any>;
+        static GetPointerPrefix(): string;
+        static QueueNewFrame(func: any): void;
+        static RequestFullscreen(element: any): void;
+        static ExitFullscreen(): void;
+        static CleanUrl(url: string): string;
+        static LoadImage(url: any, onload: any, onerror: any, database: any): HTMLImageElement;
+        static LoadFile(url: string, callback: (data: any) => void, progressCallBack?: () => void, database?: any, useArrayBuffer?: boolean, onError?: () => void): void;
+        static ReadFileAsDataURL(fileToLoad: any, callback: any, progressCallback: any): void;
+        static ReadFile(fileToLoad: any, callback: any, progressCallBack: any, useArrayBuffer?: boolean): void;
+        static FileAsURL(content: string): string;
+        static Clamp(value: number, min?: number, max?: number): number;
+        static Sign(value: number): number;
+        static Format(value: number, decimals?: number): string;
+        static CheckExtends(v: Vector3, min: Vector3, max: Vector3): void;
+        static WithinEpsilon(a: number, b: number, epsilon?: number): boolean;
+        static DeepCopy(source: any, destination: any, doNotCopyList?: string[], mustCopyList?: string[]): void;
+        static IsEmpty(obj: any): boolean;
+        static RegisterTopRootEvents(events: {
+            name: string;
+            handler: EventListener;
+        }[]): void;
+        static UnregisterTopRootEvents(events: {
+            name: string;
+            handler: EventListener;
+        }[]): void;
+        static DumpFramebuffer(width: number, height: number, engine: Engine, successCallback?: (data: string) => void): void;
+        static CreateScreenshot(engine: Engine, camera: Camera, size: any, successCallback?: (data: string) => void): void;
+        static ValidateXHRData(xhr: XMLHttpRequest, dataType?: number): boolean;
+        private static _NoneLogLevel;
+        private static _MessageLogLevel;
+        private static _WarningLogLevel;
+        private static _ErrorLogLevel;
+        private static _LogCache;
+        static errorsCount: number;
+        static OnNewCacheEntry: (entry: string) => void;
+        static NoneLogLevel: number;
+        static MessageLogLevel: number;
+        static WarningLogLevel: number;
+        static ErrorLogLevel: number;
+        static AllLogLevel: number;
+        private static _AddLogEntry(entry);
+        private static _FormatMessage(message);
+        static Log: (message: string) => void;
+        private static _LogDisabled(message);
+        private static _LogEnabled(message);
+        static Warn: (message: string) => void;
+        private static _WarnDisabled(message);
+        private static _WarnEnabled(message);
+        static Error: (message: string) => void;
+        private static _ErrorDisabled(message);
+        private static _ErrorEnabled(message);
+        static LogCache: string;
+        static ClearLogCache(): void;
+        static LogLevels: number;
+        private static _PerformanceNoneLogLevel;
+        private static _PerformanceUserMarkLogLevel;
+        private static _PerformanceConsoleLogLevel;
+        private static _performance;
+        static PerformanceNoneLogLevel: number;
+        static PerformanceUserMarkLogLevel: number;
+        static PerformanceConsoleLogLevel: number;
+        static PerformanceLogLevel: number;
+        static _StartPerformanceCounterDisabled(counterName: string, condition?: boolean): void;
+        static _EndPerformanceCounterDisabled(counterName: string, condition?: boolean): void;
+        static _StartUserMark(counterName: string, condition?: boolean): void;
+        static _EndUserMark(counterName: string, condition?: boolean): void;
+        static _StartPerformanceConsole(counterName: string, condition?: boolean): void;
+        static _EndPerformanceConsole(counterName: string, condition?: boolean): void;
+        static StartPerformanceCounter: (counterName: string, condition?: boolean) => void;
+        static EndPerformanceCounter: (counterName: string, condition?: boolean) => void;
+        static Now: number;
+    }
+    /**
+     * An implementation of a loop for asynchronous functions.
+     */
+    class AsyncLoop {
+        iterations: number;
+        private _fn;
+        private _successCallback;
+        index: number;
+        private _done;
+        /**
+         * Constroctor.
+         * @param iterations the number of iterations.
+         * @param _fn the function to run each iteration
+         * @param _successCallback the callback that will be called upon succesful execution
+         * @param offset starting offset.
+         */
+        constructor(iterations: number, _fn: (asyncLoop: AsyncLoop) => void, _successCallback: () => void, offset?: number);
+        /**
+         * Execute the next iteration. Must be called after the last iteration was finished.
+         */
+        executeNext(): void;
+        /**
+         * Break the loop and run the success callback.
+         */
+        breakLoop(): void;
+        /**
+         * Helper function
+         */
+        static Run(iterations: number, _fn: (asyncLoop: AsyncLoop) => void, _successCallback: () => void, offset?: number): AsyncLoop;
+        /**
+         * A for-loop that will run a given number of iterations synchronous and the rest async.
+         * @param iterations total number of iterations
+         * @param syncedIterations number of synchronous iterations in each async iteration.
+         * @param fn the function to call each iteration.
+         * @param callback a success call back that will be called when iterating stops.
+         * @param breakFunction a break condition (optional)
+         * @param timeout timeout settings for the setTimeout function. default - 0.
+         * @constructor
+         */
+        static SyncAsyncForLoop(iterations: number, syncedIterations: number, fn: (iteration: number) => void, callback: () => void, breakFunction?: () => boolean, timeout?: number): void;
+    }
+}
+
+declare namespace BABYLON {
+    enum JoystickAxis {
+        X = 0,
+        Y = 1,
+        Z = 2,
+    }
+    class VirtualJoystick {
+        reverseLeftRight: boolean;
+        reverseUpDown: boolean;
+        deltaPosition: Vector3;
+        pressed: boolean;
+        private static _globalJoystickIndex;
+        private static vjCanvas;
+        private static vjCanvasContext;
+        private static vjCanvasWidth;
+        private static vjCanvasHeight;
+        private static halfWidth;
+        private static halfHeight;
+        private _action;
+        private _axisTargetedByLeftAndRight;
+        private _axisTargetedByUpAndDown;
+        private _joystickSensibility;
+        private _inversedSensibility;
+        private _rotationSpeed;
+        private _inverseRotationSpeed;
+        private _rotateOnAxisRelativeToMesh;
+        private _joystickPointerID;
+        private _joystickColor;
+        private _joystickPointerPos;
+        private _joystickPreviousPointerPos;
+        private _joystickPointerStartPos;
+        private _deltaJoystickVector;
+        private _leftJoystick;
+        private _joystickIndex;
+        private _touches;
+        private _onPointerDownHandlerRef;
+        private _onPointerMoveHandlerRef;
+        private _onPointerUpHandlerRef;
+        private _onPointerOutHandlerRef;
+        private _onResize;
+        constructor(leftJoystick?: boolean);
+        setJoystickSensibility(newJoystickSensibility: number): void;
+        private _onPointerDown(e);
+        private _onPointerMove(e);
+        private _onPointerUp(e);
+        /**
+        * Change the color of the virtual joystick
+        * @param newColor a string that must be a CSS color value (like "red") or the hexa value (like "#FF0000")
+        */
+        setJoystickColor(newColor: string): void;
+        setActionOnTouch(action: () => any): void;
+        setAxisForLeftRight(axis: JoystickAxis): void;
+        setAxisForUpDown(axis: JoystickAxis): void;
+        private _clearCanvas();
+        private _drawVirtualJoystick();
+        releaseCanvas(): void;
+    }
+}
+
+declare namespace BABYLON {
+    class VRDeviceOrientationFreeCamera extends FreeCamera {
+        _alpha: number;
+        _beta: number;
+        _gamma: number;
+        private _offsetOrientation;
+        private _deviceOrientationHandler;
+        constructor(name: string, position: Vector3, scene: Scene, compensateDistortion?: boolean);
+        _onOrientationEvent(evt: DeviceOrientationEvent): void;
+        attachControl(element: HTMLElement, noPreventDefault?: boolean): void;
+        detachControl(element: HTMLElement): void;
+    }
+}
+
+declare var HMDVRDevice: any;
+declare var PositionSensorVRDevice: any;
+declare namespace BABYLON {
+    class WebVRFreeCamera extends FreeCamera {
+        _hmdDevice: any;
+        _sensorDevice: any;
+        _cacheState: any;
+        _cacheQuaternion: Quaternion;
+        _cacheRotation: Vector3;
+        _vrEnabled: boolean;
+        constructor(name: string, position: Vector3, scene: Scene, compensateDistortion?: boolean);
+        private _getWebVRDevices(devices);
+        _checkInputs(): void;
+        attachControl(element: HTMLElement, noPreventDefault?: boolean): void;
+        detachControl(element: HTMLElement): void;
+    }
+}
+
+declare namespace BABYLON {
+    interface IOctreeContainer<T> {
+        blocks: Array<OctreeBlock<T>>;
+    }
+    class Octree<T> {
+        maxDepth: number;
+        blocks: Array<OctreeBlock<T>>;
+        dynamicContent: T[];
+        private _maxBlockCapacity;
+        private _selectionContent;
+        private _creationFunc;
+        constructor(creationFunc: (entry: T, block: OctreeBlock<T>) => void, maxBlockCapacity?: number, maxDepth?: number);
+        update(worldMin: Vector3, worldMax: Vector3, entries: T[]): void;
+        addMesh(entry: T): void;
+        select(frustumPlanes: Plane[], allowDuplicate?: boolean): SmartArray<T>;
+        intersects(sphereCenter: Vector3, sphereRadius: number, allowDuplicate?: boolean): SmartArray<T>;
+        intersectsRay(ray: Ray): SmartArray<T>;
+        static _CreateBlocks<T>(worldMin: Vector3, worldMax: Vector3, entries: T[], maxBlockCapacity: number, currentDepth: number, maxDepth: number, target: IOctreeContainer<T>, creationFunc: (entry: T, block: OctreeBlock<T>) => void): void;
+        static CreationFuncForMeshes: (entry: AbstractMesh, block: OctreeBlock<AbstractMesh>) => void;
+        static CreationFuncForSubMeshes: (entry: SubMesh, block: OctreeBlock<SubMesh>) => void;
+    }
+}
+
+declare namespace BABYLON {
+    class OctreeBlock<T> {
+        entries: T[];
+        blocks: Array<OctreeBlock<T>>;
+        private _depth;
+        private _maxDepth;
+        private _capacity;
+        private _minPoint;
+        private _maxPoint;
+        private _boundingVectors;
+        private _creationFunc;
+        constructor(minPoint: Vector3, maxPoint: Vector3, capacity: number, depth: number, maxDepth: number, creationFunc: (entry: T, block: OctreeBlock<T>) => void);
+        capacity: number;
+        minPoint: Vector3;
+        maxPoint: Vector3;
+        addEntry(entry: T): void;
+        addEntries(entries: T[]): void;
+        select(frustumPlanes: Plane[], selection: SmartArray<T>, allowDuplicate?: boolean): void;
+        intersects(sphereCenter: Vector3, sphereRadius: number, selection: SmartArray<T>, allowDuplicate?: boolean): void;
+        intersectsRay(ray: Ray, selection: SmartArray<T>): void;
+        createInnerBlocks(): void;
+    }
+}
+
+declare namespace BABYLON {
+    class ShadowGenerator {
+        private static _FILTER_NONE;
+        private static _FILTER_VARIANCESHADOWMAP;
+        private static _FILTER_POISSONSAMPLING;
+        private static _FILTER_BLURVARIANCESHADOWMAP;
+        static FILTER_NONE: number;
+        static FILTER_VARIANCESHADOWMAP: number;
+        static FILTER_POISSONSAMPLING: number;
+        static FILTER_BLURVARIANCESHADOWMAP: number;
+        private _filter;
+        blurScale: number;
+        private _blurBoxOffset;
+        private _bias;
+        private _lightDirection;
+        forceBackFacesOnly: boolean;
+        bias: number;
+        blurBoxOffset: number;
+        filter: number;
+        useVarianceShadowMap: boolean;
+        usePoissonSampling: boolean;
+        useBlurVarianceShadowMap: boolean;
+        private _light;
+        private _scene;
+        private _shadowMap;
+        private _shadowMap2;
+        private _darkness;
+        private _transparencyShadow;
+        private _effect;
+        private _viewMatrix;
+        private _projectionMatrix;
+        private _transformMatrix;
+        private _worldViewProjection;
+        private _cachedPosition;
+        private _cachedDirection;
+        private _cachedDefines;
+        private _currentRenderID;
+        private _downSamplePostprocess;
+        private _boxBlurPostprocess;
+        private _mapSize;
+        private _currentFaceIndex;
+        private _currentFaceIndexCache;
+        constructor(mapSize: number, light: IShadowLight);
+        isReady(subMesh: SubMesh, useInstances: boolean): boolean;
+        getShadowMap(): RenderTargetTexture;
+        getShadowMapForRendering(): RenderTargetTexture;
+        getLight(): IShadowLight;
+        getTransformMatrix(): Matrix;
+        getDarkness(): number;
+        setDarkness(darkness: number): void;
+        setTransparencyShadow(hasShadow: boolean): void;
+        private _packHalf(depth);
+        dispose(): void;
+        serialize(): any;
+        static Parse(parsedShadowGenerator: any, scene: Scene): ShadowGenerator;
+    }
+}
+
+declare namespace BABYLON.Internals {
+}
+
+declare namespace BABYLON {
+    class BaseTexture {
+        name: string;
+        delayLoadState: number;
+        hasAlpha: boolean;
+        getAlphaFromRGB: boolean;
+        level: number;
+        isCube: boolean;
+        isRenderTarget: boolean;
+        animations: Animation[];
+        onDispose: () => void;
+        coordinatesIndex: number;
+        coordinatesMode: number;
+        wrapU: number;
+        wrapV: number;
+        anisotropicFilteringLevel: number;
+        _cachedAnisotropicFilteringLevel: number;
+        private _scene;
+        _texture: WebGLTexture;
+        constructor(scene: Scene);
+        getScene(): Scene;
+        getTextureMatrix(): Matrix;
+        getReflectionTextureMatrix(): Matrix;
+        getInternalTexture(): WebGLTexture;
+        isReady(): boolean;
+        getSize(): ISize;
+        getBaseSize(): ISize;
+        scale(ratio: number): void;
+        canRescale: boolean;
+        _removeFromCache(url: string, noMipmap: boolean): void;
+        _getFromCache(url: string, noMipmap: boolean, sampling?: number): WebGLTexture;
+        delayLoad(): void;
+        clone(): BaseTexture;
+        releaseInternalTexture(): void;
+        dispose(): void;
+        serialize(): any;
+    }
+}
+
+declare namespace BABYLON {
+    class CubeTexture extends BaseTexture {
+        url: string;
+        coordinatesMode: number;
+        private _noMipmap;
+        private _files;
+        private _extensions;
+        private _textureMatrix;
+        static CreateFromImages(files: string[], scene: Scene, noMipmap?: boolean): CubeTexture;
+        constructor(rootUrl: string, scene: Scene, extensions?: string[], noMipmap?: boolean, files?: string[]);
+        clone(): CubeTexture;
+        delayLoad(): void;
+        getReflectionTextureMatrix(): Matrix;
+        static Parse(parsedTexture: any, scene: Scene, rootUrl: string): CubeTexture;
+        serialize(): any;
+    }
+}
+
+declare namespace BABYLON {
+    class DynamicTexture extends Texture {
+        private _generateMipMaps;
+        private _canvas;
+        private _context;
+        constructor(name: string, options: any, scene: Scene, generateMipMaps: boolean, samplingMode?: number);
+        canRescale: boolean;
+        scale(ratio: number): void;
+        getContext(): CanvasRenderingContext2D;
+        clear(): void;
+        update(invertY?: boolean): void;
+        drawText(text: string, x: number, y: number, font: string, color: string, clearColor: string, invertY?: boolean, update?: boolean): void;
+        clone(): DynamicTexture;
+    }
+}
+
+declare namespace BABYLON {
+    class MirrorTexture extends RenderTargetTexture {
+        mirrorPlane: Plane;
+        private _transformMatrix;
+        private _mirrorMatrix;
+        private _savedViewMatrix;
+        constructor(name: string, size: number, scene: Scene, generateMipMaps?: boolean);
+        clone(): MirrorTexture;
+        serialize(): any;
+    }
+}
+
+declare namespace BABYLON {
+    class RawTexture extends Texture {
+        format: number;
+        constructor(data: ArrayBufferView, width: number, height: number, format: number, scene: Scene, generateMipMaps?: boolean, invertY?: boolean, samplingMode?: number);
+        update(data: ArrayBufferView): void;
+        static CreateLuminanceTexture(data: ArrayBufferView, width: number, height: number, scene: Scene, generateMipMaps?: boolean, invertY?: boolean, samplingMode?: number): RawTexture;
+        static CreateLuminanceAlphaTexture(data: ArrayBufferView, width: number, height: number, scene: Scene, generateMipMaps?: boolean, invertY?: boolean, samplingMode?: number): RawTexture;
+        static CreateAlphaTexture(data: ArrayBufferView, width: number, height: number, scene: Scene, generateMipMaps?: boolean, invertY?: boolean, samplingMode?: number): RawTexture;
+        static CreateRGBTexture(data: ArrayBufferView, width: number, height: number, scene: Scene, generateMipMaps?: boolean, invertY?: boolean, samplingMode?: number): RawTexture;
+        static CreateRGBATexture(data: ArrayBufferView, width: number, height: number, scene: Scene, generateMipMaps?: boolean, invertY?: boolean, samplingMode?: number): RawTexture;
+    }
+}
+
+declare namespace BABYLON {
+    class RenderTargetTexture extends Texture {
+        isCube: boolean;
+        static _REFRESHRATE_RENDER_ONCE: number;
+        static _REFRESHRATE_RENDER_ONEVERYFRAME: number;
+        static _REFRESHRATE_RENDER_ONEVERYTWOFRAMES: number;
+        static REFRESHRATE_RENDER_ONCE: number;
+        static REFRESHRATE_RENDER_ONEVERYFRAME: number;
+        static REFRESHRATE_RENDER_ONEVERYTWOFRAMES: number;
+        renderList: AbstractMesh[];
+        renderParticles: boolean;
+        renderSprites: boolean;
+        coordinatesMode: number;
+        onBeforeRender: (faceIndex: number) => void;
+        onAfterRender: (faceIndex: number) => void;
+        onAfterUnbind: () => void;
+        onClear: (engine: Engine) => void;
+        activeCamera: Camera;
+        customRenderFunction: (opaqueSubMeshes: SmartArray<SubMesh>, transparentSubMeshes: SmartArray<SubMesh>, alphaTestSubMeshes: SmartArray<SubMesh>, beforeTransparents?: () => void) => void;
+        private _size;
+        _generateMipMaps: boolean;
+        private _renderingManager;
+        _waitingRenderList: string[];
+        private _doNotChangeAspectRatio;
+        private _currentRefreshId;
+        private _refreshRate;
+        private _textureMatrix;
+        constructor(name: string, size: any, scene: Scene, generateMipMaps?: boolean, doNotChangeAspectRatio?: boolean, type?: number, isCube?: boolean);
+        resetRefreshCounter(): void;
+        refreshRate: number;
+        _shouldRender(): boolean;
+        isReady(): boolean;
+        getRenderSize(): number;
+        canRescale: boolean;
+        scale(ratio: number): void;
+        getReflectionTextureMatrix(): Matrix;
+        resize(size: any, generateMipMaps?: boolean): void;
+        render(useCameraPostProcess?: boolean, dumpForDebug?: boolean): void;
+        renderToTarget(faceIndex: number, currentRenderList: AbstractMesh[], useCameraPostProcess: boolean, dumpForDebug: boolean): void;
+        clone(): RenderTargetTexture;
+        serialize(): any;
+    }
+}
+
+declare namespace BABYLON {
+    class Texture extends BaseTexture {
+        static NEAREST_SAMPLINGMODE: number;
+        static BILINEAR_SAMPLINGMODE: number;
+        static TRILINEAR_SAMPLINGMODE: number;
+        static EXPLICIT_MODE: number;
+        static SPHERICAL_MODE: number;
+        static PLANAR_MODE: number;
+        static CUBIC_MODE: number;
+        static PROJECTION_MODE: number;
+        static SKYBOX_MODE: number;
+        static INVCUBIC_MODE: number;
+        static EQUIRECTANGULAR_MODE: number;
+        static FIXED_EQUIRECTANGULAR_MODE: number;
+        static CLAMP_ADDRESSMODE: number;
+        static WRAP_ADDRESSMODE: number;
+        static MIRROR_ADDRESSMODE: number;
+        url: string;
+        uOffset: number;
+        vOffset: number;
+        uScale: number;
+        vScale: number;
+        uAng: number;
+        vAng: number;
+        wAng: number;
+        private _noMipmap;
+        _invertY: boolean;
+        private _rowGenerationMatrix;
+        private _cachedTextureMatrix;
+        private _projectionModeMatrix;
+        private _t0;
+        private _t1;
+        private _t2;
+        private _cachedUOffset;
+        private _cachedVOffset;
+        private _cachedUScale;
+        private _cachedVScale;
+        private _cachedUAng;
+        private _cachedVAng;
+        private _cachedWAng;
+        private _cachedCoordinatesMode;
+        _samplingMode: number;
+        private _buffer;
+        private _deleteBuffer;
+        constructor(url: string, scene: Scene, noMipmap?: boolean, invertY?: boolean, samplingMode?: number, onLoad?: () => void, onError?: () => void, buffer?: any, deleteBuffer?: boolean);
+        delayLoad(): void;
+        updateSamplingMode(samplingMode: number): void;
+        private _prepareRowForTextureGeneration(x, y, z, t);
+        getTextureMatrix(): Matrix;
+        getReflectionTextureMatrix(): Matrix;
+        clone(): Texture;
+        serialize(): any;
+        static CreateFromBase64String(data: string, name: string, scene: Scene, noMipmap?: boolean, invertY?: boolean, samplingMode?: number, onLoad?: () => void, onError?: () => void): Texture;
+        static Parse(parsedTexture: any, scene: Scene, rootUrl: string): BaseTexture;
+    }
+}
+
+declare namespace BABYLON {
+    class VideoTexture extends Texture {
+        video: HTMLVideoElement;
+        private _autoLaunch;
+        private _lastUpdate;
+        constructor(name: string, urls: string[], scene: Scene, generateMipMaps?: boolean, invertY?: boolean, samplingMode?: number);
+        update(): boolean;
+    }
+}
+
+declare namespace BABYLON {
+    class CannonJSPlugin implements IPhysicsEnginePlugin {
+        private _useDeltaForWorldStep;
+        private _world;
+        private _registeredMeshes;
+        private _physicsMaterials;
+        private _gravity;
+        private _fixedTimeStep;
+        name: string;
+        constructor(_useDeltaForWorldStep?: boolean);
+        initialize(iterations?: number): void;
+        private _checkWithEpsilon(value);
+        runOneStep(delta: number): void;
+        setGravity(gravity: Vector3): void;
+        getGravity(): Vector3;
+        registerMesh(mesh: AbstractMesh, impostor: number, options?: PhysicsBodyCreationOptions): any;
+        private _createShape(mesh, impostor);
+        private _createConvexPolyhedron(rawVerts, rawFaces, mesh);
+        private _createHeightmap(mesh, pointDepth?);
+        private _addMaterial(friction, restitution);
+        private _createRigidBodyFromShape(shape, mesh, options);
+        registerMeshesAsCompound(parts: PhysicsCompoundBodyPart[], options: PhysicsBodyCreationOptions): any;
+        private _unbindBody(body);
+        unregisterMesh(mesh: AbstractMesh): void;
+        applyImpulse(mesh: AbstractMesh, force: Vector3, contactPoint: Vector3): void;
+        updateBodyPosition: (mesh: AbstractMesh) => void;
+        createLink(mesh1: AbstractMesh, mesh2: AbstractMesh, pivot1: Vector3, pivot2: Vector3): boolean;
+        dispose(): void;
+        isSupported(): boolean;
+        getWorldObject(): any;
+        getPhysicsBodyOfMesh(mesh: AbstractMesh): any;
+    }
+}
+
+declare namespace BABYLON {
+    class OimoJSPlugin implements IPhysicsEnginePlugin {
+        private _world;
+        private _registeredMeshes;
+        name: string;
+        private _gravity;
+        private _checkWithEpsilon(value);
+        initialize(iterations?: number): void;
+        setGravity(gravity: Vector3): void;
+        getGravity(): Vector3;
+        registerMesh(mesh: AbstractMesh, impostor: number, options: PhysicsBodyCreationOptions): any;
+        registerMeshesAsCompound(parts: PhysicsCompoundBodyPart[], options: PhysicsBodyCreationOptions): any;
+        private _createBodyAsCompound(part, options, initialMesh);
+        unregisterMesh(mesh: AbstractMesh): void;
+        private _unbindBody(body);
+        /**
+         * Update the body position according to the mesh position
+         * @param mesh
+         */
+        updateBodyPosition: (mesh: AbstractMesh) => void;
+        applyImpulse(mesh: AbstractMesh, force: Vector3, contactPoint: Vector3): void;
+        createLink(mesh1: AbstractMesh, mesh2: AbstractMesh, pivot1: Vector3, pivot2: Vector3, options?: any): boolean;
+        dispose(): void;
+        isSupported(): boolean;
+        getWorldObject(): any;
+        getPhysicsBodyOfMesh(mesh: AbstractMesh): any;
+        private _getLastShape(body);
+        runOneStep(time: number): void;
+    }
+}
+
+declare namespace BABYLON {
+    class PostProcessRenderEffect {
+        private _engine;
+        private _postProcesses;
+        private _getPostProcess;
+        private _singleInstance;
+        private _cameras;
+        private _indicesForCamera;
+        private _renderPasses;
+        private _renderEffectAsPasses;
+        _name: string;
+        applyParameters: (postProcess: PostProcess) => void;
+        constructor(engine: Engine, name: string, getPostProcess: () => PostProcess, singleInstance?: boolean);
+        isSupported: boolean;
+        _update(): void;
+        addPass(renderPass: PostProcessRenderPass): void;
+        removePass(renderPass: PostProcessRenderPass): void;
+        addRenderEffectAsPass(renderEffect: PostProcessRenderEffect): void;
+        getPass(passName: string): void;
+        emptyPasses(): void;
+        _attachCameras(cameras: Camera): any;
+        _attachCameras(cameras: Camera[]): any;
+        _detachCameras(cameras: Camera): any;
+        _detachCameras(cameras: Camera[]): any;
+        _enable(cameras: Camera): any;
+        _enable(cameras: Camera[]): any;
+        _disable(cameras: Camera): any;
+        _disable(cameras: Camera[]): any;
+        getPostProcess(camera?: Camera): PostProcess;
+        private _linkParameters();
+        private _linkTextures(effect);
+    }
+}
+
+declare namespace BABYLON {
+    class PostProcessRenderPass {
+        private _enabled;
+        private _renderList;
+        private _renderTexture;
+        private _scene;
+        private _refCount;
+        _name: string;
+        constructor(scene: Scene, name: string, size: number, renderList: Mesh[], beforeRender: () => void, afterRender: () => void);
+        _incRefCount(): number;
+        _decRefCount(): number;
+        _update(): void;
+        setRenderList(renderList: Mesh[]): void;
+        getRenderTexture(): RenderTargetTexture;
+    }
+}
+
+declare namespace BABYLON {
+    class PostProcessRenderPipeline {
+        private _engine;
+        private _renderEffects;
+        private _renderEffectsForIsolatedPass;
+        private _cameras;
+        _name: string;
+        private static PASS_EFFECT_NAME;
+        private static PASS_SAMPLER_NAME;
+        constructor(engine: Engine, name: string);
+        isSupported: boolean;
+        addEffect(renderEffect: PostProcessRenderEffect): void;
+        _enableEffect(renderEffectName: string, cameras: Camera): any;
+        _enableEffect(renderEffectName: string, cameras: Camera[]): any;
+        _disableEffect(renderEffectName: string, cameras: Camera): any;
+        _disableEffect(renderEffectName: string, cameras: Camera[]): any;
+        _attachCameras(cameras: Camera, unique: boolean): any;
+        _attachCameras(cameras: Camera[], unique: boolean): any;
+        _detachCameras(cameras: Camera): any;
+        _detachCameras(cameras: Camera[]): any;
+        _enableDisplayOnlyPass(passName: any, cameras: Camera): any;
+        _enableDisplayOnlyPass(passName: any, cameras: Camera[]): any;
+        _disableDisplayOnlyPass(cameras: Camera): any;
+        _disableDisplayOnlyPass(cameras: Camera[]): any;
+        _update(): void;
+        dispose(): void;
+    }
+}
+
+declare namespace BABYLON {
+    class PostProcessRenderPipelineManager {
+        private _renderPipelines;
+        constructor();
+        addPipeline(renderPipeline: PostProcessRenderPipeline): void;
+        attachCamerasToRenderPipeline(renderPipelineName: string, cameras: Camera, unique?: boolean): any;
+        attachCamerasToRenderPipeline(renderPipelineName: string, cameras: Camera[], unique?: boolean): any;
+        detachCamerasFromRenderPipeline(renderPipelineName: string, cameras: Camera): any;
+        detachCamerasFromRenderPipeline(renderPipelineName: string, cameras: Camera[]): any;
+        enableEffectInPipeline(renderPipelineName: string, renderEffectName: string, cameras: Camera): any;
+        enableEffectInPipeline(renderPipelineName: string, renderEffectName: string, cameras: Camera[]): any;
+        disableEffectInPipeline(renderPipelineName: string, renderEffectName: string, cameras: Camera): any;
+        disableEffectInPipeline(renderPipelineName: string, renderEffectName: string, cameras: Camera[]): any;
+        enableDisplayOnlyPassInPipeline(renderPipelineName: string, passName: string, cameras: Camera): any;
+        enableDisplayOnlyPassInPipeline(renderPipelineName: string, passName: string, cameras: Camera[]): any;
+        disableDisplayOnlyPassInPipeline(renderPipelineName: string, cameras: Camera): any;
+        disableDisplayOnlyPassInPipeline(renderPipelineName: string, cameras: Camera[]): any;
+        update(): void;
+    }
+}
+
+declare namespace BABYLON {
+    class CustomProceduralTexture extends ProceduralTexture {
+        private _animate;
+        private _time;
+        private _config;
+        private _texturePath;
+        constructor(name: string, texturePath: any, size: number, scene: Scene, fallbackTexture?: Texture, generateMipMaps?: boolean);
+        private loadJson(jsonUrl);
+        isReady(): boolean;
+        render(useCameraPostProcess?: boolean): void;
+        updateTextures(): void;
+        updateShaderUniforms(): void;
+        animate: boolean;
+    }
+}
+
+declare namespace BABYLON {
+    class ProceduralTexture extends Texture {
+        isCube: boolean;
+        private _size;
+        _generateMipMaps: boolean;
+        isEnabled: boolean;
+        private _doNotChangeAspectRatio;
+        private _currentRefreshId;
+        private _refreshRate;
+        onGenerated: () => void;
+        private _vertexBuffer;
+        private _indexBuffer;
+        private _effect;
+        private _vertexDeclaration;
+        private _vertexStrideSize;
+        private _uniforms;
+        private _samplers;
+        private _fragment;
+        _textures: Texture[];
+        private _floats;
+        private _floatsArrays;
+        private _colors3;
+        private _colors4;
+        private _vectors2;
+        private _vectors3;
+        private _matrices;
+        private _fallbackTexture;
+        private _fallbackTextureUsed;
+        constructor(name: string, size: any, fragment: any, scene: Scene, fallbackTexture?: Texture, generateMipMaps?: boolean, isCube?: boolean);
+        reset(): void;
+        isReady(): boolean;
+        resetRefreshCounter(): void;
+        setFragment(fragment: any): void;
+        refreshRate: number;
+        _shouldRender(): boolean;
+        getRenderSize(): number;
+        resize(size: any, generateMipMaps: any): void;
+        private _checkUniform(uniformName);
+        setTexture(name: string, texture: Texture): ProceduralTexture;
+        setFloat(name: string, value: number): ProceduralTexture;
+        setFloats(name: string, value: number[]): ProceduralTexture;
+        setColor3(name: string, value: Color3): ProceduralTexture;
+        setColor4(name: string, value: Color4): ProceduralTexture;
+        setVector2(name: string, value: Vector2): ProceduralTexture;
+        setVector3(name: string, value: Vector3): ProceduralTexture;
+        setMatrix(name: string, value: Matrix): ProceduralTexture;
+        render(useCameraPostProcess?: boolean): void;
+        clone(): ProceduralTexture;
+        dispose(): void;
+    }
+}
diff --git a/babylonjs/tsconfig.json b/babylonjs/tsconfig.json
new file mode 100644
index 0000000000..c4a777d01c
--- /dev/null
+++ b/babylonjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "babylon-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/babyparse/babyparse-tests.ts b/babyparse/babyparse-tests.ts
index 29d2d22891..65d798845c 100644
--- a/babyparse/babyparse-tests.ts
+++ b/babyparse/babyparse-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="babyparse.d.ts" />
+
 import * as Baby from "babyparse";
 
 var RECORD_SEP = String.fromCharCode(30);
diff --git a/babyparse/babyparse.d.ts b/babyparse/index.d.ts
similarity index 100%
rename from babyparse/babyparse.d.ts
rename to babyparse/index.d.ts
diff --git a/babyparse/tsconfig.json b/babyparse/tsconfig.json
new file mode 100644
index 0000000000..eccc8cd69a
--- /dev/null
+++ b/babyparse/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "babyparse-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/backbone-associations/backbone-associations-tests.ts b/backbone-associations/backbone-associations-tests.ts
index 36dc6cbe87..eebd48895d 100644
--- a/backbone-associations/backbone-associations-tests.ts
+++ b/backbone-associations/backbone-associations-tests.ts
@@ -1,9 +1,9 @@
-/// <reference path="../backbone/backbone.d.ts" />
-/// <reference path="backbone-associations.d.ts" />
-
 // borrowed from the Backbone.Associations tutorials
 // separated out into modules to avoid namespace clashes
-namespace Backbone.Associations.Tests {
+
+import * as Backbone from 'backbone';
+
+namespace BackboneAssociationsTests {
     namespace OneToOne {
         class EmployeeWithManager extends Backbone.AssociatedModel {
             constructor(options?) {
diff --git a/backbone-associations/backbone-associations-tests.ts.tscparams b/backbone-associations/backbone-associations-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/backbone-associations/backbone-associations-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/backbone-associations/backbone-associations.d.ts b/backbone-associations/backbone-associations.d.ts
deleted file mode 100644
index c093c01854..0000000000
--- a/backbone-associations/backbone-associations.d.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-// Type definitions for Backbone-associations 0.6.4
-// Project: https://github.com/dhruvaray/backbone-associations/
-// Definitions by: Craig Brett <https://github.com/craigbrett17/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../backbone/backbone.d.ts" />
-
-declare namespace Backbone {
-    export module Associations {
-        /** Defines a 1:Many relationship type */
-        export var Many: string;
-        /** Defines a 1:1 relationship type */
-        export var One: string;
-        /** Defines a special relationship to itself */
-        export var Self: string;
-
-        // these seem to be used internally, but can't see a reason not to include them just in case
-        export var SEPARATOR: string;
-        export function getSeparator(): any;
-        export function setSeparator(value: any): void;
-        export var EVENTS_BUBBLE: boolean;
-        export var EVENTS_WILDCARD: boolean;
-        export var EVENTS_NC: boolean;
-
-        interface IRelation {
-            /** The type of model for this relationship */
-            relatedModel: string|typeof Backbone.Associations.AssociatedModel;
-            /** The key for this relationship on this model */
-            key: string;
-            // meh, no string enums in TS. Just have to trust the user not to be a fool
-            /** The cardinality of this relationship. */
-            type: string;
-            /** Determines the type of collection used. If used, the relatedModel property is ignored */
-            collectionType?: typeof Backbone.Collection|string;
-            /** If set to true, then the attribute will not be serialized in toJSON() calls. Defaults to false */
-            isTransient?: boolean;
-            /** Specify remoteKey to serialize the key to a different key name in toJSON() calls. Useful in ROR nested-attributes like scenarios. */
-            remoteKey?: string;
-            /** the attributes to serialize when calling toJSON */
-            serialize?: string[];
-            /** A transformation function to convert the value before it is assigned to the key on the relatedModel */
-            map?: (...args: any[]) => any;
-        }
-
-        /** A Backbone model with special provision for handling relations to other models */
-        export class AssociatedModel extends Backbone.Model {
-            /** Relations with their associated model */
-            relations: IRelation[];
-            _proxyCalls: any;
-            /** Reverse association lookup for objects that contain this object */
-            parents: any[];
-            /** Cleans up any parent relations on other AssociatedModels */
-            cleanup(): void;
-        }
-    }
-    // copies of properties also put onto the Backbone scope
-    /** Defines a 1:Many relationship type */
-    export var Many: string;
-    /** Defines a 1:1 relationship type */
-    export var One: string;
-    /** Defines a special relationship to itself */
-    export var Self: string;
-
-    // I'm sure this should be doable with imports or type aliases, but doesn't seem to work
-    /** A Backbone model with special provision for handling relations to other models */
-    export class AssociatedModel extends Backbone.Model {
-        /** Relations with their associated model */
-        relations: Associations.IRelation[];
-        _proxyCalls: any;
-        /** Reverse association lookup for objects that contain this object */
-        parents: any[];
-        /** Cleans up any parent relations on other AssociatedModels */
-        cleanup(): void;
-    }
-}
diff --git a/backbone-associations/index.d.ts b/backbone-associations/index.d.ts
new file mode 100644
index 0000000000..84532c482d
--- /dev/null
+++ b/backbone-associations/index.d.ts
@@ -0,0 +1,75 @@
+// Type definitions for Backbone-associations 0.6.4
+// Project: https://github.com/dhruvaray/backbone-associations/
+// Definitions by: Craig Brett <https://github.com/craigbrett17/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as Backbone from 'backbone';
+
+declare module 'backbone' {
+    export module Associations {
+        /** Defines a 1:Many relationship type */
+        export var Many: string;
+        /** Defines a 1:1 relationship type */
+        export var One: string;
+        /** Defines a special relationship to itself */
+        export var Self: string;
+
+        // these seem to be used internally, but can't see a reason not to include them just in case
+        export var SEPARATOR: string;
+        export function getSeparator(): any;
+        export function setSeparator(value: any): void;
+        export var EVENTS_BUBBLE: boolean;
+        export var EVENTS_WILDCARD: boolean;
+        export var EVENTS_NC: boolean;
+
+        interface IRelation {
+            /** The type of model for this relationship */
+            relatedModel: string|typeof Backbone.Associations.AssociatedModel;
+            /** The key for this relationship on this model */
+            key: string;
+            // meh, no string enums in TS. Just have to trust the user not to be a fool
+            /** The cardinality of this relationship. */
+            type: string;
+            /** Determines the type of collection used. If used, the relatedModel property is ignored */
+            collectionType?: typeof Backbone.Collection|string;
+            /** If set to true, then the attribute will not be serialized in toJSON() calls. Defaults to false */
+            isTransient?: boolean;
+            /** Specify remoteKey to serialize the key to a different key name in toJSON() calls. Useful in ROR nested-attributes like scenarios. */
+            remoteKey?: string;
+            /** the attributes to serialize when calling toJSON */
+            serialize?: string[];
+            /** A transformation function to convert the value before it is assigned to the key on the relatedModel */
+            map?: (...args: any[]) => any;
+        }
+
+        /** A Backbone model with special provision for handling relations to other models */
+        export class AssociatedModel extends Backbone.Model {
+            /** Relations with their associated model */
+            relations: IRelation[];
+            _proxyCalls: any;
+            /** Reverse association lookup for objects that contain this object */
+            parents: any[];
+            /** Cleans up any parent relations on other AssociatedModels */
+            cleanup(): void;
+        }
+    }
+    // copies of properties also put onto the Backbone scope
+    /** Defines a 1:Many relationship type */
+    export var Many: string;
+    /** Defines a 1:1 relationship type */
+    export var One: string;
+    /** Defines a special relationship to itself */
+    export var Self: string;
+
+    // I'm sure this should be doable with imports or type aliases, but doesn't seem to work
+    /** A Backbone model with special provision for handling relations to other models */
+    export class AssociatedModel extends Backbone.Model {
+        /** Relations with their associated model */
+        relations: Associations.IRelation[];
+        _proxyCalls: any;
+        /** Reverse association lookup for objects that contain this object */
+        parents: any[];
+        /** Cleans up any parent relations on other AssociatedModels */
+        cleanup(): void;
+    }
+}
diff --git a/backbone-associations/tsconfig.json b/backbone-associations/tsconfig.json
new file mode 100644
index 0000000000..3b603741a5
--- /dev/null
+++ b/backbone-associations/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "backbone-associations-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/backbone-relational/backbone-relational-tests.ts b/backbone-relational/backbone-relational-tests.ts
index a642c66716..90433cd153 100644
--- a/backbone-relational/backbone-relational-tests.ts
+++ b/backbone-relational/backbone-relational-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="../backbone/backbone.d.ts" />
-/// <reference path="../underscore/underscore.d.ts" />
-/// <reference path="backbone-relational.d.ts" />
+import * as Backbone from 'backbone';
 
 class House extends Backbone.RelationalModel {
     // The 'relations' property, on the House's prototype. Initialized separately for each
diff --git a/backbone-relational/backbone-relational-tests.ts.tscparams b/backbone-relational/backbone-relational-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/backbone-relational/backbone-relational-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/backbone-relational/backbone-relational.d.ts b/backbone-relational/backbone-relational.d.ts
deleted file mode 100644
index d51991e55d..0000000000
--- a/backbone-relational/backbone-relational.d.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-// Type definitions for Backbone-relational 0.8.5
-// Project: http://backbonerelational.org/
-// Definitions by: Eirik Hoem <https://github.com/eirikhm/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../backbone/backbone.d.ts" />
-
-declare namespace Backbone {
-    class RelationalModel extends Model {
-        /**
-        * Do not use, prefer TypeScript's extend functionality.
-        **/
-        //private static extend(properties:any, classProperties?:any):any;
-
-        relations:any;
-        subModelTypes:any;
-        subModelTypeAttribute:any;
-
-
-        initializeRelations(options:any):void;
-
-        updateRelations(options:any):void;
-
-        queue(func:any):void;
-
-        processQueue():void;
-
-        getRelation(name:string):Relation;
-
-        getRelations():Relation[];
-
-        fetchRelated(key:string, options?:any, update?:boolean):any;
-
-        toJSON():any;
-
-        static setup();
-
-        static build(attributes:any, options?:any);
-
-        static findOrCreate(attributes:string, options?:any);
-
-        static findOrCreate(attributes:number, options?:any);
-
-        static findOrCreate(attributes:any, options?:any);
-    }
-
-    export class Relation extends Model {
-
-        options:any;
-        instance:any;
-        key:any;
-        keyContents:any;
-        relatedModel:any;
-        relatedCollection:any;
-        reverseRelation:any;
-        related:any;
-
-        checkPreconditions():boolean;
-
-        setRelated(related:Model):void;
-
-        setRelated(related:Collection<Model>):void;
-
-        getReverseRelations(model:RelationalModel):Relation;
-
-        destroy():void;
-    }
-
-    export class HasOne extends Relation {
-        collectionType:any;
-
-        findRelated(options:any):Model;
-
-        setKeyContents(keyContents:string):void;
-
-        setKeyContents(keyContents:string[]):void;
-
-        setKeyContents(keyContents:number):void;
-
-        setKeyContents(keyContents:number[]):void;
-
-        setKeyContents(keyContents:Collection<Model>):void;
-
-        onChange(model:Model, attr:any, options:any):void;
-
-        handleAddition(model:Model, coll:Collection<Model>, options:any):void;
-
-        handleRemoval(model:Model, coll:Collection<Model>, options:any):void;
-
-        handleReset(coll:Collection<Model>, options:any):void;
-
-        tryAddRelated(model:Model, coll:any, options:any):void;
-
-        addRelated(model:Model, options:any):void;
-
-        removeRelated(model:Model, coll:any, options:any):void;
-
-    }
-
-
-    export class HasMany extends Relation {
-        collectionType:any;
-
-        findRelated(options:any):Model;
-
-        setKeyContents(keyContents:string):void;
-
-        setKeyContents(keyContents:number):void;
-
-        setKeyContents(keyContents:Model):void;
-
-        onChange(model:Model, attr:any, options:any):void;
-
-        tryAddRelated(model:Model, coll:any, options:any):void;
-
-        addRelated(model:Model, options:any):void;
-
-        removeRelated(model:Model, coll:any, options:any):void;
-
-    }
-
-    export class Store extends Events {
-        initializeRelation(model, relation, options);
-
-        addModelScope(scope:any):void;
-
-        removeModelScope(scope):void;
-
-        addSubModels(subModelTypes:RelationalModel, superModelType:RelationalModel):void;
-
-        setupSuperModel(modelType:RelationalModel):void;
-
-        addReverseRelation(relation:any):void;
-
-        addOrphanRelation(relation:any):void;
-
-        processOrphanRelations():void;
-
-        retroFitRelation(relation:RelationalModel, create:boolean):Collection<Model>;
-
-        getCollection(type:RelationalModel, create:boolean):Collection<Model>;
-
-        getObjectByName(name:string):any;
-
-
-        resolveIdForItem(type:any, item:any):any;
-
-        static find(type:any, item:string):RelationalModel;
-
-        static find(type:any, item:number):RelationalModel;
-
-        static find(type:any, item:RelationalModel):RelationalModel;
-
-        static find(type:any, item:any):RelationalModel;
-
-        register(model:RelationalModel):void;
-
-        checkId(model:RelationalModel, id:any):void;
-
-        update(model:RelationalModel):void;
-
-        unregister(model:RelationalModel, collection:Collection<Model>, options:any):void;
-
-        reset():void;
-
-
-    }
-
-}
-
diff --git a/backbone-relational/backbone-relational.d.ts.tscparams b/backbone-relational/backbone-relational.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/backbone-relational/backbone-relational.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/backbone-relational/index.d.ts b/backbone-relational/index.d.ts
new file mode 100644
index 0000000000..f985a52d8f
--- /dev/null
+++ b/backbone-relational/index.d.ts
@@ -0,0 +1,172 @@
+// Type definitions for Backbone-relational 0.8.5
+// Project: http://backbonerelational.org/
+// Definitions by: Eirik Hoem <https://github.com/eirikhm/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+import * as Backbone from 'backbone';
+
+declare module 'backbone' {
+    class RelationalModel extends Model {
+        /**
+        * Do not use, prefer TypeScript's extend functionality.
+        **/
+        //private static extend(properties:any, classProperties?:any):any;
+
+        relations:any;
+        subModelTypes:any;
+        subModelTypeAttribute:any;
+
+
+        initializeRelations(options:any):void;
+
+        updateRelations(options:any):void;
+
+        queue(func:any):void;
+
+        processQueue():void;
+
+        getRelation(name:string):Relation;
+
+        getRelations():Relation[];
+
+        fetchRelated(key:string, options?:any, update?:boolean):any;
+
+        toJSON():any;
+
+        static setup();
+
+        static build(attributes:any, options?:any);
+
+        static findOrCreate(attributes:string, options?:any);
+
+        static findOrCreate(attributes:number, options?:any);
+
+        static findOrCreate(attributes:any, options?:any);
+    }
+
+    export class Relation extends Model {
+
+        options:any;
+        instance:any;
+        key:any;
+        keyContents:any;
+        relatedModel:any;
+        relatedCollection:any;
+        reverseRelation:any;
+        related:any;
+
+        checkPreconditions():boolean;
+
+        setRelated(related:Model):void;
+
+        setRelated(related:Collection<Model>):void;
+
+        getReverseRelations(model:RelationalModel):Relation;
+
+        destroy():void;
+    }
+
+    export class HasOne extends Relation {
+        collectionType:any;
+
+        findRelated(options:any):Model;
+
+        setKeyContents(keyContents:string):void;
+
+        setKeyContents(keyContents:string[]):void;
+
+        setKeyContents(keyContents:number):void;
+
+        setKeyContents(keyContents:number[]):void;
+
+        setKeyContents(keyContents:Collection<Model>):void;
+
+        onChange(model:Model, attr:any, options:any):void;
+
+        handleAddition(model:Model, coll:Collection<Model>, options:any):void;
+
+        handleRemoval(model:Model, coll:Collection<Model>, options:any):void;
+
+        handleReset(coll:Collection<Model>, options:any):void;
+
+        tryAddRelated(model:Model, coll:any, options:any):void;
+
+        addRelated(model:Model, options:any):void;
+
+        removeRelated(model:Model, coll:any, options:any):void;
+
+    }
+
+
+    export class HasMany extends Relation {
+        collectionType:any;
+
+        findRelated(options:any):Model;
+
+        setKeyContents(keyContents:string):void;
+
+        setKeyContents(keyContents:number):void;
+
+        setKeyContents(keyContents:Model):void;
+
+        onChange(model:Model, attr:any, options:any):void;
+
+        tryAddRelated(model:Model, coll:any, options:any):void;
+
+        addRelated(model:Model, options:any):void;
+
+        removeRelated(model:Model, coll:any, options:any):void;
+
+    }
+
+    export class Store extends Events {
+        initializeRelation(model, relation, options);
+
+        addModelScope(scope:any):void;
+
+        removeModelScope(scope):void;
+
+        addSubModels(subModelTypes:RelationalModel, superModelType:RelationalModel):void;
+
+        setupSuperModel(modelType:RelationalModel):void;
+
+        addReverseRelation(relation:any):void;
+
+        addOrphanRelation(relation:any):void;
+
+        processOrphanRelations():void;
+
+        retroFitRelation(relation:RelationalModel, create:boolean):Collection<Model>;
+
+        getCollection(type:RelationalModel, create:boolean):Collection<Model>;
+
+        getObjectByName(name:string):any;
+
+
+        resolveIdForItem(type:any, item:any):any;
+
+        static find(type:any, item:string):RelationalModel;
+
+        static find(type:any, item:number):RelationalModel;
+
+        static find(type:any, item:RelationalModel):RelationalModel;
+
+        static find(type:any, item:any):RelationalModel;
+
+        register(model:RelationalModel):void;
+
+        checkId(model:RelationalModel, id:any):void;
+
+        update(model:RelationalModel):void;
+
+        unregister(model:RelationalModel, collection:Collection<Model>, options:any):void;
+
+        reset():void;
+
+
+    }
+
+}
+
diff --git a/backbone-relational/tsconfig.json b/backbone-relational/tsconfig.json
new file mode 100644
index 0000000000..20a9ccb3a0
--- /dev/null
+++ b/backbone-relational/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "backbone-relational-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/backbone.layoutmanager/backbone.layoutmanager-tests.ts b/backbone.layoutmanager/backbone.layoutmanager-tests.ts
index 93c87cf197..fe11ce9b18 100644
--- a/backbone.layoutmanager/backbone.layoutmanager-tests.ts
+++ b/backbone.layoutmanager/backbone.layoutmanager-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="backbone.layoutmanager.d.ts"/>
-/// <reference path="../backbone/backbone.d.ts"/>
-/// <reference path="../jquery/jquery.d.ts"/>
+/// <reference types="jquery"/>
+
+import * as Backbone from 'backbone';
 
 // Example code.
 class DisplayView extends Backbone.View<Backbone.Model> {
diff --git a/backbone.layoutmanager/backbone.layoutmanager.d.ts b/backbone.layoutmanager/backbone.layoutmanager.d.ts
deleted file mode 100644
index 2051458367..0000000000
--- a/backbone.layoutmanager/backbone.layoutmanager.d.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-// Type definitions for Backbone.LayoutManager 0.9.5
-// Project: http://layoutmanager.org/
-// Definitions by: He Jiang <https://github.com/hejiang2000/>
-// Definitions: https://github.com/hejiang2000/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../underscore/underscore.d.ts" />
-/// <reference path="../backbone/backbone.d.ts" />
-
-declare namespace Backbone {
-
-	interface LayoutOptions<TModel extends Model> extends ViewOptions<TModel> {
-		template?: string;
-        views?: { [viewName: string]: View<TModel> };
-	}
-
-	interface LayoutManagerOptions {
-		manage?: boolean;
-		el?: boolean;
-	}
-
-	class Layout<TModel extends Model> extends View<TModel> {
-		template: string;
-		constructor(options?: LayoutOptions<TModel>);
-
-		beforeRender(): void;
-		afterRender(): void;
-		cleanup(): void;
-
-		fetchTemplate(path: string): (context:any)=>string;
-		async():(compiled:(context:any)=>void)=>void;
-		promise(): JQueryPromise<any>;
-
-		getAllOptions(): LayoutOptions<TModel>;
-
-		getView(fn?:any): any;
-		getViews(fn?:any): any[];
-
-		insertView(selector:any, view?:any): any; // return view;
-		insertViews(views:any): Layout<TModel>; // return this;
-
-		remove(): Layout<TModel>;
-		removeView(fn:any): Layout<TModel>;
-
-		render(): Layout<TModel>; // return this
-		renderViews(): Layout<TModel>; // return this
-		setView<U>(name: any, view: U, insert?:boolean): U; // return view
-		setViews(views:any): Layout<TModel>; // return this
-		then(fn:()=>void):void;
-
-		static cache(path: string, contents?: any): any;
-		static cleanViews(views: any): void;
-		static configure(options: LayoutManagerOptions): void;
-		static setupView(views: any, options?: LayoutOptions<Model>): void;
-	}
-}
-
diff --git a/backbone.layoutmanager/index.d.ts b/backbone.layoutmanager/index.d.ts
new file mode 100644
index 0000000000..a5c469eb1b
--- /dev/null
+++ b/backbone.layoutmanager/index.d.ts
@@ -0,0 +1,56 @@
+// Type definitions for Backbone.LayoutManager 0.9.5
+// Project: http://layoutmanager.org/
+// Definitions by: He Jiang <https://github.com/hejiang2000/>
+// Definitions: https://github.com/hejiang2000/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+import * as Backbone from 'backbone';
+
+declare module 'backbone' {
+	interface LayoutOptions<TModel extends Model> extends ViewOptions<TModel> {
+		template?: string;
+        views?: { [viewName: string]: View<TModel> };
+	}
+
+	interface LayoutManagerOptions {
+		manage?: boolean;
+		el?: boolean;
+	}
+
+	class Layout<TModel extends Model> extends View<TModel> {
+		template: string;
+		constructor(options?: LayoutOptions<TModel>);
+
+		beforeRender(): void;
+		afterRender(): void;
+		cleanup(): void;
+
+		fetchTemplate(path: string): (context:any)=>string;
+		async():(compiled:(context:any)=>void)=>void;
+		promise(): JQueryPromise<any>;
+
+		getAllOptions(): LayoutOptions<TModel>;
+
+		getView(fn?:any): any;
+		getViews(fn?:any): any[];
+
+		insertView(selector:any, view?:any): any; // return view;
+		insertViews(views:any): Layout<TModel>; // return this;
+
+		remove(): Layout<TModel>;
+		removeView(fn:any): Layout<TModel>;
+
+		render(): Layout<TModel>; // return this
+		renderViews(): Layout<TModel>; // return this
+		setView<U>(name: any, view: U, insert?:boolean): U; // return view
+		setViews(views:any): Layout<TModel>; // return this
+		then(fn:()=>void):void;
+
+		static cache(path: string, contents?: any): any;
+		static cleanViews(views: any): void;
+		static configure(options: LayoutManagerOptions): void;
+		static setupView(views: any, options?: LayoutOptions<Model>): void;
+	}
+}
+
diff --git a/backbone.layoutmanager/tsconfig.json b/backbone.layoutmanager/tsconfig.json
new file mode 100644
index 0000000000..f287941417
--- /dev/null
+++ b/backbone.layoutmanager/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "backbone.layoutmanager-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/backbone.localstorage/backbone.localstorage-tests.ts b/backbone.localstorage/backbone.localstorage-tests.ts
index 0d44897a80..20ab8ba80a 100644
--- a/backbone.localstorage/backbone.localstorage-tests.ts
+++ b/backbone.localstorage/backbone.localstorage-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./backbone.localstorage.d.ts" />
-
 var store: Store = new Store('testStore');
 store.findAll();
 
diff --git a/backbone.localstorage/backbone.localstorage.d.ts b/backbone.localstorage/backbone.localstorage.d.ts
deleted file mode 100644
index 25c9e4cb72..0000000000
--- a/backbone.localstorage/backbone.localstorage.d.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-// Type definitions for backbone.localStorage 1.0.0
-// Project: https://github.com/jeromegn/Backbone.localStorage
-// Definitions by: Louis Grignon <https://github.com/lgrignon/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../backbone/backbone.d.ts" />
-
-declare namespace Backbone {
-    interface Serializer {
-        serialize(item: any): any;
-        deserialize(data: any): any;
-    }
-
-    class LocalStorage {
-        name: string;
-        serializer: Serializer;
-        records: string[];
-
-        constructor(name: string, serializer?: Serializer);
-
-        save(): void;
-
-        // Add a model, giving it a (hopefully)-unique GUID, if it doesn't already
-        // have an id of it's own.
-        create(model: any): any;
-
-        // Update a model by replacing its copy in `this.data`.
-        update(model: any): any;
-
-        // Retrieve a model from `this.data` by id.
-        find(model: any): any;
-
-        // Return the array of all models currently in storage.
-        findAll(): any;
-
-        // Delete a model from `this.data`, returning it.
-        destroy<T>(model: T): T;
-
-        localStorage(): any;
-
-        // Clear localStorage for specific collection.
-        _clear(): void;
-
-        _storageSize(): number;
-
-        _itemName(id: any): string;
-    }
-}
-
-import Store = Backbone.LocalStorage;
-
diff --git a/backbone.localstorage/index.d.ts b/backbone.localstorage/index.d.ts
new file mode 100644
index 0000000000..d08d546ec2
--- /dev/null
+++ b/backbone.localstorage/index.d.ts
@@ -0,0 +1,55 @@
+// Type definitions for backbone.localStorage 1.0.0
+// Project: https://github.com/jeromegn/Backbone.localStorage
+// Definitions by: Louis Grignon <https://github.com/lgrignon/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as Backbone from 'backbone';
+
+declare global {
+    const Store: typeof Backbone.LocalStorage;
+    type Store = Backbone.LocalStorage;
+}
+
+declare module 'backbone' {
+    interface Serializer {
+        serialize(item: any): any;
+        deserialize(data: any): any;
+    }
+
+    class LocalStorage {
+        name: string;
+        serializer: Serializer;
+        records: string[];
+
+        constructor(name: string, serializer?: Serializer);
+
+        save(): void;
+
+        // Add a model, giving it a (hopefully)-unique GUID, if it doesn't already
+        // have an id of it's own.
+        create(model: any): any;
+
+        // Update a model by replacing its copy in `this.data`.
+        update(model: any): any;
+
+        // Retrieve a model from `this.data` by id.
+        find(model: any): any;
+
+        // Return the array of all models currently in storage.
+        findAll(): any;
+
+        // Delete a model from `this.data`, returning it.
+        destroy<T>(model: T): T;
+
+        localStorage(): any;
+
+        // Clear localStorage for specific collection.
+        _clear(): void;
+
+        _storageSize(): number;
+
+        _itemName(id: any): string;
+    }
+}
+
+
diff --git a/backbone.localstorage/tsconfig.json b/backbone.localstorage/tsconfig.json
new file mode 100644
index 0000000000..0eabeb7dca
--- /dev/null
+++ b/backbone.localstorage/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "backbone.localstorage-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/backbone.marionette/index.d.ts b/backbone.marionette/index.d.ts
new file mode 100644
index 0000000000..fd49a89cc1
--- /dev/null
+++ b/backbone.marionette/index.d.ts
@@ -0,0 +1,1508 @@
+// Type definitions for Marionette
+// Project: https://github.com/marionettejs/
+// Definitions by: Zeeshan Hamid <https://github.com/zhamid>, Natan Vivo <https://github.com/nvivo>, Sven Tschui <https://github.com/sventschui>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as Backbone from 'backbone';
+
+export as namespace Marionette;
+export = Marionette;
+
+// declarations for Backbone.BabySitter and Backbone.Wreqr, different projects but included in MarionetteJS
+declare module 'backbone' {
+    // Backbone.BabySitter
+    class ChildViewContainer<TView extends View<Backbone.Model>> {
+
+        constructor(initialViews?: any[]);
+
+        add(view: TView, customIndex?: number): void;
+        findByModel<TModel extends Backbone.Model>(model: TModel): TView;
+        findByModelCid(modelCid: string): TView;
+        findByCustom(index: number): TView;
+        findByIndex(index: number): TView;
+        findByCid(cid: string): TView;
+        remove(view: TView): void;
+        call(method: any): void;
+        apply(method: any, args?: any[]): void;
+
+        //mixins from Collection (copied from Backbone's Collection declaration)
+
+        all(iterator: (element: TView, index: number) => boolean, context?: any): boolean;
+        any(iterator: (element: TView, index: number) => boolean, context?: any): boolean;
+        contains(value: any): boolean;
+        detect(iterator: (item: any) => boolean, context?: any): any;
+        each(iterator: (element: TView, index: number, list?: any) => void, context?: any): any;
+        every(iterator: (element: TView, index: number) => boolean, context?: any): boolean;
+        filter(iterator: (element: TView, index: number) => boolean, context?: any): TView[];
+        find(iterator: (element: TView, index: number) => boolean, context?: any): TView;
+        first(): TView;
+        forEach(iterator: (element: TView, index: number, list?: any) => void, context?: any): void;
+        include(value: any): boolean;
+        initial(): TView;
+        initial(n: number): TView[];
+        invoke(methodName: string, args?: any[]): any;
+        isEmpty(object: any): boolean;
+        last(): TView;
+        last(n: number): TView[];
+        lastIndexOf(element: TView, fromIndex?: number): number;
+        map<U>(iterator: (element: TView, index: number, context?: any) => U, context?: any): U[];
+        pluck(attribute: string): any[];
+        reject(iterator: (element: TView, index: number) => boolean, context?: any): TView[];
+        rest(): TView;
+        rest(n: number): TView[];
+        select(iterator: any, context?: any): any[];
+        some(iterator: (element: TView, index: number) => boolean, context?: any): boolean;
+        toArray(): any[];
+        without(...values: any[]): TView[];
+    }
+
+    // Backbone.Wreqr
+    namespace Wreqr {
+
+        namespace radio {
+
+            function channel(channelName: string): Channel;
+
+        }
+
+        class Channel {
+
+            constructor(channelName: string);
+
+            vent: Backbone.Wreqr.EventAggregator;
+            reqres: Backbone.Wreqr.RequestResponse;
+            commands: Backbone.Wreqr.Commands;
+            channelName: string;
+
+            reset(): Channel;
+            connectEvents(hash: string, context: any): Channel;
+            connectCommands(hash: string, context: any): Channel;
+            connectRequests(hash: string, context: any): Channel;
+
+        }
+
+        class Handlers extends Backbone.Events {
+
+            constructor(options?: any);
+
+            options: any;
+
+            setHandler(name: string, handler: any, context?: any): void;
+            hasHandler(name: string): boolean;
+            getHandler(name: string): Function;
+            removeHandler(name: string): void;
+            removeAllHandlers(): void;
+        }
+
+        class CommandStorage {
+
+            constructor(options?: any);
+
+            getCommands(commandName: string): Commands;
+            addCommand(commandName: string, args: any): void;
+            clearCommands(commandName: string): void;
+        }
+
+        class Commands extends Handlers {
+
+            constructor(options?: any);
+
+            storageType: CommandStorage;
+            execute(name: string, ...args: any[]): void;
+        }
+
+        class RequestResponse extends Handlers {
+
+            constructor(options?: any);
+
+            request(...args: any[]): any;
+        }
+
+        class EventAggregator extends Backbone.Events {
+
+            constructor(options?: any);
+        }
+    }
+}
+
+declare namespace Marionette {
+
+    /**
+     * Retrieve an object's attribute either directly from the object, or
+     * from the object's this.options, with this.options taking precedence.
+     */
+    function getOption(target: any, optionName: string): any;
+
+    /**
+     * Trigger an event and a corresponding method on the target object.
+     * All arguments that are passed to the triggerMethod call are passed along
+     * to both the event and the method, with the exception of the event name not
+     * being passed to the corresponding method.
+     */
+    function triggerMethod(name: string, ...args: any[]): any;
+
+    /**
+     * Invoke triggerMethod on a specific context.
+     * This is useful when it's not clear that the object has triggerMethod defined.
+     */
+    function triggerMethodOn(ctx: any, name: string, ...args: any[]): any;
+
+    /**
+     * Monitor a view's state, and after it has been rendered and shown in the DOM,
+     * trigger a "dom:refresh" event every time it is re-rendered.
+     */
+    function MonitorDOMRefresh(view: Backbone.View<Backbone.Model>): void;
+
+    /**
+     * This method is used to bind a backbone "entity" (collection/model) to methods on a target object.
+     * @param target An object that must have a listenTo method from the EventBinder object.
+     * @param entity The entity (Backbone.Model or Backbone.Collection) to bind the events from.
+     * @param bindings a hash of { "event:name": "eventHandler" } configuration. Multiple handlers can be separated by a space. A function can be supplied instead of a string handler name.
+     */
+    function bindEntityEvents(target: any, entity: any, bindings: any): void;
+
+    /**
+     * This method can be used to unbind callbacks from entities' (collection/model) events. It's the opposite of bindEntityEvents
+     * @param target An object that must have a listenTo method from the EventBinder object.
+     * @param entity The entity (Backbone.Model or Backbone.Collection) to bind the events from.
+     * @param bindings a hash of { "event:name": "eventHandler" } configuration. Multiple handlers can be separated by a space. A function can be supplied instead of a string handler name.
+     */
+    function unbindEntityEvents(target: any, entity: any, bindings: any): void;
+
+    class Callbacks {
+        add(callback: Function, contextOverride: any): void;
+        run(options: any, context: any): void;
+        reset(): void;
+    }
+
+    /**
+     * A base class which other classes can extend from. Object incorporates many
+     * backbone conventions and utilities like initialize and Backbone.Events.
+     */
+    class Object extends Backbone.Events {
+        /**
+         * Initialize is called immediately after the Object has been instantiated,
+         * and is invoked with the same arguments that the constructor received.
+         */
+        initialize(options?: any): void;
+
+        /**
+         * Retrieve an object's attribute either directly from the object, or from
+         * the object's this.options, with this.options taking precedence.
+         * @param optionName the name of the option to retrieve.
+         */
+        getOption(optionName: string): any;
+
+        /**
+         * Objects have a destroy method that unbind the events that are directly
+         * attached to the instance. Invoking the destroy method will trigger a
+         * "before:destroy" event and corresponding onBeforeDestroy method call.
+         * These calls will be passed any arguments destroy was invoked with.
+         * @param args any arguments to pass to the "before:destory" event and call to
+         * onBeforeDestroy.
+         */
+        destroy(...args: any[]): void;
+    }
+
+    /**
+     * A Controller is an object used in the Marionette Router. Controllers are
+     * where you store your Router's callbacks.
+     */
+    class Controller extends Backbone.Events {
+        /**
+         * @param options Options that should be stored in this options. Can be retreived via
+         * getOption.
+         */
+        constructor(options?: any);
+
+        /**
+         * Handles unbinding all of the events that are directly attached to the
+         * controller instance, as well as those that are bound using the
+         * EventBinder from the controller.
+         *
+         * Invoking the destroy method will trigger the "before:destroy" and
+         * "destroy" events and the corresponding onBeforeDestory and onDestroy
+         * method calls. These calls will be passed any arguments destroy was
+         * invoked with.
+         */
+        destroy(...args: any[]): void;
+
+        /**
+         * Retrieve an object's attribute either directly from the object, or from
+         * the object's this.options, with this.options taking precedence.
+         * @param optionName the name of the option to retrieve.
+         */
+        getOption(optionName: string): any;
+
+        triggerMethod(name: string, ...args: any[]): any;
+    }
+
+    interface RegionConstructionOptions {
+        /**
+         * Specifies the element for the region to manage. This may be
+         * a selector string, a raw DOM node reference or a jQuery wrapped
+         * DOM node.
+         */
+        el?: any;
+    }
+
+    interface RegionShowOptions {
+        /**
+         * If you replace the current view with a new view by calling show, by
+         * default it will automatically destroy the previous view. You can
+         * prevent this behavior by setting this option to true.
+         */
+        preventDestroy?: boolean;
+
+        /**
+         * If you re-call show with the same view, by default nothing will happen
+         * because the view is already in the region. You can force the view to be
+         * re-shown by setting this option to true.
+         */
+        forceShow?: boolean;
+
+        /**
+         * Regions that are attached to the document when you execute show are
+         * special in that the views that they show will also become attached
+         * to the document. These regions fire a pair of triggerMethods on all
+         * of the views that are about to be attached � even the nested ones.
+         * This can cause a performance issue if you're rendering hundreds or
+         * thousands of views at once.
+         * If you think these events might be causing some lag in your app, you
+         * can selectively turn them off with the triggerBeforeAttach
+         * and triggerAttach properties.
+         */
+        triggerBeforeAttach?: boolean;
+
+        /**
+         * Regions that are attached to the document when you execute show are
+         * special in that the views that they show will also become attached
+         * to the document. These regions fire a pair of triggerMethods on all
+         * of the views that are about to be attached � even the nested ones.
+         * This can cause a performance issue if you're rendering hundreds or
+         * thousands of views at once.
+         * If you think these events might be causing some lag in your app, you
+         * can selectively turn them off with the triggerBeforeAttach
+         * and triggerAttach properties.
+         */
+        triggerAttach?: boolean;
+    }
+
+    /**
+     * Regions provide consistent methods to manage, show and destroy views in
+     * your applications and layouts. They use a jQuery selector to show your
+     * views in the correct place.
+     */
+    class Region extends Marionette.Object {
+
+        /**
+         * Build an instance of a region by passing in a configuration object and
+         * a default region class to use if none is specified in the config.
+         * The config object should either be a string as a jQuery DOM selector,
+         * a Region class directly, or an object literal that specifies a selector,
+         * a custom regionClass, and any options to be supplied to the region
+         */
+        static buildRegion(regionConfig: any, defaultRegionType: any): Region;
+
+        /**
+         * You can specify an el for the region to manage at the time the region
+         * is instantiated.
+         */
+        constructor(options?: RegionConstructionOptions);
+
+        /**
+         * Contains the element that this region should manage.
+         */
+        el: any;
+
+        /**
+         * Renders and displays the specified view in this region.
+         * @param view the view to display.
+         */
+        show<TModel extends Backbone.Model>(view: Backbone.View<TModel>, options?: RegionShowOptions): void;
+
+        /**
+         * Attaches an existing view to a region, without rendering or showing the view,
+         * and without replacing the HTML content of the region.
+         */
+        attachView<TModel extends Backbone.Model>(view: Backbone.View<TModel>, options?: RegionShowOptions): any;
+
+        /**
+         * Override this method to change how the new view is
+         * appended to the `$el` that the region is managing
+         */
+        attachHtml<TModel extends Backbone.Model>(view: Backbone.View<TModel>): void;
+
+        /**
+         * A region can be reset at any time. This destroys any existing view
+         * being displayed, and deletes the cached el. The next time the region
+         * shows a view, the region's el is queried from the DOM.
+         */
+        reset(): any;
+
+        /**
+         * If you wish to check whether a region has a view, you can use the hasView function. This will return a boolean value depending whether or not the region is showing a view.
+         */
+        hasView(): boolean;
+
+        /**
+         * Empties the current view from the region.
+         */
+        empty(): any;
+
+        /**
+         * @returns view that this region has.
+         */
+        currentView: Backbone.View<Backbone.Model>;
+    }
+
+    interface RegionDefaults {
+        /**
+         * A selector string indicating which element to assign the region two.
+         */
+        selector?: string;
+
+        /**
+         * A selector string, a jQuery object, or an HTML node indicating which element
+         * the region should use.
+         */
+        el?: any;
+
+        /**
+         * A custom region class.
+         */
+        regionClass?: any;
+
+        /**
+         * Ordinarily regions enforce the presence of a backing DOM element. In
+         * some instances it may be desirable to allow regions to be instantiated
+         * and used without an element, such as when regions defined by a parent
+         * LayoutView class are used by only some of its subclasses. In these
+         * instances, the region can be defined with this option set to true,
+         * suppressing the missing element error and causing show calls to the
+         * region to be treated as no-ops.
+         */
+        allowMissingEl?: boolean;
+    }
+
+    /**
+     * Region managers provide a consistent way to manage a number of Marionette.Region
+     * objects within an application. The RegionManager is intended to be used by
+     * other objects, to facilitate the addition, storage, retrieval, and removal of
+     * regions from that object.
+     */
+    class RegionManager extends Controller {
+
+        /**
+         * Constructor.
+         * @param options May contain an optional `regions` option. These regions
+         * are passed directly into addRegions for this instance.
+         */
+        constructor(options?: any);
+
+        /**
+         * Adds one or more regions to this RegionManager instance.
+         * @param regionDefinitions a function returning an object literal with the region definitions. The function will
+         * be called with the RegionManager instance context and all the arguments passed to addRegions.
+         * @param defaults Specifies default options that will be applied to every region added.
+         * @returns an object literal with all the created regions.
+         */
+        addRegions(regionDefinitions: Function, defaults?: RegionDefaults): any;
+
+        /**
+         * Adds one or more regions to this RegionManager instance.
+         * @param regionDefinitions an object literal containing region names as keys and region
+         * definitions as values.
+         * @param defaults Specifies default options that will be applied to every region added.
+         * @returns an object literal with all the created regions.
+         */
+        addRegions(regionDefinitions: { [regionName: string]: any }, defaults?: RegionDefaults): any;
+
+        /**
+         * Adds a region to this RegionManager.
+         * @param name the region name.
+         * @param definition the region definition. This may be a selector, object literal
+         * with various region creation options or an instance of a region object.
+         */
+        addRegion(name: string, definition: any): Region;
+
+        /**
+         * Gets the region with the specified name from this RegionManager.
+         */
+        get(name: string): Region;
+
+        /**
+         * Removes the region with the specified name from this RegionManager.
+         */
+        removeRegion(name: string): void;
+
+        /**
+         * Removes all regions from the RegionManager.
+         */
+        removeRegions(): void;
+
+        /**
+         * Empties all regions from the RegionManager instance.
+         */
+        emptyRegions(): void;
+
+        /**
+         * Destroys the RegionManager instance entierly which both destroys and
+         * removes all regions from the RegionManager instance.
+         */
+        destroy(): void;
+
+        //mixins from Collection (copied from Backbone's Collection declaration)
+
+        /**
+         * Returns true if all of the values in the list pass the predicate truth test.
+         * @alias every
+         */
+        all(iterator: (element: Region, index: number) => boolean, context?: any): boolean;
+
+        /**
+         * Returns true if any of the values in the list pass the predicate truth test. Short-circuits and stops traversing the list if a true element is found.
+         */
+        any(iterator: (element: Region, index: number) => boolean, context?: any): boolean;
+
+        /**
+         * Returns true if the value is present in the list.
+         * @alias include
+         */
+        contains(value: any): boolean;
+
+        /**
+         * Looks through each value in the list, returning the first one that passes a truth test (predicate), or undefined if no value passes the test.The function returns as soon as it finds an acceptable element, and doesn't traverse the entire list.
+         * @alias find
+         */
+        detect(iterator: (item: any) => boolean, context?: any): any;
+
+        /**
+         * Iterates over the regions in this instance, yielding each in turn to an
+         * iterator function. The iterator is bound to the context object, if one
+         * is passed.
+         * @alias forEach
+         */
+        each(iterator: (element: Region, index: number, list?: any) => void, context?: any): void;
+
+        /**
+         * Returns true if all of the values in the list pass the predicate truth test.
+         * @alias all
+         */
+        every(iterator: (element: Region, index: number) => boolean, context?: any): boolean;
+
+        /**
+         * Looks through each Region in the collection, returning an array of all
+         * the values that pass a truth test (predicate).
+         * @alias select
+         */
+        filter(iterator: (element: Region, index: number) => boolean, context?: any): Region[];
+
+        /**
+         * Looks through each Region in this instance, returning the first one that passes a truth test (predicate), or undefined if no value passes the test.The function returns as soon as it finds an acceptable element, and doesn't traverse the entire list.
+         * @alias detect
+         */
+        find(iterator: (element: Region, index: number) => boolean, context?: any): Region;
+
+        /**
+         * Returns the first Region of this RegionManager.
+         */
+        first(): Region;
+
+        /**
+         * Returns the first n Regions of this RegionManager.
+         */
+        first(n: number): Region[];
+
+        /**
+         * Iterates over the regions in this instance, yielding each in turn to an
+         * iterator function. The iterator is bound to the context object, if one
+         * is passed.
+         * @alias each
+         */
+        forEach(iterator: (element: Region, index: number, list?: any) => void, context?: any): void;
+
+        /**
+         * Returns true if the value is present in the list.
+         * @alias contains
+         */
+        include(value: any): boolean;
+
+        /**
+         * Returns everything but the last n Regions of this instance.
+         * @param n if specified determines the number of regions to exclude,
+         * otherwise only the last element is excluded.
+         */
+        initial(n: number): Region[];
+
+        /**
+         * Calls the method named by methodName on each value in the collection. Any extra
+         * arguments passed to invoke will be forwarded on to the method invocation.
+         */
+        invoke(methodName: string, args?: any[]): any;
+
+        /**
+         * Returns true if the RegionManager contains no regions.
+         */
+        isEmpty(object: any): boolean;
+
+        /**
+         * Returns the last element of a collection.
+         */
+        last(): Region;
+
+        /**
+         * Returns the last n elements of the collection.
+         */
+        last(n: number): Region[];
+
+        /**
+         * Returns the index of the last occurrence of element in the collection, or -1 if
+         * element is not present.
+         * @param fromIndex if specified starts the search at the given index.
+         */
+        lastIndexOf(element: Region, fromIndex?: number): number;
+
+        /**
+         * Produces a new array of values by mapping each value in the collection through a
+         * transformation function (iterator).
+         * @alias collect
+         */
+        map(iterator: (element: Region, index: number, context?: any) => any[], context?: any): any[];
+
+        /**
+         * Pluck an attribute from each model in the collection. Equivalent to
+         * calling map and returning a single attribute from the iterator.
+         */
+        pluck(attribute: string): any[];
+
+        /**
+         * Returns the values in the collection without the elements that the truth test
+         * (predicate) passes. The opposite of filter.
+         */
+        reject(iterator: (element: Region, index: number) => boolean, context?: any): Region[];
+
+        /**
+         * Returns the rest of the elements of the collection.
+         * Pass an index to return the values of the array from that index onward. If not
+         * specified the first item in the collection is dropped.
+         * @alias tail, drop
+         */
+        rest(n: number): Region[];
+
+        /**
+         * Looks through each value in the collection, returning an array of all
+         * the values that pass a truth test (predicate).
+         * @alias filter
+         */
+        select(iterator: any, context?: any): Region[];
+
+        /**
+         * Returns true if any of the values in the list pass the predicate truth test. Short-circuits and stops traversing the list if a true element is found.
+         * @alias any
+         */
+        some(iterator: (element: Region, index: number) => boolean, context?: any): boolean;
+
+        /**
+         * Creates an array containing the regions in this instance.
+         */
+        toArray(): Region[];
+
+        /**
+         * Returns an array of all the regions in the RegionManager except the ones specified.
+         */
+        without(...values: any[]): Region[];
+    }
+
+    /**
+     * The TemplateCache provides a cache for retrieving templates from script blocks
+     * in your HTML. This will improve the speed of subsequent calls to get a template.
+     */
+    class TemplateCache {
+        /**
+         * To use the TemplateCache, call the get method on TemplateCache directly. Internally, instances of the TemplateCache class will be created and stored but you do not have to manually create these instances yourself. get will return a compiled template function.
+         */
+        static get(templateId: string): any;
+
+        /**
+         * You can clear one or more, or all items from the cache using the clear
+         * method. Clearing a template from the cache will force it to re-load
+         * from the DOM the next time it is retrieved.
+         * @param  the templateId used for loading / caching of the templates to clear. If none specified, all templates will be cleared from the cache.
+         */
+        static clear(...templateId: string[]): void;
+
+        /**
+         * The default template retrieval is to select the template contents from the
+         * DOM using jQuery. If you wish to change the way this works, you can
+         * override this method on the TemplateCache object.
+         */
+        loadTemplate(templateId: string): any;
+
+        /**
+         * he default template compilation passes the results from loadTemplate to
+         * the compileTemplate function, which returns an underscore.js compiled
+         * template function. When overriding compileTemplate remember that it
+         * must return a function which takes an object of parameters and values
+         * and returns a formatted HTML string.
+         */
+        compileTemplate(rawTemplate: any): any;
+    }
+
+    /**
+     * The Renderer object was extracted from the ItemView rendering process, in
+     * order to create a consistent and re-usable method of rendering a template
+     * with or without data.
+     */
+    class Renderer {
+        /**
+         *  This method returns a string containing the result of applying the
+         * template using the data object as the context.
+         * @param template The template to render. If this is a function this is
+         * treated as a pre-compiled template and does not try to compile it again. This
+         * allows any view that supports a template parameter to specify a pre-compiled
+         * template function as the template setting. The template function does not
+         * have to be any specific template engine. It only needs to be a function
+         * that returns valid HTML as a string from the data parameter passed to
+         * the function.
+         */
+        static render(template: any, data: any): string;
+    }
+
+    /**
+     * This base view provides some common and core functionality for other views
+     * to take advantage of.
+     * Note: The Marionette.View class is not intended to be used directly. It
+     * exists as a base view for other view classes to be extended from, and to
+     * provide a common location for behaviors that are shared across all views.
+     */
+    class View<TModel extends Backbone.Model> extends Backbone.View<TModel> {
+
+        constructor(options?: Backbone.ViewOptions<TModel>);
+
+        /**
+         * Defines behaviors attached to this view.
+         */
+        behaviors: any;
+
+        /**
+         * Defines `triggers` to forward DOM events to view
+         * events. `triggers: {"click .foo": "do:foo"}`
+         */
+        triggers:{[key:string]:any};
+
+        /**
+         * A configuration hash for models. The left side is the event on
+         * the model, and the right side is the name of the
+         * method on the view or a function to handle the event. This property
+         * can also be a function that returns the hash described above.
+         */
+        modelEvents: any;
+
+        /**
+         * A configuration hash for collections. The left side is the event on
+         * the collection, and the right side is the name of the
+         * method on the view or a function to handle the event. This property
+         * can also be a function that returns the hash described above.
+         */
+        collectionEvents: any;
+
+        /**
+         * In several cases you need to access ui elements inside the view to
+         * retrieve their data or manipulate them. For example you have a certain
+         * div element you need to show/hide based on some state, or other ui
+         * element that you wish to set a css class to it. Instead of having
+         * jQuery selectors hanging around in the view's code you can define a
+         * ui hash that contains a mapping between the ui element's name and its
+         * jQuery selector. Afterwards you can simply access it via
+         * this.ui.elementName.
+         */
+        ui: any;
+
+        /**
+         * There may be some cases where you need to change the template that is
+         * used for a view, based on some simple logic such as the value of a
+         * specific attribute in the view's model. To do this, you can provide a
+         * getTemplate function on your views and use this to return the template
+         * that you need.
+         */
+        getTemplate(): any;
+
+
+        /**
+         * Retrieve an object's attribute either directly from the object, or
+         * from the object's this.options, with this.options taking precedence.
+         */
+        getOption<T>(optionName:string): T;
+
+        mixinTemplateHelpers(target?: any): any;
+        configureTriggers(): any;
+
+        /**
+         * View implements a destroy method, which is called by the region managers automatically. As part of the implementation.
+         */
+        destroy(...args: any[]): void;
+
+        /**
+         * In several cases you need to access ui elements inside the view to
+         * retrieve their data or manipulate them. For example you have a certain
+         * div element you need to show/hide based on some state, or other ui
+         * element that you wish to set a css class to it. Instead of having jQuery
+         * selectors hanging around in the view's code you can define a ui hash
+         * that contains a mapping between the ui element's name and its jQuery
+         * selector. Afterwards you can simply access it via this.ui.elementName.
+         * This functionality is provided via the bindUIElements method.
+         * Since View doesn't implement the render method, then if you directly
+         * extend from View you will need to invoke this method from your render
+         * method. In ItemView and CompositeView this is already taken care of.
+         */
+        bindUIElements(): any;
+
+        unbindUIElements(): any;
+
+        triggerMethod(name: string, ...args: any[]): any;
+
+        /**
+         * Called on the view instance when the view has been rendered and
+         * displayed. This event can be used to react to when a view has been
+         * shown via a region. A common use case for the onShow method is to
+         * use it to add children views.
+         */
+        onShow(): void;
+
+        /**
+         * Triggered just after the view has been destroyed.
+         */
+        onDestroy(): void;
+
+        /**
+         * When destroying a view, an onBeforeDestroy method will be called, if
+         * it has been provided, just before the view destroys. It will be passed
+         * any arguments that destroy was invoked with.
+         */
+        onBeforeDestroy(...args: any[]): void;
+
+        /**
+         * Called anytime that showing the view in a Region causes it to be
+         * attached to the document.
+         */
+        onAttach(): void;
+
+        /**
+         * Triggered right before the view is attached to the document.
+         */
+        onBeforeAttach(): void;
+
+        /**
+         * Triggered after the view has been rendered, has been shown in the DOM via a Marionette.Region, and has been re-rendered.
+         * This event / callback is useful for DOM-dependent UI plugins such as jQueryUI or KendoUI.
+         */
+        onDomRefresh(): void;
+
+        /**
+         * Internal properties extended in Marionette.View.
+         */
+        isDestroyed: boolean;
+        supportsRenderLifecycle: boolean;
+        supportsDestroyLifecycle: boolean;
+    }
+
+    /**
+     * An ItemView is a view that represents a single item. That item may be
+     * a Backbone.Model or may be a Backbone.Collection. Whichever it is though,
+     * it will be treated as a single item.
+     */
+    class ItemView<TModel extends Backbone.Model> extends View<TModel> {
+
+        constructor(options?: Backbone.ViewOptions<TModel>);
+
+        /**
+         * Item views will serialize a model or collection, by default, by calling
+         * .toJSON on either the model or collection. If both a model and
+         * collection are attached to an item view, the model will be used as the
+         * data source. The results of the data serialization will be passed to
+         * the template that is rendered.
+         *
+         * If you need custom serialization for your data, you can provide a serializeData
+         * method on your view. It must return a valid JSON object, as if you had
+         * called .toJSON on a model or collection.
+         */
+        serializeData(): any;
+
+        /**
+         * Renders the view. It is unwise to override the render method of any
+         * Marionette view. Instead, you should use the onBeforeRender and
+         * onRender callbacks to layer in additional functionality to the
+         * rendering of your view.
+         */
+        render(): ItemView<TModel>;
+
+        /**
+         * Triggered before an ItemView is rendered.
+         */
+        onBeforeRender(): void;
+
+        /**
+         * Triggered after the view has been rendered. You can implement this in
+         * your view to provide custom code for dealing with the view's el after
+         * it has been rendered.
+         */
+        onRender(): void;
+    }
+
+
+    interface CollectionViewOptions<TModel extends Backbone.Model> extends Backbone.ViewOptions<TModel> {
+
+        /**
+         * By default the CollectionView will maintain a sorted collection's order
+         * in the DOM. This behavior can be disabled by specifying {sort: false}
+         * on initialize.
+         */
+        sort?: boolean;
+
+        /**
+         * This option is useful when you have performance issues when you
+         * resort your CollectionView. Without this option, your CollectionView
+         * will be completely re-rendered, which can be costly if you have a
+         * large number of elements or if your ChildViews are complex. If this
+         * option is activated, when you sort your Collection, there will be no
+         * re-rendering, only the DOM nodes will be reordered. This can be a
+         * problem if your ChildViews use their collection's index in their
+         * rendering. In this case, you cannot use this option as you need to
+         * re-render each ChildView.
+         *
+         * If you combine this option with a filter that changes the views that
+         * are to be displayed, reorderOnSort will be bypassed to render new
+         * children and remove those that are rejected by the filter.
+         */
+        reorderOnSort?: boolean;
+    }
+
+    /**
+     * The CollectionView will loop through all of the models in the specified
+     * collection, render each of them using a specified childView, then append
+     * the results of the child view's el to the collection view's el. By
+     * default the CollectionView will maintain a sorted collection's order in the
+     * DOM. This behavior can be disabled by specifying {sort: false} on
+     * initialize.
+     */
+    class CollectionView<TModel extends Backbone.Model, TView extends View<Backbone.Model>> extends View<TModel> {
+        constructor(options?: CollectionViewOptions<TModel>);
+
+        /**
+         * Specify a childView in your collection view definition. This must be a
+         * Backbone view object definition, not an instance. It can be any
+         * Backbone.View or be derived from Marionette.ItemView
+         */
+        childView: new (...args:any[]) => TView;
+
+        /**
+         * There may be scenarios where you need to pass data from your parent
+         * collection view in to each of the childView instances. To do this,
+         * provide a childViewOptions definition on your collection view as an
+         * object literal. This will be passed to the constructor of your childView
+         * as part of the options.
+         *
+         * You can also specify the childViewOptions as a function, if you need to
+         * calculate the values to return at runtime. The model will be passed
+         * into the function should you need access to it when calculating
+         * childViewOptions. The function must return an object, and the attributes of
+         * the object will be copied to the childView instance's options.
+         */
+        childViewOptions: any;
+
+        /**
+         * You can customize the event prefix for events that are forwarded through
+         * the collection view. To do this, set the childViewEventPrefix on the
+         * collection view.
+         */
+        childViewEventPrefix: string;
+
+        /**
+         * You can specify a childEvents hash or method which allows you to
+         * capture all bubbling childEvents without having to manually set bindings.
+         * The keys of the hash can either be a function or a string that is the
+         * name of a method on the collection view.
+         */
+        childEvents: any;
+
+        /**
+         * When a collection has no children, and you need to render a view other than
+         * the list of childViews, you can specify an emptyView attribute on your collection
+         * view.
+         */
+        emptyView: any;
+
+        /**
+         * Similar to childView and childViewOptions, there is an emptyViewOptions
+         * property that will be passed to the emptyView constructor. It can be
+         * provided as an object literal or as a function. If emptyViewOptions
+         * aren't provided the CollectionView will default to passing the
+         * childViewOptions to the emptyView.
+         */
+        emptyViewOptions: any;
+
+        /**
+         * The CollectionView uses Backbone.BabySitter to store and manage its
+         * child views. This allows you to easily access the views within the
+         * collection view, iterate them, find them by a given indexer such as the
+         * view's model or collection, and more.
+         */
+        children: Backbone.ChildViewContainer<TView>;
+
+        /**
+         * The render method of the collection view is responsible for rendering the
+         * entire collection. It loops through each of the children in the collection
+         * and renders them individually as an childView.
+         */
+        render(): CollectionView<TModel, TView>;
+
+        /**
+         * The addChild method is responsible for rendering the childViews and
+         * adding them to the HTML for the collectionView instance. It is also
+         * responsible for triggering the events per ChildView. In most cases you
+         * should not override this method.
+         */
+        addChild(item: any, ChildView: TView, index: Number): void;
+
+        /** Render the child view */
+        renderChildView(view: TView, index: Number): void;
+
+        /**
+         * When a custom view instance needs to be created for the childView that
+         * represents a child, override the buildChildView method. This method
+         * takes three parameters and returns a view instance to be used as the
+         * child view.
+         */
+        buildChildView(child: any, ItemViewType: any, itemViewOptions: any): TView;
+
+        /**
+         * Remove the child view and destroy it. This function also updates the indices of
+         * later views in the collection in order to keep the children in sync with the collection.
+         */
+        removeChildView(view: TView): TView;
+
+        /**
+         * Determines if the view is empty. If you want to control when the empty
+         * view is rendered, you can override isEmpty.
+         */
+        isEmpty(): boolean;
+
+        /**
+         * If empty, show the empty view
+         */
+        checkEmpty(): void;
+
+        /**
+         * Destroy the child views that this collection view
+         * is holding on to, if any. This returns destroyed children.
+         */
+        destroyChildren(): Backbone.ChildViewContainer<TView>;
+
+        /**
+         * By default the CollectionView will maintain the order of its collection
+         * in the DOM. However on occasions the view may need to re-render to make
+         * this possible, for example if you were to change the comparator on the
+         * collection. By default CollectionView will call render when this happens,
+         * but there are cases where this may not be suitable. For instance when
+         * sorting the children in a CompositeView, you want to only render the
+         * internal collection.
+         */
+        resortView(): void;
+
+        /**
+         * By default the collection view will append the HTML of each ChildView
+         * into the element buffer, and then call jQuery's .append once at the end
+         * to move the HTML into the collection view's el.
+         * You can override this by specifying an attachHtml method in your view
+         * definition.
+         * @param collectionView the instance of the collection view that will receive the HTML.
+         * @param childView the current child view instance.
+         * @param index he index of the model that this childView instance represents,
+         * in the collection that the model came from. This is useful for sorting
+         * a collection and displaying the sorted list in the correct order on the
+         * screen.
+         */
+        attachHtml(collectionView: CollectionView<TModel, TView>, childView: TView, index: number): void;
+
+        /**
+         * The value returned by this method is the ChildView class that will be
+         * instantiated when a Model needs to be initially rendered. This method
+         * also gives you the ability to customize per Model ChildViews.
+         */
+        getChildView<M extends Backbone.Model>(item: M): new (...args:any[]) => TView;
+
+        /**
+         * If you need the emptyView's class chosen dynamically, specify
+         * getEmptyView.
+         */
+        getEmptyView(): any;
+
+        /** Serialize a collection by serializing each of its models. */
+        serializeCollection(): any;
+
+        /**
+         * Attaches the content of a given view.
+        * This method can be overridden to optimize rendering,
+        * or to render in a non standard way.
+        *
+        * For example, using `innerHTML` instead of `$el.html`
+        *
+        * @example
+        * attachElContent: function(html) {
+        *   this.el.innerHTML = html;
+        *   return this;
+        * }
+        */
+        attachElContent(html: string): ItemView<TModel>;
+
+        /**
+         * Reorder DOM after sorting. When your element's rendering
+         * do not use their index, you can pass reorderOnSort: true
+         * to only reorder the DOM after a sort instead of rendering
+         * all the collectionView
+         */
+        reorder(): void;
+
+        /**
+         * Render and show the emptyView. Similar to addChild method
+         * but "add:child" events are not fired, and the event from
+         * emptyView are not forwarded
+         */
+        addEmptyView(child: TModel, EmptyView: new (...args: any[]) => any): void;
+
+        /**
+         * Handle cleanup and other destroying needs for the collection of views
+         */
+        destroy(): CollectionView<TModel, TView>;
+
+        /**
+         * Set up the child view event forwarding. Uses a "childview:"
+         * prefix in front of all forwarded events.
+         * @param view it might be ChildView or EmptyView.
+         */
+        proxyChildEvents(view: any): void;
+
+        /**
+         * Called just prior to rendering the collection view.
+         */
+        onBeforeRender(): void;
+
+        /**
+         * Triggered after the view has been rendered. You can implement this in
+         * your view to provide custom code for dealing with the view's el after
+         * it has been rendered.
+         */
+        onRender(): void;
+
+        /**
+         * This callback function allows you to know when a child / child view
+         * instance is about to be added to the collection view. It provides
+         * access to the view instance for the child that was added.
+         */
+        onBeforeAddChild(childView: TView): void;
+
+        /**
+         * This callback function allows you to know when a child / child view
+         * instance has been added to the collection view. It provides access to
+         * the view instance for the child that was added.
+         */
+        onAddChild(childView: TView): void;
+
+        /**
+         * This callback function allows you to know when a childView instance is
+         * about to be removed from the collectionView. It provides access to the
+         * view instance for the child that was removed.
+         */
+        onBeforeRemoveChild(childView: TView): void;
+
+        /**
+         * This callback function allows you to know when a child / childView
+         * instance has been deleted or removed from the collection.
+         */
+        onRemoveChild(childView: TView): void;
+    }
+
+    /**
+     * A CompositeView extends from CollectionView to be used as a composite view
+     * for scenarios where it should represent both a branch and leaf in a tree
+     * structure, or for scenarios where a collection needs to be rendered within
+     * a wrapper template.
+     */
+    class CompositeView<TModel extends Backbone.Model, TView extends View<Backbone.Model>> extends CollectionView<TModel, TView> {
+
+        constructor(options?: CollectionViewOptions<TModel>);
+
+        /**
+         * Each childView will be rendered using the childView's template. The
+         * CompositeView's template is rendered and the childView's templates are
+         * added to this.
+         */
+        childView: new (...args:any[]) => TView;
+
+        /**
+         * By default the composite view uses the same attachHtml method that the
+         * collection view provides. This means the view will call jQuery's
+         * .append to move the HTML contents from the child view instance in to
+         * the collection view's el.
+         * This is typically not very useful as a composite view will usually render
+         * a container DOM element in which the child views should be placed.
+         * This can be either a string or a function returning a string.
+         */
+        childViewContainer: any;
+
+        /**
+        * Renders the view.
+        */
+        render(): CompositeView<TModel, TView>;
+
+        /**
+         * Invoked before the model has been rendered
+         */
+        onBeforeRenderTemplate(): void;
+
+        /**
+         * Invoked after the model has been rendered.
+         */
+        onRenderTemplate(): void;
+
+        /**
+         * Invoked before the collection of models is rendered
+         */
+        onBeforeRenderCollection(): void;
+
+        /**
+         * Invoked after the collection of models has been rendered
+         */
+        onRenderCollection(): void;
+    }
+
+    interface LayoutViewOptions<TModel extends Backbone.Model> extends Backbone.ViewOptions<TModel> {
+        /**
+         * The LayoutView takes an additional parameter where you can pass the regions as option on creation.
+         */
+        regions?:any;
+
+        /**
+         * This option removes the layoutView from the DOM before destroying the
+         * children preventing repaints as each option is removed. However, it
+         * makes it difficult to do close animations for a child view (false by
+         * default)
+         */
+        destroyImmediate?: boolean;
+    }
+
+    /**
+     * A LayoutView is a hybrid of an ItemView and a collection of Region objects.
+     * They are ideal for rendering application layouts with multiple sub-regions
+     * managed by specified region managers.
+     * A layoutView can also act as a composite-view to aggregate multiple views
+     * and sub-application areas of the screen allowing applications to attach
+     * multiple region managers to dynamically rendered HTML.
+     * You can create complex views by nesting layoutView managers within Regions.
+     */
+    class LayoutView<TModel extends Backbone.Model> extends ItemView<TModel> {
+        /**
+         * If you have the need to replace the Region with a region class of your
+         * own implementation, you can specify an alternate class to use with this
+         * property.
+         */
+        regionClass: any;
+
+        /**
+         * Constructor.
+         * A hash that can contain a regions hash that allows you to specify regions per
+         * LayoutView instance.
+         */
+        constructor(options?: LayoutViewOptions<TModel>);
+
+        /**
+         * Handle destroying regions, and then destroy the view itself.
+         */
+        destroy(): LayoutView<TModel>;
+
+        /**
+         * Regions hash or a method returning the regions hash that maps
+         * regions/selectors to methods on your View.
+         **/
+        regions(): any;
+
+        /** Adds a region to the layout view. */
+        addRegion(name: string, definition: any): Region;
+
+        /**
+         * Add multiple regions as a {name: definition, name2: def2} object literal.
+         */
+        addRegions(regions: any): any;
+
+        /** Returns a region from the layout view */
+        getRegion(name: string): Region;
+
+        /**
+         * Renders the view. It will use the existing region objects the first
+         * time it is called. Subsequent calls will destroy the views that the
+         * regions are showing and then reset the `el` for the regions to the
+         * newly rendered DOM elements.
+         */
+        render(): LayoutView<TModel>;
+
+        /**
+         * Removes the region with the specified name.
+         * @param name the name of the region to remove.
+         */
+        removeRegion(name: string): Region;
+
+        /** Enable easy overriding of the default `RegionManager`
+          * for customized region interactions and business specific
+          * view logic for better control over single regions.
+          */
+        getRegionManager(): RegionManager;
+
+        /**
+         * Show a view into the region specified by `regionName`.
+         */
+        showChildView(regionName: string, view: any, options?: RegionShowOptions): void;
+
+        /**
+         * Get the current view that is shown in the region specified by
+         * `regionName`.
+         */
+        getChildView(regionName: string): Backbone.View<TModel>;
+
+        /**
+         * Returns all regions from the layout view. The results contains an
+         * Object hash that has `string`s as keys and `Region`s as values.
+         */
+        getRegions(): {[key: string]: Region};
+
+        /**
+         * You can customize the event prefix for events that are forwarded through
+         * the layout view with this property.
+         */
+        childViewEventPrefix: string;
+    }
+
+    interface AppRouterOptions extends Backbone.RouterOptions {
+        /**
+         * The appRoutes.
+         */
+        appRoutes?: any;
+
+        /**
+         * The controller to associate with this router.
+         */
+        controller?: any;
+    }
+
+    /**
+     * Reduce the boilerplate code of handling route events and then calling a
+     * single method on another object. Have your routers configured to call
+     * the method on your object, directly.
+     */
+    class AppRouter extends Backbone.Router {
+
+        /**
+         * Configure an AppRouter with appRoutes. The route definition
+         * is passed on to Backbone's standard routing handlers. This means
+         * that you define routes like you normally would. However, instead of
+         * providing a callback method that exists on the router, you provide a
+         * callback method that exists on the controller, which you specify for
+         * the router instance (see below.)
+         */
+        constructor(options?: AppRouterOptions);
+
+        /**
+         * You can specify a controller with the multiple routes at runtime with
+         * this method. However, In this case the current controller of AppRouter
+         * will not change.
+         */
+        processAppRoutes(controller: any, appRoutes: any): void;
+
+        /**
+         * Adds an app route at runtime to this instance. It works the same as the
+         * built-in router.route() call from Backbone's Router, but has all the
+         * same semantics and behavior of the appRoutes configuration.
+         */
+        appRoute(route: string, methodName: string): void;
+    }
+
+    /**
+     * The Backbone.Marionette.Application object is the hub of your composite
+     * application. It organizes, initializes and coordinates the various pieces
+     * of your app. It also provides a starting point for you to call into from
+     * your HTML script block, or directly from your JavaScript files if you
+     * prefer to go that route. The Application is meant to be instantiated
+     * directly, although you can extend it to add your own functionality.
+     */
+    class Application extends Backbone.Events {
+
+        constructor(options?: any);
+
+        /**
+         * The Event Aggregator is available through this property. It is
+         * convenient for passively sharing information between pieces of your
+         * application as events occur.
+         * Note! To access this application channel from other objects within your
+         * app you are encouraged to get a handle of the systems through the
+         * Wreqr API instead of the Application instance itself.
+         */
+        vent: Backbone.Wreqr.EventAggregator;
+
+        /**
+         * Commands are used to make any component tell another component to
+         * perform an action without a direct reference to it.
+         */
+        commands: Backbone.Wreqr.Commands;
+
+        /**
+         * Request Response is a means for any component to request information
+         * from another component without being tightly coupled.
+         */
+        reqres: Backbone.Wreqr.RequestResponse;
+
+        submodules: any;
+
+        /** Command execution, facilitated by Backbone.Wreqr.Commands */
+        execute(...args: any[]): void;
+
+        /** Request/response, facilitated by Backbone.Wreqr.RequestResponse */
+        request(...args: any[]): any;
+
+        /** Deprecated! Initializers, you should use events to manage start-up logic. */
+        addInitializer(initializer: any): void;
+
+        /**
+         * Once you have your application configured, you can kick everything off
+         * by calling this method.
+         * @param options This parameter will be passed to each of your initializer functions, as well as the initialize events. This allows you to provide extra configuration for various parts of your app throughout the initialization sequence.
+         */
+        start(options?: any): void;
+
+        /** Deprecated! nstead of using the Application as the root of your view tree, you should use a Layout View.*/
+        addRegions(regions: any): any;
+
+        /** Deprecated! nstead of using the Application as the root of your view tree, you should use a Layout View.*/
+        emptyRegions(): void;
+
+        /** Deprecated! nstead of using the Application as the root of your view tree, you should use a Layout View.*/
+        removeRegion(region: Region): void;
+
+        /** Deprecated! nstead of using the Application as the root of your view tree, you should use a Layout View.*/
+        getRegion(regionName: string): Region;
+
+        module(moduleNames: any, moduleDefinition: any): Module;
+
+        /**
+         * Called just before the Application starts and before the initializers are executed.
+         */
+        onBeforeStart(options?: any): void;
+
+        /**
+         * Called after the Application has started and after the initializers have been executed.
+         */
+        onStart(options?: any): void;
+    }
+
+    // modules mapped for convenience, but you should probably use TypeScript modules instead
+    class Module extends Backbone.Events {
+
+        constructor(moduleName: string, app: Application);
+
+        submodules: any;
+        triggerMethod(name: string, ...args: any[]): any;
+
+        addInitializer(callback: any): void;
+        addFinalizer(callback: any): void;
+        start(options?: any): void;
+        addDefinition(moduleDefinition: any, customArgs: any): any;
+    }
+
+    /**
+     * A Behavior is an isolated set of DOM / user interactions that can be mixed
+     * into any View or another Behavior. Behaviors allow you to blackbox View
+     * specific interactions into portable logical chunks, keeping your views
+     * simple and your code DRY.
+     */
+    class Behavior extends Marionette.Object {
+        constructor(options?: any, view?: any);
+
+        options: any;
+
+		/**
+         * Behaviors can have their own ui hash, which will be mixed into the ui
+         * hash of its associated View instance. ui elements defined on either the
+         * Behavior or the View will be made available within events and triggers.
+         * They also are attached directly to the Behavior and can be accessed within
+         * Behavior methods as this.ui.
+         */
+        ui: any;
+
+        /**
+         * Any triggers you define on the Behavior will be triggered in response to the appropriate event on the view.
+         */
+        triggers: any;
+
+        /**
+         * modelEvents will respond to the view's model events.
+         */
+        modelEvents: any;
+
+        /**
+         * collectionEvents will respond to the view's collection events.
+         */
+        collectionEvents: any;
+
+        /**
+         * The behaviors key allows a behavior to group multiple behaviors
+         * together.
+         */
+        behaviors: any;
+
+        /**
+         * defaults can be a hash or function to define the default options for
+         * your behavior. The default options will be overridden depending on
+         * what you set as the options per behavior (this works just like a
+         * backbone.model).
+         */
+        defaults: any;
+
+        /**
+         * el is a direct proxy of the view's el
+         */
+        el: any;
+
+        /**
+         * $el is a direct proxy of the view's el cached as a jQuery selector.
+         */
+        $el: JQuery;
+
+        /** A reference to the view instance that the behavior is on. */
+        view: any;
+
+        /**
+         * $ is a direct proxy of the views $ lookup method.
+         */
+        $(selector: any): JQuery;
+    }
+
+    /**
+     * Marionette.Behaviors' is a utility class that takes care of glueing your
+     * behavior instances to their given View. The most important part of this
+     * class is that you MUST override the class level behaviorsLookup method or
+     * set the option behaviorClass for things to work properly.
+     */
+    class Behaviors {
+        /**
+         * This method defines where your behavior classes are stored. Override this to provide another lookup.
+         */
+        static behaviorsLookup(): any;
+
+        /**
+         * This method has a default implementation that is simple to override. It
+         * is responsible for the lookup of single behavior from within the
+         * Behaviors.behaviorsLookup or elsewhere. Note that it should return the type of the
+         * class to instantiate, not an instance of that class.
+         */
+        static getBehaviorClass(options: any, key: string): any;
+    }
+}
diff --git a/marionette/marionette-tests.ts b/backbone.marionette/marionette-tests.ts
similarity index 98%
rename from marionette/marionette-tests.ts
rename to backbone.marionette/marionette-tests.ts
index 6a688467af..b5eb9d07c6 100644
--- a/marionette/marionette-tests.ts
+++ b/backbone.marionette/marionette-tests.ts
@@ -1,6 +1,7 @@
-/// <reference path="marionette.d.ts" />
+import * as Marionette from 'backbone.marionette';
+import * as Backbone from 'backbone';
 
-namespace Marionette.Tests {
+namespace MarionetteTests {
     class DestroyWarn extends Marionette.Behavior {
         // you can set default options
         // just like you can in your Backbone Models
diff --git a/backbone.marionette/tsconfig.json b/backbone.marionette/tsconfig.json
new file mode 100644
index 0000000000..fa5166772f
--- /dev/null
+++ b/backbone.marionette/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "marionette-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/backbone.paginator/backbone.paginator-tests.ts b/backbone.paginator/backbone.paginator-tests.ts
index c05a07b9d1..28b09d4fc5 100644
--- a/backbone.paginator/backbone.paginator-tests.ts
+++ b/backbone.paginator/backbone.paginator-tests.ts
@@ -1,6 +1,7 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../backbone/backbone.d.ts" />
-/// <reference path="backbone.paginator.d.ts" />
+/// <reference types="jquery" />
+
+
+import * as Backbone from 'backbone';
 
 namespace BackbonePaginatorTests {
 
diff --git a/backbone.paginator/backbone.paginator.d.ts b/backbone.paginator/backbone.paginator.d.ts
deleted file mode 100644
index b256919893..0000000000
--- a/backbone.paginator/backbone.paginator.d.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-// Type definitions for backbone.paginator 2.0.2
-// Project: https://github.com/backbone-paginator/backbone.paginator
-// Definitions by: Nyamazing <https://github.com/Nyamazing/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../backbone/backbone.d.ts" />
-
-declare namespace Backbone {
-
-  interface PageableState {
-    firstPage?:    number;
-    lastPage?:     number;
-    currentPage?:  number;
-    pageSize?:     number;
-    totalPages?:   number;
-    totalRecords?: number;
-    sortKey?:      string;
-    order?:        number;
-  }
-
-  interface PageableQueryParams {
-    currentPage?:  string;
-    pageSize?:     string;
-    totalPages?:   string;
-    totalRecords?: string;
-    sortKey?:      string;
-    order?:        string;
-    directions?:   any;
-  }
-
-  interface PageableInitialOptions {
-    comparator?: (...options: any[]) => number;
-    full?: boolean;
-    state?: PageableState;
-    queryParam?: PageableQueryParams;
-  }
-
-  interface PageableParseLinksOptions {
-    xhr?: JQueryXHR;
-  }
-
-  interface PageableSetSortingOptions<TModel extends Model> {
-    side?: string;
-    full?: boolean;
-    sortValue?: (model: TModel, sortKey: string) => any | string;
-  }
-
-  interface PageableSwitchModeOptions {
-    fetch?:      boolean;
-    resetState?: boolean;
-  }
-
-  type PageableGetPageOptions = CollectionFetchOptions|Silenceable;
-
-  class PageableCollection<TModel extends Model> extends Collection<TModel>{
-
-    fullCollection: Collection<TModel>;
-    mode: string;
-    queryParams: PageableQueryParams;
-    state: PageableState;
-
-    constructor(models?: TModel[], options?: PageableInitialOptions);
-
-    fetch(options?: CollectionFetchOptions): JQueryXHR;
-
-    getFirstPage(options?: PageableGetPageOptions):
-                                    JQueryXHR|PageableCollection<TModel>;
-
-    getLastPage(options?:  PageableGetPageOptions):
-                                    JQueryXHR|PageableCollection<TModel>;
-
-    getNextPage(options?:  PageableGetPageOptions):
-                                    JQueryXHR|PageableCollection<TModel>;
-
-    getPage(index: number|string, options?: PageableGetPageOptions):
-                                    JQueryXHR|PageableCollection<TModel>;
-
-    getPageByOffset(offset: number, options?: PageableGetPageOptions):
-                                    JQueryXHR|PageableCollection<TModel>;
-
-    getPreviousPage(options?: PageableGetPageOptions):
-                                    JQueryXHR|PageableCollection<TModel>;
-
-    hasNextPage():     boolean;
-
-    hasPreviousPage(): boolean;
-
-    parse(resp: any, options?: any): any[];
-
-    parseLinks(resp: any, options?: PageableParseLinksOptions): any;
-
-    parseRecords(resp: any, options?: any): any[];
-
-    parseState(resp: any, queryParams: PageableQueryParams,
-               state: PageableState, options?: any): PageableState;
-
-    setPageSize(pageSize: number,
-                options?: CollectionFetchOptions):
-                    JQueryXHR|PageableCollection<TModel>;
-
-    setSorting(sortKey: string, order?: number,
-               options?: PageableSetSortingOptions<TModel>):
-                    PageableCollection<TModel>;
-
-    switchMode(mode?: string, options?: PageableSwitchModeOptions):
-                    JQueryXHR|PageableCollection<TModel>;
-
-    sync(method: string,
-         model: TModel|Collection<TModel>,
-         options?: any): JQueryXHR;
-
-    static noConflict(): typeof PageableCollection;
-
-  }
-}
-
diff --git a/backbone.paginator/index.d.ts b/backbone.paginator/index.d.ts
new file mode 100644
index 0000000000..521ccda8bf
--- /dev/null
+++ b/backbone.paginator/index.d.ts
@@ -0,0 +1,115 @@
+// Type definitions for backbone.paginator 2.0.2
+// Project: https://github.com/backbone-paginator/backbone.paginator
+// Definitions by: Nyamazing <https://github.com/Nyamazing/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as Backbone from 'backbone';
+
+declare module 'backbone' {
+  interface PageableState {
+    firstPage?:    number;
+    lastPage?:     number;
+    currentPage?:  number;
+    pageSize?:     number;
+    totalPages?:   number;
+    totalRecords?: number;
+    sortKey?:      string;
+    order?:        number;
+  }
+
+  interface PageableQueryParams {
+    currentPage?:  string;
+    pageSize?:     string;
+    totalPages?:   string;
+    totalRecords?: string;
+    sortKey?:      string;
+    order?:        string;
+    directions?:   any;
+  }
+
+  interface PageableInitialOptions {
+    comparator?: (...options: any[]) => number;
+    full?: boolean;
+    state?: PageableState;
+    queryParam?: PageableQueryParams;
+  }
+
+  interface PageableParseLinksOptions {
+    xhr?: JQueryXHR;
+  }
+
+  interface PageableSetSortingOptions<TModel extends Model> {
+    side?: string;
+    full?: boolean;
+    sortValue?: (model: TModel, sortKey: string) => any | string;
+  }
+
+  interface PageableSwitchModeOptions {
+    fetch?:      boolean;
+    resetState?: boolean;
+  }
+
+  type PageableGetPageOptions = CollectionFetchOptions|Silenceable;
+
+  class PageableCollection<TModel extends Model> extends Collection<TModel>{
+
+    fullCollection: Collection<TModel>;
+    mode: string;
+    queryParams: PageableQueryParams;
+    state: PageableState;
+
+    constructor(models?: TModel[], options?: PageableInitialOptions);
+
+    fetch(options?: CollectionFetchOptions): JQueryXHR;
+
+    getFirstPage(options?: PageableGetPageOptions):
+                                    JQueryXHR|PageableCollection<TModel>;
+
+    getLastPage(options?:  PageableGetPageOptions):
+                                    JQueryXHR|PageableCollection<TModel>;
+
+    getNextPage(options?:  PageableGetPageOptions):
+                                    JQueryXHR|PageableCollection<TModel>;
+
+    getPage(index: number|string, options?: PageableGetPageOptions):
+                                    JQueryXHR|PageableCollection<TModel>;
+
+    getPageByOffset(offset: number, options?: PageableGetPageOptions):
+                                    JQueryXHR|PageableCollection<TModel>;
+
+    getPreviousPage(options?: PageableGetPageOptions):
+                                    JQueryXHR|PageableCollection<TModel>;
+
+    hasNextPage():     boolean;
+
+    hasPreviousPage(): boolean;
+
+    parse(resp: any, options?: any): any[];
+
+    parseLinks(resp: any, options?: PageableParseLinksOptions): any;
+
+    parseRecords(resp: any, options?: any): any[];
+
+    parseState(resp: any, queryParams: PageableQueryParams,
+               state: PageableState, options?: any): PageableState;
+
+    setPageSize(pageSize: number,
+                options?: CollectionFetchOptions):
+                    JQueryXHR|PageableCollection<TModel>;
+
+    setSorting(sortKey: string, order?: number,
+               options?: PageableSetSortingOptions<TModel>):
+                    PageableCollection<TModel>;
+
+    switchMode(mode?: string, options?: PageableSwitchModeOptions):
+                    JQueryXHR|PageableCollection<TModel>;
+
+    sync(method: string,
+         model: TModel|Collection<TModel>,
+         options?: any): JQueryXHR;
+
+    static noConflict(): typeof PageableCollection;
+
+  }
+}
+
diff --git a/backbone.paginator/tsconfig.json b/backbone.paginator/tsconfig.json
new file mode 100644
index 0000000000..ca30ced10e
--- /dev/null
+++ b/backbone.paginator/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "backbone.paginator-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/backbone.radio/backbone.radio-tests.ts b/backbone.radio/backbone.radio-tests.ts
index 295c552af2..27b95dba4a 100644
--- a/backbone.radio/backbone.radio-tests.ts
+++ b/backbone.radio/backbone.radio-tests.ts
@@ -1,5 +1,7 @@
-/// <reference path="backbone.radio.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+
+/// <reference types="jquery" />
+
+import * as Backbone from 'backbone';
 
 class MyCommands extends Backbone.Radio.Commands {
 
diff --git a/backbone.radio/backbone.radio.d.ts b/backbone.radio/backbone.radio.d.ts
deleted file mode 100644
index 50895b0275..0000000000
--- a/backbone.radio/backbone.radio.d.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-// Type definitions for Backbone.Radio v0.8.3
-// Project: https://github.com/marionettejs/backbone.radio
-// Definitions by: Peter Palotas <https://github.com/alphaleonis/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../backbone/backbone.d.ts" />
-
-declare namespace Backbone {
-    interface Radio {
-        tuneIn(channelName: string): Radio;
-        tuneOut(channelName: string): Radio;
-        log(channelName: string, eventName: string, ...args: any[]): void;
-        channel(channelName: string): Radio.Channel;
-    }
-
-    namespace Radio {
-        var VERSION: string;
-        var DEBUG: boolean;
-
-        function log(channelName: string, eventName: string, ...args: any[]): void;
-        function tuneIn(channelName: string): Radio;
-        function tuneOut(channelName: string): Radio;
-        function channel(channelName: string): Channel;
-
-        // Proxy functions for Commands
-        function command(channelName: string, commandName: string, ...args: any[]): void;
-        function comply(channelName: string, commandName: string, callback: (...args: any[]) => void, context?: any): Commands;
-        function comply(channelName: string, commands: { [key: string]: (...args: any[]) => any }, context?: any): Commands;
-        function complyOnce(channelName: string, commandName: string, callback: (...args: any[]) => void, context?: any): Commands;
-        function complyOnce(channelName: string, commands: { [key: string]: (...args: any[]) => any }, context?: any): Commands;
-        function stopComplying(channelName: string, commandName?: string, callback?: (...args: any[]) => void, context?: any): Commands;
-
-        // Proxy functions for Requests
-        function request(channelName: string, requestName: string, ...args: any[]): any;
-        function reply(channelName: string, requestName: string, callback: (...args: any[]) => any, context?: any): Requests;
-        function reply(channelName: string, commands: { [key: string]: (...args: any[]) => any }, context?: any): Requests;
-        function replyOnce(channelName: string, requestName: string, callback: (...args: any[]) => any, context?: any): Requests;
-        function replyOnce(channelName: string, commands: { [key: string]: (...args: any[]) => any }, context?: any): Requests;
-        function stopReplying(channelName: string, commandName?: string, callback?: (...args: any[]) => any, context?: any): Requests;
-
-        // Proxy functions for Backbone.Events
-        function on(channelName: string, eventName: string, callback?: Function, context?: any): any;
-        function off(channelName: string, eventName?: string, callback?: Function, context?: any): any;
-        function trigger(channelName: string, eventName: string, ...args: any[]): any;
-        function bind(channelName: string, eventName: string, callback: Function, context?: any): any;
-        function unbind(channelName: string, eventName?: string, callback?: Function, context?: any): any;
-
-        function once(channelName: string, events: string, callback: Function, context?: any): any;
-        function listenTo(channelName: string, object: any, events: string, callback: Function): any;
-        function listenToOnce(channelName: string, object: any, events: string, callback: Function): any;
-        function stopListening(channelName: string, object?: any, events?: string, callback?: Function): any;
-
-        class Commands {
-            command(commandName: string, ...args: any[]): void;
-            comply(commandName: string, callback: (...args: any[]) => void, context?: any): Commands;
-            comply(commands: { [key: string]: (...args: any[]) => any }, context?: any): Commands;
-            complyOnce(commands: { [key: string]: (...args: any[]) => any }, context?: any): Commands;
-            complyOnce(commandName: string, callback: (...args: any[]) => void, context?: any): Commands;
-            stopComplying(commandName?: string, callback?: (...args: any[]) => void, context?: any): Commands;
-        }
-
-        class Requests {
-            request(requestName: string, ...args: any[]): any;
-            reply(requestName: string, callback: (...args: any[]) => any, context?: any): Requests;
-            reply(commands: { [key: string]: (...args: any[]) => any }, context?: any): Requests;
-            replyOnce(requestName: string, callback: (...args: any[]) => any, context?: any): Requests;
-            replyOnce(commands: { [key: string]: (...args: any[]) => any }, context?: any): Requests;
-            stopReplying(commandName?: string, callback?: (...args: any[]) => any, context?: any): Requests;
-        }
-
-        class Channel extends Backbone.Events implements Commands, Requests {
-            channelName: string;
-            reset(): Channel;
-
-            // Radio.Commands
-            command(commandName: string, ...args: any[]): void;
-            comply(commandName: string, callback: (...args: any[]) => void, context?: any): Commands;
-            comply(commands: { [key: string]: (...args: any[]) => any }, context?: any): Commands;
-            complyOnce(commandName: string, callback: (...args: any[]) => void, context?: any): Commands;
-            complyOnce(commands: { [key: string]: (...args: any[]) => any }, context?: any): Commands;
-            stopComplying(commandName?: string, callback?: (...args: any[]) => void, context?: any): Commands;
-
-            // Radio.Requests
-            request(requestName: string, ...args: any[]): any;
-            reply(requestName: string, callback: (...args: any[]) => any, context?: any): Requests;
-            reply(commands: { [key: string]: (...args: any[]) => any }, context?: any): Requests;
-            replyOnce(requestName: string, callback: (...args: any[]) => any, context?: any): Requests;
-            replyOnce(commands: { [key: string]: (...args: any[]) => any }, context?: any): Requests;
-            stopReplying(commandName?: string, callback?: (...args: any[]) => any, context?: any): Requests;
-        }
-    }
-}
diff --git a/backbone.radio/index.d.ts b/backbone.radio/index.d.ts
new file mode 100644
index 0000000000..5eaa7d2e6d
--- /dev/null
+++ b/backbone.radio/index.d.ts
@@ -0,0 +1,92 @@
+// Type definitions for Backbone.Radio v0.8.3
+// Project: https://github.com/marionettejs/backbone.radio
+// Definitions by: Peter Palotas <https://github.com/alphaleonis/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as Backbone from 'backbone';
+
+declare module "backbone" {
+    interface Radio {
+        tuneIn(channelName: string): Radio;
+        tuneOut(channelName: string): Radio;
+        log(channelName: string, eventName: string, ...args: any[]): void;
+        channel(channelName: string): Radio.Channel;
+    }
+
+    namespace Radio {
+        var VERSION: string;
+        var DEBUG: boolean;
+
+        function log(channelName: string, eventName: string, ...args: any[]): void;
+        function tuneIn(channelName: string): Radio;
+        function tuneOut(channelName: string): Radio;
+        function channel(channelName: string): Channel;
+
+        // Proxy functions for Commands
+        function command(channelName: string, commandName: string, ...args: any[]): void;
+        function comply(channelName: string, commandName: string, callback: (...args: any[]) => void, context?: any): Commands;
+        function comply(channelName: string, commands: { [key: string]: (...args: any[]) => any }, context?: any): Commands;
+        function complyOnce(channelName: string, commandName: string, callback: (...args: any[]) => void, context?: any): Commands;
+        function complyOnce(channelName: string, commands: { [key: string]: (...args: any[]) => any }, context?: any): Commands;
+        function stopComplying(channelName: string, commandName?: string, callback?: (...args: any[]) => void, context?: any): Commands;
+
+        // Proxy functions for Requests
+        function request(channelName: string, requestName: string, ...args: any[]): any;
+        function reply(channelName: string, requestName: string, callback: (...args: any[]) => any, context?: any): Requests;
+        function reply(channelName: string, commands: { [key: string]: (...args: any[]) => any }, context?: any): Requests;
+        function replyOnce(channelName: string, requestName: string, callback: (...args: any[]) => any, context?: any): Requests;
+        function replyOnce(channelName: string, commands: { [key: string]: (...args: any[]) => any }, context?: any): Requests;
+        function stopReplying(channelName: string, commandName?: string, callback?: (...args: any[]) => any, context?: any): Requests;
+
+        // Proxy functions for Backbone.Events
+        function on(channelName: string, eventName: string, callback?: Function, context?: any): any;
+        function off(channelName: string, eventName?: string, callback?: Function, context?: any): any;
+        function trigger(channelName: string, eventName: string, ...args: any[]): any;
+        function bind(channelName: string, eventName: string, callback: Function, context?: any): any;
+        function unbind(channelName: string, eventName?: string, callback?: Function, context?: any): any;
+
+        function once(channelName: string, events: string, callback: Function, context?: any): any;
+        function listenTo(channelName: string, object: any, events: string, callback: Function): any;
+        function listenToOnce(channelName: string, object: any, events: string, callback: Function): any;
+        function stopListening(channelName: string, object?: any, events?: string, callback?: Function): any;
+
+        class Commands {
+            command(commandName: string, ...args: any[]): void;
+            comply(commandName: string, callback: (...args: any[]) => void, context?: any): Commands;
+            comply(commands: { [key: string]: (...args: any[]) => any }, context?: any): Commands;
+            complyOnce(commands: { [key: string]: (...args: any[]) => any }, context?: any): Commands;
+            complyOnce(commandName: string, callback: (...args: any[]) => void, context?: any): Commands;
+            stopComplying(commandName?: string, callback?: (...args: any[]) => void, context?: any): Commands;
+        }
+
+        class Requests {
+            request(requestName: string, ...args: any[]): any;
+            reply(requestName: string, callback: (...args: any[]) => any, context?: any): Requests;
+            reply(commands: { [key: string]: (...args: any[]) => any }, context?: any): Requests;
+            replyOnce(requestName: string, callback: (...args: any[]) => any, context?: any): Requests;
+            replyOnce(commands: { [key: string]: (...args: any[]) => any }, context?: any): Requests;
+            stopReplying(commandName?: string, callback?: (...args: any[]) => any, context?: any): Requests;
+        }
+
+        class Channel extends Backbone.Events implements Commands, Requests {
+            channelName: string;
+            reset(): Channel;
+
+            // Radio.Commands
+            command(commandName: string, ...args: any[]): void;
+            comply(commandName: string, callback: (...args: any[]) => void, context?: any): Commands;
+            comply(commands: { [key: string]: (...args: any[]) => any }, context?: any): Commands;
+            complyOnce(commandName: string, callback: (...args: any[]) => void, context?: any): Commands;
+            complyOnce(commands: { [key: string]: (...args: any[]) => any }, context?: any): Commands;
+            stopComplying(commandName?: string, callback?: (...args: any[]) => void, context?: any): Commands;
+
+            // Radio.Requests
+            request(requestName: string, ...args: any[]): any;
+            reply(requestName: string, callback: (...args: any[]) => any, context?: any): Requests;
+            reply(commands: { [key: string]: (...args: any[]) => any }, context?: any): Requests;
+            replyOnce(requestName: string, callback: (...args: any[]) => any, context?: any): Requests;
+            replyOnce(commands: { [key: string]: (...args: any[]) => any }, context?: any): Requests;
+            stopReplying(commandName?: string, callback?: (...args: any[]) => any, context?: any): Requests;
+        }
+    }
+}
diff --git a/backbone.radio/tsconfig.json b/backbone.radio/tsconfig.json
new file mode 100644
index 0000000000..12aa65dc41
--- /dev/null
+++ b/backbone.radio/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "backbone.radio-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/backbone/backbone-global.d.ts b/backbone/backbone-global.d.ts
deleted file mode 100644
index be849cee04..0000000000
--- a/backbone/backbone-global.d.ts
+++ /dev/null
@@ -1,393 +0,0 @@
-// Type definitions for Backbone 1.0.0
-// Project: http://backbonejs.org/
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Natan Vivo <https://github.com/nvivo/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace Backbone {
-
-    interface AddOptions extends Silenceable {
-        at?: number;
-    }
-
-    interface HistoryOptions extends Silenceable {
-        pushState?: boolean;
-        root?: string;
-    }
-
-    interface NavigateOptions {
-        trigger?: boolean;
-        replace?: boolean;
-    }
-
-    interface RouterOptions {
-        routes: any;
-    }
-
-    interface Silenceable {
-        silent?: boolean;
-    }
-
-    interface Validable {
-        validate?: boolean;
-    }
-
-    interface Waitable {
-        wait?: boolean;
-    }
-
-    interface Parseable {
-        parse?: any;
-    }
-
-    interface PersistenceOptions {
-        url?: string;
-        data?: any;
-        beforeSend?: (jqxhr: JQueryXHR) => void;
-        success?: (modelOrCollection?: any, response?: any, options?: any) => void;
-        error?: (modelOrCollection?: any, jqxhr?: JQueryXHR, options?: any) => void;
-    }
-
-    interface ModelSetOptions extends Silenceable, Validable {
-    }
-
-    interface ModelFetchOptions extends PersistenceOptions, ModelSetOptions, Parseable {
-    }
-
-    interface ModelSaveOptions extends Silenceable, Waitable, Validable, Parseable, PersistenceOptions {
-        patch?: boolean;
-    }
-
-    interface ModelDestroyOptions extends Waitable, PersistenceOptions {
-    }
-
-    interface CollectionFetchOptions extends PersistenceOptions, Parseable {
-        reset?: boolean;
-    }
-
-    interface ObjectHash {
-        [key: string]: any;
-    }
-
-    interface RoutesHash {
-        [routePattern: string]: string | {(...urlParts: string[]): void};
-    }
-
-    interface EventsHash {
-        [selector: string]: string | {(eventObject: JQueryEventObject): void};
-    }
-
-    class Events {
-        on(eventName: string, callback?: Function, context?: any): any;
-        on(eventMap: EventsHash): any;
-        off(eventName?: string, callback?: Function, context?: any): any;
-        trigger(eventName: string, ...args: any[]): any;
-        bind(eventName: string, callback: Function, context?: any): any;
-        unbind(eventName?: string, callback?: Function, context?: any): any;
-
-        once(events: string, callback: Function, context?: any): any;
-        listenTo(object: any, events: string, callback: Function): any;
-        listenToOnce(object: any, events: string, callback: Function): any;
-        stopListening(object?: any, events?: string, callback?: Function): any;
-    }
-
-    class ModelBase extends Events {
-        url: any;
-        parse(response: any, options?: any): any;
-        toJSON(options?: any): any;
-        sync(...arg: any[]): JQueryXHR;
-    }
-
-    class Model extends ModelBase {
-
-        /**
-        * Do not use, prefer TypeScript's extend functionality.
-        **/
-        private static extend(properties: any, classProperties?: any): any;
-
-        attributes: any;
-        changed: any[];
-        cid: string;
-        collection: Collection<any>;
-
-        /**
-        * Default attributes for the model. It can be an object hash or a method returning an object hash.
-        * For assigning an object hash, do it like this: this.defaults = <any>{ attribute: value, ... };
-        * That works only if you set it in the constructor or the initialize method.
-        **/
-        defaults(): ObjectHash;
-        id: any;
-        idAttribute: string;
-        validationError: any;
-        urlRoot: any;
-
-        constructor(attributes?: any, options?: any);
-        initialize(attributes?: any, options?: any): void;
-
-        fetch(options?: ModelFetchOptions): JQueryXHR;
-
-        /**
-        * For strongly-typed access to attributes, use the `get` method only privately in public getter properties.
-        * @example
-        * get name(): string {
-        *    return super.get("name");
-        * }
-        **/
-        /*private*/ get(attributeName: string): any;
-
-        /**
-        * For strongly-typed assignment of attributes, use the `set` method only privately in public setter properties.
-        * @example
-        * set name(value: string) {
-        *    super.set("name", value);
-        * }
-        **/
-        /*private*/ set(attributeName: string, value: any, options?: ModelSetOptions): Model;
-        set(obj: any, options?: ModelSetOptions): Model;
-
-        change(): any;
-        changedAttributes(attributes?: any): any[];
-        clear(options?: Silenceable): any;
-        clone(): Model;
-        destroy(options?: ModelDestroyOptions): any;
-        escape(attribute: string): string;
-        has(attribute: string): boolean;
-        hasChanged(attribute?: string): boolean;
-        isNew(): boolean;
-        isValid(options?:any): boolean;
-        previous(attribute: string): any;
-        previousAttributes(): any[];
-        save(attributes?: any, options?: ModelSaveOptions): any;
-        unset(attribute: string, options?: Silenceable): Model;
-        validate(attributes: any, options?: any): any;
-
-        private _validate(attributes: any, options: any): boolean;
-
-        // mixins from underscore
-
-        keys(): string[];
-        values(): any[];
-        pairs(): any[];
-        invert(): any;
-        pick(keys: string[]): any;
-        pick(...keys: string[]): any;
-        omit(keys: string[]): any;
-        omit(...keys: string[]): any;
-    }
-
-    class Collection<TModel extends Model> extends ModelBase {
-
-        /**
-        * Do not use, prefer TypeScript's extend functionality.
-        **/
-        private static extend(properties: any, classProperties?: any): any;
-
-        model: new (...args:any[]) => TModel;
-        models: TModel[];
-        length: number;
-
-        constructor(models?: TModel[] | Object[], options?: any);
-        initialize(models?: TModel[] | Object[], options?: any): void;
-
-        fetch(options?: CollectionFetchOptions): JQueryXHR;
-
-        /**
-         * Specify a model attribute name (string) or function that will be used to sort the collection.
-         */
-        comparator: string | ((element: TModel) => number | string) | ((compare: TModel, to?: TModel) => number);
-
-        add(model: {}|TModel, options?: AddOptions): TModel;
-        add(models: ({}|TModel)[], options?: AddOptions): TModel[];
-        at(index: number): TModel;
-        /**
-         * Get a model from a collection, specified by an id, a cid, or by passing in a model.
-         **/
-        get(id: number|string|Model): TModel;
-        create(attributes: any, options?: ModelSaveOptions): TModel;
-        pluck(attribute: string): any[];
-        push(model: TModel, options?: AddOptions): TModel;
-        pop(options?: Silenceable): TModel;
-        remove(model: TModel, options?: Silenceable): TModel;
-        remove(models: TModel[], options?: Silenceable): TModel[];
-        reset(models?: TModel[], options?: Silenceable): TModel[];
-        set(models?: TModel[], options?: Silenceable): TModel[];
-        shift(options?: Silenceable): TModel;
-        sort(options?: Silenceable): Collection<TModel>;
-        unshift(model: TModel, options?: AddOptions): TModel;
-        where(properties: any): TModel[];
-        findWhere(properties: any): TModel;
-
-        private _prepareModel(attributes?: any, options?: any): any;
-        private _removeReference(model: TModel): void;
-        private _onModelEvent(event: string, model: TModel, collection: Collection<TModel>, options: any): void;
-
-        // mixins from underscore
-
-        all(iterator: (element: TModel, index: number) => boolean, context?: any): boolean;
-        any(iterator: (element: TModel, index: number) => boolean, context?: any): boolean;
-        collect(iterator: (element: TModel, index: number, context?: any) => any[], context?: any): any[];
-        chain(): any;
-        contains(value: any): boolean;
-        countBy(iterator: (element: TModel, index: number) => any): _.Dictionary<number>;
-        countBy(attribute: string): _.Dictionary<number>;
-        detect(iterator: (item: any) => boolean, context?: any): any; // ???
-        drop(): TModel;
-        drop(n: number): TModel[];
-        each(iterator: (element: TModel, index: number, list?: any) => void, context?: any): any;
-        every(iterator: (element: TModel, index: number) => boolean, context?: any): boolean;
-        filter(iterator: (element: TModel, index: number) => boolean, context?: any): TModel[];
-        find(iterator: (element: TModel, index: number) => boolean, context?: any): TModel;
-        first(): TModel;
-        first(n: number): TModel[];
-        foldl(iterator: (memo: any, element: TModel, index: number) => any, initialMemo: any, context?: any): any;
-        forEach(iterator: (element: TModel, index: number, list?: any) => void, context?: any): any;
-        groupBy(iterator: (element: TModel, index: number) => string, context?: any): _.Dictionary<TModel[]>;
-        groupBy(attribute: string, context?: any): _.Dictionary<TModel[]>;
-        include(value: any): boolean;
-        indexOf(element: TModel, isSorted?: boolean): number;
-        initial(): TModel;
-        initial(n: number): TModel[];
-        inject(iterator: (memo: any, element: TModel, index: number) => any, initialMemo: any, context?: any): any;
-        isEmpty(object: any): boolean;
-        invoke(methodName: string, args?: any[]): any;
-        last(): TModel;
-        last(n: number): TModel[];
-        lastIndexOf(element: TModel, fromIndex?: number): number;
-        map(iterator: (element: TModel, index: number, context?: any) => any, context?: any): any[];
-        max(iterator?: (element: TModel, index: number) => any, context?: any): TModel;
-        min(iterator?: (element: TModel, index: number) => any, context?: any): TModel;
-        reduce(iterator: (memo: any, element: TModel, index: number) => any, initialMemo: any, context?: any): any;
-        select(iterator: any, context?: any): any[];
-        size(): number;
-        shuffle(): any[];
-        slice(min: number, max?: number): TModel[];
-        some(iterator: (element: TModel, index: number) => boolean, context?: any): boolean;
-        sortBy(iterator: (element: TModel, index: number) => number, context?: any): TModel[];
-        sortBy(attribute: string, context?: any): TModel[];
-        sortedIndex(element: TModel, iterator?: (element: TModel, index: number) => number): number;
-        reduceRight(iterator: (memo: any, element: TModel, index: number) => any, initialMemo: any, context?: any): any[];
-        reject(iterator: (element: TModel, index: number) => boolean, context?: any): TModel[];
-        rest(): TModel;
-        rest(n: number): TModel[];
-        tail(): TModel;
-        tail(n: number): TModel[];
-        toArray(): any[];
-        without(...values: any[]): TModel[];
-    }
-
-    class Router extends Events {
-
-        /**
-        * Do not use, prefer TypeScript's extend functionality.
-        **/
-        private static extend(properties: any, classProperties?: any): any;
-
-        /**
-        * Routes hash or a method returning the routes hash that maps URLs with parameters to methods on your Router.
-        * For assigning routes as object hash, do it like this: this.routes = <any>{ "route": callback, ... };
-        * That works only if you set it in the constructor or the initialize method.
-        **/
-        routes: RoutesHash | any;
-
-        constructor(options?: RouterOptions);
-        initialize(options?: RouterOptions): void;
-        route(route: string|RegExp, name: string, callback?: Function): Router;
-        navigate(fragment: string, options?: NavigateOptions): Router;
-        navigate(fragment: string, trigger?: boolean): Router;
-
-        private _bindRoutes(): void;
-        private _routeToRegExp(route: string): RegExp;
-        private _extractParameters(route: RegExp, fragment: string): string[];
-    }
-
-    var history: History;
-
-    class History extends Events {
-
-        handlers: any[];
-        interval: number;
-
-        start(options?: HistoryOptions): boolean;
-
-        getHash(window?: Window): string;
-        getFragment(fragment?: string, forcePushState?: boolean): string;
-        stop(): void;
-        route(route: string, callback: Function): number;
-        checkUrl(e?: any): void;
-        loadUrl(fragmentOverride: string): boolean;
-        navigate(fragment: string, options?: any): boolean;
-        static started: boolean;
-        options: any;
-
-        private _updateHash(location: Location, fragment: string, replace: boolean): void;
-    }
-
-   interface ViewOptions<TModel extends Model> {
-      model?: TModel;
-       // TODO: quickfix, this can't be fixed easy. The collection does not need to have the same model as the parent view.
-      collection?: Backbone.Collection<any>; //was: Collection<TModel>;
-      el?: any;
-      id?: string;
-      className?: string;
-      tagName?: string;
-      attributes?: {[id: string]: any};
-    }
-
-    class View<TModel extends Model> extends Events {
-
-        /**
-        * Do not use, prefer TypeScript's extend functionality.
-        **/
-        private static extend(properties: any, classProperties?: any): any;
-
-        constructor(options?: ViewOptions<TModel>);
-        initialize(options?: ViewOptions<TModel>): void;
-
-        /**
-        * Events hash or a method returning the events hash that maps events/selectors to methods on your View.
-        * For assigning events as object hash, do it like this: this.events = <any>{ "event:selector": callback, ... };
-        * That works only if you set it in the constructor or the initialize method.
-        **/
-        events(): EventsHash;
-
-        $(selector: string): JQuery;
-        model: TModel;
-        collection: Collection<TModel>;
-        //template: (json, options?) => string;
-        setElement(element: HTMLElement|JQuery, delegate?: boolean): View<TModel>;
-        id: string;
-        cid: string;
-        className: string;
-        tagName: string;
-
-        el: any;
-        $el: JQuery;
-        setElement(element: any): View<TModel>;
-        attributes: any;
-        $(selector: any): JQuery;
-        render(): View<TModel>;
-        remove(): View<TModel>;
-        make(tagName: any, attributes?: any, content?: any): any;
-        delegateEvents(events?: EventsHash): any;
-        delegate(eventName: string, selector: string, listener: Function): View<TModel>;
-        undelegateEvents(): any;
-        undelegate(eventName: string, selector?: string, listener?: Function): View<TModel>;
-
-        _ensureElement(): void;
-    }
-
-    // SYNC
-    function sync(method: string, model: Model, options?: JQueryAjaxSettings): any;
-    function ajax(options?: JQueryAjaxSettings): JQueryXHR;
-    var emulateHTTP: boolean;
-    var emulateJSON: boolean;
-
-    // Utility
-    function noConflict(): typeof Backbone;
-    var $: JQueryStatic;
-}
-
-declare module "backbone" {
-    export = Backbone;
-}
diff --git a/backbone/backbone-global.d.ts.tscparams b/backbone/backbone-global.d.ts.tscparams
deleted file mode 100644
index 99e26e8cbe..0000000000
--- a/backbone/backbone-global.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---noImplicitAny ./underscore/underscore.d.ts
diff --git a/backbone/backbone-tests.ts b/backbone/backbone-tests.ts
index 3669a6c4e1..1787b0eccf 100644
--- a/backbone/backbone-tests.ts
+++ b/backbone/backbone-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="backbone.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+/// <reference types="jquery" />
 
 function test_events() {
 
diff --git a/backbone/backbone-with-lodash-tests.ts b/backbone/backbone-with-lodash-tests.ts
index e0b04880bf..1fe91bcdab 100644
--- a/backbone/backbone-with-lodash-tests.ts
+++ b/backbone/backbone-with-lodash-tests.ts
@@ -1,314 +1,315 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path='../lodash/lodash-3.10.d.ts' />
-/// <reference path="./backbone-global.d.ts" />
+/// <reference types="jquery" />
+/// <reference types="lodash-3.10" />
 
-function test_events() {
+namespace WithLoDash {
+    function test_events() {
 
-    var object = new Backbone.Events();
-    object.on("alert", (eventName: string) => alert("Triggered " + eventName));
+        var object = new Backbone.Events();
+        object.on("alert", (eventName: string) => alert("Triggered " + eventName));
 
-    object.trigger("alert", "an event");
+        object.trigger("alert", "an event");
 
-    var onChange = () => alert('whatever');
-    var context: any;
+        var onChange = () => alert('whatever');
+        var context: any;
 
-    object.off("change", onChange);
-    object.off("change");
-    object.off(null, onChange);
-    object.off(null, null, context);
-    object.off();
-}
-
-class SettingDefaults extends Backbone.Model {
-
-    // 'defaults' could be set in one of the following ways:
-
-    defaults() {
-        return {
-            name: "Joe"
-        }
+        object.off("change", onChange);
+        object.off("change");
+        object.off(null, onChange);
+        object.off(null, null, context);
+        object.off();
     }
 
-    constructor(attributes?: any, options?: any) {
-        super(attributes, options); // TODO error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
-        this.defaults = <any>{
-            name: "Joe"
-        }
-        // super has to come last
-    }
+    class SettingDefaults extends Backbone.Model {
 
-    // or set it like this
-    initialize() {
-        this.defaults = <any>{
-            name: "Joe"
-        }
+        // 'defaults' could be set in one of the following ways:
 
-    }
-
-    // same patterns could be used for setting 'Router.routes' and 'View.events'
-}
-
-class Sidebar extends Backbone.Model {
-
-    promptColor() {
-        var cssColor = prompt("Please enter a CSS color:");
-        this.set({ color: cssColor });
-    }
-}
-
-class Note extends Backbone.Model {
-    initialize() { }
-    author() { }
-    coordinates() { }
-    allowedToEdit(account: any) {
-        return true;
-    }
-}
-
-class PrivateNote extends Note {
-    allowedToEdit(account: any) {
-        return account.owns(this);
-    }
-
-    set(attributes: any, options?: any): Backbone.Model {
-        return Backbone.Model.prototype.set.call(this, attributes, options);
-    }
-}
-
-function test_models() {
-
-    var sidebar = new Sidebar();
-    sidebar.on('change:color', (model: {}, color: string) => $('#sidebar').css({ background: color }));
-    sidebar.set({ color: 'white' });
-    sidebar.promptColor();
-
-    //////////
-
-    var note = new PrivateNote();
-
-    note.get("title");
-
-    note.set({ title: "March 20", content: "In his eyes she eclipses..." });
-
-    note.set("title", "A Scandal in Bohemia");
-}
-
-class Employee extends Backbone.Model {
-    reports: EmployeeCollection;
-
-    constructor(attributes?: any, options?: any) {
-        super(options);
-        this.reports = new EmployeeCollection();
-        this.reports.url = '../api/employees/' + this.id + '/reports';
-    }
-
-    more() {
-        this.reports.reset();
-    }
-}
-
-class EmployeeCollection extends Backbone.Collection<Employee> {
-    findByName(key: any) { }
-}
-
-class Book extends Backbone.Model {
-    title: string;
-    author: string;
-    published: boolean;
-}
-
-class Library extends Backbone.Collection<Book> {
-    // This model definition is here only to test type compatibility of the model, but it
-    // is not necessary in working code as it is automatically inferred through generics.
-    model: typeof Book;
-}
-
-class Books extends Backbone.Collection<Book> { }
-
-function test_collection() {
-
-    var books = new Books();
-
-    var book1: Book = new Book({ title: "Title 1", author: "Mike" });
-    books.add(book1);
-
-    // Objects can be added to collection by casting to model type.
-    // Compiler will check if object properties are valid for the cast.
-    // This gives better type checking than declaring an `any` overload.
-    books.add(<Book>{ title: "Title 2", author: "Mikey" });
-
-    var model: Book = book1.collection.first();
-    if (model !== book1) {
-        throw new Error("Error");
-    }
-
-    books.each(book =>
-        book.get("title"));
-
-    var titles = books.map(book =>
-        book.get("title"));
-
-    var publishedBooks = books.filter(book =>
-        book.get("published") === true);
-
-    var alphabetical = books.sortBy((book: Book): number => null);
-}
-
-//////////
-
-Backbone.history.start();
-
-namespace v1Changes {
-    namespace events {
-        function test_once() {
-            var model = new Employee;
-            model.once('invalid', () => { }, this);
-            model.once('invalid', () => { });
-        }
-
-        function test_listenTo() {
-            var model = new Employee;
-            var view = new Backbone.View<Employee>();
-            view.listenTo(model, 'invalid', () => { });
-        }
-
-        function test_listenToOnce() {
-            var model = new Employee;
-            var view = new Backbone.View<Employee>();
-            view.listenToOnce(model, 'invalid', () => { });
-        }
-
-        function test_stopListening() {
-            var model = new Employee;
-            var view = new Backbone.View<Employee>();
-            view.stopListening(model, 'invalid', () => { });
-            view.stopListening(model, 'invalid');
-            view.stopListening(model);
-        }
-    }
-
-    namespace ModelAndCollection {
-        function test_url() {
-            Employee.prototype.url = () => '/employees';
-            EmployeeCollection.prototype.url = () => '/employees';
-        }
-
-        function test_parse() {
-            var model = new Employee();
-            model.parse('{}', {});
-            var collection = new EmployeeCollection;
-            collection.parse('{}', {});
-        }
-
-        function test_toJSON() {
-            var model = new Employee();
-            model.toJSON({});
-            var collection = new EmployeeCollection;
-            collection.toJSON({});
-        }
-
-        function test_sync() {
-            var model = new Employee();
-            model.sync();
-            var collection = new EmployeeCollection;
-            collection.sync();
-        }
-    }
-
-    namespace Model {
-        function test_validationError() {
-            var model = new Employee;
-            if (model.validationError) {
-                console.log('has validation errors');
+        defaults() {
+            return {
+                name: "Joe"
             }
         }
 
-        function test_fetch() {
-            var model = new Employee({ id: 1 });
-            model.fetch({
-                success: () => { },
-                error: () => { }
-            });
+        constructor(attributes?: any, options?: any) {
+            super(attributes, options); // TODO error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+            this.defaults = <any>{
+                name: "Joe"
+            }
+            // super has to come last
         }
 
-        function test_set() {
-            var model = new Employee;
-            model.set({ name: 'JoeDoe', age: 21 }, { validate: false });
-            model.set('name', 'JoeDoes', { validate: false });
+        // or set it like this
+        initialize() {
+            this.defaults = <any>{
+                name: "Joe"
+            }
+
         }
 
-        function test_destroy() {
-            var model = new Employee;
-            model.destroy({
-                wait: true,
-                success: (m?, response?, options?) => { },
-                error: (m?, jqxhr?, options?) => { }
-            });
+        // same patterns could be used for setting 'Router.routes' and 'View.events'
+    }
 
-            model.destroy({
-                success: (m?, response?, options?) => { },
-                error: (m?, jqxhr?) => { }
-            });
+    class Sidebar extends Backbone.Model {
 
-            model.destroy({
-                success: () => { },
-                error: (m?, jqxhr?) => { }
-            });
+        promptColor() {
+            var cssColor = prompt("Please enter a CSS color:");
+            this.set({ color: cssColor });
+        }
+    }
+
+    class Note extends Backbone.Model {
+        initialize() { }
+        author() { }
+        coordinates() { }
+        allowedToEdit(account: any) {
+            return true;
+        }
+    }
+
+    class PrivateNote extends Note {
+        allowedToEdit(account: any) {
+            return account.owns(this);
         }
 
-        function test_save() {
-            var model = new Employee;
+        set(attributes: any, options?: any): Backbone.Model {
+            return Backbone.Model.prototype.set.call(this, attributes, options);
+        }
+    }
 
-            model.save({
-                    name: 'Joe Doe',
-                    age: 21
-                },
-                {
+    function test_models() {
+
+        var sidebar = new Sidebar();
+        sidebar.on('change:color', (model: {}, color: string) => $('#sidebar').css({ background: color }));
+        sidebar.set({ color: 'white' });
+        sidebar.promptColor();
+
+        //////////
+
+        var note = new PrivateNote();
+
+        note.get("title");
+
+        note.set({ title: "March 20", content: "In his eyes she eclipses..." });
+
+        note.set("title", "A Scandal in Bohemia");
+    }
+
+    class Employee extends Backbone.Model {
+        reports: EmployeeCollection;
+
+        constructor(attributes?: any, options?: any) {
+            super(options);
+            this.reports = new EmployeeCollection();
+            this.reports.url = '../api/employees/' + this.id + '/reports';
+        }
+
+        more() {
+            this.reports.reset();
+        }
+    }
+
+    class EmployeeCollection extends Backbone.Collection<Employee> {
+        findByName(key: any) { }
+    }
+
+    class Book extends Backbone.Model {
+        title: string;
+        author: string;
+        published: boolean;
+    }
+
+    class Library extends Backbone.Collection<Book> {
+        // This model definition is here only to test type compatibility of the model, but it
+        // is not necessary in working code as it is automatically inferred through generics.
+        model: typeof Book;
+    }
+
+    class Books extends Backbone.Collection<Book> { }
+
+    function test_collection() {
+
+        var books = new Books();
+
+        var book1: Book = new Book({ title: "Title 1", author: "Mike" });
+        books.add(book1);
+
+        // Objects can be added to collection by casting to model type.
+        // Compiler will check if object properties are valid for the cast.
+        // This gives better type checking than declaring an `any` overload.
+        books.add(<Book>{ title: "Title 2", author: "Mikey" });
+
+        var model: Book = book1.collection.first();
+        if (model !== book1) {
+            throw new Error("Error");
+        }
+
+        books.each(book =>
+            book.get("title"));
+
+        var titles = books.map(book =>
+            book.get("title"));
+
+        var publishedBooks = books.filter(book =>
+            book.get("published") === true);
+
+        var alphabetical = books.sortBy((book: Book): number => null);
+    }
+
+    //////////
+
+    Backbone.history.start();
+
+    namespace v1Changes {
+        namespace events {
+            function test_once() {
+                var model = new Employee;
+                model.once('invalid', () => { }, this);
+                model.once('invalid', () => { });
+            }
+
+            function test_listenTo() {
+                var model = new Employee;
+                var view = new Backbone.View<Employee>();
+                view.listenTo(model, 'invalid', () => { });
+            }
+
+            function test_listenToOnce() {
+                var model = new Employee;
+                var view = new Backbone.View<Employee>();
+                view.listenToOnce(model, 'invalid', () => { });
+            }
+
+            function test_stopListening() {
+                var model = new Employee;
+                var view = new Backbone.View<Employee>();
+                view.stopListening(model, 'invalid', () => { });
+                view.stopListening(model, 'invalid');
+                view.stopListening(model);
+            }
+        }
+
+        namespace ModelAndCollection {
+            function test_url() {
+                Employee.prototype.url = () => '/employees';
+                EmployeeCollection.prototype.url = () => '/employees';
+            }
+
+            function test_parse() {
+                var model = new Employee();
+                model.parse('{}', {});
+                var collection = new EmployeeCollection;
+                collection.parse('{}', {});
+            }
+
+            function test_toJSON() {
+                var model = new Employee();
+                model.toJSON({});
+                var collection = new EmployeeCollection;
+                collection.toJSON({});
+            }
+
+            function test_sync() {
+                var model = new Employee();
+                model.sync();
+                var collection = new EmployeeCollection;
+                collection.sync();
+            }
+        }
+
+        namespace Model {
+            function test_validationError() {
+                var model = new Employee;
+                if (model.validationError) {
+                    console.log('has validation errors');
+                }
+            }
+
+            function test_fetch() {
+                var model = new Employee({ id: 1 });
+                model.fetch({
+                    success: () => { },
+                    error: () => { }
+                });
+            }
+
+            function test_set() {
+                var model = new Employee;
+                model.set({ name: 'JoeDoe', age: 21 }, { validate: false });
+                model.set('name', 'JoeDoes', { validate: false });
+            }
+
+            function test_destroy() {
+                var model = new Employee;
+                model.destroy({
                     wait: true,
-                    validate: false,
                     success: (m?, response?, options?) => { },
                     error: (m?, jqxhr?, options?) => { }
                 });
 
-            model.save({
-                    name: 'Joe Doe',
-                    age: 21
-                },
-                {
+                model.destroy({
+                    success: (m?, response?, options?) => { },
+                    error: (m?, jqxhr?) => { }
+                });
+
+                model.destroy({
                     success: () => { },
                     error: (m?, jqxhr?) => { }
                 });
+            }
+
+            function test_save() {
+                var model = new Employee;
+
+                model.save({
+                        name: 'Joe Doe',
+                        age: 21
+                    },
+                    {
+                        wait: true,
+                        validate: false,
+                        success: (m?, response?, options?) => { },
+                        error: (m?, jqxhr?, options?) => { }
+                    });
+
+                model.save({
+                        name: 'Joe Doe',
+                        age: 21
+                    },
+                    {
+                        success: () => { },
+                        error: (m?, jqxhr?) => { }
+                    });
+            }
+
+            function test_validate() {
+                var model = new Employee;
+
+                model.validate({ name: 'JoeDoe', age: 21 }, { validateAge: false })
+            }
         }
 
-        function test_validate() {
-            var model = new Employee;
+        namespace Collection {
+            function test_fetch() {
+                var collection = new EmployeeCollection;
+                collection.fetch({ reset: true });
+            }
 
-            model.validate({ name: 'JoeDoe', age: 21 }, { validateAge: false })
+            function test_create() {
+                var collection = new EmployeeCollection;
+                var model = new Employee;
+
+                collection.create(model, {
+                    validate: false
+                });
+            }
+        }
+
+        namespace Router {
+            function test_navigate() {
+                var router = new Backbone.Router;
+
+                router.navigate('/employees', { trigger: true });
+                router.navigate('/employees', true);
+            }
         }
     }
-
-    namespace Collection {
-        function test_fetch() {
-            var collection = new EmployeeCollection;
-            collection.fetch({ reset: true });
-        }
-
-        function test_create() {
-            var collection = new EmployeeCollection;
-            var model = new Employee;
-
-            collection.create(model, {
-                validate: false
-            });
-        }
-    }
-
-    namespace Router {
-        function test_navigate() {
-            var router = new Backbone.Router;
-
-            router.navigate('/employees', { trigger: true });
-            router.navigate('/employees', true);
-        }
-    }
-}
+}
\ No newline at end of file
diff --git a/backbone/backbone.d.ts b/backbone/backbone.d.ts
deleted file mode 100644
index 65e273a61f..0000000000
--- a/backbone/backbone.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// Type definitions for Backbone 1.0.0
-// Project: http://backbonejs.org/
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Natan Vivo <https://github.com/nvivo/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../underscore/underscore.d.ts" />
-/// <reference path="./backbone-global.d.ts" />
diff --git a/backbone/index.d.ts b/backbone/index.d.ts
new file mode 100644
index 0000000000..d07d7e3c9d
--- /dev/null
+++ b/backbone/index.d.ts
@@ -0,0 +1,395 @@
+// Type definitions for Backbone 1.0.0
+// Project: http://backbonejs.org/
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Natan Vivo <https://github.com/nvivo/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+export = Backbone;
+export as namespace Backbone;
+
+import * as _ from 'underscore';
+
+declare namespace Backbone {
+
+    interface AddOptions extends Silenceable {
+        at?: number;
+    }
+
+    interface HistoryOptions extends Silenceable {
+        pushState?: boolean;
+        root?: string;
+    }
+
+    interface NavigateOptions {
+        trigger?: boolean;
+        replace?: boolean;
+    }
+
+    interface RouterOptions {
+        routes: any;
+    }
+
+    interface Silenceable {
+        silent?: boolean;
+    }
+
+    interface Validable {
+        validate?: boolean;
+    }
+
+    interface Waitable {
+        wait?: boolean;
+    }
+
+    interface Parseable {
+        parse?: any;
+    }
+
+    interface PersistenceOptions {
+        url?: string;
+        data?: any;
+        beforeSend?: (jqxhr: JQueryXHR) => void;
+        success?: (modelOrCollection?: any, response?: any, options?: any) => void;
+        error?: (modelOrCollection?: any, jqxhr?: JQueryXHR, options?: any) => void;
+    }
+
+    interface ModelSetOptions extends Silenceable, Validable {
+    }
+
+    interface ModelFetchOptions extends PersistenceOptions, ModelSetOptions, Parseable {
+    }
+
+    interface ModelSaveOptions extends Silenceable, Waitable, Validable, Parseable, PersistenceOptions {
+        patch?: boolean;
+    }
+
+    interface ModelDestroyOptions extends Waitable, PersistenceOptions {
+    }
+
+    interface CollectionFetchOptions extends PersistenceOptions, Parseable {
+        reset?: boolean;
+    }
+
+    interface ObjectHash {
+        [key: string]: any;
+    }
+
+    interface RoutesHash {
+        [routePattern: string]: string | {(...urlParts: string[]): void};
+    }
+
+    interface EventsHash {
+        [selector: string]: string | {(eventObject: JQueryEventObject): void};
+    }
+
+    class Events {
+        on(eventName: string, callback?: Function, context?: any): any;
+        on(eventMap: EventsHash): any;
+        off(eventName?: string, callback?: Function, context?: any): any;
+        trigger(eventName: string, ...args: any[]): any;
+        bind(eventName: string, callback: Function, context?: any): any;
+        unbind(eventName?: string, callback?: Function, context?: any): any;
+
+        once(events: string, callback: Function, context?: any): any;
+        listenTo(object: any, events: string, callback: Function): any;
+        listenToOnce(object: any, events: string, callback: Function): any;
+        stopListening(object?: any, events?: string, callback?: Function): any;
+    }
+
+    class ModelBase extends Events {
+        url: any;
+        parse(response: any, options?: any): any;
+        toJSON(options?: any): any;
+        sync(...arg: any[]): JQueryXHR;
+    }
+
+    class Model extends ModelBase {
+
+        /**
+        * Do not use, prefer TypeScript's extend functionality.
+        **/
+        private static extend(properties: any, classProperties?: any): any;
+
+        attributes: any;
+        changed: any[];
+        cid: string;
+        collection: Collection<any>;
+
+        /**
+        * Default attributes for the model. It can be an object hash or a method returning an object hash.
+        * For assigning an object hash, do it like this: this.defaults = <any>{ attribute: value, ... };
+        * That works only if you set it in the constructor or the initialize method.
+        **/
+        defaults(): ObjectHash;
+        id: any;
+        idAttribute: string;
+        validationError: any;
+        urlRoot: any;
+
+        constructor(attributes?: any, options?: any);
+        initialize(attributes?: any, options?: any): void;
+
+        fetch(options?: ModelFetchOptions): JQueryXHR;
+
+        /**
+        * For strongly-typed access to attributes, use the `get` method only privately in public getter properties.
+        * @example
+        * get name(): string {
+        *    return super.get("name");
+        * }
+        **/
+        /*private*/ get(attributeName: string): any;
+
+        /**
+        * For strongly-typed assignment of attributes, use the `set` method only privately in public setter properties.
+        * @example
+        * set name(value: string) {
+        *    super.set("name", value);
+        * }
+        **/
+        /*private*/ set(attributeName: string, value: any, options?: ModelSetOptions): Model;
+        set(obj: any, options?: ModelSetOptions): Model;
+
+        change(): any;
+        changedAttributes(attributes?: any): any[];
+        clear(options?: Silenceable): any;
+        clone(): Model;
+        destroy(options?: ModelDestroyOptions): any;
+        escape(attribute: string): string;
+        has(attribute: string): boolean;
+        hasChanged(attribute?: string): boolean;
+        isNew(): boolean;
+        isValid(options?:any): boolean;
+        previous(attribute: string): any;
+        previousAttributes(): any[];
+        save(attributes?: any, options?: ModelSaveOptions): any;
+        unset(attribute: string, options?: Silenceable): Model;
+        validate(attributes: any, options?: any): any;
+
+        private _validate(attributes: any, options: any): boolean;
+
+        // mixins from underscore
+
+        keys(): string[];
+        values(): any[];
+        pairs(): any[];
+        invert(): any;
+        pick(keys: string[]): any;
+        pick(...keys: string[]): any;
+        omit(keys: string[]): any;
+        omit(...keys: string[]): any;
+    }
+
+    class Collection<TModel extends Model> extends ModelBase {
+
+        /**
+        * Do not use, prefer TypeScript's extend functionality.
+        **/
+        private static extend(properties: any, classProperties?: any): any;
+
+        model: new (...args:any[]) => TModel;
+        models: TModel[];
+        length: number;
+
+        constructor(models?: TModel[] | Object[], options?: any);
+        initialize(models?: TModel[] | Object[], options?: any): void;
+
+        fetch(options?: CollectionFetchOptions): JQueryXHR;
+
+        /**
+         * Specify a model attribute name (string) or function that will be used to sort the collection.
+         */
+        comparator: string | ((element: TModel) => number | string) | ((compare: TModel, to?: TModel) => number);
+
+        add(model: {}|TModel, options?: AddOptions): TModel;
+        add(models: ({}|TModel)[], options?: AddOptions): TModel[];
+        at(index: number): TModel;
+        /**
+         * Get a model from a collection, specified by an id, a cid, or by passing in a model.
+         **/
+        get(id: number|string|Model): TModel;
+        create(attributes: any, options?: ModelSaveOptions): TModel;
+        pluck(attribute: string): any[];
+        push(model: TModel, options?: AddOptions): TModel;
+        pop(options?: Silenceable): TModel;
+        remove(model: TModel, options?: Silenceable): TModel;
+        remove(models: TModel[], options?: Silenceable): TModel[];
+        reset(models?: TModel[], options?: Silenceable): TModel[];
+        set(models?: TModel[], options?: Silenceable): TModel[];
+        shift(options?: Silenceable): TModel;
+        sort(options?: Silenceable): Collection<TModel>;
+        unshift(model: TModel, options?: AddOptions): TModel;
+        where(properties: any): TModel[];
+        findWhere(properties: any): TModel;
+
+        private _prepareModel(attributes?: any, options?: any): any;
+        private _removeReference(model: TModel): void;
+        private _onModelEvent(event: string, model: TModel, collection: Collection<TModel>, options: any): void;
+
+        // mixins from underscore
+
+        all(iterator: (element: TModel, index: number) => boolean, context?: any): boolean;
+        any(iterator: (element: TModel, index: number) => boolean, context?: any): boolean;
+        collect(iterator: (element: TModel, index: number, context?: any) => any[], context?: any): any[];
+        chain(): any;
+        contains(value: any): boolean;
+        countBy(iterator: (element: TModel, index: number) => any): _.Dictionary<number>;
+        countBy(attribute: string): _.Dictionary<number>;
+        detect(iterator: (item: any) => boolean, context?: any): any; // ???
+        drop(): TModel;
+        drop(n: number): TModel[];
+        each(iterator: (element: TModel, index: number, list?: any) => void, context?: any): any;
+        every(iterator: (element: TModel, index: number) => boolean, context?: any): boolean;
+        filter(iterator: (element: TModel, index: number) => boolean, context?: any): TModel[];
+        find(iterator: (element: TModel, index: number) => boolean, context?: any): TModel;
+        first(): TModel;
+        first(n: number): TModel[];
+        foldl(iterator: (memo: any, element: TModel, index: number) => any, initialMemo: any, context?: any): any;
+        forEach(iterator: (element: TModel, index: number, list?: any) => void, context?: any): any;
+        groupBy(iterator: (element: TModel, index: number) => string, context?: any): _.Dictionary<TModel[]>;
+        groupBy(attribute: string, context?: any): _.Dictionary<TModel[]>;
+        include(value: any): boolean;
+        indexOf(element: TModel, isSorted?: boolean): number;
+        initial(): TModel;
+        initial(n: number): TModel[];
+        inject(iterator: (memo: any, element: TModel, index: number) => any, initialMemo: any, context?: any): any;
+        isEmpty(object: any): boolean;
+        invoke(methodName: string, args?: any[]): any;
+        last(): TModel;
+        last(n: number): TModel[];
+        lastIndexOf(element: TModel, fromIndex?: number): number;
+        map(iterator: (element: TModel, index: number, context?: any) => any, context?: any): any[];
+        max(iterator?: (element: TModel, index: number) => any, context?: any): TModel;
+        min(iterator?: (element: TModel, index: number) => any, context?: any): TModel;
+        reduce(iterator: (memo: any, element: TModel, index: number) => any, initialMemo: any, context?: any): any;
+        select(iterator: any, context?: any): any[];
+        size(): number;
+        shuffle(): any[];
+        slice(min: number, max?: number): TModel[];
+        some(iterator: (element: TModel, index: number) => boolean, context?: any): boolean;
+        sortBy(iterator: (element: TModel, index: number) => number, context?: any): TModel[];
+        sortBy(attribute: string, context?: any): TModel[];
+        sortedIndex(element: TModel, iterator?: (element: TModel, index: number) => number): number;
+        reduceRight(iterator: (memo: any, element: TModel, index: number) => any, initialMemo: any, context?: any): any[];
+        reject(iterator: (element: TModel, index: number) => boolean, context?: any): TModel[];
+        rest(): TModel;
+        rest(n: number): TModel[];
+        tail(): TModel;
+        tail(n: number): TModel[];
+        toArray(): any[];
+        without(...values: any[]): TModel[];
+    }
+
+    class Router extends Events {
+
+        /**
+        * Do not use, prefer TypeScript's extend functionality.
+        **/
+        private static extend(properties: any, classProperties?: any): any;
+
+        /**
+        * Routes hash or a method returning the routes hash that maps URLs with parameters to methods on your Router.
+        * For assigning routes as object hash, do it like this: this.routes = <any>{ "route": callback, ... };
+        * That works only if you set it in the constructor or the initialize method.
+        **/
+        routes: RoutesHash | any;
+
+        constructor(options?: RouterOptions);
+        initialize(options?: RouterOptions): void;
+        route(route: string|RegExp, name: string, callback?: Function): Router;
+        navigate(fragment: string, options?: NavigateOptions): Router;
+        navigate(fragment: string, trigger?: boolean): Router;
+
+        private _bindRoutes(): void;
+        private _routeToRegExp(route: string): RegExp;
+        private _extractParameters(route: RegExp, fragment: string): string[];
+    }
+
+    var history: History;
+
+    class History extends Events {
+
+        handlers: any[];
+        interval: number;
+
+        start(options?: HistoryOptions): boolean;
+
+        getHash(window?: Window): string;
+        getFragment(fragment?: string): string;
+        stop(): void;
+        route(route: string, callback: Function): number;
+        checkUrl(e?: any): void;
+        loadUrl(fragmentOverride: string): boolean;
+        navigate(fragment: string, options?: any): boolean;
+        static started: boolean;
+        options: any;
+
+        private _updateHash(location: Location, fragment: string, replace: boolean): void;
+    }
+
+   interface ViewOptions<TModel extends Model> {
+      model?: TModel;
+       // TODO: quickfix, this can't be fixed easy. The collection does not need to have the same model as the parent view.
+      collection?: Backbone.Collection<any>; //was: Collection<TModel>;
+      el?: any;
+      events?: EventsHash;
+      id?: string;
+      className?: string;
+      tagName?: string;
+      attributes?: {[id: string]: any};
+    }
+
+    class View<TModel extends Model> extends Events {
+
+        /**
+        * Do not use, prefer TypeScript's extend functionality.
+        **/
+        private static extend(properties: any, classProperties?: any): any;
+
+        constructor(options?: ViewOptions<TModel>);
+        initialize(options?: ViewOptions<TModel>): void;
+
+        /**
+        * Events hash or a method returning the events hash that maps events/selectors to methods on your View.
+        * For assigning events as object hash, do it like this: this.events = <any>{ "event:selector": callback, ... };
+        * That works only if you set it in the constructor or the initialize method.
+        **/
+        events(): EventsHash;
+
+        $(selector: string): JQuery;
+        model: TModel;
+        collection: Collection<TModel>;
+        //template: (json, options?) => string;
+        setElement(element: HTMLElement|JQuery, delegate?: boolean): View<TModel>;
+        id: string;
+        cid: string;
+        className: string;
+        tagName: string;
+
+        el: any;
+        $el: JQuery;
+        setElement(element: any): View<TModel>;
+        attributes: any;
+        $(selector: any): JQuery;
+        render(): View<TModel>;
+        remove(): View<TModel>;
+        make(tagName: any, attributes?: any, content?: any): any;
+        delegateEvents(events?: EventsHash): any;
+        delegate(eventName: string, selector: string, listener: Function): View<TModel>;
+        undelegateEvents(): any;
+        undelegate(eventName: string, selector?: string, listener?: Function): View<TModel>;
+
+        _ensureElement(): void;
+    }
+
+    // SYNC
+    function sync(method: string, model: Model, options?: JQueryAjaxSettings): any;
+    function ajax(options?: JQueryAjaxSettings): JQueryXHR;
+    var emulateHTTP: boolean;
+    var emulateJSON: boolean;
+
+    // Utility
+    function noConflict(): typeof Backbone;
+    var $: JQueryStatic;
+}
diff --git a/backbone/tsconfig.json b/backbone/tsconfig.json
new file mode 100644
index 0000000000..85e19bf8a3
--- /dev/null
+++ b/backbone/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "backbone-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/backgrid/backgrid-tests.ts b/backgrid/backgrid-tests.ts
index f2a41a5587..225d8a6ef1 100644
--- a/backgrid/backgrid-tests.ts
+++ b/backgrid/backgrid-tests.ts
@@ -1,7 +1,7 @@
-/// <reference path="backgrid.d.ts" />
-/// <reference path="../backbone/backbone.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+/// <reference types="jquery" />
 
+import * as Backgrid from 'backgrid';
+import * as Backbone from 'backbone';
 
 /*
   Uses getters and setters and requires ES >= 5
diff --git a/backgrid/backgrid-tests.ts.tscparams b/backgrid/backgrid-tests.ts.tscparams
deleted file mode 100644
index 3af0fcfed7..0000000000
--- a/backgrid/backgrid-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target ES5
diff --git a/backgrid/backgrid.d.ts b/backgrid/backgrid.d.ts
deleted file mode 100644
index d208faf415..0000000000
--- a/backgrid/backgrid.d.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-// Type definitions for Backgrid 0.2.6
-// Project: http://backgridjs.com/
-// Definitions by: Jeremy Lujan <https://github.com/jlujan/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../backbone/backbone.d.ts" />
-
-declare namespace Backgrid {
-
-    interface GridOptions {
-        columns: Column[];
-        collection: Backbone.Collection<Backbone.Model>;
-        header?: Header;
-        body?: Body;
-        row?: Row;
-        footer?: Footer;
-    }
-
-    class Header extends Backbone.View<Backbone.Model> {
-    }
-
-    class Footer extends Backbone.View<Backbone.Model> {
-    }
-
-    class Row extends Backbone.View<Backbone.Model> {
-    }
-
-    class Command {
-        moveUp(): boolean;
-        moveDown(): boolean;
-        moveLeft(): boolean;
-        moveRight(): boolean;
-        save(): boolean;
-        cancel(): boolean;
-        passThru(): boolean;
-    }
-
-    class CellFormatter {
-        fromRaw(rawData: any, model: Backbone.Model);
-        toRaw(formattedData: any, model: Backbone.Model);
-    }
-
-    class NumberFormatter extends CellFormatter {}
-
-    class PercentFormatter extends NumberFormatter {}
-
-    class DateTimeFormatter extends CellFormatter {}
-
-    class StringFormatter extends CellFormatter {}
-
-    class EmailFormatter extends CellFormatter {}
-
-    class SelectFormatter extends CellFormatter {}
-
-    class CellEditor extends Backbone.View<Backbone.Model>{
-        initialize(options?: any);
-        postRender(model: Backbone.Model, column: Backbone.Model);
-    }
-
-    class InputCellEditor extends CellEditor {
-        render();
-        saveOrCancel(event: any);
-    }
-
-    class Cell extends Backbone.View<Backbone.Model>{
-        tagName: string;
-        formatter: CellFormatter;
-        editor: InputCellEditor;
-        enterEditMode();
-        renderError();
-        exitEditMode();
-        remove();
-    }
-
-    class StringCell extends Cell {
-    }
-
-    interface ColumnAttr {
-        name: string;
-        cell: string;
-        headerCell: string;
-        label: string;
-        sortable: boolean;
-        editable: boolean;
-        renderable: boolean;
-        formater: string;
-    }
-
-    class Column extends Backbone.Model {
-        initialize(options?: any);
-    }
-
-    class Body extends Backbone.View<Backbone.Model> {
-        tagName: string;
-
-        initialize(options?: any);
-        insertRow(model: Backbone.Model, collection: Backbone.Collection<Backbone.Model>, options: any);
-        moveToNextCell(model: Backbone.Model, cell: Column, command: Command);
-        refresh(): Body;
-        remove(): Body;
-        removeRow(model: Backbone.Model, collection: Backbone.Collection<Backbone.Model>, options: any);
-        render(): Body;
-    }
-
-    class Grid extends Backbone.View<Backbone.Model> {
-        body: Backgrid.Body;
-        className: string;
-        footer: any;
-        header: any;
-        tagName: string;
-
-        constructor(options: GridOptions);
-
-        initialize(options: any);
-        getSelectedModels(): Backbone.Model[];
-        insertColumn(...options: any[]): Grid;
-        insertRow(model: Backbone.Model, collection: Backbone.Collection<Backbone.Model>, options: any);
-        remove(): Grid;
-        removeColumn(...options: any[]): Grid;
-        removeRow(model: Backbone.Model, collection: Backbone.Collection<Backbone.Model>, options: any);
-        render(): Grid;
-    }
-
-}
-
-declare module "backgrid" {
-    export = Backgrid;
-}
diff --git a/backgrid/backgrid.d.ts.tscparams b/backgrid/backgrid.d.ts.tscparams
deleted file mode 100644
index 5d4a276bca..0000000000
--- a/backgrid/backgrid.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5
diff --git a/backgrid/index.d.ts b/backgrid/index.d.ts
new file mode 100644
index 0000000000..83dc86bcbe
--- /dev/null
+++ b/backgrid/index.d.ts
@@ -0,0 +1,127 @@
+// Type definitions for Backgrid 0.2.6
+// Project: http://backgridjs.com/
+// Definitions by: Jeremy Lujan <https://github.com/jlujan/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as Backbone from 'backbone';
+
+export as namespace Backgrid;
+export = Backgrid;
+
+declare namespace Backgrid {
+
+    interface GridOptions {
+        columns: Column[];
+        collection: Backbone.Collection<Backbone.Model>;
+        header?: Header;
+        body?: Body;
+        row?: Row;
+        footer?: Footer;
+    }
+
+    class Header extends Backbone.View<Backbone.Model> {
+    }
+
+    class Footer extends Backbone.View<Backbone.Model> {
+    }
+
+    class Row extends Backbone.View<Backbone.Model> {
+    }
+
+    class Command {
+        moveUp(): boolean;
+        moveDown(): boolean;
+        moveLeft(): boolean;
+        moveRight(): boolean;
+        save(): boolean;
+        cancel(): boolean;
+        passThru(): boolean;
+    }
+
+    class CellFormatter {
+        fromRaw(rawData: any, model: Backbone.Model);
+        toRaw(formattedData: any, model: Backbone.Model);
+    }
+
+    class NumberFormatter extends CellFormatter {}
+
+    class PercentFormatter extends NumberFormatter {}
+
+    class DateTimeFormatter extends CellFormatter {}
+
+    class StringFormatter extends CellFormatter {}
+
+    class EmailFormatter extends CellFormatter {}
+
+    class SelectFormatter extends CellFormatter {}
+
+    class CellEditor extends Backbone.View<Backbone.Model>{
+        initialize(options?: any);
+        postRender(model: Backbone.Model, column: Backbone.Model);
+    }
+
+    class InputCellEditor extends CellEditor {
+        render();
+        saveOrCancel(event: any);
+    }
+
+    class Cell extends Backbone.View<Backbone.Model>{
+        tagName: string;
+        formatter: CellFormatter;
+        editor: InputCellEditor;
+        enterEditMode();
+        renderError();
+        exitEditMode();
+        remove();
+    }
+
+    class StringCell extends Cell {
+    }
+
+    interface ColumnAttr {
+        name: string;
+        cell: string;
+        headerCell: string;
+        label: string;
+        sortable: boolean;
+        editable: boolean;
+        renderable: boolean;
+        formater: string;
+    }
+
+    class Column extends Backbone.Model {
+        initialize(options?: any);
+    }
+
+    class Body extends Backbone.View<Backbone.Model> {
+        tagName: string;
+
+        initialize(options?: any);
+        insertRow(model: Backbone.Model, collection: Backbone.Collection<Backbone.Model>, options: any);
+        moveToNextCell(model: Backbone.Model, cell: Column, command: Command);
+        refresh(): Body;
+        remove(): Body;
+        removeRow(model: Backbone.Model, collection: Backbone.Collection<Backbone.Model>, options: any);
+        render(): Body;
+    }
+
+    class Grid extends Backbone.View<Backbone.Model> {
+        body: Backgrid.Body;
+        className: string;
+        footer: any;
+        header: any;
+        tagName: string;
+
+        constructor(options: GridOptions);
+
+        initialize(options: any);
+        getSelectedModels(): Backbone.Model[];
+        insertColumn(...options: any[]): Grid;
+        insertRow(model: Backbone.Model, collection: Backbone.Collection<Backbone.Model>, options: any);
+        remove(): Grid;
+        removeColumn(...options: any[]): Grid;
+        removeRow(model: Backbone.Model, collection: Backbone.Collection<Backbone.Model>, options: any);
+        render(): Grid;
+    }
+
+}
diff --git a/backgrid/tsconfig.json b/backgrid/tsconfig.json
new file mode 100644
index 0000000000..c4331d3a40
--- /dev/null
+++ b/backgrid/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "backgrid-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/baconjs/baconjs-tests.ts b/baconjs/baconjs-tests.ts
index ab5b671807..e948668dc7 100644
--- a/baconjs/baconjs-tests.ts
+++ b/baconjs/baconjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./baconjs.d.ts" />
+
 
 function CreatingStreams() {
     $("#my-div").asEventStream("click");
diff --git a/baconjs/baconjs.d.ts b/baconjs/baconjs.d.ts
deleted file mode 100644
index 50823ba422..0000000000
--- a/baconjs/baconjs.d.ts
+++ /dev/null
@@ -1,3132 +0,0 @@
-// Type definitions for Bacon.js 0.7.0
-// Project: https://baconjs.github.io/
-// Definitions by: Alexander Matsievsky <https://github.com/alexander-matsievsky>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../node/node.d.ts" />
-
-interface JQuery {
-    /**
-     * @method
-     * @description Creates an [EventStream]{@link Bacon.EventStream} from events on a jQuery or Zepto.js object.
-     * @param {string} eventName
-     * @returns {EventStream<ErrorEvent, JQueryEventObject>}
-     * @example
-     * $("#my-div").asEventStream("click");
-     */
-    asEventStream(eventName:string):Bacon.EventStream<ErrorEvent, JQueryEventObject>;
-
-    /**
-     * @method
-     * @description Creates an [EventStream]{@link Bacon.EventStream} from events on a jQuery or Zepto.js object. You can pass an argument to add a jQuery live `selector`.
-     * @param {string} eventName
-     * @param {string} selector
-     * @returns {EventStream<ErrorEvent, JQueryEventObject>}
-     * @example
-     * $("#my-div").asEventStream("click", ".more-specific-selector");
-     */
-    asEventStream(eventName:string, selector:string):Bacon.EventStream<ErrorEvent, JQueryEventObject>;
-
-    /**
-     * @callback JQuery#asEventStream1~f
-     * @param {JQueryEventObject} event
-     * @param {*[]} args
-     * @returns {A}
-     */
-    /**
-     * @method JQuery#asEventStream1
-     * @description Creates an [EventStream]{@link Bacon.EventStream} from events on a jQuery or Zepto.js object. You can pass an argument to add a function `f` that processes the jQuery event and its parameters.
-     * @param {string} eventName
-     * @param {JQuery#asEventStream1~f} f
-     * @returns {EventStream<ErrorEvent, A>}
-     * @example
-     * $("#my-div").asEventStream("click", (event, args) => args[0]);
-     */
-    asEventStream<A>(eventName:string, f:(event:JQueryEventObject, args:any[]) => A):Bacon.EventStream<ErrorEvent, A>;
-
-    /**
-     * @callback JQuery#asEventStream2~f
-     * @param {JQueryEventObject} event
-     * @param {*[]} args
-     * @returns {A}
-     */
-    /**
-     * @method JQuery#asEventStream2
-     * @description Creates an [EventStream]{@link Bacon.EventStream} from events on a jQuery or Zepto.js object. You can pass an argument to add a jQuery live `selector` and a function `f` that processes the jQuery event and its parameters.
-     * @param {string} eventName
-     * @param {string} selector
-     * @param {JQuery#asEventStream2~f} f
-     * @returns {Bacon.EventStream<ErrorEvent, A>}
-     * @example
-     * $("#my-div").asEventStream("click", ".more-specific-selector", (event, args) => args[0]);
-     */
-    asEventStream<A>(eventName:string, selector:string, f:(event:JQueryEventObject, args:any[]) => A):Bacon.EventStream<ErrorEvent, A>;
-}
-
-/** @module Bacon */
-declare namespace Bacon {
-    /**
-     * @function
-     * @description Creates an [EventStream]{@link Bacon.EventStream} from a `promise` Promise object such as JQuery Ajax. This stream will contain a single value or an error, followed immediately by stream end. You can use the optional `abort` flag (i.e. ´Bacon.fromPromise(p, true)´ to have the `abort` method of the given promise be called when all subscribers have been removed from the created stream.
-     * @param {Promise<A>|JQueryXHR} promise
-     * @param {boolean} [abort]
-     * @returns {EventStream<E, A>}
-     * @example
-     * Bacon.fromPromise($.ajax("https://baconjs.github.io/"));
-     * Bacon.fromPromise(Promise.resolve(1));
-     * Bacon.fromPromise($.ajax("https://baconjs.github.io/"), true);
-     * Bacon.fromPromise(Promise.resolve(1), false);
-     */
-    function fromPromise<E, A>(promise:Promise<A>|JQueryXHR, abort?:boolean):EventStream<E, A>;
-
-    /**
-     * @callback Bacon.fromPromise~eventTransformer
-     * @param {A} value
-     * @returns {(Initial<B>|Next<B>|End<B>|Error<E>)[]}
-     */
-    /**
-     * @function Bacon.fromPromise
-     * @description Creates an [EventStream]{@link Bacon.EventStream} from a `promise` Promise object such as JQuery Ajax. This stream will contain a single value or an error, followed immediately by stream end. You can use the `abort` flag (i.e. ´Bacon.fromPromise(p, true)´ to have the `abort` method of the given promise be called when all subscribers have been removed from the created stream, and also pass a function `eventTransformer` that transforms the promise value into Events. The default is to transform the value into `[new Bacon.Next(value), new Bacon.End()]`.
-     * @param {Promise<A>|JQueryXHR} promise
-     * @param {boolean} abort
-     * @param {Bacon.fromPromise~eventTransformer} eventTransformer
-     * @returns {EventStream<E, B>}
-     * @example
-     * Bacon.fromPromise($.ajax("https://baconjs.github.io/"), true, (n:string) => {
-     *     return [new Bacon.Next(n), new Bacon.Next(() => n), new Bacon.End()];
-     * });
-     * Bacon.fromPromise(Promise.resolve(1), false, n => {
-     *     return [new Bacon.Next(n), new Bacon.Next(() => n), new Bacon.End()];
-     * });
-     */
-    function fromPromise<E, A, B>(promise:Promise<A>|JQueryXHR, abort:boolean, eventTransformer:(value:A) => (Initial<B>|Next<B>|End<B>|Error<E>)[]):EventStream<E, B>;
-
-    /**
-     * @function
-     * @description Creates an [EventStream]{@link Bacon.EventStream} from events on a DOM EventTarget or Node.JS EventEmitter object, or an object that supports event listeners using `on`/`off` methods.
-     * @param {EventTarget|NodeJS.EventEmitter|JQuery} target
-     * @param {string} eventName
-     * @returns {EventStream<E, A>}
-     * @example
-     * Bacon.fromEvent(document.body, "click").onValue(() => {
-     *     alert("Bacon!");
-     * });
-     * Bacon.fromEvent(process.stdin, "readable", () => {
-     *     alert("Bacon!");
-     * });
-     * Bacon.fromEvent($("body"), "click").onValue(() => {
-     *     alert("Bacon!");
-     * });
-     */
-    function fromEvent<E, A>(target:EventTarget|NodeJS.EventEmitter|JQuery, eventName:string):EventStream<E, A>;
-
-    /**
-     * @callback Bacon.fromEvent~eventTransformer
-     * @param {A} event
-     * @returns {B}
-     */
-    /**
-     * @function Bacon.fromEvent
-     * @description Creates an [EventStream]{@link Bacon.EventStream} from events on a DOM EventTarget or Node.JS EventEmitter object, or an object that supports event listeners using `on`/`off` methods. You can pass a function `eventTransformer` that transforms the emitted events' parameters.
-     * @param {EventTarget|NodeJS.EventEmitter|JQuery} target
-     * @param {string} eventName
-     * @param {Bacon.fromEvent~eventTransformer} eventTransformer
-     * @returns {EventStream<E, B>}
-     * @example
-     * Bacon.fromEvent(document.body, "click", (event:MouseEvent) => event.clientX).onValue(clientX => {
-     *     alert("Bacon!");
-     * });
-     */
-    function fromEvent<E, A, B>(target:EventTarget|NodeJS.EventEmitter|JQuery, eventName:string, eventTransformer:(event:A) => B):EventStream<E, B>;
-
-    /**
-     * @callback Bacon.fromCallback1~f
-     * @param {Bacon.fromCallback1~callback} callback
-     * @returns {void}
-     */
-    /**
-     * @callback Bacon.fromCallback1~callback
-     * @param {...*} args
-     * @returns {void}
-     */
-    /**
-     * @function Bacon.fromCallback1
-     * @description Creates an [EventStream]{@link Bacon.EventStream} from a function `f` that accepts a `callback`. The function is supposed to call its callback just once.
-     * @param {Bacon.fromCallback1~f} f
-     * @returns {EventStream<E, A>}
-     * @example
-     * // This would create a stream that outputs a single value "Bacon!" and ends after that. The use of setTimeout causes the value to be delayed by 1 second.
-     * Bacon.fromCallback(callback => {
-     *     setTimeout(() => {
-     *         callback("Bacon!");
-     *     }, 1000);
-     * });
-     */
-    function fromCallback<E, A>(f:(callback:(...args:any[]) => void) => void):EventStream<E, A>;
-
-    /**
-     * @callback Bacon.fromCallback2~f
-     * @param {...*} args
-     * @returns {void}
-     */
-    /**
-     * @function Bacon.fromCallback2
-     * @description Creates an [EventStream]{@link Bacon.EventStream} from a function `f` that accepts a `callback`. The function is supposed to call its callback just once.
-     * @param {Bacon.fromCallback2~f} f
-     * @param {...*} args
-     * @returns {EventStream<E, A>}
-     * @example
-     * // You can also give any number of arguments to `fromCallback`, which will be passed to the function. These arguments can be simple variables, Bacon EventStreams or Properties. For example the following will output "Bacon rules":
-     * Bacon.fromCallback((a, b, callback) => {
-     *     callback(a + " " + b);
-     * }, Bacon.constant("bacon"), "rules").log();
-     */
-    function fromCallback<E, A>(f:(...args:any[]) => void, ...args:any[]):EventStream<E, A>;
-
-    /**
-     * @function
-     * @description Creates an [EventStream]{@link Bacon.EventStream} from a `methodName` method of a given `object`. The function is supposed to call its callback just once.
-     * @param {Object} object
-     * @param {string} methodName
-     * @param {...*} args
-     * @returns {EventStream<E, A>}
-     */
-    function fromCallback<E, A>(object:Object, methodName:string, ...args:any[]):EventStream<E, A>;
-
-    /**
-     * @callback Bacon.fromNodeCallback~f
-     * @param {Bacon.fromNodeCallback~callback} callback
-     * @returns {void}
-     */
-    /**
-     * @callback Bacon.fromNodeCallback~callback
-     * @param {E} error
-     * @param {A} data
-     * @returns {void}
-     */
-    /**
-     * @function Bacon.fromNodeCallback
-     * @description Creates an [EventStream]{@link Bacon.EventStream} from a function `f` that accepts a Node.js `callback`: callback(error, data), where error is `null` if everything is fine. The function is supposed to call its callback just once.
-     * @param {Bacon.fromNodeCallback~f} f
-     * @param {...*} args
-     * @returns {EventStream<E, A>}
-     * @example
-     * {
-     *     let fs = require("fs"),
-     *         read = Bacon.fromNodeCallback(fs.readFile, "input.txt");
-     *     read.onError(error => {
-     *        console.log("Reading failed: " + error);
-     *     });
-     *     read.onValue(value => {
-     *         console.log("Read contents: " + value);
-     *     });
-     * }
-     */
-    function fromNodeCallback<E, A>(f:(callback:(error:E, data:A) => void) => void, ...args:any[]):EventStream<E, A>;
-
-    /**
-     * @function
-     * @description Creates an [EventStream]{@link Bacon.EventStream} from a `methodName` method of a given `object`.
-     * @param {Object} object
-     * @param {string} methodName
-     * @param {...*} args
-     * @returns {EventStream<E, A>}
-     */
-    function fromNodeCallback<E, A>(object:Object, methodName:string, ...args:any[]):EventStream<E, A>;
-
-    /**
-     * @callback Bacon.fromPoll~f
-     * @returns {Next<A>|End<A>}
-     */
-    /**
-     * @function Bacon.fromPoll
-     * @description Polls given function `f` with given `interval`. Function should return events: either [Next]{@link Bacon.Next} or [End]{@link Bacon.End}. Polling occurs only when there are subscribers to the stream. Polling ends permanently when `f` returns [End]{@link Bacon.End}.
-     * @param {number} interval
-     * @param {Bacon.fromPoll~f} f
-     * @returns {EventStream<E, A>}
-     */
-    function fromPoll<E, A>(interval:number, f:() => Next<A>|End<A>):EventStream<E, A>;
-
-    /**
-     * @function Bacon.once
-     * @description Creates an [EventStream]{@link Bacon.EventStream} that delivers the given single `value` for the first subscriber. The stream will end immediately after this value. You can also send an [Error]{@link Bacon.Error} event instead of a `value`.
-     * @param {A|Error<E>} value
-     * @returns {EventStream<E, A>}
-     * @example
-     * Bacon.once(new Bacon.Error("fail"));
-     */
-    function once<E, A>(value:A|Error<E>):EventStream<E, A>;
-
-    /**
-     * @function
-     * @description Creates an [EventStream]{@link Bacon.EventStream} that delivers the given series of `values` (given as array) to the first subscriber. The stream ends after these values have been delivered. You can also send [Error]{@link Bacon.Error} events, or any combination of pure values and error events.
-     * @param {(A|Error<E>)[]} values
-     * @returns {EventStream<E, A>}
-     * @example
-     * Bacon.fromArray([1, new Bacon.Error("")]);
-     */
-    function fromArray<E, A>(values:(A|Error<E>)[]):EventStream<E, A>;
-
-    /**
-     * @function
-     * @description Repeats the single `value` indefinitely with the given `interval` (in milliseconds).
-     * @param {number} interval
-     * @param {A} value
-     * @returns {EventStream<E, A>}
-     */
-    function interval<E, A>(interval:number, value:A):EventStream<E, A>;
-
-    /**
-     * @function
-     * @description Creates a [EventStream]{@link Bacon.EventStream} containing given `values` (given as array) with the given `interval` (in milliseconds).
-     * @param {number} interval
-     * @param {A[]} values
-     * @returns {EventStream<E, A>}
-     */
-    function sequentially<E, A>(interval:number, values:A[]):EventStream<E, A>;
-
-    /**
-     * @function
-     * @description Repeats given `values` indefinitely with then given `interval` (in milliseconds).
-     * @param {number} interval
-     * @param {A[]} values
-     * @returns {EventStream<E, A>}
-     * @example
-     * // The following would lead to `1,2,3,1,2,3...` to be repeated indefinitely:
-     * Bacon.fromArray([1, new Bacon.Error("")]);
-     */
-    function repeatedly<E, A>(interval:number, values:A[]):EventStream<E, A>;
-
-    /**
-     * @callback Bacon.repeat~f
-     * @param {number} iteration
-     * @returns {boolean|Observable<E, A>}
-     */
-    /**
-     * @function Bacon.repeat
-     * @description Calls generator function `f` which is expected to return an [Observable]{@link Bacon.Observable}. The returned [EventStream]{@link Bacon.EventStream} contains values and errors from the spawned observable. When the spawned Observable ends, the generator `f` is called again to spawn a new Observable. This is repeated until the generator `f` returns a falsy value (such as `undefined` or `false`). The generator `f` is called with one argument — `iteration` number starting from `0`.
-     * @param {Bacon.repeat~f} f
-     * @returns {EventStream<E, A>}
-     * @example
-     * // The following will produce values `0,1,2`.
-     * Bacon.repeat(i => {
-     *     if (i < 3) {
-     *         return Bacon.once(i);
-     *     } else {
-     *         return false;
-     *     }
-     * }).log();
-     */
-    function repeat<E, A>(f:(iteration:number) => boolean|Observable<E, A>):EventStream<E, A>;
-
-    /**
-     * @function Bacon.never
-     * @description Creates an [EventStream]{@link Bacon.EventStream} that immediately ends.
-     * @returns {EventStream<E, A>}
-     */
-    function never<E, A>():EventStream<E, A>;
-
-    /**
-     * @function
-     * @description Creates a single-element [EventStream]{@link Bacon.EventStream} that produces given `value` after a given `delay` (in milliseconds).
-     * @param {number} delay
-     * @param {A} value
-     * @returns {EventStream<E, A>}
-     */
-    function later<E, A>(delay:number, value:A):EventStream<E, A>;
-
-    /**
-     * @function
-     * @description Creates a constant [Property]{@link Bacon.Property} with value `x`.
-     * @param {A} x
-     * @returns {Property<E, A>}
-     */
-    function constant<E, A>(x:A):Property<E, A>;
-
-    /**
-     * @callback Bacon.fromBinder~subscribe
-     * @param {Bacon.fromBinder~sink} sink
-     * @returns {Bacon.fromBinder~unsubscribe}
-     */
-    /**
-     * @callback Bacon.fromBinder~sink
-     * @param {More|NoMore|(A|Initial<A>|Next<A>|End<A>|Error<E>)|(A|Initial<A>|Next<A>|End<A>|Error<E>)[]} value
-     * @returns {void}
-     */
-    /**
-     * @callback Bacon.fromBinder~unsubscribe
-     * @returns {void}
-     */
-    /**
-     * @function Bacon.fromBinder
-     * @description Creates an [EventStream]{@link Bacon.EventStream} with the given [subscribe]{@link Bacon.fromBinder~subscribe} function. The parameter `subscribe` is a function that accepts a [sink]{@link Bacon.fromBinder~sink} which is a function that your `subscribe` function can "push" events to. You can push: a plain value, like `"first value"`; an [Event]{@link Bacon.Event} object including [Error]{@link Bacon.Error} (wraps an error) and [End]{@link Bacon.End} (indicates stream end); an array of event objects at once. The `subscribe` function must return a function. Let's call that function [unsubscribe]{@link Bacon.fromBinder~unsubscribe}. The returned function can be used by the subscriber (directly or indirectly) to unsubscribe from the EventStream. It should release all resources that the `subscribe` function reserved. The `sink` function may return [noMore]{@link Bacon.noMore} (as well as [more]{@link Bacon.more} or any other value). If it returns `noMore`, no further events will be consumed by the subscriber. The `subscribe` function may choose to clean up all resources at this point (e.g., by calling `unsubscribe`). This is usually not necessary, because further calls to `sink` are ignored, but doing so can increase performance in rare cases. The EventStream will wrap your `subscribe` function so that it will only be called when the first stream listener is added, and the `unsubscribe` function is called only after the last listener has been removed. The subscribe-unsubscribe cycle may of course be repeated indefinitely, so prepare for multiple calls to the `subscribe` function.
-     * @param {Bacon.fromBinder~subscribe} subscribe
-     * @returns {EventStream<E, A>}
-     * @example
-     * let stream = Bacon.fromBinder(sink => {
-     *     sink("first value");
-     *     sink([new Bacon.Next("2nd"), new Bacon.Next("3rd")]);
-     *     sink(new Bacon.Next(() => {
-     *         return "This one will be evaluated lazily"
-     *     }));
-     *     sink(new Bacon.Error("oops, an error"));
-     *     sink(new Bacon.End());
-     *     return () => {
-     *         // unsub functionality here, this one's a no-op
-     *     };
-     * });
-     * stream.log();
-     */
-    function fromBinder<E, A>(subscribe:(sink:(value:More|NoMore|(A|Initial<A>|Next<A>|End<A>|Error<E>)|(A|Initial<A>|Next<A>|End<A>|Error<E>)[]) => void) => (() => void)):EventStream<E, A>;
-
-    /**
-     * @interface
-     * @see Bacon.more
-     */
-    interface More {
-    }
-    /**
-     * @property more
-     * @constant
-     * @description The opaque value `sink` function may return. See [Bacon.fromBinder]{@link Bacon.fromBinder}.
-     */
-    var more:More;
-
-    /**
-     * @interface
-     * @see Bacon.noMore
-     */
-    interface NoMore {
-    }
-    /**
-     * @property noMore
-     * @constant
-     * @description The opaque value `sink` function may return. See [Bacon.fromBinder]{@link Bacon.fromBinder}.
-     */
-    var noMore:NoMore;
-
-    /**
-     * @class Observable
-     * @description A superclass for [EventStream]{@link Bacon.EventStream} and [Property]{@link Bacon.Property}.
-     * */
-    interface Observable<E, A> {
-        /**
-         * @callback Observable#onValue~f
-         * @param {A} value
-         * @returns {void}
-         */
-        /**
-         * @callback Observable#onValue~unsubscribe
-         * @returns {void}
-         */
-        /**
-         * @method Observable#onValue
-         * @description Subscribes a given handler function `f` to the [Observable]{@link Bacon.Observable}. Function will be called for each new value. This is the simplest way to assign a side-effect to an Observable. The difference to the [EventStream.subscribe]{@link Bacon.EventStream#subscribe} and [Property.subscribe]{@link Bacon.Property#subscribe} methods is that the actual stream `value`s are received, instead of [Event]{@link Bacon.Event} objects. [EventStream.onValue]{@link Bacon.EventStream#onValue} and [Property.onValue]{@link Bacon.Property#onValue} behave similarly, except that the latter also pushes the initial value of the Property, in case there is one.
-         * @param {Observable#onValue~f} f
-         * @returns {Observable#onValue~unsubscribe}
-         */
-        onValue(f:(value:A) => void):() => void;
-
-        /**
-         * @callback Observable#onError~f
-         * @param {E} error
-         * @returns {void}
-         */
-        /**
-         * @callback Observable#onError~unsubscribe
-         * @returns {void}
-         */
-        /**
-         * @method Observable#onError
-         * @description Subscribes a given handler function `f` to [Error]{@link Bacon.Error} events. The function `f` will be called for each error in the [Observable]{@link Bacon.Observable}.
-         * @param {Observable#onError~f} f
-         * @returns {Observable#onError~unsubscribe}
-         */
-        onError(f:(error:E) => void):() => void;
-
-        /**
-         * @callback Observable#onEnd~f
-         * @returns {void}
-         */
-        /**
-         * @callback Observable#onEnd~unsubscribe
-         * @returns {void}
-         */
-        /**
-         * @method Observable#onEnd
-         * @description Subscribes a given handler function `f` to [End]{@link Bacon.End} event. The function `f` will be called when the [Observable]{@link Bacon.Observable} ends. Just like [EventStream.subscribe]{@link Bacon.EventStream#subscribe} and [Property.subscribe]{@link Bacon.Property#subscribe}, this method returns a function for `unsubscribe`ing.
-         * @param {Observable#onEnd~f} f
-         * @returns {Observable#onEnd~unsubscribe}
-         */
-        onEnd(f:() => void):() => void;
-
-        /**
-         * @callback Observable#toPromise~promiseCtr
-         * @param {A} value
-         * @returns {Promise<A>}
-         */
-        /**
-         * @method Observable#toPromise
-         * @description Returns a Promise which will be resolved with the last event coming from an [Observable]{@link Bacon.Observable}. The global ES6 promise implementation will be used unless a promise constructor `promiseCtr` is given. Use a shim if you need to support legacy browsers or platforms.
-         * @param {Observable#toPromise~promiseCtr} [promiseCtr]
-         * @returns {Promise<A>}
-         */
-        toPromise(promiseCtr?:(value:A) => Promise<A>):Promise<A>;
-
-        /**
-         * @callback Observable#firstToPromise~promiseCtr
-         * @param {A} value
-         * @returns {Promise<A>}
-         */
-        /**
-         * @method Observable#firstToPromise
-         * @description Returns a Promise which will be resolved with the first event coming from an [Observable]{@link Bacon.Observable}. Like [Observable.toPromise]{@link Bacon.Observable#toPromise}, the global ES6 promise implementation will be used unless a promise constructor `promiseCtr` is given.
-         * @param {Observable#firstToPromise~promiseCtr} [promiseCtr]
-         * @returns {Promise<A>}
-         */
-        firstToPromise(promiseCtr?:(value:A) => Promise<A>):Promise<A>;
-
-        /**
-         * @method
-         * @description Throttles the [Observable]{@link Bacon.Observable} using a buffer so that at most one value event in `minimumInteval` is issued. Unlike [EventStream.throttle]{@link Bacon.EventStream#throttle} and [Property.throttle]{@link Bacon.Property#throttle}, it doesn't discard the excessive events but buffers them instead, outputting them with a rate of at most one value per `minimumInterval`.
-         * @param {number} minimumInterval
-         * @returns {EventStream<E, A>}
-         */
-        bufferingThrottle(minimumInterval:number):EventStream<E, A>;
-
-        /**
-         * @callback Observable#flatMap~f
-         * @param {A} value
-         * @returns {B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>}
-         */
-        /**
-         * @method Observable#flatMap
-         * @description For each element in the source [Observable]{@link Bacon.Observable}, spawn a new stream using the function `f`,  and collect events from each of the spawned streams into the result [EventStream]{@link Bacon.EventStream}. The return value of function `f` can be either an Observable (EventStream/[Property]{@link Bacon.Property}) or a constant value. The result of [flatMap]{@link Bacon.Observable#flatMap} is always an EventStream. The "Function Construction rules" apply here. `flatMap` can be used conveniently with [Bacon.once]{@link Bacon.once} and [Bacon.never]{@link Bacon.never} for converting and filtering at the same time, including only some of the results.
-         * @param {Observable#flatMap~f} f
-         * @returns {EventStream<E, B>}
-         * @example
-         * // Converting strings to integers, skipping empty values:
-         * Bacon.once("").flatMap(text => {
-         *     return text != "" ? parseInt(text) : Bacon.never();
-         * });
-         */
-        flatMap<B>(f:(value:A) => B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>):EventStream<E, B>;
-
-        /**
-         * @callback Observable#flatMapLatest~f
-         * @param {A} value
-         * @returns {B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>}
-         */
-        /**
-         * @method Observable#flatMapLatest
-         * @description For each element in the source [Observable]{@link Bacon.Observable}, spawn a new stream using the function `f`,  but instead of including events from all spawned streams, only includes them from the latest spawned stream into the result [EventStream]{@link Bacon.EventStream}. The return value of function `f` can be either an Observable (EventStream/[Property]{@link Bacon.Property}) or a constant value. The result of [flatMapLatest]{@link Bacon.Observable#flatMapLatest} is always an EventStream.
-         * @param {Observable#flatMapLatest~f} f
-         * @returns {EventStream<E, B>}
-         */
-        flatMapLatest<B>(f:(value:A) => B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>):EventStream<E, B>;
-
-        /**
-         * @callback Observable#flatMapFirst~f
-         * @param {A} value
-         * @returns {B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>}
-         */
-        /**
-         * @method Observable#flatMapFirst
-         * @description For each element in the source [Observable]{@link Bacon.Observable}, spawn a new stream using the function `f` only if the previously spawned stream has ended, and collect events from each of the spawned streams into the result [EventStream]{@link Bacon.EventStream}. The return value of function `f` can be either an Observable (EventStream/[Property]{@link Bacon.Property}) or a constant value. The result of [flatMapFirst]{@link Bacon.Observable#flatMapFirst} is always an EventStream.
-         * @param {Observable#flatMapFirst~f} f
-         * @returns {EventStream<E, B>}
-         */
-        flatMapFirst<B>(f:(value:A) => B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>):EventStream<E, B>;
-
-        /**
-         * @callback Observable#flatMapError~f
-         * @param {E} error
-         * @returns {B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>}
-         */
-        /**
-         * @method Observable#flatMapError
-         * @description For each [Error]{@link Bacon.Error} event in the source [Observable]{@link Bacon.Observable}, spawn a new stream using the function `f`,  and collect events from each of the spawned streams into the result [EventStream]{@link Bacon.EventStream}. The return value of function `f` can be either an Observable (EventStream/[Property]{@link Bacon.Property}) or a constant value. The result of [flatMapError]{@link Bacon.Observable#flatMapError} is always an EventStream.
-         * @param {Observable#flatMapError~f} f
-         * @returns {EventStream<E, B>}
-         */
-        flatMapError<B>(f:(error:E) => B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>):EventStream<E, B>;
-
-        /**
-         * @callback Observable#flatMapWithConcurrencyLimit~f
-         * @param {A} value
-         * @returns {B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>}
-         */
-        /**
-         * @method Observable#flatMapWithConcurrencyLimit
-         * @description For each element in the source [Observable]{@link Bacon.Observable}, spawn a new stream using the function `f`,  and collect events from each of the spawned streams into the result [EventStream]{@link Bacon.EventStream}, but limit the number of open spawned streams and buffers incoming events by `limit` amount. The return value of function `f` can be either an Observable (EventStream/[Property]{@link Bacon.Property}) or a constant value. [flatMapConcat]{@link Bacon.Observable#flatMapConcat} is [flatMapWithConcurrencyLimit]{@link Bacon.Observable#flatMapWithConcurrencyLimit}(1) (only one input active), and [flatMap]{@link Bacon.Observable#flatMap} is [flatMapWithConcurrencyLimit]{@link Bacon.Observable#flatMapWithConcurrencyLimit}(∞) (all inputs are piped to output). The result of `flatMapWithConcurrencyLimit` is always an EventStream.
-         * @param {number} limit
-         * @param {Observable#flatMapWithConcurrencyLimit~f} f
-         * @returns {EventStream<E, B>}
-         */
-        flatMapWithConcurrencyLimit<B>(limit:number, f:(value:A) => B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>):EventStream<E, B>;
-
-        /**
-         * @callback Observable#flatMapConcat~f
-         * @param {A} value
-         * @returns {B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>}
-         */
-        /**
-         * @method Observable#flatMapConcat
-         * @description For each element in the source [Observable]{@link Bacon.Observable}, spawn a new stream using the function `f`,  and collect events from each of the spawned streams into the result [EventStream]{@link Bacon.EventStream}, but limit the number of open spawned streams and buffers incoming events to 1. The return value of function `f` can be either an Observable (EventStream/[Property]{@link Bacon.Property}) or a constant value. The result of `flatMapConcat` is always an EventStream.
-         * @param {Observable#flatMapConcat~f} f
-         * @returns {EventStream<E, B>}
-         */
-        flatMapConcat<B>(f:(value:A) => B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>):EventStream<E, B>;
-
-        /**
-         * @callback Observable#scan~f
-         * @param {B} acc
-         * @param {A} next
-         * @returns {B}
-         */
-        /**
-         * @method Observable#scan
-         * @description Scans [Observable]{@link Bacon.Observable} with given `seed` value and accumulator function `f`, resulting to a [Property]{@link Bacon.Property}. For example, you might use zero as `seed` and a "plus" function as the accumulator to create an "integral" Property. When applied to a Property as in `r = p.scan(seed, f)`, there's a (hopefully insignificant) catch: the starting value for `r` depends on whether `p` has an initial value when `scan` is applied. If there's no initial value, this works identically to `[EventStream]{@link Bacon.EventStream}.scan`: the `seed` will be the initial value of `r`. However, if `r` already has a current/initial value `x`, the seed won't be output as is. Instead, the initial value of `r` will be `f(seed, x)`. This makes sense, because there can only be 1 initial value for a Property at a time.
-         * @param {B} seed
-         * @param {Observable#scan~f} f
-         * @returns {Property<E, B>}
-         * @example
-         * Bacon.sequentially(1, [1, 2, 3]).scan(0, (a, b) => a + b);
-         */
-        scan<B>(seed:B, f:(acc:B, next:A) => B):Property<E, B>;
-
-        /**
-         * @callback Observable#fold~f
-         * @param {B} acc
-         * @param {A} next
-         * @returns {B}
-         */
-        /**
-         * @method Observable#fold
-         * @description Scans [Observable]{@link Bacon.Observable} with given `seed` value and accumulator function `f`, but only emits the final value, i.e. the value just before the Observable ends. Returns a [Property]{@link Bacon.Property}.
-         * @param {B} seed
-         * @param {Observable#fold~f} f
-         * @returns {Property<E, B>}
-         */
-        fold<B>(seed:B, f:(acc:B, next:A) => B):Property<E, B>;
-
-        /**
-         * @callback Observable#reduce~f
-         * @param {B} acc
-         * @param {A} next
-         * @returns {B}
-         */
-        /**
-         * @method Observable#reduce
-         * @description Scans [Observable]{@link Bacon.Observable} with given `seed` value and accumulator function `f`, but only emits the final value, i.e. the value just before the Observable ends. Returns a [Property]{@link Bacon.Property}.
-         * @param {B} seed
-         * @param {Observable#reduce~f} f
-         * @returns {Property<E, B>}
-         */
-        reduce<B>(seed:B, f:(acc:B, next:A) => B):Property<E, B>;
-
-        /**
-         * @callback Observable#diff~f
-         * @param {A} a
-         * @param {B} b
-         * @returns {B}
-         */
-        /**
-         * @method Observable#diff
-         * @description Returns a [Property]{@link Bacon.Property} that represents the result of a comparison `f` between the previous and current value of the [Observable]{@link Bacon.Observable}. For the initial value of the Observable, the previous value will be the given `start`.
-         * @param {A} start
-         * @param {Observable#diff~f} f
-         * @returns {Property<E, B>}
-         * @example
-         * Bacon.sequentially(1, [1, 2, 3]).diff(0, (a, b) => Math.abs(b - a));
-         */
-        diff<B>(start:A, f:(a:A, b:A) => B):Property<E, B>;
-
-        /**
-         * @callback Observable#zip~f
-         * @param {A} a
-         * @param {B} b
-         * @returns {C}
-         */
-        /**
-         * @method Observable#zip
-         * @description Returns an [EventStream]{@link Bacon.EventStream} with elements pair-wise lined up with events from this and the `other` EventStream. A zipped EventStream will publish only when it has a value from each EventStream and will only produce values up to when any single EventStream ends. The given function `f` is used to create the result value from value in the two source EventStream. If no function `f` is given, the values are zipped into an array. Be careful not to have too much "drift" between streams. If one stream produces many more values than some other excessive buffering will occur inside the zipped observable.
-         * @param {EventStream<E, B>} other
-         * @param {Observable#zip~f} f
-         * @returns {EventStream<E, C>}
-         * @example
-         * {
-         *     let x = Bacon.fromArray([1, 2]),
-         *         y = Bacon.fromArray([3, 4]);
-         *     x.zip(y, (x, y) => x + y);
-         * }
-         */
-        zip<B, C>(other:EventStream<E, B>, f:(a:A, b:B) => C):EventStream<E, C>;
-
-        /**
-         * @method
-         * @description Returns a [Property]{@link Bacon.Property} that represents a "sliding window" into the history of the values of the [Observable]{@link Bacon.Observable}. The resulting Property will have a value that is an array containing the last `n` values of the original Observable, where `n` is at most the value of the `max` argument, and at least the value of the `min` argument. If the `min` argument is omitted, there's no lower limit of values.
-         * @param {number} max
-         * @param {number} [min]
-         * @returns {Property<E, A[]>}
-         * @example
-         * // If you have a EventStream `s` with a value sequence `1,2,3,4,5`, the respective values in `s.slidingWindow(2)` would be `[],[1],[1,2],[2,3],[3,4],[4,5]`:
-         * Bacon.fromArray([1, 2, 3, 4, 5]).slidingWindow(2);
-         * // The values of `s.slidingWindow(2,2)`would be `[1,2],[2,3],[3,4],[4,5]`:
-         * Bacon.fromArray([1, 2, 3, 4, 5]).slidingWindow(2, 2);
-         */
-        slidingWindow(max:number, min?:number):Property<E, A[]>;
-
-        /**
-         * @callback Observable#combine~f
-         * @param {A} a
-         * @param {B} b
-         * @returns {C}
-         */
-        /**
-         * @method Observable#combine
-         * @description Combines the latest values of the two [EventStream]{@link Bacon.EventStream}s or [Property]{@link Bacon.Property}s using a two-arg function `f`. The result is a Property.
-         * @param {Property<E, B>} property2
-         * @param {Observable#combine~f} f
-         * @returns {Property<E, C>}
-         */
-        combine<B, C>(property2:Property<E, B>, f:(a:A, b:B) => C):Property<E, C>;
-
-        /**
-         * @callback Observable#withStateMachine~f
-         * @param {B} state
-         * @param {Initial<A>|Next<A>|End<A>|Error<E>} event
-         * @returns {[B, (Initial<C>|Next<C>|End<C>|Error<E>)[]]}
-         */
-        /**
-         * @method Observable#withStateMachine
-         * @description Lets you run a state machine on an [Observable]{@link Bacon.Observable}. Give it an initial state `initState` object and a state transformation function `f` that processes each incoming [Event]{@link Bacon.Event} and returns and array containing the next `state` and an array of output Event's.
-         * @param {B} initState
-         * @param {Observable#withStateMachine~f} f
-         * @returns {EventStream<E, C>}
-         * @example
-         * // Calculate the total sum of all numbers in the stream and output the value on stream end:
-         * Bacon.fromArray([1, 2, 3]).withStateMachine(0, (sum, event) => {
-         *     if (event.hasValue()) {
-         *         // had to cast to `number` because event:Bacon.Next<number>|Bacon.Error<{}>
-         *         return [sum + <number>event.value(), []];
-         *     } else if (event.isEnd()) {
-    	 *         return [undefined, [new Bacon.Next(sum), event]];
-    	 *     } else {
-    	 *         return [sum, [event]];
-    	 *     }
-    	 * });
-         */
-        withStateMachine<B, C>(initState:B, f:(state:B, event:Initial<A>|Next<A>|End<A>|Error<E>) => [B, (Initial<C>|Next<C>|End<C>|Error<E>)[]]):EventStream<E, C>;
-
-        /**
-         * @method
-         * @description Decodes input [Observable]{@link Bacon.Observable} using the given `mapping`. Is a bit like a switch-case or the decode function in Oracle SQL. The return value of `decode` is always a [Property]{@link Bacon.Property}.
-         * @param {Object} mapping
-         * @returns {Property<E, B>}
-         * @example
-         * {
-    	 *     let property = Bacon.fromArray([1, 2, 3]).toProperty(),
-    	 *         who = Bacon.fromArray(["A", "B", "C"]).toProperty();
-    	 *     // The following would map the value 1 into the string "mike" and the value 2 into the value of the `who` property:
-    	 *     property.decode({1: "mike", 2: who});
-    	 *     // You can compose static and dynamic data quite freely, as in:
-    	 *     property.decode({1: {type: "mike"}, 2: {type: "other", whoThen: who}});
-    	 * }
-         */
-        decode<B>(mapping:Object):Property<E, B>;
-
-        /**
-         * @method
-         * @description Creates a [Property]{@link Bacon.Property} that indicates whether Observable is awaiting `otherObservable`, i.e. has produced a value after the latest value from `otherObservable`.
-         * @param {Observable<E, B>} otherObservable
-         * @returns {Property<E, boolean>}
-         * @example
-         * {
-    	 *     // This is handy for keeping track whether we are currently awaiting an AJAX response:
-    	 *     let ajaxRequest = <Bacon.Observable<Error, JQueryXHR>>{},
-    	 *         ajaxResponse = <Bacon.Observable<Error, JQueryXHR>>{},
-    	 *         showAjaxIndicator = ajaxRequest.awaiting(ajaxResponse);
-    	 * }
-         */
-        awaiting<B>(otherObservable:Observable<E, B>):Property<E, boolean>;
-    }
-
-    /**
-     * @class EventStream
-     * @augments Bacon.Observable
-     * @description A stream of events.
-     * */
-    interface EventStream<E, A> extends Observable<E, A> {
-        /**
-         * @callback EventStream#map~f
-         * @param {A} value
-         * @returns {B}
-         */
-        /**
-         * @method EventStream#map
-         * @description Maps [EventStream]{@link Bacon.EventStream} values using given function `f`, returning a new EventStream. The `map` method, among many others, uses lazy evaluation.
-         * @param {EventStream#map~f} f
-         * @returns {EventStream<E, B>}
-         * */
-        map<B>(f:(value:A) => B):EventStream<E, B>;
-
-        /**
-         * @method
-         * @description Maps [EventStream]{@link Bacon.EventStream} values using given `constant` value, returning a new EventStream. The `map` method, among many others, uses lazy evaluation.
-         * @param {B} constant
-         * @returns {EventStream<E, B>}
-         * */
-        map<B>(constant:B):EventStream<E, B>;
-
-        /**
-         * @method
-         * @description Maps [EventStream]{@link Bacon.EventStream} values using given `propertyExtractor` string like ".keyCode", returning a new EventStream. So, if `propertyExtractor` is a string starting with a dot, the elements will be mapped to the corresponding field/function in the event value. For instance map(".keyCode") will pluck the keyCode field from the input values. If `keyCode` was a function, the result EventStream would contain the values returned by the function. The "Function Construction rules" apply here. The `map` method, among many others, uses lazy evaluation.
-         * @param {string} propertyExtractor
-         * @returns {EventStream<E, B>}
-         * */
-        map<B>(propertyExtractor:string):EventStream<E, B>;
-
-        /**
-         * @method
-         * @description Maps [EventStream]{@link Bacon.EventStream} events to the current value of the given [Property]{@link Bacon.Property} `property`. This is equivalent to [Property.sampledBy]{@link Bacon.Property#sampledBy}.
-         * @param {Property<E, B>} property
-         * @returns {EventStream<E, B>}
-         */
-        map<B>(property:Property<E, B>):EventStream<E, B>;
-
-        /**
-         * @callback EventStream#mapError~f
-         * @param {E} error
-         * @returns {B}
-         */
-        /**
-         * @method EventStream#mapError
-         * @description Maps [EventStream]{@link Bacon.EventStream} [Error]{@link Bacon.Error}s using given function `f`. More specifically, feeds the "error" field of the Error event to the function and produces a [Next]{@link Bacon.Next} event based on the return value. The "Function Construction rules" apply here.
-         * @param {EventStream#mapError~f} f
-         * @returns {EventStream<E, A|B>}
-         */
-        mapError<B>(f:(error:E) => B):EventStream<E, A|B>;
-
-        /**
-         * @method
-         * @description Returns an [EventStream]{@link Bacon.EventStream} containing [Error]{@link Bacon.Error} events only. Same as filtering with a function that always returns `false`.
-         * @returns {EventStream<E, A>}
-         */
-        errors():EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Skips all [Error]{@link Bacon.Error}s.
-         * @returns {EventStream<E, A>}
-         */
-        skipErrors():EventStream<E, A>;
-
-        /**
-         * @callback EventStream#mapEnd~f
-         * @returns {A}
-         */
-        /**
-         * @method EventStream#mapEnd
-         * @description Adds an extra [Next]{@link Bacon.Next} event just before [End]{@link Bacon.End} to [EventStream]{@link Bacon.EventStream}. The value is created by calling the given function `f` when the source [EventStream]{@link Bacon.EventStream} ends.
-         * @param {EventStream#mapEnd~f} f
-         * @returns {EventStream<E, A>}
-         */
-        mapEnd(f:() => A):EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Adds an extra [Next]{@link Bacon.Next} event just before [End]{@link Bacon.End} to [EventStream]{@link Bacon.EventStream}. A static `value` is used.
-         * @param {A} value
-         * @returns {EventStream<E, A>}
-         */
-        mapEnd(value:A):EventStream<E, A>;
-
-        /**
-         * @callback EventStream#filter~f
-         * @param {A} value
-         * @returns {boolean}
-         */
-        /**
-         * @method EventStream#filter
-         * @description Filters [EventStream]{@link Bacon.EventStream} `value`s using a given predicate function `f`.
-         * @param {EventStream#filter~f} f
-         * @returns {EventStream<E, A>}
-         */
-        filter(f:(value:A) => boolean):EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Filters [EventStream]{@link Bacon.EventStream} values using a given `constant` value (`true` to include all, `false` to exclude all).
-         * @param {boolean} bool
-         * @returns {EventStream<E, A>}
-         */
-        filter(bool:boolean):EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Filters [EventStream]{@link Bacon.EventStream} values using a given `propertyExtractor` string (like ".isValuable").
-         * @param {string} propertyExtractor
-         * @returns {EventStream<E, A>}
-         */
-        filter(propertyExtractor:string):EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Filters [EventStream]{@link Bacon.EventStream} values based on the value of a [Property]{@link Bacon.Property} `property`. [Event]{@link Bacon.Event} will be included in output IF AND ONLY IF the `property` holds `true` at the time of the event.
-         * @param {Property<E, boolean>} property
-         * @returns {EventStream<E, A>}
-         */
-        filter(property:Property<E, boolean>):EventStream<E, A>;
-
-        /**
-         * @callback EventStream#takeWhile~f
-         * @param {A} value
-         * @returns {boolean}
-         */
-        /**
-         * @method EventStream#takeWhile
-         * @description Takes [EventStream]{@link Bacon.EventStream} values while given predicate function `f` holds `true`, and then ends.
-         * @param {EventStream#takeWhile} f
-         * @returns {EventStream<E, A>}
-         */
-        takeWhile(f:(value:A) => boolean):EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Takes [EventStream]{@link Bacon.EventStream} values while the value of a `property` holds `true`, and then ends.
-         * @param {Property<E, boolean>} property
-         * @returns {EventStream<E, A>}
-         */
-        takeWhile(property:Property<E, boolean>):EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Takes at most n elements from the [EventStream]{@link Bacon.EventStream}. Equal to `Bacon.never()` if `n <= 0`.
-         * @param {number} n
-         * @returns {EventStream<E, A>}
-         */
-        take(n:number):EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Takes elements from [EventStream]{@link Bacon.EventStream} until a [Next]{@link Bacon.Next} event appears in the EventStream `stream`. If `stream` ends without value, it is ignored.
-         * @param {EventStream<E, B>} stream
-         * @returns {EventStream<E, A>}
-         */
-        takeUntil<B>(stream:EventStream<E, B>):EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Takes the first element from the [EventStream]{@link Bacon.EventStream}. Essentially [Observable.take]{@link Bacon.EventStream#take}(1).
-         * @returns {EventStream<E, A>}
-         */
-        first():EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Takes the last element from the [EventStream]{@link Bacon.EventStream}. None, if EventStream is empty.
-         * @returns {EventStream<E, A>}
-         * @example
-         * // This creates the stream which doesn't produce any events and never ends:
-         * Bacon.interval(1e1, 0).last();
-         */
-        last():EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Skips the first `n` elements from the [EventStream]{@link Bacon.EventStream}.
-         * @param {number} n
-         * @returns {EventStream<E, A>}
-         */
-        skip(n:number):EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Delays the [EventStream]{@link Bacon.EventStream} by given `delay` (in milliseconds).
-         * @param {number} delay
-         * @returns {EventStream<E, A>}
-         */
-        delay(delay:number):EventStream<E, A>;
-
-        /**
-         * @method EventStream#throttle
-         * @description Throttles the [EventStream]{@link Bacon.EventStream} by given `delay` (in milliseconds). Events are emitted with the minimum interval of `delay`. The implementation is based on [EventStream.bufferWithTime]{@link Bacon.EventStream#bufferWithTime}.
-         * @param {number} delay
-         * @returns {EventStream<E, A>}
-         */
-        throttle(delay:number):EventStream<E, A>;
-
-        /**
-         * @method EventStream#debounce
-         * @description Throttles the [EventStream]{@link Bacon.EventStream} by given `delay` (in milliseconds), but so that event is only emitted after the given "quiet period". The difference of [throttle]{@link Bacon.EventStream#throttle} and [debounce]{@link Bacon.EventStream#debounce} is the same as it is in the same methods in jQuery.
-         * @param {number} delay
-         * @returns {EventStream<E, A>}
-         */
-        debounce(delay:number):EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Passes the first event in the [EventStream]{@link Bacon.EventStream} through, but after that, only passes events after a given `delay` (in milliseconds) have passed since previous output.
-         * @param {number} delay
-         * @returns {EventStream<E, A>}
-         */
-        debounceImmediate(delay:number):EventStream<E, A>;
-
-        /**
-         * @callback EventStream#doAction~f
-         * @param {A} value
-         * @returns {void}
-         */
-        /**
-         * @method EventStream#doAction
-         * @description Returns an [EventStream]{@link Bacon.EventStream} where the function `f` is executed for each value, before dispatching to subscribers. This is useful for debugging, but also for stuff like calling the `preventDefault()` method for events.
-         * @param {EventStream#doAction~f} f
-         * @returns {EventStream<E, A>}
-         */
-        doAction(f:(value:A) => void):EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Returns an [EventStream]{@link Bacon.EventStream} where the `propertyExtractor` string is applied to each value, before dispatching to subscribers. This is useful for debugging, but also for stuff like calling the `preventDefault()` method for events.
-         * @param {string} propertyExtractor
-         * @returns {EventStream<E, A>}
-         */
-        doAction(propertyExtractor:string):EventStream<E, A>;
-
-        /**
-         * @callback EventStream#doError~f
-         * @param {E} error
-         * @returns {void}
-         */
-        /**
-         * @method EventStream#doError
-         * @description Returns an [EventStream]{@link Bacon.EventStream} where the function `f` is executed for each error, before dispatching to subscribers. That is, same as `doAction` but for errors.
-         * @param {EventStream#doError~f} f
-         * @returns {EventStream<E, A>}
-         */
-        doError(f:(error:E) => void):EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Returns an [EventStream]{@link Bacon.EventStream} that inverts boolean values.
-         * @returns {EventStream<E, boolean>}
-         */
-        not():EventStream<E, boolean>;
-
-        /**
-         * @method EventStream#log
-         * @description Logs each value of the [EventStream]{@link Bacon.EventStream} to the console. It optionally takes a `label` argument to pass to `console.log()` alongside each value. To assist with chaining, it returns the original EventStream. Note that as a side-effect, the EventStream will have a constant listener and will not be garbage-collected. So, use this for debugging only and remove from production code.
-         * @param {string} [label]
-         * @returns {EventStream<E, A>}
-         */
-        log(label?:string):EventStream<E, A>;
-
-        /**
-         * @method EventStream#doLog
-         * @description Logs each value of the [EventStream]{@link Bacon.EventStream} to the console. [doLog]{@link Bacon.EventStream#doLog} behaves like [log]{@link Bacon.EventStream#log} but does not subscribe to the EventStream. You can think of `doLog` as a logger function that – unlike `log` – is safe to use in production. `doLog` is safe, because it does not cause the same surprising side-effects as `log` does.
-         * @returns {EventStream<E, A>}
-         */
-        doLog():EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Ends the [EventStream]{@link Bacon.EventStream} on first [Error]{@link Bacon.Error} event. The error is included in the output of the returned EventStream.
-         * @returns {EventStream<E, A>}
-         */
-        endOnError():EventStream<E, A>;
-
-        /**
-         * @callback EventStream#endOnError~f
-         * @param {E} error
-         * @returns {boolean}
-         */
-        /**
-         * @method EventStream#endOnError
-         * @description Ends the [EventStream]{@link Bacon.EventStream} on first [Error]{@link Bacon.Error} event for which the given predicate function `f` returns `true`. The error is included in the output of the returned EventStream.
-         * @param {EventStream#endOnError} f
-         * @returns {EventStream<E, A>}
-         */
-        endOnError(f:(error:E) => boolean):EventStream<E, A>;
-
-        /**
-         * @callback EventStream#withHandler~f
-         * @param {Initial<A>|Next<A>|End<A>|Error<E>} event
-         * @returns {*}
-         */
-        /**
-         * @method EventStream#withHandler
-         * @description Lets you do more custom event handling on [EventStream]{@link Bacon.EventStream}: you get all events to your function `f` and you can output any number of events and end the stream if you choose. Note that it's important to return the value from `this.push` so that the connection to the underlying stream will be closed when no more events are needed.
-         * @param {EventStream#withHandler~f} f
-         * @returns {EventStream<E, A>}
-         * @example
-         * // Send an error and end the stream in case a value is below zero:
-         * Bacon.fromArray([1, 2, -3, 3]).withHandler(function (event) {
-    	 *     if (event.hasValue() && event.value() < 0) {
-    	 *         this.push(new Bacon.Error("Value below zero"));
-    	 *         return this.push(new Bacon.End());
-    	 *     } else {
-    	 *         return this.push(event);
-    	 *     }
-    	 * });
-         */
-        withHandler(f:(event:Initial<A>|Next<A>|End<A>|Error<E>) => any):EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Sets the name of the [EventStream]{@link Bacon.EventStream}. Overrides the default implementation of `toString` and `inspect`. Returns itself.
-         * @param {string} newName
-         * @returns {EventStream<E, A>}
-         */
-        name(newName:string):EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Sets the structured description of the [EventStream]{@link Bacon.EventStream}. The `toString` and `inspect` methods use this data recursively to create a string representation for the `EventStream`. This method is probably useful for Bacon core/library/plugin development only.
-         * @param {...*} param
-         * @returns {EventStream<E, A>}
-         * @example
-         * {
-    	 *     let src = Bacon.once(1),
-    	 *         obs = src.map(x => -x);
-    	 *
-    	 *     console.log(obs.toString());
-    	 *     // Bacon.once(1).map(function)
-    	 *
-    	 *     obs.withDescription(src, "times", -1);
-    	 *     console.log(obs.toString());
-    	 *     // Bacon.once(1).times(-1)
-    	 */
-        withDescription(...param:any[]):EventStream<E, A>;
-
-        /**
-         * @callback EventStream#groupBy1~keyF
-         * @param {A} value
-         * @returns {B}
-         */
-        /**
-         * @method EventStream#groupBy1
-         * @description Groups [EventStream]{@link Bacon.EventStream} events to new EventStream's by `keyF`.
-         * @param {EventStream#groupBy1~keyF} keyF
-         * @returns {EventStream<E, EventStream<E, A>>}
-         */
-        groupBy<B>(keyF:(value:A) => B):EventStream<E, EventStream<E, A>>;
-
-        /**
-         * @callback keyF
-         * @param {A} value
-         * @returns {B}
-         */
-        /**
-         * @callback limitF
-         * @param {EventStream<E, A>} groupedStream
-         * @param {Initial<A>|Next<A>|End<A>|Error<E>} groupStartingEvent
-         * @returns {EventStream<E, C>}
-         */
-        /**
-         * @description Groups [EventStream]{@link Bacon.EventStream} events to new EventStream's by `keyF`. `limitF` is provided to limit grouped stream life. EventStream transformed by `limitF` is passed on if provided. `limitF` gets grouped stream and the original [Event]{@link Bacon.Event} causing the EventStream to start as parameters.
-         * @param {keyF} keyF
-         * @param {limitF} limitF
-         * @returns {EventStream<E, EventStream<E, C>>} Grouped streams.
-         */
-        groupBy<B, C>(keyF:(value:A) => B, limitF:(groupedStream:EventStream<E, A>, groupStartingEvent:Initial<A>|Next<A>|End<A>|Error<E>) => EventStream<E, C>):EventStream<E, EventStream<E, C>>;
-
-        /**
-         * @callback EventStream#subscribe~f
-         * @param {Event<A>} event
-         * @returns {void|NoMore}
-         */
-        /**
-         * @callback EventStream#subscribe~unsubscribe
-         * @returns {void}
-         */
-        /**
-         * @method EventStream#subscribe
-         * @description Subscribes a given handler function `f` to [EventStream]{@link Bacon.EventStream}. Function will receive [Event]{@link Bacon.Event} objects. The [subscribe]{@link EventStream#subscribe} call returns an [unsubscribe function]{@link EventStream#subscribe~unsubscribe} that you can call to unsubscribe. You can also unsubscribe by returning [Bacon.noMore]{@link Bacon.noMore} from the handler function as a reply to an Event.
-         * @param {EventStream#subscribe~f} f
-         * @returns {EventStream#subscribe~unsubscribe}
-         */
-        subscribe(f:(event:Event<A>) => void|NoMore):() => void;
-
-        /**
-         * @callback EventStream#onValue~f
-         * @param {A} value
-         * @returns {void}
-         */
-        /**
-         * @callback EventStream#onValue~unsubscribe
-         * @returns {void}
-         */
-        /**
-         * @method EventStream#onValue
-         * @description Subscribes a given handler function `f` to [EventStream]{@link Bacon.EventStream}. Function will be called for each new value in the EventStream. This is the simplest way to assign a side-effect to a EventStream. The difference to the [subscribe]{@link Bacon.EventStream#subscribe} method is that the actual EventStream values are received, instead of [Event]{@link Bacon.Event} objects. Just like `subscribe`, this method returns a function for `unsubscribe`ing.
-         * @param {EventStream#onValue~f} f
-         * @returns {EventStream#onValue~unsubscribe}
-         */
-        onValue(f:(value:A) => void):() => void;
-
-        /**
-         * @callback EventStream#onValues~f
-         * @param {*[]} args
-         * @returns {void}
-         */
-        /**
-         * @callback EventStream#onValues~unsubscribe
-         * @returns {void}
-         */
-        /**
-         * @method EventStream#onValues
-         * @description Subscribes a given handler function `f` to [EventStream]{@link Bacon.EventStream}. Like [EventStream.onValue]{@link Bacon.EventStream#onValue}, but splits the value (assuming its an array) as function arguments to `f`.
-         * @param {EventStream#onValues~f} f
-         * @returns {EventStream#onValues~unsubscribe}
-         */
-        onValues(f:(...args:any[]) => void):() => void;
-
-        /**
-         * @callback EventStream#skipDuplicates~isEqual
-         * @param {A} oldValue
-         * @param {A} newValue
-         * @returns {boolean}
-         */
-        /**
-         * @method EventStream#skipDuplicates
-         * @description Drops consecutive equal elements of the [EventStream]{@link Bacon.EventStream}. Uses the === operator for equality checking by default. If the `isEqual` argument is supplied, checks by calling [isEqual]{@link EventStream#skipDuplicates~isEqual}. For instance, to do a deep comparison, you can use the `isEqual` function from underscore.js like `stream.skipDuplicates(_.isEqual)`.
-         * @param {EventStream#skipDuplicates~isEqual} [isEqual]
-         * @returns {EventStream<E, A>}
-         * @example
-         * Bacon.fromArray([1, 2, 2, 1]).skipDuplicates().log();
-         * // > returns [1, 2, 1] in an order
-         */
-        skipDuplicates(isEqual?:(oldValue:A, newValue:A) => boolean):EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Concatenates two [EventStream]{@link Bacon.EventStream}s into one so that it will deliver events from EventStream until it ends and then deliver events from `otherStream`. This means too that events from `otherStream`, occurring before the end of EventStream will not be included in the result EventStream.
-         * @param {EventStream<E, A>} otherStream
-         * @returns {EventStream<E, A>}
-         */
-        concat(otherStream:EventStream<E, A>):EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Merges two [EventStream]{@link Bacon.EventStream}s into one that delivers events from both.
-         * @param {EventStream<E, A>} otherStream
-         * @returns {EventStream<E, A>}
-         */
-        merge(otherStream:EventStream<E, A>):EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Pauses and buffers the [EventStream]{@link Bacon.EventStream} if last event in `valve` is truthy. All buffered events are released when `valve` becomes falsy.
-         * @param {Observable<E, B>} valve
-         * @returns {EventStream<E, A>}
-         */
-        holdWhen<B>(valve:Observable<E, B>):EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Adds a starting `value` to the [EventStream]{@link Bacon.EventStream}, i.e. concats a EventStream containing a single `value` with this EventStream.
-         * @param {A} value
-         * @returns {EventStream<E, A>}
-         */
-        startWith(value:A):EventStream<E, A>;
-
-        /**
-         * @callback EventStream#skipWhile~f
-         * @param {A} value
-         * @returns {boolean}
-         */
-        /**
-         * @method EventStream#skipWhile
-         * @description Skips elements in the [EventStream]{@link Bacon.EventStream} until the given predicate function `f` returns falsy once, and then lets all events pass through.
-         * @param {EventStream#skipWhile~f} f
-         * @returns {EventStream<E, A>}
-         */
-        skipWhile(f:(value:A) => boolean):EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Skips elements in the [EventStream]{@link Bacon.EventStream} until the value of the given [Property]{@link Bacon.Property} `property` is falsy once, and then lets all events pass through.
-         * @param {Property<E, B>} property
-         * @returns {EventStream<E, A>}
-         */
-        skipWhile<B>(property:Property<E, B>):EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Skips elements from the [EventStream]{@link Bacon.EventStream} until a [Next]{@link Bacon.Next} event appears in `stream2`. In other words, starts delivering values from `stream` after first event appears in `stream2`.
-         * @param {EventStream<E, B>} stream2
-         * @returns {EventStream<E, A>}
-         */
-        skipUntil<B>(stream2:EventStream<E, B>):EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Buffers the [EventStream]{@link Bacon.EventStream} with given `delay` (in milliseconds). The buffer is flushed at most once in the given `delay`.
-         * @param {number} delay
-         * @returns {EventStream<E, A[]>}
-         * @example
-         * // You might get two events containing [1,2,3,4] and [5,6,7] respectively, given that the flush occurs between numbers 4 and 5:
-         * Bacon.fromArray([1, 2, 3, 4, 5, 6, 7]).bufferWithTime(0);
-         */
-        bufferWithTime(delay:number):EventStream<E, A[]>;
-
-        /**
-         * @callback EventStream#bufferWithTime~f
-         * @param {EventStream#bufferWithTime~defer} defer
-         * @returns {void}
-         */
-        /**
-         * @callback EventStream#bufferWithTime~defer
-         * @param {...*} args
-         * @returns {void}
-         */
-        /**
-         * @method EventStream#bufferWithTime
-         * @description Buffers the [EventStream]{@link Bacon.EventStream} with given "defer-function" `f`.
-         * @param {EventStream#bufferWithTime~f} f
-         * @returns {EventStream<E, A[]>}
-         * @example
-         * // Here's an equivalent to `stream.bufferWithTime(10)`:
-         * let stream = Bacon.fromArray([1, 2, 3, 4, 5, 6, 7]);
-         * stream.bufferWithTime(f => { setTimeout(f, 10); }); }
-         */
-        bufferWithTime(f:(defer:(...args:any[]) => void) => void):EventStream<E, A[]>;
-
-        /**
-         * @method
-         * @description Buffers the [EventStream]{@link Bacon.EventStream} events with given `count`. The buffer is flushed when it contains the given `count` of elements.
-         * @param {number} count
-         * @returns {EventStream<E, A[]>}
-         * @example
-         * // You will get output events with values `[1, 2]`, `[3, 4]` and `[5]`.
-         * Bacon.fromArray([1, 2, 3, 4, 5]).bufferWithCount(2);
-         */
-        bufferWithCount(count:number):EventStream<E, A[]>;
-
-        /**
-         * @method
-         * @description Buffers the [EventStream]{@link Bacon.EventStream} events and flushes when either the buffer contains the given `count` of elements or the given `delay` (in milliseconds) has passed since last buffered event.
-         * @param {number} delay
-         * @param {number} count
-         * @returns {EventStream<E, A[]>}
-         */
-        bufferWithTimeOrCount(delay:number, count:number):EventStream<E, A[]>;
-
-        /**
-         * @method EventStream#toProperty
-         * @description Creates a [Property]{@link Bacon.Property} based on the [EventStream]{@link Bacon.EventStream}. Without arguments, you'll get a Property without an initial value and will get its first actual value from the EventStream, and after that it'll always have a current value. Given `initialValue` will be used as the current value until the first value comes from the EventStream.
-         * @param {A} [initialValue]
-         * @returns {Property<E, A>}
-         */
-        toProperty(initialValue?:A):Property<E, A>;
-    }
-
-    var EventStream:{
-        /**
-         * @callback EventStream#new~subscribe
-         * @param {EventStream#new~sink} sink
-         * @returns {EventStream#new~unsubscribe}
-         */
-        /**
-         * @callback EventStream#new~sink
-         * @param {More|NoMore|(A|Initial<A>|Next<A>|End<A>|Error<E>)|(A|Initial<A>|Next<A>|End<A>|Error<E>)[]} value
-         * @returns {void}
-         */
-        /**
-         * @callback EventStream#new~unsubscribe
-         * @returns {void}
-         */
-        /**
-         * @constructor EventStream#new
-         * @constructs Bacon.EventStream
-         * @description Creates an [EventStream]{@link Bacon.EventStream} with the given `subscribe` function.
-         * @param {EventStream#new~subscribe} subscribe
-         * @returns {EventStream<E, A>}
-         */
-        new<E, A>(subscribe:(sink:(value:More|NoMore|(A|Initial<A>|Next<A>|End<A>|Error<E>)|(A|Initial<A>|Next<A>|End<A>|Error<E>)[]) => void) => (() => void)):EventStream<E, A>;
-    };
-
-    /**
-     * @class Property
-     * @augments Bacon.Observable
-     * @description A reactive property. Has the concept of "current value". You can create a Property from an [EventStream]{@link Bacon.EventStream} by using either [EventStream.toProperty]{@link Bacon.EventStream#toProperty} or [Observable.scan]{@link Bacon.Observable#scan} method. Note: depending on how a Property is created, it may or may not have an initial value. The current value stays as its last value after the EventStream has ended.
-     * */
-    interface Property<E, A> extends Observable<E, A> {
-        /**
-         * @callback Property#map~f
-         * @param {A} value
-         * @returns {B}
-         */
-        /**
-         * @method Property#map
-         * @description Maps the [Property]{@link Bacon.Property} values using given function `f`, returning a new Property. This method, among many others, uses lazy evaluation.
-         * @param {Property#map~f} f
-         * @returns {Property<E, B>}
-         * */
-        map<B>(f:(value:A) => B):Property<E, B>;
-
-        /**
-         * @method
-         * @description Maps the [Property]{@link Bacon.Property} values using given `constant` value, returning a new Property. This method, among many others, uses lazy evaluation.
-         * @param {B} constant
-         * @returns {Property<E, B>}
-         * */
-        map<B>(constant:B):Property<E, B>;
-
-        /**
-         * @method
-         * @description Maps the [Property]{@link Bacon.Property} values using given `propertyExtractor` string like ".keyCode", returning a new Property. So, if f is a string starting with a dot, the elements will be mapped to the corresponding field/function in the event value. For instance map(".keyCode") will pluck the keyCode field from the input values. If "keyCode" was a function, the resulting Property would contain the values returned by the function. This method, among many others, uses lazy evaluation.
-         * @param {string} propertyExtractor
-         * @returns {Property<E, B>}
-         * */
-        map<B>(propertyExtractor:string):Property<E, B>;
-
-        /**
-         * @callback Property#mapError~f
-         * @param {E} error
-         * @returns {B}
-         */
-        /**
-         * @method Property#mapError
-         * @description Maps the [Property]{@link Bacon.Property} errors using given function `f`. More specifically, feeds the "error" field of the [Error]{@link Bacon.Error} event to the function `f` and produces a [Next]{@link Bacon.Next} event based on the return value.
-         * @param {Property#mapError~f} f
-         * @returns {Property<E, A|B>}
-         */
-        mapError<B>(f:(error:E) => B):Property<E, A|B>;
-
-        /**
-         * @method
-         * @description Returns a [Property]{@link Bacon.Property} containing [Error]{@link Bacon.Error} events only. Same as filtering with a function that always returns false.
-         * @returns {Property<E, A>}
-         */
-        errors():Property<E, A>;
-
-        /**
-         * @method
-         * @description Skips all [Error]{@link Bacon.Error}s.
-         * @returns {Property<E, A>}
-         */
-        skipErrors():Property<E, A>;
-
-        /**
-         * @callback Property#mapEnd~f
-         * @returns {A}
-         */
-        /**
-         * @method Property#mapEnd
-         * @description Adds an extra [Next]{@link Bacon.Next} event just before [End]{@link Bacon.End} of the [Property]{@link Bacon.Property}. The value is created by calling the given function `f` when the source Property ends.
-         * @param {Property#mapEnd~f} f
-         * @returns {Property<E, A>}
-         */
-        mapEnd(f:() => A):Property<E, A>;
-
-        /**
-         * @method
-         * @description Adds an extra [Next]{@link Bacon.Next} event just before [End]{@link Bacon.End} of the [Property]{@link Bacon.Property}. A static `value` is used.
-         * @param {A} value
-         * @returns {Property<E, A>}
-         */
-        mapEnd(value:A):Property<E, A>;
-
-        /**
-         * @callback Property#filter~f
-         * @param {A} value
-         * @returns {boolean}
-         */
-        /**
-         * @method Property#filter
-         * @description Filters the [Property]{@link Bacon.Property} values using a given predicate function `f`.
-         * @param {Property#filter~f} f
-         * @returns {Property<E, A>}
-         */
-        filter(f:(value:A) => boolean):Property<E, A>;
-
-        /**
-         * @method
-         * @description Filters the [Property]{@link Bacon.Property} values using a given constant `bool` value (`true` to include all, `false` to exclude all).
-         * @param {boolean} bool
-         * @returns {Property<E, A>}
-         */
-        filter(bool:boolean):Property<E, A>;
-
-        /**
-         * @method
-         * @description Filters the [Property]{@link Bacon.Property} values using a given `propertyExtractor` string (like ".isValuable").
-         * @param {string} propertyExtractor
-         * @returns {Property<E, A>}
-         */
-        filter(propertyExtractor:string):Property<E, A>;
-
-        /**
-         * @method
-         * @description Filters the [Property]{@link Bacon.Property} values based on the value of the Property `property`. Event will be included in output IF AND ONLY IF the `property` holds `true` at the time of the event.
-         * @param {Property<E, boolean>} property
-         * @returns {Property<E, A>}
-         */
-        filter(property:Property<E, boolean>):Property<E, A>;
-
-        /**
-         * @callback Property#takeWhile~f
-         * @param {A} value
-         * @returns {boolean}
-         */
-        /**
-         * @method Property#takeWhile
-         * @description Takes the [Property]{@link Bacon.Property} values while given predicate function `f` holds `true`, and then ends.
-         * @param {Property#takeWhile~f} f
-         * @returns {Property<E, A>}
-         */
-        takeWhile(f:(value:A) => boolean):Property<E, A>;
-
-        /**
-         * @method
-         * @description Takes the [Property]{@link Bacon.Property} values while the value of a `property` holds `true`, and then ends.
-         * @param {Property<E, boolean>} property
-         * @returns {Property<E, A>}
-         */
-        takeWhile(property:Property<E, boolean>):Property<E, A>;
-
-        /**
-         * @method Property#take
-         * @description Takes at most `n` elements from the [Property]{@link Bacon.Property}. Equal to `Bacon.never()` if `n <= 0`.
-         * @param {number} n
-         * @returns {Property<E, A>}
-         */
-        take(n:number):Property<E, A>;
-
-        /**
-         * @method
-         * @description Takes elements from the [Property]{@link Bacon.Property} until a [Next]{@link Bacon.Next} event appears in the `stream`. If `stream` ends without value, it is ignored.
-         * @param {EventStream<E, B>} stream
-         * @returns {Property<E, A>}
-         */
-        takeUntil<B>(stream:EventStream<E, B>):Property<E, A>;
-
-        /**
-         * @method
-         * @description Takes the first element from the [Property]{@link Bacon.Property}. Essentially [Property.take]{@link Bacon.Property#take}(1).
-         * @returns {Property<E, A>}
-         */
-        first():Property<E, A>;
-
-        /**
-         * @method
-         * @description Takes the last element from the [Property]{@link Bacon.Property}. None, if Property is empty.
-         * @returns {Property<E, A>}
-         * @example
-         * // This creates the property which doesn't produce any events and never ends:
-         * Bacon.interval(1e1, 0).toProperty().last();
-         */
-        last():Property<E, A>;
-
-        /**
-         * @method
-         * @description Skips the first `n` elements from the [Property]{@link Bacon.Property}.
-         * @param {number} n
-         * @returns {Property<E, A>}
-         */
-        skip(n:number):Property<E, A>;
-
-        /**
-         * @method
-         * @description Delays the [Property]{@link Bacon.Property} by given `delay` (in milliseconds). Does not delay the initial value of a Property.
-         * @param {number} delay
-         * @returns {Property<E, A>}
-         */
-        delay(delay:number):Property<E, A>;
-
-        /**
-         * @method Property#throttle
-         * @description Throttles the [Property]{@link Bacon.Property} by given `delay` (in milliseconds). Events are emitted with the minimum interval of `delay`. The implementation is based on [EventStream.bufferWithTime]{@link Bacon.EventStream#bufferWithTime}. Does not affect emitting the initial value of a Property.
-         * @param {number} delay
-         * @returns {Property<E, A>}
-         */
-        throttle(delay:number):Property<E, A>;
-
-        /**
-         * @method Property#debounce
-         * @description Throttles the [Property]{@link Bacon.Property} by given `delay` (in milliseconds), but so that event is only emitted after the given "quiet period". Does not affect emitting the initial value of a Property. The difference of [throttle]{@link Bacon.Property#throttle} and [debounce]{@link Bacon.Property#debounce} is the same as it is in the same methods in jQuery.
-         * @param {number} delay
-         * @returns {Property<E, A>}
-         */
-        debounce(delay:number):Property<E, A>;
-
-        /**
-         * @method
-         * @description Passes the first event in the [Property]{@link Bacon.Property} through, but after that, only passes events after a given `delay` (in milliseconds) have passed since previous output.
-         * @param {number} delay
-         * @returns {Property<E, A>}
-         */
-        debounceImmediate(delay:number):Property<E, A>;
-
-        /**
-         * @callback Property#doAction~f
-         * @param {A} value
-         * @returns {void}
-         */
-        /**
-         * @method Property#doAction
-         * @description Returns a [Property]{@link Bacon.Property} where the function `f` is executed for each value, before dispatching to subscribers. This is useful for debugging, but also for stuff like calling the `preventDefault()` method for events.
-         * @param {Property#doAction~f} f
-         * @returns {Property<E, A>}
-         */
-        doAction(f:(value:A) => void):Property<E, A>;
-
-        /**
-         * @method
-         * @description Returns a [Property]{@link Bacon.Property} where the `propertyExtractor` string is applied to each value, before dispatching to subscribers. This is useful for debugging, but also for stuff like calling the `preventDefault()` method for events.
-         * @param {string} propertyExtractor
-         * @returns {Property<E, A>}
-         */
-        doAction(propertyExtractor:string):Property<E, A>;
-
-        /**
-         * @callback Property#doError~f
-         * @param {E} error
-         * @returns {void}
-         */
-        /**
-         * @method Property#doError
-         * @description Returns a [Property]{@link Bacon.Property} where the function `f` is executed for each error, before dispatching to subscribers. That is, same as [doAction]{@link Bacon.Property#doAction} but for [Error]{@link Bacon.Error}s.
-         * @param {Property#doError~f} f
-         * @returns {Property<E, A>}
-         */
-        doError(f:(error:E) => void):Property<E, A>;
-
-        /**
-         * @method
-         * @description Returns a [Property]{@link Bacon.Property} that inverts boolean values.
-         * @returns {Property<E, boolean>}
-         */
-        not():Property<E, boolean>;
-
-        /**
-         * @method Property#log
-         * @description Logs each value of the [Property]{@link Bacon.Property} to the console. It optionally takes a `label` argument to pass to `console.log()` alongside each value. To assist with chaining, it returns the original Property. Note that as a side-effect, the Property will have a constant listener and will not be garbage-collected. So, use this for debugging only and remove from production code.
-         * @param {string} [label]
-         * @returns {Property<E, A>}
-         */
-        log(label?:string):Property<E, A>;
-
-        /**
-         * @method Property#doLog
-         * @description Logs each value of the [Property]{@link Bacon.Property} to the console. [doLog]{@link Bacon.Property#doLog} behaves like [log]{@link Bacon.Property#log} but does not subscribe to the Property. You can think of `doLog` as a logger function that – unlike `log` – is safe to use in production. `doLog` is safe, because it does not cause the same surprising side-effects as `log` does.
-         * @returns {Property<E, A>}
-         */
-        doLog():Property<E, A>;
-
-        /**
-         * @method
-         * @description Ends the [Property]{@link Bacon.Property} on first [Error]{@link Bacon.Error} event. The error is included in the output of the returned Property.
-         * @returns {Property<E, A>}
-         */
-        endOnError():Property<E, A>;
-
-        /**
-         * @callback Property#endOnError~f
-         * @param {E} error
-         * @returns {boolean}
-         */
-        /**
-         * @method Property#endOnError
-         * @description Ends the [Property]{@link Bacon.Property} on first [Error]{@link Bacon.Error} event for which the given predicate function `f` returns `true`. The error is included in the output of the returned Property.
-         * @param {Property#endOnError~f} f
-         * @returns {Property<E, A>}
-         */
-        endOnError(f:(error:E) => boolean):Property<E, A>;
-
-        /**
-         * @callback Property#withHandler~f
-         * @param {Initial<A>|Next<A>|End<A>|Error<E>} event
-         * @returns {*}
-         */
-        /**
-         * @method Property#withHandler
-         * @description Lets you do more custom event handling on the [Property]{@link Bacon.Property}: you get all events to your function `f` and you can output any number of [Event]{@link Bacon.Event}s and end the Property if you choose. Note that it's important to return the value from `this.push` so that the connection to the underlying stream will be closed when no more events are needed.
-         * @param {Property#withHandler~f} f
-         * @returns {Property<E, A>}
-         * @example
-         * // Send an error and end the stream in case a value is below zero:
-         * Bacon.fromArray([1, 2, -3, 3]).withHandler(function (event) {
-    	 *     if (event.hasValue() && event.value() < 0) {
-    	 *         this.push(new Bacon.Error("Value below zero"));
-    	 *         return this.push(new Bacon.End());
-    	 *     } else {
-    	 *         return this.push(event);
-    	 *     }
-    	 * });
-         */
-        withHandler(f:(event:Initial<A>|Next<A>|End<A>|Error<E>) => any):Property<E, A>;
-
-        /**
-         * @method
-         * @description Sets the `newName` of the [Property]{@link Bacon.Property}. Overrides the default implementation of `toString` and `inspect`. Returns itself.
-         * @param {string} newName
-         * @returns {Property<E, A>}
-         */
-        name(newName:string):Property<E, A>;
-
-        /**
-         * @method
-         * @description Sets the structured description of the [Property]{@link Bacon.Property}. The `toString` and `inspect` methods use this data recursively to create a string representation for the Property. This method is probably useful for Bacon core/library/plugin development only.
-         * @param {...*} param
-         * @returns {Property<E, A>}
-         * @example
-         * let src = Bacon.once(1),
-         *   obs = src.map(x => -x);
-         *
-         * console.log(obs.toString());
-         * // Bacon.once(1).map(function)
-         *
-         * obs.withDescription(src, "times", -1);
-         * console.log(obs.toString());
-         * // Bacon.once(1).times(-1)
-         */
-        withDescription(...param:any[]):Property<E, A>;
-
-        /**
-         * @method
-         * @description Creates an [EventStream]{@link Bacon.EventStream} based on this [Property]{@link Bacon.Property}. The EventStream contains also an event for the current value of this Property at the time this method was called.
-         * @returns {EventStream<E, A>}
-         */
-        toEventStream():EventStream<E, A>;
-
-        /**
-         * @callback Property#subscribe~f
-         * @param {Event<A>} event
-         * @returns {void}
-         */
-        /**
-         * @callback Property#subscribe~unsubscribe
-         * @returns {void}
-         */
-        /**
-         * @method Property#subscribe
-         * @description Subscribes a handler function `f` to [Property]{@link Bacon.Property}. If there's a current value, an [Initial]{@link Bacon.Initial} event will be pushed immediately. [Next]{@link Bacon.Next} event will be pushed on updates and an [End]{@link Bacon.End} event in case the source Property ends. Returns a function that you call to `unsubscribe`.
-         * @param {Property#subscribe~f} f
-         * @returns {Property#subscribe~unsubscribe}
-         */
-        subscribe(f:(event:Event<A>) => void):() => void;
-
-        /**
-         * @callback Property#onValue~f
-         * @param {A} value
-         * @returns {void}
-         */
-        /**
-         * @callback Property#onValue~unsubscribe
-         * @returns {void}
-         */
-        /**
-         * @method Property#onValue
-         * @description Subscribes a handler function `f` to [Property]{@link Bacon.Property}. Similar to [EventStream.onValue]{@link Bacon.EventStream#onValue}, except that also pushes the initial value of the Property, in case there is one. Just like [subscribe]{@link Bacon.Property#subscribe}, this method returns a function for `unsubscribe`ing.
-         * @param {Property#onValue~f} f
-         * @returns {Property#onValue~unsubscribe}
-         */
-        onValue(f:(value:A) => void):() => void;
-
-        /**
-         * @callback Property#onValues~f
-         * @param {*[]} args
-         * @returns {void}
-         */
-        /**
-         * @callback Property#onValues~unsubscribe
-         * @returns {void}
-         */
-        /**
-         * @method Property#onValues
-         * @description Subscribes a handler function `f` to [Property]{@link Bacon.Property}. Like [onValue]{@link Bacon.Property#onValue}, but splits the value (assuming its an array) as function arguments to `f`.
-         * @param {Property#onValues~f} f
-         * @returns {Property#onValues~unsubscribe}
-         */
-        onValues(f:(...args:any[]) => void):() => void;
-
-        /**
-         * @method Property#assign
-         * @description Calls the `method` of the given `object` with each value of this [Property]{@link Bacon.Property}. You can optionally supply `params` which will be used as the first arguments of the `method` call. Note that the [assign]{@link Bacon.Property#assign} method is actually just a synonym for [onValue]{@link Bacon.Property#onValue}.
-         * @param {Object} obj
-         * @param {string} method
-         * @param {...*} params
-         * @returns {void}
-         * @example
-         * let property = Bacon.fromArray([1, 2, 3, 4, 5]).toProperty();
-         * // If you want to assign your Property to the "disabled" attribute of a JQuery object, you can do this:
-         * property.assign($("#my-button"), "attr", "disabled");
-         * // A simpler example would be to toggle the visibility of an element based on a Property:
-         * property.assign($("#my-button"), "toggle");
-         */
-        assign(obj:Object, method:string, ...params:any[]):void;
-
-        /**
-         * @method
-         * @description Creates an [EventStream]{@link Bacon.EventStream} by sampling the [Property]{@link Bacon.Property} value at given `interval` (in milliseconds).
-         * @param {number} interval
-         * @returns {EventStream<E, A>}
-         */
-        sample(interval:number):EventStream<E, A>;
-
-        /**
-         * @method Property#sampledBy
-         * @description Creates an [EventStream]{@link Bacon.EventStream} by sampling the [Property]{@link Bacon.Property} value at each event from the given `stream`. The result EventStream will contain the value at each event in the source Property.
-         * @param {EventStream<E, B>} stream
-         * @returns {EventStream<E, A>}
-         */
-        sampledBy<B>(stream:EventStream<E, B>):EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Creates a [Property]{@link Bacon.Property} by sampling the value at each event from the given [Property]{@link Bacon.Property} `property`. The result Property will contain the value at each event in the source Property.
-         * @param {Property<E, B>} property
-         * @returns {Property<E, A>}
-         */
-        sampledBy<B>(property:Property<E, B>):Property<E, A>;
-
-        /**
-         * @callback Property#sampledBy~f
-         * @param {A} propertyValue
-         * @param {B} samplerValue
-         * @returns {C}
-         */
-        /**
-         * @method Property#sampledBy
-         * @description Samples the [Property]{@link Bacon.Property} on `streamOrProperty` events. The result values will be formed using the given function `f`.
-         * @param {Observable<E, B>} streamOrProperty
-         * @param {Property#sampledBy~f} f
-         * @returns {EventStream<E, C>}
-         */
-        sampledBy<B, C>(streamOrProperty:Observable<E, B>, f:(propertyValue:A, samplerValue:B) => C):EventStream<E, C>;
-
-        /**
-         * @callback Property#skipDuplicates~isEqual
-         * @param {A} oldValue
-         * @param {A} newValue
-         * @returns {boolean}
-         */
-        /**
-         * @method Property#skipDuplicates
-         * @description Drops consecutive equal elements. Uses the `===` operator for equality checking by default. If the `isEqual` argument is supplied, checks by calling `isEqual(oldValue, newValue)`. The old name for this method was `distinctUntilChanged`.
-         * @param {Property#skipDuplicates~isEqual} [isEqual]
-         * @returns {Property<E, A>}
-         */
-        skipDuplicates(isEqual?:(oldValue:A, newValue:A) => boolean):Property<E, A>;
-
-        /**
-         * @method Property#changes
-         * @description Returns an [EventStream]{@link Bacon.EventStream} of [Property]{@link Bacon.Property} value changes. Returns exactly the same events as the Property itself, except any [Initial]{@link Bacon.Initial} events (the stream DOES NOT include an event for the current value of the Property at the time this method was called). Note that [Property.changes]{@link Bacon.Property#changes} DOES NOT skip duplicate values, use [Property.skipDuplicates]{@link Bacon.Property#skipDuplicates} for that.
-         * @returns {EventStream<E, A>}
-         */
-        changes():EventStream<E, A>;
-
-        /**
-         * @method
-         * @description Combines [Property]{@link Bacon.Property}s with the && operator.
-         * @param {Property<E, A>} other
-         * @returns {Property<E, A>}
-         */
-        and(other:Property<E, A>):Property<E, A>;
-
-        /**
-         * @method
-         * @description Combines [Property]{@link Bacon.Property}s with the || operator.
-         * @param {Property<E, A>} other
-         * @returns {Property<E, A>}
-         */
-        or(other:Property<E, A>):Property<E, A>;
-
-        /**
-         * @method
-         * @description Adds an initial "default" value for the [Property]{@link Bacon.Property}. If the Property doesn't have an initial value of it's own, the given `value` will be used as the initial value. If the property has an initial value of its own, the given `value` will be ignored.
-         * @param {A} value
-         * @returns {Property<E, A>}
-         */
-        startWith(value:A):Property<E, A>;
-    }
-
-    /**
-     * @function Bacon.combineAsArray
-     * @description Combines [Property]{@link Bacon.Property}s, [EventStream]{@link Bacon.EventStream}s and constant values so that the result Property will have an array of all property values as its value. The input array may contain both Properties and EventStreams. In the latter case, the stream is first converted into a Property and then combined with the other Property's.
-     * @param {(A|Observable<E, A>)[]} streams
-     * @returns {Property<E, A[]>}
-     */
-    function combineAsArray<E, A>(streams:(A|Observable<E, A>)[]):Property<E, A[]>;
-
-    /**
-     * @function
-     * @description Combines [Property]{@link Bacon.Property}s, [EventStream]{@link Bacon.EventStream}s and constant values so that the result Property will have an array of all property values as its value. Like [Bacon.combineAsArray]{@link Bacon.combineAsArray}, but `streams` are provided as a list of arguments as opposed to a single array.
-     * @param {...(A|Observable<E, A>)} streams
-     * @returns {Property<E, A[]>}
-     */
-    function combineAsArray<E, A>(...streams:(A|Observable<E, A>)[]):Property<E, A[]>;
-
-    /**
-     * @callback Property#combineWith~f
-     * @param {...A} args
-     * @returns {B}
-     */
-    /**
-     * @function Property#combineWith
-     * @description Combines given n [Property]{@link Bacon.Property}s, [EventStream]{@link Bacon.EventStream}s and constant values using the given n-ary function `f`.
-     * @param {Property#combineWith~f} f
-     * @param {...(A|Observable<E, A>)} streams
-     * @returns {Property<E, B>}
-     */
-    function combineWith<A, B>(f:(...args:A[]) => B, ...streams:(A|Observable<ErrorEvent, A>)[]):Property<ErrorEvent, B>;
-
-    /**
-     * @function
-     * @description Combines [Property]{@link Bacon.Property}s, [EventStream]{@link Bacon.EventStream}s and constant values using a `template` object.
-     * @param {{string:number|boolean|string|Object|Observable<E, *>}} template
-     * @returns {Property<E, A>}
-     */
-    function combineTemplate<E, A>(template:{[label:string]:number|boolean|string|Object|Observable<E, any>}):Property<E, A>;
-
-    /**
-     * @function
-     * @description Merges given array of [EventStream]{@link Bacon.EventStream}s.
-     * @param {EventStream<E, A>[]} streams
-     * @returns {EventStream<E, A>}
-     */
-    function mergeAll<E, A>(streams:EventStream<E, A>[]):EventStream<E, A>;
-
-    /**
-     * @function
-     * @description Merges given array of [EventStream]{@link Bacon.EventStream}s.
-     * @param {...EventStream<E, A>} streams
-     * @returns {EventStream<E, A>}
-     */
-    function mergeAll<E, A>(...streams:EventStream<E, A>[]):EventStream<E, A>;
-
-    /**
-     * @function
-     * @description Zips the array of `streams` in to a new [EventStream]{@link Bacon.EventStream} that will have an array of values from each source EventStream as its value. Zipping means that events from each EventStream are combine pairwise so that the 1st event from each EventStream is published first, then the 2nd event from each. The results will be published as soon as there is a value from each source EventStream. Be careful not to have too much "drift" between EventStream's. If one EventStream produces many more values than some other excessive buffering will occur inside the zipped [Observable]{@link Bacon.Observable}.
-     * @param {EventStream<E, A>[]} streams
-     * @returns {EventStream<E, A[]>}
-     */
-    function zipAsArray<E, A>(streams:EventStream<E, A>[]):EventStream<E, A[]>;
-
-    /**
-     * @function
-     * @description Zips the `streams` in to a new [EventStream]{@link Bacon.EventStream} that will have an array of values from each source EventStream as its value. Zipping means that events from each EventStream are combine pairwise so that the 1st event from each EventStream is published first, then the 2nd event from each. The results will be published as soon as there is a value from each source EventStream. EventStream's are provided as a list of arguments as opposed to a single array. Be careful not to have too much "drift" between EventStream's. If one EventStream produces many more values than some other excessive buffering will occur inside the zipped [Observable]{@link Bacon.Observable}.
-     * @param {...EventStream<E, A>} streams
-     * @returns {EventStream<E, A[]>}
-     */
-    function zipAsArray<E, A>(...streams:EventStream<E, A>[]):EventStream<E, A[]>;
-
-    /**
-     * @callback Bacon.zipWith1~f
-     * @param {...A} args
-     * @returns {B}
-     */
-    /**
-     * @function Bacon.zipWith1
-     * @description Zips the array of `streams` in to a new [EventStream]{@link Bacon.EventStream} that will combine the n values from EventStream's with n-ary function `f`. Zipping means that events from each EventStream are combine pairwise so that the 1st event from each EventStream is published first, then the 2nd event from each. The results will be published as soon as there is a value from each source EventStream. Be careful not to have too much "drift" between EventStream's. If one EventStream produces many more values than some other excessive buffering will occur inside the zipped [Observable]{@link Bacon.Observable}.
-     * @param {EventStream<E, A>[]} streams
-     * @param {Bacon.zipWith1~f} f
-     * @returns {EventStream<E, B>}
-     */
-    function zipWith<E, A, B>(streams:EventStream<E, A>[], f:(...args:A[]) => B):EventStream<E, B>;
-
-    /**
-     * @callback Bacon.zipWith2~f
-     * @param {...A} args
-     * @returns {B}
-     */
-    /**
-     * @function Bacon.zipWith2
-     * @description Zips the `streams` in to a new [EventStream]{@link Bacon.EventStream} that will combine the n values from EventStream's with n-ary function `f`. Zipping means that events from each EventStream are combine pairwise so that the 1st event from each EventStream is published first, then the 2nd event from each. The results will be published as soon as there is a value from each source EventStream. Streams are provided as a list of arguments as opposed to a single array. Be careful not to have too much "drift" between EventStream's. If one EventStream produces many more values than some other excessive buffering will occur inside the zipped [Observable]{@link Bacon.Observable}.
-     * @param {Bacon.zipWith2~f} f
-     * @param {...EventStream<E, A>} streams
-     * @returns {EventStream<E, B>}
-     */
-    function zipWith<E, A, B>(f:(...args:A[]) => B, ...streams:EventStream<E, A>[]):EventStream<E, B>;
-
-    /**
-     * @function
-     * @description Is a shorthand for combining multiple sources ([EventStream]{@link Bacon.EventStream}s, [Property]{@link Bacon.Property}s, constants) as array and assigning the side-effect function `f` for the values.
-     * @param {...*} args
-     * @returns {void}
-     */
-    function onValues(...args:any[]):void;
-
-    /**
-     * @class Bus
-     * @augments Bacon.EventStream
-     * @description An [EventStream]{@link Bacon.EventStream} that allows you to [push]{@link Bacon.Bus#push} values into the EventStream. It also allows [plug]{@link Bacon.Bus#plug}ging other EventStream's into the Bus. The Bus practically merges all plugged-in streams and the values pushed using the [push]{@link Bacon.Bus#push} method.
-     */
-    interface Bus<E, A> extends EventStream<E, A> {
-        /**
-         * @method Bus#push
-         * @description Pushes the given `value` to the [Bus]{@link Bacon.Bus}.
-         * @param {A} value
-         * @returns {void}
-         */
-        push(value:A):void;
-
-        /**
-         * @method
-         * @description Ends the [Bus]{@link Bacon.Bus}. Sends an [End]{@link Bacon.End} event to all subscribers. After this call, there'll be no more events to the subscribers. Also, the [Bus.push]{@link Bacon.Bus#push} and [Bus.plug]{@link Bacon.Bus#plug} methods have no effect.
-         * @returns {void}
-         */
-        end():void;
-
-        /**
-         * @method
-         * @description Sends an [Error]{@link Bacon.Error} with given `error` message to all subscribers.
-         * @param {E} error
-         * @returns {void}
-         */
-        error(error:E):void;
-
-        /**
-         * @callback Bus#plug~unplug
-         * @returns {void}
-         */
-        /**
-         * @method Bus#plug
-         * @description Plugs the given [EventStream]{@link Bacon.EventStream} to the [Bus]{@link Bacon.Bus}. All events from the given `stream` will be delivered to the subscribers of the Bus. Returns a function `unplug` that can be used to unplug the same stream. The [plug]{@link Bacon.Bus#plug} method practically allows you to merge in other EventStream's after the creation of the Bus.
-         * @param {EventStream<A>} stream
-         * @returns {Bus#plug~unplug}
-         */
-        plug(stream:EventStream<E, A>):() => void;
-    }
-
-    var Bus:{
-        /**
-         * @constructor
-         * @constructs Bacon.Bus
-         * @description Returns a new [Bus]{@link Bacon.Bus}.
-         * @returns {Bus<E, A>}
-         */
-        new<E, A>():Bus<E, A>;
-    };
-
-    /**
-     * @class Event
-     * @description Has subclasses [Initial]{@link Bacon.Initial}, [Next]{@link Bacon.Next}, [End]{@link Bacon.End} and [Error]{@link Bacon.Error}.
-     * */
-    class Event<A> {
-        /**
-         * @method
-         * @description Returns the value associated with a [Initial]{@link Bacon.Initial} or [Next]{@link Bacon.Next} event.
-         * @returns {A}
-         */
-        value():A;
-
-        /**
-         * @method
-         * @description Returns `true` for events of type [Initial]{@link Bacon.Initial} or [Next]{@link Bacon.Next}.
-         * @returns {boolean}
-         */
-        hasValue():boolean;
-
-        /**
-         * @method Error#isInitial
-         * @description Returns `true` for events of type [Initial]{@link Bacon.Initial}.
-         * @returns {boolean}
-         */
-        isInitial():boolean;
-
-        /**
-         * @method Error#isNext
-         * @description Returns `true` for events of type [Next]{@link Bacon.Next}.
-         * @returns {boolean}
-         */
-        isNext():boolean;
-
-        /**
-         * @method Error#isError
-         * @description Returns `true` for events of type [Error]{@link Bacon.Error}.
-         * @returns {boolean}
-         */
-        isError():boolean;
-
-        /**
-         * @method Error#isEnd
-         * @description Returns `true` for events of type [End]{@link Bacon.End}.
-         * @returns {boolean}
-         */
-        isEnd():boolean;
-    }
-
-    /**
-     * @class Error
-     * @augments Bacon.Event
-     * @description An error event. Call [Event.isError]{@link Bacon.Event#isError} to distinguish these events in your subscriber, or use [onError]{@link Bacon.Observable#onError} to react to error events only. [Error.error]{@link Bacon.Error#error} returns the associated error object (usually string). [Error]{@link Bacon.Error} events are always passed through all stream combinators. So, even if you filter all values out, the error events will pass through. If you use [Observable.flatMap]{@link Bacon.Observable#flatMap}, the result stream will contain Error events from the source as well as all the spawned stream. You can take action on errors by using the [Observable.onError]{@link Bacon.Observable#onError}. See documentation on [Observable.onError]{@link Bacon.Observable#onError}, [EventStream.mapError]{@link Bacon.EventStream#mapError}, [Property.mapError]{@link Bacon.Property#mapError}, [EventStream.errors]{@link Bacon.EventStream#errors}, [Property.errors]{@link Bacon.Property#errors}, [EventStream.skipErrors]{@link Bacon.EventStream#skipErrors}, [Property.skipErrors]{@link Bacon.Property#skipErrors}, [Bacon.retry]{@link Bacon.retry} and [Observable.flatMapError]{@link Bacon.Observable#flatMapError}. An Error does not terminate the stream. The methods [EventStream.endOnError]{@link Bacon.EventStream#endOnError} and [EventStream.endOnError]{@link Bacon.EventStream#endOnError}  returns a stream/property that ends immediately after first error. Bacon.js doesn't currently generate any Error events itself (except when converting errors using [Bacon.fromPromise]{@link Bacon.fromPromise}). Error events definitely would be generated by streams derived from IO sources such as AJAX calls.
-     * @example
-     * // In case you want to convert (some) value events into Error events, you may use `flatMap` like this:
-     * Bacon.fromArray([1, 2, 3, 4]).flatMap<number>(x => {
-   *   NOTE: had to explicitly specify the `<number>` typing for `flatMap`.
-   *   return x > 2 ? new Bacon.Error("too big") : x;
-   * });
-     *
-     * // Conversely, if you want to convert some Error events into value events, you may use `flatMapError`:
-     * Bacon.fromArray([1, 2, 3, 4]).flatMapError(error => {
-   *   let isNonCriticalError = error => Math.random() < .5,
-   *     handleNonCriticalError = error => 42;
-   *   return isNonCriticalError(error) ? handleNonCriticalError(error) : new Bacon.Error(error);
-   * });
-     *
-     * // Note also that Bacon.js combinators do not catch errors that are thrown. Especially `map` doesn't do so. If you want to map things and wrap caught errors into Error events, you can do the following:
-     * Bacon.fromArray([1, 2, 3, 4]).flatMap(x => {
-   *   let dangerousFunction = x => {
-   *     throw new Error("dangerous function!");
-   *   };
-   *   try {
-   *     return dangerousFunction(x);
-   *   } catch (e) {
-   *     return new Bacon.Error(e);
-   *   }
-   * });
-     */
-    class Error<E> extends Event<E> {
-        /**
-         * @constructor
-         * @constructs Error
-         * @param {E} error
-         * */
-        constructor(error:E);
-
-        /**
-         * @property Error#error
-         * @description Returns the `error` associated with an [Error]{@link Bacon.Error} event.
-         * @returns {E}
-         */
-        error:E;
-    }
-
-    /**
-     * @class End
-     * @augments Bacon.Event
-     * @description An end-of-stream event of [EventStream]{@link Bacon.EventStream} or [Property]{@link Bacon.Property}. Call [Event.isEnd]{@link Bacon.Event#isEnd} to distinguish an End from other events.
-     * */
-    class End<A> extends Event<A> {
-        /**
-         * @constructor
-         * @constructs Bacon.End
-         * */
-        constructor();
-    }
-
-    /**
-     * @class Initial
-     * @augments Bacon.Event
-     * @description The initial (current) value of a [Property]{@link Bacon.Property}. Call [Event.isInitial]{@link Bacon.Event#isInitial} to distinguish from other events. Only sent immediately after subscription to a Property.
-     * */
-    class Initial<A> extends Event<A> {
-        /**
-         * @constructor
-         * @constructs Bacon.Initial
-         * @param {A} value
-         * */
-        constructor(value:A);
-    }
-
-    /**
-     * @class Next
-     * @augments Bacon.Event
-     * @description Next value in an [EventStream]{@link Bacon.EventStream} or a [Property]{@link Bacon.Property}. Call [Event.isNext]{@link Bacon.Event#isNext} to distinguish a Next event from other events.
-     * */
-    class Next<A> extends Event<A> {
-        /**
-         * @constructor
-         * @constructs Bacon.Next
-         * @param {A} value
-         * @example
-         * new Bacon.Next("value");
-         * */
-        constructor(value:A);
-
-        /**
-         * @callback Next#constructor
-         * @returns {A}
-         */
-        /**
-         * @constructor Next#constructor
-         * @constructs Bacon.Next
-         * @description This version is safe only when you know that the actual value in the stream is not a function. The idea in using a function `f` instead of a plain value is that the internals on Bacon.js take advantage of lazy evaluation by deferring the evaluations of values created by `map`, `combine`.
-         * @param {Next#constructor} f
-         * @example
-         * new Bacon.Next(() => "value");
-         * */
-        constructor(f:() => A);
-    }
-
-    /**
-     * @callback Bacon.retry1~source
-     * @description Function that produces an [EventStream]{@link Bacon.EventStream}.
-     * @returns {EventStream<E, A>}
-     */
-    /**
-     * @callback Bacon.retry1~isRetryable
-     * @description Function returning `true` to continue retrying, `false` to stop. Defaults to `true`. The [Error]{@link Bacon.Error} that occurred is given as a parameter. For example, there is usually no reason to retry a 404 HTTP error, whereas a 500 or a timeout might work on the next attempt.
-     * @param {E} error
-     * @returns {boolean}
-     */
-    /**
-     * @callback Bacon.retry1~delay
-     * @description Function that returns the time in milliseconds to wait before retrying. Defaults to `0`. The function is given a `context` object with the keys `error` (the [Error]{@link Bacon.Error} that occurred) and `retriesDone` (the number of retries already performed) to help determine the appropriate delay, e.g. for an incremental backoff.
-     * @param {Object} context
-     * @param {E} context.error [Error]{@link Bacon.Error} that occurred
-     * @param {number} context.retriesDone number of retries already performed
-     * @returns {number}
-     */
-    /**
-     * @function Bacon.retry1
-     * @description Is used to retry the call when there is an [Error]{@link Bacon.Error} event in the [EventStream]{@link Bacon.EventStream} produced by the `source` function.
-     * @param {Object} options
-     * @param {Bacon.retry1~source} options.source function that produces an [EventStream]{@link Bacon.EventStream}
-     * @param {number} options.retries number of times to retry the `source` function in addition to the initial attempt
-     * @param {Bacon.retry1~isRetryable} [options.isRetryable] function returning `true` to continue retrying, `false` to stop. Defaults to `true`.
-     * @param {Bacon.retry1~delay} [options.delay] - function that returns the time in milliseconds to wait before retrying. Defaults to `0`.
-     * @returns {EventStream<E, A>}
-     */
-    function retry<E, A>(options:{
-        source:() => EventStream<E, A>;
-        retries:number;
-        isRetryable?:(error:E) => boolean;
-        delay?:(context:{error:E; retriesDone:number}) => number;
-    }):EventStream<E, A>;
-
-    /**
-     * @callback Bacon.retry1~source
-     * @description Function that produces an [Property]{@link Bacon.Property}.
-     * @returns {Property<E, A>}
-     */
-    /**
-     * @callback Bacon.retry1~isRetryable
-     * @description Function returning `true` to continue retrying, `false` to stop. Defaults to `true`. The [Error]{@link Bacon.Error} that occurred is given as a parameter. For example, there is usually no reason to retry a 404 HTTP error, whereas a 500 or a timeout might work on the next attempt.
-     * @param {E} error
-     * @returns {boolean}
-     */
-    /**
-     * @callback Bacon.retry1~delay
-     * @description Function that returns the time in milliseconds to wait before retrying. Defaults to `0`. The function is given a `context` object with the keys `error` (the [Error]{@link Bacon.Error} that occurred) and `retriesDone` (the number of retries already performed) to help determine the appropriate delay, e.g. for an incremental backoff.
-     * @param {Object} context
-     * @param {E} context.error [Error]{@link Bacon.Error} that occurred
-     * @param {number} context.retriesDone number of retries already performed
-     * @returns {number}
-     */
-    /**
-     * @function Bacon.retry1
-     * @description Is used to retry the call when there is an [Error]{@link Bacon.Error} event in the [Property]{@link Bacon.Property} produced by the `source` function.
-     * @param {Object} options
-     * @param {Bacon.retry1~source} options.source function that produces an [Property]{@link Bacon.Property}
-     * @param {number} options.retries number of times to retry the `source` function in addition to the initial attempt
-     * @param {Bacon.retry1~isRetryable} [options.isRetryable] function returning `true` to continue retrying, `false` to stop. Defaults to `true`.
-     * @param {Bacon.retry1~delay} [options.delay] - function that returns the time in milliseconds to wait before retrying. Defaults to `0`.
-     * @returns {Property<E, A>}
-     */
-    function retry<E, A>(options:{
-        source:() => Property<E, A>;
-        retries:number;
-        isRetryable?:(error:E) => boolean;
-        delay?:(context:{error:E; retriesDone:number}) => number;
-    }):Property<E, A>;
-
-    /**
-     * @callback Bacon.when1~f1
-     * @param {...A1} args
-     * @returns {B}
-     */
-    /**
-     * @method Bacon.when1
-     * @description Creates an [EventStream]{@link Bacon.EventStream} from join-pattern system.
-     * @param {Observable<E, A1>[]} pattern1
-     * @param {Bacon.when1~f1} f1
-     * @returns {EventStream<E, B>}
-     * @example
-     * {
-     *     // Consider implementing a game with discrete time ticks. We want to handle key-events synchronized on tick-events, with at most one key event handled per tick. If there are no key events, we want to just process a tick:
-     *     let tick = Bacon.interval(1e2, 0),
-     *         keyEvent = Bacon.fromEvent(document.body, "click", _ => Date.now()),
-     *         handleTick = _ => `timestamp: NONE`,
-     *         handleKeyEvent = timestamp => `timestamp: ${timestamp}`;
-     *     Bacon.when(
-     *         [tick, keyEvent], (_, timestamp) => handleKeyEvent(timestamp),
-     *         [tick], handleTick
-     *     );
-     *     // Order is important here. If the [tick] patterns had been written first, this would have been tried first, and preferred at each tick.
-     * }
-     *
-     * {
-     *     // Join patterns are indeed a generalization of `zip`, and `zip` is equivalent to a single-rule join pattern. The following `Observable`s have the same output:
-     *     let a = Bacon.once("a"),
-     *         b = Bacon.once("b"),
-     *         c = Bacon.once("c"),
-     *         f = (a, b, c) => `a = ${a}; b = ${b}; c = ${c}.`;
-     *     Bacon.zipWith(f, a, b, c);
-     *     Bacon.when([a, b, c], f);
-     * }
-     *
-     * {
-     *     // Join patterns as a "chemical machine".
-     *     // A quick way to get some intuition for join patterns is to understand them through an analogy in terms of atoms and molecules. A join pattern can here be regarded as a recipe for a chemical reaction. Lets say we have observables `oxygen`, `carbon` and `hydrogen`, where an event in these spawns an 'atom' of that type into a mixture. We can state reactions:
-     *     let oxygen = Bacon.interval(1e3, "O"),
-     *         hydrogen = Bacon.interval(2e3, "H"),
-     *         carbon = Bacon.interval(1.5e3, "C"),
-     *         makeWater = (oxygen:string, hydrogen1:string, hydrogen2:string) => `${hydrogen1}${[hydrogen1, hydrogen2].length}${oxygen}`,
-     *         makeCarbonMonoxide = (oxygen:string, carbon:string) => `${carbon}${oxygen}`;
-     *     Bacon.when(
-     *         [oxygen, hydrogen, hydrogen], makeWater,
-     *         [oxygen, carbon], makeCarbonMonoxide
-     *     );
-     *     // Now, every time a new 'atom' is spawned from one of the observables, this atom is added to the mixture. If at any time there are two hydrogen atoms, and an oxygen atom, the corresponding atoms are *consumed*, and output is produced via `makeWater`. The same semantics apply for the second rule to create carbon monoxide. The rules are tried at each point from top to bottom.
-     * }
-     *
-     * {
-     *     // Join patterns and properties.
-     *     // Properties are not part of the synchronization pattern, but are instead just sampled. The following example take three input streams `$price`, `$quantity` and `$total`, e.g. coming from input fields, and defines mutally recursive behaviours in properties `price`, `quantity` and `total` such that:
-     *     // -- updating `quantity` sets `total` to `price * quantity`;
-     *     // -- updating `total` sets `price` to `total / quantity`.
-     *     let random = (x:number) => Math.round(x * Math.random()),
-     *         id = <A>(x:A):A => x;
-     *     let $quantity = Bacon.interval<Error, number>(1e3, 10).map(random),
-     *         $price = Bacon.interval<Error, number>(2e3, 100).map(random),
-     *         $total = Bacon.interval<Error, number>(1.5e3, 1000).map(random);
-     *     let quantity = $quantity.toProperty(1),
-     *         price = Bacon.when<Error, number, number, number>(
-     *             [$price], id,
-     *             [$total, quantity], (x, y) => x / y
-     *         ).toProperty(0),
-     *         total = Bacon.when<Error, number, number, number, number>(
-     *             [$total], id,
-     *             [$price, quantity], (x, y) => x * y,
-     *             [price, $quantity], (x, y) => x * y
-     *         ).toProperty(0);
-     * }
-     *
-     * {
-     *     // Join patterns and `Bacon.Bus`.
-     *     // The result functions of join patterns are allowed to push values onto a `Bus` that may in turn be in one of its patterns. For instance, an implementation of the dining philosophers problem can be written as follows:
-     *     // Availability of chopsticks are implemented using bus.
-     *     let chopsticks = [new Bacon.Bus(), new Bacon.Bus(), new Bacon.Bus()],
-     *     // Hungry could be any type of observable, but we'll use bus here.
-     *         hungry = [new Bacon.Bus(), new Bacon.Bus(), new Bacon.Bus()],
-     *     // A philosopher eats for one second, then makes the chopsticks available again by pushing values onto their bus.
-     *         eat = (i:number) => () => {
-     *             setTimeout(() => {
-     *                 console.log("done!");
-     *                 chopsticks[i].push({});
-     *                 chopsticks[(i + 1) % 3].push({});
-     *             }, 1e3);
-     *             return `philosopher ${i} eating`;
-     *         },
-     *     // We use Bacon.when to make sure a hungry philosopher can eat only when both his chopsticks are available.
-     *         dining = Bacon.when(
-     *             [hungry[0], chopsticks[0], chopsticks[1]], eat(0),
-     *             [hungry[1], chopsticks[1], chopsticks[2]], eat(1),
-     *             [hungry[2], chopsticks[2], chopsticks[0]], eat(2)
-     *         ).log("dining");
-     *     // Make all chopsticks initially available.
-     *     chopsticks[0].push({});
-     *     chopsticks[1].push({});
-     *     chopsticks[2].push({});
-     *     // Make philosophers hungry in some way, in this case we just push to their bus.
-     *     for (let i = 0; i < 3; i++) {
-     *         hungry[0].push({});
-     *         hungry[1].push({});
-     *         hungry[2].push({});
-     *     }
-     * }
-     */
-    function when<E, A1, B>(pattern1:Observable<E, A1>[], f1:(...args:A1[]) => B):EventStream<E, B>;
-
-    /**
-     * @callback Bacon.when2~f1
-     * @param {...A1} args
-     * @returns {B}
-     */
-    /**
-     * @callback Bacon.when2~f2
-     * @param {...A2} args
-     * @returns {B}
-     */
-    /**
-     * @method Bacon.when2
-     * @description Creates an [EventStream]{@link Bacon.EventStream} from join-pattern system.
-     * @param {Observable<E, A1>[]} pattern1
-     * @param {Bacon.when2~f1} f1
-     * @param {Observable<E, A2>[]} pattern2
-     * @param {Bacon.when2~f2} f2
-     * @returns {EventStream<E, B>}
-     * @example
-     * {
-     *     // Consider implementing a game with discrete time ticks. We want to handle key-events synchronized on tick-events, with at most one key event handled per tick. If there are no key events, we want to just process a tick:
-     *     let tick = Bacon.interval(1e2, 0),
-     *         keyEvent = Bacon.fromEvent(document.body, "click", _ => Date.now()),
-     *         handleTick = _ => `timestamp: NONE`,
-     *         handleKeyEvent = timestamp => `timestamp: ${timestamp}`;
-     *     Bacon.when(
-     *         [tick, keyEvent], (_, timestamp) => handleKeyEvent(timestamp),
-     *         [tick], handleTick
-     *     );
-     *     // Order is important here. If the [tick] patterns had been written first, this would have been tried first, and preferred at each tick.
-     * }
-     *
-     * {
-     *     // Join patterns are indeed a generalization of `zip`, and `zip` is equivalent to a single-rule join pattern. The following `Observable`s have the same output:
-     *     let a = Bacon.once("a"),
-     *         b = Bacon.once("b"),
-     *         c = Bacon.once("c"),
-     *         f = (a, b, c) => `a = ${a}; b = ${b}; c = ${c}.`;
-     *     Bacon.zipWith(f, a, b, c);
-     *     Bacon.when([a, b, c], f);
-     * }
-     *
-     * {
-     *     // Join patterns as a "chemical machine".
-     *     // A quick way to get some intuition for join patterns is to understand them through an analogy in terms of atoms and molecules. A join pattern can here be regarded as a recipe for a chemical reaction. Lets say we have observables `oxygen`, `carbon` and `hydrogen`, where an event in these spawns an 'atom' of that type into a mixture. We can state reactions:
-     *     let oxygen = Bacon.interval(1e3, "O"),
-     *         hydrogen = Bacon.interval(2e3, "H"),
-     *         carbon = Bacon.interval(1.5e3, "C"),
-     *         makeWater = (oxygen:string, hydrogen1:string, hydrogen2:string) => `${hydrogen1}${[hydrogen1, hydrogen2].length}${oxygen}`,
-     *         makeCarbonMonoxide = (oxygen:string, carbon:string) => `${carbon}${oxygen}`;
-     *     Bacon.when(
-     *         [oxygen, hydrogen, hydrogen], makeWater,
-     *         [oxygen, carbon], makeCarbonMonoxide
-     *     );
-     *     // Now, every time a new 'atom' is spawned from one of the observables, this atom is added to the mixture. If at any time there are two hydrogen atoms, and an oxygen atom, the corresponding atoms are *consumed*, and output is produced via `makeWater`. The same semantics apply for the second rule to create carbon monoxide. The rules are tried at each point from top to bottom.
-     * }
-     *
-     * {
-     *     // Join patterns and properties.
-     *     // Properties are not part of the synchronization pattern, but are instead just sampled. The following example take three input streams `$price`, `$quantity` and `$total`, e.g. coming from input fields, and defines mutally recursive behaviours in properties `price`, `quantity` and `total` such that:
-     *     // -- updating `quantity` sets `total` to `price * quantity`;
-     *     // -- updating `total` sets `price` to `total / quantity`.
-     *     let random = (x:number) => Math.round(x * Math.random()),
-     *         id = <A>(x:A):A => x;
-     *     let $quantity = Bacon.interval<Error, number>(1e3, 10).map(random),
-     *         $price = Bacon.interval<Error, number>(2e3, 100).map(random),
-     *         $total = Bacon.interval<Error, number>(1.5e3, 1000).map(random);
-     *     let quantity = $quantity.toProperty(1),
-     *         price = Bacon.when<Error, number, number, number>(
-     *             [$price], id,
-     *             [$total, quantity], (x, y) => x / y
-     *         ).toProperty(0),
-     *         total = Bacon.when<Error, number, number, number, number>(
-     *             [$total], id,
-     *             [$price, quantity], (x, y) => x * y,
-     *             [price, $quantity], (x, y) => x * y
-     *         ).toProperty(0);
-     * }
-     *
-     * {
-     *     // Join patterns and `Bacon.Bus`.
-     *     // The result functions of join patterns are allowed to push values onto a `Bus` that may in turn be in one of its patterns. For instance, an implementation of the dining philosophers problem can be written as follows:
-     *     // Availability of chopsticks are implemented using bus.
-     *     let chopsticks = [new Bacon.Bus(), new Bacon.Bus(), new Bacon.Bus()],
-     *     // Hungry could be any type of observable, but we'll use bus here.
-     *         hungry = [new Bacon.Bus(), new Bacon.Bus(), new Bacon.Bus()],
-     *     // A philosopher eats for one second, then makes the chopsticks available again by pushing values onto their bus.
-     *         eat = (i:number) => () => {
-     *             setTimeout(() => {
-     *                 console.log("done!");
-     *                 chopsticks[i].push({});
-     *                 chopsticks[(i + 1) % 3].push({});
-     *             }, 1e3);
-     *             return `philosopher ${i} eating`;
-     *         },
-     *     // We use Bacon.when to make sure a hungry philosopher can eat only when both his chopsticks are available.
-     *         dining = Bacon.when(
-     *             [hungry[0], chopsticks[0], chopsticks[1]], eat(0),
-     *             [hungry[1], chopsticks[1], chopsticks[2]], eat(1),
-     *             [hungry[2], chopsticks[2], chopsticks[0]], eat(2)
-     *         ).log("dining");
-     *     // Make all chopsticks initially available.
-     *     chopsticks[0].push({});
-     *     chopsticks[1].push({});
-     *     chopsticks[2].push({});
-     *     // Make philosophers hungry in some way, in this case we just push to their bus.
-     *     for (let i = 0; i < 3; i++) {
-     *         hungry[0].push({});
-     *         hungry[1].push({});
-     *         hungry[2].push({});
-     *     }
-     * }
-     */
-    function when<E, A1, A2, B>(pattern1:Observable<E, A1>[], f1:(...args:A1[]) => B, pattern2:Observable<E, A2>[], f2:(...args:A2[]) => B):EventStream<E, B>;
-
-    /**
-     * @callback Bacon.when3~f1
-     * @param {...A1} args
-     * @returns {B}
-     */
-    /**
-     * @callback Bacon.when3~f2
-     * @param {...A2} args
-     * @returns {B}
-     */
-    /**
-     * @callback Bacon.when3~f3
-     * @param {...A3} args
-     * @returns {B}
-     */
-    /**
-     * @method Bacon.when3
-     * @description Creates an [EventStream]{@link Bacon.EventStream} from join-pattern system.
-     * @param {Observable<E, A1>[]} pattern1
-     * @param {Bacon.when3~f1} f1
-     * @param {Observable<E, A2>[]} pattern2
-     * @param {Bacon.when3~f2} f2
-     * @param {Observable<E, A3>[]} pattern3
-     * @param {Bacon.when3~f3} f3
-     * @returns {EventStream<E, B>}
-     * @example
-     * {
-     *     // Consider implementing a game with discrete time ticks. We want to handle key-events synchronized on tick-events, with at most one key event handled per tick. If there are no key events, we want to just process a tick:
-     *     let tick = Bacon.interval(1e2, 0),
-     *         keyEvent = Bacon.fromEvent(document.body, "click", _ => Date.now()),
-     *         handleTick = _ => `timestamp: NONE`,
-     *         handleKeyEvent = timestamp => `timestamp: ${timestamp}`;
-     *     Bacon.when(
-     *         [tick, keyEvent], (_, timestamp) => handleKeyEvent(timestamp),
-     *         [tick], handleTick
-     *     );
-     *     // Order is important here. If the [tick] patterns had been written first, this would have been tried first, and preferred at each tick.
-     * }
-     *
-     * {
-     *     // Join patterns are indeed a generalization of `zip`, and `zip` is equivalent to a single-rule join pattern. The following `Observable`s have the same output:
-     *     let a = Bacon.once("a"),
-     *         b = Bacon.once("b"),
-     *         c = Bacon.once("c"),
-     *         f = (a, b, c) => `a = ${a}; b = ${b}; c = ${c}.`;
-     *     Bacon.zipWith(f, a, b, c);
-     *     Bacon.when([a, b, c], f);
-     * }
-     *
-     * {
-     *     // Join patterns as a "chemical machine".
-     *     // A quick way to get some intuition for join patterns is to understand them through an analogy in terms of atoms and molecules. A join pattern can here be regarded as a recipe for a chemical reaction. Lets say we have observables `oxygen`, `carbon` and `hydrogen`, where an event in these spawns an 'atom' of that type into a mixture. We can state reactions:
-     *     let oxygen = Bacon.interval(1e3, "O"),
-     *         hydrogen = Bacon.interval(2e3, "H"),
-     *         carbon = Bacon.interval(1.5e3, "C"),
-     *         makeWater = (oxygen:string, hydrogen1:string, hydrogen2:string) => `${hydrogen1}${[hydrogen1, hydrogen2].length}${oxygen}`,
-     *         makeCarbonMonoxide = (oxygen:string, carbon:string) => `${carbon}${oxygen}`;
-     *     Bacon.when(
-     *         [oxygen, hydrogen, hydrogen], makeWater,
-     *         [oxygen, carbon], makeCarbonMonoxide
-     *     );
-     *     // Now, every time a new 'atom' is spawned from one of the observables, this atom is added to the mixture. If at any time there are two hydrogen atoms, and an oxygen atom, the corresponding atoms are *consumed*, and output is produced via `makeWater`. The same semantics apply for the second rule to create carbon monoxide. The rules are tried at each point from top to bottom.
-     * }
-     *
-     * {
-     *     // Join patterns and properties.
-     *     // Properties are not part of the synchronization pattern, but are instead just sampled. The following example take three input streams `$price`, `$quantity` and `$total`, e.g. coming from input fields, and defines mutally recursive behaviours in properties `price`, `quantity` and `total` such that:
-     *     // -- updating `quantity` sets `total` to `price * quantity`;
-     *     // -- updating `total` sets `price` to `total / quantity`.
-     *     let random = (x:number) => Math.round(x * Math.random()),
-     *         id = <A>(x:A):A => x;
-     *     let $quantity = Bacon.interval<Error, number>(1e3, 10).map(random),
-     *         $price = Bacon.interval<Error, number>(2e3, 100).map(random),
-     *         $total = Bacon.interval<Error, number>(1.5e3, 1000).map(random);
-     *     let quantity = $quantity.toProperty(1),
-     *         price = Bacon.when<Error, number, number, number>(
-     *             [$price], id,
-     *             [$total, quantity], (x, y) => x / y
-     *         ).toProperty(0),
-     *         total = Bacon.when<Error, number, number, number, number>(
-     *             [$total], id,
-     *             [$price, quantity], (x, y) => x * y,
-     *             [price, $quantity], (x, y) => x * y
-     *         ).toProperty(0);
-     * }
-     *
-     * {
-     *     // Join patterns and `Bacon.Bus`.
-     *     // The result functions of join patterns are allowed to push values onto a `Bus` that may in turn be in one of its patterns. For instance, an implementation of the dining philosophers problem can be written as follows:
-     *     // Availability of chopsticks are implemented using bus.
-     *     let chopsticks = [new Bacon.Bus(), new Bacon.Bus(), new Bacon.Bus()],
-     *     // Hungry could be any type of observable, but we'll use bus here.
-     *         hungry = [new Bacon.Bus(), new Bacon.Bus(), new Bacon.Bus()],
-     *     // A philosopher eats for one second, then makes the chopsticks available again by pushing values onto their bus.
-     *         eat = (i:number) => () => {
-     *             setTimeout(() => {
-     *                 console.log("done!");
-     *                 chopsticks[i].push({});
-     *                 chopsticks[(i + 1) % 3].push({});
-     *             }, 1e3);
-     *             return `philosopher ${i} eating`;
-     *         },
-     *     // We use Bacon.when to make sure a hungry philosopher can eat only when both his chopsticks are available.
-     *         dining = Bacon.when(
-     *             [hungry[0], chopsticks[0], chopsticks[1]], eat(0),
-     *             [hungry[1], chopsticks[1], chopsticks[2]], eat(1),
-     *             [hungry[2], chopsticks[2], chopsticks[0]], eat(2)
-     *         ).log("dining");
-     *     // Make all chopsticks initially available.
-     *     chopsticks[0].push({});
-     *     chopsticks[1].push({});
-     *     chopsticks[2].push({});
-     *     // Make philosophers hungry in some way, in this case we just push to their bus.
-     *     for (let i = 0; i < 3; i++) {
-     *         hungry[0].push({});
-     *         hungry[1].push({});
-     *         hungry[2].push({});
-     *     }
-     * }
-     */
-    function when<E, A1, A2, A3, B>(pattern1:Observable<E, A1>[], f1:(...args:A1[]) => B, pattern2:Observable<E, A2>[], f2:(...args:A2[]) => B, pattern3:Observable<E, A3>[], f3:(...args:A3[]) => B):EventStream<E, B>;
-
-    /**
-     * @callback Bacon.when4~f1
-     * @param {...A1} args
-     * @returns {B}
-     */
-    /**
-     * @callback Bacon.when4~f2
-     * @param {...A2} args
-     * @returns {B}
-     */
-    /**
-     * @callback Bacon.when4~f3
-     * @param {...A3} args
-     * @returns {B}
-     */
-    /**
-     * @callback Bacon.when4~f4
-     * @param {...A4} args
-     * @returns {B}
-     */
-    /**
-     * @method Bacon.when4
-     * @description Creates an [EventStream]{@link Bacon.EventStream} from join-pattern system.
-     * @param {Observable<E, A1>[]} pattern1
-     * @param {Bacon.when4~f1} f1
-     * @param {Observable<E, A2>[]} pattern2
-     * @param {Bacon.when4~f2} f2
-     * @param {Observable<E, A3>[]} pattern3
-     * @param {Bacon.when4~f3} f3
-     * @param {Observable<E, A4>[]} pattern4
-     * @param {Bacon.when4~f4} f4
-     * @returns {EventStream<E, B>}
-     * @example
-     * {
-     *     // Consider implementing a game with discrete time ticks. We want to handle key-events synchronized on tick-events, with at most one key event handled per tick. If there are no key events, we want to just process a tick:
-     *     let tick = Bacon.interval(1e2, 0),
-     *         keyEvent = Bacon.fromEvent(document.body, "click", _ => Date.now()),
-     *         handleTick = _ => `timestamp: NONE`,
-     *         handleKeyEvent = timestamp => `timestamp: ${timestamp}`;
-     *     Bacon.when(
-     *         [tick, keyEvent], (_, timestamp) => handleKeyEvent(timestamp),
-     *         [tick], handleTick
-     *     );
-     *     // Order is important here. If the [tick] patterns had been written first, this would have been tried first, and preferred at each tick.
-     * }
-     *
-     * {
-     *     // Join patterns are indeed a generalization of `zip`, and `zip` is equivalent to a single-rule join pattern. The following `Observable`s have the same output:
-     *     let a = Bacon.once("a"),
-     *         b = Bacon.once("b"),
-     *         c = Bacon.once("c"),
-     *         f = (a, b, c) => `a = ${a}; b = ${b}; c = ${c}.`;
-     *     Bacon.zipWith(f, a, b, c);
-     *     Bacon.when([a, b, c], f);
-     * }
-     *
-     * {
-     *     // Join patterns as a "chemical machine".
-     *     // A quick way to get some intuition for join patterns is to understand them through an analogy in terms of atoms and molecules. A join pattern can here be regarded as a recipe for a chemical reaction. Lets say we have observables `oxygen`, `carbon` and `hydrogen`, where an event in these spawns an 'atom' of that type into a mixture. We can state reactions:
-     *     let oxygen = Bacon.interval(1e3, "O"),
-     *         hydrogen = Bacon.interval(2e3, "H"),
-     *         carbon = Bacon.interval(1.5e3, "C"),
-     *         makeWater = (oxygen:string, hydrogen1:string, hydrogen2:string) => `${hydrogen1}${[hydrogen1, hydrogen2].length}${oxygen}`,
-     *         makeCarbonMonoxide = (oxygen:string, carbon:string) => `${carbon}${oxygen}`;
-     *     Bacon.when(
-     *         [oxygen, hydrogen, hydrogen], makeWater,
-     *         [oxygen, carbon], makeCarbonMonoxide
-     *     );
-     *     // Now, every time a new 'atom' is spawned from one of the observables, this atom is added to the mixture. If at any time there are two hydrogen atoms, and an oxygen atom, the corresponding atoms are *consumed*, and output is produced via `makeWater`. The same semantics apply for the second rule to create carbon monoxide. The rules are tried at each point from top to bottom.
-     * }
-     *
-     * {
-     *     // Join patterns and properties.
-     *     // Properties are not part of the synchronization pattern, but are instead just sampled. The following example take three input streams `$price`, `$quantity` and `$total`, e.g. coming from input fields, and defines mutally recursive behaviours in properties `price`, `quantity` and `total` such that:
-     *     // -- updating `quantity` sets `total` to `price * quantity`;
-     *     // -- updating `total` sets `price` to `total / quantity`.
-     *     let random = (x:number) => Math.round(x * Math.random()),
-     *         id = <A>(x:A):A => x;
-     *     let $quantity = Bacon.interval<Error, number>(1e3, 10).map(random),
-     *         $price = Bacon.interval<Error, number>(2e3, 100).map(random),
-     *         $total = Bacon.interval<Error, number>(1.5e3, 1000).map(random);
-     *     let quantity = $quantity.toProperty(1),
-     *         price = Bacon.when<Error, number, number, number>(
-     *             [$price], id,
-     *             [$total, quantity], (x, y) => x / y
-     *         ).toProperty(0),
-     *         total = Bacon.when<Error, number, number, number, number>(
-     *             [$total], id,
-     *             [$price, quantity], (x, y) => x * y,
-     *             [price, $quantity], (x, y) => x * y
-     *         ).toProperty(0);
-     * }
-     *
-     * {
-     *     // Join patterns and `Bacon.Bus`.
-     *     // The result functions of join patterns are allowed to push values onto a `Bus` that may in turn be in one of its patterns. For instance, an implementation of the dining philosophers problem can be written as follows:
-     *     // Availability of chopsticks are implemented using bus.
-     *     let chopsticks = [new Bacon.Bus(), new Bacon.Bus(), new Bacon.Bus()],
-     *     // Hungry could be any type of observable, but we'll use bus here.
-     *         hungry = [new Bacon.Bus(), new Bacon.Bus(), new Bacon.Bus()],
-     *     // A philosopher eats for one second, then makes the chopsticks available again by pushing values onto their bus.
-     *         eat = (i:number) => () => {
-     *             setTimeout(() => {
-     *                 console.log("done!");
-     *                 chopsticks[i].push({});
-     *                 chopsticks[(i + 1) % 3].push({});
-     *             }, 1e3);
-     *             return `philosopher ${i} eating`;
-     *         },
-     *     // We use Bacon.when to make sure a hungry philosopher can eat only when both his chopsticks are available.
-     *         dining = Bacon.when(
-     *             [hungry[0], chopsticks[0], chopsticks[1]], eat(0),
-     *             [hungry[1], chopsticks[1], chopsticks[2]], eat(1),
-     *             [hungry[2], chopsticks[2], chopsticks[0]], eat(2)
-     *         ).log("dining");
-     *     // Make all chopsticks initially available.
-     *     chopsticks[0].push({});
-     *     chopsticks[1].push({});
-     *     chopsticks[2].push({});
-     *     // Make philosophers hungry in some way, in this case we just push to their bus.
-     *     for (let i = 0; i < 3; i++) {
-     *         hungry[0].push({});
-     *         hungry[1].push({});
-     *         hungry[2].push({});
-     *     }
-     * }
-     */
-    function when<E, A1, A2, A3, A4, B>(pattern1:Observable<E, A1>[], f1:(...args:A1[]) => B, pattern2:Observable<E, A2>[], f2:(...args:A2[]) => B, pattern3:Observable<E, A3>[], f3:(...args:A3[]) => B, pattern4:Observable<E, A4>[], f4:(...args:A4[]) => B):EventStream<E, B>;
-
-    /**
-     * @callback Bacon.when5~f1
-     * @param {...A1} args
-     * @returns {B}
-     */
-    /**
-     * @callback Bacon.when5~f2
-     * @param {...A2} args
-     * @returns {B}
-     */
-    /**
-     * @callback Bacon.when5~f3
-     * @param {...A3} args
-     * @returns {B}
-     */
-    /**
-     * @callback Bacon.when5~f4
-     * @param {...A4} args
-     * @returns {B}
-     */
-    /**
-     * @callback Bacon.when5~f5
-     * @param {...A5} args
-     * @returns {B}
-     */
-    /**
-     * @method Bacon.when5
-     * @description Creates an [EventStream]{@link Bacon.EventStream} from join-pattern system.
-     * @param {Observable<E, A1>[]} pattern1
-     * @param {Bacon.when5~f1} f1
-     * @param {Observable<E, A2>[]} pattern2
-     * @param {Bacon.when5~f2} f2
-     * @param {Observable<E, A3>[]} pattern3
-     * @param {Bacon.when5~f3} f3
-     * @param {Observable<E, A4>[]} pattern4
-     * @param {Bacon.when5~f4} f4
-     * @param {Observable<E, A5>[]} pattern5
-     * @param {Bacon.when5~f5} f5
-     * @returns {EventStream<E, B>}
-     * @example
-     * {
-     *     // Consider implementing a game with discrete time ticks. We want to handle key-events synchronized on tick-events, with at most one key event handled per tick. If there are no key events, we want to just process a tick:
-     *     let tick = Bacon.interval(1e2, 0),
-     *         keyEvent = Bacon.fromEvent(document.body, "click", _ => Date.now()),
-     *         handleTick = _ => `timestamp: NONE`,
-     *         handleKeyEvent = timestamp => `timestamp: ${timestamp}`;
-     *     Bacon.when(
-     *         [tick, keyEvent], (_, timestamp) => handleKeyEvent(timestamp),
-     *         [tick], handleTick
-     *     );
-     *     // Order is important here. If the [tick] patterns had been written first, this would have been tried first, and preferred at each tick.
-     * }
-     *
-     * {
-     *     // Join patterns are indeed a generalization of `zip`, and `zip` is equivalent to a single-rule join pattern. The following `Observable`s have the same output:
-     *     let a = Bacon.once("a"),
-     *         b = Bacon.once("b"),
-     *         c = Bacon.once("c"),
-     *         f = (a, b, c) => `a = ${a}; b = ${b}; c = ${c}.`;
-     *     Bacon.zipWith(f, a, b, c);
-     *     Bacon.when([a, b, c], f);
-     * }
-     *
-     * {
-     *     // Join patterns as a "chemical machine".
-     *     // A quick way to get some intuition for join patterns is to understand them through an analogy in terms of atoms and molecules. A join pattern can here be regarded as a recipe for a chemical reaction. Lets say we have observables `oxygen`, `carbon` and `hydrogen`, where an event in these spawns an 'atom' of that type into a mixture. We can state reactions:
-     *     let oxygen = Bacon.interval(1e3, "O"),
-     *         hydrogen = Bacon.interval(2e3, "H"),
-     *         carbon = Bacon.interval(1.5e3, "C"),
-     *         makeWater = (oxygen:string, hydrogen1:string, hydrogen2:string) => `${hydrogen1}${[hydrogen1, hydrogen2].length}${oxygen}`,
-     *         makeCarbonMonoxide = (oxygen:string, carbon:string) => `${carbon}${oxygen}`;
-     *     Bacon.when(
-     *         [oxygen, hydrogen, hydrogen], makeWater,
-     *         [oxygen, carbon], makeCarbonMonoxide
-     *     );
-     *     // Now, every time a new 'atom' is spawned from one of the observables, this atom is added to the mixture. If at any time there are two hydrogen atoms, and an oxygen atom, the corresponding atoms are *consumed*, and output is produced via `makeWater`. The same semantics apply for the second rule to create carbon monoxide. The rules are tried at each point from top to bottom.
-     * }
-     *
-     * {
-     *     // Join patterns and properties.
-     *     // Properties are not part of the synchronization pattern, but are instead just sampled. The following example take three input streams `$price`, `$quantity` and `$total`, e.g. coming from input fields, and defines mutally recursive behaviours in properties `price`, `quantity` and `total` such that:
-     *     // -- updating `quantity` sets `total` to `price * quantity`;
-     *     // -- updating `total` sets `price` to `total / quantity`.
-     *     let random = (x:number) => Math.round(x * Math.random()),
-     *         id = <A>(x:A):A => x;
-     *     let $quantity = Bacon.interval<Error, number>(1e3, 10).map(random),
-     *         $price = Bacon.interval<Error, number>(2e3, 100).map(random),
-     *         $total = Bacon.interval<Error, number>(1.5e3, 1000).map(random);
-     *     let quantity = $quantity.toProperty(1),
-     *         price = Bacon.when<Error, number, number, number>(
-     *             [$price], id,
-     *             [$total, quantity], (x, y) => x / y
-     *         ).toProperty(0),
-     *         total = Bacon.when<Error, number, number, number, number>(
-     *             [$total], id,
-     *             [$price, quantity], (x, y) => x * y,
-     *             [price, $quantity], (x, y) => x * y
-     *         ).toProperty(0);
-     * }
-     *
-     * {
-     *     // Join patterns and `Bacon.Bus`.
-     *     // The result functions of join patterns are allowed to push values onto a `Bus` that may in turn be in one of its patterns. For instance, an implementation of the dining philosophers problem can be written as follows:
-     *     // Availability of chopsticks are implemented using bus.
-     *     let chopsticks = [new Bacon.Bus(), new Bacon.Bus(), new Bacon.Bus()],
-     *     // Hungry could be any type of observable, but we'll use bus here.
-     *         hungry = [new Bacon.Bus(), new Bacon.Bus(), new Bacon.Bus()],
-     *     // A philosopher eats for one second, then makes the chopsticks available again by pushing values onto their bus.
-     *         eat = (i:number) => () => {
-     *             setTimeout(() => {
-     *                 console.log("done!");
-     *                 chopsticks[i].push({});
-     *                 chopsticks[(i + 1) % 3].push({});
-     *             }, 1e3);
-     *             return `philosopher ${i} eating`;
-     *         },
-     *     // We use Bacon.when to make sure a hungry philosopher can eat only when both his chopsticks are available.
-     *         dining = Bacon.when(
-     *             [hungry[0], chopsticks[0], chopsticks[1]], eat(0),
-     *             [hungry[1], chopsticks[1], chopsticks[2]], eat(1),
-     *             [hungry[2], chopsticks[2], chopsticks[0]], eat(2)
-     *         ).log("dining");
-     *     // Make all chopsticks initially available.
-     *     chopsticks[0].push({});
-     *     chopsticks[1].push({});
-     *     chopsticks[2].push({});
-     *     // Make philosophers hungry in some way, in this case we just push to their bus.
-     *     for (let i = 0; i < 3; i++) {
-     *         hungry[0].push({});
-     *         hungry[1].push({});
-     *         hungry[2].push({});
-     *     }
-     * }
-     */
-    function when<E, A1, A2, A3, A4, A5, B>(pattern1:Observable<E, A1>[], f1:(...args:A1[]) => B, pattern2:Observable<E, A2>[], f2:(...args:A2[]) => B, pattern3:Observable<E, A3>[], f3:(...args:A3[]) => B, pattern4:Observable<E, A4>[], f4:(...args:A4[]) => B, pattern5:Observable<E, A5>[], f5:(...args:A5[]) => B):EventStream<E, B>;
-
-    /**
-     * @callback Bacon.update1~f1
-     * @param {B} initial
-     * @param {...A1} args
-     * @returns {B}
-     */
-    /**
-     * @method Bacon.update1
-     * @description Creates an [Property]{@link Bacon.Property} from an `initial` value and a join-pattern system.
-     * @param {B} initial
-     * @param {Observable<E, A1>[]} pattern1
-     * @param {Bacon.update1~f1} f1
-     * @returns {Property<E, B>}
-     * @example
-     * {
-     *     // The inputs to `Bacon.update` are defined like this:
-     *     let initial = 0,
-     *         x = Bacon.interval(1e3, 1),
-     *         y = Bacon.interval(2e3, 1),
-     *         z = Bacon.interval(1.5e3, 1);
-     *     // NOTE: had to explicitly specify the typing for `previous:number`
-     *     Bacon.update(initial,
-     *         [x, y, z], (previous:number, x, y, z) => previous + x + y + z,
-     *         [x, y], (previous:number, x, y) => previous + x + y + z
-     *     );
-     *     // As input, each function above will get the previous value of the `result` Property, along with values from the listed Observables. The value returned by the function will be used as the next value of `result`. Just like in `Bacon.when`, only EventStreams will trigger an update, while Properties will be just sampled. So, if you list a single EventStream and several Properties, the value will be updated only when an event occurs in the EventStream.
-     * }
-     *
-     * {
-     *     // Here's a simple gaming example:
-     *     let scoreMultiplier = Bacon.constant(1),
-     *         hitUfo = new Bacon.Bus(),
-     *         hitMotherShip = new Bacon.Bus(),
-     *         score = Bacon.update(0,
-     *             [hitUfo, scoreMultiplier], (score, _, multiplier:number) => score + 100 * multiplier,
-     *             [hitMotherShip], (score, _) => score + 2000
-     *         );
-     *     // In the example, the `score` property is updated when either `hitUfo` or `hitMotherShip` occur. The `scoreMultiplier` Property is sampled to take multiplier into account when `hitUfo` occurs.
-     * }
-     */
-    function update<E, A1, B>(initial:B, pattern1:Observable<E, A1>[], f1:(initial:B, ...args:A1[]) => B):Property<E, B>;
-
-    /**
-     * @callback Bacon.update2~f1
-     * @param {B} initial
-     * @param {...A1} args
-     * @returns {B}
-     */
-    /**
-     * @callback Bacon.update2~f2
-     * @param {B} initial
-     * @param {...A2} args
-     * @returns {B}
-     */
-    /**
-     * @method Bacon.update2
-     * @description Creates an [Property]{@link Bacon.Property} from an `initial` value and a join-pattern system.
-     * @param {B} initial
-     * @param {Observable<E, A1>[]} pattern1
-     * @param {Bacon.update2~f1} f1
-     * @param {Observable<E, A2>[]} pattern2
-     * @param {Bacon.update2~f2} f2
-     * @returns {Property<E, B>}
-     * @example
-     * {
-     *     // The inputs to `Bacon.update` are defined like this:
-     *     let initial = 0,
-     *         x = Bacon.interval(1e3, 1),
-     *         y = Bacon.interval(2e3, 1),
-     *         z = Bacon.interval(1.5e3, 1);
-     *     // NOTE: had to explicitly specify the typing for `previous:number`
-     *     Bacon.update(initial,
-     *         [x, y, z], (previous:number, x, y, z) => previous + x + y + z,
-     *         [x, y], (previous:number, x, y) => previous + x + y + z
-     *     );
-     *     // As input, each function above will get the previous value of the `result` Property, along with values from the listed Observables. The value returned by the function will be used as the next value of `result`. Just like in `Bacon.when`, only EventStreams will trigger an update, while Properties will be just sampled. So, if you list a single EventStream and several Properties, the value will be updated only when an event occurs in the EventStream.
-     * }
-     *
-     * {
-     *     // Here's a simple gaming example:
-     *     let scoreMultiplier = Bacon.constant(1),
-     *         hitUfo = new Bacon.Bus(),
-     *         hitMotherShip = new Bacon.Bus(),
-     *         score = Bacon.update(0,
-     *             [hitUfo, scoreMultiplier], (score, _, multiplier:number) => score + 100 * multiplier,
-     *             [hitMotherShip], (score, _) => score + 2000
-     *         );
-     *     // In the example, the `score` property is updated when either `hitUfo` or `hitMotherShip` occur. The `scoreMultiplier` Property is sampled to take multiplier into account when `hitUfo` occurs.
-     * }
-     */
-    function update<E, A1, A2, B>(initial:B, pattern1:Observable<E, A1>[], f1:(initial:B, ...args:A1[]) => B, pattern2:Observable<E, A2>[], f2:(initial:B, ...args:A2[]) => B):Property<E, B>;
-
-    /**
-     * @callback Bacon.update3~f1
-     * @param {B} initial
-     * @param {...A1} args
-     * @returns {B}
-     */
-    /**
-     * @callback Bacon.update3~f2
-     * @param {B} initial
-     * @param {...A2} args
-     * @returns {B}
-     */
-    /**
-     * @callback Bacon.update3~f3
-     * @param {B} initial
-     * @param {...A3} args
-     * @returns {B}
-     */
-    /**
-     * @method Bacon.update3
-     * @description Creates an [Property]{@link Bacon.Property} from an `initial` value and a join-pattern system.
-     * @param {B} initial
-     * @param {Observable<E, A1>[]} pattern1
-     * @param {Bacon.update3~f1} f1
-     * @param {Observable<E, A2>[]} pattern2
-     * @param {Bacon.update3~f2} f2
-     * @param {Observable<E, A3>[]} pattern3
-     * @param {Bacon.update3~f3} f3
-     * @returns {Property<E, B>}
-     * @example
-     * {
-     *     // The inputs to `Bacon.update` are defined like this:
-     *     let initial = 0,
-     *         x = Bacon.interval(1e3, 1),
-     *         y = Bacon.interval(2e3, 1),
-     *         z = Bacon.interval(1.5e3, 1);
-     *     // NOTE: had to explicitly specify the typing for `previous:number`
-     *     Bacon.update(initial,
-     *         [x, y, z], (previous:number, x, y, z) => previous + x + y + z,
-     *         [x, y], (previous:number, x, y) => previous + x + y + z
-     *     );
-     *     // As input, each function above will get the previous value of the `result` Property, along with values from the listed Observables. The value returned by the function will be used as the next value of `result`. Just like in `Bacon.when`, only EventStreams will trigger an update, while Properties will be just sampled. So, if you list a single EventStream and several Properties, the value will be updated only when an event occurs in the EventStream.
-     * }
-     *
-     * {
-     *     // Here's a simple gaming example:
-     *     let scoreMultiplier = Bacon.constant(1),
-     *         hitUfo = new Bacon.Bus(),
-     *         hitMotherShip = new Bacon.Bus(),
-     *         score = Bacon.update(0,
-     *             [hitUfo, scoreMultiplier], (score, _, multiplier:number) => score + 100 * multiplier,
-     *             [hitMotherShip], (score, _) => score + 2000
-     *         );
-     *     // In the example, the `score` property is updated when either `hitUfo` or `hitMotherShip` occur. The `scoreMultiplier` Property is sampled to take multiplier into account when `hitUfo` occurs.
-     * }
-     */
-    function update<E, A1, A2, A3, B>(initial:B, pattern1:Observable<E, A1>[], f1:(initial:B, ...args:A1[]) => B, pattern2:Observable<E, A2>[], f2:(initial:B, ...args:A2[]) => B, pattern3:Observable<E, A3>[], f3:(initial:B, ...args:A3[]) => B):Property<E, B>;
-
-    /**
-     * @callback Bacon.update4~f1
-     * @param {B} initial
-     * @param {...A1} args
-     * @returns {B}
-     */
-    /**
-     * @callback Bacon.update4~f2
-     * @param {B} initial
-     * @param {...A2} args
-     * @returns {B}
-     */
-    /**
-     * @callback Bacon.update4~f3
-     * @param {B} initial
-     * @param {...A3} args
-     * @returns {B}
-     */
-    /**
-     * @callback Bacon.update4~f4
-     * @param {B} initial
-     * @param {...A4} args
-     * @returns {B}
-     */
-    /**
-     * @method Bacon.update4
-     * @description Creates an [Property]{@link Bacon.Property} from an `initial` value and a join-pattern system.
-     * @param {B} initial
-     * @param {Observable<E, A1>[]} pattern1
-     * @param {Bacon.update4~f1} f1
-     * @param {Observable<E, A2>[]} pattern2
-     * @param {Bacon.update4~f2} f2
-     * @param {Observable<E, A3>[]} pattern3
-     * @param {Bacon.update4~f3} f3
-     * @param {Observable<E, A4>[]} pattern4
-     * @param {Bacon.update4~f4} f4
-     * @returns {Property<E, B>}
-     * @example
-     * {
-     *     // The inputs to `Bacon.update` are defined like this:
-     *     let initial = 0,
-     *         x = Bacon.interval(1e3, 1),
-     *         y = Bacon.interval(2e3, 1),
-     *         z = Bacon.interval(1.5e3, 1);
-     *     // NOTE: had to explicitly specify the typing for `previous:number`
-     *     Bacon.update(initial,
-     *         [x, y, z], (previous:number, x, y, z) => previous + x + y + z,
-     *         [x, y], (previous:number, x, y) => previous + x + y + z
-     *     );
-     *     // As input, each function above will get the previous value of the `result` Property, along with values from the listed Observables. The value returned by the function will be used as the next value of `result`. Just like in `Bacon.when`, only EventStreams will trigger an update, while Properties will be just sampled. So, if you list a single EventStream and several Properties, the value will be updated only when an event occurs in the EventStream.
-     * }
-     *
-     * {
-     *     // Here's a simple gaming example:
-     *     let scoreMultiplier = Bacon.constant(1),
-     *         hitUfo = new Bacon.Bus(),
-     *         hitMotherShip = new Bacon.Bus(),
-     *         score = Bacon.update(0,
-     *             [hitUfo, scoreMultiplier], (score, _, multiplier:number) => score + 100 * multiplier,
-     *             [hitMotherShip], (score, _) => score + 2000
-     *         );
-     *     // In the example, the `score` property is updated when either `hitUfo` or `hitMotherShip` occur. The `scoreMultiplier` Property is sampled to take multiplier into account when `hitUfo` occurs.
-     * }
-     */
-    function update<E, A1, A2, A3, A4, B>(initial:B, pattern1:Observable<E, A1>[], f1:(initial:B, ...args:A1[]) => B, pattern2:Observable<E, A2>[], f2:(initial:B, ...args:A2[]) => B, pattern3:Observable<E, A3>[], f3:(initial:B, ...args:A3[]) => B, pattern4:Observable<E, A4>[], f4:(initial:B, ...args:A4[]) => B):Property<E, B>;
-
-    /**
-     * @callback Bacon.update5~f1
-     * @param {B} initial
-     * @param {...A1} args
-     * @returns {B}
-     */
-    /**
-     * @callback Bacon.update5~f2
-     * @param {B} initial
-     * @param {...A2} args
-     * @returns {B}
-     */
-    /**
-     * @callback Bacon.update5~f3
-     * @param {B} initial
-     * @param {...A3} args
-     * @returns {B}
-     */
-    /**
-     * @callback Bacon.update5~f4
-     * @param {B} initial
-     * @param {...A4} args
-     * @returns {B}
-     */
-    /**
-     * @callback Bacon.update5~f5
-     * @param {B} initial
-     * @param {...A5} args
-     * @returns {B}
-     */
-    /**
-     * @method Bacon.update5
-     * @description Creates an [Property]{@link Bacon.Property} from an `initial` value and a join-pattern system.
-     * @param {B} initial
-     * @param {Observable<E, A1>[]} pattern1
-     * @param {Bacon.update5~f1} f1
-     * @param {Observable<E, A2>[]} pattern2
-     * @param {Bacon.update5~f2} f2
-     * @param {Observable<E, A3>[]} pattern3
-     * @param {Bacon.update5~f3} f3
-     * @param {Observable<E, A4>[]} pattern4
-     * @param {Bacon.update5~f4} f4
-     * @param {Observable<E, A5>[]} pattern5
-     * @param {Bacon.update5~f5} f5
-     * @returns {Property<E, B>}
-     * @example
-     * {
-     *     // The inputs to `Bacon.update` are defined like this:
-     *     let initial = 0,
-     *         x = Bacon.interval(1e3, 1),
-     *         y = Bacon.interval(2e3, 1),
-     *         z = Bacon.interval(1.5e3, 1);
-     *     // NOTE: had to explicitly specify the typing for `previous:number`
-     *     Bacon.update(initial,
-     *         [x, y, z], (previous:number, x, y, z) => previous + x + y + z,
-     *         [x, y], (previous:number, x, y) => previous + x + y + z
-     *     );
-     *     // As input, each function above will get the previous value of the `result` Property, along with values from the listed Observables. The value returned by the function will be used as the next value of `result`. Just like in `Bacon.when`, only EventStreams will trigger an update, while Properties will be just sampled. So, if you list a single EventStream and several Properties, the value will be updated only when an event occurs in the EventStream.
-     * }
-     *
-     * {
-     *     // Here's a simple gaming example:
-     *     let scoreMultiplier = Bacon.constant(1),
-     *         hitUfo = new Bacon.Bus(),
-     *         hitMotherShip = new Bacon.Bus(),
-     *         score = Bacon.update(0,
-     *             [hitUfo, scoreMultiplier], (score, _, multiplier:number) => score + 100 * multiplier,
-     *             [hitMotherShip], (score, _) => score + 2000
-     *         );
-     *     // In the example, the `score` property is updated when either `hitUfo` or `hitMotherShip` occur. The `scoreMultiplier` Property is sampled to take multiplier into account when `hitUfo` occurs.
-     * }
-     */
-    function update<E, A1, A2, A3, A4, A5, B>(initial:B, pattern1:Observable<E, A1>[], f1:(initial:B, ...args:A1[]) => B, pattern2:Observable<E, A2>[], f2:(initial:B, ...args:A2[]) => B, pattern3:Observable<E, A3>[], f3:(initial:B, ...args:A3[]) => B, pattern4:Observable<E, A4>[], f4:(initial:B, ...args:A4[]) => B, pattern5:Observable<E, A5>[], f5:(initial:B, ...args:A5[]) => B):Property<E, B>;
-}
-
-declare module "baconjs" {
-    export = Bacon;
-}
diff --git a/baconjs/index.d.ts b/baconjs/index.d.ts
new file mode 100644
index 0000000000..8659ea9115
--- /dev/null
+++ b/baconjs/index.d.ts
@@ -0,0 +1,3132 @@
+// Type definitions for Bacon.js 0.7.0
+// Project: https://baconjs.github.io/
+// Definitions by: Alexander Matsievsky <https://github.com/alexander-matsievsky>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+/// <reference types="node" />
+
+interface JQuery {
+    /**
+     * @method
+     * @description Creates an [EventStream]{@link Bacon.EventStream} from events on a jQuery or Zepto.js object.
+     * @param {string} eventName
+     * @returns {EventStream<ErrorEvent, JQueryEventObject>}
+     * @example
+     * $("#my-div").asEventStream("click");
+     */
+    asEventStream(eventName:string):Bacon.EventStream<ErrorEvent, JQueryEventObject>;
+
+    /**
+     * @method
+     * @description Creates an [EventStream]{@link Bacon.EventStream} from events on a jQuery or Zepto.js object. You can pass an argument to add a jQuery live `selector`.
+     * @param {string} eventName
+     * @param {string} selector
+     * @returns {EventStream<ErrorEvent, JQueryEventObject>}
+     * @example
+     * $("#my-div").asEventStream("click", ".more-specific-selector");
+     */
+    asEventStream(eventName:string, selector:string):Bacon.EventStream<ErrorEvent, JQueryEventObject>;
+
+    /**
+     * @callback JQuery#asEventStream1~f
+     * @param {JQueryEventObject} event
+     * @param {*[]} args
+     * @returns {A}
+     */
+    /**
+     * @method JQuery#asEventStream1
+     * @description Creates an [EventStream]{@link Bacon.EventStream} from events on a jQuery or Zepto.js object. You can pass an argument to add a function `f` that processes the jQuery event and its parameters.
+     * @param {string} eventName
+     * @param {JQuery#asEventStream1~f} f
+     * @returns {EventStream<ErrorEvent, A>}
+     * @example
+     * $("#my-div").asEventStream("click", (event, args) => args[0]);
+     */
+    asEventStream<A>(eventName:string, f:(event:JQueryEventObject, args:any[]) => A):Bacon.EventStream<ErrorEvent, A>;
+
+    /**
+     * @callback JQuery#asEventStream2~f
+     * @param {JQueryEventObject} event
+     * @param {*[]} args
+     * @returns {A}
+     */
+    /**
+     * @method JQuery#asEventStream2
+     * @description Creates an [EventStream]{@link Bacon.EventStream} from events on a jQuery or Zepto.js object. You can pass an argument to add a jQuery live `selector` and a function `f` that processes the jQuery event and its parameters.
+     * @param {string} eventName
+     * @param {string} selector
+     * @param {JQuery#asEventStream2~f} f
+     * @returns {Bacon.EventStream<ErrorEvent, A>}
+     * @example
+     * $("#my-div").asEventStream("click", ".more-specific-selector", (event, args) => args[0]);
+     */
+    asEventStream<A>(eventName:string, selector:string, f:(event:JQueryEventObject, args:any[]) => A):Bacon.EventStream<ErrorEvent, A>;
+}
+
+/** @module Bacon */
+declare namespace Bacon {
+    /**
+     * @function
+     * @description Creates an [EventStream]{@link Bacon.EventStream} from a `promise` Promise object such as JQuery Ajax. This stream will contain a single value or an error, followed immediately by stream end. You can use the optional `abort` flag (i.e. ´Bacon.fromPromise(p, true)´ to have the `abort` method of the given promise be called when all subscribers have been removed from the created stream.
+     * @param {Promise<A>|JQueryXHR} promise
+     * @param {boolean} [abort]
+     * @returns {EventStream<E, A>}
+     * @example
+     * Bacon.fromPromise($.ajax("https://baconjs.github.io/"));
+     * Bacon.fromPromise(Promise.resolve(1));
+     * Bacon.fromPromise($.ajax("https://baconjs.github.io/"), true);
+     * Bacon.fromPromise(Promise.resolve(1), false);
+     */
+    function fromPromise<E, A>(promise:Promise<A>|JQueryXHR, abort?:boolean):EventStream<E, A>;
+
+    /**
+     * @callback Bacon.fromPromise~eventTransformer
+     * @param {A} value
+     * @returns {(Initial<B>|Next<B>|End<B>|Error<E>)[]}
+     */
+    /**
+     * @function Bacon.fromPromise
+     * @description Creates an [EventStream]{@link Bacon.EventStream} from a `promise` Promise object such as JQuery Ajax. This stream will contain a single value or an error, followed immediately by stream end. You can use the `abort` flag (i.e. ´Bacon.fromPromise(p, true)´ to have the `abort` method of the given promise be called when all subscribers have been removed from the created stream, and also pass a function `eventTransformer` that transforms the promise value into Events. The default is to transform the value into `[new Bacon.Next(value), new Bacon.End()]`.
+     * @param {Promise<A>|JQueryXHR} promise
+     * @param {boolean} abort
+     * @param {Bacon.fromPromise~eventTransformer} eventTransformer
+     * @returns {EventStream<E, B>}
+     * @example
+     * Bacon.fromPromise($.ajax("https://baconjs.github.io/"), true, (n:string) => {
+     *     return [new Bacon.Next(n), new Bacon.Next(() => n), new Bacon.End()];
+     * });
+     * Bacon.fromPromise(Promise.resolve(1), false, n => {
+     *     return [new Bacon.Next(n), new Bacon.Next(() => n), new Bacon.End()];
+     * });
+     */
+    function fromPromise<E, A, B>(promise:Promise<A>|JQueryXHR, abort:boolean, eventTransformer:(value:A) => (Initial<B>|Next<B>|End<B>|Error<E>)[]):EventStream<E, B>;
+
+    /**
+     * @function
+     * @description Creates an [EventStream]{@link Bacon.EventStream} from events on a DOM EventTarget or Node.JS EventEmitter object, or an object that supports event listeners using `on`/`off` methods.
+     * @param {EventTarget|NodeJS.EventEmitter|JQuery} target
+     * @param {string} eventName
+     * @returns {EventStream<E, A>}
+     * @example
+     * Bacon.fromEvent(document.body, "click").onValue(() => {
+     *     alert("Bacon!");
+     * });
+     * Bacon.fromEvent(process.stdin, "readable", () => {
+     *     alert("Bacon!");
+     * });
+     * Bacon.fromEvent($("body"), "click").onValue(() => {
+     *     alert("Bacon!");
+     * });
+     */
+    function fromEvent<E, A>(target:EventTarget|NodeJS.EventEmitter|JQuery, eventName:string):EventStream<E, A>;
+
+    /**
+     * @callback Bacon.fromEvent~eventTransformer
+     * @param {A} event
+     * @returns {B}
+     */
+    /**
+     * @function Bacon.fromEvent
+     * @description Creates an [EventStream]{@link Bacon.EventStream} from events on a DOM EventTarget or Node.JS EventEmitter object, or an object that supports event listeners using `on`/`off` methods. You can pass a function `eventTransformer` that transforms the emitted events' parameters.
+     * @param {EventTarget|NodeJS.EventEmitter|JQuery} target
+     * @param {string} eventName
+     * @param {Bacon.fromEvent~eventTransformer} eventTransformer
+     * @returns {EventStream<E, B>}
+     * @example
+     * Bacon.fromEvent(document.body, "click", (event:MouseEvent) => event.clientX).onValue(clientX => {
+     *     alert("Bacon!");
+     * });
+     */
+    function fromEvent<E, A, B>(target:EventTarget|NodeJS.EventEmitter|JQuery, eventName:string, eventTransformer:(event:A) => B):EventStream<E, B>;
+
+    /**
+     * @callback Bacon.fromCallback1~f
+     * @param {Bacon.fromCallback1~callback} callback
+     * @returns {void}
+     */
+    /**
+     * @callback Bacon.fromCallback1~callback
+     * @param {...*} args
+     * @returns {void}
+     */
+    /**
+     * @function Bacon.fromCallback1
+     * @description Creates an [EventStream]{@link Bacon.EventStream} from a function `f` that accepts a `callback`. The function is supposed to call its callback just once.
+     * @param {Bacon.fromCallback1~f} f
+     * @returns {EventStream<E, A>}
+     * @example
+     * // This would create a stream that outputs a single value "Bacon!" and ends after that. The use of setTimeout causes the value to be delayed by 1 second.
+     * Bacon.fromCallback(callback => {
+     *     setTimeout(() => {
+     *         callback("Bacon!");
+     *     }, 1000);
+     * });
+     */
+    function fromCallback<E, A>(f:(callback:(...args:any[]) => void) => void):EventStream<E, A>;
+
+    /**
+     * @callback Bacon.fromCallback2~f
+     * @param {...*} args
+     * @returns {void}
+     */
+    /**
+     * @function Bacon.fromCallback2
+     * @description Creates an [EventStream]{@link Bacon.EventStream} from a function `f` that accepts a `callback`. The function is supposed to call its callback just once.
+     * @param {Bacon.fromCallback2~f} f
+     * @param {...*} args
+     * @returns {EventStream<E, A>}
+     * @example
+     * // You can also give any number of arguments to `fromCallback`, which will be passed to the function. These arguments can be simple variables, Bacon EventStreams or Properties. For example the following will output "Bacon rules":
+     * Bacon.fromCallback((a, b, callback) => {
+     *     callback(a + " " + b);
+     * }, Bacon.constant("bacon"), "rules").log();
+     */
+    function fromCallback<E, A>(f:(...args:any[]) => void, ...args:any[]):EventStream<E, A>;
+
+    /**
+     * @function
+     * @description Creates an [EventStream]{@link Bacon.EventStream} from a `methodName` method of a given `object`. The function is supposed to call its callback just once.
+     * @param {Object} object
+     * @param {string} methodName
+     * @param {...*} args
+     * @returns {EventStream<E, A>}
+     */
+    function fromCallback<E, A>(object:Object, methodName:string, ...args:any[]):EventStream<E, A>;
+
+    /**
+     * @callback Bacon.fromNodeCallback~f
+     * @param {Bacon.fromNodeCallback~callback} callback
+     * @returns {void}
+     */
+    /**
+     * @callback Bacon.fromNodeCallback~callback
+     * @param {E} error
+     * @param {A} data
+     * @returns {void}
+     */
+    /**
+     * @function Bacon.fromNodeCallback
+     * @description Creates an [EventStream]{@link Bacon.EventStream} from a function `f` that accepts a Node.js `callback`: callback(error, data), where error is `null` if everything is fine. The function is supposed to call its callback just once.
+     * @param {Bacon.fromNodeCallback~f} f
+     * @param {...*} args
+     * @returns {EventStream<E, A>}
+     * @example
+     * {
+     *     let fs = require("fs"),
+     *         read = Bacon.fromNodeCallback(fs.readFile, "input.txt");
+     *     read.onError(error => {
+     *        console.log("Reading failed: " + error);
+     *     });
+     *     read.onValue(value => {
+     *         console.log("Read contents: " + value);
+     *     });
+     * }
+     */
+    function fromNodeCallback<E, A>(f:(callback:(error:E, data:A) => void) => void, ...args:any[]):EventStream<E, A>;
+
+    /**
+     * @function
+     * @description Creates an [EventStream]{@link Bacon.EventStream} from a `methodName` method of a given `object`.
+     * @param {Object} object
+     * @param {string} methodName
+     * @param {...*} args
+     * @returns {EventStream<E, A>}
+     */
+    function fromNodeCallback<E, A>(object:Object, methodName:string, ...args:any[]):EventStream<E, A>;
+
+    /**
+     * @callback Bacon.fromPoll~f
+     * @returns {Next<A>|End<A>}
+     */
+    /**
+     * @function Bacon.fromPoll
+     * @description Polls given function `f` with given `interval`. Function should return events: either [Next]{@link Bacon.Next} or [End]{@link Bacon.End}. Polling occurs only when there are subscribers to the stream. Polling ends permanently when `f` returns [End]{@link Bacon.End}.
+     * @param {number} interval
+     * @param {Bacon.fromPoll~f} f
+     * @returns {EventStream<E, A>}
+     */
+    function fromPoll<E, A>(interval:number, f:() => Next<A>|End<A>):EventStream<E, A>;
+
+    /**
+     * @function Bacon.once
+     * @description Creates an [EventStream]{@link Bacon.EventStream} that delivers the given single `value` for the first subscriber. The stream will end immediately after this value. You can also send an [Error]{@link Bacon.Error} event instead of a `value`.
+     * @param {A|Error<E>} value
+     * @returns {EventStream<E, A>}
+     * @example
+     * Bacon.once(new Bacon.Error("fail"));
+     */
+    function once<E, A>(value:A|Error<E>):EventStream<E, A>;
+
+    /**
+     * @function
+     * @description Creates an [EventStream]{@link Bacon.EventStream} that delivers the given series of `values` (given as array) to the first subscriber. The stream ends after these values have been delivered. You can also send [Error]{@link Bacon.Error} events, or any combination of pure values and error events.
+     * @param {(A|Error<E>)[]} values
+     * @returns {EventStream<E, A>}
+     * @example
+     * Bacon.fromArray([1, new Bacon.Error("")]);
+     */
+    function fromArray<E, A>(values:(A|Error<E>)[]):EventStream<E, A>;
+
+    /**
+     * @function
+     * @description Repeats the single `value` indefinitely with the given `interval` (in milliseconds).
+     * @param {number} interval
+     * @param {A} value
+     * @returns {EventStream<E, A>}
+     */
+    function interval<E, A>(interval:number, value:A):EventStream<E, A>;
+
+    /**
+     * @function
+     * @description Creates a [EventStream]{@link Bacon.EventStream} containing given `values` (given as array) with the given `interval` (in milliseconds).
+     * @param {number} interval
+     * @param {A[]} values
+     * @returns {EventStream<E, A>}
+     */
+    function sequentially<E, A>(interval:number, values:A[]):EventStream<E, A>;
+
+    /**
+     * @function
+     * @description Repeats given `values` indefinitely with then given `interval` (in milliseconds).
+     * @param {number} interval
+     * @param {A[]} values
+     * @returns {EventStream<E, A>}
+     * @example
+     * // The following would lead to `1,2,3,1,2,3...` to be repeated indefinitely:
+     * Bacon.fromArray([1, new Bacon.Error("")]);
+     */
+    function repeatedly<E, A>(interval:number, values:A[]):EventStream<E, A>;
+
+    /**
+     * @callback Bacon.repeat~f
+     * @param {number} iteration
+     * @returns {boolean|Observable<E, A>}
+     */
+    /**
+     * @function Bacon.repeat
+     * @description Calls generator function `f` which is expected to return an [Observable]{@link Bacon.Observable}. The returned [EventStream]{@link Bacon.EventStream} contains values and errors from the spawned observable. When the spawned Observable ends, the generator `f` is called again to spawn a new Observable. This is repeated until the generator `f` returns a falsy value (such as `undefined` or `false`). The generator `f` is called with one argument — `iteration` number starting from `0`.
+     * @param {Bacon.repeat~f} f
+     * @returns {EventStream<E, A>}
+     * @example
+     * // The following will produce values `0,1,2`.
+     * Bacon.repeat(i => {
+     *     if (i < 3) {
+     *         return Bacon.once(i);
+     *     } else {
+     *         return false;
+     *     }
+     * }).log();
+     */
+    function repeat<E, A>(f:(iteration:number) => boolean|Observable<E, A>):EventStream<E, A>;
+
+    /**
+     * @function Bacon.never
+     * @description Creates an [EventStream]{@link Bacon.EventStream} that immediately ends.
+     * @returns {EventStream<E, A>}
+     */
+    function never<E, A>():EventStream<E, A>;
+
+    /**
+     * @function
+     * @description Creates a single-element [EventStream]{@link Bacon.EventStream} that produces given `value` after a given `delay` (in milliseconds).
+     * @param {number} delay
+     * @param {A} value
+     * @returns {EventStream<E, A>}
+     */
+    function later<E, A>(delay:number, value:A):EventStream<E, A>;
+
+    /**
+     * @function
+     * @description Creates a constant [Property]{@link Bacon.Property} with value `x`.
+     * @param {A} x
+     * @returns {Property<E, A>}
+     */
+    function constant<E, A>(x:A):Property<E, A>;
+
+    /**
+     * @callback Bacon.fromBinder~subscribe
+     * @param {Bacon.fromBinder~sink} sink
+     * @returns {Bacon.fromBinder~unsubscribe}
+     */
+    /**
+     * @callback Bacon.fromBinder~sink
+     * @param {More|NoMore|(A|Initial<A>|Next<A>|End<A>|Error<E>)|(A|Initial<A>|Next<A>|End<A>|Error<E>)[]} value
+     * @returns {void}
+     */
+    /**
+     * @callback Bacon.fromBinder~unsubscribe
+     * @returns {void}
+     */
+    /**
+     * @function Bacon.fromBinder
+     * @description Creates an [EventStream]{@link Bacon.EventStream} with the given [subscribe]{@link Bacon.fromBinder~subscribe} function. The parameter `subscribe` is a function that accepts a [sink]{@link Bacon.fromBinder~sink} which is a function that your `subscribe` function can "push" events to. You can push: a plain value, like `"first value"`; an [Event]{@link Bacon.Event} object including [Error]{@link Bacon.Error} (wraps an error) and [End]{@link Bacon.End} (indicates stream end); an array of event objects at once. The `subscribe` function must return a function. Let's call that function [unsubscribe]{@link Bacon.fromBinder~unsubscribe}. The returned function can be used by the subscriber (directly or indirectly) to unsubscribe from the EventStream. It should release all resources that the `subscribe` function reserved. The `sink` function may return [noMore]{@link Bacon.noMore} (as well as [more]{@link Bacon.more} or any other value). If it returns `noMore`, no further events will be consumed by the subscriber. The `subscribe` function may choose to clean up all resources at this point (e.g., by calling `unsubscribe`). This is usually not necessary, because further calls to `sink` are ignored, but doing so can increase performance in rare cases. The EventStream will wrap your `subscribe` function so that it will only be called when the first stream listener is added, and the `unsubscribe` function is called only after the last listener has been removed. The subscribe-unsubscribe cycle may of course be repeated indefinitely, so prepare for multiple calls to the `subscribe` function.
+     * @param {Bacon.fromBinder~subscribe} subscribe
+     * @returns {EventStream<E, A>}
+     * @example
+     * let stream = Bacon.fromBinder(sink => {
+     *     sink("first value");
+     *     sink([new Bacon.Next("2nd"), new Bacon.Next("3rd")]);
+     *     sink(new Bacon.Next(() => {
+     *         return "This one will be evaluated lazily"
+     *     }));
+     *     sink(new Bacon.Error("oops, an error"));
+     *     sink(new Bacon.End());
+     *     return () => {
+     *         // unsub functionality here, this one's a no-op
+     *     };
+     * });
+     * stream.log();
+     */
+    function fromBinder<E, A>(subscribe:(sink:(value:More|NoMore|(A|Initial<A>|Next<A>|End<A>|Error<E>)|(A|Initial<A>|Next<A>|End<A>|Error<E>)[]) => void) => (() => void)):EventStream<E, A>;
+
+    /**
+     * @interface
+     * @see Bacon.more
+     */
+    interface More {
+    }
+    /**
+     * @property more
+     * @constant
+     * @description The opaque value `sink` function may return. See [Bacon.fromBinder]{@link Bacon.fromBinder}.
+     */
+    var more:More;
+
+    /**
+     * @interface
+     * @see Bacon.noMore
+     */
+    interface NoMore {
+    }
+    /**
+     * @property noMore
+     * @constant
+     * @description The opaque value `sink` function may return. See [Bacon.fromBinder]{@link Bacon.fromBinder}.
+     */
+    var noMore:NoMore;
+
+    /**
+     * @class Observable
+     * @description A superclass for [EventStream]{@link Bacon.EventStream} and [Property]{@link Bacon.Property}.
+     * */
+    interface Observable<E, A> {
+        /**
+         * @callback Observable#onValue~f
+         * @param {A} value
+         * @returns {void}
+         */
+        /**
+         * @callback Observable#onValue~unsubscribe
+         * @returns {void}
+         */
+        /**
+         * @method Observable#onValue
+         * @description Subscribes a given handler function `f` to the [Observable]{@link Bacon.Observable}. Function will be called for each new value. This is the simplest way to assign a side-effect to an Observable. The difference to the [EventStream.subscribe]{@link Bacon.EventStream#subscribe} and [Property.subscribe]{@link Bacon.Property#subscribe} methods is that the actual stream `value`s are received, instead of [Event]{@link Bacon.Event} objects. [EventStream.onValue]{@link Bacon.EventStream#onValue} and [Property.onValue]{@link Bacon.Property#onValue} behave similarly, except that the latter also pushes the initial value of the Property, in case there is one.
+         * @param {Observable#onValue~f} f
+         * @returns {Observable#onValue~unsubscribe}
+         */
+        onValue(f:(value:A) => void):() => void;
+
+        /**
+         * @callback Observable#onError~f
+         * @param {E} error
+         * @returns {void}
+         */
+        /**
+         * @callback Observable#onError~unsubscribe
+         * @returns {void}
+         */
+        /**
+         * @method Observable#onError
+         * @description Subscribes a given handler function `f` to [Error]{@link Bacon.Error} events. The function `f` will be called for each error in the [Observable]{@link Bacon.Observable}.
+         * @param {Observable#onError~f} f
+         * @returns {Observable#onError~unsubscribe}
+         */
+        onError(f:(error:E) => void):() => void;
+
+        /**
+         * @callback Observable#onEnd~f
+         * @returns {void}
+         */
+        /**
+         * @callback Observable#onEnd~unsubscribe
+         * @returns {void}
+         */
+        /**
+         * @method Observable#onEnd
+         * @description Subscribes a given handler function `f` to [End]{@link Bacon.End} event. The function `f` will be called when the [Observable]{@link Bacon.Observable} ends. Just like [EventStream.subscribe]{@link Bacon.EventStream#subscribe} and [Property.subscribe]{@link Bacon.Property#subscribe}, this method returns a function for `unsubscribe`ing.
+         * @param {Observable#onEnd~f} f
+         * @returns {Observable#onEnd~unsubscribe}
+         */
+        onEnd(f:() => void):() => void;
+
+        /**
+         * @callback Observable#toPromise~promiseCtr
+         * @param {A} value
+         * @returns {Promise<A>}
+         */
+        /**
+         * @method Observable#toPromise
+         * @description Returns a Promise which will be resolved with the last event coming from an [Observable]{@link Bacon.Observable}. The global ES6 promise implementation will be used unless a promise constructor `promiseCtr` is given. Use a shim if you need to support legacy browsers or platforms.
+         * @param {Observable#toPromise~promiseCtr} [promiseCtr]
+         * @returns {Promise<A>}
+         */
+        toPromise(promiseCtr?:(value:A) => Promise<A>):Promise<A>;
+
+        /**
+         * @callback Observable#firstToPromise~promiseCtr
+         * @param {A} value
+         * @returns {Promise<A>}
+         */
+        /**
+         * @method Observable#firstToPromise
+         * @description Returns a Promise which will be resolved with the first event coming from an [Observable]{@link Bacon.Observable}. Like [Observable.toPromise]{@link Bacon.Observable#toPromise}, the global ES6 promise implementation will be used unless a promise constructor `promiseCtr` is given.
+         * @param {Observable#firstToPromise~promiseCtr} [promiseCtr]
+         * @returns {Promise<A>}
+         */
+        firstToPromise(promiseCtr?:(value:A) => Promise<A>):Promise<A>;
+
+        /**
+         * @method
+         * @description Throttles the [Observable]{@link Bacon.Observable} using a buffer so that at most one value event in `minimumInteval` is issued. Unlike [EventStream.throttle]{@link Bacon.EventStream#throttle} and [Property.throttle]{@link Bacon.Property#throttle}, it doesn't discard the excessive events but buffers them instead, outputting them with a rate of at most one value per `minimumInterval`.
+         * @param {number} minimumInterval
+         * @returns {EventStream<E, A>}
+         */
+        bufferingThrottle(minimumInterval:number):EventStream<E, A>;
+
+        /**
+         * @callback Observable#flatMap~f
+         * @param {A} value
+         * @returns {B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>}
+         */
+        /**
+         * @method Observable#flatMap
+         * @description For each element in the source [Observable]{@link Bacon.Observable}, spawn a new stream using the function `f`,  and collect events from each of the spawned streams into the result [EventStream]{@link Bacon.EventStream}. The return value of function `f` can be either an Observable (EventStream/[Property]{@link Bacon.Property}) or a constant value. The result of [flatMap]{@link Bacon.Observable#flatMap} is always an EventStream. The "Function Construction rules" apply here. `flatMap` can be used conveniently with [Bacon.once]{@link Bacon.once} and [Bacon.never]{@link Bacon.never} for converting and filtering at the same time, including only some of the results.
+         * @param {Observable#flatMap~f} f
+         * @returns {EventStream<E, B>}
+         * @example
+         * // Converting strings to integers, skipping empty values:
+         * Bacon.once("").flatMap(text => {
+         *     return text != "" ? parseInt(text) : Bacon.never();
+         * });
+         */
+        flatMap<B>(f:(value:A) => B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>):EventStream<E, B>;
+
+        /**
+         * @callback Observable#flatMapLatest~f
+         * @param {A} value
+         * @returns {B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>}
+         */
+        /**
+         * @method Observable#flatMapLatest
+         * @description For each element in the source [Observable]{@link Bacon.Observable}, spawn a new stream using the function `f`,  but instead of including events from all spawned streams, only includes them from the latest spawned stream into the result [EventStream]{@link Bacon.EventStream}. The return value of function `f` can be either an Observable (EventStream/[Property]{@link Bacon.Property}) or a constant value. The result of [flatMapLatest]{@link Bacon.Observable#flatMapLatest} is always an EventStream.
+         * @param {Observable#flatMapLatest~f} f
+         * @returns {EventStream<E, B>}
+         */
+        flatMapLatest<B>(f:(value:A) => B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>):EventStream<E, B>;
+
+        /**
+         * @callback Observable#flatMapFirst~f
+         * @param {A} value
+         * @returns {B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>}
+         */
+        /**
+         * @method Observable#flatMapFirst
+         * @description For each element in the source [Observable]{@link Bacon.Observable}, spawn a new stream using the function `f` only if the previously spawned stream has ended, and collect events from each of the spawned streams into the result [EventStream]{@link Bacon.EventStream}. The return value of function `f` can be either an Observable (EventStream/[Property]{@link Bacon.Property}) or a constant value. The result of [flatMapFirst]{@link Bacon.Observable#flatMapFirst} is always an EventStream.
+         * @param {Observable#flatMapFirst~f} f
+         * @returns {EventStream<E, B>}
+         */
+        flatMapFirst<B>(f:(value:A) => B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>):EventStream<E, B>;
+
+        /**
+         * @callback Observable#flatMapError~f
+         * @param {E} error
+         * @returns {B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>}
+         */
+        /**
+         * @method Observable#flatMapError
+         * @description For each [Error]{@link Bacon.Error} event in the source [Observable]{@link Bacon.Observable}, spawn a new stream using the function `f`,  and collect events from each of the spawned streams into the result [EventStream]{@link Bacon.EventStream}. The return value of function `f` can be either an Observable (EventStream/[Property]{@link Bacon.Property}) or a constant value. The result of [flatMapError]{@link Bacon.Observable#flatMapError} is always an EventStream.
+         * @param {Observable#flatMapError~f} f
+         * @returns {EventStream<E, B>}
+         */
+        flatMapError<B>(f:(error:E) => B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>):EventStream<E, B>;
+
+        /**
+         * @callback Observable#flatMapWithConcurrencyLimit~f
+         * @param {A} value
+         * @returns {B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>}
+         */
+        /**
+         * @method Observable#flatMapWithConcurrencyLimit
+         * @description For each element in the source [Observable]{@link Bacon.Observable}, spawn a new stream using the function `f`,  and collect events from each of the spawned streams into the result [EventStream]{@link Bacon.EventStream}, but limit the number of open spawned streams and buffers incoming events by `limit` amount. The return value of function `f` can be either an Observable (EventStream/[Property]{@link Bacon.Property}) or a constant value. [flatMapConcat]{@link Bacon.Observable#flatMapConcat} is [flatMapWithConcurrencyLimit]{@link Bacon.Observable#flatMapWithConcurrencyLimit}(1) (only one input active), and [flatMap]{@link Bacon.Observable#flatMap} is [flatMapWithConcurrencyLimit]{@link Bacon.Observable#flatMapWithConcurrencyLimit}(∞) (all inputs are piped to output). The result of `flatMapWithConcurrencyLimit` is always an EventStream.
+         * @param {number} limit
+         * @param {Observable#flatMapWithConcurrencyLimit~f} f
+         * @returns {EventStream<E, B>}
+         */
+        flatMapWithConcurrencyLimit<B>(limit:number, f:(value:A) => B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>):EventStream<E, B>;
+
+        /**
+         * @callback Observable#flatMapConcat~f
+         * @param {A} value
+         * @returns {B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>}
+         */
+        /**
+         * @method Observable#flatMapConcat
+         * @description For each element in the source [Observable]{@link Bacon.Observable}, spawn a new stream using the function `f`,  and collect events from each of the spawned streams into the result [EventStream]{@link Bacon.EventStream}, but limit the number of open spawned streams and buffers incoming events to 1. The return value of function `f` can be either an Observable (EventStream/[Property]{@link Bacon.Property}) or a constant value. The result of `flatMapConcat` is always an EventStream.
+         * @param {Observable#flatMapConcat~f} f
+         * @returns {EventStream<E, B>}
+         */
+        flatMapConcat<B>(f:(value:A) => B|Initial<B>|Next<B>|End<B>|Error<E>|Observable<E, B>):EventStream<E, B>;
+
+        /**
+         * @callback Observable#scan~f
+         * @param {B} acc
+         * @param {A} next
+         * @returns {B}
+         */
+        /**
+         * @method Observable#scan
+         * @description Scans [Observable]{@link Bacon.Observable} with given `seed` value and accumulator function `f`, resulting to a [Property]{@link Bacon.Property}. For example, you might use zero as `seed` and a "plus" function as the accumulator to create an "integral" Property. When applied to a Property as in `r = p.scan(seed, f)`, there's a (hopefully insignificant) catch: the starting value for `r` depends on whether `p` has an initial value when `scan` is applied. If there's no initial value, this works identically to `[EventStream]{@link Bacon.EventStream}.scan`: the `seed` will be the initial value of `r`. However, if `r` already has a current/initial value `x`, the seed won't be output as is. Instead, the initial value of `r` will be `f(seed, x)`. This makes sense, because there can only be 1 initial value for a Property at a time.
+         * @param {B} seed
+         * @param {Observable#scan~f} f
+         * @returns {Property<E, B>}
+         * @example
+         * Bacon.sequentially(1, [1, 2, 3]).scan(0, (a, b) => a + b);
+         */
+        scan<B>(seed:B, f:(acc:B, next:A) => B):Property<E, B>;
+
+        /**
+         * @callback Observable#fold~f
+         * @param {B} acc
+         * @param {A} next
+         * @returns {B}
+         */
+        /**
+         * @method Observable#fold
+         * @description Scans [Observable]{@link Bacon.Observable} with given `seed` value and accumulator function `f`, but only emits the final value, i.e. the value just before the Observable ends. Returns a [Property]{@link Bacon.Property}.
+         * @param {B} seed
+         * @param {Observable#fold~f} f
+         * @returns {Property<E, B>}
+         */
+        fold<B>(seed:B, f:(acc:B, next:A) => B):Property<E, B>;
+
+        /**
+         * @callback Observable#reduce~f
+         * @param {B} acc
+         * @param {A} next
+         * @returns {B}
+         */
+        /**
+         * @method Observable#reduce
+         * @description Scans [Observable]{@link Bacon.Observable} with given `seed` value and accumulator function `f`, but only emits the final value, i.e. the value just before the Observable ends. Returns a [Property]{@link Bacon.Property}.
+         * @param {B} seed
+         * @param {Observable#reduce~f} f
+         * @returns {Property<E, B>}
+         */
+        reduce<B>(seed:B, f:(acc:B, next:A) => B):Property<E, B>;
+
+        /**
+         * @callback Observable#diff~f
+         * @param {A} a
+         * @param {B} b
+         * @returns {B}
+         */
+        /**
+         * @method Observable#diff
+         * @description Returns a [Property]{@link Bacon.Property} that represents the result of a comparison `f` between the previous and current value of the [Observable]{@link Bacon.Observable}. For the initial value of the Observable, the previous value will be the given `start`.
+         * @param {A} start
+         * @param {Observable#diff~f} f
+         * @returns {Property<E, B>}
+         * @example
+         * Bacon.sequentially(1, [1, 2, 3]).diff(0, (a, b) => Math.abs(b - a));
+         */
+        diff<B>(start:A, f:(a:A, b:A) => B):Property<E, B>;
+
+        /**
+         * @callback Observable#zip~f
+         * @param {A} a
+         * @param {B} b
+         * @returns {C}
+         */
+        /**
+         * @method Observable#zip
+         * @description Returns an [EventStream]{@link Bacon.EventStream} with elements pair-wise lined up with events from this and the `other` EventStream. A zipped EventStream will publish only when it has a value from each EventStream and will only produce values up to when any single EventStream ends. The given function `f` is used to create the result value from value in the two source EventStream. If no function `f` is given, the values are zipped into an array. Be careful not to have too much "drift" between streams. If one stream produces many more values than some other excessive buffering will occur inside the zipped observable.
+         * @param {EventStream<E, B>} other
+         * @param {Observable#zip~f} f
+         * @returns {EventStream<E, C>}
+         * @example
+         * {
+         *     let x = Bacon.fromArray([1, 2]),
+         *         y = Bacon.fromArray([3, 4]);
+         *     x.zip(y, (x, y) => x + y);
+         * }
+         */
+        zip<B, C>(other:EventStream<E, B>, f:(a:A, b:B) => C):EventStream<E, C>;
+
+        /**
+         * @method
+         * @description Returns a [Property]{@link Bacon.Property} that represents a "sliding window" into the history of the values of the [Observable]{@link Bacon.Observable}. The resulting Property will have a value that is an array containing the last `n` values of the original Observable, where `n` is at most the value of the `max` argument, and at least the value of the `min` argument. If the `min` argument is omitted, there's no lower limit of values.
+         * @param {number} max
+         * @param {number} [min]
+         * @returns {Property<E, A[]>}
+         * @example
+         * // If you have a EventStream `s` with a value sequence `1,2,3,4,5`, the respective values in `s.slidingWindow(2)` would be `[],[1],[1,2],[2,3],[3,4],[4,5]`:
+         * Bacon.fromArray([1, 2, 3, 4, 5]).slidingWindow(2);
+         * // The values of `s.slidingWindow(2,2)`would be `[1,2],[2,3],[3,4],[4,5]`:
+         * Bacon.fromArray([1, 2, 3, 4, 5]).slidingWindow(2, 2);
+         */
+        slidingWindow(max:number, min?:number):Property<E, A[]>;
+
+        /**
+         * @callback Observable#combine~f
+         * @param {A} a
+         * @param {B} b
+         * @returns {C}
+         */
+        /**
+         * @method Observable#combine
+         * @description Combines the latest values of the two [EventStream]{@link Bacon.EventStream}s or [Property]{@link Bacon.Property}s using a two-arg function `f`. The result is a Property.
+         * @param {Property<E, B>} property2
+         * @param {Observable#combine~f} f
+         * @returns {Property<E, C>}
+         */
+        combine<B, C>(property2:Property<E, B>, f:(a:A, b:B) => C):Property<E, C>;
+
+        /**
+         * @callback Observable#withStateMachine~f
+         * @param {B} state
+         * @param {Initial<A>|Next<A>|End<A>|Error<E>} event
+         * @returns {[B, (Initial<C>|Next<C>|End<C>|Error<E>)[]]}
+         */
+        /**
+         * @method Observable#withStateMachine
+         * @description Lets you run a state machine on an [Observable]{@link Bacon.Observable}. Give it an initial state `initState` object and a state transformation function `f` that processes each incoming [Event]{@link Bacon.Event} and returns and array containing the next `state` and an array of output Event's.
+         * @param {B} initState
+         * @param {Observable#withStateMachine~f} f
+         * @returns {EventStream<E, C>}
+         * @example
+         * // Calculate the total sum of all numbers in the stream and output the value on stream end:
+         * Bacon.fromArray([1, 2, 3]).withStateMachine(0, (sum, event) => {
+         *     if (event.hasValue()) {
+         *         // had to cast to `number` because event:Bacon.Next<number>|Bacon.Error<{}>
+         *         return [sum + <number>event.value(), []];
+         *     } else if (event.isEnd()) {
+    	 *         return [undefined, [new Bacon.Next(sum), event]];
+    	 *     } else {
+    	 *         return [sum, [event]];
+    	 *     }
+    	 * });
+         */
+        withStateMachine<B, C>(initState:B, f:(state:B, event:Initial<A>|Next<A>|End<A>|Error<E>) => [B, (Initial<C>|Next<C>|End<C>|Error<E>)[]]):EventStream<E, C>;
+
+        /**
+         * @method
+         * @description Decodes input [Observable]{@link Bacon.Observable} using the given `mapping`. Is a bit like a switch-case or the decode function in Oracle SQL. The return value of `decode` is always a [Property]{@link Bacon.Property}.
+         * @param {Object} mapping
+         * @returns {Property<E, B>}
+         * @example
+         * {
+    	 *     let property = Bacon.fromArray([1, 2, 3]).toProperty(),
+    	 *         who = Bacon.fromArray(["A", "B", "C"]).toProperty();
+    	 *     // The following would map the value 1 into the string "mike" and the value 2 into the value of the `who` property:
+    	 *     property.decode({1: "mike", 2: who});
+    	 *     // You can compose static and dynamic data quite freely, as in:
+    	 *     property.decode({1: {type: "mike"}, 2: {type: "other", whoThen: who}});
+    	 * }
+         */
+        decode<B>(mapping:Object):Property<E, B>;
+
+        /**
+         * @method
+         * @description Creates a [Property]{@link Bacon.Property} that indicates whether Observable is awaiting `otherObservable`, i.e. has produced a value after the latest value from `otherObservable`.
+         * @param {Observable<E, B>} otherObservable
+         * @returns {Property<E, boolean>}
+         * @example
+         * {
+    	 *     // This is handy for keeping track whether we are currently awaiting an AJAX response:
+    	 *     let ajaxRequest = <Bacon.Observable<Error, JQueryXHR>>{},
+    	 *         ajaxResponse = <Bacon.Observable<Error, JQueryXHR>>{},
+    	 *         showAjaxIndicator = ajaxRequest.awaiting(ajaxResponse);
+    	 * }
+         */
+        awaiting<B>(otherObservable:Observable<E, B>):Property<E, boolean>;
+    }
+
+    /**
+     * @class EventStream
+     * @augments Bacon.Observable
+     * @description A stream of events.
+     * */
+    interface EventStream<E, A> extends Observable<E, A> {
+        /**
+         * @callback EventStream#map~f
+         * @param {A} value
+         * @returns {B}
+         */
+        /**
+         * @method EventStream#map
+         * @description Maps [EventStream]{@link Bacon.EventStream} values using given function `f`, returning a new EventStream. The `map` method, among many others, uses lazy evaluation.
+         * @param {EventStream#map~f} f
+         * @returns {EventStream<E, B>}
+         * */
+        map<B>(f:(value:A) => B):EventStream<E, B>;
+
+        /**
+         * @method
+         * @description Maps [EventStream]{@link Bacon.EventStream} values using given `constant` value, returning a new EventStream. The `map` method, among many others, uses lazy evaluation.
+         * @param {B} constant
+         * @returns {EventStream<E, B>}
+         * */
+        map<B>(constant:B):EventStream<E, B>;
+
+        /**
+         * @method
+         * @description Maps [EventStream]{@link Bacon.EventStream} values using given `propertyExtractor` string like ".keyCode", returning a new EventStream. So, if `propertyExtractor` is a string starting with a dot, the elements will be mapped to the corresponding field/function in the event value. For instance map(".keyCode") will pluck the keyCode field from the input values. If `keyCode` was a function, the result EventStream would contain the values returned by the function. The "Function Construction rules" apply here. The `map` method, among many others, uses lazy evaluation.
+         * @param {string} propertyExtractor
+         * @returns {EventStream<E, B>}
+         * */
+        map<B>(propertyExtractor:string):EventStream<E, B>;
+
+        /**
+         * @method
+         * @description Maps [EventStream]{@link Bacon.EventStream} events to the current value of the given [Property]{@link Bacon.Property} `property`. This is equivalent to [Property.sampledBy]{@link Bacon.Property#sampledBy}.
+         * @param {Property<E, B>} property
+         * @returns {EventStream<E, B>}
+         */
+        map<B>(property:Property<E, B>):EventStream<E, B>;
+
+        /**
+         * @callback EventStream#mapError~f
+         * @param {E} error
+         * @returns {B}
+         */
+        /**
+         * @method EventStream#mapError
+         * @description Maps [EventStream]{@link Bacon.EventStream} [Error]{@link Bacon.Error}s using given function `f`. More specifically, feeds the "error" field of the Error event to the function and produces a [Next]{@link Bacon.Next} event based on the return value. The "Function Construction rules" apply here.
+         * @param {EventStream#mapError~f} f
+         * @returns {EventStream<E, A|B>}
+         */
+        mapError<B>(f:(error:E) => B):EventStream<E, A|B>;
+
+        /**
+         * @method
+         * @description Returns an [EventStream]{@link Bacon.EventStream} containing [Error]{@link Bacon.Error} events only. Same as filtering with a function that always returns `false`.
+         * @returns {EventStream<E, A>}
+         */
+        errors():EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Skips all [Error]{@link Bacon.Error}s.
+         * @returns {EventStream<E, A>}
+         */
+        skipErrors():EventStream<E, A>;
+
+        /**
+         * @callback EventStream#mapEnd~f
+         * @returns {A}
+         */
+        /**
+         * @method EventStream#mapEnd
+         * @description Adds an extra [Next]{@link Bacon.Next} event just before [End]{@link Bacon.End} to [EventStream]{@link Bacon.EventStream}. The value is created by calling the given function `f` when the source [EventStream]{@link Bacon.EventStream} ends.
+         * @param {EventStream#mapEnd~f} f
+         * @returns {EventStream<E, A>}
+         */
+        mapEnd(f:() => A):EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Adds an extra [Next]{@link Bacon.Next} event just before [End]{@link Bacon.End} to [EventStream]{@link Bacon.EventStream}. A static `value` is used.
+         * @param {A} value
+         * @returns {EventStream<E, A>}
+         */
+        mapEnd(value:A):EventStream<E, A>;
+
+        /**
+         * @callback EventStream#filter~f
+         * @param {A} value
+         * @returns {boolean}
+         */
+        /**
+         * @method EventStream#filter
+         * @description Filters [EventStream]{@link Bacon.EventStream} `value`s using a given predicate function `f`.
+         * @param {EventStream#filter~f} f
+         * @returns {EventStream<E, A>}
+         */
+        filter(f:(value:A) => boolean):EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Filters [EventStream]{@link Bacon.EventStream} values using a given `constant` value (`true` to include all, `false` to exclude all).
+         * @param {boolean} bool
+         * @returns {EventStream<E, A>}
+         */
+        filter(bool:boolean):EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Filters [EventStream]{@link Bacon.EventStream} values using a given `propertyExtractor` string (like ".isValuable").
+         * @param {string} propertyExtractor
+         * @returns {EventStream<E, A>}
+         */
+        filter(propertyExtractor:string):EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Filters [EventStream]{@link Bacon.EventStream} values based on the value of a [Property]{@link Bacon.Property} `property`. [Event]{@link Bacon.Event} will be included in output IF AND ONLY IF the `property` holds `true` at the time of the event.
+         * @param {Property<E, boolean>} property
+         * @returns {EventStream<E, A>}
+         */
+        filter(property:Property<E, boolean>):EventStream<E, A>;
+
+        /**
+         * @callback EventStream#takeWhile~f
+         * @param {A} value
+         * @returns {boolean}
+         */
+        /**
+         * @method EventStream#takeWhile
+         * @description Takes [EventStream]{@link Bacon.EventStream} values while given predicate function `f` holds `true`, and then ends.
+         * @param {EventStream#takeWhile} f
+         * @returns {EventStream<E, A>}
+         */
+        takeWhile(f:(value:A) => boolean):EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Takes [EventStream]{@link Bacon.EventStream} values while the value of a `property` holds `true`, and then ends.
+         * @param {Property<E, boolean>} property
+         * @returns {EventStream<E, A>}
+         */
+        takeWhile(property:Property<E, boolean>):EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Takes at most n elements from the [EventStream]{@link Bacon.EventStream}. Equal to `Bacon.never()` if `n <= 0`.
+         * @param {number} n
+         * @returns {EventStream<E, A>}
+         */
+        take(n:number):EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Takes elements from [EventStream]{@link Bacon.EventStream} until a [Next]{@link Bacon.Next} event appears in the EventStream `stream`. If `stream` ends without value, it is ignored.
+         * @param {EventStream<E, B>} stream
+         * @returns {EventStream<E, A>}
+         */
+        takeUntil<B>(stream:EventStream<E, B>):EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Takes the first element from the [EventStream]{@link Bacon.EventStream}. Essentially [Observable.take]{@link Bacon.EventStream#take}(1).
+         * @returns {EventStream<E, A>}
+         */
+        first():EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Takes the last element from the [EventStream]{@link Bacon.EventStream}. None, if EventStream is empty.
+         * @returns {EventStream<E, A>}
+         * @example
+         * // This creates the stream which doesn't produce any events and never ends:
+         * Bacon.interval(1e1, 0).last();
+         */
+        last():EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Skips the first `n` elements from the [EventStream]{@link Bacon.EventStream}.
+         * @param {number} n
+         * @returns {EventStream<E, A>}
+         */
+        skip(n:number):EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Delays the [EventStream]{@link Bacon.EventStream} by given `delay` (in milliseconds).
+         * @param {number} delay
+         * @returns {EventStream<E, A>}
+         */
+        delay(delay:number):EventStream<E, A>;
+
+        /**
+         * @method EventStream#throttle
+         * @description Throttles the [EventStream]{@link Bacon.EventStream} by given `delay` (in milliseconds). Events are emitted with the minimum interval of `delay`. The implementation is based on [EventStream.bufferWithTime]{@link Bacon.EventStream#bufferWithTime}.
+         * @param {number} delay
+         * @returns {EventStream<E, A>}
+         */
+        throttle(delay:number):EventStream<E, A>;
+
+        /**
+         * @method EventStream#debounce
+         * @description Throttles the [EventStream]{@link Bacon.EventStream} by given `delay` (in milliseconds), but so that event is only emitted after the given "quiet period". The difference of [throttle]{@link Bacon.EventStream#throttle} and [debounce]{@link Bacon.EventStream#debounce} is the same as it is in the same methods in jQuery.
+         * @param {number} delay
+         * @returns {EventStream<E, A>}
+         */
+        debounce(delay:number):EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Passes the first event in the [EventStream]{@link Bacon.EventStream} through, but after that, only passes events after a given `delay` (in milliseconds) have passed since previous output.
+         * @param {number} delay
+         * @returns {EventStream<E, A>}
+         */
+        debounceImmediate(delay:number):EventStream<E, A>;
+
+        /**
+         * @callback EventStream#doAction~f
+         * @param {A} value
+         * @returns {void}
+         */
+        /**
+         * @method EventStream#doAction
+         * @description Returns an [EventStream]{@link Bacon.EventStream} where the function `f` is executed for each value, before dispatching to subscribers. This is useful for debugging, but also for stuff like calling the `preventDefault()` method for events.
+         * @param {EventStream#doAction~f} f
+         * @returns {EventStream<E, A>}
+         */
+        doAction(f:(value:A) => void):EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Returns an [EventStream]{@link Bacon.EventStream} where the `propertyExtractor` string is applied to each value, before dispatching to subscribers. This is useful for debugging, but also for stuff like calling the `preventDefault()` method for events.
+         * @param {string} propertyExtractor
+         * @returns {EventStream<E, A>}
+         */
+        doAction(propertyExtractor:string):EventStream<E, A>;
+
+        /**
+         * @callback EventStream#doError~f
+         * @param {E} error
+         * @returns {void}
+         */
+        /**
+         * @method EventStream#doError
+         * @description Returns an [EventStream]{@link Bacon.EventStream} where the function `f` is executed for each error, before dispatching to subscribers. That is, same as `doAction` but for errors.
+         * @param {EventStream#doError~f} f
+         * @returns {EventStream<E, A>}
+         */
+        doError(f:(error:E) => void):EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Returns an [EventStream]{@link Bacon.EventStream} that inverts boolean values.
+         * @returns {EventStream<E, boolean>}
+         */
+        not():EventStream<E, boolean>;
+
+        /**
+         * @method EventStream#log
+         * @description Logs each value of the [EventStream]{@link Bacon.EventStream} to the console. It optionally takes a `label` argument to pass to `console.log()` alongside each value. To assist with chaining, it returns the original EventStream. Note that as a side-effect, the EventStream will have a constant listener and will not be garbage-collected. So, use this for debugging only and remove from production code.
+         * @param {string} [label]
+         * @returns {EventStream<E, A>}
+         */
+        log(label?:string):EventStream<E, A>;
+
+        /**
+         * @method EventStream#doLog
+         * @description Logs each value of the [EventStream]{@link Bacon.EventStream} to the console. [doLog]{@link Bacon.EventStream#doLog} behaves like [log]{@link Bacon.EventStream#log} but does not subscribe to the EventStream. You can think of `doLog` as a logger function that – unlike `log` – is safe to use in production. `doLog` is safe, because it does not cause the same surprising side-effects as `log` does.
+         * @returns {EventStream<E, A>}
+         */
+        doLog():EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Ends the [EventStream]{@link Bacon.EventStream} on first [Error]{@link Bacon.Error} event. The error is included in the output of the returned EventStream.
+         * @returns {EventStream<E, A>}
+         */
+        endOnError():EventStream<E, A>;
+
+        /**
+         * @callback EventStream#endOnError~f
+         * @param {E} error
+         * @returns {boolean}
+         */
+        /**
+         * @method EventStream#endOnError
+         * @description Ends the [EventStream]{@link Bacon.EventStream} on first [Error]{@link Bacon.Error} event for which the given predicate function `f` returns `true`. The error is included in the output of the returned EventStream.
+         * @param {EventStream#endOnError} f
+         * @returns {EventStream<E, A>}
+         */
+        endOnError(f:(error:E) => boolean):EventStream<E, A>;
+
+        /**
+         * @callback EventStream#withHandler~f
+         * @param {Initial<A>|Next<A>|End<A>|Error<E>} event
+         * @returns {*}
+         */
+        /**
+         * @method EventStream#withHandler
+         * @description Lets you do more custom event handling on [EventStream]{@link Bacon.EventStream}: you get all events to your function `f` and you can output any number of events and end the stream if you choose. Note that it's important to return the value from `this.push` so that the connection to the underlying stream will be closed when no more events are needed.
+         * @param {EventStream#withHandler~f} f
+         * @returns {EventStream<E, A>}
+         * @example
+         * // Send an error and end the stream in case a value is below zero:
+         * Bacon.fromArray([1, 2, -3, 3]).withHandler(function (event) {
+    	 *     if (event.hasValue() && event.value() < 0) {
+    	 *         this.push(new Bacon.Error("Value below zero"));
+    	 *         return this.push(new Bacon.End());
+    	 *     } else {
+    	 *         return this.push(event);
+    	 *     }
+    	 * });
+         */
+        withHandler(f:(event:Initial<A>|Next<A>|End<A>|Error<E>) => any):EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Sets the name of the [EventStream]{@link Bacon.EventStream}. Overrides the default implementation of `toString` and `inspect`. Returns itself.
+         * @param {string} newName
+         * @returns {EventStream<E, A>}
+         */
+        name(newName:string):EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Sets the structured description of the [EventStream]{@link Bacon.EventStream}. The `toString` and `inspect` methods use this data recursively to create a string representation for the `EventStream`. This method is probably useful for Bacon core/library/plugin development only.
+         * @param {...*} param
+         * @returns {EventStream<E, A>}
+         * @example
+         * {
+    	 *     let src = Bacon.once(1),
+    	 *         obs = src.map(x => -x);
+    	 *
+    	 *     console.log(obs.toString());
+    	 *     // Bacon.once(1).map(function)
+    	 *
+    	 *     obs.withDescription(src, "times", -1);
+    	 *     console.log(obs.toString());
+    	 *     // Bacon.once(1).times(-1)
+    	 */
+        withDescription(...param:any[]):EventStream<E, A>;
+
+        /**
+         * @callback EventStream#groupBy1~keyF
+         * @param {A} value
+         * @returns {B}
+         */
+        /**
+         * @method EventStream#groupBy1
+         * @description Groups [EventStream]{@link Bacon.EventStream} events to new EventStream's by `keyF`.
+         * @param {EventStream#groupBy1~keyF} keyF
+         * @returns {EventStream<E, EventStream<E, A>>}
+         */
+        groupBy<B>(keyF:(value:A) => B):EventStream<E, EventStream<E, A>>;
+
+        /**
+         * @callback keyF
+         * @param {A} value
+         * @returns {B}
+         */
+        /**
+         * @callback limitF
+         * @param {EventStream<E, A>} groupedStream
+         * @param {Initial<A>|Next<A>|End<A>|Error<E>} groupStartingEvent
+         * @returns {EventStream<E, C>}
+         */
+        /**
+         * @description Groups [EventStream]{@link Bacon.EventStream} events to new EventStream's by `keyF`. `limitF` is provided to limit grouped stream life. EventStream transformed by `limitF` is passed on if provided. `limitF` gets grouped stream and the original [Event]{@link Bacon.Event} causing the EventStream to start as parameters.
+         * @param {keyF} keyF
+         * @param {limitF} limitF
+         * @returns {EventStream<E, EventStream<E, C>>} Grouped streams.
+         */
+        groupBy<B, C>(keyF:(value:A) => B, limitF:(groupedStream:EventStream<E, A>, groupStartingEvent:Initial<A>|Next<A>|End<A>|Error<E>) => EventStream<E, C>):EventStream<E, EventStream<E, C>>;
+
+        /**
+         * @callback EventStream#subscribe~f
+         * @param {Event<A>} event
+         * @returns {void|NoMore}
+         */
+        /**
+         * @callback EventStream#subscribe~unsubscribe
+         * @returns {void}
+         */
+        /**
+         * @method EventStream#subscribe
+         * @description Subscribes a given handler function `f` to [EventStream]{@link Bacon.EventStream}. Function will receive [Event]{@link Bacon.Event} objects. The [subscribe]{@link EventStream#subscribe} call returns an [unsubscribe function]{@link EventStream#subscribe~unsubscribe} that you can call to unsubscribe. You can also unsubscribe by returning [Bacon.noMore]{@link Bacon.noMore} from the handler function as a reply to an Event.
+         * @param {EventStream#subscribe~f} f
+         * @returns {EventStream#subscribe~unsubscribe}
+         */
+        subscribe(f:(event:Event<A>) => void|NoMore):() => void;
+
+        /**
+         * @callback EventStream#onValue~f
+         * @param {A} value
+         * @returns {void}
+         */
+        /**
+         * @callback EventStream#onValue~unsubscribe
+         * @returns {void}
+         */
+        /**
+         * @method EventStream#onValue
+         * @description Subscribes a given handler function `f` to [EventStream]{@link Bacon.EventStream}. Function will be called for each new value in the EventStream. This is the simplest way to assign a side-effect to a EventStream. The difference to the [subscribe]{@link Bacon.EventStream#subscribe} method is that the actual EventStream values are received, instead of [Event]{@link Bacon.Event} objects. Just like `subscribe`, this method returns a function for `unsubscribe`ing.
+         * @param {EventStream#onValue~f} f
+         * @returns {EventStream#onValue~unsubscribe}
+         */
+        onValue(f:(value:A) => void):() => void;
+
+        /**
+         * @callback EventStream#onValues~f
+         * @param {*[]} args
+         * @returns {void}
+         */
+        /**
+         * @callback EventStream#onValues~unsubscribe
+         * @returns {void}
+         */
+        /**
+         * @method EventStream#onValues
+         * @description Subscribes a given handler function `f` to [EventStream]{@link Bacon.EventStream}. Like [EventStream.onValue]{@link Bacon.EventStream#onValue}, but splits the value (assuming its an array) as function arguments to `f`.
+         * @param {EventStream#onValues~f} f
+         * @returns {EventStream#onValues~unsubscribe}
+         */
+        onValues(f:(...args:any[]) => void):() => void;
+
+        /**
+         * @callback EventStream#skipDuplicates~isEqual
+         * @param {A} oldValue
+         * @param {A} newValue
+         * @returns {boolean}
+         */
+        /**
+         * @method EventStream#skipDuplicates
+         * @description Drops consecutive equal elements of the [EventStream]{@link Bacon.EventStream}. Uses the === operator for equality checking by default. If the `isEqual` argument is supplied, checks by calling [isEqual]{@link EventStream#skipDuplicates~isEqual}. For instance, to do a deep comparison, you can use the `isEqual` function from underscore.js like `stream.skipDuplicates(_.isEqual)`.
+         * @param {EventStream#skipDuplicates~isEqual} [isEqual]
+         * @returns {EventStream<E, A>}
+         * @example
+         * Bacon.fromArray([1, 2, 2, 1]).skipDuplicates().log();
+         * // > returns [1, 2, 1] in an order
+         */
+        skipDuplicates(isEqual?:(oldValue:A, newValue:A) => boolean):EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Concatenates two [EventStream]{@link Bacon.EventStream}s into one so that it will deliver events from EventStream until it ends and then deliver events from `otherStream`. This means too that events from `otherStream`, occurring before the end of EventStream will not be included in the result EventStream.
+         * @param {EventStream<E, A>} otherStream
+         * @returns {EventStream<E, A>}
+         */
+        concat(otherStream:EventStream<E, A>):EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Merges two [EventStream]{@link Bacon.EventStream}s into one that delivers events from both.
+         * @param {EventStream<E, A>} otherStream
+         * @returns {EventStream<E, A>}
+         */
+        merge(otherStream:EventStream<E, A>):EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Pauses and buffers the [EventStream]{@link Bacon.EventStream} if last event in `valve` is truthy. All buffered events are released when `valve` becomes falsy.
+         * @param {Observable<E, B>} valve
+         * @returns {EventStream<E, A>}
+         */
+        holdWhen<B>(valve:Observable<E, B>):EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Adds a starting `value` to the [EventStream]{@link Bacon.EventStream}, i.e. concats a EventStream containing a single `value` with this EventStream.
+         * @param {A} value
+         * @returns {EventStream<E, A>}
+         */
+        startWith(value:A):EventStream<E, A>;
+
+        /**
+         * @callback EventStream#skipWhile~f
+         * @param {A} value
+         * @returns {boolean}
+         */
+        /**
+         * @method EventStream#skipWhile
+         * @description Skips elements in the [EventStream]{@link Bacon.EventStream} until the given predicate function `f` returns falsy once, and then lets all events pass through.
+         * @param {EventStream#skipWhile~f} f
+         * @returns {EventStream<E, A>}
+         */
+        skipWhile(f:(value:A) => boolean):EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Skips elements in the [EventStream]{@link Bacon.EventStream} until the value of the given [Property]{@link Bacon.Property} `property` is falsy once, and then lets all events pass through.
+         * @param {Property<E, B>} property
+         * @returns {EventStream<E, A>}
+         */
+        skipWhile<B>(property:Property<E, B>):EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Skips elements from the [EventStream]{@link Bacon.EventStream} until a [Next]{@link Bacon.Next} event appears in `stream2`. In other words, starts delivering values from `stream` after first event appears in `stream2`.
+         * @param {EventStream<E, B>} stream2
+         * @returns {EventStream<E, A>}
+         */
+        skipUntil<B>(stream2:EventStream<E, B>):EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Buffers the [EventStream]{@link Bacon.EventStream} with given `delay` (in milliseconds). The buffer is flushed at most once in the given `delay`.
+         * @param {number} delay
+         * @returns {EventStream<E, A[]>}
+         * @example
+         * // You might get two events containing [1,2,3,4] and [5,6,7] respectively, given that the flush occurs between numbers 4 and 5:
+         * Bacon.fromArray([1, 2, 3, 4, 5, 6, 7]).bufferWithTime(0);
+         */
+        bufferWithTime(delay:number):EventStream<E, A[]>;
+
+        /**
+         * @callback EventStream#bufferWithTime~f
+         * @param {EventStream#bufferWithTime~defer} defer
+         * @returns {void}
+         */
+        /**
+         * @callback EventStream#bufferWithTime~defer
+         * @param {...*} args
+         * @returns {void}
+         */
+        /**
+         * @method EventStream#bufferWithTime
+         * @description Buffers the [EventStream]{@link Bacon.EventStream} with given "defer-function" `f`.
+         * @param {EventStream#bufferWithTime~f} f
+         * @returns {EventStream<E, A[]>}
+         * @example
+         * // Here's an equivalent to `stream.bufferWithTime(10)`:
+         * let stream = Bacon.fromArray([1, 2, 3, 4, 5, 6, 7]);
+         * stream.bufferWithTime(f => { setTimeout(f, 10); }); }
+         */
+        bufferWithTime(f:(defer:(...args:any[]) => void) => void):EventStream<E, A[]>;
+
+        /**
+         * @method
+         * @description Buffers the [EventStream]{@link Bacon.EventStream} events with given `count`. The buffer is flushed when it contains the given `count` of elements.
+         * @param {number} count
+         * @returns {EventStream<E, A[]>}
+         * @example
+         * // You will get output events with values `[1, 2]`, `[3, 4]` and `[5]`.
+         * Bacon.fromArray([1, 2, 3, 4, 5]).bufferWithCount(2);
+         */
+        bufferWithCount(count:number):EventStream<E, A[]>;
+
+        /**
+         * @method
+         * @description Buffers the [EventStream]{@link Bacon.EventStream} events and flushes when either the buffer contains the given `count` of elements or the given `delay` (in milliseconds) has passed since last buffered event.
+         * @param {number} delay
+         * @param {number} count
+         * @returns {EventStream<E, A[]>}
+         */
+        bufferWithTimeOrCount(delay:number, count:number):EventStream<E, A[]>;
+
+        /**
+         * @method EventStream#toProperty
+         * @description Creates a [Property]{@link Bacon.Property} based on the [EventStream]{@link Bacon.EventStream}. Without arguments, you'll get a Property without an initial value and will get its first actual value from the EventStream, and after that it'll always have a current value. Given `initialValue` will be used as the current value until the first value comes from the EventStream.
+         * @param {A} [initialValue]
+         * @returns {Property<E, A>}
+         */
+        toProperty(initialValue?:A):Property<E, A>;
+    }
+
+    var EventStream:{
+        /**
+         * @callback EventStream#new~subscribe
+         * @param {EventStream#new~sink} sink
+         * @returns {EventStream#new~unsubscribe}
+         */
+        /**
+         * @callback EventStream#new~sink
+         * @param {More|NoMore|(A|Initial<A>|Next<A>|End<A>|Error<E>)|(A|Initial<A>|Next<A>|End<A>|Error<E>)[]} value
+         * @returns {void}
+         */
+        /**
+         * @callback EventStream#new~unsubscribe
+         * @returns {void}
+         */
+        /**
+         * @constructor EventStream#new
+         * @constructs Bacon.EventStream
+         * @description Creates an [EventStream]{@link Bacon.EventStream} with the given `subscribe` function.
+         * @param {EventStream#new~subscribe} subscribe
+         * @returns {EventStream<E, A>}
+         */
+        new<E, A>(subscribe:(sink:(value:More|NoMore|(A|Initial<A>|Next<A>|End<A>|Error<E>)|(A|Initial<A>|Next<A>|End<A>|Error<E>)[]) => void) => (() => void)):EventStream<E, A>;
+    };
+
+    /**
+     * @class Property
+     * @augments Bacon.Observable
+     * @description A reactive property. Has the concept of "current value". You can create a Property from an [EventStream]{@link Bacon.EventStream} by using either [EventStream.toProperty]{@link Bacon.EventStream#toProperty} or [Observable.scan]{@link Bacon.Observable#scan} method. Note: depending on how a Property is created, it may or may not have an initial value. The current value stays as its last value after the EventStream has ended.
+     * */
+    interface Property<E, A> extends Observable<E, A> {
+        /**
+         * @callback Property#map~f
+         * @param {A} value
+         * @returns {B}
+         */
+        /**
+         * @method Property#map
+         * @description Maps the [Property]{@link Bacon.Property} values using given function `f`, returning a new Property. This method, among many others, uses lazy evaluation.
+         * @param {Property#map~f} f
+         * @returns {Property<E, B>}
+         * */
+        map<B>(f:(value:A) => B):Property<E, B>;
+
+        /**
+         * @method
+         * @description Maps the [Property]{@link Bacon.Property} values using given `constant` value, returning a new Property. This method, among many others, uses lazy evaluation.
+         * @param {B} constant
+         * @returns {Property<E, B>}
+         * */
+        map<B>(constant:B):Property<E, B>;
+
+        /**
+         * @method
+         * @description Maps the [Property]{@link Bacon.Property} values using given `propertyExtractor` string like ".keyCode", returning a new Property. So, if f is a string starting with a dot, the elements will be mapped to the corresponding field/function in the event value. For instance map(".keyCode") will pluck the keyCode field from the input values. If "keyCode" was a function, the resulting Property would contain the values returned by the function. This method, among many others, uses lazy evaluation.
+         * @param {string} propertyExtractor
+         * @returns {Property<E, B>}
+         * */
+        map<B>(propertyExtractor:string):Property<E, B>;
+
+        /**
+         * @callback Property#mapError~f
+         * @param {E} error
+         * @returns {B}
+         */
+        /**
+         * @method Property#mapError
+         * @description Maps the [Property]{@link Bacon.Property} errors using given function `f`. More specifically, feeds the "error" field of the [Error]{@link Bacon.Error} event to the function `f` and produces a [Next]{@link Bacon.Next} event based on the return value.
+         * @param {Property#mapError~f} f
+         * @returns {Property<E, A|B>}
+         */
+        mapError<B>(f:(error:E) => B):Property<E, A|B>;
+
+        /**
+         * @method
+         * @description Returns a [Property]{@link Bacon.Property} containing [Error]{@link Bacon.Error} events only. Same as filtering with a function that always returns false.
+         * @returns {Property<E, A>}
+         */
+        errors():Property<E, A>;
+
+        /**
+         * @method
+         * @description Skips all [Error]{@link Bacon.Error}s.
+         * @returns {Property<E, A>}
+         */
+        skipErrors():Property<E, A>;
+
+        /**
+         * @callback Property#mapEnd~f
+         * @returns {A}
+         */
+        /**
+         * @method Property#mapEnd
+         * @description Adds an extra [Next]{@link Bacon.Next} event just before [End]{@link Bacon.End} of the [Property]{@link Bacon.Property}. The value is created by calling the given function `f` when the source Property ends.
+         * @param {Property#mapEnd~f} f
+         * @returns {Property<E, A>}
+         */
+        mapEnd(f:() => A):Property<E, A>;
+
+        /**
+         * @method
+         * @description Adds an extra [Next]{@link Bacon.Next} event just before [End]{@link Bacon.End} of the [Property]{@link Bacon.Property}. A static `value` is used.
+         * @param {A} value
+         * @returns {Property<E, A>}
+         */
+        mapEnd(value:A):Property<E, A>;
+
+        /**
+         * @callback Property#filter~f
+         * @param {A} value
+         * @returns {boolean}
+         */
+        /**
+         * @method Property#filter
+         * @description Filters the [Property]{@link Bacon.Property} values using a given predicate function `f`.
+         * @param {Property#filter~f} f
+         * @returns {Property<E, A>}
+         */
+        filter(f:(value:A) => boolean):Property<E, A>;
+
+        /**
+         * @method
+         * @description Filters the [Property]{@link Bacon.Property} values using a given constant `bool` value (`true` to include all, `false` to exclude all).
+         * @param {boolean} bool
+         * @returns {Property<E, A>}
+         */
+        filter(bool:boolean):Property<E, A>;
+
+        /**
+         * @method
+         * @description Filters the [Property]{@link Bacon.Property} values using a given `propertyExtractor` string (like ".isValuable").
+         * @param {string} propertyExtractor
+         * @returns {Property<E, A>}
+         */
+        filter(propertyExtractor:string):Property<E, A>;
+
+        /**
+         * @method
+         * @description Filters the [Property]{@link Bacon.Property} values based on the value of the Property `property`. Event will be included in output IF AND ONLY IF the `property` holds `true` at the time of the event.
+         * @param {Property<E, boolean>} property
+         * @returns {Property<E, A>}
+         */
+        filter(property:Property<E, boolean>):Property<E, A>;
+
+        /**
+         * @callback Property#takeWhile~f
+         * @param {A} value
+         * @returns {boolean}
+         */
+        /**
+         * @method Property#takeWhile
+         * @description Takes the [Property]{@link Bacon.Property} values while given predicate function `f` holds `true`, and then ends.
+         * @param {Property#takeWhile~f} f
+         * @returns {Property<E, A>}
+         */
+        takeWhile(f:(value:A) => boolean):Property<E, A>;
+
+        /**
+         * @method
+         * @description Takes the [Property]{@link Bacon.Property} values while the value of a `property` holds `true`, and then ends.
+         * @param {Property<E, boolean>} property
+         * @returns {Property<E, A>}
+         */
+        takeWhile(property:Property<E, boolean>):Property<E, A>;
+
+        /**
+         * @method Property#take
+         * @description Takes at most `n` elements from the [Property]{@link Bacon.Property}. Equal to `Bacon.never()` if `n <= 0`.
+         * @param {number} n
+         * @returns {Property<E, A>}
+         */
+        take(n:number):Property<E, A>;
+
+        /**
+         * @method
+         * @description Takes elements from the [Property]{@link Bacon.Property} until a [Next]{@link Bacon.Next} event appears in the `stream`. If `stream` ends without value, it is ignored.
+         * @param {EventStream<E, B>} stream
+         * @returns {Property<E, A>}
+         */
+        takeUntil<B>(stream:EventStream<E, B>):Property<E, A>;
+
+        /**
+         * @method
+         * @description Takes the first element from the [Property]{@link Bacon.Property}. Essentially [Property.take]{@link Bacon.Property#take}(1).
+         * @returns {Property<E, A>}
+         */
+        first():Property<E, A>;
+
+        /**
+         * @method
+         * @description Takes the last element from the [Property]{@link Bacon.Property}. None, if Property is empty.
+         * @returns {Property<E, A>}
+         * @example
+         * // This creates the property which doesn't produce any events and never ends:
+         * Bacon.interval(1e1, 0).toProperty().last();
+         */
+        last():Property<E, A>;
+
+        /**
+         * @method
+         * @description Skips the first `n` elements from the [Property]{@link Bacon.Property}.
+         * @param {number} n
+         * @returns {Property<E, A>}
+         */
+        skip(n:number):Property<E, A>;
+
+        /**
+         * @method
+         * @description Delays the [Property]{@link Bacon.Property} by given `delay` (in milliseconds). Does not delay the initial value of a Property.
+         * @param {number} delay
+         * @returns {Property<E, A>}
+         */
+        delay(delay:number):Property<E, A>;
+
+        /**
+         * @method Property#throttle
+         * @description Throttles the [Property]{@link Bacon.Property} by given `delay` (in milliseconds). Events are emitted with the minimum interval of `delay`. The implementation is based on [EventStream.bufferWithTime]{@link Bacon.EventStream#bufferWithTime}. Does not affect emitting the initial value of a Property.
+         * @param {number} delay
+         * @returns {Property<E, A>}
+         */
+        throttle(delay:number):Property<E, A>;
+
+        /**
+         * @method Property#debounce
+         * @description Throttles the [Property]{@link Bacon.Property} by given `delay` (in milliseconds), but so that event is only emitted after the given "quiet period". Does not affect emitting the initial value of a Property. The difference of [throttle]{@link Bacon.Property#throttle} and [debounce]{@link Bacon.Property#debounce} is the same as it is in the same methods in jQuery.
+         * @param {number} delay
+         * @returns {Property<E, A>}
+         */
+        debounce(delay:number):Property<E, A>;
+
+        /**
+         * @method
+         * @description Passes the first event in the [Property]{@link Bacon.Property} through, but after that, only passes events after a given `delay` (in milliseconds) have passed since previous output.
+         * @param {number} delay
+         * @returns {Property<E, A>}
+         */
+        debounceImmediate(delay:number):Property<E, A>;
+
+        /**
+         * @callback Property#doAction~f
+         * @param {A} value
+         * @returns {void}
+         */
+        /**
+         * @method Property#doAction
+         * @description Returns a [Property]{@link Bacon.Property} where the function `f` is executed for each value, before dispatching to subscribers. This is useful for debugging, but also for stuff like calling the `preventDefault()` method for events.
+         * @param {Property#doAction~f} f
+         * @returns {Property<E, A>}
+         */
+        doAction(f:(value:A) => void):Property<E, A>;
+
+        /**
+         * @method
+         * @description Returns a [Property]{@link Bacon.Property} where the `propertyExtractor` string is applied to each value, before dispatching to subscribers. This is useful for debugging, but also for stuff like calling the `preventDefault()` method for events.
+         * @param {string} propertyExtractor
+         * @returns {Property<E, A>}
+         */
+        doAction(propertyExtractor:string):Property<E, A>;
+
+        /**
+         * @callback Property#doError~f
+         * @param {E} error
+         * @returns {void}
+         */
+        /**
+         * @method Property#doError
+         * @description Returns a [Property]{@link Bacon.Property} where the function `f` is executed for each error, before dispatching to subscribers. That is, same as [doAction]{@link Bacon.Property#doAction} but for [Error]{@link Bacon.Error}s.
+         * @param {Property#doError~f} f
+         * @returns {Property<E, A>}
+         */
+        doError(f:(error:E) => void):Property<E, A>;
+
+        /**
+         * @method
+         * @description Returns a [Property]{@link Bacon.Property} that inverts boolean values.
+         * @returns {Property<E, boolean>}
+         */
+        not():Property<E, boolean>;
+
+        /**
+         * @method Property#log
+         * @description Logs each value of the [Property]{@link Bacon.Property} to the console. It optionally takes a `label` argument to pass to `console.log()` alongside each value. To assist with chaining, it returns the original Property. Note that as a side-effect, the Property will have a constant listener and will not be garbage-collected. So, use this for debugging only and remove from production code.
+         * @param {string} [label]
+         * @returns {Property<E, A>}
+         */
+        log(label?:string):Property<E, A>;
+
+        /**
+         * @method Property#doLog
+         * @description Logs each value of the [Property]{@link Bacon.Property} to the console. [doLog]{@link Bacon.Property#doLog} behaves like [log]{@link Bacon.Property#log} but does not subscribe to the Property. You can think of `doLog` as a logger function that – unlike `log` – is safe to use in production. `doLog` is safe, because it does not cause the same surprising side-effects as `log` does.
+         * @returns {Property<E, A>}
+         */
+        doLog():Property<E, A>;
+
+        /**
+         * @method
+         * @description Ends the [Property]{@link Bacon.Property} on first [Error]{@link Bacon.Error} event. The error is included in the output of the returned Property.
+         * @returns {Property<E, A>}
+         */
+        endOnError():Property<E, A>;
+
+        /**
+         * @callback Property#endOnError~f
+         * @param {E} error
+         * @returns {boolean}
+         */
+        /**
+         * @method Property#endOnError
+         * @description Ends the [Property]{@link Bacon.Property} on first [Error]{@link Bacon.Error} event for which the given predicate function `f` returns `true`. The error is included in the output of the returned Property.
+         * @param {Property#endOnError~f} f
+         * @returns {Property<E, A>}
+         */
+        endOnError(f:(error:E) => boolean):Property<E, A>;
+
+        /**
+         * @callback Property#withHandler~f
+         * @param {Initial<A>|Next<A>|End<A>|Error<E>} event
+         * @returns {*}
+         */
+        /**
+         * @method Property#withHandler
+         * @description Lets you do more custom event handling on the [Property]{@link Bacon.Property}: you get all events to your function `f` and you can output any number of [Event]{@link Bacon.Event}s and end the Property if you choose. Note that it's important to return the value from `this.push` so that the connection to the underlying stream will be closed when no more events are needed.
+         * @param {Property#withHandler~f} f
+         * @returns {Property<E, A>}
+         * @example
+         * // Send an error and end the stream in case a value is below zero:
+         * Bacon.fromArray([1, 2, -3, 3]).withHandler(function (event) {
+    	 *     if (event.hasValue() && event.value() < 0) {
+    	 *         this.push(new Bacon.Error("Value below zero"));
+    	 *         return this.push(new Bacon.End());
+    	 *     } else {
+    	 *         return this.push(event);
+    	 *     }
+    	 * });
+         */
+        withHandler(f:(event:Initial<A>|Next<A>|End<A>|Error<E>) => any):Property<E, A>;
+
+        /**
+         * @method
+         * @description Sets the `newName` of the [Property]{@link Bacon.Property}. Overrides the default implementation of `toString` and `inspect`. Returns itself.
+         * @param {string} newName
+         * @returns {Property<E, A>}
+         */
+        name(newName:string):Property<E, A>;
+
+        /**
+         * @method
+         * @description Sets the structured description of the [Property]{@link Bacon.Property}. The `toString` and `inspect` methods use this data recursively to create a string representation for the Property. This method is probably useful for Bacon core/library/plugin development only.
+         * @param {...*} param
+         * @returns {Property<E, A>}
+         * @example
+         * let src = Bacon.once(1),
+         *   obs = src.map(x => -x);
+         *
+         * console.log(obs.toString());
+         * // Bacon.once(1).map(function)
+         *
+         * obs.withDescription(src, "times", -1);
+         * console.log(obs.toString());
+         * // Bacon.once(1).times(-1)
+         */
+        withDescription(...param:any[]):Property<E, A>;
+
+        /**
+         * @method
+         * @description Creates an [EventStream]{@link Bacon.EventStream} based on this [Property]{@link Bacon.Property}. The EventStream contains also an event for the current value of this Property at the time this method was called.
+         * @returns {EventStream<E, A>}
+         */
+        toEventStream():EventStream<E, A>;
+
+        /**
+         * @callback Property#subscribe~f
+         * @param {Event<A>} event
+         * @returns {void}
+         */
+        /**
+         * @callback Property#subscribe~unsubscribe
+         * @returns {void}
+         */
+        /**
+         * @method Property#subscribe
+         * @description Subscribes a handler function `f` to [Property]{@link Bacon.Property}. If there's a current value, an [Initial]{@link Bacon.Initial} event will be pushed immediately. [Next]{@link Bacon.Next} event will be pushed on updates and an [End]{@link Bacon.End} event in case the source Property ends. Returns a function that you call to `unsubscribe`.
+         * @param {Property#subscribe~f} f
+         * @returns {Property#subscribe~unsubscribe}
+         */
+        subscribe(f:(event:Event<A>) => void):() => void;
+
+        /**
+         * @callback Property#onValue~f
+         * @param {A} value
+         * @returns {void}
+         */
+        /**
+         * @callback Property#onValue~unsubscribe
+         * @returns {void}
+         */
+        /**
+         * @method Property#onValue
+         * @description Subscribes a handler function `f` to [Property]{@link Bacon.Property}. Similar to [EventStream.onValue]{@link Bacon.EventStream#onValue}, except that also pushes the initial value of the Property, in case there is one. Just like [subscribe]{@link Bacon.Property#subscribe}, this method returns a function for `unsubscribe`ing.
+         * @param {Property#onValue~f} f
+         * @returns {Property#onValue~unsubscribe}
+         */
+        onValue(f:(value:A) => void):() => void;
+
+        /**
+         * @callback Property#onValues~f
+         * @param {*[]} args
+         * @returns {void}
+         */
+        /**
+         * @callback Property#onValues~unsubscribe
+         * @returns {void}
+         */
+        /**
+         * @method Property#onValues
+         * @description Subscribes a handler function `f` to [Property]{@link Bacon.Property}. Like [onValue]{@link Bacon.Property#onValue}, but splits the value (assuming its an array) as function arguments to `f`.
+         * @param {Property#onValues~f} f
+         * @returns {Property#onValues~unsubscribe}
+         */
+        onValues(f:(...args:any[]) => void):() => void;
+
+        /**
+         * @method Property#assign
+         * @description Calls the `method` of the given `object` with each value of this [Property]{@link Bacon.Property}. You can optionally supply `params` which will be used as the first arguments of the `method` call. Note that the [assign]{@link Bacon.Property#assign} method is actually just a synonym for [onValue]{@link Bacon.Property#onValue}.
+         * @param {Object} obj
+         * @param {string} method
+         * @param {...*} params
+         * @returns {void}
+         * @example
+         * let property = Bacon.fromArray([1, 2, 3, 4, 5]).toProperty();
+         * // If you want to assign your Property to the "disabled" attribute of a JQuery object, you can do this:
+         * property.assign($("#my-button"), "attr", "disabled");
+         * // A simpler example would be to toggle the visibility of an element based on a Property:
+         * property.assign($("#my-button"), "toggle");
+         */
+        assign(obj:Object, method:string, ...params:any[]):void;
+
+        /**
+         * @method
+         * @description Creates an [EventStream]{@link Bacon.EventStream} by sampling the [Property]{@link Bacon.Property} value at given `interval` (in milliseconds).
+         * @param {number} interval
+         * @returns {EventStream<E, A>}
+         */
+        sample(interval:number):EventStream<E, A>;
+
+        /**
+         * @method Property#sampledBy
+         * @description Creates an [EventStream]{@link Bacon.EventStream} by sampling the [Property]{@link Bacon.Property} value at each event from the given `stream`. The result EventStream will contain the value at each event in the source Property.
+         * @param {EventStream<E, B>} stream
+         * @returns {EventStream<E, A>}
+         */
+        sampledBy<B>(stream:EventStream<E, B>):EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Creates a [Property]{@link Bacon.Property} by sampling the value at each event from the given [Property]{@link Bacon.Property} `property`. The result Property will contain the value at each event in the source Property.
+         * @param {Property<E, B>} property
+         * @returns {Property<E, A>}
+         */
+        sampledBy<B>(property:Property<E, B>):Property<E, A>;
+
+        /**
+         * @callback Property#sampledBy~f
+         * @param {A} propertyValue
+         * @param {B} samplerValue
+         * @returns {C}
+         */
+        /**
+         * @method Property#sampledBy
+         * @description Samples the [Property]{@link Bacon.Property} on `streamOrProperty` events. The result values will be formed using the given function `f`.
+         * @param {Observable<E, B>} streamOrProperty
+         * @param {Property#sampledBy~f} f
+         * @returns {EventStream<E, C>}
+         */
+        sampledBy<B, C>(streamOrProperty:Observable<E, B>, f:(propertyValue:A, samplerValue:B) => C):EventStream<E, C>;
+
+        /**
+         * @callback Property#skipDuplicates~isEqual
+         * @param {A} oldValue
+         * @param {A} newValue
+         * @returns {boolean}
+         */
+        /**
+         * @method Property#skipDuplicates
+         * @description Drops consecutive equal elements. Uses the `===` operator for equality checking by default. If the `isEqual` argument is supplied, checks by calling `isEqual(oldValue, newValue)`. The old name for this method was `distinctUntilChanged`.
+         * @param {Property#skipDuplicates~isEqual} [isEqual]
+         * @returns {Property<E, A>}
+         */
+        skipDuplicates(isEqual?:(oldValue:A, newValue:A) => boolean):Property<E, A>;
+
+        /**
+         * @method Property#changes
+         * @description Returns an [EventStream]{@link Bacon.EventStream} of [Property]{@link Bacon.Property} value changes. Returns exactly the same events as the Property itself, except any [Initial]{@link Bacon.Initial} events (the stream DOES NOT include an event for the current value of the Property at the time this method was called). Note that [Property.changes]{@link Bacon.Property#changes} DOES NOT skip duplicate values, use [Property.skipDuplicates]{@link Bacon.Property#skipDuplicates} for that.
+         * @returns {EventStream<E, A>}
+         */
+        changes():EventStream<E, A>;
+
+        /**
+         * @method
+         * @description Combines [Property]{@link Bacon.Property}s with the && operator.
+         * @param {Property<E, A>} other
+         * @returns {Property<E, A>}
+         */
+        and(other:Property<E, A>):Property<E, A>;
+
+        /**
+         * @method
+         * @description Combines [Property]{@link Bacon.Property}s with the || operator.
+         * @param {Property<E, A>} other
+         * @returns {Property<E, A>}
+         */
+        or(other:Property<E, A>):Property<E, A>;
+
+        /**
+         * @method
+         * @description Adds an initial "default" value for the [Property]{@link Bacon.Property}. If the Property doesn't have an initial value of it's own, the given `value` will be used as the initial value. If the property has an initial value of its own, the given `value` will be ignored.
+         * @param {A} value
+         * @returns {Property<E, A>}
+         */
+        startWith(value:A):Property<E, A>;
+    }
+
+    /**
+     * @function Bacon.combineAsArray
+     * @description Combines [Property]{@link Bacon.Property}s, [EventStream]{@link Bacon.EventStream}s and constant values so that the result Property will have an array of all property values as its value. The input array may contain both Properties and EventStreams. In the latter case, the stream is first converted into a Property and then combined with the other Property's.
+     * @param {(A|Observable<E, A>)[]} streams
+     * @returns {Property<E, A[]>}
+     */
+    function combineAsArray<E, A>(streams:(A|Observable<E, A>)[]):Property<E, A[]>;
+
+    /**
+     * @function
+     * @description Combines [Property]{@link Bacon.Property}s, [EventStream]{@link Bacon.EventStream}s and constant values so that the result Property will have an array of all property values as its value. Like [Bacon.combineAsArray]{@link Bacon.combineAsArray}, but `streams` are provided as a list of arguments as opposed to a single array.
+     * @param {...(A|Observable<E, A>)} streams
+     * @returns {Property<E, A[]>}
+     */
+    function combineAsArray<E, A>(...streams:(A|Observable<E, A>)[]):Property<E, A[]>;
+
+    /**
+     * @callback Property#combineWith~f
+     * @param {...A} args
+     * @returns {B}
+     */
+    /**
+     * @function Property#combineWith
+     * @description Combines given n [Property]{@link Bacon.Property}s, [EventStream]{@link Bacon.EventStream}s and constant values using the given n-ary function `f`.
+     * @param {Property#combineWith~f} f
+     * @param {...(A|Observable<E, A>)} streams
+     * @returns {Property<E, B>}
+     */
+    function combineWith<A, B>(f:(...args:A[]) => B, ...streams:(A|Observable<ErrorEvent, A>)[]):Property<ErrorEvent, B>;
+
+    /**
+     * @function
+     * @description Combines [Property]{@link Bacon.Property}s, [EventStream]{@link Bacon.EventStream}s and constant values using a `template` object.
+     * @param {{string:number|boolean|string|Object|Observable<E, *>}} template
+     * @returns {Property<E, A>}
+     */
+    function combineTemplate<E, A>(template:{[label:string]:number|boolean|string|Object|Observable<E, any>}):Property<E, A>;
+
+    /**
+     * @function
+     * @description Merges given array of [EventStream]{@link Bacon.EventStream}s.
+     * @param {EventStream<E, A>[]} streams
+     * @returns {EventStream<E, A>}
+     */
+    function mergeAll<E, A>(streams:EventStream<E, A>[]):EventStream<E, A>;
+
+    /**
+     * @function
+     * @description Merges given array of [EventStream]{@link Bacon.EventStream}s.
+     * @param {...EventStream<E, A>} streams
+     * @returns {EventStream<E, A>}
+     */
+    function mergeAll<E, A>(...streams:EventStream<E, A>[]):EventStream<E, A>;
+
+    /**
+     * @function
+     * @description Zips the array of `streams` in to a new [EventStream]{@link Bacon.EventStream} that will have an array of values from each source EventStream as its value. Zipping means that events from each EventStream are combine pairwise so that the 1st event from each EventStream is published first, then the 2nd event from each. The results will be published as soon as there is a value from each source EventStream. Be careful not to have too much "drift" between EventStream's. If one EventStream produces many more values than some other excessive buffering will occur inside the zipped [Observable]{@link Bacon.Observable}.
+     * @param {EventStream<E, A>[]} streams
+     * @returns {EventStream<E, A[]>}
+     */
+    function zipAsArray<E, A>(streams:EventStream<E, A>[]):EventStream<E, A[]>;
+
+    /**
+     * @function
+     * @description Zips the `streams` in to a new [EventStream]{@link Bacon.EventStream} that will have an array of values from each source EventStream as its value. Zipping means that events from each EventStream are combine pairwise so that the 1st event from each EventStream is published first, then the 2nd event from each. The results will be published as soon as there is a value from each source EventStream. EventStream's are provided as a list of arguments as opposed to a single array. Be careful not to have too much "drift" between EventStream's. If one EventStream produces many more values than some other excessive buffering will occur inside the zipped [Observable]{@link Bacon.Observable}.
+     * @param {...EventStream<E, A>} streams
+     * @returns {EventStream<E, A[]>}
+     */
+    function zipAsArray<E, A>(...streams:EventStream<E, A>[]):EventStream<E, A[]>;
+
+    /**
+     * @callback Bacon.zipWith1~f
+     * @param {...A} args
+     * @returns {B}
+     */
+    /**
+     * @function Bacon.zipWith1
+     * @description Zips the array of `streams` in to a new [EventStream]{@link Bacon.EventStream} that will combine the n values from EventStream's with n-ary function `f`. Zipping means that events from each EventStream are combine pairwise so that the 1st event from each EventStream is published first, then the 2nd event from each. The results will be published as soon as there is a value from each source EventStream. Be careful not to have too much "drift" between EventStream's. If one EventStream produces many more values than some other excessive buffering will occur inside the zipped [Observable]{@link Bacon.Observable}.
+     * @param {EventStream<E, A>[]} streams
+     * @param {Bacon.zipWith1~f} f
+     * @returns {EventStream<E, B>}
+     */
+    function zipWith<E, A, B>(streams:EventStream<E, A>[], f:(...args:A[]) => B):EventStream<E, B>;
+
+    /**
+     * @callback Bacon.zipWith2~f
+     * @param {...A} args
+     * @returns {B}
+     */
+    /**
+     * @function Bacon.zipWith2
+     * @description Zips the `streams` in to a new [EventStream]{@link Bacon.EventStream} that will combine the n values from EventStream's with n-ary function `f`. Zipping means that events from each EventStream are combine pairwise so that the 1st event from each EventStream is published first, then the 2nd event from each. The results will be published as soon as there is a value from each source EventStream. Streams are provided as a list of arguments as opposed to a single array. Be careful not to have too much "drift" between EventStream's. If one EventStream produces many more values than some other excessive buffering will occur inside the zipped [Observable]{@link Bacon.Observable}.
+     * @param {Bacon.zipWith2~f} f
+     * @param {...EventStream<E, A>} streams
+     * @returns {EventStream<E, B>}
+     */
+    function zipWith<E, A, B>(f:(...args:A[]) => B, ...streams:EventStream<E, A>[]):EventStream<E, B>;
+
+    /**
+     * @function
+     * @description Is a shorthand for combining multiple sources ([EventStream]{@link Bacon.EventStream}s, [Property]{@link Bacon.Property}s, constants) as array and assigning the side-effect function `f` for the values.
+     * @param {...*} args
+     * @returns {void}
+     */
+    function onValues(...args:any[]):void;
+
+    /**
+     * @class Bus
+     * @augments Bacon.EventStream
+     * @description An [EventStream]{@link Bacon.EventStream} that allows you to [push]{@link Bacon.Bus#push} values into the EventStream. It also allows [plug]{@link Bacon.Bus#plug}ging other EventStream's into the Bus. The Bus practically merges all plugged-in streams and the values pushed using the [push]{@link Bacon.Bus#push} method.
+     */
+    interface Bus<E, A> extends EventStream<E, A> {
+        /**
+         * @method Bus#push
+         * @description Pushes the given `value` to the [Bus]{@link Bacon.Bus}.
+         * @param {A} value
+         * @returns {void}
+         */
+        push(value:A):void;
+
+        /**
+         * @method
+         * @description Ends the [Bus]{@link Bacon.Bus}. Sends an [End]{@link Bacon.End} event to all subscribers. After this call, there'll be no more events to the subscribers. Also, the [Bus.push]{@link Bacon.Bus#push} and [Bus.plug]{@link Bacon.Bus#plug} methods have no effect.
+         * @returns {void}
+         */
+        end():void;
+
+        /**
+         * @method
+         * @description Sends an [Error]{@link Bacon.Error} with given `error` message to all subscribers.
+         * @param {E} error
+         * @returns {void}
+         */
+        error(error:E):void;
+
+        /**
+         * @callback Bus#plug~unplug
+         * @returns {void}
+         */
+        /**
+         * @method Bus#plug
+         * @description Plugs the given [EventStream]{@link Bacon.EventStream} to the [Bus]{@link Bacon.Bus}. All events from the given `stream` will be delivered to the subscribers of the Bus. Returns a function `unplug` that can be used to unplug the same stream. The [plug]{@link Bacon.Bus#plug} method practically allows you to merge in other EventStream's after the creation of the Bus.
+         * @param {EventStream<A>} stream
+         * @returns {Bus#plug~unplug}
+         */
+        plug(stream:EventStream<E, A>):() => void;
+    }
+
+    var Bus:{
+        /**
+         * @constructor
+         * @constructs Bacon.Bus
+         * @description Returns a new [Bus]{@link Bacon.Bus}.
+         * @returns {Bus<E, A>}
+         */
+        new<E, A>():Bus<E, A>;
+    };
+
+    /**
+     * @class Event
+     * @description Has subclasses [Initial]{@link Bacon.Initial}, [Next]{@link Bacon.Next}, [End]{@link Bacon.End} and [Error]{@link Bacon.Error}.
+     * */
+    class Event<A> {
+        /**
+         * @method
+         * @description Returns the value associated with a [Initial]{@link Bacon.Initial} or [Next]{@link Bacon.Next} event.
+         * @returns {A}
+         */
+        value():A;
+
+        /**
+         * @method
+         * @description Returns `true` for events of type [Initial]{@link Bacon.Initial} or [Next]{@link Bacon.Next}.
+         * @returns {boolean}
+         */
+        hasValue():boolean;
+
+        /**
+         * @method Error#isInitial
+         * @description Returns `true` for events of type [Initial]{@link Bacon.Initial}.
+         * @returns {boolean}
+         */
+        isInitial():boolean;
+
+        /**
+         * @method Error#isNext
+         * @description Returns `true` for events of type [Next]{@link Bacon.Next}.
+         * @returns {boolean}
+         */
+        isNext():boolean;
+
+        /**
+         * @method Error#isError
+         * @description Returns `true` for events of type [Error]{@link Bacon.Error}.
+         * @returns {boolean}
+         */
+        isError():boolean;
+
+        /**
+         * @method Error#isEnd
+         * @description Returns `true` for events of type [End]{@link Bacon.End}.
+         * @returns {boolean}
+         */
+        isEnd():boolean;
+    }
+
+    /**
+     * @class Error
+     * @augments Bacon.Event
+     * @description An error event. Call [Event.isError]{@link Bacon.Event#isError} to distinguish these events in your subscriber, or use [onError]{@link Bacon.Observable#onError} to react to error events only. [Error.error]{@link Bacon.Error#error} returns the associated error object (usually string). [Error]{@link Bacon.Error} events are always passed through all stream combinators. So, even if you filter all values out, the error events will pass through. If you use [Observable.flatMap]{@link Bacon.Observable#flatMap}, the result stream will contain Error events from the source as well as all the spawned stream. You can take action on errors by using the [Observable.onError]{@link Bacon.Observable#onError}. See documentation on [Observable.onError]{@link Bacon.Observable#onError}, [EventStream.mapError]{@link Bacon.EventStream#mapError}, [Property.mapError]{@link Bacon.Property#mapError}, [EventStream.errors]{@link Bacon.EventStream#errors}, [Property.errors]{@link Bacon.Property#errors}, [EventStream.skipErrors]{@link Bacon.EventStream#skipErrors}, [Property.skipErrors]{@link Bacon.Property#skipErrors}, [Bacon.retry]{@link Bacon.retry} and [Observable.flatMapError]{@link Bacon.Observable#flatMapError}. An Error does not terminate the stream. The methods [EventStream.endOnError]{@link Bacon.EventStream#endOnError} and [EventStream.endOnError]{@link Bacon.EventStream#endOnError}  returns a stream/property that ends immediately after first error. Bacon.js doesn't currently generate any Error events itself (except when converting errors using [Bacon.fromPromise]{@link Bacon.fromPromise}). Error events definitely would be generated by streams derived from IO sources such as AJAX calls.
+     * @example
+     * // In case you want to convert (some) value events into Error events, you may use `flatMap` like this:
+     * Bacon.fromArray([1, 2, 3, 4]).flatMap<number>(x => {
+   *   NOTE: had to explicitly specify the `<number>` typing for `flatMap`.
+   *   return x > 2 ? new Bacon.Error("too big") : x;
+   * });
+     *
+     * // Conversely, if you want to convert some Error events into value events, you may use `flatMapError`:
+     * Bacon.fromArray([1, 2, 3, 4]).flatMapError(error => {
+   *   let isNonCriticalError = error => Math.random() < .5,
+   *     handleNonCriticalError = error => 42;
+   *   return isNonCriticalError(error) ? handleNonCriticalError(error) : new Bacon.Error(error);
+   * });
+     *
+     * // Note also that Bacon.js combinators do not catch errors that are thrown. Especially `map` doesn't do so. If you want to map things and wrap caught errors into Error events, you can do the following:
+     * Bacon.fromArray([1, 2, 3, 4]).flatMap(x => {
+   *   let dangerousFunction = x => {
+   *     throw new Error("dangerous function!");
+   *   };
+   *   try {
+   *     return dangerousFunction(x);
+   *   } catch (e) {
+   *     return new Bacon.Error(e);
+   *   }
+   * });
+     */
+    class Error<E> extends Event<E> {
+        /**
+         * @constructor
+         * @constructs Error
+         * @param {E} error
+         * */
+        constructor(error:E);
+
+        /**
+         * @property Error#error
+         * @description Returns the `error` associated with an [Error]{@link Bacon.Error} event.
+         * @returns {E}
+         */
+        error:E;
+    }
+
+    /**
+     * @class End
+     * @augments Bacon.Event
+     * @description An end-of-stream event of [EventStream]{@link Bacon.EventStream} or [Property]{@link Bacon.Property}. Call [Event.isEnd]{@link Bacon.Event#isEnd} to distinguish an End from other events.
+     * */
+    class End<A> extends Event<A> {
+        /**
+         * @constructor
+         * @constructs Bacon.End
+         * */
+        constructor();
+    }
+
+    /**
+     * @class Initial
+     * @augments Bacon.Event
+     * @description The initial (current) value of a [Property]{@link Bacon.Property}. Call [Event.isInitial]{@link Bacon.Event#isInitial} to distinguish from other events. Only sent immediately after subscription to a Property.
+     * */
+    class Initial<A> extends Event<A> {
+        /**
+         * @constructor
+         * @constructs Bacon.Initial
+         * @param {A} value
+         * */
+        constructor(value:A);
+    }
+
+    /**
+     * @class Next
+     * @augments Bacon.Event
+     * @description Next value in an [EventStream]{@link Bacon.EventStream} or a [Property]{@link Bacon.Property}. Call [Event.isNext]{@link Bacon.Event#isNext} to distinguish a Next event from other events.
+     * */
+    class Next<A> extends Event<A> {
+        /**
+         * @constructor
+         * @constructs Bacon.Next
+         * @param {A} value
+         * @example
+         * new Bacon.Next("value");
+         * */
+        constructor(value:A);
+
+        /**
+         * @callback Next#constructor
+         * @returns {A}
+         */
+        /**
+         * @constructor Next#constructor
+         * @constructs Bacon.Next
+         * @description This version is safe only when you know that the actual value in the stream is not a function. The idea in using a function `f` instead of a plain value is that the internals on Bacon.js take advantage of lazy evaluation by deferring the evaluations of values created by `map`, `combine`.
+         * @param {Next#constructor} f
+         * @example
+         * new Bacon.Next(() => "value");
+         * */
+        constructor(f:() => A);
+    }
+
+    /**
+     * @callback Bacon.retry1~source
+     * @description Function that produces an [EventStream]{@link Bacon.EventStream}.
+     * @returns {EventStream<E, A>}
+     */
+    /**
+     * @callback Bacon.retry1~isRetryable
+     * @description Function returning `true` to continue retrying, `false` to stop. Defaults to `true`. The [Error]{@link Bacon.Error} that occurred is given as a parameter. For example, there is usually no reason to retry a 404 HTTP error, whereas a 500 or a timeout might work on the next attempt.
+     * @param {E} error
+     * @returns {boolean}
+     */
+    /**
+     * @callback Bacon.retry1~delay
+     * @description Function that returns the time in milliseconds to wait before retrying. Defaults to `0`. The function is given a `context` object with the keys `error` (the [Error]{@link Bacon.Error} that occurred) and `retriesDone` (the number of retries already performed) to help determine the appropriate delay, e.g. for an incremental backoff.
+     * @param {Object} context
+     * @param {E} context.error [Error]{@link Bacon.Error} that occurred
+     * @param {number} context.retriesDone number of retries already performed
+     * @returns {number}
+     */
+    /**
+     * @function Bacon.retry1
+     * @description Is used to retry the call when there is an [Error]{@link Bacon.Error} event in the [EventStream]{@link Bacon.EventStream} produced by the `source` function.
+     * @param {Object} options
+     * @param {Bacon.retry1~source} options.source function that produces an [EventStream]{@link Bacon.EventStream}
+     * @param {number} options.retries number of times to retry the `source` function in addition to the initial attempt
+     * @param {Bacon.retry1~isRetryable} [options.isRetryable] function returning `true` to continue retrying, `false` to stop. Defaults to `true`.
+     * @param {Bacon.retry1~delay} [options.delay] - function that returns the time in milliseconds to wait before retrying. Defaults to `0`.
+     * @returns {EventStream<E, A>}
+     */
+    function retry<E, A>(options:{
+        source:() => EventStream<E, A>;
+        retries:number;
+        isRetryable?:(error:E) => boolean;
+        delay?:(context:{error:E; retriesDone:number}) => number;
+    }):EventStream<E, A>;
+
+    /**
+     * @callback Bacon.retry1~source
+     * @description Function that produces an [Property]{@link Bacon.Property}.
+     * @returns {Property<E, A>}
+     */
+    /**
+     * @callback Bacon.retry1~isRetryable
+     * @description Function returning `true` to continue retrying, `false` to stop. Defaults to `true`. The [Error]{@link Bacon.Error} that occurred is given as a parameter. For example, there is usually no reason to retry a 404 HTTP error, whereas a 500 or a timeout might work on the next attempt.
+     * @param {E} error
+     * @returns {boolean}
+     */
+    /**
+     * @callback Bacon.retry1~delay
+     * @description Function that returns the time in milliseconds to wait before retrying. Defaults to `0`. The function is given a `context` object with the keys `error` (the [Error]{@link Bacon.Error} that occurred) and `retriesDone` (the number of retries already performed) to help determine the appropriate delay, e.g. for an incremental backoff.
+     * @param {Object} context
+     * @param {E} context.error [Error]{@link Bacon.Error} that occurred
+     * @param {number} context.retriesDone number of retries already performed
+     * @returns {number}
+     */
+    /**
+     * @function Bacon.retry1
+     * @description Is used to retry the call when there is an [Error]{@link Bacon.Error} event in the [Property]{@link Bacon.Property} produced by the `source` function.
+     * @param {Object} options
+     * @param {Bacon.retry1~source} options.source function that produces an [Property]{@link Bacon.Property}
+     * @param {number} options.retries number of times to retry the `source` function in addition to the initial attempt
+     * @param {Bacon.retry1~isRetryable} [options.isRetryable] function returning `true` to continue retrying, `false` to stop. Defaults to `true`.
+     * @param {Bacon.retry1~delay} [options.delay] - function that returns the time in milliseconds to wait before retrying. Defaults to `0`.
+     * @returns {Property<E, A>}
+     */
+    function retry<E, A>(options:{
+        source:() => Property<E, A>;
+        retries:number;
+        isRetryable?:(error:E) => boolean;
+        delay?:(context:{error:E; retriesDone:number}) => number;
+    }):Property<E, A>;
+
+    /**
+     * @callback Bacon.when1~f1
+     * @param {...A1} args
+     * @returns {B}
+     */
+    /**
+     * @method Bacon.when1
+     * @description Creates an [EventStream]{@link Bacon.EventStream} from join-pattern system.
+     * @param {Observable<E, A1>[]} pattern1
+     * @param {Bacon.when1~f1} f1
+     * @returns {EventStream<E, B>}
+     * @example
+     * {
+     *     // Consider implementing a game with discrete time ticks. We want to handle key-events synchronized on tick-events, with at most one key event handled per tick. If there are no key events, we want to just process a tick:
+     *     let tick = Bacon.interval(1e2, 0),
+     *         keyEvent = Bacon.fromEvent(document.body, "click", _ => Date.now()),
+     *         handleTick = _ => `timestamp: NONE`,
+     *         handleKeyEvent = timestamp => `timestamp: ${timestamp}`;
+     *     Bacon.when(
+     *         [tick, keyEvent], (_, timestamp) => handleKeyEvent(timestamp),
+     *         [tick], handleTick
+     *     );
+     *     // Order is important here. If the [tick] patterns had been written first, this would have been tried first, and preferred at each tick.
+     * }
+     *
+     * {
+     *     // Join patterns are indeed a generalization of `zip`, and `zip` is equivalent to a single-rule join pattern. The following `Observable`s have the same output:
+     *     let a = Bacon.once("a"),
+     *         b = Bacon.once("b"),
+     *         c = Bacon.once("c"),
+     *         f = (a, b, c) => `a = ${a}; b = ${b}; c = ${c}.`;
+     *     Bacon.zipWith(f, a, b, c);
+     *     Bacon.when([a, b, c], f);
+     * }
+     *
+     * {
+     *     // Join patterns as a "chemical machine".
+     *     // A quick way to get some intuition for join patterns is to understand them through an analogy in terms of atoms and molecules. A join pattern can here be regarded as a recipe for a chemical reaction. Lets say we have observables `oxygen`, `carbon` and `hydrogen`, where an event in these spawns an 'atom' of that type into a mixture. We can state reactions:
+     *     let oxygen = Bacon.interval(1e3, "O"),
+     *         hydrogen = Bacon.interval(2e3, "H"),
+     *         carbon = Bacon.interval(1.5e3, "C"),
+     *         makeWater = (oxygen:string, hydrogen1:string, hydrogen2:string) => `${hydrogen1}${[hydrogen1, hydrogen2].length}${oxygen}`,
+     *         makeCarbonMonoxide = (oxygen:string, carbon:string) => `${carbon}${oxygen}`;
+     *     Bacon.when(
+     *         [oxygen, hydrogen, hydrogen], makeWater,
+     *         [oxygen, carbon], makeCarbonMonoxide
+     *     );
+     *     // Now, every time a new 'atom' is spawned from one of the observables, this atom is added to the mixture. If at any time there are two hydrogen atoms, and an oxygen atom, the corresponding atoms are *consumed*, and output is produced via `makeWater`. The same semantics apply for the second rule to create carbon monoxide. The rules are tried at each point from top to bottom.
+     * }
+     *
+     * {
+     *     // Join patterns and properties.
+     *     // Properties are not part of the synchronization pattern, but are instead just sampled. The following example take three input streams `$price`, `$quantity` and `$total`, e.g. coming from input fields, and defines mutally recursive behaviours in properties `price`, `quantity` and `total` such that:
+     *     // -- updating `quantity` sets `total` to `price * quantity`;
+     *     // -- updating `total` sets `price` to `total / quantity`.
+     *     let random = (x:number) => Math.round(x * Math.random()),
+     *         id = <A>(x:A):A => x;
+     *     let $quantity = Bacon.interval<Error, number>(1e3, 10).map(random),
+     *         $price = Bacon.interval<Error, number>(2e3, 100).map(random),
+     *         $total = Bacon.interval<Error, number>(1.5e3, 1000).map(random);
+     *     let quantity = $quantity.toProperty(1),
+     *         price = Bacon.when<Error, number, number, number>(
+     *             [$price], id,
+     *             [$total, quantity], (x, y) => x / y
+     *         ).toProperty(0),
+     *         total = Bacon.when<Error, number, number, number, number>(
+     *             [$total], id,
+     *             [$price, quantity], (x, y) => x * y,
+     *             [price, $quantity], (x, y) => x * y
+     *         ).toProperty(0);
+     * }
+     *
+     * {
+     *     // Join patterns and `Bacon.Bus`.
+     *     // The result functions of join patterns are allowed to push values onto a `Bus` that may in turn be in one of its patterns. For instance, an implementation of the dining philosophers problem can be written as follows:
+     *     // Availability of chopsticks are implemented using bus.
+     *     let chopsticks = [new Bacon.Bus(), new Bacon.Bus(), new Bacon.Bus()],
+     *     // Hungry could be any type of observable, but we'll use bus here.
+     *         hungry = [new Bacon.Bus(), new Bacon.Bus(), new Bacon.Bus()],
+     *     // A philosopher eats for one second, then makes the chopsticks available again by pushing values onto their bus.
+     *         eat = (i:number) => () => {
+     *             setTimeout(() => {
+     *                 console.log("done!");
+     *                 chopsticks[i].push({});
+     *                 chopsticks[(i + 1) % 3].push({});
+     *             }, 1e3);
+     *             return `philosopher ${i} eating`;
+     *         },
+     *     // We use Bacon.when to make sure a hungry philosopher can eat only when both his chopsticks are available.
+     *         dining = Bacon.when(
+     *             [hungry[0], chopsticks[0], chopsticks[1]], eat(0),
+     *             [hungry[1], chopsticks[1], chopsticks[2]], eat(1),
+     *             [hungry[2], chopsticks[2], chopsticks[0]], eat(2)
+     *         ).log("dining");
+     *     // Make all chopsticks initially available.
+     *     chopsticks[0].push({});
+     *     chopsticks[1].push({});
+     *     chopsticks[2].push({});
+     *     // Make philosophers hungry in some way, in this case we just push to their bus.
+     *     for (let i = 0; i < 3; i++) {
+     *         hungry[0].push({});
+     *         hungry[1].push({});
+     *         hungry[2].push({});
+     *     }
+     * }
+     */
+    function when<E, A1, B>(pattern1:Observable<E, A1>[], f1:(...args:A1[]) => B):EventStream<E, B>;
+
+    /**
+     * @callback Bacon.when2~f1
+     * @param {...A1} args
+     * @returns {B}
+     */
+    /**
+     * @callback Bacon.when2~f2
+     * @param {...A2} args
+     * @returns {B}
+     */
+    /**
+     * @method Bacon.when2
+     * @description Creates an [EventStream]{@link Bacon.EventStream} from join-pattern system.
+     * @param {Observable<E, A1>[]} pattern1
+     * @param {Bacon.when2~f1} f1
+     * @param {Observable<E, A2>[]} pattern2
+     * @param {Bacon.when2~f2} f2
+     * @returns {EventStream<E, B>}
+     * @example
+     * {
+     *     // Consider implementing a game with discrete time ticks. We want to handle key-events synchronized on tick-events, with at most one key event handled per tick. If there are no key events, we want to just process a tick:
+     *     let tick = Bacon.interval(1e2, 0),
+     *         keyEvent = Bacon.fromEvent(document.body, "click", _ => Date.now()),
+     *         handleTick = _ => `timestamp: NONE`,
+     *         handleKeyEvent = timestamp => `timestamp: ${timestamp}`;
+     *     Bacon.when(
+     *         [tick, keyEvent], (_, timestamp) => handleKeyEvent(timestamp),
+     *         [tick], handleTick
+     *     );
+     *     // Order is important here. If the [tick] patterns had been written first, this would have been tried first, and preferred at each tick.
+     * }
+     *
+     * {
+     *     // Join patterns are indeed a generalization of `zip`, and `zip` is equivalent to a single-rule join pattern. The following `Observable`s have the same output:
+     *     let a = Bacon.once("a"),
+     *         b = Bacon.once("b"),
+     *         c = Bacon.once("c"),
+     *         f = (a, b, c) => `a = ${a}; b = ${b}; c = ${c}.`;
+     *     Bacon.zipWith(f, a, b, c);
+     *     Bacon.when([a, b, c], f);
+     * }
+     *
+     * {
+     *     // Join patterns as a "chemical machine".
+     *     // A quick way to get some intuition for join patterns is to understand them through an analogy in terms of atoms and molecules. A join pattern can here be regarded as a recipe for a chemical reaction. Lets say we have observables `oxygen`, `carbon` and `hydrogen`, where an event in these spawns an 'atom' of that type into a mixture. We can state reactions:
+     *     let oxygen = Bacon.interval(1e3, "O"),
+     *         hydrogen = Bacon.interval(2e3, "H"),
+     *         carbon = Bacon.interval(1.5e3, "C"),
+     *         makeWater = (oxygen:string, hydrogen1:string, hydrogen2:string) => `${hydrogen1}${[hydrogen1, hydrogen2].length}${oxygen}`,
+     *         makeCarbonMonoxide = (oxygen:string, carbon:string) => `${carbon}${oxygen}`;
+     *     Bacon.when(
+     *         [oxygen, hydrogen, hydrogen], makeWater,
+     *         [oxygen, carbon], makeCarbonMonoxide
+     *     );
+     *     // Now, every time a new 'atom' is spawned from one of the observables, this atom is added to the mixture. If at any time there are two hydrogen atoms, and an oxygen atom, the corresponding atoms are *consumed*, and output is produced via `makeWater`. The same semantics apply for the second rule to create carbon monoxide. The rules are tried at each point from top to bottom.
+     * }
+     *
+     * {
+     *     // Join patterns and properties.
+     *     // Properties are not part of the synchronization pattern, but are instead just sampled. The following example take three input streams `$price`, `$quantity` and `$total`, e.g. coming from input fields, and defines mutally recursive behaviours in properties `price`, `quantity` and `total` such that:
+     *     // -- updating `quantity` sets `total` to `price * quantity`;
+     *     // -- updating `total` sets `price` to `total / quantity`.
+     *     let random = (x:number) => Math.round(x * Math.random()),
+     *         id = <A>(x:A):A => x;
+     *     let $quantity = Bacon.interval<Error, number>(1e3, 10).map(random),
+     *         $price = Bacon.interval<Error, number>(2e3, 100).map(random),
+     *         $total = Bacon.interval<Error, number>(1.5e3, 1000).map(random);
+     *     let quantity = $quantity.toProperty(1),
+     *         price = Bacon.when<Error, number, number, number>(
+     *             [$price], id,
+     *             [$total, quantity], (x, y) => x / y
+     *         ).toProperty(0),
+     *         total = Bacon.when<Error, number, number, number, number>(
+     *             [$total], id,
+     *             [$price, quantity], (x, y) => x * y,
+     *             [price, $quantity], (x, y) => x * y
+     *         ).toProperty(0);
+     * }
+     *
+     * {
+     *     // Join patterns and `Bacon.Bus`.
+     *     // The result functions of join patterns are allowed to push values onto a `Bus` that may in turn be in one of its patterns. For instance, an implementation of the dining philosophers problem can be written as follows:
+     *     // Availability of chopsticks are implemented using bus.
+     *     let chopsticks = [new Bacon.Bus(), new Bacon.Bus(), new Bacon.Bus()],
+     *     // Hungry could be any type of observable, but we'll use bus here.
+     *         hungry = [new Bacon.Bus(), new Bacon.Bus(), new Bacon.Bus()],
+     *     // A philosopher eats for one second, then makes the chopsticks available again by pushing values onto their bus.
+     *         eat = (i:number) => () => {
+     *             setTimeout(() => {
+     *                 console.log("done!");
+     *                 chopsticks[i].push({});
+     *                 chopsticks[(i + 1) % 3].push({});
+     *             }, 1e3);
+     *             return `philosopher ${i} eating`;
+     *         },
+     *     // We use Bacon.when to make sure a hungry philosopher can eat only when both his chopsticks are available.
+     *         dining = Bacon.when(
+     *             [hungry[0], chopsticks[0], chopsticks[1]], eat(0),
+     *             [hungry[1], chopsticks[1], chopsticks[2]], eat(1),
+     *             [hungry[2], chopsticks[2], chopsticks[0]], eat(2)
+     *         ).log("dining");
+     *     // Make all chopsticks initially available.
+     *     chopsticks[0].push({});
+     *     chopsticks[1].push({});
+     *     chopsticks[2].push({});
+     *     // Make philosophers hungry in some way, in this case we just push to their bus.
+     *     for (let i = 0; i < 3; i++) {
+     *         hungry[0].push({});
+     *         hungry[1].push({});
+     *         hungry[2].push({});
+     *     }
+     * }
+     */
+    function when<E, A1, A2, B>(pattern1:Observable<E, A1>[], f1:(...args:A1[]) => B, pattern2:Observable<E, A2>[], f2:(...args:A2[]) => B):EventStream<E, B>;
+
+    /**
+     * @callback Bacon.when3~f1
+     * @param {...A1} args
+     * @returns {B}
+     */
+    /**
+     * @callback Bacon.when3~f2
+     * @param {...A2} args
+     * @returns {B}
+     */
+    /**
+     * @callback Bacon.when3~f3
+     * @param {...A3} args
+     * @returns {B}
+     */
+    /**
+     * @method Bacon.when3
+     * @description Creates an [EventStream]{@link Bacon.EventStream} from join-pattern system.
+     * @param {Observable<E, A1>[]} pattern1
+     * @param {Bacon.when3~f1} f1
+     * @param {Observable<E, A2>[]} pattern2
+     * @param {Bacon.when3~f2} f2
+     * @param {Observable<E, A3>[]} pattern3
+     * @param {Bacon.when3~f3} f3
+     * @returns {EventStream<E, B>}
+     * @example
+     * {
+     *     // Consider implementing a game with discrete time ticks. We want to handle key-events synchronized on tick-events, with at most one key event handled per tick. If there are no key events, we want to just process a tick:
+     *     let tick = Bacon.interval(1e2, 0),
+     *         keyEvent = Bacon.fromEvent(document.body, "click", _ => Date.now()),
+     *         handleTick = _ => `timestamp: NONE`,
+     *         handleKeyEvent = timestamp => `timestamp: ${timestamp}`;
+     *     Bacon.when(
+     *         [tick, keyEvent], (_, timestamp) => handleKeyEvent(timestamp),
+     *         [tick], handleTick
+     *     );
+     *     // Order is important here. If the [tick] patterns had been written first, this would have been tried first, and preferred at each tick.
+     * }
+     *
+     * {
+     *     // Join patterns are indeed a generalization of `zip`, and `zip` is equivalent to a single-rule join pattern. The following `Observable`s have the same output:
+     *     let a = Bacon.once("a"),
+     *         b = Bacon.once("b"),
+     *         c = Bacon.once("c"),
+     *         f = (a, b, c) => `a = ${a}; b = ${b}; c = ${c}.`;
+     *     Bacon.zipWith(f, a, b, c);
+     *     Bacon.when([a, b, c], f);
+     * }
+     *
+     * {
+     *     // Join patterns as a "chemical machine".
+     *     // A quick way to get some intuition for join patterns is to understand them through an analogy in terms of atoms and molecules. A join pattern can here be regarded as a recipe for a chemical reaction. Lets say we have observables `oxygen`, `carbon` and `hydrogen`, where an event in these spawns an 'atom' of that type into a mixture. We can state reactions:
+     *     let oxygen = Bacon.interval(1e3, "O"),
+     *         hydrogen = Bacon.interval(2e3, "H"),
+     *         carbon = Bacon.interval(1.5e3, "C"),
+     *         makeWater = (oxygen:string, hydrogen1:string, hydrogen2:string) => `${hydrogen1}${[hydrogen1, hydrogen2].length}${oxygen}`,
+     *         makeCarbonMonoxide = (oxygen:string, carbon:string) => `${carbon}${oxygen}`;
+     *     Bacon.when(
+     *         [oxygen, hydrogen, hydrogen], makeWater,
+     *         [oxygen, carbon], makeCarbonMonoxide
+     *     );
+     *     // Now, every time a new 'atom' is spawned from one of the observables, this atom is added to the mixture. If at any time there are two hydrogen atoms, and an oxygen atom, the corresponding atoms are *consumed*, and output is produced via `makeWater`. The same semantics apply for the second rule to create carbon monoxide. The rules are tried at each point from top to bottom.
+     * }
+     *
+     * {
+     *     // Join patterns and properties.
+     *     // Properties are not part of the synchronization pattern, but are instead just sampled. The following example take three input streams `$price`, `$quantity` and `$total`, e.g. coming from input fields, and defines mutally recursive behaviours in properties `price`, `quantity` and `total` such that:
+     *     // -- updating `quantity` sets `total` to `price * quantity`;
+     *     // -- updating `total` sets `price` to `total / quantity`.
+     *     let random = (x:number) => Math.round(x * Math.random()),
+     *         id = <A>(x:A):A => x;
+     *     let $quantity = Bacon.interval<Error, number>(1e3, 10).map(random),
+     *         $price = Bacon.interval<Error, number>(2e3, 100).map(random),
+     *         $total = Bacon.interval<Error, number>(1.5e3, 1000).map(random);
+     *     let quantity = $quantity.toProperty(1),
+     *         price = Bacon.when<Error, number, number, number>(
+     *             [$price], id,
+     *             [$total, quantity], (x, y) => x / y
+     *         ).toProperty(0),
+     *         total = Bacon.when<Error, number, number, number, number>(
+     *             [$total], id,
+     *             [$price, quantity], (x, y) => x * y,
+     *             [price, $quantity], (x, y) => x * y
+     *         ).toProperty(0);
+     * }
+     *
+     * {
+     *     // Join patterns and `Bacon.Bus`.
+     *     // The result functions of join patterns are allowed to push values onto a `Bus` that may in turn be in one of its patterns. For instance, an implementation of the dining philosophers problem can be written as follows:
+     *     // Availability of chopsticks are implemented using bus.
+     *     let chopsticks = [new Bacon.Bus(), new Bacon.Bus(), new Bacon.Bus()],
+     *     // Hungry could be any type of observable, but we'll use bus here.
+     *         hungry = [new Bacon.Bus(), new Bacon.Bus(), new Bacon.Bus()],
+     *     // A philosopher eats for one second, then makes the chopsticks available again by pushing values onto their bus.
+     *         eat = (i:number) => () => {
+     *             setTimeout(() => {
+     *                 console.log("done!");
+     *                 chopsticks[i].push({});
+     *                 chopsticks[(i + 1) % 3].push({});
+     *             }, 1e3);
+     *             return `philosopher ${i} eating`;
+     *         },
+     *     // We use Bacon.when to make sure a hungry philosopher can eat only when both his chopsticks are available.
+     *         dining = Bacon.when(
+     *             [hungry[0], chopsticks[0], chopsticks[1]], eat(0),
+     *             [hungry[1], chopsticks[1], chopsticks[2]], eat(1),
+     *             [hungry[2], chopsticks[2], chopsticks[0]], eat(2)
+     *         ).log("dining");
+     *     // Make all chopsticks initially available.
+     *     chopsticks[0].push({});
+     *     chopsticks[1].push({});
+     *     chopsticks[2].push({});
+     *     // Make philosophers hungry in some way, in this case we just push to their bus.
+     *     for (let i = 0; i < 3; i++) {
+     *         hungry[0].push({});
+     *         hungry[1].push({});
+     *         hungry[2].push({});
+     *     }
+     * }
+     */
+    function when<E, A1, A2, A3, B>(pattern1:Observable<E, A1>[], f1:(...args:A1[]) => B, pattern2:Observable<E, A2>[], f2:(...args:A2[]) => B, pattern3:Observable<E, A3>[], f3:(...args:A3[]) => B):EventStream<E, B>;
+
+    /**
+     * @callback Bacon.when4~f1
+     * @param {...A1} args
+     * @returns {B}
+     */
+    /**
+     * @callback Bacon.when4~f2
+     * @param {...A2} args
+     * @returns {B}
+     */
+    /**
+     * @callback Bacon.when4~f3
+     * @param {...A3} args
+     * @returns {B}
+     */
+    /**
+     * @callback Bacon.when4~f4
+     * @param {...A4} args
+     * @returns {B}
+     */
+    /**
+     * @method Bacon.when4
+     * @description Creates an [EventStream]{@link Bacon.EventStream} from join-pattern system.
+     * @param {Observable<E, A1>[]} pattern1
+     * @param {Bacon.when4~f1} f1
+     * @param {Observable<E, A2>[]} pattern2
+     * @param {Bacon.when4~f2} f2
+     * @param {Observable<E, A3>[]} pattern3
+     * @param {Bacon.when4~f3} f3
+     * @param {Observable<E, A4>[]} pattern4
+     * @param {Bacon.when4~f4} f4
+     * @returns {EventStream<E, B>}
+     * @example
+     * {
+     *     // Consider implementing a game with discrete time ticks. We want to handle key-events synchronized on tick-events, with at most one key event handled per tick. If there are no key events, we want to just process a tick:
+     *     let tick = Bacon.interval(1e2, 0),
+     *         keyEvent = Bacon.fromEvent(document.body, "click", _ => Date.now()),
+     *         handleTick = _ => `timestamp: NONE`,
+     *         handleKeyEvent = timestamp => `timestamp: ${timestamp}`;
+     *     Bacon.when(
+     *         [tick, keyEvent], (_, timestamp) => handleKeyEvent(timestamp),
+     *         [tick], handleTick
+     *     );
+     *     // Order is important here. If the [tick] patterns had been written first, this would have been tried first, and preferred at each tick.
+     * }
+     *
+     * {
+     *     // Join patterns are indeed a generalization of `zip`, and `zip` is equivalent to a single-rule join pattern. The following `Observable`s have the same output:
+     *     let a = Bacon.once("a"),
+     *         b = Bacon.once("b"),
+     *         c = Bacon.once("c"),
+     *         f = (a, b, c) => `a = ${a}; b = ${b}; c = ${c}.`;
+     *     Bacon.zipWith(f, a, b, c);
+     *     Bacon.when([a, b, c], f);
+     * }
+     *
+     * {
+     *     // Join patterns as a "chemical machine".
+     *     // A quick way to get some intuition for join patterns is to understand them through an analogy in terms of atoms and molecules. A join pattern can here be regarded as a recipe for a chemical reaction. Lets say we have observables `oxygen`, `carbon` and `hydrogen`, where an event in these spawns an 'atom' of that type into a mixture. We can state reactions:
+     *     let oxygen = Bacon.interval(1e3, "O"),
+     *         hydrogen = Bacon.interval(2e3, "H"),
+     *         carbon = Bacon.interval(1.5e3, "C"),
+     *         makeWater = (oxygen:string, hydrogen1:string, hydrogen2:string) => `${hydrogen1}${[hydrogen1, hydrogen2].length}${oxygen}`,
+     *         makeCarbonMonoxide = (oxygen:string, carbon:string) => `${carbon}${oxygen}`;
+     *     Bacon.when(
+     *         [oxygen, hydrogen, hydrogen], makeWater,
+     *         [oxygen, carbon], makeCarbonMonoxide
+     *     );
+     *     // Now, every time a new 'atom' is spawned from one of the observables, this atom is added to the mixture. If at any time there are two hydrogen atoms, and an oxygen atom, the corresponding atoms are *consumed*, and output is produced via `makeWater`. The same semantics apply for the second rule to create carbon monoxide. The rules are tried at each point from top to bottom.
+     * }
+     *
+     * {
+     *     // Join patterns and properties.
+     *     // Properties are not part of the synchronization pattern, but are instead just sampled. The following example take three input streams `$price`, `$quantity` and `$total`, e.g. coming from input fields, and defines mutally recursive behaviours in properties `price`, `quantity` and `total` such that:
+     *     // -- updating `quantity` sets `total` to `price * quantity`;
+     *     // -- updating `total` sets `price` to `total / quantity`.
+     *     let random = (x:number) => Math.round(x * Math.random()),
+     *         id = <A>(x:A):A => x;
+     *     let $quantity = Bacon.interval<Error, number>(1e3, 10).map(random),
+     *         $price = Bacon.interval<Error, number>(2e3, 100).map(random),
+     *         $total = Bacon.interval<Error, number>(1.5e3, 1000).map(random);
+     *     let quantity = $quantity.toProperty(1),
+     *         price = Bacon.when<Error, number, number, number>(
+     *             [$price], id,
+     *             [$total, quantity], (x, y) => x / y
+     *         ).toProperty(0),
+     *         total = Bacon.when<Error, number, number, number, number>(
+     *             [$total], id,
+     *             [$price, quantity], (x, y) => x * y,
+     *             [price, $quantity], (x, y) => x * y
+     *         ).toProperty(0);
+     * }
+     *
+     * {
+     *     // Join patterns and `Bacon.Bus`.
+     *     // The result functions of join patterns are allowed to push values onto a `Bus` that may in turn be in one of its patterns. For instance, an implementation of the dining philosophers problem can be written as follows:
+     *     // Availability of chopsticks are implemented using bus.
+     *     let chopsticks = [new Bacon.Bus(), new Bacon.Bus(), new Bacon.Bus()],
+     *     // Hungry could be any type of observable, but we'll use bus here.
+     *         hungry = [new Bacon.Bus(), new Bacon.Bus(), new Bacon.Bus()],
+     *     // A philosopher eats for one second, then makes the chopsticks available again by pushing values onto their bus.
+     *         eat = (i:number) => () => {
+     *             setTimeout(() => {
+     *                 console.log("done!");
+     *                 chopsticks[i].push({});
+     *                 chopsticks[(i + 1) % 3].push({});
+     *             }, 1e3);
+     *             return `philosopher ${i} eating`;
+     *         },
+     *     // We use Bacon.when to make sure a hungry philosopher can eat only when both his chopsticks are available.
+     *         dining = Bacon.when(
+     *             [hungry[0], chopsticks[0], chopsticks[1]], eat(0),
+     *             [hungry[1], chopsticks[1], chopsticks[2]], eat(1),
+     *             [hungry[2], chopsticks[2], chopsticks[0]], eat(2)
+     *         ).log("dining");
+     *     // Make all chopsticks initially available.
+     *     chopsticks[0].push({});
+     *     chopsticks[1].push({});
+     *     chopsticks[2].push({});
+     *     // Make philosophers hungry in some way, in this case we just push to their bus.
+     *     for (let i = 0; i < 3; i++) {
+     *         hungry[0].push({});
+     *         hungry[1].push({});
+     *         hungry[2].push({});
+     *     }
+     * }
+     */
+    function when<E, A1, A2, A3, A4, B>(pattern1:Observable<E, A1>[], f1:(...args:A1[]) => B, pattern2:Observable<E, A2>[], f2:(...args:A2[]) => B, pattern3:Observable<E, A3>[], f3:(...args:A3[]) => B, pattern4:Observable<E, A4>[], f4:(...args:A4[]) => B):EventStream<E, B>;
+
+    /**
+     * @callback Bacon.when5~f1
+     * @param {...A1} args
+     * @returns {B}
+     */
+    /**
+     * @callback Bacon.when5~f2
+     * @param {...A2} args
+     * @returns {B}
+     */
+    /**
+     * @callback Bacon.when5~f3
+     * @param {...A3} args
+     * @returns {B}
+     */
+    /**
+     * @callback Bacon.when5~f4
+     * @param {...A4} args
+     * @returns {B}
+     */
+    /**
+     * @callback Bacon.when5~f5
+     * @param {...A5} args
+     * @returns {B}
+     */
+    /**
+     * @method Bacon.when5
+     * @description Creates an [EventStream]{@link Bacon.EventStream} from join-pattern system.
+     * @param {Observable<E, A1>[]} pattern1
+     * @param {Bacon.when5~f1} f1
+     * @param {Observable<E, A2>[]} pattern2
+     * @param {Bacon.when5~f2} f2
+     * @param {Observable<E, A3>[]} pattern3
+     * @param {Bacon.when5~f3} f3
+     * @param {Observable<E, A4>[]} pattern4
+     * @param {Bacon.when5~f4} f4
+     * @param {Observable<E, A5>[]} pattern5
+     * @param {Bacon.when5~f5} f5
+     * @returns {EventStream<E, B>}
+     * @example
+     * {
+     *     // Consider implementing a game with discrete time ticks. We want to handle key-events synchronized on tick-events, with at most one key event handled per tick. If there are no key events, we want to just process a tick:
+     *     let tick = Bacon.interval(1e2, 0),
+     *         keyEvent = Bacon.fromEvent(document.body, "click", _ => Date.now()),
+     *         handleTick = _ => `timestamp: NONE`,
+     *         handleKeyEvent = timestamp => `timestamp: ${timestamp}`;
+     *     Bacon.when(
+     *         [tick, keyEvent], (_, timestamp) => handleKeyEvent(timestamp),
+     *         [tick], handleTick
+     *     );
+     *     // Order is important here. If the [tick] patterns had been written first, this would have been tried first, and preferred at each tick.
+     * }
+     *
+     * {
+     *     // Join patterns are indeed a generalization of `zip`, and `zip` is equivalent to a single-rule join pattern. The following `Observable`s have the same output:
+     *     let a = Bacon.once("a"),
+     *         b = Bacon.once("b"),
+     *         c = Bacon.once("c"),
+     *         f = (a, b, c) => `a = ${a}; b = ${b}; c = ${c}.`;
+     *     Bacon.zipWith(f, a, b, c);
+     *     Bacon.when([a, b, c], f);
+     * }
+     *
+     * {
+     *     // Join patterns as a "chemical machine".
+     *     // A quick way to get some intuition for join patterns is to understand them through an analogy in terms of atoms and molecules. A join pattern can here be regarded as a recipe for a chemical reaction. Lets say we have observables `oxygen`, `carbon` and `hydrogen`, where an event in these spawns an 'atom' of that type into a mixture. We can state reactions:
+     *     let oxygen = Bacon.interval(1e3, "O"),
+     *         hydrogen = Bacon.interval(2e3, "H"),
+     *         carbon = Bacon.interval(1.5e3, "C"),
+     *         makeWater = (oxygen:string, hydrogen1:string, hydrogen2:string) => `${hydrogen1}${[hydrogen1, hydrogen2].length}${oxygen}`,
+     *         makeCarbonMonoxide = (oxygen:string, carbon:string) => `${carbon}${oxygen}`;
+     *     Bacon.when(
+     *         [oxygen, hydrogen, hydrogen], makeWater,
+     *         [oxygen, carbon], makeCarbonMonoxide
+     *     );
+     *     // Now, every time a new 'atom' is spawned from one of the observables, this atom is added to the mixture. If at any time there are two hydrogen atoms, and an oxygen atom, the corresponding atoms are *consumed*, and output is produced via `makeWater`. The same semantics apply for the second rule to create carbon monoxide. The rules are tried at each point from top to bottom.
+     * }
+     *
+     * {
+     *     // Join patterns and properties.
+     *     // Properties are not part of the synchronization pattern, but are instead just sampled. The following example take three input streams `$price`, `$quantity` and `$total`, e.g. coming from input fields, and defines mutally recursive behaviours in properties `price`, `quantity` and `total` such that:
+     *     // -- updating `quantity` sets `total` to `price * quantity`;
+     *     // -- updating `total` sets `price` to `total / quantity`.
+     *     let random = (x:number) => Math.round(x * Math.random()),
+     *         id = <A>(x:A):A => x;
+     *     let $quantity = Bacon.interval<Error, number>(1e3, 10).map(random),
+     *         $price = Bacon.interval<Error, number>(2e3, 100).map(random),
+     *         $total = Bacon.interval<Error, number>(1.5e3, 1000).map(random);
+     *     let quantity = $quantity.toProperty(1),
+     *         price = Bacon.when<Error, number, number, number>(
+     *             [$price], id,
+     *             [$total, quantity], (x, y) => x / y
+     *         ).toProperty(0),
+     *         total = Bacon.when<Error, number, number, number, number>(
+     *             [$total], id,
+     *             [$price, quantity], (x, y) => x * y,
+     *             [price, $quantity], (x, y) => x * y
+     *         ).toProperty(0);
+     * }
+     *
+     * {
+     *     // Join patterns and `Bacon.Bus`.
+     *     // The result functions of join patterns are allowed to push values onto a `Bus` that may in turn be in one of its patterns. For instance, an implementation of the dining philosophers problem can be written as follows:
+     *     // Availability of chopsticks are implemented using bus.
+     *     let chopsticks = [new Bacon.Bus(), new Bacon.Bus(), new Bacon.Bus()],
+     *     // Hungry could be any type of observable, but we'll use bus here.
+     *         hungry = [new Bacon.Bus(), new Bacon.Bus(), new Bacon.Bus()],
+     *     // A philosopher eats for one second, then makes the chopsticks available again by pushing values onto their bus.
+     *         eat = (i:number) => () => {
+     *             setTimeout(() => {
+     *                 console.log("done!");
+     *                 chopsticks[i].push({});
+     *                 chopsticks[(i + 1) % 3].push({});
+     *             }, 1e3);
+     *             return `philosopher ${i} eating`;
+     *         },
+     *     // We use Bacon.when to make sure a hungry philosopher can eat only when both his chopsticks are available.
+     *         dining = Bacon.when(
+     *             [hungry[0], chopsticks[0], chopsticks[1]], eat(0),
+     *             [hungry[1], chopsticks[1], chopsticks[2]], eat(1),
+     *             [hungry[2], chopsticks[2], chopsticks[0]], eat(2)
+     *         ).log("dining");
+     *     // Make all chopsticks initially available.
+     *     chopsticks[0].push({});
+     *     chopsticks[1].push({});
+     *     chopsticks[2].push({});
+     *     // Make philosophers hungry in some way, in this case we just push to their bus.
+     *     for (let i = 0; i < 3; i++) {
+     *         hungry[0].push({});
+     *         hungry[1].push({});
+     *         hungry[2].push({});
+     *     }
+     * }
+     */
+    function when<E, A1, A2, A3, A4, A5, B>(pattern1:Observable<E, A1>[], f1:(...args:A1[]) => B, pattern2:Observable<E, A2>[], f2:(...args:A2[]) => B, pattern3:Observable<E, A3>[], f3:(...args:A3[]) => B, pattern4:Observable<E, A4>[], f4:(...args:A4[]) => B, pattern5:Observable<E, A5>[], f5:(...args:A5[]) => B):EventStream<E, B>;
+
+    /**
+     * @callback Bacon.update1~f1
+     * @param {B} initial
+     * @param {...A1} args
+     * @returns {B}
+     */
+    /**
+     * @method Bacon.update1
+     * @description Creates an [Property]{@link Bacon.Property} from an `initial` value and a join-pattern system.
+     * @param {B} initial
+     * @param {Observable<E, A1>[]} pattern1
+     * @param {Bacon.update1~f1} f1
+     * @returns {Property<E, B>}
+     * @example
+     * {
+     *     // The inputs to `Bacon.update` are defined like this:
+     *     let initial = 0,
+     *         x = Bacon.interval(1e3, 1),
+     *         y = Bacon.interval(2e3, 1),
+     *         z = Bacon.interval(1.5e3, 1);
+     *     // NOTE: had to explicitly specify the typing for `previous:number`
+     *     Bacon.update(initial,
+     *         [x, y, z], (previous:number, x, y, z) => previous + x + y + z,
+     *         [x, y], (previous:number, x, y) => previous + x + y + z
+     *     );
+     *     // As input, each function above will get the previous value of the `result` Property, along with values from the listed Observables. The value returned by the function will be used as the next value of `result`. Just like in `Bacon.when`, only EventStreams will trigger an update, while Properties will be just sampled. So, if you list a single EventStream and several Properties, the value will be updated only when an event occurs in the EventStream.
+     * }
+     *
+     * {
+     *     // Here's a simple gaming example:
+     *     let scoreMultiplier = Bacon.constant(1),
+     *         hitUfo = new Bacon.Bus(),
+     *         hitMotherShip = new Bacon.Bus(),
+     *         score = Bacon.update(0,
+     *             [hitUfo, scoreMultiplier], (score, _, multiplier:number) => score + 100 * multiplier,
+     *             [hitMotherShip], (score, _) => score + 2000
+     *         );
+     *     // In the example, the `score` property is updated when either `hitUfo` or `hitMotherShip` occur. The `scoreMultiplier` Property is sampled to take multiplier into account when `hitUfo` occurs.
+     * }
+     */
+    function update<E, A1, B>(initial:B, pattern1:Observable<E, A1>[], f1:(initial:B, ...args:A1[]) => B):Property<E, B>;
+
+    /**
+     * @callback Bacon.update2~f1
+     * @param {B} initial
+     * @param {...A1} args
+     * @returns {B}
+     */
+    /**
+     * @callback Bacon.update2~f2
+     * @param {B} initial
+     * @param {...A2} args
+     * @returns {B}
+     */
+    /**
+     * @method Bacon.update2
+     * @description Creates an [Property]{@link Bacon.Property} from an `initial` value and a join-pattern system.
+     * @param {B} initial
+     * @param {Observable<E, A1>[]} pattern1
+     * @param {Bacon.update2~f1} f1
+     * @param {Observable<E, A2>[]} pattern2
+     * @param {Bacon.update2~f2} f2
+     * @returns {Property<E, B>}
+     * @example
+     * {
+     *     // The inputs to `Bacon.update` are defined like this:
+     *     let initial = 0,
+     *         x = Bacon.interval(1e3, 1),
+     *         y = Bacon.interval(2e3, 1),
+     *         z = Bacon.interval(1.5e3, 1);
+     *     // NOTE: had to explicitly specify the typing for `previous:number`
+     *     Bacon.update(initial,
+     *         [x, y, z], (previous:number, x, y, z) => previous + x + y + z,
+     *         [x, y], (previous:number, x, y) => previous + x + y + z
+     *     );
+     *     // As input, each function above will get the previous value of the `result` Property, along with values from the listed Observables. The value returned by the function will be used as the next value of `result`. Just like in `Bacon.when`, only EventStreams will trigger an update, while Properties will be just sampled. So, if you list a single EventStream and several Properties, the value will be updated only when an event occurs in the EventStream.
+     * }
+     *
+     * {
+     *     // Here's a simple gaming example:
+     *     let scoreMultiplier = Bacon.constant(1),
+     *         hitUfo = new Bacon.Bus(),
+     *         hitMotherShip = new Bacon.Bus(),
+     *         score = Bacon.update(0,
+     *             [hitUfo, scoreMultiplier], (score, _, multiplier:number) => score + 100 * multiplier,
+     *             [hitMotherShip], (score, _) => score + 2000
+     *         );
+     *     // In the example, the `score` property is updated when either `hitUfo` or `hitMotherShip` occur. The `scoreMultiplier` Property is sampled to take multiplier into account when `hitUfo` occurs.
+     * }
+     */
+    function update<E, A1, A2, B>(initial:B, pattern1:Observable<E, A1>[], f1:(initial:B, ...args:A1[]) => B, pattern2:Observable<E, A2>[], f2:(initial:B, ...args:A2[]) => B):Property<E, B>;
+
+    /**
+     * @callback Bacon.update3~f1
+     * @param {B} initial
+     * @param {...A1} args
+     * @returns {B}
+     */
+    /**
+     * @callback Bacon.update3~f2
+     * @param {B} initial
+     * @param {...A2} args
+     * @returns {B}
+     */
+    /**
+     * @callback Bacon.update3~f3
+     * @param {B} initial
+     * @param {...A3} args
+     * @returns {B}
+     */
+    /**
+     * @method Bacon.update3
+     * @description Creates an [Property]{@link Bacon.Property} from an `initial` value and a join-pattern system.
+     * @param {B} initial
+     * @param {Observable<E, A1>[]} pattern1
+     * @param {Bacon.update3~f1} f1
+     * @param {Observable<E, A2>[]} pattern2
+     * @param {Bacon.update3~f2} f2
+     * @param {Observable<E, A3>[]} pattern3
+     * @param {Bacon.update3~f3} f3
+     * @returns {Property<E, B>}
+     * @example
+     * {
+     *     // The inputs to `Bacon.update` are defined like this:
+     *     let initial = 0,
+     *         x = Bacon.interval(1e3, 1),
+     *         y = Bacon.interval(2e3, 1),
+     *         z = Bacon.interval(1.5e3, 1);
+     *     // NOTE: had to explicitly specify the typing for `previous:number`
+     *     Bacon.update(initial,
+     *         [x, y, z], (previous:number, x, y, z) => previous + x + y + z,
+     *         [x, y], (previous:number, x, y) => previous + x + y + z
+     *     );
+     *     // As input, each function above will get the previous value of the `result` Property, along with values from the listed Observables. The value returned by the function will be used as the next value of `result`. Just like in `Bacon.when`, only EventStreams will trigger an update, while Properties will be just sampled. So, if you list a single EventStream and several Properties, the value will be updated only when an event occurs in the EventStream.
+     * }
+     *
+     * {
+     *     // Here's a simple gaming example:
+     *     let scoreMultiplier = Bacon.constant(1),
+     *         hitUfo = new Bacon.Bus(),
+     *         hitMotherShip = new Bacon.Bus(),
+     *         score = Bacon.update(0,
+     *             [hitUfo, scoreMultiplier], (score, _, multiplier:number) => score + 100 * multiplier,
+     *             [hitMotherShip], (score, _) => score + 2000
+     *         );
+     *     // In the example, the `score` property is updated when either `hitUfo` or `hitMotherShip` occur. The `scoreMultiplier` Property is sampled to take multiplier into account when `hitUfo` occurs.
+     * }
+     */
+    function update<E, A1, A2, A3, B>(initial:B, pattern1:Observable<E, A1>[], f1:(initial:B, ...args:A1[]) => B, pattern2:Observable<E, A2>[], f2:(initial:B, ...args:A2[]) => B, pattern3:Observable<E, A3>[], f3:(initial:B, ...args:A3[]) => B):Property<E, B>;
+
+    /**
+     * @callback Bacon.update4~f1
+     * @param {B} initial
+     * @param {...A1} args
+     * @returns {B}
+     */
+    /**
+     * @callback Bacon.update4~f2
+     * @param {B} initial
+     * @param {...A2} args
+     * @returns {B}
+     */
+    /**
+     * @callback Bacon.update4~f3
+     * @param {B} initial
+     * @param {...A3} args
+     * @returns {B}
+     */
+    /**
+     * @callback Bacon.update4~f4
+     * @param {B} initial
+     * @param {...A4} args
+     * @returns {B}
+     */
+    /**
+     * @method Bacon.update4
+     * @description Creates an [Property]{@link Bacon.Property} from an `initial` value and a join-pattern system.
+     * @param {B} initial
+     * @param {Observable<E, A1>[]} pattern1
+     * @param {Bacon.update4~f1} f1
+     * @param {Observable<E, A2>[]} pattern2
+     * @param {Bacon.update4~f2} f2
+     * @param {Observable<E, A3>[]} pattern3
+     * @param {Bacon.update4~f3} f3
+     * @param {Observable<E, A4>[]} pattern4
+     * @param {Bacon.update4~f4} f4
+     * @returns {Property<E, B>}
+     * @example
+     * {
+     *     // The inputs to `Bacon.update` are defined like this:
+     *     let initial = 0,
+     *         x = Bacon.interval(1e3, 1),
+     *         y = Bacon.interval(2e3, 1),
+     *         z = Bacon.interval(1.5e3, 1);
+     *     // NOTE: had to explicitly specify the typing for `previous:number`
+     *     Bacon.update(initial,
+     *         [x, y, z], (previous:number, x, y, z) => previous + x + y + z,
+     *         [x, y], (previous:number, x, y) => previous + x + y + z
+     *     );
+     *     // As input, each function above will get the previous value of the `result` Property, along with values from the listed Observables. The value returned by the function will be used as the next value of `result`. Just like in `Bacon.when`, only EventStreams will trigger an update, while Properties will be just sampled. So, if you list a single EventStream and several Properties, the value will be updated only when an event occurs in the EventStream.
+     * }
+     *
+     * {
+     *     // Here's a simple gaming example:
+     *     let scoreMultiplier = Bacon.constant(1),
+     *         hitUfo = new Bacon.Bus(),
+     *         hitMotherShip = new Bacon.Bus(),
+     *         score = Bacon.update(0,
+     *             [hitUfo, scoreMultiplier], (score, _, multiplier:number) => score + 100 * multiplier,
+     *             [hitMotherShip], (score, _) => score + 2000
+     *         );
+     *     // In the example, the `score` property is updated when either `hitUfo` or `hitMotherShip` occur. The `scoreMultiplier` Property is sampled to take multiplier into account when `hitUfo` occurs.
+     * }
+     */
+    function update<E, A1, A2, A3, A4, B>(initial:B, pattern1:Observable<E, A1>[], f1:(initial:B, ...args:A1[]) => B, pattern2:Observable<E, A2>[], f2:(initial:B, ...args:A2[]) => B, pattern3:Observable<E, A3>[], f3:(initial:B, ...args:A3[]) => B, pattern4:Observable<E, A4>[], f4:(initial:B, ...args:A4[]) => B):Property<E, B>;
+
+    /**
+     * @callback Bacon.update5~f1
+     * @param {B} initial
+     * @param {...A1} args
+     * @returns {B}
+     */
+    /**
+     * @callback Bacon.update5~f2
+     * @param {B} initial
+     * @param {...A2} args
+     * @returns {B}
+     */
+    /**
+     * @callback Bacon.update5~f3
+     * @param {B} initial
+     * @param {...A3} args
+     * @returns {B}
+     */
+    /**
+     * @callback Bacon.update5~f4
+     * @param {B} initial
+     * @param {...A4} args
+     * @returns {B}
+     */
+    /**
+     * @callback Bacon.update5~f5
+     * @param {B} initial
+     * @param {...A5} args
+     * @returns {B}
+     */
+    /**
+     * @method Bacon.update5
+     * @description Creates an [Property]{@link Bacon.Property} from an `initial` value and a join-pattern system.
+     * @param {B} initial
+     * @param {Observable<E, A1>[]} pattern1
+     * @param {Bacon.update5~f1} f1
+     * @param {Observable<E, A2>[]} pattern2
+     * @param {Bacon.update5~f2} f2
+     * @param {Observable<E, A3>[]} pattern3
+     * @param {Bacon.update5~f3} f3
+     * @param {Observable<E, A4>[]} pattern4
+     * @param {Bacon.update5~f4} f4
+     * @param {Observable<E, A5>[]} pattern5
+     * @param {Bacon.update5~f5} f5
+     * @returns {Property<E, B>}
+     * @example
+     * {
+     *     // The inputs to `Bacon.update` are defined like this:
+     *     let initial = 0,
+     *         x = Bacon.interval(1e3, 1),
+     *         y = Bacon.interval(2e3, 1),
+     *         z = Bacon.interval(1.5e3, 1);
+     *     // NOTE: had to explicitly specify the typing for `previous:number`
+     *     Bacon.update(initial,
+     *         [x, y, z], (previous:number, x, y, z) => previous + x + y + z,
+     *         [x, y], (previous:number, x, y) => previous + x + y + z
+     *     );
+     *     // As input, each function above will get the previous value of the `result` Property, along with values from the listed Observables. The value returned by the function will be used as the next value of `result`. Just like in `Bacon.when`, only EventStreams will trigger an update, while Properties will be just sampled. So, if you list a single EventStream and several Properties, the value will be updated only when an event occurs in the EventStream.
+     * }
+     *
+     * {
+     *     // Here's a simple gaming example:
+     *     let scoreMultiplier = Bacon.constant(1),
+     *         hitUfo = new Bacon.Bus(),
+     *         hitMotherShip = new Bacon.Bus(),
+     *         score = Bacon.update(0,
+     *             [hitUfo, scoreMultiplier], (score, _, multiplier:number) => score + 100 * multiplier,
+     *             [hitMotherShip], (score, _) => score + 2000
+     *         );
+     *     // In the example, the `score` property is updated when either `hitUfo` or `hitMotherShip` occur. The `scoreMultiplier` Property is sampled to take multiplier into account when `hitUfo` occurs.
+     * }
+     */
+    function update<E, A1, A2, A3, A4, A5, B>(initial:B, pattern1:Observable<E, A1>[], f1:(initial:B, ...args:A1[]) => B, pattern2:Observable<E, A2>[], f2:(initial:B, ...args:A2[]) => B, pattern3:Observable<E, A3>[], f3:(initial:B, ...args:A3[]) => B, pattern4:Observable<E, A4>[], f4:(initial:B, ...args:A4[]) => B, pattern5:Observable<E, A5>[], f5:(initial:B, ...args:A5[]) => B):Property<E, B>;
+}
+
+declare module "baconjs" {
+    export = Bacon;
+}
diff --git a/baconjs/tsconfig.json b/baconjs/tsconfig.json
new file mode 100644
index 0000000000..3cd0556304
--- /dev/null
+++ b/baconjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "baconjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/barcode/barcode-tests.ts b/barcode/barcode-tests.ts
index bb7b67187e..2748143a3b 100644
--- a/barcode/barcode-tests.ts
+++ b/barcode/barcode-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="barcode.d.ts" />
+
 import barcode = require('barcode');
 import path = require('path');
 
diff --git a/barcode/barcode.d.ts b/barcode/barcode.d.ts
deleted file mode 100644
index c2ad43eb76..0000000000
--- a/barcode/barcode.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-// Type definitions for barcode
-// Project: https://github.com/samt/barcode
-// Definitions by: Pascal Vomhoff <https://github.com/pvomhoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "barcode" {
-
-    interface BarcodeOptions {
-        data:string|number;
-        width:number;
-        height:number;
-    }
-
-    interface BarcodeResult {
-        getStream(callback:(err:NodeJS.ErrnoException, stream:NodeJS.ReadableStream) => void):void;
-        saveImage(outputfilePath:string, callback:(err:NodeJS.ErrnoException) => void):void;
-        getBase64(callback:(err:NodeJS.ErrnoException, base64String:string) => void):void;
-    }
-
-    function barcode(type:string, options:BarcodeOptions):BarcodeResult;
-
-    export = barcode;
-}
diff --git a/barcode/index.d.ts b/barcode/index.d.ts
new file mode 100644
index 0000000000..122eb98e5a
--- /dev/null
+++ b/barcode/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for barcode
+// Project: https://github.com/samt/barcode
+// Definitions by: Pascal Vomhoff <https://github.com/pvomhoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+interface BarcodeOptions {
+    data: string | number;
+    width: number;
+    height: number;
+}
+
+interface BarcodeResult {
+    getStream(callback: (err: NodeJS.ErrnoException, stream: NodeJS.ReadableStream) => void): void;
+    saveImage(outputfilePath: string, callback: (err: NodeJS.ErrnoException) => void): void;
+    getBase64(callback: (err: NodeJS.ErrnoException, base64String: string) => void): void;
+}
+
+declare function barcode(type: string, options: BarcodeOptions): BarcodeResult;
+
+export = barcode;
diff --git a/barcode/tsconfig.json b/barcode/tsconfig.json
new file mode 100644
index 0000000000..f66f5c6204
--- /dev/null
+++ b/barcode/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "barcode-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bardjs/bardjs-tests.ts b/bardjs/bardjs-tests.ts
index b29900ad7d..4dad9b9ad9 100644
--- a/bardjs/bardjs-tests.ts
+++ b/bardjs/bardjs-tests.ts
@@ -1,8 +1,6 @@
-/// <reference path="bardjs.d.ts" />
-/// <reference path="../mocha/mocha.d.ts" />
-/// <reference path="../chai/chai.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="../angularjs/angular-mocks.d.ts" />
+/// <reference types="mocha" />
+/// <reference types="chai" />
+/// <reference types="angularjs" />
 
 namespace bardTests {
     var expect = chai.expect,
diff --git a/bardjs/bardjs.d.ts b/bardjs/bardjs.d.ts
deleted file mode 100644
index 4395ef6ddb..0000000000
--- a/bardjs/bardjs.d.ts
+++ /dev/null
@@ -1,174 +0,0 @@
-// Type definitions for bardjs 0.1.4
-// Project: https://github.com/wardbell/bardjs
-// Definitions by: Andrew Archibald <https://github.com/TepigMC>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="../chai/chai.d.ts" />
-/// <reference path="../mocha/mocha.d.ts" />
-
-/**
- * Module for bardjs functions
- */
-declare namespace bard {
-    /**
-     *  Replaces the ngMock'ed $httpBackend with the real one from ng thus
-     *  restoring the ability to issue AJAX calls to the backend with $http.
-     *
-     *  Note that $q remains ngMocked so you must flush $http calls ($rootScope.$digest).
-     *  Use $rootScope.$apply() for this purpose.
-     *
-     *  Could restore $q with $qReal in which case don't need to flush.
-     */
-    function $httpBackend($provide: angular.auto.IProvideService): any;
-
-    /**
-     *  Replaces the ngMock'ed $q with the real one from ng thus
-     *  obviating the need to flush $http and $q queues
-     *  at the expense of ability to control $q timing.
-     */
-    function $q($provide: angular.auto.IProvideService): any;
-
-    /**
-     * Add names of globals to list of OK globals for this mocha spec
-     * NB: Call this method ONLY if you're using mocha!
-     * NB: Turn off browser-sync else mocha detects the browser-sync globals
-     * like ` ___browserSync___`
-     */
-    function addGlobals(...globals: any[]): void;
-
-    /**
-     * Prepare ngMocked application feature module
-     * along with faked toastr, routehelper,
-     * and faked router services.
-     * Especially useful for controller testing
-     * Use it as you would the ngMocks#module method
-     *
-     * DO NOT USE IF YOU NEED THE REAL ROUTER SERVICES!
-     * Fall back to `angular.mock.module(...)` or just `module(...)`
-     */
-    function appModule(...fns: (string | Function | Object)[]): () => void;
-
-    /**
-     * Assert a failure in mocha, without condition
-     */
-    function assertFail(message: string): Chai.AssertionError;
-
-    /**
-     * Prepare ngMocked module definition that makes real $http and $q calls
-     * Also adds fakeLogger to the end of the definition
-     * Use it as you would the ngMocks#module method
-     */
-    function asyncModule(...fns: (string | Function | Object)[]): () => void;
-
-    /**
-     * Get or set bard debugging flag
-     */
-    function debugging(newFlag?: any): boolean;
-
-    /**
-     * Registers a fake logger service that you can spy on
-     */
-    function fakeLogger($provide: angular.auto.IProvideService): void;
-
-    /**
-     * Registers a fake route helper provider service that you can spy on
-     */
-    function fakeRouteHelperProvider($provide: angular.auto.IProvideService): void;
-
-    /**
-     * Stub out the $routeProvider so we avoid
-     * all routing calls, including the default route
-     * which runs on every test otherwise.
-     * Make sure this goes before the inject in the spec.
-     */
-    function fakeRouteProvider($provide: angular.auto.IProvideService): void;
-
-    /**
-     * Stub out the $stateProvider so we avoid
-     * all routing calls, including the default state
-     * which runs on every test otherwise.
-     * Make sure this goes before the inject in the spec.
-     */
-    function fakeStateProvider($provide: angular.auto.IProvideService): void;
-
-    /**
-     * Registers a fake toastr service that you can spy on
-     */
-    function fakeToastr($provide: angular.auto.IProvideService): void;
-
-    /**
-     * Inject selected services into the windows object during test
-     * then remove them when test ends with an `afterEach`.
-     *
-     * spares us the repetition of creating common service vars and injecting them
-     *
-     * Option: the first argument may be the mocha spec context object (`this`)
-     *         It MUST be `this` if you what to check for mocha global leaks.
-     *         Do NOT supply `this` as the first arg if you're not running mocha specs.
-     *
-     * remaining inject arguments may take one of 3 forms :
-     *
-     *    function    - This fn will be passed to ngMocks.inject.
-     *                  Annotations extracted after inject does its thing.
-     *    [strings]   - same string array you'd use to set fn.$inject
-     *    (...string) - string arguments turned into a string array
-     */
-    function inject(context?: Function, ...args: string[]): void;
-
-    /**
-     * Write to console if bard debugging flag is on
-     */
-    function log(message: any): void;
-
-    /**
-     *  Listen to mocha test runner events
-     *  Usage in browser:
-     *     var runner = mocha.run();
-     *     bard.mochaRunnerListener(runner);
-     */
-    function mochaRunnerListener(runner: Mocha.IRunner): void;
-
-    /**
-     * Mocks out a service with sinon stubbed functions
-     * that return the values specified in the config
-     *
-     * If the config value is `undefined`,
-     * stub the service method with a dummy that doesn't return a value
-     *
-     * If the config value is a function, set service property with it
-     *
-     * If a service member is a property, not a function,
-     * set it with the config value
-     * If a service member name is not a key in config,
-     * follow the same logic as above to set its members
-     * using the config._default value (which is `undefined` if omitted)
-     *
-     * If there is a config entry that is NOT a member of the service
-     * add mocked function to the service using the config value
-     */
-    function mockService(service: any, config: any): any;
-
-    /**
-     * Replaces the accented characters of many European languages w/ unaccented chars
-     * Use it in JavaScript string sorts where such characters may be encountered
-     * Matches the default string comparers of most databases.
-     * Ex: replaceAccentChars(a.Name) < replaceAccentChars(b.Name)
-     * instead of:            a.Name  <                    b.Name
-     */
-    function replaceAccentChars(text: string): string;
-
-    /**
-     *  Assert that there are no outstanding HTTP requests after test is complete
-     *  For use with ngMocks; doesn't work for async server integration tests
-     */
-    function verifyNoOutstandingHttpRequests(): void;
-
-    /**
-     * Returns a function that execute a callback function
-     * (typically a fn making asserts) within a try/catch
-     * The try/catch then calls the ambient "done" function
-     * in the appropriate way for both success and failure
-     */
-    function wrapWithDone(callback: Function, done: Function): Function;
-}
diff --git a/bardjs/index.d.ts b/bardjs/index.d.ts
new file mode 100644
index 0000000000..c2e9a76a06
--- /dev/null
+++ b/bardjs/index.d.ts
@@ -0,0 +1,174 @@
+// Type definitions for bardjs 0.1.4
+// Project: https://github.com/wardbell/bardjs
+// Definitions by: Andrew Archibald <https://github.com/TepigMC>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+/// <reference types="chai" />
+/// <reference types="mocha" />
+
+/**
+ * Module for bardjs functions
+ */
+declare namespace bard {
+    /**
+     *  Replaces the ngMock'ed $httpBackend with the real one from ng thus
+     *  restoring the ability to issue AJAX calls to the backend with $http.
+     *
+     *  Note that $q remains ngMocked so you must flush $http calls ($rootScope.$digest).
+     *  Use $rootScope.$apply() for this purpose.
+     *
+     *  Could restore $q with $qReal in which case don't need to flush.
+     */
+    function $httpBackend($provide: angular.auto.IProvideService): any;
+
+    /**
+     *  Replaces the ngMock'ed $q with the real one from ng thus
+     *  obviating the need to flush $http and $q queues
+     *  at the expense of ability to control $q timing.
+     */
+    function $q($provide: angular.auto.IProvideService): any;
+
+    /**
+     * Add names of globals to list of OK globals for this mocha spec
+     * NB: Call this method ONLY if you're using mocha!
+     * NB: Turn off browser-sync else mocha detects the browser-sync globals
+     * like ` ___browserSync___`
+     */
+    function addGlobals(...globals: any[]): void;
+
+    /**
+     * Prepare ngMocked application feature module
+     * along with faked toastr, routehelper,
+     * and faked router services.
+     * Especially useful for controller testing
+     * Use it as you would the ngMocks#module method
+     *
+     * DO NOT USE IF YOU NEED THE REAL ROUTER SERVICES!
+     * Fall back to `angular.mock.module(...)` or just `module(...)`
+     */
+    function appModule(...fns: (string | Function | Object)[]): () => void;
+
+    /**
+     * Assert a failure in mocha, without condition
+     */
+    function assertFail(message: string): Chai.AssertionError;
+
+    /**
+     * Prepare ngMocked module definition that makes real $http and $q calls
+     * Also adds fakeLogger to the end of the definition
+     * Use it as you would the ngMocks#module method
+     */
+    function asyncModule(...fns: (string | Function | Object)[]): () => void;
+
+    /**
+     * Get or set bard debugging flag
+     */
+    function debugging(newFlag?: any): boolean;
+
+    /**
+     * Registers a fake logger service that you can spy on
+     */
+    function fakeLogger($provide: angular.auto.IProvideService): void;
+
+    /**
+     * Registers a fake route helper provider service that you can spy on
+     */
+    function fakeRouteHelperProvider($provide: angular.auto.IProvideService): void;
+
+    /**
+     * Stub out the $routeProvider so we avoid
+     * all routing calls, including the default route
+     * which runs on every test otherwise.
+     * Make sure this goes before the inject in the spec.
+     */
+    function fakeRouteProvider($provide: angular.auto.IProvideService): void;
+
+    /**
+     * Stub out the $stateProvider so we avoid
+     * all routing calls, including the default state
+     * which runs on every test otherwise.
+     * Make sure this goes before the inject in the spec.
+     */
+    function fakeStateProvider($provide: angular.auto.IProvideService): void;
+
+    /**
+     * Registers a fake toastr service that you can spy on
+     */
+    function fakeToastr($provide: angular.auto.IProvideService): void;
+
+    /**
+     * Inject selected services into the windows object during test
+     * then remove them when test ends with an `afterEach`.
+     *
+     * spares us the repetition of creating common service vars and injecting them
+     *
+     * Option: the first argument may be the mocha spec context object (`this`)
+     *         It MUST be `this` if you what to check for mocha global leaks.
+     *         Do NOT supply `this` as the first arg if you're not running mocha specs.
+     *
+     * remaining inject arguments may take one of 3 forms :
+     *
+     *    function    - This fn will be passed to ngMocks.inject.
+     *                  Annotations extracted after inject does its thing.
+     *    [strings]   - same string array you'd use to set fn.$inject
+     *    (...string) - string arguments turned into a string array
+     */
+    function inject(context?: Function, ...args: string[]): void;
+
+    /**
+     * Write to console if bard debugging flag is on
+     */
+    function log(message: any): void;
+
+    /**
+     *  Listen to mocha test runner events
+     *  Usage in browser:
+     *     var runner = mocha.run();
+     *     bard.mochaRunnerListener(runner);
+     */
+    function mochaRunnerListener(runner: Mocha.IRunner): void;
+
+    /**
+     * Mocks out a service with sinon stubbed functions
+     * that return the values specified in the config
+     *
+     * If the config value is `undefined`,
+     * stub the service method with a dummy that doesn't return a value
+     *
+     * If the config value is a function, set service property with it
+     *
+     * If a service member is a property, not a function,
+     * set it with the config value
+     * If a service member name is not a key in config,
+     * follow the same logic as above to set its members
+     * using the config._default value (which is `undefined` if omitted)
+     *
+     * If there is a config entry that is NOT a member of the service
+     * add mocked function to the service using the config value
+     */
+    function mockService(service: any, config: any): any;
+
+    /**
+     * Replaces the accented characters of many European languages w/ unaccented chars
+     * Use it in JavaScript string sorts where such characters may be encountered
+     * Matches the default string comparers of most databases.
+     * Ex: replaceAccentChars(a.Name) < replaceAccentChars(b.Name)
+     * instead of:            a.Name  <                    b.Name
+     */
+    function replaceAccentChars(text: string): string;
+
+    /**
+     *  Assert that there are no outstanding HTTP requests after test is complete
+     *  For use with ngMocks; doesn't work for async server integration tests
+     */
+    function verifyNoOutstandingHttpRequests(): void;
+
+    /**
+     * Returns a function that execute a callback function
+     * (typically a fn making asserts) within a try/catch
+     * The try/catch then calls the ambient "done" function
+     * in the appropriate way for both success and failure
+     */
+    function wrapWithDone(callback: Function, done: Function): Function;
+}
diff --git a/bardjs/tsconfig.json b/bardjs/tsconfig.json
new file mode 100644
index 0000000000..e3d00cc1ed
--- /dev/null
+++ b/bardjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bardjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/base-x/base-x-tests.ts b/base-x/base-x-tests.ts
index 3e082c45ba..44e302d2d5 100644
--- a/base-x/base-x-tests.ts
+++ b/base-x/base-x-tests.ts
@@ -1,8 +1,7 @@
-/// <reference path="./base-x.d.ts" />
 
 import * as basex from 'base-x';
 
-let bs16: BaseX.BaseConverter = basex('0123456789ABCDEF');
+let bs16 = basex('0123456789ABCDEF');
 
 {
 	let encoded: string;
diff --git a/base-x/base-x.d.ts b/base-x/base-x.d.ts
deleted file mode 100644
index b6b764befe..0000000000
--- a/base-x/base-x.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Type definitions for base-x v1.0.1
-// Project: https://github.com/cryptocoinjs/base-x
-// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace BaseX {
-	interface EncodeBuffer {
-		[index: number]: number;
-		length: number;
-	}
-
-	interface BaseConverter {
-		encode: (buffer: EncodeBuffer) => string;
-		decode: (string: string) => number[];
-	}
-
-	interface Base {
-		(ALPHABET: string): BaseX.BaseConverter
-	}
-}
-
-declare module "base-x" {
-	namespace base {}
-
-	let base: BaseX.Base;
-
-	export = base;
-}
diff --git a/base-x/index.d.ts b/base-x/index.d.ts
new file mode 100644
index 0000000000..19af3aa993
--- /dev/null
+++ b/base-x/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for base-x v1.0.1
+// Project: https://github.com/cryptocoinjs/base-x
+// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var base: BaseX.Base;
+export = base;
+
+declare namespace BaseX {
+	interface EncodeBuffer {
+		[index: number]: number;
+		length: number;
+	}
+
+	interface BaseConverter {
+		encode: (buffer: EncodeBuffer) => string;
+		decode: (string: string) => number[];
+	}
+
+	interface Base {
+		(ALPHABET: string): BaseX.BaseConverter
+	}
+}
diff --git a/base-x/tsconfig.json b/base-x/tsconfig.json
new file mode 100644
index 0000000000..e18efdf2c7
--- /dev/null
+++ b/base-x/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "base-x-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/basic-auth/basic-auth-tests.ts b/basic-auth/basic-auth-tests.ts
index 54be7af1f4..1fab9c10e2 100644
--- a/basic-auth/basic-auth-tests.ts
+++ b/basic-auth/basic-auth-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="basic-auth.d.ts" />
 
 import auth = require('basic-auth');
 
diff --git a/basic-auth/basic-auth.d.ts b/basic-auth/basic-auth.d.ts
deleted file mode 100644
index 911299a6c6..0000000000
--- a/basic-auth/basic-auth.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Type definitions for basic-auth
-// Project: https://github.com/jshttp/basic-auth
-// Definitions by: Clément Bourgeois <https://github.com/moonpyk>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "basic-auth" {
-    function auth(req: Express.Request): auth.BasicAuthResult;
-
-    namespace auth {
-        interface BasicAuthResult {
-            name: string;
-            pass: string;
-        }
-    }
-
-    export = auth;
-}
diff --git a/basic-auth/index.d.ts b/basic-auth/index.d.ts
new file mode 100644
index 0000000000..3dc19b3046
--- /dev/null
+++ b/basic-auth/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for basic-auth
+// Project: https://github.com/jshttp/basic-auth
+// Definitions by: Clément Bourgeois <https://github.com/moonpyk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as Express from 'express';
+
+declare function auth(req: Express.Request): auth.BasicAuthResult;
+
+declare namespace auth {
+    interface BasicAuthResult {
+        name: string;
+        pass: string;
+    }
+}
+
+export = auth;
diff --git a/basic-auth/tsconfig.json b/basic-auth/tsconfig.json
new file mode 100644
index 0000000000..06eb0913cf
--- /dev/null
+++ b/basic-auth/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "basic-auth-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/batch-stream/batch-stream-tests.ts b/batch-stream/batch-stream-tests.ts
index 2271e67e57..d3195466e8 100644
--- a/batch-stream/batch-stream-tests.ts
+++ b/batch-stream/batch-stream-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../node/node.d.ts" />
-/// <reference path="batch-stream.d.ts" />
+/// <reference types="node" />
 
 import fs = require('fs');
 import BatchStream = require('batch-stream');
diff --git a/batch-stream/batch-stream.d.ts b/batch-stream/batch-stream.d.ts
deleted file mode 100644
index 5b27050104..0000000000
--- a/batch-stream/batch-stream.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Type definitions for batch-stream 0.1.2
-// Project: https://github.com/segmentio/batch-stream
-// Definitions by: Nicholas Penree <http://github.com/drudge>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "batch-stream" {
-  import stream = require('stream');
-
-  interface Options {
-    size?: number;
-    highWaterMark?: number;
-  }
-
-  class BatchStream extends stream.Transform {
-    size: number;
-    batch: any[];
-
-    constructor(options: Options);
-  }
-
-  export = BatchStream;
-}
\ No newline at end of file
diff --git a/batch-stream/index.d.ts b/batch-stream/index.d.ts
new file mode 100644
index 0000000000..26c433a04b
--- /dev/null
+++ b/batch-stream/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for batch-stream 0.1.2
+// Project: https://github.com/segmentio/batch-stream
+// Definitions by: Nicholas Penree <http://github.com/drudge>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import stream = require('stream');
+
+interface Options {
+    size?: number;
+    highWaterMark?: number;
+}
+
+declare class BatchStream extends stream.Transform {
+    size: number;
+    batch: any[];
+
+    constructor(options: Options);
+}
+
+export = BatchStream;
diff --git a/batch-stream/tsconfig.json b/batch-stream/tsconfig.json
new file mode 100644
index 0000000000..377af76001
--- /dev/null
+++ b/batch-stream/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "batch-stream-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bcrypt-nodejs/bcrypt-nodejs-tests.ts b/bcrypt-nodejs/bcrypt-nodejs-tests.ts
index 2a151c1c7e..a1a2944d52 100644
--- a/bcrypt-nodejs/bcrypt-nodejs-tests.ts
+++ b/bcrypt-nodejs/bcrypt-nodejs-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="bcrypt-nodejs.d.ts" />
 
 import bCrypt = require("bcrypt-nodejs");
 
diff --git a/bcrypt-nodejs/bcrypt-nodejs.d.ts b/bcrypt-nodejs/bcrypt-nodejs.d.ts
deleted file mode 100644
index 6df662346a..0000000000
--- a/bcrypt-nodejs/bcrypt-nodejs.d.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-// Type definitions for bcrypt-nodejs
-// Project: https://github.com/shaneGirish/bcrypt-nodejs
-// Definitions by: David Broder-Rodgers <https://github.com/DavidBR-SW/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "bcrypt-nodejs" {
-    /**
-     * Generate a salt synchronously
-     * @param rounds Number of rounds to process the data for (default - 10)
-     * @return Generated salt
-     */
-    export function genSaltSync(rounds?: number): string;
-
-    /**
-     * Generate a salt asynchronously
-     * @param rounds Number of rounds to process the data for (default - 10)
-     * @param callback Callback with error and resulting salt, to be fired once the salt has been generated
-     */
-    export function genSalt(rounds: number, callback: (error: Error, result: string) => void): void;
-
-    /**
-     * Generate a hash synchronously
-     * @param data Data to be encrypted
-     * @param salt Salt to be used in encryption (default - new salt generated with 10 rounds)
-     * @return Generated hash
-     */
-    export function hashSync(data: string, salt?: string): string;
-
-    /**
-     * Generate a hash asynchronously
-     * @param data Data to be encrypted
-     * @param salt Salt to be used in encryption
-     * @param callback Callback with error and hashed result, to be fired once the data has been encrypted
-     */
-    export function hash(data: string, salt: string, callback: (error: Error, result: string) => void): void;
-
-    /**
-     * Generate a hash asynchronously
-     * @param data Data to be encrypted
-     * @param salt Salt to be used in encryption
-     * @param progressCallback Callback to be fired multiple times during the hash calculation to signify progress
-     * @param callback Callback with error and hashed result, to be fired once the data has been encrypted
-     */
-    export function hash(data: string, salt: string, progressCallback: () => void, callback: (error: Error, result: string) => void): void;
-
-    /**
-     * Compares data with a hash synchronously
-     * @param data Data to be compared
-     * @param hash Hash to be compared to
-     * @return true if matching, false otherwise
-     */
-    export function compareSync(data: string, hash: string): boolean;
-
-    /**
-     * Compares data with a hash asynchronously
-     * @param data Data to be compared
-     * @param hash Hash to be compared to
-     * @param callback Callback with error and match result, to be fired once the data has been compared
-     */
-    export function compare(data: string, hash: string, callback: (error: Error, result: boolean) => void): void;
-
-    /**
-     * Get number of rounds used for hash
-     * @param hash Hash from which the number of rounds used should be extracted
-     * @return number of rounds used to encrypt a given hash
-     */
-    export function getRounds(hash: string): number;
-}
diff --git a/bcrypt-nodejs/index.d.ts b/bcrypt-nodejs/index.d.ts
new file mode 100644
index 0000000000..d6baffaffa
--- /dev/null
+++ b/bcrypt-nodejs/index.d.ts
@@ -0,0 +1,67 @@
+// Type definitions for bcrypt-nodejs
+// Project: https://github.com/shaneGirish/bcrypt-nodejs
+// Definitions by: David Broder-Rodgers <https://github.com/DavidBR-SW/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/**
+ * Generate a salt synchronously
+ * @param rounds Number of rounds to process the data for (default - 10)
+ * @return Generated salt
+ */
+export declare function genSaltSync(rounds?: number): string;
+
+/**
+ * Generate a salt asynchronously
+ * @param rounds Number of rounds to process the data for (default - 10)
+ * @param callback Callback with error and resulting salt, to be fired once the salt has been generated
+ */
+export declare function genSalt(rounds: number, callback: (error: Error, result: string) => void): void;
+
+/**
+ * Generate a hash synchronously
+ * @param data Data to be encrypted
+ * @param salt Salt to be used in encryption (default - new salt generated with 10 rounds)
+ * @return Generated hash
+ */
+export declare function hashSync(data: string, salt?: string): string;
+
+/**
+ * Generate a hash asynchronously
+ * @param data Data to be encrypted
+ * @param salt Salt to be used in encryption
+ * @param callback Callback with error and hashed result, to be fired once the data has been encrypted
+ */
+export declare function hash(data: string, salt: string, callback: (error: Error, result: string) => void): void;
+
+/**
+ * Generate a hash asynchronously
+ * @param data Data to be encrypted
+ * @param salt Salt to be used in encryption
+ * @param progressCallback Callback to be fired multiple times during the hash calculation to signify progress
+ * @param callback Callback with error and hashed result, to be fired once the data has been encrypted
+ */
+export declare function hash(data: string, salt: string, progressCallback: () => void, callback: (error: Error, result: string) => void): void;
+
+/**
+ * Compares data with a hash synchronously
+ * @param data Data to be compared
+ * @param hash Hash to be compared to
+ * @return true if matching, false otherwise
+ */
+export declare function compareSync(data: string, hash: string): boolean;
+
+/**
+ * Compares data with a hash asynchronously
+ * @param data Data to be compared
+ * @param hash Hash to be compared to
+ * @param callback Callback with error and match result, to be fired once the data has been compared
+ */
+export declare function compare(data: string, hash: string, callback: (error: Error, result: boolean) => void): void;
+
+/**
+ * Get number of rounds used for hash
+ * @param hash Hash from which the number of rounds used should be extracted
+ * @return number of rounds used to encrypt a given hash
+ */
+export declare function getRounds(hash: string): number;
diff --git a/bcrypt-nodejs/tsconfig.json b/bcrypt-nodejs/tsconfig.json
new file mode 100644
index 0000000000..2db80659fc
--- /dev/null
+++ b/bcrypt-nodejs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bcrypt-nodejs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bcrypt/bcrypt-tests.ts b/bcrypt/bcrypt-tests.ts
index b88d4fb7aa..ec4701dab2 100644
--- a/bcrypt/bcrypt-tests.ts
+++ b/bcrypt/bcrypt-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="bcrypt.d.ts" />
 
 import bcrypt = require("bcrypt");
 
diff --git a/bcrypt/bcrypt.d.ts b/bcrypt/bcrypt.d.ts
deleted file mode 100644
index 38d9604b44..0000000000
--- a/bcrypt/bcrypt.d.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-// Type definitions for bcrypt
-// Project: https://www.npmjs.org/package/bcrypt
-// Definitions by: Peter Harris <https://github.com/codeanimal>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "bcrypt" {
-  /**
-   * @param rounds  The cost of processing the data. Default 10.
-   */
-  export function genSaltSync(rounds?: number): string;
-
-  /**
-   * @param rounds    The cost of processing the data. Default 10.
-   * @param callback  A callback to be fire once the sald has been generated. Uses eio making it asynchronous.
-   */
-  export function genSalt(rounds: number, callback: (err: Error, salt: string) => void): void;
-  /**
-   * @param callback  A callback to be fire once the sald has been generated. Uses eio making it asynchronous.
-   */
-  export function genSalt(callback: (err: Error, salt: string) => void): void;
-
-  /**
-   * @param data  The data to be encrypted.
-   * @param salt  The salt to be used in encryption.
-   */
-  export function hashSync(data: any, salt: string): string;
-  /**
-   * @param data    The data to be encrypted.
-   * @param rounds  A salt will be generated using the rounds specified.
-   */
-  export function hashSync(data: any, rounds: number): string;
-
-  /**
-   * @param data      The data to be encrypted.
-   * @param salt      The salt to be used in encryption.
-   * @param callback  A callback to be fired once the data has been encrypted. Uses eio making it asynchronous.
-   */
-  export function hash(data: any, salt: string, callback: (err: Error, encrypted: string) => void): void;
-  /**
-   * @param data      The data to be encrypted.
-   * @param rounds    A salt will be generated using the rounds specified.
-   * @param callback  A callback to be fired once the data has been encrypted. Uses eio making it asynchronous.
-   */
-  export function hash(data: any, rounds: number, callback: (err: Error, encrypted: string) => void): void;
-
-  /**
-   * @param data      The data to be encrypted.
-   * @param encrypted The data to be compared against.
-   */
-  export function compareSync(data: any, encrypted: string): boolean;
-
-  /**
-   * @param data      The data to be encrypted.
-   * @param encrypted The data to be compared against.
-   * @param callback  A callback to be fire once the data has been compared. Uses eio making it asynchronous.
-   */
-  export function compare(data: any, encrypted: string, callback: (err: Error, same: boolean) => void): void;
-
-  /**
-   * Return the number of rounds used to encrypt a given hash
-   * 
-   * @param encrypted Hash from which the number of rounds used should be extracted.
-   */
-  export function getRounds(encrypted: string): number;
-}
diff --git a/bcrypt/index.d.ts b/bcrypt/index.d.ts
new file mode 100644
index 0000000000..d9eafce4ef
--- /dev/null
+++ b/bcrypt/index.d.ts
@@ -0,0 +1,64 @@
+// Type definitions for bcrypt
+// Project: https://www.npmjs.org/package/bcrypt
+// Definitions by: Peter Harris <https://github.com/codeanimal>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/**
+ * @param rounds  The cost of processing the data. Default 10.
+ */
+export declare function genSaltSync(rounds?: number): string;
+
+/**
+ * @param rounds    The cost of processing the data. Default 10.
+ * @param callback  A callback to be fire once the sald has been generated. Uses eio making it asynchronous.
+ */
+export declare function genSalt(rounds: number, callback: (err: Error, salt: string) => void): void;
+/**
+ * @param callback  A callback to be fire once the sald has been generated. Uses eio making it asynchronous.
+ */
+export declare function genSalt(callback: (err: Error, salt: string) => void): void;
+
+/**
+ * @param data  The data to be encrypted.
+ * @param salt  The salt to be used in encryption.
+ */
+export declare function hashSync(data: any, salt: string): string;
+/**
+ * @param data    The data to be encrypted.
+ * @param rounds  A salt will be generated using the rounds specified.
+ */
+export declare function hashSync(data: any, rounds: number): string;
+
+/**
+ * @param data      The data to be encrypted.
+ * @param salt      The salt to be used in encryption.
+ * @param callback  A callback to be fired once the data has been encrypted. Uses eio making it asynchronous.
+ */
+export declare function hash(data: any, salt: string, callback: (err: Error, encrypted: string) => void): void;
+/**
+ * @param data      The data to be encrypted.
+ * @param rounds    A salt will be generated using the rounds specified.
+ * @param callback  A callback to be fired once the data has been encrypted. Uses eio making it asynchronous.
+ */
+export declare function hash(data: any, rounds: number, callback: (err: Error, encrypted: string) => void): void;
+
+/**
+ * @param data      The data to be encrypted.
+ * @param encrypted The data to be compared against.
+ */
+export declare function compareSync(data: any, encrypted: string): boolean;
+
+/**
+ * @param data      The data to be encrypted.
+ * @param encrypted The data to be compared against.
+ * @param callback  A callback to be fire once the data has been compared. Uses eio making it asynchronous.
+ */
+export declare function compare(data: any, encrypted: string, callback: (err: Error, same: boolean) => void): void;
+
+/**
+ * Return the number of rounds used to encrypt a given hash
+ * 
+ * @param encrypted Hash from which the number of rounds used should be extracted.
+ */
+export declare function getRounds(encrypted: string): number;
diff --git a/bcrypt/tsconfig.json b/bcrypt/tsconfig.json
new file mode 100644
index 0000000000..70a619adc7
--- /dev/null
+++ b/bcrypt/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bcrypt-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bcryptjs/bcryptjs-tests.ts b/bcryptjs/bcryptjs-tests.ts
index acfc48e439..83b67c17cc 100644
--- a/bcryptjs/bcryptjs-tests.ts
+++ b/bcryptjs/bcryptjs-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./bcryptjs.d.ts"/>
-
 import bcryptjs = require("bcryptjs");
 
 let str: string;
diff --git a/bcryptjs/bcryptjs.d.ts b/bcryptjs/bcryptjs.d.ts
deleted file mode 100644
index 3d3128d022..0000000000
--- a/bcryptjs/bcryptjs.d.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-// Type definitions for bcryptjs v2.3.0
-// Project: https://github.com/dcodeIO/bcrypt.js
-// Definitions by: Joshua Filby <https://github.com/Joshua-F/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "bcryptjs" {
-
-    /**
-     * Sets the pseudo random number generator to use as a fallback if neither node's crypto module nor the Web Crypto API is available.
-     * Please note: It is highly important that the PRNG used is cryptographically secure and that it is seeded properly!
-     * @param  random Function taking the number of bytes to generate as its sole argument, returning the corresponding array of cryptographically secure random byte values.
-     */
-    export function setRandomFallback(random: (random: number) => number[]): void;
-
-    /**
-     * Synchronously generates a salt.
-     * @param  rounds Number of rounds to use, defaults to 10 if omitted
-     * @return Resulting salt
-     */
-    export function genSaltSync(rounds?: number): string;
-
-    /**
-     * Asynchronously generates a salt.
-     * @param callback Callback receiving the error, if any, and the resulting salt
-     */
-    export function genSalt(callback: (err: Error, salt: string) => void): void;
-
-    /**
-     * Asynchronously generates a salt.
-     * @param  rounds   Number of rounds to use, defaults to 10 if omitted
-     * @param  callback Callback receiving the error, if any, and the resulting salt
-     */
-    export function genSalt(rounds: number, callback: (err: Error, salt: string) => void): void;
-
-    /**
-     * Synchronously generates a hash for the given string.
-     * @param  s    String to hash
-     * @param  salt Salt length to generate or salt to use, default to 10
-     * @return Resulting hash
-     */
-    export function hashSync(s: string, salt?: number | string): string;
-
-    /**
-     * Asynchronously generates a hash for the given string.
-     * @param s                String to hash
-     * @param salt             Salt length to generate or salt to use
-     * @param callback         Callback receiving the error, if any, and the resulting hash
-     * @param progressCallback Callback successively called with the percentage of rounds completed (0.0 - 1.0), maximally once per MAX_EXECUTION_TIME = 100 ms.
-     */
-    export function hash(s: string, salt: number | string, callback: (err: Error, hash: string) => void, progressCallback?: (percent: number) => void): void;
-
-    /**
-     * Synchronously tests a string against a hash.
-     * @param  s    String to compare
-     * @param  hash Hash to test against
-     * @return true if matching, otherwise false
-     */
-    export function compareSync(s: string, hash: string): boolean;
-
-    /**
-     * Asynchronously compares the given data against the given hash.
-     * @param  s                Data to compare
-     * @param  hash             Data to be compared to
-     * @param  callback         Callback receiving the error, if any, otherwise the result
-     * @param  progressCallback Callback successively called with the percentage of rounds completed (0.0 - 1.0), maximally once per MAX_EXECUTION_TIME = 100 ms.
-     */
-    export function compare(s: string, hash: string, callback: (err: Error, success: boolean) => void, progressCallback?: (percent: number) => void): void;
-
-    /**
-     * Gets the number of rounds used to encrypt the specified hash.
-     * @param  hash Hash to extract the used number of rounds from
-     * @return Number of rounds used
-     */
-    export function getRounds(hash: string): number;
-
-    /**
-     * Gets the salt portion from a hash. Does not validate the hash.
-     * @param  hash Hash to extract the salt from
-     * @return Extracted salt part
-     */
-    export function getSalt(hash: string): string;
-}
diff --git a/bcryptjs/index.d.ts b/bcryptjs/index.d.ts
new file mode 100644
index 0000000000..fd1c0d7903
--- /dev/null
+++ b/bcryptjs/index.d.ts
@@ -0,0 +1,81 @@
+// Type definitions for bcryptjs v2.3.0
+// Project: https://github.com/dcodeIO/bcrypt.js
+// Definitions by: Joshua Filby <https://github.com/Joshua-F/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+/**
+ * Sets the pseudo random number generator to use as a fallback if neither node's crypto module nor the Web Crypto API is available.
+ * Please note: It is highly important that the PRNG used is cryptographically secure and that it is seeded properly!
+ * @param  random Function taking the number of bytes to generate as its sole argument, returning the corresponding array of cryptographically secure random byte values.
+ */
+export declare function setRandomFallback(random: (random: number) => number[]): void;
+
+/**
+ * Synchronously generates a salt.
+ * @param  rounds Number of rounds to use, defaults to 10 if omitted
+ * @return Resulting salt
+ */
+export declare function genSaltSync(rounds?: number): string;
+
+/**
+ * Asynchronously generates a salt.
+ * @param callback Callback receiving the error, if any, and the resulting salt
+ */
+export declare function genSalt(callback: (err: Error, salt: string) => void): void;
+
+/**
+ * Asynchronously generates a salt.
+ * @param  rounds   Number of rounds to use, defaults to 10 if omitted
+ * @param  callback Callback receiving the error, if any, and the resulting salt
+ */
+export declare function genSalt(rounds: number, callback: (err: Error, salt: string) => void): void;
+
+/**
+ * Synchronously generates a hash for the given string.
+ * @param  s    String to hash
+ * @param  salt Salt length to generate or salt to use, default to 10
+ * @return Resulting hash
+ */
+export declare function hashSync(s: string, salt?: number | string): string;
+
+/**
+ * Asynchronously generates a hash for the given string.
+ * @param s                String to hash
+ * @param salt             Salt length to generate or salt to use
+ * @param callback         Callback receiving the error, if any, and the resulting hash
+ * @param progressCallback Callback successively called with the percentage of rounds completed (0.0 - 1.0), maximally once per MAX_EXECUTION_TIME = 100 ms.
+ */
+export declare function hash(s: string, salt: number | string, callback: (err: Error, hash: string) => void, progressCallback?: (percent: number) => void): void;
+
+/**
+ * Synchronously tests a string against a hash.
+ * @param  s    String to compare
+ * @param  hash Hash to test against
+ * @return true if matching, otherwise false
+ */
+export declare function compareSync(s: string, hash: string): boolean;
+
+/**
+ * Asynchronously compares the given data against the given hash.
+ * @param  s                Data to compare
+ * @param  hash             Data to be compared to
+ * @param  callback         Callback receiving the error, if any, otherwise the result
+ * @param  progressCallback Callback successively called with the percentage of rounds completed (0.0 - 1.0), maximally once per MAX_EXECUTION_TIME = 100 ms.
+ */
+export declare function compare(s: string, hash: string, callback: (err: Error, success: boolean) => void, progressCallback?: (percent: number) => void): void;
+
+/**
+ * Gets the number of rounds used to encrypt the specified hash.
+ * @param  hash Hash to extract the used number of rounds from
+ * @return Number of rounds used
+ */
+export declare function getRounds(hash: string): number;
+
+/**
+ * Gets the salt portion from a hash. Does not validate the hash.
+ * @param  hash Hash to extract the salt from
+ * @return Extracted salt part
+ */
+export declare function getSalt(hash: string): string;
diff --git a/bcryptjs/tsconfig.json b/bcryptjs/tsconfig.json
new file mode 100644
index 0000000000..ebf1b81515
--- /dev/null
+++ b/bcryptjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bcryptjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/benchmark/benchmark-tests.ts b/benchmark/benchmark-tests.ts
index 363e522b0b..8fbe2b1d92 100644
--- a/benchmark/benchmark-tests.ts
+++ b/benchmark/benchmark-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./benchmark.d.ts"/>
 import Benchmark = require("benchmark");
 
 var suite = new Benchmark.Suite;
diff --git a/benchmark/benchmark.d.ts b/benchmark/benchmark.d.ts
deleted file mode 100644
index c5c257aaaa..0000000000
--- a/benchmark/benchmark.d.ts
+++ /dev/null
@@ -1,192 +0,0 @@
-// Type definitions for Benchmark v1.0.0
-// Project: http://benchmarkjs.com
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "benchmark" {
-    class Benchmark {
-        static deepClone<T>(value: T): T;
-        static each(obj: Object | any[], callback: Function, thisArg?: any): void;
-        static extend(destination: Object, ...sources: Object[]): Object;
-        static filter<T>(arr: T[], callback: (value: T) => any, thisArg?: any): T[];
-        static filter<T>(arr: T[], filter: string, thisArg?: any): T[];
-        static forEach<T>(arr: T[], callback: (value: T) => any, thisArg?: any): void;
-        static formatNumber(num: number): string;
-        static forOwn(obj: Object, callback: Function, thisArg?: any): void;
-        static hasKey(obj: Object, key: string): boolean;
-        static indexOf<T>(arr: T[], value: T, fromIndex?: number): number;
-        static interpolate(template: string, values: Object): string;
-        static invoke(benches: Benchmark[], name: string | Object, ...args: any[]): any[];
-        static join(obj: Object, separator1?: string, separator2?: string): string;
-        static map<T, K>(arr: T[], callback: (value: T) => K, thisArg?: any): K[];
-        static pluck<T, K>(arr: T[], key: string): K[];
-        static reduce<T, K>(arr: T[], callback: (accumulator: K, value: T) => K, thisArg?: any): K;
-
-        static options: Benchmark.Options;
-        static platform: Benchmark.Platform;
-        static support: Benchmark.Support;
-        static version: string;
-
-        constructor(fn: Function | string, options?: Benchmark.Options);
-        constructor(name: string, fn: Function | string, options?: Benchmark.Options);
-        constructor(name: string, options?: Benchmark.Options);
-        constructor(options: Benchmark.Options);
-
-        aborted: boolean;
-        compiled: Function | string;
-        count: number;
-        cycles: number;
-        error: Error;
-        fn: Function | string;
-        hz: number;
-        running: boolean;
-        setup: Function | string;
-        teardown: Function | string;
-
-        stats: Benchmark.Stats;
-        times: Benchmark.Times;
-
-        abort(): Benchmark;
-        clone(options: Benchmark.Options): Benchmark;
-        compare(benchmark: Benchmark): number;
-        emit(type: string | Object): any;
-        listeners(type: string): Function[];
-        off(type?: string, listener?: Function): Benchmark;
-        off(types: string[]): Benchmark;
-        on(type?: string, listener?: Function): Benchmark;
-        on(types: string[]): Benchmark;
-        reset(): Benchmark;
-        run(options?: Benchmark.Options): Benchmark;
-        toString(): string;
-    }
-
-    namespace Benchmark {
-        export interface Options {
-            async?: boolean;
-            defer?: boolean;
-            delay?: number;
-            id?: string;
-            initCount?: number;
-            maxTime?: number;
-            minSamples?: number;
-            minTime?: number;
-            name?: string;
-            onAbort?: Function;
-            onComplete?: Function;
-            onCycle?: Function;
-            onError?: Function;
-            onReset?: Function;
-            onStart?: Function;
-            setup?: Function | string;
-            teardown?: Function | string;
-            fn?: Function | string;
-            queued?: boolean;
-        }
-
-        export interface Platform {
-            description: string;
-            layout: string;
-            manufacturer: string;
-            name: string;
-            os: string;
-            prerelease: string;
-            product: string;
-            version: string;
-            toString(): string;
-        }
-
-        export interface Support {
-            air: boolean;
-            argumentsClass: boolean;
-            browser: boolean;
-            charByIndex: boolean;
-            charByOwnIndex: boolean;
-            decompilation: boolean;
-            descriptors: boolean;
-            getAllKeys: boolean;
-            iteratesOwnFirst: boolean;
-            java: boolean;
-            nodeClass: boolean;
-            timeout: boolean;
-        }
-
-        export interface Stats {
-            deviation: number;
-            mean: number;
-            moe: number;
-            rme: number;
-            sample: any[];
-            sem: number;
-            variance: number;
-        }
-
-        export interface Times {
-            cycle: number;
-            elapsed: number;
-            period: number;
-            timeStamp: number;
-        }
-
-        export class Deferred {
-            constructor(clone: Benchmark);
-
-            benchmark: Benchmark;
-            cycles: number;
-            elapsed: number;
-            timeStamp: number;
-        }
-
-        export class Event {
-            constructor(type: string | Object);
-
-            aborted: boolean;
-            cancelled: boolean;
-            currentTarget: Object;
-            result: any;
-            target: Object;
-            timeStamp: number;
-            type: string;
-        }
-
-        export class Suite {
-            static options: { name: string };
-
-            constructor(name?: string, options?: Options);
-
-            aborted: boolean;
-            length: number;
-            running: boolean;
-            abort(): Suite;
-            add(name: string, fn: Function | string, options?: Options): Suite;
-            add(fn: Function | string, options?: Options): Suite;
-            add(name: string, options?: Options): Suite;
-            add(options: Options): Suite;
-            clone(options: Options): Suite;
-            emit(type: string | Object): any;
-            filter(callback: Function | string): Suite;
-            forEach(callback: Function): Suite;
-            indexOf(value: any): number;
-            invoke(name: string, ...args: any[]): any[];
-            join(separator?: string): string;
-            listeners(type: string): Function[];
-            map(callback: Function): any[];
-            off(type?: string, callback?: Function): Benchmark;
-            off(types: string[]): Benchmark;
-            on(type?: string, callback?: Function): Benchmark;
-            on(types: string[]): Benchmark;
-            pluck(property: string): any[];
-            pop(): Function;
-            push(benchmark: Benchmark): number;
-            reduce<T>(callback: Function, accumulator: T): T;
-            reset(): Suite;
-            reverse(): any[];
-            run(options?: Options): Suite;
-            shift(): Benchmark;
-            slice(start: number, end: number): any[];
-            slice(start: number, deleteCount: number, ...values: any[]): any[];
-            unshift(benchmark: Benchmark): number;
-        }
-    }
-
-    export = Benchmark;
-}
diff --git a/benchmark/index.d.ts b/benchmark/index.d.ts
new file mode 100644
index 0000000000..01bb379a48
--- /dev/null
+++ b/benchmark/index.d.ts
@@ -0,0 +1,191 @@
+// Type definitions for Benchmark v1.0.0
+// Project: http://benchmarkjs.com
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare class Benchmark {
+    static deepClone<T>(value: T): T;
+    static each(obj: Object | any[], callback: Function, thisArg?: any): void;
+    static extend(destination: Object, ...sources: Object[]): Object;
+    static filter<T>(arr: T[], callback: (value: T) => any, thisArg?: any): T[];
+    static filter<T>(arr: T[], filter: string, thisArg?: any): T[];
+    static forEach<T>(arr: T[], callback: (value: T) => any, thisArg?: any): void;
+    static formatNumber(num: number): string;
+    static forOwn(obj: Object, callback: Function, thisArg?: any): void;
+    static hasKey(obj: Object, key: string): boolean;
+    static indexOf<T>(arr: T[], value: T, fromIndex?: number): number;
+    static interpolate(template: string, values: Object): string;
+    static invoke(benches: Benchmark[], name: string | Object, ...args: any[]): any[];
+    static join(obj: Object, separator1?: string, separator2?: string): string;
+    static map<T, K>(arr: T[], callback: (value: T) => K, thisArg?: any): K[];
+    static pluck<T, K>(arr: T[], key: string): K[];
+    static reduce<T, K>(arr: T[], callback: (accumulator: K, value: T) => K, thisArg?: any): K;
+
+    static options: Benchmark.Options;
+    static platform: Benchmark.Platform;
+    static support: Benchmark.Support;
+    static version: string;
+
+    constructor(fn: Function | string, options?: Benchmark.Options);
+    constructor(name: string, fn: Function | string, options?: Benchmark.Options);
+    constructor(name: string, options?: Benchmark.Options);
+    constructor(options: Benchmark.Options);
+
+    aborted: boolean;
+    compiled: Function | string;
+    count: number;
+    cycles: number;
+    error: Error;
+    fn: Function | string;
+    hz: number;
+    running: boolean;
+    setup: Function | string;
+    teardown: Function | string;
+
+    stats: Benchmark.Stats;
+    times: Benchmark.Times;
+
+    abort(): Benchmark;
+    clone(options: Benchmark.Options): Benchmark;
+    compare(benchmark: Benchmark): number;
+    emit(type: string | Object): any;
+    listeners(type: string): Function[];
+    off(type?: string, listener?: Function): Benchmark;
+    off(types: string[]): Benchmark;
+    on(type?: string, listener?: Function): Benchmark;
+    on(types: string[]): Benchmark;
+    reset(): Benchmark;
+    run(options?: Benchmark.Options): Benchmark;
+    toString(): string;
+}
+
+declare namespace Benchmark {
+    export interface Options {
+        async?: boolean;
+        defer?: boolean;
+        delay?: number;
+        id?: string;
+        initCount?: number;
+        maxTime?: number;
+        minSamples?: number;
+        minTime?: number;
+        name?: string;
+        onAbort?: Function;
+        onComplete?: Function;
+        onCycle?: Function;
+        onError?: Function;
+        onReset?: Function;
+        onStart?: Function;
+        setup?: Function | string;
+        teardown?: Function | string;
+        fn?: Function | string;
+        queued?: boolean;
+    }
+
+    export interface Platform {
+        description: string;
+        layout: string;
+        manufacturer: string;
+        name: string;
+        os: string;
+        prerelease: string;
+        product: string;
+        version: string;
+        toString(): string;
+    }
+
+    export interface Support {
+        air: boolean;
+        argumentsClass: boolean;
+        browser: boolean;
+        charByIndex: boolean;
+        charByOwnIndex: boolean;
+        decompilation: boolean;
+        descriptors: boolean;
+        getAllKeys: boolean;
+        iteratesOwnFirst: boolean;
+        java: boolean;
+        nodeClass: boolean;
+        timeout: boolean;
+    }
+
+    export interface Stats {
+        deviation: number;
+        mean: number;
+        moe: number;
+        rme: number;
+        sample: any[];
+        sem: number;
+        variance: number;
+    }
+
+    export interface Times {
+        cycle: number;
+        elapsed: number;
+        period: number;
+        timeStamp: number;
+    }
+
+    export class Deferred {
+        constructor(clone: Benchmark);
+
+        benchmark: Benchmark;
+        cycles: number;
+        elapsed: number;
+        timeStamp: number;
+    }
+
+    export class Event {
+        constructor(type: string | Object);
+
+        aborted: boolean;
+        cancelled: boolean;
+        currentTarget: Object;
+        result: any;
+        target: Object;
+        timeStamp: number;
+        type: string;
+    }
+
+    export class Suite {
+        static options: { name: string };
+
+        constructor(name?: string, options?: Options);
+
+        aborted: boolean;
+        length: number;
+        running: boolean;
+        abort(): Suite;
+        add(name: string, fn: Function | string, options?: Options): Suite;
+        add(fn: Function | string, options?: Options): Suite;
+        add(name: string, options?: Options): Suite;
+        add(options: Options): Suite;
+        clone(options: Options): Suite;
+        emit(type: string | Object): any;
+        filter(callback: Function | string): Suite;
+        forEach(callback: Function): Suite;
+        indexOf(value: any): number;
+        invoke(name: string, ...args: any[]): any[];
+        join(separator?: string): string;
+        listeners(type: string): Function[];
+        map(callback: Function): any[];
+        off(type?: string, callback?: Function): Benchmark;
+        off(types: string[]): Benchmark;
+        on(type?: string, callback?: Function): Benchmark;
+        on(types: string[]): Benchmark;
+        pluck(property: string): any[];
+        pop(): Function;
+        push(benchmark: Benchmark): number;
+        reduce<T>(callback: Function, accumulator: T): T;
+        reset(): Suite;
+        reverse(): any[];
+        run(options?: Options): Suite;
+        shift(): Benchmark;
+        slice(start: number, end: number): any[];
+        slice(start: number, deleteCount: number, ...values: any[]): any[];
+        unshift(benchmark: Benchmark): number;
+    }
+}
+
+export = Benchmark;
diff --git a/benchmark/tsconfig.json b/benchmark/tsconfig.json
new file mode 100644
index 0000000000..85df6e1ab3
--- /dev/null
+++ b/benchmark/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "benchmark-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/better-curry/better-curry-tests.ts b/better-curry/better-curry-tests.ts
index 36e4936e0d..48c9c7f0ca 100644
--- a/better-curry/better-curry-tests.ts
+++ b/better-curry/better-curry-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="better-curry.d.ts" />
+
 
 import bc = require('better-curry');
 bc.flatten([1,2,3,[1,2],['a']]) === [];
diff --git a/better-curry/better-curry.d.ts b/better-curry/index.d.ts
similarity index 100%
rename from better-curry/better-curry.d.ts
rename to better-curry/index.d.ts
diff --git a/better-curry/tsconfig.json b/better-curry/tsconfig.json
new file mode 100644
index 0000000000..2098c89392
--- /dev/null
+++ b/better-curry/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "better-curry-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bezier-easing/bezier-easing-tests.ts b/bezier-easing/bezier-easing-tests.ts
index f928fa62de..6cf2b28bf2 100644
--- a/bezier-easing/bezier-easing-tests.ts
+++ b/bezier-easing/bezier-easing-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="bezier-easing.d.ts" />
+
 
 function get_easing() {
     let easing: Easing = BezierEasing(0, 0, 1, 0.5);
diff --git a/bezier-easing/bezier-easing.d.ts b/bezier-easing/index.d.ts
similarity index 100%
rename from bezier-easing/bezier-easing.d.ts
rename to bezier-easing/index.d.ts
diff --git a/bezier-easing/tsconfig.json b/bezier-easing/tsconfig.json
new file mode 100644
index 0000000000..ab6fb82af9
--- /dev/null
+++ b/bezier-easing/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bezier-easing-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bgiframe/typescript.bgiframe.d.ts b/bgiframe/index.d.ts
similarity index 100%
rename from bgiframe/typescript.bgiframe.d.ts
rename to bgiframe/index.d.ts
diff --git a/bgiframe/tsconfig.json b/bgiframe/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/bgiframe/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/big-integer/big-integer-tests.ts b/big-integer/big-integer-tests.ts
index fd08f89a14..2ab3c1fad5 100644
--- a/big-integer/big-integer-tests.ts
+++ b/big-integer/big-integer-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="big-integer.d.ts" />
+
 
 // constructor tests
 var noArgument = bigInt(),
diff --git a/big-integer/big-integer.d.ts b/big-integer/index.d.ts
similarity index 100%
rename from big-integer/big-integer.d.ts
rename to big-integer/index.d.ts
diff --git a/big-integer/tsconfig.json b/big-integer/tsconfig.json
new file mode 100644
index 0000000000..ff891f65a2
--- /dev/null
+++ b/big-integer/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "big-integer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/big.js/big.js-tests.ts b/big.js/big.js-tests.ts
index 0067a0b4f5..10a1f44a0f 100644
--- a/big.js/big.js-tests.ts
+++ b/big.js/big.js-tests.ts
@@ -2,7 +2,6 @@
 // Project: https://github.com/MikeMcl/big.js/
 // Definitions by: Steve Ognibene <https://github.com/nycdotnet/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-///<reference path="big.js.d.ts" />
 
 /*
 
diff --git a/big.js/big.js.d.ts b/big.js/index.d.ts
similarity index 100%
rename from big.js/big.js.d.ts
rename to big.js/index.d.ts
diff --git a/big.js/tsconfig.json b/big.js/tsconfig.json
new file mode 100644
index 0000000000..102ae72e67
--- /dev/null
+++ b/big.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "big.js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bigint/bigint-tests.ts b/bigint/bigint-tests.ts
index 14cdd5b12c..35d118a8a1 100644
--- a/bigint/bigint-tests.ts
+++ b/bigint/bigint-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./bigint.d.ts" />
+
 
 var bi: BigInt.BigInt;
 var num: number;
diff --git a/bigint/bigint.d.ts b/bigint/index.d.ts
similarity index 100%
rename from bigint/bigint.d.ts
rename to bigint/index.d.ts
diff --git a/bigint/tsconfig.json b/bigint/tsconfig.json
new file mode 100644
index 0000000000..3e25ecb967
--- /dev/null
+++ b/bigint/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bigint-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bignum/bignum-tests.ts b/bignum/bignum-tests.ts
index 363fad886b..0803ac00ea 100644
--- a/bignum/bignum-tests.ts
+++ b/bignum/bignum-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="bignum.d.ts" />
+
 
 var bignum = require('bignum');
 
diff --git a/bignum/bignum.d.ts b/bignum/bignum.d.ts
deleted file mode 100644
index b9e653e189..0000000000
--- a/bignum/bignum.d.ts
+++ /dev/null
@@ -1,269 +0,0 @@
-// Type definitions for BigNum
-// Project: https://github.com/justmoon/node-BigNum
-// Definitions by: Pat Smuk <https://github.com/Patman64>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare class BigNum {
-    /** Create a new BigNum from n. */
-    constructor(n: number|BigNum);
-    
-    /** Create a new BigNum from n and a base. */
-    constructor(n: string, base?: number);
-    
-    /**
-     * Create a new BigNum from a Buffer.
-     * 
-     * The default options are: {endian: 'big', size: 1}.
-     */
-    static fromBuffer(buffer: Buffer, options?: BigNum.BufferOptions): BigNum;
-    
-    /**
-     * Generate a probable prime of length bits.
-     * 
-     * If safe is true, it will be a "safe" prime of the form p=2p'+1 where p' is also prime.
-     */
-    static prime(bits: number, safe?: boolean): BigNum;
-    
-    /** Return true if num is identified as a BigNum instance. Otherwise, return false. */
-    static isBigNum(num: any): boolean;
-    
-    /** Print out the BigNum instance in the requested base as a string. Default: base 10 */
-    toString(base?: number): string;
-    
-    /**
-     * Turn a BigNum into a Number.
-     * 
-     * If the BigNum is too big you'll lose precision or you'll get ±Infinity.
-     */
-    toNumber(): number;
-    
-    /**
-    * Return a new Buffer with the data from the BigNum.
-    * 
-    * The default options are: {endian: 'big', size: 1}.
-    */
-    toBuffer(options?: BigNum.BufferOptions): Buffer;
-    
-    /** Return a new BigNum containing the instance value plus n. */
-    add(n: BigNum.BigNumCompatible): BigNum;
-    
-    /** Return a new BigNum containing the instance value minus n. */
-    sub(n: BigNum.BigNumCompatible): BigNum;
-    
-    /** Return a new BigNum containing the instance value multiplied by n. */
-    mul(n: BigNum.BigNumCompatible): BigNum;
-    
-    /** Return a new BigNum containing the instance value integrally divided by n. */
-    div(n: BigNum.BigNumCompatible): BigNum;
-    
-    /** Return a new BigNum with the absolute value of the instance. */
-    abs(): BigNum;
-    
-    /** Return a new BigNum with the negative of the instance value. */
-    neg(): BigNum;
-    
-    /**
-     * Compare the instance value to n.
-     * 
-     * Return a positive integer if > n, a negative integer if < n, and 0 if == n.
-     */
-    cmp(n: BigNum.BigNumCompatible): number;
-    
-    /** Return a boolean: whether the instance value is greater than n (> n). */
-    gt(n: BigNum.BigNumCompatible): boolean;
-    
-    /** Return a boolean: whether the instance value is greater than or equal to n (>= n). */
-    ge(n: BigNum.BigNumCompatible): boolean;
-    
-    /** Return a boolean: whether the instance value is equal to n (== n). */
-    eq(n: BigNum.BigNumCompatible): boolean;
-    
-    /** Return a boolean: whether the instance value is less than n (< n). */
-    lt(n: BigNum.BigNumCompatible): boolean;
-    
-    /** Return a boolean: whether the instance value is less than or equal to n (<= n). */
-    le(n: BigNum.BigNumCompatible): boolean;
-    
-    /** Return a new BigNum with the instance value bitwise AND (&)-ed with n. */
-    and(n: BigNum.BigNumCompatible): BigNum;
-    
-    /** Return a new BigNum with the instance value bitwise inclusive-OR (|)-ed with n. */
-    or(n: BigNum.BigNumCompatible): BigNum;
-    
-    /** Return a new BigNum with the instance value bitwise exclusive-OR (^)-ed with n. */
-    xor(n: BigNum.BigNumCompatible): BigNum;
-    
-    /** Return a new BigNum with the instance value modulo n. */
-    mod(n: BigNum.BigNumCompatible): BigNum;
-    
-    /** Return a new BigNum with the instance value raised to the nth power. */
-    pow(n: BigNum.BigNumCompatible): BigNum;
-    
-    /** Return a new BigNum with the instance value raised to the nth power modulo m. */
-    powm(n: BigNum.BigNumCompatible, m: BigNum.BigNumCompatible): BigNum;
-    
-    /** Compute the multiplicative inverse modulo m. */
-    invertm(m: BigNum.BigNumCompatible): BigNum;
-    
-    /**
-     * If upperBound is supplied, return a random BigNum between the instance value and upperBound - 1, inclusive.
-     * Otherwise, return a random BigNum between 0 and the instance value - 1, inclusive.
-     */
-    rand(upperBound?: BigNum.BigNumCompatible): BigNum;
-    
-    /** 
-     * Return whether the BigNum is:
-     *  - certainly prime (true)
-     *  - probably prime ('maybe')
-     *  - certainly composite (false)
-     */
-    probPrime(): boolean | string;
-    
-    /** Return a new BigNum that is the 2^n multiple. Equivalent of the << operator. */
-    shiftLeft(n: BigNum.BigNumCompatible): BigNum;
-    
-    /** Return a new BigNum of the value integer divided by 2^n. Equivalent of the >> operator. */
-    shiftRight(n: BigNum.BigNumCompatible): BigNum;
-    
-    /** Return the greatest common divisor of the current BigNum with n as a new BigNum. */
-    gcd(n: BigNum): BigNum;
-    
-    /**
-     * Return the Jacobi symbol (or Legendre symbol if n is prime) of the current BigNum (= a) over n.
-     * Note that n must be odd and >= 3. 0 <= a < n.
-     * 
-     * Returns -1 or 1 as an int (NOT a BigNum). Throws an error on failure.
-     */
-    jacobi(n: BigNum): number;
-    
-    /** Return the number of bits used to represent the current BigNum. */
-    bitLength(): number;
-}
-
-declare namespace BigNum {
-    /** Anything that can be converted to BigNum. */
-    type BigNumCompatible = BigNum | number | string;
-    
-    export interface BufferOptions {
-        /** Can be either 'big' or 'little'. Also accepts 1 for big and -1 for little. Doesn't matter when size = 1. */
-        endian: string | number;
-        
-        /** Number of bytes per word, or 'auto' to flip entire Buffer. */
-        size: number | string;
-    }
-    
-    /**
-     * Turn a BigNum into a Number.
-     * 
-     * If the BigNum is too big you'll lose precision or you'll get ±Infinity.
-     */
-    export function toNumber(n: BigNumCompatible): number;
-    
-    /**
-     * Return a new Buffer with the data from the BigNum.
-     * 
-     * The default options are: {endian: 'big', size: 1}.
-     */
-    export function toBuffer(n: BigNumCompatible, options?: BufferOptions): Buffer;
-    
-    /** Return a new BigNum containing the instance value plus n. */
-    export function add(left: BigNumCompatible, right: BigNumCompatible): BigNum;
-    
-    /** Return a new BigNum containing the instance value minus n. */
-    export function sub(left: BigNumCompatible, right: BigNumCompatible): BigNum;
-    
-    /** Return a new BigNum containing the instance value multiplied by n. */
-    export function mul(left: BigNumCompatible, right: BigNumCompatible): BigNum;
-    
-    /** Return a new BigNum containing the instance value integrally divided by n. */
-    export function div(dividend: BigNumCompatible, divisor: BigNumCompatible): BigNum;
-    
-    /** Return a new BigNum with the absolute value of the instance. */
-    export function abs(n: BigNumCompatible): BigNum;
-    
-    /** Return a new BigNum with the negative of the instance value. */
-    export function neg(n: BigNumCompatible): BigNum;
-    
-    /**
-     * Compare the instance value to n.
-     * 
-     * Return a positive integer if > n, a negative integer if < n, and 0 if == n.
-     */
-    export function cmp(left: BigNumCompatible, right: BigNumCompatible): number;
-    
-    /** Return a boolean: whether the instance value is greater than n (> n). */
-    export function gt(left: BigNumCompatible, right: BigNumCompatible): boolean;
-    
-    /** Return a boolean: whether the instance value is greater than or equal to n (>= n). */
-    export function ge(left: BigNumCompatible, right: BigNumCompatible): boolean;
-    
-    /** Return a boolean: whether the instance value is equal to n (== n). */
-    export function eq(left: BigNumCompatible, right: BigNumCompatible): boolean;
-    
-    /** Return a boolean: whether the instance value is less than n (< n). */
-    export function lt(left: BigNumCompatible, right: BigNumCompatible): boolean;
-    
-    /** Return a boolean: whether the instance value is less than or equal to n (<= n). */
-    export function le(left: BigNumCompatible, right: BigNumCompatible): boolean;
-    
-    /** Return a new BigNum with the instance value bitwise AND (&)-ed with n. */
-    export function and(left: BigNumCompatible, right: BigNumCompatible): BigNum;
-    
-    /** Return a new BigNum with the instance value bitwise inclusive-OR (|)-ed with n. */
-    export function or(left: BigNumCompatible, right: BigNumCompatible): BigNum;
-    
-    /** Return a new BigNum with the instance value bitwise exclusive-OR (^)-ed with n. */
-    export function xor(left: BigNumCompatible, right: BigNumCompatible): BigNum;
-    
-    /** Return a new BigNum with the instance value modulo n. */
-    export function mod(left: BigNumCompatible, right: BigNumCompatible): BigNum;
-    
-    /** Return a new BigNum with the instance value raised to the nth power. */
-    export function pow(base: BigNumCompatible, exponent: BigNumCompatible): BigNum;
-    
-    /** Return a new BigNum with the instance value raised to the nth power modulo m. */
-    export function powm(base: BigNumCompatible, exponent: BigNumCompatible, m: BigNumCompatible): BigNum;
-    
-    /** Compute the multiplicative inverse modulo m. */
-    export function invertm(n: BigNumCompatible, m: BigNumCompatible): BigNum;
-    
-    /**
-     * If upperBound is supplied, return a random BigNum between the instance value and upperBound - 1, inclusive.
-     * Otherwise, return a random BigNum between 0 and the instance value - 1, inclusive.
-     */
-    export function rand(n: BigNumCompatible, upperBound?: BigNumCompatible): BigNum;
-    
-    /** 
-     * Return whether the BigNum is:
-     *  - certainly prime (true)
-     *  - probably prime ('maybe')
-     *  - certainly composite (false)
-     */
-    export function probPrime(n: BigNumCompatible): boolean | string;
-    
-    /** Return a new BigNum that is the 2^bits multiple. Equivalent of the << operator. */
-    export function shiftLeft(n: BigNumCompatible, bits: BigNumCompatible): BigNum;
-    
-    /** Return a new BigNum of the value integer divided by 2^bits. Equivalent of the >> operator. */
-    export function shiftRight(n: BigNumCompatible, bits: BigNumCompatible): BigNum;
-    
-    /** Return the greatest common divisor of the current BigNum with n as a new BigNum. */
-    export function gcd(left: BigNumCompatible, right: BigNum): BigNum;
-    
-    /**
-     * Return the Jacobi symbol (or Legendre symbol if n is prime) of the current BigNum (= a) over n.
-     * Note that n must be odd and >= 3. 0 <= a < n.
-     * 
-     * Returns -1 or 1 as an int (NOT a BigNum). Throws an error on failure.
-     */
-    export function jacobi(a: BigNumCompatible, n: BigNum): number;
-    
-    /** Return the number of bits used to represent the current BigNum. */
-    export function bitLength(n: BigNumCompatible): number;
-}
-
-declare module "bignum" {
-    export = BigNum;
-}
diff --git a/bignum/index.d.ts b/bignum/index.d.ts
new file mode 100644
index 0000000000..ae556d00fe
--- /dev/null
+++ b/bignum/index.d.ts
@@ -0,0 +1,267 @@
+// Type definitions for BigNum
+// Project: https://github.com/justmoon/node-BigNum
+// Definitions by: Pat Smuk <https://github.com/Patman64>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export = BigNum;
+
+declare class BigNum {
+    /** Create a new BigNum from n. */
+    constructor(n: number|BigNum);
+    
+    /** Create a new BigNum from n and a base. */
+    constructor(n: string, base?: number);
+    
+    /**
+     * Create a new BigNum from a Buffer.
+     * 
+     * The default options are: {endian: 'big', size: 1}.
+     */
+    static fromBuffer(buffer: Buffer, options?: BigNum.BufferOptions): BigNum;
+    
+    /**
+     * Generate a probable prime of length bits.
+     * 
+     * If safe is true, it will be a "safe" prime of the form p=2p'+1 where p' is also prime.
+     */
+    static prime(bits: number, safe?: boolean): BigNum;
+    
+    /** Return true if num is identified as a BigNum instance. Otherwise, return false. */
+    static isBigNum(num: any): boolean;
+    
+    /** Print out the BigNum instance in the requested base as a string. Default: base 10 */
+    toString(base?: number): string;
+    
+    /**
+     * Turn a BigNum into a Number.
+     * 
+     * If the BigNum is too big you'll lose precision or you'll get ±Infinity.
+     */
+    toNumber(): number;
+    
+    /**
+    * Return a new Buffer with the data from the BigNum.
+    * 
+    * The default options are: {endian: 'big', size: 1}.
+    */
+    toBuffer(options?: BigNum.BufferOptions): Buffer;
+    
+    /** Return a new BigNum containing the instance value plus n. */
+    add(n: BigNum.BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum containing the instance value minus n. */
+    sub(n: BigNum.BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum containing the instance value multiplied by n. */
+    mul(n: BigNum.BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum containing the instance value integrally divided by n. */
+    div(n: BigNum.BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the absolute value of the instance. */
+    abs(): BigNum;
+    
+    /** Return a new BigNum with the negative of the instance value. */
+    neg(): BigNum;
+    
+    /**
+     * Compare the instance value to n.
+     * 
+     * Return a positive integer if > n, a negative integer if < n, and 0 if == n.
+     */
+    cmp(n: BigNum.BigNumCompatible): number;
+    
+    /** Return a boolean: whether the instance value is greater than n (> n). */
+    gt(n: BigNum.BigNumCompatible): boolean;
+    
+    /** Return a boolean: whether the instance value is greater than or equal to n (>= n). */
+    ge(n: BigNum.BigNumCompatible): boolean;
+    
+    /** Return a boolean: whether the instance value is equal to n (== n). */
+    eq(n: BigNum.BigNumCompatible): boolean;
+    
+    /** Return a boolean: whether the instance value is less than n (< n). */
+    lt(n: BigNum.BigNumCompatible): boolean;
+    
+    /** Return a boolean: whether the instance value is less than or equal to n (<= n). */
+    le(n: BigNum.BigNumCompatible): boolean;
+    
+    /** Return a new BigNum with the instance value bitwise AND (&)-ed with n. */
+    and(n: BigNum.BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the instance value bitwise inclusive-OR (|)-ed with n. */
+    or(n: BigNum.BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the instance value bitwise exclusive-OR (^)-ed with n. */
+    xor(n: BigNum.BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the instance value modulo n. */
+    mod(n: BigNum.BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the instance value raised to the nth power. */
+    pow(n: BigNum.BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the instance value raised to the nth power modulo m. */
+    powm(n: BigNum.BigNumCompatible, m: BigNum.BigNumCompatible): BigNum;
+    
+    /** Compute the multiplicative inverse modulo m. */
+    invertm(m: BigNum.BigNumCompatible): BigNum;
+    
+    /**
+     * If upperBound is supplied, return a random BigNum between the instance value and upperBound - 1, inclusive.
+     * Otherwise, return a random BigNum between 0 and the instance value - 1, inclusive.
+     */
+    rand(upperBound?: BigNum.BigNumCompatible): BigNum;
+    
+    /** 
+     * Return whether the BigNum is:
+     *  - certainly prime (true)
+     *  - probably prime ('maybe')
+     *  - certainly composite (false)
+     */
+    probPrime(): boolean | string;
+    
+    /** Return a new BigNum that is the 2^n multiple. Equivalent of the << operator. */
+    shiftLeft(n: BigNum.BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum of the value integer divided by 2^n. Equivalent of the >> operator. */
+    shiftRight(n: BigNum.BigNumCompatible): BigNum;
+    
+    /** Return the greatest common divisor of the current BigNum with n as a new BigNum. */
+    gcd(n: BigNum): BigNum;
+    
+    /**
+     * Return the Jacobi symbol (or Legendre symbol if n is prime) of the current BigNum (= a) over n.
+     * Note that n must be odd and >= 3. 0 <= a < n.
+     * 
+     * Returns -1 or 1 as an int (NOT a BigNum). Throws an error on failure.
+     */
+    jacobi(n: BigNum): number;
+    
+    /** Return the number of bits used to represent the current BigNum. */
+    bitLength(): number;
+}
+
+declare namespace BigNum {
+    /** Anything that can be converted to BigNum. */
+    type BigNumCompatible = BigNum | number | string;
+    
+    export interface BufferOptions {
+        /** Can be either 'big' or 'little'. Also accepts 1 for big and -1 for little. Doesn't matter when size = 1. */
+        endian: string | number;
+        
+        /** Number of bytes per word, or 'auto' to flip entire Buffer. */
+        size: number | string;
+    }
+    
+    /**
+     * Turn a BigNum into a Number.
+     * 
+     * If the BigNum is too big you'll lose precision or you'll get ±Infinity.
+     */
+    export function toNumber(n: BigNumCompatible): number;
+    
+    /**
+     * Return a new Buffer with the data from the BigNum.
+     * 
+     * The default options are: {endian: 'big', size: 1}.
+     */
+    export function toBuffer(n: BigNumCompatible, options?: BufferOptions): Buffer;
+    
+    /** Return a new BigNum containing the instance value plus n. */
+    export function add(left: BigNumCompatible, right: BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum containing the instance value minus n. */
+    export function sub(left: BigNumCompatible, right: BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum containing the instance value multiplied by n. */
+    export function mul(left: BigNumCompatible, right: BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum containing the instance value integrally divided by n. */
+    export function div(dividend: BigNumCompatible, divisor: BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the absolute value of the instance. */
+    export function abs(n: BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the negative of the instance value. */
+    export function neg(n: BigNumCompatible): BigNum;
+    
+    /**
+     * Compare the instance value to n.
+     * 
+     * Return a positive integer if > n, a negative integer if < n, and 0 if == n.
+     */
+    export function cmp(left: BigNumCompatible, right: BigNumCompatible): number;
+    
+    /** Return a boolean: whether the instance value is greater than n (> n). */
+    export function gt(left: BigNumCompatible, right: BigNumCompatible): boolean;
+    
+    /** Return a boolean: whether the instance value is greater than or equal to n (>= n). */
+    export function ge(left: BigNumCompatible, right: BigNumCompatible): boolean;
+    
+    /** Return a boolean: whether the instance value is equal to n (== n). */
+    export function eq(left: BigNumCompatible, right: BigNumCompatible): boolean;
+    
+    /** Return a boolean: whether the instance value is less than n (< n). */
+    export function lt(left: BigNumCompatible, right: BigNumCompatible): boolean;
+    
+    /** Return a boolean: whether the instance value is less than or equal to n (<= n). */
+    export function le(left: BigNumCompatible, right: BigNumCompatible): boolean;
+    
+    /** Return a new BigNum with the instance value bitwise AND (&)-ed with n. */
+    export function and(left: BigNumCompatible, right: BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the instance value bitwise inclusive-OR (|)-ed with n. */
+    export function or(left: BigNumCompatible, right: BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the instance value bitwise exclusive-OR (^)-ed with n. */
+    export function xor(left: BigNumCompatible, right: BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the instance value modulo n. */
+    export function mod(left: BigNumCompatible, right: BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the instance value raised to the nth power. */
+    export function pow(base: BigNumCompatible, exponent: BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum with the instance value raised to the nth power modulo m. */
+    export function powm(base: BigNumCompatible, exponent: BigNumCompatible, m: BigNumCompatible): BigNum;
+    
+    /** Compute the multiplicative inverse modulo m. */
+    export function invertm(n: BigNumCompatible, m: BigNumCompatible): BigNum;
+    
+    /**
+     * If upperBound is supplied, return a random BigNum between the instance value and upperBound - 1, inclusive.
+     * Otherwise, return a random BigNum between 0 and the instance value - 1, inclusive.
+     */
+    export function rand(n: BigNumCompatible, upperBound?: BigNumCompatible): BigNum;
+    
+    /** 
+     * Return whether the BigNum is:
+     *  - certainly prime (true)
+     *  - probably prime ('maybe')
+     *  - certainly composite (false)
+     */
+    export function probPrime(n: BigNumCompatible): boolean | string;
+    
+    /** Return a new BigNum that is the 2^bits multiple. Equivalent of the << operator. */
+    export function shiftLeft(n: BigNumCompatible, bits: BigNumCompatible): BigNum;
+    
+    /** Return a new BigNum of the value integer divided by 2^bits. Equivalent of the >> operator. */
+    export function shiftRight(n: BigNumCompatible, bits: BigNumCompatible): BigNum;
+    
+    /** Return the greatest common divisor of the current BigNum with n as a new BigNum. */
+    export function gcd(left: BigNumCompatible, right: BigNum): BigNum;
+    
+    /**
+     * Return the Jacobi symbol (or Legendre symbol if n is prime) of the current BigNum (= a) over n.
+     * Note that n must be odd and >= 3. 0 <= a < n.
+     * 
+     * Returns -1 or 1 as an int (NOT a BigNum). Throws an error on failure.
+     */
+    export function jacobi(a: BigNumCompatible, n: BigNum): number;
+    
+    /** Return the number of bits used to represent the current BigNum. */
+    export function bitLength(n: BigNumCompatible): number;
+}
diff --git a/bignum/tsconfig.json b/bignum/tsconfig.json
new file mode 100644
index 0000000000..09ac5b622d
--- /dev/null
+++ b/bignum/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bignum-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bigscreen/bigscreen-tests.ts b/bigscreen/bigscreen-tests.ts
index 9e0c9fda8c..459e7cd449 100644
--- a/bigscreen/bigscreen-tests.ts
+++ b/bigscreen/bigscreen-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="bigscreen.d.ts"/>
-
 import BigScreen = require("bigscreen");
 
 BigScreen.onchange = function(element: Element) {
diff --git a/bigscreen/bigscreen.d.ts b/bigscreen/index.d.ts
similarity index 100%
rename from bigscreen/bigscreen.d.ts
rename to bigscreen/index.d.ts
diff --git a/bigscreen/tsconfig.json b/bigscreen/tsconfig.json
new file mode 100644
index 0000000000..c449fb1ae0
--- /dev/null
+++ b/bigscreen/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bigscreen-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bingmaps/Microsoft.Maps.AdvancedShapes.d.ts b/bingmaps/Microsoft.Maps.AdvancedShapes.d.ts
index a677cd2a4d..32ac20a874 100644
--- a/bingmaps/Microsoft.Maps.AdvancedShapes.d.ts
+++ b/bingmaps/Microsoft.Maps.AdvancedShapes.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Eric Todd <https://github.com/ericrtodd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="Microsoft.Maps.d.ts"/>
-
 declare namespace Microsoft.Maps.AdvancedShapes {
 
     export class EntityCollection {
diff --git a/bingmaps/Microsoft.Maps.Directions.d.ts b/bingmaps/Microsoft.Maps.Directions.d.ts
index fd0622f880..e9f2fa9cf1 100644
--- a/bingmaps/Microsoft.Maps.Directions.d.ts
+++ b/bingmaps/Microsoft.Maps.Directions.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Eric Todd <https://github.com/ericrtodd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="Microsoft.Maps.d.ts"/>
-
 declare namespace Microsoft.Maps.Directions {
 
     export interface BusinessDetails {
diff --git a/bingmaps/Microsoft.Maps.Search.d.ts b/bingmaps/Microsoft.Maps.Search.d.ts
index d13163ef25..21011ab1cd 100644
--- a/bingmaps/Microsoft.Maps.Search.d.ts
+++ b/bingmaps/Microsoft.Maps.Search.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Eric Todd <https://github.com/ericrtodd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="Microsoft.Maps.d.ts"/>
-
 declare namespace Microsoft.Maps.Search {
 
      export interface Address {
diff --git a/bingmaps/Microsoft.Maps.Traffic.d.ts b/bingmaps/Microsoft.Maps.Traffic.d.ts
index 1451c09000..353ec39b7c 100644
--- a/bingmaps/Microsoft.Maps.Traffic.d.ts
+++ b/bingmaps/Microsoft.Maps.Traffic.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Eric Todd <https://github.com/ericrtodd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="Microsoft.Maps.d.ts"/>
-
 declare namespace Microsoft.Maps.Traffic {
 
     export class TrafficManager {
diff --git a/bingmaps/Microsoft.Maps.VenueMaps.d.ts b/bingmaps/Microsoft.Maps.VenueMaps.d.ts
index 2d67bb3e69..51b41815f5 100644
--- a/bingmaps/Microsoft.Maps.VenueMaps.d.ts
+++ b/bingmaps/Microsoft.Maps.VenueMaps.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Eric Todd <https://github.com/ericrtodd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="Microsoft.Maps.d.ts"/>
-
 declare namespace Microsoft.Maps.VenueMaps {
 
     export interface MouseResponse {
diff --git a/bingmaps/bingmaps-tests.ts b/bingmaps/bingmaps-tests.ts
index 08b3decd5b..d50efb0e62 100644
--- a/bingmaps/bingmaps-tests.ts
+++ b/bingmaps/bingmaps-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="Microsoft.Maps.d.ts"/>
-/// <reference path="Microsoft.Maps.AdvancedShapes.d.ts"/>
+/// <reference path="Microsoft.Maps.AdvancedShapes.d.ts"/>
 /// <reference path="Microsoft.Maps.Directions.d.ts"/>
 /// <reference path="Microsoft.Maps.Search.d.ts"/>
 /// <reference path="Microsoft.Maps.Themes.BingTheme.d.ts"/>
diff --git a/bingmaps/Microsoft.Maps.d.ts b/bingmaps/index.d.ts
similarity index 100%
rename from bingmaps/Microsoft.Maps.d.ts
rename to bingmaps/index.d.ts
diff --git a/bingmaps/tsconfig.json b/bingmaps/tsconfig.json
new file mode 100644
index 0000000000..54cd61be88
--- /dev/null
+++ b/bingmaps/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bingmaps-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bip21/bip21-tests.ts b/bip21/bip21-tests.ts
index e685eca102..ef200719a8 100644
--- a/bip21/bip21-tests.ts
+++ b/bip21/bip21-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path='bip21.d.ts' />
-
+import bip21 = require('bip21');
 let decoded:any = bip21.decode('bitcoin:1BgGZ9tcN4rm9KBzDn7KprQz87SZ26SAMH?amount=20.3&label=Foobar');
  
 let encoded:string = bip21.encode('1BgGZ9tcN4rm9KBzDn7KprQz87SZ26SAMH', {
diff --git a/bip21/bip21.d.ts b/bip21/bip21.d.ts
deleted file mode 100644
index 7dc6223164..0000000000
--- a/bip21/bip21.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Type definitions for bip21 v1.1.2
-// Project: https://github.com/bitcoinjs/bip21
-// Definitions by: Stefan Huber <https://github.com/stefanhuber/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace bip21 {
-    export function decode(uri:string) : {address:string,amount?:number};
-    export function encode(address:string,options?:any) : string;
-}
-
-declare module "bip21" {
-    export = bip21;
-}
diff --git a/bip21/index.d.ts b/bip21/index.d.ts
new file mode 100644
index 0000000000..06e61a6944
--- /dev/null
+++ b/bip21/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for bip21 v1.1.2
+// Project: https://github.com/bitcoinjs/bip21
+// Definitions by: Stefan Huber <https://github.com/stefanhuber/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace bip21 {
+    export function decode(uri:string) : {address:string,amount?:number};
+    export function encode(address:string,options?:any) : string;
+}
+
+export = bip21;
diff --git a/bip21/tsconfig.json b/bip21/tsconfig.json
new file mode 100644
index 0000000000..0fc323b52d
--- /dev/null
+++ b/bip21/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bip21-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bitwise-xor/bitwise-xor-tests.ts b/bitwise-xor/bitwise-xor-tests.ts
index e55670b85f..b19768f11f 100644
--- a/bitwise-xor/bitwise-xor-tests.ts
+++ b/bitwise-xor/bitwise-xor-tests.ts
@@ -1,5 +1,4 @@
 
-/// <reference path="bitwise-xor.d.ts" />
 
 "use strict";
 
diff --git a/bitwise-xor/bitwise-xor.d.ts b/bitwise-xor/bitwise-xor.d.ts
deleted file mode 100644
index 09f104b9af..0000000000
--- a/bitwise-xor/bitwise-xor.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for bitwise-xor 0.0.0
-// Project: https://github.com/czzarr/node-bitwise-xor
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-declare module "bitwise-xor" {
-
-	/**
-	 * Bitwise XOR between two Buffers or Strings, returns a Buffer
-	 */
-	function xor(b1: Buffer, b2: Buffer): Buffer;
-	function xor(s1: string, s2: string): Buffer;
-
-	export = xor;
-}
-
diff --git a/bitwise-xor/index.d.ts b/bitwise-xor/index.d.ts
new file mode 100644
index 0000000000..c0a129fa70
--- /dev/null
+++ b/bitwise-xor/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for bitwise-xor 0.0.0
+// Project: https://github.com/czzarr/node-bitwise-xor
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+/**
+ * Bitwise XOR between two Buffers or Strings, returns a Buffer
+ */
+declare function xor(b1: Buffer, b2: Buffer): Buffer;
+declare function xor(s1: string, s2: string): Buffer;
+
+export = xor;
diff --git a/bitwise-xor/tsconfig.json b/bitwise-xor/tsconfig.json
new file mode 100644
index 0000000000..5b7c28f898
--- /dev/null
+++ b/bitwise-xor/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bitwise-xor-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bl/bl-tests.ts b/bl/bl-tests.ts
index b8435911de..084cf1925a 100644
--- a/bl/bl-tests.ts
+++ b/bl/bl-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./bl.d.ts" />
 
 import BufferList = require('bl');
 
diff --git a/bl/bl.d.ts b/bl/bl.d.ts
deleted file mode 100644
index b3b97b3983..0000000000
--- a/bl/bl.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// Type definitions for BufferList v0.8.0
-// Project: https://github.com/rvagg/bl
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'bl' {
-	import stream = require('stream');
-
-	class BufferList  extends stream.Duplex {
-		new (callback?:(err:Error, buffer:Buffer) => void): void;
-
-		append(buffer: Buffer):void;
-		get(index: number): number;
-		slice(start?: number, end?: number): Buffer;
-		copy(dest: Buffer, destStart?: number, srcStart?: number, srcEnd?: number): void;
-		duplicate(): BufferList;
-		consume(bytes?: number): void;
-		toString(encoding?: string, start?: number, end?: number): string;
-		length: number;
-
-		readDoubleBE(offset: number, noAssert?: boolean): number;
-		readDoubleLE(offset: number, noAssert?: boolean): number;
-		readFloatBE(offset: number, noAssert?: boolean): number;
-		readFloatLE(offset: number, noAssert?: boolean): number;
-		readInt32BE(offset: number, noAssert?: boolean): number;
-		readInt32LE(offset: number, noAssert?: boolean): number;
-		readUInt32BE(offset: number, noAssert?: boolean): number;
-		readUInt32LE(offset: number, noAssert?: boolean): number;
-		readInt16BE(offset: number, noAssert?: boolean): number;
-		readInt16LE(offset: number, noAssert?: boolean): number;
-		readUInt16BE(offset: number, noAssert?: boolean): number;
-		readUInt16LE(offset: number, noAssert?: boolean): number;
-		readInt8(offset: number, noAssert?: boolean): number;
-		readUInt8(offset: number, noAssert?: boolean): number;
-	}
-
-	export = BufferList;
-}
diff --git a/bl/index.d.ts b/bl/index.d.ts
new file mode 100644
index 0000000000..12bbf0bec5
--- /dev/null
+++ b/bl/index.d.ts
@@ -0,0 +1,39 @@
+// Type definitions for BufferList v0.8.0
+// Project: https://github.com/rvagg/bl
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import stream = require('stream');
+
+declare class BufferList extends stream.Duplex {
+    new(callback?: (err: Error, buffer: Buffer) => void): void;
+
+    append(buffer: Buffer): void;
+    get(index: number): number;
+    slice(start?: number, end?: number): Buffer;
+    copy(dest: Buffer, destStart?: number, srcStart?: number, srcEnd?: number): void;
+    duplicate(): BufferList;
+    consume(bytes?: number): void;
+    toString(encoding?: string, start?: number, end?: number): string;
+    length: number;
+
+    readDoubleBE(offset: number, noAssert?: boolean): number;
+    readDoubleLE(offset: number, noAssert?: boolean): number;
+    readFloatBE(offset: number, noAssert?: boolean): number;
+    readFloatLE(offset: number, noAssert?: boolean): number;
+    readInt32BE(offset: number, noAssert?: boolean): number;
+    readInt32LE(offset: number, noAssert?: boolean): number;
+    readUInt32BE(offset: number, noAssert?: boolean): number;
+    readUInt32LE(offset: number, noAssert?: boolean): number;
+    readInt16BE(offset: number, noAssert?: boolean): number;
+    readInt16LE(offset: number, noAssert?: boolean): number;
+    readUInt16BE(offset: number, noAssert?: boolean): number;
+    readUInt16LE(offset: number, noAssert?: boolean): number;
+    readInt8(offset: number, noAssert?: boolean): number;
+    readUInt8(offset: number, noAssert?: boolean): number;
+}
+
+export = BufferList;
diff --git a/bl/tsconfig.json b/bl/tsconfig.json
new file mode 100644
index 0000000000..da713a32d9
--- /dev/null
+++ b/bl/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bl-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/blazy/blazy-tests.ts b/blazy/blazy-tests.ts
index 6e95801e9e..835b0e6472 100644
--- a/blazy/blazy-tests.ts
+++ b/blazy/blazy-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="blazy.d.ts" />
+
 
 /* Constructor test */
 var tester: BlazyInstance = new Blazy({
diff --git a/blazy/blazy.d.ts b/blazy/index.d.ts
similarity index 100%
rename from blazy/blazy.d.ts
rename to blazy/index.d.ts
diff --git a/blazy/tsconfig.json b/blazy/tsconfig.json
new file mode 100644
index 0000000000..5f8097bb18
--- /dev/null
+++ b/blazy/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "blazy-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/blissfuljs/blissfuljs-tests.ts b/blissfuljs/blissfuljs-tests.ts
index 55085f00ae..1601ce9457 100644
--- a/blissfuljs/blissfuljs-tests.ts
+++ b/blissfuljs/blissfuljs-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="blissfuljs.d.ts" />
-
 function test_overview() {
     /*Bliss includes several static methods (on the Bliss or $ object). For example, to copy all properties of an object onto another object, you would
     call $.extend():*/
diff --git a/blissfuljs/blissfuljs.d.ts b/blissfuljs/blissfuljs.d.ts
deleted file mode 100644
index 9338929f16..0000000000
--- a/blissfuljs/blissfuljs.d.ts
+++ /dev/null
@@ -1,670 +0,0 @@
-// Type definitions for bliss
-// Project: http://blissfuljs.com/
-// Definitions by: François Skorzec <https://github.com/fskorzec>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface Element {
-    _: BlissNS.BlissBindedElement<Element>;
-}
-
-interface Array<T> {
-    _: BlissNS.BlissBindedArray<T> & BlissNS.BlissCollectionArray<T>;
-}
-
-declare namespace BlissNS {
-    export type BlissDecoratedElement<T> = Element & T;
-    export type BlissDecoratedArrayElement<T> = Array<T> & BlissNS.BlissCollectionArray<T>;
-
-    interface BlissStatic {
-        <T>(selector: string, context?: Element): BlissDecoratedElement<T>;
-
-        classProps: Object;
-
-        create(tag: "a"): HTMLAnchorElement;
-        create(tag: "applet"): HTMLAppletElement;
-        create(tag: "area"):HTMLAreaElement;
-        create(tag: "audio"): HTMLAudioElement;
-        create(tag: "base"): HTMLBaseElement;
-        create(tag: "basefont"): HTMLBaseFontElement;
-        create(tag: "blockquote"): HTMLBlockElement;
-        create(tag: "body"): HTMLBodyElement;
-        create(tag: "br"): HTMLBRElement;
-        create(tag: "button"): HTMLButtonElement;
-        create(tag: "canvas"): HTMLCanvasElement;
-        create(tag: "datalist"): HTMLDataListElement;
-        create(tag: "dd"): HTMLDDElement;
-        create(tag: "directory"): HTMLDirectoryElement;
-        create(tag: "div"): HTMLDivElement;
-        create(tag: "embeded"): HTMLEmbedElement;
-        create(tag: "fieldset"): HTMLFieldSetElement;
-        create(tag: "form"): HTMLFormElement;
-        create(tag: "frame"): HTMLFrameElement;
-        create(tag: "frameset"): HTMLFrameSetElement;
-        create(tag: "iframe"): HTMLDListElement;
-        create(tag: "image"): HTMLImageElement;
-        create(tag: "input"): HTMLInputElement;
-        create(tag: "i"): HTMLLIElement;
-        create(tag: "label"): HTMLLabelElement;
-        create(tag: "legend"): HTMLLegendElement;
-        create(tag: "li"): HTMLLIElement;
-        create(tag: "link"): HTMLLinkElement;
-        create(tag: "map"): HTMLMapElement;
-        create(tag: "mark"): HTMLMarqueeElement;
-        create(tag: "menu"): HTMLMenuElement;
-        create(tag: "meta"): HTMLMetaElement;
-        create(tag: "object"): HTMLObjectElement;
-        create(tag: "ol"): HTMLOListElement;
-        create(tag: "optgroup"): HTMLOptGroupElement;
-        create(tag: "option"): HTMLOptionElement;
-        create(tag: "p"): HTMLParagraphElement;
-        create(tag: "param"): HTMLParamElement;
-        create(tag: "pre"): HTMLPreElement;
-        create(tag: "progress"): HTMLProgressElement;
-        create(tag: "q"): HTMLQuoteElement;
-        create(tag: "script"): HTMLScriptElement;
-        create(tag: "select"): HTMLSelectElement;
-        create(tag: "source"): HTMLSourceElement;
-        create(tag: "span"): HTMLSpanElement;
-        create(tag: "style"): HTMLStyleElement;
-        create(tag: "table"): HTMLTableElement;
-        create(tag: "thead"): HTMLTableHeaderCellElement;
-        create(tag: "ul"): HTMLUListElement;
-        create(tag: "video"): HTMLVideoElement;
-        create<T>(tag: string): BlissDecoratedElement<T>;
-
-        create<T>(options: Object): BlissDecoratedElement<T>;
-
-        create(tag: "a", options: Object): HTMLAnchorElement;
-        create(tag: "applet", options: Object): HTMLAppletElement;
-        create(tag: "area", options: Object): HTMLAreaElement;
-        create(tag: "audio", options: Object): HTMLAudioElement;
-        create(tag: "base", options: Object): HTMLBaseElement;
-        create(tag: "basefont", options: Object): HTMLBaseFontElement;
-        create(tag: "blockquote", options: Object): HTMLBlockElement;
-        create(tag: "body", options: Object): HTMLBodyElement;
-        create(tag: "br", options: Object): HTMLBRElement;
-        create(tag: "button", options: Object): HTMLButtonElement;
-        create(tag: "canvas", options: Object): HTMLCanvasElement;
-        create(tag: "datalist", options: Object): HTMLDataListElement;
-        create(tag: "dd", options: Object): HTMLDDElement;
-        create(tag: "directory", options: Object): HTMLDirectoryElement;
-        create(tag: "div", options: Object): HTMLDivElement;
-        create(tag: "embeded", options: Object): HTMLEmbedElement;
-        create(tag: "fieldset", options: Object): HTMLFieldSetElement;
-        create(tag: "form", options: Object): HTMLFormElement;
-        create(tag: "frame", options: Object): HTMLFrameElement;
-        create(tag: "frameset", options: Object): HTMLFrameSetElement;
-        create(tag: "iframe", options: Object): HTMLDListElement;
-        create(tag: "image", options: Object): HTMLImageElement;
-        create(tag: "input", options: Object): HTMLInputElement;
-        create(tag: "i", options: Object): HTMLLIElement;
-        create(tag: "label", options: Object): HTMLLabelElement;
-        create(tag: "legend", options: Object): HTMLLegendElement;
-        create(tag: "li", options: Object): HTMLLIElement;
-        create(tag: "link", options: Object): HTMLLinkElement;
-        create(tag: "map", options: Object): HTMLMapElement;
-        create(tag: "mark", options: Object): HTMLMarqueeElement;
-        create(tag: "menu", options: Object): HTMLMenuElement;
-        create(tag: "meta", options: Object): HTMLMetaElement;
-        create(tag: "object", options: Object): HTMLObjectElement;
-        create(tag: "ol", options: Object): HTMLOListElement;
-        create(tag: "optgroup", options: Object): HTMLOptGroupElement;
-        create(tag: "option", options: Object): HTMLOptionElement;
-        create(tag: "p", options: Object): HTMLParagraphElement;
-        create(tag: "param", options: Object): HTMLParamElement;
-        create(tag: "pre", options: Object): HTMLPreElement;
-        create(tag: "progress", options: Object): HTMLProgressElement;
-        create(tag: "q", options: Object): HTMLQuoteElement;
-        create(tag: "script", options: Object): HTMLScriptElement;
-        create(tag: "select", options: Object): HTMLSelectElement;
-        create(tag: "source", options: Object): HTMLSourceElement;
-        create(tag: "span", options: Object): HTMLSpanElement;
-        create(tag: "style", options: Object): HTMLStyleElement;
-        create(tag: "table", options: Object): HTMLTableElement;
-        create(tag: "thead", options: Object): HTMLTableHeaderCellElement;
-        create(tag: "ul", options: Object): HTMLUListElement;
-        create(tag: "video", options: Object): HTMLVideoElement;
-        create<T>(tag: string, options: Object): BlissDecoratedElement<T>;
-
-        create<T>(...args:any[]): BlissDecoratedElement<T>;
-
-        set<T>(subject: BlissDecoratedElement<T>, options: Object): BlissDecoratedElement<T>;
-        contents<T>(subject: BlissDecoratedElement<T> , elements: Object | Array<any> | string | Number | Node): BlissDecoratedElement<T>;
-        contents<T>(subject: BlissDecoratedElement<T>[], elements: Object | Array<any> | string | Number | Node): BlissDecoratedElement<T>[];
-        clone<T>(subject:BlissDecoratedElement<T>) : BlissDecoratedElement<T>;
-        after<T>(subject:BlissDecoratedElement<T>, element: Element) : BlissDecoratedElement<T>;
-        around<T>(subject:BlissDecoratedElement<T>, element: Element) : BlissDecoratedElement<T>;
-        attributes<T>(subject:BlissDecoratedElement<T>, attrs: Object) : BlissDecoratedElement<T>;
-        attributes<T>(subject:BlissDecoratedElement<T>[], attrs: Object) : BlissDecoratedElement<T>[];
-        before<T>(subject:BlissDecoratedElement<T>, element: Element) : BlissDecoratedElement<T>;
-        inside<T>(subject:BlissDecoratedElement<T>, element: Element) : BlissDecoratedElement<T>;
-        properties<T>(subject:BlissDecoratedElement<T>, props: Object) : BlissDecoratedElement<T>;
-        properties<T>(subject:BlissDecoratedElement<T>[], props: Object) : BlissDecoratedElement<T>[];
-        start<T>(subject:BlissDecoratedElement<T>, element: Element) : BlissDecoratedElement<T>;
-        style<T>(subject:BlissDecoratedElement<T>, properties: Object) : BlissDecoratedElement<T>;
-        style<T>(subject:BlissDecoratedElement<T>[], properties: Object) : BlissDecoratedElement<T>[];
-        transition<T>(subject:BlissDecoratedElement<T> | BlissDecoratedElement<T>[], properties: Object, duration?: number) : Promise<T>;
-        delegate<T>(subject:BlissDecoratedElement<T> , type: string, selector: string, callback: (event: Event) => void): BlissDecoratedElement<T>;
-        delegate<T>(subject: BlissDecoratedElement<T>[], type: string, selector: string, callback: (event: Event) => void): BlissDecoratedElement<T>[];
-        delegate<T>(subject:BlissDecoratedElement<T> , type: string, selectorsToCallbacks: {[selector: string] : (event: Event) => void}): BlissDecoratedElement<T>;
-        delegate<T>(subject:BlissDecoratedElement<T>[], type: string, selectorsToCallbacks: {[selector: string] : (event: Event) => void}): BlissDecoratedElement<T>[];
-        delegate<T>(subject:BlissDecoratedElement<T> , typesToSelectorsToCallbacks: {[type: string] : {[selector: string] : (event: Event) => void}}): BlissDecoratedElement<T>;
-        delegate<T>(subject:BlissDecoratedElement<T>[], typesToSelectorsToCallbacks: {[type: string] : {[selector: string] : (event: Event) => void}}): BlissDecoratedElement<T>[];
-        events<T>(subject:BlissDecoratedElement<T> , handlers: {[eventName:string] : (event: Event) => void} | Element): BlissDecoratedElement<T>;
-        events<T>(subject: BlissDecoratedElement<T>[], handlers: {[eventName:string] : (event: Event) => void} | Element): BlissDecoratedElement<T>[];
-        fire<T>(subject:BlissDecoratedElement<T>, type: string, properties?: {[propertyName: string] : any}): BlissDecoratedElement<T>;
-        fire<T>(subject:BlissDecoratedElement<T>[], type: string, properties?: {[propertyName: string] : any}): BlissDecoratedElement<T>[];
-        once<T>(subject:BlissDecoratedElement<T>, handlers: {[eventName:string] : (event: Event) => void} | Element): BlissDecoratedElement<T>;
-        once<T>(subject:BlissDecoratedElement<T>[], handlers: {[eventName:string] : (event: Event) => void} | Element): BlissDecoratedElement<T>[];
-        ready(context?: Document): Promise<any>;
-
-        remove(subject:Element | BlissStatic): void;
-
-        all(array: Array<any>, method: string, ...args: Array<any>): Array<any>;
-        all<T>(array: Array<T>, method: string, ...args: Array<any>): Array<T>;
-
-        Class<T>(options: {
-            constructor?: Function;
-            extends?: Function;
-            abstract?: boolean;
-            lazy?: Object;
-            live?: Object;
-            static?: Object;
-            [propertyName: string]:any;
-        }): T;
-
-        Class(options: {
-            constructor?: Function;
-            extends?: Function;
-            abstract?: boolean;
-            lazy?: Object;
-            live?: Object;
-            static?: Object;
-            [propertyName: string]:any;
-        }): Object;
-
-        each<T>(obj: {[propertyName: string] : any}, callback: Function, ret?: Object): T;
-        each(obj: {[propertyName: string] : any}, callback: Function, ret?: Object): Object;
-
-        extend(target: Object, source: any, whitelist? : string[] | string | Function | RegExp): Object;
-        extend<T>(target: Object, source: any, whitelist? : string[] | string | Function | RegExp): T;
-
-        lazy(object: Object, property: string, getter: () => any): Object;
-        lazy<T>(object:Object, property: string, getter:() => any): T;
-
-        lazy(object: Object, properties: {[propertyName:string]: () => any}): Object;
-        lazy<T>(object: Object, properties: {[propertyName:string]: () => any}): T;
-
-        live(object: Object, property: string, descriptor: Object | Function): Object;
-        live<T>(object: Object, property: string, descriptor: Object | Function): T;
-
-        live(object: Object, properties: {[propertyName: string]: Object | Function}): Object;
-        live<T>(object: Object, properties: {[propertyName: string]: Object | Function}): T;
-
-        type(object: Object): string;
-
-        value(obj: Object, ...properties: string[]): any;
-        value<T>(obj: Object, ...properties: string[]): T;
-
-        value(property: string, ...properties: string[]): any;
-        value<T>(property: string , ...properties: string[]): T;
-
-        fetch(url: string, options?: {
-            method?: string;
-            data?: string;
-            headers?:{[key:string]:string};
-
-            onreadystatechange?: (ev: ProgressEvent) => any;
-            readyState?: number;
-            response?: any;
-            responseBody?: any;
-            responseText?: string;
-            responseType?: string;
-            responseXML?: any;
-            status?: number;
-            statusText?: string;
-            timeout?: number;
-            upload?: XMLHttpRequestUpload;
-            withCredentials?: boolean;
-
-            [propertyName: string]: any;
-        }): Promise<XMLHttpRequest>;
-
-        include(condition: any, url: string ): Promise<void>;
-        include(url: string ): Promise<void>;
-
-        add(name: string, callback: Function, on?: BlissStatic | BlissStaticCollection | Element | Array<any>): void;
-        add(callbacks:{[callbackName: string]: Function}, on?: BlissStatic | BlissStaticCollection | Element | Array<any>): void;
-
-        hooks: {
-            add(name: string, callback: Function): void;
-            run(name: string, env: Object): void;
-        };
-
-        $: BlissStaticCollection;
-    }
-
-    interface BlissStaticCollection extends BlissStatic {
-        <T>(selector: string, context?: Element): BlissDecoratedArrayElement<T>;
-        <T>(expr: Object, context?: Element): Array<T>;
-        (expr: Window, context?: Element): [Window];
-        (expr: Node, context?: Element): [Node];
-    }
-
-    // Native methods added into "_" property, but methods that return "void" now return thi stype in order to be chainables
-    // Methods are All HTMLElement a ELement methods
-    interface BlissNativeExtentions<T> {
-        blur(): T;
-        click(): T;
-        contains(child: HTMLElement): boolean;
-        dragDrop(): boolean;
-        focus(): T;
-        insertAdjacentElement(position: string, insertedElement: Element): Element;
-        insertAdjacentHTML(where: string, html: string): T;
-        insertAdjacentText(where: string, text: string): T;
-        msGetInputContext(): MSInputMethodContext;
-        scrollIntoView(top?: boolean): T;
-        setActive(): T;
-        addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSManipulationStateChanged", listener: (ev: MSManipulationEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "mouseenter", listener: (ev: MouseEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "mouseleave", listener: (ev: MouseEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): T;
-        getAttribute(name?: string): string;
-        getAttributeNS(namespaceURI: string, localName: string): string;
-        getAttributeNode(name: string): Attr;
-        getAttributeNodeNS(namespaceURI: string, localName: string): Attr;
-        getBoundingClientRect(): ClientRect;
-        getClientRects(): ClientRectList;
-        getElementsByTagName(name: "a"): NodeListOf<HTMLAnchorElement>;
-        getElementsByTagName(name: "abbr"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "acronym"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "address"): NodeListOf<HTMLBlockElement>;
-        getElementsByTagName(name: "applet"): NodeListOf<HTMLAppletElement>;
-        getElementsByTagName(name: "area"): NodeListOf<HTMLAreaElement>;
-        getElementsByTagName(name: "article"): NodeListOf<HTMLElement>;
-        getElementsByTagName(name: "aside"): NodeListOf<HTMLElement>;
-        getElementsByTagName(name: "audio"): NodeListOf<HTMLAudioElement>;
-        getElementsByTagName(name: "b"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "base"): NodeListOf<HTMLBaseElement>;
-        getElementsByTagName(name: "basefont"): NodeListOf<HTMLBaseFontElement>;
-        getElementsByTagName(name: "bdo"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "big"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "blockquote"): NodeListOf<HTMLBlockElement>;
-        getElementsByTagName(name: "body"): NodeListOf<HTMLBodyElement>;
-        getElementsByTagName(name: "br"): NodeListOf<HTMLBRElement>;
-        getElementsByTagName(name: "button"): NodeListOf<HTMLButtonElement>;
-        getElementsByTagName(name: "canvas"): NodeListOf<HTMLCanvasElement>;
-        getElementsByTagName(name: "caption"): NodeListOf<HTMLTableCaptionElement>;
-        getElementsByTagName(name: "center"): NodeListOf<HTMLBlockElement>;
-        getElementsByTagName(name: "circle"): NodeListOf<SVGCircleElement>;
-        getElementsByTagName(name: "cite"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "clippath"): NodeListOf<SVGClipPathElement>;
-        getElementsByTagName(name: "code"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "col"): NodeListOf<HTMLTableColElement>;
-        getElementsByTagName(name: "colgroup"): NodeListOf<HTMLTableColElement>;
-        getElementsByTagName(name: "datalist"): NodeListOf<HTMLDataListElement>;
-        getElementsByTagName(name: "dd"): NodeListOf<HTMLDDElement>;
-        getElementsByTagName(name: "defs"): NodeListOf<SVGDefsElement>;
-        getElementsByTagName(name: "del"): NodeListOf<HTMLModElement>;
-        getElementsByTagName(name: "desc"): NodeListOf<SVGDescElement>;
-        getElementsByTagName(name: "dfn"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "dir"): NodeListOf<HTMLDirectoryElement>;
-        getElementsByTagName(name: "div"): NodeListOf<HTMLDivElement>;
-        getElementsByTagName(name: "dl"): NodeListOf<HTMLDListElement>;
-        getElementsByTagName(name: "dt"): NodeListOf<HTMLDTElement>;
-        getElementsByTagName(name: "ellipse"): NodeListOf<SVGEllipseElement>;
-        getElementsByTagName(name: "em"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "embed"): NodeListOf<HTMLEmbedElement>;
-        getElementsByTagName(name: "feblend"): NodeListOf<SVGFEBlendElement>;
-        getElementsByTagName(name: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>;
-        getElementsByTagName(name: "fecomponenttransfer"): NodeListOf<SVGFEComponentTransferElement>;
-        getElementsByTagName(name: "fecomposite"): NodeListOf<SVGFECompositeElement>;
-        getElementsByTagName(name: "feconvolvematrix"): NodeListOf<SVGFEConvolveMatrixElement>;
-        getElementsByTagName(name: "fediffuselighting"): NodeListOf<SVGFEDiffuseLightingElement>;
-        getElementsByTagName(name: "fedisplacementmap"): NodeListOf<SVGFEDisplacementMapElement>;
-        getElementsByTagName(name: "fedistantlight"): NodeListOf<SVGFEDistantLightElement>;
-        getElementsByTagName(name: "feflood"): NodeListOf<SVGFEFloodElement>;
-        getElementsByTagName(name: "fefunca"): NodeListOf<SVGFEFuncAElement>;
-        getElementsByTagName(name: "fefuncb"): NodeListOf<SVGFEFuncBElement>;
-        getElementsByTagName(name: "fefuncg"): NodeListOf<SVGFEFuncGElement>;
-        getElementsByTagName(name: "fefuncr"): NodeListOf<SVGFEFuncRElement>;
-        getElementsByTagName(name: "fegaussianblur"): NodeListOf<SVGFEGaussianBlurElement>;
-        getElementsByTagName(name: "feimage"): NodeListOf<SVGFEImageElement>;
-        getElementsByTagName(name: "femerge"): NodeListOf<SVGFEMergeElement>;
-        getElementsByTagName(name: "femergenode"): NodeListOf<SVGFEMergeNodeElement>;
-        getElementsByTagName(name: "femorphology"): NodeListOf<SVGFEMorphologyElement>;
-        getElementsByTagName(name: "feoffset"): NodeListOf<SVGFEOffsetElement>;
-        getElementsByTagName(name: "fepointlight"): NodeListOf<SVGFEPointLightElement>;
-        getElementsByTagName(name: "fespecularlighting"): NodeListOf<SVGFESpecularLightingElement>;
-        getElementsByTagName(name: "fespotlight"): NodeListOf<SVGFESpotLightElement>;
-        getElementsByTagName(name: "fetile"): NodeListOf<SVGFETileElement>;
-        getElementsByTagName(name: "feturbulence"): NodeListOf<SVGFETurbulenceElement>;
-        getElementsByTagName(name: "fieldset"): NodeListOf<HTMLFieldSetElement>;
-        getElementsByTagName(name: "figcaption"): NodeListOf<HTMLElement>;
-        getElementsByTagName(name: "figure"): NodeListOf<HTMLElement>;
-        getElementsByTagName(name: "filter"): NodeListOf<SVGFilterElement>;
-        getElementsByTagName(name: "font"): NodeListOf<HTMLFontElement>;
-        getElementsByTagName(name: "footer"): NodeListOf<HTMLElement>;
-        getElementsByTagName(name: "foreignobject"): NodeListOf<SVGForeignObjectElement>;
-        getElementsByTagName(name: "form"): NodeListOf<HTMLFormElement>;
-        getElementsByTagName(name: "frame"): NodeListOf<HTMLFrameElement>;
-        getElementsByTagName(name: "frameset"): NodeListOf<HTMLFrameSetElement>;
-        getElementsByTagName(name: "g"): NodeListOf<SVGGElement>;
-        getElementsByTagName(name: "h1"): NodeListOf<HTMLHeadingElement>;
-        getElementsByTagName(name: "h2"): NodeListOf<HTMLHeadingElement>;
-        getElementsByTagName(name: "h3"): NodeListOf<HTMLHeadingElement>;
-        getElementsByTagName(name: "h4"): NodeListOf<HTMLHeadingElement>;
-        getElementsByTagName(name: "h5"): NodeListOf<HTMLHeadingElement>;
-        getElementsByTagName(name: "h6"): NodeListOf<HTMLHeadingElement>;
-        getElementsByTagName(name: "head"): NodeListOf<HTMLHeadElement>;
-        getElementsByTagName(name: "header"): NodeListOf<HTMLElement>;
-        getElementsByTagName(name: "hgroup"): NodeListOf<HTMLElement>;
-        getElementsByTagName(name: "hr"): NodeListOf<HTMLHRElement>;
-        getElementsByTagName(name: "html"): NodeListOf<HTMLHtmlElement>;
-        getElementsByTagName(name: "i"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "iframe"): NodeListOf<HTMLIFrameElement>;
-        getElementsByTagName(name: "image"): NodeListOf<SVGImageElement>;
-        getElementsByTagName(name: "img"): NodeListOf<HTMLImageElement>;
-        getElementsByTagName(name: "input"): NodeListOf<HTMLInputElement>;
-        getElementsByTagName(name: "ins"): NodeListOf<HTMLModElement>;
-        getElementsByTagName(name: "isindex"): NodeListOf<HTMLIsIndexElement>;
-        getElementsByTagName(name: "kbd"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "keygen"): NodeListOf<HTMLBlockElement>;
-        getElementsByTagName(name: "label"): NodeListOf<HTMLLabelElement>;
-        getElementsByTagName(name: "legend"): NodeListOf<HTMLLegendElement>;
-        getElementsByTagName(name: "li"): NodeListOf<HTMLLIElement>;
-        getElementsByTagName(name: "line"): NodeListOf<SVGLineElement>;
-        getElementsByTagName(name: "lineargradient"): NodeListOf<SVGLinearGradientElement>;
-        getElementsByTagName(name: "link"): NodeListOf<HTMLLinkElement>;
-        getElementsByTagName(name: "listing"): NodeListOf<HTMLBlockElement>;
-        getElementsByTagName(name: "map"): NodeListOf<HTMLMapElement>;
-        getElementsByTagName(name: "mark"): NodeListOf<HTMLElement>;
-        getElementsByTagName(name: "marker"): NodeListOf<SVGMarkerElement>;
-        getElementsByTagName(name: "marquee"): NodeListOf<HTMLMarqueeElement>;
-        getElementsByTagName(name: "mask"): NodeListOf<SVGMaskElement>;
-        getElementsByTagName(name: "menu"): NodeListOf<HTMLMenuElement>;
-        getElementsByTagName(name: "meta"): NodeListOf<HTMLMetaElement>;
-        getElementsByTagName(name: "metadata"): NodeListOf<SVGMetadataElement>;
-        getElementsByTagName(name: "nav"): NodeListOf<HTMLElement>;
-        getElementsByTagName(name: "nextid"): NodeListOf<HTMLNextIdElement>;
-        getElementsByTagName(name: "nobr"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "noframes"): NodeListOf<HTMLElement>;
-        getElementsByTagName(name: "noscript"): NodeListOf<HTMLElement>;
-        getElementsByTagName(name: "object"): NodeListOf<HTMLObjectElement>;
-        getElementsByTagName(name: "ol"): NodeListOf<HTMLOListElement>;
-        getElementsByTagName(name: "optgroup"): NodeListOf<HTMLOptGroupElement>;
-        getElementsByTagName(name: "option"): NodeListOf<HTMLOptionElement>;
-        getElementsByTagName(name: "p"): NodeListOf<HTMLParagraphElement>;
-        getElementsByTagName(name: "param"): NodeListOf<HTMLParamElement>;
-        getElementsByTagName(name: "path"): NodeListOf<SVGPathElement>;
-        getElementsByTagName(name: "pattern"): NodeListOf<SVGPatternElement>;
-        getElementsByTagName(name: "plaintext"): NodeListOf<HTMLBlockElement>;
-        getElementsByTagName(name: "polygon"): NodeListOf<SVGPolygonElement>;
-        getElementsByTagName(name: "polyline"): NodeListOf<SVGPolylineElement>;
-        getElementsByTagName(name: "pre"): NodeListOf<HTMLPreElement>;
-        getElementsByTagName(name: "progress"): NodeListOf<HTMLProgressElement>;
-        getElementsByTagName(name: "q"): NodeListOf<HTMLQuoteElement>;
-        getElementsByTagName(name: "radialgradient"): NodeListOf<SVGRadialGradientElement>;
-        getElementsByTagName(name: "rect"): NodeListOf<SVGRectElement>;
-        getElementsByTagName(name: "rt"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "ruby"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "s"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "samp"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "script"): NodeListOf<HTMLScriptElement>;
-        getElementsByTagName(name: "section"): NodeListOf<HTMLElement>;
-        getElementsByTagName(name: "select"): NodeListOf<HTMLSelectElement>;
-        getElementsByTagName(name: "small"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "source"): NodeListOf<HTMLSourceElement>;
-        getElementsByTagName(name: "span"): NodeListOf<HTMLSpanElement>;
-        getElementsByTagName(name: "stop"): NodeListOf<SVGStopElement>;
-        getElementsByTagName(name: "strike"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "strong"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "style"): NodeListOf<HTMLStyleElement>;
-        getElementsByTagName(name: "sub"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "sup"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "svg"): NodeListOf<SVGSVGElement>;
-        getElementsByTagName(name: "switch"): NodeListOf<SVGSwitchElement>;
-        getElementsByTagName(name: "symbol"): NodeListOf<SVGSymbolElement>;
-        getElementsByTagName(name: "table"): NodeListOf<HTMLTableElement>;
-        getElementsByTagName(name: "tbody"): NodeListOf<HTMLTableSectionElement>;
-        getElementsByTagName(name: "td"): NodeListOf<HTMLTableDataCellElement>;
-        getElementsByTagName(name: "text"): NodeListOf<SVGTextElement>;
-        getElementsByTagName(name: "textpath"): NodeListOf<SVGTextPathElement>;
-        getElementsByTagName(name: "textarea"): NodeListOf<HTMLTextAreaElement>;
-        getElementsByTagName(name: "tfoot"): NodeListOf<HTMLTableSectionElement>;
-        getElementsByTagName(name: "th"): NodeListOf<HTMLTableHeaderCellElement>;
-        getElementsByTagName(name: "thead"): NodeListOf<HTMLTableSectionElement>;
-        getElementsByTagName(name: "title"): NodeListOf<HTMLTitleElement>;
-        getElementsByTagName(name: "tr"): NodeListOf<HTMLTableRowElement>;
-        getElementsByTagName(name: "track"): NodeListOf<HTMLTrackElement>;
-        getElementsByTagName(name: "tspan"): NodeListOf<SVGTSpanElement>;
-        getElementsByTagName(name: "tt"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "u"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "ul"): NodeListOf<HTMLUListElement>;
-        getElementsByTagName(name: "use"): NodeListOf<SVGUseElement>;
-        getElementsByTagName(name: "var"): NodeListOf<HTMLPhraseElement>;
-        getElementsByTagName(name: "video"): NodeListOf<HTMLVideoElement>;
-        getElementsByTagName(name: "view"): NodeListOf<SVGViewElement>;
-        getElementsByTagName(name: "wbr"): NodeListOf<HTMLElement>;
-        getElementsByTagName(name: "x-ms-webview"): NodeListOf<MSHTMLWebViewElement>;
-        getElementsByTagName(name: "xmp"): NodeListOf<HTMLBlockElement>;
-        getElementsByTagName(name: string): NodeListOf<Element>;
-        getElementsByTagNameNS(namespaceURI: string, localName: string): NodeListOf<Element>;
-        hasAttribute(name: string): boolean;
-        hasAttributeNS(namespaceURI: string, localName: string): boolean;
-        msGetRegionContent(): MSRangeCollection;
-        msGetUntransformedBounds(): ClientRect;
-        msMatchesSelector(selectors: string): boolean;
-        msReleasePointerCapture(pointerId: number): T;
-        msSetPointerCapture(pointerId: number): T;
-        msZoomTo(args: MsZoomToOptions): T;
-        releasePointerCapture(pointerId: number): T;
-        removeAttribute(name?: string): T;
-        removeAttributeNS(namespaceURI: string, localName: string): T;
-        removeAttributeNode(oldAttr: Attr): Attr;
-        requestFullscreen(): T;
-        requestPointerLock(): T;
-        setAttribute(name?: string, value?: string): T;
-        setAttributeNS(namespaceURI: string, qualifiedName: string, value: string): T;
-        setAttributeNode(newAttr: Attr): Attr;
-        setAttributeNodeNS(newAttr: Attr): Attr;
-        setPointerCapture(pointerId: number): T;
-        webkitMatchesSelector(selectors: string): boolean;
-        webkitRequestFullScreen(): T;
-        webkitRequestFullscreen(): T;
-        getElementsByClassName(classNames: string): NodeListOf<Element>;
-        addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): T;
-        addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): T;
-        addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): T;
-    }
-
-    interface BlissBindedElement<T> extends BlissNativeExtentions<T> {
-        set(options: Object): BlissDecoratedElement<T>
-        contents(elements: Object | Array<any> | string | Number | Node): BlissDecoratedElement<T>
-        clone(): BlissDecoratedElement<T>;
-        after(element:Element) : BlissDecoratedElement<T>;
-        around(element:Element) : BlissDecoratedElement<T>;
-        attributes(attrs: Object) : BlissDecoratedElement<T>;
-        before(element:Element) : BlissDecoratedElement<T>;
-        inside(element:Element) : BlissDecoratedElement<T>;
-        properties(props: Object) : BlissDecoratedElement<T>;
-        start(element:Element) : BlissDecoratedElement<T>;
-        style(properties: Object) : BlissDecoratedElement<T>;
-        transition(properties: Object, duration?: number) : Promise<T>;
-        delegate(type: string, selector: string, callback: (event: Event) => void): BlissDecoratedElement<T>;
-        delegate(type: string, selectorsToCallbacks: {[selector: string] : (event: Event) => void}): BlissDecoratedElement<T>;
-        delegate(typesToSelectorsToCallbacks: {[type: string] : {[selector: string] : (event: Event) => void}}): BlissDecoratedElement<T>;
-        events(handlers: {[eventName:string] : (event: Event) => void} | Element): BlissDecoratedElement<T>;
-        fire(type: string, properties?: {[propertyName: string] : any}): BlissDecoratedElement<T>;
-        once(handlers: {[eventName:string] : (event: Event) => void} | Element): BlissDecoratedElement<T>;
-
-        remove(): BlissDecoratedElement<T>;
-    }
-
-    interface BlissBindedArray<T> {
-        all(method: string, ...args: Array<any>): Array<any>;
-        all<T>(method: string, ...args: Array<any>): Array<T>;
-    }
-
-    interface BlissCollectionArray<T> {
-        set(options: Object): BlissCollectionArray<T>
-        contents(elements: Object | Array<any> | string | Number | Node): BlissCollectionArray<T>
-        clone(): BlissCollectionArray<T>;
-        after(element:Element) : BlissCollectionArray<T>;
-        around(element:Element) : BlissCollectionArray<T>;
-        attributes(attrs: Object) : BlissCollectionArray<T>;
-        before(element:Element) : BlissCollectionArray<T>;
-        inside(element:Element) : BlissCollectionArray<T>;
-        properties(props: Object) : BlissCollectionArray<T>;
-        start(element:Element) : BlissCollectionArray<T>;
-        style(properties: Object) : BlissCollectionArray<T>;
-        transition(properties: Object, duration?: number) : Promise<T>[];
-        delegate(type: string, selector: string, callback: (event: Event) => void): BlissCollectionArray<T>;
-        delegate(type: string, selectorsToCallbacks: {[selector: string] : (event: Event) => void}): BlissCollectionArray<T>;
-        delegate(typesToSelectorsToCallbacks: {[type: string] : {[selector: string] : (event: Event) => void}}): BlissCollectionArray<T>;
-        events(handlers: {[eventName:string] : (event: Event) => void} | Element): BlissCollectionArray<T>;
-        fire(type: string, properties?: {[propertyName: string] : any}): BlissCollectionArray<T>;
-        once(handlers: {[eventName:string] : (event: Event) => void} | Element): BlissCollectionArray<T>;
-
-        addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): BlissCollectionArray<T>;
-
-        remove(): BlissCollectionArray<T>;
-    }
-}
-
-declare var Bliss: BlissNS.BlissStatic;
-declare var $: BlissNS.BlissStatic;
-declare var $$: BlissNS.BlissStaticCollection;
diff --git a/blissfuljs/index.d.ts b/blissfuljs/index.d.ts
new file mode 100644
index 0000000000..76061c1391
--- /dev/null
+++ b/blissfuljs/index.d.ts
@@ -0,0 +1,670 @@
+// Type definitions for bliss
+// Project: http://blissfuljs.com/
+// Definitions by: François Skorzec <https://github.com/fskorzec>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface Element {
+    _: BlissNS.BlissBindedElement<Element>;
+}
+
+interface Array<T> {
+    _: BlissNS.BlissBindedArray<T> & BlissNS.BlissCollectionArray<T>;
+}
+
+declare namespace BlissNS {
+    export type BlissDecoratedElement<T> = Element & T;
+    export type BlissDecoratedArrayElement<T> = Array<T> & BlissNS.BlissCollectionArray<T>;
+
+    interface BlissStatic {
+        <T>(selector: string, context?: Element): BlissDecoratedElement<T>;
+
+        classProps: Object;
+
+        create(tag: "a"): HTMLAnchorElement;
+        create(tag: "applet"): HTMLAppletElement;
+        create(tag: "area"):HTMLAreaElement;
+        create(tag: "audio"): HTMLAudioElement;
+        create(tag: "base"): HTMLBaseElement;
+        create(tag: "basefont"): HTMLBaseFontElement;
+        create(tag: "blockquote"): HTMLQuoteElement;
+        create(tag: "body"): HTMLBodyElement;
+        create(tag: "br"): HTMLBRElement;
+        create(tag: "button"): HTMLButtonElement;
+        create(tag: "canvas"): HTMLCanvasElement;
+        create(tag: "datalist"): HTMLDataListElement;
+        create(tag: "dd"): HTMLElement;
+        create(tag: "directory"): HTMLDirectoryElement;
+        create(tag: "div"): HTMLDivElement;
+        create(tag: "embeded"): HTMLEmbedElement;
+        create(tag: "fieldset"): HTMLFieldSetElement;
+        create(tag: "form"): HTMLFormElement;
+        create(tag: "frame"): HTMLFrameElement;
+        create(tag: "frameset"): HTMLFrameSetElement;
+        create(tag: "iframe"): HTMLDListElement;
+        create(tag: "image"): HTMLImageElement;
+        create(tag: "input"): HTMLInputElement;
+        create(tag: "i"): HTMLLIElement;
+        create(tag: "label"): HTMLLabelElement;
+        create(tag: "legend"): HTMLLegendElement;
+        create(tag: "li"): HTMLLIElement;
+        create(tag: "link"): HTMLLinkElement;
+        create(tag: "map"): HTMLMapElement;
+        create(tag: "mark"): HTMLMarqueeElement;
+        create(tag: "menu"): HTMLMenuElement;
+        create(tag: "meta"): HTMLMetaElement;
+        create(tag: "object"): HTMLObjectElement;
+        create(tag: "ol"): HTMLOListElement;
+        create(tag: "optgroup"): HTMLOptGroupElement;
+        create(tag: "option"): HTMLOptionElement;
+        create(tag: "p"): HTMLParagraphElement;
+        create(tag: "param"): HTMLParamElement;
+        create(tag: "pre"): HTMLPreElement;
+        create(tag: "progress"): HTMLProgressElement;
+        create(tag: "q"): HTMLQuoteElement;
+        create(tag: "script"): HTMLScriptElement;
+        create(tag: "select"): HTMLSelectElement;
+        create(tag: "source"): HTMLSourceElement;
+        create(tag: "span"): HTMLSpanElement;
+        create(tag: "style"): HTMLStyleElement;
+        create(tag: "table"): HTMLTableElement;
+        create(tag: "thead"): HTMLTableHeaderCellElement;
+        create(tag: "ul"): HTMLUListElement;
+        create(tag: "video"): HTMLVideoElement;
+        create<T>(tag: string): BlissDecoratedElement<T>;
+
+        create<T>(options: Object): BlissDecoratedElement<T>;
+
+        create(tag: "a", options: Object): HTMLAnchorElement;
+        create(tag: "applet", options: Object): HTMLAppletElement;
+        create(tag: "area", options: Object): HTMLAreaElement;
+        create(tag: "audio", options: Object): HTMLAudioElement;
+        create(tag: "base", options: Object): HTMLBaseElement;
+        create(tag: "basefont", options: Object): HTMLBaseFontElement;
+        create(tag: "blockquote", options: Object): HTMLQuoteElement;
+        create(tag: "body", options: Object): HTMLBodyElement;
+        create(tag: "br", options: Object): HTMLBRElement;
+        create(tag: "button", options: Object): HTMLButtonElement;
+        create(tag: "canvas", options: Object): HTMLCanvasElement;
+        create(tag: "datalist", options: Object): HTMLDataListElement;
+        create(tag: "dd", options: Object): HTMLElement;
+        create(tag: "directory", options: Object): HTMLDirectoryElement;
+        create(tag: "div", options: Object): HTMLDivElement;
+        create(tag: "embeded", options: Object): HTMLEmbedElement;
+        create(tag: "fieldset", options: Object): HTMLFieldSetElement;
+        create(tag: "form", options: Object): HTMLFormElement;
+        create(tag: "frame", options: Object): HTMLFrameElement;
+        create(tag: "frameset", options: Object): HTMLFrameSetElement;
+        create(tag: "iframe", options: Object): HTMLDListElement;
+        create(tag: "image", options: Object): HTMLImageElement;
+        create(tag: "input", options: Object): HTMLInputElement;
+        create(tag: "i", options: Object): HTMLLIElement;
+        create(tag: "label", options: Object): HTMLLabelElement;
+        create(tag: "legend", options: Object): HTMLLegendElement;
+        create(tag: "li", options: Object): HTMLLIElement;
+        create(tag: "link", options: Object): HTMLLinkElement;
+        create(tag: "map", options: Object): HTMLMapElement;
+        create(tag: "mark", options: Object): HTMLMarqueeElement;
+        create(tag: "menu", options: Object): HTMLMenuElement;
+        create(tag: "meta", options: Object): HTMLMetaElement;
+        create(tag: "object", options: Object): HTMLObjectElement;
+        create(tag: "ol", options: Object): HTMLOListElement;
+        create(tag: "optgroup", options: Object): HTMLOptGroupElement;
+        create(tag: "option", options: Object): HTMLOptionElement;
+        create(tag: "p", options: Object): HTMLParagraphElement;
+        create(tag: "param", options: Object): HTMLParamElement;
+        create(tag: "pre", options: Object): HTMLPreElement;
+        create(tag: "progress", options: Object): HTMLProgressElement;
+        create(tag: "q", options: Object): HTMLQuoteElement;
+        create(tag: "script", options: Object): HTMLScriptElement;
+        create(tag: "select", options: Object): HTMLSelectElement;
+        create(tag: "source", options: Object): HTMLSourceElement;
+        create(tag: "span", options: Object): HTMLSpanElement;
+        create(tag: "style", options: Object): HTMLStyleElement;
+        create(tag: "table", options: Object): HTMLTableElement;
+        create(tag: "thead", options: Object): HTMLTableHeaderCellElement;
+        create(tag: "ul", options: Object): HTMLUListElement;
+        create(tag: "video", options: Object): HTMLVideoElement;
+        create<T>(tag: string, options: Object): BlissDecoratedElement<T>;
+
+        create<T>(...args:any[]): BlissDecoratedElement<T>;
+
+        set<T>(subject: BlissDecoratedElement<T>, options: Object): BlissDecoratedElement<T>;
+        contents<T>(subject: BlissDecoratedElement<T> , elements: Object | Array<any> | string | Number | Node): BlissDecoratedElement<T>;
+        contents<T>(subject: BlissDecoratedElement<T>[], elements: Object | Array<any> | string | Number | Node): BlissDecoratedElement<T>[];
+        clone<T>(subject:BlissDecoratedElement<T>) : BlissDecoratedElement<T>;
+        after<T>(subject:BlissDecoratedElement<T>, element: Element) : BlissDecoratedElement<T>;
+        around<T>(subject:BlissDecoratedElement<T>, element: Element) : BlissDecoratedElement<T>;
+        attributes<T>(subject:BlissDecoratedElement<T>, attrs: Object) : BlissDecoratedElement<T>;
+        attributes<T>(subject:BlissDecoratedElement<T>[], attrs: Object) : BlissDecoratedElement<T>[];
+        before<T>(subject:BlissDecoratedElement<T>, element: Element) : BlissDecoratedElement<T>;
+        inside<T>(subject:BlissDecoratedElement<T>, element: Element) : BlissDecoratedElement<T>;
+        properties<T>(subject:BlissDecoratedElement<T>, props: Object) : BlissDecoratedElement<T>;
+        properties<T>(subject:BlissDecoratedElement<T>[], props: Object) : BlissDecoratedElement<T>[];
+        start<T>(subject:BlissDecoratedElement<T>, element: Element) : BlissDecoratedElement<T>;
+        style<T>(subject:BlissDecoratedElement<T>, properties: Object) : BlissDecoratedElement<T>;
+        style<T>(subject:BlissDecoratedElement<T>[], properties: Object) : BlissDecoratedElement<T>[];
+        transition<T>(subject:BlissDecoratedElement<T> | BlissDecoratedElement<T>[], properties: Object, duration?: number) : Promise<T>;
+        delegate<T>(subject:BlissDecoratedElement<T> , type: string, selector: string, callback: (event: Event) => void): BlissDecoratedElement<T>;
+        delegate<T>(subject: BlissDecoratedElement<T>[], type: string, selector: string, callback: (event: Event) => void): BlissDecoratedElement<T>[];
+        delegate<T>(subject:BlissDecoratedElement<T> , type: string, selectorsToCallbacks: {[selector: string] : (event: Event) => void}): BlissDecoratedElement<T>;
+        delegate<T>(subject:BlissDecoratedElement<T>[], type: string, selectorsToCallbacks: {[selector: string] : (event: Event) => void}): BlissDecoratedElement<T>[];
+        delegate<T>(subject:BlissDecoratedElement<T> , typesToSelectorsToCallbacks: {[type: string] : {[selector: string] : (event: Event) => void}}): BlissDecoratedElement<T>;
+        delegate<T>(subject:BlissDecoratedElement<T>[], typesToSelectorsToCallbacks: {[type: string] : {[selector: string] : (event: Event) => void}}): BlissDecoratedElement<T>[];
+        events<T>(subject:BlissDecoratedElement<T> , handlers: {[eventName:string] : (event: Event) => void} | Element): BlissDecoratedElement<T>;
+        events<T>(subject: BlissDecoratedElement<T>[], handlers: {[eventName:string] : (event: Event) => void} | Element): BlissDecoratedElement<T>[];
+        fire<T>(subject:BlissDecoratedElement<T>, type: string, properties?: {[propertyName: string] : any}): BlissDecoratedElement<T>;
+        fire<T>(subject:BlissDecoratedElement<T>[], type: string, properties?: {[propertyName: string] : any}): BlissDecoratedElement<T>[];
+        once<T>(subject:BlissDecoratedElement<T>, handlers: {[eventName:string] : (event: Event) => void} | Element): BlissDecoratedElement<T>;
+        once<T>(subject:BlissDecoratedElement<T>[], handlers: {[eventName:string] : (event: Event) => void} | Element): BlissDecoratedElement<T>[];
+        ready(context?: Document): Promise<any>;
+
+        remove(subject:Element | BlissStatic): void;
+
+        all(array: Array<any>, method: string, ...args: Array<any>): Array<any>;
+        all<T>(array: Array<T>, method: string, ...args: Array<any>): Array<T>;
+
+        Class<T>(options: {
+            constructor?: Function;
+            extends?: Function;
+            abstract?: boolean;
+            lazy?: Object;
+            live?: Object;
+            static?: Object;
+            [propertyName: string]:any;
+        }): T;
+
+        Class(options: {
+            constructor?: Function;
+            extends?: Function;
+            abstract?: boolean;
+            lazy?: Object;
+            live?: Object;
+            static?: Object;
+            [propertyName: string]:any;
+        }): Object;
+
+        each<T>(obj: {[propertyName: string] : any}, callback: Function, ret?: Object): T;
+        each(obj: {[propertyName: string] : any}, callback: Function, ret?: Object): Object;
+
+        extend(target: Object, source: any, whitelist? : string[] | string | Function | RegExp): Object;
+        extend<T>(target: Object, source: any, whitelist? : string[] | string | Function | RegExp): T;
+
+        lazy(object: Object, property: string, getter: () => any): Object;
+        lazy<T>(object:Object, property: string, getter:() => any): T;
+
+        lazy(object: Object, properties: {[propertyName:string]: () => any}): Object;
+        lazy<T>(object: Object, properties: {[propertyName:string]: () => any}): T;
+
+        live(object: Object, property: string, descriptor: Object | Function): Object;
+        live<T>(object: Object, property: string, descriptor: Object | Function): T;
+
+        live(object: Object, properties: {[propertyName: string]: Object | Function}): Object;
+        live<T>(object: Object, properties: {[propertyName: string]: Object | Function}): T;
+
+        type(object: Object): string;
+
+        value(obj: Object, ...properties: string[]): any;
+        value<T>(obj: Object, ...properties: string[]): T;
+
+        value(property: string, ...properties: string[]): any;
+        value<T>(property: string , ...properties: string[]): T;
+
+        fetch(url: string, options?: {
+            method?: string;
+            data?: string;
+            headers?:{[key:string]:string};
+
+            onreadystatechange?: (ev: ProgressEvent) => any;
+            readyState?: number;
+            response?: any;
+            responseBody?: any;
+            responseText?: string;
+            responseType?: string;
+            responseXML?: any;
+            status?: number;
+            statusText?: string;
+            timeout?: number;
+            upload?: XMLHttpRequestUpload;
+            withCredentials?: boolean;
+
+            [propertyName: string]: any;
+        }): Promise<XMLHttpRequest>;
+
+        include(condition: any, url: string ): Promise<void>;
+        include(url: string ): Promise<void>;
+
+        add(name: string, callback: Function, on?: BlissStatic | BlissStaticCollection | Element | Array<any>): void;
+        add(callbacks:{[callbackName: string]: Function}, on?: BlissStatic | BlissStaticCollection | Element | Array<any>): void;
+
+        hooks: {
+            add(name: string, callback: Function): void;
+            run(name: string, env: Object): void;
+        };
+
+        $: BlissStaticCollection;
+    }
+
+    interface BlissStaticCollection extends BlissStatic {
+        <T>(selector: string, context?: Element): BlissDecoratedArrayElement<T>;
+        <T>(expr: Object, context?: Element): Array<T>;
+        (expr: Window, context?: Element): [Window];
+        (expr: Node, context?: Element): [Node];
+    }
+
+    // Native methods added into "_" property, but methods that return "void" now return thi stype in order to be chainables
+    // Methods are All HTMLElement a ELement methods
+    interface BlissNativeExtentions<T> {
+        blur(): T;
+        click(): T;
+        contains(child: HTMLElement): boolean;
+        dragDrop(): boolean;
+        focus(): T;
+        insertAdjacentElement(position: string, insertedElement: Element): Element;
+        insertAdjacentHTML(where: string, html: string): T;
+        insertAdjacentText(where: string, text: string): T;
+        msGetInputContext(): MSInputMethodContext;
+        scrollIntoView(top?: boolean): T;
+        setActive(): T;
+        addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSManipulationStateChanged", listener: (ev: MSManipulationEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "mouseenter", listener: (ev: MouseEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "mouseleave", listener: (ev: MouseEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "mousewheel", listener: (ev: MouseEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): T;
+        getAttribute(name?: string): string;
+        getAttributeNS(namespaceURI: string, localName: string): string;
+        getAttributeNode(name: string): Attr;
+        getAttributeNodeNS(namespaceURI: string, localName: string): Attr;
+        getBoundingClientRect(): ClientRect;
+        getClientRects(): ClientRectList;
+        getElementsByTagName(name: "a"): NodeListOf<HTMLAnchorElement>;
+        getElementsByTagName(name: "abbr"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "acronym"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "address"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "applet"): NodeListOf<HTMLAppletElement>;
+        getElementsByTagName(name: "area"): NodeListOf<HTMLAreaElement>;
+        getElementsByTagName(name: "article"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "aside"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "audio"): NodeListOf<HTMLAudioElement>;
+        getElementsByTagName(name: "b"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "base"): NodeListOf<HTMLBaseElement>;
+        getElementsByTagName(name: "basefont"): NodeListOf<HTMLBaseFontElement>;
+        getElementsByTagName(name: "bdo"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "big"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "blockquote"): NodeListOf<HTMLQuoteElement>;
+        getElementsByTagName(name: "body"): NodeListOf<HTMLBodyElement>;
+        getElementsByTagName(name: "br"): NodeListOf<HTMLBRElement>;
+        getElementsByTagName(name: "button"): NodeListOf<HTMLButtonElement>;
+        getElementsByTagName(name: "canvas"): NodeListOf<HTMLCanvasElement>;
+        getElementsByTagName(name: "caption"): NodeListOf<HTMLTableCaptionElement>;
+        getElementsByTagName(name: "center"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "circle"): NodeListOf<SVGCircleElement>;
+        getElementsByTagName(name: "cite"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "clippath"): NodeListOf<SVGClipPathElement>;
+        getElementsByTagName(name: "code"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "col"): NodeListOf<HTMLTableColElement>;
+        getElementsByTagName(name: "colgroup"): NodeListOf<HTMLTableColElement>;
+        getElementsByTagName(name: "datalist"): NodeListOf<HTMLDataListElement>;
+        getElementsByTagName(name: "dd"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "defs"): NodeListOf<SVGDefsElement>;
+        getElementsByTagName(name: "del"): NodeListOf<HTMLModElement>;
+        getElementsByTagName(name: "desc"): NodeListOf<SVGDescElement>;
+        getElementsByTagName(name: "dfn"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "dir"): NodeListOf<HTMLDirectoryElement>;
+        getElementsByTagName(name: "div"): NodeListOf<HTMLDivElement>;
+        getElementsByTagName(name: "dl"): NodeListOf<HTMLDListElement>;
+        getElementsByTagName(name: "dt"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "ellipse"): NodeListOf<SVGEllipseElement>;
+        getElementsByTagName(name: "em"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "embed"): NodeListOf<HTMLEmbedElement>;
+        getElementsByTagName(name: "feblend"): NodeListOf<SVGFEBlendElement>;
+        getElementsByTagName(name: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>;
+        getElementsByTagName(name: "fecomponenttransfer"): NodeListOf<SVGFEComponentTransferElement>;
+        getElementsByTagName(name: "fecomposite"): NodeListOf<SVGFECompositeElement>;
+        getElementsByTagName(name: "feconvolvematrix"): NodeListOf<SVGFEConvolveMatrixElement>;
+        getElementsByTagName(name: "fediffuselighting"): NodeListOf<SVGFEDiffuseLightingElement>;
+        getElementsByTagName(name: "fedisplacementmap"): NodeListOf<SVGFEDisplacementMapElement>;
+        getElementsByTagName(name: "fedistantlight"): NodeListOf<SVGFEDistantLightElement>;
+        getElementsByTagName(name: "feflood"): NodeListOf<SVGFEFloodElement>;
+        getElementsByTagName(name: "fefunca"): NodeListOf<SVGFEFuncAElement>;
+        getElementsByTagName(name: "fefuncb"): NodeListOf<SVGFEFuncBElement>;
+        getElementsByTagName(name: "fefuncg"): NodeListOf<SVGFEFuncGElement>;
+        getElementsByTagName(name: "fefuncr"): NodeListOf<SVGFEFuncRElement>;
+        getElementsByTagName(name: "fegaussianblur"): NodeListOf<SVGFEGaussianBlurElement>;
+        getElementsByTagName(name: "feimage"): NodeListOf<SVGFEImageElement>;
+        getElementsByTagName(name: "femerge"): NodeListOf<SVGFEMergeElement>;
+        getElementsByTagName(name: "femergenode"): NodeListOf<SVGFEMergeNodeElement>;
+        getElementsByTagName(name: "femorphology"): NodeListOf<SVGFEMorphologyElement>;
+        getElementsByTagName(name: "feoffset"): NodeListOf<SVGFEOffsetElement>;
+        getElementsByTagName(name: "fepointlight"): NodeListOf<SVGFEPointLightElement>;
+        getElementsByTagName(name: "fespecularlighting"): NodeListOf<SVGFESpecularLightingElement>;
+        getElementsByTagName(name: "fespotlight"): NodeListOf<SVGFESpotLightElement>;
+        getElementsByTagName(name: "fetile"): NodeListOf<SVGFETileElement>;
+        getElementsByTagName(name: "feturbulence"): NodeListOf<SVGFETurbulenceElement>;
+        getElementsByTagName(name: "fieldset"): NodeListOf<HTMLFieldSetElement>;
+        getElementsByTagName(name: "figcaption"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "figure"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "filter"): NodeListOf<SVGFilterElement>;
+        getElementsByTagName(name: "font"): NodeListOf<HTMLFontElement>;
+        getElementsByTagName(name: "footer"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "foreignobject"): NodeListOf<SVGForeignObjectElement>;
+        getElementsByTagName(name: "form"): NodeListOf<HTMLFormElement>;
+        getElementsByTagName(name: "frame"): NodeListOf<HTMLFrameElement>;
+        getElementsByTagName(name: "frameset"): NodeListOf<HTMLFrameSetElement>;
+        getElementsByTagName(name: "g"): NodeListOf<SVGGElement>;
+        getElementsByTagName(name: "h1"): NodeListOf<HTMLHeadingElement>;
+        getElementsByTagName(name: "h2"): NodeListOf<HTMLHeadingElement>;
+        getElementsByTagName(name: "h3"): NodeListOf<HTMLHeadingElement>;
+        getElementsByTagName(name: "h4"): NodeListOf<HTMLHeadingElement>;
+        getElementsByTagName(name: "h5"): NodeListOf<HTMLHeadingElement>;
+        getElementsByTagName(name: "h6"): NodeListOf<HTMLHeadingElement>;
+        getElementsByTagName(name: "head"): NodeListOf<HTMLHeadElement>;
+        getElementsByTagName(name: "header"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "hgroup"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "hr"): NodeListOf<HTMLHRElement>;
+        getElementsByTagName(name: "html"): NodeListOf<HTMLHtmlElement>;
+        getElementsByTagName(name: "i"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "iframe"): NodeListOf<HTMLIFrameElement>;
+        getElementsByTagName(name: "image"): NodeListOf<SVGImageElement>;
+        getElementsByTagName(name: "img"): NodeListOf<HTMLImageElement>;
+        getElementsByTagName(name: "input"): NodeListOf<HTMLInputElement>;
+        getElementsByTagName(name: "ins"): NodeListOf<HTMLModElement>;
+        getElementsByTagName(name: "isindex"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "kbd"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "keygen"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "label"): NodeListOf<HTMLLabelElement>;
+        getElementsByTagName(name: "legend"): NodeListOf<HTMLLegendElement>;
+        getElementsByTagName(name: "li"): NodeListOf<HTMLLIElement>;
+        getElementsByTagName(name: "line"): NodeListOf<SVGLineElement>;
+        getElementsByTagName(name: "lineargradient"): NodeListOf<SVGLinearGradientElement>;
+        getElementsByTagName(name: "link"): NodeListOf<HTMLLinkElement>;
+        getElementsByTagName(name: "listing"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "map"): NodeListOf<HTMLMapElement>;
+        getElementsByTagName(name: "mark"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "marker"): NodeListOf<SVGMarkerElement>;
+        getElementsByTagName(name: "marquee"): NodeListOf<HTMLMarqueeElement>;
+        getElementsByTagName(name: "mask"): NodeListOf<SVGMaskElement>;
+        getElementsByTagName(name: "menu"): NodeListOf<HTMLMenuElement>;
+        getElementsByTagName(name: "meta"): NodeListOf<HTMLMetaElement>;
+        getElementsByTagName(name: "metadata"): NodeListOf<SVGMetadataElement>;
+        getElementsByTagName(name: "nav"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "nextid"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "nobr"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "noframes"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "noscript"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "object"): NodeListOf<HTMLObjectElement>;
+        getElementsByTagName(name: "ol"): NodeListOf<HTMLOListElement>;
+        getElementsByTagName(name: "optgroup"): NodeListOf<HTMLOptGroupElement>;
+        getElementsByTagName(name: "option"): NodeListOf<HTMLOptionElement>;
+        getElementsByTagName(name: "p"): NodeListOf<HTMLParagraphElement>;
+        getElementsByTagName(name: "param"): NodeListOf<HTMLParamElement>;
+        getElementsByTagName(name: "path"): NodeListOf<SVGPathElement>;
+        getElementsByTagName(name: "pattern"): NodeListOf<SVGPatternElement>;
+        getElementsByTagName(name: "plaintext"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "polygon"): NodeListOf<SVGPolygonElement>;
+        getElementsByTagName(name: "polyline"): NodeListOf<SVGPolylineElement>;
+        getElementsByTagName(name: "pre"): NodeListOf<HTMLPreElement>;
+        getElementsByTagName(name: "progress"): NodeListOf<HTMLProgressElement>;
+        getElementsByTagName(name: "q"): NodeListOf<HTMLQuoteElement>;
+        getElementsByTagName(name: "radialgradient"): NodeListOf<SVGRadialGradientElement>;
+        getElementsByTagName(name: "rect"): NodeListOf<SVGRectElement>;
+        getElementsByTagName(name: "rt"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "ruby"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "s"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "samp"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "script"): NodeListOf<HTMLScriptElement>;
+        getElementsByTagName(name: "section"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "select"): NodeListOf<HTMLSelectElement>;
+        getElementsByTagName(name: "small"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "source"): NodeListOf<HTMLSourceElement>;
+        getElementsByTagName(name: "span"): NodeListOf<HTMLSpanElement>;
+        getElementsByTagName(name: "stop"): NodeListOf<SVGStopElement>;
+        getElementsByTagName(name: "strike"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "strong"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "style"): NodeListOf<HTMLStyleElement>;
+        getElementsByTagName(name: "sub"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "sup"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "svg"): NodeListOf<SVGSVGElement>;
+        getElementsByTagName(name: "switch"): NodeListOf<SVGSwitchElement>;
+        getElementsByTagName(name: "symbol"): NodeListOf<SVGSymbolElement>;
+        getElementsByTagName(name: "table"): NodeListOf<HTMLTableElement>;
+        getElementsByTagName(name: "tbody"): NodeListOf<HTMLTableSectionElement>;
+        getElementsByTagName(name: "td"): NodeListOf<HTMLTableDataCellElement>;
+        getElementsByTagName(name: "text"): NodeListOf<SVGTextElement>;
+        getElementsByTagName(name: "textpath"): NodeListOf<SVGTextPathElement>;
+        getElementsByTagName(name: "textarea"): NodeListOf<HTMLTextAreaElement>;
+        getElementsByTagName(name: "tfoot"): NodeListOf<HTMLTableSectionElement>;
+        getElementsByTagName(name: "th"): NodeListOf<HTMLTableHeaderCellElement>;
+        getElementsByTagName(name: "thead"): NodeListOf<HTMLTableSectionElement>;
+        getElementsByTagName(name: "title"): NodeListOf<HTMLTitleElement>;
+        getElementsByTagName(name: "tr"): NodeListOf<HTMLTableRowElement>;
+        getElementsByTagName(name: "track"): NodeListOf<HTMLTrackElement>;
+        getElementsByTagName(name: "tspan"): NodeListOf<SVGTSpanElement>;
+        getElementsByTagName(name: "tt"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "u"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "ul"): NodeListOf<HTMLUListElement>;
+        getElementsByTagName(name: "use"): NodeListOf<SVGUseElement>;
+        getElementsByTagName(name: "var"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "video"): NodeListOf<HTMLVideoElement>;
+        getElementsByTagName(name: "view"): NodeListOf<SVGViewElement>;
+        getElementsByTagName(name: "wbr"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: "x-ms-webview"): NodeListOf<MSHTMLWebViewElement>;
+        getElementsByTagName(name: "xmp"): NodeListOf<HTMLElement>;
+        getElementsByTagName(name: string): NodeListOf<Element>;
+        getElementsByTagNameNS(namespaceURI: string, localName: string): NodeListOf<Element>;
+        hasAttribute(name: string): boolean;
+        hasAttributeNS(namespaceURI: string, localName: string): boolean;
+        msGetRegionContent(): MSRangeCollection;
+        msGetUntransformedBounds(): ClientRect;
+        msMatchesSelector(selectors: string): boolean;
+        msReleasePointerCapture(pointerId: number): T;
+        msSetPointerCapture(pointerId: number): T;
+        msZoomTo(args: MsZoomToOptions): T;
+        releasePointerCapture(pointerId: number): T;
+        removeAttribute(name?: string): T;
+        removeAttributeNS(namespaceURI: string, localName: string): T;
+        removeAttributeNode(oldAttr: Attr): Attr;
+        requestFullscreen(): T;
+        requestPointerLock(): T;
+        setAttribute(name?: string, value?: string): T;
+        setAttributeNS(namespaceURI: string, qualifiedName: string, value: string): T;
+        setAttributeNode(newAttr: Attr): Attr;
+        setAttributeNodeNS(newAttr: Attr): Attr;
+        setPointerCapture(pointerId: number): T;
+        webkitMatchesSelector(selectors: string): boolean;
+        webkitRequestFullScreen(): T;
+        webkitRequestFullscreen(): T;
+        getElementsByClassName(classNames: string): NodeListOf<Element>;
+        addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): T;
+        addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): T;
+        addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): T;
+    }
+
+    interface BlissBindedElement<T> extends BlissNativeExtentions<T> {
+        set(options: Object): BlissDecoratedElement<T>
+        contents(elements: Object | Array<any> | string | Number | Node): BlissDecoratedElement<T>
+        clone(): BlissDecoratedElement<T>;
+        after(element:Element) : BlissDecoratedElement<T>;
+        around(element:Element) : BlissDecoratedElement<T>;
+        attributes(attrs: Object) : BlissDecoratedElement<T>;
+        before(element:Element) : BlissDecoratedElement<T>;
+        inside(element:Element) : BlissDecoratedElement<T>;
+        properties(props: Object) : BlissDecoratedElement<T>;
+        start(element:Element) : BlissDecoratedElement<T>;
+        style(properties: Object) : BlissDecoratedElement<T>;
+        transition(properties: Object, duration?: number) : Promise<T>;
+        delegate(type: string, selector: string, callback: (event: Event) => void): BlissDecoratedElement<T>;
+        delegate(type: string, selectorsToCallbacks: {[selector: string] : (event: Event) => void}): BlissDecoratedElement<T>;
+        delegate(typesToSelectorsToCallbacks: {[type: string] : {[selector: string] : (event: Event) => void}}): BlissDecoratedElement<T>;
+        events(handlers: {[eventName:string] : (event: Event) => void} | Element): BlissDecoratedElement<T>;
+        fire(type: string, properties?: {[propertyName: string] : any}): BlissDecoratedElement<T>;
+        once(handlers: {[eventName:string] : (event: Event) => void} | Element): BlissDecoratedElement<T>;
+
+        remove(): BlissDecoratedElement<T>;
+    }
+
+    interface BlissBindedArray<T> {
+        all(method: string, ...args: Array<any>): Array<any>;
+        all<T>(method: string, ...args: Array<any>): Array<T>;
+    }
+
+    interface BlissCollectionArray<T> {
+        set(options: Object): BlissCollectionArray<T>
+        contents(elements: Object | Array<any> | string | Number | Node): BlissCollectionArray<T>
+        clone(): BlissCollectionArray<T>;
+        after(element:Element) : BlissCollectionArray<T>;
+        around(element:Element) : BlissCollectionArray<T>;
+        attributes(attrs: Object) : BlissCollectionArray<T>;
+        before(element:Element) : BlissCollectionArray<T>;
+        inside(element:Element) : BlissCollectionArray<T>;
+        properties(props: Object) : BlissCollectionArray<T>;
+        start(element:Element) : BlissCollectionArray<T>;
+        style(properties: Object) : BlissCollectionArray<T>;
+        transition(properties: Object, duration?: number) : Promise<T>[];
+        delegate(type: string, selector: string, callback: (event: Event) => void): BlissCollectionArray<T>;
+        delegate(type: string, selectorsToCallbacks: {[selector: string] : (event: Event) => void}): BlissCollectionArray<T>;
+        delegate(typesToSelectorsToCallbacks: {[type: string] : {[selector: string] : (event: Event) => void}}): BlissCollectionArray<T>;
+        events(handlers: {[eventName:string] : (event: Event) => void} | Element): BlissCollectionArray<T>;
+        fire(type: string, properties?: {[propertyName: string] : any}): BlissCollectionArray<T>;
+        once(handlers: {[eventName:string] : (event: Event) => void} | Element): BlissCollectionArray<T>;
+
+        addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): BlissCollectionArray<T>;
+
+        remove(): BlissCollectionArray<T>;
+    }
+}
+
+declare var Bliss: BlissNS.BlissStatic;
+declare var $: BlissNS.BlissStatic;
+declare var $$: BlissNS.BlissStaticCollection;
diff --git a/blissfuljs/tsconfig.json b/blissfuljs/tsconfig.json
new file mode 100644
index 0000000000..26de24f582
--- /dev/null
+++ b/blissfuljs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "blissfuljs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/blob-stream/blob-stream-tests.ts b/blob-stream/blob-stream-tests.ts
index fab0932068..b9174859f9 100644
--- a/blob-stream/blob-stream-tests.ts
+++ b/blob-stream/blob-stream-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="./blob-stream.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 var bl = require('blob-stream');
 
diff --git a/blob-stream/blob-stream.d.ts b/blob-stream/blob-stream.d.ts
deleted file mode 100644
index cb7c6c1146..0000000000
--- a/blob-stream/blob-stream.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Type definitions for blob-stream v0.1.3
-// Project: https://github.com/devongovett/blob-stream
-// Definitions by: Eric Hillah <https://github.com/erichillah>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare function BlobStream(): BlobStream.IBlobStream;
-
-declare namespace BlobStream {
-
-    interface IBlobStream extends NodeJS.WritableStream{
-        toBlob(type?: string): Blob;
-        toBlobURL(type?: string): string;
-    }
-}
-
-declare module "blob-stream" {
-    export = BlobStream;
-}
diff --git a/blob-stream/index.d.ts b/blob-stream/index.d.ts
new file mode 100644
index 0000000000..c7452a3242
--- /dev/null
+++ b/blob-stream/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for blob-stream v0.1.3
+// Project: https://github.com/devongovett/blob-stream
+// Definitions by: Eric Hillah <https://github.com/erichillah>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare function BlobStream(): BlobStream.IBlobStream;
+
+declare namespace BlobStream {
+
+    interface IBlobStream extends NodeJS.WritableStream{
+        toBlob(type?: string): Blob;
+        toBlobURL(type?: string): string;
+    }
+}
+
+export = BlobStream;
\ No newline at end of file
diff --git a/blob-stream/tsconfig.json b/blob-stream/tsconfig.json
new file mode 100644
index 0000000000..67b9cd7761
--- /dev/null
+++ b/blob-stream/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "blob-stream-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/blocks/blocks-tests.ts b/blocks/blocks-tests.ts
index 7b83b52a61..3fa24b4d83 100644
--- a/blocks/blocks-tests.ts
+++ b/blocks/blocks-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="blocks.d.ts" />
+
 
 function test_blocks_methods() {
 	var extended: Object;
diff --git a/blocks/blocks.d.ts b/blocks/index.d.ts
similarity index 100%
rename from blocks/blocks.d.ts
rename to blocks/index.d.ts
diff --git a/blocks/tsconfig.json b/blocks/tsconfig.json
new file mode 100644
index 0000000000..cea3804db6
--- /dev/null
+++ b/blocks/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "blocks-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/blue-tape/blue-tape-tests.ts b/blue-tape/blue-tape-tests.ts
index a01675a1c5..92b2641115 100644
--- a/blue-tape/blue-tape-tests.ts
+++ b/blue-tape/blue-tape-tests.ts
@@ -1,6 +1,5 @@
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../bluebird/bluebird.d.ts" />
-/// <reference path="blue-tape.d.ts" />
+/// <reference types="node" />
+/// <reference types="bluebird" />
 
 import tape = require('blue-tape');
 import P = require('bluebird');
diff --git a/blue-tape/blue-tape.d.ts b/blue-tape/blue-tape.d.ts
deleted file mode 100644
index 1216600cab..0000000000
--- a/blue-tape/blue-tape.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for blue-tape v0.1.11
-// Project: https://github.com/spion/blue-tape
-// Definitions by: Haoqun Jiang <https://github.com/sodatea>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../tape/tape.d.ts" />
-
-declare module 'blue-tape' {
-	import tape = require('tape');
-	export = tape;
-}
diff --git a/blue-tape/index.d.ts b/blue-tape/index.d.ts
new file mode 100644
index 0000000000..133968a165
--- /dev/null
+++ b/blue-tape/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for blue-tape v0.1.11
+// Project: https://github.com/spion/blue-tape
+// Definitions by: Haoqun Jiang <https://github.com/sodatea>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import tape = require('tape');
+export = tape;
diff --git a/blue-tape/tsconfig.json b/blue-tape/tsconfig.json
new file mode 100644
index 0000000000..04302d1e28
--- /dev/null
+++ b/blue-tape/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "blue-tape-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bluebird-retry/bluebird-retry-tests.ts b/bluebird-retry/bluebird-retry-tests.ts
index 5d8c32dfcb..b63b360160 100644
--- a/bluebird-retry/bluebird-retry-tests.ts
+++ b/bluebird-retry/bluebird-retry-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="bluebird-retry.d.ts" />
-/// <reference path="../bluebird/bluebird.d.ts" />
+
+/// <reference types="bluebird" />
 import Promise = require('bluebird');
 import retry = require('bluebird-retry');
 
diff --git a/bluebird-retry/bluebird-retry.d.ts b/bluebird-retry/bluebird-retry.d.ts
deleted file mode 100644
index 1210bf3b53..0000000000
--- a/bluebird-retry/bluebird-retry.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Type definitions for bluebird-retry
-// Project: https://github.com/jut-io/bluebird-retry
-// Definitions by: Pascal Vomhoff <https://github.com/pvomhoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../bluebird/bluebird.d.ts" />
-declare module "bluebird-retry" {
-	import Promise = require('bluebird');
-
-	function retry<T>(func:(param:T)=>void, options?:retry.Options):Promise<T>;
-
-	namespace retry {
-		export interface Options {
-			interval?:number;
-			backoff?:number;
-			max_interval?:number;
-			timeout?:number;
-			max_tries?:number;
-		}
-
-	}
-
-	export = retry;
-}
diff --git a/bluebird-retry/index.d.ts b/bluebird-retry/index.d.ts
new file mode 100644
index 0000000000..2881d2065c
--- /dev/null
+++ b/bluebird-retry/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for bluebird-retry
+// Project: https://github.com/jut-io/bluebird-retry
+// Definitions by: Pascal Vomhoff <https://github.com/pvomhoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="bluebird" />
+
+import Promise = require('bluebird');
+
+declare function retry<T>(func: (param: T) => void, options?: retry.Options): Promise<T>;
+
+declare namespace retry {
+    export interface Options {
+        interval?: number;
+        backoff?: number;
+        max_interval?: number;
+        timeout?: number;
+        max_tries?: number;
+    }
+
+}
+
+export = retry;
diff --git a/bluebird-retry/tsconfig.json b/bluebird-retry/tsconfig.json
new file mode 100644
index 0000000000..ab290b6e3b
--- /dev/null
+++ b/bluebird-retry/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bluebird-retry-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bluebird/bluebird-1.0-tests.ts b/bluebird/bluebird-1.0-tests.ts
index 2aa795a4f3..6f6df3a978 100644
--- a/bluebird/bluebird-1.0-tests.ts
+++ b/bluebird/bluebird-1.0-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="bluebird-1.0.d.ts" />
+
 
 // Tests by: Bart van der Schoor <https://github.com/Bartvds>
 
diff --git a/bluebird/bluebird-1.0-tests.ts.tscparams b/bluebird/bluebird-1.0-tests.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/bluebird/bluebird-1.0-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/bluebird/bluebird-1.0.d.ts.tscparams b/bluebird/bluebird-1.0.d.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/bluebird/bluebird-1.0.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/bluebird/bluebird-tests.ts b/bluebird/bluebird-tests.ts
index a24cdfd7ee..8acdcb44bd 100644
--- a/bluebird/bluebird-tests.ts
+++ b/bluebird/bluebird-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="bluebird.d.ts"/>
-
 // Tests by: Bart van der Schoor <https://github.com/Bartvds>
 
 // Note: replicate changes to all overloads in both definition and test file
diff --git a/bluebird/bluebird.d.ts b/bluebird/index.d.ts
similarity index 100%
rename from bluebird/bluebird.d.ts
rename to bluebird/index.d.ts
diff --git a/bluebird/tsconfig.json b/bluebird/tsconfig.json
new file mode 100644
index 0000000000..b7544420b6
--- /dev/null
+++ b/bluebird/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "bluebird-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es5",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/blueimp-md5/blueimp-md5-tests.ts b/blueimp-md5/blueimp-md5-tests.ts
index 5e38083097..18edc69b57 100644
--- a/blueimp-md5/blueimp-md5-tests.ts
+++ b/blueimp-md5/blueimp-md5-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path='./blueimp-md5.d.ts' />
 
 import blueimp = require('blueimp-md5');
 
diff --git a/blueimp-md5/blueimp-md5.d.ts b/blueimp-md5/blueimp-md5.d.ts
deleted file mode 100644
index 99880ba0d6..0000000000
--- a/blueimp-md5/blueimp-md5.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// Type definitions for blueimp-md5 v1.1.0
-// Project: https://github.com/blueimp/JavaScript-MD5
-// Definitions by: Ray Martone <https://github.com/rmartone>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-declare module 'blueimp-md5' {
-    export function md5(value: string, key?: string, raw?: boolean): string;
-}
diff --git a/blueimp-md5/index.d.ts b/blueimp-md5/index.d.ts
new file mode 100644
index 0000000000..b51f554e32
--- /dev/null
+++ b/blueimp-md5/index.d.ts
@@ -0,0 +1,6 @@
+// Type definitions for blueimp-md5 v1.1.0
+// Project: https://github.com/blueimp/JavaScript-MD5
+// Definitions by: Ray Martone <https://github.com/rmartone>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export declare function md5(value: string, key?: string, raw?: boolean): string;
diff --git a/blueimp-md5/tsconfig.json b/blueimp-md5/tsconfig.json
new file mode 100644
index 0000000000..0c7840bbdf
--- /dev/null
+++ b/blueimp-md5/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "blueimp-md5-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/body-parser/body-parser.d.ts b/body-parser/body-parser.d.ts
deleted file mode 100644
index 16f639dfaf..0000000000
--- a/body-parser/body-parser.d.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-// Type definitions for body-parser
-// Project: http://expressjs.com
-// Definitions by: Santi Albo <https://github.com/santialbo/>, VILIC VANE <https://vilic.info>, Jonathan Häberle <https://github.com/dreampulse/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "body-parser" {
-    import * as express from "express";
-
-    /**
-     * bodyParser: use individual json/urlencoded middlewares
-     * @deprecated
-     */
-
-    function bodyParser(options?: {
-        /**
-         * if deflated bodies will be inflated. (default: true)
-         */
-        inflate?: boolean;
-        /**
-         * maximum request body size. (default: '100kb')
-         */
-        limit?: any;
-        /**
-         * function to verify body content, the parsing can be aborted by throwing an error.
-         */
-        verify?: (req: express.Request, res: express.Response, buf: Buffer, encoding: string) => void;
-        /**
-         * only parse objects and arrays. (default: true)
-         */
-        strict?: boolean;
-        /**
-         * passed to JSON.parse().
-         */
-        receiver?: (key: string, value: any) => any;
-        /**
-         * parse extended syntax with the qs module. (default: true)
-         */
-        extended?: boolean;
-    }): express.RequestHandler;
-
-    namespace bodyParser {
-        export function json(options?: {
-            /**
-             * if deflated bodies will be inflated. (default: true)
-             */
-            inflate?: boolean;
-            /**
-             * maximum request body size. (default: '100kb')
-             */
-            limit?: any;
-            /**
-             * request content-type to parse, passed directly to the type-is library. (default: 'json')
-             */
-            type?: any;
-            /**
-             * function to verify body content, the parsing can be aborted by throwing an error.
-             */
-            verify?: (req: express.Request, res: express.Response, buf: Buffer, encoding: string) => void;
-            /**
-             * only parse objects and arrays. (default: true)
-             */
-            strict?: boolean;
-            /**
-             * passed to JSON.parse().
-             */
-            receiver?: (key: string, value: any) => any;
-        }): express.RequestHandler;
-
-        export function raw(options?: {
-            /**
-             * if deflated bodies will be inflated. (default: true)
-             */
-            inflate?: boolean;
-            /**
-             * maximum request body size. (default: '100kb')
-             */
-            limit?: any;
-            /**
-             * request content-type to parse, passed directly to the type-is library. (default: 'application/octet-stream')
-             */
-            type?: any;
-            /**
-             * function to verify body content, the parsing can be aborted by throwing an error.
-             */
-            verify?: (req: express.Request, res: express.Response, buf: Buffer, encoding: string) => void;
-        }): express.RequestHandler;
-
-        export function text(options?: {
-            /**
-             * if deflated bodies will be inflated. (default: true)
-             */
-            inflate?: boolean;
-            /**
-             * maximum request body size. (default: '100kb')
-             */
-            limit?: any;
-            /**
-             * request content-type to parse, passed directly to the type-is library. (default: 'text/plain')
-             */
-            type?: any;
-            /**
-             * function to verify body content, the parsing can be aborted by throwing an error.
-             */
-            verify?: (req: express.Request, res: express.Response, buf: Buffer, encoding: string) => void;
-            /**
-             * the default charset to parse as, if not specified in content-type. (default: 'utf-8')
-             */
-            defaultCharset?: string;
-        }): express.RequestHandler;
-
-        export function urlencoded(options: {
-            /**
-             * if deflated bodies will be inflated. (default: true)
-             */
-            inflate?: boolean;
-            /**
-             * maximum request body size. (default: '100kb')
-             */
-            limit?: any;
-            /**
-             * request content-type to parse, passed directly to the type-is library. (default: 'urlencoded')
-             */
-            type?: any;
-            /**
-             * function to verify body content, the parsing can be aborted by throwing an error.
-             */
-            verify?: (req: express.Request, res: express.Response, buf: Buffer, encoding: string) => void;
-            /**
-             * parse extended syntax with the qs module.
-             */
-            extended: boolean;
-        }): express.RequestHandler;
-    }
-
-    export = bodyParser;
-}
diff --git a/body-parser/index.d.ts b/body-parser/index.d.ts
new file mode 100644
index 0000000000..13976bbb69
--- /dev/null
+++ b/body-parser/index.d.ts
@@ -0,0 +1,137 @@
+// Type definitions for body-parser
+// Project: http://expressjs.com
+// Definitions by: Santi Albo <https://github.com/santialbo/>, VILIC VANE <https://vilic.info>, Jonathan Häberle <https://github.com/dreampulse/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+
+import * as express from "express";
+
+/**
+ * bodyParser: use individual json/urlencoded middlewares
+ * @deprecated
+ */
+
+declare function bodyParser(options?: {
+    /**
+     * if deflated bodies will be inflated. (default: true)
+     */
+    inflate?: boolean;
+    /**
+     * maximum request body size. (default: '100kb')
+     */
+    limit?: any;
+    /**
+     * function to verify body content, the parsing can be aborted by throwing an error.
+     */
+    verify?: (req: express.Request, res: express.Response, buf: Buffer, encoding: string) => void;
+    /**
+     * only parse objects and arrays. (default: true)
+     */
+    strict?: boolean;
+    /**
+     * passed to JSON.parse().
+     */
+    receiver?: (key: string, value: any) => any;
+    /**
+     * parse extended syntax with the qs module. (default: true)
+     */
+    extended?: boolean;
+}): express.RequestHandler;
+
+declare namespace bodyParser {
+    export function json(options?: {
+        /**
+         * if deflated bodies will be inflated. (default: true)
+         */
+        inflate?: boolean;
+        /**
+         * maximum request body size. (default: '100kb')
+         */
+        limit?: any;
+        /**
+         * request content-type to parse, passed directly to the type-is library. (default: 'json')
+         */
+        type?: any;
+        /**
+         * function to verify body content, the parsing can be aborted by throwing an error.
+         */
+        verify?: (req: express.Request, res: express.Response, buf: Buffer, encoding: string) => void;
+        /**
+         * only parse objects and arrays. (default: true)
+         */
+        strict?: boolean;
+        /**
+         * passed to JSON.parse().
+         */
+        receiver?: (key: string, value: any) => any;
+    }): express.RequestHandler;
+
+    export function raw(options?: {
+        /**
+         * if deflated bodies will be inflated. (default: true)
+         */
+        inflate?: boolean;
+        /**
+         * maximum request body size. (default: '100kb')
+         */
+        limit?: any;
+        /**
+         * request content-type to parse, passed directly to the type-is library. (default: 'application/octet-stream')
+         */
+        type?: any;
+        /**
+         * function to verify body content, the parsing can be aborted by throwing an error.
+         */
+        verify?: (req: express.Request, res: express.Response, buf: Buffer, encoding: string) => void;
+    }): express.RequestHandler;
+
+    export function text(options?: {
+        /**
+         * if deflated bodies will be inflated. (default: true)
+         */
+        inflate?: boolean;
+        /**
+         * maximum request body size. (default: '100kb')
+         */
+        limit?: any;
+        /**
+         * request content-type to parse, passed directly to the type-is library. (default: 'text/plain')
+         */
+        type?: any;
+        /**
+         * function to verify body content, the parsing can be aborted by throwing an error.
+         */
+        verify?: (req: express.Request, res: express.Response, buf: Buffer, encoding: string) => void;
+        /**
+         * the default charset to parse as, if not specified in content-type. (default: 'utf-8')
+         */
+        defaultCharset?: string;
+    }): express.RequestHandler;
+
+    export function urlencoded(options: {
+        /**
+         * if deflated bodies will be inflated. (default: true)
+         */
+        inflate?: boolean;
+        /**
+         * maximum request body size. (default: '100kb')
+         */
+        limit?: any;
+        /**
+         * request content-type to parse, passed directly to the type-is library. (default: 'urlencoded')
+         */
+        type?: any;
+        /**
+         * function to verify body content, the parsing can be aborted by throwing an error.
+         */
+        verify?: (req: express.Request, res: express.Response, buf: Buffer, encoding: string) => void;
+        /**
+         * parse extended syntax with the qs module.
+         */
+        extended: boolean;
+    }): express.RequestHandler;
+}
+
+export = bodyParser;
diff --git a/body-parser/tsconfig.json b/body-parser/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/body-parser/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bookshelf/bookshelf-tests.ts b/bookshelf/bookshelf-tests.ts
index 42faf0909e..59c20bb686 100644
--- a/bookshelf/bookshelf-tests.ts
+++ b/bookshelf/bookshelf-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="bookshelf.d.ts" />
-/// <reference path="../knex/knex.d.ts" />
+
 
 import * as Knex from 'knex';
 import * as Bookshelf from 'bookshelf';
@@ -15,6 +14,9 @@ var knex = Knex({
 
 var bookshelf = Bookshelf(knex);
 
+bookshelf.plugin('registry');
+bookshelf.plugin(['virtuals']);
+
 class User extends bookshelf.Model<User> {
 	get tableName() { return 'users'; }
 	messages() : Bookshelf.Collection<Posts> {
diff --git a/bookshelf/bookshelf.d.ts b/bookshelf/bookshelf.d.ts
deleted file mode 100644
index 74f5e83d4a..0000000000
--- a/bookshelf/bookshelf.d.ts
+++ /dev/null
@@ -1,314 +0,0 @@
-// Type definitions for bookshelfjs v0.8.2
-// Project: http://bookshelfjs.org/
-// Definitions by: Andrew Schurman <http://github.com/arcticwaters>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../bluebird/bluebird.d.ts" />
-/// <reference path='../lodash/lodash-3.10.d.ts' />
-/// <reference path="../knex/knex.d.ts" />
-
-declare module 'bookshelf' {
-	import knex = require('knex');
-	import Promise = require('bluebird');
-	import Lodash = require('lodash');
-
-	interface Bookshelf extends Bookshelf.Events<any> {
-		VERSION : string;
-		knex : knex;
-		Model : typeof Bookshelf.Model;
-		Collection : typeof Bookshelf.Collection;
-
-		plugin(name: string) : Bookshelf;
-		transaction<T>(callback : (transaction : knex.Transaction) => T) : Promise<T>;
-	}
-
-	function Bookshelf(knex : knex) : Bookshelf;
-
-	namespace Bookshelf {
-		abstract class Events<T> {
-			on(event? : string, callback? : EventFunction<T>, context? : any) : void;
-			off(event? : string) : void;
-			trigger(event? : string, ...args : any[]) : void;
-			triggerThen(name : string, ...args : any[]) : Promise<any>;
-			once(event : string, callback : EventFunction<T>, context? : any) : void;
-		}
-
-		interface IModelBase {
-			/** Should be declared as a getter instead of a plain property. */
-			hasTimestamps? : boolean|string[];
-			/** Should be declared as a getter instead of a plain property. Should be required, but cannot have abstract properties yet. */
-			tableName? : string;
-		}
-
-		abstract class ModelBase<T extends Model<any>> extends Events<T|Collection<T>> implements IModelBase {
-			/** If overriding, must use a getter instead of a plain property. */
-			idAttribute : string;
-
-			constructor(attributes? : any, options? : ModelOptions);
-
-			clear() : T;
-			clone() : T;
-			escape(attribute : string) : string;
-			format(attributes : any) : any;
-			get(attribute : string) : any;
-			has(attribute : string) : boolean;
-			hasChanged(attribute? : string) : boolean;
-			isNew() : boolean;
-			parse(response : any) : any;
-			previousAttributes() : any;
-			previous(attribute : string) : any;
-			related<R extends Model<any>>(relation : string) : R | Collection<R>;
-			serialize(options? : SerializeOptions) : any;
-			set(attribute?: {[key : string] : any}, options? : SetOptions) : T;
-			set(attribute : string, value? : any, options? : SetOptions) : T;
-			timestamp(options? : TimestampOptions) : any;
-			toJSON(options? : SerializeOptions) : any;
-			unset(attribute : string) : T;
-
-			// lodash methods
-			invert<R extends {}>() : R;
-			keys() : string[];
-			omit<R extends {}>(predicate? : Lodash.ObjectIterator<any, boolean>, thisArg? : any) : R;
-			omit<R extends {}>(...attributes : string[]) : R;
-			pairs() : any[][];
-			pick<R extends {}>(predicate? : Lodash.ObjectIterator<any, boolean>, thisArg? : any) : R;
-			pick<R extends {}>(...attributes : string[]) : R;
-			values() : any[];
-		}
-
-		class Model<T extends Model<any>> extends ModelBase<T> {
-			static collection<T extends Model<any>>(models? : T[], options? : CollectionOptions<T>) : Collection<T>;
-			static count(column? : string, options? : SyncOptions) : Promise<number>;
-			/** @deprecated use Typescript classes */
-			static extend<T extends Model<any>>(prototypeProperties? : any, classProperties? : any) : Function; // should return a type
-			static fetchAll<T extends Model<any>>() : Promise<Collection<T>>;
-			/** @deprecated should use `new` objects instead. */
-			static forge<T>(attributes? : any, options? : ModelOptions) : T;
-
-			belongsTo<R extends Model<any>>(target : {new(...args : any[]) : R}, foreignKey? : string) : R;
-			belongsToMany<R extends Model<any>>(target : {new(...args : any[]) : R}, table? : string, foreignKey? : string, otherKey? : string) : Collection<R>;
-			count(column? : string, options? : SyncOptions) : Promise<number>;
-			destroy(options? : SyncOptions) : Promise<T>;
-			fetch(options? : FetchOptions) : Promise<T>;
-			fetchAll(options? : FetchAllOptions) : Promise<Collection<T>>;
-			hasMany<R extends Model<any>>(target : {new(...args : any[]) : R}, foreignKey? : string) : Collection<R>;
-			hasOne<R extends Model<any>>(target : {new(...args : any[]) : R}, foreignKey? : string) : R;
-			load(relations : string|string[], options? : LoadOptions) : Promise<T>;
-			morphMany<R extends Model<any>>(target : {new(...args : any[]) : R}, name? : string, columnNames? : string[], morphValue? : string) : Collection<R>;
-			morphOne<R extends Model<any>>(target : {new(...args : any[]) : R}, name? : string, columnNames? : string[], morphValue? : string) : R;
-			morphTo(name : string, columnNames? : string[], ...target : typeof Model[]) : T;
-			morphTo(name : string, ...target : typeof Model[]) : T;
-			query(...query : string[]) : T;
-			query(query : {[key : string] : any}) : T;
-			query(callback : (qb : knex.QueryBuilder) => void) : T;
-			query() : knex.QueryBuilder;
-			refresh(options? : FetchOptions) : Promise<T>;
-			resetQuery() : T;
-			save(key? : string, val? : string, options? : SaveOptions) : Promise<T>;
-			save(attrs? : {[key : string] : any}, options? : SaveOptions) : Promise<T>;
-			through<R extends Model<any>>(interim : typeof Model, throughForeignKey? : string, otherKey? : string) : R | Collection<R>;
-			where(properties : {[key : string] : any}) : T;
-			where(key : string, operatorOrValue : string|number|boolean, valueIfOperator? : string|number|boolean) : T;
-		}
-
-		abstract class CollectionBase<T extends Model<any>> extends Events<T> {
-			add(models : T[]|{[key : string] : any}[], options? : CollectionAddOptions) : Collection<T>;
-			at(index : number) : T;
-			clone() : Collection<T>;
-			fetch(options? : CollectionFetchOptions) : Promise<Collection<T>>;
-			findWhere(match : {[key : string] : any}) : T;
-			get(id : any) : T;
-			invokeThen(name : string, ...args : any[]) : Promise<any>;
-			parse(response : any) : any;
-			pluck(attribute : string) : any[];
-			pop() : void;
-			push(model : any) : Collection<T>;
-			reduceThen<R>(iterator : (prev : R, cur : T, idx : number, array : T[]) => R, initialValue : R, context : any) : Promise<R>;
-			remove(model : T, options? : EventOptions) : T;
-			remove(model : T[], options? : EventOptions) : T[];
-			reset(model : any[], options? : CollectionAddOptions) : T[];
-			serialize(options? : SerializeOptions) : any;
-			set(models : T[]|{[key : string] : any}[], options? : CollectionSetOptions) : Collection<T>;
-			shift(options? : EventOptions) : void;
-			slice(begin? : number, end? : number) : void;
-			toJSON(options? : SerializeOptions) : any;
-			unshift(model : any, options? : CollectionAddOptions) : void;
-			where(match : {[key : string] : any}, firstOnly : boolean) : T|Collection<T>;
-
-			// lodash methods
-			all(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : boolean;
-			all<R extends {}>(predicate? : R) : boolean;
-			any(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : boolean;
-			any<R extends {}>(predicate? : R) : boolean;
-			chain() : Lodash.LoDashExplicitObjectWrapper<T>;
-			collect(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
-			collect<R extends {}>(predicate? : R) : T[];
-			contains(value : any, fromIndex? : number) : boolean;
-			countBy(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : Lodash.Dictionary<number>;
-			countBy<R extends {}>(predicate? : R) : Lodash.Dictionary<number>;
-			detect(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T;
-			detect<R extends {}>(predicate? : R) : T;
-			difference(...values : T[]) : T[];
-			drop(n? : number) : T[];
-			each(callback? : Lodash.ListIterator<T, void>, thisArg? : any) : Lodash.List<T>;
-			each(callback? : Lodash.DictionaryIterator<T, void>, thisArg? : any) : Lodash.Dictionary<T>;
-			each(callback? : Lodash.ObjectIterator<T, void>, thisArg? : any) : T;
-			every(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : boolean;
-			every<R extends {}>(predicate? : R) : boolean;
-			filter(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
-			filter<R extends {}>(predicate? : R) : T[];
-			find(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T;
-			find<R extends {}>(predicate? : R) : T;
-			first() : T;
-			foldl<R>(callback? : Lodash.MemoIterator<T, R>, accumulator? : R, thisArg? : any) : R;
-			foldr<R>(callback? : Lodash.MemoIterator<T, R>, accumulator? : R, thisArg? : any) : R;
-			forEach(callback? : Lodash.ListIterator<T, void>, thisArg? : any) : Lodash.List<T>;
-			forEach(callback? : Lodash.DictionaryIterator<T, void>, thisArg? : any) : Lodash.Dictionary<T>;
-			forEach(callback? : Lodash.ObjectIterator<T, void>, thisArg? : any) : T;
-			groupBy(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : Lodash.Dictionary<T[]>;
-			groupBy<R extends {}>(predicate? : R) : Lodash.Dictionary<T[]>;
-			head() : T;
-			include(value : any, fromIndex? : number) : boolean;
-			indexOf(value : any, fromIndex? : number) : number;
-			initial() : T[];
-			inject<R>(callback? : Lodash.MemoIterator<T, R>, accumulator? : R, thisArg? : any) : R;
-			invoke(methodName : string|Function, ...args : any[]) : any;
-			isEmpty() : boolean;
-			keys() : string[];
-			last() : T;
-			lastIndexOf(value : any, fromIndex? : number) : number;
-			map(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
-			map<R extends {}>(predicate? : R) : T[];
-			max(predicate? : Lodash.ListIterator<T, boolean>|string, thisArg? : any) : T;
-			max<R extends {}>(predicate? : R) : T;
-			min(predicate? : Lodash.ListIterator<T, boolean>|string, thisArg? : any) : T;
-			min<R extends {}>(predicate? : R) : T;
-			reduce<R>(callback? : Lodash.MemoIterator<T, R>, accumulator? : R, thisArg? : any) : R;
-			reduceRight<R>(callback? : Lodash.MemoIterator<T, R>, accumulator? : R, thisArg? : any) : R;
-			reject(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
-			reject<R extends {}>(predicate? : R) : T[];
-			rest() : T[];
-			select(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
-			select<R extends {}>(predicate? : R) : T[];
-			shuffle() : T[];
-			size() : number;
-			some(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : boolean;
-			some<R extends {}>(predicate? : R) : boolean;
-			sortBy(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
-			sortBy<R extends {}>(predicate? : R) : T[];
-			tail() : T[];
-			take(n? : number) : T[];
-			toArray() : T[];
-			without(...values : any[]) : T[];
-		}
-
-		class Collection<T extends Model<any>> extends CollectionBase<T> {
-			/** @deprecated use Typescript classes */
-			static extend<T>(prototypeProperties? : any, classProperties? : any) : Function;
-			/** @deprecated should use `new` objects instead. */
-			static forge<T>(attributes? : any, options? : ModelOptions) : T;
-
-			attach(ids : any[], options? : SyncOptions) : Promise<Collection<T>>;
-			count(column? : string, options? : SyncOptions) : Promise<number>;
-			create(model : {[key : string] : any}, options? : CollectionCreateOptions) : Promise<T>;
-			detach(ids : any[], options? : SyncOptions) : Promise<any>;
-			fetchOne(options? : CollectionFetchOneOptions) : Promise<T>;
-			load(relations : string|string[], options? : SyncOptions) : Promise<Collection<T>>;
-			query(...query : string[]) : Collection<T>;
-			query(query : {[key : string] : any}) : Collection<T>;
-			query(callback : (qb : knex.QueryBuilder) => void) : Collection<T>;
-			query() : knex.QueryBuilder;
-			resetQuery() : Collection<T>;
-			through<R extends Model<any>>(interim : typeof Model, throughForeignKey? : string, otherKey? : string) : R | Collection<R>;
-			updatePivot(attributes : any, options? : PivotOptions) : Promise<number>;
-			withPivot(columns : string[]) : Collection<T>;
-		}
-
-		interface ModelOptions {
-			tableName? : string;
-			hasTimestamps? : boolean;
-			parse? : boolean;
-		}
-
-		interface LoadOptions extends SyncOptions {
-			withRelated: string|any|any[];
-		}
-
-		interface FetchOptions extends SyncOptions {
-			require? : boolean;
-			columns? : string|string[];
-			withRelated? : string|any|any[];
-		}
-
-		interface FetchAllOptions extends SyncOptions {
-			require? : boolean;
-		}
-
-		interface SaveOptions extends SyncOptions {
-			method? : string;
-			defaults? : string;
-			patch? : boolean;
-			require? : boolean;
-		}
-
-		interface SerializeOptions {
-			shallow? : boolean;
-			omitPivot? : boolean;
-		}
-
-		interface SetOptions {
-			unset? : boolean;
-		}
-
-		interface TimestampOptions {
-			method? : string;
-		}
-
-		interface SyncOptions {
-			transacting? : knex.Transaction;
-			debug? : boolean;
-		}
-
-		interface CollectionOptions<T> {
-			comparator? : boolean|string|((a : T, b : T) => number);
-		}
-
-		interface CollectionAddOptions extends EventOptions {
-			at? : number;
-			merge? : boolean;
-		}
-
-		interface CollectionFetchOptions {
-			require? : boolean;
-			withRelated? : string|string[];
-		}
-
-		interface CollectionFetchOneOptions {
-			require? : boolean;
-			columns? : string|string[];
-		}
-
-		interface CollectionSetOptions extends EventOptions {
-			add? : boolean;
-			remove? : boolean;
-			merge?: boolean;
-		}
-
-		interface PivotOptions {
-			query? : Function|any;
-			require? : boolean;
-		}
-
-		interface EventOptions {
-			silent? : boolean;
-		}
-
-		interface EventFunction<T> {
-			(model: T, attrs: any, options: any) : Promise<any>|void;
-		}
-
-		interface CollectionCreateOptions extends ModelOptions, SyncOptions, CollectionAddOptions, SaveOptions {}
-	}
-
-	export = Bookshelf;
-}
diff --git a/bookshelf/index.d.ts b/bookshelf/index.d.ts
new file mode 100644
index 0000000000..34a94dd3e8
--- /dev/null
+++ b/bookshelf/index.d.ts
@@ -0,0 +1,312 @@
+// Type definitions for bookshelfjs v0.8.2
+// Project: http://bookshelfjs.org/
+// Definitions by: Andrew Schurman <http://github.com/arcticwaters>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="bluebird" />
+/// <reference types="lodash" />
+
+import knex = require('knex');
+import Promise = require('bluebird');
+import Lodash = require('lodash');
+
+interface Bookshelf extends Bookshelf.Events<any> {
+	VERSION : string;
+	knex : knex;
+	Model : typeof Bookshelf.Model;
+	Collection : typeof Bookshelf.Collection;
+
+	plugin(name: string | string[] | Function, options?: any) : Bookshelf;
+	transaction<T>(callback : (transaction : knex.Transaction) => T) : Promise<T>;
+}
+
+declare function Bookshelf(knex : knex) : Bookshelf;
+
+declare namespace Bookshelf {
+	abstract class Events<T> {
+		on(event? : string, callback? : EventFunction<T>, context? : any) : void;
+		off(event? : string) : void;
+		trigger(event? : string, ...args : any[]) : void;
+		triggerThen(name : string, ...args : any[]) : Promise<any>;
+		once(event : string, callback : EventFunction<T>, context? : any) : void;
+	}
+
+	interface IModelBase {
+		/** Should be declared as a getter instead of a plain property. */
+		hasTimestamps? : boolean|string[];
+		/** Should be declared as a getter instead of a plain property. Should be required, but cannot have abstract properties yet. */
+		tableName? : string;
+	}
+
+	abstract class ModelBase<T extends Model<any>> extends Events<T|Collection<T>> implements IModelBase {
+		/** If overriding, must use a getter instead of a plain property. */
+		idAttribute : string;
+
+		constructor(attributes? : any, options? : ModelOptions);
+
+		clear() : T;
+		clone() : T;
+		escape(attribute : string) : string;
+		format(attributes : any) : any;
+		get(attribute : string) : any;
+		has(attribute : string) : boolean;
+		hasChanged(attribute? : string) : boolean;
+		isNew() : boolean;
+		parse(response : any) : any;
+		previousAttributes() : any;
+		previous(attribute : string) : any;
+		related<R extends Model<any>>(relation : string) : R | Collection<R>;
+		serialize(options? : SerializeOptions) : any;
+		set(attribute?: {[key : string] : any}, options? : SetOptions) : T;
+		set(attribute : string, value? : any, options? : SetOptions) : T;
+		timestamp(options? : TimestampOptions) : any;
+		toJSON(options? : SerializeOptions) : any;
+		unset(attribute : string) : T;
+
+		// lodash methods
+		invert<R extends {}>() : R;
+		keys() : string[];
+		omit<R extends {}>(predicate? : Lodash.ObjectIterator<any, boolean>, thisArg? : any) : R;
+		omit<R extends {}>(...attributes : string[]) : R;
+		pairs() : any[][];
+		pick<R extends {}>(predicate? : Lodash.ObjectIterator<any, boolean>, thisArg? : any) : R;
+		pick<R extends {}>(...attributes : string[]) : R;
+		values() : any[];
+	}
+
+	class Model<T extends Model<any>> extends ModelBase<T> {
+		static collection<T extends Model<any>>(models? : T[], options? : CollectionOptions<T>) : Collection<T>;
+		static count(column? : string, options? : SyncOptions) : Promise<number>;
+		/** @deprecated use Typescript classes */
+		static extend<T extends Model<any>>(prototypeProperties? : any, classProperties? : any) : Function; // should return a type
+		static fetchAll<T extends Model<any>>() : Promise<Collection<T>>;
+		/** @deprecated should use `new` objects instead. */
+		static forge<T>(attributes? : any, options? : ModelOptions) : T;
+
+		belongsTo<R extends Model<any>>(target : {new(...args : any[]) : R}, foreignKey? : string) : R;
+		belongsToMany<R extends Model<any>>(target : {new(...args : any[]) : R}, table? : string, foreignKey? : string, otherKey? : string) : Collection<R>;
+		count(column? : string, options? : SyncOptions) : Promise<number>;
+		destroy(options? : SyncOptions) : Promise<T>;
+		fetch(options? : FetchOptions) : Promise<T>;
+		fetchAll(options? : FetchAllOptions) : Promise<Collection<T>>;
+		hasMany<R extends Model<any>>(target : {new(...args : any[]) : R}, foreignKey? : string) : Collection<R>;
+		hasOne<R extends Model<any>>(target : {new(...args : any[]) : R}, foreignKey? : string) : R;
+		load(relations : string|string[], options? : LoadOptions) : Promise<T>;
+		morphMany<R extends Model<any>>(target : {new(...args : any[]) : R}, name? : string, columnNames? : string[], morphValue? : string) : Collection<R>;
+		morphOne<R extends Model<any>>(target : {new(...args : any[]) : R}, name? : string, columnNames? : string[], morphValue? : string) : R;
+		morphTo(name : string, columnNames? : string[], ...target : typeof Model[]) : T;
+		morphTo(name : string, ...target : typeof Model[]) : T;
+		query(...query : string[]) : T;
+		query(query : {[key : string] : any}) : T;
+		query(callback : (qb : knex.QueryBuilder) => void) : T;
+		query() : knex.QueryBuilder;
+		refresh(options? : FetchOptions) : Promise<T>;
+		resetQuery() : T;
+		save(key? : string, val? : string, options? : SaveOptions) : Promise<T>;
+		save(attrs? : {[key : string] : any}, options? : SaveOptions) : Promise<T>;
+		through<R extends Model<any>>(interim : typeof Model, throughForeignKey? : string, otherKey? : string) : R | Collection<R>;
+		where(properties : {[key : string] : any}) : T;
+		where(key : string, operatorOrValue : string|number|boolean, valueIfOperator? : string|number|boolean) : T;
+	}
+
+	abstract class CollectionBase<T extends Model<any>> extends Events<T> {
+		add(models : T[]|{[key : string] : any}[], options? : CollectionAddOptions) : Collection<T>;
+		at(index : number) : T;
+		clone() : Collection<T>;
+		fetch(options? : CollectionFetchOptions) : Promise<Collection<T>>;
+		findWhere(match : {[key : string] : any}) : T;
+		get(id : any) : T;
+		invokeThen(name : string, ...args : any[]) : Promise<any>;
+		parse(response : any) : any;
+		pluck(attribute : string) : any[];
+		pop() : void;
+		push(model : any) : Collection<T>;
+		reduceThen<R>(iterator : (prev : R, cur : T, idx : number, array : T[]) => R, initialValue : R, context : any) : Promise<R>;
+		remove(model : T, options? : EventOptions) : T;
+		remove(model : T[], options? : EventOptions) : T[];
+		reset(model : any[], options? : CollectionAddOptions) : T[];
+		serialize(options? : SerializeOptions) : any;
+		set(models : T[]|{[key : string] : any}[], options? : CollectionSetOptions) : Collection<T>;
+		shift(options? : EventOptions) : void;
+		slice(begin? : number, end? : number) : void;
+		toJSON(options? : SerializeOptions) : any;
+		unshift(model : any, options? : CollectionAddOptions) : void;
+		where(match : {[key : string] : any}, firstOnly : boolean) : T|Collection<T>;
+
+		// lodash methods
+		all(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : boolean;
+		all<R extends {}>(predicate? : R) : boolean;
+		any(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : boolean;
+		any<R extends {}>(predicate? : R) : boolean;
+		chain() : Lodash.LoDashExplicitObjectWrapper<T>;
+		collect(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
+		collect<R extends {}>(predicate? : R) : T[];
+		contains(value : any, fromIndex? : number) : boolean;
+		countBy(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : Lodash.Dictionary<number>;
+		countBy<R extends {}>(predicate? : R) : Lodash.Dictionary<number>;
+		detect(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T;
+		detect<R extends {}>(predicate? : R) : T;
+		difference(...values : T[]) : T[];
+		drop(n? : number) : T[];
+		each(callback? : Lodash.ListIterator<T, void>, thisArg? : any) : Lodash.List<T>;
+		each(callback? : Lodash.DictionaryIterator<T, void>, thisArg? : any) : Lodash.Dictionary<T>;
+		each(callback? : Lodash.ObjectIterator<T, void>, thisArg? : any) : T;
+		every(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : boolean;
+		every<R extends {}>(predicate? : R) : boolean;
+		filter(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
+		filter<R extends {}>(predicate? : R) : T[];
+		find(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T;
+		find<R extends {}>(predicate? : R) : T;
+		first() : T;
+		foldl<R>(callback? : Lodash.MemoIterator<T, R>, accumulator? : R, thisArg? : any) : R;
+		foldr<R>(callback? : Lodash.MemoIterator<T, R>, accumulator? : R, thisArg? : any) : R;
+		forEach(callback? : Lodash.ListIterator<T, void>, thisArg? : any) : Lodash.List<T>;
+		forEach(callback? : Lodash.DictionaryIterator<T, void>, thisArg? : any) : Lodash.Dictionary<T>;
+		forEach(callback? : Lodash.ObjectIterator<T, void>, thisArg? : any) : T;
+		groupBy(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : Lodash.Dictionary<T[]>;
+		groupBy<R extends {}>(predicate? : R) : Lodash.Dictionary<T[]>;
+		head() : T;
+		include(value : any, fromIndex? : number) : boolean;
+		indexOf(value : any, fromIndex? : number) : number;
+		initial() : T[];
+		inject<R>(callback? : Lodash.MemoIterator<T, R>, accumulator? : R, thisArg? : any) : R;
+		invoke(methodName : string|Function, ...args : any[]) : any;
+		isEmpty() : boolean;
+		keys() : string[];
+		last() : T;
+		lastIndexOf(value : any, fromIndex? : number) : number;
+		map(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
+		map<R extends {}>(predicate? : R) : T[];
+		max(predicate? : Lodash.ListIterator<T, boolean>|string, thisArg? : any) : T;
+		max<R extends {}>(predicate? : R) : T;
+		min(predicate? : Lodash.ListIterator<T, boolean>|string, thisArg? : any) : T;
+		min<R extends {}>(predicate? : R) : T;
+		reduce<R>(callback? : Lodash.MemoIterator<T, R>, accumulator? : R, thisArg? : any) : R;
+		reduceRight<R>(callback? : Lodash.MemoIterator<T, R>, accumulator? : R, thisArg? : any) : R;
+		reject(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
+		reject<R extends {}>(predicate? : R) : T[];
+		rest() : T[];
+		select(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
+		select<R extends {}>(predicate? : R) : T[];
+		shuffle() : T[];
+		size() : number;
+		some(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : boolean;
+		some<R extends {}>(predicate? : R) : boolean;
+		sortBy(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
+		sortBy<R extends {}>(predicate? : R) : T[];
+		tail() : T[];
+		take(n? : number) : T[];
+		toArray() : T[];
+		without(...values : any[]) : T[];
+	}
+
+	class Collection<T extends Model<any>> extends CollectionBase<T> {
+		/** @deprecated use Typescript classes */
+		static extend<T>(prototypeProperties? : any, classProperties? : any) : Function;
+		/** @deprecated should use `new` objects instead. */
+		static forge<T>(attributes? : any, options? : ModelOptions) : T;
+
+		attach(ids : any[], options? : SyncOptions) : Promise<Collection<T>>;
+		count(column? : string, options? : SyncOptions) : Promise<number>;
+		create(model : {[key : string] : any}, options? : CollectionCreateOptions) : Promise<T>;
+		detach(ids : any[], options? : SyncOptions) : Promise<any>;
+		fetchOne(options? : CollectionFetchOneOptions) : Promise<T>;
+		load(relations : string|string[], options? : SyncOptions) : Promise<Collection<T>>;
+		query(...query : string[]) : Collection<T>;
+		query(query : {[key : string] : any}) : Collection<T>;
+		query(callback : (qb : knex.QueryBuilder) => void) : Collection<T>;
+		query() : knex.QueryBuilder;
+		resetQuery() : Collection<T>;
+		through<R extends Model<any>>(interim : typeof Model, throughForeignKey? : string, otherKey? : string) : R | Collection<R>;
+		updatePivot(attributes : any, options? : PivotOptions) : Promise<number>;
+		withPivot(columns : string[]) : Collection<T>;
+	}
+
+	interface ModelOptions {
+		tableName? : string;
+		hasTimestamps? : boolean;
+		parse? : boolean;
+	}
+
+	interface LoadOptions extends SyncOptions {
+		withRelated: string|any|any[];
+	}
+
+	interface FetchOptions extends SyncOptions {
+		require? : boolean;
+		columns? : string|string[];
+		withRelated? : string|any|any[];
+	}
+
+	interface FetchAllOptions extends SyncOptions {
+		require? : boolean;
+	}
+
+	interface SaveOptions extends SyncOptions {
+		method? : string;
+		defaults? : string;
+		patch? : boolean;
+		require? : boolean;
+	}
+
+	interface SerializeOptions {
+		shallow? : boolean;
+		omitPivot? : boolean;
+	}
+
+	interface SetOptions {
+		unset? : boolean;
+	}
+
+	interface TimestampOptions {
+		method? : string;
+	}
+
+	interface SyncOptions {
+		transacting? : knex.Transaction;
+		debug? : boolean;
+	}
+
+	interface CollectionOptions<T> {
+		comparator? : boolean|string|((a : T, b : T) => number);
+	}
+
+	interface CollectionAddOptions extends EventOptions {
+		at? : number;
+		merge? : boolean;
+	}
+
+	interface CollectionFetchOptions {
+		require? : boolean;
+		withRelated? : string|string[];
+	}
+
+	interface CollectionFetchOneOptions {
+		require? : boolean;
+		columns? : string|string[];
+	}
+
+	interface CollectionSetOptions extends EventOptions {
+		add? : boolean;
+		remove? : boolean;
+		merge?: boolean;
+	}
+
+	interface PivotOptions {
+		query? : Function|any;
+		require? : boolean;
+	}
+
+	interface EventOptions {
+		silent? : boolean;
+	}
+
+	interface EventFunction<T> {
+		(model: T, attrs: any, options: any) : Promise<any>|void;
+	}
+
+	interface CollectionCreateOptions extends ModelOptions, SyncOptions, CollectionAddOptions, SaveOptions {}
+}
+
+export = Bookshelf;
+
diff --git a/bookshelf/tsconfig.json b/bookshelf/tsconfig.json
new file mode 100644
index 0000000000..c789d28f14
--- /dev/null
+++ b/bookshelf/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bookshelf-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/boolify-string/boolify-string-tests.ts b/boolify-string/boolify-string-tests.ts
index 1436a1aeae..80a68375a9 100644
--- a/boolify-string/boolify-string-tests.ts
+++ b/boolify-string/boolify-string-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="boolify-string.d.ts" />
 
 import boolifyString = require('boolify-string');
 
diff --git a/boolify-string/boolify-string.d.ts b/boolify-string/boolify-string.d.ts
deleted file mode 100644
index d4ab286a5e..0000000000
--- a/boolify-string/boolify-string.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Type definitions for boolify-string
-// Project: https://github.com/sanemat/node-boolify-string
-// Definitions by: Tobias Henöckl <http://www.sisyphus.de/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-declare module "boolify-string" {
-  function boolifyString(obj: any): boolean;
-  export = boolifyString;
-}
diff --git a/boolify-string/index.d.ts b/boolify-string/index.d.ts
new file mode 100644
index 0000000000..8d405fe032
--- /dev/null
+++ b/boolify-string/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for boolify-string
+// Project: https://github.com/sanemat/node-boolify-string
+// Definitions by: Tobias Henöckl <http://www.sisyphus.de/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function boolifyString(obj: any): boolean;
+export = boolifyString;
diff --git a/boolify-string/tsconfig.json b/boolify-string/tsconfig.json
new file mode 100644
index 0000000000..c25af627ad
--- /dev/null
+++ b/boolify-string/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "boolify-string-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/boom/boom-tests.ts b/boom/boom-tests.ts
index 67c7786273..4c2f23ed64 100644
--- a/boom/boom-tests.ts
+++ b/boom/boom-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="boom.d.ts" />
+
 
 import Boom = require('boom');
 
diff --git a/boom/boom.d.ts b/boom/boom.d.ts
deleted file mode 100644
index 85c2e22b35..0000000000
--- a/boom/boom.d.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-// Type definitions for boom
-// Project: http://github.com/hapijs/boom
-// Definitions by: Igor Rogatty <http://github.com/rogatty>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare namespace Boom {
-
-    export interface BoomError {
-        data: any;
-        reformat: () => void;
-        isBoom: boolean;
-        isServer: boolean;
-        message: string;
-        output: Output;
-    }
-
-    export interface Output {
-        statusCode: number;
-        headers: any;
-        payload: any;
-    }
-
-    export function wrap(error: Error, statusCode?: number, message?: string): BoomError;
-    export function create(statusCode: number, message?: string, data?: any): BoomError;
-
-    // 4xx
-    export function badRequest(message?: string, data?: any): BoomError;
-    export function unauthorized(message?: string, scheme?: any, attributes?: any): BoomError;
-    export function forbidden(message?: string, data?: any): BoomError;
-    export function notFound(message?: string, data?: any): BoomError;
-    export function methodNotAllowed(message?: string, data?: any): BoomError;
-    export function notAcceptable(message?: string, data?: any): BoomError;
-    export function proxyAuthRequired(message?: string, data?: any): BoomError;
-    export function clientTimeout(message?: string, data?: any): BoomError;
-    export function conflict(message?: string, data?: any): BoomError;
-    export function resourceGone(message?: string, data?: any): BoomError;
-    export function lengthRequired(message?: string, data?: any): BoomError;
-    export function preconditionFailed(message?: string, data?: any): BoomError;
-    export function entityTooLarge(message?: string, data?: any): BoomError;
-    export function uriTooLong(message?: string, data?: any): BoomError;
-    export function unsupportedMediaType(message?: string, data?: any): BoomError;
-    export function rangeNotSatisfiable(message?: string, data?: any): BoomError;
-    export function expectationFailed(message?: string, data?: any): BoomError;
-    export function badData(message?: string, data?: any): BoomError;
-    export function tooManyRequests(message?: string, data?: any): BoomError;
-
-    // 5xx
-    export function notImplemented(message?: string, data?: any): BoomError;
-    export function badGateway(message?: string, data?: any): BoomError;
-    export function serverTimeout(message?: string, data?: any): BoomError;
-    export function gatewayTimeout(message?: string, data?: any): BoomError;
-    export function badImplementation(message?: string, data?: any): BoomError;
-}
-
-declare module "boom" {
-    export = Boom;
-}
diff --git a/boom/index.d.ts b/boom/index.d.ts
new file mode 100644
index 0000000000..6945673678
--- /dev/null
+++ b/boom/index.d.ts
@@ -0,0 +1,57 @@
+// Type definitions for boom
+// Project: http://github.com/hapijs/boom
+// Definitions by: Igor Rogatty <http://github.com/rogatty>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export = Boom;
+
+declare namespace Boom {
+
+    export interface BoomError {
+        data: any;
+        reformat: () => void;
+        isBoom: boolean;
+        isServer: boolean;
+        message: string;
+        output: Output;
+    }
+
+    export interface Output {
+        statusCode: number;
+        headers: any;
+        payload: any;
+    }
+
+    export function wrap(error: Error, statusCode?: number, message?: string): BoomError;
+    export function create(statusCode: number, message?: string, data?: any): BoomError;
+
+    // 4xx
+    export function badRequest(message?: string, data?: any): BoomError;
+    export function unauthorized(message?: string, scheme?: any, attributes?: any): BoomError;
+    export function forbidden(message?: string, data?: any): BoomError;
+    export function notFound(message?: string, data?: any): BoomError;
+    export function methodNotAllowed(message?: string, data?: any): BoomError;
+    export function notAcceptable(message?: string, data?: any): BoomError;
+    export function proxyAuthRequired(message?: string, data?: any): BoomError;
+    export function clientTimeout(message?: string, data?: any): BoomError;
+    export function conflict(message?: string, data?: any): BoomError;
+    export function resourceGone(message?: string, data?: any): BoomError;
+    export function lengthRequired(message?: string, data?: any): BoomError;
+    export function preconditionFailed(message?: string, data?: any): BoomError;
+    export function entityTooLarge(message?: string, data?: any): BoomError;
+    export function uriTooLong(message?: string, data?: any): BoomError;
+    export function unsupportedMediaType(message?: string, data?: any): BoomError;
+    export function rangeNotSatisfiable(message?: string, data?: any): BoomError;
+    export function expectationFailed(message?: string, data?: any): BoomError;
+    export function badData(message?: string, data?: any): BoomError;
+    export function tooManyRequests(message?: string, data?: any): BoomError;
+
+    // 5xx
+    export function notImplemented(message?: string, data?: any): BoomError;
+    export function badGateway(message?: string, data?: any): BoomError;
+    export function serverTimeout(message?: string, data?: any): BoomError;
+    export function gatewayTimeout(message?: string, data?: any): BoomError;
+    export function badImplementation(message?: string, data?: any): BoomError;
+}
diff --git a/boom/tsconfig.json b/boom/tsconfig.json
new file mode 100644
index 0000000000..0ca34d3a08
--- /dev/null
+++ b/boom/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "boom-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bootbox/bootbox-tests.ts b/bootbox/bootbox-tests.ts
index 83837d41fa..92a079f456 100644
--- a/bootbox/bootbox-tests.ts
+++ b/bootbox/bootbox-tests.ts
@@ -1,5 +1,5 @@
 // QUnit Tests for Bootbox 4.4.0
-/// <reference path="bootbox.d.ts" />
+
 
 bootbox.alert("Are we ok?");
 bootbox.alert("Are we ok with callback?", function () {
diff --git a/bootbox/bootbox.d.ts b/bootbox/bootbox.d.ts
deleted file mode 100644
index ce422de880..0000000000
--- a/bootbox/bootbox.d.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-// Type definitions for Bootbox 4.4.0
-// Project: https://github.com/makeusabrew/bootbox
-// Definitions by: Vincent Bortone <https://github.com/vbortone/>, Kon Pik <https://github.com/konpikwastaken/>, Anup Kattel <https://github.com/kanup/>, Dominik Schroeter <https://github.com/icereed/>, Troy McKinnon <https://github.com/trodi/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-/** Bootbox options shared by all modal types */
-interface BootboxBaseOptions {
-	title?: string | Element;
-	callback?: (result: boolean | string) => any;
-	onEscape?: () => any | boolean;
-	show?: boolean;
-	backdrop?: boolean;
-	closeButton?: boolean;
-	animate?: boolean;
-	className?: string;
-	size?: string;
-	buttons?: BootboxButtonMap; // complex object where each key is of type BootboxButton
-}
-
-/** Bootbox options available for custom modals */
-interface BootboxDialogOptions extends BootboxBaseOptions {
-	message: string | Element;
-}
-
-/** Bootbox options available for alert modals */
-interface BootboxAlertOptions extends BootboxDialogOptions {
-	callback?: () => any;
-	buttons?: BootboxAlertButtonMap;
-}
-
-/** Bootbox options available for confirm modals */
-interface BootboxConfirmOptions extends BootboxDialogOptions {
-	callback: (result: boolean) => any;
-	buttons?: BootboxConfirmPromptButtonMap;
-}
-
-/** Bootbox options available for prompt modals */
-interface BootboxPromptOptions extends BootboxBaseOptions {
-	title: string;
-	value?: string;
-	callback: (result: string) => any;
-	buttons?: BootboxConfirmPromptButtonMap;
-}
-
-/** Bootbox options available when setting defaults for modals */
-interface BootboxDefaultOptions {
-	locale?: string;
-	show?: boolean;
-	backdrop?: boolean;
-	closeButton?: boolean;
-	animate?: boolean;
-	className?: string;
-}
-
-interface BootboxButton {
-	label?: string;
-	className?: string;
-	callback?: () => any;
-}
-
-interface BootboxButtonMap {
-  [key: string]: BootboxButton | Function;
-}
-
-/** ButtonMap options for alerts modals */
-interface BootboxAlertButtonMap extends BootboxButtonMap {
-	ok: BootboxButton | Function;
-}
-
-/** ButtonMap options for confirm and prompt modals */
-interface BootboxConfirmPromptButtonMap extends BootboxButtonMap {
-	confirm: BootboxButton | Function;
-	cancel: BootboxButton | Function;
-}
-
-interface BootboxLocaleValues {
-	OK: string;
-	CANCEL: string;
-	CONFIRM: string;
-}
-
-interface BootboxStatic {
-	alert(message: string, callback?: () => void): JQuery;
-	alert(options: BootboxAlertOptions): JQuery;
-	confirm(message: string, callback: (result: boolean) => void): JQuery;
-	confirm(options: BootboxConfirmOptions): JQuery;
-	prompt(message: string, callback: (result: string) => void): JQuery;
-	prompt(options: BootboxPromptOptions): JQuery;
-	dialog(message: string, callback?: (result: string) => void): JQuery;
-	dialog(options: BootboxDialogOptions): JQuery;
-	setDefaults(options: BootboxDefaultOptions): void;
-	hideAll(): void;
-
-	addLocale(name: string, values: BootboxLocaleValues): void;
-	removeLocale(name: string): void;
-	setLocale(name: string): void;
-}
-
-declare var bootbox: BootboxStatic;
-
-declare module "bootbox" {
-    export = bootbox;
-}
diff --git a/bootbox/index.d.ts b/bootbox/index.d.ts
new file mode 100644
index 0000000000..28ba5072d1
--- /dev/null
+++ b/bootbox/index.d.ts
@@ -0,0 +1,105 @@
+// Type definitions for Bootbox 4.4.0
+// Project: https://github.com/makeusabrew/bootbox
+// Definitions by: Vincent Bortone <https://github.com/vbortone/>, Kon Pik <https://github.com/konpikwastaken/>, Anup Kattel <https://github.com/kanup/>, Dominik Schroeter <https://github.com/icereed/>, Troy McKinnon <https://github.com/trodi/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+/** Bootbox options shared by all modal types */
+interface BootboxBaseOptions {
+	title?: string | Element;
+	callback?: (result: boolean | string) => any;
+	onEscape?: () => any | boolean;
+	show?: boolean;
+	backdrop?: boolean;
+	closeButton?: boolean;
+	animate?: boolean;
+	className?: string;
+	size?: string;
+	buttons?: BootboxButtonMap; // complex object where each key is of type BootboxButton
+}
+
+/** Bootbox options available for custom modals */
+interface BootboxDialogOptions extends BootboxBaseOptions {
+	message: string | Element;
+}
+
+/** Bootbox options available for alert modals */
+interface BootboxAlertOptions extends BootboxDialogOptions {
+	callback?: () => any;
+	buttons?: BootboxAlertButtonMap;
+}
+
+/** Bootbox options available for confirm modals */
+interface BootboxConfirmOptions extends BootboxDialogOptions {
+	callback: (result: boolean) => any;
+	buttons?: BootboxConfirmPromptButtonMap;
+}
+
+/** Bootbox options available for prompt modals */
+interface BootboxPromptOptions extends BootboxBaseOptions {
+	title: string;
+	value?: string;
+	callback: (result: string) => any;
+	buttons?: BootboxConfirmPromptButtonMap;
+}
+
+/** Bootbox options available when setting defaults for modals */
+interface BootboxDefaultOptions {
+	locale?: string;
+	show?: boolean;
+	backdrop?: boolean;
+	closeButton?: boolean;
+	animate?: boolean;
+	className?: string;
+}
+
+interface BootboxButton {
+	label?: string;
+	className?: string;
+	callback?: () => any;
+}
+
+interface BootboxButtonMap {
+  [key: string]: BootboxButton | Function;
+}
+
+/** ButtonMap options for alerts modals */
+interface BootboxAlertButtonMap extends BootboxButtonMap {
+	ok: BootboxButton | Function;
+}
+
+/** ButtonMap options for confirm and prompt modals */
+interface BootboxConfirmPromptButtonMap extends BootboxButtonMap {
+	confirm: BootboxButton | Function;
+	cancel: BootboxButton | Function;
+}
+
+interface BootboxLocaleValues {
+	OK: string;
+	CANCEL: string;
+	CONFIRM: string;
+}
+
+interface BootboxStatic {
+	alert(message: string, callback?: () => void): JQuery;
+	alert(options: BootboxAlertOptions): JQuery;
+	confirm(message: string, callback: (result: boolean) => void): JQuery;
+	confirm(options: BootboxConfirmOptions): JQuery;
+	prompt(message: string, callback: (result: string) => void): JQuery;
+	prompt(options: BootboxPromptOptions): JQuery;
+	dialog(message: string, callback?: (result: string) => void): JQuery;
+	dialog(options: BootboxDialogOptions): JQuery;
+	setDefaults(options: BootboxDefaultOptions): void;
+	hideAll(): void;
+
+	addLocale(name: string, values: BootboxLocaleValues): void;
+	removeLocale(name: string): void;
+	setLocale(name: string): void;
+}
+
+declare var bootbox: BootboxStatic;
+
+declare module "bootbox" {
+    export = bootbox;
+}
diff --git a/bootbox/tsconfig.json b/bootbox/tsconfig.json
new file mode 100644
index 0000000000..4c5702a4ce
--- /dev/null
+++ b/bootbox/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bootbox-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bootpag/bootpag-tests.ts b/bootpag/bootpag-tests.ts
index a0986e74cc..6a5503f9f8 100644
--- a/bootpag/bootpag-tests.ts
+++ b/bootpag/bootpag-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="bootpag.d.ts"/>
+/// <reference types="jquery"/>
 
 var pagerSelector = ".bootpager";
 var $pager = $(pagerSelector);
diff --git a/bootpag/bootpag.d.ts b/bootpag/bootpag.d.ts
deleted file mode 100644
index fef37711cd..0000000000
--- a/bootpag/bootpag.d.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-// Type definitions for jQuery-Bootpag 1.0.7
-// Project: http://botmonster.com/jquery-bootpag/
-// Definitions by: MAF.DAP / Romain Deneau <https://github.com/rdeneau/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-declare namespace JqueryBootpag {
-    /**
-     * Bootpag plugin interface options
-     */
-    export interface Options {
-        /**
-         * number of pages
-         */
-        total: number;
-
-        /**
-         * maximum number of visible pages
-         */
-        maxVisible: number;
-
-        /**
-         * page to show on start
-         */
-        page?: number;
-
-        /**
-         * next/prev buttons move over one page or maximum visible pages (default true)
-         */
-        leaps?: boolean;
-
-        /**
-         * next button text (default "�")
-         */
-        next?: string;
-
-        /**
-         * prev button text (default "�")
-         */
-        prev?: string;
-
-        /**
-         * template for pagination links (default "javascript:void(0);")
-         */
-        href?: string;
-
-        /**
-         * variable name in href template for page number (default "{{number}}")
-         */
-        hrefVariable?: string;
-
-        /**
-         * do we ant first and last (default true)
-         */
-        firstLastUse?: boolean;
-
-        /**
-         * name of first (default 'FIRST')
-         */
-        first?: string;
-
-        /**
-         * name of last (default 'LAST')
-         */
-        last?: string;
-
-        /**
-         * css class for wrap (default 'pagination')
-         */
-        wrapClass?: string;
-
-        /**
-         * css class for active (default 'active')
-         */
-        activeClass?: string;
-
-        /**
-         * css class for disabled (default 'disabled')
-         */
-        disabledClass?: string;
-
-        /**
-         * css class for next (default 'next')
-         */
-        nextClass?: string;
-
-        /**
-         * css class for prev (default 'prev')
-         */
-        prevClass?: string;
-
-        /**
-         * css class for last (default 'last')
-         */
-        lastClass?: string;
-
-        /**
-         * css class for first (default 'first')
-         */
-        firstClass?: string;
-    }
-
-    /**
-     * Event handler on page click.
-     * @param event : JQueryEventObject
-     * @param pageNumber : number of the clicked page
-     */
-    interface PageEventHandler {
-        (event: JQueryEventObject, pageNumber: number): any;
-    }
-}
-
-interface JQuery {
-    /**
-     * jQuery Bootpag plugin main method
-     */
-    bootpag(options: JqueryBootpag.Options): JQuery;
-
-    /**
-     * jQuery Bootpag "page" event occurring on page click.
-     * @param eventName : always "page"
-     * @param handler : A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(eventName: "page", handler: JqueryBootpag.PageEventHandler): JQuery;
-}
diff --git a/bootpag/index.d.ts b/bootpag/index.d.ts
new file mode 100644
index 0000000000..2063cf5b93
--- /dev/null
+++ b/bootpag/index.d.ts
@@ -0,0 +1,126 @@
+// Type definitions for jQuery-Bootpag 1.0.7
+// Project: http://botmonster.com/jquery-bootpag/
+// Definitions by: MAF.DAP / Romain Deneau <https://github.com/rdeneau/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+declare namespace JqueryBootpag {
+    /**
+     * Bootpag plugin interface options
+     */
+    export interface Options {
+        /**
+         * number of pages
+         */
+        total: number;
+
+        /**
+         * maximum number of visible pages
+         */
+        maxVisible: number;
+
+        /**
+         * page to show on start
+         */
+        page?: number;
+
+        /**
+         * next/prev buttons move over one page or maximum visible pages (default true)
+         */
+        leaps?: boolean;
+
+        /**
+         * next button text (default "�")
+         */
+        next?: string;
+
+        /**
+         * prev button text (default "�")
+         */
+        prev?: string;
+
+        /**
+         * template for pagination links (default "javascript:void(0);")
+         */
+        href?: string;
+
+        /**
+         * variable name in href template for page number (default "{{number}}")
+         */
+        hrefVariable?: string;
+
+        /**
+         * do we ant first and last (default true)
+         */
+        firstLastUse?: boolean;
+
+        /**
+         * name of first (default 'FIRST')
+         */
+        first?: string;
+
+        /**
+         * name of last (default 'LAST')
+         */
+        last?: string;
+
+        /**
+         * css class for wrap (default 'pagination')
+         */
+        wrapClass?: string;
+
+        /**
+         * css class for active (default 'active')
+         */
+        activeClass?: string;
+
+        /**
+         * css class for disabled (default 'disabled')
+         */
+        disabledClass?: string;
+
+        /**
+         * css class for next (default 'next')
+         */
+        nextClass?: string;
+
+        /**
+         * css class for prev (default 'prev')
+         */
+        prevClass?: string;
+
+        /**
+         * css class for last (default 'last')
+         */
+        lastClass?: string;
+
+        /**
+         * css class for first (default 'first')
+         */
+        firstClass?: string;
+    }
+
+    /**
+     * Event handler on page click.
+     * @param event : JQueryEventObject
+     * @param pageNumber : number of the clicked page
+     */
+    interface PageEventHandler {
+        (event: JQueryEventObject, pageNumber: number): any;
+    }
+}
+
+interface JQuery {
+    /**
+     * jQuery Bootpag plugin main method
+     */
+    bootpag(options: JqueryBootpag.Options): JQuery;
+
+    /**
+     * jQuery Bootpag "page" event occurring on page click.
+     * @param eventName : always "page"
+     * @param handler : A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(eventName: "page", handler: JqueryBootpag.PageEventHandler): JQuery;
+}
diff --git a/bootpag/tsconfig.json b/bootpag/tsconfig.json
new file mode 100644
index 0000000000..9b2a07d1b1
--- /dev/null
+++ b/bootpag/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bootpag-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bootstrap-maxlength/bootstrap-maxlength-tests.ts b/bootstrap-maxlength/bootstrap-maxlength-tests.ts
index 8a17cc7ff9..32255bc66b 100644
--- a/bootstrap-maxlength/bootstrap-maxlength-tests.ts
+++ b/bootstrap-maxlength/bootstrap-maxlength-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="bootstrap-maxlength.d.ts"/>
-/// <reference path="../jquery/jquery.d.ts"/>
+/// <reference types="jquery"/>
 
 // Examples from the projects github page
 $('input[maxlength]').maxlength();
diff --git a/bootstrap-maxlength/bootstrap-maxlength.d.ts b/bootstrap-maxlength/bootstrap-maxlength.d.ts
deleted file mode 100644
index 024ebcba5f..0000000000
--- a/bootstrap-maxlength/bootstrap-maxlength.d.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-// Type definitions for bootstrap-maxlength v1.7.0
-// Project: https://github.com/mimo84/bootstrap-maxlength
-// Definitions by: Dan Manastireanu <https://github.com/danmana>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace BootstrapMaxlength {
-
-    /**
-     * Possible options for the position of the counter. (passed to $.fn.css)
-     */
-    interface PlacementOptions {
-        /**
-         * The top position of the counter (Number of pixels, or a px or percent string)
-         */
-        top?: Number | string,
-        /**
-         * The right position of the counter (Number of pixels, or a px or percent string)
-         */
-        right?: Number | string,
-        /**
-         * The bottom position of the counter (Number of pixels, or a px or percent string)
-         */
-        bottom?: Number | string,
-        /**
-         * The left position of the counter (Number of pixels, or a px or percent string)
-         */
-        left?: Number | string,
-        /**
-         * The positioning to use. For example 'relative', 'absolute'
-         */
-        position?: string
-    }
-
-    /**
-     * Representation of the current input position
-     */
-    interface PositionParam {
-        top: Number,
-        right: Number,
-        bottom: Number,
-        left: Number,
-        width: Number,
-        height: Number
-    }
-
-    export interface Options {
-        /**
-         * If true the threshold will be ignored and the remaining length indication will be always showing up while typing or on focus on the input
-         * @default false
-         */
-        alwaysShow?: Boolean,
-        /**
-         * This is a number indicating how many chars are left to start displaying the indications
-         * @default 10
-         */
-        threshold?: Number,
-        /**
-         * It's the class of the element with the indicator. By default is the bootstrap "label label-success" but can be changed to anything you'd like.
-         * @default 'label label-success'
-         */
-        warningClass?: string,
-        /**
-         * It's the class the element gets when the limit is reached. Default is "label label-important label-danger" (to support Bootstrap 2 and 3).
-         * @default 'label label-important label-danger'
-         */
-        limitReachedClass?: string,
-        /**
-         * Represents the separator between the number of typed chars and total number of available chars.
-         * @default ' / '
-         */
-        separator?: string,
-        /**
-         * Is a string of text that can be outputted in front of the indicator.
-         * @default ''
-         */
-        preText?: string,
-        /**
-         * Is a string outputted after the indicator.
-         * @default ''
-         */
-        postText?: string,
-        /**
-         * If false, will display just the number of typed characters, e.g. will not display the max length.
-         * @default true
-         */
-        showMaxLength?: Boolean,
-        /**
-         * If false, will display just the remaining length, e.g. will display remaining lenght instead of number of typed characters.
-         * @default true
-         */
-        showCharsTyped?: Boolean,
-        /**
-         * Is a string, define where to output the counter.
-         * Options:  bottom, left, top, right, bottom-right, top-right, top-left, bottom-left and centered-right
-         * @default 'bottom'
-         */
-        placement?: string | PlacementOptions | ((currentInput: JQuery, maxLengthIndicator: JQuery, currentInputPosition: PositionParam) => void),
-        /**
-         * Appends the maxlength indicator badge to the parent of the input rather than to the body.
-         * @default false
-         */
-        appendToParent?: boolean,
-        /**
-         * An alternative way to provide the message text.
-         * String example: 'You have typed %charsTyped% chars, %charsRemaining% of %charsTotal% remaining'.
-         * %charsTyped%, %charsRemaining% and %charsTotal% will be replaced by the actual values. This overrides the options separator, preText, postText and showMaxLength.
-         * Alternatively you may supply a function that the current text and max length and returns the string to be displayed.
-         * Function example: function(currentText, maxLength) { return '' + Math.ceil(currentText.length / 160) + ' SMS Message(s)'; }
-         * @default null
-         */
-        message?: string | ((currentText : string, maxLength: Number) => string),
-        /**
-         * If true the input will count using utf8 bytesize/encoding. For example: the '�' character is counted as two characters.
-         * @default false
-         */
-        utf8?: boolean,
-        /**
-         * Shows the badge as soon as it is added to the page, similar to alwaysShow
-         * @default false
-         */
-        showOnReady?: boolean,
-        /**
-         * Count linebreak as 2 characters to match IE/Chrome textarea validation. As well as DB storage.
-         * @default true
-         */
-        twoCharLinebreak?: boolean,
-        /**
-         * Allows a custom attribute to display indicator without triggering native maxlength behaviour.
-         * Ignored if value greater than a native maxlength attribute.
-         * 'overmax' class gets added when exceeded to allow user to implement form validation.
-         * @default null (use the maxlength attribute and browser functionality)
-         */
-        customMaxAttribute?: string,
-        /**
-         * Will allow the input to be over the customMaxLength. Useful in soft max situations.
-         * @default false
-         */
-        allowOverMax?: boolean,
-        /**
-         * If the browser doesn't support the maxlength attribute, attempt to type more than
-         * the indicated chars, will be prevented.
-         * @default false
-         */
-        validate?: boolean
-    }
-}
-
-
-interface JQuery {
-    /** Apply the maxlength plugin on the selected elemens */
-    maxlength(options?: BootstrapMaxlength.Options): JQuery;
-    on(events: 'maxlength.shown', handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-    on(events: 'maxlength.hidden', handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-    trigger(eventType: 'maxlength.reposition', extraParameters?: any[]|Object): JQuery;
-
-}
diff --git a/bootstrap-maxlength/index.d.ts b/bootstrap-maxlength/index.d.ts
new file mode 100644
index 0000000000..fefe196dff
--- /dev/null
+++ b/bootstrap-maxlength/index.d.ts
@@ -0,0 +1,158 @@
+// Type definitions for bootstrap-maxlength v1.7.0
+// Project: https://github.com/mimo84/bootstrap-maxlength
+// Definitions by: Dan Manastireanu <https://github.com/danmana>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace BootstrapMaxlength {
+
+    /**
+     * Possible options for the position of the counter. (passed to $.fn.css)
+     */
+    interface PlacementOptions {
+        /**
+         * The top position of the counter (Number of pixels, or a px or percent string)
+         */
+        top?: Number | string,
+        /**
+         * The right position of the counter (Number of pixels, or a px or percent string)
+         */
+        right?: Number | string,
+        /**
+         * The bottom position of the counter (Number of pixels, or a px or percent string)
+         */
+        bottom?: Number | string,
+        /**
+         * The left position of the counter (Number of pixels, or a px or percent string)
+         */
+        left?: Number | string,
+        /**
+         * The positioning to use. For example 'relative', 'absolute'
+         */
+        position?: string
+    }
+
+    /**
+     * Representation of the current input position
+     */
+    interface PositionParam {
+        top: Number,
+        right: Number,
+        bottom: Number,
+        left: Number,
+        width: Number,
+        height: Number
+    }
+
+    export interface Options {
+        /**
+         * If true the threshold will be ignored and the remaining length indication will be always showing up while typing or on focus on the input
+         * @default false
+         */
+        alwaysShow?: Boolean,
+        /**
+         * This is a number indicating how many chars are left to start displaying the indications
+         * @default 10
+         */
+        threshold?: Number,
+        /**
+         * It's the class of the element with the indicator. By default is the bootstrap "label label-success" but can be changed to anything you'd like.
+         * @default 'label label-success'
+         */
+        warningClass?: string,
+        /**
+         * It's the class the element gets when the limit is reached. Default is "label label-important label-danger" (to support Bootstrap 2 and 3).
+         * @default 'label label-important label-danger'
+         */
+        limitReachedClass?: string,
+        /**
+         * Represents the separator between the number of typed chars and total number of available chars.
+         * @default ' / '
+         */
+        separator?: string,
+        /**
+         * Is a string of text that can be outputted in front of the indicator.
+         * @default ''
+         */
+        preText?: string,
+        /**
+         * Is a string outputted after the indicator.
+         * @default ''
+         */
+        postText?: string,
+        /**
+         * If false, will display just the number of typed characters, e.g. will not display the max length.
+         * @default true
+         */
+        showMaxLength?: Boolean,
+        /**
+         * If false, will display just the remaining length, e.g. will display remaining lenght instead of number of typed characters.
+         * @default true
+         */
+        showCharsTyped?: Boolean,
+        /**
+         * Is a string, define where to output the counter.
+         * Options:  bottom, left, top, right, bottom-right, top-right, top-left, bottom-left and centered-right
+         * @default 'bottom'
+         */
+        placement?: string | PlacementOptions | ((currentInput: JQuery, maxLengthIndicator: JQuery, currentInputPosition: PositionParam) => void),
+        /**
+         * Appends the maxlength indicator badge to the parent of the input rather than to the body.
+         * @default false
+         */
+        appendToParent?: boolean,
+        /**
+         * An alternative way to provide the message text.
+         * String example: 'You have typed %charsTyped% chars, %charsRemaining% of %charsTotal% remaining'.
+         * %charsTyped%, %charsRemaining% and %charsTotal% will be replaced by the actual values. This overrides the options separator, preText, postText and showMaxLength.
+         * Alternatively you may supply a function that the current text and max length and returns the string to be displayed.
+         * Function example: function(currentText, maxLength) { return '' + Math.ceil(currentText.length / 160) + ' SMS Message(s)'; }
+         * @default null
+         */
+        message?: string | ((currentText : string, maxLength: Number) => string),
+        /**
+         * If true the input will count using utf8 bytesize/encoding. For example: the '�' character is counted as two characters.
+         * @default false
+         */
+        utf8?: boolean,
+        /**
+         * Shows the badge as soon as it is added to the page, similar to alwaysShow
+         * @default false
+         */
+        showOnReady?: boolean,
+        /**
+         * Count linebreak as 2 characters to match IE/Chrome textarea validation. As well as DB storage.
+         * @default true
+         */
+        twoCharLinebreak?: boolean,
+        /**
+         * Allows a custom attribute to display indicator without triggering native maxlength behaviour.
+         * Ignored if value greater than a native maxlength attribute.
+         * 'overmax' class gets added when exceeded to allow user to implement form validation.
+         * @default null (use the maxlength attribute and browser functionality)
+         */
+        customMaxAttribute?: string,
+        /**
+         * Will allow the input to be over the customMaxLength. Useful in soft max situations.
+         * @default false
+         */
+        allowOverMax?: boolean,
+        /**
+         * If the browser doesn't support the maxlength attribute, attempt to type more than
+         * the indicated chars, will be prevented.
+         * @default false
+         */
+        validate?: boolean
+    }
+}
+
+
+interface JQuery {
+    /** Apply the maxlength plugin on the selected elemens */
+    maxlength(options?: BootstrapMaxlength.Options): JQuery;
+    on(events: 'maxlength.shown', handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+    on(events: 'maxlength.hidden', handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+    trigger(eventType: 'maxlength.reposition', extraParameters?: any[]|Object): JQuery;
+
+}
diff --git a/bootstrap-maxlength/tsconfig.json b/bootstrap-maxlength/tsconfig.json
new file mode 100644
index 0000000000..d482e7b7d1
--- /dev/null
+++ b/bootstrap-maxlength/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bootstrap-maxlength-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bootstrap-notify/bootstrap-notify-tests.ts b/bootstrap-notify/bootstrap-notify-tests.ts
index 8461da8e48..5ae4f2ffc1 100644
--- a/bootstrap-notify/bootstrap-notify-tests.ts
+++ b/bootstrap-notify/bootstrap-notify-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="bootstrap-notify.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+
+/// <reference types="jquery" />
 
 //Test for bootstrap-notify v3.1.3
 //Copied example directly from Bootstrap-notify site
diff --git a/bootstrap-notify/bootstrap-notify.d.ts b/bootstrap-notify/bootstrap-notify.d.ts
deleted file mode 100644
index acdb83b9fd..0000000000
--- a/bootstrap-notify/bootstrap-notify.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-// Type definitions for bootstrap-notify v3.1.3
-// Project: http://bootstrap-notify.remabledesigns.com/
-// Definitions by: Blake Niemyjski <https://github.com/niemyjski/>, Robert McIntosh <https://github.com/mouse0270>, Robert Voica <https://github.com/robert-voica>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-/* tslint:disable: interface-name no-any */
-
-interface JQueryStatic {
-	/* tslint:enable: interface-name */
-    notify(message: string): NotifyReturn;
-	notify(opts: NotifyOptions, settings?: NotifySettings): NotifyReturn;
-	notifyDefaults(settings: NotifySettings): void;
-	notifyClose(): void;
-	notifyClose(command: string): void;
-}
-
-interface NotifyOptions {
-	message: string;
-	title?: string;
-	icon?: string;
-	url?: string;
-	target?: string;
-}
-
-interface NotifySettings {
-	element?: string;
-	position?: string;
-	type?: string;
-	allow_dismiss?: boolean;
-	allow_duplicates?: boolean;
-	newest_on_top?: boolean;
-	showProgressbar?: boolean;
-	placement?: {
-		from?: string;
-		align?: string;
-	};
-	offset?: number;
-	spacing?: number;
-	z_index?: number;
-	delay?: number;
-	timer?: number;
-	url_target?: string;
-	mouse_over?: string;
-	animate?: {
-		enter?: string;
-		exit?: string;
-	};
-	onShow?: () => void;
-	onShown?: () => void;
-	onClose?: () => void;
-	onClosed?: () => void;
-	icon_type?: string;
-	template?: string;
-}
-
-interface NotifyReturn {
-	$ele: JQueryStatic;
-	close: () => void;
-	update: (command: string, update: any) => void;
-}
\ No newline at end of file
diff --git a/bootstrap-notify/index.d.ts b/bootstrap-notify/index.d.ts
new file mode 100644
index 0000000000..afc7913273
--- /dev/null
+++ b/bootstrap-notify/index.d.ts
@@ -0,0 +1,62 @@
+// Type definitions for bootstrap-notify v3.1.3
+// Project: http://bootstrap-notify.remabledesigns.com/
+// Definitions by: Blake Niemyjski <https://github.com/niemyjski/>, Robert McIntosh <https://github.com/mouse0270>, Robert Voica <https://github.com/robert-voica>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+/* tslint:disable: interface-name no-any */
+
+interface JQueryStatic {
+	/* tslint:enable: interface-name */
+    notify(message: string): NotifyReturn;
+	notify(opts: NotifyOptions, settings?: NotifySettings): NotifyReturn;
+	notifyDefaults(settings: NotifySettings): void;
+	notifyClose(): void;
+	notifyClose(command: string): void;
+}
+
+interface NotifyOptions {
+	message: string;
+	title?: string;
+	icon?: string;
+	url?: string;
+	target?: string;
+}
+
+interface NotifySettings {
+	element?: string;
+	position?: string;
+	type?: string;
+	allow_dismiss?: boolean;
+	allow_duplicates?: boolean;
+	newest_on_top?: boolean;
+	showProgressbar?: boolean;
+	placement?: {
+		from?: string;
+		align?: string;
+	};
+	offset?: number;
+	spacing?: number;
+	z_index?: number;
+	delay?: number;
+	timer?: number;
+	url_target?: string;
+	mouse_over?: string;
+	animate?: {
+		enter?: string;
+		exit?: string;
+	};
+	onShow?: () => void;
+	onShown?: () => void;
+	onClose?: () => void;
+	onClosed?: () => void;
+	icon_type?: string;
+	template?: string;
+}
+
+interface NotifyReturn {
+	$ele: JQueryStatic;
+	close: () => void;
+	update: (command: string, update: any) => void;
+}
\ No newline at end of file
diff --git a/bootstrap-notify/tsconfig.json b/bootstrap-notify/tsconfig.json
new file mode 100644
index 0000000000..b27df7f92c
--- /dev/null
+++ b/bootstrap-notify/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bootstrap-notify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bootstrap-slider/bootstrap-slider-tests.ts b/bootstrap-slider/bootstrap-slider-tests.ts
index 548d909a62..749d8dc137 100644
--- a/bootstrap-slider/bootstrap-slider-tests.ts
+++ b/bootstrap-slider/bootstrap-slider-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="bootstrap-slider.d.ts" />
+/// <reference types="jquery" />
+
 
 $(function() {
     // examples from http://seiyria.github.io/bootstrap-slider/
diff --git a/bootstrap-slider/bootstrap-slider.d.ts b/bootstrap-slider/bootstrap-slider.d.ts
deleted file mode 100644
index 77a5177fa0..0000000000
--- a/bootstrap-slider/bootstrap-slider.d.ts
+++ /dev/null
@@ -1,207 +0,0 @@
-// Type definitions for bootstrap-slider.js 4.8.3
-// Project: https://github.com/seiyria/bootstrap-slider
-// Definitions by: Daniel Beckwith <https://github.com/dbeckwith>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../jquery/jquery.d.ts"/>
-
-interface SliderOptions {
-    /**
-     * Default: ''
-     * set the id of the slider element when it's created
-     */
-    id?: string;
-    /**
-     * Default: 0
-     * minimum possible value
-     */
-    min?: number;
-    /**
-     * Default: 10
-     * maximum possible value
-     */
-    max?: number;
-    /**
-     * Default: 1
-     * increment step
-     */
-    step?: number;
-    /**
-     * Default: number of digits after the decimal of step value
-     * The number of digits shown after the decimal. Defaults to the number of digits after the decimal of step value.
-     */
-    precision?: number;
-    /**
-     * Default: 'horizontal'
-     * set the orientation. Accepts 'vertical' or 'horizontal'
-     */
-    orientation?: number;
-    /**
-     * Default: 5
-     * initial value. Use array to have a range slider.
-     */
-    value?: number|number[];
-    /**
-     * Default: false
-     * make range slider. Optional if initial value is an array. If initial value is scalar, max will be used for second value.
-     */
-    range?: boolean;
-    /**
-     * Default: 'before'
-     * selection placement. Accepts: 'before', 'after' or 'none'. In case of a range slider, the selection will be placed between the handles
-     */
-    selection?: string;
-    /**
-     * Default: 'show'
-     * whether to show the tooltip on drag, hide the tooltip, or always show the tooltip. Accepts: 'show', 'hide', or 'always'
-     */
-    tooltip?: string;
-    /**
-     * Default: false
-     * if false show one tootip if true show two tooltips one for each handler
-     */
-    tooltip_split?: boolean;
-    /**
-     * Default: 'round'
-     * handle shape. Accepts: 'round', 'square', 'triangle' or 'custom'
-     */
-    handle?: string;
-    /**
-     * Default: false
-     * whether or not the slider should be reversed
-     */
-    reversed?: boolean;
-    /**
-     * Default: true
-     * whether or not the slider is initially enabled
-     */
-    enabled?: boolean;
-    /**
-     * Default: returns the plain value
-     * formatter callback. Return the value wanted to be displayed in the tooltip
-     * @param val the current value to display
-     */
-    formatter?(val:number): string;
-    /**
-     * Default: false
-     * The natural order is used for the arrow keys. Arrow up select the upper slider value for vertical sliders, arrow right the righter slider value for a horizontal slider - no matter if the slider was reversed or not. By default the arrow keys are oriented by arrow up/right to the higher slider value, arrow down/left to the lower slider value.
-     */
-    natural_arrow_keys?: boolean;
-    /**
-     * Default: [ ]
-     * Used to define the values of ticks. Tick marks are indicators to denote special values in the range. This option overwrites min and max options.
-     */
-    ticks?: number[];
-    /**
-     * Default: [ ]
-     * Defines the positions of the tick values in percentages. The first value should alwasy be 0, the last value should always be 100 percent.
-     */
-    ticks_positions?: number[];
-    /**
-     * Default: [ ]
-     * Defines the labels below the tick marks. Accepts HTML input.
-     */
-    ticks_labels?: string[];
-    /**
-     * Default: 0
-     * Used to define the snap bounds of a tick. Snaps to the tick if value is within these bounds.
-     */
-    ticks_snap_bounds?: number;
-    /**
-     * Default: 'linear'
-     * Set to 'logarithmic' to use a logarithmic scale.
-     */
-    scale?: string;
-    /**
-     * Default: false
-     * Focus the appropriate slider handle after a value change.
-     */
-    focus?: boolean;
-}
-
-interface JQuery {
-    /**
-     * Creates a slider from the current element.
-     * @param options
-     */
-    slider(options?:SliderOptions): JQuery;
-    slider(methodName:string, ...args:any[]): JQuery;
-}
-
-interface ChangeValue {
-    oldValue: number;
-    newValue: number;
-}
-
-interface JQueryEventObject {
-    value: number|ChangeValue;
-}
-
-interface SliderStatics {
-	new (selector: string, opts: SliderOptions): Slider;
-	prototype: Slider;
-}
-
-declare var Slider: SliderStatics;
-
-/**
- * This class is actually not used when using the jQuery version of bootstrap-slider
- * The method documentation is still here thouh.
- * When using jQuery, slider methods like setValue(3, true) have to be called like $slider.slider('setValue', 3, true)
- */
-interface Slider extends JQuery {
-    /**
-     * Get the current value from the slider
-     */
-    getValue(): number;
-    /**
-     * Set a new value for the slider. If optional triggerSlideEvent parameter is true, 'slide' events will be triggered. If optional triggerChangeEvent parameter is true, 'change' events will be triggered.
-     * @param newValue
-     * @param triggerSlideEvent
-     * @param triggerChangeEvent
-     */
-    setValue(newValue:number, triggerSlideEvent?:boolean, triggerChangeEvent?:boolean): void;
-    /**
-     * Properly clean up and remove the slider instance
-     */
-    destroy(): void;
-    /**
-     * Disables the slider and prevents the user from changing the value
-     */
-    disable(): void;
-    /**
-     * Enables the slider
-     */
-    enable(): void;
-    /**
-     * Returns true if enabled, false if disabled
-     */
-    isEnabled(): boolean;
-    /**
-     * Updates the slider's attributes
-     * @param attribute
-     * @param value
-     */
-    setAttribute(attribute:string, value:any): void;
-    /**
-     * Get the slider's attributes
-     * @param attribute
-     */
-    getAttribute(attribute:string): any;
-    /**
-     * Refreshes the current slider
-     */
-    refresh(): void;
-    /**
-     * Renders the tooltip again, after initialization. Useful in situations when the slider and tooltip are initially hidden.
-     */
-    relayout(): void;
-    on: {
-        (eventType:string, callback:(eventObject:JQueryEventObject, ...args:any[]) => any): Slider;
-        (eventType:string, data:any, callback:(eventObject:JQueryEventObject, ...args:any[]) => any): Slider;
-        (eventType:string, selector:string, callback:(eventObject:JQueryEventObject, ...eventData:any[]) => any): Slider;
-        (eventType:string, selector:string, data:any, callback:(eventObject:JQueryEventObject, ...eventData:any[]) => any): Slider;
-        (eventType:{ [key: string]: any; }, selector?:string, data?:any): Slider;
-        (eventType:{ [key: string]: any; }, data?:any): Slider;
-    }
-}
diff --git a/bootstrap-slider/index.d.ts b/bootstrap-slider/index.d.ts
new file mode 100644
index 0000000000..0d704c0dfc
--- /dev/null
+++ b/bootstrap-slider/index.d.ts
@@ -0,0 +1,207 @@
+// Type definitions for bootstrap-slider.js 4.8.3
+// Project: https://github.com/seiyria/bootstrap-slider
+// Definitions by: Daniel Beckwith <https://github.com/dbeckwith>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="jquery"/>
+
+interface SliderOptions {
+    /**
+     * Default: ''
+     * set the id of the slider element when it's created
+     */
+    id?: string;
+    /**
+     * Default: 0
+     * minimum possible value
+     */
+    min?: number;
+    /**
+     * Default: 10
+     * maximum possible value
+     */
+    max?: number;
+    /**
+     * Default: 1
+     * increment step
+     */
+    step?: number;
+    /**
+     * Default: number of digits after the decimal of step value
+     * The number of digits shown after the decimal. Defaults to the number of digits after the decimal of step value.
+     */
+    precision?: number;
+    /**
+     * Default: 'horizontal'
+     * set the orientation. Accepts 'vertical' or 'horizontal'
+     */
+    orientation?: number;
+    /**
+     * Default: 5
+     * initial value. Use array to have a range slider.
+     */
+    value?: number|number[];
+    /**
+     * Default: false
+     * make range slider. Optional if initial value is an array. If initial value is scalar, max will be used for second value.
+     */
+    range?: boolean;
+    /**
+     * Default: 'before'
+     * selection placement. Accepts: 'before', 'after' or 'none'. In case of a range slider, the selection will be placed between the handles
+     */
+    selection?: string;
+    /**
+     * Default: 'show'
+     * whether to show the tooltip on drag, hide the tooltip, or always show the tooltip. Accepts: 'show', 'hide', or 'always'
+     */
+    tooltip?: string;
+    /**
+     * Default: false
+     * if false show one tootip if true show two tooltips one for each handler
+     */
+    tooltip_split?: boolean;
+    /**
+     * Default: 'round'
+     * handle shape. Accepts: 'round', 'square', 'triangle' or 'custom'
+     */
+    handle?: string;
+    /**
+     * Default: false
+     * whether or not the slider should be reversed
+     */
+    reversed?: boolean;
+    /**
+     * Default: true
+     * whether or not the slider is initially enabled
+     */
+    enabled?: boolean;
+    /**
+     * Default: returns the plain value
+     * formatter callback. Return the value wanted to be displayed in the tooltip
+     * @param val the current value to display
+     */
+    formatter?(val:number): string;
+    /**
+     * Default: false
+     * The natural order is used for the arrow keys. Arrow up select the upper slider value for vertical sliders, arrow right the righter slider value for a horizontal slider - no matter if the slider was reversed or not. By default the arrow keys are oriented by arrow up/right to the higher slider value, arrow down/left to the lower slider value.
+     */
+    natural_arrow_keys?: boolean;
+    /**
+     * Default: [ ]
+     * Used to define the values of ticks. Tick marks are indicators to denote special values in the range. This option overwrites min and max options.
+     */
+    ticks?: number[];
+    /**
+     * Default: [ ]
+     * Defines the positions of the tick values in percentages. The first value should alwasy be 0, the last value should always be 100 percent.
+     */
+    ticks_positions?: number[];
+    /**
+     * Default: [ ]
+     * Defines the labels below the tick marks. Accepts HTML input.
+     */
+    ticks_labels?: string[];
+    /**
+     * Default: 0
+     * Used to define the snap bounds of a tick. Snaps to the tick if value is within these bounds.
+     */
+    ticks_snap_bounds?: number;
+    /**
+     * Default: 'linear'
+     * Set to 'logarithmic' to use a logarithmic scale.
+     */
+    scale?: string;
+    /**
+     * Default: false
+     * Focus the appropriate slider handle after a value change.
+     */
+    focus?: boolean;
+}
+
+interface JQuery {
+    /**
+     * Creates a slider from the current element.
+     * @param options
+     */
+    slider(options?:SliderOptions): JQuery;
+    slider(methodName:string, ...args:any[]): JQuery;
+}
+
+interface ChangeValue {
+    oldValue: number;
+    newValue: number;
+}
+
+interface JQueryEventObject {
+    value: number|ChangeValue;
+}
+
+interface SliderStatics {
+	new (selector: string, opts: SliderOptions): Slider;
+	prototype: Slider;
+}
+
+declare var Slider: SliderStatics;
+
+/**
+ * This class is actually not used when using the jQuery version of bootstrap-slider
+ * The method documentation is still here thouh.
+ * When using jQuery, slider methods like setValue(3, true) have to be called like $slider.slider('setValue', 3, true)
+ */
+interface Slider extends JQuery {
+    /**
+     * Get the current value from the slider
+     */
+    getValue(): number;
+    /**
+     * Set a new value for the slider. If optional triggerSlideEvent parameter is true, 'slide' events will be triggered. If optional triggerChangeEvent parameter is true, 'change' events will be triggered.
+     * @param newValue
+     * @param triggerSlideEvent
+     * @param triggerChangeEvent
+     */
+    setValue(newValue:number, triggerSlideEvent?:boolean, triggerChangeEvent?:boolean): void;
+    /**
+     * Properly clean up and remove the slider instance
+     */
+    destroy(): void;
+    /**
+     * Disables the slider and prevents the user from changing the value
+     */
+    disable(): void;
+    /**
+     * Enables the slider
+     */
+    enable(): void;
+    /**
+     * Returns true if enabled, false if disabled
+     */
+    isEnabled(): boolean;
+    /**
+     * Updates the slider's attributes
+     * @param attribute
+     * @param value
+     */
+    setAttribute(attribute:string, value:any): void;
+    /**
+     * Get the slider's attributes
+     * @param attribute
+     */
+    getAttribute(attribute:string): any;
+    /**
+     * Refreshes the current slider
+     */
+    refresh(): void;
+    /**
+     * Renders the tooltip again, after initialization. Useful in situations when the slider and tooltip are initially hidden.
+     */
+    relayout(): void;
+    on: {
+        (eventType:string, callback:(eventObject:JQueryEventObject, ...args:any[]) => any): Slider;
+        (eventType:string, data:any, callback:(eventObject:JQueryEventObject, ...args:any[]) => any): Slider;
+        (eventType:string, selector:string, callback:(eventObject:JQueryEventObject, ...eventData:any[]) => any): Slider;
+        (eventType:string, selector:string, data:any, callback:(eventObject:JQueryEventObject, ...eventData:any[]) => any): Slider;
+        (eventType:{ [key: string]: any; }, selector?:string, data?:any): Slider;
+        (eventType:{ [key: string]: any; }, data?:any): Slider;
+    }
+}
diff --git a/bootstrap-slider/tsconfig.json b/bootstrap-slider/tsconfig.json
new file mode 100644
index 0000000000..afed31c049
--- /dev/null
+++ b/bootstrap-slider/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bootstrap-slider-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bootstrap-switch/bootstrap-switch-tests.ts b/bootstrap-switch/bootstrap-switch-tests.ts
index 542f71ebd4..17bc0fd561 100644
--- a/bootstrap-switch/bootstrap-switch-tests.ts
+++ b/bootstrap-switch/bootstrap-switch-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="bootstrap-switch.d.ts" />
+/// <reference types="jquery"/>
+
 
 function test_cases() {
 	$('#switch').bootstrapSwitch();
diff --git a/bootstrap-switch/bootstrap-switch.d.ts b/bootstrap-switch/bootstrap-switch.d.ts
deleted file mode 100644
index b6738a9b8d..0000000000
--- a/bootstrap-switch/bootstrap-switch.d.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-// Type definitions for Bootstrap Switch
-// Project: http://www.bootstrap-switch.org/
-// Definitions by: John M. Baughman <https://github.com/johnmbaughman>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/**
- * bootstrap-switch - v3.3.2 Copyright (c) 2012-2013 Mattia Larentis
- * Available via the Apache license.
- * see: http://www.bootstrap-switch.org/ or https://github.com/nostalgiaz/bootstrap-switch for details.
- */
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-declare namespace BootstrapSwitch {
-    interface BootstrapSwitchChangeEventObject extends JQueryEventObject {
-        state: boolean
-    }
-
-    interface BootstrapSwitchEventObject extends JQueryEventObject { }
-
-    interface BootstrapSwitchOptions {
-        state?: boolean;
-        size?: string;
-        animate?: boolean;
-        disabled?: boolean;
-        readonly?: boolean;
-        indeterminate?: boolean;
-        invers?: boolean;
-        radioAllOff?: boolean;
-        onColor?: string;
-        offColor?: string;
-        onText?: string;
-        offText?: string;
-        labelText?: string;
-        handleWidth?: string;
-        labelWidth?: string;
-        baseClass?: string;
-        wrapperClass?: string;
-        onInit?: any;
-        onSwitchChange?: any;
-    }
-
-    interface Switch {
-        toggleAnimate(): JQuery;
-        toggleDisabled(): JQuery;
-        toggleReadonly(): JQuery;
-        toggleIndeterminate(): JQuery;
-        toggleInverse(): JQuery;
-        destroy(): JQuery;
-
-        state(): boolean;
-        state(value: any): JQuery;
-        state(value: any, skip: boolean): JQuery;
-        toggleState(skip?: boolean): JQuery;
-        radioAllOff(): boolean;
-        radioAllOff(state: boolean): JQuery;
-        size(): string;
-        size(size: string): JQuery;
-        animate(): boolean;
-        animate(state: boolean): JQuery;
-        disabled(): boolean;
-        disabled(state: boolean): JQuery;
-        toggleDisabled(): JQuery;
-        readonly(): boolean;
-        readonly(state: boolean): JQuery;
-        toggleReadOnly(): JQuery;
-        onColor(): string;
-        onColor(color: string): JQuery;
-        offColor(): string;
-        offColor(color: string): JQuery;
-        onText(): string;
-        onText(text: string): JQuery;
-        offText(): string;
-        offText(text: string): JQuery;
-        labelText(): string;
-        labelText(text: string): JQuery;
-        baseClass(): string;
-        baseClass(text: string): JQuery;
-        wrapperClass(): string;
-        wrapperClass(text: string): JQuery;
-    }
-}
-
-interface JQuery {
-    bootstrapSwitch(): JQuery;
-    bootstrapSwitch(options: BootstrapSwitch.BootstrapSwitchOptions): JQuery;
-    bootstrapSwitch(method: string): JQuery;
-    bootstrapSwitch(method: string, param: any): JQuery;
-    bootstrapSwitch(method: string, param1: any, param2: any): JQuery;
-
-    off(events: "init.bootstrapSwitch", selector?: string, handler?: (eventobject: BootstrapSwitch.BootstrapSwitchEventObject) => any): JQuery;
-    off(events: "init.bootstrapSwitch", handler?: (eventobject: BootstrapSwitch.BootstrapSwitchEventObject) => any): JQuery;
-
-    off(events: "switchChange.bootstrapSwitch", selector?: string, handler?: (eventobject: BootstrapSwitch.BootstrapSwitchChangeEventObject) => any): JQuery;
-    off(events: "switchChange.bootstrapSwitch", handler?: (eventobject: BootstrapSwitch.BootstrapSwitchChangeEventObject) => any): JQuery;
-
-    on(events: "init.bootstrapSwitch", selector?: string, handler?: (eventobject: BootstrapSwitch.BootstrapSwitchEventObject) => any): JQuery;
-    on(events: "init.bootstrapSwitch", handler?: (eventobject: BootstrapSwitch.BootstrapSwitchEventObject) => any): JQuery;
-
-    on(events: "switchChange.bootstrapSwitch", selector?: string, handler?: (eventobject: BootstrapSwitch.BootstrapSwitchChangeEventObject) => any): JQuery;
-    on(events: "switchChange.bootstrapSwitch", handler?: (eventobject: BootstrapSwitch.BootstrapSwitchChangeEventObject) => any): JQuery;
-}
diff --git a/bootstrap-switch/index.d.ts b/bootstrap-switch/index.d.ts
new file mode 100644
index 0000000000..fe6d5f5a0c
--- /dev/null
+++ b/bootstrap-switch/index.d.ts
@@ -0,0 +1,102 @@
+// Type definitions for Bootstrap Switch
+// Project: http://www.bootstrap-switch.org/
+// Definitions by: John M. Baughman <https://github.com/johnmbaughman>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * bootstrap-switch - v3.3.2 Copyright (c) 2012-2013 Mattia Larentis
+ * Available via the Apache license.
+ * see: http://www.bootstrap-switch.org/ or https://github.com/nostalgiaz/bootstrap-switch for details.
+ */
+
+/// <reference types="jquery"/>
+
+declare namespace BootstrapSwitch {
+    interface BootstrapSwitchChangeEventObject extends JQueryEventObject {
+        state: boolean
+    }
+
+    interface BootstrapSwitchEventObject extends JQueryEventObject { }
+
+    interface BootstrapSwitchOptions {
+        state?: boolean;
+        size?: string;
+        animate?: boolean;
+        disabled?: boolean;
+        readonly?: boolean;
+        indeterminate?: boolean;
+        invers?: boolean;
+        radioAllOff?: boolean;
+        onColor?: string;
+        offColor?: string;
+        onText?: string;
+        offText?: string;
+        labelText?: string;
+        handleWidth?: string;
+        labelWidth?: string;
+        baseClass?: string;
+        wrapperClass?: string;
+        onInit?: any;
+        onSwitchChange?: any;
+    }
+
+    interface Switch {
+        toggleAnimate(): JQuery;
+        toggleDisabled(): JQuery;
+        toggleReadonly(): JQuery;
+        toggleIndeterminate(): JQuery;
+        toggleInverse(): JQuery;
+        destroy(): JQuery;
+
+        state(): boolean;
+        state(value: any): JQuery;
+        state(value: any, skip: boolean): JQuery;
+        toggleState(skip?: boolean): JQuery;
+        radioAllOff(): boolean;
+        radioAllOff(state: boolean): JQuery;
+        size(): string;
+        size(size: string): JQuery;
+        animate(): boolean;
+        animate(state: boolean): JQuery;
+        disabled(): boolean;
+        disabled(state: boolean): JQuery;
+        toggleDisabled(): JQuery;
+        readonly(): boolean;
+        readonly(state: boolean): JQuery;
+        toggleReadOnly(): JQuery;
+        onColor(): string;
+        onColor(color: string): JQuery;
+        offColor(): string;
+        offColor(color: string): JQuery;
+        onText(): string;
+        onText(text: string): JQuery;
+        offText(): string;
+        offText(text: string): JQuery;
+        labelText(): string;
+        labelText(text: string): JQuery;
+        baseClass(): string;
+        baseClass(text: string): JQuery;
+        wrapperClass(): string;
+        wrapperClass(text: string): JQuery;
+    }
+}
+
+interface JQuery {
+    bootstrapSwitch(): JQuery;
+    bootstrapSwitch(options: BootstrapSwitch.BootstrapSwitchOptions): JQuery;
+    bootstrapSwitch(method: string): JQuery;
+    bootstrapSwitch(method: string, param: any): JQuery;
+    bootstrapSwitch(method: string, param1: any, param2: any): JQuery;
+
+    off(events: "init.bootstrapSwitch", selector?: string, handler?: (eventobject: BootstrapSwitch.BootstrapSwitchEventObject) => any): JQuery;
+    off(events: "init.bootstrapSwitch", handler?: (eventobject: BootstrapSwitch.BootstrapSwitchEventObject) => any): JQuery;
+
+    off(events: "switchChange.bootstrapSwitch", selector?: string, handler?: (eventobject: BootstrapSwitch.BootstrapSwitchChangeEventObject) => any): JQuery;
+    off(events: "switchChange.bootstrapSwitch", handler?: (eventobject: BootstrapSwitch.BootstrapSwitchChangeEventObject) => any): JQuery;
+
+    on(events: "init.bootstrapSwitch", selector?: string, handler?: (eventobject: BootstrapSwitch.BootstrapSwitchEventObject) => any): JQuery;
+    on(events: "init.bootstrapSwitch", handler?: (eventobject: BootstrapSwitch.BootstrapSwitchEventObject) => any): JQuery;
+
+    on(events: "switchChange.bootstrapSwitch", selector?: string, handler?: (eventobject: BootstrapSwitch.BootstrapSwitchChangeEventObject) => any): JQuery;
+    on(events: "switchChange.bootstrapSwitch", handler?: (eventobject: BootstrapSwitch.BootstrapSwitchChangeEventObject) => any): JQuery;
+}
diff --git a/bootstrap-switch/tsconfig.json b/bootstrap-switch/tsconfig.json
new file mode 100644
index 0000000000..1ac64e6a95
--- /dev/null
+++ b/bootstrap-switch/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bootstrap-switch-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bootstrap-touchspin/bootstrap-touchspin-tests.ts b/bootstrap-touchspin/bootstrap-touchspin-tests.ts
index 552c26f52f..d3c37d87d7 100644
--- a/bootstrap-touchspin/bootstrap-touchspin-tests.ts
+++ b/bootstrap-touchspin/bootstrap-touchspin-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="bootstrap-touchspin.d.ts" />
+/// <reference types="jquery" />
+
 
 $(function () {
     // Example 1 from http://www.virtuosoft.eu/code/bootstrap-touchspin/
diff --git a/bootstrap-touchspin/bootstrap-touchspin.d.ts b/bootstrap-touchspin/bootstrap-touchspin.d.ts
deleted file mode 100644
index 7334e37bbb..0000000000
--- a/bootstrap-touchspin/bootstrap-touchspin.d.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-// Type definitions for Bootstrap TouchSpin
-// Project: http://www.virtuosoft.eu/code/bootstrap-touchspin/
-// Definitions by: Albin Sunnanbo <https://github.com/albinsunnanbo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-/**
- * TouchSpinOptions. All options are optional
- */
-interface TouchSpinOptions {
-    /**
-     * Applied when no explicit value is set on the input with the value attribute.
-     * Empty string means that the value remains empty on initialization.
-     */
-    initval?: number | string;
-
-    /**
-     * Minimum value.
-     */
-    min?: number;
-
-    /**
-     * Maximum value.
-     */
-    max?: number;
-
-    /**
-     * Incremental/decremental step on up/down change.
-     */
-    step?: number;
-
-    /**
-     * How to force the value to be divisible by step value: 'none' | 'round' | 'floor' | 'ceil'
-     */
-    forcestepdivisibility?: string;
-
-    /**
-     * Number of decimal points.
-     */
-    decimals?: number;
-
-    /**
-     * Refresh rate of the spinner in milliseconds.
-     */
-    stepinterval?: number;
-
-    /**
-     * Time in milliseconds before the spinner starts to spin.
-     */
-    stepintervaldelay?: number;
-
-    /**
-     * Enables the traditional up/down buttons.
-     */
-    verticalbuttons?: boolean;
-
-    /**
-     * Class of the up button with vertical buttons mode enabled.
-     */
-    verticalupclass?: string;
-
-    /**
-     * Class of the down button with vertical buttons mode enabled.
-     */
-    verticaldownclass?: string;
-
-    /**
-     * Text before the input.
-     */
-    prefix?: string;
-
-    /**
-     * Text after the input.
-     */
-    postfix?: string;
-
-    /**
-     * Extra class(es) for prefix.
-     */
-    prefix_extraclass?: string;
-
-    /**
-     * Extra class(es) for postfix.
-     */
-    postfix_extraclass?: string;
-
-    /**
-     * If enabled, the the spinner is continually becoming faster as holding the button.
-     */
-    booster?: boolean;
-
-    /**
-     * Boost at every nth step.
-     */
-    boostat?: number;
-
-    /**
-     * Maximum step when boosted.
-     */
-    maxboostedstep?: number | boolean;
-
-    /**
-     * Enables the mouse wheel to change the value of the input.
-     */
-    mousewheel?: boolean;
-
-    /**
-     * Class(es) of down button.
-     */
-    buttondown_class?: string;
-
-    /**
-     * Class(es) of up button.
-     */
-    buttonup_class?: string;
-}
-
-interface JQuery {
-    /**
-     * Initialize TouchSpin
-     */
-    TouchSpin(): JQuery;
-
-    /**
-     * Inialize TouchSpin with options
-     * @param options a TouchSpinOptions object with one or more options
-     */
-    TouchSpin(options: TouchSpinOptions): JQuery;
-}
diff --git a/bootstrap-touchspin/index.d.ts b/bootstrap-touchspin/index.d.ts
new file mode 100644
index 0000000000..268a33df38
--- /dev/null
+++ b/bootstrap-touchspin/index.d.ts
@@ -0,0 +1,130 @@
+// Type definitions for Bootstrap TouchSpin
+// Project: http://www.virtuosoft.eu/code/bootstrap-touchspin/
+// Definitions by: Albin Sunnanbo <https://github.com/albinsunnanbo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+/**
+ * TouchSpinOptions. All options are optional
+ */
+interface TouchSpinOptions {
+    /**
+     * Applied when no explicit value is set on the input with the value attribute.
+     * Empty string means that the value remains empty on initialization.
+     */
+    initval?: number | string;
+
+    /**
+     * Minimum value.
+     */
+    min?: number;
+
+    /**
+     * Maximum value.
+     */
+    max?: number;
+
+    /**
+     * Incremental/decremental step on up/down change.
+     */
+    step?: number;
+
+    /**
+     * How to force the value to be divisible by step value: 'none' | 'round' | 'floor' | 'ceil'
+     */
+    forcestepdivisibility?: string;
+
+    /**
+     * Number of decimal points.
+     */
+    decimals?: number;
+
+    /**
+     * Refresh rate of the spinner in milliseconds.
+     */
+    stepinterval?: number;
+
+    /**
+     * Time in milliseconds before the spinner starts to spin.
+     */
+    stepintervaldelay?: number;
+
+    /**
+     * Enables the traditional up/down buttons.
+     */
+    verticalbuttons?: boolean;
+
+    /**
+     * Class of the up button with vertical buttons mode enabled.
+     */
+    verticalupclass?: string;
+
+    /**
+     * Class of the down button with vertical buttons mode enabled.
+     */
+    verticaldownclass?: string;
+
+    /**
+     * Text before the input.
+     */
+    prefix?: string;
+
+    /**
+     * Text after the input.
+     */
+    postfix?: string;
+
+    /**
+     * Extra class(es) for prefix.
+     */
+    prefix_extraclass?: string;
+
+    /**
+     * Extra class(es) for postfix.
+     */
+    postfix_extraclass?: string;
+
+    /**
+     * If enabled, the the spinner is continually becoming faster as holding the button.
+     */
+    booster?: boolean;
+
+    /**
+     * Boost at every nth step.
+     */
+    boostat?: number;
+
+    /**
+     * Maximum step when boosted.
+     */
+    maxboostedstep?: number | boolean;
+
+    /**
+     * Enables the mouse wheel to change the value of the input.
+     */
+    mousewheel?: boolean;
+
+    /**
+     * Class(es) of down button.
+     */
+    buttondown_class?: string;
+
+    /**
+     * Class(es) of up button.
+     */
+    buttonup_class?: string;
+}
+
+interface JQuery {
+    /**
+     * Initialize TouchSpin
+     */
+    TouchSpin(): JQuery;
+
+    /**
+     * Inialize TouchSpin with options
+     * @param options a TouchSpinOptions object with one or more options
+     */
+    TouchSpin(options: TouchSpinOptions): JQuery;
+}
diff --git a/bootstrap-touchspin/tsconfig.json b/bootstrap-touchspin/tsconfig.json
new file mode 100644
index 0000000000..a046a7d843
--- /dev/null
+++ b/bootstrap-touchspin/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bootstrap-touchspin-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bootstrap.datepicker/bootstrap.datepicker-tests.ts b/bootstrap.datepicker/bootstrap.datepicker-tests.ts
index b275ee25a8..5e084697a2 100644
--- a/bootstrap.datepicker/bootstrap.datepicker-tests.ts
+++ b/bootstrap.datepicker/bootstrap.datepicker-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="bootstrap.datepicker.d.ts"/>
-
-function tests_simple() {
+function tests_simple() {
     $('#datepicker').datepicker();
     $('#datepicker').datepicker({
         format: 'mm-dd-yyyy'
diff --git a/bootstrap.datepicker/bootstrap.datepicker.d.ts b/bootstrap.datepicker/bootstrap.datepicker.d.ts
deleted file mode 100644
index 0633db5358..0000000000
--- a/bootstrap.datepicker/bootstrap.datepicker.d.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-// Type definitions for bootstrap.datepicker
-// Project: https://github.com/eternicode/bootstrap-datepicker
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-/**
- * All options that take a “Date” can handle a Date object; a String
- * formatted according to the given format; or a timedelta relative
- * to today, eg “-1d”, “+6m +1y”, etc, where valid units are “d” (day),
- * “w” (week), “m” (month), and “y” (year).
- * 
- * See online docs for more info:
- *  http://bootstrap-datepicker.readthedocs.org/en/release/options.html
- */
-interface DatepickerOptions {
-    format?: string;
-    weekStart?: number;
-    startDate?: any;
-    endDate?: any;
-    autoclose?: boolean;
-    startView?: number;
-    todayBtn?: any;
-    todayHighlight?: boolean;
-    keyboardNavigation?: boolean;
-    language?: string;
-    beforeShowDay?: (date: any) => any;
-    calendarWeeks?: boolean;
-    clearBtn?: boolean;
-    daysOfWeekDisabled?: number[];
-    forceParse?: boolean;
-    inputs?: any[];
-    minViewMode?: any;
-    multidate?: any;
-    multidateSeparator?: string;
-    orientation?: string;
-}
-
-interface DatepickerEventObject extends JQueryEventObject {
-    date: Date;
-    format(format?: string): string;
-}
-
-interface JQuery {
-    datepicker(): JQuery;
-    datepicker(methodName: string): any;
-    datepicker(methodName: string, params: any): any;
-    datepicker(options: DatepickerOptions): JQuery;
-
-    off(events: "changeDate", selector?: string, handler?: (eventObject: DatepickerEventObject) => any): JQuery;
-    off(events: "changeDate", handler: (eventObject: DatepickerEventObject) => any): JQuery;
-
-    on(events: "changeDate", selector: string, data: any, handler?: (eventObject: DatepickerEventObject) => any): JQuery;
-    on(events: "changeDate", selector: string, handler: (eventObject: DatepickerEventObject) => any): JQuery;
-    on(events: 'changeDate', handler: (eventObject: DatepickerEventObject) => any): JQuery;
-}
diff --git a/bootstrap.datepicker/index.d.ts b/bootstrap.datepicker/index.d.ts
new file mode 100644
index 0000000000..107a3d536c
--- /dev/null
+++ b/bootstrap.datepicker/index.d.ts
@@ -0,0 +1,57 @@
+// Type definitions for bootstrap.datepicker
+// Project: https://github.com/eternicode/bootstrap-datepicker
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+/**
+ * All options that take a “Date” can handle a Date object; a String
+ * formatted according to the given format; or a timedelta relative
+ * to today, eg “-1d”, “+6m +1y”, etc, where valid units are “d” (day),
+ * “w” (week), “m” (month), and “y” (year).
+ * 
+ * See online docs for more info:
+ *  http://bootstrap-datepicker.readthedocs.org/en/release/options.html
+ */
+interface DatepickerOptions {
+    format?: string;
+    weekStart?: number;
+    startDate?: any;
+    endDate?: any;
+    autoclose?: boolean;
+    startView?: number;
+    todayBtn?: any;
+    todayHighlight?: boolean;
+    keyboardNavigation?: boolean;
+    language?: string;
+    beforeShowDay?: (date: any) => any;
+    calendarWeeks?: boolean;
+    clearBtn?: boolean;
+    daysOfWeekDisabled?: number[];
+    forceParse?: boolean;
+    inputs?: any[];
+    minViewMode?: any;
+    multidate?: any;
+    multidateSeparator?: string;
+    orientation?: string;
+}
+
+interface DatepickerEventObject extends JQueryEventObject {
+    date: Date;
+    format(format?: string): string;
+}
+
+interface JQuery {
+    datepicker(): JQuery;
+    datepicker(methodName: string): any;
+    datepicker(methodName: string, params: any): any;
+    datepicker(options: DatepickerOptions): JQuery;
+
+    off(events: "changeDate", selector?: string, handler?: (eventObject: DatepickerEventObject) => any): JQuery;
+    off(events: "changeDate", handler: (eventObject: DatepickerEventObject) => any): JQuery;
+
+    on(events: "changeDate", selector: string, data: any, handler?: (eventObject: DatepickerEventObject) => any): JQuery;
+    on(events: "changeDate", selector: string, handler: (eventObject: DatepickerEventObject) => any): JQuery;
+    on(events: 'changeDate', handler: (eventObject: DatepickerEventObject) => any): JQuery;
+}
diff --git a/bootstrap.datepicker/tsconfig.json b/bootstrap.datepicker/tsconfig.json
new file mode 100644
index 0000000000..7c242b10d7
--- /dev/null
+++ b/bootstrap.datepicker/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bootstrap.datepicker-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bootstrap.paginator/bootstrap.paginator.d.ts b/bootstrap.paginator/bootstrap.paginator.d.ts
deleted file mode 100644
index 805850c88d..0000000000
--- a/bootstrap.paginator/bootstrap.paginator.d.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// Type definitions for bootstrap.paginator
-// Project: https://github.com/lyonlai/bootstrap-paginator
-// Definitions by: derikwhittaker <https://github.com/derikwhittaker/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface PaginatorOptions{
-    alignment?: string;
-    size?: string;
-    itemContainerClass?: (type, page, current) => string;
-    currentPage?: number;
-    numberOfPages?: number;
-    totalPages?: number;
-    pageUrl?: (type, page, current) => string;
-    shouldShowPage?: boolean;
-    itemTexts?: (type:string, page:number, current:number) => string;
-    tooltipTitles?: (type, page, current) => string;
-    useBootstrapTooltip?: boolean;
-    bootstrapTooltipOptions?: {};
-    bootstrapMajorVersion?: number;
-    onPageClicked?: (event, originalEvent, type, page) => void;
-    onPageChanged?: (event, originalEvent, type, page) => void;
-}
-
-interface JQuery {
-    bootstrapPaginator(): JQuery;
-    bootstrapPaginator(options: PaginatorOptions): JQuery;
-}
diff --git a/bootstrap.paginator/bootstrap.paginator.d.ts.tscparams b/bootstrap.paginator/bootstrap.paginator.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/bootstrap.paginator/bootstrap.paginator.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/bootstrap.paginator/index.d.ts b/bootstrap.paginator/index.d.ts
new file mode 100644
index 0000000000..52aedd0656
--- /dev/null
+++ b/bootstrap.paginator/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for bootstrap.paginator
+// Project: https://github.com/lyonlai/bootstrap-paginator
+// Definitions by: derikwhittaker <https://github.com/derikwhittaker/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface PaginatorOptions {
+    alignment?: string;
+    size?: string;
+    itemContainerClass?: (type: string, page: number, current: number) => string;
+    currentPage?: number;
+    numberOfPages?: number;
+    totalPages?: number;
+    pageUrl?: (type: string, page: number, current: number) => string;
+    shouldShowPage?: boolean;
+    itemTexts?: (type: string, page: number, current: number) => string;
+    tooltipTitles?: (type: string, page: number, current: number) => string;
+    useBootstrapTooltip?: boolean;
+    bootstrapTooltipOptions?: {};
+    bootstrapMajorVersion?: number;
+    onPageClicked?: (event: any, originalEvent: any, type: string, page: number) => void;
+    onPageChanged?: (event: any, originalEvent: any, type: string, page: number) => void;
+}
+
+interface JQuery {
+    bootstrapPaginator(options?: PaginatorOptions): JQuery;
+}
diff --git a/bootstrap.paginator/tsconfig.json b/bootstrap.paginator/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/bootstrap.paginator/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bootstrap.timepicker/bootstrap.timepicker.d.ts b/bootstrap.timepicker/bootstrap.timepicker.d.ts
deleted file mode 100644
index 70a48184e6..0000000000
--- a/bootstrap.timepicker/bootstrap.timepicker.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// Type definitions for bootstrap.timepicker
-// Project: https://github.com/jdewit/bootstrap-timepicker
-// Definitions by: derikwhittaker <https://github.com/derikwhittaker/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface TimeickerOptions {
-    defaultTime?: string;
-    disableFocus?: boolean;
-    isOpen?: boolean;
-    minuteStep?: number;
-    modalBackdrop?: boolean;
-    secondStep?: number;
-    showSeconds?: boolean;
-    showInputs?: boolean;
-    showMeridian?: boolean;
-    template?: string;
-    appendWidgetTo?: string;
-}
-
-interface JQuery {
-    timepicker(): JQuery;
-    timepicker(methodName: string): JQuery;
-    timepicker(methodName: string, params: any): JQuery;
-    timepicker(options: TimeickerOptions): JQuery;
-}
diff --git a/bootstrap.timepicker/index.d.ts b/bootstrap.timepicker/index.d.ts
new file mode 100644
index 0000000000..b1325323af
--- /dev/null
+++ b/bootstrap.timepicker/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for bootstrap.timepicker
+// Project: https://github.com/jdewit/bootstrap-timepicker
+// Definitions by: derikwhittaker <https://github.com/derikwhittaker/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface TimeickerOptions {
+    defaultTime?: string;
+    disableFocus?: boolean;
+    isOpen?: boolean;
+    minuteStep?: number;
+    modalBackdrop?: boolean;
+    secondStep?: number;
+    showSeconds?: boolean;
+    showInputs?: boolean;
+    showMeridian?: boolean;
+    template?: string;
+    appendWidgetTo?: string;
+}
+
+interface JQuery {
+    timepicker(): JQuery;
+    timepicker(methodName: string): JQuery;
+    timepicker(methodName: string, params: any): JQuery;
+    timepicker(options: TimeickerOptions): JQuery;
+}
diff --git a/bootstrap.timepicker/tsconfig.json b/bootstrap.timepicker/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/bootstrap.timepicker/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker-3.0.0.d.ts b/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker-3.0.0.d.ts
index 1412ad47eb..2f9a25cb1e 100644
--- a/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker-3.0.0.d.ts
+++ b/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker-3.0.0.d.ts
@@ -9,105 +9,105 @@
  * see: http://eonasdan.github.io/bootstrap-datetimepicker or https://github.com/Eonasdan/bootstrap-datetimepicker for details.
  */
 
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="../moment/moment.d.ts"/>
+/// <reference types="jquery"/>
 
-declare namespace BootstrapV3DatetimePicker {
-    interface DatetimepickerChangeEventObject extends DatetimepickerEventObject {
-        oldDate: moment.Moment;
-    }
+import * as moment from '../moment';
 
-    interface DatetimepickerEventObject extends JQueryEventObject {
-        date: moment.Moment;
-    }
-
-    interface DatetimepickerIcons {
-        time?: string;
-        date?: string;
-        up?: string;
-        down?: string;
-    }
-
-    interface DatetimepickerOptions {
-        pickDate?: boolean;
-        pickTime?: boolean;
-        useMinutes?: boolean;
-        useSeconds?: boolean;
-        useCurrent?: boolean;
-        minuteStepping?: number;
-        minDate?: moment.Moment | Date | string;
-        maxDate?: moment.Moment | Date | string;
-        showToday?: boolean;
-        collapse?: boolean;
-        language?: string;
-        defaultDate?: moment.Moment | Date | string;
-        disabledDates?: Array<moment.Moment | Date | string>;
-        enabledDates?: Array<moment.Moment | Date | string>;
-        icons?: DatetimepickerIcons;
-        useStrict?: boolean;
-        direction?: string;
-        sideBySide?: boolean;
-        daysOfWeekDisabled?: Array<number>;
-        calendarWeeks?: boolean;
-        format?: string | boolean;
-        locale?: string;
-        showTodayButton?: boolean;
-        viewMode?: string;
-        inline?: boolean;
-        toolbarPlacement?: string;
-        showClear?: boolean;
-        ignoreReadonly?: boolean;
-    }
-
-    interface Datetimepicker {
-        date(date: moment.Moment | Date | string): void;
-        date(): moment.Moment;
-        minDate(date: moment.Moment | Date | string): void;
-        minDate(): moment.Moment | boolean;
-        maxDate(date: moment.Moment | Date | string): void;
-        maxDate(): moment.Moment | boolean;
-        show(): void;
-        disable(): void;
-        enable(): void;
-        destroy(): void;
-        toggle(): void;
-    }
+export as namespace BootstrapV3DatetimePicker;
 
+export interface DatetimepickerChangeEventObject extends DatetimepickerEventObject {
+    oldDate: moment.Moment;
 }
 
+export interface DatetimepickerEventObject extends JQueryEventObject {
+    date: moment.Moment;
+}
 
-interface JQuery {
+export interface DatetimepickerIcons {
+    time?: string;
+    date?: string;
+    up?: string;
+    down?: string;
+}
 
-    datetimepicker(): JQuery;
-    datetimepicker(options: BootstrapV3DatetimePicker.DatetimepickerOptions): JQuery;
+export interface DatetimepickerOptions {
+    pickDate?: boolean;
+    pickTime?: boolean;
+    useMinutes?: boolean;
+    useSeconds?: boolean;
+    useCurrent?: boolean;
+    minuteStepping?: number;
+    minDate?: moment.Moment | Date | string;
+    maxDate?: moment.Moment | Date | string;
+    showToday?: boolean;
+    collapse?: boolean;
+    language?: string;
+    defaultDate?: moment.Moment | Date | string;
+    disabledDates?: Array<moment.Moment | Date | string>;
+    enabledDates?: Array<moment.Moment | Date | string>;
+    icons?: DatetimepickerIcons;
+    useStrict?: boolean;
+    direction?: string;
+    sideBySide?: boolean;
+    daysOfWeekDisabled?: Array<number>;
+    calendarWeeks?: boolean;
+    format?: string | boolean;
+    locale?: string;
+    showTodayButton?: boolean;
+    viewMode?: string;
+    inline?: boolean;
+    toolbarPlacement?: string;
+    showClear?: boolean;
+    ignoreReadonly?: boolean;
+}
 
-    off(events: "dp.change", selector?: string, handler?: (eventobject: BootstrapV3DatetimePicker.DatetimepickerChangeEventObject) => any): JQuery;
-    off(events: "dp.change", handler: (eventobject: BootstrapV3DatetimePicker.DatetimepickerChangeEventObject) => any): JQuery;
+export interface Datetimepicker {
+    date(date: moment.Moment | Date | string): void;
+    date(): moment.Moment;
+    minDate(date: moment.Moment | Date | string): void;
+    minDate(): moment.Moment | boolean;
+    maxDate(date: moment.Moment | Date | string): void;
+    maxDate(): moment.Moment | boolean;
+    show(): void;
+    disable(): void;
+    enable(): void;
+    destroy(): void;
+    toggle(): void;
+}
 
-    on(events: "dp.change", selector: string, data: any, handler?: (eventobject: BootstrapV3DatetimePicker.DatetimepickerChangeEventObject) => any): JQuery;
-    on(events: "dp.change", selector: string, handler: (eventobject: BootstrapV3DatetimePicker.DatetimepickerChangeEventObject) => any): JQuery;
-    on(events: 'dp.change', handler: (eventObject: BootstrapV3DatetimePicker.DatetimepickerChangeEventObject) => any): JQuery;
+declare global {
+    interface JQuery {
+        datetimepicker(): JQuery;
+        datetimepicker(options: DatetimepickerOptions): JQuery;
 
-    off(events: "dp.show", selector?: string, handler?: (eventobject: BootstrapV3DatetimePicker.DatetimepickerEventObject) => any): JQuery;
-    off(events: "dp.show", handler: (eventobject: BootstrapV3DatetimePicker.DatetimepickerEventObject) => any): JQuery;
+        off(events: "dp.change", selector?: string, handler?: (eventobject: DatetimepickerChangeEventObject) => any): JQuery;
+        off(events: "dp.change", handler: (eventobject: DatetimepickerChangeEventObject) => any): JQuery;
 
-    on(events: "dp.show", selector: string, data: any, handler?: (eventobject: BootstrapV3DatetimePicker.DatetimepickerEventObject) => any): JQuery;
-    on(events: "dp.show", selector: string, handler: (eventobject: BootstrapV3DatetimePicker.DatetimepickerEventObject) => any): JQuery;
-    on(events: 'dp.show', handler: (eventObject: BootstrapV3DatetimePicker.DatetimepickerEventObject) => any): JQuery;
+        on(events: "dp.change", selector: string, data: any, handler?: (eventobject: DatetimepickerChangeEventObject) => any): JQuery;
+        on(events: "dp.change", selector: string, handler: (eventobject: DatetimepickerChangeEventObject) => any): JQuery;
+        on(events: 'dp.change', handler: (eventObject: DatetimepickerChangeEventObject) => any): JQuery;
 
-    off(events: "dp.hide", selector?: string, handler?: (eventobject: BootstrapV3DatetimePicker.DatetimepickerEventObject) => any): JQuery;
-    off(events: "dp.hide", handler: (eventobject: BootstrapV3DatetimePicker.DatetimepickerEventObject) => any): JQuery;
+        off(events: "dp.show", selector?: string, handler?: (eventobject: DatetimepickerEventObject) => any): JQuery;
+        off(events: "dp.show", handler: (eventobject: DatetimepickerEventObject) => any): JQuery;
 
-    on(events: "dp.hide", selector: string, data: any, handler?: (eventobject: BootstrapV3DatetimePicker.DatetimepickerEventObject) => any): JQuery;
-    on(events: "dp.hide", selector: string, handler: (eventobject: BootstrapV3DatetimePicker.DatetimepickerEventObject) => any): JQuery;
-    on(events: 'dp.hide', handler: (eventObject: BootstrapV3DatetimePicker.DatetimepickerEventObject) => any): JQuery;
+        on(events: "dp.show", selector: string, data: any, handler?: (eventobject: DatetimepickerEventObject) => any): JQuery;
+        on(events: "dp.show", selector: string, handler: (eventobject: DatetimepickerEventObject) => any): JQuery;
+        on(events: 'dp.show', handler: (eventObject: DatetimepickerEventObject) => any): JQuery;
 
-    off(events: "dp.error", selector?: string, handler?: (eventobject: BootstrapV3DatetimePicker.DatetimepickerEventObject) => any): JQuery;
-    off(events: "dp.error", handler: (eventobject: BootstrapV3DatetimePicker.DatetimepickerEventObject) => any): JQuery;
+        off(events: "dp.hide", selector?: string, handler?: (eventobject: DatetimepickerEventObject) => any): JQuery;
+        off(events: "dp.hide", handler: (eventobject: DatetimepickerEventObject) => any): JQuery;
 
-    on(events: "dp.error", selector: string, data: any, handler?: (eventobject: BootstrapV3DatetimePicker.DatetimepickerEventObject) => any): JQuery;
-    on(events: "dp.error", selector: string, handler: (eventobject: BootstrapV3DatetimePicker.DatetimepickerEventObject) => any): JQuery;
-    on(events: 'dp.error', handler: (eventObject: BootstrapV3DatetimePicker.DatetimepickerEventObject) => any): JQuery;
+        on(events: "dp.hide", selector: string, data: any, handler?: (eventobject: DatetimepickerEventObject) => any): JQuery;
+        on(events: "dp.hide", selector: string, handler: (eventobject: DatetimepickerEventObject) => any): JQuery;
+        on(events: 'dp.hide', handler: (eventObject: DatetimepickerEventObject) => any): JQuery;
 
-    data(key: 'DateTimePicker'): BootstrapV3DatetimePicker.Datetimepicker;
+        off(events: "dp.error", selector?: string, handler?: (eventobject: DatetimepickerEventObject) => any): JQuery;
+        off(events: "dp.error", handler: (eventobject: DatetimepickerEventObject) => any): JQuery;
+
+        on(events: "dp.error", selector: string, data: any, handler?: (eventobject: DatetimepickerEventObject) => any): JQuery;
+        on(events: "dp.error", selector: string, handler: (eventobject: DatetimepickerEventObject) => any): JQuery;
+        on(events: 'dp.error', handler: (eventObject: DatetimepickerEventObject) => any): JQuery;
+
+        data(key: 'DateTimePicker'): Datetimepicker;
+    }
 }
diff --git a/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker-tests.ts b/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker-tests.ts
index 137e84720d..4306bf97c7 100644
--- a/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker-tests.ts
+++ b/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker-tests.ts
@@ -1,5 +1,6 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="bootstrap.v3.datetimepicker.d.ts" />
+/// <reference types="jquery"/>
+
+import * as moment from 'moment';
 
 function test_cases() {
     $('#datetimepicker').datetimepicker();
diff --git a/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker.d.ts b/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker.d.ts
deleted file mode 100644
index d49a0d8814..0000000000
--- a/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker.d.ts
+++ /dev/null
@@ -1,588 +0,0 @@
-// Type definitions for Bootstrap 3 Datepicker v4.17.37
-// Project: http://eonasdan.github.io/bootstrap-datetimepicker
-// Definitions by: Katona Péter <https://github.com/katonap>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// based on the previous version created by Jesica N. Fera <https://github.com/bayitajesi>
-
-/**
- * bootstrap-datetimepicker.js 4.17.37 Copyright (c) 2015 Jonathan Peterson
- * Available via the MIT license.
- * see: http://eonasdan.github.io/bootstrap-datetimepicker or https://github.com/Eonasdan/bootstrap-datetimepicker for details.
- */
-
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="../moment/moment.d.ts"/>
-
-declare namespace BootstrapV3DatetimePicker {
-
-	interface Datetimepicker {
-		/**Clears the datepicker by setting the value to null */
-		clear(): void;
-		/**Returns the component's model current date, a moment object or null if not set. */
-		date(): moment.Moment;
-		/**Takes string, Date, moment, null parameter and sets the components model current moment to it.
-		 * Passing a null value unsets the components model current moment.
-		 * Parsing of the newDate parameter is made using moment library with the options.format and options.useStrict components configuration.
-		 * Throws:
-		 * - TypeError - in case the newDate cannot be parsed
-		 *
-		 * Emits:
-		 * - dp.change - In case newDate is different from current moment
-		 */
-		date(date: moment.Moment | Date | string): void;
-		/**Destroys the widget and removes all attached event listeners */
-		destroy(): void;
-		/**Disables the input element, the component is attached to, by adding a disabled="true" attribute to it. If the widget was visible before that call it is hidden.
-		 * Emits:
-		 * - dp.hide - if the widget was visible before that call
-		 */
-		disable(): void;
-		/**Enables the input element, the component is attached to, by removing disabled attribute from it. */
-		enable(): void;
-		/**Hides the widget
-		 * Emits:
-		 * - dp.hide - if the widget was visible before that call
-		 */
-		hide(): void;
-		/**Returns the components current options object.
-		 * Note that the changing the values of the returned object does not change the components actual configuration. */
-		options(): DatetimepickerOptions
-		/**Takes an object variable with option key:value properties and configures the component. Use this to update multiple options on the component. */
-		options(options: DatetimepickerOptions): void
-		/**Shows the widget
-		 * Emits:
-		 * - dp.show - if the widget was hidden before that call
-		 * - dp.change - if the widget is opened for the first time and the useCurrent is set to true or to a granularity value and the input element the component is attached to has an empty value
-		 */
-		show(): void;
-		/**Shows or hides the widget
-		 * Emits:
-		 * - dp.hide - if the widget is hidden after the toggle call
-		 * - dp.show - if the widget is show after the toggle call
-		 * - dp.change - if the widget is opened for the first time and the input element is empty and options.useCurrent != false
-		 */
-		toggle(): void;
-
-		////////////////////////////////////////////////////////////////////////////////////////////////////
-		//// Below are the getters/setters for the properties of the 'options(): DatetimepickerOptions' ////
-		////////////////////////////////////////////////////////////////////////////////////////////////////
-
-		/**Returns the options.allowInputToggle option. */
-		allowInputToggle(): boolean;
-		/**If true, the picker will show on textbox focus and icon click when used in a button group */
-		allowInputToggle(value: boolean): void;
-		/**Returns the current options.calendarWeeks option configuration */
-		calendarWeeks(): boolean;
-		/**Set if the week numbers will appear to the left on the days view */
-		calendarWeeks(value: boolean): void;
-		/**Returns the options.collapse option configuration */
-		collapse(): boolean;
-		/**If set to false the picker will display similar to sideBySide except vertical. */
-		collapse(value: boolean): void;
-		/**Returns the options.daysOfWeekDisabled configuration
-		 * IMPORTANT! Throws exception if not set explicitly https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1459
-		*/
-		daysOfWeekDisabled(): Array<number>;
-		/**Takes an [ Number:0 to 6 ] and disallow the user to select weekdays that exist in this array.
-		 * This has lower priority over the options.minDate, options.maxDate, options.disabledDates and options.enabledDates configuration settings.
-		 * Emits:
-		 * - dp.change - if the currently selected moment falls in the values passed on the daysOfWeek parameter.
-		 * - dp.error - if the currently selected moment falls in the values passed on the daysOfWeek parameter.
-		 */
-		daysOfWeekDisabled(days: Array<number>): void;
-		/**Returns the options.dayViewHeaderFormat option. */
-		dayViewHeaderFormat(): string;
-		/**Used to customize the header of the day view. */
-		dayViewHeaderFormat(value: string): void;
-		/**Returns a moment with the options.defaultDate option configuration or false if not set */
-		defaultDate(): moment.Moment | boolean;
-		/**Will set the picker's inital date.
-		 * If a boolean:false value is passed the options.defaultDate parameter is cleared.
-		 * Throws:
-		 * - TypeError - if the provided date doesn't pass validation, including disabledDates, enabledDates, minDate, maxDate, and daysOfWeekDisabled
-		 * - TypeError - if the provided date cannot be parsed by momentjs
-		 */
-		defaultDate(date: string | Date | moment.Moment | boolean): void;
-		/**Returns the options.disabledDates option.
-		 * NOTES: probably should be: disabledDates(): boolean | Array<moment.Moment>; see: DatetimepickerOptions
-		*/
-		disabledDates(): boolean | any;
-		/**Takes an array of values and disallows the user to select those days.
-		 * Setting this takes precedence over options.minDate, options.maxDate configuration.
-		 * Also calling this function removes the configuration of options.enabledDates if such exist.
-		 * Note: These values are matched with Day granularity.
-		 */
-		disabledDates(dates: boolean | Array<string | Date | moment.Moment>): void;
-		/**Returns the options.disabledHours option.
-		 * NOTES: probably should be: disabledHours(): boolean | Array<number>; see: DatetimepickerOptions
-		*/
-		disabledHours(): boolean | any;
-		/**Must be in 24 hour format. Will disallow hour selections (much like disabledTimeIntervals) but will affect all days.
-		 * Like en/disabledDates, the en/disabledHours options are mutually exclusive and will reset one of the options back to false. */
-		disabledHours(value: boolean | Array<number>): void;
-		/**Returns the options.disabledTimeIntervals option, or... not exactly
-		 * IMPORTANT! Creates an object from the options.disabledTimeIntervals with the keys being numbers, the values being the moment arrays.
-		 * eg { "0": [<moment.Moment1>, <moment.Moment2>], "1": [...] }
-		 * https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1498
-		 */
-		disabledTimeIntervals(): boolean | Array<Array<moment.Moment>>;
-		/**Disables time selection between the given moments
-		 * eg: [[moment({ h: 0 }), moment({ h: 8 })], [moment({ h: 18 }), moment({ h: 24 })]]
-		 */
-		disabledTimeIntervals(value: boolean | Array<Array<moment.Moment>>): void;
-		/**Returns the options.enabledDates option
-		 * NOTES: probably should be: enabledDates(): boolean | Array<moment.Moment>; see: DatetimepickerOptions
-		*/
-		enabledDates(): boolean | any;
-		/**Takes an array of values and allows the user to select only from those days.
-		 * Setting this takes precedence over options.minDate, options.maxDate configuration.
-		 * Also calling this function removes the configuration of options.disabledDates if such exist.
-		 * Note: These values are matched with Day granularity.
-		 */
-		enabledDates(dates: boolean | Array<string | Date | moment.Moment>): void;
-		/**Returns the options.enabledHours option.
-		 * NOTES: probably should be: enabledHours(): boolean | Array<number>; see: DatetimepickerOptions
-		*/
-		enabledHours(): boolean | any;
-		/**Must be in 24 hour format. Will allow hour selections (much like enabledTimeIntervals) but will affect all days.
-		 * Like en/disabledDates, the en/disabledHours options are mutually exclusive and will reset one of the options back to false. */
-		enabledHours(value: boolean | Array<number>): void;
-		/**Returns a boolean or array with the options.extraFormats option configuration */
-		extraFormats(): boolean | Array<string>;
-		/**Takes an array of valid input moment format options, or boolean:false */
-		extraFormats(formats: boolean | Array<string>): void;
-		/**Returns the options.focusOnShow option. */
-		focusOnShow(): boolean;
-		/**If false, the textbox will not be given focus when the picker is shown */
-		focusOnShow(value: boolean): void;
-		/**Returns the component's options.format string */
-		format(): boolean | string;
-		/**Takes a moment.js format string and sets the components options.format.
-		 * This is used for displaying and also for parsing input strings either from the input element the component is attached to or the date() function.
-		 * The parameter can also be a boolean:false in which case the format is set to the locale's L LT.
-		 * Note: this is also used to determine if the TimePicker sub component will display the hours in 12 or 24 format. (if "a" or "h" exists in the passed string then a 12 hour mode is set)
-		 */
-		format(format: boolean | string): void;
-		/**Returns options.icons */
-		icons(): Icons;
-		/**Takes an Object of strings.
-		 * Throws:
-		 * - TypeError - if icons parameter is not an Object
-		 */
-		icons(icons: Icons): void;
-		/**Returns the options.ignoreReadonly option. */
-		ignoreReadonly(): boolean;
-		/**Set this to true to allow the picker to be used even if the input field is readonly. This will not bypass the disabled property */
-		ignoreReadonly(value: boolean): void;
-		/**Returns the options.inline option. */
-		inline(): boolean;
-		/**Used to customize the header of the day view. */
-		inline(value: boolean): void;
-		/**Returns the options.keepInvalid option. */
-		keepInvalid(): boolean;
-		/**If true, invalid dates will not be reverted to a previous selection or changed. */
-		keepInvalid(value: boolean): void;
-		/**Returns a string variable with the currently set options.keyBinds option. */
-		keyBinds(): any;
-		/**Allows for several keyBinding functions to be specified for ease of access or accessibility. For defaults see {@link http://eonasdan.github.io/bootstrap-datetimepicker/Options/#keybinds}.
-		*/
-		keyBinds(value: any): void;
-		/**Returns the currently set locale of the options.locale */
-		locale(): string;
-		/**Takes a string of any valid moment locale e.g. de for German.
-		 * Throws:
-		 * - TypeError - if the locale is not loaded via a separate script or moment-with-locale
-		 */
-		locale(newLocale: string): void;
-		/**Returns the currently set moment of the options.maxDate or false if not set */
-		maxDate(): moment.Moment | boolean;
-		/**Takes a parameter and disallows the user to select a moment that is after that moment.
-		 * If a boolean:false value is passed options.maxDate is cleared and there is no restriction to the maximum moment the user can select.
-		 * Note: If the parameter is before the currently selected moment the currently selected moment changes to maxDate
-		 * Throws:
-		 * - TypeError - if the parameter cannot be parsed using the options.format and options.useStrict configuration settings
-		 * - TypeError - if the parameter is before options.minDate
-		 *
-		 * Emits:
-		 * - dp.change - if the new maxDate is after currently selected moment
-		 * - dp.error - if the new maxDate is after currently selected moment
-		 */
-		maxDate(date: moment.Moment | Date | string | boolean): void;
-		/**Returns the currently set moment of the options.minDate or false if not set */
-		minDate(): moment.Moment | boolean;
-		/**Takes a parameter and disallows the user to select a moment that is before that moment.
-		 * If a boolean:false value is passed the options.minDate parameter is cleared and there is no restriction to the miminum moment the user can select.
-		 * Note: If the parameter is after the currently selected moment the currently selected moment changes to minDate parameter
-		 * Throws:
-		 * - TypeError - if the parameter cannot be parsed using the options.format and options.useStrict configuration settings
-		 * - TypeError - if the parameter is after options.maxDate
-		 *
-		 * Emits:
-		 * - dp.change - if the new minDate is after currently selected moment
-		 * - dp.error - if the new minDate is after currently selected moment
-		 */
-		minDate(date: moment.Moment | Date | string | boolean): void;
-		/**Returns the options.parseInputDate option */
-		parseInputDate(): Function;
-		/**Allows custom input formatting For example: the user can enter "yesterday"" or "30 days ago".
-		 * {@link http://eonasdan.github.io/bootstrap-datetimepicker/Functions/#parseinputdate}
-		 */
-		parseInputDate(value: (input: string) => moment.Moment): void;
-		/**Returns the options.showClear option. */
-		showClear(): boolean;
-		/**Set if the clear date button will appear on the widget */
-		showClear(value: boolean): void;
-		/**Returns the options.showClose option. */
-		showClose(): boolean;
-		/**If true, an icon will be displayed on the toolbar that will hide the picker */
-		showClose(value: boolean): void;
-		/**Returns the options.showTodayButton option. */
-		showTodayButton(): boolean;
-		/**Set if the Today button will appear on the widget */
-		showTodayButton(value: boolean): void;
-		/**Returns a boolean of the options.sideBySide. */
-		sideBySide(): boolean;
-		/**If sideBySide is true and the time picker is used, both components will display side by side instead of collapsing. */
-		sideBySide(value: boolean): void;
-		/**Returns a number with the options.stepping option configuration */
-		stepping(): number;
-		/**This will be the amount the up/down arrows move the minute value with a time picker. */
-		stepping(step: number): void;
-		/**Returns the options.toolbarplacement option. */
-		toolbarPlacement(): string;
-		/**Changes the placement of the toolbar where the today, clear, component switch icon are located.
-		 * See valid values at DatetimepickerOptions.toolbarplacement
-		 * Throws:
-		 * - TypeError if the parameter is not a valid value
-		 */
-		toolbarPlacement(value: string): void;
-		/**Returns the options.tooltips option */
-		tooltips(): Tooltips;
-		/**Sets the tooltips for icons.
-		 * Throws:
-		 * - TypeError - if tooltips parameter is not an Object
-		 */
-		tooltips(value: Tooltips): void;
-		/**Returns the options.useCurrent option configuration */
-		useCurrent(): boolean | string;
-		/**Takes a boolean or string.
-		 * If a boolean true is passed and the components model moment is not set (either through setDate or through a valid value on the input element the component is attached to) then the first time the user opens the datetimepicker widget the value is initialized to the current moment of the action.
-		 * If a false boolean is passed then no initialization happens on the input element.
-		 * You can select the granularity on the initialized moment by passing one of the following strings ("year", "month", "day", "hour", "minute") in the variable.
-		 * If for example you pass "day" to the useCurrent function and the input field is empty the first time the user opens the datetimepicker widget the input text will be initialized to the current datetime with day granularity (ie if currentTime = 2014-08-10 13:32:33 the input value will be initialized to 2014-08-10 00:00:00)
-		 * Note: If the options.defaultDate is set or the input element the component is attached to has already a value that takes precedence and the functionality of useCurrent is not triggered!
-		 */
-		useCurrent(value: boolean | string): void;
-		/**Returns the options.useStrict */
-		useStrict(): boolean;
-		/**If useStrict is true, momentjs parsing rules will be stricter when determining if a date is valid or not. */
-		useStrict(value: boolean): void;
-		/**Returns the options.viewDate option. */
-		viewDate(): boolean | moment.Moment;
-		/**This will change the viewDate without changing or setting the selected date. */
-		viewDate(value: string | Date | moment.Moment | boolean): void;
-		/**Returns the options.viewMode. */
-		viewMode(): string;
-		/**Takes a string. See valid values at DatetimepickerOptions.viewMode
-		 * Throws:
-		 * - TypeError - if the parameter is not a string or not a valid value
-		 */
-		viewMode(value: string): void;
-		/**Returns the options.widgetPositioning object */
-		widgetPositioning(): WidgetPositioningOptions;
-		/**WidgetPositioning defines where the dropdown with the widget will appear relative to the input element the component is attached to.
-		 * "auto" is the default value for both horizontal and vertical keys and it tries to automatically place the dropdown in a position that is visible to the user.
-		 * Usually you should not override those options unless you have a special need in your layout.
-		 */
-		widgetPositioning(value: WidgetPositioningOptions): void;
-	}
-
-    interface DatetimepickerOptions {
-		/**If true, the picker will show on textbox focus and icon click when used in a button group
-		 * @default: false
-		 */
-		allowInputToggle?: boolean;
-		/**Shows the week of the year to the left of first day of the week.
-		 * @default: false
-		 */
-        calendarWeeks?: boolean;
-		/**Using a Bootstraps collapse to switch between date/time pickers.
-		 * @default: true
-		 */
-        collapse?: boolean;
-		/**Disables the section of days of the week, e.g. weekends.
-		 * Accepts: array of numbers from 0-6
-		 * @default: false
-		 */
-        daysOfWeekDisabled?: Array<number> | boolean;
-		/**Changes the heading of the datepicker when in "days" view.
-		 * @default: "MMMM YYYY"
-		 */
-		dayViewHeaderFormat?: string;
-		/**Will cause the date picker to stay open after a blur event.
-		 * @default: false
-		 */
-		debug?: boolean;
-		/**Sets the picker default date/time. Overrides useCurrent
-		 * @default: false
-		 */
-        defaultDate?: boolean | moment.Moment | Date | string;
-		/**Disables selection of dates in the array, e.g. holidays
-		 * @default: false
-		 * IMPORTANT! The getter returns an Object NOT an Array, with keys being the dates, values being true.
-		 * eg disabledDates = ["2010-10-10"]; -> disabledDated will be { "2010-01-01": true }
-		 * https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1499
-		 */
-        disabledDates?: boolean | Array<moment.Moment | Date | string> | any;
-		/**Will allow or disallow hour selections (much like disabledTimeIntervals) but will affect all days
-		 * @default: false
-		 * IMPORTANT! The getter returns an Object NOT an Array, with keys being the hours, values being true.
-		 * eg disabledHours = [0, 1]; -> disabledHours will be { "0": true, "1": true }
-		 * https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1499
-		 */
-		disabledHours?: boolean | Array<number> | any;
-		/**Disables time selection between the given moments
-		 * eg: [[moment({ h: 0 }), moment({ h: 8 })], [moment({ h: 18 }), moment({ h: 24 })]]
-		 * @default: false
-		 */
-		disabledTimeIntervals?: boolean | Array<Array<moment.Moment>>;
-		/**Disables selection of dates NOT in the array, e.g. holidays
-		 * @default: false
-		 * IMPORTANT! The getter returns an Object NOT an Array, with keys being the dates, values being true.
-		 * eg enabledDates = ["2010-10-10"]; -> enabledDated will be { "2010-01-01": true }
-		 * https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1499
-		 */
-        enabledDates?: boolean | Array<moment.Moment | Date | string> | any;
-		/**Will allow or disallow hour selections (much like disabledTimeIntervals) but will affect all days
-		 * @default: false
-		 * IMPORTANT! The getter returns an Object NOT an Array, with keys being the hours, values being true.
-		 * eg enabledHours = [0, 1]; -> enabledHours will be { "0": true, "1": true }
-		 * https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1499
-		 */
-		enabledHours?: boolean | Array<number>;
-		/**Allows for several input formats to be valid. See: https://github.com/Eonasdan/bootstrap-datetimepicker/pull/666
-		 * @default: false
-		 */
-		extraFormats?: boolean | Array<string>;
-		/**If false, the textbox will not be given focus when the picker is shown
-		 * @default: true
-		 */
-		focusOnShow?: boolean;
-		/**See momentjs' docs for valid formats. Format also dictates what components are shown, e.g. MM/dd/YYYY will not display the time picker.
-		 * @default: false
-		 */
-        format?: boolean | string;
-		/**Change the default icons for the pickers functions. */
-        icons?: Icons;
-		/**Allow date picker show event to fire even when the associated input element has the readonly="readonly"property.
-		 * @default: false
-		 */
-        ignoreReadonly?: boolean;
-		/**Will display the picker inline without the need of a input field. This will also hide borders and shadows.
-		 * @default: false
-		 */
-        inline?: boolean;
-		/**Allows for custom events to fire on keyboard press.
-		 * eg: keybinds: {
-		 * 		up: (widget) => console.log(widget),
-		 * 		"control up": (widget) => console.log(widget)
-		 * }
-		 * The widget parameter is false, if the datepicker is closed.
-		 */
-		keyBinds?: { [key: string]: (widget: boolean | JQuery) => void };
-		/**Will cause the date picker to not revert or overwrite invalid dates.
-		 * @default: false
-		 */
-		keepInvalid?: boolean;
-		/**Will cause the date picker to stay open after selecting a date if no time components are being used.
-		 * @default: false
-		 */
-		keepOpen?: boolean;
-		/**See momentjs for valid locales. You must include moment-with-locales.js or a local js file.
-		 * @default: moment.locale()
-		 */
-        locale?: string;
-		/**Prevents date/time selections after this date.
-		 * maxDate will override defaultDate and useCurrent if either of these settings are the same day since both options are invalid according to the rules you've selected.
-		 * @default: false
-		 */
-        maxDate?: boolean | moment.Moment | Date | string;
-		/**Prevents date/time selections before this date.
-		 * minDate will override defaultDate and useCurrent if either of these settings are the same day since both options are invalid according to the rules you've selected.
-		 * @default: false
-		 */
-        minDate?: boolean | moment.Moment | Date | string;
-		/**Allows custom input formatting For example: the user can enter "yesterday"" or "30 days ago".
-		 * {@link http://eonasdan.github.io/bootstrap-datetimepicker/Functions/#parseinputdate}
-		 */
-		parseInputDate?: (input: string) => moment.Moment;
-		/**Show the "Clear" button in the icon toolbar.
-		 * Clicking the "Clear" button will set the calendar to null.
-		 * @default: false
-		 */
-        showClear?: boolean;
-		/**Show the "Close" button in the icon toolbar.
-		 * Clicking the "Close" button will call hide()
-		 * @default: false
-		 */
-		showClose?: boolean;
-		/**Show the "Today" button in the icon toolbar.
-		 * Clicking the "Today" button will set the calendar view and set the date to now.
-		 * @default: false
-		 */
-        showTodayButton?: boolean;
-		/**Shows the picker side by side when using the time and date together.
-		 * @default: false
-		 */
-        sideBySide?: boolean;
-		/**Number of minutes the up/down arrow's will move the minutes value in the time picker
-		 * @default: 1
-		 */
-		stepping?: number;
-		/**Changes the placement of the icon toolbar.
-		 * @default: "default"
-		 */
-        toolbarPlacement?: "default" | "top" | "bottom";
-		/**This will change the tooltips over each icon to a custom string */
-		tooltips?: Tooltips;
-		/**On show, will set the picker to the current date/time
-		 * @default: true
-		 */
-        useCurrent?: boolean;
-		/**Defines if moment should use strict date parsing when considering a date to be valid
-		 * @default: false
-		 */
-        useStrict?: boolean;
-		/**This will change the viewDate without changing or setting the selected date.
-		 * @default: false
-		 */
-		viewDate?: boolean | moment.Moment | Date | string;
-		/**The default view to display when the picker is shown.
-		 * Note: To limit the picker to selecting, for instance the year and month, use format: MM/YYYY
-		 * @default: "days"
-		 */
-        viewMode?: "decades" | "years" | "months" | "days";
-		/**On picker show, places the widget at the identifier (string) or jQuery object if the element has css position: "relative"
-		 * @default: null
-		 */
-		widgetParent?: string | JQuery;
-		widgetPositioning?: WidgetPositioningOptions;
-    }
-
-	interface Icons {
-		/**default: "glyphicon glyphicon-trash" */
-		clear?: string;
-		/**default: "glyphicon glyphicon-remove" */
-		close?: string;
-		/**default: "glyphicon glyphicon-calendar" */
-		date?: string;
-		/**default: "glyphicon glyphicon-time" */
-		down?: string;
-		/**default: "glyphicon glyphicon-chevron-left" */
-		next?: string;
-		/**default: "glyphicon glyphicon-screenshot" */
-		previous?: string;
-		/**default: "glyphicon glyphicon-chevron-right" */
-        time?: string;
-		/**default: "glyphicon glyphicon-chevron-down" */
-		today?: string;
-		/**default: "glyphicon glyphicon-chevron-up" */
-		up?: string;
-    }
-
-	interface Tooltips {
-		today?: string;
-		clear?: string;
-		close?: string;
-		selectMonth?: string;
-		prevMonth?: string;
-		nextMonth?: string;
-		selectYear?: string;
-		prevYear?: string;
-		nextYear?: string;
-		selectDecade?: string;
-		prevDecade?: string;
-		nextDecade?: string;
-		prevCentury?: string;
-		nextCentury?: string;
-		selectTime?: string;
-		pickHour?: string;
-		incrementHour?: string;
-		decrementHour?: string;
-		pickMinute?: string;
-		incrementMinute?: string;
-		decrementMinute?: string;
-		togglePeriod?: string;
-		pickSecond?: string;
-		incrementSecond?: string;
-		decrementSecond?: string;
-	}
-
-	interface WidgetPositioningOptions {
-		horizontal?: "auto" | "left" | "right";
-		vertical?: "auto" | "top" | "bottom";
-	}
-
-    interface Event extends JQueryEventObject {
-        date: moment.Moment;
-    }
-
-    interface ChangeEvent extends Event {
-		/**Previous date. False if the previous date is null. */
-        oldDate: moment.Moment | boolean;
-    }
-
-	interface UpdateEvent extends JQueryEventObject {
-		/**Change type as a momentjs format token. e.g. yyyy on year change */
-		change: string;
-		/**New viewDate. */
-		viewDate: moment.Moment;
-	}
-}
-
-interface JQuery {
-
-    datetimepicker(): JQuery;
-    datetimepicker(options: BootstrapV3DatetimePicker.DatetimepickerOptions): JQuery;
-
-    data(key: "DateTimePicker"): BootstrapV3DatetimePicker.Datetimepicker;
-
-    on(events: "dp.change", handler: (eventObject: BootstrapV3DatetimePicker.ChangeEvent) => any): JQuery;
-    on(events: "dp.change", selector: string, handler: (eventobject: BootstrapV3DatetimePicker.ChangeEvent) => any): JQuery;
-    on(events: "dp.change", selector: string, data: any, handler?: (eventobject: BootstrapV3DatetimePicker.ChangeEvent) => any): JQuery;
-
-    off(events: "dp.change", handler: (eventobject: BootstrapV3DatetimePicker.ChangeEvent) => any): JQuery;
-    off(events: "dp.change", selector?: string, handler?: (eventobject: BootstrapV3DatetimePicker.ChangeEvent) => any): JQuery;
-
-
-    on(events: "dp.show", handler: (eventObject: BootstrapV3DatetimePicker.Event) => any): JQuery;
-    on(events: "dp.show", selector: string, handler: (eventobject: BootstrapV3DatetimePicker.Event) => any): JQuery;
-    on(events: "dp.show", selector: string, data: any, handler?: (eventobject: BootstrapV3DatetimePicker.Event) => any): JQuery;
-
-    off(events: "dp.show", handler: (eventobject: BootstrapV3DatetimePicker.Event) => any): JQuery;
-    off(events: "dp.show", selector?: string, handler?: (eventobject: BootstrapV3DatetimePicker.Event) => any): JQuery;
-
-
-    on(events: "dp.hide", handler: (eventObject: BootstrapV3DatetimePicker.Event) => any): JQuery;
-    on(events: "dp.hide", selector: string, handler: (eventobject: BootstrapV3DatetimePicker.Event) => any): JQuery;
-    on(events: "dp.hide", selector: string, data: any, handler?: (eventobject: BootstrapV3DatetimePicker.Event) => any): JQuery;
-
-    off(events: "dp.hide", handler: (eventobject: BootstrapV3DatetimePicker.Event) => any): JQuery;
-    off(events: "dp.hide", selector?: string, handler?: (eventobject: BootstrapV3DatetimePicker.Event) => any): JQuery;
-
-
-    on(events: "dp.error", handler: (eventObject: BootstrapV3DatetimePicker.Event) => any): JQuery;
-    on(events: "dp.error", selector: string, handler: (eventobject: BootstrapV3DatetimePicker.Event) => any): JQuery;
-    on(events: "dp.error", selector: string, data: any, handler?: (eventobject: BootstrapV3DatetimePicker.Event) => any): JQuery;
-
-    off(events: "dp.error", handler: (eventobject: BootstrapV3DatetimePicker.Event) => any): JQuery;
-    off(events: "dp.error", selector?: string, handler?: (eventobject: BootstrapV3DatetimePicker.Event) => any): JQuery;
-
-
-    on(events: "dp.update", handler: (eventObject: BootstrapV3DatetimePicker.UpdateEvent) => any): JQuery;
-    on(events: "dp.update", selector: string, handler: (eventobject: BootstrapV3DatetimePicker.UpdateEvent) => any): JQuery;
-    on(events: "dp.update", selector: string, data: any, handler?: (eventobject: BootstrapV3DatetimePicker.UpdateEvent) => any): JQuery;
-
-    off(events: "dp.update", handler: (eventobject: BootstrapV3DatetimePicker.Event) => any): JQuery;
-    off(events: "dp.update", selector?: string, handler?: (eventobject: BootstrapV3DatetimePicker.UpdateEvent) => any): JQuery;
-}
diff --git a/bootstrap.v3.datetimepicker/index.d.ts b/bootstrap.v3.datetimepicker/index.d.ts
new file mode 100644
index 0000000000..cb8f8d0e47
--- /dev/null
+++ b/bootstrap.v3.datetimepicker/index.d.ts
@@ -0,0 +1,591 @@
+// Type definitions for Bootstrap 3 Datepicker v4.17.37
+// Project: http://eonasdan.github.io/bootstrap-datetimepicker
+// Definitions by: Katona Péter <https://github.com/katonap>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// based on the previous version created by Jesica N. Fera <https://github.com/bayitajesi>
+
+/**
+ * bootstrap-datetimepicker.js 4.17.37 Copyright (c) 2015 Jonathan Peterson
+ * Available via the MIT license.
+ * see: http://eonasdan.github.io/bootstrap-datetimepicker or https://github.com/Eonasdan/bootstrap-datetimepicker for details.
+ */
+
+/// <reference types="jquery"/>
+
+import * as moment from '../moment';
+
+export as namespace BootstrapV3DatetimePicker;
+
+export interface Datetimepicker {
+	/**Clears the datepicker by setting the value to null */
+	clear(): void;
+	/**Returns the component's model current date, a moment object or null if not set. */
+	date(): moment.Moment;
+	/**Takes string, Date, moment, null parameter and sets the components model current moment to it.
+	 * Passing a null value unsets the components model current moment.
+	 * Parsing of the newDate parameter is made using moment library with the options.format and options.useStrict components configuration.
+	 * Throws:
+	 * - TypeError - in case the newDate cannot be parsed
+	 *
+	 * Emits:
+	 * - dp.change - In case newDate is different from current moment
+	 */
+	date(date: moment.Moment | Date | string): void;
+	/**Destroys the widget and removes all attached event listeners */
+	destroy(): void;
+	/**Disables the input element, the component is attached to, by adding a disabled="true" attribute to it. If the widget was visible before that call it is hidden.
+	 * Emits:
+	 * - dp.hide - if the widget was visible before that call
+	 */
+	disable(): void;
+	/**Enables the input element, the component is attached to, by removing disabled attribute from it. */
+	enable(): void;
+	/**Hides the widget
+	 * Emits:
+	 * - dp.hide - if the widget was visible before that call
+	 */
+	hide(): void;
+	/**Returns the components current options object.
+	 * Note that the changing the values of the returned object does not change the components actual configuration. */
+	options(): DatetimepickerOptions
+	/**Takes an object variable with option key:value properties and configures the component. Use this to update multiple options on the component. */
+	options(options: DatetimepickerOptions): void
+	/**Shows the widget
+	 * Emits:
+	 * - dp.show - if the widget was hidden before that call
+	 * - dp.change - if the widget is opened for the first time and the useCurrent is set to true or to a granularity value and the input element the component is attached to has an empty value
+	 */
+	show(): void;
+	/**Shows or hides the widget
+	 * Emits:
+	 * - dp.hide - if the widget is hidden after the toggle call
+	 * - dp.show - if the widget is show after the toggle call
+	 * - dp.change - if the widget is opened for the first time and the input element is empty and options.useCurrent != false
+	 */
+	toggle(): void;
+
+	////////////////////////////////////////////////////////////////////////////////////////////////////
+	//// Below are the getters/setters for the properties of the 'options(): DatetimepickerOptions' ////
+	////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	/**Returns the options.allowInputToggle option. */
+	allowInputToggle(): boolean;
+	/**If true, the picker will show on textbox focus and icon click when used in a button group */
+	allowInputToggle(value: boolean): void;
+	/**Returns the current options.calendarWeeks option configuration */
+	calendarWeeks(): boolean;
+	/**Set if the week numbers will appear to the left on the days view */
+	calendarWeeks(value: boolean): void;
+	/**Returns the options.collapse option configuration */
+	collapse(): boolean;
+	/**If set to false the picker will display similar to sideBySide except vertical. */
+	collapse(value: boolean): void;
+	/**Returns the options.daysOfWeekDisabled configuration
+	 * IMPORTANT! Throws exception if not set explicitly https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1459
+	*/
+	daysOfWeekDisabled(): Array<number>;
+	/**Takes an [ Number:0 to 6 ] and disallow the user to select weekdays that exist in this array.
+	 * This has lower priority over the options.minDate, options.maxDate, options.disabledDates and options.enabledDates configuration settings.
+	 * Emits:
+	 * - dp.change - if the currently selected moment falls in the values passed on the daysOfWeek parameter.
+	 * - dp.error - if the currently selected moment falls in the values passed on the daysOfWeek parameter.
+	 */
+	daysOfWeekDisabled(days: Array<number>): void;
+	/**Returns the options.dayViewHeaderFormat option. */
+	dayViewHeaderFormat(): string;
+	/**Used to customize the header of the day view. */
+	dayViewHeaderFormat(value: string): void;
+	/**Returns a moment with the options.defaultDate option configuration or false if not set */
+	defaultDate(): moment.Moment | boolean;
+	/**Will set the picker's inital date.
+	 * If a boolean:false value is passed the options.defaultDate parameter is cleared.
+	 * Throws:
+	 * - TypeError - if the provided date doesn't pass validation, including disabledDates, enabledDates, minDate, maxDate, and daysOfWeekDisabled
+	 * - TypeError - if the provided date cannot be parsed by momentjs
+	 */
+	defaultDate(date: string | Date | moment.Moment | boolean): void;
+	/**Returns the options.disabledDates option.
+	 * NOTES: probably should be: disabledDates(): boolean | Array<moment.Moment>; see: DatetimepickerOptions
+	*/
+	disabledDates(): boolean | any;
+	/**Takes an array of values and disallows the user to select those days.
+	 * Setting this takes precedence over options.minDate, options.maxDate configuration.
+	 * Also calling this function removes the configuration of options.enabledDates if such exist.
+	 * Note: These values are matched with Day granularity.
+	 */
+	disabledDates(dates: boolean | Array<string | Date | moment.Moment>): void;
+	/**Returns the options.disabledHours option.
+	 * NOTES: probably should be: disabledHours(): boolean | Array<number>; see: DatetimepickerOptions
+	*/
+	disabledHours(): boolean | any;
+	/**Must be in 24 hour format. Will disallow hour selections (much like disabledTimeIntervals) but will affect all days.
+	 * Like en/disabledDates, the en/disabledHours options are mutually exclusive and will reset one of the options back to false. */
+	disabledHours(value: boolean | Array<number>): void;
+	/**Returns the options.disabledTimeIntervals option, or... not exactly
+	 * IMPORTANT! Creates an object from the options.disabledTimeIntervals with the keys being numbers, the values being the moment arrays.
+	 * eg { "0": [<moment.Moment1>, <moment.Moment2>], "1": [...] }
+	 * https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1498
+	 */
+	disabledTimeIntervals(): boolean | Array<Array<moment.Moment>>;
+	/**Disables time selection between the given moments
+	 * eg: [[moment({ h: 0 }), moment({ h: 8 })], [moment({ h: 18 }), moment({ h: 24 })]]
+	 */
+	disabledTimeIntervals(value: boolean | Array<Array<moment.Moment>>): void;
+	/**Returns the options.enabledDates option
+	 * NOTES: probably should be: enabledDates(): boolean | Array<moment.Moment>; see: DatetimepickerOptions
+	*/
+	enabledDates(): boolean | any;
+	/**Takes an array of values and allows the user to select only from those days.
+	 * Setting this takes precedence over options.minDate, options.maxDate configuration.
+	 * Also calling this function removes the configuration of options.disabledDates if such exist.
+	 * Note: These values are matched with Day granularity.
+	 */
+	enabledDates(dates: boolean | Array<string | Date | moment.Moment>): void;
+	/**Returns the options.enabledHours option.
+	 * NOTES: probably should be: enabledHours(): boolean | Array<number>; see: DatetimepickerOptions
+	*/
+	enabledHours(): boolean | any;
+	/**Must be in 24 hour format. Will allow hour selections (much like enabledTimeIntervals) but will affect all days.
+	 * Like en/disabledDates, the en/disabledHours options are mutually exclusive and will reset one of the options back to false. */
+	enabledHours(value: boolean | Array<number>): void;
+	/**Returns a boolean or array with the options.extraFormats option configuration */
+	extraFormats(): boolean | Array<string>;
+	/**Takes an array of valid input moment format options, or boolean:false */
+	extraFormats(formats: boolean | Array<string>): void;
+	/**Returns the options.focusOnShow option. */
+	focusOnShow(): boolean;
+	/**If false, the textbox will not be given focus when the picker is shown */
+	focusOnShow(value: boolean): void;
+	/**Returns the component's options.format string */
+	format(): boolean | string;
+	/**Takes a moment.js format string and sets the components options.format.
+	 * This is used for displaying and also for parsing input strings either from the input element the component is attached to or the date() function.
+	 * The parameter can also be a boolean:false in which case the format is set to the locale's L LT.
+	 * Note: this is also used to determine if the TimePicker sub component will display the hours in 12 or 24 format. (if "a" or "h" exists in the passed string then a 12 hour mode is set)
+	 */
+	format(format: boolean | string): void;
+	/**Returns options.icons */
+	icons(): Icons;
+	/**Takes an Object of strings.
+	 * Throws:
+	 * - TypeError - if icons parameter is not an Object
+	 */
+	icons(icons: Icons): void;
+	/**Returns the options.ignoreReadonly option. */
+	ignoreReadonly(): boolean;
+	/**Set this to true to allow the picker to be used even if the input field is readonly. This will not bypass the disabled property */
+	ignoreReadonly(value: boolean): void;
+	/**Returns the options.inline option. */
+	inline(): boolean;
+	/**Used to customize the header of the day view. */
+	inline(value: boolean): void;
+	/**Returns the options.keepInvalid option. */
+	keepInvalid(): boolean;
+	/**If true, invalid dates will not be reverted to a previous selection or changed. */
+	keepInvalid(value: boolean): void;
+	/**Returns a string variable with the currently set options.keyBinds option. */
+	keyBinds(): any;
+	/**Allows for several keyBinding functions to be specified for ease of access or accessibility. For defaults see {@link http://eonasdan.github.io/bootstrap-datetimepicker/Options/#keybinds}.
+	*/
+	keyBinds(value: any): void;
+	/**Returns the currently set locale of the options.locale */
+	locale(): string;
+	/**Takes a string of any valid moment locale e.g. de for German.
+	 * Throws:
+	 * - TypeError - if the locale is not loaded via a separate script or moment-with-locale
+	 */
+	locale(newLocale: string): void;
+	/**Returns the currently set moment of the options.maxDate or false if not set */
+	maxDate(): moment.Moment | boolean;
+	/**Takes a parameter and disallows the user to select a moment that is after that moment.
+	 * If a boolean:false value is passed options.maxDate is cleared and there is no restriction to the maximum moment the user can select.
+	 * Note: If the parameter is before the currently selected moment the currently selected moment changes to maxDate
+	 * Throws:
+	 * - TypeError - if the parameter cannot be parsed using the options.format and options.useStrict configuration settings
+	 * - TypeError - if the parameter is before options.minDate
+	 *
+	 * Emits:
+	 * - dp.change - if the new maxDate is after currently selected moment
+	 * - dp.error - if the new maxDate is after currently selected moment
+	 */
+	maxDate(date: moment.Moment | Date | string | boolean): void;
+	/**Returns the currently set moment of the options.minDate or false if not set */
+	minDate(): moment.Moment | boolean;
+	/**Takes a parameter and disallows the user to select a moment that is before that moment.
+	 * If a boolean:false value is passed the options.minDate parameter is cleared and there is no restriction to the miminum moment the user can select.
+	 * Note: If the parameter is after the currently selected moment the currently selected moment changes to minDate parameter
+	 * Throws:
+	 * - TypeError - if the parameter cannot be parsed using the options.format and options.useStrict configuration settings
+	 * - TypeError - if the parameter is after options.maxDate
+	 *
+	 * Emits:
+	 * - dp.change - if the new minDate is after currently selected moment
+	 * - dp.error - if the new minDate is after currently selected moment
+	 */
+	minDate(date: moment.Moment | Date | string | boolean): void;
+	/**Returns the options.parseInputDate option */
+	parseInputDate(): Function;
+	/**Allows custom input formatting For example: the user can enter "yesterday"" or "30 days ago".
+	 * {@link http://eonasdan.github.io/bootstrap-datetimepicker/Functions/#parseinputdate}
+	 */
+	parseInputDate(value: (input: string) => moment.Moment): void;
+	/**Returns the options.showClear option. */
+	showClear(): boolean;
+	/**Set if the clear date button will appear on the widget */
+	showClear(value: boolean): void;
+	/**Returns the options.showClose option. */
+	showClose(): boolean;
+	/**If true, an icon will be displayed on the toolbar that will hide the picker */
+	showClose(value: boolean): void;
+	/**Returns the options.showTodayButton option. */
+	showTodayButton(): boolean;
+	/**Set if the Today button will appear on the widget */
+	showTodayButton(value: boolean): void;
+	/**Returns a boolean of the options.sideBySide. */
+	sideBySide(): boolean;
+	/**If sideBySide is true and the time picker is used, both components will display side by side instead of collapsing. */
+	sideBySide(value: boolean): void;
+	/**Returns a number with the options.stepping option configuration */
+	stepping(): number;
+	/**This will be the amount the up/down arrows move the minute value with a time picker. */
+	stepping(step: number): void;
+	/**Returns the options.toolbarplacement option. */
+	toolbarPlacement(): string;
+	/**Changes the placement of the toolbar where the today, clear, component switch icon are located.
+	 * See valid values at DatetimepickerOptions.toolbarplacement
+	 * Throws:
+	 * - TypeError if the parameter is not a valid value
+	 */
+	toolbarPlacement(value: string): void;
+	/**Returns the options.tooltips option */
+	tooltips(): Tooltips;
+	/**Sets the tooltips for icons.
+	 * Throws:
+	 * - TypeError - if tooltips parameter is not an Object
+	 */
+	tooltips(value: Tooltips): void;
+	/**Returns the options.useCurrent option configuration */
+	useCurrent(): boolean | string;
+	/**Takes a boolean or string.
+	 * If a boolean true is passed and the components model moment is not set (either through setDate or through a valid value on the input element the component is attached to) then the first time the user opens the datetimepicker widget the value is initialized to the current moment of the action.
+	 * If a false boolean is passed then no initialization happens on the input element.
+	 * You can select the granularity on the initialized moment by passing one of the following strings ("year", "month", "day", "hour", "minute") in the variable.
+	 * If for example you pass "day" to the useCurrent function and the input field is empty the first time the user opens the datetimepicker widget the input text will be initialized to the current datetime with day granularity (ie if currentTime = 2014-08-10 13:32:33 the input value will be initialized to 2014-08-10 00:00:00)
+	 * Note: If the options.defaultDate is set or the input element the component is attached to has already a value that takes precedence and the functionality of useCurrent is not triggered!
+	 */
+	useCurrent(value: boolean | string): void;
+	/**Returns the options.useStrict */
+	useStrict(): boolean;
+	/**If useStrict is true, momentjs parsing rules will be stricter when determining if a date is valid or not. */
+	useStrict(value: boolean): void;
+	/**Returns the options.viewDate option. */
+	viewDate(): boolean | moment.Moment;
+	/**This will change the viewDate without changing or setting the selected date. */
+	viewDate(value: string | Date | moment.Moment | boolean): void;
+	/**Returns the options.viewMode. */
+	viewMode(): string;
+	/**Takes a string. See valid values at DatetimepickerOptions.viewMode
+	 * Throws:
+	 * - TypeError - if the parameter is not a string or not a valid value
+	 */
+	viewMode(value: string): void;
+	/**Returns the options.widgetPositioning object */
+	widgetPositioning(): WidgetPositioningOptions;
+	/**WidgetPositioning defines where the dropdown with the widget will appear relative to the input element the component is attached to.
+	 * "auto" is the default value for both horizontal and vertical keys and it tries to automatically place the dropdown in a position that is visible to the user.
+	 * Usually you should not override those options unless you have a special need in your layout.
+	 */
+	widgetPositioning(value: WidgetPositioningOptions): void;
+}
+
+export interface DatetimepickerOptions {
+	/**If true, the picker will show on textbox focus and icon click when used in a button group
+	 * @default: false
+	 */
+	allowInputToggle?: boolean;
+	/**Shows the week of the year to the left of first day of the week.
+	 * @default: false
+	 */
+    calendarWeeks?: boolean;
+	/**Using a Bootstraps collapse to switch between date/time pickers.
+	 * @default: true
+	 */
+    collapse?: boolean;
+	/**Disables the section of days of the week, e.g. weekends.
+	 * Accepts: array of numbers from 0-6
+	 * @default: false
+	 */
+    daysOfWeekDisabled?: Array<number> | boolean;
+	/**Changes the heading of the datepicker when in "days" view.
+	 * @default: "MMMM YYYY"
+	 */
+	dayViewHeaderFormat?: string;
+	/**Will cause the date picker to stay open after a blur event.
+	 * @default: false
+	 */
+	debug?: boolean;
+	/**Sets the picker default date/time. Overrides useCurrent
+	 * @default: false
+	 */
+    defaultDate?: boolean | moment.Moment | Date | string;
+	/**Disables selection of dates in the array, e.g. holidays
+	 * @default: false
+	 * IMPORTANT! The getter returns an Object NOT an Array, with keys being the dates, values being true.
+	 * eg disabledDates = ["2010-10-10"]; -> disabledDated will be { "2010-01-01": true }
+	 * https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1499
+	 */
+    disabledDates?: boolean | Array<moment.Moment | Date | string> | any;
+	/**Will allow or disallow hour selections (much like disabledTimeIntervals) but will affect all days
+	 * @default: false
+	 * IMPORTANT! The getter returns an Object NOT an Array, with keys being the hours, values being true.
+	 * eg disabledHours = [0, 1]; -> disabledHours will be { "0": true, "1": true }
+	 * https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1499
+	 */
+	disabledHours?: boolean | Array<number> | any;
+	/**Disables time selection between the given moments
+	 * eg: [[moment({ h: 0 }), moment({ h: 8 })], [moment({ h: 18 }), moment({ h: 24 })]]
+	 * @default: false
+	 */
+	disabledTimeIntervals?: boolean | Array<Array<moment.Moment>>;
+	/**Disables selection of dates NOT in the array, e.g. holidays
+	 * @default: false
+	 * IMPORTANT! The getter returns an Object NOT an Array, with keys being the dates, values being true.
+	 * eg enabledDates = ["2010-10-10"]; -> enabledDated will be { "2010-01-01": true }
+	 * https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1499
+	 */
+    enabledDates?: boolean | Array<moment.Moment | Date | string> | any;
+	/**Will allow or disallow hour selections (much like disabledTimeIntervals) but will affect all days
+	 * @default: false
+	 * IMPORTANT! The getter returns an Object NOT an Array, with keys being the hours, values being true.
+	 * eg enabledHours = [0, 1]; -> enabledHours will be { "0": true, "1": true }
+	 * https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1499
+	 */
+	enabledHours?: boolean | Array<number>;
+	/**Allows for several input formats to be valid. See: https://github.com/Eonasdan/bootstrap-datetimepicker/pull/666
+	 * @default: false
+	 */
+	extraFormats?: boolean | Array<string>;
+	/**If false, the textbox will not be given focus when the picker is shown
+	 * @default: true
+	 */
+	focusOnShow?: boolean;
+	/**See momentjs' docs for valid formats. Format also dictates what components are shown, e.g. MM/dd/YYYY will not display the time picker.
+	 * @default: false
+	 */
+    format?: boolean | string;
+	/**Change the default icons for the pickers functions. */
+    icons?: Icons;
+	/**Allow date picker show event to fire even when the associated input element has the readonly="readonly"property.
+	 * @default: false
+	 */
+    ignoreReadonly?: boolean;
+	/**Will display the picker inline without the need of a input field. This will also hide borders and shadows.
+	 * @default: false
+	 */
+    inline?: boolean;
+	/**Allows for custom events to fire on keyboard press.
+	 * eg: keybinds: {
+	 * 		up: (widget) => console.log(widget),
+	 * 		"control up": (widget) => console.log(widget)
+	 * }
+	 * The widget parameter is false, if the datepicker is closed.
+	 */
+	keyBinds?: { [key: string]: (widget: boolean | JQuery) => void };
+	/**Will cause the date picker to not revert or overwrite invalid dates.
+	 * @default: false
+	 */
+	keepInvalid?: boolean;
+	/**Will cause the date picker to stay open after selecting a date if no time components are being used.
+	 * @default: false
+	 */
+	keepOpen?: boolean;
+	/**See momentjs for valid locales. You must include moment-with-locales.js or a local js file.
+	 * @default: moment.locale()
+	 */
+    locale?: string;
+	/**Prevents date/time selections after this date.
+	 * maxDate will override defaultDate and useCurrent if either of these settings are the same day since both options are invalid according to the rules you've selected.
+	 * @default: false
+	 */
+    maxDate?: boolean | moment.Moment | Date | string;
+	/**Prevents date/time selections before this date.
+	 * minDate will override defaultDate and useCurrent if either of these settings are the same day since both options are invalid according to the rules you've selected.
+	 * @default: false
+	 */
+    minDate?: boolean | moment.Moment | Date | string;
+	/**Allows custom input formatting For example: the user can enter "yesterday"" or "30 days ago".
+	 * {@link http://eonasdan.github.io/bootstrap-datetimepicker/Functions/#parseinputdate}
+	 */
+	parseInputDate?: (input: string) => moment.Moment;
+	/**Show the "Clear" button in the icon toolbar.
+	 * Clicking the "Clear" button will set the calendar to null.
+	 * @default: false
+	 */
+    showClear?: boolean;
+	/**Show the "Close" button in the icon toolbar.
+	 * Clicking the "Close" button will call hide()
+	 * @default: false
+	 */
+	showClose?: boolean;
+	/**Show the "Today" button in the icon toolbar.
+	 * Clicking the "Today" button will set the calendar view and set the date to now.
+	 * @default: false
+	 */
+    showTodayButton?: boolean;
+	/**Shows the picker side by side when using the time and date together.
+	 * @default: false
+	 */
+    sideBySide?: boolean;
+	/**Number of minutes the up/down arrow's will move the minutes value in the time picker
+	 * @default: 1
+	 */
+	stepping?: number;
+	/**Changes the placement of the icon toolbar.
+	 * @default: "default"
+	 */
+    toolbarPlacement?: "default" | "top" | "bottom";
+	/**This will change the tooltips over each icon to a custom string */
+	tooltips?: Tooltips;
+	/**On show, will set the picker to the current date/time
+	 * @default: true
+	 */
+    useCurrent?: boolean;
+	/**Defines if moment should use strict date parsing when considering a date to be valid
+	 * @default: false
+	 */
+    useStrict?: boolean;
+	/**This will change the viewDate without changing or setting the selected date.
+	 * @default: false
+	 */
+	viewDate?: boolean | moment.Moment | Date | string;
+	/**The default view to display when the picker is shown.
+	 * Note: To limit the picker to selecting, for instance the year and month, use format: MM/YYYY
+	 * @default: "days"
+	 */
+    viewMode?: "decades" | "years" | "months" | "days";
+	/**On picker show, places the widget at the identifier (string) or jQuery object if the element has css position: "relative"
+	 * @default: null
+	 */
+	widgetParent?: string | JQuery;
+	widgetPositioning?: WidgetPositioningOptions;
+}
+
+export interface Icons {
+	/**default: "glyphicon glyphicon-trash" */
+	clear?: string;
+	/**default: "glyphicon glyphicon-remove" */
+	close?: string;
+	/**default: "glyphicon glyphicon-calendar" */
+	date?: string;
+	/**default: "glyphicon glyphicon-time" */
+	down?: string;
+	/**default: "glyphicon glyphicon-chevron-left" */
+	next?: string;
+	/**default: "glyphicon glyphicon-screenshot" */
+	previous?: string;
+	/**default: "glyphicon glyphicon-chevron-right" */
+    time?: string;
+	/**default: "glyphicon glyphicon-chevron-down" */
+	today?: string;
+	/**default: "glyphicon glyphicon-chevron-up" */
+	up?: string;
+}
+
+export interface Tooltips {
+	today?: string;
+	clear?: string;
+	close?: string;
+	selectMonth?: string;
+	prevMonth?: string;
+	nextMonth?: string;
+	selectYear?: string;
+	prevYear?: string;
+	nextYear?: string;
+	selectDecade?: string;
+	prevDecade?: string;
+	nextDecade?: string;
+	prevCentury?: string;
+	nextCentury?: string;
+	selectTime?: string;
+	pickHour?: string;
+	incrementHour?: string;
+	decrementHour?: string;
+	pickMinute?: string;
+	incrementMinute?: string;
+	decrementMinute?: string;
+	togglePeriod?: string;
+	pickSecond?: string;
+	incrementSecond?: string;
+	decrementSecond?: string;
+}
+
+export interface WidgetPositioningOptions {
+	horizontal?: "auto" | "left" | "right";
+	vertical?: "auto" | "top" | "bottom";
+}
+
+export interface Event extends JQueryEventObject {
+    date: moment.Moment;
+}
+
+export interface ChangeEvent extends Event {
+	/**Previous date. False if the previous date is null. */
+    oldDate: moment.Moment | boolean;
+}
+
+export interface UpdateEvent extends JQueryEventObject {
+	/**Change type as a momentjs format token. e.g. yyyy on year change */
+	change: string;
+	/**New viewDate. */
+	viewDate: moment.Moment;
+}
+
+
+declare global {
+	interface JQuery {
+
+	    datetimepicker(): JQuery;
+	    datetimepicker(options: DatetimepickerOptions): JQuery;
+
+	    data(key: "DateTimePicker"): Datetimepicker;
+
+	    on(events: "dp.change", handler: (eventObject: ChangeEvent) => any): JQuery;
+	    on(events: "dp.change", selector: string, handler: (eventobject: ChangeEvent) => any): JQuery;
+	    on(events: "dp.change", selector: string, data: any, handler?: (eventobject: ChangeEvent) => any): JQuery;
+
+	    off(events: "dp.change", handler: (eventobject: ChangeEvent) => any): JQuery;
+	    off(events: "dp.change", selector?: string, handler?: (eventobject: ChangeEvent) => any): JQuery;
+
+
+	    on(events: "dp.show", handler: (eventObject: Event) => any): JQuery;
+	    on(events: "dp.show", selector: string, handler: (eventobject: Event) => any): JQuery;
+	    on(events: "dp.show", selector: string, data: any, handler?: (eventobject: Event) => any): JQuery;
+
+	    off(events: "dp.show", handler: (eventobject: Event) => any): JQuery;
+	    off(events: "dp.show", selector?: string, handler?: (eventobject: Event) => any): JQuery;
+
+
+	    on(events: "dp.hide", handler: (eventObject: Event) => any): JQuery;
+	    on(events: "dp.hide", selector: string, handler: (eventobject: Event) => any): JQuery;
+	    on(events: "dp.hide", selector: string, data: any, handler?: (eventobject: Event) => any): JQuery;
+
+	    off(events: "dp.hide", handler: (eventobject: Event) => any): JQuery;
+	    off(events: "dp.hide", selector?: string, handler?: (eventobject: Event) => any): JQuery;
+
+
+	    on(events: "dp.error", handler: (eventObject: Event) => any): JQuery;
+	    on(events: "dp.error", selector: string, handler: (eventobject: Event) => any): JQuery;
+	    on(events: "dp.error", selector: string, data: any, handler?: (eventobject: Event) => any): JQuery;
+
+	    off(events: "dp.error", handler: (eventobject: Event) => any): JQuery;
+	    off(events: "dp.error", selector?: string, handler?: (eventobject: Event) => any): JQuery;
+
+
+	    on(events: "dp.update", handler: (eventObject: UpdateEvent) => any): JQuery;
+	    on(events: "dp.update", selector: string, handler: (eventobject: UpdateEvent) => any): JQuery;
+	    on(events: "dp.update", selector: string, data: any, handler?: (eventobject: UpdateEvent) => any): JQuery;
+
+	    off(events: "dp.update", handler: (eventobject: Event) => any): JQuery;
+	    off(events: "dp.update", selector?: string, handler?: (eventobject: UpdateEvent) => any): JQuery;
+	}
+}
diff --git a/bootstrap.v3.datetimepicker/tsconfig.json b/bootstrap.v3.datetimepicker/tsconfig.json
new file mode 100644
index 0000000000..4b93d0b7ae
--- /dev/null
+++ b/bootstrap.v3.datetimepicker/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "bootstrap.v3.datetimepicker-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/bootstrap/bootstrap-tests.ts b/bootstrap/bootstrap-tests.ts
index c497e0abcd..a3633e5d12 100644
--- a/bootstrap/bootstrap-tests.ts
+++ b/bootstrap/bootstrap-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="bootstrap.d.ts" />
+/// <reference types="jquery" />
+
 
 $('body').off('.data-api');
 $('body').off('.alert.data-api');
diff --git a/bootstrap/bootstrap.d.ts b/bootstrap/bootstrap.d.ts
deleted file mode 100644
index b0e8fbf858..0000000000
--- a/bootstrap/bootstrap.d.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-// Type definitions for Bootstrap 3.3.5
-// Project: http://twitter.github.com/bootstrap/
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface ModalOptions {
-    backdrop?: boolean|string;
-    keyboard?: boolean;
-    show?: boolean;
-    remote?: string;
-}
-
-interface ModalOptionsBackdropString {
-    backdrop?: string; // for "static"
-    keyboard?: boolean;
-    show?: boolean;
-    remote?: string;
-}
-
-interface ScrollSpyOptions {
-    offset?: number;
-    target?: string;
-}
-
-interface TooltipOptions {
-    animation?: boolean;
-    html?: boolean;
-    placement?: string | Function;
-    selector?: string;
-    title?: string | Function;
-    trigger?: string;
-    template?: string;
-    delay?: number | Object;
-    container?: string | boolean;
-    viewport?: string | Function | Object;
-}
-
-interface PopoverOptions {
-    animation?: boolean;
-    html?: boolean;
-    placement?: string | Function;
-    selector?: string;
-    trigger?: string;
-    title?: string | Function;
-    template?: string;
-    content?: any;
-    delay?: number | Object;
-    container?: string | boolean;
-    viewport?: string | Function | Object;
-}
-
-interface CollapseOptions {
-    parent?: any;    
-    toggle?: boolean;
-}
-
-interface CarouselOptions {
-    interval?: number;
-    pause?: string;
-    wrap?: boolean;
-    keybord?: boolean;
-}
-
-interface TypeaheadOptions {
-    source?: any;
-    items?: number;
-    minLength?: number;
-    matcher?: (item: any) => boolean;
-    sorter?: (items: any[]) => any[];
-    updater?: (item: any) => any;
-    highlighter?: (item: any) => string;
-}
-
-interface AffixOptions {
-    offset?: number | Function | Object;
-    target?: any;
-}
-
-interface JQuery {
-    modal(options?: ModalOptions): JQuery;
-    modal(options?: ModalOptionsBackdropString): JQuery;
-    modal(command: string): JQuery;
-
-    dropdown(): JQuery;
-    dropdown(command: string): JQuery;
-
-    scrollspy(command: string): JQuery;
-    scrollspy(options?: ScrollSpyOptions): JQuery;
-
-    tab(): JQuery;
-    tab(command: string): JQuery;
-
-    tooltip(options?: TooltipOptions): JQuery;
-    tooltip(command: string): JQuery;
-
-    popover(options?: PopoverOptions): JQuery;
-    popover(command: string): JQuery;
-
-    alert(): JQuery;
-    alert(command: string): JQuery;
-
-    button(): JQuery;
-    button(command: string): JQuery;
-
-    collapse(options?: CollapseOptions): JQuery;
-    collapse(command: string): JQuery;
-
-    carousel(options?: CarouselOptions): JQuery;
-    carousel(command: string): JQuery;
-
-    typeahead(options?: TypeaheadOptions): JQuery;
-
-    affix(options?: AffixOptions): JQuery;
-}
-
-declare module "bootstrap" {
-}
diff --git a/bootstrap/index.d.ts b/bootstrap/index.d.ts
new file mode 100644
index 0000000000..c9c264defa
--- /dev/null
+++ b/bootstrap/index.d.ts
@@ -0,0 +1,120 @@
+// Type definitions for Bootstrap 3.3.5
+// Project: http://twitter.github.com/bootstrap/
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="jquery"/>
+
+interface ModalOptions {
+    backdrop?: boolean|string;
+    keyboard?: boolean;
+    show?: boolean;
+    remote?: string;
+}
+
+interface ModalOptionsBackdropString {
+    backdrop?: string; // for "static"
+    keyboard?: boolean;
+    show?: boolean;
+    remote?: string;
+}
+
+interface ScrollSpyOptions {
+    offset?: number;
+    target?: string;
+}
+
+interface TooltipOptions {
+    animation?: boolean;
+    html?: boolean;
+    placement?: string | Function;
+    selector?: string;
+    title?: string | Function;
+    trigger?: string;
+    template?: string;
+    delay?: number | Object;
+    container?: string | boolean;
+    viewport?: string | Function | Object;
+}
+
+interface PopoverOptions {
+    animation?: boolean;
+    html?: boolean;
+    placement?: string | Function;
+    selector?: string;
+    trigger?: string;
+    title?: string | Function;
+    template?: string;
+    content?: any;
+    delay?: number | Object;
+    container?: string | boolean;
+    viewport?: string | Function | Object;
+}
+
+interface CollapseOptions {
+    parent?: any;    
+    toggle?: boolean;
+}
+
+interface CarouselOptions {
+    interval?: number;
+    pause?: string;
+    wrap?: boolean;
+    keybord?: boolean;
+}
+
+interface TypeaheadOptions {
+    source?: any;
+    items?: number;
+    minLength?: number;
+    matcher?: (item: any) => boolean;
+    sorter?: (items: any[]) => any[];
+    updater?: (item: any) => any;
+    highlighter?: (item: any) => string;
+}
+
+interface AffixOptions {
+    offset?: number | Function | Object;
+    target?: any;
+}
+
+interface JQuery {
+    modal(options?: ModalOptions): JQuery;
+    modal(options?: ModalOptionsBackdropString): JQuery;
+    modal(command: string): JQuery;
+
+    dropdown(): JQuery;
+    dropdown(command: string): JQuery;
+
+    scrollspy(command: string): JQuery;
+    scrollspy(options?: ScrollSpyOptions): JQuery;
+
+    tab(): JQuery;
+    tab(command: string): JQuery;
+
+    tooltip(options?: TooltipOptions): JQuery;
+    tooltip(command: string): JQuery;
+
+    popover(options?: PopoverOptions): JQuery;
+    popover(command: string): JQuery;
+
+    alert(): JQuery;
+    alert(command: string): JQuery;
+
+    button(): JQuery;
+    button(command: string): JQuery;
+
+    collapse(options?: CollapseOptions): JQuery;
+    collapse(command: string): JQuery;
+
+    carousel(options?: CarouselOptions): JQuery;
+    carousel(command: string): JQuery;
+
+    typeahead(options?: TypeaheadOptions): JQuery;
+
+    affix(options?: AffixOptions): JQuery;
+}
+
+declare module "bootstrap" {
+}
diff --git a/bootstrap/tsconfig.json b/bootstrap/tsconfig.json
new file mode 100644
index 0000000000..7202bd75f5
--- /dev/null
+++ b/bootstrap/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bootstrap-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bounce/bounce-tests.ts b/bounce.js/bounce-tests.ts
similarity index 94%
rename from bounce/bounce-tests.ts
rename to bounce.js/bounce-tests.ts
index bd90bfe4c1..afa0cdcae2 100644
--- a/bounce/bounce-tests.ts
+++ b/bounce.js/bounce-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="./bounce.d.ts" />
-/// <reference path="./../jquery/jquery.d.ts" />
+
+
 
 import Bounce from 'bounce.js';
 import * as $ from 'jquery';
diff --git a/bounce.js/index.d.ts b/bounce.js/index.d.ts
new file mode 100644
index 0000000000..250fef1a51
--- /dev/null
+++ b/bounce.js/index.d.ts
@@ -0,0 +1,65 @@
+// Type definitions for Bounce.js v0.8.2
+// Project: http://github.com/tictail/bounce.js
+// Definitions by: Cherry <http://github.com/cherrry>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+
+export default Bounce
+
+interface Point2D {
+    x: number
+    y: number
+}
+
+interface BounceOptions<T> {
+    from: T
+    to: T
+    duration?: number
+    delay?: number
+    easing?: string
+    bounces?: number
+    stiffness?: number
+}
+
+interface AnimationOptions {
+    loop?: boolean
+    remove?: boolean
+    onComplete?: () => void
+}
+
+interface SerailizedComponent<T> {
+    type: string
+    from: T
+    to: T
+    duration: number
+    delay: number
+    easing: string
+    bounces: number
+    stiffness: number
+}
+
+declare class Bounce {
+    static FPS: number
+    static counter: number
+
+    static isSupported(): boolean
+
+    constructor();
+
+    scale(options: BounceOptions<Point2D>): Bounce
+    rotate(options: BounceOptions<number>): Bounce
+    translate(options: BounceOptions<Point2D>): Bounce
+    skew(options: BounceOptions<Point2D>): Bounce
+
+    serialize(): SerailizedComponent<number | Point2D>[]
+    deserialize(serailized: SerailizedComponent<number | Point2D>[]): Bounce
+
+    applyTo(element: Element, options?: AnimationOptions): void
+    applyTo(elements: Element[], options?: AnimationOptions): void
+    applyTo(elements: JQuery, options?: AnimationOptions): JQueryPromise<void>
+
+    define(name: string): Bounce
+    remove(): void
+}
diff --git a/bounce.js/tsconfig.json b/bounce.js/tsconfig.json
new file mode 100644
index 0000000000..8bf7f47534
--- /dev/null
+++ b/bounce.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bounce-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bounce/bounce.d.ts b/bounce/bounce.d.ts
deleted file mode 100644
index 54fe897638..0000000000
--- a/bounce/bounce.d.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-// Type definitions for Bounce.js v0.8.2
-// Project: http://github.com/tictail/bounce.js
-// Definitions by: Cherry <http://github.com/cherrry>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-declare module 'bounce.js' {
-    export default Bounce
-
-    interface Point2D {
-        x: number
-        y: number
-    }
-
-    interface BounceOptions<T> {
-        from: T
-        to: T
-        duration?: number
-        delay?: number
-        easing?: string
-        bounces?: number
-        stiffness?: number
-    }
-
-    interface AnimationOptions {
-        loop?: boolean
-        remove?: boolean
-        onComplete?: () => void
-    }
-
-    interface SerailizedComponent<T> {
-        type: string
-        from: T
-        to: T
-        duration: number
-        delay: number
-        easing: string
-        bounces: number
-        stiffness: number
-    }
-
-    class Bounce {
-        static FPS: number
-        static counter: number
-
-        static isSupported(): boolean
-
-        constructor();
-
-        scale(options: BounceOptions<Point2D>): Bounce
-        rotate(options: BounceOptions<number>): Bounce
-        translate(options: BounceOptions<Point2D>): Bounce
-        skew(options: BounceOptions<Point2D>): Bounce
-
-        serialize(): SerailizedComponent<number|Point2D>[]
-        deserialize(serailized: SerailizedComponent<number|Point2D>[]): Bounce
-
-        applyTo(element: Element, options?: AnimationOptions): void
-        applyTo(elements: Element[], options?: AnimationOptions): void
-        applyTo(elements: JQuery, options?: AnimationOptions): JQueryPromise<void>
-
-        define(name: string): Bounce
-        remove(): void
-    }
-}
diff --git a/bowser/bowser-tests.ts b/bowser/bowser-tests.ts
index 2f7cb8904c..c70ab4da05 100644
--- a/bowser/bowser-tests.ts
+++ b/bowser/bowser-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./bowser.d.ts" />
+
 
 import Bowser = require('bowser');
 
diff --git a/bowser/bowser.d.ts b/bowser/bowser.d.ts
deleted file mode 100644
index 2bf1b3d510..0000000000
--- a/bowser/bowser.d.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-// Type definitions for Bowser 1.x
-// Project: https://github.com/ded/bowser
-// Definitions by: Paulo Cesar <https://github.com/pocesar>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'bowser' {
-    var def: BowserModule.IBowser;
-    export = def;
-}
-
-declare namespace BowserModule {
-
-    export interface IBowserUA {
-        msie: boolean;
-        chrome: boolean;
-        webkit: boolean;
-        phantom: boolean;
-        opera: boolean;
-        safari: boolean;
-        android: boolean;
-        ios: boolean;
-        webos: boolean;
-        msedge: boolean;
-        seamonkey: boolean;
-        firefox: boolean;
-        yandexbrowser: boolean;
-        blackberry: boolean;
-        tablet: boolean;
-        mobile: boolean;
-        silk: boolean;
-        bada: boolean;
-        tizen: boolean;
-        windowsphone: boolean;
-        firefoxos: boolean;
-        gecko: boolean;
-        sailfish: boolean;
-        chromeBook: boolean;
-        /** Grade A browser */
-        a: boolean;
-        /** Grade C browser */
-        c: boolean;
-        /** Grade X browser */
-        x: boolean;
-        name: string;
-        version: string|number;
-        osversion: string|number;
-    }
-
-    export interface IBowser extends IBowserUA {
-        test(browserList: string[]): boolean;
-        _detect(ua: string): IBowser;
-    }
-
-}
diff --git a/bowser/index.d.ts b/bowser/index.d.ts
new file mode 100644
index 0000000000..1a9fa4bf70
--- /dev/null
+++ b/bowser/index.d.ts
@@ -0,0 +1,53 @@
+// Type definitions for Bowser 1.x
+// Project: https://github.com/ded/bowser
+// Definitions by: Paulo Cesar <https://github.com/pocesar>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var def: BowserModule.IBowser;
+export = def;
+export as namespace bowser;
+
+declare namespace BowserModule {
+
+    export interface IBowserUA {
+        msie: boolean;
+        chrome: boolean;
+        webkit: boolean;
+        phantom: boolean;
+        opera: boolean;
+        safari: boolean;
+        android: boolean;
+        ios: boolean;
+        webos: boolean;
+        msedge: boolean;
+        seamonkey: boolean;
+        firefox: boolean;
+        yandexbrowser: boolean;
+        blackberry: boolean;
+        tablet: boolean;
+        mobile: boolean;
+        silk: boolean;
+        bada: boolean;
+        tizen: boolean;
+        windowsphone: boolean;
+        firefoxos: boolean;
+        gecko: boolean;
+        sailfish: boolean;
+        chromeBook: boolean;
+        /** Grade A browser */
+        a: boolean;
+        /** Grade C browser */
+        c: boolean;
+        /** Grade X browser */
+        x: boolean;
+        name: string;
+        version: string|number;
+        osversion: string|number;
+    }
+
+    export interface IBowser extends IBowserUA {
+        test(browserList: string[]): boolean;
+        _detect(ua: string): IBowser;
+    }
+
+}
diff --git a/bowser/tsconfig.json b/bowser/tsconfig.json
new file mode 100644
index 0000000000..da76d06764
--- /dev/null
+++ b/bowser/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bowser-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/box2d/README.md b/box2d/README.md
index 251b20ced4..9a775a1962 100644
--- a/box2d/README.md
+++ b/box2d/README.md
@@ -16,7 +16,7 @@ Import Statements
 Reference the box2dweb.d.ts file in your project and in an appropriate location include the following import statements to reduce the amount of typing you will need to do to acccess deeply nested modules.
 
 ```typescript
-/// <reference path="box2dweb.d.ts" />
+
 
 // Include the following imports, or add more/less, to reduce the module nesting.
 import b2Common = Box2D.Common;
diff --git a/box2d/box2dweb-tests.ts b/box2d/box2dweb-tests.ts
index 5a5f44f24c..776e0df68f 100644
--- a/box2d/box2dweb-tests.ts
+++ b/box2d/box2dweb-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="box2dweb.d.ts" />
+
 
 import b2Common = Box2D.Common;
 import b2Math = Box2D.Common.Math;
diff --git a/box2d/box2dweb.d.ts b/box2d/index.d.ts
similarity index 100%
rename from box2d/box2dweb.d.ts
rename to box2d/index.d.ts
diff --git a/box2d/tsconfig.json b/box2d/tsconfig.json
new file mode 100644
index 0000000000..676c2c42a3
--- /dev/null
+++ b/box2d/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "box2dweb-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/breeze/breeze-tests.ts b/breeze/breeze-tests.ts
index 022f4e3c16..1606e6f591 100644
--- a/breeze/breeze-tests.ts
+++ b/breeze/breeze-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="breeze.d.ts" />
+
 
 import core = breeze.core;
 import config = breeze.config;
@@ -133,7 +133,7 @@ function test_entityManager() {
         metadataStore: metadataStore
     });
 
-    return new breeze.QueryOptions({
+    new breeze.QueryOptions({
         mergeStrategy: null,
         fetchStrategy: this.fetchStrategy
     });
@@ -415,25 +415,25 @@ function test_entityQuery() {
 function test_entityState() {
     var anEntity: breeze.Entity;
     var es = anEntity.entityAspect.entityState;
-    return es.isAdded();
-    return es === breeze.EntityState.Added;
+    es.isAdded();
+    es === breeze.EntityState.Added;
     var es = anEntity.entityAspect.entityState;
-    return es.isAddedModifiedOrDeleted();
-    return es === breeze.EntityState.Added || es === breeze.EntityState.Modified || es === breeze.EntityState.Deleted;
+    es.isAddedModifiedOrDeleted();
+    es === breeze.EntityState.Added || es === breeze.EntityState.Modified || es === breeze.EntityState.Deleted;
     var es = anEntity.entityAspect.entityState;
-    return es.isDeleted();
-    return es === breeze.EntityState.Deleted;
+    es.isDeleted();
+    es === breeze.EntityState.Deleted;
     var es = anEntity.entityAspect.entityState;
-    return es.isDetached();
-    return es === breeze.EntityState.Detached;
+    es.isDetached();
+    es === breeze.EntityState.Detached;
     var es = anEntity.entityAspect.entityState;
-    return es.isModified();
-    return es === breeze.EntityState.Modified;
+    es.isModified();
+    es === breeze.EntityState.Modified;
     var es = anEntity.entityAspect.entityState;
-    return es.isUnchanged();
-    return es === breeze.EntityState.Unchanged;
+    es.isUnchanged();
+    es === breeze.EntityState.Unchanged;
     var es = anEntity.entityAspect.entityState;
-    return es.isUnchangedOrModified();
+    es.isUnchangedOrModified();
 
     return es === breeze.EntityState.Unchanged || es === breeze.EntityState.Modified;
 }
diff --git a/breeze/breeze.d.ts b/breeze/index.d.ts
similarity index 100%
rename from breeze/breeze.d.ts
rename to breeze/index.d.ts
diff --git a/breeze/tsconfig.json b/breeze/tsconfig.json
new file mode 100644
index 0000000000..78821385f8
--- /dev/null
+++ b/breeze/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "breeze-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/brorand/brorand-tests.ts b/brorand/brorand-tests.ts
index 1adb7b1144..ac090e8724 100644
--- a/brorand/brorand-tests.ts
+++ b/brorand/brorand-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./brorand.d.ts" />
 
 import * as brorand from 'brorand';
 
diff --git a/brorand/brorand.d.ts b/brorand/brorand.d.ts
deleted file mode 100644
index efef9baa3f..0000000000
--- a/brorand/brorand.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Type definitions for Brorand v1.0.5
-// Project: https://github.com/indutny/brorand
-// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "brorand" {
-	type rand = {getByte: () => number};
-
-	interface RandStatic {
-		new (rand: rand): RandInstance;
-	}
-
-	interface RandInstance {
-		rand: rand;
-		generate(len: number): Buffer|Uint8Array;
-	}
-
-	interface BrorandStatic {
-		(len: number): Buffer|Uint8Array;
-		Rand: RandStatic;
-	}
-
-	namespace Brorand {}
-
-	let Brorand: BrorandStatic;
-
-	export = Brorand;
-}
diff --git a/brorand/index.d.ts b/brorand/index.d.ts
new file mode 100644
index 0000000000..b7e21ed284
--- /dev/null
+++ b/brorand/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for Brorand v1.0.5
+// Project: https://github.com/indutny/brorand
+// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+type rand = { getByte: () => number };
+
+interface RandStatic {
+    new (rand: rand): RandInstance;
+}
+
+interface RandInstance {
+    rand: rand;
+    generate(len: number): Buffer | Uint8Array;
+}
+
+interface BrorandStatic {
+    (len: number): Buffer | Uint8Array;
+    Rand: RandStatic;
+}
+
+declare namespace Brorand { }
+
+declare let Brorand: BrorandStatic;
+
+export = Brorand;
diff --git a/brorand/tsconfig.json b/brorand/tsconfig.json
new file mode 100644
index 0000000000..cd2bb44f8f
--- /dev/null
+++ b/brorand/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "brorand-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/browser-harness/browser-harness-tests.ts b/browser-harness/browser-harness-tests.ts
index 71001ba9b0..4215c847d0 100644
--- a/browser-harness/browser-harness-tests.ts
+++ b/browser-harness/browser-harness-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./browser-harness.d.ts" />
 
 import harness = require('browser-harness');
 
diff --git a/browser-harness/browser-harness-tests.ts.tscparams b/browser-harness/browser-harness-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/browser-harness/browser-harness-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/browser-harness/browser-harness.d.ts b/browser-harness/browser-harness.d.ts
deleted file mode 100644
index c57311b1f8..0000000000
--- a/browser-harness/browser-harness.d.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-// Type definitions for Browser Harness
-// Project: https://github.com/scriby/browser-harness
-// Definitions by: Chris Scribner <https://github.com/scriby>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "browser-harness" {
-    import _events = require('events');
-
-    interface HarnessEvents extends _events.EventEmitter {
-        once(event: string, listener: (driver: Driver) => void): this;
-        once(event: 'ready', listener: (driver: Driver) => void): this;
-
-        on(event: string, listener: (driver: Driver) => void): this;
-        on(event: 'ready', listener: (driver: Driver) => void): this;
-    }
-
-    interface DriverEvents extends _events.EventEmitter {
-        once(event: string, listener: (text: string) => void): this;
-        once(event: 'console.log', listener: (text: string) => void): this;
-        once(event: 'console.warn', listener: (text: string) => void): this;
-        once(event: 'console.error', listener: (text: string) => void): this;
-        once(event: 'window.onerror', listener: (text: string) => void): this;
-
-        on(event: string, listener: (text: string) => void): this;
-        on(event: 'console.log', listener: (text: string) => void): this;
-        on(event: 'console.warn', listener: (text: string) => void): this;
-        on(event: 'console.error', listener: (text: string) => void): this;
-        on(event: 'window.onerror', listener: (text: string) => void): this;
-    }
-
-    export interface Driver {
-        exec(args: { func: Function; args?: any[]}, callback?: Function) : any;
-        exec(func: Function, callback?: Function) : any;
-
-        setUrl(url: string, callback?: Function);
-
-        waitFor(args: { condition: Function; exec?: Function; timeoutMS?: number }, callback?: Function);
-        waitFor(condition: Function, callback?: Function);
-
-        findElement(selector: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy;
-        findElements(selector: string, callback?: (err: Error, elements: ElementProxy) => void): ElementProxy;
-
-        findVisible(selector: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy;
-        findVisibles(selector: string, callback?: (err: Error, elements: ElementProxy) => void): ElementProxy;
-        find(selector: string, callback?: (err: Error, elements: ElementProxy) => void): ElementProxy;
-
-        events: DriverEvents;
-    }
-
-    export interface ElementProxy {
-        click(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        focus(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        blur(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        val(value?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        attr(name: string, value?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        removeAttr(name: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        prop(name: string, value?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        removeProp(name: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        html(value?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        text(value?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        hasClass(className: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        addClass(className: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        removeClass(className: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        toggleClass(className: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-
-        trigger(event: string, extraParameters?: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        triggerHandler(event: string, extraParameters?: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-
-        css(name: string, value?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        height(value?: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        innerHeight(value?: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        outerHeight(value?: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        width(value?: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        innerWidth(value?: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        outerWidth(value?: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        offset(value?: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        position(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        scrollLeft(value?: number, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        scrollTop(value?: number, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-
-        hide(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        show(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        toggle(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-
-        children(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        closest(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        contents(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        find(selector: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        findElements(selector: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        findElement(selector: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        findVisible(selector: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        findVisibles(selector: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        isActionable(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        first(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        has(arg: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        is(arg: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        last(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        next(selector?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        nextAll(selector?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        nextUntil(selector?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        offsetParent(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        parent(selector?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        parents(selector?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        parentsUntil(selector?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        prev(selector?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        prevAll(selector?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        prevUntil(selector?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        siblings(selector?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-
-
-        data(name: string, value?: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        removeData(name: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-
-        filter(selector: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-    }
-
-    export class Browser {
-        //constructor(args: { type: string; location?: string; args?: string[] });
-        constructor(args: { type: string; location?: string; args?: any; });
-
-        open(harnessUrl: string, serverUrl?: string);
-        close();
-    }
-
-    export function listen(port: number, callback?: Function)
-    export var events: HarnessEvents;
-    export var config: {
-        timeoutMS: number;
-        retryMS: number;
-    };
-}
diff --git a/browser-harness/browser-harness.d.ts.tscparams b/browser-harness/browser-harness.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/browser-harness/browser-harness.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/browser-harness/index.d.ts b/browser-harness/index.d.ts
new file mode 100644
index 0000000000..d2c49be3e9
--- /dev/null
+++ b/browser-harness/index.d.ts
@@ -0,0 +1,132 @@
+// Type definitions for Browser Harness
+// Project: https://github.com/scriby/browser-harness
+// Definitions by: Chris Scribner <https://github.com/scriby>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import _events = require('events');
+
+interface HarnessEvents extends _events.EventEmitter {
+    once(event: string, listener: (driver: Driver) => void): this;
+    once(event: 'ready', listener: (driver: Driver) => void): this;
+
+    on(event: string, listener: (driver: Driver) => void): this;
+    on(event: 'ready', listener: (driver: Driver) => void): this;
+}
+
+interface DriverEvents extends _events.EventEmitter {
+    once(event: string, listener: (text: string) => void): this;
+    once(event: 'console.log', listener: (text: string) => void): this;
+    once(event: 'console.warn', listener: (text: string) => void): this;
+    once(event: 'console.error', listener: (text: string) => void): this;
+    once(event: 'window.onerror', listener: (text: string) => void): this;
+
+    on(event: string, listener: (text: string) => void): this;
+    on(event: 'console.log', listener: (text: string) => void): this;
+    on(event: 'console.warn', listener: (text: string) => void): this;
+    on(event: 'console.error', listener: (text: string) => void): this;
+    on(event: 'window.onerror', listener: (text: string) => void): this;
+}
+
+export interface Driver {
+    exec(args: { func: Function; args?: any[] }, callback?: Function): any;
+    exec(func: Function, callback?: Function): any;
+
+    setUrl(url: string, callback?: Function);
+
+    waitFor(args: { condition: Function; exec?: Function; timeoutMS?: number }, callback?: Function);
+    waitFor(condition: Function, callback?: Function);
+
+    findElement(selector: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy;
+    findElements(selector: string, callback?: (err: Error, elements: ElementProxy) => void): ElementProxy;
+
+    findVisible(selector: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy;
+    findVisibles(selector: string, callback?: (err: Error, elements: ElementProxy) => void): ElementProxy;
+    find(selector: string, callback?: (err: Error, elements: ElementProxy) => void): ElementProxy;
+
+    events: DriverEvents;
+}
+
+export interface ElementProxy {
+    click(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    focus(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    blur(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    val(value?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    attr(name: string, value?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    removeAttr(name: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    prop(name: string, value?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    removeProp(name: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    html(value?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    text(value?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    hasClass(className: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    addClass(className: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    removeClass(className: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    toggleClass(className: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+
+    trigger(event: string, extraParameters?: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    triggerHandler(event: string, extraParameters?: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+
+    css(name: string, value?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    height(value?: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    innerHeight(value?: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    outerHeight(value?: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    width(value?: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    innerWidth(value?: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    outerWidth(value?: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    offset(value?: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    position(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    scrollLeft(value?: number, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    scrollTop(value?: number, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+
+    hide(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    show(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    toggle(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+
+    children(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    closest(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    contents(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    find(selector: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    findElements(selector: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    findElement(selector: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    findVisible(selector: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    findVisibles(selector: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    isActionable(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    first(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    has(arg: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    is(arg: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    last(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    next(selector?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    nextAll(selector?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    nextUntil(selector?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    offsetParent(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    parent(selector?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    parents(selector?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    parentsUntil(selector?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    prev(selector?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    prevAll(selector?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    prevUntil(selector?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    siblings(selector?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+
+
+    data(name: string, value?: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    removeData(name: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+
+    filter(selector: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+}
+
+export declare class Browser {
+    //constructor(args: { type: string; location?: string; args?: string[] });
+    constructor(args: { type: string; location?: string; args?: any; });
+
+    open(harnessUrl: string, serverUrl?: string);
+    close();
+}
+
+export declare function listen(port: number, callback?: Function)
+export declare var events: HarnessEvents;
+export declare var config: {
+    timeoutMS: number;
+    retryMS: number;
+};
diff --git a/browser-harness/tsconfig.json b/browser-harness/tsconfig.json
new file mode 100644
index 0000000000..a0732be20a
--- /dev/null
+++ b/browser-harness/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "browser-harness-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/browser-sync/browser-sync-tests.ts b/browser-sync/browser-sync-tests.ts
index 822c941d9f..45cfd11c30 100644
--- a/browser-sync/browser-sync-tests.ts
+++ b/browser-sync/browser-sync-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./browser-sync.d.ts"/>
 import browserSync = require("browser-sync");
 
 (() => {
diff --git a/browser-sync/browser-sync.d.ts b/browser-sync/browser-sync.d.ts
deleted file mode 100644
index 3bc083d1f1..0000000000
--- a/browser-sync/browser-sync.d.ts
+++ /dev/null
@@ -1,422 +0,0 @@
-// Type definitions for browser-sync
-// Project: http://www.browsersync.io/
-// Definitions by: Asana <https://asana.com>, Joe Skeen <http://github.com/joeskeen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../chokidar/chokidar.d.ts"/>
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../micromatch/micromatch.d.ts" />
-
-declare module "browser-sync" {
-    import chokidar = require("chokidar");
-    import fs = require("fs");
-    import http = require("http");
-    import mm = require("micromatch");
-
-    namespace browserSync {
-        interface Options {
-            /**
-             * Browsersync includes a user-interface that is accessed via a separate port. The UI allows to controls
-             * all devices, push sync updates and much more.
-             *
-             * port - Default: 3001
-             * weinre.port - Default: 8080
-             * Note: requires at least version 2.0.0
-             */
-            ui?: UIOptions;
-            /**
-             * Browsersync can watch your files as you work. Changes you make will either be injected into the page (CSS
-             * & images) or will cause all browsers to do a full-page refresh. See anymatch for more information on glob
-             * patterns.
-             * Default: false
-             */
-            files?: string | string[];
-            /**
-             * File watching options that get passed along to Chokidar. Check their docs for available options
-             * Default: undefined
-             * Note: requires at least version 2.6.0
-             */
-            watchOptions?: chokidar.WatchOptions;
-            /**
-             * Use the built-in static server for basic HTML/JS/CSS websites.
-             * Default: false
-             */
-            server?: ServerOptions;
-            /**
-             * Proxy an EXISTING vhost. Browsersync will wrap your vhost with a proxy URL to view your site.
-             * target - Default: undefined
-             * ws - Default: undefined
-             * middleware - Default: undefined
-             * reqHeaders - Default: undefined
-             * proxyRes - Default: undefined
-             */
-            proxy?: string | boolean | ProxyOptions;
-            /**
-             * Use a specific port (instead of the one auto-detected by Browsersync)
-             * Default: 3000
-             */
-            port?: number;
-            /**
-             * Add additional directories from which static files should be served.
-             * Should only be used in proxy or snippet mode.
-             * Default: []
-             * Note: requires at least version 2.8.0
-             */
-            serveStatic?: string[];
-            /**
-             * Enable https for localhost development.
-             * Note - this is not needed for proxy option as it will be inferred from your target url.
-             * Note: requires at least version 1.3.0
-             */
-            https?: boolean;
-            /**
-             * Clicks, Scrolls & Form inputs on any device will be mirrored to all others.
-             * clicks - Default: true
-             * scroll - Default: true
-             * forms - Default: true
-             */
-            ghostMode?: GhostOptions | boolean;
-            /**
-             * Can be either "info", "debug", "warn", or "silent"
-             * Default: info
-             */
-            logLevel?: string;
-            /**
-             * Change the console logging prefix. Useful if you're creating your own project based on Browsersync
-             * Default: BS
-             * Note: requires at least version 1.5.1
-             */
-            logPrefix?: string;
-            /**
-             * Whether or not to log connections
-             * Default: false
-             */
-            logConnections?: boolean;
-            /**
-             * Whether or not to log information about changed files
-             * Default: false
-             */
-            logFileChanges?: boolean;
-            /**
-             * Log the snippet to the console when you're in snippet mode (no proxy/server)
-             * Default: true
-             * Note: requires at least version 1.5.2
-             */
-            logSnippet?: boolean;
-            /**
-             * You can control how the snippet is injected onto each page via a custom regex + function.
-             * You can also provide patterns for certain urls that should be ignored from the snippet injection.
-             * Note: requires at least version 2.0.0
-             */
-            snippetOptions?: SnippetOptions;
-            /**
-             * Add additional HTML rewriting rules.
-             * Default: false
-             * Note: requires at least version 2.4.0
-             */
-            rewriteRules?: boolean | RewriteRules[];
-            /**
-             * Tunnel the Browsersync server through a random Public URL
-             * Default: null
-             */
-            tunnel?: string | boolean;
-            /**
-             * Some features of Browsersync (such as xip & tunnel) require an internet connection, but if you're
-             * working offline, you can reduce start-up time by setting this option to false
-             */
-            online?: boolean;
-            /**
-             * Default: true
-             * Decide which URL to open automatically when Browsersync starts. Defaults to "local" if none set.
-             * Can be true, local, external, ui, ui-external, tunnel or false
-             */
-            open?: string | boolean;
-            /**
-             * The browser(s) to open
-             * Default: default
-             */
-            browser?: string | string[];
-            /**
-             * Requires an internet connection - useful for services such as Typekit as it allows you to configure
-             * domains such as *.xip.io in your kit settings
-             * Default: false
-             */
-            xip?: boolean;
-            /**
-             * Reload each browser when Browsersync is restarted.
-             * Default: false
-             */
-            reloadOnRestart?: boolean;
-            /**
-             * The small pop-over notifications in the browser are not always needed/wanted.
-             * Default: true
-             */
-            notify?: boolean;
-            /**
-             * scrollProportionally: false // Sync viewports to TOP position
-             * Default: true
-             */
-            scrollProportionally?: boolean;
-            /**
-             * How often to send scroll events
-             * Default: 0
-             */
-            scrollThrottle?: number;
-            /**
-             * Decide which technique should be used to restore scroll position following a reload.
-             * Can be window.name or cookie
-             * Default: 'window.name'
-             */
-            scrollRestoreTechnique?: string;
-            /**
-             * Sync the scroll position of any element on the page. Add any amount of CSS selectors
-             * Default: []
-             * Note: requires at least version 2.9.0
-             */
-            scrollElements?: string[];
-            /**
-             * Default: []
-             * Note: requires at least version 2.9.0
-             * Sync the scroll position of any element on the page - where any scrolled element will cause
-             * all others to match scroll position. This is helpful when a breakpoint alters which element
-             * is actually scrolling
-             */
-            scrollElementMapping?: string[];
-            /**
-             * Time, in milliseconds, to wait before instructing the browser to reload/inject following a file
-             * change event
-             * Default: 0
-             */
-            reloadDelay?: number;
-            /**
-             * Restrict the frequency in which browser:reload events can be emitted to connected clients
-             * Default: 0
-             * Note: requires at least version 2.6.0
-             */
-            reloadDebounce?: number;
-            /**
-             * User provided plugins
-             * Default: []
-             * Note: requires at least version 2.6.0
-             */
-            plugins?: any[];
-            /**
-             * Whether to inject changes (rather than a page refresh)
-             * Default: true
-             */
-            injectChanges?: boolean;
-            /**
-             * The initial path to load
-             */
-            startPath?: string;
-            /**
-             * Whether to minify the client script
-             * Default: true
-             */
-            minify?: boolean;
-            /**
-             * Override host detection if you know the correct IP to use
-             */
-            host?: string;
-            /**
-             * Send file-change events to the browser
-             * Default: true
-             */
-            codeSync?: boolean;
-            /**
-             * Append timestamps to injected files
-             * Default: true
-             */
-            timestamps?: boolean;
-            /**
-             * Alter the script path for complete control over where the Browsersync Javascript is served
-             * from. Whatever you return from this function will be used as the script path.
-             * Note: requires at least version 1.5.0
-             */
-            scriptPath?: (path: string) => string;
-            /**
-             * Configure the Socket.IO path and namespace & domain to avoid collisions.
-             * path - Default: "/browser-sync/socket.io"
-             * clientPath - Default: "/browser-sync"
-             * namespace - Default: "/browser-sync"
-             * domain - Default: undefined
-             * port - Default: undefined
-             * clients.heartbeatTimeout - Default: 5000
-             * Note: requires at least version 1.6.2
-             */
-            socket?: SocketOptions;
-            middleware?: MiddlewareHandler | MiddlewareHandler[];
-        }
-
-        interface Hash<T> {
-            [path: string]: T;
-        }
-
-        interface UIOptions {
-            /** set the default port */
-            port?: number;
-            /** set the default weinre port */
-            weinre?: {
-                port?: number;
-            };
-        }
-
-        interface ServerOptions {
-            /** set base directory */
-            baseDir?: string | string[];
-            /** enable directory listing */
-            directory?: boolean;
-            /** set index filename */
-            index?: string;
-            /**
-             * key-value object hash, where the key is the url to match,
-             * and the value is the folder to serve (relative to your working directory)
-             */
-            routes?: Hash<string>;
-            /** configure custom middleware */
-            middleware?: MiddlewareHandler[];
-        }
-
-        interface ProxyOptions {
-            target?: string;
-            middleware?: MiddlewareHandler;
-            ws: boolean;
-            reqHeaders: (config: any) => Hash<any>;
-            proxyRes: (res: http.ServerResponse, req: http.ServerRequest, next: Function) => any;
-        }
-
-        interface MiddlewareHandler {
-            (req: http.ServerRequest, res: http.ServerResponse, next: Function): any;
-        }
-
-        interface GhostOptions {
-            clicks?: boolean;
-            scroll?: boolean;
-            forms?: boolean;
-        }
-
-        interface SnippetOptions {
-            ignorePaths?: string;
-            rule?: { match?: RegExp; fn?: (snippet: string, match: string) => any };
-        }
-
-        interface SocketOptions {
-            path?: string;
-            clientPath?: string;
-            namespace?: string;
-            domain?: string;
-            port?: number;
-            clients?: { heartbeatTimeout?: number; };
-        }
-
-        interface RewriteRules {
-            match: RegExp;
-            fn: (match: string) => string;
-        }
-
-        interface StreamOptions {
-            once?: boolean;
-            match?: mm.Pattern | mm.Pattern[];
-        }
-
-        interface BrowserSyncStatic extends BrowserSyncInstance {
-            /**
-             * Start the Browsersync service. This will launch a server, proxy or start the snippet mode
-             * depending on your use-case.
-             */
-            (config?: Options, callback?: (err: Error, bs: Object) => any): BrowserSyncInstance;
-            /**
-             * Create a Browsersync instance
-             * @param name an identifier that can used for retrieval later
-             */
-            create(name?: string): BrowserSyncInstance;
-            /**
-             * Get a single instance by name. This is useful if you have your build scripts in separate files
-             * @param name the identifier used for retrieval
-             */
-            get(name: string): BrowserSyncInstance;
-            /**
-             * Check if an instance has been created.
-             * @param name the name of the instance
-             */
-            has(name: string): boolean;
-        }
-
-        interface BrowserSyncInstance {
-            /** the name of this instance of browser-sync */
-            name: string;
-            /**
-             * Start the Browsersync service. This will launch a server, proxy or start the snippet mode
-             * depending on your use-case.
-             */
-            init(config?: Options, callback?: (err: Error, bs: Object) => any): BrowserSyncInstance;
-            /**
-             * Reload the browser
-             * The reload method will inform all browsers about changed files and will either cause the browser
-             * to refresh, or inject the files where possible.
-             */
-            reload(): void;
-            /**
-             * Reload a single file
-             * The reload method will inform all browsers about changed files and will either cause the browser
-             * to refresh, or inject the files where possible.
-             */
-            reload(file: string): void;
-            /**
-             * Reload multiple files
-             * The reload method will inform all browsers about changed files and will either cause the browser
-             * to refresh, or inject the files where possible.
-             */
-            reload(files: string[]): void;
-            /**
-             * The reload method will inform all browsers about changed files and will either cause the browser
-             * to refresh, or inject the files where possible.
-             */
-            reload(options: { stream: boolean }): NodeJS.ReadWriteStream;
-            /**
-             * The stream method returns a transform stream and can act once or on many files.
-             * @param opts Configuration for the stream method
-             */
-            stream(opts?: StreamOptions): NodeJS.ReadWriteStream;
-            /**
-             * Helper method for browser notifications
-             * @param message Can be a simple message such as 'Connected' or HTML
-             * @param timeout How long the message will remain in the browser. @since 1.3.0
-             */
-            notify(message: string, timeout?: number): void;
-            /**
-             * This method will close any running server, stop file watching & exit the current process.
-             */
-            exit(): void;
-            /**
-             * Stand alone file-watcher. Use this along with Browsersync to create your own, minimal build system
-             */
-            watch(patterns: string, opts?: chokidar.WatchOptions, fn?: (event: string, file: fs.Stats) => any)
-                : NodeJS.EventEmitter;
-            /**
-             * Method to pause file change events
-             */
-            pause(): void;
-            /**
-             * Method to resume paused watchers
-             */
-            resume(): void;
-            /**
-             * The internal Event Emitter used by the running Browsersync instance (if there is one). You can use
-             * this to emit your own events, such as changed files, logging etc.
-             */
-            emitter: NodeJS.EventEmitter;
-            /**
-             * A simple true/false flag that you can use to determine if there's a currently-running Browsersync instance.
-             */
-            active: boolean;
-            /**
-             * A simple true/false flag to determine if the current instance is paused
-             */
-            paused: boolean;
-        }
-    }
-
-    const browserSync: browserSync.BrowserSyncStatic;
-    export = browserSync;
-}
diff --git a/browser-sync/index.d.ts b/browser-sync/index.d.ts
new file mode 100644
index 0000000000..82563271d8
--- /dev/null
+++ b/browser-sync/index.d.ts
@@ -0,0 +1,419 @@
+// Type definitions for browser-sync
+// Project: http://www.browsersync.io/
+// Definitions by: Asana <https://asana.com>, Joe Skeen <http://github.com/joeskeen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="chokidar"/>
+/// <reference types="node" />
+
+import chokidar = require("chokidar");
+import fs = require("fs");
+import http = require("http");
+import mm = require("micromatch");
+
+declare namespace browserSync {
+    interface Options {
+        /**
+         * Browsersync includes a user-interface that is accessed via a separate port. The UI allows to controls
+         * all devices, push sync updates and much more.
+         *
+         * port - Default: 3001
+         * weinre.port - Default: 8080
+         * Note: requires at least version 2.0.0
+         */
+        ui?: UIOptions;
+        /**
+         * Browsersync can watch your files as you work. Changes you make will either be injected into the page (CSS
+         * & images) or will cause all browsers to do a full-page refresh. See anymatch for more information on glob
+         * patterns.
+         * Default: false
+         */
+        files?: string | string[];
+        /**
+         * File watching options that get passed along to Chokidar. Check their docs for available options
+         * Default: undefined
+         * Note: requires at least version 2.6.0
+         */
+        watchOptions?: chokidar.WatchOptions;
+        /**
+         * Use the built-in static server for basic HTML/JS/CSS websites.
+         * Default: false
+         */
+        server?: ServerOptions;
+        /**
+         * Proxy an EXISTING vhost. Browsersync will wrap your vhost with a proxy URL to view your site.
+         * target - Default: undefined
+         * ws - Default: undefined
+         * middleware - Default: undefined
+         * reqHeaders - Default: undefined
+         * proxyRes - Default: undefined
+         */
+        proxy?: string | boolean | ProxyOptions;
+        /**
+         * Use a specific port (instead of the one auto-detected by Browsersync)
+         * Default: 3000
+         */
+        port?: number;
+        /**
+         * Add additional directories from which static files should be served.
+         * Should only be used in proxy or snippet mode.
+         * Default: []
+         * Note: requires at least version 2.8.0
+         */
+        serveStatic?: string[];
+        /**
+         * Enable https for localhost development.
+         * Note - this is not needed for proxy option as it will be inferred from your target url.
+         * Note: requires at least version 1.3.0
+         */
+        https?: boolean;
+        /**
+         * Clicks, Scrolls & Form inputs on any device will be mirrored to all others.
+         * clicks - Default: true
+         * scroll - Default: true
+         * forms - Default: true
+         */
+        ghostMode?: GhostOptions | boolean;
+        /**
+         * Can be either "info", "debug", "warn", or "silent"
+         * Default: info
+         */
+        logLevel?: string;
+        /**
+         * Change the console logging prefix. Useful if you're creating your own project based on Browsersync
+         * Default: BS
+         * Note: requires at least version 1.5.1
+         */
+        logPrefix?: string;
+        /**
+         * Whether or not to log connections
+         * Default: false
+         */
+        logConnections?: boolean;
+        /**
+         * Whether or not to log information about changed files
+         * Default: false
+         */
+        logFileChanges?: boolean;
+        /**
+         * Log the snippet to the console when you're in snippet mode (no proxy/server)
+         * Default: true
+         * Note: requires at least version 1.5.2
+         */
+        logSnippet?: boolean;
+        /**
+         * You can control how the snippet is injected onto each page via a custom regex + function.
+         * You can also provide patterns for certain urls that should be ignored from the snippet injection.
+         * Note: requires at least version 2.0.0
+         */
+        snippetOptions?: SnippetOptions;
+        /**
+         * Add additional HTML rewriting rules.
+         * Default: false
+         * Note: requires at least version 2.4.0
+         */
+        rewriteRules?: boolean | RewriteRules[];
+        /**
+         * Tunnel the Browsersync server through a random Public URL
+         * Default: null
+         */
+        tunnel?: string | boolean;
+        /**
+         * Some features of Browsersync (such as xip & tunnel) require an internet connection, but if you're
+         * working offline, you can reduce start-up time by setting this option to false
+         */
+        online?: boolean;
+        /**
+         * Default: true
+         * Decide which URL to open automatically when Browsersync starts. Defaults to "local" if none set.
+         * Can be true, local, external, ui, ui-external, tunnel or false
+         */
+        open?: string | boolean;
+        /**
+         * The browser(s) to open
+         * Default: default
+         */
+        browser?: string | string[];
+        /**
+         * Requires an internet connection - useful for services such as Typekit as it allows you to configure
+         * domains such as *.xip.io in your kit settings
+         * Default: false
+         */
+        xip?: boolean;
+        /**
+         * Reload each browser when Browsersync is restarted.
+         * Default: false
+         */
+        reloadOnRestart?: boolean;
+        /**
+         * The small pop-over notifications in the browser are not always needed/wanted.
+         * Default: true
+         */
+        notify?: boolean;
+        /**
+         * scrollProportionally: false // Sync viewports to TOP position
+         * Default: true
+         */
+        scrollProportionally?: boolean;
+        /**
+         * How often to send scroll events
+         * Default: 0
+         */
+        scrollThrottle?: number;
+        /**
+         * Decide which technique should be used to restore scroll position following a reload.
+         * Can be window.name or cookie
+         * Default: 'window.name'
+         */
+        scrollRestoreTechnique?: string;
+        /**
+         * Sync the scroll position of any element on the page. Add any amount of CSS selectors
+         * Default: []
+         * Note: requires at least version 2.9.0
+         */
+        scrollElements?: string[];
+        /**
+         * Default: []
+         * Note: requires at least version 2.9.0
+         * Sync the scroll position of any element on the page - where any scrolled element will cause
+         * all others to match scroll position. This is helpful when a breakpoint alters which element
+         * is actually scrolling
+         */
+        scrollElementMapping?: string[];
+        /**
+         * Time, in milliseconds, to wait before instructing the browser to reload/inject following a file
+         * change event
+         * Default: 0
+         */
+        reloadDelay?: number;
+        /**
+         * Restrict the frequency in which browser:reload events can be emitted to connected clients
+         * Default: 0
+         * Note: requires at least version 2.6.0
+         */
+        reloadDebounce?: number;
+        /**
+         * User provided plugins
+         * Default: []
+         * Note: requires at least version 2.6.0
+         */
+        plugins?: any[];
+        /**
+         * Whether to inject changes (rather than a page refresh)
+         * Default: true
+         */
+        injectChanges?: boolean;
+        /**
+         * The initial path to load
+         */
+        startPath?: string;
+        /**
+         * Whether to minify the client script
+         * Default: true
+         */
+        minify?: boolean;
+        /**
+         * Override host detection if you know the correct IP to use
+         */
+        host?: string;
+        /**
+         * Send file-change events to the browser
+         * Default: true
+         */
+        codeSync?: boolean;
+        /**
+         * Append timestamps to injected files
+         * Default: true
+         */
+        timestamps?: boolean;
+        /**
+         * Alter the script path for complete control over where the Browsersync Javascript is served
+         * from. Whatever you return from this function will be used as the script path.
+         * Note: requires at least version 1.5.0
+         */
+        scriptPath?: (path: string) => string;
+        /**
+         * Configure the Socket.IO path and namespace & domain to avoid collisions.
+         * path - Default: "/browser-sync/socket.io"
+         * clientPath - Default: "/browser-sync"
+         * namespace - Default: "/browser-sync"
+         * domain - Default: undefined
+         * port - Default: undefined
+         * clients.heartbeatTimeout - Default: 5000
+         * Note: requires at least version 1.6.2
+         */
+        socket?: SocketOptions;
+        middleware?: MiddlewareHandler | MiddlewareHandler[];
+    }
+
+    interface Hash<T> {
+        [path: string]: T;
+    }
+
+    interface UIOptions {
+        /** set the default port */
+        port?: number;
+        /** set the default weinre port */
+        weinre?: {
+            port?: number;
+        };
+    }
+
+    interface ServerOptions {
+        /** set base directory */
+        baseDir?: string | string[];
+        /** enable directory listing */
+        directory?: boolean;
+        /** set index filename */
+        index?: string;
+        /**
+         * key-value object hash, where the key is the url to match,
+         * and the value is the folder to serve (relative to your working directory)
+         */
+        routes?: Hash<string>;
+        /** configure custom middleware */
+        middleware?: MiddlewareHandler[];
+    }
+
+    interface ProxyOptions {
+        target?: string;
+        middleware?: MiddlewareHandler;
+        ws: boolean;
+        reqHeaders: (config: any) => Hash<any>;
+        proxyRes: (res: http.ServerResponse, req: http.ServerRequest, next: Function) => any;
+    }
+
+    interface MiddlewareHandler {
+        (req: http.ServerRequest, res: http.ServerResponse, next: Function): any;
+    }
+
+    interface GhostOptions {
+        clicks?: boolean;
+        scroll?: boolean;
+        forms?: boolean;
+    }
+
+    interface SnippetOptions {
+        ignorePaths?: string;
+        rule?: { match?: RegExp; fn?: (snippet: string, match: string) => any };
+    }
+
+    interface SocketOptions {
+        path?: string;
+        clientPath?: string;
+        namespace?: string;
+        domain?: string;
+        port?: number;
+        clients?: { heartbeatTimeout?: number; };
+    }
+
+    interface RewriteRules {
+        match: RegExp;
+        fn: (match: string) => string;
+    }
+
+    interface StreamOptions {
+        once?: boolean;
+        match?: mm.Pattern | mm.Pattern[];
+    }
+
+    interface BrowserSyncStatic extends BrowserSyncInstance {
+        /**
+         * Start the Browsersync service. This will launch a server, proxy or start the snippet mode
+         * depending on your use-case.
+         */
+        (config?: Options, callback?: (err: Error, bs: Object) => any): BrowserSyncInstance;
+        /**
+         * Create a Browsersync instance
+         * @param name an identifier that can used for retrieval later
+         */
+        create(name?: string): BrowserSyncInstance;
+        /**
+         * Get a single instance by name. This is useful if you have your build scripts in separate files
+         * @param name the identifier used for retrieval
+         */
+        get(name: string): BrowserSyncInstance;
+        /**
+         * Check if an instance has been created.
+         * @param name the name of the instance
+         */
+        has(name: string): boolean;
+    }
+
+    interface BrowserSyncInstance {
+        /** the name of this instance of browser-sync */
+        name: string;
+        /**
+         * Start the Browsersync service. This will launch a server, proxy or start the snippet mode
+         * depending on your use-case.
+         */
+        init(config?: Options, callback?: (err: Error, bs: Object) => any): BrowserSyncInstance;
+        /**
+         * Reload the browser
+         * The reload method will inform all browsers about changed files and will either cause the browser
+         * to refresh, or inject the files where possible.
+         */
+        reload(): void;
+        /**
+         * Reload a single file
+         * The reload method will inform all browsers about changed files and will either cause the browser
+         * to refresh, or inject the files where possible.
+         */
+        reload(file: string): void;
+        /**
+         * Reload multiple files
+         * The reload method will inform all browsers about changed files and will either cause the browser
+         * to refresh, or inject the files where possible.
+         */
+        reload(files: string[]): void;
+        /**
+         * The reload method will inform all browsers about changed files and will either cause the browser
+         * to refresh, or inject the files where possible.
+         */
+        reload(options: { stream: boolean }): NodeJS.ReadWriteStream;
+        /**
+         * The stream method returns a transform stream and can act once or on many files.
+         * @param opts Configuration for the stream method
+         */
+        stream(opts?: StreamOptions): NodeJS.ReadWriteStream;
+        /**
+         * Helper method for browser notifications
+         * @param message Can be a simple message such as 'Connected' or HTML
+         * @param timeout How long the message will remain in the browser. @since 1.3.0
+         */
+        notify(message: string, timeout?: number): void;
+        /**
+         * This method will close any running server, stop file watching & exit the current process.
+         */
+        exit(): void;
+        /**
+         * Stand alone file-watcher. Use this along with Browsersync to create your own, minimal build system
+         */
+        watch(patterns: string, opts?: chokidar.WatchOptions, fn?: (event: string, file: fs.Stats) => any)
+            : NodeJS.EventEmitter;
+        /**
+         * Method to pause file change events
+         */
+        pause(): void;
+        /**
+         * Method to resume paused watchers
+         */
+        resume(): void;
+        /**
+         * The internal Event Emitter used by the running Browsersync instance (if there is one). You can use
+         * this to emit your own events, such as changed files, logging etc.
+         */
+        emitter: NodeJS.EventEmitter;
+        /**
+         * A simple true/false flag that you can use to determine if there's a currently-running Browsersync instance.
+         */
+        active: boolean;
+        /**
+         * A simple true/false flag to determine if the current instance is paused
+         */
+        paused: boolean;
+    }
+}
+
+declare const browserSync: browserSync.BrowserSyncStatic;
+export = browserSync;
diff --git a/browser-sync/tsconfig.json b/browser-sync/tsconfig.json
new file mode 100644
index 0000000000..8e33dc71e9
--- /dev/null
+++ b/browser-sync/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "browser-sync-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/browserify/browserify-tests.ts b/browserify/browserify-tests.ts
index b4096a7f98..68ebb59c7f 100644
--- a/browserify/browserify-tests.ts
+++ b/browserify/browserify-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="browserify.d.ts"/>
-
 import browserify = require("browserify");
 import fs = require("fs");
 import stream = require('stream');
diff --git a/browserify/browserify.d.ts b/browserify/browserify.d.ts
deleted file mode 100644
index a3a9c4efd1..0000000000
--- a/browserify/browserify.d.ts
+++ /dev/null
@@ -1,182 +0,0 @@
-// Type definitions for Browserify v12.0.1
-// Project: http://browserify.org/
-// Definitions by: Andrew Gaspar <https://github.com/AndrewGaspar/>, John Vilk <https://github.com/jvilk>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare namespace Browserify {
-  /**
-   * Options pertaining to an individual file.
-   */
-  interface FileOptions {
-    // If true, this is considered an entry point to your app.
-    entry?: boolean;
-    // Expose this file under a custom dependency name.
-    // require('./vendor/angular/angular.js', {expose: 'angular'}) enables require('angular')
-    expose?: string;
-    // Basedir to use to resolve this file's path.
-    basedir?: string;
-    // The name/path to the file.
-    file?: string;
-    // Forward file to external() to be externalized.
-    external?: boolean;
-    // Disable transforms on file if set to false.
-    transform?: boolean;
-    // The ID to use for require() statements.
-    id?: string;
-  }
-
-
-  // Browserify accepts a filename, an input stream for file inputs, or a FileOptions configuration
-  // for each file in a bundle.
-  type InputFile = string | NodeJS.ReadableStream | FileOptions;
-
-  /**
-   * Options pertaining to a Browserify instance.
-   */
-  interface Options {
-    // Custom properties can be defined on Options.
-    // These options are forwarded along to module-deps and browser-pack directly.
-    [propName: string]: any;
-    // String, file object, or array of those types (they may be mixed) specifying entry file(s).
-    entries?: InputFile | InputFile[];
-    // an array which will skip all require() and global parsing for each file in the array.
-    // Use this for giant libs like jquery or threejs that don't have any requires or node-style globals but take forever to parse.
-    noParse?: string[];
-    // an array of optional extra extensions for the module lookup machinery to use when the extension has not been specified.
-    // By default Browserify considers only .js and .json files in such cases.
-    extensions?: string[];
-    // the directory that Browserify starts bundling from for filenames that start with ..
-    basedir?: string;
-    // an array of directories that Browserify searches when looking for modules which are not referenced using relative path.
-    // Can be absolute or relative to basedir. Equivalent of setting NODE_PATH environmental variable when calling Browserify command.
-    paths?: string[];
-    // sets the algorithm used to parse out the common paths. Use false to turn this off, otherwise it uses the commondir module.
-    commondir?: boolean;
-    // disables converting module ids into numerical indexes. This is useful for preserving the original paths that a bundle was generated with.
-    fullPaths?: boolean;
-    // sets the list of built-ins to use, which by default is set in lib/builtins.js in this distribution.
-    builtins?: string[] | {[builtinName: string]: string} | boolean;
-    // set if external modules should be bundled. Defaults to true.
-    bundleExternal?: boolean;
-    // When true, always insert process, global, __filename, and __dirname without analyzing the AST for faster builds but larger output bundles. Default false.
-    insertGlobals?: boolean;
-    // When true, scan all files for process, global, __filename, and __dirname, defining as necessary.
-    // With this option npm modules are more likely to work but bundling takes longer. Default true.
-    detectGlobals?: boolean;
-    // When true, add a source map inline to the end of the bundle. This makes debugging easier because you can see all the original files if you are in a modern enough browser.
-    debug?: boolean;
-    // When a non-empty string, a standalone module is created with that name and a umd wrapper.
-    // You can use namespaces in the standalone global export using a . in the string name as a separator, for example 'A.B.C'.
-    // The global export will be sanitized and camel cased.
-    standalone?: string;
-    // will be passed to insert-module-globals as the opts.vars parameter.
-    insertGlobalVars?: {[globalName: string]: (file: string, basedir: string) => any};
-    // defaults to 'require' in expose mode but you can use another name.
-    externalRequireName?: string;
-  }
-
-  interface BrowserifyConstructor {
-    (files: InputFile[], opts?: Options): BrowserifyObject;
-    (file: InputFile, opts?: Options): BrowserifyObject;
-    (opts: Options): BrowserifyObject;
-    (): BrowserifyObject
-    new(files: InputFile[], opts?: Options): BrowserifyObject;
-    new(file: InputFile, opts?: Options): BrowserifyObject;
-    new(opts: Options): BrowserifyObject;
-    new(): BrowserifyObject
-  }
-
-  interface BrowserifyObject extends NodeJS.EventEmitter {
-    /**
-     * Add an entry file from file that will be executed when the bundle loads.
-     * If file is an array, each item in file will be added as an entry file.
-     */
-    add(file: InputFile[], opts?: FileOptions): BrowserifyObject;
-    add(file: InputFile, opts?: FileOptions): BrowserifyObject;
-    /**
-     * Make file available from outside the bundle with require(file).
-     * The file param is anything that can be resolved by require.resolve().
-     * file can also be a stream, but you should also use opts.basedir so that relative requires will be resolvable.
-     * If file is an array, each item in file will be required. In file array form, you can use a string or object for each item. Object items should have a file property and the rest of the parameters will be used for the opts.
-     * Use the expose property of opts to specify a custom dependency name. require('./vendor/angular/angular.js', {expose: 'angular'}) enables require('angular')
-     */
-    require(file: InputFile, opts?: FileOptions): BrowserifyObject;
-    /**
-     * Bundle the files and their dependencies into a single javascript file.
-     * Return a readable stream with the javascript file contents or optionally specify a cb(err, buf) to get the buffered results.
-     */
-    bundle(cb?: (err: any, src: Buffer) => any): NodeJS.ReadableStream;
-    /**
-     * Prevent file from being loaded into the current bundle, instead referencing from another bundle.
-     * If file is an array, each item in file will be externalized.
-     * If file is another bundle, that bundle's contents will be read and excluded from the current bundle as the bundle in file gets bundled.
-     */
-    external(file: string[], opts?: { basedir?: string }): BrowserifyObject;
-    external(file: string, opts?: { basedir?: string }): BrowserifyObject;
-    external(file: BrowserifyObject): BrowserifyObject;
-    /**
-     * Prevent the module name or file at file from showing up in the output bundle.
-     * Instead you will get a file with module.exports = {}.
-     */
-    ignore(file: string, opts?: { basedir?: string }): BrowserifyObject;
-    /**
-     * Prevent the module name or file at file from showing up in the output bundle.
-     * If your code tries to require() that file it will throw unless you've provided another mechanism for loading it.
-     */
-    exclude(file: string, opts?: { basedir?: string }): BrowserifyObject;
-    /**
-     * Transform source code before parsing it for require() calls with the transform function or module name tr.
-     * If tr is a function, it will be called with tr(file) and it should return a through-stream that takes the raw file contents and produces the transformed source.
-     * If tr is a string, it should be a module name or file path of a transform module
-     */
-    transform<T extends { basedir?: string }>(tr: string, opts?: T): BrowserifyObject;
-    transform<T extends { basedir?: string }>(tr: (file: string, opts: T) => NodeJS.ReadWriteStream, opts?: T): BrowserifyObject;
-    /**
-     * Register a plugin with opts. Plugins can be a string module name or a function the same as transforms.
-     * plugin(b, opts) is called with the Browserify instance b.
-     */
-    plugin<T extends { basedir?: string }>(plugin: string, opts?: T): BrowserifyObject;
-    plugin<T extends { basedir?: string }>(plugin: (b: BrowserifyObject, opts: T) => any, opts?: T): BrowserifyObject;
-    /**
-     * Reset the pipeline back to a normal state. This function is called automatically when bundle() is called multiple times.
-     * This function triggers a 'reset' event.
-     */
-    reset(opts?: Options): void;
-
-    /**
-     * When a file is resolved for the bundle, the bundle emits a 'file' event with the full file path, the id string passed to require(), and the parent object used by browser-resolve.
-     * You could use the file event to implement a file watcher to regenerate bundles when files change.
-     */
-    on(event: 'file', listener: (file: string, id: string, parent: any) => any): this;
-    /**
-     * When a package.json file is read, this event fires with the contents.
-     * The package directory is available at pkg.__dirname.
-     */
-    on(event: 'package', listener: (pkg: any) => any): this;
-    /**
-     * When .bundle() is called, this event fires with the bundle output stream.
-     */
-    on(event: 'bundle', listener: (bundle: NodeJS.ReadableStream) => any): this;
-    /**
-     * When the .reset() method is called or implicitly called by another call to .bundle(), this event fires.
-     */
-    on(event: 'reset', listener: () => any): this;
-    /**
-     * When a transform is applied to a file, the 'transform' event fires on the bundle stream with the transform stream tr and the file that the transform is being applied to.
-     */
-    on(event: 'transform', listener: (tr: NodeJS.ReadWriteStream, file: string) => any): this;
-    on(event: string, listener: Function): this;
-
-    /**
-     * Set to any until substack/labeled-stream-splicer is defined
-     */
-    pipeline: any;
-  }
-}
-
-declare module "browserify" {
-  var browserify: Browserify.BrowserifyConstructor;
-  export = browserify;
-}
diff --git a/browserify/index.d.ts b/browserify/index.d.ts
new file mode 100644
index 0000000000..506bc3dd86
--- /dev/null
+++ b/browserify/index.d.ts
@@ -0,0 +1,175 @@
+// Type definitions for Browserify v12.0.1
+// Project: http://browserify.org/
+// Definitions by: Andrew Gaspar <https://github.com/AndrewGaspar/>, John Vilk <https://github.com/jvilk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare var browserify: BrowserifyConstructor;
+export = browserify;
+
+/**
+ * Options pertaining to an individual file.
+ */
+interface FileOptions {
+  // If true, this is considered an entry point to your app.
+  entry?: boolean;
+  // Expose this file under a custom dependency name.
+  // require('./vendor/angular/angular.js', {expose: 'angular'}) enables require('angular')
+  expose?: string;
+  // Basedir to use to resolve this file's path.
+  basedir?: string;
+  // The name/path to the file.
+  file?: string;
+  // Forward file to external() to be externalized.
+  external?: boolean;
+  // Disable transforms on file if set to false.
+  transform?: boolean;
+  // The ID to use for require() statements.
+  id?: string;
+}
+
+// Browserify accepts a filename, an input stream for file inputs, or a FileOptions configuration
+// for each file in a bundle.
+type InputFile = string | NodeJS.ReadableStream | FileOptions;
+
+/**
+ * Options pertaining to a Browserify instance.
+ */
+interface Options {
+  // Custom properties can be defined on Options.
+  // These options are forwarded along to module-deps and browser-pack directly.
+  [propName: string]: any;
+  // String, file object, or array of those types (they may be mixed) specifying entry file(s).
+  entries?: InputFile | InputFile[];
+  // an array which will skip all require() and global parsing for each file in the array.
+  // Use this for giant libs like jquery or threejs that don't have any requires or node-style globals but take forever to parse.
+  noParse?: string[];
+  // an array of optional extra extensions for the module lookup machinery to use when the extension has not been specified.
+  // By default Browserify considers only .js and .json files in such cases.
+  extensions?: string[];
+  // the directory that Browserify starts bundling from for filenames that start with ..
+  basedir?: string;
+  // an array of directories that Browserify searches when looking for modules which are not referenced using relative path.
+  // Can be absolute or relative to basedir. Equivalent of setting NODE_PATH environmental variable when calling Browserify command.
+  paths?: string[];
+  // sets the algorithm used to parse out the common paths. Use false to turn this off, otherwise it uses the commondir module.
+  commondir?: boolean;
+  // disables converting module ids into numerical indexes. This is useful for preserving the original paths that a bundle was generated with.
+  fullPaths?: boolean;
+  // sets the list of built-ins to use, which by default is set in lib/builtins.js in this distribution.
+  builtins?: string[] | {[builtinName: string]: string} | boolean;
+  // set if external modules should be bundled. Defaults to true.
+  bundleExternal?: boolean;
+  // When true, always insert process, global, __filename, and __dirname without analyzing the AST for faster builds but larger output bundles. Default false.
+  insertGlobals?: boolean;
+  // When true, scan all files for process, global, __filename, and __dirname, defining as necessary.
+  // With this option npm modules are more likely to work but bundling takes longer. Default true.
+  detectGlobals?: boolean;
+  // When true, add a source map inline to the end of the bundle. This makes debugging easier because you can see all the original files if you are in a modern enough browser.
+  debug?: boolean;
+  // When a non-empty string, a standalone module is created with that name and a umd wrapper.
+  // You can use namespaces in the standalone global export using a . in the string name as a separator, for example 'A.B.C'.
+  // The global export will be sanitized and camel cased.
+  standalone?: string;
+  // will be passed to insert-module-globals as the opts.vars parameter.
+  insertGlobalVars?: {[globalName: string]: (file: string, basedir: string) => any};
+  // defaults to 'require' in expose mode but you can use another name.
+  externalRequireName?: string;
+}
+
+interface BrowserifyConstructor {
+  (files: InputFile[], opts?: Options): BrowserifyObject;
+  (file: InputFile, opts?: Options): BrowserifyObject;
+  (opts?: Options): BrowserifyObject;
+  new(files: InputFile[], opts?: Options): BrowserifyObject;
+  new(file: InputFile, opts?: Options): BrowserifyObject;
+  new(opts?: Options): BrowserifyObject;
+}
+
+interface BrowserifyObject extends NodeJS.EventEmitter {
+  /**
+   * Add an entry file from file that will be executed when the bundle loads.
+   * If file is an array, each item in file will be added as an entry file.
+   */
+  add(file: InputFile[], opts?: FileOptions): BrowserifyObject;
+  add(file: InputFile, opts?: FileOptions): BrowserifyObject;
+  /**
+   * Make file available from outside the bundle with require(file).
+   * The file param is anything that can be resolved by require.resolve().
+   * file can also be a stream, but you should also use opts.basedir so that relative requires will be resolvable.
+   * If file is an array, each item in file will be required. In file array form, you can use a string or object for each item. Object items should have a file property and the rest of the parameters will be used for the opts.
+   * Use the expose property of opts to specify a custom dependency name. require('./vendor/angular/angular.js', {expose: 'angular'}) enables require('angular')
+   */
+  require(file: InputFile, opts?: FileOptions): BrowserifyObject;
+  /**
+   * Bundle the files and their dependencies into a single javascript file.
+   * Return a readable stream with the javascript file contents or optionally specify a cb(err, buf) to get the buffered results.
+   */
+  bundle(cb?: (err: any, src: Buffer) => any): NodeJS.ReadableStream;
+  /**
+   * Prevent file from being loaded into the current bundle, instead referencing from another bundle.
+   * If file is an array, each item in file will be externalized.
+   * If file is another bundle, that bundle's contents will be read and excluded from the current bundle as the bundle in file gets bundled.
+   */
+  external(file: string[], opts?: { basedir?: string }): BrowserifyObject;
+  external(file: string, opts?: { basedir?: string }): BrowserifyObject;
+  external(file: BrowserifyObject): BrowserifyObject;
+  /**
+   * Prevent the module name or file at file from showing up in the output bundle.
+   * Instead you will get a file with module.exports = {}.
+   */
+  ignore(file: string, opts?: { basedir?: string }): BrowserifyObject;
+  /**
+   * Prevent the module name or file at file from showing up in the output bundle.
+   * If your code tries to require() that file it will throw unless you've provided another mechanism for loading it.
+   */
+  exclude(file: string, opts?: { basedir?: string }): BrowserifyObject;
+  /**
+   * Transform source code before parsing it for require() calls with the transform function or module name tr.
+   * If tr is a function, it will be called with tr(file) and it should return a through-stream that takes the raw file contents and produces the transformed source.
+   * If tr is a string, it should be a module name or file path of a transform module
+   */
+  transform<T extends { basedir?: string }>(tr: string, opts?: T): BrowserifyObject;
+  transform<T extends { basedir?: string }>(tr: (file: string, opts: T) => NodeJS.ReadWriteStream, opts?: T): BrowserifyObject;
+  /**
+   * Register a plugin with opts. Plugins can be a string module name or a function the same as transforms.
+   * plugin(b, opts) is called with the Browserify instance b.
+   */
+  plugin<T extends { basedir?: string }>(plugin: string, opts?: T): BrowserifyObject;
+  plugin<T extends { basedir?: string }>(plugin: (b: BrowserifyObject, opts: T) => any, opts?: T): BrowserifyObject;
+  /**
+   * Reset the pipeline back to a normal state. This function is called automatically when bundle() is called multiple times.
+   * This function triggers a 'reset' event.
+   */
+  reset(opts?: Options): void;
+
+  /**
+   * When a file is resolved for the bundle, the bundle emits a 'file' event with the full file path, the id string passed to require(), and the parent object used by browser-resolve.
+   * You could use the file event to implement a file watcher to regenerate bundles when files change.
+   */
+  on(event: 'file', listener: (file: string, id: string, parent: any) => any): this;
+  /**
+   * When a package.json file is read, this event fires with the contents.
+   * The package directory is available at pkg.__dirname.
+   */
+  on(event: 'package', listener: (pkg: any) => any): this;
+  /**
+   * When .bundle() is called, this event fires with the bundle output stream.
+   */
+  on(event: 'bundle', listener: (bundle: NodeJS.ReadableStream) => any): this;
+  /**
+   * When the .reset() method is called or implicitly called by another call to .bundle(), this event fires.
+   */
+  on(event: 'reset', listener: () => any): this;
+  /**
+   * When a transform is applied to a file, the 'transform' event fires on the bundle stream with the transform stream tr and the file that the transform is being applied to.
+   */
+  on(event: 'transform', listener: (tr: NodeJS.ReadWriteStream, file: string) => any): this;
+  on(event: string, listener: Function): this;
+
+  /**
+   * Set to any until substack/labeled-stream-splicer is defined
+   */
+  pipeline: any;
+}
diff --git a/browserify/tsconfig.json b/browserify/tsconfig.json
new file mode 100644
index 0000000000..e29ea03579
--- /dev/null
+++ b/browserify/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "browserify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bs58/bs58-tests.ts b/bs58/bs58-tests.ts
index 8016469269..5fe3b73675 100644
--- a/bs58/bs58-tests.ts
+++ b/bs58/bs58-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./bs58.d.ts" />
 
 import * as bs58 from 'bs58';
 
diff --git a/bs58/bs58.d.ts b/bs58/bs58.d.ts
deleted file mode 100644
index 00ebbbfec7..0000000000
--- a/bs58/bs58.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// Type definitions for bs58 3.0.0
-// Project: https://github.com/cryptocoinjs/bs58
-// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../base-x/base-x.d.ts" />
-
-declare module "bs58" {
-	namespace base58 {}
-
-	let base58: BaseX.BaseConverter;
-
-	export = base58;
-}
diff --git a/bs58/index.d.ts b/bs58/index.d.ts
new file mode 100644
index 0000000000..dcc0735e08
--- /dev/null
+++ b/bs58/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for bs58 3.0.0
+// Project: https://github.com/cryptocoinjs/bs58
+// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="base-x" />
+
+
+declare namespace base58 { }
+
+declare let base58: BaseX.BaseConverter;
+
+export = base58;
diff --git a/bs58/tsconfig.json b/bs58/tsconfig.json
new file mode 100644
index 0000000000..047bfbfd7a
--- /dev/null
+++ b/bs58/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bs58-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bson/bson-tests.ts b/bson/bson-tests.ts
index a454ed2366..e1e1c5d323 100644
--- a/bson/bson-tests.ts
+++ b/bson/bson-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="bson.d.ts"/>
-
 import * as bson from 'bson';
 
 let BSON = new bson.BSONPure.BSON();
diff --git a/bson/bson.d.ts b/bson/bson.d.ts
deleted file mode 100644
index c311103ff3..0000000000
--- a/bson/bson.d.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-// Type definitions for bson 0.4.21
-// Project: https://github.com/mongodb/js-bson
-// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-
-declare module 'bson' {
-
-  namespace bson {
-
-      export module BSONPure {
-
-          export interface DeserializeOptions {
-              /** {Boolean, default:false}, evaluate functions in the BSON document scoped to the object deserialized. */
-              evalFunctions?: boolean;
-              /** {Boolean, default:false}, cache evaluated functions for reuse. */
-              cacheFunctions?: boolean;
-              /** {Boolean, default:false}, use a crc32 code for caching, otherwise use the string of the function. */
-              cacheFunctionsCrc32?: boolean;
-              /** {Boolean, default:false}, deserialize Binary data directly into node.js Buffer object. */
-              promoteBuffers?: boolean;
-          }
-          export class BSON {
-              /**
-               * @param {Object} object the Javascript object to serialize.
-               * @param {Boolean} checkKeys the serializer will check if keys are valid.
-               * @param {Boolean} asBuffer return the serialized object as a Buffer object (ignore).
-               * @param {Boolean} serializeFunctions serialize the javascript functions (default:false)
-               * @return {Buffer} returns a TypedArray or Array depending on what your browser supports
-               */
-              serialize(object: any, checkKeys?: boolean, asBuffer?: boolean, serializeFunctions?: boolean): Buffer;
-              deserialize(buffer: Buffer, options?: DeserializeOptions, isArray?: boolean): any;
-          }
-
-
-          export interface Binary {}
-          export interface BinaryStatic {
-              SUBTYPE_DEFAULT: number;
-              SUBTYPE_FUNCTION: number;
-              SUBTYPE_BYTE_ARRAY: number;
-              SUBTYPE_UUID_OLD: number;
-              SUBTYPE_UUID: number;
-              SUBTYPE_MD5: number;
-              SUBTYPE_USER_DEFINED: number;
-
-              new (buffer: Buffer, subType?: number): Binary;
-          }
-          export let Binary: BinaryStatic;
-
-          export interface Code {}
-          export interface CodeStatic {
-              new (code: string | Function, scope?: any): Code;
-          }
-          export let Code: CodeStatic;
-
-          export interface DBRef {}
-          export interface DBRefStatic {
-              new (namespace: string, oid: ObjectID, db?: string): DBRef;
-          }
-          export let DBRef: DBRefStatic;
-
-          export interface Double {}
-          export interface DoubleStatic {
-              new (value: number): Double;
-          }
-          export let Double: DoubleStatic;
-
-          export interface Long {}
-          export interface LongStatic {
-              new (low: number, high: number): Long;
-              fromInt(i: number): Long;
-              fromNumber(n: number): Long;
-              fromBits(lowBits: number, highBits: number): Long;
-              fromString(s: string, opt_radix?: number): Long;
-          }
-          export let Long: LongStatic;
-
-          export interface MaxKey {}
-          export interface MaxKeyStatic {
-              new (): MaxKey;
-          }
-          export let MaxKey: MaxKeyStatic;
-
-          export interface MinKey {}
-          export interface MinKeyStatic {
-              new (): MinKey;
-          }
-          export let MinKey: MinKeyStatic;
-
-          export interface ObjectID {}
-          export interface ObjectIDStatic {
-              new (id?: number | string | ObjectID): ObjectID;
-              createPk(): ObjectID;
-              createFromTime(time: number): ObjectID;
-              createFromHexString(hexString: string): ObjectID;
-              isValid(id: number | string | ObjectID): boolean;
-          }
-          export let ObjectID: ObjectIDStatic;
-          export let ObjectId: ObjectIDStatic;
-
-          export interface BSONRegExp {}
-          export interface BSONRegExpStatic {
-              new (pattern: string, options: string): BSONRegExp;
-          }
-          export let BSONRegExp: BSONRegExpStatic;
-
-          export interface Symbol {}
-          export interface SymbolStatic {
-              new (value: string): Symbol;
-          }
-          export let Symbol: SymbolStatic;
-
-          export interface Timestamp {}
-          export interface TimestampStatic {
-              new (low: number, high: number): Timestamp;
-              fromInt(i: number): Timestamp;
-              fromNumber(n: number): Timestamp;
-              fromBits(lowBits: number, highBits: number): Timestamp;
-              fromString(s: string, opt_radix?: number): Timestamp;
-          }
-          export let Timestamp: TimestampStatic;
-
-      }
-
-      export let BSONNative: typeof BSONPure;
-
-  }
-
-  export = bson;
-}
-
diff --git a/bson/index.d.ts b/bson/index.d.ts
new file mode 100644
index 0000000000..75726c4516
--- /dev/null
+++ b/bson/index.d.ts
@@ -0,0 +1,131 @@
+// Type definitions for bson 0.4.21
+// Project: https://github.com/mongodb/js-bson
+// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+
+
+declare namespace bson {
+
+    export module BSONPure {
+
+        export interface DeserializeOptions {
+            /** {Boolean, default:false}, evaluate functions in the BSON document scoped to the object deserialized. */
+            evalFunctions?: boolean;
+            /** {Boolean, default:false}, cache evaluated functions for reuse. */
+            cacheFunctions?: boolean;
+            /** {Boolean, default:false}, use a crc32 code for caching, otherwise use the string of the function. */
+            cacheFunctionsCrc32?: boolean;
+            /** {Boolean, default:false}, deserialize Binary data directly into node.js Buffer object. */
+            promoteBuffers?: boolean;
+        }
+        export class BSON {
+            /**
+             * @param {Object} object the Javascript object to serialize.
+             * @param {Boolean} checkKeys the serializer will check if keys are valid.
+             * @param {Boolean} asBuffer return the serialized object as a Buffer object (ignore).
+             * @param {Boolean} serializeFunctions serialize the javascript functions (default:false)
+             * @return {Buffer} returns a TypedArray or Array depending on what your browser supports
+             */
+            serialize(object: any, checkKeys?: boolean, asBuffer?: boolean, serializeFunctions?: boolean): Buffer;
+            deserialize(buffer: Buffer, options?: DeserializeOptions, isArray?: boolean): any;
+        }
+
+
+        export interface Binary { }
+        export interface BinaryStatic {
+            SUBTYPE_DEFAULT: number;
+            SUBTYPE_FUNCTION: number;
+            SUBTYPE_BYTE_ARRAY: number;
+            SUBTYPE_UUID_OLD: number;
+            SUBTYPE_UUID: number;
+            SUBTYPE_MD5: number;
+            SUBTYPE_USER_DEFINED: number;
+
+            new (buffer: Buffer, subType?: number): Binary;
+        }
+        export let Binary: BinaryStatic;
+
+        export interface Code { }
+        export interface CodeStatic {
+            new (code: string | Function, scope?: any): Code;
+        }
+        export let Code: CodeStatic;
+
+        export interface DBRef { }
+        export interface DBRefStatic {
+            new (namespace: string, oid: ObjectID, db?: string): DBRef;
+        }
+        export let DBRef: DBRefStatic;
+
+        export interface Double { }
+        export interface DoubleStatic {
+            new (value: number): Double;
+        }
+        export let Double: DoubleStatic;
+
+        export interface Long { }
+        export interface LongStatic {
+            new (low: number, high: number): Long;
+            fromInt(i: number): Long;
+            fromNumber(n: number): Long;
+            fromBits(lowBits: number, highBits: number): Long;
+            fromString(s: string, opt_radix?: number): Long;
+        }
+        export let Long: LongStatic;
+
+        export interface MaxKey { }
+        export interface MaxKeyStatic {
+            new (): MaxKey;
+        }
+        export let MaxKey: MaxKeyStatic;
+
+        export interface MinKey { }
+        export interface MinKeyStatic {
+            new (): MinKey;
+        }
+        export let MinKey: MinKeyStatic;
+
+        export interface ObjectID { }
+        export interface ObjectIDStatic {
+            new (id?: number | string | ObjectID): ObjectID;
+            createPk(): ObjectID;
+            createFromTime(time: number): ObjectID;
+            createFromHexString(hexString: string): ObjectID;
+            isValid(id: number | string | ObjectID): boolean;
+        }
+        export let ObjectID: ObjectIDStatic;
+        export let ObjectId: ObjectIDStatic;
+
+        export interface BSONRegExp { }
+        export interface BSONRegExpStatic {
+            new (pattern: string, options: string): BSONRegExp;
+        }
+        export let BSONRegExp: BSONRegExpStatic;
+
+        export interface Symbol { }
+        export interface SymbolStatic {
+            new (value: string): Symbol;
+        }
+        export let Symbol: SymbolStatic;
+
+        export interface Timestamp { }
+        export interface TimestampStatic {
+            new (low: number, high: number): Timestamp;
+            fromInt(i: number): Timestamp;
+            fromNumber(n: number): Timestamp;
+            fromBits(lowBits: number, highBits: number): Timestamp;
+            fromString(s: string, opt_radix?: number): Timestamp;
+        }
+        export let Timestamp: TimestampStatic;
+
+    }
+
+    export let BSONNative: typeof BSONPure;
+
+}
+
+export = bson;
diff --git a/bson/tsconfig.json b/bson/tsconfig.json
new file mode 100644
index 0000000000..a44e9fa503
--- /dev/null
+++ b/bson/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bson-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bucks/bucks-tests.ts b/bucks/bucks-tests.ts
index 5ebbd882cf..c996de4459 100644
--- a/bucks/bucks-tests.ts
+++ b/bucks/bucks-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="bucks.d.ts"/>
-
 function add_and_end() {
   //
   // new Bucks object
@@ -98,7 +96,6 @@ function error() {
   var b = new Bucks();
   b.then(function start() {
     throw new Error('error in start');
-    return 'start';
   }).error(function onError(e, next) {
     // e => 'error in start'
     return next();
diff --git a/bucks/bucks.d.ts b/bucks/index.d.ts
similarity index 100%
rename from bucks/bucks.d.ts
rename to bucks/index.d.ts
diff --git a/bucks/tsconfig.json b/bucks/tsconfig.json
new file mode 100644
index 0000000000..ba0598aff2
--- /dev/null
+++ b/bucks/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bucks-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/buffer-compare/buffer-compare-tests.ts b/buffer-compare/buffer-compare-tests.ts
index 88e6dddb94..0f43838bd4 100644
--- a/buffer-compare/buffer-compare-tests.ts
+++ b/buffer-compare/buffer-compare-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="./buffer-compare.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import compare = require('buffer-compare');
 
diff --git a/buffer-compare/buffer-compare.d.ts b/buffer-compare/buffer-compare.d.ts
deleted file mode 100644
index 47bd3fcbec..0000000000
--- a/buffer-compare/buffer-compare.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for buffer-compare
-// Project: https://github.com/soldair/node-buffer-compare
-// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "buffer-compare" {
-	interface List {
-		[index: number]: any;
-		length: number
-	}
-
-	function compare(cmp: List, to: List): number;
-	function compare<T>(cmp: T, to: T): number;
-	function compare<C, T>(cmp: C, to: T): number;
-
-	export = compare;
-}
diff --git a/buffer-compare/index.d.ts b/buffer-compare/index.d.ts
new file mode 100644
index 0000000000..bd61febdb7
--- /dev/null
+++ b/buffer-compare/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for buffer-compare
+// Project: https://github.com/soldair/node-buffer-compare
+// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface List {
+    [index: number]: any;
+    length: number
+}
+
+declare function compare(cmp: List, to: List): number;
+declare function compare<T>(cmp: T, to: T): number;
+declare function compare<C, T>(cmp: C, to: T): number;
+
+export = compare;
diff --git a/buffer-compare/tsconfig.json b/buffer-compare/tsconfig.json
new file mode 100644
index 0000000000..5ca9a18028
--- /dev/null
+++ b/buffer-compare/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "buffer-compare-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/buffer-equal/buffer-equal-tests.ts b/buffer-equal/buffer-equal-tests.ts
index 192051ab47..f025c2f4e6 100644
--- a/buffer-equal/buffer-equal-tests.ts
+++ b/buffer-equal/buffer-equal-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="buffer-equal.d.ts" />
 
 import bufferEqual = require('buffer-equal');
 
diff --git a/buffer-equal/buffer-equal.d.ts b/buffer-equal/buffer-equal.d.ts
deleted file mode 100644
index b3ede1fc1d..0000000000
--- a/buffer-equal/buffer-equal.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Type definitions for buffer-equal 0.0.1
-// Project: https://github.com/substack/node-buffer-equal
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'buffer-equal' {
-	function bufferEqual(actual:Buffer, expected:Buffer): boolean;
-	export = bufferEqual;
-}
diff --git a/buffer-equal/index.d.ts b/buffer-equal/index.d.ts
new file mode 100644
index 0000000000..b7862f6ee1
--- /dev/null
+++ b/buffer-equal/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for buffer-equal 0.0.1
+// Project: https://github.com/substack/node-buffer-equal
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+declare function bufferEqual(actual: Buffer, expected: Buffer): boolean;
+export = bufferEqual;
diff --git a/buffer-equal/tsconfig.json b/buffer-equal/tsconfig.json
new file mode 100644
index 0000000000..82cd53bcfe
--- /dev/null
+++ b/buffer-equal/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "buffer-equal-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/buffers/buffers-tests.ts b/buffers/buffers-tests.ts
index 0a51f97ae4..73dbd57794 100644
--- a/buffers/buffers-tests.ts
+++ b/buffers/buffers-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="buffers.d.ts" />
+
 import Buffers = require('buffers');
 
 var any: any;
diff --git a/buffers/buffers.d.ts b/buffers/buffers.d.ts
deleted file mode 100644
index e2ca5c2708..0000000000
--- a/buffers/buffers.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Type definitions for buffers 0.1.1
-// Project: https://github.com/substack/node-buffers
-// Definitions by: Robert Hencke <https://github.com/rhencke/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare module "buffers" {
-
-    interface BuffersStatics {
-        new (bufs?: Buffer[]|Buffers): Buffers;
-        (bufs?: Buffer[]| Buffers): Buffers;
-        prototype: Buffers;
-    }
-
-    interface Buffers {
-        buffers: Buffer[];
-        length: number;
-
-        push(...items: Buffer[]): number;
-        unshift(...items: Buffer[]): number;
-        slice(i?: number, j?: number): Buffer;
-        splice(i: number, howMany?: number, ...items: Buffer[]): Buffers;
-        copy(dst: Buffer, dstStart?: number, start?: number, end?: number): number;
-        get(i: number): any;
-        set(i: number, b: any): void;
-        indexOf(needle: string|Buffer, offset?: number): number;
-        toBuffer(): Buffer;
-        toString(encoding?: any, start?: number, end?: number): string;
-    }
-
-    var Buffers: BuffersStatics;
-
-    export = Buffers;
-
-}
diff --git a/buffers/index.d.ts b/buffers/index.d.ts
new file mode 100644
index 0000000000..ec8be5a493
--- /dev/null
+++ b/buffers/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for buffers 0.1.1
+// Project: https://github.com/substack/node-buffers
+// Definitions by: Robert Hencke <https://github.com/rhencke/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+
+interface BuffersStatics {
+    new (bufs?: Buffer[] | Buffers): Buffers;
+    (bufs?: Buffer[] | Buffers): Buffers;
+    prototype: Buffers;
+}
+
+interface Buffers {
+    buffers: Buffer[];
+    length: number;
+
+    push(...items: Buffer[]): number;
+    unshift(...items: Buffer[]): number;
+    slice(i?: number, j?: number): Buffer;
+    splice(i: number, howMany?: number, ...items: Buffer[]): Buffers;
+    copy(dst: Buffer, dstStart?: number, start?: number, end?: number): number;
+    get(i: number): any;
+    set(i: number, b: any): void;
+    indexOf(needle: string | Buffer, offset?: number): number;
+    toBuffer(): Buffer;
+    toString(encoding?: any, start?: number, end?: number): string;
+}
+
+declare var Buffers: BuffersStatics;
+
+export = Buffers;
diff --git a/buffers/tsconfig.json b/buffers/tsconfig.json
new file mode 100644
index 0000000000..8ed06f90d3
--- /dev/null
+++ b/buffers/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "buffers-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bufferstream/bufferstream-tests.ts b/bufferstream/bufferstream-tests.ts
index fe1ea70aa9..5d2bcbd4c7 100644
--- a/bufferstream/bufferstream-tests.ts
+++ b/bufferstream/bufferstream-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="bufferstream.d.ts" />
+
 
 import BufferStream = require('bufferstream')
 
diff --git a/bufferstream/bufferstream.d.ts b/bufferstream/bufferstream.d.ts
deleted file mode 100644
index ee115d0ab5..0000000000
--- a/bufferstream/bufferstream.d.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-// Type definitions for bufferstream v0.6.2
-// Project: https://github.com/dodo/node-bufferstream
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'bufferstream' {
-	import stream = require('stream');
-
-	export = BufferStream;
-
-	class BufferStream extends stream.Duplex {
-		constructor(options?: BufferStream.Opts);
-
-		/*
-		 different buffer behaviors can be triggered by size:
-
-		 none when output drains, bufferstream drains too
-		 flexible buffers everthing that it gets and not piping out
-		 <number> TODO buffer has given size. buffers everthing until buffer is full. when buffer is full then the stream will drain
-		*/
-		setSize(size: string): void; // can be one of ['none', 'flexible', <number>]
-		setSize(size: number): void; // can be one of ['none', 'flexible', <number>]
-		/*
-		 enables stream buffering default
-		*/
-		enable(): void;
-		/*
-		 flushes buffer and disables stream buffering. BufferStream now pipes all data as long as the output accepting data. when the output is draining BufferStream will buffer all input temporary.
-
-		 token[s] buffer splitters (should be String or Buffer)
-
-		 disables given tokens. wont flush until no splitter tokens are left.
-		*/
-		disable(): void;
-		disable(token: string, ...tokens: string[]): void;
-		disable(tokens: string[]): void; // Array
-		disable(token: Buffer, ...tokens: Buffer[]): void;
-		disable(tokens: Buffer[]): void; // Array
-		/*
-		 each time BufferStream finds a splitter token in the input data it will emit a split event. this also works for binary data.
-
-		 token[s] buffer splitters (should be String or Buffer)
-		*/
-		split(token: string, ...tokens: string[]): void;
-		split(tokens: string[]): void; // Array
-		split(token: Buffer, ...tokens: Buffer[]): void;
-		split(tokens: Buffer[]): void; // Array
-		/*
-		 returns Buffer.
-		*/
-		getBuffer(): Buffer;
-		/*
-		 returns Buffer.
-		*/
-		buffer: Buffer;
-		/*
-		 shortcut for buffer.toString()
-		*/
-		toString(): string;
-		/*
-		 shortcut for buffer.length
-		*/
-		length: number;
-	}
-	namespace BufferStream {
-
-		export interface Opts {
-			/*
-			 default encoding for writing strings
-			*/
-			encoding?: string;
-			/*
-			 if true and the source is a child_process the stream will block the entire process (timeouts wont work anymore, but splitting and listening on data still works, because they work sync)
-			*/
-			blocking?: boolean;
-			/*
-			 defines buffer level or sets buffer to given size (see ↓setSize for more)
-			*/
-			size?: any;
-			/*
-			 immediately call disable
-			*/
-			disabled?: boolean;
-			/*
-			 short form for:
-				split(token, function (chunk) {emit('data', chunk)})
-			*/
-			// String or Buffer
-			split?: any;
-		}
-		export var fn: {warn: boolean};
-	}
-}
-
-declare module 'bufferstream/postbuffer' {
-	import http = require('http');
-	import BufferStream = require('bufferstream');
-
-	class PostBuffer extends BufferStream {
-		/*
-		 for if you want to get all the post data from a http server request and do some db reqeust before.
-
-		 http client buffer
-		*/
-		constructor(req: http.ServerRequest);
-		/*
-			set a callback to get all post data from a http server request
-		*/
-		onEnd(callback: (data: any) => void): void;
-		/*
-		 pumps data into another stream to allow incoming streams given options will be passed to Stream.pipe
-		*/
-		pipe(stream: NodeJS.WritableStream, options?: BufferStream.Opts): NodeJS.ReadableStream;
-	}
-
-	export = PostBuffer;
-}
diff --git a/bufferstream/index.d.ts b/bufferstream/index.d.ts
new file mode 100644
index 0000000000..06ce5d96c4
--- /dev/null
+++ b/bufferstream/index.d.ts
@@ -0,0 +1,119 @@
+// Type definitions for bufferstream v0.6.2
+// Project: https://github.com/dodo/node-bufferstream
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare module 'bufferstream' {
+	import stream = require('stream');
+
+	export = BufferStream;
+
+	class BufferStream extends stream.Duplex {
+		constructor(options?: BufferStream.Opts);
+
+		/*
+		 different buffer behaviors can be triggered by size:
+
+		 none when output drains, bufferstream drains too
+		 flexible buffers everthing that it gets and not piping out
+		 <number> TODO buffer has given size. buffers everthing until buffer is full. when buffer is full then the stream will drain
+		*/
+		setSize(size: string): void; // can be one of ['none', 'flexible', <number>]
+		setSize(size: number): void; // can be one of ['none', 'flexible', <number>]
+		/*
+		 enables stream buffering default
+		*/
+		enable(): void;
+		/*
+		 flushes buffer and disables stream buffering. BufferStream now pipes all data as long as the output accepting data. when the output is draining BufferStream will buffer all input temporary.
+
+		 token[s] buffer splitters (should be String or Buffer)
+
+		 disables given tokens. wont flush until no splitter tokens are left.
+		*/
+		disable(): void;
+		disable(token: string, ...tokens: string[]): void;
+		disable(tokens: string[]): void; // Array
+		disable(token: Buffer, ...tokens: Buffer[]): void;
+		disable(tokens: Buffer[]): void; // Array
+		/*
+		 each time BufferStream finds a splitter token in the input data it will emit a split event. this also works for binary data.
+
+		 token[s] buffer splitters (should be String or Buffer)
+		*/
+		split(token: string, ...tokens: string[]): void;
+		split(tokens: string[]): void; // Array
+		split(token: Buffer, ...tokens: Buffer[]): void;
+		split(tokens: Buffer[]): void; // Array
+		/*
+		 returns Buffer.
+		*/
+		getBuffer(): Buffer;
+		/*
+		 returns Buffer.
+		*/
+		buffer: Buffer;
+		/*
+		 shortcut for buffer.toString()
+		*/
+		toString(): string;
+		/*
+		 shortcut for buffer.length
+		*/
+		length: number;
+	}
+	namespace BufferStream {
+
+		export interface Opts {
+			/*
+			 default encoding for writing strings
+			*/
+			encoding?: string;
+			/*
+			 if true and the source is a child_process the stream will block the entire process (timeouts wont work anymore, but splitting and listening on data still works, because they work sync)
+			*/
+			blocking?: boolean;
+			/*
+			 defines buffer level or sets buffer to given size (see ↓setSize for more)
+			*/
+			size?: any;
+			/*
+			 immediately call disable
+			*/
+			disabled?: boolean;
+			/*
+			 short form for:
+				split(token, function (chunk) {emit('data', chunk)})
+			*/
+			// String or Buffer
+			split?: any;
+		}
+		export var fn: {warn: boolean};
+	}
+}
+
+declare module 'bufferstream/postbuffer' {
+	import http = require('http');
+	import BufferStream = require('bufferstream');
+
+	class PostBuffer extends BufferStream {
+		/*
+		 for if you want to get all the post data from a http server request and do some db reqeust before.
+
+		 http client buffer
+		*/
+		constructor(req: http.ServerRequest);
+		/*
+			set a callback to get all post data from a http server request
+		*/
+		onEnd(callback: (data: any) => void): void;
+		/*
+		 pumps data into another stream to allow incoming streams given options will be passed to Stream.pipe
+		*/
+		pipe(stream: NodeJS.WritableStream, options?: BufferStream.Opts): NodeJS.ReadableStream;
+	}
+
+	export = PostBuffer;
+}
diff --git a/bufferstream/tsconfig.json b/bufferstream/tsconfig.json
new file mode 100644
index 0000000000..f9ba836771
--- /dev/null
+++ b/bufferstream/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bufferstream-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bugsnag/bugsnag-tests.ts b/bugsnag/bugsnag-tests.ts
index 8e91e03c6b..033abe2a34 100644
--- a/bugsnag/bugsnag-tests.ts
+++ b/bugsnag/bugsnag-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="bugsnag.d.ts" />
+
 
 Bugsnag.apiKey = "API-KEY";
 
diff --git a/bugsnag/bugsnag.d.ts b/bugsnag/index.d.ts
similarity index 100%
rename from bugsnag/bugsnag.d.ts
rename to bugsnag/index.d.ts
diff --git a/bugsnag/tsconfig.json b/bugsnag/tsconfig.json
new file mode 100644
index 0000000000..0b1b4625ca
--- /dev/null
+++ b/bugsnag/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bugsnag-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bull/bull-tests.ts.tscparams b/bull/bull-tests.ts.tscparams
deleted file mode 100644
index 6641df12d4..0000000000
--- a/bull/bull-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny --module commonjs
diff --git a/bull/bull-tests.tsx b/bull/bull-tests.tsx
index bd25efc0c9..1d307fd31e 100644
--- a/bull/bull-tests.tsx
+++ b/bull/bull-tests.tsx
@@ -2,9 +2,6 @@
  * Created by Bruno Grieder
  */
 
-///<reference path="./bull.d.ts" />
-
-
 import * as Queue from "bull"
 
 var videoQueue = Queue( 'video transcoding', 6379, '127.0.0.1' );
@@ -87,16 +84,17 @@ interface VideoJob extends Queue.Job {
 
 videoQueue.process( ( job: VideoJob ) => { // don't forget to remove the done callback!
     // Simply return a promise
-    return fetchVideo( job.data.url ).then( transcodeVideo );
+    fetchVideo( job.data.url ).then( transcodeVideo );
 
     // Handles promise rejection
-    return Promise.reject( new Error( 'error transcoding' ) );
+    Promise.reject( new Error( 'error transcoding' ) );
 
     // Passes the value the promise is resolved with to the "completed" event
-    return Promise.resolve( { framerate: 29.5 /* etc... */ } );
+    Promise.resolve( { framerate: 29.5 /* etc... */ } );
+
+    // same as
+    Promise.reject( new Error( 'some unexpected error' ) );
 
     // If the job throws an unhandled exception it is also handled correctly
     throw new Error( 'some unexpected error' );
-    // same as
-    return Promise.reject( new Error( 'some unexpected error' ) );
 } );
diff --git a/bull/bull.d.ts b/bull/bull.d.ts
deleted file mode 100644
index e04a9f21e8..0000000000
--- a/bull/bull.d.ts
+++ /dev/null
@@ -1,309 +0,0 @@
-// Type definitions for bull 0.7.0
-// Project: https://github.com/OptimalBits/bull
-// Definitions by: Bruno Grieder <https://github.com/bgrieder>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../redis/redis.d.ts" />
-
-declare module "bull" {
-
-    import * as Redis from "redis";
-
-    /**
-    * This is the Queue constructor.
-    * It creates a new Queue that is persisted in Redis.
-    * Everytime the same queue is instantiated it tries to process all the old jobs that may exist from a previous unfinished session.
-    */
-    function Bull(queueName: string, redisPort: number, redisHost: string, redisOpt?: Redis.ClientOpts): Bull.Queue;
-
-    namespace Bull {
-
-        export interface DoneCallback {
-            (error?: Error, value?: any): void
-        }
-
-        export interface Job {
-
-            id: string
-
-            /**
-            * The custom data passed when the job was created
-            */
-            data: Object;
-
-            /**
-             * Report progress on a job
-             */
-            progress(value: any): Promise<void>;
-
-            /**
-             * Removes a Job from the queue from all the lists where it may be included.
-             * @returns {Promise} A promise that resolves when the job is removed.
-             */
-            remove(): Promise<void>;
-
-            /**
-             * Rerun a Job that has failed.
-             * @returns {Promise} A promise that resolves when the job is scheduled for retry.
-             */
-            retry(): Promise<void>;
-        }
-
-        export interface Backoff {
-
-            /**
-             * Backoff type, which can be either `fixed` or `exponential`
-             */
-            type: string
-
-            /**
-             * Backoff delay, in milliseconds
-             */
-            delay: number;
-        }
-
-        export interface AddOptions {
-            /**
-             * An amount of miliseconds to wait until this job can be processed.
-             * Note that for accurate delays, both server and clients should have their clocks synchronized
-             */
-            delay?: number;
-
-            /**
-             * A number of attempts to retry if the job fails [optional]
-             */
-            attempts?: number;
-
-            /**
-             * Backoff setting for automatic retries if the job fails
-             */
-            backoff?: number | Backoff
-
-            /**
-             * A boolean which, if true, adds the job to the right
-             * of the queue instead of the left (default false)
-             */
-            lifo?: boolean;
-
-            /**
-             *  The number of milliseconds after which the job should be fail with a timeout error
-             */
-            timeout?: number;
-        }
-
-        export interface Queue {
-
-            /**
-             * Defines a processing function for the jobs placed into a given Queue.
-             *
-             * The callback is called everytime a job is placed in the queue.
-             * It is passed an instance of the job as first argument.
-             *
-             * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
-             * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
-             * Errors will be passed as a second argument to the "failed" event;
-             * results, as a second argument to the "completed" event.
-             *
-             * concurrency: Bull will then call you handler in parallel respecting this max number.
-            */
-            process(concurrency: number, callback: (job: Job, done: DoneCallback) => void): void;
-
-            /**
-             * Defines a processing function for the jobs placed into a given Queue.
-             *
-             * The callback is called everytime a job is placed in the queue.
-             * It is passed an instance of the job as first argument.
-             *
-             * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
-             * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
-             * Errors will be passed as a second argument to the "failed" event;
-             * results, as a second argument to the "completed" event.
-            */
-            process(callback: (job: Job, done: DoneCallback) => void): void;
-
-            /**
-             * Defines a processing function for the jobs placed into a given Queue.
-             *
-             * The callback is called everytime a job is placed in the queue.
-             * It is passed an instance of the job as first argument.
-             *
-             * A promise must be returned to signal job completion.
-             * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
-             * If it is resolved, its value will be the "completed" event's second argument.
-             *
-             * concurrency: Bull will then call you handler in parallel respecting this max number.
-            */
-            process(concurrency: number, callback: (job: Job) => void): Promise<any>;
-
-            /**
-             * Defines a processing function for the jobs placed into a given Queue.
-             *
-             * The callback is called everytime a job is placed in the queue.
-             * It is passed an instance of the job as first argument.
-             *
-             * A promise must be returned to signal job completion.
-             * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
-             * If it is resolved, its value will be the "completed" event's second argument.
-            */
-            process(callback: (job: Job) => void): Promise<any>;
-
-            // process(callback: (job: Job, done?: DoneCallback) => void): Promise<any>;
-
-            /**
-             * Creates a new job and adds it to the queue.
-             * If the queue is empty the job will be executed directly,
-             * otherwise it will be placed in the queue and executed as soon as possible.
-             */
-            add(data: Object, opts?: AddOptions): Promise<Job>;
-
-            /**
-             * Returns a promise that resolves when the queue is paused.
-             * The pause is global, meaning that all workers in all queue instances for a given queue will be paused.
-             * A paused queue will not process new jobs until resumed,
-             * but current jobs being processed will continue until they are finalized.
-             *
-             * Pausing a queue that is already paused does nothing.
-             */
-            pause(): Promise<void>;
-
-            /**
-             * Returns a promise that resolves when the queue is resumed after being paused.
-             * The resume is global, meaning that all workers in all queue instances for a given queue will be resumed.
-             *
-             * Resuming a queue that is not paused does nothing.
-             */
-            resume(): Promise<void>;
-
-            /**
-             * Returns a promise that returns the number of jobs in the queue, waiting or paused.
-             * Since there may be other processes adding or processing jobs, this value may be true only for a very small amount of time.
-             */
-            count(): Promise<number>;
-
-            /**
-             * Empties a queue deleting all the input lists and associated jobs.
-             */
-            empty(): Promise<void>;
-
-            /**
-             * Closes the underlying redis client. Use this to perform a graceful shutdown.
-             *
-             * `close` can be called from anywhere, with one caveat:
-             * if called from within a job handler the queue won't close until after the job has been processed
-             */
-            close(): Promise<void>;
-
-            /**
-             * Returns a promise that will return the job instance associated with the jobId parameter.
-             * If the specified job cannot be located, the promise callback parameter will be set to null.
-             */
-            getJob(jobId: string): Promise<Job>;
-
-            /**
-             * Tells the queue remove all jobs created outside of a grace period in milliseconds.
-             * You can clean the jobs with the following states: completed, waiting, active, delayed, and failed.
-             */
-            clean(gracePeriod: number, jobsState?: string): Promise<Job[]>;
-
-            /**
-             * Listens to queue events
-             * 'ready', 'error', 'activ', 'progress', 'completed', 'failed', 'paused', 'resumed', 'cleaned'
-             */
-            on(eventName: string, callback: EventCallback): void;
-        }
-
-        interface EventCallback {
-            (...args: any[]): void
-        }
-
-        interface ReadyEventCallback extends EventCallback {
-            (): void;
-        }
-
-        interface ErrorEventCallback extends EventCallback {
-            (error: Error): void;
-        }
-
-        interface JobPromise {
-            /**
-             * Abort this job
-             */
-            cancel(): void
-        }
-
-        interface ActiveEventCallback extends EventCallback {
-            (job: Job, jobPromise: JobPromise): void;
-        }
-
-        interface ProgressEventCallback extends EventCallback {
-            (job: Job, progress: any): void;
-        }
-
-        interface CompletedEventCallback extends EventCallback {
-            (job: Job, result: Object): void;
-        }
-
-        interface FailedEventCallback extends EventCallback {
-            (job: Job, error: Error): void;
-        }
-
-        interface PausedEventCallback extends EventCallback {
-            (): void;
-        }
-
-        interface ResumedEventCallback extends EventCallback {
-            (job?: Job): void;
-        }
-
-        /**
-         * @see clean() for details
-         */
-        interface CleanedEventCallback extends EventCallback {
-            (jobs: Job[], type: string): void;
-        }
-    }
-
-    export = Bull;
-}
-
-declare module "bull/lib/priority-queue" {
-
-    import * as Bull from "bull";
-    import * as Redis from "redis";
-
-    /**
-     * This is the Queue constructor of priority queue.
-     *
-     * It works same a normal queue, with same function and parameters.
-     * The only difference is that the Queue#add() allow an options opts.priority
-     * that could take ["low", "normal", "medium", "hight", "critical"]. If no options provider, "normal" will be taken.
-     *
-     * The priority queue will process more often highter priority jobs than lower.
-     */
-    function PQueue(queueName: string, redisPort: number, redisHost: string, redisOpt?: Redis.ClientOpts): PQueue.PriorityQueue;
-
-    namespace PQueue {
-
-        export interface AddOptions extends Bull.AddOptions {
-
-            /**
-             * "low", "normal", "medium", "high", "critical"
-             */
-            priority?: string;
-        }
-
-
-        export interface PriorityQueue extends Bull.Queue {
-
-            /**
-             * Creates a new job and adds it to the queue.
-             * If the queue is empty the job will be executed directly,
-             * otherwise it will be placed in the queue and executed as soon as possible.
-             */
-            add(data: Object, opts?: PQueue.AddOptions): Promise<Bull.Job>;
-
-        }
-    }
-
-    export = PQueue;
-}
diff --git a/bull/index.d.ts b/bull/index.d.ts
new file mode 100644
index 0000000000..fc7e8ac015
--- /dev/null
+++ b/bull/index.d.ts
@@ -0,0 +1,308 @@
+// Type definitions for bull 0.7.0
+// Project: https://github.com/OptimalBits/bull
+// Definitions by: Bruno Grieder <https://github.com/bgrieder>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare module "bull" {
+
+    import * as Redis from "redis";
+
+    /**
+    * This is the Queue constructor.
+    * It creates a new Queue that is persisted in Redis.
+    * Everytime the same queue is instantiated it tries to process all the old jobs that may exist from a previous unfinished session.
+    */
+    function Bull(queueName: string, redisPort: number, redisHost: string, redisOpt?: Redis.ClientOpts): Bull.Queue;
+
+    namespace Bull {
+
+        export interface DoneCallback {
+            (error?: Error, value?: any): void
+        }
+
+        export interface Job {
+
+            id: string
+
+            /**
+            * The custom data passed when the job was created
+            */
+            data: Object;
+
+            /**
+             * Report progress on a job
+             */
+            progress(value: any): Promise<void>;
+
+            /**
+             * Removes a Job from the queue from all the lists where it may be included.
+             * @returns {Promise} A promise that resolves when the job is removed.
+             */
+            remove(): Promise<void>;
+
+            /**
+             * Rerun a Job that has failed.
+             * @returns {Promise} A promise that resolves when the job is scheduled for retry.
+             */
+            retry(): Promise<void>;
+        }
+
+        export interface Backoff {
+
+            /**
+             * Backoff type, which can be either `fixed` or `exponential`
+             */
+            type: string
+
+            /**
+             * Backoff delay, in milliseconds
+             */
+            delay: number;
+        }
+
+        export interface AddOptions {
+            /**
+             * An amount of miliseconds to wait until this job can be processed.
+             * Note that for accurate delays, both server and clients should have their clocks synchronized
+             */
+            delay?: number;
+
+            /**
+             * A number of attempts to retry if the job fails [optional]
+             */
+            attempts?: number;
+
+            /**
+             * Backoff setting for automatic retries if the job fails
+             */
+            backoff?: number | Backoff
+
+            /**
+             * A boolean which, if true, adds the job to the right
+             * of the queue instead of the left (default false)
+             */
+            lifo?: boolean;
+
+            /**
+             *  The number of milliseconds after which the job should be fail with a timeout error
+             */
+            timeout?: number;
+        }
+
+        export interface Queue {
+
+            /**
+             * Defines a processing function for the jobs placed into a given Queue.
+             *
+             * The callback is called everytime a job is placed in the queue.
+             * It is passed an instance of the job as first argument.
+             *
+             * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
+             * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
+             * Errors will be passed as a second argument to the "failed" event;
+             * results, as a second argument to the "completed" event.
+             *
+             * concurrency: Bull will then call you handler in parallel respecting this max number.
+            */
+            process(concurrency: number, callback: (job: Job, done: DoneCallback) => void): void;
+
+            /**
+             * Defines a processing function for the jobs placed into a given Queue.
+             *
+             * The callback is called everytime a job is placed in the queue.
+             * It is passed an instance of the job as first argument.
+             *
+             * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
+             * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
+             * Errors will be passed as a second argument to the "failed" event;
+             * results, as a second argument to the "completed" event.
+            */
+            process(callback: (job: Job, done: DoneCallback) => void): void;
+
+            /**
+             * Defines a processing function for the jobs placed into a given Queue.
+             *
+             * The callback is called everytime a job is placed in the queue.
+             * It is passed an instance of the job as first argument.
+             *
+             * A promise must be returned to signal job completion.
+             * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
+             * If it is resolved, its value will be the "completed" event's second argument.
+             *
+             * concurrency: Bull will then call you handler in parallel respecting this max number.
+            */
+            process(concurrency: number, callback: (job: Job) => void): Promise<any>;
+
+            /**
+             * Defines a processing function for the jobs placed into a given Queue.
+             *
+             * The callback is called everytime a job is placed in the queue.
+             * It is passed an instance of the job as first argument.
+             *
+             * A promise must be returned to signal job completion.
+             * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
+             * If it is resolved, its value will be the "completed" event's second argument.
+            */
+            process(callback: (job: Job) => void): Promise<any>;
+
+            // process(callback: (job: Job, done?: DoneCallback) => void): Promise<any>;
+
+            /**
+             * Creates a new job and adds it to the queue.
+             * If the queue is empty the job will be executed directly,
+             * otherwise it will be placed in the queue and executed as soon as possible.
+             */
+            add(data: Object, opts?: AddOptions): Promise<Job>;
+
+            /**
+             * Returns a promise that resolves when the queue is paused.
+             * The pause is global, meaning that all workers in all queue instances for a given queue will be paused.
+             * A paused queue will not process new jobs until resumed,
+             * but current jobs being processed will continue until they are finalized.
+             *
+             * Pausing a queue that is already paused does nothing.
+             */
+            pause(): Promise<void>;
+
+            /**
+             * Returns a promise that resolves when the queue is resumed after being paused.
+             * The resume is global, meaning that all workers in all queue instances for a given queue will be resumed.
+             *
+             * Resuming a queue that is not paused does nothing.
+             */
+            resume(): Promise<void>;
+
+            /**
+             * Returns a promise that returns the number of jobs in the queue, waiting or paused.
+             * Since there may be other processes adding or processing jobs, this value may be true only for a very small amount of time.
+             */
+            count(): Promise<number>;
+
+            /**
+             * Empties a queue deleting all the input lists and associated jobs.
+             */
+            empty(): Promise<void>;
+
+            /**
+             * Closes the underlying redis client. Use this to perform a graceful shutdown.
+             *
+             * `close` can be called from anywhere, with one caveat:
+             * if called from within a job handler the queue won't close until after the job has been processed
+             */
+            close(): Promise<void>;
+
+            /**
+             * Returns a promise that will return the job instance associated with the jobId parameter.
+             * If the specified job cannot be located, the promise callback parameter will be set to null.
+             */
+            getJob(jobId: string): Promise<Job>;
+
+            /**
+             * Tells the queue remove all jobs created outside of a grace period in milliseconds.
+             * You can clean the jobs with the following states: completed, waiting, active, delayed, and failed.
+             */
+            clean(gracePeriod: number, jobsState?: string): Promise<Job[]>;
+
+            /**
+             * Listens to queue events
+             * 'ready', 'error', 'activ', 'progress', 'completed', 'failed', 'paused', 'resumed', 'cleaned'
+             */
+            on(eventName: string, callback: EventCallback): void;
+        }
+
+        interface EventCallback {
+            (...args: any[]): void
+        }
+
+        interface ReadyEventCallback extends EventCallback {
+            (): void;
+        }
+
+        interface ErrorEventCallback extends EventCallback {
+            (error: Error): void;
+        }
+
+        interface JobPromise {
+            /**
+             * Abort this job
+             */
+            cancel(): void
+        }
+
+        interface ActiveEventCallback extends EventCallback {
+            (job: Job, jobPromise: JobPromise): void;
+        }
+
+        interface ProgressEventCallback extends EventCallback {
+            (job: Job, progress: any): void;
+        }
+
+        interface CompletedEventCallback extends EventCallback {
+            (job: Job, result: Object): void;
+        }
+
+        interface FailedEventCallback extends EventCallback {
+            (job: Job, error: Error): void;
+        }
+
+        interface PausedEventCallback extends EventCallback {
+            (): void;
+        }
+
+        interface ResumedEventCallback extends EventCallback {
+            (job?: Job): void;
+        }
+
+        /**
+         * @see clean() for details
+         */
+        interface CleanedEventCallback extends EventCallback {
+            (jobs: Job[], type: string): void;
+        }
+    }
+
+    export = Bull;
+}
+
+declare module "bull/lib/priority-queue" {
+
+    import * as Bull from "bull";
+    import * as Redis from "redis";
+
+    /**
+     * This is the Queue constructor of priority queue.
+     *
+     * It works same a normal queue, with same function and parameters.
+     * The only difference is that the Queue#add() allow an options opts.priority
+     * that could take ["low", "normal", "medium", "hight", "critical"]. If no options provider, "normal" will be taken.
+     *
+     * The priority queue will process more often highter priority jobs than lower.
+     */
+    function PQueue(queueName: string, redisPort: number, redisHost: string, redisOpt?: Redis.ClientOpts): PQueue.PriorityQueue;
+
+    namespace PQueue {
+
+        export interface AddOptions extends Bull.AddOptions {
+
+            /**
+             * "low", "normal", "medium", "high", "critical"
+             */
+            priority?: string;
+        }
+
+
+        export interface PriorityQueue extends Bull.Queue {
+
+            /**
+             * Creates a new job and adds it to the queue.
+             * If the queue is empty the job will be executed directly,
+             * otherwise it will be placed in the queue and executed as soon as possible.
+             */
+            add(data: Object, opts?: PQueue.AddOptions): Promise<Bull.Job>;
+
+        }
+    }
+
+    export = PQueue;
+}
diff --git a/bull/tsconfig.json b/bull/tsconfig.json
new file mode 100644
index 0000000000..eb40d231fa
--- /dev/null
+++ b/bull/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bull-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/bunyan-logentries/bunyan-logentries-tests.ts b/bunyan-logentries/bunyan-logentries-tests.ts
index d0e4874898..a644d028e4 100644
--- a/bunyan-logentries/bunyan-logentries-tests.ts
+++ b/bunyan-logentries/bunyan-logentries-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="./bunyan-logentries.d.ts" />
-/// <reference path="../bunyan/bunyan.d.ts" />
-
 import bunyan = require("bunyan");
 import bunyanLogentries = require("bunyan-logentries");
 
diff --git a/bunyan-logentries/bunyan-logentries.d.ts b/bunyan-logentries/bunyan-logentries.d.ts
deleted file mode 100644
index bc91174dc1..0000000000
--- a/bunyan-logentries/bunyan-logentries.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for node-bunyan-logentries v0.1.0
-// Project: https://github.com/nemtsov/node-bunyan-logentries
-// Definitions by: Aymeric Beaumet <http://aymericbeaumet.me>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../bunyan/bunyan.d.ts" />
-
-declare module "bunyan-logentries" {
-  import bunyan = require("bunyan");
-
-  interface StreamOptions {
-    token: string;
-  }
-
-  export function createStream(options: StreamOptions): NodeJS.WritableStream;
-}
diff --git a/bunyan-logentries/index.d.ts b/bunyan-logentries/index.d.ts
new file mode 100644
index 0000000000..9a2a5c3fb9
--- /dev/null
+++ b/bunyan-logentries/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for node-bunyan-logentries v0.1.0
+// Project: https://github.com/nemtsov/node-bunyan-logentries
+// Definitions by: Aymeric Beaumet <http://aymericbeaumet.me>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import bunyan = require("bunyan");
+
+interface StreamOptions {
+    token: string;
+}
+
+export declare function createStream(options: StreamOptions): NodeJS.WritableStream;
diff --git a/bunyan-logentries/tsconfig.json b/bunyan-logentries/tsconfig.json
new file mode 100644
index 0000000000..b62ab6686d
--- /dev/null
+++ b/bunyan-logentries/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bunyan-logentries-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bunyan-prettystream/bunyan-prettystream-tests.ts b/bunyan-prettystream/bunyan-prettystream-tests.ts
index 3dd7b15a31..49a3d405dc 100644
--- a/bunyan-prettystream/bunyan-prettystream-tests.ts
+++ b/bunyan-prettystream/bunyan-prettystream-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="bunyan-prettystream.d.ts" />
 
 import PrettyStream = require("bunyan-prettystream");
 var stream = new PrettyStream();
diff --git a/bunyan-prettystream/bunyan-prettystream.d.ts b/bunyan-prettystream/bunyan-prettystream.d.ts
deleted file mode 100644
index 297e63731c..0000000000
--- a/bunyan-prettystream/bunyan-prettystream.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Type definitions for bunyan-prettystream 0.1.3
-// Project: https://www.npmjs.com/package/bunyan-prettystream
-// Definitions by: Jason Swearingen <https://github.com/jasonswearingen/>, Vadim Macagon <https://github.com/enlight/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "bunyan-prettystream" {
-	import stream = require("stream");
-	class PrettyStream extends stream.Writable {
-		/**
-		 * @param options.mode Output format, can be either `long`, `short`, or `dev`,
-		 *                     defaults to `long`.
-		 * @param options.useColor Indicates whether or not output should be colored,
-		 *                         defaults to `true`.
-		 */
-		constructor(options?: { mode?: string; useColor?: boolean });
-
-		/**
-		 * Pipes data from this stream to another.
-		 *
-		 * @param destination Stream to write data to.
-		 * @param options.end Indicates whether `end()` should be called on the `destination`
-		 *                    stream when this stream emits `end`, defaults to `true`.
-		 * @return The `destination` stream.
-		 */
-		pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
-	}
-	export = PrettyStream;
-}
\ No newline at end of file
diff --git a/bunyan-prettystream/index.d.ts b/bunyan-prettystream/index.d.ts
new file mode 100644
index 0000000000..04c328b058
--- /dev/null
+++ b/bunyan-prettystream/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for bunyan-prettystream 0.1.3
+// Project: https://www.npmjs.com/package/bunyan-prettystream
+// Definitions by: Jason Swearingen <https://github.com/jasonswearingen/>, Vadim Macagon <https://github.com/enlight/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import stream = require("stream");
+declare class PrettyStream extends stream.Writable {
+    /**
+     * @param options.mode Output format, can be either `long`, `short`, or `dev`,
+     *                     defaults to `long`.
+     * @param options.useColor Indicates whether or not output should be colored,
+     *                         defaults to `true`.
+     */
+    constructor(options?: { mode?: string; useColor?: boolean });
+
+    /**
+     * Pipes data from this stream to another.
+     *
+     * @param destination Stream to write data to.
+     * @param options.end Indicates whether `end()` should be called on the `destination`
+     *                    stream when this stream emits `end`, defaults to `true`.
+     * @return The `destination` stream.
+     */
+    pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
+}
+export = PrettyStream;
diff --git a/bunyan-prettystream/tsconfig.json b/bunyan-prettystream/tsconfig.json
new file mode 100644
index 0000000000..1f519f5495
--- /dev/null
+++ b/bunyan-prettystream/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bunyan-prettystream-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bunyan/bunyan-tests.ts b/bunyan/bunyan-tests.ts
index 2575f043d8..86a24f6bef 100644
--- a/bunyan/bunyan-tests.ts
+++ b/bunyan/bunyan-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="bunyan.d.ts" />
 
 import * as bunyan from 'bunyan';
 
diff --git a/bunyan/bunyan.d.ts b/bunyan/bunyan.d.ts
deleted file mode 100644
index 4ea2668a2b..0000000000
--- a/bunyan/bunyan.d.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-// Type definitions for node-bunyan
-// Project: https://github.com/trentm/node-bunyan
-// Definitions by: Alex Mikhalev <https://github.com/amikhalev>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "bunyan" {
-    import { EventEmitter } from 'events';
-
-    class Logger extends EventEmitter {
-        constructor(options:LoggerOptions);
-        addStream(stream:Stream):void;
-        addSerializers(serializers:Serializers):void;
-        child(options:LoggerOptions, simple?:boolean):Logger;
-        child(obj:Object, simple?:boolean):Logger;
-        reopenFileStreams():void;
-
-        level():string|number;
-        level(value: number | string):void;
-        levels(name: number | string, value: number | string):void;
-
-        trace(error:Error, format?:any, ...params:any[]):void;
-        trace(buffer:Buffer, format?:any, ...params:any[]):void;
-        trace(obj:Object, format?:any, ...params:any[]):void;
-        trace(format:string, ...params:any[]):void;
-        debug(error:Error, format?:any, ...params:any[]):void;
-        debug(buffer:Buffer, format?:any, ...params:any[]):void;
-        debug(obj:Object, format?:any, ...params:any[]):void;
-        debug(format:string, ...params:any[]):void;
-        info(error:Error, format?:any, ...params:any[]):void;
-        info(buffer:Buffer, format?:any, ...params:any[]):void;
-        info(obj:Object, format?:any, ...params:any[]):void;
-        info(format:string, ...params:any[]):void;
-        warn(error:Error, format?:any, ...params:any[]):void;
-        warn(buffer:Buffer, format?:any, ...params:any[]):void;
-        warn(obj:Object, format?:any, ...params:any[]):void;
-        warn(format:string, ...params:any[]):void;
-        error(error:Error, format?:any, ...params:any[]):void;
-        error(buffer:Buffer, format?:any, ...params:any[]):void;
-        error(obj:Object, format?:any, ...params:any[]):void;
-        error(format:string, ...params:any[]):void;
-        fatal(error:Error, format?:any, ...params:any[]):void;
-        fatal(buffer:Buffer, format?:any, ...params:any[]):void;
-        fatal(obj:Object, format?:any, ...params:any[]):void;
-        fatal(format:string, ...params:any[]):void;
-    }
-
-    interface LoggerOptions {
-        name: string;
-        streams?: Stream[];
-        level?: string | number;
-        stream?: NodeJS.WritableStream;
-        serializers?: Serializers;
-        src?: boolean;
-    }
-
-    interface Serializers {
-        [key:string]: (input:any) => string;
-    }
-
-    interface Stream {
-        type?: string;
-        level?: number | string;
-        path?: string;
-        stream?: NodeJS.WritableStream | Stream;
-        closeOnExit?: boolean;
-        period?: string;
-        count?: number;
-    }
-
-    export var stdSerializers:Serializers;
-
-    export var TRACE:number;
-    export var DEBUG:number;
-    export var INFO:number;
-    export var WARN:number;
-    export var ERROR:number;
-    export var FATAL:number;
-
-    export function resolveLevel(value: number | string):number;
-
-    export function createLogger(options:LoggerOptions):Logger;
-
-    class RingBuffer extends EventEmitter {
-        constructor(options:RingBufferOptions);
-
-        writable:boolean;
-        records:any[];
-
-        write(record:any):void;
-        end(record?:any):void;
-        destroy():void;
-        destroySoon():void;
-    }
-
-    interface RingBufferOptions {
-        limit?: number;
-    }
-
-    export function safeCycles():(key:string, value:any) => any;
-}
diff --git a/bunyan/index.d.ts b/bunyan/index.d.ts
new file mode 100644
index 0000000000..ade8577847
--- /dev/null
+++ b/bunyan/index.d.ts
@@ -0,0 +1,104 @@
+// Type definitions for node-bunyan
+// Project: https://github.com/trentm/node-bunyan
+// Definitions by: Alex Mikhalev <https://github.com/amikhalev>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import { EventEmitter } from 'events';
+
+declare class Logger extends EventEmitter {
+    constructor(options: LoggerOptions);
+    addStream(stream: Stream): void;
+    addSerializers(serializers: Serializers): void;
+    child(options: LoggerOptions, simple?: boolean): Logger;
+    child(obj: Object, simple?: boolean): Logger;
+    reopenFileStreams(): void;
+
+    level(): string | number;
+    level(value: number | string): void;
+    levels(name: number | string, value: number | string): void;
+
+    fields: any;
+    src: boolean;
+
+    trace(error: Error, format?: any, ...params: any[]): void;
+    trace(buffer: Buffer, format?: any, ...params: any[]): void;
+    trace(obj: Object, format?: any, ...params: any[]): void;
+    trace(format: string, ...params: any[]): void;
+    debug(error: Error, format?: any, ...params: any[]): void;
+    debug(buffer: Buffer, format?: any, ...params: any[]): void;
+    debug(obj: Object, format?: any, ...params: any[]): void;
+    debug(format: string, ...params: any[]): void;
+    info(error: Error, format?: any, ...params: any[]): void;
+    info(buffer: Buffer, format?: any, ...params: any[]): void;
+    info(obj: Object, format?: any, ...params: any[]): void;
+    info(format: string, ...params: any[]): void;
+    warn(error: Error, format?: any, ...params: any[]): void;
+    warn(buffer: Buffer, format?: any, ...params: any[]): void;
+    warn(obj: Object, format?: any, ...params: any[]): void;
+    warn(format: string, ...params: any[]): void;
+    error(error: Error, format?: any, ...params: any[]): void;
+    error(buffer: Buffer, format?: any, ...params: any[]): void;
+    error(obj: Object, format?: any, ...params: any[]): void;
+    error(format: string, ...params: any[]): void;
+    fatal(error: Error, format?: any, ...params: any[]): void;
+    fatal(buffer: Buffer, format?: any, ...params: any[]): void;
+    fatal(obj: Object, format?: any, ...params: any[]): void;
+    fatal(format: string, ...params: any[]): void;
+}
+
+interface LoggerOptions {
+    name: string;
+    streams?: Stream[];
+    level?: string | number;
+    stream?: NodeJS.WritableStream;
+    serializers?: Serializers;
+    src?: boolean;
+}
+
+interface Serializers {
+    [key: string]: (input: any) => string;
+}
+
+interface Stream {
+    type?: string;
+    level?: number | string;
+    path?: string;
+    stream?: NodeJS.WritableStream | Stream;
+    closeOnExit?: boolean;
+    period?: string;
+    count?: number;
+}
+
+export declare var stdSerializers: Serializers;
+
+export declare var TRACE: number;
+export declare var DEBUG: number;
+export declare var INFO: number;
+export declare var WARN: number;
+export declare var ERROR: number;
+export declare var FATAL: number;
+
+export declare function resolveLevel(value: number | string): number;
+
+export declare function createLogger(options: LoggerOptions): Logger;
+
+declare class RingBuffer extends EventEmitter {
+    constructor(options: RingBufferOptions);
+
+    writable: boolean;
+    records: any[];
+
+    write(record: any): void;
+    end(record?: any): void;
+    destroy(): void;
+    destroySoon(): void;
+}
+
+interface RingBufferOptions {
+    limit?: number;
+}
+
+export declare function safeCycles(): (key: string, value: any) => any;
diff --git a/bunyan/tsconfig.json b/bunyan/tsconfig.json
new file mode 100644
index 0000000000..2beee66906
--- /dev/null
+++ b/bunyan/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bunyan-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/business-rules-engine/BasicValidators.d.ts b/business-rules-engine/BasicValidators.d.ts
deleted file mode 100644
index aa176d94a2..0000000000
--- a/business-rules-engine/BasicValidators.d.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-// Type definitions for business-rules-engine - v1.0.20
-// Project: https://github.com/rsamec/form
-// Definitions by: Roman Samec <https://github.com/rsamec>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../underscore/underscore.d.ts" />
-/// <reference path="../q/Q.d.ts" />
-/// <reference path="../moment/moment.d.ts" />
-/// <reference path="../node/node.d.ts" />
-/// <reference path="business-rules-engine.d.ts" />
-declare namespace Validators {
-    class LettersOnlyValidator implements Validation.IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class ZipCodeValidator implements Validation.IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class EmailValidator implements Validation.IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class UrlValidator implements Validation.IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class RequiredValidator implements Validation.IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class DateValidator implements Validation.IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class DateISOValidator implements Validation.IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class NumberValidator implements Validation.IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class DigitValidator implements Validation.IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class SignedDigitValidator implements Validation.IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class MinLengthValidator implements Validation.IStringValidator {
-        public MinLength: number;
-        constructor(MinLength?: number);
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class MaxLengthValidator implements Validation.IStringValidator {
-        public MaxLength: number;
-        constructor(MaxLength?: number);
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class RangeLengthValidator implements Validation.IStringValidator {
-        public RangeLength: number[];
-        constructor(RangeLength?: number[]);
-        public isAcceptable(s: string): boolean;
-        public MinLength : number;
-        public MaxLength : number;
-        public tagName: string;
-    }
-    class MinValidator implements Validation.IPropertyValidator {
-        public Min: number;
-        constructor(Min?: number);
-        public isAcceptable(s: any): boolean;
-        public tagName: string;
-    }
-    class MaxValidator implements Validation.IPropertyValidator {
-        public Max: number;
-        constructor(Max?: number);
-        public isAcceptable(s: any): boolean;
-        public tagName: string;
-    }
-    class RangeValidator implements Validation.IPropertyValidator {
-        public Range: number[];
-        constructor(Range?: number[]);
-        public isAcceptable(s: any): boolean;
-        public Min : number;
-        public Max : number;
-        public tagName: string;
-    }
-    class StepValidator implements Validation.IPropertyValidator {
-        public Step: string;
-        constructor(Step?: string);
-        public isAcceptable(s: any): boolean;
-        public tagName: string;
-    }
-    class PatternValidator implements Validation.IStringValidator {
-        public Pattern: string;
-        constructor(Pattern?: string);
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class ContainsValidator implements Validation.IAsyncPropertyValidator {
-        public Options: Q.Promise<any[]>;
-        constructor(Options: Q.Promise<any[]>);
-        public isAcceptable(s: string): Q.Promise<boolean>;
-        public isAsync: boolean;
-        public tagName: string;
-    }
-}
-declare module "node-validators" {export = Validators;}
diff --git a/business-rules-engine/Utils.d.ts b/business-rules-engine/Utils.d.ts
index e9ca88a547..0efa349a73 100644
--- a/business-rules-engine/Utils.d.ts
+++ b/business-rules-engine/Utils.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Roman Samec <https://github.com/rsamec>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../node/node.d.ts" />
+/// <reference types="node" />
 declare namespace Utils {
     class StringFce {
         static format(s: string, args: any): string;
diff --git a/business-rules-engine/Validation.d.ts b/business-rules-engine/Validation.d.ts
index bcfd0d6d9a..91efba146a 100644
--- a/business-rules-engine/Validation.d.ts
+++ b/business-rules-engine/Validation.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Roman Samec <https://github.com/rsamec>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../q/Q.d.ts" />
-/// <reference path="../underscore/underscore.d.ts" />
+/// <reference types="Q" />
+
 declare namespace Validation {
     interface IErrorCustomMessage {
         (config: any, args: any): string;
diff --git a/business-rules-engine/business-rules-engine-tests.ts b/business-rules-engine/business-rules-engine-tests.ts
index 5695c3b7fb..2a8180ce6b 100644
--- a/business-rules-engine/business-rules-engine-tests.ts
+++ b/business-rules-engine/business-rules-engine-tests.ts
@@ -1,8 +1,6 @@
-/// <reference path="business-rules-engine.d.ts" />
-/// <reference path="BasicValidators.d.ts" />
-/// <reference path="../underscore/underscore.d.ts" />
-/// <reference path="../q/Q.d.ts" />
-/// <reference path="../moment/moment.d.ts" />
+/// <reference types="Q" />
+import * as Validators from './node-validators';
+import Validation = require("business-rules-engine");
 
 export interface IPerson{
     Checked:boolean;
diff --git a/business-rules-engine/business-rules-engine.d.ts b/business-rules-engine/business-rules-engine.d.ts
deleted file mode 100644
index a26e49492d..0000000000
--- a/business-rules-engine/business-rules-engine.d.ts
+++ /dev/null
@@ -1,242 +0,0 @@
-// Type definitions for business-rules-engine v1.0.20
-// Project: https://github.com/rsamec/form
-// Definitions by: Roman Samec <https://github.com/rsamec>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Source: typings/business-rules-engine/Validation.d.ts
-/// <reference path="../q/Q.d.ts" />
-/// <reference path="../underscore/underscore.d.ts" />
-declare namespace Validation {
-    interface IErrorCustomMessage {
-        (config: any, args: any): string;
-    }
-    interface IPropertyValidator {
-        isAcceptable(s: any): boolean;
-        customMessage?: IErrorCustomMessage;
-        tagName?: string;
-    }
-    interface IStringValidator extends IPropertyValidator {
-        isAcceptable(s: string): boolean;
-    }
-    interface IAsyncPropertyValidator {
-        isAcceptable(s: any): Q.Promise<boolean>;
-        customMessage?: IErrorCustomMessage;
-        isAsync: boolean;
-        tagName?: string;
-    }
-    interface IAsyncStringPropertyValidator extends IAsyncPropertyValidator {
-        isAcceptable(s: string): Q.Promise<boolean>;
-    }
-    enum CompareOperator {
-        LessThan = 0,
-        LessThanEqual = 1,
-        Equal = 2,
-        NotEqual = 3,
-        GreaterThanEqual = 4,
-        GreaterThan = 5,
-    }
-    interface IError {
-        HasError: boolean;
-        ErrorMessage: string;
-        TranslateArgs?: IErrorTranslateArgs;
-    }
-    interface IErrorTranslateArgs {
-        TranslateId: string;
-        MessageArgs: any;
-        CustomMessage?: IErrorCustomMessage;
-    }
-    interface IOptional {
-        (): boolean;
-    }
-    interface IValidationFailure extends IError {
-        IsAsync: boolean;
-        Error: IError;
-    }
-    interface IValidationResult {
-        Name: string;
-        Add(validationResult: IValidationResult): void;
-        Remove(index: number): void;
-        Children: IValidationResult[];
-        HasErrors: boolean;
-        HasErrorsDirty: boolean;
-        ErrorMessage: string;
-        ErrorCount: number;
-        Optional?: IOptional;
-        TranslateArgs?: IErrorTranslateArgs[];
-    }
-    interface IValidate {
-        (args: IError): void;
-    }
-    interface IAsyncValidate {
-        (args: IError): Q.Promise<any>;
-    }
-    interface IValidatorFce {
-        Name: string;
-        ValidationFce?: IValidate;
-        AsyncValidationFce?: IAsyncValidate;
-    }
-    interface IValidator {
-        Validate(context: any): IValidationFailure;
-        ValidateAsync(context: any): Q.Promise<IValidationFailure>;
-        Error: IError;
-    }
-    interface IAbstractValidator<T> {
-        RuleFor(prop: string, validator: IPropertyValidator): any;
-        ValidationFor(prop: string, validatorFce: IValidatorFce): any;
-        Validation(validatorFce: IValidatorFce): any;
-        ValidatorFor<K>(prop: string, validator: IAbstractValidator<K>): any;
-        CreateRule(name: string): IAbstractValidationRule<any>;
-        CreateAbstractRule(name: string): IAbstractValidationRule<any>;
-        CreateAbstractListRule(name: string): IAbstractValidationRule<any>;
-        ForList: boolean;
-    }
-    interface IAbstractValidationRule<T> {
-        Validate(context: T): IValidationResult;
-        ValidateAsync(context: T): Q.Promise<IValidationResult>;
-        ValidateAll(context: T): Q.Promise<IValidationResult>;
-        ValidateProperty(context: T, propName: string): void;
-        ValidationResult: IValidationResult;
-        Rules: {
-            [name: string]: IPropertyValidationRule<T>;
-        };
-        Validators: {
-            [name: string]: IValidator;
-        };
-        Children: {
-            [name: string]: IAbstractValidationRule<any>;
-        };
-    }
-    interface IPropertyValidationRule<T> {
-        Validators: {
-            [name: string]: any;
-        };
-        Validate(context: IValidationContext<T>): IValidationFailure[];
-        ValidateAsync(context: IValidationContext<T>): Q.Promise<IValidationFailure[]>;
-    }
-    interface IValidationContext<T> {
-        Value: string;
-        Key: string;
-        Data: T;
-    }
-    class Error implements IError {
-        public HasError: boolean;
-        public ErrorMessage: string;
-        constructor();
-    }
-    class ValidationFailure implements IError {
-        public Error: IError;
-        public IsAsync: boolean;
-        constructor(Error: IError, IsAsync: boolean);
-        public HasError : boolean;
-        public ErrorMessage : string;
-        public TranslateArgs : IErrorTranslateArgs;
-    }
-    class ValidationResult implements IValidationResult {
-        public Name: string;
-        constructor(Name: string);
-        public IsDirty: boolean;
-        public Children : IValidationResult[];
-        public Add(error: IValidationResult): void;
-        public Remove(index: number): void;
-        public Optional: IOptional;
-        public TranslateArgs: IErrorTranslateArgs[];
-        public HasErrorsDirty : boolean;
-        public HasErrors : boolean;
-        public ErrorCount : number;
-        public ErrorMessage : string;
-    }
-    class CompositeValidationResult implements IValidationResult {
-        public Name: string;
-        public Children: IValidationResult[];
-        constructor(Name: string);
-        public Optional: IOptional;
-        public AddFirst(error: IValidationResult): void;
-        public Add(error: IValidationResult): void;
-        public Remove(index: number): void;
-        public HasErrorsDirty : boolean;
-        public HasErrors : boolean;
-        public ErrorCount : number;
-        public ErrorMessage : string;
-        public TranslateArgs : IErrorTranslateArgs[];
-        public LogErrors(headerMessage?: string): void;
-        public Errors : {
-            [name: string]: IValidationResult;
-        };
-        private FlattenErros;
-        public SetDirty(): void;
-        public SetPristine(): void;
-        private SetDirtyEx(node, dirty);
-        private flattenErrors(node, errorCollection);
-        private traverse(node, indent);
-    }
-    class AbstractValidator<T> implements IAbstractValidator<T> {
-        public Validators: {
-            [name: string]: IPropertyValidator[];
-        };
-        public AbstractValidators: {
-            [name: string]: IAbstractValidator<any>;
-        };
-        public ValidationFunctions: {
-            [name: string]: IValidatorFce[];
-        };
-        public RuleFor(prop: string, validator: IPropertyValidator): void;
-        public ValidationFor(prop: string, fce: IValidatorFce): void;
-        public Validation(fce: IValidatorFce): void;
-        public ValidatorFor<K>(prop: string, validator: IAbstractValidator<K>, forList?: boolean): void;
-        public CreateAbstractRule(name: string): IAbstractValidationRule<T>;
-        public CreateAbstractListRule(name: string): IAbstractValidationRule<T>;
-        public CreateRule(name: string): IAbstractValidationRule<T>;
-        public ForList: boolean;
-    }
-    class MessageLocalization {
-        static customMsg: string;
-        static defaultMessages: {
-            "required": string;
-            "remote": string;
-            "email": string;
-            "url": string;
-            "date": string;
-            "dateISO": string;
-            "number": string;
-            "digits": string;
-            "signedDigits": string;
-            "creditcard": string;
-            "equalTo": string;
-            "maxlength": string;
-            "minlength": string;
-            "rangelength": string;
-            "range": string;
-            "max": string;
-            "min": string;
-            "step": string;
-            "contains": string;
-            "mask": string;
-            "custom": string;
-        };
-        static ValidationMessages: {
-            "required": string;
-            "remote": string;
-            "email": string;
-            "url": string;
-            "date": string;
-            "dateISO": string;
-            "number": string;
-            "digits": string;
-            "signedDigits": string;
-            "creditcard": string;
-            "equalTo": string;
-            "maxlength": string;
-            "minlength": string;
-            "rangelength": string;
-            "range": string;
-            "max": string;
-            "min": string;
-            "step": string;
-            "contains": string;
-            "mask": string;
-            "custom": string;
-        };
-        static GetValidationMessage(validator: any): string;
-    }
-}
-declare module "business-rule-engine" {export = Validation;}
diff --git a/business-rules-engine/index.d.ts b/business-rules-engine/index.d.ts
new file mode 100644
index 0000000000..197c4fd23f
--- /dev/null
+++ b/business-rules-engine/index.d.ts
@@ -0,0 +1,243 @@
+// Type definitions for business-rules-engine v1.0.20
+// Project: https://github.com/rsamec/form
+// Definitions by: Roman Samec <https://github.com/rsamec>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Source: typings/business-rules-engine/Validation.d.ts
+/// <reference types="Q" />
+
+declare namespace Validation {
+    interface IErrorCustomMessage {
+        (config: any, args: any): string;
+    }
+    interface IPropertyValidator {
+        isAcceptable(s: any): boolean;
+        customMessage?: IErrorCustomMessage;
+        tagName?: string;
+    }
+    interface IStringValidator extends IPropertyValidator {
+        isAcceptable(s: string): boolean;
+    }
+    interface IAsyncPropertyValidator {
+        isAcceptable(s: any): Q.Promise<boolean>;
+        customMessage?: IErrorCustomMessage;
+        isAsync: boolean;
+        tagName?: string;
+    }
+    interface IAsyncStringPropertyValidator extends IAsyncPropertyValidator {
+        isAcceptable(s: string): Q.Promise<boolean>;
+    }
+    enum CompareOperator {
+        LessThan = 0,
+        LessThanEqual = 1,
+        Equal = 2,
+        NotEqual = 3,
+        GreaterThanEqual = 4,
+        GreaterThan = 5,
+    }
+    interface IError {
+        HasError: boolean;
+        ErrorMessage: string;
+        TranslateArgs?: IErrorTranslateArgs;
+    }
+    interface IErrorTranslateArgs {
+        TranslateId: string;
+        MessageArgs: any;
+        CustomMessage?: IErrorCustomMessage;
+    }
+    interface IOptional {
+        (): boolean;
+    }
+    interface IValidationFailure extends IError {
+        IsAsync: boolean;
+        Error: IError;
+    }
+    interface IValidationResult {
+        Name: string;
+        Add(validationResult: IValidationResult): void;
+        Remove(index: number): void;
+        Children: IValidationResult[];
+        HasErrors: boolean;
+        HasErrorsDirty: boolean;
+        ErrorMessage: string;
+        ErrorCount: number;
+        Optional?: IOptional;
+        TranslateArgs?: IErrorTranslateArgs[];
+    }
+    interface IValidate {
+        (args: IError): void;
+    }
+    interface IAsyncValidate {
+        (args: IError): Q.Promise<any>;
+    }
+    interface IValidatorFce {
+        Name: string;
+        ValidationFce?: IValidate;
+        AsyncValidationFce?: IAsyncValidate;
+    }
+    interface IValidator {
+        Validate(context: any): IValidationFailure;
+        ValidateAsync(context: any): Q.Promise<IValidationFailure>;
+        Error: IError;
+    }
+    interface IAbstractValidator<T> {
+        RuleFor(prop: string, validator: IPropertyValidator): any;
+        ValidationFor(prop: string, validatorFce: IValidatorFce): any;
+        Validation(validatorFce: IValidatorFce): any;
+        ValidatorFor<K>(prop: string, validator: IAbstractValidator<K>): any;
+        CreateRule(name: string): IAbstractValidationRule<any>;
+        CreateAbstractRule(name: string): IAbstractValidationRule<any>;
+        CreateAbstractListRule(name: string): IAbstractValidationRule<any>;
+        ForList: boolean;
+    }
+    interface IAbstractValidationRule<T> {
+        Validate(context: T): IValidationResult;
+        ValidateAsync(context: T): Q.Promise<IValidationResult>;
+        ValidateAll(context: T): Q.Promise<IValidationResult>;
+        ValidateProperty(context: T, propName: string): void;
+        ValidationResult: IValidationResult;
+        Rules: {
+            [name: string]: IPropertyValidationRule<T>;
+        };
+        Validators: {
+            [name: string]: IValidator;
+        };
+        Children: {
+            [name: string]: IAbstractValidationRule<any>;
+        };
+    }
+    interface IPropertyValidationRule<T> {
+        Validators: {
+            [name: string]: any;
+        };
+        Validate(context: IValidationContext<T>): IValidationFailure[];
+        ValidateAsync(context: IValidationContext<T>): Q.Promise<IValidationFailure[]>;
+    }
+    interface IValidationContext<T> {
+        Value: string;
+        Key: string;
+        Data: T;
+    }
+    class Error implements IError {
+        public HasError: boolean;
+        public ErrorMessage: string;
+        constructor();
+    }
+    class ValidationFailure implements IError {
+        public Error: IError;
+        public IsAsync: boolean;
+        constructor(Error: IError, IsAsync: boolean);
+        public HasError : boolean;
+        public ErrorMessage : string;
+        public TranslateArgs : IErrorTranslateArgs;
+    }
+    class ValidationResult implements IValidationResult {
+        public Name: string;
+        constructor(Name: string);
+        public IsDirty: boolean;
+        public Children : IValidationResult[];
+        public Add(error: IValidationResult): void;
+        public Remove(index: number): void;
+        public Optional: IOptional;
+        public TranslateArgs: IErrorTranslateArgs[];
+        public HasErrorsDirty : boolean;
+        public HasErrors : boolean;
+        public ErrorCount : number;
+        public ErrorMessage : string;
+    }
+    class CompositeValidationResult implements IValidationResult {
+        public Name: string;
+        public Children: IValidationResult[];
+        constructor(Name: string);
+        public Optional: IOptional;
+        public AddFirst(error: IValidationResult): void;
+        public Add(error: IValidationResult): void;
+        public Remove(index: number): void;
+        public HasErrorsDirty : boolean;
+        public HasErrors : boolean;
+        public ErrorCount : number;
+        public ErrorMessage : string;
+        public TranslateArgs : IErrorTranslateArgs[];
+        public LogErrors(headerMessage?: string): void;
+        public Errors : {
+            [name: string]: IValidationResult;
+        };
+        private FlattenErros;
+        public SetDirty(): void;
+        public SetPristine(): void;
+        private SetDirtyEx(node, dirty);
+        private flattenErrors(node, errorCollection);
+        private traverse(node, indent);
+    }
+    class AbstractValidator<T> implements IAbstractValidator<T> {
+        public Validators: {
+            [name: string]: IPropertyValidator[];
+        };
+        public AbstractValidators: {
+            [name: string]: IAbstractValidator<any>;
+        };
+        public ValidationFunctions: {
+            [name: string]: IValidatorFce[];
+        };
+        public RuleFor(prop: string, validator: IPropertyValidator): void;
+        public ValidationFor(prop: string, fce: IValidatorFce): void;
+        public Validation(fce: IValidatorFce): void;
+        public ValidatorFor<K>(prop: string, validator: IAbstractValidator<K>, forList?: boolean): void;
+        public CreateAbstractRule(name: string): IAbstractValidationRule<T>;
+        public CreateAbstractListRule(name: string): IAbstractValidationRule<T>;
+        public CreateRule(name: string): IAbstractValidationRule<T>;
+        public ForList: boolean;
+    }
+    class MessageLocalization {
+        static customMsg: string;
+        static defaultMessages: {
+            "required": string;
+            "remote": string;
+            "email": string;
+            "url": string;
+            "date": string;
+            "dateISO": string;
+            "number": string;
+            "digits": string;
+            "signedDigits": string;
+            "creditcard": string;
+            "equalTo": string;
+            "maxlength": string;
+            "minlength": string;
+            "rangelength": string;
+            "range": string;
+            "max": string;
+            "min": string;
+            "step": string;
+            "contains": string;
+            "mask": string;
+            "custom": string;
+        };
+        static ValidationMessages: {
+            "required": string;
+            "remote": string;
+            "email": string;
+            "url": string;
+            "date": string;
+            "dateISO": string;
+            "number": string;
+            "digits": string;
+            "signedDigits": string;
+            "creditcard": string;
+            "equalTo": string;
+            "maxlength": string;
+            "minlength": string;
+            "rangelength": string;
+            "range": string;
+            "max": string;
+            "min": string;
+            "step": string;
+            "contains": string;
+            "mask": string;
+            "custom": string;
+        };
+        static GetValidationMessage(validator: any): string;
+    }
+}
+export = Validation;
+export as namespace Validation;
diff --git a/business-rules-engine/node-validators.d.ts b/business-rules-engine/node-validators.d.ts
new file mode 100644
index 0000000000..715acbb243
--- /dev/null
+++ b/business-rules-engine/node-validators.d.ts
@@ -0,0 +1,112 @@
+// Type definitions for business-rules-engine - v1.0.20
+// Project: https://github.com/rsamec/form
+// Definitions by: Roman Samec <https://github.com/rsamec>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="Q" />
+/// <reference types="node" />
+
+import Validation = require("business-rules-engine");
+export as namespace Validators;
+
+import * as moment from 'moment';
+
+export class LettersOnlyValidator implements Validation.IStringValidator {
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class ZipCodeValidator implements Validation.IStringValidator {
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class EmailValidator implements Validation.IStringValidator {
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class UrlValidator implements Validation.IStringValidator {
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class RequiredValidator implements Validation.IStringValidator {
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class DateValidator implements Validation.IStringValidator {
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class DateISOValidator implements Validation.IStringValidator {
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class NumberValidator implements Validation.IStringValidator {
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class DigitValidator implements Validation.IStringValidator {
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class SignedDigitValidator implements Validation.IStringValidator {
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class MinLengthValidator implements Validation.IStringValidator {
+    public MinLength: number;
+    constructor(MinLength?: number);
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class MaxLengthValidator implements Validation.IStringValidator {
+    public MaxLength: number;
+    constructor(MaxLength?: number);
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class RangeLengthValidator implements Validation.IStringValidator {
+    public RangeLength: number[];
+    constructor(RangeLength?: number[]);
+    public isAcceptable(s: string): boolean;
+    public MinLength : number;
+    public MaxLength : number;
+    public tagName: string;
+}
+export class MinValidator implements Validation.IPropertyValidator {
+    public Min: number;
+    constructor(Min?: number);
+    public isAcceptable(s: any): boolean;
+    public tagName: string;
+}
+export class MaxValidator implements Validation.IPropertyValidator {
+    public Max: number;
+    constructor(Max?: number);
+    public isAcceptable(s: any): boolean;
+    public tagName: string;
+}
+export class RangeValidator implements Validation.IPropertyValidator {
+    public Range: number[];
+    constructor(Range?: number[]);
+    public isAcceptable(s: any): boolean;
+    public Min : number;
+    public Max : number;
+    public tagName: string;
+}
+export class StepValidator implements Validation.IPropertyValidator {
+    public Step: string;
+    constructor(Step?: string);
+    public isAcceptable(s: any): boolean;
+    public tagName: string;
+}
+export class PatternValidator implements Validation.IStringValidator {
+    public Pattern: string;
+    constructor(Pattern?: string);
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class ContainsValidator implements Validation.IAsyncPropertyValidator {
+    public Options: Q.Promise<any[]>;
+    constructor(Options: Q.Promise<any[]>);
+    public isAcceptable(s: string): Q.Promise<boolean>;
+    public isAsync: boolean;
+    public tagName: string;
+}
diff --git a/business-rules-engine/tsconfig.json b/business-rules-engine/tsconfig.json
new file mode 100644
index 0000000000..8ebc501b41
--- /dev/null
+++ b/business-rules-engine/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "business-rules-engine-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/byline/byline-tests.ts b/byline/byline-tests.ts
index 42de3d5d9c..d21b8a196c 100644
--- a/byline/byline-tests.ts
+++ b/byline/byline-tests.ts
@@ -2,7 +2,6 @@
  * Created by stefansteinhart on 31.01.15.
  */
 
-/// <reference path="byline.d.ts" />
 
 import fs = require( 'fs' );
 import byline = require( 'byline' );
diff --git a/byline/byline.d.ts b/byline/byline.d.ts
deleted file mode 100644
index 48ddd2d57a..0000000000
--- a/byline/byline.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// Type definitions for byline 4.2.1
-// Project: https://github.com/jahewson/node-byline
-// Definitions by: Stefan Steinhart <https://github.com/reppners>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "byline" {
-    import stream = require("stream");
-
-    export interface LineStreamOptions extends stream.TransformOptions {
-        keepEmptyLines?: boolean;
-    }
-
-    export interface LineStream extends stream.Transform {
-    }
-
-    export interface LineStreamCreatable extends LineStream {
-        new (options?:LineStreamOptions):LineStream
-    }
-
-    //TODO is it possible to declare static factory functions without name (directly on the module)
-    //
-    // JS:
-    // // convinience API
-    // module.exports = function(readStream, options) {
-    //      return module.exports.createStream(readStream, options);
-    // };
-    //
-    // TS:
-    // ():LineStream; // same as createStream():LineStream
-    // (stream:stream.Stream, options?:LineStreamOptions):LineStream; // same as createStream(stream, options?):LineStream
-
-    export function createStream():LineStream;
-    export function createStream(stream:NodeJS.ReadableStream, options?:LineStreamOptions):LineStream;
-
-    export var LineStream:LineStreamCreatable;
-}
diff --git a/byline/index.d.ts b/byline/index.d.ts
new file mode 100644
index 0000000000..243db166cd
--- /dev/null
+++ b/byline/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for byline 4.2.1
+// Project: https://github.com/jahewson/node-byline
+// Definitions by: Stefan Steinhart <https://github.com/reppners>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import stream = require("stream");
+
+export interface LineStreamOptions extends stream.TransformOptions {
+    keepEmptyLines?: boolean;
+}
+
+export interface LineStream extends stream.Transform {
+}
+
+export interface LineStreamCreatable extends LineStream {
+    new (options?: LineStreamOptions): LineStream
+}
+
+//TODO is it possible to declare static factory functions without name (directly on the module)
+//
+// JS:
+// // convinience API
+// module.exports = function(readStream, options) {
+//      return module.exports.createStream(readStream, options);
+// };
+//
+// TS:
+// ():LineStream; // same as createStream():LineStream
+// (stream:stream.Stream, options?:LineStreamOptions):LineStream; // same as createStream(stream, options?):LineStream
+
+export declare function createStream(): LineStream;
+export declare function createStream(stream: NodeJS.ReadableStream, options?: LineStreamOptions): LineStream;
+
+export declare var LineStream: LineStreamCreatable;
diff --git a/byline/tsconfig.json b/byline/tsconfig.json
new file mode 100644
index 0000000000..5754ae25a7
--- /dev/null
+++ b/byline/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "byline-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bytebuffer/bytebuffer-tests.ts b/bytebuffer/bytebuffer-tests.ts
index 34db7368d5..eec2f3e583 100644
--- a/bytebuffer/bytebuffer-tests.ts
+++ b/bytebuffer/bytebuffer-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="bytebuffer.d.ts" />
+
 
 import ByteBuffer = require("bytebuffer");
 
diff --git a/bytebuffer/bytebuffer.d.ts b/bytebuffer/bytebuffer.d.ts
deleted file mode 100644
index e5d267787f..0000000000
--- a/bytebuffer/bytebuffer.d.ts
+++ /dev/null
@@ -1,616 +0,0 @@
-// Type definitions for bytebuffer.js 5.0.0
-// Project: https://github.com/dcodeIO/bytebuffer.js
-// Definitions by: Denis Cappellin <http://github.com/cappellin>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Definitions by: SINTEF-9012 <http://github.com/SINTEF-9012>
-
-/// <reference path="../long/long.d.ts" />
-
-declare class ByteBuffer
-{
-    /**
-     * Constructs a new ByteBuffer.
-     */
-    constructor( capacity?: number, littleEndian?: boolean, noAssert?: boolean );
-
-    /**
-     * Big endian constant that can be used instead of its boolean value. Evaluates to false.
-     */
-    static BIG_ENDIAN: boolean;
-
-    /**
-     * Default initial capacity of 16.
-     */
-    static DEFAULT_CAPACITY: number;
-
-    /**
-     * Default no assertions flag of false.
-     */
-    static DEFAULT_NOASSERT: boolean;
-
-    /**
-     * Little endian constant that can be used instead of its boolean value. Evaluates to true.
-     */
-    static LITTLE_ENDIAN: boolean;
-
-    /**
-     * Maximum number of bytes required to store a 32bit base 128 variable-length integer.
-     */
-    static MAX_VARINT32_BYTES: number;
-
-    /**
-     * Maximum number of bytes required to store a 64bit base 128 variable-length integer.
-     */
-    static MAX_VARINT64_BYTES: number;
-
-    /**
-     * Metrics representing number of bytes.Evaluates to 2.
-     */
-    static METRICS_BYTES: number;
-
-    /**
-     * Metrics representing number of UTF8 characters.Evaluates to 1.
-     */
-    static METRICS_CHARS: number;
-
-    /**
-     * ByteBuffer version.
-     */
-    static VERSION: string;
-
-    /**
-     * Backing buffer.
-     */
-    buffer: ArrayBuffer;
-
-    /**
-     * Absolute limit of the contained data. Set to the backing buffer's capacity upon allocation.
-     */
-    limit: number;
-
-    /**
-     * Whether to use little endian byte order, defaults to false for big endian.
-     */
-    littleEndian: boolean;
-
-    /**
-     * Marked offset.
-     */
-    markedOffset: number;
-
-    /**
-     * Whether to skip assertions of offsets and values, defaults to false.
-     */
-    noAssert: boolean;
-
-    /**
-     * Absolute read/write offset.
-     */
-    offset: number;
-
-    /**
-     * Data view to manipulate the backing buffer. Becomes null if the backing buffer has a capacity of 0.
-     */
-    view: DataView;    
-
-    /**
-     * Allocates a new ByteBuffer backed by a buffer of the specified capacity.
-     */
-    static allocate( capacity?: number, littleEndian?: number, noAssert?: boolean ): ByteBuffer;
-
-    /**
-     * Decodes a base64 encoded string to binary like window.atob does.
-     */
-    static atob( b64: string ): string;
-
-    /**
-     * Encodes a binary string to base64 like window.btoa does.
-     */
-    static btoa( str: string ): string;
-
-    /**
-     * Calculates the number of UTF8 bytes of a string.
-     */
-    static calculateUTF8Byte( str: string ): number;
-
-    /**
-     * Calculates the number of UTF8 characters of a string.JavaScript itself uses UTF- 16, so that a string's length property does not reflect its actual UTF8 size if it contains code points larger than 0xFFFF.
-     */
-    static calculateUTF8Char( str: string ): number;
-
-    /**
-     * Calculates the actual number of bytes required to store a 32bit base 128 variable-length integer.
-     */
-    static calculateVariant32( value: number ): number;
-
-    /**
-     * Calculates the actual number of bytes required to store a 64bit base 128 variable-length integer.
-     */
-    static calculateVariant64( value: number | Long ): number;
-
-    /**
-     * Concatenates multiple ByteBuffers into one.
-     */
-    static concat( buffers: Array<ByteBuffer | ArrayBuffer | Uint8Array | string>, encoding?: string | boolean, litteEndian?: boolean, noAssert?: boolean ): ByteBuffer;
-
-    /**
-     * Decodes a base64 encoded string to a ByteBuffer.
-     */
-    static fromBase64( str: string, littleEndian?: boolean, noAssert?: boolean ): ByteBuffer;
-
-    /**
-     * Decodes a binary encoded string, that is using only characters 0x00-0xFF as bytes, to a ByteBuffer.
-     */
-    static fromBinary( str: string, littleEndian?: boolean, noAssert?: boolean ): ByteBuffer;
-
-    /**
-     * Decodes a hex encoded string with marked offsets to a ByteBuffer.
-     */
-    static fromDebug( str: string, littleEndian?: boolean, noAssert?: boolean ): ByteBuffer;
-
-    /**
-     * Decodes a hex encoded string to a ByteBuffer.
-     */
-    static fromHex( str: string, littleEndian?: boolean, noAssert?: boolean ): ByteBuffer;
-
-    /**
-     * Decodes an UTF8 encoded string to a ByteBuffer.
-     */
-    static fromUTF8( str: string, littleEndian?: boolean, noAssert?: boolean ): ByteBuffer;
-
-    /**
-     * Gets the backing buffer type.
-     */
-    static isByteBuffer( bb: any ): boolean;
-
-    /**
-     * Wraps a buffer or a string. Sets the allocated ByteBuffer's ByteBuffer#offset to 0 and its ByteBuffer#limit to the length of the wrapped data.
-     * @param buffer Anything that can be wrapped
-     * @param encoding String encoding if buffer is a string ("base64", "hex", "binary", defaults to "utf8")
-     * @param littleEndian Whether to use little or big endian byte order. Defaults to ByteBuffer.DEFAULT_ENDIAN.
-     * @param noAssert Whether to skip assertions of offsets and values. Defaults to ByteBuffer.DEFAULT_NOASSERT.
-     */
-    static wrap( buffer: ByteBuffer | ArrayBuffer | Uint8Array | string, enc?: string | boolean, littleEndian?: boolean, noAssert?: boolean ): ByteBuffer;
-
-    /**
-     * Decodes a zigzag encoded signed 32bit integer.
-     */
-    static zigZagDecode32( n: number ): number;
-
-    /**
-     * Decodes a zigzag encoded signed 64bit integer.
-     */
-    static zigZagDecode64( n: number | Long ): Long;
-
-    /**
-     * Zigzag encodes a signed 32bit integer so that it can be effectively used with varint encoding.
-     */
-    static zigZagEncode32( n: number ): number;
-
-    /**
-     * Zigzag encodes a signed 64bit integer so that it can be effectively used with varint encoding.
-     */
-    static zigZagEncode64( n: number | Long ): Long;
-
-    /**
-     * Switches (to) big endian byte order.
-     */
-    BE( bigEndian?: boolean ): ByteBuffer;
-
-    /**
-     * Switches (to) little endian byte order.
-     */
-    LE( bigEndian?: boolean ): ByteBuffer;
-
-    /**
-     * Appends some data to this ByteBuffer. This will overwrite any contents behind the specified offset up to the appended data's length.
-     */
-    append( source: ByteBuffer | ArrayBuffer | Uint8Array | string, encoding?: string | number, offset?: number ): ByteBuffer;
-
-    /**
-     * Appends this ByteBuffer's contents to another ByteBuffer. This will overwrite any contents behind the specified offset up to the length of this ByteBuffer's data.
-     */
-    appendTo( target: ByteBuffer, offset?: number ): ByteBuffer;
-
-    /**
-     * Enables or disables assertions of argument types and offsets. Assertions are enabled by default but you can opt to disable them if your code already makes sure that everything is valid.
-     */
-    assert( assert: boolean ): ByteBuffer;
-
-    /**
-     * Gets the capacity of this ByteBuffer's backing buffer.
-     */
-    capacity(): number;
-
-    /**
-     * Clears this ByteBuffer's offsets by setting ByteBuffer#offset to 0 and
-     * ByteBuffer#limit to the backing buffer's capacity. Discards ByteBuffer#markedOffset.
-     */
-    clear(): ByteBuffer;
-
-    /**
-     * Creates a cloned instance of this ByteBuffer, preset with this ByteBuffer's values for ByteBuffer#offset, ByteBuffer#markedOffset and ByteBuffer#limit.
-     */
-    clone( copy?: boolean ): ByteBuffer;
-
-    /**
-     * Compacts this ByteBuffer to be backed by a ByteBuffer#buffer of its contents' length. Contents are the bytes between ByteBuffer#offset and ByteBuffer#limit. Will set offset = 0 and limit = capacity and adapt ByteBuffer#markedOffset to the same relative position if set.
-     */
-    compact( begin?: number, end?: number ): ByteBuffer;
-
-    /**
-     * Creates a copy of this ByteBuffer's contents. Contents are the bytes between ByteBuffer#offset and ByteBuffer#limit.
-     */
-    copy( begin?: number, end?: number ): ByteBuffer;
-
-    /**
-     * Copies this ByteBuffer's contents to another ByteBuffer. Contents are the bytes between ByteBuffer#offset and ByteBuffer#limit.
-     */
-    copyTo( target: ByteBuffer, targetOffset?: number, sourceOffset?: number, sourceLimit?: number ): ByteBuffer;
-
-    /**
-     * Makes sure that this ByteBuffer is backed by a ByteBuffer#buffer of at least the specified capacity. If the current capacity is exceeded, it will be doubled. If double the current capacity is less than the required capacity, the required capacity will be used instead.
-     */
-    ensureCapacity( capacity: number ): ByteBuffer;
-
-    /**
-     * Overwrites this ByteBuffer's contents with the specified value. Contents are the bytes between ByteBuffer#offset and ByteBuffer#limit.
-     */
-    fill( value: number | string, begin?: number, end?: number ): ByteBuffer;
-
-    /**
-     * Makes this ByteBuffer ready for a new sequence of write or relative read operations. Sets limit = offset and offset = 0. Make sure always to flip a ByteBuffer when all relative read or write operations are complete.
-     */
-    flip(): ByteBuffer;
-
-    /**
-     * Marks an offset on this ByteBuffer to be used later.
-     */
-    mark( offset?: number ): ByteBuffer;
-
-    /**
-     * Sets the byte order.
-     */
-    order( littleEndian: boolean ): ByteBuffer;
-
-    /**
-     * Prepends some data to this ByteBuffer. This will overwrite any contents before the specified offset up to the prepended data's length. If there is not enough space available before the specified offset, the backing buffer will be resized and its contents moved accordingly.
-     */
-    prepend( source: ByteBuffer | string | ArrayBuffer, encoding?: string | number, offset?: number ): ByteBuffer;
-
-    /**
-     * Prepends this ByteBuffer to another ByteBuffer. This will overwrite any contents before the specified offset up to the prepended data's length. If there is not enough space available before the specified offset, the backing buffer will be resized and its contents moved accordingly.
-     */
-    prependTo( target: ByteBuffer, offset?: number ): ByteBuffer;
-
-    /**
-     * Prints debug information about this ByteBuffer's contents.
-     */
-    printDebug( out?: ( text: string ) => void ): void;
-
-    /**
-     * Reads an 8bit signed integer. This is an alias of ByteBuffer#readInt8.
-     */
-    readByte( offset?: number ): number;
-
-    /**
-     * Reads a NULL-terminated UTF8 encoded string. For this to work the string read must not contain any NULL characters itself.
-     */
-    readCString( offset?: number ): string;
-
-    /**
-     * Reads a 64bit float. This is an alias of ByteBuffer#readFloat64.
-     */
-    readDouble( offset?: number ): number;
-
-    /**
-     * Reads a 32bit float. This is an alias of ByteBuffer#readFloat32.
-     */
-    readFloat( offset?: number ): number;
-
-    /**
-     * Reads a 32bit float.
-     */
-    readFloat32( offset?: number ): number;
-
-    /**
-     * Reads a 64bit float.
-     */
-    readFloat64( offset?: number ): number;
-
-    /**
-     * Reads a length as uint32 prefixed UTF8 encoded string.
-     */
-    readIString( offset?: number ): string;
-
-    /**
-     * Reads a 32bit signed integer.This is an alias of ByteBuffer#readInt32.
-     */
-    readInt( offset?: number ): number;
-
-    /**
-     * Reads a 16bit signed integer.
-     */
-    readInt16( offset?: number ): number;
-
-    /**
-     * Reads a 32bit signed integer.
-     */
-    readInt32( offset?: number ): number;
-
-    /**
-     * Reads a 64bit signed integer.
-     */
-    readInt64( offset?: number ): Long;
-
-    /**
-     * Reads an 8bit signed integer.
-     */
-    readInt8( offset?: number ): number;
-
-    /**
-     * Reads a 64bit signed integer. This is an alias of ByteBuffer#readInt64.
-     */
-    readLong( offset?: number ): Long;
-
-    /**
-     * Reads a 16bit signed integer. This is an alias of ByteBuffer#readInt16.
-     */
-    readShort( offset?: number ): number;
-
-    /**
-     * Reads an UTF8 encoded string. This is an alias of ByteBuffer#readUTF8String.
-     */
-    readString( length: number, metrics?: number, offset?: number ): string;
-
-    /**
-     * Reads an UTF8 encoded string.
-     */
-    readUTF8String( chars: number, offset?: number ): string;
-
-    /**
-     * Reads a 16bit unsigned integer.
-     */
-    readUint16( offset?: number ): number;
-
-    /**
-     * Reads a 32bit unsigned integer.
-     */
-    readUint32( offset?: number ): number;
-
-    /**
-     * Reads a 64bit unsigned integer.
-     */
-    readUint64( offset?: number ): Long;
-    /**
-     * Reads an 8bit unsigned integer.
-     */
-    readUint8( offset?: number ): number;
-
-    /**
-     * Reads a length as varint32 prefixed UTF8 encoded string.
-     */
-    readVString( offset?: number ): string;
-
-    /**
-     * Reads a 32bit base 128 variable-length integer.
-     */
-    readVarint32( offset?: number ): number;
-
-    /**
-     * Reads a zig-zag encoded 32bit base 128 variable-length integer.
-     */
-    readVarint32ZiZag( offset?: number ): number;
-
-    /**
-     * Reads a 64bit base 128 variable-length integer. Requires Long.js.
-     */
-    readVarint64( offset?: number ): Long;
-
-    /**
-     * Reads a zig-zag encoded 64bit base 128 variable-length integer. Requires Long.js.
-     */
-    readVarint64ZigZag( offset?: number ): Long;
-
-    /**
-     * Gets the number of remaining readable bytes. Contents are the bytes between ByteBuffer#offset and ByteBuffer#limit, so this returns limit - offset.
-     */
-    remaining(): number;
-
-    /**
-     * Resets this ByteBuffer's ByteBuffer#offset. If an offset has been marked through ByteBuffer#mark before, offset will be set to ByteBuffer#markedOffset, which will then be discarded. If no offset has been marked, sets offset = 0.
-     */
-    reset(): ByteBuffer;
-
-    /**
-     * Resizes this ByteBuffer to be backed by a buffer of at least the given capacity. Will do nothing if already that large or larger.
-     */ 
-    resize( capacity: number ): ByteBuffer;
-
-    /**
-     * Reverses this ByteBuffer's contents
-     */
-    reverse( begin?: number, end?: number ): ByteBuffer;
-
-    /**
-     * Skips the next length bytes. This will just advance
-     */
-    skip( length: number ): ByteBuffer;
-
-    /**
-     * Slices this ByteBuffer by creating a cloned instance with offset = begin and limit = end.
-     */
-    slice( begin?: number, end?: number ): ByteBuffer;
-
-    /**
-     * Returns a raw buffer compacted to contain this ByteBuffer's contents. Contents are the bytes between ByteBuffer#offset and ByteBuffer#limit. Will transparently ByteBuffer#flip this ByteBuffer if offset > limit but the actual offsets remain untouched. This is an alias of ByteBuffer#toBuffer.
-     */
-    toArrayBuffer( forceCopy?: boolean ): ArrayBuffer;
-
-    /**
-     * Encodes this ByteBuffer's contents to a base64 encoded string.
-     */
-    toBase64( begin?: number, end?: number ): string;
-
-    /**
-     * Encodes this ByteBuffer to a binary encoded string, that is using only characters 0x00-0xFF as bytes.
-     */
-    toBinary( begin?: number, end?: number ): string;
-
-    /**
-     * Returns a copy of the backing buffer that contains this ByteBuffer's contents. Contents are the bytes between ByteBuffer#offset and ByteBuffer#limit. Will transparently ByteBuffer#flip this ByteBuffer if offset > limit but the actual offsets remain untouched.
-     */
-    toBuffer( forceCopy?: boolean ): ArrayBuffer;
-
-    /**
-      *Encodes this ByteBuffer to a hex encoded string with marked offsets. Offset symbols are:
-     *  < : offset,
-     *  ' : markedOffset,
-     *  > : limit,
-     *  | : offset and limit,
-     *  [ : offset and markedOffset,
-     *  ] : markedOffset and limit,
-     *  ! : offset, markedOffset and limit
-     */
-    toDebug( columns?: boolean ): string | Array<string>
-
-    /**
-     * Encodes this ByteBuffer's contents to a hex encoded string.
-     */
-    toHex( begin?: number, end?: number ): string;
-
-    /**
-     * Converts the ByteBuffer's contents to a string.
-     */
-    toString( encoding?: string ): string;
-
-    /**
-     * Encodes this ByteBuffer's contents between ByteBuffer#offset and ByteBuffer#limit to an UTF8 encoded string.
-     */
-    toUTF8(): string;
-
-    /**
-     * Writes an 8bit signed integer. This is an alias of ByteBuffer#writeInt8.
-     */
-    writeByte( value: number, offset?: number ): ByteBuffer;
-
-    /**
-     * Writes a NULL-terminated UTF8 encoded string. For this to work the specified string must not contain any NULL characters itself.
-     */
-    writeCString( str: string, offset?: number ): ByteBuffer;
-
-    /**
-     * Writes a 64bit float. This is an alias of ByteBuffer#writeFloat64.
-     */
-    writeDouble( value: number, offset?: number ): ByteBuffer;
-
-    /**
-     * Writes a 32bit float. This is an alias of ByteBuffer#writeFloat32.
-     */
-    writeFloat( value: number, offset?: number ): ByteBuffer;
-
-    /**
-     * Writes a 32bit float.
-     */
-    writeFloat32( value: number, offset?: number ): ByteBuffer;
-
-    /**
-     * Writes a 64bit float.
-     */
-    writeFloat64( value: number, offset?: number ): ByteBuffer;
-
-    /**
-     * Writes a length as uint32 prefixed UTF8 encoded string.
-     */
-    writeIString( str: string, offset?: number ): ByteBuffer;
-
-    /**
-     * Writes a 32bit signed integer. This is an alias of ByteBuffer#writeInt32.
-     */
-    writeInt( value: number, offset?: number ): ByteBuffer;
-
-    /**
-     * Writes a 16bit signed integer.
-     */
-    writeInt16( value: number, offset?: number ): ByteBuffer;
-
-    /**
-     * Writes a 32bit signed integer.
-     */
-    writeInt32( value: number, offset?: number ): ByteBuffer;
-
-    /**
-     * Writes a 64bit signed integer.
-     */
-    writeInt64( value: number | Long, offset?: number ): ByteBuffer;
-
-    /**
-     * Writes an 8bit signed integer.
-     */
-    writeInt8( value: number, offset?: number ): ByteBuffer;
-
-    /**
-     * Writes a 16bit signed integer. This is an alias of ByteBuffer#writeInt16.
-     */
-    writeShort( value: number, offset?: number ): ByteBuffer;
-
-    /**
-     * Writes an UTF8 encoded string.This is an alias of ByteBuffer#writeUTF8String.
-     */
-    WriteString( str: string, offset?: number ): ByteBuffer | number;
-
-    /**
-     * Writes an UTF8 encoded string.
-     */
-    writeUTF8String( str: string, offset?: number ): ByteBuffer | number;
-
-    /**
-     * Writes a 16bit unsigned integer.
-     */
-    writeUint16( value: number, offset?: number ): ByteBuffer;
-
-    /**
-     * Writes a 32bit unsigned integer.
-     */
-    writeUint32( value: number, offset?: number ): ByteBuffer;
-
-    /**
-     * Writes a 64bit unsigned integer.
-     */
-    writeUint64( value: number | Long, offset?: number ): ByteBuffer;
-
-    /**
-     * Writes an 8bit unsigned integer.
-     */
-    writeUint8( value: number, offset?: number ): ByteBuffer;
-
-    /**
-     * Writes a length as varint32 prefixed UTF8 encoded string.
-     */
-    writeVString( str: string, offset?: number ): ByteBuffer | number;
-
-    /**
-     * Writes a 32bit base 128 variable-length integer.
-     */
-    writeVarint32( value: number, offset?: number ): ByteBuffer | number;
-
-    /**
-     * Writes a zig-zag encoded 32bit base 128 variable-length integer.
-     */
-    writeVarint32ZigZag( value: number, offset?: number ): ByteBuffer | number;
-
-    /**
-     * Writes a 64bit base 128 variable-length integer.
-     */
-    writeVarint64( value: number | Long, offset?: number ): ByteBuffer;
-
-    /**
-     * Writes a zig-zag encoded 64bit base 128 variable-length integer.
-     */
-    writeVarint64ZigZag( value: number | Long, offset?: number ): ByteBuffer | number;
-}
-
-declare module 'bytebuffer' {
-    namespace ByteBuffer {}
-    export = ByteBuffer;
-}
diff --git a/bytebuffer/index.d.ts b/bytebuffer/index.d.ts
new file mode 100644
index 0000000000..ed5677dd05
--- /dev/null
+++ b/bytebuffer/index.d.ts
@@ -0,0 +1,615 @@
+// Type definitions for bytebuffer.js 5.0.0
+// Project: https://github.com/dcodeIO/bytebuffer.js
+// Definitions by: Denis Cappellin <http://github.com/cappellin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Definitions by: SINTEF-9012 <http://github.com/SINTEF-9012>
+
+/// <reference types="long" />
+
+declare class ByteBuffer
+{
+    /**
+     * Constructs a new ByteBuffer.
+     */
+    constructor( capacity?: number, littleEndian?: boolean, noAssert?: boolean );
+
+    /**
+     * Big endian constant that can be used instead of its boolean value. Evaluates to false.
+     */
+    static BIG_ENDIAN: boolean;
+
+    /**
+     * Default initial capacity of 16.
+     */
+    static DEFAULT_CAPACITY: number;
+
+    /**
+     * Default no assertions flag of false.
+     */
+    static DEFAULT_NOASSERT: boolean;
+
+    /**
+     * Little endian constant that can be used instead of its boolean value. Evaluates to true.
+     */
+    static LITTLE_ENDIAN: boolean;
+
+    /**
+     * Maximum number of bytes required to store a 32bit base 128 variable-length integer.
+     */
+    static MAX_VARINT32_BYTES: number;
+
+    /**
+     * Maximum number of bytes required to store a 64bit base 128 variable-length integer.
+     */
+    static MAX_VARINT64_BYTES: number;
+
+    /**
+     * Metrics representing number of bytes.Evaluates to 2.
+     */
+    static METRICS_BYTES: number;
+
+    /**
+     * Metrics representing number of UTF8 characters.Evaluates to 1.
+     */
+    static METRICS_CHARS: number;
+
+    /**
+     * ByteBuffer version.
+     */
+    static VERSION: string;
+
+    /**
+     * Backing buffer.
+     */
+    buffer: ArrayBuffer;
+
+    /**
+     * Absolute limit of the contained data. Set to the backing buffer's capacity upon allocation.
+     */
+    limit: number;
+
+    /**
+     * Whether to use little endian byte order, defaults to false for big endian.
+     */
+    littleEndian: boolean;
+
+    /**
+     * Marked offset.
+     */
+    markedOffset: number;
+
+    /**
+     * Whether to skip assertions of offsets and values, defaults to false.
+     */
+    noAssert: boolean;
+
+    /**
+     * Absolute read/write offset.
+     */
+    offset: number;
+
+    /**
+     * Data view to manipulate the backing buffer. Becomes null if the backing buffer has a capacity of 0.
+     */
+    view: DataView;    
+
+    /**
+     * Allocates a new ByteBuffer backed by a buffer of the specified capacity.
+     */
+    static allocate( capacity?: number, littleEndian?: number, noAssert?: boolean ): ByteBuffer;
+
+    /**
+     * Decodes a base64 encoded string to binary like window.atob does.
+     */
+    static atob( b64: string ): string;
+
+    /**
+     * Encodes a binary string to base64 like window.btoa does.
+     */
+    static btoa( str: string ): string;
+
+    /**
+     * Calculates the number of UTF8 bytes of a string.
+     */
+    static calculateUTF8Byte( str: string ): number;
+
+    /**
+     * Calculates the number of UTF8 characters of a string.JavaScript itself uses UTF- 16, so that a string's length property does not reflect its actual UTF8 size if it contains code points larger than 0xFFFF.
+     */
+    static calculateUTF8Char( str: string ): number;
+
+    /**
+     * Calculates the actual number of bytes required to store a 32bit base 128 variable-length integer.
+     */
+    static calculateVariant32( value: number ): number;
+
+    /**
+     * Calculates the actual number of bytes required to store a 64bit base 128 variable-length integer.
+     */
+    static calculateVariant64( value: number | Long ): number;
+
+    /**
+     * Concatenates multiple ByteBuffers into one.
+     */
+    static concat( buffers: Array<ByteBuffer | ArrayBuffer | Uint8Array | string>, encoding?: string | boolean, litteEndian?: boolean, noAssert?: boolean ): ByteBuffer;
+
+    /**
+     * Decodes a base64 encoded string to a ByteBuffer.
+     */
+    static fromBase64( str: string, littleEndian?: boolean, noAssert?: boolean ): ByteBuffer;
+
+    /**
+     * Decodes a binary encoded string, that is using only characters 0x00-0xFF as bytes, to a ByteBuffer.
+     */
+    static fromBinary( str: string, littleEndian?: boolean, noAssert?: boolean ): ByteBuffer;
+
+    /**
+     * Decodes a hex encoded string with marked offsets to a ByteBuffer.
+     */
+    static fromDebug( str: string, littleEndian?: boolean, noAssert?: boolean ): ByteBuffer;
+
+    /**
+     * Decodes a hex encoded string to a ByteBuffer.
+     */
+    static fromHex( str: string, littleEndian?: boolean, noAssert?: boolean ): ByteBuffer;
+
+    /**
+     * Decodes an UTF8 encoded string to a ByteBuffer.
+     */
+    static fromUTF8( str: string, littleEndian?: boolean, noAssert?: boolean ): ByteBuffer;
+
+    /**
+     * Gets the backing buffer type.
+     */
+    static isByteBuffer( bb: any ): boolean;
+
+    /**
+     * Wraps a buffer or a string. Sets the allocated ByteBuffer's ByteBuffer#offset to 0 and its ByteBuffer#limit to the length of the wrapped data.
+     * @param buffer Anything that can be wrapped
+     * @param encoding String encoding if buffer is a string ("base64", "hex", "binary", defaults to "utf8")
+     * @param littleEndian Whether to use little or big endian byte order. Defaults to ByteBuffer.DEFAULT_ENDIAN.
+     * @param noAssert Whether to skip assertions of offsets and values. Defaults to ByteBuffer.DEFAULT_NOASSERT.
+     */
+    static wrap( buffer: ByteBuffer | ArrayBuffer | Uint8Array | string, enc?: string | boolean, littleEndian?: boolean, noAssert?: boolean ): ByteBuffer;
+
+    /**
+     * Decodes a zigzag encoded signed 32bit integer.
+     */
+    static zigZagDecode32( n: number ): number;
+
+    /**
+     * Decodes a zigzag encoded signed 64bit integer.
+     */
+    static zigZagDecode64( n: number | Long ): Long;
+
+    /**
+     * Zigzag encodes a signed 32bit integer so that it can be effectively used with varint encoding.
+     */
+    static zigZagEncode32( n: number ): number;
+
+    /**
+     * Zigzag encodes a signed 64bit integer so that it can be effectively used with varint encoding.
+     */
+    static zigZagEncode64( n: number | Long ): Long;
+
+    /**
+     * Switches (to) big endian byte order.
+     */
+    BE( bigEndian?: boolean ): ByteBuffer;
+
+    /**
+     * Switches (to) little endian byte order.
+     */
+    LE( bigEndian?: boolean ): ByteBuffer;
+
+    /**
+     * Appends some data to this ByteBuffer. This will overwrite any contents behind the specified offset up to the appended data's length.
+     */
+    append( source: ByteBuffer | ArrayBuffer | Uint8Array | string, encoding?: string | number, offset?: number ): ByteBuffer;
+
+    /**
+     * Appends this ByteBuffer's contents to another ByteBuffer. This will overwrite any contents behind the specified offset up to the length of this ByteBuffer's data.
+     */
+    appendTo( target: ByteBuffer, offset?: number ): ByteBuffer;
+
+    /**
+     * Enables or disables assertions of argument types and offsets. Assertions are enabled by default but you can opt to disable them if your code already makes sure that everything is valid.
+     */
+    assert( assert: boolean ): ByteBuffer;
+
+    /**
+     * Gets the capacity of this ByteBuffer's backing buffer.
+     */
+    capacity(): number;
+
+    /**
+     * Clears this ByteBuffer's offsets by setting ByteBuffer#offset to 0 and
+     * ByteBuffer#limit to the backing buffer's capacity. Discards ByteBuffer#markedOffset.
+     */
+    clear(): ByteBuffer;
+
+    /**
+     * Creates a cloned instance of this ByteBuffer, preset with this ByteBuffer's values for ByteBuffer#offset, ByteBuffer#markedOffset and ByteBuffer#limit.
+     */
+    clone( copy?: boolean ): ByteBuffer;
+
+    /**
+     * Compacts this ByteBuffer to be backed by a ByteBuffer#buffer of its contents' length. Contents are the bytes between ByteBuffer#offset and ByteBuffer#limit. Will set offset = 0 and limit = capacity and adapt ByteBuffer#markedOffset to the same relative position if set.
+     */
+    compact( begin?: number, end?: number ): ByteBuffer;
+
+    /**
+     * Creates a copy of this ByteBuffer's contents. Contents are the bytes between ByteBuffer#offset and ByteBuffer#limit.
+     */
+    copy( begin?: number, end?: number ): ByteBuffer;
+
+    /**
+     * Copies this ByteBuffer's contents to another ByteBuffer. Contents are the bytes between ByteBuffer#offset and ByteBuffer#limit.
+     */
+    copyTo( target: ByteBuffer, targetOffset?: number, sourceOffset?: number, sourceLimit?: number ): ByteBuffer;
+
+    /**
+     * Makes sure that this ByteBuffer is backed by a ByteBuffer#buffer of at least the specified capacity. If the current capacity is exceeded, it will be doubled. If double the current capacity is less than the required capacity, the required capacity will be used instead.
+     */
+    ensureCapacity( capacity: number ): ByteBuffer;
+
+    /**
+     * Overwrites this ByteBuffer's contents with the specified value. Contents are the bytes between ByteBuffer#offset and ByteBuffer#limit.
+     */
+    fill( value: number | string, begin?: number, end?: number ): ByteBuffer;
+
+    /**
+     * Makes this ByteBuffer ready for a new sequence of write or relative read operations. Sets limit = offset and offset = 0. Make sure always to flip a ByteBuffer when all relative read or write operations are complete.
+     */
+    flip(): ByteBuffer;
+
+    /**
+     * Marks an offset on this ByteBuffer to be used later.
+     */
+    mark( offset?: number ): ByteBuffer;
+
+    /**
+     * Sets the byte order.
+     */
+    order( littleEndian: boolean ): ByteBuffer;
+
+    /**
+     * Prepends some data to this ByteBuffer. This will overwrite any contents before the specified offset up to the prepended data's length. If there is not enough space available before the specified offset, the backing buffer will be resized and its contents moved accordingly.
+     */
+    prepend( source: ByteBuffer | string | ArrayBuffer, encoding?: string | number, offset?: number ): ByteBuffer;
+
+    /**
+     * Prepends this ByteBuffer to another ByteBuffer. This will overwrite any contents before the specified offset up to the prepended data's length. If there is not enough space available before the specified offset, the backing buffer will be resized and its contents moved accordingly.
+     */
+    prependTo( target: ByteBuffer, offset?: number ): ByteBuffer;
+
+    /**
+     * Prints debug information about this ByteBuffer's contents.
+     */
+    printDebug( out?: ( text: string ) => void ): void;
+
+    /**
+     * Reads an 8bit signed integer. This is an alias of ByteBuffer#readInt8.
+     */
+    readByte( offset?: number ): number;
+
+    /**
+     * Reads a NULL-terminated UTF8 encoded string. For this to work the string read must not contain any NULL characters itself.
+     */
+    readCString( offset?: number ): string;
+
+    /**
+     * Reads a 64bit float. This is an alias of ByteBuffer#readFloat64.
+     */
+    readDouble( offset?: number ): number;
+
+    /**
+     * Reads a 32bit float. This is an alias of ByteBuffer#readFloat32.
+     */
+    readFloat( offset?: number ): number;
+
+    /**
+     * Reads a 32bit float.
+     */
+    readFloat32( offset?: number ): number;
+
+    /**
+     * Reads a 64bit float.
+     */
+    readFloat64( offset?: number ): number;
+
+    /**
+     * Reads a length as uint32 prefixed UTF8 encoded string.
+     */
+    readIString( offset?: number ): string;
+
+    /**
+     * Reads a 32bit signed integer.This is an alias of ByteBuffer#readInt32.
+     */
+    readInt( offset?: number ): number;
+
+    /**
+     * Reads a 16bit signed integer.
+     */
+    readInt16( offset?: number ): number;
+
+    /**
+     * Reads a 32bit signed integer.
+     */
+    readInt32( offset?: number ): number;
+
+    /**
+     * Reads a 64bit signed integer.
+     */
+    readInt64( offset?: number ): Long;
+
+    /**
+     * Reads an 8bit signed integer.
+     */
+    readInt8( offset?: number ): number;
+
+    /**
+     * Reads a 64bit signed integer. This is an alias of ByteBuffer#readInt64.
+     */
+    readLong( offset?: number ): Long;
+
+    /**
+     * Reads a 16bit signed integer. This is an alias of ByteBuffer#readInt16.
+     */
+    readShort( offset?: number ): number;
+
+    /**
+     * Reads an UTF8 encoded string. This is an alias of ByteBuffer#readUTF8String.
+     */
+    readString( length: number, metrics?: number, offset?: number ): string;
+
+    /**
+     * Reads an UTF8 encoded string.
+     */
+    readUTF8String( chars: number, offset?: number ): string;
+
+    /**
+     * Reads a 16bit unsigned integer.
+     */
+    readUint16( offset?: number ): number;
+
+    /**
+     * Reads a 32bit unsigned integer.
+     */
+    readUint32( offset?: number ): number;
+
+    /**
+     * Reads a 64bit unsigned integer.
+     */
+    readUint64( offset?: number ): Long;
+    /**
+     * Reads an 8bit unsigned integer.
+     */
+    readUint8( offset?: number ): number;
+
+    /**
+     * Reads a length as varint32 prefixed UTF8 encoded string.
+     */
+    readVString( offset?: number ): string;
+
+    /**
+     * Reads a 32bit base 128 variable-length integer.
+     */
+    readVarint32( offset?: number ): number;
+
+    /**
+     * Reads a zig-zag encoded 32bit base 128 variable-length integer.
+     */
+    readVarint32ZiZag( offset?: number ): number;
+
+    /**
+     * Reads a 64bit base 128 variable-length integer. Requires Long.js.
+     */
+    readVarint64( offset?: number ): Long;
+
+    /**
+     * Reads a zig-zag encoded 64bit base 128 variable-length integer. Requires Long.js.
+     */
+    readVarint64ZigZag( offset?: number ): Long;
+
+    /**
+     * Gets the number of remaining readable bytes. Contents are the bytes between ByteBuffer#offset and ByteBuffer#limit, so this returns limit - offset.
+     */
+    remaining(): number;
+
+    /**
+     * Resets this ByteBuffer's ByteBuffer#offset. If an offset has been marked through ByteBuffer#mark before, offset will be set to ByteBuffer#markedOffset, which will then be discarded. If no offset has been marked, sets offset = 0.
+     */
+    reset(): ByteBuffer;
+
+    /**
+     * Resizes this ByteBuffer to be backed by a buffer of at least the given capacity. Will do nothing if already that large or larger.
+     */ 
+    resize( capacity: number ): ByteBuffer;
+
+    /**
+     * Reverses this ByteBuffer's contents
+     */
+    reverse( begin?: number, end?: number ): ByteBuffer;
+
+    /**
+     * Skips the next length bytes. This will just advance
+     */
+    skip( length: number ): ByteBuffer;
+
+    /**
+     * Slices this ByteBuffer by creating a cloned instance with offset = begin and limit = end.
+     */
+    slice( begin?: number, end?: number ): ByteBuffer;
+
+    /**
+     * Returns a raw buffer compacted to contain this ByteBuffer's contents. Contents are the bytes between ByteBuffer#offset and ByteBuffer#limit. Will transparently ByteBuffer#flip this ByteBuffer if offset > limit but the actual offsets remain untouched. This is an alias of ByteBuffer#toBuffer.
+     */
+    toArrayBuffer( forceCopy?: boolean ): ArrayBuffer;
+
+    /**
+     * Encodes this ByteBuffer's contents to a base64 encoded string.
+     */
+    toBase64( begin?: number, end?: number ): string;
+
+    /**
+     * Encodes this ByteBuffer to a binary encoded string, that is using only characters 0x00-0xFF as bytes.
+     */
+    toBinary( begin?: number, end?: number ): string;
+
+    /**
+     * Returns a copy of the backing buffer that contains this ByteBuffer's contents. Contents are the bytes between ByteBuffer#offset and ByteBuffer#limit. Will transparently ByteBuffer#flip this ByteBuffer if offset > limit but the actual offsets remain untouched.
+     */
+    toBuffer( forceCopy?: boolean ): ArrayBuffer;
+
+    /**
+      *Encodes this ByteBuffer to a hex encoded string with marked offsets. Offset symbols are:
+     *  < : offset,
+     *  ' : markedOffset,
+     *  > : limit,
+     *  | : offset and limit,
+     *  [ : offset and markedOffset,
+     *  ] : markedOffset and limit,
+     *  ! : offset, markedOffset and limit
+     */
+    toDebug( columns?: boolean ): string | Array<string>
+
+    /**
+     * Encodes this ByteBuffer's contents to a hex encoded string.
+     */
+    toHex( begin?: number, end?: number ): string;
+
+    /**
+     * Converts the ByteBuffer's contents to a string.
+     */
+    toString( encoding?: string ): string;
+
+    /**
+     * Encodes this ByteBuffer's contents between ByteBuffer#offset and ByteBuffer#limit to an UTF8 encoded string.
+     */
+    toUTF8(): string;
+
+    /**
+     * Writes an 8bit signed integer. This is an alias of ByteBuffer#writeInt8.
+     */
+    writeByte( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a NULL-terminated UTF8 encoded string. For this to work the specified string must not contain any NULL characters itself.
+     */
+    writeCString( str: string, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a 64bit float. This is an alias of ByteBuffer#writeFloat64.
+     */
+    writeDouble( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a 32bit float. This is an alias of ByteBuffer#writeFloat32.
+     */
+    writeFloat( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a 32bit float.
+     */
+    writeFloat32( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a 64bit float.
+     */
+    writeFloat64( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a length as uint32 prefixed UTF8 encoded string.
+     */
+    writeIString( str: string, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a 32bit signed integer. This is an alias of ByteBuffer#writeInt32.
+     */
+    writeInt( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a 16bit signed integer.
+     */
+    writeInt16( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a 32bit signed integer.
+     */
+    writeInt32( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a 64bit signed integer.
+     */
+    writeInt64( value: number | Long, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes an 8bit signed integer.
+     */
+    writeInt8( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a 16bit signed integer. This is an alias of ByteBuffer#writeInt16.
+     */
+    writeShort( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes an UTF8 encoded string.This is an alias of ByteBuffer#writeUTF8String.
+     */
+    WriteString( str: string, offset?: number ): ByteBuffer | number;
+
+    /**
+     * Writes an UTF8 encoded string.
+     */
+    writeUTF8String( str: string, offset?: number ): ByteBuffer | number;
+
+    /**
+     * Writes a 16bit unsigned integer.
+     */
+    writeUint16( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a 32bit unsigned integer.
+     */
+    writeUint32( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a 64bit unsigned integer.
+     */
+    writeUint64( value: number | Long, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes an 8bit unsigned integer.
+     */
+    writeUint8( value: number, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a length as varint32 prefixed UTF8 encoded string.
+     */
+    writeVString( str: string, offset?: number ): ByteBuffer | number;
+
+    /**
+     * Writes a 32bit base 128 variable-length integer.
+     */
+    writeVarint32( value: number, offset?: number ): ByteBuffer | number;
+
+    /**
+     * Writes a zig-zag encoded 32bit base 128 variable-length integer.
+     */
+    writeVarint32ZigZag( value: number, offset?: number ): ByteBuffer | number;
+
+    /**
+     * Writes a 64bit base 128 variable-length integer.
+     */
+    writeVarint64( value: number | Long, offset?: number ): ByteBuffer;
+
+    /**
+     * Writes a zig-zag encoded 64bit base 128 variable-length integer.
+     */
+    writeVarint64ZigZag( value: number | Long, offset?: number ): ByteBuffer | number;
+}
+
+declare namespace ByteBuffer {}
+export = ByteBuffer;
+export as namespace ByteBuffer;
diff --git a/bytebuffer/tsconfig.json b/bytebuffer/tsconfig.json
new file mode 100644
index 0000000000..c82b8b1261
--- /dev/null
+++ b/bytebuffer/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bytebuffer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/bytes/bytes-tests.ts b/bytes/bytes-tests.ts
index 4a981aee47..8df0bcbf18 100644
--- a/bytes/bytes-tests.ts
+++ b/bytes/bytes-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="./bytes.d.ts"/>
-
-import bytes = require('bytes');
+import bytes = require('bytes');
 
 // 1024*1024 = 1048576
 console.log(bytes(104857));
diff --git a/bytes/bytes.d.ts b/bytes/bytes.d.ts
deleted file mode 100644
index b99ebee7c6..0000000000
--- a/bytes/bytes.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-// Type definitions for bytes v2.1.0
-// Project: https://github.com/visionmedia/bytes.js
-// Definitions by: Zhiyuan Wang <https://github.com/danny8002/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'bytes' {
-
-    /**
-     *Convert the given value in bytes into a string.
-     *
-     * @param {number} value
-     * @param {{
-     *  thousandsSeparator: [string]
-     *  }} [options] bytes options.
-     *
-     * @returns {string}
-     */
-    function bytes(value: number, options?: { thousandsSeparator: string }): string;
-
-    /**
-     *Parse string to an integer in bytes.
-     *
-     * @param {string} value
-     * @returns {number}
-     */
-    function bytes(value: string): number;
-
-    namespace bytes {
-
-        /**
-         * Format the given value in bytes into a string.
-         *
-         * If the value is negative, take Math.abs(). If it is a float,
-         * it is rounded.
-         *
-         * @param {number} value
-         * @param {BytesFormatOptions} [options]
-         */
-
-        function format(value: number, options?: { thousandsSeparator: string }): string;
-
-        /**
-         * Just return the input number value.
-         *
-         * @param {number} value
-         * @return {number}
-         */
-        function parse(value: number): number;
-
-        /**
-         * Parse the string value into an integer in bytes.
-         *
-         * If no unit is given, it is assumed the value is in bytes.
-         *
-         * @param {string} value
-         * @return {number}
-         */
-        function parse(value: string): number;
-    }
-
-    export = bytes;
-}
diff --git a/bytes/index.d.ts b/bytes/index.d.ts
new file mode 100644
index 0000000000..37a25897a0
--- /dev/null
+++ b/bytes/index.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for bytes v2.1.0
+// Project: https://github.com/visionmedia/bytes.js
+// Definitions by: Zhiyuan Wang <https://github.com/danny8002/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+/**
+ *Convert the given value in bytes into a string.
+ *
+ * @param {number} value
+ * @param {{
+ *  thousandsSeparator: [string]
+ *  }} [options] bytes options.
+ *
+ * @returns {string}
+ */
+declare function bytes(value: number, options?: { thousandsSeparator: string }): string;
+
+/**
+ *Parse string to an integer in bytes.
+ *
+ * @param {string} value
+ * @returns {number}
+ */
+declare function bytes(value: string): number;
+
+declare namespace bytes {
+
+    /**
+     * Format the given value in bytes into a string.
+     *
+     * If the value is negative, take Math.abs(). If it is a float,
+     * it is rounded.
+     *
+     * @param {number} value
+     * @param {BytesFormatOptions} [options]
+     */
+
+    function format(value: number, options?: { thousandsSeparator: string }): string;
+
+    /**
+     * Just return the input number value.
+     *
+     * @param {number} value
+     * @return {number}
+     */
+    function parse(value: number): number;
+
+    /**
+     * Parse the string value into an integer in bytes.
+     *
+     * If no unit is given, it is assumed the value is in bytes.
+     *
+     * @param {string} value
+     * @return {number}
+     */
+    function parse(value: string): number;
+}
+
+export = bytes;
diff --git a/bytes/tsconfig.json b/bytes/tsconfig.json
new file mode 100644
index 0000000000..8b7e4e50e4
--- /dev/null
+++ b/bytes/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "bytes-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/c3/c3-tests.ts b/c3/c3-tests.ts
index 5413db82d7..3bbab6f4af 100644
--- a/c3/c3-tests.ts
+++ b/c3/c3-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="c3.d.ts" />
+
 
 //////////////////
 // Doc Examples
diff --git a/c3/c3.d.ts b/c3/c3.d.ts
deleted file mode 100644
index 32dee37dce..0000000000
--- a/c3/c3.d.ts
+++ /dev/null
@@ -1,1073 +0,0 @@
-// Type definitions for C3js
-// Project: http://c3js.org/
-// Definitions by: Marc Climent <https://github.com/mcliment>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../d3/d3.d.ts"/>
-
-declare namespace c3 {
-
-    type PrimitiveArray = Array<string | boolean | number>;
-    type FormatFunction = (v: any, id: string, i: number, j: number) => void;
-
-    interface TargetIds {
-        ids: ArrayOrString;
-    }
-
-    type ArrayOrString = Array<string> | string;
-
-    interface ChartConfiguration {
-        /**
-         * The CSS selector or the element which the chart will be set to. D3 selection object can be specified. If other chart is set already, it will be replaced with the new one (only one chart can be set in one element).
-         * If this option is not specified, the chart will be generated but not be set. Instead, we can access the element by chart.element and set it by ourselves.
-         * Note: When chart is not binded, c3 starts observing if chart.element is binded by MutationObserver. In this case, polyfill is required in IE9 and IE10 becuase they do not support MutationObserver. On the other hand, if chart always will be binded, polyfill will not be required because MutationObserver will never be called.
-         */
-        bindto?: string | HTMLElement | d3.Selection<any>;
-        size?: {
-            /**
-             * The desired width of the chart element.
-             * If this option is not specified, the width of the chart will be calculated by the size of the parent element it's appended to.
-             * Note: This option should be specified if possible because it can improve its performance because some size calculations will be skipped by an explicit value.
-             */
-            width?: number;
-            /**
-             * The desired height of the chart element.
-             * If this option is not specified, the height of the chart will be calculated by the size of the parent element it's appended to.
-             */
-            height?: number;
-        };
-
-        padding?: {
-            /**
-             * The padding on the top of the chart.
-             */
-            top?: number;
-            /**
-             * The padding on the right of the chart.
-             */
-            right?: number;
-            /**
-             * The padding on the bottom of the chart.
-             */
-            bottom?: number;
-            /**
-             * The padding on the left of the chart.
-             */
-            left?: number;
-        };
-
-        color?: {
-            /**
-             * Set custom color pattern.
-             */
-            pattern?: Array<string>;
-            threshold?: any; // Undocumented
-        };
-
-        interaction?: {
-            /**
-             * Indicate if the chart should have interactions.
-             * If false is set, all of interactions (showing/hiding tooltip, selection, mouse events, etc) will be disabled.
-             */
-            enabled?: boolean;
-        };
-
-        transition?: {
-            /**
-             * Set duration of transition (in milliseconds) for chart animation.
-             * Note: If 0 or null set, transition will be skipped. So, this makes initial rendering faster especially in case you have a lot of data.
-             */
-            duration?: number;
-        };
-
-        /**
-         * Set a callback to execute when the chart is initialized.
-         */
-        oninit?: () => void;
-
-        /**
-         * Set a callback which is executed when the chart is rendered. Basically, this callback will be called in each time when the chart is redrawed.
-         */
-        onrendered?: () => void;
-
-        /**
-         * Set a callback to execute when mouse enters the chart.
-         */
-        onmouseover?: () => void;
-
-        /**
-         * Set a callback to execute when mouse leaves the chart.
-         */
-        onmouseout?: () => void;
-
-        /**
-         * Set a callback to execute when user resizes the screen.
-         */
-        onresize?: () => void;
-
-        /**
-         * Set a callback to execute when screen resize finished.
-         */
-        onresized?: () => void;
-
-        data: Data;
-
-        axis?: Axis;
-
-        grid?: Grid;
-
-        /**
-         * Show rectangles inside the chart.
-         * This option accepts array including object that has axis, start, end and class. The keys start, end and class are optional.
-         * axis must be x, y or y2. start and end should be the value where regions start and end. If not specified, the edge values will be used. If timeseries x axis, date string, Date object and unixtime integer can be used. If class is set, the region element will have it as class.
-         */
-        regions?: Array<RegionOptions>;
-
-        legend?: LegendOptions;
-
-        tooltip?: TooltipOptions;
-
-        subchart?: SubchartOptions;
-
-        zoom?: ZoomOptions;
-
-        point?: PointOptions;
-
-        line?: {
-            /**
-             * Set if null data point will be connected or not.
-             * If true set, the region of null data will be connected without any data point. If false set, the region of null data will not be connected and get empty.
-             */
-            connectNull?: boolean;
-            /**
-             * Change step type for step chart. 'step', 'step-before' and 'step-after' can be used.
-             */
-            step_type?: string;
-        };
-
-        area?: {
-            /**
-             * Set if min or max value will be 0 on area chart.
-             */
-            zerobased?: boolean;
-        };
-
-        bar?: {
-            /**
-             * Change the width of bar chart. If ratio is specified, change the width of bar chart by ratio.
-             */
-            width?: number | { ratio: number };
-            /**
-             * Set if min or max value will be 0 on bar chart.
-             */
-            zerobased?: boolean;
-        };
-
-        pie?: {
-            label?: {
-                /**
-                 * Show or hide label on each pie piece.
-                 */
-                show?: boolean;
-                /**
-                 * Set formatter for the label on each pie piece.
-                 */
-                format?: (value: number, ratio: number, id: string) => string;
-                /**
-                 * Set threshold to show/hide labels.
-                 */
-                threshold?: number
-            };
-            /**
-             * Enable or disable expanding pie pieces.
-             */
-            expand?: boolean;
-        };
-
-        donut?: {
-            label?: {
-                /**
-                 * Show or hide label on each donut piece.
-                 */
-                show?: boolean;
-                /**
-                 * Set formatter for the label on each donut piece.
-                 */
-                format?: (value: number, ratio: number, id: string) => string;
-                /**
-                 * Set threshold to show/hide labels.
-                 */
-                threshold?: number
-            };
-            /**
-             * Enable or disable expanding pie pieces.
-             */
-            expand?: boolean;
-            /**
-             * Set width of donut chart.
-             */
-            width?: number;
-            /**
-             * Set title of donut chart.
-             */
-            title?: string;
-        };
-
-        gauge?: {
-            label?: {
-                /**
-                 * Show or hide label on gauge.
-                 */
-                show?: boolean;
-                /**
-                 * Set formatter for the label on gauge.
-                 */
-                format?: (value: any, ratio: number) => string;
-            };
-            /**
-             * Enable or disable expanding gauge.
-             */
-            expand?: boolean;
-            /**
-             * Set min value of the gauge.
-             */
-            min?: number;
-            /**
-             * Set max value of the gauge.
-             */
-            max?: number;
-            /**
-             * Set units of the gauge.
-             */
-            units?: string;
-            /**
-             * Set width of gauge chart.
-             */
-            width?: number;
-        };
-    }
-
-    interface Data {
-        /**
-         * Load a CSV or JSON file from a URL. Note that this will not work if loading via the "file://" protocol as most browsers with block XMLHTTPRequests.
-         */
-        url?: string;
-        /**
-         * Parse a JSON object for data.
-         */
-        json?: Object;
-        /**
-         * Load data from a multidimensional array, with the first element containing the data names, the following containing related data in that order.
-         */
-        rows?: Array<PrimitiveArray>;
-        /*
-         * Load data from a multidimensional array, with each element containing an array consisting of a datum name and associated data values.
-         */
-        columns?: Array<PrimitiveArray>;
-        /**
-         * Used if loading JSON via data.url
-         */
-        mimeType?: string;
-        /**
-         * Choose which JSON object keys correspond to desired data.
-         */
-        keys?: { x?: string; value: Array<string>; };
-        /**
-         * Specify the key of x values in the data.
-         * We can show the data with non-index x values by this option. This option is required when the type of x axis is timeseries. If this option is set on category axis, the values of the data on the key will be used for category names.
-         */
-        x?: string;
-        /**
-         * Specify the keys of the x values for each data.
-         * This option can be used if we want to show the data that has different x values.
-         */
-        xs?: { [key: string]: string };
-        /**
-         * Set a format to parse string specifed as x.
-         * Default is %Y-%m-%d
-         */
-        xFormat?: string;
-        //xLocaltime?: any;
-        //xSort?: any;
-        /**
-         * Set custom data name.
-         */
-        names?: { [key: string]: string };
-        /**
-         * Set custom data class.
-         * If this option is specified, the element g for the data has an additional class that has the prefix c3-target- (e.g. c3-target-additional-data1-class).
-         */
-        classes?: { [key: string]: string };
-        /**
-         * Set groups for the data for stacking.
-         */
-        groups?: Array<Array<string>>;
-        /**
-         * Set y axis the data related to. y and y2 can be used.
-         */
-        axes?: { [key: string]: string };
-        /**
-         * Set chart type at once.
-         * If this option is specified, the type will be applied to every data. This setting can be overwritten by data.types.
-         * Available Values: line, spline, step, area, area-spline, area-step, bar, scatter, pie, donut, gauge
-         */
-        type?: string;
-        /**
-         * Set chart type for each data.
-         * This setting overwrites data.type setting.
-         */
-        types?: { [key: string]: string };
-        /**
-         * Show labels on each data points or set formatter function for data labels.
-         * The formatter function receives 4 arguments such as v, id, i, j and it must return a string that will be shown as the label. The arguments are:
-         * - v is the value of the data point where the label is shown.
-         * - id is the id of the data where the label is shown.
-         * - i is the index of the data point where the label is shown.
-         * - j is the sub index of the data point where the label is shown.
-         * Formatter function can be defined for each data by specifying as an object and D3 formatter function can be set (e.g. d3.format('$'))
-         */
-        labels?: boolean |
-        { format: FormatFunction } |
-        { format: { [key: string]: FormatFunction } };
-        /**
-         * Define the order of the data.
-         * This option changes the order of stacking the data and pieces of pie/donut. If null specified, it will be the order the data loaded. If function specified, it will be used to sort the data and it will recieve the data as argument.
-         * Available Values: desc, asc, function (data1, data2) { ... }, null
-         */
-        order?: string | ((...data: string[]) => void);
-        /**
-         * Define regions for each data.
-         * The values must be an array for each data and it should include an object that has start, end, style. If start is not set, the start will be the first data point. If end is not set, the end will be the last data point.
-         * Currently this option supports only line chart and dashed style. If this option specified, the line will be dashed only in the regions.
-         */
-        regions?: { [key: string]: any };
-        /**
-         * Set color converter function.
-         * This option should a function and the specified function receives color (e.g. '#ff0000') and d that has data parameters like id, value, index, etc. And it must return a string that represents color (e.g. '#00ff00').
-         */
-        color?: (color: string, d: any) => string | d3.Rgb;
-        /**
-         * Set color for each data.
-         */
-        colors?: { [key: string]: string | d3.Rgb };
-        /**
-         * Hide each data when the chart appears.
-         * If true specified, all of data will be hidden. If multiple ids specified as an array, those will be hidden.
-         */
-        hide?: boolean | Array<string>;
-        /**
-         * Set text displayed when empty data.
-         */
-        empty?: { label: { text: string } };
-
-        selection?: {
-            enabled?: boolean;
-            grouped?: boolean;
-            multiple?: boolean;
-            draggable?: boolean;
-            isselectable?: (d?: any) => boolean;
-        };
-        /**
-         * Set a callback for click event on each data point.
-         * This callback will be called when each data point clicked and will receive d and element as the arguments.
-         * - d is the data clicked and element is the element clicked. In this callback, this will be the Chart object.
-         */
-        onclick?: (d: any, element: any) => void;
-        /**
-         * Set a callback for mouseover event on each data point.
-         * This callback will be called when mouse cursor moves onto each data point and will receive d as the argument.
-         * - d is the data where mouse cursor moves onto. In this callback, this will be the Chart object.
-         */
-        onmouseover?: (d: any, element?: any) => void;
-        /**
-         * Set a callback for mouseout event on each data point.
-         * This callback will be called when mouse cursor moves out each data point and will receive d as the argument.
-         * - d is the data where mouse cursor moves out. In this callback, this will be the Chart object.
-         */
-        onmouseout?: (d: any, element?: any) => void;
-        // onselected?: any;
-        // onunselected?: any;
-        // ondragstart?: any;
-        // ondragend?: any;
-    }
-
-    interface Axis {
-        /**
-         * Switch x and y axis position.
-         */
-        rotated?: boolean;
-        x?: XAxisConfiguration;
-        y?: YAxisConfiguration;
-        y2?: YAxisConfiguration;
-    }
-
-    interface XAxisConfiguration {
-        /**
-         * Show or hide x axis.
-         */
-        show?: boolean;
-        /**
-         * Set type of x axis (timeseries, category, indexed)
-         */
-        type?: string;
-        /**
-         * Set how to treat the timezone of x values.
-         * If true, treat x value as localtime. If false, convert to UTC internally.
-         */
-        localtime?: boolean;
-        /**
-         * Set category names on category axis.
-         * This must be an array that includes category names in string. If category names are included in the date by data.x option, this is not required.
-         */
-        categories?: Array<string>;
-
-        tick?: XTickConfiguration;
-        /**
-         * Set max value of x axis range.
-         */
-        max?: number;
-        /**
-         * Set min value of x axis range.
-         */
-        min?: number;
-        /**
-         * Set padding for x axis.
-         * If this option is set, the range of x axis will increase/decrease according to the values. If no padding is needed in the ragen of x axis, 0 should be set. On category axis, this option will be ignored.
-         */
-        padding?: {
-            left?: number;
-            right?: number;
-        };
-        /**
-         * Set height of x axis.
-         * The height of x axis can be set manually by this option. If you need more space for x axis, please use this option for that. The unit is pixel.
-         */
-        height?: number;
-        /**
-         * Set default extent for subchart and zoom. This can be an array or function that returns an array.
-         */
-        extent?: Array<number> | (() => Array<number>);
-        /**
-         * Set label on x axis.
-         * You can set x axis label and change its position by this option. string and object can be passed and we can change the poisiton by passing object that has position key. Available position differs according to the axis direction (vertical or horizontal). If string set, the position will be the default.
-         * Valid horizontal positions: inner-right (Default), inner-center, inner-left, outer-right, outer-center, outer-left
-         * Valid vertical positions: inner-top, inner-middle, inner-bottom, outer-top, outer-middle, outer-bottom
-         */
-        label?: string | { text: string; position: string };
-    }
-
-    interface YAxisConfiguration {
-        /**
-         * Show or hide y axis.
-         */
-        show?: boolean;
-        /**
-         * Show y axis inside of the chart.
-         */
-        inner?: boolean;
-        /**
-         * Set max value of y axis.
-         */
-        max?: number;
-        /**
-         * Set min value of y axis.
-         */
-        min?: number;
-        /**
-         * Change the direction of y axis.
-         * If true set, the direction will be from the top to the bottom.
-         */
-        inverted?: boolean;
-        /**
-         * Set center value of y axis.
-         */
-        center?: number;
-        /**
-         * Set label on y axis. This option works in the same way as axis.x.label.
-         * Valid horizontal positions: inner-right (Default), inner-center, inner-left, outer-right, outer-center, outer-left
-         * Valid vertical positions: inner-top, inner-middle, inner-bottom, outer-top, outer-middle, outer-bottom
-         */
-        label?: string | { text: string; position: string };
-        tick?: YTickConfiguration;
-        /**
-         * Set padding for y axis.
-         * You can set padding for y axis to create more space on the edge of the axis. This option accepts object and it can include top and bottom. top, bottom will be treated as pixels.
-         */
-        padding?: {
-            top?: number;
-            bottom?: number;
-        };
-        /**
-         * Set default range of y axis. This option set the default value for y axis when there is no data on init.
-         */
-        default?: Array<number>;
-
-    }
-
-    interface XTickConfiguration {
-        /**
-         * Centerise ticks on category axis
-         */
-        centered?: boolean;
-        /**
-         * A function to format tick value. Format string is also available for timeseries data.
-         */
-        format?: string | ((x: number | Date) => string | number);
-        /**
-        * Setting for culling ticks.
-        * If true is set, the ticks will be culled, then only limitted tick text will be shown. This option does not hide the tick lines. If false is set, all of ticks will be shown.
-        */
-        culling?: boolean | CullingConfiguration;
-        /**
-         * The number of x axis ticks to show.
-         * This option hides tick lines together with tick text. If this option is used on timeseries axis, the ticks position will be determined precisely and not nicely positioned (e.g. it will have rough second value).
-        */
-        count?: number;
-        /**
-         * Fit x axis ticks.
-         * If true set, the ticks will be positioned nicely. If false set, the ticks will be positioned according to x value of the data points.
-         */
-        fit?: boolean;
-        /**
-         * Set the x values of ticks manually.
-         * If this option is provided, the position of the ticks will be determined based on those values. This option works with timeseries data and the x values will be parsed accoding to the type of the value and data.xFormat option.
-         */
-        values?: Array<number> | Array<string>;
-        /**
-         * Rotate x axis tick text. If you set negative value, it will rotate to opposite direction.
-         */
-        rotate?: number;
-        /**
-         * Show x axis outer tick.
-         */
-        outer?: boolean;
-        multiline?: boolean; // Undocumented
-    }
-
-    interface YTickConfiguration {
-        /**
-         * Set formatter for y axis tick text.
-         * This option accepts d3.format object as well as a function you define.
-         */
-        format?: (x: number) => string;
-        /**
-         * Show or hide outer tick.
-         */
-        outer?: boolean;
-        /**
-         * Set the y values of ticks manually.
-         */
-        values?: Array<number>;
-        /**
-         * The number of y axis ticks to show.
-         * The position of the ticks will be calculated precisely, so the values on the ticks will not be rounded nicely. In the case, axis.y.tick.format or axis.y.tick.values will be helpful.
-        */
-        count?: number;
-    }
-
-    interface CullingConfiguration {
-        /**
-        * The number of tick texts will be adjusted to less than this value.
-        */
-        max: number;
-    }
-
-    interface Grid {
-        x?: {
-            /**
-             * Show grids along x axis.
-             */
-            show?: boolean;
-            /**
-             * Show additional grid lines along x axis.
-             * This option accepts array including object that has value, text, position and class. text, position and class are optional. For position, start, middle and end (default) are available.
-             * If x axis is category axis, value can be category name. If x axis is timeseries axis, value can be date string, Date object and unixtime integer.
-             */
-            lines?: Array<LineOptions>;
-        };
-        y?: {
-            /**
-             * Show grids along y axis.
-             */
-            show?: boolean;
-            /**
-             * Show additional grid lines along y axis.
-             * This option accepts array including object that has value, text, position and class.
-             */
-            lines?: Array<LineOptions>;
-        };
-    }
-
-    interface LineOptions {
-        value: number;
-        text?: string;
-        axis?: string;
-        position?: string;
-        class?: string;
-    }
-
-    interface RegionOptions {
-        axis?: string;
-        start?: string | number | Date;
-        end?: string | number | Date;
-        class?: string;
-    }
-
-    interface LegendOptions {
-        /**
-         * Show or hide legend.
-         */
-        show?: boolean;
-        /**
-         * Hide legend
-         * If true given, all legend will be hidden. If string or array given, only the legend that has the id will be hidden.
-         */
-        hide?: boolean | ArrayOrString;
-        /**
-         * Change the position of legend.
-         * Currently bottom, right and inset are supported.
-         */
-        position?: string;
-        /**
-         * Change inset legend attributes.
-         * This option accepts object that has the keys anchor, x, y and step.
-         * anchor decides the position of the legend. These anchors are available: top-left, top-right, bottom-left, bottom-right
-         * x and y set the position of the legend based on the anchor.
-         * step defines the max step the lagend has (e.g. If 2 set and legend has 3 legend item, the legend 2 columns).
-         */
-        inset?: {
-            anchor?: string;
-            x?: number;
-            y?: number;
-            step?: number;
-        };
-
-        item?: {
-            /**
-             * Set click event handler to the legend item.
-             */
-            onclick?: (id: any) => void;
-            /**
-             * Set mouseover event handler to the legend item.
-             */
-            onmoouseover?: (id: any) => void;
-            /**
-             * Set mouseout event handler to the legend item.
-             */
-            onmouseout?: (id: any) => void;
-        };
-    }
-
-    interface TooltipOptions {
-        /**
-         * Show or hide tooltip.
-         */
-        show?: boolean;
-        /**
-         * Set if tooltip is grouped or not for the data points.
-         */
-        grouped?: boolean;
-        format?: {
-            /**
-             * Set format for the title of tooltip. Specified function receives x of the data point to show.
-             */
-            title?: (x: any) => string;
-            /**
-             * Set format for the name of each data in tooltip. Specified function receives name, ratio, id and index of the data point to show. ratio will be undefined if the chart is not donut/pie/gauge.
-             */
-            name?: (name: string, ratio: number, id: string, index: number) => string;
-            /**
-             * Set format for the value of each data in tooltip.
-             * Specified function receives name, ratio, id and index of the data point to show. ratio will be undefined if the chart is not donut/pie/gauge.
-             * If undefined returned, the row of that value will be skipped.
-             */
-            value?: (name: string, ratio: number, id: string, index: number) => string;
-        };
-        /**
-         * Set custom position for the tooltip. This option can be used to modify the tooltip position by returning object that has top and left.
-         */
-        position?: (data: any, width: number, height: number, element: any) => { top: number; left: number };
-        /**
-         * Set custom HTML for the tooltip.
-         * Specified function receives data, defaultTitleFormat, defaultValueFormat and color of the data point to show. If tooltip.grouped is true, data includes multiple data points.
-         */
-        contents?: (data: any, defaultTitleFormat: string, defaultValueFormat: string, color: any) => string;
-    }
-
-    interface SubchartOptions {
-        /**
-         * Show sub chart on the bottom of the chart.
-         */
-        show?: boolean;
-        size?: {
-            /**
-             * Change the height of the subchart.
-             */
-            height: number;
-        };
-        /**
-         * Set callback for brush event.
-         * Specified function receives the current zoomed x domain.
-         */
-        onbrush?: (domain: any) => void;
-    }
-
-    interface ZoomOptions {
-        /**
-         * Enable zooming.
-         */
-        enabled?: boolean;
-        /**
-         * Enable to rescale after zooming. If true set, y domain will be updated according to the zoomed region.
-         */
-        rescale?: boolean;
-        /**
-         * Change zoom extent.
-         */
-        extent?: [number, number];
-        /**
-         * Set callback that is called when the chart is zooming. Specified function receives the zoomed domain.
-         */
-        onzoom?: (domain: any) => void;
-        /**
-         * Set callback that is called when zooming starts. Specified function receives the zoom event.
-         */
-        onzoomstart?: (event: Event) => void;
-        /**
-         * Set callback that is called when zooming ends. Specified function receives the zoomed domain.
-         */
-        onzoomend?: (domain: any) => void;
-    }
-
-    interface PointOptions {
-        /**
-         * Whether to show each point in line.
-         */
-        show?: boolean;
-        /**
-         * The radius size of each point.
-         */
-        r?: number;
-
-        focus?: {
-            expand: {
-                /**
-                 * Whether to expand each point on focus.
-                 */
-                enabled?: boolean;
-                /**
-                 * The radius size of each point on focus.
-                 */
-                r?: number
-            };
-        };
-
-        select?: {
-            /**
-             * The radius size of each point on selected.
-             */
-            r?: number;
-        };
-    }
-
-    interface ChartAPI {
-        /**
-         * This API highlights specified targets and fade out the others.
-         * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be highlighted.
-         */
-        focus(targetIds?: ArrayOrString): void;
-        /**
-         * This API fades out specified targets and reverts the others.
-         * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be faded out.
-         */
-        defocus(targetIds?: ArrayOrString): void;
-        /**
-         * This API reverts specified targets.
-         * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be reverted.
-         */
-        revert(targetIds?: ArrayOrString): void;
-
-        /**
-         * This API shows specified targets.
-         * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be shown.
-         * If withLegend is set true, legend will be shown together with the specified data.
-         */
-        show(targetIds?: ArrayOrString, options?: { withLegend: boolean }): void;
-        /**
-         * This API hides specified targets.
-         * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be hidden.
-         * If withLegend is set true, legend will be hidden together with the specified data.
-         */
-        hide(targetIds?: ArrayOrString, options?: { withLegend: boolean }): void;
-        /**
-         * This API toggles (shows or hides) specified targets.
-         * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be toggles.
-         * If withLegend is set true, legend will be toggled together with the specified data.
-         */
-        toggle(targetIds?: ArrayOrString, options?: { withLegend: boolean }): void;
-        /**
-         * Load data to the chart.
-         * If url, json, rows and columns given, the data will be loaded. If data that has the same target id is given, the chart will be updated. Otherwise, new target will be added.
-         * If classes given, the classes specifed by data.classes will be updated. classes must be Object that has target id as keys.
-         * If categories given, the categories specifed by axis.x.categories or data.x will be updated. categories must be Array.
-         * If axes given, the axes specifed by data.axes will be updated. axes must be Object that has target id as keys.
-         * If colors given, the colors specifed by data.colors will be updated. colors must be Object that has target id as keys.
-         * If type or types given, the type of targets will be updated. type must be String and types must be Object.
-         * If unload given, data will be unloaded before loading new data. If true given, all of data will be unloaded. If target ids given as String or Array, specified targets will be unloaded.
-         * If done given, the specified function will be called after data loded.
-         * NOTE: unload should be used if some data needs to be unloaded simultaneously. If you call unload API soon after/before load instead of unload param, chart will not be rendered properly because of cancel of animation.
-         * NOTE: done will be called after data loaded, but it's not after rendering. It's because rendering will finish after some transition and there is some time lag between loading and rendering.
-         */
-        load(args: {
-            url?: string;
-            json?: Object;
-            keys?: { x?: string; value: Array<string>; }
-            rows?: Array<PrimitiveArray>;
-            columns?: Array<PrimitiveArray>;
-            classes?: { [key: string]: string };
-            categories?: Array<string>;
-            axes?: { [key: string]: string };
-            colors?: { [key: string]: string | d3.Rgb };
-            type?: string;
-            types?: { [key: string]: string };
-            unload?: boolean | ArrayOrString;
-            done?: () => any;
-        }): void;
-        /**
-         * Unload data to the chart.
-         * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be toggles.
-         * If ids given, the data that has specified target id will be unloaded. ids should be String or Array. If ids is not specified, all data will be unloaded.
-         * If done given, the specified function will be called after data loded.
-         * NOTE: If you call load API soon after/before unload, unload param of load should be used. Otherwise chart will not be rendered properly because of cancel of animation.
-         * NOTE: done will be called after data loaded, but it's not after rendering. It's because rendering will finish after some transition and there is some time lag between loading and rendering.
-         */
-        unload(targetIds?: TargetIds, done?: () => any): any;
-        /**
-         * Flow data to the chart. By this API, you can append new data points to the chart.
-         * If json, rows and columns given, the data will be loaded. If data that has the same target id is given, the chart will be appended. Otherwise, new target will be added. One of these is required when calling. If json specified, keys is required as well as data.json
-         * If to is given, the lower x edge will move to that point. If not given, the lower x edge will move by the number of given data points.
-         * If length is given, the lower x edge will move by the number of this argument.
-         * If duration is given, the duration of the transition will be specified value. If not given, transition.duration will be used as default.
-         * If done is given, the specified function will be called when flow ends.
-         */
-        flow(args: {
-            json?: Object;
-            keys?: { x?: string; value: Array<string>; }
-            rows?: Array<PrimitiveArray>;
-            columns?: Array<PrimitiveArray>;
-            to?: any;
-            length?: number;
-            duration?: number;
-            done?: () => any;
-        }): void;
-        /**
-         * Change data point state to selected. By this API, you can select data points. To use this API, data.selection.enabled needs to be set true.
-         * @param ids Specify target ids to be selected. If this argument is not given, all targets will be the candidate.
-         * @param indices Specify indices to be selected. If this argument is not given, all data points will be the candidate.
-         * @param resetOthers If this argument is set true, the data points that are not specified by ids, indices will be unselected.
-         */
-        select(ids?: Array<string>, indices?: Array<number>, resetOthers?: boolean): void;
-        /**
-         * Change data point state to unselected. By this API, you can unselect data points. To use this API, data.selection.enabled needs to be set true.
-         * @param ids Specify target ids to be unselected. If this argument is not given, all targets will be the candidate.
-         * @param indices Specify indices to be unselected. If this argument is not given, all data points will be the candidate.
-         */
-        unselect(ids?: Array<string>, indices?: Array<number>): void;
-        /**
-         * Get selected data points. By this API, you can get selected data points information. To use this API, data.selection.enabled needs to be set true.
-         * @param targetId You can filter the result by giving target id that you want to get. If not given, all of data points will be returned.
-         */
-        selected(targetId?: string): Data;
-        /**
-         * Change the type of the chart.
-         * @param type Specify the type to be transformed. The types listed in data.type can be used.
-         * @param targetIds Specify targets to be transformed. If not given, all targets will be the candidate.
-         */
-        transform(type: string, targetIds?: ArrayOrString): void;
-        /**
-         * Update groups for the targets.
-         * @param groups This argument needs to be an Array that includes one or more Array that includes target ids to be grouped.
-         */
-        groups(groups: Array<Array<string>>): void;
-
-        xgrids: GridOperations;
-
-        ygrids: GridOperations;
-
-        regions: {
-            /**
-             * Update regions.
-             * @param regions Regions will be replaced with this argument. The format of this argument is the same as regions.
-             */
-            (regions: Array<any>): void;
-            /**
-             * Add new region. This API adds new region instead of replacing like regions.
-             * @param grids New region will be added. The format of this argument is the same as regions and it's possible to give an Object if only one region will be added.
-             */
-            add(regions: Array<any> | Object): void;
-            /**
-             * Remove regions. This API removes regions.
-             * @param args This argument should include classes. If classes is given, the regions that have one of the specified classes will be removed. If args is not given, all of regions will be removed.
-             */
-            remove(args?: { value?: number | string; class?: string }): void;
-        };
-
-        data: {
-            /**
-             * Get data loaded in the chart.
-             * @param targetIds If this argument is given, this API returns the specified target data. If this argument is not given, all of data will be returned.
-             */
-            (targetIds?: ArrayOrString): Data;
-            /**
-             * Get data shown in the chart.
-             * @param targetIds If this argument is given, this API filters the data with specified target ids. If this argument is not given, all shown data will be returned.
-             */
-            shown(targetIds?: ArrayOrString): Data;
-            /**
-             * Get values of the data loaded in the chart.
-             * @param targetIds This API returns the values of specified target. If this argument is not given, null will be retruned.
-             */
-            values(targetIds?: ArrayOrString): Array<any>;
-            /**
-             * Get and set names of the data loaded in the chart.
-             * @param names If this argument is given, the names of data will be updated. If not given, the current names will be returned. The format of this argument is the same as data.names.
-             */
-            names(names?: { [key: string]: string }): { [key: string]: string };
-            /**
-             * Get and set colors of the data loaded in the chart.
-             * @param colors If this argument is given, the colors of data will be updated. If not given, the current colors will be returned. The format of this argument is the same as data.colors.
-             */
-            colors(colors?: { [key: string]: string | d3.Rgb }): { [key: string]: string };
-            /**
-             * Get and set axes of the data loaded in the chart.
-             * @param axes If this argument is given, the axes of data will be updated. If not given, the current axes will be returned. The format of this argument is the same as data.axes.
-             */
-            axes(axes?: { [key: string]: string }): { [key: string]: string };
-        };
-
-        /**
-         * Gets and sets the value a category
-         * @param index Index of the category to get or set
-         * @param category: Value of the category to update
-         */
-        category(index: number, category?: string): string;
-
-        /**
-         * Get and set the categories
-         * @param categories: Value of the categories to update
-         */
-        categories(categories?: Array<string>): Array<string>;
-
-        /**
-         * Get the color for the specified targetId
-         */
-        color(targetId: string): string;
-
-        /**
-         * Get and set x values for the chart.
-         * @param x If x is given, x values of every target will be updated. If no argument is given, current x values will be returned as an Object whose keys are the target ids.
-         */
-        x(x?: PrimitiveArray): PrimitiveArray;
-
-        /**
-         * Get and set x values for the chart.
-         * @param x If x is given, x values of every target will be updated. If no argument is given, current x values will be returned as an Object whose keys are the target ids.
-         */
-        xs(xs?: { [key: string]: PrimitiveArray }): { [key: string]: PrimitiveArray };
-
-        axis: {
-            /**
-             * Get and set axis labels.
-             * @param labels If labels is given, specified axis' label will be updated.
-             */
-            labels(labels?: { [key: string]: string }): { [key: string]: string }
-            /**
-             * Get and set axis min value.
-             * @param min If min is given, specified axis' min value will be updated. If no argument is given, the current min values for each axis will be returned.
-             */
-            min(min?: number | { [key: string]: number }): number | { [key: string]: number }
-            /**
-             * Get and set axis max value.
-             * @param max If max is given, specified axis' max value will be updated. If no argument is given, the current max values for each axis will be returned.
-             */
-            max(max?: number | { [key: string]: number }): number | { [key: string]: number }
-            /**
-             * Get and set axis min and max value.
-             * @param range If range is given, specified axis' min and max value will be updated. If no argument is given, the current min and max values for each axis will be returned.
-             */
-            range(range?: { min?: number | { [key: string]: number }; max?: number | { [key: string]: number } }): { min: number | { [key: string]: number }; max: number | { [key: string]: number } }
-        };
-
-        legend: {
-            /**
-             * Show legend for each target.
-             * @param targetIds If targetIds is given, specified target's legend will be shown. If only one target is the candidate, String can be passed. If no argument is given, all of target's legend will be shown.
-             */
-            show(targetIds?: ArrayOrString): void;
-            /**
-             * Hide legend for each target.
-             * @param targetIds If targetIds is given, specified target's legend will be hidden. If only one target is the candidate, String can be passed. If no argument is given, all of target's legend will be hidden.
-             */
-            hide(targetIds?: ArrayOrString): void;
-        };
-
-        zoom: {
-            /**
-             * Zoom by giving x domain.
-             * @param domain If domain is given, the chart will be zoomed to the given domain. If no argument is given, the current zoomed domain will be returned.
-             */
-            (domain?: Array<number>): Array<number>;
-
-            /**
-             * Enable and disable zooming.
-             * @param enabled If enabled is true, the feature of zooming will be enabled. If false is given, it will be disabled.
-             */
-            enable(enabled: boolean): void;
-        };
-
-        /**
-         * Unzoom to the original domain.
-         */
-        unzoom(): void;
-
-        /**
-         * Resize the chart. If no size is specified it will resize to fit.
-         * @param size This argument should include width and height in pixels.
-         */
-        resize(size?: { width?: number; height?: number }): void;
-
-        /**
-         * Force to redraw.
-         */
-        flush(): void;
-
-        /**
-         * Reset the chart object and remove element and events completely.
-         */
-        destroy(): void;
-    }
-
-    interface GridOperations {
-        /**
-         * Update the x/y grid lines.
-         * @param grids X/Y grid lines will be replaced with this argument. The format of this argument is the same as grid.x.lines or grid.y.lines.
-         */
-        (grids: Array<any>): void;
-        /**
-         * Add x/y grid lines. This API adds new x/y grid lines instead of replacing like xgrids.
-         * @param grids New x/y grid lines will be added. The format of this argument is the same as grid.x.lines or grid.y.lines and it's possible to give an Object if only one line will be added.
-         */
-        add(grids: Array<any> | Object): void;
-        /**
-         * Remove x/y grid lines. This API removes x/y grid lines.
-         * @param args This argument should include value or class. If value is given, the x/y grid lines that have specified x/y value will be removed. If class is given, the x/y grid lines that have specified class will be removed. If args is not given, all of x/y grid lines will be removed.
-         */
-        remove(args?: { class?: string; value?: number | string }): void;
-    }
-
-    export function generate(config: ChartConfiguration): ChartAPI;
-}
-
-declare module "c3" {
-    export = c3;
-}
diff --git a/c3/index.d.ts b/c3/index.d.ts
new file mode 100644
index 0000000000..e4616627f1
--- /dev/null
+++ b/c3/index.d.ts
@@ -0,0 +1,1069 @@
+// Type definitions for C3js
+// Project: http://c3js.org/
+// Definitions by: Marc Climent <https://github.com/mcliment>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="d3"/>
+
+declare namespace c3 {
+
+    type PrimitiveArray = Array<string | boolean | number>;
+    type FormatFunction = (v: any, id: string, i: number, j: number) => void;
+
+    interface TargetIds {
+        ids: ArrayOrString;
+    }
+
+    type ArrayOrString = Array<string> | string;
+
+    interface ChartConfiguration {
+        /**
+         * The CSS selector or the element which the chart will be set to. D3 selection object can be specified. If other chart is set already, it will be replaced with the new one (only one chart can be set in one element).
+         * If this option is not specified, the chart will be generated but not be set. Instead, we can access the element by chart.element and set it by ourselves.
+         * Note: When chart is not binded, c3 starts observing if chart.element is binded by MutationObserver. In this case, polyfill is required in IE9 and IE10 becuase they do not support MutationObserver. On the other hand, if chart always will be binded, polyfill will not be required because MutationObserver will never be called.
+         */
+        bindto?: string | HTMLElement | d3.Selection<any>;
+        size?: {
+            /**
+             * The desired width of the chart element.
+             * If this option is not specified, the width of the chart will be calculated by the size of the parent element it's appended to.
+             * Note: This option should be specified if possible because it can improve its performance because some size calculations will be skipped by an explicit value.
+             */
+            width?: number;
+            /**
+             * The desired height of the chart element.
+             * If this option is not specified, the height of the chart will be calculated by the size of the parent element it's appended to.
+             */
+            height?: number;
+        };
+
+        padding?: {
+            /**
+             * The padding on the top of the chart.
+             */
+            top?: number;
+            /**
+             * The padding on the right of the chart.
+             */
+            right?: number;
+            /**
+             * The padding on the bottom of the chart.
+             */
+            bottom?: number;
+            /**
+             * The padding on the left of the chart.
+             */
+            left?: number;
+        };
+
+        color?: {
+            /**
+             * Set custom color pattern.
+             */
+            pattern?: Array<string>;
+            threshold?: any; // Undocumented
+        };
+
+        interaction?: {
+            /**
+             * Indicate if the chart should have interactions.
+             * If false is set, all of interactions (showing/hiding tooltip, selection, mouse events, etc) will be disabled.
+             */
+            enabled?: boolean;
+        };
+
+        transition?: {
+            /**
+             * Set duration of transition (in milliseconds) for chart animation.
+             * Note: If 0 or null set, transition will be skipped. So, this makes initial rendering faster especially in case you have a lot of data.
+             */
+            duration?: number;
+        };
+
+        /**
+         * Set a callback to execute when the chart is initialized.
+         */
+        oninit?: () => void;
+
+        /**
+         * Set a callback which is executed when the chart is rendered. Basically, this callback will be called in each time when the chart is redrawed.
+         */
+        onrendered?: () => void;
+
+        /**
+         * Set a callback to execute when mouse enters the chart.
+         */
+        onmouseover?: () => void;
+
+        /**
+         * Set a callback to execute when mouse leaves the chart.
+         */
+        onmouseout?: () => void;
+
+        /**
+         * Set a callback to execute when user resizes the screen.
+         */
+        onresize?: () => void;
+
+        /**
+         * Set a callback to execute when screen resize finished.
+         */
+        onresized?: () => void;
+
+        data: Data;
+
+        axis?: Axis;
+
+        grid?: Grid;
+
+        /**
+         * Show rectangles inside the chart.
+         * This option accepts array including object that has axis, start, end and class. The keys start, end and class are optional.
+         * axis must be x, y or y2. start and end should be the value where regions start and end. If not specified, the edge values will be used. If timeseries x axis, date string, Date object and unixtime integer can be used. If class is set, the region element will have it as class.
+         */
+        regions?: Array<RegionOptions>;
+
+        legend?: LegendOptions;
+
+        tooltip?: TooltipOptions;
+
+        subchart?: SubchartOptions;
+
+        zoom?: ZoomOptions;
+
+        point?: PointOptions;
+
+        line?: {
+            /**
+             * Set if null data point will be connected or not.
+             * If true set, the region of null data will be connected without any data point. If false set, the region of null data will not be connected and get empty.
+             */
+            connectNull?: boolean;
+            /**
+             * Change step type for step chart. 'step', 'step-before' and 'step-after' can be used.
+             */
+            step_type?: string;
+        };
+
+        area?: {
+            /**
+             * Set if min or max value will be 0 on area chart.
+             */
+            zerobased?: boolean;
+        };
+
+        bar?: {
+            /**
+             * Change the width of bar chart. If ratio is specified, change the width of bar chart by ratio.
+             */
+            width?: number | { ratio: number };
+            /**
+             * Set if min or max value will be 0 on bar chart.
+             */
+            zerobased?: boolean;
+        };
+
+        pie?: {
+            label?: {
+                /**
+                 * Show or hide label on each pie piece.
+                 */
+                show?: boolean;
+                /**
+                 * Set formatter for the label on each pie piece.
+                 */
+                format?: (value: number, ratio: number, id: string) => string;
+                /**
+                 * Set threshold to show/hide labels.
+                 */
+                threshold?: number
+            };
+            /**
+             * Enable or disable expanding pie pieces.
+             */
+            expand?: boolean;
+        };
+
+        donut?: {
+            label?: {
+                /**
+                 * Show or hide label on each donut piece.
+                 */
+                show?: boolean;
+                /**
+                 * Set formatter for the label on each donut piece.
+                 */
+                format?: (value: number, ratio: number, id: string) => string;
+                /**
+                 * Set threshold to show/hide labels.
+                 */
+                threshold?: number
+            };
+            /**
+             * Enable or disable expanding pie pieces.
+             */
+            expand?: boolean;
+            /**
+             * Set width of donut chart.
+             */
+            width?: number;
+            /**
+             * Set title of donut chart.
+             */
+            title?: string;
+        };
+
+        gauge?: {
+            label?: {
+                /**
+                 * Show or hide label on gauge.
+                 */
+                show?: boolean;
+                /**
+                 * Set formatter for the label on gauge.
+                 */
+                format?: (value: any, ratio: number) => string;
+            };
+            /**
+             * Enable or disable expanding gauge.
+             */
+            expand?: boolean;
+            /**
+             * Set min value of the gauge.
+             */
+            min?: number;
+            /**
+             * Set max value of the gauge.
+             */
+            max?: number;
+            /**
+             * Set units of the gauge.
+             */
+            units?: string;
+            /**
+             * Set width of gauge chart.
+             */
+            width?: number;
+        };
+    }
+
+    interface Data {
+        /**
+         * Load a CSV or JSON file from a URL. Note that this will not work if loading via the "file://" protocol as most browsers with block XMLHTTPRequests.
+         */
+        url?: string;
+        /**
+         * Parse a JSON object for data.
+         */
+        json?: Object;
+        /**
+         * Load data from a multidimensional array, with the first element containing the data names, the following containing related data in that order.
+         */
+        rows?: Array<PrimitiveArray>;
+        /*
+         * Load data from a multidimensional array, with each element containing an array consisting of a datum name and associated data values.
+         */
+        columns?: Array<PrimitiveArray>;
+        /**
+         * Used if loading JSON via data.url
+         */
+        mimeType?: string;
+        /**
+         * Choose which JSON object keys correspond to desired data.
+         */
+        keys?: { x?: string; value: Array<string>; };
+        /**
+         * Specify the key of x values in the data.
+         * We can show the data with non-index x values by this option. This option is required when the type of x axis is timeseries. If this option is set on category axis, the values of the data on the key will be used for category names.
+         */
+        x?: string;
+        /**
+         * Specify the keys of the x values for each data.
+         * This option can be used if we want to show the data that has different x values.
+         */
+        xs?: { [key: string]: string };
+        /**
+         * Set a format to parse string specifed as x.
+         * Default is %Y-%m-%d
+         */
+        xFormat?: string;
+        //xLocaltime?: any;
+        //xSort?: any;
+        /**
+         * Set custom data name.
+         */
+        names?: { [key: string]: string };
+        /**
+         * Set custom data class.
+         * If this option is specified, the element g for the data has an additional class that has the prefix c3-target- (e.g. c3-target-additional-data1-class).
+         */
+        classes?: { [key: string]: string };
+        /**
+         * Set groups for the data for stacking.
+         */
+        groups?: Array<Array<string>>;
+        /**
+         * Set y axis the data related to. y and y2 can be used.
+         */
+        axes?: { [key: string]: string };
+        /**
+         * Set chart type at once.
+         * If this option is specified, the type will be applied to every data. This setting can be overwritten by data.types.
+         * Available Values: line, spline, step, area, area-spline, area-step, bar, scatter, pie, donut, gauge
+         */
+        type?: string;
+        /**
+         * Set chart type for each data.
+         * This setting overwrites data.type setting.
+         */
+        types?: { [key: string]: string };
+        /**
+         * Show labels on each data points or set formatter function for data labels.
+         * The formatter function receives 4 arguments such as v, id, i, j and it must return a string that will be shown as the label. The arguments are:
+         * - v is the value of the data point where the label is shown.
+         * - id is the id of the data where the label is shown.
+         * - i is the index of the data point where the label is shown.
+         * - j is the sub index of the data point where the label is shown.
+         * Formatter function can be defined for each data by specifying as an object and D3 formatter function can be set (e.g. d3.format('$'))
+         */
+        labels?: boolean |
+        { format: FormatFunction } |
+        { format: { [key: string]: FormatFunction } };
+        /**
+         * Define the order of the data.
+         * This option changes the order of stacking the data and pieces of pie/donut. If null specified, it will be the order the data loaded. If function specified, it will be used to sort the data and it will recieve the data as argument.
+         * Available Values: desc, asc, function (data1, data2) { ... }, null
+         */
+        order?: string | ((...data: string[]) => void);
+        /**
+         * Define regions for each data.
+         * The values must be an array for each data and it should include an object that has start, end, style. If start is not set, the start will be the first data point. If end is not set, the end will be the last data point.
+         * Currently this option supports only line chart and dashed style. If this option specified, the line will be dashed only in the regions.
+         */
+        regions?: { [key: string]: any };
+        /**
+         * Set color converter function.
+         * This option should a function and the specified function receives color (e.g. '#ff0000') and d that has data parameters like id, value, index, etc. And it must return a string that represents color (e.g. '#00ff00').
+         */
+        color?: (color: string, d: any) => string | d3.Rgb;
+        /**
+         * Set color for each data.
+         */
+        colors?: { [key: string]: string | d3.Rgb };
+        /**
+         * Hide each data when the chart appears.
+         * If true specified, all of data will be hidden. If multiple ids specified as an array, those will be hidden.
+         */
+        hide?: boolean | Array<string>;
+        /**
+         * Set text displayed when empty data.
+         */
+        empty?: { label: { text: string } };
+
+        selection?: {
+            enabled?: boolean;
+            grouped?: boolean;
+            multiple?: boolean;
+            draggable?: boolean;
+            isselectable?: (d?: any) => boolean;
+        };
+        /**
+         * Set a callback for click event on each data point.
+         * This callback will be called when each data point clicked and will receive d and element as the arguments.
+         * - d is the data clicked and element is the element clicked. In this callback, this will be the Chart object.
+         */
+        onclick?: (d: any, element: any) => void;
+        /**
+         * Set a callback for mouseover event on each data point.
+         * This callback will be called when mouse cursor moves onto each data point and will receive d as the argument.
+         * - d is the data where mouse cursor moves onto. In this callback, this will be the Chart object.
+         */
+        onmouseover?: (d: any, element?: any) => void;
+        /**
+         * Set a callback for mouseout event on each data point.
+         * This callback will be called when mouse cursor moves out each data point and will receive d as the argument.
+         * - d is the data where mouse cursor moves out. In this callback, this will be the Chart object.
+         */
+        onmouseout?: (d: any, element?: any) => void;
+        // onselected?: any;
+        // onunselected?: any;
+        // ondragstart?: any;
+        // ondragend?: any;
+    }
+
+    interface Axis {
+        /**
+         * Switch x and y axis position.
+         */
+        rotated?: boolean;
+        x?: XAxisConfiguration;
+        y?: YAxisConfiguration;
+        y2?: YAxisConfiguration;
+    }
+
+    interface XAxisConfiguration {
+        /**
+         * Show or hide x axis.
+         */
+        show?: boolean;
+        /**
+         * Set type of x axis (timeseries, category, indexed)
+         */
+        type?: string;
+        /**
+         * Set how to treat the timezone of x values.
+         * If true, treat x value as localtime. If false, convert to UTC internally.
+         */
+        localtime?: boolean;
+        /**
+         * Set category names on category axis.
+         * This must be an array that includes category names in string. If category names are included in the date by data.x option, this is not required.
+         */
+        categories?: Array<string>;
+
+        tick?: XTickConfiguration;
+        /**
+         * Set max value of x axis range.
+         */
+        max?: number;
+        /**
+         * Set min value of x axis range.
+         */
+        min?: number;
+        /**
+         * Set padding for x axis.
+         * If this option is set, the range of x axis will increase/decrease according to the values. If no padding is needed in the ragen of x axis, 0 should be set. On category axis, this option will be ignored.
+         */
+        padding?: {
+            left?: number;
+            right?: number;
+        };
+        /**
+         * Set height of x axis.
+         * The height of x axis can be set manually by this option. If you need more space for x axis, please use this option for that. The unit is pixel.
+         */
+        height?: number;
+        /**
+         * Set default extent for subchart and zoom. This can be an array or function that returns an array.
+         */
+        extent?: Array<number> | (() => Array<number>);
+        /**
+         * Set label on x axis.
+         * You can set x axis label and change its position by this option. string and object can be passed and we can change the poisiton by passing object that has position key. Available position differs according to the axis direction (vertical or horizontal). If string set, the position will be the default.
+         * Valid horizontal positions: inner-right (Default), inner-center, inner-left, outer-right, outer-center, outer-left
+         * Valid vertical positions: inner-top, inner-middle, inner-bottom, outer-top, outer-middle, outer-bottom
+         */
+        label?: string | { text: string; position: string };
+    }
+
+    interface YAxisConfiguration {
+        /**
+         * Show or hide y axis.
+         */
+        show?: boolean;
+        /**
+         * Show y axis inside of the chart.
+         */
+        inner?: boolean;
+        /**
+         * Set max value of y axis.
+         */
+        max?: number;
+        /**
+         * Set min value of y axis.
+         */
+        min?: number;
+        /**
+         * Change the direction of y axis.
+         * If true set, the direction will be from the top to the bottom.
+         */
+        inverted?: boolean;
+        /**
+         * Set center value of y axis.
+         */
+        center?: number;
+        /**
+         * Set label on y axis. This option works in the same way as axis.x.label.
+         * Valid horizontal positions: inner-right (Default), inner-center, inner-left, outer-right, outer-center, outer-left
+         * Valid vertical positions: inner-top, inner-middle, inner-bottom, outer-top, outer-middle, outer-bottom
+         */
+        label?: string | { text: string; position: string };
+        tick?: YTickConfiguration;
+        /**
+         * Set padding for y axis.
+         * You can set padding for y axis to create more space on the edge of the axis. This option accepts object and it can include top and bottom. top, bottom will be treated as pixels.
+         */
+        padding?: {
+            top?: number;
+            bottom?: number;
+        };
+        /**
+         * Set default range of y axis. This option set the default value for y axis when there is no data on init.
+         */
+        default?: Array<number>;
+
+    }
+
+    interface XTickConfiguration {
+        /**
+         * Centerise ticks on category axis
+         */
+        centered?: boolean;
+        /**
+         * A function to format tick value. Format string is also available for timeseries data.
+         */
+        format?: string | ((x: number | Date) => string | number);
+        /**
+        * Setting for culling ticks.
+        * If true is set, the ticks will be culled, then only limitted tick text will be shown. This option does not hide the tick lines. If false is set, all of ticks will be shown.
+        */
+        culling?: boolean | CullingConfiguration;
+        /**
+         * The number of x axis ticks to show.
+         * This option hides tick lines together with tick text. If this option is used on timeseries axis, the ticks position will be determined precisely and not nicely positioned (e.g. it will have rough second value).
+        */
+        count?: number;
+        /**
+         * Fit x axis ticks.
+         * If true set, the ticks will be positioned nicely. If false set, the ticks will be positioned according to x value of the data points.
+         */
+        fit?: boolean;
+        /**
+         * Set the x values of ticks manually.
+         * If this option is provided, the position of the ticks will be determined based on those values. This option works with timeseries data and the x values will be parsed accoding to the type of the value and data.xFormat option.
+         */
+        values?: Array<number> | Array<string>;
+        /**
+         * Rotate x axis tick text. If you set negative value, it will rotate to opposite direction.
+         */
+        rotate?: number;
+        /**
+         * Show x axis outer tick.
+         */
+        outer?: boolean;
+        multiline?: boolean; // Undocumented
+    }
+
+    interface YTickConfiguration {
+        /**
+         * Set formatter for y axis tick text.
+         * This option accepts d3.format object as well as a function you define.
+         */
+        format?: (x: number) => string;
+        /**
+         * Show or hide outer tick.
+         */
+        outer?: boolean;
+        /**
+         * Set the y values of ticks manually.
+         */
+        values?: Array<number>;
+        /**
+         * The number of y axis ticks to show.
+         * The position of the ticks will be calculated precisely, so the values on the ticks will not be rounded nicely. In the case, axis.y.tick.format or axis.y.tick.values will be helpful.
+        */
+        count?: number;
+    }
+
+    interface CullingConfiguration {
+        /**
+        * The number of tick texts will be adjusted to less than this value.
+        */
+        max: number;
+    }
+
+    interface Grid {
+        x?: {
+            /**
+             * Show grids along x axis.
+             */
+            show?: boolean;
+            /**
+             * Show additional grid lines along x axis.
+             * This option accepts array including object that has value, text, position and class. text, position and class are optional. For position, start, middle and end (default) are available.
+             * If x axis is category axis, value can be category name. If x axis is timeseries axis, value can be date string, Date object and unixtime integer.
+             */
+            lines?: Array<LineOptions>;
+        };
+        y?: {
+            /**
+             * Show grids along y axis.
+             */
+            show?: boolean;
+            /**
+             * Show additional grid lines along y axis.
+             * This option accepts array including object that has value, text, position and class.
+             */
+            lines?: Array<LineOptions>;
+        };
+    }
+
+    interface LineOptions {
+        value: number;
+        text?: string;
+        axis?: string;
+        position?: string;
+        class?: string;
+    }
+
+    interface RegionOptions {
+        axis?: string;
+        start?: string | number | Date;
+        end?: string | number | Date;
+        class?: string;
+    }
+
+    interface LegendOptions {
+        /**
+         * Show or hide legend.
+         */
+        show?: boolean;
+        /**
+         * Hide legend
+         * If true given, all legend will be hidden. If string or array given, only the legend that has the id will be hidden.
+         */
+        hide?: boolean | ArrayOrString;
+        /**
+         * Change the position of legend.
+         * Currently bottom, right and inset are supported.
+         */
+        position?: string;
+        /**
+         * Change inset legend attributes.
+         * This option accepts object that has the keys anchor, x, y and step.
+         * anchor decides the position of the legend. These anchors are available: top-left, top-right, bottom-left, bottom-right
+         * x and y set the position of the legend based on the anchor.
+         * step defines the max step the lagend has (e.g. If 2 set and legend has 3 legend item, the legend 2 columns).
+         */
+        inset?: {
+            anchor?: string;
+            x?: number;
+            y?: number;
+            step?: number;
+        };
+
+        item?: {
+            /**
+             * Set click event handler to the legend item.
+             */
+            onclick?: (id: any) => void;
+            /**
+             * Set mouseover event handler to the legend item.
+             */
+            onmoouseover?: (id: any) => void;
+            /**
+             * Set mouseout event handler to the legend item.
+             */
+            onmouseout?: (id: any) => void;
+        };
+    }
+
+    interface TooltipOptions {
+        /**
+         * Show or hide tooltip.
+         */
+        show?: boolean;
+        /**
+         * Set if tooltip is grouped or not for the data points.
+         */
+        grouped?: boolean;
+        format?: {
+            /**
+             * Set format for the title of tooltip. Specified function receives x of the data point to show.
+             */
+            title?: (x: any) => string;
+            /**
+             * Set format for the name of each data in tooltip. Specified function receives name, ratio, id and index of the data point to show. ratio will be undefined if the chart is not donut/pie/gauge.
+             */
+            name?: (name: string, ratio: number, id: string, index: number) => string;
+            /**
+             * Set format for the value of each data in tooltip.
+             * Specified function receives name, ratio, id and index of the data point to show. ratio will be undefined if the chart is not donut/pie/gauge.
+             * If undefined returned, the row of that value will be skipped.
+             */
+            value?: (name: string, ratio: number, id: string, index: number) => string;
+        };
+        /**
+         * Set custom position for the tooltip. This option can be used to modify the tooltip position by returning object that has top and left.
+         */
+        position?: (data: any, width: number, height: number, element: any) => { top: number; left: number };
+        /**
+         * Set custom HTML for the tooltip.
+         * Specified function receives data, defaultTitleFormat, defaultValueFormat and color of the data point to show. If tooltip.grouped is true, data includes multiple data points.
+         */
+        contents?: (data: any, defaultTitleFormat: string, defaultValueFormat: string, color: any) => string;
+    }
+
+    interface SubchartOptions {
+        /**
+         * Show sub chart on the bottom of the chart.
+         */
+        show?: boolean;
+        size?: {
+            /**
+             * Change the height of the subchart.
+             */
+            height: number;
+        };
+        /**
+         * Set callback for brush event.
+         * Specified function receives the current zoomed x domain.
+         */
+        onbrush?: (domain: any) => void;
+    }
+
+    interface ZoomOptions {
+        /**
+         * Enable zooming.
+         */
+        enabled?: boolean;
+        /**
+         * Enable to rescale after zooming. If true set, y domain will be updated according to the zoomed region.
+         */
+        rescale?: boolean;
+        /**
+         * Change zoom extent.
+         */
+        extent?: [number, number];
+        /**
+         * Set callback that is called when the chart is zooming. Specified function receives the zoomed domain.
+         */
+        onzoom?: (domain: any) => void;
+        /**
+         * Set callback that is called when zooming starts. Specified function receives the zoom event.
+         */
+        onzoomstart?: (event: Event) => void;
+        /**
+         * Set callback that is called when zooming ends. Specified function receives the zoomed domain.
+         */
+        onzoomend?: (domain: any) => void;
+    }
+
+    interface PointOptions {
+        /**
+         * Whether to show each point in line.
+         */
+        show?: boolean;
+        /**
+         * The radius size of each point.
+         */
+        r?: number;
+
+        focus?: {
+            expand: {
+                /**
+                 * Whether to expand each point on focus.
+                 */
+                enabled?: boolean;
+                /**
+                 * The radius size of each point on focus.
+                 */
+                r?: number
+            };
+        };
+
+        select?: {
+            /**
+             * The radius size of each point on selected.
+             */
+            r?: number;
+        };
+    }
+
+    interface ChartAPI {
+        /**
+         * This API highlights specified targets and fade out the others.
+         * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be highlighted.
+         */
+        focus(targetIds?: ArrayOrString): void;
+        /**
+         * This API fades out specified targets and reverts the others.
+         * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be faded out.
+         */
+        defocus(targetIds?: ArrayOrString): void;
+        /**
+         * This API reverts specified targets.
+         * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be reverted.
+         */
+        revert(targetIds?: ArrayOrString): void;
+
+        /**
+         * This API shows specified targets.
+         * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be shown.
+         * If withLegend is set true, legend will be shown together with the specified data.
+         */
+        show(targetIds?: ArrayOrString, options?: { withLegend: boolean }): void;
+        /**
+         * This API hides specified targets.
+         * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be hidden.
+         * If withLegend is set true, legend will be hidden together with the specified data.
+         */
+        hide(targetIds?: ArrayOrString, options?: { withLegend: boolean }): void;
+        /**
+         * This API toggles (shows or hides) specified targets.
+         * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be toggles.
+         * If withLegend is set true, legend will be toggled together with the specified data.
+         */
+        toggle(targetIds?: ArrayOrString, options?: { withLegend: boolean }): void;
+        /**
+         * Load data to the chart.
+         * If url, json, rows and columns given, the data will be loaded. If data that has the same target id is given, the chart will be updated. Otherwise, new target will be added.
+         * If classes given, the classes specifed by data.classes will be updated. classes must be Object that has target id as keys.
+         * If categories given, the categories specifed by axis.x.categories or data.x will be updated. categories must be Array.
+         * If axes given, the axes specifed by data.axes will be updated. axes must be Object that has target id as keys.
+         * If colors given, the colors specifed by data.colors will be updated. colors must be Object that has target id as keys.
+         * If type or types given, the type of targets will be updated. type must be String and types must be Object.
+         * If unload given, data will be unloaded before loading new data. If true given, all of data will be unloaded. If target ids given as String or Array, specified targets will be unloaded.
+         * If done given, the specified function will be called after data loded.
+         * NOTE: unload should be used if some data needs to be unloaded simultaneously. If you call unload API soon after/before load instead of unload param, chart will not be rendered properly because of cancel of animation.
+         * NOTE: done will be called after data loaded, but it's not after rendering. It's because rendering will finish after some transition and there is some time lag between loading and rendering.
+         */
+        load(args: {
+            url?: string;
+            json?: Object;
+            keys?: { x?: string; value: Array<string>; }
+            rows?: Array<PrimitiveArray>;
+            columns?: Array<PrimitiveArray>;
+            classes?: { [key: string]: string };
+            categories?: Array<string>;
+            axes?: { [key: string]: string };
+            colors?: { [key: string]: string | d3.Rgb };
+            type?: string;
+            types?: { [key: string]: string };
+            unload?: boolean | ArrayOrString;
+            done?: () => any;
+        }): void;
+        /**
+         * Unload data to the chart.
+         * You can specify multiple targets by giving an array that includes id as String. If no argument is given, all of targets will be toggles.
+         * If ids given, the data that has specified target id will be unloaded. ids should be String or Array. If ids is not specified, all data will be unloaded.
+         * If done given, the specified function will be called after data loded.
+         * NOTE: If you call load API soon after/before unload, unload param of load should be used. Otherwise chart will not be rendered properly because of cancel of animation.
+         * NOTE: done will be called after data loaded, but it's not after rendering. It's because rendering will finish after some transition and there is some time lag between loading and rendering.
+         */
+        unload(targetIds?: TargetIds, done?: () => any): any;
+        /**
+         * Flow data to the chart. By this API, you can append new data points to the chart.
+         * If json, rows and columns given, the data will be loaded. If data that has the same target id is given, the chart will be appended. Otherwise, new target will be added. One of these is required when calling. If json specified, keys is required as well as data.json
+         * If to is given, the lower x edge will move to that point. If not given, the lower x edge will move by the number of given data points.
+         * If length is given, the lower x edge will move by the number of this argument.
+         * If duration is given, the duration of the transition will be specified value. If not given, transition.duration will be used as default.
+         * If done is given, the specified function will be called when flow ends.
+         */
+        flow(args: {
+            json?: Object;
+            keys?: { x?: string; value: Array<string>; }
+            rows?: Array<PrimitiveArray>;
+            columns?: Array<PrimitiveArray>;
+            to?: any;
+            length?: number;
+            duration?: number;
+            done?: () => any;
+        }): void;
+        /**
+         * Change data point state to selected. By this API, you can select data points. To use this API, data.selection.enabled needs to be set true.
+         * @param ids Specify target ids to be selected. If this argument is not given, all targets will be the candidate.
+         * @param indices Specify indices to be selected. If this argument is not given, all data points will be the candidate.
+         * @param resetOthers If this argument is set true, the data points that are not specified by ids, indices will be unselected.
+         */
+        select(ids?: Array<string>, indices?: Array<number>, resetOthers?: boolean): void;
+        /**
+         * Change data point state to unselected. By this API, you can unselect data points. To use this API, data.selection.enabled needs to be set true.
+         * @param ids Specify target ids to be unselected. If this argument is not given, all targets will be the candidate.
+         * @param indices Specify indices to be unselected. If this argument is not given, all data points will be the candidate.
+         */
+        unselect(ids?: Array<string>, indices?: Array<number>): void;
+        /**
+         * Get selected data points. By this API, you can get selected data points information. To use this API, data.selection.enabled needs to be set true.
+         * @param targetId You can filter the result by giving target id that you want to get. If not given, all of data points will be returned.
+         */
+        selected(targetId?: string): Data;
+        /**
+         * Change the type of the chart.
+         * @param type Specify the type to be transformed. The types listed in data.type can be used.
+         * @param targetIds Specify targets to be transformed. If not given, all targets will be the candidate.
+         */
+        transform(type: string, targetIds?: ArrayOrString): void;
+        /**
+         * Update groups for the targets.
+         * @param groups This argument needs to be an Array that includes one or more Array that includes target ids to be grouped.
+         */
+        groups(groups: Array<Array<string>>): void;
+
+        xgrids: GridOperations;
+
+        ygrids: GridOperations;
+
+        regions: {
+            /**
+             * Update regions.
+             * @param regions Regions will be replaced with this argument. The format of this argument is the same as regions.
+             */
+            (regions: Array<any>): void;
+            /**
+             * Add new region. This API adds new region instead of replacing like regions.
+             * @param grids New region will be added. The format of this argument is the same as regions and it's possible to give an Object if only one region will be added.
+             */
+            add(regions: Array<any> | Object): void;
+            /**
+             * Remove regions. This API removes regions.
+             * @param args This argument should include classes. If classes is given, the regions that have one of the specified classes will be removed. If args is not given, all of regions will be removed.
+             */
+            remove(args?: { value?: number | string; class?: string }): void;
+        };
+
+        data: {
+            /**
+             * Get data loaded in the chart.
+             * @param targetIds If this argument is given, this API returns the specified target data. If this argument is not given, all of data will be returned.
+             */
+            (targetIds?: ArrayOrString): Data;
+            /**
+             * Get data shown in the chart.
+             * @param targetIds If this argument is given, this API filters the data with specified target ids. If this argument is not given, all shown data will be returned.
+             */
+            shown(targetIds?: ArrayOrString): Data;
+            /**
+             * Get values of the data loaded in the chart.
+             * @param targetIds This API returns the values of specified target. If this argument is not given, null will be retruned.
+             */
+            values(targetIds?: ArrayOrString): Array<any>;
+            /**
+             * Get and set names of the data loaded in the chart.
+             * @param names If this argument is given, the names of data will be updated. If not given, the current names will be returned. The format of this argument is the same as data.names.
+             */
+            names(names?: { [key: string]: string }): { [key: string]: string };
+            /**
+             * Get and set colors of the data loaded in the chart.
+             * @param colors If this argument is given, the colors of data will be updated. If not given, the current colors will be returned. The format of this argument is the same as data.colors.
+             */
+            colors(colors?: { [key: string]: string | d3.Rgb }): { [key: string]: string };
+            /**
+             * Get and set axes of the data loaded in the chart.
+             * @param axes If this argument is given, the axes of data will be updated. If not given, the current axes will be returned. The format of this argument is the same as data.axes.
+             */
+            axes(axes?: { [key: string]: string }): { [key: string]: string };
+        };
+
+        /**
+         * Gets and sets the value a category
+         * @param index Index of the category to get or set
+         * @param category: Value of the category to update
+         */
+        category(index: number, category?: string): string;
+
+        /**
+         * Get and set the categories
+         * @param categories: Value of the categories to update
+         */
+        categories(categories?: Array<string>): Array<string>;
+
+        /**
+         * Get the color for the specified targetId
+         */
+        color(targetId: string): string;
+
+        /**
+         * Get and set x values for the chart.
+         * @param x If x is given, x values of every target will be updated. If no argument is given, current x values will be returned as an Object whose keys are the target ids.
+         */
+        x(x?: PrimitiveArray): PrimitiveArray;
+
+        /**
+         * Get and set x values for the chart.
+         * @param x If x is given, x values of every target will be updated. If no argument is given, current x values will be returned as an Object whose keys are the target ids.
+         */
+        xs(xs?: { [key: string]: PrimitiveArray }): { [key: string]: PrimitiveArray };
+
+        axis: {
+            /**
+             * Get and set axis labels.
+             * @param labels If labels is given, specified axis' label will be updated.
+             */
+            labels(labels?: { [key: string]: string }): { [key: string]: string }
+            /**
+             * Get and set axis min value.
+             * @param min If min is given, specified axis' min value will be updated. If no argument is given, the current min values for each axis will be returned.
+             */
+            min(min?: number | { [key: string]: number }): number | { [key: string]: number }
+            /**
+             * Get and set axis max value.
+             * @param max If max is given, specified axis' max value will be updated. If no argument is given, the current max values for each axis will be returned.
+             */
+            max(max?: number | { [key: string]: number }): number | { [key: string]: number }
+            /**
+             * Get and set axis min and max value.
+             * @param range If range is given, specified axis' min and max value will be updated. If no argument is given, the current min and max values for each axis will be returned.
+             */
+            range(range?: { min?: number | { [key: string]: number }; max?: number | { [key: string]: number } }): { min: number | { [key: string]: number }; max: number | { [key: string]: number } }
+        };
+
+        legend: {
+            /**
+             * Show legend for each target.
+             * @param targetIds If targetIds is given, specified target's legend will be shown. If only one target is the candidate, String can be passed. If no argument is given, all of target's legend will be shown.
+             */
+            show(targetIds?: ArrayOrString): void;
+            /**
+             * Hide legend for each target.
+             * @param targetIds If targetIds is given, specified target's legend will be hidden. If only one target is the candidate, String can be passed. If no argument is given, all of target's legend will be hidden.
+             */
+            hide(targetIds?: ArrayOrString): void;
+        };
+
+        zoom: {
+            /**
+             * Zoom by giving x domain.
+             * @param domain If domain is given, the chart will be zoomed to the given domain. If no argument is given, the current zoomed domain will be returned.
+             */
+            (domain?: Array<number>): Array<number>;
+
+            /**
+             * Enable and disable zooming.
+             * @param enabled If enabled is true, the feature of zooming will be enabled. If false is given, it will be disabled.
+             */
+            enable(enabled: boolean): void;
+        };
+
+        /**
+         * Unzoom to the original domain.
+         */
+        unzoom(): void;
+
+        /**
+         * Resize the chart. If no size is specified it will resize to fit.
+         * @param size This argument should include width and height in pixels.
+         */
+        resize(size?: { width?: number; height?: number }): void;
+
+        /**
+         * Force to redraw.
+         */
+        flush(): void;
+
+        /**
+         * Reset the chart object and remove element and events completely.
+         */
+        destroy(): void;
+    }
+
+    interface GridOperations {
+        /**
+         * Update the x/y grid lines.
+         * @param grids X/Y grid lines will be replaced with this argument. The format of this argument is the same as grid.x.lines or grid.y.lines.
+         */
+        (grids: Array<any>): void;
+        /**
+         * Add x/y grid lines. This API adds new x/y grid lines instead of replacing like xgrids.
+         * @param grids New x/y grid lines will be added. The format of this argument is the same as grid.x.lines or grid.y.lines and it's possible to give an Object if only one line will be added.
+         */
+        add(grids: Array<any> | Object): void;
+        /**
+         * Remove x/y grid lines. This API removes x/y grid lines.
+         * @param args This argument should include value or class. If value is given, the x/y grid lines that have specified x/y value will be removed. If class is given, the x/y grid lines that have specified class will be removed. If args is not given, all of x/y grid lines will be removed.
+         */
+        remove(args?: { class?: string; value?: number | string }): void;
+    }
+
+    export function generate(config: ChartConfiguration): ChartAPI;
+}
diff --git a/c3/tsconfig.json b/c3/tsconfig.json
new file mode 100644
index 0000000000..0db9fbc685
--- /dev/null
+++ b/c3/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "c3-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cal-heatmap/cal-heatmap-tests.ts b/cal-heatmap/cal-heatmap-tests.ts
index 4a7b0cb949..f19a88c3c1 100644
--- a/cal-heatmap/cal-heatmap-tests.ts
+++ b/cal-heatmap/cal-heatmap-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="cal-heatmap.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../d3/d3.d.ts" />
+
+/// <reference types="jquery" />
+/// <reference types="d3" />
 
 var cal = new CalHeatMap();
 cal.init();
diff --git a/cal-heatmap/cal-heatmap.d.ts b/cal-heatmap/cal-heatmap.d.ts
deleted file mode 100644
index 85a20d6d9d..0000000000
--- a/cal-heatmap/cal-heatmap.d.ts
+++ /dev/null
@@ -1,514 +0,0 @@
-// Type definitions for cal-heatmap v3.5.4
-// Project: https://github.com/wa0x6e/cal-heatmap
-// Definitions by: Chris Baker <https://github.com/RetroChrisB/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../d3/d3.d.ts" />
-
-declare namespace CalHeatMap
-{
-	interface CalHeatMapStatic
-	{
-		new (): CalHeatMap;
-	}
-
-	interface CalHeatMap
-	{
-		/**
-		 * Initialise the CalHeatMap with the specified options
-		 * @param {InitOptions} options The CalHeatMap options
-		 */
-		init(options?: InitOptions): void;
-
-		options: RuntimeOptions;
-
-		// Various update mode when using the update() API
-		/** Reset the whole calendar data before inserting the new data. */
-		RESET_ALL_ON_UPDATE: number;
-		/**
-		 * Update only the dates (subDomain) you pass in the data argument, replace their value by the new ones.
-		 * All other dates are leaved untouched.
-		 */
-		RESET_SINGLE_ON_UPDATE: number;
-		/**
-		 * Instead of replacing a date's value by a new one, increment it by the new value. All other dates are leaved untouched.
-		 * That's the one you want to use of you're populating the calendar in realtime!
-		 */
-		APPEND_ON_UPDATE: number;
-
-		/**
-		 * Shift the calendar n domains back
-		 * @param {number} n The number of domains to shift back. The default is 1.
-		 */
-		previous(n?: number): void;
-		/**
-		 * Shift the calendar n domains forward
-		 * @param {number} n The number of domains to shift forward. The default is 1.
-		 */
-		next(n?: number): void;
-		/**
-		 * Jump the calendar to the specified date
-		 * This method will shift the calendar backward or forward, until the domain containing the specified date is visible.
-		 * @param {Date} date The date to jump to.
-		 * @param {boolean} reset Whether to set the domain with the specified as the calendar's first domain.
-		 */
-		jumpTo(date: Date, reset?: boolean): void;
-		/** Reset the calendar back to the start date */
-		rewind(): void;
-		/**
-		 * Update the calendar with new data
-		 * Use update() when you want to refresh the calendar with a new set of data.
-		 * Particularly useful if you're filling the calendar in realtime, or if you want to display a subset of the current data.
-		 * @param {string|Object} data Accept the same format as the data option.
-		 * @param {} afterLoad Whether to execute the afterLoad() callback to convert your data into the json object, expected by cal-heatmap.
-		 *                     It can also directly takes a function, in case your data can not be converted with the afterLoad() function you defined.
-		 * @param {} updateMode Define how to insert the new data into the calendar.
-		 *                      Accepted values are:
-		 *                        Instance.RESET_ALL_ON_UPDATE  (default) Reset the whole calendar data before inserting the new data.
-		 *                        Instance.RESET_SINGLE_ON_UPDATE  Update only the dates (subDomain) you pass in the data argument,
-		 *                                                         replace their value by the new ones. All other dates are leaved untouched.
-		 *                        Instance.APPEND_ON_UPDATE  Instead of replacing a date's value by a new one, increment it by the new value.
-		 *                                                   All other dates are leaved untouched. That's the one you want to use of you're
-		 *                                                   populating the calendar in realtime!
-		 */
-		update(data: string | Object, afterLoad?: boolean | Function, updateMode?: number): void;
-		/**
-		 * Change the highlighted dates.
-		 * Takes an array of Date object. Can also accepts the now string, equivalent to Date.now().
-		 * @param {string|Date|Date[]} dates The date or dates to highlight.
-		 */
-		highlight(dates: string | Date | Date[]): void;
-		/**
-		 * Return the SVG source code with the appropriate CSS
-		 * The returned string code is valid and ready to be placed in a .svg file.
-		 * @returns SVG source code with the appropriate CSS.
-		 */
-		getSVG(): string;
-		/**
-		 * Change the legend settings and/or threshold
-		 * When called without arguments, setLegend() will just redraw the legend.
-		 * @param {} legend Same as legend : an array of thresholds
-		 * @param {} legendColor Same as legendColors : an object with the heatmap's colors, or an array of 2 colors
-		 */
-		setLegend(legend?: number[], legendColors?: LegendColor | string[]): void;
-		/**
-		 * Remove the legend from the calendar
-		 * Settings are kept and you can re-add the legend with the same settings using showLegend().
-		 */
-		removeLegend(): void;
-		/** Display the legend, if not already shown. */
-		showLegend(): void;
-		/**
-		 * Remove the calendar from the DOM
-		 * Remember to self-assign the result of destroy() to your calendar instance, or it'll lead to a memory leak.
-		 * @param {Function} callback function that will be executed when the calendar is removed from the DOM, at the end of the animation.
-		 * @returns always returns null.
-		 */
-		destroy(callback?: Function): CalHeatMap;
-	}
-
-	interface LegendColor
-	{
-		/** Color of the smallest value on the legend */
-		min: string;
-		/** Color of the highest value on the legend */
-		max: string;
-		/** Color for the dates with value == 0 */
-		empty?: string;
-		/** Base color of the date cells */
-		base?: string;
-		/** Color for the special value */
-		overflow?: string;
-	}
-
-	interface InitOptions
-	{
-		// ================================================
-		// Presentation
-		// ================================================
-
-		/** DOM node to insert the calendar in. Default: "#cal-heatmap" */
-		itemSelector?: string | HTMLElement | Element | EventTarget;
-
-		/**
-		 * Type of domain. Default: "hour"
-		 * Valid domains: {"hour", "day", "week", "month", "year"}
-		 */
-		domain?: string;
-
-		/**
-		 * Type of subDomain. Default: "min"
-		 * Valid subDomains: {"min", "x_min", "hour", "x_hour", "day", "x_day", "week", "x_week", "month", "x_month"}
-		 */
-		subDomain?: string;
-
-		/** Number of domain to display. Default: 12 */
-		range?: number;
-
-		/** Size of each subDomain cell, in pixels. Default: 10 */
-		cellSize?: number;
-
-		/** Space between each subDomain cell, in pixel. Default: 2 */
-		cellPadding?: number;
-
-		/** subDomain cell's border radius, for rounder corner, in pixel. Default: 0 */
-		cellRadius?: number;
-
-		/** Space between each domain, in pixel. Default: 2 */
-		domainGutter?: number;
-
-		/**
-		 * Margin around each domain, in pixel. Default: [0,0,0,0]
-		 * Ordered like in CSS (top, right, bottom, left), it also accepts CSS like values
-		 */
-		domainMargin?: number | number[];
-
-		/**
-		 * Whether to enable domain dynamic width and height. Default: true
-		 * Some domain>subdomain couple, like month>days, doesn't always have the same number of
-		 * subDomain cells. Some months have 6 weeks, some only 4.
-		 * With dynamic dimension enabled, the domain width and height will be adjusted to fit the
-		 * domain content, whereas when it's disabled, all domains will have the same dimension : the biggest.
-		 */
-		domainDynamicDimension?: boolean;
-
-		/** To display the calendar vertically, with each domain one under the other. Default: false */
-		verticalOrientation?: boolean;
-
-		/** Position and alignment of the domain label. */
-		label?: Label;
-
-		/**
-		 * Control the number of columns to split the domain dates into. Default: null
-		 * Each domain is split into an arbitrary number of columns (or rows depending on the
-		 * reading direction). You can overwrite that number with colLimit, and force all dates on the
-		 * same line, or split them into more columns.
-		 * That setting limit the maximum number of columns, and doesn't necessary means that each rows will
-		 * contains that number of columns.
-		 */
-		colLimit?: number;
-
-		/** Control the number of rows to split the domain dates into. Default: null
-		 * If rowLimit and colLimit are both used, rowLimit will be ignored. */
-		rowLimit?: number;
-
-		/** Whether to display a tooltip when hovering over a date. Default: false */
-		tooltip?: boolean;
-
-		// ================================================
-		// Data
-		// ================================================
-
-		/**
-		 * Starting date of the calendar. Default: new Date()
-		 * It doesn't have to be precise, the calendar will not start at that date, but at the first domain containing that date.
-		 */
-		start?: Date;
-		/**
-		 * Data used to fill the calendar. Default: ""
-		 * String is interpreted as a URL to an API, which should be returning the data used to fill the calendar.
-		 */
-
-		data?: string | Object;
-
-		/**
-		 * Engine used to parse the data. Default: json
-		 * Valid values:
-		 *  "json" - Interpret the data as json.
-		 *  "csv"  - Interpret the data as csv.
-		 *  "tsv"  - Interpret the data exactly like csv, but are delimited with a tab character, instead of comma.
-		 *  "txt"  - Just return the data as a string.
-		 */
-		dataType?: string;
-
-		/**
-		 * Highlight selected subDomain cells. Default: false
-		 * Takes an array of Date object. Can also accepts the now string, equivalent to Date.now().
-		 */
-		highlight?: string | string[] | Date[] | any[];
-
-		/** Whether to start the week on Monday, instead of Sunday. Default: true */
-		weekStartOnMonday?: boolean;
-
-		/**
-		 * Lower limit of the domain navigation, preventing navigating beyond a certain date. Default: null
-		 * When set, calling previous() will only work only until the leftmost domain containing minDate.
-		 * Like with start, minDate does not have to be precise, and just have to be a date inside the domain.
-		 * previous() will always return true, unless the domain containing minDate is reached, in which case, it'll return false.
-		 */
-		minDate?: Date;
-
-		/** Upper limit of the domain navigation, preventing navigating beyond a certain date. Default: null */
-		maxDate?: Date;
-
-		/**
-		 * Whether to consider missing date:value couple in the data source as equal to 0.  Default: false
-		 * By default, when the a date is not associated to a value, it's considered as null, and rendered as a no value cell.
-		 * You should ask yourself, if the API is not returning result for a date, is it because there is really no value
-		 * associated to this date, or because it's supposed to be equal to 0, and it's skipped in order to save bandwidth ?
-		 */
-		considerMissingDataAsZero?: boolean;
-
-		// ================================================
-		// Legend
-		// ================================================
-
-		/** Assign each range of values to a color. Default: [10, 20, 30, 40] */
-		legend?: number[];
-
-		/** Whether to display the legend. Default: true */
-		displayLegend?: boolean;
-
-		/** Size of the legend cells, in pixels. Default: 10 */
-		legendCellSize?: number;
-
-		/** Padding between each legend cell, in pixels. Default: 2 */
-		legendCellPadding?: number;
-
-		/** Margin around the legend, in pixels. Default: [10, 0, 0, 0] */
-		legendMargin?: number | number[];
-
-		/**
-		 * Vertical position of the legend. Default: "bottom"
-		 * Valid values:
-		 *  "top"    - Place the legend above the calendar
-		 *  "center" - Place the legend on the calendar's side
-		 *             Use with legendHorizontalPosition, to position the legend on the left (default) or on the right.
-		 *  "bottom" - Place the legend on below the calendar
-		 */
-		legendVerticalPosition?: string;
-
-		/**
-		 * Horizontal position of the legend. Default: "left"
-		 * Valid values:
-		 *  "left"   - Align the legend to the left
-		 *  "center" - Center the legend
-		 *  "right"  - Align the legend to the right
-		 */
-		legendHorizontalPosition?: string;
-
-		/**
-		 * Orientation of the legend. Default: "horizontal"
-		 * legendOrientation is best used together with legendHorizontalPosition when the legend is positioned on the side.
-		 * Valid values:
-		 *  "horizontal" - Legend is displayed horizontally, from left to right
-		 *  "vertical"   - Legend is displayed vertically, from top to bottom
-		 */
-		legendOrientation?: string;
-
-		/**
-		 * Set of colors to automagically compute the heatmap colors.
-		 * Instead of relying on the CSS for your heatmap's colors, you can also set the heatmap's colors directly with
-		 * cal-heatmap on initialization, or even dynamically change them after.
-		 * All legend settings can be changed dynamically after calendar initialisation, with setLegend().
-		 */
-		legendColors?: LegendColor | string[];
-
-		// ================================================
-		// i18n
-		// ================================================
-
-		/**
-		 * Name of the entity you're representing on the calendar.
-		 * Takes an array of string, with the first index as the singular form, and the second index the plural form.
-		 * For the lazy, you can also pass a simple string, ar a single element array, and it'll automatically guess
-		 * the plural form, as long as it's the singular form plus the "s" suffix.
-		 */
-		itemName?: string | string[];
-		/**
-		 * Format of the title displayed when hovering a subDomain.
-		 * Some template strings are available, and enclosed in braces.
-		 *  {name}       Name of the entity represented in the calendar (see itemName)
-		 *  {count}      The value associated to the date.
-		 *  {date}       The date of the cell. It's automatically formatted according to the type of subDomain.
-		 *               See subDomainDateFormat to further customize that date formatting.
-		 *  {connector}  An English preposition placed before a datetime (on Monday, at 15:00, etc.). Each subDomain
-		 *               have their own default connector, corresponding to the default date format.
-		 */
-		subDomainTitleFormat?: SubDomainFormatTemplates;
-		/**
-		 * Format of the {date} template string inside subDomainTitleFormat.
-		 * {date} is by default formatted according to the subDomain type.
-		 * subDomainFormat can accept any string with directive accepted by d3.time.format(), like "%Y-%m-%d".
-		 * As d3.time.format() will only output English dates, subDomainDateFormat can also accept a function,
-		 * with the subDomain date as the argument.
-		 */
-		subDomainDateFormat?: string | Function;
-		/**
-		 * Format of the text inside a subDomain cell.
-		 * Disabled by default, you can display a text inside each subDomain cell.
-		 * Works exactly like subDomainDateFormat, except that the function takes the cell value as second argument.
-		 */
-		subDomainTextFormat?: string | Function;
-		/**
-		 * Format of the domain label.
-		 * Works exactly like subDomainDateFormat, and will format the domain label with any string accepted by d3.time.format(), or a function.
-		 * To not display the domain label, set domainLabelFormat to "" (empty string).
-		 */
-		domainLabelFormat?: string | Function;
-		/**
-		 * Formatting of the legend title, displayed when hovering a legend cell.
-		 * Some template strings are available, and enclosed in braces.
-		 *  {name}  Name of the entity represented in the calendar (see itemName)
-		 *  {min}   The first value of the legend array.
-		 *  {max}   The last value of the legend array.
-		 *  {down}  The lower bound of a color
-		 *  {up}    The upper bound of a color
-		 */
-		legendTitleFormat?: LegendTitleTemplates;
-
-		// ================================================
-		// Other
-		// ================================================
-
-		/** Animation duration, in milliseconds. Default value: 500 */
-		animationDuration?: number;
-		/**
-		 * Will attach the previous() event to the specified element, on a mouse click, shifting the calendar one domain back. Default value: false
-		 * If you want to shift by more than one domain, see the previous() method.
-		 */
-		previousSelector?: string | HTMLElement;
-		/**
-		 * Will attach the next() event to the specified element, on a mouse click, shifting the calendar one domain forward. Default value: false
-		 * If you want to shift by more than one domain, see the next() method.
-		 */
-		nextSelector?: string | HTMLElement;
-		/**
-		 * The calendar instance namespace.
-		 * If you have more than one instance of Cal-Heatmap, you should assign each instance its own namespace, in order to isolate each instance event handler.
-		 */
-		itemNamespace?: string;
-
-		// ================================================
-		// Events
-		// ================================================
-
-		/** Called after a mouse click event on a subDomain cell. */
-		onClick?: (date: Date, value: number) => void;
-		/** Called after drawing the empty calendar, and before filling it with data. */
-		afterLoad?: () => void;
-		/**
-		 * Called after shifting the calendar one domain back.
-		 * The date argument is the start date of the domain that was added.
-		 */
-		afterLoadPreviousDomain?: (date: Date) => void;
-		/**
-		 * Called after shifting the calendar one domain forward.
-		 * The date argument is the start date of the domain that was added.
-		 */
-		afterLoadNextDomain?: (date: Date) => void;
-		/**
-		 * Called after drawing and filling the calendar.
-		 * Useful in case you're loading data via ajax, as it's loading data asynchronously. This event will wait for the ajax
-		 * request to complete before triggering.
-		 * This event will only trigger once, on the initial setup. See afterLoadPreviousDomain and afterLoadNextDomain for
-		 * callback events after a domain navigation.
-		 */
-		onComplete?: () => void;
-		/**
-		 * Called after getting the data from source, but before filling the calendar.
-		 * This callback must return a json object formatted in the expected data format.
-		 * afterLoadData() is used to do some works on the data, especially when the data source is not returning data in the expected format.
-		 */
-		afterLoadData?: (data: any) => DataFormat;
-		/**
-		 * Triggered after previous(), when the incoming domain is containing minDate.
-		 * When the leftmost domain set by minDate is loaded into the calendar, onMinDomainReached() will be triggered with true as argument.
-		 * This event is useful if you want to disable your previous button, since there is no more previous domains to load.
-		 * In order to reverse the action, onMinDomainReached() will be called with false as argument afer next(), only once, and only if the
-		 * leftmost domain is not the lower limit domain anymore.
-		 */
-		onMinDomainReached?: (reached: boolean) => void;
-		/**
-		 * Triggered after next(), when the incoming domain is containing maxDate.
-		 * See onMinDomainReached().
-		 */
-		onMaxDomainReached?: (reached: boolean) => void;
-	}
-
-	interface RuntimeOptions extends InitOptions
-	{
-		/** Margin around each domain, in pixels. Ordered like in CSS (top, right, bottom, left) */
-		domainMargin: number[];
-		/** Margin around the legend, in pixels. Ordered like in CSS (top, right, bottom, left) */
-		legendMargin: number[];
-		/** List of dates to highlight */
-		highlight: Date[];
-		/**
-		 * Name of the items to represent in the calendar.
-		 * First index is singular form, and the second index, the plural form.
-		 */
-		itemName: string[];
-	}
-
-	interface LegendTitleTemplates
-	{
-		/** Formatting of the smallest (leftmost) value of the legend. Default value: "less than {min} {name}" */
-		lower?: string;
-		/** Formatting of all the value but the first and the last. Default value: "between {down} and {up} {name}" */
-		inner?: string;
-		/** Formatting of the biggest (rightmost) value of the legend. Default value: "more than {max} {name}" */
-		upper?: string;
-	}
-
-	interface SubDomainFormatTemplates
-	{
-		/** Format of the title when there is no value associated to the date. Default value: "{date}" */
-		empty?: string;
-		/** Format of the title when it's associated to a value. Default value: "{count} {name} {connector} {date}" */
-		filled?: string;
-	}
-
-	interface DataFormat
-	{
-		/** timestamp are in seconds, value can be any number (integer or float) */
-		[timestamp: string]: number;
-	}
-
-	interface LabelOffset
-	{
-		x: number;
-		y: number;
-	}
-
-	/** Position and alignment of the domain label. */
-	interface Label
-	{
-		/**
-		 * Position of the label, relative to the domain. Default: "bottom"
-		 * Valid values: {"top", "right", "bottom", "left"}
-		 */
-		position?: string;
-
-		/**
-		 * Horizontal align of the domain. Default: "center"
-		 * Valid values: {"left", "center", "right"}
-		 */
-		align?: string;
-		/**
-		 * Rotation for a vertical label. Default: null
-		 * Valid values: {null, "left", "right"}
-		 */
-		rotate?: string;
-		/**
-		 * Only used when label is rotated, defines the width of the label. Default: 100
-		 * Valid values: any intger
-		 */
-		width?: number;
-		/**
-		 * More control about label positioning, if the default value does not fit your need,
-		 * especially when label is rotated, or when using a big font-size. Default: {x:0, y:0}
-		 */
-		offset?: LabelOffset;
-		/**
-		 * Height of the domain label in pixels.
-		 * By leaving it to null, the label will be set to 2 times the height of the subDomain cell.
-		 * If you want to remove the label, set domainLabelFormat to "" (empty string), instead
-		 * of setting the label height to 0. Default: null
-		 * Valid values: any integer
-		 */
-		height?: number;
-	}
-}
-
-declare var CalHeatMap: CalHeatMap.CalHeatMapStatic;
diff --git a/cal-heatmap/index.d.ts b/cal-heatmap/index.d.ts
new file mode 100644
index 0000000000..356487c3e9
--- /dev/null
+++ b/cal-heatmap/index.d.ts
@@ -0,0 +1,514 @@
+// Type definitions for cal-heatmap v3.5.4
+// Project: https://github.com/wa0x6e/cal-heatmap
+// Definitions by: Chris Baker <https://github.com/RetroChrisB/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="d3" />
+
+declare namespace CalHeatMap
+{
+	interface CalHeatMapStatic
+	{
+		new (): CalHeatMap;
+	}
+
+	interface CalHeatMap
+	{
+		/**
+		 * Initialise the CalHeatMap with the specified options
+		 * @param {InitOptions} options The CalHeatMap options
+		 */
+		init(options?: InitOptions): void;
+
+		options: RuntimeOptions;
+
+		// Various update mode when using the update() API
+		/** Reset the whole calendar data before inserting the new data. */
+		RESET_ALL_ON_UPDATE: number;
+		/**
+		 * Update only the dates (subDomain) you pass in the data argument, replace their value by the new ones.
+		 * All other dates are leaved untouched.
+		 */
+		RESET_SINGLE_ON_UPDATE: number;
+		/**
+		 * Instead of replacing a date's value by a new one, increment it by the new value. All other dates are leaved untouched.
+		 * That's the one you want to use of you're populating the calendar in realtime!
+		 */
+		APPEND_ON_UPDATE: number;
+
+		/**
+		 * Shift the calendar n domains back
+		 * @param {number} n The number of domains to shift back. The default is 1.
+		 */
+		previous(n?: number): void;
+		/**
+		 * Shift the calendar n domains forward
+		 * @param {number} n The number of domains to shift forward. The default is 1.
+		 */
+		next(n?: number): void;
+		/**
+		 * Jump the calendar to the specified date
+		 * This method will shift the calendar backward or forward, until the domain containing the specified date is visible.
+		 * @param {Date} date The date to jump to.
+		 * @param {boolean} reset Whether to set the domain with the specified as the calendar's first domain.
+		 */
+		jumpTo(date: Date, reset?: boolean): void;
+		/** Reset the calendar back to the start date */
+		rewind(): void;
+		/**
+		 * Update the calendar with new data
+		 * Use update() when you want to refresh the calendar with a new set of data.
+		 * Particularly useful if you're filling the calendar in realtime, or if you want to display a subset of the current data.
+		 * @param {string|Object} data Accept the same format as the data option.
+		 * @param {} afterLoad Whether to execute the afterLoad() callback to convert your data into the json object, expected by cal-heatmap.
+		 *                     It can also directly takes a function, in case your data can not be converted with the afterLoad() function you defined.
+		 * @param {} updateMode Define how to insert the new data into the calendar.
+		 *                      Accepted values are:
+		 *                        Instance.RESET_ALL_ON_UPDATE  (default) Reset the whole calendar data before inserting the new data.
+		 *                        Instance.RESET_SINGLE_ON_UPDATE  Update only the dates (subDomain) you pass in the data argument,
+		 *                                                         replace their value by the new ones. All other dates are leaved untouched.
+		 *                        Instance.APPEND_ON_UPDATE  Instead of replacing a date's value by a new one, increment it by the new value.
+		 *                                                   All other dates are leaved untouched. That's the one you want to use of you're
+		 *                                                   populating the calendar in realtime!
+		 */
+		update(data: string | Object, afterLoad?: boolean | Function, updateMode?: number): void;
+		/**
+		 * Change the highlighted dates.
+		 * Takes an array of Date object. Can also accepts the now string, equivalent to Date.now().
+		 * @param {string|Date|Date[]} dates The date or dates to highlight.
+		 */
+		highlight(dates: string | Date | Date[]): void;
+		/**
+		 * Return the SVG source code with the appropriate CSS
+		 * The returned string code is valid and ready to be placed in a .svg file.
+		 * @returns SVG source code with the appropriate CSS.
+		 */
+		getSVG(): string;
+		/**
+		 * Change the legend settings and/or threshold
+		 * When called without arguments, setLegend() will just redraw the legend.
+		 * @param {} legend Same as legend : an array of thresholds
+		 * @param {} legendColor Same as legendColors : an object with the heatmap's colors, or an array of 2 colors
+		 */
+		setLegend(legend?: number[], legendColors?: LegendColor | string[]): void;
+		/**
+		 * Remove the legend from the calendar
+		 * Settings are kept and you can re-add the legend with the same settings using showLegend().
+		 */
+		removeLegend(): void;
+		/** Display the legend, if not already shown. */
+		showLegend(): void;
+		/**
+		 * Remove the calendar from the DOM
+		 * Remember to self-assign the result of destroy() to your calendar instance, or it'll lead to a memory leak.
+		 * @param {Function} callback function that will be executed when the calendar is removed from the DOM, at the end of the animation.
+		 * @returns always returns null.
+		 */
+		destroy(callback?: Function): CalHeatMap;
+	}
+
+	interface LegendColor
+	{
+		/** Color of the smallest value on the legend */
+		min: string;
+		/** Color of the highest value on the legend */
+		max: string;
+		/** Color for the dates with value == 0 */
+		empty?: string;
+		/** Base color of the date cells */
+		base?: string;
+		/** Color for the special value */
+		overflow?: string;
+	}
+
+	interface InitOptions
+	{
+		// ================================================
+		// Presentation
+		// ================================================
+
+		/** DOM node to insert the calendar in. Default: "#cal-heatmap" */
+		itemSelector?: string | HTMLElement | Element | EventTarget;
+
+		/**
+		 * Type of domain. Default: "hour"
+		 * Valid domains: {"hour", "day", "week", "month", "year"}
+		 */
+		domain?: string;
+
+		/**
+		 * Type of subDomain. Default: "min"
+		 * Valid subDomains: {"min", "x_min", "hour", "x_hour", "day", "x_day", "week", "x_week", "month", "x_month"}
+		 */
+		subDomain?: string;
+
+		/** Number of domain to display. Default: 12 */
+		range?: number;
+
+		/** Size of each subDomain cell, in pixels. Default: 10 */
+		cellSize?: number;
+
+		/** Space between each subDomain cell, in pixel. Default: 2 */
+		cellPadding?: number;
+
+		/** subDomain cell's border radius, for rounder corner, in pixel. Default: 0 */
+		cellRadius?: number;
+
+		/** Space between each domain, in pixel. Default: 2 */
+		domainGutter?: number;
+
+		/**
+		 * Margin around each domain, in pixel. Default: [0,0,0,0]
+		 * Ordered like in CSS (top, right, bottom, left), it also accepts CSS like values
+		 */
+		domainMargin?: number | number[];
+
+		/**
+		 * Whether to enable domain dynamic width and height. Default: true
+		 * Some domain>subdomain couple, like month>days, doesn't always have the same number of
+		 * subDomain cells. Some months have 6 weeks, some only 4.
+		 * With dynamic dimension enabled, the domain width and height will be adjusted to fit the
+		 * domain content, whereas when it's disabled, all domains will have the same dimension : the biggest.
+		 */
+		domainDynamicDimension?: boolean;
+
+		/** To display the calendar vertically, with each domain one under the other. Default: false */
+		verticalOrientation?: boolean;
+
+		/** Position and alignment of the domain label. */
+		label?: Label;
+
+		/**
+		 * Control the number of columns to split the domain dates into. Default: null
+		 * Each domain is split into an arbitrary number of columns (or rows depending on the
+		 * reading direction). You can overwrite that number with colLimit, and force all dates on the
+		 * same line, or split them into more columns.
+		 * That setting limit the maximum number of columns, and doesn't necessary means that each rows will
+		 * contains that number of columns.
+		 */
+		colLimit?: number;
+
+		/** Control the number of rows to split the domain dates into. Default: null
+		 * If rowLimit and colLimit are both used, rowLimit will be ignored. */
+		rowLimit?: number;
+
+		/** Whether to display a tooltip when hovering over a date. Default: false */
+		tooltip?: boolean;
+
+		// ================================================
+		// Data
+		// ================================================
+
+		/**
+		 * Starting date of the calendar. Default: new Date()
+		 * It doesn't have to be precise, the calendar will not start at that date, but at the first domain containing that date.
+		 */
+		start?: Date;
+		/**
+		 * Data used to fill the calendar. Default: ""
+		 * String is interpreted as a URL to an API, which should be returning the data used to fill the calendar.
+		 */
+
+		data?: string | Object;
+
+		/**
+		 * Engine used to parse the data. Default: json
+		 * Valid values:
+		 *  "json" - Interpret the data as json.
+		 *  "csv"  - Interpret the data as csv.
+		 *  "tsv"  - Interpret the data exactly like csv, but are delimited with a tab character, instead of comma.
+		 *  "txt"  - Just return the data as a string.
+		 */
+		dataType?: string;
+
+		/**
+		 * Highlight selected subDomain cells. Default: false
+		 * Takes an array of Date object. Can also accepts the now string, equivalent to Date.now().
+		 */
+		highlight?: string | string[] | Date[] | any[];
+
+		/** Whether to start the week on Monday, instead of Sunday. Default: true */
+		weekStartOnMonday?: boolean;
+
+		/**
+		 * Lower limit of the domain navigation, preventing navigating beyond a certain date. Default: null
+		 * When set, calling previous() will only work only until the leftmost domain containing minDate.
+		 * Like with start, minDate does not have to be precise, and just have to be a date inside the domain.
+		 * previous() will always return true, unless the domain containing minDate is reached, in which case, it'll return false.
+		 */
+		minDate?: Date;
+
+		/** Upper limit of the domain navigation, preventing navigating beyond a certain date. Default: null */
+		maxDate?: Date;
+
+		/**
+		 * Whether to consider missing date:value couple in the data source as equal to 0.  Default: false
+		 * By default, when the a date is not associated to a value, it's considered as null, and rendered as a no value cell.
+		 * You should ask yourself, if the API is not returning result for a date, is it because there is really no value
+		 * associated to this date, or because it's supposed to be equal to 0, and it's skipped in order to save bandwidth ?
+		 */
+		considerMissingDataAsZero?: boolean;
+
+		// ================================================
+		// Legend
+		// ================================================
+
+		/** Assign each range of values to a color. Default: [10, 20, 30, 40] */
+		legend?: number[];
+
+		/** Whether to display the legend. Default: true */
+		displayLegend?: boolean;
+
+		/** Size of the legend cells, in pixels. Default: 10 */
+		legendCellSize?: number;
+
+		/** Padding between each legend cell, in pixels. Default: 2 */
+		legendCellPadding?: number;
+
+		/** Margin around the legend, in pixels. Default: [10, 0, 0, 0] */
+		legendMargin?: number | number[];
+
+		/**
+		 * Vertical position of the legend. Default: "bottom"
+		 * Valid values:
+		 *  "top"    - Place the legend above the calendar
+		 *  "center" - Place the legend on the calendar's side
+		 *             Use with legendHorizontalPosition, to position the legend on the left (default) or on the right.
+		 *  "bottom" - Place the legend on below the calendar
+		 */
+		legendVerticalPosition?: string;
+
+		/**
+		 * Horizontal position of the legend. Default: "left"
+		 * Valid values:
+		 *  "left"   - Align the legend to the left
+		 *  "center" - Center the legend
+		 *  "right"  - Align the legend to the right
+		 */
+		legendHorizontalPosition?: string;
+
+		/**
+		 * Orientation of the legend. Default: "horizontal"
+		 * legendOrientation is best used together with legendHorizontalPosition when the legend is positioned on the side.
+		 * Valid values:
+		 *  "horizontal" - Legend is displayed horizontally, from left to right
+		 *  "vertical"   - Legend is displayed vertically, from top to bottom
+		 */
+		legendOrientation?: string;
+
+		/**
+		 * Set of colors to automagically compute the heatmap colors.
+		 * Instead of relying on the CSS for your heatmap's colors, you can also set the heatmap's colors directly with
+		 * cal-heatmap on initialization, or even dynamically change them after.
+		 * All legend settings can be changed dynamically after calendar initialisation, with setLegend().
+		 */
+		legendColors?: LegendColor | string[];
+
+		// ================================================
+		// i18n
+		// ================================================
+
+		/**
+		 * Name of the entity you're representing on the calendar.
+		 * Takes an array of string, with the first index as the singular form, and the second index the plural form.
+		 * For the lazy, you can also pass a simple string, ar a single element array, and it'll automatically guess
+		 * the plural form, as long as it's the singular form plus the "s" suffix.
+		 */
+		itemName?: string | string[];
+		/**
+		 * Format of the title displayed when hovering a subDomain.
+		 * Some template strings are available, and enclosed in braces.
+		 *  {name}       Name of the entity represented in the calendar (see itemName)
+		 *  {count}      The value associated to the date.
+		 *  {date}       The date of the cell. It's automatically formatted according to the type of subDomain.
+		 *               See subDomainDateFormat to further customize that date formatting.
+		 *  {connector}  An English preposition placed before a datetime (on Monday, at 15:00, etc.). Each subDomain
+		 *               have their own default connector, corresponding to the default date format.
+		 */
+		subDomainTitleFormat?: SubDomainFormatTemplates;
+		/**
+		 * Format of the {date} template string inside subDomainTitleFormat.
+		 * {date} is by default formatted according to the subDomain type.
+		 * subDomainFormat can accept any string with directive accepted by d3.time.format(), like "%Y-%m-%d".
+		 * As d3.time.format() will only output English dates, subDomainDateFormat can also accept a function,
+		 * with the subDomain date as the argument.
+		 */
+		subDomainDateFormat?: string | Function;
+		/**
+		 * Format of the text inside a subDomain cell.
+		 * Disabled by default, you can display a text inside each subDomain cell.
+		 * Works exactly like subDomainDateFormat, except that the function takes the cell value as second argument.
+		 */
+		subDomainTextFormat?: string | Function;
+		/**
+		 * Format of the domain label.
+		 * Works exactly like subDomainDateFormat, and will format the domain label with any string accepted by d3.time.format(), or a function.
+		 * To not display the domain label, set domainLabelFormat to "" (empty string).
+		 */
+		domainLabelFormat?: string | Function;
+		/**
+		 * Formatting of the legend title, displayed when hovering a legend cell.
+		 * Some template strings are available, and enclosed in braces.
+		 *  {name}  Name of the entity represented in the calendar (see itemName)
+		 *  {min}   The first value of the legend array.
+		 *  {max}   The last value of the legend array.
+		 *  {down}  The lower bound of a color
+		 *  {up}    The upper bound of a color
+		 */
+		legendTitleFormat?: LegendTitleTemplates;
+
+		// ================================================
+		// Other
+		// ================================================
+
+		/** Animation duration, in milliseconds. Default value: 500 */
+		animationDuration?: number;
+		/**
+		 * Will attach the previous() event to the specified element, on a mouse click, shifting the calendar one domain back. Default value: false
+		 * If you want to shift by more than one domain, see the previous() method.
+		 */
+		previousSelector?: string | HTMLElement;
+		/**
+		 * Will attach the next() event to the specified element, on a mouse click, shifting the calendar one domain forward. Default value: false
+		 * If you want to shift by more than one domain, see the next() method.
+		 */
+		nextSelector?: string | HTMLElement;
+		/**
+		 * The calendar instance namespace.
+		 * If you have more than one instance of Cal-Heatmap, you should assign each instance its own namespace, in order to isolate each instance event handler.
+		 */
+		itemNamespace?: string;
+
+		// ================================================
+		// Events
+		// ================================================
+
+		/** Called after a mouse click event on a subDomain cell. */
+		onClick?: (date: Date, value: number) => void;
+		/** Called after drawing the empty calendar, and before filling it with data. */
+		afterLoad?: () => void;
+		/**
+		 * Called after shifting the calendar one domain back.
+		 * The date argument is the start date of the domain that was added.
+		 */
+		afterLoadPreviousDomain?: (date: Date) => void;
+		/**
+		 * Called after shifting the calendar one domain forward.
+		 * The date argument is the start date of the domain that was added.
+		 */
+		afterLoadNextDomain?: (date: Date) => void;
+		/**
+		 * Called after drawing and filling the calendar.
+		 * Useful in case you're loading data via ajax, as it's loading data asynchronously. This event will wait for the ajax
+		 * request to complete before triggering.
+		 * This event will only trigger once, on the initial setup. See afterLoadPreviousDomain and afterLoadNextDomain for
+		 * callback events after a domain navigation.
+		 */
+		onComplete?: () => void;
+		/**
+		 * Called after getting the data from source, but before filling the calendar.
+		 * This callback must return a json object formatted in the expected data format.
+		 * afterLoadData() is used to do some works on the data, especially when the data source is not returning data in the expected format.
+		 */
+		afterLoadData?: (data: any) => DataFormat;
+		/**
+		 * Triggered after previous(), when the incoming domain is containing minDate.
+		 * When the leftmost domain set by minDate is loaded into the calendar, onMinDomainReached() will be triggered with true as argument.
+		 * This event is useful if you want to disable your previous button, since there is no more previous domains to load.
+		 * In order to reverse the action, onMinDomainReached() will be called with false as argument afer next(), only once, and only if the
+		 * leftmost domain is not the lower limit domain anymore.
+		 */
+		onMinDomainReached?: (reached: boolean) => void;
+		/**
+		 * Triggered after next(), when the incoming domain is containing maxDate.
+		 * See onMinDomainReached().
+		 */
+		onMaxDomainReached?: (reached: boolean) => void;
+	}
+
+	interface RuntimeOptions extends InitOptions
+	{
+		/** Margin around each domain, in pixels. Ordered like in CSS (top, right, bottom, left) */
+		domainMargin: number[];
+		/** Margin around the legend, in pixels. Ordered like in CSS (top, right, bottom, left) */
+		legendMargin: number[];
+		/** List of dates to highlight */
+		highlight: Date[];
+		/**
+		 * Name of the items to represent in the calendar.
+		 * First index is singular form, and the second index, the plural form.
+		 */
+		itemName: string[];
+	}
+
+	interface LegendTitleTemplates
+	{
+		/** Formatting of the smallest (leftmost) value of the legend. Default value: "less than {min} {name}" */
+		lower?: string;
+		/** Formatting of all the value but the first and the last. Default value: "between {down} and {up} {name}" */
+		inner?: string;
+		/** Formatting of the biggest (rightmost) value of the legend. Default value: "more than {max} {name}" */
+		upper?: string;
+	}
+
+	interface SubDomainFormatTemplates
+	{
+		/** Format of the title when there is no value associated to the date. Default value: "{date}" */
+		empty?: string;
+		/** Format of the title when it's associated to a value. Default value: "{count} {name} {connector} {date}" */
+		filled?: string;
+	}
+
+	interface DataFormat
+	{
+		/** timestamp are in seconds, value can be any number (integer or float) */
+		[timestamp: string]: number;
+	}
+
+	interface LabelOffset
+	{
+		x: number;
+		y: number;
+	}
+
+	/** Position and alignment of the domain label. */
+	interface Label
+	{
+		/**
+		 * Position of the label, relative to the domain. Default: "bottom"
+		 * Valid values: {"top", "right", "bottom", "left"}
+		 */
+		position?: string;
+
+		/**
+		 * Horizontal align of the domain. Default: "center"
+		 * Valid values: {"left", "center", "right"}
+		 */
+		align?: string;
+		/**
+		 * Rotation for a vertical label. Default: null
+		 * Valid values: {null, "left", "right"}
+		 */
+		rotate?: string;
+		/**
+		 * Only used when label is rotated, defines the width of the label. Default: 100
+		 * Valid values: any intger
+		 */
+		width?: number;
+		/**
+		 * More control about label positioning, if the default value does not fit your need,
+		 * especially when label is rotated, or when using a big font-size. Default: {x:0, y:0}
+		 */
+		offset?: LabelOffset;
+		/**
+		 * Height of the domain label in pixels.
+		 * By leaving it to null, the label will be set to 2 times the height of the subDomain cell.
+		 * If you want to remove the label, set domainLabelFormat to "" (empty string), instead
+		 * of setting the label height to 0. Default: null
+		 * Valid values: any integer
+		 */
+		height?: number;
+	}
+}
+
+declare var CalHeatMap: CalHeatMap.CalHeatMapStatic;
diff --git a/cal-heatmap/tsconfig.json b/cal-heatmap/tsconfig.json
new file mode 100644
index 0000000000..8f0487a2e2
--- /dev/null
+++ b/cal-heatmap/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cal-heatmap-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/callsite/callsite-tests.ts b/callsite/callsite-tests.ts
index fcabcd8b50..079e7522e1 100644
--- a/callsite/callsite-tests.ts
+++ b/callsite/callsite-tests.ts
@@ -1,5 +1,4 @@
 
-///<reference path="callsite.d.ts" />
 
 import callsite = require("callsite");
 
diff --git a/callsite/callsite.d.ts b/callsite/callsite.d.ts
deleted file mode 100644
index ffaa5d7e6f..0000000000
--- a/callsite/callsite.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Type definitions for callsite 1.0.0
-// Project: https://github.com/tj/callsite
-// Definitions by: newclear <https://github.com/newclear>
-// Definitions: https://github.com/newclear/DefinitelyTyped
-
-declare module "callsite" {
-
-    namespace Callsite{
-
-        interface CallSite {
-            getThis(): any;
-            getTypeName(): string;
-            getFunctionName(): string;
-            getMethodName(): string;
-            getFileName(): string;
-            getLineNumber(): number;
-            getColumnNumber(): number;
-            getFunction(): Function;
-            getEvalOrigin(): string;
-            isNative(): boolean;
-            isToplevel(): boolean;
-            isEval(): boolean;
-            isConstructor(): boolean;
-        }
-    }
-
-    function Callsite(): Callsite.CallSite[];
-
-    export = Callsite;
-}
diff --git a/callsite/index.d.ts b/callsite/index.d.ts
new file mode 100644
index 0000000000..780ca8b0ab
--- /dev/null
+++ b/callsite/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for callsite 1.0.0
+// Project: https://github.com/tj/callsite
+// Definitions by: newclear <https://github.com/newclear>
+// Definitions: https://github.com/newclear/DefinitelyTyped
+
+
+
+declare namespace Callsite {
+
+    interface CallSite {
+        getThis(): any;
+        getTypeName(): string;
+        getFunctionName(): string;
+        getMethodName(): string;
+        getFileName(): string;
+        getLineNumber(): number;
+        getColumnNumber(): number;
+        getFunction(): Function;
+        getEvalOrigin(): string;
+        isNative(): boolean;
+        isToplevel(): boolean;
+        isEval(): boolean;
+        isConstructor(): boolean;
+    }
+}
+
+declare function Callsite(): Callsite.CallSite[];
+
+export = Callsite;
diff --git a/callsite/tsconfig.json b/callsite/tsconfig.json
new file mode 100644
index 0000000000..ce34e53195
--- /dev/null
+++ b/callsite/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "callsite-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/calq/calq-tests.ts b/calq/calq-tests.ts
index 6f8019261d..45d6d69e41 100644
--- a/calq/calq-tests.ts
+++ b/calq/calq-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="calq.d.ts" />
+
 function calq_base()
 {
     calq.init("bfff14a4e0225789be3d9d22c4bb42a1");
diff --git a/calq/calq.d.ts b/calq/index.d.ts
similarity index 100%
rename from calq/calq.d.ts
rename to calq/index.d.ts
diff --git a/calq/tsconfig.json b/calq/tsconfig.json
new file mode 100644
index 0000000000..95bf5b8356
--- /dev/null
+++ b/calq/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "calq-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/camel-case/camel-case-tests.ts b/camel-case/camel-case-tests.ts
index 4f40e11fb2..f26f7cdb85 100644
--- a/camel-case/camel-case-tests.ts
+++ b/camel-case/camel-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="camel-case.d.ts" />
 
 import camelCase = require('camel-case');
 
diff --git a/camel-case/camel-case.d.ts b/camel-case/camel-case.d.ts
deleted file mode 100644
index e2a4777f21..0000000000
--- a/camel-case/camel-case.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for camel-case
-// Project: https://github.com/blakeembrey/camel-case
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "camel-case" {
-	function camelCase(string: string, locale?: string): string;
-	export = camelCase;
-}
diff --git a/camel-case/index.d.ts b/camel-case/index.d.ts
new file mode 100644
index 0000000000..1345063e82
--- /dev/null
+++ b/camel-case/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for camel-case
+// Project: https://github.com/blakeembrey/camel-case
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function camelCase(string: string, locale?: string): string;
+export = camelCase;
diff --git a/camel-case/tsconfig.json b/camel-case/tsconfig.json
new file mode 100644
index 0000000000..6d379a9d5a
--- /dev/null
+++ b/camel-case/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "camel-case-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/camelcase/camelcase-tests.ts b/camelcase/camelcase-tests.ts
index 945f79abb4..aacb29481a 100644
--- a/camelcase/camelcase-tests.ts
+++ b/camelcase/camelcase-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./camelcase.d.ts" />
 
 import camelCase = require('camelcase');
 
diff --git a/camelcase/camelcase.d.ts b/camelcase/camelcase.d.ts
deleted file mode 100644
index 2edd71948a..0000000000
--- a/camelcase/camelcase.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Type definitions for camelcase
-// Project: https://github.com/sindresorhus/camelcase
-// Definitions by: Sam Verschueren <https://github.com/samverschueren>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "camelcase" {
-	function camelcase(...args: string[]): string;
-	namespace camelcase {}
-	export = camelcase;
-}
diff --git a/camelcase/index.d.ts b/camelcase/index.d.ts
new file mode 100644
index 0000000000..79705dd423
--- /dev/null
+++ b/camelcase/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for camelcase
+// Project: https://github.com/sindresorhus/camelcase
+// Definitions by: Sam Verschueren <https://github.com/samverschueren>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function camelcase(...args: string[]): string;
+declare namespace camelcase { }
+export = camelcase;
diff --git a/camelcase/tsconfig.json b/camelcase/tsconfig.json
new file mode 100644
index 0000000000..d2e2e7bbe8
--- /dev/null
+++ b/camelcase/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "camelcase-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/camljs/camljs-tests.ts b/camljs/camljs-tests.ts
index ddececcc52..12afd10fbb 100644
--- a/camljs/camljs-tests.ts
+++ b/camljs/camljs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="camljs.d.ts" />
+
 
 var caml = new CamlBuilder().Where()
 	.Any(
diff --git a/camljs/camljs.d.ts b/camljs/index.d.ts
similarity index 100%
rename from camljs/camljs.d.ts
rename to camljs/index.d.ts
diff --git a/camljs/tsconfig.json b/camljs/tsconfig.json
new file mode 100644
index 0000000000..b689c6af86
--- /dev/null
+++ b/camljs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "camljs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/camo/camo-tests.ts b/camo/camo-tests.ts
index 68b515a61c..31354dc945 100644
--- a/camo/camo-tests.ts
+++ b/camo/camo-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./camo.d.ts" />
 
 import {
 	connect,
diff --git a/camo/camo.d.ts b/camo/camo.d.ts
deleted file mode 100644
index 70f9817ffb..0000000000
--- a/camo/camo.d.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-// Type definitions for camo v0.11.4
-// Project: https://github.com/scottwrobinson/camo
-// Definitions by: Lucas Matías Ciruzzi <https://github.com/lucasmciruzzi>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "camo" {
-
-	type TypeOrArray<Type> = Type | Type[];
-
-	/**
-	 * Supported type constructors for document properties
-	 */
-	export type SchemaTypeConstructor =
-		TypeOrArray<StringConstructor> |
-		TypeOrArray<NumberConstructor> |
-		TypeOrArray<BooleanConstructor> |
-		TypeOrArray<DateConstructor> |
-		TypeOrArray<ObjectConstructor> |
-		TypeOrArray<ArrayConstructor>;
-
-	/**
-	 * Supported types for document properties
-	 */
-	export type SchemaType = TypeOrArray<string | number | boolean | Date | Object>;
-
-	/**
-	 * Document property with options
-	 */
-	export interface SchemaTypeOptions<Type> {
-		/**
-		 * Type of data
-		 */
-		type: SchemaTypeConstructor;
-		/**
-		 * Default value
-		 */
-		default?: Type;
-		/**
-		 * Min value (only with Number)
-		 */
-		min?: number;
-		/**
-		 * Max value (only with Number)
-		 */
-		max?: number;
-		/**
-		 * Posible options
-		 */
-		choices?: Type[];
-		/**
-		 * RegEx to match value
-		 */
-		match?: RegExp;
-		/**
-		 * Validation function
-		 *
-		 * @param	value	Value taken
-		 * @returns			true (validation ok) or false (validation wrong)
-		 */
-		validate?(value: Type): boolean;
-		/**
-		 * Unique value (like ids)
-		 */
-		unique?: boolean;
-		/**
-		 * Required field
-		 */
-		required?: boolean;
-	}
-
-	/**
-	 * Document property type or options
-	 */
-	export type SchemaTypeExtended = SchemaTypeConstructor | SchemaTypeOptions<SchemaType>;
-
-	/**
-	 * Schema passed to Document.create()
-	 */
-	interface DocumentSchema {
-		/**
-		 * Index signature
-		 */
-		[property: string]: SchemaType;
-		/**
-		 * Document id
-		 */
-		_id?: string;
-	}
-
-	/**
-	 * Camo document instance
-	 */
-	class DocumentInstance<Schema extends DocumentSchema> {
-		public save(): Promise<Schema>;
-		public loadOne(): Promise<Schema>;
-		public loadMany(): Promise<Schema>;
-		public delete(): Promise<Schema>;
-		public deleteOne(): Promise<Schema>;
-		public deleteMany(): Promise<Schema>;
-		public loadOneAndDelete(): Promise<Schema>;
-		public count(): Promise<Schema>;
-		public preValidate(): Promise<Schema>;
-		public postValidate(): Promise<Schema>;
-		public preSave(): Promise<Schema>;
-		public postSave(): Promise<Schema>;
-		public preDelete(): Promise<Schema>;
-		public postDelete(): Promise<Schema>;
-	}
-
-	/**
-	 * Camo document
-	 */
-	export class Document {
-		/**
-		 * Index signature
-		 */
-		[property: string]: SchemaTypeExtended | string | DocumentInstance<any>;
-		/**
-		 * Static method to define the collection name
-		 *
-		 * @returns		The collection name
-		 */
-		static collectionName(): string;
-		/**
-		 * Creates a camo document instance
-		 *
-		 * @returns		A camo document instance
-		 */
-		static create<Schema extends DocumentSchema>(schema: Schema): DocumentInstance<Schema>;
-	}
-
-	/**
-	 * Connect function
-	 *
-	 * @param	uri		Connection URI
-	 */
-	export function connect (uri: string): Promise<any>;
-
-}
diff --git a/camo/index.d.ts b/camo/index.d.ts
new file mode 100644
index 0000000000..168765f136
--- /dev/null
+++ b/camo/index.d.ts
@@ -0,0 +1,137 @@
+// Type definitions for camo v0.11.4
+// Project: https://github.com/scottwrobinson/camo
+// Definitions by: Lucas Matías Ciruzzi <https://github.com/lucasmciruzzi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+type TypeOrArray<Type> = Type | Type[];
+
+/**
+ * Supported type constructors for document properties
+ */
+export type SchemaTypeConstructor =
+    TypeOrArray<StringConstructor> |
+    TypeOrArray<NumberConstructor> |
+    TypeOrArray<BooleanConstructor> |
+    TypeOrArray<DateConstructor> |
+    TypeOrArray<ObjectConstructor> |
+    TypeOrArray<ArrayConstructor>;
+
+/**
+ * Supported types for document properties
+ */
+export type SchemaType = TypeOrArray<string | number | boolean | Date | Object>;
+
+/**
+ * Document property with options
+ */
+export interface SchemaTypeOptions<Type> {
+    /**
+     * Type of data
+     */
+    type: SchemaTypeConstructor;
+    /**
+     * Default value
+     */
+    default?: Type;
+    /**
+     * Min value (only with Number)
+     */
+    min?: number;
+    /**
+     * Max value (only with Number)
+     */
+    max?: number;
+    /**
+     * Posible options
+     */
+    choices?: Type[];
+    /**
+     * RegEx to match value
+     */
+    match?: RegExp;
+    /**
+     * Validation function
+     *
+     * @param	value	Value taken
+     * @returns			true (validation ok) or false (validation wrong)
+     */
+    validate?(value: Type): boolean;
+    /**
+     * Unique value (like ids)
+     */
+    unique?: boolean;
+    /**
+     * Required field
+     */
+    required?: boolean;
+}
+
+/**
+ * Document property type or options
+ */
+export type SchemaTypeExtended = SchemaTypeConstructor | SchemaTypeOptions<SchemaType>;
+
+/**
+ * Schema passed to Document.create()
+ */
+interface DocumentSchema {
+    /**
+     * Index signature
+     */
+    [property: string]: SchemaType;
+    /**
+     * Document id
+     */
+    _id?: string;
+}
+
+/**
+ * Camo document instance
+ */
+declare class DocumentInstance<Schema extends DocumentSchema> {
+    public save(): Promise<Schema>;
+    public loadOne(): Promise<Schema>;
+    public loadMany(): Promise<Schema>;
+    public delete(): Promise<Schema>;
+    public deleteOne(): Promise<Schema>;
+    public deleteMany(): Promise<Schema>;
+    public loadOneAndDelete(): Promise<Schema>;
+    public count(): Promise<Schema>;
+    public preValidate(): Promise<Schema>;
+    public postValidate(): Promise<Schema>;
+    public preSave(): Promise<Schema>;
+    public postSave(): Promise<Schema>;
+    public preDelete(): Promise<Schema>;
+    public postDelete(): Promise<Schema>;
+}
+
+/**
+ * Camo document
+ */
+export declare class Document {
+    /**
+     * Index signature
+     */
+    [property: string]: SchemaTypeExtended | string | DocumentInstance<any>;
+    /**
+     * Static method to define the collection name
+     *
+     * @returns		The collection name
+     */
+    static collectionName(): string;
+    /**
+     * Creates a camo document instance
+     *
+     * @returns		A camo document instance
+     */
+    static create<Schema extends DocumentSchema>(schema: Schema): DocumentInstance<Schema>;
+}
+
+/**
+ * Connect function
+ *
+ * @param	uri		Connection URI
+ */
+export declare function connect(uri: string): Promise<any>;
diff --git a/camo/tsconfig.json b/camo/tsconfig.json
new file mode 100644
index 0000000000..55ad8d4d21
--- /dev/null
+++ b/camo/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "camo-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/canvasjs/canvasjs-tests.ts b/canvasjs/canvasjs-tests.ts
index c9fe45e927..cfc67ab128 100644
--- a/canvasjs/canvasjs-tests.ts
+++ b/canvasjs/canvasjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="canvasjs.d.ts" />
+
 
 namespace CanvasJS.Tests {
     // Column Chart
diff --git a/canvasjs/canvasjs.d.ts b/canvasjs/index.d.ts
similarity index 100%
rename from canvasjs/canvasjs.d.ts
rename to canvasjs/index.d.ts
diff --git a/canvasjs/tsconfig.json b/canvasjs/tsconfig.json
new file mode 100644
index 0000000000..964a6e8955
--- /dev/null
+++ b/canvasjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "canvasjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/casperjs/casperjs.d.ts b/casperjs/casperjs.d.ts
deleted file mode 100644
index cfe345c72f..0000000000
--- a/casperjs/casperjs.d.ts
+++ /dev/null
@@ -1,312 +0,0 @@
-// Type definitions for CasperJS v1.0.0
-// Project: http://casperjs.org/
-// Definitions by: Jed Mao <https://github.com/jedmao>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../phantomjs/phantomjs.d.ts" />
-
-interface CasperModule {
-    create(options: CasperOptions): Casper;
-    selectXPath(expression: string): Object
-}
-
-interface EventEmitter {
-    removeAllFilters(filter: string): Casper;
-    setFilter(filter: string, cb: Function): boolean;
-}
-
-interface Casper extends EventEmitter {
-    test: Tester;
-
-	constructor (options: CasperOptions): Casper;
-
-	options: CasperOptions;
-	// Properties
-	__utils__: ClientUtils;
-
-	// Methods
-	back(): Casper;
-	base64encode(url: string, method?: string, data?: any): string;
-	bypass(nb: number): any;
-	click(selector: string): boolean;
-	clickLabel(label: string, tag?: string): boolean;
-	capture(targetFilePath: string, clipRect: ClipRect): Casper;
-	captureBase64(format: string): string;
-	captureBase64(format: string, area: string): string;
-	captureBase64(format: string, area: ClipRect): string;
-	captureBase64(format: string, area: any): string;
-	captureSelector(targetFile: string, selector: string): Casper;
-	clear(): Casper;
-	debugHTML(selector?: string, outer?: boolean): Casper;
-	debugPage(): Casper;
-	die(message: string, status?: number): Casper;
-	download(url: string, target?: string, method?: string, data?: any): Casper;
-    each<T>(array: T[], fn: (self: Casper, item: T, index: number) => void): Casper;
-	echo(message: string, style?: string): Casper;
-    evaluate<T>(fn: () => T, ...args: any[]): T
-    evaluateOrDie(fn: () => any, message?: string, status?: number): Casper;
-	exit(status?: number): Casper;
-	exists(selector: string): boolean;
-	fetchText(selector: string): string;
-	forward(): Casper;
-	log(message: string, level?: string, space?: string): Casper;
-	fill(selector: string, values: any, submit?: boolean): void;
-	fillSelectors(selector: string, values: any, submit?: boolean): void;
-	fillXPath(selector: string, values: any, submit?: boolean): void;
-	getCurrentUrl(): string;
-	getElementAttribute(selector: string, attribute: string): string;
-	getElementsAttribute(selector: string, attribute: string): string;
-	getElementBounds(selector: string): ElementBounds;
-	getElementsBounds(selector: string): ElementBounds[];
-	getElementInfo(selector: string): ElementInfo;
-	getElementsInfo(selector: string): ElementInfo;
-	getFormValues(selector: string): any;
-	getGlobal(name: string): any;
-	getHTML(selector?: string, outer?: boolean): string;
-	getPageContent(): string;
-	getTitle(): string;
-	mouseEvent(type: string, selector: string): boolean;
-	open(location: string, settings: OpenSettings): Casper;
-	reload(then?: (response: HttpResponse) => void): Casper;
-	repeat(times: number, then: Function): Casper;
-	resourceExists(test: Function): boolean;
-	resourceExists(test: string): boolean;
-	run(onComplete: Function, time?: number): Casper;
-	scrollTo(x: number, y: number): Casper;
-	scrollToBottom(): Casper;
-	sendKeys(selector: string, keys: string, options?: any): Casper;
-	setHttpAuth(username: string, password: string): Casper;
-	start(url?: string, then?: (response: HttpResponse) => void): Casper;
-	status(asString: boolean): any;
-	then(fn: (self?: Casper) => void): Casper;
-	thenBypass(nb: number): Casper;
-	thenBypassIf(condition: any, nb: number): Casper;
-	thenBypassUnless(condition: any, nb: number): Casper;
-	thenClick(selector: string): Casper;
-    thenEvaluate(fn: () => any, ...args: any[]): Casper;
-	thenOpen(location: string, then?: (response: HttpResponse) => void): Casper;
-	thenOpen(location: string, options?: OpenSettings, then?: (response: HttpResponse) => void): Casper;
-	thenOpenAndEvaluate(location: string, then?: Function, ...args: any[]): Casper;
-	toString(): string;
-	unwait(): Casper;
-	userAgent(agent: string): string;
-	viewport(width: number, height: number): Casper;
-	visible(selector: string): boolean;
-	wait(timeout: number, then?: Function): Casper;
-	waitFor(testFx: Function, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitForAlert(then: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitForPopup(urlPattern: string, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitForPopup(urlPattern: RegExp, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitForUrl(url: string, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitForUrl(url: RegExp, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitForSelector(selector: string, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitWhileSelector(selector: string, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitForResource(testFx: Function, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitForText(pattern: string, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitForText(pattern: RegExp, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitUntilVisible(selector: string, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	waitWhileVisible(selector: string, then?: Function, onTimeout?: Function, timeout?: number): Casper;
-	warn(message: string): Casper;
-	withFrame(frameInfo: string, then: Function): Casper;
-	withFrame(frameInfo: number, then: Function): Casper;
-	withPopup(popupInfo: string, step: Function): Casper;
-	withPopup(popupInfo: RegExp, step: Function): Casper;
-	zoom(factor: number): Casper;
-}
-
-interface HttpResponse {
-	contentType: string;
-	headers: any[];
-	id: number;
-	redirectURL: string;
-	stage: string;
-	status: number;
-	statusText: string;
-	time: string;
-	url: string;
-}
-
-interface OpenSettings {
-	method: string;
-	data: any;
-	headers: any;
-}
-
-interface ElementBounds {
-	top: number;
-	left: number;
-	width: number;
-	height: number;
-}
-
-interface ElementInfo {
-	nodeName: string;
-	attributes: any;
-	tag: string;
-	html: string;
-	text: string;
-	x: number;
-	y: number;
-	width: number;
-	height: number;
-	visible: boolean;
-}
-
-interface CasperOptions {
-	clientScripts?: any[];
-	exitOnError?: boolean;
-	httpStatusHandlers?: any;
-	logLevel?: string;
-	onAlert?: Function;
-	onDie?: Function;
-	onError?: Function;
-	onLoadError?: Function;
-	onPageInitialized?: Function;
-	onResourceReceived?: Function;
-	onResourceRequested?: Function;
-	onStepComplete?: Function;
-	onStepTimeout?: Function;
-	onTimeout?: Function;
-	onWaitTimeout?: Function;
-	page?: WebPage;
-	pageSettings?: any;
-	remoteScripts?: any[];
-	safeLogs?: boolean;
-	silentErrors?: boolean;
-	stepTimeout?: number;
-	timeout?: number;
-	verbose?: boolean;
-	viewportSize?: any;
-	retryTimeout?: number;
-	waitTimeout?: number;
-}
-
-interface ClientUtils {
-	echo(message: string): void;
-	encode(contents: string): void;
-	exists(selector: string): void;
-	findAll(selector: string): void;
-	findOne(selector: string): void;
-	getBase64(url: string, method?: string, data?: any): void;
-	getBinary(url: string, method?: string, data?: any): void;
-	getDocumentHeight(): void;
-	getElementBounds(selector: string): void;
-	getElementsBounds(selector: string): void;
-	getElementByXPath(expression: string, scope?: HTMLElement): void;
-	getElementsByXPath(expression: string, scope?: HTMLElement): void;
-	getFieldValue(inputName: string): void;
-	getFormValues(selector: string): void;
-	mouseEvent(type: string, selector: string): void;
-	removeElementsByXPath(expression: string): void;
-	sendAJAX(url: string, method?: string, data?: any, async?: boolean): void;
-	visible(selector: string): void;
-}
-
-interface Colorizer {
-	colorize(text: string, styleName: string): void;
-	format(text: string, style: any): void;
-}
-
-interface Tester {
-	assert(condition: boolean, message?: string): any;
-	assertDoesntExist(selector: string, message?: string): any;
-	assertElementCount(selctor: string, expected: number, message?: string): any;
-	assertEquals(testValue: any, expected: any, message?: string): any;
-	assertEval(fn: Function, message: string, arguments: any): any;
-	assertEvalEquals(fn: Function, expected: any, message?: string, arguments?: any): any;
-	assertExists(selector: string, message?: string): any;
-	assertFalsy(subject: any, message?: string): any;
-	assertField(inputName: string, expected: string, message?: string): any;
-	assertFieldName(inputName: string, expected: string, message?: string, options?: any): any;
-	assertFieldCSS(cssSelector: string, expected: string, message?: string): any;
-	assertFieldXPath(xpathSelector: string, expected: string, message?: string): any;
-	assertHttpStatus(status: number, message?: string): any;
-	assertMatch(subject: any, pattern: RegExp, message?: string): any;
-	assertNot(subject: any, message?: string): any;
-	assertNotEquals(testValue: any, expected: any, message?: string): any;
-	assertNotVisible(selector: string, message?: string): any;
-	assertRaises(fn: Function, args: any[], message?: string): any;
-	assertSelectorDoesntHaveText(selector: string, text: string, message?: string): any;
-	assertSelectorExists(selector: string, message?: string): any;
-	assertSelectorHasText(selector: string, text: string, message?: string): any;
-	assertResourceExists(testFx: Function, message?: string): any;
-	assertTextExists(expected: string, message?: string): any;
-	assertTextDoesntExist(unexpected: string, message: string): any;
-	assertTitle(expected: string, message?: string): any;
-	assertTitleMatch(pattern: RegExp, message?: string): any;
-	assertTruthy(subject: any, message?: string): any;
-	assertType(input: any, type: string, message?: string): any;
-	assertInstanceOf(input: any, ctor: Function, message?: string): any;
-	assertUrlMatch(pattern: string, message?: string): any;
-	assertUrlMatch(pattern: RegExp, message?: string): any;
-	assertVisible(selector: string, message?: string): any;
-
-    /* since 1.1 */
-    begin(description: string, planned: number, suite: Function): any;
-    begin(description: string, suite: Function): any;
-    begin(description: string, planned: number, config: Object): any;
-    begin(description: string, config: Object): any;
-
-	colorize(message: string, style: string): any;
-	comment(message: string): any;
-	done(expected?: number): any;
-	error(message: string): any;
-	fail(message: string): any;
-	formatMessage(message: string, style: string): any;
-	getFailures(): Cases;
-	getPasses(): Cases;
-	info(message: string): any;
-	pass(message: string): any;
-	renderResults(exit: boolean, status: number, save: string): any;
-
-	setup(fn: Function): any;
-	skip(nb: number, message: string): any;
-	tearDown(fn: Function): any;
-}
-
-interface Cases {
-	length: number;
-	cases: Case[];
-}
-
-interface Case {
-	success: boolean;
-	type: string;
-	standard: string;
-	file: string;
-	values: CaseValues;
-}
-
-interface CaseValues {
-	subject: boolean;
-	expected: boolean;
-}
-
-interface Utils {
-	betterTypeOf(input: any): any;
-	dump(value: any): any;
-	fileExt(file: string): any;
-	fillBlanks(text: string, pad: number): any;
-	format(f: string, ...args: any[]): any;
-	getPropertyPath(obj: any, path: string): any;
-	inherits(ctor: any, superCtor: any): any;
-	isArray(value: any): any;
-	isCasperObject(value: any): any;
-	isClipRect(value: any): any;
-	isFalsy(subject: any): any;
-	isFunction(value: any): any;
-	isJsFile(file: string): any;
-	isNull(value: any): any;
-	isNumber(value: any): any;
-	isObject(value: any): any;
-	isRegExp(value: any): any;
-	isString(value: any): any;
-	isTruthy(subject: any): any;
-	isType(what: any, type: string): any;
-	isUndefined(value: any): any;
-	isWebPage(what: any): any;
-	mergeObjects(origin: any, add: any): any;
-	node(name: string, attributes: any): any;
-	serialize(value: any): any;
-	unique(array: any[]): any;
-}
diff --git a/casperjs/index.d.ts b/casperjs/index.d.ts
new file mode 100644
index 0000000000..a3f456f238
--- /dev/null
+++ b/casperjs/index.d.ts
@@ -0,0 +1,312 @@
+// Type definitions for CasperJS v1.0.0
+// Project: http://casperjs.org/
+// Definitions by: Jed Mao <https://github.com/jedmao>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="phantomjs" />
+
+interface CasperModule {
+    create(options: CasperOptions): Casper;
+    selectXPath(expression: string): Object
+}
+
+interface EventEmitter {
+    removeAllFilters(filter: string): Casper;
+    setFilter(filter: string, cb: Function): boolean;
+}
+
+interface Casper extends EventEmitter {
+    test: Tester;
+
+	constructor (options: CasperOptions): Casper;
+
+	options: CasperOptions;
+	// Properties
+	__utils__: ClientUtils;
+
+	// Methods
+	back(): Casper;
+	base64encode(url: string, method?: string, data?: any): string;
+	bypass(nb: number): any;
+	click(selector: string): boolean;
+	clickLabel(label: string, tag?: string): boolean;
+	capture(targetFilePath: string, clipRect: ClipRect): Casper;
+	captureBase64(format: string): string;
+	captureBase64(format: string, area: string): string;
+	captureBase64(format: string, area: ClipRect): string;
+	captureBase64(format: string, area: any): string;
+	captureSelector(targetFile: string, selector: string): Casper;
+	clear(): Casper;
+	debugHTML(selector?: string, outer?: boolean): Casper;
+	debugPage(): Casper;
+	die(message: string, status?: number): Casper;
+	download(url: string, target?: string, method?: string, data?: any): Casper;
+    each<T>(array: T[], fn: (self: Casper, item: T, index: number) => void): Casper;
+	echo(message: string, style?: string): Casper;
+    evaluate<T>(fn: () => T, ...args: any[]): T
+    evaluateOrDie(fn: () => any, message?: string, status?: number): Casper;
+	exit(status?: number): Casper;
+	exists(selector: string): boolean;
+	fetchText(selector: string): string;
+	forward(): Casper;
+	log(message: string, level?: string, space?: string): Casper;
+	fill(selector: string, values: any, submit?: boolean): void;
+	fillSelectors(selector: string, values: any, submit?: boolean): void;
+	fillXPath(selector: string, values: any, submit?: boolean): void;
+	getCurrentUrl(): string;
+	getElementAttribute(selector: string, attribute: string): string;
+	getElementsAttribute(selector: string, attribute: string): string;
+	getElementBounds(selector: string): ElementBounds;
+	getElementsBounds(selector: string): ElementBounds[];
+	getElementInfo(selector: string): ElementInfo;
+	getElementsInfo(selector: string): ElementInfo;
+	getFormValues(selector: string): any;
+	getGlobal(name: string): any;
+	getHTML(selector?: string, outer?: boolean): string;
+	getPageContent(): string;
+	getTitle(): string;
+	mouseEvent(type: string, selector: string): boolean;
+	open(location: string, settings: OpenSettings): Casper;
+	reload(then?: (response: HttpResponse) => void): Casper;
+	repeat(times: number, then: Function): Casper;
+	resourceExists(test: Function): boolean;
+	resourceExists(test: string): boolean;
+	run(onComplete: Function, time?: number): Casper;
+	scrollTo(x: number, y: number): Casper;
+	scrollToBottom(): Casper;
+	sendKeys(selector: string, keys: string, options?: any): Casper;
+	setHttpAuth(username: string, password: string): Casper;
+	start(url?: string, then?: (response: HttpResponse) => void): Casper;
+	status(asString: boolean): any;
+	then(fn: (self?: Casper) => void): Casper;
+	thenBypass(nb: number): Casper;
+	thenBypassIf(condition: any, nb: number): Casper;
+	thenBypassUnless(condition: any, nb: number): Casper;
+	thenClick(selector: string): Casper;
+    thenEvaluate(fn: () => any, ...args: any[]): Casper;
+	thenOpen(location: string, then?: (response: HttpResponse) => void): Casper;
+	thenOpen(location: string, options?: OpenSettings, then?: (response: HttpResponse) => void): Casper;
+	thenOpenAndEvaluate(location: string, then?: Function, ...args: any[]): Casper;
+	toString(): string;
+	unwait(): Casper;
+	userAgent(agent: string): string;
+	viewport(width: number, height: number): Casper;
+	visible(selector: string): boolean;
+	wait(timeout: number, then?: Function): Casper;
+	waitFor(testFx: Function, then?: Function, onTimeout?: Function, timeout?: number): Casper;
+	waitForAlert(then: Function, onTimeout?: Function, timeout?: number): Casper;
+	waitForPopup(urlPattern: string, then?: Function, onTimeout?: Function, timeout?: number): Casper;
+	waitForPopup(urlPattern: RegExp, then?: Function, onTimeout?: Function, timeout?: number): Casper;
+	waitForUrl(url: string, then?: Function, onTimeout?: Function, timeout?: number): Casper;
+	waitForUrl(url: RegExp, then?: Function, onTimeout?: Function, timeout?: number): Casper;
+	waitForSelector(selector: string, then?: Function, onTimeout?: Function, timeout?: number): Casper;
+	waitWhileSelector(selector: string, then?: Function, onTimeout?: Function, timeout?: number): Casper;
+	waitForResource(testFx: Function, then?: Function, onTimeout?: Function, timeout?: number): Casper;
+	waitForText(pattern: string, then?: Function, onTimeout?: Function, timeout?: number): Casper;
+	waitForText(pattern: RegExp, then?: Function, onTimeout?: Function, timeout?: number): Casper;
+	waitUntilVisible(selector: string, then?: Function, onTimeout?: Function, timeout?: number): Casper;
+	waitWhileVisible(selector: string, then?: Function, onTimeout?: Function, timeout?: number): Casper;
+	warn(message: string): Casper;
+	withFrame(frameInfo: string, then: Function): Casper;
+	withFrame(frameInfo: number, then: Function): Casper;
+	withPopup(popupInfo: string, step: Function): Casper;
+	withPopup(popupInfo: RegExp, step: Function): Casper;
+	zoom(factor: number): Casper;
+}
+
+interface HttpResponse {
+	contentType: string;
+	headers: any[];
+	id: number;
+	redirectURL: string;
+	stage: string;
+	status: number;
+	statusText: string;
+	time: string;
+	url: string;
+}
+
+interface OpenSettings {
+	method: string;
+	data: any;
+	headers: any;
+}
+
+interface ElementBounds {
+	top: number;
+	left: number;
+	width: number;
+	height: number;
+}
+
+interface ElementInfo {
+	nodeName: string;
+	attributes: any;
+	tag: string;
+	html: string;
+	text: string;
+	x: number;
+	y: number;
+	width: number;
+	height: number;
+	visible: boolean;
+}
+
+interface CasperOptions {
+	clientScripts?: any[];
+	exitOnError?: boolean;
+	httpStatusHandlers?: any;
+	logLevel?: string;
+	onAlert?: Function;
+	onDie?: Function;
+	onError?: Function;
+	onLoadError?: Function;
+	onPageInitialized?: Function;
+	onResourceReceived?: Function;
+	onResourceRequested?: Function;
+	onStepComplete?: Function;
+	onStepTimeout?: Function;
+	onTimeout?: Function;
+	onWaitTimeout?: Function;
+	page?: WebPage;
+	pageSettings?: any;
+	remoteScripts?: any[];
+	safeLogs?: boolean;
+	silentErrors?: boolean;
+	stepTimeout?: number;
+	timeout?: number;
+	verbose?: boolean;
+	viewportSize?: any;
+	retryTimeout?: number;
+	waitTimeout?: number;
+}
+
+interface ClientUtils {
+	echo(message: string): void;
+	encode(contents: string): void;
+	exists(selector: string): void;
+	findAll(selector: string): void;
+	findOne(selector: string): void;
+	getBase64(url: string, method?: string, data?: any): void;
+	getBinary(url: string, method?: string, data?: any): void;
+	getDocumentHeight(): void;
+	getElementBounds(selector: string): void;
+	getElementsBounds(selector: string): void;
+	getElementByXPath(expression: string, scope?: HTMLElement): void;
+	getElementsByXPath(expression: string, scope?: HTMLElement): void;
+	getFieldValue(inputName: string): void;
+	getFormValues(selector: string): void;
+	mouseEvent(type: string, selector: string): void;
+	removeElementsByXPath(expression: string): void;
+	sendAJAX(url: string, method?: string, data?: any, async?: boolean): void;
+	visible(selector: string): void;
+}
+
+interface Colorizer {
+	colorize(text: string, styleName: string): void;
+	format(text: string, style: any): void;
+}
+
+interface Tester {
+	assert(condition: boolean, message?: string): any;
+	assertDoesntExist(selector: string, message?: string): any;
+	assertElementCount(selctor: string, expected: number, message?: string): any;
+	assertEquals(testValue: any, expected: any, message?: string): any;
+	assertEval(fn: Function, message: string, arguments: any): any;
+	assertEvalEquals(fn: Function, expected: any, message?: string, arguments?: any): any;
+	assertExists(selector: string, message?: string): any;
+	assertFalsy(subject: any, message?: string): any;
+	assertField(inputName: string, expected: string, message?: string): any;
+	assertFieldName(inputName: string, expected: string, message?: string, options?: any): any;
+	assertFieldCSS(cssSelector: string, expected: string, message?: string): any;
+	assertFieldXPath(xpathSelector: string, expected: string, message?: string): any;
+	assertHttpStatus(status: number, message?: string): any;
+	assertMatch(subject: any, pattern: RegExp, message?: string): any;
+	assertNot(subject: any, message?: string): any;
+	assertNotEquals(testValue: any, expected: any, message?: string): any;
+	assertNotVisible(selector: string, message?: string): any;
+	assertRaises(fn: Function, args: any[], message?: string): any;
+	assertSelectorDoesntHaveText(selector: string, text: string, message?: string): any;
+	assertSelectorExists(selector: string, message?: string): any;
+	assertSelectorHasText(selector: string, text: string, message?: string): any;
+	assertResourceExists(testFx: Function, message?: string): any;
+	assertTextExists(expected: string, message?: string): any;
+	assertTextDoesntExist(unexpected: string, message: string): any;
+	assertTitle(expected: string, message?: string): any;
+	assertTitleMatch(pattern: RegExp, message?: string): any;
+	assertTruthy(subject: any, message?: string): any;
+	assertType(input: any, type: string, message?: string): any;
+	assertInstanceOf(input: any, ctor: Function, message?: string): any;
+	assertUrlMatch(pattern: string, message?: string): any;
+	assertUrlMatch(pattern: RegExp, message?: string): any;
+	assertVisible(selector: string, message?: string): any;
+
+    /* since 1.1 */
+    begin(description: string, planned: number, suite: Function): any;
+    begin(description: string, suite: Function): any;
+    begin(description: string, planned: number, config: Object): any;
+    begin(description: string, config: Object): any;
+
+	colorize(message: string, style: string): any;
+	comment(message: string): any;
+	done(expected?: number): any;
+	error(message: string): any;
+	fail(message: string): any;
+	formatMessage(message: string, style: string): any;
+	getFailures(): Cases;
+	getPasses(): Cases;
+	info(message: string): any;
+	pass(message: string): any;
+	renderResults(exit: boolean, status: number, save: string): any;
+
+	setup(fn: Function): any;
+	skip(nb: number, message: string): any;
+	tearDown(fn: Function): any;
+}
+
+interface Cases {
+	length: number;
+	cases: Case[];
+}
+
+interface Case {
+	success: boolean;
+	type: string;
+	standard: string;
+	file: string;
+	values: CaseValues;
+}
+
+interface CaseValues {
+	subject: boolean;
+	expected: boolean;
+}
+
+interface Utils {
+	betterTypeOf(input: any): any;
+	dump(value: any): any;
+	fileExt(file: string): any;
+	fillBlanks(text: string, pad: number): any;
+	format(f: string, ...args: any[]): any;
+	getPropertyPath(obj: any, path: string): any;
+	inherits(ctor: any, superCtor: any): any;
+	isArray(value: any): any;
+	isCasperObject(value: any): any;
+	isClipRect(value: any): any;
+	isFalsy(subject: any): any;
+	isFunction(value: any): any;
+	isJsFile(file: string): any;
+	isNull(value: any): any;
+	isNumber(value: any): any;
+	isObject(value: any): any;
+	isRegExp(value: any): any;
+	isString(value: any): any;
+	isTruthy(subject: any): any;
+	isType(what: any, type: string): any;
+	isUndefined(value: any): any;
+	isWebPage(what: any): any;
+	mergeObjects(origin: any, add: any): any;
+	node(name: string, attributes: any): any;
+	serialize(value: any): any;
+	unique(array: any[]): any;
+}
diff --git a/casperjs/tsconfig.json b/casperjs/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/casperjs/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/chai-as-promised/chai-as-promised-tests.ts b/chai-as-promised/chai-as-promised-tests.ts
index 8685f953f2..b860a78dc8 100644
--- a/chai-as-promised/chai-as-promised-tests.ts
+++ b/chai-as-promised/chai-as-promised-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="chai-as-promised.d.ts" />
-/// <reference path="../promises-a-plus/promises-a-plus.d.ts" />
-/// <reference path="../q/Q.d.ts" />
+
+/// <reference types="promises-a-plus" />
+/// <reference types="Q" />
 
 import chai = require('chai');
 import chaiAsPromised = require('chai-as-promised');
diff --git a/chai-as-promised/chai-as-promised.d.ts b/chai-as-promised/chai-as-promised.d.ts
deleted file mode 100644
index 91a46f9033..0000000000
--- a/chai-as-promised/chai-as-promised.d.ts
+++ /dev/null
@@ -1,285 +0,0 @@
-// Type definitions for chai-as-promised
-// Project: https://github.com/domenic/chai-as-promised/
-// Definitions by: jt000 <https://github.com/jt000>, Yuki Kokubun <https://github.com/Kuniwak>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../chai/chai.d.ts" />
-/// <reference path="../promises-a-plus/promises-a-plus.d.ts" />
-
-declare module 'chai-as-promised' {
-    function chaiAsPromised(chai: any, utils: any): void;
-    namespace chaiAsPromised {}
-    export = chaiAsPromised;
-}
-
-declare namespace Chai {
-
-    // For BDD API
-    interface Assertion extends LanguageChains, NumericComparison, TypeComparison {
-        eventually: PromisedAssertion;
-        become(expected: any): PromisedAssertion;
-        fulfilled: PromisedAssertion;
-        rejected: PromisedAssertion;
-        rejectedWith(expected: any, message?: string | RegExp): PromisedAssertion;
-        notify(fn: Function): PromisedAssertion;
-    }
-
-    // Eventually does not have .then(), but PromisedAssertion have.
-    interface Eventually extends PromisedLanguageChains, PromisedNumericComparison, PromisedTypeComparison {
-        // From chai-as-promised
-        become(expected: PromisesAPlus.Thenable<any>): PromisedAssertion;
-        fulfilled: PromisedAssertion;
-        rejected: PromisedAssertion;
-        rejectedWith(expected: any, message?: string | RegExp): PromisedAssertion;
-        notify(fn: Function): PromisedAssertion;
-
-        // From chai
-        not: PromisedAssertion;
-        deep: PromisedDeep;
-        a: PromisedTypeComparison;
-        an: PromisedTypeComparison;
-        include: PromisedInclude;
-        contain: PromisedInclude;
-        ok: PromisedAssertion;
-        true: PromisedAssertion;
-        false: PromisedAssertion;
-        null: PromisedAssertion;
-        undefined: PromisedAssertion;
-        exist: PromisedAssertion;
-        empty: PromisedAssertion;
-        arguments: PromisedAssertion;
-        Arguments: PromisedAssertion;
-        equal: PromisedEqual;
-        equals: PromisedEqual;
-        eq: PromisedEqual;
-        eql: PromisedEqual;
-        eqls: PromisedEqual;
-        property: PromisedProperty;
-        ownProperty: PromisedOwnProperty;
-        haveOwnProperty: PromisedOwnProperty;
-        length: PromisedLength;
-        lengthOf: PromisedLength;
-        match(regexp: RegExp|string, message?: string): PromisedAssertion;
-        string(string: string, message?: string): PromisedAssertion;
-        keys: PromisedKeys;
-        key(string: string): PromisedAssertion;
-        throw: PromisedThrow;
-        throws: PromisedThrow;
-        Throw: PromisedThrow;
-        respondTo(method: string, message?: string): PromisedAssertion;
-        itself: PromisedAssertion;
-        satisfy(matcher: Function, message?: string): PromisedAssertion;
-        closeTo(expected: number, delta: number, message?: string): PromisedAssertion;
-        members: PromisedMembers;
-    }
-
-    interface PromisedAssertion extends Eventually, PromisesAPlus.Thenable<any> {
-    }
-
-    interface PromisedLanguageChains {
-        eventually: Eventually;
-
-        // From chai
-        to: PromisedAssertion;
-        be: PromisedAssertion;
-        been: PromisedAssertion;
-        is: PromisedAssertion;
-        that: PromisedAssertion;
-        which: PromisedAssertion;
-        and: PromisedAssertion;
-        has: PromisedAssertion;
-        have: PromisedAssertion;
-        with: PromisedAssertion;
-        at: PromisedAssertion;
-        of: PromisedAssertion;
-        same: PromisedAssertion;
-    }
-
-    interface PromisedNumericComparison {
-        above: PromisedNumberComparer;
-        gt: PromisedNumberComparer;
-        greaterThan: PromisedNumberComparer;
-        least: PromisedNumberComparer;
-        gte: PromisedNumberComparer;
-        below: PromisedNumberComparer;
-        lt: PromisedNumberComparer;
-        lessThan: PromisedNumberComparer;
-        most: PromisedNumberComparer;
-        lte: PromisedNumberComparer;
-        within(start: number, finish: number, message?: string): PromisedAssertion;
-    }
-
-    interface PromisedNumberComparer {
-        (value: number, message?: string): PromisedAssertion;
-    }
-
-    interface PromisedTypeComparison {
-        (type: string, message?: string): PromisedAssertion;
-        instanceof: PromisedInstanceOf;
-        instanceOf: PromisedInstanceOf;
-    }
-
-    interface PromisedInstanceOf {
-        (constructor: Object, message?: string): PromisedAssertion;
-    }
-
-    interface PromisedDeep {
-        equal: PromisedEqual;
-        include: PromisedInclude;
-        property: PromisedProperty;
-    }
-
-    interface PromisedEqual {
-        (value: any, message?: string): PromisedAssertion;
-    }
-
-    interface PromisedProperty {
-        (name: string, value?: any, message?: string): PromisedAssertion;
-    }
-
-    interface PromisedOwnProperty {
-        (name: string, message?: string): PromisedAssertion;
-    }
-
-    interface PromisedLength extends PromisedLanguageChains, PromisedNumericComparison {
-        (length: number, message?: string): PromisedAssertion;
-    }
-
-    interface PromisedInclude {
-        (value: Object, message?: string): PromisedAssertion;
-        (value: string, message?: string): PromisedAssertion;
-        (value: number, message?: string): PromisedAssertion;
-        keys: PromisedKeys;
-        members: PromisedMembers;
-    }
-
-    interface PromisedKeys {
-        (...keys: string[]): PromisedAssertion;
-        (keys: any[]): PromisedAssertion;
-    }
-
-    interface PromisedThrow {
-        (): PromisedAssertion;
-        (expected: string, message?: string): PromisedAssertion;
-        (expected: RegExp, message?: string): PromisedAssertion;
-        (constructor: Error, expected?: string, message?: string): PromisedAssertion;
-        (constructor: Error, expected?: RegExp, message?: string): PromisedAssertion;
-        (constructor: Function, expected?: string, message?: string): PromisedAssertion;
-        (constructor: Function, expected?: RegExp, message?: string): PromisedAssertion;
-    }
-
-    interface PromisedMembers {
-        (set: any[], message?: string): PromisedAssertion;
-    }
-
-    // For Assert API
-    interface Assert {
-        eventually: PromisedAssert;
-        isFulfilled(promise: PromisesAPlus.Thenable<any>, message?: string): PromisesAPlus.Thenable<void>;
-        becomes(promise: PromisesAPlus.Thenable<any>, expected: any, message?: string): PromisesAPlus.Thenable<void>;
-        doesNotBecome(promise: PromisesAPlus.Thenable<any>, expected: any, message?: string): PromisesAPlus.Thenable<void>;
-        isRejected(promise: PromisesAPlus.Thenable<any>, message?: string): PromisesAPlus.Thenable<void>;
-        isRejected(promise: PromisesAPlus.Thenable<any>, expected: any, message?: string): PromisesAPlus.Thenable<void>;
-        isRejected(promise: PromisesAPlus.Thenable<any>, match: RegExp, message?: string): PromisesAPlus.Thenable<void>;
-        notify(fn: Function): PromisesAPlus.Thenable<void>;
-    }
-
-    export interface PromisedAssert {
-        fail(actual?: any, expected?: any, msg?: string, operator?: string): PromisesAPlus.Thenable<void>;
-
-        ok(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        notOk(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-
-        equal(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
-        notEqual(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
-
-        strictEqual(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
-        notStrictEqual(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
-
-        deepEqual(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
-        notDeepEqual(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
-
-        isTrue(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        isFalse(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-
-        isNull(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        isNotNull(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-
-        isUndefined(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        isDefined(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-
-        isFunction(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        isNotFunction(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-
-        isObject(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        isNotObject(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-
-        isArray(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        isNotArray(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-
-        isString(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        isNotString(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-
-        isNumber(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        isNotNumber(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-
-        isBoolean(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        isNotBoolean(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-
-        typeOf(val: any, type: string, msg?: string): PromisesAPlus.Thenable<void>;
-        notTypeOf(val: any, type: string, msg?: string): PromisesAPlus.Thenable<void>;
-
-        instanceOf(val: any, type: Function, msg?: string): PromisesAPlus.Thenable<void>;
-        notInstanceOf(val: any, type: Function, msg?: string): PromisesAPlus.Thenable<void>;
-
-        include(exp: string, inc: any, msg?: string): PromisesAPlus.Thenable<void>;
-        include(exp: any[], inc: any, msg?: string): PromisesAPlus.Thenable<void>;
-
-        notInclude(exp: string, inc: any, msg?: string): PromisesAPlus.Thenable<void>;
-        notInclude(exp: any[], inc: any, msg?: string): PromisesAPlus.Thenable<void>;
-
-        match(exp: any, re: RegExp, msg?: string): PromisesAPlus.Thenable<void>;
-        notMatch(exp: any, re: RegExp, msg?: string): PromisesAPlus.Thenable<void>;
-
-        property(obj: Object, prop: string, msg?: string): PromisesAPlus.Thenable<void>;
-        notProperty(obj: Object, prop: string, msg?: string): PromisesAPlus.Thenable<void>;
-        deepProperty(obj: Object, prop: string, msg?: string): PromisesAPlus.Thenable<void>;
-        notDeepProperty(obj: Object, prop: string, msg?: string): PromisesAPlus.Thenable<void>;
-
-        propertyVal(obj: Object, prop: string, val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        propertyNotVal(obj: Object, prop: string, val: any, msg?: string): PromisesAPlus.Thenable<void>;
-
-        deepPropertyVal(obj: Object, prop: string, val: any, msg?: string): PromisesAPlus.Thenable<void>;
-        deepPropertyNotVal(obj: Object, prop: string, val: any, msg?: string): PromisesAPlus.Thenable<void>;
-
-        lengthOf(exp: any, len: number, msg?: string): PromisesAPlus.Thenable<void>;
-        //alias frenzy
-        throw(fn: Function, msg?: string): PromisesAPlus.Thenable<void>;
-        throw(fn: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
-        throw(fn: Function, errType: Function, msg?: string): PromisesAPlus.Thenable<void>;
-        throw(fn: Function, errType: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
-
-        throws(fn: Function, msg?: string): PromisesAPlus.Thenable<void>;
-        throws(fn: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
-        throws(fn: Function, errType: Function, msg?: string): PromisesAPlus.Thenable<void>;
-        throws(fn: Function, errType: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
-
-        Throw(fn: Function, msg?: string): PromisesAPlus.Thenable<void>;
-        Throw(fn: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
-        Throw(fn: Function, errType: Function, msg?: string): PromisesAPlus.Thenable<void>;
-        Throw(fn: Function, errType: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
-
-        doesNotThrow(fn: Function, msg?: string): PromisesAPlus.Thenable<void>;
-        doesNotThrow(fn: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
-        doesNotThrow(fn: Function, errType: Function, msg?: string): PromisesAPlus.Thenable<void>;
-        doesNotThrow(fn: Function, errType: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
-
-        operator(val: any, operator: string, val2: any, msg?: string): PromisesAPlus.Thenable<void>;
-        closeTo(act: number, exp: number, delta: number, msg?: string): PromisesAPlus.Thenable<void>;
-
-        sameMembers(set1: any[], set2: any[], msg?: string): PromisesAPlus.Thenable<void>;
-        includeMembers(set1: any[], set2: any[], msg?: string): PromisesAPlus.Thenable<void>;
-
-        ifError(val: any, msg?: string): PromisesAPlus.Thenable<void>;
-    }
-}
diff --git a/chai-as-promised/index.d.ts b/chai-as-promised/index.d.ts
new file mode 100644
index 0000000000..b4f3ca405d
--- /dev/null
+++ b/chai-as-promised/index.d.ts
@@ -0,0 +1,291 @@
+// Type definitions for chai-as-promised
+// Project: https://github.com/domenic/chai-as-promised/
+// Definitions by: jt000 <https://github.com/jt000>, Yuki Kokubun <https://github.com/Kuniwak>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="chai" />
+/// <reference types="promises-a-plus" />
+
+declare module 'chai-as-promised' {
+    function chaiAsPromised(chai: any, utils: any): void;
+    namespace chaiAsPromised {}
+    export = chaiAsPromised;
+}
+
+declare namespace Chai {
+
+    // For BDD API
+    interface Assertion extends LanguageChains, NumericComparison, TypeComparison {
+        eventually: PromisedAssertion;
+        become(expected: any): PromisedAssertion;
+        fulfilled: PromisedAssertion;
+        rejected: PromisedAssertion;
+        rejectedWith(expected: any, message?: string | RegExp): PromisedAssertion;
+        notify(fn: Function): PromisedAssertion;
+    }
+
+    // Eventually does not have .then(), but PromisedAssertion have.
+    interface Eventually extends PromisedLanguageChains, PromisedNumericComparison, PromisedTypeComparison {
+        // From chai-as-promised
+        become(expected: PromisesAPlus.Thenable<any>): PromisedAssertion;
+        fulfilled: PromisedAssertion;
+        rejected: PromisedAssertion;
+        rejectedWith(expected: any, message?: string | RegExp): PromisedAssertion;
+        notify(fn: Function): PromisedAssertion;
+
+        // From chai
+        not: PromisedAssertion;
+        deep: PromisedDeep;
+        all: PromisedKeyFilter;
+        a: PromisedTypeComparison;
+        an: PromisedTypeComparison;
+        include: PromisedInclude;
+        contain: PromisedInclude;
+        ok: PromisedAssertion;
+        true: PromisedAssertion;
+        false: PromisedAssertion;
+        null: PromisedAssertion;
+        undefined: PromisedAssertion;
+        exist: PromisedAssertion;
+        empty: PromisedAssertion;
+        arguments: PromisedAssertion;
+        Arguments: PromisedAssertion;
+        equal: PromisedEqual;
+        equals: PromisedEqual;
+        eq: PromisedEqual;
+        eql: PromisedEqual;
+        eqls: PromisedEqual;
+        property: PromisedProperty;
+        ownProperty: PromisedOwnProperty;
+        haveOwnProperty: PromisedOwnProperty;
+        length: PromisedLength;
+        lengthOf: PromisedLength;
+        match(regexp: RegExp|string, message?: string): PromisedAssertion;
+        string(string: string, message?: string): PromisedAssertion;
+        keys: PromisedKeys;
+        key(string: string): PromisedAssertion;
+        throw: PromisedThrow;
+        throws: PromisedThrow;
+        Throw: PromisedThrow;
+        respondTo(method: string, message?: string): PromisedAssertion;
+        itself: PromisedAssertion;
+        satisfy(matcher: Function, message?: string): PromisedAssertion;
+        closeTo(expected: number, delta: number, message?: string): PromisedAssertion;
+        members: PromisedMembers;
+    }
+
+    interface PromisedAssertion extends Eventually, PromisesAPlus.Thenable<any> {
+    }
+
+    interface PromisedLanguageChains {
+        eventually: Eventually;
+
+        // From chai
+        to: PromisedAssertion;
+        be: PromisedAssertion;
+        been: PromisedAssertion;
+        is: PromisedAssertion;
+        that: PromisedAssertion;
+        which: PromisedAssertion;
+        and: PromisedAssertion;
+        has: PromisedAssertion;
+        have: PromisedAssertion;
+        with: PromisedAssertion;
+        at: PromisedAssertion;
+        of: PromisedAssertion;
+        same: PromisedAssertion;
+    }
+
+    interface PromisedNumericComparison {
+        above: PromisedNumberComparer;
+        gt: PromisedNumberComparer;
+        greaterThan: PromisedNumberComparer;
+        least: PromisedNumberComparer;
+        gte: PromisedNumberComparer;
+        below: PromisedNumberComparer;
+        lt: PromisedNumberComparer;
+        lessThan: PromisedNumberComparer;
+        most: PromisedNumberComparer;
+        lte: PromisedNumberComparer;
+        within(start: number, finish: number, message?: string): PromisedAssertion;
+    }
+
+    interface PromisedNumberComparer {
+        (value: number, message?: string): PromisedAssertion;
+    }
+
+    interface PromisedTypeComparison {
+        (type: string, message?: string): PromisedAssertion;
+        instanceof: PromisedInstanceOf;
+        instanceOf: PromisedInstanceOf;
+    }
+
+    interface PromisedInstanceOf {
+        (constructor: Object, message?: string): PromisedAssertion;
+    }
+
+    interface PromisedDeep {
+        equal: PromisedEqual;
+        include: PromisedInclude;
+        property: PromisedProperty;
+    }
+
+    interface PromisedKeyFilter {
+        keys: PromisedKeys;
+    }
+
+    interface PromisedEqual {
+        (value: any, message?: string): PromisedAssertion;
+    }
+
+    interface PromisedProperty {
+        (name: string, value?: any, message?: string): PromisedAssertion;
+    }
+
+    interface PromisedOwnProperty {
+        (name: string, message?: string): PromisedAssertion;
+    }
+
+    interface PromisedLength extends PromisedLanguageChains, PromisedNumericComparison {
+        (length: number, message?: string): PromisedAssertion;
+    }
+
+    interface PromisedInclude {
+        (value: Object, message?: string): PromisedAssertion;
+        (value: string, message?: string): PromisedAssertion;
+        (value: number, message?: string): PromisedAssertion;
+        keys: PromisedKeys;
+        members: PromisedMembers;
+        all: PromisedKeyFilter;
+    }
+
+    interface PromisedKeys {
+        (...keys: string[]): PromisedAssertion;
+        (keys: any[]): PromisedAssertion;
+    }
+
+    interface PromisedThrow {
+        (): PromisedAssertion;
+        (expected: string, message?: string): PromisedAssertion;
+        (expected: RegExp, message?: string): PromisedAssertion;
+        (constructor: Error, expected?: string, message?: string): PromisedAssertion;
+        (constructor: Error, expected?: RegExp, message?: string): PromisedAssertion;
+        (constructor: Function, expected?: string, message?: string): PromisedAssertion;
+        (constructor: Function, expected?: RegExp, message?: string): PromisedAssertion;
+    }
+
+    interface PromisedMembers {
+        (set: any[], message?: string): PromisedAssertion;
+    }
+
+    // For Assert API
+    interface Assert {
+        eventually: PromisedAssert;
+        isFulfilled(promise: PromisesAPlus.Thenable<any>, message?: string): PromisesAPlus.Thenable<void>;
+        becomes(promise: PromisesAPlus.Thenable<any>, expected: any, message?: string): PromisesAPlus.Thenable<void>;
+        doesNotBecome(promise: PromisesAPlus.Thenable<any>, expected: any, message?: string): PromisesAPlus.Thenable<void>;
+        isRejected(promise: PromisesAPlus.Thenable<any>, message?: string): PromisesAPlus.Thenable<void>;
+        isRejected(promise: PromisesAPlus.Thenable<any>, expected: any, message?: string): PromisesAPlus.Thenable<void>;
+        isRejected(promise: PromisesAPlus.Thenable<any>, match: RegExp, message?: string): PromisesAPlus.Thenable<void>;
+        notify(fn: Function): PromisesAPlus.Thenable<void>;
+    }
+
+    export interface PromisedAssert {
+        fail(actual?: any, expected?: any, msg?: string, operator?: string): PromisesAPlus.Thenable<void>;
+
+        ok(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        notOk(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        equal(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
+        notEqual(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        strictEqual(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
+        notStrictEqual(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        deepEqual(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
+        notDeepEqual(act: any, exp: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        isTrue(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isFalse(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        isNull(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isNotNull(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        isUndefined(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isDefined(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        isFunction(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isNotFunction(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        isObject(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isNotObject(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        isArray(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isNotArray(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        isString(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isNotString(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        isNumber(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isNotNumber(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        isBoolean(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        isNotBoolean(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        typeOf(val: any, type: string, msg?: string): PromisesAPlus.Thenable<void>;
+        notTypeOf(val: any, type: string, msg?: string): PromisesAPlus.Thenable<void>;
+
+        instanceOf(val: any, type: Function, msg?: string): PromisesAPlus.Thenable<void>;
+        notInstanceOf(val: any, type: Function, msg?: string): PromisesAPlus.Thenable<void>;
+
+        include(exp: string, inc: any, msg?: string): PromisesAPlus.Thenable<void>;
+        include(exp: any[], inc: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        notInclude(exp: string, inc: any, msg?: string): PromisesAPlus.Thenable<void>;
+        notInclude(exp: any[], inc: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        match(exp: any, re: RegExp, msg?: string): PromisesAPlus.Thenable<void>;
+        notMatch(exp: any, re: RegExp, msg?: string): PromisesAPlus.Thenable<void>;
+
+        property(obj: Object, prop: string, msg?: string): PromisesAPlus.Thenable<void>;
+        notProperty(obj: Object, prop: string, msg?: string): PromisesAPlus.Thenable<void>;
+        deepProperty(obj: Object, prop: string, msg?: string): PromisesAPlus.Thenable<void>;
+        notDeepProperty(obj: Object, prop: string, msg?: string): PromisesAPlus.Thenable<void>;
+
+        propertyVal(obj: Object, prop: string, val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        propertyNotVal(obj: Object, prop: string, val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        deepPropertyVal(obj: Object, prop: string, val: any, msg?: string): PromisesAPlus.Thenable<void>;
+        deepPropertyNotVal(obj: Object, prop: string, val: any, msg?: string): PromisesAPlus.Thenable<void>;
+
+        lengthOf(exp: any, len: number, msg?: string): PromisesAPlus.Thenable<void>;
+        //alias frenzy
+        throw(fn: Function, msg?: string): PromisesAPlus.Thenable<void>;
+        throw(fn: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
+        throw(fn: Function, errType: Function, msg?: string): PromisesAPlus.Thenable<void>;
+        throw(fn: Function, errType: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
+
+        throws(fn: Function, msg?: string): PromisesAPlus.Thenable<void>;
+        throws(fn: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
+        throws(fn: Function, errType: Function, msg?: string): PromisesAPlus.Thenable<void>;
+        throws(fn: Function, errType: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
+
+        Throw(fn: Function, msg?: string): PromisesAPlus.Thenable<void>;
+        Throw(fn: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
+        Throw(fn: Function, errType: Function, msg?: string): PromisesAPlus.Thenable<void>;
+        Throw(fn: Function, errType: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
+
+        doesNotThrow(fn: Function, msg?: string): PromisesAPlus.Thenable<void>;
+        doesNotThrow(fn: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
+        doesNotThrow(fn: Function, errType: Function, msg?: string): PromisesAPlus.Thenable<void>;
+        doesNotThrow(fn: Function, errType: Function, regExp: RegExp): PromisesAPlus.Thenable<void>;
+
+        operator(val: any, operator: string, val2: any, msg?: string): PromisesAPlus.Thenable<void>;
+        closeTo(act: number, exp: number, delta: number, msg?: string): PromisesAPlus.Thenable<void>;
+
+        sameMembers(set1: any[], set2: any[], msg?: string): PromisesAPlus.Thenable<void>;
+        includeMembers(set1: any[], set2: any[], msg?: string): PromisesAPlus.Thenable<void>;
+
+        ifError(val: any, msg?: string): PromisesAPlus.Thenable<void>;
+    }
+}
diff --git a/chai-as-promised/tsconfig.json b/chai-as-promised/tsconfig.json
new file mode 100644
index 0000000000..faa3ff15be
--- /dev/null
+++ b/chai-as-promised/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "chai-as-promised-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/chai-datetime/chai-datetime-tests.ts b/chai-datetime/chai-datetime-tests.ts
index 5c15326f48..255d816b5a 100644
--- a/chai-datetime/chai-datetime-tests.ts
+++ b/chai-datetime/chai-datetime-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="chai-datetime.d.ts" />
 
 import chai = require('chai');
 import chaiDateTime = require('chai-datetime');
diff --git a/chai-datetime/chai-datetime.d.ts b/chai-datetime/chai-datetime.d.ts
deleted file mode 100644
index 16dd6b8856..0000000000
--- a/chai-datetime/chai-datetime.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// Type definitions for chai-datetime
-// Project: https://github.com/gaslight/chai-datetime.git
-// Definitions by: Cliff Burger <https://github.com/cliffburger/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../chai/chai.d.ts" />
-
-declare namespace Chai {
-
-    interface Assertion {
-        afterDate(date: Date): Assertion;
-        beforeDate(date: Date): Assertion;
-        equalDate(date: Date): Assertion;
-        afterTime(date: Date): Assertion;
-        beforeTime(date: Date): Assertion;
-        equalTime(date: Date): Assertion;
-    }
-
-    interface Assert {
-        equalTime(val: Date, exp: Date, msg?: string): void;
-        notEqualTime(val: Date, exp: Date, msg?: string): void;
-        beforeTime(val: Date, exp: Date, msg?: string): void;
-        notBeforeTime(val: Date, exp: Date, msg?: string): void;
-        afterTime(val: Date, exp: Date, msg?: string): void;
-        notAfterTime(val: Date, exp: Date, msg?: string): void;
-        equalDate(val: Date, exp: Date, msg?: string): void;
-        notEqualDate(val: Date, exp: Date, msg?: string): void;
-        beforeDate(val: Date, exp: Date, msg?: string): void;
-        notBeforeDate(val: Date, exp: Date, msg?: string): void;
-        afterDate(val: Date, exp: Date, msg?: string): void;
-        notAfterDate(val: Date, exp: Date, msg?: string): void;
-    }
-}
-
-interface Date {
-    should: Chai.Assertion;
-}
-
-declare module "chai-datetime" {
-    function chaiDateTime(chai: any, utils: any): void;
-    export = chaiDateTime;
-}
diff --git a/chai-datetime/index.d.ts b/chai-datetime/index.d.ts
new file mode 100644
index 0000000000..c008586cfe
--- /dev/null
+++ b/chai-datetime/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for chai-datetime
+// Project: https://github.com/gaslight/chai-datetime.git
+// Definitions by: Cliff Burger <https://github.com/cliffburger/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="chai" />
+
+declare function chaiDateTime(chai: any, utils: any): void;
+export = chaiDateTime;
+
+declare global {
+    namespace Chai {
+        interface Assertion {
+            afterDate(date: Date): Assertion;
+            beforeDate(date: Date): Assertion;
+            equalDate(date: Date): Assertion;
+            afterTime(date: Date): Assertion;
+            beforeTime(date: Date): Assertion;
+            equalTime(date: Date): Assertion;
+        }
+
+        interface Assert {
+            equalTime(val: Date, exp: Date, msg?: string): void;
+            notEqualTime(val: Date, exp: Date, msg?: string): void;
+            beforeTime(val: Date, exp: Date, msg?: string): void;
+            notBeforeTime(val: Date, exp: Date, msg?: string): void;
+            afterTime(val: Date, exp: Date, msg?: string): void;
+            notAfterTime(val: Date, exp: Date, msg?: string): void;
+            equalDate(val: Date, exp: Date, msg?: string): void;
+            notEqualDate(val: Date, exp: Date, msg?: string): void;
+            beforeDate(val: Date, exp: Date, msg?: string): void;
+            notBeforeDate(val: Date, exp: Date, msg?: string): void;
+            afterDate(val: Date, exp: Date, msg?: string): void;
+            notAfterDate(val: Date, exp: Date, msg?: string): void;
+        }
+    }
+
+    interface Date {
+        should: Chai.Assertion;
+    }
+}
diff --git a/chai-datetime/tsconfig.json b/chai-datetime/tsconfig.json
new file mode 100644
index 0000000000..4ecf86a4fb
--- /dev/null
+++ b/chai-datetime/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "chai-datetime-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/chai-fuzzy/chai-fuzzy-tests.ts b/chai-fuzzy/chai-fuzzy-tests.ts
index 292b25002d..42805a1869 100644
--- a/chai-fuzzy/chai-fuzzy-tests.ts
+++ b/chai-fuzzy/chai-fuzzy-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="chai-fuzzy.d.ts" />
 
 // tests taken from http://chaijs.com/plugins/chai-fuzzy
 
diff --git a/chai-fuzzy/chai-fuzzy.d.ts b/chai-fuzzy/chai-fuzzy.d.ts
deleted file mode 100644
index 163ce7dda7..0000000000
--- a/chai-fuzzy/chai-fuzzy.d.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-// Type definitions for chai-fuzzy 1.3.0
-// Project: http://chaijs.com/plugins/chai-fuzzy
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../chai/chai.d.ts" />
-
-declare namespace Chai {
-
-	interface Assertion {
-		/**
-		 * Compare object attributes and values rather than checking to see if
-		 * they're the same reference.
-		 */
-		like(expected: any, message?: string): Assertion;
-		/**
-		 * Compare object attributes and values rather than checking to see if
-		 * they're the same reference.
-		 */
-		notLike(expected: any, message?: string): Assertion;
-		/**
-		 * Check the first level of the container for a value like the one provided.
-		 */
-		containOneLike(expected: any, message?: string): Assertion;
-		/**
-		 * Check the first level of the container for a value like the one provided.
-		 */
-		notContainOneLike(expected: any, message?: string): Assertion;
-		/**
-		 * Check that the given javascript object is like the JSON-ified expected
-		 * value. Useful for checking stringification and parsing of an object.
-		 */
-		jsonOf(expected: any, message?: string): Assertion;
-		/**
-		 * Check that the given javascript object is like the JSON-ified expected
-		 * value. Useful for checking stringification and parsing of an object.
-		 */
-		notJsonOf(expected: any, message?: string): Assertion;
-	}
-
-	export interface Assert {
-		/**
-		 * Compare object attributes and values rather than checking to see if
-		 * they're the same reference.
-		 */
-		like(actual: any, expected: any, message?: string): void;
-		/**
-		 * Compare object attributes and values rather than checking to see if
-		 * they're the same reference.
-		 */
-		notLike(actual: any, expected: any, message?: string): void;
-		/**
-		 * Check the first level of the container for a value like the one provided.
-		 */
-		containOneLike(actual: any, expected: any, message?: string): void;
-		/**
-		 * Check the first level of the container for a value like the one provided.
-		 */
-		notContainOneLike(actual: any, expected: any, message?: string): void;
-		/**
-		 * Check that the given javascript object is like the JSON-ified expected
-		 * value. Useful for checking stringification and parsing of an object.
-		 */
-		jsonOf(actual: any, expected: any, message?: string): void;
-		/**
-		 * Check that the given javascript object is like the JSON-ified expected
-		 * value. Useful for checking stringification and parsing of an object.
-		 */
-		notJsonOf(actual: any, expected: any, message?: string): void;
-	}
-}
-
-declare module "chai-fuzzy" {
-	function chaiFuzzy(chai: any, utils: any): void;
-	export = chaiFuzzy;
-}
diff --git a/chai-fuzzy/index.d.ts b/chai-fuzzy/index.d.ts
new file mode 100644
index 0000000000..b4f8c1191c
--- /dev/null
+++ b/chai-fuzzy/index.d.ts
@@ -0,0 +1,76 @@
+// Type definitions for chai-fuzzy 1.3.0
+// Project: http://chaijs.com/plugins/chai-fuzzy
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="chai" />
+
+declare global {
+	namespace Chai {
+		interface Assertion {
+			/**
+			 * Compare object attributes and values rather than checking to see if
+			 * they're the same reference.
+			 */
+			like(expected: any, message?: string): Assertion;
+			/**
+			 * Compare object attributes and values rather than checking to see if
+			 * they're the same reference.
+			 */
+			notLike(expected: any, message?: string): Assertion;
+			/**
+			 * Check the first level of the container for a value like the one provided.
+			 */
+			containOneLike(expected: any, message?: string): Assertion;
+			/**
+			 * Check the first level of the container for a value like the one provided.
+			 */
+			notContainOneLike(expected: any, message?: string): Assertion;
+			/**
+			 * Check that the given javascript object is like the JSON-ified expected
+			 * value. Useful for checking stringification and parsing of an object.
+			 */
+			jsonOf(expected: any, message?: string): Assertion;
+			/**
+			 * Check that the given javascript object is like the JSON-ified expected
+			 * value. Useful for checking stringification and parsing of an object.
+			 */
+			notJsonOf(expected: any, message?: string): Assertion;
+		}
+
+		interface Assert {
+			/**
+			 * Compare object attributes and values rather than checking to see if
+			 * they're the same reference.
+			 */
+			like(actual: any, expected: any, message?: string): void;
+			/**
+			 * Compare object attributes and values rather than checking to see if
+			 * they're the same reference.
+			 */
+			notLike(actual: any, expected: any, message?: string): void;
+			/**
+			 * Check the first level of the container for a value like the one provided.
+			 */
+			containOneLike(actual: any, expected: any, message?: string): void;
+			/**
+			 * Check the first level of the container for a value like the one provided.
+			 */
+			notContainOneLike(actual: any, expected: any, message?: string): void;
+			/**
+			 * Check that the given javascript object is like the JSON-ified expected
+			 * value. Useful for checking stringification and parsing of an object.
+			 */
+			jsonOf(actual: any, expected: any, message?: string): void;
+			/**
+			 * Check that the given javascript object is like the JSON-ified expected
+			 * value. Useful for checking stringification and parsing of an object.
+			 */
+			notJsonOf(actual: any, expected: any, message?: string): void;
+		}
+	}
+}
+
+declare function chaiFuzzy(chai: any, utils: any): void;
+export = chaiFuzzy;
+
diff --git a/chai-fuzzy/tsconfig.json b/chai-fuzzy/tsconfig.json
new file mode 100644
index 0000000000..d0ab502b12
--- /dev/null
+++ b/chai-fuzzy/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "chai-fuzzy-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/chai-http/chai-http-tests.ts b/chai-http/chai-http-tests.ts
index 078a7799c6..369e5b8ee3 100644
--- a/chai-http/chai-http-tests.ts
+++ b/chai-http/chai-http-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../when/when.d.ts" />
-/// <reference path="chai-http.d.ts" />
+/// <reference types="when" />
+
 
 import fs = require('fs');
 import http = require('http');
diff --git a/chai-http/chai-http.d.ts b/chai-http/chai-http.d.ts
deleted file mode 100644
index a542081635..0000000000
--- a/chai-http/chai-http.d.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-// Type definitions for chai-http
-// Project: https://github.com/chaijs/chai-http
-// Definitions by: Wim Looman <https://github.com/Nemo157>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../chai/chai.d.ts" />
-
-declare namespace Chai {
-
-	interface ChaiStatic {
-		request: ChaiHttpRequest;
-	}
-
-	interface ChaiHttpRequest {
-		(server: any): ChaiHttp.Agent;
-		agent(server: any): ChaiHttp.Agent;
-		addPromises(promiseConstructor: any): void;
-	}
-
-	interface Assertion {
-		status(code: number): Assertion;
-		header(key: string, value?: string): Assertion;
-		header(key: string, value?: RegExp): Assertion;
-		headers: Assertion;
-		json: Assertion;
-		text: Assertion;
-		html: Assertion;
-		redirect: Assertion;
-		redirectTo(location: string): Assertion;
-		param(key: string, value?: string): Assertion;
-		cookie(key: string, value?: string): Assertion;
-	}
-
-	interface TypeComparison {
-		ip: Assertion;
-	}
-}
-
-declare namespace ChaiHttp {
-	interface Promise<T> {
-		then<U>(onFulfilled: (value: T) => U, onRejected?: (reason: any) => U): Promise<U>;
-	}
-
-	interface Response {
-		body: any;
-		type: string;
-		status: number;
-	}
-
-	interface Request extends FinishedRequest {
-		attach(field: string, file: string|Buffer, filename: string): Request;
-		set(field: string, val: string): Request;
-		query(params: Object): Request;
-		send(data: Object): Request;
-		auth(user: string, name: string): Request;
-		field(name: string, val: string): Request;
-		end(callback?: (err: any, res: Response) => void): FinishedRequest;
-	}
-
-	interface FinishedRequest {
-		then(success?: (res: Response) => void, failure?: (err: any) => void): FinishedRequest;
-		catch(failure?: (err: any) => void): FinishedRequest;
-	}
-
-	interface Agent {
-		get(url: string, callback?: (err: any, res: Response) => void): Request;
-		post(url: string, callback?: (err: any, res: Response) => void): Request;
-		put(url: string, callback?: (err: any, res: Response) => void): Request;
-		head(url: string, callback?: (err: any, res: Response) => void): Request;
-		del(url: string, callback?: (err: any, res: Response) => void): Request;
-		options(url: string, callback?: (err: any, res: Response) => void): Request;
-		patch(url: string, callback?: (err: any, res: Response) => void): Request;
-	}
-
-	interface TypeComparison {
-		ip: any;
-	}
-}
-
-declare module "chai-http" {
-	function chaiHttp(chai: any, utils: any): void;
-	export = chaiHttp;
-}
diff --git a/chai-http/index.d.ts b/chai-http/index.d.ts
new file mode 100644
index 0000000000..567f13e4e7
--- /dev/null
+++ b/chai-http/index.d.ts
@@ -0,0 +1,84 @@
+// Type definitions for chai-http
+// Project: https://github.com/chaijs/chai-http
+// Definitions by: Wim Looman <https://github.com/Nemo157>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+/// <reference types="chai" />
+
+declare namespace Chai {
+
+	interface ChaiStatic {
+		request: ChaiHttpRequest;
+	}
+
+	interface ChaiHttpRequest {
+		(server: any): ChaiHttp.Agent;
+		agent(server: any): ChaiHttp.Agent;
+		addPromises(promiseConstructor: any): void;
+	}
+
+	interface Assertion {
+		status(code: number): Assertion;
+		header(key: string, value?: string): Assertion;
+		header(key: string, value?: RegExp): Assertion;
+		headers: Assertion;
+		json: Assertion;
+		text: Assertion;
+		html: Assertion;
+		redirect: Assertion;
+		redirectTo(location: string): Assertion;
+		param(key: string, value?: string): Assertion;
+		cookie(key: string, value?: string): Assertion;
+	}
+
+	interface TypeComparison {
+		ip: Assertion;
+	}
+}
+
+declare namespace ChaiHttp {
+	interface Promise<T> {
+		then<U>(onFulfilled: (value: T) => U, onRejected?: (reason: any) => U): Promise<U>;
+	}
+
+	interface Response {
+		body: any;
+		type: string;
+		status: number;
+	}
+
+	interface Request extends FinishedRequest {
+		attach(field: string, file: string|Buffer, filename: string): Request;
+		set(field: string, val: string): Request;
+		query(params: Object): Request;
+		send(data: Object): Request;
+		auth(user: string, name: string): Request;
+		field(name: string, val: string): Request;
+		end(callback?: (err: any, res: Response) => void): FinishedRequest;
+	}
+
+	interface FinishedRequest {
+		then(success?: (res: Response) => void, failure?: (err: any) => void): FinishedRequest;
+		catch(failure?: (err: any) => void): FinishedRequest;
+	}
+
+	interface Agent {
+		get(url: string, callback?: (err: any, res: Response) => void): Request;
+		post(url: string, callback?: (err: any, res: Response) => void): Request;
+		put(url: string, callback?: (err: any, res: Response) => void): Request;
+		head(url: string, callback?: (err: any, res: Response) => void): Request;
+		del(url: string, callback?: (err: any, res: Response) => void): Request;
+		options(url: string, callback?: (err: any, res: Response) => void): Request;
+		patch(url: string, callback?: (err: any, res: Response) => void): Request;
+	}
+
+	interface TypeComparison {
+		ip: any;
+	}
+}
+
+declare module "chai-http" {
+	function chaiHttp(chai: any, utils: any): void;
+	export = chaiHttp;
+}
diff --git a/chai-http/tsconfig.json b/chai-http/tsconfig.json
new file mode 100644
index 0000000000..4453285f95
--- /dev/null
+++ b/chai-http/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "chai-http-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/chai-jquery/chai-jquery-tests.ts b/chai-jquery/chai-jquery-tests.ts
index 64f6b040b9..52c54ab7ee 100644
--- a/chai-jquery/chai-jquery-tests.ts
+++ b/chai-jquery/chai-jquery-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="chai-jquery.d.ts" />
+
 
 // tests taken from https://github.com/chaijs/chai-jquery
 
diff --git a/chai-jquery/chai-jquery.d.ts b/chai-jquery/chai-jquery.d.ts
deleted file mode 100644
index 3d287f30fc..0000000000
--- a/chai-jquery/chai-jquery.d.ts
+++ /dev/null
@@ -1,2580 +0,0 @@
-// Type definitions for chai-jquery 1.1.1
-// Project: https://github.com/chaijs/chai-jquery
-// Definitions by: Kazi Manzur Rashid <https://github.com/kazimanzurrashid/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../chai/chai.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace Chai {
-
-    interface Assertion {
-        attr: (name: string, value?: string) => Assertion;
-        css: (name: string, value?: string) => Assertion;
-        data: (name: string, value?: string) => Assertion;
-        class(className: string): Assertion;
-        id(id: string): Assertion;
-        html(html: string): Assertion;
-        text(text: string): Assertion;
-        value(text: string): Assertion;
-        (selector: string): Assertion;
-        visible: Assertion;
-        hidden: Assertion;
-        selected: Assertion;
-        checked: Assertion;
-        disabled: Assertion;
-        (selector: string): Assertion;
-    }
-}
-
-/**
- * Static members of chai-jquery (those on $ and jQuery themselves)
- */
-interface ChaiJQueryStatic {
-
-    /**
-     * Perform an asynchronous HTTP (Ajax) request.
-     *
-     * @param settings A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with $.ajaxSetup().
-     */
-    ajax(settings: JQueryAjaxSettings): JQueryXHR;
-    /**
-     * Perform an asynchronous HTTP (Ajax) request.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param settings A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with $.ajaxSetup().
-     */
-    ajax(url: string, settings?: JQueryAjaxSettings): JQueryXHR;
-
-    /**
-     * Handle custom Ajax options or modify existing options before each request is sent and before they are processed by $.ajax().
-     *
-     * @param dataTypes An optional string containing one or more space-separated dataTypes
-     * @param handler A handler to set default values for future Ajax requests.
-     */
-    ajaxPrefilter(dataTypes: string, handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void;
-    /**
-     * Handle custom Ajax options or modify existing options before each request is sent and before they are processed by $.ajax().
-     *
-     * @param handler A handler to set default values for future Ajax requests.
-     */
-    ajaxPrefilter(handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void;
-
-    ajaxSettings: JQueryAjaxSettings;
-
-    /**
-     * Set default values for future Ajax requests. Its use is not recommended.
-     *
-     * @param options A set of key/value pairs that configure the default Ajax request. All options are optional.
-     */
-    ajaxSetup(options: JQueryAjaxSettings): void;
-
-    /**
-     * Load data from the server using a HTTP GET request.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param success A callback function that is executed if the request succeeds.
-     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, or html).
-     */
-    get(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
-    /**
-     * Load data from the server using a HTTP GET request.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param data A plain object or string that is sent to the server with the request.
-     * @param success A callback function that is executed if the request succeeds.
-     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, or html).
-     */
-    get(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
-    /**
-     * Load JSON-encoded data from the server using a GET HTTP request.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param success A callback function that is executed if the request succeeds.
-     */
-    getJSON(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR;
-    /**
-     * Load JSON-encoded data from the server using a GET HTTP request.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param data A plain object or string that is sent to the server with the request.
-     * @param success A callback function that is executed if the request succeeds.
-     */
-    getJSON(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR;
-    /**
-     * Load a JavaScript file from the server using a GET HTTP request, then execute it.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param success A callback function that is executed if the request succeeds.
-     */
-    getScript(url: string, success?: (script: string, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR;
-
-    /**
-     * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request.
-     */
-    param: JQueryParam;
-
-    /**
-     * Load data from the server using a HTTP POST request.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but can be null in that case.
-     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
-     */
-    post(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
-    /**
-     * Load data from the server using a HTTP POST request.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param data A plain object or string that is sent to the server with the request.
-     * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but can be null in that case.
-     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
-     */
-    post(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
-
-    /**
-     * A multi-purpose callbacks list object that provides a powerful way to manage callback lists.
-     *
-     * @param flags An optional list of space-separated flags that change how the callback list behaves.
-     */
-    Callbacks(flags?: string): JQueryCallback;
-
-    /**
-     * Holds or releases the execution of jQuery's ready event.
-     *
-     * @param hold Indicates whether the ready hold is being requested or released
-     */
-    holdReady(hold: boolean): void;
-
-    /**
-     * Accepts a string containing a CSS selector which is then used to match a set of elements.
-     *
-     * @param selector A string containing a selector expression
-     * @param context A DOM Element, Document, or jQuery to use as context
-     */
-    (selector: string, context?: Element|JQuery): ChaiJQuery;
-    /**
-     * Accepts a string containing a CSS selector which is then used to match a set of elements.
-     *
-     * @param element A DOM element to wrap in a jQuery object.
-     */
-    (element: Element): ChaiJQuery;
-    /**
-     * Accepts a string containing a CSS selector which is then used to match a set of elements.
-     *
-     * @param elementArray An array containing a set of DOM elements to wrap in a jQuery object.
-     */
-    (elementArray: Element[]): ChaiJQuery;
-    /**
-     * Accepts a string containing a CSS selector which is then used to match a set of elements.
-     *
-     * @param object A plain object to wrap in a jQuery object.
-     */
-    (object: {}): ChaiJQuery;
-    /**
-     * Accepts a string containing a CSS selector which is then used to match a set of elements.
-     *
-     * @param object An existing jQuery object to clone.
-     */
-    (object: JQuery): ChaiJQuery;
-    /**
-     * Specify a function to execute when the DOM is fully loaded.
-     */
-    (): ChaiJQuery;
-
-    /**
-     * Creates DOM elements on the fly from the provided string of raw HTML.
-     *
-     * @param html A string of HTML to create on the fly. Note that this parses HTML, not XML.
-     * @param ownerDocument A document in which the new elements will be created.
-     */
-    (html: string, ownerDocument?: Document): ChaiJQuery;
-    /**
-     * Creates DOM elements on the fly from the provided string of raw HTML.
-     *
-     * @param html A string defining a single, standalone, HTML element (e.g. <div/> or <div></div>).
-     * @param attributes An object of attributes, events, and methods to call on the newly-created element.
-     */
-    (html: string, attributes: Object): ChaiJQuery;
-
-    /**
-     * Binds a function to be executed when the DOM has finished loading.
-     *
-     * @param callback A function to execute after the DOM is ready.
-     */
-    (callback: Function): ChaiJQuery;
-
-    /**
-     * Relinquish jQuery's control of the $ variable.
-     *
-     * @param removeAll A Boolean indicating whether to remove all jQuery variables from the global scope (including jQuery itself).
-     */
-    noConflict(removeAll?: boolean): Object;
-
-    /**
-     * Provides a way to execute callback functions based on one or more objects, usually Deferred objects that represent asynchronous events.
-     *
-     * @param deferreds One or more Deferred objects, or plain JavaScript objects.
-     */
-    when<T>(...deferreds: Array<T|JQueryPromise<T>/* as JQueryDeferred<T> */>): JQueryPromise<T>;
-
-    /**
-     * Hook directly into jQuery to override how particular CSS properties are retrieved or set, normalize CSS property naming, or create custom properties.
-     */
-    cssHooks: { [key: string]: any; };
-    cssNumber: any;
-
-    /**
-     * Store arbitrary data associated with the specified element. Returns the value that was set.
-     *
-     * @param element The DOM element to associate with the data.
-     * @param key A string naming the piece of data to set.
-     * @param value The new data value.
-     */
-    data<T>(element: Element, key: string, value: T): T;
-    /**
-     * Returns value at named data store for the element, as set by jQuery.data(element, name, value), or the full data store for the element.
-     *
-     * @param element The DOM element to associate with the data.
-     * @param key A string naming the piece of data to set.
-     */
-    data(element: Element, key: string): any;
-    /**
-     * Returns value at named data store for the element, as set by jQuery.data(element, name, value), or the full data store for the element.
-     *
-     * @param element The DOM element to associate with the data.
-     */
-    data(element: Element): any;
-
-    /**
-     * Execute the next function on the queue for the matched element.
-     *
-     * @param element A DOM element from which to remove and execute a queued function.
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     */
-    dequeue(element: Element, queueName?: string): void;
-
-    /**
-     * Determine whether an element has any jQuery data associated with it.
-     *
-     * @param element A DOM element to be checked for data.
-     */
-    hasData(element: Element): boolean;
-
-    /**
-     * Show the queue of functions to be executed on the matched element.
-     *
-     * @param element A DOM element to inspect for an attached queue.
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     */
-    queue(element: Element, queueName?: string): any[];
-    /**
-     * Manipulate the queue of functions to be executed on the matched element.
-     *
-     * @param element A DOM element where the array of queued functions is attached.
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @param newQueue An array of functions to replace the current queue contents.
-     */
-    queue(element: Element, queueName: string, newQueue: Function[]): ChaiJQuery;
-    /**
-     * Manipulate the queue of functions to be executed on the matched element.
-     *
-     * @param element A DOM element on which to add a queued function.
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @param callback The new function to add to the queue.
-     */
-    queue(element: Element, queueName: string, callback: Function): ChaiJQuery;
-
-    /**
-     * Remove a previously-stored piece of data.
-     *
-     * @param element A DOM element from which to remove data.
-     * @param name A string naming the piece of data to remove.
-     */
-    removeData(element: Element, name?: string): ChaiJQuery;
-
-    /**
-     * A constructor function that returns a chainable utility object with methods to register multiple callbacks into callback queues, invoke callback queues, and relay the success or failure state of any synchronous or asynchronous function.
-     *
-     * @param beforeStart A function that is called just before the constructor returns.
-     */
-    Deferred<T>(beforeStart?: (deferred: JQueryDeferred<T>) => any): JQueryDeferred<T>;
-
-    /**
-     * Effects
-     */
-    fx: {
-        tick: () => void;
-        /**
-         * The rate (in milliseconds) at which animations fire.
-         */
-        interval: number;
-        stop: () => void;
-        speeds: { slow: number; fast: number; };
-        /**
-         * Globally disable all animations.
-         */
-        off: boolean;
-        step: any;
-    };
-
-    /**
-     * Takes a function and returns a new one that will always have a particular context.
-     *
-     * @param fnction The function whose context will be changed.
-     * @param context The object to which the context (this) of the function should be set.
-     * @param additionalArguments Any number of arguments to be passed to the function referenced in the function argument.
-     */
-    proxy(fnction: (...args: any[]) => any, context: Object, ...additionalArguments: any[]): any;
-    /**
-     * Takes a function and returns a new one that will always have a particular context.
-     *
-     * @param context The object to which the context (this) of the function should be set.
-     * @param name The name of the function whose context will be changed (should be a property of the context object).
-     * @param additionalArguments Any number of arguments to be passed to the function named in the name argument.
-     */
-    proxy(context: Object, name: string, ...additionalArguments: any[]): any;
-
-    Event: JQueryEventConstructor;
-
-    /**
-     * Takes a string and throws an exception containing it.
-     *
-     * @param message The message to send out.
-     */
-    error(message: any): ChaiJQuery;
-
-    expr: any;
-    fn: any;  //TODO: Decide how we want to type this
-
-    isReady: boolean;
-
-    // Properties
-    support: JQuerySupport;
-
-    /**
-     * Check to see if a DOM element is a descendant of another DOM element.
-     *
-     * @param container The DOM element that may contain the other element.
-     * @param contained The DOM element that may be contained by (a descendant of) the other element.
-     */
-    contains(container: Element, contained: Element): boolean;
-
-    /**
-     * A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties.
-     *
-     * @param collection The object or array to iterate over.
-     * @param callback The function that will be executed on every object.
-     */
-    each<T>(
-        collection: T[],
-        callback: (indexInArray: number, valueOfElement: T) => any
-        ): any;
-
-    /**
-     * A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties.
-     *
-     * @param collection The object or array to iterate over.
-     * @param callback The function that will be executed on every object.
-     */
-    each(
-        collection: any,
-        callback: (indexInArray: any, valueOfElement: any) => any
-        ): any;
-
-    /**
-     * Merge the contents of two or more objects together into the first object.
-     *
-     * @param target An object that will receive the new properties if additional objects are passed in or that will extend the jQuery namespace if it is the sole argument.
-     * @param object1 An object containing additional properties to merge in.
-     * @param objectN Additional objects containing properties to merge in.
-     */
-    extend(target: any, object1?: any, ...objectN: any[]): any;
-    /**
-     * Merge the contents of two or more objects together into the first object.
-     *
-     * @param deep If true, the merge becomes recursive (aka. deep copy).
-     * @param target The object to extend. It will receive the new properties.
-     * @param object1 An object containing additional properties to merge in.
-     * @param objectN Additional objects containing properties to merge in.
-     */
-    extend(deep: boolean, target: any, object1?: any, ...objectN: any[]): any;
-
-    /**
-     * Execute some JavaScript code globally.
-     *
-     * @param code The JavaScript code to execute.
-     */
-    globalEval(code: string): any;
-
-    /**
-     * Finds the elements of an array which satisfy a filter function. The original array is not affected.
-     *
-     * @param array The array to search through.
-     * @param func The function to process each item against. The first argument to the function is the item, and the second argument is the index. The function should return a Boolean value.  this will be the global window object.
-     * @param invert If "invert" is false, or not provided, then the function returns an array consisting of all elements for which "callback" returns true. If "invert" is true, then the function returns an array consisting of all elements for which "callback" returns false.
-     */
-    grep<T>(array: T[], func: (elementOfArray: T, indexInArray: number) => boolean, invert?: boolean): T[];
-
-    /**
-     * Search for a specified value within an array and return its index (or -1 if not found).
-     *
-     * @param value The value to search for.
-     * @param array An array through which to search.
-     * @param fromIndex he index of the array at which to begin the search. The default is 0, which will search the whole array.
-     */
-    inArray<T>(value: T, array: T[], fromIndex?: number): number;
-
-    /**
-     * Determine whether the argument is an array.
-     *
-     * @param obj Object to test whether or not it is an array.
-     */
-    isArray(obj: any): boolean;
-    /**
-     * Check to see if an object is empty (contains no enumerable properties).
-     *
-     * @param obj The object that will be checked to see if it's empty.
-     */
-    isEmptyObject(obj: any): boolean;
-    /**
-     * Determine if the argument passed is a Javascript function object.
-     *
-     * @param obj Object to test whether or not it is a function.
-     */
-    isFunction(obj: any): boolean;
-    /**
-     * Determines whether its argument is a number.
-     *
-     * @param obj The value to be tested.
-     */
-    isNumeric(value: any): boolean;
-    /**
-     * Check to see if an object is a plain object (created using "{}" or "new Object").
-     *
-     * @param obj The object that will be checked to see if it's a plain object.
-     */
-    isPlainObject(obj: any): boolean;
-    /**
-     * Determine whether the argument is a window.
-     *
-     * @param obj Object to test whether or not it is a window.
-     */
-    isWindow(obj: any): boolean;
-    /**
-     * Check to see if a DOM node is within an XML document (or is an XML document).
-     *
-     * @param node he DOM node that will be checked to see if it's in an XML document.
-     */
-    isXMLDoc(node: Node): boolean;
-
-    /**
-     * Convert an array-like object into a true JavaScript array.
-     *
-     * @param obj Any object to turn into a native Array.
-     */
-    makeArray(obj: any): any[];
-
-    /**
-     * Translate all items in an array or object to new array of items.
-     *
-     * @param array The Array to translate.
-     * @param callback The function to process each item against. The first argument to the function is the array item, the second argument is the index in array The function can return any value. Within the function, this refers to the global (window) object.
-     */
-    map<T, U>(array: T[], callback: (elementOfArray: T, indexInArray: number) => U): U[];
-    /**
-     * Translate all items in an array or object to new array of items.
-     *
-     * @param arrayOrObject The Array or Object to translate.
-     * @param callback The function to process each item against. The first argument to the function is the value; the second argument is the index or key of the array or object property. The function can return any value to add to the array. A returned array will be flattened into the resulting array. Within the function, this refers to the global (window) object.
-     */
-    map(arrayOrObject: any, callback: (value: any, indexOrKey: any) => any): any;
-
-    /**
-     * Merge the contents of two arrays together into the first array.
-     *
-     * @param first The first array to merge, the elements of second added.
-     * @param second The second array to merge into the first, unaltered.
-     */
-    merge<T>(first: T[], second: T[]): T[];
-
-    /**
-     * An empty function.
-     */
-    noop(): any;
-
-    /**
-     * Return a number representing the current time.
-     */
-    now(): number;
-
-    /**
-     * Takes a well-formed JSON string and returns the resulting JavaScript object.
-     *
-     * @param json The JSON string to parse.
-     */
-    parseJSON(json: string): any;
-
-    /**
-     * Parses a string into an XML document.
-     *
-     * @param data a well-formed XML string to be parsed
-     */
-    parseXML(data: string): XMLDocument;
-
-    /**
-     * Remove the whitespace from the beginning and end of a string.
-     *
-     * @param str Remove the whitespace from the beginning and end of a string.
-     */
-    trim(str: string): string;
-
-    /**
-     * Determine the internal JavaScript [[Class]] of an object.
-     *
-     * @param obj Object to get the internal JavaScript [[Class]] of.
-     */
-    type(obj: any): string;
-
-    /**
-     * Sorts an array of DOM elements, in place, with the duplicates removed. Note that this only works on arrays of DOM elements, not strings or numbers.
-     *
-     * @param array The Array of DOM elements.
-     */
-    unique(array: Element[]): Element[];
-
-    /**
-     * Parses a string into an array of DOM nodes.
-     *
-     * @param data HTML string to be parsed
-     * @param context DOM element to serve as the context in which the HTML fragment will be created
-     * @param keepScripts A Boolean indicating whether to include scripts passed in the HTML string
-     */
-    parseHTML(data: string, context?: HTMLElement, keepScripts?: boolean): any[];
-
-    /**
-     * Parses a string into an array of DOM nodes.
-     *
-     * @param data HTML string to be parsed
-     * @param context DOM element to serve as the context in which the HTML fragment will be created
-     * @param keepScripts A Boolean indicating whether to include scripts passed in the HTML string
-     */
-    parseHTML(data: string, context?: Document, keepScripts?: boolean): any[];
-}
-
-/**
- * The chai-jquery instance members
- */
-interface ChaiJQuery {
-    /**
-     * Register a handler to be called when Ajax requests complete. This is an AjaxEvent.
-     *
-     * @param handler The function to be invoked.
-     */
-    ajaxComplete(handler: (event: JQueryEventObject, XMLHttpRequest: XMLHttpRequest, ajaxOptions: any) => any): ChaiJQuery;
-    /**
-     * Register a handler to be called when Ajax requests complete with an error. This is an Ajax Event.
-     *
-     * @param handler The function to be invoked.
-     */
-    ajaxError(handler: (event: JQueryEventObject, jqXHR: JQueryXHR, ajaxSettings: JQueryAjaxSettings, thrownError: any) => any): ChaiJQuery;
-    /**
-     * Attach a function to be executed before an Ajax request is sent. This is an Ajax Event.
-     *
-     * @param handler The function to be invoked.
-     */
-    ajaxSend(handler: (event: JQueryEventObject, jqXHR: JQueryXHR, ajaxOptions: JQueryAjaxSettings) => any): ChaiJQuery;
-    /**
-     * Register a handler to be called when the first Ajax request begins. This is an Ajax Event.
-     *
-     * @param handler The function to be invoked.
-     */
-    ajaxStart(handler: () => any): ChaiJQuery;
-    /**
-     * Register a handler to be called when all Ajax requests have completed. This is an Ajax Event.
-     *
-     * @param handler The function to be invoked.
-     */
-    ajaxStop(handler: () => any): ChaiJQuery;
-    /**
-     * Attach a function to be executed whenever an Ajax request completes successfully. This is an Ajax Event.
-     *
-     * @param handler The function to be invoked.
-     */
-    ajaxSuccess(handler: (event: JQueryEventObject, XMLHttpRequest: XMLHttpRequest, ajaxOptions: JQueryAjaxSettings) => any): ChaiJQuery;
-
-    /**
-     * Load data from the server and place the returned HTML into the matched element.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param data A plain object or string that is sent to the server with the request.
-     * @param complete A callback function that is executed when the request completes.
-     */
-    load(url: string, data?: string|Object, complete?: (responseText: string, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any): ChaiJQuery;
-
-    /**
-     * Encode a set of form elements as a string for submission.
-     */
-    serialize(): string;
-    /**
-     * Encode a set of form elements as an array of names and values.
-     */
-    serializeArray(): JQuerySerializeArrayElement[];
-
-    /**
-     * Adds the specified class(es) to each of the set of matched elements.
-     *
-     * @param className One or more space-separated classes to be added to the class attribute of each matched element.
-     */
-    addClass(className: string): ChaiJQuery;
-    /**
-     * Adds the specified class(es) to each of the set of matched elements.
-     *
-     * @param function A function returning one or more space-separated class names to be added to the existing class name(s). Receives the index position of the element in the set and the existing class name(s) as arguments. Within the function, this refers to the current element in the set.
-     */
-    addClass(func: (index: number, className: string) => string): ChaiJQuery;
-
-    /**
-     * Add the previous set of elements on the stack to the current set, optionally filtered by a selector.
-     */
-    addBack(selector?: string): ChaiJQuery;
-
-    /**
-     * Get the value of an attribute for the first element in the set of matched elements.
-     *
-     * @param attributeName The name of the attribute to get.
-     */
-    attr(attributeName: string): string;
-    /**
-     * Set one or more attributes for the set of matched elements.
-     *
-     * @param attributeName The name of the attribute to set.
-     * @param value A value to set for the attribute.
-     */
-    attr(attributeName: string, value: string|number): ChaiJQuery;
-    /**
-     * Set one or more attributes for the set of matched elements.
-     *
-     * @param attributeName The name of the attribute to set.
-     * @param func A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old attribute value as arguments.
-     */
-    attr(attributeName: string, func: (index: number, attr: string) => string|number): ChaiJQuery;
-    /**
-     * Set one or more attributes for the set of matched elements.
-     *
-     * @param attributes An object of attribute-value pairs to set.
-     */
-    attr(attributes: Object): ChaiJQuery;
-
-    /**
-     * Determine whether any of the matched elements are assigned the given class.
-     *
-     * @param className The class name to search for.
-     */
-    hasClass(className: string): boolean;
-
-    /**
-     * Get the HTML contents of the first element in the set of matched elements.
-     */
-    html(): string;
-    /**
-     * Set the HTML contents of each element in the set of matched elements.
-     *
-     * @param htmlString A string of HTML to set as the content of each matched element.
-     */
-    html(htmlString: string): ChaiJQuery;
-    /**
-     * Set the HTML contents of each element in the set of matched elements.
-     *
-     * @param func A function returning the HTML content to set. Receives the index position of the element in the set and the old HTML value as arguments. jQuery empties the element before calling the function; use the oldhtml argument to reference the previous content. Within the function, this refers to the current element in the set.
-     */
-    html(func: (index: number, oldhtml: string) => string): ChaiJQuery;
-    /**
-     * Set the HTML contents of each element in the set of matched elements.
-     *
-     * @param func A function returning the HTML content to set. Receives the index position of the element in the set and the old HTML value as arguments. jQuery empties the element before calling the function; use the oldhtml argument to reference the previous content. Within the function, this refers to the current element in the set.
-     */
-
-    /**
-     * Get the value of a property for the first element in the set of matched elements.
-     *
-     * @param propertyName The name of the property to get.
-     */
-    prop(propertyName: string): any;
-    /**
-     * Set one or more properties for the set of matched elements.
-     *
-     * @param propertyName The name of the property to set.
-     * @param value A value to set for the property.
-     */
-    prop(propertyName: string, value: string|number|boolean): ChaiJQuery;
-    /**
-     * Set one or more properties for the set of matched elements.
-     *
-     * @param properties An object of property-value pairs to set.
-     */
-    prop(properties: Object): ChaiJQuery;
-    /**
-     * Set one or more properties for the set of matched elements.
-     *
-     * @param propertyName The name of the property to set.
-     * @param func A function returning the value to set. Receives the index position of the element in the set and the old property value as arguments. Within the function, the keyword this refers to the current element.
-     */
-    prop(propertyName: string, func: (index: number, oldPropertyValue: any) => any): ChaiJQuery;
-
-    /**
-     * Remove an attribute from each element in the set of matched elements.
-     *
-     * @param attributeName An attribute to remove; as of version 1.7, it can be a space-separated list of attributes.
-     */
-    removeAttr(attributeName: string): ChaiJQuery;
-
-    /**
-     * Remove a single class, multiple classes, or all classes from each element in the set of matched elements.
-     *
-     * @param className One or more space-separated classes to be removed from the class attribute of each matched element.
-     */
-    removeClass(className?: string): ChaiJQuery;
-    /**
-     * Remove a single class, multiple classes, or all classes from each element in the set of matched elements.
-     *
-     * @param function A function returning one or more space-separated class names to be removed. Receives the index position of the element in the set and the old class value as arguments.
-     */
-    removeClass(func: (index: number, className: string) => string): ChaiJQuery;
-
-    /**
-     * Remove a property for the set of matched elements.
-     *
-     * @param propertyName The name of the property to remove.
-     */
-    removeProp(propertyName: string): ChaiJQuery;
-
-    /**
-     * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.
-     *
-     * @param className One or more class names (separated by spaces) to be toggled for each element in the matched set.
-     * @param swtch A Boolean (not just truthy/falsy) value to determine whether the class should be added or removed.
-     */
-    toggleClass(className: string, swtch?: boolean): ChaiJQuery;
-    /**
-     * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.
-     *
-     * @param swtch A boolean value to determine whether the class should be added or removed.
-     */
-    toggleClass(swtch?: boolean): ChaiJQuery;
-    /**
-     * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.
-     *
-     * @param func A function that returns class names to be toggled in the class attribute of each element in the matched set. Receives the index position of the element in the set, the old class value, and the switch as arguments.
-     * @param swtch A boolean value to determine whether the class should be added or removed.
-     */
-    toggleClass(func: (index: number, className: string, swtch: boolean) => string, swtch?: boolean): ChaiJQuery;
-
-    /**
-     * Get the current value of the first element in the set of matched elements.
-     */
-    val(): any;
-    /**
-     * Set the value of each element in the set of matched elements.
-     *
-     * @param value A string of text or an array of strings corresponding to the value of each matched element to set as selected/checked.
-     */
-    val(value: string|string[]): ChaiJQuery;
-    /**
-     * Set the value of each element in the set of matched elements.
-     *
-     * @param func A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old value as arguments.
-     */
-    val(func: (index: number, value: string) => string): ChaiJQuery;
-
-
-    /**
-     * Get the value of style properties for the first element in the set of matched elements.
-     *
-     * @param propertyName A CSS property.
-     */
-    css(propertyName: string): string;
-    /**
-     * Set one or more CSS properties for the set of matched elements.
-     *
-     * @param propertyName A CSS property name.
-     * @param value A value to set for the property.
-     */
-    css(propertyName: string, value: string|number): ChaiJQuery;
-    /**
-     * Set one or more CSS properties for the set of matched elements.
-     *
-     * @param propertyName A CSS property name.
-     * @param value A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old value as arguments.
-     */
-    css(propertyName: string, value: (index: number, value: string) => string|number): ChaiJQuery;
-    /**
-     * Set one or more CSS properties for the set of matched elements.
-     *
-     * @param properties An object of property-value pairs to set.
-     */
-    css(properties: Object): ChaiJQuery;
-
-    /**
-     * Get the current computed height for the first element in the set of matched elements.
-     */
-    height(): number;
-    /**
-     * Set the CSS height of every matched element.
-     *
-     * @param value An integer representing the number of pixels, or an integer with an optional unit of measure appended (as a string).
-     */
-    height(value: number|string): ChaiJQuery;
-    /**
-     * Set the CSS height of every matched element.
-     *
-     * @param func A function returning the height to set. Receives the index position of the element in the set and the old height as arguments. Within the function, this refers to the current element in the set.
-     */
-    height(func: (index: number, height: number) => number|string): ChaiJQuery;
-
-    /**
-     * Get the current computed height for the first element in the set of matched elements, including padding but not border.
-     */
-    innerHeight(): number;
-
-    /**
-     * Sets the inner height on elements in the set of matched elements, including padding but not border.
-     *
-     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
-     */
-    innerHeight(height: number|string): ChaiJQuery;
-
-    /**
-     * Get the current computed width for the first element in the set of matched elements, including padding but not border.
-     */
-    innerWidth(): number;
-
-    /**
-     * Sets the inner width on elements in the set of matched elements, including padding but not border.
-     *
-     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
-     */
-    innerWidth(width: number|string): ChaiJQuery;
-
-    /**
-     * Get the current coordinates of the first element in the set of matched elements, relative to the document.
-     */
-    offset(): JQueryCoordinates;
-    /**
-     * An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
-     *
-     * @param coordinates An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
-     */
-    offset(coordinates: JQueryCoordinates): ChaiJQuery;
-    /**
-     * An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
-     *
-     * @param func A function to return the coordinates to set. Receives the index of the element in the collection as the first argument and the current coordinates as the second argument. The function should return an object with the new top and left properties.
-     */
-    offset(func: (index: number, coords: JQueryCoordinates) => JQueryCoordinates): ChaiJQuery;
-
-    /**
-     * Get the current computed height for the first element in the set of matched elements, including padding, border, and optionally margin. Returns an integer (without "px") representation of the value or null if called on an empty set of elements.
-     *
-     * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation.
-     */
-    outerHeight(includeMargin?: boolean): number;
-
-    /**
-     * Sets the outer height on elements in the set of matched elements, including padding and border.
-     *
-     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
-     */
-    outerHeight(height: number|string): ChaiJQuery;
-
-    /**
-     * Get the current computed width for the first element in the set of matched elements, including padding and border.
-     *
-     * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation.
-     */
-    outerWidth(includeMargin?: boolean): number;
-
-    /**
-     * Sets the outer width on elements in the set of matched elements, including padding and border.
-     *
-     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
-     */
-    outerWidth(width: number|string): ChaiJQuery;
-
-    /**
-     * Get the current coordinates of the first element in the set of matched elements, relative to the offset parent.
-     */
-    position(): JQueryCoordinates;
-
-    /**
-     * Get the current horizontal position of the scroll bar for the first element in the set of matched elements or set the horizontal position of the scroll bar for every matched element.
-     */
-    scrollLeft(): number;
-    /**
-     * Set the current horizontal position of the scroll bar for each of the set of matched elements.
-     *
-     * @param value An integer indicating the new position to set the scroll bar to.
-     */
-    scrollLeft(value: number): ChaiJQuery;
-
-    /**
-     * Get the current vertical position of the scroll bar for the first element in the set of matched elements or set the vertical position of the scroll bar for every matched element.
-     */
-    scrollTop(): number;
-    /**
-     * Set the current vertical position of the scroll bar for each of the set of matched elements.
-     *
-     * @param value An integer indicating the new position to set the scroll bar to.
-     */
-    scrollTop(value: number): ChaiJQuery;
-
-    /**
-     * Get the current computed width for the first element in the set of matched elements.
-     */
-    width(): number;
-    /**
-     * Set the CSS width of each element in the set of matched elements.
-     *
-     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
-     */
-    width(value: number|string): ChaiJQuery;
-    /**
-     * Set the CSS width of each element in the set of matched elements.
-     *
-     * @param func A function returning the width to set. Receives the index position of the element in the set and the old width as arguments. Within the function, this refers to the current element in the set.
-     */
-    width(func: (index: number, width: number) => number|string): ChaiJQuery;
-
-    /**
-     * Remove from the queue all items that have not yet been run.
-     *
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     */
-    clearQueue(queueName?: string): ChaiJQuery;
-
-    /**
-     * Store arbitrary data associated with the matched elements.
-     *
-     * @param key A string naming the piece of data to set.
-     * @param value The new data value; it can be any Javascript type including Array or Object.
-     */
-    data(key: string, value: any): ChaiJQuery;
-    /**
-     * Store arbitrary data associated with the matched elements.
-     *
-     * @param obj An object of key-value pairs of data to update.
-     */
-    data(obj: { [key: string]: any; }): ChaiJQuery;
-    /**
-     * Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute.
-     *
-     * @param key Name of the data stored.
-     */
-    data(key: string): any;
-    /**
-     * Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute.
-     */
-    data(): any;
-
-    /**
-     * Execute the next function on the queue for the matched elements.
-     *
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     */
-    dequeue(queueName?: string): ChaiJQuery;
-
-    /**
-     * Remove a previously-stored piece of data.
-     *
-     * @param name A string naming the piece of data to delete or space-separated string naming the pieces of data to delete.
-     */
-    removeData(name: string): ChaiJQuery;
-    /**
-     * Remove a previously-stored piece of data.
-     *
-     * @param list An array of strings naming the pieces of data to delete.
-     */
-    removeData(list: string[]): ChaiJQuery;
-
-    /**
-     * Return a Promise object to observe when all actions of a certain type bound to the collection, queued or not, have finished.
-     *
-     * @param type The type of queue that needs to be observed. (default: fx)
-     * @param target Object onto which the promise methods have to be attached
-     */
-    promise(type?: string, target?: Object): JQueryPromise<any>;
-
-    /**
-     * Perform a custom animation of a set of CSS properties.
-     *
-     * @param properties An object of CSS properties and values that the animation will move toward.
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     */
-    animate(properties: Object, duration?: string|number, complete?: Function): ChaiJQuery;
-    /**
-     * Perform a custom animation of a set of CSS properties.
-     *
-     * @param properties An object of CSS properties and values that the animation will move toward.
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition. (default: swing)
-     * @param complete A function to call once the animation is complete.
-     */
-    animate(properties: Object, duration?: string|number, easing?: string, complete?: Function): ChaiJQuery;
-    /**
-     * Perform a custom animation of a set of CSS properties.
-     *
-     * @param properties An object of CSS properties and values that the animation will move toward.
-     * @param options A map of additional options to pass to the method.
-     */
-    animate(properties: Object, options: JQueryAnimationOptions): ChaiJQuery;
-
-    /**
-     * Set a timer to delay execution of subsequent items in the queue.
-     *
-     * @param duration An integer indicating the number of milliseconds to delay execution of the next item in the queue.
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     */
-    delay(duration: number, queueName?: string): ChaiJQuery;
-
-    /**
-     * Display the matched elements by fading them to opaque.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     */
-    fadeIn(duration?: number|string, complete?: Function): ChaiJQuery;
-    /**
-     * Display the matched elements by fading them to opaque.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     */
-    fadeIn(duration?: number|string, easing?: string, complete?: Function): ChaiJQuery;
-    /**
-     * Display the matched elements by fading them to opaque.
-     *
-     * @param options A map of additional options to pass to the method.
-     */
-    fadeIn(options: JQueryAnimationOptions): ChaiJQuery;
-
-    /**
-     * Hide the matched elements by fading them to transparent.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     */
-    fadeOut(duration?: number|string, complete?: Function): ChaiJQuery;
-    /**
-     * Hide the matched elements by fading them to transparent.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     */
-    fadeOut(duration?: number|string, easing?: string, complete?: Function): ChaiJQuery;
-    /**
-     * Hide the matched elements by fading them to transparent.
-     *
-     * @param options A map of additional options to pass to the method.
-     */
-    fadeOut(options: JQueryAnimationOptions): ChaiJQuery;
-
-    /**
-     * Adjust the opacity of the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param opacity A number between 0 and 1 denoting the target opacity.
-     * @param complete A function to call once the animation is complete.
-     */
-    fadeTo(duration: string|number, opacity: number, complete?: Function): ChaiJQuery;
-    /**
-     * Adjust the opacity of the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param opacity A number between 0 and 1 denoting the target opacity.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     */
-    fadeTo(duration: string|number, opacity: number, easing?: string, complete?: Function): ChaiJQuery;
-
-    /**
-     * Display or hide the matched elements by animating their opacity.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     */
-    fadeToggle(duration?: number|string, complete?: Function): ChaiJQuery;
-    /**
-     * Display or hide the matched elements by animating their opacity.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     */
-    fadeToggle(duration?: number|string, easing?: string, complete?: Function): ChaiJQuery;
-    /**
-     * Display or hide the matched elements by animating their opacity.
-     *
-     * @param options A map of additional options to pass to the method.
-     */
-    fadeToggle(options: JQueryAnimationOptions): ChaiJQuery;
-
-    /**
-     * Stop the currently-running animation, remove all queued animations, and complete all animations for the matched elements.
-     *
-     * @param queue The name of the queue in which to stop animations.
-     */
-    finish(queue?: string): ChaiJQuery;
-
-    /**
-     * Hide the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     */
-    hide(duration?: number|string, complete?: Function): ChaiJQuery;
-    /**
-     * Hide the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     */
-    hide(duration?: number|string, easing?: string, complete?: Function): ChaiJQuery;
-    /**
-     * Hide the matched elements.
-     *
-     * @param options A map of additional options to pass to the method.
-     */
-    hide(options: JQueryAnimationOptions): ChaiJQuery;
-
-    /**
-     * Display the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     */
-    show(duration?: number|string, complete?: Function): ChaiJQuery;
-    /**
-     * Display the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     */
-    show(duration?: number|string, easing?: string, complete?: Function): ChaiJQuery;
-    /**
-     * Display the matched elements.
-     *
-     * @param options A map of additional options to pass to the method.
-     */
-    show(options: JQueryAnimationOptions): ChaiJQuery;
-
-    /**
-     * Display the matched elements with a sliding motion.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     */
-    slideDown(duration?: number|string, complete?: Function): ChaiJQuery;
-    /**
-     * Display the matched elements with a sliding motion.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     */
-    slideDown(duration?: number|string, easing?: string, complete?: Function): ChaiJQuery;
-    /**
-     * Display the matched elements with a sliding motion.
-     *
-     * @param options A map of additional options to pass to the method.
-     */
-    slideDown(options: JQueryAnimationOptions): ChaiJQuery;
-
-    /**
-     * Display or hide the matched elements with a sliding motion.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     */
-    slideToggle(duration?: number|string, complete?: Function): ChaiJQuery;
-    /**
-     * Display or hide the matched elements with a sliding motion.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     */
-    slideToggle(duration?: number|string, easing?: string, complete?: Function): ChaiJQuery;
-    /**
-     * Display or hide the matched elements with a sliding motion.
-     *
-     * @param options A map of additional options to pass to the method.
-     */
-    slideToggle(options: JQueryAnimationOptions): ChaiJQuery;
-
-    /**
-     * Hide the matched elements with a sliding motion.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     */
-    slideUp(duration?: number|string, complete?: Function): ChaiJQuery;
-    /**
-     * Hide the matched elements with a sliding motion.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     */
-    slideUp(duration?: number|string, easing?: string, complete?: Function): ChaiJQuery;
-    /**
-     * Hide the matched elements with a sliding motion.
-     *
-     * @param options A map of additional options to pass to the method.
-     */
-    slideUp(options: JQueryAnimationOptions): ChaiJQuery;
-
-    /**
-     * Stop the currently-running animation on the matched elements.
-     *
-     * @param clearQueue A Boolean indicating whether to remove queued animation as well. Defaults to false.
-     * @param jumpToEnd A Boolean indicating whether to complete the current animation immediately. Defaults to false.
-     */
-    stop(clearQueue?: boolean, jumpToEnd?: boolean): ChaiJQuery;
-    /**
-     * Stop the currently-running animation on the matched elements.
-     *
-     * @param queue The name of the queue in which to stop animations.
-     * @param clearQueue A Boolean indicating whether to remove queued animation as well. Defaults to false.
-     * @param jumpToEnd A Boolean indicating whether to complete the current animation immediately. Defaults to false.
-     */
-    stop(queue?: string, clearQueue?: boolean, jumpToEnd?: boolean): ChaiJQuery;
-
-    /**
-     * Display or hide the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     */
-    toggle(duration?: number|string, complete?: Function): ChaiJQuery;
-    /**
-     * Display or hide the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     */
-    toggle(duration?: number|string, easing?: string, complete?: Function): ChaiJQuery;
-    /**
-     * Display or hide the matched elements.
-     *
-     * @param options A map of additional options to pass to the method.
-     */
-    toggle(options: JQueryAnimationOptions): ChaiJQuery;
-    /**
-     * Display or hide the matched elements.
-     *
-     * @param showOrHide A Boolean indicating whether to show or hide the elements.
-     */
-    toggle(showOrHide: boolean): ChaiJQuery;
-
-    /**
-     * Attach a handler to an event for the elements.
-     *
-     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    bind(eventType: string, eventData: any, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Attach a handler to an event for the elements.
-     *
-     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    bind(eventType: string, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Attach a handler to an event for the elements.
-     *
-     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param preventBubble Setting the third argument to false will attach a function that prevents the default action from occurring and stops the event from bubbling. The default is true.
-     */
-    bind(eventType: string, eventData: any, preventBubble: boolean): ChaiJQuery;
-    /**
-     * Attach a handler to an event for the elements.
-     *
-     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
-     * @param preventBubble Setting the third argument to false will attach a function that prevents the default action from occurring and stops the event from bubbling. The default is true.
-     */
-    bind(eventType: string, preventBubble: boolean): ChaiJQuery;
-    /**
-     * Attach a handler to an event for the elements.
-     *
-     * @param events An object containing one or more DOM event types and functions to execute for them.
-     */
-    bind(events: any): ChaiJQuery;
-
-    /**
-     * Trigger the "blur" event on an element
-     */
-    blur(): ChaiJQuery;
-    /**
-     * Bind an event handler to the "blur" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    blur(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to the "blur" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    blur(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-
-    /**
-     * Trigger the "change" event on an element.
-     */
-    change(): ChaiJQuery;
-    /**
-     * Bind an event handler to the "change" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    change(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to the "change" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    change(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-
-    /**
-     * Trigger the "click" event on an element.
-     */
-    click(): ChaiJQuery;
-    /**
-     * Bind an event handler to the "click" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     */
-    click(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to the "click" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    click(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-
-    /**
-     * Trigger the "dblclick" event on an element.
-     */
-    dblclick(): ChaiJQuery;
-    /**
-     * Bind an event handler to the "dblclick" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    dblclick(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to the "dblclick" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    dblclick(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-
-    delegate(selector: any, eventType: string, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    delegate(selector: any, eventType: string, eventData: any, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-
-    /**
-     * Trigger the "focus" event on an element.
-     */
-    focus(): ChaiJQuery;
-    /**
-     * Bind an event handler to the "focus" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    focus(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to the "focus" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    focus(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-
-    /**
-     * Bind an event handler to the "focusin" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    focusin(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to the "focusin" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    focusin(eventData: Object, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-
-    /**
-     * Bind an event handler to the "focusout" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    focusout(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to the "focusout" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    focusout(eventData: Object, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-
-    /**
-     * Bind two handlers to the matched elements, to be executed when the mouse pointer enters and leaves the elements.
-     *
-     * @param handlerIn A function to execute when the mouse pointer enters the element.
-     * @param handlerOut A function to execute when the mouse pointer leaves the element.
-     */
-    hover(handlerIn: (eventObject: JQueryEventObject) => any, handlerOut: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Bind a single handler to the matched elements, to be executed when the mouse pointer enters or leaves the elements.
-     *
-     * @param handlerInOut A function to execute when the mouse pointer enters or leaves the element.
-     */
-    hover(handlerInOut: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-
-    /**
-     * Trigger the "keydown" event on an element.
-     */
-    keydown(): ChaiJQuery;
-    /**
-     * Bind an event handler to the "keydown" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    keydown(handler: (eventObject: JQueryKeyEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to the "keydown" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    keydown(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): ChaiJQuery;
-
-    /**
-     * Trigger the "keypress" event on an element.
-     */
-    keypress(): ChaiJQuery;
-    /**
-     * Bind an event handler to the "keypress" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    keypress(handler: (eventObject: JQueryKeyEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to the "keypress" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    keypress(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): ChaiJQuery;
-
-    /**
-     * Trigger the "keyup" event on an element.
-     */
-    keyup(): ChaiJQuery;
-    /**
-     * Bind an event handler to the "keyup" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    keyup(handler: (eventObject: JQueryKeyEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to the "keyup" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    keyup(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): ChaiJQuery;
-
-    /**
-     * Bind an event handler to the "load" JavaScript event.
-     *
-     * @param handler A function to execute when the event is triggered.
-     */
-    load(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to the "load" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     */
-    load(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-
-    /**
-     * Trigger the "mousedown" event on an element.
-     */
-    mousedown(): ChaiJQuery;
-    /**
-     * Bind an event handler to the "mousedown" JavaScript event.
-     *
-     * @param handler A function to execute when the event is triggered.
-     */
-    mousedown(handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to the "mousedown" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     */
-    mousedown(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
-
-    /**
-     * Trigger the "mouseenter" event on an element.
-     */
-    mouseenter(): ChaiJQuery;
-    /**
-     * Bind an event handler to be fired when the mouse enters an element.
-     *
-     * @param handler A function to execute when the event is triggered.
-     */
-    mouseenter(handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to be fired when the mouse enters an element.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     */
-    mouseenter(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
-
-    /**
-     * Trigger the "mouseleave" event on an element.
-     */
-    mouseleave(): ChaiJQuery;
-    /**
-     * Bind an event handler to be fired when the mouse leaves an element.
-     *
-     * @param handler A function to execute when the event is triggered.
-     */
-    mouseleave(handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to be fired when the mouse leaves an element.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     */
-    mouseleave(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
-
-    /**
-     * Trigger the "mousemove" event on an element.
-     */
-    mousemove(): ChaiJQuery;
-    /**
-     * Bind an event handler to the "mousemove" JavaScript event.
-     *
-     * @param handler A function to execute when the event is triggered.
-     */
-    mousemove(handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to the "mousemove" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     */
-    mousemove(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
-
-    /**
-     * Trigger the "mouseout" event on an element.
-     */
-    mouseout(): ChaiJQuery;
-    /**
-     * Bind an event handler to the "mouseout" JavaScript event.
-     *
-     * @param handler A function to execute when the event is triggered.
-     */
-    mouseout(handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to the "mouseout" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     */
-    mouseout(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
-
-    /**
-     * Trigger the "mouseover" event on an element.
-     */
-    mouseover(): ChaiJQuery;
-    /**
-     * Bind an event handler to the "mouseover" JavaScript event.
-     *
-     * @param handler A function to execute when the event is triggered.
-     */
-    mouseover(handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to the "mouseover" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     */
-    mouseover(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
-
-    /**
-     * Trigger the "mouseup" event on an element.
-     */
-    mouseup(): ChaiJQuery;
-    /**
-     * Bind an event handler to the "mouseup" JavaScript event.
-     *
-     * @param handler A function to execute when the event is triggered.
-     */
-    mouseup(handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to the "mouseup" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     */
-    mouseup(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
-
-    /**
-     * Remove an event handler.
-     */
-    off(): ChaiJQuery;
-    /**
-     * Remove an event handler.
-     *
-     * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin".
-     * @param selector A selector which should match the one originally passed to .on() when attaching event handlers.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: string, selector?: string, handler?: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Remove an event handler.
-     *
-     * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin".
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: string, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Remove an event handler.
-     *
-     * @param events An object where the string keys represent one or more space-separated event types and optional namespaces, and the values represent handler functions previously attached for the event(s).
-     * @param selector A selector which should match the one originally passed to .on() when attaching event handlers.
-     */
-    off(events: { [key: string]: any; }, selector?: string): ChaiJQuery;
-
-    /**
-     * Attach an event handler function for one or more events to the selected elements.
-     *
-     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: string, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): ChaiJQuery;
-    /**
-     * Attach an event handler function for one or more events to the selected elements.
-     *
-     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: string, data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): ChaiJQuery;
-    /**
-     * Attach an event handler function for one or more events to the selected elements.
-     *
-     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: string, selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): ChaiJQuery;
-    /**
-     * Attach an event handler function for one or more events to the selected elements.
-     *
-     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: string, selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): ChaiJQuery;
-    /**
-     * Attach an event handler function for one or more events to the selected elements.
-     *
-     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
-     * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If the selector is null or omitted, the handler is always called when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event occurs.
-     */
-    on(events: { [key: string]: any; }, selector?: string, data?: any): ChaiJQuery;
-    /**
-     * Attach an event handler function for one or more events to the selected elements.
-     *
-     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
-     * @param data Data to be passed to the handler in event.data when an event occurs.
-     */
-    on(events: { [key: string]: any; }, data?: any): ChaiJQuery;
-
-    /**
-     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
-     *
-     * @param events A string containing one or more JavaScript event types, such as "click" or "submit," or custom event names.
-     * @param handler A function to execute at the time the event is triggered.
-     */
-    one(events: string, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
-     *
-     * @param events A string containing one or more JavaScript event types, such as "click" or "submit," or custom event names.
-     * @param data An object containing data that will be passed to the event handler.
-     * @param handler A function to execute at the time the event is triggered.
-     */
-    one(events: string, data: Object, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-
-    /**
-     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
-     *
-     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    one(events: string, selector: string, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
-     *
-     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    one(events: string, selector: string, data: any, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-
-    /**
-     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
-     *
-     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
-     * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If the selector is null or omitted, the handler is always called when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event occurs.
-     */
-    one(events: { [key: string]: any; }, selector?: string, data?: any): ChaiJQuery;
-
-    /**
-     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
-     *
-     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
-     * @param data Data to be passed to the handler in event.data when an event occurs.
-     */
-    one(events: { [key: string]: any; }, data?: any): ChaiJQuery;
-
-
-    /**
-     * Specify a function to execute when the DOM is fully loaded.
-     *
-     * @param handler A function to execute after the DOM is ready.
-     */
-    ready(handler: Function): ChaiJQuery;
-
-    /**
-     * Trigger the "resize" event on an element.
-     */
-    resize(): ChaiJQuery;
-    /**
-     * Bind an event handler to the "resize" JavaScript event.
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    resize(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to the "resize" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    resize(eventData: Object, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-
-    /**
-     * Trigger the "scroll" event on an element.
-     */
-    scroll(): ChaiJQuery;
-    /**
-     * Bind an event handler to the "scroll" JavaScript event.
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    scroll(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to the "scroll" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    scroll(eventData: Object, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-
-    /**
-     * Trigger the "select" event on an element.
-     */
-    select(): ChaiJQuery;
-    /**
-     * Bind an event handler to the "select" JavaScript event.
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    select(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to the "select" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    select(eventData: Object, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-
-    /**
-     * Trigger the "submit" event on an element.
-     */
-    submit(): ChaiJQuery;
-    /**
-     * Bind an event handler to the "submit" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    submit(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to the "submit" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    submit(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-
-    /**
-     * Execute all handlers and behaviors attached to the matched elements for the given event type.
-     *
-     * @param eventType A string containing a JavaScript event type, such as click or submit.
-     * @param extraParameters Additional parameters to pass along to the event handler.
-     */
-    trigger(eventType: string, extraParameters?: any[]|Object): ChaiJQuery;
-    /**
-     * Execute all handlers and behaviors attached to the matched elements for the given event type.
-     *
-     * @param event A jQuery.Event object.
-     * @param extraParameters Additional parameters to pass along to the event handler.
-     */
-    trigger(event: JQueryEventObject, extraParameters?: any[]|Object): ChaiJQuery;
-
-    /**
-     * Execute all handlers attached to an element for an event.
-     *
-     * @param eventType A string containing a JavaScript event type, such as click or submit.
-     * @param extraParameters An array of additional parameters to pass along to the event handler.
-     */
-    triggerHandler(eventType: string, ...extraParameters: any[]): Object;
-
-    /**
-     * Remove a previously-attached event handler from the elements.
-     *
-     * @param eventType A string containing a JavaScript event type, such as click or submit.
-     * @param handler The function that is to be no longer executed.
-     */
-    unbind(eventType?: string, handler?: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Remove a previously-attached event handler from the elements.
-     *
-     * @param eventType A string containing a JavaScript event type, such as click or submit.
-     * @param fls Unbinds the corresponding 'return false' function that was bound using .bind( eventType, false ).
-     */
-    unbind(eventType: string, fls: boolean): ChaiJQuery;
-    /**
-     * Remove a previously-attached event handler from the elements.
-     *
-     * @param evt A JavaScript event object as passed to an event handler.
-     */
-    unbind(evt: any): ChaiJQuery;
-
-    /**
-     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
-     */
-    undelegate(): ChaiJQuery;
-    /**
-     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
-     *
-     * @param selector A selector which will be used to filter the event results.
-     * @param eventType A string containing a JavaScript event type, such as "click" or "keydown"
-     * @param handler A function to execute at the time the event is triggered.
-     */
-    undelegate(selector: string, eventType: string, handler?: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
-     *
-     * @param selector A selector which will be used to filter the event results.
-     * @param events An object of one or more event types and previously bound functions to unbind from them.
-     */
-    undelegate(selector: string, events: Object): ChaiJQuery;
-    /**
-     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
-     *
-     * @param namespace A string containing a namespace to unbind all events from.
-     */
-    undelegate(namespace: string): ChaiJQuery;
-
-    /**
-     * Bind an event handler to the "unload" JavaScript event. (DEPRECATED from v1.8)
-     *
-     * @param handler A function to execute when the event is triggered.
-     */
-    unload(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to the "unload" JavaScript event. (DEPRECATED from v1.8)
-     *
-     * @param eventData A plain object of data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     */
-    unload(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-
-    /**
-     * The DOM node context originally passed to jQuery(); if none was passed then context will likely be the document. (DEPRECATED from v1.10)
-     */
-    context: Element;
-
-    jquery: string;
-
-    /**
-     * Bind an event handler to the "error" JavaScript event. (DEPRECATED from v1.8)
-     *
-     * @param handler A function to execute when the event is triggered.
-     */
-    error(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-    /**
-     * Bind an event handler to the "error" JavaScript event. (DEPRECATED from v1.8)
-     *
-     * @param eventData A plain object of data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     */
-    error(eventData: any, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
-
-    /**
-     * Add a collection of DOM elements onto the jQuery stack.
-     *
-     * @param elements An array of elements to push onto the stack and make into a new jQuery object.
-     */
-    pushStack(elements: any[]): ChaiJQuery;
-    /**
-     * Add a collection of DOM elements onto the jQuery stack.
-     *
-     * @param elements An array of elements to push onto the stack and make into a new jQuery object.
-     * @param name The name of a jQuery method that generated the array of elements.
-     * @param arguments The arguments that were passed in to the jQuery method (for serialization).
-     */
-    pushStack(elements: any[], name: string, arguments: any[]): ChaiJQuery;
-
-    /**
-     * Insert content, specified by the parameter, after each element in the set of matched elements.
-     *
-     * param content1 HTML string, DOM element, array of elements, or jQuery object to insert after each element in the set of matched elements.
-     * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert after each element in the set of matched elements.
-     */
-    after(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): ChaiJQuery;
-    /**
-     * Insert content, specified by the parameter, after each element in the set of matched elements.
-     *
-     * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert after each element in the set of matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
-     */
-    after(func: (index: number, html: string) => string|Element|JQuery): ChaiJQuery;
-
-    /**
-     * Insert content, specified by the parameter, to the end of each element in the set of matched elements.
-     *
-     * param content1 DOM element, array of elements, HTML string, or jQuery object to insert at the end of each element in the set of matched elements.
-     * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the end of each element in the set of matched elements.
-     */
-    append(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): ChaiJQuery;
-    /**
-     * Insert content, specified by the parameter, to the end of each element in the set of matched elements.
-     *
-     * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert at the end of each element in the set of matched elements. Receives the index position of the element in the set and the old HTML value of the element as arguments. Within the function, this refers to the current element in the set.
-     */
-    append(func: (index: number, html: string) => string|Element|JQuery): ChaiJQuery;
-
-    /**
-     * Insert every element in the set of matched elements to the end of the target.
-     *
-     * @param target A selector, element, HTML string, array of elements, or jQuery object; the matched set of elements will be inserted at the end of the element(s) specified by this parameter.
-     */
-    appendTo(target: JQuery|any[]|Element|string): ChaiJQuery;
-
-    /**
-     * Insert content, specified by the parameter, before each element in the set of matched elements.
-     *
-     * param content1 HTML string, DOM element, array of elements, or jQuery object to insert before each element in the set of matched elements.
-     * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert before each element in the set of matched elements.
-     */
-    before(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): ChaiJQuery;
-    /**
-     * Insert content, specified by the parameter, before each element in the set of matched elements.
-     *
-     * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert before each element in the set of matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
-     */
-    before(func: (index: number, html: string) => string|Element|JQuery): ChaiJQuery;
-
-    /**
-     * Create a deep copy of the set of matched elements.
-     *
-     * param withDataAndEvents A Boolean indicating whether event handlers and data should be copied along with the elements. The default value is false.
-     * param deepWithDataAndEvents A Boolean indicating whether event handlers and data for all children of the cloned element should be copied. By default its value matches the first argument's value (which defaults to false).
-     */
-    clone(withDataAndEvents?: boolean, deepWithDataAndEvents?: boolean): ChaiJQuery;
-
-    /**
-     * Remove the set of matched elements from the DOM.
-     *
-     * param selector A selector expression that filters the set of matched elements to be removed.
-     */
-    detach(selector?: string): ChaiJQuery;
-
-    /**
-     * Remove all child nodes of the set of matched elements from the DOM.
-     */
-    empty(): ChaiJQuery;
-
-    /**
-     * Insert every element in the set of matched elements after the target.
-     *
-     * param target A selector, element, array of elements, HTML string, or jQuery object; the matched set of elements will be inserted after the element(s) specified by this parameter.
-     */
-    insertAfter(target: JQuery|any[]|Element|Text|string): ChaiJQuery;
-
-    /**
-     * Insert every element in the set of matched elements before the target.
-     *
-     * param target A selector, element, array of elements, HTML string, or jQuery object; the matched set of elements will be inserted before the element(s) specified by this parameter.
-     */
-    insertBefore(target: JQuery|any[]|Element|Text|string): ChaiJQuery;
-
-    /**
-     * Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.
-     *
-     * param content1 DOM element, array of elements, HTML string, or jQuery object to insert at the beginning of each element in the set of matched elements.
-     * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the beginning of each element in the set of matched elements.
-     */
-    prepend(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): ChaiJQuery;
-    /**
-     * Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.
-     *
-     * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert at the beginning of each element in the set of matched elements. Receives the index position of the element in the set and the old HTML value of the element as arguments. Within the function, this refers to the current element in the set.
-     */
-    prepend(func: (index: number, html: string) => string|Element|JQuery): ChaiJQuery;
-
-    /**
-     * Insert every element in the set of matched elements to the beginning of the target.
-     *
-     * @param target A selector, element, HTML string, array of elements, or jQuery object; the matched set of elements will be inserted at the beginning of the element(s) specified by this parameter.
-     */
-    prependTo(target: JQuery|any[]|Element|string): ChaiJQuery;
-
-    /**
-     * Remove the set of matched elements from the DOM.
-     *
-     * @param selector A selector expression that filters the set of matched elements to be removed.
-     */
-    remove(selector?: string): ChaiJQuery;
-
-    /**
-     * Replace each target element with the set of matched elements.
-     *
-     * @param target A selector string, jQuery object, DOM element, or array of elements indicating which element(s) to replace.
-     */
-    replaceAll(target: JQuery|any[]|Element|string): ChaiJQuery;
-
-    /**
-     * Replace each element in the set of matched elements with the provided new content and return the set of elements that was removed.
-     *
-     * param newContent The content to insert. May be an HTML string, DOM element, array of DOM elements, or jQuery object.
-     */
-    replaceWith(newContent: JQuery|any[]|Element|Text|string): ChaiJQuery;
-    /**
-     * Replace each element in the set of matched elements with the provided new content and return the set of elements that was removed.
-     *
-     * param func A function that returns content with which to replace the set of matched elements.
-     */
-    replaceWith(func: () => Element|JQuery): ChaiJQuery;
-
-    /**
-     * Get the combined text contents of each element in the set of matched elements, including their descendants.
-     */
-    text(): string;
-    /**
-     * Set the content of each element in the set of matched elements to the specified text.
-     *
-     * @param text The text to set as the content of each matched element. When Number or Boolean is supplied, it will be converted to a String representation.
-     */
-    text(text: string|number|boolean): ChaiJQuery;
-    /**
-     * Set the content of each element in the set of matched elements to the specified text.
-     *
-     * @param func A function returning the text content to set. Receives the index position of the element in the set and the old text value as arguments.
-     */
-    text(func: (index: number, text: string) => string): ChaiJQuery;
-
-    /**
-     * Retrieve all the elements contained in the jQuery set, as an array.
-     */
-    toArray(): any[];
-
-    /**
-     * Remove the parents of the set of matched elements from the DOM, leaving the matched elements in their place.
-     */
-    unwrap(): ChaiJQuery;
-
-    /**
-     * Wrap an HTML structure around each element in the set of matched elements.
-     *
-     * @param wrappingElement A selector, element, HTML string, or jQuery object specifying the structure to wrap around the matched elements.
-     */
-    wrap(wrappingElement: JQuery|Element|string): ChaiJQuery;
-    /**
-     * Wrap an HTML structure around each element in the set of matched elements.
-     *
-     * @param func A callback function returning the HTML content or jQuery object to wrap around the matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
-     */
-    wrap(func: (index: number) => string|JQuery): ChaiJQuery;
-
-    /**
-     * Wrap an HTML structure around all elements in the set of matched elements.
-     *
-     * @param wrappingElement A selector, element, HTML string, or jQuery object specifying the structure to wrap around the matched elements.
-     */
-    wrapAll(wrappingElement: JQuery|Element|string): ChaiJQuery;
-    wrapAll(func: (index: number) => string): ChaiJQuery;
-
-    /**
-     * Wrap an HTML structure around the content of each element in the set of matched elements.
-     *
-     * @param wrappingElement An HTML snippet, selector expression, jQuery object, or DOM element specifying the structure to wrap around the content of the matched elements.
-     */
-    wrapInner(wrappingElement: JQuery|Element|string): ChaiJQuery;
-    /**
-     * Wrap an HTML structure around the content of each element in the set of matched elements.
-     *
-     * @param func A callback function which generates a structure to wrap around the content of the matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
-     */
-    wrapInner(func: (index: number) => string): ChaiJQuery;
-
-    /**
-     * Iterate over a jQuery object, executing a function for each matched element.
-     *
-     * @param func A function to execute for each matched element.
-     */
-    each(func: (index: number, elem: Element) => any): ChaiJQuery;
-
-    /**
-     * Retrieve one of the elements matched by the jQuery object.
-     *
-     * @param index A zero-based integer indicating which element to retrieve.
-     */
-    get(index: number): HTMLElement;
-    /**
-     * Retrieve the elements matched by the jQuery object.
-     */
-    get(): any[];
-
-    /**
-     * Search for a given element from among the matched elements.
-     */
-    index(): number;
-    /**
-     * Search for a given element from among the matched elements.
-     *
-     * @param selector A selector representing a jQuery collection in which to look for an element.
-     */
-    index(selector: string|JQuery|Element): number;
-
-    /**
-     * The number of elements in the jQuery object.
-     */
-    length: number;
-    /**
-     * A selector representing selector passed to jQuery(), if any, when creating the original set.
-     * version deprecated: 1.7, removed: 1.9
-     */
-    selector: string;
-    [index: string]: any;
-    [index: number]: HTMLElement;
-
-    /**
-     * Add elements to the set of matched elements.
-     *
-     * @param selector A string representing a selector expression to find additional elements to add to the set of matched elements.
-     * @param context The point in the document at which the selector should begin matching; similar to the context argument of the $(selector, context) method.
-     */
-    add(selector: string, context?: Element): ChaiJQuery;
-    /**
-     * Add elements to the set of matched elements.
-     *
-     * @param elements One or more elements to add to the set of matched elements.
-     */
-    add(...elements: Element[]): ChaiJQuery;
-    /**
-     * Add elements to the set of matched elements.
-     *
-     * @param html An HTML fragment to add to the set of matched elements.
-     */
-    add(html: string): ChaiJQuery;
-    /**
-     * Add elements to the set of matched elements.
-     *
-     * @param obj An existing jQuery object to add to the set of matched elements.
-     */
-    add(obj: JQuery): ChaiJQuery;
-
-    /**
-     * Get the children of each element in the set of matched elements, optionally filtered by a selector.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    children(selector?: string): ChaiJQuery;
-
-    /**
-     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    closest(selector: string): ChaiJQuery;
-    /**
-     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     * @param context A DOM element within which a matching element may be found. If no context is passed in then the context of the jQuery set will be used instead.
-     */
-    closest(selector: string, context?: Element): ChaiJQuery;
-    /**
-     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
-     *
-     * @param obj A jQuery object to match elements against.
-     */
-    closest(obj: JQuery): ChaiJQuery;
-    /**
-     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
-     *
-     * @param element An element to match elements against.
-     */
-    closest(element: Element): ChaiJQuery;
-
-    /**
-     * Get an array of all the elements and selectors matched against the current element up through the DOM tree.
-     *
-     * @param selectors An array or string containing a selector expression to match elements against (can also be a jQuery object).
-     * @param context A DOM element within which a matching element may be found. If no context is passed in then the context of the jQuery set will be used instead.
-     */
-    closest(selectors: any, context?: Element): any[];
-
-    /**
-     * Get the children of each element in the set of matched elements, including text and comment nodes.
-     */
-    contents(): ChaiJQuery;
-
-    /**
-     * End the most recent filtering operation in the current chain and return the set of matched elements to its previous state.
-     */
-    end(): ChaiJQuery;
-
-    /**
-     * Reduce the set of matched elements to the one at the specified index.
-     *
-     * @param index An integer indicating the 0-based position of the element. OR An integer indicating the position of the element, counting backwards from the last element in the set.
-     *
-     */
-    eq(index: number): ChaiJQuery;
-
-    /**
-     * Reduce the set of matched elements to those that match the selector or pass the function's test.
-     *
-     * @param selector A string containing a selector expression to match the current set of elements against.
-     */
-    filter(selector: string): ChaiJQuery;
-    /**
-     * Reduce the set of matched elements to those that match the selector or pass the function's test.
-     *
-     * @param func A function used as a test for each element in the set. this is the current DOM element.
-     */
-    filter(func: (index: number, element: Element) => any): ChaiJQuery;
-    /**
-     * Reduce the set of matched elements to those that match the selector or pass the function's test.
-     *
-     * @param element An element to match the current set of elements against.
-     */
-    filter(element: Element): ChaiJQuery;
-    /**
-     * Reduce the set of matched elements to those that match the selector or pass the function's test.
-     *
-     * @param obj An existing jQuery object to match the current set of elements against.
-     */
-    filter(obj: JQuery): ChaiJQuery;
-
-    /**
-     * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    find(selector: string): ChaiJQuery;
-    /**
-     * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.
-     *
-     * @param element An element to match elements against.
-     */
-    find(element: Element): ChaiJQuery;
-    /**
-     * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.
-     *
-     * @param obj A jQuery object to match elements against.
-     */
-    find(obj: JQuery): ChaiJQuery;
-
-    /**
-     * Reduce the set of matched elements to the first in the set.
-     */
-    first(): ChaiJQuery;
-
-    /**
-     * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    has(selector: string): ChaiJQuery;
-    /**
-     * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.
-     *
-     * @param contained A DOM element to match elements against.
-     */
-    has(contained: Element): ChaiJQuery;
-
-    /**
-     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    is(selector: string): boolean;
-    /**
-     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
-     *
-     * @param func A function used as a test for the set of elements. It accepts one argument, index, which is the element's index in the jQuery collection.Within the function, this refers to the current DOM element.
-     */
-    is(func: (index: number, element: Element) => boolean): boolean;
-    /**
-     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
-     *
-     * @param obj An existing jQuery object to match the current set of elements against.
-     */
-    is(obj: JQuery): boolean;
-    /**
-     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
-     *
-     * @param elements One or more elements to match the current set of elements against.
-     */
-    is(elements: any): boolean;
-
-    /**
-     * Reduce the set of matched elements to the final one in the set.
-     */
-    last(): ChaiJQuery;
-
-    /**
-     * Pass each element in the current matched set through a function, producing a new jQuery object containing the return values.
-     *
-     * @param callback A function object that will be invoked for each element in the current set.
-     */
-    map(callback: (index: number, domElement: Element) => any): ChaiJQuery;
-
-    /**
-     * Get the immediately following sibling of each element in the set of matched elements. If a selector is provided, it retrieves the next sibling only if it matches that selector.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    next(selector?: string): ChaiJQuery;
-
-    /**
-     * Get all following siblings of each element in the set of matched elements, optionally filtered by a selector.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    nextAll(selector?: string): ChaiJQuery;
-
-    /**
-     * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.
-     *
-     * @param selector A string containing a selector expression to indicate where to stop matching following sibling elements.
-     * @param filter A string containing a selector expression to match elements against.
-     */
-    nextUntil(selector?: string, filter?: string): ChaiJQuery;
-    /**
-     * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.
-     *
-     * @param element A DOM node or jQuery object indicating where to stop matching following sibling elements.
-     * @param filter A string containing a selector expression to match elements against.
-     */
-    nextUntil(element?: Element, filter?: string): ChaiJQuery;
-    /**
-     * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.
-     *
-     * @param obj A DOM node or jQuery object indicating where to stop matching following sibling elements.
-     * @param filter A string containing a selector expression to match elements against.
-     */
-    nextUntil(obj?: JQuery, filter?: string): ChaiJQuery;
-
-    /**
-     * Remove elements from the set of matched elements.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    not(selector: string): ChaiJQuery;
-    /**
-     * Remove elements from the set of matched elements.
-     *
-     * @param func A function used as a test for each element in the set. this is the current DOM element.
-     */
-    not(func: (index: number, element: Element) => boolean): ChaiJQuery;
-    /**
-     * Remove elements from the set of matched elements.
-     *
-     * @param elements One or more DOM elements to remove from the matched set.
-     */
-    not(...elements: Element[]): ChaiJQuery;
-    /**
-     * Remove elements from the set of matched elements.
-     *
-     * @param obj An existing jQuery object to match the current set of elements against.
-     */
-    not(obj: JQuery): ChaiJQuery;
-
-    /**
-     * Get the closest ancestor element that is positioned.
-     */
-    offsetParent(): ChaiJQuery;
-
-    /**
-     * Get the parent of each element in the current set of matched elements, optionally filtered by a selector.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    parent(selector?: string): ChaiJQuery;
-
-    /**
-     * Get the ancestors of each element in the current set of matched elements, optionally filtered by a selector.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    parents(selector?: string): ChaiJQuery;
-
-    /**
-     * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.
-     *
-     * @param selector A string containing a selector expression to indicate where to stop matching ancestor elements.
-     * @param filter A string containing a selector expression to match elements against.
-     */
-    parentsUntil(selector?: string, filter?: string): ChaiJQuery;
-    /**
-     * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.
-     *
-     * @param element A DOM node or jQuery object indicating where to stop matching ancestor elements.
-     * @param filter A string containing a selector expression to match elements against.
-     */
-    parentsUntil(element?: Element, filter?: string): ChaiJQuery;
-    /**
-     * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.
-     *
-     * @param obj A DOM node or jQuery object indicating where to stop matching ancestor elements.
-     * @param filter A string containing a selector expression to match elements against.
-     */
-    parentsUntil(obj?: JQuery, filter?: string): ChaiJQuery;
-
-    /**
-     * Get the immediately preceding sibling of each element in the set of matched elements, optionally filtered by a selector.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    prev(selector?: string): ChaiJQuery;
-
-    /**
-     * Get all preceding siblings of each element in the set of matched elements, optionally filtered by a selector.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    prevAll(selector?: string): ChaiJQuery;
-
-    /**
-     * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.
-     *
-     * @param selector A string containing a selector expression to indicate where to stop matching preceding sibling elements.
-     * @param filter A string containing a selector expression to match elements against.
-     */
-    prevUntil(selector?: string, filter?: string): ChaiJQuery;
-    /**
-     * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.
-     *
-     * @param element A DOM node or jQuery object indicating where to stop matching preceding sibling elements.
-     * @param filter A string containing a selector expression to match elements against.
-     */
-    prevUntil(element?: Element, filter?: string): ChaiJQuery;
-    /**
-     * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.
-     *
-     * @param obj A DOM node or jQuery object indicating where to stop matching preceding sibling elements.
-     * @param filter A string containing a selector expression to match elements against.
-     */
-    prevUntil(obj?: JQuery, filter?: string): ChaiJQuery;
-
-    /**
-     * Get the siblings of each element in the set of matched elements, optionally filtered by a selector.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    siblings(selector?: string): ChaiJQuery;
-
-    /**
-     * Reduce the set of matched elements to a subset specified by a range of indices.
-     *
-     * @param start An integer indicating the 0-based position at which the elements begin to be selected. If negative, it indicates an offset from the end of the set.
-     * @param end An integer indicating the 0-based position at which the elements stop being selected. If negative, it indicates an offset from the end of the set. If omitted, the range continues until the end of the set.
-     */
-    slice(start: number, end?: number): ChaiJQuery;
-
-    /**
-     * Show the queue of functions to be executed on the matched elements.
-     *
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     */
-    queue(queueName?: string): any[];
-    /**
-     * Manipulate the queue of functions to be executed, once for each matched element.
-     *
-     * @param newQueue An array of functions to replace the current queue contents.
-     */
-    queue(newQueue: Function[]): ChaiJQuery;
-    /**
-     * Manipulate the queue of functions to be executed, once for each matched element.
-     *
-     * @param callback The new function to add to the queue, with a function to call that will dequeue the next item.
-     */
-    queue(callback: Function): ChaiJQuery;
-    /**
-     * Manipulate the queue of functions to be executed, once for each matched element.
-     *
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @param newQueue An array of functions to replace the current queue contents.
-     */
-    queue(queueName: string, newQueue: Function[]): ChaiJQuery;
-    /**
-     * Manipulate the queue of functions to be executed, once for each matched element.
-     *
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @param callback The new function to add to the queue, with a function to call that will dequeue the next item.
-     */
-    queue(queueName: string, callback: Function): ChaiJQuery;
-    should: Chai.Assertion;
-}
diff --git a/chai-jquery/index.d.ts b/chai-jquery/index.d.ts
new file mode 100644
index 0000000000..79774640f6
--- /dev/null
+++ b/chai-jquery/index.d.ts
@@ -0,0 +1,2580 @@
+// Type definitions for chai-jquery 1.1.1
+// Project: https://github.com/chaijs/chai-jquery
+// Definitions by: Kazi Manzur Rashid <https://github.com/kazimanzurrashid/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="chai" />
+/// <reference types="jquery" />
+
+declare namespace Chai {
+
+    interface Assertion {
+        attr: (name: string, value?: string) => Assertion;
+        css: (name: string, value?: string) => Assertion;
+        data: (name: string, value?: string) => Assertion;
+        class(className: string): Assertion;
+        id(id: string): Assertion;
+        html(html: string): Assertion;
+        text(text: string): Assertion;
+        value(text: string): Assertion;
+        (selector: string): Assertion;
+        visible: Assertion;
+        hidden: Assertion;
+        selected: Assertion;
+        checked: Assertion;
+        disabled: Assertion;
+        (selector: string): Assertion;
+    }
+}
+
+/**
+ * Static members of chai-jquery (those on $ and jQuery themselves)
+ */
+interface ChaiJQueryStatic {
+
+    /**
+     * Perform an asynchronous HTTP (Ajax) request.
+     *
+     * @param settings A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with $.ajaxSetup().
+     */
+    ajax(settings: JQueryAjaxSettings): JQueryXHR;
+    /**
+     * Perform an asynchronous HTTP (Ajax) request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param settings A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with $.ajaxSetup().
+     */
+    ajax(url: string, settings?: JQueryAjaxSettings): JQueryXHR;
+
+    /**
+     * Handle custom Ajax options or modify existing options before each request is sent and before they are processed by $.ajax().
+     *
+     * @param dataTypes An optional string containing one or more space-separated dataTypes
+     * @param handler A handler to set default values for future Ajax requests.
+     */
+    ajaxPrefilter(dataTypes: string, handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void;
+    /**
+     * Handle custom Ajax options or modify existing options before each request is sent and before they are processed by $.ajax().
+     *
+     * @param handler A handler to set default values for future Ajax requests.
+     */
+    ajaxPrefilter(handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void;
+
+    ajaxSettings: JQueryAjaxSettings;
+
+    /**
+     * Set default values for future Ajax requests. Its use is not recommended.
+     *
+     * @param options A set of key/value pairs that configure the default Ajax request. All options are optional.
+     */
+    ajaxSetup(options: JQueryAjaxSettings): void;
+
+    /**
+     * Load data from the server using a HTTP GET request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param success A callback function that is executed if the request succeeds.
+     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, or html).
+     */
+    get(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
+    /**
+     * Load data from the server using a HTTP GET request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param data A plain object or string that is sent to the server with the request.
+     * @param success A callback function that is executed if the request succeeds.
+     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, or html).
+     */
+    get(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
+    /**
+     * Load JSON-encoded data from the server using a GET HTTP request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param success A callback function that is executed if the request succeeds.
+     */
+    getJSON(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR;
+    /**
+     * Load JSON-encoded data from the server using a GET HTTP request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param data A plain object or string that is sent to the server with the request.
+     * @param success A callback function that is executed if the request succeeds.
+     */
+    getJSON(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR;
+    /**
+     * Load a JavaScript file from the server using a GET HTTP request, then execute it.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param success A callback function that is executed if the request succeeds.
+     */
+    getScript(url: string, success?: (script: string, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR;
+
+    /**
+     * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request.
+     */
+    param: JQueryParam;
+
+    /**
+     * Load data from the server using a HTTP POST request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but can be null in that case.
+     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
+     */
+    post(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
+    /**
+     * Load data from the server using a HTTP POST request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param data A plain object or string that is sent to the server with the request.
+     * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but can be null in that case.
+     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
+     */
+    post(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
+
+    /**
+     * A multi-purpose callbacks list object that provides a powerful way to manage callback lists.
+     *
+     * @param flags An optional list of space-separated flags that change how the callback list behaves.
+     */
+    Callbacks(flags?: string): JQueryCallback;
+
+    /**
+     * Holds or releases the execution of jQuery's ready event.
+     *
+     * @param hold Indicates whether the ready hold is being requested or released
+     */
+    holdReady(hold: boolean): void;
+
+    /**
+     * Accepts a string containing a CSS selector which is then used to match a set of elements.
+     *
+     * @param selector A string containing a selector expression
+     * @param context A DOM Element, Document, or jQuery to use as context
+     */
+    (selector: string, context?: Element|JQuery): ChaiJQuery;
+    /**
+     * Accepts a string containing a CSS selector which is then used to match a set of elements.
+     *
+     * @param element A DOM element to wrap in a jQuery object.
+     */
+    (element: Element): ChaiJQuery;
+    /**
+     * Accepts a string containing a CSS selector which is then used to match a set of elements.
+     *
+     * @param elementArray An array containing a set of DOM elements to wrap in a jQuery object.
+     */
+    (elementArray: Element[]): ChaiJQuery;
+    /**
+     * Accepts a string containing a CSS selector which is then used to match a set of elements.
+     *
+     * @param object A plain object to wrap in a jQuery object.
+     */
+    (object: {}): ChaiJQuery;
+    /**
+     * Accepts a string containing a CSS selector which is then used to match a set of elements.
+     *
+     * @param object An existing jQuery object to clone.
+     */
+    (object: JQuery): ChaiJQuery;
+    /**
+     * Specify a function to execute when the DOM is fully loaded.
+     */
+    (): ChaiJQuery;
+
+    /**
+     * Creates DOM elements on the fly from the provided string of raw HTML.
+     *
+     * @param html A string of HTML to create on the fly. Note that this parses HTML, not XML.
+     * @param ownerDocument A document in which the new elements will be created.
+     */
+    (html: string, ownerDocument?: Document): ChaiJQuery;
+    /**
+     * Creates DOM elements on the fly from the provided string of raw HTML.
+     *
+     * @param html A string defining a single, standalone, HTML element (e.g. <div/> or <div></div>).
+     * @param attributes An object of attributes, events, and methods to call on the newly-created element.
+     */
+    (html: string, attributes: Object): ChaiJQuery;
+
+    /**
+     * Binds a function to be executed when the DOM has finished loading.
+     *
+     * @param callback A function to execute after the DOM is ready.
+     */
+    (callback: Function): ChaiJQuery;
+
+    /**
+     * Relinquish jQuery's control of the $ variable.
+     *
+     * @param removeAll A Boolean indicating whether to remove all jQuery variables from the global scope (including jQuery itself).
+     */
+    noConflict(removeAll?: boolean): Object;
+
+    /**
+     * Provides a way to execute callback functions based on one or more objects, usually Deferred objects that represent asynchronous events.
+     *
+     * @param deferreds One or more Deferred objects, or plain JavaScript objects.
+     */
+    when<T>(...deferreds: Array<T|JQueryPromise<T>/* as JQueryDeferred<T> */>): JQueryPromise<T>;
+
+    /**
+     * Hook directly into jQuery to override how particular CSS properties are retrieved or set, normalize CSS property naming, or create custom properties.
+     */
+    cssHooks: { [key: string]: any; };
+    cssNumber: any;
+
+    /**
+     * Store arbitrary data associated with the specified element. Returns the value that was set.
+     *
+     * @param element The DOM element to associate with the data.
+     * @param key A string naming the piece of data to set.
+     * @param value The new data value.
+     */
+    data<T>(element: Element, key: string, value: T): T;
+    /**
+     * Returns value at named data store for the element, as set by jQuery.data(element, name, value), or the full data store for the element.
+     *
+     * @param element The DOM element to associate with the data.
+     * @param key A string naming the piece of data to set.
+     */
+    data(element: Element, key: string): any;
+    /**
+     * Returns value at named data store for the element, as set by jQuery.data(element, name, value), or the full data store for the element.
+     *
+     * @param element The DOM element to associate with the data.
+     */
+    data(element: Element): any;
+
+    /**
+     * Execute the next function on the queue for the matched element.
+     *
+     * @param element A DOM element from which to remove and execute a queued function.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     */
+    dequeue(element: Element, queueName?: string): void;
+
+    /**
+     * Determine whether an element has any jQuery data associated with it.
+     *
+     * @param element A DOM element to be checked for data.
+     */
+    hasData(element: Element): boolean;
+
+    /**
+     * Show the queue of functions to be executed on the matched element.
+     *
+     * @param element A DOM element to inspect for an attached queue.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     */
+    queue(element: Element, queueName?: string): any[];
+    /**
+     * Manipulate the queue of functions to be executed on the matched element.
+     *
+     * @param element A DOM element where the array of queued functions is attached.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @param newQueue An array of functions to replace the current queue contents.
+     */
+    queue(element: Element, queueName: string, newQueue: Function[]): ChaiJQuery;
+    /**
+     * Manipulate the queue of functions to be executed on the matched element.
+     *
+     * @param element A DOM element on which to add a queued function.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @param callback The new function to add to the queue.
+     */
+    queue(element: Element, queueName: string, callback: Function): ChaiJQuery;
+
+    /**
+     * Remove a previously-stored piece of data.
+     *
+     * @param element A DOM element from which to remove data.
+     * @param name A string naming the piece of data to remove.
+     */
+    removeData(element: Element, name?: string): ChaiJQuery;
+
+    /**
+     * A constructor function that returns a chainable utility object with methods to register multiple callbacks into callback queues, invoke callback queues, and relay the success or failure state of any synchronous or asynchronous function.
+     *
+     * @param beforeStart A function that is called just before the constructor returns.
+     */
+    Deferred<T>(beforeStart?: (deferred: JQueryDeferred<T>) => any): JQueryDeferred<T>;
+
+    /**
+     * Effects
+     */
+    fx: {
+        tick: () => void;
+        /**
+         * The rate (in milliseconds) at which animations fire.
+         */
+        interval: number;
+        stop: () => void;
+        speeds: { slow: number; fast: number; };
+        /**
+         * Globally disable all animations.
+         */
+        off: boolean;
+        step: any;
+    };
+
+    /**
+     * Takes a function and returns a new one that will always have a particular context.
+     *
+     * @param fnction The function whose context will be changed.
+     * @param context The object to which the context (this) of the function should be set.
+     * @param additionalArguments Any number of arguments to be passed to the function referenced in the function argument.
+     */
+    proxy(fnction: (...args: any[]) => any, context: Object, ...additionalArguments: any[]): any;
+    /**
+     * Takes a function and returns a new one that will always have a particular context.
+     *
+     * @param context The object to which the context (this) of the function should be set.
+     * @param name The name of the function whose context will be changed (should be a property of the context object).
+     * @param additionalArguments Any number of arguments to be passed to the function named in the name argument.
+     */
+    proxy(context: Object, name: string, ...additionalArguments: any[]): any;
+
+    Event: JQueryEventConstructor;
+
+    /**
+     * Takes a string and throws an exception containing it.
+     *
+     * @param message The message to send out.
+     */
+    error(message: any): ChaiJQuery;
+
+    expr: any;
+    fn: any;  //TODO: Decide how we want to type this
+
+    isReady: boolean;
+
+    // Properties
+    support: JQuerySupport;
+
+    /**
+     * Check to see if a DOM element is a descendant of another DOM element.
+     *
+     * @param container The DOM element that may contain the other element.
+     * @param contained The DOM element that may be contained by (a descendant of) the other element.
+     */
+    contains(container: Element, contained: Element): boolean;
+
+    /**
+     * A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties.
+     *
+     * @param collection The object or array to iterate over.
+     * @param callback The function that will be executed on every object.
+     */
+    each<T>(
+        collection: T[],
+        callback: (indexInArray: number, valueOfElement: T) => any
+        ): any;
+
+    /**
+     * A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties.
+     *
+     * @param collection The object or array to iterate over.
+     * @param callback The function that will be executed on every object.
+     */
+    each(
+        collection: any,
+        callback: (indexInArray: any, valueOfElement: any) => any
+        ): any;
+
+    /**
+     * Merge the contents of two or more objects together into the first object.
+     *
+     * @param target An object that will receive the new properties if additional objects are passed in or that will extend the jQuery namespace if it is the sole argument.
+     * @param object1 An object containing additional properties to merge in.
+     * @param objectN Additional objects containing properties to merge in.
+     */
+    extend(target: any, object1?: any, ...objectN: any[]): any;
+    /**
+     * Merge the contents of two or more objects together into the first object.
+     *
+     * @param deep If true, the merge becomes recursive (aka. deep copy).
+     * @param target The object to extend. It will receive the new properties.
+     * @param object1 An object containing additional properties to merge in.
+     * @param objectN Additional objects containing properties to merge in.
+     */
+    extend(deep: boolean, target: any, object1?: any, ...objectN: any[]): any;
+
+    /**
+     * Execute some JavaScript code globally.
+     *
+     * @param code The JavaScript code to execute.
+     */
+    globalEval(code: string): any;
+
+    /**
+     * Finds the elements of an array which satisfy a filter function. The original array is not affected.
+     *
+     * @param array The array to search through.
+     * @param func The function to process each item against. The first argument to the function is the item, and the second argument is the index. The function should return a Boolean value.  this will be the global window object.
+     * @param invert If "invert" is false, or not provided, then the function returns an array consisting of all elements for which "callback" returns true. If "invert" is true, then the function returns an array consisting of all elements for which "callback" returns false.
+     */
+    grep<T>(array: T[], func: (elementOfArray: T, indexInArray: number) => boolean, invert?: boolean): T[];
+
+    /**
+     * Search for a specified value within an array and return its index (or -1 if not found).
+     *
+     * @param value The value to search for.
+     * @param array An array through which to search.
+     * @param fromIndex he index of the array at which to begin the search. The default is 0, which will search the whole array.
+     */
+    inArray<T>(value: T, array: T[], fromIndex?: number): number;
+
+    /**
+     * Determine whether the argument is an array.
+     *
+     * @param obj Object to test whether or not it is an array.
+     */
+    isArray(obj: any): boolean;
+    /**
+     * Check to see if an object is empty (contains no enumerable properties).
+     *
+     * @param obj The object that will be checked to see if it's empty.
+     */
+    isEmptyObject(obj: any): boolean;
+    /**
+     * Determine if the argument passed is a Javascript function object.
+     *
+     * @param obj Object to test whether or not it is a function.
+     */
+    isFunction(obj: any): boolean;
+    /**
+     * Determines whether its argument is a number.
+     *
+     * @param obj The value to be tested.
+     */
+    isNumeric(value: any): boolean;
+    /**
+     * Check to see if an object is a plain object (created using "{}" or "new Object").
+     *
+     * @param obj The object that will be checked to see if it's a plain object.
+     */
+    isPlainObject(obj: any): boolean;
+    /**
+     * Determine whether the argument is a window.
+     *
+     * @param obj Object to test whether or not it is a window.
+     */
+    isWindow(obj: any): boolean;
+    /**
+     * Check to see if a DOM node is within an XML document (or is an XML document).
+     *
+     * @param node he DOM node that will be checked to see if it's in an XML document.
+     */
+    isXMLDoc(node: Node): boolean;
+
+    /**
+     * Convert an array-like object into a true JavaScript array.
+     *
+     * @param obj Any object to turn into a native Array.
+     */
+    makeArray(obj: any): any[];
+
+    /**
+     * Translate all items in an array or object to new array of items.
+     *
+     * @param array The Array to translate.
+     * @param callback The function to process each item against. The first argument to the function is the array item, the second argument is the index in array The function can return any value. Within the function, this refers to the global (window) object.
+     */
+    map<T, U>(array: T[], callback: (elementOfArray: T, indexInArray: number) => U): U[];
+    /**
+     * Translate all items in an array or object to new array of items.
+     *
+     * @param arrayOrObject The Array or Object to translate.
+     * @param callback The function to process each item against. The first argument to the function is the value; the second argument is the index or key of the array or object property. The function can return any value to add to the array. A returned array will be flattened into the resulting array. Within the function, this refers to the global (window) object.
+     */
+    map(arrayOrObject: any, callback: (value: any, indexOrKey: any) => any): any;
+
+    /**
+     * Merge the contents of two arrays together into the first array.
+     *
+     * @param first The first array to merge, the elements of second added.
+     * @param second The second array to merge into the first, unaltered.
+     */
+    merge<T>(first: T[], second: T[]): T[];
+
+    /**
+     * An empty function.
+     */
+    noop(): any;
+
+    /**
+     * Return a number representing the current time.
+     */
+    now(): number;
+
+    /**
+     * Takes a well-formed JSON string and returns the resulting JavaScript object.
+     *
+     * @param json The JSON string to parse.
+     */
+    parseJSON(json: string): any;
+
+    /**
+     * Parses a string into an XML document.
+     *
+     * @param data a well-formed XML string to be parsed
+     */
+    parseXML(data: string): XMLDocument;
+
+    /**
+     * Remove the whitespace from the beginning and end of a string.
+     *
+     * @param str Remove the whitespace from the beginning and end of a string.
+     */
+    trim(str: string): string;
+
+    /**
+     * Determine the internal JavaScript [[Class]] of an object.
+     *
+     * @param obj Object to get the internal JavaScript [[Class]] of.
+     */
+    type(obj: any): string;
+
+    /**
+     * Sorts an array of DOM elements, in place, with the duplicates removed. Note that this only works on arrays of DOM elements, not strings or numbers.
+     *
+     * @param array The Array of DOM elements.
+     */
+    unique(array: Element[]): Element[];
+
+    /**
+     * Parses a string into an array of DOM nodes.
+     *
+     * @param data HTML string to be parsed
+     * @param context DOM element to serve as the context in which the HTML fragment will be created
+     * @param keepScripts A Boolean indicating whether to include scripts passed in the HTML string
+     */
+    parseHTML(data: string, context?: HTMLElement, keepScripts?: boolean): any[];
+
+    /**
+     * Parses a string into an array of DOM nodes.
+     *
+     * @param data HTML string to be parsed
+     * @param context DOM element to serve as the context in which the HTML fragment will be created
+     * @param keepScripts A Boolean indicating whether to include scripts passed in the HTML string
+     */
+    parseHTML(data: string, context?: Document, keepScripts?: boolean): any[];
+}
+
+/**
+ * The chai-jquery instance members
+ */
+interface ChaiJQuery {
+    /**
+     * Register a handler to be called when Ajax requests complete. This is an AjaxEvent.
+     *
+     * @param handler The function to be invoked.
+     */
+    ajaxComplete(handler: (event: JQueryEventObject, XMLHttpRequest: XMLHttpRequest, ajaxOptions: any) => any): ChaiJQuery;
+    /**
+     * Register a handler to be called when Ajax requests complete with an error. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     */
+    ajaxError(handler: (event: JQueryEventObject, jqXHR: JQueryXHR, ajaxSettings: JQueryAjaxSettings, thrownError: any) => any): ChaiJQuery;
+    /**
+     * Attach a function to be executed before an Ajax request is sent. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     */
+    ajaxSend(handler: (event: JQueryEventObject, jqXHR: JQueryXHR, ajaxOptions: JQueryAjaxSettings) => any): ChaiJQuery;
+    /**
+     * Register a handler to be called when the first Ajax request begins. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     */
+    ajaxStart(handler: () => any): ChaiJQuery;
+    /**
+     * Register a handler to be called when all Ajax requests have completed. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     */
+    ajaxStop(handler: () => any): ChaiJQuery;
+    /**
+     * Attach a function to be executed whenever an Ajax request completes successfully. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     */
+    ajaxSuccess(handler: (event: JQueryEventObject, XMLHttpRequest: XMLHttpRequest, ajaxOptions: JQueryAjaxSettings) => any): ChaiJQuery;
+
+    /**
+     * Load data from the server and place the returned HTML into the matched element.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param data A plain object or string that is sent to the server with the request.
+     * @param complete A callback function that is executed when the request completes.
+     */
+    load(url: string, data?: string|Object, complete?: (responseText: string, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any): ChaiJQuery;
+
+    /**
+     * Encode a set of form elements as a string for submission.
+     */
+    serialize(): string;
+    /**
+     * Encode a set of form elements as an array of names and values.
+     */
+    serializeArray(): JQuerySerializeArrayElement[];
+
+    /**
+     * Adds the specified class(es) to each of the set of matched elements.
+     *
+     * @param className One or more space-separated classes to be added to the class attribute of each matched element.
+     */
+    addClass(className: string): ChaiJQuery;
+    /**
+     * Adds the specified class(es) to each of the set of matched elements.
+     *
+     * @param function A function returning one or more space-separated class names to be added to the existing class name(s). Receives the index position of the element in the set and the existing class name(s) as arguments. Within the function, this refers to the current element in the set.
+     */
+    addClass(func: (index: number, className: string) => string): ChaiJQuery;
+
+    /**
+     * Add the previous set of elements on the stack to the current set, optionally filtered by a selector.
+     */
+    addBack(selector?: string): ChaiJQuery;
+
+    /**
+     * Get the value of an attribute for the first element in the set of matched elements.
+     *
+     * @param attributeName The name of the attribute to get.
+     */
+    attr(attributeName: string): string;
+    /**
+     * Set one or more attributes for the set of matched elements.
+     *
+     * @param attributeName The name of the attribute to set.
+     * @param value A value to set for the attribute.
+     */
+    attr(attributeName: string, value: string|number): ChaiJQuery;
+    /**
+     * Set one or more attributes for the set of matched elements.
+     *
+     * @param attributeName The name of the attribute to set.
+     * @param func A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old attribute value as arguments.
+     */
+    attr(attributeName: string, func: (index: number, attr: string) => string|number): ChaiJQuery;
+    /**
+     * Set one or more attributes for the set of matched elements.
+     *
+     * @param attributes An object of attribute-value pairs to set.
+     */
+    attr(attributes: Object): ChaiJQuery;
+
+    /**
+     * Determine whether any of the matched elements are assigned the given class.
+     *
+     * @param className The class name to search for.
+     */
+    hasClass(className: string): boolean;
+
+    /**
+     * Get the HTML contents of the first element in the set of matched elements.
+     */
+    html(): string;
+    /**
+     * Set the HTML contents of each element in the set of matched elements.
+     *
+     * @param htmlString A string of HTML to set as the content of each matched element.
+     */
+    html(htmlString: string): ChaiJQuery;
+    /**
+     * Set the HTML contents of each element in the set of matched elements.
+     *
+     * @param func A function returning the HTML content to set. Receives the index position of the element in the set and the old HTML value as arguments. jQuery empties the element before calling the function; use the oldhtml argument to reference the previous content. Within the function, this refers to the current element in the set.
+     */
+    html(func: (index: number, oldhtml: string) => string): ChaiJQuery;
+    /**
+     * Set the HTML contents of each element in the set of matched elements.
+     *
+     * @param func A function returning the HTML content to set. Receives the index position of the element in the set and the old HTML value as arguments. jQuery empties the element before calling the function; use the oldhtml argument to reference the previous content. Within the function, this refers to the current element in the set.
+     */
+
+    /**
+     * Get the value of a property for the first element in the set of matched elements.
+     *
+     * @param propertyName The name of the property to get.
+     */
+    prop(propertyName: string): any;
+    /**
+     * Set one or more properties for the set of matched elements.
+     *
+     * @param propertyName The name of the property to set.
+     * @param value A value to set for the property.
+     */
+    prop(propertyName: string, value: string|number|boolean): ChaiJQuery;
+    /**
+     * Set one or more properties for the set of matched elements.
+     *
+     * @param properties An object of property-value pairs to set.
+     */
+    prop(properties: Object): ChaiJQuery;
+    /**
+     * Set one or more properties for the set of matched elements.
+     *
+     * @param propertyName The name of the property to set.
+     * @param func A function returning the value to set. Receives the index position of the element in the set and the old property value as arguments. Within the function, the keyword this refers to the current element.
+     */
+    prop(propertyName: string, func: (index: number, oldPropertyValue: any) => any): ChaiJQuery;
+
+    /**
+     * Remove an attribute from each element in the set of matched elements.
+     *
+     * @param attributeName An attribute to remove; as of version 1.7, it can be a space-separated list of attributes.
+     */
+    removeAttr(attributeName: string): ChaiJQuery;
+
+    /**
+     * Remove a single class, multiple classes, or all classes from each element in the set of matched elements.
+     *
+     * @param className One or more space-separated classes to be removed from the class attribute of each matched element.
+     */
+    removeClass(className?: string): ChaiJQuery;
+    /**
+     * Remove a single class, multiple classes, or all classes from each element in the set of matched elements.
+     *
+     * @param function A function returning one or more space-separated class names to be removed. Receives the index position of the element in the set and the old class value as arguments.
+     */
+    removeClass(func: (index: number, className: string) => string): ChaiJQuery;
+
+    /**
+     * Remove a property for the set of matched elements.
+     *
+     * @param propertyName The name of the property to remove.
+     */
+    removeProp(propertyName: string): ChaiJQuery;
+
+    /**
+     * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.
+     *
+     * @param className One or more class names (separated by spaces) to be toggled for each element in the matched set.
+     * @param swtch A Boolean (not just truthy/falsy) value to determine whether the class should be added or removed.
+     */
+    toggleClass(className: string, swtch?: boolean): ChaiJQuery;
+    /**
+     * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.
+     *
+     * @param swtch A boolean value to determine whether the class should be added or removed.
+     */
+    toggleClass(swtch?: boolean): ChaiJQuery;
+    /**
+     * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.
+     *
+     * @param func A function that returns class names to be toggled in the class attribute of each element in the matched set. Receives the index position of the element in the set, the old class value, and the switch as arguments.
+     * @param swtch A boolean value to determine whether the class should be added or removed.
+     */
+    toggleClass(func: (index: number, className: string, swtch: boolean) => string, swtch?: boolean): ChaiJQuery;
+
+    /**
+     * Get the current value of the first element in the set of matched elements.
+     */
+    val(): any;
+    /**
+     * Set the value of each element in the set of matched elements.
+     *
+     * @param value A string of text or an array of strings corresponding to the value of each matched element to set as selected/checked.
+     */
+    val(value: string|string[]): ChaiJQuery;
+    /**
+     * Set the value of each element in the set of matched elements.
+     *
+     * @param func A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old value as arguments.
+     */
+    val(func: (index: number, value: string) => string): ChaiJQuery;
+
+
+    /**
+     * Get the value of style properties for the first element in the set of matched elements.
+     *
+     * @param propertyName A CSS property.
+     */
+    css(propertyName: string): string;
+    /**
+     * Set one or more CSS properties for the set of matched elements.
+     *
+     * @param propertyName A CSS property name.
+     * @param value A value to set for the property.
+     */
+    css(propertyName: string, value: string|number): ChaiJQuery;
+    /**
+     * Set one or more CSS properties for the set of matched elements.
+     *
+     * @param propertyName A CSS property name.
+     * @param value A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old value as arguments.
+     */
+    css(propertyName: string, value: (index: number, value: string) => string|number): ChaiJQuery;
+    /**
+     * Set one or more CSS properties for the set of matched elements.
+     *
+     * @param properties An object of property-value pairs to set.
+     */
+    css(properties: Object): ChaiJQuery;
+
+    /**
+     * Get the current computed height for the first element in the set of matched elements.
+     */
+    height(): number;
+    /**
+     * Set the CSS height of every matched element.
+     *
+     * @param value An integer representing the number of pixels, or an integer with an optional unit of measure appended (as a string).
+     */
+    height(value: number|string): ChaiJQuery;
+    /**
+     * Set the CSS height of every matched element.
+     *
+     * @param func A function returning the height to set. Receives the index position of the element in the set and the old height as arguments. Within the function, this refers to the current element in the set.
+     */
+    height(func: (index: number, height: number) => number|string): ChaiJQuery;
+
+    /**
+     * Get the current computed height for the first element in the set of matched elements, including padding but not border.
+     */
+    innerHeight(): number;
+
+    /**
+     * Sets the inner height on elements in the set of matched elements, including padding but not border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     */
+    innerHeight(height: number|string): ChaiJQuery;
+
+    /**
+     * Get the current computed width for the first element in the set of matched elements, including padding but not border.
+     */
+    innerWidth(): number;
+
+    /**
+     * Sets the inner width on elements in the set of matched elements, including padding but not border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     */
+    innerWidth(width: number|string): ChaiJQuery;
+
+    /**
+     * Get the current coordinates of the first element in the set of matched elements, relative to the document.
+     */
+    offset(): JQueryCoordinates;
+    /**
+     * An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
+     *
+     * @param coordinates An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
+     */
+    offset(coordinates: JQueryCoordinates): ChaiJQuery;
+    /**
+     * An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
+     *
+     * @param func A function to return the coordinates to set. Receives the index of the element in the collection as the first argument and the current coordinates as the second argument. The function should return an object with the new top and left properties.
+     */
+    offset(func: (index: number, coords: JQueryCoordinates) => JQueryCoordinates): ChaiJQuery;
+
+    /**
+     * Get the current computed height for the first element in the set of matched elements, including padding, border, and optionally margin. Returns an integer (without "px") representation of the value or null if called on an empty set of elements.
+     *
+     * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation.
+     */
+    outerHeight(includeMargin?: boolean): number;
+
+    /**
+     * Sets the outer height on elements in the set of matched elements, including padding and border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     */
+    outerHeight(height: number|string): ChaiJQuery;
+
+    /**
+     * Get the current computed width for the first element in the set of matched elements, including padding and border.
+     *
+     * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation.
+     */
+    outerWidth(includeMargin?: boolean): number;
+
+    /**
+     * Sets the outer width on elements in the set of matched elements, including padding and border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     */
+    outerWidth(width: number|string): ChaiJQuery;
+
+    /**
+     * Get the current coordinates of the first element in the set of matched elements, relative to the offset parent.
+     */
+    position(): JQueryCoordinates;
+
+    /**
+     * Get the current horizontal position of the scroll bar for the first element in the set of matched elements or set the horizontal position of the scroll bar for every matched element.
+     */
+    scrollLeft(): number;
+    /**
+     * Set the current horizontal position of the scroll bar for each of the set of matched elements.
+     *
+     * @param value An integer indicating the new position to set the scroll bar to.
+     */
+    scrollLeft(value: number): ChaiJQuery;
+
+    /**
+     * Get the current vertical position of the scroll bar for the first element in the set of matched elements or set the vertical position of the scroll bar for every matched element.
+     */
+    scrollTop(): number;
+    /**
+     * Set the current vertical position of the scroll bar for each of the set of matched elements.
+     *
+     * @param value An integer indicating the new position to set the scroll bar to.
+     */
+    scrollTop(value: number): ChaiJQuery;
+
+    /**
+     * Get the current computed width for the first element in the set of matched elements.
+     */
+    width(): number;
+    /**
+     * Set the CSS width of each element in the set of matched elements.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     */
+    width(value: number|string): ChaiJQuery;
+    /**
+     * Set the CSS width of each element in the set of matched elements.
+     *
+     * @param func A function returning the width to set. Receives the index position of the element in the set and the old width as arguments. Within the function, this refers to the current element in the set.
+     */
+    width(func: (index: number, width: number) => number|string): ChaiJQuery;
+
+    /**
+     * Remove from the queue all items that have not yet been run.
+     *
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     */
+    clearQueue(queueName?: string): ChaiJQuery;
+
+    /**
+     * Store arbitrary data associated with the matched elements.
+     *
+     * @param key A string naming the piece of data to set.
+     * @param value The new data value; it can be any Javascript type including Array or Object.
+     */
+    data(key: string, value: any): ChaiJQuery;
+    /**
+     * Store arbitrary data associated with the matched elements.
+     *
+     * @param obj An object of key-value pairs of data to update.
+     */
+    data(obj: { [key: string]: any; }): ChaiJQuery;
+    /**
+     * Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute.
+     *
+     * @param key Name of the data stored.
+     */
+    data(key: string): any;
+    /**
+     * Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute.
+     */
+    data(): any;
+
+    /**
+     * Execute the next function on the queue for the matched elements.
+     *
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     */
+    dequeue(queueName?: string): ChaiJQuery;
+
+    /**
+     * Remove a previously-stored piece of data.
+     *
+     * @param name A string naming the piece of data to delete or space-separated string naming the pieces of data to delete.
+     */
+    removeData(name: string): ChaiJQuery;
+    /**
+     * Remove a previously-stored piece of data.
+     *
+     * @param list An array of strings naming the pieces of data to delete.
+     */
+    removeData(list: string[]): ChaiJQuery;
+
+    /**
+     * Return a Promise object to observe when all actions of a certain type bound to the collection, queued or not, have finished.
+     *
+     * @param type The type of queue that needs to be observed. (default: fx)
+     * @param target Object onto which the promise methods have to be attached
+     */
+    promise(type?: string, target?: Object): JQueryPromise<any>;
+
+    /**
+     * Perform a custom animation of a set of CSS properties.
+     *
+     * @param properties An object of CSS properties and values that the animation will move toward.
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     */
+    animate(properties: Object, duration?: string|number, complete?: Function): ChaiJQuery;
+    /**
+     * Perform a custom animation of a set of CSS properties.
+     *
+     * @param properties An object of CSS properties and values that the animation will move toward.
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition. (default: swing)
+     * @param complete A function to call once the animation is complete.
+     */
+    animate(properties: Object, duration?: string|number, easing?: string, complete?: Function): ChaiJQuery;
+    /**
+     * Perform a custom animation of a set of CSS properties.
+     *
+     * @param properties An object of CSS properties and values that the animation will move toward.
+     * @param options A map of additional options to pass to the method.
+     */
+    animate(properties: Object, options: JQueryAnimationOptions): ChaiJQuery;
+
+    /**
+     * Set a timer to delay execution of subsequent items in the queue.
+     *
+     * @param duration An integer indicating the number of milliseconds to delay execution of the next item in the queue.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     */
+    delay(duration: number, queueName?: string): ChaiJQuery;
+
+    /**
+     * Display the matched elements by fading them to opaque.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     */
+    fadeIn(duration?: number|string, complete?: Function): ChaiJQuery;
+    /**
+     * Display the matched elements by fading them to opaque.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     */
+    fadeIn(duration?: number|string, easing?: string, complete?: Function): ChaiJQuery;
+    /**
+     * Display the matched elements by fading them to opaque.
+     *
+     * @param options A map of additional options to pass to the method.
+     */
+    fadeIn(options: JQueryAnimationOptions): ChaiJQuery;
+
+    /**
+     * Hide the matched elements by fading them to transparent.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     */
+    fadeOut(duration?: number|string, complete?: Function): ChaiJQuery;
+    /**
+     * Hide the matched elements by fading them to transparent.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     */
+    fadeOut(duration?: number|string, easing?: string, complete?: Function): ChaiJQuery;
+    /**
+     * Hide the matched elements by fading them to transparent.
+     *
+     * @param options A map of additional options to pass to the method.
+     */
+    fadeOut(options: JQueryAnimationOptions): ChaiJQuery;
+
+    /**
+     * Adjust the opacity of the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param opacity A number between 0 and 1 denoting the target opacity.
+     * @param complete A function to call once the animation is complete.
+     */
+    fadeTo(duration: string|number, opacity: number, complete?: Function): ChaiJQuery;
+    /**
+     * Adjust the opacity of the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param opacity A number between 0 and 1 denoting the target opacity.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     */
+    fadeTo(duration: string|number, opacity: number, easing?: string, complete?: Function): ChaiJQuery;
+
+    /**
+     * Display or hide the matched elements by animating their opacity.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     */
+    fadeToggle(duration?: number|string, complete?: Function): ChaiJQuery;
+    /**
+     * Display or hide the matched elements by animating their opacity.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     */
+    fadeToggle(duration?: number|string, easing?: string, complete?: Function): ChaiJQuery;
+    /**
+     * Display or hide the matched elements by animating their opacity.
+     *
+     * @param options A map of additional options to pass to the method.
+     */
+    fadeToggle(options: JQueryAnimationOptions): ChaiJQuery;
+
+    /**
+     * Stop the currently-running animation, remove all queued animations, and complete all animations for the matched elements.
+     *
+     * @param queue The name of the queue in which to stop animations.
+     */
+    finish(queue?: string): ChaiJQuery;
+
+    /**
+     * Hide the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     */
+    hide(duration?: number|string, complete?: Function): ChaiJQuery;
+    /**
+     * Hide the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     */
+    hide(duration?: number|string, easing?: string, complete?: Function): ChaiJQuery;
+    /**
+     * Hide the matched elements.
+     *
+     * @param options A map of additional options to pass to the method.
+     */
+    hide(options: JQueryAnimationOptions): ChaiJQuery;
+
+    /**
+     * Display the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     */
+    show(duration?: number|string, complete?: Function): ChaiJQuery;
+    /**
+     * Display the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     */
+    show(duration?: number|string, easing?: string, complete?: Function): ChaiJQuery;
+    /**
+     * Display the matched elements.
+     *
+     * @param options A map of additional options to pass to the method.
+     */
+    show(options: JQueryAnimationOptions): ChaiJQuery;
+
+    /**
+     * Display the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     */
+    slideDown(duration?: number|string, complete?: Function): ChaiJQuery;
+    /**
+     * Display the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     */
+    slideDown(duration?: number|string, easing?: string, complete?: Function): ChaiJQuery;
+    /**
+     * Display the matched elements with a sliding motion.
+     *
+     * @param options A map of additional options to pass to the method.
+     */
+    slideDown(options: JQueryAnimationOptions): ChaiJQuery;
+
+    /**
+     * Display or hide the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     */
+    slideToggle(duration?: number|string, complete?: Function): ChaiJQuery;
+    /**
+     * Display or hide the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     */
+    slideToggle(duration?: number|string, easing?: string, complete?: Function): ChaiJQuery;
+    /**
+     * Display or hide the matched elements with a sliding motion.
+     *
+     * @param options A map of additional options to pass to the method.
+     */
+    slideToggle(options: JQueryAnimationOptions): ChaiJQuery;
+
+    /**
+     * Hide the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     */
+    slideUp(duration?: number|string, complete?: Function): ChaiJQuery;
+    /**
+     * Hide the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     */
+    slideUp(duration?: number|string, easing?: string, complete?: Function): ChaiJQuery;
+    /**
+     * Hide the matched elements with a sliding motion.
+     *
+     * @param options A map of additional options to pass to the method.
+     */
+    slideUp(options: JQueryAnimationOptions): ChaiJQuery;
+
+    /**
+     * Stop the currently-running animation on the matched elements.
+     *
+     * @param clearQueue A Boolean indicating whether to remove queued animation as well. Defaults to false.
+     * @param jumpToEnd A Boolean indicating whether to complete the current animation immediately. Defaults to false.
+     */
+    stop(clearQueue?: boolean, jumpToEnd?: boolean): ChaiJQuery;
+    /**
+     * Stop the currently-running animation on the matched elements.
+     *
+     * @param queue The name of the queue in which to stop animations.
+     * @param clearQueue A Boolean indicating whether to remove queued animation as well. Defaults to false.
+     * @param jumpToEnd A Boolean indicating whether to complete the current animation immediately. Defaults to false.
+     */
+    stop(queue?: string, clearQueue?: boolean, jumpToEnd?: boolean): ChaiJQuery;
+
+    /**
+     * Display or hide the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     */
+    toggle(duration?: number|string, complete?: Function): ChaiJQuery;
+    /**
+     * Display or hide the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     */
+    toggle(duration?: number|string, easing?: string, complete?: Function): ChaiJQuery;
+    /**
+     * Display or hide the matched elements.
+     *
+     * @param options A map of additional options to pass to the method.
+     */
+    toggle(options: JQueryAnimationOptions): ChaiJQuery;
+    /**
+     * Display or hide the matched elements.
+     *
+     * @param showOrHide A Boolean indicating whether to show or hide the elements.
+     */
+    toggle(showOrHide: boolean): ChaiJQuery;
+
+    /**
+     * Attach a handler to an event for the elements.
+     *
+     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    bind(eventType: string, eventData: any, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Attach a handler to an event for the elements.
+     *
+     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    bind(eventType: string, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Attach a handler to an event for the elements.
+     *
+     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param preventBubble Setting the third argument to false will attach a function that prevents the default action from occurring and stops the event from bubbling. The default is true.
+     */
+    bind(eventType: string, eventData: any, preventBubble: boolean): ChaiJQuery;
+    /**
+     * Attach a handler to an event for the elements.
+     *
+     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+     * @param preventBubble Setting the third argument to false will attach a function that prevents the default action from occurring and stops the event from bubbling. The default is true.
+     */
+    bind(eventType: string, preventBubble: boolean): ChaiJQuery;
+    /**
+     * Attach a handler to an event for the elements.
+     *
+     * @param events An object containing one or more DOM event types and functions to execute for them.
+     */
+    bind(events: any): ChaiJQuery;
+
+    /**
+     * Trigger the "blur" event on an element
+     */
+    blur(): ChaiJQuery;
+    /**
+     * Bind an event handler to the "blur" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    blur(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to the "blur" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    blur(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+
+    /**
+     * Trigger the "change" event on an element.
+     */
+    change(): ChaiJQuery;
+    /**
+     * Bind an event handler to the "change" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    change(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to the "change" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    change(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+
+    /**
+     * Trigger the "click" event on an element.
+     */
+    click(): ChaiJQuery;
+    /**
+     * Bind an event handler to the "click" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     */
+    click(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to the "click" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    click(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+
+    /**
+     * Trigger the "dblclick" event on an element.
+     */
+    dblclick(): ChaiJQuery;
+    /**
+     * Bind an event handler to the "dblclick" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    dblclick(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to the "dblclick" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    dblclick(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+
+    delegate(selector: any, eventType: string, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    delegate(selector: any, eventType: string, eventData: any, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+
+    /**
+     * Trigger the "focus" event on an element.
+     */
+    focus(): ChaiJQuery;
+    /**
+     * Bind an event handler to the "focus" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    focus(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to the "focus" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    focus(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+
+    /**
+     * Bind an event handler to the "focusin" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    focusin(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to the "focusin" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    focusin(eventData: Object, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+
+    /**
+     * Bind an event handler to the "focusout" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    focusout(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to the "focusout" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    focusout(eventData: Object, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+
+    /**
+     * Bind two handlers to the matched elements, to be executed when the mouse pointer enters and leaves the elements.
+     *
+     * @param handlerIn A function to execute when the mouse pointer enters the element.
+     * @param handlerOut A function to execute when the mouse pointer leaves the element.
+     */
+    hover(handlerIn: (eventObject: JQueryEventObject) => any, handlerOut: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Bind a single handler to the matched elements, to be executed when the mouse pointer enters or leaves the elements.
+     *
+     * @param handlerInOut A function to execute when the mouse pointer enters or leaves the element.
+     */
+    hover(handlerInOut: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+
+    /**
+     * Trigger the "keydown" event on an element.
+     */
+    keydown(): ChaiJQuery;
+    /**
+     * Bind an event handler to the "keydown" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    keydown(handler: (eventObject: JQueryKeyEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to the "keydown" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    keydown(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): ChaiJQuery;
+
+    /**
+     * Trigger the "keypress" event on an element.
+     */
+    keypress(): ChaiJQuery;
+    /**
+     * Bind an event handler to the "keypress" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    keypress(handler: (eventObject: JQueryKeyEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to the "keypress" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    keypress(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): ChaiJQuery;
+
+    /**
+     * Trigger the "keyup" event on an element.
+     */
+    keyup(): ChaiJQuery;
+    /**
+     * Bind an event handler to the "keyup" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    keyup(handler: (eventObject: JQueryKeyEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to the "keyup" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    keyup(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): ChaiJQuery;
+
+    /**
+     * Bind an event handler to the "load" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     */
+    load(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to the "load" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     */
+    load(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+
+    /**
+     * Trigger the "mousedown" event on an element.
+     */
+    mousedown(): ChaiJQuery;
+    /**
+     * Bind an event handler to the "mousedown" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     */
+    mousedown(handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to the "mousedown" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     */
+    mousedown(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
+
+    /**
+     * Trigger the "mouseenter" event on an element.
+     */
+    mouseenter(): ChaiJQuery;
+    /**
+     * Bind an event handler to be fired when the mouse enters an element.
+     *
+     * @param handler A function to execute when the event is triggered.
+     */
+    mouseenter(handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to be fired when the mouse enters an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     */
+    mouseenter(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
+
+    /**
+     * Trigger the "mouseleave" event on an element.
+     */
+    mouseleave(): ChaiJQuery;
+    /**
+     * Bind an event handler to be fired when the mouse leaves an element.
+     *
+     * @param handler A function to execute when the event is triggered.
+     */
+    mouseleave(handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to be fired when the mouse leaves an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     */
+    mouseleave(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
+
+    /**
+     * Trigger the "mousemove" event on an element.
+     */
+    mousemove(): ChaiJQuery;
+    /**
+     * Bind an event handler to the "mousemove" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     */
+    mousemove(handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to the "mousemove" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     */
+    mousemove(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
+
+    /**
+     * Trigger the "mouseout" event on an element.
+     */
+    mouseout(): ChaiJQuery;
+    /**
+     * Bind an event handler to the "mouseout" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     */
+    mouseout(handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to the "mouseout" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     */
+    mouseout(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
+
+    /**
+     * Trigger the "mouseover" event on an element.
+     */
+    mouseover(): ChaiJQuery;
+    /**
+     * Bind an event handler to the "mouseover" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     */
+    mouseover(handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to the "mouseover" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     */
+    mouseover(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
+
+    /**
+     * Trigger the "mouseup" event on an element.
+     */
+    mouseup(): ChaiJQuery;
+    /**
+     * Bind an event handler to the "mouseup" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     */
+    mouseup(handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to the "mouseup" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     */
+    mouseup(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): ChaiJQuery;
+
+    /**
+     * Remove an event handler.
+     */
+    off(): ChaiJQuery;
+    /**
+     * Remove an event handler.
+     *
+     * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin".
+     * @param selector A selector which should match the one originally passed to .on() when attaching event handlers.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: string, selector?: string, handler?: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Remove an event handler.
+     *
+     * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin".
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: string, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Remove an event handler.
+     *
+     * @param events An object where the string keys represent one or more space-separated event types and optional namespaces, and the values represent handler functions previously attached for the event(s).
+     * @param selector A selector which should match the one originally passed to .on() when attaching event handlers.
+     */
+    off(events: { [key: string]: any; }, selector?: string): ChaiJQuery;
+
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: string, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): ChaiJQuery;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: string, data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): ChaiJQuery;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: string, selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): ChaiJQuery;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: string, selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): ChaiJQuery;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
+     * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If the selector is null or omitted, the handler is always called when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event occurs.
+     */
+    on(events: { [key: string]: any; }, selector?: string, data?: any): ChaiJQuery;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
+     * @param data Data to be passed to the handler in event.data when an event occurs.
+     */
+    on(events: { [key: string]: any; }, data?: any): ChaiJQuery;
+
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events A string containing one or more JavaScript event types, such as "click" or "submit," or custom event names.
+     * @param handler A function to execute at the time the event is triggered.
+     */
+    one(events: string, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events A string containing one or more JavaScript event types, such as "click" or "submit," or custom event names.
+     * @param data An object containing data that will be passed to the event handler.
+     * @param handler A function to execute at the time the event is triggered.
+     */
+    one(events: string, data: Object, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    one(events: string, selector: string, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    one(events: string, selector: string, data: any, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
+     * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If the selector is null or omitted, the handler is always called when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event occurs.
+     */
+    one(events: { [key: string]: any; }, selector?: string, data?: any): ChaiJQuery;
+
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
+     * @param data Data to be passed to the handler in event.data when an event occurs.
+     */
+    one(events: { [key: string]: any; }, data?: any): ChaiJQuery;
+
+
+    /**
+     * Specify a function to execute when the DOM is fully loaded.
+     *
+     * @param handler A function to execute after the DOM is ready.
+     */
+    ready(handler: Function): ChaiJQuery;
+
+    /**
+     * Trigger the "resize" event on an element.
+     */
+    resize(): ChaiJQuery;
+    /**
+     * Bind an event handler to the "resize" JavaScript event.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    resize(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to the "resize" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    resize(eventData: Object, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+
+    /**
+     * Trigger the "scroll" event on an element.
+     */
+    scroll(): ChaiJQuery;
+    /**
+     * Bind an event handler to the "scroll" JavaScript event.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    scroll(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to the "scroll" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    scroll(eventData: Object, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+
+    /**
+     * Trigger the "select" event on an element.
+     */
+    select(): ChaiJQuery;
+    /**
+     * Bind an event handler to the "select" JavaScript event.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    select(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to the "select" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    select(eventData: Object, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+
+    /**
+     * Trigger the "submit" event on an element.
+     */
+    submit(): ChaiJQuery;
+    /**
+     * Bind an event handler to the "submit" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    submit(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to the "submit" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    submit(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+
+    /**
+     * Execute all handlers and behaviors attached to the matched elements for the given event type.
+     *
+     * @param eventType A string containing a JavaScript event type, such as click or submit.
+     * @param extraParameters Additional parameters to pass along to the event handler.
+     */
+    trigger(eventType: string, extraParameters?: any[]|Object): ChaiJQuery;
+    /**
+     * Execute all handlers and behaviors attached to the matched elements for the given event type.
+     *
+     * @param event A jQuery.Event object.
+     * @param extraParameters Additional parameters to pass along to the event handler.
+     */
+    trigger(event: JQueryEventObject, extraParameters?: any[]|Object): ChaiJQuery;
+
+    /**
+     * Execute all handlers attached to an element for an event.
+     *
+     * @param eventType A string containing a JavaScript event type, such as click or submit.
+     * @param extraParameters An array of additional parameters to pass along to the event handler.
+     */
+    triggerHandler(eventType: string, ...extraParameters: any[]): Object;
+
+    /**
+     * Remove a previously-attached event handler from the elements.
+     *
+     * @param eventType A string containing a JavaScript event type, such as click or submit.
+     * @param handler The function that is to be no longer executed.
+     */
+    unbind(eventType?: string, handler?: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Remove a previously-attached event handler from the elements.
+     *
+     * @param eventType A string containing a JavaScript event type, such as click or submit.
+     * @param fls Unbinds the corresponding 'return false' function that was bound using .bind( eventType, false ).
+     */
+    unbind(eventType: string, fls: boolean): ChaiJQuery;
+    /**
+     * Remove a previously-attached event handler from the elements.
+     *
+     * @param evt A JavaScript event object as passed to an event handler.
+     */
+    unbind(evt: any): ChaiJQuery;
+
+    /**
+     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
+     */
+    undelegate(): ChaiJQuery;
+    /**
+     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
+     *
+     * @param selector A selector which will be used to filter the event results.
+     * @param eventType A string containing a JavaScript event type, such as "click" or "keydown"
+     * @param handler A function to execute at the time the event is triggered.
+     */
+    undelegate(selector: string, eventType: string, handler?: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
+     *
+     * @param selector A selector which will be used to filter the event results.
+     * @param events An object of one or more event types and previously bound functions to unbind from them.
+     */
+    undelegate(selector: string, events: Object): ChaiJQuery;
+    /**
+     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
+     *
+     * @param namespace A string containing a namespace to unbind all events from.
+     */
+    undelegate(namespace: string): ChaiJQuery;
+
+    /**
+     * Bind an event handler to the "unload" JavaScript event. (DEPRECATED from v1.8)
+     *
+     * @param handler A function to execute when the event is triggered.
+     */
+    unload(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to the "unload" JavaScript event. (DEPRECATED from v1.8)
+     *
+     * @param eventData A plain object of data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     */
+    unload(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+
+    /**
+     * The DOM node context originally passed to jQuery(); if none was passed then context will likely be the document. (DEPRECATED from v1.10)
+     */
+    context: Element;
+
+    jquery: string;
+
+    /**
+     * Bind an event handler to the "error" JavaScript event. (DEPRECATED from v1.8)
+     *
+     * @param handler A function to execute when the event is triggered.
+     */
+    error(handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+    /**
+     * Bind an event handler to the "error" JavaScript event. (DEPRECATED from v1.8)
+     *
+     * @param eventData A plain object of data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     */
+    error(eventData: any, handler: (eventObject: JQueryEventObject) => any): ChaiJQuery;
+
+    /**
+     * Add a collection of DOM elements onto the jQuery stack.
+     *
+     * @param elements An array of elements to push onto the stack and make into a new jQuery object.
+     */
+    pushStack(elements: any[]): ChaiJQuery;
+    /**
+     * Add a collection of DOM elements onto the jQuery stack.
+     *
+     * @param elements An array of elements to push onto the stack and make into a new jQuery object.
+     * @param name The name of a jQuery method that generated the array of elements.
+     * @param arguments The arguments that were passed in to the jQuery method (for serialization).
+     */
+    pushStack(elements: any[], name: string, arguments: any[]): ChaiJQuery;
+
+    /**
+     * Insert content, specified by the parameter, after each element in the set of matched elements.
+     *
+     * param content1 HTML string, DOM element, array of elements, or jQuery object to insert after each element in the set of matched elements.
+     * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert after each element in the set of matched elements.
+     */
+    after(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): ChaiJQuery;
+    /**
+     * Insert content, specified by the parameter, after each element in the set of matched elements.
+     *
+     * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert after each element in the set of matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
+     */
+    after(func: (index: number, html: string) => string|Element|JQuery): ChaiJQuery;
+
+    /**
+     * Insert content, specified by the parameter, to the end of each element in the set of matched elements.
+     *
+     * param content1 DOM element, array of elements, HTML string, or jQuery object to insert at the end of each element in the set of matched elements.
+     * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the end of each element in the set of matched elements.
+     */
+    append(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): ChaiJQuery;
+    /**
+     * Insert content, specified by the parameter, to the end of each element in the set of matched elements.
+     *
+     * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert at the end of each element in the set of matched elements. Receives the index position of the element in the set and the old HTML value of the element as arguments. Within the function, this refers to the current element in the set.
+     */
+    append(func: (index: number, html: string) => string|Element|JQuery): ChaiJQuery;
+
+    /**
+     * Insert every element in the set of matched elements to the end of the target.
+     *
+     * @param target A selector, element, HTML string, array of elements, or jQuery object; the matched set of elements will be inserted at the end of the element(s) specified by this parameter.
+     */
+    appendTo(target: JQuery|any[]|Element|string): ChaiJQuery;
+
+    /**
+     * Insert content, specified by the parameter, before each element in the set of matched elements.
+     *
+     * param content1 HTML string, DOM element, array of elements, or jQuery object to insert before each element in the set of matched elements.
+     * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert before each element in the set of matched elements.
+     */
+    before(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): ChaiJQuery;
+    /**
+     * Insert content, specified by the parameter, before each element in the set of matched elements.
+     *
+     * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert before each element in the set of matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
+     */
+    before(func: (index: number, html: string) => string|Element|JQuery): ChaiJQuery;
+
+    /**
+     * Create a deep copy of the set of matched elements.
+     *
+     * param withDataAndEvents A Boolean indicating whether event handlers and data should be copied along with the elements. The default value is false.
+     * param deepWithDataAndEvents A Boolean indicating whether event handlers and data for all children of the cloned element should be copied. By default its value matches the first argument's value (which defaults to false).
+     */
+    clone(withDataAndEvents?: boolean, deepWithDataAndEvents?: boolean): ChaiJQuery;
+
+    /**
+     * Remove the set of matched elements from the DOM.
+     *
+     * param selector A selector expression that filters the set of matched elements to be removed.
+     */
+    detach(selector?: string): ChaiJQuery;
+
+    /**
+     * Remove all child nodes of the set of matched elements from the DOM.
+     */
+    empty(): ChaiJQuery;
+
+    /**
+     * Insert every element in the set of matched elements after the target.
+     *
+     * param target A selector, element, array of elements, HTML string, or jQuery object; the matched set of elements will be inserted after the element(s) specified by this parameter.
+     */
+    insertAfter(target: JQuery|any[]|Element|Text|string): ChaiJQuery;
+
+    /**
+     * Insert every element in the set of matched elements before the target.
+     *
+     * param target A selector, element, array of elements, HTML string, or jQuery object; the matched set of elements will be inserted before the element(s) specified by this parameter.
+     */
+    insertBefore(target: JQuery|any[]|Element|Text|string): ChaiJQuery;
+
+    /**
+     * Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.
+     *
+     * param content1 DOM element, array of elements, HTML string, or jQuery object to insert at the beginning of each element in the set of matched elements.
+     * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the beginning of each element in the set of matched elements.
+     */
+    prepend(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): ChaiJQuery;
+    /**
+     * Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.
+     *
+     * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert at the beginning of each element in the set of matched elements. Receives the index position of the element in the set and the old HTML value of the element as arguments. Within the function, this refers to the current element in the set.
+     */
+    prepend(func: (index: number, html: string) => string|Element|JQuery): ChaiJQuery;
+
+    /**
+     * Insert every element in the set of matched elements to the beginning of the target.
+     *
+     * @param target A selector, element, HTML string, array of elements, or jQuery object; the matched set of elements will be inserted at the beginning of the element(s) specified by this parameter.
+     */
+    prependTo(target: JQuery|any[]|Element|string): ChaiJQuery;
+
+    /**
+     * Remove the set of matched elements from the DOM.
+     *
+     * @param selector A selector expression that filters the set of matched elements to be removed.
+     */
+    remove(selector?: string): ChaiJQuery;
+
+    /**
+     * Replace each target element with the set of matched elements.
+     *
+     * @param target A selector string, jQuery object, DOM element, or array of elements indicating which element(s) to replace.
+     */
+    replaceAll(target: JQuery|any[]|Element|string): ChaiJQuery;
+
+    /**
+     * Replace each element in the set of matched elements with the provided new content and return the set of elements that was removed.
+     *
+     * param newContent The content to insert. May be an HTML string, DOM element, array of DOM elements, or jQuery object.
+     */
+    replaceWith(newContent: JQuery|any[]|Element|Text|string): ChaiJQuery;
+    /**
+     * Replace each element in the set of matched elements with the provided new content and return the set of elements that was removed.
+     *
+     * param func A function that returns content with which to replace the set of matched elements.
+     */
+    replaceWith(func: () => Element|JQuery): ChaiJQuery;
+
+    /**
+     * Get the combined text contents of each element in the set of matched elements, including their descendants.
+     */
+    text(): string;
+    /**
+     * Set the content of each element in the set of matched elements to the specified text.
+     *
+     * @param text The text to set as the content of each matched element. When Number or Boolean is supplied, it will be converted to a String representation.
+     */
+    text(text: string|number|boolean): ChaiJQuery;
+    /**
+     * Set the content of each element in the set of matched elements to the specified text.
+     *
+     * @param func A function returning the text content to set. Receives the index position of the element in the set and the old text value as arguments.
+     */
+    text(func: (index: number, text: string) => string): ChaiJQuery;
+
+    /**
+     * Retrieve all the elements contained in the jQuery set, as an array.
+     */
+    toArray(): any[];
+
+    /**
+     * Remove the parents of the set of matched elements from the DOM, leaving the matched elements in their place.
+     */
+    unwrap(): ChaiJQuery;
+
+    /**
+     * Wrap an HTML structure around each element in the set of matched elements.
+     *
+     * @param wrappingElement A selector, element, HTML string, or jQuery object specifying the structure to wrap around the matched elements.
+     */
+    wrap(wrappingElement: JQuery|Element|string): ChaiJQuery;
+    /**
+     * Wrap an HTML structure around each element in the set of matched elements.
+     *
+     * @param func A callback function returning the HTML content or jQuery object to wrap around the matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
+     */
+    wrap(func: (index: number) => string|JQuery): ChaiJQuery;
+
+    /**
+     * Wrap an HTML structure around all elements in the set of matched elements.
+     *
+     * @param wrappingElement A selector, element, HTML string, or jQuery object specifying the structure to wrap around the matched elements.
+     */
+    wrapAll(wrappingElement: JQuery|Element|string): ChaiJQuery;
+    wrapAll(func: (index: number) => string): ChaiJQuery;
+
+    /**
+     * Wrap an HTML structure around the content of each element in the set of matched elements.
+     *
+     * @param wrappingElement An HTML snippet, selector expression, jQuery object, or DOM element specifying the structure to wrap around the content of the matched elements.
+     */
+    wrapInner(wrappingElement: JQuery|Element|string): ChaiJQuery;
+    /**
+     * Wrap an HTML structure around the content of each element in the set of matched elements.
+     *
+     * @param func A callback function which generates a structure to wrap around the content of the matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
+     */
+    wrapInner(func: (index: number) => string): ChaiJQuery;
+
+    /**
+     * Iterate over a jQuery object, executing a function for each matched element.
+     *
+     * @param func A function to execute for each matched element.
+     */
+    each(func: (index: number, elem: Element) => any): ChaiJQuery;
+
+    /**
+     * Retrieve one of the elements matched by the jQuery object.
+     *
+     * @param index A zero-based integer indicating which element to retrieve.
+     */
+    get(index: number): HTMLElement;
+    /**
+     * Retrieve the elements matched by the jQuery object.
+     */
+    get(): any[];
+
+    /**
+     * Search for a given element from among the matched elements.
+     */
+    index(): number;
+    /**
+     * Search for a given element from among the matched elements.
+     *
+     * @param selector A selector representing a jQuery collection in which to look for an element.
+     */
+    index(selector: string|JQuery|Element): number;
+
+    /**
+     * The number of elements in the jQuery object.
+     */
+    length: number;
+    /**
+     * A selector representing selector passed to jQuery(), if any, when creating the original set.
+     * version deprecated: 1.7, removed: 1.9
+     */
+    selector: string;
+    [index: string]: any;
+    [index: number]: HTMLElement;
+
+    /**
+     * Add elements to the set of matched elements.
+     *
+     * @param selector A string representing a selector expression to find additional elements to add to the set of matched elements.
+     * @param context The point in the document at which the selector should begin matching; similar to the context argument of the $(selector, context) method.
+     */
+    add(selector: string, context?: Element): ChaiJQuery;
+    /**
+     * Add elements to the set of matched elements.
+     *
+     * @param elements One or more elements to add to the set of matched elements.
+     */
+    add(...elements: Element[]): ChaiJQuery;
+    /**
+     * Add elements to the set of matched elements.
+     *
+     * @param html An HTML fragment to add to the set of matched elements.
+     */
+    add(html: string): ChaiJQuery;
+    /**
+     * Add elements to the set of matched elements.
+     *
+     * @param obj An existing jQuery object to add to the set of matched elements.
+     */
+    add(obj: JQuery): ChaiJQuery;
+
+    /**
+     * Get the children of each element in the set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    children(selector?: string): ChaiJQuery;
+
+    /**
+     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    closest(selector: string): ChaiJQuery;
+    /**
+     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @param context A DOM element within which a matching element may be found. If no context is passed in then the context of the jQuery set will be used instead.
+     */
+    closest(selector: string, context?: Element): ChaiJQuery;
+    /**
+     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
+     *
+     * @param obj A jQuery object to match elements against.
+     */
+    closest(obj: JQuery): ChaiJQuery;
+    /**
+     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
+     *
+     * @param element An element to match elements against.
+     */
+    closest(element: Element): ChaiJQuery;
+
+    /**
+     * Get an array of all the elements and selectors matched against the current element up through the DOM tree.
+     *
+     * @param selectors An array or string containing a selector expression to match elements against (can also be a jQuery object).
+     * @param context A DOM element within which a matching element may be found. If no context is passed in then the context of the jQuery set will be used instead.
+     */
+    closest(selectors: any, context?: Element): any[];
+
+    /**
+     * Get the children of each element in the set of matched elements, including text and comment nodes.
+     */
+    contents(): ChaiJQuery;
+
+    /**
+     * End the most recent filtering operation in the current chain and return the set of matched elements to its previous state.
+     */
+    end(): ChaiJQuery;
+
+    /**
+     * Reduce the set of matched elements to the one at the specified index.
+     *
+     * @param index An integer indicating the 0-based position of the element. OR An integer indicating the position of the element, counting backwards from the last element in the set.
+     *
+     */
+    eq(index: number): ChaiJQuery;
+
+    /**
+     * Reduce the set of matched elements to those that match the selector or pass the function's test.
+     *
+     * @param selector A string containing a selector expression to match the current set of elements against.
+     */
+    filter(selector: string): ChaiJQuery;
+    /**
+     * Reduce the set of matched elements to those that match the selector or pass the function's test.
+     *
+     * @param func A function used as a test for each element in the set. this is the current DOM element.
+     */
+    filter(func: (index: number, element: Element) => any): ChaiJQuery;
+    /**
+     * Reduce the set of matched elements to those that match the selector or pass the function's test.
+     *
+     * @param element An element to match the current set of elements against.
+     */
+    filter(element: Element): ChaiJQuery;
+    /**
+     * Reduce the set of matched elements to those that match the selector or pass the function's test.
+     *
+     * @param obj An existing jQuery object to match the current set of elements against.
+     */
+    filter(obj: JQuery): ChaiJQuery;
+
+    /**
+     * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    find(selector: string): ChaiJQuery;
+    /**
+     * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.
+     *
+     * @param element An element to match elements against.
+     */
+    find(element: Element): ChaiJQuery;
+    /**
+     * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.
+     *
+     * @param obj A jQuery object to match elements against.
+     */
+    find(obj: JQuery): ChaiJQuery;
+
+    /**
+     * Reduce the set of matched elements to the first in the set.
+     */
+    first(): ChaiJQuery;
+
+    /**
+     * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    has(selector: string): ChaiJQuery;
+    /**
+     * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.
+     *
+     * @param contained A DOM element to match elements against.
+     */
+    has(contained: Element): ChaiJQuery;
+
+    /**
+     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    is(selector: string): boolean;
+    /**
+     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
+     *
+     * @param func A function used as a test for the set of elements. It accepts one argument, index, which is the element's index in the jQuery collection.Within the function, this refers to the current DOM element.
+     */
+    is(func: (index: number, element: Element) => boolean): boolean;
+    /**
+     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
+     *
+     * @param obj An existing jQuery object to match the current set of elements against.
+     */
+    is(obj: JQuery): boolean;
+    /**
+     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
+     *
+     * @param elements One or more elements to match the current set of elements against.
+     */
+    is(elements: any): boolean;
+
+    /**
+     * Reduce the set of matched elements to the final one in the set.
+     */
+    last(): ChaiJQuery;
+
+    /**
+     * Pass each element in the current matched set through a function, producing a new jQuery object containing the return values.
+     *
+     * @param callback A function object that will be invoked for each element in the current set.
+     */
+    map(callback: (index: number, domElement: Element) => any): ChaiJQuery;
+
+    /**
+     * Get the immediately following sibling of each element in the set of matched elements. If a selector is provided, it retrieves the next sibling only if it matches that selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    next(selector?: string): ChaiJQuery;
+
+    /**
+     * Get all following siblings of each element in the set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    nextAll(selector?: string): ChaiJQuery;
+
+    /**
+     * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.
+     *
+     * @param selector A string containing a selector expression to indicate where to stop matching following sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     */
+    nextUntil(selector?: string, filter?: string): ChaiJQuery;
+    /**
+     * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.
+     *
+     * @param element A DOM node or jQuery object indicating where to stop matching following sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     */
+    nextUntil(element?: Element, filter?: string): ChaiJQuery;
+    /**
+     * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.
+     *
+     * @param obj A DOM node or jQuery object indicating where to stop matching following sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     */
+    nextUntil(obj?: JQuery, filter?: string): ChaiJQuery;
+
+    /**
+     * Remove elements from the set of matched elements.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    not(selector: string): ChaiJQuery;
+    /**
+     * Remove elements from the set of matched elements.
+     *
+     * @param func A function used as a test for each element in the set. this is the current DOM element.
+     */
+    not(func: (index: number, element: Element) => boolean): ChaiJQuery;
+    /**
+     * Remove elements from the set of matched elements.
+     *
+     * @param elements One or more DOM elements to remove from the matched set.
+     */
+    not(...elements: Element[]): ChaiJQuery;
+    /**
+     * Remove elements from the set of matched elements.
+     *
+     * @param obj An existing jQuery object to match the current set of elements against.
+     */
+    not(obj: JQuery): ChaiJQuery;
+
+    /**
+     * Get the closest ancestor element that is positioned.
+     */
+    offsetParent(): ChaiJQuery;
+
+    /**
+     * Get the parent of each element in the current set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    parent(selector?: string): ChaiJQuery;
+
+    /**
+     * Get the ancestors of each element in the current set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    parents(selector?: string): ChaiJQuery;
+
+    /**
+     * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.
+     *
+     * @param selector A string containing a selector expression to indicate where to stop matching ancestor elements.
+     * @param filter A string containing a selector expression to match elements against.
+     */
+    parentsUntil(selector?: string, filter?: string): ChaiJQuery;
+    /**
+     * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.
+     *
+     * @param element A DOM node or jQuery object indicating where to stop matching ancestor elements.
+     * @param filter A string containing a selector expression to match elements against.
+     */
+    parentsUntil(element?: Element, filter?: string): ChaiJQuery;
+    /**
+     * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.
+     *
+     * @param obj A DOM node or jQuery object indicating where to stop matching ancestor elements.
+     * @param filter A string containing a selector expression to match elements against.
+     */
+    parentsUntil(obj?: JQuery, filter?: string): ChaiJQuery;
+
+    /**
+     * Get the immediately preceding sibling of each element in the set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    prev(selector?: string): ChaiJQuery;
+
+    /**
+     * Get all preceding siblings of each element in the set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    prevAll(selector?: string): ChaiJQuery;
+
+    /**
+     * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.
+     *
+     * @param selector A string containing a selector expression to indicate where to stop matching preceding sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     */
+    prevUntil(selector?: string, filter?: string): ChaiJQuery;
+    /**
+     * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.
+     *
+     * @param element A DOM node or jQuery object indicating where to stop matching preceding sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     */
+    prevUntil(element?: Element, filter?: string): ChaiJQuery;
+    /**
+     * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.
+     *
+     * @param obj A DOM node or jQuery object indicating where to stop matching preceding sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     */
+    prevUntil(obj?: JQuery, filter?: string): ChaiJQuery;
+
+    /**
+     * Get the siblings of each element in the set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    siblings(selector?: string): ChaiJQuery;
+
+    /**
+     * Reduce the set of matched elements to a subset specified by a range of indices.
+     *
+     * @param start An integer indicating the 0-based position at which the elements begin to be selected. If negative, it indicates an offset from the end of the set.
+     * @param end An integer indicating the 0-based position at which the elements stop being selected. If negative, it indicates an offset from the end of the set. If omitted, the range continues until the end of the set.
+     */
+    slice(start: number, end?: number): ChaiJQuery;
+
+    /**
+     * Show the queue of functions to be executed on the matched elements.
+     *
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     */
+    queue(queueName?: string): any[];
+    /**
+     * Manipulate the queue of functions to be executed, once for each matched element.
+     *
+     * @param newQueue An array of functions to replace the current queue contents.
+     */
+    queue(newQueue: Function[]): ChaiJQuery;
+    /**
+     * Manipulate the queue of functions to be executed, once for each matched element.
+     *
+     * @param callback The new function to add to the queue, with a function to call that will dequeue the next item.
+     */
+    queue(callback: Function): ChaiJQuery;
+    /**
+     * Manipulate the queue of functions to be executed, once for each matched element.
+     *
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @param newQueue An array of functions to replace the current queue contents.
+     */
+    queue(queueName: string, newQueue: Function[]): ChaiJQuery;
+    /**
+     * Manipulate the queue of functions to be executed, once for each matched element.
+     *
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @param callback The new function to add to the queue, with a function to call that will dequeue the next item.
+     */
+    queue(queueName: string, callback: Function): ChaiJQuery;
+    should: Chai.Assertion;
+}
diff --git a/chai-jquery/tsconfig.json b/chai-jquery/tsconfig.json
new file mode 100644
index 0000000000..3026631bf7
--- /dev/null
+++ b/chai-jquery/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "chai-jquery-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/chai-string/chai-string-tests.ts b/chai-string/chai-string-tests.ts
index f5380b0768..af18987bb5 100644
--- a/chai-string/chai-string-tests.ts
+++ b/chai-string/chai-string-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="chai-string.d.ts" />
-/// <reference path="../mocha/mocha.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="mocha" />
+/// <reference types="node" />
 
 var should = chai.should();
 var assert = chai.assert;
diff --git a/chai-string/chai-string.d.ts b/chai-string/chai-string.d.ts
deleted file mode 100644
index ef75470cc7..0000000000
--- a/chai-string/chai-string.d.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-// Type definitions for chai-string 1.1.4
-// Project: https://github.com/onechiporenko/chai-string
-// Definitions by: Nick Malaguti <https://github.com/nmalaguti/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../chai/chai.d.ts" />
-
-declare namespace Chai {
-    interface Assertion extends LanguageChains, NumericComparison, TypeComparison {
-        startsWith(expected: string, message?: string): Assertion;
-        startWith(expected: string, message?: string): Assertion;
-        endsWith(expected: string, message?: string): Assertion;
-        endWith(expected: string, message?: string): Assertion;
-        equalIgnoreCase(expected: string, message?: string): Assertion;
-        equalIgnoreSpaces(expected: string, message?: string): Assertion;
-        singleLine(message?: string): Assertion;
-        reverseOf(message?: string): Assertion;
-        palindrome(message?: string): Assertion;
-        entriesCount(substr: string, expected: number, message?: string): Assertion;
-    }
-
-    export interface Assert {
-        startsWith(val: string, exp: string, msg?: string): void;
-        notStartsWith(val: string, exp: string, msg?: string): void;
-        endsWith(val: string, exp: string, msg?: string): void;
-        notEndsWith(val: string, exp: string, msg?: string): void;
-        equalIgnoreCase(val: string, exp: string, msg?: string): void;
-        notEqualIgnoreCase(val: string, exp: string, msg?: string): void;
-        equalIgnoreSpaces(val: string, exp: string, msg?: string): void;
-        notEqualIgnoreSpaces(val: string, exp: string, msg?: string): void;
-        singleLine(val: string, msg?: string): void;
-        notSingleLine(val: string, msg?: string): void;
-        reverseOf(val: string, exp: string, msg?: string): void;
-        notReverseOf(val: string, exp: string, msg?: string): void;
-        palindrome(val: string, msg?: string): void;
-        notPalindrome(val: string, msg?: string): void;
-        entriesCount(str: string, substr: string, count: number, msg?: string): void;
-    }
-}
-
-declare module 'chai-string' {
-    function chaiString(chai: any, utils: any): void;
-    namespace chaiString {}
-    export = chaiString;
-}
diff --git a/chai-string/index.d.ts b/chai-string/index.d.ts
new file mode 100644
index 0000000000..1c880dc87e
--- /dev/null
+++ b/chai-string/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for chai-string 1.1.4
+// Project: https://github.com/onechiporenko/chai-string
+// Definitions by: Nick Malaguti <https://github.com/nmalaguti/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="chai" />
+
+declare global {
+    namespace Chai {
+        interface Assertion extends LanguageChains, NumericComparison, TypeComparison {
+            startsWith(expected: string, message?: string): Assertion;
+            startWith(expected: string, message?: string): Assertion;
+            endsWith(expected: string, message?: string): Assertion;
+            endWith(expected: string, message?: string): Assertion;
+            equalIgnoreCase(expected: string, message?: string): Assertion;
+            equalIgnoreSpaces(expected: string, message?: string): Assertion;
+            singleLine(message?: string): Assertion;
+            reverseOf(message?: string): Assertion;
+            palindrome(message?: string): Assertion;
+            entriesCount(substr: string, expected: number, message?: string): Assertion;
+        }
+
+        interface Assert {
+            startsWith(val: string, exp: string, msg?: string): void;
+            notStartsWith(val: string, exp: string, msg?: string): void;
+            endsWith(val: string, exp: string, msg?: string): void;
+            notEndsWith(val: string, exp: string, msg?: string): void;
+            equalIgnoreCase(val: string, exp: string, msg?: string): void;
+            notEqualIgnoreCase(val: string, exp: string, msg?: string): void;
+            equalIgnoreSpaces(val: string, exp: string, msg?: string): void;
+            notEqualIgnoreSpaces(val: string, exp: string, msg?: string): void;
+            singleLine(val: string, msg?: string): void;
+            notSingleLine(val: string, msg?: string): void;
+            reverseOf(val: string, exp: string, msg?: string): void;
+            notReverseOf(val: string, exp: string, msg?: string): void;
+            palindrome(val: string, msg?: string): void;
+            notPalindrome(val: string, msg?: string): void;
+            entriesCount(str: string, substr: string, count: number, msg?: string): void;
+        }
+    }
+}
+
+declare function chaiString(chai: any, utils: any): void;
+export = chaiString;
diff --git a/chai-string/tsconfig.json b/chai-string/tsconfig.json
new file mode 100644
index 0000000000..89290bf131
--- /dev/null
+++ b/chai-string/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "chai-string-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/chai-subset/chai-subset-tests.ts b/chai-subset/chai-subset-tests.ts
index 8b88e5c6a3..d4c7ca3f2b 100644
--- a/chai-subset/chai-subset-tests.ts
+++ b/chai-subset/chai-subset-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="chai-subset.d.ts" />
+
 
 import chai = require('chai');
 import chaiSubset = require('chai-subset');
diff --git a/chai-subset/chai-subset.d.ts b/chai-subset/chai-subset.d.ts
deleted file mode 100644
index 7e2b3a159b..0000000000
--- a/chai-subset/chai-subset.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for chai-subset 1.0.0
-// Project: https://github.com/e-conomic/chai-subset
-// Definitions by: Sam Noedel <https://github.com/delta62/>, Andrew Brown <https://github.com/AGBrown>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../chai/chai.d.ts" />
-
-declare namespace Chai {
-    interface Assertion {
-        containSubset(obj: Object): Assertion;
-    }
-}
-
-declare module "chai-subset" {
-    function chaiSubset(chai: any, utils: any): void;
-    export = chaiSubset;
-}
diff --git a/chai-subset/index.d.ts b/chai-subset/index.d.ts
new file mode 100644
index 0000000000..89ee553945
--- /dev/null
+++ b/chai-subset/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for chai-subset 1.0.0
+// Project: https://github.com/e-conomic/chai-subset
+// Definitions by: Sam Noedel <https://github.com/delta62/>, Andrew Brown <https://github.com/AGBrown>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="chai" />
+
+declare namespace Chai {
+    interface Assertion {
+        containSubset(obj: Object): Assertion;
+    }
+}
+
+declare module "chai-subset" {
+    function chaiSubset(chai: any, utils: any): void;
+    export = chaiSubset;
+}
diff --git a/chai-subset/tsconfig.json b/chai-subset/tsconfig.json
new file mode 100644
index 0000000000..0a1890207d
--- /dev/null
+++ b/chai-subset/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "chai-subset-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/chai-things/chai-things-tests.ts b/chai-things/chai-things-tests.ts
index de6a4c3ffe..a8337ce36f 100644
--- a/chai-things/chai-things-tests.ts
+++ b/chai-things/chai-things-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="chai-things.d.ts" />
+
 
 import chai = require('chai');
 import chaiThings = require('chai-things');
diff --git a/chai-things/chai-things.d.ts b/chai-things/chai-things.d.ts
deleted file mode 100644
index 823329808c..0000000000
--- a/chai-things/chai-things.d.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-// Type definitions for chai-things
-// Project: https://github.com/chaijs/chai-things
-// Definitions by: David Broder-Rodgers <https://github.com/DavidBR-SW/>
-// Definitions: https://github.com/DavidBR-SW/DefinitelyTyped
-
-/// <reference path="../chai/chai.d.ts" />
-
-declare namespace Chai {
-    interface ArrayAssertion {
-        include: ArrayInclude;
-        contain: ArrayInclude;
-        not: ArrayAssertion;
-        all: Assertion;
-    }
-
-    interface ArrayInclude {
-        (item: any): any;
-        a: Item;
-        an: Item;
-        one: Something;
-        some: Something;
-        something: Something;
-        any: Anything;
-    }
-
-    interface Anything extends Assertion {
-        (): any;
-        that: Assertion
-        with: Assertion
-    }
-
-    interface Something extends Assertion {
-        (): any;
-        that: Assertion
-        with: Assertion
-    }
-
-    interface Item {
-        item: Something;
-        thing: Something;
-    }
-
-    interface Deep {
-        equals: Equal;
-    }
-}
-
-interface Array<T> {
-    should: Chai.ArrayAssertion;
-}
-
-declare module "chai-things" {
-    function chaiThings(chai: any, utils: any): void;
-    export = chaiThings;
-}
diff --git a/chai-things/index.d.ts b/chai-things/index.d.ts
new file mode 100644
index 0000000000..21dd73a9a4
--- /dev/null
+++ b/chai-things/index.d.ts
@@ -0,0 +1,55 @@
+// Type definitions for chai-things
+// Project: https://github.com/chaijs/chai-things
+// Definitions by: David Broder-Rodgers <https://github.com/DavidBR-SW/>
+// Definitions: https://github.com/DavidBR-SW/DefinitelyTyped
+
+/// <reference types="chai" />
+
+declare namespace Chai {
+    interface ArrayAssertion {
+        include: ArrayInclude;
+        contain: ArrayInclude;
+        not: ArrayAssertion;
+        all: Assertion;
+    }
+
+    interface ArrayInclude {
+        (item: any): any;
+        a: Item;
+        an: Item;
+        one: Something;
+        some: Something;
+        something: Something;
+        any: Anything;
+    }
+
+    interface Anything extends Assertion {
+        (): any;
+        that: Assertion
+        with: Assertion
+    }
+
+    interface Something extends Assertion {
+        (): any;
+        that: Assertion
+        with: Assertion
+    }
+
+    interface Item {
+        item: Something;
+        thing: Something;
+    }
+
+    interface Deep {
+        equals: Equal;
+    }
+}
+
+interface Array<T> {
+    should: Chai.ArrayAssertion;
+}
+
+declare module "chai-things" {
+    function chaiThings(chai: any, utils: any): void;
+    export = chaiThings;
+}
diff --git a/chai-things/tsconfig.json b/chai-things/tsconfig.json
new file mode 100644
index 0000000000..59d3b38578
--- /dev/null
+++ b/chai-things/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "chai-things-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/chai/chai-3.2.0-tests.ts b/chai/chai-3.2.0-tests.ts
index 9b646b1529..9578a54c2c 100644
--- a/chai/chai-3.2.0-tests.ts
+++ b/chai/chai-3.2.0-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="chai.d.ts" />
+
 import chai = require('chai');
 
 // ReSharper disable WrongExpressionStatement
diff --git a/chai/chai-3.2.0.d.ts b/chai/chai-3.2.0.d.ts
index 87b0c08e6f..124beead2e 100644
--- a/chai/chai-3.2.0.d.ts
+++ b/chai/chai-3.2.0.d.ts
@@ -6,7 +6,7 @@
 //                 Olivier Chevet <https://github.com/olivr70>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// <reference path="../assertion-error/assertion-error.d.ts"/>
+// <reference types="assertion-error"/>
 
 declare namespace Chai {
 
diff --git a/chai/chai-tests.ts b/chai/chai-tests.ts
index dbca4c11a1..7f104d07e5 100644
--- a/chai/chai-tests.ts
+++ b/chai/chai-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="chai.d.ts" />
+
 import chai = require('chai');
 
 // ReSharper disable WrongExpressionStatement
diff --git a/chai/chai.d.ts b/chai/chai.d.ts
deleted file mode 100644
index 0ebc855022..0000000000
--- a/chai/chai.d.ts
+++ /dev/null
@@ -1,401 +0,0 @@
-// Type definitions for chai 3.4.0
-// Project: http://chaijs.com/
-// Definitions by: Jed Mao <https://github.com/jedmao/>,
-//                 Bart van der Schoor <https://github.com/Bartvds>,
-//                 Andrew Brown <https://github.com/AGBrown>,
-//                 Olivier Chevet <https://github.com/olivr70>,
-//                 Matt Wistrand <https://github.com/mwistrand>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// <reference path="../assertion-error/assertion-error.d.ts"/>
-
-declare namespace Chai {
-
-    interface ChaiStatic {
-        expect: ExpectStatic;
-        should(): Should;
-        /**
-         * Provides a way to extend the internals of Chai
-         */
-        use(fn: (chai: any, utils: any) => void): ChaiStatic;
-        assert: AssertStatic;
-        config: Config;
-        AssertionError: typeof AssertionError;
-    }
-
-    export interface ExpectStatic extends AssertionStatic {
-        fail(actual?: any, expected?: any, message?: string, operator?: string): void;
-    }
-
-    export interface AssertStatic extends Assert {
-    }
-
-    export interface AssertionStatic {
-        (target: any, message?: string): Assertion;
-    }
-
-    interface ShouldAssertion {
-        equal(value1: any, value2: any, message?: string): void;
-        Throw: ShouldThrow;
-        throw: ShouldThrow;
-        exist(value: any, message?: string): void;
-    }
-
-    interface Should extends ShouldAssertion {
-        not: ShouldAssertion;
-        fail(actual: any, expected: any, message?: string, operator?: string): void;
-    }
-
-    interface ShouldThrow {
-        (actual: Function): void;
-        (actual: Function, expected: string|RegExp, message?: string): void;
-        (actual: Function, constructor: Error|Function, expected?: string|RegExp, message?: string): void;
-    }
-
-    interface Assertion extends LanguageChains, NumericComparison, TypeComparison {
-        not: Assertion;
-        deep: Deep;
-        any: KeyFilter;
-        all: KeyFilter;
-        a: TypeComparison;
-        an: TypeComparison;
-        include: Include;
-        includes: Include;
-        contain: Include;
-        contains: Include;
-        ok: Assertion;
-        true: Assertion;
-        false: Assertion;
-        null: Assertion;
-        undefined: Assertion;
-        NaN: Assertion;
-        exist: Assertion;
-        empty: Assertion;
-        arguments: Assertion;
-        Arguments: Assertion;
-        equal: Equal;
-        equals: Equal;
-        eq: Equal;
-        eql: Equal;
-        eqls: Equal;
-        property: Property;
-        ownProperty: OwnProperty;
-        haveOwnProperty: OwnProperty;
-        ownPropertyDescriptor: OwnPropertyDescriptor;
-        haveOwnPropertyDescriptor: OwnPropertyDescriptor;
-        length: Length;
-        lengthOf: Length;
-        match: Match;
-        matches: Match;
-        string(string: string, message?: string): Assertion;
-        keys: Keys;
-        key(string: string): Assertion;
-        throw: Throw;
-        throws: Throw;
-        Throw: Throw;
-        respondTo: RespondTo;
-        respondsTo: RespondTo;
-        itself: Assertion;
-        satisfy: Satisfy;
-        satisfies: Satisfy;
-        closeTo: CloseTo;
-        approximately: CloseTo;
-        members: Members;
-        increase: PropertyChange;
-        increases: PropertyChange;
-        decrease: PropertyChange;
-        decreases: PropertyChange;
-        change: PropertyChange;
-        changes: PropertyChange;
-        extensible: Assertion;
-        sealed: Assertion;
-        frozen: Assertion;
-        oneOf(list: any[], message?: string): Assertion;
-    }
-
-    interface LanguageChains {
-        to: Assertion;
-        be: Assertion;
-        been: Assertion;
-        is: Assertion;
-        that: Assertion;
-        which: Assertion;
-        and: Assertion;
-        has: Assertion;
-        have: Assertion;
-        with: Assertion;
-        at: Assertion;
-        of: Assertion;
-        same: Assertion;
-    }
-
-    interface NumericComparison {
-        above: NumberComparer;
-        gt: NumberComparer;
-        greaterThan: NumberComparer;
-        least: NumberComparer;
-        gte: NumberComparer;
-        below: NumberComparer;
-        lt: NumberComparer;
-        lessThan: NumberComparer;
-        most: NumberComparer;
-        lte: NumberComparer;
-        within(start: number, finish: number, message?: string): Assertion;
-    }
-
-    interface NumberComparer {
-        (value: number, message?: string): Assertion;
-    }
-
-    interface TypeComparison {
-        (type: string, message?: string): Assertion;
-        instanceof: InstanceOf;
-        instanceOf: InstanceOf;
-    }
-
-    interface InstanceOf {
-        (constructor: Object, message?: string): Assertion;
-    }
-
-    interface CloseTo {
-        (expected: number, delta: number, message?: string): Assertion;
-    }
-
-    interface Deep {
-        equal: Equal;
-        include: Include;
-        property: Property;
-        members: Members;
-    }
-
-    interface KeyFilter {
-        keys: Keys;
-    }
-
-    interface Equal {
-        (value: any, message?: string): Assertion;
-    }
-
-    interface Property {
-        (name: string, value?: any, message?: string): Assertion;
-    }
-
-    interface OwnProperty {
-        (name: string, message?: string): Assertion;
-    }
-
-    interface OwnPropertyDescriptor {
-        (name: string, descriptor: PropertyDescriptor, message?: string): Assertion;
-        (name: string, message?: string): Assertion;
-    }
-
-    interface Length extends LanguageChains, NumericComparison {
-        (length: number, message?: string): Assertion;
-    }
-
-    interface Include {
-        (value: Object, message?: string): Assertion;
-        (value: string, message?: string): Assertion;
-        (value: number, message?: string): Assertion;
-        keys: Keys;
-        members: Members;
-        any: KeyFilter;
-        all: KeyFilter;
-    }
-
-    interface Match {
-        (regexp: RegExp|string, message?: string): Assertion;
-    }
-
-    interface Keys {
-        (...keys: string[]): Assertion;
-        (keys: any[]): Assertion;
-        (keys: Object): Assertion;
-    }
-
-    interface Throw {
-        (): Assertion;
-        (expected: string, message?: string): Assertion;
-        (expected: RegExp, message?: string): Assertion;
-        (constructor: Error, expected?: string, message?: string): Assertion;
-        (constructor: Error, expected?: RegExp, message?: string): Assertion;
-        (constructor: Function, expected?: string, message?: string): Assertion;
-        (constructor: Function, expected?: RegExp, message?: string): Assertion;
-    }
-
-    interface RespondTo {
-        (method: string, message?: string): Assertion;
-    }
-
-    interface Satisfy {
-        (matcher: Function, message?: string): Assertion;
-    }
-
-    interface Members {
-        (set: any[], message?: string): Assertion;
-    }
-
-    interface PropertyChange {
-        (object: Object, prop: string, msg?: string): Assertion;
-    }
-
-    export interface Assert {
-        /**
-         * @param expression Expression to test for truthiness.
-         * @param message Message to display on error.
-         */
-        (expression: any, message?: string): void;
-
-        fail(actual?: any, expected?: any, msg?: string, operator?: string): void;
-
-        ok(val: any, msg?: string): void;
-        isOk(val: any, msg?: string): void;
-        notOk(val: any, msg?: string): void;
-        isNotOk(val: any, msg?: string): void;
-
-        equal(act: any, exp: any, msg?: string): void;
-        notEqual(act: any, exp: any, msg?: string): void;
-
-        strictEqual(act: any, exp: any, msg?: string): void;
-        notStrictEqual(act: any, exp: any, msg?: string): void;
-
-        deepEqual(act: any, exp: any, msg?: string): void;
-        notDeepEqual(act: any, exp: any, msg?: string): void;
-
-        isTrue(val: any, msg?: string): void;
-        isFalse(val: any, msg?: string): void;
-
-        isNotTrue(val: any, msg?: string): void;
-        isNotFalse(val: any, msg?: string): void;
-
-        isNull(val: any, msg?: string): void;
-        isNotNull(val: any, msg?: string): void;
-
-        isUndefined(val: any, msg?: string): void;
-        isDefined(val: any, msg?: string): void;
-
-        isNaN(val: any, msg?: string): void;
-        isNotNaN(val: any, msg?: string): void;
-
-        isAbove(val: number, abv: number, msg?: string): void;
-        isBelow(val: number, blw: number, msg?: string): void;
-
-        isAtLeast(val: number, atlst: number, msg?: string): void;
-        isAtMost(val: number, atmst: number, msg?: string): void;
-
-        isFunction(val: any, msg?: string): void;
-        isNotFunction(val: any, msg?: string): void;
-
-        isObject(val: any, msg?: string): void;
-        isNotObject(val: any, msg?: string): void;
-
-        isArray(val: any, msg?: string): void;
-        isNotArray(val: any, msg?: string): void;
-
-        isString(val: any, msg?: string): void;
-        isNotString(val: any, msg?: string): void;
-
-        isNumber(val: any, msg?: string): void;
-        isNotNumber(val: any, msg?: string): void;
-
-        isBoolean(val: any, msg?: string): void;
-        isNotBoolean(val: any, msg?: string): void;
-
-        typeOf(val: any, type: string, msg?: string): void;
-        notTypeOf(val: any, type: string, msg?: string): void;
-
-        instanceOf(val: any, type: Function, msg?: string): void;
-        notInstanceOf(val: any, type: Function, msg?: string): void;
-
-        include(exp: string, inc: any, msg?: string): void;
-        include(exp: any[], inc: any, msg?: string): void;
-
-        notInclude(exp: string, inc: any, msg?: string): void;
-        notInclude(exp: any[], inc: any, msg?: string): void;
-
-        match(exp: any, re: RegExp, msg?: string): void;
-        notMatch(exp: any, re: RegExp, msg?: string): void;
-
-        property(obj: Object, prop: string, msg?: string): void;
-        notProperty(obj: Object, prop: string, msg?: string): void;
-        deepProperty(obj: Object, prop: string, msg?: string): void;
-        notDeepProperty(obj: Object, prop: string, msg?: string): void;
-
-        propertyVal(obj: Object, prop: string, val: any, msg?: string): void;
-        propertyNotVal(obj: Object, prop: string, val: any, msg?: string): void;
-
-        deepPropertyVal(obj: Object, prop: string, val: any, msg?: string): void;
-        deepPropertyNotVal(obj: Object, prop: string, val: any, msg?: string): void;
-
-        lengthOf(exp: any, len: number, msg?: string): void;
-        //alias frenzy
-        throw(fn: Function, msg?: string): void;
-        throw(fn: Function, regExp: RegExp): void;
-        throw(fn: Function, errType: Function, msg?: string): void;
-        throw(fn: Function, errType: Function, regExp: RegExp): void;
-
-        throws(fn: Function, msg?: string): void;
-        throws(fn: Function, regExp: RegExp): void;
-        throws(fn: Function, errType: Function, msg?: string): void;
-        throws(fn: Function, errType: Function, regExp: RegExp): void;
-
-        Throw(fn: Function, msg?: string): void;
-        Throw(fn: Function, regExp: RegExp): void;
-        Throw(fn: Function, errType: Function, msg?: string): void;
-        Throw(fn: Function, errType: Function, regExp: RegExp): void;
-
-        doesNotThrow(fn: Function, msg?: string): void;
-        doesNotThrow(fn: Function, regExp: RegExp): void;
-        doesNotThrow(fn: Function, errType: Function, msg?: string): void;
-        doesNotThrow(fn: Function, errType: Function, regExp: RegExp): void;
-
-        operator(val: any, operator: string, val2: any, msg?: string): void;
-        closeTo(act: number, exp: number, delta: number, msg?: string): void;
-        approximately(act: number, exp: number, delta: number, msg?: string): void;
-
-        sameMembers(set1: any[], set2: any[], msg?: string): void;
-        sameDeepMembers(set1: any[], set2: any[], msg?: string): void;
-        includeMembers(superset: any[], subset: any[], msg?: string): void;
-
-        ifError(val: any, msg?: string): void;
-
-        isExtensible(obj: {}, msg?: string): void;
-        extensible(obj: {}, msg?: string): void;
-        isNotExtensible(obj: {}, msg?: string): void;
-        notExtensible(obj: {}, msg?: string): void;
-
-        isSealed(obj: {}, msg?: string): void;
-        sealed(obj: {}, msg?: string): void;
-        isNotSealed(obj: {}, msg?: string): void;
-        notSealed(obj: {}, msg?: string): void;
-
-        isFrozen(obj: Object, msg?: string): void;
-        frozen(obj: Object, msg?: string): void;
-        isNotFrozen(obj: Object, msg?: string): void;
-        notFrozen(obj: Object, msg?: string): void;
-
-        oneOf(inList: any, list: any[], msg?: string): void;
-    }
-
-    export interface Config {
-        includeStack: boolean;
-    }
-
-    export class AssertionError {
-        constructor(message: string, _props?: any, ssf?: Function);
-        name: string;
-        message: string;
-        showDiff: boolean;
-        stack: string;
-    }
-}
-
-declare var chai: Chai.ChaiStatic;
-
-declare module "chai" {
-    export = chai;
-}
-
-interface Object {
-    should: Chai.Assertion;
-}
diff --git a/chai/index.d.ts b/chai/index.d.ts
new file mode 100644
index 0000000000..f8f9f733f0
--- /dev/null
+++ b/chai/index.d.ts
@@ -0,0 +1,401 @@
+// Type definitions for chai 3.4.0
+// Project: http://chaijs.com/
+// Definitions by: Jed Mao <https://github.com/jedmao/>,
+//                 Bart van der Schoor <https://github.com/Bartvds>,
+//                 Andrew Brown <https://github.com/AGBrown>,
+//                 Olivier Chevet <https://github.com/olivr70>,
+//                 Matt Wistrand <https://github.com/mwistrand>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// <reference types="assertion-error"/>
+
+declare namespace Chai {
+
+    interface ChaiStatic {
+        expect: ExpectStatic;
+        should(): Should;
+        /**
+         * Provides a way to extend the internals of Chai
+         */
+        use(fn: (chai: any, utils: any) => void): ChaiStatic;
+        assert: AssertStatic;
+        config: Config;
+        AssertionError: typeof AssertionError;
+    }
+
+    export interface ExpectStatic extends AssertionStatic {
+        fail(actual?: any, expected?: any, message?: string, operator?: string): void;
+    }
+
+    export interface AssertStatic extends Assert {
+    }
+
+    export interface AssertionStatic {
+        (target: any, message?: string): Assertion;
+    }
+
+    interface ShouldAssertion {
+        equal(value1: any, value2: any, message?: string): void;
+        Throw: ShouldThrow;
+        throw: ShouldThrow;
+        exist(value: any, message?: string): void;
+    }
+
+    interface Should extends ShouldAssertion {
+        not: ShouldAssertion;
+        fail(actual: any, expected: any, message?: string, operator?: string): void;
+    }
+
+    interface ShouldThrow {
+        (actual: Function): void;
+        (actual: Function, expected: string|RegExp, message?: string): void;
+        (actual: Function, constructor: Error|Function, expected?: string|RegExp, message?: string): void;
+    }
+
+    interface Assertion extends LanguageChains, NumericComparison, TypeComparison {
+        not: Assertion;
+        deep: Deep;
+        any: KeyFilter;
+        all: KeyFilter;
+        a: TypeComparison;
+        an: TypeComparison;
+        include: Include;
+        includes: Include;
+        contain: Include;
+        contains: Include;
+        ok: Assertion;
+        true: Assertion;
+        false: Assertion;
+        null: Assertion;
+        undefined: Assertion;
+        NaN: Assertion;
+        exist: Assertion;
+        empty: Assertion;
+        arguments: Assertion;
+        Arguments: Assertion;
+        equal: Equal;
+        equals: Equal;
+        eq: Equal;
+        eql: Equal;
+        eqls: Equal;
+        property: Property;
+        ownProperty: OwnProperty;
+        haveOwnProperty: OwnProperty;
+        ownPropertyDescriptor: OwnPropertyDescriptor;
+        haveOwnPropertyDescriptor: OwnPropertyDescriptor;
+        length: Length;
+        lengthOf: Length;
+        match: Match;
+        matches: Match;
+        string(string: string, message?: string): Assertion;
+        keys: Keys;
+        key(string: string): Assertion;
+        throw: Throw;
+        throws: Throw;
+        Throw: Throw;
+        respondTo: RespondTo;
+        respondsTo: RespondTo;
+        itself: Assertion;
+        satisfy: Satisfy;
+        satisfies: Satisfy;
+        closeTo: CloseTo;
+        approximately: CloseTo;
+        members: Members;
+        increase: PropertyChange;
+        increases: PropertyChange;
+        decrease: PropertyChange;
+        decreases: PropertyChange;
+        change: PropertyChange;
+        changes: PropertyChange;
+        extensible: Assertion;
+        sealed: Assertion;
+        frozen: Assertion;
+        oneOf(list: any[], message?: string): Assertion;
+    }
+
+    interface LanguageChains {
+        to: Assertion;
+        be: Assertion;
+        been: Assertion;
+        is: Assertion;
+        that: Assertion;
+        which: Assertion;
+        and: Assertion;
+        has: Assertion;
+        have: Assertion;
+        with: Assertion;
+        at: Assertion;
+        of: Assertion;
+        same: Assertion;
+    }
+
+    interface NumericComparison {
+        above: NumberComparer;
+        gt: NumberComparer;
+        greaterThan: NumberComparer;
+        least: NumberComparer;
+        gte: NumberComparer;
+        below: NumberComparer;
+        lt: NumberComparer;
+        lessThan: NumberComparer;
+        most: NumberComparer;
+        lte: NumberComparer;
+        within(start: number, finish: number, message?: string): Assertion;
+    }
+
+    interface NumberComparer {
+        (value: number, message?: string): Assertion;
+    }
+
+    interface TypeComparison {
+        (type: string, message?: string): Assertion;
+        instanceof: InstanceOf;
+        instanceOf: InstanceOf;
+    }
+
+    interface InstanceOf {
+        (constructor: Object, message?: string): Assertion;
+    }
+
+    interface CloseTo {
+        (expected: number, delta: number, message?: string): Assertion;
+    }
+
+    interface Deep {
+        equal: Equal;
+        include: Include;
+        property: Property;
+        members: Members;
+    }
+
+    interface KeyFilter {
+        keys: Keys;
+    }
+
+    interface Equal {
+        (value: any, message?: string): Assertion;
+    }
+
+    interface Property {
+        (name: string, value?: any, message?: string): Assertion;
+    }
+
+    interface OwnProperty {
+        (name: string, message?: string): Assertion;
+    }
+
+    interface OwnPropertyDescriptor {
+        (name: string, descriptor: PropertyDescriptor, message?: string): Assertion;
+        (name: string, message?: string): Assertion;
+    }
+
+    interface Length extends LanguageChains, NumericComparison {
+        (length: number, message?: string): Assertion;
+    }
+
+    interface Include {
+        (value: Object, message?: string): Assertion;
+        (value: string, message?: string): Assertion;
+        (value: number, message?: string): Assertion;
+        keys: Keys;
+        members: Members;
+        any: KeyFilter;
+        all: KeyFilter;
+    }
+
+    interface Match {
+        (regexp: RegExp|string, message?: string): Assertion;
+    }
+
+    interface Keys {
+        (...keys: string[]): Assertion;
+        (keys: any[]): Assertion;
+        (keys: Object): Assertion;
+    }
+
+    interface Throw {
+        (): Assertion;
+        (expected: string, message?: string): Assertion;
+        (expected: RegExp, message?: string): Assertion;
+        (constructor: Error, expected?: string, message?: string): Assertion;
+        (constructor: Error, expected?: RegExp, message?: string): Assertion;
+        (constructor: Function, expected?: string, message?: string): Assertion;
+        (constructor: Function, expected?: RegExp, message?: string): Assertion;
+    }
+
+    interface RespondTo {
+        (method: string, message?: string): Assertion;
+    }
+
+    interface Satisfy {
+        (matcher: Function, message?: string): Assertion;
+    }
+
+    interface Members {
+        (set: any[], message?: string): Assertion;
+    }
+
+    interface PropertyChange {
+        (object: Object, prop: string, msg?: string): Assertion;
+    }
+
+    export interface Assert {
+        /**
+         * @param expression Expression to test for truthiness.
+         * @param message Message to display on error.
+         */
+        (expression: any, message?: string): void;
+
+        fail(actual?: any, expected?: any, msg?: string, operator?: string): void;
+
+        ok(val: any, msg?: string): void;
+        isOk(val: any, msg?: string): void;
+        notOk(val: any, msg?: string): void;
+        isNotOk(val: any, msg?: string): void;
+
+        equal(act: any, exp: any, msg?: string): void;
+        notEqual(act: any, exp: any, msg?: string): void;
+
+        strictEqual(act: any, exp: any, msg?: string): void;
+        notStrictEqual(act: any, exp: any, msg?: string): void;
+
+        deepEqual(act: any, exp: any, msg?: string): void;
+        notDeepEqual(act: any, exp: any, msg?: string): void;
+
+        isTrue(val: any, msg?: string): void;
+        isFalse(val: any, msg?: string): void;
+
+        isNotTrue(val: any, msg?: string): void;
+        isNotFalse(val: any, msg?: string): void;
+
+        isNull(val: any, msg?: string): void;
+        isNotNull(val: any, msg?: string): void;
+
+        isUndefined(val: any, msg?: string): void;
+        isDefined(val: any, msg?: string): void;
+
+        isNaN(val: any, msg?: string): void;
+        isNotNaN(val: any, msg?: string): void;
+
+        isAbove(val: number, abv: number, msg?: string): void;
+        isBelow(val: number, blw: number, msg?: string): void;
+
+        isAtLeast(val: number, atlst: number, msg?: string): void;
+        isAtMost(val: number, atmst: number, msg?: string): void;
+
+        isFunction(val: any, msg?: string): void;
+        isNotFunction(val: any, msg?: string): void;
+
+        isObject(val: any, msg?: string): void;
+        isNotObject(val: any, msg?: string): void;
+
+        isArray(val: any, msg?: string): void;
+        isNotArray(val: any, msg?: string): void;
+
+        isString(val: any, msg?: string): void;
+        isNotString(val: any, msg?: string): void;
+
+        isNumber(val: any, msg?: string): void;
+        isNotNumber(val: any, msg?: string): void;
+
+        isBoolean(val: any, msg?: string): void;
+        isNotBoolean(val: any, msg?: string): void;
+
+        typeOf(val: any, type: string, msg?: string): void;
+        notTypeOf(val: any, type: string, msg?: string): void;
+
+        instanceOf(val: any, type: Function, msg?: string): void;
+        notInstanceOf(val: any, type: Function, msg?: string): void;
+
+        include(exp: string, inc: any, msg?: string): void;
+        include(exp: any[], inc: any, msg?: string): void;
+
+        notInclude(exp: string, inc: any, msg?: string): void;
+        notInclude(exp: any[], inc: any, msg?: string): void;
+
+        match(exp: any, re: RegExp, msg?: string): void;
+        notMatch(exp: any, re: RegExp, msg?: string): void;
+
+        property(obj: Object, prop: string, msg?: string): void;
+        notProperty(obj: Object, prop: string, msg?: string): void;
+        deepProperty(obj: Object, prop: string, msg?: string): void;
+        notDeepProperty(obj: Object, prop: string, msg?: string): void;
+
+        propertyVal(obj: Object, prop: string, val: any, msg?: string): void;
+        propertyNotVal(obj: Object, prop: string, val: any, msg?: string): void;
+
+        deepPropertyVal(obj: Object, prop: string, val: any, msg?: string): void;
+        deepPropertyNotVal(obj: Object, prop: string, val: any, msg?: string): void;
+
+        lengthOf(exp: any, len: number, msg?: string): void;
+        //alias frenzy
+        throw(fn: Function, msg?: string): void;
+        throw(fn: Function, regExp: RegExp): void;
+        throw(fn: Function, errType: Function, msg?: string): void;
+        throw(fn: Function, errType: Function, regExp: RegExp): void;
+
+        throws(fn: Function, msg?: string): void;
+        throws(fn: Function, regExp: RegExp): void;
+        throws(fn: Function, errType: Function, msg?: string): void;
+        throws(fn: Function, errType: Function, regExp: RegExp): void;
+
+        Throw(fn: Function, msg?: string): void;
+        Throw(fn: Function, regExp: RegExp): void;
+        Throw(fn: Function, errType: Function, msg?: string): void;
+        Throw(fn: Function, errType: Function, regExp: RegExp): void;
+
+        doesNotThrow(fn: Function, msg?: string): void;
+        doesNotThrow(fn: Function, regExp: RegExp): void;
+        doesNotThrow(fn: Function, errType: Function, msg?: string): void;
+        doesNotThrow(fn: Function, errType: Function, regExp: RegExp): void;
+
+        operator(val: any, operator: string, val2: any, msg?: string): void;
+        closeTo(act: number, exp: number, delta: number, msg?: string): void;
+        approximately(act: number, exp: number, delta: number, msg?: string): void;
+
+        sameMembers(set1: any[], set2: any[], msg?: string): void;
+        sameDeepMembers(set1: any[], set2: any[], msg?: string): void;
+        includeMembers(superset: any[], subset: any[], msg?: string): void;
+
+        ifError(val: any, msg?: string): void;
+
+        isExtensible(obj: {}, msg?: string): void;
+        extensible(obj: {}, msg?: string): void;
+        isNotExtensible(obj: {}, msg?: string): void;
+        notExtensible(obj: {}, msg?: string): void;
+
+        isSealed(obj: {}, msg?: string): void;
+        sealed(obj: {}, msg?: string): void;
+        isNotSealed(obj: {}, msg?: string): void;
+        notSealed(obj: {}, msg?: string): void;
+
+        isFrozen(obj: Object, msg?: string): void;
+        frozen(obj: Object, msg?: string): void;
+        isNotFrozen(obj: Object, msg?: string): void;
+        notFrozen(obj: Object, msg?: string): void;
+
+        oneOf(inList: any, list: any[], msg?: string): void;
+    }
+
+    export interface Config {
+        includeStack: boolean;
+    }
+
+    export class AssertionError {
+        constructor(message: string, _props?: any, ssf?: Function);
+        name: string;
+        message: string;
+        showDiff: boolean;
+        stack: string;
+    }
+}
+
+declare var chai: Chai.ChaiStatic;
+
+declare module "chai" {
+    export = chai;
+}
+
+interface Object {
+    should: Chai.Assertion;
+}
diff --git a/chai/tsconfig.json b/chai/tsconfig.json
new file mode 100644
index 0000000000..5e194fef23
--- /dev/null
+++ b/chai/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "chai-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/chalk/chalk-tests.ts b/chalk/chalk-tests.ts
index e159d34765..8b302aecb7 100644
--- a/chalk/chalk-tests.ts
+++ b/chalk/chalk-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="chalk.d.ts" />
+
 
 import chalk = require('chalk');
 
diff --git a/chalk/chalk.d.ts b/chalk/chalk.d.ts
deleted file mode 100644
index 1ead986818..0000000000
--- a/chalk/chalk.d.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-// Type definitions for chalk v0.4.0
-// Project: https://github.com/sindresorhus/chalk
-// Definitions by: Diullei Gomes <https://github.com/Diullei>, Bart van der Schoor <https://github.com/Bartvds>, Nico Jansen <https://github.com/nicojs>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace Chalk {
-
-    export var enabled: boolean;
-    export var supportsColor: boolean;
-    export var styles: ChalkStyleMap;
-
-    export function stripColor(value: string): any;
-    export function hasColor(str: string): boolean;
-
-    export interface ChalkChain extends ChalkStyle {
-        (...text: string[]): string;
-    }
-
-    export interface ChalkStyleElement {
-        open: string;
-        close: string;
-    }
-
-    // General
-    export var reset: ChalkChain;
-    export var bold: ChalkChain;
-    export var italic: ChalkChain;
-    export var underline: ChalkChain;
-    export var inverse: ChalkChain;
-    export var strikethrough: ChalkChain;
-
-    // Text colors
-    export var black: ChalkChain;
-    export var red: ChalkChain;
-    export var green: ChalkChain;
-    export var yellow: ChalkChain;
-    export var blue: ChalkChain;
-    export var magenta: ChalkChain;
-    export var cyan: ChalkChain;
-    export var white: ChalkChain;
-    export var gray: ChalkChain;
-    export var grey: ChalkChain;
-
-    // Background colors
-    export var bgBlack: ChalkChain;
-    export var bgRed: ChalkChain;
-    export var bgGreen: ChalkChain;
-    export var bgYellow: ChalkChain;
-    export var bgBlue: ChalkChain;
-    export var bgMagenta: ChalkChain;
-    export var bgCyan: ChalkChain;
-    export var bgWhite: ChalkChain;
-
-
-    export interface ChalkStyle {
-        // General
-        reset: ChalkChain;
-        bold: ChalkChain;
-        italic: ChalkChain;
-        underline: ChalkChain;
-        inverse: ChalkChain;
-        strikethrough: ChalkChain;
-
-        // Text colors
-        black: ChalkChain;
-        red: ChalkChain;
-        green: ChalkChain;
-        yellow: ChalkChain;
-        blue: ChalkChain;
-        magenta: ChalkChain;
-        cyan: ChalkChain;
-        white: ChalkChain;
-        gray: ChalkChain;
-        grey: ChalkChain;
-
-        // Background colors
-        bgBlack: ChalkChain;
-        bgRed: ChalkChain;
-        bgGreen: ChalkChain;
-        bgYellow: ChalkChain;
-        bgBlue: ChalkChain;
-        bgMagenta: ChalkChain;
-        bgCyan: ChalkChain;
-        bgWhite: ChalkChain;
-    }
-
-    export interface ChalkStyleMap {
-        // General
-        reset: ChalkStyleElement;
-        bold: ChalkStyleElement;
-        italic: ChalkStyleElement;
-        underline: ChalkStyleElement;
-        inverse: ChalkStyleElement;
-        strikethrough: ChalkStyleElement;
-
-        // Text colors
-        black: ChalkStyleElement;
-        red: ChalkStyleElement;
-        green: ChalkStyleElement;
-        yellow: ChalkStyleElement;
-        blue: ChalkStyleElement;
-        magenta: ChalkStyleElement;
-        cyan: ChalkStyleElement;
-        white: ChalkStyleElement;
-        gray: ChalkStyleElement;
-
-        // Background colors
-        bgBlack: ChalkStyleElement;
-        bgRed: ChalkStyleElement;
-        bgGreen: ChalkStyleElement;
-        bgYellow: ChalkStyleElement;
-        bgBlue: ChalkStyleElement;
-        bgMagenta: ChalkStyleElement;
-        bgCyan: ChalkStyleElement;
-        bgWhite: ChalkStyleElement;
-    }
-}
-
-declare module "chalk" {
-    export = Chalk;
-}
-
diff --git a/chalk/index.d.ts b/chalk/index.d.ts
new file mode 100644
index 0000000000..97c7f7427a
--- /dev/null
+++ b/chalk/index.d.ts
@@ -0,0 +1,120 @@
+// Type definitions for chalk v0.4.0
+// Project: https://github.com/sindresorhus/chalk
+// Definitions by: Diullei Gomes <https://github.com/Diullei>, Bart van der Schoor <https://github.com/Bartvds>, Nico Jansen <https://github.com/nicojs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = Chalk;
+
+declare namespace Chalk {
+
+    export var enabled: boolean;
+    export var supportsColor: boolean;
+    export var styles: ChalkStyleMap;
+
+    export function stripColor(value: string): any;
+    export function hasColor(str: string): boolean;
+
+    export interface ChalkChain extends ChalkStyle {
+        (...text: string[]): string;
+    }
+
+    export interface ChalkStyleElement {
+        open: string;
+        close: string;
+    }
+
+    // General
+    export var reset: ChalkChain;
+    export var bold: ChalkChain;
+    export var italic: ChalkChain;
+    export var underline: ChalkChain;
+    export var inverse: ChalkChain;
+    export var strikethrough: ChalkChain;
+
+    // Text colors
+    export var black: ChalkChain;
+    export var red: ChalkChain;
+    export var green: ChalkChain;
+    export var yellow: ChalkChain;
+    export var blue: ChalkChain;
+    export var magenta: ChalkChain;
+    export var cyan: ChalkChain;
+    export var white: ChalkChain;
+    export var gray: ChalkChain;
+    export var grey: ChalkChain;
+
+    // Background colors
+    export var bgBlack: ChalkChain;
+    export var bgRed: ChalkChain;
+    export var bgGreen: ChalkChain;
+    export var bgYellow: ChalkChain;
+    export var bgBlue: ChalkChain;
+    export var bgMagenta: ChalkChain;
+    export var bgCyan: ChalkChain;
+    export var bgWhite: ChalkChain;
+
+
+    export interface ChalkStyle {
+        // General
+        reset: ChalkChain;
+        bold: ChalkChain;
+        italic: ChalkChain;
+        underline: ChalkChain;
+        inverse: ChalkChain;
+        strikethrough: ChalkChain;
+
+        // Text colors
+        black: ChalkChain;
+        red: ChalkChain;
+        green: ChalkChain;
+        yellow: ChalkChain;
+        blue: ChalkChain;
+        magenta: ChalkChain;
+        cyan: ChalkChain;
+        white: ChalkChain;
+        gray: ChalkChain;
+        grey: ChalkChain;
+
+        // Background colors
+        bgBlack: ChalkChain;
+        bgRed: ChalkChain;
+        bgGreen: ChalkChain;
+        bgYellow: ChalkChain;
+        bgBlue: ChalkChain;
+        bgMagenta: ChalkChain;
+        bgCyan: ChalkChain;
+        bgWhite: ChalkChain;
+    }
+
+    export interface ChalkStyleMap {
+        // General
+        reset: ChalkStyleElement;
+        bold: ChalkStyleElement;
+        italic: ChalkStyleElement;
+        underline: ChalkStyleElement;
+        inverse: ChalkStyleElement;
+        strikethrough: ChalkStyleElement;
+
+        // Text colors
+        black: ChalkStyleElement;
+        red: ChalkStyleElement;
+        green: ChalkStyleElement;
+        yellow: ChalkStyleElement;
+        blue: ChalkStyleElement;
+        magenta: ChalkStyleElement;
+        cyan: ChalkStyleElement;
+        white: ChalkStyleElement;
+        gray: ChalkStyleElement;
+
+        // Background colors
+        bgBlack: ChalkStyleElement;
+        bgRed: ChalkStyleElement;
+        bgGreen: ChalkStyleElement;
+        bgYellow: ChalkStyleElement;
+        bgBlue: ChalkStyleElement;
+        bgMagenta: ChalkStyleElement;
+        bgCyan: ChalkStyleElement;
+        bgWhite: ChalkStyleElement;
+    }
+}
+
diff --git a/chalk/tsconfig.json b/chalk/tsconfig.json
new file mode 100644
index 0000000000..02f0e59176
--- /dev/null
+++ b/chalk/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "chalk-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/chance/chance-tests.ts b/chance/chance-tests.ts
index d9b4153960..a426142d7f 100644
--- a/chance/chance-tests.ts
+++ b/chance/chance-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="chance.d.ts" />
+
 
 // Instantiation
 var globalInstance: Chance.Chance = chance;
diff --git a/chance/chance.d.ts b/chance/index.d.ts
similarity index 100%
rename from chance/chance.d.ts
rename to chance/index.d.ts
diff --git a/chance/tsconfig.json b/chance/tsconfig.json
new file mode 100644
index 0000000000..4c3858d36c
--- /dev/null
+++ b/chance/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "chance-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/change-case/change-case-tests.ts b/change-case/change-case-tests.ts
index 2e80c8a0d9..67ef86405b 100644
--- a/change-case/change-case-tests.ts
+++ b/change-case/change-case-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="change-case.d.ts"/>
-
 import changeCase = require("change-case");
 
 var s: string;
diff --git a/change-case/change-case.d.ts b/change-case/change-case.d.ts
deleted file mode 100644
index d432db1c35..0000000000
--- a/change-case/change-case.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-// Type definitions for change-case
-// Project: https://github.com/blakeembrey/change-case
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "change-case" {
-    function dot(s: string): string;
-    function dotCase(s: string): string;
-    function swap(s: string): string;
-    function swapCase(s: string): string;
-    function path(s: string): string;
-    function pathCase(s: string): string;
-    function upper(s: string): string;
-    function upperCase(s: string): string;
-    function lower(s: string): string;
-    function lowerCase(s: string): string;
-    function camel(s: string): string;
-    function camelCase(s: string): string;
-    function snake(s: string): string;
-    function snakeCase(s: string): string;
-    function title(s: string): string;
-    function titleCase(s: string): string;
-    function param(s: string): string;
-    function paramCase(s: string): string;
-    function pascal(s: string): string;
-    function pascalCase(s: string): string;
-    function constant(s: string): string;
-    function constantCase(s: string): string;
-    function sentence(s: string): string;
-    function sentenceCase(s: string): string;
-    function isUpper(s: string): boolean;
-    function isUpperCase(s: string): boolean;
-    function isLower(s: string): boolean;
-    function isLowerCase(s: string): boolean;
-    function ucFirst(s: string): string;
-    function upperCaseFirst(s: string): string;
-    function lcFirst(s: string): string;
-    function lowerCaseFirst(s: string): string;
-}
diff --git a/change-case/index.d.ts b/change-case/index.d.ts
new file mode 100644
index 0000000000..590597d621
--- /dev/null
+++ b/change-case/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for change-case
+// Project: https://github.com/blakeembrey/change-case
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function dot(s: string): string;
+export function dotCase(s: string): string;
+export function swap(s: string): string;
+export function swapCase(s: string): string;
+export function path(s: string): string;
+export function pathCase(s: string): string;
+export function upper(s: string): string;
+export function upperCase(s: string): string;
+export function lower(s: string): string;
+export function lowerCase(s: string): string;
+export function camel(s: string): string;
+export function camelCase(s: string): string;
+export function snake(s: string): string;
+export function snakeCase(s: string): string;
+export function title(s: string): string;
+export function titleCase(s: string): string;
+export function param(s: string): string;
+export function paramCase(s: string): string;
+export function pascal(s: string): string;
+export function pascalCase(s: string): string;
+export function constant(s: string): string;
+export function constantCase(s: string): string;
+export function sentence(s: string): string;
+export function sentenceCase(s: string): string;
+export function isUpper(s: string): boolean;
+export function isUpperCase(s: string): boolean;
+export function isLower(s: string): boolean;
+export function isLowerCase(s: string): boolean;
+export function ucFirst(s: string): string;
+export function upperCaseFirst(s: string): string;
+export function lcFirst(s: string): string;
+export function lowerCaseFirst(s: string): string;
diff --git a/change-case/tsconfig.json b/change-case/tsconfig.json
new file mode 100644
index 0000000000..09c8fe7baf
--- /dev/null
+++ b/change-case/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "change-case-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/chartist/chartist-tests.ts b/chartist/chartist-tests.ts
index 22b10e8b03..2a4a362e7e 100644
--- a/chartist/chartist-tests.ts
+++ b/chartist/chartist-tests.ts
@@ -1,5 +1,4 @@
-///<reference path="chartist.d.ts" />
-
+import Chartist = require("chartist");
 Chartist.escapingMap = {
   '&': '&amp;',
   '<': '&lt;',
diff --git a/chartist/chartist.d.ts b/chartist/chartist.d.ts
deleted file mode 100644
index ca2b4206d8..0000000000
--- a/chartist/chartist.d.ts
+++ /dev/null
@@ -1,559 +0,0 @@
-// Type definitions for Chartist v0.9.5
-// Project: https://github.com/gionkunz/chartist-js
-// Definitions by: Matt Gibbs <https://github.com/mtgibbs>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace Chartist {
-
-  interface ChartistStatic {
-
-    /**
-     * Precision level used internally in Chartist for rounding. If you require more decimal places you can increase this number.
-     */
-    precision: number;
-
-    /**
-     * A map with characters to escape for strings to be safely used as attribute values.
-     */
-    escapingMap: IChartistEscapeMap;
-
-    Pie: IChartistPieChart;
-    Bar: IChartistBarChart;
-    Line: IChartistLineChart;
-
-    FixedScaleAxis: IFixedScaleAxisStatic;
-    AutoScaleAxis: IAutoScaleAxisStatic;
-    StepAxis: IStepAxisStatic;
-
-    Svg: ChartistSvgStatic;
-    Interpolation: ChartistInterpolationStatic;
-
-    noop: Function;
-
-    alphaNumerate(n: number): string;
-    extend(target: Object, ...sources: Object[]): Object;
-
-    replaceAll(str: string, subStr: string, newSubStr: string): string;
-    ensureUnit(value: number, unit: string): string;
-    quantity(input: string | number): Object;
-
-    query(query: Node | string): Node;
-    times(length: number): Array<any>;
-    sum(previous: number, current: number): number;
-    mapMultiply(factor: number): (num: number) => number;
-    mapAdd(addend: number): (num: number) => number;
-    serialMap(arr: Array<any>, cb: Function): Array<any>;
-    roundWithPrecision(value: number, digits?: number): number;
-
-    getMultiValue(value: any, dimension?: any): number; // this method is not documented, but it is used in the examples
-
-    serialize(data: Object | string | number): string;
-    deserialize(data: string): Object | string | number;
-
-    createSvg(container: Node, width: string, height: string, className: string): Object; // TODO: Figure out if this is returning a ChartistSVGWrapper or an actual SVGElement
-
-    plugins: any;
-  }
-
-  interface IChartistEscapeMap {
-    [Key: string]: string;
-  }
-
-  interface IResponsiveOptionTuple<T extends IChartOptions> extends Array<string | T> {
-    0: string;
-    1: T;
-  }
-
-  // these have no other purpose than to help define the types that can be placed on
-  // a line chart axisX
-  // in the actual chartist library these are classes that project their options onto
-  // the parent class
-  interface IFixedScaleAxisStatic { }
-  interface IAutoScaleAxisStatic { }
-  interface IStepAxisStatic { }
-
-  // data formats are not well documented on all the ways they can be passed to the constructors
-  // this definition gives some intellisense, but does not protect the user from misuse
-  // TODO: come in and tidy this up and make it fit better
-  interface IChartistData {
-    labels?: Array<string> | Array<number> | Array<Date>;
-    series: Array<IChartistSeriesData> | Array<number> |  Array<Array<number>>;
-  }
-
-  interface IChartistSeriesData {
-    name?: string;
-    value?: number;
-    data?: Array<number>;
-    className?: string;
-    meta?: string; // I assume this could probably be a number as well?
-  }
-
-  interface IChartistBase<T extends IChartOptions> {
-    container: any;
-    data: IChartistData;
-    defaultOptions: T;
-    options: T;
-    responsiveOptions: Array<IResponsiveOptionTuple<T>>;
-
-    // this most likely doesn't need to be exposed to the user
-    eventEmitter: any;
-
-    supportsForeignObject: boolean;
-    supportsAnimations: boolean;
-    resizeListener: any;
-
-    plugins?: Array<any>; // all of these plugins seem to be functions with options, but keeping type any for now
-
-    update(data: Object, options?: T, override?: boolean): void;
-    detatch(): void;
-
-    /**
-     * Use this function to register event handlers. The handler callbacks are synchronous and will run in the main thread rather than the event loop.
-     *
-     * @method on
-     * @param event {string} Name of the event. Check the examples for supported events.
-     * @param handler {Function} The handler function that will be called when an event with the given name was emitted. This function will receive a data argument which contains event data. See the example for more details.
-     */
-    on(event: string, handler: Function): IChartistBase<T>;
-
-    /**
-     * Use this function to un-register event handlers. If the handler function parameter is omitted all handlers for the given event will be un-registered.
-     *
-     * @method off
-     * @param event {string} Name of the event for which a handler should be removed
-     * @param handler {Function} The handler function that that was previously used to register a new event handler. This handler will be removed from the event handler list. If this parameter is omitted then all event handlers for the given event are removed from the list.
-     */
-    off(event: string, handler?: Function): IChartistBase<T>;
-  }
-
-  interface IChartistPieChart extends IChartistBase<IPieChartOptions> {
-    new (target: any, data: IChartistData, options?: IPieChartOptions, responsiveOptions?: Array<IResponsiveOptionTuple<IPieChartOptions>>): IChartistPieChart;
-  }
-
-  interface IChartistLineChart extends IChartistBase<ILineChartOptions> {
-    new (target: any, data: IChartistData, options?: ILineChartOptions, responsiveOptions?: Array<IResponsiveOptionTuple<ILineChartOptions>>): IChartistLineChart;
-  }
-
-  interface IChartistBarChart extends IChartistBase<IBarChartOptions> {
-    new (target: any, data: IChartistData, options?: IBarChartOptions, responsiveOptions?: Array<IResponsiveOptionTuple<IBarChartOptions>>): IChartistBarChart;
-  }
-
-  interface IChartOptions {
-    /**
-     * If true the whole data is reversed including labels, the series order as well as the whole series data arrays.
-     */
-    reverseData?: boolean;
-
-    plugins?: Array<any>;
-  }
-
-  interface IPieChartOptions extends IChartOptions {
-    /**
-     * Specify a fixed width for the chart as a string (i.e. '100px' or '50%')
-     */
-    width?: number | string;
-
-    /**
-     * Specify a fixed height for the chart as a string (i.e. '100px' or '50%')
-     */
-    height?: number | string;
-
-    /**
-     * Padding of the chart drawing area to the container element and labels as a number or padding object {top: 5, right: 5, bottom: 5, left: 5}
-     */
-    chartPadding?: IChartPadding | number;
-
-    /**
-     * Override the class names that are used to generate the SVG structure of the chart
-     */
-    classNames?: IPieChartClasses;
-
-    /**
-     * The start angle of the pie chart in degrees where 0 points north. A higher value offsets the start angle clockwise.
-     */
-    startAngle?: number;
-
-    /**
-     * An optional total you can specify. By specifying a total value, the sum of the values in the series must be this total in order to draw a full pie. You can use this parameter to draw only parts of a pie or gauge charts.
-     */
-    total?: number;
-
-    /**
-     * If specified the donut CSS classes will be used and strokes will be drawn instead of pie slices.
-     */
-    donut?: boolean;
-
-    /**
-     * Specify the donut stroke width, currently done in javascript for convenience.
-     */
-    donutWidth?: number;
-
-    /**
-     * Specify if a label should be shown or not
-     */
-    showLabel?: boolean;
-
-    /**
-     * Label position offset from the standard position which is half distance of the radius. This value can be either positive or negative. Positive values will position the label away from the center.
-     */
-    labelOffset?: number;
-
-    /**
-     * This option can be set to 'inside', 'outside' or 'center'. Positioned with 'inside' the labels will be placed on half the distance of the radius to the border of the Pie by respecting the 'labelOffset'. The 'outside' option will place the labels at the border of the pie and 'center' will place the labels in the absolute center point of the chart. The 'center' option only makes sense in conjunction with the 'labelOffset' option.
-     */
-    labelPosition?: string;
-
-    /**
-     * An interpolation function for the label value
-     */
-    labelInterpolationFnc?: Function;
-
-    /**
-     * Label direction can be 'neutral', 'explode' or 'implode'.  Default is 'neutral'.  The labels anchor will be positioned based on those settings as well as the fact if the labels are on the right or left side of the center of the chart. Usually explode is useful when labels are positioned far away from the center.
-     */
-    labelDirection?: string;
-  }
-
-  interface IChartPadding {
-    top?: number;
-    right?: number;
-    bottom?: number;
-    left?: number;
-  }
-
-  interface IPieChartClasses {
-    chartPie?: string;
-    chartDonut?: string;
-    series?: string;
-    slicePie?: string;
-    sliceDonut?: string;
-    label?: string;
-  }
-
-  interface IBarChartOptions extends IChartOptions {
-    axisX?: IBarChartAxis;
-    axisY?: IBarChartAxis;
-    width?: number | string;
-    height?: number | string;
-    high?: number;
-    low?: number;
-    ticks?: Array<string | number>;
-    onlyInteger?: boolean;
-    chartPadding?: IChartPadding;
-    seriesBarDistance?: number;
-
-    /**
-     * If set to true this property will cause the series bars to be stacked and form a total for each series point. This will also influence the y-axis and the overall bounds of the chart. In stacked mode the seriesBarDistance property will have no effect.
-     */
-    stackBars?: boolean;
-
-    horizontalBars?: boolean;
-    distributeSeries?: boolean;
-  }
-
-  interface IBarChartAxis {
-    offset?: number;
-    position?: string;
-    labelOffset?: {
-      x?: number;
-      y?: number;
-    };
-    showLabel?: boolean;
-    showGrid?: boolean;
-    labelInterpolationFnc?: Function;
-    scaleMinSpace?: number;
-    onlyInteger?: boolean;
-  }
-
-  interface IBarChartClasses {
-    chart?: string;
-    horizontalBars?: string;
-    label?: string;
-    labelGroup?: string;
-    series?: string;
-    bar?: string;
-    grid?: string;
-    gridGroup?: string;
-    vertical?: string;
-    horizontal?: string;
-    start?: string;
-    end?: string;
-  }
-
-  interface ILineChartOptions extends IChartOptions {
-    axisX?: IChartistStepAxis | IChartistFixedScaleAxis | IChartistAutoScaleAxis;
-    axisY?: IChartistStepAxis | IChartistFixedScaleAxis | IChartistAutoScaleAxis;
-    width?: number | string;
-    height?: number | string;
-    showLine?: boolean;
-    showPoint?: boolean;
-    showArea?: boolean;
-    areaBase?: number;
-    lineSmooth?: Function | boolean;
-    low?: number;
-    high?: number;
-    ticks?: Array<string | number>;
-    chartPadding?: IChartPadding;
-    fullWidth?: boolean;
-    classNames?: ILineChartClasses;
-  }
-
-  interface ILineChartAxis {
-    offset?: number;
-    position?: string;
-    labelOffset?: {
-      x?: number;
-      y?: number;
-    };
-    showLabel?: boolean;
-    showGrid?: boolean;
-    labelInterpolationFnc?: Function;
-  }
-
-  interface IChartistStepAxis extends ILineChartAxis {
-    type?: IStepAxisStatic;
-    ticks?: Array<string> | Array<number>;
-    stretch?: boolean;
-  }
-
-  interface IChartistFixedScaleAxis extends ILineChartAxis {
-    type?: IFixedScaleAxisStatic;
-    high?: number;
-    low?: number;
-    divisor?: number;
-    ticks?: Array<string> | Array<number>;
-  }
-
-  interface IChartistAutoScaleAxis extends ILineChartAxis {
-    high?: number;
-    low?: number;
-    scaleMinSpace?: number;
-    onlyInteger?: boolean;
-    referenceValue?: number;
-    type?: IAutoScaleAxisStatic;
-  }
-
-  interface ILineChartClasses {
-    /**
-     * Default is 'ct-chart-line'
-     */
-    chart?: string;
-    label?: string;
-    labelGroup?: string;
-    series?: string;
-    line?: string;
-    point?: string;
-    area?: string;
-    grid?: string;
-    gridGroup?: string;
-    vertical?: string;
-    horizontal?: string;
-    start?: string;
-    end?: string;
-  }
-
-  interface ChartistSvgStatic {
-    new (name: HTMLElement | string, attributes: Object, className?: string, parent?: Object, insertFirst?: boolean): IChartistSvg;
-
-    Easing: ChartistEasingStatic;
-
-    /**
-     * This method checks for support of a given SVG feature like Extensibility, SVG-animation or the like. Check http://www.w3.org/TR/SVG11/feature for a detailed list.
-     */
-    isSupported(feature: string): boolean;
-  }
-
-  interface IChartistSvg {
-
-    /**
-     * Set attributes on the current SVG element of the wrapper you're currently working on.
-     */
-    attr(attributes: Object | string, ns: string): Object | string;
-
-    /**
-     * Create a new SVG element whose wrapper object will be selected for further operations. This way you can also create nested groups easily.
-     */
-    elem(name: string, attributes?: Object, className?: string, insertFirst?: boolean): IChartistSvg;
-
-    /**
-     * Returns the parent Chartist.SVG wrapper object
-     */
-    parent(): IChartistSvg;
-
-    /**
-     * This method returns a Chartist.Svg wrapper around the root SVG element of the current tree.
-     */
-    root(): IChartistSvg;
-
-    /**
-     * Find the first child SVG element of the current element that matches a CSS selector. The returned object is a Chartist.Svg wrapper.
-     */
-    querySelector(selector: string): IChartistSvg;
-
-    /**
-     * Find the all child SVG elements of the current element that match a CSS selector. The returned object is a Chartist.Svg.List wrapper.
-     */
-    querySelectorAll(selector: string): any; // this returns an svg wrapper list in the docs, need to see if that's just an array or a special list
-
-    /**
-     * This method creates a foreignObject (see https://developer.mozilla.org/en-US/docs/Web/SVG/Element/foreignObject) that allows to embed HTML content into a SVG graphic. With the help of foreignObjects you can enable the usage of regular HTML elements inside of SVG where they are subject for SVG positioning and transformation but the Browser will use the HTML rendering capabilities for the containing DOM.
-     */
-    foreignObject(content: any, attributes?: Object, className?: string, insertFirst?: boolean): IChartistSvg;
-
-    /**
-     * This method adds a new text element to the current Chartist.Svg wrapper.
-     */
-    text(t: string): IChartistSvg;
-
-    /**
-     * This method will clear all child nodes of the current wrapper object.
-     */
-    empty(): IChartistSvg;
-
-    /**
-     * This method will cause the current wrapper to remove itself from its parent wrapper. Use this method if you'd like to get rid of an element in a given DOM structure.
-     */
-    remove(): IChartistSvg;
-
-    /**
-     * This method will replace the element with a new element that can be created outside of the current DOM.
-     */
-    replace(): IChartistSvg;
-
-    /**
-     * This method will append an element to the current element as a child.
-     */
-    append(): IChartistSvg;
-
-    /**
-     * Returns an array of class names that are attached to the current wrapper element. This method can not be chained further.
-     */
-    classes(): Array<string>;
-
-    /**
-     * Adds one or a space separated list of classes to the current element and ensures the classes are only existing once.
-     *
-     * @method addClass
-     * @param names {string} A white space separated list of class names
-     */
-    addClass(names: string): IChartistSvg;
-
-    /**
-     * Removes one or a space separated list of classes from the current element.
-     *
-     * @method removeClass
-     * @param names {string} A white space separated list of class names
-     */
-    removeClass(names: string): IChartistSvg;
-
-    /**
-     * Removes all classes from the current element.
-     */
-    removeAllClasses(): IChartistSvg;
-
-    /**
-     * Get element height with fallback to svg BoundingBox or parent container dimensions
-     */
-    height(): number;
-
-    /**
-     * The animate function lets you animate the current element with SMIL animations. You can add animations for multiple attributes at the same time by using an animation definition object. This object should contain SMIL animation attributes.
-     */
-    animate(animations: IChartistAnimations, guided: boolean, eventEmitter: Object): IChartistSvg;
-
-    /**
-     * "Safe" way to get property value from svg BoundingBox. This is a workaround. Firefox throws an NS_ERROR_FAILURE error if getBBox() is called on an invisible node.
-     * THIS IS A WORKAROUND
-     */
-    getBBoxProperty(node: SVGElement, prop: string): string; // TODO: find a good example of this and add it to the tests, it might belong to static
-  }
-
-  interface IChartistAnimations {
-    [Key: string]: IChartistAnimationOptions;
-  }
-
-  interface IChartistAnimationOptions {
-    id?: string;
-    dur: string | number;
-    from: string | number;
-    to: string | number;
-    easing?: IChartistEasingDefinition | string;
-    fill?: string;
-    begin?: string;
-  }
-
-  interface IChartistEasingDefinition {
-    0: number;
-    1: number;
-    2: number;
-    3: number;
-  }
-
-  interface ChartistEasingStatic {
-    easeInSine: IChartistEasingDefinition;
-    easeOutSine: IChartistEasingDefinition;
-    easeInOutSine: IChartistEasingDefinition;
-    easeInQuad: IChartistEasingDefinition;
-    easeOutQuad: IChartistEasingDefinition;
-    easeInOutQuad: IChartistEasingDefinition;
-    easeInCubic: IChartistEasingDefinition;
-    easeOutCubic: IChartistEasingDefinition;
-    easeInOutCubic: IChartistEasingDefinition;
-    easeInQuart: IChartistEasingDefinition;
-    easeOutQuart: IChartistEasingDefinition;
-    easeInOutQuart: IChartistEasingDefinition;
-    easeInQuint: IChartistEasingDefinition;
-    easeOutQuint: IChartistEasingDefinition;
-    easeInOutQuint: IChartistEasingDefinition;
-    easeInExpo: IChartistEasingDefinition;
-    easeOutExpo: IChartistEasingDefinition;
-    easeInOutExpo: IChartistEasingDefinition;
-    easeInCirc: IChartistEasingDefinition;
-    easeOutCirc: IChartistEasingDefinition;
-    easeInOutCirc: IChartistEasingDefinition;
-    easeInBack: IChartistEasingDefinition;
-    easeOutBack: IChartistEasingDefinition;
-    easeInOutBack: IChartistEasingDefinition;
-  }
-
-  interface ChartistInterpolationStatic {
-
-    /**
-     * This interpolation function does not smooth the path and the result is only containing lines and no curves.
-     */
-    none(options?: IChartistInterpolationOptions): Function;
-
-    /**
-     * Simple smoothing creates horizontal handles that are positioned with a fraction of the length between two data points. You can use the divisor option to specify the amount of smoothing.
-     */
-    simple(options?: IChartistSimpleInterpolationOptions): Function;
-
-    /**
-     * Cardinal / Catmull-Rome spline interpolation is the default smoothing function in Chartist. It produces nice results where the splines will always meet the points. It produces some artifacts though when data values are increased or decreased rapidly. The line may not follow a very accurate path and if the line should be accurate this smoothing function does not produce the best results.
-     */
-    cardinal(options?: IChartistCardinalInterpolationOptions): Function;
-
-    /**
-     * Step interpolation will cause the line chart to move in steps rather than diagonal or smoothed lines. This interpolation will create additional points that will also be drawn when the showPoint option is enabled.
-     */
-    step(options?: IChartistStepInterpolationOptions): Function;
-  }
-
-  interface IChartistInterpolationOptions {
-    fillHoles?: boolean;
-  }
-
-  interface IChartistSimpleInterpolationOptions extends IChartistInterpolationOptions {
-    divisor?: number;
-  }
-
-  interface IChartistCardinalInterpolationOptions extends IChartistInterpolationOptions {
-    tension?: number;
-  }
-
-  interface IChartistStepInterpolationOptions extends IChartistInterpolationOptions {
-    postpone?: boolean;
-  }
-}
-
-declare var Chartist: Chartist.ChartistStatic;
diff --git a/chartist/index.d.ts b/chartist/index.d.ts
new file mode 100644
index 0000000000..117f0914ae
--- /dev/null
+++ b/chartist/index.d.ts
@@ -0,0 +1,562 @@
+// Type definitions for Chartist v0.9.5
+// Project: https://github.com/gionkunz/chartist-js
+// Definitions by: Matt Gibbs <https://github.com/mtgibbs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace Chartist {
+
+  interface ChartistStatic {
+
+    /**
+     * Precision level used internally in Chartist for rounding. If you require more decimal places you can increase this number.
+     */
+    precision: number;
+
+    /**
+     * A map with characters to escape for strings to be safely used as attribute values.
+     */
+    escapingMap: IChartistEscapeMap;
+
+    Pie: IChartistPieChart;
+    Bar: IChartistBarChart;
+    Line: IChartistLineChart;
+
+    FixedScaleAxis: IFixedScaleAxisStatic;
+    AutoScaleAxis: IAutoScaleAxisStatic;
+    StepAxis: IStepAxisStatic;
+
+    Svg: ChartistSvgStatic;
+    Interpolation: ChartistInterpolationStatic;
+
+    noop: Function;
+
+    alphaNumerate(n: number): string;
+    extend(target: Object, ...sources: Object[]): Object;
+
+    replaceAll(str: string, subStr: string, newSubStr: string): string;
+    ensureUnit(value: number, unit: string): string;
+    quantity(input: string | number): Object;
+
+    query(query: Node | string): Node;
+    times(length: number): Array<any>;
+    sum(previous: number, current: number): number;
+    mapMultiply(factor: number): (num: number) => number;
+    mapAdd(addend: number): (num: number) => number;
+    serialMap(arr: Array<any>, cb: Function): Array<any>;
+    roundWithPrecision(value: number, digits?: number): number;
+
+    getMultiValue(value: any, dimension?: any): number; // this method is not documented, but it is used in the examples
+
+    serialize(data: Object | string | number): string;
+    deserialize(data: string): Object | string | number;
+
+    createSvg(container: Node, width: string, height: string, className: string): Object; // TODO: Figure out if this is returning a ChartistSVGWrapper or an actual SVGElement
+
+    plugins: any;
+  }
+
+  interface IChartistEscapeMap {
+    [Key: string]: string;
+  }
+
+  interface IResponsiveOptionTuple<T extends IChartOptions> extends Array<string | T> {
+    0: string;
+    1: T;
+  }
+
+  // these have no other purpose than to help define the types that can be placed on
+  // a line chart axisX
+  // in the actual chartist library these are classes that project their options onto
+  // the parent class
+  interface IFixedScaleAxisStatic { }
+  interface IAutoScaleAxisStatic { }
+  interface IStepAxisStatic { }
+
+  // data formats are not well documented on all the ways they can be passed to the constructors
+  // this definition gives some intellisense, but does not protect the user from misuse
+  // TODO: come in and tidy this up and make it fit better
+  interface IChartistData {
+    labels?: Array<string> | Array<number> | Array<Date>;
+    series: Array<IChartistSeriesData> | Array<number> |  Array<Array<number>>;
+  }
+
+  interface IChartistSeriesData {
+    name?: string;
+    value?: number;
+    data?: Array<number>;
+    className?: string;
+    meta?: string; // I assume this could probably be a number as well?
+  }
+
+  interface IChartistBase<T extends IChartOptions> {
+    container: any;
+    data: IChartistData;
+    defaultOptions: T;
+    options: T;
+    responsiveOptions: Array<IResponsiveOptionTuple<T>>;
+
+    // this most likely doesn't need to be exposed to the user
+    eventEmitter: any;
+
+    supportsForeignObject: boolean;
+    supportsAnimations: boolean;
+    resizeListener: any;
+
+    plugins?: Array<any>; // all of these plugins seem to be functions with options, but keeping type any for now
+
+    update(data: Object, options?: T, override?: boolean): void;
+    detatch(): void;
+
+    /**
+     * Use this function to register event handlers. The handler callbacks are synchronous and will run in the main thread rather than the event loop.
+     *
+     * @method on
+     * @param event {string} Name of the event. Check the examples for supported events.
+     * @param handler {Function} The handler function that will be called when an event with the given name was emitted. This function will receive a data argument which contains event data. See the example for more details.
+     */
+    on(event: string, handler: Function): IChartistBase<T>;
+
+    /**
+     * Use this function to un-register event handlers. If the handler function parameter is omitted all handlers for the given event will be un-registered.
+     *
+     * @method off
+     * @param event {string} Name of the event for which a handler should be removed
+     * @param handler {Function} The handler function that that was previously used to register a new event handler. This handler will be removed from the event handler list. If this parameter is omitted then all event handlers for the given event are removed from the list.
+     */
+    off(event: string, handler?: Function): IChartistBase<T>;
+  }
+
+  interface IChartistPieChart extends IChartistBase<IPieChartOptions> {
+    new (target: any, data: IChartistData, options?: IPieChartOptions, responsiveOptions?: Array<IResponsiveOptionTuple<IPieChartOptions>>): IChartistPieChart;
+  }
+
+  interface IChartistLineChart extends IChartistBase<ILineChartOptions> {
+    new (target: any, data: IChartistData, options?: ILineChartOptions, responsiveOptions?: Array<IResponsiveOptionTuple<ILineChartOptions>>): IChartistLineChart;
+  }
+
+  interface IChartistBarChart extends IChartistBase<IBarChartOptions> {
+    new (target: any, data: IChartistData, options?: IBarChartOptions, responsiveOptions?: Array<IResponsiveOptionTuple<IBarChartOptions>>): IChartistBarChart;
+  }
+
+  interface IChartOptions {
+    /**
+     * If true the whole data is reversed including labels, the series order as well as the whole series data arrays.
+     */
+    reverseData?: boolean;
+
+    plugins?: Array<any>;
+  }
+
+  interface IPieChartOptions extends IChartOptions {
+    /**
+     * Specify a fixed width for the chart as a string (i.e. '100px' or '50%')
+     */
+    width?: number | string;
+
+    /**
+     * Specify a fixed height for the chart as a string (i.e. '100px' or '50%')
+     */
+    height?: number | string;
+
+    /**
+     * Padding of the chart drawing area to the container element and labels as a number or padding object {top: 5, right: 5, bottom: 5, left: 5}
+     */
+    chartPadding?: IChartPadding | number;
+
+    /**
+     * Override the class names that are used to generate the SVG structure of the chart
+     */
+    classNames?: IPieChartClasses;
+
+    /**
+     * The start angle of the pie chart in degrees where 0 points north. A higher value offsets the start angle clockwise.
+     */
+    startAngle?: number;
+
+    /**
+     * An optional total you can specify. By specifying a total value, the sum of the values in the series must be this total in order to draw a full pie. You can use this parameter to draw only parts of a pie or gauge charts.
+     */
+    total?: number;
+
+    /**
+     * If specified the donut CSS classes will be used and strokes will be drawn instead of pie slices.
+     */
+    donut?: boolean;
+
+    /**
+     * Specify the donut stroke width, currently done in javascript for convenience.
+     */
+    donutWidth?: number;
+
+    /**
+     * Specify if a label should be shown or not
+     */
+    showLabel?: boolean;
+
+    /**
+     * Label position offset from the standard position which is half distance of the radius. This value can be either positive or negative. Positive values will position the label away from the center.
+     */
+    labelOffset?: number;
+
+    /**
+     * This option can be set to 'inside', 'outside' or 'center'. Positioned with 'inside' the labels will be placed on half the distance of the radius to the border of the Pie by respecting the 'labelOffset'. The 'outside' option will place the labels at the border of the pie and 'center' will place the labels in the absolute center point of the chart. The 'center' option only makes sense in conjunction with the 'labelOffset' option.
+     */
+    labelPosition?: string;
+
+    /**
+     * An interpolation function for the label value
+     */
+    labelInterpolationFnc?: Function;
+
+    /**
+     * Label direction can be 'neutral', 'explode' or 'implode'.  Default is 'neutral'.  The labels anchor will be positioned based on those settings as well as the fact if the labels are on the right or left side of the center of the chart. Usually explode is useful when labels are positioned far away from the center.
+     */
+    labelDirection?: string;
+  }
+
+  interface IChartPadding {
+    top?: number;
+    right?: number;
+    bottom?: number;
+    left?: number;
+  }
+
+  interface IPieChartClasses {
+    chartPie?: string;
+    chartDonut?: string;
+    series?: string;
+    slicePie?: string;
+    sliceDonut?: string;
+    label?: string;
+  }
+
+  interface IBarChartOptions extends IChartOptions {
+    axisX?: IBarChartAxis;
+    axisY?: IBarChartAxis;
+    width?: number | string;
+    height?: number | string;
+    high?: number;
+    low?: number;
+    ticks?: Array<string | number>;
+    onlyInteger?: boolean;
+    chartPadding?: IChartPadding;
+    seriesBarDistance?: number;
+
+    /**
+     * If set to true this property will cause the series bars to be stacked and form a total for each series point. This will also influence the y-axis and the overall bounds of the chart. In stacked mode the seriesBarDistance property will have no effect.
+     */
+    stackBars?: boolean;
+
+    horizontalBars?: boolean;
+    distributeSeries?: boolean;
+  }
+
+  interface IBarChartAxis {
+    offset?: number;
+    position?: string;
+    labelOffset?: {
+      x?: number;
+      y?: number;
+    };
+    showLabel?: boolean;
+    showGrid?: boolean;
+    labelInterpolationFnc?: Function;
+    scaleMinSpace?: number;
+    onlyInteger?: boolean;
+  }
+
+  interface IBarChartClasses {
+    chart?: string;
+    horizontalBars?: string;
+    label?: string;
+    labelGroup?: string;
+    series?: string;
+    bar?: string;
+    grid?: string;
+    gridGroup?: string;
+    vertical?: string;
+    horizontal?: string;
+    start?: string;
+    end?: string;
+  }
+
+  interface ILineChartOptions extends IChartOptions {
+    axisX?: IChartistStepAxis | IChartistFixedScaleAxis | IChartistAutoScaleAxis;
+    axisY?: IChartistStepAxis | IChartistFixedScaleAxis | IChartistAutoScaleAxis;
+    width?: number | string;
+    height?: number | string;
+    showLine?: boolean;
+    showPoint?: boolean;
+    showArea?: boolean;
+    areaBase?: number;
+    lineSmooth?: Function | boolean;
+    low?: number;
+    high?: number;
+    ticks?: Array<string | number>;
+    chartPadding?: IChartPadding;
+    fullWidth?: boolean;
+    classNames?: ILineChartClasses;
+  }
+
+  interface ILineChartAxis {
+    offset?: number;
+    position?: string;
+    labelOffset?: {
+      x?: number;
+      y?: number;
+    };
+    showLabel?: boolean;
+    showGrid?: boolean;
+    labelInterpolationFnc?: Function;
+  }
+
+  interface IChartistStepAxis extends ILineChartAxis {
+    type?: IStepAxisStatic;
+    ticks?: Array<string> | Array<number>;
+    stretch?: boolean;
+  }
+
+  interface IChartistFixedScaleAxis extends ILineChartAxis {
+    type?: IFixedScaleAxisStatic;
+    high?: number;
+    low?: number;
+    divisor?: number;
+    ticks?: Array<string> | Array<number>;
+  }
+
+  interface IChartistAutoScaleAxis extends ILineChartAxis {
+    high?: number;
+    low?: number;
+    scaleMinSpace?: number;
+    onlyInteger?: boolean;
+    referenceValue?: number;
+    type?: IAutoScaleAxisStatic;
+  }
+
+  interface ILineChartClasses {
+    /**
+     * Default is 'ct-chart-line'
+     */
+    chart?: string;
+    label?: string;
+    labelGroup?: string;
+    series?: string;
+    line?: string;
+    point?: string;
+    area?: string;
+    grid?: string;
+    gridGroup?: string;
+    vertical?: string;
+    horizontal?: string;
+    start?: string;
+    end?: string;
+  }
+
+  interface ChartistSvgStatic {
+    new (name: HTMLElement | string, attributes: Object, className?: string, parent?: Object, insertFirst?: boolean): IChartistSvg;
+
+    Easing: ChartistEasingStatic;
+
+    /**
+     * This method checks for support of a given SVG feature like Extensibility, SVG-animation or the like. Check http://www.w3.org/TR/SVG11/feature for a detailed list.
+     */
+    isSupported(feature: string): boolean;
+  }
+
+  interface IChartistSvg {
+
+    /**
+     * Set attributes on the current SVG element of the wrapper you're currently working on.
+     */
+    attr(attributes: Object | string, ns: string): Object | string;
+
+    /**
+     * Create a new SVG element whose wrapper object will be selected for further operations. This way you can also create nested groups easily.
+     */
+    elem(name: string, attributes?: Object, className?: string, insertFirst?: boolean): IChartistSvg;
+
+    /**
+     * Returns the parent Chartist.SVG wrapper object
+     */
+    parent(): IChartistSvg;
+
+    /**
+     * This method returns a Chartist.Svg wrapper around the root SVG element of the current tree.
+     */
+    root(): IChartistSvg;
+
+    /**
+     * Find the first child SVG element of the current element that matches a CSS selector. The returned object is a Chartist.Svg wrapper.
+     */
+    querySelector(selector: string): IChartistSvg;
+
+    /**
+     * Find the all child SVG elements of the current element that match a CSS selector. The returned object is a Chartist.Svg.List wrapper.
+     */
+    querySelectorAll(selector: string): any; // this returns an svg wrapper list in the docs, need to see if that's just an array or a special list
+
+    /**
+     * This method creates a foreignObject (see https://developer.mozilla.org/en-US/docs/Web/SVG/Element/foreignObject) that allows to embed HTML content into a SVG graphic. With the help of foreignObjects you can enable the usage of regular HTML elements inside of SVG where they are subject for SVG positioning and transformation but the Browser will use the HTML rendering capabilities for the containing DOM.
+     */
+    foreignObject(content: any, attributes?: Object, className?: string, insertFirst?: boolean): IChartistSvg;
+
+    /**
+     * This method adds a new text element to the current Chartist.Svg wrapper.
+     */
+    text(t: string): IChartistSvg;
+
+    /**
+     * This method will clear all child nodes of the current wrapper object.
+     */
+    empty(): IChartistSvg;
+
+    /**
+     * This method will cause the current wrapper to remove itself from its parent wrapper. Use this method if you'd like to get rid of an element in a given DOM structure.
+     */
+    remove(): IChartistSvg;
+
+    /**
+     * This method will replace the element with a new element that can be created outside of the current DOM.
+     */
+    replace(): IChartistSvg;
+
+    /**
+     * This method will append an element to the current element as a child.
+     */
+    append(): IChartistSvg;
+
+    /**
+     * Returns an array of class names that are attached to the current wrapper element. This method can not be chained further.
+     */
+    classes(): Array<string>;
+
+    /**
+     * Adds one or a space separated list of classes to the current element and ensures the classes are only existing once.
+     *
+     * @method addClass
+     * @param names {string} A white space separated list of class names
+     */
+    addClass(names: string): IChartistSvg;
+
+    /**
+     * Removes one or a space separated list of classes from the current element.
+     *
+     * @method removeClass
+     * @param names {string} A white space separated list of class names
+     */
+    removeClass(names: string): IChartistSvg;
+
+    /**
+     * Removes all classes from the current element.
+     */
+    removeAllClasses(): IChartistSvg;
+
+    /**
+     * Get element height with fallback to svg BoundingBox or parent container dimensions
+     */
+    height(): number;
+
+    /**
+     * The animate function lets you animate the current element with SMIL animations. You can add animations for multiple attributes at the same time by using an animation definition object. This object should contain SMIL animation attributes.
+     */
+    animate(animations: IChartistAnimations, guided: boolean, eventEmitter: Object): IChartistSvg;
+
+    /**
+     * "Safe" way to get property value from svg BoundingBox. This is a workaround. Firefox throws an NS_ERROR_FAILURE error if getBBox() is called on an invisible node.
+     * THIS IS A WORKAROUND
+     */
+    getBBoxProperty(node: SVGElement, prop: string): string; // TODO: find a good example of this and add it to the tests, it might belong to static
+  }
+
+  interface IChartistAnimations {
+    [Key: string]: IChartistAnimationOptions;
+  }
+
+  interface IChartistAnimationOptions {
+    id?: string;
+    dur: string | number;
+    from: string | number;
+    to: string | number;
+    easing?: IChartistEasingDefinition | string;
+    fill?: string;
+    begin?: string;
+  }
+
+  interface IChartistEasingDefinition {
+    0: number;
+    1: number;
+    2: number;
+    3: number;
+  }
+
+  interface ChartistEasingStatic {
+    easeInSine: IChartistEasingDefinition;
+    easeOutSine: IChartistEasingDefinition;
+    easeInOutSine: IChartistEasingDefinition;
+    easeInQuad: IChartistEasingDefinition;
+    easeOutQuad: IChartistEasingDefinition;
+    easeInOutQuad: IChartistEasingDefinition;
+    easeInCubic: IChartistEasingDefinition;
+    easeOutCubic: IChartistEasingDefinition;
+    easeInOutCubic: IChartistEasingDefinition;
+    easeInQuart: IChartistEasingDefinition;
+    easeOutQuart: IChartistEasingDefinition;
+    easeInOutQuart: IChartistEasingDefinition;
+    easeInQuint: IChartistEasingDefinition;
+    easeOutQuint: IChartistEasingDefinition;
+    easeInOutQuint: IChartistEasingDefinition;
+    easeInExpo: IChartistEasingDefinition;
+    easeOutExpo: IChartistEasingDefinition;
+    easeInOutExpo: IChartistEasingDefinition;
+    easeInCirc: IChartistEasingDefinition;
+    easeOutCirc: IChartistEasingDefinition;
+    easeInOutCirc: IChartistEasingDefinition;
+    easeInBack: IChartistEasingDefinition;
+    easeOutBack: IChartistEasingDefinition;
+    easeInOutBack: IChartistEasingDefinition;
+  }
+
+  interface ChartistInterpolationStatic {
+
+    /**
+     * This interpolation function does not smooth the path and the result is only containing lines and no curves.
+     */
+    none(options?: IChartistInterpolationOptions): Function;
+
+    /**
+     * Simple smoothing creates horizontal handles that are positioned with a fraction of the length between two data points. You can use the divisor option to specify the amount of smoothing.
+     */
+    simple(options?: IChartistSimpleInterpolationOptions): Function;
+
+    /**
+     * Cardinal / Catmull-Rome spline interpolation is the default smoothing function in Chartist. It produces nice results where the splines will always meet the points. It produces some artifacts though when data values are increased or decreased rapidly. The line may not follow a very accurate path and if the line should be accurate this smoothing function does not produce the best results.
+     */
+    cardinal(options?: IChartistCardinalInterpolationOptions): Function;
+
+    /**
+     * Step interpolation will cause the line chart to move in steps rather than diagonal or smoothed lines. This interpolation will create additional points that will also be drawn when the showPoint option is enabled.
+     */
+    step(options?: IChartistStepInterpolationOptions): Function;
+  }
+
+  interface IChartistInterpolationOptions {
+    fillHoles?: boolean;
+  }
+
+  interface IChartistSimpleInterpolationOptions extends IChartistInterpolationOptions {
+    divisor?: number;
+  }
+
+  interface IChartistCardinalInterpolationOptions extends IChartistInterpolationOptions {
+    tension?: number;
+  }
+
+  interface IChartistStepInterpolationOptions extends IChartistInterpolationOptions {
+    postpone?: boolean;
+  }
+}
+
+declare var Chartist: Chartist.ChartistStatic;
+
+export = Chartist;
+export as namespace Chartist;
diff --git a/chartist/tsconfig.json b/chartist/tsconfig.json
new file mode 100644
index 0000000000..d11b14393f
--- /dev/null
+++ b/chartist/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "chartist-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/chartjs/chart-tests.ts b/chartjs/chart-tests.ts
index 452ddbf623..d6b47d45bf 100644
--- a/chartjs/chart-tests.ts
+++ b/chartjs/chart-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="chart.d.ts" />
+
 
 var canvas = <HTMLCanvasElement>document.getElementById('example-chart');
 var ctx = canvas.getContext('2d');
diff --git a/chartjs/chart.d.ts b/chartjs/index.d.ts
similarity index 100%
rename from chartjs/chart.d.ts
rename to chartjs/index.d.ts
diff --git a/chartjs/tsconfig.json b/chartjs/tsconfig.json
new file mode 100644
index 0000000000..efb0b03e22
--- /dev/null
+++ b/chartjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "chart-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/checksum/checksum-tests.ts b/checksum/checksum-tests.ts
index 2746bcb9e9..a5924bcb2f 100644
--- a/checksum/checksum-tests.ts
+++ b/checksum/checksum-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="checksum.d.ts" />
 
 import checksum = require("checksum");
 
diff --git a/checksum/checksum.d.ts b/checksum/checksum.d.ts
deleted file mode 100644
index 920164386f..0000000000
--- a/checksum/checksum.d.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-// Type definitions for checksum 0.1.1
-// Project: https://github.com/dshaw/checksum
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "checksum" {
-
-	namespace checksum {
-		/**
-		 * Options object for all functions
-		 */
-		interface ChecksumOptions {
-			/**
-			 * Algorithm to use, default 'sha1'
-			 * Can be 'sha1' or 'md5'  (see module 'crypto').
-			 */
-			algorithm?: string;
-		}
-
-		/**
-		 * Generate the checksum for a file on disk
-		 * @param filename	The file name
-		 * @param callback	Callback which is called with the result or an error
-		 */
-		function file(filename: string, callback: (error: Error, hash: string) => void): void;
-		/**
-		 * Generate the checksum for a file on disk
-		 * @param filename	The file name
-		 * @param options	Options object to indicate hash algo
-		 * @param callback	Callback which is called with the result or an error
-		 */
-		function file(filename: string, options: ChecksumOptions, callback: (error: Error, hash: string) => void): void;
-	}
-
-	/**
-	 * Generates a checksum for the given value
-	 * @param value	Any value
-	 * @param options	Allows to set the algorithm
-	 * @returns	Checksum
-	 */
-	function checksum(value: any, options?: checksum.ChecksumOptions): string;
-
-	export = checksum;
-}
diff --git a/checksum/index.d.ts b/checksum/index.d.ts
new file mode 100644
index 0000000000..3c3620bbcf
--- /dev/null
+++ b/checksum/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for checksum 0.1.1
+// Project: https://github.com/dshaw/checksum
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare namespace checksum {
+    /**
+     * Options object for all functions
+     */
+    interface ChecksumOptions {
+        /**
+         * Algorithm to use, default 'sha1'
+         * Can be 'sha1' or 'md5'  (see module 'crypto').
+         */
+        algorithm?: string;
+    }
+
+    /**
+     * Generate the checksum for a file on disk
+     * @param filename	The file name
+     * @param callback	Callback which is called with the result or an error
+     */
+    function file(filename: string, callback: (error: Error, hash: string) => void): void;
+    /**
+     * Generate the checksum for a file on disk
+     * @param filename	The file name
+     * @param options	Options object to indicate hash algo
+     * @param callback	Callback which is called with the result or an error
+     */
+    function file(filename: string, options: ChecksumOptions, callback: (error: Error, hash: string) => void): void;
+}
+
+/**
+ * Generates a checksum for the given value
+ * @param value	Any value
+ * @param options	Allows to set the algorithm
+ * @returns	Checksum
+ */
+declare function checksum(value: any, options?: checksum.ChecksumOptions): string;
+
+export = checksum;
diff --git a/checksum/tsconfig.json b/checksum/tsconfig.json
new file mode 100644
index 0000000000..f7b6cb3368
--- /dev/null
+++ b/checksum/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "checksum-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cheerio/cheerio-tests.ts b/cheerio/cheerio-tests.ts
index c1b5eda894..add6938dea 100644
--- a/cheerio/cheerio-tests.ts
+++ b/cheerio/cheerio-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="cheerio.d.ts" />
+
 
 import * as cheerio from 'cheerio';
 
diff --git a/cheerio/cheerio.d.ts b/cheerio/index.d.ts
similarity index 100%
rename from cheerio/cheerio.d.ts
rename to cheerio/index.d.ts
diff --git a/cheerio/tsconfig.json b/cheerio/tsconfig.json
new file mode 100644
index 0000000000..91abb07530
--- /dev/null
+++ b/cheerio/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cheerio-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/chocolatechipjs/chocolatechipjs-tests.ts b/chocolatechipjs/chocolatechipjs-tests.ts
index 111e69f638..465ea2b0a9 100644
--- a/chocolatechipjs/chocolatechipjs-tests.ts
+++ b/chocolatechipjs/chocolatechipjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../chocolatechipjs/chocolatechipjs.d.ts" />
+/// <reference types="chocolatechipjs" />
 // ChocolateChipStatic -- DOM creation, etc.
 $(function() {
     alert('Ready to do stuff!');
diff --git a/chocolatechipjs/chocolatechipjs-tests.ts.tscparams b/chocolatechipjs/chocolatechipjs-tests.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/chocolatechipjs/chocolatechipjs-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/chocolatechipjs/chocolatechipjs.d.ts b/chocolatechipjs/chocolatechipjs.d.ts
deleted file mode 100644
index df54d62951..0000000000
--- a/chocolatechipjs/chocolatechipjs.d.ts
+++ /dev/null
@@ -1,1484 +0,0 @@
-// Type definitions for chocolatechip v4.0.4
-// Project: https://github.com/chocolatechipui/ChocolateChipJS
-// Definitions by: Robert Biggs <http://chocolatechip-ui.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-interface ChocolateChipStatic {
-
-  /**
-   * Accepts a string containing a CSS selector which is then used to match a set of elements.
-   *
-   * @param selector A string containing a selector expression
-   * @param context A DOM HTMLElement to use as context
-   * @return HTMLElement[]
-   */
-  (selector: string | HTMLElement | Document, context?: HTMLElement | ChocolateChipElementArray): ChocolateChipElementArray;
-
-  /**
-   * Binds a function to be executed when the DOM has finished loading.
-   *
-   * @param callback A function to execute after the DOM is ready.
-   * @return void
-   */
-  (callback: () => any): void;
-
-
-  /**
-   * Accepts a string containing a CSS selector which is then used to match a set of elements.
-   *
-   * @param element A DOM element to wrap in an array.
-   * @return HTMLElement[]
-   */
-  (element: HTMLElement): ChocolateChipElementArray;
-
-  /**
-   * Accepts a string containing a CSS selector which is then used to match a set of elements.
-   *
-   * @param elementArray An array of DOM elements to convert into a ChocolateChip Collection.
-   * @return HTMLElement[]
-   */
-  (elementArray: ChocolateChipElementArray): ChocolateChipElementArray;
-
-  /**
-   * Accepts the document element and returns it wrapped in an array.
-   *
-   * @param document The document object.
-   * @return document[]
-   */
-  (document: Document): Document[];
-  
-  /**
-   * If no argument is provided, return the document as a ChocolateChipElementArray.
-   * @return Document[]
-   */
-  (): Document[];
-
-  /**
-   * Extend the ChocolateChipJS object itself with the provided object.
-   *
-   * @param object The object to add to ChocolateChipJS.
-   * @return The ChocolateChipJS object.
-   */
-  extend(object: Object): Object;
-
-  /**
-   * Extend a target object with another object.
-   *
-   * @param target An object to extend.
-   * @param object The object to add to the target.
-   * @return The extended object.
-   */
-  extend(target: Object, object: Object): Object;
-
-  /**
-   * The base for extending ChocolateChipJS collections, which are arrays of elements.
-   */
-  fn: {
-    /**
-     * This method adds the provided object to the Array prototype to make it available to all arrays of HTML elements.
-     *
-     * @param object And object to add to element arrays.
-     * @return The extended array of elements.
-     */
-    extend(object: Object): HTMLElement[];
-  };
-
-  /**
-   * Contains the version of ChocolateChipJS in use.
-   */
-  version: string;
-
-  /**
-   * Contains the name of the library (ChocolateChip).
-   */
-  libraryName: string;
-
-  /**
-   * An empty function.
-   *
-   * @return void.
-   */
-  noop(): void;
-
-  /**
-   * Uuid number.
-   */
-  uuid: number;
-
-  /**
-   * Create a random number to use as a uuid.
-   *
-   * @return number.
-   */
-  uuidNum(): number;
-
-  /**
-   * Creates a uuid using uuidNum().
-   *
-   * @return A string.
-   */
-  makeUuid(): string;
-
-
-  /**
-   * Create a ChocolateChip collection object by creating elements from an HTML string.
-   *
-   * @param selector
-   * @return any
-   */
-  make(selector: string): ChocolateChipElementArray;
-
-  /**
-   * Create a ChocolateChip collection object by creating elements from an HTML string. This is an alias for $.make.
-   *
-   * @param selector
-   * @return any
-   */
-  html(selector: string): ChocolateChipElementArray;
-
-  /**
-   * Replace one element with another.
-   *
-   * @param new HTMLElement
-   * @param old HTMLElement
-   * @return HTMLElement[]
-   */
-  replace(newElement: ChocolateChipElementArray, oldElement: ChocolateChipElementArray): void;
-
-  /**
-   * Load a JavaScript file from a url, then execute it.
-   *
-   * @param url A string containing the URL where the script resides.
-   * @param callback A callback function that is executed after the script loads.
-   * @return void
-   */
-  require(url: string, callback: Function): Function;
-
-  /**
-   * Process JavaScript returned by Ajax request. An optional name can be used to create a custom variable name by which the data is exposed, otherwise it is exposed with the variable "data".
-   *
-   * @param url A string containing the URL where the script resides.
-   * @param callback A callback function that is executed after the script loads.
-   * @return Function
-   */
-  processJSON(json: string, name?: string): any;
-
-  /**
-   * This method takes a referenced form and serializes its element names and values, which it returns as a string. This is required if you want to send form data.
-   *
-   * @param element A string, HTML element or ChocolateChipElementArray containing a reference to a from.
-   * @return An encode string form element names and values.
-   */
-  serialize(element: any): string;
-
-  /**
-   * Parse the data in a Promise response as JSON.
-   *
-   * @param response The response from a Promise.
-   * @result
-   */
-  json(reponse: Response): JSON;
-
-  /**
-   * This method will defer the execution of a function until the call stack is clear.
-   *
-   * @param callback A function to execute.
-   * @param duration The number of milliseconds to delay execution.
-   * @return any
-   */
-  delay(callback: Function, duration?: number): any;
-
-  /**
-   * The method will defer the execution of its callback until the call stack is clear.
-   *
-   * @param callback A callback to execute after a delay.
-   * @return    Function.
-   */
-  defer(callback: Function): Function;
-
-  /**
-   * This method makes sure a method always returns an array. If no values are available to return, it returns and empty array. This is to make sure that methods that expect a chainable array will not throw and exception.
-   *
-   * @param result The result of a method to test if it can be returned in an array.
-   * @return An array holding the results of a method, otherwise an empty array.
-   */
-  returnResult(result: HTMLElement[]): any[];
-
-  /**
-   * This method allows you to execute a callback on each item in an array of elements.
-   *
-   * @param array An array of elements.
-   * @param callback A callback to execute on each element. This has two parameters: the context, followed by the index of the current iteration.
-   */
-  each<T>(array: T[], callback: (ctx: T, idx: number) => any): any;
-
-  /**
-   * This method will concatenate strings or values as a cleaner alternative to using the '+' operator.
-   *
-   * @param string or number A comma separated series of strings to concatenate.
-   * @return string
-   */
-  concat(...string: string[]): string;
-
-  /**
-   * This method takes a space-delimited string of words and returns it as an array where the individual words are indices.
-   *
-   * @param string Any string with values separated by spaces.
-   * @return string[]
-   */
-  w(string: string): string[];
-
-  /**
-   * This method converts a string of hyphenated tokens into a camel cased string.
-   *
-   * @param string A string of hyphenated tokens.
-   * @return string
-   */
-  camelize(string: string): string;
-
-  /**
-   * This method converts a camel case string into lowercase with hyphens.
-   *
-   * @param string A camel case string.
-   * @return string
-   */
-  deCamelize(string: string): string;
-
-  /**
-   * This method capitalizes the first letter of a string.
-   *
-   * @param string A string.
-   * @param boolean A boolean value.
-   * @return string
-   */
-  capitalize(string: string, boolean?: boolean): string;
-
-  /**
-   * Determine whether the argument is a string.
-   *
-   * @param obj Object to test whether or not it is a string.
-   * @return boolean
-   */
-  isString(obj: any): boolean;
-
-  /**
-   * Determine whether the argument is an array.
-   *
-   * @param obj Object to test whether or not it is an array.
-   * @return boolean
-   */
-  isArray(obj: any): boolean;
-
-  /**
-   * Determine whether the argument is a function.
-   *
-   * @param obj Object to test whether or not it is an function.
-   * @return boolean
-   */
-  isFunction(obj: any): boolean;
-
-  /**
-   * Determine whether the argument is an object.
-   *
-   * @param obj Object to test whether or not it is an object.
-   * @return boolean
-   */
-  isObject(obj: any): boolean;
-
-  /**
-   * Determine whether the argument is an empty object.
-   *
-   * @param obj Object to test whether or not it is an empty object.
-   * @return boolean
-   */
-  isEmptyObject(obj: any): boolean;
-
-  /**
-   * Determine whether the argument is an empty object.
-   *
-   * @param obj Object to test whether or not it is an empty object.
-   * @return boolean
-   */
-  isEmptyObject(obj: any): boolean;
-
-  /**
-   * Determine whether the argument is a number.
-   *
-   * @param obj Object to test whether or not it is a number.
-   * @return boolean
-   */
-  isNumber(obj: any): boolean;
-
-  /**
-   * Determine whether the argument is an integer.
-   *
-   * @param obj Object to test whether or not it is an integer.
-   * @return boolean
-   */
-  isInteger(obj: any): boolean;
-
-  /**
-   * Determine whether the argument is a float.
-   *
-   * @param obj Object to test whether or not it is a float.
-   * @return boolean
-   */
-  isFloat(obj: any): boolean;
-
-  /**
-   * Whether device is iPhone.
-   */
-  isiPhone: boolean;
-
-  /**
-   * Whether device is iPad.
-   */
-  isiPad: boolean;
-
-  /**
-   * Whether device is iPod.
-   */
-  isiPod: boolean;
-
-  /**
-   * Whether OS is iOS.
-   */
-  isiOS: boolean;
-
-  /**
-   * Whether OS is Android
-   */
-  isAndroid: boolean;
-
-  /**
-   * Whether OS is WebOS.
-   */
-  isWebOS: boolean;
-
-  /**
-   * Whether OS is Blackberry.
-   */
-  isBlackberry: boolean;
-
-  /**
-   * Whether OS supports touch events.
-   */
-  isTouchEnabled: boolean;
-
-  /**
-   * Whether there is a network connection.
-   */
-  isOnline: boolean;
-
-  /**
-   * Whether app is running in stanalone mode.
-   */
-  isStandalone: boolean;
-
-  /**
-   * Whether OS is iOS 6.
-   */
-  isiOS6: boolean;
-
-  /**
-   * Whether OS i iOS 7.
-   */
-  isiOS7: boolean;
-
-  /**
-   * Whether OS is Windows.
-   */
-  isWin: boolean;
-
-  /**
-   * Whether device is Windows Phone.
-   */
-  isWinPhone: boolean;
-
-  /**
-   * Whether browser is IE10.
-   */
-  isIE10: boolean;
-
-  /**
-   * Whether browser is IE11.
-   */
-  isIE11: boolean;
-
-  /**
-   * Whether browser is Webkit based.
-   */
-  isWebkit: boolean;
-
-  /**
-   * Whether browser is running on mobile device.
-   */
-  isMobile: boolean;
-
-  /**
-   * Whether browser is running on desktop.
-   */
-  isDesktop: boolean;
-
-  /**
-   * Whether browser is Safari.
-   */
-  isSafari: boolean;
-
-  /**
-   * Whether browser is Chrome.
-   */
-  isChrome: boolean;
-
-  /**
-   * Is native Android browser (not mobile Chrome).
-   */
-  isNativeAndroid: boolean;
-
-  /**
-   * Serialize
-   */
-   serialize(form: HTMLFormElement | ChocolateChipElementArray): string;
-
-  /**
-   * Grabs values from a form and converts them into a JSON object.
-   *
-   * @param rootNode: string | HTMLElement A form whose values you want to convert to JSON.
-   * @param delimiter string A delimiter to namespace your form values. The default is "."
-   * You use the form input's name to set up the namespace structure for your JSON, e.g. name="newUser.name.first".
-   */
-  form2JSON(rootNode: string | HTMLElement, delimiter: string): Object;
-
-  /**
-   * Subscribe to a publication. You provide the topic you want to subscribe to, as well as a callback to execute when a publication occurs.
-   * Any data passed by the publisher is exposed to the callback as its second parameter. The callback's first parameter is the published topic.
-   *
-   * @param topic string A topic to subscribe to. This can be a single term, or any type of namespaced term with delimiters.
-   * @data any You can receive any type: string, number, array, object, etc.
-   * @return any
-   */
-  subscribe(topic: string, callback: (topic: string, data: any) => any): boolean;
-
-  /**
-   * Unsubscribe from a topic. Pass this the topic you wish to unsubscribe from. The subscription will be terminated immediately.
-   *
-   * @param topic string The name of the topic to unsubscribe from.
-   * @return void
-   */
-  unsubscribe(topic: string): void;
-
-  /**
-   *    Publish a topic with data for the topic's subscribers to receive.
-   *
-   * @param topic string The topic you wish to publish.
-   * @param data The data to send with the publication. This can be of any type: string, number, array, object, etc.
-   * @return void
-   */
-  publish(topic: string, data: any): string;
-
-  /**
-   * Object used to store string templates and parsed templates.
-   *
-   * @param string A string defining the template.
-   * @param string A label used to access an object's properties in the template. If none is provided it defaults to "data": [[= data.name]].
-   * @return void
-   */
-  templates: Object;
-
-  /**
-   * This method returns a parsed template.
-   *
-   */
-  template: {
-
-    /**
-     * This method parses a string and an optoinal variable name and returns a parsed template in the form of a function. You can then pass this function data to get rendered nodes.
-     *
-     * @param template A string of markup to use as a template.
-     * @param variable An option name to use in the template. If it were "myData": [[= myData.name]]. Otherwise it defaults to "data": [[= data.name]].
-     * @return A function.
-     */
-    (template: string, variable?: string): Function;
-
-    /**
-     * The repeater method used to rendering iterable template data.
-     */
-    repeater: {
-      
-      /**
-       * Use this method to render declarative temlate repeaters. This expects a "data-repeater" attribute whose value points to data stored on $.template.data.
-       */
-      (): void;
-      
-      /**
-      * A method to repeated output a template.
-      *
-      * @param element The target container into which the content will be inserted.
-      * @param template A string of markup.
-      * @param data The iterable data the template will consume.
-      * @return void.
-      */
-      (element: ChocolateChipElementArray, template: string, data: any): void;
-    }
-
-    /**
-     * An object that holds the reference to the controller for a repeater.
-     * This is used to cache the data that a repeater uses. After the repeater is rendered, the reference is deleted from this object.
-     * Example: $.template.data["myRepeater"] = [{name: "Joe"}, {name: "Sue"}];
-     *
-     */
-    data: any;
-
-    /**
-     * Use this value to output an index value in a template repeater.
-     */
-    index: number;
-  };
-
-  /**
-   * ATENTION: DO NOT TOUCH! This is the ChocolateChipJS cache. This is used to store details about registered events and data. You should not touch any of these values, even though they are exposed, as this can seriously impair the behavior of your app.
-   * 
-   * data: this is used by $(element).data() to store data.
-   * events: this is used by the event system.
-   */
-  chch_cache: {
-    /**
-     * DO NOT TOUCH! This hold data stored by $(element).data().
-     */
-    data: {};
-    
-    /**
-     * DO NOT TOUCH! This stores information about registered events.
-     */
-    events: {
-      keys: any[];
-      values: any[];
-      set: Function;
-      hasKey: Function;
-      _delete: Function;
-    }
-  }
-
-}
-
-
-/**
- * Interface for ChocolateChipJS Element Collections.
- */
-
-interface ChocolateChipElementArray extends Array<HTMLElement> {
-
-  /**
-   * Iterate over an Array object, executing a function for each matched element.
-   *
-   * @param Function
-   * @return void
-   */
-  each(func: (ctx: any, idx: number) => void): void;
-
-  /**
-   * Sorts an array and removes duplicates before returning it.
-   *
-   * @return Array
-   */
-  unique(): ChocolateChipElementArray;
-
-  /**
-   * This method returns the element at the position in the array indicated by the argument. This is a zero-based number.
-   * When dealing with document nodes, this allows you to cherry pick a node from its collection based on its
-   * position amongst its siblings.
-   *
-   * @param number Index value indicating the node you wish to access from a collection. This is zero-based.
-   * @return HTMLElement
-   */
-  eq(index: number): ChocolateChipElementArray;
-
-  /**
-   * Search for a given element from among the matched elements on a collection.
-   * This method returns the index value as an integer.
-   *
-   * @return number
-   */
-  index(): number;
-
-  /**
-   * Search for a given element from among the matched elements on a collection.
-   * This method returns the index value as an integer.
-   *
-   * @param selector A selector representing an element to look for in a collection of elements.
-   * @return number
-   */
-  index(selector: string | HTMLElement[]): number;
-
-  /**
-   * Check the current matched set of elements against a selector or element and return it
-   * if it matches the given arguments.
-   *
-   * @param selector A string containing a selector expression to match elements against.
-   * @return HTMLElement[]
-   */
-  is(selector: string): ChocolateChipElementArray;
-
-  /**
-   * Check the current matched set of elements against a selector or element and return it
-   * if it matches the given arguments.
-   *
-   * @param elements One or more elements to match the current set of elements against.
-   * @ return HTMLElement[]
-   */
-  is(element: any): ChocolateChipElementArray;
-
-  /**
-   * Check the current matched set of elements against a selector or element and return it
-   * if it does not match the given arguments.
-   *
-   * @param selector A string containing a selector expression to match elements against.
-   * @ return HTMLElement[]
-   */
-  isnt(selector: string): ChocolateChipElementArray;
-
-  /**
-   * Check the current matched set of elements against a selector or element and return it
-   * if it does not match the given arguments.
-   *
-   * @param elements One or more elements to match the current set of elements against.
-   * @ return HTMLElement[]
-   */
-  isnt(element: any): ChocolateChipElementArray;
-
-  /**
-   * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.
-   *
-   * @param selector A string containing a selector expression to match elements against.
-   * @ return HTMLElement[]
-   */
-  has(selector: string): ChocolateChipElementArray;
-  
-  /**
-   * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.
-   *
-   * @param contained A DOM element to match elements against.
-   * @ return HTMLElement[]
-   */
-  has(contained: HTMLElement): ChocolateChipElementArray;
-
-  /**
-   * Reduce the set of matched elements to those that have a descendant that does not match the selector or DOM element.
-   *
-   * @param selector A string containing a selector expression to match elements against.
-   * @ return HTMLElement[]
-   */
-  hasnt(selector: string): ChocolateChipElementArray;
-  
-  /**
-   * Reduce the set of matched elements to those that have a descendant that does not match the selector or DOM element.
-   *
-   * @param contained A DOM element to match elements against.
-   * @ return HTMLElement[]
-   */
-  hasnt(contained: HTMLElement): ChocolateChipElementArray;
-
-  /**
-   * Get the descendants of each element in the current set of matched elements, filtered by a selector or element.
-   *
-   * @param selector A string containing a selector expression to match elements against.
-   * @ return HTMLElement[]
-   */
-  find(selector: string): ChocolateChipElementArray;
-
-  /**
-   * Get the descendants of each element in the current set of matched elements, filtered by a selector or element.
-   *
-   * @param element An element to match elements against.
-   * @ return HTMLElement[]
-   */
-  find(element: HTMLElement): ChocolateChipElementArray;
-
-  /**
-   * Get the immediately preceding sibling of each element in the set of matched elements.
-   *
-   * @ return HTMLElement[]
-   */
-  prev(): ChocolateChipElementArray;
-
-  /**
-   * Get the immediately following sibling of each element in the set of matched elements.
-   *
-   * @ return HTMLElement[]
-   */
-  next(): ChocolateChipElementArray;
-
-  /**
-   * Reduce the set of matched elements to the first in the set.
-   */
-  first(): ChocolateChipElementArray;
-
-  /**
-   * Reduce the set of matched elements to the last in the set.
-   *
-   * @return HTMLElement[]
-   */
-  last(): ChocolateChipElementArray;
-
-  /**
-   * Get the children of each element in the set of matched elements, optionally filtered by a selector.
-   *
-   * @param selector A string containing a selector expression to match elements against.
-   * @return HTMLElement[]
-   */
-  children(selector?: string): ChocolateChipElementArray;
-
-  /**
-   * Get the parent of each element in the current set of matched elements, optionally filtered by a selector.
-   * If multiple elements have the same parent, only one instance of the parent is returned.
-   *
-   * @param selector A string containing a selector expression to match elements against.
-   * @return HTMLElement[]
-   */
-  parent(selector?: string): ChocolateChipElementArray;
-
-  /**
-   * For each element in the set, get the first element that matches the selector by testing the element
-   * itself and traversing up through its ancestors in the DOM tree, or, if a number is provided,
-   * retrieving that ancestor based on its distance from the element.
-   *
-   * @param selector A string containing a selector expression to match elements against.
-   * @return HTMLElement[]
-   */
-  ancestor(selector: string | number): ChocolateChipElementArray;
-
-  /**
-   * For each element in the set, get the first element that matches the selector by testing the element
-   * itself and traversing up through its ancestors in the DOM tree.
-   *
-   * @param selector A string containing a selector expression to match elements against.
-   * @return HTMLElement[]
-   */
-  closest(selector: string | number): ChocolateChipElementArray;
-
-  /**
-   * Get the siblings of each element in the set of matched elements, optionally filtered by a selector.
-   *
-   * @param selector A string containing a selector expression to match elements against.
-   * @return HTMLElement[]
-   */
-  siblings(selector?: string): ChocolateChipElementArray;
-
-  /**
-   * Get the HTML contents of the first element in the set of matched elements.
-   *
-   * @return HTMLElement[]
-   */
-  html(): ChocolateChipElementArray;
-
-  /**
-   * Set the HTML contents of each element in the set of matched elements.
-   *
-   * @param htmlString A string of HTML to set as the content of each matched element.
-   * @return HTMLElement[]
-   */
-  html(htmlString: string): ChocolateChipElementArray;
-
-  /**
-   * Get the value of style properties for the first element in the set of matched elements.
-   *
-   * @param propertyName A CSS property.
-   * @return string
-   */
-  css(propertyName: string): string;
-
-  /**
-   * Set one or more CSS properties for the set of matched elements using a quoted string.
-   *
-   * @param propertyName A CSS property name.
-   * @param value A value to set for the property.
-   * @return HTMLElement[]
-   */
-  css(propertyName: string, value: string): ChocolateChipElementArray;
-
-  /**
-   * Set one or more CSS properties for the set of matched elements.
-   *
-   * @param properties An object of property-value pairs to set.
-   * @return HTMLElement[]
-   */
-  css(properties: Object): ChocolateChipElementArray;
-
-  /**
-   * Get the value of an attribute for the first element in the set of matched elements.
-   *
-   * @param attributeName The name of the attribute to get.
-   * @return string
-   */
-  attr(attributeName: string): string;
-
-  /**
-   * Set an attribute for the set of matched elements.
-   *
-   * @param attributeName A string indicating the attribute to set.
-   * @param value A string indicating the value to set the attribute to.
-   * @return HTMLElement[]
-   */
-  attr(attributeName: string, value: string): ChocolateChipElementArray;
-
-  /**
-   * Remove an attribute from a node.
-   *
-   * @param attributeName A string indicating the attribute to remove.
-   * @return HTMLElement[]
-   */
-  removeAttr(attributeName: string): ChocolateChipElementArray;
-
-  /**
-   * Return any of the matched elements that have the given attribute.
-   *
-   * @param className The class name to search for.
-   * @return HTMLElement[]
-   */
-  hasAttr(attributeName: string): ChocolateChipElementArray;
-
-  /**
-   * Test whether an attribute exists on the first element in the set of matched elements. The value returned is a boolean.
-   *
-   * @param attributeName The name of the attribute to get.
-   * @return boolean
-   */
-  prop(propertyName: string): boolean;
-
-  /**
-   * Set an property for the set of matched elements.
-   *
-   * @param propertyName A string indicating the property to set.
-   * @param value A string indicating the value to set the property to.
-   * @return HTMLElement[]
-   */
-  prop(propertyName: string, value: any | boolean): ChocolateChipElementArray;
-  
-  /**
-   * Remove an element property.
-   * 
-   * @param property The property to remove.
-   * @return HTMLElement[]
-   */
-   removeProp(property: string): ChocolateChipElementArray;
-
-  /**
-   * Adds the specified class(es) to each of the set of matched elements.
-   *
-   * @param className One or more space-separated classes to be added to the class attribute of each matched element.
-   * @return HTMLElement[]
-   */
-  addClass(className: string): ChocolateChipElementArray;
-
-  /**
-   * Remove a single class or multiple classes from each element in the set of matched elements.
-   *
-   * @param className One or more space-separated classes to be removed from the class attribute of each matched element.
-   * @return HTMLElement[]
-   */
-  removeClass(className?: string): ChocolateChipElementArray;
-
-  /**
-   * Add or remove a classe from each element in the set of matched elements, depending on whether the class is present or not.
-   *
-   * @param className One or more class names (separated by spaces) to be toggled for each element in the matched set.
-   * @return HTMLElement[]
-   */
-  toggleClass(className: string, swtch?: boolean): ChocolateChipElementArray;
-
-  /**
-   * Return any of the matched elements that have the given class.
-   *
-   * @param className The class name to search for.
-   * @return HTMLElement[]
-   */
-  hasClass(className: string): ChocolateChipElementArray;
-
-  /**
-   * Store arbitrary data associated with the matched elements.
-   *
-   * @param key A string naming the piece of data to set.
-   * @param value The new data value; it can be any Javascript type including Array or Object.
-   * @return HTMLElement[]
-   */
-  data(key: string, value: any): ChocolateChipElementArray;
-
-  /**
-   * Return the value at the named data store for the first element in the element collection, as set by
-   * data(name).
-   *
-   * @param key Name of the data stored.
-   * @return any
-   */
-  data(key: string): any;
-
-  /**
-   * Remove the value at the named data store for the first element in the element collection, as set by data(name, value).
-   *
-   * @param key Name of the data stored.
-   * @return any
-   */
-  removeData(key?: string): any;
-
-  /**
-   * Store string data associated with the matched elements.
-   *
-   * @param key A string naming the piece of data to set.
-   * @param value The new data value; it must be a string. You can convert JSON into a string to use with this.
-   * @return HTMLElement[]
-   */
-  dataset(key: string, value: any): ChocolateChipElementArray;
-
-  /**
- * Retrieve a dataset key's value for the first element in the element collection.
-  *
-  * @param key A string naming the piece of data to set.
-  * @return HTMLElement[]
-  */
-  dataset(key: string): ChocolateChipElementArray;
-
-  /**
-   * Return the value at the named data store for the first element in the element collection, as set by data(name, value).
-   *
-   * @param key Name of the data stored.
-   * @return any
-   */
-  data(key: string): any;
-
-  /**
-   * Store arbitrary data associated with the matched element.
-   *
-   * @param key A string naming the piece of data to set.
-   * @param value The new data value; it can be any Javascript type including Array or Object.
-   * @return HTMLElement[]
-   */
-  data(key: string, value?: any): ChocolateChipElementArray;
-
-  /**
-   * Get the current value of the first element in the set of matched elements.
-   */
-  val(): any;
-
-  /**
-   * Set the value of each element in the set of matched elements.
-   *
-   * @param value A string of text or an array of strings corresponding to the value of each matched element
-   * to set as selected/checked.
-   * @return any
-   */
-  val(value: string): ChocolateChipElementArray;
-
-  /**
-   * Set the property of an element to enabled by removing the "disabled" attribute.
-   *
-   * @return HTMLElement[]
-   */
-  enable(): ChocolateChipElementArray;
-
-  /**
-   * Set the property of an element to "disabled".
-   *
-   * @return HTMLElement[]
-   */
-  disable(): ChocolateChipElementArray;
-
-  /**
-   * Display the matched elements.
-   *
-   * @param speed A string or number determining how long the animation will run.
-   * @param callback A function to call once the animation is complete.
-   * @return HTMLElement[]
-   */
-  show(duration?: number | string, callback?: Function): ChocolateChipElementArray;
-
-  /**
-   * Hide the matched elements.
-   *
-   * @param duration A string or number determining how long the animation will run.
-   * @param callback A function to call once the animation is complete.
-   * @return HTMLElement[]
-   */
-  hide(duration?: number | string, callback?: Function): ChocolateChipElementArray;
-
-  /**
-   * Insert content, specified by the parameter, before each element in the set of matched elements.
-   *
-   * @param content HTML string, DOM element, array of elements to insert before each element in the set of matched elements.
-   * @return HTMLElement[]
-   */
-  before(content: ChocolateChipElementArray | HTMLElement | string): ChocolateChipElementArray;
-
-  /**
-   * Insert content, specified by the parameter, after each element in the set of matched elements.
-   *
-   * @param content HTML string, DOM element, array of elements to insert after each element in the set of matched elements.
-   * @return HTMLElement[]
-   */
-  after(content: ChocolateChipElementArray | HTMLElement | string): ChocolateChipElementArray;
-
-  /**
-   * Insert content, specified by the parameter, to the end of each element in the set of matched elements.
-   *
-   * @param content DOM element, array of elements, or HTML string to insert at the end of each element in the set
-   * of matched elements.
-   * @return HTMLElement[]
-   */
-  append(content: ChocolateChipElementArray | HTMLElement | Text | string): ChocolateChipElementArray;
-
-  /**
-   * Insert content, specified by the parameter, at the beginning of each element in the set of matched elements.
-   *
-   * @param content DOM element, array of elements, or HTML string to insert at the beginning of each element in the set of matched elements.
-   * @return HTMLElement[]
-   */
-  prepend(content: ChocolateChipElementArray | HTMLElement | Text | string): ChocolateChipElementArray;
-
-  /**
-   * Insert every element in the set of matched elements to the beginning of the target.
-   *
-   * @param target A selector, element, or HTML string. The matched set of elements will be inserted at the beginning of the element specified by this parameter.
-   * @return HTMLElement[]
-   */
-  prependTo(target: any[] | HTMLElement | string): ChocolateChipElementArray;
-
-  /**
-   * Insert every element in the set of matched elements to the end of the target.
-   *
-   * @param target A selector, element, or HTML string. The matched set of elements will be inserted at the end of the element specified by this parameter.
-   * If no position value is provided it will simply append the content to the target.
-   * @return HTMLElement[]
-   */
-  appendTo(target: any[] | HTMLElement | string): ChocolateChipElementArray;
-
-  /**
-   * Insert element(s) into the target element.
-   *
-   * @return HTMLElement[]
-   */
-  insert(content: string, position?: number | string): ChocolateChipElementArray;
-
-  /**
-   * Create a copy of the set of matched elements.
-   *
-   * @param value A Boolean indicating whether to copy the element(s) with their children. A true value copies the children.
-   * @return HTMLElement[]
-   */
-  clone(value?: boolean): ChocolateChipElementArray;
-
-  /**
-   * Wrap an HTML structure around each element in the set of matched elements.
-   *
-   * @param wrappingElement A selector or HTML string specifying the structure to wrap around the matched elements.
-   * @return HTMLElement[]
-   */
-  wrap(wrappingElement: string): ChocolateChipElementArray;
-
-  /**
-   * Remove the parents of the set of matched elements from the DOM, leaving the matched elements in their place.
-   *
-   * @return HTMLElement[]
-   */
-  unwrap(): ChocolateChipElementArray;
-
-  /**
-   * Remove the set of matched elements from the DOM. If there are any attached events, this will remove them to prevent memory leaks.
-   *
-   * @param selector A selector expression that filters the set of matched elements to be removed.
-   * @return HTMLElement[]
-   */
-  remove(selector?: string): ChocolateChipElementArray;
-
-  /**
-   * Remove all child nodes of the set of matched elements from the DOM.
-   *
-   * @return HTMLElement[]
-   */
-  empty(): ChocolateChipElementArray;
-
-  /**
-   * Get an object of the current coordinates of the first element in the set of matched elements, relative to the document.
-   * These are: top, left, bottom and right. The values are numbers representing pixel values.
-   * @return Object
-   */
-  offset(): {
-    top: number;
-    bottom: number;
-    left: number;
-    right: number;
-  };
-
-  /**
-   * Get the current computed width for the first element in the set of matched elements,
-   * including padding but excluding borders.
-   *
-   * @return number
-   */
-  width(): number;
-
-  /**
-   * Get the current computed height for the first element in the set of matched elements,
-   * including padding but excluding borders.
-   *
-   * @return number
-   */
-  height(): number;
-
-  /**
-   * Get the combined text contents of each element in the set of matched elements, including their descendants.
-   *
-   * @return string
-   */
-  text(): string;
-
-  /**
-   * Set the content of each element in the set of matched elements to the specified text.
-   *
-   * @param text The text to set as the content of each matched element. When Number is supplied, it will be converted to a String representation. To delete text, use ChocolateChipElementArray.empty() or ChocolateChipElementArray.remove().
-   * @return HTMLElement
-   */
-  text(text: string | number): HTMLElement;
-
-  /**
-   * A method to animate DOM nodes using CSS. This uses CSS transitions.
-   *
-   * @param options And object of key value pairs define the CSS properties and values to animate.
-   * @param duration A string representing the time. Should have a time identifier: "200s", "200ms", etc.
-   * @param easing A string indicating the easing for the animation, such as "ease-out", "ease-in", "ease-in-out".
-   * @return void
-   */
-  animate(options: Object, duration?: string, easing?: string): void;
-
-  /**
-   * Attach a handler to an event for the elements.
-   *
-   * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
-   * @param handler A function to execute each time the event is triggered.
-   * @param useCapture Setting the third argument to true will trigger event bubbling. The default is false.
-   * @return ChocolateChipStatic
-   */
-  bind(eventType: string, handler: (eventObject: Event) => any, useCapture?: boolean): ChocolateChipStatic;
-
-  /**
-   * Remove a handler for an event from the elements.
-   *
-   * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
-   * @param handler A function to execute each time the event is triggered.
-   * @param useCapture Setting the third argument to true will trigger event bubbling. The default is false.
-   * @return ChocolateChipStatic
-   */
-  unbind(eventType?: string, handler?: (eventObject: Event) => any, useCapture?: boolean): ChocolateChipStatic;
-
-  /**
-   * Add a delegated event to listen for the provided event on the descendant elements.
-   *
-   * @param selector A string defining the descendant elements to listen on for the designated event.
-   * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
-   * @param handler A function to execute each time the event is triggered. The keyword "this" will refer
-   * to the element receiving the event.
-   * @param useCapture Setting the third argument to true will trigger event bubbling. The default is false.
-   * @return ChocolateChipStatic
-   */
-  delegate(selector: any, eventType: string, handler: (eventObject: Event) => any, useCapture?: boolean): ChocolateChipStatic;
-
-  /**
-   * Add a delegated event to listen for the provided event on the descendant elements.
-   *
-   * @param selector A string defining the descendant elements are listening for the event.
-   * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
-   * @param handler A function handler assigned to this event.
-   * @param useCapture Setting the third argument to true will trigger event bubbling. The default is false.
-   * @return ChocolateChipStatic
-   */
-  undelegate(selector?: any, eventType?: string, handler?: (eventObject: Event) => any, useCapture?: boolean): ChocolateChipStatic;
-
-  /**
-   * Add a handler to an event for elements. If a selector is provided as the second argument, this implements a delegated event.
-   *
-   * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
-   * @param selector A string defining the descendant elements are listening for the event.
-   * @param handler A function handler assigned to this event.
-   * @param useCapture Setting the third argument to true will trigger event bubbling. The default is false.
-   * @return ChocolateChipStatic
-   */
-  on(eventType: string, selector: any, handler?: (eventObject: Event) => any, capturePhase?: boolean): ChocolateChipStatic;
-
-  /**
-   * Remove a handler for an event from the elements. If the second argument is a selector, it tries to undelegate the event.
-   * If no arugments are provided, it removes all events from the element(s).
-   *
-   * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
-   * @param selector A string defining the descendant elements are listening for the event.
-   * @param handler A function handler assigned to this event.
-   * @param useCapture Setting the third argument to true will trigger event bubbling. The default is false.
-   * @return ChocolateChipStatic
-   */
-  off(eventType?: string, selector?: any, handler?: (eventObject: Event) => any, capturePhase?: boolean): ChocolateChipStatic;
-
-  /**
-  * Trigger an event on an element.
-  * 
-  * @param eventType The event to trigger.
-  * @return void
-  */
-  trigger(eventType: string): void;
-}
-
-/**
- * Represents the completion of an asynchronous operation
- */
-interface Promise<T> {
-  /**
-   * Attaches callbacks for the resolution and/or rejection of the Promise.
-   *
-   * @param onfulfilled The callback to execute when the Promise is resolved.
-   * @param onrejected The callback to execute when the Promise is rejected.
-   * @return Promise A Promise for the completion of which ever callback is executed.
-   * @return Promise A new Promise
-   */
-  then<TResult>(onfulfilled?: (value: T) => TResult | Promise<TResult>, onrejected?: (reason: any) => TResult | Promise<TResult>): Promise<TResult>;
-
-  /**
-   * Attaches a callback for only the rejection of the Promise.
-   *
-   * @param onrejected The callback to execute when the Promise is rejected.
-   * @return Promise A Promise for the completion of the callback.
-   * @return Promise A new Promise
-   */
-  catch(onrejected?: (reason: any) => T | Promise<T>): Promise<T>;
-}
-
-interface PromiseConstructor {
-  /**
-   * A reference to the prototype.
-   */
-  prototype: Promise<any>;
-
-  /**
-   * Creates a new Promise.
-   *
-   * @param init A callback used to initialize the promise. This callback is passed two arguments: a resolve callback used resolve the promise with a value or the result of another promise, and a reject callback used to reject the promise with a provided reason or error.
-   * @return Promise A new Proimise
-   */
-  new <T>(init: (resolve: (value?: T | Promise<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
-
-  <T>(init: (resolve: (value?: T | Promise<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
-
-  /**
-   * Creates a Promise that is resolved with an array of results when all of the provided Promises resolve, or rejected when any Promise is rejected.
-   *
-   * @param values An array of Promises.
-   * @return Promise A new Promise.
-   */
-  all<T>(values: (T | Promise<T>)[]): Promise<T[]>;
-
-  /**
-   * Creates a Promise that is resolved with an array of results when all of the provided Promises resolve, or rejected when any Promise is rejected.
-   *
-   * @param values An array of values.
-   * @returns A new Promise.
-   */
-  all(values: Promise<void>[]): Promise<void>;
-
-  /**
-   * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved or rejected.
-   *
-   * @param values An array of Promises.
-   * @return Promise A new Promise.
-   */
-  race<T>(values: (T | Promise<T>)[]): Promise<T>;
-
-  /**
-   * Creates a new rejected promise for the provided reason.
-   *
-   * @param reason The reason the promise was rejected.
-   * @return Promise A new rejected Promise.
-   */
-  reject(reason: any): Promise<void>;
-
-  /**
-   * Creates a new rejected promise for the provided reason.
-   *
-   * @param reason The reason the promise was rejected.
-   * @return void A Promise is rejected.
-   */
-  reject<T>(reason: any): Promise<T>;
-
-  /**
-   * Creates a new resolved promise for the provided value.
-   *
-   * @param value A promise.
-   * @return Promise A promise whose internal state matches the provided promise.
-   */
-  resolve<T>(value: T | Promise<T>): Promise<T>;
-
-  /**
-   * Creates a new resolved promise.
-   *
-   * @return Promise A resolved promise.
-   */
-  resolve(): Promise<void>;
-}
-
-declare var Promise: PromiseConstructor;
-declare type ByteString = string;
-declare type USVString = string;
-declare type DOMString = string;
-declare type OpenEndedDictionary = Object;
-
-/**
- * Interface for fetch API.
- *
- * @param input A string representing a valid url.
- * @param init An object literal of key value pairs to set method, headers, body, credentials or cache.
- * @return Promise.
- */
-interface fetch {
-  (input: string,
-    init?: {
-    method?: string;
-    headers?: {};
-    body?: any;
-    mode?:  {
-      cors: string;
-      "no-cors": string;
-      "same-origin": string;
-    };
-    credentials?: {
-      omit: string;
-      "same-origin": string;
-      include: string;
-    };
-    cache?: {
-      default: string;
-      "no-store": string;
-      reload: string;
-      "no-cache": string;
-      "force-cache": string;
-      "only-if-cached": string;
-    };
-    timeout?: number;
-  }): Promise<any>;
-}
-
-interface XMLHttpRequest {
-   responseURL: string;
-}
-
-/**
- * Headers Interface. This defines the methods exposed by the Headers object.
- */
-interface Headers {
-   (headers?: any): void;
-   append(name: string, value: string): void;
-   delete(name: string): any;
-   get(name: string): any;
-   getAll(name: string): any;
-   has(name: string): any;
-   set(name: string, value: string): any;
-   forEach(callback: Function, thisArg: any): any;
-}
-
-interface decode {
-  (body: any): FormData;
-}
-
-/**
- * Request Interface. This defines the properties and methods exposed by the Request object.
- */
-interface Request {
-  (input: {
-    url: string;
-    request: Request;
-  }, init: Object): Request;
-  clone(): Request;
-  arrayBuffer(): ArrayBuffer;
-  blob(): Blob;
-  formData(): FormData;
-  json(): JSON;
-  text(): string;
-
-  method: string;
-  url: string;
-  heaers: Headers;
-  context: any;
-  referrer: any;
-  mode: string;
-  credentials: any;
-  cache: string;
-  bodyUsed: boolean;
-}
-
-interface URLSearchParams {
-  ():URLSearchParams;
-}
-
-/**
- * Resonse Interface. This defines the properties and methods exposed by the Response object.
- */
-interface Response {
-  (body?: {
-    blob: Blob;
-    bormData: FormData;
-    urlParams: URLSearchParams;
-    url: string;
-   },
-   init?: {
-    status?: string | number;
-    statusText?: string;
-    headers: Headers;
-  }): Response;
-  clone(): Response;
-  redirect(): Response;
-  arrayBuffer(): ArrayBuffer;
-  blob(): Blob;
-  formData(): FormData;
-  json(): JSON;
-  text(): string;
-
-  type: string;
-  url: string;
-  useFinalURL: boolean;
-  ok: boolean;
-  statusText: string;
-  headers: Headers;
-  bodyUsed: boolean;
-}
-
-interface ChocolateChipStatic {
-  
-  /**
-   * A cache to hold callbacks execute by the response from a JSONP request. This is an array of strings. By default these values get purged when the callback execute and exposes the data returned by the request.
-   */
-  JSONPCallbacks: string[];
-  /**
-   * Method to perform JSONP request. 
-   * 
-   * @param url A string defining the url to target.
-   * @param options And object literal of properties: {timeout? number, callbackName?: string, clear?: boolean}
-   */
-  jsonp(url: string, options?: {
-    /**
-     * A number representing milliseconds to express when to refect a JSONP request.
-     */
-    timeout?: number;
-    
-    /**
-     * The optional name for the callback when the server response will execute. The default value is "callback". However some sites may use a different name for their JSONP function. Consult the documentation on the site to ascertain the correct value for this callback. 
-     */
-    callbackName?: string;
-    
-    /**
-     * This value determines whether the callbacks and script associate with JSONP persist or are purged after the request returns. By default this is set to true, meaning that they will be purged.
-     */
-    clear?: boolean;
-  }): any
-}
-
-interface Window {
-  chocolatechipjs: ChocolateChipStatic;
-  $: ChocolateChipStatic;
-  jsonp: any;
-}
-declare var $: ChocolateChipStatic;
-declare var fetch: fetch;
-
-declare var chocolatechipjs: ChocolateChipStatic;
\ No newline at end of file
diff --git a/chocolatechipjs/chocolatechipjs.d.ts.tscparams b/chocolatechipjs/chocolatechipjs.d.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/chocolatechipjs/chocolatechipjs.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/chocolatechipjs/index.d.ts b/chocolatechipjs/index.d.ts
new file mode 100644
index 0000000000..9ac2ae8c52
--- /dev/null
+++ b/chocolatechipjs/index.d.ts
@@ -0,0 +1,1484 @@
+// Type definitions for chocolatechip v4.0.4
+// Project: https://github.com/chocolatechipui/ChocolateChipJS
+// Definitions by: Robert Biggs <http://chocolatechip-ui.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+interface ChocolateChipStatic {
+
+  /**
+   * Accepts a string containing a CSS selector which is then used to match a set of elements.
+   *
+   * @param selector A string containing a selector expression
+   * @param context A DOM HTMLElement to use as context
+   * @return HTMLElement[]
+   */
+  (selector: string | HTMLElement | Document, context?: HTMLElement | ChocolateChipElementArray): ChocolateChipElementArray;
+
+  /**
+   * Binds a function to be executed when the DOM has finished loading.
+   *
+   * @param callback A function to execute after the DOM is ready.
+   * @return void
+   */
+  (callback: () => any): void;
+
+
+  /**
+   * Accepts a string containing a CSS selector which is then used to match a set of elements.
+   *
+   * @param element A DOM element to wrap in an array.
+   * @return HTMLElement[]
+   */
+  (element: HTMLElement): ChocolateChipElementArray;
+
+  /**
+   * Accepts a string containing a CSS selector which is then used to match a set of elements.
+   *
+   * @param elementArray An array of DOM elements to convert into a ChocolateChip Collection.
+   * @return HTMLElement[]
+   */
+  (elementArray: ChocolateChipElementArray): ChocolateChipElementArray;
+
+  /**
+   * Accepts the document element and returns it wrapped in an array.
+   *
+   * @param document The document object.
+   * @return document[]
+   */
+  (document: Document): Document[];
+  
+  /**
+   * If no argument is provided, return the document as a ChocolateChipElementArray.
+   * @return Document[]
+   */
+  (): Document[];
+
+  /**
+   * Extend the ChocolateChipJS object itself with the provided object.
+   *
+   * @param object The object to add to ChocolateChipJS.
+   * @return The ChocolateChipJS object.
+   */
+  extend(object: Object): Object;
+
+  /**
+   * Extend a target object with another object.
+   *
+   * @param target An object to extend.
+   * @param object The object to add to the target.
+   * @return The extended object.
+   */
+  extend(target: Object, object: Object): Object;
+
+  /**
+   * The base for extending ChocolateChipJS collections, which are arrays of elements.
+   */
+  fn: {
+    /**
+     * This method adds the provided object to the Array prototype to make it available to all arrays of HTML elements.
+     *
+     * @param object And object to add to element arrays.
+     * @return The extended array of elements.
+     */
+    extend(object: Object): HTMLElement[];
+  };
+
+  /**
+   * Contains the version of ChocolateChipJS in use.
+   */
+  version: string;
+
+  /**
+   * Contains the name of the library (ChocolateChip).
+   */
+  libraryName: string;
+
+  /**
+   * An empty function.
+   *
+   * @return void.
+   */
+  noop(): void;
+
+  /**
+   * Uuid number.
+   */
+  uuid: number;
+
+  /**
+   * Create a random number to use as a uuid.
+   *
+   * @return number.
+   */
+  uuidNum(): number;
+
+  /**
+   * Creates a uuid using uuidNum().
+   *
+   * @return A string.
+   */
+  makeUuid(): string;
+
+
+  /**
+   * Create a ChocolateChip collection object by creating elements from an HTML string.
+   *
+   * @param selector
+   * @return any
+   */
+  make(selector: string): ChocolateChipElementArray;
+
+  /**
+   * Create a ChocolateChip collection object by creating elements from an HTML string. This is an alias for $.make.
+   *
+   * @param selector
+   * @return any
+   */
+  html(selector: string): ChocolateChipElementArray;
+
+  /**
+   * Replace one element with another.
+   *
+   * @param new HTMLElement
+   * @param old HTMLElement
+   * @return HTMLElement[]
+   */
+  replace(newElement: ChocolateChipElementArray, oldElement: ChocolateChipElementArray): void;
+
+  /**
+   * Load a JavaScript file from a url, then execute it.
+   *
+   * @param url A string containing the URL where the script resides.
+   * @param callback A callback function that is executed after the script loads.
+   * @return void
+   */
+  require(url: string, callback: Function): Function;
+
+  /**
+   * Process JavaScript returned by Ajax request. An optional name can be used to create a custom variable name by which the data is exposed, otherwise it is exposed with the variable "data".
+   *
+   * @param url A string containing the URL where the script resides.
+   * @param callback A callback function that is executed after the script loads.
+   * @return Function
+   */
+  processJSON(json: string, name?: string): any;
+
+  /**
+   * This method takes a referenced form and serializes its element names and values, which it returns as a string. This is required if you want to send form data.
+   *
+   * @param element A string, HTML element or ChocolateChipElementArray containing a reference to a from.
+   * @return An encode string form element names and values.
+   */
+  serialize(element: any): string;
+
+  /**
+   * Parse the data in a Promise response as JSON.
+   *
+   * @param response The response from a Promise.
+   * @result
+   */
+  json(reponse: Response): JSON;
+
+  /**
+   * This method will defer the execution of a function until the call stack is clear.
+   *
+   * @param callback A function to execute.
+   * @param duration The number of milliseconds to delay execution.
+   * @return any
+   */
+  delay(callback: Function, duration?: number): any;
+
+  /**
+   * The method will defer the execution of its callback until the call stack is clear.
+   *
+   * @param callback A callback to execute after a delay.
+   * @return    Function.
+   */
+  defer(callback: Function): Function;
+
+  /**
+   * This method makes sure a method always returns an array. If no values are available to return, it returns and empty array. This is to make sure that methods that expect a chainable array will not throw and exception.
+   *
+   * @param result The result of a method to test if it can be returned in an array.
+   * @return An array holding the results of a method, otherwise an empty array.
+   */
+  returnResult(result: HTMLElement[]): any[];
+
+  /**
+   * This method allows you to execute a callback on each item in an array of elements.
+   *
+   * @param array An array of elements.
+   * @param callback A callback to execute on each element. This has two parameters: the context, followed by the index of the current iteration.
+   */
+  each<T>(array: T[], callback: (ctx: T, idx: number) => any): any;
+
+  /**
+   * This method will concatenate strings or values as a cleaner alternative to using the '+' operator.
+   *
+   * @param string or number A comma separated series of strings to concatenate.
+   * @return string
+   */
+  concat(...string: string[]): string;
+
+  /**
+   * This method takes a space-delimited string of words and returns it as an array where the individual words are indices.
+   *
+   * @param string Any string with values separated by spaces.
+   * @return string[]
+   */
+  w(string: string): string[];
+
+  /**
+   * This method converts a string of hyphenated tokens into a camel cased string.
+   *
+   * @param string A string of hyphenated tokens.
+   * @return string
+   */
+  camelize(string: string): string;
+
+  /**
+   * This method converts a camel case string into lowercase with hyphens.
+   *
+   * @param string A camel case string.
+   * @return string
+   */
+  deCamelize(string: string): string;
+
+  /**
+   * This method capitalizes the first letter of a string.
+   *
+   * @param string A string.
+   * @param boolean A boolean value.
+   * @return string
+   */
+  capitalize(string: string, boolean?: boolean): string;
+
+  /**
+   * Determine whether the argument is a string.
+   *
+   * @param obj Object to test whether or not it is a string.
+   * @return boolean
+   */
+  isString(obj: any): boolean;
+
+  /**
+   * Determine whether the argument is an array.
+   *
+   * @param obj Object to test whether or not it is an array.
+   * @return boolean
+   */
+  isArray(obj: any): boolean;
+
+  /**
+   * Determine whether the argument is a function.
+   *
+   * @param obj Object to test whether or not it is an function.
+   * @return boolean
+   */
+  isFunction(obj: any): boolean;
+
+  /**
+   * Determine whether the argument is an object.
+   *
+   * @param obj Object to test whether or not it is an object.
+   * @return boolean
+   */
+  isObject(obj: any): boolean;
+
+  /**
+   * Determine whether the argument is an empty object.
+   *
+   * @param obj Object to test whether or not it is an empty object.
+   * @return boolean
+   */
+  isEmptyObject(obj: any): boolean;
+
+  /**
+   * Determine whether the argument is an empty object.
+   *
+   * @param obj Object to test whether or not it is an empty object.
+   * @return boolean
+   */
+  isEmptyObject(obj: any): boolean;
+
+  /**
+   * Determine whether the argument is a number.
+   *
+   * @param obj Object to test whether or not it is a number.
+   * @return boolean
+   */
+  isNumber(obj: any): boolean;
+
+  /**
+   * Determine whether the argument is an integer.
+   *
+   * @param obj Object to test whether or not it is an integer.
+   * @return boolean
+   */
+  isInteger(obj: any): boolean;
+
+  /**
+   * Determine whether the argument is a float.
+   *
+   * @param obj Object to test whether or not it is a float.
+   * @return boolean
+   */
+  isFloat(obj: any): boolean;
+
+  /**
+   * Whether device is iPhone.
+   */
+  isiPhone: boolean;
+
+  /**
+   * Whether device is iPad.
+   */
+  isiPad: boolean;
+
+  /**
+   * Whether device is iPod.
+   */
+  isiPod: boolean;
+
+  /**
+   * Whether OS is iOS.
+   */
+  isiOS: boolean;
+
+  /**
+   * Whether OS is Android
+   */
+  isAndroid: boolean;
+
+  /**
+   * Whether OS is WebOS.
+   */
+  isWebOS: boolean;
+
+  /**
+   * Whether OS is Blackberry.
+   */
+  isBlackberry: boolean;
+
+  /**
+   * Whether OS supports touch events.
+   */
+  isTouchEnabled: boolean;
+
+  /**
+   * Whether there is a network connection.
+   */
+  isOnline: boolean;
+
+  /**
+   * Whether app is running in stanalone mode.
+   */
+  isStandalone: boolean;
+
+  /**
+   * Whether OS is iOS 6.
+   */
+  isiOS6: boolean;
+
+  /**
+   * Whether OS i iOS 7.
+   */
+  isiOS7: boolean;
+
+  /**
+   * Whether OS is Windows.
+   */
+  isWin: boolean;
+
+  /**
+   * Whether device is Windows Phone.
+   */
+  isWinPhone: boolean;
+
+  /**
+   * Whether browser is IE10.
+   */
+  isIE10: boolean;
+
+  /**
+   * Whether browser is IE11.
+   */
+  isIE11: boolean;
+
+  /**
+   * Whether browser is Webkit based.
+   */
+  isWebkit: boolean;
+
+  /**
+   * Whether browser is running on mobile device.
+   */
+  isMobile: boolean;
+
+  /**
+   * Whether browser is running on desktop.
+   */
+  isDesktop: boolean;
+
+  /**
+   * Whether browser is Safari.
+   */
+  isSafari: boolean;
+
+  /**
+   * Whether browser is Chrome.
+   */
+  isChrome: boolean;
+
+  /**
+   * Is native Android browser (not mobile Chrome).
+   */
+  isNativeAndroid: boolean;
+
+  /**
+   * Serialize
+   */
+   serialize(form: HTMLFormElement | ChocolateChipElementArray): string;
+
+  /**
+   * Grabs values from a form and converts them into a JSON object.
+   *
+   * @param rootNode: string | HTMLElement A form whose values you want to convert to JSON.
+   * @param delimiter string A delimiter to namespace your form values. The default is "."
+   * You use the form input's name to set up the namespace structure for your JSON, e.g. name="newUser.name.first".
+   */
+  form2JSON(rootNode: string | HTMLElement, delimiter: string): Object;
+
+  /**
+   * Subscribe to a publication. You provide the topic you want to subscribe to, as well as a callback to execute when a publication occurs.
+   * Any data passed by the publisher is exposed to the callback as its second parameter. The callback's first parameter is the published topic.
+   *
+   * @param topic string A topic to subscribe to. This can be a single term, or any type of namespaced term with delimiters.
+   * @data any You can receive any type: string, number, array, object, etc.
+   * @return any
+   */
+  subscribe(topic: string, callback: (topic: string, data: any) => any): boolean;
+
+  /**
+   * Unsubscribe from a topic. Pass this the topic you wish to unsubscribe from. The subscription will be terminated immediately.
+   *
+   * @param topic string The name of the topic to unsubscribe from.
+   * @return void
+   */
+  unsubscribe(topic: string): void;
+
+  /**
+   *    Publish a topic with data for the topic's subscribers to receive.
+   *
+   * @param topic string The topic you wish to publish.
+   * @param data The data to send with the publication. This can be of any type: string, number, array, object, etc.
+   * @return void
+   */
+  publish(topic: string, data: any): string;
+
+  /**
+   * Object used to store string templates and parsed templates.
+   *
+   * @param string A string defining the template.
+   * @param string A label used to access an object's properties in the template. If none is provided it defaults to "data": [[= data.name]].
+   * @return void
+   */
+  templates: Object;
+
+  /**
+   * This method returns a parsed template.
+   *
+   */
+  template: {
+
+    /**
+     * This method parses a string and an optoinal variable name and returns a parsed template in the form of a function. You can then pass this function data to get rendered nodes.
+     *
+     * @param template A string of markup to use as a template.
+     * @param variable An option name to use in the template. If it were "myData": [[= myData.name]]. Otherwise it defaults to "data": [[= data.name]].
+     * @return A function.
+     */
+    (template: string, variable?: string): Function;
+
+    /**
+     * The repeater method used to rendering iterable template data.
+     */
+    repeater: {
+      
+      /**
+       * Use this method to render declarative temlate repeaters. This expects a "data-repeater" attribute whose value points to data stored on $.template.data.
+       */
+      (): void;
+      
+      /**
+      * A method to repeated output a template.
+      *
+      * @param element The target container into which the content will be inserted.
+      * @param template A string of markup.
+      * @param data The iterable data the template will consume.
+      * @return void.
+      */
+      (element: ChocolateChipElementArray, template: string, data: any): void;
+    }
+
+    /**
+     * An object that holds the reference to the controller for a repeater.
+     * This is used to cache the data that a repeater uses. After the repeater is rendered, the reference is deleted from this object.
+     * Example: $.template.data["myRepeater"] = [{name: "Joe"}, {name: "Sue"}];
+     *
+     */
+    data: any;
+
+    /**
+     * Use this value to output an index value in a template repeater.
+     */
+    index: number;
+  };
+
+  /**
+   * ATENTION: DO NOT TOUCH! This is the ChocolateChipJS cache. This is used to store details about registered events and data. You should not touch any of these values, even though they are exposed, as this can seriously impair the behavior of your app.
+   * 
+   * data: this is used by $(element).data() to store data.
+   * events: this is used by the event system.
+   */
+  chch_cache: {
+    /**
+     * DO NOT TOUCH! This hold data stored by $(element).data().
+     */
+    data: {};
+    
+    /**
+     * DO NOT TOUCH! This stores information about registered events.
+     */
+    events: {
+      keys: any[];
+      values: any[];
+      set: Function;
+      hasKey: Function;
+      _delete: Function;
+    }
+  }
+
+}
+
+
+/**
+ * Interface for ChocolateChipJS Element Collections.
+ */
+
+interface ChocolateChipElementArray extends Array<HTMLElement> {
+
+  /**
+   * Iterate over an Array object, executing a function for each matched element.
+   *
+   * @param Function
+   * @return void
+   */
+  each(func: (ctx: any, idx: number) => void): void;
+
+  /**
+   * Sorts an array and removes duplicates before returning it.
+   *
+   * @return Array
+   */
+  unique(): ChocolateChipElementArray;
+
+  /**
+   * This method returns the element at the position in the array indicated by the argument. This is a zero-based number.
+   * When dealing with document nodes, this allows you to cherry pick a node from its collection based on its
+   * position amongst its siblings.
+   *
+   * @param number Index value indicating the node you wish to access from a collection. This is zero-based.
+   * @return HTMLElement
+   */
+  eq(index: number): ChocolateChipElementArray;
+
+  /**
+   * Search for a given element from among the matched elements on a collection.
+   * This method returns the index value as an integer.
+   *
+   * @return number
+   */
+  index(): number;
+
+  /**
+   * Search for a given element from among the matched elements on a collection.
+   * This method returns the index value as an integer.
+   *
+   * @param selector A selector representing an element to look for in a collection of elements.
+   * @return number
+   */
+  index(selector: string | HTMLElement[]): number;
+
+  /**
+   * Check the current matched set of elements against a selector or element and return it
+   * if it matches the given arguments.
+   *
+   * @param selector A string containing a selector expression to match elements against.
+   * @return HTMLElement[]
+   */
+  is(selector: string): ChocolateChipElementArray;
+
+  /**
+   * Check the current matched set of elements against a selector or element and return it
+   * if it matches the given arguments.
+   *
+   * @param elements One or more elements to match the current set of elements against.
+   * @ return HTMLElement[]
+   */
+  is(element: any): ChocolateChipElementArray;
+
+  /**
+   * Check the current matched set of elements against a selector or element and return it
+   * if it does not match the given arguments.
+   *
+   * @param selector A string containing a selector expression to match elements against.
+   * @ return HTMLElement[]
+   */
+  isnt(selector: string): ChocolateChipElementArray;
+
+  /**
+   * Check the current matched set of elements against a selector or element and return it
+   * if it does not match the given arguments.
+   *
+   * @param elements One or more elements to match the current set of elements against.
+   * @ return HTMLElement[]
+   */
+  isnt(element: any): ChocolateChipElementArray;
+
+  /**
+   * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.
+   *
+   * @param selector A string containing a selector expression to match elements against.
+   * @ return HTMLElement[]
+   */
+  has(selector: string): ChocolateChipElementArray;
+  
+  /**
+   * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.
+   *
+   * @param contained A DOM element to match elements against.
+   * @ return HTMLElement[]
+   */
+  has(contained: HTMLElement): ChocolateChipElementArray;
+
+  /**
+   * Reduce the set of matched elements to those that have a descendant that does not match the selector or DOM element.
+   *
+   * @param selector A string containing a selector expression to match elements against.
+   * @ return HTMLElement[]
+   */
+  hasnt(selector: string): ChocolateChipElementArray;
+  
+  /**
+   * Reduce the set of matched elements to those that have a descendant that does not match the selector or DOM element.
+   *
+   * @param contained A DOM element to match elements against.
+   * @ return HTMLElement[]
+   */
+  hasnt(contained: HTMLElement): ChocolateChipElementArray;
+
+  /**
+   * Same overload as is present in the base type
+   */
+  find(predicate: (value: HTMLElement, index: number, obj: HTMLElement[]) => boolean, thisArg?: any): HTMLElement;
+
+  /**
+   * Get the descendants of each element in the current set of matched elements, filtered by a selector or element.
+   *
+   * @param selector A string containing a selector expression to match elements against.
+   * @ return HTMLElement[]
+   */
+  find(selector: string): ChocolateChipElementArray;
+
+  /**
+   * Get the descendants of each element in the current set of matched elements, filtered by a selector or element.
+   *
+   * @param element An element to match elements against.
+   * @ return HTMLElement[]
+   */
+  find(element: HTMLElement): ChocolateChipElementArray;
+
+  /**
+   * Get the immediately preceding sibling of each element in the set of matched elements.
+   *
+   * @ return HTMLElement[]
+   */
+  prev(): ChocolateChipElementArray;
+
+  /**
+   * Get the immediately following sibling of each element in the set of matched elements.
+   *
+   * @ return HTMLElement[]
+   */
+  next(): ChocolateChipElementArray;
+
+  /**
+   * Reduce the set of matched elements to the first in the set.
+   */
+  first(): ChocolateChipElementArray;
+
+  /**
+   * Reduce the set of matched elements to the last in the set.
+   *
+   * @return HTMLElement[]
+   */
+  last(): ChocolateChipElementArray;
+
+  /**
+   * Get the children of each element in the set of matched elements, optionally filtered by a selector.
+   *
+   * @param selector A string containing a selector expression to match elements against.
+   * @return HTMLElement[]
+   */
+  children(selector?: string): ChocolateChipElementArray;
+
+  /**
+   * Get the parent of each element in the current set of matched elements, optionally filtered by a selector.
+   * If multiple elements have the same parent, only one instance of the parent is returned.
+   *
+   * @param selector A string containing a selector expression to match elements against.
+   * @return HTMLElement[]
+   */
+  parent(selector?: string): ChocolateChipElementArray;
+
+  /**
+   * For each element in the set, get the first element that matches the selector by testing the element
+   * itself and traversing up through its ancestors in the DOM tree, or, if a number is provided,
+   * retrieving that ancestor based on its distance from the element.
+   *
+   * @param selector A string containing a selector expression to match elements against.
+   * @return HTMLElement[]
+   */
+  ancestor(selector: string | number): ChocolateChipElementArray;
+
+  /**
+   * For each element in the set, get the first element that matches the selector by testing the element
+   * itself and traversing up through its ancestors in the DOM tree.
+   *
+   * @param selector A string containing a selector expression to match elements against.
+   * @return HTMLElement[]
+   */
+  closest(selector: string | number): ChocolateChipElementArray;
+
+  /**
+   * Get the siblings of each element in the set of matched elements, optionally filtered by a selector.
+   *
+   * @param selector A string containing a selector expression to match elements against.
+   * @return HTMLElement[]
+   */
+  siblings(selector?: string): ChocolateChipElementArray;
+
+  /**
+   * Get the HTML contents of the first element in the set of matched elements.
+   *
+   * @return HTMLElement[]
+   */
+  html(): ChocolateChipElementArray;
+
+  /**
+   * Set the HTML contents of each element in the set of matched elements.
+   *
+   * @param htmlString A string of HTML to set as the content of each matched element.
+   * @return HTMLElement[]
+   */
+  html(htmlString: string): ChocolateChipElementArray;
+
+  /**
+   * Get the value of style properties for the first element in the set of matched elements.
+   *
+   * @param propertyName A CSS property.
+   * @return string
+   */
+  css(propertyName: string): string;
+
+  /**
+   * Set one or more CSS properties for the set of matched elements using a quoted string.
+   *
+   * @param propertyName A CSS property name.
+   * @param value A value to set for the property.
+   * @return HTMLElement[]
+   */
+  css(propertyName: string, value: string): ChocolateChipElementArray;
+
+  /**
+   * Set one or more CSS properties for the set of matched elements.
+   *
+   * @param properties An object of property-value pairs to set.
+   * @return HTMLElement[]
+   */
+  css(properties: Object): ChocolateChipElementArray;
+
+  /**
+   * Get the value of an attribute for the first element in the set of matched elements.
+   *
+   * @param attributeName The name of the attribute to get.
+   * @return string
+   */
+  attr(attributeName: string): string;
+
+  /**
+   * Set an attribute for the set of matched elements.
+   *
+   * @param attributeName A string indicating the attribute to set.
+   * @param value A string indicating the value to set the attribute to.
+   * @return HTMLElement[]
+   */
+  attr(attributeName: string, value: string): ChocolateChipElementArray;
+
+  /**
+   * Remove an attribute from a node.
+   *
+   * @param attributeName A string indicating the attribute to remove.
+   * @return HTMLElement[]
+   */
+  removeAttr(attributeName: string): ChocolateChipElementArray;
+
+  /**
+   * Return any of the matched elements that have the given attribute.
+   *
+   * @param className The class name to search for.
+   * @return HTMLElement[]
+   */
+  hasAttr(attributeName: string): ChocolateChipElementArray;
+
+  /**
+   * Test whether an attribute exists on the first element in the set of matched elements. The value returned is a boolean.
+   *
+   * @param attributeName The name of the attribute to get.
+   * @return boolean
+   */
+  prop(propertyName: string): boolean;
+
+  /**
+   * Set an property for the set of matched elements.
+   *
+   * @param propertyName A string indicating the property to set.
+   * @param value A string indicating the value to set the property to.
+   * @return HTMLElement[]
+   */
+  prop(propertyName: string, value: any | boolean): ChocolateChipElementArray;
+  
+  /**
+   * Remove an element property.
+   * 
+   * @param property The property to remove.
+   * @return HTMLElement[]
+   */
+   removeProp(property: string): ChocolateChipElementArray;
+
+  /**
+   * Adds the specified class(es) to each of the set of matched elements.
+   *
+   * @param className One or more space-separated classes to be added to the class attribute of each matched element.
+   * @return HTMLElement[]
+   */
+  addClass(className: string): ChocolateChipElementArray;
+
+  /**
+   * Remove a single class or multiple classes from each element in the set of matched elements.
+   *
+   * @param className One or more space-separated classes to be removed from the class attribute of each matched element.
+   * @return HTMLElement[]
+   */
+  removeClass(className?: string): ChocolateChipElementArray;
+
+  /**
+   * Add or remove a classe from each element in the set of matched elements, depending on whether the class is present or not.
+   *
+   * @param className One or more class names (separated by spaces) to be toggled for each element in the matched set.
+   * @return HTMLElement[]
+   */
+  toggleClass(className: string, swtch?: boolean): ChocolateChipElementArray;
+
+  /**
+   * Return any of the matched elements that have the given class.
+   *
+   * @param className The class name to search for.
+   * @return HTMLElement[]
+   */
+  hasClass(className: string): ChocolateChipElementArray;
+
+  /**
+   * Store arbitrary data associated with the matched elements.
+   *
+   * @param key A string naming the piece of data to set.
+   * @param value The new data value; it can be any Javascript type including Array or Object.
+   * @return HTMLElement[]
+   */
+  data(key: string, value: any): ChocolateChipElementArray;
+
+  /**
+   * Return the value at the named data store for the first element in the element collection, as set by
+   * data(name).
+   *
+   * @param key Name of the data stored.
+   * @return any
+   */
+  data(key: string): any;
+
+  /**
+   * Remove the value at the named data store for the first element in the element collection, as set by data(name, value).
+   *
+   * @param key Name of the data stored.
+   * @return any
+   */
+  removeData(key?: string): any;
+
+  /**
+   * Store string data associated with the matched elements.
+   *
+   * @param key A string naming the piece of data to set.
+   * @param value The new data value; it must be a string. You can convert JSON into a string to use with this.
+   * @return HTMLElement[]
+   */
+  dataset(key: string, value: any): ChocolateChipElementArray;
+
+  /**
+ * Retrieve a dataset key's value for the first element in the element collection.
+  *
+  * @param key A string naming the piece of data to set.
+  * @return HTMLElement[]
+  */
+  dataset(key: string): ChocolateChipElementArray;
+
+  /**
+   * Return the value at the named data store for the first element in the element collection, as set by data(name, value).
+   *
+   * @param key Name of the data stored.
+   * @return any
+   */
+  data(key: string): any;
+
+  /**
+   * Store arbitrary data associated with the matched element.
+   *
+   * @param key A string naming the piece of data to set.
+   * @param value The new data value; it can be any Javascript type including Array or Object.
+   * @return HTMLElement[]
+   */
+  data(key: string, value?: any): ChocolateChipElementArray;
+
+  /**
+   * Get the current value of the first element in the set of matched elements.
+   */
+  val(): any;
+
+  /**
+   * Set the value of each element in the set of matched elements.
+   *
+   * @param value A string of text or an array of strings corresponding to the value of each matched element
+   * to set as selected/checked.
+   * @return any
+   */
+  val(value: string): ChocolateChipElementArray;
+
+  /**
+   * Set the property of an element to enabled by removing the "disabled" attribute.
+   *
+   * @return HTMLElement[]
+   */
+  enable(): ChocolateChipElementArray;
+
+  /**
+   * Set the property of an element to "disabled".
+   *
+   * @return HTMLElement[]
+   */
+  disable(): ChocolateChipElementArray;
+
+  /**
+   * Display the matched elements.
+   *
+   * @param speed A string or number determining how long the animation will run.
+   * @param callback A function to call once the animation is complete.
+   * @return HTMLElement[]
+   */
+  show(duration?: number | string, callback?: Function): ChocolateChipElementArray;
+
+  /**
+   * Hide the matched elements.
+   *
+   * @param duration A string or number determining how long the animation will run.
+   * @param callback A function to call once the animation is complete.
+   * @return HTMLElement[]
+   */
+  hide(duration?: number | string, callback?: Function): ChocolateChipElementArray;
+
+  /**
+   * Insert content, specified by the parameter, before each element in the set of matched elements.
+   *
+   * @param content HTML string, DOM element, array of elements to insert before each element in the set of matched elements.
+   * @return HTMLElement[]
+   */
+  before(content: ChocolateChipElementArray | HTMLElement | string): ChocolateChipElementArray;
+
+  /**
+   * Insert content, specified by the parameter, after each element in the set of matched elements.
+   *
+   * @param content HTML string, DOM element, array of elements to insert after each element in the set of matched elements.
+   * @return HTMLElement[]
+   */
+  after(content: ChocolateChipElementArray | HTMLElement | string): ChocolateChipElementArray;
+
+  /**
+   * Insert content, specified by the parameter, to the end of each element in the set of matched elements.
+   *
+   * @param content DOM element, array of elements, or HTML string to insert at the end of each element in the set
+   * of matched elements.
+   * @return HTMLElement[]
+   */
+  append(content: ChocolateChipElementArray | HTMLElement | Text | string): ChocolateChipElementArray;
+
+  /**
+   * Insert content, specified by the parameter, at the beginning of each element in the set of matched elements.
+   *
+   * @param content DOM element, array of elements, or HTML string to insert at the beginning of each element in the set of matched elements.
+   * @return HTMLElement[]
+   */
+  prepend(content: ChocolateChipElementArray | HTMLElement | Text | string): ChocolateChipElementArray;
+
+  /**
+   * Insert every element in the set of matched elements to the beginning of the target.
+   *
+   * @param target A selector, element, or HTML string. The matched set of elements will be inserted at the beginning of the element specified by this parameter.
+   * @return HTMLElement[]
+   */
+  prependTo(target: any[] | HTMLElement | string): ChocolateChipElementArray;
+
+  /**
+   * Insert every element in the set of matched elements to the end of the target.
+   *
+   * @param target A selector, element, or HTML string. The matched set of elements will be inserted at the end of the element specified by this parameter.
+   * If no position value is provided it will simply append the content to the target.
+   * @return HTMLElement[]
+   */
+  appendTo(target: any[] | HTMLElement | string): ChocolateChipElementArray;
+
+  /**
+   * Insert element(s) into the target element.
+   *
+   * @return HTMLElement[]
+   */
+  insert(content: string, position?: number | string): ChocolateChipElementArray;
+
+  /**
+   * Create a copy of the set of matched elements.
+   *
+   * @param value A Boolean indicating whether to copy the element(s) with their children. A true value copies the children.
+   * @return HTMLElement[]
+   */
+  clone(value?: boolean): ChocolateChipElementArray;
+
+  /**
+   * Wrap an HTML structure around each element in the set of matched elements.
+   *
+   * @param wrappingElement A selector or HTML string specifying the structure to wrap around the matched elements.
+   * @return HTMLElement[]
+   */
+  wrap(wrappingElement: string): ChocolateChipElementArray;
+
+  /**
+   * Remove the parents of the set of matched elements from the DOM, leaving the matched elements in their place.
+   *
+   * @return HTMLElement[]
+   */
+  unwrap(): ChocolateChipElementArray;
+
+  /**
+   * Remove the set of matched elements from the DOM. If there are any attached events, this will remove them to prevent memory leaks.
+   *
+   * @param selector A selector expression that filters the set of matched elements to be removed.
+   * @return HTMLElement[]
+   */
+  remove(selector?: string): ChocolateChipElementArray;
+
+  /**
+   * Remove all child nodes of the set of matched elements from the DOM.
+   *
+   * @return HTMLElement[]
+   */
+  empty(): ChocolateChipElementArray;
+
+  /**
+   * Get an object of the current coordinates of the first element in the set of matched elements, relative to the document.
+   * These are: top, left, bottom and right. The values are numbers representing pixel values.
+   * @return Object
+   */
+  offset(): {
+    top: number;
+    bottom: number;
+    left: number;
+    right: number;
+  };
+
+  /**
+   * Get the current computed width for the first element in the set of matched elements,
+   * including padding but excluding borders.
+   *
+   * @return number
+   */
+  width(): number;
+
+  /**
+   * Get the current computed height for the first element in the set of matched elements,
+   * including padding but excluding borders.
+   *
+   * @return number
+   */
+  height(): number;
+
+  /**
+   * Get the combined text contents of each element in the set of matched elements, including their descendants.
+   *
+   * @return string
+   */
+  text(): string;
+
+  /**
+   * Set the content of each element in the set of matched elements to the specified text.
+   *
+   * @param text The text to set as the content of each matched element. When Number is supplied, it will be converted to a String representation. To delete text, use ChocolateChipElementArray.empty() or ChocolateChipElementArray.remove().
+   * @return HTMLElement
+   */
+  text(text: string | number): HTMLElement;
+
+  /**
+   * A method to animate DOM nodes using CSS. This uses CSS transitions.
+   *
+   * @param options And object of key value pairs define the CSS properties and values to animate.
+   * @param duration A string representing the time. Should have a time identifier: "200s", "200ms", etc.
+   * @param easing A string indicating the easing for the animation, such as "ease-out", "ease-in", "ease-in-out".
+   * @return void
+   */
+  animate(options: Object, duration?: string, easing?: string): void;
+
+  /**
+   * Attach a handler to an event for the elements.
+   *
+   * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+   * @param handler A function to execute each time the event is triggered.
+   * @param useCapture Setting the third argument to true will trigger event bubbling. The default is false.
+   * @return ChocolateChipStatic
+   */
+  bind(eventType: string, handler: (eventObject: Event) => any, useCapture?: boolean): ChocolateChipStatic;
+
+  /**
+   * Remove a handler for an event from the elements.
+   *
+   * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+   * @param handler A function to execute each time the event is triggered.
+   * @param useCapture Setting the third argument to true will trigger event bubbling. The default is false.
+   * @return ChocolateChipStatic
+   */
+  unbind(eventType?: string, handler?: (eventObject: Event) => any, useCapture?: boolean): ChocolateChipStatic;
+
+  /**
+   * Add a delegated event to listen for the provided event on the descendant elements.
+   *
+   * @param selector A string defining the descendant elements to listen on for the designated event.
+   * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+   * @param handler A function to execute each time the event is triggered. The keyword "this" will refer
+   * to the element receiving the event.
+   * @param useCapture Setting the third argument to true will trigger event bubbling. The default is false.
+   * @return ChocolateChipStatic
+   */
+  delegate(selector: any, eventType: string, handler: (eventObject: Event) => any, useCapture?: boolean): ChocolateChipStatic;
+
+  /**
+   * Add a delegated event to listen for the provided event on the descendant elements.
+   *
+   * @param selector A string defining the descendant elements are listening for the event.
+   * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+   * @param handler A function handler assigned to this event.
+   * @param useCapture Setting the third argument to true will trigger event bubbling. The default is false.
+   * @return ChocolateChipStatic
+   */
+  undelegate(selector?: any, eventType?: string, handler?: (eventObject: Event) => any, useCapture?: boolean): ChocolateChipStatic;
+
+  /**
+   * Add a handler to an event for elements. If a selector is provided as the second argument, this implements a delegated event.
+   *
+   * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+   * @param selector A string defining the descendant elements are listening for the event.
+   * @param handler A function handler assigned to this event.
+   * @param useCapture Setting the third argument to true will trigger event bubbling. The default is false.
+   * @return ChocolateChipStatic
+   */
+  on(eventType: string, selector: any, handler?: (eventObject: Event) => any, capturePhase?: boolean): ChocolateChipStatic;
+
+  /**
+   * Remove a handler for an event from the elements. If the second argument is a selector, it tries to undelegate the event.
+   * If no arugments are provided, it removes all events from the element(s).
+   *
+   * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+   * @param selector A string defining the descendant elements are listening for the event.
+   * @param handler A function handler assigned to this event.
+   * @param useCapture Setting the third argument to true will trigger event bubbling. The default is false.
+   * @return ChocolateChipStatic
+   */
+  off(eventType?: string, selector?: any, handler?: (eventObject: Event) => any, capturePhase?: boolean): ChocolateChipStatic;
+
+  /**
+  * Trigger an event on an element.
+  * 
+  * @param eventType The event to trigger.
+  * @return void
+  */
+  trigger(eventType: string): void;
+}
+
+/**
+ * Represents the completion of an asynchronous operation
+ */
+interface Promise<T> {
+  /**
+   * Attaches callbacks for the resolution and/or rejection of the Promise.
+   *
+   * @param onfulfilled The callback to execute when the Promise is resolved.
+   * @param onrejected The callback to execute when the Promise is rejected.
+   * @return Promise A Promise for the completion of which ever callback is executed.
+   * @return Promise A new Promise
+   */
+  then<TResult>(onfulfilled?: (value: T) => TResult | Promise<TResult>, onrejected?: (reason: any) => TResult | Promise<TResult>): Promise<TResult>;
+
+  /**
+   * Attaches a callback for only the rejection of the Promise.
+   *
+   * @param onrejected The callback to execute when the Promise is rejected.
+   * @return Promise A Promise for the completion of the callback.
+   * @return Promise A new Promise
+   */
+  catch(onrejected?: (reason: any) => T | Promise<T>): Promise<T>;
+}
+
+interface PromiseConstructor {
+  /**
+   * Creates a new Promise.
+   *
+   * @param init A callback used to initialize the promise. This callback is passed two arguments: a resolve callback used resolve the promise with a value or the result of another promise, and a reject callback used to reject the promise with a provided reason or error.
+   * @return Promise A new Proimise
+   */
+  new <T>(init: (resolve: (value?: T | Promise<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
+
+  <T>(init: (resolve: (value?: T | Promise<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
+
+  /**
+   * Creates a Promise that is resolved with an array of results when all of the provided Promises resolve, or rejected when any Promise is rejected.
+   *
+   * @param values An array of Promises.
+   * @return Promise A new Promise.
+   */
+  all<T>(values: (T | Promise<T>)[]): Promise<T[]>;
+
+  /**
+   * Creates a Promise that is resolved with an array of results when all of the provided Promises resolve, or rejected when any Promise is rejected.
+   *
+   * @param values An array of values.
+   * @returns A new Promise.
+   */
+  all(values: Promise<void>[]): Promise<void>;
+
+  /**
+   * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved or rejected.
+   *
+   * @param values An array of Promises.
+   * @return Promise A new Promise.
+   */
+  race<T>(values: (T | Promise<T>)[]): Promise<T>;
+
+  /**
+   * Creates a new rejected promise for the provided reason.
+   *
+   * @param reason The reason the promise was rejected.
+   * @return Promise A new rejected Promise.
+   */
+  reject(reason: any): Promise<void>;
+
+  /**
+   * Creates a new rejected promise for the provided reason.
+   *
+   * @param reason The reason the promise was rejected.
+   * @return void A Promise is rejected.
+   */
+  reject<T>(reason: any): Promise<T>;
+
+  /**
+   * Creates a new resolved promise for the provided value.
+   *
+   * @param value A promise.
+   * @return Promise A promise whose internal state matches the provided promise.
+   */
+  resolve<T>(value: T | Promise<T>): Promise<T>;
+
+  /**
+   * Creates a new resolved promise.
+   *
+   * @return Promise A resolved promise.
+   */
+  resolve(): Promise<void>;
+}
+
+declare var Promise: PromiseConstructor;
+declare type ByteString = string;
+declare type USVString = string;
+declare type DOMString = string;
+declare type OpenEndedDictionary = Object;
+
+/**
+ * Interface for fetch API.
+ *
+ * @param input A string representing a valid url.
+ * @param init An object literal of key value pairs to set method, headers, body, credentials or cache.
+ * @return Promise.
+ */
+interface fetch {
+  (input: string,
+    init?: {
+    method?: string;
+    headers?: {};
+    body?: any;
+    mode?:  {
+      cors: string;
+      "no-cors": string;
+      "same-origin": string;
+    };
+    credentials?: {
+      omit: string;
+      "same-origin": string;
+      include: string;
+    };
+    cache?: {
+      default: string;
+      "no-store": string;
+      reload: string;
+      "no-cache": string;
+      "force-cache": string;
+      "only-if-cached": string;
+    };
+    timeout?: number;
+  }): Promise<any>;
+}
+
+interface XMLHttpRequest {
+   responseURL: string;
+}
+
+/**
+ * Headers Interface. This defines the methods exposed by the Headers object.
+ */
+interface Headers {
+   (headers?: any): void;
+   append(name: string, value: string): void;
+   delete(name: string): any;
+   get(name: string): any;
+   getAll(name: string): any;
+   has(name: string): any;
+   set(name: string, value: string): any;
+   forEach(callback: Function, thisArg: any): any;
+}
+
+interface decode {
+  (body: any): FormData;
+}
+
+/**
+ * Request Interface. This defines the properties and methods exposed by the Request object.
+ */
+interface Request {
+  (input: {
+    url: string;
+    request: Request;
+  }, init: Object): Request;
+  clone(): Request;
+  arrayBuffer(): ArrayBuffer;
+  blob(): Blob;
+  formData(): FormData;
+  json(): JSON;
+  text(): string;
+
+  method: string;
+  url: string;
+  heaers: Headers;
+  context: any;
+  referrer: any;
+  mode: string;
+  credentials: any;
+  cache: string;
+  bodyUsed: boolean;
+}
+
+interface URLSearchParams {
+  ():URLSearchParams;
+}
+
+/**
+ * Resonse Interface. This defines the properties and methods exposed by the Response object.
+ */
+interface Response {
+  (body?: {
+    blob: Blob;
+    bormData: FormData;
+    urlParams: URLSearchParams;
+    url: string;
+   },
+   init?: {
+    status?: string | number;
+    statusText?: string;
+    headers: Headers;
+  }): Response;
+  clone(): Response;
+  redirect(): Response;
+  arrayBuffer(): ArrayBuffer;
+  blob(): Blob;
+  formData(): FormData;
+  json(): JSON;
+  text(): string;
+
+  type: string;
+  url: string;
+  useFinalURL: boolean;
+  ok: boolean;
+  statusText: string;
+  headers: Headers;
+  bodyUsed: boolean;
+}
+
+interface ChocolateChipStatic {
+  
+  /**
+   * A cache to hold callbacks execute by the response from a JSONP request. This is an array of strings. By default these values get purged when the callback execute and exposes the data returned by the request.
+   */
+  JSONPCallbacks: string[];
+  /**
+   * Method to perform JSONP request. 
+   * 
+   * @param url A string defining the url to target.
+   * @param options And object literal of properties: {timeout? number, callbackName?: string, clear?: boolean}
+   */
+  jsonp(url: string, options?: {
+    /**
+     * A number representing milliseconds to express when to refect a JSONP request.
+     */
+    timeout?: number;
+    
+    /**
+     * The optional name for the callback when the server response will execute. The default value is "callback". However some sites may use a different name for their JSONP function. Consult the documentation on the site to ascertain the correct value for this callback. 
+     */
+    callbackName?: string;
+    
+    /**
+     * This value determines whether the callbacks and script associate with JSONP persist or are purged after the request returns. By default this is set to true, meaning that they will be purged.
+     */
+    clear?: boolean;
+  }): any
+}
+
+interface Window {
+  chocolatechipjs: ChocolateChipStatic;
+  $: ChocolateChipStatic;
+  jsonp: any;
+}
+declare var $: ChocolateChipStatic;
+declare var fetch: fetch;
+
+declare var chocolatechipjs: ChocolateChipStatic;
\ No newline at end of file
diff --git a/chocolatechipjs/tsconfig.json b/chocolatechipjs/tsconfig.json
new file mode 100644
index 0000000000..f3f3090f3d
--- /dev/null
+++ b/chocolatechipjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "chocolatechipjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/chokidar/chokidar-tests.ts b/chokidar/chokidar-tests.ts
index b89dd81a0b..9ff862789d 100644
--- a/chokidar/chokidar-tests.ts
+++ b/chokidar/chokidar-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="chokidar.d.ts" />
+
 
 import fs = require('fs');
 import chokidar = require('chokidar');
diff --git a/chokidar/chokidar.d.ts b/chokidar/chokidar.d.ts
deleted file mode 100644
index 36f2f821c2..0000000000
--- a/chokidar/chokidar.d.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-// Type definitions for chokidar 1.4.3
-// Project: https://github.com/paulmillr/chokidar
-// Definitions by: Stefan Steinhart <https://github.com/reppners/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "fs"
-{
-    interface FSWatcher
-    {
-        add(fileDirOrGlob:string):void;
-        add(filesDirsOrGlobs:Array<string>):void;
-        unwatch(fileDirOrGlob:string):void;
-        unwatch(filesDirsOrGlobs:Array<string>):void;
-        getWatched():any;
-    }
-}
-
-declare module "chokidar"
-{
-    interface WatchOptions
-    {
-        persistent?:boolean;
-        ignored?:any;
-        ignoreInitial?:boolean;
-        followSymlinks?:boolean;
-        cwd?:string;
-        usePolling?:boolean;
-        useFsEvents?:boolean;
-        alwaysStat?:boolean;
-        depth?:number;
-        interval?:number;
-        binaryInterval?:number;
-        ignorePermissionErrors?:boolean;
-        atomic?:boolean;
-        awaitWriteFinish?:any;
-    }
-
-    import fs = require("fs");
-
-    function watch(fileDirOrGlob:string, options?:WatchOptions):fs.FSWatcher;
-    function watch(filesDirsOrGlobs:Array<string>, options?:WatchOptions):fs.FSWatcher;
-}
diff --git a/chokidar/index.d.ts b/chokidar/index.d.ts
new file mode 100644
index 0000000000..aa0dd27ef5
--- /dev/null
+++ b/chokidar/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for chokidar 1.4.3
+// Project: https://github.com/paulmillr/chokidar
+// Definitions by: Stefan Steinhart <https://github.com/reppners/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare module "fs"
+{
+    interface FSWatcher
+    {
+        add(fileDirOrGlob:string):void;
+        add(filesDirsOrGlobs:Array<string>):void;
+        unwatch(fileDirOrGlob:string):void;
+        unwatch(filesDirsOrGlobs:Array<string>):void;
+        getWatched():any;
+    }
+}
+
+declare module "chokidar"
+{
+    interface WatchOptions
+    {
+        persistent?:boolean;
+        ignored?:any;
+        ignoreInitial?:boolean;
+        followSymlinks?:boolean;
+        cwd?:string;
+        usePolling?:boolean;
+        useFsEvents?:boolean;
+        alwaysStat?:boolean;
+        depth?:number;
+        interval?:number;
+        binaryInterval?:number;
+        ignorePermissionErrors?:boolean;
+        atomic?:boolean;
+        awaitWriteFinish?:any;
+    }
+
+    import fs = require("fs");
+
+    function watch(fileDirOrGlob:string, options?:WatchOptions):fs.FSWatcher;
+    function watch(filesDirsOrGlobs:Array<string>, options?:WatchOptions):fs.FSWatcher;
+}
diff --git a/chokidar/tsconfig.json b/chokidar/tsconfig.json
new file mode 100644
index 0000000000..6d78fa298c
--- /dev/null
+++ b/chokidar/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "chokidar-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/chosen/chosen-tests.ts b/chosen/chosen-tests.ts
index 818b1e1261..e5a97b0b59 100644
--- a/chosen/chosen-tests.ts
+++ b/chosen/chosen-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="chosen.jquery.d.ts" />
+
 
 $(".chzn-select").chosen({ no_results_text: "No results matched" });
 $("#form_field").chosen().change();
diff --git a/chosen/chosen.jquery.d.ts b/chosen/chosen.jquery.d.ts
deleted file mode 100644
index 0033bfdd1d..0000000000
--- a/chosen/chosen.jquery.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Type definitions for Chosen.JQuery 1.4.2
-// Project: http://harvesthq.github.com/chosen/
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface ChosenOptions {
-    allow_single_deselect?: boolean;
-    disable_search?: boolean;
-    disable_search_threshold?: number;
-    enable_split_word_search?: boolean;
-    inherit_select_classes?: boolean;
-    max_selected_options?: number;
-    no_results_text?: string;
-    placeholder_text_multiple?: string;
-    placeholder_text_single?: string;
-    search_contains?: boolean;
-    single_backstroke_delete?: boolean;
-    width?: number|string;
-    display_disabled_options?: boolean;
-    display_selected_options?: boolean;
-    include_group_label_in_selected?: boolean;
-}
-
-interface JQuery {
-    chosen(): JQuery;
-    chosen(options: ChosenOptions): JQuery;
-}
diff --git a/chosen/index.d.ts b/chosen/index.d.ts
new file mode 100644
index 0000000000..836e64e19d
--- /dev/null
+++ b/chosen/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for Chosen.JQuery 1.4.2
+// Project: http://harvesthq.github.com/chosen/
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="jquery"/>
+
+interface ChosenOptions {
+    allow_single_deselect?: boolean;
+    disable_search?: boolean;
+    disable_search_threshold?: number;
+    enable_split_word_search?: boolean;
+    inherit_select_classes?: boolean;
+    max_selected_options?: number;
+    no_results_text?: string;
+    placeholder_text_multiple?: string;
+    placeholder_text_single?: string;
+    search_contains?: boolean;
+    single_backstroke_delete?: boolean;
+    width?: number|string;
+    display_disabled_options?: boolean;
+    display_selected_options?: boolean;
+    include_group_label_in_selected?: boolean;
+}
+
+interface JQuery {
+    chosen(): JQuery;
+    chosen(options: ChosenOptions): JQuery;
+}
diff --git a/chosen/tsconfig.json b/chosen/tsconfig.json
new file mode 100644
index 0000000000..2785328efc
--- /dev/null
+++ b/chosen/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "chosen-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/chroma-js/chroma-js-tests.ts b/chroma-js/chroma-js-tests.ts
index 3240ac11f8..4bb67004fb 100644
--- a/chroma-js/chroma-js-tests.ts
+++ b/chroma-js/chroma-js-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="chroma-js.d.ts" />
+
 
 function test_chroma() {
     chroma("red");
diff --git a/chroma-js/chroma-js.d.ts b/chroma-js/index.d.ts
similarity index 100%
rename from chroma-js/chroma-js.d.ts
rename to chroma-js/index.d.ts
diff --git a/chroma-js/tsconfig.json b/chroma-js/tsconfig.json
new file mode 100644
index 0000000000..b37d5e2914
--- /dev/null
+++ b/chroma-js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "chroma-js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/chrome/chrome-app-tests.ts b/chrome/chrome-app-tests.ts
index c7194b523b..8d1a6f548f 100644
--- a/chrome/chrome-app-tests.ts
+++ b/chrome/chrome-app-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="chrome-app.d.ts" />
+
 
 import runtime = chrome.app.runtime;
 import cwindow = chrome.app.window;
diff --git a/chrome/chrome-app.d.ts b/chrome/chrome-app.d.ts
index 1891b960e0..73ad3c75ee 100644
--- a/chrome/chrome-app.d.ts
+++ b/chrome/chrome-app.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="chrome.d.ts"/>
-/// <reference path='../filesystem/filesystem.d.ts'/>
+/// <reference types="filesystem"/>
 
 ////////////////////
 // App Runtime
diff --git a/chrome/chrome-tests.ts b/chrome/chrome-tests.ts
index e184a82167..02273f4385 100644
--- a/chrome/chrome-tests.ts
+++ b/chrome/chrome-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="chrome.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../jqueryui/jqueryui.d.ts" />
+
+/// <reference types="jquery" />
+/// <reference types="jqueryui" />
 
 // https://developer.chrome.com/extensions/examples/api/bookmarks/basic/popup.js
 function bookmarksExample() {
diff --git a/chrome/chrome-tests.ts.tscparams b/chrome/chrome-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/chrome/chrome-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/chrome/chrome.d.ts b/chrome/chrome.d.ts
deleted file mode 100644
index 9cdf8c3a5d..0000000000
--- a/chrome/chrome.d.ts
+++ /dev/null
@@ -1,7691 +0,0 @@
-// Type definitions for Chrome extension development
-// Project: http://developer.chrome.com/extensions/
-// Definitions by: Matthew Kimber <https://github.com/matthewkimber>, otiai10 <https://github.com/otiai10>, couven92 <https://github.com/couven92>, RReverser <https://github.com/rreverser>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path='../webrtc/MediaStream.d.ts'/>
-/// <reference path='../filesystem/filesystem.d.ts' />
-
-////////////////////
-// Global object
-////////////////////
-interface Window {
-    chrome: typeof chrome;
-}
-
-////////////////////
-// Accessibility Features
-////////////////////
-/**
- * Use the chrome.accessibilityFeatures API to manage Chrome's accessibility features. This API relies on the ChromeSetting prototype of the type API for getting and setting individual accessibility features. In order to get feature states the extension must request accessibilityFeatures.read permission. For modifying feature state, the extension needs accessibilityFeatures.modify permission. Note that accessibilityFeatures.modify does not imply accessibilityFeatures.read permission.
- * Availability: Since Chrome 37.
- * Permissions: "accessibilityFeatures.read"
- * Important: This API works only on Chrome OS.
- */
-declare namespace chrome.accessibilityFeatures {
-	interface AccessibilityFeaturesGetArg {
-		/** Optional. Whether to return the value that applies to the incognito session (default false).  */
-		incognito?: boolean;
-	}
-
-	interface AccessibilityFeaturesCallbackArg {
-		/** The value of the setting. */
-		value: any;
-		/**
-		 * One of
-		 * • not_controllable: cannot be controlled by any extension
-		 * • controlled_by_other_extensions: controlled by extensions with higher precedence
-		 * • controllable_by_this_extension: can be controlled by this extension
-		 * • controlled_by_this_extension: controlled by this extension
-		 */
-		levelOfControl: string;
-		/** Optional. Whether the effective value is specific to the incognito session. This property will only be present if the incognito property in the details parameter of get() was true.  */
-		incognitoSpecific?: boolean;
-	}
-
-	interface AccessibilityFeaturesSetArg {
-		/**
-		 * The value of the setting.
-		 * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
-		 */
-		value: any;
-		/**
-		 * Optional.
- 		 * The scope of the ChromeSetting. One of
-		 * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
-		 * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
-		 * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
-		 * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
-		 */
-		scope?: string;
-	}
-
-	interface AccessibilityFeaturesClearArg {
-		/**
-		 * Optional.
- 		 * The scope of the ChromeSetting. One of
-		 * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
-		 * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
-		 * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
-		 * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
-		 */
-		scope?: string;
-	}
-
-	interface AccessibilityFeaturesSetting {
-		/**
-		 * Gets the value of a setting.
-		 * @param details Which setting to consider.
-		 * @param callback The callback parameter should be a function that looks like this:
-		 * function(object details) {...};
-		 */
-		get(details: AccessibilityFeaturesGetArg, callback: (details: AccessibilityFeaturesCallbackArg) => void): void;
-		/**
-		 * Sets the value of a setting.
-		 * @param details Which setting to change.
-		 * @param callback Called at the completion of the set operation.
-		 * If you specify the callback parameter, it should be a function that looks like this:
-		 * function() {...};
-		 */
-		set(details: AccessibilityFeaturesSetArg, callback?: () => void): void;
-		/**
-		 * Clears the setting, restoring any default value.
-		 * @param details Which setting to clear.
-		 * @param callback Called at the completion of the clear operation.
-		 * If you specify the callback parameter, it should be a function that looks like this:
-		 * function() {...};
-		 */
-		clear(details: AccessibilityFeaturesClearArg, callback?: () => void): void;
-	}
-
-	var spokenFeedback: AccessibilityFeaturesSetting;
-	var largeCursor: AccessibilityFeaturesSetting;
-	var stickyKeys: AccessibilityFeaturesSetting;
-	var highContrast: AccessibilityFeaturesSetting;
-	var screenMagnifier: AccessibilityFeaturesSetting;
-	var autoclick: AccessibilityFeaturesSetting;
-	var virtualKeyboard: AccessibilityFeaturesSetting;
-	var animationPolicy: AccessibilityFeaturesSetting;
-}
-
-////////////////////
-// Alarms
-////////////////////
-/**
- * Use the chrome.alarms API to schedule code to run periodically or at a specified time in the future.
- * Availability: Since Chrome 22.
- * Permissions:  "alarms"
- */
-declare namespace chrome.alarms {
-    interface AlarmCreateInfo {
-		/** Optional. Length of time in minutes after which the onAlarm event should fire.  */
-        delayInMinutes?: number;
-		/** Optional. If set, the onAlarm event should fire every periodInMinutes minutes after the initial event specified by when or delayInMinutes. If not set, the alarm will only fire once.  */
-        periodInMinutes?: number;
-		/** Optional. Time at which the alarm should fire, in milliseconds past the epoch (e.g. Date.now() + n).  */
-        when?: number;
-    }
-
-    interface Alarm {
-		/** Optional. If not null, the alarm is a repeating alarm and will fire again in periodInMinutes minutes.  */
-        periodInMinutes?: number;
-		/** Time at which this alarm was scheduled to fire, in milliseconds past the epoch (e.g. Date.now() + n). For performance reasons, the alarm may have been delayed an arbitrary amount beyond this. */
-        scheduledTime: number;
-		/** Name of this alarm. */
-        name: string;
-    }
-
-    interface AlarmEvent extends chrome.events.Event<(alarm: Alarm) => void> {}
-
-	/**
-	 * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
-	 * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
-	 * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
-	 * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
-	 */
-    export function create(alarmInfo: AlarmCreateInfo): void;
-	/**
-	 * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
-	 * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
-	 * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
-	 * @param name Optional name to identify this alarm. Defaults to the empty string.
-	 * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
-	 */
-    export function create(name: string, alarmInfo: AlarmCreateInfo): void;
-	/**
-	 * Gets an array of all the alarms.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of Alarm alarms) {...};
-	 */
-    export function getAll(callback: (alarms: Alarm[]) => void): void;
-	/**
-	 * Clears all alarms.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean wasCleared) {...};
-	 */
-    export function clearAll(callback?: (wasCleared: boolean) => void): void;
-	/**
-	 * Clears the alarm with the given name.
-	 * @param name The name of the alarm to clear. Defaults to the empty string.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean wasCleared) {...};
-	 */
-    export function clear(name?: string, callback?: (wasCleared: boolean) => void): void;
-	/**
-	 * Clears the alarm without a name.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean wasCleared) {...};
-	 */
-    export function clear(callback: (wasCleared: boolean) => void): void;
-	/**
-	 * Retrieves details about the specified alarm.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function( Alarm alarm) {...};
-	 */
-    export function get(callback: (alarm: Alarm) => void): void;
-	/**
-	 * Retrieves details about the specified alarm.
-	 * @param name The name of the alarm to get. Defaults to the empty string.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function( Alarm alarm) {...};
-	 */
-    export function get(name: string, callback: (alarm: Alarm) => void): void;
-
-	/** Fired when an alarm has elapsed. Useful for event pages. */
-    var onAlarm: AlarmEvent;
-}
-
-/**
- * Use the chrome.browser API to interact with the Chrome browser associated with
- * the current application and Chrome profile.
- */
-declare namespace chrome.browser {
-    interface Options {
-        /** The URL to navigate to when the new tab is initially opened. */
-        url: string;
-    }
-
-    /**
-     * Opens a new tab in a browser window associated with the current application
-     * and Chrome profile. If no browser window for the Chrome profile is opened,
-     * a new one is opened prior to creating the new tab.
-     * @param options Configures how the tab should be opened.
-     * @param callback Called when the tab was successfully
-     * created, or failed to be created. If failed, runtime.lastError will be set.
-     */
-    export function openTab(options: Options, callback: () => void): void;
-
-	/**
-	* Opens a new tab in a browser window associated with the current application
-	* and Chrome profile. If no browser window for the Chrome profile is opened,
-	* a new one is opened prior to creating the new tab. Since Chrome 42 only.
-	* @param options Configures how the tab should be opened.
-	*/
-    export function openTab(options: Options): void;
-}
-
-////////////////////
-// Bookmarks
-////////////////////
-/**
- * Use the chrome.bookmarks API to create, organize, and otherwise manipulate bookmarks. Also see Override Pages, which you can use to create a custom Bookmark Manager page.
- * Availability: Since Chrome 5.
- * Permissions:  "bookmarks"
- */
-declare namespace chrome.bookmarks {
-	/** A node (either a bookmark or a folder) in the bookmark tree. Child nodes are ordered within their parent folder. */
-    interface BookmarkTreeNode {
-		/** Optional. The 0-based position of this node within its parent folder.  */
-        index?: number;
-		/** Optional. When this node was created, in milliseconds since the epoch (new Date(dateAdded)).  */
-        dateAdded?: number;
-		/** The text displayed for the node. */
-        title: string;
-		/** Optional. The URL navigated to when a user clicks the bookmark. Omitted for folders.   */
-        url?: string;
-		/** Optional. When the contents of this folder last changed, in milliseconds since the epoch.   */
-        dateGroupModified?: number;
-		/** The unique identifier for the node. IDs are unique within the current profile, and they remain valid even after the browser is restarted.  */
-        id: string;
-		/** Optional. The id of the parent folder. Omitted for the root node.   */
-        parentId?: string;
-		/** Optional. An ordered list of children of this node.  */
-        children?: BookmarkTreeNode[];
-		/**
-		 * Optional.
- 		 * Since Chrome 37.
-		 * Indicates the reason why this node is unmodifiable. The managed value indicates that this node was configured by the system administrator or by the custodian of a supervised user. Omitted if the node can be modified by the user and the extension (default).
-		 */
-		unmodifiable?: any;
-    }
-
-    interface BookmarkRemoveInfo {
-        index: number;
-        parentId: string;
-    }
-
-    interface BookmarkMoveInfo {
-        index: number;
-        oldIndex: number;
-        parentId: string;
-        oldParentId: string;
-    }
-
-    interface BookmarkChangeInfo {
-        url?: string;
-        title: string;
-    }
-
-    interface BookmarkReorderInfo {
-        childIds: string[];
-    }
-
-    interface BookmarkRemovedEvent extends chrome.events.Event<(id: string, removeInfo: BookmarkRemoveInfo) => void> {}
-
-    interface BookmarkImportEndedEvent extends chrome.events.Event<() => void> {}
-
-    interface BookmarkMovedEvent extends chrome.events.Event<(id: string, moveInfo: BookmarkMoveInfo) => void> {}
-
-    interface BookmarkImportBeganEvent extends chrome.events.Event<() => void> {}
-
-    interface BookmarkChangedEvent extends chrome.events.Event<(id: string, changeInfo: BookmarkChangeInfo) => void> {}
-
-    interface BookmarkCreatedEvent extends chrome.events.Event<(id: string, bookmark: BookmarkTreeNode) => void> {}
-
-    interface BookmarkChildrenReordered extends chrome.events.Event<(id: string, reorderInfo: BookmarkReorderInfo) => void> {}
-
-	interface BookmarkSearchQuery {
-		query?: string;
-		url?: string;
-		title?: string;
-	}
-
-	interface BookmarkCreateArg {
-		/** Optional. Defaults to the Other Bookmarks folder.  */
-		parentId?: string;
-		index?: number;
-		title?: string;
-		url?: string;
-	}
-
-	interface BookmarkDestinationArg {
-		parentId?: string;
-		index?: number;
-	}
-
-	interface BookmarkChangesArg {
-		title?: string;
-		url?: string;
-	}
-
-	/** @deprecated since Chrome 38. Bookmark write operations are no longer limited by Chrome. */
-    var MAX_WRITE_OPERATIONS_PER_HOUR: number;
-	/** @deprecated since Chrome 38. Bookmark write operations are no longer limited by Chrome. */
-    var MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: number;
-
-	/**
-	 * Searches for BookmarkTreeNodes matching the given query. Queries specified with an object produce BookmarkTreeNodes matching all specified properties.
-	 * @param query A string of words and quoted phrases that are matched against bookmark URLs and titles.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of BookmarkTreeNode results) {...};
-	 */
-    export function search(query: string, callback: (results: BookmarkTreeNode[]) => void): void;
-	/**
-	 * Searches for BookmarkTreeNodes matching the given query. Queries specified with an object produce BookmarkTreeNodes matching all specified properties.
-	 * @param query An object with one or more of the properties query, url, and title specified. Bookmarks matching all specified properties will be produced.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of BookmarkTreeNode results) {...};
-	 */
-	export function search(query: BookmarkSearchQuery, callback: (results: BookmarkTreeNode[]) => void): void;
-	/**
-	 * Retrieves the entire Bookmarks hierarchy.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of BookmarkTreeNode results) {...};
-	 */
-    export function getTree(callback: (results: BookmarkTreeNode[]) => void): void;
-	/**
-	 * Retrieves the recently added bookmarks.
-	 * @param numberOfItems The maximum number of items to return.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of BookmarkTreeNode results) {...};
-	 */
-    export function getRecent(numberOfItems: number, callback: (results: BookmarkTreeNode[]) => void): void;
-	/**
-	 * Retrieves the specified BookmarkTreeNode.
-	 * @param id A single string-valued id
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of BookmarkTreeNode results) {...};
-	 */
-    export function get(id: string, callback: (results: BookmarkTreeNode[]) => void): void;
-	/**
-	 * Retrieves the specified BookmarkTreeNode.
-	 * @param idList An array of string-valued ids
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of BookmarkTreeNode results) {...};
-	 */
-    export function get(idList: string[], callback: (results: BookmarkTreeNode[]) => void): void;
-	/**
-	 * Creates a bookmark or folder under the specified parentId. If url is NULL or missing, it will be a folder.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function( BookmarkTreeNode result) {...};
-	 */
-    export function create(bookmark: BookmarkCreateArg, callback?: (result: BookmarkTreeNode) => void): void;
-	/**
-	 * Moves the specified BookmarkTreeNode to the provided location.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function( BookmarkTreeNode result) {...};
-	 */
-    export function move(id: string, destination: BookmarkDestinationArg, callback?: (result: BookmarkTreeNode) => void): void;
-	/**
-	 * Updates the properties of a bookmark or folder. Specify only the properties that you want to change; unspecified properties will be left unchanged. Note: Currently, only 'title' and 'url' are supported.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function( BookmarkTreeNode result) {...};
-	 */
-    export function update(id: string, changes: BookmarkChangesArg, callback?: (result: BookmarkTreeNode) => void): void;
-	/**
-	 * Removes a bookmark or an empty bookmark folder.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function remove(id: string, callback?: Function): void;
-	/**
-	 * Retrieves the children of the specified BookmarkTreeNode id.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of BookmarkTreeNode results) {...};
-	 */
-    export function getChildren(id: string, callback: (results: BookmarkTreeNode[]) => void): void;
-	/**
-	 * Since Chrome 14.
-	 * Retrieves part of the Bookmarks hierarchy, starting at the specified node.
-	 * @param id The ID of the root of the subtree to retrieve.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of BookmarkTreeNode results) {...};
-	 */
-    export function getSubTree(id: string, callback: (results: BookmarkTreeNode[]) => void): void;
-	/**
-	 * Recursively removes a bookmark folder.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function removeTree(id: string, callback?: Function): void;
-
-	/** Fired when a bookmark or folder is removed. When a folder is removed recursively, a single notification is fired for the folder, and none for its contents. */
-    var onRemoved: BookmarkRemovedEvent;
-	/** Fired when a bookmark import session is ended. */
-    var onImportEnded: BookmarkImportEndedEvent;
-	/** Fired when a bookmark import session is begun. Expensive observers should ignore onCreated updates until onImportEnded is fired. Observers should still handle other notifications immediately. */
-    var onImportBegan: BookmarkImportBeganEvent;
-	/** Fired when a bookmark or folder changes. Note: Currently, only title and url changes trigger this. */
-    var onChanged: BookmarkChangedEvent;
-	/** Fired when a bookmark or folder is moved to a different parent folder. */
-    var onMoved: BookmarkMovedEvent;
-	/** Fired when a bookmark or folder is created. */
-    var onCreated: BookmarkCreatedEvent;
-	/** Fired when the children of a folder have changed their order due to the order being sorted in the UI. This is not called as a result of a move(). */
-    var onChildrenReordered: BookmarkChildrenReordered;
-}
-
-////////////////////
-// Browser Action
-////////////////////
-/**
- * Use browser actions to put icons in the main Google Chrome toolbar, to the right of the address bar. In addition to its icon, a browser action can also have a tooltip, a badge, and a popup.
- * Availability: Since Chrome 5.
- * Manifest:  "browser_action": {...}
- */
-declare namespace chrome.browserAction {
-    interface BadgeBackgroundColorDetails {
-		/** An array of four integers in the range [0,255] that make up the RGBA color of the badge. For example, opaque red is [255, 0, 0, 255]. Can also be a string with a CSS value, with opaque red being #FF0000 or #F00. */
-        color: any;
-		/** Optional. Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.  */
-        tabId?: number;
-    }
-
-    interface BadgeTextDetails {
-		/** Any number of characters can be passed, but only about four can fit in the space. */
-        text: string;
-		/** Optional. Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.  */
-        tabId?: number;
-    }
-
-    interface TitleDetails {
-		/** The string the browser action should display when moused over. */
-        title: string;
-		/** Optional. Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.  */
-        tabId?: number;
-    }
-
-    interface TabDetails {
-		/** Optional. Specify the tab to get the information. If no tab is specified, the non-tab-specific information is returned.  */
-        tabId?: number;
-    }
-
-    interface TabIconDetails {
-		/** Optional. Either a relative image path or a dictionary {size -> relative image path} pointing to icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.path = foo' is equivalent to 'details.imageData = {'19': foo}'  */
-        path?: any;
-		/** Optional. Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.  */
-        tabId?: number;
-		/** Optional. Either an ImageData object or a dictionary {size -> ImageData} representing icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.imageData = foo' is equivalent to 'details.imageData = {'19': foo}'  */
-        imageData?: ImageData;
-    }
-
-    interface PopupDetails {
-		/** Optional. Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.  */
-        tabId?: number;
-		/** The html file to show in a popup. If set to the empty string (''), no popup is shown. */
-        popup: string;
-    }
-
-    interface BrowserClickedEvent extends chrome.events.Event<(tab: chrome.tabs.Tab) => void> {}
-
-	/**
-	 * Since Chrome 22.
-	 * Enables the browser action for a tab. By default, browser actions are enabled.
-	 * @param tabId The id of the tab for which you want to modify the browser action.
-	 */
-    export function enable(tabId?: number): void;
-	/** Sets the background color for the badge. */
-    export function setBadgeBackgroundColor(details: BadgeBackgroundColorDetails): void;
-	/** Sets the badge text for the browser action. The badge is displayed on top of the icon. */
-    export function setBadgeText(details: BadgeTextDetails): void;
-	/** Sets the title of the browser action. This shows up in the tooltip. */
-    export function setTitle(details: TitleDetails): void;
-	/**
-	 * Since Chrome 19.
-	 * Gets the badge text of the browser action. If no tab is specified, the non-tab-specific badge text is returned.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(string result) {...};
-	 */
-    export function getBadgeText(details: TabDetails, callback: (result: string) => void): void;
-	/** Sets the html document to be opened as a popup when the user clicks on the browser action's icon. */
-    export function setPopup(details: PopupDetails): void;
-	/**
-	 * Since Chrome 22.
-	 * Disables the browser action for a tab.
-	 * @param tabId The id of the tab for which you want to modify the browser action.
-	 */
-    export function disable(tabId?: number): void;
-	/**
-	 * Since Chrome 19.
-	 * Gets the title of the browser action.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(string result) {...};
-	 */
-    export function getTitle(details: TabDetails, callback: (result: string) => void): void;
-	/**
-	 * Since Chrome 19.
-	 * Gets the background color of the browser action.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function( ColorArray result) {...};
-	 */
-    export function getBadgeBackgroundColor(details: TabDetails, callback: (result: number[]) => void): void;
-	/**
-	 * Since Chrome 19.
-	 * Gets the html document set as the popup for this browser action.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(string result) {...};
-	 */
-    export function getPopup(details: TabDetails, callback: (result: string) => void): void;
-	/**
-	 * Sets the icon for the browser action. The icon can be specified either as the path to an image file or as the pixel data from a canvas element, or as dictionary of either one of those. Either the path or the imageData property must be specified.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function setIcon(details: TabIconDetails, callback?: Function): void;
-
-	/** Fired when a browser action icon is clicked. This event will not fire if the browser action has a popup. */
-    var onClicked: BrowserClickedEvent;
-}
-
-////////////////////
-// Browsing Data
-////////////////////
-/**
- * Use the chrome.browsingData API to remove browsing data from a user's local profile.
- * Availability: Since Chrome 19.
- * Permissions:  "browsingData"
- */
-declare namespace chrome.browsingData {
-    interface OriginTypes {
-		/** Optional. Websites that have been installed as hosted applications (be careful!).  */
-        protectedWeb?: boolean;
-		/** Optional. Extensions and packaged applications a user has installed (be _really_ careful!).  */
-        extension?: boolean;
-		/** Optional. Normal websites.  */
-        unprotectedWeb?: boolean;
-    }
-
-	/** Options that determine exactly what data will be removed. */
-    interface RemovalOptions {
-		/**
-		 * Optional.
- 		 * Since Chrome 21.
-		 * An object whose properties specify which origin types ought to be cleared. If this object isn't specified, it defaults to clearing only "unprotected" origins. Please ensure that you really want to remove application data before adding 'protectedWeb' or 'extensions'.
-		 */
-        originTypes?: OriginTypes;
-		/** Optional. Remove data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript Date object). If absent, defaults to 0 (which would remove all browsing data).  */
-        since?: number;
-    }
-
-	/**
-	 * Since Chrome 27.
-	 * A set of data types. Missing data types are interpreted as false.
-	 */
-    interface DataTypeSet {
-		/** Optional. Websites' WebSQL data.  */
-        webSQL?: boolean;
-		/** Optional. Websites' IndexedDB data.  */
-        indexedDB?: boolean;
-		/** Optional. The browser's cookies.  */
-        cookies?: boolean;
-		/** Optional. Stored passwords.  */
-        passwords?: boolean;
-		/** Optional. Server-bound certificates.  */
-        serverBoundCertificates?: boolean;
-		/** Optional. The browser's download list.  */
-        downloads?: boolean;
-		/** Optional. The browser's cache. Note: when removing data, this clears the entire cache: it is not limited to the range you specify.  */
-        cache?: boolean;
-		/** Optional. Websites' appcaches.  */
-        appcache?: boolean;
-		/** Optional. Websites' file systems.  */
-        fileSystems?: boolean;
-		/** Optional. Plugins' data.  */
-        pluginData?: boolean;
-		/** Optional. Websites' local storage data.  */
-        localStorage?: boolean;
-		/** Optional. The browser's stored form data.  */
-        formData?: boolean;
-		/** Optional. The browser's history.  */
-        history?: boolean;
-		/**
-		 * Optional.
- 		 * Since Chrome 39.
-		 * Service Workers.
-		 */
-		serviceWorkers?: boolean;
-    }
-
-	interface SettingsCallback {
-		options: RemovalOptions;
-		/** All of the types will be present in the result, with values of true if they are both selected to be removed and permitted to be removed, otherwise false. */
-		dataToRemove: DataTypeSet;
-		/** All of the types will be present in the result, with values of true if they are permitted to be removed (e.g., by enterprise policy) and false if not. */
-		dataRemovalPermitted: DataTypeSet;
-	}
-
-	/**
-	 * Since Chrome 26.
-	 * Reports which types of data are currently selected in the 'Clear browsing data' settings UI. Note: some of the data types included in this API are not available in the settings UI, and some UI settings control more than one data type listed here.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(object result) {...};
-	 */
-	export function settings(callback: (result: SettingsCallback) => void): void;
-	/**
-	 * Clears plugins' data.
-	 * @param callback Called when plugins' data has been cleared.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function removePluginData(options: RemovalOptions, callback?: () => void): void;
-	/**
-	 * Clears the browser's stored form data (autofill).
-	 * @param callback Called when the browser's form data has been cleared.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function removeFormData(options: RemovalOptions, callback?: () => void): void;
-	/**
-	 * Clears websites' file system data.
-	 * @param callback Called when websites' file systems have been cleared.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function removeFileSystems(options: RemovalOptions, callback?: () => void): void;
-	/**
-	 * Clears various types of browsing data stored in a user's profile.
-	 * @param dataToRemove The set of data types to remove.
-	 * @param callback Called when deletion has completed.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function remove(options: RemovalOptions, dataToRemove: DataTypeSet, callback?: () => void): void;
-	/**
-	 * Clears the browser's stored passwords.
-	 * @param callback Called when the browser's passwords have been cleared.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function removePasswords(options: RemovalOptions, callback?: () => void): void;
-	/**
-	 * Clears the browser's cookies and server-bound certificates modified within a particular timeframe.
-	 * @param callback Called when the browser's cookies and server-bound certificates have been cleared.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function removeCookies(options: RemovalOptions, callback?: () => void): void;
-	/**
-	 * Clears websites' WebSQL data.
-	 * @param callback Called when websites' WebSQL databases have been cleared.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function removeWebSQL(options: RemovalOptions, callback?: () => void): void;
-	/**
-	 * Clears websites' appcache data.
-	 * @param callback Called when websites' appcache data has been cleared.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function removeAppcache(options: RemovalOptions, callback?: () => void): void;
-	/**
-	 * Clears the browser's list of downloaded files (not the downloaded files themselves).
-	 * @param callback Called when the browser's list of downloaded files has been cleared.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function removeDownloads(options: RemovalOptions, callback?: () => void): void;
-	/**
-	 * Clears websites' local storage data.
-	 * @param callback Called when websites' local storage has been cleared.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function removeLocalStorage(options: RemovalOptions, callback?: () => void): void;
-	/**
-	 * Clears the browser's cache.
-	 * @param callback Called when the browser's cache has been cleared.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function removeCache(options: RemovalOptions, callback?: () => void): void;
-	/**
-	 * Clears the browser's history.
-	 * @param callback Called when the browser's history has cleared.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function removeHistory(options: RemovalOptions, callback?: () => void): void;
-	/**
-	 * Clears websites' IndexedDB data.
-	 * @param callback Called when websites' IndexedDB data has been cleared.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function removeIndexedDB(options: RemovalOptions, callback?: () => void): void;
-}
-
-////////////////////
-// Commands
-////////////////////
-/**
- * Use the commands API to add keyboard shortcuts that trigger actions in your extension, for example, an action to open the browser action or send a command to the extension.
- * Availability: Since Chrome 25.
- * Manifest:  "commands": {...}
- */
-declare namespace chrome.commands {
-	interface Command {
-		/** Optional. The name of the Extension Command  */
-		name?: string;
-		/** Optional. The Extension Command description  */
-		description?: string;
-		/** Optional. The shortcut active for this command, or blank if not active.  */
-		shortcut?: string;
-	}
-
-    interface CommandEvent extends chrome.events.Event<(command: string) => void> {}
-
-	/**
-	 * Returns all the registered extension commands for this extension and their shortcut (if active).
-	 * @param callback Called to return the registered commands.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(array of Command commands) {...};
-	 */
-	export function getAll(callback: (commands: Command[]) => void): void;
-
-	/** Fired when a registered command is activated using a keyboard shortcut. */
-    var onCommand: CommandEvent;
-}
-
-////////////////////
-// Content Settings
-////////////////////
-/**
- * Use the chrome.contentSettings API to change settings that control whether websites can use features such as cookies, JavaScript, and plugins. More generally speaking, content settings allow you to customize Chrome's behavior on a per-site basis instead of globally.
- * Availability: Since Chrome 16.
- * Permissions:  "contentSettings"
- */
-declare namespace chrome.contentSettings {
-    interface ClearDetails {
-		/**
-		 * Optional.
- 		 * Where to clear the setting (default: regular).
-		 * The scope of the ContentSetting. One of
-		 * * regular: setting for regular profile (which is inherited by the incognito profile if not overridden elsewhere),
-		 * * incognito_session_only: setting for incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular settings).
-		 */
-        scope?: string;
-    }
-
-    interface SetDetails {
-		/** Optional. The resource identifier for the content type.  */
-        resourceIdentifier?: ResourceIdentifier;
-		/** The setting applied by this rule. See the description of the individual ContentSetting objects for the possible values. */
-        setting: any;
-		/** Optional. The pattern for the secondary URL. Defaults to matching all URLs. For details on the format of a pattern, see Content Setting Patterns.  */
-        secondaryPattern?: string;
-		/** Optional. Where to set the setting (default: regular).  */
-        scope?: string;
-		/** The pattern for the primary URL. For details on the format of a pattern, see Content Setting Patterns. */
-        primaryPattern: string;
-    }
-
-    interface GetDetails {
-		/** Optional. The secondary URL for which the content setting should be retrieved. Defaults to the primary URL. Note that the meaning of a secondary URL depends on the content type, and not all content types use secondary URLs.  */
-        secondaryUrl?: string;
-		/** Optional. A more specific identifier of the type of content for which the settings should be retrieved.  */
-        resourceIdentifier?: ResourceIdentifier;
-		/** Optional. Whether to check the content settings for an incognito session. (default false)  */
-        incognito?: boolean;
-		/** The primary URL for which the content setting should be retrieved. Note that the meaning of a primary URL depends on the content type. */
-        primaryUrl: string;
-    }
-
-    interface ReturnedDetails {
-		/** The content setting. See the description of the individual ContentSetting objects for the possible values. */
-        setting: any;
-    }
-
-    interface ContentSetting {
-		/**
-		 * Clear all content setting rules set by this extension.
-		 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-		 * function() {...};
-		 */
-        clear(details: ClearDetails, callback?: () => void): void;
-		/**
-		 * Applies a new content setting rule.
-		 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-		 * function() {...};
-		 */
-        set(details: SetDetails, callback?: () => void): void;
-		/**
-		 * @param callback The callback parameter should be a function that looks like this:
-		 * function(array of ResourceIdentifier resourceIdentifiers) {...};
-		 * Parameter resourceIdentifiers: A list of resource identifiers for this content type, or undefined if this content type does not use resource identifiers.
-		 */
-        getResourceIdentifiers(callback: (resourceIdentifiers?: ResourceIdentifier[]) => void): void;
-		/**
-		 * Gets the current content setting for a given pair of URLs.
-		 * @param callback The callback parameter should be a function that looks like this:
-		 * function(object details) {...};
-		 */
-        get(details: GetDetails, callback: (details: ReturnedDetails) => void): void;
-    }
-
-	/** The only content type using resource identifiers is contentSettings.plugins. For more information, see Resource Identifiers. */
-    interface ResourceIdentifier {
-		/** The resource identifier for the given content type. */
-        id: string;
-		/** Optional. A human readable description of the resource.  */
-        description?: string;
-    }
-
-	/**
-	 * Whether to allow cookies and other local data to be set by websites. One of
-	 * allow: Accept cookies,
-	 * block: Block cookies,
-	 * session_only: Accept cookies only for the current session.
-	 * Default is allow.
-	 * The primary URL is the URL representing the cookie origin. The secondary URL is the URL of the top-level frame.
-	 */
-    var cookies: ContentSetting;
-	/**
-	 * Whether to allow sites to show pop-ups. One of
-	 * allow: Allow sites to show pop-ups,
-	 * block: Don't allow sites to show pop-ups.
-	 * Default is block.
-	 * The primary URL is the URL of the top-level frame. The secondary URL is not used.
-	 */
-    var popups: ContentSetting;
-	/**
-	 * Whether to run JavaScript. One of
-	 * allow: Run JavaScript,
-	 * block: Don't run JavaScript.
-	 * Default is allow.
-	 * The primary URL is the URL of the top-level frame. The secondary URL is not used.
-	 */
-    var javascript: ContentSetting;
-	/**
-	 * Whether to allow sites to show desktop notifications. One of
-	 * allow: Allow sites to show desktop notifications,
-	 * block: Don't allow sites to show desktop notifications,
-	 * ask: Ask when a site wants to show desktop notifications.
-	 * Default is ask.
-	 * The primary URL is the URL of the document which wants to show the notification. The secondary URL is not used.
-	 */
-    var notifications: ContentSetting;
-	/**
-	 * Whether to run plugins. One of
-	 * allow: Run plugins automatically,
-	 * block: Don't run plugins automatically,
-	 * detect_important_content: Only run automatically those plugins that are detected as the website's main content.
-	 * Default is allow.
-	 * The primary URL is the URL of the top-level frame. The secondary URL is not used.
-	 */
-    var plugins: ContentSetting;
-	/**
-	 * Whether to show images. One of
-	 * allow: Show images,
-	 * block: Don't show images.
-	 * Default is allow.
-	 * The primary URL is the URL of the top-level frame. The secondary URL is the URL of the image.
-	 */
-    var images: ContentSetting;
-	/**
-	 * Since Chrome 42.
-	 * Whether to allow Geolocation. One of
-	 * allow: Allow sites to track your physical location,
-	 * block: Don't allow sites to track your physical location,
-	 * ask: Ask before allowing sites to track your physical location.
-	 * Default is ask.
-	 * The primary URL is the URL of the document which requested location data. The secondary URL is the URL of the top-level frame (which may or may not differ from the requesting URL).
-	 */
-	var location: ContentSetting;
-	/**
-	 * Since Chrome 42.
-	 * Whether to allow sites to toggle the fullscreen mode. One of
-	 * allow: Allow sites to toggle the fullscreen mode,
-	 * ask: Ask when a site wants to toggle the fullscreen mode.
-	 * Default is ask.
-	 * The primary URL is the URL of the document which requested to toggle the fullscreen mode. The secondary URL is the URL of the top-level frame (which may or may not differ from the requesting URL).
-	 */
-	var fullscreen: ContentSetting;
-	/**
-	 * Since Chrome 42.
-	 * Whether to allow sites to disable the mouse cursor. One of
-	 * allow: Allow sites to disable the mouse cursor,
-	 * block: Don't allow sites to disable the mouse cursor,
-	 * ask: Ask when a site wants to disable the mouse cursor.
-	 * Default is ask.
-	 * The primary URL is the URL of the top-level frame. The secondary URL is not used.
-	 */
-	var mouselock: ContentSetting;
-	/**
-	 * Since Chrome 42.
-	 * Whether to allow sites to run plugins unsandboxed. One of
-	 * allow: Allow sites to run plugins unsandboxed,
-	 * block: Don't allow sites to run plugins unsandboxed,
-	 * ask: Ask when a site wants to run a plugin unsandboxed.
-	 * Default is ask.
-	 * The primary URL is the URL of the top-level frame. The secondary URL is not used.
-	 */
-	var unsandboxedPlugins: ContentSetting;
-	/**
-	 * Since Chrome 42.
-	 * Whether to allow sites to download multiple files automatically. One of
-	 * allow: Allow sites to download multiple files automatically,
-	 * block: Don't allow sites to download multiple files automatically,
-	 * ask: Ask when a site wants to download files automatically after the first file.
-	 * Default is ask.
-	 * The primary URL is the URL of the top-level frame. The secondary URL is not used.
-	 */
-	var automaticDownloads: ContentSetting;
-}
-
-////////////////////
-// Context Menus
-////////////////////
-/**
- * Use the chrome.contextMenus API to add items to Google Chrome's context menu. You can choose what types of objects your context menu additions apply to, such as images, hyperlinks, and pages.
- * Availability: Since Chrome 6.
- * Permissions:  "contextMenus"
- */
-declare namespace chrome.contextMenus {
-    interface OnClickData {
-		/**
-		 * Optional.
- 		 * Since Chrome 35.
-		 * The text for the context selection, if any.
-		 */
-        selectionText?: string;
-		/**
-		 * Optional.
- 		 * Since Chrome 35.
-		 * A flag indicating the state of a checkbox or radio item after it is clicked.
-		 */
-        checked?: boolean;
-		/**
-		 * Since Chrome 35.
-		 * The ID of the menu item that was clicked.
-		 */
-        menuItemId: any;
-		/**
-		 * Optional.
- 		 * Since Chrome 35.
-		 * The URL of the frame of the element where the context menu was clicked, if it was in a frame.
-		 */
-        frameUrl?: string;
-		/**
-		 * Since Chrome 35.
-		 * A flag indicating whether the element is editable (text input, textarea, etc.).
-		 */
-        editable: boolean;
-		/**
-		 * Optional.
- 		 * Since Chrome 35.
-		 * One of 'image', 'video', or 'audio' if the context menu was activated on one of these types of elements.
-		 */
-        mediaType?: string;
-		/**
-		 * Optional.
- 		 * Since Chrome 35.
-		 * A flag indicating the state of a checkbox or radio item before it was clicked.
-		 */
-        wasChecked?: boolean;
-		/**
-		 * Since Chrome 35.
-		 * The URL of the page where the menu item was clicked. This property is not set if the click occured in a context where there is no current page, such as in a launcher context menu.
-		 */
-        pageUrl: string;
-		/**
-		 * Optional.
- 		 * Since Chrome 35.
-		 * If the element is a link, the URL it points to.
-		 */
-        linkUrl?: string;
-		/**
-		 * Optional.
- 		 * Since Chrome 35.
-		 * The parent ID, if any, for the item clicked.
-		 */
-        parentMenuItemId?: any;
-		/**
-		 * Optional.
- 		 * Since Chrome 35.
-		 * Will be present for elements with a 'src' URL.
-		 */
-        srcUrl?: string;
-    }
-
-    interface CreateProperties {
-		/** Optional. Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see Match Patterns.  */
-        documentUrlPatterns?: string[];
-		/** Optional. The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.  */
-        checked?: boolean;
-		/** Optional. The text to be displayed in the item; this is required unless type is 'separator'. When the context is 'selection', you can use %s within the string to show the selected text. For example, if this parameter's value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the selection is "Translate 'cool' to Pig Latin".  */
-        title?: string;
-		/** Optional. List of contexts this menu item will appear in. Defaults to ['page'] if not specified.  */
-        contexts?: string[];
-		/**
-		 * Optional.
- 		 * Since Chrome 20.
-		 * Whether this context menu item is enabled or disabled. Defaults to true.
-		 */
-        enabled?: boolean;
-		/** Optional. Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.  */
-        targetUrlPatterns?: string[];
-		/**
-		 * Optional.
- 		 * A function that will be called back when the menu item is clicked. Event pages cannot use this; instead, they should register a listener for chrome.contextMenus.onClicked.
-		 * @param info Information sent when a context menu item is clicked.
-		 * @param tab The details of the tab where the click took place. Note: this parameter only present for extensions.
-		 */
-        onclick?: (info: OnClickData, tab: chrome.tabs.Tab) => void;
-		/** Optional. The ID of a parent menu item; this makes the item a child of a previously added item.  */
-        parentId?: any;
-		/** Optional. The type of menu item. Defaults to 'normal' if not specified.  */
-        type?: string;
-		/**
-		 * Optional.
- 		 * Since Chrome 21.
-		 * The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
-		 */
-        id?: string;
-    }
-
-    interface UpdateProperties {
-        documentUrlPatterns?: string[];
-        checked?: boolean;
-        title?: string;
-        contexts?: string[];
-		/** Optional. Since Chrome 20.  */
-        enabled?: boolean;
-        targetUrlPatterns?: string[];
-        onclick?: Function;
-		/** Optional. Note: You cannot change an item to be a child of one of its own descendants.  */
-        parentId?: any;
-        type?: string;
-    }
-
-    interface MenuClickedEvent extends chrome.events.Event<(info: OnClickData, tab?: chrome.tabs.Tab) => void> {}
-
-	/**
-	 * Since Chrome 38.
-	 * The maximum number of top level extension items that can be added to an extension action context menu. Any items beyond this limit will be ignored.
-	 */
-	var ACTION_MENU_TOP_LEVEL_LIMIT: number;
-
-    /**
-	 * Removes all context menu items added by this extension.
-	 * @param callback Called when removal is complete.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function removeAll(callback?: () => void): void;
-	/**
-	 * Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
-	 * @param callback Called when the item has been created in the browser. If there were any problems creating the item, details will be available in chrome.runtime.lastError.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function create(createProperties: CreateProperties, callback?: () => void): void;
-	/**
-	 * Updates a previously created context menu item.
-	 * @param id The ID of the item to update.
-	 * @param updateProperties The properties to update. Accepts the same values as the create function.
-	 * @param callback Called when the context menu has been updated.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function update(id: string, updateProperties: UpdateProperties, callback?: () => void): void;
-	/**
-	 * Updates a previously created context menu item.
-	 * @param id The ID of the item to update.
-	 * @param updateProperties The properties to update. Accepts the same values as the create function.
-	 * @param callback Called when the context menu has been updated.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function update(id: number, updateProperties: UpdateProperties, callback?: () => void): void;
-	/**
-	 * Removes a context menu item.
-	 * @param menuItemId The ID of the context menu item to remove.
-	 * @param callback Called when the context menu has been removed.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function remove(menuItemId: string, callback?: () => void): void;
-	/**
-	 * Removes a context menu item.
-	 * @param menuItemId The ID of the context menu item to remove.
-	 * @param callback Called when the context menu has been removed.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function remove(menuItemId: number, callback?: () => void): void;
-
-	/**
-	 * Since Chrome 21.
-	 * Fired when a context menu item is clicked.
-	 */
-    var onClicked: MenuClickedEvent;
-}
-
-////////////////////
-// Cookies
-////////////////////
-/**
- * Use the chrome.cookies API to query and modify cookies, and to be notified when they change.
- * Availability: Since Chrome 6.
- * Permissions:  "cookies", host permissions
- */
-declare namespace chrome.cookies {
-	/** Represents information about an HTTP cookie. */
-    interface Cookie {
-		/** The domain of the cookie (e.g. "www.google.com", "example.com"). */
-        domain: string;
-		/** The name of the cookie. */
-        name: string;
-		/** The ID of the cookie store containing this cookie, as provided in getAllCookieStores(). */
-        storeId: string;
-		/** The value of the cookie. */
-        value: string;
-		/** True if the cookie is a session cookie, as opposed to a persistent cookie with an expiration date. */
-        session: boolean;
-		/** True if the cookie is a host-only cookie (i.e. a request's host must exactly match the domain of the cookie). */
-        hostOnly: boolean;
-		/** Optional. The expiration date of the cookie as the number of seconds since the UNIX epoch. Not provided for session cookies.  */
-        expirationDate?: number;
-		/** The path of the cookie. */
-        path: string;
-		/** True if the cookie is marked as HttpOnly (i.e. the cookie is inaccessible to client-side scripts). */
-        httpOnly: boolean;
-		/** True if the cookie is marked as Secure (i.e. its scope is limited to secure channels, typically HTTPS). */
-        secure: boolean;
-    }
-
-	/** Represents a cookie store in the browser. An incognito mode window, for instance, uses a separate cookie store from a non-incognito window. */
-    interface CookieStore {
-		/** The unique identifier for the cookie store. */
-        id: string;
-		/** Identifiers of all the browser tabs that share this cookie store. */
-        tabIds: number[];
-    }
-
-    interface GetAllDetails {
-		/** Optional. Restricts the retrieved cookies to those whose domains match or are subdomains of this one.  */
-        domain?: string;
-		/** Optional. Filters the cookies by name.  */
-        name?: string;
-		/** Optional. Restricts the retrieved cookies to those that would match the given URL.  */
-        url?: string;
-		/** Optional. The cookie store to retrieve cookies from. If omitted, the current execution context's cookie store will be used.  */
-        storeId?: string;
-		/** Optional. Filters out session vs. persistent cookies.  */
-        session?: boolean;
-		/** Optional. Restricts the retrieved cookies to those whose path exactly matches this string.  */
-        path?: string;
-		/** Optional. Filters the cookies by their Secure property.  */
-        secure?: boolean;
-    }
-
-    interface SetDetails {
-		/** Optional. The domain of the cookie. If omitted, the cookie becomes a host-only cookie.  */
-        domain?: string;
-		/** Optional. The name of the cookie. Empty by default if omitted.  */
-        name?: string;
-		/** The request-URI to associate with the setting of the cookie. This value can affect the default domain and path values of the created cookie. If host permissions for this URL are not specified in the manifest file, the API call will fail. */
-        url: string;
-		/** Optional. The ID of the cookie store in which to set the cookie. By default, the cookie is set in the current execution context's cookie store.  */
-        storeId?: string;
-		/** Optional. The value of the cookie. Empty by default if omitted.  */
-        value?: string;
-		/** Optional. The expiration date of the cookie as the number of seconds since the UNIX epoch. If omitted, the cookie becomes a session cookie.  */
-        expirationDate?: number;
-		/** Optional. The path of the cookie. Defaults to the path portion of the url parameter.  */
-        path?: string;
-		/** Optional. Whether the cookie should be marked as HttpOnly. Defaults to false.  */
-        httpOnly?: boolean;
-		/** Optional. Whether the cookie should be marked as Secure. Defaults to false.  */
-        secure?: boolean;
-    }
-
-    interface Details {
-        name: string;
-        url: string;
-        storeId?: string;
-    }
-
-    interface CookieChangeInfo {
-		/** Information about the cookie that was set or removed. */
-        cookie: Cookie;
-		/** True if a cookie was removed. */
-        removed: boolean;
-		/**
-		 * Since Chrome 12.
-		 * The underlying reason behind the cookie's change.
-		 */
-        cause: string;
-    }
-
-    interface CookieChangedEvent extends chrome.events.Event<(changeInfo: CookieChangeInfo) => void> {}
-
-	/**
-	 * Lists all existing cookie stores.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of CookieStore cookieStores) {...};
-	 * Parameter cookieStores: All the existing cookie stores.
-	 */
-    export function getAllCookieStores(callback: (cookieStores: CookieStore[]) => void): void;
-	/**
-	 * Retrieves all cookies from a single cookie store that match the given information. The cookies returned will be sorted, with those with the longest path first. If multiple cookies have the same path length, those with the earliest creation time will be first.
-	 * @param details Information to filter the cookies being retrieved.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of Cookie cookies) {...};
-	 * Parameter cookies: All the existing, unexpired cookies that match the given cookie info.
-	 */
-    export function getAll(details: GetAllDetails, callback: (cookies: Cookie[]) => void): void;
-	/**
-	 * Sets a cookie with the given cookie data; may overwrite equivalent cookies if they exist.
-	 * @param details Details about the cookie being set.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function( Cookie cookie) {...};
-	 * Optional parameter cookie: Contains details about the cookie that's been set. If setting failed for any reason, this will be "null", and "chrome.runtime.lastError" will be set.
-	 */
-    export function set(details: SetDetails, callback?: (cookie?: Cookie) => void): void;
-	/**
-	 * Deletes a cookie by name.
-	 * @param details Information to identify the cookie to remove.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(object details) {...};
-	 */
-    export function remove(details: Details, callback?: (details: Details) => void): void;
-	/**
-	 * Retrieves information about a single cookie. If more than one cookie of the same name exists for the given URL, the one with the longest path will be returned. For cookies with the same path length, the cookie with the earliest creation time will be returned.
-	 * @param details Details to identify the cookie being retrieved.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function( Cookie cookie) {...};
-	 * Parameter cookie: Contains details about the cookie. This parameter is null if no such cookie was found.
-	 */
-    export function get(details: Details, callback: (cookie?: Cookie) => void): void;
-
-	/** Fired when a cookie is set or removed. As a special case, note that updating a cookie's properties is implemented as a two step process: the cookie to be updated is first removed entirely, generating a notification with "cause" of "overwrite" . Afterwards, a new cookie is written with the updated values, generating a second notification with "cause" "explicit". */
-    var onChanged: CookieChangedEvent;
-}
-
-////////////////////
-// Debugger
-////////////////////
-/**
- * The chrome.debugger API serves as an alternate transport for Chrome's remote debugging protocol. Use chrome.debugger to attach to one or more tabs to instrument network interaction, debug JavaScript, mutate the DOM and CSS, etc. Use the Debuggee tabId to target tabs with sendCommand and route events by tabId from onEvent callbacks.
- * Availability: Since Chrome 18.
- * Permissions:  "debugger"
- */
-declare module "chrome.debugger" {
-	/** Debuggee identifier. Either tabId or extensionId must be specified */
-    interface Debuggee {
-		/** Optional. The id of the tab which you intend to debug.  */
-		tabId?: number;
-		/**
-		 * Optional.
- 		 * Since Chrome 27.
-		 * The id of the extension which you intend to debug. Attaching to an extension background page is only possible when 'silent-debugger-extension-api' flag is enabled on the target browser.
-		 */
-		extensionId?: string;
-		/**
-		 * Optional.
- 		 * Since Chrome 28.
-		 * The opaque id of the debug target.
-		 */
-		targetId?: string;
-    }
-
-	/**
-	 * Since Chrome 28.
-	 * Debug target information
-	 */
-	interface TargetInfo {
-		/** Target type. */
-		type: string;
-		/** Target id. */
-		id: string;
-		/**
-		 * Optional.
- 		 * Since Chrome 30.
-		 * The tab id, defined if type == 'page'.
-		 */
-		tabId?: number;
-		/**
-		 * Optional.
- 		 * Since Chrome 30.
-		 * The extension id, defined if type = 'background_page'.
-		 */
-		extensionId?: string;
-		/** True if debugger is already attached. */
-		attached: boolean;
-		/** Target page title. */
-		title: string;
-		/** Target URL. */
-		url: string;
-		/** Optional. Target favicon URL.  */
-		faviconUrl?: string;
-    }
-
-    interface DebuggerDetachedEvent extends chrome.events.Event<(source: Debuggee, reason: string) => void> {}
-
-    interface DebuggerEventEvent extends chrome.events.Event<(source: Debuggee, method: string, params?: Object) => void> {}
-
-	/**
-	 * Attaches debugger to the given target.
-	 * @param target Debugging target to which you want to attach.
-	 * @param requiredVersion Required debugging protocol version ("0.1"). One can only attach to the debuggee with matching major version and greater or equal minor version. List of the protocol versions can be obtained in the documentation pages.
-	 * @param callback Called once the attach operation succeeds or fails. Callback receives no arguments. If the attach fails, runtime.lastError will be set to the error message.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function attach(target: Debuggee, requiredVersion: string, callback?: () => void): void;
-	/**
-	 * Detaches debugger from the given target.
-	 * @param target Debugging target from which you want to detach.
-	 * @param callback Called once the detach operation succeeds or fails. Callback receives no arguments. If the detach fails, runtime.lastError will be set to the error message.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function detach(target: Debuggee, callback?: () => void): void;
-	/**
-	 * Sends given command to the debugging target.
-	 * @param target Debugging target to which you want to send the command.
-	 * @param method Method name. Should be one of the methods defined by the remote debugging protocol.
-	 * @param commandParams Since Chrome 22.
-	 * JSON object with request parameters. This object must conform to the remote debugging params scheme for given method.
-	 * @param callback Response body. If an error occurs while posting the message, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(object result) {...};
-	 */
-    export function sendCommand(target: Debuggee, method: string, commandParams?: Object, callback?: (result?: Object) => void): void;
-	/**
-	 * Since Chrome 28.
-	 * Returns the list of available debug targets.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of TargetInfo result) {...};
-	 * Parameter result: Array of TargetInfo objects corresponding to the available debug targets.
-	 */
-	export function getTargets(callback: (result: TargetInfo[]) => void): void;
-
-	/** Fired when browser terminates debugging session for the tab. This happens when either the tab is being closed or Chrome DevTools is being invoked for the attached tab. */
-    var onDetach: DebuggerDetachedEvent;
-	/** Fired whenever debugging target issues instrumentation event. */
-    var onEvent: DebuggerEventEvent;
-}
-
-////////////////////
-// Declarative Content
-////////////////////
-/**
- * Use the chrome.declarativeContent API to take actions depending on the content of a page, without requiring permission to read the page's content.
- * Availability: Since Chrome 33.
- * Permissions:  "declarativeContent"
- */
-declare namespace chrome.declarativeContent {
-	interface PageStateUrlDetails {
-		/** Optional. Matches if the host name of the URL contains a specified string. To test whether a host name component has a prefix 'foo', use hostContains: '.foo'. This matches 'www.foobar.com' and 'foo.com', because an implicit dot is added at the beginning of the host name. Similarly, hostContains can be used to match against component suffix ('foo.') and to exactly match against components ('.foo.'). Suffix- and exact-matching for the last components need to be done separately using hostSuffix, because no implicit dot is added at the end of the host name.  */
-		hostContains?: string;
-		/** Optional. Matches if the host name of the URL is equal to a specified string.  */
-		hostEquals?: string;
-		/** Optional. Matches if the host name of the URL starts with a specified string.  */
-		hostPrefix?: string;
-		/** Optional. Matches if the host name of the URL ends with a specified string.  */
-		hostSuffix?: string;
-		/** Optional. Matches if the path segment of the URL contains a specified string.  */
-		pathContains?: string;
-		/** Optional. Matches if the path segment of the URL is equal to a specified string.  */
-		pathEquals?: string;
-		/** Optional. Matches if the path segment of the URL starts with a specified string.  */
-		pathPrefix?: string;
-		/** Optional. Matches if the path segment of the URL ends with a specified string.  */
-		pathSuffix?: string;
-		/** Optional. Matches if the query segment of the URL contains a specified string.  */
-		queryContains?: string;
-		/** Optional. Matches if the query segment of the URL is equal to a specified string.  */
-		queryEquals?: string;
-		/** Optional. Matches if the query segment of the URL starts with a specified string.  */
-		queryPrefix?: string;
-		/** Optional. Matches if the query segment of the URL ends with a specified string.  */
-		querySuffix?: string;
-		/** Optional. Matches if the URL (without fragment identifier) contains a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-		urlContains?: string;
-		/** Optional. Matches if the URL (without fragment identifier) is equal to a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-		urlEquals?: string;
-		/** Optional. Matches if the URL (without fragment identifier) matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.  */
-		urlMatches?: string;
-		/** Optional. Matches if the URL without query segment and fragment identifier matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.  */
-		originAndPathMatches?: string;
-		/** Optional. Matches if the URL (without fragment identifier) starts with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-		urlPrefix?: string;
-		/** Optional. Matches if the URL (without fragment identifier) ends with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-		urlSuffix?: string;
-		/** Optional. Matches if the scheme of the URL is equal to any of the schemes specified in the array.  */
-		schemes?: string[];
-		/** Optional. Matches if the port of the URL is contained in any of the specified port lists. For example [80, 443, [1000, 1200]] matches all requests on port 80, 443 and in the range 1000-1200.  */
-		ports?: (number | number[])[];
-	}
-
-	/** Matches the state of a web page by various criteria. */
-	interface PageStateMatcher {
-		/** Optional. Filters URLs for various criteria. See event filtering. All criteria are case sensitive.  */
-		pageUrl?: PageStateUrlDetails;
-		/** Optional. Matches if all of the CSS selectors in the array match displayed elements in a frame with the same origin as the page's main frame. All selectors in this array must be compound selectors to speed up matching. Note that listing hundreds of CSS selectors or CSS selectors that match hundreds of times per page can still slow down web sites.  */
-		css?: string[];
-		/**
-		 * Optional.
- 		 * Since Chrome 45. Warning: this is the current Beta channel. More information available on the API documentation pages.
-		 * Matches if the bookmarked state of the page is equal to the specified value. Requres the bookmarks permission.
-		 */
-		isBookmarked?: boolean;
-	}
-}
-
-////////////////////
-// Declarative Web Request
-////////////////////
-declare namespace chrome.declarativeWebRequest {
-    interface HeaderFilter {
-        nameEquals?: string;
-        valueContains?: any;
-        nameSuffix?: string;
-        valueSuffix?: string;
-        valuePrefix?: string;
-        nameContains?: any;
-        valueEquals?: string;
-        namePrefix?: string;
-    }
-
-    interface AddResponseHeader {
-        name: string;
-        value: string;
-    }
-
-    interface RemoveResponseCookie {
-        filter: ResponseCookie;
-    }
-
-    interface RemoveResponseHeader {
-        name: string;
-        value?: string;
-    }
-
-    interface RequestMatcher {
-        contentType?: string[];
-        url?: chrome.events.UrlFilter;
-        excludeContentType?: string[];
-        excludeResponseHeader?: HeaderFilter[];
-        resourceType?: string;
-        responseHeaders?: HeaderFilter[];
-    }
-
-    interface IgnoreRules {
-        lowerPriorityThan: number;
-    }
-
-    interface RedirectToEmptyDocument { }
-
-    interface RedirectRequest {
-        redirectUrl: string;
-    }
-
-    interface ResponseCookie {
-        domain?: string;
-        name?: string;
-        expires?: string;
-        maxAge?: number;
-        value?: string;
-        path?: string;
-        httpOnly?: string;
-        secure?: string;
-    }
-
-    interface AddResponseCookie {
-        cookie: ResponseCookie;
-    }
-
-    interface EditResponseCookie {
-        filter: ResponseCookie;
-        modification: ResponseCookie;
-    }
-
-    interface CancelRequest { }
-
-    interface RemoveRequestHeader {
-        name: string;
-    }
-
-    interface EditRequestCookie {
-        filter: RequestCookie;
-        modification: RequestCookie;
-    }
-
-    interface SetRequestHeader {
-        name: string;
-        value: string;
-    }
-
-    interface RequestCookie {
-        name?: string;
-        value?: string;
-    }
-
-    interface RedirectByRegEx {
-        to: string;
-        from: string;
-    }
-
-    interface RedirectToTransparentImage { }
-
-    interface AddRequestCookie {
-        cookie: RequestCookie;
-    }
-
-    interface RemoveRequestCookie {
-        filter: RequestCookie;
-    }
-
-    interface RequestedEvent extends chrome.events.Event<Function> {}
-
-    var onRequest: RequestedEvent;
-}
-
-////////////////////
-// DesktopCapture
-////////////////////
-/**
- * Desktop Capture API that can be used to capture content of screen, individual windows or tabs.
- * Availability: Since Chrome 34.
- * Permissions:  "desktopCapture"
- */
-declare namespace chrome.desktopCapture {
-	/**
-	 * Shows desktop media picker UI with the specified set of sources.
-	 * @param sources Set of sources that should be shown to the user.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(string streamId) {...};
-	 * Parameter streamId: An opaque string that can be passed to getUserMedia() API to generate media stream that corresponds to the source selected by the user. If user didn't select any source (i.e. canceled the prompt) then the callback is called with an empty streamId. The created streamId can be used only once and expires after a few seconds when it is not used.
-	 */
-    export function chooseDesktopMedia(sources: string[], callback: (streamId: string) => void): number;
-	/**
-	 * Shows desktop media picker UI with the specified set of sources.
-	 * @param sources Set of sources that should be shown to the user.
-	 * @param targetTab Optional tab for which the stream is created. If not specified then the resulting stream can be used only by the calling extension. The stream can only be used by frames in the given tab whose security origin matches tab.url.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(string streamId) {...};
-	 * Parameter streamId: An opaque string that can be passed to getUserMedia() API to generate media stream that corresponds to the source selected by the user. If user didn't select any source (i.e. canceled the prompt) then the callback is called with an empty streamId. The created streamId can be used only once and expires after a few seconds when it is not used.
-	 */
-    export function chooseDesktopMedia(sources: string[], targetTab: chrome.tabs.Tab, callback: (streamId: string) => void): number;
-	/**
-	 * Hides desktop media picker dialog shown by chooseDesktopMedia().
-	 * @param desktopMediaRequestId Id returned by chooseDesktopMedia()
-	 */
-    export function cancelChooseDesktopMedia(desktopMediaRequestId: number): void;
-}
-
-////////////////////
-// Dev Tools - Inspected Window
-////////////////////
-/**
- * Use the chrome.devtools.inspectedWindow API to interact with the inspected window: obtain the tab ID for the inspected page, evaluate the code in the context of the inspected window, reload the page, or obtain the list of resources within the page.
- * Availability: Since Chrome 18.
- */
-declare namespace chrome.devtools.inspectedWindow {
-	/** A resource within the inspected page, such as a document, a script, or an image. */
-    interface Resource {
-		/** The URL of the resource. */
-        url: string;
-		/**
-		 * Gets the content of the resource.
-		 * @param callback A function that receives resource content when the request completes.
-		 * The callback parameter should be a function that looks like this:
-		 * function(string content, string encoding) {...};
-		 * Parameter content: Content of the resource (potentially encoded).
-		 * Parameter encoding: Empty if content is not encoded, encoding name otherwise. Currently, only base64 is supported.
-		 */
-        getContent(callback: (content: string, encoding: string) => void): void;
-		/**
-		 * Sets the content of the resource.
-		 * @param content New content of the resource. Only resources with the text type are currently supported.
-		 * @param commit True if the user has finished editing the resource, and the new content of the resource should be persisted; false if this is a minor change sent in progress of the user editing the resource.
-		 * @param callback A function called upon request completion.
-		 * If you specify the callback parameter, it should be a function that looks like this:
-		 * function(object error) {...};
-		 * Optional parameter error: Set to undefined if the resource content was set successfully; describes error otherwise.
-		 */
-        setContent(content: string, commit: boolean, callback?: (error: Object) => void): void;
-    }
-
-    interface ReloadOptions {
-		/** Optional. If specified, the string will override the value of the User-Agent HTTP header that's sent while loading the resources of the inspected page. The string will also override the value of the navigator.userAgent property that's returned to any scripts that are running within the inspected page.  */
-        userAgent?: string;
-		/** Optional. When true, the loader will ignore the cache for all inspected page resources loaded before the load event is fired. The effect is similar to pressing Ctrl+Shift+R in the inspected window or within the Developer Tools window.  */
-        ignoreCache?: boolean;
-		/** Optional. If specified, the script will be injected into every frame of the inspected page immediately upon load, before any of the frame's scripts. The script will not be injected after subsequent reloads—for example, if the user presses Ctrl+R.  */
-        injectedScript?: boolean;
-		/**
-		 * Optional.
- 		 * If specified, this script evaluates into a function that accepts three string arguments: the source to preprocess, the URL of the source, and a function name if the source is an DOM event handler. The preprocessorerScript function should return a string to be compiled by Chrome in place of the input source. In the case that the source is a DOM event handler, the returned source must compile to a single JS function.
-		 * @deprecated Deprecated since Chrome 41. Please avoid using this parameter, it will be removed soon.
-		 */
-		preprocessorScript?: string;
-    }
-
-	interface EvaluationExceptionInfo {
-		/** Set if the error occurred on the DevTools side before the expression is evaluated. */
-		isError: boolean;
-		/** Set if the error occurred on the DevTools side before the expression is evaluated. */
-		code: string;
-		/** Set if the error occurred on the DevTools side before the expression is evaluated. */
-		description: string;
-		/** Set if the error occurred on the DevTools side before the expression is evaluated, contains the array of the values that may be substituted into the description string to provide more information about the cause of the error. */
-		details: any[];
-		/** Set if the evaluated code produces an unhandled exception. */
-		isException: boolean;
-		/** Set if the evaluated code produces an unhandled exception. */
-		value: string;
-    }
-
-    interface ResourceAddedEvent extends chrome.events.Event<(resource: Resource) => void> {}
-
-    interface ResourceContentCommittedEvent extends chrome.events.Event<(resource: Resource, content: string) => void> {}
-
-	/** The ID of the tab being inspected. This ID may be used with chrome.tabs.* API. */
-    var tabId: number;
-
-	/** Reloads the inspected page. */
-    export function reload(reloadOptions: ReloadOptions): void;
-	/**
-	 * Evaluates a JavaScript expression in the context of the main frame of the inspected page. The expression must evaluate to a JSON-compliant object, otherwise an exception is thrown. The eval function can report either a DevTools-side error or a JavaScript exception that occurs during evaluation. In either case, the result parameter of the callback is undefined. In the case of a DevTools-side error, the isException parameter is non-null and has isError set to true and code set to an error code. In the case of a JavaScript error, isException is set to true and value is set to the string value of thrown object.
-	 * @param expression An expression to evaluate.
-	 * @param callback A function called when evaluation completes.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(object result, object exceptionInfo) {...};
-	 * Parameter result: The result of evaluation.
-	 * Parameter exceptionInfo: An object providing details if an exception occurred while evaluating the expression.
-	 */
-    export function eval(expression: string, callback?: (result: Object, exceptionInfo: EvaluationExceptionInfo) => void): void;
-	/**
-	 * Retrieves the list of resources from the inspected page.
-	 * @param callback A function that receives the list of resources when the request completes.
-	 * The callback parameter should be a function that looks like this:
-	 * function(array of Resource resources) {...};
-	 */
-    export function getResources(callback: (resources: Resource[]) => void): void;
-
-	/** Fired when a new resource is added to the inspected page. */
-    var onResourceAdded: ResourceAddedEvent;
-	/** Fired when a new revision of the resource is committed (e.g. user saves an edited version of the resource in the Developer Tools). */
-    var onResourceContentCommitted: ResourceContentCommittedEvent;
-}
-
-////////////////////
-// Dev Tools - Network
-////////////////////
-/**
- * Use the chrome.devtools.network API to retrieve the information about network requests displayed by the Developer Tools in the Network panel.
- * Availability: Since Chrome 18.
- */
-declare namespace chrome.devtools.network {
-	/** Represents a network request for a document resource (script, image and so on). See HAR Specification for reference. */
-    interface Request {
-		/**
-		 * Returns content of the response body.
-		 * @param callback A function that receives the response body when the request completes.
-		 * The callback parameter should be a function that looks like this:
-		 * function(string content, string encoding) {...};
-		 * Parameter content: Content of the response body (potentially encoded).
-		 * Parameter encoding: Empty if content is not encoded, encoding name otherwise. Currently, only base64 is supported.
-		 */
-        getContent(callback: (content: string, encoding: string) => void): void;
-    }
-
-    interface RequestFinishedEvent extends chrome.events.Event<(request: Request) => void> {}
-
-    interface NavigatedEvent extends chrome.events.Event<(url: string) => void> {}
-
-	/**
-	 * Returns HAR log that contains all known network requests.
-	 * @param callback A function that receives the HAR log when the request completes.
-	 * The callback parameter should be a function that looks like this:
-	 * function(object harLog) {...};
-	 * Parameter harLog: A HAR log. See HAR specification for details.
-	 */
-    export function getHAR(callback: (harLog: Object) => void): void;
-
-	/** Fired when a network request is finished and all request data are available. */
-    var onRequestFinished: RequestFinishedEvent;
-	/** Fired when the inspected window navigates to a new page. */
-    var onNavigated: NavigatedEvent;
-}
-
-////////////////////
-// Dev Tools - Panels
-////////////////////
-/**
- * Use the chrome.devtools.panels API to integrate your extension into Developer Tools window UI: create your own panels, access existing panels, and add sidebars.
- * Availability: Since Chrome 18.
- */
-declare namespace chrome.devtools.panels {
-    interface PanelShownEvent extends chrome.events.Event<(window: chrome.windows.Window) => void> {}
-
-    interface PanelHiddenEvent extends chrome.events.Event<() => void> {}
-
-    interface PanelSearchEvent extends chrome.events.Event<(action: string, queryString?: string) => void> {}
-
-	/** Represents a panel created by extension. */
-    interface ExtensionPanel {
-		/**
-		 * Appends a button to the status bar of the panel.
-		 * @param iconPath Path to the icon of the button. The file should contain a 64x24-pixel image composed of two 32x24 icons. The left icon is used when the button is inactive; the right icon is displayed when the button is pressed.
-		 * @param tooltipText Text shown as a tooltip when user hovers the mouse over the button.
-		 * @param disabled Whether the button is disabled.
-		 */
-        createStatusBarButton(iconPath: string, tooltipText: string, disabled: boolean): Button;
-		/** Fired when the user switches to the panel. */
-        onShown: PanelShownEvent;
-		/** Fired when the user switches away from the panel. */
-        onHidden: PanelHiddenEvent;
-		/** Fired upon a search action (start of a new search, search result navigation, or search being canceled). */
-        onSearch: PanelSearchEvent;
-    }
-
-    interface ButtonClickedEvent extends chrome.events.Event<() => void> {}
-
-	/** A button created by the extension. */
-    interface Button {
-		/**
-		 * Updates the attributes of the button. If some of the arguments are omitted or null, the corresponding attributes are not updated.
-		 * @param iconPath Path to the new icon of the button.
-		 * @param tooltipText Text shown as a tooltip when user hovers the mouse over the button.
-		 * @param disabled Whether the button is disabled.
-		 */
-        update(iconPath?: string, tooltipText?: string, disabled?: boolean): void;
-		/** Fired when the button is clicked. */
-        onClicked: ButtonClickedEvent;
-    }
-
-    interface SelectionChangedEvent extends chrome.events.Event<() => void> {}
-
-	/** Represents the Elements panel. */
-    interface ElementsPanel {
-		/**
-		 * Creates a pane within panel's sidebar.
-		 * @param title Text that is displayed in sidebar caption.
-		 * @param callback A callback invoked when the sidebar is created.
-		 * If you specify the callback parameter, it should be a function that looks like this:
-		 * function( ExtensionSidebarPane result) {...};
-		 * Parameter result: An ExtensionSidebarPane object for created sidebar pane.
-		 */
-        createSidebarPane(title: string, callback?: (result: ExtensionSidebarPane) => void): void;
-		/** Fired when an object is selected in the panel. */
-        onSelectionChanged: SelectionChangedEvent;
-    }
-
-	/**
-	 * Since Chrome 41.
-	 * Represents the Sources panel.
-	 */
-	interface SourcesPanel {
-		/**
-		 * Creates a pane within panel's sidebar.
-		 * @param title Text that is displayed in sidebar caption.
-		 * @param callback A callback invoked when the sidebar is created.
-		 * If you specify the callback parameter, it should be a function that looks like this:
-		 * function( ExtensionSidebarPane result) {...};
-		 * Parameter result: An ExtensionSidebarPane object for created sidebar pane.
-		 */
-        createSidebarPane(title: string, callback?: (result: ExtensionSidebarPane) => void): void;
-		/** Fired when an object is selected in the panel. */
-        onSelectionChanged: SelectionChangedEvent;
-    }
-
-    interface ExtensionSidebarPaneShownEvent extends chrome.events.Event<(window: chrome.windows.Window) => void> {}
-
-    interface ExtensionSidebarPaneHiddenEvent extends chrome.events.Event<() => void> {}
-
-	/** A sidebar created by the extension. */
-    interface ExtensionSidebarPane {
-		/**
-		 * Sets the height of the sidebar.
-		 * @param height A CSS-like size specification, such as '100px' or '12ex'.
-		 */
-        setHeight(height: string): void;
-		/**
-		 * Sets an expression that is evaluated within the inspected page. The result is displayed in the sidebar pane.
-		 * @param expression An expression to be evaluated in context of the inspected page. JavaScript objects and DOM nodes are displayed in an expandable tree similar to the console/watch.
-		 * @param rootTitle An optional title for the root of the expression tree.
-		 * @param callback A callback invoked after the sidebar pane is updated with the expression evaluation results.
-		 * If you specify the callback parameter, it should be a function that looks like this:
-		 * function() {...};
-		 */
-        setExpression(expression: string, rootTitle?: string, callback?: () => void): void;
-		/**
-		 * Sets an expression that is evaluated within the inspected page. The result is displayed in the sidebar pane.
-		 * @param expression An expression to be evaluated in context of the inspected page. JavaScript objects and DOM nodes are displayed in an expandable tree similar to the console/watch.
-		 * @param callback A callback invoked after the sidebar pane is updated with the expression evaluation results.
-		 * If you specify the callback parameter, it should be a function that looks like this:
-		 * function() {...};
-		 */
-        setExpression(expression: string, callback?: () => void): void;
-		/**
-		 * Sets a JSON-compliant object to be displayed in the sidebar pane.
-		 * @param jsonObject An object to be displayed in context of the inspected page. Evaluated in the context of the caller (API client).
-		 * @param rootTitle An optional title for the root of the expression tree.
-		 * @param callback A callback invoked after the sidebar is updated with the object.
-		 * If you specify the callback parameter, it should be a function that looks like this:
-		 * function() {...};
-		 */
-        setObject(jsonObject: string, rootTitle?: string, callback?: () => void): void;
-		/**
-		 * Sets a JSON-compliant object to be displayed in the sidebar pane.
-		 * @param jsonObject An object to be displayed in context of the inspected page. Evaluated in the context of the caller (API client).
-		 * @param callback A callback invoked after the sidebar is updated with the object.
-		 * If you specify the callback parameter, it should be a function that looks like this:
-		 * function() {...};
-		 */
-        setObject(jsonObject: string, callback?: () => void): void;
-		/**
-		 * Sets an HTML page to be displayed in the sidebar pane.
-		 * @param path Relative path of an extension page to display within the sidebar.
-		 */
-        setPage(path: string): void;
-		/** Fired when the sidebar pane becomes visible as a result of user switching to the panel that hosts it. */
-        onShown: ExtensionSidebarPaneShownEvent;
-		/** Fired when the sidebar pane becomes hidden as a result of the user switching away from the panel that hosts the sidebar pane. */
-        onHidden: ExtensionSidebarPaneHiddenEvent;
-    }
-
-	/** Elements panel. */
-    var elements: ElementsPanel;
-	/**
-	 * Since Chrome 38.
-	 * Sources panel.
-	 */
-	var sources: SourcesPanel;
-
-	/**
-	 * Creates an extension panel.
-	 * @param title Title that is displayed next to the extension icon in the Developer Tools toolbar.
-	 * @param iconPath Path of the panel's icon relative to the extension directory.
-	 * @param pagePath Path of the panel's HTML page relative to the extension directory.
-	 * @param callback A function that is called when the panel is created.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function( ExtensionPanel panel) {...};
-	 * Parameter panel: An ExtensionPanel object representing the created panel.
-	 */
-    export function create(title: string, iconPath: string, pagePath: string, callback?: (panel: ExtensionPanel) => void): void;
-	/**
-	 * Specifies the function to be called when the user clicks a resource link in the Developer Tools window. To unset the handler, either call the method with no parameters or pass null as the parameter.
-	 * @param callback A function that is called when the user clicks on a valid resource link in Developer Tools window. Note that if the user clicks an invalid URL or an XHR, this function is not called.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function( devtools.inspectedWindow.Resource resource) {...};
-	 * Parameter resource: A devtools.inspectedWindow.Resource object for the resource that was clicked.
-	 */
-    export function setOpenResourceHandler(callback?: (resource: chrome.devtools.inspectedWindow.Resource) => void): void;
-	/**
-	 * Since Chrome 38.
-	 * Requests DevTools to open a URL in a Developer Tools panel.
-	 * @param url The URL of the resource to open.
-	 * @param lineNumber Specifies the line number to scroll to when the resource is loaded.
-	 * @param callback A function that is called when the resource has been successfully loaded.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function openResource(url: string, lineNumber: number, callback: () => void): void;
-}
-
-////////////////////
-// Document Scan
-////////////////////
-/**
- * Use the chrome.documentScan API to discover and retrieve images from attached paper document scanners.
- * Availability: Since Chrome 44.
- * Permissions:  "documentScan"
- * Important: This API works only on Chrome OS.
- */
-declare namespace chrome.documentScan {
-	interface DocumentScanOptions {
-		/** Optional. The MIME types that are accepted by the caller.  */
-		mimeTypes?: string[];
-		/** Optional. The number of scanned images allowed (defaults to 1).  */
-		maxImages?: number;
-	}
-
-	interface DocumentScanCallbackArg {
-		/** The data image URLs in a form that can be passed as the "src" value to an image tag. */
-		dataUrls: string[];
-		/** The MIME type of dataUrls. */
-		mimeType: string;
-	}
-
-	/**
-	 * Performs a document scan. On success, the PNG data will be sent to the callback.
-	 * @param options Object containing scan parameters.
-	 * @param callback Called with the result and data from the scan.
-	 * The callback parameter should be a function that looks like this:
-	 * function(object result) {...};
-	 */
-	export function scan(options: DocumentScanOptions, callback: (result: DocumentScanCallbackArg) => void): void;
-}
-
-////////////////////
-// Dev Tools - Downloads
-////////////////////
-/**
- * Use the chrome.downloads API to programmatically initiate, monitor, manipulate, and search for downloads.
- * Availability: Since Chrome 31.
- * Permissions:  "downloads"
- */
-declare namespace chrome.downloads {
-    interface HeaderNameValuePair {
-		/** Name of the HTTP header. */
-        name: string;
-		/** Value of the HTTP header. */
-        value: string;
-    }
-
-    interface DownloadOptions {
-		/** Optional. Post body.  */
-        body?: string;
-		/** Optional. Use a file-chooser to allow the user to select a filename regardless of whether filename is set or already exists.  */
-        saveAs?: boolean;
-		/** The URL to download. */
-        url: string;
-		/** Optional. A file path relative to the Downloads directory to contain the downloaded file, possibly containing subdirectories. Absolute paths, empty paths, and paths containing back-references ".." will cause an error. onDeterminingFilename allows suggesting a filename after the file's MIME type and a tentative filename have been determined.  */
-        filename?: string;
-		/** Optional. Extra HTTP headers to send with the request if the URL uses the HTTP[s] protocol. Each header is represented as a dictionary containing the keys name and either value or binaryValue, restricted to those allowed by XMLHttpRequest.  */
-        headers?: HeaderNameValuePair[];
-		/** Optional. The HTTP method to use if the URL uses the HTTP[S] protocol.  */
-        method?: string;
-		/** Optional. The action to take if filename already exists.  */
-		conflictAction?: string;
-    }
-
-    interface DownloadDelta {
-		/** Optional. The change in danger, if any.  */
-		danger?: StringDelta;
-		/** Optional. The change in url, if any.  */
-		url?: StringDelta;
-		/** Optional. The change in totalBytes, if any.  */
-		totalBytes?: DoubleDelta;
-		/** Optional. The change in filename, if any.  */
-		filename?: StringDelta;
-		/** Optional. The change in paused, if any.  */
-		paused?: BooleanDelta;
-		/** Optional. The change in state, if any.  */
-		state?: StringDelta;
-		/** Optional. The change in mime, if any.  */
-		mime?: StringDelta;
-		/** Optional. The change in fileSize, if any.  */
-		fileSize?: DoubleDelta;
-		/** Optional. The change in startTime, if any.  */
-		startTime?: DoubleDelta;
-		/** Optional. The change in error, if any.  */
-		error?: StringDelta;
-		/** Optional. The change in endTime, if any.  */
-		endTime?: DoubleDelta;
-		/** The id of the DownloadItem that changed. */
-        id: number;
-		/** Optional. The change in canResume, if any.  */
-		canResume?: BooleanDelta;
-		/** Optional. The change in exists, if any.  */
-		exists?: BooleanDelta;
-    }
-
-    interface BooleanDelta {
-        current?: boolean;
-        previous?: boolean;
-    }
-
-	/** Since Chrome 34. */
-    interface DoubleDelta {
-        current?: number;
-        previous?: number;
-    }
-
-    interface StringDelta {
-        current?: string;
-        previous?: string;
-    }
-
-    interface DownloadItem {
-		/** Number of bytes received so far from the host, without considering file compression. */
-        bytesReceived: number;
-		/** Indication of whether this download is thought to be safe or known to be suspicious. */
-        danger: string;
-		/** Absolute URL. */
-        url: string;
-		/** Number of bytes in the whole file, without considering file compression, or -1 if unknown. */
-        totalBytes: number;
-		/** Absolute local path. */
-        filename: string;
-		/** True if the download has stopped reading data from the host, but kept the connection open. */
-        paused: boolean;
-		/** Indicates whether the download is progressing, interrupted, or complete. */
-        state: string;
-		/** The file's MIME type. */
-        mime: string;
-		/** Number of bytes in the whole file post-decompression, or -1 if unknown. */
-        fileSize: number;
-		/** The time when the download began in ISO 8601 format. May be passed directly to the Date constructor: chrome.downloads.search({}, function(items){items.forEach(function(item){console.log(new Date(item.startTime))})}) */
-        startTime: string;
-		/** Optional. Why the download was interrupted. Several kinds of HTTP errors may be grouped under one of the errors beginning with SERVER_. Errors relating to the network begin with NETWORK_, errors relating to the process of writing the file to the file system begin with FILE_, and interruptions initiated by the user begin with USER_.  */
-		error?: string;
-		/** Optional. The time when the download ended in ISO 8601 format. May be passed directly to the Date constructor: chrome.downloads.search({}, function(items){items.forEach(function(item){if (item.endTime) console.log(new Date(item.endTime))})})  */
-		endTime?: string;
-		/** An identifier that is persistent across browser sessions. */
-        id: number;
-		/** False if this download is recorded in the history, true if it is not recorded. */
-        incognito: boolean;
-		/** Absolute URL. */
-		referrer: string;
-		/** Optional. Estimated time when the download will complete in ISO 8601 format. May be passed directly to the Date constructor: chrome.downloads.search({}, function(items){items.forEach(function(item){if (item.estimatedEndTime) console.log(new Date(item.estimatedEndTime))})})  */
-		estimatedEndTime?: string;
-		/** True if the download is in progress and paused, or else if it is interrupted and can be resumed starting from where it was interrupted. */
-		canResume: boolean;
-		/** Whether the downloaded file still exists. This information may be out of date because Chrome does not automatically watch for file removal. Call search() in order to trigger the check for file existence. When the existence check completes, if the file has been deleted, then an onChanged event will fire. Note that search() does not wait for the existence check to finish before returning, so results from search() may not accurately reflect the file system. Also, search() may be called as often as necessary, but will not check for file existence any more frequently than once every 10 seconds. */
-		exists: boolean;
-		/** Optional. The identifier for the extension that initiated this download if this download was initiated by an extension. Does not change once it is set.  */
-		byExtensionId?: string;
-		/** Optional. The localized name of the extension that initiated this download if this download was initiated by an extension. May change if the extension changes its name or if the user changes their locale.  */
-		byExtensionName?: string;
-    }
-
-    interface GetFileIconOptions {
-		/** Optional. * The size of the returned icon. The icon will be square with dimensions size * size pixels. The default and largest size for the icon is 32x32 pixels. The only supported sizes are 16 and 32. It is an error to specify any other size.
- */
-        size?: number;
-    }
-
-    interface DownloadQuery {
-		/** Optional. Set elements of this array to DownloadItem properties in order to sort search results. For example, setting orderBy=['startTime'] sorts the DownloadItem by their start time in ascending order. To specify descending order, prefix with a hyphen: '-startTime'.  */
-		orderBy?: string[];
-		/** Optional. Limits results to DownloadItem whose url matches the given regular expression.  */
-        urlRegex?: string;
-		/** Optional. Limits results to DownloadItem that ended before the given ms since the epoch.  */
-        endedBefore?: number;
-		/** Optional. Limits results to DownloadItem whose totalBytes is greater than the given integer.  */
-        totalBytesGreater?: number;
-		/** Optional. Indication of whether this download is thought to be safe or known to be suspicious.  */
-        danger?: string;
-		/** Optional. Number of bytes in the whole file, without considering file compression, or -1 if unknown.  */
-        totalBytes?: number;
-		/** Optional. True if the download has stopped reading data from the host, but kept the connection open.  */
-        paused?: boolean;
-		/** Optional. Limits results to DownloadItem whose filename matches the given regular expression.  */
-        filenameRegex?: string;
-		/** Optional. This array of search terms limits results to DownloadItem whose filename or url contain all of the search terms that do not begin with a dash '-' and none of the search terms that do begin with a dash.  */
-		query?: string[];
-		/** Optional. Limits results to DownloadItem whose totalBytes is less than the given integer.  */
-        totalBytesLess?: number;
-		/** Optional. The id of the DownloadItem to query.  */
-        id?: number;
-		/** Optional. Number of bytes received so far from the host, without considering file compression.  */
-        bytesReceived?: number;
-		/** Optional. Limits results to DownloadItem that ended after the given ms since the epoch.  */
-        endedAfter?: number;
-		/** Optional. Absolute local path.  */
-        filename?: string;
-		/** Optional. Indicates whether the download is progressing, interrupted, or complete.  */
-        state?: string;
-		/** Optional. Limits results to DownloadItem that started after the given ms since the epoch.  */
-        startedAfter?: number;
-		/** Optional. The file's MIME type.  */
-        mime?: string;
-		/** Optional. Number of bytes in the whole file post-decompression, or -1 if unknown.  */
-        fileSize?: number;
-		/** Optional. The time when the download began in ISO 8601 format.  */
-        startTime?: number;
-		/** Optional. Absolute URL.  */
-        url?: string;
-		/** Optional. Limits results to DownloadItem that started before the given ms since the epoch.  */
-        startedBefore?: number;
-		/** Optional. The maximum number of matching DownloadItem returned. Defaults to 1000. Set to 0 in order to return all matching DownloadItem. See search for how to page through results.  */
-        limit?: number;
-		/** Optional. Why a download was interrupted.  */
-        error?: number;
-		/** Optional. The time when the download ended in ISO 8601 format.  */
-        endTime?: number;
-		/** Optional. Whether the downloaded file exists;  */
-		exists?: boolean;
-    }
-
-	interface DownloadFilenameSuggestion {
-		/** The DownloadItem's new target DownloadItem.filename, as a path relative to the user's default Downloads directory, possibly containing subdirectories. Absolute paths, empty paths, and paths containing back-references ".." will be ignored. */
-		filename: string;
-		/** Optional. The action to take if filename already exists.  */
-		conflictAction?: string;
-	}
-
-    interface DownloadChangedEvent extends chrome.events.Event<(downloadDelta: DownloadDelta) => void> {}
-
-    interface DownloadCreatedEvent extends chrome.events.Event<(downloadItem: DownloadItem) => void> {}
-
-    interface DownloadErasedEvent extends chrome.events.Event<(downloadId: number) => void> {}
-
-	interface DownloadDeterminingFilenameEvent extends chrome.events.Event<(downloadItem: DownloadItem, suggest: (suggestion?: DownloadFilenameSuggestion) => void) => void> {}
-
-	/**
-	 * Find DownloadItem. Set query to the empty object to get all DownloadItem. To get a specific DownloadItem, set only the id field. To page through a large number of items, set orderBy: ['-startTime'], set limit to the number of items per page, and set startedAfter to the startTime of the last item from the last page.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of DownloadItem results) {...};
-	 */
-    export function search(query: DownloadQuery, callback: (results: DownloadItem[]) => void): void;
-	/**
-	 * Pause the download. If the request was successful the download is in a paused state. Otherwise runtime.lastError contains an error message. The request will fail if the download is not active.
-	 * @param downloadId The id of the download to pause.
-	 * @param callback Called when the pause request is completed.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function pause(downloadId: number, callback?: () => void): void;
-	/**
-	 * Retrieve an icon for the specified download. For new downloads, file icons are available after the onCreated event has been received. The image returned by this function while a download is in progress may be different from the image returned after the download is complete. Icon retrieval is done by querying the underlying operating system or toolkit depending on the platform. The icon that is returned will therefore depend on a number of factors including state of the download, platform, registered file types and visual theme. If a file icon cannot be determined, runtime.lastError will contain an error message.
-	 * @param downloadId The identifier for the download.
-	 * @param callback A URL to an image that represents the download.
-	 * The callback parameter should be a function that looks like this:
-	 * function(string iconURL) {...};
-	 */
-    export function getFileIcon(downloadId: number, callback: (iconURL: string) => void): void;
-	/**
-	 * Retrieve an icon for the specified download. For new downloads, file icons are available after the onCreated event has been received. The image returned by this function while a download is in progress may be different from the image returned after the download is complete. Icon retrieval is done by querying the underlying operating system or toolkit depending on the platform. The icon that is returned will therefore depend on a number of factors including state of the download, platform, registered file types and visual theme. If a file icon cannot be determined, runtime.lastError will contain an error message.
-	 * @param downloadId The identifier for the download.
-	 * @param callback A URL to an image that represents the download.
-	 * The callback parameter should be a function that looks like this:
-	 * function(string iconURL) {...};
-	 */
-    export function getFileIcon(downloadId: number, options: GetFileIconOptions, callback: (iconURL: string) => void): void;
-	/**
-	 * Resume a paused download. If the request was successful the download is in progress and unpaused. Otherwise runtime.lastError contains an error message. The request will fail if the download is not active.
-	 * @param downloadId The id of the download to resume.
-	 * @param callback  Called when the resume request is completed.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function resume(downloadId: number, callback?: () => void): void;
-	/**
-	 * Cancel a download. When callback is run, the download is cancelled, completed, interrupted or doesn't exist anymore.
-	 * @param downloadId The id of the download to cancel.
-	 * @param callback Called when the cancel request is completed.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function cancel(downloadId: number, callback?: () => void): void;
-	/**
-	 * Download a URL. If the URL uses the HTTP[S] protocol, then the request will include all cookies currently set for its hostname. If both filename and saveAs are specified, then the Save As dialog will be displayed, pre-populated with the specified filename. If the download started successfully, callback will be called with the new DownloadItem's downloadId. If there was an error starting the download, then callback will be called with downloadId=undefined and runtime.lastError will contain a descriptive string. The error strings are not guaranteed to remain backwards compatible between releases. Extensions must not parse it.
-	 * @param options What to download and how.
-	 * @param callback Called with the id of the new DownloadItem.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(integer downloadId) {...};
-	 */
-    export function download(options: DownloadOptions, callback?: (downloadId: number) => void): void;
-	/**
-	 * Open the downloaded file now if the DownloadItem is complete; otherwise returns an error through runtime.lastError. Requires the "downloads.open" permission in addition to the "downloads" permission. An onChanged event will fire when the item is opened for the first time.
-	 * @param downloadId The identifier for the downloaded file.
-	 */
-    export function open(downloadId: number): void;
-	/**
-	 * Show the downloaded file in its folder in a file manager.
-	 * @param downloadId The identifier for the downloaded file.
-	 */
-    export function show(downloadId: number): void;
-	/** Show the default Downloads folder in a file manager. */
-    export function showDefaultFolder(): void;
-	/**
-	 * Erase matching DownloadItem from history without deleting the downloaded file. An onErased event will fire for each DownloadItem that matches query, then callback will be called.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(array of integer erasedIds) {...};
-	 */
-    export function erase(query: DownloadQuery, callback: (erasedIds: number[]) => void): void;
-	/**
-	 * Remove the downloaded file if it exists and the DownloadItem is complete; otherwise return an error through runtime.lastError.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function removeFile(downloadId: number, callback?: () => void): void;
-	/**
-	 * Prompt the user to accept a dangerous download. Can only be called from a visible context (tab, window, or page/browser action popup). Does not automatically accept dangerous downloads. If the download is accepted, then an onChanged event will fire, otherwise nothing will happen. When all the data is fetched into a temporary file and either the download is not dangerous or the danger has been accepted, then the temporary file is renamed to the target filename, the |state| changes to 'complete', and onChanged fires.
-	 * @param downloadId The identifier for the DownloadItem.
-	 * @param callback Called when the danger prompt dialog closes.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function acceptDanger(downloadId: number, callback: () => void): void;
-	/** Initiate dragging the downloaded file to another application. Call in a javascript ondragstart handler. */
-    export function drag(downloadId: number): void;
-	/** Enable or disable the gray shelf at the bottom of every window associated with the current browser profile. The shelf will be disabled as long as at least one extension has disabled it. Enabling the shelf while at least one other extension has disabled it will return an error through runtime.lastError. Requires the "downloads.shelf" permission in addition to the "downloads" permission. */
-    export function setShelfEnabled(enabled: boolean): void;
-
-	/** When any of a DownloadItem's properties except bytesReceived and estimatedEndTime changes, this event fires with the downloadId and an object containing the properties that changed. */
-    var onChanged: DownloadChangedEvent;
-	/** This event fires with the DownloadItem object when a download begins. */
-    var onCreated: DownloadCreatedEvent;
-	/** Fires with the downloadId when a download is erased from history. */
-    var onErased: DownloadErasedEvent;
-	/** During the filename determination process, extensions will be given the opportunity to override the target DownloadItem.filename. Each extension may not register more than one listener for this event. Each listener must call suggest exactly once, either synchronously or asynchronously. If the listener calls suggest asynchronously, then it must return true. If the listener neither calls suggest synchronously nor returns true, then suggest will be called automatically. The DownloadItem will not complete until all listeners have called suggest. Listeners may call suggest without any arguments in order to allow the download to use downloadItem.filename for its filename, or pass a suggestion object to suggest in order to override the target filename. If more than one extension overrides the filename, then the last extension installed whose listener passes a suggestion object to suggest wins. In order to avoid confusion regarding which extension will win, users should not install extensions that may conflict. If the download is initiated by download and the target filename is known before the MIME type and tentative filename have been determined, pass filename to download instead. */
-	var onDeterminingFilename: DownloadDeterminingFilenameEvent;
-}
-
-////////////////////
-// Enterprise Platform Keys
-////////////////////
-/**
- * Use the chrome.enterprise.platformKeys API to generate hardware-backed keys and to install certificates for these keys. The certificates will be managed by the platform and can be used for TLS authentication, network access or by other extension through chrome.platformKeys.
- * Availability: Since Chrome 37.
- * Permissions:  "enterprise.platformKeys"
- * Important: This API works only on Chrome OS.
- * Note:  This API is only for extensions pre-installed by policy.
- */
-declare namespace chrome.enterprise.platformKeys {
-	interface Token {
-		/**
-		 * Uniquely identifies this Token.
-		 * Static IDs are "user" and "system", referring to the platform's user-specific and the system-wide hardware token, respectively. Any other tokens (with other identifiers) might be returned by enterprise.platformKeys.getTokens.
-		 */
-		id: string;
-		/**
-		 * Implements the WebCrypto's SubtleCrypto interface. The cryptographic operations, including key generation, are hardware-backed.
-		 * Only non-extractable RSASSA-PKCS1-V1_5 keys with modulusLength up to 2048 can be generated. Each key can be used for signing data at most once.
-		 * Keys generated on a specific Token cannot be used with any other Tokens, nor can they be used with window.crypto.subtle. Equally, Key objects created with window.crypto.subtle cannot be used with this interface.
-		 */
-		subtleCrypto: SubtleCrypto;
-	}
-
-	/**
-	 * Returns the available Tokens. In a regular user's session the list will always contain the user's token with id "user". If a system-wide TPM token is available, the returned list will also contain the system-wide token with id "system". The system-wide token will be the same for all sessions on this device (device in the sense of e.g. a Chromebook).
-	 * @param callback Invoked by getTokens with the list of available Tokens.
-	 * The callback parameter should be a function that looks like this:
-	 * function(array of Token tokens) {...};
-	 * Parameter tokens: The list of available tokens.
-	 */
-	export function getToken(callback: (tokens: Token[]) => void): void;
-	/**
-	 * Returns the list of all client certificates available from the given token. Can be used to check for the existence and expiration of client certificates that are usable for a certain authentication.
-	 * @param tokenId The id of a Token returned by getTokens.
-	 * @param callback Called back with the list of the available certificates.
-	 * The callback parameter should be a function that looks like this:
-	 * function(array of ArrayBuffer certificates) {...};
-	 * Parameter certificates: The list of certificates, each in DER encoding of a X.509 certificate.
-	 */
-	export function getCertificates(tokenId: string, callback: (certificates: ArrayBuffer) => void): void;
-	/**
-	 * Imports certificate to the given token if the certified key is already stored in this token. After a successful certification request, this function should be used to store the obtained certificate and to make it available to the operating system and browser for authentication.
-	 * @param tokenId The id of a Token returned by getTokens.
-	 * @param certificate The DER encoding of a X.509 certificate.
-	 * @param callback Called back when this operation is finished.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function importCertificate(tokenId: string, certificate: ArrayBuffer, callback?: () => void): void;
-	/**
-	 * Removes certificate from the given token if present. Should be used to remove obsolete certificates so that they are not considered during authentication and do not clutter the certificate choice. Should be used to free storage in the certificate store.
-	 * @param tokenId The id of a Token returned by getTokens.
-	 * @param certificate The DER encoding of a X.509 certificate.
-	 * @param callback Called back when this operation is finished.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function removeCertificate(tokenId: string, certificate: ArrayBuffer, callback?: () => void): void;
-}
-
-////////////////////
-// Events
-////////////////////
-/**
- * The chrome.events namespace contains common types used by APIs dispatching events to notify you when something interesting happens.
- * Availability: Since Chrome 21.
- */
-declare namespace chrome.events {
-	/** Filters URLs for various criteria. See event filtering. All criteria are case sensitive. */
-    interface UrlFilter {
-		/** Optional. Matches if the scheme of the URL is equal to any of the schemes specified in the array.  */
-        schemes?: string[];
-		/**
-		 * Optional.
- 		 * Since Chrome 23.
-		 * Matches if the URL (without fragment identifier) matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
-		 */
-        urlMatches?: string;
-		/** Optional. Matches if the path segment of the URL contains a specified string.  */
-        pathContains?: string;
-		/** Optional. Matches if the host name of the URL ends with a specified string.  */
-        hostSuffix?: string;
-		/** Optional. Matches if the host name of the URL starts with a specified string.  */
-        hostPrefix?: string;
-		/** Optional. Matches if the host name of the URL contains a specified string. To test whether a host name component has a prefix 'foo', use hostContains: '.foo'. This matches 'www.foobar.com' and 'foo.com', because an implicit dot is added at the beginning of the host name. Similarly, hostContains can be used to match against component suffix ('foo.') and to exactly match against components ('.foo.'). Suffix- and exact-matching for the last components need to be done separately using hostSuffix, because no implicit dot is added at the end of the host name.  */
-        hostContains?: string;
-		/** Optional. Matches if the URL (without fragment identifier) contains a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-        urlContains?: string;
-		/** Optional. Matches if the query segment of the URL ends with a specified string.  */
-        querySuffix?: string;
-		/** Optional. Matches if the URL (without fragment identifier) starts with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-        urlPrefix?: string;
-		/** Optional. Matches if the host name of the URL is equal to a specified string.  */
-        hostEquals?: string;
-		/** Optional. Matches if the URL (without fragment identifier) is equal to a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-        urlEquals?: string;
-		/** Optional. Matches if the query segment of the URL contains a specified string.  */
-        queryContains?: string;
-		/** Optional. Matches if the path segment of the URL starts with a specified string.  */
-        pathPrefix?: string;
-		/** Optional. Matches if the path segment of the URL is equal to a specified string.  */
-        pathEquals?: string;
-		/** Optional. Matches if the path segment of the URL ends with a specified string.  */
-        pathSuffix?: string;
-		/** Optional. Matches if the query segment of the URL is equal to a specified string.  */
-        queryEquals?: string;
-		/** Optional. Matches if the query segment of the URL starts with a specified string.  */
-        queryPrefix?: string;
-		/** Optional. Matches if the URL (without fragment identifier) ends with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-        urlSuffix?: string;
-		/** Optional. Matches if the port of the URL is contained in any of the specified port lists. For example [80, 443, [1000, 1200]] matches all requests on port 80, 443 and in the range 1000-1200.  */
-        ports?: any[];
-		/**
-		 * Optional.
- 		 * Since Chrome 28.
-		 * Matches if the URL without query segment and fragment identifier matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
-		 */
-		originAndPathMatches?: string;
-    }
-
-	/** An object which allows the addition and removal of listeners for a Chrome event. */
-    interface Event<T extends Function> {
-		/**
-		 * Registers an event listener callback to an event.
-		 * @param callback Called when an event occurs. The parameters of this function depend on the type of event.
-		 * The callback parameter should be a function that looks like this:
-		 * function() {...};
-		 */
-        addListener(callback: T): void;
-		/**
-		 * Returns currently registered rules.
-		 * @param callback Called with registered rules.
-		 * The callback parameter should be a function that looks like this:
-		 * function(array of Rule rules) {...};
-		 * Parameter rules: Rules that were registered, the optional parameters are filled with values.
-		 */
-        getRules(callback: (rules: Rule[]) => void): void;
-		/**
-		 * Returns currently registered rules.
-		 * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are returned.
-		 * @param callback Called with registered rules.
-		 * The callback parameter should be a function that looks like this:
-		 * function(array of Rule rules) {...};
-		 * Parameter rules: Rules that were registered, the optional parameters are filled with values.
-		 */
-        getRules(ruleIdentifiers: string[], callback: (rules: Rule[]) => void): void;
-        /**
-		 * @param callback Listener whose registration status shall be tested.
-		 */
-        hasListener(callback: T): boolean;
-		/**
-		 * Unregisters currently registered rules.
-		 * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are unregistered.
-		 * @param callback Called when rules were unregistered.
-		 * If you specify the callback parameter, it should be a function that looks like this:
-		 * function() {...};
-		 */
-        removeRules(ruleIdentifiers?: string[], callback?: () => void): void;
-		/**
-		 * Unregisters currently registered rules.
-		 * @param callback Called when rules were unregistered.
-		 * If you specify the callback parameter, it should be a function that looks like this:
-		 * function() {...};
-		 */
-        removeRules(callback?: () => void): void;
-		/**
-		 * Registers rules to handle events.
-		 * @param rules Rules to be registered. These do not replace previously registered rules.
-		 * @param callback Called with registered rules.
-		 * If you specify the callback parameter, it should be a function that looks like this:
-		 * function(array of Rule rules) {...};
-		 * Parameter rules: Rules that were registered, the optional parameters are filled with values.
-		 */
-        addRules(rules: Rule[], callback?: (rules: Rule[]) => void): void;
-		/**
-		 * Deregisters an event listener callback from an event.
-		 * @param callback Listener that shall be unregistered.
-		 * The callback parameter should be a function that looks like this:
-		 * function() {...};
-		 */
-        removeListener(callback: T): void;
-        hasListeners(): boolean;
-    }
-
-	/** Description of a declarative rule for handling events. */
-    interface Rule {
-		/** Optional. Optional priority of this rule. Defaults to 100.  */
-        priority?: number;
-		/** List of conditions that can trigger the actions. */
-        conditions: any[];
-		/** Optional. Optional identifier that allows referencing this rule.  */
-        id?: string;
-		/** List of actions that are triggered if one of the condtions is fulfilled. */
-        actions: any[];
-		/**
-		 * Optional.
- 		 * Since Chrome 28.
-		 * Tags can be used to annotate rules and perform operations on sets of rules.
-		 */
-		tags?: string[];
-    }
-}
-
-////////////////////
-// Extension
-////////////////////
-/**
- * The chrome.extension API has utilities that can be used by any extension page. It includes support for exchanging messages between an extension and its content scripts or between extensions, as described in detail in Message Passing.
- * Availability: Since Chrome 5.
- */
-declare namespace chrome.extension {
-    interface FetchProperties {
-		/** Optional. The window to restrict the search to. If omitted, returns all views.  */
-        windowId?: number;
-		/** Optional. The type of view to get. If omitted, returns all views (including background pages and tabs). Valid values: 'tab', 'notification', 'popup'.  */
-        type?: string;
-    }
-
-    interface LastError {
-		/** Description of the error that has taken place. */
-        message: string;
-    }
-
-	interface OnRequestEvent extends chrome.events.Event<((request: any, sender: runtime.MessageSender, sendResponse: (response: any) => void) => void) | ((sender: runtime.MessageSender, sendResponse: (response: any) => void) => void)> {}
-
-	/**
-	 * Since Chrome 7.
-	 * True for content scripts running inside incognito tabs, and for extension pages running inside an incognito process. The latter only applies to extensions with 'split' incognito_behavior.
-	 */
-    var inIncognitoContext: boolean;
-	/** Set for the lifetime of a callback if an ansychronous extension api has resulted in an error. If no error has occured lastError will be undefined. */
-    var lastError: LastError;
-
-	/** Returns the JavaScript 'window' object for the background page running inside the current extension. Returns null if the extension has no background page. */
-    export function getBackgroundPage(): Window;
-	/**
-	 * Converts a relative path within an extension install directory to a fully-qualified URL.
-	 * @param path A path to a resource within an extension expressed relative to its install directory.
-	 */
-    export function getURL(path: string): string;
-	/**
-	 * Sets the value of the ap CGI parameter used in the extension's update URL. This value is ignored for extensions that are hosted in the Chrome Extension Gallery.
-	 * Since Chrome 9.
-	 */
-    export function setUpdateUrlData(data: string): void;
-	/** Returns an array of the JavaScript 'window' objects for each of the pages running inside the current extension. */
-    export function getViews(fetchProperties?: FetchProperties): Window[];
-	/**
-	 * Retrieves the state of the extension's access to the 'file://' scheme (as determined by the user-controlled 'Allow access to File URLs' checkbox.
-	 * Since Chrome 12.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(boolean isAllowedAccess) {...};
-	 * Parameter isAllowedAccess: True if the extension can access the 'file://' scheme, false otherwise.
-	 */
-    export function isAllowedFileSchemeAccess(callback: (isAllowedAccess: boolean) => void): void;
-	/**
-	 * Retrieves the state of the extension's access to Incognito-mode (as determined by the user-controlled 'Allowed in Incognito' checkbox.
-	 * Since Chrome 12.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(boolean isAllowedAccess) {...};
-	 * Parameter isAllowedAccess: True if the extension has access to Incognito mode, false otherwise.
-	 */
-    export function isAllowedIncognitoAccess(callback: (isAllowedAccess: boolean) => void): void;
-	/**
-	 * Sends a single request to other listeners within the extension. Similar to runtime.connect, but only sends a single request with an optional response. The extension.onRequest event is fired in each page of the extension.
-	 * @deprecated Deprecated since Chrome 33. Please use runtime.sendMessage.
-	 * @param extensionId The extension ID of the extension you want to connect to. If omitted, default is your own extension.
-	 * @param responseCallback If you specify the responseCallback parameter, it should be a function that looks like this:
-	 * function(any response) {...};
-	 * Parameter response: The JSON response object sent by the handler of the request. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-	 */
-	export function sendRequest(extensionId: string, request: any, responseCallback?: (response: any) => void): void;
-	/**
-	 * Sends a single request to other listeners within the extension. Similar to runtime.connect, but only sends a single request with an optional response. The extension.onRequest event is fired in each page of the extension.
-	 * @deprecated Deprecated since Chrome 33. Please use runtime.sendMessage.
-	 * @param responseCallback If you specify the responseCallback parameter, it should be a function that looks like this:
-	 * function(any response) {...};
-	 * Parameter response: The JSON response object sent by the handler of the request. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-	 */
-	export function sendRequest(request: any, responseCallback?: (response: any) => void): void;
-	/**
-	 * Returns an array of the JavaScript 'window' objects for each of the tabs running inside the current extension. If windowId is specified, returns only the 'window' objects of tabs attached to the specified window.
-	 * @deprecated Deprecated since Chrome 33. Please use extension.getViews {type: "tab"}.
-	 */
-	export function getExtensionTabs(windowId?: number): Window[];
-
-	/**
-	 * Fired when a request is sent from either an extension process or a content script.
-	 * @deprecated Deprecated since Chrome 33. Please use runtime.onMessage.
-	 */
-	var onRequest: OnRequestEvent;
-	/**
-	 * Fired when a request is sent from another extension.
-	 * @deprecated Deprecated since Chrome 33. Please use runtime.onMessageExternal.
-	 */
-	var onRequestExternal: OnRequestEvent;
-}
-
-////////////////////
-// File Browser Handler
-////////////////////
-/**
- * Use the chrome.fileBrowserHandler API to extend the Chrome OS file browser. For example, you can use this API to enable users to upload files to your website.
- * Availability: Since Chrome 12.
- * Permissions:  "fileBrowserHandler"
- * Important: This API works only on Chrome OS.
- */
-declare namespace chrome.fileBrowserHandler {
-    interface SelectionParams {
-		/**
-		 * Optional.
- 		 * List of file extensions that the selected file can have. The list is also used to specify what files to be shown in the select file dialog. Files with the listed extensions are only shown in the dialog. Extensions should not include the leading '.'. Example: ['jpg', 'png']
-		 * Since Chrome 23.
-		 */
-        allowedFileExtensions?: string[];
-		/** Suggested name for the file. */
-        suggestedName: string;
-    }
-
-    interface SelectionResult {
-		/** Optional. Selected file entry. It will be null if a file hasn't been selected.  */
-        entry?: Object;
-		/** Whether the file has been selected. */
-        success: boolean;
-    }
-
-	/** Event details payload for fileBrowserHandler.onExecute event. */
-    interface FileHandlerExecuteEventDetails {
-		/** Optional. The ID of the tab that raised this event. Tab IDs are unique within a browser session.  */
-        tab_id?: number;
-		/** Array of Entry instances representing files that are targets of this action (selected in ChromeOS file browser). */
-        entries: any[];
-    }
-
-    interface FileBrowserHandlerExecuteEvent extends chrome.events.Event<(id: string, details: FileHandlerExecuteEventDetails) => void> {}
-
-	/**
-	 * Prompts user to select file path under which file should be saved. When the file is selected, file access permission required to use the file (read, write and create) are granted to the caller. The file will not actually get created during the function call, so function caller must ensure its existence before using it. The function has to be invoked with a user gesture.
-	 * Since Chrome 21.
-	 * @param selectionParams Parameters that will be used while selecting the file.
-	 * @param callback Function called upon completion.
-	 * The callback parameter should be a function that looks like this:
-	 * function(object result) {...};
-	 * Parameter result: Result of the method.
-	 */
-	export function selectFile(selectionParams: SelectionParams, callback: (result: SelectionResult) => void): void;
-
-	/** Fired when file system action is executed from ChromeOS file browser. */
-    var onExecute: FileBrowserHandlerExecuteEvent;
-}
-
-////////////////////
-// File System Provider
-////////////////////
-/**
- * Use the chrome.fileSystemProvider API to create file systems, that can be accessible from the file manager on Chrome OS.
- * Availability: Since Chrome 40.
- * Permissions:  "fileSystemProvider"
- * Important: This API works only on Chrome OS.
- */
-declare namespace chrome.fileSystemProvider {
-	interface OpenedFileInfo {
-		/** A request ID to be be used by consecutive read/write and close requests. */
-		openRequestId: number;
-		/** The path of the opened file. */
-		filePath: string;
-		/** Whether the file was opened for reading or writing. */
-		mode: string;
-	}
-
-	interface FileWatchersInfo {
-		/** The path of the entry being observed. */
-		entryPath: string;
-		/** Whether watching should include all child entries recursively. It can be true for directories only. */
-		recursive: boolean;
-		/** Optional. Tag used by the last notification for the watcher.  */
-		lastTag?: string;
-	}
-
-	interface EntryMetadata {
-		/** True if it is a directory. */
-		isDirectory: boolean;
-		/** Name of this entry (not full path name). Must not contain '/'. For root it must be empty. */
-		name: string;
-		/** File size in bytes. */
-		size: number;
-		/** The last modified time of this entry. */
-		modificationTime: Date;
-		/** Optional. Mime type for the entry.  */
-		mimeType?: string;
-		/** Optional. Thumbnail image as a data URI in either PNG, JPEG or WEBP format, at most 32 KB in size. Optional, but can be provided only when explicitly requested by the onGetMetadataRequested event.  */
-		thumbnail?: string;
-	}
-
-	interface FileSystemInfo {
-		/** The identifier of the file system. */
-		fileSystemId: string;
-		/** A human-readable name for the file system. */
-		displayName: string;
-		/** Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files). */
-		writable: boolean;
-		/**
-		 * The maximum number of files that can be opened at once. If 0, then not limited.
-		 * @since Since Chrome 42.
-		 */
-		openedFilesLimit: number;
-		/**
-		 * List of currently opened files.
-		 * @since Since Chrome 42.
-		 */
-		openedFiles: OpenedFileInfo[];
-		/**
-		 * Optional.
- 		 * Whether the file system supports the tag field for observing directories.
-		 * @since Since Chrome 45. Warning: this is the current Beta channel.
-		 */
-		supportsNotifyTag?: boolean;
-		/**
-		 * List of watchers.
-		 * @since Since Chrome 45. Warning: this is the current Beta channel.
-		 */
-		watchers: FileWatchersInfo[];
-	}
-
-	/** @since Since Chrome 45. Warning: this is the current Beta channel. */
-	interface GetActionsRequestedOptions {
-		/** The identifier of the file system related to this operation. */
-		fileSystemId: string;
-		/** The unique identifier of this request. */
-		requestId: number;
-		/** The path of the entry to return the list of actions for. */
-		entryPath: string;
-	}
-
-	/** @since Since Chrome 45. Warning: this is the current Beta channel. */
-	interface Action {
-		/** The identifier of the action. Any string or CommonActionId for common actions. */
-		id: string;
-		/** Optional. The title of the action. It may be ignored for common actions.  */
-		title?: string;
-	}
-
-	/** @since Since Chrome 45. Warning: this is the current Beta channel. */
-	interface ExecuteActionRequestedOptions {
-		/** The identifier of the file system related to this operation. */
-		fileSystemId: string;
-		/** The unique identifier of this request. */
-		requestId: number;
-		/** The path of the entry to be used for the action. */
-		entryPath: string;
-		/** The identifier of the action to be executed. */
-		actionId: string;
-	}
-
-	interface MountOptions {
-		/** The string indentifier of the file system. Must be unique per each extension. */
-		fileSystemId: string;
-		/** A human-readable name for the file system. */
-		displayName: string;
-		/** Optional. Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files).  */
-		writable?: boolean;
-		/**
-		 * Optional.
- 		 * The maximum number of files that can be opened at once. If not specified, or 0, then not limited.
-		 * @since Since Chrome 41.
-		 */
-		openedFilesLimit?: number;
-		/**
-		 * Optional.
- 		 * Whether the file system supports the tag field for observed directories.
-		 * @since Since Chrome 45. Warning: this is the current Beta channel.
-		 */
-		supportsNotifyTag?: boolean;
-	}
-
-	interface UnmountOptions {
-		/** The identifier of the file system to be unmounted. */
-		fileSystemId: string;
-	}
-
-	interface NotificationChange {
-		/** The path of the changed entry. */
-		entryPath: string;
-		/** The type of the change which happened to the entry. */
-		changeType: string;
-	}
-
-	interface NotificationOptions {
-		/** The identifier of the file system related to this change. */
-		fileSystemId: string;
-		/** The path of the observed entry. */
-		observedPath: string;
-		/** Mode of the observed entry. */
-		recursive: boolean;
-		/** The type of the change which happened to the observed entry. If it is DELETED, then the observed entry will be automatically removed from the list of observed entries. */
-		changeType: string;
-		/** Optional. List of changes to entries within the observed directory (including the entry itself)  */
-		changes?: NotificationChange[];
-		/** Optional. Tag for the notification. Required if the file system was mounted with the supportsNotifyTag option. Note, that this flag is necessary to provide notifications about changes which changed even when the system was shutdown.  */
-		tag?: string;
-	}
-
-	interface RequestedEventOptions {
-		/** The identifier of the file system related to this operation. */
-		fileSystemId: string;
-		/** The unique identifier of this request. */
-		requestId: number;
-	}
-
-	interface EntryPathRequestedEventOptions extends RequestedEventOptions {
-		/** The path of the entry to which this operation is related to. */
-		entryPath: string;
-	}
-
-	interface MetadataRequestedEventOptions extends EntryPathRequestedEventOptions {
-		/** Set to true if the thumbnail is requested. */
-		thumbnail: boolean;
-	}
-
-	interface DirectoryPathRequestedEventOptions extends RequestedEventOptions {
-		/** The path of the directory which is to be operated on. */
-		directoryPath: string;
-	}
-
-	interface FilePathRequestedEventOptions extends RequestedEventOptions {
-		/** The path of the entry for the operation */
-		filePath: string;
-	}
-
-	interface OpenFileRequestedEventOptions extends FilePathRequestedEventOptions {
-		/** Whether the file will be used for reading or writing. */
-		mode: string;
-	}
-
-	interface OpenedFileRequestedEventOptions extends RequestedEventOptions {
-		/** A request ID used to open the file. */
-		openRequestId: number;
-	}
-
-	interface OpenedFileOffsetRequestedEventOptions extends OpenedFileRequestedEventOptions {
-		/** Position in the file (in bytes) to start reading from. */
-		offset: number;
-		/** Number of bytes to be returned. */
-		length: number;
-	}
-
-	interface DirectoryPathRecursiveRequestedEventOptions extends DirectoryPathRequestedEventOptions {
-		/** Whether the operation is recursive (for directories only). */
-		recursive: boolean;
-	}
-
-	interface EntryPathRecursiveRequestedEventOptions extends EntryPathRequestedEventOptions {
-		/** Whether the operation is recursive (for directories only). */
-		recursive: boolean;
-	}
-
-	interface SourceTargetPathRequestedEventOptions extends RequestedEventOptions {
-		/** The source path for the operation. */
-		sourcePath: string;
-		/** The destination path for the operation. */
-		targetPath: string;
-	}
-
-	interface FilePathLengthRequestedEventOptions extends FilePathRequestedEventOptions {
-		/** Number of bytes to be retained after the operation completes. */
-		length: number;
-	}
-
-	interface OpenedFileIoRequestedEventOptions extends OpenedFileRequestedEventOptions {
-		/** Position in the file (in bytes) to start operating from. */
-		offset: number;
-		/** Buffer of bytes to be operated on the file. */
-		data: ArrayBuffer;
-	}
-
-	interface OperationRequestedEventOptions extends RequestedEventOptions {
-		/** An ID of the request to which this operation is related. */
-		operationRequestId: number;
-	}
-
-	interface RequestedEvent extends chrome.events.Event<(options: RequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
-
-	interface MetadataRequestedEvent extends chrome.events.Event<(options: MetadataRequestedEventOptions, successCallback: (metadata: EntryMetadata) => void, errorCallback: (error: string) => void) => void> {}
-
-	interface DirectoryPathRequestedEvent extends chrome.events.Event<(options: DirectoryPathRequestedEventOptions, successCallback: (entries: EntryMetadata[], hasMore: boolean) => void, errorCallback: (error: string) => void) => void> {}
-
-	interface OpenFileRequestedEvent extends chrome.events.Event<(options: OpenFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
-
-	interface OpenedFileRequestedEvent extends chrome.events.Event<(options: OpenedFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
-
-	interface OpenedFileOffsetRequestedEvent extends chrome.events.Event<(options: OpenedFileOffsetRequestedEventOptions, successCallback: (data: ArrayBuffer, hasMore: boolean) => void, errorCallback: (error: string) => void) => void> {}
-
-	interface DirectoryPathRecursiveRequestedEvent extends chrome.events.Event<(options: DirectoryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
-
-	interface EntryPathRecursiveRequestedEvent extends chrome.events.Event<(options: EntryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
-
-	interface FilePathRequestedEvent extends chrome.events.Event<(options: FilePathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
-
-	interface SourceTargetPathRequestedEvent extends chrome.events.Event<(options: SourceTargetPathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
-
-	interface FilePathLengthRequestedEvent extends chrome.events.Event<(options: FilePathLengthRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
-
-	interface OpenedFileIoRequestedEvent extends chrome.events.Event<(options: OpenedFileIoRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
-
-	interface OperationRequestedEvent extends chrome.events.Event<(options: OperationRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
-
-	interface OptionlessRequestedEvent extends chrome.events.Event<(successCallback: Function, errorCallback: (error: string) => void) => void> {}
-
-	/**
-	 * Mounts a file system with the given fileSystemId and displayName. displayName will be shown in the left panel of Files.app. displayName can contain any characters including '/', but cannot be an empty string. displayName must be descriptive but doesn't have to be unique. The fileSystemId must not be an empty string.
-	 * Depending on the type of the file system being mounted, the source option must be set appropriately.
-	 * In case of an error, runtime.lastError will be set with a corresponding error code.
-	 * @param callback A generic result callback to indicate success or failure.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function mount(options: MountOptions, callback?: () => void): void;
-	/**
-	 * Unmounts a file system with the given fileSystemId. It must be called after onUnmountRequested is invoked. Also, the providing extension can decide to perform unmounting if not requested (eg. in case of lost connection, or a file error).
-	 * In case of an error, runtime.lastError will be set with a corresponding error code.
-	 * @param callback A generic result callback to indicate success or failure.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function unmount(options: UnmountOptions, callback?: () => void): void;
-	/**
-	 * Returns all file systems mounted by the extension.
-	 * @param callback Callback to receive the result of getAll function.
-	 * The callback parameter should be a function that looks like this:
-	 * function(array of FileSystemInfo fileSystems) {...};
-	 */
-	export function getAll(callback: (fileSystems: FileSystemInfo[]) => void): void;
-	/**
-	 * Returns information about a file system with the passed fileSystemId.
-	 * @since Since Chrome 42.
-	 * @param callback Callback to receive the result of get function.
-	 * The callback parameter should be a function that looks like this:
-	 * function(FileSystemInfo fileSystem) {...};
-	 */
-	export function get(fileSystemId: string, callback: (fileSystem: FileSystemInfo) => void): void;
-	/**
-	 * Notifies about changes in the watched directory at observedPath in recursive mode. If the file system is mounted with supportsNofityTag, then tag must be provided, and all changes since the last notification always reported, even if the system was shutdown. The last tag can be obtained with getAll.
-	 * To use, the file_system_provider.notify manifest option must be set to true.
-	 * Value of tag can be any string which is unique per call, so it's possible to identify the last registered notification. Eg. if the providing extension starts after a reboot, and the last registered notification's tag is equal to "123", then it should call notify for all changes which happened since the change tagged as "123". It cannot be an empty string.
-	 * Not all providers are able to provide a tag, but if the file system has a changelog, then the tag can be eg. a change number, or a revision number.
-	 * Note that if a parent directory is removed, then all descendant entries are also removed, and if they are watched, then the API must be notified about the fact. Also, if a directory is renamed, then all descendant entries are in fact removed, as there is no entry under their original paths anymore.
-	 * In case of an error, runtime.lastError will be set will a corresponding error code.
-	 * @param callback A generic result callback to indicate success or failure.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function notify(options: NotificationOptions, callback: () => void): void;
-
-	/** Raised when unmounting for the file system with the fileSystemId identifier is requested. In the response, the unmount API method must be called together with successCallback. If unmounting is not possible (eg. due to a pending operation), then errorCallback must be called.  */
-	var onUnmountRequested: RequestedEvent;
-	/** Raised when metadata of a file or a directory at entryPath is requested. The metadata must be returned with the successCallback call. In case of an error, errorCallback must be called. */
-	var onGetMetadataRequested: MetadataRequestedEvent;
-	/** Raised when contents of a directory at directoryPath are requested. The results must be returned in chunks by calling the successCallback several times. In case of an error, errorCallback must be called. */
-	var onReadDirectoryRequested: DirectoryPathRequestedEvent;
-	/** Raised when opening a file at filePath is requested. If the file does not exist, then the operation must fail. Maximum number of files opened at once can be specified with MountOptions. */
-	var onOpenFileRequested: OpenFileRequestedEvent;
-	/** Raised when opening a file previously opened with openRequestId is requested to be closed. */
-	var onCloseFileRequested: OpenedFileRequestedEvent;
-	/** Raised when reading contents of a file opened previously with openRequestId is requested. The results must be returned in chunks by calling successCallback several times. In case of an error, errorCallback must be called. */
-	var onReadFileRequested: OpenedFileOffsetRequestedEvent;
-	/** Raised when creating a directory is requested. The operation must fail with the EXISTS error if the target directory already exists. If recursive is true, then all of the missing directories on the directory path must be created. */
-	var onCreateDirectoryRequested: DirectoryPathRecursiveRequestedEvent;
-	/** Raised when deleting an entry is requested. If recursive is true, and the entry is a directory, then all of the entries inside must be recursively deleted as well. */
-	var onDeleteEntryRequested: EntryPathRecursiveRequestedEvent;
-	/** Raised when creating a file is requested. If the file already exists, then errorCallback must be called with the "EXISTS" error code. */
-	var onCreateFileRequested: FilePathRequestedEvent;
-	/** Raised when copying an entry (recursively if a directory) is requested. If an error occurs, then errorCallback must be called. */
-	var onCopyEntryRequested: SourceTargetPathRequestedEvent;
-	/** Raised when moving an entry (recursively if a directory) is requested. If an error occurs, then errorCallback must be called. */
-	var onMoveEntryRequested: SourceTargetPathRequestedEvent;
-	/** Raised when truncating a file to a desired length is requested. If an error occurs, then errorCallback must be called. */
-	var onTruncateRequested: FilePathLengthRequestedEvent;
-	/** Raised when writing contents to a file opened previously with openRequestId is requested. */
-	var onWriteFileRequested: OpenedFileIoRequestedEvent;
-	/** Raised when aborting an operation with operationRequestId is requested. The operation executed with operationRequestId must be immediately stopped and successCallback of this abort request executed. If aborting fails, then errorCallback must be called. Note, that callbacks of the aborted operation must not be called, as they will be ignored. Despite calling errorCallback, the request may be forcibly aborted. */
-	var onAbortRequested: OperationRequestedEvent;
-	/**
-	 * Raised when showing a configuration dialog for fileSystemId is requested. If it's handled, the file_system_provider.configurable manfiest option must be set to true.
-	 * @since Since Chrome 44.
-	 */
-	var onConfigureRequested: RequestedEvent;
-	/**
-	 * Raised when showing a dialog for mounting a new file system is requested. If the extension/app is a file handler, then this event shouldn't be handled. Instead app.runtime.onLaunched should be handled in order to mount new file systems when a file is opened. For multiple mounts, the file_system_provider.multiple_mounts manifest option must be set to true.
-	 * @since Since Chrome 44.
-	 */
-	var onMountRequested: OptionlessRequestedEvent;
-	/**
-	 * Raised when setting a new directory watcher is requested. If an error occurs, then errorCallback must be called.
-	 * @since Since Chrome 45. Warning: this is the current Beta channel.
-	 */
-	var onAddWatcherRequested: EntryPathRecursiveRequestedEvent;
-	/**
-	 * Raised when the watcher should be removed. If an error occurs, then errorCallback must be called.
-	 * @since Since Chrome 45. Warning: this is the current Beta channel.
-	 */
-	var onRemoveWatcherRequested: EntryPathRecursiveRequestedEvent;
-}
-
-////////////////////
-// Font Settings
-////////////////////
-/**
- * Use the chrome.fontSettings API to manage Chrome's font settings.
- * Availability: Since Chrome 22.
- * Permissions:  "fontSettings"
- */
-declare namespace chrome.fontSettings {
-	/** Represents a font name. */
-    interface FontName {
-		/** The display name of the font. */
-        displayName: string;
-		/** The font ID. */
-        fontId: string;
-    }
-
-    interface DefaultFontSizeDetails {
-		/** The font size in pixels. */
-        pixelSize: number;
-    }
-
-    interface FontDetails {
-		/** The generic font family for the font. */
-        genericFamily: string;
-		/** Optional. The script for the font. If omitted, the global script font setting is affected.  */
-        script?: string;
-    }
-
-    interface FullFontDetails {
-		/** The generic font family for which the font setting has changed. */
-        genericFamily: string;
-		/** The level of control this extension has over the setting. */
-        levelOfControl: string;
-		/** Optional. The script code for which the font setting has changed.  */
-        script?: string;
-		/** The font ID. See the description in getFont. */
-        fontId: string;
-    }
-
-    interface FontDetailsResult {
-		/** The level of control this extension has over the setting. */
-        levelOfControl: string;
-		/** The font ID. Rather than the literal font ID preference value, this may be the ID of the font that the system resolves the preference value to. So, fontId can differ from the font passed to setFont, if, for example, the font is not available on the system. The empty string signifies fallback to the global script font setting. */
-        fontId: string;
-    }
-
-    interface FontSizeDetails {
-		/** The font size in pixels. */
-        pixelSize: number;
-		/** The level of control this extension has over the setting. */
-        levelOfControl: string;
-    }
-
-    interface SetFontSizeDetails {
-		/** The font size in pixels. */
-        pixelSize: number;
-    }
-
-	interface SetFontDetails extends FontDetails {
-		/** The font ID. The empty string means to fallback to the global script font setting. */
-        fontId: string;
-    }
-
-    interface DefaultFixedFontSizeChangedEvent extends chrome.events.Event<(details: FontSizeDetails) => void> {}
-
-    interface DefaultFontSizeChangedEvent extends chrome.events.Event<(details: FontSizeDetails) => void> {}
-
-    interface MinimumFontSizeChangedEvent extends chrome.events.Event<(details: FontSizeDetails) => void> {}
-
-    interface FontChangedEvent extends chrome.events.Event<(details: FullFontDetails) => void> {}
-
-	/**
-	 * Sets the default font size.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function setDefaultFontSize(details: DefaultFontSizeDetails, callback?: Function): void;
-	/**
-	 * Gets the font for a given script and generic font family.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(object details) {...};
-	 */
-    export function getFont(details: FontDetails, callback?: (details: FontDetailsResult) => void): void;
-	/**
-	 * Gets the default font size.
-	 * @param details This parameter is currently unused.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(object details) {...};
-	 */
-	export function getDefaultFontSize(details?: Object, callback?: (options: FontSizeDetails) => void): void;
-	/**
-	 * Gets the minimum font size.
-	 * @param details This parameter is currently unused.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(object details) {...};
-	 */
-    export function getMinimumFontSize(details?: FontSizeDetails, callback?: (options: FontSizeDetails) => void): void;
-	/**
-	 * Sets the minimum font size.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function setMinimumFontSize(details: SetFontSizeDetails, callback?: Function): void;
-	/**
-	 * Gets the default size for fixed width fonts.
-	 * @param details This parameter is currently unused.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(object details) {...};
-	 */
-    export function getDefaultFixedFontSize(details?: Object, callback?: (details: FontSizeDetails) => void): void;
-	/**
-	 * Clears the default font size set by this extension, if any.
-	 * @param details This parameter is currently unused.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function clearDefaultFontSize(details?: Object, callback?: Function): void;
-	/**
-	 * Sets the default size for fixed width fonts.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function setDefaultFixedFontSize(details: SetFontSizeDetails, callback?: Function): void;
-	/**
-	 * Clears the font set by this extension, if any.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function clearFont(details: FontDetails, callback?: Function): void;
-	/**
-	 * Sets the font for a given script and generic font family.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(object details) {...};
-	 */
-    export function setFont(details: SetFontDetails, callback?: Function): void;
-	/**
-	 * Clears the minimum font size set by this extension, if any.
-	 * @param details This parameter is currently unused.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function clearMinimumFontSize(details?: Object, callback?: Function): void;
-	/**
-	 * Gets a list of fonts on the system.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of FontName results) {...};
-	 */
-    export function getFontList(callback: (results: FontName[]) => void): void;
-	/**
-	 * Clears the default fixed font size set by this extension, if any.
-	 * @param details This parameter is currently unused.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-    export function clearDefaultFixedFontSize(details: Object, callback?: Function): void;
-
-	/** Fired when the default fixed font size setting changes. */
-    var onDefaultFixedFontSizeChanged: DefaultFixedFontSizeChangedEvent;
-	/** Fired when the default font size setting changes. */
-    var onDefaultFontSizeChanged: DefaultFontSizeChangedEvent;
-	/** Fired when the minimum font size setting changes. */
-    var onMinimumFontSizeChanged: MinimumFontSizeChangedEvent;
-	/** Fired when a font setting changes. */
-    var onFontChanged: FontChangedEvent;
-}
-
-////////////////////
-// Google Cloud Messaging
-////////////////////
-/**
- * Use chrome.gcm to enable apps and extensions to send and receive messages through the Google Cloud Messaging Service.
- * Availability: Since Chrome 35.
- * Permissions:  "gcm"
- */
-declare namespace chrome.gcm {
-	interface OutgoingMessage {
-		/** The ID of the server to send the message to as assigned by Google API Console. */
-		destinationId: string;
-		/** The ID of the message. It must be unique for each message in scope of the applications. See the Cloud Messaging documentation for advice for picking and handling an ID. */
-		messageId: string;
-		/** Optional. Time-to-live of the message in seconds. If it is not possible to send the message within that time, an onSendError event will be raised. A time-to-live of 0 indicates that the message should be sent immediately or fail if it's not possible. The maximum and a default value of time-to-live is 86400 seconds (1 day). */
-		timeToLive?: number;
-		/** Message data to send to the server. Case-insensitive goog. and google, as well as case-sensitive collapse_key are disallowed as key prefixes. Sum of all key/value pairs should not exceed gcm.MAX_MESSAGE_SIZE. */
-		data: Object;
-	}
-
-	interface IncomingMessage {
-		/** The message data. */
-		data: Object;
-		/**
-		 * Optional.
-		 * The sender who issued the message.
-		 * @since Since Chrome 41.
-		 */
-		from?: string;
-		/**
-		 * Optional.
-		 * The collapse key of a message. See Collapsible Messages section of Cloud Messaging documentation for details.
-		 */
-		collapseKey?: string;
-	}
-
-	interface GcmError {
-		/** The error message describing the problem. */
-		errorMessage: string;
-		/** Optional. The ID of the message with this error, if error is related to a specific message. */
-		messageId?: string;
-		/** Additional details related to the error, when available. */
-		detail: Object;
-	}
-
-	interface MessageReceptionEvent extends chrome.events.Event<(message: IncomingMessage) => void> {}
-
-	interface MessageDeletionEvent extends chrome.events.Event<() => void> {}
-
-	interface GcmErrorEvent extends chrome.events.Event<(error: GcmError) => void> {}
-
-	/** The maximum size (in bytes) of all key/value pairs in a message. */
-	var MAX_MESSAGE_SIZE: number;
-
-	/**
-	 * Registers the application with GCM. The registration ID will be returned by the callback. If register is called again with the same list of senderIds, the same registration ID will be returned.
-	 * @param senderIds A list of server IDs that are allowed to send messages to the application. It should contain at least one and no more than 100 sender IDs.
-	 * @param callback Function called when registration completes. It should check runtime.lastError for error when registrationId is empty.
-	 * The callback parameter should be a function that looks like this:
-	 * function(string registrationId) {...};
-	 * Parameter registrationId: A registration ID assigned to the application by the GCM.
-	 */
-	export function register(senderIds: string[], callback: (registrationId: string) => void): void;
-	/**
-	 * Unregisters the application from GCM.
-	 * @param callback A function called after the unregistration completes. Unregistration was successful if runtime.lastError is not set.
-	 * The callback parameter should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function unregister(callback: () => void): void;
-	/**
-	 * Sends a message according to its contents.
-	 * @param message A message to send to the other party via GCM.
-	 * @param callback A function called after the message is successfully queued for sending. runtime.lastError should be checked, to ensure a message was sent without problems.
-	 * The callback parameter should be a function that looks like this:
-	 * function(string messageId) {...};
-	 * Parameter messageId: The ID of the message that the callback was issued for.
-	 */
-	export function send(message: OutgoingMessage, callback: (messageId: string) => void): void;
-
-	/** Fired when a message is received through GCM. */
-	var onMessage: MessageReceptionEvent;
-	/** Fired when a GCM server had to delete messages sent by an app server to the application. See Messages deleted event section of Cloud Messaging documentation for details on handling this event. */
-	var onMessagesDeleted: MessageDeletionEvent;
-	/** Fired when it was not possible to send a message to the GCM server. */
-	var onSendError: GcmErrorEvent;
-}
-
-////////////////////
-// History
-////////////////////
-/**
- * Use the chrome.history API to interact with the browser's record of visited pages. You can add, remove, and query for URLs in the browser's history. To override the history page with your own version, see Override Pages.
- * Availability: Since Chrome 5.
- * Permissions:  "history"
- */
-declare namespace chrome.history {
-	/** An object encapsulating one visit to a URL. */
-    interface VisitItem {
-		/** The transition type for this visit from its referrer. */
-        transition: string;
-		/** Optional. When this visit occurred, represented in milliseconds since the epoch. */
-        visitTime?: number;
-		/** The unique identifier for this visit. */
-        visitId: string;
-		/** The visit ID of the referrer. */
-        referringVisitId: string;
-		/** The unique identifier for the item. */
-        id: string;
-    }
-
-	/** An object encapsulating one result of a history query. */
-    interface HistoryItem {
-		/** Optional. The number of times the user has navigated to this page by typing in the address. */
-        typedCount?: number;
-		/** Optional. The title of the page when it was last loaded. */
-        title?: string;
-		/** Optional. The URL navigated to by a user. */
-        url?: string;
-		/** Optional. When this page was last loaded, represented in milliseconds since the epoch. */
-        lastVisitTime?: number;
-		/** Optional. The number of times the user has navigated to this page. */
-        visitCount?: number;
-		/** The unique identifier for the item. */
-        id: string;
-    }
-
-    interface HistoryQuery {
-		/** A free-text query to the history service. Leave empty to retrieve all pages. */
-        text: string;
-		/** Optional. The maximum number of results to retrieve. Defaults to 100. */
-        maxResults?: number;
-		/** Optional. Limit results to those visited after this date, represented in milliseconds since the epoch. */
-        startTime?: number;
-		/** Optional. Limit results to those visited before this date, represented in milliseconds since the epoch. */
-        endTime?: number;
-    }
-
-    interface Url {
-		/** The URL for the operation. It must be in the format as returned from a call to history.search. */
-        url: string;
-    }
-
-    interface Range {
-		/** Items added to history before this date, represented in milliseconds since the epoch. */
-        endTime: number;
-		/** Items added to history after this date, represented in milliseconds since the epoch. */
-        startTime: number;
-    }
-
-    interface RemovedResult {
-		/** True if all history was removed. If true, then urls will be empty. */
-        allHistory: boolean;
-		/** Optional. */
-        urls?: string[];
-    }
-
-    interface HistoryVisitedEvent extends chrome.events.Event<(result: HistoryItem) => void> {}
-
-    interface HistoryVisitRemovedEvent extends chrome.events.Event<(removed: RemovedResult) => void> {}
-
-	/**
-	 * Searches the history for the last visit time of each page matching the query.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of HistoryItem results) {...};
-	 */
-    export function search(query: HistoryQuery, callback: (results: HistoryItem[]) => void): void;
-	/**
-	 * Adds a URL to the history at the current time with a transition type of "link".
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function addUrl(details: Url, callback?: () => void): void;
-	/**
-	 * Removes all items within the specified date range from the history. Pages will not be removed from the history unless all visits fall within the range.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function deleteRange(range: Range, callback: () => void): void;
-	/**
-	 * Deletes all items from the history.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function deleteAll(callback: () => void): void;
-	/**
-	 * Retrieves information about visits to a URL.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of VisitItem results) {...};
-	 */
-    export function getVisits(details: Url, callback: (results: VisitItem[]) => void): void;
-	/**
-	 * Removes all occurrences of the given URL from the history.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function deleteUrl(details: Url, callback?: () => void): void;
-
-	/** Fired when a URL is visited, providing the HistoryItem data for that URL. This event fires before the page has loaded. */
-    var onVisited: HistoryVisitedEvent;
-	/** Fired when one or more URLs are removed from the history service. When all visits have been removed the URL is purged from history. */
-    var onVisitRemoved: HistoryVisitRemovedEvent;
-}
-
-////////////////////
-// i18n
-////////////////////
-/**
- * Use the chrome.i18n infrastructure to implement internationalization across your whole app or extension.
- * @since Chrome 5.
- */
-declare namespace chrome.i18n {
-	/**
-	 * Gets the accept-languages of the browser. This is different from the locale used by the browser; to get the locale, use i18n.getUILanguage.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of string languages) {...};
-	 * Parameter languages: Array of the accept languages of the browser, such as en-US,en,zh-CN
-	 */
-	export function getAcceptLanguages(callback: (languages: string[]) => void): void;
-	/**
-	 * Gets the localized string for the specified message. If the message is missing, this method returns an empty string (''). If the format of the getMessage() call is wrong — for example, messageName is not a string or the substitutions array has more than 9 elements — this method returns undefined.
-	 * @param messageName The name of the message, as specified in the messages.json file.
-	 * @param substitutions Optional. Up to 9 substitution strings, if the message requires any.
-	 */
-	export function getMessage(messageName: string, substitutions?: any): string;
-	/**
-	 * Gets the browser UI language of the browser. This is different from i18n.getAcceptLanguages which returns the preferred user languages.
-	 * @since Chrome 35.
-	 */
-	export function getUILanguage(): string;
-}
-
-////////////////////
-// Identity
-////////////////////
-/**
- * Use the chrome.identity API to get OAuth2 access tokens.
- * Permissions:  "identity"
- * @since Chrome 29.
- */
-declare namespace chrome.identity {
-	/** @since Chrome 32. */
-	interface AccountInfo {
-		/** A unique identifier for the account. This ID will not change for the lifetime of the account. */
-		id: string;
-	}
-
-	interface TokenDetails {
-		/**
-		 * Optional.
-		 * Fetching a token may require the user to sign-in to Chrome, or approve the application's requested scopes. If the interactive flag is true, getAuthToken will prompt the user as necessary. When the flag is false or omitted, getAuthToken will return failure any time a prompt would be required.
-		 */
-		interactive?: boolean;
-		/**
-		 * Optional.
-		 * The account ID whose token should be returned. If not specified, the primary account for the profile will be used.
-		 * account is only supported when the "enable-new-profile-management" flag is set.
-		 * @since Chrome 37.
-		 */
-		account?: AccountInfo;
-		/**
-		 * Optional.
-		 * A list of OAuth2 scopes to request.
-		 * When the scopes field is present, it overrides the list of scopes specified in manifest.json.
-		 * @since Chrome 37.
-		 */
-		scopes?: string[];
-	}
-
-	interface UserInfo {
-		/** An email address for the user account signed into the current profile. Empty if the user is not signed in or the identity.email manifest permission is not specified. */
-		email: string;
-		/** A unique identifier for the account. This ID will not change for the lifetime of the account. Empty if the user is not signed in or (in M41+) the identity.email manifest permission is not specified. */
-		id: string;
-	}
-
-	interface TokenInformation {
-		/** The specific token that should be removed from the cache. */
-		token: string;
-	}
-
-	interface WebAuthFlowOptions {
-		/** The URL that initiates the auth flow. */
-		url: string;
-		/**
-		 * Optional.
-		 * Whether to launch auth flow in interactive mode.
-		 * Since some auth flows may immediately redirect to a result URL, launchWebAuthFlow hides its web view until the first navigation either redirects to the final URL, or finishes loading a page meant to be displayed.
-		 * If the interactive flag is true, the window will be displayed when a page load completes. If the flag is false or omitted, launchWebAuthFlow will return with an error if the initial navigation does not complete the flow.
-		 */
-		interactive?: boolean;
-	}
-
-	interface SignInChangeEvent extends chrome.events.Event<(account: AccountInfo, signedIn: boolean) => void> {}
-
-	/**
-	 * Retrieves a list of AccountInfo objects describing the accounts present on the profile.
-	 * getAccounts is only supported on dev channel.
-	 * Dev channel only.
-	 */
-	export function getAccounts(callback: (accounts: AccountInfo[]) => void): void;
-	/**
-	 * Gets an OAuth2 access token using the client ID and scopes specified in the oauth2 section of manifest.json.
-	 * The Identity API caches access tokens in memory, so it's ok to call getAuthToken non-interactively any time a token is required. The token cache automatically handles expiration.
-	 * For a good user experience it is important interactive token requests are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests, or Chrome sign in screens if they are not signed in, with with no context. In particular, do not use getAuthToken interactively when your app is first launched.
-	 * @param details Token options.
-	 * @param callback Called with an OAuth2 access token as specified by the manifest, or undefined if there was an error.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(string token) {...};
-	 */
-	export function getAuthToken(details: TokenDetails, callback?: (token: string) => void): void;
-	/**
-	 * Retrieves email address and obfuscated gaia id of the user signed into a profile.
-	 * This API is different from identity.getAccounts in two ways. The information returned is available offline, and it only applies to the primary account for the profile.
-	 * @since Chrome 37.
-	 */
-	export function getProfileUserInfo(callback: (userInfo: UserInfo) => void): void;
-	/**
-	 * Removes an OAuth2 access token from the Identity API's token cache.
-	 * If an access token is discovered to be invalid, it should be passed to removeCachedAuthToken to remove it from the cache. The app may then retrieve a fresh token with getAuthToken.
-	 * @param details Token information.
-	 * @param callback Called when the token has been removed from the cache.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function removeCachedAuthToken(details: TokenInformation, callback?: () => void): void;
-	/**
-	 * Starts an auth flow at the specified URL.
-	 * This method enables auth flows with non-Google identity providers by launching a web view and navigating it to the first URL in the provider's auth flow. When the provider redirects to a URL matching the pattern https://<app-id>.chromiumapp.org/*, the window will close, and the final redirect URL will be passed to the callback function.
-	 * For a good user experience it is important interactive auth flows are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests with no context. In particular, do not launch an interactive auth flow when your app is first launched.
-	 * @param details WebAuth flow options.
-	 * @param callback Called with the URL redirected back to your application.
-	 * The callback parameter should be a function that looks like this:
-	 * function(string responseUrl) {...};
-	 */
-	export function launchWebAuthFlow(details: WebAuthFlowOptions, callback: (responseUrl?: string) => void): void;
-	/**
-	 * Generates a redirect URL to be used in launchWebAuthFlow.
-	 * The generated URLs match the pattern https://<app-id>.chromiumapp.org/*.
-	 * @since Chrome 33.
-	 * @param path Optional. The path appended to the end of the generated URL.
-	 */
-	export function getRedirectURL(path?: string): string;
-
-	/**
-	 * Fired when signin state changes for an account on the user's profile.
-	 * @since Chrome 33.
-	 */
-	var onSignInChanged: SignInChangeEvent;
-}
-
-////////////////////
-// Idle
-////////////////////
-/**
- * Use the chrome.idle API to detect when the machine's idle state changes.
- * Permissions:  "idle"
- * @since Chrome 6.
- */
-declare namespace chrome.idle {
-    interface IdleStateChangedEvent extends chrome.events.Event<(newState: string) => void> {}
-
-	/**
-	 * Returns "locked" if the system is locked, "idle" if the user has not generated any input for a specified number of seconds, or "active" otherwise.
-	 * @param detectionIntervalInSeconds The system is considered idle if detectionIntervalInSeconds seconds have elapsed since the last user input detected.
-	 * Since Chrome 25.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function( IdleState newState) {...};
-	 */
-	export function queryState(detectionIntervalInSeconds: number, callback: (newState: string) => void): void;
-	/**
-	 * Sets the interval, in seconds, used to determine when the system is in an idle state for onStateChanged events. The default interval is 60 seconds.
-	 * @since Chrome 25.
-	 * @param intervalInSeconds Threshold, in seconds, used to determine when the system is in an idle state.
-	 */
-	export function setDetectionInterval(intervalInSeconds: number): void;
-
-	/** Fired when the system changes to an active, idle or locked state. The event fires with "locked" if the screen is locked or the screensaver activates, "idle" if the system is unlocked and the user has not generated any input for a specified number of seconds, and "active" when the user generates input on an idle system. */
-    var onStateChanged: IdleStateChangedEvent;
-}
-
-////////////////////
-// Input - IME
-////////////////////
-/**
- * Use the chrome.input.ime API to implement a custom IME for Chrome OS. This allows your extension to handle keystrokes, set the composition, and manage the candidate window.
- * Permissions:  "input"
- * @since Chrome 21.
- */
-declare namespace chrome.input.ime {
-	/** See http://www.w3.org/TR/DOM-Level-3-Events/#events-KeyboardEvent */
-    interface KeyboardEvent {
-		/**
-		 * Optional.
-		 * Whether or not the SHIFT key is pressed.
-		 */
-        shiftKey?: boolean;
-		/**
-		 * Optional.
-		 * Whether or not the ALT key is pressed.
-		 */
-        altKey?: boolean;
-		/** The ID of the request. */
-        requestId: string;
-		/** Value of the key being pressed */
-        key: string;
-		/**
-		 * Optional.
-		 * Whether or not the CTRL key is pressed.
-		 */
-        ctrlKey?: boolean;
-		/** One of keyup or keydown. */
-        type: string;
-		/**
-		 * Optional.
-		 * The extension ID of the sender of this keyevent.
-		 * @since Chrome 34.
-		 */
-		extensionId?: string;
-		/**
-		 * Optional.
-		 * Value of the physical key being pressed. The value is not affected by current keyboard layout or modifier state.
-		 * @since Chrome 26.
-		 */
-		code: string;
-		/**
-		 * Optional.
-		 * The deprecated HTML keyCode, which is system- and implementation-dependent numerical code signifying the unmodified identifier associated with the key pressed.
-		 * @since Chrome 37.
-		 */
-		keyCode?: number;
-		/**
-		 * Optional.
-		 * Whether or not the CAPS_LOCK is enabled.
-		 * @since Chrome 29.
-		 */
-		capsLock?: boolean;
-    }
-
-	/** Describes an input Context */
-    interface InputContext {
-		/** This is used to specify targets of text field operations. This ID becomes invalid as soon as onBlur is called. */
-        contextID: number;
-		/** Type of value this text field edits, (Text, Number, URL, etc) */
-        type: string;
-		/**
-		 * Whether the text field wants auto-correct.
-		 * @since Chrome 40.
-		 */
-		autoCorrect: boolean;
-		/**
-		 * Whether the text field wants auto-complete.
-		 * @since Chrome 40.
-		 */
-		autoComplete: boolean;
-		/**
-		 * Whether the text field wants spell-check.
-		 * @since Chrome 40.
-		 */
-		spellCheck: boolean;
-	}
-
-	/**
-	 * A menu item used by an input method to interact with the user from the language menu.
-	 * @since Chrome 30.
-	 */
-	interface MenuItem {
-		/** String that will be passed to callbacks referencing this MenuItem. */
-		id: string;
-		/** Optional. Text displayed in the menu for this item. */
-		label?: string;
-		/** Optional. The type of menu item. */
-		style?: string;
-		/** Optional. Indicates this item is visible. */
-		visible?: boolean;
-		/** Indicates this item should be drawn with a check. */
-		checked?: boolean;
-		/** Indicates this item is enabled. */
-		enabled?: boolean;
-    }
-
-    interface ImeParameters {
-		/** MenuItems to use. */
-		items: MenuItem[];
-		/** ID of the engine to use */
-        engineID: string;
-    }
-
-    interface CommitTextParameters {
-		/** The text to commit */
-        text: string;
-		/** ID of the context where the text will be committed */
-        contextID: number;
-    }
-
-	interface CandidateUsage {
-		/** The title string of details description. */
-		title: string;
-		/** The body string of detail description. */
-		body: string;
-	}
-
-	interface CandidateTemplate {
-		/** The candidate */
-		candidate: string;
-		/** The candidate's id */
-		id: number;
-		/**
-		 * Optional.
-		 * The id to add these candidates under
-		 */
-		parentId?: number;
-		/**
-		 * Optional.
-		 * Short string displayed to next to the candidate, often the shortcut key or index
-		 */
-		label?: string;
-		/**
-		 * Optional.
-		 * Additional text describing the candidate
-		 */
-		annotation?: string;
-		/**
-		 * Optional.
-		 * The usage or detail description of word.
-		 */
-		usage?: CandidateUsage;
-	}
-
-    interface CandidatesParameters {
-		/** ID of the context that owns the candidate window. */
-        contextID: number;
-		/** List of candidates to show in the candidate window */
-		candidates: CandidateTemplate[];
-	}
-
-	interface CompositionParameterSegment {
-		/** Index of the character to start this segment at */
-		start: number;
-		/** Index of the character to end this segment after. */
-		end: number;
-		/** The type of the underline to modify this segment. */
-		style: string;
-    }
-
-    interface CompositionParameters {
-		/** ID of the context where the composition text will be set */
-        contextID: number;
-		/** Text to set */
-        text: string;
-		/** Optional. List of segments and their associated types. */
-		segments: CompositionParameterSegment[];
-		/** Position in the text of the cursor. */
-        cursor: number;
-		/** Optional. Position in the text that the selection starts at. */
-        selectionStart?: number;
-		/** Optional. Position in the text that the selection ends at. */
-        selectionEnd?: number;
-    }
-
-    interface MenuItemParameters {
-        items: Object[];
-        engineId: string;
-    }
-
-	interface CandidateWindowParameterProperties {
-		/**
-		 * Optional.
-		 * True to show the cursor, false to hide it.
-		 */
-        cursorVisible?: boolean;
-		/**
-		 * Optional.
-		 * True if the candidate window should be rendered vertical, false to make it horizontal.
-		 */
-        vertical?: boolean;
-		/**
-		 * Optional.
-		 * The number of candidates to display per page.
-		 */
-        pageSize?: number;
-		/**
-		 * Optional.
-		 * True to display the auxiliary text, false to hide it.
-		 */
-        auxiliaryTextVisible?: boolean;
-		/**
-		 * Optional.
-		 * Text that is shown at the bottom of the candidate window.
-		 */
-        auxiliaryText?: string;
-		/**
-		 * Optional.
-		 * True to show the Candidate window, false to hide it.
-		 */
-        visible?: boolean;
-		/**
-		 * Optional.
-		 * Where to display the candidate window.
-		 * @since Chrome 28.
-		 */
-		windowPosition?: string;
-	}
-
-	interface CandidateWindowParameter {
-		/** ID of the engine to set properties on. */
-		engineID: string;
-		properties: CandidateWindowParameterProperties;
-    }
-
-    interface ClearCompositionParameters {
-		/** ID of the context where the composition will be cleared */
-        contextID: number;
-    }
-
-    interface CursorPositionParameters {
-		/** ID of the candidate to select. */
-        candidateID: number;
-		/** ID of the context that owns the candidate window. */
-		contextID: number;
-	}
-
-	interface SendKeyEventParameters {
-		/** ID of the context where the key events will be sent, or zero to send key events to non-input field. */
-		contextID: number;
-		/** Data on the key event. */
-		keyData: KeyboardEvent[];
-	}
-
-	interface DeleteSurroundingTextParameters {
-		/** ID of the engine receiving the event. */
-		engineID: string;
-		/** ID of the context where the surrounding text will be deleted. */
-        contextID: number;
-		/** The offset from the caret position where deletion will start. This value can be negative. */
-		offset: number;
-		/** The number of characters to be deleted */
-		length: number;
-	}
-
-	interface SurroundingTextInfo {
-		/** The text around cursor. */
-		text: string;
-		/** The ending position of the selection. This value indicates caret position if there is no selection. */
-		focus: number;
-		/** The beginning position of the selection. This value indicates caret position if is no selection. */
-		anchor: number;
-    }
-
-    interface BlurEvent extends chrome.events.Event<(contextID: number) => void> {}
-
-    interface CandidateClickedEvent extends chrome.events.Event<(engineID: string, candidateID: number, button: string) => void> {}
-
-    interface KeyEventEvent extends chrome.events.Event<(engineID: string, keyData: KeyboardEvent) => void> {}
-
-    interface DeactivatedEvent extends chrome.events.Event<(engineID: string) => void> {}
-
-    interface InputContextUpdateEvent extends chrome.events.Event<(context: InputContext) => void> {}
-
-    interface ActivateEvent extends chrome.events.Event<(engineID: string, screen: string) => void> {}
-
-    interface FocusEvent extends chrome.events.Event<(context: InputContext) => void> {}
-
-    interface MenuItemActivatedEvent extends chrome.events.Event<(engineID: string, name: string) => void> {}
-
-	interface SurroundingTextChangedEvent extends chrome.events.Event<(engineID: string, surroundingInfo: SurroundingTextInfo) => void> {}
-
-	interface InputResetEvent extends chrome.events.Event<(engineID: string) => void> {}
-
-	/**
-	 * Adds the provided menu items to the language menu when this IME is active.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function setMenuItems(parameters: ImeParameters, callback?: () => void): void;
-	/**
-	 * Commits the provided text to the current input.
-	 * @param callback Called when the operation completes with a boolean indicating if the text was accepted or not. On failure, chrome.runtime.lastError is set.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean success) {...};
-	 */
-    export function commitText(parameters: CommitTextParameters, callback?: (success: boolean) => void): void;
-	/**
-	 * Sets the current candidate list. This fails if this extension doesn't own the active IME
-	 * @param callback Called when the operation completes.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean success) {...};
-	 */
-    export function setCandidates(parameters: CandidatesParameters, callback?: (success: boolean) => void): void;
-	/**
-	 * Set the current composition. If this extension does not own the active IME, this fails.
-	 * @param callback Called when the operation completes with a boolean indicating if the text was accepted or not. On failure, chrome.runtime.lastError is set.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean success) {...};
-	 */
-    export function setComposition(parameters: CompositionParameters, callback?: (success: boolean) => void): void;
-	/**
-	 * Updates the state of the MenuItems specified
-	 * @param callback Called when the operation completes
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function updateMenuItems(parameters: MenuItemParameters, callback?: () => void): void;
-	/**
-	 * Sets the properties of the candidate window. This fails if the extension doesn't own the active IME
-	 * @param callback Called when the operation completes.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean success) {...};
-	 */
-	export function setCandidateWindowProperties(parameters: CandidateWindowParameter, callback?: (success: boolean) => void): void;
-	/**
-	 * Clear the current composition. If this extension does not own the active IME, this fails.
-	 * @param callback Called when the operation completes with a boolean indicating if the text was accepted or not. On failure, chrome.runtime.lastError is set.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean success) {...};
-	 */
-    export function clearComposition(parameters: ClearCompositionParameters, callback?: (success: boolean) => void): void;
-	/**
-	 * Set the position of the cursor in the candidate window. This is a no-op if this extension does not own the active IME.
-	 * @param callback Called when the operation completes
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean success) {...};
-	 */
-    export function setCursorPosition(parameters: CursorPositionParameters, callback?: (success: boolean) => void): void;
-	/**
-	 * Sends the key events. This function is expected to be used by virtual keyboards. When key(s) on a virtual keyboard is pressed by a user, this function is used to propagate that event to the system.
-	 * @since Chrome 33.
-	 * @param callback Called when the operation completes.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function sendKeyEvents(parameters: SendKeyEventParameters, callback?: () => void): void;
-	/**
-	 * Hides the input view window, which is popped up automatically by system. If the input view window is already hidden, this function will do nothing.
-	 * @since Chrome 34.
-	 */
-	export function hideInputView(): void;
-	/**
-	 * Deletes the text around the caret.
-	 * @since Chrome 27.
-	 */
-	export function deleteSurroundingText(parameters: DeleteSurroundingTextParameters, callback?: () => void): void;
-	/**
-	 * Indicates that the key event received by onKeyEvent is handled. This should only be called if the onKeyEvent listener is asynchronous.
-	 * @since Chrome 25.
-	 * @param requestId Request id of the event that was handled. This should come from keyEvent.requestId
-	 * @param response True if the keystroke was handled, false if not
-	 */
-	export function keyEventHandled(requestId: string, response: boolean): void;
-
-	/** This event is sent when focus leaves a text box. It is sent to all extensions that are listening to this event, and enabled by the user. */
-    var onBlur: BlurEvent;
-	/** This event is sent if this extension owns the active IME. */
-    var onCandidateClicked: CandidateClickedEvent;
-	/** This event is sent if this extension owns the active IME. */
-    var onKeyEvent: KeyEventEvent;
-	/** This event is sent when an IME is deactivated. It signals that the IME will no longer be receiving onKeyPress events. */
-    var onDeactivated: DeactivatedEvent;
-	/** This event is sent when the properties of the current InputContext change, such as the the type. It is sent to all extensions that are listening to this event, and enabled by the user. */
-    var onInputContextUpdate: InputContextUpdateEvent;
-	/** This event is sent when an IME is activated. It signals that the IME will be receiving onKeyPress events. */
-    var onActivate: ActivateEvent;
-	/** This event is sent when focus enters a text box. It is sent to all extensions that are listening to this event, and enabled by the user. */
-    var onFocus: FocusEvent;
-	/** Called when the user selects a menu item */
-    var onMenuItemActivated: MenuItemActivatedEvent;
-	/**
-	 * Called when the editable string around caret is changed or when the caret position is moved. The text length is limited to 100 characters for each back and forth direction.
-	 * @since Chrome 27.
-	 */
-	var onSurroundingTextChanged: SurroundingTextChangedEvent;
-	/**
-	 * This event is sent when chrome terminates ongoing text input session.
-	 * @since Chrome 29.
-	 */
-	var onReset: InputResetEvent;
-}
-
-////////////////////
-// Management
-////////////////////
-/**
- * The chrome.management API provides ways to manage the list of extensions/apps that are installed and running. It is particularly useful for extensions that override the built-in New Tab page.
- * Permissions:  "management"
- * @since Chrome 8.
- */
-declare namespace chrome.management {
-	/** Information about an installed extension, app, or theme. */
-    interface ExtensionInfo {
-		/**
-		 * Optional.
-		 * A reason the item is disabled.
-		 * @since Chrome 17.
-		 */
-        disabledReason?: string;
-		/** Optional. The launch url (only present for apps). */
-        appLaunchUrl?: string;
-		/**
-		 * The description of this extension, app, or theme.
-		 * @since Chrome 9.
-		 */
-        description: string;
-		/**
-		 * Returns a list of API based permissions.
-		 * @since Chrome 9.
-		 */
-        permissions: string[];
-		/**
-		 * Optional.
-		 * A list of icon information. Note that this just reflects what was declared in the manifest, and the actual image at that url may be larger or smaller than what was declared, so you might consider using explicit width and height attributes on img tags referencing these images. See the manifest documentation on icons for more details.
-		 */
-        icons?: IconInfo[];
-		/**
-		 * Returns a list of host based permissions.
-		 * @since Chrome 9.
-		 */
-        hostPermissions: string[];
-		/** Whether it is currently enabled or disabled. */
-        enabled: boolean;
-		/**
-		 * Optional.
-		 * The URL of the homepage of this extension, app, or theme.
-		 * @since Chrome 11.
-		 */
-        homepageUrl?: string;
-		/**
-		 * Whether this extension can be disabled or uninstalled by the user.
-		 * @since Chrome 12.
-		 */
-        mayDisable: boolean;
-		/**
-		 * How the extension was installed.
-		 * @since Chrome 22.
-		 */
-        installType: string;
-		/** The version of this extension, app, or theme. */
-        version: string;
-		/** The extension's unique identifier. */
-        id: string;
-		/**
-		 * Whether the extension, app, or theme declares that it supports offline.
-		 * @since Chrome 15.
-		 */
-        offlineEnabled: boolean;
-		/**
-		 * Optional.
-		 * The update URL of this extension, app, or theme.
-		 * @since Chrome 16.
-		 */
-        updateUrl?: string;
-		/**
-		 * The type of this extension, app, or theme.
-		 * @since Chrome 23.
-		 */
-        type: string;
-		/** The url for the item's options page, if it has one. */
-        optionsUrl: string;
-		/** The name of this extension, app, or theme. */
-        name: string;
-		/**
-		 * A short version of the name of this extension, app, or theme.
-		 * @since Chrome 31.
-		 */
-		shortName: string;
-		/**
-		 * True if this is an app.
-		 * @deprecated since Chrome 33. Please use management.ExtensionInfo.type.
-		 */
-		isApp: boolean;
-		/**
-		 * Optional.
-		 * The app launch type (only present for apps).
-		 * @since Chrome 37.
-		 */
-		launchType?: string;
-		/**
-		 * Optional.
-		 * The currently available launch types (only present for apps).
-		 * @since Chrome 37.
-		 */
-		availableLaunchTypes?: string[];
-    }
-
-	/** Information about an icon belonging to an extension, app, or theme. */
-    interface IconInfo {
-		/** The URL for this icon image. To display a grayscale version of the icon (to indicate that an extension is disabled, for example), append ?grayscale=true to the URL. */
-        url: string;
-		/** A number representing the width and height of the icon. Likely values include (but are not limited to) 128, 48, 24, and 16. */
-        size: number;
-    }
-
-    interface UninstallOptions {
-		/**
-		 * Optional.
-		 * Whether or not a confirm-uninstall dialog should prompt the user. Defaults to false for self uninstalls. If an extension uninstalls another extension, this parameter is ignored and the dialog is always shown.
-		 */
-        showConfirmDialog?: boolean;
-    }
-
-    interface ManagementDisabledEvent extends chrome.events.Event<(info: ExtensionInfo) => void> {}
-
-    interface ManagementUninstalledEvent extends chrome.events.Event<(id: string) => void> {}
-
-    interface ManagementInstalledEvent extends chrome.events.Event<(info: ExtensionInfo) => void> {}
-
-    interface ManagementEnabledEvent extends chrome.events.Event<(info: ExtensionInfo) => void> {}
-
-	/**
-	 * Enables or disables an app or extension.
-	 * @param id This should be the id from an item of management.ExtensionInfo.
-	 * @param enabled Whether this item should be enabled or disabled.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function setEnabled(id: string, enabled: boolean, callback?: () => void): void;
-	/**
-	 * Returns a list of permission warnings for the given extension id.
-	 * @since Chrome 15.
-	 * @param id The ID of an already installed extension.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(array of string permissionWarnings) {...};
-	 */
-    export function getPermissionWarningsById(id: string, callback?: (permissionWarnings: string[]) => void): void;
-	/**
-	 * Returns information about the installed extension, app, or theme that has the given ID.
-	 * @since Chrome 9.
-	 * @param id The ID from an item of management.ExtensionInfo.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function( ExtensionInfo result) {...};
-	 */
-    export function get(id: string, callback?: (result: ExtensionInfo) => void): void;
-	/**
-	 * Returns a list of information about installed extensions and apps.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(array of ExtensionInfo result) {...};
-	 */
-    export function getAll(callback?: (result: ExtensionInfo[]) => void): void;
-	/**
-	 * Returns a list of permission warnings for the given extension manifest string. Note: This function can be used without requesting the 'management' permission in the manifest.
-	 * @since Chrome 15.
-	 * @param manifestStr Extension manifest JSON string.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(array of string permissionWarnings) {...};
-	 */
-    export function getPermissionWarningsByManifest(manifestStr: string, callback?: (permissionwarnings: string[]) => void): void;
-	/**
-	 * Launches an application.
-	 * @param id The extension id of the application.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function launchApp(id: string, callback?: () => void): void;
-	/**
-	 * Uninstalls a currently installed app or extension.
-	 * @since Chrome 21.
-	 * @param id This should be the id from an item of management.ExtensionInfo.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function uninstall(id: string, options?: UninstallOptions, callback?: () => void): void;
-	/**
-	 * Uninstalls a currently installed app or extension.
-	 * @deprecated since Chrome 21. The options parameter was added to this function.
-	 * @param id This should be the id from an item of management.ExtensionInfo.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function uninstall(id: string, callback?: () => void): void;
-	/**
-	 * Returns information about the calling extension, app, or theme. Note: This function can be used without requesting the 'management' permission in the manifest.
-	 * @since Chrome 39.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function( ExtensionInfo result) {...};
-	 */
-	export function getSelf(callback?: (result: ExtensionInfo) => void): void;
-	/**
-	 * Uninstalls the calling extension.
-	 * Note: This function can be used without requesting the 'management' permission in the manifest.
-	 * @since Chrome 26.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function uninstallSelf(options?: UninstallOptions, callback?: () => void): void;
-	/**
-	 * Uninstalls the calling extension.
-	 * Note: This function can be used without requesting the 'management' permission in the manifest.
-	 * @since Chrome 26.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function uninstallSelf(callback?: () => void): void;
-	/**
-	 * Display options to create shortcuts for an app. On Mac, only packaged app shortcuts can be created.
-	 * @since Chrome 37.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function createAppShortcut(id: string, callback?: () => void): void;
-	/**
-	 * Set the launch type of an app.
-	 * @since Chrome 37.
-	 * @param id This should be the id from an app item of management.ExtensionInfo.
-	 * @param launchType The target launch type. Always check and make sure this launch type is in ExtensionInfo.availableLaunchTypes, because the available launch types vary on different platforms and configurations.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function setLaunchType(id: string, launchType: string, callback?: () => void): void;
-	/**
-	 * Generate an app for a URL. Returns the generated bookmark app.
-	 * @since Chrome 37.
-	 * @param url The URL of a web page. The scheme of the URL can only be "http" or "https".
-	 * @param title The title of the generated app.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function( ExtensionInfo result) {...};
-	 */
-	export function generateAppForLink(url: string, title: string, callback?: (result: ExtensionInfo) => void): void;
-
-	/** Fired when an app or extension has been disabled. */
-    var onDisabled: ManagementDisabledEvent;
-	/** Fired when an app or extension has been uninstalled. */
-    var onUninstalled: ManagementUninstalledEvent;
-	/** Fired when an app or extension has been installed. */
-    var onInstalled: ManagementInstalledEvent;
-	/** Fired when an app or extension has been enabled. */
-    var onEnabled: ManagementEnabledEvent;
-}
-
-////////////////////
-// Notifications
-////////////////////
-/**
- * Use the networking.config API to authenticate to captive portals.
- * Permissions:  "networking.config"
- * Important: This API works only on Chrome OS.
- * @since Chrome 43.
- */
-declare namespace chrome.networking.config {
-	interface NetworkInfo {
-		/** Currently only WiFi supported. */
-		Type: string;
-		/** Optional. A unique identifier of the network. */
-		GUID?: string;
-		/** Optional. A hex-encoded byte sequence. */
-		HexSSID?: string;
-		/** Optional. The decoded SSID of the network (default encoding is UTF-8). To filter for non-UTF-8 SSIDs, use HexSSID instead. */
-		SSID?: string;
-		/** Optional. The basic service set identification (BSSID) uniquely identifying the basic service set. BSSID is represented as a human readable, hex-encoded string with bytes separated by colons, e.g. 45:67:89:ab:cd:ef. */
-		BSSID?: string;
-		/** Optional. Identifier indicating the security type of the network. Valid values are None, WEP-PSK, WPA-PSK and WPA-EAP. */
-		Security?: string;
-	}
-
-	interface CaptivePorttalDetectedEvent extends chrome.events.Event<(networkInfo: NetworkInfo) => void> {}
-
-	/**
-	 * Allows an extension to define network filters for the networks it can handle. A call to this function will remove all filters previously installed by the extension before setting the new list.
-	 * @param networks Network filters to set. Every NetworkInfo must either have the SSID or HexSSID set. Other fields will be ignored.
-	 * @param callback Called back when this operation is finished.
-	 * The callback parameter should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function setNetworkFilter(networks: NetworkInfo[], callback: () => void): void;
-	/**
-	 * Called by the extension to notify the network config API that it finished a captive portal authentication attempt and hand over the result of the attempt. This function must only be called with the GUID of the latest onCaptivePortalDetected event.
-	 * @param GUID Unique network identifier obtained from onCaptivePortalDetected.
-	 * @param result The result of the authentication attempt.
-	 * unhandled: The extension does not handle this network or captive portal (e.g. server end-point not found or not compatible).
-	 * succeeded: The extension handled this network and authenticated successfully.
-	 * rejected: The extension handled this network, tried to authenticate, however was rejected by the server.
-	 * failed: The extension handled this network, tried to authenticate, however failed due to an unspecified error.
-	 * @param callback Called back when this operation is finished.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function finishAuthentication(GUID: string, result: string, callback?: () => void): void;
-
-	/** This event fires everytime a captive portal is detected on a network matching any of the currently registered network filters and the user consents to use the extension for authentication. Network filters may be set using the setNetworkFilter. Upon receiving this event the extension should start its authentication attempt with the captive portal. When the extension finishes its attempt, it must call finishAuthentication with the GUID received with this event and the appropriate authentication result. */
-	var onCaptivePortalDetected: CaptivePorttalDetectedEvent;
-}
-
-////////////////////
-// Notifications
-// https://developer.chrome.com/extensions/notifications
-////////////////////
-/**
- * Use the chrome.notifications API to create rich notifications using templates and show these notifications to users in the system tray.
- * Permissions:  "notifications"
- * @since Chrome 28.
- */
-declare namespace chrome.notifications {
-    interface ButtonOptions {
-        title: string;
-        iconUrl?: string;
-    }
-
-    interface ItemOptions {
-		/** Title of one item of a list notification. */
-        title: string;
-		/** Additional details about this item. */
-        message: string;
-    }
-
-    interface NotificationOptions {
-		/** Optional. Which type of notification to display. Required for notifications.create method. */
-        type?: string;
-		/**
-		 * Optional.
-		 * A URL to the sender's avatar, app icon, or a thumbnail for image notifications.
-		 * URLs can be a data URL, a blob URL, or a URL relative to a resource within this extension's .crx file Required for notifications.create method.
-		 */
-        iconUrl?: string;
-		/** Optional. Title of the notification (e.g. sender name for email). Required for notifications.create method. */
-        title?: string;
-		/** Optional. Main notification content. Required for notifications.create method. */
-        message?: string;
-		/**
-		 * Optional.
-		 * Alternate notification content with a lower-weight font.
-		 * @since Chrome 31.
-		 */
-        contextMessage?: string;
-		/** Optional. Priority ranges from -2 to 2. -2 is lowest priority. 2 is highest. Zero is default. */
-        priority?: number;
-		/** Optional. A timestamp associated with the notification, in milliseconds past the epoch (e.g. Date.now() + n). */
-        eventTime?: number;
-		/** Optional. Text and icons for up to two notification action buttons. */
-		buttons?: ButtonOptions[];
-		/** Optional. Items for multi-item notifications. */
-		items?: ItemOptions[];
-		/**
-		 * Optional.
-		 * Current progress ranges from 0 to 100.
-		 * @since Chrome 30.
-		 */
-        progress?: number;
-		/**
-		 * Optional.
-		 * Whether to show UI indicating that the app will visibly respond to clicks on the body of a notification.
-		 * @since Chrome 32.
-		 */
-        isClickable?: boolean;
-		/**
-		 * Optional.
-		 * A URL to the app icon mask. URLs have the same restrictions as iconUrl. The app icon mask should be in alpha channel, as only the alpha channel of the image will be considered.
-		 * @since Chrome 38.
-		 */
-		appIconMaskUrl?: string;
-		/** Optional. A URL to the image thumbnail for image-type notifications. URLs have the same restrictions as iconUrl. */
-		imageUrl?: string;
-    }
-
-	interface NotificationClosedEvent extends chrome.events.Event<(notificationId: string, byUser: boolean) => void> {}
-
-	interface NotificationClickedEvent extends chrome.events.Event<(notificationId: string) => void> {}
-
-	interface NotificationButtonClickedEvent extends chrome.events.Event<(notificationId: string, buttonIndex: number) => void> {}
-
-	interface NotificationPermissionLevelChangedEvent extends chrome.events.Event<(level: string) => void> {}
-
-	interface NotificationShowSettingsEvent extends chrome.events.Event<() => void> {}
-
-	/** The notification closed, either by the system or by user action. */
-	export var onClosed: NotificationClosedEvent;
-	/** The user clicked in a non-button area of the notification. */
-	export var onClicked: NotificationClickedEvent;
-	/** The user pressed a button in the notification. */
-	export var onButtonClicked: NotificationButtonClickedEvent;
-	/**
-	 * The user changes the permission level.
-	 * @since Chrome 32.
-	 */
-	export var onPermissionLevelChanged: NotificationPermissionLevelChangedEvent;
-	/**
-	 * The user clicked on a link for the app's notification settings.
-	 * @since Chrome 32.
-	 */
-	export var onShowSettings: NotificationShowSettingsEvent;
-
-	/**
-	 * Creates and displays a notification.
-	 * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
-	 * The notificationId parameter is required before Chrome 42.
-	 * @param options Contents of the notification.
-	 * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
-	 * The callback is required before Chrome 42.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(string notificationId) {...};
-	 */
-	export function create(notificationId: string, options: NotificationOptions, callback?: (notificationId: string) => void): void;
-	/**
-	 * Creates and displays a notification.
-	 * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
-	 * The notificationId parameter is required before Chrome 42.
-	 * @param options Contents of the notification.
-	 * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
-	 * The callback is required before Chrome 42.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(string notificationId) {...};
-	 */
-	export function create(options: NotificationOptions, callback?: (notificationId: string) => void): void;
-	/**
-	 * Updates an existing notification.
-	 * @param notificationId The id of the notification to be updated. This is returned by notifications.create method.
-	 * @param options Contents of the notification to update to.
-	 * @param callback Called to indicate whether a matching notification existed.
-	 * The callback is required before Chrome 42.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean wasUpdated) {...};
-	 */
-	export function update(notificationId: string, options: NotificationOptions, callback?: (wasUpdated: boolean) => void): void;
-	/**
-	 * Clears the specified notification.
-	 * @param notificationId The id of the notification to be cleared. This is returned by notifications.create method.
-	 * @param callback Called to indicate whether a matching notification existed.
-	 * The callback is required before Chrome 42.
-	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean wasCleared) {...};
-	 */
-	export function clear(notificationId: string, callback?: (wasCleared: boolean) => void): void;
-	/**
-	 * Retrieves all the notifications.
-	 * @since Chrome 29.
-	 * @param callback Returns the set of notification_ids currently in the system.
-	 * The callback parameter should be a function that looks like this:
-	 * function(object notifications) {...};
-	 */
-	export function getAll(callback: (notifications: Object) => void): void;
-	/**
-	 * Retrieves whether the user has enabled notifications from this app or extension.
-	 * @since Chrome 32.
-	 * @param callback Returns the current permission level.
-	 * The callback parameter should be a function that looks like this:
-	 * function( PermissionLevel level) {...};
-	 */
-    export function getPermissionLevel(callback: (level: string) => void): void;
-}
-
-////////////////////
-// Omnibox
-////////////////////
-/**
- * The omnibox API allows you to register a keyword with Google Chrome's address bar, which is also known as the omnibox.
- * Manifest:  "omnibox": {...}
- * @since Chrome 9.
- */
-declare namespace chrome.omnibox {
-	/** A suggest result. */
-    interface SuggestResult {
-		/** The text that is put into the URL bar, and that is sent to the extension when the user chooses this entry. */
-        content: string;
-		/** The text that is displayed in the URL dropdown. Can contain XML-style markup for styling. The supported tags are 'url' (for a literal URL), 'match' (for highlighting text that matched what the user's query), and 'dim' (for dim helper text). The styles can be nested, eg. dimmed match. You must escape the five predefined entities to display them as text: stackoverflow.com/a/1091953/89484 */
-        description: string;
-    }
-
-    interface Suggestion {
-		/** The text that is displayed in the URL dropdown. Can contain XML-style markup for styling. The supported tags are 'url' (for a literal URL), 'match' (for highlighting text that matched what the user's query), and 'dim' (for dim helper text). The styles can be nested, eg. dimmed match. */
-        description: string;
-    }
-
-    interface OmniboxInputEnteredEvent extends chrome.events.Event<(text: string) => void> {}
-
-    interface OmniboxInputChangedEvent extends chrome.events.Event<(text: string, suggest: (suggestResults: SuggestResult[]) => void) => void> {}
-
-    interface OmniboxInputStartedEvent extends chrome.events.Event<() => void> {}
-
-    interface OmniboxInputCancelledEvent extends chrome.events.Event<() => void> {}
-
-	/**
-	 * Sets the description and styling for the default suggestion. The default suggestion is the text that is displayed in the first suggestion row underneath the URL bar.
-	 * @param suggestion A partial SuggestResult object, without the 'content' parameter.
-	 */
-    export function setDefaultSuggestion(suggestion: Suggestion): void;
-
-	/** User has accepted what is typed into the omnibox. */
-    var onInputEntered: OmniboxInputEnteredEvent;
-	/** User has changed what is typed into the omnibox. */
-    var onInputChanged: OmniboxInputChangedEvent;
-	/** User has started a keyword input session by typing the extension's keyword. This is guaranteed to be sent exactly once per input session, and before any onInputChanged events. */
-    var onInputStarted: OmniboxInputStartedEvent;
-	/** User has ended the keyword input session without accepting the input. */
-    var onInputCancelled: OmniboxInputCancelledEvent;
-}
-
-////////////////////
-// Page Action
-////////////////////
-/**
- * Use the chrome.pageAction API to put icons inside the address bar. Page actions represent actions that can be taken on the current page, but that aren't applicable to all pages.
- * Manifest:  "page_action": {...}
- * @since Chrome 5.
- */
-declare namespace chrome.pageAction {
-    interface PageActionClickedEvent extends chrome.events.Event<(tab: chrome.tabs.Tab) => void> {}
-
-    interface TitleDetails {
-		/** The id of the tab for which you want to modify the page action. */
-        tabId: number;
-		/** The tooltip string. */
-        title: string;
-    }
-
-    interface GetDetails {
-		/** Specify the tab to get the title from. */
-        tabId: number;
-    }
-
-    interface PopupDetails {
-		/** The id of the tab for which you want to modify the page action. */
-        tabId: number;
-		/** The html file to show in a popup. If set to the empty string (''), no popup is shown. */
-        popup: string;
-    }
-
-    interface IconDetails {
-		/** The id of the tab for which you want to modify the page action. */
-        tabId: number;
-		/**
-		 * Optional.
-		 * @deprecated This argument is ignored.
-		 */
-        iconIndex?: number;
-		/**
-		 * Optional.
-		 * Either an ImageData object or a dictionary {size -> ImageData} representing icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.imageData = foo' is equivalent to 'details.imageData = {'19': foo}'
-		 */
-        imageData?: ImageData;
-		/**
-		 * Optional.
-		 * Either a relative image path or a dictionary {size -> relative image path} pointing to icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.path = foo' is equivalent to 'details.imageData = {'19': foo}'
-		 */
-        path?: any;
-    }
-
-	/**
-	 * Shows the page action. The page action is shown whenever the tab is selected.
-	 * @param tabId The id of the tab for which you want to modify the page action.
-	 */
-    export function hide(tabId: number): void;
-	/**
-	 * Shows the page action. The page action is shown whenever the tab is selected.
-	 * @param tabId The id of the tab for which you want to modify the page action.
-	 */
-    export function show(tabId: number): void;
-	/** Sets the title of the page action. This is displayed in a tooltip over the page action. */
-    export function setTitle(details: TitleDetails): void;
-	/** Sets the html document to be opened as a popup when the user clicks on the page action's icon. */
-    export function setPopup(details: PopupDetails): void;
-	/**
-	 * Gets the title of the page action.
-	 * @since Chrome 19.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(string result) {...};
-	 */
-    export function getTitle(details: GetDetails, callback: (result: string) => void): void;
-	/**
-	 * Gets the html document set as the popup for this page action.
-	 * @since Chrome 19.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(string result) {...};
-	 */
-    export function getPopup(details: GetDetails, callback: (result: string) => void): void;
-	/**
-	 * Sets the icon for the page action. The icon can be specified either as the path to an image file or as the pixel data from a canvas element, or as dictionary of either one of those. Either the path or the imageData property must be specified.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...};
-	 */
-	export function setIcon(details: IconDetails, callback?: () => void): void;
-
-	/** Fired when a page action icon is clicked. This event will not fire if the page action has a popup. */
-    var onClicked: PageActionClickedEvent;
-}
-
-////////////////////
-// Page Capture
-////////////////////
-/**
- * Use the chrome.pageCapture API to save a tab as MHTML.
- * Permissions:  "pageCapture"
- * @since Chrome 18.
- */
-declare namespace chrome.pageCapture {
-    interface SaveDetails {
-		/** The id of the tab to save as MHTML. */
-        tabId: number;
-    }
-
-	/**
-	 * Saves the content of the tab with given id as MHTML.
-	 * @param callback Called when the MHTML has been generated.
-	 * The callback parameter should be a function that looks like this:
-	 * function(binary mhtmlData) {...};
-	 * Parameter mhtmlData: The MHTML data as a Blob.
-	 */
-    export function saveAsMHTML(details: SaveDetails, callback: (mhtmlData: any) => void): void;
-}
-
-////////////////////
-// Permissions
-////////////////////
-/**
- * Use the chrome.permissions API to request declared optional permissions at run time rather than install time, so users understand why the permissions are needed and grant only those that are necessary.
- * @since Chrome 16.
- */
-declare namespace chrome.permissions {
-    interface Permissions {
-		/**
-		 * Optional.
-		 * List of named permissions (does not include hosts or origins). Anything listed here must appear in the optional_permissions list in the manifest.
-		 */
-        origins?: string[];
-		/**
-		 * Optional.
-		 * List of origin permissions. Anything listed here must be a subset of a host that appears in the optional_permissions list in the manifest. For example, if http://*.example.com/ or http://* appears in optional_permissions, you can request an origin of http://help.example.com/. Any path is ignored.
-		 */
-        permissions?: string[];
-    }
-
-    interface PermissionsRemovedEvent {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this:
-		 * function( Permissions permissions) {...};
-		 * Parameter permissions: The permissions that have been removed.
-		 */
-        addListener(callback: (permissions: Permissions) => void): void;
-    }
-
-    interface PermissionsAddedEvent {
-		/**
-		 * @param callback The callback parameter should be a function that looks like this:
-		 * function( Permissions permissions) {...};
-		 * Parameter permissions: The newly acquired permissions.
-		 */
-        addListener(callback: (permissions: Permissions) => void): void;
-    }
-
-	/**
-	 * Checks if the extension has the specified permissions.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(boolean result) {...};
-	 * Parameter result: True if the extension has the specified permissions.
-	 */
-    export function contains(permissions: Permissions, callback: (result: boolean) => void): void;
-	/**
-	 * Gets the extension's current set of permissions.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function( Permissions permissions) {...};
-	 * Parameter permissions: The extension's active permissions.
-	 */
-    export function getAll(callback: (permissions: Permissions) => void): void;
-	/**
-	 * Requests access to the specified permissions. These permissions must be defined in the optional_permissions field of the manifest. If there are any problems requesting the permissions, runtime.lastError will be set.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean granted) {...};
-	 * Parameter granted: True if the user granted the specified permissions.
-	 */
-    export function request(permissions: Permissions, callback?: (granted: boolean) => void): void;
-	/**
-	 * Removes access to the specified permissions. If there are any problems removing the permissions, runtime.lastError will be set.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean removed) {...};
-	 * Parameter removed: True if the permissions were removed.
-	 */
-    export function remove(permissions: Permissions, callback?: (removed: boolean) => void): void;
-
-	/** Fired when access to permissions has been removed from the extension. */
-    var onRemoved: PermissionsRemovedEvent;
-	/** Fired when the extension acquires new permissions. */
-    var onAdded: PermissionsAddedEvent;
-}
-
-////////////////////
-// Platform Keys
-////////////////////
-/**
- * Use the chrome.platformKeys API to access client certificates managed by the platform. If the user or policy grants the permission, an extension can use such a certficate in its custom authentication protocol. E.g. this allows usage of platform managed certificates in third party VPNs (see chrome.vpnProvider).
- * Permissions:  "platformKeys"
- * Important: This API works only on Chrome OS.
- * @since Chrome 45.
- */
-declare namespace chrome.platformKeys {
-	interface Match {
-		/** The DER encoding of a X.509 certificate. */
-		certificate: ArrayBuffer;
-		/** The  KeyAlgorithm of the certified key. This contains algorithm parameters that are inherent to the key of the certificate (e.g. the key length). Other parameters like the hash function used by the sign function are not included. */
-		keyAlgorithm: KeyAlgorithm;
-	}
-
-	interface ClientCertificateSelectRequestDetails {
-		/** This field is a list of the types of certificates requested, sorted in order of the server's preference. Only certificates of a type contained in this list will be retrieved. If certificateTypes is the empty list, however, certificates of any type will be returned. */
-		certificateTypes: string[];
-		/** List of distinguished names of certificate authorities allowed by the server. Each entry must be a DER-encoded X.509 DistinguishedName. */
-		certificateAuthorities: ArrayBuffer[];
-	}
-
-	interface ClientCertificateSelectDetails {
-		/** Only certificates that match this request will be returned. */
-		request: ClientCertificateSelectRequestDetails;
-		/**
-		 * Optional.
-		 * If given, the selectClientCertificates operates on this list. Otherwise, obtains the list of all certificates from the platform's certificate stores that are available to this extensions. Entries that the extension doesn't have permission for or which doesn't match the request, are removed.
-		 */
-		clientCerts?: ArrayBuffer[];
-		/** If true, the filtered list is presented to the user to manually select a certificate and thereby granting the extension access to the certificate(s) and key(s). Only the selected certificate(s) will be returned. If is false, the list is reduced to all certificates that the extension has been granted access to (automatically or manually). */
-		interactive: boolean;
-	}
-
-	interface ServerCertificateVerificationDetails {
-		/** Each chain entry must be the DER encoding of a X.509 certificate, the first entry must be the server certificate and each entry must certify the entry preceding it. */
-		serverCertificateChain: ArrayBuffer[];
-		/** The hostname of the server to verify the certificate for, e.g. the server that presented the serverCertificateChain. */
-		hostname: string;
-	}
-
-	interface ServerCertificateVerificationResult {
-		/** The result of the trust verification: true if trust for the given verification details could be established and false if trust is rejected for any reason. */
-		trusted: boolean;
-		/**
-		 * If the trust verification failed, this array contains the errors reported by the underlying network layer. Otherwise, this array is empty.
-		 * Note: This list is meant for debugging only and may not contain all relevant errors. The errors returned may change in future revisions of this API, and are not guaranteed to be forwards or backwards compatible.
-		 */
-		debug_errors: string[];
-	}
-
-	/**
-	 * This function filters from a list of client certificates the ones that are known to the platform, match request and for which the extension has permission to access the certificate and its private key. If interactive is true, the user is presented a dialog where he can select from matching certificates and grant the extension access to the certificate. The selected/filtered client certificates will be passed to callback.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of Match matches) {...};
-	 * Parameter matches: The list of certificates that match the request, that the extension has permission for and, if interactive is true, that were selected by the user.
-	 */
-	export function selectClientCertificates(details: ClientCertificateSelectDetails, callback: (matches: Match[]) => void): void;
-	/**
-	 * Passes the key pair of certificate for usage with platformKeys.subtleCrypto to callback.
-	 * @param certificate The certificate of a Match returned by selectClientCertificates.
-	 * @param parameters Determines signature/hash algorithm parameters additionally to the parameters fixed by the key itself. The same parameters are   accepted as by WebCrypto's importKey function, e.g. RsaHashedImportParams for a RSASSA-PKCS1-v1_5 key. For RSASSA-PKCS1-v1_5 keys, additionally the parameters { 'hash': { 'name': 'none' } } are supported. The sign function will then apply PKCS#1 v1.5 padding and but not hash the given data.
-	 * @param callback The public and private CryptoKey of a certificate which can only be used with platformKeys.subtleCrypto.
-	 * The callback parameter should be a function that looks like this:
-	 * function(object publicKey, object privateKey) {...};
-	 * Optional parameter privateKey: Might be null if this extension does not have access to it.
-	 */
-	export function getKeyPair(certificate: ArrayBuffer, parameters: Object, callback: (publicKey: CryptoKey, privateKey?: CryptoKey) => void): void;
-	/** An implementation of WebCrypto's  SubtleCrypto that allows crypto operations on keys of client certificates that are available to this extension. */
-	export function subtleCrypto(): SubtleCrypto;
-	/**
-	 * Checks whether details.serverCertificateChain can be trusted for details.hostname according to the trust settings of the platform. Note: The actual behavior of the trust verification is not fully specified and might change in the future. The API implementation verifies certificate expiration, validates the certification path and checks trust by a known CA. The implementation is supposed to respect the EKU serverAuth and to support subject alternative names.
-	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(object result) {...};
-	 */
-	export function verifyTLSServerCertificate(details: ServerCertificateVerificationDetails, callback: (result: ServerCertificateVerificationResult) => void): void;
-}
-
-////////////////////
-// Power
-////////////////////
-/**
- * Use the chrome.power API to override the system's power management features.
- * Permissions:  "power"
- * @since Chrome 27.
- */
-declare namespace chrome.power {
-	/** Requests that power management be temporarily disabled. |level| describes the degree to which power management should be disabled. If a request previously made by the same app is still active, it will be replaced by the new request. */
-	export function requestKeepAwake(level: string): void;
-	/** Releases a request previously made via requestKeepAwake(). */
-	export function releaseKeepAwake(): void;
-}
-
-////////////////////
-// Printer Provider
-////////////////////
-/**
- * The chrome.printerProvider API exposes events used by print manager to query printers controlled by extensions, to query their capabilities and to submit print jobs to these printers.
- * Permissions:  "printerProvider"
- * @since Chrome 44.
- */
-declare namespace chrome.printerProvider {
-	interface PrinterInfo {
-		/** Unique printer ID. */
-		id: string;
-		/** Printer's human readable name. */
-		name: string;
-		/** Optional. Printer's human readable description. */
-		description?: string;
-	}
-
-	interface PrinterCapabilities {
-		/** Device capabilities in CDD format. */
-		capabilities: any;
-	}
-
-	interface PrintJob {
-		/** ID of the printer which should handle the job. */
-		printerId: string;
-		/** The print job title. */
-		title: string;
-		/** Print ticket in  CJT format. */
-		ticket: Object;
-		/** The document content type. Supported formats are "application/pdf" and "image/pwg-raster". */
-		contentType: string;
-		/** Blob containing the document data to print. Format must match |contentType|. */
-		document: Blob;
-	}
-
-	interface PrinterRequestedEvent extends chrome.events.Event<(resultCallback: (printerInfo: PrinterInfo[]) => void) => void> {}
-
-	interface PrinterInfoRequestedEvent extends chrome.events.Event<(device: any, resultCallback: (printerInfo?: PrinterInfo) => void) => void> {}
-
-	interface CapabilityRequestedEvent extends chrome.events.Event<(printerId: string, resultCallback: (capabilities: PrinterCapabilities) => void) => void> {}
-
-	interface PrintRequestedEvent extends chrome.events.Event<(printJob: PrintJob, resultCallback: (result: string) => void) => void> {}
-
-	/** Event fired when print manager requests printers provided by extensions. */
-	export var onGetPrintersRequested: PrinterRequestedEvent;
-	/**
-	 * Event fired when print manager requests information about a USB device that may be a printer.
-	 * Note: An application should not rely on this event being fired more than once per device. If a connected device is supported it should be returned in the onGetPrintersRequested event.
-	 * @since Chrome 45.
-	 */
-	export var onGetUsbPrinterInfoRequested: PrinterInfoRequestedEvent;
-	/** Event fired when print manager requests printer capabilities. */
-	export var onGetCapabilityRequested: CapabilityRequestedEvent;
-	/** Event fired when print manager requests printing. */
-	export var onPrintRequested: PrintRequestedEvent;
-}
-
-////////////////////
-// Privacy
-////////////////////
-/**
- * Use the chrome.privacy API to control usage of the features in Chrome that can affect a user's privacy. This API relies on the ChromeSetting prototype of the type API for getting and setting Chrome's configuration.
- * Permissions:  "privacy"
- * The Chrome Privacy Whitepaper gives background detail regarding the features which this API can control.
- * @since Chrome 18.
- */
-declare namespace chrome.privacy {
-    interface Services {
-		/** since Chrome 20. */
-        spellingServiceEnabled: chrome.types.ChromeSetting;
-        searchSuggestEnabled: chrome.types.ChromeSetting;
-        instantEnabled: chrome.types.ChromeSetting;
-        alternateErrorPagesEnabled: chrome.types.ChromeSetting;
-        safeBrowsingEnabled: chrome.types.ChromeSetting;
-        autofillEnabled: chrome.types.ChromeSetting;
-        translationServiceEnabled: chrome.types.ChromeSetting;
-		/** @since Chrome 38. */
-		passwordSavingEnabled: chrome.types.ChromeSetting;
-		/** @since Chrome 42. */
-		hotwordSearchEnabled: chrome.types.ChromeSetting;
-		/** @since Chrome 42. */
-		safeBrowsingExtendedReportingEnabled: chrome.types.ChromeSetting;
-    }
-
-    interface Network {
-        networkPredictionEnabled: chrome.types.ChromeSetting;
-		/** @since Chrome 42. */
-		webRTCMultipleRoutesEnabled: chrome.types.ChromeSetting;
-		/** @since Chrome 47. Warning: this is the current Dev channel. */
-		webRTCNonProxiedUdpEnabled: chrome.types.ChromeSetting;
-    }
-
-    interface Websites {
-        thirdPartyCookiesAllowed: chrome.types.ChromeSetting;
-        referrersEnabled: chrome.types.ChromeSetting;
-        hyperlinkAuditingEnabled: chrome.types.ChromeSetting;
-		/** @since Chrome 21. */
-        protectedContentEnabled: chrome.types.ChromeSetting;
-    }
-
-	/** Settings that enable or disable features that require third-party network services provided by Google and your default search provider. */
-    var services: Services;
-	/** Settings that influence Chrome's handling of network connections in general. */
-    var network: Network;
-	/** Settings that determine what information Chrome makes available to websites. */
-    var websites: Websites;
-}
-
-////////////////////
-// Proxy
-////////////////////
-/**
- * Use the chrome.proxy API to manage Chrome's proxy settings. This API relies on the ChromeSetting prototype of the type API for getting and setting the proxy configuration.
- * Permissions:  "proxy"
- * @since Chrome 13.
- */
-declare namespace chrome.proxy {
-    /** An object holding proxy auto-config information. Exactly one of the fields should be non-empty. */
-    interface PacScript {
-        /** Optional. URL of the PAC file to be used. */
-        url?: string;
-        /** Optional. If true, an invalid PAC script will prevent the network stack from falling back to direct connections. Defaults to false. */
-        mandatory?: boolean;
-        /** Optional. A PAC script. */
-        data?: string;
-    }
-
-    /** An object encapsulating a complete proxy configuration. */
-    interface ProxyConfig {
-        /** Optional. The proxy rules describing this configuration. Use this for 'fixed_servers' mode. */
-        rules?: ProxyRules;
-        /** Optional. The proxy auto-config (PAC) script for this configuration. Use this for 'pac_script' mode. */
-        pacScript?: PacScript;
-        /**
-         * 'direct' = Never use a proxy
-         * 'auto_detect' = Auto detect proxy settings
-         * 'pac_script' = Use specified PAC script
-         * 'fixed_servers' = Manually specify proxy servers
-         * 'system' = Use system proxy settings
-         */
-        mode: string;
-    }
-
-    /** An object encapsulating a single proxy server's specification. */
-    interface ProxyServer {
-        /** The URI of the proxy server. This must be an ASCII hostname (in Punycode format). IDNA is not supported, yet. */
-        host: string;
-        /** Optional. The scheme (protocol) of the proxy server itself. Defaults to 'http'. */
-        scheme?: string;
-        /** Optional. The port of the proxy server. Defaults to a port that depends on the scheme. */
-        port?: number;
-    }
-
-    /** An object encapsulating the set of proxy rules for all protocols. Use either 'singleProxy' or (a subset of) 'proxyForHttp', 'proxyForHttps', 'proxyForFtp' and 'fallbackProxy'. */
-    interface ProxyRules {
-        /** Optional. The proxy server to be used for FTP requests. */
-        proxyForFtp?: ProxyServer;
-        /** Optional. The proxy server to be used for HTTP requests. */
-        proxyForHttp?: ProxyServer;
-        /** Optional. The proxy server to be used for everthing else or if any of the specific proxyFor... is not specified. */
-		fallbackProxy?: ProxyServer;
-        /** Optional. The proxy server to be used for all per-URL requests (that is http, https, and ftp). */
-        singleProxy?: ProxyServer;
-        /** Optional. The proxy server to be used for HTTPS requests. */
-        proxyForHttps?: ProxyServer;
-        /** Optional. List of servers to connect to without a proxy server. */
-        bypassList?: string[];
-    }
-
-    interface ErrorDetails {
-        /** Additional details about the error such as a JavaScript runtime error. */
-        details: string;
-        /** The error description. */
-        error: string;
-        /** If true, the error was fatal and the network transaction was aborted. Otherwise, a direct connection is used instead. */
-        fatal: boolean;
-    }
-
-    interface ProxyErrorEvent extends chrome.events.Event<(details: ErrorDetails) => void> {}
-
-    var settings: chrome.types.ChromeSetting;
-    /** Notifies about proxy errors. */
-    var onProxyError: ProxyErrorEvent;
-}
-
-////////////////////
-// Runtime
-////////////////////
-/**
- * Use the chrome.runtime API to retrieve the background page, return details about the manifest, and listen for and respond to events in the app or extension lifecycle. You can also use this API to convert the relative path of URLs to fully-qualified URLs.
- * @since Chrome 22
- */
-declare namespace chrome.runtime {
-    /** This will be defined during an API method callback if there was an error */
-    var lastError: LastError;
-    /** The ID of the extension/app. */
-    var id: string;
-
-    interface LastError {
-        /** Optional. Details about the error which occurred.  */
-        message?: string;
-    }
-
-    interface ConnectInfo {
-        name?: string;
-    }
-
-    interface InstalledDetails {
-		/**
-		 * The reason that this event is being dispatched.
-		 * One of: "install", "update", "chrome_update", or "shared_module_update"
-		 */
-        reason: string;
-		/**
-		 * Optional.
-		 * Indicates the previous version of the extension, which has just been updated. This is present only if 'reason' is 'update'.
-		 */
-        previousVersion?: string;
-		/**
-		 * Optional.
-		 * Indicates the ID of the imported shared module extension which updated. This is present only if 'reason' is 'shared_module_update'.
-		 * @since Chrome 29.
-		 */
-		id?: string;
-    }
-
-    interface MessageOptions {
-        /** Whether the TLS channel ID will be passed into onMessageExternal for processes that are listening for the connection event. */
-        includeTlsChannelId?: boolean;
-    }
-
-    /**
-     * An object containing information about the script context that sent a message or request.
-     * @since Chrome 26.
-     */
-    interface MessageSender {
-        /** The ID of the extension or app that opened the connection, if any. */
-        id?: string;
-        /** The tabs.Tab which opened the connection, if any. This property will only be present when the connection was opened from a tab (including content scripts), and only if the receiver is an extension, not an app. */
-        tab?: chrome.tabs.Tab;
-        /**
-         * The frame that opened the connection. 0 for top-level frames, positive for child frames. This will only be set when tab is set.
-         * @since Chrome 41.
-         */
-        frameId?: number;
-        /**
-         * The URL of the page or frame that opened the connection. If the sender is in an iframe, it will be iframe's URL not the URL of the page which hosts it.
-         * @since Chrome 28.
-         */
-        url?: string;
-        /**
-         * The TLS channel ID of the page or frame that opened the connection, if requested by the extension or app, and if available.
-         * @since Chrome 32.
-         */
-        tlsChannelId?: string;
-    }
-
-    /**
-     * An object containing information about the current platform.
-     * @since Chrome 36.
-     */
-    interface PlatformInfo {
-        /**
-         * The operating system chrome is running on.
-         * One of: "mac", "win", "android", "cros", "linux", or "openbsd"
-         */
-        os: string;
-        /**
-         * The machine's processor architecture.
-         * One of: "arm", "x86-32", or "x86-64"
-         */
-        arch: string;
-        /**
-         * The native client architecture. This may be different from arch on some platforms.
-         * One of: "arm", "x86-32", or "x86-64"
-         */
-        nacl_arch: string;
-    }
-
-    /**
-     * An object which allows two way communication with other pages.
-     * @since Chrome 26.
-     */
-    interface Port {
-        postMessage: (message: Object) => void;
-        disconnect: () => void;
-        /**
-         * Optional.
-         * This property will only be present on ports passed to onConnect/onConnectExternal listeners.
-         */
-        sender?: MessageSender;
-        /** An object which allows the addition and removal of listeners for a Chrome event. */
-        onDisconnect: chrome.events.Event<() => void>;
-        /** An object which allows the addition and removal of listeners for a Chrome event. */
-        onMessage: PortMessageEvent;
-        name: string;
-    }
-
-    interface UpdateAvailableDetails {
-		/** The version number of the available update. */
-        version: string;
-    }
-
-    interface UpdateCheckDetails {
-        /** The version of the available update. */
-        version: string;
-    }
-
-    interface PortMessageEvent extends chrome.events.Event<(message: Object, port: Port) => void> {}
-
-    interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response: any) => void) => void> {}
-
-    interface ExtensionConnectEvent extends chrome.events.Event<(port: Port) => void> {}
-
-    interface RuntimeInstalledEvent extends chrome.events.Event<(details: InstalledDetails) => void> {}
-
-	interface RuntimeEvent extends chrome.events.Event<() => void> {}
-
-    interface RuntimeRestartRequiredEvent extends chrome.events.Event<(reason: string) => void> {}
-
-    interface RuntimeUpdateAvailableEvent extends chrome.events.Event<(details: UpdateAvailableDetails) => void> {}
-
-	interface ManifestIcons {
-		[size: number]: string;
-	}
-
-	interface ManifestAction {
-		default_icon?: ManifestIcons;
-		default_title?: string;
-		default_popup?: string;
-	}
-
-	interface SearchProvider {
-		name?: string;
-		keyword?: string;
-		favicon_url?: string;
-		search_url: string;
-		encoding?: string;
-		suggest_url?: string;
-		instant_url?: string;
-		image_url?: string;
-		search_url_post_params?: string;
-		suggest_url_post_params?: string;
-		instant_url_post_params?: string;
-		image_url_post_params?: string;
-		alternate_urls?: string[];
-		prepopulated_id?: number;
-		is_default?: boolean;
-	}
-
-	interface Manifest {
-		// Required
-		manifest_version: number;
-		name: string;
-		version: string;
-
-		// Recommended
-		default_locale?: string;
-		description?: string;
-		icons?: ManifestIcons;
-
-		// Pick one (or none)
-		browser_action?: ManifestAction;
-		page_action?: ManifestAction;
-
-		// Optional
-		author?: any;
-		automation?: any;
-		background?: {
-			scripts?: string[];
-			page?: string;
-			persistent?: boolean;
-		};
-		background_page?: string;
-		chrome_settings_overrides?: {
-			homepage?: string;
-			search_provider?: SearchProvider;
-			startup_pages?: string[];
-		};
-		chrome_ui_overrides?: {
-			bookmarks_ui?: {
-				remove_bookmark_shortcut?: boolean;
-				remove_button?: boolean;
-			}
-		};
-		chrome_url_overrides?: {
-			bookmarks?: string;
-			history?: string;
-			newtab?: string;
-		};
-		commands?: {
-			[name: string]: {
-				suggested_key?: {
-                    default?: string;
-					windows?: string;
-					mac?: string;
-					chromeos?: string;
-					linux?: string;
-				};
-				description?: string;
-				global?: boolean
-			}
-		};
-		content_capabilities?: {
-			matches?: string[];
-			permissions?: string[];
-		};
-		content_scripts?: {
-			matches?: string[];
-			exclude_matches?: string[];
-			css?: string[];
-			js?: string[];
-			run_at?: string;
-			all_frames?: boolean;
-			include_globs?: string[];
-			exclude_globs?: string[];
-		}[];
-		content_security_policy?: string;
-		converted_from_user_script?: boolean;
-		copresence?: any;
-		current_locale?: string;
-		devtools_page?: string;
-		event_rules?: {
-			event?: string;
-			actions?: {
-				type: string;
-			}[];
-            conditions?: chrome.declarativeContent.PageStateMatcher[]
-		}[];
-		externally_connectable?: {
-            ids?: string[];
-			matches?: string[];
-            accepts_tls_channel_id?: boolean;
-		};
-		file_browser_handlers?: {
-			id?: string;
-			default_title?: string;
-			file_filters?: string[];
-		}[];
-		file_system_provider_capabilities?: {
-			configurable?: boolean;
-			watchable?: boolean;
-			multiple_mounts?: boolean;
-			source?: string;
-		};
-		homepage_url?: string;
-		import?: {
-			id: string;
-			minimum_version?: string
-		}[];
-		export?: {
-			whitelist?: string[]
-		};
-		incognito?: string;
-		input_components?: {
-			name?: string;
-			type?: string;
-			id?: string;
-			description?: string;
-			language?: string;
-			layouts?: any[];
-		}[];
-		key?: string;
-		minimum_chrome_version?: string;
-		nacl_modules?: {
-			path: string;
-			mime_type: string;
-		}[];
-		oauth2?: {
-			client_id: string;
-			scopes?: string[];
-		};
-		offline_enabled?: boolean;
-		omnibox?: {
-			keyword: string;
-		};
-		optional_permissions?: string[];
-		options_page?: string;
-		options_ui?: {
-			page?: string;
-			chrome_style?: boolean;
-			open_in_tab?: boolean;
-		};
-		permissions?: string[];
-		platforms?: {
-			nacl_arch?: string;
-			sub_package_path: string;
-		}[];
-		plugins?: {
-			path: string;
-		}[];
-		requirements?: {
-			'3D'?: {
-				features?: string[]
-			};
-			plugins?: {
-				npapi?: boolean;
-			}
-		};
-		sandbox?: {
-			pages: string[];
-			content_security_policy?: string;
-		};
-		short_name?: string;
-		signature?: any;
-		spellcheck?: {
-			dictionary_language?: string;
-			dictionary_locale?: string;
-			dictionary_format?: string;
-			dictionary_path?: string;
-		};
-		storage?: {
-			managed_schema: string
-		};
-		system_indicator?: any;
-		tts_engine?: {
-			voices: {
-				voice_name: string;
-				lang?: string;
-				gender?: string;
-				event_types?: string[];
-			}[]
-		};
-		update_url?: string;
-		version_name?: string;
-		web_accessible_resources?: string[];
-		[key: string]: any;
-	}
-
-    /**
-     * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect.
-     * @since Chrome 26.
-     */
-    export function connect(connectInfo?: ConnectInfo): Port;
-	/**
-     * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect.
-     * @since Chrome 26.
-     * @param extensionId Optional.
-     * The ID of the extension or app to connect to. If omitted, a connection will be attempted with your own extension. Required if sending messages from a web page for web messaging.
-     */
-    export function connect(extensionId: string, connectInfo?: ConnectInfo): Port;
-    /**
-     * Connects to a native application in the host machine.
-     * @since Chrome 28.
-     * @param application The name of the registered application to connect to.
-     */
-    export function connectNative(application: string): Port;
-    /** Retrieves the JavaScript 'window' object for the background page running inside the current extension/app. If the background page is an event page, the system will ensure it is loaded before calling the callback. If there is no background page, an error is set. */
-    export function getBackgroundPage(callback: (backgroundPage?: Window) => void): void;
-    /**
-     * Returns details about the app or extension from the manifest. The object returned is a serialization of the full manifest file.
-     * @returns The manifest details.
-     */
-    export function getManifest(): Manifest;
-    /**
-     * Returns a DirectoryEntry for the package directory.
-     * @since Chrome 29.
-     */
-	export function getPackageDirectoryEntry(callback: (directoryEntry: DirectoryEntry) => void): void;
-    /**
-     * Returns information about the current platform.
-     * @since Chrome 29.
-     * @param callback Called with results
-     */
-    export function getPlatformInfo(callback: (platformInfo: PlatformInfo) => void): void;
-    /**
-     * Converts a relative path within an app/extension install directory to a fully-qualified URL.
-     * @param path A path to a resource within an app/extension expressed relative to its install directory.
-     */
-    export function getURL(path: string): string;
-    /**
-     * Reloads the app or extension.
-     * @since Chrome 25.
-     */
-    export function reload(): void;
-    /**
-     * Requests an update check for this app/extension.
-     * @since Chrome 25.
-     * @param callback
-     * Parameter status: Result of the update check. One of: "throttled", "no_update", or "update_available"
-     * Optional parameter details: If an update is available, this contains more information about the available update.
-     */
-    export function requestUpdateCheck(callback: (status: string, details?: UpdateCheckDetails) => void): void;
-    /**
-     * Restart the ChromeOS device when the app runs in kiosk mode. Otherwise, it's no-op.
-     * @since Chrome 32.
-     */
-    export function restart(): void;
-	/**
-     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
-     * @since Chrome 26.
-     * @param responseCallback Optional
-     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-     */
-    export function sendMessage(message: any, responseCallback?: (response: any) => void): void;
-	/**
-     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
-     * @since Chrome 32.
-     * @param responseCallback Optional
-     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-     */
-    export function sendMessage(message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
-	/**
-     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
-     * @since Chrome 26.
-     * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to your own extension/app. Required if sending messages from a web page for web messaging.
-     * @param responseCallback Optional
-     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-     */
-    export function sendMessage(extensionId: string, message: any, responseCallback?: (response: any) => void): void;
-    /**
-     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
-     * @since Chrome 32.
-     * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to your own extension/app. Required if sending messages from a web page for web messaging.
-     * @param responseCallback Optional
-     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-     */
-    export function sendMessage(extensionId: string, message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
-    /**
-     * Send a single message to a native application.
-     * @since Chrome 28.
-     * @param application The of the native messaging host.
-     * @param message The message that will be passed to the native messaging host.
-     * @param responseCallback Optional.
-     * Parameter response: The response message sent by the native messaging host. If an error occurs while connecting to the native messaging host, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-     */
-	export function sendNativeMessage(application: string, message: Object, responseCallback?: (response: any) => void): void;
-    /**
-     * Sets the URL to be visited upon uninstallation. This may be used to clean up server-side data, do analytics, and implement surveys. Maximum 255 characters.
-     * @since Chrome 41.
-     * @param url Since Chrome 34.
-     * URL to be opened after the extension is uninstalled. This URL must have an http: or https: scheme. Set an empty string to not open a new tab upon uninstallation.
-     * @param callback Called when the uninstall URL is set. If the given URL is invalid, runtime.lastError will be set.
-     */
-	export function setUninstallURL(url: string, callback?: () => void): void;
-    /**
-     * Open your Extension's options page, if possible.
-     * The precise behavior may depend on your manifest's options_ui or options_page key, or what Chrome happens to support at the time. For example, the page may be opened in a new tab, within chrome://extensions, within an App, or it may just focus an open options page. It will never cause the caller page to reload.
-     * If your Extension does not declare an options page, or Chrome failed to create one for some other reason, the callback will set lastError.
-     * @since Chrome 42.
-     */
-    export function openOptionsPage(callback?: () => void): void;
-
-	/**
-	 * Fired when a connection is made from either an extension process or a content script.
-	 * @since Chrome 26.
-	 */
-    var onConnect: ExtensionConnectEvent;
-	/**
-	 * Fired when a connection is made from another extension.
-	 * @since Chrome 26.
-	 */
-	var onConnectExternal: ExtensionConnectEvent;
-	/** Sent to the event page just before it is unloaded. This gives the extension opportunity to do some clean up. Note that since the page is unloading, any asynchronous operations started while handling this event are not guaranteed to complete. If more activity for the event page occurs before it gets unloaded the onSuspendCanceled event will be sent and the page won't be unloaded. */
-	var onSuspend: RuntimeEvent;
-	/**
-	 * Fired when a profile that has this extension installed first starts up. This event is not fired when an incognito profile is started, even if this extension is operating in 'split' incognito mode.
-	 * @since Chrome 23.
-	 */
-	var onStartup: RuntimeEvent;
-	/** Fired when the extension is first installed, when the extension is updated to a new version, and when Chrome is updated to a new version. */
-    var onInstalled: RuntimeInstalledEvent;
-	/** Sent after onSuspend to indicate that the app won't be unloaded after all. */
-	var onSuspendCanceled: RuntimeEvent;
-	/**
-	 * Fired when a message is sent from either an extension process or a content script.
-	 * @since Chrome 26.
-	 */
-    var onMessage: ExtensionMessageEvent;
-	/**
-	 * Fired when a message is sent from another extension/app. Cannot be used in a content script.
-	 * @since Chrome 26.
-	 */
-	var onMessageExternal: ExtensionMessageEvent;
-	/**
-	 * Fired when an app or the device that it runs on needs to be restarted. The app should close all its windows at its earliest convenient time to let the restart to happen. If the app does nothing, a restart will be enforced after a 24-hour grace period has passed. Currently, this event is only fired for Chrome OS kiosk apps.
-	 * @since Chrome 29.
-	 */
-    var onRestartRequired: RuntimeRestartRequiredEvent;
-	/**
-	 * Fired when an update is available, but isn't installed immediately because the app is currently running. If you do nothing, the update will be installed the next time the background page gets unloaded, if you want it to be installed sooner you can explicitly call chrome.runtime.reload(). If your extension is using a persistent background page, the background page of course never gets unloaded, so unless you call chrome.runtime.reload() manually in response to this event the update will not get installed until the next time chrome itself restarts. If no handlers are listening for this event, and your extension has a persistent background page, it behaves as if chrome.runtime.reload() is called in response to this event.
-	 * @since Chrome 25.
-	 */
-    var onUpdateAvailable: RuntimeUpdateAvailableEvent;
-	/**
-	 * @deprecated since Chrome 33. Please use chrome.runtime.onRestartRequired.
-	 * Fired when a Chrome update is available, but isn't installed immediately because a browser restart is required.
-	 */
-	var onBrowserUpdateAvailable: RuntimeEvent;
-}
-
-////////////////////
-// Script Badge
-////////////////////
-declare namespace chrome.scriptBadge {
-    interface GetPopupDetails {
-        tabId: number;
-    }
-
-    interface AttentionDetails {
-        tabId: number;
-    }
-
-    interface SetPopupDetails {
-        tabId: number;
-        popup: string;
-    }
-
-    interface ScriptBadgeClickedEvent extends chrome.events.Event<(tab: chrome.tabs.Tab) => void> {}
-
-    export function getPopup(details: GetPopupDetails, callback: Function): void;
-    export function getAttention(details: AttentionDetails): void;
-    export function setPopup(details: SetPopupDetails): void;
-
-    var onClicked: ScriptBadgeClickedEvent;
-}
-
-////////////////////
-// Sessions
-////////////////////
-/**
- * Use the chrome.sessions API to query and restore tabs and windows from a browsing session.
- * Permissions:  "sessions"
- * @since Chrome 37.
- */
-declare namespace chrome.sessions {
-	interface Filter {
-		/**
-		 * Optional.
-		 * The maximum number of entries to be fetched in the requested list. Omit this parameter to fetch the maximum number of entries (sessions.MAX_SESSION_RESULTS).
-		 */
-		maxResults?: number;
-	}
-
-	interface Session {
-		/** The time when the window or tab was closed or modified, represented in milliseconds since the epoch. */
-		lastModified: number;
-		/**
-		 * Optional.
-		 * The tabs.Tab, if this entry describes a tab. Either this or sessions.Session.window will be set.
-		 */
-		tab?: tabs.Tab;
-		/**
-		 * Optional.
-		 * The windows.Window, if this entry describes a window. Either this or sessions.Session.tab will be set.
-		 */
-		window?: windows.Window;
-	}
-
-	interface Device {
-		/** The name of the foreign device. */
-		deviceName: string;
-		/** A list of open window sessions for the foreign device, sorted from most recently to least recently modified session. */
-		sessions: Session[];
-	}
-
-	interface SessionChangedEvent extends chrome.events.Event<() => void> {}
-
-	/** The maximum number of sessions.Session that will be included in a requested list. */
-	export var MAX_SESSION_RESULTS: number;
-
-	/**
-	 * Gets the list of recently closed tabs and/or windows.
-	 * @param callback
-	 * Parameter sessions: The list of closed entries in reverse order that they were closed (the most recently closed tab or window will be at index 0). The entries may contain either tabs or windows.
-	 */
-	export function getRecentlyClosed(filter: Filter, callback: (sessions: Session[]) => void): void;
-	/**
-	 * Gets the list of recently closed tabs and/or windows.
-	 * @param callback
-	 * Parameter sessions: The list of closed entries in reverse order that they were closed (the most recently closed tab or window will be at index 0). The entries may contain either tabs or windows.
-	 */
-	export function getRecentlyClosed(callback: (sessions: Session[]) => void): void;
-	/**
-	 * Retrieves all devices with synced sessions.
-	 * @param callback
-	 * Parameter devices: The list of sessions.Device objects for each synced session, sorted in order from device with most recently modified session to device with least recently modified session. tabs.Tab objects are sorted by recency in the windows.Window of the sessions.Session objects.
-	 */
-	export function getDevices(filter: Filter, callback: (devices: Device[]) => void): void;
-	/**
-	 * Retrieves all devices with synced sessions.
-	 * @param callback
-	 * Parameter devices: The list of sessions.Device objects for each synced session, sorted in order from device with most recently modified session to device with least recently modified session. tabs.Tab objects are sorted by recency in the windows.Window of the sessions.Session objects.
-	 */
-	export function getDevices(callback: (devices: Device[]) => void): void;
-	/**
-	 * Reopens a windows.Window or tabs.Tab, with an optional callback to run when the entry has been restored.
-	 * @param sessionId Optional.
-	 * The windows.Window.sessionId, or tabs.Tab.sessionId to restore. If this parameter is not specified, the most recently closed session is restored.
-	 * @param callback Optional.
-	 * Parameter restoredSession: A sessions.Session containing the restored windows.Window or tabs.Tab object.
-	 */
-	export function restore(sessionId?: string, callback?: (restoredSession: Session) => void): void;
-
-	/** Fired when recently closed tabs and/or windows are changed. This event does not monitor synced sessions changes. */
-	export var onChanged: SessionChangedEvent;
-}
-
-////////////////////
-// Storage
-////////////////////
-/**
- * Use the chrome.storage API to store, retrieve, and track changes to user data.
- * Permissions:  "storage"
- * @since Chrome 20.
- */
-declare namespace chrome.storage {
-	interface StorageArea {
-		/**
-		 * Gets the amount of space (in bytes) being used by one or more items.
-		 * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
-		 * Parameter bytesInUse: Amount of space being used in storage, in bytes.
-		 */
-		getBytesInUse(callback: (bytesInUse: number) => void): void;
-		/**
-		 * Gets the amount of space (in bytes) being used by one or more items.
-		 * @param key A single key to get the total usage for. Pass in null to get the total usage of all of storage.
-		 * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
-		 * Parameter bytesInUse: Amount of space being used in storage, in bytes.
-		 */
-		getBytesInUse(key: string, callback: (bytesInUse: number) => void): void;
-		/**
-		 * Gets the amount of space (in bytes) being used by one or more items.
-		 * @param keys A list of keys to get the total usage for. An empty list will return 0. Pass in null to get the total usage of all of storage.
-		 * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
-		 * Parameter bytesInUse: Amount of space being used in storage, in bytes.
-		 */
-		getBytesInUse(keys: string[], callback: (bytesInUse: number) => void): void;
-		/**
-		 * Removes all items from storage.
-		 * @param callback Optional.
-		 * Callback on success, or on failure (in which case runtime.lastError will be set).
-		 */
-		clear(callback?: () => void): void;
-		/**
-		 * Sets multiple items.
-		 * @param items An object which gives each key/value pair to update storage with. Any other key/value pairs in storage will not be affected.
-		 * Primitive values such as numbers will serialize as expected. Values with a typeof "object" and "function" will typically serialize to {}, with the exception of Array (serializes as expected), Date, and Regex (serialize using their String representation).
-		 * @param callback Optional.
-		 * Callback on success, or on failure (in which case runtime.lastError will be set).
-		 */
-		set(items: Object, callback?: () => void): void;
-		/**
-		 * Removes one item from storage.
-		 * @param key A single key for items to remove.
-		 * @param callback Optional.
-		 * Callback on success, or on failure (in which case runtime.lastError will be set).
-		 */
-		remove(key: string, callback?: () => void): void;
-		/**
-		 * Removes items from storage.
-		 * @param keys A list of keys for items to remove.
-		 * @param callback Optional.
-		 * Callback on success, or on failure (in which case runtime.lastError will be set).
-		 */
-		remove(keys: string[], callback?: () => void): void;
-		/**
-		 * Gets one or more items from storage.
-		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
-		 * Parameter items: Object with items in their key-value mappings.
-		 */
-		get(callback: (items: { [key: string]: any }) => void): void;
-		/**
-		 * Gets one or more items from storage.
-		 * @param key A single key to get. Pass in null to get the entire contents of storage.
-		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
-		 * Parameter items: Object with items in their key-value mappings.
-		 */
-		get(key: string, callback: (items: { [key: string]: any }) => void): void;
-		/**
-		 * Gets one or more items from storage.
-		 * @param keys A list of keys to get. An empty list or object will return an empty result object. Pass in null to get the entire contents of storage.
-		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
-		 * Parameter items: Object with items in their key-value mappings.
-		 */
-		get(keys: string[], callback: (items: { [key: string]: any }) => void): void;
-		/**
-		 * Gets one or more items from storage.
-		 * @param keys A dictionary specifying default values. Pass in null to get the entire contents of storage.
-		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
-		 * Parameter items: Object with items in their key-value mappings.
-		 */
-		get(keys: Object, callback: (items: { [key: string]: any }) => void): void;
-	}
-
-	interface StorageChange {
-		/** Optional. The new value of the item, if there is a new value. */
-		newValue?: any;
-		/** Optional. The old value of the item, if there was an old value. */
-		oldValue?: any;
-	}
-
-	interface LocalStorageArea extends StorageArea {
-		/** The maximum amount (in bytes) of data that can be stored in local storage, as measured by the JSON stringification of every value plus every key's length. This value will be ignored if the extension has the unlimitedStorage permission. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
-		QUOTA_BYTES: number;
-	}
-
-	interface SyncStorageArea extends StorageArea {
-		/** @deprecated since Chrome 40. The storage.sync API no longer has a sustained write operation quota. */
-		MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: number;
-		/** The maximum total amount (in bytes) of data that can be stored in sync storage, as measured by the JSON stringification of every value plus every key's length. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
-		QUOTA_BYTES: number;
-		/** The maximum size (in bytes) of each individual item in sync storage, as measured by the JSON stringification of its value plus its key length. Updates containing items larger than this limit will fail immediately and set runtime.lastError. */
-		QUOTA_BYTES_PER_ITEM: number;
-		/** The maximum number of items that can be stored in sync storage. Updates that would cause this limit to be exceeded will fail immediately and set runtime.lastError. */
-		MAX_ITEMS: number;
-		/**
-		 * The maximum number of set, remove, or clear operations that can be performed each hour. This is 1 every 2 seconds, a lower ceiling than the short term higher writes-per-minute limit.
-		 * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
-		 */
-		MAX_WRITE_OPERATIONS_PER_HOUR: number;
-		/**
-		 * The maximum number of set, remove, or clear operations that can be performed each minute. This is 2 per second, providing higher throughput than writes-per-hour over a shorter period of time.
-		 * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
-		 * @since Chrome 40.
-		 */
-		MAX_WRITE_OPERATIONS_PER_MINUTE: number;
-	}
-
-	interface StorageChangedEvent extends chrome.events.Event<(changes: { [key: string]: StorageChange }, areaName: string) => void> {}
-
-	/** Items in the local storage area are local to each machine. */
-	var local: LocalStorageArea;
-	/** Items in the sync storage area are synced using Chrome Sync. */
-	var sync: SyncStorageArea;
-
-	/**
-	 * Items in the managed storage area are set by the domain administrator, and are read-only for the extension; trying to modify this namespace results in an error.
-	 * @since Chrome 33.
-	 */
-	var managed: StorageArea;
-
-	/** Fired when one or more items change. */
-	var onChanged: StorageChangedEvent;
-}
-
-////////////////////
-// Socket
-////////////////////
-declare namespace chrome.socket {
-    interface CreateInfo {
-        socketId: number;
-    }
-
-    interface AcceptInfo {
-        resultCode: number;
-        socketId?: number;
-    }
-
-    interface ReadInfo {
-        resultCode: number;
-        data: ArrayBuffer;
-    }
-
-    interface WriteInfo {
-        bytesWritten: number;
-    }
-
-    interface RecvFromInfo {
-        resultCode: number;
-        data: ArrayBuffer;
-        port: number;
-        address: string;
-    }
-
-    interface SocketInfo {
-        socketType: string;
-        localPort?: number;
-        peerAddress?: string;
-        peerPort?: number;
-        localAddress?: string;
-        connected: boolean;
-    }
-
-    interface NetworkInterface {
-        name: string;
-        address: string;
-    }
-
-    export function create(type: string, options?: Object, callback?: (createInfo: CreateInfo) => void): void;
-    export function destroy(socketId: number): void;
-    export function connect(socketId: number, hostname: string, port: number, callback: (result: number) => void): void;
-    export function bind(socketId: number, address: string, port: number, callback: (result: number) => void): void;
-    export function disconnect(socketId: number): void;
-    export function read(socketId: number, bufferSize?: number, callback?: (readInfo: ReadInfo) => void): void;
-    export function write(socketId: number, data: ArrayBuffer, callback?: (writeInfo: WriteInfo) => void): void;
-    export function recvFrom(socketId: number, bufferSize?: number, callback?: (recvFromInfo: RecvFromInfo) => void): void;
-    export function sendTo(socketId: number, data: ArrayBuffer, address: string, port: number, callback?: (writeInfo: WriteInfo) => void): void;
-    export function listen(socketId: number, address: string, port: number, backlog?: number, callback?: (result: number) => void): void;
-    export function accept(socketId: number, callback?: (acceptInfo: AcceptInfo) => void): void;
-    export function setKeepAlive(socketId: number, enable: boolean, delay?: number, callback?: (result: boolean) => void): void;
-    export function setNoDelay(socketId: number, noDelay: boolean, callback?: (result: boolean) => void): void;
-    export function getInfo(socketId: number, callback: (result: SocketInfo) => void): void;
-    export function getNetworkList(callback: (result: NetworkInterface[]) => void): void;
-}
-
-////////////////////
-// System CPU
-////////////////////
-/**
- * Use the system.cpu API to query CPU metadata.
- * Permissions: "system.cpu"
- * @since Chrome 32.
- */
-declare namespace chrome.system.cpu {
-	interface ProcessorUsage {
-		/** The cumulative time used by userspace programs on this processor. */
-		user: number;
-		/** The cumulative time used by kernel programs on this processor. */
-		kernel: number;
-		/** The cumulative time spent idle by this processor. */
-		idle: number;
-		/** The total cumulative time for this processor. This value is equal to user + kernel + idle. */
-		total: number;
-	}
-
-	interface ProcessorInfo {
-		/** Cumulative usage info for this logical processor. */
-		usage: ProcessorUsage;
-	}
-
-	interface CpuInfo {
-		/** The number of logical processors. */
-		numOfProcessors: number;
-		/** The architecture name of the processors. */
-		archName: string;
-		/** The model name of the processors. */
-		modelName: string;
-		/**
-		 * A set of feature codes indicating some of the processor's capabilities.
-		 * The currently supported codes are "mmx", "sse", "sse2", "sse3", "ssse3", "sse4_1", "sse4_2", and "avx".
-		 */
-		features: string[];
-		/** Information about each logical processor. */
-		processors: ProcessorInfo[];
-	}
-
-	/** Queries basic CPU information of the system. */
-	export function getInfo(callback: (info: CpuInfo) => void): void;
-}
-
-////////////////////
-// System Memory
-////////////////////
-/**
- * The chrome.system.memory API.
- * Permissions:  "system.memory"
- * @since Chrome 32.
- */
-declare namespace chrome.system.memory {
-	interface MemoryInfo {
-		/** The total amount of physical memory capacity, in bytes. */
-		capacity: number;
-		/** The amount of available capacity, in bytes. */
-		availableCapacity: number;
-	}
-
-	/** Get physical memory information. */
-	export function getInfo(callback: (info: MemoryInfo) => void): void;
-}
-
-////////////////////
-// System Storage
-////////////////////
-/**
- * Use the chrome.system.storage API to query storage device information and be notified when a removable storage device is attached and detached.
- * Permissions:  "system.storage"
- * @since Chrome 30.
- */
-declare namespace chrome.system.storage {
-	interface StorageUnitInfo {
-		/** The transient ID that uniquely identifies the storage device. This ID will be persistent within the same run of a single application. It will not be a persistent identifier between different runs of an application, or between different applications. */
-		id: string;
-		/** The name of the storage unit. */
-		name: string;
-		/**
-		 * The media type of the storage unit.
-		 * fixed: The storage has fixed media, e.g. hard disk or SSD.
-		 * removable: The storage is removable, e.g. USB flash drive.
-		 * unknown: The storage type is unknown.
-		 */
-		type: string;
-		/** The total amount of the storage space, in bytes. */
-		capacity: number;
-	}
-
-	interface StorageCapacityInfo {
-		/** A copied |id| of getAvailableCapacity function parameter |id|. */
-		id: string;
-		/** The available capacity of the storage device, in bytes. */
-		availableCapacity: number;
-	}
-
-	interface SystemStorageAttachedEvent extends chrome.events.Event<(info: StorageUnitInfo) => void> {}
-
-	interface SystemStorageDetachedEvent extends chrome.events.Event<(id: string) => void> {}
-
-	/** Get the storage information from the system. The argument passed to the callback is an array of StorageUnitInfo objects. */
-	export function getInfo(callback: (info: StorageUnitInfo[]) => void): void;
-	/**
-	 * Ejects a removable storage device.
-	 * @param callback
-	 * Parameter result: success: The ejection command is successful -- the application can prompt the user to remove the device; in_use: The device is in use by another application. The ejection did not succeed; the user should not remove the device until the other application is done with the device; no_such_device: There is no such device known. failure: The ejection command failed.
-	 */
-	export function ejectDevice(id: string, callback: (result: string) => void): void;
-	/**
-	 * Get the available capacity of a specified |id| storage device. The |id| is the transient device ID from StorageUnitInfo.
-	 * @since Dev channel only.
-	 */
-	export function getAvailableCapacity(id: string, callback: (info: StorageCapacityInfo) => void): void;
-
-	/** Fired when a new removable storage is attached to the system. */
-	export var onAttached: SystemStorageAttachedEvent;
-	/** Fired when a removable storage is detached from the system. */
-	export var onDetached: SystemStorageDetachedEvent;
-}
-
-////////////////////
-// TabCapture
-////////////////////
-/**
- * Use the chrome.tabCapture API to interact with tab media streams.
- * Permissions:  "tabCapture"
- * @since Chrome 31.
- */
-declare namespace chrome.tabCapture {
-    interface CaptureInfo {
-		/** The id of the tab whose status changed. */
-        tabId: number;
-		/**
-		 * The new capture status of the tab.
-		 * One of: "pending", "active", "stopped", or "error"
-		 */
-        status: string;
-		/** Whether an element in the tab being captured is in fullscreen mode. */
-        fullscreen: boolean;
-    }
-
-    interface CaptureOptions {
-		/** Optional. */
-        audio?: boolean;
-		/** Optional. */
-        video?: boolean;
-		/** Optional. */
-		audioConstraints?: MediaStreamConstraints;
-		/** Optional. */
-		videoConstraints?: MediaStreamConstraints;
-	}
-
-	interface CaptureStatusChangedEvent extends chrome.events.Event<(info: CaptureInfo) => void> {}
-
-	/**
-	 * Captures the visible area of the currently active tab. Capture can only be started on the currently active tab after the extension has been invoked. Capture is maintained across page navigations within the tab, and stops when the tab is closed, or the media stream is closed by the extension.
-	 * @param options Configures the returned media stream.
-	 * @param callback Callback with either the tab capture stream or null.
-	 */
-    export function capture(options: CaptureOptions, callback: (stream: MediaStream) => void): void;
-	/**
-	 * Returns a list of tabs that have requested capture or are being captured, i.e. status != stopped and status != error. This allows extensions to inform the user that there is an existing tab capture that would prevent a new tab capture from succeeding (or to prevent redundant requests for the same tab).
-	 * @param callback Callback invoked with CaptureInfo[] for captured tabs.
-	 */
-    export function getCapturedTabs(callback: (result: CaptureInfo[]) => void): void;
-
-	/** Event fired when the capture status of a tab changes. This allows extension authors to keep track of the capture status of tabs to keep UI elements like page actions in sync. */
-	var onStatusChanged: CaptureStatusChangedEvent;
-}
-
-////////////////////
-// Tabs
-////////////////////
-/**
- * Use the chrome.tabs API to interact with the browser's tab system. You can use this API to create, modify, and rearrange tabs in the browser.
- * Permissions: The majority of the chrome.tabs API can be used without declaring any permission. However, the "tabs" permission is required in order to populate the url, title, and favIconUrl properties of Tab.
- * @since Chrome 5.
- */
-declare namespace chrome.tabs {
-	/**
-	 * Tab muted state and the reason for the last state change.
-	 * @since Chrome 46. Warning: this is the current Beta channel.
-	 */
-	interface MutedInfo {
-		/** Whether the tab is prevented from playing sound (but hasn't necessarily recently produced sound). Equivalent to whether the muted audio indicator is showing. */
-		muted: boolean;
-		/**
-		 * Optional.
-		 * The reason the tab was muted or unmuted. Not set if the tab's mute state has never been changed.
-		 * "user": A user input action has set/overridden the muted state.
-		 * "capture": Tab capture started, forcing a muted state change.
-		 * "extension": An extension, identified by the extensionId field, set the muted state.
-		 */
-		reason?: string;
-		/**
-		 * Optional.
-		 * The ID of the extension that changed the muted state. Not set if an extension was not the reason the muted state last changed.
-		 */
-		extensionId?: string;
-	}
-
-    interface Tab {
-		/**
-		 * Optional.
-		 * Either loading or complete.
-		 */
-        status?: string;
-		/** The zero-based index of the tab within its window. */
-        index: number;
-		/**
-		 * Optional.
-		 * The ID of the tab that opened this tab, if any. This property is only present if the opener tab still exists.
-		 * @since Chrome 18.
-		 */
-        openerTabId?: number;
-		/**
-		 * Optional.
-		 * The title of the tab. This property is only present if the extension's manifest includes the "tabs" permission.
-		 */
-        title?: string;
-		/**
-		 * Optional.
-		 * The URL the tab is displaying. This property is only present if the extension's manifest includes the "tabs" permission.
-		 */
-        url?: string;
-		/**
-		 * Whether the tab is pinned.
-		 * @since Chrome 9.
-		 */
-        pinned: boolean;
-		/**
-		 * Whether the tab is highlighted.
-		 * @since Chrome 16.
-		 */
-        highlighted: boolean;
-		/** The ID of the window the tab is contained within. */
-        windowId: number;
-		/**
-		 * Whether the tab is active in its window. (Does not necessarily mean the window is focused.)
-		 * @since Chrome 16.
-		 */
-        active: boolean;
-		/**
-		 * Optional.
-		 * The URL of the tab's favicon. This property is only present if the extension's manifest includes the "tabs" permission. It may also be an empty string if the tab is loading.
-		 */
-        favIconUrl?: string;
-		/**
-		 * Optional.
-		 * The ID of the tab. Tab IDs are unique within a browser session. Under some circumstances a Tab may not be assigned an ID, for example when querying foreign tabs using the sessions API, in which case a session ID may be present. Tab ID can also be set to chrome.tabs.TAB_ID_NONE for apps and devtools windows.
-		 */
-		id?: number;
-		/** Whether the tab is in an incognito window. */
-        incognito: boolean;
-		/**
-		 * Whether the tab is selected.
-		 * @deprecated since Chrome 33. Please use tabs.Tab.highlighted.
-		 */
-		selected: boolean;
-		/**
-		 * Optional.
-		 * Whether the tab has produced sound over the past couple of seconds (but it might not be heard if also muted). Equivalent to whether the speaker audio indicator is showing.
-		 * @since Chrome 45.
-		 */
-		audible?: boolean;
-		/**
-		 * Optional.
-		 * Current tab muted state and the reason for the last state change.
-		 * @since Chrome 46. Warning: this is the current Beta channel.
-		 */
-		mutedInfo?: MutedInfo;
-		/**
-		 * Optional. The width of the tab in pixels.
-		 * @since Chrome 31.
-		 */
-		width?: number;
-		/**
-		 * Optional. The height of the tab in pixels.
-		 * @since Chrome 31.
-		 */
-		height?: number;
-		/**
-		 * Optional. The session ID used to uniquely identify a Tab obtained from the sessions API.
-		 * @since Chrome 31.
-		 */
-		sessionId?: string;
-    }
-
-	/**
-	 * Defines how zoom changes in a tab are handled and at what scope.
-	 * @since Chrome 38.
-	 */
-	interface ZoomSettings {
-		/**
-		 * Optional.
-		 * Defines how zoom changes are handled, i.e. which entity is responsible for the actual scaling of the page; defaults to "automatic".
-		 * "automatic": Zoom changes are handled automatically by the browser.
-		 * "manual": Overrides the automatic handling of zoom changes. The onZoomChange event will still be dispatched, and it is the responsibility of the extension to listen for this event and manually scale the page. This mode does not support per-origin zooming, and will thus ignore the scope zoom setting and assume per-tab.
-		 * "disabled": Disables all zooming in the tab. The tab will revert to the default zoom level, and all attempted zoom changes will be ignored.
-		 */
-		mode?: string;
-		/**
-		 * Optional.
-		 * Defines whether zoom changes will persist for the page's origin, or only take effect in this tab; defaults to per-origin when in automatic mode, and per-tab otherwise.
-		 * "per-origin": Zoom changes will persist in the zoomed page's origin, i.e. all other tabs navigated to that same origin will be zoomed as well. Moreover, per-origin zoom changes are saved with the origin, meaning that when navigating to other pages in the same origin, they will all be zoomed to the same zoom factor. The per-origin scope is only available in the automatic mode.
-		 * "per-tab": Zoom changes only take effect in this tab, and zoom changes in other tabs will not affect the zooming of this tab. Also, per-tab zoom changes are reset on navigation; navigating a tab will always load pages with their per-origin zoom factors.
-		 */
-		scope?: string;
-		/**
-		 * Optional.
-		 * Used to return the default zoom level for the current tab in calls to tabs.getZoomSettings.
-		 * @since Chrome 43.
-		 */
-		defaultZoomFactor?: number;
-	}
-
-    interface InjectDetails {
-		/**
-		 * Optional.
-		 * If allFrames is true, implies that the JavaScript or CSS should be injected into all frames of current page. By default, it's false and is only injected into the top frame.
-		 */
-        allFrames?: boolean;
-		/**
-		 * Optional. JavaScript or CSS code to inject.
-		 * Warning: Be careful using the code parameter. Incorrect use of it may open your extension to cross site scripting attacks.
-		 */
-        code?: string;
-		/**
-		 * Optional. The soonest that the JavaScript or CSS will be injected into the tab.
-		 * One of: "document_start", "document_end", or "document_idle"
-		 * @since Chrome 20.
-		 */
-        runAt?: string;
-		/** Optional. JavaScript or CSS file to inject. */
-        file?: string;
-		/**
-		 * Optional.
-		 * If matchAboutBlank is true, then the code is also injected in about:blank and about:srcdoc frames if your extension has access to its parent document. Code cannot be inserted in top-level about:-frames. By default it is false.
-		 * @since Chrome 39.
-		 */
-		matchAboutBlank?: boolean;
-    }
-
-    interface CreateProperties {
-		/** Optional. The position the tab should take in the window. The provided value will be clamped to between zero and the number of tabs in the window. */
-        index?: number;
-		/**
-		 * Optional.
-		 * The ID of the tab that opened this tab. If specified, the opener tab must be in the same window as the newly created tab.
-		 * @since Chrome 18.
-		 */
-        openerTabId?: number;
-		/**
-		 * Optional.
-		 * The URL to navigate the tab to initially. Fully-qualified URLs must include a scheme (i.e. 'http://www.google.com', not 'www.google.com'). Relative URLs will be relative to the current page within the extension. Defaults to the New Tab Page.
-		 */
-        url?: string;
-		/**
-		 * Optional. Whether the tab should be pinned. Defaults to false
-		 * @since Chrome 9.
-		 */
-        pinned?: boolean;
-		/** Optional. The window to create the new tab in. Defaults to the current window. */
-        windowId?: number;
-		/**
-		 * Optional.
-		 * Whether the tab should become the active tab in the window. Does not affect whether the window is focused (see windows.update). Defaults to true.
-		 * @since Chrome 16.
-		 */
-        active?: boolean;
-		/**
-		 * Optional. Whether the tab should become the selected tab in the window. Defaults to true
-		 * @deprecated since Chrome 33. Please use active.
-		 */
-		selected?: boolean;
-    }
-
-    interface MoveProperties {
-		/** The position to move the window to. -1 will place the tab at the end of the window. */
-        index: number;
-		/** Optional. Defaults to the window the tab is currently in. */
-        windowId?: number;
-    }
-
-    interface UpdateProperties {
-		/**
-		 * Optional. Whether the tab should be pinned.
-		 * @since Chrome 9.
-		 */
-        pinned?: boolean;
-		/**
-		 * Optional. The ID of the tab that opened this tab. If specified, the opener tab must be in the same window as this tab.
-		 * @since Chrome 18.
-		 */
-        openerTabId?: number;
-		/** Optional. A URL to navigate the tab to. */
-        url?: string;
-		/**
-		 * Optional. Adds or removes the tab from the current selection.
-		 * @since Chrome 16.
-		 */
-        highlighted?: boolean;
-		/**
-		 * Optional. Whether the tab should be active. Does not affect whether the window is focused (see windows.update).
-		 * @since Chrome 16.
-		 */
-        active?: boolean;
-		/**
-		 * Optional. Whether the tab should be selected.
-		 * @deprecated since Chrome 33. Please use highlighted.
-		 */
-		selected?: boolean;
-		/**
-		 * Optional. Whether the tab should be muted.
-		 * @since Chrome 45.
-		 */
-		muted?: boolean;
-    }
-
-    interface CaptureVisibleTabOptions {
-		/**
-		 * Optional.
-		 * When format is "jpeg", controls the quality of the resulting image. This value is ignored for PNG images. As quality is decreased, the resulting image will have more visual artifacts, and the number of bytes needed to store it will decrease.
-		 */
-        quality?: number;
-		/**
-		 * Optional. The format of an image.
-		 * One of: "jpeg", or "png"
-		 */
-        format?: string;
-    }
-
-    interface ReloadProperties {
-		/** Optional. Whether using any local cache. Default is false. */
-        bypassCache?: boolean;
-    }
-
-    interface ConnectInfo {
-		/** Optional. Will be passed into onConnect for content scripts that are listening for the connection event. */
-        name?: string;
-		/**
-		 * Open a port to a specific frame identified by frameId instead of all frames in the tab.
-		 * @since Chrome 41.
-		 */
-		frameId?: number;
-    }
-
-	interface MessageSendOptions {
-		/** Optional. Send a message to a specific frame identified by frameId instead of all frames in the tab. */
-		frameId?: number;
-	}
-
-    interface HighlightInfo {
-		/** One or more tab indices to highlight. */
-		tabs: number | number[];
-		/** Optional. The window that contains the tabs. */
-        windowId?: number;
-    }
-
-    interface QueryInfo {
-		/**
-		 * Optional. Whether the tabs have completed loading.
-		 * One of: "loading", or "complete"
-		 */
-        status?: string;
-		/**
-		 * Optional. Whether the tabs are in the last focused window.
-		 * @since Chrome 19.
-		 */
-        lastFocusedWindow?: boolean;
-		/** Optional. The ID of the parent window, or windows.WINDOW_ID_CURRENT for the current window. */
-        windowId?: number;
-		/**
-		 * Optional. The type of window the tabs are in.
-		 * One of: "normal", "popup", "panel", "app", or "devtools"
-		 */
-        windowType?: string;
-		/** Optional. Whether the tabs are active in their windows. */
-        active?: boolean;
-		/**
-		 * Optional. The position of the tabs within their windows.
-		 * @since Chrome 18.
-		 */
-        index?: number;
-		/** Optional. Match page titles against a pattern. */
-        title?: string;
-		/** Optional. Match tabs against one or more URL patterns. Note that fragment identifiers are not matched. */
-        url?: string | string[];
-		/**
-		 * Optional. Whether the tabs are in the current window.
-		 * @since Chrome 19.
-		 */
-        currentWindow?: boolean;
-		/** Optional. Whether the tabs are highlighted. */
-        highlighted?: boolean;
-		/** Optional. Whether the tabs are pinned. */
-        pinned?: boolean;
-		/**
-		 * Optional. Whether the tabs are audible.
-		 * @since Chrome 45.
-		 */
-		audible?: boolean;
-		/**
-		 * Optional. Whether the tabs are muted.
-		 * @since Chrome 45.
-		 */
-		muted?: boolean;
-    }
-
-    interface TabHighlightInfo {
-        windowId: number;
-        tabIds: number[];
-    }
-
-    interface TabRemoveInfo {
-		/**
-		 * The window whose tab is closed.
-		 * @since Chrome 25.
-		 */
-        windowId: number;
-		/** True when the tab is being closed because its window is being closed. */
-        isWindowClosing: boolean;
-    }
-
-    interface TabAttachInfo {
-        newPosition: number;
-        newWindowId: number;
-    }
-
-    interface TabChangeInfo {
-		/** Optional. The status of the tab. Can be either loading or complete. */
-        status?: string;
-		/**
-		 * The tab's new pinned state.
-		 * @since Chrome 9.
-		 */
-        pinned?: boolean;
-		/** Optional. The tab's URL if it has changed. */
-        url?: string;
-		/**
-		 * The tab's new audible state.
-		 * @since Chrome 45.
-		 */
-		audible?: boolean;
-		/**
-		 * The tab's new muted state and the reason for the change.
-		 * @since Chrome 46. Warning: this is the current Beta channel.
-		 */
-		mutedInfo?: MutedInfo;
-		/**
-		 * The tab's new favicon URL.
-		 * @since Chrome 27.
-		 */
-		faviconUrl?: string;
-    }
-
-    interface TabMoveInfo {
-        toIndex: number;
-        windowId: number;
-        fromIndex: number;
-    }
-
-    interface TabDetachInfo {
-        oldWindowId: number;
-        oldPosition: number;
-    }
-
-    interface TabActiveInfo {
-		/** The ID of the tab that has become active. */
-        tabId: number;
-		/** The ID of the window the active tab changed inside of. */
-        windowId: number;
-    }
-
-	interface TabWindowInfo {
-		/** The ID of the window of where the tab is located. */
-		windowId: number;
-	}
-
-	interface ZoomChangeInfo {
-		tabId: number;
-		oldZoomFactor: number;
-		newZoomFactor: number;
-		zoomSettings: ZoomSettings;
-	}
-
-    interface TabHighlightedEvent extends chrome.events.Event<(highlightInfo: HighlightInfo) => void> {}
-
-    interface TabRemovedEvent extends chrome.events.Event<(tabId: number, removeInfo: TabRemoveInfo) => void> {}
-
-    interface TabUpdatedEvent extends chrome.events.Event<(tabId: number, changeInfo: TabChangeInfo, tab: Tab) => void> {}
-
-    interface TabAttachedEvent extends chrome.events.Event<(tabId: number, attachInfo: TabAttachInfo) => void> {}
-
-    interface TabMovedEvent extends chrome.events.Event<(tabId: number, moveInfo: TabMoveInfo) => void> {}
-
-    interface TabDetachedEvent extends chrome.events.Event<(tabId: number, detachInfo: TabDetachInfo) => void> {}
-
-    interface TabCreatedEvent extends chrome.events.Event<(tab: Tab) => void> {}
-
-    interface TabActivatedEvent extends chrome.events.Event<(activeInfo: TabActiveInfo) => void> {}
-
-    interface TabReplacedEvent extends chrome.events.Event<(addedTabId: number, removedTabId: number) => void> {}
-
-	interface TabSelectedEvent extends chrome.events.Event<(tabId: number, selectInfo: TabWindowInfo) => void> {}
-
-	interface TabZoomChangeEvent extends chrome.events.Event<(ZoomChangeInfo: ZoomChangeInfo) => void> {}
-
-	/**
-	 * Injects JavaScript code into a page. For details, see the programmatic injection section of the content scripts doc.
-	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
-	 * @param callback Optional. Called after all the JavaScript has been executed.
-	 * Parameter result: The result of the script in every injected frame.
-	 */
-    export function executeScript(details: InjectDetails, callback?: (result: any[]) => void): void;
-	/**
-	 * Injects JavaScript code into a page. For details, see the programmatic injection section of the content scripts doc.
-	 * @param tabId Optional. The ID of the tab in which to run the script; defaults to the active tab of the current window.
-	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
-	 * @param callback Optional. Called after all the JavaScript has been executed.
-	 * Parameter result: The result of the script in every injected frame.
-	 */
-    export function executeScript(tabId: number, details: InjectDetails, callback?: (result: any[]) => void): void;
-	/** Retrieves details about the specified tab. */
-    export function get(tabId: number, callback: (tab: Tab) => void): void;
-	/**
-	 * Gets details about all tabs in the specified window.
-	 * @deprecated since Chrome 33. Please use tabs.query {windowId: windowId}.
-	 */
-	export function getAllInWindow(callback: (tab: Tab) => void): void;
-	/**
-	 * Gets details about all tabs in the specified window.
-	 * @deprecated since Chrome 33. Please use tabs.query {windowId: windowId}.
-	 * @param windowId Optional. Defaults to the current window.
-	 */
-	export function getAllInWindow(windowId: number, callback: (tab: Tab) => void): void;
-	/** Gets the tab that this script call is being made from. May be undefined if called from a non-tab context (for example: a background page or popup view). */
-    export function getCurrent(callback: (tab?: Tab) => void): void;
-	/**
-	 * Gets the tab that is selected in the specified window.
-	 * @deprecated since Chrome 33. Please use tabs.query {active: true}.
-	 */
-	export function getSelected(callback: (tab: Tab) => void): void;
-	/**
-	 * Gets the tab that is selected in the specified window.
-	 * @deprecated since Chrome 33. Please use tabs.query {active: true}.
-	 * @param windowId Optional. Defaults to the current window.
-	 */
-	export function getSelected(windowId: number, callback: (tab: Tab) => void): void;
-	/**
-	 * Creates a new tab.
-	 * @param callback Optional.
-	 * Parameter tab: Details about the created tab. Will contain the ID of the new tab.
-	 */
-    export function create(createProperties: CreateProperties, callback?: (tab: Tab) => void): void;
-	/**
-	 * Moves one or more tabs to a new position within its window, or to a new window. Note that tabs can only be moved to and from normal (window.type === "normal") windows.
-	 * @param tabId The tab to move.
-	 * @param callback Optional.
-	 * Parameter tab: Details about the moved tab.
-	 */
-    export function move(tabId: number, moveProperties: MoveProperties, callback?: (tab: Tab) => void): void;
-	/**
-	 * Moves one or more tabs to a new position within its window, or to a new window. Note that tabs can only be moved to and from normal (window.type === "normal") windows.
-	 * @param tabIds The tabs to move.
-	 * @param callback Optional.
-	 * Parameter tabs: Details about the moved tabs.
-	 */
-    export function move(tabIds: number[], moveProperties: MoveProperties, callback?: (tabs: Tab[]) => void): void;
-	/**
-	 * Modifies the properties of a tab. Properties that are not specified in updateProperties are not modified.
-	 * @param callback Optional.
-	 * Optional parameter tab: Details about the updated tab. The tabs.Tab object doesn't contain url, title and favIconUrl if the "tabs" permission has not been requested.
-	 */
-    export function update(updateProperties: UpdateProperties, callback?: (tab?: Tab) => void): void;
-	/**
-	 * Modifies the properties of a tab. Properties that are not specified in updateProperties are not modified.
-	 * @param tabId Defaults to the selected tab of the current window.
-	 * @param callback Optional.
-	 * Optional parameter tab: Details about the updated tab. The tabs.Tab object doesn't contain url, title and favIconUrl if the "tabs" permission has not been requested.
-	 */
-    export function update(tabId: number, updateProperties: UpdateProperties, callback?: (tab?: Tab) => void): void;
-	/**
-	 * Closes a tab.
-	 * @param tabId The tab to close.
-	 */
-    export function remove(tabId: number, callback?: Function): void;
-	/**
-	 * Closes several tabs.
-	 * @param tabIds The list of tabs to close.
-	 */
-    export function remove(tabIds: number[], callback?: Function): void;
-	/**
-	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method.
-	 * @param callback
-	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
-	 */
-    export function captureVisibleTab(callback: (dataUrl: string) => void): void;
-	/**
-	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method.
-	 * @param windowId Optional. The target window. Defaults to the current window.
-	 * @param callback
-	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
-	 */
-    export function captureVisibleTab(windowId: number, callback: (dataUrl: string) => void): void;
-	/**
-	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method.
-	 * @param options Optional. Details about the format and quality of an image.
-	 * @param callback
-	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
-	 */
-    export function captureVisibleTab(options: CaptureVisibleTabOptions, callback: (dataUrl: string) => void): void;
-	/**
-	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method.
-	 * @param windowId Optional. The target window. Defaults to the current window.
-	 * @param options Optional. Details about the format and quality of an image.
-	 * @param callback
-	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
-	 */
-    export function captureVisibleTab(windowId: number, options: CaptureVisibleTabOptions, callback: (dataUrl: string) => void): void;
-	/**
-	 * Reload a tab.
-	 * @since Chrome 16.
-	 * @param tabId The ID of the tab to reload; defaults to the selected tab of the current window.
-	 */
-	export function reload(tabId: number, reloadProperties?: ReloadProperties, callback?: () => void): void;
-	/**
-	 * Reload the selected tab of the current window.
-	 * @since Chrome 16.
-	 */
-	export function reload(reloadProperties: ReloadProperties, callback?: () => void): void;
-	/**
-	 * Reload the selected tab of the current window.
- 	 * @since Chrome 16.
-	 */
-	export function reload(callback?: () => void): void;
-	/**
-	 * Duplicates a tab.
-	 * @since Chrome 23.
-	 * @param tabId The ID of the tab which is to be duplicated.
-	 * @param callback Optional.
-	 * Optional parameter tab: Details about the duplicated tab. The tabs.Tab object doesn't contain url, title and favIconUrl if the "tabs" permission has not been requested.
-	 */
-    export function duplicate(tabId: number, callback?: (tab?: Tab) => void): void;
-	/**
-	 * Sends a single message to the content script(s) in the specified tab, with an optional callback to run when a response is sent back. The runtime.onMessage event is fired in each content script running in the specified tab for the current extension.
-	 * @since Chrome 20.
-	 */
-    export function sendMessage(tabId: number, message: any, responseCallback?: (response: any) => void): void;
-	/**
-	 * Sends a single message to the content script(s) in the specified tab, with an optional callback to run when a response is sent back. The runtime.onMessage event is fired in each content script running in the specified tab for the current extension.
-	 * @since Chrome 41.
-	 * @param responseCallback Optional.
-	 * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the specified tab, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-	 */
-	export function sendMessage(tabId: number, message: any, options: MessageSendOptions, responseCallback?: (response: any) => void): void;
-	/**
-	 * Sends a single request to the content script(s) in the specified tab, with an optional callback to run when a response is sent back. The extension.onRequest event is fired in each content script running in the specified tab for the current extension.
-	 * @deprecated since Chrome 33. Please use runtime.sendMessage.
-	 * @param responseCallback Optional.
-	 * Parameter response: The JSON response object sent by the handler of the request. If an error occurs while connecting to the specified tab, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-	 */
-	export function sendRequest(tabId: number, request: any, responseCallback?: (response: any) => void): void;
-	/** Connects to the content script(s) in the specified tab. The runtime.onConnect event is fired in each content script running in the specified tab for the current extension. */
-    export function connect(tabId: number, connectInfo?: ConnectInfo): runtime.Port;
-	/**
-	 * Injects CSS into a page. For details, see the programmatic injection section of the content scripts doc.
-	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
-	 * @param callback Optional. Called when all the CSS has been inserted.
-	 */
-	export function insertCSS(details: InjectDetails, callback?: Function): void;
-	/**
-	 * Injects CSS into a page. For details, see the programmatic injection section of the content scripts doc.
-	 * @param tabId Optional. The ID of the tab in which to insert the CSS; defaults to the active tab of the current window.
-	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
-	 * @param callback Optional. Called when all the CSS has been inserted.
-	 */
-    export function insertCSS(tabId: number, details: InjectDetails, callback?: Function): void;
-	/**
-	 * Highlights the given tabs.
-	 * @since Chrome 16.
-	 * @param callback Optional.
-	 * Parameter window: Contains details about the window whose tabs were highlighted.
-	 */
-    export function highlight(highlightInfo: HighlightInfo, callback: (window: chrome.windows.Window) => void): void;
-	/**
-	 * Gets all tabs that have the specified properties, or all tabs if no properties are specified.
-	 * @since Chrome 16.
-	 */
-    export function query(queryInfo: QueryInfo, callback: (result: Tab[]) => void): void;
-	/**
-	 * Detects the primary language of the content in a tab.
-	 * @param callback
-	 * Parameter language: An ISO language code such as en or fr. For a complete list of languages supported by this method, see kLanguageInfoTable. The 2nd to 4th columns will be checked and the first non-NULL value will be returned except for Simplified Chinese for which zh-CN will be returned. For an unknown language, und will be returned.
-	 */
-    export function detectLanguage(callback: (language: string) => void): void;
-	/**
-	 * Detects the primary language of the content in a tab.
-	 * @param tabId Optional. Defaults to the active tab of the current window.
-	 * @param callback
-	 * Parameter language: An ISO language code such as en or fr. For a complete list of languages supported by this method, see kLanguageInfoTable. The 2nd to 4th columns will be checked and the first non-NULL value will be returned except for Simplified Chinese for which zh-CN will be returned. For an unknown language, und will be returned.
-	 */
-    export function detectLanguage(tabId: number, callback: (language: string) => void): void;
-	/**
-	 * Zooms a specified tab.
-	 * @since Chrome 42.
-	 * @param zoomFactor The new zoom factor. Use a value of 0 here to set the tab to its current default zoom factor. Values greater than zero specify a (possibly non-default) zoom factor for the tab.
-	 * @param callback Optional. Called after the zoom factor has been changed.
-	 */
-	export function setZoom(zoomFactor: number, callback?: () => void): void;
-	/**
-	 * Zooms a specified tab.
-	 * @since Chrome 42.
-	 * @param tabId Optional. The ID of the tab to zoom; defaults to the active tab of the current window.
-	 * @param zoomFactor The new zoom factor. Use a value of 0 here to set the tab to its current default zoom factor. Values greater than zero specify a (possibly non-default) zoom factor for the tab.
-	 * @param callback Optional. Called after the zoom factor has been changed.
-	 */
-	export function setZoom(tabId: number, zoomFactor: number, callback?: () => void): void;
-	/**
-	 * Gets the current zoom factor of a specified tab.
-	 * @since Chrome 42.
-	 * @param callback Called with the tab's current zoom factor after it has been fetched.
-	 * Parameter zoomFactor: The tab's current zoom factor.
-	 */
-	export function getZoom(callback: (zoomFactor: number) => void): void;
-	/**
-	 * Gets the current zoom factor of a specified tab.
-	 * @since Chrome 42.
-	 * @param tabId Optional. The ID of the tab to get the current zoom factor from; defaults to the active tab of the current window.
-	 * @param callback Called with the tab's current zoom factor after it has been fetched.
-	 * Parameter zoomFactor: The tab's current zoom factor.
-	 */
-	export function getZoom(tabId: number, callback: (zoomFactor: number) => void): void;
-	/**
-	 * Sets the zoom settings for a specified tab, which define how zoom changes are handled. These settings are reset to defaults upon navigating the tab.
-	 * @since Chrome 42.
-	 * @param zoomSettings Defines how zoom changes are handled and at what scope.
-	 * @param callback Optional. Called after the zoom settings have been changed.
-	 */
-	export function setZoomSettings(zoomSettings: ZoomSettings, callback?: () => void): void;
-	/**
-	 * Sets the zoom settings for a specified tab, which define how zoom changes are handled. These settings are reset to defaults upon navigating the tab.
-	 * @since Chrome 42.
-	 * @param tabId Optional. The ID of the tab to change the zoom settings for; defaults to the active tab of the current window.
-	 * @param zoomSettings Defines how zoom changes are handled and at what scope.
-	 * @param callback Optional. Called after the zoom settings have been changed.
-	 */
-	export function setZoomSettings(tabId: number, zoomSettings: ZoomSettings, callback?: () => void): void;
-	/**
-	 * Gets the current zoom settings of a specified tab.
-	 * @since Chrome 42.
-	 * @param callback Called with the tab's current zoom settings.
-	 * Paramater zoomSettings: The tab's current zoom settings.
-	 */
-	export function getZoomSettings(callback: (zoomSettings: ZoomSettings) => void): void;
-	/**
-	 * Gets the current zoom settings of a specified tab.
-	 * @since Chrome 42.
-	 * @param tabId Optional. The ID of the tab to get the current zoom settings from; defaults to the active tab of the current window.
-	 * @param callback Called with the tab's current zoom settings.
-	 * Paramater zoomSettings: The tab's current zoom settings.
-	 */
-	export function getZoomSettings(tabId: number, callback: (zoomSettings: ZoomSettings) => void): void;
-
-	/**
-	 * Fired when the highlighted or selected tabs in a window changes.
-	 * @since Chrome 18.
-	 */
-    var onHighlighted: TabHighlightedEvent;
-	/** Fired when a tab is closed. */
-    var onRemoved: TabRemovedEvent;
-	/** Fired when a tab is updated. */
-    var onUpdated: TabUpdatedEvent;
-	/** Fired when a tab is attached to a window, for example because it was moved between windows. */
-    var onAttached: TabAttachedEvent;
-	/**
-	 * Fired when a tab is moved within a window. Only one move event is fired, representing the tab the user directly moved. Move events are not fired for the other tabs that must move in response. This event is not fired when a tab is moved between windows. For that, see tabs.onDetached.
-	 */
-    var onMoved: TabMovedEvent;
-	/** Fired when a tab is detached from a window, for example because it is being moved between windows. */
-    var onDetached: TabDetachedEvent;
-	/** Fired when a tab is created. Note that the tab's URL may not be set at the time this event fired, but you can listen to onUpdated events to be notified when a URL is set. */
-    var onCreated: TabCreatedEvent;
-	/**
-	 * Fires when the active tab in a window changes. Note that the tab's URL may not be set at the time this event fired, but you can listen to onUpdated events to be notified when a URL is set.
-	 * @since Chrome 18.
-	 */
-    var onActivated: TabActivatedEvent;
-	/**
-	 * Fired when a tab is replaced with another tab due to prerendering or instant.
-	 * @since Chrome 26.
-	 */
-    var onReplaced: TabReplacedEvent;
-	/**
-	 * @deprecated since Chrome 33. Please use tabs.onActivated.
-	 * Fires when the selected tab in a window changes.
-	 */
-	var onSelectionChanged: TabSelectedEvent;
-	/**
-	 * @deprecated since Chrome 33. Please use tabs.onActivated.
-	 * Fires when the selected tab in a window changes. Note that the tab's URL may not be set at the time this event fired, but you can listen to tabs.onUpdated events to be notified when a URL is set.
-	 */
-	var onActiveChanged: TabSelectedEvent;
-	/**
-	 * @deprecated since Chrome 33. Please use tabs.onHighlighted.
-	 * Fired when the highlighted or selected tabs in a window changes.
-	 */
-	var onHighlightChanged: TabHighlightedEvent;
-	/**
-	 * Fired when a tab is zoomed.
-	 * @since Chrome 38.
-	 */
-	var onZoomChange: TabZoomChangeEvent;
-}
-
-////////////////////
-// Top Sites
-////////////////////
-/**
- * Use the chrome.topSites API to access the top sites that are displayed on the new tab page.
- * Permissions:  "topSites"
- * @since Chrome 19.
- */
-declare namespace chrome.topSites {
-	/** An object encapsulating a most visited URL, such as the URLs on the new tab page. */
-    interface MostVisitedURL {
-		/** The most visited URL. */
-        url: string;
-		/** The title of the page */
-        title: string;
-    }
-
-	/** Gets a list of top sites. */
-	export function get(callback: (data: MostVisitedURL[]) => void): void;
-}
-
-////////////////////
-// Text to Speech
-////////////////////
-/**
- * Use the chrome.tts API to play synthesized text-to-speech (TTS). See also the related ttsEngine API, which allows an extension to implement a speech engine.
- * Permissions:  "tts"
- * @since Chrome 14.
- */
-declare namespace chrome.tts {
-	/** An event from the TTS engine to communicate the status of an utterance. */
-    interface TtsEvent {
-		/** Optional. The index of the current character in the utterance. */
-        charIndex?: number;
-		/** Optional. The error description, if the event type is 'error'. */
-        errorMessage?: string;
-		/**
-		 * The type can be 'start' as soon as speech has started, 'word' when a word boundary is reached, 'sentence' when a sentence boundary is reached, 'marker' when an SSML mark element is reached, 'end' when the end of the utterance is reached, 'interrupted' when the utterance is stopped or interrupted before reaching the end, 'cancelled' when it's removed from the queue before ever being synthesized, or 'error' when any other error occurs. When pausing speech, a 'pause' event is fired if a particular utterance is paused in the middle, and 'resume' if an utterance resumes speech. Note that pause and resume events may not fire if speech is paused in-between utterances.
-		 * One of: "start", "end", "word", "sentence", "marker", "interrupted", "cancelled", "error", "pause", or "resume"
-		 */
-        type: string;
-    }
-
-	/** A description of a voice available for speech synthesis. */
-    interface TtsVoice {
-		/** Optional. The language that this voice supports, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
-        lang?: string;
-		/**
-		 * Optional. This voice's gender.
-		 * One of: "male", or "female"
-		 */
-        gender?: string;
-		/** Optional. The name of the voice. */
-        voiceName?: string;
-		/** The ID of the extension providing this voice. */
-        extensionsId?: string;
-		/** All of the callback event types that this voice is capable of sending. */
-        eventTypes?: string[];
-		/**
-		 * If true, the synthesis engine is a remote network resource. It may be higher latency and may incur bandwidth costs.
-		 * @since Chrome 33.
-		 */
-		remote?: boolean;
-    }
-
-    interface SpeakOptions {
-		/** Optional. Speaking volume between 0 and 1 inclusive, with 0 being lowest and 1 being highest, with a default of 1.0. */
-        volume?: number;
-		/**
-		 * Optional.
-		 * If true, enqueues this utterance if TTS is already in progress. If false (the default), interrupts any current speech and flushes the speech queue before speaking this new utterance.
-		 */
-        enqueue?: boolean;
-		/**
-		 * Optional.
-		 * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. Values below 0.1 or above 10.0 are strictly disallowed, but many voices will constrain the minimum and maximum rates further—for example a particular voice may not actually speak faster than 3 times normal even if you specify a value larger than 3.0.
-		 */
-        rate?: number;
-		/**
-		 * Optional. This function is called with events that occur in the process of speaking the utterance.
-		 * @param event The update event from the text-to-speech engine indicating the status of this utterance.
-		 */
-        onEvent?: (event: TtsEvent) => void;
-		/**
-		 * Optional.
-		 * Speaking pitch between 0 and 2 inclusive, with 0 being lowest and 2 being highest. 1.0 corresponds to a voice's default pitch.
-		 */
-        pitch?: number;
-		/** Optional. The language to be used for synthesis, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
-        lang?: string;
-		/** Optional. The name of the voice to use for synthesis. If empty, uses any available voice. */
-        voiceName?: string;
-		/** Optional. The extension ID of the speech engine to use, if known. */
-        extensionId?: string;
-		/**
-		 * Optional. Gender of voice for synthesized speech.
-		 * One of: "male", or "female"
-		 */
-        gender?: string;
-		/** Optional. The TTS event types the voice must support. */
-        requiredEventTypes?: string[];
-		/** Optional. The TTS event types that you are interested in listening to. If missing, all event types may be sent. */
-        desiredEventTypes?: string[];
-    }
-
-	/** Checks whether the engine is currently speaking. On Mac OS X, the result is true whenever the system speech engine is speaking, even if the speech wasn't initiated by Chrome. */
-    export function isSpeaking(callback?: (speaking: boolean) => void): void;
-	/** Stops any current speech and flushes the queue of any pending utterances. In addition, if speech was paused, it will now be un-paused for the next call to speak. */
-    export function stop(): void;
-	/** Gets an array of all available voices. */
-    export function getVoices(callback?: (voices: TtsVoice[]) => void): void;
-	/**
-	 * Speaks text using a text-to-speech engine.
-	 * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
-	 * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
-	 */
-	export function speak(utterance: string, callback?: Function): void;
-	/**
-	 * Speaks text using a text-to-speech engine.
-	 * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
-	 * @param options Optional. The speech options.
-	 * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
-	 */
-	export function speak(utterance: string, options: SpeakOptions, callback?: Function): void;
-	/**
-	 * Pauses speech synthesis, potentially in the middle of an utterance. A call to resume or stop will un-pause speech.
-	 * @since Chrome 29.
-	 */
-	export function pause(): void;
-	/**
-	 * If speech was paused, resumes speaking where it left off.
-	 * @since Chrome 29.
-	 */
-	export function resume(): void;
-}
-
-////////////////////
-// Text to Speech Engine
-////////////////////
-/**
- * Use the chrome.ttsEngine API to implement a text-to-speech(TTS) engine using an extension. If your extension registers using this API, it will receive events containing an utterance to be spoken and other parameters when any extension or Chrome App uses the tts API to generate speech. Your extension can then use any available web technology to synthesize and output the speech, and send events back to the calling function to report the status.
- * Permissions:  "ttsEngine"
- * @since Chrome 14.
- */
-declare namespace chrome.ttsEngine {
-    interface SpeakOptions {
-		/** Optional. The language to be used for synthesis, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
-        lang?: string;
-		/** Optional. The name of the voice to use for synthesis. */
-        voiceName?: string;
-		/**
-		 * Optional. Gender of voice for synthesized speech.
-		 * One of: "male", or "female"
-		 */
-        gender?: string;
-		/** Optional. Speaking volume between 0 and 1 inclusive, with 0 being lowest and 1 being highest, with a default of 1.0. */
-        volume?: number;
-		/**
-		 * Optional.
-		 * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. This value is guaranteed to be between 0.1 and 10.0, inclusive. When a voice does not support this full range of rates, don't return an error. Instead, clip the rate to the range the voice supports.
-		 */
-        rate?: number;
-		/** Optional. Speaking pitch between 0 and 2 inclusive, with 0 being lowest and 2 being highest. 1.0 corresponds to this voice's default pitch. */
-        pitch?: number;
-    }
-
-    interface TtsEngineSpeakEvent extends chrome.events.Event<(utterance: string, options: SpeakOptions, sendTtsEvent: (event: chrome.tts.TtsEvent) => void) => void> {}
-
-	/** Called when the user makes a call to tts.speak() and one of the voices from this extension's manifest is the first to match the options object. */
-    var onSpeak: TtsEngineSpeakEvent;
-	/** Fired when a call is made to tts.stop and this extension may be in the middle of speaking. If an extension receives a call to onStop and speech is already stopped, it should do nothing (not raise an error). If speech is in the paused state, this should cancel the paused state. */
-	var onStop: chrome.events.Event<() => void>;
-	/**
-	 * Optional: if an engine supports the pause event, it should pause the current utterance being spoken, if any, until it receives a resume event or stop event. Note that a stop event should also clear the paused state.
-	 * @since Chrome 29.
-	 */
-	var onPause: chrome.events.Event<() => void>;
-	/**
-	 * Optional: if an engine supports the pause event, it should also support the resume event, to continue speaking the current utterance, if any. Note that a stop event should also clear the paused state.
-	 * @since Chrome 29.
-	 */
-	var onResume: chrome.events.Event<() => void>;
-}
-
-////////////////////
-// Types
-////////////////////
-/**
- * The chrome.types API contains type declarations for Chrome.
- * @since Chrome 13.
- */
-declare namespace chrome.types {
-    interface ChromeSettingClearDetails {
-		/**
-		 * Optional.
-		 * The scope of the ChromeSetting. One of
-		 * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
-		 * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
-		 * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
-		 * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
-		 */
-        scope?: string;
-    }
-
-    interface ChromeSettingSetDetails extends ChromeSettingClearDetails {
-		/**
-		 * The value of the setting.
-		 * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
-		 */
-        value: any;
-		/**
-		 * Optional.
-		 * The scope of the ChromeSetting. One of
-		 * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
-		 * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
-		 * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
-		 * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
-		 */
-		scope?: string;
-    }
-
-    interface ChromeSettingGetDetails {
-		/** Optional. Whether to return the value that applies to the incognito session (default false). */
-        incognito?: boolean;
-    }
-
-	/**
-	 * @param details Details of the currently effective value.
-	 */
-    type DetailsCallback = (details: ChromeSettingGetResultDetails) => void;
-
-    interface ChromeSettingGetResultDetails {
-		/**
-		 * One of
-		 * • not_controllable: cannot be controlled by any extension
-		 * • controlled_by_other_extensions: controlled by extensions with higher precedence
-		 * • controllable_by_this_extension: can be controlled by this extension
-		 * • controlled_by_this_extension: controlled by this extension
-		 */
-        levelOfControl: string;
-		/** The value of the setting. */
-        value: any;
-		/**
-		 * Optional.
-		 * Whether the effective value is specific to the incognito session.
-		 * This property will only be present if the incognito property in the details parameter of get() was true.
-		 */
-        incognitoSpecific?: boolean;
-    }
-
-    interface ChromeSettingChangedEvent extends chrome.events.Event<DetailsCallback> {}
-
-	/** An interface that allows access to a Chrome browser setting. See accessibilityFeatures for an example. */
-    interface ChromeSetting {
-		/**
-		 * Sets the value of a setting.
-		 * @param details Which setting to change.
-		 * @param callback Optional. Called at the completion of the set operation.
-		 */
-        set(details: ChromeSettingSetDetails, callback?: Function): void;
-		/**
-		 * Gets the value of a setting.
-		 * @param details Which setting to consider.
-		 */
-        get(details: ChromeSettingGetDetails, callback?: DetailsCallback): void;
-		/**
-		 * Clears the setting, restoring any default value.
-		 * @param details Which setting to clear.
-		 * @param callback Optional. Called at the completion of the clear operation.
-		 */
-        clear(details: ChromeSettingClearDetails, callback?: Function): void;
-		/** Fired after the setting changes. */
-        onChange: ChromeSettingChangedEvent;
-    }
-}
-
-////////////////////
-// VPN Provider
-////////////////////
-/**
- * Use the chrome.vpnProvider API to implement a VPN client.
- * Permissions:  "vpnProvider"
- * Important: This API works only on Chrome OS.
- * @since Chrome 43.
- */
-declare namespace chrome.vpnProvider {
-	interface VpnSessionParameters {
-		/** IP address for the VPN interface in CIDR notation. IPv4 is currently the only supported mode. */
-		address: string;
-		/** Optional. Broadcast address for the VPN interface. (default: deduced from IP address and mask) */
-		broadcastAddress?: string;
-		/** Optional. MTU setting for the VPN interface. (default: 1500 bytes) */
-		mtu?: string;
-		/**
-		 * Exclude network traffic to the list of IP blocks in CIDR notation from the tunnel. This can be used to bypass traffic to and from the VPN server. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
-		 */
-		exclusionList: string[];
-		/**
-		 * Include network traffic to the list of IP blocks in CIDR notation to the tunnel. This parameter can be used to set up a split tunnel. By default no traffic is directed to the tunnel. Adding the entry "0.0.0.0/0" to this list gets all the user traffic redirected to the tunnel. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
-		 */
-		inclusionList: string[];
-		/** Optional. A list of search domains. (default: no search domain) */
-		domainSearch?: string[];
-		/** A list of IPs for the DNS servers. */
-		dnsServer: string[];
-	}
-
-	interface VpnPlatformMessageEvent extends chrome.events.Event<(id: string, message: string, error: string) => void> {}
-
-	interface VpnPacketReceptionEvent extends chrome.events.Event<(data: ArrayBuffer) => void> {}
-
-	interface VpnConfigRemovalEvent extends chrome.events.Event<(id: string) => void> {}
-
-	interface VpnConfigCreationEvent extends chrome.events.Event<(id: string, name: string, data: Object) => void> {}
-
-	interface VpnUiEvent extends chrome.events.Event<(event: string, id?: string) => void> {}
-
-	/**
-	 * Creates a new VPN configuration that persists across multiple login sessions of the user.
-	 * @param name The name of the VPN configuration.
-	 * @param callback Called when the configuration is created or if there is an error.
-	 * Parameter id: A unique ID for the created configuration, empty string on failure.
-	 */
-	export function createConfig(name: string, callback: (id: string) => void): void;
-	/**
-	 * Destroys a VPN configuration created by the extension.
-	 * @param id ID of the VPN configuration to destroy.
-	 * @param callback Optional. Called when the configuration is destroyed or if there is an error.
-	 */
-	export function destroyConfig(id: string, callback?: Function): void;
-	/**
-	 * Sets the parameters for the VPN session. This should be called immediately after "connected" is received from the platform. This will succeed only when the VPN session is owned by the extension.
-	 * @param parameters The parameters for the VPN session.
-	 * @param callback Called when the parameters are set or if there is an error.
-	 */
-	export function setParameters(parameters: VpnSessionParameters, callback: Function): void;
-	/**
-	 * Sends an IP packet through the tunnel created for the VPN session. This will succeed only when the VPN session is owned by the extension.
-	 * @param data The IP packet to be sent to the platform.
-	 * @param callback Optional. Called when the packet is sent or if there is an error.
-	 */
-	export function sendPacket(data: ArrayBuffer, callback?: Function): void;
-	/**
-	 * Notifies the VPN session state to the platform. This will succeed only when the VPN session is owned by the extension.
-	 * @param state The VPN session state of the VPN client.
-	 * connected: VPN connection was successful.
-	 * failure: VPN connection failed.
-	 * @param callback Optional. Called when the notification is complete or if there is an error.
-	 */
-	export function notifyConnectionStateChanged(state: string, callback?: Function): void;
-
-	/** Triggered when a message is received from the platform for a VPN configuration owned by the extension. */
-	var onPlatformMessage: VpnPlatformMessageEvent;
-	/** Triggered when an IP packet is received via the tunnel for the VPN session owned by the extension. */
-	var onPacketReceived: VpnPacketReceptionEvent;
-	/** Triggered when a configuration created by the extension is removed by the platform. */
-	var onConfigRemoved: VpnConfigRemovalEvent;
-	/** Triggered when a configuration is created by the platform for the extension. */
-	var onConfigCreated: VpnConfigCreationEvent;
-	/** Triggered when there is a UI event for the extension. UI events are signals from the platform that indicate to the app that a UI dialog needs to be shown to the user. */
-	var onUIEvent: VpnUiEvent;
-}
-
-////////////////////
-// Wallpaper
-////////////////////
-/**
- * Use the chrome.wallpaper API to change the ChromeOS wallpaper.
- * Permissions:  "wallpaper"
- * Important: This API works only on Chrome OS.
- * @since Chrome 43.
- */
-declare namespace chrome.wallpaper {
-	interface WallpaperDetails {
-		/** Optional. The jpeg or png encoded wallpaper image. */
-		data?: any;
-		/** Optional. The URL of the wallpaper to be set. */
-		url?: string;
-		/**
-		 * The supported wallpaper layouts.
-		 * One of: "STRETCH", "CENTER", or "CENTER_CROPPED"
-		 */
-		layout: string;
-		/** The file name of the saved wallpaper. */
-		filename: string;
-		/** Optional. True if a 128x60 thumbnail should be generated. */
-		thumbnail?: boolean;
-	}
-
-	/**
-	 * Sets wallpaper to the image at url or wallpaperData with the specified layout
-	 * @param callback
-	 * Optional parameter thumbnail: The jpeg encoded wallpaper thumbnail. It is generated by resizing the wallpaper to 128x60.
-	 */
-	export function setWallpaper(details: WallpaperDetails, callback: (thumbnail: any) => void): void;
-}
-
-////////////////////
-// Web Navigation
-////////////////////
-/**
- * Use the chrome.webNavigation API to receive notifications about the status of navigation requests in-flight.
- * Permissions:  "webNavigation"
- * @since Chrome 16.
- */
-declare namespace chrome.webNavigation {
-    interface GetFrameDetails {
-		/**
-		 * The ID of the process runs the renderer for this tab.
-		 * @since Chrome 22.
-		 */
-        processId: number;
-		/** The ID of the tab in which the frame is. */
-        tabId: number;
-		/** The ID of the frame in the given tab. */
-        frameId: number;
-    }
-
-    interface GetFrameResultDetails {
-		/** The URL currently associated with this frame, if the frame identified by the frameId existed at one point in the given tab. The fact that an URL is associated with a given frameId does not imply that the corresponding frame still exists. */
-        url: string;
-		/** True if the last navigation in this frame was interrupted by an error, i.e. the onErrorOccurred event fired. */
-        errorOccurred: boolean;
-		/** ID of frame that wraps the frame. Set to -1 of no parent frame exists. */
-        parentFrameId: number;
-    }
-
-    interface GetAllFrameDetails {
-		/** The ID of the tab. */
-        tabId: number;
-    }
-
-    interface GetAllFrameResultDetails extends GetFrameResultDetails {
-		/** The ID of the process runs the renderer for this tab. */
-        processId: number;
-		/** The ID of the frame. 0 indicates that this is the main frame; a positive value indicates the ID of a subframe. */
-        frameId: number;
-    }
-
-	interface WebNavigationCallbackDetails {
-		/** The ID of the tab in which the navigation is about to occur. */
-        tabId: number;
-		/** The time when the browser was about to start the navigation, in milliseconds since the epoch. */
-        timeStamp: number;
-    }
-
-	interface WebNavigationUrlCallbackDetails extends WebNavigationCallbackDetails {
-        url: string;
-    }
-
-	interface WebNavigationReplacementCallbackDetails extends WebNavigationCallbackDetails {
-		/** The ID of the tab that was replaced. */
-		replacedTabId: number;
-    }
-
-	interface WebNavigationFramedCallbackDetails extends WebNavigationUrlCallbackDetails {
-		/** 0 indicates the navigation happens in the tab content window; a positive value indicates navigation in a subframe. Frame IDs are unique for a given tab and process. */
-		frameId: number;
-		/**
-		 * The ID of the process runs the renderer for this tab.
-		 * @since Chrome 22.
-		 */
-		processId: number;
-    }
-
-	interface WebNavigationFramedErrorCallbackDetails extends WebNavigationFramedCallbackDetails {
-		/** The error description. */
-		error: string;
-    }
-
-	interface WebNavigationSourceCallbackDetails extends WebNavigationUrlCallbackDetails {
-		/** The ID of the tab in which the navigation is triggered. */
-        sourceTabId: number;
-		/**
-		 * The ID of the process runs the renderer for the source tab.
-		 * @since Chrome 22.
-		 */
-        sourceProcessId: number;
-		/** The ID of the frame with sourceTabId in which the navigation is triggered. 0 indicates the main frame. */
-        sourceFrameId: number;
-    }
-
-	interface WebNavigationParentedCallbackDetails extends WebNavigationFramedCallbackDetails {
-		/**
-		 * ID of frame that wraps the frame. Set to -1 of no parent frame exists.
-		 * @since Chrome 24.
-		 */
-        parentFrameId: number;
-    }
-
-	interface WebNavigationTransitionCallbackDetails extends WebNavigationFramedCallbackDetails {
-		/**
-		 * Cause of the navigation.
-		 * One of: "link", "typed", "auto_bookmark", "auto_subframe", "manual_subframe", "generated", "start_page", "form_submit", "reload", "keyword", or "keyword_generated"
-		 */
-		transitionType: string;
-		/**
-		 * A list of transition qualifiers.
-		 * Each element one of: "client_redirect", "server_redirect", "forward_back", or "from_address_bar"
-		 */
-		transitionQualifiers: string[];
-    }
-
-	interface WebNavigationEventFilter {
-		/** Conditions that the URL being navigated to must satisfy. The 'schemes' and 'ports' fields of UrlFilter are ignored for this event. */
-        url: chrome.events.UrlFilter[];
-    }
-
-	interface WebNavigationEvent<T extends WebNavigationCallbackDetails> extends chrome.events.Event<(details: T) => void> {
-		addListener(callback: (details: T) => void, filters?: WebNavigationEventFilter): void;
-    }
-
-    interface WebNavigationFramedEvent extends WebNavigationEvent<WebNavigationFramedCallbackDetails> {}
-
-	interface WebNavigationFramedErrorEvent extends WebNavigationEvent<WebNavigationFramedErrorCallbackDetails> {}
-
-	interface WebNavigationSourceEvent extends WebNavigationEvent<WebNavigationSourceCallbackDetails> {}
-
-	interface WebNavigationParentedEvent extends WebNavigationEvent<WebNavigationParentedCallbackDetails> {}
-
-	interface WebNavigationTransitionalEvent extends WebNavigationEvent<WebNavigationTransitionCallbackDetails> {}
-
-	interface WebNavigationReplacementEvent extends WebNavigationEvent<WebNavigationReplacementCallbackDetails> {}
-
-	/**
-	 * Retrieves information about the given frame. A frame refers to an <iframe> or a <frame> of a web page and is identified by a tab ID and a frame ID.
-	 * @param details Information about the frame to retrieve information about.
-	 * @param callback
-	 * Optional parameter details: Information about the requested frame, null if the specified frame ID and/or tab ID are invalid.
-	 */
-    export function getFrame(details: GetFrameDetails, callback: (details?: GetFrameResultDetails) => void): void;
-	/**
-	 * Retrieves information about all frames of a given tab.
-	 * @param details Information about the tab to retrieve all frames from.
-	 * @param callback
-	 * Optional parameter details: A list of frames in the given tab, null if the specified tab ID is invalid.
-	 */
-    export function getAllFrames(details: GetAllFrameDetails, callback: (details?: GetAllFrameResultDetails[]) => void): void;
-
-	/** Fired when the reference fragment of a frame was updated. All future events for that frame will use the updated URL. */
-	var onReferenceFragmentUpdated: WebNavigationTransitionalEvent;
-	/** Fired when a document, including the resources it refers to, is completely loaded and initialized. */
-	var onCompleted: WebNavigationFramedEvent;
-	/**
-	 * Fired when the frame's history was updated to a new URL. All future events for that frame will use the updated URL.
-	 * @since Chrome 22.
-	 */
-	var onHistoryStateUpdated: WebNavigationTransitionalEvent;
-	/** Fired when a new window, or a new tab in an existing window, is created to host a navigation. */
-	var onCreatedNavigationTarget: WebNavigationSourceEvent;
-	/**
-	 * Fired when the contents of the tab is replaced by a different (usually previously pre-rendered) tab.
-	 * @since Chrome 22.
-	 */
-	var onTabReplaced: WebNavigationReplacementEvent;
-	/** Fired when a navigation is about to occur. */
-	var onBeforeNavigate: WebNavigationParentedEvent;
-	/** Fired when a navigation is committed. The document (and the resources it refers to, such as images and subframes) might still be downloading, but at least part of the document has been received from the server and the browser has decided to switch to the new document. */
-	var onCommitted: WebNavigationTransitionalEvent;
-	/** Fired when the page's DOM is fully constructed, but the referenced resources may not finish loading. */
-	var onDOMContentLoaded: WebNavigationFramedEvent;
-	/** Fired when an error occurs and the navigation is aborted. This can happen if either a network error occurred, or the user aborted the navigation. */
-	var onErrorOccurred: WebNavigationFramedErrorEvent;
-}
-
-////////////////////
-// Web Request
-////////////////////
-/**
- * Use the chrome.webRequest API to observe and analyze traffic and to intercept, block, or modify requests in-flight.
- * Permissions:  "webRequest", host permissions
- * @since Chrome 17.
- */
-declare namespace chrome.webRequest {
-    interface AuthCredentials {
-        username: string;
-        password: string;
-    }
-
-	/** An HTTP Header, represented as an object containing a key and either a value or a binaryValue. */
-    interface HttpHeader {
-        name: string;
-        value?: string;
-        binaryValue?: ArrayBuffer;
-    }
-
-	/** Returns value for event handlers that have the 'blocking' extraInfoSpec applied. Allows the event handler to modify network requests. */
-    interface BlockingResponse {
-		/** Optional. If true, the request is cancelled. Used in onBeforeRequest, this prevents the request from being sent. */
-        cancel?: boolean;
-		/**
-		 * Optional.
-		 * Only used as a response to the onBeforeRequest and onHeadersReceived events. If set, the original request is prevented from being sent/completed and is instead redirected to the given URL. Redirections to non-HTTP schemes such as data: are allowed. Redirects initiated by a redirect action use the original request method for the redirect, with one exception: If the redirect is initiated at the onHeadersReceived stage, then the redirect will be issued using the GET method.
-		 */
-        redirectUrl?: string;
-		/**
-		 * Optional.
-		 * Only used as a response to the onHeadersReceived event. If set, the server is assumed to have responded with these response headers instead. Only return responseHeaders if you really want to modify the headers in order to limit the number of conflicts (only one extension may modify responseHeaders for each request).
-		 */
-        responseHeaders?: HttpHeader[];
-		/** Optional. Only used as a response to the onAuthRequired event. If set, the request is made using the supplied credentials. */
-        authCredentials?: AuthCredentials;
-		/**
-		 * Optional.
-		 * Only used as a response to the onBeforeSendHeaders event. If set, the request is made with these request headers instead.
-		 */
-        requestHeaders?: HttpHeader[];
-    }
-
-	/** An object describing filters to apply to webRequest events. */
-    interface RequestFilter {
-		/** Optional. */
-        tabId?: number;
-		/**
-		 * A list of request types. Requests that cannot match any of the types will be filtered out.
-		 * Each element one of: "main_frame", "sub_frame", "stylesheet", "script", "image", "object", "xmlhttprequest", or "other"
-		 */
-        types?: string[];
-		/** A list of URLs or URL patterns. Requests that cannot match any of the URLs will be filtered out. */
-        urls: string[];
-		/** Optional. */
-        windowId?: number;
-    }
-
-	/**
-	 * Contains data uploaded in a URL request.
-	 * @since Chrome 23.
-	 */
-    interface UploadData {
-		/** Optional. An ArrayBuffer with a copy of the data. */
-        bytes?: ArrayBuffer;
-		/** Optional. A string with the file's path and name. */
-        file?: string;
-    }
-
-	interface WebRequestBody {
-		/** Optional. Errors when obtaining request body data. */
-		error?: string;
-		/**
-		 * Optional.
-		 * If the request method is POST and the body is a sequence of key-value pairs encoded in UTF8, encoded as either multipart/form-data, or application/x-www-form-urlencoded, this dictionary is present and for each key contains the list of all values for that key. If the data is of another media type, or if it is malformed, the dictionary is not present. An example value of this dictionary is {'key': ['value1', 'value2']}.
-		 */
-		formData?: Object;
-		/**
-		 * Optional.
-		 * If the request method is PUT or POST, and the body is not already parsed in formData, then the unparsed request body elements are contained in this array.
-		 */
-		raw?: UploadData[];
-	}
-
-	interface WebAuthChallenger {
-		host: string;
-		port: number;
-	}
-
-	interface ResourceRequest {
-		/** The ID of the request. Request IDs are unique within a browser session. As a result, they could be used to relate different events of the same request. */
-        requestId: string;
-		/** The value 0 indicates that the request happens in the main frame; a positive value indicates the ID of a subframe in which the request happens. If the document of a (sub-)frame is loaded (type is main_frame or sub_frame), frameId indicates the ID of this frame, not the ID of the outer frame. Frame IDs are unique within a tab. */
-        frameId: number;
-		/** ID of frame that wraps the frame which sent the request. Set to -1 if no parent frame exists. */
-        parentFrameId: number;
-		/** The ID of the tab in which the request takes place. Set to -1 if the request isn't related to a tab. */
-		tabId: number;
-		/**
-		 * How the requested resource will be used.
-		 * One of: "main_frame", "sub_frame", "stylesheet", "script", "image", "object", "xmlhttprequest", or "other"
-		 */
-        type: string;
-		/** The time when this signal is triggered, in milliseconds since the epoch. */
-		timeStamp: number;
-    }
-
-	interface WebRequestDetails extends ResourceRequest {
-		url: string;
-		/** Standard HTTP method. */
-		method: string;
-    }
-
-	interface WebRequestHeadersDetails extends WebRequestDetails {
-		/** Optional. The HTTP request headers that are going to be sent out with this request. */
-		requestHeaders?: HttpHeader[];
-    }
-
-	interface WebRequestBodyDetails extends WebRequestDetails {
-		/**
-		 * Contains the HTTP request body data. Only provided if extraInfoSpec contains 'requestBody'.
-		 * @since Chrome 23.
-		 */
-		requestBody: WebRequestBody;
-    }
-
-	interface WebRequestFullDetails extends WebRequestHeadersDetails, WebRequestBodyDetails {
-    }
-
-	interface WebResponseDetails extends ResourceRequest {
-		/** HTTP status line of the response or the 'HTTP/0.9 200 OK' string for HTTP/0.9 responses (i.e., responses that lack a status line). */
-        statusLine: string;
-		/**
-		 * Standard HTTP status code returned by the server.
-		 * @since Chrome 43.
-		 */
-		statusCode: number;
-    }
-
-	interface WebResponseHeadersDetails extends WebResponseDetails {
-		/** Optional. The HTTP response headers that have been received with this response. */
-		responseHeaders?: HttpHeader[];
-    }
-
-	interface WebResponseCacheDetails extends WebResponseHeadersDetails {
-		/**
-		 * Optional.
-		 * The server IP address that the request was actually sent to. Note that it may be a literal IPv6 address.
-		 */
-        ip?: string;
-		/** Indicates if this response was fetched from disk cache. */
-        fromCache: boolean;
-    }
-
-	interface WebRedirectionResponseDetails extends WebResponseCacheDetails {
-		/** The new URL. */
-		redirectUrl: string;
-    }
-
-	interface WebAuthenticationChallengeDetails extends WebResponseHeadersDetails {
-		/** The authentication scheme, e.g. Basic or Digest. */
-		schema: string;
-		/** The authentication realm provided by the server, if there is one. */
-		realm?: string;
-		/** The server requesting authentication. */
-		challenger: WebAuthChallenger;
-		/** True for Proxy-Authenticate, false for WWW-Authenticate. */
-		isProxy: boolean;
-    }
-
-	interface WebResponseErrorDetails extends WebResponseCacheDetails {
-		/** The error description. This string is not guaranteed to remain backwards compatible between releases. You must not parse and act based upon its content. */
-		error: string;
-    }
-
-	interface WebRequestBodyEvent extends chrome.events.Event<(details: WebRequestBodyDetails) => void> {
-		addListener(callback: (details: WebRequestBodyDetails) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void;
-    }
-
-	interface WebRequestHeadersEvent extends chrome.events.Event<(details: WebRequestHeadersDetails) => void> {
-		addListener(callback: (details: WebRequestHeadersDetails) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void;
-    }
-
-	interface _WebResponseHeadersEvent<T extends WebResponseHeadersDetails> extends chrome.events.Event<(details: T) => void> {
-		addListener(callback: (details: T) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void;
-    }
-
-    interface WebResponseHeadersEvent extends _WebResponseHeadersEvent<WebResponseHeadersDetails> {}
-
-    interface WebResponseCacheEvent extends _WebResponseHeadersEvent<WebResponseCacheDetails> {}
-
-	interface WebRedirectionResponseEvent extends _WebResponseHeadersEvent<WebRedirectionResponseDetails> {}
-
-	interface WebAuthenticationChallengeEvent extends chrome.events.Event<(details: WebAuthenticationChallengeDetails, callback?: (response: BlockingResponse) => void) => void> {}
-
-	interface WebResponseErrorEvent extends _WebResponseHeadersEvent<WebResponseErrorDetails> {}
-
-	/**
-	 * The maximum number of times that handlerBehaviorChanged can be called per 10 minute sustained interval. handlerBehaviorChanged is an expensive function call that shouldn't be called often.
-	 * @since Chrome 23.
-	 */
-    var MAX_HANDLER_BEHAVIOR_CHANGED_CALLS_PER_10_MINUTES: number;
-
-	/** Needs to be called when the behavior of the webRequest handlers has changed to prevent incorrect handling due to caching. This function call is expensive. Don't call it often. */
-    export function handlerBehaviorChanged(callback?: Function): void;
-
-	/** Fired when a request is about to occur. */
-	var onBeforeRequest: WebRequestBodyEvent;
-	/** Fired before sending an HTTP request, once the request headers are available. This may occur after a TCP connection is made to the server, but before any HTTP data is sent. */
-	var onBeforeSendHeaders: WebRequestHeadersEvent;
-	/** Fired just before a request is going to be sent to the server (modifications of previous onBeforeSendHeaders callbacks are visible by the time onSendHeaders is fired). */
-	var onSendHeaders: WebRequestHeadersEvent;
-	/** Fired when HTTP response headers of a request have been received. */
-	var onHeadersReceived: WebResponseHeadersEvent;
-	/** Fired when an authentication failure is received. The listener has three options: it can provide authentication credentials, it can cancel the request and display the error page, or it can take no action on the challenge. If bad user credentials are provided, this may be called multiple times for the same request. */
-	var onAuthRequired: WebAuthenticationChallengeEvent;
-	/** Fired when the first byte of the response body is received. For HTTP requests, this means that the status line and response headers are available. */
-	var onResponseStarted: WebResponseCacheEvent;
-	/** Fired when a server-initiated redirect is about to occur. */
-	var onBeforeRedirect: WebRedirectionResponseEvent;
-	/** Fired when a request is completed. */
-	var onCompleted: WebResponseCacheEvent;
-	/** Fired when an error occurs. */
-	var onErrorOccurred: WebResponseErrorEvent;
-}
-
-////////////////////
-// Web Store
-////////////////////
-/**
- * Use the chrome.webstore API to initiate app and extension installations "inline" from your site.
- * @since Chrome 15.
- */
-declare namespace chrome.webstore {
-	/**
-	 * @param url Optional. If you have more than one <link> tag on your page with the chrome-webstore-item relation, you can choose which item you'd like to install by passing in its URL here. If it is omitted, then the first (or only) link will be used. An exception will be thrown if the passed in URL does not exist on the page.
-	 * @param successCallback Optional. This function is invoked when inline installation successfully completes (after the dialog is shown and the user agrees to add the item to Chrome). You may wish to use this to hide the user interface element that prompted the user to install the app or extension.
-	 * @param failureCallback Optional. This function is invoked when inline installation does not successfully complete. Possible reasons for this include the user canceling the dialog, the linked item not being found in the store, or the install being initiated from a non-verified site.
-	 * Parameter error: The failure detail. You may wish to inspect or log this for debugging purposes, but you should not rely on specific strings being passed back.
-	 * Optional parameter errorCode: The error code from the stable set of possible errors.
-	 * * Enum of the possible install results, including error codes sent back in the event that an inline installation has failed.
-	 * * * "otherError": An uncommon, unrecognized, or unexpected error. In some cases, the readable error string can provide more information.
-	 * * * "aborted": The operation was aborted as the requestor is no longer alive.
-	 * * * "installInProgress": An installation of the same extension is in progress.
-	 * * * "notPermitted": The installation is not permitted.
-	 * * * "invalidId": Invalid Chrome Web Store item ID.
-	 * * * "webstoreRequestError": Failed to retrieve extension metadata from the Web Store.
-	 * * * "invalidWebstoreResponse": The extension metadata retrieved from the Web Store was invalid.
-	 * * * "invalidManifest": An error occurred while parsing the extension manifest retrieved from the Web Store.
-	 * * * "iconError": Failed to retrieve the extension's icon from the Web Store, or the icon was invalid.
-	 * * * "userCanceled": The user canceled the operation.
-	 * * * "blacklisted": The extension is blacklisted.
-	 * * * "missingDependencies": Unsatisfied dependencies, such as shared modules.
-	 * * * "requirementViolations": Unsatisfied requirements, such as webgl.
-	 * * * "blockedByPolicy": The extension is blocked by management policies.
-	 * * * "launchFeatureDisabled": The launch feature is not available.
-	 * * * "launchUnsupportedExtensionType": The launch feature is not supported for the extension type.
-	 * * * "launchInProgress": A launch of the same extension is in progress.
-	 */
-	export function install(url: string, successCallback?: Function, failureCallback?: (error: string, errorCode?: string) => void): void;
-	/**
-	 * @param successCallback Optional. This function is invoked when inline installation successfully completes (after the dialog is shown and the user agrees to add the item to Chrome). You may wish to use this to hide the user interface element that prompted the user to install the app or extension.
-	 * @param failureCallback Optional. This function is invoked when inline installation does not successfully complete. Possible reasons for this include the user canceling the dialog, the linked item not being found in the store, or the install being initiated from a non-verified site.
-	 * Parameter error: The failure detail. You may wish to inspect or log this for debugging purposes, but you should not rely on specific strings being passed back.
-	 * Optional parameter errorCode: The error code from the stable set of possible errors.
-	 * * Enum of the possible install results, including error codes sent back in the event that an inline installation has failed.
-	 * * * "otherError": An uncommon, unrecognized, or unexpected error. In some cases, the readable error string can provide more information.
-	 * * * "aborted": The operation was aborted as the requestor is no longer alive.
-	 * * * "installInProgress": An installation of the same extension is in progress.
-	 * * * "notPermitted": The installation is not permitted.
-	 * * * "invalidId": Invalid Chrome Web Store item ID.
-	 * * * "webstoreRequestError": Failed to retrieve extension metadata from the Web Store.
-	 * * * "invalidWebstoreResponse": The extension metadata retrieved from the Web Store was invalid.
-	 * * * "invalidManifest": An error occurred while parsing the extension manifest retrieved from the Web Store.
-	 * * * "iconError": Failed to retrieve the extension's icon from the Web Store, or the icon was invalid.
-	 * * * "userCanceled": The user canceled the operation.
-	 * * * "blacklisted": The extension is blacklisted.
-	 * * * "missingDependencies": Unsatisfied dependencies, such as shared modules.
-	 * * * "requirementViolations": Unsatisfied requirements, such as webgl.
-	 * * * "blockedByPolicy": The extension is blocked by management policies.
-	 * * * "launchFeatureDisabled": The launch feature is not available.
-	 * * * "launchUnsupportedExtensionType": The launch feature is not supported for the extension type.
-	 * * * "launchInProgress": A launch of the same extension is in progress.
-	 */
-	export function install(successCallback: Function, failureCallback?: (error: string, errorCode?: string) => void): void;
-	/**
-	 * @param failureCallback Optional. This function is invoked when inline installation does not successfully complete. Possible reasons for this include the user canceling the dialog, the linked item not being found in the store, or the install being initiated from a non-verified site.
-	 * Parameter error: The failure detail. You may wish to inspect or log this for debugging purposes, but you should not rely on specific strings being passed back.
-	 * Optional parameter errorCode: The error code from the stable set of possible errors.
-	 * * Enum of the possible install results, including error codes sent back in the event that an inline installation has failed.
-	 * * * "otherError": An uncommon, unrecognized, or unexpected error. In some cases, the readable error string can provide more information.
-	 * * * "aborted": The operation was aborted as the requestor is no longer alive.
-	 * * * "installInProgress": An installation of the same extension is in progress.
-	 * * * "notPermitted": The installation is not permitted.
-	 * * * "invalidId": Invalid Chrome Web Store item ID.
-	 * * * "webstoreRequestError": Failed to retrieve extension metadata from the Web Store.
-	 * * * "invalidWebstoreResponse": The extension metadata retrieved from the Web Store was invalid.
-	 * * * "invalidManifest": An error occurred while parsing the extension manifest retrieved from the Web Store.
-	 * * * "iconError": Failed to retrieve the extension's icon from the Web Store, or the icon was invalid.
-	 * * * "userCanceled": The user canceled the operation.
-	 * * * "blacklisted": The extension is blacklisted.
-	 * * * "missingDependencies": Unsatisfied dependencies, such as shared modules.
-	 * * * "requirementViolations": Unsatisfied requirements, such as webgl.
-	 * * * "blockedByPolicy": The extension is blocked by management policies.
-	 * * * "launchFeatureDisabled": The launch feature is not available.
-	 * * * "launchUnsupportedExtensionType": The launch feature is not supported for the extension type.
-	 * * * "launchInProgress": A launch of the same extension is in progress.
-	 */
-	export function install(failureCallback?: (error: string, errorCode?: string) => void): void;
-
-	interface InstallationStageEvent extends chrome.events.Event<(stage: string) => void> {}
-
-	interface DownloadProgressEvent extends chrome.events.Event<(percentDownloaded: number) => void> {}
-
-	/**
-	 * Fired when an inline installation enters a new InstallStage. In order to receive notifications about this event, listeners must be registered before the inline installation begins.
-	 * @since Chrome 35.
-	 */
-	var onInstallStageChanged: InstallationStageEvent;
-	/**
-	 * Fired periodically with the download progress of an inline install. In order to receive notifications about this event, listeners must be registered before the inline installation begins.
-	 * @since Chrome 35.
-	 */
-	var onDownloadProgress: DownloadProgressEvent;
-}
-
-////////////////////
-// Windows
-////////////////////
-/**
- * Use the chrome.windows API to interact with browser windows. You can use this API to create, modify, and rearrange windows in the browser.
- * Permissions: The chrome.windows API can be used without declaring any permission. However, the "tabs" permission is required in order to populate the url, title, and favIconUrl properties of Tab objects.
- * @since Chrome 5.
- */
-declare namespace chrome.windows {
-    interface Window {
-		/** Array of tabs.Tab objects representing the current tabs in the window. */
-        tabs?: chrome.tabs.Tab[];
-		/** Optional. The offset of the window from the top edge of the screen in pixels. Under some circumstances a Window may not be assigned top property, for example when querying closed windows from the sessions API. */
-		top?: number;
-		/** Optional. The height of the window, including the frame, in pixels. Under some circumstances a Window may not be assigned height property, for example when querying closed windows from the sessions API. */
-		height?: number;
-		/** Optional. The width of the window, including the frame, in pixels. Under some circumstances a Window may not be assigned width property, for example when querying closed windows from the sessions API. */
-		width?: number;
-		/**
-		 * The state of this browser window.
-		 * One of: "normal", "minimized", "maximized", "fullscreen", or "docked"
-		 * @since Chrome 17.
-		 */
-        state: string;
-		/** Whether the window is currently the focused window. */
-        focused: boolean;
-		/**
-		 * Whether the window is set to be always on top.
-		 * @since Chrome 19.
-		 */
-        alwaysOnTop: boolean;
-		/** Whether the window is incognito. */
-        incognito: boolean;
-		/**
-		 * The type of browser window this is.
-		 * One of: "normal", "popup", "panel", "app", or "devtools"
-		 */
-        type: string;
-		/** Optional. The ID of the window. Window IDs are unique within a browser session. Under some circumstances a Window may not be assigned an ID, for example when querying windows using the sessions API, in which case a session ID may be present. */
-        id: number;
-		/** Optional. The offset of the window from the left edge of the screen in pixels. Under some circumstances a Window may not be assigned left property, for example when querying closed windows from the sessions API. */
-		left?: number;
-		/**
-		 * The session ID used to uniquely identify a Window obtained from the sessions API.
-		 * @since Chrome 31.
-		 */
-		sessionId?: string;
-    }
-
-    interface GetInfo {
-		/**
-		 * Optional.
-		 * If true, the windows.Window object will have a tabs property that contains a list of the tabs.Tab objects. The Tab objects only contain the url, title and favIconUrl properties if the extension's manifest file includes the "tabs" permission.
-		 */
-        populate?: boolean;
-		/**
-		 * If set, the windows.Window returned will be filtered based on its type. If unset the default filter is set to ['app', 'normal', 'panel', 'popup'], with 'app' and 'panel' window types limited to the extension's own windows.
-		 * Each one of: "normal", "popup", "panel", "app", or "devtools"
-		 * @since Chrome 46. Warning: this is the current Beta channel.
-		 */
-		windowTypes?: string[];
-    }
-
-    interface CreateData {
-		/**
-		 * Optional. The id of the tab for which you want to adopt to the new window.
-		 * @since Chrome 10.
-		 */
-        tabId?: number;
-		/**
-		 * Optional.
-		 * A URL or array of URLs to open as tabs in the window. Fully-qualified URLs must include a scheme (i.e. 'http://www.google.com', not 'www.google.com'). Relative URLs will be relative to the current page within the extension. Defaults to the New Tab Page.
-		 */
-		url?: string | string[];
-		/**
-		 * Optional.
-		 * The number of pixels to position the new window from the top edge of the screen. If not specified, the new window is offset naturally from the last focused window. This value is ignored for panels.
-		 */
-        top?: number;
-		/**
-		 * Optional.
-		 * The height in pixels of the new window, including the frame. If not specified defaults to a natural height.
-		 */
-        height?: number;
-		/**
-		 * Optional.
-		 * The width in pixels of the new window, including the frame. If not specified defaults to a natural width.
-		 */
-        width?: number;
-		/**
-		 * Optional. If true, opens an active window. If false, opens an inactive window.
-		 * @since Chrome 12.
-		 */
-        focused?: boolean;
-		/** Optional. Whether the new window should be an incognito window. */
-        incognito?: boolean;
-		/**
-		 * Optional. Specifies what type of browser window to create. The 'panel' and 'detached_panel' types create a popup unless the '--enable-panels' flag is set.
-		 * One of: "normal", "popup", "panel", or "detached_panel"
-		 */
-        type?: string;
-		/**
-		 * Optional.
-		 * The number of pixels to position the new window from the left edge of the screen. If not specified, the new window is offset naturally from the last focused window. This value is ignored for panels.
-		 */
-        left?: number;
-		/**
-		 * Optional. The initial state of the window. The 'minimized', 'maximized' and 'fullscreen' states cannot be combined with 'left', 'top', 'width' or 'height'.
-		 * One of: "normal", "minimized", "maximized", "fullscreen", or "docked"
-		 * @since Chrome 44.
-		 */
-		state?: string;
-    }
-
-    interface UpdateInfo {
-		/** Optional. The offset from the top edge of the screen to move the window to in pixels. This value is ignored for panels. */
-        top?: number;
-		/**
-		 * Optional. If true, causes the window to be displayed in a manner that draws the user's attention to the window, without changing the focused window. The effect lasts until the user changes focus to the window. This option has no effect if the window already has focus. Set to false to cancel a previous draw attention request.
-		 * @since Chrome 14.
-		 */
-        drawAttention?: boolean;
-		/** Optional. The height to resize the window to in pixels. This value is ignored for panels. */
-        height?: number;
-		/** Optional. The width to resize the window to in pixels. This value is ignored for panels. */
-        width?: number;
-		/**
-		 * Optional. The new state of the window. The 'minimized', 'maximized' and 'fullscreen' states cannot be combined with 'left', 'top', 'width' or 'height'.
-		 * One of: "normal", "minimized", "maximized", "fullscreen", or "docked"
-		 * @since Chrome 17.
-		 */
-        state?: string;
-		/**
-		 * Optional. If true, brings the window to the front. If false, brings the next window in the z-order to the front.
-		 * @since Chrome 8.
-		 */
-        focused?: boolean;
-		/** Optional. The offset from the left edge of the screen to move the window to in pixels. This value is ignored for panels. */
-        left?: number;
-    }
-
-	interface WindowEventFilter {
-		/**
-		 * Conditions that the window's type being created must satisfy. By default it will satisfy ['app', 'normal', 'panel', 'popup'], with 'app' and 'panel' window types limited to the extension's own windows.
-		 * Each one of: "normal", "popup", "panel", "app", or "devtools"
-		 */
-		windowTypes: string[];
-    }
-
-	interface WindowIdEvent extends chrome.events.Event<(windowId: number, filters?: WindowEventFilter) => void> {}
-
-	interface WindowReferenceEvent extends chrome.events.Event<(window: Window, filters?: WindowEventFilter) => void> {}
-
-	/**
-	 * The windowId value that represents the current window.
-	 * @since Chrome 18.
-	 */
-    var WINDOW_ID_CURRENT: number;
-	/**
-	 * The windowId value that represents the absence of a chrome browser window.
-	 * @since Chrome 6.
-	 */
-    var WINDOW_ID_NONE: number;
-
-	/** Gets details about a window. */
-    export function get(windowId: number, callback: (window: chrome.windows.Window) => void): void;
-	/**
-	 * Gets details about a window.
-	 * @since Chrome 18.
-	 */
-    export function get(windowId: number, getInfo: GetInfo, callback: (window: chrome.windows.Window) => void): void;
-	/**
-	 * Gets the current window.
-	 */
-    export function getCurrent(callback: (window: chrome.windows.Window) => void): void;
-	/**
-	 * Gets the current window.
-	 * @since Chrome 18.
-	 */
-    export function getCurrent(getInfo: GetInfo, callback: (window: chrome.windows.Window) => void): void;
-	/**
-	 * Creates (opens) a new browser with any optional sizing, position or default URL provided.
-	 * @param callback
-	 * Optional parameter window: Contains details about the created window.
-	 */
-	export function create(callback?: (window?: chrome.windows.Window) => void): void;
-	/**
-	 * Creates (opens) a new browser with any optional sizing, position or default URL provided.
-	 * @param callback
-	 * Optional parameter window: Contains details about the created window.
-	 */
-	export function create(createData: CreateData, callback?: (window?: chrome.windows.Window) => void): void;
-	/**
-	 * Gets all windows.
-	 */
-    export function getAll(callback: (windows: chrome.windows.Window[]) => void): void;
-	/**
-	 * Gets all windows.
-	 * @since Chrome 18.
-	 */
-    export function getAll(getInfo: GetInfo, callback: (windows: chrome.windows.Window[]) => void): void;
-	/** Updates the properties of a window. Specify only the properties that you want to change; unspecified properties will be left unchanged. */
-    export function update(windowId: number, updateInfo: UpdateInfo, callback?: (window: chrome.windows.Window) => void): void;
-	/** Removes (closes) a window, and all the tabs inside it. */
-    export function remove(windowId: number, callback?: Function): void;
-	/**
-	 * Gets the window that was most recently focused — typically the window 'on top'.
-	 */
-    export function getLastFocused(callback: (window: chrome.windows.Window) => void): void;
-	/**
-	 * Gets the window that was most recently focused — typically the window 'on top'.
-	 * @since Chrome 18.
-	 */
-    export function getLastFocused(getInfo: GetInfo, callback: (window: chrome.windows.Window) => void): void;
-
-	/** Fired when a window is removed (closed). */
-	var onRemoved: WindowIdEvent;
-	/** Fired when a window is created. */
-	var onCreated: WindowReferenceEvent;
-	/**
-	 * Fired when the currently focused window changes. Will be chrome.windows.WINDOW_ID_NONE if all chrome windows have lost focus.
-	 * Note: On some Linux window managers, WINDOW_ID_NONE will always be sent immediately preceding a switch from one chrome window to another.
-	 */
-	var onFocusChanged: WindowIdEvent;
-}
diff --git a/chrome/index.d.ts b/chrome/index.d.ts
new file mode 100644
index 0000000000..e6b6274906
--- /dev/null
+++ b/chrome/index.d.ts
@@ -0,0 +1,7692 @@
+// Type definitions for Chrome extension development
+// Project: http://developer.chrome.com/extensions/
+// Definitions by: Matthew Kimber <https://github.com/matthewkimber>, otiai10 <https://github.com/otiai10>, couven92 <https://github.com/couven92>, RReverser <https://github.com/rreverser>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="webrtc" />
+/// <reference types="filesystem" />
+
+////////////////////
+// Global object
+////////////////////
+interface Window {
+    chrome: typeof chrome;
+}
+
+////////////////////
+// Accessibility Features
+////////////////////
+/**
+ * Use the chrome.accessibilityFeatures API to manage Chrome's accessibility features. This API relies on the ChromeSetting prototype of the type API for getting and setting individual accessibility features. In order to get feature states the extension must request accessibilityFeatures.read permission. For modifying feature state, the extension needs accessibilityFeatures.modify permission. Note that accessibilityFeatures.modify does not imply accessibilityFeatures.read permission.
+ * Availability: Since Chrome 37.
+ * Permissions: "accessibilityFeatures.read"
+ * Important: This API works only on Chrome OS.
+ */
+declare namespace chrome.accessibilityFeatures {
+	interface AccessibilityFeaturesGetArg {
+		/** Optional. Whether to return the value that applies to the incognito session (default false).  */
+		incognito?: boolean;
+	}
+
+	interface AccessibilityFeaturesCallbackArg {
+		/** The value of the setting. */
+		value: any;
+		/**
+		 * One of
+		 * • not_controllable: cannot be controlled by any extension
+		 * • controlled_by_other_extensions: controlled by extensions with higher precedence
+		 * • controllable_by_this_extension: can be controlled by this extension
+		 * • controlled_by_this_extension: controlled by this extension
+		 */
+		levelOfControl: string;
+		/** Optional. Whether the effective value is specific to the incognito session. This property will only be present if the incognito property in the details parameter of get() was true.  */
+		incognitoSpecific?: boolean;
+	}
+
+	interface AccessibilityFeaturesSetArg {
+		/**
+		 * The value of the setting.
+		 * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
+		 */
+		value: any;
+		/**
+		 * Optional.
+ 		 * The scope of the ChromeSetting. One of
+		 * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+		 * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+		 * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+		 * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+		 */
+		scope?: string;
+	}
+
+	interface AccessibilityFeaturesClearArg {
+		/**
+		 * Optional.
+ 		 * The scope of the ChromeSetting. One of
+		 * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+		 * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+		 * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+		 * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+		 */
+		scope?: string;
+	}
+
+	interface AccessibilityFeaturesSetting {
+		/**
+		 * Gets the value of a setting.
+		 * @param details Which setting to consider.
+		 * @param callback The callback parameter should be a function that looks like this:
+		 * function(object details) {...};
+		 */
+		get(details: AccessibilityFeaturesGetArg, callback: (details: AccessibilityFeaturesCallbackArg) => void): void;
+		/**
+		 * Sets the value of a setting.
+		 * @param details Which setting to change.
+		 * @param callback Called at the completion of the set operation.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
+		 */
+		set(details: AccessibilityFeaturesSetArg, callback?: () => void): void;
+		/**
+		 * Clears the setting, restoring any default value.
+		 * @param details Which setting to clear.
+		 * @param callback Called at the completion of the clear operation.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
+		 */
+		clear(details: AccessibilityFeaturesClearArg, callback?: () => void): void;
+	}
+
+	var spokenFeedback: AccessibilityFeaturesSetting;
+	var largeCursor: AccessibilityFeaturesSetting;
+	var stickyKeys: AccessibilityFeaturesSetting;
+	var highContrast: AccessibilityFeaturesSetting;
+	var screenMagnifier: AccessibilityFeaturesSetting;
+	var autoclick: AccessibilityFeaturesSetting;
+	var virtualKeyboard: AccessibilityFeaturesSetting;
+	var animationPolicy: AccessibilityFeaturesSetting;
+}
+
+////////////////////
+// Alarms
+////////////////////
+/**
+ * Use the chrome.alarms API to schedule code to run periodically or at a specified time in the future.
+ * Availability: Since Chrome 22.
+ * Permissions:  "alarms"
+ */
+declare namespace chrome.alarms {
+    interface AlarmCreateInfo {
+		/** Optional. Length of time in minutes after which the onAlarm event should fire.  */
+        delayInMinutes?: number;
+		/** Optional. If set, the onAlarm event should fire every periodInMinutes minutes after the initial event specified by when or delayInMinutes. If not set, the alarm will only fire once.  */
+        periodInMinutes?: number;
+		/** Optional. Time at which the alarm should fire, in milliseconds past the epoch (e.g. Date.now() + n).  */
+        when?: number;
+    }
+
+    interface Alarm {
+		/** Optional. If not null, the alarm is a repeating alarm and will fire again in periodInMinutes minutes.  */
+        periodInMinutes?: number;
+		/** Time at which this alarm was scheduled to fire, in milliseconds past the epoch (e.g. Date.now() + n). For performance reasons, the alarm may have been delayed an arbitrary amount beyond this. */
+        scheduledTime: number;
+		/** Name of this alarm. */
+        name: string;
+    }
+
+    interface AlarmEvent extends chrome.events.Event<(alarm: Alarm) => void> {}
+
+	/**
+	 * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
+	 * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
+	 * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
+	 * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
+	 */
+    export function create(alarmInfo: AlarmCreateInfo): void;
+	/**
+	 * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
+	 * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
+	 * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
+	 * @param name Optional name to identify this alarm. Defaults to the empty string.
+	 * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
+	 */
+    export function create(name: string, alarmInfo: AlarmCreateInfo): void;
+	/**
+	 * Gets an array of all the alarms.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of Alarm alarms) {...};
+	 */
+    export function getAll(callback: (alarms: Alarm[]) => void): void;
+	/**
+	 * Clears all alarms.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(boolean wasCleared) {...};
+	 */
+    export function clearAll(callback?: (wasCleared: boolean) => void): void;
+	/**
+	 * Clears the alarm with the given name.
+	 * @param name The name of the alarm to clear. Defaults to the empty string.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(boolean wasCleared) {...};
+	 */
+    export function clear(name?: string, callback?: (wasCleared: boolean) => void): void;
+	/**
+	 * Clears the alarm without a name.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(boolean wasCleared) {...};
+	 */
+    export function clear(callback: (wasCleared: boolean) => void): void;
+	/**
+	 * Retrieves details about the specified alarm.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function( Alarm alarm) {...};
+	 */
+    export function get(callback: (alarm: Alarm) => void): void;
+	/**
+	 * Retrieves details about the specified alarm.
+	 * @param name The name of the alarm to get. Defaults to the empty string.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function( Alarm alarm) {...};
+	 */
+    export function get(name: string, callback: (alarm: Alarm) => void): void;
+
+	/** Fired when an alarm has elapsed. Useful for event pages. */
+    var onAlarm: AlarmEvent;
+}
+
+/**
+ * Use the chrome.browser API to interact with the Chrome browser associated with
+ * the current application and Chrome profile.
+ */
+declare namespace chrome.browser {
+    interface Options {
+        /** The URL to navigate to when the new tab is initially opened. */
+        url: string;
+    }
+
+    /**
+     * Opens a new tab in a browser window associated with the current application
+     * and Chrome profile. If no browser window for the Chrome profile is opened,
+     * a new one is opened prior to creating the new tab.
+     * @param options Configures how the tab should be opened.
+     * @param callback Called when the tab was successfully
+     * created, or failed to be created. If failed, runtime.lastError will be set.
+     */
+    export function openTab(options: Options, callback: () => void): void;
+
+	/**
+	* Opens a new tab in a browser window associated with the current application
+	* and Chrome profile. If no browser window for the Chrome profile is opened,
+	* a new one is opened prior to creating the new tab. Since Chrome 42 only.
+	* @param options Configures how the tab should be opened.
+	*/
+    export function openTab(options: Options): void;
+}
+
+////////////////////
+// Bookmarks
+////////////////////
+/**
+ * Use the chrome.bookmarks API to create, organize, and otherwise manipulate bookmarks. Also see Override Pages, which you can use to create a custom Bookmark Manager page.
+ * Availability: Since Chrome 5.
+ * Permissions:  "bookmarks"
+ */
+declare namespace chrome.bookmarks {
+	/** A node (either a bookmark or a folder) in the bookmark tree. Child nodes are ordered within their parent folder. */
+    interface BookmarkTreeNode {
+		/** Optional. The 0-based position of this node within its parent folder.  */
+        index?: number;
+		/** Optional. When this node was created, in milliseconds since the epoch (new Date(dateAdded)).  */
+        dateAdded?: number;
+		/** The text displayed for the node. */
+        title: string;
+		/** Optional. The URL navigated to when a user clicks the bookmark. Omitted for folders.   */
+        url?: string;
+		/** Optional. When the contents of this folder last changed, in milliseconds since the epoch.   */
+        dateGroupModified?: number;
+		/** The unique identifier for the node. IDs are unique within the current profile, and they remain valid even after the browser is restarted.  */
+        id: string;
+		/** Optional. The id of the parent folder. Omitted for the root node.   */
+        parentId?: string;
+		/** Optional. An ordered list of children of this node.  */
+        children?: BookmarkTreeNode[];
+		/**
+		 * Optional.
+ 		 * Since Chrome 37.
+		 * Indicates the reason why this node is unmodifiable. The managed value indicates that this node was configured by the system administrator or by the custodian of a supervised user. Omitted if the node can be modified by the user and the extension (default).
+		 */
+		unmodifiable?: any;
+    }
+
+    interface BookmarkRemoveInfo {
+        index: number;
+        parentId: string;
+    }
+
+    interface BookmarkMoveInfo {
+        index: number;
+        oldIndex: number;
+        parentId: string;
+        oldParentId: string;
+    }
+
+    interface BookmarkChangeInfo {
+        url?: string;
+        title: string;
+    }
+
+    interface BookmarkReorderInfo {
+        childIds: string[];
+    }
+
+    interface BookmarkRemovedEvent extends chrome.events.Event<(id: string, removeInfo: BookmarkRemoveInfo) => void> {}
+
+    interface BookmarkImportEndedEvent extends chrome.events.Event<() => void> {}
+
+    interface BookmarkMovedEvent extends chrome.events.Event<(id: string, moveInfo: BookmarkMoveInfo) => void> {}
+
+    interface BookmarkImportBeganEvent extends chrome.events.Event<() => void> {}
+
+    interface BookmarkChangedEvent extends chrome.events.Event<(id: string, changeInfo: BookmarkChangeInfo) => void> {}
+
+    interface BookmarkCreatedEvent extends chrome.events.Event<(id: string, bookmark: BookmarkTreeNode) => void> {}
+
+    interface BookmarkChildrenReordered extends chrome.events.Event<(id: string, reorderInfo: BookmarkReorderInfo) => void> {}
+
+	interface BookmarkSearchQuery {
+		query?: string;
+		url?: string;
+		title?: string;
+	}
+
+	interface BookmarkCreateArg {
+		/** Optional. Defaults to the Other Bookmarks folder.  */
+		parentId?: string;
+		index?: number;
+		title?: string;
+		url?: string;
+	}
+
+	interface BookmarkDestinationArg {
+		parentId?: string;
+		index?: number;
+	}
+
+	interface BookmarkChangesArg {
+		title?: string;
+		url?: string;
+	}
+
+	/** @deprecated since Chrome 38. Bookmark write operations are no longer limited by Chrome. */
+    var MAX_WRITE_OPERATIONS_PER_HOUR: number;
+	/** @deprecated since Chrome 38. Bookmark write operations are no longer limited by Chrome. */
+    var MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: number;
+
+	/**
+	 * Searches for BookmarkTreeNodes matching the given query. Queries specified with an object produce BookmarkTreeNodes matching all specified properties.
+	 * @param query A string of words and quoted phrases that are matched against bookmark URLs and titles.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of BookmarkTreeNode results) {...};
+	 */
+    export function search(query: string, callback: (results: BookmarkTreeNode[]) => void): void;
+	/**
+	 * Searches for BookmarkTreeNodes matching the given query. Queries specified with an object produce BookmarkTreeNodes matching all specified properties.
+	 * @param query An object with one or more of the properties query, url, and title specified. Bookmarks matching all specified properties will be produced.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of BookmarkTreeNode results) {...};
+	 */
+	export function search(query: BookmarkSearchQuery, callback: (results: BookmarkTreeNode[]) => void): void;
+	/**
+	 * Retrieves the entire Bookmarks hierarchy.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of BookmarkTreeNode results) {...};
+	 */
+    export function getTree(callback: (results: BookmarkTreeNode[]) => void): void;
+	/**
+	 * Retrieves the recently added bookmarks.
+	 * @param numberOfItems The maximum number of items to return.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of BookmarkTreeNode results) {...};
+	 */
+    export function getRecent(numberOfItems: number, callback: (results: BookmarkTreeNode[]) => void): void;
+	/**
+	 * Retrieves the specified BookmarkTreeNode.
+	 * @param id A single string-valued id
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of BookmarkTreeNode results) {...};
+	 */
+    export function get(id: string, callback: (results: BookmarkTreeNode[]) => void): void;
+	/**
+	 * Retrieves the specified BookmarkTreeNode.
+	 * @param idList An array of string-valued ids
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of BookmarkTreeNode results) {...};
+	 */
+    export function get(idList: string[], callback: (results: BookmarkTreeNode[]) => void): void;
+	/**
+	 * Creates a bookmark or folder under the specified parentId. If url is NULL or missing, it will be a folder.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function( BookmarkTreeNode result) {...};
+	 */
+    export function create(bookmark: BookmarkCreateArg, callback?: (result: BookmarkTreeNode) => void): void;
+	/**
+	 * Moves the specified BookmarkTreeNode to the provided location.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function( BookmarkTreeNode result) {...};
+	 */
+    export function move(id: string, destination: BookmarkDestinationArg, callback?: (result: BookmarkTreeNode) => void): void;
+	/**
+	 * Updates the properties of a bookmark or folder. Specify only the properties that you want to change; unspecified properties will be left unchanged. Note: Currently, only 'title' and 'url' are supported.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function( BookmarkTreeNode result) {...};
+	 */
+    export function update(id: string, changes: BookmarkChangesArg, callback?: (result: BookmarkTreeNode) => void): void;
+	/**
+	 * Removes a bookmark or an empty bookmark folder.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function remove(id: string, callback?: Function): void;
+	/**
+	 * Retrieves the children of the specified BookmarkTreeNode id.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of BookmarkTreeNode results) {...};
+	 */
+    export function getChildren(id: string, callback: (results: BookmarkTreeNode[]) => void): void;
+	/**
+	 * Since Chrome 14.
+	 * Retrieves part of the Bookmarks hierarchy, starting at the specified node.
+	 * @param id The ID of the root of the subtree to retrieve.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of BookmarkTreeNode results) {...};
+	 */
+    export function getSubTree(id: string, callback: (results: BookmarkTreeNode[]) => void): void;
+	/**
+	 * Recursively removes a bookmark folder.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function removeTree(id: string, callback?: Function): void;
+
+	/** Fired when a bookmark or folder is removed. When a folder is removed recursively, a single notification is fired for the folder, and none for its contents. */
+    var onRemoved: BookmarkRemovedEvent;
+	/** Fired when a bookmark import session is ended. */
+    var onImportEnded: BookmarkImportEndedEvent;
+	/** Fired when a bookmark import session is begun. Expensive observers should ignore onCreated updates until onImportEnded is fired. Observers should still handle other notifications immediately. */
+    var onImportBegan: BookmarkImportBeganEvent;
+	/** Fired when a bookmark or folder changes. Note: Currently, only title and url changes trigger this. */
+    var onChanged: BookmarkChangedEvent;
+	/** Fired when a bookmark or folder is moved to a different parent folder. */
+    var onMoved: BookmarkMovedEvent;
+	/** Fired when a bookmark or folder is created. */
+    var onCreated: BookmarkCreatedEvent;
+	/** Fired when the children of a folder have changed their order due to the order being sorted in the UI. This is not called as a result of a move(). */
+    var onChildrenReordered: BookmarkChildrenReordered;
+}
+
+////////////////////
+// Browser Action
+////////////////////
+/**
+ * Use browser actions to put icons in the main Google Chrome toolbar, to the right of the address bar. In addition to its icon, a browser action can also have a tooltip, a badge, and a popup.
+ * Availability: Since Chrome 5.
+ * Manifest:  "browser_action": {...}
+ */
+declare namespace chrome.browserAction {
+    interface BadgeBackgroundColorDetails {
+		/** An array of four integers in the range [0,255] that make up the RGBA color of the badge. For example, opaque red is [255, 0, 0, 255]. Can also be a string with a CSS value, with opaque red being #FF0000 or #F00. */
+        color: any;
+		/** Optional. Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.  */
+        tabId?: number;
+    }
+
+    interface BadgeTextDetails {
+		/** Any number of characters can be passed, but only about four can fit in the space. */
+        text: string;
+		/** Optional. Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.  */
+        tabId?: number;
+    }
+
+    interface TitleDetails {
+		/** The string the browser action should display when moused over. */
+        title: string;
+		/** Optional. Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.  */
+        tabId?: number;
+    }
+
+    interface TabDetails {
+		/** Optional. Specify the tab to get the information. If no tab is specified, the non-tab-specific information is returned.  */
+        tabId?: number;
+    }
+
+    interface TabIconDetails {
+		/** Optional. Either a relative image path or a dictionary {size -> relative image path} pointing to icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.path = foo' is equivalent to 'details.imageData = {'19': foo}'  */
+        path?: any;
+		/** Optional. Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.  */
+        tabId?: number;
+		/** Optional. Either an ImageData object or a dictionary {size -> ImageData} representing icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.imageData = foo' is equivalent to 'details.imageData = {'19': foo}'  */
+        imageData?: ImageData;
+    }
+
+    interface PopupDetails {
+		/** Optional. Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.  */
+        tabId?: number;
+		/** The html file to show in a popup. If set to the empty string (''), no popup is shown. */
+        popup: string;
+    }
+
+    interface BrowserClickedEvent extends chrome.events.Event<(tab: chrome.tabs.Tab) => void> {}
+
+	/**
+	 * Since Chrome 22.
+	 * Enables the browser action for a tab. By default, browser actions are enabled.
+	 * @param tabId The id of the tab for which you want to modify the browser action.
+	 */
+    export function enable(tabId?: number): void;
+	/** Sets the background color for the badge. */
+    export function setBadgeBackgroundColor(details: BadgeBackgroundColorDetails): void;
+	/** Sets the badge text for the browser action. The badge is displayed on top of the icon. */
+    export function setBadgeText(details: BadgeTextDetails): void;
+	/** Sets the title of the browser action. This shows up in the tooltip. */
+    export function setTitle(details: TitleDetails): void;
+	/**
+	 * Since Chrome 19.
+	 * Gets the badge text of the browser action. If no tab is specified, the non-tab-specific badge text is returned.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(string result) {...};
+	 */
+    export function getBadgeText(details: TabDetails, callback: (result: string) => void): void;
+	/** Sets the html document to be opened as a popup when the user clicks on the browser action's icon. */
+    export function setPopup(details: PopupDetails): void;
+	/**
+	 * Since Chrome 22.
+	 * Disables the browser action for a tab.
+	 * @param tabId The id of the tab for which you want to modify the browser action.
+	 */
+    export function disable(tabId?: number): void;
+	/**
+	 * Since Chrome 19.
+	 * Gets the title of the browser action.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(string result) {...};
+	 */
+    export function getTitle(details: TabDetails, callback: (result: string) => void): void;
+	/**
+	 * Since Chrome 19.
+	 * Gets the background color of the browser action.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function( ColorArray result) {...};
+	 */
+    export function getBadgeBackgroundColor(details: TabDetails, callback: (result: number[]) => void): void;
+	/**
+	 * Since Chrome 19.
+	 * Gets the html document set as the popup for this browser action.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(string result) {...};
+	 */
+    export function getPopup(details: TabDetails, callback: (result: string) => void): void;
+	/**
+	 * Sets the icon for the browser action. The icon can be specified either as the path to an image file or as the pixel data from a canvas element, or as dictionary of either one of those. Either the path or the imageData property must be specified.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function setIcon(details: TabIconDetails, callback?: Function): void;
+
+	/** Fired when a browser action icon is clicked. This event will not fire if the browser action has a popup. */
+    var onClicked: BrowserClickedEvent;
+}
+
+////////////////////
+// Browsing Data
+////////////////////
+/**
+ * Use the chrome.browsingData API to remove browsing data from a user's local profile.
+ * Availability: Since Chrome 19.
+ * Permissions:  "browsingData"
+ */
+declare namespace chrome.browsingData {
+    interface OriginTypes {
+		/** Optional. Websites that have been installed as hosted applications (be careful!).  */
+        protectedWeb?: boolean;
+		/** Optional. Extensions and packaged applications a user has installed (be _really_ careful!).  */
+        extension?: boolean;
+		/** Optional. Normal websites.  */
+        unprotectedWeb?: boolean;
+    }
+
+	/** Options that determine exactly what data will be removed. */
+    interface RemovalOptions {
+		/**
+		 * Optional.
+ 		 * Since Chrome 21.
+		 * An object whose properties specify which origin types ought to be cleared. If this object isn't specified, it defaults to clearing only "unprotected" origins. Please ensure that you really want to remove application data before adding 'protectedWeb' or 'extensions'.
+		 */
+        originTypes?: OriginTypes;
+		/** Optional. Remove data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript Date object). If absent, defaults to 0 (which would remove all browsing data).  */
+        since?: number;
+    }
+
+	/**
+	 * Since Chrome 27.
+	 * A set of data types. Missing data types are interpreted as false.
+	 */
+    interface DataTypeSet {
+		/** Optional. Websites' WebSQL data.  */
+        webSQL?: boolean;
+		/** Optional. Websites' IndexedDB data.  */
+        indexedDB?: boolean;
+		/** Optional. The browser's cookies.  */
+        cookies?: boolean;
+		/** Optional. Stored passwords.  */
+        passwords?: boolean;
+		/** Optional. Server-bound certificates.  */
+        serverBoundCertificates?: boolean;
+		/** Optional. The browser's download list.  */
+        downloads?: boolean;
+		/** Optional. The browser's cache. Note: when removing data, this clears the entire cache: it is not limited to the range you specify.  */
+        cache?: boolean;
+		/** Optional. Websites' appcaches.  */
+        appcache?: boolean;
+		/** Optional. Websites' file systems.  */
+        fileSystems?: boolean;
+		/** Optional. Plugins' data.  */
+        pluginData?: boolean;
+		/** Optional. Websites' local storage data.  */
+        localStorage?: boolean;
+		/** Optional. The browser's stored form data.  */
+        formData?: boolean;
+		/** Optional. The browser's history.  */
+        history?: boolean;
+		/**
+		 * Optional.
+ 		 * Since Chrome 39.
+		 * Service Workers.
+		 */
+		serviceWorkers?: boolean;
+    }
+
+	interface SettingsCallback {
+		options: RemovalOptions;
+		/** All of the types will be present in the result, with values of true if they are both selected to be removed and permitted to be removed, otherwise false. */
+		dataToRemove: DataTypeSet;
+		/** All of the types will be present in the result, with values of true if they are permitted to be removed (e.g., by enterprise policy) and false if not. */
+		dataRemovalPermitted: DataTypeSet;
+	}
+
+	/**
+	 * Since Chrome 26.
+	 * Reports which types of data are currently selected in the 'Clear browsing data' settings UI. Note: some of the data types included in this API are not available in the settings UI, and some UI settings control more than one data type listed here.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(object result) {...};
+	 */
+	export function settings(callback: (result: SettingsCallback) => void): void;
+	/**
+	 * Clears plugins' data.
+	 * @param callback Called when plugins' data has been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function removePluginData(options: RemovalOptions, callback?: () => void): void;
+	/**
+	 * Clears the browser's stored form data (autofill).
+	 * @param callback Called when the browser's form data has been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function removeFormData(options: RemovalOptions, callback?: () => void): void;
+	/**
+	 * Clears websites' file system data.
+	 * @param callback Called when websites' file systems have been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function removeFileSystems(options: RemovalOptions, callback?: () => void): void;
+	/**
+	 * Clears various types of browsing data stored in a user's profile.
+	 * @param dataToRemove The set of data types to remove.
+	 * @param callback Called when deletion has completed.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function remove(options: RemovalOptions, dataToRemove: DataTypeSet, callback?: () => void): void;
+	/**
+	 * Clears the browser's stored passwords.
+	 * @param callback Called when the browser's passwords have been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function removePasswords(options: RemovalOptions, callback?: () => void): void;
+	/**
+	 * Clears the browser's cookies and server-bound certificates modified within a particular timeframe.
+	 * @param callback Called when the browser's cookies and server-bound certificates have been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function removeCookies(options: RemovalOptions, callback?: () => void): void;
+	/**
+	 * Clears websites' WebSQL data.
+	 * @param callback Called when websites' WebSQL databases have been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function removeWebSQL(options: RemovalOptions, callback?: () => void): void;
+	/**
+	 * Clears websites' appcache data.
+	 * @param callback Called when websites' appcache data has been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function removeAppcache(options: RemovalOptions, callback?: () => void): void;
+	/**
+	 * Clears the browser's list of downloaded files (not the downloaded files themselves).
+	 * @param callback Called when the browser's list of downloaded files has been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function removeDownloads(options: RemovalOptions, callback?: () => void): void;
+	/**
+	 * Clears websites' local storage data.
+	 * @param callback Called when websites' local storage has been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function removeLocalStorage(options: RemovalOptions, callback?: () => void): void;
+	/**
+	 * Clears the browser's cache.
+	 * @param callback Called when the browser's cache has been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function removeCache(options: RemovalOptions, callback?: () => void): void;
+	/**
+	 * Clears the browser's history.
+	 * @param callback Called when the browser's history has cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function removeHistory(options: RemovalOptions, callback?: () => void): void;
+	/**
+	 * Clears websites' IndexedDB data.
+	 * @param callback Called when websites' IndexedDB data has been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function removeIndexedDB(options: RemovalOptions, callback?: () => void): void;
+}
+
+////////////////////
+// Commands
+////////////////////
+/**
+ * Use the commands API to add keyboard shortcuts that trigger actions in your extension, for example, an action to open the browser action or send a command to the extension.
+ * Availability: Since Chrome 25.
+ * Manifest:  "commands": {...}
+ */
+declare namespace chrome.commands {
+	interface Command {
+		/** Optional. The name of the Extension Command  */
+		name?: string;
+		/** Optional. The Extension Command description  */
+		description?: string;
+		/** Optional. The shortcut active for this command, or blank if not active.  */
+		shortcut?: string;
+	}
+
+    interface CommandEvent extends chrome.events.Event<(command: string) => void> {}
+
+	/**
+	 * Returns all the registered extension commands for this extension and their shortcut (if active).
+	 * @param callback Called to return the registered commands.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function(array of Command commands) {...};
+	 */
+	export function getAll(callback: (commands: Command[]) => void): void;
+
+	/** Fired when a registered command is activated using a keyboard shortcut. */
+    var onCommand: CommandEvent;
+}
+
+////////////////////
+// Content Settings
+////////////////////
+/**
+ * Use the chrome.contentSettings API to change settings that control whether websites can use features such as cookies, JavaScript, and plugins. More generally speaking, content settings allow you to customize Chrome's behavior on a per-site basis instead of globally.
+ * Availability: Since Chrome 16.
+ * Permissions:  "contentSettings"
+ */
+declare namespace chrome.contentSettings {
+    interface ClearDetails {
+		/**
+		 * Optional.
+ 		 * Where to clear the setting (default: regular).
+		 * The scope of the ContentSetting. One of
+		 * * regular: setting for regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+		 * * incognito_session_only: setting for incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular settings).
+		 */
+        scope?: string;
+    }
+
+    interface SetDetails {
+		/** Optional. The resource identifier for the content type.  */
+        resourceIdentifier?: ResourceIdentifier;
+		/** The setting applied by this rule. See the description of the individual ContentSetting objects for the possible values. */
+        setting: any;
+		/** Optional. The pattern for the secondary URL. Defaults to matching all URLs. For details on the format of a pattern, see Content Setting Patterns.  */
+        secondaryPattern?: string;
+		/** Optional. Where to set the setting (default: regular).  */
+        scope?: string;
+		/** The pattern for the primary URL. For details on the format of a pattern, see Content Setting Patterns. */
+        primaryPattern: string;
+    }
+
+    interface GetDetails {
+		/** Optional. The secondary URL for which the content setting should be retrieved. Defaults to the primary URL. Note that the meaning of a secondary URL depends on the content type, and not all content types use secondary URLs.  */
+        secondaryUrl?: string;
+		/** Optional. A more specific identifier of the type of content for which the settings should be retrieved.  */
+        resourceIdentifier?: ResourceIdentifier;
+		/** Optional. Whether to check the content settings for an incognito session. (default false)  */
+        incognito?: boolean;
+		/** The primary URL for which the content setting should be retrieved. Note that the meaning of a primary URL depends on the content type. */
+        primaryUrl: string;
+    }
+
+    interface ReturnedDetails {
+		/** The content setting. See the description of the individual ContentSetting objects for the possible values. */
+        setting: any;
+    }
+
+    interface ContentSetting {
+		/**
+		 * Clear all content setting rules set by this extension.
+		 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
+		 */
+        clear(details: ClearDetails, callback?: () => void): void;
+		/**
+		 * Applies a new content setting rule.
+		 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
+		 */
+        set(details: SetDetails, callback?: () => void): void;
+		/**
+		 * @param callback The callback parameter should be a function that looks like this:
+		 * function(array of ResourceIdentifier resourceIdentifiers) {...};
+		 * Parameter resourceIdentifiers: A list of resource identifiers for this content type, or undefined if this content type does not use resource identifiers.
+		 */
+        getResourceIdentifiers(callback: (resourceIdentifiers?: ResourceIdentifier[]) => void): void;
+		/**
+		 * Gets the current content setting for a given pair of URLs.
+		 * @param callback The callback parameter should be a function that looks like this:
+		 * function(object details) {...};
+		 */
+        get(details: GetDetails, callback: (details: ReturnedDetails) => void): void;
+    }
+
+	/** The only content type using resource identifiers is contentSettings.plugins. For more information, see Resource Identifiers. */
+    interface ResourceIdentifier {
+		/** The resource identifier for the given content type. */
+        id: string;
+		/** Optional. A human readable description of the resource.  */
+        description?: string;
+    }
+
+	/**
+	 * Whether to allow cookies and other local data to be set by websites. One of
+	 * allow: Accept cookies,
+	 * block: Block cookies,
+	 * session_only: Accept cookies only for the current session.
+	 * Default is allow.
+	 * The primary URL is the URL representing the cookie origin. The secondary URL is the URL of the top-level frame.
+	 */
+    var cookies: ContentSetting;
+	/**
+	 * Whether to allow sites to show pop-ups. One of
+	 * allow: Allow sites to show pop-ups,
+	 * block: Don't allow sites to show pop-ups.
+	 * Default is block.
+	 * The primary URL is the URL of the top-level frame. The secondary URL is not used.
+	 */
+    var popups: ContentSetting;
+	/**
+	 * Whether to run JavaScript. One of
+	 * allow: Run JavaScript,
+	 * block: Don't run JavaScript.
+	 * Default is allow.
+	 * The primary URL is the URL of the top-level frame. The secondary URL is not used.
+	 */
+    var javascript: ContentSetting;
+	/**
+	 * Whether to allow sites to show desktop notifications. One of
+	 * allow: Allow sites to show desktop notifications,
+	 * block: Don't allow sites to show desktop notifications,
+	 * ask: Ask when a site wants to show desktop notifications.
+	 * Default is ask.
+	 * The primary URL is the URL of the document which wants to show the notification. The secondary URL is not used.
+	 */
+    var notifications: ContentSetting;
+	/**
+	 * Whether to run plugins. One of
+	 * allow: Run plugins automatically,
+	 * block: Don't run plugins automatically,
+	 * detect_important_content: Only run automatically those plugins that are detected as the website's main content.
+	 * Default is allow.
+	 * The primary URL is the URL of the top-level frame. The secondary URL is not used.
+	 */
+    var plugins: ContentSetting;
+	/**
+	 * Whether to show images. One of
+	 * allow: Show images,
+	 * block: Don't show images.
+	 * Default is allow.
+	 * The primary URL is the URL of the top-level frame. The secondary URL is the URL of the image.
+	 */
+    var images: ContentSetting;
+	/**
+	 * Since Chrome 42.
+	 * Whether to allow Geolocation. One of
+	 * allow: Allow sites to track your physical location,
+	 * block: Don't allow sites to track your physical location,
+	 * ask: Ask before allowing sites to track your physical location.
+	 * Default is ask.
+	 * The primary URL is the URL of the document which requested location data. The secondary URL is the URL of the top-level frame (which may or may not differ from the requesting URL).
+	 */
+	var location: ContentSetting;
+	/**
+	 * Since Chrome 42.
+	 * Whether to allow sites to toggle the fullscreen mode. One of
+	 * allow: Allow sites to toggle the fullscreen mode,
+	 * ask: Ask when a site wants to toggle the fullscreen mode.
+	 * Default is ask.
+	 * The primary URL is the URL of the document which requested to toggle the fullscreen mode. The secondary URL is the URL of the top-level frame (which may or may not differ from the requesting URL).
+	 */
+	var fullscreen: ContentSetting;
+	/**
+	 * Since Chrome 42.
+	 * Whether to allow sites to disable the mouse cursor. One of
+	 * allow: Allow sites to disable the mouse cursor,
+	 * block: Don't allow sites to disable the mouse cursor,
+	 * ask: Ask when a site wants to disable the mouse cursor.
+	 * Default is ask.
+	 * The primary URL is the URL of the top-level frame. The secondary URL is not used.
+	 */
+	var mouselock: ContentSetting;
+	/**
+	 * Since Chrome 42.
+	 * Whether to allow sites to run plugins unsandboxed. One of
+	 * allow: Allow sites to run plugins unsandboxed,
+	 * block: Don't allow sites to run plugins unsandboxed,
+	 * ask: Ask when a site wants to run a plugin unsandboxed.
+	 * Default is ask.
+	 * The primary URL is the URL of the top-level frame. The secondary URL is not used.
+	 */
+	var unsandboxedPlugins: ContentSetting;
+	/**
+	 * Since Chrome 42.
+	 * Whether to allow sites to download multiple files automatically. One of
+	 * allow: Allow sites to download multiple files automatically,
+	 * block: Don't allow sites to download multiple files automatically,
+	 * ask: Ask when a site wants to download files automatically after the first file.
+	 * Default is ask.
+	 * The primary URL is the URL of the top-level frame. The secondary URL is not used.
+	 */
+	var automaticDownloads: ContentSetting;
+}
+
+////////////////////
+// Context Menus
+////////////////////
+/**
+ * Use the chrome.contextMenus API to add items to Google Chrome's context menu. You can choose what types of objects your context menu additions apply to, such as images, hyperlinks, and pages.
+ * Availability: Since Chrome 6.
+ * Permissions:  "contextMenus"
+ */
+declare namespace chrome.contextMenus {
+    interface OnClickData {
+		/**
+		 * Optional.
+ 		 * Since Chrome 35.
+		 * The text for the context selection, if any.
+		 */
+        selectionText?: string;
+		/**
+		 * Optional.
+ 		 * Since Chrome 35.
+		 * A flag indicating the state of a checkbox or radio item after it is clicked.
+		 */
+        checked?: boolean;
+		/**
+		 * Since Chrome 35.
+		 * The ID of the menu item that was clicked.
+		 */
+        menuItemId: any;
+		/**
+		 * Optional.
+ 		 * Since Chrome 35.
+		 * The URL of the frame of the element where the context menu was clicked, if it was in a frame.
+		 */
+        frameUrl?: string;
+		/**
+		 * Since Chrome 35.
+		 * A flag indicating whether the element is editable (text input, textarea, etc.).
+		 */
+        editable: boolean;
+		/**
+		 * Optional.
+ 		 * Since Chrome 35.
+		 * One of 'image', 'video', or 'audio' if the context menu was activated on one of these types of elements.
+		 */
+        mediaType?: string;
+		/**
+		 * Optional.
+ 		 * Since Chrome 35.
+		 * A flag indicating the state of a checkbox or radio item before it was clicked.
+		 */
+        wasChecked?: boolean;
+		/**
+		 * Since Chrome 35.
+		 * The URL of the page where the menu item was clicked. This property is not set if the click occured in a context where there is no current page, such as in a launcher context menu.
+		 */
+        pageUrl: string;
+		/**
+		 * Optional.
+ 		 * Since Chrome 35.
+		 * If the element is a link, the URL it points to.
+		 */
+        linkUrl?: string;
+		/**
+		 * Optional.
+ 		 * Since Chrome 35.
+		 * The parent ID, if any, for the item clicked.
+		 */
+        parentMenuItemId?: any;
+		/**
+		 * Optional.
+ 		 * Since Chrome 35.
+		 * Will be present for elements with a 'src' URL.
+		 */
+        srcUrl?: string;
+    }
+
+    interface CreateProperties {
+		/** Optional. Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see Match Patterns.  */
+        documentUrlPatterns?: string[];
+		/** Optional. The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.  */
+        checked?: boolean;
+		/** Optional. The text to be displayed in the item; this is required unless type is 'separator'. When the context is 'selection', you can use %s within the string to show the selected text. For example, if this parameter's value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the selection is "Translate 'cool' to Pig Latin".  */
+        title?: string;
+		/** Optional. List of contexts this menu item will appear in. Defaults to ['page'] if not specified.  */
+        contexts?: string[];
+		/**
+		 * Optional.
+ 		 * Since Chrome 20.
+		 * Whether this context menu item is enabled or disabled. Defaults to true.
+		 */
+        enabled?: boolean;
+		/** Optional. Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.  */
+        targetUrlPatterns?: string[];
+		/**
+		 * Optional.
+ 		 * A function that will be called back when the menu item is clicked. Event pages cannot use this; instead, they should register a listener for chrome.contextMenus.onClicked.
+		 * @param info Information sent when a context menu item is clicked.
+		 * @param tab The details of the tab where the click took place. Note: this parameter only present for extensions.
+		 */
+        onclick?: (info: OnClickData, tab: chrome.tabs.Tab) => void;
+		/** Optional. The ID of a parent menu item; this makes the item a child of a previously added item.  */
+        parentId?: any;
+		/** Optional. The type of menu item. Defaults to 'normal' if not specified.  */
+        type?: string;
+		/**
+		 * Optional.
+ 		 * Since Chrome 21.
+		 * The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
+		 */
+        id?: string;
+    }
+
+    interface UpdateProperties {
+        documentUrlPatterns?: string[];
+        checked?: boolean;
+        title?: string;
+        contexts?: string[];
+		/** Optional. Since Chrome 20.  */
+        enabled?: boolean;
+        targetUrlPatterns?: string[];
+        onclick?: Function;
+		/** Optional. Note: You cannot change an item to be a child of one of its own descendants.  */
+        parentId?: any;
+        type?: string;
+    }
+
+    interface MenuClickedEvent extends chrome.events.Event<(info: OnClickData, tab?: chrome.tabs.Tab) => void> {}
+
+	/**
+	 * Since Chrome 38.
+	 * The maximum number of top level extension items that can be added to an extension action context menu. Any items beyond this limit will be ignored.
+	 */
+	var ACTION_MENU_TOP_LEVEL_LIMIT: number;
+
+    /**
+	 * Removes all context menu items added by this extension.
+	 * @param callback Called when removal is complete.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function removeAll(callback?: () => void): void;
+	/**
+	 * Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
+	 * @param callback Called when the item has been created in the browser. If there were any problems creating the item, details will be available in chrome.runtime.lastError.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function create(createProperties: CreateProperties, callback?: () => void): void;
+	/**
+	 * Updates a previously created context menu item.
+	 * @param id The ID of the item to update.
+	 * @param updateProperties The properties to update. Accepts the same values as the create function.
+	 * @param callback Called when the context menu has been updated.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function update(id: string, updateProperties: UpdateProperties, callback?: () => void): void;
+	/**
+	 * Updates a previously created context menu item.
+	 * @param id The ID of the item to update.
+	 * @param updateProperties The properties to update. Accepts the same values as the create function.
+	 * @param callback Called when the context menu has been updated.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function update(id: number, updateProperties: UpdateProperties, callback?: () => void): void;
+	/**
+	 * Removes a context menu item.
+	 * @param menuItemId The ID of the context menu item to remove.
+	 * @param callback Called when the context menu has been removed.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function remove(menuItemId: string, callback?: () => void): void;
+	/**
+	 * Removes a context menu item.
+	 * @param menuItemId The ID of the context menu item to remove.
+	 * @param callback Called when the context menu has been removed.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function remove(menuItemId: number, callback?: () => void): void;
+
+	/**
+	 * Since Chrome 21.
+	 * Fired when a context menu item is clicked.
+	 */
+    var onClicked: MenuClickedEvent;
+}
+
+////////////////////
+// Cookies
+////////////////////
+/**
+ * Use the chrome.cookies API to query and modify cookies, and to be notified when they change.
+ * Availability: Since Chrome 6.
+ * Permissions:  "cookies", host permissions
+ */
+declare namespace chrome.cookies {
+	/** Represents information about an HTTP cookie. */
+    interface Cookie {
+		/** The domain of the cookie (e.g. "www.google.com", "example.com"). */
+        domain: string;
+		/** The name of the cookie. */
+        name: string;
+		/** The ID of the cookie store containing this cookie, as provided in getAllCookieStores(). */
+        storeId: string;
+		/** The value of the cookie. */
+        value: string;
+		/** True if the cookie is a session cookie, as opposed to a persistent cookie with an expiration date. */
+        session: boolean;
+		/** True if the cookie is a host-only cookie (i.e. a request's host must exactly match the domain of the cookie). */
+        hostOnly: boolean;
+		/** Optional. The expiration date of the cookie as the number of seconds since the UNIX epoch. Not provided for session cookies.  */
+        expirationDate?: number;
+		/** The path of the cookie. */
+        path: string;
+		/** True if the cookie is marked as HttpOnly (i.e. the cookie is inaccessible to client-side scripts). */
+        httpOnly: boolean;
+		/** True if the cookie is marked as Secure (i.e. its scope is limited to secure channels, typically HTTPS). */
+        secure: boolean;
+    }
+
+	/** Represents a cookie store in the browser. An incognito mode window, for instance, uses a separate cookie store from a non-incognito window. */
+    interface CookieStore {
+		/** The unique identifier for the cookie store. */
+        id: string;
+		/** Identifiers of all the browser tabs that share this cookie store. */
+        tabIds: number[];
+    }
+
+    interface GetAllDetails {
+		/** Optional. Restricts the retrieved cookies to those whose domains match or are subdomains of this one.  */
+        domain?: string;
+		/** Optional. Filters the cookies by name.  */
+        name?: string;
+		/** Optional. Restricts the retrieved cookies to those that would match the given URL.  */
+        url?: string;
+		/** Optional. The cookie store to retrieve cookies from. If omitted, the current execution context's cookie store will be used.  */
+        storeId?: string;
+		/** Optional. Filters out session vs. persistent cookies.  */
+        session?: boolean;
+		/** Optional. Restricts the retrieved cookies to those whose path exactly matches this string.  */
+        path?: string;
+		/** Optional. Filters the cookies by their Secure property.  */
+        secure?: boolean;
+    }
+
+    interface SetDetails {
+		/** Optional. The domain of the cookie. If omitted, the cookie becomes a host-only cookie.  */
+        domain?: string;
+		/** Optional. The name of the cookie. Empty by default if omitted.  */
+        name?: string;
+		/** The request-URI to associate with the setting of the cookie. This value can affect the default domain and path values of the created cookie. If host permissions for this URL are not specified in the manifest file, the API call will fail. */
+        url: string;
+		/** Optional. The ID of the cookie store in which to set the cookie. By default, the cookie is set in the current execution context's cookie store.  */
+        storeId?: string;
+		/** Optional. The value of the cookie. Empty by default if omitted.  */
+        value?: string;
+		/** Optional. The expiration date of the cookie as the number of seconds since the UNIX epoch. If omitted, the cookie becomes a session cookie.  */
+        expirationDate?: number;
+		/** Optional. The path of the cookie. Defaults to the path portion of the url parameter.  */
+        path?: string;
+		/** Optional. Whether the cookie should be marked as HttpOnly. Defaults to false.  */
+        httpOnly?: boolean;
+		/** Optional. Whether the cookie should be marked as Secure. Defaults to false.  */
+        secure?: boolean;
+    }
+
+    interface Details {
+        name: string;
+        url: string;
+        storeId?: string;
+    }
+
+    interface CookieChangeInfo {
+		/** Information about the cookie that was set or removed. */
+        cookie: Cookie;
+		/** True if a cookie was removed. */
+        removed: boolean;
+		/**
+		 * Since Chrome 12.
+		 * The underlying reason behind the cookie's change.
+		 */
+        cause: string;
+    }
+
+    interface CookieChangedEvent extends chrome.events.Event<(changeInfo: CookieChangeInfo) => void> {}
+
+	/**
+	 * Lists all existing cookie stores.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of CookieStore cookieStores) {...};
+	 * Parameter cookieStores: All the existing cookie stores.
+	 */
+    export function getAllCookieStores(callback: (cookieStores: CookieStore[]) => void): void;
+	/**
+	 * Retrieves all cookies from a single cookie store that match the given information. The cookies returned will be sorted, with those with the longest path first. If multiple cookies have the same path length, those with the earliest creation time will be first.
+	 * @param details Information to filter the cookies being retrieved.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of Cookie cookies) {...};
+	 * Parameter cookies: All the existing, unexpired cookies that match the given cookie info.
+	 */
+    export function getAll(details: GetAllDetails, callback: (cookies: Cookie[]) => void): void;
+	/**
+	 * Sets a cookie with the given cookie data; may overwrite equivalent cookies if they exist.
+	 * @param details Details about the cookie being set.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function( Cookie cookie) {...};
+	 * Optional parameter cookie: Contains details about the cookie that's been set. If setting failed for any reason, this will be "null", and "chrome.runtime.lastError" will be set.
+	 */
+    export function set(details: SetDetails, callback?: (cookie?: Cookie) => void): void;
+	/**
+	 * Deletes a cookie by name.
+	 * @param details Information to identify the cookie to remove.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object details) {...};
+	 */
+    export function remove(details: Details, callback?: (details: Details) => void): void;
+	/**
+	 * Retrieves information about a single cookie. If more than one cookie of the same name exists for the given URL, the one with the longest path will be returned. For cookies with the same path length, the cookie with the earliest creation time will be returned.
+	 * @param details Details to identify the cookie being retrieved.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function( Cookie cookie) {...};
+	 * Parameter cookie: Contains details about the cookie. This parameter is null if no such cookie was found.
+	 */
+    export function get(details: Details, callback: (cookie?: Cookie) => void): void;
+
+	/** Fired when a cookie is set or removed. As a special case, note that updating a cookie's properties is implemented as a two step process: the cookie to be updated is first removed entirely, generating a notification with "cause" of "overwrite" . Afterwards, a new cookie is written with the updated values, generating a second notification with "cause" "explicit". */
+    var onChanged: CookieChangedEvent;
+}
+
+////////////////////
+// Debugger
+////////////////////
+/**
+ * The chrome.debugger API serves as an alternate transport for Chrome's remote debugging protocol. Use chrome.debugger to attach to one or more tabs to instrument network interaction, debug JavaScript, mutate the DOM and CSS, etc. Use the Debuggee tabId to target tabs with sendCommand and route events by tabId from onEvent callbacks.
+ * Availability: Since Chrome 18.
+ * Permissions:  "debugger"
+ */
+// TODO: Uncomment when Microsoft/TypeScript#8312 is merged in
+// declare module chrome.debugger {
+// 	/** Debuggee identifier. Either tabId or extensionId must be specified */
+//     interface Debuggee {
+// 		/** Optional. The id of the tab which you intend to debug.  */
+// 		tabId?: number;
+// 		/**
+// 		 * Optional.
+//  		 * Since Chrome 27.
+// 		 * The id of the extension which you intend to debug. Attaching to an extension background page is only possible when 'silent-debugger-extension-api' flag is enabled on the target browser.
+// 		 */
+// 		extensionId?: string;
+// 		/**
+// 		 * Optional.
+//  		 * Since Chrome 28.
+// 		 * The opaque id of the debug target.
+// 		 */
+// 		targetId?: string;
+//     }
+// 
+// 	/**
+// 	 * Since Chrome 28.
+// 	 * Debug target information
+// 	 */
+// 	interface TargetInfo {
+// 		/** Target type. */
+// 		type: string;
+// 		/** Target id. */
+// 		id: string;
+// 		/**
+// 		 * Optional.
+//  		 * Since Chrome 30.
+// 		 * The tab id, defined if type == 'page'.
+// 		 */
+// 		tabId?: number;
+// 		/**
+// 		 * Optional.
+//  		 * Since Chrome 30.
+// 		 * The extension id, defined if type = 'background_page'.
+// 		 */
+// 		extensionId?: string;
+// 		/** True if debugger is already attached. */
+// 		attached: boolean;
+// 		/** Target page title. */
+// 		title: string;
+// 		/** Target URL. */
+// 		url: string;
+// 		/** Optional. Target favicon URL.  */
+// 		faviconUrl?: string;
+//     }
+// 
+//     interface DebuggerDetachedEvent extends chrome.events.Event<(source: Debuggee, reason: string) => void> {}
+// 
+//     interface DebuggerEventEvent extends chrome.events.Event<(source: Debuggee, method: string, params?: Object) => void> {}
+// 
+// 	/**
+// 	 * Attaches debugger to the given target.
+// 	 * @param target Debugging target to which you want to attach.
+// 	 * @param requiredVersion Required debugging protocol version ("0.1"). One can only attach to the debuggee with matching major version and greater or equal minor version. List of the protocol versions can be obtained in the documentation pages.
+// 	 * @param callback Called once the attach operation succeeds or fails. Callback receives no arguments. If the attach fails, runtime.lastError will be set to the error message.
+// 	 * If you specify the callback parameter, it should be a function that looks like this:
+// 	 * function() {...};
+// 	 */
+//     export function attach(target: Debuggee, requiredVersion: string, callback?: () => void): void;
+// 	/**
+// 	 * Detaches debugger from the given target.
+// 	 * @param target Debugging target from which you want to detach.
+// 	 * @param callback Called once the detach operation succeeds or fails. Callback receives no arguments. If the detach fails, runtime.lastError will be set to the error message.
+// 	 * If you specify the callback parameter, it should be a function that looks like this:
+// 	 * function() {...};
+// 	 */
+//     export function detach(target: Debuggee, callback?: () => void): void;
+// 	/**
+// 	 * Sends given command to the debugging target.
+// 	 * @param target Debugging target to which you want to send the command.
+// 	 * @param method Method name. Should be one of the methods defined by the remote debugging protocol.
+// 	 * @param commandParams Since Chrome 22.
+// 	 * JSON object with request parameters. This object must conform to the remote debugging params scheme for given method.
+// 	 * @param callback Response body. If an error occurs while posting the message, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+// 	 * If you specify the callback parameter, it should be a function that looks like this:
+// 	 * function(object result) {...};
+// 	 */
+//     export function sendCommand(target: Debuggee, method: string, commandParams?: Object, callback?: (result?: Object) => void): void;
+// 	/**
+// 	 * Since Chrome 28.
+// 	 * Returns the list of available debug targets.
+// 	 * @param callback The callback parameter should be a function that looks like this:
+// 	 * function(array of TargetInfo result) {...};
+// 	 * Parameter result: Array of TargetInfo objects corresponding to the available debug targets.
+// 	 */
+// 	export function getTargets(callback: (result: TargetInfo[]) => void): void;
+// 
+// 	/** Fired when browser terminates debugging session for the tab. This happens when either the tab is being closed or Chrome DevTools is being invoked for the attached tab. */
+//     var onDetach: DebuggerDetachedEvent;
+// 	/** Fired whenever debugging target issues instrumentation event. */
+//     var onEvent: DebuggerEventEvent;
+// }
+
+////////////////////
+// Declarative Content
+////////////////////
+/**
+ * Use the chrome.declarativeContent API to take actions depending on the content of a page, without requiring permission to read the page's content.
+ * Availability: Since Chrome 33.
+ * Permissions:  "declarativeContent"
+ */
+declare namespace chrome.declarativeContent {
+	interface PageStateUrlDetails {
+		/** Optional. Matches if the host name of the URL contains a specified string. To test whether a host name component has a prefix 'foo', use hostContains: '.foo'. This matches 'www.foobar.com' and 'foo.com', because an implicit dot is added at the beginning of the host name. Similarly, hostContains can be used to match against component suffix ('foo.') and to exactly match against components ('.foo.'). Suffix- and exact-matching for the last components need to be done separately using hostSuffix, because no implicit dot is added at the end of the host name.  */
+		hostContains?: string;
+		/** Optional. Matches if the host name of the URL is equal to a specified string.  */
+		hostEquals?: string;
+		/** Optional. Matches if the host name of the URL starts with a specified string.  */
+		hostPrefix?: string;
+		/** Optional. Matches if the host name of the URL ends with a specified string.  */
+		hostSuffix?: string;
+		/** Optional. Matches if the path segment of the URL contains a specified string.  */
+		pathContains?: string;
+		/** Optional. Matches if the path segment of the URL is equal to a specified string.  */
+		pathEquals?: string;
+		/** Optional. Matches if the path segment of the URL starts with a specified string.  */
+		pathPrefix?: string;
+		/** Optional. Matches if the path segment of the URL ends with a specified string.  */
+		pathSuffix?: string;
+		/** Optional. Matches if the query segment of the URL contains a specified string.  */
+		queryContains?: string;
+		/** Optional. Matches if the query segment of the URL is equal to a specified string.  */
+		queryEquals?: string;
+		/** Optional. Matches if the query segment of the URL starts with a specified string.  */
+		queryPrefix?: string;
+		/** Optional. Matches if the query segment of the URL ends with a specified string.  */
+		querySuffix?: string;
+		/** Optional. Matches if the URL (without fragment identifier) contains a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+		urlContains?: string;
+		/** Optional. Matches if the URL (without fragment identifier) is equal to a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+		urlEquals?: string;
+		/** Optional. Matches if the URL (without fragment identifier) matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.  */
+		urlMatches?: string;
+		/** Optional. Matches if the URL without query segment and fragment identifier matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.  */
+		originAndPathMatches?: string;
+		/** Optional. Matches if the URL (without fragment identifier) starts with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+		urlPrefix?: string;
+		/** Optional. Matches if the URL (without fragment identifier) ends with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+		urlSuffix?: string;
+		/** Optional. Matches if the scheme of the URL is equal to any of the schemes specified in the array.  */
+		schemes?: string[];
+		/** Optional. Matches if the port of the URL is contained in any of the specified port lists. For example [80, 443, [1000, 1200]] matches all requests on port 80, 443 and in the range 1000-1200.  */
+		ports?: (number | number[])[];
+	}
+
+	/** Matches the state of a web page by various criteria. */
+	interface PageStateMatcher {
+		/** Optional. Filters URLs for various criteria. See event filtering. All criteria are case sensitive.  */
+		pageUrl?: PageStateUrlDetails;
+		/** Optional. Matches if all of the CSS selectors in the array match displayed elements in a frame with the same origin as the page's main frame. All selectors in this array must be compound selectors to speed up matching. Note that listing hundreds of CSS selectors or CSS selectors that match hundreds of times per page can still slow down web sites.  */
+		css?: string[];
+		/**
+		 * Optional.
+ 		 * Since Chrome 45. Warning: this is the current Beta channel. More information available on the API documentation pages.
+		 * Matches if the bookmarked state of the page is equal to the specified value. Requres the bookmarks permission.
+		 */
+		isBookmarked?: boolean;
+	}
+}
+
+////////////////////
+// Declarative Web Request
+////////////////////
+declare namespace chrome.declarativeWebRequest {
+    interface HeaderFilter {
+        nameEquals?: string;
+        valueContains?: any;
+        nameSuffix?: string;
+        valueSuffix?: string;
+        valuePrefix?: string;
+        nameContains?: any;
+        valueEquals?: string;
+        namePrefix?: string;
+    }
+
+    interface AddResponseHeader {
+        name: string;
+        value: string;
+    }
+
+    interface RemoveResponseCookie {
+        filter: ResponseCookie;
+    }
+
+    interface RemoveResponseHeader {
+        name: string;
+        value?: string;
+    }
+
+    interface RequestMatcher {
+        contentType?: string[];
+        url?: chrome.events.UrlFilter;
+        excludeContentType?: string[];
+        excludeResponseHeader?: HeaderFilter[];
+        resourceType?: string;
+        responseHeaders?: HeaderFilter[];
+    }
+
+    interface IgnoreRules {
+        lowerPriorityThan: number;
+    }
+
+    interface RedirectToEmptyDocument { }
+
+    interface RedirectRequest {
+        redirectUrl: string;
+    }
+
+    interface ResponseCookie {
+        domain?: string;
+        name?: string;
+        expires?: string;
+        maxAge?: number;
+        value?: string;
+        path?: string;
+        httpOnly?: string;
+        secure?: string;
+    }
+
+    interface AddResponseCookie {
+        cookie: ResponseCookie;
+    }
+
+    interface EditResponseCookie {
+        filter: ResponseCookie;
+        modification: ResponseCookie;
+    }
+
+    interface CancelRequest { }
+
+    interface RemoveRequestHeader {
+        name: string;
+    }
+
+    interface EditRequestCookie {
+        filter: RequestCookie;
+        modification: RequestCookie;
+    }
+
+    interface SetRequestHeader {
+        name: string;
+        value: string;
+    }
+
+    interface RequestCookie {
+        name?: string;
+        value?: string;
+    }
+
+    interface RedirectByRegEx {
+        to: string;
+        from: string;
+    }
+
+    interface RedirectToTransparentImage { }
+
+    interface AddRequestCookie {
+        cookie: RequestCookie;
+    }
+
+    interface RemoveRequestCookie {
+        filter: RequestCookie;
+    }
+
+    interface RequestedEvent extends chrome.events.Event<Function> {}
+
+    var onRequest: RequestedEvent;
+}
+
+////////////////////
+// DesktopCapture
+////////////////////
+/**
+ * Desktop Capture API that can be used to capture content of screen, individual windows or tabs.
+ * Availability: Since Chrome 34.
+ * Permissions:  "desktopCapture"
+ */
+declare namespace chrome.desktopCapture {
+	/**
+	 * Shows desktop media picker UI with the specified set of sources.
+	 * @param sources Set of sources that should be shown to the user.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(string streamId) {...};
+	 * Parameter streamId: An opaque string that can be passed to getUserMedia() API to generate media stream that corresponds to the source selected by the user. If user didn't select any source (i.e. canceled the prompt) then the callback is called with an empty streamId. The created streamId can be used only once and expires after a few seconds when it is not used.
+	 */
+    export function chooseDesktopMedia(sources: string[], callback: (streamId: string) => void): number;
+	/**
+	 * Shows desktop media picker UI with the specified set of sources.
+	 * @param sources Set of sources that should be shown to the user.
+	 * @param targetTab Optional tab for which the stream is created. If not specified then the resulting stream can be used only by the calling extension. The stream can only be used by frames in the given tab whose security origin matches tab.url.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(string streamId) {...};
+	 * Parameter streamId: An opaque string that can be passed to getUserMedia() API to generate media stream that corresponds to the source selected by the user. If user didn't select any source (i.e. canceled the prompt) then the callback is called with an empty streamId. The created streamId can be used only once and expires after a few seconds when it is not used.
+	 */
+    export function chooseDesktopMedia(sources: string[], targetTab: chrome.tabs.Tab, callback: (streamId: string) => void): number;
+	/**
+	 * Hides desktop media picker dialog shown by chooseDesktopMedia().
+	 * @param desktopMediaRequestId Id returned by chooseDesktopMedia()
+	 */
+    export function cancelChooseDesktopMedia(desktopMediaRequestId: number): void;
+}
+
+////////////////////
+// Dev Tools - Inspected Window
+////////////////////
+/**
+ * Use the chrome.devtools.inspectedWindow API to interact with the inspected window: obtain the tab ID for the inspected page, evaluate the code in the context of the inspected window, reload the page, or obtain the list of resources within the page.
+ * Availability: Since Chrome 18.
+ */
+declare namespace chrome.devtools.inspectedWindow {
+	/** A resource within the inspected page, such as a document, a script, or an image. */
+    interface Resource {
+		/** The URL of the resource. */
+        url: string;
+		/**
+		 * Gets the content of the resource.
+		 * @param callback A function that receives resource content when the request completes.
+		 * The callback parameter should be a function that looks like this:
+		 * function(string content, string encoding) {...};
+		 * Parameter content: Content of the resource (potentially encoded).
+		 * Parameter encoding: Empty if content is not encoded, encoding name otherwise. Currently, only base64 is supported.
+		 */
+        getContent(callback: (content: string, encoding: string) => void): void;
+		/**
+		 * Sets the content of the resource.
+		 * @param content New content of the resource. Only resources with the text type are currently supported.
+		 * @param commit True if the user has finished editing the resource, and the new content of the resource should be persisted; false if this is a minor change sent in progress of the user editing the resource.
+		 * @param callback A function called upon request completion.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function(object error) {...};
+		 * Optional parameter error: Set to undefined if the resource content was set successfully; describes error otherwise.
+		 */
+        setContent(content: string, commit: boolean, callback?: (error: Object) => void): void;
+    }
+
+    interface ReloadOptions {
+		/** Optional. If specified, the string will override the value of the User-Agent HTTP header that's sent while loading the resources of the inspected page. The string will also override the value of the navigator.userAgent property that's returned to any scripts that are running within the inspected page.  */
+        userAgent?: string;
+		/** Optional. When true, the loader will ignore the cache for all inspected page resources loaded before the load event is fired. The effect is similar to pressing Ctrl+Shift+R in the inspected window or within the Developer Tools window.  */
+        ignoreCache?: boolean;
+		/** Optional. If specified, the script will be injected into every frame of the inspected page immediately upon load, before any of the frame's scripts. The script will not be injected after subsequent reloads—for example, if the user presses Ctrl+R.  */
+        injectedScript?: boolean;
+		/**
+		 * Optional.
+ 		 * If specified, this script evaluates into a function that accepts three string arguments: the source to preprocess, the URL of the source, and a function name if the source is an DOM event handler. The preprocessorerScript function should return a string to be compiled by Chrome in place of the input source. In the case that the source is a DOM event handler, the returned source must compile to a single JS function.
+		 * @deprecated Deprecated since Chrome 41. Please avoid using this parameter, it will be removed soon.
+		 */
+		preprocessorScript?: string;
+    }
+
+	interface EvaluationExceptionInfo {
+		/** Set if the error occurred on the DevTools side before the expression is evaluated. */
+		isError: boolean;
+		/** Set if the error occurred on the DevTools side before the expression is evaluated. */
+		code: string;
+		/** Set if the error occurred on the DevTools side before the expression is evaluated. */
+		description: string;
+		/** Set if the error occurred on the DevTools side before the expression is evaluated, contains the array of the values that may be substituted into the description string to provide more information about the cause of the error. */
+		details: any[];
+		/** Set if the evaluated code produces an unhandled exception. */
+		isException: boolean;
+		/** Set if the evaluated code produces an unhandled exception. */
+		value: string;
+    }
+
+    interface ResourceAddedEvent extends chrome.events.Event<(resource: Resource) => void> {}
+
+    interface ResourceContentCommittedEvent extends chrome.events.Event<(resource: Resource, content: string) => void> {}
+
+	/** The ID of the tab being inspected. This ID may be used with chrome.tabs.* API. */
+    var tabId: number;
+
+	/** Reloads the inspected page. */
+    export function reload(reloadOptions: ReloadOptions): void;
+	/**
+	 * Evaluates a JavaScript expression in the context of the main frame of the inspected page. The expression must evaluate to a JSON-compliant object, otherwise an exception is thrown. The eval function can report either a DevTools-side error or a JavaScript exception that occurs during evaluation. In either case, the result parameter of the callback is undefined. In the case of a DevTools-side error, the isException parameter is non-null and has isError set to true and code set to an error code. In the case of a JavaScript error, isException is set to true and value is set to the string value of thrown object.
+	 * @param expression An expression to evaluate.
+	 * @param callback A function called when evaluation completes.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object result, object exceptionInfo) {...};
+	 * Parameter result: The result of evaluation.
+	 * Parameter exceptionInfo: An object providing details if an exception occurred while evaluating the expression.
+	 */
+    export function eval(expression: string, callback?: (result: Object, exceptionInfo: EvaluationExceptionInfo) => void): void;
+	/**
+	 * Retrieves the list of resources from the inspected page.
+	 * @param callback A function that receives the list of resources when the request completes.
+	 * The callback parameter should be a function that looks like this:
+	 * function(array of Resource resources) {...};
+	 */
+    export function getResources(callback: (resources: Resource[]) => void): void;
+
+	/** Fired when a new resource is added to the inspected page. */
+    var onResourceAdded: ResourceAddedEvent;
+	/** Fired when a new revision of the resource is committed (e.g. user saves an edited version of the resource in the Developer Tools). */
+    var onResourceContentCommitted: ResourceContentCommittedEvent;
+}
+
+////////////////////
+// Dev Tools - Network
+////////////////////
+/**
+ * Use the chrome.devtools.network API to retrieve the information about network requests displayed by the Developer Tools in the Network panel.
+ * Availability: Since Chrome 18.
+ */
+declare namespace chrome.devtools.network {
+	/** Represents a network request for a document resource (script, image and so on). See HAR Specification for reference. */
+    interface Request {
+		/**
+		 * Returns content of the response body.
+		 * @param callback A function that receives the response body when the request completes.
+		 * The callback parameter should be a function that looks like this:
+		 * function(string content, string encoding) {...};
+		 * Parameter content: Content of the response body (potentially encoded).
+		 * Parameter encoding: Empty if content is not encoded, encoding name otherwise. Currently, only base64 is supported.
+		 */
+        getContent(callback: (content: string, encoding: string) => void): void;
+    }
+
+    interface RequestFinishedEvent extends chrome.events.Event<(request: Request) => void> {}
+
+    interface NavigatedEvent extends chrome.events.Event<(url: string) => void> {}
+
+	/**
+	 * Returns HAR log that contains all known network requests.
+	 * @param callback A function that receives the HAR log when the request completes.
+	 * The callback parameter should be a function that looks like this:
+	 * function(object harLog) {...};
+	 * Parameter harLog: A HAR log. See HAR specification for details.
+	 */
+    export function getHAR(callback: (harLog: Object) => void): void;
+
+	/** Fired when a network request is finished and all request data are available. */
+    var onRequestFinished: RequestFinishedEvent;
+	/** Fired when the inspected window navigates to a new page. */
+    var onNavigated: NavigatedEvent;
+}
+
+////////////////////
+// Dev Tools - Panels
+////////////////////
+/**
+ * Use the chrome.devtools.panels API to integrate your extension into Developer Tools window UI: create your own panels, access existing panels, and add sidebars.
+ * Availability: Since Chrome 18.
+ */
+declare namespace chrome.devtools.panels {
+    interface PanelShownEvent extends chrome.events.Event<(window: chrome.windows.Window) => void> {}
+
+    interface PanelHiddenEvent extends chrome.events.Event<() => void> {}
+
+    interface PanelSearchEvent extends chrome.events.Event<(action: string, queryString?: string) => void> {}
+
+	/** Represents a panel created by extension. */
+    interface ExtensionPanel {
+		/**
+		 * Appends a button to the status bar of the panel.
+		 * @param iconPath Path to the icon of the button. The file should contain a 64x24-pixel image composed of two 32x24 icons. The left icon is used when the button is inactive; the right icon is displayed when the button is pressed.
+		 * @param tooltipText Text shown as a tooltip when user hovers the mouse over the button.
+		 * @param disabled Whether the button is disabled.
+		 */
+        createStatusBarButton(iconPath: string, tooltipText: string, disabled: boolean): Button;
+		/** Fired when the user switches to the panel. */
+        onShown: PanelShownEvent;
+		/** Fired when the user switches away from the panel. */
+        onHidden: PanelHiddenEvent;
+		/** Fired upon a search action (start of a new search, search result navigation, or search being canceled). */
+        onSearch: PanelSearchEvent;
+    }
+
+    interface ButtonClickedEvent extends chrome.events.Event<() => void> {}
+
+	/** A button created by the extension. */
+    interface Button {
+		/**
+		 * Updates the attributes of the button. If some of the arguments are omitted or null, the corresponding attributes are not updated.
+		 * @param iconPath Path to the new icon of the button.
+		 * @param tooltipText Text shown as a tooltip when user hovers the mouse over the button.
+		 * @param disabled Whether the button is disabled.
+		 */
+        update(iconPath?: string, tooltipText?: string, disabled?: boolean): void;
+		/** Fired when the button is clicked. */
+        onClicked: ButtonClickedEvent;
+    }
+
+    interface SelectionChangedEvent extends chrome.events.Event<() => void> {}
+
+	/** Represents the Elements panel. */
+    interface ElementsPanel {
+		/**
+		 * Creates a pane within panel's sidebar.
+		 * @param title Text that is displayed in sidebar caption.
+		 * @param callback A callback invoked when the sidebar is created.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function( ExtensionSidebarPane result) {...};
+		 * Parameter result: An ExtensionSidebarPane object for created sidebar pane.
+		 */
+        createSidebarPane(title: string, callback?: (result: ExtensionSidebarPane) => void): void;
+		/** Fired when an object is selected in the panel. */
+        onSelectionChanged: SelectionChangedEvent;
+    }
+
+	/**
+	 * Since Chrome 41.
+	 * Represents the Sources panel.
+	 */
+	interface SourcesPanel {
+		/**
+		 * Creates a pane within panel's sidebar.
+		 * @param title Text that is displayed in sidebar caption.
+		 * @param callback A callback invoked when the sidebar is created.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function( ExtensionSidebarPane result) {...};
+		 * Parameter result: An ExtensionSidebarPane object for created sidebar pane.
+		 */
+        createSidebarPane(title: string, callback?: (result: ExtensionSidebarPane) => void): void;
+		/** Fired when an object is selected in the panel. */
+        onSelectionChanged: SelectionChangedEvent;
+    }
+
+    interface ExtensionSidebarPaneShownEvent extends chrome.events.Event<(window: chrome.windows.Window) => void> {}
+
+    interface ExtensionSidebarPaneHiddenEvent extends chrome.events.Event<() => void> {}
+
+	/** A sidebar created by the extension. */
+    interface ExtensionSidebarPane {
+		/**
+		 * Sets the height of the sidebar.
+		 * @param height A CSS-like size specification, such as '100px' or '12ex'.
+		 */
+        setHeight(height: string): void;
+		/**
+		 * Sets an expression that is evaluated within the inspected page. The result is displayed in the sidebar pane.
+		 * @param expression An expression to be evaluated in context of the inspected page. JavaScript objects and DOM nodes are displayed in an expandable tree similar to the console/watch.
+		 * @param rootTitle An optional title for the root of the expression tree.
+		 * @param callback A callback invoked after the sidebar pane is updated with the expression evaluation results.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
+		 */
+        setExpression(expression: string, rootTitle?: string, callback?: () => void): void;
+		/**
+		 * Sets an expression that is evaluated within the inspected page. The result is displayed in the sidebar pane.
+		 * @param expression An expression to be evaluated in context of the inspected page. JavaScript objects and DOM nodes are displayed in an expandable tree similar to the console/watch.
+		 * @param callback A callback invoked after the sidebar pane is updated with the expression evaluation results.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
+		 */
+        setExpression(expression: string, callback?: () => void): void;
+		/**
+		 * Sets a JSON-compliant object to be displayed in the sidebar pane.
+		 * @param jsonObject An object to be displayed in context of the inspected page. Evaluated in the context of the caller (API client).
+		 * @param rootTitle An optional title for the root of the expression tree.
+		 * @param callback A callback invoked after the sidebar is updated with the object.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
+		 */
+        setObject(jsonObject: string, rootTitle?: string, callback?: () => void): void;
+		/**
+		 * Sets a JSON-compliant object to be displayed in the sidebar pane.
+		 * @param jsonObject An object to be displayed in context of the inspected page. Evaluated in the context of the caller (API client).
+		 * @param callback A callback invoked after the sidebar is updated with the object.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
+		 */
+        setObject(jsonObject: string, callback?: () => void): void;
+		/**
+		 * Sets an HTML page to be displayed in the sidebar pane.
+		 * @param path Relative path of an extension page to display within the sidebar.
+		 */
+        setPage(path: string): void;
+		/** Fired when the sidebar pane becomes visible as a result of user switching to the panel that hosts it. */
+        onShown: ExtensionSidebarPaneShownEvent;
+		/** Fired when the sidebar pane becomes hidden as a result of the user switching away from the panel that hosts the sidebar pane. */
+        onHidden: ExtensionSidebarPaneHiddenEvent;
+    }
+
+	/** Elements panel. */
+    var elements: ElementsPanel;
+	/**
+	 * Since Chrome 38.
+	 * Sources panel.
+	 */
+	var sources: SourcesPanel;
+
+	/**
+	 * Creates an extension panel.
+	 * @param title Title that is displayed next to the extension icon in the Developer Tools toolbar.
+	 * @param iconPath Path of the panel's icon relative to the extension directory.
+	 * @param pagePath Path of the panel's HTML page relative to the extension directory.
+	 * @param callback A function that is called when the panel is created.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function( ExtensionPanel panel) {...};
+	 * Parameter panel: An ExtensionPanel object representing the created panel.
+	 */
+    export function create(title: string, iconPath: string, pagePath: string, callback?: (panel: ExtensionPanel) => void): void;
+	/**
+	 * Specifies the function to be called when the user clicks a resource link in the Developer Tools window. To unset the handler, either call the method with no parameters or pass null as the parameter.
+	 * @param callback A function that is called when the user clicks on a valid resource link in Developer Tools window. Note that if the user clicks an invalid URL or an XHR, this function is not called.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function( devtools.inspectedWindow.Resource resource) {...};
+	 * Parameter resource: A devtools.inspectedWindow.Resource object for the resource that was clicked.
+	 */
+    export function setOpenResourceHandler(callback?: (resource: chrome.devtools.inspectedWindow.Resource) => void): void;
+	/**
+	 * Since Chrome 38.
+	 * Requests DevTools to open a URL in a Developer Tools panel.
+	 * @param url The URL of the resource to open.
+	 * @param lineNumber Specifies the line number to scroll to when the resource is loaded.
+	 * @param callback A function that is called when the resource has been successfully loaded.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function openResource(url: string, lineNumber: number, callback: () => void): void;
+}
+
+////////////////////
+// Document Scan
+////////////////////
+/**
+ * Use the chrome.documentScan API to discover and retrieve images from attached paper document scanners.
+ * Availability: Since Chrome 44.
+ * Permissions:  "documentScan"
+ * Important: This API works only on Chrome OS.
+ */
+declare namespace chrome.documentScan {
+	interface DocumentScanOptions {
+		/** Optional. The MIME types that are accepted by the caller.  */
+		mimeTypes?: string[];
+		/** Optional. The number of scanned images allowed (defaults to 1).  */
+		maxImages?: number;
+	}
+
+	interface DocumentScanCallbackArg {
+		/** The data image URLs in a form that can be passed as the "src" value to an image tag. */
+		dataUrls: string[];
+		/** The MIME type of dataUrls. */
+		mimeType: string;
+	}
+
+	/**
+	 * Performs a document scan. On success, the PNG data will be sent to the callback.
+	 * @param options Object containing scan parameters.
+	 * @param callback Called with the result and data from the scan.
+	 * The callback parameter should be a function that looks like this:
+	 * function(object result) {...};
+	 */
+	export function scan(options: DocumentScanOptions, callback: (result: DocumentScanCallbackArg) => void): void;
+}
+
+////////////////////
+// Dev Tools - Downloads
+////////////////////
+/**
+ * Use the chrome.downloads API to programmatically initiate, monitor, manipulate, and search for downloads.
+ * Availability: Since Chrome 31.
+ * Permissions:  "downloads"
+ */
+declare namespace chrome.downloads {
+    interface HeaderNameValuePair {
+		/** Name of the HTTP header. */
+        name: string;
+		/** Value of the HTTP header. */
+        value: string;
+    }
+
+    interface DownloadOptions {
+		/** Optional. Post body.  */
+        body?: string;
+		/** Optional. Use a file-chooser to allow the user to select a filename regardless of whether filename is set or already exists.  */
+        saveAs?: boolean;
+		/** The URL to download. */
+        url: string;
+		/** Optional. A file path relative to the Downloads directory to contain the downloaded file, possibly containing subdirectories. Absolute paths, empty paths, and paths containing back-references ".." will cause an error. onDeterminingFilename allows suggesting a filename after the file's MIME type and a tentative filename have been determined.  */
+        filename?: string;
+		/** Optional. Extra HTTP headers to send with the request if the URL uses the HTTP[s] protocol. Each header is represented as a dictionary containing the keys name and either value or binaryValue, restricted to those allowed by XMLHttpRequest.  */
+        headers?: HeaderNameValuePair[];
+		/** Optional. The HTTP method to use if the URL uses the HTTP[S] protocol.  */
+        method?: string;
+		/** Optional. The action to take if filename already exists.  */
+		conflictAction?: string;
+    }
+
+    interface DownloadDelta {
+		/** Optional. The change in danger, if any.  */
+		danger?: StringDelta;
+		/** Optional. The change in url, if any.  */
+		url?: StringDelta;
+		/** Optional. The change in totalBytes, if any.  */
+		totalBytes?: DoubleDelta;
+		/** Optional. The change in filename, if any.  */
+		filename?: StringDelta;
+		/** Optional. The change in paused, if any.  */
+		paused?: BooleanDelta;
+		/** Optional. The change in state, if any.  */
+		state?: StringDelta;
+		/** Optional. The change in mime, if any.  */
+		mime?: StringDelta;
+		/** Optional. The change in fileSize, if any.  */
+		fileSize?: DoubleDelta;
+		/** Optional. The change in startTime, if any.  */
+		startTime?: DoubleDelta;
+		/** Optional. The change in error, if any.  */
+		error?: StringDelta;
+		/** Optional. The change in endTime, if any.  */
+		endTime?: DoubleDelta;
+		/** The id of the DownloadItem that changed. */
+        id: number;
+		/** Optional. The change in canResume, if any.  */
+		canResume?: BooleanDelta;
+		/** Optional. The change in exists, if any.  */
+		exists?: BooleanDelta;
+    }
+
+    interface BooleanDelta {
+        current?: boolean;
+        previous?: boolean;
+    }
+
+	/** Since Chrome 34. */
+    interface DoubleDelta {
+        current?: number;
+        previous?: number;
+    }
+
+    interface StringDelta {
+        current?: string;
+        previous?: string;
+    }
+
+    interface DownloadItem {
+		/** Number of bytes received so far from the host, without considering file compression. */
+        bytesReceived: number;
+		/** Indication of whether this download is thought to be safe or known to be suspicious. */
+        danger: string;
+		/** Absolute URL. */
+        url: string;
+		/** Number of bytes in the whole file, without considering file compression, or -1 if unknown. */
+        totalBytes: number;
+		/** Absolute local path. */
+        filename: string;
+		/** True if the download has stopped reading data from the host, but kept the connection open. */
+        paused: boolean;
+		/** Indicates whether the download is progressing, interrupted, or complete. */
+        state: string;
+		/** The file's MIME type. */
+        mime: string;
+		/** Number of bytes in the whole file post-decompression, or -1 if unknown. */
+        fileSize: number;
+		/** The time when the download began in ISO 8601 format. May be passed directly to the Date constructor: chrome.downloads.search({}, function(items){items.forEach(function(item){console.log(new Date(item.startTime))})}) */
+        startTime: string;
+		/** Optional. Why the download was interrupted. Several kinds of HTTP errors may be grouped under one of the errors beginning with SERVER_. Errors relating to the network begin with NETWORK_, errors relating to the process of writing the file to the file system begin with FILE_, and interruptions initiated by the user begin with USER_.  */
+		error?: string;
+		/** Optional. The time when the download ended in ISO 8601 format. May be passed directly to the Date constructor: chrome.downloads.search({}, function(items){items.forEach(function(item){if (item.endTime) console.log(new Date(item.endTime))})})  */
+		endTime?: string;
+		/** An identifier that is persistent across browser sessions. */
+        id: number;
+		/** False if this download is recorded in the history, true if it is not recorded. */
+        incognito: boolean;
+		/** Absolute URL. */
+		referrer: string;
+		/** Optional. Estimated time when the download will complete in ISO 8601 format. May be passed directly to the Date constructor: chrome.downloads.search({}, function(items){items.forEach(function(item){if (item.estimatedEndTime) console.log(new Date(item.estimatedEndTime))})})  */
+		estimatedEndTime?: string;
+		/** True if the download is in progress and paused, or else if it is interrupted and can be resumed starting from where it was interrupted. */
+		canResume: boolean;
+		/** Whether the downloaded file still exists. This information may be out of date because Chrome does not automatically watch for file removal. Call search() in order to trigger the check for file existence. When the existence check completes, if the file has been deleted, then an onChanged event will fire. Note that search() does not wait for the existence check to finish before returning, so results from search() may not accurately reflect the file system. Also, search() may be called as often as necessary, but will not check for file existence any more frequently than once every 10 seconds. */
+		exists: boolean;
+		/** Optional. The identifier for the extension that initiated this download if this download was initiated by an extension. Does not change once it is set.  */
+		byExtensionId?: string;
+		/** Optional. The localized name of the extension that initiated this download if this download was initiated by an extension. May change if the extension changes its name or if the user changes their locale.  */
+		byExtensionName?: string;
+    }
+
+    interface GetFileIconOptions {
+		/** Optional. * The size of the returned icon. The icon will be square with dimensions size * size pixels. The default and largest size for the icon is 32x32 pixels. The only supported sizes are 16 and 32. It is an error to specify any other size.
+ */
+        size?: number;
+    }
+
+    interface DownloadQuery {
+		/** Optional. Set elements of this array to DownloadItem properties in order to sort search results. For example, setting orderBy=['startTime'] sorts the DownloadItem by their start time in ascending order. To specify descending order, prefix with a hyphen: '-startTime'.  */
+		orderBy?: string[];
+		/** Optional. Limits results to DownloadItem whose url matches the given regular expression.  */
+        urlRegex?: string;
+		/** Optional. Limits results to DownloadItem that ended before the given ms since the epoch.  */
+        endedBefore?: number;
+		/** Optional. Limits results to DownloadItem whose totalBytes is greater than the given integer.  */
+        totalBytesGreater?: number;
+		/** Optional. Indication of whether this download is thought to be safe or known to be suspicious.  */
+        danger?: string;
+		/** Optional. Number of bytes in the whole file, without considering file compression, or -1 if unknown.  */
+        totalBytes?: number;
+		/** Optional. True if the download has stopped reading data from the host, but kept the connection open.  */
+        paused?: boolean;
+		/** Optional. Limits results to DownloadItem whose filename matches the given regular expression.  */
+        filenameRegex?: string;
+		/** Optional. This array of search terms limits results to DownloadItem whose filename or url contain all of the search terms that do not begin with a dash '-' and none of the search terms that do begin with a dash.  */
+		query?: string[];
+		/** Optional. Limits results to DownloadItem whose totalBytes is less than the given integer.  */
+        totalBytesLess?: number;
+		/** Optional. The id of the DownloadItem to query.  */
+        id?: number;
+		/** Optional. Number of bytes received so far from the host, without considering file compression.  */
+        bytesReceived?: number;
+		/** Optional. Limits results to DownloadItem that ended after the given ms since the epoch.  */
+        endedAfter?: number;
+		/** Optional. Absolute local path.  */
+        filename?: string;
+		/** Optional. Indicates whether the download is progressing, interrupted, or complete.  */
+        state?: string;
+		/** Optional. Limits results to DownloadItem that started after the given ms since the epoch.  */
+        startedAfter?: number;
+		/** Optional. The file's MIME type.  */
+        mime?: string;
+		/** Optional. Number of bytes in the whole file post-decompression, or -1 if unknown.  */
+        fileSize?: number;
+		/** Optional. The time when the download began in ISO 8601 format.  */
+        startTime?: number;
+		/** Optional. Absolute URL.  */
+        url?: string;
+		/** Optional. Limits results to DownloadItem that started before the given ms since the epoch.  */
+        startedBefore?: number;
+		/** Optional. The maximum number of matching DownloadItem returned. Defaults to 1000. Set to 0 in order to return all matching DownloadItem. See search for how to page through results.  */
+        limit?: number;
+		/** Optional. Why a download was interrupted.  */
+        error?: number;
+		/** Optional. The time when the download ended in ISO 8601 format.  */
+        endTime?: number;
+		/** Optional. Whether the downloaded file exists;  */
+		exists?: boolean;
+    }
+
+	interface DownloadFilenameSuggestion {
+		/** The DownloadItem's new target DownloadItem.filename, as a path relative to the user's default Downloads directory, possibly containing subdirectories. Absolute paths, empty paths, and paths containing back-references ".." will be ignored. */
+		filename: string;
+		/** Optional. The action to take if filename already exists.  */
+		conflictAction?: string;
+	}
+
+    interface DownloadChangedEvent extends chrome.events.Event<(downloadDelta: DownloadDelta) => void> {}
+
+    interface DownloadCreatedEvent extends chrome.events.Event<(downloadItem: DownloadItem) => void> {}
+
+    interface DownloadErasedEvent extends chrome.events.Event<(downloadId: number) => void> {}
+
+	interface DownloadDeterminingFilenameEvent extends chrome.events.Event<(downloadItem: DownloadItem, suggest: (suggestion?: DownloadFilenameSuggestion) => void) => void> {}
+
+	/**
+	 * Find DownloadItem. Set query to the empty object to get all DownloadItem. To get a specific DownloadItem, set only the id field. To page through a large number of items, set orderBy: ['-startTime'], set limit to the number of items per page, and set startedAfter to the startTime of the last item from the last page.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of DownloadItem results) {...};
+	 */
+    export function search(query: DownloadQuery, callback: (results: DownloadItem[]) => void): void;
+	/**
+	 * Pause the download. If the request was successful the download is in a paused state. Otherwise runtime.lastError contains an error message. The request will fail if the download is not active.
+	 * @param downloadId The id of the download to pause.
+	 * @param callback Called when the pause request is completed.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function pause(downloadId: number, callback?: () => void): void;
+	/**
+	 * Retrieve an icon for the specified download. For new downloads, file icons are available after the onCreated event has been received. The image returned by this function while a download is in progress may be different from the image returned after the download is complete. Icon retrieval is done by querying the underlying operating system or toolkit depending on the platform. The icon that is returned will therefore depend on a number of factors including state of the download, platform, registered file types and visual theme. If a file icon cannot be determined, runtime.lastError will contain an error message.
+	 * @param downloadId The identifier for the download.
+	 * @param callback A URL to an image that represents the download.
+	 * The callback parameter should be a function that looks like this:
+	 * function(string iconURL) {...};
+	 */
+    export function getFileIcon(downloadId: number, callback: (iconURL: string) => void): void;
+	/**
+	 * Retrieve an icon for the specified download. For new downloads, file icons are available after the onCreated event has been received. The image returned by this function while a download is in progress may be different from the image returned after the download is complete. Icon retrieval is done by querying the underlying operating system or toolkit depending on the platform. The icon that is returned will therefore depend on a number of factors including state of the download, platform, registered file types and visual theme. If a file icon cannot be determined, runtime.lastError will contain an error message.
+	 * @param downloadId The identifier for the download.
+	 * @param callback A URL to an image that represents the download.
+	 * The callback parameter should be a function that looks like this:
+	 * function(string iconURL) {...};
+	 */
+    export function getFileIcon(downloadId: number, options: GetFileIconOptions, callback: (iconURL: string) => void): void;
+	/**
+	 * Resume a paused download. If the request was successful the download is in progress and unpaused. Otherwise runtime.lastError contains an error message. The request will fail if the download is not active.
+	 * @param downloadId The id of the download to resume.
+	 * @param callback  Called when the resume request is completed.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function resume(downloadId: number, callback?: () => void): void;
+	/**
+	 * Cancel a download. When callback is run, the download is cancelled, completed, interrupted or doesn't exist anymore.
+	 * @param downloadId The id of the download to cancel.
+	 * @param callback Called when the cancel request is completed.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function cancel(downloadId: number, callback?: () => void): void;
+	/**
+	 * Download a URL. If the URL uses the HTTP[S] protocol, then the request will include all cookies currently set for its hostname. If both filename and saveAs are specified, then the Save As dialog will be displayed, pre-populated with the specified filename. If the download started successfully, callback will be called with the new DownloadItem's downloadId. If there was an error starting the download, then callback will be called with downloadId=undefined and runtime.lastError will contain a descriptive string. The error strings are not guaranteed to remain backwards compatible between releases. Extensions must not parse it.
+	 * @param options What to download and how.
+	 * @param callback Called with the id of the new DownloadItem.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function(integer downloadId) {...};
+	 */
+    export function download(options: DownloadOptions, callback?: (downloadId: number) => void): void;
+	/**
+	 * Open the downloaded file now if the DownloadItem is complete; otherwise returns an error through runtime.lastError. Requires the "downloads.open" permission in addition to the "downloads" permission. An onChanged event will fire when the item is opened for the first time.
+	 * @param downloadId The identifier for the downloaded file.
+	 */
+    export function open(downloadId: number): void;
+	/**
+	 * Show the downloaded file in its folder in a file manager.
+	 * @param downloadId The identifier for the downloaded file.
+	 */
+    export function show(downloadId: number): void;
+	/** Show the default Downloads folder in a file manager. */
+    export function showDefaultFolder(): void;
+	/**
+	 * Erase matching DownloadItem from history without deleting the downloaded file. An onErased event will fire for each DownloadItem that matches query, then callback will be called.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(array of integer erasedIds) {...};
+	 */
+    export function erase(query: DownloadQuery, callback: (erasedIds: number[]) => void): void;
+	/**
+	 * Remove the downloaded file if it exists and the DownloadItem is complete; otherwise return an error through runtime.lastError.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function removeFile(downloadId: number, callback?: () => void): void;
+	/**
+	 * Prompt the user to accept a dangerous download. Can only be called from a visible context (tab, window, or page/browser action popup). Does not automatically accept dangerous downloads. If the download is accepted, then an onChanged event will fire, otherwise nothing will happen. When all the data is fetched into a temporary file and either the download is not dangerous or the danger has been accepted, then the temporary file is renamed to the target filename, the |state| changes to 'complete', and onChanged fires.
+	 * @param downloadId The identifier for the DownloadItem.
+	 * @param callback Called when the danger prompt dialog closes.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function acceptDanger(downloadId: number, callback: () => void): void;
+	/** Initiate dragging the downloaded file to another application. Call in a javascript ondragstart handler. */
+    export function drag(downloadId: number): void;
+	/** Enable or disable the gray shelf at the bottom of every window associated with the current browser profile. The shelf will be disabled as long as at least one extension has disabled it. Enabling the shelf while at least one other extension has disabled it will return an error through runtime.lastError. Requires the "downloads.shelf" permission in addition to the "downloads" permission. */
+    export function setShelfEnabled(enabled: boolean): void;
+
+	/** When any of a DownloadItem's properties except bytesReceived and estimatedEndTime changes, this event fires with the downloadId and an object containing the properties that changed. */
+    var onChanged: DownloadChangedEvent;
+	/** This event fires with the DownloadItem object when a download begins. */
+    var onCreated: DownloadCreatedEvent;
+	/** Fires with the downloadId when a download is erased from history. */
+    var onErased: DownloadErasedEvent;
+	/** During the filename determination process, extensions will be given the opportunity to override the target DownloadItem.filename. Each extension may not register more than one listener for this event. Each listener must call suggest exactly once, either synchronously or asynchronously. If the listener calls suggest asynchronously, then it must return true. If the listener neither calls suggest synchronously nor returns true, then suggest will be called automatically. The DownloadItem will not complete until all listeners have called suggest. Listeners may call suggest without any arguments in order to allow the download to use downloadItem.filename for its filename, or pass a suggestion object to suggest in order to override the target filename. If more than one extension overrides the filename, then the last extension installed whose listener passes a suggestion object to suggest wins. In order to avoid confusion regarding which extension will win, users should not install extensions that may conflict. If the download is initiated by download and the target filename is known before the MIME type and tentative filename have been determined, pass filename to download instead. */
+	var onDeterminingFilename: DownloadDeterminingFilenameEvent;
+}
+
+////////////////////
+// Enterprise Platform Keys
+////////////////////
+/**
+ * Use the chrome.enterprise.platformKeys API to generate hardware-backed keys and to install certificates for these keys. The certificates will be managed by the platform and can be used for TLS authentication, network access or by other extension through chrome.platformKeys.
+ * Availability: Since Chrome 37.
+ * Permissions:  "enterprise.platformKeys"
+ * Important: This API works only on Chrome OS.
+ * Note:  This API is only for extensions pre-installed by policy.
+ */
+declare namespace chrome.enterprise.platformKeys {
+	interface Token {
+		/**
+		 * Uniquely identifies this Token.
+		 * Static IDs are "user" and "system", referring to the platform's user-specific and the system-wide hardware token, respectively. Any other tokens (with other identifiers) might be returned by enterprise.platformKeys.getTokens.
+		 */
+		id: string;
+		/**
+		 * Implements the WebCrypto's SubtleCrypto interface. The cryptographic operations, including key generation, are hardware-backed.
+		 * Only non-extractable RSASSA-PKCS1-V1_5 keys with modulusLength up to 2048 can be generated. Each key can be used for signing data at most once.
+		 * Keys generated on a specific Token cannot be used with any other Tokens, nor can they be used with window.crypto.subtle. Equally, Key objects created with window.crypto.subtle cannot be used with this interface.
+		 */
+		subtleCrypto: SubtleCrypto;
+	}
+
+	/**
+	 * Returns the available Tokens. In a regular user's session the list will always contain the user's token with id "user". If a system-wide TPM token is available, the returned list will also contain the system-wide token with id "system". The system-wide token will be the same for all sessions on this device (device in the sense of e.g. a Chromebook).
+	 * @param callback Invoked by getTokens with the list of available Tokens.
+	 * The callback parameter should be a function that looks like this:
+	 * function(array of Token tokens) {...};
+	 * Parameter tokens: The list of available tokens.
+	 */
+	export function getToken(callback: (tokens: Token[]) => void): void;
+	/**
+	 * Returns the list of all client certificates available from the given token. Can be used to check for the existence and expiration of client certificates that are usable for a certain authentication.
+	 * @param tokenId The id of a Token returned by getTokens.
+	 * @param callback Called back with the list of the available certificates.
+	 * The callback parameter should be a function that looks like this:
+	 * function(array of ArrayBuffer certificates) {...};
+	 * Parameter certificates: The list of certificates, each in DER encoding of a X.509 certificate.
+	 */
+	export function getCertificates(tokenId: string, callback: (certificates: ArrayBuffer) => void): void;
+	/**
+	 * Imports certificate to the given token if the certified key is already stored in this token. After a successful certification request, this function should be used to store the obtained certificate and to make it available to the operating system and browser for authentication.
+	 * @param tokenId The id of a Token returned by getTokens.
+	 * @param certificate The DER encoding of a X.509 certificate.
+	 * @param callback Called back when this operation is finished.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function importCertificate(tokenId: string, certificate: ArrayBuffer, callback?: () => void): void;
+	/**
+	 * Removes certificate from the given token if present. Should be used to remove obsolete certificates so that they are not considered during authentication and do not clutter the certificate choice. Should be used to free storage in the certificate store.
+	 * @param tokenId The id of a Token returned by getTokens.
+	 * @param certificate The DER encoding of a X.509 certificate.
+	 * @param callback Called back when this operation is finished.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function removeCertificate(tokenId: string, certificate: ArrayBuffer, callback?: () => void): void;
+}
+
+////////////////////
+// Events
+////////////////////
+/**
+ * The chrome.events namespace contains common types used by APIs dispatching events to notify you when something interesting happens.
+ * Availability: Since Chrome 21.
+ */
+declare namespace chrome.events {
+	/** Filters URLs for various criteria. See event filtering. All criteria are case sensitive. */
+    interface UrlFilter {
+		/** Optional. Matches if the scheme of the URL is equal to any of the schemes specified in the array.  */
+        schemes?: string[];
+		/**
+		 * Optional.
+ 		 * Since Chrome 23.
+		 * Matches if the URL (without fragment identifier) matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
+		 */
+        urlMatches?: string;
+		/** Optional. Matches if the path segment of the URL contains a specified string.  */
+        pathContains?: string;
+		/** Optional. Matches if the host name of the URL ends with a specified string.  */
+        hostSuffix?: string;
+		/** Optional. Matches if the host name of the URL starts with a specified string.  */
+        hostPrefix?: string;
+		/** Optional. Matches if the host name of the URL contains a specified string. To test whether a host name component has a prefix 'foo', use hostContains: '.foo'. This matches 'www.foobar.com' and 'foo.com', because an implicit dot is added at the beginning of the host name. Similarly, hostContains can be used to match against component suffix ('foo.') and to exactly match against components ('.foo.'). Suffix- and exact-matching for the last components need to be done separately using hostSuffix, because no implicit dot is added at the end of the host name.  */
+        hostContains?: string;
+		/** Optional. Matches if the URL (without fragment identifier) contains a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+        urlContains?: string;
+		/** Optional. Matches if the query segment of the URL ends with a specified string.  */
+        querySuffix?: string;
+		/** Optional. Matches if the URL (without fragment identifier) starts with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+        urlPrefix?: string;
+		/** Optional. Matches if the host name of the URL is equal to a specified string.  */
+        hostEquals?: string;
+		/** Optional. Matches if the URL (without fragment identifier) is equal to a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+        urlEquals?: string;
+		/** Optional. Matches if the query segment of the URL contains a specified string.  */
+        queryContains?: string;
+		/** Optional. Matches if the path segment of the URL starts with a specified string.  */
+        pathPrefix?: string;
+		/** Optional. Matches if the path segment of the URL is equal to a specified string.  */
+        pathEquals?: string;
+		/** Optional. Matches if the path segment of the URL ends with a specified string.  */
+        pathSuffix?: string;
+		/** Optional. Matches if the query segment of the URL is equal to a specified string.  */
+        queryEquals?: string;
+		/** Optional. Matches if the query segment of the URL starts with a specified string.  */
+        queryPrefix?: string;
+		/** Optional. Matches if the URL (without fragment identifier) ends with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+        urlSuffix?: string;
+		/** Optional. Matches if the port of the URL is contained in any of the specified port lists. For example [80, 443, [1000, 1200]] matches all requests on port 80, 443 and in the range 1000-1200.  */
+        ports?: any[];
+		/**
+		 * Optional.
+ 		 * Since Chrome 28.
+		 * Matches if the URL without query segment and fragment identifier matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
+		 */
+		originAndPathMatches?: string;
+    }
+
+	/** An object which allows the addition and removal of listeners for a Chrome event. */
+    interface Event<T extends Function> {
+		/**
+		 * Registers an event listener callback to an event.
+		 * @param callback Called when an event occurs. The parameters of this function depend on the type of event.
+		 * The callback parameter should be a function that looks like this:
+		 * function() {...};
+		 */
+        addListener(callback: T): void;
+		/**
+		 * Returns currently registered rules.
+		 * @param callback Called with registered rules.
+		 * The callback parameter should be a function that looks like this:
+		 * function(array of Rule rules) {...};
+		 * Parameter rules: Rules that were registered, the optional parameters are filled with values.
+		 */
+        getRules(callback: (rules: Rule[]) => void): void;
+		/**
+		 * Returns currently registered rules.
+		 * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are returned.
+		 * @param callback Called with registered rules.
+		 * The callback parameter should be a function that looks like this:
+		 * function(array of Rule rules) {...};
+		 * Parameter rules: Rules that were registered, the optional parameters are filled with values.
+		 */
+        getRules(ruleIdentifiers: string[], callback: (rules: Rule[]) => void): void;
+        /**
+		 * @param callback Listener whose registration status shall be tested.
+		 */
+        hasListener(callback: T): boolean;
+		/**
+		 * Unregisters currently registered rules.
+		 * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are unregistered.
+		 * @param callback Called when rules were unregistered.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
+		 */
+        removeRules(ruleIdentifiers?: string[], callback?: () => void): void;
+		/**
+		 * Unregisters currently registered rules.
+		 * @param callback Called when rules were unregistered.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
+		 */
+        removeRules(callback?: () => void): void;
+		/**
+		 * Registers rules to handle events.
+		 * @param rules Rules to be registered. These do not replace previously registered rules.
+		 * @param callback Called with registered rules.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function(array of Rule rules) {...};
+		 * Parameter rules: Rules that were registered, the optional parameters are filled with values.
+		 */
+        addRules(rules: Rule[], callback?: (rules: Rule[]) => void): void;
+		/**
+		 * Deregisters an event listener callback from an event.
+		 * @param callback Listener that shall be unregistered.
+		 * The callback parameter should be a function that looks like this:
+		 * function() {...};
+		 */
+        removeListener(callback: T): void;
+        hasListeners(): boolean;
+    }
+
+	/** Description of a declarative rule for handling events. */
+    interface Rule {
+		/** Optional. Optional priority of this rule. Defaults to 100.  */
+        priority?: number;
+		/** List of conditions that can trigger the actions. */
+        conditions: any[];
+		/** Optional. Optional identifier that allows referencing this rule.  */
+        id?: string;
+		/** List of actions that are triggered if one of the condtions is fulfilled. */
+        actions: any[];
+		/**
+		 * Optional.
+ 		 * Since Chrome 28.
+		 * Tags can be used to annotate rules and perform operations on sets of rules.
+		 */
+		tags?: string[];
+    }
+}
+
+////////////////////
+// Extension
+////////////////////
+/**
+ * The chrome.extension API has utilities that can be used by any extension page. It includes support for exchanging messages between an extension and its content scripts or between extensions, as described in detail in Message Passing.
+ * Availability: Since Chrome 5.
+ */
+declare namespace chrome.extension {
+    interface FetchProperties {
+		/** Optional. The window to restrict the search to. If omitted, returns all views.  */
+        windowId?: number;
+		/** Optional. The type of view to get. If omitted, returns all views (including background pages and tabs). Valid values: 'tab', 'notification', 'popup'.  */
+        type?: string;
+    }
+
+    interface LastError {
+		/** Description of the error that has taken place. */
+        message: string;
+    }
+
+	interface OnRequestEvent extends chrome.events.Event<((request: any, sender: runtime.MessageSender, sendResponse: (response: any) => void) => void) | ((sender: runtime.MessageSender, sendResponse: (response: any) => void) => void)> {}
+
+	/**
+	 * Since Chrome 7.
+	 * True for content scripts running inside incognito tabs, and for extension pages running inside an incognito process. The latter only applies to extensions with 'split' incognito_behavior.
+	 */
+    var inIncognitoContext: boolean;
+	/** Set for the lifetime of a callback if an ansychronous extension api has resulted in an error. If no error has occured lastError will be undefined. */
+    var lastError: LastError;
+
+	/** Returns the JavaScript 'window' object for the background page running inside the current extension. Returns null if the extension has no background page. */
+    export function getBackgroundPage(): Window;
+	/**
+	 * Converts a relative path within an extension install directory to a fully-qualified URL.
+	 * @param path A path to a resource within an extension expressed relative to its install directory.
+	 */
+    export function getURL(path: string): string;
+	/**
+	 * Sets the value of the ap CGI parameter used in the extension's update URL. This value is ignored for extensions that are hosted in the Chrome Extension Gallery.
+	 * Since Chrome 9.
+	 */
+    export function setUpdateUrlData(data: string): void;
+	/** Returns an array of the JavaScript 'window' objects for each of the pages running inside the current extension. */
+    export function getViews(fetchProperties?: FetchProperties): Window[];
+	/**
+	 * Retrieves the state of the extension's access to the 'file://' scheme (as determined by the user-controlled 'Allow access to File URLs' checkbox.
+	 * Since Chrome 12.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(boolean isAllowedAccess) {...};
+	 * Parameter isAllowedAccess: True if the extension can access the 'file://' scheme, false otherwise.
+	 */
+    export function isAllowedFileSchemeAccess(callback: (isAllowedAccess: boolean) => void): void;
+	/**
+	 * Retrieves the state of the extension's access to Incognito-mode (as determined by the user-controlled 'Allowed in Incognito' checkbox.
+	 * Since Chrome 12.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(boolean isAllowedAccess) {...};
+	 * Parameter isAllowedAccess: True if the extension has access to Incognito mode, false otherwise.
+	 */
+    export function isAllowedIncognitoAccess(callback: (isAllowedAccess: boolean) => void): void;
+	/**
+	 * Sends a single request to other listeners within the extension. Similar to runtime.connect, but only sends a single request with an optional response. The extension.onRequest event is fired in each page of the extension.
+	 * @deprecated Deprecated since Chrome 33. Please use runtime.sendMessage.
+	 * @param extensionId The extension ID of the extension you want to connect to. If omitted, default is your own extension.
+	 * @param responseCallback If you specify the responseCallback parameter, it should be a function that looks like this:
+	 * function(any response) {...};
+	 * Parameter response: The JSON response object sent by the handler of the request. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+	 */
+	export function sendRequest(extensionId: string, request: any, responseCallback?: (response: any) => void): void;
+	/**
+	 * Sends a single request to other listeners within the extension. Similar to runtime.connect, but only sends a single request with an optional response. The extension.onRequest event is fired in each page of the extension.
+	 * @deprecated Deprecated since Chrome 33. Please use runtime.sendMessage.
+	 * @param responseCallback If you specify the responseCallback parameter, it should be a function that looks like this:
+	 * function(any response) {...};
+	 * Parameter response: The JSON response object sent by the handler of the request. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+	 */
+	export function sendRequest(request: any, responseCallback?: (response: any) => void): void;
+	/**
+	 * Returns an array of the JavaScript 'window' objects for each of the tabs running inside the current extension. If windowId is specified, returns only the 'window' objects of tabs attached to the specified window.
+	 * @deprecated Deprecated since Chrome 33. Please use extension.getViews {type: "tab"}.
+	 */
+	export function getExtensionTabs(windowId?: number): Window[];
+
+	/**
+	 * Fired when a request is sent from either an extension process or a content script.
+	 * @deprecated Deprecated since Chrome 33. Please use runtime.onMessage.
+	 */
+	var onRequest: OnRequestEvent;
+	/**
+	 * Fired when a request is sent from another extension.
+	 * @deprecated Deprecated since Chrome 33. Please use runtime.onMessageExternal.
+	 */
+	var onRequestExternal: OnRequestEvent;
+}
+
+////////////////////
+// File Browser Handler
+////////////////////
+/**
+ * Use the chrome.fileBrowserHandler API to extend the Chrome OS file browser. For example, you can use this API to enable users to upload files to your website.
+ * Availability: Since Chrome 12.
+ * Permissions:  "fileBrowserHandler"
+ * Important: This API works only on Chrome OS.
+ */
+declare namespace chrome.fileBrowserHandler {
+    interface SelectionParams {
+		/**
+		 * Optional.
+ 		 * List of file extensions that the selected file can have. The list is also used to specify what files to be shown in the select file dialog. Files with the listed extensions are only shown in the dialog. Extensions should not include the leading '.'. Example: ['jpg', 'png']
+		 * Since Chrome 23.
+		 */
+        allowedFileExtensions?: string[];
+		/** Suggested name for the file. */
+        suggestedName: string;
+    }
+
+    interface SelectionResult {
+		/** Optional. Selected file entry. It will be null if a file hasn't been selected.  */
+        entry?: Object;
+		/** Whether the file has been selected. */
+        success: boolean;
+    }
+
+	/** Event details payload for fileBrowserHandler.onExecute event. */
+    interface FileHandlerExecuteEventDetails {
+		/** Optional. The ID of the tab that raised this event. Tab IDs are unique within a browser session.  */
+        tab_id?: number;
+		/** Array of Entry instances representing files that are targets of this action (selected in ChromeOS file browser). */
+        entries: any[];
+    }
+
+    interface FileBrowserHandlerExecuteEvent extends chrome.events.Event<(id: string, details: FileHandlerExecuteEventDetails) => void> {}
+
+	/**
+	 * Prompts user to select file path under which file should be saved. When the file is selected, file access permission required to use the file (read, write and create) are granted to the caller. The file will not actually get created during the function call, so function caller must ensure its existence before using it. The function has to be invoked with a user gesture.
+	 * Since Chrome 21.
+	 * @param selectionParams Parameters that will be used while selecting the file.
+	 * @param callback Function called upon completion.
+	 * The callback parameter should be a function that looks like this:
+	 * function(object result) {...};
+	 * Parameter result: Result of the method.
+	 */
+	export function selectFile(selectionParams: SelectionParams, callback: (result: SelectionResult) => void): void;
+
+	/** Fired when file system action is executed from ChromeOS file browser. */
+    var onExecute: FileBrowserHandlerExecuteEvent;
+}
+
+////////////////////
+// File System Provider
+////////////////////
+/**
+ * Use the chrome.fileSystemProvider API to create file systems, that can be accessible from the file manager on Chrome OS.
+ * Availability: Since Chrome 40.
+ * Permissions:  "fileSystemProvider"
+ * Important: This API works only on Chrome OS.
+ */
+declare namespace chrome.fileSystemProvider {
+	interface OpenedFileInfo {
+		/** A request ID to be be used by consecutive read/write and close requests. */
+		openRequestId: number;
+		/** The path of the opened file. */
+		filePath: string;
+		/** Whether the file was opened for reading or writing. */
+		mode: string;
+	}
+
+	interface FileWatchersInfo {
+		/** The path of the entry being observed. */
+		entryPath: string;
+		/** Whether watching should include all child entries recursively. It can be true for directories only. */
+		recursive: boolean;
+		/** Optional. Tag used by the last notification for the watcher.  */
+		lastTag?: string;
+	}
+
+	interface EntryMetadata {
+		/** True if it is a directory. */
+		isDirectory: boolean;
+		/** Name of this entry (not full path name). Must not contain '/'. For root it must be empty. */
+		name: string;
+		/** File size in bytes. */
+		size: number;
+		/** The last modified time of this entry. */
+		modificationTime: Date;
+		/** Optional. Mime type for the entry.  */
+		mimeType?: string;
+		/** Optional. Thumbnail image as a data URI in either PNG, JPEG or WEBP format, at most 32 KB in size. Optional, but can be provided only when explicitly requested by the onGetMetadataRequested event.  */
+		thumbnail?: string;
+	}
+
+	interface FileSystemInfo {
+		/** The identifier of the file system. */
+		fileSystemId: string;
+		/** A human-readable name for the file system. */
+		displayName: string;
+		/** Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files). */
+		writable: boolean;
+		/**
+		 * The maximum number of files that can be opened at once. If 0, then not limited.
+		 * @since Since Chrome 42.
+		 */
+		openedFilesLimit: number;
+		/**
+		 * List of currently opened files.
+		 * @since Since Chrome 42.
+		 */
+		openedFiles: OpenedFileInfo[];
+		/**
+		 * Optional.
+ 		 * Whether the file system supports the tag field for observing directories.
+		 * @since Since Chrome 45. Warning: this is the current Beta channel.
+		 */
+		supportsNotifyTag?: boolean;
+		/**
+		 * List of watchers.
+		 * @since Since Chrome 45. Warning: this is the current Beta channel.
+		 */
+		watchers: FileWatchersInfo[];
+	}
+
+	/** @since Since Chrome 45. Warning: this is the current Beta channel. */
+	interface GetActionsRequestedOptions {
+		/** The identifier of the file system related to this operation. */
+		fileSystemId: string;
+		/** The unique identifier of this request. */
+		requestId: number;
+		/** The path of the entry to return the list of actions for. */
+		entryPath: string;
+	}
+
+	/** @since Since Chrome 45. Warning: this is the current Beta channel. */
+	interface Action {
+		/** The identifier of the action. Any string or CommonActionId for common actions. */
+		id: string;
+		/** Optional. The title of the action. It may be ignored for common actions.  */
+		title?: string;
+	}
+
+	/** @since Since Chrome 45. Warning: this is the current Beta channel. */
+	interface ExecuteActionRequestedOptions {
+		/** The identifier of the file system related to this operation. */
+		fileSystemId: string;
+		/** The unique identifier of this request. */
+		requestId: number;
+		/** The path of the entry to be used for the action. */
+		entryPath: string;
+		/** The identifier of the action to be executed. */
+		actionId: string;
+	}
+
+	interface MountOptions {
+		/** The string indentifier of the file system. Must be unique per each extension. */
+		fileSystemId: string;
+		/** A human-readable name for the file system. */
+		displayName: string;
+		/** Optional. Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files).  */
+		writable?: boolean;
+		/**
+		 * Optional.
+ 		 * The maximum number of files that can be opened at once. If not specified, or 0, then not limited.
+		 * @since Since Chrome 41.
+		 */
+		openedFilesLimit?: number;
+		/**
+		 * Optional.
+ 		 * Whether the file system supports the tag field for observed directories.
+		 * @since Since Chrome 45. Warning: this is the current Beta channel.
+		 */
+		supportsNotifyTag?: boolean;
+	}
+
+	interface UnmountOptions {
+		/** The identifier of the file system to be unmounted. */
+		fileSystemId: string;
+	}
+
+	interface NotificationChange {
+		/** The path of the changed entry. */
+		entryPath: string;
+		/** The type of the change which happened to the entry. */
+		changeType: string;
+	}
+
+	interface NotificationOptions {
+		/** The identifier of the file system related to this change. */
+		fileSystemId: string;
+		/** The path of the observed entry. */
+		observedPath: string;
+		/** Mode of the observed entry. */
+		recursive: boolean;
+		/** The type of the change which happened to the observed entry. If it is DELETED, then the observed entry will be automatically removed from the list of observed entries. */
+		changeType: string;
+		/** Optional. List of changes to entries within the observed directory (including the entry itself)  */
+		changes?: NotificationChange[];
+		/** Optional. Tag for the notification. Required if the file system was mounted with the supportsNotifyTag option. Note, that this flag is necessary to provide notifications about changes which changed even when the system was shutdown.  */
+		tag?: string;
+	}
+
+	interface RequestedEventOptions {
+		/** The identifier of the file system related to this operation. */
+		fileSystemId: string;
+		/** The unique identifier of this request. */
+		requestId: number;
+	}
+
+	interface EntryPathRequestedEventOptions extends RequestedEventOptions {
+		/** The path of the entry to which this operation is related to. */
+		entryPath: string;
+	}
+
+	interface MetadataRequestedEventOptions extends EntryPathRequestedEventOptions {
+		/** Set to true if the thumbnail is requested. */
+		thumbnail: boolean;
+	}
+
+	interface DirectoryPathRequestedEventOptions extends RequestedEventOptions {
+		/** The path of the directory which is to be operated on. */
+		directoryPath: string;
+	}
+
+	interface FilePathRequestedEventOptions extends RequestedEventOptions {
+		/** The path of the entry for the operation */
+		filePath: string;
+	}
+
+	interface OpenFileRequestedEventOptions extends FilePathRequestedEventOptions {
+		/** Whether the file will be used for reading or writing. */
+		mode: string;
+	}
+
+	interface OpenedFileRequestedEventOptions extends RequestedEventOptions {
+		/** A request ID used to open the file. */
+		openRequestId: number;
+	}
+
+	interface OpenedFileOffsetRequestedEventOptions extends OpenedFileRequestedEventOptions {
+		/** Position in the file (in bytes) to start reading from. */
+		offset: number;
+		/** Number of bytes to be returned. */
+		length: number;
+	}
+
+	interface DirectoryPathRecursiveRequestedEventOptions extends DirectoryPathRequestedEventOptions {
+		/** Whether the operation is recursive (for directories only). */
+		recursive: boolean;
+	}
+
+	interface EntryPathRecursiveRequestedEventOptions extends EntryPathRequestedEventOptions {
+		/** Whether the operation is recursive (for directories only). */
+		recursive: boolean;
+	}
+
+	interface SourceTargetPathRequestedEventOptions extends RequestedEventOptions {
+		/** The source path for the operation. */
+		sourcePath: string;
+		/** The destination path for the operation. */
+		targetPath: string;
+	}
+
+	interface FilePathLengthRequestedEventOptions extends FilePathRequestedEventOptions {
+		/** Number of bytes to be retained after the operation completes. */
+		length: number;
+	}
+
+	interface OpenedFileIoRequestedEventOptions extends OpenedFileRequestedEventOptions {
+		/** Position in the file (in bytes) to start operating from. */
+		offset: number;
+		/** Buffer of bytes to be operated on the file. */
+		data: ArrayBuffer;
+	}
+
+	interface OperationRequestedEventOptions extends RequestedEventOptions {
+		/** An ID of the request to which this operation is related. */
+		operationRequestId: number;
+	}
+
+	interface RequestedEvent extends chrome.events.Event<(options: RequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+
+	interface MetadataRequestedEvent extends chrome.events.Event<(options: MetadataRequestedEventOptions, successCallback: (metadata: EntryMetadata) => void, errorCallback: (error: string) => void) => void> {}
+
+	interface DirectoryPathRequestedEvent extends chrome.events.Event<(options: DirectoryPathRequestedEventOptions, successCallback: (entries: EntryMetadata[], hasMore: boolean) => void, errorCallback: (error: string) => void) => void> {}
+
+	interface OpenFileRequestedEvent extends chrome.events.Event<(options: OpenFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+
+	interface OpenedFileRequestedEvent extends chrome.events.Event<(options: OpenedFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+
+	interface OpenedFileOffsetRequestedEvent extends chrome.events.Event<(options: OpenedFileOffsetRequestedEventOptions, successCallback: (data: ArrayBuffer, hasMore: boolean) => void, errorCallback: (error: string) => void) => void> {}
+
+	interface DirectoryPathRecursiveRequestedEvent extends chrome.events.Event<(options: DirectoryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+
+	interface EntryPathRecursiveRequestedEvent extends chrome.events.Event<(options: EntryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+
+	interface FilePathRequestedEvent extends chrome.events.Event<(options: FilePathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+
+	interface SourceTargetPathRequestedEvent extends chrome.events.Event<(options: SourceTargetPathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+
+	interface FilePathLengthRequestedEvent extends chrome.events.Event<(options: FilePathLengthRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+
+	interface OpenedFileIoRequestedEvent extends chrome.events.Event<(options: OpenedFileIoRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+
+	interface OperationRequestedEvent extends chrome.events.Event<(options: OperationRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+
+	interface OptionlessRequestedEvent extends chrome.events.Event<(successCallback: Function, errorCallback: (error: string) => void) => void> {}
+
+	/**
+	 * Mounts a file system with the given fileSystemId and displayName. displayName will be shown in the left panel of Files.app. displayName can contain any characters including '/', but cannot be an empty string. displayName must be descriptive but doesn't have to be unique. The fileSystemId must not be an empty string.
+	 * Depending on the type of the file system being mounted, the source option must be set appropriately.
+	 * In case of an error, runtime.lastError will be set with a corresponding error code.
+	 * @param callback A generic result callback to indicate success or failure.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function mount(options: MountOptions, callback?: () => void): void;
+	/**
+	 * Unmounts a file system with the given fileSystemId. It must be called after onUnmountRequested is invoked. Also, the providing extension can decide to perform unmounting if not requested (eg. in case of lost connection, or a file error).
+	 * In case of an error, runtime.lastError will be set with a corresponding error code.
+	 * @param callback A generic result callback to indicate success or failure.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function unmount(options: UnmountOptions, callback?: () => void): void;
+	/**
+	 * Returns all file systems mounted by the extension.
+	 * @param callback Callback to receive the result of getAll function.
+	 * The callback parameter should be a function that looks like this:
+	 * function(array of FileSystemInfo fileSystems) {...};
+	 */
+	export function getAll(callback: (fileSystems: FileSystemInfo[]) => void): void;
+	/**
+	 * Returns information about a file system with the passed fileSystemId.
+	 * @since Since Chrome 42.
+	 * @param callback Callback to receive the result of get function.
+	 * The callback parameter should be a function that looks like this:
+	 * function(FileSystemInfo fileSystem) {...};
+	 */
+	export function get(fileSystemId: string, callback: (fileSystem: FileSystemInfo) => void): void;
+	/**
+	 * Notifies about changes in the watched directory at observedPath in recursive mode. If the file system is mounted with supportsNofityTag, then tag must be provided, and all changes since the last notification always reported, even if the system was shutdown. The last tag can be obtained with getAll.
+	 * To use, the file_system_provider.notify manifest option must be set to true.
+	 * Value of tag can be any string which is unique per call, so it's possible to identify the last registered notification. Eg. if the providing extension starts after a reboot, and the last registered notification's tag is equal to "123", then it should call notify for all changes which happened since the change tagged as "123". It cannot be an empty string.
+	 * Not all providers are able to provide a tag, but if the file system has a changelog, then the tag can be eg. a change number, or a revision number.
+	 * Note that if a parent directory is removed, then all descendant entries are also removed, and if they are watched, then the API must be notified about the fact. Also, if a directory is renamed, then all descendant entries are in fact removed, as there is no entry under their original paths anymore.
+	 * In case of an error, runtime.lastError will be set will a corresponding error code.
+	 * @param callback A generic result callback to indicate success or failure.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function notify(options: NotificationOptions, callback: () => void): void;
+
+	/** Raised when unmounting for the file system with the fileSystemId identifier is requested. In the response, the unmount API method must be called together with successCallback. If unmounting is not possible (eg. due to a pending operation), then errorCallback must be called.  */
+	var onUnmountRequested: RequestedEvent;
+	/** Raised when metadata of a file or a directory at entryPath is requested. The metadata must be returned with the successCallback call. In case of an error, errorCallback must be called. */
+	var onGetMetadataRequested: MetadataRequestedEvent;
+	/** Raised when contents of a directory at directoryPath are requested. The results must be returned in chunks by calling the successCallback several times. In case of an error, errorCallback must be called. */
+	var onReadDirectoryRequested: DirectoryPathRequestedEvent;
+	/** Raised when opening a file at filePath is requested. If the file does not exist, then the operation must fail. Maximum number of files opened at once can be specified with MountOptions. */
+	var onOpenFileRequested: OpenFileRequestedEvent;
+	/** Raised when opening a file previously opened with openRequestId is requested to be closed. */
+	var onCloseFileRequested: OpenedFileRequestedEvent;
+	/** Raised when reading contents of a file opened previously with openRequestId is requested. The results must be returned in chunks by calling successCallback several times. In case of an error, errorCallback must be called. */
+	var onReadFileRequested: OpenedFileOffsetRequestedEvent;
+	/** Raised when creating a directory is requested. The operation must fail with the EXISTS error if the target directory already exists. If recursive is true, then all of the missing directories on the directory path must be created. */
+	var onCreateDirectoryRequested: DirectoryPathRecursiveRequestedEvent;
+	/** Raised when deleting an entry is requested. If recursive is true, and the entry is a directory, then all of the entries inside must be recursively deleted as well. */
+	var onDeleteEntryRequested: EntryPathRecursiveRequestedEvent;
+	/** Raised when creating a file is requested. If the file already exists, then errorCallback must be called with the "EXISTS" error code. */
+	var onCreateFileRequested: FilePathRequestedEvent;
+	/** Raised when copying an entry (recursively if a directory) is requested. If an error occurs, then errorCallback must be called. */
+	var onCopyEntryRequested: SourceTargetPathRequestedEvent;
+	/** Raised when moving an entry (recursively if a directory) is requested. If an error occurs, then errorCallback must be called. */
+	var onMoveEntryRequested: SourceTargetPathRequestedEvent;
+	/** Raised when truncating a file to a desired length is requested. If an error occurs, then errorCallback must be called. */
+	var onTruncateRequested: FilePathLengthRequestedEvent;
+	/** Raised when writing contents to a file opened previously with openRequestId is requested. */
+	var onWriteFileRequested: OpenedFileIoRequestedEvent;
+	/** Raised when aborting an operation with operationRequestId is requested. The operation executed with operationRequestId must be immediately stopped and successCallback of this abort request executed. If aborting fails, then errorCallback must be called. Note, that callbacks of the aborted operation must not be called, as they will be ignored. Despite calling errorCallback, the request may be forcibly aborted. */
+	var onAbortRequested: OperationRequestedEvent;
+	/**
+	 * Raised when showing a configuration dialog for fileSystemId is requested. If it's handled, the file_system_provider.configurable manfiest option must be set to true.
+	 * @since Since Chrome 44.
+	 */
+	var onConfigureRequested: RequestedEvent;
+	/**
+	 * Raised when showing a dialog for mounting a new file system is requested. If the extension/app is a file handler, then this event shouldn't be handled. Instead app.runtime.onLaunched should be handled in order to mount new file systems when a file is opened. For multiple mounts, the file_system_provider.multiple_mounts manifest option must be set to true.
+	 * @since Since Chrome 44.
+	 */
+	var onMountRequested: OptionlessRequestedEvent;
+	/**
+	 * Raised when setting a new directory watcher is requested. If an error occurs, then errorCallback must be called.
+	 * @since Since Chrome 45. Warning: this is the current Beta channel.
+	 */
+	var onAddWatcherRequested: EntryPathRecursiveRequestedEvent;
+	/**
+	 * Raised when the watcher should be removed. If an error occurs, then errorCallback must be called.
+	 * @since Since Chrome 45. Warning: this is the current Beta channel.
+	 */
+	var onRemoveWatcherRequested: EntryPathRecursiveRequestedEvent;
+}
+
+////////////////////
+// Font Settings
+////////////////////
+/**
+ * Use the chrome.fontSettings API to manage Chrome's font settings.
+ * Availability: Since Chrome 22.
+ * Permissions:  "fontSettings"
+ */
+declare namespace chrome.fontSettings {
+	/** Represents a font name. */
+    interface FontName {
+		/** The display name of the font. */
+        displayName: string;
+		/** The font ID. */
+        fontId: string;
+    }
+
+    interface DefaultFontSizeDetails {
+		/** The font size in pixels. */
+        pixelSize: number;
+    }
+
+    interface FontDetails {
+		/** The generic font family for the font. */
+        genericFamily: string;
+		/** Optional. The script for the font. If omitted, the global script font setting is affected.  */
+        script?: string;
+    }
+
+    interface FullFontDetails {
+		/** The generic font family for which the font setting has changed. */
+        genericFamily: string;
+		/** The level of control this extension has over the setting. */
+        levelOfControl: string;
+		/** Optional. The script code for which the font setting has changed.  */
+        script?: string;
+		/** The font ID. See the description in getFont. */
+        fontId: string;
+    }
+
+    interface FontDetailsResult {
+		/** The level of control this extension has over the setting. */
+        levelOfControl: string;
+		/** The font ID. Rather than the literal font ID preference value, this may be the ID of the font that the system resolves the preference value to. So, fontId can differ from the font passed to setFont, if, for example, the font is not available on the system. The empty string signifies fallback to the global script font setting. */
+        fontId: string;
+    }
+
+    interface FontSizeDetails {
+		/** The font size in pixels. */
+        pixelSize: number;
+		/** The level of control this extension has over the setting. */
+        levelOfControl: string;
+    }
+
+    interface SetFontSizeDetails {
+		/** The font size in pixels. */
+        pixelSize: number;
+    }
+
+	interface SetFontDetails extends FontDetails {
+		/** The font ID. The empty string means to fallback to the global script font setting. */
+        fontId: string;
+    }
+
+    interface DefaultFixedFontSizeChangedEvent extends chrome.events.Event<(details: FontSizeDetails) => void> {}
+
+    interface DefaultFontSizeChangedEvent extends chrome.events.Event<(details: FontSizeDetails) => void> {}
+
+    interface MinimumFontSizeChangedEvent extends chrome.events.Event<(details: FontSizeDetails) => void> {}
+
+    interface FontChangedEvent extends chrome.events.Event<(details: FullFontDetails) => void> {}
+
+	/**
+	 * Sets the default font size.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function setDefaultFontSize(details: DefaultFontSizeDetails, callback?: Function): void;
+	/**
+	 * Gets the font for a given script and generic font family.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object details) {...};
+	 */
+    export function getFont(details: FontDetails, callback?: (details: FontDetailsResult) => void): void;
+	/**
+	 * Gets the default font size.
+	 * @param details This parameter is currently unused.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object details) {...};
+	 */
+	export function getDefaultFontSize(details?: Object, callback?: (options: FontSizeDetails) => void): void;
+	/**
+	 * Gets the minimum font size.
+	 * @param details This parameter is currently unused.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object details) {...};
+	 */
+    export function getMinimumFontSize(details?: FontSizeDetails, callback?: (options: FontSizeDetails) => void): void;
+	/**
+	 * Sets the minimum font size.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function setMinimumFontSize(details: SetFontSizeDetails, callback?: Function): void;
+	/**
+	 * Gets the default size for fixed width fonts.
+	 * @param details This parameter is currently unused.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object details) {...};
+	 */
+    export function getDefaultFixedFontSize(details?: Object, callback?: (details: FontSizeDetails) => void): void;
+	/**
+	 * Clears the default font size set by this extension, if any.
+	 * @param details This parameter is currently unused.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function clearDefaultFontSize(details?: Object, callback?: Function): void;
+	/**
+	 * Sets the default size for fixed width fonts.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function setDefaultFixedFontSize(details: SetFontSizeDetails, callback?: Function): void;
+	/**
+	 * Clears the font set by this extension, if any.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function clearFont(details: FontDetails, callback?: Function): void;
+	/**
+	 * Sets the font for a given script and generic font family.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object details) {...};
+	 */
+    export function setFont(details: SetFontDetails, callback?: Function): void;
+	/**
+	 * Clears the minimum font size set by this extension, if any.
+	 * @param details This parameter is currently unused.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function clearMinimumFontSize(details?: Object, callback?: Function): void;
+	/**
+	 * Gets a list of fonts on the system.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of FontName results) {...};
+	 */
+    export function getFontList(callback: (results: FontName[]) => void): void;
+	/**
+	 * Clears the default fixed font size set by this extension, if any.
+	 * @param details This parameter is currently unused.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+    export function clearDefaultFixedFontSize(details: Object, callback?: Function): void;
+
+	/** Fired when the default fixed font size setting changes. */
+    var onDefaultFixedFontSizeChanged: DefaultFixedFontSizeChangedEvent;
+	/** Fired when the default font size setting changes. */
+    var onDefaultFontSizeChanged: DefaultFontSizeChangedEvent;
+	/** Fired when the minimum font size setting changes. */
+    var onMinimumFontSizeChanged: MinimumFontSizeChangedEvent;
+	/** Fired when a font setting changes. */
+    var onFontChanged: FontChangedEvent;
+}
+
+////////////////////
+// Google Cloud Messaging
+////////////////////
+/**
+ * Use chrome.gcm to enable apps and extensions to send and receive messages through the Google Cloud Messaging Service.
+ * Availability: Since Chrome 35.
+ * Permissions:  "gcm"
+ */
+declare namespace chrome.gcm {
+	interface OutgoingMessage {
+		/** The ID of the server to send the message to as assigned by Google API Console. */
+		destinationId: string;
+		/** The ID of the message. It must be unique for each message in scope of the applications. See the Cloud Messaging documentation for advice for picking and handling an ID. */
+		messageId: string;
+		/** Optional. Time-to-live of the message in seconds. If it is not possible to send the message within that time, an onSendError event will be raised. A time-to-live of 0 indicates that the message should be sent immediately or fail if it's not possible. The maximum and a default value of time-to-live is 86400 seconds (1 day). */
+		timeToLive?: number;
+		/** Message data to send to the server. Case-insensitive goog. and google, as well as case-sensitive collapse_key are disallowed as key prefixes. Sum of all key/value pairs should not exceed gcm.MAX_MESSAGE_SIZE. */
+		data: Object;
+	}
+
+	interface IncomingMessage {
+		/** The message data. */
+		data: Object;
+		/**
+		 * Optional.
+		 * The sender who issued the message.
+		 * @since Since Chrome 41.
+		 */
+		from?: string;
+		/**
+		 * Optional.
+		 * The collapse key of a message. See Collapsible Messages section of Cloud Messaging documentation for details.
+		 */
+		collapseKey?: string;
+	}
+
+	interface GcmError {
+		/** The error message describing the problem. */
+		errorMessage: string;
+		/** Optional. The ID of the message with this error, if error is related to a specific message. */
+		messageId?: string;
+		/** Additional details related to the error, when available. */
+		detail: Object;
+	}
+
+	interface MessageReceptionEvent extends chrome.events.Event<(message: IncomingMessage) => void> {}
+
+	interface MessageDeletionEvent extends chrome.events.Event<() => void> {}
+
+	interface GcmErrorEvent extends chrome.events.Event<(error: GcmError) => void> {}
+
+	/** The maximum size (in bytes) of all key/value pairs in a message. */
+	var MAX_MESSAGE_SIZE: number;
+
+	/**
+	 * Registers the application with GCM. The registration ID will be returned by the callback. If register is called again with the same list of senderIds, the same registration ID will be returned.
+	 * @param senderIds A list of server IDs that are allowed to send messages to the application. It should contain at least one and no more than 100 sender IDs.
+	 * @param callback Function called when registration completes. It should check runtime.lastError for error when registrationId is empty.
+	 * The callback parameter should be a function that looks like this:
+	 * function(string registrationId) {...};
+	 * Parameter registrationId: A registration ID assigned to the application by the GCM.
+	 */
+	export function register(senderIds: string[], callback: (registrationId: string) => void): void;
+	/**
+	 * Unregisters the application from GCM.
+	 * @param callback A function called after the unregistration completes. Unregistration was successful if runtime.lastError is not set.
+	 * The callback parameter should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function unregister(callback: () => void): void;
+	/**
+	 * Sends a message according to its contents.
+	 * @param message A message to send to the other party via GCM.
+	 * @param callback A function called after the message is successfully queued for sending. runtime.lastError should be checked, to ensure a message was sent without problems.
+	 * The callback parameter should be a function that looks like this:
+	 * function(string messageId) {...};
+	 * Parameter messageId: The ID of the message that the callback was issued for.
+	 */
+	export function send(message: OutgoingMessage, callback: (messageId: string) => void): void;
+
+	/** Fired when a message is received through GCM. */
+	var onMessage: MessageReceptionEvent;
+	/** Fired when a GCM server had to delete messages sent by an app server to the application. See Messages deleted event section of Cloud Messaging documentation for details on handling this event. */
+	var onMessagesDeleted: MessageDeletionEvent;
+	/** Fired when it was not possible to send a message to the GCM server. */
+	var onSendError: GcmErrorEvent;
+}
+
+////////////////////
+// History
+////////////////////
+/**
+ * Use the chrome.history API to interact with the browser's record of visited pages. You can add, remove, and query for URLs in the browser's history. To override the history page with your own version, see Override Pages.
+ * Availability: Since Chrome 5.
+ * Permissions:  "history"
+ */
+declare namespace chrome.history {
+	/** An object encapsulating one visit to a URL. */
+    interface VisitItem {
+		/** The transition type for this visit from its referrer. */
+        transition: string;
+		/** Optional. When this visit occurred, represented in milliseconds since the epoch. */
+        visitTime?: number;
+		/** The unique identifier for this visit. */
+        visitId: string;
+		/** The visit ID of the referrer. */
+        referringVisitId: string;
+		/** The unique identifier for the item. */
+        id: string;
+    }
+
+	/** An object encapsulating one result of a history query. */
+    interface HistoryItem {
+		/** Optional. The number of times the user has navigated to this page by typing in the address. */
+        typedCount?: number;
+		/** Optional. The title of the page when it was last loaded. */
+        title?: string;
+		/** Optional. The URL navigated to by a user. */
+        url?: string;
+		/** Optional. When this page was last loaded, represented in milliseconds since the epoch. */
+        lastVisitTime?: number;
+		/** Optional. The number of times the user has navigated to this page. */
+        visitCount?: number;
+		/** The unique identifier for the item. */
+        id: string;
+    }
+
+    interface HistoryQuery {
+		/** A free-text query to the history service. Leave empty to retrieve all pages. */
+        text: string;
+		/** Optional. The maximum number of results to retrieve. Defaults to 100. */
+        maxResults?: number;
+		/** Optional. Limit results to those visited after this date, represented in milliseconds since the epoch. */
+        startTime?: number;
+		/** Optional. Limit results to those visited before this date, represented in milliseconds since the epoch. */
+        endTime?: number;
+    }
+
+    interface Url {
+		/** The URL for the operation. It must be in the format as returned from a call to history.search. */
+        url: string;
+    }
+
+    interface Range {
+		/** Items added to history before this date, represented in milliseconds since the epoch. */
+        endTime: number;
+		/** Items added to history after this date, represented in milliseconds since the epoch. */
+        startTime: number;
+    }
+
+    interface RemovedResult {
+		/** True if all history was removed. If true, then urls will be empty. */
+        allHistory: boolean;
+		/** Optional. */
+        urls?: string[];
+    }
+
+    interface HistoryVisitedEvent extends chrome.events.Event<(result: HistoryItem) => void> {}
+
+    interface HistoryVisitRemovedEvent extends chrome.events.Event<(removed: RemovedResult) => void> {}
+
+	/**
+	 * Searches the history for the last visit time of each page matching the query.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of HistoryItem results) {...};
+	 */
+    export function search(query: HistoryQuery, callback: (results: HistoryItem[]) => void): void;
+	/**
+	 * Adds a URL to the history at the current time with a transition type of "link".
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function addUrl(details: Url, callback?: () => void): void;
+	/**
+	 * Removes all items within the specified date range from the history. Pages will not be removed from the history unless all visits fall within the range.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function deleteRange(range: Range, callback: () => void): void;
+	/**
+	 * Deletes all items from the history.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function deleteAll(callback: () => void): void;
+	/**
+	 * Retrieves information about visits to a URL.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of VisitItem results) {...};
+	 */
+    export function getVisits(details: Url, callback: (results: VisitItem[]) => void): void;
+	/**
+	 * Removes all occurrences of the given URL from the history.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function deleteUrl(details: Url, callback?: () => void): void;
+
+	/** Fired when a URL is visited, providing the HistoryItem data for that URL. This event fires before the page has loaded. */
+    var onVisited: HistoryVisitedEvent;
+	/** Fired when one or more URLs are removed from the history service. When all visits have been removed the URL is purged from history. */
+    var onVisitRemoved: HistoryVisitRemovedEvent;
+}
+
+////////////////////
+// i18n
+////////////////////
+/**
+ * Use the chrome.i18n infrastructure to implement internationalization across your whole app or extension.
+ * @since Chrome 5.
+ */
+declare namespace chrome.i18n {
+	/**
+	 * Gets the accept-languages of the browser. This is different from the locale used by the browser; to get the locale, use i18n.getUILanguage.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of string languages) {...};
+	 * Parameter languages: Array of the accept languages of the browser, such as en-US,en,zh-CN
+	 */
+	export function getAcceptLanguages(callback: (languages: string[]) => void): void;
+	/**
+	 * Gets the localized string for the specified message. If the message is missing, this method returns an empty string (''). If the format of the getMessage() call is wrong — for example, messageName is not a string or the substitutions array has more than 9 elements — this method returns undefined.
+	 * @param messageName The name of the message, as specified in the messages.json file.
+	 * @param substitutions Optional. Up to 9 substitution strings, if the message requires any.
+	 */
+	export function getMessage(messageName: string, substitutions?: any): string;
+	/**
+	 * Gets the browser UI language of the browser. This is different from i18n.getAcceptLanguages which returns the preferred user languages.
+	 * @since Chrome 35.
+	 */
+	export function getUILanguage(): string;
+}
+
+////////////////////
+// Identity
+////////////////////
+/**
+ * Use the chrome.identity API to get OAuth2 access tokens.
+ * Permissions:  "identity"
+ * @since Chrome 29.
+ */
+declare namespace chrome.identity {
+	/** @since Chrome 32. */
+	interface AccountInfo {
+		/** A unique identifier for the account. This ID will not change for the lifetime of the account. */
+		id: string;
+	}
+
+	interface TokenDetails {
+		/**
+		 * Optional.
+		 * Fetching a token may require the user to sign-in to Chrome, or approve the application's requested scopes. If the interactive flag is true, getAuthToken will prompt the user as necessary. When the flag is false or omitted, getAuthToken will return failure any time a prompt would be required.
+		 */
+		interactive?: boolean;
+		/**
+		 * Optional.
+		 * The account ID whose token should be returned. If not specified, the primary account for the profile will be used.
+		 * account is only supported when the "enable-new-profile-management" flag is set.
+		 * @since Chrome 37.
+		 */
+		account?: AccountInfo;
+		/**
+		 * Optional.
+		 * A list of OAuth2 scopes to request.
+		 * When the scopes field is present, it overrides the list of scopes specified in manifest.json.
+		 * @since Chrome 37.
+		 */
+		scopes?: string[];
+	}
+
+	interface UserInfo {
+		/** An email address for the user account signed into the current profile. Empty if the user is not signed in or the identity.email manifest permission is not specified. */
+		email: string;
+		/** A unique identifier for the account. This ID will not change for the lifetime of the account. Empty if the user is not signed in or (in M41+) the identity.email manifest permission is not specified. */
+		id: string;
+	}
+
+	interface TokenInformation {
+		/** The specific token that should be removed from the cache. */
+		token: string;
+	}
+
+	interface WebAuthFlowOptions {
+		/** The URL that initiates the auth flow. */
+		url: string;
+		/**
+		 * Optional.
+		 * Whether to launch auth flow in interactive mode.
+		 * Since some auth flows may immediately redirect to a result URL, launchWebAuthFlow hides its web view until the first navigation either redirects to the final URL, or finishes loading a page meant to be displayed.
+		 * If the interactive flag is true, the window will be displayed when a page load completes. If the flag is false or omitted, launchWebAuthFlow will return with an error if the initial navigation does not complete the flow.
+		 */
+		interactive?: boolean;
+	}
+
+	interface SignInChangeEvent extends chrome.events.Event<(account: AccountInfo, signedIn: boolean) => void> {}
+
+	/**
+	 * Retrieves a list of AccountInfo objects describing the accounts present on the profile.
+	 * getAccounts is only supported on dev channel.
+	 * Dev channel only.
+	 */
+	export function getAccounts(callback: (accounts: AccountInfo[]) => void): void;
+	/**
+	 * Gets an OAuth2 access token using the client ID and scopes specified in the oauth2 section of manifest.json.
+	 * The Identity API caches access tokens in memory, so it's ok to call getAuthToken non-interactively any time a token is required. The token cache automatically handles expiration.
+	 * For a good user experience it is important interactive token requests are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests, or Chrome sign in screens if they are not signed in, with with no context. In particular, do not use getAuthToken interactively when your app is first launched.
+	 * @param details Token options.
+	 * @param callback Called with an OAuth2 access token as specified by the manifest, or undefined if there was an error.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function(string token) {...};
+	 */
+	export function getAuthToken(details: TokenDetails, callback?: (token: string) => void): void;
+	/**
+	 * Retrieves email address and obfuscated gaia id of the user signed into a profile.
+	 * This API is different from identity.getAccounts in two ways. The information returned is available offline, and it only applies to the primary account for the profile.
+	 * @since Chrome 37.
+	 */
+	export function getProfileUserInfo(callback: (userInfo: UserInfo) => void): void;
+	/**
+	 * Removes an OAuth2 access token from the Identity API's token cache.
+	 * If an access token is discovered to be invalid, it should be passed to removeCachedAuthToken to remove it from the cache. The app may then retrieve a fresh token with getAuthToken.
+	 * @param details Token information.
+	 * @param callback Called when the token has been removed from the cache.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function removeCachedAuthToken(details: TokenInformation, callback?: () => void): void;
+	/**
+	 * Starts an auth flow at the specified URL.
+	 * This method enables auth flows with non-Google identity providers by launching a web view and navigating it to the first URL in the provider's auth flow. When the provider redirects to a URL matching the pattern https://<app-id>.chromiumapp.org/*, the window will close, and the final redirect URL will be passed to the callback function.
+	 * For a good user experience it is important interactive auth flows are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests with no context. In particular, do not launch an interactive auth flow when your app is first launched.
+	 * @param details WebAuth flow options.
+	 * @param callback Called with the URL redirected back to your application.
+	 * The callback parameter should be a function that looks like this:
+	 * function(string responseUrl) {...};
+	 */
+	export function launchWebAuthFlow(details: WebAuthFlowOptions, callback: (responseUrl?: string) => void): void;
+	/**
+	 * Generates a redirect URL to be used in launchWebAuthFlow.
+	 * The generated URLs match the pattern https://<app-id>.chromiumapp.org/*.
+	 * @since Chrome 33.
+	 * @param path Optional. The path appended to the end of the generated URL.
+	 */
+	export function getRedirectURL(path?: string): string;
+
+	/**
+	 * Fired when signin state changes for an account on the user's profile.
+	 * @since Chrome 33.
+	 */
+	var onSignInChanged: SignInChangeEvent;
+}
+
+////////////////////
+// Idle
+////////////////////
+/**
+ * Use the chrome.idle API to detect when the machine's idle state changes.
+ * Permissions:  "idle"
+ * @since Chrome 6.
+ */
+declare namespace chrome.idle {
+    interface IdleStateChangedEvent extends chrome.events.Event<(newState: string) => void> {}
+
+	/**
+	 * Returns "locked" if the system is locked, "idle" if the user has not generated any input for a specified number of seconds, or "active" otherwise.
+	 * @param detectionIntervalInSeconds The system is considered idle if detectionIntervalInSeconds seconds have elapsed since the last user input detected.
+	 * Since Chrome 25.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function( IdleState newState) {...};
+	 */
+	export function queryState(detectionIntervalInSeconds: number, callback: (newState: string) => void): void;
+	/**
+	 * Sets the interval, in seconds, used to determine when the system is in an idle state for onStateChanged events. The default interval is 60 seconds.
+	 * @since Chrome 25.
+	 * @param intervalInSeconds Threshold, in seconds, used to determine when the system is in an idle state.
+	 */
+	export function setDetectionInterval(intervalInSeconds: number): void;
+
+	/** Fired when the system changes to an active, idle or locked state. The event fires with "locked" if the screen is locked or the screensaver activates, "idle" if the system is unlocked and the user has not generated any input for a specified number of seconds, and "active" when the user generates input on an idle system. */
+    var onStateChanged: IdleStateChangedEvent;
+}
+
+////////////////////
+// Input - IME
+////////////////////
+/**
+ * Use the chrome.input.ime API to implement a custom IME for Chrome OS. This allows your extension to handle keystrokes, set the composition, and manage the candidate window.
+ * Permissions:  "input"
+ * @since Chrome 21.
+ */
+declare namespace chrome.input.ime {
+	/** See http://www.w3.org/TR/DOM-Level-3-Events/#events-KeyboardEvent */
+    interface KeyboardEvent {
+		/**
+		 * Optional.
+		 * Whether or not the SHIFT key is pressed.
+		 */
+        shiftKey?: boolean;
+		/**
+		 * Optional.
+		 * Whether or not the ALT key is pressed.
+		 */
+        altKey?: boolean;
+		/** The ID of the request. */
+        requestId: string;
+		/** Value of the key being pressed */
+        key: string;
+		/**
+		 * Optional.
+		 * Whether or not the CTRL key is pressed.
+		 */
+        ctrlKey?: boolean;
+		/** One of keyup or keydown. */
+        type: string;
+		/**
+		 * Optional.
+		 * The extension ID of the sender of this keyevent.
+		 * @since Chrome 34.
+		 */
+		extensionId?: string;
+		/**
+		 * Optional.
+		 * Value of the physical key being pressed. The value is not affected by current keyboard layout or modifier state.
+		 * @since Chrome 26.
+		 */
+		code: string;
+		/**
+		 * Optional.
+		 * The deprecated HTML keyCode, which is system- and implementation-dependent numerical code signifying the unmodified identifier associated with the key pressed.
+		 * @since Chrome 37.
+		 */
+		keyCode?: number;
+		/**
+		 * Optional.
+		 * Whether or not the CAPS_LOCK is enabled.
+		 * @since Chrome 29.
+		 */
+		capsLock?: boolean;
+    }
+
+	/** Describes an input Context */
+    interface InputContext {
+		/** This is used to specify targets of text field operations. This ID becomes invalid as soon as onBlur is called. */
+        contextID: number;
+		/** Type of value this text field edits, (Text, Number, URL, etc) */
+        type: string;
+		/**
+		 * Whether the text field wants auto-correct.
+		 * @since Chrome 40.
+		 */
+		autoCorrect: boolean;
+		/**
+		 * Whether the text field wants auto-complete.
+		 * @since Chrome 40.
+		 */
+		autoComplete: boolean;
+		/**
+		 * Whether the text field wants spell-check.
+		 * @since Chrome 40.
+		 */
+		spellCheck: boolean;
+	}
+
+	/**
+	 * A menu item used by an input method to interact with the user from the language menu.
+	 * @since Chrome 30.
+	 */
+	interface MenuItem {
+		/** String that will be passed to callbacks referencing this MenuItem. */
+		id: string;
+		/** Optional. Text displayed in the menu for this item. */
+		label?: string;
+		/** Optional. The type of menu item. */
+		style?: string;
+		/** Optional. Indicates this item is visible. */
+		visible?: boolean;
+		/** Indicates this item should be drawn with a check. */
+		checked?: boolean;
+		/** Indicates this item is enabled. */
+		enabled?: boolean;
+    }
+
+    interface ImeParameters {
+		/** MenuItems to use. */
+		items: MenuItem[];
+		/** ID of the engine to use */
+        engineID: string;
+    }
+
+    interface CommitTextParameters {
+		/** The text to commit */
+        text: string;
+		/** ID of the context where the text will be committed */
+        contextID: number;
+    }
+
+	interface CandidateUsage {
+		/** The title string of details description. */
+		title: string;
+		/** The body string of detail description. */
+		body: string;
+	}
+
+	interface CandidateTemplate {
+		/** The candidate */
+		candidate: string;
+		/** The candidate's id */
+		id: number;
+		/**
+		 * Optional.
+		 * The id to add these candidates under
+		 */
+		parentId?: number;
+		/**
+		 * Optional.
+		 * Short string displayed to next to the candidate, often the shortcut key or index
+		 */
+		label?: string;
+		/**
+		 * Optional.
+		 * Additional text describing the candidate
+		 */
+		annotation?: string;
+		/**
+		 * Optional.
+		 * The usage or detail description of word.
+		 */
+		usage?: CandidateUsage;
+	}
+
+    interface CandidatesParameters {
+		/** ID of the context that owns the candidate window. */
+        contextID: number;
+		/** List of candidates to show in the candidate window */
+		candidates: CandidateTemplate[];
+	}
+
+	interface CompositionParameterSegment {
+		/** Index of the character to start this segment at */
+		start: number;
+		/** Index of the character to end this segment after. */
+		end: number;
+		/** The type of the underline to modify this segment. */
+		style: string;
+    }
+
+    interface CompositionParameters {
+		/** ID of the context where the composition text will be set */
+        contextID: number;
+		/** Text to set */
+        text: string;
+		/** Optional. List of segments and their associated types. */
+		segments: CompositionParameterSegment[];
+		/** Position in the text of the cursor. */
+        cursor: number;
+		/** Optional. Position in the text that the selection starts at. */
+        selectionStart?: number;
+		/** Optional. Position in the text that the selection ends at. */
+        selectionEnd?: number;
+    }
+
+    interface MenuItemParameters {
+        items: Object[];
+        engineId: string;
+    }
+
+	interface CandidateWindowParameterProperties {
+		/**
+		 * Optional.
+		 * True to show the cursor, false to hide it.
+		 */
+        cursorVisible?: boolean;
+		/**
+		 * Optional.
+		 * True if the candidate window should be rendered vertical, false to make it horizontal.
+		 */
+        vertical?: boolean;
+		/**
+		 * Optional.
+		 * The number of candidates to display per page.
+		 */
+        pageSize?: number;
+		/**
+		 * Optional.
+		 * True to display the auxiliary text, false to hide it.
+		 */
+        auxiliaryTextVisible?: boolean;
+		/**
+		 * Optional.
+		 * Text that is shown at the bottom of the candidate window.
+		 */
+        auxiliaryText?: string;
+		/**
+		 * Optional.
+		 * True to show the Candidate window, false to hide it.
+		 */
+        visible?: boolean;
+		/**
+		 * Optional.
+		 * Where to display the candidate window.
+		 * @since Chrome 28.
+		 */
+		windowPosition?: string;
+	}
+
+	interface CandidateWindowParameter {
+		/** ID of the engine to set properties on. */
+		engineID: string;
+		properties: CandidateWindowParameterProperties;
+    }
+
+    interface ClearCompositionParameters {
+		/** ID of the context where the composition will be cleared */
+        contextID: number;
+    }
+
+    interface CursorPositionParameters {
+		/** ID of the candidate to select. */
+        candidateID: number;
+		/** ID of the context that owns the candidate window. */
+		contextID: number;
+	}
+
+	interface SendKeyEventParameters {
+		/** ID of the context where the key events will be sent, or zero to send key events to non-input field. */
+		contextID: number;
+		/** Data on the key event. */
+		keyData: KeyboardEvent[];
+	}
+
+	interface DeleteSurroundingTextParameters {
+		/** ID of the engine receiving the event. */
+		engineID: string;
+		/** ID of the context where the surrounding text will be deleted. */
+        contextID: number;
+		/** The offset from the caret position where deletion will start. This value can be negative. */
+		offset: number;
+		/** The number of characters to be deleted */
+		length: number;
+	}
+
+	interface SurroundingTextInfo {
+		/** The text around cursor. */
+		text: string;
+		/** The ending position of the selection. This value indicates caret position if there is no selection. */
+		focus: number;
+		/** The beginning position of the selection. This value indicates caret position if is no selection. */
+		anchor: number;
+    }
+
+    interface BlurEvent extends chrome.events.Event<(contextID: number) => void> {}
+
+    interface CandidateClickedEvent extends chrome.events.Event<(engineID: string, candidateID: number, button: string) => void> {}
+
+    interface KeyEventEvent extends chrome.events.Event<(engineID: string, keyData: KeyboardEvent) => void> {}
+
+    interface DeactivatedEvent extends chrome.events.Event<(engineID: string) => void> {}
+
+    interface InputContextUpdateEvent extends chrome.events.Event<(context: InputContext) => void> {}
+
+    interface ActivateEvent extends chrome.events.Event<(engineID: string, screen: string) => void> {}
+
+    interface FocusEvent extends chrome.events.Event<(context: InputContext) => void> {}
+
+    interface MenuItemActivatedEvent extends chrome.events.Event<(engineID: string, name: string) => void> {}
+
+	interface SurroundingTextChangedEvent extends chrome.events.Event<(engineID: string, surroundingInfo: SurroundingTextInfo) => void> {}
+
+	interface InputResetEvent extends chrome.events.Event<(engineID: string) => void> {}
+
+	/**
+	 * Adds the provided menu items to the language menu when this IME is active.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function setMenuItems(parameters: ImeParameters, callback?: () => void): void;
+	/**
+	 * Commits the provided text to the current input.
+	 * @param callback Called when the operation completes with a boolean indicating if the text was accepted or not. On failure, chrome.runtime.lastError is set.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function(boolean success) {...};
+	 */
+    export function commitText(parameters: CommitTextParameters, callback?: (success: boolean) => void): void;
+	/**
+	 * Sets the current candidate list. This fails if this extension doesn't own the active IME
+	 * @param callback Called when the operation completes.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function(boolean success) {...};
+	 */
+    export function setCandidates(parameters: CandidatesParameters, callback?: (success: boolean) => void): void;
+	/**
+	 * Set the current composition. If this extension does not own the active IME, this fails.
+	 * @param callback Called when the operation completes with a boolean indicating if the text was accepted or not. On failure, chrome.runtime.lastError is set.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function(boolean success) {...};
+	 */
+    export function setComposition(parameters: CompositionParameters, callback?: (success: boolean) => void): void;
+	/**
+	 * Updates the state of the MenuItems specified
+	 * @param callback Called when the operation completes
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function updateMenuItems(parameters: MenuItemParameters, callback?: () => void): void;
+	/**
+	 * Sets the properties of the candidate window. This fails if the extension doesn't own the active IME
+	 * @param callback Called when the operation completes.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function(boolean success) {...};
+	 */
+	export function setCandidateWindowProperties(parameters: CandidateWindowParameter, callback?: (success: boolean) => void): void;
+	/**
+	 * Clear the current composition. If this extension does not own the active IME, this fails.
+	 * @param callback Called when the operation completes with a boolean indicating if the text was accepted or not. On failure, chrome.runtime.lastError is set.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function(boolean success) {...};
+	 */
+    export function clearComposition(parameters: ClearCompositionParameters, callback?: (success: boolean) => void): void;
+	/**
+	 * Set the position of the cursor in the candidate window. This is a no-op if this extension does not own the active IME.
+	 * @param callback Called when the operation completes
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function(boolean success) {...};
+	 */
+    export function setCursorPosition(parameters: CursorPositionParameters, callback?: (success: boolean) => void): void;
+	/**
+	 * Sends the key events. This function is expected to be used by virtual keyboards. When key(s) on a virtual keyboard is pressed by a user, this function is used to propagate that event to the system.
+	 * @since Chrome 33.
+	 * @param callback Called when the operation completes.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function sendKeyEvents(parameters: SendKeyEventParameters, callback?: () => void): void;
+	/**
+	 * Hides the input view window, which is popped up automatically by system. If the input view window is already hidden, this function will do nothing.
+	 * @since Chrome 34.
+	 */
+	export function hideInputView(): void;
+	/**
+	 * Deletes the text around the caret.
+	 * @since Chrome 27.
+	 */
+	export function deleteSurroundingText(parameters: DeleteSurroundingTextParameters, callback?: () => void): void;
+	/**
+	 * Indicates that the key event received by onKeyEvent is handled. This should only be called if the onKeyEvent listener is asynchronous.
+	 * @since Chrome 25.
+	 * @param requestId Request id of the event that was handled. This should come from keyEvent.requestId
+	 * @param response True if the keystroke was handled, false if not
+	 */
+	export function keyEventHandled(requestId: string, response: boolean): void;
+
+	/** This event is sent when focus leaves a text box. It is sent to all extensions that are listening to this event, and enabled by the user. */
+    var onBlur: BlurEvent;
+	/** This event is sent if this extension owns the active IME. */
+    var onCandidateClicked: CandidateClickedEvent;
+	/** This event is sent if this extension owns the active IME. */
+    var onKeyEvent: KeyEventEvent;
+	/** This event is sent when an IME is deactivated. It signals that the IME will no longer be receiving onKeyPress events. */
+    var onDeactivated: DeactivatedEvent;
+	/** This event is sent when the properties of the current InputContext change, such as the the type. It is sent to all extensions that are listening to this event, and enabled by the user. */
+    var onInputContextUpdate: InputContextUpdateEvent;
+	/** This event is sent when an IME is activated. It signals that the IME will be receiving onKeyPress events. */
+    var onActivate: ActivateEvent;
+	/** This event is sent when focus enters a text box. It is sent to all extensions that are listening to this event, and enabled by the user. */
+    var onFocus: FocusEvent;
+	/** Called when the user selects a menu item */
+    var onMenuItemActivated: MenuItemActivatedEvent;
+	/**
+	 * Called when the editable string around caret is changed or when the caret position is moved. The text length is limited to 100 characters for each back and forth direction.
+	 * @since Chrome 27.
+	 */
+	var onSurroundingTextChanged: SurroundingTextChangedEvent;
+	/**
+	 * This event is sent when chrome terminates ongoing text input session.
+	 * @since Chrome 29.
+	 */
+	var onReset: InputResetEvent;
+}
+
+////////////////////
+// Management
+////////////////////
+/**
+ * The chrome.management API provides ways to manage the list of extensions/apps that are installed and running. It is particularly useful for extensions that override the built-in New Tab page.
+ * Permissions:  "management"
+ * @since Chrome 8.
+ */
+declare namespace chrome.management {
+	/** Information about an installed extension, app, or theme. */
+    interface ExtensionInfo {
+		/**
+		 * Optional.
+		 * A reason the item is disabled.
+		 * @since Chrome 17.
+		 */
+        disabledReason?: string;
+		/** Optional. The launch url (only present for apps). */
+        appLaunchUrl?: string;
+		/**
+		 * The description of this extension, app, or theme.
+		 * @since Chrome 9.
+		 */
+        description: string;
+		/**
+		 * Returns a list of API based permissions.
+		 * @since Chrome 9.
+		 */
+        permissions: string[];
+		/**
+		 * Optional.
+		 * A list of icon information. Note that this just reflects what was declared in the manifest, and the actual image at that url may be larger or smaller than what was declared, so you might consider using explicit width and height attributes on img tags referencing these images. See the manifest documentation on icons for more details.
+		 */
+        icons?: IconInfo[];
+		/**
+		 * Returns a list of host based permissions.
+		 * @since Chrome 9.
+		 */
+        hostPermissions: string[];
+		/** Whether it is currently enabled or disabled. */
+        enabled: boolean;
+		/**
+		 * Optional.
+		 * The URL of the homepage of this extension, app, or theme.
+		 * @since Chrome 11.
+		 */
+        homepageUrl?: string;
+		/**
+		 * Whether this extension can be disabled or uninstalled by the user.
+		 * @since Chrome 12.
+		 */
+        mayDisable: boolean;
+		/**
+		 * How the extension was installed.
+		 * @since Chrome 22.
+		 */
+        installType: string;
+		/** The version of this extension, app, or theme. */
+        version: string;
+		/** The extension's unique identifier. */
+        id: string;
+		/**
+		 * Whether the extension, app, or theme declares that it supports offline.
+		 * @since Chrome 15.
+		 */
+        offlineEnabled: boolean;
+		/**
+		 * Optional.
+		 * The update URL of this extension, app, or theme.
+		 * @since Chrome 16.
+		 */
+        updateUrl?: string;
+		/**
+		 * The type of this extension, app, or theme.
+		 * @since Chrome 23.
+		 */
+        type: string;
+		/** The url for the item's options page, if it has one. */
+        optionsUrl: string;
+		/** The name of this extension, app, or theme. */
+        name: string;
+		/**
+		 * A short version of the name of this extension, app, or theme.
+		 * @since Chrome 31.
+		 */
+		shortName: string;
+		/**
+		 * True if this is an app.
+		 * @deprecated since Chrome 33. Please use management.ExtensionInfo.type.
+		 */
+		isApp: boolean;
+		/**
+		 * Optional.
+		 * The app launch type (only present for apps).
+		 * @since Chrome 37.
+		 */
+		launchType?: string;
+		/**
+		 * Optional.
+		 * The currently available launch types (only present for apps).
+		 * @since Chrome 37.
+		 */
+		availableLaunchTypes?: string[];
+    }
+
+	/** Information about an icon belonging to an extension, app, or theme. */
+    interface IconInfo {
+		/** The URL for this icon image. To display a grayscale version of the icon (to indicate that an extension is disabled, for example), append ?grayscale=true to the URL. */
+        url: string;
+		/** A number representing the width and height of the icon. Likely values include (but are not limited to) 128, 48, 24, and 16. */
+        size: number;
+    }
+
+    interface UninstallOptions {
+		/**
+		 * Optional.
+		 * Whether or not a confirm-uninstall dialog should prompt the user. Defaults to false for self uninstalls. If an extension uninstalls another extension, this parameter is ignored and the dialog is always shown.
+		 */
+        showConfirmDialog?: boolean;
+    }
+
+    interface ManagementDisabledEvent extends chrome.events.Event<(info: ExtensionInfo) => void> {}
+
+    interface ManagementUninstalledEvent extends chrome.events.Event<(id: string) => void> {}
+
+    interface ManagementInstalledEvent extends chrome.events.Event<(info: ExtensionInfo) => void> {}
+
+    interface ManagementEnabledEvent extends chrome.events.Event<(info: ExtensionInfo) => void> {}
+
+	/**
+	 * Enables or disables an app or extension.
+	 * @param id This should be the id from an item of management.ExtensionInfo.
+	 * @param enabled Whether this item should be enabled or disabled.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function setEnabled(id: string, enabled: boolean, callback?: () => void): void;
+	/**
+	 * Returns a list of permission warnings for the given extension id.
+	 * @since Chrome 15.
+	 * @param id The ID of an already installed extension.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(array of string permissionWarnings) {...};
+	 */
+    export function getPermissionWarningsById(id: string, callback?: (permissionWarnings: string[]) => void): void;
+	/**
+	 * Returns information about the installed extension, app, or theme that has the given ID.
+	 * @since Chrome 9.
+	 * @param id The ID from an item of management.ExtensionInfo.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function( ExtensionInfo result) {...};
+	 */
+    export function get(id: string, callback?: (result: ExtensionInfo) => void): void;
+	/**
+	 * Returns a list of information about installed extensions and apps.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(array of ExtensionInfo result) {...};
+	 */
+    export function getAll(callback?: (result: ExtensionInfo[]) => void): void;
+	/**
+	 * Returns a list of permission warnings for the given extension manifest string. Note: This function can be used without requesting the 'management' permission in the manifest.
+	 * @since Chrome 15.
+	 * @param manifestStr Extension manifest JSON string.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(array of string permissionWarnings) {...};
+	 */
+    export function getPermissionWarningsByManifest(manifestStr: string, callback?: (permissionwarnings: string[]) => void): void;
+	/**
+	 * Launches an application.
+	 * @param id The extension id of the application.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function launchApp(id: string, callback?: () => void): void;
+	/**
+	 * Uninstalls a currently installed app or extension.
+	 * @since Chrome 21.
+	 * @param id This should be the id from an item of management.ExtensionInfo.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function uninstall(id: string, options?: UninstallOptions, callback?: () => void): void;
+	/**
+	 * Uninstalls a currently installed app or extension.
+	 * @deprecated since Chrome 21. The options parameter was added to this function.
+	 * @param id This should be the id from an item of management.ExtensionInfo.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function uninstall(id: string, callback?: () => void): void;
+	/**
+	 * Returns information about the calling extension, app, or theme. Note: This function can be used without requesting the 'management' permission in the manifest.
+	 * @since Chrome 39.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function( ExtensionInfo result) {...};
+	 */
+	export function getSelf(callback?: (result: ExtensionInfo) => void): void;
+	/**
+	 * Uninstalls the calling extension.
+	 * Note: This function can be used without requesting the 'management' permission in the manifest.
+	 * @since Chrome 26.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function uninstallSelf(options?: UninstallOptions, callback?: () => void): void;
+	/**
+	 * Uninstalls the calling extension.
+	 * Note: This function can be used without requesting the 'management' permission in the manifest.
+	 * @since Chrome 26.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function uninstallSelf(callback?: () => void): void;
+	/**
+	 * Display options to create shortcuts for an app. On Mac, only packaged app shortcuts can be created.
+	 * @since Chrome 37.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function createAppShortcut(id: string, callback?: () => void): void;
+	/**
+	 * Set the launch type of an app.
+	 * @since Chrome 37.
+	 * @param id This should be the id from an app item of management.ExtensionInfo.
+	 * @param launchType The target launch type. Always check and make sure this launch type is in ExtensionInfo.availableLaunchTypes, because the available launch types vary on different platforms and configurations.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function setLaunchType(id: string, launchType: string, callback?: () => void): void;
+	/**
+	 * Generate an app for a URL. Returns the generated bookmark app.
+	 * @since Chrome 37.
+	 * @param url The URL of a web page. The scheme of the URL can only be "http" or "https".
+	 * @param title The title of the generated app.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function( ExtensionInfo result) {...};
+	 */
+	export function generateAppForLink(url: string, title: string, callback?: (result: ExtensionInfo) => void): void;
+
+	/** Fired when an app or extension has been disabled. */
+    var onDisabled: ManagementDisabledEvent;
+	/** Fired when an app or extension has been uninstalled. */
+    var onUninstalled: ManagementUninstalledEvent;
+	/** Fired when an app or extension has been installed. */
+    var onInstalled: ManagementInstalledEvent;
+	/** Fired when an app or extension has been enabled. */
+    var onEnabled: ManagementEnabledEvent;
+}
+
+////////////////////
+// Notifications
+////////////////////
+/**
+ * Use the networking.config API to authenticate to captive portals.
+ * Permissions:  "networking.config"
+ * Important: This API works only on Chrome OS.
+ * @since Chrome 43.
+ */
+declare namespace chrome.networking.config {
+	interface NetworkInfo {
+		/** Currently only WiFi supported. */
+		Type: string;
+		/** Optional. A unique identifier of the network. */
+		GUID?: string;
+		/** Optional. A hex-encoded byte sequence. */
+		HexSSID?: string;
+		/** Optional. The decoded SSID of the network (default encoding is UTF-8). To filter for non-UTF-8 SSIDs, use HexSSID instead. */
+		SSID?: string;
+		/** Optional. The basic service set identification (BSSID) uniquely identifying the basic service set. BSSID is represented as a human readable, hex-encoded string with bytes separated by colons, e.g. 45:67:89:ab:cd:ef. */
+		BSSID?: string;
+		/** Optional. Identifier indicating the security type of the network. Valid values are None, WEP-PSK, WPA-PSK and WPA-EAP. */
+		Security?: string;
+	}
+
+	interface CaptivePorttalDetectedEvent extends chrome.events.Event<(networkInfo: NetworkInfo) => void> {}
+
+	/**
+	 * Allows an extension to define network filters for the networks it can handle. A call to this function will remove all filters previously installed by the extension before setting the new list.
+	 * @param networks Network filters to set. Every NetworkInfo must either have the SSID or HexSSID set. Other fields will be ignored.
+	 * @param callback Called back when this operation is finished.
+	 * The callback parameter should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function setNetworkFilter(networks: NetworkInfo[], callback: () => void): void;
+	/**
+	 * Called by the extension to notify the network config API that it finished a captive portal authentication attempt and hand over the result of the attempt. This function must only be called with the GUID of the latest onCaptivePortalDetected event.
+	 * @param GUID Unique network identifier obtained from onCaptivePortalDetected.
+	 * @param result The result of the authentication attempt.
+	 * unhandled: The extension does not handle this network or captive portal (e.g. server end-point not found or not compatible).
+	 * succeeded: The extension handled this network and authenticated successfully.
+	 * rejected: The extension handled this network, tried to authenticate, however was rejected by the server.
+	 * failed: The extension handled this network, tried to authenticate, however failed due to an unspecified error.
+	 * @param callback Called back when this operation is finished.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function finishAuthentication(GUID: string, result: string, callback?: () => void): void;
+
+	/** This event fires everytime a captive portal is detected on a network matching any of the currently registered network filters and the user consents to use the extension for authentication. Network filters may be set using the setNetworkFilter. Upon receiving this event the extension should start its authentication attempt with the captive portal. When the extension finishes its attempt, it must call finishAuthentication with the GUID received with this event and the appropriate authentication result. */
+	var onCaptivePortalDetected: CaptivePorttalDetectedEvent;
+}
+
+////////////////////
+// Notifications
+// https://developer.chrome.com/extensions/notifications
+////////////////////
+/**
+ * Use the chrome.notifications API to create rich notifications using templates and show these notifications to users in the system tray.
+ * Permissions:  "notifications"
+ * @since Chrome 28.
+ */
+declare namespace chrome.notifications {
+    interface ButtonOptions {
+        title: string;
+        iconUrl?: string;
+    }
+
+    interface ItemOptions {
+		/** Title of one item of a list notification. */
+        title: string;
+		/** Additional details about this item. */
+        message: string;
+    }
+
+    interface NotificationOptions {
+		/** Optional. Which type of notification to display. Required for notifications.create method. */
+        type?: string;
+		/**
+		 * Optional.
+		 * A URL to the sender's avatar, app icon, or a thumbnail for image notifications.
+		 * URLs can be a data URL, a blob URL, or a URL relative to a resource within this extension's .crx file Required for notifications.create method.
+		 */
+        iconUrl?: string;
+		/** Optional. Title of the notification (e.g. sender name for email). Required for notifications.create method. */
+        title?: string;
+		/** Optional. Main notification content. Required for notifications.create method. */
+        message?: string;
+		/**
+		 * Optional.
+		 * Alternate notification content with a lower-weight font.
+		 * @since Chrome 31.
+		 */
+        contextMessage?: string;
+		/** Optional. Priority ranges from -2 to 2. -2 is lowest priority. 2 is highest. Zero is default. */
+        priority?: number;
+		/** Optional. A timestamp associated with the notification, in milliseconds past the epoch (e.g. Date.now() + n). */
+        eventTime?: number;
+		/** Optional. Text and icons for up to two notification action buttons. */
+		buttons?: ButtonOptions[];
+		/** Optional. Items for multi-item notifications. */
+		items?: ItemOptions[];
+		/**
+		 * Optional.
+		 * Current progress ranges from 0 to 100.
+		 * @since Chrome 30.
+		 */
+        progress?: number;
+		/**
+		 * Optional.
+		 * Whether to show UI indicating that the app will visibly respond to clicks on the body of a notification.
+		 * @since Chrome 32.
+		 */
+        isClickable?: boolean;
+		/**
+		 * Optional.
+		 * A URL to the app icon mask. URLs have the same restrictions as iconUrl. The app icon mask should be in alpha channel, as only the alpha channel of the image will be considered.
+		 * @since Chrome 38.
+		 */
+		appIconMaskUrl?: string;
+		/** Optional. A URL to the image thumbnail for image-type notifications. URLs have the same restrictions as iconUrl. */
+		imageUrl?: string;
+    }
+
+	interface NotificationClosedEvent extends chrome.events.Event<(notificationId: string, byUser: boolean) => void> {}
+
+	interface NotificationClickedEvent extends chrome.events.Event<(notificationId: string) => void> {}
+
+	interface NotificationButtonClickedEvent extends chrome.events.Event<(notificationId: string, buttonIndex: number) => void> {}
+
+	interface NotificationPermissionLevelChangedEvent extends chrome.events.Event<(level: string) => void> {}
+
+	interface NotificationShowSettingsEvent extends chrome.events.Event<() => void> {}
+
+	/** The notification closed, either by the system or by user action. */
+	export var onClosed: NotificationClosedEvent;
+	/** The user clicked in a non-button area of the notification. */
+	export var onClicked: NotificationClickedEvent;
+	/** The user pressed a button in the notification. */
+	export var onButtonClicked: NotificationButtonClickedEvent;
+	/**
+	 * The user changes the permission level.
+	 * @since Chrome 32.
+	 */
+	export var onPermissionLevelChanged: NotificationPermissionLevelChangedEvent;
+	/**
+	 * The user clicked on a link for the app's notification settings.
+	 * @since Chrome 32.
+	 */
+	export var onShowSettings: NotificationShowSettingsEvent;
+
+	/**
+	 * Creates and displays a notification.
+	 * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
+	 * The notificationId parameter is required before Chrome 42.
+	 * @param options Contents of the notification.
+	 * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
+	 * The callback is required before Chrome 42.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function(string notificationId) {...};
+	 */
+	export function create(notificationId: string, options: NotificationOptions, callback?: (notificationId: string) => void): void;
+	/**
+	 * Creates and displays a notification.
+	 * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
+	 * The notificationId parameter is required before Chrome 42.
+	 * @param options Contents of the notification.
+	 * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
+	 * The callback is required before Chrome 42.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function(string notificationId) {...};
+	 */
+	export function create(options: NotificationOptions, callback?: (notificationId: string) => void): void;
+	/**
+	 * Updates an existing notification.
+	 * @param notificationId The id of the notification to be updated. This is returned by notifications.create method.
+	 * @param options Contents of the notification to update to.
+	 * @param callback Called to indicate whether a matching notification existed.
+	 * The callback is required before Chrome 42.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function(boolean wasUpdated) {...};
+	 */
+	export function update(notificationId: string, options: NotificationOptions, callback?: (wasUpdated: boolean) => void): void;
+	/**
+	 * Clears the specified notification.
+	 * @param notificationId The id of the notification to be cleared. This is returned by notifications.create method.
+	 * @param callback Called to indicate whether a matching notification existed.
+	 * The callback is required before Chrome 42.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function(boolean wasCleared) {...};
+	 */
+	export function clear(notificationId: string, callback?: (wasCleared: boolean) => void): void;
+	/**
+	 * Retrieves all the notifications.
+	 * @since Chrome 29.
+	 * @param callback Returns the set of notification_ids currently in the system.
+	 * The callback parameter should be a function that looks like this:
+	 * function(object notifications) {...};
+	 */
+	export function getAll(callback: (notifications: Object) => void): void;
+	/**
+	 * Retrieves whether the user has enabled notifications from this app or extension.
+	 * @since Chrome 32.
+	 * @param callback Returns the current permission level.
+	 * The callback parameter should be a function that looks like this:
+	 * function( PermissionLevel level) {...};
+	 */
+    export function getPermissionLevel(callback: (level: string) => void): void;
+}
+
+////////////////////
+// Omnibox
+////////////////////
+/**
+ * The omnibox API allows you to register a keyword with Google Chrome's address bar, which is also known as the omnibox.
+ * Manifest:  "omnibox": {...}
+ * @since Chrome 9.
+ */
+declare namespace chrome.omnibox {
+	/** A suggest result. */
+    interface SuggestResult {
+		/** The text that is put into the URL bar, and that is sent to the extension when the user chooses this entry. */
+        content: string;
+		/** The text that is displayed in the URL dropdown. Can contain XML-style markup for styling. The supported tags are 'url' (for a literal URL), 'match' (for highlighting text that matched what the user's query), and 'dim' (for dim helper text). The styles can be nested, eg. dimmed match. You must escape the five predefined entities to display them as text: stackoverflow.com/a/1091953/89484 */
+        description: string;
+    }
+
+    interface Suggestion {
+		/** The text that is displayed in the URL dropdown. Can contain XML-style markup for styling. The supported tags are 'url' (for a literal URL), 'match' (for highlighting text that matched what the user's query), and 'dim' (for dim helper text). The styles can be nested, eg. dimmed match. */
+        description: string;
+    }
+
+    interface OmniboxInputEnteredEvent extends chrome.events.Event<(text: string) => void> {}
+
+    interface OmniboxInputChangedEvent extends chrome.events.Event<(text: string, suggest: (suggestResults: SuggestResult[]) => void) => void> {}
+
+    interface OmniboxInputStartedEvent extends chrome.events.Event<() => void> {}
+
+    interface OmniboxInputCancelledEvent extends chrome.events.Event<() => void> {}
+
+	/**
+	 * Sets the description and styling for the default suggestion. The default suggestion is the text that is displayed in the first suggestion row underneath the URL bar.
+	 * @param suggestion A partial SuggestResult object, without the 'content' parameter.
+	 */
+    export function setDefaultSuggestion(suggestion: Suggestion): void;
+
+	/** User has accepted what is typed into the omnibox. */
+    var onInputEntered: OmniboxInputEnteredEvent;
+	/** User has changed what is typed into the omnibox. */
+    var onInputChanged: OmniboxInputChangedEvent;
+	/** User has started a keyword input session by typing the extension's keyword. This is guaranteed to be sent exactly once per input session, and before any onInputChanged events. */
+    var onInputStarted: OmniboxInputStartedEvent;
+	/** User has ended the keyword input session without accepting the input. */
+    var onInputCancelled: OmniboxInputCancelledEvent;
+}
+
+////////////////////
+// Page Action
+////////////////////
+/**
+ * Use the chrome.pageAction API to put icons inside the address bar. Page actions represent actions that can be taken on the current page, but that aren't applicable to all pages.
+ * Manifest:  "page_action": {...}
+ * @since Chrome 5.
+ */
+declare namespace chrome.pageAction {
+    interface PageActionClickedEvent extends chrome.events.Event<(tab: chrome.tabs.Tab) => void> {}
+
+    interface TitleDetails {
+		/** The id of the tab for which you want to modify the page action. */
+        tabId: number;
+		/** The tooltip string. */
+        title: string;
+    }
+
+    interface GetDetails {
+		/** Specify the tab to get the title from. */
+        tabId: number;
+    }
+
+    interface PopupDetails {
+		/** The id of the tab for which you want to modify the page action. */
+        tabId: number;
+		/** The html file to show in a popup. If set to the empty string (''), no popup is shown. */
+        popup: string;
+    }
+
+    interface IconDetails {
+		/** The id of the tab for which you want to modify the page action. */
+        tabId: number;
+		/**
+		 * Optional.
+		 * @deprecated This argument is ignored.
+		 */
+        iconIndex?: number;
+		/**
+		 * Optional.
+		 * Either an ImageData object or a dictionary {size -> ImageData} representing icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.imageData = foo' is equivalent to 'details.imageData = {'19': foo}'
+		 */
+        imageData?: ImageData;
+		/**
+		 * Optional.
+		 * Either a relative image path or a dictionary {size -> relative image path} pointing to icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.path = foo' is equivalent to 'details.imageData = {'19': foo}'
+		 */
+        path?: any;
+    }
+
+	/**
+	 * Shows the page action. The page action is shown whenever the tab is selected.
+	 * @param tabId The id of the tab for which you want to modify the page action.
+	 */
+    export function hide(tabId: number): void;
+	/**
+	 * Shows the page action. The page action is shown whenever the tab is selected.
+	 * @param tabId The id of the tab for which you want to modify the page action.
+	 */
+    export function show(tabId: number): void;
+	/** Sets the title of the page action. This is displayed in a tooltip over the page action. */
+    export function setTitle(details: TitleDetails): void;
+	/** Sets the html document to be opened as a popup when the user clicks on the page action's icon. */
+    export function setPopup(details: PopupDetails): void;
+	/**
+	 * Gets the title of the page action.
+	 * @since Chrome 19.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(string result) {...};
+	 */
+    export function getTitle(details: GetDetails, callback: (result: string) => void): void;
+	/**
+	 * Gets the html document set as the popup for this page action.
+	 * @since Chrome 19.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(string result) {...};
+	 */
+    export function getPopup(details: GetDetails, callback: (result: string) => void): void;
+	/**
+	 * Sets the icon for the page action. The icon can be specified either as the path to an image file or as the pixel data from a canvas element, or as dictionary of either one of those. Either the path or the imageData property must be specified.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
+	 */
+	export function setIcon(details: IconDetails, callback?: () => void): void;
+
+	/** Fired when a page action icon is clicked. This event will not fire if the page action has a popup. */
+    var onClicked: PageActionClickedEvent;
+}
+
+////////////////////
+// Page Capture
+////////////////////
+/**
+ * Use the chrome.pageCapture API to save a tab as MHTML.
+ * Permissions:  "pageCapture"
+ * @since Chrome 18.
+ */
+declare namespace chrome.pageCapture {
+    interface SaveDetails {
+		/** The id of the tab to save as MHTML. */
+        tabId: number;
+    }
+
+	/**
+	 * Saves the content of the tab with given id as MHTML.
+	 * @param callback Called when the MHTML has been generated.
+	 * The callback parameter should be a function that looks like this:
+	 * function(binary mhtmlData) {...};
+	 * Parameter mhtmlData: The MHTML data as a Blob.
+	 */
+    export function saveAsMHTML(details: SaveDetails, callback: (mhtmlData: any) => void): void;
+}
+
+////////////////////
+// Permissions
+////////////////////
+/**
+ * Use the chrome.permissions API to request declared optional permissions at run time rather than install time, so users understand why the permissions are needed and grant only those that are necessary.
+ * @since Chrome 16.
+ */
+declare namespace chrome.permissions {
+    interface Permissions {
+		/**
+		 * Optional.
+		 * List of named permissions (does not include hosts or origins). Anything listed here must appear in the optional_permissions list in the manifest.
+		 */
+        origins?: string[];
+		/**
+		 * Optional.
+		 * List of origin permissions. Anything listed here must be a subset of a host that appears in the optional_permissions list in the manifest. For example, if http://*.example.com/ or http://* appears in optional_permissions, you can request an origin of http://help.example.com/. Any path is ignored.
+		 */
+        permissions?: string[];
+    }
+
+    interface PermissionsRemovedEvent {
+		/**
+		 * @param callback The callback parameter should be a function that looks like this:
+		 * function( Permissions permissions) {...};
+		 * Parameter permissions: The permissions that have been removed.
+		 */
+        addListener(callback: (permissions: Permissions) => void): void;
+    }
+
+    interface PermissionsAddedEvent {
+		/**
+		 * @param callback The callback parameter should be a function that looks like this:
+		 * function( Permissions permissions) {...};
+		 * Parameter permissions: The newly acquired permissions.
+		 */
+        addListener(callback: (permissions: Permissions) => void): void;
+    }
+
+	/**
+	 * Checks if the extension has the specified permissions.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(boolean result) {...};
+	 * Parameter result: True if the extension has the specified permissions.
+	 */
+    export function contains(permissions: Permissions, callback: (result: boolean) => void): void;
+	/**
+	 * Gets the extension's current set of permissions.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function( Permissions permissions) {...};
+	 * Parameter permissions: The extension's active permissions.
+	 */
+    export function getAll(callback: (permissions: Permissions) => void): void;
+	/**
+	 * Requests access to the specified permissions. These permissions must be defined in the optional_permissions field of the manifest. If there are any problems requesting the permissions, runtime.lastError will be set.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(boolean granted) {...};
+	 * Parameter granted: True if the user granted the specified permissions.
+	 */
+    export function request(permissions: Permissions, callback?: (granted: boolean) => void): void;
+	/**
+	 * Removes access to the specified permissions. If there are any problems removing the permissions, runtime.lastError will be set.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(boolean removed) {...};
+	 * Parameter removed: True if the permissions were removed.
+	 */
+    export function remove(permissions: Permissions, callback?: (removed: boolean) => void): void;
+
+	/** Fired when access to permissions has been removed from the extension. */
+    var onRemoved: PermissionsRemovedEvent;
+	/** Fired when the extension acquires new permissions. */
+    var onAdded: PermissionsAddedEvent;
+}
+
+////////////////////
+// Platform Keys
+////////////////////
+/**
+ * Use the chrome.platformKeys API to access client certificates managed by the platform. If the user or policy grants the permission, an extension can use such a certficate in its custom authentication protocol. E.g. this allows usage of platform managed certificates in third party VPNs (see chrome.vpnProvider).
+ * Permissions:  "platformKeys"
+ * Important: This API works only on Chrome OS.
+ * @since Chrome 45.
+ */
+declare namespace chrome.platformKeys {
+	interface Match {
+		/** The DER encoding of a X.509 certificate. */
+		certificate: ArrayBuffer;
+		/** The  KeyAlgorithm of the certified key. This contains algorithm parameters that are inherent to the key of the certificate (e.g. the key length). Other parameters like the hash function used by the sign function are not included. */
+		keyAlgorithm: KeyAlgorithm;
+	}
+
+	interface ClientCertificateSelectRequestDetails {
+		/** This field is a list of the types of certificates requested, sorted in order of the server's preference. Only certificates of a type contained in this list will be retrieved. If certificateTypes is the empty list, however, certificates of any type will be returned. */
+		certificateTypes: string[];
+		/** List of distinguished names of certificate authorities allowed by the server. Each entry must be a DER-encoded X.509 DistinguishedName. */
+		certificateAuthorities: ArrayBuffer[];
+	}
+
+	interface ClientCertificateSelectDetails {
+		/** Only certificates that match this request will be returned. */
+		request: ClientCertificateSelectRequestDetails;
+		/**
+		 * Optional.
+		 * If given, the selectClientCertificates operates on this list. Otherwise, obtains the list of all certificates from the platform's certificate stores that are available to this extensions. Entries that the extension doesn't have permission for or which doesn't match the request, are removed.
+		 */
+		clientCerts?: ArrayBuffer[];
+		/** If true, the filtered list is presented to the user to manually select a certificate and thereby granting the extension access to the certificate(s) and key(s). Only the selected certificate(s) will be returned. If is false, the list is reduced to all certificates that the extension has been granted access to (automatically or manually). */
+		interactive: boolean;
+	}
+
+	interface ServerCertificateVerificationDetails {
+		/** Each chain entry must be the DER encoding of a X.509 certificate, the first entry must be the server certificate and each entry must certify the entry preceding it. */
+		serverCertificateChain: ArrayBuffer[];
+		/** The hostname of the server to verify the certificate for, e.g. the server that presented the serverCertificateChain. */
+		hostname: string;
+	}
+
+	interface ServerCertificateVerificationResult {
+		/** The result of the trust verification: true if trust for the given verification details could be established and false if trust is rejected for any reason. */
+		trusted: boolean;
+		/**
+		 * If the trust verification failed, this array contains the errors reported by the underlying network layer. Otherwise, this array is empty.
+		 * Note: This list is meant for debugging only and may not contain all relevant errors. The errors returned may change in future revisions of this API, and are not guaranteed to be forwards or backwards compatible.
+		 */
+		debug_errors: string[];
+	}
+
+	/**
+	 * This function filters from a list of client certificates the ones that are known to the platform, match request and for which the extension has permission to access the certificate and its private key. If interactive is true, the user is presented a dialog where he can select from matching certificates and grant the extension access to the certificate. The selected/filtered client certificates will be passed to callback.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of Match matches) {...};
+	 * Parameter matches: The list of certificates that match the request, that the extension has permission for and, if interactive is true, that were selected by the user.
+	 */
+	export function selectClientCertificates(details: ClientCertificateSelectDetails, callback: (matches: Match[]) => void): void;
+	/**
+	 * Passes the key pair of certificate for usage with platformKeys.subtleCrypto to callback.
+	 * @param certificate The certificate of a Match returned by selectClientCertificates.
+	 * @param parameters Determines signature/hash algorithm parameters additionally to the parameters fixed by the key itself. The same parameters are   accepted as by WebCrypto's importKey function, e.g. RsaHashedImportParams for a RSASSA-PKCS1-v1_5 key. For RSASSA-PKCS1-v1_5 keys, additionally the parameters { 'hash': { 'name': 'none' } } are supported. The sign function will then apply PKCS#1 v1.5 padding and but not hash the given data.
+	 * @param callback The public and private CryptoKey of a certificate which can only be used with platformKeys.subtleCrypto.
+	 * The callback parameter should be a function that looks like this:
+	 * function(object publicKey, object privateKey) {...};
+	 * Optional parameter privateKey: Might be null if this extension does not have access to it.
+	 */
+	export function getKeyPair(certificate: ArrayBuffer, parameters: Object, callback: (publicKey: CryptoKey, privateKey?: CryptoKey) => void): void;
+	/** An implementation of WebCrypto's  SubtleCrypto that allows crypto operations on keys of client certificates that are available to this extension. */
+	export function subtleCrypto(): SubtleCrypto;
+	/**
+	 * Checks whether details.serverCertificateChain can be trusted for details.hostname according to the trust settings of the platform. Note: The actual behavior of the trust verification is not fully specified and might change in the future. The API implementation verifies certificate expiration, validates the certification path and checks trust by a known CA. The implementation is supposed to respect the EKU serverAuth and to support subject alternative names.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(object result) {...};
+	 */
+	export function verifyTLSServerCertificate(details: ServerCertificateVerificationDetails, callback: (result: ServerCertificateVerificationResult) => void): void;
+}
+
+////////////////////
+// Power
+////////////////////
+/**
+ * Use the chrome.power API to override the system's power management features.
+ * Permissions:  "power"
+ * @since Chrome 27.
+ */
+declare namespace chrome.power {
+	/** Requests that power management be temporarily disabled. |level| describes the degree to which power management should be disabled. If a request previously made by the same app is still active, it will be replaced by the new request. */
+	export function requestKeepAwake(level: string): void;
+	/** Releases a request previously made via requestKeepAwake(). */
+	export function releaseKeepAwake(): void;
+}
+
+////////////////////
+// Printer Provider
+////////////////////
+/**
+ * The chrome.printerProvider API exposes events used by print manager to query printers controlled by extensions, to query their capabilities and to submit print jobs to these printers.
+ * Permissions:  "printerProvider"
+ * @since Chrome 44.
+ */
+declare namespace chrome.printerProvider {
+	interface PrinterInfo {
+		/** Unique printer ID. */
+		id: string;
+		/** Printer's human readable name. */
+		name: string;
+		/** Optional. Printer's human readable description. */
+		description?: string;
+	}
+
+	interface PrinterCapabilities {
+		/** Device capabilities in CDD format. */
+		capabilities: any;
+	}
+
+	interface PrintJob {
+		/** ID of the printer which should handle the job. */
+		printerId: string;
+		/** The print job title. */
+		title: string;
+		/** Print ticket in  CJT format. */
+		ticket: Object;
+		/** The document content type. Supported formats are "application/pdf" and "image/pwg-raster". */
+		contentType: string;
+		/** Blob containing the document data to print. Format must match |contentType|. */
+		document: Blob;
+	}
+
+	interface PrinterRequestedEvent extends chrome.events.Event<(resultCallback: (printerInfo: PrinterInfo[]) => void) => void> {}
+
+	interface PrinterInfoRequestedEvent extends chrome.events.Event<(device: any, resultCallback: (printerInfo?: PrinterInfo) => void) => void> {}
+
+	interface CapabilityRequestedEvent extends chrome.events.Event<(printerId: string, resultCallback: (capabilities: PrinterCapabilities) => void) => void> {}
+
+	interface PrintRequestedEvent extends chrome.events.Event<(printJob: PrintJob, resultCallback: (result: string) => void) => void> {}
+
+	/** Event fired when print manager requests printers provided by extensions. */
+	export var onGetPrintersRequested: PrinterRequestedEvent;
+	/**
+	 * Event fired when print manager requests information about a USB device that may be a printer.
+	 * Note: An application should not rely on this event being fired more than once per device. If a connected device is supported it should be returned in the onGetPrintersRequested event.
+	 * @since Chrome 45.
+	 */
+	export var onGetUsbPrinterInfoRequested: PrinterInfoRequestedEvent;
+	/** Event fired when print manager requests printer capabilities. */
+	export var onGetCapabilityRequested: CapabilityRequestedEvent;
+	/** Event fired when print manager requests printing. */
+	export var onPrintRequested: PrintRequestedEvent;
+}
+
+////////////////////
+// Privacy
+////////////////////
+/**
+ * Use the chrome.privacy API to control usage of the features in Chrome that can affect a user's privacy. This API relies on the ChromeSetting prototype of the type API for getting and setting Chrome's configuration.
+ * Permissions:  "privacy"
+ * The Chrome Privacy Whitepaper gives background detail regarding the features which this API can control.
+ * @since Chrome 18.
+ */
+declare namespace chrome.privacy {
+    interface Services {
+		/** since Chrome 20. */
+        spellingServiceEnabled: chrome.types.ChromeSetting;
+        searchSuggestEnabled: chrome.types.ChromeSetting;
+        instantEnabled: chrome.types.ChromeSetting;
+        alternateErrorPagesEnabled: chrome.types.ChromeSetting;
+        safeBrowsingEnabled: chrome.types.ChromeSetting;
+        autofillEnabled: chrome.types.ChromeSetting;
+        translationServiceEnabled: chrome.types.ChromeSetting;
+		/** @since Chrome 38. */
+		passwordSavingEnabled: chrome.types.ChromeSetting;
+		/** @since Chrome 42. */
+		hotwordSearchEnabled: chrome.types.ChromeSetting;
+		/** @since Chrome 42. */
+		safeBrowsingExtendedReportingEnabled: chrome.types.ChromeSetting;
+    }
+
+    interface Network {
+        networkPredictionEnabled: chrome.types.ChromeSetting;
+		/** @since Chrome 42. */
+		webRTCMultipleRoutesEnabled: chrome.types.ChromeSetting;
+		/** @since Chrome 47. Warning: this is the current Dev channel. */
+		webRTCNonProxiedUdpEnabled: chrome.types.ChromeSetting;
+    }
+
+    interface Websites {
+        thirdPartyCookiesAllowed: chrome.types.ChromeSetting;
+        referrersEnabled: chrome.types.ChromeSetting;
+        hyperlinkAuditingEnabled: chrome.types.ChromeSetting;
+		/** @since Chrome 21. */
+        protectedContentEnabled: chrome.types.ChromeSetting;
+    }
+
+	/** Settings that enable or disable features that require third-party network services provided by Google and your default search provider. */
+    var services: Services;
+	/** Settings that influence Chrome's handling of network connections in general. */
+    var network: Network;
+	/** Settings that determine what information Chrome makes available to websites. */
+    var websites: Websites;
+}
+
+////////////////////
+// Proxy
+////////////////////
+/**
+ * Use the chrome.proxy API to manage Chrome's proxy settings. This API relies on the ChromeSetting prototype of the type API for getting and setting the proxy configuration.
+ * Permissions:  "proxy"
+ * @since Chrome 13.
+ */
+declare namespace chrome.proxy {
+    /** An object holding proxy auto-config information. Exactly one of the fields should be non-empty. */
+    interface PacScript {
+        /** Optional. URL of the PAC file to be used. */
+        url?: string;
+        /** Optional. If true, an invalid PAC script will prevent the network stack from falling back to direct connections. Defaults to false. */
+        mandatory?: boolean;
+        /** Optional. A PAC script. */
+        data?: string;
+    }
+
+    /** An object encapsulating a complete proxy configuration. */
+    interface ProxyConfig {
+        /** Optional. The proxy rules describing this configuration. Use this for 'fixed_servers' mode. */
+        rules?: ProxyRules;
+        /** Optional. The proxy auto-config (PAC) script for this configuration. Use this for 'pac_script' mode. */
+        pacScript?: PacScript;
+        /**
+         * 'direct' = Never use a proxy
+         * 'auto_detect' = Auto detect proxy settings
+         * 'pac_script' = Use specified PAC script
+         * 'fixed_servers' = Manually specify proxy servers
+         * 'system' = Use system proxy settings
+         */
+        mode: string;
+    }
+
+    /** An object encapsulating a single proxy server's specification. */
+    interface ProxyServer {
+        /** The URI of the proxy server. This must be an ASCII hostname (in Punycode format). IDNA is not supported, yet. */
+        host: string;
+        /** Optional. The scheme (protocol) of the proxy server itself. Defaults to 'http'. */
+        scheme?: string;
+        /** Optional. The port of the proxy server. Defaults to a port that depends on the scheme. */
+        port?: number;
+    }
+
+    /** An object encapsulating the set of proxy rules for all protocols. Use either 'singleProxy' or (a subset of) 'proxyForHttp', 'proxyForHttps', 'proxyForFtp' and 'fallbackProxy'. */
+    interface ProxyRules {
+        /** Optional. The proxy server to be used for FTP requests. */
+        proxyForFtp?: ProxyServer;
+        /** Optional. The proxy server to be used for HTTP requests. */
+        proxyForHttp?: ProxyServer;
+        /** Optional. The proxy server to be used for everthing else or if any of the specific proxyFor... is not specified. */
+		fallbackProxy?: ProxyServer;
+        /** Optional. The proxy server to be used for all per-URL requests (that is http, https, and ftp). */
+        singleProxy?: ProxyServer;
+        /** Optional. The proxy server to be used for HTTPS requests. */
+        proxyForHttps?: ProxyServer;
+        /** Optional. List of servers to connect to without a proxy server. */
+        bypassList?: string[];
+    }
+
+    interface ErrorDetails {
+        /** Additional details about the error such as a JavaScript runtime error. */
+        details: string;
+        /** The error description. */
+        error: string;
+        /** If true, the error was fatal and the network transaction was aborted. Otherwise, a direct connection is used instead. */
+        fatal: boolean;
+    }
+
+    interface ProxyErrorEvent extends chrome.events.Event<(details: ErrorDetails) => void> {}
+
+    var settings: chrome.types.ChromeSetting;
+    /** Notifies about proxy errors. */
+    var onProxyError: ProxyErrorEvent;
+}
+
+////////////////////
+// Runtime
+////////////////////
+/**
+ * Use the chrome.runtime API to retrieve the background page, return details about the manifest, and listen for and respond to events in the app or extension lifecycle. You can also use this API to convert the relative path of URLs to fully-qualified URLs.
+ * @since Chrome 22
+ */
+declare namespace chrome.runtime {
+    /** This will be defined during an API method callback if there was an error */
+    var lastError: LastError;
+    /** The ID of the extension/app. */
+    var id: string;
+
+    interface LastError {
+        /** Optional. Details about the error which occurred.  */
+        message?: string;
+    }
+
+    interface ConnectInfo {
+        name?: string;
+    }
+
+    interface InstalledDetails {
+		/**
+		 * The reason that this event is being dispatched.
+		 * One of: "install", "update", "chrome_update", or "shared_module_update"
+		 */
+        reason: string;
+		/**
+		 * Optional.
+		 * Indicates the previous version of the extension, which has just been updated. This is present only if 'reason' is 'update'.
+		 */
+        previousVersion?: string;
+		/**
+		 * Optional.
+		 * Indicates the ID of the imported shared module extension which updated. This is present only if 'reason' is 'shared_module_update'.
+		 * @since Chrome 29.
+		 */
+		id?: string;
+    }
+
+    interface MessageOptions {
+        /** Whether the TLS channel ID will be passed into onMessageExternal for processes that are listening for the connection event. */
+        includeTlsChannelId?: boolean;
+    }
+
+    /**
+     * An object containing information about the script context that sent a message or request.
+     * @since Chrome 26.
+     */
+    interface MessageSender {
+        /** The ID of the extension or app that opened the connection, if any. */
+        id?: string;
+        /** The tabs.Tab which opened the connection, if any. This property will only be present when the connection was opened from a tab (including content scripts), and only if the receiver is an extension, not an app. */
+        tab?: chrome.tabs.Tab;
+        /**
+         * The frame that opened the connection. 0 for top-level frames, positive for child frames. This will only be set when tab is set.
+         * @since Chrome 41.
+         */
+        frameId?: number;
+        /**
+         * The URL of the page or frame that opened the connection. If the sender is in an iframe, it will be iframe's URL not the URL of the page which hosts it.
+         * @since Chrome 28.
+         */
+        url?: string;
+        /**
+         * The TLS channel ID of the page or frame that opened the connection, if requested by the extension or app, and if available.
+         * @since Chrome 32.
+         */
+        tlsChannelId?: string;
+    }
+
+    /**
+     * An object containing information about the current platform.
+     * @since Chrome 36.
+     */
+    interface PlatformInfo {
+        /**
+         * The operating system chrome is running on.
+         * One of: "mac", "win", "android", "cros", "linux", or "openbsd"
+         */
+        os: string;
+        /**
+         * The machine's processor architecture.
+         * One of: "arm", "x86-32", or "x86-64"
+         */
+        arch: string;
+        /**
+         * The native client architecture. This may be different from arch on some platforms.
+         * One of: "arm", "x86-32", or "x86-64"
+         */
+        nacl_arch: string;
+    }
+
+    /**
+     * An object which allows two way communication with other pages.
+     * @since Chrome 26.
+     */
+    interface Port {
+        postMessage: (message: Object) => void;
+        disconnect: () => void;
+        /**
+         * Optional.
+         * This property will only be present on ports passed to onConnect/onConnectExternal listeners.
+         */
+        sender?: MessageSender;
+        /** An object which allows the addition and removal of listeners for a Chrome event. */
+        onDisconnect: chrome.events.Event<() => void>;
+        /** An object which allows the addition and removal of listeners for a Chrome event. */
+        onMessage: PortMessageEvent;
+        name: string;
+    }
+
+    interface UpdateAvailableDetails {
+		/** The version number of the available update. */
+        version: string;
+    }
+
+    interface UpdateCheckDetails {
+        /** The version of the available update. */
+        version: string;
+    }
+
+    interface PortMessageEvent extends chrome.events.Event<(message: Object, port: Port) => void> {}
+
+    interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response: any) => void) => void> {}
+
+    interface ExtensionConnectEvent extends chrome.events.Event<(port: Port) => void> {}
+
+    interface RuntimeInstalledEvent extends chrome.events.Event<(details: InstalledDetails) => void> {}
+
+	interface RuntimeEvent extends chrome.events.Event<() => void> {}
+
+    interface RuntimeRestartRequiredEvent extends chrome.events.Event<(reason: string) => void> {}
+
+    interface RuntimeUpdateAvailableEvent extends chrome.events.Event<(details: UpdateAvailableDetails) => void> {}
+
+	interface ManifestIcons {
+		[size: number]: string;
+	}
+
+	interface ManifestAction {
+		default_icon?: ManifestIcons;
+		default_title?: string;
+		default_popup?: string;
+	}
+
+	interface SearchProvider {
+		name?: string;
+		keyword?: string;
+		favicon_url?: string;
+		search_url: string;
+		encoding?: string;
+		suggest_url?: string;
+		instant_url?: string;
+		image_url?: string;
+		search_url_post_params?: string;
+		suggest_url_post_params?: string;
+		instant_url_post_params?: string;
+		image_url_post_params?: string;
+		alternate_urls?: string[];
+		prepopulated_id?: number;
+		is_default?: boolean;
+	}
+
+	interface Manifest {
+		// Required
+		manifest_version: number;
+		name: string;
+		version: string;
+
+		// Recommended
+		default_locale?: string;
+		description?: string;
+		icons?: ManifestIcons;
+
+		// Pick one (or none)
+		browser_action?: ManifestAction;
+		page_action?: ManifestAction;
+
+		// Optional
+		author?: any;
+		automation?: any;
+		background?: {
+			scripts?: string[];
+			page?: string;
+			persistent?: boolean;
+		};
+		background_page?: string;
+		chrome_settings_overrides?: {
+			homepage?: string;
+			search_provider?: SearchProvider;
+			startup_pages?: string[];
+		};
+		chrome_ui_overrides?: {
+			bookmarks_ui?: {
+				remove_bookmark_shortcut?: boolean;
+				remove_button?: boolean;
+			}
+		};
+		chrome_url_overrides?: {
+			bookmarks?: string;
+			history?: string;
+			newtab?: string;
+		};
+		commands?: {
+			[name: string]: {
+				suggested_key?: {
+                    default?: string;
+					windows?: string;
+					mac?: string;
+					chromeos?: string;
+					linux?: string;
+				};
+				description?: string;
+				global?: boolean
+			}
+		};
+		content_capabilities?: {
+			matches?: string[];
+			permissions?: string[];
+		};
+		content_scripts?: {
+			matches?: string[];
+			exclude_matches?: string[];
+			css?: string[];
+			js?: string[];
+			run_at?: string;
+			all_frames?: boolean;
+			include_globs?: string[];
+			exclude_globs?: string[];
+		}[];
+		content_security_policy?: string;
+		converted_from_user_script?: boolean;
+		copresence?: any;
+		current_locale?: string;
+		devtools_page?: string;
+		event_rules?: {
+			event?: string;
+			actions?: {
+				type: string;
+			}[];
+            conditions?: chrome.declarativeContent.PageStateMatcher[]
+		}[];
+		externally_connectable?: {
+            ids?: string[];
+			matches?: string[];
+            accepts_tls_channel_id?: boolean;
+		};
+		file_browser_handlers?: {
+			id?: string;
+			default_title?: string;
+			file_filters?: string[];
+		}[];
+		file_system_provider_capabilities?: {
+			configurable?: boolean;
+			watchable?: boolean;
+			multiple_mounts?: boolean;
+			source?: string;
+		};
+		homepage_url?: string;
+		import?: {
+			id: string;
+			minimum_version?: string
+		}[];
+		export?: {
+			whitelist?: string[]
+		};
+		incognito?: string;
+		input_components?: {
+			name?: string;
+			type?: string;
+			id?: string;
+			description?: string;
+			language?: string;
+			layouts?: any[];
+		}[];
+		key?: string;
+		minimum_chrome_version?: string;
+		nacl_modules?: {
+			path: string;
+			mime_type: string;
+		}[];
+		oauth2?: {
+			client_id: string;
+			scopes?: string[];
+		};
+		offline_enabled?: boolean;
+		omnibox?: {
+			keyword: string;
+		};
+		optional_permissions?: string[];
+		options_page?: string;
+		options_ui?: {
+			page?: string;
+			chrome_style?: boolean;
+			open_in_tab?: boolean;
+		};
+		permissions?: string[];
+		platforms?: {
+			nacl_arch?: string;
+			sub_package_path: string;
+		}[];
+		plugins?: {
+			path: string;
+		}[];
+		requirements?: {
+			'3D'?: {
+				features?: string[]
+			};
+			plugins?: {
+				npapi?: boolean;
+			}
+		};
+		sandbox?: {
+			pages: string[];
+			content_security_policy?: string;
+		};
+		short_name?: string;
+		signature?: any;
+		spellcheck?: {
+			dictionary_language?: string;
+			dictionary_locale?: string;
+			dictionary_format?: string;
+			dictionary_path?: string;
+		};
+		storage?: {
+			managed_schema: string
+		};
+		system_indicator?: any;
+		tts_engine?: {
+			voices: {
+				voice_name: string;
+				lang?: string;
+				gender?: string;
+				event_types?: string[];
+			}[]
+		};
+		update_url?: string;
+		version_name?: string;
+		web_accessible_resources?: string[];
+		[key: string]: any;
+	}
+
+    /**
+     * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect.
+     * @since Chrome 26.
+     */
+    export function connect(connectInfo?: ConnectInfo): Port;
+	/**
+     * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect.
+     * @since Chrome 26.
+     * @param extensionId Optional.
+     * The ID of the extension or app to connect to. If omitted, a connection will be attempted with your own extension. Required if sending messages from a web page for web messaging.
+     */
+    export function connect(extensionId: string, connectInfo?: ConnectInfo): Port;
+    /**
+     * Connects to a native application in the host machine.
+     * @since Chrome 28.
+     * @param application The name of the registered application to connect to.
+     */
+    export function connectNative(application: string): Port;
+    /** Retrieves the JavaScript 'window' object for the background page running inside the current extension/app. If the background page is an event page, the system will ensure it is loaded before calling the callback. If there is no background page, an error is set. */
+    export function getBackgroundPage(callback: (backgroundPage?: Window) => void): void;
+    /**
+     * Returns details about the app or extension from the manifest. The object returned is a serialization of the full manifest file.
+     * @returns The manifest details.
+     */
+    export function getManifest(): Manifest;
+    /**
+     * Returns a DirectoryEntry for the package directory.
+     * @since Chrome 29.
+     */
+	export function getPackageDirectoryEntry(callback: (directoryEntry: DirectoryEntry) => void): void;
+    /**
+     * Returns information about the current platform.
+     * @since Chrome 29.
+     * @param callback Called with results
+     */
+    export function getPlatformInfo(callback: (platformInfo: PlatformInfo) => void): void;
+    /**
+     * Converts a relative path within an app/extension install directory to a fully-qualified URL.
+     * @param path A path to a resource within an app/extension expressed relative to its install directory.
+     */
+    export function getURL(path: string): string;
+    /**
+     * Reloads the app or extension.
+     * @since Chrome 25.
+     */
+    export function reload(): void;
+    /**
+     * Requests an update check for this app/extension.
+     * @since Chrome 25.
+     * @param callback
+     * Parameter status: Result of the update check. One of: "throttled", "no_update", or "update_available"
+     * Optional parameter details: If an update is available, this contains more information about the available update.
+     */
+    export function requestUpdateCheck(callback: (status: string, details?: UpdateCheckDetails) => void): void;
+    /**
+     * Restart the ChromeOS device when the app runs in kiosk mode. Otherwise, it's no-op.
+     * @since Chrome 32.
+     */
+    export function restart(): void;
+	/**
+     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
+     * @since Chrome 26.
+     * @param responseCallback Optional
+     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+     */
+    export function sendMessage(message: any, responseCallback?: (response: any) => void): void;
+	/**
+     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
+     * @since Chrome 32.
+     * @param responseCallback Optional
+     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+     */
+    export function sendMessage(message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
+	/**
+     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
+     * @since Chrome 26.
+     * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to your own extension/app. Required if sending messages from a web page for web messaging.
+     * @param responseCallback Optional
+     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+     */
+    export function sendMessage(extensionId: string, message: any, responseCallback?: (response: any) => void): void;
+    /**
+     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
+     * @since Chrome 32.
+     * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to your own extension/app. Required if sending messages from a web page for web messaging.
+     * @param responseCallback Optional
+     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+     */
+    export function sendMessage(extensionId: string, message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
+    /**
+     * Send a single message to a native application.
+     * @since Chrome 28.
+     * @param application The of the native messaging host.
+     * @param message The message that will be passed to the native messaging host.
+     * @param responseCallback Optional.
+     * Parameter response: The response message sent by the native messaging host. If an error occurs while connecting to the native messaging host, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+     */
+	export function sendNativeMessage(application: string, message: Object, responseCallback?: (response: any) => void): void;
+    /**
+     * Sets the URL to be visited upon uninstallation. This may be used to clean up server-side data, do analytics, and implement surveys. Maximum 255 characters.
+     * @since Chrome 41.
+     * @param url Since Chrome 34.
+     * URL to be opened after the extension is uninstalled. This URL must have an http: or https: scheme. Set an empty string to not open a new tab upon uninstallation.
+     * @param callback Called when the uninstall URL is set. If the given URL is invalid, runtime.lastError will be set.
+     */
+	export function setUninstallURL(url: string, callback?: () => void): void;
+    /**
+     * Open your Extension's options page, if possible.
+     * The precise behavior may depend on your manifest's options_ui or options_page key, or what Chrome happens to support at the time. For example, the page may be opened in a new tab, within chrome://extensions, within an App, or it may just focus an open options page. It will never cause the caller page to reload.
+     * If your Extension does not declare an options page, or Chrome failed to create one for some other reason, the callback will set lastError.
+     * @since Chrome 42.
+     */
+    export function openOptionsPage(callback?: () => void): void;
+
+	/**
+	 * Fired when a connection is made from either an extension process or a content script.
+	 * @since Chrome 26.
+	 */
+    var onConnect: ExtensionConnectEvent;
+	/**
+	 * Fired when a connection is made from another extension.
+	 * @since Chrome 26.
+	 */
+	var onConnectExternal: ExtensionConnectEvent;
+	/** Sent to the event page just before it is unloaded. This gives the extension opportunity to do some clean up. Note that since the page is unloading, any asynchronous operations started while handling this event are not guaranteed to complete. If more activity for the event page occurs before it gets unloaded the onSuspendCanceled event will be sent and the page won't be unloaded. */
+	var onSuspend: RuntimeEvent;
+	/**
+	 * Fired when a profile that has this extension installed first starts up. This event is not fired when an incognito profile is started, even if this extension is operating in 'split' incognito mode.
+	 * @since Chrome 23.
+	 */
+	var onStartup: RuntimeEvent;
+	/** Fired when the extension is first installed, when the extension is updated to a new version, and when Chrome is updated to a new version. */
+    var onInstalled: RuntimeInstalledEvent;
+	/** Sent after onSuspend to indicate that the app won't be unloaded after all. */
+	var onSuspendCanceled: RuntimeEvent;
+	/**
+	 * Fired when a message is sent from either an extension process or a content script.
+	 * @since Chrome 26.
+	 */
+    var onMessage: ExtensionMessageEvent;
+	/**
+	 * Fired when a message is sent from another extension/app. Cannot be used in a content script.
+	 * @since Chrome 26.
+	 */
+	var onMessageExternal: ExtensionMessageEvent;
+	/**
+	 * Fired when an app or the device that it runs on needs to be restarted. The app should close all its windows at its earliest convenient time to let the restart to happen. If the app does nothing, a restart will be enforced after a 24-hour grace period has passed. Currently, this event is only fired for Chrome OS kiosk apps.
+	 * @since Chrome 29.
+	 */
+    var onRestartRequired: RuntimeRestartRequiredEvent;
+	/**
+	 * Fired when an update is available, but isn't installed immediately because the app is currently running. If you do nothing, the update will be installed the next time the background page gets unloaded, if you want it to be installed sooner you can explicitly call chrome.runtime.reload(). If your extension is using a persistent background page, the background page of course never gets unloaded, so unless you call chrome.runtime.reload() manually in response to this event the update will not get installed until the next time chrome itself restarts. If no handlers are listening for this event, and your extension has a persistent background page, it behaves as if chrome.runtime.reload() is called in response to this event.
+	 * @since Chrome 25.
+	 */
+    var onUpdateAvailable: RuntimeUpdateAvailableEvent;
+	/**
+	 * @deprecated since Chrome 33. Please use chrome.runtime.onRestartRequired.
+	 * Fired when a Chrome update is available, but isn't installed immediately because a browser restart is required.
+	 */
+	var onBrowserUpdateAvailable: RuntimeEvent;
+}
+
+////////////////////
+// Script Badge
+////////////////////
+declare namespace chrome.scriptBadge {
+    interface GetPopupDetails {
+        tabId: number;
+    }
+
+    interface AttentionDetails {
+        tabId: number;
+    }
+
+    interface SetPopupDetails {
+        tabId: number;
+        popup: string;
+    }
+
+    interface ScriptBadgeClickedEvent extends chrome.events.Event<(tab: chrome.tabs.Tab) => void> {}
+
+    export function getPopup(details: GetPopupDetails, callback: Function): void;
+    export function getAttention(details: AttentionDetails): void;
+    export function setPopup(details: SetPopupDetails): void;
+
+    var onClicked: ScriptBadgeClickedEvent;
+}
+
+////////////////////
+// Sessions
+////////////////////
+/**
+ * Use the chrome.sessions API to query and restore tabs and windows from a browsing session.
+ * Permissions:  "sessions"
+ * @since Chrome 37.
+ */
+declare namespace chrome.sessions {
+	interface Filter {
+		/**
+		 * Optional.
+		 * The maximum number of entries to be fetched in the requested list. Omit this parameter to fetch the maximum number of entries (sessions.MAX_SESSION_RESULTS).
+		 */
+		maxResults?: number;
+	}
+
+	interface Session {
+		/** The time when the window or tab was closed or modified, represented in milliseconds since the epoch. */
+		lastModified: number;
+		/**
+		 * Optional.
+		 * The tabs.Tab, if this entry describes a tab. Either this or sessions.Session.window will be set.
+		 */
+		tab?: tabs.Tab;
+		/**
+		 * Optional.
+		 * The windows.Window, if this entry describes a window. Either this or sessions.Session.tab will be set.
+		 */
+		window?: windows.Window;
+	}
+
+	interface Device {
+		/** The name of the foreign device. */
+		deviceName: string;
+		/** A list of open window sessions for the foreign device, sorted from most recently to least recently modified session. */
+		sessions: Session[];
+	}
+
+	interface SessionChangedEvent extends chrome.events.Event<() => void> {}
+
+	/** The maximum number of sessions.Session that will be included in a requested list. */
+	export var MAX_SESSION_RESULTS: number;
+
+	/**
+	 * Gets the list of recently closed tabs and/or windows.
+	 * @param callback
+	 * Parameter sessions: The list of closed entries in reverse order that they were closed (the most recently closed tab or window will be at index 0). The entries may contain either tabs or windows.
+	 */
+	export function getRecentlyClosed(filter: Filter, callback: (sessions: Session[]) => void): void;
+	/**
+	 * Gets the list of recently closed tabs and/or windows.
+	 * @param callback
+	 * Parameter sessions: The list of closed entries in reverse order that they were closed (the most recently closed tab or window will be at index 0). The entries may contain either tabs or windows.
+	 */
+	export function getRecentlyClosed(callback: (sessions: Session[]) => void): void;
+	/**
+	 * Retrieves all devices with synced sessions.
+	 * @param callback
+	 * Parameter devices: The list of sessions.Device objects for each synced session, sorted in order from device with most recently modified session to device with least recently modified session. tabs.Tab objects are sorted by recency in the windows.Window of the sessions.Session objects.
+	 */
+	export function getDevices(filter: Filter, callback: (devices: Device[]) => void): void;
+	/**
+	 * Retrieves all devices with synced sessions.
+	 * @param callback
+	 * Parameter devices: The list of sessions.Device objects for each synced session, sorted in order from device with most recently modified session to device with least recently modified session. tabs.Tab objects are sorted by recency in the windows.Window of the sessions.Session objects.
+	 */
+	export function getDevices(callback: (devices: Device[]) => void): void;
+	/**
+	 * Reopens a windows.Window or tabs.Tab, with an optional callback to run when the entry has been restored.
+	 * @param sessionId Optional.
+	 * The windows.Window.sessionId, or tabs.Tab.sessionId to restore. If this parameter is not specified, the most recently closed session is restored.
+	 * @param callback Optional.
+	 * Parameter restoredSession: A sessions.Session containing the restored windows.Window or tabs.Tab object.
+	 */
+	export function restore(sessionId?: string, callback?: (restoredSession: Session) => void): void;
+
+	/** Fired when recently closed tabs and/or windows are changed. This event does not monitor synced sessions changes. */
+	export var onChanged: SessionChangedEvent;
+}
+
+////////////////////
+// Storage
+////////////////////
+/**
+ * Use the chrome.storage API to store, retrieve, and track changes to user data.
+ * Permissions:  "storage"
+ * @since Chrome 20.
+ */
+declare namespace chrome.storage {
+	interface StorageArea {
+		/**
+		 * Gets the amount of space (in bytes) being used by one or more items.
+		 * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
+		 * Parameter bytesInUse: Amount of space being used in storage, in bytes.
+		 */
+		getBytesInUse(callback: (bytesInUse: number) => void): void;
+		/**
+		 * Gets the amount of space (in bytes) being used by one or more items.
+		 * @param key A single key to get the total usage for. Pass in null to get the total usage of all of storage.
+		 * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
+		 * Parameter bytesInUse: Amount of space being used in storage, in bytes.
+		 */
+		getBytesInUse(key: string, callback: (bytesInUse: number) => void): void;
+		/**
+		 * Gets the amount of space (in bytes) being used by one or more items.
+		 * @param keys A list of keys to get the total usage for. An empty list will return 0. Pass in null to get the total usage of all of storage.
+		 * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
+		 * Parameter bytesInUse: Amount of space being used in storage, in bytes.
+		 */
+		getBytesInUse(keys: string[], callback: (bytesInUse: number) => void): void;
+		/**
+		 * Removes all items from storage.
+		 * @param callback Optional.
+		 * Callback on success, or on failure (in which case runtime.lastError will be set).
+		 */
+		clear(callback?: () => void): void;
+		/**
+		 * Sets multiple items.
+		 * @param items An object which gives each key/value pair to update storage with. Any other key/value pairs in storage will not be affected.
+		 * Primitive values such as numbers will serialize as expected. Values with a typeof "object" and "function" will typically serialize to {}, with the exception of Array (serializes as expected), Date, and Regex (serialize using their String representation).
+		 * @param callback Optional.
+		 * Callback on success, or on failure (in which case runtime.lastError will be set).
+		 */
+		set(items: Object, callback?: () => void): void;
+		/**
+		 * Removes one item from storage.
+		 * @param key A single key for items to remove.
+		 * @param callback Optional.
+		 * Callback on success, or on failure (in which case runtime.lastError will be set).
+		 */
+		remove(key: string, callback?: () => void): void;
+		/**
+		 * Removes items from storage.
+		 * @param keys A list of keys for items to remove.
+		 * @param callback Optional.
+		 * Callback on success, or on failure (in which case runtime.lastError will be set).
+		 */
+		remove(keys: string[], callback?: () => void): void;
+		/**
+		 * Gets one or more items from storage.
+		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+		 * Parameter items: Object with items in their key-value mappings.
+		 */
+		get(callback: (items: { [key: string]: any }) => void): void;
+		/**
+		 * Gets one or more items from storage.
+		 * @param key A single key to get. Pass in null to get the entire contents of storage.
+		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+		 * Parameter items: Object with items in their key-value mappings.
+		 */
+		get(key: string, callback: (items: { [key: string]: any }) => void): void;
+		/**
+		 * Gets one or more items from storage.
+		 * @param keys A list of keys to get. An empty list or object will return an empty result object. Pass in null to get the entire contents of storage.
+		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+		 * Parameter items: Object with items in their key-value mappings.
+		 */
+		get(keys: string[], callback: (items: { [key: string]: any }) => void): void;
+		/**
+		 * Gets one or more items from storage.
+		 * @param keys A dictionary specifying default values. Pass in null to get the entire contents of storage.
+		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+		 * Parameter items: Object with items in their key-value mappings.
+		 */
+		get(keys: Object, callback: (items: { [key: string]: any }) => void): void;
+	}
+
+	interface StorageChange {
+		/** Optional. The new value of the item, if there is a new value. */
+		newValue?: any;
+		/** Optional. The old value of the item, if there was an old value. */
+		oldValue?: any;
+	}
+
+	interface LocalStorageArea extends StorageArea {
+		/** The maximum amount (in bytes) of data that can be stored in local storage, as measured by the JSON stringification of every value plus every key's length. This value will be ignored if the extension has the unlimitedStorage permission. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
+		QUOTA_BYTES: number;
+	}
+
+	interface SyncStorageArea extends StorageArea {
+		/** @deprecated since Chrome 40. The storage.sync API no longer has a sustained write operation quota. */
+		MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: number;
+		/** The maximum total amount (in bytes) of data that can be stored in sync storage, as measured by the JSON stringification of every value plus every key's length. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
+		QUOTA_BYTES: number;
+		/** The maximum size (in bytes) of each individual item in sync storage, as measured by the JSON stringification of its value plus its key length. Updates containing items larger than this limit will fail immediately and set runtime.lastError. */
+		QUOTA_BYTES_PER_ITEM: number;
+		/** The maximum number of items that can be stored in sync storage. Updates that would cause this limit to be exceeded will fail immediately and set runtime.lastError. */
+		MAX_ITEMS: number;
+		/**
+		 * The maximum number of set, remove, or clear operations that can be performed each hour. This is 1 every 2 seconds, a lower ceiling than the short term higher writes-per-minute limit.
+		 * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
+		 */
+		MAX_WRITE_OPERATIONS_PER_HOUR: number;
+		/**
+		 * The maximum number of set, remove, or clear operations that can be performed each minute. This is 2 per second, providing higher throughput than writes-per-hour over a shorter period of time.
+		 * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
+		 * @since Chrome 40.
+		 */
+		MAX_WRITE_OPERATIONS_PER_MINUTE: number;
+	}
+
+	interface StorageChangedEvent extends chrome.events.Event<(changes: { [key: string]: StorageChange }, areaName: string) => void> {}
+
+	/** Items in the local storage area are local to each machine. */
+	var local: LocalStorageArea;
+	/** Items in the sync storage area are synced using Chrome Sync. */
+	var sync: SyncStorageArea;
+
+	/**
+	 * Items in the managed storage area are set by the domain administrator, and are read-only for the extension; trying to modify this namespace results in an error.
+	 * @since Chrome 33.
+	 */
+	var managed: StorageArea;
+
+	/** Fired when one or more items change. */
+	var onChanged: StorageChangedEvent;
+}
+
+////////////////////
+// Socket
+////////////////////
+declare namespace chrome.socket {
+    interface CreateInfo {
+        socketId: number;
+    }
+
+    interface AcceptInfo {
+        resultCode: number;
+        socketId?: number;
+    }
+
+    interface ReadInfo {
+        resultCode: number;
+        data: ArrayBuffer;
+    }
+
+    interface WriteInfo {
+        bytesWritten: number;
+    }
+
+    interface RecvFromInfo {
+        resultCode: number;
+        data: ArrayBuffer;
+        port: number;
+        address: string;
+    }
+
+    interface SocketInfo {
+        socketType: string;
+        localPort?: number;
+        peerAddress?: string;
+        peerPort?: number;
+        localAddress?: string;
+        connected: boolean;
+    }
+
+    interface NetworkInterface {
+        name: string;
+        address: string;
+    }
+
+    export function create(type: string, options?: Object, callback?: (createInfo: CreateInfo) => void): void;
+    export function destroy(socketId: number): void;
+    export function connect(socketId: number, hostname: string, port: number, callback: (result: number) => void): void;
+    export function bind(socketId: number, address: string, port: number, callback: (result: number) => void): void;
+    export function disconnect(socketId: number): void;
+    export function read(socketId: number, bufferSize?: number, callback?: (readInfo: ReadInfo) => void): void;
+    export function write(socketId: number, data: ArrayBuffer, callback?: (writeInfo: WriteInfo) => void): void;
+    export function recvFrom(socketId: number, bufferSize?: number, callback?: (recvFromInfo: RecvFromInfo) => void): void;
+    export function sendTo(socketId: number, data: ArrayBuffer, address: string, port: number, callback?: (writeInfo: WriteInfo) => void): void;
+    export function listen(socketId: number, address: string, port: number, backlog?: number, callback?: (result: number) => void): void;
+    export function accept(socketId: number, callback?: (acceptInfo: AcceptInfo) => void): void;
+    export function setKeepAlive(socketId: number, enable: boolean, delay?: number, callback?: (result: boolean) => void): void;
+    export function setNoDelay(socketId: number, noDelay: boolean, callback?: (result: boolean) => void): void;
+    export function getInfo(socketId: number, callback: (result: SocketInfo) => void): void;
+    export function getNetworkList(callback: (result: NetworkInterface[]) => void): void;
+}
+
+////////////////////
+// System CPU
+////////////////////
+/**
+ * Use the system.cpu API to query CPU metadata.
+ * Permissions: "system.cpu"
+ * @since Chrome 32.
+ */
+declare namespace chrome.system.cpu {
+	interface ProcessorUsage {
+		/** The cumulative time used by userspace programs on this processor. */
+		user: number;
+		/** The cumulative time used by kernel programs on this processor. */
+		kernel: number;
+		/** The cumulative time spent idle by this processor. */
+		idle: number;
+		/** The total cumulative time for this processor. This value is equal to user + kernel + idle. */
+		total: number;
+	}
+
+	interface ProcessorInfo {
+		/** Cumulative usage info for this logical processor. */
+		usage: ProcessorUsage;
+	}
+
+	interface CpuInfo {
+		/** The number of logical processors. */
+		numOfProcessors: number;
+		/** The architecture name of the processors. */
+		archName: string;
+		/** The model name of the processors. */
+		modelName: string;
+		/**
+		 * A set of feature codes indicating some of the processor's capabilities.
+		 * The currently supported codes are "mmx", "sse", "sse2", "sse3", "ssse3", "sse4_1", "sse4_2", and "avx".
+		 */
+		features: string[];
+		/** Information about each logical processor. */
+		processors: ProcessorInfo[];
+	}
+
+	/** Queries basic CPU information of the system. */
+	export function getInfo(callback: (info: CpuInfo) => void): void;
+}
+
+////////////////////
+// System Memory
+////////////////////
+/**
+ * The chrome.system.memory API.
+ * Permissions:  "system.memory"
+ * @since Chrome 32.
+ */
+declare namespace chrome.system.memory {
+	interface MemoryInfo {
+		/** The total amount of physical memory capacity, in bytes. */
+		capacity: number;
+		/** The amount of available capacity, in bytes. */
+		availableCapacity: number;
+	}
+
+	/** Get physical memory information. */
+	export function getInfo(callback: (info: MemoryInfo) => void): void;
+}
+
+////////////////////
+// System Storage
+////////////////////
+/**
+ * Use the chrome.system.storage API to query storage device information and be notified when a removable storage device is attached and detached.
+ * Permissions:  "system.storage"
+ * @since Chrome 30.
+ */
+declare namespace chrome.system.storage {
+	interface StorageUnitInfo {
+		/** The transient ID that uniquely identifies the storage device. This ID will be persistent within the same run of a single application. It will not be a persistent identifier between different runs of an application, or between different applications. */
+		id: string;
+		/** The name of the storage unit. */
+		name: string;
+		/**
+		 * The media type of the storage unit.
+		 * fixed: The storage has fixed media, e.g. hard disk or SSD.
+		 * removable: The storage is removable, e.g. USB flash drive.
+		 * unknown: The storage type is unknown.
+		 */
+		type: string;
+		/** The total amount of the storage space, in bytes. */
+		capacity: number;
+	}
+
+	interface StorageCapacityInfo {
+		/** A copied |id| of getAvailableCapacity function parameter |id|. */
+		id: string;
+		/** The available capacity of the storage device, in bytes. */
+		availableCapacity: number;
+	}
+
+	interface SystemStorageAttachedEvent extends chrome.events.Event<(info: StorageUnitInfo) => void> {}
+
+	interface SystemStorageDetachedEvent extends chrome.events.Event<(id: string) => void> {}
+
+	/** Get the storage information from the system. The argument passed to the callback is an array of StorageUnitInfo objects. */
+	export function getInfo(callback: (info: StorageUnitInfo[]) => void): void;
+	/**
+	 * Ejects a removable storage device.
+	 * @param callback
+	 * Parameter result: success: The ejection command is successful -- the application can prompt the user to remove the device; in_use: The device is in use by another application. The ejection did not succeed; the user should not remove the device until the other application is done with the device; no_such_device: There is no such device known. failure: The ejection command failed.
+	 */
+	export function ejectDevice(id: string, callback: (result: string) => void): void;
+	/**
+	 * Get the available capacity of a specified |id| storage device. The |id| is the transient device ID from StorageUnitInfo.
+	 * @since Dev channel only.
+	 */
+	export function getAvailableCapacity(id: string, callback: (info: StorageCapacityInfo) => void): void;
+
+	/** Fired when a new removable storage is attached to the system. */
+	export var onAttached: SystemStorageAttachedEvent;
+	/** Fired when a removable storage is detached from the system. */
+	export var onDetached: SystemStorageDetachedEvent;
+}
+
+////////////////////
+// TabCapture
+////////////////////
+/**
+ * Use the chrome.tabCapture API to interact with tab media streams.
+ * Permissions:  "tabCapture"
+ * @since Chrome 31.
+ */
+declare namespace chrome.tabCapture {
+    interface CaptureInfo {
+		/** The id of the tab whose status changed. */
+        tabId: number;
+		/**
+		 * The new capture status of the tab.
+		 * One of: "pending", "active", "stopped", or "error"
+		 */
+        status: string;
+		/** Whether an element in the tab being captured is in fullscreen mode. */
+        fullscreen: boolean;
+    }
+
+    interface CaptureOptions {
+		/** Optional. */
+        audio?: boolean;
+		/** Optional. */
+        video?: boolean;
+		/** Optional. */
+		audioConstraints?: MediaStreamConstraints;
+		/** Optional. */
+		videoConstraints?: MediaStreamConstraints;
+	}
+
+	interface CaptureStatusChangedEvent extends chrome.events.Event<(info: CaptureInfo) => void> {}
+
+	/**
+	 * Captures the visible area of the currently active tab. Capture can only be started on the currently active tab after the extension has been invoked. Capture is maintained across page navigations within the tab, and stops when the tab is closed, or the media stream is closed by the extension.
+	 * @param options Configures the returned media stream.
+	 * @param callback Callback with either the tab capture stream or null.
+	 */
+    export function capture(options: CaptureOptions, callback: (stream: MediaStream) => void): void;
+	/**
+	 * Returns a list of tabs that have requested capture or are being captured, i.e. status != stopped and status != error. This allows extensions to inform the user that there is an existing tab capture that would prevent a new tab capture from succeeding (or to prevent redundant requests for the same tab).
+	 * @param callback Callback invoked with CaptureInfo[] for captured tabs.
+	 */
+    export function getCapturedTabs(callback: (result: CaptureInfo[]) => void): void;
+
+	/** Event fired when the capture status of a tab changes. This allows extension authors to keep track of the capture status of tabs to keep UI elements like page actions in sync. */
+	var onStatusChanged: CaptureStatusChangedEvent;
+}
+
+////////////////////
+// Tabs
+////////////////////
+/**
+ * Use the chrome.tabs API to interact with the browser's tab system. You can use this API to create, modify, and rearrange tabs in the browser.
+ * Permissions: The majority of the chrome.tabs API can be used without declaring any permission. However, the "tabs" permission is required in order to populate the url, title, and favIconUrl properties of Tab.
+ * @since Chrome 5.
+ */
+declare namespace chrome.tabs {
+	/**
+	 * Tab muted state and the reason for the last state change.
+	 * @since Chrome 46. Warning: this is the current Beta channel.
+	 */
+	interface MutedInfo {
+		/** Whether the tab is prevented from playing sound (but hasn't necessarily recently produced sound). Equivalent to whether the muted audio indicator is showing. */
+		muted: boolean;
+		/**
+		 * Optional.
+		 * The reason the tab was muted or unmuted. Not set if the tab's mute state has never been changed.
+		 * "user": A user input action has set/overridden the muted state.
+		 * "capture": Tab capture started, forcing a muted state change.
+		 * "extension": An extension, identified by the extensionId field, set the muted state.
+		 */
+		reason?: string;
+		/**
+		 * Optional.
+		 * The ID of the extension that changed the muted state. Not set if an extension was not the reason the muted state last changed.
+		 */
+		extensionId?: string;
+	}
+
+    interface Tab {
+		/**
+		 * Optional.
+		 * Either loading or complete.
+		 */
+        status?: string;
+		/** The zero-based index of the tab within its window. */
+        index: number;
+		/**
+		 * Optional.
+		 * The ID of the tab that opened this tab, if any. This property is only present if the opener tab still exists.
+		 * @since Chrome 18.
+		 */
+        openerTabId?: number;
+		/**
+		 * Optional.
+		 * The title of the tab. This property is only present if the extension's manifest includes the "tabs" permission.
+		 */
+        title?: string;
+		/**
+		 * Optional.
+		 * The URL the tab is displaying. This property is only present if the extension's manifest includes the "tabs" permission.
+		 */
+        url?: string;
+		/**
+		 * Whether the tab is pinned.
+		 * @since Chrome 9.
+		 */
+        pinned: boolean;
+		/**
+		 * Whether the tab is highlighted.
+		 * @since Chrome 16.
+		 */
+        highlighted: boolean;
+		/** The ID of the window the tab is contained within. */
+        windowId: number;
+		/**
+		 * Whether the tab is active in its window. (Does not necessarily mean the window is focused.)
+		 * @since Chrome 16.
+		 */
+        active: boolean;
+		/**
+		 * Optional.
+		 * The URL of the tab's favicon. This property is only present if the extension's manifest includes the "tabs" permission. It may also be an empty string if the tab is loading.
+		 */
+        favIconUrl?: string;
+		/**
+		 * Optional.
+		 * The ID of the tab. Tab IDs are unique within a browser session. Under some circumstances a Tab may not be assigned an ID, for example when querying foreign tabs using the sessions API, in which case a session ID may be present. Tab ID can also be set to chrome.tabs.TAB_ID_NONE for apps and devtools windows.
+		 */
+		id?: number;
+		/** Whether the tab is in an incognito window. */
+        incognito: boolean;
+		/**
+		 * Whether the tab is selected.
+		 * @deprecated since Chrome 33. Please use tabs.Tab.highlighted.
+		 */
+		selected: boolean;
+		/**
+		 * Optional.
+		 * Whether the tab has produced sound over the past couple of seconds (but it might not be heard if also muted). Equivalent to whether the speaker audio indicator is showing.
+		 * @since Chrome 45.
+		 */
+		audible?: boolean;
+		/**
+		 * Optional.
+		 * Current tab muted state and the reason for the last state change.
+		 * @since Chrome 46. Warning: this is the current Beta channel.
+		 */
+		mutedInfo?: MutedInfo;
+		/**
+		 * Optional. The width of the tab in pixels.
+		 * @since Chrome 31.
+		 */
+		width?: number;
+		/**
+		 * Optional. The height of the tab in pixels.
+		 * @since Chrome 31.
+		 */
+		height?: number;
+		/**
+		 * Optional. The session ID used to uniquely identify a Tab obtained from the sessions API.
+		 * @since Chrome 31.
+		 */
+		sessionId?: string;
+    }
+
+	/**
+	 * Defines how zoom changes in a tab are handled and at what scope.
+	 * @since Chrome 38.
+	 */
+	interface ZoomSettings {
+		/**
+		 * Optional.
+		 * Defines how zoom changes are handled, i.e. which entity is responsible for the actual scaling of the page; defaults to "automatic".
+		 * "automatic": Zoom changes are handled automatically by the browser.
+		 * "manual": Overrides the automatic handling of zoom changes. The onZoomChange event will still be dispatched, and it is the responsibility of the extension to listen for this event and manually scale the page. This mode does not support per-origin zooming, and will thus ignore the scope zoom setting and assume per-tab.
+		 * "disabled": Disables all zooming in the tab. The tab will revert to the default zoom level, and all attempted zoom changes will be ignored.
+		 */
+		mode?: string;
+		/**
+		 * Optional.
+		 * Defines whether zoom changes will persist for the page's origin, or only take effect in this tab; defaults to per-origin when in automatic mode, and per-tab otherwise.
+		 * "per-origin": Zoom changes will persist in the zoomed page's origin, i.e. all other tabs navigated to that same origin will be zoomed as well. Moreover, per-origin zoom changes are saved with the origin, meaning that when navigating to other pages in the same origin, they will all be zoomed to the same zoom factor. The per-origin scope is only available in the automatic mode.
+		 * "per-tab": Zoom changes only take effect in this tab, and zoom changes in other tabs will not affect the zooming of this tab. Also, per-tab zoom changes are reset on navigation; navigating a tab will always load pages with their per-origin zoom factors.
+		 */
+		scope?: string;
+		/**
+		 * Optional.
+		 * Used to return the default zoom level for the current tab in calls to tabs.getZoomSettings.
+		 * @since Chrome 43.
+		 */
+		defaultZoomFactor?: number;
+	}
+
+    interface InjectDetails {
+		/**
+		 * Optional.
+		 * If allFrames is true, implies that the JavaScript or CSS should be injected into all frames of current page. By default, it's false and is only injected into the top frame.
+		 */
+        allFrames?: boolean;
+		/**
+		 * Optional. JavaScript or CSS code to inject.
+		 * Warning: Be careful using the code parameter. Incorrect use of it may open your extension to cross site scripting attacks.
+		 */
+        code?: string;
+		/**
+		 * Optional. The soonest that the JavaScript or CSS will be injected into the tab.
+		 * One of: "document_start", "document_end", or "document_idle"
+		 * @since Chrome 20.
+		 */
+        runAt?: string;
+		/** Optional. JavaScript or CSS file to inject. */
+        file?: string;
+		/**
+		 * Optional.
+		 * If matchAboutBlank is true, then the code is also injected in about:blank and about:srcdoc frames if your extension has access to its parent document. Code cannot be inserted in top-level about:-frames. By default it is false.
+		 * @since Chrome 39.
+		 */
+		matchAboutBlank?: boolean;
+    }
+
+    interface CreateProperties {
+		/** Optional. The position the tab should take in the window. The provided value will be clamped to between zero and the number of tabs in the window. */
+        index?: number;
+		/**
+		 * Optional.
+		 * The ID of the tab that opened this tab. If specified, the opener tab must be in the same window as the newly created tab.
+		 * @since Chrome 18.
+		 */
+        openerTabId?: number;
+		/**
+		 * Optional.
+		 * The URL to navigate the tab to initially. Fully-qualified URLs must include a scheme (i.e. 'http://www.google.com', not 'www.google.com'). Relative URLs will be relative to the current page within the extension. Defaults to the New Tab Page.
+		 */
+        url?: string;
+		/**
+		 * Optional. Whether the tab should be pinned. Defaults to false
+		 * @since Chrome 9.
+		 */
+        pinned?: boolean;
+		/** Optional. The window to create the new tab in. Defaults to the current window. */
+        windowId?: number;
+		/**
+		 * Optional.
+		 * Whether the tab should become the active tab in the window. Does not affect whether the window is focused (see windows.update). Defaults to true.
+		 * @since Chrome 16.
+		 */
+        active?: boolean;
+		/**
+		 * Optional. Whether the tab should become the selected tab in the window. Defaults to true
+		 * @deprecated since Chrome 33. Please use active.
+		 */
+		selected?: boolean;
+    }
+
+    interface MoveProperties {
+		/** The position to move the window to. -1 will place the tab at the end of the window. */
+        index: number;
+		/** Optional. Defaults to the window the tab is currently in. */
+        windowId?: number;
+    }
+
+    interface UpdateProperties {
+		/**
+		 * Optional. Whether the tab should be pinned.
+		 * @since Chrome 9.
+		 */
+        pinned?: boolean;
+		/**
+		 * Optional. The ID of the tab that opened this tab. If specified, the opener tab must be in the same window as this tab.
+		 * @since Chrome 18.
+		 */
+        openerTabId?: number;
+		/** Optional. A URL to navigate the tab to. */
+        url?: string;
+		/**
+		 * Optional. Adds or removes the tab from the current selection.
+		 * @since Chrome 16.
+		 */
+        highlighted?: boolean;
+		/**
+		 * Optional. Whether the tab should be active. Does not affect whether the window is focused (see windows.update).
+		 * @since Chrome 16.
+		 */
+        active?: boolean;
+		/**
+		 * Optional. Whether the tab should be selected.
+		 * @deprecated since Chrome 33. Please use highlighted.
+		 */
+		selected?: boolean;
+		/**
+		 * Optional. Whether the tab should be muted.
+		 * @since Chrome 45.
+		 */
+		muted?: boolean;
+    }
+
+    interface CaptureVisibleTabOptions {
+		/**
+		 * Optional.
+		 * When format is "jpeg", controls the quality of the resulting image. This value is ignored for PNG images. As quality is decreased, the resulting image will have more visual artifacts, and the number of bytes needed to store it will decrease.
+		 */
+        quality?: number;
+		/**
+		 * Optional. The format of an image.
+		 * One of: "jpeg", or "png"
+		 */
+        format?: string;
+    }
+
+    interface ReloadProperties {
+		/** Optional. Whether using any local cache. Default is false. */
+        bypassCache?: boolean;
+    }
+
+    interface ConnectInfo {
+		/** Optional. Will be passed into onConnect for content scripts that are listening for the connection event. */
+        name?: string;
+		/**
+		 * Open a port to a specific frame identified by frameId instead of all frames in the tab.
+		 * @since Chrome 41.
+		 */
+		frameId?: number;
+    }
+
+	interface MessageSendOptions {
+		/** Optional. Send a message to a specific frame identified by frameId instead of all frames in the tab. */
+		frameId?: number;
+	}
+
+    interface HighlightInfo {
+		/** One or more tab indices to highlight. */
+		tabs: number | number[];
+		/** Optional. The window that contains the tabs. */
+        windowId?: number;
+    }
+
+    interface QueryInfo {
+		/**
+		 * Optional. Whether the tabs have completed loading.
+		 * One of: "loading", or "complete"
+		 */
+        status?: string;
+		/**
+		 * Optional. Whether the tabs are in the last focused window.
+		 * @since Chrome 19.
+		 */
+        lastFocusedWindow?: boolean;
+		/** Optional. The ID of the parent window, or windows.WINDOW_ID_CURRENT for the current window. */
+        windowId?: number;
+		/**
+		 * Optional. The type of window the tabs are in.
+		 * One of: "normal", "popup", "panel", "app", or "devtools"
+		 */
+        windowType?: string;
+		/** Optional. Whether the tabs are active in their windows. */
+        active?: boolean;
+		/**
+		 * Optional. The position of the tabs within their windows.
+		 * @since Chrome 18.
+		 */
+        index?: number;
+		/** Optional. Match page titles against a pattern. */
+        title?: string;
+		/** Optional. Match tabs against one or more URL patterns. Note that fragment identifiers are not matched. */
+        url?: string | string[];
+		/**
+		 * Optional. Whether the tabs are in the current window.
+		 * @since Chrome 19.
+		 */
+        currentWindow?: boolean;
+		/** Optional. Whether the tabs are highlighted. */
+        highlighted?: boolean;
+		/** Optional. Whether the tabs are pinned. */
+        pinned?: boolean;
+		/**
+		 * Optional. Whether the tabs are audible.
+		 * @since Chrome 45.
+		 */
+		audible?: boolean;
+		/**
+		 * Optional. Whether the tabs are muted.
+		 * @since Chrome 45.
+		 */
+		muted?: boolean;
+    }
+
+    interface TabHighlightInfo {
+        windowId: number;
+        tabIds: number[];
+    }
+
+    interface TabRemoveInfo {
+		/**
+		 * The window whose tab is closed.
+		 * @since Chrome 25.
+		 */
+        windowId: number;
+		/** True when the tab is being closed because its window is being closed. */
+        isWindowClosing: boolean;
+    }
+
+    interface TabAttachInfo {
+        newPosition: number;
+        newWindowId: number;
+    }
+
+    interface TabChangeInfo {
+		/** Optional. The status of the tab. Can be either loading or complete. */
+        status?: string;
+		/**
+		 * The tab's new pinned state.
+		 * @since Chrome 9.
+		 */
+        pinned?: boolean;
+		/** Optional. The tab's URL if it has changed. */
+        url?: string;
+		/**
+		 * The tab's new audible state.
+		 * @since Chrome 45.
+		 */
+		audible?: boolean;
+		/**
+		 * The tab's new muted state and the reason for the change.
+		 * @since Chrome 46. Warning: this is the current Beta channel.
+		 */
+		mutedInfo?: MutedInfo;
+		/**
+		 * The tab's new favicon URL.
+		 * @since Chrome 27.
+		 */
+		faviconUrl?: string;
+    }
+
+    interface TabMoveInfo {
+        toIndex: number;
+        windowId: number;
+        fromIndex: number;
+    }
+
+    interface TabDetachInfo {
+        oldWindowId: number;
+        oldPosition: number;
+    }
+
+    interface TabActiveInfo {
+		/** The ID of the tab that has become active. */
+        tabId: number;
+		/** The ID of the window the active tab changed inside of. */
+        windowId: number;
+    }
+
+	interface TabWindowInfo {
+		/** The ID of the window of where the tab is located. */
+		windowId: number;
+	}
+
+	interface ZoomChangeInfo {
+		tabId: number;
+		oldZoomFactor: number;
+		newZoomFactor: number;
+		zoomSettings: ZoomSettings;
+	}
+
+    interface TabHighlightedEvent extends chrome.events.Event<(highlightInfo: HighlightInfo) => void> {}
+
+    interface TabRemovedEvent extends chrome.events.Event<(tabId: number, removeInfo: TabRemoveInfo) => void> {}
+
+    interface TabUpdatedEvent extends chrome.events.Event<(tabId: number, changeInfo: TabChangeInfo, tab: Tab) => void> {}
+
+    interface TabAttachedEvent extends chrome.events.Event<(tabId: number, attachInfo: TabAttachInfo) => void> {}
+
+    interface TabMovedEvent extends chrome.events.Event<(tabId: number, moveInfo: TabMoveInfo) => void> {}
+
+    interface TabDetachedEvent extends chrome.events.Event<(tabId: number, detachInfo: TabDetachInfo) => void> {}
+
+    interface TabCreatedEvent extends chrome.events.Event<(tab: Tab) => void> {}
+
+    interface TabActivatedEvent extends chrome.events.Event<(activeInfo: TabActiveInfo) => void> {}
+
+    interface TabReplacedEvent extends chrome.events.Event<(addedTabId: number, removedTabId: number) => void> {}
+
+	interface TabSelectedEvent extends chrome.events.Event<(tabId: number, selectInfo: TabWindowInfo) => void> {}
+
+	interface TabZoomChangeEvent extends chrome.events.Event<(ZoomChangeInfo: ZoomChangeInfo) => void> {}
+
+	/**
+	 * Injects JavaScript code into a page. For details, see the programmatic injection section of the content scripts doc.
+	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
+	 * @param callback Optional. Called after all the JavaScript has been executed.
+	 * Parameter result: The result of the script in every injected frame.
+	 */
+    export function executeScript(details: InjectDetails, callback?: (result: any[]) => void): void;
+	/**
+	 * Injects JavaScript code into a page. For details, see the programmatic injection section of the content scripts doc.
+	 * @param tabId Optional. The ID of the tab in which to run the script; defaults to the active tab of the current window.
+	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
+	 * @param callback Optional. Called after all the JavaScript has been executed.
+	 * Parameter result: The result of the script in every injected frame.
+	 */
+    export function executeScript(tabId: number, details: InjectDetails, callback?: (result: any[]) => void): void;
+	/** Retrieves details about the specified tab. */
+    export function get(tabId: number, callback: (tab: Tab) => void): void;
+	/**
+	 * Gets details about all tabs in the specified window.
+	 * @deprecated since Chrome 33. Please use tabs.query {windowId: windowId}.
+	 */
+	export function getAllInWindow(callback: (tab: Tab) => void): void;
+	/**
+	 * Gets details about all tabs in the specified window.
+	 * @deprecated since Chrome 33. Please use tabs.query {windowId: windowId}.
+	 * @param windowId Optional. Defaults to the current window.
+	 */
+	export function getAllInWindow(windowId: number, callback: (tab: Tab) => void): void;
+	/** Gets the tab that this script call is being made from. May be undefined if called from a non-tab context (for example: a background page or popup view). */
+    export function getCurrent(callback: (tab?: Tab) => void): void;
+	/**
+	 * Gets the tab that is selected in the specified window.
+	 * @deprecated since Chrome 33. Please use tabs.query {active: true}.
+	 */
+	export function getSelected(callback: (tab: Tab) => void): void;
+	/**
+	 * Gets the tab that is selected in the specified window.
+	 * @deprecated since Chrome 33. Please use tabs.query {active: true}.
+	 * @param windowId Optional. Defaults to the current window.
+	 */
+	export function getSelected(windowId: number, callback: (tab: Tab) => void): void;
+	/**
+	 * Creates a new tab.
+	 * @param callback Optional.
+	 * Parameter tab: Details about the created tab. Will contain the ID of the new tab.
+	 */
+    export function create(createProperties: CreateProperties, callback?: (tab: Tab) => void): void;
+	/**
+	 * Moves one or more tabs to a new position within its window, or to a new window. Note that tabs can only be moved to and from normal (window.type === "normal") windows.
+	 * @param tabId The tab to move.
+	 * @param callback Optional.
+	 * Parameter tab: Details about the moved tab.
+	 */
+    export function move(tabId: number, moveProperties: MoveProperties, callback?: (tab: Tab) => void): void;
+	/**
+	 * Moves one or more tabs to a new position within its window, or to a new window. Note that tabs can only be moved to and from normal (window.type === "normal") windows.
+	 * @param tabIds The tabs to move.
+	 * @param callback Optional.
+	 * Parameter tabs: Details about the moved tabs.
+	 */
+    export function move(tabIds: number[], moveProperties: MoveProperties, callback?: (tabs: Tab[]) => void): void;
+	/**
+	 * Modifies the properties of a tab. Properties that are not specified in updateProperties are not modified.
+	 * @param callback Optional.
+	 * Optional parameter tab: Details about the updated tab. The tabs.Tab object doesn't contain url, title and favIconUrl if the "tabs" permission has not been requested.
+	 */
+    export function update(updateProperties: UpdateProperties, callback?: (tab?: Tab) => void): void;
+	/**
+	 * Modifies the properties of a tab. Properties that are not specified in updateProperties are not modified.
+	 * @param tabId Defaults to the selected tab of the current window.
+	 * @param callback Optional.
+	 * Optional parameter tab: Details about the updated tab. The tabs.Tab object doesn't contain url, title and favIconUrl if the "tabs" permission has not been requested.
+	 */
+    export function update(tabId: number, updateProperties: UpdateProperties, callback?: (tab?: Tab) => void): void;
+	/**
+	 * Closes a tab.
+	 * @param tabId The tab to close.
+	 */
+    export function remove(tabId: number, callback?: Function): void;
+	/**
+	 * Closes several tabs.
+	 * @param tabIds The list of tabs to close.
+	 */
+    export function remove(tabIds: number[], callback?: Function): void;
+	/**
+	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method.
+	 * @param callback
+	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
+	 */
+    export function captureVisibleTab(callback: (dataUrl: string) => void): void;
+	/**
+	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method.
+	 * @param windowId Optional. The target window. Defaults to the current window.
+	 * @param callback
+	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
+	 */
+    export function captureVisibleTab(windowId: number, callback: (dataUrl: string) => void): void;
+	/**
+	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method.
+	 * @param options Optional. Details about the format and quality of an image.
+	 * @param callback
+	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
+	 */
+    export function captureVisibleTab(options: CaptureVisibleTabOptions, callback: (dataUrl: string) => void): void;
+	/**
+	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method.
+	 * @param windowId Optional. The target window. Defaults to the current window.
+	 * @param options Optional. Details about the format and quality of an image.
+	 * @param callback
+	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
+	 */
+    export function captureVisibleTab(windowId: number, options: CaptureVisibleTabOptions, callback: (dataUrl: string) => void): void;
+	/**
+	 * Reload a tab.
+	 * @since Chrome 16.
+	 * @param tabId The ID of the tab to reload; defaults to the selected tab of the current window.
+	 */
+	export function reload(tabId: number, reloadProperties?: ReloadProperties, callback?: () => void): void;
+	/**
+	 * Reload the selected tab of the current window.
+	 * @since Chrome 16.
+	 */
+	export function reload(reloadProperties: ReloadProperties, callback?: () => void): void;
+	/**
+	 * Reload the selected tab of the current window.
+ 	 * @since Chrome 16.
+	 */
+	export function reload(callback?: () => void): void;
+	/**
+	 * Duplicates a tab.
+	 * @since Chrome 23.
+	 * @param tabId The ID of the tab which is to be duplicated.
+	 * @param callback Optional.
+	 * Optional parameter tab: Details about the duplicated tab. The tabs.Tab object doesn't contain url, title and favIconUrl if the "tabs" permission has not been requested.
+	 */
+    export function duplicate(tabId: number, callback?: (tab?: Tab) => void): void;
+	/**
+	 * Sends a single message to the content script(s) in the specified tab, with an optional callback to run when a response is sent back. The runtime.onMessage event is fired in each content script running in the specified tab for the current extension.
+	 * @since Chrome 20.
+	 */
+    export function sendMessage(tabId: number, message: any, responseCallback?: (response: any) => void): void;
+	/**
+	 * Sends a single message to the content script(s) in the specified tab, with an optional callback to run when a response is sent back. The runtime.onMessage event is fired in each content script running in the specified tab for the current extension.
+	 * @since Chrome 41.
+	 * @param responseCallback Optional.
+	 * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the specified tab, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+	 */
+	export function sendMessage(tabId: number, message: any, options: MessageSendOptions, responseCallback?: (response: any) => void): void;
+	/**
+	 * Sends a single request to the content script(s) in the specified tab, with an optional callback to run when a response is sent back. The extension.onRequest event is fired in each content script running in the specified tab for the current extension.
+	 * @deprecated since Chrome 33. Please use runtime.sendMessage.
+	 * @param responseCallback Optional.
+	 * Parameter response: The JSON response object sent by the handler of the request. If an error occurs while connecting to the specified tab, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+	 */
+	export function sendRequest(tabId: number, request: any, responseCallback?: (response: any) => void): void;
+	/** Connects to the content script(s) in the specified tab. The runtime.onConnect event is fired in each content script running in the specified tab for the current extension. */
+    export function connect(tabId: number, connectInfo?: ConnectInfo): runtime.Port;
+	/**
+	 * Injects CSS into a page. For details, see the programmatic injection section of the content scripts doc.
+	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
+	 * @param callback Optional. Called when all the CSS has been inserted.
+	 */
+	export function insertCSS(details: InjectDetails, callback?: Function): void;
+	/**
+	 * Injects CSS into a page. For details, see the programmatic injection section of the content scripts doc.
+	 * @param tabId Optional. The ID of the tab in which to insert the CSS; defaults to the active tab of the current window.
+	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
+	 * @param callback Optional. Called when all the CSS has been inserted.
+	 */
+    export function insertCSS(tabId: number, details: InjectDetails, callback?: Function): void;
+	/**
+	 * Highlights the given tabs.
+	 * @since Chrome 16.
+	 * @param callback Optional.
+	 * Parameter window: Contains details about the window whose tabs were highlighted.
+	 */
+    export function highlight(highlightInfo: HighlightInfo, callback: (window: chrome.windows.Window) => void): void;
+	/**
+	 * Gets all tabs that have the specified properties, or all tabs if no properties are specified.
+	 * @since Chrome 16.
+	 */
+    export function query(queryInfo: QueryInfo, callback: (result: Tab[]) => void): void;
+	/**
+	 * Detects the primary language of the content in a tab.
+	 * @param callback
+	 * Parameter language: An ISO language code such as en or fr. For a complete list of languages supported by this method, see kLanguageInfoTable. The 2nd to 4th columns will be checked and the first non-NULL value will be returned except for Simplified Chinese for which zh-CN will be returned. For an unknown language, und will be returned.
+	 */
+    export function detectLanguage(callback: (language: string) => void): void;
+	/**
+	 * Detects the primary language of the content in a tab.
+	 * @param tabId Optional. Defaults to the active tab of the current window.
+	 * @param callback
+	 * Parameter language: An ISO language code such as en or fr. For a complete list of languages supported by this method, see kLanguageInfoTable. The 2nd to 4th columns will be checked and the first non-NULL value will be returned except for Simplified Chinese for which zh-CN will be returned. For an unknown language, und will be returned.
+	 */
+    export function detectLanguage(tabId: number, callback: (language: string) => void): void;
+	/**
+	 * Zooms a specified tab.
+	 * @since Chrome 42.
+	 * @param zoomFactor The new zoom factor. Use a value of 0 here to set the tab to its current default zoom factor. Values greater than zero specify a (possibly non-default) zoom factor for the tab.
+	 * @param callback Optional. Called after the zoom factor has been changed.
+	 */
+	export function setZoom(zoomFactor: number, callback?: () => void): void;
+	/**
+	 * Zooms a specified tab.
+	 * @since Chrome 42.
+	 * @param tabId Optional. The ID of the tab to zoom; defaults to the active tab of the current window.
+	 * @param zoomFactor The new zoom factor. Use a value of 0 here to set the tab to its current default zoom factor. Values greater than zero specify a (possibly non-default) zoom factor for the tab.
+	 * @param callback Optional. Called after the zoom factor has been changed.
+	 */
+	export function setZoom(tabId: number, zoomFactor: number, callback?: () => void): void;
+	/**
+	 * Gets the current zoom factor of a specified tab.
+	 * @since Chrome 42.
+	 * @param callback Called with the tab's current zoom factor after it has been fetched.
+	 * Parameter zoomFactor: The tab's current zoom factor.
+	 */
+	export function getZoom(callback: (zoomFactor: number) => void): void;
+	/**
+	 * Gets the current zoom factor of a specified tab.
+	 * @since Chrome 42.
+	 * @param tabId Optional. The ID of the tab to get the current zoom factor from; defaults to the active tab of the current window.
+	 * @param callback Called with the tab's current zoom factor after it has been fetched.
+	 * Parameter zoomFactor: The tab's current zoom factor.
+	 */
+	export function getZoom(tabId: number, callback: (zoomFactor: number) => void): void;
+	/**
+	 * Sets the zoom settings for a specified tab, which define how zoom changes are handled. These settings are reset to defaults upon navigating the tab.
+	 * @since Chrome 42.
+	 * @param zoomSettings Defines how zoom changes are handled and at what scope.
+	 * @param callback Optional. Called after the zoom settings have been changed.
+	 */
+	export function setZoomSettings(zoomSettings: ZoomSettings, callback?: () => void): void;
+	/**
+	 * Sets the zoom settings for a specified tab, which define how zoom changes are handled. These settings are reset to defaults upon navigating the tab.
+	 * @since Chrome 42.
+	 * @param tabId Optional. The ID of the tab to change the zoom settings for; defaults to the active tab of the current window.
+	 * @param zoomSettings Defines how zoom changes are handled and at what scope.
+	 * @param callback Optional. Called after the zoom settings have been changed.
+	 */
+	export function setZoomSettings(tabId: number, zoomSettings: ZoomSettings, callback?: () => void): void;
+	/**
+	 * Gets the current zoom settings of a specified tab.
+	 * @since Chrome 42.
+	 * @param callback Called with the tab's current zoom settings.
+	 * Paramater zoomSettings: The tab's current zoom settings.
+	 */
+	export function getZoomSettings(callback: (zoomSettings: ZoomSettings) => void): void;
+	/**
+	 * Gets the current zoom settings of a specified tab.
+	 * @since Chrome 42.
+	 * @param tabId Optional. The ID of the tab to get the current zoom settings from; defaults to the active tab of the current window.
+	 * @param callback Called with the tab's current zoom settings.
+	 * Paramater zoomSettings: The tab's current zoom settings.
+	 */
+	export function getZoomSettings(tabId: number, callback: (zoomSettings: ZoomSettings) => void): void;
+
+	/**
+	 * Fired when the highlighted or selected tabs in a window changes.
+	 * @since Chrome 18.
+	 */
+    var onHighlighted: TabHighlightedEvent;
+	/** Fired when a tab is closed. */
+    var onRemoved: TabRemovedEvent;
+	/** Fired when a tab is updated. */
+    var onUpdated: TabUpdatedEvent;
+	/** Fired when a tab is attached to a window, for example because it was moved between windows. */
+    var onAttached: TabAttachedEvent;
+	/**
+	 * Fired when a tab is moved within a window. Only one move event is fired, representing the tab the user directly moved. Move events are not fired for the other tabs that must move in response. This event is not fired when a tab is moved between windows. For that, see tabs.onDetached.
+	 */
+    var onMoved: TabMovedEvent;
+	/** Fired when a tab is detached from a window, for example because it is being moved between windows. */
+    var onDetached: TabDetachedEvent;
+	/** Fired when a tab is created. Note that the tab's URL may not be set at the time this event fired, but you can listen to onUpdated events to be notified when a URL is set. */
+    var onCreated: TabCreatedEvent;
+	/**
+	 * Fires when the active tab in a window changes. Note that the tab's URL may not be set at the time this event fired, but you can listen to onUpdated events to be notified when a URL is set.
+	 * @since Chrome 18.
+	 */
+    var onActivated: TabActivatedEvent;
+	/**
+	 * Fired when a tab is replaced with another tab due to prerendering or instant.
+	 * @since Chrome 26.
+	 */
+    var onReplaced: TabReplacedEvent;
+	/**
+	 * @deprecated since Chrome 33. Please use tabs.onActivated.
+	 * Fires when the selected tab in a window changes.
+	 */
+	var onSelectionChanged: TabSelectedEvent;
+	/**
+	 * @deprecated since Chrome 33. Please use tabs.onActivated.
+	 * Fires when the selected tab in a window changes. Note that the tab's URL may not be set at the time this event fired, but you can listen to tabs.onUpdated events to be notified when a URL is set.
+	 */
+	var onActiveChanged: TabSelectedEvent;
+	/**
+	 * @deprecated since Chrome 33. Please use tabs.onHighlighted.
+	 * Fired when the highlighted or selected tabs in a window changes.
+	 */
+	var onHighlightChanged: TabHighlightedEvent;
+	/**
+	 * Fired when a tab is zoomed.
+	 * @since Chrome 38.
+	 */
+	var onZoomChange: TabZoomChangeEvent;
+}
+
+////////////////////
+// Top Sites
+////////////////////
+/**
+ * Use the chrome.topSites API to access the top sites that are displayed on the new tab page.
+ * Permissions:  "topSites"
+ * @since Chrome 19.
+ */
+declare namespace chrome.topSites {
+	/** An object encapsulating a most visited URL, such as the URLs on the new tab page. */
+    interface MostVisitedURL {
+		/** The most visited URL. */
+        url: string;
+		/** The title of the page */
+        title: string;
+    }
+
+	/** Gets a list of top sites. */
+	export function get(callback: (data: MostVisitedURL[]) => void): void;
+}
+
+////////////////////
+// Text to Speech
+////////////////////
+/**
+ * Use the chrome.tts API to play synthesized text-to-speech (TTS). See also the related ttsEngine API, which allows an extension to implement a speech engine.
+ * Permissions:  "tts"
+ * @since Chrome 14.
+ */
+declare namespace chrome.tts {
+	/** An event from the TTS engine to communicate the status of an utterance. */
+    interface TtsEvent {
+		/** Optional. The index of the current character in the utterance. */
+        charIndex?: number;
+		/** Optional. The error description, if the event type is 'error'. */
+        errorMessage?: string;
+		/**
+		 * The type can be 'start' as soon as speech has started, 'word' when a word boundary is reached, 'sentence' when a sentence boundary is reached, 'marker' when an SSML mark element is reached, 'end' when the end of the utterance is reached, 'interrupted' when the utterance is stopped or interrupted before reaching the end, 'cancelled' when it's removed from the queue before ever being synthesized, or 'error' when any other error occurs. When pausing speech, a 'pause' event is fired if a particular utterance is paused in the middle, and 'resume' if an utterance resumes speech. Note that pause and resume events may not fire if speech is paused in-between utterances.
+		 * One of: "start", "end", "word", "sentence", "marker", "interrupted", "cancelled", "error", "pause", or "resume"
+		 */
+        type: string;
+    }
+
+	/** A description of a voice available for speech synthesis. */
+    interface TtsVoice {
+		/** Optional. The language that this voice supports, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
+        lang?: string;
+		/**
+		 * Optional. This voice's gender.
+		 * One of: "male", or "female"
+		 */
+        gender?: string;
+		/** Optional. The name of the voice. */
+        voiceName?: string;
+		/** The ID of the extension providing this voice. */
+        extensionsId?: string;
+		/** All of the callback event types that this voice is capable of sending. */
+        eventTypes?: string[];
+		/**
+		 * If true, the synthesis engine is a remote network resource. It may be higher latency and may incur bandwidth costs.
+		 * @since Chrome 33.
+		 */
+		remote?: boolean;
+    }
+
+    interface SpeakOptions {
+		/** Optional. Speaking volume between 0 and 1 inclusive, with 0 being lowest and 1 being highest, with a default of 1.0. */
+        volume?: number;
+		/**
+		 * Optional.
+		 * If true, enqueues this utterance if TTS is already in progress. If false (the default), interrupts any current speech and flushes the speech queue before speaking this new utterance.
+		 */
+        enqueue?: boolean;
+		/**
+		 * Optional.
+		 * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. Values below 0.1 or above 10.0 are strictly disallowed, but many voices will constrain the minimum and maximum rates further—for example a particular voice may not actually speak faster than 3 times normal even if you specify a value larger than 3.0.
+		 */
+        rate?: number;
+		/**
+		 * Optional. This function is called with events that occur in the process of speaking the utterance.
+		 * @param event The update event from the text-to-speech engine indicating the status of this utterance.
+		 */
+        onEvent?: (event: TtsEvent) => void;
+		/**
+		 * Optional.
+		 * Speaking pitch between 0 and 2 inclusive, with 0 being lowest and 2 being highest. 1.0 corresponds to a voice's default pitch.
+		 */
+        pitch?: number;
+		/** Optional. The language to be used for synthesis, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
+        lang?: string;
+		/** Optional. The name of the voice to use for synthesis. If empty, uses any available voice. */
+        voiceName?: string;
+		/** Optional. The extension ID of the speech engine to use, if known. */
+        extensionId?: string;
+		/**
+		 * Optional. Gender of voice for synthesized speech.
+		 * One of: "male", or "female"
+		 */
+        gender?: string;
+		/** Optional. The TTS event types the voice must support. */
+        requiredEventTypes?: string[];
+		/** Optional. The TTS event types that you are interested in listening to. If missing, all event types may be sent. */
+        desiredEventTypes?: string[];
+    }
+
+	/** Checks whether the engine is currently speaking. On Mac OS X, the result is true whenever the system speech engine is speaking, even if the speech wasn't initiated by Chrome. */
+    export function isSpeaking(callback?: (speaking: boolean) => void): void;
+	/** Stops any current speech and flushes the queue of any pending utterances. In addition, if speech was paused, it will now be un-paused for the next call to speak. */
+    export function stop(): void;
+	/** Gets an array of all available voices. */
+    export function getVoices(callback?: (voices: TtsVoice[]) => void): void;
+	/**
+	 * Speaks text using a text-to-speech engine.
+	 * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
+	 * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
+	 */
+	export function speak(utterance: string, callback?: Function): void;
+	/**
+	 * Speaks text using a text-to-speech engine.
+	 * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
+	 * @param options Optional. The speech options.
+	 * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
+	 */
+	export function speak(utterance: string, options: SpeakOptions, callback?: Function): void;
+	/**
+	 * Pauses speech synthesis, potentially in the middle of an utterance. A call to resume or stop will un-pause speech.
+	 * @since Chrome 29.
+	 */
+	export function pause(): void;
+	/**
+	 * If speech was paused, resumes speaking where it left off.
+	 * @since Chrome 29.
+	 */
+	export function resume(): void;
+}
+
+////////////////////
+// Text to Speech Engine
+////////////////////
+/**
+ * Use the chrome.ttsEngine API to implement a text-to-speech(TTS) engine using an extension. If your extension registers using this API, it will receive events containing an utterance to be spoken and other parameters when any extension or Chrome App uses the tts API to generate speech. Your extension can then use any available web technology to synthesize and output the speech, and send events back to the calling function to report the status.
+ * Permissions:  "ttsEngine"
+ * @since Chrome 14.
+ */
+declare namespace chrome.ttsEngine {
+    interface SpeakOptions {
+		/** Optional. The language to be used for synthesis, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
+        lang?: string;
+		/** Optional. The name of the voice to use for synthesis. */
+        voiceName?: string;
+		/**
+		 * Optional. Gender of voice for synthesized speech.
+		 * One of: "male", or "female"
+		 */
+        gender?: string;
+		/** Optional. Speaking volume between 0 and 1 inclusive, with 0 being lowest and 1 being highest, with a default of 1.0. */
+        volume?: number;
+		/**
+		 * Optional.
+		 * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. This value is guaranteed to be between 0.1 and 10.0, inclusive. When a voice does not support this full range of rates, don't return an error. Instead, clip the rate to the range the voice supports.
+		 */
+        rate?: number;
+		/** Optional. Speaking pitch between 0 and 2 inclusive, with 0 being lowest and 2 being highest. 1.0 corresponds to this voice's default pitch. */
+        pitch?: number;
+    }
+
+    interface TtsEngineSpeakEvent extends chrome.events.Event<(utterance: string, options: SpeakOptions, sendTtsEvent: (event: chrome.tts.TtsEvent) => void) => void> {}
+
+	/** Called when the user makes a call to tts.speak() and one of the voices from this extension's manifest is the first to match the options object. */
+    var onSpeak: TtsEngineSpeakEvent;
+	/** Fired when a call is made to tts.stop and this extension may be in the middle of speaking. If an extension receives a call to onStop and speech is already stopped, it should do nothing (not raise an error). If speech is in the paused state, this should cancel the paused state. */
+	var onStop: chrome.events.Event<() => void>;
+	/**
+	 * Optional: if an engine supports the pause event, it should pause the current utterance being spoken, if any, until it receives a resume event or stop event. Note that a stop event should also clear the paused state.
+	 * @since Chrome 29.
+	 */
+	var onPause: chrome.events.Event<() => void>;
+	/**
+	 * Optional: if an engine supports the pause event, it should also support the resume event, to continue speaking the current utterance, if any. Note that a stop event should also clear the paused state.
+	 * @since Chrome 29.
+	 */
+	var onResume: chrome.events.Event<() => void>;
+}
+
+////////////////////
+// Types
+////////////////////
+/**
+ * The chrome.types API contains type declarations for Chrome.
+ * @since Chrome 13.
+ */
+declare namespace chrome.types {
+    interface ChromeSettingClearDetails {
+		/**
+		 * Optional.
+		 * The scope of the ChromeSetting. One of
+		 * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+		 * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+		 * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+		 * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+		 */
+        scope?: string;
+    }
+
+    interface ChromeSettingSetDetails extends ChromeSettingClearDetails {
+		/**
+		 * The value of the setting.
+		 * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
+		 */
+        value: any;
+		/**
+		 * Optional.
+		 * The scope of the ChromeSetting. One of
+		 * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+		 * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+		 * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+		 * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+		 */
+		scope?: string;
+    }
+
+    interface ChromeSettingGetDetails {
+		/** Optional. Whether to return the value that applies to the incognito session (default false). */
+        incognito?: boolean;
+    }
+
+	/**
+	 * @param details Details of the currently effective value.
+	 */
+    type DetailsCallback = (details: ChromeSettingGetResultDetails) => void;
+
+    interface ChromeSettingGetResultDetails {
+		/**
+		 * One of
+		 * • not_controllable: cannot be controlled by any extension
+		 * • controlled_by_other_extensions: controlled by extensions with higher precedence
+		 * • controllable_by_this_extension: can be controlled by this extension
+		 * • controlled_by_this_extension: controlled by this extension
+		 */
+        levelOfControl: string;
+		/** The value of the setting. */
+        value: any;
+		/**
+		 * Optional.
+		 * Whether the effective value is specific to the incognito session.
+		 * This property will only be present if the incognito property in the details parameter of get() was true.
+		 */
+        incognitoSpecific?: boolean;
+    }
+
+    interface ChromeSettingChangedEvent extends chrome.events.Event<DetailsCallback> {}
+
+	/** An interface that allows access to a Chrome browser setting. See accessibilityFeatures for an example. */
+    interface ChromeSetting {
+		/**
+		 * Sets the value of a setting.
+		 * @param details Which setting to change.
+		 * @param callback Optional. Called at the completion of the set operation.
+		 */
+        set(details: ChromeSettingSetDetails, callback?: Function): void;
+		/**
+		 * Gets the value of a setting.
+		 * @param details Which setting to consider.
+		 */
+        get(details: ChromeSettingGetDetails, callback?: DetailsCallback): void;
+		/**
+		 * Clears the setting, restoring any default value.
+		 * @param details Which setting to clear.
+		 * @param callback Optional. Called at the completion of the clear operation.
+		 */
+        clear(details: ChromeSettingClearDetails, callback?: Function): void;
+		/** Fired after the setting changes. */
+        onChange: ChromeSettingChangedEvent;
+    }
+}
+
+////////////////////
+// VPN Provider
+////////////////////
+/**
+ * Use the chrome.vpnProvider API to implement a VPN client.
+ * Permissions:  "vpnProvider"
+ * Important: This API works only on Chrome OS.
+ * @since Chrome 43.
+ */
+declare namespace chrome.vpnProvider {
+	interface VpnSessionParameters {
+		/** IP address for the VPN interface in CIDR notation. IPv4 is currently the only supported mode. */
+		address: string;
+		/** Optional. Broadcast address for the VPN interface. (default: deduced from IP address and mask) */
+		broadcastAddress?: string;
+		/** Optional. MTU setting for the VPN interface. (default: 1500 bytes) */
+		mtu?: string;
+		/**
+		 * Exclude network traffic to the list of IP blocks in CIDR notation from the tunnel. This can be used to bypass traffic to and from the VPN server. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
+		 */
+		exclusionList: string[];
+		/**
+		 * Include network traffic to the list of IP blocks in CIDR notation to the tunnel. This parameter can be used to set up a split tunnel. By default no traffic is directed to the tunnel. Adding the entry "0.0.0.0/0" to this list gets all the user traffic redirected to the tunnel. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
+		 */
+		inclusionList: string[];
+		/** Optional. A list of search domains. (default: no search domain) */
+		domainSearch?: string[];
+		/** A list of IPs for the DNS servers. */
+		dnsServer: string[];
+	}
+
+	interface VpnPlatformMessageEvent extends chrome.events.Event<(id: string, message: string, error: string) => void> {}
+
+	interface VpnPacketReceptionEvent extends chrome.events.Event<(data: ArrayBuffer) => void> {}
+
+	interface VpnConfigRemovalEvent extends chrome.events.Event<(id: string) => void> {}
+
+	interface VpnConfigCreationEvent extends chrome.events.Event<(id: string, name: string, data: Object) => void> {}
+
+	interface VpnUiEvent extends chrome.events.Event<(event: string, id?: string) => void> {}
+
+	/**
+	 * Creates a new VPN configuration that persists across multiple login sessions of the user.
+	 * @param name The name of the VPN configuration.
+	 * @param callback Called when the configuration is created or if there is an error.
+	 * Parameter id: A unique ID for the created configuration, empty string on failure.
+	 */
+	export function createConfig(name: string, callback: (id: string) => void): void;
+	/**
+	 * Destroys a VPN configuration created by the extension.
+	 * @param id ID of the VPN configuration to destroy.
+	 * @param callback Optional. Called when the configuration is destroyed or if there is an error.
+	 */
+	export function destroyConfig(id: string, callback?: Function): void;
+	/**
+	 * Sets the parameters for the VPN session. This should be called immediately after "connected" is received from the platform. This will succeed only when the VPN session is owned by the extension.
+	 * @param parameters The parameters for the VPN session.
+	 * @param callback Called when the parameters are set or if there is an error.
+	 */
+	export function setParameters(parameters: VpnSessionParameters, callback: Function): void;
+	/**
+	 * Sends an IP packet through the tunnel created for the VPN session. This will succeed only when the VPN session is owned by the extension.
+	 * @param data The IP packet to be sent to the platform.
+	 * @param callback Optional. Called when the packet is sent or if there is an error.
+	 */
+	export function sendPacket(data: ArrayBuffer, callback?: Function): void;
+	/**
+	 * Notifies the VPN session state to the platform. This will succeed only when the VPN session is owned by the extension.
+	 * @param state The VPN session state of the VPN client.
+	 * connected: VPN connection was successful.
+	 * failure: VPN connection failed.
+	 * @param callback Optional. Called when the notification is complete or if there is an error.
+	 */
+	export function notifyConnectionStateChanged(state: string, callback?: Function): void;
+
+	/** Triggered when a message is received from the platform for a VPN configuration owned by the extension. */
+	var onPlatformMessage: VpnPlatformMessageEvent;
+	/** Triggered when an IP packet is received via the tunnel for the VPN session owned by the extension. */
+	var onPacketReceived: VpnPacketReceptionEvent;
+	/** Triggered when a configuration created by the extension is removed by the platform. */
+	var onConfigRemoved: VpnConfigRemovalEvent;
+	/** Triggered when a configuration is created by the platform for the extension. */
+	var onConfigCreated: VpnConfigCreationEvent;
+	/** Triggered when there is a UI event for the extension. UI events are signals from the platform that indicate to the app that a UI dialog needs to be shown to the user. */
+	var onUIEvent: VpnUiEvent;
+}
+
+////////////////////
+// Wallpaper
+////////////////////
+/**
+ * Use the chrome.wallpaper API to change the ChromeOS wallpaper.
+ * Permissions:  "wallpaper"
+ * Important: This API works only on Chrome OS.
+ * @since Chrome 43.
+ */
+declare namespace chrome.wallpaper {
+	interface WallpaperDetails {
+		/** Optional. The jpeg or png encoded wallpaper image. */
+		data?: any;
+		/** Optional. The URL of the wallpaper to be set. */
+		url?: string;
+		/**
+		 * The supported wallpaper layouts.
+		 * One of: "STRETCH", "CENTER", or "CENTER_CROPPED"
+		 */
+		layout: string;
+		/** The file name of the saved wallpaper. */
+		filename: string;
+		/** Optional. True if a 128x60 thumbnail should be generated. */
+		thumbnail?: boolean;
+	}
+
+	/**
+	 * Sets wallpaper to the image at url or wallpaperData with the specified layout
+	 * @param callback
+	 * Optional parameter thumbnail: The jpeg encoded wallpaper thumbnail. It is generated by resizing the wallpaper to 128x60.
+	 */
+	export function setWallpaper(details: WallpaperDetails, callback: (thumbnail: any) => void): void;
+}
+
+////////////////////
+// Web Navigation
+////////////////////
+/**
+ * Use the chrome.webNavigation API to receive notifications about the status of navigation requests in-flight.
+ * Permissions:  "webNavigation"
+ * @since Chrome 16.
+ */
+declare namespace chrome.webNavigation {
+    interface GetFrameDetails {
+		/**
+		 * The ID of the process runs the renderer for this tab.
+		 * @since Chrome 22.
+		 */
+        processId: number;
+		/** The ID of the tab in which the frame is. */
+        tabId: number;
+		/** The ID of the frame in the given tab. */
+        frameId: number;
+    }
+
+    interface GetFrameResultDetails {
+		/** The URL currently associated with this frame, if the frame identified by the frameId existed at one point in the given tab. The fact that an URL is associated with a given frameId does not imply that the corresponding frame still exists. */
+        url: string;
+		/** True if the last navigation in this frame was interrupted by an error, i.e. the onErrorOccurred event fired. */
+        errorOccurred: boolean;
+		/** ID of frame that wraps the frame. Set to -1 of no parent frame exists. */
+        parentFrameId: number;
+    }
+
+    interface GetAllFrameDetails {
+		/** The ID of the tab. */
+        tabId: number;
+    }
+
+    interface GetAllFrameResultDetails extends GetFrameResultDetails {
+		/** The ID of the process runs the renderer for this tab. */
+        processId: number;
+		/** The ID of the frame. 0 indicates that this is the main frame; a positive value indicates the ID of a subframe. */
+        frameId: number;
+    }
+
+	interface WebNavigationCallbackDetails {
+		/** The ID of the tab in which the navigation is about to occur. */
+        tabId: number;
+		/** The time when the browser was about to start the navigation, in milliseconds since the epoch. */
+        timeStamp: number;
+    }
+
+	interface WebNavigationUrlCallbackDetails extends WebNavigationCallbackDetails {
+        url: string;
+    }
+
+	interface WebNavigationReplacementCallbackDetails extends WebNavigationCallbackDetails {
+		/** The ID of the tab that was replaced. */
+		replacedTabId: number;
+    }
+
+	interface WebNavigationFramedCallbackDetails extends WebNavigationUrlCallbackDetails {
+		/** 0 indicates the navigation happens in the tab content window; a positive value indicates navigation in a subframe. Frame IDs are unique for a given tab and process. */
+		frameId: number;
+		/**
+		 * The ID of the process runs the renderer for this tab.
+		 * @since Chrome 22.
+		 */
+		processId: number;
+    }
+
+	interface WebNavigationFramedErrorCallbackDetails extends WebNavigationFramedCallbackDetails {
+		/** The error description. */
+		error: string;
+    }
+
+	interface WebNavigationSourceCallbackDetails extends WebNavigationUrlCallbackDetails {
+		/** The ID of the tab in which the navigation is triggered. */
+        sourceTabId: number;
+		/**
+		 * The ID of the process runs the renderer for the source tab.
+		 * @since Chrome 22.
+		 */
+        sourceProcessId: number;
+		/** The ID of the frame with sourceTabId in which the navigation is triggered. 0 indicates the main frame. */
+        sourceFrameId: number;
+    }
+
+	interface WebNavigationParentedCallbackDetails extends WebNavigationFramedCallbackDetails {
+		/**
+		 * ID of frame that wraps the frame. Set to -1 of no parent frame exists.
+		 * @since Chrome 24.
+		 */
+        parentFrameId: number;
+    }
+
+	interface WebNavigationTransitionCallbackDetails extends WebNavigationFramedCallbackDetails {
+		/**
+		 * Cause of the navigation.
+		 * One of: "link", "typed", "auto_bookmark", "auto_subframe", "manual_subframe", "generated", "start_page", "form_submit", "reload", "keyword", or "keyword_generated"
+		 */
+		transitionType: string;
+		/**
+		 * A list of transition qualifiers.
+		 * Each element one of: "client_redirect", "server_redirect", "forward_back", or "from_address_bar"
+		 */
+		transitionQualifiers: string[];
+    }
+
+	interface WebNavigationEventFilter {
+		/** Conditions that the URL being navigated to must satisfy. The 'schemes' and 'ports' fields of UrlFilter are ignored for this event. */
+        url: chrome.events.UrlFilter[];
+    }
+
+	interface WebNavigationEvent<T extends WebNavigationCallbackDetails> extends chrome.events.Event<(details: T) => void> {
+		addListener(callback: (details: T) => void, filters?: WebNavigationEventFilter): void;
+    }
+
+    interface WebNavigationFramedEvent extends WebNavigationEvent<WebNavigationFramedCallbackDetails> {}
+
+	interface WebNavigationFramedErrorEvent extends WebNavigationEvent<WebNavigationFramedErrorCallbackDetails> {}
+
+	interface WebNavigationSourceEvent extends WebNavigationEvent<WebNavigationSourceCallbackDetails> {}
+
+	interface WebNavigationParentedEvent extends WebNavigationEvent<WebNavigationParentedCallbackDetails> {}
+
+	interface WebNavigationTransitionalEvent extends WebNavigationEvent<WebNavigationTransitionCallbackDetails> {}
+
+	interface WebNavigationReplacementEvent extends WebNavigationEvent<WebNavigationReplacementCallbackDetails> {}
+
+	/**
+	 * Retrieves information about the given frame. A frame refers to an <iframe> or a <frame> of a web page and is identified by a tab ID and a frame ID.
+	 * @param details Information about the frame to retrieve information about.
+	 * @param callback
+	 * Optional parameter details: Information about the requested frame, null if the specified frame ID and/or tab ID are invalid.
+	 */
+    export function getFrame(details: GetFrameDetails, callback: (details?: GetFrameResultDetails) => void): void;
+	/**
+	 * Retrieves information about all frames of a given tab.
+	 * @param details Information about the tab to retrieve all frames from.
+	 * @param callback
+	 * Optional parameter details: A list of frames in the given tab, null if the specified tab ID is invalid.
+	 */
+    export function getAllFrames(details: GetAllFrameDetails, callback: (details?: GetAllFrameResultDetails[]) => void): void;
+
+	/** Fired when the reference fragment of a frame was updated. All future events for that frame will use the updated URL. */
+	var onReferenceFragmentUpdated: WebNavigationTransitionalEvent;
+	/** Fired when a document, including the resources it refers to, is completely loaded and initialized. */
+	var onCompleted: WebNavigationFramedEvent;
+	/**
+	 * Fired when the frame's history was updated to a new URL. All future events for that frame will use the updated URL.
+	 * @since Chrome 22.
+	 */
+	var onHistoryStateUpdated: WebNavigationTransitionalEvent;
+	/** Fired when a new window, or a new tab in an existing window, is created to host a navigation. */
+	var onCreatedNavigationTarget: WebNavigationSourceEvent;
+	/**
+	 * Fired when the contents of the tab is replaced by a different (usually previously pre-rendered) tab.
+	 * @since Chrome 22.
+	 */
+	var onTabReplaced: WebNavigationReplacementEvent;
+	/** Fired when a navigation is about to occur. */
+	var onBeforeNavigate: WebNavigationParentedEvent;
+	/** Fired when a navigation is committed. The document (and the resources it refers to, such as images and subframes) might still be downloading, but at least part of the document has been received from the server and the browser has decided to switch to the new document. */
+	var onCommitted: WebNavigationTransitionalEvent;
+	/** Fired when the page's DOM is fully constructed, but the referenced resources may not finish loading. */
+	var onDOMContentLoaded: WebNavigationFramedEvent;
+	/** Fired when an error occurs and the navigation is aborted. This can happen if either a network error occurred, or the user aborted the navigation. */
+	var onErrorOccurred: WebNavigationFramedErrorEvent;
+}
+
+////////////////////
+// Web Request
+////////////////////
+/**
+ * Use the chrome.webRequest API to observe and analyze traffic and to intercept, block, or modify requests in-flight.
+ * Permissions:  "webRequest", host permissions
+ * @since Chrome 17.
+ */
+declare namespace chrome.webRequest {
+    interface AuthCredentials {
+        username: string;
+        password: string;
+    }
+
+	/** An HTTP Header, represented as an object containing a key and either a value or a binaryValue. */
+    interface HttpHeader {
+        name: string;
+        value?: string;
+        binaryValue?: ArrayBuffer;
+    }
+
+	/** Returns value for event handlers that have the 'blocking' extraInfoSpec applied. Allows the event handler to modify network requests. */
+    interface BlockingResponse {
+		/** Optional. If true, the request is cancelled. Used in onBeforeRequest, this prevents the request from being sent. */
+        cancel?: boolean;
+		/**
+		 * Optional.
+		 * Only used as a response to the onBeforeRequest and onHeadersReceived events. If set, the original request is prevented from being sent/completed and is instead redirected to the given URL. Redirections to non-HTTP schemes such as data: are allowed. Redirects initiated by a redirect action use the original request method for the redirect, with one exception: If the redirect is initiated at the onHeadersReceived stage, then the redirect will be issued using the GET method.
+		 */
+        redirectUrl?: string;
+		/**
+		 * Optional.
+		 * Only used as a response to the onHeadersReceived event. If set, the server is assumed to have responded with these response headers instead. Only return responseHeaders if you really want to modify the headers in order to limit the number of conflicts (only one extension may modify responseHeaders for each request).
+		 */
+        responseHeaders?: HttpHeader[];
+		/** Optional. Only used as a response to the onAuthRequired event. If set, the request is made using the supplied credentials. */
+        authCredentials?: AuthCredentials;
+		/**
+		 * Optional.
+		 * Only used as a response to the onBeforeSendHeaders event. If set, the request is made with these request headers instead.
+		 */
+        requestHeaders?: HttpHeader[];
+    }
+
+	/** An object describing filters to apply to webRequest events. */
+    interface RequestFilter {
+		/** Optional. */
+        tabId?: number;
+		/**
+		 * A list of request types. Requests that cannot match any of the types will be filtered out.
+		 * Each element one of: "main_frame", "sub_frame", "stylesheet", "script", "image", "object", "xmlhttprequest", or "other"
+		 */
+        types?: string[];
+		/** A list of URLs or URL patterns. Requests that cannot match any of the URLs will be filtered out. */
+        urls: string[];
+		/** Optional. */
+        windowId?: number;
+    }
+
+	/**
+	 * Contains data uploaded in a URL request.
+	 * @since Chrome 23.
+	 */
+    interface UploadData {
+		/** Optional. An ArrayBuffer with a copy of the data. */
+        bytes?: ArrayBuffer;
+		/** Optional. A string with the file's path and name. */
+        file?: string;
+    }
+
+	interface WebRequestBody {
+		/** Optional. Errors when obtaining request body data. */
+		error?: string;
+		/**
+		 * Optional.
+		 * If the request method is POST and the body is a sequence of key-value pairs encoded in UTF8, encoded as either multipart/form-data, or application/x-www-form-urlencoded, this dictionary is present and for each key contains the list of all values for that key. If the data is of another media type, or if it is malformed, the dictionary is not present. An example value of this dictionary is {'key': ['value1', 'value2']}.
+		 */
+		formData?: Object;
+		/**
+		 * Optional.
+		 * If the request method is PUT or POST, and the body is not already parsed in formData, then the unparsed request body elements are contained in this array.
+		 */
+		raw?: UploadData[];
+	}
+
+	interface WebAuthChallenger {
+		host: string;
+		port: number;
+	}
+
+	interface ResourceRequest {
+		/** The ID of the request. Request IDs are unique within a browser session. As a result, they could be used to relate different events of the same request. */
+        requestId: string;
+		/** The value 0 indicates that the request happens in the main frame; a positive value indicates the ID of a subframe in which the request happens. If the document of a (sub-)frame is loaded (type is main_frame or sub_frame), frameId indicates the ID of this frame, not the ID of the outer frame. Frame IDs are unique within a tab. */
+        frameId: number;
+		/** ID of frame that wraps the frame which sent the request. Set to -1 if no parent frame exists. */
+        parentFrameId: number;
+		/** The ID of the tab in which the request takes place. Set to -1 if the request isn't related to a tab. */
+		tabId: number;
+		/**
+		 * How the requested resource will be used.
+		 * One of: "main_frame", "sub_frame", "stylesheet", "script", "image", "object", "xmlhttprequest", or "other"
+		 */
+        type: string;
+		/** The time when this signal is triggered, in milliseconds since the epoch. */
+		timeStamp: number;
+    }
+
+	interface WebRequestDetails extends ResourceRequest {
+		url: string;
+		/** Standard HTTP method. */
+		method: string;
+    }
+
+	interface WebRequestHeadersDetails extends WebRequestDetails {
+		/** Optional. The HTTP request headers that are going to be sent out with this request. */
+		requestHeaders?: HttpHeader[];
+    }
+
+	interface WebRequestBodyDetails extends WebRequestDetails {
+		/**
+		 * Contains the HTTP request body data. Only provided if extraInfoSpec contains 'requestBody'.
+		 * @since Chrome 23.
+		 */
+		requestBody: WebRequestBody;
+    }
+
+	interface WebRequestFullDetails extends WebRequestHeadersDetails, WebRequestBodyDetails {
+    }
+
+	interface WebResponseDetails extends ResourceRequest {
+		/** HTTP status line of the response or the 'HTTP/0.9 200 OK' string for HTTP/0.9 responses (i.e., responses that lack a status line). */
+        statusLine: string;
+		/**
+		 * Standard HTTP status code returned by the server.
+		 * @since Chrome 43.
+		 */
+		statusCode: number;
+    }
+
+	interface WebResponseHeadersDetails extends WebResponseDetails {
+		/** Optional. The HTTP response headers that have been received with this response. */
+		responseHeaders?: HttpHeader[];
+    }
+
+	interface WebResponseCacheDetails extends WebResponseHeadersDetails {
+		/**
+		 * Optional.
+		 * The server IP address that the request was actually sent to. Note that it may be a literal IPv6 address.
+		 */
+        ip?: string;
+		/** Indicates if this response was fetched from disk cache. */
+        fromCache: boolean;
+    }
+
+	interface WebRedirectionResponseDetails extends WebResponseCacheDetails {
+		/** The new URL. */
+		redirectUrl: string;
+    }
+
+	interface WebAuthenticationChallengeDetails extends WebResponseHeadersDetails {
+		/** The authentication scheme, e.g. Basic or Digest. */
+		schema: string;
+		/** The authentication realm provided by the server, if there is one. */
+		realm?: string;
+		/** The server requesting authentication. */
+		challenger: WebAuthChallenger;
+		/** True for Proxy-Authenticate, false for WWW-Authenticate. */
+		isProxy: boolean;
+    }
+
+	interface WebResponseErrorDetails extends WebResponseCacheDetails {
+		/** The error description. This string is not guaranteed to remain backwards compatible between releases. You must not parse and act based upon its content. */
+		error: string;
+    }
+
+	interface WebRequestBodyEvent extends chrome.events.Event<(details: WebRequestBodyDetails) => void> {
+		addListener(callback: (details: WebRequestBodyDetails) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void;
+    }
+
+	interface WebRequestHeadersEvent extends chrome.events.Event<(details: WebRequestHeadersDetails) => void> {
+		addListener(callback: (details: WebRequestHeadersDetails) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void;
+    }
+
+	interface _WebResponseHeadersEvent<T extends WebResponseHeadersDetails> extends chrome.events.Event<(details: T) => void> {
+		addListener(callback: (details: T) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void;
+    }
+
+    interface WebResponseHeadersEvent extends _WebResponseHeadersEvent<WebResponseHeadersDetails> {}
+
+    interface WebResponseCacheEvent extends _WebResponseHeadersEvent<WebResponseCacheDetails> {}
+
+	interface WebRedirectionResponseEvent extends _WebResponseHeadersEvent<WebRedirectionResponseDetails> {}
+
+	interface WebAuthenticationChallengeEvent extends chrome.events.Event<(details: WebAuthenticationChallengeDetails, callback?: (response: BlockingResponse) => void) => void> {}
+
+	interface WebResponseErrorEvent extends _WebResponseHeadersEvent<WebResponseErrorDetails> {}
+
+	/**
+	 * The maximum number of times that handlerBehaviorChanged can be called per 10 minute sustained interval. handlerBehaviorChanged is an expensive function call that shouldn't be called often.
+	 * @since Chrome 23.
+	 */
+    var MAX_HANDLER_BEHAVIOR_CHANGED_CALLS_PER_10_MINUTES: number;
+
+	/** Needs to be called when the behavior of the webRequest handlers has changed to prevent incorrect handling due to caching. This function call is expensive. Don't call it often. */
+    export function handlerBehaviorChanged(callback?: Function): void;
+
+	/** Fired when a request is about to occur. */
+	var onBeforeRequest: WebRequestBodyEvent;
+	/** Fired before sending an HTTP request, once the request headers are available. This may occur after a TCP connection is made to the server, but before any HTTP data is sent. */
+	var onBeforeSendHeaders: WebRequestHeadersEvent;
+	/** Fired just before a request is going to be sent to the server (modifications of previous onBeforeSendHeaders callbacks are visible by the time onSendHeaders is fired). */
+	var onSendHeaders: WebRequestHeadersEvent;
+	/** Fired when HTTP response headers of a request have been received. */
+	var onHeadersReceived: WebResponseHeadersEvent;
+	/** Fired when an authentication failure is received. The listener has three options: it can provide authentication credentials, it can cancel the request and display the error page, or it can take no action on the challenge. If bad user credentials are provided, this may be called multiple times for the same request. */
+	var onAuthRequired: WebAuthenticationChallengeEvent;
+	/** Fired when the first byte of the response body is received. For HTTP requests, this means that the status line and response headers are available. */
+	var onResponseStarted: WebResponseCacheEvent;
+	/** Fired when a server-initiated redirect is about to occur. */
+	var onBeforeRedirect: WebRedirectionResponseEvent;
+	/** Fired when a request is completed. */
+	var onCompleted: WebResponseCacheEvent;
+	/** Fired when an error occurs. */
+	var onErrorOccurred: WebResponseErrorEvent;
+}
+
+////////////////////
+// Web Store
+////////////////////
+/**
+ * Use the chrome.webstore API to initiate app and extension installations "inline" from your site.
+ * @since Chrome 15.
+ */
+declare namespace chrome.webstore {
+	/**
+	 * @param url Optional. If you have more than one <link> tag on your page with the chrome-webstore-item relation, you can choose which item you'd like to install by passing in its URL here. If it is omitted, then the first (or only) link will be used. An exception will be thrown if the passed in URL does not exist on the page.
+	 * @param successCallback Optional. This function is invoked when inline installation successfully completes (after the dialog is shown and the user agrees to add the item to Chrome). You may wish to use this to hide the user interface element that prompted the user to install the app or extension.
+	 * @param failureCallback Optional. This function is invoked when inline installation does not successfully complete. Possible reasons for this include the user canceling the dialog, the linked item not being found in the store, or the install being initiated from a non-verified site.
+	 * Parameter error: The failure detail. You may wish to inspect or log this for debugging purposes, but you should not rely on specific strings being passed back.
+	 * Optional parameter errorCode: The error code from the stable set of possible errors.
+	 * * Enum of the possible install results, including error codes sent back in the event that an inline installation has failed.
+	 * * * "otherError": An uncommon, unrecognized, or unexpected error. In some cases, the readable error string can provide more information.
+	 * * * "aborted": The operation was aborted as the requestor is no longer alive.
+	 * * * "installInProgress": An installation of the same extension is in progress.
+	 * * * "notPermitted": The installation is not permitted.
+	 * * * "invalidId": Invalid Chrome Web Store item ID.
+	 * * * "webstoreRequestError": Failed to retrieve extension metadata from the Web Store.
+	 * * * "invalidWebstoreResponse": The extension metadata retrieved from the Web Store was invalid.
+	 * * * "invalidManifest": An error occurred while parsing the extension manifest retrieved from the Web Store.
+	 * * * "iconError": Failed to retrieve the extension's icon from the Web Store, or the icon was invalid.
+	 * * * "userCanceled": The user canceled the operation.
+	 * * * "blacklisted": The extension is blacklisted.
+	 * * * "missingDependencies": Unsatisfied dependencies, such as shared modules.
+	 * * * "requirementViolations": Unsatisfied requirements, such as webgl.
+	 * * * "blockedByPolicy": The extension is blocked by management policies.
+	 * * * "launchFeatureDisabled": The launch feature is not available.
+	 * * * "launchUnsupportedExtensionType": The launch feature is not supported for the extension type.
+	 * * * "launchInProgress": A launch of the same extension is in progress.
+	 */
+	export function install(url: string, successCallback?: Function, failureCallback?: (error: string, errorCode?: string) => void): void;
+	/**
+	 * @param successCallback Optional. This function is invoked when inline installation successfully completes (after the dialog is shown and the user agrees to add the item to Chrome). You may wish to use this to hide the user interface element that prompted the user to install the app or extension.
+	 * @param failureCallback Optional. This function is invoked when inline installation does not successfully complete. Possible reasons for this include the user canceling the dialog, the linked item not being found in the store, or the install being initiated from a non-verified site.
+	 * Parameter error: The failure detail. You may wish to inspect or log this for debugging purposes, but you should not rely on specific strings being passed back.
+	 * Optional parameter errorCode: The error code from the stable set of possible errors.
+	 * * Enum of the possible install results, including error codes sent back in the event that an inline installation has failed.
+	 * * * "otherError": An uncommon, unrecognized, or unexpected error. In some cases, the readable error string can provide more information.
+	 * * * "aborted": The operation was aborted as the requestor is no longer alive.
+	 * * * "installInProgress": An installation of the same extension is in progress.
+	 * * * "notPermitted": The installation is not permitted.
+	 * * * "invalidId": Invalid Chrome Web Store item ID.
+	 * * * "webstoreRequestError": Failed to retrieve extension metadata from the Web Store.
+	 * * * "invalidWebstoreResponse": The extension metadata retrieved from the Web Store was invalid.
+	 * * * "invalidManifest": An error occurred while parsing the extension manifest retrieved from the Web Store.
+	 * * * "iconError": Failed to retrieve the extension's icon from the Web Store, or the icon was invalid.
+	 * * * "userCanceled": The user canceled the operation.
+	 * * * "blacklisted": The extension is blacklisted.
+	 * * * "missingDependencies": Unsatisfied dependencies, such as shared modules.
+	 * * * "requirementViolations": Unsatisfied requirements, such as webgl.
+	 * * * "blockedByPolicy": The extension is blocked by management policies.
+	 * * * "launchFeatureDisabled": The launch feature is not available.
+	 * * * "launchUnsupportedExtensionType": The launch feature is not supported for the extension type.
+	 * * * "launchInProgress": A launch of the same extension is in progress.
+	 */
+	export function install(successCallback: Function, failureCallback?: (error: string, errorCode?: string) => void): void;
+	/**
+	 * @param failureCallback Optional. This function is invoked when inline installation does not successfully complete. Possible reasons for this include the user canceling the dialog, the linked item not being found in the store, or the install being initiated from a non-verified site.
+	 * Parameter error: The failure detail. You may wish to inspect or log this for debugging purposes, but you should not rely on specific strings being passed back.
+	 * Optional parameter errorCode: The error code from the stable set of possible errors.
+	 * * Enum of the possible install results, including error codes sent back in the event that an inline installation has failed.
+	 * * * "otherError": An uncommon, unrecognized, or unexpected error. In some cases, the readable error string can provide more information.
+	 * * * "aborted": The operation was aborted as the requestor is no longer alive.
+	 * * * "installInProgress": An installation of the same extension is in progress.
+	 * * * "notPermitted": The installation is not permitted.
+	 * * * "invalidId": Invalid Chrome Web Store item ID.
+	 * * * "webstoreRequestError": Failed to retrieve extension metadata from the Web Store.
+	 * * * "invalidWebstoreResponse": The extension metadata retrieved from the Web Store was invalid.
+	 * * * "invalidManifest": An error occurred while parsing the extension manifest retrieved from the Web Store.
+	 * * * "iconError": Failed to retrieve the extension's icon from the Web Store, or the icon was invalid.
+	 * * * "userCanceled": The user canceled the operation.
+	 * * * "blacklisted": The extension is blacklisted.
+	 * * * "missingDependencies": Unsatisfied dependencies, such as shared modules.
+	 * * * "requirementViolations": Unsatisfied requirements, such as webgl.
+	 * * * "blockedByPolicy": The extension is blocked by management policies.
+	 * * * "launchFeatureDisabled": The launch feature is not available.
+	 * * * "launchUnsupportedExtensionType": The launch feature is not supported for the extension type.
+	 * * * "launchInProgress": A launch of the same extension is in progress.
+	 */
+	export function install(failureCallback?: (error: string, errorCode?: string) => void): void;
+
+	interface InstallationStageEvent extends chrome.events.Event<(stage: string) => void> {}
+
+	interface DownloadProgressEvent extends chrome.events.Event<(percentDownloaded: number) => void> {}
+
+	/**
+	 * Fired when an inline installation enters a new InstallStage. In order to receive notifications about this event, listeners must be registered before the inline installation begins.
+	 * @since Chrome 35.
+	 */
+	var onInstallStageChanged: InstallationStageEvent;
+	/**
+	 * Fired periodically with the download progress of an inline install. In order to receive notifications about this event, listeners must be registered before the inline installation begins.
+	 * @since Chrome 35.
+	 */
+	var onDownloadProgress: DownloadProgressEvent;
+}
+
+////////////////////
+// Windows
+////////////////////
+/**
+ * Use the chrome.windows API to interact with browser windows. You can use this API to create, modify, and rearrange windows in the browser.
+ * Permissions: The chrome.windows API can be used without declaring any permission. However, the "tabs" permission is required in order to populate the url, title, and favIconUrl properties of Tab objects.
+ * @since Chrome 5.
+ */
+declare namespace chrome.windows {
+    interface Window {
+		/** Array of tabs.Tab objects representing the current tabs in the window. */
+        tabs?: chrome.tabs.Tab[];
+		/** Optional. The offset of the window from the top edge of the screen in pixels. Under some circumstances a Window may not be assigned top property, for example when querying closed windows from the sessions API. */
+		top?: number;
+		/** Optional. The height of the window, including the frame, in pixels. Under some circumstances a Window may not be assigned height property, for example when querying closed windows from the sessions API. */
+		height?: number;
+		/** Optional. The width of the window, including the frame, in pixels. Under some circumstances a Window may not be assigned width property, for example when querying closed windows from the sessions API. */
+		width?: number;
+		/**
+		 * The state of this browser window.
+		 * One of: "normal", "minimized", "maximized", "fullscreen", or "docked"
+		 * @since Chrome 17.
+		 */
+        state: string;
+		/** Whether the window is currently the focused window. */
+        focused: boolean;
+		/**
+		 * Whether the window is set to be always on top.
+		 * @since Chrome 19.
+		 */
+        alwaysOnTop: boolean;
+		/** Whether the window is incognito. */
+        incognito: boolean;
+		/**
+		 * The type of browser window this is.
+		 * One of: "normal", "popup", "panel", "app", or "devtools"
+		 */
+        type: string;
+		/** Optional. The ID of the window. Window IDs are unique within a browser session. Under some circumstances a Window may not be assigned an ID, for example when querying windows using the sessions API, in which case a session ID may be present. */
+        id: number;
+		/** Optional. The offset of the window from the left edge of the screen in pixels. Under some circumstances a Window may not be assigned left property, for example when querying closed windows from the sessions API. */
+		left?: number;
+		/**
+		 * The session ID used to uniquely identify a Window obtained from the sessions API.
+		 * @since Chrome 31.
+		 */
+		sessionId?: string;
+    }
+
+    interface GetInfo {
+		/**
+		 * Optional.
+		 * If true, the windows.Window object will have a tabs property that contains a list of the tabs.Tab objects. The Tab objects only contain the url, title and favIconUrl properties if the extension's manifest file includes the "tabs" permission.
+		 */
+        populate?: boolean;
+		/**
+		 * If set, the windows.Window returned will be filtered based on its type. If unset the default filter is set to ['app', 'normal', 'panel', 'popup'], with 'app' and 'panel' window types limited to the extension's own windows.
+		 * Each one of: "normal", "popup", "panel", "app", or "devtools"
+		 * @since Chrome 46. Warning: this is the current Beta channel.
+		 */
+		windowTypes?: string[];
+    }
+
+    interface CreateData {
+		/**
+		 * Optional. The id of the tab for which you want to adopt to the new window.
+		 * @since Chrome 10.
+		 */
+        tabId?: number;
+		/**
+		 * Optional.
+		 * A URL or array of URLs to open as tabs in the window. Fully-qualified URLs must include a scheme (i.e. 'http://www.google.com', not 'www.google.com'). Relative URLs will be relative to the current page within the extension. Defaults to the New Tab Page.
+		 */
+		url?: string | string[];
+		/**
+		 * Optional.
+		 * The number of pixels to position the new window from the top edge of the screen. If not specified, the new window is offset naturally from the last focused window. This value is ignored for panels.
+		 */
+        top?: number;
+		/**
+		 * Optional.
+		 * The height in pixels of the new window, including the frame. If not specified defaults to a natural height.
+		 */
+        height?: number;
+		/**
+		 * Optional.
+		 * The width in pixels of the new window, including the frame. If not specified defaults to a natural width.
+		 */
+        width?: number;
+		/**
+		 * Optional. If true, opens an active window. If false, opens an inactive window.
+		 * @since Chrome 12.
+		 */
+        focused?: boolean;
+		/** Optional. Whether the new window should be an incognito window. */
+        incognito?: boolean;
+		/**
+		 * Optional. Specifies what type of browser window to create. The 'panel' and 'detached_panel' types create a popup unless the '--enable-panels' flag is set.
+		 * One of: "normal", "popup", "panel", or "detached_panel"
+		 */
+        type?: string;
+		/**
+		 * Optional.
+		 * The number of pixels to position the new window from the left edge of the screen. If not specified, the new window is offset naturally from the last focused window. This value is ignored for panels.
+		 */
+        left?: number;
+		/**
+		 * Optional. The initial state of the window. The 'minimized', 'maximized' and 'fullscreen' states cannot be combined with 'left', 'top', 'width' or 'height'.
+		 * One of: "normal", "minimized", "maximized", "fullscreen", or "docked"
+		 * @since Chrome 44.
+		 */
+		state?: string;
+    }
+
+    interface UpdateInfo {
+		/** Optional. The offset from the top edge of the screen to move the window to in pixels. This value is ignored for panels. */
+        top?: number;
+		/**
+		 * Optional. If true, causes the window to be displayed in a manner that draws the user's attention to the window, without changing the focused window. The effect lasts until the user changes focus to the window. This option has no effect if the window already has focus. Set to false to cancel a previous draw attention request.
+		 * @since Chrome 14.
+		 */
+        drawAttention?: boolean;
+		/** Optional. The height to resize the window to in pixels. This value is ignored for panels. */
+        height?: number;
+		/** Optional. The width to resize the window to in pixels. This value is ignored for panels. */
+        width?: number;
+		/**
+		 * Optional. The new state of the window. The 'minimized', 'maximized' and 'fullscreen' states cannot be combined with 'left', 'top', 'width' or 'height'.
+		 * One of: "normal", "minimized", "maximized", "fullscreen", or "docked"
+		 * @since Chrome 17.
+		 */
+        state?: string;
+		/**
+		 * Optional. If true, brings the window to the front. If false, brings the next window in the z-order to the front.
+		 * @since Chrome 8.
+		 */
+        focused?: boolean;
+		/** Optional. The offset from the left edge of the screen to move the window to in pixels. This value is ignored for panels. */
+        left?: number;
+    }
+
+	interface WindowEventFilter {
+		/**
+		 * Conditions that the window's type being created must satisfy. By default it will satisfy ['app', 'normal', 'panel', 'popup'], with 'app' and 'panel' window types limited to the extension's own windows.
+		 * Each one of: "normal", "popup", "panel", "app", or "devtools"
+		 */
+		windowTypes: string[];
+    }
+
+	interface WindowIdEvent extends chrome.events.Event<(windowId: number, filters?: WindowEventFilter) => void> {}
+
+	interface WindowReferenceEvent extends chrome.events.Event<(window: Window, filters?: WindowEventFilter) => void> {}
+
+	/**
+	 * The windowId value that represents the current window.
+	 * @since Chrome 18.
+	 */
+    var WINDOW_ID_CURRENT: number;
+	/**
+	 * The windowId value that represents the absence of a chrome browser window.
+	 * @since Chrome 6.
+	 */
+    var WINDOW_ID_NONE: number;
+
+	/** Gets details about a window. */
+    export function get(windowId: number, callback: (window: chrome.windows.Window) => void): void;
+	/**
+	 * Gets details about a window.
+	 * @since Chrome 18.
+	 */
+    export function get(windowId: number, getInfo: GetInfo, callback: (window: chrome.windows.Window) => void): void;
+	/**
+	 * Gets the current window.
+	 */
+    export function getCurrent(callback: (window: chrome.windows.Window) => void): void;
+	/**
+	 * Gets the current window.
+	 * @since Chrome 18.
+	 */
+    export function getCurrent(getInfo: GetInfo, callback: (window: chrome.windows.Window) => void): void;
+	/**
+	 * Creates (opens) a new browser with any optional sizing, position or default URL provided.
+	 * @param callback
+	 * Optional parameter window: Contains details about the created window.
+	 */
+	export function create(callback?: (window?: chrome.windows.Window) => void): void;
+	/**
+	 * Creates (opens) a new browser with any optional sizing, position or default URL provided.
+	 * @param callback
+	 * Optional parameter window: Contains details about the created window.
+	 */
+	export function create(createData: CreateData, callback?: (window?: chrome.windows.Window) => void): void;
+	/**
+	 * Gets all windows.
+	 */
+    export function getAll(callback: (windows: chrome.windows.Window[]) => void): void;
+	/**
+	 * Gets all windows.
+	 * @since Chrome 18.
+	 */
+    export function getAll(getInfo: GetInfo, callback: (windows: chrome.windows.Window[]) => void): void;
+	/** Updates the properties of a window. Specify only the properties that you want to change; unspecified properties will be left unchanged. */
+    export function update(windowId: number, updateInfo: UpdateInfo, callback?: (window: chrome.windows.Window) => void): void;
+	/** Removes (closes) a window, and all the tabs inside it. */
+    export function remove(windowId: number, callback?: Function): void;
+	/**
+	 * Gets the window that was most recently focused — typically the window 'on top'.
+	 */
+    export function getLastFocused(callback: (window: chrome.windows.Window) => void): void;
+	/**
+	 * Gets the window that was most recently focused — typically the window 'on top'.
+	 * @since Chrome 18.
+	 */
+    export function getLastFocused(getInfo: GetInfo, callback: (window: chrome.windows.Window) => void): void;
+
+	/** Fired when a window is removed (closed). */
+	var onRemoved: WindowIdEvent;
+	/** Fired when a window is created. */
+	var onCreated: WindowReferenceEvent;
+	/**
+	 * Fired when the currently focused window changes. Will be chrome.windows.WINDOW_ID_NONE if all chrome windows have lost focus.
+	 * Note: On some Linux window managers, WINDOW_ID_NONE will always be sent immediately preceding a switch from one chrome window to another.
+	 */
+	var onFocusChanged: WindowIdEvent;
+}
diff --git a/chrome/tsconfig.json b/chrome/tsconfig.json
new file mode 100644
index 0000000000..01fee1deb4
--- /dev/null
+++ b/chrome/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "chrome-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/chui/chui-tests.ts b/chui/chui-tests.ts
index d4f7be5f30..5e1e549dc7 100644
--- a/chui/chui-tests.ts
+++ b/chui/chui-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="chui.d.ts"/>
+/// <reference types="jquery"/>
 
 $(function() {
 
diff --git a/chui/chui.d.ts b/chui/index.d.ts
similarity index 100%
rename from chui/chui.d.ts
rename to chui/index.d.ts
diff --git a/chui/tsconfig.json b/chui/tsconfig.json
new file mode 100644
index 0000000000..2e6a827c73
--- /dev/null
+++ b/chui/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "chui-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/circular-json/circular-json-tests.ts b/circular-json/circular-json-tests.ts
index d3f2e0951c..41ec8f0a36 100644
--- a/circular-json/circular-json-tests.ts
+++ b/circular-json/circular-json-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="circular-json.d.ts" />
 
 import CircularJSON = require('circular-json');
 
diff --git a/circular-json/circular-json.d.ts b/circular-json/circular-json.d.ts
deleted file mode 100644
index 343744a690..0000000000
--- a/circular-json/circular-json.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Type definitions for circular-json v0.1.6
-// Project: https://github.com/WebReflection/circular-json
-// Definitions by: Jonathan Pevarnek <https://github.com/jpevarnek/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'circular-json' {
-  interface ICircularJSON extends JSON {
-    parse(text: string, reviver?: (key: any, value: any) => any): any;
-    stringify(value: any, replacer?: ((key: string, value: any) => any) | any[], space?: any, placeholder?: boolean): string;
-  }
-
-  var CircularJSON: ICircularJSON;
-
-  export = CircularJSON;
-}
diff --git a/circular-json/index.d.ts b/circular-json/index.d.ts
new file mode 100644
index 0000000000..b724f92577
--- /dev/null
+++ b/circular-json/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for circular-json v0.1.6
+// Project: https://github.com/WebReflection/circular-json
+// Definitions by: Jonathan Pevarnek <https://github.com/jpevarnek/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface ICircularJSON extends JSON {
+    parse(text: string, reviver?: (key: any, value: any) => any): any;
+    stringify(value: any, replacer?: ((key: string, value: any) => any) | any[], space?: any, placeholder?: boolean): string;
+}
+
+declare var CircularJSON: ICircularJSON;
+
+export = CircularJSON;
diff --git a/circular-json/tsconfig.json b/circular-json/tsconfig.json
new file mode 100644
index 0000000000..fbce76fc99
--- /dev/null
+++ b/circular-json/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "circular-json-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ckeditor/ckeditor-tests.ts b/ckeditor/ckeditor-tests.ts
index f7deb67069..76f2c1c4b4 100644
--- a/ckeditor/ckeditor-tests.ts
+++ b/ckeditor/ckeditor-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="ckeditor.d.ts" />
+
 
 function test_CKEDITOR() {
     CKEDITOR.basePath = 'test';
diff --git a/ckeditor/ckeditor.d.ts b/ckeditor/index.d.ts
similarity index 100%
rename from ckeditor/ckeditor.d.ts
rename to ckeditor/index.d.ts
diff --git a/ckeditor/tsconfig.json b/ckeditor/tsconfig.json
new file mode 100644
index 0000000000..1123475676
--- /dev/null
+++ b/ckeditor/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ckeditor-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/classnames/classnames-tests.ts b/classnames/classnames-tests.ts
index 3c3086c51e..e296001ed8 100644
--- a/classnames/classnames-tests.ts
+++ b/classnames/classnames-tests.ts
@@ -1,5 +1,3 @@
-///<reference path='classnames.d.ts' />
-
 import classNames = require('classnames')
 
 classNames('foo', 'bar'); // => 'foo bar'
diff --git a/classnames/classnames.d.ts b/classnames/index.d.ts
similarity index 100%
rename from classnames/classnames.d.ts
rename to classnames/index.d.ts
diff --git a/classnames/tsconfig.json b/classnames/tsconfig.json
new file mode 100644
index 0000000000..cab85942eb
--- /dev/null
+++ b/classnames/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "classnames-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cldr.js/cldr.js-event.d.ts b/cldr.js/cldr.js-event.d.ts
deleted file mode 100644
index b86580aa95..0000000000
--- a/cldr.js/cldr.js-event.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Type definitions for Cldr.js 0.4.4
-// Project: https://github.com/rxaviers/cldrjs
-// Definitions by: Raman But-Husaim <https://github.com/RamanBut-Husaim>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// The definition file for event module.
-
-declare namespace cldr {
-    interface CldrStatic {
-        on(event:string, listener:(path:string, value:any) => void): void;
-        once(event:string, listener:(path:string, value:any) => void): void;
-        off(event:string, listener:(path:string, value:any) => void): void;
-    }
-
-    interface CldrFactory {
-        on(event:string, listener:(path:string, value:any) => void): void;
-        once(event:string, listener:(path:string, value:any) => void): void;
-        off(event:string, listener:(path:string, value:any) => void): void;
-    }
-}
-
-declare module "cldr/event" {
-    export = cldr;
-}
diff --git a/cldr.js/cldr.js.d.ts b/cldr.js/cldr.js.d.ts
deleted file mode 100644
index 04ecb428f6..0000000000
--- a/cldr.js/cldr.js.d.ts
+++ /dev/null
@@ -1,259 +0,0 @@
-// Type definitions for Cldr.js 0.4.4
-// Project: https://github.com/rxaviers/cldrjs
-// Definitions by: Raman But-Husaim <https://github.com/RamanBut-Husaim>, Grégoire Castre <https://github.com/gcastre/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace cldr {
-    /**
-     * @name Attributes
-     * @memberof cldr
-     * @kind interface
-     *
-     * @description
-     * The object created during instance initialization and used internally by .get()
-     * to replace dynamic parts of an item path.
-     */
-    interface Attributes {
-        /**
-         * @name language
-         * @memberof cldr.Attributes
-         * @kind property
-         * @access public
-         *
-         * @type {any}
-         *
-         * @description
-         * Language subtag {@link http://www.unicode.org/reports/tr35/#Language_Locale_Field_Definitions}
-         */
-        language: any;
-
-        /**
-         * @name script
-         * @memberof cldr.Attributes
-         * @kind property
-         * @access public
-         *
-         * @type {any}
-         *
-         * @description
-         * Script subtag {@link http://www.unicode.org/reports/tr35/#Language_Locale_Field_Definitions}
-         */
-        script: any;
-
-        /**
-         * @name region
-         * @memberof cldr.Attributes
-         * @kind property
-         * @access public
-         *
-         * @type {any}
-         *
-         * @description
-         * Region subtag {@link http://www.unicode.org/reports/tr35/#Language_Locale_Field_Definitions}
-         */
-        region: any;
-
-        /**
-         * @name territory
-         * @memberof cldr.Attributes
-         * @kind property
-         * @access public
-         *
-         * @type {any}
-         *
-         * @description
-         * Region subtag (territory variant) {@link http://www.unicode.org/reports/tr35/#Language_Locale_Field_Definitions}
-         */
-        territory: any;
-
-        /**
-         * @name languageId
-         * @memberof cldr.Attributes
-         * @kind property
-         * @access public
-         *
-         * @type {any}
-         *
-         * @description
-         * Language Id {@link http://www.unicode.org/reports/tr35/#Unicode_language_identifier}
-         */
-        languageId: any;
-
-        /**
-         * @name maxLanguageId
-         * @memberof cldr.Attributes
-         * @kind property
-         * @access public
-         *
-         * @type {any}
-         *
-         * @description
-         * Maximized Language Id {@link http://www.unicode.org/reports/tr35/#Likely_Subtags}
-         */
-        maxLanguageId: any;
-
-        /**
-         * @name minLanguageId
-         * @memberof cldr.Attributes
-         * @kind property
-         * @access public
-         *
-         * @type {any}
-         *
-         * @description
-         * Minimized Language Id {@link http://www.unicode.org/reports/tr35/#Likely_Subtags}
-         */
-        minLanguageId: any;
-    }
-
-    /**
-     * @name CldrStatic
-     * @memberof cldr
-     * @kind interface
-     *
-     * @description
-     * The cldr class definition.
-     */
-    interface CldrStatic {
-        /**
-         * @name get
-         * @memberof cldr.CldrStatic
-         * @kind function
-         * @access public
-         *
-         * @description
-         * Get the item data given its path, or 'undefined' if missing.
-         *
-         * @param {string} path The path to the cldr member.
-         *
-         * @returns {any} The cldr member.
-         */
-        get(path: string) : any;
-
-        /**
-         * @name get
-         * @memberof cldr.CldrStatic
-         * @kind function
-         * @access public
-         *
-         * @description
-         * Get the item data given its path, or 'undefined' if missing.
-         *
-         * @param {Array<string>} paths The array with path parts to the cldr member.
-         *
-         * @returns {any} The cldr member.
-         */
-        get(paths: string[]): any;
-
-        /**
-         * @name main
-         * @memberof cldr.CldrStatic
-         * @kind function
-         * @access public
-         *
-         * @description
-         * It's an alias for .get(["main/{languageId}, ...])"
-         *
-         * @param {string} path The path to the cldr member.
-         *
-         * @returns {any} The cldr member.
-         */
-        main(path: string): any;
-
-        /**
-         * @name main
-         * @memberof cldr.CldrStatic
-         * @kind function
-         * @access public
-         *
-         * @declaration
-         * It's an alias for .get(["main/{languageId}, ...])"
-         *
-         * @param {Array<string>} paths The array with path parts to the cldr member.
-         *
-         * @returns {any} The cldr member.
-         */
-        main(paths: string[]): any;
-
-        /**
-         * @name locale
-         * @memberof cldr.CldrStatic
-         * @kind property
-         * @access public
-         *
-         * @type {string}
-         *
-         * @declaration
-         * The locale string.
-         */
-        locale: string;
-
-        /**
-         * @name attributes
-         * @memberof cldr.CldrStatic
-         * @kind property
-         * @access public
-         *
-         * @type {cldr.Attributes}
-         *
-         * @declaration
-         * The object created during instance initialization and used internally by .get()
-         * to replace dynamic parts of an item path.
-         */
-        attributes: Attributes;
-    }
-
-    /**
-     * @name CldrFactory
-     * @memberof cldr
-     * @kind inteface
-     *
-     * @description
-     * The factory for {@link cldr.CldrStatic} class.
-     */
-    interface CldrFactory {
-        /**
-         * @name load
-         * @memberof cldr.CldrFactory
-         * @kind function
-         * @access public
-         *
-         * @description
-         * Load the CLDR content in the form of JSON.
-         *
-         * @param {any} json The json content.
-         * @param {Array<any>} otherJson Optional. The parts of the JSON.
-         *
-         * @returns {void}
-         */
-        load(json: any, ...otherJson: any[]): void;
-
-        /**
-         * @name constructor
-         * @memberof cldr.CldrFactory
-         * @kind function
-         * @access public
-         *
-         * @description
-         * The constructor function for {@link cldr.CldrStatic} class.
-         *
-         * @param {string} locale The locale name that was previously loaded.
-         *
-         * @returns {cldr.CldrStatic} The instance of {@link cldr.CldrStatic} class.
-         */
-        new (locale: string): CldrStatic;
-
-        /**
-         * Allow user to override locale separator "-" (default) | "_".
-         * According to http://www.unicode.org/reports/tr35/#Unicode_language_identifier, both "-" and "_" are valid locale separators (eg. "en_GB", "en-GB").
-         * According to http://unicode.org/cldr/trac/ticket/6786 its usage must be consistent throughout the data set.
-         */
-        localeSep: "-" | "_";
-    }
-}
-
-declare module "cldr" {
-    export = cldr;
-}
-
-declare var Cldr: cldr.CldrFactory;
diff --git a/cldr.js/cldr.js-event-tests.ts b/cldrjs/cldr.js-event-tests.ts
similarity index 94%
rename from cldr.js/cldr.js-event-tests.ts
rename to cldrjs/cldr.js-event-tests.ts
index 1d397e4df3..89d971a63b 100644
--- a/cldr.js/cldr.js-event-tests.ts
+++ b/cldrjs/cldr.js-event-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="cldr.js.d.ts" />
 /// <reference path="cldr.js-event.d.ts" />
 
 Cldr.on("get", (path, value) => {
diff --git a/cldrjs/cldr.js-event.d.ts b/cldrjs/cldr.js-event.d.ts
new file mode 100644
index 0000000000..54df87ebd6
--- /dev/null
+++ b/cldrjs/cldr.js-event.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for Cldr.js 0.4.4
+// Project: https://github.com/rxaviers/cldrjs
+// Definitions by: Raman But-Husaim <https://github.com/RamanBut-Husaim>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// The definition file for event module.
+
+declare module "cldr/event" {
+    export = Cldr;
+}
diff --git a/cldr.js/cldr.js-supplemental-tests.ts b/cldrjs/cldr.js-supplemental-tests.ts
similarity index 80%
rename from cldr.js/cldr.js-supplemental-tests.ts
rename to cldrjs/cldr.js-supplemental-tests.ts
index 5827337973..b0c5cf5fad 100644
--- a/cldr.js/cldr.js-supplemental-tests.ts
+++ b/cldrjs/cldr.js-supplemental-tests.ts
@@ -1,7 +1,7 @@
-/// <reference path="cldr.js.d.ts" />
-/// <reference path="cldr.js-supplemental.d.ts" />
 
-const cldr = new Cldr("en");
+
+
+const myCldr = new Cldr("en");
 
 const supplemental = cldr.supplemental;
 
diff --git a/cldr.js/cldr.js-supplemental.d.ts b/cldrjs/cldr.js-supplemental.d.ts
similarity index 100%
rename from cldr.js/cldr.js-supplemental.d.ts
rename to cldrjs/cldr.js-supplemental.d.ts
diff --git a/cldr.js/cldr.js-tests.ts b/cldrjs/cldr.js-tests.ts
similarity index 99%
rename from cldr.js/cldr.js-tests.ts
rename to cldrjs/cldr.js-tests.ts
index c86d487741..94897ed5ed 100644
--- a/cldr.js/cldr.js-tests.ts
+++ b/cldrjs/cldr.js-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="cldr.js.d.ts" />
+
 
 Cldr.load({
     "main": {
diff --git a/cldrjs/index.d.ts b/cldrjs/index.d.ts
new file mode 100644
index 0000000000..6ac52371b3
--- /dev/null
+++ b/cldrjs/index.d.ts
@@ -0,0 +1,271 @@
+// Type definitions for Cldr.js 0.4.4
+// Project: https://github.com/rxaviers/cldrjs
+// Definitions by: Raman But-Husaim <https://github.com/RamanBut-Husaim>, Grégoire Castre <https://github.com/gcastre/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = self;
+export as namespace Cldr;
+
+declare var self: cldr.CldrFactory;
+
+declare namespace cldr {
+    /**
+     * @name Attributes
+     * @memberof cldr
+     * @kind interface
+     *
+     * @description
+     * The object created during instance initialization and used internally by .get()
+     * to replace dynamic parts of an item path.
+     */
+    interface Attributes {
+        /**
+         * @name language
+         * @memberof cldr.Attributes
+         * @kind property
+         * @access public
+         *
+         * @type {any}
+         *
+         * @description
+         * Language subtag {@link http://www.unicode.org/reports/tr35/#Language_Locale_Field_Definitions}
+         */
+        language: any;
+
+        /**
+         * @name script
+         * @memberof cldr.Attributes
+         * @kind property
+         * @access public
+         *
+         * @type {any}
+         *
+         * @description
+         * Script subtag {@link http://www.unicode.org/reports/tr35/#Language_Locale_Field_Definitions}
+         */
+        script: any;
+
+        /**
+         * @name region
+         * @memberof cldr.Attributes
+         * @kind property
+         * @access public
+         *
+         * @type {any}
+         *
+         * @description
+         * Region subtag {@link http://www.unicode.org/reports/tr35/#Language_Locale_Field_Definitions}
+         */
+        region: any;
+
+        /**
+         * @name territory
+         * @memberof cldr.Attributes
+         * @kind property
+         * @access public
+         *
+         * @type {any}
+         *
+         * @description
+         * Region subtag (territory variant) {@link http://www.unicode.org/reports/tr35/#Language_Locale_Field_Definitions}
+         */
+        territory: any;
+
+        /**
+         * @name languageId
+         * @memberof cldr.Attributes
+         * @kind property
+         * @access public
+         *
+         * @type {any}
+         *
+         * @description
+         * Language Id {@link http://www.unicode.org/reports/tr35/#Unicode_language_identifier}
+         */
+        languageId: any;
+
+        /**
+         * @name maxLanguageId
+         * @memberof cldr.Attributes
+         * @kind property
+         * @access public
+         *
+         * @type {any}
+         *
+         * @description
+         * Maximized Language Id {@link http://www.unicode.org/reports/tr35/#Likely_Subtags}
+         */
+        maxLanguageId: any;
+
+        /**
+         * @name minLanguageId
+         * @memberof cldr.Attributes
+         * @kind property
+         * @access public
+         *
+         * @type {any}
+         *
+         * @description
+         * Minimized Language Id {@link http://www.unicode.org/reports/tr35/#Likely_Subtags}
+         */
+        minLanguageId: any;
+    }
+
+    /**
+     * @name CldrStatic
+     * @memberof cldr
+     * @kind interface
+     *
+     * @description
+     * The cldr class definition.
+     */
+    interface CldrStatic {
+        /**
+         * @name get
+         * @memberof cldr.CldrStatic
+         * @kind function
+         * @access public
+         *
+         * @description
+         * Get the item data given its path, or 'undefined' if missing.
+         *
+         * @param {string} path The path to the cldr member.
+         *
+         * @returns {any} The cldr member.
+         */
+        get(path: string) : any;
+
+        /**
+         * @name get
+         * @memberof cldr.CldrStatic
+         * @kind function
+         * @access public
+         *
+         * @description
+         * Get the item data given its path, or 'undefined' if missing.
+         *
+         * @param {Array<string>} paths The array with path parts to the cldr member.
+         *
+         * @returns {any} The cldr member.
+         */
+        get(paths: string[]): any;
+
+        /**
+         * @name main
+         * @memberof cldr.CldrStatic
+         * @kind function
+         * @access public
+         *
+         * @description
+         * It's an alias for .get(["main/{languageId}, ...])"
+         *
+         * @param {string} path The path to the cldr member.
+         *
+         * @returns {any} The cldr member.
+         */
+        main(path: string): any;
+
+        /**
+         * @name main
+         * @memberof cldr.CldrStatic
+         * @kind function
+         * @access public
+         *
+         * @declaration
+         * It's an alias for .get(["main/{languageId}, ...])"
+         *
+         * @param {Array<string>} paths The array with path parts to the cldr member.
+         *
+         * @returns {any} The cldr member.
+         */
+        main(paths: string[]): any;
+
+        /**
+         * @name locale
+         * @memberof cldr.CldrStatic
+         * @kind property
+         * @access public
+         *
+         * @type {string}
+         *
+         * @declaration
+         * The locale string.
+         */
+        locale: string;
+
+        /**
+         * @name attributes
+         * @memberof cldr.CldrStatic
+         * @kind property
+         * @access public
+         *
+         * @type {cldr.Attributes}
+         *
+         * @declaration
+         * The object created during instance initialization and used internally by .get()
+         * to replace dynamic parts of an item path.
+         */
+        attributes: Attributes;
+    }
+
+    /**
+     * @name CldrFactory
+     * @memberof cldr
+     * @kind inteface
+     *
+     * @description
+     * The factory for {@link cldr.CldrStatic} class.
+     */
+    interface CldrFactory {
+        /**
+         * @name load
+         * @memberof cldr.CldrFactory
+         * @kind function
+         * @access public
+         *
+         * @description
+         * Load the CLDR content in the form of JSON.
+         *
+         * @param {any} json The json content.
+         * @param {Array<any>} otherJson Optional. The parts of the JSON.
+         *
+         * @returns {void}
+         */
+        load(json: any, ...otherJson: any[]): void;
+
+        /**
+         * @name constructor
+         * @memberof cldr.CldrFactory
+         * @kind function
+         * @access public
+         *
+         * @description
+         * The constructor function for {@link cldr.CldrStatic} class.
+         *
+         * @param {string} locale The locale name that was previously loaded.
+         *
+         * @returns {cldr.CldrStatic} The instance of {@link cldr.CldrStatic} class.
+         */
+        new (locale: string): CldrStatic;
+
+        /**
+         * Allow user to override locale separator "-" (default) | "_".
+         * According to http://www.unicode.org/reports/tr35/#Unicode_language_identifier, both "-" and "_" are valid locale separators (eg. "en_GB", "en-GB").
+         * According to http://unicode.org/cldr/trac/ticket/6786 its usage must be consistent throughout the data set.
+         */
+        localeSep: "-" | "_";
+    }
+
+    interface CldrStatic {
+        on(event:string, listener:(path:string, value:any) => void): void;
+        once(event:string, listener:(path:string, value:any) => void): void;
+        off(event:string, listener:(path:string, value:any) => void): void;
+    }
+
+    interface CldrFactory {
+        on(event:string, listener:(path:string, value:any) => void): void;
+        once(event:string, listener:(path:string, value:any) => void): void;
+        off(event:string, listener:(path:string, value:any) => void): void;
+    }
+
+}
diff --git a/cldrjs/tsconfig.json b/cldrjs/tsconfig.json
new file mode 100644
index 0000000000..6a9facbbf0
--- /dev/null
+++ b/cldrjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "cldr.js-event-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/clean-css/clean-css-tests.ts b/clean-css/clean-css-tests.ts
index ffbb3d1278..1ba3953cfd 100644
--- a/clean-css/clean-css-tests.ts
+++ b/clean-css/clean-css-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="clean-css.d.ts" />
 
 import * as CleanCSS from 'clean-css';
 
diff --git a/clean-css/clean-css.d.ts b/clean-css/clean-css.d.ts
deleted file mode 100644
index 752be96571..0000000000
--- a/clean-css/clean-css.d.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-// Type definitions for clean-css v3.4.9
-// Project: https://github.com/jakubpawlowicz/clean-css
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'clean-css' {
-  namespace CleanCSS {
-    interface Options {
-      // Set to false to disable advanced optimizations - selector & property merging, reduction, etc.
-      advanced?: boolean;
-
-      // Set to false to disable aggressive merging of properties.
-      aggressiveMerging?: boolean;
-
-      // Turns on benchmarking mode measuring time spent on cleaning up (run npm run bench to see example)
-      benchmark?: boolean;
-
-      // Enables compatibility mode
-      compatibility?: Object;
-
-      // Set to true to get minification statistics under stats property (see test/custom-test.js for examples)
-      debug?: boolean;
-
-      // A hash of options for @import inliner, see test/protocol-imports-test.js for examples, or this comment for a proxy use case.
-      inliner?: Object;
-
-      // Whether to keep line breaks (default is false)
-      keepBreaks?: boolean;
-
-      // * for keeping all (default), 1 for keeping first one only, 0 for removing all
-      keepSpecialComments?: string | number;
-
-      // Whether to merge @media at-rules (default is true)
-      mediaMerging?: boolean;
-
-      // Whether to process @import rules
-      processImport?: boolean;
-
-      // A list of @import rules, can be ['all'] (default), ['local'], ['remote'], or a blacklisted path e.g. ['!fonts.googleapis.com']
-      processImportFrom?: Array<string>;
-
-      // Set to false to skip URL rebasing
-      rebase?: boolean;
-
-      // Path to resolve relative @import rules and URLs
-      relativeTo?: string;
-
-      // Set to false to disable restructuring in advanced optimizations
-      restructuring?: boolean;
-
-      // Path to resolve absolute @import rules and rebase relative URLs
-      root?: string;
-
-      // Rounding precision; defaults to 2; -1 disables rounding
-      roundingPrecision?: number;
-
-      // Set to true to enable semantic merging mode which assumes BEM-like content (default is false as it's highly likely this will break your stylesheets - use with caution!)
-      semanticMerging?: boolean;
-
-      // Set to false to skip shorthand compacting (default is true unless sourceMap is set when it's false)
-      shorthandCompacting?: boolean;
-
-      // Exposes source map under sourceMap property, e.g. new CleanCSS().minify(source).sourceMap (default is false) If input styles are a product of CSS preprocessor (Less, Sass) an input source map can be passed as a string.
-      sourceMap?: boolean | string;
-
-      // Set to true to inline sources inside a source map's sourcesContent field (defaults to false) It is also required to process inlined sources from input source maps.
-      sourceMapInlineSources?: boolean;
-
-      // Path to a folder or an output file to which rebase all URLs
-      target?: string;
-    }
-
-    interface Output {
-      // Optimized output CSS as a string
-      styles: string;
-
-      // Output source map (if requested with sourceMap option)
-      sourceMap: string;
-
-      // A list of errors raised
-      errors: Array<string>;
-
-      // A list of warnings raised
-      warnings: Array<string>;
-
-      // A hash of statistic information (if requested with debug option)
-      stats: {
-        // Original content size (after import inlining)
-        originalSize: number;
-
-        // Optimized content size
-        minifiedSize: number;
-
-        // Time spent on optimizations
-        timeSpent: number;
-
-        // A ratio of output size to input size (e.g. 25% if content was reduced from 100 bytes to 75 bytes)
-        efficiency: number;
-      };
-    }
-  }
-
-  class CleanCSS {
-    constructor(options?: CleanCSS.Options);
-    minify(sources: string | Array<string> | Object, callback?: (error: any, minified: CleanCSS.Output) => void): CleanCSS.Output;
-  }
-
-  export = CleanCSS;
-}
diff --git a/clean-css/index.d.ts b/clean-css/index.d.ts
new file mode 100644
index 0000000000..012977f035
--- /dev/null
+++ b/clean-css/index.d.ts
@@ -0,0 +1,108 @@
+// Type definitions for clean-css v3.4.9
+// Project: https://github.com/jakubpawlowicz/clean-css
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare namespace CleanCSS {
+    interface Options {
+        // Set to false to disable advanced optimizations - selector & property merging, reduction, etc.
+        advanced?: boolean;
+
+        // Set to false to disable aggressive merging of properties.
+        aggressiveMerging?: boolean;
+
+        // Turns on benchmarking mode measuring time spent on cleaning up (run npm run bench to see example)
+        benchmark?: boolean;
+
+        // Enables compatibility mode
+        compatibility?: Object;
+
+        // Set to true to get minification statistics under stats property (see test/custom-test.js for examples)
+        debug?: boolean;
+
+        // A hash of options for @import inliner, see test/protocol-imports-test.js for examples, or this comment for a proxy use case.
+        inliner?: Object;
+
+        // Whether to keep line breaks (default is false)
+        keepBreaks?: boolean;
+
+        // * for keeping all (default), 1 for keeping first one only, 0 for removing all
+        keepSpecialComments?: string | number;
+
+        // Whether to merge @media at-rules (default is true)
+        mediaMerging?: boolean;
+
+        // Whether to process @import rules
+        processImport?: boolean;
+
+        // A list of @import rules, can be ['all'] (default), ['local'], ['remote'], or a blacklisted path e.g. ['!fonts.googleapis.com']
+        processImportFrom?: Array<string>;
+
+        // Set to false to skip URL rebasing
+        rebase?: boolean;
+
+        // Path to resolve relative @import rules and URLs
+        relativeTo?: string;
+
+        // Set to false to disable restructuring in advanced optimizations
+        restructuring?: boolean;
+
+        // Path to resolve absolute @import rules and rebase relative URLs
+        root?: string;
+
+        // Rounding precision; defaults to 2; -1 disables rounding
+        roundingPrecision?: number;
+
+        // Set to true to enable semantic merging mode which assumes BEM-like content (default is false as it's highly likely this will break your stylesheets - use with caution!)
+        semanticMerging?: boolean;
+
+        // Set to false to skip shorthand compacting (default is true unless sourceMap is set when it's false)
+        shorthandCompacting?: boolean;
+
+        // Exposes source map under sourceMap property, e.g. new CleanCSS().minify(source).sourceMap (default is false) If input styles are a product of CSS preprocessor (Less, Sass) an input source map can be passed as a string.
+        sourceMap?: boolean | string;
+
+        // Set to true to inline sources inside a source map's sourcesContent field (defaults to false) It is also required to process inlined sources from input source maps.
+        sourceMapInlineSources?: boolean;
+
+        // Path to a folder or an output file to which rebase all URLs
+        target?: string;
+    }
+
+    interface Output {
+        // Optimized output CSS as a string
+        styles: string;
+
+        // Output source map (if requested with sourceMap option)
+        sourceMap: string;
+
+        // A list of errors raised
+        errors: Array<string>;
+
+        // A list of warnings raised
+        warnings: Array<string>;
+
+        // A hash of statistic information (if requested with debug option)
+        stats: {
+            // Original content size (after import inlining)
+            originalSize: number;
+
+            // Optimized content size
+            minifiedSize: number;
+
+            // Time spent on optimizations
+            timeSpent: number;
+
+            // A ratio of output size to input size (e.g. 25% if content was reduced from 100 bytes to 75 bytes)
+            efficiency: number;
+        };
+    }
+}
+
+declare class CleanCSS {
+    constructor(options?: CleanCSS.Options);
+    minify(sources: string | Array<string> | Object, callback?: (error: any, minified: CleanCSS.Output) => void): CleanCSS.Output;
+}
+
+export = CleanCSS;
diff --git a/clean-css/tsconfig.json b/clean-css/tsconfig.json
new file mode 100644
index 0000000000..48f14ac317
--- /dev/null
+++ b/clean-css/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "clean-css-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cli-color/cli-color-tests.ts b/cli-color/cli-color-tests.ts
index 627377b47f..0c4261da19 100644
--- a/cli-color/cli-color-tests.ts
+++ b/cli-color/cli-color-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="cli-color.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import clc = require('cli-color');
 import ansiTrim = require('cli-color/trim');
diff --git a/cli-color/cli-color.d.ts b/cli-color/index.d.ts
similarity index 100%
rename from cli-color/cli-color.d.ts
rename to cli-color/index.d.ts
diff --git a/cli-color/tsconfig.json b/cli-color/tsconfig.json
new file mode 100644
index 0000000000..197da35aa4
--- /dev/null
+++ b/cli-color/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cli-color-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cli/cli-tests.ts b/cli/cli-tests.ts
index 44ff7e66e7..294cb7dd8b 100644
--- a/cli/cli-tests.ts
+++ b/cli/cli-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./cli.d.ts" />
 
 import * as cli from "cli";
 
@@ -93,10 +92,10 @@ console.log(cli.args);
 // ==============================================================================
 
 //You can (optionally) boost the width of output with:
-cli.width = 120;
+// cli.width = 120;
 
 //You can also adjust the width of the options/command definitions
-cli.option_width = 25;
+// cli.option_width = 25;
 
 var long_desc = 'Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry\'s '
               + 'standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make'
diff --git a/cli/cli.d.ts b/cli/cli.d.ts
deleted file mode 100644
index 2283d3d283..0000000000
--- a/cli/cli.d.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-// Type definitions for cli v0.11.2
-// Project: https://www.npmjs.com/package/cli
-// Definitions by: Klaus Reimer <https://github.com/kayahr>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "cli" {
-    interface CLI {
-        app: string;
-        version: string;
-        argv: string[];
-        argc: number;
-        options: any;
-        args: string[];
-        command: string;
-        width: number;
-        option_width: number;
-        native: any;
-        output(message?: any, ...optionalParams: any[]): void;
-        exit(code: number): void;
-        no_color: boolean;
-        enable(...plugins: string[]): CLI;
-        disable(...plugins: string[]): CLI;
-        setArgv(argv: string | Array<any>, keepArg0?: boolean): void;
-        next(): string;
-        parse(opts?: { [long: string]: { 0: string | boolean, 1: string, 2?: string, 3?: any } },
-              commands?: { [name: string]: string } | string[]): any;
-        autocompleteCommand(command: string): string;
-        info(msg: string): void;
-        error(msg: string): void;
-        ok(msg: string): void;
-        debug(msg: string): void;
-        fatal(msg: string): void;
-        setApp(appName: string, version: string): CLI;
-        setApp(packageJson: string): CLI;
-        parsePackageJson(path?: string): void;
-        setUsage(usage: string): CLI;
-        getUsage(code?: number): void;
-        getOptError(expects: string, type: string): string;
-        getValue(defaultVal: string, validateFunc: (value: any) => any, errMsg: string): void;
-        getInt(defaultVal: number): number;
-        getDate(defaultVal: Date): Date;
-        getFloat(defaultVal: number): number;
-        getUrl(defautltVal: string, identifier?: string): string;
-        getEmail(defaultVal: string): string;
-        getIp(defaultVal: string): string;
-        getPath(defaultVal: string, identifier?: string): string;
-        getArrayValue<T>(arr: T[], defaultVal: T): T;
-        withStdin(callback: (data: string) => void): void;
-        withStdin(encoding: string, callback: (text: string) => void): void;
-        withStdinLines(callback: (lines: string[], newline: string) => void): void;
-        withInput(file: string, encoding: string, callback: (line: string, newline: string, eof: boolean) => void): void;
-        withInput(file: string, callback: (line: string, newline: string, eof: boolean) => void): void;
-        withInput(callback: (line: string, newline: string, eof: boolean) => void): void;
-        toType(object: any): string;
-        daemon(arg: string, callback: () => void): void;
-        main(callback: (args: string[], options: any) => void): void;
-        createServer(...args: any[]): any;
-        exec(cmd: string, callback?: (lines: string[]) => void, errback?: (err: any, stdout: string) => void): void;
-        progress(progress: number, decimals?: number, stream?: NodeJS.WritableStream): void;
-        spinner(prefix?: string | boolean, end?: boolean, stream?: NodeJS.WritableStream): void;
-    }
-    const cli: CLI;
-    export = cli;
-}
diff --git a/cli/index.d.ts b/cli/index.d.ts
new file mode 100644
index 0000000000..b06e20b423
--- /dev/null
+++ b/cli/index.d.ts
@@ -0,0 +1,65 @@
+// Type definitions for cli v0.11.2
+// Project: https://www.npmjs.com/package/cli
+// Definitions by: Klaus Reimer <https://github.com/kayahr>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+interface CLI {
+    app: string;
+    version: string;
+    argv: string[];
+    argc: number;
+    options: any;
+    args: string[];
+    command: string;
+    width: number;
+    option_width: number;
+    native: any;
+    output(message?: any, ...optionalParams: any[]): void;
+    exit(code: number): void;
+    no_color: boolean;
+    enable(...plugins: string[]): CLI;
+    disable(...plugins: string[]): CLI;
+    setArgv(argv: string | Array<any>, keepArg0?: boolean): void;
+    next(): string;
+    parse(opts?: { [long: string]: { 0: string | boolean, 1: string, 2?: string, 3?: any } },
+        commands?: { [name: string]: string } | string[]): any;
+    autocompleteCommand(command: string): string;
+    info(msg: string): void;
+    error(msg: string): void;
+    ok(msg: string): void;
+    debug(msg: string): void;
+    fatal(msg: string): void;
+    setApp(appName: string, version: string): CLI;
+    setApp(packageJson: string): CLI;
+    parsePackageJson(path?: string): void;
+    setUsage(usage: string): CLI;
+    getUsage(code?: number): void;
+    getOptError(expects: string, type: string): string;
+    getValue(defaultVal: string, validateFunc: (value: any) => any, errMsg: string): void;
+    getInt(defaultVal: number): number;
+    getDate(defaultVal: Date): Date;
+    getFloat(defaultVal: number): number;
+    getUrl(defautltVal: string, identifier?: string): string;
+    getEmail(defaultVal: string): string;
+    getIp(defaultVal: string): string;
+    getPath(defaultVal: string, identifier?: string): string;
+    getArrayValue<T>(arr: T[], defaultVal: T): T;
+    withStdin(callback: (data: string) => void): void;
+    withStdin(encoding: string, callback: (text: string) => void): void;
+    withStdinLines(callback: (lines: string[], newline: string) => void): void;
+    withInput(file: string, encoding: string, callback: (line: string, newline: string, eof: boolean) => void): void;
+    withInput(file: string, callback: (line: string, newline: string, eof: boolean) => void): void;
+    withInput(callback: (line: string, newline: string, eof: boolean) => void): void;
+    toType(object: any): string;
+    daemon(arg: string, callback: () => void): void;
+    main(callback: (args: string[], options: any) => void): void;
+    createServer(...args: any[]): any;
+    exec(cmd: string, callback?: (lines: string[]) => void, errback?: (err: any, stdout: string) => void): void;
+    progress(progress: number, decimals?: number, stream?: NodeJS.WritableStream): void;
+    spinner(prefix?: string | boolean, end?: boolean, stream?: NodeJS.WritableStream): void;
+}
+declare const cli: CLI;
+export = cli;
diff --git a/cli/tsconfig.json b/cli/tsconfig.json
new file mode 100644
index 0000000000..e9c3ce98f6
--- /dev/null
+++ b/cli/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cli-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/clipboard/clipboard-tests.ts b/clipboard/clipboard-tests.ts
index 1a19fbf230..c6c7b756cb 100644
--- a/clipboard/clipboard-tests.ts
+++ b/clipboard/clipboard-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="clipboard.d.ts" />
+
 
 var cb1 = new Clipboard('.btn');
 var cb2 = new Clipboard(document.getElementById('id'), {
diff --git a/clipboard/clipboard.d.ts b/clipboard/index.d.ts
similarity index 100%
rename from clipboard/clipboard.d.ts
rename to clipboard/index.d.ts
diff --git a/clipboard/tsconfig.json b/clipboard/tsconfig.json
new file mode 100644
index 0000000000..b7a4bfab61
--- /dev/null
+++ b/clipboard/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "clipboard-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/clone/clone-tests.ts b/clone/clone-tests.ts
index 8cb0681fd6..372eb185a9 100644
--- a/clone/clone-tests.ts
+++ b/clone/clone-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./clone.d.ts" />
 
 import clone = require("clone");
 
diff --git a/clone/clone.d.ts b/clone/clone.d.ts
deleted file mode 100644
index 79c05cef00..0000000000
--- a/clone/clone.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-// Type definitions for clone 0.1.11
-// Project: https://github.com/pvorb/node-clone
-// Definitions by: Kieran Simpson <https://github.com/kierans/DefinitelyTyped>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/**
- * See clone JS source for API docs
- */
-declare module "clone" {
-    /**
-     * @param val the value that you want to clone, any type allowed
-     * @param circular Call clone with circular set to false if you are certain that obj contains no circular references. This will give better performance if needed. There is no error if undefined or null is passed as obj.
-     * @param depth to wich the object is to be cloned (optional, defaults to infinity)
-     */
-    function clone<T>(val: T, circular?: boolean, depth?: number): T;
-
-    namespace clone {
-        /**
-         * @param obj the object that you want to clone
-         */
-        function clonePrototype<T>(obj: T): T;
-    }
-
-    export = clone
-}
diff --git a/clone/index.d.ts b/clone/index.d.ts
new file mode 100644
index 0000000000..07fb70d94d
--- /dev/null
+++ b/clone/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for clone 0.1.11
+// Project: https://github.com/pvorb/node-clone
+// Definitions by: Kieran Simpson <https://github.com/kierans/DefinitelyTyped>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * See clone JS source for API docs
+ */
+
+/**
+ * @param val the value that you want to clone, any type allowed
+ * @param circular Call clone with circular set to false if you are certain that obj contains no circular references. This will give better performance if needed. There is no error if undefined or null is passed as obj.
+ * @param depth to wich the object is to be cloned (optional, defaults to infinity)
+ */
+declare function clone<T>(val: T, circular?: boolean, depth?: number): T;
+
+declare namespace clone {
+    /**
+     * @param obj the object that you want to clone
+     */
+    function clonePrototype<T>(obj: T): T;
+}
+
+export = clone
diff --git a/clone/tsconfig.json b/clone/tsconfig.json
new file mode 100644
index 0000000000..acb2e94c52
--- /dev/null
+++ b/clone/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "clone-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/closure-compiler/closure-compiler-tests.ts b/closure-compiler/closure-compiler-tests.ts
index e0bd650a36..3dd827a0f8 100644
--- a/closure-compiler/closure-compiler-tests.ts
+++ b/closure-compiler/closure-compiler-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="closure-compiler.d.ts"/>
 import {compile} from 'closure-compiler';
 
 compile('some.source()', {'check-only': null},
diff --git a/closure-compiler/closure-compiler.d.ts b/closure-compiler/closure-compiler.d.ts
deleted file mode 100644
index 2e875afbdb..0000000000
--- a/closure-compiler/closure-compiler.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Type definitions for closure-compiler
-// Project: https://github.com/tim-smart/node-closure/
-// Definitions by: Martin Probst <https://github.com/mprobst>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'closure-compiler' {
-  type Callback = (err: Error, stdout: string, stderr: string) => any;
-  function compile(src: string, callback: Callback): void;
-  function compile(src: string, options: {[k: string]: string | string[]},
-                   callback: Callback): void;
-}
diff --git a/closure-compiler/index.d.ts b/closure-compiler/index.d.ts
new file mode 100644
index 0000000000..a253dca835
--- /dev/null
+++ b/closure-compiler/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for closure-compiler
+// Project: https://github.com/tim-smart/node-closure/
+// Definitions by: Martin Probst <https://github.com/mprobst>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export type Callback = (err: Error, stdout: string, stderr: string) => any;
+export function compile(src: string, callback: Callback): void;
+export function compile(src: string, options: { [k: string]: string | string[] },
+    callback: Callback): void;
diff --git a/closure-compiler/tsconfig.json b/closure-compiler/tsconfig.json
new file mode 100644
index 0000000000..854c1d5978
--- /dev/null
+++ b/closure-compiler/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "closure-compiler-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/codemirror/codemirror-matchbrackets-tests.ts b/codemirror/codemirror-matchbrackets-tests.ts
index 2189612c02..bfaaaa4ede 100644
--- a/codemirror/codemirror-matchbrackets-tests.ts
+++ b/codemirror/codemirror-matchbrackets-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="codemirror.d.ts" />
-/// <reference path="codemirror-matchbrackets.d.ts" />
+
+
 
 var myCodeMirror: CodeMirror.Editor = CodeMirror(document.body, { matchBrackets: true });
diff --git a/codemirror/codemirror-runmode-tests.ts b/codemirror/codemirror-runmode-tests.ts
index e139e7177b..ff673652c8 100644
--- a/codemirror/codemirror-runmode-tests.ts
+++ b/codemirror/codemirror-runmode-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="codemirror.d.ts" />
-/// <reference path="codemirror-runmode.d.ts" />
+
+
 
 var query = "SELECT * FROM Table";
 
diff --git a/codemirror/codemirror-showhint-tests.ts b/codemirror/codemirror-showhint-tests.ts
index b00333b29e..59521ed440 100644
--- a/codemirror/codemirror-showhint-tests.ts
+++ b/codemirror/codemirror-showhint-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="codemirror.d.ts" />
-/// <reference path="codemirror-showhint.d.ts" />
+
+
 var doc = new CodeMirror.Doc('text');
 var pos = new CodeMirror.Pos(2, 3);
 CodeMirror.showHint(doc);
diff --git a/codemirror/codemirror-tests.ts b/codemirror/codemirror-tests.ts
index 89bd1d16f3..c7b4e32ac6 100644
--- a/codemirror/codemirror-tests.ts
+++ b/codemirror/codemirror-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="codemirror.d.ts" />
+import CodeMirror = require('codemirror');
 
 var myCodeMirror: CodeMirror.Editor = CodeMirror(document.body);
 
diff --git a/codemirror/codemirror.d.ts b/codemirror/codemirror.d.ts
deleted file mode 100644
index 6196d015c6..0000000000
--- a/codemirror/codemirror.d.ts
+++ /dev/null
@@ -1,1126 +0,0 @@
-// Type definitions for CodeMirror
-// Project: https://github.com/marijnh/CodeMirror
-// Definitions by: mihailik <https://github.com/mihailik>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare function CodeMirror(host: HTMLElement, options?: CodeMirror.EditorConfiguration): CodeMirror.Editor;
-declare function CodeMirror(callback: (host: HTMLElement) => void , options?: CodeMirror.EditorConfiguration): CodeMirror.Editor;
-
-declare namespace CodeMirror {
-    export var Doc : CodeMirror.DocConstructor;
-    export var Pos: CodeMirror.PositionConstructor;
-    export var Pass: any;
-
-    function fromTextArea(host: HTMLTextAreaElement, options?: EditorConfiguration): CodeMirror.EditorFromTextArea;
-
-    var version: string;
-
-    /** If you want to define extra methods in terms of the CodeMirror API, it is possible to use defineExtension.
-    This will cause the given value(usually a method) to be added to all CodeMirror instances created from then on. */
-    function defineExtension(name: string, value: any): void;
-
-    /** Like defineExtension, but the method will be added to the interface for Doc objects instead. */
-    function defineDocExtension(name: string, value: any): void;
-
-    /** Similarly, defineOption can be used to define new options for CodeMirror.
-    The updateFunc will be called with the editor instance and the new value when an editor is initialized,
-    and whenever the option is modified through setOption. */
-    function defineOption(name: string, default_: any, updateFunc: Function): void;
-
-    /** If your extention just needs to run some code whenever a CodeMirror instance is initialized, use CodeMirror.defineInitHook.
-    Give it a function as its only argument, and from then on, that function will be called (with the instance as argument)
-    whenever a new CodeMirror instance is initialized. */
-    function defineInitHook(func: Function): void;
-
-    /** Registers a helper value with the given name in the given namespace (type). This is used to define functionality
-    that may be looked up by mode. Will create (if it doesn't already exist) a property on the CodeMirror object for
-    the given type, pointing to an object that maps names to values. I.e. after doing
-    CodeMirror.registerHelper("hint", "foo", myFoo), the value CodeMirror.hint.foo will point to myFoo. */
-    function registerHelper(namespace: string, name: string, helper: any): void;
-
-
-    function on(element: any, eventName: string, handler: Function): void;
-    function off(element: any, eventName: string, handler: Function): void;
-
-    /** Fired whenever a change occurs to the document. changeObj has a similar type as the object passed to the editor's "change" event,
-    but it never has a next property, because document change events are not batched (whereas editor change events are). */
-    function on(doc: Doc, eventName: 'change', handler: (instance: Doc, change: EditorChange) => void ): void;
-    function off(doc: Doc, eventName: 'change', handler: (instance: Doc, change: EditorChange) => void ): void;
-
-    /** See the description of the same event on editor instances. */
-    function on(doc: Doc, eventName: 'beforeChange', handler: (instance: Doc, change: EditorChangeCancellable) => void ): void;
-    function off(doc: Doc, eventName: 'beforeChange', handler: (instance: Doc, change: EditorChangeCancellable) => void ): void;
-
-    /** Fired whenever the cursor or selection in this document changes. */
-    function on(doc: Doc, eventName: 'cursorActivity', handler: (instance: CodeMirror.Editor) => void ): void;
-    function off(doc: Doc, eventName: 'cursorActivity', handler: (instance: CodeMirror.Editor) => void ): void;
-
-    /** Equivalent to the event by the same name as fired on editor instances. */
-    function on(doc: Doc, eventName: 'beforeSelectionChange', handler: (instance: CodeMirror.Editor, selection: { head: Position; anchor: Position; }) => void ): void;
-    function off(doc: Doc, eventName: 'beforeSelectionChange', handler: (instance: CodeMirror.Editor, selection: { head: Position; anchor: Position; }) => void ): void;
-
-    /** Will be fired when the line object is deleted. A line object is associated with the start of the line.
-    Mostly useful when you need to find out when your gutter markers on a given line are removed. */
-    function on(line: LineHandle, eventName: 'delete', handler: () => void ): void;
-    function off(line: LineHandle, eventName: 'delete', handler: () => void ): void;
-
-    /** Fires when the line's text content is changed in any way (but the line is not deleted outright).
-    The change object is similar to the one passed to change event on the editor object. */
-    function on(line: LineHandle, eventName: 'change', handler: (line: LineHandle, change: EditorChange) => void ): void;
-    function off(line: LineHandle, eventName: 'change', handler: (line: LineHandle, change: EditorChange) => void ): void;
-
-    /** Fired when the cursor enters the marked range. From this event handler, the editor state may be inspected but not modified,
-    with the exception that the range on which the event fires may be cleared. */
-    function on(marker: TextMarker, eventName: 'beforeCursorEnter', handler: () => void ): void;
-    function off(marker: TextMarker, eventName: 'beforeCursorEnter', handler: () => void ): void;
-
-    /** Fired when the range is cleared, either through cursor movement in combination with clearOnEnter or through a call to its clear() method.
-    Will only be fired once per handle. Note that deleting the range through text editing does not fire this event,
-    because an undo action might bring the range back into existence. */
-    function on(marker: TextMarker, eventName: 'clear', handler: () => void ): void;
-    function off(marker: TextMarker, eventName: 'clear', handler: () => void ): void;
-
-    /** Fired when the last part of the marker is removed from the document by editing operations. */
-    function on(marker: TextMarker, eventName: 'hide', handler: () => void ): void;
-    function off(marker: TextMarker, eventName: 'hide', handler: () => void ): void;
-
-    /** Fired when, after the marker was removed by editing, a undo operation brought the marker back. */
-    function on(marker: TextMarker, eventName: 'unhide', handler: () => void ): void;
-    function off(marker: TextMarker, eventName: 'unhide', handler: () => void ): void;
-
-    /** Fired whenever the editor re-adds the widget to the DOM. This will happen once right after the widget is added (if it is scrolled into view),
-    and then again whenever it is scrolled out of view and back in again, or when changes to the editor options
-    or the line the widget is on require the widget to be redrawn. */
-    function on(line: LineWidget, eventName: 'redraw', handler: () => void ): void;
-    function off(line: LineWidget, eventName: 'redraw', handler: () => void ): void;
-
-    /** Various CodeMirror-related objects emit events, which allow client code to react to various situations.
-    Handlers for such events can be registered with the on and off methods on the objects that the event fires on.
-    To fire your own events, use CodeMirror.signal(target, name, args...), where target is a non-DOM-node object. */
-    function signal(target: any, name: string, ...args: any[]): void;
-
-    interface Editor {
-
-        /** Tells you whether the editor currently has focus. */
-        hasFocus(): boolean;
-
-        /** Used to find the target position for horizontal cursor motion.start is a { line , ch } object,
-        amount an integer(may be negative), and unit one of the string "char", "column", or "word".
-        Will return a position that is produced by moving amount times the distance specified by unit.
-        When visually is true , motion in right - to - left text will be visual rather than logical.
-        When the motion was clipped by hitting the end or start of the document, the returned value will have a hitSide property set to true. */
-        findPosH(start: CodeMirror.Position, amount: number, unit: string, visually: boolean): { line: number; ch: number; hitSide?: boolean; };
-
-        /** Similar to findPosH , but used for vertical motion.unit may be "line" or "page".
-        The other arguments and the returned value have the same interpretation as they have in findPosH. */
-        findPosV(start: CodeMirror.Position, amount: number, unit: string): { line: number; ch: number; hitSide?: boolean; };
-
-
-        /** Change the configuration of the editor. option should the name of an option, and value should be a valid value for that option. */
-        setOption(option: string, value: any): void;
-
-        /** Retrieves the current value of the given option for this editor instance. */
-        getOption(option: string): any;
-
-        /** Attach an additional keymap to the editor.
-        This is mostly useful for add - ons that need to register some key handlers without trampling on the extraKeys option.
-        Maps added in this way have a higher precedence than the extraKeys and keyMap options, and between them,
-        the maps added earlier have a lower precedence than those added later, unless the bottom argument was passed,
-        in which case they end up below other keymaps added with this method. */
-        addKeyMap(map: any, bottom?: boolean): void;
-
-        /** Disable a keymap added with addKeyMap.Either pass in the keymap object itself , or a string,
-        which will be compared against the name property of the active keymaps. */
-        removeKeyMap(map: any): void;
-
-        /** Enable a highlighting overlay.This is a stateless mini - mode that can be used to add extra highlighting.
-        For example, the search add - on uses it to highlight the term that's currently being searched.
-        mode can be a mode spec or a mode object (an object with a token method). The options parameter is optional. If given, it should be an object.
-        Currently, only the opaque option is recognized. This defaults to off, but can be given to allow the overlay styling, when not null,
-        to override the styling of the base mode entirely, instead of the two being applied together. */
-        addOverlay(mode: any, options?: any): void;
-
-        /** Pass this the exact argument passed for the mode parameter to addOverlay to remove an overlay again. */
-        removeOverlay(mode: any): void;
-
-
-        /** Retrieve the currently active document from an editor. */
-        getDoc(): CodeMirror.Doc;
-
-        /** Attach a new document to the editor. Returns the old document, which is now no longer associated with an editor. */
-        swapDoc(doc: CodeMirror.Doc): CodeMirror.Doc;
-
-        /** Get the content of the current editor document. You can pass it an optional argument to specify the string to be used to separate lines (defaults to "\n"). */
-        getValue(seperator?: string): string;
-
-        /** Set the content of the current editor document. */
-        setValue(content: string): void;
-
-        /** Sets the gutter marker for the given gutter (identified by its CSS class, see the gutters option) to the given value.
-        Value can be either null, to clear the marker, or a DOM element, to set it. The DOM element will be shown in the specified gutter next to the specified line. */
-        setGutterMarker(line: any, gutterID: string, value: HTMLElement): CodeMirror.LineHandle;
-
-        /** Remove all gutter markers in the gutter with the given ID. */
-        clearGutter(gutterID: string): void;
-
-        /** Set a CSS class name for the given line.line can be a number or a line handle.
-        where determines to which element this class should be applied, can can be one of "text" (the text element, which lies in front of the selection),
-        "background"(a background element that will be behind the selection),
-        or "wrap" (the wrapper node that wraps all of the line's elements, including gutter elements).
-        class should be the name of the class to apply. */
-        addLineClass(line: any, where: string, _class_: string): CodeMirror.LineHandle;
-
-        /** Remove a CSS class from a line.line can be a line handle or number.
-        where should be one of "text", "background", or "wrap"(see addLineClass).
-        class can be left off to remove all classes for the specified node, or be a string to remove only a specific class. */
-        removeLineClass(line: any, where: string, class_: string): CodeMirror.LineHandle;
-
-        /** Returns the line number, text content, and marker status of the given line, which can be either a number or a line handle. */
-        lineInfo(line: any): {
-            line: any;
-            handle: any;
-            text: string;
-            /** Object mapping gutter IDs to marker elements. */
-            gutterMarks: any;
-            textClass: string;
-            bgClass: string;
-            wrapClass: string;
-            /** Array of line widgets attached to this line. */
-            widgets: any;
-        };
-
-        /** Puts node, which should be an absolutely positioned DOM node, into the editor, positioned right below the given { line , ch } position.
-        When scrollIntoView is true, the editor will ensure that the entire node is visible (if possible).
-        To remove the widget again, simply use DOM methods (move it somewhere else, or call removeChild on its parent). */
-        addWidget(pos: CodeMirror.Position, node: HTMLElement, scrollIntoView: boolean): void;
-
-        /** Adds a line widget, an element shown below a line, spanning the whole of the editor's width, and moving the lines below it downwards.
-        line should be either an integer or a line handle, and node should be a DOM node, which will be displayed below the given line.
-        options, when given, should be an object that configures the behavior of the widget.
-        Note that the widget node will become a descendant of nodes with CodeMirror-specific CSS classes, and those classes might in some cases affect it. */
-        addLineWidget(line: any, node: HTMLElement, options?: {
-            /** Whether the widget should cover the gutter. */
-            coverGutter: boolean;
-            /** Whether the widget should stay fixed in the face of horizontal scrolling. */
-            noHScroll: boolean;
-            /** Causes the widget to be placed above instead of below the text of the line. */
-            above: boolean;
-            /** When true, will cause the widget to be rendered even if the line it is associated with is hidden. */
-            showIfHidden: boolean;
-        }): CodeMirror.LineWidget;
-
-
-        /** Programatically set the size of the editor (overriding the applicable CSS rules).
-        width and height height can be either numbers(interpreted as pixels) or CSS units ("100%", for example).
-        You can pass null for either of them to indicate that that dimension should not be changed. */
-        setSize(width: any, height: any): void;
-
-        /** Scroll the editor to a given(pixel) position.Both arguments may be left as null or undefined to have no effect. */
-        scrollTo(x: number, y: number): void;
-
-        /** Get an { left , top , width , height , clientWidth , clientHeight } object that represents the current scroll position, the size of the scrollable area,
-        and the size of the visible area(minus scrollbars). */
-        getScrollInfo(): {
-            left: any;
-            top: any;
-            width: any;
-            height: any;
-            clientWidth: any;
-            clientHeight: any;
-        }
-
-        /** Scrolls the given element into view. pos is a { line , ch } position, referring to a given character, null, to refer to the cursor.
-        The margin parameter is optional. When given, it indicates the amount of pixels around the given area that should be made visible as well. */
-        scrollIntoView(pos: CodeMirror.Position, margin?: number): void;
-
-        /** Scrolls the given element into view. pos is a { left , top , right , bottom } object, in editor-local coordinates.
-        The margin parameter is optional. When given, it indicates the amount of pixels around the given area that should be made visible as well. */
-        scrollIntoView(pos: { left: number; top: number; right: number; bottom: number; }, margin: number): void;
-
-        /** Scrolls the given element into view. pos is a { line, ch } object, in editor-local coordinates.
-        The margin parameter is optional. When given, it indicates the amount of pixels around the given area that should be made visible as well. */
-        scrollIntoView(pos: { line: number, ch: number }, margin?: number): void;
-
-        /** Scrolls the given element into view. pos is a { from, to } object, in editor-local coordinates.
-        The margin parameter is optional. When given, it indicates the amount of pixels around the given area that should be made visible as well. */
-        scrollIntoView(pos: { from: CodeMirror.Position, to: CodeMirror.Position }, margin: number): void;
-
-        /** Returns an { left , top , bottom } object containing the coordinates of the cursor position.
-        If mode is "local" , they will be relative to the top-left corner of the editable document.
-        If it is "page" or not given, they are relative to the top-left corner of the page.
-        where is a boolean indicating whether you want the start(true) or the end(false) of the selection. */
-        cursorCoords(where: boolean, mode: string): { left: number; top: number; bottom: number; };
-
-        /** Returns an { left , top , bottom } object containing the coordinates of the cursor position.
-        If mode is "local" , they will be relative to the top-left corner of the editable document.
-        If it is "page" or not given, they are relative to the top-left corner of the page.
-        where specifies the precise position at which you want to measure. */
-        cursorCoords(where: CodeMirror.Position, mode: string): { left: number; top: number; bottom: number; };
-
-        /** Returns the position and dimensions of an arbitrary character.pos should be a { line , ch } object.
-        This differs from cursorCoords in that it'll give the size of the whole character,
-        rather than just the position that the cursor would have when it would sit at that position. */
-        charCoords(pos: CodeMirror.Position, mode: string): { left: number; right: number; top: number; bottom: number; };
-
-        /** Given an { left , top } object , returns the { line , ch } position that corresponds to it.
-        The optional mode parameter determines relative to what the coordinates are interpreted. It may be "window" , "page"(the default) , or "local". */
-        coordsChar(object: { left: number; top: number; }, mode?: string): CodeMirror.Position;
-
-        /** Returns the line height of the default font for the editor. */
-        defaultTextHeight(): number;
-
-        /** Returns the pixel width of an 'x' in the default font for the editor.
-        (Note that for non - monospace fonts , this is mostly useless, and even for monospace fonts, non - ascii characters might have a different width). */
-        defaultCharWidth(): number;
-
-        /** Returns a { from , to } object indicating the start (inclusive) and end (exclusive) of the currently rendered part of the document.
-        In big documents, when most content is scrolled out of view, CodeMirror will only render the visible part, and a margin around it.
-        See also the viewportChange event. */
-        getViewport(): { from: number; to: number };
-
-        /** If your code does something to change the size of the editor element (window resizes are already listened for), or unhides it,
-        you should probably follow up by calling this method to ensure CodeMirror is still looking as intended. */
-        refresh(): void;
-
-
-        /** Retrieves information about the token the current mode found before the given position (a {line, ch} object). */
-        getTokenAt(pos: CodeMirror.Position): {
-            /** The character(on the given line) at which the token starts. */
-            start: number;
-            /** The character at which the token ends. */
-            end: number;
-            /** The token's string. */
-            string: string;
-            /** The token type the mode assigned to the token, such as "keyword" or "comment" (may also be null). */
-            type: string;
-            /** The mode's state at the end of this token. */
-            state: any;
-        };
-
-        /** Returns the mode's parser state, if any, at the end of the given line number.
-        If no line number is given, the state at the end of the document is returned.
-        This can be useful for storing parsing errors in the state, or getting other kinds of contextual information for a line. */
-        getStateAfter(line?: number): any;
-
-        /** CodeMirror internally buffers changes and only updates its DOM structure after it has finished performing some operation.
-        If you need to perform a lot of operations on a CodeMirror instance, you can call this method with a function argument.
-        It will call the function, buffering up all changes, and only doing the expensive update after the function returns.
-        This can be a lot faster. The return value from this method will be the return value of your function. */
-        operation<T>(fn: ()=> T): T;
-
-        /** Adjust the indentation of the given line.
-        The second argument (which defaults to "smart") may be one of:
-        "prev" Base indentation on the indentation of the previous line.
-        "smart" Use the mode's smart indentation if available, behave like "prev" otherwise.
-        "add" Increase the indentation of the line by one indent unit.
-        "subtract" Reduce the indentation of the line. */
-        indentLine(line: number, dir?: string): void;
-
-
-        /** Give the editor focus. */
-        focus(): void;
-
-        /** Returns the hidden textarea used to read input. */
-        getInputField(): HTMLTextAreaElement;
-
-        /** Returns the DOM node that represents the editor, and controls its size. Remove this from your tree to delete an editor instance. */
-        getWrapperElement(): HTMLElement;
-
-        /** Returns the DOM node that is responsible for the scrolling of the editor. */
-        getScrollerElement(): HTMLElement;
-
-        /** Fetches the DOM node that contains the editor gutters. */
-        getGutterElement(): HTMLElement;
-
-
-
-        /** Events are registered with the on method (and removed with the off method).
-        These are the events that fire on the instance object. The name of the event is followed by the arguments that will be passed to the handler.
-        The instance argument always refers to the editor instance. */
-        on(eventName: string, handler: (instance: CodeMirror.Editor) => void ): void;
-        off(eventName: string, handler: (instance: CodeMirror.Editor) => void ): void;
-
-        /** Fires every time the content of the editor is changed. */
-        on(eventName: 'change', handler: (instance: CodeMirror.Editor, change: CodeMirror.EditorChangeLinkedList) => void ): void;
-        off(eventName: 'change', handler: (instance: CodeMirror.Editor, change: CodeMirror.EditorChangeLinkedList) => void ): void;
-
-        /** Like the "change" event, but batched per operation, passing an
-         * array containing all the changes that happened in the operation.
-         * This event is fired after the operation finished, and display
-         * changes it makes will trigger a new operation. */
-        on(eventName: 'changes', handler: (instance: CodeMirror.Editor, change: CodeMirror.EditorChangeLinkedList[]) => void ): void;
-        off(eventName: 'changes', handler: (instance: CodeMirror.Editor, change: CodeMirror.EditorChangeLinkedList[]) => void ): void;
-
-        /** This event is fired before a change is applied, and its handler may choose to modify or cancel the change.
-        The changeObj never has a next property, since this is fired for each individual change, and not batched per operation.
-        Note: you may not do anything from a "beforeChange" handler that would cause changes to the document or its visualization.
-        Doing so will, since this handler is called directly from the bowels of the CodeMirror implementation,
-        probably cause the editor to become corrupted. */
-        on(eventName: 'beforeChange', handler: (instance: CodeMirror.Editor, change: CodeMirror.EditorChangeCancellable) => void ): void;
-        off(eventName: 'beforeChange', handler: (instance: CodeMirror.Editor, change: CodeMirror.EditorChangeCancellable) => void ): void;
-
-        /** Will be fired when the cursor or selection moves, or any change is made to the editor content. */
-        on(eventName: 'cursorActivity', handler: (instance: CodeMirror.Editor) => void ): void;
-        off(eventName: 'cursorActivity', handler: (instance: CodeMirror.Editor) => void ): void;
-
-        /** This event is fired before the selection is moved. Its handler may modify the resulting selection head and anchor.
-        Handlers for this event have the same restriction as "beforeChange" handlers � they should not do anything to directly update the state of the editor. */
-        on(eventName: 'beforeSelectionChange', handler: (instance: CodeMirror.Editor, selection: { head: CodeMirror.Position; anchor: CodeMirror.Position; }) => void ): void;
-        off(eventName: 'beforeSelectionChange', handler: (instance: CodeMirror.Editor, selection: { head: CodeMirror.Position; anchor: CodeMirror.Position; }) => void ): void;
-
-        /** Fires whenever the view port of the editor changes (due to scrolling, editing, or any other factor).
-        The from and to arguments give the new start and end of the viewport. */
-        on(eventName: 'viewportChange', handler: (instance: CodeMirror.Editor, from: number, to: number) => void ): void;
-        off(eventName: 'viewportChange', handler: (instance: CodeMirror.Editor, from: number, to: number) => void ): void;
-
-        /** Fires when the editor gutter (the line-number area) is clicked. Will pass the editor instance as first argument,
-        the (zero-based) number of the line that was clicked as second argument, the CSS class of the gutter that was clicked as third argument,
-        and the raw mousedown event object as fourth argument. */
-        on(eventName: 'gutterClick', handler: (instance: CodeMirror.Editor, line: number, gutter: string, clickEvent: Event) => void ): void;
-        off(eventName: 'gutterClick', handler: (instance: CodeMirror.Editor, line: number, gutter: string, clickEvent: Event) => void ): void;
-
-        /** Fires whenever the editor is focused. */
-        on(eventName: 'focus', handler: (instance: CodeMirror.Editor) => void ): void;
-        off(eventName: 'focus', handler: (instance: CodeMirror.Editor) => void ): void;
-
-        /** Fires whenever the editor is unfocused. */
-        on(eventName: 'blur', handler: (instance: CodeMirror.Editor) => void ): void;
-        off(eventName: 'blur', handler: (instance: CodeMirror.Editor) => void ): void;
-
-        /** Fires when the editor is scrolled. */
-        on(eventName: 'scroll', handler: (instance: CodeMirror.Editor) => void ): void;
-        off(eventName: 'scroll', handler: (instance: CodeMirror.Editor) => void ): void;
-
-        /** Will be fired whenever CodeMirror updates its DOM display. */
-        on(eventName: 'update', handler: (instance: CodeMirror.Editor) => void ): void;
-        off(eventName: 'update', handler: (instance: CodeMirror.Editor) => void ): void;
-
-        /** Fired whenever a line is (re-)rendered to the DOM. Fired right after the DOM element is built, before it is added to the document.
-        The handler may mess with the style of the resulting element, or add event handlers, but should not try to change the state of the editor. */
-        on(eventName: 'renderLine', handler: (instance: CodeMirror.Editor, line: number, element: HTMLElement) => void ): void;
-        off(eventName: 'renderLine', handler: (instance: CodeMirror.Editor, line: number, element: HTMLElement) => void ): void;
-
-        /** Expose the state object, so that the Editor.state.completionActive property is reachable*/
-        state: any;
-    }
-
-    interface EditorFromTextArea extends Editor {
-
-        /** Copy the content of the editor into the textarea. */
-        save(): void;
-
-        /** Remove the editor, and restore the original textarea (with the editor's current content). */
-        toTextArea(): void;
-
-        /** Returns the textarea that the instance was based on. */
-        getTextArea(): HTMLTextAreaElement;
-    }
-
-    interface DocConstructor {
-        new (text: string, mode?: any, firstLineNumber?: number, lineSep?: string): Doc;
-        (text: string, mode?: any, firstLineNumber?: number, lineSep?: string): Doc;
-    }
-
-    interface Doc {
-        /** Get the current editor content. You can pass it an optional argument to specify the string to be used to separate lines (defaults to "\n"). */
-        getValue(seperator?: string): string;
-
-        /** Set the editor content. */
-        setValue(content: string): void;
-
-        /** Get the text between the given points in the editor, which should be {line, ch} objects.
-        An optional third argument can be given to indicate the line separator string to use (defaults to "\n"). */
-        getRange(from: Position, to: CodeMirror.Position, seperator?: string): string;
-
-        /** Replace the part of the document between from and to with the given string.
-        from and to must be {line, ch} objects. to can be left off to simply insert the string at position from. */
-        replaceRange(replacement: string, from: CodeMirror.Position, to: CodeMirror.Position): void;
-
-        /** Get the content of line n. */
-        getLine(n: number): string;
-
-        /** Set the content of line n. */
-        setLine(n: number, text: string): void;
-
-        /** Remove the given line from the document. */
-        removeLine(n: number): void;
-
-        /** Get the number of lines in the editor. */
-        lineCount(): number;
-
-        /** Get the first line of the editor. This will usually be zero but for linked sub-views,
-        or documents instantiated with a non-zero first line, it might return other values. */
-        firstLine(): number;
-
-        /** Get the last line of the editor. This will usually be lineCount() - 1, but for linked sub-views, it might return other values. */
-        lastLine(): number;
-
-        /** Fetches the line handle for the given line number. */
-        getLineHandle(num: number): CodeMirror.LineHandle;
-
-        /** Given a line handle, returns the current position of that line (or null when it is no longer in the document). */
-        getLineNumber(handle: CodeMirror.LineHandle): number;
-
-        /** Iterate over the whole document, and call f for each line, passing the line handle.
-        This is a faster way to visit a range of line handlers than calling getLineHandle for each of them.
-        Note that line handles have a text property containing the line's content (as a string). */
-        eachLine(f: (line: CodeMirror.LineHandle) => void ): void;
-
-        /** Iterate over the range from start up to (not including) end, and call f for each line, passing the line handle.
-        This is a faster way to visit a range of line handlers than calling getLineHandle for each of them.
-        Note that line handles have a text property containing the line's content (as a string). */
-        eachLine(start: number, end: number, f: (line: CodeMirror.LineHandle) => void ): void;
-
-        /** Set the editor content as 'clean', a flag that it will retain until it is edited, and which will be set again when such an edit is undone again.
-        Useful to track whether the content needs to be saved. */
-        markClean(): void;
-
-        /** Returns whether the document is currently clean (not modified since initialization or the last call to markClean). */
-        isClean(): boolean;
-
-
-
-        /** Get the currently selected code. */
-        getSelection(): string;
-
-        /** Replace the selection with the given string. By default, the new selection will span the inserted text.
-        The optional collapse argument can be used to change this � passing "start" or "end" will collapse the selection to the start or end of the inserted text. */
-        replaceSelection(replacement: string, collapse?: string): void;
-
-        /** start is a an optional string indicating which end of the selection to return.
-        It may be "start" , "end" , "head"(the side of the selection that moves when you press shift + arrow),
-        or "anchor"(the fixed side of the selection).Omitting the argument is the same as passing "head".A { line , ch } object will be returned. */
-        getCursor(start?: string): CodeMirror.Position;
-
-        /** Retrieves a list of all current selections. These will always be sorted, and never overlap (overlapping selections are merged).
-        Each object in the array contains anchor and head properties referring to {line, ch} objects. */
-        listSelections(): { anchor: CodeMirror.Position; head: CodeMirror.Position }[];
-
-        /** Return true if any text is selected. */
-        somethingSelected(): boolean;
-
-        /** Set the cursor position.You can either pass a single { line , ch } object , or the line and the character as two separate parameters. */
-        setCursor(pos: CodeMirror.Position): void;
-
-        /** Set the selection range.anchor and head should be { line , ch } objects.head defaults to anchor when not given. */
-        setSelection(anchor: CodeMirror.Position, head: CodeMirror.Position): void;
-
-        /** Similar to setSelection , but will, if shift is held or the extending flag is set,
-        move the head of the selection while leaving the anchor at its current place.
-        pos2 is optional , and can be passed to ensure a region (for example a word or paragraph) will end up selected
-        (in addition to whatever lies between that region and the current anchor). */
-        extendSelection(from: CodeMirror.Position, to?: CodeMirror.Position): void;
-
-        /** Sets or clears the 'extending' flag , which acts similar to the shift key,
-        in that it will cause cursor movement and calls to extendSelection to leave the selection anchor in place. */
-        setExtending(value: boolean): void;
-
-
-        /** Retrieve the editor associated with a document. May return null. */
-        getEditor(): CodeMirror.Editor;
-
-
-        /** Create an identical copy of the given doc. When copyHistory is true , the history will also be copied.Can not be called directly on an editor. */
-        copy(copyHistory: boolean): CodeMirror.Doc;
-
-        /** Create a new document that's linked to the target document. Linked documents will stay in sync (changes to one are also applied to the other) until unlinked. */
-        linkedDoc(options: {
-            /** When turned on, the linked copy will share an undo history with the original.
-            Thus, something done in one of the two can be undone in the other, and vice versa. */
-            sharedHist?: boolean;
-            from?: number;
-            /** Can be given to make the new document a subview of the original. Subviews only show a given range of lines.
-            Note that line coordinates inside the subview will be consistent with those of the parent,
-            so that for example a subview starting at line 10 will refer to its first line as line 10, not 0. */
-            to?: number;
-            /** By default, the new document inherits the mode of the parent. This option can be set to a mode spec to give it a different mode. */
-            mode: any;
-        }): CodeMirror.Doc;
-
-        /** Break the link between two documents. After calling this , changes will no longer propagate between the documents,
-        and, if they had a shared history, the history will become separate. */
-        unlinkDoc(doc: CodeMirror.Doc): void;
-
-        /** Will call the given function for all documents linked to the target document. It will be passed two arguments,
-        the linked document and a boolean indicating whether that document shares history with the target. */
-        iterLinkedDocs(fn: (doc: CodeMirror.Doc, sharedHist: boolean) => void ): void;
-
-        /** Undo one edit (if any undo events are stored). */
-        undo(): void;
-
-        /** Redo one undone edit. */
-        redo(): void;
-
-        /** Returns an object with {undo, redo } properties , both of which hold integers , indicating the amount of stored undo and redo operations. */
-        historySize(): { undo: number; redo: number; };
-
-        /** Clears the editor's undo history. */
-        clearHistory(): void;
-
-        /** Get a(JSON - serializeable) representation of the undo history. */
-        getHistory(): any;
-
-        /** Replace the editor's undo history with the one provided, which must be a value as returned by getHistory.
-        Note that this will have entirely undefined results if the editor content isn't also the same as it was when getHistory was called. */
-        setHistory(history: any): void;
-
-
-        /** Can be used to mark a range of text with a specific CSS class name. from and to should be { line , ch } objects. */
-        markText(from: CodeMirror.Position, to: CodeMirror.Position, options?: CodeMirror.TextMarkerOptions): TextMarker;
-
-        /** Inserts a bookmark, a handle that follows the text around it as it is being edited, at the given position.
-        A bookmark has two methods find() and clear(). The first returns the current position of the bookmark, if it is still in the document,
-        and the second explicitly removes the bookmark. */
-        setBookmark(pos: CodeMirror.Position, options?: {
-            /** Can be used to display a DOM node at the current location of the bookmark (analogous to the replacedWith option to markText). */
-            widget?: HTMLElement;
-
-            /** By default, text typed when the cursor is on top of the bookmark will end up to the right of the bookmark.
-            Set this option to true to make it go to the left instead. */
-            insertLeft?: boolean;
-        }): CodeMirror.TextMarker;
-
-        /** Returns an array of all the bookmarks and marked ranges found between the given positions. */
-        findMarks(from: CodeMirror.Position, to: CodeMirror.Position): TextMarker[];
-
-        /** Returns an array of all the bookmarks and marked ranges present at the given position. */
-        findMarksAt(pos: CodeMirror.Position): TextMarker[];
-
-        /** Returns an array containing all marked ranges in the document. */
-        getAllMarks(): CodeMirror.TextMarker[];
-
-
-        /** Gets the mode object for the editor. Note that this is distinct from getOption("mode"), which gives you the mode specification,
-        rather than the resolved, instantiated mode object. */
-        getMode(): any;
-
-        /** Calculates and returns a { line , ch } object for a zero-based index whose value is relative to the start of the editor's text.
-        If the index is out of range of the text then the returned object is clipped to start or end of the text respectively. */
-        posFromIndex(index: number): CodeMirror.Position;
-
-        /** The reverse of posFromIndex. */
-        indexFromPos(object: CodeMirror.Position): number;
-
-        /** Expose the state object, so that the Doc.state.completionActive property is reachable*/
-        state: any;
-    }
-
-    interface LineHandle {
-        text: string;
-    }
-
-    interface TextMarker {
-        /** Remove the mark. */
-        clear(): void;
-
-        /** Returns a {from, to} object (both holding document positions), indicating the current position of the marked range,
-        or undefined if the marker is no longer in the document. */
-        find(): CodeMirror.Range;
-
-        /**  Returns an object representing the options for the marker. If copyWidget is given true, it will clone the value of the replacedWith option, if any. */
-        getOptions(copyWidget: boolean): CodeMirror.TextMarkerOptions;
-    }
-
-    interface LineWidget {
-        /** Removes the widget. */
-        clear(): void;
-
-        /** Call this if you made some change to the widget's DOM node that might affect its height.
-        It'll force CodeMirror to update the height of the line that contains the widget. */
-        changed(): void;
-    }
-
-    interface EditorChange {
-        /** Position (in the pre-change coordinate system) where the change started. */
-        from: CodeMirror.Position;
-        /** Position (in the pre-change coordinate system) where the change ended. */
-        to: CodeMirror.Position;
-        /** Array of strings representing the text that replaced the changed range (split by line). */
-        text: string[];
-        /**  Text that used to be between from and to, which is overwritten by this change. */
-        removed: string[];
-        /**  String representing the origin of the change event and wether it can be merged with history */
-        origin: string;
-    }
-
-    interface EditorChangeLinkedList extends CodeMirror.EditorChange {
-        /** Points to another change object (which may point to another, etc). */
-        next?: CodeMirror.EditorChangeLinkedList;
-    }
-
-    interface EditorChangeCancellable extends CodeMirror.EditorChange {
-        /** may be used to modify the change. All three arguments to update are optional, and can be left off to leave the existing value for that field intact. */
-        update(from?: CodeMirror.Position, to?: CodeMirror.Position, text?: string): void;
-
-        cancel(): void;
-    }
-
-    interface PositionConstructor {
-        new (line: number, ch?: number): Position;
-        (line: number, ch?: number): Position;
-    }
-
-    interface Range{
-        from: CodeMirror.Position;
-        to: CodeMirror.Position;
-    }
-
-    interface Position {
-        ch: number;
-        line: number;
-    }
-
-    interface EditorConfiguration {
-        /** string| The starting value of the editor. Can be a string, or a document object. */
-        value?: any;
-
-        /** string|object. The mode to use. When not given, this will default to the first mode that was loaded.
-        It may be a string, which either simply names the mode or is a MIME type associated with the mode.
-        Alternatively, it may be an object containing configuration options for the mode,
-        with a name property that names the mode (for example {name: "javascript", json: true}). */
-        mode?: any;
-
-        /** The theme to style the editor with. You must make sure the CSS file defining the corresponding .cm-s-[name] styles is loaded.
-        The default is "default". */
-        theme?: string;
-
-        /** How many spaces a block (whatever that means in the edited language) should be indented. The default is 2. */
-        indentUnit?: number;
-
-        /** Whether to use the context-sensitive indentation that the mode provides (or just indent the same as the line before). Defaults to true. */
-        smartIndent?: boolean;
-
-        /** The width of a tab character. Defaults to 4. */
-        tabSize?: number;
-
-        /** Whether, when indenting, the first N*tabSize spaces should be replaced by N tabs. Default is false. */
-        indentWithTabs?: boolean;
-
-        /** Configures whether the editor should re-indent the current line when a character is typed
-        that might change its proper indentation (only works if the mode supports indentation). Default is true. */
-        electricChars?: boolean;
-
-        /** Determines whether horizontal cursor movement through right-to-left (Arabic, Hebrew) text
-        is visual (pressing the left arrow moves the cursor left)
-        or logical (pressing the left arrow moves to the next lower index in the string, which is visually right in right-to-left text).
-        The default is false on Windows, and true on other platforms. */
-        rtlMoveVisually?: boolean;
-
-        /** Configures the keymap to use. The default is "default", which is the only keymap defined in codemirror.js itself.
-        Extra keymaps are found in the keymap directory. See the section on keymaps for more information. */
-        keyMap?: string;
-
-        /** Can be used to specify extra keybindings for the editor, alongside the ones defined by keyMap. Should be either null, or a valid keymap value. */
-        extraKeys?: any;
-
-        /** Whether CodeMirror should scroll or wrap for long lines. Defaults to false (scroll). */
-        lineWrapping?: boolean;
-
-        /** Whether to show line numbers to the left of the editor. */
-        lineNumbers?: boolean;
-
-        /** At which number to start counting lines. Default is 1. */
-        firstLineNumber?: number;
-
-        /** A function used to format line numbers. The function is passed the line number, and should return a string that will be shown in the gutter. */
-        lineNumberFormatter?: (line: number) => string;
-
-        /** Can be used to add extra gutters (beyond or instead of the line number gutter).
-        Should be an array of CSS class names, each of which defines a width (and optionally a background),
-        and which will be used to draw the background of the gutters.
-        May include the CodeMirror-linenumbers class, in order to explicitly set the position of the line number gutter
-        (it will default to be to the right of all other gutters). These class names are the keys passed to setGutterMarker. */
-        gutters?: string[];
-
-        /** Determines whether the gutter scrolls along with the content horizontally (false)
-        or whether it stays fixed during horizontal scrolling (true, the default). */
-        fixedGutter?: boolean;
-
-        /** boolean|string. This disables editing of the editor content by the user. If the special value "nocursor" is given (instead of simply true), focusing of the editor is also disallowed. */
-        readOnly?: any;
-
-        /**Whether the cursor should be drawn when a selection is active. Defaults to false. */
-        showCursorWhenSelecting?: boolean;
-
-        /** The maximum number of undo levels that the editor stores. Defaults to 40. */
-        undoDepth?: number;
-
-        /** The period of inactivity (in milliseconds) that will cause a new history event to be started when typing or deleting. Defaults to 500. */
-        historyEventDelay?: number;
-
-        /** The tab index to assign to the editor. If not given, no tab index will be assigned. */
-        tabindex?: number;
-
-        /** Can be used to make CodeMirror focus itself on initialization. Defaults to off.
-        When fromTextArea is used, and no explicit value is given for this option, it will be set to true when either the source textarea is focused,
-        or it has an autofocus attribute and no other element is focused. */
-        autofocus?: boolean;
-
-        /** Controls whether drag-and - drop is enabled. On by default. */
-        dragDrop?: boolean;
-
-        /** When given , this will be called when the editor is handling a dragenter , dragover , or drop event.
-        It will be passed the editor instance and the event object as arguments.
-        The callback can choose to handle the event itself , in which case it should return true to indicate that CodeMirror should not do anything further. */
-        onDragEvent?: (instance: CodeMirror.Editor, event: Event) => boolean;
-
-        /** This provides a rather low - level hook into CodeMirror's key handling.
-        If provided, this function will be called on every keydown, keyup, and keypress event that CodeMirror captures.
-        It will be passed two arguments, the editor instance and the key event.
-        This key event is pretty much the raw key event, except that a stop() method is always added to it.
-        You could feed it to, for example, jQuery.Event to further normalize it.
-        This function can inspect the key event, and handle it if it wants to.
-        It may return true to tell CodeMirror to ignore the event.
-        Be wary that, on some browsers, stopping a keydown does not stop the keypress from firing, whereas on others it does.
-        If you respond to an event, you should probably inspect its type property and only do something when it is keydown
-        (or keypress for actions that need character data). */
-        onKeyEvent?: (instance: CodeMirror.Editor, event: Event) => boolean;
-
-        /** Half - period in milliseconds used for cursor blinking. The default blink rate is 530ms. */
-        cursorBlinkRate?: number;
-
-        /** Determines the height of the cursor. Default is 1 , meaning it spans the whole height of the line.
-        For some fonts (and by some tastes) a smaller height (for example 0.85),
-        which causes the cursor to not reach all the way to the bottom of the line, looks better */
-        cursorHeight?: number;
-
-        /** Highlighting is done by a pseudo background - thread that will work for workTime milliseconds,
-        and then use timeout to sleep for workDelay milliseconds.
-        The defaults are 200 and 300, you can change these options to make the highlighting more or less aggressive. */
-        workTime?: number;
-
-        /** See workTime. */
-        workDelay?: number;
-
-        /** Indicates how quickly CodeMirror should poll its input textarea for changes(when focused).
-        Most input is captured by events, but some things, like IME input on some browsers, don't generate events that allow CodeMirror to properly detect it.
-        Thus, it polls. Default is 100 milliseconds. */
-        pollInterval?: number
-
-        /** By default, CodeMirror will combine adjacent tokens into a single span if they have the same class.
-        This will result in a simpler DOM tree, and thus perform better. With some kinds of styling(such as rounded corners),
-        this will change the way the document looks. You can set this option to false to disable this behavior. */
-        flattenSpans?: boolean;
-
-        /** When highlighting long lines, in order to stay responsive, the editor will give up and simply style
-        the rest of the line as plain text when it reaches a certain position. The default is 10000.
-        You can set this to Infinity to turn off this behavior. */
-        maxHighlightLength?: number;
-
-        /** Specifies the amount of lines that are rendered above and below the part of the document that's currently scrolled into view.
-        This affects the amount of updates needed when scrolling, and the amount of work that such an update does.
-        You should usually leave it at its default, 10. Can be set to Infinity to make sure the whole document is always rendered,
-        and thus the browser's text search works on it. This will have bad effects on performance of big documents. */
-        viewportMargin?: number;
-
-        /** Optional lint configuration to be used in conjunction with CodeMirror's linter addon. */
-        lint?: boolean | LintOptions;
-
-        /** Optional value to be used in conjunction with CodeMirror’s placeholder add-on. */
-        placeholder?: string;
-    }
-
-    interface TextMarkerOptions {
-        /** Assigns a CSS class to the marked stretch of text. */
-        className?: string;
-
-        /** Determines whether text inserted on the left of the marker will end up inside or outside of it. */
-        inclusiveLeft?: boolean;
-
-        /** Like inclusiveLeft , but for the right side. */
-        inclusiveRight?: boolean;
-
-        /** Atomic ranges act as a single unit when cursor movement is concerned — i.e. it is impossible to place the cursor inside of them.
-        In atomic ranges, inclusiveLeft and inclusiveRight have a different meaning — they will prevent the cursor from being placed
-        respectively directly before and directly after the range. */
-        atomic?: boolean;
-
-        /** Collapsed ranges do not show up in the display.Setting a range to be collapsed will automatically make it atomic. */
-        collapsed?: boolean;
-
-        /** When enabled, will cause the mark to clear itself whenever the cursor enters its range.
-        This is mostly useful for text - replacement widgets that need to 'snap open' when the user tries to edit them.
-        The "clear" event fired on the range handle can be used to be notified when this happens. */
-        clearOnEnter?: boolean;
-
-        /** Determines whether the mark is automatically cleared when it becomes empty. Default is true. */
-        clearWhenEmpty?: boolean;
-
-        /** Use a given node to display this range.Implies both collapsed and atomic.
-        The given DOM node must be an inline element(as opposed to a block element). */
-        replacedWith?: HTMLElement;
-
-        /** When replacedWith is given, this determines whether the editor will
-         * capture mouse and drag events occurring in this widget. Default is
-         * false—the events will be left alone for the default browser handler,
-         * or specific handlers on the widget, to capture. */
-        handleMouseEvents?: boolean;
-
-        /** A read - only span can, as long as it is not cleared, not be modified except by calling setValue to reset the whole document.
-        Note: adding a read - only span currently clears the undo history of the editor,
-        because existing undo events being partially nullified by read - only spans would corrupt the history (in the current implementation). */
-        readOnly?: boolean;
-
-        /** When set to true (default is false), adding this marker will create an event in the undo history that can be individually undone(clearing the marker). */
-        addToHistory?: boolean;
-
-        /** Can be used to specify an extra CSS class to be applied to the leftmost span that is part of the marker. */
-        startStyle?: string;
-
-        /** Equivalent to startStyle, but for the rightmost span. */
-        endStyle?: string;
-
-        /** A string of CSS to be applied to the covered text. For example "color: #fe3". */
-        css?: string;
-
-        /** When given, will give the nodes created for this span a HTML title attribute with the given value. */
-        title?: string;
-
-        /** When the target document is linked to other documents, you can set shared to true to make the marker appear in all documents.
-        By default, a marker appears only in its target document. */
-        shared?: boolean;
-    }
-
-    interface StringStream {
-        lastColumnPos: number;
-        lastColumnValue: number;
-        lineStart: number;
-
-        /**
-         * Current position in the string.
-         */
-        pos: number;
-
-        /**
-         * Where the stream's position was when it was first passed to the token function.
-         */
-        start: number;
-
-        /**
-         * The current line's content.
-         */
-        string: string;
-
-        /**
-         * Number of spaces per tab character.
-         */
-        tabSize: number;
-
-        /**
-         * Returns true only if the stream is at the end of the line.
-         */
-        eol(): boolean;
-
-        /**
-         * Returns true only if the stream is at the start of the line.
-         */
-        sol(): boolean;
-
-        /**
-         * Returns the next character in the stream without advancing it. Will return an null at the end of the line.
-         */
-        peek(): string;
-
-        /**
-         * Returns the next character in the stream and advances it. Also returns null when no more characters are available.
-         */
-        next(): string;
-
-        /**
-         * match can be a character, a regular expression, or a function that takes a character and returns a boolean.
-         * If the next character in the stream 'matches' the given argument, it is consumed and returned.
-         * Otherwise, undefined is returned.
-         */
-        eat(match: string): string;
-        eat(match: RegExp): string;
-        eat(match: (char: string) => boolean): string;
-
-        /**
-         * Repeatedly calls eat with the given argument, until it fails. Returns true if any characters were eaten.
-         */
-        eatWhile(match: string): boolean;
-        eatWhile(match: RegExp): boolean;
-        eatWhile(match: (char: string) => boolean): boolean;
-
-        /**
-         * Shortcut for eatWhile when matching white-space.
-         */
-        eatSpace(): boolean;
-
-        /**
-         * Moves the position to the end of the line.
-         */
-        skipToEnd(): void;
-
-        /**
-         * Skips to the next occurrence of the given character, if found on the current line (doesn't advance the stream if
-         * the character does not occur on the line).
-         *
-         * Returns true if the character was found.
-         */
-        skipTo(ch: string): boolean;
-
-        /**
-         * Act like a multi-character eat - if consume is true or not given - or a look-ahead that doesn't update the stream
-         * position - if it is false. pattern can be either a string or a regular expression starting with ^. When it is a
-         * string, caseFold can be set to true to make the match case-insensitive. When successfully matching a regular
-         * expression, the returned value will be the array returned by match, in case you need to extract matched groups.
-         */
-        match(pattern: string, consume?: boolean, caseFold?: boolean): boolean;
-        match(pattern: RegExp, consume?: boolean): string[];
-
-        /**
-         * Backs up the stream n characters. Backing it up further than the start of the current token will cause things to
-         * break, so be careful.
-         */
-        backUp(n: number): void;
-
-        /**
-         * Returns the column (taking into account tabs) at which the current token starts.
-         */
-        column(): number;
-
-        /**
-         * Tells you how far the current line has been indented, in spaces. Corrects for tab characters.
-         */
-        indentation(): number;
-
-        /**
-         * Get the string between the start of the current token and the current stream position.
-         */
-        current(): string;
-    }
-
-    /**
-     * A Mode is, in the simplest case, a lexer (tokenizer) for your language — a function that takes a character stream as input,
-     * advances it past a token, and returns a style for that token. More advanced modes can also handle indentation for the language.
-     */
-    interface Mode<T> {
-        /**
-         * This function should read one token from the stream it is given as an argument, optionally update its state,
-         * and return a style string, or null for tokens that do not have to be styled. Multiple styles can be returned, separated by spaces.
-         */
-        token(stream: StringStream, state: T): string;
-
-        /**
-         * A function that produces a state object to be used at the start of a document.
-         */
-        startState?: () => T;
-        /**
-         * For languages that have significant blank lines, you can define a blankLine(state) method on your mode that will get called
-         * whenever a blank line is passed over, so that it can update the parser state.
-         */
-        blankLine?: (state: T) => void;
-        /**
-         * Given a state returns a safe copy of that state.
-         */
-        copyState?: (state: T) => T;
-
-        /**
-         * The indentation method should inspect the given state object, and optionally the textAfter string, which contains the text on
-         * the line that is being indented, and return an integer, the amount of spaces to indent.
-         */
-        indent?: (state: T, textAfter: string) => number;
-
-        /** The four below strings are used for working with the commenting addon. */
-        /**
-         * String that starts a line comment.
-         */
-        lineComment?: string;
-        /**
-         * String that starts a block comment.
-         */
-        blockCommentStart?: string;
-        /**
-         * String that ends a block comment.
-         */
-        blockCommentEnd?: string;
-        /**
-         * String to put at the start of continued lines in a block comment.
-         */
-        blockCommentLead?: string;
-
-        /**
-         * Trigger a reindent whenever one of the characters in the string is typed.
-         */
-        electricChars?: string
-        /**
-         * Trigger a reindent whenever the regex matches the part of the line before the cursor.
-         */
-        electricinput?: RegExp
-    }
-
-    /**
-     * A function that, given a CodeMirror configuration object and an optional mode configuration object, returns a mode object.
-     */
-    interface ModeFactory<T> {
-        (config: CodeMirror.EditorConfiguration, modeOptions?: any): Mode<T>
-    }
-
-    /**
-     * id will be the id for the defined mode. Typically, you should use this second argument to defineMode as your module scope function
-     * (modes should not leak anything into the global scope!), i.e. write your whole mode inside this function.
-     */
-    function defineMode(id: string, modefactory: ModeFactory<any>): void;
-
-    /**
-     * The first argument is a configuration object as passed to the mode constructor function, and the second argument
-     * is a mode specification as in the EditorConfiguration mode option.
-     */
-    function getMode<T>(config: CodeMirror.EditorConfiguration, mode: any): Mode<T>;
-
-    /**
-     * Utility function from the overlay.js addon that allows modes to be combined. The mode given as the base argument takes care of
-     * most of the normal mode functionality, but a second (typically simple) mode is used, which can override the style of text.
-     * Both modes get to parse all of the text, but when both assign a non-null style to a piece of code, the overlay wins, unless
-     * the combine argument was true and not overridden, or state.overlay.combineTokens was true, in which case the styles are combined.
-     */
-    function overlayMode<T, S>(base: Mode<T>, overlay: Mode<S>, combine?: boolean): Mode<any>
-
-    /**
-     * async specifies that the lint process runs asynchronously. hasGutters specifies that lint errors should be displayed in the CodeMirror
-     * gutter, note that you must use this in conjunction with [ "CodeMirror-lint-markers" ] as an element in the gutters argument on
-     * initialization of the CodeMirror instance.
-     */
-    interface LintStateOptions {
-        async: boolean;
-        hasGutters: boolean;
-    }
-
-    /**
-     * Adds the getAnnotations callback to LintStateOptions which may be overridden by the user if they choose use their own
-     * linter.
-     */
-    interface LintOptions extends LintStateOptions {
-        getAnnotations: AnnotationsCallback;
-    }
-
-    /**
-     * A function that calls the updateLintingCallback with any errors found during the linting process.
-     */
-    interface AnnotationsCallback {
-        (content: string, updateLintingCallback: UpdateLintingCallback, options: LintStateOptions, codeMirror: Editor): void;
-    }
-
-    /**
-     * A function that, given an array of annotations, updates the CodeMirror linting GUI with those annotations
-     */
-    interface UpdateLintingCallback {
-        (codeMirror: Editor, annotations: Annotation[]): void;
-    }
-
-    /**
-     * An annotation contains a description of a lint error, detailing the location of the error within the code, the severity of the error,
-     * and an explaination as to why the error was thrown.
-     */
-    interface Annotation {
-        from: Position;
-        message?: string;
-        severity?: string;
-        to?: Position;
-    }
-}
-
-declare module "codemirror" {
-    export = CodeMirror;
-}
diff --git a/codemirror/index.d.ts b/codemirror/index.d.ts
new file mode 100644
index 0000000000..6108df1fdc
--- /dev/null
+++ b/codemirror/index.d.ts
@@ -0,0 +1,1132 @@
+// Type definitions for CodeMirror
+// Project: https://github.com/marijnh/CodeMirror
+// Definitions by: mihailik <https://github.com/mihailik>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = CodeMirror;
+export as namespace CodeMirror;
+
+declare function CodeMirror(host: HTMLElement, options?: CodeMirror.EditorConfiguration): CodeMirror.Editor;
+declare function CodeMirror(callback: (host: HTMLElement) => void , options?: CodeMirror.EditorConfiguration): CodeMirror.Editor;
+
+declare namespace CodeMirror {
+    export var Doc : CodeMirror.DocConstructor;
+    export var Pos: CodeMirror.PositionConstructor;
+    export var Pass: any;
+
+    function fromTextArea(host: HTMLTextAreaElement, options?: EditorConfiguration): CodeMirror.EditorFromTextArea;
+
+    var version: string;
+
+    /** If you want to define extra methods in terms of the CodeMirror API, it is possible to use defineExtension.
+    This will cause the given value(usually a method) to be added to all CodeMirror instances created from then on. */
+    function defineExtension(name: string, value: any): void;
+
+    /** Like defineExtension, but the method will be added to the interface for Doc objects instead. */
+    function defineDocExtension(name: string, value: any): void;
+
+    /** Similarly, defineOption can be used to define new options for CodeMirror.
+    The updateFunc will be called with the editor instance and the new value when an editor is initialized,
+    and whenever the option is modified through setOption. */
+    function defineOption(name: string, default_: any, updateFunc: Function): void;
+
+    /** If your extention just needs to run some code whenever a CodeMirror instance is initialized, use CodeMirror.defineInitHook.
+    Give it a function as its only argument, and from then on, that function will be called (with the instance as argument)
+    whenever a new CodeMirror instance is initialized. */
+    function defineInitHook(func: Function): void;
+
+    /** Registers a helper value with the given name in the given namespace (type). This is used to define functionality
+    that may be looked up by mode. Will create (if it doesn't already exist) a property on the CodeMirror object for
+    the given type, pointing to an object that maps names to values. I.e. after doing
+    CodeMirror.registerHelper("hint", "foo", myFoo), the value CodeMirror.hint.foo will point to myFoo. */
+    function registerHelper(namespace: string, name: string, helper: any): void;
+
+
+    function on(element: any, eventName: string, handler: Function): void;
+    function off(element: any, eventName: string, handler: Function): void;
+
+    /** Fired whenever a change occurs to the document. changeObj has a similar type as the object passed to the editor's "change" event,
+    but it never has a next property, because document change events are not batched (whereas editor change events are). */
+    function on(doc: Doc, eventName: 'change', handler: (instance: Doc, change: EditorChange) => void ): void;
+    function off(doc: Doc, eventName: 'change', handler: (instance: Doc, change: EditorChange) => void ): void;
+
+    /** See the description of the same event on editor instances. */
+    function on(doc: Doc, eventName: 'beforeChange', handler: (instance: Doc, change: EditorChangeCancellable) => void ): void;
+    function off(doc: Doc, eventName: 'beforeChange', handler: (instance: Doc, change: EditorChangeCancellable) => void ): void;
+
+    /** Fired whenever the cursor or selection in this document changes. */
+    function on(doc: Doc, eventName: 'cursorActivity', handler: (instance: CodeMirror.Editor) => void ): void;
+    function off(doc: Doc, eventName: 'cursorActivity', handler: (instance: CodeMirror.Editor) => void ): void;
+
+    /** Equivalent to the event by the same name as fired on editor instances. */
+    function on(doc: Doc, eventName: 'beforeSelectionChange', handler: (instance: CodeMirror.Editor, selection: { head: Position; anchor: Position; }) => void ): void;
+    function off(doc: Doc, eventName: 'beforeSelectionChange', handler: (instance: CodeMirror.Editor, selection: { head: Position; anchor: Position; }) => void ): void;
+
+    /** Will be fired when the line object is deleted. A line object is associated with the start of the line.
+    Mostly useful when you need to find out when your gutter markers on a given line are removed. */
+    function on(line: LineHandle, eventName: 'delete', handler: () => void ): void;
+    function off(line: LineHandle, eventName: 'delete', handler: () => void ): void;
+
+    /** Fires when the line's text content is changed in any way (but the line is not deleted outright).
+    The change object is similar to the one passed to change event on the editor object. */
+    function on(line: LineHandle, eventName: 'change', handler: (line: LineHandle, change: EditorChange) => void ): void;
+    function off(line: LineHandle, eventName: 'change', handler: (line: LineHandle, change: EditorChange) => void ): void;
+
+    /** Fired when the cursor enters the marked range. From this event handler, the editor state may be inspected but not modified,
+    with the exception that the range on which the event fires may be cleared. */
+    function on(marker: TextMarker, eventName: 'beforeCursorEnter', handler: () => void ): void;
+    function off(marker: TextMarker, eventName: 'beforeCursorEnter', handler: () => void ): void;
+
+    /** Fired when the range is cleared, either through cursor movement in combination with clearOnEnter or through a call to its clear() method.
+    Will only be fired once per handle. Note that deleting the range through text editing does not fire this event,
+    because an undo action might bring the range back into existence. */
+    function on(marker: TextMarker, eventName: 'clear', handler: () => void ): void;
+    function off(marker: TextMarker, eventName: 'clear', handler: () => void ): void;
+
+    /** Fired when the last part of the marker is removed from the document by editing operations. */
+    function on(marker: TextMarker, eventName: 'hide', handler: () => void ): void;
+    function off(marker: TextMarker, eventName: 'hide', handler: () => void ): void;
+
+    /** Fired when, after the marker was removed by editing, a undo operation brought the marker back. */
+    function on(marker: TextMarker, eventName: 'unhide', handler: () => void ): void;
+    function off(marker: TextMarker, eventName: 'unhide', handler: () => void ): void;
+
+    /** Fired whenever the editor re-adds the widget to the DOM. This will happen once right after the widget is added (if it is scrolled into view),
+    and then again whenever it is scrolled out of view and back in again, or when changes to the editor options
+    or the line the widget is on require the widget to be redrawn. */
+    function on(line: LineWidget, eventName: 'redraw', handler: () => void ): void;
+    function off(line: LineWidget, eventName: 'redraw', handler: () => void ): void;
+
+    /** Various CodeMirror-related objects emit events, which allow client code to react to various situations.
+    Handlers for such events can be registered with the on and off methods on the objects that the event fires on.
+    To fire your own events, use CodeMirror.signal(target, name, args...), where target is a non-DOM-node object. */
+    function signal(target: any, name: string, ...args: any[]): void;
+
+    interface Editor {
+
+        /** Tells you whether the editor currently has focus. */
+        hasFocus(): boolean;
+
+        /** Used to find the target position for horizontal cursor motion.start is a { line , ch } object,
+        amount an integer(may be negative), and unit one of the string "char", "column", or "word".
+        Will return a position that is produced by moving amount times the distance specified by unit.
+        When visually is true , motion in right - to - left text will be visual rather than logical.
+        When the motion was clipped by hitting the end or start of the document, the returned value will have a hitSide property set to true. */
+        findPosH(start: CodeMirror.Position, amount: number, unit: string, visually: boolean): { line: number; ch: number; hitSide?: boolean; };
+
+        /** Similar to findPosH , but used for vertical motion.unit may be "line" or "page".
+        The other arguments and the returned value have the same interpretation as they have in findPosH. */
+        findPosV(start: CodeMirror.Position, amount: number, unit: string): { line: number; ch: number; hitSide?: boolean; };
+
+
+        /** Change the configuration of the editor. option should the name of an option, and value should be a valid value for that option. */
+        setOption(option: string, value: any): void;
+
+        /** Retrieves the current value of the given option for this editor instance. */
+        getOption(option: string): any;
+
+        /** Attach an additional keymap to the editor.
+        This is mostly useful for add - ons that need to register some key handlers without trampling on the extraKeys option.
+        Maps added in this way have a higher precedence than the extraKeys and keyMap options, and between them,
+        the maps added earlier have a lower precedence than those added later, unless the bottom argument was passed,
+        in which case they end up below other keymaps added with this method. */
+        addKeyMap(map: any, bottom?: boolean): void;
+
+        /** Disable a keymap added with addKeyMap.Either pass in the keymap object itself , or a string,
+        which will be compared against the name property of the active keymaps. */
+        removeKeyMap(map: any): void;
+
+        /** Enable a highlighting overlay.This is a stateless mini - mode that can be used to add extra highlighting.
+        For example, the search add - on uses it to highlight the term that's currently being searched.
+        mode can be a mode spec or a mode object (an object with a token method). The options parameter is optional. If given, it should be an object.
+        Currently, only the opaque option is recognized. This defaults to off, but can be given to allow the overlay styling, when not null,
+        to override the styling of the base mode entirely, instead of the two being applied together. */
+        addOverlay(mode: any, options?: any): void;
+
+        /** Pass this the exact argument passed for the mode parameter to addOverlay to remove an overlay again. */
+        removeOverlay(mode: any): void;
+
+
+        /** Retrieve the currently active document from an editor. */
+        getDoc(): CodeMirror.Doc;
+
+        /** Attach a new document to the editor. Returns the old document, which is now no longer associated with an editor. */
+        swapDoc(doc: CodeMirror.Doc): CodeMirror.Doc;
+
+        /** Get the content of the current editor document. You can pass it an optional argument to specify the string to be used to separate lines (defaults to "\n"). */
+        getValue(seperator?: string): string;
+
+        /** Set the content of the current editor document. */
+        setValue(content: string): void;
+
+        /** Sets the gutter marker for the given gutter (identified by its CSS class, see the gutters option) to the given value.
+        Value can be either null, to clear the marker, or a DOM element, to set it. The DOM element will be shown in the specified gutter next to the specified line. */
+        setGutterMarker(line: any, gutterID: string, value: HTMLElement): CodeMirror.LineHandle;
+
+        /** Remove all gutter markers in the gutter with the given ID. */
+        clearGutter(gutterID: string): void;
+
+        /** Set a CSS class name for the given line.line can be a number or a line handle.
+        where determines to which element this class should be applied, can can be one of "text" (the text element, which lies in front of the selection),
+        "background"(a background element that will be behind the selection),
+        or "wrap" (the wrapper node that wraps all of the line's elements, including gutter elements).
+        class should be the name of the class to apply. */
+        addLineClass(line: any, where: string, _class_: string): CodeMirror.LineHandle;
+
+        /** Remove a CSS class from a line.line can be a line handle or number.
+        where should be one of "text", "background", or "wrap"(see addLineClass).
+        class can be left off to remove all classes for the specified node, or be a string to remove only a specific class. */
+        removeLineClass(line: any, where: string, class_: string): CodeMirror.LineHandle;
+
+        /** Returns the line number, text content, and marker status of the given line, which can be either a number or a line handle. */
+        lineInfo(line: any): {
+            line: any;
+            handle: any;
+            text: string;
+            /** Object mapping gutter IDs to marker elements. */
+            gutterMarks: any;
+            textClass: string;
+            bgClass: string;
+            wrapClass: string;
+            /** Array of line widgets attached to this line. */
+            widgets: any;
+        };
+
+        /** Puts node, which should be an absolutely positioned DOM node, into the editor, positioned right below the given { line , ch } position.
+        When scrollIntoView is true, the editor will ensure that the entire node is visible (if possible).
+        To remove the widget again, simply use DOM methods (move it somewhere else, or call removeChild on its parent). */
+        addWidget(pos: CodeMirror.Position, node: HTMLElement, scrollIntoView: boolean): void;
+
+        /** Adds a line widget, an element shown below a line, spanning the whole of the editor's width, and moving the lines below it downwards.
+        line should be either an integer or a line handle, and node should be a DOM node, which will be displayed below the given line.
+        options, when given, should be an object that configures the behavior of the widget.
+        Note that the widget node will become a descendant of nodes with CodeMirror-specific CSS classes, and those classes might in some cases affect it. */
+        addLineWidget(line: any, node: HTMLElement, options?: {
+            /** Whether the widget should cover the gutter. */
+            coverGutter: boolean;
+            /** Whether the widget should stay fixed in the face of horizontal scrolling. */
+            noHScroll: boolean;
+            /** Causes the widget to be placed above instead of below the text of the line. */
+            above: boolean;
+            /** When true, will cause the widget to be rendered even if the line it is associated with is hidden. */
+            showIfHidden: boolean;
+        }): CodeMirror.LineWidget;
+
+
+        /** Programatically set the size of the editor (overriding the applicable CSS rules).
+        width and height height can be either numbers(interpreted as pixels) or CSS units ("100%", for example).
+        You can pass null for either of them to indicate that that dimension should not be changed. */
+        setSize(width: any, height: any): void;
+
+        /** Scroll the editor to a given(pixel) position.Both arguments may be left as null or undefined to have no effect. */
+        scrollTo(x: number, y: number): void;
+
+        /** Get an { left , top , width , height , clientWidth , clientHeight } object that represents the current scroll position, the size of the scrollable area,
+        and the size of the visible area(minus scrollbars). */
+        getScrollInfo(): {
+            left: any;
+            top: any;
+            width: any;
+            height: any;
+            clientWidth: any;
+            clientHeight: any;
+        }
+
+        /** Scrolls the given element into view. pos is a { line , ch } position, referring to a given character, null, to refer to the cursor.
+        The margin parameter is optional. When given, it indicates the amount of pixels around the given area that should be made visible as well. */
+        scrollIntoView(pos: CodeMirror.Position, margin?: number): void;
+
+        /** Scrolls the given element into view. pos is a { left , top , right , bottom } object, in editor-local coordinates.
+        The margin parameter is optional. When given, it indicates the amount of pixels around the given area that should be made visible as well. */
+        scrollIntoView(pos: { left: number; top: number; right: number; bottom: number; }, margin: number): void;
+
+        /** Scrolls the given element into view. pos is a { line, ch } object, in editor-local coordinates.
+        The margin parameter is optional. When given, it indicates the amount of pixels around the given area that should be made visible as well. */
+        scrollIntoView(pos: { line: number, ch: number }, margin?: number): void;
+
+        /** Scrolls the given element into view. pos is a { from, to } object, in editor-local coordinates.
+        The margin parameter is optional. When given, it indicates the amount of pixels around the given area that should be made visible as well. */
+        scrollIntoView(pos: { from: CodeMirror.Position, to: CodeMirror.Position }, margin: number): void;
+
+        /** Returns an { left , top , bottom } object containing the coordinates of the cursor position.
+        If mode is "local" , they will be relative to the top-left corner of the editable document.
+        If it is "page" or not given, they are relative to the top-left corner of the page.
+        where is a boolean indicating whether you want the start(true) or the end(false) of the selection. */
+        cursorCoords(where: boolean, mode: string): { left: number; top: number; bottom: number; };
+
+        /** Returns an { left , top , bottom } object containing the coordinates of the cursor position.
+        If mode is "local" , they will be relative to the top-left corner of the editable document.
+        If it is "page" or not given, they are relative to the top-left corner of the page.
+        where specifies the precise position at which you want to measure. */
+        cursorCoords(where: CodeMirror.Position, mode: string): { left: number; top: number; bottom: number; };
+
+        /** Returns the position and dimensions of an arbitrary character.pos should be a { line , ch } object.
+        This differs from cursorCoords in that it'll give the size of the whole character,
+        rather than just the position that the cursor would have when it would sit at that position. */
+        charCoords(pos: CodeMirror.Position, mode: string): { left: number; right: number; top: number; bottom: number; };
+
+        /** Given an { left , top } object , returns the { line , ch } position that corresponds to it.
+        The optional mode parameter determines relative to what the coordinates are interpreted. It may be "window" , "page"(the default) , or "local". */
+        coordsChar(object: { left: number; top: number; }, mode?: string): CodeMirror.Position;
+
+        /** Returns the line height of the default font for the editor. */
+        defaultTextHeight(): number;
+
+        /** Returns the pixel width of an 'x' in the default font for the editor.
+        (Note that for non - monospace fonts , this is mostly useless, and even for monospace fonts, non - ascii characters might have a different width). */
+        defaultCharWidth(): number;
+
+        /** Returns a { from , to } object indicating the start (inclusive) and end (exclusive) of the currently rendered part of the document.
+        In big documents, when most content is scrolled out of view, CodeMirror will only render the visible part, and a margin around it.
+        See also the viewportChange event. */
+        getViewport(): { from: number; to: number };
+
+        /** If your code does something to change the size of the editor element (window resizes are already listened for), or unhides it,
+        you should probably follow up by calling this method to ensure CodeMirror is still looking as intended. */
+        refresh(): void;
+
+
+        /** Retrieves information about the token the current mode found before the given position (a {line, ch} object). */
+        getTokenAt(pos: CodeMirror.Position): {
+            /** The character(on the given line) at which the token starts. */
+            start: number;
+            /** The character at which the token ends. */
+            end: number;
+            /** The token's string. */
+            string: string;
+            /** The token type the mode assigned to the token, such as "keyword" or "comment" (may also be null). */
+            type: string;
+            /** The mode's state at the end of this token. */
+            state: any;
+        };
+
+        /** Returns the mode's parser state, if any, at the end of the given line number.
+        If no line number is given, the state at the end of the document is returned.
+        This can be useful for storing parsing errors in the state, or getting other kinds of contextual information for a line. */
+        getStateAfter(line?: number): any;
+
+        /** CodeMirror internally buffers changes and only updates its DOM structure after it has finished performing some operation.
+        If you need to perform a lot of operations on a CodeMirror instance, you can call this method with a function argument.
+        It will call the function, buffering up all changes, and only doing the expensive update after the function returns.
+        This can be a lot faster. The return value from this method will be the return value of your function. */
+        operation<T>(fn: ()=> T): T;
+
+        /** Adjust the indentation of the given line.
+        The second argument (which defaults to "smart") may be one of:
+        "prev" Base indentation on the indentation of the previous line.
+        "smart" Use the mode's smart indentation if available, behave like "prev" otherwise.
+        "add" Increase the indentation of the line by one indent unit.
+        "subtract" Reduce the indentation of the line. */
+        indentLine(line: number, dir?: string): void;
+
+
+        /** Give the editor focus. */
+        focus(): void;
+
+        /** Returns the hidden textarea used to read input. */
+        getInputField(): HTMLTextAreaElement;
+
+        /** Returns the DOM node that represents the editor, and controls its size. Remove this from your tree to delete an editor instance. */
+        getWrapperElement(): HTMLElement;
+
+        /** Returns the DOM node that is responsible for the scrolling of the editor. */
+        getScrollerElement(): HTMLElement;
+
+        /** Fetches the DOM node that contains the editor gutters. */
+        getGutterElement(): HTMLElement;
+
+
+
+        /** Events are registered with the on method (and removed with the off method).
+        These are the events that fire on the instance object. The name of the event is followed by the arguments that will be passed to the handler.
+        The instance argument always refers to the editor instance. */
+        on(eventName: string, handler: (instance: CodeMirror.Editor) => void ): void;
+        off(eventName: string, handler: (instance: CodeMirror.Editor) => void ): void;
+
+        /** Fires every time the content of the editor is changed. */
+        on(eventName: 'change', handler: (instance: CodeMirror.Editor, change: CodeMirror.EditorChangeLinkedList) => void ): void;
+        off(eventName: 'change', handler: (instance: CodeMirror.Editor, change: CodeMirror.EditorChangeLinkedList) => void ): void;
+
+        /** Like the "change" event, but batched per operation, passing an
+         * array containing all the changes that happened in the operation.
+         * This event is fired after the operation finished, and display
+         * changes it makes will trigger a new operation. */
+        on(eventName: 'changes', handler: (instance: CodeMirror.Editor, change: CodeMirror.EditorChangeLinkedList[]) => void ): void;
+        off(eventName: 'changes', handler: (instance: CodeMirror.Editor, change: CodeMirror.EditorChangeLinkedList[]) => void ): void;
+
+        /** This event is fired before a change is applied, and its handler may choose to modify or cancel the change.
+        The changeObj never has a next property, since this is fired for each individual change, and not batched per operation.
+        Note: you may not do anything from a "beforeChange" handler that would cause changes to the document or its visualization.
+        Doing so will, since this handler is called directly from the bowels of the CodeMirror implementation,
+        probably cause the editor to become corrupted. */
+        on(eventName: 'beforeChange', handler: (instance: CodeMirror.Editor, change: CodeMirror.EditorChangeCancellable) => void ): void;
+        off(eventName: 'beforeChange', handler: (instance: CodeMirror.Editor, change: CodeMirror.EditorChangeCancellable) => void ): void;
+
+        /** Will be fired when the cursor or selection moves, or any change is made to the editor content. */
+        on(eventName: 'cursorActivity', handler: (instance: CodeMirror.Editor) => void ): void;
+        off(eventName: 'cursorActivity', handler: (instance: CodeMirror.Editor) => void ): void;
+
+        /** This event is fired before the selection is moved. Its handler may modify the resulting selection head and anchor.
+        Handlers for this event have the same restriction as "beforeChange" handlers � they should not do anything to directly update the state of the editor. */
+        on(eventName: 'beforeSelectionChange', handler: (instance: CodeMirror.Editor, selection: { head: CodeMirror.Position; anchor: CodeMirror.Position; }) => void ): void;
+        off(eventName: 'beforeSelectionChange', handler: (instance: CodeMirror.Editor, selection: { head: CodeMirror.Position; anchor: CodeMirror.Position; }) => void ): void;
+
+        /** Fires whenever the view port of the editor changes (due to scrolling, editing, or any other factor).
+        The from and to arguments give the new start and end of the viewport. */
+        on(eventName: 'viewportChange', handler: (instance: CodeMirror.Editor, from: number, to: number) => void ): void;
+        off(eventName: 'viewportChange', handler: (instance: CodeMirror.Editor, from: number, to: number) => void ): void;
+
+        /** Fires when the editor gutter (the line-number area) is clicked. Will pass the editor instance as first argument,
+        the (zero-based) number of the line that was clicked as second argument, the CSS class of the gutter that was clicked as third argument,
+        and the raw mousedown event object as fourth argument. */
+        on(eventName: 'gutterClick', handler: (instance: CodeMirror.Editor, line: number, gutter: string, clickEvent: Event) => void ): void;
+        off(eventName: 'gutterClick', handler: (instance: CodeMirror.Editor, line: number, gutter: string, clickEvent: Event) => void ): void;
+
+        /** Fires whenever the editor is focused. */
+        on(eventName: 'focus', handler: (instance: CodeMirror.Editor) => void ): void;
+        off(eventName: 'focus', handler: (instance: CodeMirror.Editor) => void ): void;
+
+        /** Fires whenever the editor is unfocused. */
+        on(eventName: 'blur', handler: (instance: CodeMirror.Editor) => void ): void;
+        off(eventName: 'blur', handler: (instance: CodeMirror.Editor) => void ): void;
+
+        /** Fires when the editor is scrolled. */
+        on(eventName: 'scroll', handler: (instance: CodeMirror.Editor) => void ): void;
+        off(eventName: 'scroll', handler: (instance: CodeMirror.Editor) => void ): void;
+
+        /** Will be fired whenever CodeMirror updates its DOM display. */
+        on(eventName: 'update', handler: (instance: CodeMirror.Editor) => void ): void;
+        off(eventName: 'update', handler: (instance: CodeMirror.Editor) => void ): void;
+
+        /** Fired whenever a line is (re-)rendered to the DOM. Fired right after the DOM element is built, before it is added to the document.
+        The handler may mess with the style of the resulting element, or add event handlers, but should not try to change the state of the editor. */
+        on(eventName: 'renderLine', handler: (instance: CodeMirror.Editor, line: number, element: HTMLElement) => void ): void;
+        off(eventName: 'renderLine', handler: (instance: CodeMirror.Editor, line: number, element: HTMLElement) => void ): void;
+
+        /** Expose the state object, so that the Editor.state.completionActive property is reachable*/
+        state: any;
+    }
+
+    interface EditorFromTextArea extends Editor {
+
+        /** Copy the content of the editor into the textarea. */
+        save(): void;
+
+        /** Remove the editor, and restore the original textarea (with the editor's current content). */
+        toTextArea(): void;
+
+        /** Returns the textarea that the instance was based on. */
+        getTextArea(): HTMLTextAreaElement;
+    }
+
+    interface DocConstructor {
+        new (text: string, mode?: any, firstLineNumber?: number, lineSep?: string): Doc;
+        (text: string, mode?: any, firstLineNumber?: number, lineSep?: string): Doc;
+    }
+
+    interface Doc {
+        /** Get the current editor content. You can pass it an optional argument to specify the string to be used to separate lines (defaults to "\n"). */
+        getValue(seperator?: string): string;
+
+        /** Set the editor content. */
+        setValue(content: string): void;
+
+        /** Get the text between the given points in the editor, which should be {line, ch} objects.
+        An optional third argument can be given to indicate the line separator string to use (defaults to "\n"). */
+        getRange(from: Position, to: CodeMirror.Position, seperator?: string): string;
+
+        /** Replace the part of the document between from and to with the given string.
+        from and to must be {line, ch} objects. to can be left off to simply insert the string at position from. */
+        replaceRange(replacement: string, from: CodeMirror.Position, to: CodeMirror.Position): void;
+
+        /** Get the content of line n. */
+        getLine(n: number): string;
+
+        /** Set the content of line n. */
+        setLine(n: number, text: string): void;
+
+        /** Remove the given line from the document. */
+        removeLine(n: number): void;
+
+        /** Get the number of lines in the editor. */
+        lineCount(): number;
+
+        /** Get the first line of the editor. This will usually be zero but for linked sub-views,
+        or documents instantiated with a non-zero first line, it might return other values. */
+        firstLine(): number;
+
+        /** Get the last line of the editor. This will usually be lineCount() - 1, but for linked sub-views, it might return other values. */
+        lastLine(): number;
+
+        /** Fetches the line handle for the given line number. */
+        getLineHandle(num: number): CodeMirror.LineHandle;
+
+        /** Given a line handle, returns the current position of that line (or null when it is no longer in the document). */
+        getLineNumber(handle: CodeMirror.LineHandle): number;
+
+        /** Iterate over the whole document, and call f for each line, passing the line handle.
+        This is a faster way to visit a range of line handlers than calling getLineHandle for each of them.
+        Note that line handles have a text property containing the line's content (as a string). */
+        eachLine(f: (line: CodeMirror.LineHandle) => void ): void;
+
+        /** Iterate over the range from start up to (not including) end, and call f for each line, passing the line handle.
+        This is a faster way to visit a range of line handlers than calling getLineHandle for each of them.
+        Note that line handles have a text property containing the line's content (as a string). */
+        eachLine(start: number, end: number, f: (line: CodeMirror.LineHandle) => void ): void;
+
+        /** Set the editor content as 'clean', a flag that it will retain until it is edited, and which will be set again when such an edit is undone again.
+        Useful to track whether the content needs to be saved. */
+        markClean(): void;
+
+        /** Returns whether the document is currently clean (not modified since initialization or the last call to markClean). */
+        isClean(): boolean;
+
+
+
+        /** Get the currently selected code. */
+        getSelection(): string;
+
+        /** Replace the selection with the given string. By default, the new selection will span the inserted text.
+        The optional collapse argument can be used to change this � passing "start" or "end" will collapse the selection to the start or end of the inserted text. */
+        replaceSelection(replacement: string, collapse?: string): void;
+
+        /** start is a an optional string indicating which end of the selection to return.
+        It may be "start" , "end" , "head"(the side of the selection that moves when you press shift + arrow),
+        or "anchor"(the fixed side of the selection).Omitting the argument is the same as passing "head".A { line , ch } object will be returned. */
+        getCursor(start?: string): CodeMirror.Position;
+
+        /** Retrieves a list of all current selections. These will always be sorted, and never overlap (overlapping selections are merged).
+        Each object in the array contains anchor and head properties referring to {line, ch} objects. */
+        listSelections(): { anchor: CodeMirror.Position; head: CodeMirror.Position }[];
+
+        /** Return true if any text is selected. */
+        somethingSelected(): boolean;
+
+        /** Set the cursor position.You can either pass a single { line , ch } object , or the line and the character as two separate parameters. */
+        setCursor(pos: CodeMirror.Position): void;
+
+        /** Set the selection range.anchor and head should be { line , ch } objects.head defaults to anchor when not given. */
+        setSelection(anchor: CodeMirror.Position, head: CodeMirror.Position): void;
+
+        /** Similar to setSelection , but will, if shift is held or the extending flag is set,
+        move the head of the selection while leaving the anchor at its current place.
+        pos2 is optional , and can be passed to ensure a region (for example a word or paragraph) will end up selected
+        (in addition to whatever lies between that region and the current anchor). */
+        extendSelection(from: CodeMirror.Position, to?: CodeMirror.Position): void;
+
+        /** Sets or clears the 'extending' flag , which acts similar to the shift key,
+        in that it will cause cursor movement and calls to extendSelection to leave the selection anchor in place. */
+        setExtending(value: boolean): void;
+
+
+        /** Retrieve the editor associated with a document. May return null. */
+        getEditor(): CodeMirror.Editor;
+
+
+        /** Create an identical copy of the given doc. When copyHistory is true , the history will also be copied.Can not be called directly on an editor. */
+        copy(copyHistory: boolean): CodeMirror.Doc;
+
+        /** Create a new document that's linked to the target document. Linked documents will stay in sync (changes to one are also applied to the other) until unlinked. */
+        linkedDoc(options: {
+            /** When turned on, the linked copy will share an undo history with the original.
+            Thus, something done in one of the two can be undone in the other, and vice versa. */
+            sharedHist?: boolean;
+            from?: number;
+            /** Can be given to make the new document a subview of the original. Subviews only show a given range of lines.
+            Note that line coordinates inside the subview will be consistent with those of the parent,
+            so that for example a subview starting at line 10 will refer to its first line as line 10, not 0. */
+            to?: number;
+            /** By default, the new document inherits the mode of the parent. This option can be set to a mode spec to give it a different mode. */
+            mode: any;
+        }): CodeMirror.Doc;
+
+        /** Break the link between two documents. After calling this , changes will no longer propagate between the documents,
+        and, if they had a shared history, the history will become separate. */
+        unlinkDoc(doc: CodeMirror.Doc): void;
+
+        /** Will call the given function for all documents linked to the target document. It will be passed two arguments,
+        the linked document and a boolean indicating whether that document shares history with the target. */
+        iterLinkedDocs(fn: (doc: CodeMirror.Doc, sharedHist: boolean) => void ): void;
+
+        /** Undo one edit (if any undo events are stored). */
+        undo(): void;
+
+        /** Redo one undone edit. */
+        redo(): void;
+
+        /** Returns an object with {undo, redo } properties , both of which hold integers , indicating the amount of stored undo and redo operations. */
+        historySize(): { undo: number; redo: number; };
+
+        /** Clears the editor's undo history. */
+        clearHistory(): void;
+
+        /** Get a(JSON - serializeable) representation of the undo history. */
+        getHistory(): any;
+
+        /** Replace the editor's undo history with the one provided, which must be a value as returned by getHistory.
+        Note that this will have entirely undefined results if the editor content isn't also the same as it was when getHistory was called. */
+        setHistory(history: any): void;
+
+
+        /** Can be used to mark a range of text with a specific CSS class name. from and to should be { line , ch } objects. */
+        markText(from: CodeMirror.Position, to: CodeMirror.Position, options?: CodeMirror.TextMarkerOptions): TextMarker;
+
+        /** Inserts a bookmark, a handle that follows the text around it as it is being edited, at the given position.
+        A bookmark has two methods find() and clear(). The first returns the current position of the bookmark, if it is still in the document,
+        and the second explicitly removes the bookmark. */
+        setBookmark(pos: CodeMirror.Position, options?: {
+            /** Can be used to display a DOM node at the current location of the bookmark (analogous to the replacedWith option to markText). */
+            widget?: HTMLElement;
+
+            /** By default, text typed when the cursor is on top of the bookmark will end up to the right of the bookmark.
+            Set this option to true to make it go to the left instead. */
+            insertLeft?: boolean;
+        }): CodeMirror.TextMarker;
+
+        /** Returns an array of all the bookmarks and marked ranges found between the given positions. */
+        findMarks(from: CodeMirror.Position, to: CodeMirror.Position): TextMarker[];
+
+        /** Returns an array of all the bookmarks and marked ranges present at the given position. */
+        findMarksAt(pos: CodeMirror.Position): TextMarker[];
+
+        /** Returns an array containing all marked ranges in the document. */
+        getAllMarks(): CodeMirror.TextMarker[];
+
+
+        /** Gets the mode object for the editor. Note that this is distinct from getOption("mode"), which gives you the mode specification,
+        rather than the resolved, instantiated mode object. */
+        getMode(): any;
+
+        /** Calculates and returns a { line , ch } object for a zero-based index whose value is relative to the start of the editor's text.
+        If the index is out of range of the text then the returned object is clipped to start or end of the text respectively. */
+        posFromIndex(index: number): CodeMirror.Position;
+
+        /** The reverse of posFromIndex. */
+        indexFromPos(object: CodeMirror.Position): number;
+
+        /** Expose the state object, so that the Doc.state.completionActive property is reachable*/
+        state: any;
+    }
+
+    interface LineHandle {
+        text: string;
+    }
+
+    interface TextMarker {
+        /** Remove the mark. */
+        clear(): void;
+
+        /** Returns a {from, to} object (both holding document positions), indicating the current position of the marked range,
+        or undefined if the marker is no longer in the document. */
+        find(): CodeMirror.Range;
+
+        /**  Returns an object representing the options for the marker. If copyWidget is given true, it will clone the value of the replacedWith option, if any. */
+        getOptions(copyWidget: boolean): CodeMirror.TextMarkerOptions;
+    }
+
+    interface LineWidget {
+        /** Removes the widget. */
+        clear(): void;
+
+        /** Call this if you made some change to the widget's DOM node that might affect its height.
+        It'll force CodeMirror to update the height of the line that contains the widget. */
+        changed(): void;
+    }
+
+    interface EditorChange {
+        /** Position (in the pre-change coordinate system) where the change started. */
+        from: CodeMirror.Position;
+        /** Position (in the pre-change coordinate system) where the change ended. */
+        to: CodeMirror.Position;
+        /** Array of strings representing the text that replaced the changed range (split by line). */
+        text: string[];
+        /**  Text that used to be between from and to, which is overwritten by this change. */
+        removed: string[];
+        /**  String representing the origin of the change event and wether it can be merged with history */
+        origin: string;
+    }
+
+    interface EditorChangeLinkedList extends CodeMirror.EditorChange {
+        /** Points to another change object (which may point to another, etc). */
+        next?: CodeMirror.EditorChangeLinkedList;
+    }
+
+    interface EditorChangeCancellable extends CodeMirror.EditorChange {
+        /** may be used to modify the change. All three arguments to update are optional, and can be left off to leave the existing value for that field intact. */
+        update(from?: CodeMirror.Position, to?: CodeMirror.Position, text?: string): void;
+
+        cancel(): void;
+    }
+
+    interface PositionConstructor {
+        new (line: number, ch?: number): Position;
+        (line: number, ch?: number): Position;
+    }
+
+    interface Range{
+        from: CodeMirror.Position;
+        to: CodeMirror.Position;
+    }
+
+    interface Position {
+        ch: number;
+        line: number;
+    }
+
+    interface EditorConfiguration {
+        /** string| The starting value of the editor. Can be a string, or a document object. */
+        value?: any;
+
+        /** string|object. The mode to use. When not given, this will default to the first mode that was loaded.
+        It may be a string, which either simply names the mode or is a MIME type associated with the mode.
+        Alternatively, it may be an object containing configuration options for the mode,
+        with a name property that names the mode (for example {name: "javascript", json: true}). */
+        mode?: any;
+
+        /** The theme to style the editor with. You must make sure the CSS file defining the corresponding .cm-s-[name] styles is loaded.
+        The default is "default". */
+        theme?: string;
+
+        /** How many spaces a block (whatever that means in the edited language) should be indented. The default is 2. */
+        indentUnit?: number;
+
+        /** Whether to use the context-sensitive indentation that the mode provides (or just indent the same as the line before). Defaults to true. */
+        smartIndent?: boolean;
+
+        /** The width of a tab character. Defaults to 4. */
+        tabSize?: number;
+
+        /** Whether, when indenting, the first N*tabSize spaces should be replaced by N tabs. Default is false. */
+        indentWithTabs?: boolean;
+
+        /** Configures whether the editor should re-indent the current line when a character is typed
+        that might change its proper indentation (only works if the mode supports indentation). Default is true. */
+        electricChars?: boolean;
+
+        /** Determines whether horizontal cursor movement through right-to-left (Arabic, Hebrew) text
+        is visual (pressing the left arrow moves the cursor left)
+        or logical (pressing the left arrow moves to the next lower index in the string, which is visually right in right-to-left text).
+        The default is false on Windows, and true on other platforms. */
+        rtlMoveVisually?: boolean;
+
+        /** Configures the keymap to use. The default is "default", which is the only keymap defined in codemirror.js itself.
+        Extra keymaps are found in the keymap directory. See the section on keymaps for more information. */
+        keyMap?: string;
+
+        /** Can be used to specify extra keybindings for the editor, alongside the ones defined by keyMap. Should be either null, or a valid keymap value. */
+        extraKeys?: any;
+
+        /** Whether CodeMirror should scroll or wrap for long lines. Defaults to false (scroll). */
+        lineWrapping?: boolean;
+
+        /** Whether to show line numbers to the left of the editor. */
+        lineNumbers?: boolean;
+
+        /** At which number to start counting lines. Default is 1. */
+        firstLineNumber?: number;
+
+        /** A function used to format line numbers. The function is passed the line number, and should return a string that will be shown in the gutter. */
+        lineNumberFormatter?: (line: number) => string;
+
+        /** Can be used to add extra gutters (beyond or instead of the line number gutter).
+        Should be an array of CSS class names, each of which defines a width (and optionally a background),
+        and which will be used to draw the background of the gutters.
+        May include the CodeMirror-linenumbers class, in order to explicitly set the position of the line number gutter
+        (it will default to be to the right of all other gutters). These class names are the keys passed to setGutterMarker. */
+        gutters?: string[];
+
+        /** Determines whether the gutter scrolls along with the content horizontally (false)
+        or whether it stays fixed during horizontal scrolling (true, the default). */
+        fixedGutter?: boolean;
+
+        /** boolean|string. This disables editing of the editor content by the user. If the special value "nocursor" is given (instead of simply true), focusing of the editor is also disallowed. */
+        readOnly?: any;
+
+        /**Whether the cursor should be drawn when a selection is active. Defaults to false. */
+        showCursorWhenSelecting?: boolean;
+
+        /** The maximum number of undo levels that the editor stores. Defaults to 40. */
+        undoDepth?: number;
+
+        /** The period of inactivity (in milliseconds) that will cause a new history event to be started when typing or deleting. Defaults to 500. */
+        historyEventDelay?: number;
+
+        /** The tab index to assign to the editor. If not given, no tab index will be assigned. */
+        tabindex?: number;
+
+        /** Can be used to make CodeMirror focus itself on initialization. Defaults to off.
+        When fromTextArea is used, and no explicit value is given for this option, it will be set to true when either the source textarea is focused,
+        or it has an autofocus attribute and no other element is focused. */
+        autofocus?: boolean;
+
+        /** Controls whether drag-and - drop is enabled. On by default. */
+        dragDrop?: boolean;
+
+        /** When given , this will be called when the editor is handling a dragenter , dragover , or drop event.
+        It will be passed the editor instance and the event object as arguments.
+        The callback can choose to handle the event itself , in which case it should return true to indicate that CodeMirror should not do anything further. */
+        onDragEvent?: (instance: CodeMirror.Editor, event: Event) => boolean;
+
+        /** This provides a rather low - level hook into CodeMirror's key handling.
+        If provided, this function will be called on every keydown, keyup, and keypress event that CodeMirror captures.
+        It will be passed two arguments, the editor instance and the key event.
+        This key event is pretty much the raw key event, except that a stop() method is always added to it.
+        You could feed it to, for example, jQuery.Event to further normalize it.
+        This function can inspect the key event, and handle it if it wants to.
+        It may return true to tell CodeMirror to ignore the event.
+        Be wary that, on some browsers, stopping a keydown does not stop the keypress from firing, whereas on others it does.
+        If you respond to an event, you should probably inspect its type property and only do something when it is keydown
+        (or keypress for actions that need character data). */
+        onKeyEvent?: (instance: CodeMirror.Editor, event: Event) => boolean;
+
+        /** Half - period in milliseconds used for cursor blinking. The default blink rate is 530ms. */
+        cursorBlinkRate?: number;
+
+        /** Determines the height of the cursor. Default is 1 , meaning it spans the whole height of the line.
+        For some fonts (and by some tastes) a smaller height (for example 0.85),
+        which causes the cursor to not reach all the way to the bottom of the line, looks better */
+        cursorHeight?: number;
+
+        /** Highlighting is done by a pseudo background - thread that will work for workTime milliseconds,
+        and then use timeout to sleep for workDelay milliseconds.
+        The defaults are 200 and 300, you can change these options to make the highlighting more or less aggressive. */
+        workTime?: number;
+
+        /** See workTime. */
+        workDelay?: number;
+
+        /** Indicates how quickly CodeMirror should poll its input textarea for changes(when focused).
+        Most input is captured by events, but some things, like IME input on some browsers, don't generate events that allow CodeMirror to properly detect it.
+        Thus, it polls. Default is 100 milliseconds. */
+        pollInterval?: number
+
+        /** By default, CodeMirror will combine adjacent tokens into a single span if they have the same class.
+        This will result in a simpler DOM tree, and thus perform better. With some kinds of styling(such as rounded corners),
+        this will change the way the document looks. You can set this option to false to disable this behavior. */
+        flattenSpans?: boolean;
+
+        /** When highlighting long lines, in order to stay responsive, the editor will give up and simply style
+        the rest of the line as plain text when it reaches a certain position. The default is 10000.
+        You can set this to Infinity to turn off this behavior. */
+        maxHighlightLength?: number;
+
+        /** Specifies the amount of lines that are rendered above and below the part of the document that's currently scrolled into view.
+        This affects the amount of updates needed when scrolling, and the amount of work that such an update does.
+        You should usually leave it at its default, 10. Can be set to Infinity to make sure the whole document is always rendered,
+        and thus the browser's text search works on it. This will have bad effects on performance of big documents. */
+        viewportMargin?: number;
+
+        /** Optional lint configuration to be used in conjunction with CodeMirror's linter addon. */
+        lint?: boolean | LintOptions;
+
+        /** Optional value to be used in conjunction with CodeMirror’s placeholder add-on. */
+        placeholder?: string;
+    }
+
+    interface TextMarkerOptions {
+        /** Assigns a CSS class to the marked stretch of text. */
+        className?: string;
+
+        /** Determines whether text inserted on the left of the marker will end up inside or outside of it. */
+        inclusiveLeft?: boolean;
+
+        /** Like inclusiveLeft , but for the right side. */
+        inclusiveRight?: boolean;
+
+        /** Atomic ranges act as a single unit when cursor movement is concerned — i.e. it is impossible to place the cursor inside of them.
+        In atomic ranges, inclusiveLeft and inclusiveRight have a different meaning — they will prevent the cursor from being placed
+        respectively directly before and directly after the range. */
+        atomic?: boolean;
+
+        /** Collapsed ranges do not show up in the display.Setting a range to be collapsed will automatically make it atomic. */
+        collapsed?: boolean;
+
+        /** When enabled, will cause the mark to clear itself whenever the cursor enters its range.
+        This is mostly useful for text - replacement widgets that need to 'snap open' when the user tries to edit them.
+        The "clear" event fired on the range handle can be used to be notified when this happens. */
+        clearOnEnter?: boolean;
+
+        /** Determines whether the mark is automatically cleared when it becomes empty. Default is true. */
+        clearWhenEmpty?: boolean;
+
+        /** Use a given node to display this range.Implies both collapsed and atomic.
+        The given DOM node must be an inline element(as opposed to a block element). */
+        replacedWith?: HTMLElement;
+
+        /** When replacedWith is given, this determines whether the editor will
+         * capture mouse and drag events occurring in this widget. Default is
+         * false—the events will be left alone for the default browser handler,
+         * or specific handlers on the widget, to capture. */
+        handleMouseEvents?: boolean;
+
+        /** A read - only span can, as long as it is not cleared, not be modified except by calling setValue to reset the whole document.
+        Note: adding a read - only span currently clears the undo history of the editor,
+        because existing undo events being partially nullified by read - only spans would corrupt the history (in the current implementation). */
+        readOnly?: boolean;
+
+        /** When set to true (default is false), adding this marker will create an event in the undo history that can be individually undone(clearing the marker). */
+        addToHistory?: boolean;
+
+        /** Can be used to specify an extra CSS class to be applied to the leftmost span that is part of the marker. */
+        startStyle?: string;
+
+        /** Equivalent to startStyle, but for the rightmost span. */
+        endStyle?: string;
+
+        /** A string of CSS to be applied to the covered text. For example "color: #fe3". */
+        css?: string;
+
+        /** When given, will give the nodes created for this span a HTML title attribute with the given value. */
+        title?: string;
+
+        /** When the target document is linked to other documents, you can set shared to true to make the marker appear in all documents.
+        By default, a marker appears only in its target document. */
+        shared?: boolean;
+    }
+
+    interface StringStream {
+        lastColumnPos: number;
+        lastColumnValue: number;
+        lineStart: number;
+
+        /**
+         * Current position in the string.
+         */
+        pos: number;
+
+        /**
+         * Where the stream's position was when it was first passed to the token function.
+         */
+        start: number;
+
+        /**
+         * The current line's content.
+         */
+        string: string;
+
+        /**
+         * Number of spaces per tab character.
+         */
+        tabSize: number;
+
+        /**
+         * Returns true only if the stream is at the end of the line.
+         */
+        eol(): boolean;
+
+        /**
+         * Returns true only if the stream is at the start of the line.
+         */
+        sol(): boolean;
+
+        /**
+         * Returns the next character in the stream without advancing it. Will return an null at the end of the line.
+         */
+        peek(): string;
+
+        /**
+         * Returns the next character in the stream and advances it. Also returns null when no more characters are available.
+         */
+        next(): string;
+
+        /**
+         * match can be a character, a regular expression, or a function that takes a character and returns a boolean.
+         * If the next character in the stream 'matches' the given argument, it is consumed and returned.
+         * Otherwise, undefined is returned.
+         */
+        eat(match: string): string;
+        eat(match: RegExp): string;
+        eat(match: (char: string) => boolean): string;
+
+        /**
+         * Repeatedly calls eat with the given argument, until it fails. Returns true if any characters were eaten.
+         */
+        eatWhile(match: string): boolean;
+        eatWhile(match: RegExp): boolean;
+        eatWhile(match: (char: string) => boolean): boolean;
+
+        /**
+         * Shortcut for eatWhile when matching white-space.
+         */
+        eatSpace(): boolean;
+
+        /**
+         * Moves the position to the end of the line.
+         */
+        skipToEnd(): void;
+
+        /**
+         * Skips to the next occurrence of the given character, if found on the current line (doesn't advance the stream if
+         * the character does not occur on the line).
+         *
+         * Returns true if the character was found.
+         */
+        skipTo(ch: string): boolean;
+
+        /**
+         * Act like a multi-character eat - if consume is true or not given - or a look-ahead that doesn't update the stream
+         * position - if it is false. pattern can be either a string or a regular expression starting with ^. When it is a
+         * string, caseFold can be set to true to make the match case-insensitive. When successfully matching a regular
+         * expression, the returned value will be the array returned by match, in case you need to extract matched groups.
+         */
+        match(pattern: string, consume?: boolean, caseFold?: boolean): boolean;
+        match(pattern: RegExp, consume?: boolean): string[];
+
+        /**
+         * Backs up the stream n characters. Backing it up further than the start of the current token will cause things to
+         * break, so be careful.
+         */
+        backUp(n: number): void;
+
+        /**
+         * Returns the column (taking into account tabs) at which the current token starts.
+         */
+        column(): number;
+
+        /**
+         * Tells you how far the current line has been indented, in spaces. Corrects for tab characters.
+         */
+        indentation(): number;
+
+        /**
+         * Get the string between the start of the current token and the current stream position.
+         */
+        current(): string;
+    }
+
+    /**
+     * A Mode is, in the simplest case, a lexer (tokenizer) for your language — a function that takes a character stream as input,
+     * advances it past a token, and returns a style for that token. More advanced modes can also handle indentation for the language.
+     */
+    interface Mode<T> {
+        /**
+         * This function should read one token from the stream it is given as an argument, optionally update its state,
+         * and return a style string, or null for tokens that do not have to be styled. Multiple styles can be returned, separated by spaces.
+         */
+        token(stream: StringStream, state: T): string;
+
+        /**
+         * A function that produces a state object to be used at the start of a document.
+         */
+        startState?: () => T;
+        /**
+         * For languages that have significant blank lines, you can define a blankLine(state) method on your mode that will get called
+         * whenever a blank line is passed over, so that it can update the parser state.
+         */
+        blankLine?: (state: T) => void;
+        /**
+         * Given a state returns a safe copy of that state.
+         */
+        copyState?: (state: T) => T;
+
+        /**
+         * The indentation method should inspect the given state object, and optionally the textAfter string, which contains the text on
+         * the line that is being indented, and return an integer, the amount of spaces to indent.
+         */
+        indent?: (state: T, textAfter: string) => number;
+
+        /** The four below strings are used for working with the commenting addon. */
+        /**
+         * String that starts a line comment.
+         */
+        lineComment?: string;
+        /**
+         * String that starts a block comment.
+         */
+        blockCommentStart?: string;
+        /**
+         * String that ends a block comment.
+         */
+        blockCommentEnd?: string;
+        /**
+         * String to put at the start of continued lines in a block comment.
+         */
+        blockCommentLead?: string;
+
+        /**
+         * Trigger a reindent whenever one of the characters in the string is typed.
+         */
+        electricChars?: string
+        /**
+         * Trigger a reindent whenever the regex matches the part of the line before the cursor.
+         */
+        electricinput?: RegExp
+    }
+
+    /**
+     * A function that, given a CodeMirror configuration object and an optional mode configuration object, returns a mode object.
+     */
+    interface ModeFactory<T> {
+        (config: CodeMirror.EditorConfiguration, modeOptions?: any): Mode<T>
+    }
+
+    /**
+     * id will be the id for the defined mode. Typically, you should use this second argument to defineMode as your module scope function
+     * (modes should not leak anything into the global scope!), i.e. write your whole mode inside this function.
+     */
+    function defineMode(id: string, modefactory: ModeFactory<any>): void;
+
+    /**
+     * id will be the id for the defined mode. Typically, you should use this second argument to defineMode as your module scope function
+     * (modes should not leak anything into the global scope!), i.e. write your whole mode inside this function.
+     */
+    function defineMode<T>(id: string, modefactory: ModeFactory<T>): void;
+
+    /**
+     * The first argument is a configuration object as passed to the mode constructor function, and the second argument
+     * is a mode specification as in the EditorConfiguration mode option.
+     */
+    function getMode<T>(config: CodeMirror.EditorConfiguration, mode: any): Mode<T>;
+
+    /**
+     * Utility function from the overlay.js addon that allows modes to be combined. The mode given as the base argument takes care of
+     * most of the normal mode functionality, but a second (typically simple) mode is used, which can override the style of text.
+     * Both modes get to parse all of the text, but when both assign a non-null style to a piece of code, the overlay wins, unless
+     * the combine argument was true and not overridden, or state.overlay.combineTokens was true, in which case the styles are combined.
+     */
+    function overlayMode<T, S>(base: Mode<T>, overlay: Mode<S>, combine?: boolean): Mode<any>
+
+    /**
+     * async specifies that the lint process runs asynchronously. hasGutters specifies that lint errors should be displayed in the CodeMirror
+     * gutter, note that you must use this in conjunction with [ "CodeMirror-lint-markers" ] as an element in the gutters argument on
+     * initialization of the CodeMirror instance.
+     */
+    interface LintStateOptions {
+        async: boolean;
+        hasGutters: boolean;
+    }
+
+    /**
+     * Adds the getAnnotations callback to LintStateOptions which may be overridden by the user if they choose use their own
+     * linter.
+     */
+    interface LintOptions extends LintStateOptions {
+        getAnnotations: AnnotationsCallback;
+    }
+
+    /**
+     * A function that calls the updateLintingCallback with any errors found during the linting process.
+     */
+    interface AnnotationsCallback {
+        (content: string, updateLintingCallback: UpdateLintingCallback, options: LintStateOptions, codeMirror: Editor): void;
+    }
+
+    /**
+     * A function that, given an array of annotations, updates the CodeMirror linting GUI with those annotations
+     */
+    interface UpdateLintingCallback {
+        (codeMirror: Editor, annotations: Annotation[]): void;
+    }
+
+    /**
+     * An annotation contains a description of a lint error, detailing the location of the error within the code, the severity of the error,
+     * and an explaination as to why the error was thrown.
+     */
+    interface Annotation {
+        from: Position;
+        message?: string;
+        severity?: string;
+        to?: Position;
+    }
+}
+
diff --git a/codemirror/searchcursor-tests.ts b/codemirror/searchcursor-tests.ts
index 2e87a8b599..9faaa4f518 100644
--- a/codemirror/searchcursor-tests.ts
+++ b/codemirror/searchcursor-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="codemirror.d.ts" />
-/// <reference path="searchcursor.d.ts" />
+
+
 
 var doc = new CodeMirror.Doc('text some string and another text match');
 var cursor = doc.getSearchCursor('text', new CodeMirror.Pos(0,0), false);
diff --git a/codemirror/tsconfig.json b/codemirror/tsconfig.json
new file mode 100644
index 0000000000..5d7a71dd46
--- /dev/null
+++ b/codemirror/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "codemirror-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/coffeeify/coffeeify-tests.ts b/coffeeify/coffeeify-tests.ts
index 753f68e79c..67e9fcfc24 100644
--- a/coffeeify/coffeeify-tests.ts
+++ b/coffeeify/coffeeify-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="coffeeify.d.ts" />
 
 import coffeeify = require('coffeeify');
 
diff --git a/coffeeify/coffeeify.d.ts b/coffeeify/coffeeify.d.ts
deleted file mode 100644
index 05919f901a..0000000000
--- a/coffeeify/coffeeify.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-// Type definitions for coffeeify
-// Project: https://github.com/jnordberg/coffeeify
-// Definitions by: Qubo <https://github.com/tkQubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../through/through.d.ts" />
-
-declare module "coffeeify" {
-    import through = require('through');
-
-    namespace coffeeify {
-        interface Coffeeify {
-            isCoffee(file: string): boolean;
-            isLiterate(file: string): boolean;
-            sourceMap: boolean;
-            compile(file: string, data: string, callback: Callback): void;
-            (file: string): through.ThroughStream;
-        }
-
-        interface Callback {
-            (error: ParseError, compiled: string): void;
-        }
-
-        interface ParseError extends SyntaxError {
-            new(error: any, src: string, file: string): ParseError;
-            message: string;
-            line: number;
-            column: number;
-            annotated: string;
-        }
-    }
-
-    var coffeeify: coffeeify.Coffeeify;
-
-    export = coffeeify;
-}
-
diff --git a/coffeeify/index.d.ts b/coffeeify/index.d.ts
new file mode 100644
index 0000000000..729dea86f9
--- /dev/null
+++ b/coffeeify/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for coffeeify
+// Project: https://github.com/jnordberg/coffeeify
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+import through = require('through');
+
+declare namespace coffeeify {
+    interface Coffeeify {
+        isCoffee(file: string): boolean;
+        isLiterate(file: string): boolean;
+        sourceMap: boolean;
+        compile(file: string, data: string, callback: Callback): void;
+        (file: string): through.ThroughStream;
+    }
+
+    interface Callback {
+        (error: ParseError, compiled: string): void;
+    }
+
+    interface ParseError extends SyntaxError {
+        new (error: any, src: string, file: string): ParseError;
+        message: string;
+        line: number;
+        column: number;
+        annotated: string;
+    }
+}
+
+declare var coffeeify: coffeeify.Coffeeify;
+
+export = coffeeify;
diff --git a/coffeeify/tsconfig.json b/coffeeify/tsconfig.json
new file mode 100644
index 0000000000..5198a6ba90
--- /dev/null
+++ b/coffeeify/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "coffeeify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/colorbrewer/colorbrewer-tests.ts b/colorbrewer/colorbrewer-tests.ts
index 7e17551b5a..a4a4af27c9 100644
--- a/colorbrewer/colorbrewer-tests.ts
+++ b/colorbrewer/colorbrewer-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./colorbrewer.d.ts" />
+
 
 var accent3: string[] = colorbrewer.Accent[3];
 var accent4: string[] = colorbrewer.Accent[4];
diff --git a/colorbrewer/colorbrewer.d.ts b/colorbrewer/index.d.ts
similarity index 100%
rename from colorbrewer/colorbrewer.d.ts
rename to colorbrewer/index.d.ts
diff --git a/colorbrewer/tsconfig.json b/colorbrewer/tsconfig.json
new file mode 100644
index 0000000000..92a296cba1
--- /dev/null
+++ b/colorbrewer/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "colorbrewer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/colors/colors-tests.ts b/colors/colors-tests.ts
index 15fd5ab4e5..e0e9120074 100644
--- a/colors/colors-tests.ts
+++ b/colors/colors-tests.ts
@@ -1,6 +1,3 @@
-
-///<reference path="colors.d.ts" />
-
 import colors = require("colors");
 
 console.log(colors.black.underline('test'));
diff --git a/colors/colors-tests.ts.tscparams b/colors/colors-tests.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/colors/colors-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/colors/colors.d.ts b/colors/colors.d.ts
deleted file mode 100644
index cc6b307c03..0000000000
--- a/colors/colors.d.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-// Type definitions for Colors.js 0.6.0-1
-// Project: https://github.com/Marak/colors.js
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "colors" {
-    interface Color {
-        (text: string): string;
-
-        black: Color;
-        red: Color;
-        green: Color;
-        yellow: Color;
-        blue: Color;
-        magenta: Color;
-        cyan: Color;
-        white: Color;
-        gray: Color;
-        grey: Color;
-
-        bgBlack: Color;
-        bgRed: Color;
-        bgGreen: Color;
-        bgYellow: Color;
-        bgBlue: Color;
-        bgMagenta: Color;
-        bgCyan: Color;
-        bgWhite: Color;
-
-        reset: Color;
-        bold: Color;
-        dim: Color;
-        italic: Color;
-        underline: Color;
-        inverse: Color;
-        hidden: Color;
-        strikethrough: Color;
-
-        rainbow: Color;
-        zebra: Color;
-        america: Color;
-        trap: Color;
-        random: Color;
-    }
-
-    namespace e {
-        export function setTheme(theme:any): void;
-
-        export var black: Color;
-        export var red: Color;
-        export var green: Color;
-        export var yellow: Color;
-        export var blue: Color;
-        export var magenta: Color;
-        export var cyan: Color;
-        export var white: Color;
-        export var gray: Color;
-        export var grey: Color;
-
-        export var bgBlack: Color;
-        export var bgRed: Color;
-        export var bgGreen: Color;
-        export var bgYellow: Color;
-        export var bgBlue: Color;
-        export var bgMagenta: Color;
-        export var bgCyan: Color;
-        export var bgWhite: Color;
-
-        export var reset: Color;
-        export var bold: Color;
-        export var dim: Color;
-        export var italic: Color;
-        export var underline: Color;
-        export var inverse: Color;
-        export var hidden: Color;
-        export var strikethrough: Color;
-
-        export var rainbow: Color;
-        export var zebra: Color;
-        export var america: Color;
-        export var trap: Color;
-        export var random: Color;
-    }
-
-    export = e;
-}
-
-interface String {
-    black: string;
-    red: string;
-    green: string;
-    yellow: string;
-    blue: string;
-    magenta: string;
-    cyan: string;
-    white: string;
-    gray: string;
-    grey: string;
-
-    bgBlack: string;
-    bgRed: string;
-    bgGreen: string;
-    bgYellow: string;
-    bgBlue: string;
-    bgMagenta: string;
-    bgCyan: string;
-    bgWhite: string;
-
-    reset: string;
-    bold: string;
-    dim: string;
-    italic: string;
-    underline: string;
-    inverse: string;
-    hidden: string;
-    strikethrough: string;
-
-    rainbow: string;
-    zebra: string;
-    america: string;
-    trap: string;
-    random: string;
-}
diff --git a/colors/colors.d.ts.tscparams b/colors/colors.d.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/colors/colors.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/colors/index.d.ts b/colors/index.d.ts
new file mode 100644
index 0000000000..6814edd66a
--- /dev/null
+++ b/colors/index.d.ts
@@ -0,0 +1,123 @@
+// Type definitions for Colors.js 0.6.0-1
+// Project: https://github.com/Marak/colors.js
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module "colors" {
+    interface Color {
+        (text: string): string;
+
+        black: Color;
+        red: Color;
+        green: Color;
+        yellow: Color;
+        blue: Color;
+        magenta: Color;
+        cyan: Color;
+        white: Color;
+        gray: Color;
+        grey: Color;
+
+        bgBlack: Color;
+        bgRed: Color;
+        bgGreen: Color;
+        bgYellow: Color;
+        bgBlue: Color;
+        bgMagenta: Color;
+        bgCyan: Color;
+        bgWhite: Color;
+
+        reset: Color;
+        bold: Color;
+        dim: Color;
+        italic: Color;
+        underline: Color;
+        inverse: Color;
+        hidden: Color;
+        strikethrough: Color;
+
+        rainbow: Color;
+        zebra: Color;
+        america: Color;
+        trap: Color;
+        random: Color;
+        zalgo: Color;
+    }
+
+    namespace e {
+        export function setTheme(theme:any): void;
+
+        export var black: Color;
+        export var red: Color;
+        export var green: Color;
+        export var yellow: Color;
+        export var blue: Color;
+        export var magenta: Color;
+        export var cyan: Color;
+        export var white: Color;
+        export var gray: Color;
+        export var grey: Color;
+
+        export var bgBlack: Color;
+        export var bgRed: Color;
+        export var bgGreen: Color;
+        export var bgYellow: Color;
+        export var bgBlue: Color;
+        export var bgMagenta: Color;
+        export var bgCyan: Color;
+        export var bgWhite: Color;
+
+        export var reset: Color;
+        export var bold: Color;
+        export var dim: Color;
+        export var italic: Color;
+        export var underline: Color;
+        export var inverse: Color;
+        export var hidden: Color;
+        export var strikethrough: Color;
+
+        export var rainbow: Color;
+        export var zebra: Color;
+        export var america: Color;
+        export var trap: Color;
+        export var random: Color;
+    }
+
+    export = e;
+}
+
+interface String {
+    black: string;
+    red: string;
+    green: string;
+    yellow: string;
+    blue: string;
+    magenta: string;
+    cyan: string;
+    white: string;
+    gray: string;
+    grey: string;
+
+    bgBlack: string;
+    bgRed: string;
+    bgGreen: string;
+    bgYellow: string;
+    bgBlue: string;
+    bgMagenta: string;
+    bgCyan: string;
+    bgWhite: string;
+
+    reset: string;
+    dim: string;
+    italic: string;
+    underline: string;
+    inverse: string;
+    hidden: string;
+    strikethrough: string;
+
+    rainbow: string;
+    zebra: string;
+    america: string;
+    trap: string;
+    random: string;
+}
diff --git a/colors/tsconfig.json b/colors/tsconfig.json
new file mode 100644
index 0000000000..0eed8cbf33
--- /dev/null
+++ b/colors/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "colors-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cometd/cometd.d.ts b/cometd/index.d.ts
similarity index 100%
rename from cometd/cometd.d.ts
rename to cometd/index.d.ts
diff --git a/cometd/tsconfig.json b/cometd/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/cometd/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/commander/commander-tests.ts b/commander/commander-tests.ts
index 52dd0f8504..f6f3918f6a 100644
--- a/commander/commander-tests.ts
+++ b/commander/commander-tests.ts
@@ -1,16 +1,5 @@
-///<reference path="commander.d.ts"/>
-
 // NOTE: import statement can not use in TypeScript 1.0.1
-var program:commander.IExportedCommand = require('commander');
-
-declare namespace commander {
-    interface IExportedCommand {
-        peppers:boolean;
-        pineapple:boolean;
-        bbq:boolean;
-        cheese:string;
-    }
-}
+import program = require('commander');
 
 program
     .version('0.0.1')
@@ -21,10 +10,10 @@ program
     .parse(process.argv);
 
 console.log('you ordered a pizza with:');
-if (program.peppers) console.log('  - peppers');
-if (program.pineapple) console.log('  - pineapple');
-if (program.bbq) console.log('  - bbq');
-console.log('  - %s cheese', program.cheese);
+if (program['peppers']) console.log('  - peppers');
+if (program['pineapple']) console.log('  - pineapple');
+if (program['bbq']) console.log('  - bbq');
+console.log('  - %s cheese', program['cheese']);
 
 function range(val:string) {
     return val.split('..').map(Number);
@@ -43,18 +32,6 @@ function increaseVerbosity(v:any, total:number) {
     return total + 1;
 }
 
-declare namespace commander {
-    interface IExportedCommand {
-        integer:number;
-        float:number;
-        optional:string;
-        range:number[];
-        list:string[];
-        collect:string[];
-        verbose:number;
-    }
-}
-
 program
     .version('0.0.1')
     .usage('[options] <file ...>')
@@ -67,15 +44,15 @@ program
     .option('-v, --verbose', 'A value that can be increased', increaseVerbosity, 0)
     .parse(process.argv);
 
-console.log(' int: %j', program.integer);
-console.log(' float: %j', program.float);
-console.log(' optional: %j', program.optional);
-program.range = program.range || [];
-console.log(' range: %j..%j', program.range[0], program.range[1]);
-console.log(' list: %j', program.list);
-console.log(' collect: %j', program.collect);
-console.log(' verbosity: %j', program.verbose);
-console.log(' args: %j', program.args);
+console.log(' int: %j', program['integer']);
+console.log(' float: %j', program['float']);
+console.log(' optional: %j', program['optional']);
+program['range'] = program['range'] || [];
+console.log(' range: %j..%j', program['range'][0], program['range'][1]);
+console.log(' list: %j', program['list']);
+console.log(' collect: %j', program['collect']);
+console.log(' verbosity: %j', program['verbose']);
+console.log(' args: %j', program['args']);
 
 
 program
diff --git a/commander/commander.d.ts b/commander/commander.d.ts
deleted file mode 100644
index 40543a2768..0000000000
--- a/commander/commander.d.ts
+++ /dev/null
@@ -1,412 +0,0 @@
-// Type definitions for commanderjs 2.3.0
-// Project: https://github.com/visionmedia/commander.js
-// Definitions by: Marcelo Dezem <http://github.com/mdezem>, vvakame <http://github.com/vvakame>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare namespace commander {
-    interface ICommandStatic {
-        /**
-         * Initialize a new `Command`.
-         *
-         * @param {String} name
-         * @api public
-         */
-        new (name?:string):ICommand;
-    }
-
-    interface ICommand extends NodeJS.EventEmitter {
-        args: string[];
-        _args: { required:boolean; name: string; }[];
-
-        /**
-         * Add command `name`.
-         *
-         * The `.action()` callback is invoked when the
-         * command `name` is specified via __ARGV__,
-         * and the remaining arguments are applied to the
-         * function for access.
-         *
-         * When the `name` is "*" an un-matched command
-         * will be passed as the first arg, followed by
-         * the rest of __ARGV__ remaining.
-         *
-         * Examples:
-         *
-         *      program
-         *        .version('0.0.1')
-         *        .option('-C, --chdir <path>', 'change the working directory')
-         *        .option('-c, --config <path>', 'set config path. defaults to ./deploy.conf')
-         *        .option('-T, --no-tests', 'ignore test hook')
-         *
-         *      program
-         *        .command('setup')
-         *        .description('run remote setup commands')
-         *        .action(function(){
-         *          console.log('setup');
-         *        });
-         *
-         *      program
-         *        .command('exec <cmd>')
-         *        .description('run the given remote command')
-         *        .action(function(cmd){
-         *          console.log('exec "%s"', cmd);
-         *        });
-         *
-         *      program
-         *        .command('*')
-         *        .description('deploy the given env')
-         *        .action(function(env){
-         *          console.log('deploying "%s"', env);
-         *        });
-         *
-         *      program.parse(process.argv);
-         *
-         * @param {String} name
-         * @param {String} [desc]
-         * @param {Mixed} [opts]
-         * @return {Command} the new command
-         * @api public
-         */
-        command(name:string, desc?:string, opts?: any):ICommand;
-
-        /**
-         * Add an implicit `help [cmd]` subcommand
-         * which invokes `--help` for the given command.
-         *
-         * @api private
-         */
-        addImplicitHelpCommand():void;
-
-        /**
-         * Parse expected `args`.
-         *
-         * For example `["[type]"]` becomes `[{ required: false, name: 'type' }]`.
-         *
-         * @param {Array} args
-         * @return {Command} for chaining
-         * @api public
-         */
-        parseExpectedArgs(args:string[]):ICommand;
-
-        /**
-         * Register callback `fn` for the command.
-         *
-         * Examples:
-         *
-         *      program
-         *        .command('help')
-         *        .description('display verbose help')
-         *        .action(function(){
-         *           // output help here
-         *        });
-         *
-         * @param {Function} fn
-         * @return {Command} for chaining
-         * @api public
-         */
-        action(fn:(...args:any[])=>void):ICommand;
-
-        /**
-         * Define option with `flags`, `description` and optional
-         * coercion `fn`.
-         *
-         * The `flags` string should contain both the short and long flags,
-         * separated by comma, a pipe or space. The following are all valid
-         * all will output this way when `--help` is used.
-         *
-         *    "-p, --pepper"
-         *    "-p|--pepper"
-         *    "-p --pepper"
-         *
-         * Examples:
-         *
-         *     // simple boolean defaulting to false
-         *     program.option('-p, --pepper', 'add pepper');
-         *
-         *     --pepper
-         *     program.pepper
-         *     // => Boolean
-         *
-         *     // simple boolean defaulting to true
-         *     program.option('-C, --no-cheese', 'remove cheese');
-         *
-         *     program.cheese
-         *     // => true
-         *
-         *     --no-cheese
-         *     program.cheese
-         *     // => false
-         *
-         *     // required argument
-         *     program.option('-C, --chdir <path>', 'change the working directory');
-         *
-         *     --chdir /tmp
-         *     program.chdir
-         *     // => "/tmp"
-         *
-         *     // optional argument
-         *     program.option('-c, --cheese [type]', 'add cheese [marble]');
-         *
-         * @param {String} flags
-         * @param {String} description
-         * @param {Function|Mixed} fn or default
-         * @param {Mixed} defaultValue
-         * @return {Command} for chaining
-         * @api public
-         */
-        option(flags:string, description?:string, fn?:((arg1:any, arg2:any)=>void)|RegExp, defaultValue?:any):ICommand;
-        option(flags:string, description?:string, defaultValue?:any):ICommand;
-
-        /**
-         * Allow unknown options on the command line.
-         *
-         * @param {Boolean} arg if `true` or omitted, no error will be thrown
-         * for unknown options.
-         * @api public
-         */
-        allowUnknownOption(arg?: boolean):ICommand;
-
-        /**
-         * Parse `argv`, settings options and invoking commands when defined.
-         *
-         * @param {Array} argv
-         * @return {Command} for chaining
-         * @api public
-         */
-        parse(argv:string[]):ICommand;
-
-        /**
-         * Execute a sub-command executable.
-         *
-         * @param {Array} argv
-         * @param {Array} args
-         * @param {Array} unknown
-         * @api private
-         */
-        executeSubCommand(argv:string[], args:string[], unknown:string[]):any; /* child_process.ChildProcess */
-
-        /**
-         * Normalize `args`, splitting joined short flags. For example
-         * the arg "-abc" is equivalent to "-a -b -c".
-         * This also normalizes equal sign and splits "--abc=def" into "--abc def".
-         *
-         * @param {Array} args
-         * @return {Array}
-         * @api private
-         */
-        normalize(args:string[]):string[];
-
-        /**
-         * Parse command `args`.
-         *
-         * When listener(s) are available those
-         * callbacks are invoked, otherwise the "*"
-         * event is emitted and those actions are invoked.
-         *
-         * @param {Array} args
-         * @return {Command} for chaining
-         * @api private
-         */
-        parseArgs(args:string[], unknown:string[]):ICommand;
-
-        /**
-         * Return an option matching `arg` if any.
-         *
-         * @param {String} arg
-         * @return {Option}
-         * @api private
-         */
-        optionFor(arg:string):IOption;
-
-        /**
-         * Parse options from `argv` returning `argv`
-         * void of these options.
-         *
-         * @param {Array} argv
-         * @return {Array}
-         * @api public
-         */
-        parseOptions(argv:string[]): {args:string[]; unknown:string[];};
-
-        /**
-         * Return an object containing options as key-value pairs
-         *
-         * @return {Object}
-         * @api public
-         */
-        opts():any;
-
-        /**
-         * Argument `name` is missing.
-         *
-         * @param {String} name
-         * @api private
-         */
-        missingArgument(name:string):void;
-
-        /**
-         * `Option` is missing an argument, but received `flag` or nothing.
-         *
-         * @param {String} option
-         * @param {String} flag
-         * @api private
-         */
-        optionMissingArgument(option:{flags:string;}, flag?:string):void;
-
-        /**
-         * Unknown option `flag`.
-         *
-         * @param {String} flag
-         * @api private
-         */
-        unknownOption(flag:string):void;
-
-        /**
-         * Set the program version to `str`.
-         *
-         * This method auto-registers the "-V, --version" flag
-         * which will print the version number when passed.
-         *
-         * @param {String} str
-         * @param {String} flags
-         * @return {Command} for chaining
-         * @api public
-         */
-        version(str:string, flags?:string):ICommand;
-
-        /**
-         * Set the description to `str`.
-         *
-         * @param {String} str
-         * @return {String|Command}
-         * @api public
-         */
-        description(str:string):ICommand;
-        description():string;
-
-        /**
-         * Set an alias for the command
-         *
-         * @param {String} alias
-         * @return {String|Command}
-         * @api public
-         */
-        alias(alias:string):ICommand;
-        alias():string;
-
-        /**
-         * Set / get the command usage `str`.
-         *
-         * @param {String} str
-         * @return {String|Command}
-         * @api public
-         */
-        usage(str:string):ICommand;
-        usage():string;
-
-        /**
-         * Get the name of the command
-         *
-         * @param {String} name
-         * @return {String|Command}
-         * @api public
-         */
-        name():string;
-
-        /**
-         * Return the largest option length.
-         *
-         * @return {Number}
-         * @api private
-         */
-        largestOptionLength():number;
-
-        /**
-         * Return help for options.
-         *
-         * @return {String}
-         * @api private
-         */
-        optionHelp():string;
-
-        /**
-         * Return command help documentation.
-         *
-         * @return {String}
-         * @api private
-         */
-        commandHelp():string;
-
-        /**
-         * Return program help documentation.
-         *
-         * @return {String}
-         * @api private
-         */
-        helpInformation():string;
-
-        /**
-         * Output help information for this command
-         *
-         * @api public
-         */
-        outputHelp():void;
-
-        /**
-         * Output help information and exit.
-         *
-         * @api public
-         */
-        help():void;
-    }
-
-    interface IOptionStatic {
-        /**
-         * Initialize a new `Option` with the given `flags` and `description`.
-         *
-         * @param {String} flags
-         * @param {String} description
-         * @api public
-         */
-        new (flags:string, description?:string):IOption;
-    }
-
-    interface IOption {
-        flags:string;
-        required:boolean;
-        optional:boolean;
-        bool:boolean;
-        short?:string;
-        long:string;
-        description:string;
-
-        /**
-         * Return option name.
-         *
-         * @return {String}
-         * @api private
-         */
-        name():string;
-
-        /**
-         * Check if `arg` matches the short or long flag.
-         *
-         * @param {String} arg
-         * @return {Boolean}
-         * @api private
-         */
-        is(arg:string):boolean;
-    }
-
-    interface IExportedCommand extends ICommand {
-        Command: commander.ICommandStatic;
-        Option: commander.IOptionStatic;
-    }
-}
-
-declare module "commander" {
-    var _tmp:commander.IExportedCommand;
-    export = _tmp;
-}
diff --git a/commander/index.d.ts b/commander/index.d.ts
new file mode 100644
index 0000000000..6edbd987b0
--- /dev/null
+++ b/commander/index.d.ts
@@ -0,0 +1,411 @@
+// Type definitions for commanderjs 2.3.0
+// Project: https://github.com/visionmedia/commander.js
+// Definitions by: Marcelo Dezem <http://github.com/mdezem>, vvakame <http://github.com/vvakame>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare var _tmp: commander.IExportedCommand;
+export = _tmp;
+
+declare namespace commander {
+    interface ICommandStatic {
+        /**
+         * Initialize a new `Command`.
+         *
+         * @param {String} name
+         * @api public
+         */
+        new (name?:string):ICommand;
+    }
+
+    interface ICommand extends NodeJS.EventEmitter {
+        args: string[];
+        _args: { required:boolean; name: string; }[];
+
+        /**
+         * Add command `name`.
+         *
+         * The `.action()` callback is invoked when the
+         * command `name` is specified via __ARGV__,
+         * and the remaining arguments are applied to the
+         * function for access.
+         *
+         * When the `name` is "*" an un-matched command
+         * will be passed as the first arg, followed by
+         * the rest of __ARGV__ remaining.
+         *
+         * Examples:
+         *
+         *      program
+         *        .version('0.0.1')
+         *        .option('-C, --chdir <path>', 'change the working directory')
+         *        .option('-c, --config <path>', 'set config path. defaults to ./deploy.conf')
+         *        .option('-T, --no-tests', 'ignore test hook')
+         *
+         *      program
+         *        .command('setup')
+         *        .description('run remote setup commands')
+         *        .action(function(){
+         *          console.log('setup');
+         *        });
+         *
+         *      program
+         *        .command('exec <cmd>')
+         *        .description('run the given remote command')
+         *        .action(function(cmd){
+         *          console.log('exec "%s"', cmd);
+         *        });
+         *
+         *      program
+         *        .command('*')
+         *        .description('deploy the given env')
+         *        .action(function(env){
+         *          console.log('deploying "%s"', env);
+         *        });
+         *
+         *      program.parse(process.argv);
+         *
+         * @param {String} name
+         * @param {String} [desc]
+         * @param {Mixed} [opts]
+         * @return {Command} the new command
+         * @api public
+         */
+        command(name:string, desc?:string, opts?: any):ICommand;
+
+        /**
+         * Add an implicit `help [cmd]` subcommand
+         * which invokes `--help` for the given command.
+         *
+         * @api private
+         */
+        addImplicitHelpCommand():void;
+
+        /**
+         * Parse expected `args`.
+         *
+         * For example `["[type]"]` becomes `[{ required: false, name: 'type' }]`.
+         *
+         * @param {Array} args
+         * @return {Command} for chaining
+         * @api public
+         */
+        parseExpectedArgs(args:string[]):ICommand;
+
+        /**
+         * Register callback `fn` for the command.
+         *
+         * Examples:
+         *
+         *      program
+         *        .command('help')
+         *        .description('display verbose help')
+         *        .action(function(){
+         *           // output help here
+         *        });
+         *
+         * @param {Function} fn
+         * @return {Command} for chaining
+         * @api public
+         */
+        action(fn:(...args:any[])=>void):ICommand;
+
+        /**
+         * Define option with `flags`, `description` and optional
+         * coercion `fn`.
+         *
+         * The `flags` string should contain both the short and long flags,
+         * separated by comma, a pipe or space. The following are all valid
+         * all will output this way when `--help` is used.
+         *
+         *    "-p, --pepper"
+         *    "-p|--pepper"
+         *    "-p --pepper"
+         *
+         * Examples:
+         *
+         *     // simple boolean defaulting to false
+         *     program.option('-p, --pepper', 'add pepper');
+         *
+         *     --pepper
+         *     program.pepper
+         *     // => Boolean
+         *
+         *     // simple boolean defaulting to true
+         *     program.option('-C, --no-cheese', 'remove cheese');
+         *
+         *     program.cheese
+         *     // => true
+         *
+         *     --no-cheese
+         *     program.cheese
+         *     // => false
+         *
+         *     // required argument
+         *     program.option('-C, --chdir <path>', 'change the working directory');
+         *
+         *     --chdir /tmp
+         *     program.chdir
+         *     // => "/tmp"
+         *
+         *     // optional argument
+         *     program.option('-c, --cheese [type]', 'add cheese [marble]');
+         *
+         * @param {String} flags
+         * @param {String} description
+         * @param {Function|Mixed} fn or default
+         * @param {Mixed} defaultValue
+         * @return {Command} for chaining
+         * @api public
+         */
+        option(flags:string, description?:string, fn?:((arg1:any, arg2:any)=>void)|RegExp, defaultValue?:any):ICommand;
+        option(flags:string, description?:string, defaultValue?:any):ICommand;
+
+        /**
+         * Allow unknown options on the command line.
+         *
+         * @param {Boolean} arg if `true` or omitted, no error will be thrown
+         * for unknown options.
+         * @api public
+         */
+        allowUnknownOption(arg?: boolean):ICommand;
+
+        /**
+         * Parse `argv`, settings options and invoking commands when defined.
+         *
+         * @param {Array} argv
+         * @return {Command} for chaining
+         * @api public
+         */
+        parse(argv:string[]):ICommand;
+
+        /**
+         * Execute a sub-command executable.
+         *
+         * @param {Array} argv
+         * @param {Array} args
+         * @param {Array} unknown
+         * @api private
+         */
+        executeSubCommand(argv:string[], args:string[], unknown:string[]):any; /* child_process.ChildProcess */
+
+        /**
+         * Normalize `args`, splitting joined short flags. For example
+         * the arg "-abc" is equivalent to "-a -b -c".
+         * This also normalizes equal sign and splits "--abc=def" into "--abc def".
+         *
+         * @param {Array} args
+         * @return {Array}
+         * @api private
+         */
+        normalize(args:string[]):string[];
+
+        /**
+         * Parse command `args`.
+         *
+         * When listener(s) are available those
+         * callbacks are invoked, otherwise the "*"
+         * event is emitted and those actions are invoked.
+         *
+         * @param {Array} args
+         * @return {Command} for chaining
+         * @api private
+         */
+        parseArgs(args:string[], unknown:string[]):ICommand;
+
+        /**
+         * Return an option matching `arg` if any.
+         *
+         * @param {String} arg
+         * @return {Option}
+         * @api private
+         */
+        optionFor(arg:string):IOption;
+
+        /**
+         * Parse options from `argv` returning `argv`
+         * void of these options.
+         *
+         * @param {Array} argv
+         * @return {Array}
+         * @api public
+         */
+        parseOptions(argv:string[]): {args:string[]; unknown:string[];};
+
+        /**
+         * Return an object containing options as key-value pairs
+         *
+         * @return {Object}
+         * @api public
+         */
+        opts():any;
+
+        /**
+         * Argument `name` is missing.
+         *
+         * @param {String} name
+         * @api private
+         */
+        missingArgument(name:string):void;
+
+        /**
+         * `Option` is missing an argument, but received `flag` or nothing.
+         *
+         * @param {String} option
+         * @param {String} flag
+         * @api private
+         */
+        optionMissingArgument(option:{flags:string;}, flag?:string):void;
+
+        /**
+         * Unknown option `flag`.
+         *
+         * @param {String} flag
+         * @api private
+         */
+        unknownOption(flag:string):void;
+
+        /**
+         * Set the program version to `str`.
+         *
+         * This method auto-registers the "-V, --version" flag
+         * which will print the version number when passed.
+         *
+         * @param {String} str
+         * @param {String} flags
+         * @return {Command} for chaining
+         * @api public
+         */
+        version(str:string, flags?:string):ICommand;
+
+        /**
+         * Set the description to `str`.
+         *
+         * @param {String} str
+         * @return {String|Command}
+         * @api public
+         */
+        description(str:string):ICommand;
+        description():string;
+
+        /**
+         * Set an alias for the command
+         *
+         * @param {String} alias
+         * @return {String|Command}
+         * @api public
+         */
+        alias(alias:string):ICommand;
+        alias():string;
+
+        /**
+         * Set / get the command usage `str`.
+         *
+         * @param {String} str
+         * @return {String|Command}
+         * @api public
+         */
+        usage(str:string):ICommand;
+        usage():string;
+
+        /**
+         * Get the name of the command
+         *
+         * @param {String} name
+         * @return {String|Command}
+         * @api public
+         */
+        name():string;
+
+        /**
+         * Return the largest option length.
+         *
+         * @return {Number}
+         * @api private
+         */
+        largestOptionLength():number;
+
+        /**
+         * Return help for options.
+         *
+         * @return {String}
+         * @api private
+         */
+        optionHelp():string;
+
+        /**
+         * Return command help documentation.
+         *
+         * @return {String}
+         * @api private
+         */
+        commandHelp():string;
+
+        /**
+         * Return program help documentation.
+         *
+         * @return {String}
+         * @api private
+         */
+        helpInformation():string;
+
+        /**
+         * Output help information for this command
+         *
+         * @api public
+         */
+        outputHelp():void;
+
+        /**
+         * Output help information and exit.
+         *
+         * @api public
+         */
+        help():void;
+    }
+
+    interface IOptionStatic {
+        /**
+         * Initialize a new `Option` with the given `flags` and `description`.
+         *
+         * @param {String} flags
+         * @param {String} description
+         * @api public
+         */
+        new (flags:string, description?:string):IOption;
+    }
+
+    interface IOption {
+        flags:string;
+        required:boolean;
+        optional:boolean;
+        bool:boolean;
+        short?:string;
+        long:string;
+        description:string;
+
+        /**
+         * Return option name.
+         *
+         * @return {String}
+         * @api private
+         */
+        name():string;
+
+        /**
+         * Check if `arg` matches the short or long flag.
+         *
+         * @param {String} arg
+         * @return {Boolean}
+         * @api private
+         */
+        is(arg:string):boolean;
+    }
+
+    interface IExportedCommand extends ICommand {
+        Command: commander.ICommandStatic;
+        Option: commander.IOptionStatic;
+        [key: string]: any;
+    }
+}
diff --git a/commander/tsconfig.json b/commander/tsconfig.json
new file mode 100644
index 0000000000..8d8ae65b0a
--- /dev/null
+++ b/commander/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "commander-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/commonmark/commonmark-tests.ts b/commonmark/commonmark-tests.ts
index 4896c04646..d298972f89 100644
--- a/commonmark/commonmark-tests.ts
+++ b/commonmark/commonmark-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="commonmark.d.ts" />
+
 
 import commonmark = require('commonmark');
 
diff --git a/commonmark/commonmark.d.ts b/commonmark/commonmark.d.ts
deleted file mode 100644
index 84a76c47f6..0000000000
--- a/commonmark/commonmark.d.ts
+++ /dev/null
@@ -1,214 +0,0 @@
-// Type definitions for commonmark.js 0.22.1
-// Project: https://github.com/jgm/commonmark.js
-// Definitions by: Nico Jansen <https://github.com/nicojs>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-declare namespace commonmark {
-
-    export interface NodeWalkingStep {
-        /**
-         * a boolean, which is true when we enter a Node from a parent or sibling, and false when we reenter it from a child
-         */
-        entering: boolean;
-        /**
-         * The node belonging to this step
-         */
-        node: Node;
-    }
-
-    export interface NodeWalker {
-        /**
-         * Returns an object with properties entering and node. Returns null when we have finished walking the tree.
-         */
-        next(): NodeWalkingStep;
-        /**
-         * Resets the iterator to resume at the specified node and setting for entering. (Normally this isn't needed unless you do destructive updates to the Node tree.)
-         */
-        resumeAt(node: Node, entering?: boolean): void;
-    }
-
-    export interface Position extends Array<Array<number>> {
-    }
-
-    export interface ListData {
-        type?: string,
-        tight?: boolean,
-        delimiter?: string,
-        bulletChar?: string
-    }
-
-    export class Node {
-        constructor(nodeType: string, sourcepos?: Position);
-        isContainer: boolean;
-
-        /**
-         * (read-only): one of Text, Softbreak, Hardbreak, Emph, Strong, Html, Link, Image, Code, Document, Paragraph, BlockQuote, Item, List, Heading, CodeBlock, HtmlBlock ThematicBreak.
-         */
-        type: string;
-        /**
-         * (read-only): a Node or null.
-         */
-        firstChild: Node;
-        /**
-         * (read-only): a Node or null.
-         */
-        lastChild: Node;
-        /**
-         * (read-only): a Node or null.
-         */
-        next: Node;
-        /**
-         * (read-only): a Node or null.
-         */
-        prev: Node;
-        /**
-         * (read-only): a Node or null.
-         */
-        parent: Node;
-        /**
-         * (read-only): an Array with the following form: [[startline, startcolumn], [endline, endcolumn]]
-         */
-        sourcepos: Position;
-        /**
-         *  the literal String content of the node or null.
-         */
-        literal: string;
-        /**
-         * link or image destination (String) or null.
-         */
-        destination: string;
-        /**
-         *  link or image title (String) or null.
-         */
-        title: string;
-        /**
-         * fenced code block info string (String) or null.
-         */
-        info: string;
-        /**
-         * heading level (Number).
-         */
-        level: number;
-        /**
-         * either Bullet or Ordered (or undefined).
-         */
-        listType: string;
-        /**
-         * true if list is tight
-         */
-        listTight: boolean;
-        /**
-         * a Number, the starting number of an ordered list.
-         */
-        listStart: number;
-        /**
-         * a String, either ) or . for an ordered list.
-         */
-        listDelimiter: string;
-        /**
-         * used only for CustomBlock or CustomInline.
-         */
-        onEnter: string;
-        /**
-         * used only for CustomBlock or CustomInline.
-         */
-        onExit: string;
-        /**
-         * Append a Node child to the end of the Node's children.
-         */
-        appendChild(child: Node): void;
-        /**
-         *  Prepend a Node child to the beginning of the Node's children.
-         */
-        prependChild(child: Node): void;
-        /**
-         *  Remove the Node from the tree, severing its links with siblings and parents, and closing up gaps as needed.
-         */
-        unlink(): void;
-        /**
-         * Insert a Node sibling after the Node.
-         */
-        insertAfter(sibling: Node): void;
-        /**
-         * Insert a Node sibling before the Node.
-         */
-        insertBefore(sibling: Node): void;
-        /**
-         * Returns a NodeWalker that can be used to iterate through the Node tree rooted in the Node
-         */
-        walker(): NodeWalker;
-        /**
-         * Setting the backing object of listType, listTight, listStat and listDelimiter directly.
-         * Not needed unless creating list nodes directly. Should be fixed from v>0.22.1
-         * https://github.com/jgm/commonmark.js/issues/74
-         */
-        _listData: ListData;
-    }
-
-    /**
-     * Instead of converting Markdown directly to HTML, as most converters do, commonmark.js parses Markdown to an AST (abstract syntax tree), and then renders this AST as HTML.
-     * This opens up the possibility of manipulating the AST between parsing and rendering. For example, one could transform emphasis into ALL CAPS.
-     */
-    export class Parser {
-        /**
-         * Constructs a new Parser
-         */
-        constructor(options?: ParserOptions);
-        parse(input: string): Node;
-    }
-
-    export interface ParserOptions {
-        /**
-         *  if true, straight quotes will be made curly, -- will be changed to an en dash, --- will be changed to an em dash, and ... will be changed to ellipses.
-         */
-        smart?: boolean;
-        time?: boolean;
-    }
-
-    export interface HtmlRenderingOptions extends XmlRenderingOptions {
-        /**
-         *  if true, raw HTML will not be passed through to HTML output (it will be replaced by comments), and potentially unsafe URLs in links and images (those beginning with javascript:, vbscript:, file:, and with a few exceptions data:) will be replaced with empty strings.
-         */
-        safe?: boolean;
-        /**
-         *  if true, straight quotes will be made curly, -- will be changed to an en dash, --- will be changed to an em dash, and ... will be changed to ellipses.
-         */
-        smart?: boolean;
-        /**
-         *  if true, source position information for block-level elements will be rendered in the data-sourcepos attribute (for HTML) or the sourcepos attribute (for XML).
-         */
-        sourcepos?: boolean;
-    }
-
-    export class HtmlRenderer {
-        constructor(options?: HtmlRenderingOptions)
-        render(root: Node): string;
-        /**
-         * Let's you override the softbreak properties of a renderer. So, to make soft breaks render as hard breaks in HTML:
-         * writer.softbreak = "<br />";
-         */
-        softbreak: string;
-        /**
-         * Override the function that will be used to escape (sanitize) the html output. Return value is used to add to the html output
-         * @param input the input to escape
-         * @param isAttributeValue indicates wheter or not the input value will be used as value of an html attribute.
-         */
-        escape: (input: string, isAttributeValue: boolean) => string;
-    }
-
-    export interface XmlRenderingOptions {
-        time?: boolean;
-        sourcepos?: boolean;
-    }
-
-    export class XmlRenderer {
-        constructor(options?: XmlRenderingOptions)
-        render(root: Node): string;
-    }
-
-}
-
-declare module 'commonmark' {
-    export = commonmark;
-}
diff --git a/commonmark/index.d.ts b/commonmark/index.d.ts
new file mode 100644
index 0000000000..bba8cd7e36
--- /dev/null
+++ b/commonmark/index.d.ts
@@ -0,0 +1,212 @@
+// Type definitions for commonmark.js 0.22.1
+// Project: https://github.com/jgm/commonmark.js
+// Definitions by: Nico Jansen <https://github.com/nicojs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = commonmark;
+export as namespace commonmark;
+
+declare namespace commonmark {
+
+    export interface NodeWalkingStep {
+        /**
+         * a boolean, which is true when we enter a Node from a parent or sibling, and false when we reenter it from a child
+         */
+        entering: boolean;
+        /**
+         * The node belonging to this step
+         */
+        node: Node;
+    }
+
+    export interface NodeWalker {
+        /**
+         * Returns an object with properties entering and node. Returns null when we have finished walking the tree.
+         */
+        next(): NodeWalkingStep;
+        /**
+         * Resets the iterator to resume at the specified node and setting for entering. (Normally this isn't needed unless you do destructive updates to the Node tree.)
+         */
+        resumeAt(node: Node, entering?: boolean): void;
+    }
+
+    export interface Position extends Array<Array<number>> {
+    }
+
+    export interface ListData {
+        type?: string,
+        tight?: boolean,
+        delimiter?: string,
+        bulletChar?: string
+    }
+
+    export class Node {
+        constructor(nodeType: string, sourcepos?: Position);
+        isContainer: boolean;
+
+        /**
+         * (read-only): one of Text, Softbreak, Hardbreak, Emph, Strong, Html, Link, Image, Code, Document, Paragraph, BlockQuote, Item, List, Heading, CodeBlock, HtmlBlock ThematicBreak.
+         */
+        type: string;
+        /**
+         * (read-only): a Node or null.
+         */
+        firstChild: Node;
+        /**
+         * (read-only): a Node or null.
+         */
+        lastChild: Node;
+        /**
+         * (read-only): a Node or null.
+         */
+        next: Node;
+        /**
+         * (read-only): a Node or null.
+         */
+        prev: Node;
+        /**
+         * (read-only): a Node or null.
+         */
+        parent: Node;
+        /**
+         * (read-only): an Array with the following form: [[startline, startcolumn], [endline, endcolumn]]
+         */
+        sourcepos: Position;
+        /**
+         *  the literal String content of the node or null.
+         */
+        literal: string;
+        /**
+         * link or image destination (String) or null.
+         */
+        destination: string;
+        /**
+         *  link or image title (String) or null.
+         */
+        title: string;
+        /**
+         * fenced code block info string (String) or null.
+         */
+        info: string;
+        /**
+         * heading level (Number).
+         */
+        level: number;
+        /**
+         * either Bullet or Ordered (or undefined).
+         */
+        listType: string;
+        /**
+         * true if list is tight
+         */
+        listTight: boolean;
+        /**
+         * a Number, the starting number of an ordered list.
+         */
+        listStart: number;
+        /**
+         * a String, either ) or . for an ordered list.
+         */
+        listDelimiter: string;
+        /**
+         * used only for CustomBlock or CustomInline.
+         */
+        onEnter: string;
+        /**
+         * used only for CustomBlock or CustomInline.
+         */
+        onExit: string;
+        /**
+         * Append a Node child to the end of the Node's children.
+         */
+        appendChild(child: Node): void;
+        /**
+         *  Prepend a Node child to the beginning of the Node's children.
+         */
+        prependChild(child: Node): void;
+        /**
+         *  Remove the Node from the tree, severing its links with siblings and parents, and closing up gaps as needed.
+         */
+        unlink(): void;
+        /**
+         * Insert a Node sibling after the Node.
+         */
+        insertAfter(sibling: Node): void;
+        /**
+         * Insert a Node sibling before the Node.
+         */
+        insertBefore(sibling: Node): void;
+        /**
+         * Returns a NodeWalker that can be used to iterate through the Node tree rooted in the Node
+         */
+        walker(): NodeWalker;
+        /**
+         * Setting the backing object of listType, listTight, listStat and listDelimiter directly.
+         * Not needed unless creating list nodes directly. Should be fixed from v>0.22.1
+         * https://github.com/jgm/commonmark.js/issues/74
+         */
+        _listData: ListData;
+    }
+
+    /**
+     * Instead of converting Markdown directly to HTML, as most converters do, commonmark.js parses Markdown to an AST (abstract syntax tree), and then renders this AST as HTML.
+     * This opens up the possibility of manipulating the AST between parsing and rendering. For example, one could transform emphasis into ALL CAPS.
+     */
+    export class Parser {
+        /**
+         * Constructs a new Parser
+         */
+        constructor(options?: ParserOptions);
+        parse(input: string): Node;
+    }
+
+    export interface ParserOptions {
+        /**
+         *  if true, straight quotes will be made curly, -- will be changed to an en dash, --- will be changed to an em dash, and ... will be changed to ellipses.
+         */
+        smart?: boolean;
+        time?: boolean;
+    }
+
+    export interface HtmlRenderingOptions extends XmlRenderingOptions {
+        /**
+         *  if true, raw HTML will not be passed through to HTML output (it will be replaced by comments), and potentially unsafe URLs in links and images (those beginning with javascript:, vbscript:, file:, and with a few exceptions data:) will be replaced with empty strings.
+         */
+        safe?: boolean;
+        /**
+         *  if true, straight quotes will be made curly, -- will be changed to an en dash, --- will be changed to an em dash, and ... will be changed to ellipses.
+         */
+        smart?: boolean;
+        /**
+         *  if true, source position information for block-level elements will be rendered in the data-sourcepos attribute (for HTML) or the sourcepos attribute (for XML).
+         */
+        sourcepos?: boolean;
+    }
+
+    export class HtmlRenderer {
+        constructor(options?: HtmlRenderingOptions)
+        render(root: Node): string;
+        /**
+         * Let's you override the softbreak properties of a renderer. So, to make soft breaks render as hard breaks in HTML:
+         * writer.softbreak = "<br />";
+         */
+        softbreak: string;
+        /**
+         * Override the function that will be used to escape (sanitize) the html output. Return value is used to add to the html output
+         * @param input the input to escape
+         * @param isAttributeValue indicates wheter or not the input value will be used as value of an html attribute.
+         */
+        escape: (input: string, isAttributeValue: boolean) => string;
+    }
+
+    export interface XmlRenderingOptions {
+        time?: boolean;
+        sourcepos?: boolean;
+    }
+
+    export class XmlRenderer {
+        constructor(options?: XmlRenderingOptions)
+        render(root: Node): string;
+    }
+
+}
diff --git a/commonmark/tsconfig.json b/commonmark/tsconfig.json
new file mode 100644
index 0000000000..9a8814d829
--- /dev/null
+++ b/commonmark/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "commonmark-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/compare-version/compare-version-tests.ts b/compare-version/compare-version-tests.ts
index 4903cf8225..8e8826539d 100644
--- a/compare-version/compare-version-tests.ts
+++ b/compare-version/compare-version-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="compare-version.d.ts" />
 
 import compareVersion = require('compare-version');
 
diff --git a/compare-version/compare-version.d.ts b/compare-version/compare-version.d.ts
deleted file mode 100644
index 690d517294..0000000000
--- a/compare-version/compare-version.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Type definitions for compare-version v0.1.2
-// Project: https://www.npmjs.com/package/compare-version
-// Definitions by: Jonathan Pevarnek <https://github.com/jpevarnek/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-declare module 'compare-version' {
-  function compare(a: string, b: string): number;
-
-  export = compare;
-}
diff --git a/compare-version/index.d.ts b/compare-version/index.d.ts
new file mode 100644
index 0000000000..1807abe537
--- /dev/null
+++ b/compare-version/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for compare-version v0.1.2
+// Project: https://www.npmjs.com/package/compare-version
+// Definitions by: Jonathan Pevarnek <https://github.com/jpevarnek/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare function compare(a: string, b: string): number;
+
+export = compare;
diff --git a/compare-version/tsconfig.json b/compare-version/tsconfig.json
new file mode 100644
index 0000000000..ac98c515d2
--- /dev/null
+++ b/compare-version/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "compare-version-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/complex/complex-tests.ts b/complex/complex-tests.ts
index 46a5f5c69b..23074d104d 100644
--- a/complex/complex-tests.ts
+++ b/complex/complex-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./complex.d.ts" />
-
 import Complex from 'complex';
 
 var z: Complex = new Complex(2, 3);
diff --git a/complex/complex.d.ts b/complex/complex.d.ts
deleted file mode 100644
index b1ca7c4ac6..0000000000
--- a/complex/complex.d.ts
+++ /dev/null
@@ -1,238 +0,0 @@
-// Type definitions for Complex 3.0.1
-// Project: https://github.com/arian/Complex
-// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'complex' {
-	export default class Complex {
-		/**
-		 * @param real The real part of the number
-		 * @param im The imaginary part of the number
-		 */
-		constructor(real: number, im: number);
-
-		/**
-		 * A in line function like Number.from.
-		 *
-		 * Examples:
-		 * var z = Complex.from(2, 4);
-		 * var z = Complex.from(5);
-		 * var z = Complex.from('2+5i');
-		 *
-		 * @param real A string representation of the number, for example 1+4i
-		 */
-		static from(real: string): Complex;
-
-		/**
-		 * A in line function like Number.from.
-		 * @param real The real part of the number
-		 * @param im The imaginary part of the number
-		 */
-		static from(real: number, im?: number): Complex;
-
-		/**
-		 * Creates a complex instance from a polar representation
-		 * @param r The radius/magnitude of the number
-		 * @param phi The angle/phase of the number
-		 */
-		static fromPolar(r: number, phi: number): Complex;
-
-		/**
-		 * A instance of the imaginary unit
-		 */
-		static i: Complex;
-
-		/**
-		 * A instance for the real number
-		 */
-		static one: Complex;
-
-		/**
-		 * Set the real and imaginary properties a and b from a + bi.
-		 * @param real The real part of the number
-		 * @param im The imaginary part of the number
-		 */
-		fromRect(real: number, im: number): Complex;
-
-		/**
-		 * Set the a and b in a + bi from a polar representation.
-		 * @param r The radius/magnitude of the number
-		 * @param phi The angle/phase of the number
-		 */
-		fromPolar(r: number, phi: number): Complex;
-
-		/**
-		 * Set the precision of the numbers. Similar to Number.prototype.toPrecision. Useful before printing the number with the toString method.
-		 * @param k An integer specifying the number of significant digits
-		 */
-		toPrecision(k: number): Complex;
-
-		/**
-		 * Format a number using fixed-point notation. Similar to Number.prototype.toFixed. Useful before printing the number with the toString method.
-		 * @param k The number of digits to appear after the decimal point; this may be a value between 0 and 20, inclusive, and implementations may optionally support a larger range of values. If this argument is omitted, it is treated as 0.
-		 */
-		toFixed(k: number): Complex;
-
-		/**
-		 * Finalize the instance. The number will not change and any other method call will return a new instance. Very useful when a complex instance should stay constant. For example the Complex.i variable is a finalized instance.
-		 */
-		finalize(): Complex;
-
-		/**
-		 * Calculate the magnitude of the complex number
-		 */
-		magnitude(): number;
-
-		/**
-		 * Alias for magnitude(). Calculate the magnitude of the complex number.
-		 */
-		abs(): number;
-
-		/**
-		 * Calculate the angle with respect to the real axis, in radians.
-		 */
-		angle(): number;
-
-		/**
-		 * Alias for angle(). Calculate the angle with respect to the real axis, in radians.
-		 */
-		arg(): number;
-
-		/**
-		 * Alias for angle(). Calculate the angle with respect to the real axis, in radians.
-		 */
-		phase(): number;
-
-		/**
-		 * Calculate the conjugate of the complex number (multiplies the imaginary part with -1)
-		 */
-		conjugate(): Complex;
-
-		/**
-		 * Negate the number (multiplies both the real and imaginary part with -1)
-		 */
-		negate(): Complex;
-
-		/**
-		 * Multiply the number with a real or complex number
-		 * @param z The number to multiply with
-		 */
-		multiply(z: number | Complex): Complex;
-
-		/**
-		 * Alias for multiply(). Multiply the number with a real or complex number
-		 * @param z The number to multiply with
-		 */
-		mult(z: number | Complex): Complex;
-
-		/**
-		 * Divide the number by a real or complex number
-		 * @param z The number to divide by
-		 */
-		divide(z: number | Complex): Complex;
-
-		/**
-		 * Alias for divide(). Divide the number by a real or complex number
-		 * @param z The number to divide by
-		 */
-		div(z: number | Complex): Complex;
-
-		/**
-		 * Add a real or complex number
-		 * @param z The number to add
-		 */
-		add(z: number | Complex): Complex;
-
-		/**
-		 * Subtract a real or complex number
-		 * @param z The number to subtract
-		 */
-		subtract(z: number | Complex): Complex;
-
-		/**
-		 * Alias for subtract(). Subtract a real or complex number
-		 * @param z The number to subtract
-		 */
-		sub(z: number | Complex): Complex;
-
-		/**
-		 * Return the base to the exponent
-		 * @param z The exponent
-		 */
-		pow(z: number | Complex): Complex;
-
-		/**
-		 * Return the square root
-		 */
-		sqrt(): Complex;
-
-		/**
-		 * Return the natural logarithm (base E)
-		 * @param k The actual answer has a multiplicity (ln(z) = ln|z| + arg(z)) where arg(z) can return the same for different angles (every 2*pi), with this argument you can define which answer is required
-		 */
-		log(k?: number): Complex;
-
-		/**
-		 * Calculate the e^z where the base is E and the exponential the complex number.
-		 */
-		exp(): Complex;
-
-		/**
-		 * Calculate the sine of the complex number
-		 */
-		sin(): Complex;
-
-		/**
-		 * Calculate the cosine of the complex number
-		 */
-		cos(): Complex;
-
-		/**
-		 * Calculate the tangent of the complex number
-		 */
-		tan(): Complex;
-
-		/**
-		 * Calculate the hyperbolic sine of the complex number
-		 */
-		sinh(): Complex
-
-		/**
-		 * Calculate the hyperbolic cosine of the complex number
-		 */
-		cosh(): Complex
-
-		/**
-		 * Calculate the hyperbolic tangent of the complex number
-		 */
-		tanh(): Complex
-
-		/**
-		 * Return a new Complex instance with the same real and imaginary properties
-		 */
-		clone(): Complex;
-
-		/**
-		 * Return a string representation of the complex number
-		 *
-		 * Examples:
-		 * new Complex(1, 2).toString(); // 1+2i
-		 * new Complex(0, 1).toString(); // i
-		 * new Complex(4, 0).toString(); // 4
-		 * new Complex(1, 1).toString(); // 1+i
-		 * 'my Complex Number is: ' + (new Complex(3, 5)); // 'my Complex Number is: 3+5i
-		 */
-		toString(): string;
-
-		/**
-		 * Check if the real and imaginary components are equal to the passed in compelex components.
-		 *
-		 * Examples:
-		 * new Complex(1, 4).equals(new Complex(1, 4)); // true
-		 * new Complex(1, 4).equals(new Complex(1, 3)); // false
-		 *
-		 * @param z The complex number to compare with
-		 */
-		equals(z: number | Complex): boolean;
-	}
-}
diff --git a/complex/index.d.ts b/complex/index.d.ts
new file mode 100644
index 0000000000..90ad161ffc
--- /dev/null
+++ b/complex/index.d.ts
@@ -0,0 +1,236 @@
+// Type definitions for Complex 3.0.1
+// Project: https://github.com/arian/Complex
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export default class Complex {
+    /**
+     * @param real The real part of the number
+     * @param im The imaginary part of the number
+     */
+    constructor(real: number, im: number);
+
+    /**
+     * A in line function like Number.from.
+     *
+     * Examples:
+     * var z = Complex.from(2, 4);
+     * var z = Complex.from(5);
+     * var z = Complex.from('2+5i');
+     *
+     * @param real A string representation of the number, for example 1+4i
+     */
+    static from(real: string): Complex;
+
+    /**
+     * A in line function like Number.from.
+     * @param real The real part of the number
+     * @param im The imaginary part of the number
+     */
+    static from(real: number, im?: number): Complex;
+
+    /**
+     * Creates a complex instance from a polar representation
+     * @param r The radius/magnitude of the number
+     * @param phi The angle/phase of the number
+     */
+    static fromPolar(r: number, phi: number): Complex;
+
+    /**
+     * A instance of the imaginary unit
+     */
+    static i: Complex;
+
+    /**
+     * A instance for the real number
+     */
+    static one: Complex;
+
+    /**
+     * Set the real and imaginary properties a and b from a + bi.
+     * @param real The real part of the number
+     * @param im The imaginary part of the number
+     */
+    fromRect(real: number, im: number): Complex;
+
+    /**
+     * Set the a and b in a + bi from a polar representation.
+     * @param r The radius/magnitude of the number
+     * @param phi The angle/phase of the number
+     */
+    fromPolar(r: number, phi: number): Complex;
+
+    /**
+     * Set the precision of the numbers. Similar to Number.prototype.toPrecision. Useful before printing the number with the toString method.
+     * @param k An integer specifying the number of significant digits
+     */
+    toPrecision(k: number): Complex;
+
+    /**
+     * Format a number using fixed-point notation. Similar to Number.prototype.toFixed. Useful before printing the number with the toString method.
+     * @param k The number of digits to appear after the decimal point; this may be a value between 0 and 20, inclusive, and implementations may optionally support a larger range of values. If this argument is omitted, it is treated as 0.
+     */
+    toFixed(k: number): Complex;
+
+    /**
+     * Finalize the instance. The number will not change and any other method call will return a new instance. Very useful when a complex instance should stay constant. For example the Complex.i variable is a finalized instance.
+     */
+    finalize(): Complex;
+
+    /**
+     * Calculate the magnitude of the complex number
+     */
+    magnitude(): number;
+
+    /**
+     * Alias for magnitude(). Calculate the magnitude of the complex number.
+     */
+    abs(): number;
+
+    /**
+     * Calculate the angle with respect to the real axis, in radians.
+     */
+    angle(): number;
+
+    /**
+     * Alias for angle(). Calculate the angle with respect to the real axis, in radians.
+     */
+    arg(): number;
+
+    /**
+     * Alias for angle(). Calculate the angle with respect to the real axis, in radians.
+     */
+    phase(): number;
+
+    /**
+     * Calculate the conjugate of the complex number (multiplies the imaginary part with -1)
+     */
+    conjugate(): Complex;
+
+    /**
+     * Negate the number (multiplies both the real and imaginary part with -1)
+     */
+    negate(): Complex;
+
+    /**
+     * Multiply the number with a real or complex number
+     * @param z The number to multiply with
+     */
+    multiply(z: number | Complex): Complex;
+
+    /**
+     * Alias for multiply(). Multiply the number with a real or complex number
+     * @param z The number to multiply with
+     */
+    mult(z: number | Complex): Complex;
+
+    /**
+     * Divide the number by a real or complex number
+     * @param z The number to divide by
+     */
+    divide(z: number | Complex): Complex;
+
+    /**
+     * Alias for divide(). Divide the number by a real or complex number
+     * @param z The number to divide by
+     */
+    div(z: number | Complex): Complex;
+
+    /**
+     * Add a real or complex number
+     * @param z The number to add
+     */
+    add(z: number | Complex): Complex;
+
+    /**
+     * Subtract a real or complex number
+     * @param z The number to subtract
+     */
+    subtract(z: number | Complex): Complex;
+
+    /**
+     * Alias for subtract(). Subtract a real or complex number
+     * @param z The number to subtract
+     */
+    sub(z: number | Complex): Complex;
+
+    /**
+     * Return the base to the exponent
+     * @param z The exponent
+     */
+    pow(z: number | Complex): Complex;
+
+    /**
+     * Return the square root
+     */
+    sqrt(): Complex;
+
+    /**
+     * Return the natural logarithm (base E)
+     * @param k The actual answer has a multiplicity (ln(z) = ln|z| + arg(z)) where arg(z) can return the same for different angles (every 2*pi), with this argument you can define which answer is required
+     */
+    log(k?: number): Complex;
+
+    /**
+     * Calculate the e^z where the base is E and the exponential the complex number.
+     */
+    exp(): Complex;
+
+    /**
+     * Calculate the sine of the complex number
+     */
+    sin(): Complex;
+
+    /**
+     * Calculate the cosine of the complex number
+     */
+    cos(): Complex;
+
+    /**
+     * Calculate the tangent of the complex number
+     */
+    tan(): Complex;
+
+    /**
+     * Calculate the hyperbolic sine of the complex number
+     */
+    sinh(): Complex
+
+    /**
+     * Calculate the hyperbolic cosine of the complex number
+     */
+    cosh(): Complex
+
+    /**
+     * Calculate the hyperbolic tangent of the complex number
+     */
+    tanh(): Complex
+
+    /**
+     * Return a new Complex instance with the same real and imaginary properties
+     */
+    clone(): Complex;
+
+    /**
+     * Return a string representation of the complex number
+     *
+     * Examples:
+     * new Complex(1, 2).toString(); // 1+2i
+     * new Complex(0, 1).toString(); // i
+     * new Complex(4, 0).toString(); // 4
+     * new Complex(1, 1).toString(); // 1+i
+     * 'my Complex Number is: ' + (new Complex(3, 5)); // 'my Complex Number is: 3+5i
+     */
+    toString(): string;
+
+    /**
+     * Check if the real and imaginary components are equal to the passed in compelex components.
+     *
+     * Examples:
+     * new Complex(1, 4).equals(new Complex(1, 4)); // true
+     * new Complex(1, 4).equals(new Complex(1, 3)); // false
+     *
+     * @param z The complex number to compare with
+     */
+    equals(z: number | Complex): boolean;
+}
diff --git a/complex/tsconfig.json b/complex/tsconfig.json
new file mode 100644
index 0000000000..8b12974f90
--- /dev/null
+++ b/complex/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "complex-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/compose-function/compose-function-tests.ts b/compose-function/compose-function-tests.ts
index dd0a80feff..52135f25a5 100644
--- a/compose-function/compose-function-tests.ts
+++ b/compose-function/compose-function-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="compose-function.d.ts" />
 
 const numberToNumber = (a: number): number => a + 2;
 const numberToString = (a: number): string => "foo";
diff --git a/compose-function/compose-function.d.ts b/compose-function/compose-function.d.ts
deleted file mode 100644
index d4f205fd32..0000000000
--- a/compose-function/compose-function.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-// Type definitions for compose-function
-// Project: https://github.com/stoeffel/compose-function
-// Definitions by: Denis Sokolov <https://github.com/denis-sokolov>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "compose-function" {
-	// Hardcoded signatures for 2-4 parameters
-	function f<A, B, C>(
-		f1: (b: B) => C,
-		f2: (a: A) => B
-	): (a: A) => C
-	function f<A, B, C, D>(
-		f1: (b: C) => D,
-		f2: (a: B) => C,
-		f3: (a: A) => B
-	): (a: A) => D
-	function f<A, B, C, D, E>(
-		f1: (b: D) => E,
-		f2: (a: C) => D,
-		f3: (a: B) => C,
-		f4: (a: A) => B
-	): (a: A) => E
-
-	// Minimal typing for more than 4 parameters
-	function f<Result>(
-		f1: (a: any) => Result,
-		...functions: Function[]
-	): (a: any) => Result
-
-	export = f;
-}
diff --git a/compose-function/index.d.ts b/compose-function/index.d.ts
new file mode 100644
index 0000000000..a77317c48c
--- /dev/null
+++ b/compose-function/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for compose-function
+// Project: https://github.com/stoeffel/compose-function
+// Definitions by: Denis Sokolov <https://github.com/denis-sokolov>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+// Hardcoded signatures for 2-4 parameters
+declare function f<A, B, C>(
+    f1: (b: B) => C,
+    f2: (a: A) => B
+): (a: A) => C
+declare function f<A, B, C, D>(
+    f1: (b: C) => D,
+    f2: (a: B) => C,
+    f3: (a: A) => B
+): (a: A) => D
+declare function f<A, B, C, D, E>(
+    f1: (b: D) => E,
+    f2: (a: C) => D,
+    f3: (a: B) => C,
+    f4: (a: A) => B
+): (a: A) => E
+
+// Minimal typing for more than 4 parameters
+declare function f<Result>(
+    f1: (a: any) => Result,
+    ...functions: Function[]
+): (a: any) => Result
+
+export = f;
diff --git a/compose-function/tsconfig.json b/compose-function/tsconfig.json
new file mode 100644
index 0000000000..f1807ad5aa
--- /dev/null
+++ b/compose-function/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "compose-function-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/compression/compression-tests.ts b/compression/compression-tests.ts
index ecfcab4320..dc284ce2df 100644
--- a/compression/compression-tests.ts
+++ b/compression/compression-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="compression.d.ts" />
 
 import express = require('express');
 import compress = require('compression');
diff --git a/compression/compression.d.ts b/compression/compression.d.ts
deleted file mode 100644
index 6a444e3f49..0000000000
--- a/compression/compression.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Type definitions for compression
-// Project: https://github.com/expressjs/compression
-// Definitions by: Santi Albo <https://github.com/santialbo/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "compression" {
-    import express = require('express');
-
-    namespace e {
-        interface CompressionOptions  {
-            threshold?: number;
-            filter?: Function;
-        }
-    }
-
-    function e(options?: e.CompressionOptions): express.RequestHandler;
-    export = e;
-}
diff --git a/compression/index.d.ts b/compression/index.d.ts
new file mode 100644
index 0000000000..c083cd3347
--- /dev/null
+++ b/compression/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for compression
+// Project: https://github.com/expressjs/compression
+// Definitions by: Santi Albo <https://github.com/santialbo/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+
+import express = require('express');
+
+declare namespace e {
+    interface CompressionOptions {
+        threshold?: number;
+        filter?: Function;
+    }
+}
+
+declare function e(options?: e.CompressionOptions): express.RequestHandler;
+export = e;
diff --git a/compression/tsconfig.json b/compression/tsconfig.json
new file mode 100644
index 0000000000..73bc674305
--- /dev/null
+++ b/compression/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "compression-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/confidence/confidence-tests.ts b/confidence/confidence-tests.ts
index 60825e0127..34e0c587c3 100644
--- a/confidence/confidence-tests.ts
+++ b/confidence/confidence-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="confidence.d.ts" />
 
 import Confidence = require('confidence');
 
diff --git a/confidence/confidence.d.ts b/confidence/confidence.d.ts
deleted file mode 100644
index 62ad82adb1..0000000000
--- a/confidence/confidence.d.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-// Type definitions for Confidence v1.4.2
-// Project: https://github.com/hapijs/confidence.git
-// Definitions by: Jean-Philippe Pellerin <https://github.com/jppellerin>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/**
-* Confidence is a configuration document format, an API, and a foundation for A/B testing.
-* The configuration format is designed to work with any existing JSON-based configuration,
-* serving values based on object path ('/a/b/c' translates to a.b.c). In addition,
-* confidence defines special $-prefixed keys used to filter values for a given criteria.
-*/
-declare module 'confidence' {
-
-    export class Store {
-
-        /**
-        * @constructor
-        * @param {any} document - the configuration document for this document store
-        */
-        constructor(document?: any);
-
-        /**
-        * Validates the provided configuration, clears any existing configuration, then loads the configuration where:
-        *   @param {any} document - an object containing a confidence configuration object generated from a parsed JSON document. If the document is invlaid, will throw an error.
-        */
-        load(document: any): void;
-
-
-        /**
-        * Retrieves a value from the configuration document after applying the provided criteria where:
-        *   @param {string} key - the requested key path. All keys must begin with '/'. '/' returns the the entire document.
-        *   @param {any} criteria - optional object used as criteria for applying filters in the configuration document. Defaults to {}.
-        *
-        *   @return {any} Returns the value found after applying the criteria. If the key is invalid or not found, returns undefined.
-        */
-        get(key: string, criteria?: any): any;
-
-
-        /**
-        * Retrieves the metadata (if any) from the configuration document after applying the provided criteria where:
-        *   @param {string} key - the requested key path. All keys must begin with '/'. '/' returns the the entire document.
-        *   @param {any} criteria - optional object used as criteria for applying filters in the configuration document. Defaults to {}.
-        *
-        *   @return {any} Returns the metadata found after applying the criteria. If the key is invalid or not found, or if no metadata is available, returns undefined.
-        */
-        meta(key: string, criteria?: any): any;
-    }
-}
diff --git a/confidence/index.d.ts b/confidence/index.d.ts
new file mode 100644
index 0000000000..b0f9462903
--- /dev/null
+++ b/confidence/index.d.ts
@@ -0,0 +1,47 @@
+// Type definitions for Confidence v1.4.2
+// Project: https://github.com/hapijs/confidence.git
+// Definitions by: Jean-Philippe Pellerin <https://github.com/jppellerin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+* Confidence is a configuration document format, an API, and a foundation for A/B testing.
+* The configuration format is designed to work with any existing JSON-based configuration,
+* serving values based on object path ('/a/b/c' translates to a.b.c). In addition,
+* confidence defines special $-prefixed keys used to filter values for a given criteria.
+*/
+
+
+export declare class Store {
+
+    /**
+    * @constructor
+    * @param {any} document - the configuration document for this document store
+    */
+    constructor(document?: any);
+
+    /**
+    * Validates the provided configuration, clears any existing configuration, then loads the configuration where:
+    *   @param {any} document - an object containing a confidence configuration object generated from a parsed JSON document. If the document is invlaid, will throw an error.
+    */
+    load(document: any): void;
+
+
+    /**
+    * Retrieves a value from the configuration document after applying the provided criteria where:
+    *   @param {string} key - the requested key path. All keys must begin with '/'. '/' returns the the entire document.
+    *   @param {any} criteria - optional object used as criteria for applying filters in the configuration document. Defaults to {}.
+    *
+    *   @return {any} Returns the value found after applying the criteria. If the key is invalid or not found, returns undefined.
+    */
+    get(key: string, criteria?: any): any;
+
+
+    /**
+    * Retrieves the metadata (if any) from the configuration document after applying the provided criteria where:
+    *   @param {string} key - the requested key path. All keys must begin with '/'. '/' returns the the entire document.
+    *   @param {any} criteria - optional object used as criteria for applying filters in the configuration document. Defaults to {}.
+    *
+    *   @return {any} Returns the metadata found after applying the criteria. If the key is invalid or not found, or if no metadata is available, returns undefined.
+    */
+    meta(key: string, criteria?: any): any;
+}
diff --git a/confidence/tsconfig.json b/confidence/tsconfig.json
new file mode 100644
index 0000000000..03e2f21847
--- /dev/null
+++ b/confidence/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "confidence-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/config/config-tests.ts b/config/config-tests.ts
index 9525a582e1..1dab917d84 100644
--- a/config/config-tests.ts
+++ b/config/config-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="config.d.ts" />
 
 import * as config from "config";
 
diff --git a/config/config.d.ts b/config/config.d.ts
deleted file mode 100644
index f09abdd3f2..0000000000
--- a/config/config.d.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-// Type definitions for node-config
-// Project: https://github.com/lorenwest/node-config
-// Definitions by: Roman Korneev <https://github.com/RWander>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "config" {
-
-    var c: c.IConfig;
-
-    namespace c {
-
-			// see https://github.com/lorenwest/node-config/wiki/Using-Config-Utilities
-			interface IUtil {
-				// Extend an object (and any object it contains) with one or more objects (and objects contained in them).
-				extendDeep(mergeInto: any, mergeFrom: any, depth?: number): any;
-
-				// Return a deep copy of the specified object.
-				cloneDeep(copyFrom: any, depth?: number): any;
-
-				// Return true if two objects have equal contents.
-				equalsDeep(object1: any, object2: any, dept?: number): boolean;
-
-				// Returns an object containing all elements that differ between two objects.
-				diffDeep(object1: any, object2: any, depth?: number): any;
-
-				// Make a javascript object property immutable (assuring it cannot be changed from the current value).
-				makeImmutable(object: any, propertyName?: string, propertyValue?: string): any;
-
-				// Make an object property hidden so it doesn't appear when enumerating elements of the object.
-				makeHidden(object: any, propertyName: string, propertyValue?: string): any;
-
-				// Get the current value of a config environment variable
-				getEnv(varName: string): string;
-			}
-
-			interface IConfig {
-					get<T>(setting: string): T;
-					has(setting: string): boolean;
-					util: IUtil;
-			}
-		}
-
-    export = c;
-}
diff --git a/config/index.d.ts b/config/index.d.ts
new file mode 100644
index 0000000000..a9cb505f0e
--- /dev/null
+++ b/config/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for node-config
+// Project: https://github.com/lorenwest/node-config
+// Definitions by: Roman Korneev <https://github.com/RWander>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare var c: c.IConfig;
+
+declare namespace c {
+
+    // see https://github.com/lorenwest/node-config/wiki/Using-Config-Utilities
+    interface IUtil {
+        // Extend an object (and any object it contains) with one or more objects (and objects contained in them).
+        extendDeep(mergeInto: any, mergeFrom: any, depth?: number): any;
+
+        // Return a deep copy of the specified object.
+        cloneDeep(copyFrom: any, depth?: number): any;
+
+        // Return true if two objects have equal contents.
+        equalsDeep(object1: any, object2: any, dept?: number): boolean;
+
+        // Returns an object containing all elements that differ between two objects.
+        diffDeep(object1: any, object2: any, depth?: number): any;
+
+        // Make a javascript object property immutable (assuring it cannot be changed from the current value).
+        makeImmutable(object: any, propertyName?: string, propertyValue?: string): any;
+
+        // Make an object property hidden so it doesn't appear when enumerating elements of the object.
+        makeHidden(object: any, propertyName: string, propertyValue?: string): any;
+
+        // Get the current value of a config environment variable
+        getEnv(varName: string): string;
+    }
+
+    interface IConfig {
+        get<T>(setting: string): T;
+        has(setting: string): boolean;
+        util: IUtil;
+    }
+}
+
+export = c;
diff --git a/config/tsconfig.json b/config/tsconfig.json
new file mode 100644
index 0000000000..b3afd8ce30
--- /dev/null
+++ b/config/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "config-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/configstore/configstore-tests.ts b/configstore/configstore-tests.ts
index e616707af9..5a615ae9fa 100644
--- a/configstore/configstore-tests.ts
+++ b/configstore/configstore-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="configstore.d.ts" />
 
 import cs = require('configstore');
 
diff --git a/configstore/configstore.d.ts b/configstore/configstore.d.ts
deleted file mode 100644
index 7ca1bcb9ee..0000000000
--- a/configstore/configstore.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// Type definitions for configstore 0.3.0
-// Project: https://github.com/yeoman/configstore
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'configstore' {
-	/*
-	 Set an item
-	 */
-	export function set(key: string, val: any): void;
-
-	/*
-	 Get an item
-	 */
-	export function get(key: string): any;
-
-	/*
-	 Delete an item
-	 */
-	export function del(key: string): void;
-
-	/*
-	 Get all items as an object or replace the current config with an object:
-
-	 conf.all = {
-	    hello: 'world'
-	 };
-	 */
-	export var all: Object;
-	/*
-	 Get the item count
-	 */
-	export var size: number;
-	/*
-	 Get the path to the config file. Can be used to show the user where the config file is located or even better open it for them.
-	 */
-	export var path: string;
-}
diff --git a/configstore/index.d.ts b/configstore/index.d.ts
new file mode 100644
index 0000000000..5d8463b45b
--- /dev/null
+++ b/configstore/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for configstore 0.3.0
+// Project: https://github.com/yeoman/configstore
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/*
+ Set an item
+ */
+export declare function set(key: string, val: any): void;
+
+/*
+ Get an item
+ */
+export declare function get(key: string): any;
+
+/*
+ Delete an item
+ */
+export declare function del(key: string): void;
+
+/*
+ Get all items as an object or replace the current config with an object:
+
+ conf.all = {
+    hello: 'world'
+ };
+ */
+export declare var all: Object;
+/*
+ Get the item count
+ */
+export declare var size: number;
+/*
+ Get the path to the config file. Can be used to show the user where the config file is located or even better open it for them.
+ */
+export declare var path: string;
diff --git a/configstore/tsconfig.json b/configstore/tsconfig.json
new file mode 100644
index 0000000000..aef0250052
--- /dev/null
+++ b/configstore/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "configstore-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/connect-flash/connect-flash-tests.ts b/connect-flash/connect-flash-tests.ts
index 303c12647d..0f22c0cdd5 100644
--- a/connect-flash/connect-flash-tests.ts
+++ b/connect-flash/connect-flash-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./connect-flash.d.ts" />
+
 
 import express = require('express');
 import flash = require('connect-flash');
diff --git a/connect-flash/connect-flash.d.ts b/connect-flash/connect-flash.d.ts
deleted file mode 100644
index 2479142bdd..0000000000
--- a/connect-flash/connect-flash.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// Type definitions for connect-flash
-// Project: https://github.com/jaredhanson/connect-flash
-// Definitions by: Andreas Gassmann <https://github.com/AndreasGassmann/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare namespace Express {
-    export interface Request {
-        flash(message: string): any;
-        flash(event: string, message: string): any;
-    }
-}
-
-declare module "connect-flash" {
-    import express = require('express');
-    interface IConnectFlashOptions {
-        unsafe?: boolean;
-    }
-    function e(options?: IConnectFlashOptions): express.RequestHandler;
-    export = e;
-}
diff --git a/connect-flash/index.d.ts b/connect-flash/index.d.ts
new file mode 100644
index 0000000000..7ec2ae0ae7
--- /dev/null
+++ b/connect-flash/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for connect-flash
+// Project: https://github.com/jaredhanson/connect-flash
+// Definitions by: Andreas Gassmann <https://github.com/AndreasGassmann/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare namespace Express {
+    export interface Request {
+        flash(message: string): any;
+        flash(event: string, message: string): any;
+    }
+}
+
+declare module "connect-flash" {
+    import express = require('express');
+    interface IConnectFlashOptions {
+        unsafe?: boolean;
+    }
+    function e(options?: IConnectFlashOptions): express.RequestHandler;
+    export = e;
+}
diff --git a/connect-flash/tsconfig.json b/connect-flash/tsconfig.json
new file mode 100644
index 0000000000..0212f0e6da
--- /dev/null
+++ b/connect-flash/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "connect-flash-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/connect-livereload/connect-livereload-tests.ts b/connect-livereload/connect-livereload-tests.ts
index 2609871e98..26a09a2983 100644
--- a/connect-livereload/connect-livereload-tests.ts
+++ b/connect-livereload/connect-livereload-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./connect-livereload.d.ts" />
 
 import * as connect from "connect";
 import * as livereload from "connect-livereload";
diff --git a/connect-livereload/connect-livereload.d.ts b/connect-livereload/connect-livereload.d.ts
deleted file mode 100644
index c8246e62f1..0000000000
--- a/connect-livereload/connect-livereload.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// Type definitions for connect-livereload v0.5.3
-// Project: https://github.com/intesso/connect-livereload
-// Definitions by: Maxime LUCE <https://github.com/SomaticIT/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../connect/connect.d.ts" />
-
-declare module "connect-livereload" {
-	import { HandleFunction } from "connect";
-
-	function livereload(): HandleFunction;
-	function livereload(options: livereload.Options): HandleFunction;
-
-	namespace livereload {
-		export type FileMatcher = string | RegExp;
-
-		export interface Rule {
-			match: RegExp;
-			fn: (w: string, s: string) => string;
-		}
-
-		export interface Options {
-			ignore?: FileMatcher[];
-			excludeList?: FileMatcher[];
-
-			include?: FileMatcher[];
-			html?: (val: string) => boolean;
-			rules?: Rule[];
-			disableCompression?: boolean;
-
-			hostname?: string;
-			port?: number;
-			src?: string;
-		}
-	}
-
-	export = livereload;
-}
diff --git a/connect-livereload/index.d.ts b/connect-livereload/index.d.ts
new file mode 100644
index 0000000000..993e610b04
--- /dev/null
+++ b/connect-livereload/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for connect-livereload v0.5.3
+// Project: https://github.com/intesso/connect-livereload
+// Definitions by: Maxime LUCE <https://github.com/SomaticIT/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+import { HandleFunction } from "connect";
+
+declare function livereload(): HandleFunction;
+declare function livereload(options: livereload.Options): HandleFunction;
+
+declare namespace livereload {
+    export type FileMatcher = string | RegExp;
+
+    export interface Rule {
+        match: RegExp;
+        fn: (w: string, s: string) => string;
+    }
+
+    export interface Options {
+        ignore?: FileMatcher[];
+        excludeList?: FileMatcher[];
+
+        include?: FileMatcher[];
+        html?: (val: string) => boolean;
+        rules?: Rule[];
+        disableCompression?: boolean;
+
+        hostname?: string;
+        port?: number;
+        src?: string;
+    }
+}
+
+export = livereload;
diff --git a/connect-livereload/tsconfig.json b/connect-livereload/tsconfig.json
new file mode 100644
index 0000000000..8d85e76ccf
--- /dev/null
+++ b/connect-livereload/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "connect-livereload-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/connect-modrewrite/connect-modrewrite-tests.ts b/connect-modrewrite/connect-modrewrite-tests.ts
index 177cea497d..9a976cbf7b 100644
--- a/connect-modrewrite/connect-modrewrite-tests.ts
+++ b/connect-modrewrite/connect-modrewrite-tests.ts
@@ -1,8 +1,6 @@
-/// <reference path='./connect-modrewrite.d.ts' />
-/// <reference path='../express/express.d.ts' />
 
 import modRewrite = require('connect-modrewrite');
-import express = require('express');
+import express = require('../express');
 
 var app = express();
 
diff --git a/connect-modrewrite/connect-modrewrite.d.ts b/connect-modrewrite/connect-modrewrite.d.ts
deleted file mode 100644
index 57e9e842f3..0000000000
--- a/connect-modrewrite/connect-modrewrite.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for connect-modrewrite
-// Project: https://github.com/tinganho/connect-modrewrite
-// Definitions by: Tingan Ho <https://github.com/tinganho/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare module 'connect-modrewrite' {
-    import express = require('express');
-    function modrewrite(rewrites: string[]): express.RequestHandler;
-    export = modrewrite;
-}
\ No newline at end of file
diff --git a/connect-modrewrite/index.d.ts b/connect-modrewrite/index.d.ts
new file mode 100644
index 0000000000..00a8b4fe46
--- /dev/null
+++ b/connect-modrewrite/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for connect-modrewrite
+// Project: https://github.com/tinganho/connect-modrewrite
+// Definitions by: Tingan Ho <https://github.com/tinganho/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+
+import express = require('express');
+declare function modrewrite(rewrites: string[]): express.RequestHandler;
+export = modrewrite;
diff --git a/connect-modrewrite/tsconfig.json b/connect-modrewrite/tsconfig.json
new file mode 100644
index 0000000000..9a316db8e5
--- /dev/null
+++ b/connect-modrewrite/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "connect-modrewrite-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/connect-mongo/connect-mongo-tests.ts b/connect-mongo/connect-mongo-tests.ts
index 018aeea2fe..a512d7dc71 100644
--- a/connect-mongo/connect-mongo-tests.ts
+++ b/connect-mongo/connect-mongo-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="connect-mongo.d.ts" />
 
 import * as express from 'express';
 import * as mongoose from 'mongoose';
diff --git a/connect-mongo/connect-mongo.d.ts b/connect-mongo/connect-mongo.d.ts
deleted file mode 100644
index 49f93e2d46..0000000000
--- a/connect-mongo/connect-mongo.d.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-// Type definitions for connect-mongo
-// Project: https://github.com/kcbanner/connect-mongo
-// Definitions by: Mizuki Yamamoto <https://github.com/Syati>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-/// <reference path="../mongoose/mongoose.d.ts" />
-/// <reference path="../mongodb/mongodb.d.ts" />
-/// <reference path="../express-session/express-session.d.ts" />
-
-declare module "connect-mongo" {
-    import * as express from 'express';
-    import * as mongoose from 'mongoose';
-    import * as mongodb from 'mongodb';
-    import * as session from 'express-session';
-
-    function connectMongo(connect: (options?: session.SessionOptions) => express.RequestHandler): connectMongo.MongoStoreFactory;
-
-    namespace connectMongo {
-
-        export interface DefaultOptions{
-            /**
-             * The hostname of the database you are connecting to.
-             * (Default: '127.0.0.1')
-             */
-            host?: string;
-
-            /**
-             * The port number to connect to.
-             * (Default: 27017)
-             */
-            port?: string;
-
-            /**
-             * (Default: false)
-             */
-            autoReconnect?: boolean;
-
-            /**
-             * (Default: true)
-             */
-            ssl?: boolean;
-
-            /**
-             * (Default: 1)
-             */
-            w?: number;
-
-            /**
-             * The colletion of the database you are connecting to.
-             * (Default: sessions)
-             */
-            collection?: string;
-
-            /**
-             * Serialize sessions using JSON.stringify and deserialize them with JSON.parse.
-             * (Default: true)
-             */
-            stringify?: boolean;
-
-            /**
-             * Default: false
-             */
-            hash?: boolean;
-
-            /**
-             * Default: 14 days (60 * 60 * 24 * 14)
-             */
-            ttl?: number;
-
-            /**
-             * Automatically remove expired sessions.
-             * (Default: 'native')
-             */
-            autoRemove?: string;
-
-            /**
-             * (Default: 10)
-             */
-            autoRemoveInterval?: number;
-        }
-
-        export interface MongoUrlOptions extends DefaultOptions {
-            url: string;
-            mongoOptions?: mongoose.ConnectionOptions;
-        }
-
-        export interface MogooseConnectionOptions extends DefaultOptions {
-            mongooseConnection: mongoose.Connection;
-        }
-
-        export interface NaitiveMongoOptions extends DefaultOptions {
-            db: mongodb.Db;
-        }
-
-        export interface MongoStoreFactory {
-            new (options: MongoUrlOptions): MongoStore;
-            new (options: MogooseConnectionOptions): MongoStore;
-            new (options: NaitiveMongoOptions): MongoStore;
-        }
-
-        export class MongoStore extends session.Store {
-            get: (sid: string, callback: (err: any, session: Express.Session) => void) => void;
-            set: (sid: string, session: Express.Session, callback: (err: any) => void) => void;
-            destroy: (sid: string, callback: (err: any) => void) => void;
-            length: (callback: (err: any, length: number) => void) => void;
-            clear: (callback: (err: any) => void) => void;
-            touch: (sid: string, session: Express.Session, callback:(err: any) => void) => void;
-        }
-    }
-
-    export = connectMongo;
-}
diff --git a/connect-mongo/index.d.ts b/connect-mongo/index.d.ts
new file mode 100644
index 0000000000..b85ae72156
--- /dev/null
+++ b/connect-mongo/index.d.ts
@@ -0,0 +1,108 @@
+// Type definitions for connect-mongo
+// Project: https://github.com/kcbanner/connect-mongo
+// Definitions by: Mizuki Yamamoto <https://github.com/Syati>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="express-session" />
+
+import * as express from 'express';
+import * as mongoose from 'mongoose';
+import * as mongodb from 'mongodb';
+import * as session from 'express-session';
+
+declare function connectMongo(connect: (options?: session.SessionOptions) => express.RequestHandler): connectMongo.MongoStoreFactory;
+
+declare namespace connectMongo {
+
+    export interface DefaultOptions {
+        /**
+         * The hostname of the database you are connecting to.
+         * (Default: '127.0.0.1')
+         */
+        host?: string;
+
+        /**
+         * The port number to connect to.
+         * (Default: 27017)
+         */
+        port?: string;
+
+        /**
+         * (Default: false)
+         */
+        autoReconnect?: boolean;
+
+        /**
+         * (Default: true)
+         */
+        ssl?: boolean;
+
+        /**
+         * (Default: 1)
+         */
+        w?: number;
+
+        /**
+         * The colletion of the database you are connecting to.
+         * (Default: sessions)
+         */
+        collection?: string;
+
+        /**
+         * Serialize sessions using JSON.stringify and deserialize them with JSON.parse.
+         * (Default: true)
+         */
+        stringify?: boolean;
+
+        /**
+         * Default: false
+         */
+        hash?: boolean;
+
+        /**
+         * Default: 14 days (60 * 60 * 24 * 14)
+         */
+        ttl?: number;
+
+        /**
+         * Automatically remove expired sessions.
+         * (Default: 'native')
+         */
+        autoRemove?: string;
+
+        /**
+         * (Default: 10)
+         */
+        autoRemoveInterval?: number;
+    }
+
+    export interface MongoUrlOptions extends DefaultOptions {
+        url: string;
+        mongoOptions?: mongoose.ConnectionOptions;
+    }
+
+    export interface MogooseConnectionOptions extends DefaultOptions {
+        mongooseConnection: mongoose.Connection;
+    }
+
+    export interface NaitiveMongoOptions extends DefaultOptions {
+        db: mongodb.Db;
+    }
+
+    export interface MongoStoreFactory {
+        new (options: MongoUrlOptions): MongoStore;
+        new (options: MogooseConnectionOptions): MongoStore;
+        new (options: NaitiveMongoOptions): MongoStore;
+    }
+
+    export class MongoStore extends session.Store {
+        get: (sid: string, callback: (err: any, session: Express.Session) => void) => void;
+        set: (sid: string, session: Express.Session, callback: (err: any) => void) => void;
+        destroy: (sid: string, callback: (err: any) => void) => void;
+        length: (callback: (err: any, length: number) => void) => void;
+        clear: (callback: (err: any) => void) => void;
+        touch: (sid: string, session: Express.Session, callback: (err: any) => void) => void;
+    }
+}
+
+export = connectMongo;
diff --git a/connect-mongo/tsconfig.json b/connect-mongo/tsconfig.json
new file mode 100644
index 0000000000..11a47a5d35
--- /dev/null
+++ b/connect-mongo/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "connect-mongo-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/connect-slashes/connect-slashes-tests.ts b/connect-slashes/connect-slashes-tests.ts
index f4c8ac965c..f94705ca29 100644
--- a/connect-slashes/connect-slashes-tests.ts
+++ b/connect-slashes/connect-slashes-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./connect-slashes.d.ts"/>
-
 import express = require('express');
 import slashes = require('connect-slashes');
 
diff --git a/connect-slashes/connect-slashes.d.ts b/connect-slashes/connect-slashes.d.ts
deleted file mode 100644
index 111e29c093..0000000000
--- a/connect-slashes/connect-slashes.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// Type definitions for connect-slashes
-// Project: https://github.com/avinoamr/connect-slashes
-// Definitions by: Sam Herrmann <https://github.com/samherrmann>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/* =================== USAGE ===================
-
-    import express = require('express');
-    import slashes = require('connect-slashes');
-
-    var app = express();
-    app.use(slashes());
- =============================================== */
-
-/// <reference path="../express/express.d.ts" />
-
-
-declare module "connect-slashes" {
-    import express = require('express');
-
-    /**
-     * @see https://github.com/avinoamr/connect-slashes#usage
-     */
-    function slashes (addTrailingSlashes?: boolean, options?: slashes.Options): express.RequestHandler;
-
-    namespace slashes {
-
-        /**
-         * Additional settings
-         * @see https://github.com/avinoamr/connect-slashes#additional-settings
-         */
-        interface Options {
-            base?: string;
-            code?: number;
-            headers?: {[field: string]: string};
-        }
-    }
-
-    export = slashes;
-}
diff --git a/connect-slashes/index.d.ts b/connect-slashes/index.d.ts
new file mode 100644
index 0000000000..ccb7eb82c3
--- /dev/null
+++ b/connect-slashes/index.d.ts
@@ -0,0 +1,39 @@
+// Type definitions for connect-slashes
+// Project: https://github.com/avinoamr/connect-slashes
+// Definitions by: Sam Herrmann <https://github.com/samherrmann>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* =================== USAGE ===================
+
+    import express = require('express');
+    import slashes = require('connect-slashes');
+
+    var app = express();
+    app.use(slashes());
+ =============================================== */
+
+
+
+
+
+import express = require('express');
+
+/**
+ * @see https://github.com/avinoamr/connect-slashes#usage
+ */
+declare function slashes(addTrailingSlashes?: boolean, options?: slashes.Options): express.RequestHandler;
+
+declare namespace slashes {
+
+    /**
+     * Additional settings
+     * @see https://github.com/avinoamr/connect-slashes#additional-settings
+     */
+    interface Options {
+        base?: string;
+        code?: number;
+        headers?: { [field: string]: string };
+    }
+}
+
+export = slashes;
diff --git a/connect-slashes/tsconfig.json b/connect-slashes/tsconfig.json
new file mode 100644
index 0000000000..876bc644b1
--- /dev/null
+++ b/connect-slashes/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "connect-slashes-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/connect-timeout/connect-timeout-tests.ts b/connect-timeout/connect-timeout-tests.ts
index 14e07aa847..aa93ea179e 100644
--- a/connect-timeout/connect-timeout-tests.ts
+++ b/connect-timeout/connect-timeout-tests.ts
@@ -1,7 +1,4 @@
-/// <reference path="connect-timeout.d.ts" />
-/// <reference path="../body-parser/body-parser.d.ts" />
-/// <reference path="../cookie-parser/cookie-parser.d.ts" />
-/// <reference path="../express/express.d.ts" />
+
 
 import * as express from "express";
 import * as timeout from "connect-timeout";
diff --git a/connect-timeout/connect-timeout.d.ts b/connect-timeout/connect-timeout.d.ts
deleted file mode 100644
index dbd4c5cfd8..0000000000
--- a/connect-timeout/connect-timeout.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// Type definitions for connect-timeout
-// Project: https://github.com/expressjs/timeout
-// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare namespace Express {
-    export interface Request {
-        /**
-         * @summary Clears the timeout on the request.
-         */
-        clearTimeout(): void;
-
-        /**
-         *
-         * @return {boolean} true if timeout fired; false otherwise.
-         */
-        timedout(event: string, message: string): boolean;
-    }
-}
-
-declare module "connect-timeout" {
-    import express = require("express");
-
-    namespace e {
-        /**
-         * @summary Interface for timeout options.
-         * @interface
-         */
-        interface TimeoutOptions {
-            /**
-             * @summary Controls if this module will "respond" in the form of forwarding an error.
-             * @type {boolean}
-             */
-            respond?: boolean;
-        }
-    }
-
-    function e(timeout: string, options?: e.TimeoutOptions): express.RequestHandler;
-    export = e;
-}
diff --git a/connect-timeout/index.d.ts b/connect-timeout/index.d.ts
new file mode 100644
index 0000000000..80b3c56a6c
--- /dev/null
+++ b/connect-timeout/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for connect-timeout
+// Project: https://github.com/expressjs/timeout
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace Express {
+    export interface Request {
+        /**
+         * @summary Clears the timeout on the request.
+         */
+        clearTimeout(): void;
+
+        /**
+         *
+         * @return {boolean} true if timeout fired; false otherwise.
+         */
+        timedout(event: string, message: string): boolean;
+    }
+}
+
+declare module "connect-timeout" {
+    import express = require("express");
+
+    namespace e {
+        /**
+         * @summary Interface for timeout options.
+         * @interface
+         */
+        interface TimeoutOptions {
+            /**
+             * @summary Controls if this module will "respond" in the form of forwarding an error.
+             * @type {boolean}
+             */
+            respond?: boolean;
+        }
+    }
+
+    function e(timeout: string, options?: e.TimeoutOptions): express.RequestHandler;
+    export = e;
+}
diff --git a/connect-timeout/tsconfig.json b/connect-timeout/tsconfig.json
new file mode 100644
index 0000000000..d734f6fd8b
--- /dev/null
+++ b/connect-timeout/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "connect-timeout-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/connect/connect-tests.ts b/connect/connect-tests.ts
index e8665f8f91..627017a7e4 100644
--- a/connect/connect-tests.ts
+++ b/connect/connect-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./connect.d.ts" />
 
 import * as http from "http";
 import * as connect from "connect";
diff --git a/connect/connect.d.ts b/connect/connect.d.ts
deleted file mode 100644
index 4ec11f042d..0000000000
--- a/connect/connect.d.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-// Type definitions for connect v3.4.0
-// Project: https://github.com/senchalabs/connect
-// Definitions by: Maxime LUCE <https://github.com/SomaticIT/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "connect" {
-    import * as http from "http";
-
-    /**
-     * Create a new connect server.
-     * @public
-     */
-    function createServer(): createServer.Server;
-
-    namespace createServer {
-    	export type ServerHandle = HandleFunction | http.Server;
-
-        export type SimpleHandleFunction = (req: http.IncomingMessage, res: http.ServerResponse) => void;
-        export type NextHandleFunction = (req: http.IncomingMessage, res: http.ServerResponse, next: Function) => void;
-        export type ErrorHandleFunction = (err: Error, req: http.IncomingMessage, res: http.ServerResponse, next: Function) => void;
-        export type HandleFunction = SimpleHandleFunction | NextHandleFunction | ErrorHandleFunction;
-
-    	export interface ServerStackItem {
-            route: string;
-            handle: ServerHandle;
-    	}
-
-        export interface Server extends NodeJS.EventEmitter {
-            (req: http.IncomingMessage, res: http.ServerResponse, next?: Function): void;
-
-            route: string;
-            stack: ServerStackItem[];
-
-            /**
-            * Utilize the given middleware `handle` to the given `route`,
-            * defaulting to _/_. This "route" is the mount-point for the
-            * middleware, when given a value other than _/_ the middleware
-            * is only effective when that segment is present in the request's
-            * pathname.
-            *
-            * For example if we were to mount a function at _/admin_, it would
-            * be invoked on _/admin_, and _/admin/settings_, however it would
-            * not be invoked for _/_, or _/posts_.
-            *
-            * @public
-            */
-            use(fn: HandleFunction): Server;
-            use(route: string, fn: HandleFunction): Server;
-
-            /**
-            * Handle server requests, punting them down
-            * the middleware stack.
-            *
-            * @private
-            */
-            handle(req: http.IncomingMessage, res: http.ServerResponse, next: Function): void;
-
-            /**
-            * Listen for connections.
-            *
-            * This method takes the same arguments
-            * as node's `http.Server#listen()`.
-            *
-            * HTTP and HTTPS:
-            *
-            * If you run your application both as HTTP
-            * and HTTPS you may wrap them individually,
-            * since your Connect "server" is really just
-            * a JavaScript `Function`.
-            *
-            *      var connect = require('connect')
-            *        , http = require('http')
-            *        , https = require('https');
-            *
-            *      var app = connect();
-            *
-            *      http.createServer(app).listen(80);
-            *      https.createServer(options, app).listen(443);
-            *
-            * @api public
-            */
-            listen(port: number, hostname?: string, backlog?: number, callback?: Function): http.Server;
-            listen(port: number, hostname?: string, callback?: Function): http.Server;
-            listen(path: string, callback?: Function): http.Server;
-            listen(handle: any, listeningListener?: Function): http.Server;
-        }
-    }
-
-    export = createServer;
-}
diff --git a/connect/index.d.ts b/connect/index.d.ts
new file mode 100644
index 0000000000..66c5b7562c
--- /dev/null
+++ b/connect/index.d.ts
@@ -0,0 +1,91 @@
+// Type definitions for connect v3.4.0
+// Project: https://github.com/senchalabs/connect
+// Definitions by: Maxime LUCE <https://github.com/SomaticIT/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import * as http from "http";
+
+/**
+ * Create a new connect server.
+ * @public
+ */
+declare function createServer(): createServer.Server;
+
+declare namespace createServer {
+    export type ServerHandle = HandleFunction | http.Server;
+
+    export type SimpleHandleFunction = (req: http.IncomingMessage, res: http.ServerResponse) => void;
+    export type NextHandleFunction = (req: http.IncomingMessage, res: http.ServerResponse, next: Function) => void;
+    export type ErrorHandleFunction = (err: Error, req: http.IncomingMessage, res: http.ServerResponse, next: Function) => void;
+    export type HandleFunction = SimpleHandleFunction | NextHandleFunction | ErrorHandleFunction;
+
+    export interface ServerStackItem {
+        route: string;
+        handle: ServerHandle;
+    }
+
+    export interface Server extends NodeJS.EventEmitter {
+        (req: http.IncomingMessage, res: http.ServerResponse, next?: Function): void;
+
+        route: string;
+        stack: ServerStackItem[];
+
+        /**
+        * Utilize the given middleware `handle` to the given `route`,
+        * defaulting to _/_. This "route" is the mount-point for the
+        * middleware, when given a value other than _/_ the middleware
+        * is only effective when that segment is present in the request's
+        * pathname.
+        *
+        * For example if we were to mount a function at _/admin_, it would
+        * be invoked on _/admin_, and _/admin/settings_, however it would
+        * not be invoked for _/_, or _/posts_.
+        *
+        * @public
+        */
+        use(fn: HandleFunction): Server;
+        use(route: string, fn: HandleFunction): Server;
+
+        /**
+        * Handle server requests, punting them down
+        * the middleware stack.
+        *
+        * @private
+        */
+        handle(req: http.IncomingMessage, res: http.ServerResponse, next: Function): void;
+
+        /**
+        * Listen for connections.
+        *
+        * This method takes the same arguments
+        * as node's `http.Server#listen()`.
+        *
+        * HTTP and HTTPS:
+        *
+        * If you run your application both as HTTP
+        * and HTTPS you may wrap them individually,
+        * since your Connect "server" is really just
+        * a JavaScript `Function`.
+        *
+        *      var connect = require('connect')
+        *        , http = require('http')
+        *        , https = require('https');
+        *
+        *      var app = connect();
+        *
+        *      http.createServer(app).listen(80);
+        *      https.createServer(options, app).listen(443);
+        *
+        * @api public
+        */
+        listen(port: number, hostname?: string, backlog?: number, callback?: Function): http.Server;
+        listen(port: number, hostname?: string, callback?: Function): http.Server;
+        listen(path: string, callback?: Function): http.Server;
+        listen(handle: any, listeningListener?: Function): http.Server;
+    }
+}
+
+export = createServer;
diff --git a/connect/tsconfig.json b/connect/tsconfig.json
new file mode 100644
index 0000000000..f42cccb822
--- /dev/null
+++ b/connect/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "connect-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/console-stamp/console-stamp-tests.ts b/console-stamp/console-stamp-tests.ts
index e6ae6895b0..d4dad4d695 100644
--- a/console-stamp/console-stamp-tests.ts
+++ b/console-stamp/console-stamp-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="console-stamp.d.ts" />
 
 import consoleStamp = require("console-stamp");
 
diff --git a/console-stamp/console-stamp.d.ts b/console-stamp/console-stamp.d.ts
deleted file mode 100644
index a798dc66cc..0000000000
--- a/console-stamp/console-stamp.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// Type definitions for console-stamp 0.2.0
-// Project: https://github.com/starak/node-console-stamp
-// Definitions by: Eric Byers <https://github.com/ericbyers/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'console-stamp' {
-
-	function consoleStamp(console:{}, options?: {
-		/**
-		 * A string with date format based on Javascript Date Format
-		 */
-		pattern?: string
-
-		/**
-		 * If true it will show the label (LOG | INFO | WARN | ERROR)
-		 */
-		label?: boolean;
-
-		/**
-		 * An array containing the methods to include in the patch
-		 */
-		include?: any;
-
-		/**
-		 * An array containing the methods to exclude in the patch)
-		 */
-		exclude?: any;
-
-		/**
-		 * Types can be String, Object (interpreted with util.inspect), or Function. See the test-metadata.js for examples.
-		 * Note that metadata can still be sent as the third parameter (as in vesion 1.6) as a backward compatibillity feature, but this is deprecated.
-		 */
-		metadata?: any;
-
-		/**
-		 * An object representing a color theme. More info https://www.npmjs.com/package/colors
-		 */
-		colors?: {
-			stamp?: any;
-			label?: any;
-			metadata?: any;
-		};
-	}): void;
-
-	export = consoleStamp;
-}
diff --git a/console-stamp/index.d.ts b/console-stamp/index.d.ts
new file mode 100644
index 0000000000..ff6571330d
--- /dev/null
+++ b/console-stamp/index.d.ts
@@ -0,0 +1,45 @@
+// Type definitions for console-stamp 0.2.0
+// Project: https://github.com/starak/node-console-stamp
+// Definitions by: Eric Byers <https://github.com/ericbyers/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare function consoleStamp(console: {}, options?: {
+    /**
+     * A string with date format based on Javascript Date Format
+     */
+    pattern?: string
+
+    /**
+     * If true it will show the label (LOG | INFO | WARN | ERROR)
+     */
+    label?: boolean;
+
+    /**
+     * An array containing the methods to include in the patch
+     */
+    include?: any;
+
+    /**
+     * An array containing the methods to exclude in the patch)
+     */
+    exclude?: any;
+
+    /**
+     * Types can be String, Object (interpreted with util.inspect), or Function. See the test-metadata.js for examples.
+     * Note that metadata can still be sent as the third parameter (as in vesion 1.6) as a backward compatibillity feature, but this is deprecated.
+     */
+    metadata?: any;
+
+    /**
+     * An object representing a color theme. More info https://www.npmjs.com/package/colors
+     */
+    colors?: {
+        stamp?: any;
+        label?: any;
+        metadata?: any;
+    };
+}): void;
+
+export = consoleStamp;
diff --git a/console-stamp/tsconfig.json b/console-stamp/tsconfig.json
new file mode 100644
index 0000000000..779d49375f
--- /dev/null
+++ b/console-stamp/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "console-stamp-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/consolidate/consolidate-tests.ts b/consolidate/consolidate-tests.ts
index 77fddb631d..4145fd1e6c 100644
--- a/consolidate/consolidate-tests.ts
+++ b/consolidate/consolidate-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="consolidate.d.ts" />
+
 import cons = require('consolidate');
 
 var path: string = 'test/path';
diff --git a/consolidate/consolidate.d.ts b/consolidate/consolidate.d.ts
deleted file mode 100644
index ff54a83a8e..0000000000
--- a/consolidate/consolidate.d.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-// Type definitions for consolidate
-// Project: https://github.com/visionmedia/consolidate.js
-// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>, Theo Sherry <https://github.com/theosherry>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/consolidate.d.ts
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../bluebird/bluebird.d.ts" />
-
-declare module "consolidate" {
-	var cons: Consolidate;
-
-	export = cons;
-
-	interface Consolidate {
-		/**
- 		 * expose the instance of the engine
-	   */
-		requires: Object;
-
-		/**
-		 * Clear the cache.
-		 *
-		 * @api public
-		 */
-		clearCache(): void;
-		// template engines
-		atpl: RendererInterface;
-		dot: RendererInterface;
-		dust: RendererInterface;
-		eco: RendererInterface;
-		ejs: RendererInterface;
-		ect: RendererInterface;
-		haml: RendererInterface;
-		// TODO figure out how to do haml-coffee
-		hamlet: RendererInterface;
-		handlebars: RendererInterface;
-		hogan: RendererInterface;
-		htmling: RendererInterface;
-		jade: RendererInterface;
-		jazz: RendererInterface;
-		jqtpl: RendererInterface;
-		just: RendererInterface;
-		liquid: RendererInterface;
-		liquor: RendererInterface;
-		lodash: RendererInterface;
-		mote: RendererInterface;
-		mustache: RendererInterface;
-		nunjucks: RendererInterface;
-		qejs: RendererInterface;
-		ractive: RendererInterface;
-		react: RendererInterface;
-		swig: RendererInterface;
-		templayed: RendererInterface;
-		toffee: RendererInterface;
-		underscore: RendererInterface;
-		walrus: RendererInterface;
-		whiskers: RendererInterface;
-	}
-
-	interface RendererInterface {
-		render(path: String, fn: (err: Error, html: String) => any): any;
-
-		render(path: String, options: {cache?: boolean, [otherOptions: string]: any}, fn: (err: Error, html: String) => any): any;
-
-		render(path: String, options?: { cache?: boolean, [otherOptions: string]: any }): Promise<String>;
-
-		(path: String, fn: (err: Error, html: String) => any): any;
-
-		(path: String, options: { cache?: boolean, [otherOptions: string]: any }, fn: (err: Error, html: String) => any): any;
-
-		(path: String, options?: { cache?: boolean, [otherOptions: string]: any }): Promise<String>;
-	}
-}
diff --git a/consolidate/index.d.ts b/consolidate/index.d.ts
new file mode 100644
index 0000000000..9f59a0ba13
--- /dev/null
+++ b/consolidate/index.d.ts
@@ -0,0 +1,74 @@
+// Type definitions for consolidate
+// Project: https://github.com/visionmedia/consolidate.js
+// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>, Theo Sherry <https://github.com/theosherry>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/consolidate.d.ts
+
+/// <reference types="node" />
+/// <reference types="bluebird" />
+
+
+declare var cons: Consolidate;
+
+export = cons;
+
+interface Consolidate {
+    /**
+         * expose the instance of the engine
+   */
+    requires: Object;
+
+    /**
+     * Clear the cache.
+     *
+     * @api public
+     */
+    clearCache(): void;
+    // template engines
+    atpl: RendererInterface;
+    dot: RendererInterface;
+    dust: RendererInterface;
+    eco: RendererInterface;
+    ejs: RendererInterface;
+    ect: RendererInterface;
+    haml: RendererInterface;
+    // TODO figure out how to do haml-coffee
+    hamlet: RendererInterface;
+    handlebars: RendererInterface;
+    hogan: RendererInterface;
+    htmling: RendererInterface;
+    jade: RendererInterface;
+    jazz: RendererInterface;
+    jqtpl: RendererInterface;
+    just: RendererInterface;
+    liquid: RendererInterface;
+    liquor: RendererInterface;
+    lodash: RendererInterface;
+    mote: RendererInterface;
+    mustache: RendererInterface;
+    nunjucks: RendererInterface;
+    qejs: RendererInterface;
+    ractive: RendererInterface;
+    react: RendererInterface;
+    swig: RendererInterface;
+    templayed: RendererInterface;
+    toffee: RendererInterface;
+    underscore: RendererInterface;
+    walrus: RendererInterface;
+    whiskers: RendererInterface;
+}
+
+interface RendererInterface {
+    render(path: String, fn: (err: Error, html: String) => any): any;
+
+    render(path: String, options: { cache?: boolean, [otherOptions: string]: any }, fn: (err: Error, html: String) => any): any;
+
+    render(path: String, options?: { cache?: boolean, [otherOptions: string]: any }): Promise<String>;
+
+    (path: String, fn: (err: Error, html: String) => any): any;
+
+    (path: String, options: { cache?: boolean, [otherOptions: string]: any }, fn: (err: Error, html: String) => any): any;
+
+    (path: String, options?: { cache?: boolean, [otherOptions: string]: any }): Promise<String>;
+}
diff --git a/consolidate/tsconfig.json b/consolidate/tsconfig.json
new file mode 100644
index 0000000000..a8f19b1bb4
--- /dev/null
+++ b/consolidate/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "consolidate-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/constant-case/constant-case-tests.ts b/constant-case/constant-case-tests.ts
index b7ac3fe9e0..ddb5c57e66 100644
--- a/constant-case/constant-case-tests.ts
+++ b/constant-case/constant-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="constant-case.d.ts" />
 
 import constantCase = require('constant-case');
 
diff --git a/constant-case/constant-case.d.ts b/constant-case/constant-case.d.ts
deleted file mode 100644
index 2bb635c763..0000000000
--- a/constant-case/constant-case.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for constant-case
-// Project: https://github.com/blakeembrey/constant-case
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "constant-case" {
-	function constantCase(string: string, locale?: string): string;
-	export = constantCase;
-}
diff --git a/constant-case/index.d.ts b/constant-case/index.d.ts
new file mode 100644
index 0000000000..7ae0536e74
--- /dev/null
+++ b/constant-case/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for constant-case
+// Project: https://github.com/blakeembrey/constant-case
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function constantCase(string: string, locale?: string): string;
+export = constantCase;
diff --git a/constant-case/tsconfig.json b/constant-case/tsconfig.json
new file mode 100644
index 0000000000..367c4161b4
--- /dev/null
+++ b/constant-case/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "constant-case-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/consul/consul-tests.ts b/consul/consul-tests.ts
index 2a8619aca5..f749ef0a5d 100644
--- a/consul/consul-tests.ts
+++ b/consul/consul-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./consul.d.ts" />
 
 import * as Consul from "consul";
 
diff --git a/consul/consul.d.ts b/consul/consul.d.ts
deleted file mode 100644
index 4f46e6a5be..0000000000
--- a/consul/consul.d.ts
+++ /dev/null
@@ -1,1034 +0,0 @@
-// Type definitions for Consul v0.23.0
-// Project: https://github.com/silas/node-consul
-// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "consul" {
-
-	import {IncomingMessage as HttpIncomingMessage} from "http";
-
-	namespace Consul {
-
-		interface Thenable<T> {
-			then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => U | Thenable<U>): Thenable<U>;
-			then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => void): Thenable<U>;
-			catch<U>(onRejected?: (error: any) => U | Thenable<U>): Thenable<U>;
-		}
-
-		interface CommonOptions {
-			consistent?: boolean;
-			dc?: string;
-			stale?: boolean;
-			token?: string;
-			wait?: string;
-			wan?: boolean;
-
-			ctx?: NodeJS.EventEmitter;
-			timeout?: number;
-		}
-
-		interface Response extends HttpIncomingMessage {
-			body?: Object|string|Buffer;
-		}
-
-		interface Callback<TData> {
-			(err?: Error, data?: TData, res?: Response): any;
-		}
-
-		namespace Acl {
-
-			interface CreateOptions extends CommonOptions {
-				name?: string;
-				type?: string;
-				rules?: string;
-			}
-
-			interface UpdateOptions extends CommonOptions {
-				id: string;
-				name?: string;
-				type?: string;
-				rules?: string;
-			}
-
-			interface DestroyOptions extends CommonOptions {
-				id: string;
-			}
-
-			interface InfoOptions extends CommonOptions {
-				id: string;
-			}
-
-			interface GetOptions extends InfoOptions {}
-
-			interface CloneOptions extends CommonOptions {
-				id: string;
-			}
-
-			interface ListOptions extends CommonOptions {}
-		}
-
-		interface Acl {
-			consul: Consul;
-
-			/**
-			 * Creates a new token with policy
-			 */
-			create: {
-				<TData>(opts: Acl.CreateOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(opts?: Acl.CreateOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Update the policy of a token
-			 */
-			update: {
-				<TData>(opts: Acl.UpdateOptions, callback: Callback<TData>): void;
-				<TData>(opts: Acl.UpdateOptions): Thenable<TData>;
-			}
-
-			/**
-			 * Destroys a given token
-			 */
-			destroy: {
-				<TData>(id: string, callback: Callback<TData>): void;
-				<TData>(opts: Acl.DestroyOptions, callback: Callback<TData>): void;
-				<TData>(id: string): Thenable<TData>;
-				<TData>(opts: Acl.DestroyOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Queries the policy of a given token
-			 */
-			info: {
-				<TData>(id: string, callback: Callback<TData>): void;
-				<TData>(opts: Acl.InfoOptions, callback: Callback<TData>): void;
-				<TData>(id: string): Thenable<TData>;
-				<TData>(opts: Acl.InfoOptions): Thenable<TData>;
-			};
-			get: {
-				<TData>(id: string, callback: Callback<TData>): void;
-				<TData>(opts: Acl.GetOptions, callback: Callback<TData>): void;
-				<TData>(id: string): Thenable<TData>;
-				<TData>(opts: Acl.GetOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Creates a new token by cloning an existing token
-			 */
-			clone: {
-				<TData>(id: string, callback: Callback<TData>): void;
-				<TData>(opts: Acl.CloneOptions, callback: Callback<TData>): void;
-				<TData>(id: string): Thenable<TData>;
-				<TData>(opts: Acl.CloneOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Lists all the active tokens
-			 */
-			list: {
-				<TData>(opts: Acl.ListOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(opts?: Acl.ListOptions): Thenable<TData>;
-			};
-		}
-
-		interface AclStatic {
-			new (consul: Consul): Acl;
-		}
-
-		namespace Agent {
-
-			namespace Check {
-
-				interface ListOptions extends CommonOptions {}
-
-				interface RegisterOptions extends CommonOptions {
-					name: string;
-					id?: string;
-					serviceid?: string;
-					http?: string;
-					script?: string;
-					interval?: string;
-					ttl?: string;
-					notes?: string;
-					status?: string;
-				}
-
-				interface DeregisterOptions extends CommonOptions {
-					id: string;
-				}
-
-				interface PassOptions extends CommonOptions {
-					id: string;
-					note?: string;
-				}
-
-				interface WarnOptions extends CommonOptions {
-					id: string;
-					note?: string;
-				}
-
-				interface FailOptions extends CommonOptions {
-					id: string;
-					note?: string;
-				}
-			}
-
-			interface Check {
-				consul: Consul;
-
-				/**
-				 * Returns the checks the local agent is managing
-				 */
-				list: {
-					<TData>(opts: Check.ListOptions, callback: Callback<TData>): void;
-					<TData>(callback: Callback<TData>): void;
-					<TData>(opts?: Check.ListOptions): Thenable<TData>;
-				};
-
-				/**
-				 * Registers a new local check
-				 */
-				register: {
-					<TData>(opts: Check.RegisterOptions, callback: Callback<TData>): void;
-					<TData>(opts: Check.RegisterOptions): Thenable<TData>;
-				};
-
-				/**
-				 * Deregister a local check
-				 */
-				deregister: {
-					<TData>(id: string, callback: Callback<TData>): void;
-					<TData>(opts: Check.DeregisterOptions, callback: Callback<TData>): void;
-					<TData>(id: string): Thenable<TData>;
-					<TData>(opts: Check.DeregisterOptions): Thenable<TData>;
-				};
-
-				/**
-				 * Mark a local test as passing
-				 */
-				pass: {
-					<TData>(id: string, callback: Callback<TData>): void;
-					<TData>(opts: Check.PassOptions, callback: Callback<TData>): void;
-					<TData>(id: string): Thenable<TData>;
-					<TData>(opts: Check.PassOptions): Thenable<TData>;
-				};
-
-				/**
-				 * Mark a local test as warning
-				 */
-				warn: {
-					<TData>(id: string, callback: Callback<TData>): void;
-					<TData>(opts: Check.WarnOptions, callback: Callback<TData>): void;
-					<TData>(id: string): Thenable<TData>;
-					<TData>(opts: Check.WarnOptions): Thenable<TData>;
-				};
-
-				/**
-				 * Mark a local test as critical
-				 */
-				fail: {
-					<TData>(id: string, callback: Callback<TData>): void;
-					<TData>(opts: Check.FailOptions, callback: Callback<TData>): void;
-					<TData>(id: string): Thenable<TData>;
-					<TData>(opts: Check.FailOptions): Thenable<TData>;
-				};
-			}
-
-			interface CheckStatic {
-				new (consul: Consul): Check;
-			}
-
-			namespace Service {
-
-				interface RegisterCheck {
-					http?: string;
-					script?: string;
-					interval?: string;
-					ttl?: string;
-					notes?: string;
-					status?: string;
-				}
-
-				interface ListOptions extends CommonOptions {}
-
-				interface RegisterOptions extends CommonOptions {
-					name: string;
-					id?: string;
-					tags?: string[];
-					address?: string;
-					port?: number;
-					check?: RegisterCheck;
-					checks?: RegisterCheck[];
-				}
-
-				interface DeregisterOptions extends CommonOptions {
-					id: string;
-				}
-
-				interface MaintenanceOptions extends CommonOptions {
-					id: string;
-					enable: boolean;
-					reason?: string;
-				}
-			}
-
-			interface Service {
-				consul: Consul;
-
-				/**
-				 * Returns the services local agent is managing
-				 */
-				list: {
-					<TData>(opts: Service.ListOptions, callback: Callback<TData>): void;
-					<TData>(callback: Callback<TData>): void;
-					<TData>(opts?: Service.ListOptions): Thenable<TData>;
-				};
-
-				/**
-				 * Registers a new local service
-				 */
-				register: {
-					<TData>(name: string, callback: Callback<TData>): void;
-					<TData>(opts: Service.RegisterOptions, callback: Callback<TData>): void;
-					<TData>(name: string): Thenable<TData>;
-					<TData>(opts: Service.RegisterOptions): Thenable<TData>;
-				};
-
-				/**
-				 * Deregister a local service
-				 */
-				deregister: {
-					<TData>(id: string, callback: Callback<TData>): void;
-					<TData>(opts: Service.DeregisterOptions, callback: Callback<TData>): void;
-					<TData>(id: string): Thenable<TData>;
-					<TData>(opts: Service.DeregisterOptions): Thenable<TData>;
-				};
-
-				/**
-				 * Manages node maintenance mode
-				 */
-				maintenance: {
-					<TData>(opts: Service.MaintenanceOptions, callback: Callback<TData>): void;
-					<TData>(opts: Service.MaintenanceOptions): Thenable<TData>;
-				};
-			}
-
-			interface ServiceStatic {
-				new (consul: Consul): Service;
-			}
-
-			interface ChecksOptions extends Check.ListOptions {}
-
-			interface ServicesOptions extends Service.ListOptions {}
-
-			interface MembersOptions extends CommonOptions {
-				wan?: boolean;
-			}
-
-			interface SelfOptions extends CommonOptions {}
-
-			interface MaintenanceOptions extends CommonOptions {
-				enable: boolean;
-				reason?: string;
-			}
-
-			interface JoinOptions extends CommonOptions {
-				address: string;
-				wan?: boolean;
-			}
-
-			interface ForceLeaveOptions extends CommonOptions {
-				node: string;
-			}
-		}
-
-		interface Agent {
-			consul: Consul;
-			check: Agent.Check;
-			service: Agent.Service;
-
-			/**
-			 * Returns the checks the local agent is managing
-			 */
-			checks: {
-				<TData>(opts: Agent.ChecksOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(opts?: Agent.ChecksOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Returns the services local agent is managing
-			 */
-			services: {
-				<TData>(opts: Agent.ServicesOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(opts?: Agent.ServicesOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Returns the members as seen by the local consul agent
-			 */
-			members: {
-				<TData>(opts: Agent.MembersOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(opts?: Agent.MembersOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Returns the local node configuration
-			 */
-			self: {
-				<TData>(opts: Agent.SelfOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(opts?: Agent.SelfOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Manages node maintenance mode
-			 */
-			maintenance: {
-				<TData>(enable: boolean, callback: Callback<TData>): void;
-				<TData>(opts: Agent.MaintenanceOptions, callback: Callback<TData>): void;
-				<TData>(enable: boolean): Thenable<TData>;
-				<TData>(opts: Agent.MaintenanceOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Trigger local agent to join a node
-			 */
-			join: {
-				<TData>(address: string, callback: Callback<TData>): void;
-				<TData>(opts: Agent.JoinOptions, callback: Callback<TData>): void;
-				<TData>(address: string): Thenable<TData>;
-				<TData>(opts: Agent.JoinOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Force remove node
-			 */
-			forceLeave: {
-				<TData>(node: string, callback: Callback<TData>): void;
-				<TData>(opts: Agent.ForceLeaveOptions, callback: Callback<TData>): void;
-				<TData>(node: string): Thenable<TData>;
-				<TData>(opts: Agent.ForceLeaveOptions): Thenable<TData>;
-			};
-		}
-
-		interface AgentStatic {
-			new (consul: Consul): Agent;
-
-			Check: Agent.CheckStatic;
-			Service: Agent.ServiceStatic;
-		}
-
-		namespace Catalog {
-
-			namespace Node {
-
-				interface ListOptions extends CommonOptions {
-					dc?: string;
-				}
-
-				interface ServicesOptions extends CommonOptions {
-					node: string;
-				}
-			}
-
-			interface Node {
-				consul: Consul;
-
-				/**
-				 * Lists nodes in a given DC
-				 */
-				list: {
-					<TData>(dc: string, callback: Callback<TData>): void;
-					<TData>(opts: Node.ListOptions, callback: Callback<TData>): void;
-					<TData>(callback: Callback<TData>): void;
-					<TData>(dc?: string): Thenable<TData>;
-					<TData>(opts?: Node.ListOptions): Thenable<TData>;
-				};
-
-				/**
-				 * Lists the services provided by a node
-				 */
-				services: {
-					<TData>(node: string, callback: Callback<TData>): void;
-					<TData>(opts: Node.ServicesOptions, callback: Callback<TData>): void;
-					<TData>(node: string): Thenable<TData>;
-					<TData>(opts: Node.ServicesOptions): Thenable<TData>;
-				};
-			}
-
-			interface NodeStatic {
-				new(consul: Consul): Node;
-			}
-
-			namespace Service {
-
-				interface ListOptions extends CommonOptions {
-					dc?: string;
-				}
-
-				interface NodesOptions extends CommonOptions {
-					service: string;
-					dc?: string;
-					tag?: string;
-				}
-			}
-
-
-
-			interface Service {
-				consul: Consul;
-
-				/**
-				 * Lists services in a given DC
-				 */
-				list: {
-					<TData>(dc: string, callback: Callback<TData>): void;
-					<TData>(opts: Service.ListOptions, callback: Callback<TData>): void;
-					<TData>(callback: Callback<TData>): void;
-					<TData>(dc?: string): Thenable<TData>;
-					<TData>(opts?: Service.ListOptions): Thenable<TData>;
-				};
-
-				/**
-				 * Lists the nodes in a given service
-				 */
-				nodes: {
-					<TData>(service: string, callback: Callback<TData>): void;
-					<TData>(opts: Service.NodesOptions, callback: Callback<TData>): void;
-					<TData>(service: string): Thenable<TData>;
-					<TData>(opts: Service.NodesOptions): Thenable<TData>;
-				};
-			}
-
-			interface ServiceStatic {
-				new(consul: Consul): Service;
-			}
-
-			interface DatacentersOptions extends CommonOptions {}
-
-			interface NodesOptions extends Node.ListOptions {}
-
-			interface ServicesOptions extends Service.ListOptions {}
-		}
-
-		interface Catalog {
-			consul: Consul;
-			node: Catalog.Node;
-			service: Catalog.Service;
-
-			/**
-			 * Lists known datacenters
-			 */
-			datacenters: {
-				<TData>(opts: Catalog.DatacentersOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(opts?: Catalog.DatacentersOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Lists nodes in a given DC
-			 */
-			nodes: {
-				<TData>(dc: string, callback: Callback<TData>): void;
-				<TData>(opts: Catalog.NodesOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(dc?: string): Thenable<TData>;
-				<TData>(opts?: Catalog.NodesOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Lists services in a given DC
-			 */
-			services: {
-				<TData>(dc: string, callback: Callback<TData>): void;
-				<TData>(opts: Catalog.ServicesOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(dc?: string): Thenable<TData>;
-				<TData>(opts?: Catalog.ServicesOptions): Thenable<TData>;
-			};
-		}
-
-		interface CatalogStatic {
-			new(consul: Consul): Catalog;
-
-			Node: Catalog.NodeStatic;
-			Service: Catalog.ServiceStatic;
-		}
-
-		namespace Event {
-
-			interface FireOptions extends CommonOptions {
-				name: string;
-				payload: string|Buffer;
-				node?: string;
-				service?: string;
-				tag?: string;
-			}
-
-			interface ListOptions extends CommonOptions {
-				name?: string;
-			}
-		}
-
-		interface Event {
-			consul: Consul;
-
-			/**
-			 * Fires a new user event
-			 */
-			fire: {
-				<TData>(name: string, payload: string|Buffer, callback: Callback<TData>): void;
-				<TData>(name: string, callback: Callback<TData>): void;
-				<TData>(opts: Event.FireOptions, callback: Callback<TData>): void;
-				<TData>(name: string, payload: string|Buffer): Thenable<TData>;
-				<TData>(name: string): Thenable<TData>;
-				<TData>(opts: Event.FireOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Lists the most recent events an agent has seen
-			 */
-			list: {
-				<TData>(name: string, callback: Callback<TData>): void;
-				<TData>(opts: Event.ListOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(name?: string): Thenable<TData>;
-				<TData>(opts?: Event.ListOptions): Thenable<TData>;
-			};
-		}
-
-		interface EventStatic {
-			new(consul: Consul): Event;
-		}
-
-		namespace Health {
-
-			interface NodeOptions extends CommonOptions {
-				node: string;
-				dc?: string;
-			}
-
-			interface ChecksOptions extends CommonOptions {
-				service: string;
-				dc?: string;
-			}
-
-			interface ServiceOptions extends CommonOptions {
-				service: string;
-				dc?: string;
-				tag?: string;
-				passing?: boolean;
-			}
-
-			interface StateOptions extends CommonOptions {
-				state: string;
-				dc?: string;
-			}
-		}
-
-		interface Health {
-			consul: Consul;
-
-			/**
-			 * Returns the health info of a node
-			 */
-			node: {
-				<TData>(node: string, callback: Callback<TData>): void;
-				<TData>(opts: Health.NodeOptions, callback: Callback<TData>): void;
-				<TData>(node: string): Thenable<TData>;
-				<TData>(opts: Health.NodeOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Returns the checks of a service
-			 */
-			checks: {
-				<TData>(service: string, callback: Callback<TData>): void;
-				<TData>(opts: Health.ChecksOptions, callback: Callback<TData>): void;
-				<TData>(service: string): Thenable<TData>;
-				<TData>(opts: Health.ChecksOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Returns the nodes and health info of a service
-			 */
-			service: {
-				<TData>(service: string, callback: Callback<TData>): void;
-				<TData>(opts: Health.ServiceOptions, callback: Callback<TData>): void;
-				<TData>(service: string): Thenable<TData>;
-				<TData>(opts: Health.ServiceOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Returns the checks in a given state
-			 */
-			state: {
-				<TData>(state: string, callback: Callback<TData>): void;
-				<TData>(opts: Health.StateOptions, callback: Callback<TData>): void;
-				<TData>(state: string): Thenable<TData>;
-				<TData>(opts: Health.StateOptions): Thenable<TData>;
-			};
-		}
-
-		interface HealthStatic {
-			new(consul: Consul): Health;
-		}
-
-		namespace Kv {
-
-			interface GetOptions extends CommonOptions {
-				key: string;
-				dc?: string;
-				recurse?: boolean;
-				index?: string;
-				wait?: string;
-				raw?: boolean;
-				buffer?: boolean;
-			}
-
-			interface KeysOptions extends CommonOptions {
-				key: string;
-				dc?: string;
-				separator?: string;
-			}
-
-			interface SetOptions extends CommonOptions {
-				key: string;
-				value: string|Buffer;
-				dc?: string;
-				flags?: number;
-				cas?: string;
-				acquire?: string;
-				release?: string;
-			}
-
-			interface DelOptions extends CommonOptions {
-				key: string;
-				dc?: string;
-				recurse?: boolean;
-				cas?: string;
-			}
-
-			interface DeleteOptions extends DelOptions {}
-		}
-
-		interface Kv {
-			consul: Consul;
-
-			/**
-			 * Get
-			 */
-			get: {
-				<TData>(key: string, callback: Callback<TData>): void;
-				<TData>(opts: Kv.GetOptions, callback: Callback<TData>): void;
-				<TData>(key: string): Thenable<TData>;
-				<TData>(opts: Kv.GetOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Keys
-			 */
-			keys: {
-				<TData>(key: string, callback: Callback<TData>): void;
-				<TData>(opts: Kv.KeysOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(key?: string): Thenable<TData>;
-				<TData>(opts?: Kv.KeysOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Set
-			 */
-			set: {
-				<TData>(key: string, value: string|Buffer, opts: Kv.SetOptions, callback: Callback<TData>): void;
-				<TData>(key: string, value: string|Buffer, callback: Callback<TData>): void;
-				<TData>(opts: Kv.SetOptions, callback: Callback<TData>): void;
-				<TData>(key: string, value: string|Buffer, opts: Kv.SetOptions): Thenable<TData>;
-				<TData>(key: string, value: string|Buffer): Thenable<TData>;
-				<TData>(opts: Kv.SetOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Delete
-			 */
-			del: {
-				<TData>(key: string, callback: Callback<TData>): void;
-				<TData>(opts: Kv.DelOptions, callback: Callback<TData>): void;
-				<TData>(key: string): Thenable<TData>;
-				<TData>(opts: Kv.DelOptions): Thenable<TData>;
-			};
-			delete: {
-				<TData>(key: string, callback: Callback<TData>): void;
-				<TData>(opts: Kv.DeleteOptions, callback: Callback<TData>): void;
-				<TData>(key: string): Thenable<TData>;
-				<TData>(opts: Kv.DeleteOptions): Thenable<TData>;
-			};
-		}
-
-		interface KvStatic {
-			new(consul: Consul): Kv;
-		}
-
-		namespace Lock {
-
-			interface Options {
-				key: string;
-				session?: Object|string;
-				value?: string|Buffer;
-				lockwaittime?: string;
-				lockretrytime?: string;
-			}
-		}
-
-		interface Lock extends NodeJS.EventEmitter {
-			consul: Consul;
-
-			/**
-			 * Acquire lock
-			 */
-			acquire(): void;
-
-			/**
-			 * Release lock
-			 */
-			release(): void;
-		}
-
-		interface LockStatic {
-			new(consul: Consul, opts: Lock.Options): Lock;
-		}
-
-		namespace Session {
-
-			interface CreateOptions extends CommonOptions {
-				dc?: string;
-				lockdelay?: string;
-				name?: string;
-				node?: string;
-				checks?: string[];
-				behavior?: string;
-				ttl?: string;
-			}
-
-			interface DestroyOptions extends CommonOptions {
-				id: string;
-				dc?: string;
-			}
-
-			interface InfoOptions extends CommonOptions {
-				id: string;
-				dc?: string;
-			}
-
-			interface GetOptions extends InfoOptions {}
-
-			interface NodeOptions extends CommonOptions {
-				node: string;
-				dc?: string;
-			}
-
-			interface ListOptions extends CommonOptions {
-				dc?: string;
-			}
-
-			interface RenewOptions extends CommonOptions {
-				id: string;
-				dc?: string;
-			}
-		}
-
-
-		interface Session {
-			consul: Consul;
-
-			/**
-			 * Creates a new session
-			 */
-			create: {
-				<TData>(opts: Session.CreateOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(opts?: Session.CreateOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Destroys a given session
-			 */
-			destroy: {
-				<TData>(id: string, callback: Callback<TData>): void;
-				<TData>(opts: Session.DestroyOptions, callback: Callback<TData>): void;
-				<TData>(id: string): Thenable<TData>;
-				<TData>(opts: Session.DestroyOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Queries a given session
-			 */
-			info: {
-				<TData>(id: string, callback: Callback<TData>): void;
-				<TData>(opts: Session.InfoOptions, callback: Callback<TData>): void;
-				<TData>(id: string): Thenable<TData>;
-				<TData>(opts: Session.InfoOptions): Thenable<TData>;
-			};
-			get: {
-				<TData>(id: string, callback: Callback<TData>): void;
-				<TData>(opts: Session.GetOptions, callback: Callback<TData>): void;
-				<TData>(id: string): Thenable<TData>;
-				<TData>(opts: Session.GetOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Lists sessions belonging to a node
-			 */
-			node: {
-				<TData>(node: string, callback: Callback<TData>): void;
-				<TData>(opts: Session.NodeOptions, callback: Callback<TData>): void;
-				<TData>(node: string): Thenable<TData>;
-				<TData>(opts: Session.NodeOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Lists all the active sessions
-			 */
-			list: {
-				<TData>(opts: Session.ListOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(opts?: Session.ListOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Renews a TTL-based session
-			 */
-			renew: {
-				<TData>(id: string, callback: Callback<TData>): void;
-				<TData>(opts: Session.RenewOptions, callback: Callback<TData>): void;
-				<TData>(id: string): Thenable<TData>;
-				<TData>(opts: Session.RenewOptions): Thenable<TData>;
-			};
-		}
-
-		interface SessionStatic {
-			new(consul: Consul): Session;
-		}
-
-		namespace Status {
-
-			interface LeaderOptions extends CommonOptions {}
-
-			interface PeersOptions extends CommonOptions {}
-		}
-
-		interface Status {
-			consul: Consul;
-
-			/**
-			 * Returns the current Raft leader.
-			 */
-			leader: {
-				<TData>(opts: Status.LeaderOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(opts?: Status.LeaderOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Returns the current Raft peer set
-			 */
-			peers: {
-				<TData>(opts: Status.PeersOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(opts?: Status.PeersOptions): Thenable<TData>;
-			};
-		}
-
-		interface StatusStatic {
-			new(consul: Consul): Status;
-		}
-
-		namespace Watch {
-
-			interface Options {
-				method: Function;
-				options?: CommonOptions;
-			}
-		}
-
-		interface Watch extends NodeJS.EventEmitter {
-			consul: Consul;
-
-			/**
-			 * Is running
-			 */
-			isRunning(): boolean;
-
-			/**
-			 * Update time
-			 */
-			updateTime(): number;
-
-			/**
-			 * End watch
-			 */
-			end(): void;
-		}
-
-		interface WatchStatic {
-			new(consul: Consul, opts: Watch.Options): Watch;
-		}
-
-		interface ConsulOptions {
-			host?: string;
-			port?: string;
-			secure?: boolean;
-			ca?: string[];
-			defaults?: CommonOptions;
-			promisify?: boolean|Function;
-		}
-
-		interface Consul {
-			acl: Acl;
-			agent: Agent;
-			catalog: Catalog;
-			event: Event;
-			health: Health;
-			kv: Kv;
-			session: Session;
-			status: Status;
-
-			/**
-			 * Lock helper.
-			 */
-			lock(opts: Lock.Options): Lock;
-
-			/**
-			 * Watch helper.
-			 */
-			watch(opts: Watch.Options): Watch;
-		}
-
-		interface ConsulStatic {
-			(opts?: ConsulOptions): Consul;
-			new (opts?: ConsulOptions): Consul;
-
-			Acl: AclStatic;
-			Agent: AgentStatic;
-			Catalog: CatalogStatic;
-			Event: EventStatic;
-			Health: HealthStatic;
-			Kv: KvStatic;
-			Lock: LockStatic;
-			Session: SessionStatic;
-			Status: StatusStatic;
-			Watch: WatchStatic;
-		}
-	}
-
-	let Consul: Consul.ConsulStatic;
-
-	export = Consul;
-}
diff --git a/consul/index.d.ts b/consul/index.d.ts
new file mode 100644
index 0000000000..b154eeccb3
--- /dev/null
+++ b/consul/index.d.ts
@@ -0,0 +1,1033 @@
+// Type definitions for Consul v0.23.0
+// Project: https://github.com/silas/node-consul
+// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+import {IncomingMessage as HttpIncomingMessage} from "http";
+
+declare namespace Consul {
+
+    interface Thenable<T> {
+        then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => U | Thenable<U>): Thenable<U>;
+        then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => void): Thenable<U>;
+        catch<U>(onRejected?: (error: any) => U | Thenable<U>): Thenable<U>;
+    }
+
+    interface CommonOptions {
+        consistent?: boolean;
+        dc?: string;
+        stale?: boolean;
+        token?: string;
+        wait?: string;
+        wan?: boolean;
+
+        ctx?: NodeJS.EventEmitter;
+        timeout?: number;
+    }
+
+    interface Response extends HttpIncomingMessage {
+        body?: Object | string | Buffer;
+    }
+
+    interface Callback<TData> {
+        (err?: Error, data?: TData, res?: Response): any;
+    }
+
+    namespace Acl {
+
+        interface CreateOptions extends CommonOptions {
+            name?: string;
+            type?: string;
+            rules?: string;
+        }
+
+        interface UpdateOptions extends CommonOptions {
+            id: string;
+            name?: string;
+            type?: string;
+            rules?: string;
+        }
+
+        interface DestroyOptions extends CommonOptions {
+            id: string;
+        }
+
+        interface InfoOptions extends CommonOptions {
+            id: string;
+        }
+
+        interface GetOptions extends InfoOptions { }
+
+        interface CloneOptions extends CommonOptions {
+            id: string;
+        }
+
+        interface ListOptions extends CommonOptions { }
+    }
+
+    interface Acl {
+        consul: Consul;
+
+        /**
+         * Creates a new token with policy
+         */
+        create: {
+            <TData>(opts: Acl.CreateOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(opts?: Acl.CreateOptions): Thenable<TData>;
+        };
+
+        /**
+         * Update the policy of a token
+         */
+        update: {
+            <TData>(opts: Acl.UpdateOptions, callback: Callback<TData>): void;
+            <TData>(opts: Acl.UpdateOptions): Thenable<TData>;
+        }
+
+        /**
+         * Destroys a given token
+         */
+        destroy: {
+            <TData>(id: string, callback: Callback<TData>): void;
+            <TData>(opts: Acl.DestroyOptions, callback: Callback<TData>): void;
+            <TData>(id: string): Thenable<TData>;
+            <TData>(opts: Acl.DestroyOptions): Thenable<TData>;
+        };
+
+        /**
+         * Queries the policy of a given token
+         */
+        info: {
+            <TData>(id: string, callback: Callback<TData>): void;
+            <TData>(opts: Acl.InfoOptions, callback: Callback<TData>): void;
+            <TData>(id: string): Thenable<TData>;
+            <TData>(opts: Acl.InfoOptions): Thenable<TData>;
+        };
+        get: {
+            <TData>(id: string, callback: Callback<TData>): void;
+            <TData>(opts: Acl.GetOptions, callback: Callback<TData>): void;
+            <TData>(id: string): Thenable<TData>;
+            <TData>(opts: Acl.GetOptions): Thenable<TData>;
+        };
+
+        /**
+         * Creates a new token by cloning an existing token
+         */
+        clone: {
+            <TData>(id: string, callback: Callback<TData>): void;
+            <TData>(opts: Acl.CloneOptions, callback: Callback<TData>): void;
+            <TData>(id: string): Thenable<TData>;
+            <TData>(opts: Acl.CloneOptions): Thenable<TData>;
+        };
+
+        /**
+         * Lists all the active tokens
+         */
+        list: {
+            <TData>(opts: Acl.ListOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(opts?: Acl.ListOptions): Thenable<TData>;
+        };
+    }
+
+    interface AclStatic {
+        new (consul: Consul): Acl;
+    }
+
+    namespace Agent {
+
+        namespace Check {
+
+            interface ListOptions extends CommonOptions { }
+
+            interface RegisterOptions extends CommonOptions {
+                name: string;
+                id?: string;
+                serviceid?: string;
+                http?: string;
+                script?: string;
+                interval?: string;
+                ttl?: string;
+                notes?: string;
+                status?: string;
+            }
+
+            interface DeregisterOptions extends CommonOptions {
+                id: string;
+            }
+
+            interface PassOptions extends CommonOptions {
+                id: string;
+                note?: string;
+            }
+
+            interface WarnOptions extends CommonOptions {
+                id: string;
+                note?: string;
+            }
+
+            interface FailOptions extends CommonOptions {
+                id: string;
+                note?: string;
+            }
+        }
+
+        interface Check {
+            consul: Consul;
+
+            /**
+             * Returns the checks the local agent is managing
+             */
+            list: {
+                <TData>(opts: Check.ListOptions, callback: Callback<TData>): void;
+                <TData>(callback: Callback<TData>): void;
+                <TData>(opts?: Check.ListOptions): Thenable<TData>;
+            };
+
+            /**
+             * Registers a new local check
+             */
+            register: {
+                <TData>(opts: Check.RegisterOptions, callback: Callback<TData>): void;
+                <TData>(opts: Check.RegisterOptions): Thenable<TData>;
+            };
+
+            /**
+             * Deregister a local check
+             */
+            deregister: {
+                <TData>(id: string, callback: Callback<TData>): void;
+                <TData>(opts: Check.DeregisterOptions, callback: Callback<TData>): void;
+                <TData>(id: string): Thenable<TData>;
+                <TData>(opts: Check.DeregisterOptions): Thenable<TData>;
+            };
+
+            /**
+             * Mark a local test as passing
+             */
+            pass: {
+                <TData>(id: string, callback: Callback<TData>): void;
+                <TData>(opts: Check.PassOptions, callback: Callback<TData>): void;
+                <TData>(id: string): Thenable<TData>;
+                <TData>(opts: Check.PassOptions): Thenable<TData>;
+            };
+
+            /**
+             * Mark a local test as warning
+             */
+            warn: {
+                <TData>(id: string, callback: Callback<TData>): void;
+                <TData>(opts: Check.WarnOptions, callback: Callback<TData>): void;
+                <TData>(id: string): Thenable<TData>;
+                <TData>(opts: Check.WarnOptions): Thenable<TData>;
+            };
+
+            /**
+             * Mark a local test as critical
+             */
+            fail: {
+                <TData>(id: string, callback: Callback<TData>): void;
+                <TData>(opts: Check.FailOptions, callback: Callback<TData>): void;
+                <TData>(id: string): Thenable<TData>;
+                <TData>(opts: Check.FailOptions): Thenable<TData>;
+            };
+        }
+
+        interface CheckStatic {
+            new (consul: Consul): Check;
+        }
+
+        namespace Service {
+
+            interface RegisterCheck {
+                http?: string;
+                script?: string;
+                interval?: string;
+                ttl?: string;
+                notes?: string;
+                status?: string;
+            }
+
+            interface ListOptions extends CommonOptions { }
+
+            interface RegisterOptions extends CommonOptions {
+                name: string;
+                id?: string;
+                tags?: string[];
+                address?: string;
+                port?: number;
+                check?: RegisterCheck;
+                checks?: RegisterCheck[];
+            }
+
+            interface DeregisterOptions extends CommonOptions {
+                id: string;
+            }
+
+            interface MaintenanceOptions extends CommonOptions {
+                id: string;
+                enable: boolean;
+                reason?: string;
+            }
+        }
+
+        interface Service {
+            consul: Consul;
+
+            /**
+             * Returns the services local agent is managing
+             */
+            list: {
+                <TData>(opts: Service.ListOptions, callback: Callback<TData>): void;
+                <TData>(callback: Callback<TData>): void;
+                <TData>(opts?: Service.ListOptions): Thenable<TData>;
+            };
+
+            /**
+             * Registers a new local service
+             */
+            register: {
+                <TData>(name: string, callback: Callback<TData>): void;
+                <TData>(opts: Service.RegisterOptions, callback: Callback<TData>): void;
+                <TData>(name: string): Thenable<TData>;
+                <TData>(opts: Service.RegisterOptions): Thenable<TData>;
+            };
+
+            /**
+             * Deregister a local service
+             */
+            deregister: {
+                <TData>(id: string, callback: Callback<TData>): void;
+                <TData>(opts: Service.DeregisterOptions, callback: Callback<TData>): void;
+                <TData>(id: string): Thenable<TData>;
+                <TData>(opts: Service.DeregisterOptions): Thenable<TData>;
+            };
+
+            /**
+             * Manages node maintenance mode
+             */
+            maintenance: {
+                <TData>(opts: Service.MaintenanceOptions, callback: Callback<TData>): void;
+                <TData>(opts: Service.MaintenanceOptions): Thenable<TData>;
+            };
+        }
+
+        interface ServiceStatic {
+            new (consul: Consul): Service;
+        }
+
+        interface ChecksOptions extends Check.ListOptions { }
+
+        interface ServicesOptions extends Service.ListOptions { }
+
+        interface MembersOptions extends CommonOptions {
+            wan?: boolean;
+        }
+
+        interface SelfOptions extends CommonOptions { }
+
+        interface MaintenanceOptions extends CommonOptions {
+            enable: boolean;
+            reason?: string;
+        }
+
+        interface JoinOptions extends CommonOptions {
+            address: string;
+            wan?: boolean;
+        }
+
+        interface ForceLeaveOptions extends CommonOptions {
+            node: string;
+        }
+    }
+
+    interface Agent {
+        consul: Consul;
+        check: Agent.Check;
+        service: Agent.Service;
+
+        /**
+         * Returns the checks the local agent is managing
+         */
+        checks: {
+            <TData>(opts: Agent.ChecksOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(opts?: Agent.ChecksOptions): Thenable<TData>;
+        };
+
+        /**
+         * Returns the services local agent is managing
+         */
+        services: {
+            <TData>(opts: Agent.ServicesOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(opts?: Agent.ServicesOptions): Thenable<TData>;
+        };
+
+        /**
+         * Returns the members as seen by the local consul agent
+         */
+        members: {
+            <TData>(opts: Agent.MembersOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(opts?: Agent.MembersOptions): Thenable<TData>;
+        };
+
+        /**
+         * Returns the local node configuration
+         */
+        self: {
+            <TData>(opts: Agent.SelfOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(opts?: Agent.SelfOptions): Thenable<TData>;
+        };
+
+        /**
+         * Manages node maintenance mode
+         */
+        maintenance: {
+            <TData>(enable: boolean, callback: Callback<TData>): void;
+            <TData>(opts: Agent.MaintenanceOptions, callback: Callback<TData>): void;
+            <TData>(enable: boolean): Thenable<TData>;
+            <TData>(opts: Agent.MaintenanceOptions): Thenable<TData>;
+        };
+
+        /**
+         * Trigger local agent to join a node
+         */
+        join: {
+            <TData>(address: string, callback: Callback<TData>): void;
+            <TData>(opts: Agent.JoinOptions, callback: Callback<TData>): void;
+            <TData>(address: string): Thenable<TData>;
+            <TData>(opts: Agent.JoinOptions): Thenable<TData>;
+        };
+
+        /**
+         * Force remove node
+         */
+        forceLeave: {
+            <TData>(node: string, callback: Callback<TData>): void;
+            <TData>(opts: Agent.ForceLeaveOptions, callback: Callback<TData>): void;
+            <TData>(node: string): Thenable<TData>;
+            <TData>(opts: Agent.ForceLeaveOptions): Thenable<TData>;
+        };
+    }
+
+    interface AgentStatic {
+        new (consul: Consul): Agent;
+
+        Check: Agent.CheckStatic;
+        Service: Agent.ServiceStatic;
+    }
+
+    namespace Catalog {
+
+        namespace Node {
+
+            interface ListOptions extends CommonOptions {
+                dc?: string;
+            }
+
+            interface ServicesOptions extends CommonOptions {
+                node: string;
+            }
+        }
+
+        interface Node {
+            consul: Consul;
+
+            /**
+             * Lists nodes in a given DC
+             */
+            list: {
+                <TData>(dc: string, callback: Callback<TData>): void;
+                <TData>(opts: Node.ListOptions, callback: Callback<TData>): void;
+                <TData>(callback: Callback<TData>): void;
+                <TData>(dc?: string): Thenable<TData>;
+                <TData>(opts?: Node.ListOptions): Thenable<TData>;
+            };
+
+            /**
+             * Lists the services provided by a node
+             */
+            services: {
+                <TData>(node: string, callback: Callback<TData>): void;
+                <TData>(opts: Node.ServicesOptions, callback: Callback<TData>): void;
+                <TData>(node: string): Thenable<TData>;
+                <TData>(opts: Node.ServicesOptions): Thenable<TData>;
+            };
+        }
+
+        interface NodeStatic {
+            new (consul: Consul): Node;
+        }
+
+        namespace Service {
+
+            interface ListOptions extends CommonOptions {
+                dc?: string;
+            }
+
+            interface NodesOptions extends CommonOptions {
+                service: string;
+                dc?: string;
+                tag?: string;
+            }
+        }
+
+
+
+        interface Service {
+            consul: Consul;
+
+            /**
+             * Lists services in a given DC
+             */
+            list: {
+                <TData>(dc: string, callback: Callback<TData>): void;
+                <TData>(opts: Service.ListOptions, callback: Callback<TData>): void;
+                <TData>(callback: Callback<TData>): void;
+                <TData>(dc?: string): Thenable<TData>;
+                <TData>(opts?: Service.ListOptions): Thenable<TData>;
+            };
+
+            /**
+             * Lists the nodes in a given service
+             */
+            nodes: {
+                <TData>(service: string, callback: Callback<TData>): void;
+                <TData>(opts: Service.NodesOptions, callback: Callback<TData>): void;
+                <TData>(service: string): Thenable<TData>;
+                <TData>(opts: Service.NodesOptions): Thenable<TData>;
+            };
+        }
+
+        interface ServiceStatic {
+            new (consul: Consul): Service;
+        }
+
+        interface DatacentersOptions extends CommonOptions { }
+
+        interface NodesOptions extends Node.ListOptions { }
+
+        interface ServicesOptions extends Service.ListOptions { }
+    }
+
+    interface Catalog {
+        consul: Consul;
+        node: Catalog.Node;
+        service: Catalog.Service;
+
+        /**
+         * Lists known datacenters
+         */
+        datacenters: {
+            <TData>(opts: Catalog.DatacentersOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(opts?: Catalog.DatacentersOptions): Thenable<TData>;
+        };
+
+        /**
+         * Lists nodes in a given DC
+         */
+        nodes: {
+            <TData>(dc: string, callback: Callback<TData>): void;
+            <TData>(opts: Catalog.NodesOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(dc?: string): Thenable<TData>;
+            <TData>(opts?: Catalog.NodesOptions): Thenable<TData>;
+        };
+
+        /**
+         * Lists services in a given DC
+         */
+        services: {
+            <TData>(dc: string, callback: Callback<TData>): void;
+            <TData>(opts: Catalog.ServicesOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(dc?: string): Thenable<TData>;
+            <TData>(opts?: Catalog.ServicesOptions): Thenable<TData>;
+        };
+    }
+
+    interface CatalogStatic {
+        new (consul: Consul): Catalog;
+
+        Node: Catalog.NodeStatic;
+        Service: Catalog.ServiceStatic;
+    }
+
+    namespace Event {
+
+        interface FireOptions extends CommonOptions {
+            name: string;
+            payload: string | Buffer;
+            node?: string;
+            service?: string;
+            tag?: string;
+        }
+
+        interface ListOptions extends CommonOptions {
+            name?: string;
+        }
+    }
+
+    interface Event {
+        consul: Consul;
+
+        /**
+         * Fires a new user event
+         */
+        fire: {
+            <TData>(name: string, payload: string | Buffer, callback: Callback<TData>): void;
+            <TData>(name: string, callback: Callback<TData>): void;
+            <TData>(opts: Event.FireOptions, callback: Callback<TData>): void;
+            <TData>(name: string, payload: string | Buffer): Thenable<TData>;
+            <TData>(name: string): Thenable<TData>;
+            <TData>(opts: Event.FireOptions): Thenable<TData>;
+        };
+
+        /**
+         * Lists the most recent events an agent has seen
+         */
+        list: {
+            <TData>(name: string, callback: Callback<TData>): void;
+            <TData>(opts: Event.ListOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(name?: string): Thenable<TData>;
+            <TData>(opts?: Event.ListOptions): Thenable<TData>;
+        };
+    }
+
+    interface EventStatic {
+        new (consul: Consul): Event;
+    }
+
+    namespace Health {
+
+        interface NodeOptions extends CommonOptions {
+            node: string;
+            dc?: string;
+        }
+
+        interface ChecksOptions extends CommonOptions {
+            service: string;
+            dc?: string;
+        }
+
+        interface ServiceOptions extends CommonOptions {
+            service: string;
+            dc?: string;
+            tag?: string;
+            passing?: boolean;
+        }
+
+        interface StateOptions extends CommonOptions {
+            state: string;
+            dc?: string;
+        }
+    }
+
+    interface Health {
+        consul: Consul;
+
+        /**
+         * Returns the health info of a node
+         */
+        node: {
+            <TData>(node: string, callback: Callback<TData>): void;
+            <TData>(opts: Health.NodeOptions, callback: Callback<TData>): void;
+            <TData>(node: string): Thenable<TData>;
+            <TData>(opts: Health.NodeOptions): Thenable<TData>;
+        };
+
+        /**
+         * Returns the checks of a service
+         */
+        checks: {
+            <TData>(service: string, callback: Callback<TData>): void;
+            <TData>(opts: Health.ChecksOptions, callback: Callback<TData>): void;
+            <TData>(service: string): Thenable<TData>;
+            <TData>(opts: Health.ChecksOptions): Thenable<TData>;
+        };
+
+        /**
+         * Returns the nodes and health info of a service
+         */
+        service: {
+            <TData>(service: string, callback: Callback<TData>): void;
+            <TData>(opts: Health.ServiceOptions, callback: Callback<TData>): void;
+            <TData>(service: string): Thenable<TData>;
+            <TData>(opts: Health.ServiceOptions): Thenable<TData>;
+        };
+
+        /**
+         * Returns the checks in a given state
+         */
+        state: {
+            <TData>(state: string, callback: Callback<TData>): void;
+            <TData>(opts: Health.StateOptions, callback: Callback<TData>): void;
+            <TData>(state: string): Thenable<TData>;
+            <TData>(opts: Health.StateOptions): Thenable<TData>;
+        };
+    }
+
+    interface HealthStatic {
+        new (consul: Consul): Health;
+    }
+
+    namespace Kv {
+
+        interface GetOptions extends CommonOptions {
+            key: string;
+            dc?: string;
+            recurse?: boolean;
+            index?: string;
+            wait?: string;
+            raw?: boolean;
+            buffer?: boolean;
+        }
+
+        interface KeysOptions extends CommonOptions {
+            key: string;
+            dc?: string;
+            separator?: string;
+        }
+
+        interface SetOptions extends CommonOptions {
+            key: string;
+            value: string | Buffer;
+            dc?: string;
+            flags?: number;
+            cas?: string;
+            acquire?: string;
+            release?: string;
+        }
+
+        interface DelOptions extends CommonOptions {
+            key: string;
+            dc?: string;
+            recurse?: boolean;
+            cas?: string;
+        }
+
+        interface DeleteOptions extends DelOptions { }
+    }
+
+    interface Kv {
+        consul: Consul;
+
+        /**
+         * Get
+         */
+        get: {
+            <TData>(key: string, callback: Callback<TData>): void;
+            <TData>(opts: Kv.GetOptions, callback: Callback<TData>): void;
+            <TData>(key: string): Thenable<TData>;
+            <TData>(opts: Kv.GetOptions): Thenable<TData>;
+        };
+
+        /**
+         * Keys
+         */
+        keys: {
+            <TData>(key: string, callback: Callback<TData>): void;
+            <TData>(opts: Kv.KeysOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(key?: string): Thenable<TData>;
+            <TData>(opts?: Kv.KeysOptions): Thenable<TData>;
+        };
+
+        /**
+         * Set
+         */
+        set: {
+            <TData>(key: string, value: string | Buffer, opts: Kv.SetOptions, callback: Callback<TData>): void;
+            <TData>(key: string, value: string | Buffer, callback: Callback<TData>): void;
+            <TData>(opts: Kv.SetOptions, callback: Callback<TData>): void;
+            <TData>(key: string, value: string | Buffer, opts: Kv.SetOptions): Thenable<TData>;
+            <TData>(key: string, value: string | Buffer): Thenable<TData>;
+            <TData>(opts: Kv.SetOptions): Thenable<TData>;
+        };
+
+        /**
+         * Delete
+         */
+        del: {
+            <TData>(key: string, callback: Callback<TData>): void;
+            <TData>(opts: Kv.DelOptions, callback: Callback<TData>): void;
+            <TData>(key: string): Thenable<TData>;
+            <TData>(opts: Kv.DelOptions): Thenable<TData>;
+        };
+        delete: {
+            <TData>(key: string, callback: Callback<TData>): void;
+            <TData>(opts: Kv.DeleteOptions, callback: Callback<TData>): void;
+            <TData>(key: string): Thenable<TData>;
+            <TData>(opts: Kv.DeleteOptions): Thenable<TData>;
+        };
+    }
+
+    interface KvStatic {
+        new (consul: Consul): Kv;
+    }
+
+    namespace Lock {
+
+        interface Options {
+            key: string;
+            session?: Object | string;
+            value?: string | Buffer;
+            lockwaittime?: string;
+            lockretrytime?: string;
+        }
+    }
+
+    interface Lock extends NodeJS.EventEmitter {
+        consul: Consul;
+
+        /**
+         * Acquire lock
+         */
+        acquire(): void;
+
+        /**
+         * Release lock
+         */
+        release(): void;
+    }
+
+    interface LockStatic {
+        new (consul: Consul, opts: Lock.Options): Lock;
+    }
+
+    namespace Session {
+
+        interface CreateOptions extends CommonOptions {
+            dc?: string;
+            lockdelay?: string;
+            name?: string;
+            node?: string;
+            checks?: string[];
+            behavior?: string;
+            ttl?: string;
+        }
+
+        interface DestroyOptions extends CommonOptions {
+            id: string;
+            dc?: string;
+        }
+
+        interface InfoOptions extends CommonOptions {
+            id: string;
+            dc?: string;
+        }
+
+        interface GetOptions extends InfoOptions { }
+
+        interface NodeOptions extends CommonOptions {
+            node: string;
+            dc?: string;
+        }
+
+        interface ListOptions extends CommonOptions {
+            dc?: string;
+        }
+
+        interface RenewOptions extends CommonOptions {
+            id: string;
+            dc?: string;
+        }
+    }
+
+
+    interface Session {
+        consul: Consul;
+
+        /**
+         * Creates a new session
+         */
+        create: {
+            <TData>(opts: Session.CreateOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(opts?: Session.CreateOptions): Thenable<TData>;
+        };
+
+        /**
+         * Destroys a given session
+         */
+        destroy: {
+            <TData>(id: string, callback: Callback<TData>): void;
+            <TData>(opts: Session.DestroyOptions, callback: Callback<TData>): void;
+            <TData>(id: string): Thenable<TData>;
+            <TData>(opts: Session.DestroyOptions): Thenable<TData>;
+        };
+
+        /**
+         * Queries a given session
+         */
+        info: {
+            <TData>(id: string, callback: Callback<TData>): void;
+            <TData>(opts: Session.InfoOptions, callback: Callback<TData>): void;
+            <TData>(id: string): Thenable<TData>;
+            <TData>(opts: Session.InfoOptions): Thenable<TData>;
+        };
+        get: {
+            <TData>(id: string, callback: Callback<TData>): void;
+            <TData>(opts: Session.GetOptions, callback: Callback<TData>): void;
+            <TData>(id: string): Thenable<TData>;
+            <TData>(opts: Session.GetOptions): Thenable<TData>;
+        };
+
+        /**
+         * Lists sessions belonging to a node
+         */
+        node: {
+            <TData>(node: string, callback: Callback<TData>): void;
+            <TData>(opts: Session.NodeOptions, callback: Callback<TData>): void;
+            <TData>(node: string): Thenable<TData>;
+            <TData>(opts: Session.NodeOptions): Thenable<TData>;
+        };
+
+        /**
+         * Lists all the active sessions
+         */
+        list: {
+            <TData>(opts: Session.ListOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(opts?: Session.ListOptions): Thenable<TData>;
+        };
+
+        /**
+         * Renews a TTL-based session
+         */
+        renew: {
+            <TData>(id: string, callback: Callback<TData>): void;
+            <TData>(opts: Session.RenewOptions, callback: Callback<TData>): void;
+            <TData>(id: string): Thenable<TData>;
+            <TData>(opts: Session.RenewOptions): Thenable<TData>;
+        };
+    }
+
+    interface SessionStatic {
+        new (consul: Consul): Session;
+    }
+
+    namespace Status {
+
+        interface LeaderOptions extends CommonOptions { }
+
+        interface PeersOptions extends CommonOptions { }
+    }
+
+    interface Status {
+        consul: Consul;
+
+        /**
+         * Returns the current Raft leader.
+         */
+        leader: {
+            <TData>(opts: Status.LeaderOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(opts?: Status.LeaderOptions): Thenable<TData>;
+        };
+
+        /**
+         * Returns the current Raft peer set
+         */
+        peers: {
+            <TData>(opts: Status.PeersOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(opts?: Status.PeersOptions): Thenable<TData>;
+        };
+    }
+
+    interface StatusStatic {
+        new (consul: Consul): Status;
+    }
+
+    namespace Watch {
+
+        interface Options {
+            method: Function;
+            options?: CommonOptions;
+        }
+    }
+
+    interface Watch extends NodeJS.EventEmitter {
+        consul: Consul;
+
+        /**
+         * Is running
+         */
+        isRunning(): boolean;
+
+        /**
+         * Update time
+         */
+        updateTime(): number;
+
+        /**
+         * End watch
+         */
+        end(): void;
+    }
+
+    interface WatchStatic {
+        new (consul: Consul, opts: Watch.Options): Watch;
+    }
+
+    interface ConsulOptions {
+        host?: string;
+        port?: string;
+        secure?: boolean;
+        ca?: string[];
+        defaults?: CommonOptions;
+        promisify?: boolean | Function;
+    }
+
+    interface Consul {
+        acl: Acl;
+        agent: Agent;
+        catalog: Catalog;
+        event: Event;
+        health: Health;
+        kv: Kv;
+        session: Session;
+        status: Status;
+
+        /**
+         * Lock helper.
+         */
+        lock(opts: Lock.Options): Lock;
+
+        /**
+         * Watch helper.
+         */
+        watch(opts: Watch.Options): Watch;
+    }
+
+    interface ConsulStatic {
+        (opts?: ConsulOptions): Consul;
+        new (opts?: ConsulOptions): Consul;
+
+        Acl: AclStatic;
+        Agent: AgentStatic;
+        Catalog: CatalogStatic;
+        Event: EventStatic;
+        Health: HealthStatic;
+        Kv: KvStatic;
+        Lock: LockStatic;
+        Session: SessionStatic;
+        Status: StatusStatic;
+        Watch: WatchStatic;
+    }
+}
+
+declare let Consul: Consul.ConsulStatic;
+
+export = Consul;
diff --git a/consul/tsconfig.json b/consul/tsconfig.json
new file mode 100644
index 0000000000..1986f0b80b
--- /dev/null
+++ b/consul/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "consul-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/content-type/content-type-tests.ts b/content-type/content-type-tests.ts
index 872b3cded0..dcbba27d85 100644
--- a/content-type/content-type-tests.ts
+++ b/content-type/content-type-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="content-type.d.ts" />
+
 
 import MediaType = require('content-type');
 
diff --git a/content-type/content-type.d.ts b/content-type/content-type.d.ts
deleted file mode 100644
index 6e901e7f86..0000000000
--- a/content-type/content-type.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// Type definitions for content-type v0.0.1
-// Project: https://github.com/deoxxa/content-type
-// Definitions by: Pine Mizune <https://github.com/pine613>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace ContentType {
-    interface MediaType {
-        type: string;
-        q?: number;
-        params: any;
-        toString(): string;
-    }
-
-    interface SelectOptions {
-        sortAvailable?: boolean;
-        sortAccepted?: boolean;
-    }
-
-    interface MediaTypeStatic {
-        new (s: string, p?: any): MediaType;
-        parseMedia(type: string): MediaType;
-        splitQuotedString(str: string, delimiter?: string, quote?: string): string[];
-        splitContentTypes(str: string): string[];
-        select(availableTypes: MediaType[], acceptedTypes: MediaType[], options?: SelectOptions): string;
-        mediaCmp(a: MediaType, b: MediaType): number;
-    }
-}
-
-declare module "content-type" {
-    var x: ContentType.MediaTypeStatic;
-    export = x;
-}
diff --git a/content-type/index.d.ts b/content-type/index.d.ts
new file mode 100644
index 0000000000..086e1b9d4f
--- /dev/null
+++ b/content-type/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for content-type v0.0.1
+// Project: https://github.com/deoxxa/content-type
+// Definitions by: Pine Mizune <https://github.com/pine613>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var x: ContentType.MediaTypeStatic;
+export = x;
+
+declare namespace ContentType {
+    interface MediaType {
+        type: string;
+        q?: number;
+        params: any;
+        toString(): string;
+    }
+
+    interface SelectOptions {
+        sortAvailable?: boolean;
+        sortAccepted?: boolean;
+    }
+
+    interface MediaTypeStatic {
+        new (s: string, p?: any): MediaType;
+        parseMedia(type: string): MediaType;
+        splitQuotedString(str: string, delimiter?: string, quote?: string): string[];
+        splitContentTypes(str: string): string[];
+        select(availableTypes: MediaType[], acceptedTypes: MediaType[], options?: SelectOptions): string;
+        mediaCmp(a: MediaType, b: MediaType): number;
+    }
+}
diff --git a/content-type/tsconfig.json b/content-type/tsconfig.json
new file mode 100644
index 0000000000..947f2da116
--- /dev/null
+++ b/content-type/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "content-type-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/contentful-resolve-response/contentful-resolve-response-tests.ts b/contentful-resolve-response/contentful-resolve-response-tests.ts
index 098641e7bb..51d3f59f17 100644
--- a/contentful-resolve-response/contentful-resolve-response-tests.ts
+++ b/contentful-resolve-response/contentful-resolve-response-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="contentful-resolve-response.d.ts" />
+
 import resolveResponse = require('contentful-resolve-response');
 
 var response = {
diff --git a/contentful-resolve-response/contentful-resolve-response.d.ts b/contentful-resolve-response/contentful-resolve-response.d.ts
deleted file mode 100644
index bd2daef9e6..0000000000
--- a/contentful-resolve-response/contentful-resolve-response.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for contentful-resolve-response v0.1.2
-// Project: https://github.com/contentful/contentful-resolve-response
-// Definitions by: Anton Karsten <https://github.com/antonkarsten>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'contentful-resolve-response' {
-    function resolveResponse(response: any): any;
-    export = resolveResponse;
-}
diff --git a/contentful-resolve-response/index.d.ts b/contentful-resolve-response/index.d.ts
new file mode 100644
index 0000000000..ba04d42b5c
--- /dev/null
+++ b/contentful-resolve-response/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for contentful-resolve-response v0.1.2
+// Project: https://github.com/contentful/contentful-resolve-response
+// Definitions by: Anton Karsten <https://github.com/antonkarsten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function resolveResponse(response: any): any;
+export = resolveResponse;
diff --git a/contentful-resolve-response/tsconfig.json b/contentful-resolve-response/tsconfig.json
new file mode 100644
index 0000000000..f431fc2e5e
--- /dev/null
+++ b/contentful-resolve-response/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "contentful-resolve-response-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/contextjs/contextjs-tests.ts b/contextjs/contextjs-tests.ts
index abfc643efa..bff4d1e7c5 100644
--- a/contextjs/contextjs-tests.ts
+++ b/contextjs/contextjs-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./contextjs.d.ts" />
 
 import context = require("contextjs");
 
diff --git a/contextjs/contextjs.d.ts b/contextjs/contextjs.d.ts
deleted file mode 100644
index 3ae8c54502..0000000000
--- a/contextjs/contextjs.d.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// Type definitions for contextjs 2.1.1
-// Project: https://github.com/jakiestfu/Context.js
-// Definitions by: Kern Handa <https://github.com/kernhanda>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "contextjs" {
-    interface MenuObject {
-        action?: (e: Event) => void;
-        divider?: boolean;
-        header?: string;
-        href?: string;
-        subMenu?: MenuObject[];
-        target?: string;
-        text?: string;
-    }
-
-    interface InitSettings {
-        above?: string | boolean;
-        compress?: boolean;
-        fadeSpeed?: number;
-        filter?: (e: Element) => void;
-        preventDoubleContext?: boolean;
-    }
-
-    namespace context {
-      function init(settings?: InitSettings): void;
-      function destroy(selector: any): void;
-      function attach(selector: any, menuObjects: MenuObject[]): void;
-      function settings(settings: InitSettings): void;
-    }
-
-    export = context;
-}
diff --git a/contextjs/index.d.ts b/contextjs/index.d.ts
new file mode 100644
index 0000000000..b36003e3dc
--- /dev/null
+++ b/contextjs/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for contextjs 2.1.1
+// Project: https://github.com/jakiestfu/Context.js
+// Definitions by: Kern Handa <https://github.com/kernhanda>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface MenuObject {
+    action?: (e: Event) => void;
+    divider?: boolean;
+    header?: string;
+    href?: string;
+    subMenu?: MenuObject[];
+    target?: string;
+    text?: string;
+}
+
+interface InitSettings {
+    above?: string | boolean;
+    compress?: boolean;
+    fadeSpeed?: number;
+    filter?: (e: Element) => void;
+    preventDoubleContext?: boolean;
+}
+
+declare namespace context {
+    function init(settings?: InitSettings): void;
+    function destroy(selector: any): void;
+    function attach(selector: any, menuObjects: MenuObject[]): void;
+    function settings(settings: InitSettings): void;
+}
+
+export = context;
diff --git a/contextjs/tsconfig.json b/contextjs/tsconfig.json
new file mode 100644
index 0000000000..465833691c
--- /dev/null
+++ b/contextjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "contextjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/convert-source-map/convert-source-map-tests.ts b/convert-source-map/convert-source-map-tests.ts
index b53e1bd2cb..1a6df7df10 100644
--- a/convert-source-map/convert-source-map-tests.ts
+++ b/convert-source-map/convert-source-map-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./convert-source-map.d.ts" />
 
 import convert = require("convert-source-map");
 
diff --git a/convert-source-map/convert-source-map.d.ts b/convert-source-map/convert-source-map.d.ts
deleted file mode 100644
index 76b31445fb..0000000000
--- a/convert-source-map/convert-source-map.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// Type definitions for convert-source-map
-// Project: https://github.com/thlorenz/convert-source-map
-// Definitions by: Andrew Gaspar <https://github.com/AndrewGaspar/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "convert-source-map" {
-	export interface SourceMapConverter {
-		toObject(): any;
-		toJSON(space?: any): string;
-		toBase64(): string;
-		toComment(): string;
-
-		addProperty(key: string, value: any): SourceMapConverter;
-		setProperty(key: string, value: any): SourceMapConverter;
-
-		getProperty(key: string): any;
-	}
-
-	export function removeComments(src: string): string;
-	export var commentRegex: RegExp;
-
-	export function fromObject(obj: any): SourceMapConverter;
-	export function fromJSON(json: string): SourceMapConverter;
-	export function fromBase64(base64: string): SourceMapConverter;
-	export function fromComment(comment: string): SourceMapConverter;
-	export function fromSource(source: string): SourceMapConverter;
-}
diff --git a/convert-source-map/index.d.ts b/convert-source-map/index.d.ts
new file mode 100644
index 0000000000..22fda2b62b
--- /dev/null
+++ b/convert-source-map/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for convert-source-map
+// Project: https://github.com/thlorenz/convert-source-map
+// Definitions by: Andrew Gaspar <https://github.com/AndrewGaspar/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export interface SourceMapConverter {
+    toObject(): any;
+    toJSON(space?: any): string;
+    toBase64(): string;
+    toComment(): string;
+
+    addProperty(key: string, value: any): SourceMapConverter;
+    setProperty(key: string, value: any): SourceMapConverter;
+
+    getProperty(key: string): any;
+}
+
+export declare function removeComments(src: string): string;
+export declare var commentRegex: RegExp;
+
+export declare function fromObject(obj: any): SourceMapConverter;
+export declare function fromJSON(json: string): SourceMapConverter;
+export declare function fromBase64(base64: string): SourceMapConverter;
+export declare function fromComment(comment: string): SourceMapConverter;
+export declare function fromSource(source: string): SourceMapConverter;
diff --git a/convert-source-map/tsconfig.json b/convert-source-map/tsconfig.json
new file mode 100644
index 0000000000..31666e02b8
--- /dev/null
+++ b/convert-source-map/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "convert-source-map-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/convict/convict-tests.ts b/convict/convict-tests.ts
index 3bd64c5929..8de36c683f 100644
--- a/convict/convict-tests.ts
+++ b/convict/convict-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path='convict.d.ts' />
-/// <reference path='../validator/validator.d.ts' />
+
+/// <reference types="validator" />
 
 import convict = require('convict');
 import validator = require('validator');
diff --git a/convict/convict.d.ts b/convict/convict.d.ts
deleted file mode 100644
index 05323de269..0000000000
--- a/convict/convict.d.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-// Type definitions for node-convict v0.6.0
-// Project: https://github.com/mozilla/node-convict
-// Definitions by: Wim Looman <https://github.com/Nemo157>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "convict" {
-    namespace convict {
-
-        interface Format {
-            name?: string;
-            validate?: (val: any) => void;
-            coerce?: (val: any) => any;
-        }
-
-        interface Schema {
-            [name: string]: convict.Schema | {
-                default: any;
-                doc?: string;
-                /**
-                 * From the implementation:
-                 *
-                 *  format can be a:
-                 *   - predefine type, as seen below
-                 *   - an array of enumerated values, e.g. ["production", "development", "testing"]
-                 *   - built-in JavaScript type, i.e. Object, Array, String, Number, Boolean
-                 *   - or if omitted, the Object.prototype.toString.call of the default value
-                 *
-                 * The docs also state that any function that validates is ok too
-                 */
-                format?: string | Array<any> | Function;
-                env?: string;
-                arg?: string;
-            };
-        }
-
-        interface Config {
-            get(name: string): any;
-            default(name: string): any;
-            has(name: string): boolean;
-            set(name: string, value: any): void;
-            load(conf: Object): void;
-            loadFile(file: string): void;
-            loadFile(files: string[]): void;
-            validate(): void;
-            /**
-             * Exports all the properties (that is the keys and their current values) as a {JSON} {Object}
-             * @returns {Object} A {JSON} compliant {Object}
-             */
-            getProperties() : Object;
-            /**
-             * Exports the schema as a {JSON} {Object}
-             * @returns {Object} A {JSON} compliant {Object}
-             */
-            getSchema() : Object;
-
-            /**
-             * Exports all the properties (that is the keys and their current values) as a JSON string.
-             * @returns {String} a string representing this object
-             */
-            toString() : string;
-
-            /**
-             * Exports the schema as a JSON string.
-             * @returns {String} a string representing the schema of this {Config}
-             */
-            getSchemaString() : string;
-        }
-    }
-    interface convict {
-        addFormat(format: convict.Format): void;
-        addFormats(formats: { [name: string]: convict.Format }): void;
-        (config: convict.Schema): convict.Config;
-    }
-    var convict : convict;
-    export = convict;
-}
-
diff --git a/convict/index.d.ts b/convict/index.d.ts
new file mode 100644
index 0000000000..c99255828d
--- /dev/null
+++ b/convict/index.d.ts
@@ -0,0 +1,75 @@
+// Type definitions for node-convict v0.6.0
+// Project: https://github.com/mozilla/node-convict
+// Definitions by: Wim Looman <https://github.com/Nemo157>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare namespace convict {
+
+    interface Format {
+        name?: string;
+        validate?: (val: any) => void;
+        coerce?: (val: any) => any;
+    }
+
+    interface Schema {
+        [name: string]: convict.Schema | {
+            default: any;
+            doc?: string;
+            /**
+             * From the implementation:
+             *
+             *  format can be a:
+             *   - predefine type, as seen below
+             *   - an array of enumerated values, e.g. ["production", "development", "testing"]
+             *   - built-in JavaScript type, i.e. Object, Array, String, Number, Boolean
+             *   - or if omitted, the Object.prototype.toString.call of the default value
+             *
+             * The docs also state that any function that validates is ok too
+             */
+            format?: string | Array<any> | Function;
+            env?: string;
+            arg?: string;
+        };
+    }
+
+    interface Config {
+        get(name: string): any;
+        default(name: string): any;
+        has(name: string): boolean;
+        set(name: string, value: any): void;
+        load(conf: Object): void;
+        loadFile(file: string): void;
+        loadFile(files: string[]): void;
+        validate(): void;
+        /**
+         * Exports all the properties (that is the keys and their current values) as a {JSON} {Object}
+         * @returns {Object} A {JSON} compliant {Object}
+         */
+        getProperties(): Object;
+        /**
+         * Exports the schema as a {JSON} {Object}
+         * @returns {Object} A {JSON} compliant {Object}
+         */
+        getSchema(): Object;
+
+        /**
+         * Exports all the properties (that is the keys and their current values) as a JSON string.
+         * @returns {String} a string representing this object
+         */
+        toString(): string;
+
+        /**
+         * Exports the schema as a JSON string.
+         * @returns {String} a string representing the schema of this {Config}
+         */
+        getSchemaString(): string;
+    }
+}
+interface convict {
+    addFormat(format: convict.Format): void;
+    addFormats(formats: { [name: string]: convict.Format }): void;
+    (config: convict.Schema): convict.Config;
+}
+declare var convict: convict;
+export = convict;
diff --git a/convict/tsconfig.json b/convict/tsconfig.json
new file mode 100644
index 0000000000..30d476d4e6
--- /dev/null
+++ b/convict/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "convict-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cookie-parser/cookie-parser-tests.ts b/cookie-parser/cookie-parser-tests.ts
index 94e8a9fdb2..1f9aaa1a8b 100644
--- a/cookie-parser/cookie-parser-tests.ts
+++ b/cookie-parser/cookie-parser-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="cookie-parser.d.ts" />
 
 import express = require('express');
 import cookieParser = require('cookie-parser');
diff --git a/cookie-parser/cookie-parser.d.ts b/cookie-parser/cookie-parser.d.ts
deleted file mode 100644
index b2ecb55613..0000000000
--- a/cookie-parser/cookie-parser.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Type definitions for cookie-parser v1.3.4
-// Project: https://github.com/expressjs/cookie-parser
-// Definitions by: Santi Albo <https://github.com/santialbo/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "cookie-parser" {
-    import express = require('express');
-    function e(secret?: string, options?: any): express.RequestHandler;
-    namespace e{}
-    export = e;
-}
\ No newline at end of file
diff --git a/cookie-parser/index.d.ts b/cookie-parser/index.d.ts
new file mode 100644
index 0000000000..96412d6ee9
--- /dev/null
+++ b/cookie-parser/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for cookie-parser v1.3.4
+// Project: https://github.com/expressjs/cookie-parser
+// Definitions by: Santi Albo <https://github.com/santialbo/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+
+import express = require('express');
+declare function e(secret?: string, options?: any): express.RequestHandler;
+declare namespace e { }
+export = e;
diff --git a/cookie-parser/tsconfig.json b/cookie-parser/tsconfig.json
new file mode 100644
index 0000000000..546934f0c0
--- /dev/null
+++ b/cookie-parser/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cookie-parser-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cookie-session/cookie-session-tests.ts b/cookie-session/cookie-session-tests.ts
index 1bd6694c5b..74b7cafc8f 100644
--- a/cookie-session/cookie-session-tests.ts
+++ b/cookie-session/cookie-session-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="cookie-session.d.ts" />
+
 
 import express = require('express');
 import cookieSession = require('cookie-session');
diff --git a/cookie-session/cookie-session.d.ts b/cookie-session/cookie-session.d.ts
deleted file mode 100644
index 812594a299..0000000000
--- a/cookie-session/cookie-session.d.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-// Type definitions for cookie-session v2.0.0-alpha.1
-// Project: https://github.com/expressjs/cookie-session
-// Definitions by: Borislav Zhivkov <https://github.com/borislavjivkov/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare namespace Express {
-    interface Request extends CookieSessionInterfaces.CookieSessionRequest {}
-}
-
-declare namespace CookieSessionInterfaces {
-    interface CookieSessionOptions {
-        /**
-         * The name of the cookie to set, defaults to session.
-         */
-        name: string;
-
-        /**
-         * The list of keys to use to sign & verify cookie values. Set cookies are always signed with keys[0], while the other keys are valid for verification, allowing for key rotation.
-         */
-        keys?: Array<string>;
-
-        /**
-         * A string which will be used as single key if keys is not provided.
-         */
-        secret?: string;
-
-        /**
-         * a number representing the milliseconds from Date.now() for expiry.
-         */
-        maxAge?: number;
-
-        /**
-         * a Date object indicating the cookie's expiration date (expires at the end of session by default).
-         */
-        expires?: Date;
-
-        /**
-         * a string indicating the path of the cookie (/ by default).
-         */
-        path?: string;
-
-        /**
-         * a string indicating the domain of the cookie (no default).
-         */
-        domain?: string;
-
-        /**
-         * a boolean indicating whether the cookie is only to be sent over HTTPS (false by default for HTTP, true by default for HTTPS).
-         */
-        secure?: boolean;
-
-        /**
-         * a boolean indicating whether the cookie is only to be sent over HTTPS (use this if you handle SSL not in your node process).
-         */
-        secureProxy?: boolean;
-
-        /**
-         * a boolean indicating whether the cookie is only to be sent over HTTP(S), and not made available to client JavaScript (true by default).
-         */
-        httpOnly?: boolean;
-
-        /**
-         * a boolean indicating whether the cookie is to be signed (true by default). If this is true, another cookie of the same name with the .sig suffix appended will also be sent, with a 27-byte url-safe base64 SHA1 value representing the hash of cookie-name=cookie-value against the
-         * first Keygrip key. This signature key is used to detect tampering the next time a cookie is received.
-         */
-        signed?: boolean;
-
-        /**
-         * a boolean indicating whether to overwrite previously set cookies of the same name (true by default). If this is true, all cookies set during the same request with the same name (regardless of path or domain) are filtered out of the Set-Cookie header when setting this cookie.
-         */
-        overwrite?: boolean;
-    }
-
-    interface CookieSessionObject {
-        /**
-         * Is true if the session has been changed during the request.
-         */
-        isChanged: boolean;
-
-        /**
-         * Is true if the session is new.
-         */
-        isNew: boolean;
-
-        /**
-         * Determine if the session has been populated with data or is empty.
-         */
-        isPopulated: boolean;
-
-        [propertyName: string]: any;
-    }
-
-    interface CookieSessionRequest {
-        /**
-         * Represents the session for the given request.
-         */
-        session: CookieSessionObject;
-
-        /**
-         * Represents the session options for the current request. These options are a shallow clone of what was provided at middleware construction and can be altered to change cookie setting behavior on a per-request basis.
-         */
-        sessionOptions: CookieSessionOptions;
-    }
-}
-
-declare module "cookie-session" {
-    import express = require('express');
-
-    function cookieSession(options?: CookieSessionInterfaces.CookieSessionOptions): express.RequestHandler;
-    export = cookieSession;
-}
diff --git a/cookie-session/index.d.ts b/cookie-session/index.d.ts
new file mode 100644
index 0000000000..aa014e2049
--- /dev/null
+++ b/cookie-session/index.d.ts
@@ -0,0 +1,113 @@
+// Type definitions for cookie-session v2.0.0-alpha.1
+// Project: https://github.com/expressjs/cookie-session
+// Definitions by: Borislav Zhivkov <https://github.com/borislavjivkov/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare namespace Express {
+    interface Request extends CookieSessionInterfaces.CookieSessionRequest {}
+}
+
+declare namespace CookieSessionInterfaces {
+    interface CookieSessionOptions {
+        /**
+         * The name of the cookie to set, defaults to session.
+         */
+        name: string;
+
+        /**
+         * The list of keys to use to sign & verify cookie values. Set cookies are always signed with keys[0], while the other keys are valid for verification, allowing for key rotation.
+         */
+        keys?: Array<string>;
+
+        /**
+         * A string which will be used as single key if keys is not provided.
+         */
+        secret?: string;
+
+        /**
+         * a number representing the milliseconds from Date.now() for expiry.
+         */
+        maxAge?: number;
+
+        /**
+         * a Date object indicating the cookie's expiration date (expires at the end of session by default).
+         */
+        expires?: Date;
+
+        /**
+         * a string indicating the path of the cookie (/ by default).
+         */
+        path?: string;
+
+        /**
+         * a string indicating the domain of the cookie (no default).
+         */
+        domain?: string;
+
+        /**
+         * a boolean indicating whether the cookie is only to be sent over HTTPS (false by default for HTTP, true by default for HTTPS).
+         */
+        secure?: boolean;
+
+        /**
+         * a boolean indicating whether the cookie is only to be sent over HTTPS (use this if you handle SSL not in your node process).
+         */
+        secureProxy?: boolean;
+
+        /**
+         * a boolean indicating whether the cookie is only to be sent over HTTP(S), and not made available to client JavaScript (true by default).
+         */
+        httpOnly?: boolean;
+
+        /**
+         * a boolean indicating whether the cookie is to be signed (true by default). If this is true, another cookie of the same name with the .sig suffix appended will also be sent, with a 27-byte url-safe base64 SHA1 value representing the hash of cookie-name=cookie-value against the
+         * first Keygrip key. This signature key is used to detect tampering the next time a cookie is received.
+         */
+        signed?: boolean;
+
+        /**
+         * a boolean indicating whether to overwrite previously set cookies of the same name (true by default). If this is true, all cookies set during the same request with the same name (regardless of path or domain) are filtered out of the Set-Cookie header when setting this cookie.
+         */
+        overwrite?: boolean;
+    }
+
+    interface CookieSessionObject {
+        /**
+         * Is true if the session has been changed during the request.
+         */
+        isChanged: boolean;
+
+        /**
+         * Is true if the session is new.
+         */
+        isNew: boolean;
+
+        /**
+         * Determine if the session has been populated with data or is empty.
+         */
+        isPopulated: boolean;
+
+        [propertyName: string]: any;
+    }
+
+    interface CookieSessionRequest {
+        /**
+         * Represents the session for the given request.
+         */
+        session: CookieSessionObject;
+
+        /**
+         * Represents the session options for the current request. These options are a shallow clone of what was provided at middleware construction and can be altered to change cookie setting behavior on a per-request basis.
+         */
+        sessionOptions: CookieSessionOptions;
+    }
+}
+
+declare module "cookie-session" {
+    import express = require('express');
+
+    function cookieSession(options?: CookieSessionInterfaces.CookieSessionOptions): express.RequestHandler;
+    export = cookieSession;
+}
diff --git a/cookie-session/tsconfig.json b/cookie-session/tsconfig.json
new file mode 100644
index 0000000000..ed9ac5a104
--- /dev/null
+++ b/cookie-session/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cookie-session-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cookie/cookie-tests.ts b/cookie/cookie-tests.ts
index f8b585048a..2581a5c372 100644
--- a/cookie/cookie-tests.ts
+++ b/cookie/cookie-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="cookie.d.ts" />
+
 
 import cookie = require('cookie');
 
diff --git a/cookie/cookie.d.ts b/cookie/index.d.ts
similarity index 100%
rename from cookie/cookie.d.ts
rename to cookie/index.d.ts
diff --git a/cookie/tsconfig.json b/cookie/tsconfig.json
new file mode 100644
index 0000000000..c50688c301
--- /dev/null
+++ b/cookie/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cookie-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cookiejs/cookiejs-tests.ts b/cookiejs/cookiejs-tests.ts
index b4dd6927b6..d1f382e193 100644
--- a/cookiejs/cookiejs-tests.ts
+++ b/cookiejs/cookiejs-tests.ts
@@ -1,7 +1,9 @@
-/// <reference path="cookiejs.d.ts" />
+
 
 // Based on https://github.com/js-coder/cookie.js/blob/gh-pages/tests/spec.js
 
+import cookie = require("cookiejs");
+
 cookie.set({a: '1', b: '2', c: '3'});
 
 cookie;
diff --git a/cookiejs/cookiejs.d.ts b/cookiejs/cookiejs.d.ts
deleted file mode 100644
index 1bc4d2b5ee..0000000000
--- a/cookiejs/cookiejs.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Type definitions for cookie.js v1.0.0
-// Project: https://github.com/js-coder/cookie.js
-// Definitions by: Boltmade <https://github.com/Boltmade>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare function cookie(key : string, fallback?: string) : string;
-declare function cookie(keys : string[], fallback?: string) : string;
-
-declare namespace cookie {
-  export function set(key : string, value : string, options? : any) : void;
-  export function set(obj : any, options? : any) : void;
-  export function remove(key : string) : void;
-  export function remove(keys : string[]) : void;
-  export function remove(...args : string[]) : void;
-  export function empty() : void;
-  export function get(key : string, fallback?: string) : string;
-  export function get(keys : string[], fallback?: string) : string;
-  export function all() : any;
-  export function enabled() : boolean;
-}
-
-declare module "cookiejs" {
-  export = cookie;
-}
diff --git a/cookiejs/index.d.ts b/cookiejs/index.d.ts
new file mode 100644
index 0000000000..ba7f0ee4f1
--- /dev/null
+++ b/cookiejs/index.d.ts
@@ -0,0 +1,50 @@
+// Type definitions for cookie.js v1.0.0
+// Project: https://github.com/js-coder/cookie.js
+// Definitions by: Boltmade <https://github.com/Boltmade>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/**
+ * Shortcut for cookie.get()
+ */
+
+export = cookie;
+export as namespace cookie;
+
+declare function cookie(key : string, fallback?: string) : string;
+declare function cookie(keys : string[], fallback?: string) : string;
+
+declare namespace cookie {
+  /**
+   * Create a cookie. The value will automatically be escaped.
+   */
+  export function set(key : string, value : string, options? : any) : void;
+  /**
+   * Set several cookies at once
+   */
+  export function set(obj : any, options? : any) : void;
+  /**
+   * Remove cookies
+   */
+  export function remove(key : string) : void;
+  export function remove(keys : string[]) : void;
+  export function remove(...args : string[]) : void;
+  /**
+   * Remove all cookies
+   */
+  export function empty() : void;
+  /**
+   * Retrieve the value of the cookie
+   */
+  export function get(key : string, fallback?: string) : string;
+  /**
+   * Retrieve values of several cookies
+   */
+  export function get(keys : string[], fallback?: string) : any;
+  /**
+   * Get all currently saved cookies
+   */
+  export function all() : any;
+  /**
+   * Test if cookies are enabled
+   */
+  export function enabled() : boolean;
+}
diff --git a/cookiejs/tsconfig.json b/cookiejs/tsconfig.json
new file mode 100644
index 0000000000..b00718488d
--- /dev/null
+++ b/cookiejs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cookiejs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cookies/cookies-tests.ts b/cookies/cookies-tests.ts
index 3e3274a4d4..21e81b49de 100644
--- a/cookies/cookies-tests.ts
+++ b/cookies/cookies-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../node/node.d.ts" />
-/// <reference path="cookies.d.ts" />
+/// <reference types="node" />
 
 import * as Cookies from 'cookies';
 import * as http from 'http';
diff --git a/cookies/cookies.d.ts b/cookies/cookies.d.ts
deleted file mode 100644
index 23621ee2ae..0000000000
--- a/cookies/cookies.d.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-// Type definitions for cookie-parser v0.5.1
-// Project: https://github.com/pillarjs/cookies
-// Definitions by: Wang Zishi <https://github.com/WangZishi/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "cookies" {
-    import * as http from "http"
-
-    namespace cookies {
-        interface ICookies {
-            /**
-             * This extracts the cookie with the given name from the
-             * Cookie header in the request. If such a cookie exists,
-             * its value is returned. Otherwise, nothing is returned.
-             */
-            get(name: string): string;
-            /**
-             * This extracts the cookie with the given name from the
-             * Cookie header in the request. If such a cookie exists,
-             * its value is returned. Otherwise, nothing is returned.
-             */
-            get(name: string, opts: IOptions): string;
-
-            /**
-             * This sets the given cookie in the response and returns
-             * the current context to allow chaining.If the value is omitted,
-             * an outbound header with an expired date is used to delete the cookie.
-             */
-            set(name: string, value: string): ICookies;
-            /**
-             * This sets the given cookie in the response and returns
-             * the current context to allow chaining.If the value is omitted,
-             * an outbound header with an expired date is used to delete the cookie.
-             */
-            set(name: string, value: string, opts: IOptions): ICookies;
-        }
-
-        interface IOptions {
-            /**
-             * a number representing the milliseconds from Date.now() for expiry
-             */
-            maxAge?: number;
-            /**
-             * a Date object indicating the cookie's expiration
-             * date (expires at the end of session by default).
-             */
-            expires?: Date;
-            /**
-             * a string indicating the path of the cookie (/ by default).
-             */
-            path?: string;
-            /**
-             * a string indicating the domain of the cookie (no default).
-             */
-            domain?: string;
-            /**
-             * a boolean indicating whether the cookie is only to be sent
-             * over HTTPS (false by default for HTTP, true by default for HTTPS).
-             */
-            secure?: boolean;
-            /**
-             * a boolean indicating whether the cookie is only to be sent
-             * over HTTPS (use this if you handle SSL not in your node process).
-             */
-            secureProxy?: boolean;
-            /**
-             * a boolean indicating whether the cookie is only to be sent over HTTP(S),
-             * and not made available to client JavaScript (true by default).
-             */
-            httpOnly?: boolean;
-            /**
-             * a boolean indicating whether the cookie is to be signed (false by default).
-             * If this is true, another cookie of the same name with the .sig suffix
-             * appended will also be sent, with a 27-byte url-safe base64 SHA1 value
-             * representing the hash of cookie-name=cookie-value against the first Keygrip key.
-             * This signature key is used to detect tampering the next time a cookie is received.
-             */
-            signed?: boolean;
-            /**
-             * a boolean indicating whether to overwrite previously set
-             * cookies of the same name (false by default). If this is true,
-             * all cookies set during the same request with the same
-             * name (regardless of path or domain) are filtered out of
-             * the Set-Cookie header when setting this cookie.
-             */
-            overwrite?: boolean;
-        }
-    }
-
-    interface CookiesStatic {
-        new (request: http.IncomingMessage, response: http.ServerResponse): cookies.ICookies;
-        new (request: http.IncomingMessage, response: http.ServerResponse, keys?: Array<string>): cookies.ICookies;
-    }
-
-    const cookies: CookiesStatic;
-
-    export = cookies
-}
diff --git a/cookies/index.d.ts b/cookies/index.d.ts
new file mode 100644
index 0000000000..3f46563cb6
--- /dev/null
+++ b/cookies/index.d.ts
@@ -0,0 +1,99 @@
+// Type definitions for cookie-parser v0.5.1
+// Project: https://github.com/pillarjs/cookies
+// Definitions by: Wang Zishi <https://github.com/WangZishi/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import * as http from "http"
+
+declare namespace cookies {
+    interface ICookies {
+        /**
+         * This extracts the cookie with the given name from the
+         * Cookie header in the request. If such a cookie exists,
+         * its value is returned. Otherwise, nothing is returned.
+         */
+        get(name: string): string;
+        /**
+         * This extracts the cookie with the given name from the
+         * Cookie header in the request. If such a cookie exists,
+         * its value is returned. Otherwise, nothing is returned.
+         */
+        get(name: string, opts: IOptions): string;
+
+        /**
+         * This sets the given cookie in the response and returns
+         * the current context to allow chaining.If the value is omitted,
+         * an outbound header with an expired date is used to delete the cookie.
+         */
+        set(name: string, value: string): ICookies;
+        /**
+         * This sets the given cookie in the response and returns
+         * the current context to allow chaining.If the value is omitted,
+         * an outbound header with an expired date is used to delete the cookie.
+         */
+        set(name: string, value: string, opts: IOptions): ICookies;
+    }
+
+    interface IOptions {
+        /**
+         * a number representing the milliseconds from Date.now() for expiry
+         */
+        maxAge?: number;
+        /**
+         * a Date object indicating the cookie's expiration
+         * date (expires at the end of session by default).
+         */
+        expires?: Date;
+        /**
+         * a string indicating the path of the cookie (/ by default).
+         */
+        path?: string;
+        /**
+         * a string indicating the domain of the cookie (no default).
+         */
+        domain?: string;
+        /**
+         * a boolean indicating whether the cookie is only to be sent
+         * over HTTPS (false by default for HTTP, true by default for HTTPS).
+         */
+        secure?: boolean;
+        /**
+         * a boolean indicating whether the cookie is only to be sent
+         * over HTTPS (use this if you handle SSL not in your node process).
+         */
+        secureProxy?: boolean;
+        /**
+         * a boolean indicating whether the cookie is only to be sent over HTTP(S),
+         * and not made available to client JavaScript (true by default).
+         */
+        httpOnly?: boolean;
+        /**
+         * a boolean indicating whether the cookie is to be signed (false by default).
+         * If this is true, another cookie of the same name with the .sig suffix
+         * appended will also be sent, with a 27-byte url-safe base64 SHA1 value
+         * representing the hash of cookie-name=cookie-value against the first Keygrip key.
+         * This signature key is used to detect tampering the next time a cookie is received.
+         */
+        signed?: boolean;
+        /**
+         * a boolean indicating whether to overwrite previously set
+         * cookies of the same name (false by default). If this is true,
+         * all cookies set during the same request with the same
+         * name (regardless of path or domain) are filtered out of
+         * the Set-Cookie header when setting this cookie.
+         */
+        overwrite?: boolean;
+    }
+}
+
+interface CookiesStatic {
+    new (request: http.IncomingMessage, response: http.ServerResponse): cookies.ICookies;
+    new (request: http.IncomingMessage, response: http.ServerResponse, keys?: Array<string>): cookies.ICookies;
+}
+
+declare const cookies: CookiesStatic;
+
+export = cookies
diff --git a/cookies/tsconfig.json b/cookies/tsconfig.json
new file mode 100644
index 0000000000..6abf28c2ea
--- /dev/null
+++ b/cookies/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cookies-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/copy-paste/copy-paste-tests.ts b/copy-paste/copy-paste-tests.ts
index 400c32a2a2..24ab6c5d95 100644
--- a/copy-paste/copy-paste-tests.ts
+++ b/copy-paste/copy-paste-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../node/node.d.ts" />
-/// <reference path="copy-paste.d.ts" />
+/// <reference types="node" />
 
 import * as CopyPaste from 'copy-paste';
 
diff --git a/copy-paste/copy-paste.d.ts b/copy-paste/copy-paste.d.ts
deleted file mode 100644
index a8a844b5bf..0000000000
--- a/copy-paste/copy-paste.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// Type definitions for copy-paste v1.1.3
-// Project: https://github.com/xavi-/node-copy-paste
-// Definitions by: Tobias Kahlert <https://github.com/SrTobi>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'copy-paste' {
-    
-    export type CopyCallback = (err: Error) => void;
-    export type PasteCallback = (err: Error, content: string) => void;
-
-    /**
-     * Asynchronously replaces the current contents of the clip board with text.
-     * 
-     * @param {T} content Takes either a string, array, object, or readable stream.
-     * @return {T} Returns the same value passed in.
-     */
-    export function copy<T>(content: T): T;
-    
-    /**
-     * Asynchronously replaces the current contents of the clip board with text.
-     * 
-     * @param {T} content Takes either a string, array, object, or readable stream.
-     * @param {CopyCallback} callback will fire when the copy operation is complete.
-     * @return {T} Returns the same value passed in.
-     */
-    export function copy<T>(content: T, callback: CopyCallback): T;
-
-
-    /**
-     * Synchronously returns the current contents of the system clip board.
-     * 
-     * Note: The synchronous version of paste is not always availabled.
-     * An error message is shown if the synchronous version of paste is used on an unsupported platform.
-     * The asynchronous version of paste is always available.
-     * 
-     * @return {string} Returns the current contents of the system clip board.
-     */
-    export function paste(): string;
-    
-    /**
-     * Asynchronously returns the current contents of the system clip board.
-     * 
-     * @param {PasteCallback} callback The contents of the system clip board are passed to the callback as the second parameter.
-     */
-    export function paste(callback: PasteCallback): void;
-}
\ No newline at end of file
diff --git a/copy-paste/index.d.ts b/copy-paste/index.d.ts
new file mode 100644
index 0000000000..9b505cb0a5
--- /dev/null
+++ b/copy-paste/index.d.ts
@@ -0,0 +1,45 @@
+// Type definitions for copy-paste v1.1.3
+// Project: https://github.com/xavi-/node-copy-paste
+// Definitions by: Tobias Kahlert <https://github.com/SrTobi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+export type CopyCallback = (err: Error) => void;
+export type PasteCallback = (err: Error, content: string) => void;
+
+/**
+ * Asynchronously replaces the current contents of the clip board with text.
+ * 
+ * @param {T} content Takes either a string, array, object, or readable stream.
+ * @return {T} Returns the same value passed in.
+ */
+export declare function copy<T>(content: T): T;
+
+/**
+ * Asynchronously replaces the current contents of the clip board with text.
+ * 
+ * @param {T} content Takes either a string, array, object, or readable stream.
+ * @param {CopyCallback} callback will fire when the copy operation is complete.
+ * @return {T} Returns the same value passed in.
+ */
+export declare function copy<T>(content: T, callback: CopyCallback): T;
+
+
+/**
+ * Synchronously returns the current contents of the system clip board.
+ * 
+ * Note: The synchronous version of paste is not always availabled.
+ * An error message is shown if the synchronous version of paste is used on an unsupported platform.
+ * The asynchronous version of paste is always available.
+ * 
+ * @return {string} Returns the current contents of the system clip board.
+ */
+export declare function paste(): string;
+
+/**
+ * Asynchronously returns the current contents of the system clip board.
+ * 
+ * @param {PasteCallback} callback The contents of the system clip board are passed to the callback as the second parameter.
+ */
+export declare function paste(callback: PasteCallback): void;
diff --git a/copy-paste/tsconfig.json b/copy-paste/tsconfig.json
new file mode 100644
index 0000000000..784bb55a4b
--- /dev/null
+++ b/copy-paste/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "copy-paste-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cordova-ionic/cordova-ionic-tests.ts b/cordova-ionic/cordova-ionic-tests.ts
index a88c9c5809..917ad8d9ab 100644
--- a/cordova-ionic/cordova-ionic-tests.ts
+++ b/cordova-ionic/cordova-ionic-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../cordova/cordova.d.ts" />
-/// <reference path="./cordova-ionic.d.ts" />
+/// <reference types="cordova" />
+
 
 // Keyboard
 cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true);
diff --git a/cordova-ionic/cordova-ionic.d.ts b/cordova-ionic/cordova-ionic.d.ts
deleted file mode 100644
index c9a67bf9c7..0000000000
--- a/cordova-ionic/cordova-ionic.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Type definitions for Ionic Cordova plugins
-// Project: https://github.com/driftyco
-// Definitions by: Hendrik Maus <https://github.com/hendrikmaus>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="./plugins/keyboard.d.ts" />
-
-interface CordovaPlugins {
-  Keyboard:Ionic.Keyboard;
-}
diff --git a/cordova-ionic/index.d.ts b/cordova-ionic/index.d.ts
new file mode 100644
index 0000000000..dc008b8a54
--- /dev/null
+++ b/cordova-ionic/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for Ionic Cordova plugins
+// Project: https://github.com/driftyco
+// Definitions by: Hendrik Maus <https://github.com/hendrikmaus>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="keyboard.d.ts" />
+
+interface CordovaPlugins {
+  Keyboard: Ionic.Keyboard;
+}
diff --git a/cordova-ionic/plugins/keyboard.d.ts b/cordova-ionic/keyboard.d.ts
similarity index 100%
rename from cordova-ionic/plugins/keyboard.d.ts
rename to cordova-ionic/keyboard.d.ts
diff --git a/cordova-ionic/tsconfig.json b/cordova-ionic/tsconfig.json
new file mode 100644
index 0000000000..3e190767e0
--- /dev/null
+++ b/cordova-ionic/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cordova-ionic-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cordova-plugin-app-version/cordova-plugin-app-version-tests.ts b/cordova-plugin-app-version/cordova-plugin-app-version-tests.ts
index 3b27435bd4..36be88bfa4 100644
--- a/cordova-plugin-app-version/cordova-plugin-app-version-tests.ts
+++ b/cordova-plugin-app-version/cordova-plugin-app-version-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../cordova/cordova.d.ts" />
-/// <reference path="./cordova-plugin-app-version.d.ts" />
+/// <reference types="cordova" />
+
 
 cordova.getAppVersion.getAppName()
 	.then(appName=> {
diff --git a/cordova-plugin-app-version/cordova-plugin-app-version.d.ts b/cordova-plugin-app-version/cordova-plugin-app-version.d.ts
deleted file mode 100644
index 6f36248f94..0000000000
--- a/cordova-plugin-app-version/cordova-plugin-app-version.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Type definitions for cordova-plugin-app-version v0.1.7
-// Project: https://github.com/whiteoctober/cordova-plugin-app-version
-// Definitions by: Markus Wagner <https://github.com/Ritzlgrmft/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../q/Q.d.ts" />
-
-interface Cordova {
-	getAppVersion: {
-		getAppName: () => Q.IPromise<string> | JQueryPromise<string>;
-		getPackageName: () => Q.IPromise<string> | JQueryPromise<string>;
-		getVersionCode: () => Q.IPromise<string> | JQueryPromise<string>;
-		getVersionNumber: () => Q.IPromise<string> | JQueryPromise<string>;
-	};
-}
\ No newline at end of file
diff --git a/cordova-plugin-app-version/index.d.ts b/cordova-plugin-app-version/index.d.ts
new file mode 100644
index 0000000000..898159db76
--- /dev/null
+++ b/cordova-plugin-app-version/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for cordova-plugin-app-version v0.1.7
+// Project: https://github.com/whiteoctober/cordova-plugin-app-version
+// Definitions by: Markus Wagner <https://github.com/Ritzlgrmft/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+/// <reference types="Q" />
+
+interface Cordova {
+	getAppVersion: {
+		getAppName: () => Q.IPromise<string> | JQueryPromise<string>;
+		getPackageName: () => Q.IPromise<string> | JQueryPromise<string>;
+		getVersionCode: () => Q.IPromise<string> | JQueryPromise<string>;
+		getVersionNumber: () => Q.IPromise<string> | JQueryPromise<string>;
+	};
+}
\ No newline at end of file
diff --git a/cordova-plugin-app-version/tsconfig.json b/cordova-plugin-app-version/tsconfig.json
new file mode 100644
index 0000000000..92a3ae1f44
--- /dev/null
+++ b/cordova-plugin-app-version/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cordova-plugin-app-version-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cordova-plugin-background-mode/cordova-plugin-background-mode-tests.ts b/cordova-plugin-background-mode/cordova-plugin-background-mode-tests.ts
new file mode 100644
index 0000000000..ac632272f6
--- /dev/null
+++ b/cordova-plugin-background-mode/cordova-plugin-background-mode-tests.ts
@@ -0,0 +1,13 @@
+/// <reference types="cordova"  />
+
+cordova.plugins.backgroundMode.setDefaults({ silent: true });
+
+cordova.plugins.backgroundMode.enable();
+cordova.plugins.backgroundMode.isEnabled();
+cordova.plugins.backgroundMode.isActivated();
+
+cordova.plugins.backgroundMode.configure({ text: 'Insane Title' });
+
+cordova.plugins.backgroundMode.onactivate = () => { }
+cordova.plugins.backgroundMode.ondeactivate = () => { }
+cordova.plugins.backgroundMode.onfailure = (errorCode) => { }
\ No newline at end of file
diff --git a/cordova-plugin-background-mode/index.d.ts b/cordova-plugin-background-mode/index.d.ts
new file mode 100644
index 0000000000..48a1be08c2
--- /dev/null
+++ b/cordova-plugin-background-mode/index.d.ts
@@ -0,0 +1,76 @@
+// Type definitions for Apache Background Mode plugin
+// Project: https://github.com/katzer/cordova-plugin-background-mode
+// Definitions by: Paul Thiel <https://github.com/Lordnoname>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * The plugin prevent the app from going to sleep while in background
+ */
+interface CordovaPluginBackgroundMode {
+
+  /**
+   * The background mode can be enabled
+   */
+  enable(): void;
+  /**
+   * The background mode can be disabled
+   */
+  disable(): void;
+  /**
+   * Checks if the background mode is enabled or not
+   */
+  isEnabled(): boolean;
+  /**
+   * Checks if the background mode is activated or not
+   */
+  isActivated(): boolean;
+  /**
+   * Function to get notified when the background mode has been activated
+   */
+  onactivate(): void;
+  /**
+   * Function to get notified when the background mode has been deactivated
+   */
+  ondeactivate(): void;
+  /**
+   * Function to get notified when the background could not benn activated
+   */
+  onfailure(callback: (errorCode: number) => void): void;
+  /**
+   * Customize default title, ticker and text for the notification
+   */
+  setDefaults(item: ICordovaPluginBackgroundModeNotificationItem): void;
+  /**
+   * Configure the default background notification
+   */
+  configure(item: ICordovaPluginBackgroundModeNotificationItem): void;
+}
+
+interface ICordovaPluginBackgroundModeNotificationItem {
+
+  /**
+   * The title of the notification displayed in background mode
+   */
+  title?: string,
+  /**
+   * The ticker of the notification displayed in background mode
+   */
+  ticker?: string,
+  /**
+   * The body of the notification displayed in background mode
+   */
+  text?: string,
+  /**
+   * Handles if app is coming to foreground when tapping on the notification
+   */
+  resume?: boolean,
+  /**
+   * Handles if there is a notification when background is activated
+   */
+  silent?: boolean
+}
+
+interface CordovaPlugins {
+
+  backgroundMode: CordovaPluginBackgroundMode
+}
\ No newline at end of file
diff --git a/cordova-plugin-background-mode/tsconfig.json b/cordova-plugin-background-mode/tsconfig.json
new file mode 100644
index 0000000000..2521c171a9
--- /dev/null
+++ b/cordova-plugin-background-mode/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cordova-plugin-background-mode-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cordova-plugin-email-composer/cordova-plugin-email-composer-tests.ts b/cordova-plugin-email-composer/cordova-plugin-email-composer-tests.ts
index ccd1e725d4..c6df52721a 100644
--- a/cordova-plugin-email-composer/cordova-plugin-email-composer-tests.ts
+++ b/cordova-plugin-email-composer/cordova-plugin-email-composer-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../cordova/cordova.d.ts" />
-/// <reference path="./cordova-plugin-email-composer.d.ts" />
+/// <reference types="cordova" />
+
 
 cordova.plugins.email.isAvailable((isAvailable) => {}, {});
 cordova.plugins.email.open({
diff --git a/cordova-plugin-email-composer/cordova-plugin-email-composer.d.ts b/cordova-plugin-email-composer/index.d.ts
similarity index 100%
rename from cordova-plugin-email-composer/cordova-plugin-email-composer.d.ts
rename to cordova-plugin-email-composer/index.d.ts
diff --git a/cordova-plugin-email-composer/tsconfig.json b/cordova-plugin-email-composer/tsconfig.json
new file mode 100644
index 0000000000..06ca2cb9f0
--- /dev/null
+++ b/cordova-plugin-email-composer/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cordova-plugin-email-composer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cordova-plugin-ibeacon/cordova-plugin-ibeacon-tests.ts b/cordova-plugin-ibeacon/cordova-plugin-ibeacon-tests.ts
index 7520c39d52..3c5c19064a 100644
--- a/cordova-plugin-ibeacon/cordova-plugin-ibeacon-tests.ts
+++ b/cordova-plugin-ibeacon/cordova-plugin-ibeacon-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../cordova/cordova.d.ts" />
-/// <reference path="./cordova-plugin-ibeacon.d.ts" />
+/// <reference types="cordova" />
+
 
 function registerDelegates() {
 	cordova.plugins.locationManager.enableDebugLogs();
diff --git a/cordova-plugin-ibeacon/cordova-plugin-ibeacon.d.ts b/cordova-plugin-ibeacon/cordova-plugin-ibeacon.d.ts
deleted file mode 100644
index 537ae00071..0000000000
--- a/cordova-plugin-ibeacon/cordova-plugin-ibeacon.d.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-// Type definitions for cordova-plugin-ibeacon v3.3.0
-// Project: https://github.com/petermetz/cordova-plugin-ibeacon
-// Definitions by: Markus Wagner <https://github.com/Ritzlgrmft/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../q/Q.d.ts" />
-
-interface CordovaPlugins {
-    locationManager: BeaconPlugin.LocationManager;
-}
-
-declare namespace BeaconPlugin {
-	/**
-	 * Beacon Plugin.
-	 */
-	export interface LocationManager {
-		delegate: Delegate;
-		BeaconRegion: BeaconRegion;
-		onDomDelegateReady(): void;
-		startMonitoringForRegion(region: Region): Q.Promise<void>;
-		stopMonitoringForRegion(region: Region): Q.Promise<void>;
-		requestStateForRegion(region: Region): Q.Promise<void>;
-		startRangingBeaconsInRegion(region: Region): Q.Promise<void>;
-		stopRangingBeaconsInRegion(region: Region): Q.Promise<void>;
-		getAuthorizationStatus(): Q.Promise<PluginResult>;
-		requestWhenInUseAuthorization(): Q.Promise<void>;
-		requestAlwaysAuthorization(): Q.Promise<void>;
-		getMonitoredRegions(): Q.Promise<Region[]>;
-		getRangedRegions(): Q.Promise<Region[]>;
-		isRangingAvailable(): Q.Promise<boolean>;
-		isMonitoringAvailableForClass(region: Region): Q.Promise<boolean>;
-		startAdvertising(region: Region, measuredPower: boolean): Q.Promise<void>;
-		stopAdvertising(): Q.Promise<void>;
-		isAdvertisingAvailable(): Q.Promise<boolean>;
-		isAdvertising(): Q.Promise<boolean>;
-		disableDebugLogs(): Q.Promise<void>;
-		enableDebugNotifications(): Q.Promise<void>;
-		disableDebugNotifications(): Q.Promise<void>;
-		enableDebugLogs(): Q.Promise<void>;
-		isBluetoothEnabled(): Q.Promise<boolean>;
-		enableBluetooth(): Q.Promise<void>;
-		disableBluetooth(): Q.Promise<void>;
-		appendToDeviceLog(message: string): Q.Promise<string>;
-	}
-
-	export interface PluginResult {
-		eventType: string;
-		region: Region;
-		beacons: Beacon[];
-		authorizationStatus: string;
-		state: string;
-	}
-
-	export interface Delegate {
-		didDetermineStateForRegion(pluginResult: PluginResult): void;
-		didStartMonitoringForRegion(pluginResult: PluginResult): void;
-		didExitRegion(pluginResult: PluginResult): void;
-		didEnterRegion(pluginResult: PluginResult): void;
-		didRangeBeaconsInRegion(pluginResult: PluginResult): void;
-		peripheralManagerDidStartAdvertising(pluginResult: PluginResult): void;
-		peripheralManagerDidUpdateState(pluginResult: PluginResult): void;
-		didChangeAuthorizationStatus(authorizationStatus: string): void;
-		monitoringDidFailForRegionWithError(pluginResult: PluginResult): void;
-	}
-
-	export interface Region {
-		identifier: string;
-		new (identifier: string): Region;
-	}
-
-	export interface BeaconRegion extends Region {
-		uuid: string;
-		major: string;
-		minor: string;
-		notifyEntryStateOnDisplay: boolean;
-		new (identifier: string, uuid: string, major?: number, minor?: number, notifyEntryStateOnDisplay?: boolean): BeaconRegion;
-	}
-
-	export interface CircularRegion extends Region {
-		latitude: number;
-		longitude: number;
-		radius: number;
-		new (identifier: string, latitude: number, longitude: number, radius: number): CircularRegion;
-	}
-
-	export interface Beacon {
-		uuid: string;
-		major: string;
-		minor: string;
-		proximity: string;
-		tx: number;
-		rssi: number;
-		accuracy: number;
-	}
-}
diff --git a/cordova-plugin-ibeacon/index.d.ts b/cordova-plugin-ibeacon/index.d.ts
new file mode 100644
index 0000000000..c6a69eed3b
--- /dev/null
+++ b/cordova-plugin-ibeacon/index.d.ts
@@ -0,0 +1,95 @@
+// Type definitions for cordova-plugin-ibeacon v3.3.0
+// Project: https://github.com/petermetz/cordova-plugin-ibeacon
+// Definitions by: Markus Wagner <https://github.com/Ritzlgrmft/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="Q" />
+
+interface CordovaPlugins {
+    locationManager: BeaconPlugin.LocationManager;
+}
+
+declare namespace BeaconPlugin {
+	/**
+	 * Beacon Plugin.
+	 */
+	export interface LocationManager {
+		delegate: Delegate;
+		BeaconRegion: BeaconRegion;
+		onDomDelegateReady(): void;
+		startMonitoringForRegion(region: Region): Q.Promise<void>;
+		stopMonitoringForRegion(region: Region): Q.Promise<void>;
+		requestStateForRegion(region: Region): Q.Promise<void>;
+		startRangingBeaconsInRegion(region: Region): Q.Promise<void>;
+		stopRangingBeaconsInRegion(region: Region): Q.Promise<void>;
+		getAuthorizationStatus(): Q.Promise<PluginResult>;
+		requestWhenInUseAuthorization(): Q.Promise<void>;
+		requestAlwaysAuthorization(): Q.Promise<void>;
+		getMonitoredRegions(): Q.Promise<Region[]>;
+		getRangedRegions(): Q.Promise<Region[]>;
+		isRangingAvailable(): Q.Promise<boolean>;
+		isMonitoringAvailableForClass(region: Region): Q.Promise<boolean>;
+		startAdvertising(region: Region, measuredPower: boolean): Q.Promise<void>;
+		stopAdvertising(): Q.Promise<void>;
+		isAdvertisingAvailable(): Q.Promise<boolean>;
+		isAdvertising(): Q.Promise<boolean>;
+		disableDebugLogs(): Q.Promise<void>;
+		enableDebugNotifications(): Q.Promise<void>;
+		disableDebugNotifications(): Q.Promise<void>;
+		enableDebugLogs(): Q.Promise<void>;
+		isBluetoothEnabled(): Q.Promise<boolean>;
+		enableBluetooth(): Q.Promise<void>;
+		disableBluetooth(): Q.Promise<void>;
+		appendToDeviceLog(message: string): Q.Promise<string>;
+	}
+
+	export interface PluginResult {
+		eventType: string;
+		region: Region;
+		beacons: Beacon[];
+		authorizationStatus: string;
+		state: string;
+	}
+
+	export interface Delegate {
+		didDetermineStateForRegion(pluginResult: PluginResult): void;
+		didStartMonitoringForRegion(pluginResult: PluginResult): void;
+		didExitRegion(pluginResult: PluginResult): void;
+		didEnterRegion(pluginResult: PluginResult): void;
+		didRangeBeaconsInRegion(pluginResult: PluginResult): void;
+		peripheralManagerDidStartAdvertising(pluginResult: PluginResult): void;
+		peripheralManagerDidUpdateState(pluginResult: PluginResult): void;
+		didChangeAuthorizationStatus(authorizationStatus: string): void;
+		monitoringDidFailForRegionWithError(pluginResult: PluginResult): void;
+	}
+
+	export interface Region {
+		identifier: string;
+		new (identifier: string): Region;
+	}
+
+	export interface BeaconRegion extends Region {
+		uuid: string;
+		major: string;
+		minor: string;
+		notifyEntryStateOnDisplay: boolean;
+		new (identifier: string, uuid: string, major?: number, minor?: number, notifyEntryStateOnDisplay?: boolean): BeaconRegion;
+	}
+
+	export interface CircularRegion extends Region {
+		latitude: number;
+		longitude: number;
+		radius: number;
+		new (identifier: string, latitude: number, longitude: number, radius: number): CircularRegion;
+	}
+
+	export interface Beacon {
+		uuid: string;
+		major: string;
+		minor: string;
+		proximity: string;
+		tx: number;
+		rssi: number;
+		accuracy: number;
+	}
+}
diff --git a/cordova-plugin-ibeacon/tsconfig.json b/cordova-plugin-ibeacon/tsconfig.json
new file mode 100644
index 0000000000..2b6580e048
--- /dev/null
+++ b/cordova-plugin-ibeacon/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cordova-plugin-ibeacon-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cordova-plugin-insomnia/cordova-plugin-insomnia-tests.ts b/cordova-plugin-insomnia/cordova-plugin-insomnia-tests.ts
index 2d7f04a105..f5bbd6b2ca 100644
--- a/cordova-plugin-insomnia/cordova-plugin-insomnia-tests.ts
+++ b/cordova-plugin-insomnia/cordova-plugin-insomnia-tests.ts
@@ -1,7 +1,4 @@
-/// <reference path="../cordova/plugins/Push.d.ts" />
-/// <reference path="./cordova-plugin-insomnia.d.ts" />
-
-window.plugins.insomnia.allowSleepAgain(
+window.plugins.insomnia.allowSleepAgain(
 	() => { console.log("success"); },
 	() => { console.log("fail"); }
 );
diff --git a/cordova-plugin-insomnia/cordova-plugin-insomnia.d.ts b/cordova-plugin-insomnia/cordova-plugin-insomnia.d.ts
deleted file mode 100644
index 7b37c12001..0000000000
--- a/cordova-plugin-insomnia/cordova-plugin-insomnia.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Type definitions for Insomnia-PhoneGap-Plugin v4.0.1
-// Project: https://github.com/EddyVerbruggen/Insomnia-PhoneGap-Plugin/
-// Definitions by: Markus Wagner <https://github.com/Ritzlgrmft/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface Plugins {
-	insomnia: InsomniaPlugin.Insomnia;
-}
-
-declare namespace InsomniaPlugin {
-
-	export interface Insomnia {
-
-		/**
-		 * Prevent the screen of the mobile device from falling asleep.
-		 */
-		keepAwake(success?: () => any, fail?: () => any): void;
-
-		/**
-		 * After making your app practically a zombie, you can allow it to sleep again by calling allowSleepAgain.
-		 */
-		allowSleepAgain(success?: () => any, fail?: () => any): void;
-	}
-}
diff --git a/cordova-plugin-insomnia/index.d.ts b/cordova-plugin-insomnia/index.d.ts
new file mode 100644
index 0000000000..2d3ca2e9e4
--- /dev/null
+++ b/cordova-plugin-insomnia/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for Insomnia-PhoneGap-Plugin v4.0.1
+// Project: https://github.com/EddyVerbruggen/Insomnia-PhoneGap-Plugin/
+// Definitions by: Markus Wagner <https://github.com/Ritzlgrmft/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface Window {
+	plugins: Plugins;
+}
+
+interface Plugins {
+	insomnia: InsomniaPlugin.Insomnia;
+}
+
+declare namespace InsomniaPlugin {
+	export interface Insomnia {
+
+		/**
+		 * Prevent the screen of the mobile device from falling asleep.
+		 */
+		keepAwake(success?: () => any, fail?: () => any): void;
+
+		/**
+		 * After making your app practically a zombie, you can allow it to sleep again by calling allowSleepAgain.
+		 */
+		allowSleepAgain(success?: () => any, fail?: () => any): void;
+	}
+}
diff --git a/cordova-plugin-insomnia/tsconfig.json b/cordova-plugin-insomnia/tsconfig.json
new file mode 100644
index 0000000000..c1b1660423
--- /dev/null
+++ b/cordova-plugin-insomnia/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cordova-plugin-insomnia-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cordova-plugin-mapsforge/cordova-plugin-mapsforge-tests.ts b/cordova-plugin-mapsforge/cordova-plugin-mapsforge-tests.ts
index 52ef78700b..db3d45c306 100644
--- a/cordova-plugin-mapsforge/cordova-plugin-mapsforge-tests.ts
+++ b/cordova-plugin-mapsforge/cordova-plugin-mapsforge-tests.ts
@@ -1,6 +1,3 @@
-///<reference path="cordova-plugin-mapsforge.d.ts"/>
-
-
 mapsforge.embedded.initialize(["/mnt/sdcard/spain.map",0,0]); //Creates the view
 mapsforge.embedded.setCenter(43.360056,-5.845757); //Sets the center of the view
 mapsforge.embedded.setMaxZoom(18);
diff --git a/cordova-plugin-mapsforge/cordova-plugin-mapsforge.d.ts b/cordova-plugin-mapsforge/index.d.ts
similarity index 100%
rename from cordova-plugin-mapsforge/cordova-plugin-mapsforge.d.ts
rename to cordova-plugin-mapsforge/index.d.ts
diff --git a/cordova-plugin-mapsforge/tsconfig.json b/cordova-plugin-mapsforge/tsconfig.json
new file mode 100644
index 0000000000..6def5d8b99
--- /dev/null
+++ b/cordova-plugin-mapsforge/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cordova-plugin-mapsforge-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cordova-plugin-ms-adal/cordova-plugin-ms-adal-tests.ts b/cordova-plugin-ms-adal/cordova-plugin-ms-adal-tests.ts
index 8bdb7f1427..6022aa7bc4 100644
--- a/cordova-plugin-ms-adal/cordova-plugin-ms-adal-tests.ts
+++ b/cordova-plugin-ms-adal/cordova-plugin-ms-adal-tests.ts
@@ -1,7 +1,4 @@
-/// <reference path="./cordova-plugin-ms-adal.d.ts"/>
-
 function test_cordova_plugin_ms_adal() {
-
     var testConfiguration = {
         authority: 'https://login.microsoftonline.com/testtenant.onmicrosoft.com',
         resourceUrl: 'https://graph.windows.net/',
diff --git a/cordova-plugin-ms-adal/cordova-plugin-ms-adal.d.ts b/cordova-plugin-ms-adal/index.d.ts
similarity index 100%
rename from cordova-plugin-ms-adal/cordova-plugin-ms-adal.d.ts
rename to cordova-plugin-ms-adal/index.d.ts
diff --git a/cordova-plugin-ms-adal/tsconfig.json b/cordova-plugin-ms-adal/tsconfig.json
new file mode 100644
index 0000000000..8b126d83cd
--- /dev/null
+++ b/cordova-plugin-ms-adal/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cordova-plugin-ms-adal-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cordova-plugin-ouralabs/cordova-plugin-ouralabs-tests.ts b/cordova-plugin-ouralabs/cordova-plugin-ouralabs-tests.ts
index eed76253c7..8c054c99e1 100644
--- a/cordova-plugin-ouralabs/cordova-plugin-ouralabs-tests.ts
+++ b/cordova-plugin-ouralabs/cordova-plugin-ouralabs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="cordova-plugin-ouralabs.d.ts" />
+
 
 var traceLevel: number = OuralabsPlugin.LogLevel.TRACE;
 var debugLevel: number = OuralabsPlugin.LogLevel.DEBUG;
diff --git a/cordova-plugin-ouralabs/cordova-plugin-ouralabs.d.ts b/cordova-plugin-ouralabs/index.d.ts
similarity index 100%
rename from cordova-plugin-ouralabs/cordova-plugin-ouralabs.d.ts
rename to cordova-plugin-ouralabs/index.d.ts
diff --git a/cordova-plugin-ouralabs/tsconfig.json b/cordova-plugin-ouralabs/tsconfig.json
new file mode 100644
index 0000000000..3b8c033b4a
--- /dev/null
+++ b/cordova-plugin-ouralabs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cordova-plugin-ouralabs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cordova-plugin-qrscanner/cordova-plugin-qrscanner-tests.ts b/cordova-plugin-qrscanner/cordova-plugin-qrscanner-tests.ts
index 630bfd09ca..009b0b7d2b 100644
--- a/cordova-plugin-qrscanner/cordova-plugin-qrscanner-tests.ts
+++ b/cordova-plugin-qrscanner/cordova-plugin-qrscanner-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="cordova-plugin-qrscanner.d.ts" />
+
 
 var QRScanner: QRScanner = window.QRScanner;
 QRScanner.prepare();
diff --git a/cordova-plugin-qrscanner/cordova-plugin-qrscanner.d.ts b/cordova-plugin-qrscanner/index.d.ts
similarity index 100%
rename from cordova-plugin-qrscanner/cordova-plugin-qrscanner.d.ts
rename to cordova-plugin-qrscanner/index.d.ts
diff --git a/cordova-plugin-qrscanner/tsconfig.json b/cordova-plugin-qrscanner/tsconfig.json
new file mode 100644
index 0000000000..05f1295b7f
--- /dev/null
+++ b/cordova-plugin-qrscanner/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cordova-plugin-qrscanner-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cordova-plugin-spinner/cordova-plugin-spinner-tests.ts b/cordova-plugin-spinner/cordova-plugin-spinner-tests.ts
index 25e6b60add..22beab9152 100644
--- a/cordova-plugin-spinner/cordova-plugin-spinner-tests.ts
+++ b/cordova-plugin-spinner/cordova-plugin-spinner-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="cordova-plugin-spinner.d.ts" />
+
 
 SpinnerPlugin.activityStart();
 SpinnerPlugin.activityStart("a");
diff --git a/cordova-plugin-spinner/cordova-plugin-spinner.d.ts b/cordova-plugin-spinner/index.d.ts
similarity index 100%
rename from cordova-plugin-spinner/cordova-plugin-spinner.d.ts
rename to cordova-plugin-spinner/index.d.ts
diff --git a/cordova-plugin-spinner/tsconfig.json b/cordova-plugin-spinner/tsconfig.json
new file mode 100644
index 0000000000..b7c3058320
--- /dev/null
+++ b/cordova-plugin-spinner/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cordova-plugin-spinner-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cordova-plugin-x-socialsharing/cordova-plugin-x-socialsharing-tests.ts b/cordova-plugin-x-socialsharing/cordova-plugin-x-socialsharing-tests.ts
index e85c1cfb23..1d52b13646 100755
--- a/cordova-plugin-x-socialsharing/cordova-plugin-x-socialsharing-tests.ts
+++ b/cordova-plugin-x-socialsharing/cordova-plugin-x-socialsharing-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../cordova/cordova.d.ts" />
-/// <reference path="./cordova-plugin-x-socialsharing.d.ts" />
+/// <reference types="cordova" />
+
 
 window.plugins.socialsharing.iPadPopupCoordinates = function () {
 	return "100,100,200,300";
diff --git a/cordova-plugin-x-socialsharing/cordova-plugin-x-socialsharing.d.ts b/cordova-plugin-x-socialsharing/index.d.ts
old mode 100755
new mode 100644
similarity index 100%
rename from cordova-plugin-x-socialsharing/cordova-plugin-x-socialsharing.d.ts
rename to cordova-plugin-x-socialsharing/index.d.ts
diff --git a/cordova-plugin-x-socialsharing/tsconfig.json b/cordova-plugin-x-socialsharing/tsconfig.json
new file mode 100644
index 0000000000..523f072568
--- /dev/null
+++ b/cordova-plugin-x-socialsharing/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cordova-plugin-x-socialsharing-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cordova/cordova-tests.ts b/cordova/cordova-tests.ts
index 7e97305a25..6ab730af11 100644
--- a/cordova/cordova-tests.ts
+++ b/cordova/cordova-tests.ts
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Open Technologies, Inc.
 // Licensed under the MIT license.
 
-/// <reference path="cordova.d.ts"/>
-
 // Apache Cordova core
 //----------------------------------------------------------------------
 
@@ -269,8 +267,6 @@ window.plugins.pushNotification.unregister(() => { }, () => { });
 // Network Plugin
 //----------------------------------------------------------------------
 
-console.log('Connection type is: ' + navigator.connectionSpeed);
-
 var connType = navigator.connection.type;
 if (connType == Connection.WIFI) {
     console.log('Congratulations, you\'re with fast Internet!');
diff --git a/cordova/cordova.d.ts b/cordova/index.d.ts
similarity index 100%
rename from cordova/cordova.d.ts
rename to cordova/index.d.ts
diff --git a/cordova/plugins/StatusBar-tests.ts b/cordova/plugins/StatusBar-tests.ts
index 92eac303e9..01ab0bf945 100644
--- a/cordova/plugins/StatusBar-tests.ts
+++ b/cordova/plugins/StatusBar-tests.ts
@@ -1,6 +1,6 @@
 // Licensed under the MIT license.
 
-/// <reference path="StatusBar.d.ts" />
+
 
 var statusBar: StatusBar = window.StatusBar;
 statusBar.overlaysWebView(true);
diff --git a/cordova/tsconfig.json b/cordova/tsconfig.json
new file mode 100644
index 0000000000..c4723a1e5e
--- /dev/null
+++ b/cordova/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cordova-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cordovarduino/cordovarduino-tests.ts b/cordovarduino/cordovarduino-tests.ts
index a4fd608789..a33a8c3f9d 100644
--- a/cordovarduino/cordovarduino-tests.ts
+++ b/cordovarduino/cordovarduino-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="cordovarduino.d.ts"/>
-
 serial.requestPermission(function success() {}, function error() {});
 serial.open({}, function success() {}, function error() {});
 serial.write('data_string', function success() {}, function error() {});
diff --git a/cordovarduino/cordovarduino.d.ts b/cordovarduino/index.d.ts
similarity index 100%
rename from cordovarduino/cordovarduino.d.ts
rename to cordovarduino/index.d.ts
diff --git a/cordovarduino/tsconfig.json b/cordovarduino/tsconfig.json
new file mode 100644
index 0000000000..52e3d53cf2
--- /dev/null
+++ b/cordovarduino/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cordovarduino-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/core-decorators/core-decorators-tests.ts b/core-decorators/core-decorators-tests.ts
index 1731c41933..86df21fc6d 100644
--- a/core-decorators/core-decorators-tests.ts
+++ b/core-decorators/core-decorators-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="core-decorators.d.ts" />
 
 //
 // @autobind
diff --git a/core-decorators/core-decorators.d.ts b/core-decorators/core-decorators.d.ts
deleted file mode 100644
index 30d3a6c170..0000000000
--- a/core-decorators/core-decorators.d.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-// Type definitions for core-decorators.js v0.10
-// Project: https://github.com/jayphelps/core-decorators.js
-// Definitions by: Qubo <https://github.com/tkqubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "core-decorators" {
-    export interface ClassDecorator {
-      <TFunction extends Function>(target: TFunction): TFunction|void;
-    }
-
-    export interface ParameterDecorator {
-      (target: Object, propertyKey: string|symbol, parameterIndex: number): void;
-    }
-
-    export interface PropertyDecorator {
-        (target: Object, propertyKey: string|symbol): void;
-    }
-
-    export interface MethodDecorator {
-      <T>(target: Object, propertyKey: string|symbol, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>|void;
-    }
-
-    export interface PropertyOrMethodDecorator extends MethodDecorator, PropertyDecorator {
-        (target: Object, propertyKey: string|symbol): void;
-    }
-
-    export interface Deprecate extends MethodDecorator {
-        (message?: string, option?: DeprecateOption): MethodDecorator;
-    }
-
-    export interface DeprecateOption {
-        url: string;
-    }
-
-    export interface ThrottleOptions {
-        /** allows to trigger function on the leading. */
-        leading?: boolean;
-        /** allows to trigger function on the trailing edge of the wait interval. */
-        trailing?: boolean;
-    }
-
-    export interface Console {
-        log(message?: any, ...optionalParams: any[]): void;
-        time(timerName?: string): void;
-        timeEnd(timerName?: string): void;
-    }
-
-    /**
-     * Forces invocations of this function to always have this refer to the class instance,
-     * even if the function is passed around or would otherwise lose its this context. e.g. var fn = context.method;
-     */
-    var autobind: Function;
-    /**
-     * Marks a property or method as not being writable.
-     */
-    var readonly: PropertyOrMethodDecorator;
-    /**
-     * Checks that the marked method indeed overrides a function with the same signature somewhere on the prototype chain.
-     */
-    var override: MethodDecorator;
-    /**
-     * Calls console.warn() with a deprecation message. Provide a custom message to override the default one. You can also provide an options hash with a url, for further reading.
-     */
-    var deprecate: Deprecate;
-    /**
-     * Calls console.warn() with a deprecation message. Provide a custom message to override the default one. You can also provide an options hash with a url, for further reading.
-     */
-    var deprecated: Deprecate;
-    /**
-     * Creates a new debounced function which will be invoked after wait milliseconds since the time it was invoked. Default timeout is 300 ms.
-     */
-    var debounce: (wait: number) => MethodDecorator;
-    /**
-     * Creates a new throttled function which will be invoked in every wait milliseconds. Default timeout is 300 ms.
-     */
-    var throttle: (wait: number, options?: ThrottleOptions) => MethodDecorator;
-    /**
-     * Suppresses any JavaScript console.warn() call while the decorated function is called. (i.e. on the stack)
-     */
-    var suppressWarnings: MethodDecorator;
-    /**
-     * Marks a property or method as not being enumerable.
-     */
-    var nonenumerable: PropertyOrMethodDecorator;
-    /**
-     * Marks a property or method as not being writable.
-     */
-    var nonconfigurable: PropertyOrMethodDecorator;
-    /**
-     * Initial implementation included, likely slow. WIP.
-     */
-    var memoize: MethodDecorator;
-    /**
-     * Immediately applies the provided function and arguments to the method, allowing you to wrap methods with arbitrary helpers like those provided by lodash.
-     * The first argument is the function to apply, all further arguments will be passed to that decorating function.
-     */
-    var decorate: (func: Function, ...args: any[]) => MethodDecorator;
-    /**
-     * Prevents a property initializer from running until the decorated property is actually looked up.
-     * Useful to prevent excess allocations that might otherwise not be used, but be careful not to over-optimize things.
-     */
-    var lazyInitialize: PropertyDecorator;
-    /**
-     * Mixes in all property descriptors from the provided Plain Old JavaScript Objects (aka POJOs) as arguments.
-     * Mixins are applied in the order they are passed, but do not override descriptors already on the class, including those inherited traditionally.
-     */
-    var mixin: (...mixins: any[]) => ClassDecorator;
-    /**
-     * Mixes in all property descriptors from the provided Plain Old JavaScript Objects (aka POJOs) as arguments.
-     * Mixins are applied in the order they are passed, but do not override descriptors already on the class, including those inherited traditionally.
-     */
-    var mixins: (...mixins: any[]) => ClassDecorator;
-    /**
-     * Uses console.time and console.timeEnd to provide function timings with a unique label whose default prefix is ClassName.method. Supply a first argument to override the prefix:
-     */
-    var time: (label: string, console?: Console) => MethodDecorator;
-
-    export {
-        autobind,
-        readonly,
-        override,
-        deprecate,
-        deprecated,
-        debounce,
-        throttle,
-        suppressWarnings,
-        nonenumerable,
-        nonconfigurable,
-        memoize,
-        decorate,
-        lazyInitialize,
-        mixin,
-        mixins,
-        time,
-    };
-}
diff --git a/core-decorators/index.d.ts b/core-decorators/index.d.ts
new file mode 100644
index 0000000000..18fcc95a27
--- /dev/null
+++ b/core-decorators/index.d.ts
@@ -0,0 +1,135 @@
+// Type definitions for core-decorators.js v0.10
+// Project: https://github.com/jayphelps/core-decorators.js
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export interface ClassDecorator {
+    <TFunction extends Function>(target: TFunction): TFunction | void;
+}
+
+export interface ParameterDecorator {
+    (target: Object, propertyKey: string | symbol, parameterIndex: number): void;
+}
+
+export interface PropertyDecorator {
+    (target: Object, propertyKey: string | symbol): void;
+}
+
+export interface MethodDecorator {
+    <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T> | void;
+}
+
+export interface PropertyOrMethodDecorator extends MethodDecorator, PropertyDecorator {
+    (target: Object, propertyKey: string | symbol): void;
+}
+
+export interface Deprecate extends MethodDecorator {
+    (message?: string, option?: DeprecateOption): MethodDecorator;
+}
+
+export interface DeprecateOption {
+    url: string;
+}
+
+export interface ThrottleOptions {
+    /** allows to trigger function on the leading. */
+    leading?: boolean;
+    /** allows to trigger function on the trailing edge of the wait interval. */
+    trailing?: boolean;
+}
+
+export interface Console {
+    log(message?: any, ...optionalParams: any[]): void;
+    time(timerName?: string): void;
+    timeEnd(timerName?: string): void;
+}
+
+/**
+ * Forces invocations of this function to always have this refer to the class instance,
+ * even if the function is passed around or would otherwise lose its this context. e.g. var fn = context.method;
+ */
+declare var autobind: Function;
+/**
+ * Marks a property or method as not being writable.
+ */
+declare var readonly: PropertyOrMethodDecorator;
+/**
+ * Checks that the marked method indeed overrides a function with the same signature somewhere on the prototype chain.
+ */
+declare var override: MethodDecorator;
+/**
+ * Calls console.warn() with a deprecation message. Provide a custom message to override the default one. You can also provide an options hash with a url, for further reading.
+ */
+declare var deprecate: Deprecate;
+/**
+ * Calls console.warn() with a deprecation message. Provide a custom message to override the default one. You can also provide an options hash with a url, for further reading.
+ */
+declare var deprecated: Deprecate;
+/**
+ * Creates a new debounced function which will be invoked after wait milliseconds since the time it was invoked. Default timeout is 300 ms.
+ */
+declare var debounce: (wait: number) => MethodDecorator;
+/**
+ * Creates a new throttled function which will be invoked in every wait milliseconds. Default timeout is 300 ms.
+ */
+declare var throttle: (wait: number, options?: ThrottleOptions) => MethodDecorator;
+/**
+ * Suppresses any JavaScript console.warn() call while the decorated function is called. (i.e. on the stack)
+ */
+declare var suppressWarnings: MethodDecorator;
+/**
+ * Marks a property or method as not being enumerable.
+ */
+declare var nonenumerable: PropertyOrMethodDecorator;
+/**
+ * Marks a property or method as not being writable.
+ */
+declare var nonconfigurable: PropertyOrMethodDecorator;
+/**
+ * Initial implementation included, likely slow. WIP.
+ */
+declare var memoize: MethodDecorator;
+/**
+ * Immediately applies the provided function and arguments to the method, allowing you to wrap methods with arbitrary helpers like those provided by lodash.
+ * The first argument is the function to apply, all further arguments will be passed to that decorating function.
+ */
+declare var decorate: (func: Function, ...args: any[]) => MethodDecorator;
+/**
+ * Prevents a property initializer from running until the decorated property is actually looked up.
+ * Useful to prevent excess allocations that might otherwise not be used, but be careful not to over-optimize things.
+ */
+declare var lazyInitialize: PropertyDecorator;
+/**
+ * Mixes in all property descriptors from the provided Plain Old JavaScript Objects (aka POJOs) as arguments.
+ * Mixins are applied in the order they are passed, but do not override descriptors already on the class, including those inherited traditionally.
+ */
+declare var mixin: (...mixins: any[]) => ClassDecorator;
+/**
+ * Mixes in all property descriptors from the provided Plain Old JavaScript Objects (aka POJOs) as arguments.
+ * Mixins are applied in the order they are passed, but do not override descriptors already on the class, including those inherited traditionally.
+ */
+declare var mixins: (...mixins: any[]) => ClassDecorator;
+/**
+ * Uses console.time and console.timeEnd to provide function timings with a unique label whose default prefix is ClassName.method. Supply a first argument to override the prefix:
+ */
+declare var time: (label: string, console?: Console) => MethodDecorator;
+
+export {
+autobind,
+readonly,
+override,
+deprecate,
+deprecated,
+debounce,
+throttle,
+suppressWarnings,
+nonenumerable,
+nonconfigurable,
+memoize,
+decorate,
+lazyInitialize,
+mixin,
+mixins,
+time,
+};
diff --git a/core-decorators/tsconfig.json b/core-decorators/tsconfig.json
new file mode 100644
index 0000000000..fc85813532
--- /dev/null
+++ b/core-decorators/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "experimentalDecorators": true,
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "core-decorators-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/core-js/core-js-tests.ts b/core-js/core-js-tests.ts
index bc690d434c..e34d8c3ef4 100644
--- a/core-js/core-js-tests.ts
+++ b/core-js/core-js-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="core-js.d.ts" />
+
 
 interface Point { x: number; y: number; }
 interface Point3D extends Point { z: number; }
diff --git a/core-js/core-js-tests.ts.tscparams b/core-js/core-js-tests.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/core-js/core-js-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/core-js/core-js.d.ts.tscparams b/core-js/core-js.d.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/core-js/core-js.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/core-js/core-js.d.ts b/core-js/index.d.ts
similarity index 100%
rename from core-js/core-js.d.ts
rename to core-js/index.d.ts
diff --git a/core-js/tsconfig.json b/core-js/tsconfig.json
new file mode 100644
index 0000000000..8b9e858637
--- /dev/null
+++ b/core-js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es5",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "core-js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cors/cors-tests.ts b/cors/cors-tests.ts
index a3f5ea10e1..186e006726 100644
--- a/cors/cors-tests.ts
+++ b/cors/cors-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="cors.d.ts" />
 
 import express = require('express');
 import cors = require('cors');
diff --git a/cors/cors.d.ts b/cors/cors.d.ts
deleted file mode 100644
index eaf917fb1f..0000000000
--- a/cors/cors.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Type definitions for cors
-// Project: https://github.com/troygoode/node-cors/
-// Definitions by: Mihhail Lapushkin <https://github.com/mihhail-lapushkin/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "cors" {
-    import express = require('express');
-
-    namespace e {
-        interface CorsOptions  {
-            origin?: any;
-            methods?: any;
-            allowedHeaders?: any;
-            exposedHeaders?: any;
-            credentials?: boolean;
-            maxAge?: number;
-        }
-    }
-
-    function e(options?: e.CorsOptions): express.RequestHandler;
-    export = e;
-}
diff --git a/cors/index.d.ts b/cors/index.d.ts
new file mode 100644
index 0000000000..06d8d6d618
--- /dev/null
+++ b/cors/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for cors
+// Project: https://github.com/troygoode/node-cors/
+// Definitions by: Mihhail Lapushkin <https://github.com/mihhail-lapushkin/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+
+import express = require('express');
+
+declare namespace e {
+    interface CorsOptions {
+        origin?: any;
+        methods?: any;
+        allowedHeaders?: any;
+        exposedHeaders?: any;
+        credentials?: boolean;
+        maxAge?: number;
+    }
+}
+
+declare function e(options?: e.CorsOptions): express.RequestHandler;
+export = e;
diff --git a/cors/tsconfig.json b/cors/tsconfig.json
new file mode 100644
index 0000000000..7e012723b3
--- /dev/null
+++ b/cors/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cors-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/couchbase/couchbase-tests.ts b/couchbase/couchbase-tests.ts
index a1a3ee6bba..547133754b 100644
--- a/couchbase/couchbase-tests.ts
+++ b/couchbase/couchbase-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="couchbase.d.ts"/>
-
 import couchbase = require('couchbase');
 var cluster = new couchbase.Cluster('couchbase://127.0.0.1');
 var bucket = cluster.openBucket('default');
diff --git a/couchbase/couchbase.d.ts b/couchbase/couchbase.d.ts
deleted file mode 100644
index 351c9a806d..0000000000
--- a/couchbase/couchbase.d.ts
+++ /dev/null
@@ -1,1129 +0,0 @@
-// Type definitions for Couchbase Node.js SDK 2.1.2
-// Project: https://github.com/couchbase/couchnode
-// Definitions by: Marwan Aouida <https://github.com/maouida>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-
-declare module 'couchbase' {
-
-    import events = require('events');
-
-    /**
-     * Enumeration of all error codes. See libcouchbase documentation for more details on what these errors represent.
-     */
-    enum errors {
-        /** Operation was successful. **/
-        success,
-
-        /** Authentication should continue. **/
-        authContinue,
-
-        /** Error authenticating. **/
-        authError,
-
-        /** The passed incr/decr delta was invalid. **/
-        deltaBadVal,
-
-        /** Object is too large to be stored on the cluster. **/
-        objectTooBig,
-
-        /** Operation was successful. **/
-        serverBusy,
-
-        /** Server is too busy to handle your request right now. **/
-        cLibInternal,
-
-        /** An invalid arguement was passed. **/
-        cLinInvalidArgument,
-
-        /** The server is out of memory. **/
-        cLibOutOfMemory,
-
-        /** An invalid range was specified. **/
-        invalidRange,
-
-        /** An unknown error occured within libcouchbase. **/
-        cLibGenericError,
-
-        /** A temporary error occured. Try again. **/
-        temporaryError,
-
-        /** The key already exists on the server. **/
-        keyAlreadyExists,
-
-        /** The key does not exist on the server. **/
-        keyNotFound,
-
-        /** Failed to open library. **/
-        failedToOpenLibrary,
-
-        /** Failed to find expected symbol in library. **/
-        failedToFindSymbol,
-
-        /** A network error occured. **/
-        networkError,
-
-        /** Operations were performed on the incorrect server. **/
-        wrongServer,
-
-        /** Operations were performed on the incorrect server. **/
-        notMyVBucket,
-
-        /** The document was not stored. **/
-        notSorted,
-
-        /** An unsupported operation was sent to the server. **/
-        notSupported,
-
-        /** An unknown command was sent to the server. **/
-        unknownCommand,
-
-        /** An unknown host was specified. **/
-        unknownHost,
-
-        /** A protocol error occured. **/
-        protocolError,
-
-        /** The operation timed out. **/
-        timedOut,
-
-        /** Error connecting to the server. **/
-        connectError,
-
-        /** The bucket you request was not found. **/
-        bukcketNotFound,
-
-        /** libcouchbase is out of memory. **/
-        clientOutOfMemory,
-
-        /** A temporary error occured in libcouchbase. Try again. **/
-        clientTemporaryError,
-
-        /** A bad handle was passed. **/
-        badHandle,
-
-        /** A server bug caused the operation to fail. **/
-        serverBug,
-
-        /** The host format specified is invalid. **/
-        invalidHostFormat,
-
-        /**  Not enough nodes to meet the operations durability requirements. **/
-        notEnoughNodes,
-
-        /** Duplicate items. **/
-        duplicateItems,
-
-        /** Key mapping failed and could not match a server. **/
-        noMatchingServerForKey,
-
-        /** A bad environment variable was specified. **/
-        badEnvironmentVariable,
-
-        /** Couchnode is out of memory. **/
-        outOfMemory,
-
-        /** Invalid arguements were passed. **/
-        invalidArguments,
-
-        /** An error occured while trying to schedule the operation. **/
-        schedulingError,
-
-        /** Not all operations completed successfully. **/
-        checkResults,
-
-        /** A generic error occured in Couchnode. **/
-        genericError,
-
-        /** The specified durability requirements could not be satisfied. **/
-        durabilityFailed,
-
-        /** An error occured during a RESTful operation. **/
-        restError
-    }
-
-    /**
-     * Represents a singular cluster containing your buckets.
-     */
-    class Cluster {
-        /**
-         * Create a new instance of the Cluster class.
-         * @param cnstr The connection string for your cluster.
-         * @param options The options object.
-         */
-        constructor(cnstr?: string, options?: ClusterConstructorOptions);
-
-        /**
-         * Creates a manager allowing the management of a Couchbase cluster.
-         */
-        manager(): ClusterManager;
-
-        /**
-         * Open a bucket to perform operations. This will begin the handshake process immediately and operations will complete later. Subscribe to the connect event to be alerted when the connection is ready, though be aware operations can be successfully queued before this.
-         * @param name The name of the bucket to open.
-         */
-        openBucket(name?: string): Bucket;
-
-
-        /**
-         * Open a bucket to perform operations. This will begin the handshake process immediately and operations will complete later. Subscribe to the connect event to be alerted when the connection is ready, though be aware operations can be successfully queued before this.
-         * @param name The name of the bucket to open.
-         * @param password Password for the bucket.
-         */
-        openBucket(name?: string, password?: string): Bucket;
-
-        /**
-         * Open a bucket to perform operations. This will begin the handshake process immediately and operations will complete later. Subscribe to the connect event to be alerted when the connection is ready, though be aware operations can be successfully queued before this.
-         * @param name The name of the bucket to open.
-         * @param callback Callback to invoke on connection success or failure.
-         */
-        openBucket(name?: string, callback?: Function): Bucket;
-
-        /**
-         * Open a bucket to perform operations. This will begin the handshake process immediately and operations will complete later. Subscribe to the connect event to be alerted when the connection is ready, though be aware operations can be successfully queued before this.
-         * @param name The name of the bucket to open.
-         * @param password Password for the bucket.
-         * @param callback Callback to invoke on connection success or failure.
-         */
-        openBucket(name?: string, password?: string, callback?: Function): Bucket;
-    }
-
-    interface ClusterConstructorOptions {
-        /**
-         * The path to the certificate to use for SSL connections
-         */
-        certpath: string;
-    }
-
-    interface CreateBucketOptions {
-        /**
-         * The bucket name
-         */
-        name?: string;
-        authType?: string,
-        bucketType?: string;
-        ramQuotaMB?: number;
-        replicaNumber?: number;
-    }
-
-    /**
-     * Class for performing management operations against a cluster.
-     */
-    interface ClusterManager {
-        /**
-         *
-         * @param name
-         * @param callback
-         */
-        createBucket(name: string, callback: Function): void;
-
-        /**
-         *
-         * @param name
-         * @param opts
-         * @param callback
-         */
-        createBucket(name: string, opts: any, callback: Function): void;
-
-        /**
-         *
-         * @param callback
-         */
-        listBuckets(callback: Function): void;
-
-        /**
-         *
-         * @param name
-         * @param callback
-         */
-        removeBucket(name: string, callback: Function): void;
-    }
-
-    /**
-     * The virtual class thrown for all Couchnode errors.
-     */
-    interface CouchbaseError extends Error {
-        /**
-         * The error code for this error.
-         */
-        code: errors;
-    }
-
-    interface AppendOptions {
-        /**
-         * The CAS value to check. If the item on the server contains a different CAS value, the operation will fail. Note that if this option is undefined, no comparison will be performed.
-         */
-        cas?: Bucket.CAS;
-
-        /**
-         * Ensures this operation is persisted to this many nodes.
-         */
-        persist_to?: number;
-
-        /**
-         * 	Ensures this operation is replicated to this many nodes.
-         */
-        replicate_to?: number;
-    }
-
-    interface PrependOptions extends AppendOptions { }
-
-    interface RemoveOptions extends AppendOptions { }
-
-    interface ReplaceOptions extends AppendOptions {
-        /**
-         * Set the initial expiration time for the document. A value of 0 represents never expiring.
-         */
-        expiry?: number;
-    }
-
-    interface UpsertOptions extends ReplaceOptions { }
-
-    interface TouchOptions {
-        /**
-         * 	Ensures this operation is persisted to this many nodes.
-         */
-        persist_to?: number;
-
-        /**
-         * Ensures this operation is replicated to this many nodes.
-         */
-        replicate_to?: number;
-    }
-
-    interface CounterOptions {
-        /**
-         * Sets the initial value for the document if it does not exist. Specifying a value of undefined will cause the operation to fail if the document does not exist, otherwise this value must be equal to or greater than 0.
-         */
-        initial?: number;
-
-        /**
-         * Set the initial expiration time for the document. A value of 0 represents never expiring.
-         */
-        expiry?: number;
-
-        /**
-         * Ensures this operation is persisted to this many nodes
-         */
-        persist_to?: number;
-
-        /**
-         * Ensures this operation is replicated to this many nodes
-         */
-        replicate_to?: number;
-    }
-
-    interface GetAndLockOptions {
-        lockTime?: number;
-    }
-
-    interface GetReplicaOptions {
-
-        /**
-         * The index for which replica you wish to retrieve this value from, or if undefined, use the value from the first server that replies.
-         */
-        index?: number;
-    }
-
-    interface InsertOptions {
-
-        /**
-         * Set the initial expiration time for the document. A value of 0 represents never expiring.
-         */
-        expiry?: number;
-
-        /**
-         * Ensures this operation is persisted to this many nodes.
-         */
-        persist_to?: number;
-
-        /**
-         * 	Ensures this operation is replicated to this many nodes.
-         */
-        replicate_to?: number;
-    }
-
-    /**
-     * A class for performing management operations against a bucket. This class should not be instantiated directly, but instead through the use of the Bucket#manager method instead.
-     */
-    interface BucketManager {
-
-        /**
-         * Flushes the cluster, deleting all data stored within this bucket. Note that this method requires the Flush permission to be enabled on the bucket from the management console before it will work.
-         * @param callback The callback function.
-         */
-        flush(callback: Function): void;
-
-        /**
-         * Retrieves a specific design document from this bucket.
-         * @param name
-         * @param callback The callback function.
-         */
-        getDesignDocument(name: string, callback: Function): void;
-
-        /**
-         * Retrieves a list of all design documents registered to a bucket.
-         * @param callback The callback function.
-         */
-        getDesignDocuments(callback: Function): void;
-
-        /**
-         * Registers a design document to this bucket, failing if it already exists.
-         * @param name
-         * @param data
-         * @param callback The callback function.
-         * @returns {}
-         */
-        insertDesignDocument(name: string, data: any, callback: Function): void;
-
-        /**
-         * Unregisters a design document from this bucket.
-         * @param name
-         * @param callback The callback function.
-         * @returns {}
-         */
-        removeDesignDocument(name: string, callback: Function): void;
-
-        /**
-         * Registers a design document to this bucket, overwriting any existing design document that was previously registered.
-         * @param name
-         * @param data
-         * @param callback The callback function.
-         * @returns {}
-         */
-        upsertDesignDocument(name: string, data: any, callback: Function): void;
-    }
-
-    /**
-     * Class for dynamically construction of view queries. This class should never be constructed directly, instead you should use ViewQuery.from to construct this object.
-     */
-    class ViewQuery {
-        /**
-         * Instantiates a ViewQuery object for the specified design document and view name.
-         * @param ddoc The design document to use.
-         * @param name The view to use.
-         */
-        static from(ddoc: string, name: string): ViewQuery;
-
-        /**
-         * Specifies the design document and view name to use for this query.
-         * @param ddoc The design document to use.
-         * @param name The view to use.
-         */
-        from(ddoc: string, name: string): ViewQuery;
-
-        /**
-         * Allows you to specify custom view options that may not be available though the fluent interface defined by this class.
-         * @param opts
-         */
-        custom(opts: any): ViewQuery;
-
-        /**
-         * Flag to request a view request accross all nodes in the case of a development view.
-         * @param full_set
-         */
-        full_set(full_set: boolean): ViewQuery;
-
-        /**
-         * Specifies whether to preform grouping during view execution.
-         * @param group
-         */
-        group(group: boolean): ViewQuery;
-
-        /**
-         * Specifies the level at which to perform view grouping.
-         * @param group_level
-         */
-        group_level(group_level: number): ViewQuery;
-
-        /**
-         * Specifies a range of document id's to retrieve from the index.
-         * @param start
-         * @param end
-         */
-        id_range(start: any, end: any): ViewQuery;
-
-        /**
-         * Flag to request a view request include the full document value.
-         * @param include_docs
-         */
-        include_docs(include_docs: boolean): ViewQuery;
-
-        /**
-         * Specifies a specified key to retrieve from the index.
-         * @param key
-         */
-        key(key: any): ViewQuery;
-
-        /**
-         * Specifies a list of keys you wish to retrieve from the index.
-         * @param keys
-         */
-        keys(key: any[]): ViewQuery;
-
-        /**
-         * Specifies the maximum number of results to return.
-         * @param limit
-         */
-        limit(limit: number): ViewQuery;
-
-        /**
-         * Sets the error handling mode for this query.
-         * @param mode
-         */
-        on_error(mode: ViewQuery.ErrorMode): ViewQuery;
-
-        /**
-         * Specifies the desired ordering for the results.
-         * @param order
-         */
-        order(order: ViewQuery.Order): ViewQuery;
-
-        /**
-         * Specifies a range of keys to retrieve from the index. You may specify both a start and an end point and additionally specify whether or not the end value is inclusive or exclusive.
-         * @param start
-         * @param end
-         * @param inclusive_end
-         */
-        range(start: any | any[], end: any | any[], inclusive_end?: boolean): ViewQuery;
-
-        /**
-         * Specifies whether to execute the map-reduce reduce step.
-         * @param reduce
-         */
-        reduce(reduce: boolean): ViewQuery;
-
-        /**
-         * Specifies how many results to skip from the beginning of the result set.
-         * @param skip
-         */
-        skip(skip: number): ViewQuery;
-
-        /**
-         * Specifies how this query will affect view indexing, both before and after the query is executed.
-         * @param stale
-         */
-        stale(stale: ViewQuery.Update): ViewQuery;
-    }
-
-    namespace ViewQuery {
-        /**
-         * Enumeration for specifying on_error behaviour.
-         */
-        enum ErrorMode {
-            /**
-             * Continues querying when an error occurs.
-             */
-            CONTINUE,
-
-            /**
-             * Stops and errors query when an error occurs.
-             */
-            STOP
-        }
-
-        /**
-         * Enumeration for specifying view result ordering.
-         */
-        enum Order {
-            /**
-             * Orders with lower values first and higher values last.
-             */
-            ASCENDING,
-
-            /**
-             * Orders with higher values first and lower values last.
-             */
-            DESCENDING
-        }
-
-        /**
-         * Enumeration for specifying view update semantics.
-         */
-        enum Update {
-            /**
-             * Causes the view to be fully indexed before results are retrieved.
-             */
-            BEFORE,
-
-            /**
-             * Allows the index to stay in whatever state it is already in prior retrieval of the query results.
-             */
-            NONE,
-
-            /**
-             * Forces the view to be indexed after the results of this query has been fetched.
-             */
-            AFTER
-        }
-    }
-
-    /**
-     * Class for dynamically construction of N1QL queries. This class should never be constructed directly, instead you should use the N1qlQuery.fromString static method to instantiate a N1qlStringQuery.
-     */
-    class N1qlQuery {
-        /**
-         * Creates a query object directly from the passed query string.
-         * @param str
-         */
-        static fromString(str: string): N1qlStringQuery;
-
-        /**
-         * Returns the fully prepared string representation of this query.
-         */
-        toString(): string;
-    }
-
-    namespace N1qlQuery {
-        /**
-         * Enumeration for specifying N1QL consistency semantics.
-         */
-        enum Consistency {
-            /**
-             * 	This is the default (for single-statement requests).
-             */
-            NOT_BOUND,
-
-            /**
-             * This implements strong consistency per request.
-             */
-            REQUEST_PLUS,
-
-            /**
-             * This implements strong consistency per statement.
-             */
-            STATEMENT_PLUS
-        }
-    }
-
-    /**
-     * Class for holding a explicitly defined N1QL query string.
-     */
-    class N1qlStringQuery extends N1qlQuery {
-        /**
-         * Specifies whether this query is adhoc or should be prepared.
-         * @param adhoc
-         */
-        adhoc(adhoc: boolean): N1qlStringQuery;
-
-        /**
-         * Specify the consistency level for this query.
-         * @param val
-         */
-        consistency(val: N1qlQuery.Consistency): N1qlStringQuery;
-
-        /**
-         * Returns the fully prepared object representation of this query.
-         */
-        toObject(): any;
-
-        /**
-         * Returns the fully prepared string representation of this query.
-         */
-        toString(): string;
-    }
-
-    /**
-     * Class for dynamically construction of spatial queries. This class should never be constructed directly, instead you should use SpatialQuery.from to construct this object.
-     */
-    class SpatialQuery {
-        /**
-         * Instantiates a SpatialQuery object for the specified design document and view name.
-         * @param ddoc The design document to use.
-         * @param name 	The view to use.
-         */
-        static from(ddoc: string, name: string): SpatialQuery;
-
-        /**
-         * Specifies the design document and view name to use for this query.
-         * @param ddoc
-         * @param name
-         */
-        from(ddoc: string, name: string): SpatialQuery;
-
-        /**
-         * Specifies a bounding box to query the index for. This value must be an array of exactly 4 numbers which represents the left, top, right and bottom edges of the bounding box (in that order).
-         * @param bbox
-         */
-        bbox(bbox: number[]): SpatialQuery;
-
-        /**
-         * Allows you to specify custom view options that may not be available though the fluent interface defined by this class.
-         * @param opts
-         */
-        custom(opts: any): SpatialQuery;
-
-        /**
-         * Specifies the maximum number of results to return.
-         * @param limit
-         */
-        limit(limit: number): SpatialQuery;
-
-        /**
-         * Specifies how many results to skip from the beginning of the result set.
-         * @param skip
-         */
-        skip(skip: number): SpatialQuery;
-
-        /**
-         * Specifies how this query will affect view indexing, both before and after the query is executed.
-         * @param stale
-         */
-        stale(stale: SpatialQuery.Update): SpatialQuery;
-    }
-
-    namespace SpatialQuery {
-        /**
-         * Enumeration for specifying view update semantics.
-         */
-        enum Update {
-            /**
-             * Causes the view to be fully indexed before results are retrieved.
-             */
-            BEFORE,
-
-            /**
-             * Allows the index to stay in whatever state it is already in prior retrieval of the query results.
-             */
-            NONE,
-
-            /**
-             * 	Forces the view to be indexed after the results of this query has been fetched.
-             */
-            AFTER
-        }
-    }
-
-    /**
-     * The Bucket class represents a connection to a Couchbase bucket. Never instantiate this class directly. Instead use the Cluster#openBucket method instead.
-     */
-    interface Bucket {
-        /**
-         * Returns the version of the Node.js library as a string.
-         */
-        clientVersion: string;
-
-        /**
-         * Gets or sets the config throttling in milliseconds. The config throttling is the time that Bucket will wait before forcing a configuration refresh. If no refresh occurs before this period while a configuration is marked invalid, an update will be triggered.
-         */
-        configThrottle: number;
-
-        /**
-         * Sets or gets the connection timeout in milliseconds. This is the timeout value used when connecting to the configuration port during the initial connection (in this case, use this as a key in the 'options' parameter in the constructor) and/or when Bucket attempts to reconnect in-situ (if the current connection has failed).
-         */
-        connectionTimeout: number;
-
-        /**
-         * Gets or sets the durability interval in milliseconds. The durability interval is the time that Bucket will wait between requesting new durability information during a durability poll.
-         */
-        durabilityInterval: number;
-
-        /**
-         * Gets or sets the durability timeout in milliseconds. The durability timeout is the time that Bucket will wait for a response from the server in regards to a durability request. If there are no responses received within this time frame, the request fails with an error.
-         */
-        durabilityTimeout: number;
-
-        /**
-         * Returns the libcouchbase version as a string. This information will usually be in the format of 2.4.0-fffffff representing the major, minor, patch and git-commit that the built libcouchbase is based upon.
-         */
-        lcbVersion: string;
-
-        /**
-         * Gets or sets the management timeout in milliseconds. The management timeout is the time that Bucket will wait for a response from the server for a management request. If the response is not received within this time frame, the request is failed out with an error.
-         */
-        managementTimeout: number;
-
-        /**
-         * Sets or gets the node connection timeout in msecs. This value is similar to Bucket#connectionTimeout, but defines the time to wait for a particular node to respond before trying the next one.
-         */
-        nodeConnectionTimeout: number;
-
-        /**
-         * Gets or sets the operation timeout in milliseconds. The operation timeout is the time that Bucket will wait for a response from the server for a CRUD operation. If the response is not received within this time frame, the operation is failed with an error.
-         */
-        operationTimeout: number;
-
-        /**
-         * Gets or sets the view timeout in milliseconds. The view timeout is the time that Bucket will wait for a response from the server for a view request. If the response is not received within this time frame, the request fails with an error.
-         */
-        viewTimeout: number;
-
-        /**
-         * Similar to Bucket#upsert, but instead of setting a new key, it appends data to the existing key. Note that this function only makes sense when the stored data is a string; 'appending' to a JSON document may result in parse errors when the document is later retrieved.
-         * @param key The target document key.
-         * @param fragment The document's contents to append.
-         * @param callback The callback function.
-         */
-        append(key: any | Buffer, fragment: any, callback: Bucket.OpCallback): void;
-
-        /**
-         *
-         * @param key The target document key.
-         * @param fragment The document's contents to append.
-         * @param options The options object.
-         * @param callback The callback function.
-         */
-        append(key: any | Buffer, fragment: any, options: AppendOptions, callback: Bucket.OpCallback): void;
-
-        /**
-         * Increments or decrements a key's numeric value.
-         * Note that JavaScript does not support 64-bit integers (while libcouchbase and the server do). You might receive an inaccurate value if the number is greater than 53-bits (JavaScript's maximum integer precision).
-         * @param key The target document key.
-         * @param delta The amount to add or subtract from the counter value. This value may be any non-zero integer.
-         * @param callback The callback function.
-         */
-        counter(key: any | Buffer, delta: number, callback: Bucket.OpCallback): void;
-
-        /**
-         *
-         * @param key The target document key.
-         * @param delta The amount to add or subtract from the counter value. This value may be any non-zero integer.
-         * @param options The options object.
-         * @param callback The callback function.
-         */
-        counter(key: any | Buffer, delta: number, options: CounterOptions, callback: Bucket.OpCallback): void;
-
-        /**
-         * Shuts down this connection.
-         */
-        disconnect(): void;
-
-        /**
-         * Enables N1QL support on the client. A cbq-server URI must be passed. This method will be deprecated in the future in favor of automatic configuration through the connected cluster.
-         * @param hosts An array of host/port combinations which are N1QL servers attached to this cluster.
-         */
-        enableN1ql(hosts: string | string[]): void;
-
-        /**
-         * Retrieves a document.
-         * @param key The target document key.
-         * @param callback The callback function.
-         */
-        get(key: any | Buffer, callback: Bucket.OpCallback): void;
-
-        /**
-         * @param key The target document key.
-         * @param options The options object.
-         * @param callback The callback function.
-         */
-        get(key: any | Buffer, options: any, callback: Bucket.OpCallback): void;
-
-        /**
-         * Lock the document on the server and retrieve it. When an document is locked, its CAS changes and subsequent operations on the document (without providing the current CAS) will fail until the lock is no longer held.
-         * This function behaves identically to Bucket#get in that it will return the value. It differs in that the document is also locked. This ensures that attempts by other client instances to access this document while the lock is held will fail.
-         * Once locked, a document can be unlocked either by explicitly calling Bucket#unlock or by performing a storage operation (e.g. Bucket#upsert, Bucket#replace, Bucket::append) with the current CAS value. Note that any other lock operations on this key will fail while a document is locked.
-         * @param key The target document key.
-         * @param callback The callback function.
-         */
-        getAndLock(key: any, callback: Bucket.OpCallback): void;
-
-        /**
-         * Lock the document on the server and retrieve it. When an document is locked, its CAS changes and subsequent operations on the document (without providing the current CAS) will fail until the lock is no longer held.
-         * This function behaves identically to Bucket#get in that it will return the value. It differs in that the document is also locked. This ensures that attempts by other client instances to access this document while the lock is held will fail.
-         * Once locked, a document can be unlocked either by explicitly calling Bucket#unlock or by performing a storage operation (e.g. Bucket#upsert, Bucket#replace, Bucket::append) with the current CAS value. Note that any other lock operations on this key will fail while a document is locked.
-         * @param key The target document key.
-         * @param options The options object.
-         * @param callback The callback function.
-         * @returns {}
-         */
-        getAndLock(key: any, options: GetAndLockOptions, callback: Bucket.OpCallback): void;
-
-        /**
-         * Retrieves a document and updates the expiry of the item at the same time.
-         * @param key The target document key.
-         * @param expiry The expiration time to use. If a value of 0 is provided, then the current expiration time is cleared and the key is set to never expire. Otherwise, the key is updated to expire in the time provided (in seconds).
-         * @param options The options object.
-         * @param callback The callback function.
-         */
-        getAndTouch(key: any | Buffer, expiry: number, options: any, callback: Bucket.OpCallback): void;
-
-        /**
-         * Retrieves a document and updates the expiry of the item at the same time.
-         * @param key The target document key.
-         * @param expiry The expiration time to use. If a value of 0 is provided, then the current expiration time is cleared and the key is set to never expire. Otherwise, the key is updated to expire in the time provided (in seconds).
-         * @param callback The callback function.
-         */
-        getAndTouch(key: any | Buffer, expiry: number, callback: Bucket.OpCallback): void;
-
-        /**
-         * Retrieves a list of keys
-         * @param keys The target document keys.
-         * @param callback The callback function.
-         */
-        getMulti(key: any[] | Buffer[], callback: Bucket.MultiGetCallback): void;
-
-        /**
-         * Get a document from a replica server in your cluster.
-         * @param key The target document key.
-         * @param callback The callback function.
-         */
-        getReplica(key: any | Buffer, callback: Bucket.OpCallback): void;
-
-        /**
-        * Get a document from a replica server in your cluster.
-        * @param key The target document key.
-        * @param options The options object.
-        * @param callback The callback function.
-        */
-        getReplica(key: any | Buffer, options: GetReplicaOptions, callback: Bucket.OpCallback): void;
-
-        /**
-         * Identical to Bucket#upsert but will fail if the document already exists.
-         * @param key The target document key.
-         * @param value The document's contents.
-         * @param callback The callback function.
-         */
-        insert(key: any | Buffer, value: any, callback: Bucket.OpCallback): void;
-
-        /**
-         * Identical to Bucket#upsert but will fail if the document already exists.
-         * @param key The target document key.
-         * @param value The document's contents.
-         * @param options The options object.
-         * @param callback The callback function.
-         */
-        insert(key: any | Buffer, value: any, options: InsertOptions, callback: Bucket.OpCallback): void;
-
-        /**
-         * Returns an instance of a BuckerManager for performing management operations against a bucket.
-         */
-        manager(): BucketManager;
-
-        /**
-         * Like Bucket#append, but prepends data to the existing value.
-         * @param key The target document key.
-         * @param fragment The document's contents to prepend.
-         * @param callback The callback function.
-         */
-        prepend(key: any, fragment: any, callback: Bucket.OpCallback): void;
-
-        /**
-         * Like Bucket#append, but prepends data to the existing value.
-         * @param key The target document key.
-         * @param fragment The document's contents to prepend.
-         * @param options The options object.
-         * @param callback The callback function.
-         */
-        prepend(key: any, fragment: any, options: PrependOptions, callback: Bucket.OpCallback): void;
-
-        /**
-         * Executes a previously prepared query object. This could be a ViewQuery or a N1qlQuery.
-         * Note: N1qlQuery queries are currently an uncommitted interface and may be subject to change in 2.0.0's final release.
-         * @param query The query to execute.
-         * @param callback The callback function.
-         */
-        query(query: ViewQuery | N1qlQuery, callback: Bucket.QueryCallback): Bucket.ViewQueryResponse | Bucket.N1qlQueryResponse;
-
-        /**
-         * Executes a previously prepared query object. This could be a ViewQuery or a N1qlQuery.
-         * Note: N1qlQuery queries are currently an uncommitted interface and may be subject to change in 2.0.0's final release.
-         * @param query The query to execute.
-         * @param params A list or map to do replacements on a N1QL query.
-         * @param callback The callback function.
-         */
-        query(query: ViewQuery | N1qlQuery, params: Object | Array<any>, callback: Bucket.QueryCallback): Bucket.ViewQueryResponse | Bucket.N1qlQueryResponse;
-
-        /**
-         * Deletes a document on the server.
-         * @param key The target document key.
-         * @param callback The callback function.
-         */
-        remove(key: any | Buffer, callback: Bucket.OpCallback): void;
-
-        /**
-         * Deletes a document on the server.
-         * @param key The target document key.
-         * @param options The options object.
-         * @param callback The callback function.
-         */
-        remove(key: any | Buffer, options: RemoveOptions, callback: Bucket.OpCallback): void;
-
-        /**
-         * Identical to Bucket#upsert, but will only succeed if the document exists already (i.e. the inverse of Bucket#insert).
-         * @param key The target document key.
-         * @param value The document's contents.
-         * @param callback The callback function.
-         */
-        replace(key: any | Buffer, value: any, callback: Bucket.OpCallback): void;
-
-        /**
-         * Identical to Bucket#upsert, but will only succeed if the document exists already (i.e. the inverse of Bucket#insert).
-         * @param key The target document key.
-         * @param value The document's contents.
-         * @param options The options object.
-         * @param callback The callback function.
-         */
-        replace(key: any | Buffer, value: any, options: ReplaceOptions, callback: Bucket.OpCallback): void;
-
-        /**
-         * Configures a custom set of transcoder functions for encoding and decoding values that are being stored or retreived from the server.
-         * @param encoder The function for encoding.
-         * @param decoder The function for decoding.
-         */
-        setTranscoder(encoder: Bucket.EncoderFunction, decoder: Bucket.DecoderFunction): void;
-
-        /**
-         * Update the document expiration time.
-         * @param key The target document key.
-         * @param expiry The expiration time to use. If a value of 0 is provided, then the current expiration time is cleared and the key is set to never expire. Otherwise, the key is updated to expire in the time provided (in seconds). Values larger than 302460*60 seconds (30 days) are interpreted as absolute times (from the epoch).
-         * @param options The options object.
-         * @param callback The callback function.
-         */
-        touch(key: any | Buffer, expiry: number, options: TouchOptions, callback: Bucket.OpCallback): void;
-
-        /**
-         * Unlock a previously locked document on the server. See the Bucket#lock method for more details on locking.
-         * @param key The target document key.
-         * @param cas The CAS value returned when the key was locked. This operation will fail if the CAS value provided does not match that which was the result of the original lock operation.
-         * @param callback The callback function.
-         */
-        unlock(key: any | Buffer, cas: Bucket.CAS, callback: Bucket.OpCallback): void;
-
-        /**
-         * Unlock a previously locked document on the server. See the Bucket#lock method for more details on locking.
-         * @param key The target document key.
-         * @param cas The CAS value returned when the key was locked. This operation will fail if the CAS value provided does not match that which was the result of the original lock operation.
-         * @param options The options object.
-         * @param callback The callback function.
-         */
-        unlock(key: any | Buffer, cas: Bucket.CAS, options: any, callback: Bucket.OpCallback): void;
-
-        /**
-         * Stores a document to the bucket.
-         * @param key The target document key.
-         * @param value The document's contents.
-         * @param callback The callback function.
-         */
-        upsert(key: any | Buffer, value: any, callback: Bucket.OpCallback): void;
-
-        /**
-         * Stores a document to the bucket.
-         * @param key The target document key.
-         * @param value The document's contents.
-         * @param options The options object.
-         * @param callback The callback function.
-         */
-        upsert(key: any | Buffer, value: any, options: UpsertOptions, callback: Bucket.OpCallback): void;
-    }
-
-    namespace Bucket {
-
-        /**
-         * his is used as a callback from executed queries. It is a shortcut method that automatically subscribes to the rows and error events of the Bucket.ViewQueryResponse.
-         */
-        interface QueryCallback {
-            /**
-             * @param error The error for the operation. This can either be an Error object or a falsy value.
-             * @param rows The rows returned from the query.
-             * @param meta The metadata returned by the query.
-             */
-            (error: CouchbaseError, rows: any[], meta: Bucket.ViewQueryResponse.Meta): void;
-        }
-
-        /**
-         * Single-Key callbacks.
-         * This callback is passed to all of the single key functions.
-         * It returns a result objcet containing a combination of a CAS and a value, depending on which operation was invoked.
-         */
-        interface OpCallback {
-            /**
-             * @param error The error for the operation. This can either be an Error object or a value which evaluates to false (null, undefined, 0 or false).
-             * @param result The result of the operation that was executed. This usually contains at least a cas property, and on some operations will contain a value property as well.
-             */
-            (error: CouchbaseError | number, result: any): void;
-        }
-
-        /**
-         * Multi-Get Callback.
-         * This callback is used to return results from a getMulti operation.
-         */
-        interface MultiGetCallback {
-            /**
-             * @param error The number of keys that failed to be retrieved. The precise errors are available by checking the error property of the individual documents.
-             * @param results This is a map of keys to results. The result for each key will optionally contain an error if one occured, or if no error occured will contain the CAS and value of the document.
-             */
-            (error: number, results: any[]): void;
-        }
-
-        /**
-         * Transcoder Encoding Function.
-         * This function will receive a value when a storage operation is invoked that needs to encode user-provided data for storage into Couchbase. It expects to be returned a Buffer object to store along with an integer representing any flag metadata relating to how to decode the key later using the matching DecoderFunction.
-         */
-        interface EncoderFunction {
-            /**
-             * Transcoder Encoding Function.
-             * This function will receive a value when a storage operation is invoked that needs to encode user-provided data for storage into Couchbase. It expects to be returned a Buffer object to store along with an integer representing any flag metadata relating to how to decode the key later using the matching DecoderFunction.
-             * @param value The value needing encoding.
-             */
-            (value: any): Bucket.TranscoderDoc;
-        }
-
-        /**
-         * Transcoder Decoding Function.
-         * This function will receive an object containing a Buffer value and an integer value representing any flags metadata whenever a retrieval operation is executed. It is expected that this function will return a value representing the original value stored and encoded with its matching EncoderFunction.
-         */
-        interface DecoderFunction {
-            /**
-             *
-             * @param doc The data from Couchbase to decode.
-             */
-            (doc: Bucket.TranscoderDoc): any
-        }
-
-        /**
-         * The CAS value is a special object that indicates the current state of the item on the server. Each time an object is mutated on the server, the value is changed. CAS objects can be used in conjunction with mutation operations to ensure that the value on the server matches the local value retrieved by the client. This is useful when doing document updates on the server as you can ensure no changes were applied by other clients while you were in the process of mutating the document locally.
-         * In the Node.js SDK, the CAS is represented as an opaque value. As such,y ou cannot generate CAS objects, but should rather use the values returned from a Bucket.OpCallback.
-         */
-        interface CAS {
-
-        }
-
-        /**
-         * An event emitter allowing you to bind to various query result set events.
-         */
-        interface N1qlQueryResponse extends events.EventEmitter {
-
-        }
-
-        namespace N1qlQueryResponse {
-            /**
-             * The meta-information available from a view query response.
-             */
-            interface Meta {
-                /**
-                 * The identifier for this query request.
-                 */
-                requestID: number;
-            }
-        }
-
-        /**
-         * A class used in relation to transcoders.
-         */
-        class TranscoderDoc {
-            value: Buffer;
-            flags: number;
-        }
-
-        /**
-         * An event emitter allowing you to bind to various query result set events.
-         */
-        interface ViewQueryResponse extends events.EventEmitter {
-
-        }
-
-        namespace ViewQueryResponse {
-            /**
-             * The meta-information available from a view query response.
-             */
-            interface Meta {
-                /**
-                 * The total number of rows available in the index of the view that was queried.
-                 */
-                total_rows: number;
-            }
-        }
-    }
-}
diff --git a/couchbase/index.d.ts b/couchbase/index.d.ts
new file mode 100644
index 0000000000..4121455dd2
--- /dev/null
+++ b/couchbase/index.d.ts
@@ -0,0 +1,1128 @@
+// Type definitions for Couchbase Node.js SDK 2.1.2
+// Project: https://github.com/couchbase/couchnode
+// Definitions by: Marwan Aouida <https://github.com/maouida>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+
+
+import events = require('events');
+
+/**
+ * Enumeration of all error codes. See libcouchbase documentation for more details on what these errors represent.
+ */
+declare enum errors {
+    /** Operation was successful. **/
+    success,
+
+    /** Authentication should continue. **/
+    authContinue,
+
+    /** Error authenticating. **/
+    authError,
+
+    /** The passed incr/decr delta was invalid. **/
+    deltaBadVal,
+
+    /** Object is too large to be stored on the cluster. **/
+    objectTooBig,
+
+    /** Operation was successful. **/
+    serverBusy,
+
+    /** Server is too busy to handle your request right now. **/
+    cLibInternal,
+
+    /** An invalid arguement was passed. **/
+    cLinInvalidArgument,
+
+    /** The server is out of memory. **/
+    cLibOutOfMemory,
+
+    /** An invalid range was specified. **/
+    invalidRange,
+
+    /** An unknown error occured within libcouchbase. **/
+    cLibGenericError,
+
+    /** A temporary error occured. Try again. **/
+    temporaryError,
+
+    /** The key already exists on the server. **/
+    keyAlreadyExists,
+
+    /** The key does not exist on the server. **/
+    keyNotFound,
+
+    /** Failed to open library. **/
+    failedToOpenLibrary,
+
+    /** Failed to find expected symbol in library. **/
+    failedToFindSymbol,
+
+    /** A network error occured. **/
+    networkError,
+
+    /** Operations were performed on the incorrect server. **/
+    wrongServer,
+
+    /** Operations were performed on the incorrect server. **/
+    notMyVBucket,
+
+    /** The document was not stored. **/
+    notSorted,
+
+    /** An unsupported operation was sent to the server. **/
+    notSupported,
+
+    /** An unknown command was sent to the server. **/
+    unknownCommand,
+
+    /** An unknown host was specified. **/
+    unknownHost,
+
+    /** A protocol error occured. **/
+    protocolError,
+
+    /** The operation timed out. **/
+    timedOut,
+
+    /** Error connecting to the server. **/
+    connectError,
+
+    /** The bucket you request was not found. **/
+    bukcketNotFound,
+
+    /** libcouchbase is out of memory. **/
+    clientOutOfMemory,
+
+    /** A temporary error occured in libcouchbase. Try again. **/
+    clientTemporaryError,
+
+    /** A bad handle was passed. **/
+    badHandle,
+
+    /** A server bug caused the operation to fail. **/
+    serverBug,
+
+    /** The host format specified is invalid. **/
+    invalidHostFormat,
+
+    /**  Not enough nodes to meet the operations durability requirements. **/
+    notEnoughNodes,
+
+    /** Duplicate items. **/
+    duplicateItems,
+
+    /** Key mapping failed and could not match a server. **/
+    noMatchingServerForKey,
+
+    /** A bad environment variable was specified. **/
+    badEnvironmentVariable,
+
+    /** Couchnode is out of memory. **/
+    outOfMemory,
+
+    /** Invalid arguements were passed. **/
+    invalidArguments,
+
+    /** An error occured while trying to schedule the operation. **/
+    schedulingError,
+
+    /** Not all operations completed successfully. **/
+    checkResults,
+
+    /** A generic error occured in Couchnode. **/
+    genericError,
+
+    /** The specified durability requirements could not be satisfied. **/
+    durabilityFailed,
+
+    /** An error occured during a RESTful operation. **/
+    restError
+}
+
+/**
+ * Represents a singular cluster containing your buckets.
+ */
+declare class Cluster {
+    /**
+     * Create a new instance of the Cluster class.
+     * @param cnstr The connection string for your cluster.
+     * @param options The options object.
+     */
+    constructor(cnstr?: string, options?: ClusterConstructorOptions);
+
+    /**
+     * Creates a manager allowing the management of a Couchbase cluster.
+     */
+    manager(): ClusterManager;
+
+    /**
+     * Open a bucket to perform operations. This will begin the handshake process immediately and operations will complete later. Subscribe to the connect event to be alerted when the connection is ready, though be aware operations can be successfully queued before this.
+     * @param name The name of the bucket to open.
+     */
+    openBucket(name?: string): Bucket;
+
+
+    /**
+     * Open a bucket to perform operations. This will begin the handshake process immediately and operations will complete later. Subscribe to the connect event to be alerted when the connection is ready, though be aware operations can be successfully queued before this.
+     * @param name The name of the bucket to open.
+     * @param password Password for the bucket.
+     */
+    openBucket(name?: string, password?: string): Bucket;
+
+    /**
+     * Open a bucket to perform operations. This will begin the handshake process immediately and operations will complete later. Subscribe to the connect event to be alerted when the connection is ready, though be aware operations can be successfully queued before this.
+     * @param name The name of the bucket to open.
+     * @param callback Callback to invoke on connection success or failure.
+     */
+    openBucket(name?: string, callback?: Function): Bucket;
+
+    /**
+     * Open a bucket to perform operations. This will begin the handshake process immediately and operations will complete later. Subscribe to the connect event to be alerted when the connection is ready, though be aware operations can be successfully queued before this.
+     * @param name The name of the bucket to open.
+     * @param password Password for the bucket.
+     * @param callback Callback to invoke on connection success or failure.
+     */
+    openBucket(name?: string, password?: string, callback?: Function): Bucket;
+}
+
+interface ClusterConstructorOptions {
+    /**
+     * The path to the certificate to use for SSL connections
+     */
+    certpath: string;
+}
+
+interface CreateBucketOptions {
+    /**
+     * The bucket name
+     */
+    name?: string;
+    authType?: string,
+    bucketType?: string;
+    ramQuotaMB?: number;
+    replicaNumber?: number;
+}
+
+/**
+ * Class for performing management operations against a cluster.
+ */
+interface ClusterManager {
+    /**
+     *
+     * @param name
+     * @param callback
+     */
+    createBucket(name: string, callback: Function): void;
+
+    /**
+     *
+     * @param name
+     * @param opts
+     * @param callback
+     */
+    createBucket(name: string, opts: any, callback: Function): void;
+
+    /**
+     *
+     * @param callback
+     */
+    listBuckets(callback: Function): void;
+
+    /**
+     *
+     * @param name
+     * @param callback
+     */
+    removeBucket(name: string, callback: Function): void;
+}
+
+/**
+ * The virtual class thrown for all Couchnode errors.
+ */
+interface CouchbaseError extends Error {
+    /**
+     * The error code for this error.
+     */
+    code: errors;
+}
+
+interface AppendOptions {
+    /**
+     * The CAS value to check. If the item on the server contains a different CAS value, the operation will fail. Note that if this option is undefined, no comparison will be performed.
+     */
+    cas?: Bucket.CAS;
+
+    /**
+     * Ensures this operation is persisted to this many nodes.
+     */
+    persist_to?: number;
+
+    /**
+     * 	Ensures this operation is replicated to this many nodes.
+     */
+    replicate_to?: number;
+}
+
+interface PrependOptions extends AppendOptions { }
+
+interface RemoveOptions extends AppendOptions { }
+
+interface ReplaceOptions extends AppendOptions {
+    /**
+     * Set the initial expiration time for the document. A value of 0 represents never expiring.
+     */
+    expiry?: number;
+}
+
+interface UpsertOptions extends ReplaceOptions { }
+
+interface TouchOptions {
+    /**
+     * 	Ensures this operation is persisted to this many nodes.
+     */
+    persist_to?: number;
+
+    /**
+     * Ensures this operation is replicated to this many nodes.
+     */
+    replicate_to?: number;
+}
+
+interface CounterOptions {
+    /**
+     * Sets the initial value for the document if it does not exist. Specifying a value of undefined will cause the operation to fail if the document does not exist, otherwise this value must be equal to or greater than 0.
+     */
+    initial?: number;
+
+    /**
+     * Set the initial expiration time for the document. A value of 0 represents never expiring.
+     */
+    expiry?: number;
+
+    /**
+     * Ensures this operation is persisted to this many nodes
+     */
+    persist_to?: number;
+
+    /**
+     * Ensures this operation is replicated to this many nodes
+     */
+    replicate_to?: number;
+}
+
+interface GetAndLockOptions {
+    lockTime?: number;
+}
+
+interface GetReplicaOptions {
+
+    /**
+     * The index for which replica you wish to retrieve this value from, or if undefined, use the value from the first server that replies.
+     */
+    index?: number;
+}
+
+interface InsertOptions {
+
+    /**
+     * Set the initial expiration time for the document. A value of 0 represents never expiring.
+     */
+    expiry?: number;
+
+    /**
+     * Ensures this operation is persisted to this many nodes.
+     */
+    persist_to?: number;
+
+    /**
+     * 	Ensures this operation is replicated to this many nodes.
+     */
+    replicate_to?: number;
+}
+
+/**
+ * A class for performing management operations against a bucket. This class should not be instantiated directly, but instead through the use of the Bucket#manager method instead.
+ */
+interface BucketManager {
+
+    /**
+     * Flushes the cluster, deleting all data stored within this bucket. Note that this method requires the Flush permission to be enabled on the bucket from the management console before it will work.
+     * @param callback The callback function.
+     */
+    flush(callback: Function): void;
+
+    /**
+     * Retrieves a specific design document from this bucket.
+     * @param name
+     * @param callback The callback function.
+     */
+    getDesignDocument(name: string, callback: Function): void;
+
+    /**
+     * Retrieves a list of all design documents registered to a bucket.
+     * @param callback The callback function.
+     */
+    getDesignDocuments(callback: Function): void;
+
+    /**
+     * Registers a design document to this bucket, failing if it already exists.
+     * @param name
+     * @param data
+     * @param callback The callback function.
+     * @returns {}
+     */
+    insertDesignDocument(name: string, data: any, callback: Function): void;
+
+    /**
+     * Unregisters a design document from this bucket.
+     * @param name
+     * @param callback The callback function.
+     * @returns {}
+     */
+    removeDesignDocument(name: string, callback: Function): void;
+
+    /**
+     * Registers a design document to this bucket, overwriting any existing design document that was previously registered.
+     * @param name
+     * @param data
+     * @param callback The callback function.
+     * @returns {}
+     */
+    upsertDesignDocument(name: string, data: any, callback: Function): void;
+}
+
+/**
+ * Class for dynamically construction of view queries. This class should never be constructed directly, instead you should use ViewQuery.from to construct this object.
+ */
+declare class ViewQuery {
+    /**
+     * Instantiates a ViewQuery object for the specified design document and view name.
+     * @param ddoc The design document to use.
+     * @param name The view to use.
+     */
+    static from(ddoc: string, name: string): ViewQuery;
+
+    /**
+     * Specifies the design document and view name to use for this query.
+     * @param ddoc The design document to use.
+     * @param name The view to use.
+     */
+    from(ddoc: string, name: string): ViewQuery;
+
+    /**
+     * Allows you to specify custom view options that may not be available though the fluent interface defined by this class.
+     * @param opts
+     */
+    custom(opts: any): ViewQuery;
+
+    /**
+     * Flag to request a view request accross all nodes in the case of a development view.
+     * @param full_set
+     */
+    full_set(full_set: boolean): ViewQuery;
+
+    /**
+     * Specifies whether to preform grouping during view execution.
+     * @param group
+     */
+    group(group: boolean): ViewQuery;
+
+    /**
+     * Specifies the level at which to perform view grouping.
+     * @param group_level
+     */
+    group_level(group_level: number): ViewQuery;
+
+    /**
+     * Specifies a range of document id's to retrieve from the index.
+     * @param start
+     * @param end
+     */
+    id_range(start: any, end: any): ViewQuery;
+
+    /**
+     * Flag to request a view request include the full document value.
+     * @param include_docs
+     */
+    include_docs(include_docs: boolean): ViewQuery;
+
+    /**
+     * Specifies a specified key to retrieve from the index.
+     * @param key
+     */
+    key(key: any): ViewQuery;
+
+    /**
+     * Specifies a list of keys you wish to retrieve from the index.
+     * @param keys
+     */
+    keys(key: any[]): ViewQuery;
+
+    /**
+     * Specifies the maximum number of results to return.
+     * @param limit
+     */
+    limit(limit: number): ViewQuery;
+
+    /**
+     * Sets the error handling mode for this query.
+     * @param mode
+     */
+    on_error(mode: ViewQuery.ErrorMode): ViewQuery;
+
+    /**
+     * Specifies the desired ordering for the results.
+     * @param order
+     */
+    order(order: ViewQuery.Order): ViewQuery;
+
+    /**
+     * Specifies a range of keys to retrieve from the index. You may specify both a start and an end point and additionally specify whether or not the end value is inclusive or exclusive.
+     * @param start
+     * @param end
+     * @param inclusive_end
+     */
+    range(start: any | any[], end: any | any[], inclusive_end?: boolean): ViewQuery;
+
+    /**
+     * Specifies whether to execute the map-reduce reduce step.
+     * @param reduce
+     */
+    reduce(reduce: boolean): ViewQuery;
+
+    /**
+     * Specifies how many results to skip from the beginning of the result set.
+     * @param skip
+     */
+    skip(skip: number): ViewQuery;
+
+    /**
+     * Specifies how this query will affect view indexing, both before and after the query is executed.
+     * @param stale
+     */
+    stale(stale: ViewQuery.Update): ViewQuery;
+}
+
+declare namespace ViewQuery {
+    /**
+     * Enumeration for specifying on_error behaviour.
+     */
+    enum ErrorMode {
+        /**
+         * Continues querying when an error occurs.
+         */
+        CONTINUE,
+
+        /**
+         * Stops and errors query when an error occurs.
+         */
+        STOP
+    }
+
+    /**
+     * Enumeration for specifying view result ordering.
+     */
+    enum Order {
+        /**
+         * Orders with lower values first and higher values last.
+         */
+        ASCENDING,
+
+        /**
+         * Orders with higher values first and lower values last.
+         */
+        DESCENDING
+    }
+
+    /**
+     * Enumeration for specifying view update semantics.
+     */
+    enum Update {
+        /**
+         * Causes the view to be fully indexed before results are retrieved.
+         */
+        BEFORE,
+
+        /**
+         * Allows the index to stay in whatever state it is already in prior retrieval of the query results.
+         */
+        NONE,
+
+        /**
+         * Forces the view to be indexed after the results of this query has been fetched.
+         */
+        AFTER
+    }
+}
+
+/**
+ * Class for dynamically construction of N1QL queries. This class should never be constructed directly, instead you should use the N1qlQuery.fromString static method to instantiate a N1qlStringQuery.
+ */
+declare class N1qlQuery {
+    /**
+     * Creates a query object directly from the passed query string.
+     * @param str
+     */
+    static fromString(str: string): N1qlStringQuery;
+
+    /**
+     * Returns the fully prepared string representation of this query.
+     */
+    toString(): string;
+}
+
+declare namespace N1qlQuery {
+    /**
+     * Enumeration for specifying N1QL consistency semantics.
+     */
+    enum Consistency {
+        /**
+         * 	This is the default (for single-statement requests).
+         */
+        NOT_BOUND,
+
+        /**
+         * This implements strong consistency per request.
+         */
+        REQUEST_PLUS,
+
+        /**
+         * This implements strong consistency per statement.
+         */
+        STATEMENT_PLUS
+    }
+}
+
+/**
+ * Class for holding a explicitly defined N1QL query string.
+ */
+declare class N1qlStringQuery extends N1qlQuery {
+    /**
+     * Specifies whether this query is adhoc or should be prepared.
+     * @param adhoc
+     */
+    adhoc(adhoc: boolean): N1qlStringQuery;
+
+    /**
+     * Specify the consistency level for this query.
+     * @param val
+     */
+    consistency(val: N1qlQuery.Consistency): N1qlStringQuery;
+
+    /**
+     * Returns the fully prepared object representation of this query.
+     */
+    toObject(): any;
+
+    /**
+     * Returns the fully prepared string representation of this query.
+     */
+    toString(): string;
+}
+
+/**
+ * Class for dynamically construction of spatial queries. This class should never be constructed directly, instead you should use SpatialQuery.from to construct this object.
+ */
+declare class SpatialQuery {
+    /**
+     * Instantiates a SpatialQuery object for the specified design document and view name.
+     * @param ddoc The design document to use.
+     * @param name 	The view to use.
+     */
+    static from(ddoc: string, name: string): SpatialQuery;
+
+    /**
+     * Specifies the design document and view name to use for this query.
+     * @param ddoc
+     * @param name
+     */
+    from(ddoc: string, name: string): SpatialQuery;
+
+    /**
+     * Specifies a bounding box to query the index for. This value must be an array of exactly 4 numbers which represents the left, top, right and bottom edges of the bounding box (in that order).
+     * @param bbox
+     */
+    bbox(bbox: number[]): SpatialQuery;
+
+    /**
+     * Allows you to specify custom view options that may not be available though the fluent interface defined by this class.
+     * @param opts
+     */
+    custom(opts: any): SpatialQuery;
+
+    /**
+     * Specifies the maximum number of results to return.
+     * @param limit
+     */
+    limit(limit: number): SpatialQuery;
+
+    /**
+     * Specifies how many results to skip from the beginning of the result set.
+     * @param skip
+     */
+    skip(skip: number): SpatialQuery;
+
+    /**
+     * Specifies how this query will affect view indexing, both before and after the query is executed.
+     * @param stale
+     */
+    stale(stale: SpatialQuery.Update): SpatialQuery;
+}
+
+declare namespace SpatialQuery {
+    /**
+     * Enumeration for specifying view update semantics.
+     */
+    enum Update {
+        /**
+         * Causes the view to be fully indexed before results are retrieved.
+         */
+        BEFORE,
+
+        /**
+         * Allows the index to stay in whatever state it is already in prior retrieval of the query results.
+         */
+        NONE,
+
+        /**
+         * 	Forces the view to be indexed after the results of this query has been fetched.
+         */
+        AFTER
+    }
+}
+
+/**
+ * The Bucket class represents a connection to a Couchbase bucket. Never instantiate this class directly. Instead use the Cluster#openBucket method instead.
+ */
+interface Bucket {
+    /**
+     * Returns the version of the Node.js library as a string.
+     */
+    clientVersion: string;
+
+    /**
+     * Gets or sets the config throttling in milliseconds. The config throttling is the time that Bucket will wait before forcing a configuration refresh. If no refresh occurs before this period while a configuration is marked invalid, an update will be triggered.
+     */
+    configThrottle: number;
+
+    /**
+     * Sets or gets the connection timeout in milliseconds. This is the timeout value used when connecting to the configuration port during the initial connection (in this case, use this as a key in the 'options' parameter in the constructor) and/or when Bucket attempts to reconnect in-situ (if the current connection has failed).
+     */
+    connectionTimeout: number;
+
+    /**
+     * Gets or sets the durability interval in milliseconds. The durability interval is the time that Bucket will wait between requesting new durability information during a durability poll.
+     */
+    durabilityInterval: number;
+
+    /**
+     * Gets or sets the durability timeout in milliseconds. The durability timeout is the time that Bucket will wait for a response from the server in regards to a durability request. If there are no responses received within this time frame, the request fails with an error.
+     */
+    durabilityTimeout: number;
+
+    /**
+     * Returns the libcouchbase version as a string. This information will usually be in the format of 2.4.0-fffffff representing the major, minor, patch and git-commit that the built libcouchbase is based upon.
+     */
+    lcbVersion: string;
+
+    /**
+     * Gets or sets the management timeout in milliseconds. The management timeout is the time that Bucket will wait for a response from the server for a management request. If the response is not received within this time frame, the request is failed out with an error.
+     */
+    managementTimeout: number;
+
+    /**
+     * Sets or gets the node connection timeout in msecs. This value is similar to Bucket#connectionTimeout, but defines the time to wait for a particular node to respond before trying the next one.
+     */
+    nodeConnectionTimeout: number;
+
+    /**
+     * Gets or sets the operation timeout in milliseconds. The operation timeout is the time that Bucket will wait for a response from the server for a CRUD operation. If the response is not received within this time frame, the operation is failed with an error.
+     */
+    operationTimeout: number;
+
+    /**
+     * Gets or sets the view timeout in milliseconds. The view timeout is the time that Bucket will wait for a response from the server for a view request. If the response is not received within this time frame, the request fails with an error.
+     */
+    viewTimeout: number;
+
+    /**
+     * Similar to Bucket#upsert, but instead of setting a new key, it appends data to the existing key. Note that this function only makes sense when the stored data is a string; 'appending' to a JSON document may result in parse errors when the document is later retrieved.
+     * @param key The target document key.
+     * @param fragment The document's contents to append.
+     * @param callback The callback function.
+     */
+    append(key: any | Buffer, fragment: any, callback: Bucket.OpCallback): void;
+
+    /**
+     *
+     * @param key The target document key.
+     * @param fragment The document's contents to append.
+     * @param options The options object.
+     * @param callback The callback function.
+     */
+    append(key: any | Buffer, fragment: any, options: AppendOptions, callback: Bucket.OpCallback): void;
+
+    /**
+     * Increments or decrements a key's numeric value.
+     * Note that JavaScript does not support 64-bit integers (while libcouchbase and the server do). You might receive an inaccurate value if the number is greater than 53-bits (JavaScript's maximum integer precision).
+     * @param key The target document key.
+     * @param delta The amount to add or subtract from the counter value. This value may be any non-zero integer.
+     * @param callback The callback function.
+     */
+    counter(key: any | Buffer, delta: number, callback: Bucket.OpCallback): void;
+
+    /**
+     *
+     * @param key The target document key.
+     * @param delta The amount to add or subtract from the counter value. This value may be any non-zero integer.
+     * @param options The options object.
+     * @param callback The callback function.
+     */
+    counter(key: any | Buffer, delta: number, options: CounterOptions, callback: Bucket.OpCallback): void;
+
+    /**
+     * Shuts down this connection.
+     */
+    disconnect(): void;
+
+    /**
+     * Enables N1QL support on the client. A cbq-server URI must be passed. This method will be deprecated in the future in favor of automatic configuration through the connected cluster.
+     * @param hosts An array of host/port combinations which are N1QL servers attached to this cluster.
+     */
+    enableN1ql(hosts: string | string[]): void;
+
+    /**
+     * Retrieves a document.
+     * @param key The target document key.
+     * @param callback The callback function.
+     */
+    get(key: any | Buffer, callback: Bucket.OpCallback): void;
+
+    /**
+     * @param key The target document key.
+     * @param options The options object.
+     * @param callback The callback function.
+     */
+    get(key: any | Buffer, options: any, callback: Bucket.OpCallback): void;
+
+    /**
+     * Lock the document on the server and retrieve it. When an document is locked, its CAS changes and subsequent operations on the document (without providing the current CAS) will fail until the lock is no longer held.
+     * This function behaves identically to Bucket#get in that it will return the value. It differs in that the document is also locked. This ensures that attempts by other client instances to access this document while the lock is held will fail.
+     * Once locked, a document can be unlocked either by explicitly calling Bucket#unlock or by performing a storage operation (e.g. Bucket#upsert, Bucket#replace, Bucket::append) with the current CAS value. Note that any other lock operations on this key will fail while a document is locked.
+     * @param key The target document key.
+     * @param callback The callback function.
+     */
+    getAndLock(key: any, callback: Bucket.OpCallback): void;
+
+    /**
+     * Lock the document on the server and retrieve it. When an document is locked, its CAS changes and subsequent operations on the document (without providing the current CAS) will fail until the lock is no longer held.
+     * This function behaves identically to Bucket#get in that it will return the value. It differs in that the document is also locked. This ensures that attempts by other client instances to access this document while the lock is held will fail.
+     * Once locked, a document can be unlocked either by explicitly calling Bucket#unlock or by performing a storage operation (e.g. Bucket#upsert, Bucket#replace, Bucket::append) with the current CAS value. Note that any other lock operations on this key will fail while a document is locked.
+     * @param key The target document key.
+     * @param options The options object.
+     * @param callback The callback function.
+     * @returns {}
+     */
+    getAndLock(key: any, options: GetAndLockOptions, callback: Bucket.OpCallback): void;
+
+    /**
+     * Retrieves a document and updates the expiry of the item at the same time.
+     * @param key The target document key.
+     * @param expiry The expiration time to use. If a value of 0 is provided, then the current expiration time is cleared and the key is set to never expire. Otherwise, the key is updated to expire in the time provided (in seconds).
+     * @param options The options object.
+     * @param callback The callback function.
+     */
+    getAndTouch(key: any | Buffer, expiry: number, options: any, callback: Bucket.OpCallback): void;
+
+    /**
+     * Retrieves a document and updates the expiry of the item at the same time.
+     * @param key The target document key.
+     * @param expiry The expiration time to use. If a value of 0 is provided, then the current expiration time is cleared and the key is set to never expire. Otherwise, the key is updated to expire in the time provided (in seconds).
+     * @param callback The callback function.
+     */
+    getAndTouch(key: any | Buffer, expiry: number, callback: Bucket.OpCallback): void;
+
+    /**
+     * Retrieves a list of keys
+     * @param keys The target document keys.
+     * @param callback The callback function.
+     */
+    getMulti(key: any[] | Buffer[], callback: Bucket.MultiGetCallback): void;
+
+    /**
+     * Get a document from a replica server in your cluster.
+     * @param key The target document key.
+     * @param callback The callback function.
+     */
+    getReplica(key: any | Buffer, callback: Bucket.OpCallback): void;
+
+    /**
+    * Get a document from a replica server in your cluster.
+    * @param key The target document key.
+    * @param options The options object.
+    * @param callback The callback function.
+    */
+    getReplica(key: any | Buffer, options: GetReplicaOptions, callback: Bucket.OpCallback): void;
+
+    /**
+     * Identical to Bucket#upsert but will fail if the document already exists.
+     * @param key The target document key.
+     * @param value The document's contents.
+     * @param callback The callback function.
+     */
+    insert(key: any | Buffer, value: any, callback: Bucket.OpCallback): void;
+
+    /**
+     * Identical to Bucket#upsert but will fail if the document already exists.
+     * @param key The target document key.
+     * @param value The document's contents.
+     * @param options The options object.
+     * @param callback The callback function.
+     */
+    insert(key: any | Buffer, value: any, options: InsertOptions, callback: Bucket.OpCallback): void;
+
+    /**
+     * Returns an instance of a BuckerManager for performing management operations against a bucket.
+     */
+    manager(): BucketManager;
+
+    /**
+     * Like Bucket#append, but prepends data to the existing value.
+     * @param key The target document key.
+     * @param fragment The document's contents to prepend.
+     * @param callback The callback function.
+     */
+    prepend(key: any, fragment: any, callback: Bucket.OpCallback): void;
+
+    /**
+     * Like Bucket#append, but prepends data to the existing value.
+     * @param key The target document key.
+     * @param fragment The document's contents to prepend.
+     * @param options The options object.
+     * @param callback The callback function.
+     */
+    prepend(key: any, fragment: any, options: PrependOptions, callback: Bucket.OpCallback): void;
+
+    /**
+     * Executes a previously prepared query object. This could be a ViewQuery or a N1qlQuery.
+     * Note: N1qlQuery queries are currently an uncommitted interface and may be subject to change in 2.0.0's final release.
+     * @param query The query to execute.
+     * @param callback The callback function.
+     */
+    query(query: ViewQuery | N1qlQuery, callback: Bucket.QueryCallback): Bucket.ViewQueryResponse | Bucket.N1qlQueryResponse;
+
+    /**
+     * Executes a previously prepared query object. This could be a ViewQuery or a N1qlQuery.
+     * Note: N1qlQuery queries are currently an uncommitted interface and may be subject to change in 2.0.0's final release.
+     * @param query The query to execute.
+     * @param params A list or map to do replacements on a N1QL query.
+     * @param callback The callback function.
+     */
+    query(query: ViewQuery | N1qlQuery, params: Object | Array<any>, callback: Bucket.QueryCallback): Bucket.ViewQueryResponse | Bucket.N1qlQueryResponse;
+
+    /**
+     * Deletes a document on the server.
+     * @param key The target document key.
+     * @param callback The callback function.
+     */
+    remove(key: any | Buffer, callback: Bucket.OpCallback): void;
+
+    /**
+     * Deletes a document on the server.
+     * @param key The target document key.
+     * @param options The options object.
+     * @param callback The callback function.
+     */
+    remove(key: any | Buffer, options: RemoveOptions, callback: Bucket.OpCallback): void;
+
+    /**
+     * Identical to Bucket#upsert, but will only succeed if the document exists already (i.e. the inverse of Bucket#insert).
+     * @param key The target document key.
+     * @param value The document's contents.
+     * @param callback The callback function.
+     */
+    replace(key: any | Buffer, value: any, callback: Bucket.OpCallback): void;
+
+    /**
+     * Identical to Bucket#upsert, but will only succeed if the document exists already (i.e. the inverse of Bucket#insert).
+     * @param key The target document key.
+     * @param value The document's contents.
+     * @param options The options object.
+     * @param callback The callback function.
+     */
+    replace(key: any | Buffer, value: any, options: ReplaceOptions, callback: Bucket.OpCallback): void;
+
+    /**
+     * Configures a custom set of transcoder functions for encoding and decoding values that are being stored or retreived from the server.
+     * @param encoder The function for encoding.
+     * @param decoder The function for decoding.
+     */
+    setTranscoder(encoder: Bucket.EncoderFunction, decoder: Bucket.DecoderFunction): void;
+
+    /**
+     * Update the document expiration time.
+     * @param key The target document key.
+     * @param expiry The expiration time to use. If a value of 0 is provided, then the current expiration time is cleared and the key is set to never expire. Otherwise, the key is updated to expire in the time provided (in seconds). Values larger than 302460*60 seconds (30 days) are interpreted as absolute times (from the epoch).
+     * @param options The options object.
+     * @param callback The callback function.
+     */
+    touch(key: any | Buffer, expiry: number, options: TouchOptions, callback: Bucket.OpCallback): void;
+
+    /**
+     * Unlock a previously locked document on the server. See the Bucket#lock method for more details on locking.
+     * @param key The target document key.
+     * @param cas The CAS value returned when the key was locked. This operation will fail if the CAS value provided does not match that which was the result of the original lock operation.
+     * @param callback The callback function.
+     */
+    unlock(key: any | Buffer, cas: Bucket.CAS, callback: Bucket.OpCallback): void;
+
+    /**
+     * Unlock a previously locked document on the server. See the Bucket#lock method for more details on locking.
+     * @param key The target document key.
+     * @param cas The CAS value returned when the key was locked. This operation will fail if the CAS value provided does not match that which was the result of the original lock operation.
+     * @param options The options object.
+     * @param callback The callback function.
+     */
+    unlock(key: any | Buffer, cas: Bucket.CAS, options: any, callback: Bucket.OpCallback): void;
+
+    /**
+     * Stores a document to the bucket.
+     * @param key The target document key.
+     * @param value The document's contents.
+     * @param callback The callback function.
+     */
+    upsert(key: any | Buffer, value: any, callback: Bucket.OpCallback): void;
+
+    /**
+     * Stores a document to the bucket.
+     * @param key The target document key.
+     * @param value The document's contents.
+     * @param options The options object.
+     * @param callback The callback function.
+     */
+    upsert(key: any | Buffer, value: any, options: UpsertOptions, callback: Bucket.OpCallback): void;
+}
+
+declare namespace Bucket {
+
+    /**
+     * his is used as a callback from executed queries. It is a shortcut method that automatically subscribes to the rows and error events of the Bucket.ViewQueryResponse.
+     */
+    interface QueryCallback {
+        /**
+         * @param error The error for the operation. This can either be an Error object or a falsy value.
+         * @param rows The rows returned from the query.
+         * @param meta The metadata returned by the query.
+         */
+        (error: CouchbaseError, rows: any[], meta: Bucket.ViewQueryResponse.Meta): void;
+    }
+
+    /**
+     * Single-Key callbacks.
+     * This callback is passed to all of the single key functions.
+     * It returns a result objcet containing a combination of a CAS and a value, depending on which operation was invoked.
+     */
+    interface OpCallback {
+        /**
+         * @param error The error for the operation. This can either be an Error object or a value which evaluates to false (null, undefined, 0 or false).
+         * @param result The result of the operation that was executed. This usually contains at least a cas property, and on some operations will contain a value property as well.
+         */
+        (error: CouchbaseError | number, result: any): void;
+    }
+
+    /**
+     * Multi-Get Callback.
+     * This callback is used to return results from a getMulti operation.
+     */
+    interface MultiGetCallback {
+        /**
+         * @param error The number of keys that failed to be retrieved. The precise errors are available by checking the error property of the individual documents.
+         * @param results This is a map of keys to results. The result for each key will optionally contain an error if one occured, or if no error occured will contain the CAS and value of the document.
+         */
+        (error: number, results: any[]): void;
+    }
+
+    /**
+     * Transcoder Encoding Function.
+     * This function will receive a value when a storage operation is invoked that needs to encode user-provided data for storage into Couchbase. It expects to be returned a Buffer object to store along with an integer representing any flag metadata relating to how to decode the key later using the matching DecoderFunction.
+     */
+    interface EncoderFunction {
+        /**
+         * Transcoder Encoding Function.
+         * This function will receive a value when a storage operation is invoked that needs to encode user-provided data for storage into Couchbase. It expects to be returned a Buffer object to store along with an integer representing any flag metadata relating to how to decode the key later using the matching DecoderFunction.
+         * @param value The value needing encoding.
+         */
+        (value: any): Bucket.TranscoderDoc;
+    }
+
+    /**
+     * Transcoder Decoding Function.
+     * This function will receive an object containing a Buffer value and an integer value representing any flags metadata whenever a retrieval operation is executed. It is expected that this function will return a value representing the original value stored and encoded with its matching EncoderFunction.
+     */
+    interface DecoderFunction {
+        /**
+         *
+         * @param doc The data from Couchbase to decode.
+         */
+        (doc: Bucket.TranscoderDoc): any
+    }
+
+    /**
+     * The CAS value is a special object that indicates the current state of the item on the server. Each time an object is mutated on the server, the value is changed. CAS objects can be used in conjunction with mutation operations to ensure that the value on the server matches the local value retrieved by the client. This is useful when doing document updates on the server as you can ensure no changes were applied by other clients while you were in the process of mutating the document locally.
+     * In the Node.js SDK, the CAS is represented as an opaque value. As such,y ou cannot generate CAS objects, but should rather use the values returned from a Bucket.OpCallback.
+     */
+    interface CAS {
+
+    }
+
+    /**
+     * An event emitter allowing you to bind to various query result set events.
+     */
+    interface N1qlQueryResponse extends events.EventEmitter {
+
+    }
+
+    namespace N1qlQueryResponse {
+        /**
+         * The meta-information available from a view query response.
+         */
+        interface Meta {
+            /**
+             * The identifier for this query request.
+             */
+            requestID: number;
+        }
+    }
+
+    /**
+     * A class used in relation to transcoders.
+     */
+    class TranscoderDoc {
+        value: Buffer;
+        flags: number;
+    }
+
+    /**
+     * An event emitter allowing you to bind to various query result set events.
+     */
+    interface ViewQueryResponse extends events.EventEmitter {
+
+    }
+
+    namespace ViewQueryResponse {
+        /**
+         * The meta-information available from a view query response.
+         */
+        interface Meta {
+            /**
+             * The total number of rows available in the index of the view that was queried.
+             */
+            total_rows: number;
+        }
+    }
+}
diff --git a/couchbase/tsconfig.json b/couchbase/tsconfig.json
new file mode 100644
index 0000000000..d6e6be6cd0
--- /dev/null
+++ b/couchbase/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "couchbase-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cradle/cradle-tests.ts b/cradle/cradle-tests.ts
index 655e92a87b..cd05e6274c 100644
--- a/cradle/cradle-tests.ts
+++ b/cradle/cradle-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./cradle.d.ts" />
 
 import cradle = require("cradle");
 
diff --git a/cradle/cradle.d.ts b/cradle/cradle.d.ts
deleted file mode 100644
index 22a2fcf58e..0000000000
--- a/cradle/cradle.d.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-// Type definitions for cradle
-// Project: https://github.com/flatiron/cradle
-// Definitions by: Panu Horsmalahti <https://github.com/panuhorsmalahti>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "cradle" {
-    interface Options {
-        host?: string;
-        hostname?: string;
-        cache?: boolean;
-        raw?: boolean;
-        forceSave?: boolean;
-        auth?: string | {
-            username: string;
-            password: string;
-        }
-        ca?: string;
-        secure?: boolean;
-        retries?: number;
-        retryTimeout?: number;
-        maxSockets?: number;
-    }
-
-    interface Callback {
-        (error: any, response: any): void;
-    }
-
-    interface ErrorCallback {
-        (error: any): void;
-    }
-
-    export class Connection {
-        constructor(uri?: string, port?: number, options?: Options);
-        database(name: string): Database;
-        databases(Callback: Callback): void;
-        config(callback: Callback): void;
-        info(callback: Callback): void;
-        stats(callback: Callback): void;
-        activeTasks(callback: Callback): void;
-        uuids(callback: Callback): void;
-        uuids(count: number, callback: Callback): void;
-        replicate(options: {
-            source: string | {
-                url: string;
-            };
-            target: string | {
-                url: string;
-            };
-            cancel?: boolean;
-            continuous?: boolean;
-            create_target?: boolean;
-            doc_ids?: string[];
-            filter?: string;
-            proxy?: string;
-            query_params?: any;
-        }, callback: Callback): void;
-    }
-
-    export interface ChangesOptions {
-        since: number;
-    }
-
-    export class Database {
-        name: string;
-        get(id: string, callback: (error: any, document: any) => void): void;
-        get<T>(id: string, callback: (error: any, document: T) => void): void;
-        get(id: string, rev: string, callback: (error: any, document: any) => void): void;
-        get<T>(id: string, rev: string, callback: (error: any, document: T) => void): void;
-        get(ids: string[], callback: Callback): void;
-        save(document: any, callback: Callback): void;
-        save(id: string, document: any, callback: Callback): void;
-        save(id: string, revision: string, document: any,
-            callback: Callback): void;
-        save<T>(document: T, callback: Callback): void;
-        save<T>(id: string, document: T, callback: Callback): void;
-        save<T>(id: string, revision: string, document: T,
-            callback: Callback): void;
-        save(documents: any[], callback: Callback): void;
-        merge(id: string, document: any, callback: Callback): void;
-        merge<T>(id: string, document: T, callback: Callback): void;
-        remove(id: string, revision: string, callback: Callback): void;
-        update(name: string, id: string, queryObject: any, documentBody: any,
-            callback: Callback): void;
-        view(name: string, callback: Callback): void;
-        view(name: string, options: {
-            group?: boolean;
-            reduce?: boolean;
-            key?: string;
-            startkey?: any;
-            endkey?: any;
-            include_docs?: boolean;
-            limit?: number;
-            descending?: boolean;
-        }, callback: Callback): void;
-        temporaryView(view: any, callback: Callback): void;
-        create(callback: ErrorCallback): void;
-        exists(callback: (error: any, exists: boolean) => void): void;
-        destroy(callback: ErrorCallback): void;
-        changes(options: ChangesOptions): any;
-        changes(callback: (error: any, list: any[]) => void): void;
-        changes(options: ChangesOptions, callback: (error: any,
-            list: any[]) => void): void;
-        saveAttachment(idAndRevData: {
-            id: string;
-            rev: string;
-        }, attachmentData: any, callback: Callback): void;
-        getAttachment(id: string, attachmentName: string,
-            callback: Callback): void;
-        removeAttachment(id: string, attachmentName: string,
-            callback: Callback): void;
-        info(callback: Callback): void;
-        all(callback: Callback): void;
-        all(options: any, callback: Callback): void;
-        compact(callback: Callback): void;
-        compact(design: string, callback: Callback): void;
-        viewCleanup(callback: Callback): void;
-        replicate(target: string, callback: Callback): void;
-        replicate(target: string, options: any, callback: Callback): void;
-    }
-
-    export function setup(options: Options): void;
-}
diff --git a/cradle/index.d.ts b/cradle/index.d.ts
new file mode 100644
index 0000000000..159787ea64
--- /dev/null
+++ b/cradle/index.d.ts
@@ -0,0 +1,121 @@
+// Type definitions for cradle
+// Project: https://github.com/flatiron/cradle
+// Definitions by: Panu Horsmalahti <https://github.com/panuhorsmalahti>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface Options {
+    host?: string;
+    hostname?: string;
+    cache?: boolean;
+    raw?: boolean;
+    forceSave?: boolean;
+    auth?: string | {
+        username: string;
+        password: string;
+    }
+    ca?: string;
+    secure?: boolean;
+    retries?: number;
+    retryTimeout?: number;
+    maxSockets?: number;
+}
+
+interface Callback {
+    (error: any, response: any): void;
+}
+
+interface ErrorCallback {
+    (error: any): void;
+}
+
+export declare class Connection {
+    constructor(uri?: string, port?: number, options?: Options);
+    database(name: string): Database;
+    databases(Callback: Callback): void;
+    config(callback: Callback): void;
+    info(callback: Callback): void;
+    stats(callback: Callback): void;
+    activeTasks(callback: Callback): void;
+    uuids(callback: Callback): void;
+    uuids(count: number, callback: Callback): void;
+    replicate(options: {
+        source: string | {
+            url: string;
+        };
+        target: string | {
+            url: string;
+        };
+        cancel?: boolean;
+        continuous?: boolean;
+        create_target?: boolean;
+        doc_ids?: string[];
+        filter?: string;
+        proxy?: string;
+        query_params?: any;
+    }, callback: Callback): void;
+}
+
+export interface ChangesOptions {
+    since: number;
+}
+
+export declare class Database {
+    name: string;
+    get(id: string, callback: (error: any, document: any) => void): void;
+    get<T>(id: string, callback: (error: any, document: T) => void): void;
+    get(id: string, rev: string, callback: (error: any, document: any) => void): void;
+    get<T>(id: string, rev: string, callback: (error: any, document: T) => void): void;
+    get(ids: string[], callback: Callback): void;
+    save(document: any, callback: Callback): void;
+    save(id: string, document: any, callback: Callback): void;
+    save(id: string, revision: string, document: any,
+        callback: Callback): void;
+    save<T>(document: T, callback: Callback): void;
+    save<T>(id: string, document: T, callback: Callback): void;
+    save<T>(id: string, revision: string, document: T,
+        callback: Callback): void;
+    save(documents: any[], callback: Callback): void;
+    merge(id: string, document: any, callback: Callback): void;
+    merge<T>(id: string, document: T, callback: Callback): void;
+    remove(id: string, revision: string, callback: Callback): void;
+    update(name: string, id: string, queryObject: any, documentBody: any,
+        callback: Callback): void;
+    view(name: string, callback: Callback): void;
+    view(name: string, options: {
+        group?: boolean;
+        reduce?: boolean;
+        key?: string;
+        startkey?: any;
+        endkey?: any;
+        include_docs?: boolean;
+        limit?: number;
+        descending?: boolean;
+    }, callback: Callback): void;
+    temporaryView(view: any, callback: Callback): void;
+    create(callback: ErrorCallback): void;
+    exists(callback: (error: any, exists: boolean) => void): void;
+    destroy(callback: ErrorCallback): void;
+    changes(options: ChangesOptions): any;
+    changes(callback: (error: any, list: any[]) => void): void;
+    changes(options: ChangesOptions, callback: (error: any,
+        list: any[]) => void): void;
+    saveAttachment(idAndRevData: {
+        id: string;
+        rev: string;
+    }, attachmentData: any, callback: Callback): void;
+    getAttachment(id: string, attachmentName: string,
+        callback: Callback): void;
+    removeAttachment(id: string, attachmentName: string,
+        callback: Callback): void;
+    info(callback: Callback): void;
+    all(callback: Callback): void;
+    all(options: any, callback: Callback): void;
+    compact(callback: Callback): void;
+    compact(design: string, callback: Callback): void;
+    viewCleanup(callback: Callback): void;
+    replicate(target: string, callback: Callback): void;
+    replicate(target: string, options: any, callback: Callback): void;
+}
+
+export declare function setup(options: Options): void;
diff --git a/cradle/tsconfig.json b/cradle/tsconfig.json
new file mode 100644
index 0000000000..aa8c7e4117
--- /dev/null
+++ b/cradle/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cradle-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/create-error/create-error-tests.ts b/create-error/create-error-tests.ts
index 76b66adf27..51cdab4381 100644
--- a/create-error/create-error-tests.ts
+++ b/create-error/create-error-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="create-error.d.ts" />
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../mocha/mocha.d.ts" />
+
+/// <reference types="node" />
+/// <reference types="mocha" />
 
 import * as createError from 'create-error';
 import * as assert from 'assert';
diff --git a/create-error/create-error.d.ts b/create-error/create-error.d.ts
deleted file mode 100644
index a92048ee1d..0000000000
--- a/create-error/create-error.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Type definitions for create-error.js 0.3.1
-// Project: https://github.com/tgriesser/create-error
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'create-error' {
-  // FIXME See Global type references https://github.com/Microsoft/TypeScript/issues/983
-  type Err = Error;
-
-  namespace createError {
-    interface Error<T extends Err> extends Err {
-      new (message?: string, obj?: any): T;
-    }
-  }
-
-  function createError(): createError.Error<Error>;
-  function createError<T extends createError.Error<Error>>(name: string, properties?: any): T;
-  function createError<T extends createError.Error<Error>>(Target: createError.Error<Error>, name?: string, properties?: any): T;
-
-  export = createError;
-}
diff --git a/create-error/index.d.ts b/create-error/index.d.ts
new file mode 100644
index 0000000000..95d1fd4e7b
--- /dev/null
+++ b/create-error/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for create-error.js 0.3.1
+// Project: https://github.com/tgriesser/create-error
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+// FIXME See Global type references https://github.com/Microsoft/TypeScript/issues/983
+type Err = Error;
+
+declare namespace createError {
+    interface Error<T extends Err> extends Err {
+        new (message?: string, obj?: any): T;
+    }
+}
+
+declare function createError(): createError.Error<Error>;
+declare function createError<T extends createError.Error<Error>>(name: string, properties?: any): T;
+declare function createError<T extends createError.Error<Error>>(Target: createError.Error<Error>, name?: string, properties?: any): T;
+
+export = createError;
diff --git a/create-error/tsconfig.json b/create-error/tsconfig.json
new file mode 100644
index 0000000000..0b97555baf
--- /dev/null
+++ b/create-error/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "create-error-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/createjs-lib/createjs-lib.d.ts b/createjs-lib/index.d.ts
similarity index 100%
rename from createjs-lib/createjs-lib.d.ts
rename to createjs-lib/index.d.ts
diff --git a/createjs-lib/tsconfig.json b/createjs-lib/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/createjs-lib/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/createjs/createjs.d.ts b/createjs/createjs.d.ts
deleted file mode 100644
index 26ebfa1262..0000000000
--- a/createjs/createjs.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Type definitions for CreateJS
-// Project: http://www.createjs.com/
-// Definitions by: Pedro Ferreira <https://bitbucket.org/drk4>, Chris Smith <https://github.com/evilangelist>, Satoru Kimura <https://github.com/gyohk>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/*
- Copyright (c) 2012 Pedro Ferreira
- Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-// Library documentation : http://www.createjs.com/Docs/EaselJS/modules/EaselJS.html
-// Library documentation : http://www.createjs.com/Docs/PreloadJS/modules/PreloadJS.html
-// Library documentation : http://www.createjs.com/Docs/SoundJS/modules/SoundJS.html
-// Library documentation : http://www.createjs.com/Docs/TweenJS/modules/TweenJS.html
-
-
-/// <reference path="../createjs-lib/createjs-lib.d.ts" />
-/// <reference path="../easeljs/easeljs.d.ts" />
-/// <reference path="../tweenjs/tweenjs.d.ts" />
-/// <reference path="../preloadjs/preloadjs.d.ts" />
-/// <reference path="../soundjs/soundjs.d.ts" />
-
diff --git a/createjs/index.d.ts b/createjs/index.d.ts
new file mode 100644
index 0000000000..0aaf6412fb
--- /dev/null
+++ b/createjs/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for CreateJS
+// Project: http://www.createjs.com/
+// Definitions by: Pedro Ferreira <https://bitbucket.org/drk4>, Chris Smith <https://github.com/evilangelist>, Satoru Kimura <https://github.com/gyohk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*
+ Copyright (c) 2012 Pedro Ferreira
+ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Library documentation : http://www.createjs.com/Docs/EaselJS/modules/EaselJS.html
+// Library documentation : http://www.createjs.com/Docs/PreloadJS/modules/PreloadJS.html
+// Library documentation : http://www.createjs.com/Docs/SoundJS/modules/SoundJS.html
+// Library documentation : http://www.createjs.com/Docs/TweenJS/modules/TweenJS.html
+
+
+/// <reference types="createjs-lib" />
+/// <reference types="easeljs" />
+/// <reference types="tweenjs" />
+/// <reference types="preloadjs" />
+/// <reference types="soundjs" />
+
diff --git a/createjs/tsconfig.json b/createjs/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/createjs/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/credential/credential-tests.ts b/credential/credential-tests.ts
index 6013436b05..a2bbb152a2 100644
--- a/credential/credential-tests.ts
+++ b/credential/credential-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="credential.d.ts" />
 
 import * as credential from 'credential';
 
diff --git a/credential/credential.d.ts b/credential/credential.d.ts
deleted file mode 100644
index 2934a090d4..0000000000
--- a/credential/credential.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Type definitions for credential
-// Project: https://github.com/ericelliott/credential
-// Definitions by: Phú <https://github.com/phuvo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'credential' {
-
-	type HashCallback = (err: Error, hash: string) => void;
-	type VerifyCallback = (err: Error, isValid: boolean) => void;
-
-	namespace credential {
-		function hash(password: string, callback: HashCallback): void;
-		function verify(hash: string, password: string, callback: VerifyCallback): void;
-	}
-
-	export = credential;
-
-}
diff --git a/credential/index.d.ts b/credential/index.d.ts
new file mode 100644
index 0000000000..4027305a01
--- /dev/null
+++ b/credential/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for credential
+// Project: https://github.com/ericelliott/credential
+// Definitions by: Phú <https://github.com/phuvo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+type HashCallback = (err: Error, hash: string) => void;
+type VerifyCallback = (err: Error, isValid: boolean) => void;
+
+declare namespace credential {
+    function hash(password: string, callback: HashCallback): void;
+    function verify(hash: string, password: string, callback: VerifyCallback): void;
+}
+
+export = credential;
diff --git a/credential/tsconfig.json b/credential/tsconfig.json
new file mode 100644
index 0000000000..8566ba0555
--- /dev/null
+++ b/credential/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "credential-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cron/cron-tests.ts b/cron/cron-tests.ts
index cea98cdab6..7eea73eeed 100644
--- a/cron/cron-tests.ts
+++ b/cron/cron-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="cron.d.ts" />
 
 import cron = require('cron');
 var CronJob = cron.CronJob;
diff --git a/cron/cron.d.ts b/cron/cron.d.ts
deleted file mode 100644
index 2eb532cf56..0000000000
--- a/cron/cron.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// Type definitions for cron 1.0.9
-// Project: https://www.npmjs.com/package/cron
-// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "cron" {
-
-  interface CronJobStatic {
-    new(cronTime: string|Date, onTick: () => void, onComplete?: () => void, start?: boolean, timeZone?: string, context?: any): CronJob;
-    new(options: {
-      cronTime: string|Date; onTick: () => void; onComplete?: () => void; start?: boolean; timeZone?: string; context?: any
-    }): CronJob;
-  }
-  interface CronJob {
-    start(): void;
-    stop(): void;
-  }
-  export var CronJob: CronJobStatic;
-
-  interface CronTimeStatic {
-    new(time: string|Date): CronTime;
-  }
-  interface CronTime {}
-  export var CronTime: CronTimeStatic;
-
-}
-
diff --git a/cron/index.d.ts b/cron/index.d.ts
new file mode 100644
index 0000000000..e962a9eb27
--- /dev/null
+++ b/cron/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for cron 1.0.9
+// Project: https://www.npmjs.com/package/cron
+// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+interface CronJobStatic {
+    new (cronTime: string | Date, onTick: () => void, onComplete?: () => void, start?: boolean, timeZone?: string, context?: any): CronJob;
+    new (options: {
+        cronTime: string | Date; onTick: () => void; onComplete?: () => void; start?: boolean; timeZone?: string; context?: any
+    }): CronJob;
+}
+interface CronJob {
+    start(): void;
+    stop(): void;
+}
+export declare var CronJob: CronJobStatic;
+
+interface CronTimeStatic {
+    new (time: string | Date): CronTime;
+}
+interface CronTime { }
+export declare var CronTime: CronTimeStatic;
diff --git a/cron/tsconfig.json b/cron/tsconfig.json
new file mode 100644
index 0000000000..984ad4188e
--- /dev/null
+++ b/cron/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cron-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cropperjs/cropperjs-tests.ts b/cropperjs/cropperjs-tests.ts
index d328a12b4a..9fb8556118 100644
--- a/cropperjs/cropperjs-tests.ts
+++ b/cropperjs/cropperjs-tests.ts
@@ -1,2 +1 @@
-/// <reference path="./cropperjs.d.ts"/>
 import * as Cropper from 'cropperjs';
diff --git a/cropperjs/cropperjs.d.ts b/cropperjs/cropperjs.d.ts
deleted file mode 100644
index f2f8e861e5..0000000000
--- a/cropperjs/cropperjs.d.ts
+++ /dev/null
@@ -1,452 +0,0 @@
-// Type definitions for cropperjs
-// Project: https://github.com/fengyuanchen/cropperjs
-// Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-declare module cropperjs {
-    export enum CropperViewMods {
-        CropBoxIsJustWithInTheContainer = 0,
-        CropBoxShouldBeWithInTheCanvas = 1,
-        CanvasShouldNotBeWithInTheContainer = 2,
-        ContainerSshouldBeWithInTheCanvas = 3
-    }
-    export interface CropperOptions {
-        /**
-        * Define the view mode of the cropper.
-        * @default 0
-        */
-        viewMode?: CropperViewMods;
-        /**
-        * Define the dragging mode of the cropper.
-        * 'crop': create a new crop box
-        * 'move': move the canvas
-        * 'none': do nothing
-        */
-        dragMode?: string;
-        /**
-        * Set the aspect ratio of the crop box. By default, the crop box is free ratio.
-        * @default Nan
-        */
-        aspectRatio?: number;
-        /**
-        * The previous cropped data if you had stored, will be passed to setData method automatically.
-        * @default null
-        */
-        data?: Object;
-        /**
-        * Add extra elements (containers) for previewing.
-        * Valid selector for Document.querySelectorAll
-        * @default ''
-        */
-        preview?: string;
-        /**
-        * Rebuild the cropper when resize the window.
-        * @default true
-        */
-        responsive?: boolean;
-        /**
-        * By default, the plugin will check the image origin, and if it is a cross-origin image,
-        * a crossOrigin attribute will be added to the image element and a timestamp will be added to the image url to reload the image for "getCroppedCanvas".
-        * By adding crossOrigin attribute to image will stop adding timestamp to image url, and stop reload of image.
-        * @default true
-        */
-        checkCrossOrigin?: boolean;
-        /**
-        * Show the black modal above the image and under the crop box.
-        * @default true
-        */
-        modal?: boolean;
-        /**
-        * Show the dashed lines above the crop box.
-        * @default true
-        */
-        guides?: boolean;
-        /**
-        * Show the center indicator above the crop box.
-        * @default true
-        */
-        center?: boolean;
-        /**
-        * Show the white modal above the crop box (highlight the crop box).
-        * @default true
-        */
-        highlight?: boolean;
-        /**
-        * Show the grid background of the container.
-        * @default true
-        */
-        background?: boolean;
-        /**
-        * Enable to crop the image automatically when initialize.
-        * @default true
-        */
-        autoCrop?: boolean;
-        /**
-        * A number between 0 and 1. Define the automatic cropping area size (percentage).
-        * @default 0.8 (80% of the image)
-        */
-        autoCropArea?: number;
-        /**
-        * Enable to move the image.
-        * @default true
-        */
-        movable?: boolean;
-        /**
-        * Enable to rotate the image.
-        * @default true
-        */
-        rotatable?: boolean;
-        /**
-        * Enable to scale the image.
-        * @default true
-        */
-        scalable?: boolean;
-        /**
-        * Enable to zoom the image.
-        * @default true
-        */
-        zoomable?: boolean;
-        /**
-        * Enable to zoom the image by dragging touch.
-        * @default true
-        */
-        zoomOnTouch?: boolean;
-        /**
-        * Enable to zoom the image by wheeling mouse.
-        * @default true
-        */
-        zoomOnWheel?: boolean;
-        /**
-        * Define zoom ratio when zoom the image by wheeling mouse.
-        * @default 0.1
-        */
-        wheelZoomRatio?: number;
-        /**
-        * Enable to move the crop box.
-        * @default true
-        */
-        cropBoxMovable?: boolean;
-        /**
-        * Enable to resize the crop box.
-        * @default true
-        */
-        cropBoxResizable?: boolean;
-        /**
-        * Enable to toggle drag mode between "crop" and "move" when click twice on the cropper.
-        * @default true
-        */
-        toggleDragModeOnDblclick?: boolean;
-        /**
-        * The minimum width of the container
-        * @default 200
-        */
-        minContainerWidth?: number;
-        /**
-        * The minimum height of the container.
-        * @default 100
-        */
-        minContainerHeight?: number;
-        /**
-        * The minimum width of the canvas (image wrapper).
-        * @default 0
-        */
-        minCanvasWidth?: number;
-        /**
-        * The minimum height of the canvas (image wrapper).
-        * @default 0
-        */
-        minCanvasHeight?: number;
-        /**
-        * The minimum width of the crop box.
-        * @default 0
-        */
-        minCropBoxWidth?: number;
-        /**
-        * The minimum height of the crop box.
-        * @default 0
-        */
-        minCropBoxHeight?: number;
-        /**
-        * This function will be called when a cropper instance starts to load an image.
-        * Return false to prevent to build
-        * @default null
-        */
-        build?: () => boolean;
-        /**
-        * This function will be called when a cropper instance has built completely.
-        * @default null
-        */
-        built?: () => void;
-    }
-    interface Data {
-        /**
-        * the offset left of the cropped area
-        */
-        x: number;
-        /**
-        * the offset top of the cropped area
-        */
-        y: number;
-        /**
-        * the width of the cropped area
-        */
-        width: number;
-        /**
-        * the height of the cropped area
-        */
-        height: number;
-        /**
-        * the rotated degrees of the image
-        */
-        rotate: number;
-        /**
-        * the scaling factor to apply on the abscissa of the image
-        */
-        scaleX: number;
-        /**
-        * the scaling factor to apply on the ordinate of the image
-        */
-        scaleY: number;
-    }
-    interface ContainerData {
-        /**
-        * The current width of the container
-        */
-        width: number;
-        /**
-        * The current height of the container
-        */
-        height: number;
-    }
-    interface CropBoxData {
-        /**
-        * the offset left of the crop box
-        */
-        left: number;
-        /**
-        * the offset top of the crop box
-        */
-        top: number;
-        /**
-        * the width of the crop box
-        */
-        width: number;
-        /**
-        * the height of the crop box
-        */
-        height: number;
-    }
-    interface CanvasData {
-        /**
-        * offset left of the canvas
-        */
-        left: number;
-        /**
-        * new offset top of the canvas
-        */
-        top: number;
-        /**
-        * new width of the canvas
-        */
-        width: number;
-        /**
-        * new height of the canvas
-        */
-        height: number;
-    }
-    interface ImageData {
-        /**
-        * the offset left of the image
-        */
-        left: number;
-        /**
-        * the offset top of the image
-        */
-        top: number;
-        /**
-        * the width of the image
-        */
-        width: number;
-        /**
-        * the height of the image
-        */
-        height: number;
-        /**
-        * the natural width of the image
-        */
-        naturalWidth: number;
-        /**
-        * the natural height of the image
-        */
-        naturalHeight: number;
-        /**
-        * the aspect ratio of the image
-        */
-        aspectRatio: number;
-        /**
-        * the rotated degrees of the image if rotated
-        */
-        rotate: number;
-        /**
-        * the scaling factor to apply on the abscissa of the image if scaled
-        */
-        scaleX: number;
-        /**
-        * the scaling factor to apply on the ordinate of the image if scaled
-        */
-        scaleY: number;
-    }
-    interface CroppedCanvasOptions {
-        /**
-        * the destination width of the output canvas
-        */
-        width?: number;
-        /**
-        * the destination height of the output canvas
-        */
-        height?: number;
-        /**
-        * a color to fill any alpha values in the output canvas
-        */
-        fillColor?: string;
-    }
-    export class Cropper {
-        constructor(element: HTMLImageElement, options: CropperOptions);
-        /**
- 				* Show the crop box manually.
- 				*/
-        crop(): void;
-
-        /**
-        * Clear the crop box.
-        */
-        reset(): void;
-
-        /**
-        * Replace the image's src and rebuild the cropper.
-        * @param url A new image url
-        */
-        replace(url: string): void;
-
-        /**
-        * Enable (unfreeze) the cropper.
-        */
-        enable(): void;
-
-        /**
-        * Disable (freeze) the cropper
-        */
-        disable(): void;
-
-        /**
-        * Destroy the cropper and remove the instance from the image.
-        */
-        destroy(): void;
-
-        /**
-        * Move the canvas (image wrapper) with relative offsets.
-        * @param offsetX Moving size (px) in the horizontal direction.
-        * @param offsetY Moving size (px) in the vertical direction.
-        * If not present, its default value is offsetX.
-        */
-        move(offsetX: number, offsetY?: number): void;
-
-        /**
-        * Move the canvas (image wrapper) to an absolute point.
-        * @param x The left value of the canvas
-        * @param y The top value of the canvas
-        * If not present, its default value is x.
-        */
-        moveTo(x: number, y?: number): void;
-
-        /**
-        * Zoom the canvas (image wrapper) with a relative ratio.
-        * Zoom in: requires a positive number (ratio > 0)
-        * Zoom out: requires a negative number (ratio < 0)
-        */
-        zoom(ratio: number): void;
-
-        /**
-        * Rotate the canvas (image wrapper) with a relative degree.
-        * Rotate right: requires a positive number (degree > 0)
-        * Rotate left: requires a negative number (degree < 0)
-        */
-        rotate(degree: number): void;
-
-        /**
-        * Clear the crop box.
-        */
-        clear(): void;
-
-        /**
-        * Output the cropped area position and size data (base on the original image).
-        */
-        getData(rounded?: boolean): Data;
-
-        /**
-        * Change the cropped area position and size with new data (base on the original image).
-        */
-        setData(data: Data): void;
-
-        /**
-        * Output the container size data.
-        */
-        getContainerData(): ContainerData;
-
-        /**
-        * Output the image position, size and other related data.
-        */
-        getImageData(): ImageData;
-
-        /**
-        * Output the canvas (image wrapper) position and size data.
-        */
-        getCanvasData(): CanvasData & {
-            /**
-            * the natural width of the canvas (read only)
-            */
-            naturalWidth: number;
-            /**
-            * the natural height of the canvas (read only)
-            */
-            naturalHeight: number;
-        };
-
-        /**
-        * Change the canvas (image wrapper) position and size with new data.
-        */
-        setCanvasData(data: CanvasData): void;
-
-        /**
-        * Output the crop box position and size data.
-        */
-        getCropBoxData(): CropBoxData;
-
-        /**
-        * Change the crop box position and size with new data.
-        */
-        setCropBoxData(data: CropBoxData): void;
-
-        /**
-        * Get a canvas drawn the cropped image.
-        */
-        getCroppedCanvas(options?: CroppedCanvasOptions): HTMLCanvasElement;
-
-        /**
-        * Change the aspect ratio of the crop box.
-        */
-        setAspectRatio(aspectRatio: number): void;
-
-        /**
-        * Change the drag mode.
-        */
-        setDragMode(mode?: 'none' | 'crop' | 'move'): void;
-
-    }
-}
-
-declare module "cropperjs" {
-    const Cropper: typeof cropperjs.Cropper;
-    export = Cropper;
-}
diff --git a/cropperjs/index.d.ts b/cropperjs/index.d.ts
new file mode 100644
index 0000000000..0759f97732
--- /dev/null
+++ b/cropperjs/index.d.ts
@@ -0,0 +1,452 @@
+// Type definitions for cropperjs
+// Project: https://github.com/fengyuanchen/cropperjs
+// Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare const Cropper: typeof cropperjs.Cropper;
+export = Cropper;
+export as namespace Cropper;
+
+declare module cropperjs {
+    export enum CropperViewMods {
+        CropBoxIsJustWithInTheContainer = 0,
+        CropBoxShouldBeWithInTheCanvas = 1,
+        CanvasShouldNotBeWithInTheContainer = 2,
+        ContainerSshouldBeWithInTheCanvas = 3
+    }
+    export interface CropperOptions {
+        /**
+        * Define the view mode of the cropper.
+        * @default 0
+        */
+        viewMode?: CropperViewMods;
+        /**
+        * Define the dragging mode of the cropper.
+        * 'crop': create a new crop box
+        * 'move': move the canvas
+        * 'none': do nothing
+        */
+        dragMode?: string;
+        /**
+        * Set the aspect ratio of the crop box. By default, the crop box is free ratio.
+        * @default Nan
+        */
+        aspectRatio?: number;
+        /**
+        * The previous cropped data if you had stored, will be passed to setData method automatically.
+        * @default null
+        */
+        data?: Object;
+        /**
+        * Add extra elements (containers) for previewing.
+        * Valid selector for Document.querySelectorAll
+        * @default ''
+        */
+        preview?: string;
+        /**
+        * Rebuild the cropper when resize the window.
+        * @default true
+        */
+        responsive?: boolean;
+        /**
+        * By default, the plugin will check the image origin, and if it is a cross-origin image,
+        * a crossOrigin attribute will be added to the image element and a timestamp will be added to the image url to reload the image for "getCroppedCanvas".
+        * By adding crossOrigin attribute to image will stop adding timestamp to image url, and stop reload of image.
+        * @default true
+        */
+        checkCrossOrigin?: boolean;
+        /**
+        * Show the black modal above the image and under the crop box.
+        * @default true
+        */
+        modal?: boolean;
+        /**
+        * Show the dashed lines above the crop box.
+        * @default true
+        */
+        guides?: boolean;
+        /**
+        * Show the center indicator above the crop box.
+        * @default true
+        */
+        center?: boolean;
+        /**
+        * Show the white modal above the crop box (highlight the crop box).
+        * @default true
+        */
+        highlight?: boolean;
+        /**
+        * Show the grid background of the container.
+        * @default true
+        */
+        background?: boolean;
+        /**
+        * Enable to crop the image automatically when initialize.
+        * @default true
+        */
+        autoCrop?: boolean;
+        /**
+        * A number between 0 and 1. Define the automatic cropping area size (percentage).
+        * @default 0.8 (80% of the image)
+        */
+        autoCropArea?: number;
+        /**
+        * Enable to move the image.
+        * @default true
+        */
+        movable?: boolean;
+        /**
+        * Enable to rotate the image.
+        * @default true
+        */
+        rotatable?: boolean;
+        /**
+        * Enable to scale the image.
+        * @default true
+        */
+        scalable?: boolean;
+        /**
+        * Enable to zoom the image.
+        * @default true
+        */
+        zoomable?: boolean;
+        /**
+        * Enable to zoom the image by dragging touch.
+        * @default true
+        */
+        zoomOnTouch?: boolean;
+        /**
+        * Enable to zoom the image by wheeling mouse.
+        * @default true
+        */
+        zoomOnWheel?: boolean;
+        /**
+        * Define zoom ratio when zoom the image by wheeling mouse.
+        * @default 0.1
+        */
+        wheelZoomRatio?: number;
+        /**
+        * Enable to move the crop box.
+        * @default true
+        */
+        cropBoxMovable?: boolean;
+        /**
+        * Enable to resize the crop box.
+        * @default true
+        */
+        cropBoxResizable?: boolean;
+        /**
+        * Enable to toggle drag mode between "crop" and "move" when click twice on the cropper.
+        * @default true
+        */
+        toggleDragModeOnDblclick?: boolean;
+        /**
+        * The minimum width of the container
+        * @default 200
+        */
+        minContainerWidth?: number;
+        /**
+        * The minimum height of the container.
+        * @default 100
+        */
+        minContainerHeight?: number;
+        /**
+        * The minimum width of the canvas (image wrapper).
+        * @default 0
+        */
+        minCanvasWidth?: number;
+        /**
+        * The minimum height of the canvas (image wrapper).
+        * @default 0
+        */
+        minCanvasHeight?: number;
+        /**
+        * The minimum width of the crop box.
+        * @default 0
+        */
+        minCropBoxWidth?: number;
+        /**
+        * The minimum height of the crop box.
+        * @default 0
+        */
+        minCropBoxHeight?: number;
+        /**
+        * This function will be called when a cropper instance starts to load an image.
+        * Return false to prevent to build
+        * @default null
+        */
+        build?: () => boolean;
+        /**
+        * This function will be called when a cropper instance has built completely.
+        * @default null
+        */
+        built?: () => void;
+    }
+    interface Data {
+        /**
+        * the offset left of the cropped area
+        */
+        x: number;
+        /**
+        * the offset top of the cropped area
+        */
+        y: number;
+        /**
+        * the width of the cropped area
+        */
+        width: number;
+        /**
+        * the height of the cropped area
+        */
+        height: number;
+        /**
+        * the rotated degrees of the image
+        */
+        rotate: number;
+        /**
+        * the scaling factor to apply on the abscissa of the image
+        */
+        scaleX: number;
+        /**
+        * the scaling factor to apply on the ordinate of the image
+        */
+        scaleY: number;
+    }
+    interface ContainerData {
+        /**
+        * The current width of the container
+        */
+        width: number;
+        /**
+        * The current height of the container
+        */
+        height: number;
+    }
+    interface CropBoxData {
+        /**
+        * the offset left of the crop box
+        */
+        left: number;
+        /**
+        * the offset top of the crop box
+        */
+        top: number;
+        /**
+        * the width of the crop box
+        */
+        width: number;
+        /**
+        * the height of the crop box
+        */
+        height: number;
+    }
+    interface CanvasData {
+        /**
+        * offset left of the canvas
+        */
+        left: number;
+        /**
+        * new offset top of the canvas
+        */
+        top: number;
+        /**
+        * new width of the canvas
+        */
+        width: number;
+        /**
+        * new height of the canvas
+        */
+        height: number;
+    }
+    interface ImageData {
+        /**
+        * the offset left of the image
+        */
+        left: number;
+        /**
+        * the offset top of the image
+        */
+        top: number;
+        /**
+        * the width of the image
+        */
+        width: number;
+        /**
+        * the height of the image
+        */
+        height: number;
+        /**
+        * the natural width of the image
+        */
+        naturalWidth: number;
+        /**
+        * the natural height of the image
+        */
+        naturalHeight: number;
+        /**
+        * the aspect ratio of the image
+        */
+        aspectRatio: number;
+        /**
+        * the rotated degrees of the image if rotated
+        */
+        rotate: number;
+        /**
+        * the scaling factor to apply on the abscissa of the image if scaled
+        */
+        scaleX: number;
+        /**
+        * the scaling factor to apply on the ordinate of the image if scaled
+        */
+        scaleY: number;
+    }
+    interface CroppedCanvasOptions {
+        /**
+        * the destination width of the output canvas
+        */
+        width?: number;
+        /**
+        * the destination height of the output canvas
+        */
+        height?: number;
+        /**
+        * a color to fill any alpha values in the output canvas
+        */
+        fillColor?: string;
+    }
+    export class Cropper {
+        constructor(element: HTMLImageElement, options: CropperOptions);
+        /**
+ 				* Show the crop box manually.
+ 				*/
+        crop(): void;
+
+        /**
+        * Clear the crop box.
+        */
+        reset(): void;
+
+        /**
+        * Replace the image's src and rebuild the cropper.
+        * @param url A new image url
+        */
+        replace(url: string): void;
+
+        /**
+        * Enable (unfreeze) the cropper.
+        */
+        enable(): void;
+
+        /**
+        * Disable (freeze) the cropper
+        */
+        disable(): void;
+
+        /**
+        * Destroy the cropper and remove the instance from the image.
+        */
+        destroy(): void;
+
+        /**
+        * Move the canvas (image wrapper) with relative offsets.
+        * @param offsetX Moving size (px) in the horizontal direction.
+        * @param offsetY Moving size (px) in the vertical direction.
+        * If not present, its default value is offsetX.
+        */
+        move(offsetX: number, offsetY?: number): void;
+
+        /**
+        * Move the canvas (image wrapper) to an absolute point.
+        * @param x The left value of the canvas
+        * @param y The top value of the canvas
+        * If not present, its default value is x.
+        */
+        moveTo(x: number, y?: number): void;
+
+        /**
+        * Zoom the canvas (image wrapper) with a relative ratio.
+        * Zoom in: requires a positive number (ratio > 0)
+        * Zoom out: requires a negative number (ratio < 0)
+        */
+        zoom(ratio: number): void;
+
+        /**
+        * Rotate the canvas (image wrapper) with a relative degree.
+        * Rotate right: requires a positive number (degree > 0)
+        * Rotate left: requires a negative number (degree < 0)
+        */
+        rotate(degree: number): void;
+
+        /**
+        * Clear the crop box.
+        */
+        clear(): void;
+
+        /**
+        * Output the cropped area position and size data (base on the original image).
+        */
+        getData(rounded?: boolean): Data;
+
+        /**
+        * Change the cropped area position and size with new data (base on the original image).
+        */
+        setData(data: Data): void;
+
+        /**
+        * Output the container size data.
+        */
+        getContainerData(): ContainerData;
+
+        /**
+        * Output the image position, size and other related data.
+        */
+        getImageData(): ImageData;
+
+        /**
+        * Output the canvas (image wrapper) position and size data.
+        */
+        getCanvasData(): CanvasData & {
+            /**
+            * the natural width of the canvas (read only)
+            */
+            naturalWidth: number;
+            /**
+            * the natural height of the canvas (read only)
+            */
+            naturalHeight: number;
+        };
+
+        /**
+        * Change the canvas (image wrapper) position and size with new data.
+        */
+        setCanvasData(data: CanvasData): void;
+
+        /**
+        * Output the crop box position and size data.
+        */
+        getCropBoxData(): CropBoxData;
+
+        /**
+        * Change the crop box position and size with new data.
+        */
+        setCropBoxData(data: CropBoxData): void;
+
+        /**
+        * Get a canvas drawn the cropped image.
+        */
+        getCroppedCanvas(options?: CroppedCanvasOptions): HTMLCanvasElement;
+
+        /**
+        * Change the aspect ratio of the crop box.
+        */
+        setAspectRatio(aspectRatio: number): void;
+
+        /**
+        * Change the drag mode.
+        */
+        setDragMode(mode?: 'none' | 'crop' | 'move'): void;
+
+    }
+}
+
diff --git a/cropperjs/tsconfig.json b/cropperjs/tsconfig.json
new file mode 100644
index 0000000000..1fd5d93561
--- /dev/null
+++ b/cropperjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cropperjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cross-storage/cross-storage-tests.ts b/cross-storage/cross-storage-tests.ts
index 9e6b4204ab..66373c79db 100644
--- a/cross-storage/cross-storage-tests.ts
+++ b/cross-storage/cross-storage-tests.ts
@@ -1,8 +1,5 @@
-/// <reference path="./cross-storage.d.ts"/>
-
 import { CrossStorageClient, CrossStorageHub } from "cross-storage";
 
-
 const client = new CrossStorageClient("http://foo.com", {
   timeout: 0,
   frameId: "null"
diff --git a/cross-storage/cross-storage.d.ts b/cross-storage/cross-storage.d.ts
deleted file mode 100644
index 05e1b0ac1f..0000000000
--- a/cross-storage/cross-storage.d.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-// Type definitions for cross-storage v0.8.1
-// Project: https://github.com/zendesk/cross-storage
-// Definitions by: Daniel Chao <http://dchao.co/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "cross-storage" {
-  interface CrossStorageClientOptions {
-    timeout?: number;
-    promise?: any;
-    frameId?: string;
-  }
-
-  type CrossStorageMethod = "get" | "set" | "del" | "getKeys" | "clear";
-
-  interface SubDomain {
-    origin: RegExp;
-    allow: CrossStorageMethod[];
-  }
-
-  export class CrossStorageClient {
-
-    /**
-     * Constructs a new cross storage client given the url to a hub. By default, an iframe is created 
-     * within the document body that points to the url. It also accepts an options object, which may include 
-     * a timeout, frameId, and promise. The timeout, in milliseconds, is applied to each request and defaults 
-     * to 5000ms. The options object may also include a frameId, identifying an existing frame on which to 
-     * install its listeners. If the promise key is supplied the constructor for a Promise, that Promise 
-     * library will be used instead of the default window.Promise.
-     */
-    constructor (hubUrl: string, opts: CrossStorageClientOptions)
-
-    /**
-     * Returns a promise that is fulfilled when a connection has been established with the cross storage 
-     * hub. Its use is required to avoid sending any requests prior to initialization being complete.
-     */
-    onConnect (): Promise<void>;
-
-    /**
-     * Sets a key to the specified value, optionally accepting a ttl to passively expire the key after a 
-     * number of milliseconds. Returns a promise that is fulfilled on success, or rejected if any errors 
-     * setting the key occurred, or the request timed out.
-     */
-    set (key: string, value: any, ttl?: number): Promise<void>;
-    /**
-     * Accepts one or more keys for which to retrieve their values. Returns a promise that is settled on 
-     * hub response or timeout. On success, it is fulfilled with the value of the key if only passed a 
-     * single argument. Otherwise it's resolved with an array of values. On failure, it is rejected with 
-     * the corresponding error message.
-     */
-    get (key: string): Promise<any>;
-    get (...keys: string[]): Promise<any[]>;
-
-    /**
-     * Accepts one or more keys for deletion. Returns a promise that is settled on hub response or timeout.
-     */
-    del (...keys: string[]): Promise<void>;
-
-    /**
-     * Returns a promise that, when resolved, passes an array of keys currently in storage.
-     */
-    getKeys(): Promise<string[]>;
-
-    /**
-     * Returns a promise that, when resolved, passes an array of keys currently in storage.
-     */
-    clear(): Promise<void>;
-
-    /**
-     * Deletes the iframe and sets the connected state to false. The client can no longer be used after 
-     * being invoked.
-     */
-    close(): void;
-  }
-
-  export class CrossStorageHub {
-    /**
-     * Accepts an array of objects with two keys: origin and allow. The value of origin is expected to be 
-     * a RegExp, and allow, an array of strings. The cross storage hub is then initialized to accept requests 
-     * from any of the matching origins, allowing access to the associated lists of methods. Methods may 
-     * include any of: get, set, del, getKeys and clear. A 'ready' message is sent to the parent window once 
-     * complete.
-     */
-    static init (subdomains: SubDomain[]): void;
-  }
-
-}
diff --git a/cross-storage/index.d.ts b/cross-storage/index.d.ts
new file mode 100644
index 0000000000..8d425a96c8
--- /dev/null
+++ b/cross-storage/index.d.ts
@@ -0,0 +1,84 @@
+// Type definitions for cross-storage v0.8.1
+// Project: https://github.com/zendesk/cross-storage
+// Definitions by: Daniel Chao <http://dchao.co/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface CrossStorageClientOptions {
+    timeout?: number;
+    promise?: any;
+    frameId?: string;
+}
+
+type CrossStorageMethod = "get" | "set" | "del" | "getKeys" | "clear";
+
+interface SubDomain {
+    origin: RegExp;
+    allow: CrossStorageMethod[];
+}
+
+export declare class CrossStorageClient {
+
+    /**
+     * Constructs a new cross storage client given the url to a hub. By default, an iframe is created 
+     * within the document body that points to the url. It also accepts an options object, which may include 
+     * a timeout, frameId, and promise. The timeout, in milliseconds, is applied to each request and defaults 
+     * to 5000ms. The options object may also include a frameId, identifying an existing frame on which to 
+     * install its listeners. If the promise key is supplied the constructor for a Promise, that Promise 
+     * library will be used instead of the default window.Promise.
+     */
+    constructor(hubUrl: string, opts: CrossStorageClientOptions)
+
+    /**
+     * Returns a promise that is fulfilled when a connection has been established with the cross storage 
+     * hub. Its use is required to avoid sending any requests prior to initialization being complete.
+     */
+    onConnect(): Promise<void>;
+
+    /**
+     * Sets a key to the specified value, optionally accepting a ttl to passively expire the key after a 
+     * number of milliseconds. Returns a promise that is fulfilled on success, or rejected if any errors 
+     * setting the key occurred, or the request timed out.
+     */
+    set(key: string, value: any, ttl?: number): Promise<void>;
+    /**
+     * Accepts one or more keys for which to retrieve their values. Returns a promise that is settled on 
+     * hub response or timeout. On success, it is fulfilled with the value of the key if only passed a 
+     * single argument. Otherwise it's resolved with an array of values. On failure, it is rejected with 
+     * the corresponding error message.
+     */
+    get(key: string): Promise<any>;
+    get(...keys: string[]): Promise<any[]>;
+
+    /**
+     * Accepts one or more keys for deletion. Returns a promise that is settled on hub response or timeout.
+     */
+    del(...keys: string[]): Promise<void>;
+
+    /**
+     * Returns a promise that, when resolved, passes an array of keys currently in storage.
+     */
+    getKeys(): Promise<string[]>;
+
+    /**
+     * Returns a promise that, when resolved, passes an array of keys currently in storage.
+     */
+    clear(): Promise<void>;
+
+    /**
+     * Deletes the iframe and sets the connected state to false. The client can no longer be used after 
+     * being invoked.
+     */
+    close(): void;
+}
+
+export declare class CrossStorageHub {
+    /**
+     * Accepts an array of objects with two keys: origin and allow. The value of origin is expected to be 
+     * a RegExp, and allow, an array of strings. The cross storage hub is then initialized to accept requests 
+     * from any of the matching origins, allowing access to the associated lists of methods. Methods may 
+     * include any of: get, set, del, getKeys and clear. A 'ready' message is sent to the parent window once 
+     * complete.
+     */
+    static init(subdomains: SubDomain[]): void;
+}
diff --git a/cross-storage/tsconfig.json b/cross-storage/tsconfig.json
new file mode 100644
index 0000000000..c93dc10a4c
--- /dev/null
+++ b/cross-storage/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cross-storage-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/crossfilter/crossfilter-tests.ts b/crossfilter/crossfilter-tests.ts
index fb80ddd9bb..813ddae2b9 100644
--- a/crossfilter/crossfilter-tests.ts
+++ b/crossfilter/crossfilter-tests.ts
@@ -1,5 +1,5 @@
 
-/// <reference path="crossfilter.d.ts" />
+
 
 interface Payment {
     date: string;
@@ -10,24 +10,24 @@ interface Payment {
 }
 
 var payments = crossfilter<Payment>([
-  {date: "2011-11-14T16:17:54Z", quantity: 2, total: 190, tip: 100, type: "tab"},
-  {date: "2011-11-14T16:20:19Z", quantity: 2, total: 190, tip: 100, type: "tab"},
-  {date: "2011-11-14T16:28:54Z", quantity: 1, total: 300, tip: 200, type: "visa"},
-  {date: "2011-11-14T16:30:43Z", quantity: 2, total: 90, tip: 0, type: "tab"},
-  {date: "2011-11-14T16:48:46Z", quantity: 2, total: 90, tip: 0, type: "tab"},
-  {date: "2011-11-14T16:53:41Z", quantity: 2, total: 90, tip: 0, type: "tab"},
-  {date: "2011-11-14T16:54:06Z", quantity: 1, total: 100, tip: 0, type: "cash"},
-  {date: "2011-11-14T16:58:03Z", quantity: 2, total: 90, tip: 0, type: "tab"},
-  {date: "2011-11-14T17:07:21Z", quantity: 2, total: 90, tip: 0, type: "tab"},
-  {date: "2011-11-14T17:22:59Z", quantity: 2, total: 90, tip: 0, type: "tab"},
-  {date: "2011-11-14T17:25:45Z", quantity: 2, total: 200, tip: 0, type: "cash"},
-  {date: "2011-11-14T17:29:52Z", quantity: 1, total: 200, tip: 100, type: "visa"}
+  { date: "2011-11-14T16:17:54Z", quantity: 2, total: 190, tip: 100, type: "tab" },
+  { date: "2011-11-14T16:20:19Z", quantity: 2, total: 190, tip: 100, type: "tab" },
+  { date: "2011-11-14T16:28:54Z", quantity: 1, total: 300, tip: 200, type: "visa" },
+  { date: "2011-11-14T16:30:43Z", quantity: 2, total: 90, tip: 0, type: "tab" },
+  { date: "2011-11-14T16:48:46Z", quantity: 2, total: 90, tip: 0, type: "tab" },
+  { date: "2011-11-14T16:53:41Z", quantity: 2, total: 90, tip: 0, type: "tab" },
+  { date: "2011-11-14T16:54:06Z", quantity: 1, total: 100, tip: 0, type: "cash" },
+  { date: "2011-11-14T16:58:03Z", quantity: 2, total: 90, tip: 0, type: "tab" },
+  { date: "2011-11-14T17:07:21Z", quantity: 2, total: 90, tip: 0, type: "tab" },
+  { date: "2011-11-14T17:22:59Z", quantity: 2, total: 90, tip: 0, type: "tab" },
+  { date: "2011-11-14T17:25:45Z", quantity: 2, total: 200, tip: 0, type: "cash" },
+  { date: "2011-11-14T17:29:52Z", quantity: 1, total: 200, tip: 100, type: "visa" }
 ]);
 
-var total_payments : number = payments.groupAll<number>().reduce(
-    function(p,v) { return p+=v.total; },
-    function(p,v) { return p-=v.total; },
-    function() { return 0; } ).value();
+var total_payments: number = payments.groupAll<number>().reduce(
+    function(p: number, v: any) { return p += v.total; },
+    function(p: number, v: any) { return p -= v.total; },
+    function() { return 0; }).value();
 
 var paymentsByTotal = payments.dimension((d) => d.total);
 
@@ -49,13 +49,13 @@ paymentsByTotal.filterFunction(d => 0 <= d && d < 10 || 20 <= d && d < 30);
 paymentsByTotal.filterAll();                // selects all payments
 
 var topPayments = paymentsByTotal.top(4);   // the top four payments, by total
-{var p: Payment = topPayments[0];}          // the biggest payment
+{ var p: Payment = topPayments[0]; }          // the biggest payment
 topPayments[1];                             // the second-biggest payment
 
 var allPayments = paymentsByTotal.top(Infinity);
 
 var bottomPayments = paymentsByTotal.bottom(4); // the bottom four payments, by total
-{var p: Payment = bottomPayments[0];}           // the smallest payment
+{ var p: Payment = bottomPayments[0]; }           // the smallest payment
 bottomPayments[1];                              // the second-smallest payment
 
 var paymentGroupsByTotal = paymentsByTotal.group(total => Math.floor(total / 100));
@@ -71,8 +71,8 @@ paymentGroupsByTotal.reduceCount();
 var paymentsByType = payments.dimension(d => d.type),
     paymentVolumeByType = paymentsByType.group().reduceSum(d => d.total),
     topTypes = paymentVolumeByType.top(1);
-{var s: string = topTypes[0].key;}   // the top payment type (e.g., "tab")
-{var n: number = topTypes[0].value;} // the payment volume for that type (e.g., 900)
+{ var s: string = topTypes[0].key; }   // the top payment type (e.g., "tab")
+{ var n: number = topTypes[0].value; } // the payment volume for that type (e.g., 900)
 
 interface Group {
     count: number;
@@ -91,8 +91,8 @@ function reduceRemove(p: Group, v: Payment) {
   return p;
 }
 
-function reduceInitial() : Group {
-  return {count: 0, total: 0};
+function reduceInitial(): Group {
+  return { count: 0, total: 0 };
 }
 
 function orderValue(p: Group) {
diff --git a/crossfilter/crossfilter.d.ts b/crossfilter/index.d.ts
similarity index 100%
rename from crossfilter/crossfilter.d.ts
rename to crossfilter/index.d.ts
diff --git a/crossfilter/tsconfig.json b/crossfilter/tsconfig.json
new file mode 100644
index 0000000000..244fc4c0b3
--- /dev/null
+++ b/crossfilter/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "crossfilter-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/crossroads/crossroads-tests.ts b/crossroads/crossroads-tests.ts
index 26ff1dda3a..3004d851cc 100644
--- a/crossroads/crossroads-tests.ts
+++ b/crossroads/crossroads-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="crossroads.d.ts" />
+
 
 //String rule with param:
 //match '/news/123' passing "123" as param to handler
diff --git a/crossroads/crossroads.d.ts b/crossroads/crossroads.d.ts
deleted file mode 100644
index 6c3e17a832..0000000000
--- a/crossroads/crossroads.d.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-// Type definitions for Crossroads.js
-// Project: http://millermedeiros.github.io/crossroads.js/
-// Definitions by: Diullei Gomes <https://github.com/diullei>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../js-signals/js-signals.d.ts" />
-
-declare namespace CrossroadsJs {
-
-    export interface Route {
-        matched: Signal;
-
-        /**
-         * Signal dispatched every time a request "leaves" the route.
-         */
-        switched: Signal;
-
-        /**
-         * Object used to configure parameters/segments validation rules.
-         */
-        rules: any;
-
-        /**
-         * If crossroads should try to match this Route even after matching another Route.
-         */
-        greedy: boolean;
-
-        /**
-         * Remove route from crossroads and destroy it, releasing memory.
-         */
-        dispose(): void;
-
-        /**
-         * Test if Route matches against request. Return true if request validate against route rules and pattern.
-         */
-        match(request: any): boolean;
-
-        /**
-         * Return a string that matches the route replacing the capturing groups with the values provided in the replacements object.
-         */
-        interpolate(replacements: any): string;
-
-        /**
-         * Add a listener to the signal.
-         *
-         * @param listener Signal handler function.
-         * @param listenercontext Context on which listener will be executed (object that should represent the `this` variable inside listener function).
-         * @param priority The priority level of the event listener. Listeners with higher priority will be executed before listeners with lower priority. Listeners with same priority level will be executed at the same order as they were added. (default = 0)
-         */
-        add(listener: Function, listenerContext?: any, priority?: Number): SignalBinding;
-    }
-
-    export interface CrossRoadsStatic {
-
-        NORM_AS_ARRAY: Function;
-
-        NORM_AS_OBJECT: Function;
-
-        /**
-         * Creates a new route pattern listener and add it to crossroads routes collection.
-         *
-         * @param pattern String pattern or Regular Expression that should be used to match against requests.
-         * @param handler Function that should be executed when a request matches the Route pattern.
-         * @param priority Route execution priority.
-         */
-        addRoute(pattern: any, handler?: Function, priority?: number): Route;
-
-        /**
-         * Remove a single route from crossroads collection.
-         *
-         * @param route Reference to the Route object returned by crossroads.addRoute().
-         */
-        removeRoute(route: Route): void;
-
-        /**
-         * Remove all routes from crossroads collection.
-         */
-        removeAllRoutes(): void;
-
-        /**
-         * Parse a string input and dispatch matched Signal of the first Route that matches the request.
-         *
-         * @param request String that should be evaluated and matched against Routes to define which Route handlers should be executed and which parameters should be passed to the handlers.
-         * @param defaultargs Array containing values passed to matched/routed/bypassed signals as first arguments. Useful for node.js in case you need to access the request and response objects.
-         */
-        parse(request: string, ...defaultArgs: any[]): void;
-
-        /**
-         * Get number of Routes contained on the crossroads collection.
-         */
-        getNumRoutes(): number;
-
-        /**
-         * Signal dispatched every time that crossroads.parse can't find a Route that matches the request. Useful for debuging and error handling.
-         */
-        bypassed: Signal;
-
-        /**
-         * Signal dispatched every time that crossroads.parse find a Route that matches the request. Useful for debuging and for executing tasks that should happen at each routing.
-         */
-        routed: Signal;
-
-        /**
-         * Create a new independent Router instance.
-         */
-        create(): CrossRoadsStatic;
-
-        /**
-         * Sets a default function that should be used to normalize parameters before passing them to the Route.matched, works similarly to Route.rules.normalize_.
-         */
-        normalizeFn: Function;
-
-        /**
-         * Set if crossroads should typecast route paths. Default value is false (IMPORTANT: on v0.5.0 it was true by default).
-         */
-        shouldTypecast: boolean;
-
-        /**
-         * String representation of the crossroads version number (e.g. "0.6.0").
-         */
-        VERSION: string;
-
-        /**
-         * Sets global route matching behavior to greedy so crossroads will try to match every single route with the supplied request (if true it won't stop at first match).
-         */
-        greedy: boolean;
-
-        /**
-         * Sets if the greedy routes feature is enabled. If false it won't try to match multiple routes (faster).
-         */
-        greedyEnabled: boolean;
-
-        /**
-         * Resets the Router internal state. Will clear reference to previously matched routes (so they won't dispatch switched signal when matching a new route) and reset last request.
-         */
-        resetState(): void;
-
-        /**
-         * Sets if Router should care about previous state, so multiple crossroads.parse() calls passing same argument would not trigger the routed, matched and bypassed signals.
-         */
-        ignoreState: boolean;
-
-        /**
-         * Pipe routers, so all crossroads.parse() calls will be forwarded to the other router as well.
-         */
-        pipe(router: CrossRoadsStatic): void;
-
-        /**
-         * "Ceci n'est pas une pipe"
-         */
-        unpipe(router: CrossRoadsStatic): void;
-    }
-}
-
-declare var crossroads: CrossroadsJs.CrossRoadsStatic;
-
-declare module 'crossroads'{
-    export = crossroads;
-}
diff --git a/crossroads/index.d.ts b/crossroads/index.d.ts
new file mode 100644
index 0000000000..f0da2a56b6
--- /dev/null
+++ b/crossroads/index.d.ts
@@ -0,0 +1,159 @@
+// Type definitions for Crossroads.js
+// Project: http://millermedeiros.github.io/crossroads.js/
+// Definitions by: Diullei Gomes <https://github.com/diullei>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="signals" />
+
+declare namespace CrossroadsJs {
+
+    export interface Route {
+        matched: Signal;
+
+        /**
+         * Signal dispatched every time a request "leaves" the route.
+         */
+        switched: Signal;
+
+        /**
+         * Object used to configure parameters/segments validation rules.
+         */
+        rules: any;
+
+        /**
+         * If crossroads should try to match this Route even after matching another Route.
+         */
+        greedy: boolean;
+
+        /**
+         * Remove route from crossroads and destroy it, releasing memory.
+         */
+        dispose(): void;
+
+        /**
+         * Test if Route matches against request. Return true if request validate against route rules and pattern.
+         */
+        match(request: any): boolean;
+
+        /**
+         * Return a string that matches the route replacing the capturing groups with the values provided in the replacements object.
+         */
+        interpolate(replacements: any): string;
+
+        /**
+         * Add a listener to the signal.
+         *
+         * @param listener Signal handler function.
+         * @param listenercontext Context on which listener will be executed (object that should represent the `this` variable inside listener function).
+         * @param priority The priority level of the event listener. Listeners with higher priority will be executed before listeners with lower priority. Listeners with same priority level will be executed at the same order as they were added. (default = 0)
+         */
+        add(listener: Function, listenerContext?: any, priority?: Number): SignalBinding;
+    }
+
+    export interface CrossRoadsStatic {
+
+        NORM_AS_ARRAY: Function;
+
+        NORM_AS_OBJECT: Function;
+
+        /**
+         * Creates a new route pattern listener and add it to crossroads routes collection.
+         *
+         * @param pattern String pattern or Regular Expression that should be used to match against requests.
+         * @param handler Function that should be executed when a request matches the Route pattern.
+         * @param priority Route execution priority.
+         */
+        addRoute(pattern: any, handler?: Function, priority?: number): Route;
+
+        /**
+         * Remove a single route from crossroads collection.
+         *
+         * @param route Reference to the Route object returned by crossroads.addRoute().
+         */
+        removeRoute(route: Route): void;
+
+        /**
+         * Remove all routes from crossroads collection.
+         */
+        removeAllRoutes(): void;
+
+        /**
+         * Parse a string input and dispatch matched Signal of the first Route that matches the request.
+         *
+         * @param request String that should be evaluated and matched against Routes to define which Route handlers should be executed and which parameters should be passed to the handlers.
+         * @param defaultargs Array containing values passed to matched/routed/bypassed signals as first arguments. Useful for node.js in case you need to access the request and response objects.
+         */
+        parse(request: string, ...defaultArgs: any[]): void;
+
+        /**
+         * Get number of Routes contained on the crossroads collection.
+         */
+        getNumRoutes(): number;
+
+        /**
+         * Signal dispatched every time that crossroads.parse can't find a Route that matches the request. Useful for debuging and error handling.
+         */
+        bypassed: Signal;
+
+        /**
+         * Signal dispatched every time that crossroads.parse find a Route that matches the request. Useful for debuging and for executing tasks that should happen at each routing.
+         */
+        routed: Signal;
+
+        /**
+         * Create a new independent Router instance.
+         */
+        create(): CrossRoadsStatic;
+
+        /**
+         * Sets a default function that should be used to normalize parameters before passing them to the Route.matched, works similarly to Route.rules.normalize_.
+         */
+        normalizeFn: Function;
+
+        /**
+         * Set if crossroads should typecast route paths. Default value is false (IMPORTANT: on v0.5.0 it was true by default).
+         */
+        shouldTypecast: boolean;
+
+        /**
+         * String representation of the crossroads version number (e.g. "0.6.0").
+         */
+        VERSION: string;
+
+        /**
+         * Sets global route matching behavior to greedy so crossroads will try to match every single route with the supplied request (if true it won't stop at first match).
+         */
+        greedy: boolean;
+
+        /**
+         * Sets if the greedy routes feature is enabled. If false it won't try to match multiple routes (faster).
+         */
+        greedyEnabled: boolean;
+
+        /**
+         * Resets the Router internal state. Will clear reference to previously matched routes (so they won't dispatch switched signal when matching a new route) and reset last request.
+         */
+        resetState(): void;
+
+        /**
+         * Sets if Router should care about previous state, so multiple crossroads.parse() calls passing same argument would not trigger the routed, matched and bypassed signals.
+         */
+        ignoreState: boolean;
+
+        /**
+         * Pipe routers, so all crossroads.parse() calls will be forwarded to the other router as well.
+         */
+        pipe(router: CrossRoadsStatic): void;
+
+        /**
+         * "Ceci n'est pas une pipe"
+         */
+        unpipe(router: CrossRoadsStatic): void;
+    }
+}
+
+declare var crossroads: CrossroadsJs.CrossRoadsStatic;
+
+declare module 'crossroads'{
+    export = crossroads;
+}
diff --git a/crossroads/tsconfig.json b/crossroads/tsconfig.json
new file mode 100644
index 0000000000..8ec6c46b4a
--- /dev/null
+++ b/crossroads/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "crossroads-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/crypto-js/crypto-js-tests.ts b/crypto-js/crypto-js-tests.ts
index 199c32ef2f..b041813cfb 100644
--- a/crypto-js/crypto-js-tests.ts
+++ b/crypto-js/crypto-js-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="crypto-js.d.ts" />
+
 
 import CryptoJS = require('crypto-js');
 
diff --git a/crypto-js/crypto-js.d.ts b/crypto-js/crypto-js.d.ts
deleted file mode 100644
index 19ea3cd196..0000000000
--- a/crypto-js/crypto-js.d.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-// Type definitions for crypto-js v3.1.3
-// Project: https://github.com/evanvosberg/crypto-js
-// Definitions by: Michael Zabka <https://github.com/misak113/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace CryptoJS {
-	type Hash = (message: string, key?: string, ...options: any[]) => string;
-
-	export interface Hashes {
-		MD5: Hash;
-		SHA1: Hash;
-		SHA256: Hash;
-		SHA224: Hash;
-		SHA512: Hash;
-		SHA384: Hash;
-		SHA3: Hash;
-		RIPEMD160: Hash;
-		HmacMD5: Hash;
-		HmacSHA1: Hash;
-		HmacSHA256: Hash;
-		HmacSHA224: Hash;
-		HmacSHA512: Hash;
-		HmacSHA384: Hash;
-		HmacSHA3: Hash;
-		HmacRIPEMD160: Hash;
-		PBKDF2: Hash;
-		AES: Hash;
-		TripleDES: Hash;
-		RC4: Hash;
-		Rabbit: Hash;
-		RabbitLegacy: Hash;
-		EvpKDF: Hash;
-		format: {
-			OpenSSL: Hash;
-			Hex: Hash;
-		};
-		enc: {
-			Latin1: Hash;
-			Utf8: Hash;
-			Hex: Hash;
-			Utf16: Hash;
-			Base64: Hash;
-		};
-		mode: {
-			CFB: Hash;
-			CTR: Hash;
-			CTRGladman: Hash;
-			OFB: Hash;
-			ECB: Hash;
-		};
-		pad: {
-			Pkcs7: Hash;
-			Ansix923: Hash;
-			Iso10126: Hash;
-			Iso97971: Hash;
-			ZeroPadding: Hash;
-			NoPadding: Hash;
-		};
-	}
-
-	export var hashes: Hashes;
-}
-
-declare module 'crypto-js' {
-	import hashes = CryptoJS.hashes;
-	export = hashes;
-}
diff --git a/crypto-js/index.d.ts b/crypto-js/index.d.ts
new file mode 100644
index 0000000000..875cb018bc
--- /dev/null
+++ b/crypto-js/index.d.ts
@@ -0,0 +1,68 @@
+// Type definitions for crypto-js v3.1.3
+// Project: https://github.com/evanvosberg/crypto-js
+// Definitions by: Michael Zabka <https://github.com/misak113/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+import hashes = CryptoJS.hashes;
+export = hashes;
+export as namespace CryptoJS;
+
+declare namespace CryptoJS {
+	type Hash = (message: string, key?: string, ...options: any[]) => string;
+
+	export interface Hashes {
+		MD5: Hash;
+		SHA1: Hash;
+		SHA256: Hash;
+		SHA224: Hash;
+		SHA512: Hash;
+		SHA384: Hash;
+		SHA3: Hash;
+		RIPEMD160: Hash;
+		HmacMD5: Hash;
+		HmacSHA1: Hash;
+		HmacSHA256: Hash;
+		HmacSHA224: Hash;
+		HmacSHA512: Hash;
+		HmacSHA384: Hash;
+		HmacSHA3: Hash;
+		HmacRIPEMD160: Hash;
+		PBKDF2: Hash;
+		AES: Hash;
+		TripleDES: Hash;
+		RC4: Hash;
+		Rabbit: Hash;
+		RabbitLegacy: Hash;
+		EvpKDF: Hash;
+		format: {
+			OpenSSL: Hash;
+			Hex: Hash;
+		};
+		enc: {
+			Latin1: Hash;
+			Utf8: Hash;
+			Hex: Hash;
+			Utf16: Hash;
+			Base64: Hash;
+		};
+		mode: {
+			CFB: Hash;
+			CTR: Hash;
+			CTRGladman: Hash;
+			OFB: Hash;
+			ECB: Hash;
+		};
+		pad: {
+			Pkcs7: Hash;
+			Ansix923: Hash;
+			Iso10126: Hash;
+			Iso97971: Hash;
+			ZeroPadding: Hash;
+			NoPadding: Hash;
+		};
+	}
+
+	export var hashes: Hashes;
+}
+
diff --git a/crypto-js/tsconfig.json b/crypto-js/tsconfig.json
new file mode 100644
index 0000000000..1f0223025d
--- /dev/null
+++ b/crypto-js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "crypto-js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cryptojs/all-tests.ts b/cryptojs/all-tests.ts
index 207ecda6b0..bd147a6aa6 100644
--- a/cryptojs/all-tests.ts
+++ b/cryptojs/all-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="cryptojs.d.ts" />
+
 
 /// <reference path="test/aes-profile-tests.ts" />
 /// <reference path="test/aes-tests.ts" />
diff --git a/cryptojs/all-tests.ts.tscparams b/cryptojs/all-tests.ts.tscparams
deleted file mode 100644
index e5e9ee1520..0000000000
--- a/cryptojs/all-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
\ No newline at end of file
diff --git a/cryptojs/cryptojs.d.ts b/cryptojs/cryptojs.d.ts
deleted file mode 100644
index ca7cfcc219..0000000000
--- a/cryptojs/cryptojs.d.ts
+++ /dev/null
@@ -1,469 +0,0 @@
-// Type definitions for CryptoJS 3.1.2
-// Project: https://code.google.com/p/crypto-js/
-// Definitions by: Gia Bảo @ Sân Đình <https://github.com/giabao>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare var CryptoJS: CryptoJS.CryptoJSStatic;
-
-declare namespace CryptoJS{
-    namespace lib{
-        interface Base{
-            extend(overrides: Object): Object
-            init(...args: any[]): void
-            //arguments of create() is same as init(). This is true for all subclasses
-            create(...args: any[]): Base
-            mixIn(properties: Object): void
-            clone(): Base
-        }
-
-        interface WordArray extends Base{
-            words: number[]
-            sigBytes: number
-            init(words?: number[], sigBytes?: number): void
-            create(words?: number[], sigBytes?: number): WordArray
-
-            init(typedArray: ArrayBuffer): void
-            init(typedArray: Int8Array): void
-
-            //Because TypeScript uses a structural type system then we don't need (& can't)
-            //declare oveload function init, create for the following type (same as Int8Array):
-            //then Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array
-            //Note also: Uint8ClampedArray is not defined in lib.d.ts & not supported in IE
-            //@see http://compatibility.shwups-cms.ch/en/home?&property=Uint8ClampedArray
-
-            create(typedArray: ArrayBuffer): WordArray
-            create(typedArray: Int8Array): WordArray
-
-            toString(encoder?: enc.IEncoder): string
-            concat(wordArray: WordArray): WordArray
-            clamp(): void
-            clone(): WordArray
-            random(nBytes: number): WordArray
-        }
-
-        interface BufferedBlockAlgorithm extends Base{
-            reset(): void
-            clone(): BufferedBlockAlgorithm
-        }
-
-        //tparam C - Configuration type
-        interface IHasher<C> extends BufferedBlockAlgorithm{
-            cfg: C
-            init(cfg?: C): void
-            create(cfg?: C): IHasher<C>
-
-            update(messageUpdate: string): Hasher
-            update(messageUpdate: WordArray): Hasher
-
-            finalize(messageUpdate?: string): WordArray
-            finalize(messageUpdate?: WordArray): WordArray
-
-            blockSize: number
-
-            _createHelper(hasher: Hasher): IHasherHelper<C>
-            _createHmacHelper(hasher: Hasher): IHasherHmacHelper
-
-            clone(): IHasher<C>
-        }
-        interface Hasher extends IHasher<Object>{}
-
-        //tparam C - Configuration type
-        interface IHasherHelper<C>{
-            (message: string, cfg?: C): WordArray
-            (message: WordArray, cfg?: C): WordArray
-        }
-        interface HasherHelper extends IHasherHelper<Object>{}
-
-        interface IHasherHmacHelper{
-            (message: string,     key: string): WordArray
-            (message: string,     key: WordArray): WordArray
-            (message: WordArray,  key: string): WordArray
-            (message: WordArray,  key: WordArray): WordArray
-        }
-
-        //tparam C - Configuration type
-        interface ICipher<C> extends BufferedBlockAlgorithm{
-            cfg: C
-            createEncryptor(key: WordArray, cfg?: C): ICipher<C>
-            createDecryptor(key: WordArray, cfg?: C): ICipher<C>
-
-            create(xformMode?: number, key?: WordArray, cfg?: C): ICipher<C>
-            init(xformMode?: number, key?: WordArray, cfg?: C): void
-
-            process(dataUpdate: string): WordArray
-            process(dataUpdate: WordArray): WordArray
-
-            finalize(dataUpdate?: string): WordArray
-            finalize(dataUpdate?: WordArray): WordArray
-
-            keySize: number
-            ivSize: number
-
-            _createHelper(cipher: Cipher): ICipherHelper<C>
-
-            clone(): ICipher<C>
-        }
-        interface Cipher extends ICipher<Object>{}
-
-        interface IStreamCipher<C> extends ICipher<C>{
-            drop?: number;
-
-            createEncryptor(key: WordArray, cfg?: C): IStreamCipher<C>
-            createDecryptor(key: WordArray, cfg?: C): IStreamCipher<C>
-
-            create(xformMode?: number, key?: WordArray, cfg?: C): IStreamCipher<C>
-
-            blockSize: number
-        }
-        interface StreamCipher extends IStreamCipher<Object>{}
-
-        interface BlockCipherMode extends Base{
-            createEncryptor(cipher: Cipher, iv: number[]): mode.IBlockCipherEncryptor
-            createDecryptor(cipher: Cipher, iv: number[]): mode.IBlockCipherDecryptor
-            init(cipher?: Cipher, iv?: number[]): void
-            create(cipher?: Cipher, iv?: number[]): BlockCipherMode
-        }
-
-        //BlockCipher has interface same as IStreamCipher
-        interface BlockCipher extends IStreamCipher<IBlockCipherCfg>{}
-
-        interface IBlockCipherCfg {
-            iv?: WordArray;
-            mode?: mode.IBlockCipherModeImpl //default CBC
-            padding?: pad.IPaddingImpl //default Pkcs7
-        }
-
-        interface CipherParamsData {
-            ciphertext?: lib.WordArray
-            key?: lib.WordArray
-            iv?: lib.WordArray
-            salt?: lib.WordArray
-            algorithm?: Cipher
-            mode?: mode.IBlockCipherModeImpl
-            padding?: pad.IPaddingImpl
-            blockSize?: number
-            formatter?: format.IFormatter
-        }
-
-        interface CipherParams extends Base, CipherParamsData{
-            init(cipherParams?: CipherParamsData): void
-            create(cipherParams?: CipherParamsData): CipherParams
-            toString(formatter?: format.IFormatter): string
-        }
-
-        //tparam C - Configuration type
-        interface ISerializableCipher<C extends ISerializableCipherCfg> extends Base{
-            cfg: C
-            encrypt(cipher: Cipher, message: WordArray, key: WordArray, cfg?: C): CipherParams
-            encrypt(cipher: Cipher, message: string,    key: WordArray, cfg?: C): CipherParams
-
-            decrypt(cipher: Cipher, ciphertext: CipherParamsData, key: WordArray, cfg?: C): WordArray
-            decrypt(cipher: Cipher, ciphertext: string,       key: WordArray, cfg?: C): WordArray
-        }
-
-        interface SerializableCipher extends ISerializableCipher<ISerializableCipherCfg>{}
-        interface ISerializableCipherCfg{
-            format?: format.IFormatter //default OpenSSLFormatter
-            iv?: WordArray;
-            mode?: mode.IBlockCipherModeImpl;
-            padding?: pad.IPaddingImpl;
-        }
-
-        interface IPasswordBasedCipher<C extends IPasswordBasedCipherCfg> extends Base{
-            cfg: C
-            encrypt(cipher: Cipher, message: WordArray, password: string, cfg?: C): CipherParams
-            encrypt(cipher: Cipher, message: string,    password: string, cfg?: C): CipherParams
-
-            decrypt(cipher: Cipher, ciphertext: CipherParamsData, password: string, cfg?: C): WordArray
-            decrypt(cipher: Cipher, ciphertext: string,       password: string, cfg?: C): WordArray
-        }
-
-        interface PasswordBasedCipher extends IPasswordBasedCipher<IPasswordBasedCipherCfg>{}
-        interface IPasswordBasedCipherCfg extends ISerializableCipherCfg{
-            kdf?: kdf.IKdfImpl //default OpenSSLKdf
-            mode?: mode.IBlockCipherModeImpl;
-            padding?: pad.IPaddingImpl;
-        }
-
-        /** see Cipher._createHelper */
-        interface ICipherHelper<C>{
-            encrypt(message: string,    password: string, cfg?: C): CipherParams
-            encrypt(message: string,    key: WordArray, cfg?: C): CipherParams
-            encrypt(message: WordArray, password: string, cfg?: C): CipherParams
-            encrypt(message: WordArray, key: WordArray, cfg?: C): CipherParams
-
-            decrypt(ciphertext: string,       password: string, cfg?: C): WordArray
-            decrypt(ciphertext: string,       key: WordArray, cfg?: C): WordArray
-            decrypt(ciphertext: CipherParamsData, password: string, cfg?: C): WordArray
-            decrypt(ciphertext: CipherParamsData, key: WordArray, cfg?: C): WordArray
-        }
-
-        interface CipherHelper extends ICipherHelper<Object>{}
-        interface LibStatic{
-            Base: lib.Base
-            WordArray: lib.WordArray
-            CipherParams: lib.CipherParams
-            SerializableCipher: lib.SerializableCipher
-            PasswordBasedCipher: lib.PasswordBasedCipher
-        }
-    }
-
-    namespace enc{
-        interface IEncoder{
-            stringify(wordArray: lib.WordArray): string
-        }
-        interface IDecoder{
-            parse(s: string): lib.WordArray
-        }
-        interface ICoder extends IEncoder, IDecoder {}
-
-        interface EncStatic{
-            Hex: ICoder
-            Latin1: ICoder
-            Utf8: ICoder
-            Base64: ICoder
-            Utf16: ICoder
-            Utf16BE: ICoder
-            Utf16LE: ICoder
-        }
-    }
-
-    namespace kdf{
-        interface KdfStatic{
-            OpenSSL: IKdfImpl
-        }
-
-        interface IKdfImpl{
-            execute(password: string, keySize: number, ivSize: number, salt?: string): lib.CipherParams
-            execute(password: string, keySize: number, ivSize: number, salt?: lib.WordArray): lib.CipherParams
-        }
-    }
-
-    namespace format{
-        interface FormatStatic{
-            OpenSSL: IFormatter
-            Hex: IFormatter
-        }
-
-        interface IFormatter{
-            stringify(cipherParams: lib.CipherParamsData): string
-            parse(s: string): lib.CipherParams
-        }
-    }
-
-    namespace algo{
-        interface AlgoStatic{
-            AES: algo.AES
-            DES: algo.DES
-            TripleDES: algo.TripleDES
-
-            RabbitLegacy: algo.RabbitLegacy
-            Rabbit: algo.Rabbit
-            RC4: algo.RC4
-
-            MD5: algo.MD5
-            RIPEMD160: algo.RIPEMD160
-            SHA1: algo.SHA1
-            SHA256: algo.SHA256
-            SHA224: algo.SHA224
-            SHA384: algo.SHA384
-            SHA512: algo.SHA512
-
-            SHA3: algo.SHA3
-
-            HMAC: algo.HMAC
-
-            EvpKDF: algo.EvpKDF
-            PBKDF2: algo.PBKDF2
-
-            RC4Drop: algo.RC4Drop
-        }
-
-        interface IBlockCipherImpl extends lib.BlockCipher{
-            encryptBlock(M: number[], offset: number): void
-            decryptBlock(M: number[], offset: number): void
-
-            createEncryptor(key: lib.WordArray, cfg?: lib.CipherParamsData): IBlockCipherImpl
-            createDecryptor(key: lib.WordArray, cfg?: lib.CipherParamsData): IBlockCipherImpl
-
-            create(xformMode?: number, key?: lib.WordArray, cfg?: lib.IBlockCipherCfg): IBlockCipherImpl
-        }
-
-        interface AES extends IBlockCipherImpl{}
-        interface DES extends IBlockCipherImpl{}
-        interface TripleDES extends IBlockCipherImpl{}
-
-        interface RabbitLegacy extends lib.StreamCipher{}
-        interface Rabbit extends lib.StreamCipher{}
-        interface RC4 extends lib.StreamCipher{}
-
-        interface MD5 extends lib.Hasher{}
-        interface RIPEMD160 extends lib.Hasher{}
-        interface SHA1 extends lib.Hasher{}
-        interface SHA256 extends lib.Hasher{}
-        interface SHA224 extends lib.Hasher{}
-        interface SHA384 extends lib.Hasher{}
-        interface SHA512 extends lib.Hasher{}
-
-        interface SHA3 extends lib.IHasher<ISHA3Cfg>{}
-        interface ISHA3Cfg{
-            outputLength?: number //default 512
-        }
-
-        interface HMAC extends lib.Base{
-            init(hasher?: lib.Hasher, key?: string): void
-            init(hasher?: lib.Hasher, key?: lib.WordArray): void
-            create(hasher?: lib.Hasher, key?: string): HMAC
-            create(hasher?: lib.Hasher, key?: lib.WordArray): HMAC
-
-            update(messageUpdate: string): HMAC
-            update(messageUpdate: lib.WordArray): HMAC
-
-            finalize(messageUpdate?: string): lib.WordArray
-            finalize(messageUpdate?: lib.WordArray): lib.WordArray
-        }
-
-        interface EvpKDF extends lib.Base{
-            cfg: IEvpKDFCfg
-            init(cfg?: IEvpKDFCfg): void
-            create(cfg?: IEvpKDFCfg): EvpKDF
-            compute(password: string,         salt: string): lib.WordArray
-            compute(password: string,         salt: lib.WordArray): lib.WordArray
-            compute(password: lib.WordArray,  salt: string): lib.WordArray
-            compute(password: lib.WordArray,  salt: lib.WordArray): lib.WordArray
-        }
-        interface IEvpKDFCfg{
-            keySize?: number //default 128/32
-            hasher?: lib.Hasher //default MD5, or SHA1 with PBKDF2
-            iterations?: number //default 1
-        }
-        interface IEvpKDFHelper{
-            (password: string,         salt: string,        cfg?: IEvpKDFCfg): lib.WordArray
-            (password: string,         salt: lib.WordArray, cfg?: IEvpKDFCfg): lib.WordArray
-            (password: lib.WordArray,  salt: string,        cfg?: IEvpKDFCfg): lib.WordArray
-            (password: lib.WordArray,  salt: lib.WordArray, cfg?: IEvpKDFCfg): lib.WordArray
-        }
-
-        interface PBKDF2 extends EvpKDF{} //PBKDF2 is same as EvpKDF
-
-        interface RC4Drop extends RC4 { }
-    }
-
-    namespace mode{
-        interface ModeStatic{
-            CBC: mode.CBC
-            CFB: mode.CFB
-            CTR: mode.CTR
-            CTRGladman: mode.CTRGladman
-            ECB: mode.ECB
-            OFB: mode.OFB
-        }
-
-        interface IBlockCipherEncryptor extends lib.BlockCipherMode{
-            processBlock(words: number[], offset: number): void
-        }
-        interface IBlockCipherDecryptor extends lib.BlockCipherMode{ //exactly as IBlockCipherEncryptor
-            processBlock(words: number[], offset: number): void
-        }
-        interface IBlockCipherModeImpl extends lib.BlockCipherMode{
-            Encryptor: IBlockCipherEncryptor
-            Decryptor: IBlockCipherDecryptor
-        }
-
-        interface CBC extends IBlockCipherModeImpl{}
-        interface CFB extends IBlockCipherModeImpl{}
-        interface CTR extends IBlockCipherModeImpl{}
-        interface CTRGladman extends IBlockCipherModeImpl{}
-        interface ECB extends IBlockCipherModeImpl{}
-        interface OFB extends IBlockCipherModeImpl{}
-    }
-
-    namespace pad{
-        interface PadStatic{
-            Pkcs7: pad.Pkcs7
-            AnsiX923: pad.AnsiX923
-            Iso10126: pad.Iso10126
-            Iso97971: pad.Iso97971
-            ZeroPadding: pad.ZeroPadding
-            NoPadding: pad.NoPadding
-        }
-
-        interface IPaddingImpl{
-            pad(data: lib.WordArray, blockSize: number): void
-            unpad(data: lib.WordArray): void
-        }
-
-        interface Pkcs7 extends IPaddingImpl{}
-        interface AnsiX923 extends IPaddingImpl{}
-        interface Iso10126 extends IPaddingImpl{}
-        interface Iso97971 extends IPaddingImpl{}
-        interface ZeroPadding extends IPaddingImpl{}
-        interface NoPadding extends IPaddingImpl{}
-    }
-
-    namespace x64{
-        interface X64Static{
-            Word: x64.Word
-            WordArray: x64.WordArray
-        }
-
-        interface Word extends lib.Base{
-            high: number
-            low: number
-
-            init(high?: number, low?: number): void
-            create(high?: number, low?: number): Word
-        }
-
-        interface WordArray extends lib.Base{
-            words: Word[]
-            sigBytes: number
-
-            init(words?: Word[], sigBytes?: number): void
-            create(words?: Word[], sigBytes?: number): WordArray
-            toX32(): lib.WordArray
-            clone(): WordArray
-        }
-    }
-
-    interface CryptoJSStatic{
-        lib: lib.LibStatic
-        enc: enc.EncStatic
-        kdf: kdf.KdfStatic
-        format: format.FormatStatic
-        algo: algo.AlgoStatic
-        mode: mode.ModeStatic
-        pad: pad.PadStatic
-        x64: x64.X64Static
-
-        AES: CryptoJS.lib.ICipherHelper<CryptoJS.lib.IBlockCipherCfg>
-        DES: CryptoJS.lib.ICipherHelper<CryptoJS.lib.IBlockCipherCfg>
-        TripleDES: CryptoJS.lib.ICipherHelper<CryptoJS.lib.IBlockCipherCfg>
-
-        RabbitLegacy: CryptoJS.lib.CipherHelper
-        Rabbit: CryptoJS.lib.CipherHelper
-        RC4: CryptoJS.lib.CipherHelper
-        RC4Drop: CryptoJS.lib.ICipherHelper<Object>
-
-        MD5: CryptoJS.lib.HasherHelper
-        HmacMD5: CryptoJS.lib.IHasherHmacHelper
-        RIPEMD160: CryptoJS.lib.HasherHelper
-        HmacRIPEMD160: CryptoJS.lib.IHasherHmacHelper
-        SHA1: CryptoJS.lib.HasherHelper
-        HmacSHA1: CryptoJS.lib.IHasherHmacHelper
-        SHA256: CryptoJS.lib.HasherHelper
-        HmacSHA256: CryptoJS.lib.IHasherHmacHelper
-        SHA224: CryptoJS.lib.HasherHelper
-        HmacSHA224: CryptoJS.lib.IHasherHmacHelper
-        SHA512: CryptoJS.lib.HasherHelper
-        HmacSHA512: CryptoJS.lib.IHasherHmacHelper
-        SHA384: CryptoJS.lib.HasherHelper
-        HmacSHA384: CryptoJS.lib.IHasherHmacHelper
-
-        SHA3: CryptoJS.lib.IHasherHelper<CryptoJS.algo.ISHA3Cfg>
-        HmacSHA3: CryptoJS.lib.IHasherHmacHelper
-
-        EvpKDF: CryptoJS.algo.IEvpKDFHelper
-        PBKDF2: CryptoJS.algo.IEvpKDFHelper //PBKDF2 is same as EvpKDF
-    }
-}
diff --git a/cryptojs/index.d.ts b/cryptojs/index.d.ts
new file mode 100644
index 0000000000..d537641462
--- /dev/null
+++ b/cryptojs/index.d.ts
@@ -0,0 +1,465 @@
+// Type definitions for CryptoJS 3.1.2
+// Project: https://code.google.com/p/crypto-js/
+// Definitions by: Gia Bảo @ Sân Đình <https://github.com/giabao>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var CryptoJS: CryptoJS.CryptoJSStatic;
+
+declare namespace CryptoJS{
+    namespace lib{
+        type SomeArray = ArrayBuffer |
+                        Int8Array | Int16Array | Int32Array |
+                        Uint8Array | Uint16Array | Uint32Array;
+
+        interface Base{
+            extend(overrides: Object): Object
+            init(...args: any[]): void
+            //arguments of create() is same as init(). This is true for all subclasses
+            create(...args: any[]): Base
+            mixIn(properties: Object): void
+            clone(): Base
+        }
+
+        interface WordArray extends Base{
+            words: number[]
+            sigBytes: number
+
+            init(typedArray: SomeArray): void
+            init(words?: number[], sigBytes?: number): void
+
+            create(typedArray: SomeArray): WordArray;
+            create(words?: number[], sigBytes?: number): WordArray
+
+            toString(encoder?: enc.IEncoder): string
+            concat(wordArray: WordArray): WordArray
+            clamp(): void
+            clone(): WordArray
+            random(nBytes: number): WordArray
+        }
+
+        interface BufferedBlockAlgorithm extends Base{
+            reset(): void
+            clone(): BufferedBlockAlgorithm
+        }
+
+        //tparam C - Configuration type
+        interface IHasher<C> extends BufferedBlockAlgorithm{
+            cfg: C
+            init(cfg?: C): void
+            create(cfg?: C): IHasher<C>
+
+            update(messageUpdate: string): Hasher
+            update(messageUpdate: WordArray): Hasher
+
+            finalize(messageUpdate?: string): WordArray
+            finalize(messageUpdate?: WordArray): WordArray
+
+            blockSize: number
+
+            _createHelper(hasher: Hasher): IHasherHelper<C>
+            _createHmacHelper(hasher: Hasher): IHasherHmacHelper
+
+            clone(): IHasher<C>
+        }
+        interface Hasher extends IHasher<Object>{}
+
+        //tparam C - Configuration type
+        interface IHasherHelper<C>{
+            (message: string, cfg?: C): WordArray
+            (message: WordArray, cfg?: C): WordArray
+        }
+        interface HasherHelper extends IHasherHelper<Object>{}
+
+        interface IHasherHmacHelper{
+            (message: string,     key: string): WordArray
+            (message: string,     key: WordArray): WordArray
+            (message: WordArray,  key: string): WordArray
+            (message: WordArray,  key: WordArray): WordArray
+        }
+
+        //tparam C - Configuration type
+        interface ICipher<C> extends BufferedBlockAlgorithm{
+            cfg: C
+            createEncryptor(key: WordArray, cfg?: C): ICipher<C>
+            createDecryptor(key: WordArray, cfg?: C): ICipher<C>
+
+            create(xformMode?: number, key?: WordArray, cfg?: C): ICipher<C>
+            init(xformMode?: number, key?: WordArray, cfg?: C): void
+
+            process(dataUpdate: string): WordArray
+            process(dataUpdate: WordArray): WordArray
+
+            finalize(dataUpdate?: string): WordArray
+            finalize(dataUpdate?: WordArray): WordArray
+
+            keySize: number
+            ivSize: number
+
+            _createHelper(cipher: Cipher): ICipherHelper<C>
+
+            clone(): ICipher<C>
+        }
+        interface Cipher extends ICipher<Object>{}
+
+        interface IStreamCipher<C> extends ICipher<C>{
+            drop?: number;
+
+            createEncryptor(key: WordArray, cfg?: C): IStreamCipher<C>
+            createDecryptor(key: WordArray, cfg?: C): IStreamCipher<C>
+
+            create(xformMode?: number, key?: WordArray, cfg?: C): IStreamCipher<C>
+
+            blockSize: number
+        }
+        interface StreamCipher extends IStreamCipher<Object>{}
+
+        interface BlockCipherMode extends Base{
+            createEncryptor(cipher: Cipher, iv: number[]): mode.IBlockCipherEncryptor
+            createDecryptor(cipher: Cipher, iv: number[]): mode.IBlockCipherDecryptor
+            init(cipher?: Cipher, iv?: number[]): void
+            create(cipher?: Cipher, iv?: number[]): BlockCipherMode
+        }
+
+        //BlockCipher has interface same as IStreamCipher
+        interface BlockCipher extends IStreamCipher<IBlockCipherCfg>{}
+
+        interface IBlockCipherCfg {
+            iv?: WordArray;
+            mode?: mode.IBlockCipherModeImpl //default CBC
+            padding?: pad.IPaddingImpl //default Pkcs7
+        }
+
+        interface CipherParamsData {
+            ciphertext?: lib.WordArray
+            key?: lib.WordArray
+            iv?: lib.WordArray
+            salt?: lib.WordArray
+            algorithm?: Cipher
+            mode?: mode.IBlockCipherModeImpl
+            padding?: pad.IPaddingImpl
+            blockSize?: number
+            formatter?: format.IFormatter
+        }
+
+        interface CipherParams extends Base, CipherParamsData{
+            init(cipherParams?: CipherParamsData): void
+            create(cipherParams?: CipherParamsData): CipherParams
+            toString(formatter?: format.IFormatter): string
+        }
+
+        //tparam C - Configuration type
+        interface ISerializableCipher<C extends ISerializableCipherCfg> extends Base{
+            cfg: C
+            encrypt(cipher: Cipher, message: WordArray, key: WordArray, cfg?: C): CipherParams
+            encrypt(cipher: Cipher, message: string,    key: WordArray, cfg?: C): CipherParams
+
+            decrypt(cipher: Cipher, ciphertext: CipherParamsData, key: WordArray, cfg?: C): WordArray
+            decrypt(cipher: Cipher, ciphertext: string,       key: WordArray, cfg?: C): WordArray
+        }
+
+        interface SerializableCipher extends ISerializableCipher<ISerializableCipherCfg>{}
+        interface ISerializableCipherCfg{
+            format?: format.IFormatter //default OpenSSLFormatter
+            iv?: WordArray;
+            mode?: mode.IBlockCipherModeImpl;
+            padding?: pad.IPaddingImpl;
+        }
+
+        interface IPasswordBasedCipher<C extends IPasswordBasedCipherCfg> extends Base{
+            cfg: C
+            encrypt(cipher: Cipher, message: WordArray, password: string, cfg?: C): CipherParams
+            encrypt(cipher: Cipher, message: string,    password: string, cfg?: C): CipherParams
+
+            decrypt(cipher: Cipher, ciphertext: CipherParamsData, password: string, cfg?: C): WordArray
+            decrypt(cipher: Cipher, ciphertext: string,       password: string, cfg?: C): WordArray
+        }
+
+        interface PasswordBasedCipher extends IPasswordBasedCipher<IPasswordBasedCipherCfg>{}
+        interface IPasswordBasedCipherCfg extends ISerializableCipherCfg{
+            kdf?: kdf.IKdfImpl //default OpenSSLKdf
+            mode?: mode.IBlockCipherModeImpl;
+            padding?: pad.IPaddingImpl;
+        }
+
+        /** see Cipher._createHelper */
+        interface ICipherHelper<C>{
+            encrypt(message: string,    password: string, cfg?: C): CipherParams
+            encrypt(message: string,    key: WordArray, cfg?: C): CipherParams
+            encrypt(message: WordArray, password: string, cfg?: C): CipherParams
+            encrypt(message: WordArray, key: WordArray, cfg?: C): CipherParams
+
+            decrypt(ciphertext: string,       password: string, cfg?: C): WordArray
+            decrypt(ciphertext: string,       key: WordArray, cfg?: C): WordArray
+            decrypt(ciphertext: CipherParamsData, password: string, cfg?: C): WordArray
+            decrypt(ciphertext: CipherParamsData, key: WordArray, cfg?: C): WordArray
+        }
+
+        interface CipherHelper extends ICipherHelper<Object>{}
+        interface LibStatic{
+            Base: lib.Base
+            WordArray: lib.WordArray
+            CipherParams: lib.CipherParams
+            SerializableCipher: lib.SerializableCipher
+            PasswordBasedCipher: lib.PasswordBasedCipher
+        }
+    }
+
+    namespace enc{
+        interface IEncoder{
+            stringify(wordArray: lib.WordArray): string
+        }
+        interface IDecoder{
+            parse(s: string): lib.WordArray
+        }
+        interface ICoder extends IEncoder, IDecoder {}
+
+        interface EncStatic{
+            Hex: ICoder
+            Latin1: ICoder
+            Utf8: ICoder
+            Base64: ICoder
+            Utf16: ICoder
+            Utf16BE: ICoder
+            Utf16LE: ICoder
+        }
+    }
+
+    namespace kdf{
+        interface KdfStatic{
+            OpenSSL: IKdfImpl
+        }
+
+        interface IKdfImpl{
+            execute(password: string, keySize: number, ivSize: number, salt?: string): lib.CipherParams
+            execute(password: string, keySize: number, ivSize: number, salt?: lib.WordArray): lib.CipherParams
+        }
+    }
+
+    namespace format{
+        interface FormatStatic{
+            OpenSSL: IFormatter
+            Hex: IFormatter
+        }
+
+        interface IFormatter{
+            stringify(cipherParams: lib.CipherParamsData): string
+            parse(s: string): lib.CipherParams
+        }
+    }
+
+    namespace algo{
+        interface AlgoStatic{
+            AES: algo.AES
+            DES: algo.DES
+            TripleDES: algo.TripleDES
+
+            RabbitLegacy: algo.RabbitLegacy
+            Rabbit: algo.Rabbit
+            RC4: algo.RC4
+
+            MD5: algo.MD5
+            RIPEMD160: algo.RIPEMD160
+            SHA1: algo.SHA1
+            SHA256: algo.SHA256
+            SHA224: algo.SHA224
+            SHA384: algo.SHA384
+            SHA512: algo.SHA512
+
+            SHA3: algo.SHA3
+
+            HMAC: algo.HMAC
+
+            EvpKDF: algo.EvpKDF
+            PBKDF2: algo.PBKDF2
+
+            RC4Drop: algo.RC4Drop
+        }
+
+        interface IBlockCipherImpl extends lib.BlockCipher{
+            encryptBlock(M: number[], offset: number): void
+            decryptBlock(M: number[], offset: number): void
+
+            createEncryptor(key: lib.WordArray, cfg?: lib.CipherParamsData): IBlockCipherImpl
+            createDecryptor(key: lib.WordArray, cfg?: lib.CipherParamsData): IBlockCipherImpl
+
+            create(xformMode?: number, key?: lib.WordArray, cfg?: lib.IBlockCipherCfg): IBlockCipherImpl
+        }
+
+        interface AES extends IBlockCipherImpl{}
+        interface DES extends IBlockCipherImpl{}
+        interface TripleDES extends IBlockCipherImpl{}
+
+        interface RabbitLegacy extends lib.StreamCipher{}
+        interface Rabbit extends lib.StreamCipher{}
+        interface RC4 extends lib.StreamCipher{}
+
+        interface MD5 extends lib.Hasher{}
+        interface RIPEMD160 extends lib.Hasher{}
+        interface SHA1 extends lib.Hasher{}
+        interface SHA256 extends lib.Hasher{}
+        interface SHA224 extends lib.Hasher{}
+        interface SHA384 extends lib.Hasher{}
+        interface SHA512 extends lib.Hasher{}
+
+        interface SHA3 extends lib.IHasher<ISHA3Cfg>{}
+        interface ISHA3Cfg{
+            outputLength?: number //default 512
+        }
+
+        interface HMAC extends lib.Base{
+            init(hasher?: lib.Hasher, key?: string): void
+            init(hasher?: lib.Hasher, key?: lib.WordArray): void
+            create(hasher?: lib.Hasher, key?: string): HMAC
+            create(hasher?: lib.Hasher, key?: lib.WordArray): HMAC
+
+            update(messageUpdate: string): HMAC
+            update(messageUpdate: lib.WordArray): HMAC
+
+            finalize(messageUpdate?: string): lib.WordArray
+            finalize(messageUpdate?: lib.WordArray): lib.WordArray
+        }
+
+        interface EvpKDF extends lib.Base{
+            cfg: IEvpKDFCfg
+            init(cfg?: IEvpKDFCfg): void
+            create(cfg?: IEvpKDFCfg): EvpKDF
+            compute(password: string,         salt: string): lib.WordArray
+            compute(password: string,         salt: lib.WordArray): lib.WordArray
+            compute(password: lib.WordArray,  salt: string): lib.WordArray
+            compute(password: lib.WordArray,  salt: lib.WordArray): lib.WordArray
+        }
+        interface IEvpKDFCfg{
+            keySize?: number //default 128/32
+            hasher?: lib.Hasher //default MD5, or SHA1 with PBKDF2
+            iterations?: number //default 1
+        }
+        interface IEvpKDFHelper{
+            (password: string,         salt: string,        cfg?: IEvpKDFCfg): lib.WordArray
+            (password: string,         salt: lib.WordArray, cfg?: IEvpKDFCfg): lib.WordArray
+            (password: lib.WordArray,  salt: string,        cfg?: IEvpKDFCfg): lib.WordArray
+            (password: lib.WordArray,  salt: lib.WordArray, cfg?: IEvpKDFCfg): lib.WordArray
+        }
+
+        interface PBKDF2 extends EvpKDF{} //PBKDF2 is same as EvpKDF
+
+        interface RC4Drop extends RC4 { }
+    }
+
+    namespace mode{
+        interface ModeStatic{
+            CBC: mode.CBC
+            CFB: mode.CFB
+            CTR: mode.CTR
+            CTRGladman: mode.CTRGladman
+            ECB: mode.ECB
+            OFB: mode.OFB
+        }
+
+        interface IBlockCipherEncryptor extends lib.BlockCipherMode{
+            processBlock(words: number[], offset: number): void
+        }
+        interface IBlockCipherDecryptor extends lib.BlockCipherMode{ //exactly as IBlockCipherEncryptor
+            processBlock(words: number[], offset: number): void
+        }
+        interface IBlockCipherModeImpl extends lib.BlockCipherMode{
+            Encryptor: IBlockCipherEncryptor
+            Decryptor: IBlockCipherDecryptor
+        }
+
+        interface CBC extends IBlockCipherModeImpl{}
+        interface CFB extends IBlockCipherModeImpl{}
+        interface CTR extends IBlockCipherModeImpl{}
+        interface CTRGladman extends IBlockCipherModeImpl{}
+        interface ECB extends IBlockCipherModeImpl{}
+        interface OFB extends IBlockCipherModeImpl{}
+    }
+
+    namespace pad{
+        interface PadStatic{
+            Pkcs7: pad.Pkcs7
+            AnsiX923: pad.AnsiX923
+            Iso10126: pad.Iso10126
+            Iso97971: pad.Iso97971
+            ZeroPadding: pad.ZeroPadding
+            NoPadding: pad.NoPadding
+        }
+
+        interface IPaddingImpl{
+            pad(data: lib.WordArray, blockSize: number): void
+            unpad(data: lib.WordArray): void
+        }
+
+        interface Pkcs7 extends IPaddingImpl{}
+        interface AnsiX923 extends IPaddingImpl{}
+        interface Iso10126 extends IPaddingImpl{}
+        interface Iso97971 extends IPaddingImpl{}
+        interface ZeroPadding extends IPaddingImpl{}
+        interface NoPadding extends IPaddingImpl{}
+    }
+
+    namespace x64{
+        interface X64Static{
+            Word: x64.Word
+            WordArray: x64.WordArray
+        }
+
+        interface Word extends lib.Base{
+            high: number
+            low: number
+
+            init(high?: number, low?: number): void
+            create(high?: number, low?: number): Word
+        }
+
+        interface WordArray extends lib.Base{
+            words: Word[]
+            sigBytes: number
+
+            init(words?: Word[], sigBytes?: number): void
+            create(words?: Word[], sigBytes?: number): WordArray
+            toX32(): lib.WordArray
+            clone(): WordArray
+        }
+    }
+
+    interface CryptoJSStatic{
+        lib: lib.LibStatic
+        enc: enc.EncStatic
+        kdf: kdf.KdfStatic
+        format: format.FormatStatic
+        algo: algo.AlgoStatic
+        mode: mode.ModeStatic
+        pad: pad.PadStatic
+        x64: x64.X64Static
+
+        AES: CryptoJS.lib.ICipherHelper<CryptoJS.lib.IBlockCipherCfg>
+        DES: CryptoJS.lib.ICipherHelper<CryptoJS.lib.IBlockCipherCfg>
+        TripleDES: CryptoJS.lib.ICipherHelper<CryptoJS.lib.IBlockCipherCfg>
+
+        RabbitLegacy: CryptoJS.lib.CipherHelper
+        Rabbit: CryptoJS.lib.CipherHelper
+        RC4: CryptoJS.lib.CipherHelper
+        RC4Drop: CryptoJS.lib.ICipherHelper<Object>
+
+        MD5: CryptoJS.lib.HasherHelper
+        HmacMD5: CryptoJS.lib.IHasherHmacHelper
+        RIPEMD160: CryptoJS.lib.HasherHelper
+        HmacRIPEMD160: CryptoJS.lib.IHasherHmacHelper
+        SHA1: CryptoJS.lib.HasherHelper
+        HmacSHA1: CryptoJS.lib.IHasherHmacHelper
+        SHA256: CryptoJS.lib.HasherHelper
+        HmacSHA256: CryptoJS.lib.IHasherHmacHelper
+        SHA224: CryptoJS.lib.HasherHelper
+        HmacSHA224: CryptoJS.lib.IHasherHmacHelper
+        SHA512: CryptoJS.lib.HasherHelper
+        HmacSHA512: CryptoJS.lib.IHasherHmacHelper
+        SHA384: CryptoJS.lib.HasherHelper
+        HmacSHA384: CryptoJS.lib.IHasherHmacHelper
+
+        SHA3: CryptoJS.lib.IHasherHelper<CryptoJS.algo.ISHA3Cfg>
+        HmacSHA3: CryptoJS.lib.IHasherHmacHelper
+
+        EvpKDF: CryptoJS.algo.IEvpKDFHelper
+        PBKDF2: CryptoJS.algo.IEvpKDFHelper //PBKDF2 is same as EvpKDF
+    }
+}
diff --git a/cryptojs/test/aes-profile-tests.ts b/cryptojs/test/aes-profile-tests.ts
index 2e9df8ceb7..fa9d648759 100644
--- a/cryptojs/test/aes-profile-tests.ts
+++ b/cryptojs/test/aes-profile-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-aes-profile', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/aes-tests.ts b/cryptojs/test/aes-tests.ts
index 81e83e594a..ec2272ff76 100644
--- a/cryptojs/test/aes-tests.ts
+++ b/cryptojs/test/aes-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-aes-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/des-profile-tests.ts b/cryptojs/test/des-profile-tests.ts
index edc9321fc8..3cd0643020 100644
--- a/cryptojs/test/des-profile-tests.ts
+++ b/cryptojs/test/des-profile-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-des-profile', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/des-tests.ts b/cryptojs/test/des-tests.ts
index 72ae365f92..3697a0acac 100644
--- a/cryptojs/test/des-tests.ts
+++ b/cryptojs/test/des-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-des-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/enc-base64-tests.ts b/cryptojs/test/enc-base64-tests.ts
index 87bfd57765..831addf9d5 100644
--- a/cryptojs/test/enc-base64-tests.ts
+++ b/cryptojs/test/enc-base64-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('enc-base64-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/enc-hex-tests.ts b/cryptojs/test/enc-hex-tests.ts
index dc960ba452..e2af406966 100644
--- a/cryptojs/test/enc-hex-tests.ts
+++ b/cryptojs/test/enc-hex-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('enc-hex-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/enc-latin1-tests.ts b/cryptojs/test/enc-latin1-tests.ts
index 5e163912e6..2d7087c060 100644
--- a/cryptojs/test/enc-latin1-tests.ts
+++ b/cryptojs/test/enc-latin1-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('enc-latin1-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/enc-utf16-tests.ts b/cryptojs/test/enc-utf16-tests.ts
index 8191cd72c9..800078ac95 100644
--- a/cryptojs/test/enc-utf16-tests.ts
+++ b/cryptojs/test/enc-utf16-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('enc-utf16-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/enc-utf8-tests.ts b/cryptojs/test/enc-utf8-tests.ts
index 7c0a0583ce..48a370b31e 100644
--- a/cryptojs/test/enc-utf8-tests.ts
+++ b/cryptojs/test/enc-utf8-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('enc-utf8-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/evpkdf-profile-tests.ts b/cryptojs/test/evpkdf-profile-tests.ts
index 7af922fbf6..978da6c00e 100644
--- a/cryptojs/test/evpkdf-profile-tests.ts
+++ b/cryptojs/test/evpkdf-profile-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-evpkdf-profile', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/evpkdf-tests.ts b/cryptojs/test/evpkdf-tests.ts
index d02a304f4e..d17eaf9fe8 100644
--- a/cryptojs/test/evpkdf-tests.ts
+++ b/cryptojs/test/evpkdf-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-evpkdf-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/format-openssl-tests.ts b/cryptojs/test/format-openssl-tests.ts
index 3f863bd8da..e21ebcdde1 100644
--- a/cryptojs/test/format-openssl-tests.ts
+++ b/cryptojs/test/format-openssl-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('format-openssl-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/hmac-profile-tests.ts b/cryptojs/test/hmac-profile-tests.ts
index 1d9a1ba75f..23f270c14d 100644
--- a/cryptojs/test/hmac-profile-tests.ts
+++ b/cryptojs/test/hmac-profile-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-hmac-profile', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/hmac-tests.ts b/cryptojs/test/hmac-tests.ts
index d40f6ce42f..ac1820561d 100644
--- a/cryptojs/test/hmac-tests.ts
+++ b/cryptojs/test/hmac-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-hmac-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/kdf-openssl-tests.ts b/cryptojs/test/kdf-openssl-tests.ts
index cc353d7e4c..0a407b9e6b 100644
--- a/cryptojs/test/kdf-openssl-tests.ts
+++ b/cryptojs/test/kdf-openssl-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('kdf-openssl-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/lib-base-tests.ts b/cryptojs/test/lib-base-tests.ts
index 38467b9076..c231def920 100644
--- a/cryptojs/test/lib-base-tests.ts
+++ b/cryptojs/test/lib-base-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('lib-base-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/lib-cipherparams-tests.ts b/cryptojs/test/lib-cipherparams-tests.ts
index 2b87034fa1..eaf23fc6d2 100644
--- a/cryptojs/test/lib-cipherparams-tests.ts
+++ b/cryptojs/test/lib-cipherparams-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('lib-cipherparams-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/lib-passwordbasedcipher-tests.ts b/cryptojs/test/lib-passwordbasedcipher-tests.ts
index d18128896e..81b00a5bad 100644
--- a/cryptojs/test/lib-passwordbasedcipher-tests.ts
+++ b/cryptojs/test/lib-passwordbasedcipher-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('lib-passwordbasedcipher-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/lib-serializablecipher-tests.ts b/cryptojs/test/lib-serializablecipher-tests.ts
index 6ea097a342..f2dceeeb47 100644
--- a/cryptojs/test/lib-serializablecipher-tests.ts
+++ b/cryptojs/test/lib-serializablecipher-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('lib-serializablecipher-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/lib-typedarrays-tests.ts b/cryptojs/test/lib-typedarrays-tests.ts
index beb3d667a7..e02c067ccb 100644
--- a/cryptojs/test/lib-typedarrays-tests.ts
+++ b/cryptojs/test/lib-typedarrays-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('lib-wordarray-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/lib-typedarrays-tests.ts.tscparams b/cryptojs/test/lib-typedarrays-tests.ts.tscparams
deleted file mode 100644
index e5e9ee1520..0000000000
--- a/cryptojs/test/lib-typedarrays-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
\ No newline at end of file
diff --git a/cryptojs/test/lib-wordarray-tests.ts b/cryptojs/test/lib-wordarray-tests.ts
index 0f210aa663..afa4c5342e 100644
--- a/cryptojs/test/lib-wordarray-tests.ts
+++ b/cryptojs/test/lib-wordarray-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('lib-wordarray-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/md5-profile-tests.ts b/cryptojs/test/md5-profile-tests.ts
index c51c735b51..3304cbab3b 100644
--- a/cryptojs/test/md5-profile-tests.ts
+++ b/cryptojs/test/md5-profile-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-md5-profile', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/md5-tests.ts b/cryptojs/test/md5-tests.ts
index 71056d1b64..d44496aae5 100644
--- a/cryptojs/test/md5-tests.ts
+++ b/cryptojs/test/md5-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-md5-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/mode-cbc-tests.ts b/cryptojs/test/mode-cbc-tests.ts
index cb6b4e18c9..64145b8dac 100644
--- a/cryptojs/test/mode-cbc-tests.ts
+++ b/cryptojs/test/mode-cbc-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('mode-cbc-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/mode-cfb-tests.ts b/cryptojs/test/mode-cfb-tests.ts
index 8727946bae..21e08b1c25 100644
--- a/cryptojs/test/mode-cfb-tests.ts
+++ b/cryptojs/test/mode-cfb-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('mode-cfb-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/mode-ctr-tests.ts b/cryptojs/test/mode-ctr-tests.ts
index a9ca0ddbb1..97e143bf94 100644
--- a/cryptojs/test/mode-ctr-tests.ts
+++ b/cryptojs/test/mode-ctr-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('mode-ctr-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/mode-ecb-tests.ts b/cryptojs/test/mode-ecb-tests.ts
index 249c2b6d24..d389c40402 100644
--- a/cryptojs/test/mode-ecb-tests.ts
+++ b/cryptojs/test/mode-ecb-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('mode-ecb-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/mode-ofb-tests.ts b/cryptojs/test/mode-ofb-tests.ts
index 89aa36c681..ba96b5dc2c 100644
--- a/cryptojs/test/mode-ofb-tests.ts
+++ b/cryptojs/test/mode-ofb-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('mode-ofb-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/pad-ansix923-tests.ts b/cryptojs/test/pad-ansix923-tests.ts
index 6b610728cc..48964f5165 100644
--- a/cryptojs/test/pad-ansix923-tests.ts
+++ b/cryptojs/test/pad-ansix923-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('pad-ansix923-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/pad-iso10126-tests.ts b/cryptojs/test/pad-iso10126-tests.ts
index 2961c9a32e..0a7f350d58 100644
--- a/cryptojs/test/pad-iso10126-tests.ts
+++ b/cryptojs/test/pad-iso10126-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('pad-iso10126-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/pad-iso97971-tests.ts b/cryptojs/test/pad-iso97971-tests.ts
index 29f1ef6af1..f59000d3c6 100644
--- a/cryptojs/test/pad-iso97971-tests.ts
+++ b/cryptojs/test/pad-iso97971-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('pad-iso97971-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/pad-pkcs7-tests.ts b/cryptojs/test/pad-pkcs7-tests.ts
index b56381daf3..3af35cfa71 100644
--- a/cryptojs/test/pad-pkcs7-tests.ts
+++ b/cryptojs/test/pad-pkcs7-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('pad-pkcs7-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/pad-zeropadding-tests.ts b/cryptojs/test/pad-zeropadding-tests.ts
index f2fdfe8f48..665ee817ba 100644
--- a/cryptojs/test/pad-zeropadding-tests.ts
+++ b/cryptojs/test/pad-zeropadding-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('pad-zeropadding-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/pbkdf2-profile-tests.ts b/cryptojs/test/pbkdf2-profile-tests.ts
index adb684c365..e13f9b5aea 100644
--- a/cryptojs/test/pbkdf2-profile-tests.ts
+++ b/cryptojs/test/pbkdf2-profile-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-pbkdf2-profile', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/pbkdf2-tests.ts b/cryptojs/test/pbkdf2-tests.ts
index 0b7cf411f8..440ca370f9 100644
--- a/cryptojs/test/pbkdf2-tests.ts
+++ b/cryptojs/test/pbkdf2-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-pbkdf2-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/rabbit-legacy-tests.ts b/cryptojs/test/rabbit-legacy-tests.ts
index 30f3687171..1bcab431ec 100644
--- a/cryptojs/test/rabbit-legacy-tests.ts
+++ b/cryptojs/test/rabbit-legacy-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-rabbit-legacy-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/rabbit-profile-tests.ts b/cryptojs/test/rabbit-profile-tests.ts
index 05bdc9a4ee..461b3a4bbd 100644
--- a/cryptojs/test/rabbit-profile-tests.ts
+++ b/cryptojs/test/rabbit-profile-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-rabbit-profile', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/rabbit-tests.ts b/cryptojs/test/rabbit-tests.ts
index a5690facee..fafb75f3d0 100644
--- a/cryptojs/test/rabbit-tests.ts
+++ b/cryptojs/test/rabbit-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-rabbit-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/rc4-profile-tests.ts b/cryptojs/test/rc4-profile-tests.ts
index 6d3145e56e..93590b5903 100644
--- a/cryptojs/test/rc4-profile-tests.ts
+++ b/cryptojs/test/rc4-profile-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-rc4-profile', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/rc4-tests.ts b/cryptojs/test/rc4-tests.ts
index a827c0921a..507d2d6189 100644
--- a/cryptojs/test/rc4-tests.ts
+++ b/cryptojs/test/rc4-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-rc4-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/ripemd160-tests.ts b/cryptojs/test/ripemd160-tests.ts
index 3173983887..d939e72ae7 100644
--- a/cryptojs/test/ripemd160-tests.ts
+++ b/cryptojs/test/ripemd160-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-ripemd160-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/sha1-profile-tests.ts b/cryptojs/test/sha1-profile-tests.ts
index e0d46c49b2..501becd9d4 100644
--- a/cryptojs/test/sha1-profile-tests.ts
+++ b/cryptojs/test/sha1-profile-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-sha1-profile', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/sha1-tests.ts b/cryptojs/test/sha1-tests.ts
index 92f87d2107..50dfe1992b 100644
--- a/cryptojs/test/sha1-tests.ts
+++ b/cryptojs/test/sha1-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-sha1-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/sha224-tests.ts b/cryptojs/test/sha224-tests.ts
index 49413aaef1..8689bb0c30 100644
--- a/cryptojs/test/sha224-tests.ts
+++ b/cryptojs/test/sha224-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-sha224-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/sha256-profile-tests.ts b/cryptojs/test/sha256-profile-tests.ts
index 899202743f..9ea0a5b0b9 100644
--- a/cryptojs/test/sha256-profile-tests.ts
+++ b/cryptojs/test/sha256-profile-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-sha256-profile', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/sha256-tests.ts b/cryptojs/test/sha256-tests.ts
index 0daf3223ec..2f03acc59c 100644
--- a/cryptojs/test/sha256-tests.ts
+++ b/cryptojs/test/sha256-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-sha256-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/sha3-profile-tests.ts b/cryptojs/test/sha3-profile-tests.ts
index 015c326d0b..83123ca1ca 100644
--- a/cryptojs/test/sha3-profile-tests.ts
+++ b/cryptojs/test/sha3-profile-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-sha3-profile', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/sha3-tests.ts b/cryptojs/test/sha3-tests.ts
index c8ab5d642e..17bbb61d41 100644
--- a/cryptojs/test/sha3-tests.ts
+++ b/cryptojs/test/sha3-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-sha3-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/sha384-tests.ts b/cryptojs/test/sha384-tests.ts
index fd4f4a4095..12ff93c61e 100644
--- a/cryptojs/test/sha384-tests.ts
+++ b/cryptojs/test/sha384-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-sha384-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/sha512-profile-tests.ts b/cryptojs/test/sha512-profile-tests.ts
index 82baed5a81..17b949989e 100644
--- a/cryptojs/test/sha512-profile-tests.ts
+++ b/cryptojs/test/sha512-profile-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-sha512-profile', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/sha512-tests.ts b/cryptojs/test/sha512-tests.ts
index c6559d7c7c..f02c084edb 100644
--- a/cryptojs/test/sha512-tests.ts
+++ b/cryptojs/test/sha512-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-sha512-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/tripledes-profile-tests.ts b/cryptojs/test/tripledes-profile-tests.ts
index e1543ff485..999f75c9c3 100644
--- a/cryptojs/test/tripledes-profile-tests.ts
+++ b/cryptojs/test/tripledes-profile-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-tripledes-profile', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/tripledes-tests.ts b/cryptojs/test/tripledes-tests.ts
index c0a795c9d6..1747c77358 100644
--- a/cryptojs/test/tripledes-tests.ts
+++ b/cryptojs/test/tripledes-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('algo-tripledes-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/x64-word-tests.ts b/cryptojs/test/x64-word-tests.ts
index f5ee66ce22..c54b7de236 100644
--- a/cryptojs/test/x64-word-tests.ts
+++ b/cryptojs/test/x64-word-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('x64-word-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/test/x64-wordarray-tests.ts b/cryptojs/test/x64-wordarray-tests.ts
index 7b11830b9e..035b6c6cd8 100644
--- a/cryptojs/test/x64-wordarray-tests.ts
+++ b/cryptojs/test/x64-wordarray-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../yui/yui.d.ts" />
-/// <reference path="../cryptojs.d.ts" />
+/// <reference types="yui" />
+
 
 YUI.add('x64-wordarray-test', function (Y) {
     var C = CryptoJS;
diff --git a/cryptojs/tsconfig.json b/cryptojs/tsconfig.json
new file mode 100644
index 0000000000..29dc64e6e5
--- /dev/null
+++ b/cryptojs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "all-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cson/cson-tests.ts b/cson/cson-tests.ts
index 62e7f064df..e5bdc67069 100644
--- a/cson/cson-tests.ts
+++ b/cson/cson-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="cson.d.ts" />
 
 import cson = require('cson');
 
diff --git a/cson/cson.d.ts b/cson/cson.d.ts
deleted file mode 100644
index 0150273c0c..0000000000
--- a/cson/cson.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// Type definitions for CSON
-// Project: https://github.com/bevry/cson
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "cson" {
-	// Create Strings
-	export function stringify(data: Object, opts?: Object, indent?: any): string;
-	export function createCSONString(data: Object, opts?: Object, next?: any): string;
-	export function createJSONString(data: Object, opts?: Object, next?: any): string;
-	export function createString(data: Object, opts?: Object, next?: any): string;
-
-	// Parse Strings
-	export function parse(data: string, opts?: Object, next?: any): Object;
-	export function parseCSONString(data: string, opts?: Object, next?: any): Object;
-	export function parseJSONString(data: string, opts?: Object, next?: any): Object;
-	export function parseCSString(data: string, opts?: Object, next?: any): Object;
-	export function parseJSString(data: string, opts?: Object, next?: any): Object;
-	export function parseString(data: string, opts?: Object, next?:any): Object;
-
-	// Parse Files
-	export function load(filePath: string, opts?: Object, next?: any): Object;
-	export function parseCSONFile(filePath: string, opts?: Object, next?: any): Object;
-	export function parseJSONFile(filePath: string, opts?: Object, next?: any): Object;
-	export function parseCSFile(filePath: string, opts?: Object, next?: any): Object;
-	export function parseJSFile(filePath: string, opts?: Object, next?: any): Object;
-
-	// Require Files
-	export function requireCSFile(filePath: string, opts?: Object, next?: any): Object;
-	export function requireJSFile(filePath: string, opts?: Object, next?: any): Object;
-	export function requireFile(filePath: string, opts?: Object, next?: any): Object;
-}
diff --git a/cson/index.d.ts b/cson/index.d.ts
new file mode 100644
index 0000000000..72b985a82d
--- /dev/null
+++ b/cson/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for CSON
+// Project: https://github.com/bevry/cson
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+// Create Strings
+export declare function stringify(data: Object, opts?: Object, indent?: any): string;
+export declare function createCSONString(data: Object, opts?: Object, next?: any): string;
+export declare function createJSONString(data: Object, opts?: Object, next?: any): string;
+export declare function createString(data: Object, opts?: Object, next?: any): string;
+
+// Parse Strings
+export declare function parse(data: string, opts?: Object, next?: any): Object;
+export declare function parseCSONString(data: string, opts?: Object, next?: any): Object;
+export declare function parseJSONString(data: string, opts?: Object, next?: any): Object;
+export declare function parseCSString(data: string, opts?: Object, next?: any): Object;
+export declare function parseJSString(data: string, opts?: Object, next?: any): Object;
+export declare function parseString(data: string, opts?: Object, next?: any): Object;
+
+// Parse Files
+export declare function load(filePath: string, opts?: Object, next?: any): Object;
+export declare function parseCSONFile(filePath: string, opts?: Object, next?: any): Object;
+export declare function parseJSONFile(filePath: string, opts?: Object, next?: any): Object;
+export declare function parseCSFile(filePath: string, opts?: Object, next?: any): Object;
+export declare function parseJSFile(filePath: string, opts?: Object, next?: any): Object;
+
+// Require Files
+export declare function requireCSFile(filePath: string, opts?: Object, next?: any): Object;
+export declare function requireJSFile(filePath: string, opts?: Object, next?: any): Object;
+export declare function requireFile(filePath: string, opts?: Object, next?: any): Object;
diff --git a/cson/tsconfig.json b/cson/tsconfig.json
new file mode 100644
index 0000000000..975bd1e506
--- /dev/null
+++ b/cson/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cson-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/css/css-tests.ts b/css/css-tests.ts
index d223679e26..81ca2a2f70 100644
--- a/css/css-tests.ts
+++ b/css/css-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./css.d.ts" />
-
 import css = require("css");
 
 // Check that user can parse, modify and persist CSS content
diff --git a/css/css.d.ts b/css/css.d.ts
deleted file mode 100644
index acea1acf0e..0000000000
--- a/css/css.d.ts
+++ /dev/null
@@ -1,258 +0,0 @@
-// Type definitions for css
-// Project: https://github.com/reworkcss/css
-// Definitions by: Ilya Verbitskiy <https://github.com/ilich>
-// Definitions: https://github.com/ilich/DefinitelyTyped
-
-/**
- * CSS parser / stringifier for Node.js
- */
-declare module "css" {
-
-	/**
-	 * css.parse options
-	 */
-	interface ParserOptions {
-		/** Silently fail on parse errors */
-		silent?: boolean;
-		/** The path to the file containing css. Makes errors and source maps more helpful, by letting them know where code comes from. */
-		source?: string;
-	}
-
-	/**
-	 * css.stringify options
-	 */
-	interface StringifyOptions {
-		/** The string used to indent the output. Defaults to two spaces. */
-		indent?: string;
-		/** Omit comments and extraneous whitespace. */
-		compress?: boolean;
-		/** Return a sourcemap along with the CSS output. 
-		 * Using the source option of css.parse is strongly recommended 
-		 * when creating a source map. Specify sourcemap: 'generator' 
-		 * to return the SourceMapGenerator object instead of serializing the source map. 
-		 */
-		sourcemap?: string;
-		/** (enabled by default, specify false to disable)
-		 *  Reads any source maps referenced by the input files 
-		 * when generating the output source map. When enabled, 
-		 * file system access may be required for reading the referenced source maps. 
-		 */
-		inputSourcemaps?: boolean;
-	}
-
-	/**
-	 * Error thrown during parsing.
-	 */
-	interface ParserError {
-		/** The full error message with the source position. */
-		message?: string;
-		/** The error message without position. */
-		reason?: string;
-		/** The value of options.source if passed to css.parse. Otherwise undefined. */
-		filename?: string;
-		line?: number;
-		column?: number;
-		/** The portion of code that couldn't be parsed. */
-		source?: string;
-	}
-
-	// ---------------------------------------------------------------------------------
-	// AST Tree
-	// ---------------------------------------------------------------------------------
-
-	/**
-	 * Information about a position in the code.
-	 * The line and column numbers are 1-based: The first line is 1 and the first column of a line is 1 (not 0).
-	 */
-	interface Position {
-		line?: number;
-		column?: number;
-	}
-
-	/**
-	 * Base AST Tree Node.
-	 */
-	interface Node {
-		/** The possible values are the ones listed in the Types section on https://github.com/reworkcss/css page. */
-		type?: string;
-		/** A reference to the parent node, or null if the node has no parent. */
-		parent?: Node;
-		/** Information about the position in the source string that corresponds to the node. */
-		position?: {
-			start?: Position;
-			end?: Position;
-			/** The value of options.source if passed to css.parse. Otherwise undefined. */
-			source?: string;
-			/** The full source string passed to css.parse. */
-			content?: string;
-		};
-	}
-
-	interface Rule extends Node {
-		/** The list of selectors of the rule, split on commas. Each selector is trimmed from whitespace and comments. */
-		selectors?: Array<string>;
-		/** Array of nodes with the types declaration and comment. */
-		declarations?: Array<Declaration|Comment>;
-	}
-
-	interface Declaration extends Node {
-		/** The property name, trimmed from whitespace and comments. May not be empty. */
-		property?: string;
-		/** The value of the property, trimmed from whitespace and comments. Empty values are allowed. */
-		value?: string;
-	}
-
-	/** 
-	 * A rule-level or declaration-level comment. Comments inside selectors, properties and values etc. are lost.
-	 */
-	interface Comment extends Node {
-		comment?: string;
-	}
-
-	/** 
-	 * The @charset at-rule. 
-	 */
-	interface Charset {
-		/** The part following @charset. */
-		charset?: string;
-	}
-
-	/**
-	 * The @custom-media at-rule 
-	 */
-	interface CustomMedia {
-		/** The ---prefixed name. */
-		name?: string;
-		/** The part following the name. */
-		media?: string;
-	}
-
-	/**
-	 * The @document at-rule.
-	 */
-	interface Document {
-		/** The part following @document. */
-		document?: string;
-		/** The vendor prefix in @document, or undefined if there is none. */
-		vendor?: string;
-		/** Array of nodes with the types rule, comment and any of the at-rule types. */
-		rules?: Array<Rule|Comment|AtRule>;
-	}
-
-	/**
-	 * The @font-face at-rule.
-	 */
-	interface FontFace {
-		/** Array of nodes with the types declaration and comment. */
-		declarations?: Array<Declaration|Comment>;
-	}
-
-	/**
-	 * The @host at-rule.
-	 */
-	interface Host {
-		/** Array of nodes with the types rule, comment and any of the at-rule types. */
-		rules?: Array<Rule|Comment|AtRule>;
-	}
-
-	/**
-	 * The @import at-rule.
-	 */
-	interface Import {
-		/** The part following @import. */
-		import?: string;
-	}
-
-	/**
-	 * The @keyframes at-rule.
-	 */
-	interface KeyFrames {
-		/** The name of the keyframes rule. */
-		name?: string;
-		/** The vendor prefix in @keyframes, or undefined if there is none. */
-		vendor?: string;
-		/** Array of nodes with the types keyframe and comment. */
-		keyframes?: Array<KeyFrame|Comment>;
-	}
-
-	interface KeyFrame {
-		/** The list of "selectors" of the keyframe rule, split on commas. Each “selector” is trimmed from whitespace. */
-		values?: Array<string>;
-		/** Array of nodes with the types declaration and comment. */
-		declarations?: Array<Declaration|Comment>;
-	}
-
-	/**
-	 * The @media at-rule.
-	 */
-	interface Media {
-		/** The part following @media. */
-		media?: string;
-		/** Array of nodes with the types rule, comment and any of the at-rule types. */
-		rules?: Array<Rule|Comment|AtRule>;
-	}
-
-	/**
-	 * The @namespace at-rule.
-	 */
-	interface Namespace {
-		/** The part following @namespace. */
-		namespace?: string;
-	}
-
-	/**
-	 * The @page at-rule.
-	 */
-	interface Page {
-		/** The list of selectors of the rule, split on commas. Each selector is trimmed from whitespace and comments. */
-		selectors?: Array<string>;
-		/** Array of nodes with the types declaration and comment. */
-		declarations?: Array<Declaration|Comment>;
-	}
-
-	/**
-	 * The @supports at-rule.
-	 */
-	interface Supports {
-		/** The part following @supports. */
-		supports?: string;
-		/** Array of nodes with the types rule, comment and any of the at-rule types. */
-		rules?: Array<Rule|Comment|AtRule>;
-	}
-
-	/** All at-rules. */
-	type AtRule = Charset|CustomMedia|Document|FontFace|Host|Import|KeyFrames|Media|Namespace|Page|Supports;
-
-	/** 
-	 * The root node returned by css.parse. 
-	 */
-	interface Stylesheet extends Node {
-		stylesheet?: {
-			/** Array of nodes with the types rule, comment and any of the at-rule types. */
-			rules?: Array<Rule|Comment|AtRule>;
-			/** Array of Errors. Errors collected during parsing when option silent is true. */
-			parsingErrors?: Array<ParserError>
-		};
-	}
-
-	// ---------------------------------------------------------------------------------
-
-	/**
-	 * Accepts a CSS string and returns an AST object.
-	 * 
-	 * @param {string} code - CSS code.
-	 * @param {ParserOptions} options - CSS parser options.
-	 * @return {Stylesheet} AST object built using provides CSS code.
-	 */
-	function parse(code: string, options?: ParserOptions): Stylesheet;
-
-	/**
-	 * Accepts an AST object (as css.parse produces) and returns a CSS string.
-	 * 
-	 * @param {Stylesheet} stylesheet - AST tree.
-	 * @param {StringifyOptions} options - AST tree to string serializaiton options.
-	 * @return {string} CSS code.
-	 */
-	function stringify(stylesheet: Stylesheet, options?: StringifyOptions): string;
-
-}
\ No newline at end of file
diff --git a/css/index.d.ts b/css/index.d.ts
new file mode 100644
index 0000000000..c892d5c3a2
--- /dev/null
+++ b/css/index.d.ts
@@ -0,0 +1,256 @@
+// Type definitions for css
+// Project: https://github.com/reworkcss/css
+// Definitions by: Ilya Verbitskiy <https://github.com/ilich>
+// Definitions: https://github.com/ilich/DefinitelyTyped
+
+/**
+ * CSS parser / stringifier for Node.js
+ */
+
+
+/**
+ * css.parse options
+ */
+export interface ParserOptions {
+    /** Silently fail on parse errors */
+    silent?: boolean;
+    /** The path to the file containing css. Makes errors and source maps more helpful, by letting them know where code comes from. */
+    source?: string;
+}
+
+/**
+ * css.stringify options
+ */
+export interface StringifyOptions {
+    /** The string used to indent the output. Defaults to two spaces. */
+    indent?: string;
+    /** Omit comments and extraneous whitespace. */
+    compress?: boolean;
+    /** Return a sourcemap along with the CSS output. 
+     * Using the source option of css.parse is strongly recommended 
+     * when creating a source map. Specify sourcemap: 'generator' 
+     * to return the SourceMapGenerator object instead of serializing the source map. 
+     */
+    sourcemap?: string;
+    /** (enabled by default, specify false to disable)
+     *  Reads any source maps referenced by the input files 
+     * when generating the output source map. When enabled, 
+     * file system access may be required for reading the referenced source maps. 
+     */
+    inputSourcemaps?: boolean;
+}
+
+/**
+ * Error thrown during parsing.
+ */
+export interface ParserError {
+    /** The full error message with the source position. */
+    message?: string;
+    /** The error message without position. */
+    reason?: string;
+    /** The value of options.source if passed to css.parse. Otherwise undefined. */
+    filename?: string;
+    line?: number;
+    column?: number;
+    /** The portion of code that couldn't be parsed. */
+    source?: string;
+}
+
+// ---------------------------------------------------------------------------------
+// AST Tree
+// ---------------------------------------------------------------------------------
+
+/**
+ * Information about a position in the code.
+ * The line and column numbers are 1-based: The first line is 1 and the first column of a line is 1 (not 0).
+ */
+export interface Position {
+    line?: number;
+    column?: number;
+}
+
+/**
+ * Base AST Tree Node.
+ */
+export interface Node {
+    /** The possible values are the ones listed in the Types section on https://github.com/reworkcss/css page. */
+    type?: string;
+    /** A reference to the parent node, or null if the node has no parent. */
+    parent?: Node;
+    /** Information about the position in the source string that corresponds to the node. */
+    position?: {
+        start?: Position;
+        end?: Position;
+        /** The value of options.source if passed to css.parse. Otherwise undefined. */
+        source?: string;
+        /** The full source string passed to css.parse. */
+        content?: string;
+    };
+}
+
+export interface Rule extends Node {
+    /** The list of selectors of the rule, split on commas. Each selector is trimmed from whitespace and comments. */
+    selectors?: Array<string>;
+    /** Array of nodes with the types declaration and comment. */
+    declarations?: Array<Declaration | Comment>;
+}
+
+export interface Declaration extends Node {
+    /** The property name, trimmed from whitespace and comments. May not be empty. */
+    property?: string;
+    /** The value of the property, trimmed from whitespace and comments. Empty values are allowed. */
+    value?: string;
+}
+
+/** 
+ * A rule-level or declaration-level comment. Comments inside selectors, properties and values etc. are lost.
+ */
+export interface Comment extends Node {
+    comment?: string;
+}
+
+/** 
+ * The @charset at-rule. 
+ */
+export interface Charset {
+    /** The part following @charset. */
+    charset?: string;
+}
+
+/**
+ * The @custom-media at-rule 
+ */
+export interface CustomMedia {
+    /** The ---prefixed name. */
+    name?: string;
+    /** The part following the name. */
+    media?: string;
+}
+
+/**
+ * The @document at-rule.
+ */
+export interface Document {
+    /** The part following @document. */
+    document?: string;
+    /** The vendor prefix in @document, or undefined if there is none. */
+    vendor?: string;
+    /** Array of nodes with the types rule, comment and any of the at-rule types. */
+    rules?: Array<Rule | Comment | AtRule>;
+}
+
+/**
+ * The @font-face at-rule.
+ */
+export interface FontFace {
+    /** Array of nodes with the types declaration and comment. */
+    declarations?: Array<Declaration | Comment>;
+}
+
+/**
+ * The @host at-rule.
+ */
+export interface Host {
+    /** Array of nodes with the types rule, comment and any of the at-rule types. */
+    rules?: Array<Rule | Comment | AtRule>;
+}
+
+/**
+ * The @import at-rule.
+ */
+export interface Import {
+    /** The part following @import. */
+    import?: string;
+}
+
+/**
+ * The @keyframes at-rule.
+ */
+export interface KeyFrames {
+    /** The name of the keyframes rule. */
+    name?: string;
+    /** The vendor prefix in @keyframes, or undefined if there is none. */
+    vendor?: string;
+    /** Array of nodes with the types keyframe and comment. */
+    keyframes?: Array<KeyFrame | Comment>;
+}
+
+export interface KeyFrame {
+    /** The list of "selectors" of the keyframe rule, split on commas. Each “selector” is trimmed from whitespace. */
+    values?: Array<string>;
+    /** Array of nodes with the types declaration and comment. */
+    declarations?: Array<Declaration | Comment>;
+}
+
+/**
+ * The @media at-rule.
+ */
+export interface Media {
+    /** The part following @media. */
+    media?: string;
+    /** Array of nodes with the types rule, comment and any of the at-rule types. */
+    rules?: Array<Rule | Comment | AtRule>;
+}
+
+/**
+ * The @namespace at-rule.
+ */
+export interface Namespace {
+    /** The part following @namespace. */
+    namespace?: string;
+}
+
+/**
+ * The @page at-rule.
+ */
+export interface Page {
+    /** The list of selectors of the rule, split on commas. Each selector is trimmed from whitespace and comments. */
+    selectors?: Array<string>;
+    /** Array of nodes with the types declaration and comment. */
+    declarations?: Array<Declaration | Comment>;
+}
+
+/**
+ * The @supports at-rule.
+ */
+export interface Supports {
+    /** The part following @supports. */
+    supports?: string;
+    /** Array of nodes with the types rule, comment and any of the at-rule types. */
+    rules?: Array<Rule | Comment | AtRule>;
+}
+
+/** All at-rules. */
+export type AtRule = Charset | CustomMedia | Document | FontFace | Host | Import | KeyFrames | Media | Namespace | Page | Supports;
+
+/** 
+ * The root node returned by css.parse. 
+ */
+export interface Stylesheet extends Node {
+    stylesheet?: {
+        /** Array of nodes with the types rule, comment and any of the at-rule types. */
+        rules?: Array<Rule | Comment | AtRule>;
+        /** Array of Errors. Errors collected during parsing when option silent is true. */
+        parsingErrors?: Array<ParserError>
+    };
+}
+
+// ---------------------------------------------------------------------------------
+
+/**
+ * Accepts a CSS string and returns an AST object.
+ * 
+ * @param {string} code - CSS code.
+ * @param {ParserOptions} options - CSS parser options.
+ * @return {Stylesheet} AST object built using provides CSS code.
+ */
+export function parse(code: string, options?: ParserOptions): Stylesheet;
+
+/**
+ * Accepts an AST object (as css.parse produces) and returns a CSS string.
+ * 
+ * @param {Stylesheet} stylesheet - AST tree.
+ * @param {StringifyOptions} options - AST tree to string serializaiton options.
+ * @return {string} CSS code.
+ */
+export function stringify(stylesheet: Stylesheet, options?: StringifyOptions): string;
diff --git a/css/tsconfig.json b/css/tsconfig.json
new file mode 100644
index 0000000000..d8748dc4ba
--- /dev/null
+++ b/css/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "css-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/csurf/csurf.d.ts b/csurf/csurf.d.ts
deleted file mode 100644
index ed2b2e68ed..0000000000
--- a/csurf/csurf.d.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// Type definitions for csurf
-// Project: https://www.npmjs.org/package/csurf
-// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare namespace Express {
-  export interface Request {
-    csrfToken(): string;
-  }
-}
-
-declare module "csurf" {
-  import express = require('express');
-
-  function csurf(options?: {
-    value?: (req: express.Request) => string;
-    cookie?: csurf.CookieOptions | boolean;
-  }): express.RequestHandler;
-
-  namespace csurf {
-    export interface CookieOptions extends express.CookieOptions {
-      key: string;
-    }
-  }
-
-  export = csurf;
-}
diff --git a/csurf/index.d.ts b/csurf/index.d.ts
new file mode 100644
index 0000000000..badf1f747a
--- /dev/null
+++ b/csurf/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for csurf
+// Project: https://www.npmjs.org/package/csurf
+// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare namespace Express {
+  export interface Request {
+    csrfToken(): string;
+  }
+}
+
+declare module "csurf" {
+  import express = require('express');
+
+  function csurf(options?: {
+    value?: (req: express.Request) => string;
+    cookie?: csurf.CookieOptions | boolean;
+  }): express.RequestHandler;
+
+  namespace csurf {
+    export interface CookieOptions extends express.CookieOptions {
+      key: string;
+    }
+  }
+
+  export = csurf;
+}
diff --git a/csurf/tsconfig.json b/csurf/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/csurf/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/csv-stringify/csv-stringify-tests.ts b/csv-stringify/csv-stringify-tests.ts
index 842a2f106a..5dd14d459c 100644
--- a/csv-stringify/csv-stringify-tests.ts
+++ b/csv-stringify/csv-stringify-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="csv-stringify.d.ts" />
 
 import stringify = require("csv-stringify");
 
diff --git a/csv-stringify/csv-stringify.d.ts b/csv-stringify/csv-stringify.d.ts
deleted file mode 100644
index a1cc16a15b..0000000000
--- a/csv-stringify/csv-stringify.d.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-// Type definitions for csv-stringify 0.0.6
-// Project: https://github.com/wdavidw/node-csv-stringify
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "csv-stringify" {
-
-	namespace stringify {
-		interface StringifyOpts {
-			/**
-			 * List of fields, applied when transform returns an object, order matters, read the transformer documentation for additionnal information, columns are auto discovered when the user write object, see the "header" option on how to print columns names on the first line.
-			 */
-			columns?: string[];
-			/**
-			 * Set the field delimiter, one character only, defaults to a comma.
-			 */
-			delimiter?: string;
-			/**
-			 * Add the value of "options.rowDelimiter" on the last line, default to true.
-			 */
-			eof?: boolean;
-			/**
-			 * Defaults to the escape read option.
-			 */
-			escape?: boolean;
-			/**
-			 * Display the column names on the first line if the columns option is provided or discovered.
-			 */
-			header?: boolean;
-			/**
-			 * String used to delimit record rows or a special value; special values are 'auto', 'unix', 'mac', 'windows', 'unicode'; defaults to 'auto' (discovered in source or 'unix' if no source is specified).
-			 */
-			lineBreaks?: string;
-			/**
-			 * Defaults to the quote read option.
-			 */
-			quote?: string;
-			/**
-			 * Boolean, default to false, quote all the non-empty fields even if not required.
-			 */
-			quoted?: boolean;
-			/**
-			 * Boolean, no default, quote empty fields? If specified, overrides quotedString for empty strings.
-			 */
-			quotedEmpty?: boolean;
-			/**
-			 * Boolean, default to false, quote all fields of type string even if not required.
-			 */
-			quotedString?: boolean;
-			/**
-			 * String used to delimit record rows or a special value; special values are 'auto', 'unix', 'mac', 'windows', 'unicode'; defaults to 'auto' (discovered in source or 'unix' if no source is specified).
-			 */
-			rowDelimiter?: string;
-
-		}
-
-		interface Stringifier extends NodeJS.ReadWriteStream {
-
-			// Stringifier stream takes array of strings
-			write(line: string[]): boolean;
-
-			// repeat declarations from NodeJS.WritableStream to avoid compile error
-			write(buffer: Buffer, cb?: Function): boolean;
-			write(str: string, cb?: Function): boolean;
-			write(str: string, encoding?: string, cb?: Function): boolean;
-		}
-	}
-
-	/**
-	 * Callback version: string in --> callback with string out
-	 */
-	function stringify(input: any[][], opts: stringify.StringifyOpts, callback: (error: Error, output: string) => void): void;
-	function stringify(input: any[][], callback: (error: Error, output: string) => void): void;
-
-	/**
-	 * Streaming stringifier
-	 */
-	function stringify(opts: stringify.StringifyOpts): stringify.Stringifier;
-
-	export = stringify;
-}
diff --git a/csv-stringify/index.d.ts b/csv-stringify/index.d.ts
new file mode 100644
index 0000000000..27694f3252
--- /dev/null
+++ b/csv-stringify/index.d.ts
@@ -0,0 +1,82 @@
+// Type definitions for csv-stringify 0.0.6
+// Project: https://github.com/wdavidw/node-csv-stringify
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+declare namespace stringify {
+    interface StringifyOpts {
+        /**
+         * List of fields, applied when transform returns an object, order matters, read the transformer documentation for additionnal information, columns are auto discovered when the user write object, see the "header" option on how to print columns names on the first line.
+         */
+        columns?: string[];
+        /**
+         * Set the field delimiter, one character only, defaults to a comma.
+         */
+        delimiter?: string;
+        /**
+         * Add the value of "options.rowDelimiter" on the last line, default to true.
+         */
+        eof?: boolean;
+        /**
+         * Defaults to the escape read option.
+         */
+        escape?: boolean;
+        /**
+         * Display the column names on the first line if the columns option is provided or discovered.
+         */
+        header?: boolean;
+        /**
+         * String used to delimit record rows or a special value; special values are 'auto', 'unix', 'mac', 'windows', 'unicode'; defaults to 'auto' (discovered in source or 'unix' if no source is specified).
+         */
+        lineBreaks?: string;
+        /**
+         * Defaults to the quote read option.
+         */
+        quote?: string;
+        /**
+         * Boolean, default to false, quote all the non-empty fields even if not required.
+         */
+        quoted?: boolean;
+        /**
+         * Boolean, no default, quote empty fields? If specified, overrides quotedString for empty strings.
+         */
+        quotedEmpty?: boolean;
+        /**
+         * Boolean, default to false, quote all fields of type string even if not required.
+         */
+        quotedString?: boolean;
+        /**
+         * String used to delimit record rows or a special value; special values are 'auto', 'unix', 'mac', 'windows', 'unicode'; defaults to 'auto' (discovered in source or 'unix' if no source is specified).
+         */
+        rowDelimiter?: string;
+
+    }
+
+    interface Stringifier extends NodeJS.ReadWriteStream {
+
+        // Stringifier stream takes array of strings
+        write(line: string[]): boolean;
+
+        // repeat declarations from NodeJS.WritableStream to avoid compile error
+        write(buffer: Buffer, cb?: Function): boolean;
+        write(str: string, cb?: Function): boolean;
+        write(str: string, encoding?: string, cb?: Function): boolean;
+    }
+}
+
+/**
+ * Callback version: string in --> callback with string out
+ */
+declare function stringify(input: any[][], opts: stringify.StringifyOpts, callback: (error: Error, output: string) => void): void;
+declare function stringify(input: any[][], callback: (error: Error, output: string) => void): void;
+
+/**
+ * Streaming stringifier
+ */
+declare function stringify(opts: stringify.StringifyOpts): stringify.Stringifier;
+
+export = stringify;
diff --git a/csv-stringify/tsconfig.json b/csv-stringify/tsconfig.json
new file mode 100644
index 0000000000..c3d7d0e4c0
--- /dev/null
+++ b/csv-stringify/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "csv-stringify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cucumber/cucumber-tests.ts b/cucumber/cucumber-tests.ts
index d6ada278c2..720c81251f 100644
--- a/cucumber/cucumber-tests.ts
+++ b/cucumber/cucumber-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="cucumber.d.ts" />
+import cucumber = require("cucumber");
 
 function StepSample() {
 	type Callback = cucumber.CallbackStepDefinition;
diff --git a/cucumber/cucumber.d.ts b/cucumber/cucumber.d.ts
deleted file mode 100644
index d0e742d9c2..0000000000
--- a/cucumber/cucumber.d.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-// Type definitions for cucumber-js
-// Project: https://github.com/cucumber/cucumber-js
-// Definitions by: Abraão Alves <https://github.com/abraaoalves>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace cucumber {
-
-	export interface CallbackStepDefinition{
-		pending : () => PromiseLike<any>;
-		(errror?:any):void;
-	}
-
-	interface StepDefinitionCode {
-		(...stepArgs: Array<string |CallbackStepDefinition>): PromiseLike<any> | any | void;
-	}
-
-	interface StepDefinitionOptions{
-		timeout?: number;
-	}
-
-	export interface StepDefinitions {
-		Given(pattern: RegExp | string, options: StepDefinitionOptions, code: StepDefinitionCode): void;
-		Given(pattern: RegExp | string, code: StepDefinitionCode): void;
-		When(pattern: RegExp | string,  options: StepDefinitionOptions, code: StepDefinitionCode): void;
-		When(pattern: RegExp | string,  code: StepDefinitionCode): void;
-		Then(pattern: RegExp | string,  options: StepDefinitionOptions, code: StepDefinitionCode): void;
-		Then(pattern: RegExp | string,  code: StepDefinitionCode): void;
-		setDefaultTimeout(time:number): void;
-	}
-
-	interface HookScenario{
-		attach(text: string, mimeType?: string, callback?: (err?:any) => void): void;
-		isFailed() : boolean;
-	}
-
-	interface HookCode {
-		(scenario: HookScenario, callback?: CallbackStepDefinition): void;
-	}
-
-	interface AroundCode{
-		(scenario: HookScenario, runScenario?: (error:string, callback?:Function)=>void): void;
-	}
-
-	export interface Hooks {
-		Before(code: HookCode): void;
-		After(code: HookCode): void;
-		Around(code: AroundCode):void;
-		setDefaultTimeout(time:number): void;
-		registerHandler(handlerOption:string, code:(event:any, callback:CallbackStepDefinition) =>void): void;
-	}
-}
-
-declare module 'cucumber'{
-	export = cucumber;
-}
diff --git a/cucumber/index.d.ts b/cucumber/index.d.ts
new file mode 100644
index 0000000000..1d27bc28f6
--- /dev/null
+++ b/cucumber/index.d.ts
@@ -0,0 +1,53 @@
+// Type definitions for cucumber-js
+// Project: https://github.com/cucumber/cucumber-js
+// Definitions by: Abraão Alves <https://github.com/abraaoalves>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = cucumber;
+
+declare namespace cucumber {
+
+	export interface CallbackStepDefinition{
+		pending : () => PromiseLike<any>;
+		(errror?:any):void;
+	}
+
+	interface StepDefinitionCode {
+		(...stepArgs: Array<string |CallbackStepDefinition>): PromiseLike<any> | any | void;
+	}
+
+	interface StepDefinitionOptions{
+		timeout?: number;
+	}
+
+	export interface StepDefinitions {
+		Given(pattern: RegExp | string, options: StepDefinitionOptions, code: StepDefinitionCode): void;
+		Given(pattern: RegExp | string, code: StepDefinitionCode): void;
+		When(pattern: RegExp | string,  options: StepDefinitionOptions, code: StepDefinitionCode): void;
+		When(pattern: RegExp | string,  code: StepDefinitionCode): void;
+		Then(pattern: RegExp | string,  options: StepDefinitionOptions, code: StepDefinitionCode): void;
+		Then(pattern: RegExp | string,  code: StepDefinitionCode): void;
+		setDefaultTimeout(time:number): void;
+	}
+
+	interface HookScenario{
+		attach(text: string, mimeType?: string, callback?: (err?:any) => void): void;
+		isFailed() : boolean;
+	}
+
+	interface HookCode {
+		(scenario: HookScenario, callback?: CallbackStepDefinition): void;
+	}
+
+	interface AroundCode{
+		(scenario: HookScenario, runScenario?: (error:string, callback?:Function)=>void): void;
+	}
+
+	export interface Hooks {
+		Before(code: HookCode): void;
+		After(code: HookCode): void;
+		Around(code: AroundCode):void;
+		setDefaultTimeout(time:number): void;
+		registerHandler(handlerOption:string, code:(event:any, callback:CallbackStepDefinition) =>void): void;
+	}
+}
diff --git a/cucumber/tsconfig.json b/cucumber/tsconfig.json
new file mode 100644
index 0000000000..cd0b1fefd7
--- /dev/null
+++ b/cucumber/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cucumber-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/cuid/cuid-tests.ts b/cuid/cuid-tests.ts
index 033f9ea833..82defb5fae 100644
--- a/cuid/cuid-tests.ts
+++ b/cuid/cuid-tests.ts
@@ -1,4 +1,3 @@
-///<reference path='cuid.d.ts' />
 
 import cuid = require('cuid')
 
diff --git a/cuid/cuid.d.ts b/cuid/cuid.d.ts
deleted file mode 100644
index a5b9429800..0000000000
--- a/cuid/cuid.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Type definitions for cuid
-// Project: https://github.com/ericelliott/cuid
-// Definitions by: Dave Keen <http://www.keendevelopment.ch>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'cuid' {
-	function cuid(): string;
-	
-	export = cuid
-}
diff --git a/cuid/index.d.ts b/cuid/index.d.ts
new file mode 100644
index 0000000000..d7979eefcd
--- /dev/null
+++ b/cuid/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for cuid
+// Project: https://github.com/ericelliott/cuid
+// Definitions by: Dave Keen <http://www.keendevelopment.ch>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function cuid(): string;
+
+export = cuid
diff --git a/cuid/tsconfig.json b/cuid/tsconfig.json
new file mode 100644
index 0000000000..17451d51c1
--- /dev/null
+++ b/cuid/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "cuid-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/custom-error-generator/custom-error-generator-tests.ts b/custom-error-generator/custom-error-generator-tests.ts
index 09ae86373e..52e11ad9ff 100644
--- a/custom-error-generator/custom-error-generator-tests.ts
+++ b/custom-error-generator/custom-error-generator-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./custom-error-generator.d.ts" />
 
 import createCustomError = require('custom-error-generator');
 var HTTPError = createCustomError('HTTPError', { 'code' : 500, 'status' : 'Server Error' });
diff --git a/custom-error-generator/custom-error-generator.d.ts b/custom-error-generator/custom-error-generator.d.ts
deleted file mode 100644
index b6c3872bda..0000000000
--- a/custom-error-generator/custom-error-generator.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Type definitions for custom-error-generator 7.0.0
-// Project: https://github.com/jproulx/node-custom-error
-// Definitions by: Thierry Miceli <https://github.com/thmiceli>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "custom-error-generator" {
-    function createError(name: string, parameters?: Object, Constructor?: any): any;
-    namespace createError {
-    }
-    export = createError;
-}
diff --git a/custom-error-generator/index.d.ts b/custom-error-generator/index.d.ts
new file mode 100644
index 0000000000..50c3e14338
--- /dev/null
+++ b/custom-error-generator/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for custom-error-generator 7.0.0
+// Project: https://github.com/jproulx/node-custom-error
+// Definitions by: Thierry Miceli <https://github.com/thmiceli>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function createError(name: string, parameters?: Object, Constructor?: any): any;
+declare namespace createError {
+}
+export = createError;
diff --git a/custom-error-generator/tsconfig.json b/custom-error-generator/tsconfig.json
new file mode 100644
index 0000000000..982b1dcbe2
--- /dev/null
+++ b/custom-error-generator/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "custom-error-generator-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/d3-dsv/d3-dsv-tests.ts b/d3-dsv/d3-dsv-tests.ts
index 44b0a6cb38..587d4d5a55 100644
--- a/d3-dsv/d3-dsv-tests.ts
+++ b/d3-dsv/d3-dsv-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="d3-dsv.d.ts" />
+
 
 import d3dsv = require("d3-dsv");
 
diff --git a/d3-dsv/d3-dsv.d.ts b/d3-dsv/d3-dsv.d.ts
deleted file mode 100644
index ef963eeeaa..0000000000
--- a/d3-dsv/d3-dsv.d.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-// Type definitions for d3-dsv
-// Project: https://www.npmjs.com/package/d3-dsv
-// Definitions by: Jason Swearingen <https://jasonswearingen.github.io>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-//commonjs loader
-declare module "d3-dsv" {
-
-	/** A parser and formatter for DSV (CSV and TSV) files.
-Extracted from D3. */
-    var loader: (
-        /** the symbol used to seperate cells in the row.*/
-        delimiter: string,
-        /** example: "text/plain" */
-        encoding?: string) => _d3dsv.D3Dsv;
-    export = loader;
-}
-declare module _d3dsv {
-	/** A parser and formatter for DSV (CSV and TSV) files.
-Extracted from D3. */
-	export class D3Dsv {
-		/** Parses the specified string, which is the contents of a CSV file, returning an array of objects representing the parsed rows. 
-		The string is assumed to be RFC4180-compliant. 
-		Unlike the parseRows method, this method requires that the first line of the CSV file contains a comma-separated list of column names; 
-		these column names become the attributes on the returned objects. 
-		For example, consider the following CSV file:
-
-Year,Make,Model,Length
-1997,Ford,E350,2.34
-2000,Mercury,Cougar,2.38
-
-The resulting JavaScript array is:
-
-[  {"Year": "1997", "Make": "Ford", "Model": "E350", "Length": "2.34"},
-  {"Year": "2000", "Make": "Mercury", "Model": "Cougar", "Length": "2.38"} ]
-		 */
-		public parse<TRow>(
-			table: string, 
-			/** coerce cells (strings) into different types or modify them. return null to strip this row from the output results. */
-			accessor?: (row: any) => TRow
-			): TRow[];
-		/** Parses the specified string, which is the contents of a CSV file, returning an array of arrays representing the parsed rows. The string is assumed to be RFC4180-compliant. Unlike the parse method, this method treats the header line as a standard row, and should be used whenever the CSV file does not contain a header. Each row is represented as an array rather than an object. Rows may have variable length. For example, consider the following CSV file:
-
-1997,Ford,E350,2.34
-2000,Mercury,Cougar,2.38
-The resulting JavaScript array is:
-
-[  ["1997", "Ford", "E350", "2.34"],
-  ["2000", "Mercury", "Cougar", "2.38"] ]
-Note that the values themselves are always strings; they will not be automatically converted to numbers. See parse for details.*/
-		public parseRows<TRow>(
-			table: string,
-			/** coerce cells (strings) into different types or modify them. return null to strip this row from the output results.*/
-			accessor?: (row: string[]) => TRow
-			): TRow[];
-		/** Converts the specified array of rows into comma-separated values format, returning a string. This operation is the reverse of parse. Each row will be separated by a newline (\n), and each column within each row will be separated by a comma (,). Values that contain either commas, double-quotes (") or newlines will be escaped using double-quotes.
-
-Each row should be an object, and all object properties will be converted into fields. For greater control over which properties are converted, convert the rows into arrays containing only the properties that should be converted and use formatRows. */
-		public format(rows: any[]): string;
-		/** Converts the specified array of rows into comma-separated values format, returning a string. This operation is the reverse of parseRows. Each row will be separated by a newline (\n), and each column within each row will be separated by a comma (,). Values that contain either commas, double-quotes (") or newlines will be escaped using double-quotes. */
-		public formatRows(rows: any[]): string;
-
-
-	}
-
-}
\ No newline at end of file
diff --git a/d3-dsv/index.d.ts b/d3-dsv/index.d.ts
new file mode 100644
index 0000000000..b798c4fcbe
--- /dev/null
+++ b/d3-dsv/index.d.ts
@@ -0,0 +1,65 @@
+// Type definitions for d3-dsv
+// Project: https://www.npmjs.com/package/d3-dsv
+// Definitions by: Jason Swearingen <https://jasonswearingen.github.io>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+	/** A parser and formatter for DSV (CSV and TSV) files.
+Extracted from D3. */
+declare var loader: (
+    /** the symbol used to seperate cells in the row.*/
+    delimiter: string,
+    /** example: "text/plain" */
+    encoding?: string) => _d3dsv.D3Dsv;
+export = loader;
+export as namespace d3_dsv;
+
+declare module _d3dsv {
+	/** A parser and formatter for DSV (CSV and TSV) files.
+Extracted from D3. */
+	export class D3Dsv {
+		/** Parses the specified string, which is the contents of a CSV file, returning an array of objects representing the parsed rows. 
+		The string is assumed to be RFC4180-compliant. 
+		Unlike the parseRows method, this method requires that the first line of the CSV file contains a comma-separated list of column names; 
+		these column names become the attributes on the returned objects. 
+		For example, consider the following CSV file:
+
+Year,Make,Model,Length
+1997,Ford,E350,2.34
+2000,Mercury,Cougar,2.38
+
+The resulting JavaScript array is:
+
+[  {"Year": "1997", "Make": "Ford", "Model": "E350", "Length": "2.34"},
+  {"Year": "2000", "Make": "Mercury", "Model": "Cougar", "Length": "2.38"} ]
+		 */
+		public parse<TRow>(
+			table: string, 
+			/** coerce cells (strings) into different types or modify them. return null to strip this row from the output results. */
+			accessor?: (row: any) => TRow
+			): TRow[];
+		/** Parses the specified string, which is the contents of a CSV file, returning an array of arrays representing the parsed rows. The string is assumed to be RFC4180-compliant. Unlike the parse method, this method treats the header line as a standard row, and should be used whenever the CSV file does not contain a header. Each row is represented as an array rather than an object. Rows may have variable length. For example, consider the following CSV file:
+
+1997,Ford,E350,2.34
+2000,Mercury,Cougar,2.38
+The resulting JavaScript array is:
+
+[  ["1997", "Ford", "E350", "2.34"],
+  ["2000", "Mercury", "Cougar", "2.38"] ]
+Note that the values themselves are always strings; they will not be automatically converted to numbers. See parse for details.*/
+		public parseRows<TRow>(
+			table: string,
+			/** coerce cells (strings) into different types or modify them. return null to strip this row from the output results.*/
+			accessor?: (row: string[]) => TRow
+			): TRow[];
+		/** Converts the specified array of rows into comma-separated values format, returning a string. This operation is the reverse of parse. Each row will be separated by a newline (\n), and each column within each row will be separated by a comma (,). Values that contain either commas, double-quotes (") or newlines will be escaped using double-quotes.
+
+Each row should be an object, and all object properties will be converted into fields. For greater control over which properties are converted, convert the rows into arrays containing only the properties that should be converted and use formatRows. */
+		public format(rows: any[]): string;
+		/** Converts the specified array of rows into comma-separated values format, returning a string. This operation is the reverse of parseRows. Each row will be separated by a newline (\n), and each column within each row will be separated by a comma (,). Values that contain either commas, double-quotes (") or newlines will be escaped using double-quotes. */
+		public formatRows(rows: any[]): string;
+
+
+	}
+
+}
\ No newline at end of file
diff --git a/d3-dsv/tsconfig.json b/d3-dsv/tsconfig.json
new file mode 100644
index 0000000000..97cab50007
--- /dev/null
+++ b/d3-dsv/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "d3-dsv-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/d3.cloud.layout/d3.cloud.layout-tests.ts b/d3.cloud.layout/d3.cloud.layout-tests.ts
index 9d5ed7b718..489af26357 100644
--- a/d3.cloud.layout/d3.cloud.layout-tests.ts
+++ b/d3.cloud.layout/d3.cloud.layout-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../d3/d3.d.ts" />
-/// <reference path="d3.cloud.layout.d.ts" />
+/// <reference types="d3" />
 
   interface ICompTextSize{
     text:string;
diff --git a/d3.cloud.layout/d3.cloud.layout.d.ts b/d3.cloud.layout/d3.cloud.layout.d.ts
deleted file mode 100644
index a66c6c7a65..0000000000
--- a/d3.cloud.layout/d3.cloud.layout.d.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-// Type definitions for d3JS cloud layout plugin by Jason Davies
-// Project: https://github.com/jasondavies/d3-cloud
-// Definitions by: hans windhoff <https://github.com/hansrwindhoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../d3/d3.d.ts" />
-
-declare namespace d3 {
-    namespace layout {
-        export function cloud(): Cloud<cloud.Word>;
-        export function cloud<T extends cloud.Word>(): Cloud<T>;
-
-        namespace cloud {
-            interface Word {
-                text?: string;
-                font?: string;
-                style?: string;
-                weight?: string | number;
-                rotate?: number;
-                size?: number;
-                padding?: number;
-                x?: number;
-                y?: number;
-            }
-        }
-
-        interface Cloud<T extends cloud.Word> {
-            start(): Cloud<T>;
-            stop(): Cloud<T>;
-
-            timeInterval(): number;
-            timeInterval(interval: number): Cloud<T>;
-
-            words(): T[];
-            words(words: T[]): Cloud<T>;
-
-            size(): [number, number];
-            size(size: [number, number]): Cloud<T>;
-
-            font(): (datum: T, index: number) => string;
-            font(font: string): Cloud<T>;
-            font(font: (datum: T, index: number) => string): Cloud<T>;
-
-            fontStyle(): (datum: T, index: number) => string;
-            fontStyle(style: string): Cloud<T>;
-            fontStyle(style: (datum: T, index: number) => string): Cloud<T>;
-
-            fontWeight(): (datum: T, index: number) => string | number;
-            fontWeight(weight: string | number): Cloud<T>;
-            fontWeight(weight: (datum: T, index: number) => string | number): Cloud<T>;
-
-            rotate(): (datum: T, index: number) => number;
-            rotate(rotate: number): Cloud<T>;
-            rotate(rotate: (datum: T, index: number) => number): Cloud<T>;
-
-            text(): (datum: T, index: number) => string;
-            text(text: string): Cloud<T>;
-            text(text: (datum: T, index: number) => string): Cloud<T>;
-
-            spiral(): (size: number) => (t: number) => [number, number];
-            spiral(name: string): Cloud<T>;
-            spiral(spiral: (size: number) => (t: number) => [number, number]): Cloud<T>;
-
-            fontSize(): (datum: T, index: number) => number;
-            fontSize(size: number): Cloud<T>;
-            fontSize(size: (datum: T, index: number) => number): Cloud<T>;
-
-            padding(): (datum: T, index: number) => number;
-            padding(padding: number): Cloud<T>;
-            padding(padding: (datum: T, index: number) => number): Cloud<T>;
-
-            on(type: "word", listener: (word: T) => void): Cloud<T>;
-            on(type: "end", listener: (tags: T[], bounds: { x: number; y: number }[]) => void): Cloud<T>;
-            on(type: string, listener: (...args: any[]) => void): Cloud<T>;
-
-            on(type: "word"): (word: T) => void;
-            on(type: "end"): (tags: T[], bounds: { x: number; y: number }[]) => void;
-            on(type: string): (...args: any[]) => void;
-        }
-    }
-}
diff --git a/d3.cloud.layout/index.d.ts b/d3.cloud.layout/index.d.ts
new file mode 100644
index 0000000000..c189c7b240
--- /dev/null
+++ b/d3.cloud.layout/index.d.ts
@@ -0,0 +1,81 @@
+// Type definitions for d3JS cloud layout plugin by Jason Davies
+// Project: https://github.com/jasondavies/d3-cloud
+// Definitions by: hans windhoff <https://github.com/hansrwindhoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as d3 from 'd3';
+
+declare module 'd3' {
+    namespace layout {
+        export function cloud(): Cloud<cloud.Word>;
+        export function cloud<T extends cloud.Word>(): Cloud<T>;
+
+        namespace cloud {
+            interface Word {
+                text?: string;
+                font?: string;
+                style?: string;
+                weight?: string | number;
+                rotate?: number;
+                size?: number;
+                padding?: number;
+                x?: number;
+                y?: number;
+            }
+        }
+
+        interface Cloud<T extends cloud.Word> {
+            start(): Cloud<T>;
+            stop(): Cloud<T>;
+
+            timeInterval(): number;
+            timeInterval(interval: number): Cloud<T>;
+
+            words(): T[];
+            words(words: T[]): Cloud<T>;
+
+            size(): [number, number];
+            size(size: [number, number]): Cloud<T>;
+
+            font(): (datum: T, index: number) => string;
+            font(font: string): Cloud<T>;
+            font(font: (datum: T, index: number) => string): Cloud<T>;
+
+            fontStyle(): (datum: T, index: number) => string;
+            fontStyle(style: string): Cloud<T>;
+            fontStyle(style: (datum: T, index: number) => string): Cloud<T>;
+
+            fontWeight(): (datum: T, index: number) => string | number;
+            fontWeight(weight: string | number): Cloud<T>;
+            fontWeight(weight: (datum: T, index: number) => string | number): Cloud<T>;
+
+            rotate(): (datum: T, index: number) => number;
+            rotate(rotate: number): Cloud<T>;
+            rotate(rotate: (datum: T, index: number) => number): Cloud<T>;
+
+            text(): (datum: T, index: number) => string;
+            text(text: string): Cloud<T>;
+            text(text: (datum: T, index: number) => string): Cloud<T>;
+
+            spiral(): (size: number) => (t: number) => [number, number];
+            spiral(name: string): Cloud<T>;
+            spiral(spiral: (size: number) => (t: number) => [number, number]): Cloud<T>;
+
+            fontSize(): (datum: T, index: number) => number;
+            fontSize(size: number): Cloud<T>;
+            fontSize(size: (datum: T, index: number) => number): Cloud<T>;
+
+            padding(): (datum: T, index: number) => number;
+            padding(padding: number): Cloud<T>;
+            padding(padding: (datum: T, index: number) => number): Cloud<T>;
+
+            on(type: "word", listener: (word: T) => void): Cloud<T>;
+            on(type: "end", listener: (tags: T[], bounds: { x: number; y: number }[]) => void): Cloud<T>;
+            on(type: string, listener: (...args: any[]) => void): Cloud<T>;
+
+            on(type: "word"): (word: T) => void;
+            on(type: "end"): (tags: T[], bounds: { x: number; y: number }[]) => void;
+            on(type: string): (...args: any[]) => void;
+        }
+    }
+}
diff --git a/d3.cloud.layout/tsconfig.json b/d3.cloud.layout/tsconfig.json
new file mode 100644
index 0000000000..3698dd54cd
--- /dev/null
+++ b/d3.cloud.layout/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "d3.cloud.layout-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/d3/d3-tests.ts b/d3/d3-tests.ts
index c9027b0889..e47a1fa770 100644
--- a/d3/d3-tests.ts
+++ b/d3/d3-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="d3.d.ts" />
+
 
 //Example from http://bl.ocks.org/3887235
 interface TestPieChartData {
diff --git a/d3/d3.d.ts b/d3/d3.d.ts
deleted file mode 100644
index c80a922f1f..0000000000
--- a/d3/d3.d.ts
+++ /dev/null
@@ -1,3358 +0,0 @@
-// Type definitions for d3JS
-// Project: http://d3js.org/
-// Definitions by: Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace d3 {
-    /**
-     * The current version of D3.js.
-     */
-    export var version: string;
-
-    /**
-     * Find the first element that matches the given selector string.
-     */
-    export function select(selector: string): Selection<any>;
-
-    /**
-     * Create a selection from the given node reference.
-     */
-    export function select(node: EventTarget): Selection<any>;
-
-    /**
-     * Find all elements that match the given selector string.
-     */
-    export function selectAll(selector: string): Selection<any>;
-
-    /**
-     * Create a selection from the given list of nodes.
-     */
-    export function selectAll(nodes: EventTarget[]): Selection<any>;
-
-    /**
-     * Returns the root selection (as if by d3.select(document.documentElement)). This function may be used for 'instanceof' tests, and extending its prototype will add properties to all selections.
-     */
-    export function selection(): Selection<any>;
-
-    namespace selection {
-        export var prototype: Selection<any>;
-
-        /**
-         * Selections are grouped into arrays of nodes, with the parent tracked in the 'parentNode' property.
-         */
-        interface Group extends Array<EventTarget> {
-            parentNode: EventTarget;
-        }
-
-        interface Update<Datum> {
-            /**
-             * Retrieve a grouped selection.
-             */
-            [index: number]: Group;
-
-            /**
-             * The number of groups in this selection.
-             */
-            length: number;
-
-            /**
-             * Retrieve the value of the given attribute for the first node in the selection.
-             *
-             * @param name The attribute name to query. May be prefixed (see d3.ns.prefix).
-             */
-            attr(name: string): string;
-
-            /**
-             * For all nodes, set the attribute to the specified constant value. Use null to remove.
-             *
-             * @param name The attribute name, optionally prefixed.
-             * @param value The attribute value to use. Note that this is coerced to a string automatically.
-             */
-            attr(name: string, value: Primitive): Update<Datum>;
-
-            /**
-             * Derive an attribute value for each node in the selection based on bound data.
-             *
-             * @param name The attribute name, optionally prefixed.
-             * @param value The function of the datum (the bound data item), index (the position in the subgrouping), and outer index (overall position in nested selections) which computes the attribute value. If the function returns null, the attribute is removed.
-             */
-            attr(name: string, value: (datum: Datum, index: number, outerIndex: number) => Primitive): Update<Datum>;
-
-            /**
-             * Set multiple properties at once using an Object. D3 iterates over all enumerable properties and either sets or computes the attribute's value based on the corresponding entry in the Object.
-             *
-             * @param obj A key-value mapping corresponding to attributes and values. If the value is a simple string or number, it is taken as a constant. Otherwise, it is a function that derives the attribute value.
-             */
-            attr(obj: { [key: string]: Primitive | ((datum: Datum, index: number, outerIndex: number) => Primitive) }): Update<Datum>;
-
-            /**
-             * Returns true if the first node in this selection has the given class list. If multiple classes are specified (i.e., "foo bar"), then returns true only if all classes match.
-             *
-             * @param name The class list to query.
-             */
-            classed(name: string): boolean;
-
-            /**
-             * Adds (or removes) the given class list.
-             *
-             * @param name The class list to toggle. Spaces separate class names: "foo bar" is a list of two classes.
-             * @param value If true, add the classes. If false, remove them.
-             */
-            classed(name: string, value: boolean): Update<Datum>;
-
-            /**
-             * Determine if the given class list should be toggled for each node in the selection.
-             *
-             * @param name The class list. Spaces separate multiple class names.
-             * @param value The function to run for each node. Should return true to add the class to the node, or false to remove it.
-             */
-            classed(name: string, value: (datum: Datum, index: number, outerIndex: number) => boolean): Update<Datum>;
-
-            /**
-             * Set or derive classes for multiple class lists at once.
-             *
-             * @param obj An Object mapping class lists to values that are either plain booleans or functions that return booleans.
-             */
-            classed(obj: { [key: string]: boolean | ((datum: Datum, index: number, outerIndex: number) => boolean) }): Update<Datum>;
-
-            /**
-             * Retrieve the computed style value for the first node in the selection.
-             * @param name The CSS property name to query
-             */
-            style(name: string): string;
-
-            /**
-             * Set a style property for all nodes in the selection.
-             * @param name the CSS property name
-             * @param value the property value
-             * @param priority if specified, either null or the string "important" (no exclamation mark)
-             */
-            style(name: string, value: Primitive, priority?: string): Update<Datum>;
-
-            /**
-             * Derive a property value for each node in the selection.
-             * @param name the CSS property name
-             * @param value the function to derive the value
-             * @param priority if specified, either null or the string "important" (no exclamation mark)
-             */
-            style(name: string, value: (datum: Datum, index: number, outerIndex: number) => Primitive, priority?: string): Update<Datum>;
-
-            /**
-             * Set a large number of CSS properties from an object.
-             *
-             * @param obj an Object whose keys correspond to CSS property names and values are either constants or functions that derive property values
-             * @param priority if specified, either null or the string "important" (no exclamation mark)
-             */
-            style(obj: { [key: string]: Primitive | ((datum: Datum, index: number, outerIndex: number) => Primitive) }, priority?: string): Update<Datum>;
-
-            /**
-             * Retrieve an arbitrary node property such as the 'checked' property of checkboxes, or the 'value' of text boxes.
-             *
-             * @param name the node's property to retrieve
-             */
-            property(name: string): any;
-
-            /**
-             * For each node, set the property value. Internally, this sets the node property directly (e.g., node[name] = value), so take care not to mutate special properties like __proto__.
-             *
-             * @param name the property name
-             * @param value the property value
-             */
-            property(name: string, value: any): Update<Datum>;
-
-            /**
-             * For each node, derive the property value. Internally, this sets the node property directly (e.g., node[name] = value), so take care not to mutate special properties like __proto__.
-             *
-             * @param name the property name
-             * @param value the function used to derive the property's value
-             */
-            property(name: string, value: (datum: Datum, index: number, outerIndex: number) => any): Update<Datum>;
-
-            /**
-             * Set multiple node properties. Caveats apply: take care not to mutate special properties like __proto__.
-             *
-             * @param obj an Object whose keys correspond to node properties and values are either constants or functions that will compute a value.
-             */
-            property(obj: { [key: string]: any | ((datum: Datum, index: number, outerIndex: number) => any) }): Update<Datum>;
-
-            /**
-             * Retrieve the textContent of the first node in the selection.
-             */
-            text(): string;
-
-            /**
-             * Set the textContent of each node in the selection.
-             * @param value the text to use for all nodes
-             */
-            text(value: Primitive): Update<Datum>;
-
-            /**
-             * Compute the textContent of each node in the selection.
-             * @param value the function which will compute the text
-             */
-            text(value: (datum: Datum, index: number, outerIndex: number) => Primitive): Update<Datum>;
-
-            /**
-             * Retrieve the HTML content of the first node in the selection. Uses 'innerHTML' internally and will not work with SVG or other elements without a polyfill.
-             */
-            html(): string;
-
-            /**
-             * Set the HTML content of every node in the selection. Uses 'innerHTML' internally and thus will not work with SVG or other elements without a polyfill.
-             * @param value the HTML content to use.
-             */
-            html(value: string): Selection<Datum>;
-
-            /**
-             * Compute the HTML content for each node in the selection. Uses 'innerHTML' internally and thus will not work with SVG or other elements without a polyfill.
-             * @param value the function to compute HTML content
-             */
-            html(value: (datum: Datum, index: number, outerIndex: number) => string): Selection<Datum>;
-
-            /**
-             * Appends a new child to each node in the selection. This child will inherit the parent's data (if available). Returns a fresh selection consisting of the newly-appended children.
-             *
-             * @param name the element name to append. May be prefixed (see d3.ns.prefix).
-             */
-            append(name: string): Selection<Datum>;
-
-            /**
-             * Appends a new child to each node in the selection by computing a new node. This child will inherit the parent's data (if available). Returns a fresh selection consisting of the newly-appended children.
-             *
-             * @param name the function to compute a new element
-             */
-            append(name: (datum: Datum, index: number, outerIndex: number) => EventTarget): Update<Datum>;
-
-            /**
-             * Inserts a new child to each node in the selection. This child will inherit its parent's data (if available). Returns a fresh selection consisting of the newly-inserted children.
-             * @param name the element name to append. May be prefixed (see d3.ns.prefix).
-             * @param before the selector to determine position (e.g., ":first-child")
-             */
-            insert(name: string, before: string): Update<Datum>;
-
-            /**
-             * Inserts a new child to each node in the selection. This child will inherit its parent's data (if available). Returns a fresh selection consisting of the newly-inserted children.
-             * @param name the element name to append. May be prefixed (see d3.ns.prefix).
-             * @param before a function to determine the node to use as the next sibling
-             */
-            insert(name: string, before: (datum: Datum, index: number, outerIndex: number) => EventTarget): Update<Datum>;
-
-            /**
-             * Inserts a new child to the end of each node in the selection by computing a new node. This child will inherit its parent's data (if available). Returns a fresh selection consisting of the newly-inserted children.
-             * @param name the function to compute a new child
-             * @param before the selector to determine position (e.g., ":first-child")
-             */
-            insert(name: (datum: Datum, index: number, outerIndex: number) => EventTarget, before: string): Update<Datum>;
-
-            /**
-             * Inserts a new child to the end of each node in the selection by computing a new node. This child will inherit its parent's data (if available). Returns a fresh selection consisting of the newly-inserted children.
-             * @param name the function to compute a new child
-             * @param before a function to determine the node to use as the next sibling
-             */
-            insert(name: (datum: Datum, index: number, outerIndex: number) => EventTarget, before: (datum: Datum, index: number, outerIndex: number) => EventTarget): Update<Datum>;
-
-            /**
-             * Removes the elements from the DOM. They are in a detached state and may be re-added (though there is currently no dedicated API for doing so).
-             */
-            remove(): Update<Datum>;
-
-            /**
-             * Retrieves the data bound to the first group in this selection.
-             */
-            data(): Datum[];
-
-            /**
-             * Binds data to this selection.
-             * @param data the array of data to bind to this selection
-             * @param key the optional function to determine the unique key for each piece of data. When unspecified, uses the index of the element.
-             */
-            data<NewDatum>(data: NewDatum[], key?: (datum: NewDatum, index: number, outerIndex: number) => string): Update<NewDatum>;
-
-            /**
-             * Derives data to bind to this selection.
-             * @param data the function to derive data. Must return an array.
-             * @param key the optional function to determine the unique key for each data item. When unspecified, uses the index of the element.
-             */
-            data<NewDatum>(data: (datum: Datum, index: number, outerIndex: number) => NewDatum[], key?: (datum: NewDatum, index: number, outerIndex: number) => string): Update<NewDatum>;
-
-            /**
-             * Filters the selection, returning only those nodes that match the given CSS selector.
-             * @param selector the CSS selector
-             */
-            filter(selector: string): Update<Datum>;
-
-            /**
-             * Filters the selection, returning only those nodes for which the given function returned true.
-             * @param selector the filter function
-             */
-            filter(selector: (datum: Datum, index: number, outerIndex: number) => boolean): Update<Datum>;
-
-            /**
-             * Return the data item bound to the first element in the selection.
-             */
-            datum(): Datum;
-
-            /**
-             * Set the data item for each node in the selection.
-             * @param value the constant element to use for each node
-             */
-            datum<NewDatum>(value: NewDatum): Update<NewDatum>;
-
-            /**
-             * Derive the data item for each node in the selection. Useful for situations such as the HTML5 'dataset' attribute.
-             * @param value the function to compute data for each node
-             */
-            datum<NewDatum>(value: (datum: Datum, index: number, outerIndex: number) => NewDatum): Update<NewDatum>;
-
-            /**
-             * Reorders nodes in the selection based on the given comparator. Nodes are re-inserted into the document once sorted.
-             * @param comparator the comparison function, which defaults to d3.ascending
-             */
-            sort(comparator?: (a: Datum, b: Datum) => number): Update<Datum>;
-
-            /**
-             * Reorders nodes in the document to match the selection order. More efficient than calling sort() if the selection is already ordered.
-             */
-            order(): Update<Datum>;
-
-            /**
-             * Returns the listener (if any) for the given event.
-             * @param type the type of event to load the listener for. May have a namespace (e.g., ".foo") at the end.
-             */
-            on(type: string): (datum: Datum, index: number, outerIndex: number) => any;
-
-            /**
-             * Adds a listener for the specified event. If one was already registered, it is removed before the new listener is added. The return value of the listener function is ignored.
-             * @param type the of event to listen to. May have a namespace (e.g., ".foo") at the end.
-             * @param listener an event listener function, or null to unregister
-             * @param capture sets the DOM useCapture flag
-             */
-            on(type: string, listener: (datum: Datum, index: number, outerIndex: number) => any, capture?: boolean): Update<Datum>;
-
-            /**
-             * Begins a new transition. Interrupts any active transitions of the same name.
-             * @param name the transition name (defaults to "")
-             */
-            transition(name?: string): Transition<Datum>;
-
-            /**
-             * Interrupts the active transition of the provided name. Does not cancel scheduled transitions.
-             * @param name the transition name (defaults to "")
-             */
-            interrupt(name?: string): Update<Datum>;
-
-            /**
-             * Creates a subselection by finding the first descendent matching the selector string. Bound data is inherited.
-             * @param selector the CSS selector to match against
-             */
-            select(selector: string): Update<Datum>;
-
-            /**
-             * Creates a subselection by using a function to find descendent elements. Bound data is inherited.
-             * @param selector the function to find matching descendants
-             */
-            select(selector: (datum: Datum, index: number, outerIndex: number) => EventTarget): Update<Datum>;
-
-            /**
-             * Creates a subselection by finding all descendents that match the given selector. Bound data is not inherited.
-             * @param selector the CSS selector to match against
-             */
-            selectAll(selector: string): Update<Datum>;
-
-            /**
-             * Creates a subselection by using a function to find descendent elements. Bound data is not inherited.
-             * @param selector the function to find matching descendents
-             */
-            selectAll(selector: (datum: Datum, index: number, outerIndex: number) => Array<EventTarget> | NodeList): Update<any>;
-
-            /**
-             * Invoke the given function for each element in the selection. The return value of the function is ignored.
-             * @param func the function to invoke
-             */
-            each(func: (datum: Datum, index: number, outerIndex: number) => any): Update<Datum>;
-
-            /**
-             * Call a function on the selection. sel.call(foo) is equivalent to foo(sel).
-             * @param func the function to call on the selection
-             * @param args any optional args
-             */
-            call(func: (sel: Update<Datum>, ...args: any[]) => any, ...args: any[]): Update<Datum>;
-
-            /**
-             * Returns true if the current selection is empty.
-             */
-            empty(): boolean;
-
-            /**
-             * Returns the first non-null element in the selection, or null otherwise.
-             */
-            node(): Node;
-
-            /**
-             * Returns the total number of elements in the selection.
-             */
-            size(): number;
-
-            /**
-             * Returns the placeholder nodes for each data element for which no corresponding DOM element was found.
-             */
-            enter(): Enter<Datum>;
-
-            /**
-             * Returns a selection for those DOM nodes for which no new data element was found.
-             */
-            exit(): Selection<Datum>;
-        }
-
-        interface Enter<Datum> {
-            append(name: string): Selection<Datum>;
-            append(name: (datum: Datum, index: number, outerIndex: number) => EventTarget): Selection<Datum>;
-
-            insert(name: string, before?: string): Selection<Datum>;
-            insert(name: string, before: (datum: Datum, index: number, outerIndex: number) => EventTarget): Selection<Datum>;
-            insert(name: (datum: Datum, index: number, outerIndex: number) => EventTarget, before?: string): Selection<Datum>;
-            insert(name: (datum: Datum, index: number, outerIndex: number) => EventTarget, before: (datum: Datum, index: number, outerIndex: number) => EventTarget): Selection<Datum>;
-
-            select(name: (datum: Datum, index: number, outerIndex: number) => EventTarget): Selection<Datum>;
-            call(func: (selection: Enter<Datum>, ...args: any[]) => any, ...args: any[]): Enter<Datum>;
-        }
-    }
-
-    /**
-     * Administrivia: JavaScript primitive types, or "things that toString() predictably".
-     */
-    export type Primitive = number | string | boolean;
-
-    /**
-     * Administrivia: anything with a valueOf(): number method is comparable, so we allow it in numeric operations
-     */
-    interface Numeric {
-        valueOf(): number;
-    }
-
-    /**
-     * A grouped array of nodes.
-     * @param Datum the data bound to this selection.
-     */
-    interface Selection<Datum> {
-        /**
-         * Retrieve a grouped selection.
-         */
-        [index: number]: selection.Group;
-
-        /**
-         * The number of groups in this selection.
-         */
-        length: number;
-
-        /**
-         * Retrieve the value of the given attribute for the first node in the selection.
-         *
-         * @param name The attribute name to query. May be prefixed (see d3.ns.prefix).
-         */
-        attr(name: string): string;
-
-        /**
-         * For all nodes, set the attribute to the specified constant value. Use null to remove.
-         *
-         * @param name The attribute name, optionally prefixed.
-         * @param value The attribute value to use. Note that this is coerced to a string automatically.
-         */
-        attr(name: string, value: Primitive): Selection<Datum>;
-
-        /**
-         * Derive an attribute value for each node in the selection based on bound data.
-         *
-         * @param name The attribute name, optionally prefixed.
-         * @param value The function of the datum (the bound data item), index (the position in the subgrouping), and outer index (overall position in nested selections) which computes the attribute value. If the function returns null, the attribute is removed.
-         */
-        attr(name: string, value: (datum: Datum, index: number, outerIndex: number) => Primitive): Selection<Datum>;
-
-        /**
-         * Set multiple properties at once using an Object. D3 iterates over all enumerable properties and either sets or computes the attribute's value based on the corresponding entry in the Object.
-         *
-         * @param obj A key-value mapping corresponding to attributes and values. If the value is a simple string or number, it is taken as a constant. Otherwise, it is a function that derives the attribute value.
-         */
-        attr(obj: { [key: string]: Primitive | ((datum: Datum, index: number, outerIndex: number) => Primitive) }): Selection<Datum>;
-
-        /**
-         * Returns true if the first node in this selection has the given class list. If multiple classes are specified (i.e., "foo bar"), then returns true only if all classes match.
-         *
-         * @param name The class list to query.
-         */
-        classed(name: string): boolean;
-
-        /**
-         * Adds (or removes) the given class list.
-         *
-         * @param name The class list to toggle. Spaces separate class names: "foo bar" is a list of two classes.
-         * @param value If true, add the classes. If false, remove them.
-         */
-        classed(name: string, value: boolean): Selection<Datum>;
-
-        /**
-         * Determine if the given class list should be toggled for each node in the selection.
-         *
-         * @param name The class list. Spaces separate multiple class names.
-         * @param value The function to run for each node. Should return true to add the class to the node, or false to remove it.
-         */
-        classed(name: string, value: (datum: Datum, index: number, outerIndex: number) => boolean): Selection<Datum>;
-
-        /**
-         * Set or derive classes for multiple class lists at once.
-         *
-         * @param obj An Object mapping class lists to values that are either plain booleans or functions that return booleans.
-         */
-        classed(obj: { [key: string]: boolean | ((datum: Datum, index: number, outerIndex: number) => boolean) }): Selection<Datum>;
-
-        /**
-         * Retrieve the computed style value for the first node in the selection.
-         * @param name The CSS property name to query
-         */
-        style(name: string): string;
-
-        /**
-         * Set a style property for all nodes in the selection.
-         * @param name the CSS property name
-         * @param value the property value
-         * @param priority if specified, either null or the string "important" (no exclamation mark)
-         */
-        style(name: string, value: Primitive, priority?: string): Selection<Datum>;
-
-        /**
-         * Derive a property value for each node in the selection.
-         * @param name the CSS property name
-         * @param value the function to derive the value
-         * @param priority if specified, either null or the string "important" (no exclamation mark)
-         */
-        style(name: string, value: (datum: Datum, index: number, outerIndex: number) => Primitive, priority?: string): Selection<Datum>;
-
-        /**
-         * Set a large number of CSS properties from an object.
-         *
-         * @param obj an Object whose keys correspond to CSS property names and values are either constants or functions that derive property values
-         * @param priority if specified, either null or the string "important" (no exclamation mark)
-         */
-        style(obj: { [key: string]: Primitive | ((datum: Datum, index: number, outerIndex: number) => Primitive) }, priority?: string): Selection<Datum>;
-
-        /**
-         * Retrieve an arbitrary node property such as the 'checked' property of checkboxes, or the 'value' of text boxes.
-         *
-         * @param name the node's property to retrieve
-         */
-        property(name: string): any;
-
-        /**
-         * For each node, set the property value. Internally, this sets the node property directly (e.g., node[name] = value), so take care not to mutate special properties like __proto__.
-         *
-         * @param name the property name
-         * @param value the property value
-         */
-        property(name: string, value: any): Selection<Datum>;
-
-        /**
-         * For each node, derive the property value. Internally, this sets the node property directly (e.g., node[name] = value), so take care not to mutate special properties like __proto__.
-         *
-         * @param name the property name
-         * @param value the function used to derive the property's value
-         */
-        property(name: string, value: (datum: Datum, index: number, outerIndex: number) => any): Selection<Datum>;
-
-        /**
-         * Set multiple node properties. Caveats apply: take care not to mutate special properties like __proto__.
-         *
-         * @param obj an Object whose keys correspond to node properties and values are either constants or functions that will compute a value.
-         */
-        property(obj: { [key: string]: any | ((datum: Datum, index: number, innerInder: number) => any) }): Selection<Datum>;
-
-        /**
-         * Retrieve the textContent of the first node in the selection.
-         */
-        text(): string;
-
-        /**
-         * Set the textContent of each node in the selection.
-         * @param value the text to use for all nodes
-         */
-        text(value: Primitive): Selection<Datum>;
-
-        /**
-         * Compute the textContent of each node in the selection.
-         * @param value the function which will compute the text
-         */
-        text(value: (datum: Datum, index: number, outerIndex: number) => Primitive): Selection<Datum>;
-
-        /**
-         * Retrieve the HTML content of the first node in the selection. Uses 'innerHTML' internally and will not work with SVG or other elements without a polyfill.
-         */
-        html(): string;
-
-        /**
-         * Set the HTML content of every node in the selection. Uses 'innerHTML' internally and thus will not work with SVG or other elements without a polyfill.
-         * @param value the HTML content to use.
-         */
-        html(value: string): Selection<Datum>;
-
-        /**
-         * Compute the HTML content for each node in the selection. Uses 'innerHTML' internally and thus will not work with SVG or other elements without a polyfill.
-         * @param value the function to compute HTML content
-         */
-        html(value: (datum: Datum, index: number, outerIndex: number) => string): Selection<Datum>;
-
-        /**
-         * Appends a new child to each node in the selection. This child will inherit the parent's data (if available). Returns a fresh selection consisting of the newly-appended children.
-         *
-         * @param name the element name to append. May be prefixed (see d3.ns.prefix).
-         */
-        append(name: string): Selection<Datum>;
-
-        /**
-         * Appends a new child to each node in the selection by computing a new node. This child will inherit the parent's data (if available). Returns a fresh selection consisting of the newly-appended children.
-         *
-         * @param name the function to compute a new element
-         */
-        append(name: (datum: Datum, index: number, outerIndex: number) => EventTarget): Selection<Datum>;
-
-        /**
-         * Inserts a new child to each node in the selection. This child will inherit its parent's data (if available). Returns a fresh selection consisting of the newly-inserted children.
-         * @param name the element name to append. May be prefixed (see d3.ns.prefix).
-         * @param before the selector to determine position (e.g., ":first-child")
-         */
-        insert(name: string, before: string): Selection<Datum>;
-
-        /**
-         * Inserts a new child to each node in the selection. This child will inherit its parent's data (if available). Returns a fresh selection consisting of the newly-inserted children.
-         * @param name the element name to append. May be prefixed (see d3.ns.prefix).
-         * @param before a function to determine the node to use as the next sibling
-         */
-        insert(name: string, before: (datum: Datum, index: number, outerIndex: number) => EventTarget): Selection<Datum>;
-
-        /**
-         * Inserts a new child to the end of each node in the selection by computing a new node. This child will inherit its parent's data (if available). Returns a fresh selection consisting of the newly-inserted children.
-         * @param name the function to compute a new child
-         * @param before the selector to determine position (e.g., ":first-child")
-         */
-        insert(name: (datum: Datum, index: number, outerIndex: number) => EventTarget, before: string): Selection<Datum>;
-
-        /**
-         * Inserts a new child to the end of each node in the selection by computing a new node. This child will inherit its parent's data (if available). Returns a fresh selection consisting of the newly-inserted children.
-         * @param name the function to compute a new child
-         * @param before a function to determine the node to use as the next sibling
-         */
-        insert(name: (datum: Datum, index: number, outerIndex: number) => EventTarget, before: (datum: Datum, index: number, outerIndex: number) => EventTarget): Selection<Datum>;
-
-        /**
-         * Removes the elements from the DOM. They are in a detached state and may be re-added (though there is currently no dedicated API for doing so).
-         */
-        remove(): Selection<Datum>;
-
-        /**
-         * Retrieves the data bound to the first group in this selection.
-         */
-        data(): Datum[];
-
-        /**
-         * Binds data to this selection.
-         * @param data the array of data to bind to this selection
-         * @param key the optional function to determine the unique key for each piece of data. When unspecified, uses the index of the element.
-         */
-        data<NewDatum>(data: NewDatum[], key?: (datum: NewDatum, index: number, outerIndex: number) => string): selection.Update<NewDatum>;
-
-        /**
-         * Derives data to bind to this selection.
-         * @param data the function to derive data. Must return an array.
-         * @param key the optional function to determine the unique key for each data item. When unspecified, uses the index of the element.
-         */
-        data<NewDatum>(data: (datum: Datum, index: number, outerIndex: number) => NewDatum[], key?: (datum: NewDatum, index: number, outerIndex: number) => string): selection.Update<NewDatum>;
-
-        /**
-         * Filters the selection, returning only those nodes that match the given CSS selector.
-         * @param selector the CSS selector
-         */
-        filter(selector: string): Selection<Datum>;
-
-        /**
-         * Filters the selection, returning only those nodes for which the given function returned true.
-         * @param selector the filter function
-         */
-        filter(selector: (datum: Datum, index: number, outerIndex: number) => boolean): Selection<Datum>;
-
-        /**
-         * Return the data item bound to the first element in the selection.
-         */
-        datum(): Datum;
-
-        /**
-         * Derive the data item for each node in the selection. Useful for situations such as the HTML5 'dataset' attribute.
-         * @param value the function to compute data for each node
-         */
-        datum<NewDatum>(value: (datum: Datum, index: number, outerIndex: number) => NewDatum): Selection<NewDatum>;
-
-        /**
-         * Set the data item for each node in the selection.
-         * @param value the constant element to use for each node
-         */
-        datum<NewDatum>(value: NewDatum): Selection<NewDatum>;
-
-        /**
-         * Reorders nodes in the selection based on the given comparator. Nodes are re-inserted into the document once sorted.
-         * @param comparator the comparison function, which defaults to d3.ascending
-         */
-        sort(comparator?: (a: Datum, b: Datum) => number): Selection<Datum>;
-
-        /**
-         * Reorders nodes in the document to match the selection order. More efficient than calling sort() if the selection is already ordered.
-         */
-        order(): Selection<Datum>;
-
-        /**
-         * Returns the listener (if any) for the given event.
-         * @param type the type of event to load the listener for. May have a namespace (e.g., ".foo") at the end.
-         */
-        on(type: string): (datum: Datum, index: number, outerIndex: number) => any;
-
-        /**
-         * Adds a listener for the specified event. If one was already registered, it is removed before the new listener is added. The return value of the listener function is ignored.
-         * @param type the of event to listen to. May have a namespace (e.g., ".foo") at the end.
-         * @param listener an event listener function, or null to unregister
-         * @param capture sets the DOM useCapture flag
-         */
-        on(type: string, listener: (datum: Datum, index: number, outerIndex: number) => any, capture?: boolean): Selection<Datum>;
-
-        /**
-         * Begins a new transition. Interrupts any active transitions of the same name.
-         * @param name the transition name (defaults to "")
-         */
-        transition(name?: string): Transition<Datum>;
-
-        /**
-         * Interrupts the active transition of the provided name. Does not cancel scheduled transitions.
-         * @param name the transition name (defaults to "")
-         */
-        interrupt(name?: string): Selection<Datum>;
-
-        /**
-         * Creates a subselection by finding the first descendent matching the selector string. Bound data is inherited.
-         * @param selector the CSS selector to match against
-         */
-        select(selector: string): Selection<Datum>;
-
-        /**
-         * Creates a subselection by using a function to find descendent elements. Bound data is inherited.
-         * @param selector the function to find matching descendants
-         */
-        select(selector: (datum: Datum, index: number, outerIndex: number) => EventTarget): Selection<Datum>;
-
-        /**
-         * Creates a subselection by finding all descendents that match the given selector. Bound data is not inherited.
-         * @param selector the CSS selector to match against
-         */
-        selectAll(selector: string): Selection<any>;
-
-        /**
-         * Creates a subselection by finding all descendants that match the given selector. Bound data is not inherited.
-         *
-         * Use this overload when data-binding a subselection (that is, sel.selectAll('.foo').data(d => ...)). The type will carry over.
-         */
-        selectAll<T>(selector: string): Selection<T>;
-
-        /**
-         * Creates a subselection by using a function to find descendent elements. Bound data is not inherited.
-         * @param selector the function to find matching descendents
-         */
-        selectAll(selector: (datum: Datum, index: number, outerIndex: number) => Array<EventTarget> | NodeList): Selection<any>;
-
-        /**
-         * Creates a subselection by using a function to find descendent elements. Bound data is not inherited.
-         *
-         * Use this overload when data-binding a subselection (that is, sel.selectAll('.foo').data(d => ...)). The type will carry over.
-         * @param selector the function to find matching descendents
-         */
-        selectAll<T>(selector: (datum: Datum, index: number, outerIndex: number) => Array<EventTarget> | NodeList): Selection<T>;
-
-        /**
-         * Invoke the given function for each element in the selection. The return value of the function is ignored.
-         * @param func the function to invoke
-         */
-        each(func: (datum: Datum, index: number, outerIndex: number) => any): Selection<Datum>;
-
-        /**
-         * Call a function on the selection. sel.call(foo) is equivalent to foo(sel).
-         * @param func the function to call on the selection
-         * @param args any optional args
-         */
-        call(func: (sel: Selection<Datum>, ...args: any[]) => any, ...args: any[]): Selection<Datum>;
-
-        /**
-         * Returns true if the current selection is empty.
-         */
-        empty(): boolean;
-
-        /**
-         * Returns the first non-null element in the selection, or null otherwise.
-         */
-        node(): Node;
-
-        /**
-         * Returns the total number of elements in the selection.
-         */
-        size(): number;
-    }
-
-    export function transition(): Transition<any>;
-    namespace transition {
-        export var prototype: Transition<any>;
-    }
-
-    interface Transition<Datum> {
-
-        transition(): Transition<Datum>;
-
-        delay(): number;
-        delay(delay: number): Transition<Datum>;
-        delay(delay: (datum: Datum, index: number, outerIndex: number) => number): Transition<Datum>;
-
-        duration(): number;
-        duration(duration: number): Transition<Datum>;
-        duration(duration: (datum: Datum, index: number, outerIndex: number) => number): Transition<Datum>;
-
-        ease(): (t: number) => number;
-        ease(value: string, ...args: any[]): Transition<Datum>;
-        ease(value: (t: number) => number): Transition<Datum>;
-
-        attr(name: string, value: Primitive): Transition<Datum>;
-        attr(name: string, value: (datum: Datum, index: number, outerIndex: number) => Primitive): Transition<Datum>;
-        attr(obj: { [key: string]: Primitive | ((datum: Datum, index: number, outerIndex: number) => Primitive) }): Transition<Datum>;
-
-        attrTween(name: string, tween: (datum: Datum, index: number, attr: string) => (t: number) => Primitive): Transition<Datum>;
-
-        style(name: string, value: Primitive, priority?: string): Transition<Datum>;
-        style(name: string, value: (datum: Datum, index: number, outerIndex: number) => Primitive, priority?: string): Transition<Datum>;
-        style(obj: { [key: string]: Primitive | ((datum: Datum, index: number, outerIndex: number) => Primitive) }, priority?: string): Transition<Datum>;
-
-        styleTween(name: string, tween: (datum: Datum, index: number, attr: string) => (t: number) => Primitive, priority?: string): Transition<Datum>;
-
-        text(value: Primitive): Transition<Datum>;
-        text(value: (datum: Datum, index: number, outerIndex: number) => Primitive): Transition<Datum>;
-
-        tween(name: string, factory: () => (t: number) => any): Transition<Datum>;
-
-        remove(): Transition<Datum>;
-
-        select(selector: string): Transition<Datum>;
-        select(selector: (d: Datum, i: number) => EventTarget): Transition<Datum>;
-
-        selectAll(selector: string): Transition<any>;
-        selectAll(selector: (d: Datum, i: number) => EventTarget[]): Transition<any>;
-
-        filter(selector: string): Transition<Datum>;
-        filter(selector: (d: Datum, i: number) => boolean): Transition<Datum>;
-
-        each(type: string, listener: (d: Datum, i: number) => any): Transition<Datum>;
-        each(listener: (d: Datum, i: number) => any): Transition<Datum>;
-
-        call(func: (transition: Transition<Datum>, ...args: any[]) => any, ...args: any[]): Transition<Datum>;
-
-        empty(): boolean;
-        node(): Node;
-        size(): number;
-    }
-
-    export function ease(type: 'linear'): (t: number) => number;
-    export function ease(type: 'linear-in'): (t: number) => number;
-    export function ease(type: 'linear-out'): (t: number) => number;
-    export function ease(type: 'linear-in-out'): (t: number) => number;
-    export function ease(type: 'linear-out-in'): (t: number) => number;
-
-    export function ease(type: 'poly', k: number): (t: number) => number;
-    export function ease(type: 'poly-in', k: number): (t: number) => number;
-    export function ease(type: 'poly-out', k: number): (t: number) => number;
-    export function ease(type: 'poly-in-out', k: number): (t: number) => number;
-    export function ease(type: 'poly-out-in', k: number): (t: number) => number;
-
-    export function ease(type: 'quad'): (t: number) => number;
-    export function ease(type: 'quad-in'): (t: number) => number;
-    export function ease(type: 'quad-out'): (t: number) => number;
-    export function ease(type: 'quad-in-out'): (t: number) => number;
-    export function ease(type: 'quad-out-in'): (t: number) => number;
-
-    export function ease(type: 'cubic'): (t: number) => number;
-    export function ease(type: 'cubic-in'): (t: number) => number;
-    export function ease(type: 'cubic-out'): (t: number) => number;
-    export function ease(type: 'cubic-in-out'): (t: number) => number;
-    export function ease(type: 'cubic-out-in'): (t: number) => number;
-
-    export function ease(type: 'sin'): (t: number) => number;
-    export function ease(type: 'sin-in'): (t: number) => number;
-    export function ease(type: 'sin-out'): (t: number) => number;
-    export function ease(type: 'sin-in-out'): (t: number) => number;
-    export function ease(type: 'sin-out-in'): (t: number) => number;
-
-    export function ease(type: 'circle'): (t: number) => number;
-    export function ease(type: 'circle-in'): (t: number) => number;
-    export function ease(type: 'circle-out'): (t: number) => number;
-    export function ease(type: 'circle-in-out'): (t: number) => number;
-    export function ease(type: 'circle-out-in'): (t: number) => number;
-
-    export function ease(type: 'elastic', a?: number, b?: number): (t: number) => number;
-    export function ease(type: 'elastic-in', a?: number, b?: number): (t: number) => number;
-    export function ease(type: 'elastic-out', a?: number, b?: number): (t: number) => number;
-    export function ease(type: 'elastic-in-out', a?: number, b?: number): (t: number) => number;
-    export function ease(type: 'elastic-out-in', a?: number, b?: number): (t: number) => number;
-
-    export function ease(type: 'back', s: number): (t: number) => number;
-    export function ease(type: 'back-in', s: number): (t: number) => number;
-    export function ease(type: 'back-out', s: number): (t: number) => number;
-    export function ease(type: 'back-in-out', s: number): (t: number) => number;
-    export function ease(type: 'back-out-in', s: number): (t: number) => number;
-
-    export function ease(type: 'bounce'): (t: number) => number;
-    export function ease(type: 'bounce-in'): (t: number) => number;
-    export function ease(type: 'bounce-out'): (t: number) => number;
-    export function ease(type: 'bounce-in-out'): (t: number) => number;
-    export function ease(type: 'bounce-out-in'): (t: number) => number;
-
-    export function ease(type: string, ...args: any[]): (t: number) => number;
-
-    export function timer(func: () => any, delay?: number, time?: number): void;
-
-    namespace timer {
-        export function flush(): void;
-    }
-
-	 interface BaseEvent {
-		 type: string;
-		 sourceEvent?: Event;
-	 }
-
-	 /**
-	  * Define a D3-specific ZoomEvent per https://github.com/mbostock/d3/wiki/Zoom-Behavior#event
-	  */
-	 interface ZoomEvent extends BaseEvent {
-		 scale: number;
-		 translate: [number, number];
-	 }
-
-	 /**
-	  * Define a D3-specific DragEvent per https://github.com/mbostock/d3/wiki/Drag-Behavior#on
-	  */
-	 interface DragEvent extends BaseEvent {
-		 x: number;
-		 y: number;
-		 dx: number;
-		 dy: number;
-	 }
-
-    /**
-     * The current event's value. Use this variable in a handler registered with `selection.on`.
-     */
-    export var event: Event | BaseEvent;
-
-    /**
-     * Returns the x and y coordinates of the mouse relative to the provided container element, using d3.event for the mouse's position on the page.
-     * @param container the container element (e.g. an SVG <g> element)
-     */
-    export function mouse(container: EventTarget): [number, number];
-
-    /**
-     * Given a container element and a touch identifier, determine the x and y coordinates of the touch.
-     * @param container the container element (e.g., an SVG <svg> element)
-     * @param identifier the given touch identifier
-     */
-    export function touch(container: EventTarget, identifer: number): [number, number];
-
-    /**
-     * Given a container element, a list of touches, and a touch identifier, determine the x and y coordinates of the touch.
-     * @param container the container element (e.g., an SVG <svg> element)
-     * @param identifier the given touch identifier
-     */
-    export function touch(container: EventTarget, touches: TouchList, identifer: number): [number, number];
-
-    /**
-     * Given a container element and an optional list of touches, return the position of every touch relative to the container.
-     * @param container the container element
-     * @param touches an optional list of touches (defaults to d3.event.touches)
-     */
-    export function touches(container: EventTarget, touches?: TouchList): Array<[number, number]>;
-
-    // NB. this is limited to primitive values due to D3's use of the <, >, and >= operators. Results get weird for object instances.
-    /**
-     * Compares two primitive values for sorting (in ascending order).
-     */
-    export function ascending(a: Primitive, b: Primitive): number;
-
-    /**
-     * Compares two primitive values for sorting (in ascending order).
-     */
-    export function descending(a: Primitive, b: Primitive): number;
-
-    /**
-     * Return the minimum value in the array using natural order.
-     */
-    export function min(array: number[]): number;
-
-    /**
-     * Return the minimum value in the array using natural order.
-     */
-    export function min(array: string[]): string;
-
-    /**
-     * Return the minimum value in the array using natural order.
-     */
-    export function min<T extends Numeric>(array: T[]): T;
-
-    /**
-     * Return the minimum value in the array using natural order.
-     */
-    export function min<T>(array: T[], accessor: (datum: T, index: number) => number): number;
-
-    /**
-     * Return the minimum value in the array using natural order.
-     */
-    export function min<T>(array: T[], accessor: (datum: T, index: number) => string): string;
-
-    /**
-     * Return the minimum value in the array using natural order.
-     */
-    export function min<T, U extends Numeric>(array: T[], accessor: (datum: T, index: number) => U): U;
-
-    /**
-     * Return the maximum value in the array of numbers using natural order.
-     */
-    export function max(array: number[]): number;
-
-    /**
-     * Return the maximum value in the array of strings using natural order.
-     */
-    export function max(array: string[]): string;
-
-    /**
-     * Return the maximum value in the array of numbers using natural order.
-     */
-    export function max<T extends Numeric>(array: T[]): T;
-
-    /**
-     * Return the maximum value in the array using natural order and a projection function to map values to numbers.
-     */
-    export function max<T>(array: T[], accessor: (datum: T, index: number) => number): number;
-
-    /**
-     * Return the maximum value in the array using natural order and a projection function to map values to strings.
-     */
-    export function max<T>(array: T[], accessor: (datum: T, index: number) => string): string;
-
-    /**
-     * Return the maximum value in the array using natural order and a projection function to map values to easily-sorted values.
-     */
-    export function max<T, U extends Numeric>(array: T[], accessor: (datum: T, index: number) => U): U;
-
-    /**
-     * Return the min and max simultaneously.
-     */
-    export function extent(array: number[]): [number, number];
-
-    /**
-     * Return the min and max simultaneously.
-     */
-    export function extent(array: string[]): [string, string];
-
-    /**
-     * Return the min and max simultaneously.
-     */
-    export function extent<T extends Numeric>(array: T[]): [T, T];
-
-    /**
-     * Return the min and max simultaneously.
-     */
-    export function extent<T extends Numeric>(array: Array<T | Primitive>): [T | Primitive, T | Primitive];
-
-    /**
-     * Return the min and max simultaneously.
-     */
-    export function extent<T>(array: T[], accessor: (datum: T, index: number) => number): [number, number];
-
-    /**
-     * Return the min and max simultaneously.
-     */
-    export function extent<T>(array: T[], accessor: (datum: T, index: number) => string): [string, string];
-
-    /**
-     * Return the min and max simultaneously.
-     */
-    export function extent<T, U extends Numeric>(array: U[], accessor: (datum: T, index: number) => U): [U | Primitive, U | Primitive];
-
-    /**
-     * Compute the sum of an array of numbers.
-     */
-    export function sum(array: number[]): number;
-
-    /**
-     * Compute the sum of an array, using the given accessor to convert values to numbers.
-     */
-    export function sum<T>(array: T[], accessor: (datum: T, index: number) => number): number;
-
-    export function mean(array: number[]): number;
-    export function mean<T>(array: T[], accessor: (datum: T, index: number) => number): number;
-
-    export function quantile(array: number[], p: number): number;
-
-    export function variance(array: number[]): number;
-    export function variance<T>(array: T[], accessor: (datum: T, index: number) => number): number;
-
-    export function deviation(array: number[]): number;
-    export function deviation<T>(array: T[], accessor: (datum: T, index: number) => number): number;
-
-    export function bisectLeft(array: number[], x: number, lo?: number, hi?: number): number;
-    export function bisectLeft(array: string[], x: string, lo?: number, hi?: number): number;
-
-    export var bisect: typeof bisectRight;
-
-    export function bisectRight<T>(array: T[], x: T, lo?: number, hi?: number): number;
-
-    export function bisector<T, U>(accessor: (x: T) => U): {
-        left: (array: T[], x: U, lo?: number, hi?: number) => number;
-        right: (array: T[], x: U, lo?: number, hi?: number) => number;
-    }
-
-    export function bisector<T, U>(comparator: (a: T, b: U) => number): {
-        left: (array: T[], x: U, lo?: number, hi?: number) => number;
-        right: (array: T[], x: U, lo?: number, hi?: number) => number;
-    }
-
-    export function shuffle<T>(array: T[], lo?: number, hi?: number): T[];
-
-    /**
-     * Returns the enumerable property names of the specified object.
-     * @param object a JavaScript object
-     */
-    export function keys(object: Object): string[];
-
-    /**
-     * Returns an array containing the property values of the specified object.
-     */
-    export function values<T>(object: { [key: string]: T }): T[];
-    /**
-     * Returns an array containing the property values of the specified object.
-     */
-    export function values<T>(object: { [key: number]: T }): T[];
-    /**
-     * Returns an array containing the property values of the specified object.
-     */
-    export function values(object: Object): any[];
-
-    /**
-     * Returns an array of key-value pairs containing the property values of the specified object.
-     */
-    export function entries<T>(object: { [key: string]: T }): { key: string; value: T }[];
-
-    /**
-     * Returns an array of key-value pairs containing the property values of the specified object.
-     */
-    export function entries<T>(object: { [key: number]: T }): { key: string; value: T }[];
-
-    /**
-     * Returns an array of key-value pairs containing the property values of the specified object.
-     */
-    export function entries(object: Object): { key: string; value: any }[];
-
-    /**
-     * A shim for ES6 maps. The implementation uses a JavaScript object internally, and thus keys are limited to strings.
-     */
-    interface Map<T> {
-        /**
-         * Does the map contain the given key?
-         */
-        has(key: string): boolean;
-
-        /**
-         * Retrieve the value for the given key. Returns undefined if there is no value stored.
-         */
-        get(key: string): T;
-
-        /**
-         * Set the value for the given key. Returns the new value.
-         */
-        set(key: string, value: T): T;
-
-        /**
-         * Remove the value for the given key. Returns true if there was a value and false otherwise.
-         */
-        remove(key: string): boolean;
-
-        /**
-         * Returns an array of all keys in arbitrary order.
-         */
-        keys(): string[];
-
-        /**
-         * Returns an array of all values in arbitrary order.
-         */
-        values(): T[];
-
-        /**
-         * Returns an array of key-value objects in arbitrary order.
-         */
-        entries(): { key: string; value: T }[];
-
-        /**
-         * Calls the function for each key and value pair in the map. The 'this' context is the map itself.
-         */
-        forEach(func: (key: string, value: T) => any): void;
-
-        /**
-         * Is this map empty?
-         */
-        empty(): boolean;
-
-        /**
-         * Returns the number of elements stored in the map.
-         */
-        size(): number;
-    }
-
-    /**
-     * Constructs an initially empty map.
-     */
-    export function map<T>(): Map<T>;
-
-    /**
-     * Construct a new map by copying keys and values from the given one.
-     */
-    export function map<T>(object: Map<T>): Map<T>;
-
-    /**
-     * Construct a new map by copying enumerable properties and values from the given object.
-     */
-    export function map<T>(object: { [key: string]: T }): Map<T>;
-
-    /**
-     * Construct a new map by copying enumerable properties and values from the given object.
-     */
-    export function map<T>(object: { [key: number]: T }): Map<T>;
-
-    /**
-     * Construct a new map by copying elements from the array. The key function is used to identify each object.
-     */
-    export function map<T>(array: T[], key: (datum: T, index: number) => string): Map<T>;
-
-    /**
-     * Construct a new map by copying enumerable properties and values from the given object.
-     */
-    export function map(object: Object): Map<any>;
-
-    /**
-     * A shim for ES6 sets. Is only able to store strings.
-     */
-    interface Set {
-        /**
-         * Is the given string stored in this set?
-         */
-        has(value: string): boolean;
-
-        /**
-         * Add the string to this set. Returns the value.
-         */
-        add(value: string): string;
-
-        /**
-         * Remove the given value from the set. Returns true if it was stored, and false otherwise.
-         */
-        remove(value: string): boolean;
-
-        /**
-         * Returns an array of the strings stored in this set.
-         */
-        values(): string[];
-
-        /**
-         * Calls a given function for each value in the set. The return value of the function is ignored. The this context of the function is the set itself.
-         */
-        forEach(func: (value: string) => any): void;
-
-        /**
-         * Is this set empty?
-         */
-        empty(): boolean;
-
-        /**
-         * Returns the number of values stored in this set.
-         */
-        size(): number;
-    }
-
-    /**
-     * Creates an initially-empty set.
-     */
-    export function set(): Set;
-
-    /**
-     * Initializes a set from the given array of strings.
-     */
-    export function set(array: string[]): Set;
-
-    /**
-     * Merges the specified arrays into a single array.
-     */
-    export function merge<T>(arrays: T[][]): T[];
-
-    /**
-     * Generates a 0-based numeric sequence. The output range does not include 'stop'.
-     */
-    export function range(stop: number): number[];
-
-    /**
-     * Generates a numeric sequence starting from the given start and stop values. 'step' defaults to 1. The output range does not include 'stop'.
-     */
-    export function range(start: number, stop: number, step?: number): number[];
-
-    /**
-     * Given the specified array, return an array corresponding to the list of indices in 'keys'.
-     */
-    export function permute<T>(array: { [key: number]: T }, keys: number[]): T[];
-
-    /**
-     * Given the specified object, return an array corresponding to the list of property names in 'keys'.
-     */
-    export function permute<T>(object: { [key: string]: T }, keys: string[]): T[];
-
-    // TODO construct n-tuples from n input arrays
-    export function zip<T>(...arrays: T[][]): T[][];
-
-    export function transpose<T>(matrix: T[][]): T[][];
-
-    /**
-     * For each adjacent pair of elements in the specified array, returns a new array of tuples of elements i and i - 1.
-     * Returns the empty array if the input array has fewer than two elements.
-     */
-    export function pairs<T>(array: T[]): Array<[T, T]>;
-
-    interface Nest<T> {
-        key(func: (datum: T) => string): Nest<T>;
-        sortKeys(comparator: (a: string, b: string) => number): Nest<T>;
-        sortValues(comparator: (a: T, b: T) => number): Nest<T>;
-        rollup<U>(func: (values: T[]) => U): Nest<T>;
-        map(array: T[]): { [key: string]: any };
-        map(array: T[], mapType: typeof d3.map): Map<any>;
-        entries(array: T[]): { key: string; values: any }[];
-    }
-
-    export function nest<T>(): Nest<T>;
-
-    export module random {
-        export function normal(mean?: number, deviation?: number): () => number;
-        export function logNormal(mean?: number, deviation?: number): () => number;
-        export function bates(count: number): () => number;
-        export function irwinHall(count: number): () => number;
-    }
-
-    interface Transform {
-        rotate: number;
-        translate: [number, number];
-        skew: number;
-        scale: [number, number];
-        toString(): string;
-    }
-
-    export function transform(transform: string): Transform;
-
-    export function format(specifier: string): (n: number) => string;
-
-    interface FormatPrefix {
-        symbol: string;
-        scale(n: number): number;
-    }
-
-    export function formatPrefix(value: number, precision?: number): FormatPrefix;
-
-    export function round(x: number, n?: number): number;
-
-    export function requote(string: string): string;
-
-    export var rgb: {
-        new (r: number, g: number, b: number): Rgb;
-        new (color: string): Rgb;
-
-        (r: number, g: number, b: number): Rgb;
-        (color: string): Rgb;
-    };
-
-    interface Rgb extends Color {
-        r: number;
-        g: number;
-        b: number;
-
-        brighter(k?: number): Rgb;
-        darker(k?: number): Rgb;
-
-        hsl(): Hsl;
-
-        toString(): string;
-    }
-
-    export var hsl: {
-        new (h: number, s: number, l: number): Hsl;
-        new (color: string): Hsl;
-
-        (h: number, s: number, l: number): Hsl;
-        (color: string): Hsl;
-    };
-
-    interface Hsl extends Color {
-        h: number;
-        s: number;
-        l: number;
-
-        brighter(k?: number): Hsl;
-        darker(k?: number): Hsl;
-
-        rgb(): Rgb;
-
-        toString(): string;
-    }
-
-    export var hcl: {
-        new (h: number, c: number, l: number): Hcl;
-        new (color: string): Hcl;
-
-        (h: number, c: number, l: number): Hcl;
-        (color: string): Hcl;
-    };
-
-    interface Hcl extends Color {
-        h: number;
-        c: number;
-        l: number;
-
-        brighter(k?: number): Hcl;
-        darker(k?: number): Hcl;
-    }
-
-    export var lab: {
-        new (l: number, a: number, b: number): Lab;
-        new (color: string): Lab;
-
-        (l: number, a: number, b: number): Lab;
-        (color: string): Lab;
-    }
-
-    interface Lab extends Color {
-        l: number;
-        a: number;
-        b: number;
-
-        brighter(k?: number): Lab;
-        darker(k?: number): Lab;
-
-        rgb(): Rgb;
-        toString(): string;
-    }
-
-    export var color: {
-        (): Color;
-        new (): Color;
-    };
-
-    interface Color {
-        rgb(): Rgb;
-    }
-
-    export module ns {
-        interface Qualified {
-            space: string;
-            local: string;
-        }
-
-        export var prefix: { [key: string]: string };
-        export function qualify(name: string): Qualified | string;
-    }
-
-    export function functor<T extends Function>(value: T): T;
-    export function functor<T>(value: T): () => T;
-
-    export function rebind(target: {}, source: {}, ...names: string[]): any;
-
-    export function dispatch(...names: string[]): Dispatch;
-
-    interface Dispatch {
-        on(type: string): (...args: any[]) => void;
-        on(type: string, listener: (...args: any[]) => any): Dispatch;
-        [event: string]: (...args: any[]) => void;
-    }
-
-    export module scale {
-        export function identity(): Identity;
-
-        interface Identity {
-            (n: number): number;
-            invert(n: number): number;
-
-            domain(): number[];
-            domain(numbers: number[]): Identity;
-
-            range(): number[];
-            range(numbers: number[]): Identity;
-
-            ticks(count?: number): number[];
-
-            tickFormat(count?: number, format?: string): (n: number) => string;
-
-            copy(): Identity;
-        }
-
-        export function linear(): Linear<number, number>;
-        export function linear<Output>(): Linear<Output, Output>;
-        export function linear<Range, Output>(): Linear<Range, Output>;
-
-        interface Linear<Range, Output> {
-            (x: number): Output;
-            invert(y: number): number;
-
-            domain(): number[];
-            domain(numbers: number[]): Linear<Range, Output>;
-
-            range(): Range[];
-            range(values: Range[]): Linear<Range, Output>;
-
-            rangeRound(values: number[]): Linear<number, number>;
-
-            interpolate(): (a: Range, b: Range) => (t: number) => Output;
-            interpolate(factory: (a: Range, b: Range) => (t: number) => Output): Linear<Range, Output>;
-
-            clamp(): boolean;
-            clamp(clamp: boolean): Linear<Range, Output>;
-
-            nice(count?: number): Linear<Range, Output>;
-
-            ticks(count?: number): number[];
-
-            tickFormat(count?: number, format?: string): (n: number) => string;
-
-            copy(): Linear<Range, Output>;
-        }
-
-        export function sqrt(): Pow<number, number>;
-        export function sqrt<Output>(): Pow<Output, Output>;
-        export function sqrt<Range, Output>(): Pow<Range, Output>;
-
-        export function pow(): Pow<number, number>;
-        export function pow<Output>(): Pow<Output, Output>;
-        export function pow<Range, Output>(): Pow<Range, Output>;
-
-        interface Pow<Range, Output> {
-            (x: number): Output;
-
-            invert(y: number): number;
-
-            domain(): number[];
-            domain(numbers: number[]): Pow<Range, Output>;
-
-            range(): Range[];
-            range(values: Range[]): Pow<Range, Output>;
-
-            rangeRound(values: number[]): Pow<number, number>;
-
-            exponent(): number;
-            exponent(k: number): Pow<Range, Output>;
-
-            interpolate(): (a: Range, b: Range) => (t: number) => Output;
-            interpolate(factory: (a: Range, b: Range) => (t: number) => Output): Pow<Range, Output>;
-
-            clamp(): boolean;
-            clamp(clamp: boolean): Pow<Range, Output>;
-
-            nice(m?: number): Pow<Range, Output>;
-
-            ticks(count?: number): number[];
-
-            tickFormat(count?: number, format?: string): (n: number) => string;
-
-            copy(): Pow<Range, Output>;
-        }
-
-        export function log(): Log<number, number>;
-        export function log<Output>(): Log<Output, Output>;
-        export function log<Range, Output>(): Log<Range, Output>;
-
-        interface Log<Range, Output> {
-            (x: number): Output;
-
-            invert(y: number): number;
-
-            domain(): number[];
-            domain(numbers: number[]): Log<Range, Output>;
-
-            range(): Range[];
-            range(values: Range[]): Log<Range, Output>;
-
-            rangeRound(values: number[]): Log<number, number>;
-
-            base(): number;
-            base(base: number): Log<Range, Output>;
-
-            interpolate(): (a: Range, b: Range) => (t: number) => Output;
-            interpolate(factory: (a: Range, b: Range) => (t: number) => Output): Log<Range, Output>;
-
-            clamp(): boolean;
-            clamp(clamp: boolean): Log<Range, Output>;
-
-            nice(): Log<Range, Output>;
-
-            ticks(): number[];
-
-            tickFormat(count?: number, format?: string): (t: number) => string;
-
-            copy(): Log<Range, Output>;
-        }
-
-        export function quantize<T>(): Quantize<T>;
-
-        interface Quantize<T> {
-            (x: number): T;
-
-            invertExtent(y: T): [number, number];
-
-            domain(): number[];
-            domain(numbers: number[]): Quantize<T>;
-
-            range(): T[];
-            range(values: T[]): Quantize<T>;
-
-            copy(): Quantize<T>;
-        }
-
-        export function quantile<T>(): Quantile<T>;
-
-        interface Quantile<T> {
-            (x: number): T;
-
-            invertExtent(y: T): [number, number];
-
-            domain(): number[];
-            domain(numbers: number[]): Quantile<T>;
-
-            range(): T[];
-            range(values: T[]): Quantile<T>;
-
-            quantiles(): number[];
-
-            copy(): Quantile<T>;
-        }
-
-        export function threshold<Range>(): Threshold<number, Range>;
-        export function threshold<Domain, Range>(): Threshold<Domain, Range>;
-
-        interface Threshold<Domain, Range> {
-            (x: number): Range;
-
-            invertExtent(y: Range): [Domain, Domain];
-
-            domain(): Domain[];
-            domain(domain: Domain[]): Threshold<Domain, Range>;
-
-            range(): Range[];
-            range(values: Range[]): Threshold<Domain, Range>;
-
-            copy(): Threshold<Domain, Range>;
-        }
-
-        export function ordinal<Range>(): Ordinal<string, Range>;
-        export function ordinal<Domain extends { toString(): string }, Range>(): Ordinal<Domain, Range>;
-        export function category10(): Ordinal<string, string>;
-        export function category10<Domain extends { toString(): string }>(): Ordinal<Domain, string>;
-        export function category20(): Ordinal<string, string>;
-        export function category20<Domain extends { toString(): string }>(): Ordinal<Domain, string>;
-        export function category20b(): Ordinal<string, string>;
-        export function category20b<Domain extends { toString(): string }>(): Ordinal<Domain, string>;
-        export function category20c(): Ordinal<string,string>;
-        export function category20c<Domain extends { toString(): string }>(): Ordinal<Domain, string>;
-
-        interface Ordinal<Domain extends { toString(): string }, Range> {
-            (x: Domain): Range;
-
-            domain(): Domain[];
-            domain(values: Domain[]): Ordinal<Domain, Range>;
-
-            range(): Range[];
-            range(values: Range[]): Ordinal<Domain, Range>;
-
-            rangePoints(interval: [number, number], padding?: number): Ordinal<Domain, number>;
-            rangeRoundPoints(interval: [number, number], padding?: number): Ordinal<Domain, number>;
-
-            rangeBands(interval: [number, number], padding?: number, outerPadding?: number): Ordinal<Domain, number>;
-            rangeRoundBands(interval: [number, number], padding?: number, outerPadding?: number): Ordinal<Domain, number>;
-
-            rangeBand(): number;
-            rangeExtent(): [number, number];
-
-            copy(): Ordinal<Domain, Range>;
-        }
-    }
-
-    export function interpolate(a: number, b: number): (t: number) => number;
-    export function interpolate(a: string, b: string): (t: number) => string;
-    export function interpolate(a: string | Color, b: Color): (t: number) => string;
-    export function interpolate(a: Array<string | Color>, b: Color[]): (t: number) => string;
-    export function interpolate<Range, Output>(a: Range[], b: Output[]): (t: number) => Output[];
-    export function interpolate<Range, Output>(a: Range[], b: Range[]): (t: number) => Output[];
-    export function interpolate(a: { [key: string]: string | Color }, b: { [key: string]: Color }): (t: number) => { [key: string]: string };
-    export function interpolate<Range, Output>(a: { [key: string]: Range }, b: { [key: string]: Output }): (t: number) => { [key: string]: Output };
-    export function interpolate<Range, Output>(a: { [key: string]: Range }, b: { [key: string]: Range }): (t: number) => { [key: string]: Output };
-
-    export function interpolateNumber(a: number, b: number): (t: number) => number;
-
-    export function interpolateRound(a: number, b: number): (t: number) => number;
-
-    export function interpolateString(a: string, b: string): (t: number) => string;
-
-    export function interpolateRgb(a: string | Color, b: string | Color): (t: number) => string;
-
-    export function interpolateHsl(a: string | Color, b: string | Color): (t: number) => string;
-
-    export function interpolateLab(a: string | Color, b: string | Color): (t: number) => string;
-
-    export function interpolateHcl(a: string | Color, b: string | Color): (t: number) => string;
-
-    export function interpolateArray(a: Array<string | Color>, b: Color[]): (t: number) => string[];
-    export function interpolateArray<Range, Output>(a: Range[], b: Range[]): (t: number) => Output[];
-    export function interpolateArray<Range, Output>(a: Range[], b: Output[]): (t: number) => Output[];
-
-    export function interpolateObject(a: { [key: string]: string | Color }, b: { [key: string]: Color }): (t: number) => { [key: string]: string };
-    export function interpolateObject<Range, Output>(a: { [key: string]: Range }, b: { [key: string]: Output }): (t: number) => { [key: string]: Output };
-    export function interpolateObject<Range, Output>(a: { [key: string]: Range }, b: { [key: string]: Range }): (t: number) => { [key: string]: Output };
-
-    export function interpolateTransform(a: string | Transform, b: string | Transform): (t: number) => string;
-
-    export function interpolateZoom(a: [number, number, number], b: [number, number, number]): {
-        (t: number): [number, number, number];
-        duration: number;
-    };
-
-    export var interpolators: Array<(a: any, b: any) => (t: number) => any>;
-
-    export module time {
-        export var second: Interval;
-        export var minute: Interval;
-        export var hour: Interval;
-        export var day: Interval;
-        export var week: Interval;
-        export var sunday: Interval;
-        export var monday: Interval;
-        export var tuesday: Interval;
-        export var wednesday: Interval;
-        export var thursday: Interval;
-        export var friday: Interval;
-        export var saturday: Interval;
-        export var month: Interval;
-        export var year: Interval;
-
-        interface Interval {
-            (d: Date): Date;
-
-            floor(d: Date): Date;
-
-            round(d: Date): Date;
-
-            ceil(d: Date): Date;
-
-            range(start: Date, stop: Date, step?: number): Date[];
-
-            offset(date: Date, step: number): Date;
-
-            utc: {
-                (d: Date): Date;
-
-                floor(d: Date): Date;
-
-                round(d: Date): Date;
-
-                ceil(d: Date): Date;
-
-                range(start: Date, stop: Date, step?: number): Date[];
-
-                offset(date: Date, step: number): Date;
-            }
-        }
-
-        export function seconds(start: Date, stop: Date, step?: number): Date[];
-        export function minutes(start: Date, stop: Date, step?: number): Date[];
-        export function hours(start: Date, stop: Date, step?: number): Date[];
-        export function days(start: Date, stop: Date, step?: number): Date[];
-        export function weeks(start: Date, stop: Date, step?: number): Date[];
-        export function sundays(start: Date, stop: Date, step?: number): Date[];
-        export function mondays(start: Date, stop: Date, step?: number): Date[];
-        export function tuesdays(start: Date, stop: Date, step?: number): Date[];
-        export function wednesdays(start: Date, stop: Date, step?: number): Date[];
-        export function thursdays(start: Date, stop: Date, step?: number): Date[];
-        export function fridays(start: Date, stop: Date, step?: number): Date[];
-        export function saturdays(start: Date, stop: Date, step?: number): Date[];
-        export function months(start: Date, stop: Date, step?: number): Date[];
-        export function years(start: Date, stop: Date, step?: number): Date[];
-
-        export function dayOfYear(d: Date): number;
-        export function weekOfYear(d: Date): number;
-        export function sundayOfYear(d: Date): number;
-        export function mondayOfYear(d: Date): number;
-        export function tuesdayOfYear(d: Date): number;
-        export function wednesdayOfYear(d: Date): number;
-        export function fridayOfYear(d: Date): number;
-        export function saturdayOfYear(d: Date): number;
-
-        export function format(specifier: string): Format;
-
-        export module format {
-            export function multi(formats: Array<[string, (d: Date) => boolean|number]>): Format;
-            export function utc(specifier: string): Format;
-            namespace utc {
-                export function multi(formats: Array<[string, (d: Date) => boolean|number]>): Format;
-            }
-
-            export var iso: Format;
-        }
-
-        interface Format {
-            (d: Date): string;
-            parse(input: string): Date;
-        }
-
-        export function scale(): Scale<number, number>;
-        export function scale<Output>(): Scale<Output, Output>;
-        export function scale<Range, Output>(): Scale<Range, Output>;
-
-        export module scale {
-            export function utc(): Scale<number, number>;
-            export function utc<Output>(): Scale<Output, Output>;
-            export function utc<Range, Output>(): Scale<Range, Output>;
-        }
-
-
-        interface Scale<Range, Output> {
-            (x: Date): Output;
-
-            invert(y: number): Date;
-
-            domain(): Date[];
-            domain(dates: number[]): Scale<Range, Output>;
-            domain(dates: Date[]): Scale<Range, Output>;
-
-            nice(): Scale<Range, Output>;
-            nice(interval: Interval, step?: number): Scale<Range, Output>;
-
-            range(): Range[];
-            range(values: Range[]): Scale<Range, Output>;
-
-            rangeRound(values: number[]): Scale<number, number>;
-
-            interpolate(): (a: Range, b: Range) => (t: number) => Output;
-            interpolate(factory: (a: Range, b: Range) => (t: number) => Output): Scale<Range, Output>;
-
-            clamp(): boolean;
-            clamp(clamp: boolean): Scale<Range, Output>;
-
-            ticks(): Date[];
-            ticks(interval: Interval, step?: number): Date[];
-            ticks(count: number): Date[];
-
-            tickFormat(count: number): (d: Date) => string;
-
-            copy(): Scale<Range, Output>;
-        }
-    }
-
-    export module behavior {
-        export function drag<Datum>(): Drag<Datum>;
-
-        interface Drag<Datum> {
-            (selection: Selection<Datum>): void;
-
-            on(type: string): (d: Datum, i: number) => any;
-            on(type: string, listener: (d: Datum, i: number) => any): Drag<Datum>;
-
-            origin(): (d: Datum, i: number) => { x: number; y: number };
-            origin(accessor: (d: Datum, i: number) => { x: number; y: number }): Drag<Datum>;
-        }
-
-        export function zoom<Datum>(): Zoom<Datum>;
-
-        namespace zoom {
-            interface Scale {
-                domain(): number[];
-                domain(values: number[]): Scale;
-
-                invert(y: number): number;
-
-                range(values: number[]): Scale;
-                range(): number[];
-            }
-        }
-
-        interface Zoom<Datum> {
-            (selection: Selection<Datum>): void;
-
-            translate(): [number, number];
-            translate(translate: [number, number]): Zoom<Datum>;
-
-            scale(): number;
-            scale(scale: number): Zoom<Datum>;
-
-            scaleExtent(): [number, number];
-            scaleExtent(extent: [number, number]): Zoom<Datum>;
-
-            center(): [number, number];
-            center(center: [number, number]): Zoom<Datum>;
-
-            size(): [number, number];
-            size(size: [number, number]): Zoom<Datum>;
-
-            x(): zoom.Scale;
-            x(x: zoom.Scale): Zoom<Datum>;
-
-            y(): zoom.Scale;
-            y(y: zoom.Scale): Zoom<Datum>;
-
-            on(type: string): (d: Datum, i: number) => any;
-            on(type: string, listener: (d: Datum, i: number) => any): Zoom<Datum>;
-
-            event(selection: Selection<Datum>): void;
-            event(transition: Transition<Datum>): void;
-        }
-    }
-
-    export module geo {
-        export function path(): Path;
-
-        interface Path {
-            (feature: any, index?: number): string;
-
-            area(feature: any): number;
-
-            centroid(feature: any): [number, number];
-
-            bounds(feature: any): [[number, number], [number, number]];
-
-            projection(): Transform | ((coordinates: [number, number]) => [number, number]);
-            projection(stream: Transform): Path;
-            projection(projection: (coordinates: [number, number]) => [number, number]): Path;
-
-            pointRadius(): number | ((datum: any, index: number) => number);
-            pointRadius(radius: number): Path;
-            pointRadius(radius: (datum: any, index: number) => number): Path;
-
-            context(): CanvasRenderingContext2D;
-            context(context: CanvasRenderingContext2D): Path;
-        }
-
-        export function graticule(): Graticule;
-
-        interface Graticule {
-            (): any;
-
-            lines(): any[];
-
-            outline(): any;
-
-            extent(): [[number, number], [number, number]];
-            extent(extent: [[number, number], [number, number]]): Graticule;
-
-            majorExtent(): [[number, number], [number, number]];
-            majorExtent(extent: [[number, number], [number, number]]): Graticule;
-
-            minorExtent(): [[number, number], [number, number]];
-            minorExtent(extent: [[number, number], [number, number]]): Graticule;
-
-            step(): [number, number];
-            step(step: [number, number]): Graticule;
-
-            majorStep(): [number, number];
-            majorStep(step: [number, number]): Graticule;
-
-            minorStep(): [number, number];
-            minorStep(step: [number, number]): Graticule;
-
-            precision(): number;
-            precision(precision: number): Graticule;
-        }
-
-        export function circle(): Circle;
-
-        interface Circle {
-            (...args: any[]): any;
-
-            origin(): [number, number] | ((...args: any[]) => [number, number]);
-            origin(origin: [number, number]): Circle;
-            origin(origin: (...args: any[]) => [number, number]): Circle;
-
-            angle(): number;
-            angle(angle: number): Circle;
-
-            precision(): number;
-            precision(precision: number): Circle;
-        }
-
-        export function area(feature: any): number;
-        export function centroid(feature: any): [number, number];
-        export function bounds(feature: any): [[number, number], [number, number]];
-        export function distance(a: [number, number], b: [number, number]): number;
-        export function length(feature: any): number;
-        export function interpolate(a: [number, number], b: [number, number]): (t: number) => [number, number];
-
-        export function rotation(rotate: [number, number] | [number, number, number]): Rotation;
-
-        interface Rotation {
-            (location: [number, number]): [number, number];
-            invert(location: [number, number]): [number, number];
-        }
-
-        export function stream(object: any, listener: Listener): void;
-
-        interface Listener {
-            point(x: number, y: number, z: number): void;
-            lineStart(): void;
-            lineEnd(): void;
-            polygonStart(): void;
-            polygonEnd(): void;
-            sphere(): void;
-        }
-
-        export function transform(methods: TransformMethods): Transform;
-
-        interface TransformMethods {
-            point?(x: number, y: number, z: number): void;
-            lineStart?(): void;
-            lineEnd?(): void;
-            polygonStart?(): void;
-            polygonEnd?(): void;
-            sphere?(): void;
-        }
-
-        interface Transform {
-            stream(stream: Listener): Listener;
-        }
-
-        export function clipExtent(): ClipExtent;
-
-        interface ClipExtent extends Transform {
-            extent(): [[number, number], [number, number]];
-            extent(extent: [[number, number], [number, number]]): ClipExtent;
-        }
-
-        export function projection(raw: RawInvertibleProjection): InvertibleProjection;
-        export function projection(raw: RawProjection): Projection;
-
-        export function projectionMutator(factory: (...args: any[]) => RawInvertibleProjection): (...args: any[]) => InvertibleProjection;
-        export function projectionMutator(factory: (...args: any[]) => RawProjection): (...args: any[]) => Projection;
-
-        export function albers(): ConicProjection;
-        export function albersUsa(): ConicProjection;
-        export function azimuthalEqualArea(): InvertibleProjection;
-        namespace azimuthalEqualArea {
-            export function raw(lambda: number, phi: number): [number, number];
-            namespace raw {
-                export function invert(x: number, y: number): [number, number];
-            }
-        }
-
-        export function azimuthalEquidistant(): InvertibleProjection;
-        namespace azimuthalEquidistant {
-            export function raw(lambda: number, phi: number): [number, number];
-            namespace raw {
-                export function invert(x: number, y: number): [number, number];
-            }
-        }
-
-        export function conicConformal(): ConicProjection;
-        namespace conicConformal {
-            export function raw(phi0: number, phi1: number): RawInvertibleProjection;
-        }
-
-        export function conicEqualArea(): ConicProjection;
-        namespace conicEqualArea {
-            export function raw(phi0: number, phi1: number): RawInvertibleProjection;
-        }
-
-        export function conicEquidistant(): ConicProjection;
-        namespace conicEquidistant {
-            export function raw(phi0: number, phi1: number): RawInvertibleProjection;
-        }
-
-        export function equirectangular(): InvertibleProjection;
-        namespace equirectangular {
-            export function raw(lambda: number, phi: number): [number, number];
-            namespace raw {
-                export function invert(x: number, y: number): [number, number];
-            }
-        }
-
-        export function gnomonic(): InvertibleProjection;
-        namespace gnomonic {
-            export function raw(lambda: number, phi: number): [number, number];
-            namespace raw {
-                export function invert(x: number, y: number): [number, number];
-            }
-        }
-
-        export function mercator(): InvertibleProjection;
-        namespace mercator {
-            export function raw(lambda: number, phi: number): [number, number];
-            namespace raw {
-                export function invert(x: number, y: number): [number, number];
-            }
-        }
-
-        export function orthographic(): InvertibleProjection;
-        namespace orthographic {
-            export function raw(lambda: number, phi: number): [number, number];
-            namespace raw {
-                export function invert(x: number, y: number): [number, number];
-            }
-        }
-
-        export function stereographic(): InvertibleProjection;
-        namespace stereographic {
-            export function raw(lambda: number, phi: number): [number, number];
-            namespace raw {
-                export function invert(x: number, y: number): [number, number];
-            }
-        }
-
-        export function transverseMercator(): InvertibleProjection;
-        namespace transverseMercator {
-            export function raw(lambda: number, phi: number): [number, number];
-            namespace raw {
-                export function invert(x: number, y: number): [number, number];
-            }
-        }
-
-        interface Projection {
-            (location: [number, number]): [number, number];
-
-            rotate(): [number, number, number];
-            rotate(rotation: [number, number, number]): Projection;
-
-            center(): [number, number];
-            center(location: [number, number]): Projection;
-
-            translate(): [number, number];
-            translate(point: [number, number]): Projection;
-
-            scale(): number;
-            scale(scale: number): Projection;
-
-            clipAngle(): number;
-            clipAngle(angle: number): Projection;
-
-            clipExtent(): [[number, number], [number, number]];
-            clipExtent(extent: [[number, number], [number, number]]): Projection;
-
-            precision(): number;
-            precision(precision: number): Projection;
-
-            stream(listener: Listener): Listener;
-        }
-
-        interface InvertibleProjection extends Projection {
-            invert(point: [number, number]): [number, number];
-        }
-
-        interface ConicProjection extends InvertibleProjection {
-            parallels(): [number, number];
-            parallels(parallels: [number, number]): ConicProjection;
-
-            rotate(): [number, number, number];
-            rotate(rotation: [number, number, number]): ConicProjection;
-
-            center(): [number, number];
-            center(location: [number, number]): ConicProjection;
-
-            translate(): [number, number];
-            translate(point: [number, number]): ConicProjection;
-
-            scale(): number;
-            scale(scale: number): ConicProjection;
-
-            clipAngle(): number;
-            clipAngle(angle: number): ConicProjection;
-
-            clipExtent(): [[number, number], [number, number]];
-            clipExtent(extent: [[number, number], [number, number]]): ConicProjection;
-
-            precision(): number;
-            precision(precision: number): ConicProjection;
-        }
-
-        interface RawProjection {
-            (lambda: number, phi: number): [number, number];
-        }
-
-        interface RawInvertibleProjection extends RawProjection {
-            invert(x: number, y: number): [number, number];
-        }
-    }
-
-    namespace svg {
-        export function line(): Line<[number, number]>;
-        export function line<T>(): Line<T>;
-
-        interface Line<T> {
-            (data: T[]): string;
-
-            x(): number | ((d: T, i: number) => number);
-            x(x: number): Line<T>;
-            x(x: (d: T, i: number) => number): Line<T>;
-
-            y(): number | ((d: T, i: number) => number);
-            y(x: number): Line<T>;
-            y(y: (d: T, i: number) => number): Line<T>;
-
-            interpolate(): string | ((points: Array<[number, number]>) => string);
-            interpolate(interpolate: "linear"): Line<T>;
-            interpolate(interpolate: "linear-closed"): Line<T>;
-            interpolate(interpolate: "step"): Line<T>;
-            interpolate(interpolate: "step-before"): Line<T>;
-            interpolate(interpolate: "step-after"): Line<T>;
-            interpolate(interpolate: "basis"): Line<T>;
-            interpolate(interpolate: "basis-open"): Line<T>;
-            interpolate(interpolate: "basis-closed"): Line<T>;
-            interpolate(interpolate: "bundle"): Line<T>;
-            interpolate(interpolate: "cardinal"): Line<T>;
-            interpolate(interpolate: "cardinal-open"): Line<T>;
-            interpolate(interpolate: "cardinal-closed"): Line<T>;
-            interpolate(interpolate: "monotone"): Line<T>;
-            interpolate(interpolate: string | ((points: Array<[number, number]>) => string)): Line<T>;
-
-            tension(): number;
-            tension(tension: number): Line<T>;
-
-            defined(): (d: T, i: number) => boolean;
-            defined(defined: (d: T, i: number) => boolean): Line<T>;
-        }
-
-        namespace line {
-            export function radial(): Radial<[number, number]>;
-            export function radial<T>(): Radial<T>;
-
-            interface Radial<T> {
-                (data: T[]): string;
-
-                radius(): number | ((d: T, i: number) => number);
-                radius(radius: number): Radial<T>;
-                radius(radius: (d: T, i: number) => number): Radial<T>;
-
-                angle(): number | ((d: T, i: number) => number);
-                angle(angle: number): Radial<T>;
-                angle(angle: (d: T, i: number) => number): Radial<T>;
-
-                interpolate(): string | ((points: Array<[number, number]>) => string);
-                interpolate(interpolate: "linear"): Radial<T>;
-                interpolate(interpolate: "linear-closed"): Radial<T>;
-                interpolate(interpolate: "step"): Radial<T>;
-                interpolate(interpolate: "step-before"): Radial<T>;
-                interpolate(interpolate: "step-after"): Radial<T>;
-                interpolate(interpolate: "basis"): Radial<T>;
-                interpolate(interpolate: "basis-open"): Radial<T>;
-                interpolate(interpolate: "basis-closed"): Radial<T>;
-                interpolate(interpolate: "bundle"): Radial<T>;
-                interpolate(interpolate: "cardinal"): Radial<T>;
-                interpolate(interpolate: "cardinal-open"): Radial<T>;
-                interpolate(interpolate: "cardinal-closed"): Radial<T>;
-                interpolate(interpolate: "monotone"): Radial<T>;
-                interpolate(interpolate: string | ((points: Array<[number, number]>) => string)): Radial<T>;
-
-                tension(): number;
-                tension(tension: number): Radial<T>;
-
-                defined(): (d: T, i: number) => boolean;
-                defined(defined: (d: T, i: number) => boolean): Radial<T>;
-            }
-        }
-
-        export function area(): Area<[number, number]>;
-        export function area<T>(): Area<T>;
-
-        interface Area<T> {
-            (data: T[]): string;
-
-            x(): number | ((d: T, i: number) => number);
-            x(x: number): Area<T>;
-            x(x: (d: T, i: number) => number): Area<T>;
-
-            x0(): number | ((d: T, i: number) => number);
-            x0(x0: number): Area<T>;
-            x0(x0: (d: T, i: number) => number): Area<T>;
-
-            x1(): number | ((d: T, i: number) => number);
-            x1(x1: number): Area<T>;
-            x1(x1: (d: T, i: number) => number): Area<T>;
-
-            y(): number | ((d: T, i: number) => number);
-            y(y: number): Area<T>;
-            y(y: (d: T, i: number) => number): Area<T>;
-
-            y0(): number | ((d: T, i: number) => number);
-            y0(y0: number): Area<T>;
-            y0(y0: (d: T, i: number) => number): Area<T>;
-
-            y1(): number | ((d: T, i: number) => number);
-            y1(y1: number): Area<T>;
-            y1(y1: (d: T, i: number) => number): Area<T>;
-
-            interpolate(): string | ((points: Array<[number, number]>) => string);
-            interpolate(interpolate: "linear"): Area<T>;
-            interpolate(interpolate: "step"): Area<T>;
-            interpolate(interpolate: "step-before"): Area<T>;
-            interpolate(interpolate: "step-after"): Area<T>;
-            interpolate(interpolate: "basis"): Area<T>;
-            interpolate(interpolate: "basis-open"): Area<T>;
-            interpolate(interpolate: "cardinal"): Area<T>;
-            interpolate(interpolate: "cardinal-open"): Area<T>;
-            interpolate(interpolate: "monotone"): Area<T>;
-            interpolate(interpolate: string | ((points: Array<[number, number]>) => string)): Area<T>;
-
-            tension(): number;
-            tension(tension: number): Area<T>;
-
-            defined(): (d: T, i: number) => boolean;
-            defined(defined: (d: T, i: number) => boolean): Area<T>;
-        }
-
-        namespace area {
-            export function radial(): Radial<[number, number]>;
-            export function radial<T>(): Radial<T>;
-
-            interface Radial<T> {
-                (data: T[]): string;
-
-                radius(): number | ((d: T, i: number) => number);
-                radius(radius: number): Radial<T>;
-                radius(radius: (d: T, i: number) => number): Radial<T>;
-
-                innerRadius(): number | ((d: T, i: number) => number);
-                innerRadius(innerRadius: number): Radial<T>;
-                innerRadius(innerRadius: (d: T, i: number) => number): Radial<T>;
-
-                outerRadius(): number | ((d: T, i: number) => number);
-                outerRadius(outerRadius: number): Radial<T>;
-                outerRadius(outerRadius: (d: T, i: number) => number): Radial<T>;
-
-                angle(): number | ((d: T, i: number) => number);
-                angle(angle: number): Radial<T>;
-                angle(angle: (d: T, i: number) => number): Radial<T>;
-
-                startAngle(): number | ((d: T, i: number) => number);
-                startAngle(startAngle: number): Radial<T>;
-                startAngle(startAngle: (d: T, i: number) => number): Radial<T>;
-
-                endAngle(): number | ((d: T, i: number) => number);
-                endAngle(endAngle: number): Radial<T>;
-                endAngle(endAngle: (d: T, i: number) => number): Radial<T>;
-
-                interpolate(): string | ((points: Array<[number, number]>) => string);
-                interpolate(interpolate: "linear"): Radial<T>;
-                interpolate(interpolate: "step"): Radial<T>;
-                interpolate(interpolate: "step-before"): Radial<T>;
-                interpolate(interpolate: "step-after"): Radial<T>;
-                interpolate(interpolate: "basis"): Radial<T>;
-                interpolate(interpolate: "basis-open"): Radial<T>;
-                interpolate(interpolate: "cardinal"): Radial<T>;
-                interpolate(interpolate: "cardinal-open"): Radial<T>;
-                interpolate(interpolate: "monotone"): Radial<T>;
-                interpolate(interpolate: string | ((points: Array<[number, number]>) => string)): Radial<T>;
-
-                tension(): number;
-                tension(tension: number): Radial<T>;
-
-                defined(): (d: T, i: number) => boolean;
-                defined(defined: (d: T, i: number) => boolean): Radial<T>;
-            }
-        }
-
-        export function arc(): Arc<arc.Arc>;
-        export function arc<T>(): Arc<T>;
-
-        namespace arc {
-            interface Arc {
-                innerRadius: number;
-                outerRadius: number;
-                startAngle: number;
-                endAngle: number;
-                padAngle: number
-            }
-        }
-
-        interface Arc<T> {
-            (d: T, i?: number): string;
-
-            innerRadius(): (d: T, i: number) => number;
-            innerRadius(radius: number): Arc<T>;
-            innerRadius(radius: (d: T, i: number) => number): Arc<T>;
-
-            outerRadius(): (d: T, i: number) => number;
-            outerRadius(radius: number): Arc<T>;
-            outerRadius(radius: (d: T, i: number) => number): Arc<T>;
-
-            cornerRadius(): (d: T, i: number) => number;
-            cornerRadius(radius: number): Arc<T>;
-            cornerRadius(radius: (d: T, i: number) => number): Arc<T>;
-
-            padRadius(): string | ((d: T, i: number) => number);
-            padRadius(radius: "auto"): Arc<T>;
-            padRadius(radius: string): Arc<T>;
-            padRadius(radius: (d: T, i: number) => number): Arc<T>;
-
-            startAngle(): (d: T, i: number) => number;
-            startAngle(angle: number): Arc<T>;
-            startAngle(angle: (d: T, i: number) => number): Arc<T>;
-
-            endAngle(): (d: T, i: number) => number;
-            endAngle(angle: number): Arc<T>;
-            endAngle(angle: (d: T, i: number) => number): Arc<T>;
-
-            padAngle(): (d: T, i: number) => number;
-            padAngle(angle: number): Arc<T>;
-            padAngle(angle: (d: T, i: number) => number): Arc<T>;
-
-            centroid(d: T, i?: number): [number, number];
-        }
-
-        export function symbol(): Symbol<{}>;
-        export function symbol<T>(): Symbol<T>;
-
-        interface Symbol<T> {
-            (d: T, i?: number): string;
-
-            type(): (d: T, i: number) => string;
-            type(type: string): Symbol<T>;
-            type(type: (d: T, i: number) => string): Symbol<T>;
-
-            size(): (d: T, i: string) => number;
-            size(size: number): Symbol<T>;
-            size(size: (d: T, i: number) => number): Symbol<T>;
-        }
-
-        export var symbolTypes: string[];
-
-        export function chord(): Chord<chord.Link<chord.Node>, chord.Node>;
-        export function chord<Node>(): Chord<chord.Link<Node>, Node>;
-        export function chord<Link, Node>(): Chord<Link, Node>;
-
-        namespace chord {
-            interface Link<Node> {
-                source: Node;
-                target: Node;
-            }
-
-            interface Node {
-                radius: number;
-                startAngle: number;
-                endAngle: number
-            }
-        }
-
-        interface Chord<Link, Node> {
-            (d: Link, i: number): string;
-
-            source(): (d: Link, i: number) => Node;
-            source(source: Node): Chord<Link, Node>;
-            source(source: (d: Link, i: number) => Node): Chord<Link, Node>;
-
-            target(): (d: Link, i: number) => Node;
-            target(target: Node): Chord<Link, Node>;
-            target(target: (d: Link, i: number) => Node): Chord<Link, Node>;
-
-            radius(): (d: Node, i: number) => number;
-            radius(radius: number): Chord<Link, Node>;
-            radius(radius: (d: Node, i: number) => number): Chord<Link, Node>;
-
-            startAngle(): (d: Node, i: number) => number;
-            startAngle(angle: number): Chord<Link, Node>;
-            startAngle(angle: (d: Node, i: number) => number): Chord<Link, Node>;
-
-            endAngle(): (d: Node, i: number) => number;
-            endAngle(angle: number): Chord<Link, Node>;
-            endAngle(angle: (d: Node, i: number) => number): Chord<Link, Node>;
-        }
-
-        export function diagonal(): Diagonal<diagonal.Link<diagonal.Node>, diagonal.Node>;
-        export function diagonal<Node>(): Diagonal<diagonal.Link<Node>, Node>;
-        export function diagonal<Link, Node>(): Diagonal<Link, Node>;
-
-        namespace diagonal {
-            interface Link<Node> {
-                source: Node;
-                target: Node;
-            }
-
-            interface Node {
-                x: number;
-                y: number;
-            }
-        }
-
-        interface Diagonal<Link, Node> {
-            (d: Link, i?: number): string;
-
-            source(): (d: Link, i: number) => Node;
-            source(source: Node): Diagonal<Link, Node>;
-            source(source: (d: Link, i: number) => { x: number; y: number; }): Diagonal<Link, Node>;
-
-            target(): (d: Link, i: number) => Node;
-            target(target: Node): Diagonal<Link, Node>;
-            target(target: (d: Link, i: number) => { x: number; y: number; }): Diagonal<Link, Node>;
-
-            projection(): (d: Node, i: number) => [number, number];
-            projection(projection: (d: Node, i: number) => [number, number]): Diagonal<Link, Node>;
-        }
-
-        namespace diagonal {
-            export function radial(): Radial<Link<Node>, Node>;
-            export function radial<Node>(): Radial<Link<Node>, Node>;
-            export function radial<Link, Node>(): Radial<Link, Node>;
-
-            interface Radial<Link, Node> {
-                (d: Link, i: number): string;
-
-                source(): (d: Link, i: number) => Node;
-                source(source: Node): Radial<Link, Node>;
-                source(source: (d: Link, i: number) => Node): Radial<Link, Node>;
-
-                target(): (d: Link, i: number) => Node;
-                target(target: Node): Radial<Link, Node>;
-                target(target: (d: Link, i: number) => Node): Radial<Link, Node>;
-
-                projection(): (d: Node, i: number) => [number, number];
-                projection(projection: (d: Node, i: number) => [number, number]): Radial<Link, Node>;
-            }
-        }
-
-        export function axis(): Axis;
-
-        interface Axis {
-            (selection: Selection<any>): void;
-            (selection: Transition<any>): void;
-
-            scale(): any;
-            scale(scale: any): Axis;
-
-            orient(): string;
-            orient(orientation: string): Axis;
-
-            ticks(): any[];
-            ticks(...args: any[]): Axis;
-
-            tickValues(): any[];
-            tickValues(values: any[]): Axis;
-
-            tickSize(): number;
-            tickSize(size: number): Axis;
-            tickSize(inner: number, outer: number): Axis;
-
-            innerTickSize(): number;
-            innerTickSize(size: number): Axis;
-
-            outerTickSize(): number;
-            outerTickSize(size: number): Axis;
-
-            tickPadding(): number;
-            tickPadding(padding: number): Axis;
-
-            tickFormat(): (t: any) => string;
-            tickFormat(format: (t: any) => string): Axis;
-            tickFormat(format:string): Axis;
-        }
-
-        export function brush(): Brush<any>;
-        export function brush<T>(): Brush<T>;
-
-        namespace brush {
-            interface Scale {
-                domain(): number[];
-                domain(domain: number[]): Scale;
-
-                range(): number[];
-                range(range: number[]): Scale;
-
-                invert?(y: number): number;
-            }
-        }
-
-        interface Brush<T> {
-            (selection: Selection<T>): void;
-            (selection: Transition<T>): void;
-
-            event(selection: Selection<T>): void;
-            event(selection: Transition<T>): void;
-
-            x(): brush.Scale;
-            x(x: brush.Scale): Brush<T>;
-
-            y(): brush.Scale;
-            y(y: brush.Scale): Brush<T>;
-
-            extent(): [number, number] | [[number, number], [number, number]];
-            extent(extent: [number, number] | [[number, number], [number, number]]): Brush<T>;
-
-            clamp(): boolean | [boolean, boolean];
-            clamp(clamp: boolean | [boolean, boolean]): Brush<T>;
-
-            clear(): void;
-
-            empty(): boolean;
-
-            on(type: 'brushstart'): (datum: T, index: number) => void;
-            on(type: 'brush'): (datum: T, index: number) => void;
-            on(type: 'brushend'): (datum: T, index: number) => void;
-            on(type: string): (datum: T, index: number) => void;
-
-            on(type: 'brushstart', listener: (datum: T, index: number) => void): Brush<T>;
-            on(type: 'brush', listener: (datum: T, index: number) => void): Brush<T>;
-            on(type: 'brushend', listener: (datum: T, index: number) => void): Brush<T>;
-            on(type: string, listener: (datum: T, index: number) => void): Brush<T>;
-        }
-    }
-
-    export function xhr(url: string, mimeType?: string, callback?: (err: any, data: any) => void): Xhr;
-    export function xhr(url: string, callback: (err: any, data: any) => void): Xhr;
-
-    interface Xhr {
-        header(name: string): string;
-        header(name: string, value: string): Xhr;
-
-        mimeType(): string;
-        mimeType(type: string): Xhr;
-
-        responseType(): string;
-        responseType(type: string): Xhr;
-
-        response(): (request: XMLHttpRequest) => any;
-        response(value: (request: XMLHttpRequest) => any): Xhr;
-
-        get(callback?: (err: any, data: any) => void): Xhr;
-
-        post(data?: any, callback?: (err: any, data: any) => void): Xhr;
-        post(callback: (err: any, data: any) => void): Xhr;
-
-        send(method: string, data?: any, callback?: (err: any, data: any) => void): Xhr;
-        send(method: string, callback: (err: any, data: any) => void): Xhr;
-
-        abort(): Xhr;
-
-        on(type: "beforesend"): (request: XMLHttpRequest) => void;
-        on(type: "progress"): (request: XMLHttpRequest) => void;
-        on(type: "load"): (response: any) => void;
-        on(type: "error"): (err: any) => void;
-        on(type: string): (...args: any[]) => void;
-
-        on(type: "beforesend", listener: (request: XMLHttpRequest) => void): Xhr;
-        on(type: "progress", listener: (request: XMLHttpRequest) => void): Xhr;
-        on(type: "load", listener: (response: any) => void): Xhr;
-        on(type: "error", listener: (err: any) => void): Xhr;
-        on(type: string, listener: (...args: any[]) => void): Xhr;
-    }
-
-    export function text(url: string, mimeType?: string, callback?: (err: any, data: string) => void): Xhr;
-    export function text(url: string, callback: (err: any, data: string) => void): Xhr;
-
-    export function json(url: string, callback?: (err: any, data: any) => void): Xhr;
-
-    export function xml(url: string, mimeType?: string, callback?: (err: any, data: any) => void): Xhr;
-    export function xml(url: string, callback: (err: any, data: any) => void): Xhr;
-
-    export function html(url: string, callback?: (err: any, data: DocumentFragment) => void): Xhr;
-
-    export var csv: Dsv;
-    export var tsv: Dsv;
-    export function dsv(delimiter: string, mimeType: string): Dsv;
-
-    interface Dsv {
-        (url: string, callback: (rows: { [key: string]: string }[]) => void): DsvXhr<{ [key: string]: string }>;
-        (url: string, callback: (error: any, rows: { [key: string]: string }[]) => void): DsvXhr<{ [key: string]: string }>;
-        (url: string): DsvXhr<{ [key: string]: string }>;
-        <T>(url: string, accessor: (row: { [key: string]: string }) => T, callback: (rows: T[]) => void): DsvXhr<T>;
-        <T>(url: string, accessor: (row: { [key: string]: string }) => T, callback: (error: any, rows: T[]) => void): DsvXhr<T>;
-        <T>(url: string, accessor: (row: { [key: string]: string }) => T): DsvXhr<T>;
-
-        parse(string: string): { [key: string]: string }[];
-        parse<T>(string: string, accessor: (row: { [key: string]: string }, index: number) => T): T[];
-
-        parseRows(string: string): string[][];
-        parseRows<T>(string: string, accessor: (row: string[], index: number) => T): T[];
-
-        format(rows: Object[]): string;
-
-        formatRows(rows: string[][]): string;
-    }
-
-    interface DsvXhr<T> extends Xhr {
-        row(): (row: { [key: string]: string }) => T;
-        row<U>(accessor: (row: { [key: string]: string }) => U): DsvXhr<U>;
-
-        header(name: string): string;
-        header(name: string, value: string): DsvXhr<T>;
-
-        mimeType(): string;
-        mimeType(type: string): DsvXhr<T>;
-
-        responseType(): string;
-        responseType(type: string): DsvXhr<T>;
-
-        response(): (request: XMLHttpRequest) => any;
-        response(value: (request: XMLHttpRequest) => any): DsvXhr<T>;
-
-        get(callback?: (err: XMLHttpRequest, data: T[]) => void): DsvXhr<T>;
-        post(data?: any, callback?: (err: XMLHttpRequest, data: T[]) => void): DsvXhr<T>;
-        post(callback: (err: XMLHttpRequest, data: T[]) => void): DsvXhr<T>;
-
-        send(method: string, data?: any, callback?: (err: XMLHttpRequest, data: T[]) => void): DsvXhr<T>;
-        send(method: string, callback: (err: XMLHttpRequest, data: T[]) => void): DsvXhr<T>;
-
-        abort(): DsvXhr<T>;
-
-        on(type: "beforesend"): (request: XMLHttpRequest) => void;
-        on(type: "progress"): (request: XMLHttpRequest) => void;
-        on(type: "load"): (response: T[]) => void;
-        on(type: "error"): (err: any) => void;
-        on(type: string): (...args: any[]) => void;
-
-        on(type: "beforesend", listener: (request: XMLHttpRequest) => void): DsvXhr<T>;
-        on(type: "progress", listener: (request: XMLHttpRequest) => void): DsvXhr<T>;
-        on(type: "load", listener: (response: T[]) => void): DsvXhr<T>;
-        on(type: "error", listener: (err: any) => void): DsvXhr<T>;
-        on(type: string, listener: (...args: any[]) => void): DsvXhr<T>;
-    }
-
-    export function locale(definition: LocaleDefinition): Locale;
-
-    interface LocaleDefinition {
-        decimal: string;
-        thousands: string;
-        grouping: number[];
-        currency: [string, string];
-        dateTime: string;
-        date: string;
-        time: string;
-        periods: [string, string];
-        days: [string, string, string, string, string, string, string];
-        shortDays: [string, string, string, string, string, string, string];
-        months: [string, string, string, string, string, string, string, string, string, string, string, string];
-        shortMonths: [string, string, string, string, string, string, string, string, string, string, string, string];
-    }
-
-    interface Locale {
-        numberFormat(specifier: string): (n: number) => string;
-        timeFormat: {
-            (specifier: string): time.Format;
-            utc(specifier: string): time.Format;
-            multi(formats: Array<[string, (d: Date) => boolean|number]>): time.Format;
-        }
-    }
-
-    namespace layout {
-        export function bundle(): Bundle<bundle.Node>;
-        export function bundle<T extends bundle.Node>(): Bundle<T>
-
-        namespace bundle {
-            interface Node {
-                parent: Node;
-            }
-
-            interface Link<T extends Node> {
-                source: T;
-                target: T;
-            }
-        }
-
-        interface Bundle<T extends bundle.Node> {
-            (links: bundle.Link<T>[]): T[][];
-        }
-
-        export function chord(): Chord;
-
-        namespace chord {
-            interface Link {
-                source: Node;
-                target: Node;
-            }
-
-            interface Node {
-                index: number;
-                subindex: number;
-                startAngle: number;
-                endAngle: number;
-                value: number;
-            }
-
-            interface Group {
-                index: number;
-                startAngle: number;
-                endAngle: number;
-                value: number;
-            }
-        }
-
-        interface Chord {
-            matrix(): number[][];
-            matrix(matrix: number[][]): Chord;
-
-            padding(): number;
-            padding(padding: number): Chord;
-
-            sortGroups(): (a: number, b: number) => number;
-            sortGroups(comparator: (a: number, b: number) => number): Chord;
-
-            sortSubgroups(): (a: number, b: number) => number;
-            sortSubgroups(comparator: (a: number, b: number) => number): Chord;
-
-            sortChords(): (a: number, b: number) => number;
-            sortChords(comparator: (a: number, b: number) => number): Chord;
-
-            chords(): chord.Link[];
-            groups(): chord.Group[];
-        }
-
-        export function cluster(): Cluster<cluster.Result>;
-        export function cluster<T extends cluster.Result>(): Cluster<T>;
-
-        namespace cluster {
-            interface Result {
-                parent?: Result;
-                children?: Result[];
-                depth?: number;
-                x?: number;
-                y?: number;
-            }
-
-            interface Link<T extends Result> {
-                source: T;
-                target: T;
-            }
-        }
-
-        interface Cluster<T extends cluster.Result> {
-            (root: T): T[];
-
-            nodes(root: T): T[];
-
-            links(nodes: T[]): cluster.Link<T>[];
-
-            children(): (node: T) => T[];
-            children(accessor: (node: T) => T[]): Cluster<T>;
-
-            sort(): (a: T, b: T) => number;
-            sort(comparator: (a: T, b: T) => number): Cluster<T>;
-
-            separation(): (a: T, b: T) => number;
-            separation(separation: (a: T, b: T) => number): Cluster<T>;
-
-            size(): [number, number];
-            size(size: [number, number]): Cluster<T>;
-
-            nodeSize(): [number, number];
-            nodeSize(nodeSize: [number, number]): Cluster<T>;
-
-            value(): (a: T) => number;
-            value(value: (a: T) => number): Cluster<T>;
-        }
-
-        export function force(): Force<force.Link<force.Node>, force.Node>;
-        export function force<Node extends force.Node>(): Force<force.Link<Node>, Node>;
-        export function force<Link extends force.Link<force.Node>, Node extends force.Node>(): Force<Link, Node>;
-
-        namespace force {
-            interface Link<T extends Node> {
-                source: T;
-                target: T;
-            }
-
-            interface Node {
-                index?: number;
-                x?: number;
-                y?: number;
-                px?: number;
-                py?: number;
-                fixed?: boolean;
-                weight?: number;
-            }
-
-            interface Event {
-                type: string;
-                alpha: number;
-            }
-        }
-
-        interface Force<Link extends force.Link<force.Node>, Node extends force.Node> {
-            size(): [number, number];
-            size(size: [number, number]): Force<Link, Node>;
-
-            linkDistance(): number | ((link: Link, index: number) => number);
-            linkDistance(distance: number): Force<Link, Node>;
-            linkDistance(distance: (link: Link, index: number) => number): Force<Link, Node>;
-
-            linkStrength(): number | ((link: Link, index: number) => number);
-            linkStrength(strength: number): Force<Link, Node>;
-            linkStrength(strength: (link: Link, index: number) => number): Force<Link, Node>;
-
-            friction(): number;
-            friction(friction: number): Force<Link, Node>;
-
-            charge(): number | ((node: Node, index: number) => number);
-            charge(charge: number): Force<Link, Node>;
-            charge(charge: (node: Node, index: number) => number): Force<Link, Node>;
-
-            chargeDistance(): number;
-            chargeDistance(distance: number): Force<Link, Node>;
-
-            theta(): number;
-            theta(theta: number): Force<Link, Node>;
-
-            gravity(): number;
-            gravity(gravity: number): Force<Link, Node>;
-
-            nodes(): Node[];
-            nodes(nodes: Node[]): Force<Link, Node>;
-
-            links(): Link[];
-            links(links: { source: number; target: number }[]): Force<Link, Node>;
-            links(links: Link[]): Force<Link, Node>;
-
-            start(): Force<Link, Node>;
-
-            alpha(): number;
-            alpha(value: number): Force<Link, Node>;
-
-            resume(): Force<Link, Node>;
-
-            stop(): Force<Link, Node>;
-
-            on(type: string): (event: force.Event) => void;
-            on(type: string, listener: (event: force.Event) => void): Force<Link, Node>;
-
-            drag(): behavior.Drag<Node>;
-            drag(selection: Selection<Node>): void;
-        }
-
-        export function hierarchy(): Hierarchy<hierarchy.Result>;
-        export function hierarchy<T extends hierarchy.Result>(): Hierarchy<T>;
-
-        namespace hierarchy {
-            interface Result {
-                parent?: Result;
-                children?: Result[];
-                value?: number;
-                depth?: number;
-            }
-        }
-
-        interface Hierarchy<T extends hierarchy.Result> {
-            (root: T): T[];
-
-            children(): (node: T) => T[];
-            children(accessor: (node: T) => T[]): Hierarchy<T>;
-
-            sort(): (a: T, b: T) => number;
-            sort(comparator: (a: T, b: T) => number): Hierarchy<T>;
-
-            value(): (node: T) => number;
-            value(accessor: (node: T) => number): Hierarchy<T>;
-
-            revalue(root: T): T[];
-        }
-
-        export function histogram(): Histogram<number>;
-        export function histogram<T>(): Histogram<T>;
-
-        namespace histogram {
-            interface Bin<T> extends Array<T> {
-                x: number;
-                dx: number;
-                y: number;
-            }
-        }
-
-        interface Histogram<T> {
-            (values: T[], index?: number): histogram.Bin<T>[];
-
-            value(): (datum: T, index: number) => number;
-            value(value: (datum: T, index: number) => number): Histogram<T>;
-
-            range(): (values: T[], index: number) => [number, number];
-            range(range: (values: T[], index: number) => [number, number]): Histogram<T>;
-
-            bins(): (range: [number, number], values: T[], index: number) => number[];
-            bins(count: number): Histogram<T>;
-            bins(thresholds: number[]): Histogram<T>;
-            bins(func: (range: [number, number], values: T[], index: number) => number[]): Histogram<T>;
-
-            frequency(): boolean;
-            frequency(frequency: boolean): Histogram<T>;
-        }
-
-        export function pack(): Pack<pack.Node>;
-        export function pack<T extends pack.Node>(): Pack<T>;
-
-        namespace pack {
-            interface Node {
-                parent?: Node;
-                children?: Node[];
-                value?: number;
-                depth?: number;
-                x?: number;
-                y?: number;
-                r?: number;
-            }
-
-            interface Link<T extends Node> {
-                source: Node;
-                target: Node;
-            }
-        }
-
-        interface Pack<T extends pack.Node> {
-            (root: T): T[];
-
-            nodes(root: T): T[];
-
-            links(nodes: T[]): pack.Link<T>[];
-
-            children(): (node: T, depth: number) => T[];
-            children(children: (node: T, depth: number) => T[]): Pack<T>;
-
-            sort(): (a: T, b: T) => number;
-            sort(comparator: (a: T, b: T) => number): Pack<T>;
-
-            value(): (node: T) => number;
-            value(value: (node: T) => number): Pack<T>;
-
-            size(): [number, number];
-            size(size: [number, number]): Pack<T>;
-
-            radius(): number | ((node: T) => number);
-            radius(radius: number): Pack<T>;
-            radius(radius: (node: T) => number): Pack<T>;
-
-            padding(): number;
-            padding(padding: number): Pack<T>;
-        }
-
-        export function partition(): Partition<partition.Node>;
-        export function partition<T extends partition.Node>(): Partition<T>;
-
-        namespace partition {
-            interface Link<T extends Node> {
-                source: T;
-                target: T;
-            }
-
-            interface Node {
-                parent?: Node;
-                children?: number;
-                value?: number;
-                depth?: number;
-                x?: number;
-                y?: number;
-                dx?: number;
-                dy?: number;
-            }
-
-        }
-
-        export interface Partition<T extends partition.Node> {
-            nodes(root: T): T[];
-
-            links(nodes: T[]): partition.Link<T>[];
-
-            children(): (node: T, depth: number) => T[];
-            children(children: (node: T, depth: number) => T[]): Partition<T>;
-
-            sort(): (a: T, b: T) => number;
-            sort(comparator: (a: T, b: T) => number): Partition<T>;
-
-            value(): (node: T) => number;
-            value(value: (node: T) => number): Partition<T>;
-
-            size(): [number, number];
-            size(size: [number, number]): Partition<T>;
-        }
-
-        export function pie(): Pie<number>;
-        export function pie<T>(): Pie<T>;
-
-        namespace pie {
-            interface Arc<T> {
-                value: number;
-                startAngle: number;
-                endAngle: number;
-                padAngle: number;
-                data: T;
-            }
-        }
-
-        interface Pie<T> {
-            (data: T[], index?: number): pie.Arc<T>[];
-
-            value(): (datum: T, index: number) => number;
-            value(accessor: (datum: T, index: number) => number): Pie<T>;
-
-            sort(): (a: T, b: T) => number;
-            sort(comparator: (a: T, b: T) => number): Pie<T>;
-
-            startAngle(): number | ((data: T[], index: number) => number);
-            startAngle(angle: number): Pie<T>;
-            startAngle(angle: (data: T[], index: number) => number): Pie<T>;
-
-            endAngle(): number | ((data: T[], index: number) => number);
-            endAngle(angle: number): Pie<T>;
-            endAngle(angle: (data: T[], index: number) => number): Pie<T>;
-
-            padAngle(): number | ((data: T[], index: number) => number);
-            padAngle(angle: number): Pie<T>;
-            padAngle(angle: (data: T[], index: number) => number): Pie<T>;
-        }
-
-        export function stack(): Stack<stack.Value[], stack.Value>;
-        export function stack<Value>(): Stack<Value[], Value>;
-        export function stack<Series, Value>(): Stack<Series, Value>;
-        namespace stack {
-            interface Value {
-                x: number;
-                y: number;
-                y0?: number;
-            }
-        }
-
-        interface Stack<Series, Value> {
-            (layers: Series[], index?: number): Series[];
-
-            values(): (layer: Series, index: number) => Value[];
-            values(accessor: (layer: Series, index: number) => Value[]): Stack<Series, Value>;
-
-            offset(): (data: Array<[number, number]>) => number[];
-            offset(offset: "silhouette"): Stack<Series, Value>;
-            offset(offset: "wiggle"): Stack<Series, Value>;
-            offset(offset: "expand"): Stack<Series, Value>;
-            offset(offset: "zero"): Stack<Series, Value>;
-            offset(offset: string): Stack<Series, Value>;
-            offset(offset: (data: Array<[number, number]>) => number[]): Stack<Series, Value>;
-
-            order(): (data: Array<[number, number]>) => number[];
-            order(order: "inside-out"): Stack<Series, Value>;
-            order(order: "reverse"): Stack<Series, Value>;
-            order(order: "default"): Stack<Series, Value>;
-            order(order: string): Stack<Series, Value>;
-            order(order: (data: Array<[number, number]>) => number[]): Stack<Series, Value>;
-
-            x(): (value: Value, index: number) => number;
-            x(accessor: (value: Value, index: number) => number): Stack<Series, Value>;
-
-            y(): (value: Value, index: number) => number;
-            y(accesor: (value: Value, index: number) => number): Stack<Series, Value>;
-
-            out(): (value: Value, y0: number, y: number) => void;
-            out(setter: (value: Value, y0: number, y: number) => void): Stack<Series, Value>;
-        }
-
-        export function tree(): Tree<tree.Node>;
-        export function tree<T extends tree.Node>(): Tree<T>;
-
-        namespace tree {
-            interface Link<T extends Node> {
-                source: T;
-                target: T;
-            }
-
-            interface Node {
-                parent?: Node;
-                children?: Node[];
-                depth?: number;
-                x?: number;
-                y?: number;
-            }
-        }
-
-        interface Tree<T> {
-            (root: T, index?: number): T[];
-
-            nodes(root: T, index?: number): T[];
-
-            links(nodes: T[]): tree.Link<T>[];
-
-            children(): (datum: T, index: number) => T[];
-            children(children: (datum: T, index: number) => T[]): Tree<T>;
-
-            separation(): (a: T, b: T) => number;
-            separation(separation: (a: T, b: T) => number): Tree<T>;
-
-            size(): [number, number];
-            size(size: [number, number]): Tree<T>;
-
-            nodeSize(): [number, number];
-            nodeSize(size: [number, number]): Tree<T>;
-
-            sort(): (a: T, b: T) => number;
-            sort(comparator: (a: T, b: T) => number): Tree<T>;
-
-            value(): (datum: T, index: number) => number;
-            value(value: (datum: T, index: number) => number): Tree<T>;
-        }
-
-        export function treemap(): Treemap<treemap.Node>;
-        export function treemap<T extends treemap.Node>(): Treemap<T>;
-
-        namespace treemap {
-            interface Node {
-                parent?: Node;
-                children?: Node[];
-                value?: number;
-                depth?: number;
-                x?: number;
-                y?: number;
-                dx?: number;
-                dy?: number;
-            }
-
-            interface Link<T extends Node> {
-                source: T;
-                target: T;
-            }
-
-            type Padding = number | [number, number, number, number];
-        }
-
-        interface Treemap<T extends treemap.Node> {
-            (root: T, index?: number): T[];
-
-            nodes(root: T, index?: number): T[];
-
-            links(nodes: T[]): treemap.Link<T>[];
-
-            children(): (node: T, depth: number) => T[];
-            children(children: (node: T, depth: number) => T[]): Treemap<T>;
-
-            sort(): (a: T, b: T) => number;
-            sort(comparator: (a: T, b: T) => number): Treemap<T>;
-
-            value(): (node: T, index: number) => number;
-            value(value: (node: T, index: number) => number): Treemap<T>;
-
-            size(): [number, number];
-            size(size: [number, number]): Treemap<T>;
-
-            padding(): (node: T, depth: number) => treemap.Padding;
-            padding(padding: treemap.Padding): Treemap<T>;
-            padding(padding: (node: T, depth: number) => treemap.Padding): Treemap<T>;
-
-            round(): boolean;
-            round(round: boolean): Treemap<T>;
-
-            sticky(): boolean;
-            sticky(sticky: boolean): boolean;
-
-            mode(): string;
-            mode(mode: "squarify"): Treemap<T>;
-            mode(mode: "slice"): Treemap<T>;
-            mode(mode: "dice"): Treemap<T>;
-            mode(mode: "slice-dice"): Treemap<T>;
-            mode(mode: string): Treemap<T>;
-
-            ratio(): number;
-            ratio(ratio: number): Treemap<T>;
-        }
-    }
-
-    namespace geom {
-        export function voronoi(): Voronoi<[number, number]>;
-        export function voronoi<T>(): Voronoi<T>;
-
-        namespace voronoi {
-            interface Link<T> {
-                source: T;
-                target: T;
-            }
-        }
-
-        interface Voronoi<T> {
-            (data: T[]): Array<[number, number]>;
-
-            x(): (vertex: T) => number;
-            x(x: (vertex: T) => number): Voronoi<T>;
-
-            y(): (vertex: T) => number;
-            y(y: (vertex: T) => number): Voronoi<T>;
-
-            clipExtent(): [[number, number], [number, number]];
-            clipExtent(extent: [[number, number], [number, number]]): Voronoi<T>;
-
-            links(data: T[]): voronoi.Link<T>[];
-
-            triangles(data: T[]): Array<[T, T, T]>;
-        }
-
-        /**
-         * @deprecated use d3.geom.voronoi().triangles() instead
-         */
-        export function delaunay(vertices: Array<[number, number]>): Array<[[number, number], [number, number], [number, number]]>;
-
-        export function quadtree(): Quadtree<[number, number]>;
-        export function quadtree<T>(nodes: T[], x1?: number, y1?: number, x2?: number, y2?: number): quadtree.Quadtree<T>;
-
-        namespace quadtree {
-            interface Node<T> {
-                nodes: [Node<T>, Node<T>, Node<T>, Node<T>];
-                leaf: boolean;
-                point: T;
-                x: number;
-                y: number;
-            }
-
-            interface Quadtree<T> extends Node<T> {
-                add(point: T): void;
-                visit(callback: (node: Node<T>, x1: number, y1: number, x2: number, y2: number) => boolean | void): void;
-                find(point: [number, number]): T;
-            }
-        }
-
-        interface Quadtree<T> {
-            (points: T[]): quadtree.Quadtree<T>;
-
-            x(): (datum: T, index: number) => number;
-            x(x: number): Quadtree<T>;
-            x(x: (datum: T, index: number) => number): Quadtree<T>;
-
-            y(): (datum: T, index: number) => number;
-            y(y: number): Quadtree<T>;
-            y(y: (datum: T, index: number) => number): Quadtree<T>;
-
-            extent(): [[number, number], [number, number]];
-            extent(extent: [[number, number], [number, number]]): Quadtree<T>;
-        }
-
-        export function hull(vertices: Array<[number, number]>): Array<[number, number]>;
-        export function hull(): Hull<[number, number]>;
-        export function hull<T>(): Hull<T>;
-
-        interface Hull<T> {
-            (vertices: T[]): Array<[number, number]>;
-
-            x(): (datum: T) => number;
-            x(x: (datum: T) => number): Hull<T>;
-
-            y(): (datum: T) => number;
-            y(y: (datum: T) => number): Hull<T>;
-        }
-
-        export function polygon(vertices: Array<[number, number]>): Polygon;
-
-        interface Polygon {
-            area(): number;
-
-            centroid(): [number, number];
-
-            clip(subject: Array<[number, number]>): Array<[number, number]>;
-        }
-    }
-}
-
-// we need this to exist
-interface TouchList { }
-
-declare module 'd3' {
-    export = d3;
-}
diff --git a/d3/index.d.ts b/d3/index.d.ts
new file mode 100644
index 0000000000..5af031546e
--- /dev/null
+++ b/d3/index.d.ts
@@ -0,0 +1,3357 @@
+// Type definitions for d3JS
+// Project: http://d3js.org/
+// Definitions by: Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = d3;
+export as namespace d3;
+
+declare namespace d3 {
+    /**
+     * The current version of D3.js.
+     */
+    export var version: string;
+
+    /**
+     * Find the first element that matches the given selector string.
+     */
+    export function select(selector: string): Selection<any>;
+
+    /**
+     * Create a selection from the given node reference.
+     */
+    export function select(node: EventTarget): Selection<any>;
+
+    /**
+     * Find all elements that match the given selector string.
+     */
+    export function selectAll(selector: string): Selection<any>;
+
+    /**
+     * Create a selection from the given list of nodes.
+     */
+    export function selectAll(nodes: EventTarget[]): Selection<any>;
+
+    /**
+     * Returns the root selection (as if by d3.select(document.documentElement)). This function may be used for 'instanceof' tests, and extending its prototype will add properties to all selections.
+     */
+    export function selection(): Selection<any>;
+
+    namespace selection {
+        export var prototype: Selection<any>;
+
+        /**
+         * Selections are grouped into arrays of nodes, with the parent tracked in the 'parentNode' property.
+         */
+        interface Group extends Array<EventTarget> {
+            parentNode: EventTarget;
+        }
+
+        interface Update<Datum> {
+            /**
+             * Retrieve a grouped selection.
+             */
+            [index: number]: Group;
+
+            /**
+             * The number of groups in this selection.
+             */
+            length: number;
+
+            /**
+             * Retrieve the value of the given attribute for the first node in the selection.
+             *
+             * @param name The attribute name to query. May be prefixed (see d3.ns.prefix).
+             */
+            attr(name: string): string;
+
+            /**
+             * For all nodes, set the attribute to the specified constant value. Use null to remove.
+             *
+             * @param name The attribute name, optionally prefixed.
+             * @param value The attribute value to use. Note that this is coerced to a string automatically.
+             */
+            attr(name: string, value: Primitive): Update<Datum>;
+
+            /**
+             * Derive an attribute value for each node in the selection based on bound data.
+             *
+             * @param name The attribute name, optionally prefixed.
+             * @param value The function of the datum (the bound data item), index (the position in the subgrouping), and outer index (overall position in nested selections) which computes the attribute value. If the function returns null, the attribute is removed.
+             */
+            attr(name: string, value: (datum: Datum, index: number, outerIndex: number) => Primitive): Update<Datum>;
+
+            /**
+             * Set multiple properties at once using an Object. D3 iterates over all enumerable properties and either sets or computes the attribute's value based on the corresponding entry in the Object.
+             *
+             * @param obj A key-value mapping corresponding to attributes and values. If the value is a simple string or number, it is taken as a constant. Otherwise, it is a function that derives the attribute value.
+             */
+            attr(obj: { [key: string]: Primitive | ((datum: Datum, index: number, outerIndex: number) => Primitive) }): Update<Datum>;
+
+            /**
+             * Returns true if the first node in this selection has the given class list. If multiple classes are specified (i.e., "foo bar"), then returns true only if all classes match.
+             *
+             * @param name The class list to query.
+             */
+            classed(name: string): boolean;
+
+            /**
+             * Adds (or removes) the given class list.
+             *
+             * @param name The class list to toggle. Spaces separate class names: "foo bar" is a list of two classes.
+             * @param value If true, add the classes. If false, remove them.
+             */
+            classed(name: string, value: boolean): Update<Datum>;
+
+            /**
+             * Determine if the given class list should be toggled for each node in the selection.
+             *
+             * @param name The class list. Spaces separate multiple class names.
+             * @param value The function to run for each node. Should return true to add the class to the node, or false to remove it.
+             */
+            classed(name: string, value: (datum: Datum, index: number, outerIndex: number) => boolean): Update<Datum>;
+
+            /**
+             * Set or derive classes for multiple class lists at once.
+             *
+             * @param obj An Object mapping class lists to values that are either plain booleans or functions that return booleans.
+             */
+            classed(obj: { [key: string]: boolean | ((datum: Datum, index: number, outerIndex: number) => boolean) }): Update<Datum>;
+
+            /**
+             * Retrieve the computed style value for the first node in the selection.
+             * @param name The CSS property name to query
+             */
+            style(name: string): string;
+
+            /**
+             * Set a style property for all nodes in the selection.
+             * @param name the CSS property name
+             * @param value the property value
+             * @param priority if specified, either null or the string "important" (no exclamation mark)
+             */
+            style(name: string, value: Primitive, priority?: string): Update<Datum>;
+
+            /**
+             * Derive a property value for each node in the selection.
+             * @param name the CSS property name
+             * @param value the function to derive the value
+             * @param priority if specified, either null or the string "important" (no exclamation mark)
+             */
+            style(name: string, value: (datum: Datum, index: number, outerIndex: number) => Primitive, priority?: string): Update<Datum>;
+
+            /**
+             * Set a large number of CSS properties from an object.
+             *
+             * @param obj an Object whose keys correspond to CSS property names and values are either constants or functions that derive property values
+             * @param priority if specified, either null or the string "important" (no exclamation mark)
+             */
+            style(obj: { [key: string]: Primitive | ((datum: Datum, index: number, outerIndex: number) => Primitive) }, priority?: string): Update<Datum>;
+
+            /**
+             * Retrieve an arbitrary node property such as the 'checked' property of checkboxes, or the 'value' of text boxes.
+             *
+             * @param name the node's property to retrieve
+             */
+            property(name: string): any;
+
+            /**
+             * For each node, set the property value. Internally, this sets the node property directly (e.g., node[name] = value), so take care not to mutate special properties like __proto__.
+             *
+             * @param name the property name
+             * @param value the property value
+             */
+            property(name: string, value: any): Update<Datum>;
+
+            /**
+             * For each node, derive the property value. Internally, this sets the node property directly (e.g., node[name] = value), so take care not to mutate special properties like __proto__.
+             *
+             * @param name the property name
+             * @param value the function used to derive the property's value
+             */
+            property(name: string, value: (datum: Datum, index: number, outerIndex: number) => any): Update<Datum>;
+
+            /**
+             * Set multiple node properties. Caveats apply: take care not to mutate special properties like __proto__.
+             *
+             * @param obj an Object whose keys correspond to node properties and values are either constants or functions that will compute a value.
+             */
+            property(obj: { [key: string]: any | ((datum: Datum, index: number, outerIndex: number) => any) }): Update<Datum>;
+
+            /**
+             * Retrieve the textContent of the first node in the selection.
+             */
+            text(): string;
+
+            /**
+             * Set the textContent of each node in the selection.
+             * @param value the text to use for all nodes
+             */
+            text(value: Primitive): Update<Datum>;
+
+            /**
+             * Compute the textContent of each node in the selection.
+             * @param value the function which will compute the text
+             */
+            text(value: (datum: Datum, index: number, outerIndex: number) => Primitive): Update<Datum>;
+
+            /**
+             * Retrieve the HTML content of the first node in the selection. Uses 'innerHTML' internally and will not work with SVG or other elements without a polyfill.
+             */
+            html(): string;
+
+            /**
+             * Set the HTML content of every node in the selection. Uses 'innerHTML' internally and thus will not work with SVG or other elements without a polyfill.
+             * @param value the HTML content to use.
+             */
+            html(value: string): Selection<Datum>;
+
+            /**
+             * Compute the HTML content for each node in the selection. Uses 'innerHTML' internally and thus will not work with SVG or other elements without a polyfill.
+             * @param value the function to compute HTML content
+             */
+            html(value: (datum: Datum, index: number, outerIndex: number) => string): Selection<Datum>;
+
+            /**
+             * Appends a new child to each node in the selection. This child will inherit the parent's data (if available). Returns a fresh selection consisting of the newly-appended children.
+             *
+             * @param name the element name to append. May be prefixed (see d3.ns.prefix).
+             */
+            append(name: string): Selection<Datum>;
+
+            /**
+             * Appends a new child to each node in the selection by computing a new node. This child will inherit the parent's data (if available). Returns a fresh selection consisting of the newly-appended children.
+             *
+             * @param name the function to compute a new element
+             */
+            append(name: (datum: Datum, index: number, outerIndex: number) => EventTarget): Update<Datum>;
+
+            /**
+             * Inserts a new child to each node in the selection. This child will inherit its parent's data (if available). Returns a fresh selection consisting of the newly-inserted children.
+             * @param name the element name to append. May be prefixed (see d3.ns.prefix).
+             * @param before the selector to determine position (e.g., ":first-child")
+             */
+            insert(name: string, before: string): Update<Datum>;
+
+            /**
+             * Inserts a new child to each node in the selection. This child will inherit its parent's data (if available). Returns a fresh selection consisting of the newly-inserted children.
+             * @param name the element name to append. May be prefixed (see d3.ns.prefix).
+             * @param before a function to determine the node to use as the next sibling
+             */
+            insert(name: string, before: (datum: Datum, index: number, outerIndex: number) => EventTarget): Update<Datum>;
+
+            /**
+             * Inserts a new child to the end of each node in the selection by computing a new node. This child will inherit its parent's data (if available). Returns a fresh selection consisting of the newly-inserted children.
+             * @param name the function to compute a new child
+             * @param before the selector to determine position (e.g., ":first-child")
+             */
+            insert(name: (datum: Datum, index: number, outerIndex: number) => EventTarget, before: string): Update<Datum>;
+
+            /**
+             * Inserts a new child to the end of each node in the selection by computing a new node. This child will inherit its parent's data (if available). Returns a fresh selection consisting of the newly-inserted children.
+             * @param name the function to compute a new child
+             * @param before a function to determine the node to use as the next sibling
+             */
+            insert(name: (datum: Datum, index: number, outerIndex: number) => EventTarget, before: (datum: Datum, index: number, outerIndex: number) => EventTarget): Update<Datum>;
+
+            /**
+             * Removes the elements from the DOM. They are in a detached state and may be re-added (though there is currently no dedicated API for doing so).
+             */
+            remove(): Update<Datum>;
+
+            /**
+             * Retrieves the data bound to the first group in this selection.
+             */
+            data(): Datum[];
+
+            /**
+             * Binds data to this selection.
+             * @param data the array of data to bind to this selection
+             * @param key the optional function to determine the unique key for each piece of data. When unspecified, uses the index of the element.
+             */
+            data<NewDatum>(data: NewDatum[], key?: (datum: NewDatum, index: number, outerIndex: number) => string): Update<NewDatum>;
+
+            /**
+             * Derives data to bind to this selection.
+             * @param data the function to derive data. Must return an array.
+             * @param key the optional function to determine the unique key for each data item. When unspecified, uses the index of the element.
+             */
+            data<NewDatum>(data: (datum: Datum, index: number, outerIndex: number) => NewDatum[], key?: (datum: NewDatum, index: number, outerIndex: number) => string): Update<NewDatum>;
+
+            /**
+             * Filters the selection, returning only those nodes that match the given CSS selector.
+             * @param selector the CSS selector
+             */
+            filter(selector: string): Update<Datum>;
+
+            /**
+             * Filters the selection, returning only those nodes for which the given function returned true.
+             * @param selector the filter function
+             */
+            filter(selector: (datum: Datum, index: number, outerIndex: number) => boolean): Update<Datum>;
+
+            /**
+             * Return the data item bound to the first element in the selection.
+             */
+            datum(): Datum;
+
+            /**
+             * Set the data item for each node in the selection.
+             * @param value the constant element to use for each node
+             */
+            datum<NewDatum>(value: NewDatum): Update<NewDatum>;
+
+            /**
+             * Derive the data item for each node in the selection. Useful for situations such as the HTML5 'dataset' attribute.
+             * @param value the function to compute data for each node
+             */
+            datum<NewDatum>(value: (datum: Datum, index: number, outerIndex: number) => NewDatum): Update<NewDatum>;
+
+            /**
+             * Reorders nodes in the selection based on the given comparator. Nodes are re-inserted into the document once sorted.
+             * @param comparator the comparison function, which defaults to d3.ascending
+             */
+            sort(comparator?: (a: Datum, b: Datum) => number): Update<Datum>;
+
+            /**
+             * Reorders nodes in the document to match the selection order. More efficient than calling sort() if the selection is already ordered.
+             */
+            order(): Update<Datum>;
+
+            /**
+             * Returns the listener (if any) for the given event.
+             * @param type the type of event to load the listener for. May have a namespace (e.g., ".foo") at the end.
+             */
+            on(type: string): (datum: Datum, index: number, outerIndex: number) => any;
+
+            /**
+             * Adds a listener for the specified event. If one was already registered, it is removed before the new listener is added. The return value of the listener function is ignored.
+             * @param type the of event to listen to. May have a namespace (e.g., ".foo") at the end.
+             * @param listener an event listener function, or null to unregister
+             * @param capture sets the DOM useCapture flag
+             */
+            on(type: string, listener: (datum: Datum, index: number, outerIndex: number) => any, capture?: boolean): Update<Datum>;
+
+            /**
+             * Begins a new transition. Interrupts any active transitions of the same name.
+             * @param name the transition name (defaults to "")
+             */
+            transition(name?: string): Transition<Datum>;
+
+            /**
+             * Interrupts the active transition of the provided name. Does not cancel scheduled transitions.
+             * @param name the transition name (defaults to "")
+             */
+            interrupt(name?: string): Update<Datum>;
+
+            /**
+             * Creates a subselection by finding the first descendent matching the selector string. Bound data is inherited.
+             * @param selector the CSS selector to match against
+             */
+            select(selector: string): Update<Datum>;
+
+            /**
+             * Creates a subselection by using a function to find descendent elements. Bound data is inherited.
+             * @param selector the function to find matching descendants
+             */
+            select(selector: (datum: Datum, index: number, outerIndex: number) => EventTarget): Update<Datum>;
+
+            /**
+             * Creates a subselection by finding all descendents that match the given selector. Bound data is not inherited.
+             * @param selector the CSS selector to match against
+             */
+            selectAll(selector: string): Update<Datum>;
+
+            /**
+             * Creates a subselection by using a function to find descendent elements. Bound data is not inherited.
+             * @param selector the function to find matching descendents
+             */
+            selectAll(selector: (datum: Datum, index: number, outerIndex: number) => Array<EventTarget> | NodeList): Update<any>;
+
+            /**
+             * Invoke the given function for each element in the selection. The return value of the function is ignored.
+             * @param func the function to invoke
+             */
+            each(func: (datum: Datum, index: number, outerIndex: number) => any): Update<Datum>;
+
+            /**
+             * Call a function on the selection. sel.call(foo) is equivalent to foo(sel).
+             * @param func the function to call on the selection
+             * @param args any optional args
+             */
+            call(func: (sel: Update<Datum>, ...args: any[]) => any, ...args: any[]): Update<Datum>;
+
+            /**
+             * Returns true if the current selection is empty.
+             */
+            empty(): boolean;
+
+            /**
+             * Returns the first non-null element in the selection, or null otherwise.
+             */
+            node(): Node;
+
+            /**
+             * Returns the total number of elements in the selection.
+             */
+            size(): number;
+
+            /**
+             * Returns the placeholder nodes for each data element for which no corresponding DOM element was found.
+             */
+            enter(): Enter<Datum>;
+
+            /**
+             * Returns a selection for those DOM nodes for which no new data element was found.
+             */
+            exit(): Selection<Datum>;
+        }
+
+        interface Enter<Datum> {
+            append(name: string): Selection<Datum>;
+            append(name: (datum: Datum, index: number, outerIndex: number) => EventTarget): Selection<Datum>;
+
+            insert(name: string, before?: string): Selection<Datum>;
+            insert(name: string, before: (datum: Datum, index: number, outerIndex: number) => EventTarget): Selection<Datum>;
+            insert(name: (datum: Datum, index: number, outerIndex: number) => EventTarget, before?: string): Selection<Datum>;
+            insert(name: (datum: Datum, index: number, outerIndex: number) => EventTarget, before: (datum: Datum, index: number, outerIndex: number) => EventTarget): Selection<Datum>;
+
+            select(name: (datum: Datum, index: number, outerIndex: number) => EventTarget): Selection<Datum>;
+            call(func: (selection: Enter<Datum>, ...args: any[]) => any, ...args: any[]): Enter<Datum>;
+        }
+    }
+
+    /**
+     * Administrivia: JavaScript primitive types, or "things that toString() predictably".
+     */
+    export type Primitive = number | string | boolean;
+
+    /**
+     * Administrivia: anything with a valueOf(): number method is comparable, so we allow it in numeric operations
+     */
+    interface Numeric {
+        valueOf(): number;
+    }
+
+    /**
+     * A grouped array of nodes.
+     * @param Datum the data bound to this selection.
+     */
+    interface Selection<Datum> {
+        /**
+         * Retrieve a grouped selection.
+         */
+        [index: number]: selection.Group;
+
+        /**
+         * The number of groups in this selection.
+         */
+        length: number;
+
+        /**
+         * Retrieve the value of the given attribute for the first node in the selection.
+         *
+         * @param name The attribute name to query. May be prefixed (see d3.ns.prefix).
+         */
+        attr(name: string): string;
+
+        /**
+         * For all nodes, set the attribute to the specified constant value. Use null to remove.
+         *
+         * @param name The attribute name, optionally prefixed.
+         * @param value The attribute value to use. Note that this is coerced to a string automatically.
+         */
+        attr(name: string, value: Primitive): Selection<Datum>;
+
+        /**
+         * Derive an attribute value for each node in the selection based on bound data.
+         *
+         * @param name The attribute name, optionally prefixed.
+         * @param value The function of the datum (the bound data item), index (the position in the subgrouping), and outer index (overall position in nested selections) which computes the attribute value. If the function returns null, the attribute is removed.
+         */
+        attr(name: string, value: (datum: Datum, index: number, outerIndex: number) => Primitive): Selection<Datum>;
+
+        /**
+         * Set multiple properties at once using an Object. D3 iterates over all enumerable properties and either sets or computes the attribute's value based on the corresponding entry in the Object.
+         *
+         * @param obj A key-value mapping corresponding to attributes and values. If the value is a simple string or number, it is taken as a constant. Otherwise, it is a function that derives the attribute value.
+         */
+        attr(obj: { [key: string]: Primitive | ((datum: Datum, index: number, outerIndex: number) => Primitive) }): Selection<Datum>;
+
+        /**
+         * Returns true if the first node in this selection has the given class list. If multiple classes are specified (i.e., "foo bar"), then returns true only if all classes match.
+         *
+         * @param name The class list to query.
+         */
+        classed(name: string): boolean;
+
+        /**
+         * Adds (or removes) the given class list.
+         *
+         * @param name The class list to toggle. Spaces separate class names: "foo bar" is a list of two classes.
+         * @param value If true, add the classes. If false, remove them.
+         */
+        classed(name: string, value: boolean): Selection<Datum>;
+
+        /**
+         * Determine if the given class list should be toggled for each node in the selection.
+         *
+         * @param name The class list. Spaces separate multiple class names.
+         * @param value The function to run for each node. Should return true to add the class to the node, or false to remove it.
+         */
+        classed(name: string, value: (datum: Datum, index: number, outerIndex: number) => boolean): Selection<Datum>;
+
+        /**
+         * Set or derive classes for multiple class lists at once.
+         *
+         * @param obj An Object mapping class lists to values that are either plain booleans or functions that return booleans.
+         */
+        classed(obj: { [key: string]: boolean | ((datum: Datum, index: number, outerIndex: number) => boolean) }): Selection<Datum>;
+
+        /**
+         * Retrieve the computed style value for the first node in the selection.
+         * @param name The CSS property name to query
+         */
+        style(name: string): string;
+
+        /**
+         * Set a style property for all nodes in the selection.
+         * @param name the CSS property name
+         * @param value the property value
+         * @param priority if specified, either null or the string "important" (no exclamation mark)
+         */
+        style(name: string, value: Primitive, priority?: string): Selection<Datum>;
+
+        /**
+         * Derive a property value for each node in the selection.
+         * @param name the CSS property name
+         * @param value the function to derive the value
+         * @param priority if specified, either null or the string "important" (no exclamation mark)
+         */
+        style(name: string, value: (datum: Datum, index: number, outerIndex: number) => Primitive, priority?: string): Selection<Datum>;
+
+        /**
+         * Set a large number of CSS properties from an object.
+         *
+         * @param obj an Object whose keys correspond to CSS property names and values are either constants or functions that derive property values
+         * @param priority if specified, either null or the string "important" (no exclamation mark)
+         */
+        style(obj: { [key: string]: Primitive | ((datum: Datum, index: number, outerIndex: number) => Primitive) }, priority?: string): Selection<Datum>;
+
+        /**
+         * Retrieve an arbitrary node property such as the 'checked' property of checkboxes, or the 'value' of text boxes.
+         *
+         * @param name the node's property to retrieve
+         */
+        property(name: string): any;
+
+        /**
+         * For each node, set the property value. Internally, this sets the node property directly (e.g., node[name] = value), so take care not to mutate special properties like __proto__.
+         *
+         * @param name the property name
+         * @param value the property value
+         */
+        property(name: string, value: any): Selection<Datum>;
+
+        /**
+         * For each node, derive the property value. Internally, this sets the node property directly (e.g., node[name] = value), so take care not to mutate special properties like __proto__.
+         *
+         * @param name the property name
+         * @param value the function used to derive the property's value
+         */
+        property(name: string, value: (datum: Datum, index: number, outerIndex: number) => any): Selection<Datum>;
+
+        /**
+         * Set multiple node properties. Caveats apply: take care not to mutate special properties like __proto__.
+         *
+         * @param obj an Object whose keys correspond to node properties and values are either constants or functions that will compute a value.
+         */
+        property(obj: { [key: string]: any | ((datum: Datum, index: number, innerInder: number) => any) }): Selection<Datum>;
+
+        /**
+         * Retrieve the textContent of the first node in the selection.
+         */
+        text(): string;
+
+        /**
+         * Set the textContent of each node in the selection.
+         * @param value the text to use for all nodes
+         */
+        text(value: Primitive): Selection<Datum>;
+
+        /**
+         * Compute the textContent of each node in the selection.
+         * @param value the function which will compute the text
+         */
+        text(value: (datum: Datum, index: number, outerIndex: number) => Primitive): Selection<Datum>;
+
+        /**
+         * Retrieve the HTML content of the first node in the selection. Uses 'innerHTML' internally and will not work with SVG or other elements without a polyfill.
+         */
+        html(): string;
+
+        /**
+         * Set the HTML content of every node in the selection. Uses 'innerHTML' internally and thus will not work with SVG or other elements without a polyfill.
+         * @param value the HTML content to use.
+         */
+        html(value: string): Selection<Datum>;
+
+        /**
+         * Compute the HTML content for each node in the selection. Uses 'innerHTML' internally and thus will not work with SVG or other elements without a polyfill.
+         * @param value the function to compute HTML content
+         */
+        html(value: (datum: Datum, index: number, outerIndex: number) => string): Selection<Datum>;
+
+        /**
+         * Appends a new child to each node in the selection. This child will inherit the parent's data (if available). Returns a fresh selection consisting of the newly-appended children.
+         *
+         * @param name the element name to append. May be prefixed (see d3.ns.prefix).
+         */
+        append(name: string): Selection<Datum>;
+
+        /**
+         * Appends a new child to each node in the selection by computing a new node. This child will inherit the parent's data (if available). Returns a fresh selection consisting of the newly-appended children.
+         *
+         * @param name the function to compute a new element
+         */
+        append(name: (datum: Datum, index: number, outerIndex: number) => EventTarget): Selection<Datum>;
+
+        /**
+         * Inserts a new child to each node in the selection. This child will inherit its parent's data (if available). Returns a fresh selection consisting of the newly-inserted children.
+         * @param name the element name to append. May be prefixed (see d3.ns.prefix).
+         * @param before the selector to determine position (e.g., ":first-child")
+         */
+        insert(name: string, before: string): Selection<Datum>;
+
+        /**
+         * Inserts a new child to each node in the selection. This child will inherit its parent's data (if available). Returns a fresh selection consisting of the newly-inserted children.
+         * @param name the element name to append. May be prefixed (see d3.ns.prefix).
+         * @param before a function to determine the node to use as the next sibling
+         */
+        insert(name: string, before: (datum: Datum, index: number, outerIndex: number) => EventTarget): Selection<Datum>;
+
+        /**
+         * Inserts a new child to the end of each node in the selection by computing a new node. This child will inherit its parent's data (if available). Returns a fresh selection consisting of the newly-inserted children.
+         * @param name the function to compute a new child
+         * @param before the selector to determine position (e.g., ":first-child")
+         */
+        insert(name: (datum: Datum, index: number, outerIndex: number) => EventTarget, before: string): Selection<Datum>;
+
+        /**
+         * Inserts a new child to the end of each node in the selection by computing a new node. This child will inherit its parent's data (if available). Returns a fresh selection consisting of the newly-inserted children.
+         * @param name the function to compute a new child
+         * @param before a function to determine the node to use as the next sibling
+         */
+        insert(name: (datum: Datum, index: number, outerIndex: number) => EventTarget, before: (datum: Datum, index: number, outerIndex: number) => EventTarget): Selection<Datum>;
+
+        /**
+         * Removes the elements from the DOM. They are in a detached state and may be re-added (though there is currently no dedicated API for doing so).
+         */
+        remove(): Selection<Datum>;
+
+        /**
+         * Retrieves the data bound to the first group in this selection.
+         */
+        data(): Datum[];
+
+        /**
+         * Binds data to this selection.
+         * @param data the array of data to bind to this selection
+         * @param key the optional function to determine the unique key for each piece of data. When unspecified, uses the index of the element.
+         */
+        data<NewDatum>(data: NewDatum[], key?: (datum: NewDatum, index: number, outerIndex: number) => string): selection.Update<NewDatum>;
+
+        /**
+         * Derives data to bind to this selection.
+         * @param data the function to derive data. Must return an array.
+         * @param key the optional function to determine the unique key for each data item. When unspecified, uses the index of the element.
+         */
+        data<NewDatum>(data: (datum: Datum, index: number, outerIndex: number) => NewDatum[], key?: (datum: NewDatum, index: number, outerIndex: number) => string): selection.Update<NewDatum>;
+
+        /**
+         * Filters the selection, returning only those nodes that match the given CSS selector.
+         * @param selector the CSS selector
+         */
+        filter(selector: string): Selection<Datum>;
+
+        /**
+         * Filters the selection, returning only those nodes for which the given function returned true.
+         * @param selector the filter function
+         */
+        filter(selector: (datum: Datum, index: number, outerIndex: number) => boolean): Selection<Datum>;
+
+        /**
+         * Return the data item bound to the first element in the selection.
+         */
+        datum(): Datum;
+
+        /**
+         * Derive the data item for each node in the selection. Useful for situations such as the HTML5 'dataset' attribute.
+         * @param value the function to compute data for each node
+         */
+        datum<NewDatum>(value: (datum: Datum, index: number, outerIndex: number) => NewDatum): Selection<NewDatum>;
+
+        /**
+         * Set the data item for each node in the selection.
+         * @param value the constant element to use for each node
+         */
+        datum<NewDatum>(value: NewDatum): Selection<NewDatum>;
+
+        /**
+         * Reorders nodes in the selection based on the given comparator. Nodes are re-inserted into the document once sorted.
+         * @param comparator the comparison function, which defaults to d3.ascending
+         */
+        sort(comparator?: (a: Datum, b: Datum) => number): Selection<Datum>;
+
+        /**
+         * Reorders nodes in the document to match the selection order. More efficient than calling sort() if the selection is already ordered.
+         */
+        order(): Selection<Datum>;
+
+        /**
+         * Returns the listener (if any) for the given event.
+         * @param type the type of event to load the listener for. May have a namespace (e.g., ".foo") at the end.
+         */
+        on(type: string): (datum: Datum, index: number, outerIndex: number) => any;
+
+        /**
+         * Adds a listener for the specified event. If one was already registered, it is removed before the new listener is added. The return value of the listener function is ignored.
+         * @param type the of event to listen to. May have a namespace (e.g., ".foo") at the end.
+         * @param listener an event listener function, or null to unregister
+         * @param capture sets the DOM useCapture flag
+         */
+        on(type: string, listener: (datum: Datum, index: number, outerIndex: number) => any, capture?: boolean): Selection<Datum>;
+
+        /**
+         * Begins a new transition. Interrupts any active transitions of the same name.
+         * @param name the transition name (defaults to "")
+         */
+        transition(name?: string): Transition<Datum>;
+
+        /**
+         * Interrupts the active transition of the provided name. Does not cancel scheduled transitions.
+         * @param name the transition name (defaults to "")
+         */
+        interrupt(name?: string): Selection<Datum>;
+
+        /**
+         * Creates a subselection by finding the first descendent matching the selector string. Bound data is inherited.
+         * @param selector the CSS selector to match against
+         */
+        select(selector: string): Selection<Datum>;
+
+        /**
+         * Creates a subselection by using a function to find descendent elements. Bound data is inherited.
+         * @param selector the function to find matching descendants
+         */
+        select(selector: (datum: Datum, index: number, outerIndex: number) => EventTarget): Selection<Datum>;
+
+        /**
+         * Creates a subselection by finding all descendents that match the given selector. Bound data is not inherited.
+         * @param selector the CSS selector to match against
+         */
+        selectAll(selector: string): Selection<any>;
+
+        /**
+         * Creates a subselection by finding all descendants that match the given selector. Bound data is not inherited.
+         *
+         * Use this overload when data-binding a subselection (that is, sel.selectAll('.foo').data(d => ...)). The type will carry over.
+         */
+        selectAll<T>(selector: string): Selection<T>;
+
+        /**
+         * Creates a subselection by using a function to find descendent elements. Bound data is not inherited.
+         * @param selector the function to find matching descendents
+         */
+        selectAll(selector: (datum: Datum, index: number, outerIndex: number) => Array<EventTarget> | NodeList): Selection<any>;
+
+        /**
+         * Creates a subselection by using a function to find descendent elements. Bound data is not inherited.
+         *
+         * Use this overload when data-binding a subselection (that is, sel.selectAll('.foo').data(d => ...)). The type will carry over.
+         * @param selector the function to find matching descendents
+         */
+        selectAll<T>(selector: (datum: Datum, index: number, outerIndex: number) => Array<EventTarget> | NodeList): Selection<T>;
+
+        /**
+         * Invoke the given function for each element in the selection. The return value of the function is ignored.
+         * @param func the function to invoke
+         */
+        each(func: (datum: Datum, index: number, outerIndex: number) => any): Selection<Datum>;
+
+        /**
+         * Call a function on the selection. sel.call(foo) is equivalent to foo(sel).
+         * @param func the function to call on the selection
+         * @param args any optional args
+         */
+        call(func: (sel: Selection<Datum>, ...args: any[]) => any, ...args: any[]): Selection<Datum>;
+
+        /**
+         * Returns true if the current selection is empty.
+         */
+        empty(): boolean;
+
+        /**
+         * Returns the first non-null element in the selection, or null otherwise.
+         */
+        node(): Node;
+
+        /**
+         * Returns the total number of elements in the selection.
+         */
+        size(): number;
+    }
+
+    export function transition(): Transition<any>;
+    namespace transition {
+        export var prototype: Transition<any>;
+    }
+
+    interface Transition<Datum> {
+
+        transition(): Transition<Datum>;
+
+        delay(): number;
+        delay(delay: number): Transition<Datum>;
+        delay(delay: (datum: Datum, index: number, outerIndex: number) => number): Transition<Datum>;
+
+        duration(): number;
+        duration(duration: number): Transition<Datum>;
+        duration(duration: (datum: Datum, index: number, outerIndex: number) => number): Transition<Datum>;
+
+        ease(): (t: number) => number;
+        ease(value: string, ...args: any[]): Transition<Datum>;
+        ease(value: (t: number) => number): Transition<Datum>;
+
+        attr(name: string, value: Primitive): Transition<Datum>;
+        attr(name: string, value: (datum: Datum, index: number, outerIndex: number) => Primitive): Transition<Datum>;
+        attr(obj: { [key: string]: Primitive | ((datum: Datum, index: number, outerIndex: number) => Primitive) }): Transition<Datum>;
+
+        attrTween(name: string, tween: (datum: Datum, index: number, attr: string) => (t: number) => Primitive): Transition<Datum>;
+
+        style(name: string, value: Primitive, priority?: string): Transition<Datum>;
+        style(name: string, value: (datum: Datum, index: number, outerIndex: number) => Primitive, priority?: string): Transition<Datum>;
+        style(obj: { [key: string]: Primitive | ((datum: Datum, index: number, outerIndex: number) => Primitive) }, priority?: string): Transition<Datum>;
+
+        styleTween(name: string, tween: (datum: Datum, index: number, attr: string) => (t: number) => Primitive, priority?: string): Transition<Datum>;
+
+        text(value: Primitive): Transition<Datum>;
+        text(value: (datum: Datum, index: number, outerIndex: number) => Primitive): Transition<Datum>;
+
+        tween(name: string, factory: () => (t: number) => any): Transition<Datum>;
+
+        remove(): Transition<Datum>;
+
+        select(selector: string): Transition<Datum>;
+        select(selector: (d: Datum, i: number) => EventTarget): Transition<Datum>;
+
+        selectAll(selector: string): Transition<any>;
+        selectAll(selector: (d: Datum, i: number) => EventTarget[]): Transition<any>;
+
+        filter(selector: string): Transition<Datum>;
+        filter(selector: (d: Datum, i: number) => boolean): Transition<Datum>;
+
+        each(type: string, listener: (d: Datum, i: number) => any): Transition<Datum>;
+        each(listener: (d: Datum, i: number) => any): Transition<Datum>;
+
+        call(func: (transition: Transition<Datum>, ...args: any[]) => any, ...args: any[]): Transition<Datum>;
+
+        empty(): boolean;
+        node(): Node;
+        size(): number;
+    }
+
+    export function ease(type: 'linear'): (t: number) => number;
+    export function ease(type: 'linear-in'): (t: number) => number;
+    export function ease(type: 'linear-out'): (t: number) => number;
+    export function ease(type: 'linear-in-out'): (t: number) => number;
+    export function ease(type: 'linear-out-in'): (t: number) => number;
+
+    export function ease(type: 'poly', k: number): (t: number) => number;
+    export function ease(type: 'poly-in', k: number): (t: number) => number;
+    export function ease(type: 'poly-out', k: number): (t: number) => number;
+    export function ease(type: 'poly-in-out', k: number): (t: number) => number;
+    export function ease(type: 'poly-out-in', k: number): (t: number) => number;
+
+    export function ease(type: 'quad'): (t: number) => number;
+    export function ease(type: 'quad-in'): (t: number) => number;
+    export function ease(type: 'quad-out'): (t: number) => number;
+    export function ease(type: 'quad-in-out'): (t: number) => number;
+    export function ease(type: 'quad-out-in'): (t: number) => number;
+
+    export function ease(type: 'cubic'): (t: number) => number;
+    export function ease(type: 'cubic-in'): (t: number) => number;
+    export function ease(type: 'cubic-out'): (t: number) => number;
+    export function ease(type: 'cubic-in-out'): (t: number) => number;
+    export function ease(type: 'cubic-out-in'): (t: number) => number;
+
+    export function ease(type: 'sin'): (t: number) => number;
+    export function ease(type: 'sin-in'): (t: number) => number;
+    export function ease(type: 'sin-out'): (t: number) => number;
+    export function ease(type: 'sin-in-out'): (t: number) => number;
+    export function ease(type: 'sin-out-in'): (t: number) => number;
+
+    export function ease(type: 'circle'): (t: number) => number;
+    export function ease(type: 'circle-in'): (t: number) => number;
+    export function ease(type: 'circle-out'): (t: number) => number;
+    export function ease(type: 'circle-in-out'): (t: number) => number;
+    export function ease(type: 'circle-out-in'): (t: number) => number;
+
+    export function ease(type: 'elastic', a?: number, b?: number): (t: number) => number;
+    export function ease(type: 'elastic-in', a?: number, b?: number): (t: number) => number;
+    export function ease(type: 'elastic-out', a?: number, b?: number): (t: number) => number;
+    export function ease(type: 'elastic-in-out', a?: number, b?: number): (t: number) => number;
+    export function ease(type: 'elastic-out-in', a?: number, b?: number): (t: number) => number;
+
+    export function ease(type: 'back', s: number): (t: number) => number;
+    export function ease(type: 'back-in', s: number): (t: number) => number;
+    export function ease(type: 'back-out', s: number): (t: number) => number;
+    export function ease(type: 'back-in-out', s: number): (t: number) => number;
+    export function ease(type: 'back-out-in', s: number): (t: number) => number;
+
+    export function ease(type: 'bounce'): (t: number) => number;
+    export function ease(type: 'bounce-in'): (t: number) => number;
+    export function ease(type: 'bounce-out'): (t: number) => number;
+    export function ease(type: 'bounce-in-out'): (t: number) => number;
+    export function ease(type: 'bounce-out-in'): (t: number) => number;
+
+    export function ease(type: string, ...args: any[]): (t: number) => number;
+
+    export function timer(func: () => any, delay?: number, time?: number): void;
+
+    namespace timer {
+        export function flush(): void;
+    }
+
+	 interface BaseEvent {
+		 type: string;
+		 sourceEvent?: Event;
+	 }
+
+	 /**
+	  * Define a D3-specific ZoomEvent per https://github.com/mbostock/d3/wiki/Zoom-Behavior#event
+	  */
+	 interface ZoomEvent extends BaseEvent {
+		 scale: number;
+		 translate: [number, number];
+	 }
+
+	 /**
+	  * Define a D3-specific DragEvent per https://github.com/mbostock/d3/wiki/Drag-Behavior#on
+	  */
+	 interface DragEvent extends BaseEvent {
+		 x: number;
+		 y: number;
+		 dx: number;
+		 dy: number;
+	 }
+
+    /**
+     * The current event's value. Use this variable in a handler registered with `selection.on`.
+     */
+    export var event: Event | BaseEvent;
+
+    /**
+     * Returns the x and y coordinates of the mouse relative to the provided container element, using d3.event for the mouse's position on the page.
+     * @param container the container element (e.g. an SVG <g> element)
+     */
+    export function mouse(container: EventTarget): [number, number];
+
+    /**
+     * Given a container element and a touch identifier, determine the x and y coordinates of the touch.
+     * @param container the container element (e.g., an SVG <svg> element)
+     * @param identifier the given touch identifier
+     */
+    export function touch(container: EventTarget, identifer: number): [number, number];
+
+    /**
+     * Given a container element, a list of touches, and a touch identifier, determine the x and y coordinates of the touch.
+     * @param container the container element (e.g., an SVG <svg> element)
+     * @param identifier the given touch identifier
+     */
+    export function touch(container: EventTarget, touches: TouchList, identifer: number): [number, number];
+
+    /**
+     * Given a container element and an optional list of touches, return the position of every touch relative to the container.
+     * @param container the container element
+     * @param touches an optional list of touches (defaults to d3.event.touches)
+     */
+    export function touches(container: EventTarget, touches?: TouchList): Array<[number, number]>;
+
+    // NB. this is limited to primitive values due to D3's use of the <, >, and >= operators. Results get weird for object instances.
+    /**
+     * Compares two primitive values for sorting (in ascending order).
+     */
+    export function ascending(a: Primitive, b: Primitive): number;
+
+    /**
+     * Compares two primitive values for sorting (in ascending order).
+     */
+    export function descending(a: Primitive, b: Primitive): number;
+
+    /**
+     * Return the minimum value in the array using natural order.
+     */
+    export function min(array: number[]): number;
+
+    /**
+     * Return the minimum value in the array using natural order.
+     */
+    export function min(array: string[]): string;
+
+    /**
+     * Return the minimum value in the array using natural order.
+     */
+    export function min<T extends Numeric>(array: T[]): T;
+
+    /**
+     * Return the minimum value in the array using natural order.
+     */
+    export function min<T>(array: T[], accessor: (datum: T, index: number) => number): number;
+
+    /**
+     * Return the minimum value in the array using natural order.
+     */
+    export function min<T>(array: T[], accessor: (datum: T, index: number) => string): string;
+
+    /**
+     * Return the minimum value in the array using natural order.
+     */
+    export function min<T, U extends Numeric>(array: T[], accessor: (datum: T, index: number) => U): U;
+
+    /**
+     * Return the maximum value in the array of numbers using natural order.
+     */
+    export function max(array: number[]): number;
+
+    /**
+     * Return the maximum value in the array of strings using natural order.
+     */
+    export function max(array: string[]): string;
+
+    /**
+     * Return the maximum value in the array of numbers using natural order.
+     */
+    export function max<T extends Numeric>(array: T[]): T;
+
+    /**
+     * Return the maximum value in the array using natural order and a projection function to map values to numbers.
+     */
+    export function max<T>(array: T[], accessor: (datum: T, index: number) => number): number;
+
+    /**
+     * Return the maximum value in the array using natural order and a projection function to map values to strings.
+     */
+    export function max<T>(array: T[], accessor: (datum: T, index: number) => string): string;
+
+    /**
+     * Return the maximum value in the array using natural order and a projection function to map values to easily-sorted values.
+     */
+    export function max<T, U extends Numeric>(array: T[], accessor: (datum: T, index: number) => U): U;
+
+    /**
+     * Return the min and max simultaneously.
+     */
+    export function extent(array: number[]): [number, number];
+
+    /**
+     * Return the min and max simultaneously.
+     */
+    export function extent(array: string[]): [string, string];
+
+    /**
+     * Return the min and max simultaneously.
+     */
+    export function extent<T extends Numeric>(array: T[]): [T, T];
+
+    /**
+     * Return the min and max simultaneously.
+     */
+    export function extent<T extends Numeric>(array: Array<T | Primitive>): [T | Primitive, T | Primitive];
+
+    /**
+     * Return the min and max simultaneously.
+     */
+    export function extent<T>(array: T[], accessor: (datum: T, index: number) => number): [number, number];
+
+    /**
+     * Return the min and max simultaneously.
+     */
+    export function extent<T>(array: T[], accessor: (datum: T, index: number) => string): [string, string];
+
+    /**
+     * Return the min and max simultaneously.
+     */
+    export function extent<T, U extends Numeric>(array: U[], accessor: (datum: T, index: number) => U): [U | Primitive, U | Primitive];
+
+    /**
+     * Compute the sum of an array of numbers.
+     */
+    export function sum(array: number[]): number;
+
+    /**
+     * Compute the sum of an array, using the given accessor to convert values to numbers.
+     */
+    export function sum<T>(array: T[], accessor: (datum: T, index: number) => number): number;
+
+    export function mean(array: number[]): number;
+    export function mean<T>(array: T[], accessor: (datum: T, index: number) => number): number;
+
+    export function quantile(array: number[], p: number): number;
+
+    export function variance(array: number[]): number;
+    export function variance<T>(array: T[], accessor: (datum: T, index: number) => number): number;
+
+    export function deviation(array: number[]): number;
+    export function deviation<T>(array: T[], accessor: (datum: T, index: number) => number): number;
+
+    export function bisectLeft(array: number[], x: number, lo?: number, hi?: number): number;
+    export function bisectLeft(array: string[], x: string, lo?: number, hi?: number): number;
+
+    export var bisect: typeof bisectRight;
+
+    export function bisectRight<T>(array: T[], x: T, lo?: number, hi?: number): number;
+
+    export function bisector<T, U>(accessor: (x: T) => U): {
+        left: (array: T[], x: U, lo?: number, hi?: number) => number;
+        right: (array: T[], x: U, lo?: number, hi?: number) => number;
+    }
+
+    export function bisector<T, U>(comparator: (a: T, b: U) => number): {
+        left: (array: T[], x: U, lo?: number, hi?: number) => number;
+        right: (array: T[], x: U, lo?: number, hi?: number) => number;
+    }
+
+    export function shuffle<T>(array: T[], lo?: number, hi?: number): T[];
+
+    /**
+     * Returns the enumerable property names of the specified object.
+     * @param object a JavaScript object
+     */
+    export function keys(object: Object): string[];
+
+    /**
+     * Returns an array containing the property values of the specified object.
+     */
+    export function values<T>(object: { [key: string]: T }): T[];
+    /**
+     * Returns an array containing the property values of the specified object.
+     */
+    export function values<T>(object: { [key: number]: T }): T[];
+    /**
+     * Returns an array containing the property values of the specified object.
+     */
+    export function values(object: Object): any[];
+
+    /**
+     * Returns an array of key-value pairs containing the property values of the specified object.
+     */
+    export function entries<T>(object: { [key: string]: T }): { key: string; value: T }[];
+
+    /**
+     * Returns an array of key-value pairs containing the property values of the specified object.
+     */
+    export function entries<T>(object: { [key: number]: T }): { key: string; value: T }[];
+
+    /**
+     * Returns an array of key-value pairs containing the property values of the specified object.
+     */
+    export function entries(object: Object): { key: string; value: any }[];
+
+    /**
+     * A shim for ES6 maps. The implementation uses a JavaScript object internally, and thus keys are limited to strings.
+     */
+    interface Map<T> {
+        /**
+         * Does the map contain the given key?
+         */
+        has(key: string): boolean;
+
+        /**
+         * Retrieve the value for the given key. Returns undefined if there is no value stored.
+         */
+        get(key: string): T;
+
+        /**
+         * Set the value for the given key. Returns the new value.
+         */
+        set(key: string, value: T): T;
+
+        /**
+         * Remove the value for the given key. Returns true if there was a value and false otherwise.
+         */
+        remove(key: string): boolean;
+
+        /**
+         * Returns an array of all keys in arbitrary order.
+         */
+        keys(): string[];
+
+        /**
+         * Returns an array of all values in arbitrary order.
+         */
+        values(): T[];
+
+        /**
+         * Returns an array of key-value objects in arbitrary order.
+         */
+        entries(): { key: string; value: T }[];
+
+        /**
+         * Calls the function for each key and value pair in the map. The 'this' context is the map itself.
+         */
+        forEach(func: (key: string, value: T) => any): void;
+
+        /**
+         * Is this map empty?
+         */
+        empty(): boolean;
+
+        /**
+         * Returns the number of elements stored in the map.
+         */
+        size(): number;
+    }
+
+    /**
+     * Constructs an initially empty map.
+     */
+    export function map<T>(): Map<T>;
+
+    /**
+     * Construct a new map by copying keys and values from the given one.
+     */
+    export function map<T>(object: Map<T>): Map<T>;
+
+    /**
+     * Construct a new map by copying enumerable properties and values from the given object.
+     */
+    export function map<T>(object: { [key: string]: T }): Map<T>;
+
+    /**
+     * Construct a new map by copying enumerable properties and values from the given object.
+     */
+    export function map<T>(object: { [key: number]: T }): Map<T>;
+
+    /**
+     * Construct a new map by copying elements from the array. The key function is used to identify each object.
+     */
+    export function map<T>(array: T[], key: (datum: T, index: number) => string): Map<T>;
+
+    /**
+     * Construct a new map by copying enumerable properties and values from the given object.
+     */
+    export function map(object: Object): Map<any>;
+
+    /**
+     * A shim for ES6 sets. Is only able to store strings.
+     */
+    interface Set {
+        /**
+         * Is the given string stored in this set?
+         */
+        has(value: string): boolean;
+
+        /**
+         * Add the string to this set. Returns the value.
+         */
+        add(value: string): string;
+
+        /**
+         * Remove the given value from the set. Returns true if it was stored, and false otherwise.
+         */
+        remove(value: string): boolean;
+
+        /**
+         * Returns an array of the strings stored in this set.
+         */
+        values(): string[];
+
+        /**
+         * Calls a given function for each value in the set. The return value of the function is ignored. The this context of the function is the set itself.
+         */
+        forEach(func: (value: string) => any): void;
+
+        /**
+         * Is this set empty?
+         */
+        empty(): boolean;
+
+        /**
+         * Returns the number of values stored in this set.
+         */
+        size(): number;
+    }
+
+    /**
+     * Creates an initially-empty set.
+     */
+    export function set(): Set;
+
+    /**
+     * Initializes a set from the given array of strings.
+     */
+    export function set(array: string[]): Set;
+
+    /**
+     * Merges the specified arrays into a single array.
+     */
+    export function merge<T>(arrays: T[][]): T[];
+
+    /**
+     * Generates a 0-based numeric sequence. The output range does not include 'stop'.
+     */
+    export function range(stop: number): number[];
+
+    /**
+     * Generates a numeric sequence starting from the given start and stop values. 'step' defaults to 1. The output range does not include 'stop'.
+     */
+    export function range(start: number, stop: number, step?: number): number[];
+
+    /**
+     * Given the specified array, return an array corresponding to the list of indices in 'keys'.
+     */
+    export function permute<T>(array: { [key: number]: T }, keys: number[]): T[];
+
+    /**
+     * Given the specified object, return an array corresponding to the list of property names in 'keys'.
+     */
+    export function permute<T>(object: { [key: string]: T }, keys: string[]): T[];
+
+    // TODO construct n-tuples from n input arrays
+    export function zip<T>(...arrays: T[][]): T[][];
+
+    export function transpose<T>(matrix: T[][]): T[][];
+
+    /**
+     * For each adjacent pair of elements in the specified array, returns a new array of tuples of elements i and i - 1.
+     * Returns the empty array if the input array has fewer than two elements.
+     */
+    export function pairs<T>(array: T[]): Array<[T, T]>;
+
+    interface Nest<T> {
+        key(func: (datum: T) => string): Nest<T>;
+        sortKeys(comparator: (a: string, b: string) => number): Nest<T>;
+        sortValues(comparator: (a: T, b: T) => number): Nest<T>;
+        rollup<U>(func: (values: T[]) => U): Nest<T>;
+        map(array: T[]): { [key: string]: any };
+        map(array: T[], mapType: typeof d3.map): Map<any>;
+        entries(array: T[]): { key: string; values: any }[];
+    }
+
+    export function nest<T>(): Nest<T>;
+
+    export module random {
+        export function normal(mean?: number, deviation?: number): () => number;
+        export function logNormal(mean?: number, deviation?: number): () => number;
+        export function bates(count: number): () => number;
+        export function irwinHall(count: number): () => number;
+    }
+
+    interface Transform {
+        rotate: number;
+        translate: [number, number];
+        skew: number;
+        scale: [number, number];
+        toString(): string;
+    }
+
+    export function transform(transform: string): Transform;
+
+    export function format(specifier: string): (n: number) => string;
+
+    interface FormatPrefix {
+        symbol: string;
+        scale(n: number): number;
+    }
+
+    export function formatPrefix(value: number, precision?: number): FormatPrefix;
+
+    export function round(x: number, n?: number): number;
+
+    export function requote(string: string): string;
+
+    export var rgb: {
+        new (r: number, g: number, b: number): Rgb;
+        new (color: string): Rgb;
+
+        (r: number, g: number, b: number): Rgb;
+        (color: string): Rgb;
+    };
+
+    interface Rgb extends Color {
+        r: number;
+        g: number;
+        b: number;
+
+        brighter(k?: number): Rgb;
+        darker(k?: number): Rgb;
+
+        hsl(): Hsl;
+
+        toString(): string;
+    }
+
+    export var hsl: {
+        new (h: number, s: number, l: number): Hsl;
+        new (color: string): Hsl;
+
+        (h: number, s: number, l: number): Hsl;
+        (color: string): Hsl;
+    };
+
+    interface Hsl extends Color {
+        h: number;
+        s: number;
+        l: number;
+
+        brighter(k?: number): Hsl;
+        darker(k?: number): Hsl;
+
+        rgb(): Rgb;
+
+        toString(): string;
+    }
+
+    export var hcl: {
+        new (h: number, c: number, l: number): Hcl;
+        new (color: string): Hcl;
+
+        (h: number, c: number, l: number): Hcl;
+        (color: string): Hcl;
+    };
+
+    interface Hcl extends Color {
+        h: number;
+        c: number;
+        l: number;
+
+        brighter(k?: number): Hcl;
+        darker(k?: number): Hcl;
+    }
+
+    export var lab: {
+        new (l: number, a: number, b: number): Lab;
+        new (color: string): Lab;
+
+        (l: number, a: number, b: number): Lab;
+        (color: string): Lab;
+    }
+
+    interface Lab extends Color {
+        l: number;
+        a: number;
+        b: number;
+
+        brighter(k?: number): Lab;
+        darker(k?: number): Lab;
+
+        rgb(): Rgb;
+        toString(): string;
+    }
+
+    export var color: {
+        (): Color;
+        new (): Color;
+    };
+
+    interface Color {
+        rgb(): Rgb;
+    }
+
+    export module ns {
+        interface Qualified {
+            space: string;
+            local: string;
+        }
+
+        export var prefix: { [key: string]: string };
+        export function qualify(name: string): Qualified | string;
+    }
+
+    export function functor<T extends Function>(value: T): T;
+    export function functor<T>(value: T): () => T;
+
+    export function rebind(target: {}, source: {}, ...names: string[]): any;
+
+    export function dispatch(...names: string[]): Dispatch;
+
+    interface Dispatch {
+        on(type: string): (...args: any[]) => void;
+        on(type: string, listener: (...args: any[]) => any): Dispatch;
+        [event: string]: (...args: any[]) => void;
+    }
+
+    export module scale {
+        export function identity(): Identity;
+
+        interface Identity {
+            (n: number): number;
+            invert(n: number): number;
+
+            domain(): number[];
+            domain(numbers: number[]): Identity;
+
+            range(): number[];
+            range(numbers: number[]): Identity;
+
+            ticks(count?: number): number[];
+
+            tickFormat(count?: number, format?: string): (n: number) => string;
+
+            copy(): Identity;
+        }
+
+        export function linear(): Linear<number, number>;
+        export function linear<Output>(): Linear<Output, Output>;
+        export function linear<Range, Output>(): Linear<Range, Output>;
+
+        interface Linear<Range, Output> {
+            (x: number): Output;
+            invert(y: number): number;
+
+            domain(): number[];
+            domain(numbers: number[]): Linear<Range, Output>;
+
+            range(): Range[];
+            range(values: Range[]): Linear<Range, Output>;
+
+            rangeRound(values: number[]): Linear<number, number>;
+
+            interpolate(): (a: Range, b: Range) => (t: number) => Output;
+            interpolate(factory: (a: Range, b: Range) => (t: number) => Output): Linear<Range, Output>;
+
+            clamp(): boolean;
+            clamp(clamp: boolean): Linear<Range, Output>;
+
+            nice(count?: number): Linear<Range, Output>;
+
+            ticks(count?: number): number[];
+
+            tickFormat(count?: number, format?: string): (n: number) => string;
+
+            copy(): Linear<Range, Output>;
+        }
+
+        export function sqrt(): Pow<number, number>;
+        export function sqrt<Output>(): Pow<Output, Output>;
+        export function sqrt<Range, Output>(): Pow<Range, Output>;
+
+        export function pow(): Pow<number, number>;
+        export function pow<Output>(): Pow<Output, Output>;
+        export function pow<Range, Output>(): Pow<Range, Output>;
+
+        interface Pow<Range, Output> {
+            (x: number): Output;
+
+            invert(y: number): number;
+
+            domain(): number[];
+            domain(numbers: number[]): Pow<Range, Output>;
+
+            range(): Range[];
+            range(values: Range[]): Pow<Range, Output>;
+
+            rangeRound(values: number[]): Pow<number, number>;
+
+            exponent(): number;
+            exponent(k: number): Pow<Range, Output>;
+
+            interpolate(): (a: Range, b: Range) => (t: number) => Output;
+            interpolate(factory: (a: Range, b: Range) => (t: number) => Output): Pow<Range, Output>;
+
+            clamp(): boolean;
+            clamp(clamp: boolean): Pow<Range, Output>;
+
+            nice(m?: number): Pow<Range, Output>;
+
+            ticks(count?: number): number[];
+
+            tickFormat(count?: number, format?: string): (n: number) => string;
+
+            copy(): Pow<Range, Output>;
+        }
+
+        export function log(): Log<number, number>;
+        export function log<Output>(): Log<Output, Output>;
+        export function log<Range, Output>(): Log<Range, Output>;
+
+        interface Log<Range, Output> {
+            (x: number): Output;
+
+            invert(y: number): number;
+
+            domain(): number[];
+            domain(numbers: number[]): Log<Range, Output>;
+
+            range(): Range[];
+            range(values: Range[]): Log<Range, Output>;
+
+            rangeRound(values: number[]): Log<number, number>;
+
+            base(): number;
+            base(base: number): Log<Range, Output>;
+
+            interpolate(): (a: Range, b: Range) => (t: number) => Output;
+            interpolate(factory: (a: Range, b: Range) => (t: number) => Output): Log<Range, Output>;
+
+            clamp(): boolean;
+            clamp(clamp: boolean): Log<Range, Output>;
+
+            nice(): Log<Range, Output>;
+
+            ticks(): number[];
+
+            tickFormat(count?: number, format?: string): (t: number) => string;
+
+            copy(): Log<Range, Output>;
+        }
+
+        export function quantize<T>(): Quantize<T>;
+
+        interface Quantize<T> {
+            (x: number): T;
+
+            invertExtent(y: T): [number, number];
+
+            domain(): number[];
+            domain(numbers: number[]): Quantize<T>;
+
+            range(): T[];
+            range(values: T[]): Quantize<T>;
+
+            copy(): Quantize<T>;
+        }
+
+        export function quantile<T>(): Quantile<T>;
+
+        interface Quantile<T> {
+            (x: number): T;
+
+            invertExtent(y: T): [number, number];
+
+            domain(): number[];
+            domain(numbers: number[]): Quantile<T>;
+
+            range(): T[];
+            range(values: T[]): Quantile<T>;
+
+            quantiles(): number[];
+
+            copy(): Quantile<T>;
+        }
+
+        export function threshold<Range>(): Threshold<number, Range>;
+        export function threshold<Domain, Range>(): Threshold<Domain, Range>;
+
+        interface Threshold<Domain, Range> {
+            (x: number): Range;
+
+            invertExtent(y: Range): [Domain, Domain];
+
+            domain(): Domain[];
+            domain(domain: Domain[]): Threshold<Domain, Range>;
+
+            range(): Range[];
+            range(values: Range[]): Threshold<Domain, Range>;
+
+            copy(): Threshold<Domain, Range>;
+        }
+
+        export function ordinal<Range>(): Ordinal<string, Range>;
+        export function ordinal<Domain extends { toString(): string }, Range>(): Ordinal<Domain, Range>;
+        export function category10(): Ordinal<string, string>;
+        export function category10<Domain extends { toString(): string }>(): Ordinal<Domain, string>;
+        export function category20(): Ordinal<string, string>;
+        export function category20<Domain extends { toString(): string }>(): Ordinal<Domain, string>;
+        export function category20b(): Ordinal<string, string>;
+        export function category20b<Domain extends { toString(): string }>(): Ordinal<Domain, string>;
+        export function category20c(): Ordinal<string,string>;
+        export function category20c<Domain extends { toString(): string }>(): Ordinal<Domain, string>;
+
+        interface Ordinal<Domain extends { toString(): string }, Range> {
+            (x: Domain): Range;
+
+            domain(): Domain[];
+            domain(values: Domain[]): Ordinal<Domain, Range>;
+
+            range(): Range[];
+            range(values: Range[]): Ordinal<Domain, Range>;
+
+            rangePoints(interval: [number, number], padding?: number): Ordinal<Domain, number>;
+            rangeRoundPoints(interval: [number, number], padding?: number): Ordinal<Domain, number>;
+
+            rangeBands(interval: [number, number], padding?: number, outerPadding?: number): Ordinal<Domain, number>;
+            rangeRoundBands(interval: [number, number], padding?: number, outerPadding?: number): Ordinal<Domain, number>;
+
+            rangeBand(): number;
+            rangeExtent(): [number, number];
+
+            copy(): Ordinal<Domain, Range>;
+        }
+    }
+
+    export function interpolate(a: number, b: number): (t: number) => number;
+    export function interpolate(a: string, b: string): (t: number) => string;
+    export function interpolate(a: string | Color, b: Color): (t: number) => string;
+    export function interpolate(a: Array<string | Color>, b: Color[]): (t: number) => string;
+    export function interpolate<Range, Output>(a: Range[], b: Output[]): (t: number) => Output[];
+    export function interpolate<Range, Output>(a: Range[], b: Range[]): (t: number) => Output[];
+    export function interpolate(a: { [key: string]: string | Color }, b: { [key: string]: Color }): (t: number) => { [key: string]: string };
+    export function interpolate<Range, Output>(a: { [key: string]: Range }, b: { [key: string]: Output }): (t: number) => { [key: string]: Output };
+    export function interpolate<Range, Output>(a: { [key: string]: Range }, b: { [key: string]: Range }): (t: number) => { [key: string]: Output };
+
+    export function interpolateNumber(a: number, b: number): (t: number) => number;
+
+    export function interpolateRound(a: number, b: number): (t: number) => number;
+
+    export function interpolateString(a: string, b: string): (t: number) => string;
+
+    export function interpolateRgb(a: string | Color, b: string | Color): (t: number) => string;
+
+    export function interpolateHsl(a: string | Color, b: string | Color): (t: number) => string;
+
+    export function interpolateLab(a: string | Color, b: string | Color): (t: number) => string;
+
+    export function interpolateHcl(a: string | Color, b: string | Color): (t: number) => string;
+
+    export function interpolateArray(a: Array<string | Color>, b: Color[]): (t: number) => string[];
+    export function interpolateArray<Range, Output>(a: Range[], b: Range[]): (t: number) => Output[];
+    export function interpolateArray<Range, Output>(a: Range[], b: Output[]): (t: number) => Output[];
+
+    export function interpolateObject(a: { [key: string]: string | Color }, b: { [key: string]: Color }): (t: number) => { [key: string]: string };
+    export function interpolateObject<Range, Output>(a: { [key: string]: Range }, b: { [key: string]: Output }): (t: number) => { [key: string]: Output };
+    export function interpolateObject<Range, Output>(a: { [key: string]: Range }, b: { [key: string]: Range }): (t: number) => { [key: string]: Output };
+
+    export function interpolateTransform(a: string | Transform, b: string | Transform): (t: number) => string;
+
+    export function interpolateZoom(a: [number, number, number], b: [number, number, number]): {
+        (t: number): [number, number, number];
+        duration: number;
+    };
+
+    export var interpolators: Array<(a: any, b: any) => (t: number) => any>;
+
+    export module time {
+        export var second: Interval;
+        export var minute: Interval;
+        export var hour: Interval;
+        export var day: Interval;
+        export var week: Interval;
+        export var sunday: Interval;
+        export var monday: Interval;
+        export var tuesday: Interval;
+        export var wednesday: Interval;
+        export var thursday: Interval;
+        export var friday: Interval;
+        export var saturday: Interval;
+        export var month: Interval;
+        export var year: Interval;
+
+        interface Interval {
+            (d: Date): Date;
+
+            floor(d: Date): Date;
+
+            round(d: Date): Date;
+
+            ceil(d: Date): Date;
+
+            range(start: Date, stop: Date, step?: number): Date[];
+
+            offset(date: Date, step: number): Date;
+
+            utc: {
+                (d: Date): Date;
+
+                floor(d: Date): Date;
+
+                round(d: Date): Date;
+
+                ceil(d: Date): Date;
+
+                range(start: Date, stop: Date, step?: number): Date[];
+
+                offset(date: Date, step: number): Date;
+            }
+        }
+
+        export function seconds(start: Date, stop: Date, step?: number): Date[];
+        export function minutes(start: Date, stop: Date, step?: number): Date[];
+        export function hours(start: Date, stop: Date, step?: number): Date[];
+        export function days(start: Date, stop: Date, step?: number): Date[];
+        export function weeks(start: Date, stop: Date, step?: number): Date[];
+        export function sundays(start: Date, stop: Date, step?: number): Date[];
+        export function mondays(start: Date, stop: Date, step?: number): Date[];
+        export function tuesdays(start: Date, stop: Date, step?: number): Date[];
+        export function wednesdays(start: Date, stop: Date, step?: number): Date[];
+        export function thursdays(start: Date, stop: Date, step?: number): Date[];
+        export function fridays(start: Date, stop: Date, step?: number): Date[];
+        export function saturdays(start: Date, stop: Date, step?: number): Date[];
+        export function months(start: Date, stop: Date, step?: number): Date[];
+        export function years(start: Date, stop: Date, step?: number): Date[];
+
+        export function dayOfYear(d: Date): number;
+        export function weekOfYear(d: Date): number;
+        export function sundayOfYear(d: Date): number;
+        export function mondayOfYear(d: Date): number;
+        export function tuesdayOfYear(d: Date): number;
+        export function wednesdayOfYear(d: Date): number;
+        export function fridayOfYear(d: Date): number;
+        export function saturdayOfYear(d: Date): number;
+
+        export function format(specifier: string): Format;
+
+        export module format {
+            export function multi(formats: Array<[string, (d: Date) => boolean|number]>): Format;
+            export function utc(specifier: string): Format;
+            namespace utc {
+                export function multi(formats: Array<[string, (d: Date) => boolean|number]>): Format;
+            }
+
+            export var iso: Format;
+        }
+
+        interface Format {
+            (d: Date): string;
+            parse(input: string): Date;
+        }
+
+        export function scale(): Scale<number, number>;
+        export function scale<Output>(): Scale<Output, Output>;
+        export function scale<Range, Output>(): Scale<Range, Output>;
+
+        export module scale {
+            export function utc(): Scale<number, number>;
+            export function utc<Output>(): Scale<Output, Output>;
+            export function utc<Range, Output>(): Scale<Range, Output>;
+        }
+
+
+        interface Scale<Range, Output> {
+            (x: Date): Output;
+
+            invert(y: number): Date;
+
+            domain(): Date[];
+            domain(dates: number[]): Scale<Range, Output>;
+            domain(dates: Date[]): Scale<Range, Output>;
+
+            nice(): Scale<Range, Output>;
+            nice(interval: Interval, step?: number): Scale<Range, Output>;
+
+            range(): Range[];
+            range(values: Range[]): Scale<Range, Output>;
+
+            rangeRound(values: number[]): Scale<number, number>;
+
+            interpolate(): (a: Range, b: Range) => (t: number) => Output;
+            interpolate(factory: (a: Range, b: Range) => (t: number) => Output): Scale<Range, Output>;
+
+            clamp(): boolean;
+            clamp(clamp: boolean): Scale<Range, Output>;
+
+            ticks(): Date[];
+            ticks(interval: Interval, step?: number): Date[];
+            ticks(count: number): Date[];
+
+            tickFormat(count: number): (d: Date) => string;
+
+            copy(): Scale<Range, Output>;
+        }
+    }
+
+    export module behavior {
+        export function drag<Datum>(): Drag<Datum>;
+
+        interface Drag<Datum> {
+            (selection: Selection<Datum>): void;
+
+            on(type: string): (d: Datum, i: number) => any;
+            on(type: string, listener: (d: Datum, i: number) => any): Drag<Datum>;
+
+            origin(): (d: Datum, i: number) => { x: number; y: number };
+            origin(accessor: (d: Datum, i: number) => { x: number; y: number }): Drag<Datum>;
+        }
+
+        export function zoom<Datum>(): Zoom<Datum>;
+
+        namespace zoom {
+            interface Scale {
+                domain(): number[];
+                domain(values: number[]): Scale;
+
+                invert(y: number): number;
+
+                range(values: number[]): Scale;
+                range(): number[];
+            }
+        }
+
+        interface Zoom<Datum> {
+            (selection: Selection<Datum>): void;
+
+            translate(): [number, number];
+            translate(translate: [number, number]): Zoom<Datum>;
+
+            scale(): number;
+            scale(scale: number): Zoom<Datum>;
+
+            scaleExtent(): [number, number];
+            scaleExtent(extent: [number, number]): Zoom<Datum>;
+
+            center(): [number, number];
+            center(center: [number, number]): Zoom<Datum>;
+
+            size(): [number, number];
+            size(size: [number, number]): Zoom<Datum>;
+
+            x(): zoom.Scale;
+            x(x: zoom.Scale): Zoom<Datum>;
+
+            y(): zoom.Scale;
+            y(y: zoom.Scale): Zoom<Datum>;
+
+            on(type: string): (d: Datum, i: number) => any;
+            on(type: string, listener: (d: Datum, i: number) => any): Zoom<Datum>;
+
+            event(selection: Selection<Datum>): void;
+            event(transition: Transition<Datum>): void;
+        }
+    }
+
+    export module geo {
+        export function path(): Path;
+
+        interface Path {
+            (feature: any, index?: number): string;
+
+            area(feature: any): number;
+
+            centroid(feature: any): [number, number];
+
+            bounds(feature: any): [[number, number], [number, number]];
+
+            projection(): Transform | ((coordinates: [number, number]) => [number, number]);
+            projection(stream: Transform): Path;
+            projection(projection: (coordinates: [number, number]) => [number, number]): Path;
+
+            pointRadius(): number | ((datum: any, index: number) => number);
+            pointRadius(radius: number): Path;
+            pointRadius(radius: (datum: any, index: number) => number): Path;
+
+            context(): CanvasRenderingContext2D;
+            context(context: CanvasRenderingContext2D): Path;
+        }
+
+        export function graticule(): Graticule;
+
+        interface Graticule {
+            (): any;
+
+            lines(): any[];
+
+            outline(): any;
+
+            extent(): [[number, number], [number, number]];
+            extent(extent: [[number, number], [number, number]]): Graticule;
+
+            majorExtent(): [[number, number], [number, number]];
+            majorExtent(extent: [[number, number], [number, number]]): Graticule;
+
+            minorExtent(): [[number, number], [number, number]];
+            minorExtent(extent: [[number, number], [number, number]]): Graticule;
+
+            step(): [number, number];
+            step(step: [number, number]): Graticule;
+
+            majorStep(): [number, number];
+            majorStep(step: [number, number]): Graticule;
+
+            minorStep(): [number, number];
+            minorStep(step: [number, number]): Graticule;
+
+            precision(): number;
+            precision(precision: number): Graticule;
+        }
+
+        export function circle(): Circle;
+
+        interface Circle {
+            (...args: any[]): any;
+
+            origin(): [number, number] | ((...args: any[]) => [number, number]);
+            origin(origin: [number, number]): Circle;
+            origin(origin: (...args: any[]) => [number, number]): Circle;
+
+            angle(): number;
+            angle(angle: number): Circle;
+
+            precision(): number;
+            precision(precision: number): Circle;
+        }
+
+        export function area(feature: any): number;
+        export function centroid(feature: any): [number, number];
+        export function bounds(feature: any): [[number, number], [number, number]];
+        export function distance(a: [number, number], b: [number, number]): number;
+        export function length(feature: any): number;
+        export function interpolate(a: [number, number], b: [number, number]): (t: number) => [number, number];
+
+        export function rotation(rotate: [number, number] | [number, number, number]): Rotation;
+
+        interface Rotation {
+            (location: [number, number]): [number, number];
+            invert(location: [number, number]): [number, number];
+        }
+
+        export function stream(object: any, listener: Listener): void;
+
+        interface Listener {
+            point(x: number, y: number, z: number): void;
+            lineStart(): void;
+            lineEnd(): void;
+            polygonStart(): void;
+            polygonEnd(): void;
+            sphere(): void;
+        }
+
+        export function transform(methods: TransformMethods): Transform;
+
+        interface TransformMethods {
+            point?(x: number, y: number, z: number): void;
+            lineStart?(): void;
+            lineEnd?(): void;
+            polygonStart?(): void;
+            polygonEnd?(): void;
+            sphere?(): void;
+        }
+
+        interface Transform {
+            stream(stream: Listener): Listener;
+        }
+
+        export function clipExtent(): ClipExtent;
+
+        interface ClipExtent extends Transform {
+            extent(): [[number, number], [number, number]];
+            extent(extent: [[number, number], [number, number]]): ClipExtent;
+        }
+
+        export function projection(raw: RawInvertibleProjection): InvertibleProjection;
+        export function projection(raw: RawProjection): Projection;
+
+        export function projectionMutator(factory: (...args: any[]) => RawInvertibleProjection): (...args: any[]) => InvertibleProjection;
+        export function projectionMutator(factory: (...args: any[]) => RawProjection): (...args: any[]) => Projection;
+
+        export function albers(): ConicProjection;
+        export function albersUsa(): ConicProjection;
+        export function azimuthalEqualArea(): InvertibleProjection;
+        namespace azimuthalEqualArea {
+            export function raw(lambda: number, phi: number): [number, number];
+            namespace raw {
+                export function invert(x: number, y: number): [number, number];
+            }
+        }
+
+        export function azimuthalEquidistant(): InvertibleProjection;
+        namespace azimuthalEquidistant {
+            export function raw(lambda: number, phi: number): [number, number];
+            namespace raw {
+                export function invert(x: number, y: number): [number, number];
+            }
+        }
+
+        export function conicConformal(): ConicProjection;
+        namespace conicConformal {
+            export function raw(phi0: number, phi1: number): RawInvertibleProjection;
+        }
+
+        export function conicEqualArea(): ConicProjection;
+        namespace conicEqualArea {
+            export function raw(phi0: number, phi1: number): RawInvertibleProjection;
+        }
+
+        export function conicEquidistant(): ConicProjection;
+        namespace conicEquidistant {
+            export function raw(phi0: number, phi1: number): RawInvertibleProjection;
+        }
+
+        export function equirectangular(): InvertibleProjection;
+        namespace equirectangular {
+            export function raw(lambda: number, phi: number): [number, number];
+            namespace raw {
+                export function invert(x: number, y: number): [number, number];
+            }
+        }
+
+        export function gnomonic(): InvertibleProjection;
+        namespace gnomonic {
+            export function raw(lambda: number, phi: number): [number, number];
+            namespace raw {
+                export function invert(x: number, y: number): [number, number];
+            }
+        }
+
+        export function mercator(): InvertibleProjection;
+        namespace mercator {
+            export function raw(lambda: number, phi: number): [number, number];
+            namespace raw {
+                export function invert(x: number, y: number): [number, number];
+            }
+        }
+
+        export function orthographic(): InvertibleProjection;
+        namespace orthographic {
+            export function raw(lambda: number, phi: number): [number, number];
+            namespace raw {
+                export function invert(x: number, y: number): [number, number];
+            }
+        }
+
+        export function stereographic(): InvertibleProjection;
+        namespace stereographic {
+            export function raw(lambda: number, phi: number): [number, number];
+            namespace raw {
+                export function invert(x: number, y: number): [number, number];
+            }
+        }
+
+        export function transverseMercator(): InvertibleProjection;
+        namespace transverseMercator {
+            export function raw(lambda: number, phi: number): [number, number];
+            namespace raw {
+                export function invert(x: number, y: number): [number, number];
+            }
+        }
+
+        interface Projection {
+            (location: [number, number]): [number, number];
+
+            rotate(): [number, number, number];
+            rotate(rotation: [number, number, number]): Projection;
+
+            center(): [number, number];
+            center(location: [number, number]): Projection;
+
+            translate(): [number, number];
+            translate(point: [number, number]): Projection;
+
+            scale(): number;
+            scale(scale: number): Projection;
+
+            clipAngle(): number;
+            clipAngle(angle: number): Projection;
+
+            clipExtent(): [[number, number], [number, number]];
+            clipExtent(extent: [[number, number], [number, number]]): Projection;
+
+            precision(): number;
+            precision(precision: number): Projection;
+
+            stream(listener: Listener): Listener;
+        }
+
+        interface InvertibleProjection extends Projection {
+            invert(point: [number, number]): [number, number];
+        }
+
+        interface ConicProjection extends InvertibleProjection {
+            parallels(): [number, number];
+            parallels(parallels: [number, number]): ConicProjection;
+
+            rotate(): [number, number, number];
+            rotate(rotation: [number, number, number]): ConicProjection;
+
+            center(): [number, number];
+            center(location: [number, number]): ConicProjection;
+
+            translate(): [number, number];
+            translate(point: [number, number]): ConicProjection;
+
+            scale(): number;
+            scale(scale: number): ConicProjection;
+
+            clipAngle(): number;
+            clipAngle(angle: number): ConicProjection;
+
+            clipExtent(): [[number, number], [number, number]];
+            clipExtent(extent: [[number, number], [number, number]]): ConicProjection;
+
+            precision(): number;
+            precision(precision: number): ConicProjection;
+        }
+
+        interface RawProjection {
+            (lambda: number, phi: number): [number, number];
+        }
+
+        interface RawInvertibleProjection extends RawProjection {
+            invert(x: number, y: number): [number, number];
+        }
+    }
+
+    namespace svg {
+        export function line(): Line<[number, number]>;
+        export function line<T>(): Line<T>;
+
+        interface Line<T> {
+            (data: T[]): string;
+
+            x(): number | ((d: T, i: number) => number);
+            x(x: number): Line<T>;
+            x(x: (d: T, i: number) => number): Line<T>;
+
+            y(): number | ((d: T, i: number) => number);
+            y(x: number): Line<T>;
+            y(y: (d: T, i: number) => number): Line<T>;
+
+            interpolate(): string | ((points: Array<[number, number]>) => string);
+            interpolate(interpolate: "linear"): Line<T>;
+            interpolate(interpolate: "linear-closed"): Line<T>;
+            interpolate(interpolate: "step"): Line<T>;
+            interpolate(interpolate: "step-before"): Line<T>;
+            interpolate(interpolate: "step-after"): Line<T>;
+            interpolate(interpolate: "basis"): Line<T>;
+            interpolate(interpolate: "basis-open"): Line<T>;
+            interpolate(interpolate: "basis-closed"): Line<T>;
+            interpolate(interpolate: "bundle"): Line<T>;
+            interpolate(interpolate: "cardinal"): Line<T>;
+            interpolate(interpolate: "cardinal-open"): Line<T>;
+            interpolate(interpolate: "cardinal-closed"): Line<T>;
+            interpolate(interpolate: "monotone"): Line<T>;
+            interpolate(interpolate: string | ((points: Array<[number, number]>) => string)): Line<T>;
+
+            tension(): number;
+            tension(tension: number): Line<T>;
+
+            defined(): (d: T, i: number) => boolean;
+            defined(defined: (d: T, i: number) => boolean): Line<T>;
+        }
+
+        namespace line {
+            export function radial(): Radial<[number, number]>;
+            export function radial<T>(): Radial<T>;
+
+            interface Radial<T> {
+                (data: T[]): string;
+
+                radius(): number | ((d: T, i: number) => number);
+                radius(radius: number): Radial<T>;
+                radius(radius: (d: T, i: number) => number): Radial<T>;
+
+                angle(): number | ((d: T, i: number) => number);
+                angle(angle: number): Radial<T>;
+                angle(angle: (d: T, i: number) => number): Radial<T>;
+
+                interpolate(): string | ((points: Array<[number, number]>) => string);
+                interpolate(interpolate: "linear"): Radial<T>;
+                interpolate(interpolate: "linear-closed"): Radial<T>;
+                interpolate(interpolate: "step"): Radial<T>;
+                interpolate(interpolate: "step-before"): Radial<T>;
+                interpolate(interpolate: "step-after"): Radial<T>;
+                interpolate(interpolate: "basis"): Radial<T>;
+                interpolate(interpolate: "basis-open"): Radial<T>;
+                interpolate(interpolate: "basis-closed"): Radial<T>;
+                interpolate(interpolate: "bundle"): Radial<T>;
+                interpolate(interpolate: "cardinal"): Radial<T>;
+                interpolate(interpolate: "cardinal-open"): Radial<T>;
+                interpolate(interpolate: "cardinal-closed"): Radial<T>;
+                interpolate(interpolate: "monotone"): Radial<T>;
+                interpolate(interpolate: string | ((points: Array<[number, number]>) => string)): Radial<T>;
+
+                tension(): number;
+                tension(tension: number): Radial<T>;
+
+                defined(): (d: T, i: number) => boolean;
+                defined(defined: (d: T, i: number) => boolean): Radial<T>;
+            }
+        }
+
+        export function area(): Area<[number, number]>;
+        export function area<T>(): Area<T>;
+
+        interface Area<T> {
+            (data: T[]): string;
+
+            x(): number | ((d: T, i: number) => number);
+            x(x: number): Area<T>;
+            x(x: (d: T, i: number) => number): Area<T>;
+
+            x0(): number | ((d: T, i: number) => number);
+            x0(x0: number): Area<T>;
+            x0(x0: (d: T, i: number) => number): Area<T>;
+
+            x1(): number | ((d: T, i: number) => number);
+            x1(x1: number): Area<T>;
+            x1(x1: (d: T, i: number) => number): Area<T>;
+
+            y(): number | ((d: T, i: number) => number);
+            y(y: number): Area<T>;
+            y(y: (d: T, i: number) => number): Area<T>;
+
+            y0(): number | ((d: T, i: number) => number);
+            y0(y0: number): Area<T>;
+            y0(y0: (d: T, i: number) => number): Area<T>;
+
+            y1(): number | ((d: T, i: number) => number);
+            y1(y1: number): Area<T>;
+            y1(y1: (d: T, i: number) => number): Area<T>;
+
+            interpolate(): string | ((points: Array<[number, number]>) => string);
+            interpolate(interpolate: "linear"): Area<T>;
+            interpolate(interpolate: "step"): Area<T>;
+            interpolate(interpolate: "step-before"): Area<T>;
+            interpolate(interpolate: "step-after"): Area<T>;
+            interpolate(interpolate: "basis"): Area<T>;
+            interpolate(interpolate: "basis-open"): Area<T>;
+            interpolate(interpolate: "cardinal"): Area<T>;
+            interpolate(interpolate: "cardinal-open"): Area<T>;
+            interpolate(interpolate: "monotone"): Area<T>;
+            interpolate(interpolate: string | ((points: Array<[number, number]>) => string)): Area<T>;
+
+            tension(): number;
+            tension(tension: number): Area<T>;
+
+            defined(): (d: T, i: number) => boolean;
+            defined(defined: (d: T, i: number) => boolean): Area<T>;
+        }
+
+        namespace area {
+            export function radial(): Radial<[number, number]>;
+            export function radial<T>(): Radial<T>;
+
+            interface Radial<T> {
+                (data: T[]): string;
+
+                radius(): number | ((d: T, i: number) => number);
+                radius(radius: number): Radial<T>;
+                radius(radius: (d: T, i: number) => number): Radial<T>;
+
+                innerRadius(): number | ((d: T, i: number) => number);
+                innerRadius(innerRadius: number): Radial<T>;
+                innerRadius(innerRadius: (d: T, i: number) => number): Radial<T>;
+
+                outerRadius(): number | ((d: T, i: number) => number);
+                outerRadius(outerRadius: number): Radial<T>;
+                outerRadius(outerRadius: (d: T, i: number) => number): Radial<T>;
+
+                angle(): number | ((d: T, i: number) => number);
+                angle(angle: number): Radial<T>;
+                angle(angle: (d: T, i: number) => number): Radial<T>;
+
+                startAngle(): number | ((d: T, i: number) => number);
+                startAngle(startAngle: number): Radial<T>;
+                startAngle(startAngle: (d: T, i: number) => number): Radial<T>;
+
+                endAngle(): number | ((d: T, i: number) => number);
+                endAngle(endAngle: number): Radial<T>;
+                endAngle(endAngle: (d: T, i: number) => number): Radial<T>;
+
+                interpolate(): string | ((points: Array<[number, number]>) => string);
+                interpolate(interpolate: "linear"): Radial<T>;
+                interpolate(interpolate: "step"): Radial<T>;
+                interpolate(interpolate: "step-before"): Radial<T>;
+                interpolate(interpolate: "step-after"): Radial<T>;
+                interpolate(interpolate: "basis"): Radial<T>;
+                interpolate(interpolate: "basis-open"): Radial<T>;
+                interpolate(interpolate: "cardinal"): Radial<T>;
+                interpolate(interpolate: "cardinal-open"): Radial<T>;
+                interpolate(interpolate: "monotone"): Radial<T>;
+                interpolate(interpolate: string | ((points: Array<[number, number]>) => string)): Radial<T>;
+
+                tension(): number;
+                tension(tension: number): Radial<T>;
+
+                defined(): (d: T, i: number) => boolean;
+                defined(defined: (d: T, i: number) => boolean): Radial<T>;
+            }
+        }
+
+        export function arc(): Arc<arc.Arc>;
+        export function arc<T>(): Arc<T>;
+
+        namespace arc {
+            interface Arc {
+                innerRadius: number;
+                outerRadius: number;
+                startAngle: number;
+                endAngle: number;
+                padAngle: number
+            }
+        }
+
+        interface Arc<T> {
+            (d: T, i?: number): string;
+
+            innerRadius(): (d: T, i: number) => number;
+            innerRadius(radius: number): Arc<T>;
+            innerRadius(radius: (d: T, i: number) => number): Arc<T>;
+
+            outerRadius(): (d: T, i: number) => number;
+            outerRadius(radius: number): Arc<T>;
+            outerRadius(radius: (d: T, i: number) => number): Arc<T>;
+
+            cornerRadius(): (d: T, i: number) => number;
+            cornerRadius(radius: number): Arc<T>;
+            cornerRadius(radius: (d: T, i: number) => number): Arc<T>;
+
+            padRadius(): string | ((d: T, i: number) => number);
+            padRadius(radius: "auto"): Arc<T>;
+            padRadius(radius: string): Arc<T>;
+            padRadius(radius: (d: T, i: number) => number): Arc<T>;
+
+            startAngle(): (d: T, i: number) => number;
+            startAngle(angle: number): Arc<T>;
+            startAngle(angle: (d: T, i: number) => number): Arc<T>;
+
+            endAngle(): (d: T, i: number) => number;
+            endAngle(angle: number): Arc<T>;
+            endAngle(angle: (d: T, i: number) => number): Arc<T>;
+
+            padAngle(): (d: T, i: number) => number;
+            padAngle(angle: number): Arc<T>;
+            padAngle(angle: (d: T, i: number) => number): Arc<T>;
+
+            centroid(d: T, i?: number): [number, number];
+        }
+
+        export function symbol(): Symbol<{}>;
+        export function symbol<T>(): Symbol<T>;
+
+        interface Symbol<T> {
+            (d: T, i?: number): string;
+
+            type(): (d: T, i: number) => string;
+            type(type: string): Symbol<T>;
+            type(type: (d: T, i: number) => string): Symbol<T>;
+
+            size(): (d: T, i: string) => number;
+            size(size: number): Symbol<T>;
+            size(size: (d: T, i: number) => number): Symbol<T>;
+        }
+
+        export var symbolTypes: string[];
+
+        export function chord(): Chord<chord.Link<chord.Node>, chord.Node>;
+        export function chord<Node>(): Chord<chord.Link<Node>, Node>;
+        export function chord<Link, Node>(): Chord<Link, Node>;
+
+        namespace chord {
+            interface Link<Node> {
+                source: Node;
+                target: Node;
+            }
+
+            interface Node {
+                radius: number;
+                startAngle: number;
+                endAngle: number
+            }
+        }
+
+        interface Chord<Link, Node> {
+            (d: Link, i: number): string;
+
+            source(): (d: Link, i: number) => Node;
+            source(source: Node): Chord<Link, Node>;
+            source(source: (d: Link, i: number) => Node): Chord<Link, Node>;
+
+            target(): (d: Link, i: number) => Node;
+            target(target: Node): Chord<Link, Node>;
+            target(target: (d: Link, i: number) => Node): Chord<Link, Node>;
+
+            radius(): (d: Node, i: number) => number;
+            radius(radius: number): Chord<Link, Node>;
+            radius(radius: (d: Node, i: number) => number): Chord<Link, Node>;
+
+            startAngle(): (d: Node, i: number) => number;
+            startAngle(angle: number): Chord<Link, Node>;
+            startAngle(angle: (d: Node, i: number) => number): Chord<Link, Node>;
+
+            endAngle(): (d: Node, i: number) => number;
+            endAngle(angle: number): Chord<Link, Node>;
+            endAngle(angle: (d: Node, i: number) => number): Chord<Link, Node>;
+        }
+
+        export function diagonal(): Diagonal<diagonal.Link<diagonal.Node>, diagonal.Node>;
+        export function diagonal<Node>(): Diagonal<diagonal.Link<Node>, Node>;
+        export function diagonal<Link, Node>(): Diagonal<Link, Node>;
+
+        namespace diagonal {
+            interface Link<Node> {
+                source: Node;
+                target: Node;
+            }
+
+            interface Node {
+                x: number;
+                y: number;
+            }
+        }
+
+        interface Diagonal<Link, Node> {
+            (d: Link, i?: number): string;
+
+            source(): (d: Link, i: number) => Node;
+            source(source: Node): Diagonal<Link, Node>;
+            source(source: (d: Link, i: number) => { x: number; y: number; }): Diagonal<Link, Node>;
+
+            target(): (d: Link, i: number) => Node;
+            target(target: Node): Diagonal<Link, Node>;
+            target(target: (d: Link, i: number) => { x: number; y: number; }): Diagonal<Link, Node>;
+
+            projection(): (d: Node, i: number) => [number, number];
+            projection(projection: (d: Node, i: number) => [number, number]): Diagonal<Link, Node>;
+        }
+
+        namespace diagonal {
+            export function radial(): Radial<Link<Node>, Node>;
+            export function radial<Node>(): Radial<Link<Node>, Node>;
+            export function radial<Link, Node>(): Radial<Link, Node>;
+
+            interface Radial<Link, Node> {
+                (d: Link, i: number): string;
+
+                source(): (d: Link, i: number) => Node;
+                source(source: Node): Radial<Link, Node>;
+                source(source: (d: Link, i: number) => Node): Radial<Link, Node>;
+
+                target(): (d: Link, i: number) => Node;
+                target(target: Node): Radial<Link, Node>;
+                target(target: (d: Link, i: number) => Node): Radial<Link, Node>;
+
+                projection(): (d: Node, i: number) => [number, number];
+                projection(projection: (d: Node, i: number) => [number, number]): Radial<Link, Node>;
+            }
+        }
+
+        export function axis(): Axis;
+
+        interface Axis {
+            (selection: Selection<any>): void;
+            (selection: Transition<any>): void;
+
+            scale(): any;
+            scale(scale: any): Axis;
+
+            orient(): string;
+            orient(orientation: string): Axis;
+
+            ticks(): any[];
+            ticks(...args: any[]): Axis;
+
+            tickValues(): any[];
+            tickValues(values: any[]): Axis;
+
+            tickSize(): number;
+            tickSize(size: number): Axis;
+            tickSize(inner: number, outer: number): Axis;
+
+            innerTickSize(): number;
+            innerTickSize(size: number): Axis;
+
+            outerTickSize(): number;
+            outerTickSize(size: number): Axis;
+
+            tickPadding(): number;
+            tickPadding(padding: number): Axis;
+
+            tickFormat(): (t: any) => string;
+            tickFormat(format: (t: any) => string): Axis;
+            tickFormat(format:string): Axis;
+        }
+
+        export function brush(): Brush<any>;
+        export function brush<T>(): Brush<T>;
+
+        namespace brush {
+            interface Scale {
+                domain(): number[];
+                domain(domain: number[]): Scale;
+
+                range(): number[];
+                range(range: number[]): Scale;
+
+                invert?(y: number): number;
+            }
+        }
+
+        interface Brush<T> {
+            (selection: Selection<T>): void;
+            (selection: Transition<T>): void;
+
+            event(selection: Selection<T>): void;
+            event(selection: Transition<T>): void;
+
+            x(): brush.Scale;
+            x(x: brush.Scale): Brush<T>;
+
+            y(): brush.Scale;
+            y(y: brush.Scale): Brush<T>;
+
+            extent(): [number, number] | [[number, number], [number, number]];
+            extent(extent: [number, number] | [[number, number], [number, number]]): Brush<T>;
+
+            clamp(): boolean | [boolean, boolean];
+            clamp(clamp: boolean | [boolean, boolean]): Brush<T>;
+
+            clear(): void;
+
+            empty(): boolean;
+
+            on(type: 'brushstart'): (datum: T, index: number) => void;
+            on(type: 'brush'): (datum: T, index: number) => void;
+            on(type: 'brushend'): (datum: T, index: number) => void;
+            on(type: string): (datum: T, index: number) => void;
+
+            on(type: 'brushstart', listener: (datum: T, index: number) => void): Brush<T>;
+            on(type: 'brush', listener: (datum: T, index: number) => void): Brush<T>;
+            on(type: 'brushend', listener: (datum: T, index: number) => void): Brush<T>;
+            on(type: string, listener: (datum: T, index: number) => void): Brush<T>;
+        }
+    }
+
+    export function xhr(url: string, mimeType?: string, callback?: (err: any, data: any) => void): Xhr;
+    export function xhr(url: string, callback: (err: any, data: any) => void): Xhr;
+
+    interface Xhr {
+        header(name: string): string;
+        header(name: string, value: string): Xhr;
+
+        mimeType(): string;
+        mimeType(type: string): Xhr;
+
+        responseType(): string;
+        responseType(type: string): Xhr;
+
+        response(): (request: XMLHttpRequest) => any;
+        response(value: (request: XMLHttpRequest) => any): Xhr;
+
+        get(callback?: (err: any, data: any) => void): Xhr;
+
+        post(data?: any, callback?: (err: any, data: any) => void): Xhr;
+        post(callback: (err: any, data: any) => void): Xhr;
+
+        send(method: string, data?: any, callback?: (err: any, data: any) => void): Xhr;
+        send(method: string, callback: (err: any, data: any) => void): Xhr;
+
+        abort(): Xhr;
+
+        on(type: "beforesend"): (request: XMLHttpRequest) => void;
+        on(type: "progress"): (request: XMLHttpRequest) => void;
+        on(type: "load"): (response: any) => void;
+        on(type: "error"): (err: any) => void;
+        on(type: string): (...args: any[]) => void;
+
+        on(type: "beforesend", listener: (request: XMLHttpRequest) => void): Xhr;
+        on(type: "progress", listener: (request: XMLHttpRequest) => void): Xhr;
+        on(type: "load", listener: (response: any) => void): Xhr;
+        on(type: "error", listener: (err: any) => void): Xhr;
+        on(type: string, listener: (...args: any[]) => void): Xhr;
+    }
+
+    export function text(url: string, mimeType?: string, callback?: (err: any, data: string) => void): Xhr;
+    export function text(url: string, callback: (err: any, data: string) => void): Xhr;
+
+    export function json(url: string, callback?: (err: any, data: any) => void): Xhr;
+
+    export function xml(url: string, mimeType?: string, callback?: (err: any, data: any) => void): Xhr;
+    export function xml(url: string, callback: (err: any, data: any) => void): Xhr;
+
+    export function html(url: string, callback?: (err: any, data: DocumentFragment) => void): Xhr;
+
+    export var csv: Dsv;
+    export var tsv: Dsv;
+    export function dsv(delimiter: string, mimeType: string): Dsv;
+
+    interface Dsv {
+        (url: string, callback: (rows: { [key: string]: string }[]) => void): DsvXhr<{ [key: string]: string }>;
+        (url: string, callback: (error: any, rows: { [key: string]: string }[]) => void): DsvXhr<{ [key: string]: string }>;
+        (url: string): DsvXhr<{ [key: string]: string }>;
+        <T>(url: string, accessor: (row: { [key: string]: string }) => T, callback: (rows: T[]) => void): DsvXhr<T>;
+        <T>(url: string, accessor: (row: { [key: string]: string }) => T, callback: (error: any, rows: T[]) => void): DsvXhr<T>;
+        <T>(url: string, accessor: (row: { [key: string]: string }) => T): DsvXhr<T>;
+
+        parse(string: string): { [key: string]: string }[];
+        parse<T>(string: string, accessor: (row: { [key: string]: string }, index: number) => T): T[];
+
+        parseRows(string: string): string[][];
+        parseRows<T>(string: string, accessor: (row: string[], index: number) => T): T[];
+
+        format(rows: Object[]): string;
+
+        formatRows(rows: string[][]): string;
+    }
+
+    interface DsvXhr<T> extends Xhr {
+        row(): (row: { [key: string]: string }) => T;
+        row<U>(accessor: (row: { [key: string]: string }) => U): DsvXhr<U>;
+
+        header(name: string): string;
+        header(name: string, value: string): DsvXhr<T>;
+
+        mimeType(): string;
+        mimeType(type: string): DsvXhr<T>;
+
+        responseType(): string;
+        responseType(type: string): DsvXhr<T>;
+
+        response(): (request: XMLHttpRequest) => any;
+        response(value: (request: XMLHttpRequest) => any): DsvXhr<T>;
+
+        get(callback?: (err: XMLHttpRequest, data: T[]) => void): DsvXhr<T>;
+        post(data?: any, callback?: (err: XMLHttpRequest, data: T[]) => void): DsvXhr<T>;
+        post(callback: (err: XMLHttpRequest, data: T[]) => void): DsvXhr<T>;
+
+        send(method: string, data?: any, callback?: (err: XMLHttpRequest, data: T[]) => void): DsvXhr<T>;
+        send(method: string, callback: (err: XMLHttpRequest, data: T[]) => void): DsvXhr<T>;
+
+        abort(): DsvXhr<T>;
+
+        on(type: "beforesend"): (request: XMLHttpRequest) => void;
+        on(type: "progress"): (request: XMLHttpRequest) => void;
+        on(type: "load"): (response: T[]) => void;
+        on(type: "error"): (err: any) => void;
+        on(type: string): (...args: any[]) => void;
+
+        on(type: "beforesend", listener: (request: XMLHttpRequest) => void): DsvXhr<T>;
+        on(type: "progress", listener: (request: XMLHttpRequest) => void): DsvXhr<T>;
+        on(type: "load", listener: (response: T[]) => void): DsvXhr<T>;
+        on(type: "error", listener: (err: any) => void): DsvXhr<T>;
+        on(type: string, listener: (...args: any[]) => void): DsvXhr<T>;
+    }
+
+    export function locale(definition: LocaleDefinition): Locale;
+
+    interface LocaleDefinition {
+        decimal: string;
+        thousands: string;
+        grouping: number[];
+        currency: [string, string];
+        dateTime: string;
+        date: string;
+        time: string;
+        periods: [string, string];
+        days: [string, string, string, string, string, string, string];
+        shortDays: [string, string, string, string, string, string, string];
+        months: [string, string, string, string, string, string, string, string, string, string, string, string];
+        shortMonths: [string, string, string, string, string, string, string, string, string, string, string, string];
+    }
+
+    interface Locale {
+        numberFormat(specifier: string): (n: number) => string;
+        timeFormat: {
+            (specifier: string): time.Format;
+            utc(specifier: string): time.Format;
+            multi(formats: Array<[string, (d: Date) => boolean|number]>): time.Format;
+        }
+    }
+
+    namespace layout {
+        export function bundle(): Bundle<bundle.Node>;
+        export function bundle<T extends bundle.Node>(): Bundle<T>
+
+        namespace bundle {
+            interface Node {
+                parent: Node;
+            }
+
+            interface Link<T extends Node> {
+                source: T;
+                target: T;
+            }
+        }
+
+        interface Bundle<T extends bundle.Node> {
+            (links: bundle.Link<T>[]): T[][];
+        }
+
+        export function chord(): Chord;
+
+        namespace chord {
+            interface Link {
+                source: Node;
+                target: Node;
+            }
+
+            interface Node {
+                index: number;
+                subindex: number;
+                startAngle: number;
+                endAngle: number;
+                value: number;
+            }
+
+            interface Group {
+                index: number;
+                startAngle: number;
+                endAngle: number;
+                value: number;
+            }
+        }
+
+        interface Chord {
+            matrix(): number[][];
+            matrix(matrix: number[][]): Chord;
+
+            padding(): number;
+            padding(padding: number): Chord;
+
+            sortGroups(): (a: number, b: number) => number;
+            sortGroups(comparator: (a: number, b: number) => number): Chord;
+
+            sortSubgroups(): (a: number, b: number) => number;
+            sortSubgroups(comparator: (a: number, b: number) => number): Chord;
+
+            sortChords(): (a: number, b: number) => number;
+            sortChords(comparator: (a: number, b: number) => number): Chord;
+
+            chords(): chord.Link[];
+            groups(): chord.Group[];
+        }
+
+        export function cluster(): Cluster<cluster.Result>;
+        export function cluster<T extends cluster.Result>(): Cluster<T>;
+
+        namespace cluster {
+            interface Result {
+                parent?: Result;
+                children?: Result[];
+                depth?: number;
+                x?: number;
+                y?: number;
+            }
+
+            interface Link<T extends Result> {
+                source: T;
+                target: T;
+            }
+        }
+
+        interface Cluster<T extends cluster.Result> {
+            (root: T): T[];
+
+            nodes(root: T): T[];
+
+            links(nodes: T[]): cluster.Link<T>[];
+
+            children(): (node: T) => T[];
+            children(accessor: (node: T) => T[]): Cluster<T>;
+
+            sort(): (a: T, b: T) => number;
+            sort(comparator: (a: T, b: T) => number): Cluster<T>;
+
+            separation(): (a: T, b: T) => number;
+            separation(separation: (a: T, b: T) => number): Cluster<T>;
+
+            size(): [number, number];
+            size(size: [number, number]): Cluster<T>;
+
+            nodeSize(): [number, number];
+            nodeSize(nodeSize: [number, number]): Cluster<T>;
+
+            value(): (a: T) => number;
+            value(value: (a: T) => number): Cluster<T>;
+        }
+
+        export function force(): Force<force.Link<force.Node>, force.Node>;
+        export function force<Node extends force.Node>(): Force<force.Link<Node>, Node>;
+        export function force<Link extends force.Link<force.Node>, Node extends force.Node>(): Force<Link, Node>;
+
+        namespace force {
+            interface Link<T extends Node> {
+                source: T;
+                target: T;
+            }
+
+            interface Node {
+                index?: number;
+                x?: number;
+                y?: number;
+                px?: number;
+                py?: number;
+                fixed?: boolean;
+                weight?: number;
+            }
+
+            interface Event {
+                type: string;
+                alpha: number;
+            }
+        }
+
+        interface Force<Link extends force.Link<force.Node>, Node extends force.Node> {
+            size(): [number, number];
+            size(size: [number, number]): Force<Link, Node>;
+
+            linkDistance(): number | ((link: Link, index: number) => number);
+            linkDistance(distance: number): Force<Link, Node>;
+            linkDistance(distance: (link: Link, index: number) => number): Force<Link, Node>;
+
+            linkStrength(): number | ((link: Link, index: number) => number);
+            linkStrength(strength: number): Force<Link, Node>;
+            linkStrength(strength: (link: Link, index: number) => number): Force<Link, Node>;
+
+            friction(): number;
+            friction(friction: number): Force<Link, Node>;
+
+            charge(): number | ((node: Node, index: number) => number);
+            charge(charge: number): Force<Link, Node>;
+            charge(charge: (node: Node, index: number) => number): Force<Link, Node>;
+
+            chargeDistance(): number;
+            chargeDistance(distance: number): Force<Link, Node>;
+
+            theta(): number;
+            theta(theta: number): Force<Link, Node>;
+
+            gravity(): number;
+            gravity(gravity: number): Force<Link, Node>;
+
+            nodes(): Node[];
+            nodes(nodes: Node[]): Force<Link, Node>;
+
+            links(): Link[];
+            links(links: { source: number; target: number }[]): Force<Link, Node>;
+            links(links: Link[]): Force<Link, Node>;
+
+            start(): Force<Link, Node>;
+
+            alpha(): number;
+            alpha(value: number): Force<Link, Node>;
+
+            resume(): Force<Link, Node>;
+
+            stop(): Force<Link, Node>;
+
+            on(type: string): (event: force.Event) => void;
+            on(type: string, listener: (event: force.Event) => void): Force<Link, Node>;
+
+            drag(): behavior.Drag<Node>;
+            drag(selection: Selection<Node>): void;
+        }
+
+        export function hierarchy(): Hierarchy<hierarchy.Result>;
+        export function hierarchy<T extends hierarchy.Result>(): Hierarchy<T>;
+
+        namespace hierarchy {
+            interface Result {
+                parent?: Result;
+                children?: Result[];
+                value?: number;
+                depth?: number;
+            }
+        }
+
+        interface Hierarchy<T extends hierarchy.Result> {
+            (root: T): T[];
+
+            children(): (node: T) => T[];
+            children(accessor: (node: T) => T[]): Hierarchy<T>;
+
+            sort(): (a: T, b: T) => number;
+            sort(comparator: (a: T, b: T) => number): Hierarchy<T>;
+
+            value(): (node: T) => number;
+            value(accessor: (node: T) => number): Hierarchy<T>;
+
+            revalue(root: T): T[];
+        }
+
+        export function histogram(): Histogram<number>;
+        export function histogram<T>(): Histogram<T>;
+
+        namespace histogram {
+            interface Bin<T> extends Array<T> {
+                x: number;
+                dx: number;
+                y: number;
+            }
+        }
+
+        interface Histogram<T> {
+            (values: T[], index?: number): histogram.Bin<T>[];
+
+            value(): (datum: T, index: number) => number;
+            value(value: (datum: T, index: number) => number): Histogram<T>;
+
+            range(): (values: T[], index: number) => [number, number];
+            range(range: (values: T[], index: number) => [number, number]): Histogram<T>;
+
+            bins(): (range: [number, number], values: T[], index: number) => number[];
+            bins(count: number): Histogram<T>;
+            bins(thresholds: number[]): Histogram<T>;
+            bins(func: (range: [number, number], values: T[], index: number) => number[]): Histogram<T>;
+
+            frequency(): boolean;
+            frequency(frequency: boolean): Histogram<T>;
+        }
+
+        export function pack(): Pack<pack.Node>;
+        export function pack<T extends pack.Node>(): Pack<T>;
+
+        namespace pack {
+            interface Node {
+                parent?: Node;
+                children?: Node[];
+                value?: number;
+                depth?: number;
+                x?: number;
+                y?: number;
+                r?: number;
+            }
+
+            interface Link<T extends Node> {
+                source: Node;
+                target: Node;
+            }
+        }
+
+        interface Pack<T extends pack.Node> {
+            (root: T): T[];
+
+            nodes(root: T): T[];
+
+            links(nodes: T[]): pack.Link<T>[];
+
+            children(): (node: T, depth: number) => T[];
+            children(children: (node: T, depth: number) => T[]): Pack<T>;
+
+            sort(): (a: T, b: T) => number;
+            sort(comparator: (a: T, b: T) => number): Pack<T>;
+
+            value(): (node: T) => number;
+            value(value: (node: T) => number): Pack<T>;
+
+            size(): [number, number];
+            size(size: [number, number]): Pack<T>;
+
+            radius(): number | ((node: T) => number);
+            radius(radius: number): Pack<T>;
+            radius(radius: (node: T) => number): Pack<T>;
+
+            padding(): number;
+            padding(padding: number): Pack<T>;
+        }
+
+        export function partition(): Partition<partition.Node>;
+        export function partition<T extends partition.Node>(): Partition<T>;
+
+        namespace partition {
+            interface Link<T extends Node> {
+                source: T;
+                target: T;
+            }
+
+            interface Node {
+                parent?: Node;
+                children?: number;
+                value?: number;
+                depth?: number;
+                x?: number;
+                y?: number;
+                dx?: number;
+                dy?: number;
+            }
+
+        }
+
+        export interface Partition<T extends partition.Node> {
+            nodes(root: T): T[];
+
+            links(nodes: T[]): partition.Link<T>[];
+
+            children(): (node: T, depth: number) => T[];
+            children(children: (node: T, depth: number) => T[]): Partition<T>;
+
+            sort(): (a: T, b: T) => number;
+            sort(comparator: (a: T, b: T) => number): Partition<T>;
+
+            value(): (node: T) => number;
+            value(value: (node: T) => number): Partition<T>;
+
+            size(): [number, number];
+            size(size: [number, number]): Partition<T>;
+        }
+
+        export function pie(): Pie<number>;
+        export function pie<T>(): Pie<T>;
+
+        namespace pie {
+            interface Arc<T> {
+                value: number;
+                startAngle: number;
+                endAngle: number;
+                padAngle: number;
+                data: T;
+            }
+        }
+
+        interface Pie<T> {
+            (data: T[], index?: number): pie.Arc<T>[];
+
+            value(): (datum: T, index: number) => number;
+            value(accessor: (datum: T, index: number) => number): Pie<T>;
+
+            sort(): (a: T, b: T) => number;
+            sort(comparator: (a: T, b: T) => number): Pie<T>;
+
+            startAngle(): number | ((data: T[], index: number) => number);
+            startAngle(angle: number): Pie<T>;
+            startAngle(angle: (data: T[], index: number) => number): Pie<T>;
+
+            endAngle(): number | ((data: T[], index: number) => number);
+            endAngle(angle: number): Pie<T>;
+            endAngle(angle: (data: T[], index: number) => number): Pie<T>;
+
+            padAngle(): number | ((data: T[], index: number) => number);
+            padAngle(angle: number): Pie<T>;
+            padAngle(angle: (data: T[], index: number) => number): Pie<T>;
+        }
+
+        export function stack(): Stack<stack.Value[], stack.Value>;
+        export function stack<Value>(): Stack<Value[], Value>;
+        export function stack<Series, Value>(): Stack<Series, Value>;
+        namespace stack {
+            interface Value {
+                x: number;
+                y: number;
+                y0?: number;
+            }
+        }
+
+        interface Stack<Series, Value> {
+            (layers: Series[], index?: number): Series[];
+
+            values(): (layer: Series, index: number) => Value[];
+            values(accessor: (layer: Series, index: number) => Value[]): Stack<Series, Value>;
+
+            offset(): (data: Array<[number, number]>) => number[];
+            offset(offset: "silhouette"): Stack<Series, Value>;
+            offset(offset: "wiggle"): Stack<Series, Value>;
+            offset(offset: "expand"): Stack<Series, Value>;
+            offset(offset: "zero"): Stack<Series, Value>;
+            offset(offset: string): Stack<Series, Value>;
+            offset(offset: (data: Array<[number, number]>) => number[]): Stack<Series, Value>;
+
+            order(): (data: Array<[number, number]>) => number[];
+            order(order: "inside-out"): Stack<Series, Value>;
+            order(order: "reverse"): Stack<Series, Value>;
+            order(order: "default"): Stack<Series, Value>;
+            order(order: string): Stack<Series, Value>;
+            order(order: (data: Array<[number, number]>) => number[]): Stack<Series, Value>;
+
+            x(): (value: Value, index: number) => number;
+            x(accessor: (value: Value, index: number) => number): Stack<Series, Value>;
+
+            y(): (value: Value, index: number) => number;
+            y(accesor: (value: Value, index: number) => number): Stack<Series, Value>;
+
+            out(): (value: Value, y0: number, y: number) => void;
+            out(setter: (value: Value, y0: number, y: number) => void): Stack<Series, Value>;
+        }
+
+        export function tree(): Tree<tree.Node>;
+        export function tree<T extends tree.Node>(): Tree<T>;
+
+        namespace tree {
+            interface Link<T extends Node> {
+                source: T;
+                target: T;
+            }
+
+            interface Node {
+                parent?: Node;
+                children?: Node[];
+                depth?: number;
+                x?: number;
+                y?: number;
+            }
+        }
+
+        interface Tree<T> {
+            (root: T, index?: number): T[];
+
+            nodes(root: T, index?: number): T[];
+
+            links(nodes: T[]): tree.Link<T>[];
+
+            children(): (datum: T, index: number) => T[];
+            children(children: (datum: T, index: number) => T[]): Tree<T>;
+
+            separation(): (a: T, b: T) => number;
+            separation(separation: (a: T, b: T) => number): Tree<T>;
+
+            size(): [number, number];
+            size(size: [number, number]): Tree<T>;
+
+            nodeSize(): [number, number];
+            nodeSize(size: [number, number]): Tree<T>;
+
+            sort(): (a: T, b: T) => number;
+            sort(comparator: (a: T, b: T) => number): Tree<T>;
+
+            value(): (datum: T, index: number) => number;
+            value(value: (datum: T, index: number) => number): Tree<T>;
+        }
+
+        export function treemap(): Treemap<treemap.Node>;
+        export function treemap<T extends treemap.Node>(): Treemap<T>;
+
+        namespace treemap {
+            interface Node {
+                parent?: Node;
+                children?: Node[];
+                value?: number;
+                depth?: number;
+                x?: number;
+                y?: number;
+                dx?: number;
+                dy?: number;
+            }
+
+            interface Link<T extends Node> {
+                source: T;
+                target: T;
+            }
+
+            type Padding = number | [number, number, number, number];
+        }
+
+        interface Treemap<T extends treemap.Node> {
+            (root: T, index?: number): T[];
+
+            nodes(root: T, index?: number): T[];
+
+            links(nodes: T[]): treemap.Link<T>[];
+
+            children(): (node: T, depth: number) => T[];
+            children(children: (node: T, depth: number) => T[]): Treemap<T>;
+
+            sort(): (a: T, b: T) => number;
+            sort(comparator: (a: T, b: T) => number): Treemap<T>;
+
+            value(): (node: T, index: number) => number;
+            value(value: (node: T, index: number) => number): Treemap<T>;
+
+            size(): [number, number];
+            size(size: [number, number]): Treemap<T>;
+
+            padding(): (node: T, depth: number) => treemap.Padding;
+            padding(padding: treemap.Padding): Treemap<T>;
+            padding(padding: (node: T, depth: number) => treemap.Padding): Treemap<T>;
+
+            round(): boolean;
+            round(round: boolean): Treemap<T>;
+
+            sticky(): boolean;
+            sticky(sticky: boolean): boolean;
+
+            mode(): string;
+            mode(mode: "squarify"): Treemap<T>;
+            mode(mode: "slice"): Treemap<T>;
+            mode(mode: "dice"): Treemap<T>;
+            mode(mode: "slice-dice"): Treemap<T>;
+            mode(mode: string): Treemap<T>;
+
+            ratio(): number;
+            ratio(ratio: number): Treemap<T>;
+        }
+    }
+
+    namespace geom {
+        export function voronoi(): Voronoi<[number, number]>;
+        export function voronoi<T>(): Voronoi<T>;
+
+        namespace voronoi {
+            interface Link<T> {
+                source: T;
+                target: T;
+            }
+        }
+
+        interface Voronoi<T> {
+            (data: T[]): Array<[number, number]>;
+
+            x(): (vertex: T) => number;
+            x(x: (vertex: T) => number): Voronoi<T>;
+
+            y(): (vertex: T) => number;
+            y(y: (vertex: T) => number): Voronoi<T>;
+
+            clipExtent(): [[number, number], [number, number]];
+            clipExtent(extent: [[number, number], [number, number]]): Voronoi<T>;
+
+            links(data: T[]): voronoi.Link<T>[];
+
+            triangles(data: T[]): Array<[T, T, T]>;
+        }
+
+        /**
+         * @deprecated use d3.geom.voronoi().triangles() instead
+         */
+        export function delaunay(vertices: Array<[number, number]>): Array<[[number, number], [number, number], [number, number]]>;
+
+        export function quadtree(): Quadtree<[number, number]>;
+        export function quadtree<T>(nodes: T[], x1?: number, y1?: number, x2?: number, y2?: number): quadtree.Quadtree<T>;
+
+        namespace quadtree {
+            interface Node<T> {
+                nodes: [Node<T>, Node<T>, Node<T>, Node<T>];
+                leaf: boolean;
+                point: T;
+                x: number;
+                y: number;
+            }
+
+            interface Quadtree<T> extends Node<T> {
+                add(point: T): void;
+                visit(callback: (node: Node<T>, x1: number, y1: number, x2: number, y2: number) => boolean | void): void;
+                find(point: [number, number]): T;
+            }
+        }
+
+        interface Quadtree<T> {
+            (points: T[]): quadtree.Quadtree<T>;
+
+            x(): (datum: T, index: number) => number;
+            x(x: number): Quadtree<T>;
+            x(x: (datum: T, index: number) => number): Quadtree<T>;
+
+            y(): (datum: T, index: number) => number;
+            y(y: number): Quadtree<T>;
+            y(y: (datum: T, index: number) => number): Quadtree<T>;
+
+            extent(): [[number, number], [number, number]];
+            extent(extent: [[number, number], [number, number]]): Quadtree<T>;
+        }
+
+        export function hull(vertices: Array<[number, number]>): Array<[number, number]>;
+        export function hull(): Hull<[number, number]>;
+        export function hull<T>(): Hull<T>;
+
+        interface Hull<T> {
+            (vertices: T[]): Array<[number, number]>;
+
+            x(): (datum: T) => number;
+            x(x: (datum: T) => number): Hull<T>;
+
+            y(): (datum: T) => number;
+            y(y: (datum: T) => number): Hull<T>;
+        }
+
+        export function polygon(vertices: Array<[number, number]>): Polygon;
+
+        interface Polygon {
+            area(): number;
+
+            centroid(): [number, number];
+
+            clip(subject: Array<[number, number]>): Array<[number, number]>;
+        }
+    }
+}
+
+// we need this to exist
+interface TouchList { }
diff --git a/d3/plugins/d3.superformula-tests.ts b/d3/plugins/d3.superformula-tests.ts
index 432ea214c3..4515dd8d28 100644
--- a/d3/plugins/d3.superformula-tests.ts
+++ b/d3/plugins/d3.superformula-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../d3.d.ts" />
-/// <reference path="d3.superformula.d.ts" />
+import * as d3 from 'd3';
 
 function superformula() {
     var size = 1000;
diff --git a/d3/plugins/d3.superformula.d.ts b/d3/plugins/d3.superformula.d.ts
deleted file mode 100644
index f8d54a9da4..0000000000
--- a/d3/plugins/d3.superformula.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/// <reference path="../d3.d.ts" />
-
-declare namespace d3 {
-    export function superformula<T>(): Superformula<T>;
-
-    namespace superformula {
-        interface Type {
-            m: number;
-            n1: number;
-            n2: number;
-            n3: number;
-            a: number;
-            b: number;
-        }
-    }
-
-    interface Superformula<T> {
-        (datum: T, index: number): string;
-
-        type(): (datum: T, index: number) => string;
-        type(type: string): Superformula<T>;
-        type(type: (datum: T, index: number) => string): Superformula<T>;
-
-        size(): (datum: T, index: number) => number;
-        size(size: number): Superformula<T>;
-        size(size: (datum: T, index: number) => number): Superformula<T>;
-
-        segments(): (datum: T, index: number) => number;
-        segments(segments: number): Superformula<T>;
-        segments(segments: (datum: T, index: number) => number): Superformula<T>;
-
-        param(name: string): number;
-        param(name: string, value: number): Superformula<T>;
-    }
-
-    export var superformulaTypes: string[];
-}
diff --git a/d3/plugins/index.d.ts b/d3/plugins/index.d.ts
new file mode 100644
index 0000000000..967d278d99
--- /dev/null
+++ b/d3/plugins/index.d.ts
@@ -0,0 +1,38 @@
+
+import * as d3 from 'd3';
+
+declare module 'd3' {
+    export function superformula<T>(): Superformula<T>;
+
+    export namespace superformula {
+        interface Type {
+            m: number;
+            n1: number;
+            n2: number;
+            n3: number;
+            a: number;
+            b: number;
+        }
+    }
+
+    export interface Superformula<T> {
+        (datum: T, index: number): string;
+
+        type(): (datum: T, index: number) => string;
+        type(type: string): Superformula<T>;
+        type(type: (datum: T, index: number) => string): Superformula<T>;
+
+        size(): (datum: T, index: number) => number;
+        size(size: number): Superformula<T>;
+        size(size: (datum: T, index: number) => number): Superformula<T>;
+
+        segments(): (datum: T, index: number) => number;
+        segments(segments: number): Superformula<T>;
+        segments(segments: (datum: T, index: number) => number): Superformula<T>;
+
+        param(name: string): number;
+        param(name: string, value: number): Superformula<T>;
+    }
+
+    export var superformulaTypes: string[];
+}
diff --git a/d3/plugins/tsconfig.json b/d3/plugins/tsconfig.json
new file mode 100644
index 0000000000..dacc4dbc52
--- /dev/null
+++ b/d3/plugins/tsconfig.json
@@ -0,0 +1,15 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../../",
+        "typesRoot": "../../",
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "d3.superformula-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/d3/tsconfig.json b/d3/tsconfig.json
new file mode 100644
index 0000000000..bbb8f12412
--- /dev/null
+++ b/d3/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "d3-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dagre-d3/dagre-d3-tests.ts b/dagre-d3/dagre-d3-tests.ts
index f73389015f..2df9706039 100644
--- a/dagre-d3/dagre-d3-tests.ts
+++ b/dagre-d3/dagre-d3-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="dagre-d3.d.ts"/>
 namespace DagreD3Tests {
     var gDagre = new dagreD3.graphlib.Graph();
     var graph = gDagre.graph();
diff --git a/dagre-d3/dagre-d3.d.ts b/dagre-d3/dagre-d3.d.ts
deleted file mode 100644
index c8484995e3..0000000000
--- a/dagre-d3/dagre-d3.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-// Type definitions for dagre-d3.core.js
-// Project: https://github.com/cpettitt/dagre-d3
-// Definitions by: Mark Wong Siang Kai <https://github.com/markwongsk>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../d3/d3.d.ts"/>
-/// <reference path="../dagre/dagre.d.ts"/>
-
-declare namespace Dagre {
-
-    interface DagreD3Factory extends Dagre.DagreFactory {
-        render: Render;
-    }
-
-    // coupled with dagre.d.ts' Graph
-    // a lot of these methods come from graphlib.core.js
-    interface Graph {
-        graph(): Graph;
-        height: number;
-        predecessors(id: string): string[];
-        successors(id: string): string[];
-        width: number;
-    }
-
-    interface Render {
-        new (): Render;
-        (selection: d3.Selection<any>, g: Dagre.Graph): void;
-    }
-}
-
-declare var dagreD3: Dagre.DagreD3Factory;
diff --git a/dagre-d3/index.d.ts b/dagre-d3/index.d.ts
new file mode 100644
index 0000000000..7e85b439d2
--- /dev/null
+++ b/dagre-d3/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for dagre-d3.core.js
+// Project: https://github.com/cpettitt/dagre-d3
+// Definitions by: Mark Wong Siang Kai <https://github.com/markwongsk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="d3"/>
+/// <reference types="dagre"/>
+
+declare namespace Dagre {
+
+    interface DagreD3Factory extends Dagre.DagreFactory {
+        render: Render;
+    }
+
+    // coupled with dagre.d.ts' Graph
+    // a lot of these methods come from graphlib.core.js
+    interface Graph {
+        graph(): Graph;
+        height: number;
+        predecessors(id: string): string[];
+        successors(id: string): string[];
+        width: number;
+    }
+
+    interface Render {
+        new (): Render;
+        (selection: d3.Selection<any>, g: Dagre.Graph): void;
+    }
+}
+
+declare var dagreD3: Dagre.DagreD3Factory;
diff --git a/dagre-d3/tsconfig.json b/dagre-d3/tsconfig.json
new file mode 100644
index 0000000000..e03baf821b
--- /dev/null
+++ b/dagre-d3/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dagre-d3-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dagre/dagre-tests.ts b/dagre/dagre-tests.ts
index a4eaad32f3..8baed95ee8 100644
--- a/dagre/dagre-tests.ts
+++ b/dagre/dagre-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="dagre.d.ts"/>
 namespace DagreTests {
   var gDagre = new dagre.graphlib.Graph();
   gDagre.setGraph({})
diff --git a/dagre/dagre.d.ts b/dagre/index.d.ts
similarity index 100%
rename from dagre/dagre.d.ts
rename to dagre/index.d.ts
diff --git a/dagre/tsconfig.json b/dagre/tsconfig.json
new file mode 100644
index 0000000000..1ac2880306
--- /dev/null
+++ b/dagre/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dagre-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dat-gui/dat-gui-tests.ts b/dat-gui/dat-gui-tests.ts
index 19b34dd43f..2fd3e785ca 100644
--- a/dat-gui/dat-gui-tests.ts
+++ b/dat-gui/dat-gui-tests.ts
@@ -2,7 +2,7 @@
 // http://workshop.chromeexperiments.com/examples/gui/
 //////////////////////////////////////////////////////////////
 
-/// <reference path="dat-gui.d.ts" />
+
 
 
 // ------------ config
@@ -105,11 +105,11 @@ var FizzyText = function () {
     var gui = new dat.GUI();
     var controller = gui.add(fizzyText, 'maxSize', 0, 10);
 
-    controller.onChange(function (value) {
+    controller.onChange(function (value: any) {
         // Fires on every change, drag, keypress, etc.
     });
 
-    controller.onFinishChange(function (value) {
+    controller.onFinishChange(function (value: any) {
         // Fires when a controller loses focus.
         alert("The new value is " + value);
     });
@@ -163,11 +163,11 @@ var FizzyText = function () {
     var gui = new dat.GUI();
     var controller = gui.add(obj, 'maxSize', 0, 10);
 
-    controller.onChange(function (value) {
+    controller.onChange(function (value: any) {
         // Fires on every change, drag, keypress, etc.
     });
 
-    controller.onFinishChange(function (value) {
+    controller.onFinishChange(function (value: any) {
         // Fires when a controller loses focus.
         alert("The new value is " + value);
     });
diff --git a/dat-gui/dat-gui-tests.ts.tscparams b/dat-gui/dat-gui-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/dat-gui/dat-gui-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/dat-gui/dat-gui.d.ts b/dat-gui/index.d.ts
similarity index 100%
rename from dat-gui/dat-gui.d.ts
rename to dat-gui/index.d.ts
diff --git a/dat-gui/tsconfig.json b/dat-gui/tsconfig.json
new file mode 100644
index 0000000000..ba28809f85
--- /dev/null
+++ b/dat-gui/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dat-gui-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/data-driven/data-driven-tests.ts b/data-driven/data-driven-tests.ts
index b91c8361a2..247ece7327 100644
--- a/data-driven/data-driven-tests.ts
+++ b/data-driven/data-driven-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="data-driven.d.ts" />
 
 import data_driven = require('data-driven');
 
diff --git a/data-driven/data-driven.d.ts b/data-driven/data-driven.d.ts
deleted file mode 100644
index 82c307daa8..0000000000
--- a/data-driven/data-driven.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for data-driven.js
-// Project: https://github.com/fluentsoftware/data-driven
-// Definitions by: Adam Babcock <https://github.com/mrhen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "data-driven" {
-	function data_driven<T>(data:T[], callback:()=>any):any;
-    export = data_driven
-}
diff --git a/data-driven/index.d.ts b/data-driven/index.d.ts
new file mode 100644
index 0000000000..fc21425b54
--- /dev/null
+++ b/data-driven/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for data-driven.js
+// Project: https://github.com/fluentsoftware/data-driven
+// Definitions by: Adam Babcock <https://github.com/mrhen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function data_driven<T>(data: T[], callback: () => any): any;
+export = data_driven
diff --git a/data-driven/tsconfig.json b/data-driven/tsconfig.json
new file mode 100644
index 0000000000..92ca7596a7
--- /dev/null
+++ b/data-driven/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "data-driven-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/datatables-buttons/datatables-buttons-tests.ts b/datatables-buttons/datatables-buttons-tests.ts
index dbe176eea0..52a21db894 100644
--- a/datatables-buttons/datatables-buttons-tests.ts
+++ b/datatables-buttons/datatables-buttons-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../jquery.dataTables/jquery.dataTables.d.ts" />
-/// <reference path="datatables-buttons.d.ts" />
+/// <reference types="jquery" />
+/// <reference types="jquery.dataTables" />
+
 
 $(document).ready(function () {
 
diff --git a/datatables-buttons/datatables-buttons.d.ts b/datatables-buttons/datatables-buttons.d.ts
deleted file mode 100644
index f11f39040d..0000000000
--- a/datatables-buttons/datatables-buttons.d.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-// Type definitions for JQuery DataTables Buttons extension 1.1.0
-// Project: http://datatables.net/extensions/buttons/
-// Definitions by: Sam Germano <https://github.com/SammyG4Free>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../jquery.dataTables/jquery.dataTables.d.ts"/>
-
-declare namespace DataTables {
-    export interface Settings {
-        /**
-         * Buttons extension options
-         */
-        buttons?: boolean | string[] | ButtonSettings[];
-    }
-
-    //#region "button-settings"
-
-    /**
-    * Buttons extension options
-    */
-    export interface ButtonSettings {
-        /**
-        * Action to take when the button is activated
-        */
-        action?: FunctionButtonAction;
-
-        /**
-        * Ensure that any requirements have been satisfied before initialising a button
-        */
-        available?: FunctionButtonAvailable;
-
-        /**
-        * Set the class name for the button
-        */
-        className?: string;
-
-        /**
-        * Function that is called when the button is destroyed
-        */
-        destroy?: FunctionButtonInit;
-
-        /**
-        * Set a button's initial enabled state
-        */
-        enabled?: boolean;
-
-        /**
-        * Define which button type the button should be based on
-        */
-        extend?: string;
-
-        /**
-        * Initialisation function that can be used to add events specific to this button
-        */
-        init?: FunctionButtonInit;
-
-        /**
-        * Define an activation key for a button
-        */
-        key?: string | ButtonKey;
-
-        /**
-        * Set a name for each selection
-        */
-        name?: string;
-
-        /**
-        * Unique namespace for every button
-        */
-        namespace?: string;
-
-        /**
-        * The text to show in the button
-        */
-        text?: string | ButtonText;
-
-        /**
-        * Button 'title' attribute text
-        */
-        titleAttr?: string;
-
-        exportOptions?: ButtonExportOptions;
-        autoPrint?: boolean;
-        customize?: FunctionButtonCustomize;
-    }
-
-    export interface FunctionButtonAvailable {
-        (dt: DataTables.DataTable, config: any): boolean
-    }
-    export interface ButtonExportOptions {
-        columns?: string;
-    }
-
-    export interface ButtonKey {
-        key?: string;
-        shiftKey?: boolean;
-        altKey?: boolean;
-        ctrlKey?: boolean;
-        metaKey?: boolean;
-    }
-
-    export interface ButtonText {
-        (dt: DataTables.DataTable, node: JQuery, config: any): string
-    }
-    export interface FunctionButtonInit {
-        (dt: DataTables.DataTable, node: JQuery, config: any): void
-    }
-    // api object?
-    export interface FunctionButtonAction {
-        (e: any, dt: DataTables.DataTable, node: JQuery, config: any): void
-    }
-
-    export interface FunctionButtonCustomize {
-        (win: Window): void
-    }
-    //#endregion "button-settings
-}
diff --git a/datatables-buttons/index.d.ts b/datatables-buttons/index.d.ts
new file mode 100644
index 0000000000..3bb8d5c02c
--- /dev/null
+++ b/datatables-buttons/index.d.ts
@@ -0,0 +1,118 @@
+// Type definitions for JQuery DataTables Buttons extension 1.1.0
+// Project: http://datatables.net/extensions/buttons/
+// Definitions by: Sam Germano <https://github.com/SammyG4Free>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+/// <reference types="jquery.dataTables"/>
+
+declare namespace DataTables {
+    export interface Settings {
+        /**
+         * Buttons extension options
+         */
+        buttons?: boolean | string[] | ButtonSettings[];
+    }
+
+    //#region "button-settings"
+
+    /**
+    * Buttons extension options
+    */
+    export interface ButtonSettings {
+        /**
+        * Action to take when the button is activated
+        */
+        action?: FunctionButtonAction;
+
+        /**
+        * Ensure that any requirements have been satisfied before initialising a button
+        */
+        available?: FunctionButtonAvailable;
+
+        /**
+        * Set the class name for the button
+        */
+        className?: string;
+
+        /**
+        * Function that is called when the button is destroyed
+        */
+        destroy?: FunctionButtonInit;
+
+        /**
+        * Set a button's initial enabled state
+        */
+        enabled?: boolean;
+
+        /**
+        * Define which button type the button should be based on
+        */
+        extend?: string;
+
+        /**
+        * Initialisation function that can be used to add events specific to this button
+        */
+        init?: FunctionButtonInit;
+
+        /**
+        * Define an activation key for a button
+        */
+        key?: string | ButtonKey;
+
+        /**
+        * Set a name for each selection
+        */
+        name?: string;
+
+        /**
+        * Unique namespace for every button
+        */
+        namespace?: string;
+
+        /**
+        * The text to show in the button
+        */
+        text?: string | ButtonText;
+
+        /**
+        * Button 'title' attribute text
+        */
+        titleAttr?: string;
+
+        exportOptions?: ButtonExportOptions;
+        autoPrint?: boolean;
+        customize?: FunctionButtonCustomize;
+    }
+
+    export interface FunctionButtonAvailable {
+        (dt: DataTables.DataTable, config: any): boolean
+    }
+    export interface ButtonExportOptions {
+        columns?: string;
+    }
+
+    export interface ButtonKey {
+        key?: string;
+        shiftKey?: boolean;
+        altKey?: boolean;
+        ctrlKey?: boolean;
+        metaKey?: boolean;
+    }
+
+    export interface ButtonText {
+        (dt: DataTables.DataTable, node: JQuery, config: any): string
+    }
+    export interface FunctionButtonInit {
+        (dt: DataTables.DataTable, node: JQuery, config: any): void
+    }
+    // api object?
+    export interface FunctionButtonAction {
+        (e: any, dt: DataTables.DataTable, node: JQuery, config: any): void
+    }
+
+    export interface FunctionButtonCustomize {
+        (win: Window): void
+    }
+    //#endregion "button-settings
+}
diff --git a/datatables-buttons/tsconfig.json b/datatables-buttons/tsconfig.json
new file mode 100644
index 0000000000..facb49b610
--- /dev/null
+++ b/datatables-buttons/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "datatables-buttons-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/date.format.js/date.format-tests.ts b/date.format.js/date.format-tests.ts
index d06e78cb7a..7f0ca1cc15 100644
--- a/date.format.js/date.format-tests.ts
+++ b/date.format.js/date.format-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="date.format.d.ts" />
+
 
 // test dateFormat
 var now : string = dateFormat();
diff --git a/date.format.js/date.format.d.ts b/date.format.js/index.d.ts
similarity index 100%
rename from date.format.js/date.format.d.ts
rename to date.format.js/index.d.ts
diff --git a/date.format.js/tsconfig.json b/date.format.js/tsconfig.json
new file mode 100644
index 0000000000..1c9a0844db
--- /dev/null
+++ b/date.format.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "date.format-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/datejs/datejs-tests.ts b/datejs/datejs-tests.ts
index 0ed60d2d34..ee37c91b70 100644
--- a/datejs/datejs-tests.ts
+++ b/datejs/datejs-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="datejs.d.ts" />
-/// <reference path="sugarpak.d.ts" />
+
+
 
 function tests() {
     // What date is next thursday?
diff --git a/datejs/datejs.d.ts b/datejs/datejs.d.ts
deleted file mode 100644
index 068a5b42a5..0000000000
--- a/datejs/datejs.d.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-// Type definitions for DateJS
-// Project: http://www.datejs.com/
-// Definitions by: David Khristepher Santos <http://github.com/rupertavery>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-//NOTE: This definition file is for the library located at http://datejs.googlecode.com/svn/ and documented at https://code.google.com/p/datejs/wiki/APIDocumentation
-//That version of the library is more recent than the one provided at https://code.google.com/p/datejs/downloads/list, which has a slightly different API
-
-/** Defines a structure to be used in the add and set instance methods */
-interface IDateJSLiteral {
-    milliseconds: number;
-    seconds: number;
-    minutes: number;
-    hours: number;
-    days: number;
-    months: number;
-    years: number;
-}
-
-/** DateJS Public Static Methods */
-interface DateConstructor {
-    /** Gets a date that is set to the current date. The time is set to the start of the day (00:00 or 12:00 AM) */
-    today(): Date;
-    /** Compares the first date to the second date and returns an number indication of their relative values. -1 = this is lessthan date. 0 = values are equal. 1 = this is greaterthan date. */
-    compare(date1: Date, date2: Date): number;
-    /** Compares the first Date object to the second Date object and returns true if they are equal. */
-    equals(date1: Date, date2?: Date): boolean;
-    /** Gets the day number (0-6) if given a culture-specific string which is a valid full or abbreviated day name. */
-    getDayNumberFromName(dayName: string): number;
-    /** Gets the month number (0-11) if given a culture-specific string which is a valid full or abbreviated month name. */
-    getMonthNumberFromName(monthName: string): number;
-    /** Returns true if the given year is a leap year, false otherwise. */
-    isLeapYear(year: number): boolean;
-    /** Gets the number of days in the month, given a year and month value. Automatically corrects for leap year. */
-    getDaysInMonth(year: number, month: number): number;
-    /** Returns a culture-specific timezone abbreviation based on a given offset and a boolean indicating whether daylight savings time is in effect. */
-    getTimezoneAbbreviation(timezoneOffset: number, isDayLightSavingsTime: boolean): string;
-    /** Gets the timezone offset if given a culture-specific string which is a valid full or abbreviated timezone name and a boolean indicating whether daylight savings time is in effect. */
-    getTimezoneOffset(timezoneAbbreviation?: string, isDayLightSavingsTime?: boolean): number;
-    /** Converts the specified string value into its JavaScript Date equivalent using culture-specific format information. */
-    parse(dateString: string): Date;
-    /** Converts the specified string value into its JavaScript Date equivalent using the specified format. The format of the string value must match one of the supplied formats exactly. */
-    parseExact(dateString: string, formatString: string): Date;
-    /** Converts the specified string value into its JavaScript Date equivalent using the specified formats (array). The format of the string value must match one of the supplied formats exactly. */
-    parseExact(dateString: string, formatArray: string[]): Date;
-    /** Validates the number is within an acceptable range for the days in a month [0-MaxDaysInMonth]. */
-    validateDay(day: number, fullYear: number, monthNumber: number): boolean;
-    /** Validates the number is within an acceptable range for hours[0 - 23].Returns true if within range, otherwise false. */
-    validateHour(hour: number): boolean;
-    /** Validates the number is within an acceptable range for milliseconds[0 - 999].Returns true if within range, otherwise false. */
-    validateMillisecond(milliseconds: number): boolean;
-    /** Validates the number is within an acceptable range for minutes[0 - 59].Returns true if within range, otherwise false. */
-    validateMinute(minutes: number): boolean;
-    /** Validates the number is within an acceptable range for months[0 - 11]. */
-    validateMonth(month: number): boolean;
-    /** Validates the number is within an acceptable range for seconds[0 - 59].Returns true if within range, otherwise false. */
-    validateSecond(second: number): boolean;
-    /** Validates the number is within an acceptable range for years[0 - 9999]. */
-    validateYear(year: number): boolean;
-}
-
-/** DateJS Public Instance Methods */
-interface Date {
-    /** Adds(or subtracts) to the value of the year, month, day, hour, minute, second, millisecond of the date instance using given configuration object. Positive and Negative values allowed. */
-    add(config?: IDateJSLiteral): Date;
-    /** Adds the specified number of milliseconds to this instance. */
-    addMilliseconds(milliseconds: number): Date;
-    /** Adds the specified number of seconds to this instance given the number of seconds to add.The number can be positive or negative. */
-    addSeconds(seconds: number): Date;
-    /** Adds the specified number of minutes to this instance given the number of minutes to add.The number can be positive or negative. */
-    addMinutes(minutes: number): Date;
-    /** Adds the specified number of hours to this instance given the number of hours to add.The number can be positive or negative. */
-    addHours(hours: number): Date;
-    /** Adds the specified number of days to this instance.The number can be positive or negative. */
-    addDays(days: number): Date;
-    /** Adds the specified number of weeks to this instance given the number of weeks to add.The number can be positive or negative. */
-    addWeeks(weeks: number): Date;
-    /** Adds the specified number of months to this instance given the number of months to add.The number can be positive or negative. */
-    addMonths(months: number): Date;
-    /** Adds the specified number of years to this instance given the number of years to add.The number can be positive or negative. */
-    addYears(years: number): Date;
-    /** Resets the time of this Date object to 12:00 AM(00:00), which is the start of the day. */
-    clearTime(): Date;
-    /** Resets the time of this Date object to the current time('now'). */
-    setTimeToNow(): Date;
-    /** Returns a new Date object that is an exact date and time copy of the original instance. */
-    clone(): Date;
-    /** Determines if this instance is between a range of two dates or equal to either the start or end dates. */
-    between(startDate: Date, endDate: Date): boolean;
-    /** Compares this instance to a Date object and returns an number indication of their relative values. -1 = this is lessthan date. 0 = values are equal. 1 = this is greaterthan date. */
-    compareTo(date: Date): number;
-    /** Compares this instance to another Date object and returns true if they are equal, otherwise false. */
-    equals(date: Date): boolean;
-    /** Determines if this date occurs after the date to compare to. */
-    isAfter(date: Date): boolean;
-    /** Determines if this date occurs before the date to compare to. */
-    isBefore(date: Date): boolean;
-    /** Determines if the current Date instance occurs on the same Date as the supplied 'date'. */
-    isToday(date: Date): boolean;
-    /** Returns the number of milliseconds between this date and date. */
-    getElapsed(date: Date): number;
-    /** Get the Ordinal day (numeric day number) of the year, adjusted for leap year. Returns 1 through 365 (366 in leap years) */
-    getOrdinalNumber(): number;
-    /** Get the timezone abbreviation of the current date. */
-    getTimezone(): string;
-    /** Get the offset from UTC of the current date. Returns the 4-character offset string prefixed with + or - (e.g. "-0500"). */
-    getUTCOffset(): string;
-    /** Get the week number. Week one (1) is the week which contains the first Thursday of the year. Monday is considered the first day of the week. */
-    getWeek(): number;
-    /** Get the ISO 8601 week number. Week one ("01") is the week which contains the first Thursday of the year. Monday is considered the first day of the week. */
-    getISOWeek(): string;
-    /** Moves the date to Monday of the week set. Week one (1) is the week which contains the first Thursday of the year. */
-    setWeek(week: number): Date;
-    /** Indicates whether Daylight Saving Time is observed in the current time zone. */
-    hasDaylightSavingTime(): boolean;
-    /** Indicates whether this Date instance is within the Daylight Saving Time range for the current time zone. */
-    isDaylightSavingTime(): boolean;
-	/** Move to the next or previous dayOfWeek. Whether to move into the future (+1) or past(-1) is controlled by the optional direction parameter. */
-    moveToDayOfWeek(dayOfWeek: number, direction: number): Date;
-    /** Moves the date to the first day of the month. */
-    moveToFirstDayOfMonth(): Date;
-    /** Moves the date to the last day of the month. */
-    moveToLastDayOfMonth(): Date;
-    /** Move to the next or previous month.Whether to move into the future(+1) or past(-1) is controlled by the optional direction parameter. */
-    moveToMonth(month: number, direction: number): Date;
-    /** Moves the date to the next nth occurrence of the dayOfWeek starting from the beginning of the month. The number (-1) is a magic number and will return the last occurrence of the dayOfWeek in the month. */
-    moveToNthOccurrence(dayOfWeek: number, occurrence: number): Date;
-    /** Set the value of year, month, day, hour, minute, second, millisecond of date instance using given configuration object. */
-    set(config: IDateJSLiteral): Date;
-    /** Set the timezone for the current date using a culture - specific timezone abbreviation("PST").Note that in most JavaScript implementations, this will appear to change the time since the timezone is always based on the locale. */
-    setTimezone(timezoneAbbreviation: string): Date;
-    /** Set the timezone for the current date using an offset(-0700).Note that in most JavaScript implementations, this will appear to change the time since the timezone is always based on the locale. */
-    setTimezoneOffset(timezoneOffset: number): Date;
-    /** Converts the current date instance into a string with an ISO 8601 format.The date is converted to it's UTC value. As per the ISO 8601 specification, the string will be wrapped with double quotation marks ("). */
-    toISOString(): string;
-    /** Converts the value of the current Date object to its equivalent string representation.Use format argument to specify format(optional).See FormatSpecifiers for more info. */
-    toString(format?: string): string;
-}
-
-
-//NOTE: IDateJSStatic and IDateJS are provided here solely for backwards compatability with previous versions of this particular definition file (datejs.d.ts.)
-//DO NOT use them in new code (and it is strongly suggested you remove their use in any existing code); simply use the Javascript Date class instead.
-interface IDateJS extends Date { }
-interface IDateJSStatic extends DateConstructor { }
\ No newline at end of file
diff --git a/datejs/index.d.ts b/datejs/index.d.ts
new file mode 100644
index 0000000000..856cdcaded
--- /dev/null
+++ b/datejs/index.d.ts
@@ -0,0 +1,146 @@
+// Type definitions for DateJS
+// Project: http://www.datejs.com/
+// Definitions by: David Khristepher Santos <http://github.com/rupertavery>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+//NOTE: This definition file is for the library located at http://datejs.googlecode.com/svn/ and documented at https://code.google.com/p/datejs/wiki/APIDocumentation
+//That version of the library is more recent than the one provided at https://code.google.com/p/datejs/downloads/list, which has a slightly different API
+
+/// <reference path="sugarpak.d.ts" />
+
+/** Defines a structure to be used in the add and set instance methods */
+interface IDateJSLiteral {
+    milliseconds: number;
+    seconds: number;
+    minutes: number;
+    hours: number;
+    days: number;
+    months: number;
+    years: number;
+}
+
+/** DateJS Public Static Methods */
+interface DateConstructor {
+    /** Gets a date that is set to the current date. The time is set to the start of the day (00:00 or 12:00 AM) */
+    today(): Date;
+    /** Compares the first date to the second date and returns an number indication of their relative values. -1 = this is lessthan date. 0 = values are equal. 1 = this is greaterthan date. */
+    compare(date1: Date, date2: Date): number;
+    /** Compares the first Date object to the second Date object and returns true if they are equal. */
+    equals(date1: Date, date2?: Date): boolean;
+    /** Gets the day number (0-6) if given a culture-specific string which is a valid full or abbreviated day name. */
+    getDayNumberFromName(dayName: string): number;
+    /** Gets the month number (0-11) if given a culture-specific string which is a valid full or abbreviated month name. */
+    getMonthNumberFromName(monthName: string): number;
+    /** Returns true if the given year is a leap year, false otherwise. */
+    isLeapYear(year: number): boolean;
+    /** Gets the number of days in the month, given a year and month value. Automatically corrects for leap year. */
+    getDaysInMonth(year: number, month: number): number;
+    /** Returns a culture-specific timezone abbreviation based on a given offset and a boolean indicating whether daylight savings time is in effect. */
+    getTimezoneAbbreviation(timezoneOffset: number, isDayLightSavingsTime: boolean): string;
+    /** Gets the timezone offset if given a culture-specific string which is a valid full or abbreviated timezone name and a boolean indicating whether daylight savings time is in effect. */
+    getTimezoneOffset(timezoneAbbreviation?: string, isDayLightSavingsTime?: boolean): number;
+    /** Converts the specified string value into its JavaScript Date equivalent using culture-specific format information. */
+    parse(dateString: string): Date;
+    /** Converts the specified string value into its JavaScript Date equivalent using the specified format. The format of the string value must match one of the supplied formats exactly. */
+    parseExact(dateString: string, formatString: string): Date;
+    /** Converts the specified string value into its JavaScript Date equivalent using the specified formats (array). The format of the string value must match one of the supplied formats exactly. */
+    parseExact(dateString: string, formatArray: string[]): Date;
+    /** Validates the number is within an acceptable range for the days in a month [0-MaxDaysInMonth]. */
+    validateDay(day: number, fullYear: number, monthNumber: number): boolean;
+    /** Validates the number is within an acceptable range for hours[0 - 23].Returns true if within range, otherwise false. */
+    validateHour(hour: number): boolean;
+    /** Validates the number is within an acceptable range for milliseconds[0 - 999].Returns true if within range, otherwise false. */
+    validateMillisecond(milliseconds: number): boolean;
+    /** Validates the number is within an acceptable range for minutes[0 - 59].Returns true if within range, otherwise false. */
+    validateMinute(minutes: number): boolean;
+    /** Validates the number is within an acceptable range for months[0 - 11]. */
+    validateMonth(month: number): boolean;
+    /** Validates the number is within an acceptable range for seconds[0 - 59].Returns true if within range, otherwise false. */
+    validateSecond(second: number): boolean;
+    /** Validates the number is within an acceptable range for years[0 - 9999]. */
+    validateYear(year: number): boolean;
+}
+
+/** DateJS Public Instance Methods */
+interface Date {
+    /** Adds(or subtracts) to the value of the year, month, day, hour, minute, second, millisecond of the date instance using given configuration object. Positive and Negative values allowed. */
+    add(config?: IDateJSLiteral): Date;
+    /** Adds the specified number of milliseconds to this instance. */
+    addMilliseconds(milliseconds: number): Date;
+    /** Adds the specified number of seconds to this instance given the number of seconds to add.The number can be positive or negative. */
+    addSeconds(seconds: number): Date;
+    /** Adds the specified number of minutes to this instance given the number of minutes to add.The number can be positive or negative. */
+    addMinutes(minutes: number): Date;
+    /** Adds the specified number of hours to this instance given the number of hours to add.The number can be positive or negative. */
+    addHours(hours: number): Date;
+    /** Adds the specified number of days to this instance.The number can be positive or negative. */
+    addDays(days: number): Date;
+    /** Adds the specified number of weeks to this instance given the number of weeks to add.The number can be positive or negative. */
+    addWeeks(weeks: number): Date;
+    /** Adds the specified number of months to this instance given the number of months to add.The number can be positive or negative. */
+    addMonths(months: number): Date;
+    /** Adds the specified number of years to this instance given the number of years to add.The number can be positive or negative. */
+    addYears(years: number): Date;
+    /** Resets the time of this Date object to 12:00 AM(00:00), which is the start of the day. */
+    clearTime(): Date;
+    /** Resets the time of this Date object to the current time('now'). */
+    setTimeToNow(): Date;
+    /** Returns a new Date object that is an exact date and time copy of the original instance. */
+    clone(): Date;
+    /** Determines if this instance is between a range of two dates or equal to either the start or end dates. */
+    between(startDate: Date, endDate: Date): boolean;
+    /** Compares this instance to a Date object and returns an number indication of their relative values. -1 = this is lessthan date. 0 = values are equal. 1 = this is greaterthan date. */
+    compareTo(date: Date): number;
+    /** Compares this instance to another Date object and returns true if they are equal, otherwise false. */
+    equals(date: Date): boolean;
+    /** Determines if this date occurs after the date to compare to. */
+    isAfter(date: Date): boolean;
+    /** Determines if this date occurs before the date to compare to. */
+    isBefore(date: Date): boolean;
+    /** Determines if the current Date instance occurs on the same Date as the supplied 'date'. */
+    isToday(date: Date): boolean;
+    /** Returns the number of milliseconds between this date and date. */
+    getElapsed(date: Date): number;
+    /** Get the Ordinal day (numeric day number) of the year, adjusted for leap year. Returns 1 through 365 (366 in leap years) */
+    getOrdinalNumber(): number;
+    /** Get the timezone abbreviation of the current date. */
+    getTimezone(): string;
+    /** Get the offset from UTC of the current date. Returns the 4-character offset string prefixed with + or - (e.g. "-0500"). */
+    getUTCOffset(): string;
+    /** Get the week number. Week one (1) is the week which contains the first Thursday of the year. Monday is considered the first day of the week. */
+    getWeek(): number;
+    /** Get the ISO 8601 week number. Week one ("01") is the week which contains the first Thursday of the year. Monday is considered the first day of the week. */
+    getISOWeek(): string;
+    /** Moves the date to Monday of the week set. Week one (1) is the week which contains the first Thursday of the year. */
+    setWeek(week: number): Date;
+    /** Indicates whether Daylight Saving Time is observed in the current time zone. */
+    hasDaylightSavingTime(): boolean;
+    /** Indicates whether this Date instance is within the Daylight Saving Time range for the current time zone. */
+    isDaylightSavingTime(): boolean;
+	/** Move to the next or previous dayOfWeek. Whether to move into the future (+1) or past(-1) is controlled by the optional direction parameter. */
+    moveToDayOfWeek(dayOfWeek: number, direction: number): Date;
+    /** Moves the date to the first day of the month. */
+    moveToFirstDayOfMonth(): Date;
+    /** Moves the date to the last day of the month. */
+    moveToLastDayOfMonth(): Date;
+    /** Move to the next or previous month.Whether to move into the future(+1) or past(-1) is controlled by the optional direction parameter. */
+    moveToMonth(month: number, direction: number): Date;
+    /** Moves the date to the next nth occurrence of the dayOfWeek starting from the beginning of the month. The number (-1) is a magic number and will return the last occurrence of the dayOfWeek in the month. */
+    moveToNthOccurrence(dayOfWeek: number, occurrence: number): Date;
+    /** Set the value of year, month, day, hour, minute, second, millisecond of date instance using given configuration object. */
+    set(config: IDateJSLiteral): Date;
+    /** Set the timezone for the current date using a culture - specific timezone abbreviation("PST").Note that in most JavaScript implementations, this will appear to change the time since the timezone is always based on the locale. */
+    setTimezone(timezoneAbbreviation: string): Date;
+    /** Set the timezone for the current date using an offset(-0700).Note that in most JavaScript implementations, this will appear to change the time since the timezone is always based on the locale. */
+    setTimezoneOffset(timezoneOffset: number): Date;
+    /** Converts the current date instance into a string with an ISO 8601 format.The date is converted to it's UTC value. As per the ISO 8601 specification, the string will be wrapped with double quotation marks ("). */
+    toISOString(): string;
+    /** Converts the value of the current Date object to its equivalent string representation.Use format argument to specify format(optional).See FormatSpecifiers for more info. */
+    toString(format?: string): string;
+}
+
+
+//NOTE: IDateJSStatic and IDateJS are provided here solely for backwards compatability with previous versions of this particular definition file (datejs.d.ts.)
+//DO NOT use them in new code (and it is strongly suggested you remove their use in any existing code); simply use the Javascript Date class instead.
+interface IDateJS extends Date { }
+interface IDateJSStatic extends DateConstructor { }
\ No newline at end of file
diff --git a/datejs/tsconfig.json b/datejs/tsconfig.json
new file mode 100644
index 0000000000..dd8d5b85a3
--- /dev/null
+++ b/datejs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "datejs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dcjs/dc-1.6.0.d.ts b/dc/dc-1.6.0.d.ts
similarity index 98%
rename from dcjs/dc-1.6.0.d.ts
rename to dc/dc-1.6.0.d.ts
index cf410f1659..03b5e9039b 100644
--- a/dcjs/dc-1.6.0.d.ts
+++ b/dc/dc-1.6.0.d.ts
@@ -5,8 +5,8 @@
 
 // this makes only sense together with d3 and crossfilter so you need the d3.d.ts and crossfilter.d.ts files
 
-///<reference path="../d3/d3.d.ts" />
-///<reference path="../crossfilter/crossfilter.d.ts" />
+///<reference types="d3" />
+///<reference types="crossfilter" />
 
 
 
diff --git a/dcjs/dc-tests.ts b/dc/dc-tests.ts
similarity index 98%
rename from dcjs/dc-tests.ts
rename to dc/dc-tests.ts
index 91b1dc77d2..38ae18fe98 100644
--- a/dcjs/dc-tests.ts
+++ b/dc/dc-tests.ts
@@ -1,6 +1,5 @@
-///<reference path="../d3/d3.d.ts" />
-///<reference path="../crossfilter/crossfilter.d.ts" />
-///<reference path="dc.d.ts" />
+///<reference types="d3" />
+///<reference types="crossfilter" />
 
 interface IYelpData {
     city: string;
diff --git a/dc/index.d.ts b/dc/index.d.ts
new file mode 100644
index 0000000000..ffea80fa05
--- /dev/null
+++ b/dc/index.d.ts
@@ -0,0 +1,450 @@
+// Type definitions for DCJS
+// Project: https://github.com/dc-js/dc.js
+// Definitions by: hans windhoff <https://github.com/hansrwindhoff>, matt traynham <https://github.com/mtraynham>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// this makes only sense together with d3 and crossfilter so you need the d3.d.ts and crossfilter.d.ts files
+
+///<reference types="d3" />
+///<reference types="crossfilter" />
+
+declare namespace DC {
+    // helper for get/set situation
+    export interface IGetSet<T, V> {
+        (): T;
+        (t: T): V;
+    }
+
+    export interface IBiGetSet<T, R, V> {
+        (): T;
+        (t: T, r?: R): V;
+    }
+
+    export interface IGetSetComputed<T, R, V> {
+        (): R;
+        (t: T): V;
+    }
+
+    export interface Scale<T> {
+        (x: any): T;
+
+        domain(values: any[]): Scale<T>;
+        domain(): any[];
+
+        range(values: T[]): Scale<T>;
+        range(): T[];
+    }
+
+    export interface Accessor<T, V> {
+        (datum: T, index?: number): V;
+    }
+
+    export interface UnitFunction {
+        (start: number, end: number, domain?: Array<any>): number|Array<any>;
+    }
+
+    export interface FloatPointUnits {
+        precision(precision: number): UnitFunction;
+    }
+
+    export interface Units {
+        integers: UnitFunction;
+        ordinal: UnitFunction;
+        fp: FloatPointUnits;
+    }
+
+    export interface Events {
+        trigger(fn: () => void, delay?: number): void;
+    }
+
+    export interface Errors {
+        Exception(msg: string): void;
+        InvalidStateException(msg: string): void;
+    }
+
+    export interface Filter {
+        isFiltered(value: any): boolean;
+    }
+
+    export interface Filters {
+        RangedFilter(low: any, high: any): Filter;
+        TwoDimensionalFilter(arr: Array<any>): Filter;
+        RangedTwoDimensionalFilter(arr: Array<any>): Filter;
+    }
+
+    export interface Logger {
+        enableDebugLog: boolean;
+        warn(msg: string): void;
+        debug(msg: string): void;
+        deprecate(fn: Function, msg: string): void;
+    }
+
+    export interface Printers {
+        filters(filters: Array<any>): string;
+        filter(filter: any): string;
+    }
+
+    export interface Round {
+        floor(n: number): number;
+        ceil(n: number): number;
+        round(n: number): number;
+    }
+
+    export interface Utils {
+        printSingleValue(filter: any): string;
+        add(l: any, r: any): any;
+        subtract(l: any, r: any): any;
+        isNumber(n: any): boolean;
+        isFloat(n: any): boolean;
+        isInteger(n: any): boolean;
+        isNegligible(n: any): boolean;
+        clamp(n: number, min: number, max: number): number;
+        uniqueId(): number;
+        nameToId(name: string): string;
+        appendOrSelect(parent: d3.Selection<any>, selector: string, tag: any): d3.Selection<any>;
+        safeNumber(n: any): number;
+    }
+
+    export interface Legend {
+        x: IGetSet<number, number>;
+        y: IGetSet<number, number>;
+        gap: IGetSet<number, number>;
+        itemHeight: IGetSet<number, number>;
+        horizontal: IGetSet<boolean, boolean>;
+        legendWidth: IGetSet<number, number>;
+        itemWidth: IGetSet<number, number>;
+        autoItemWidth: IGetSet<boolean, boolean>;
+        render: () => void;
+    }
+
+    export interface BaseMixin<T> {
+        width: IGetSet<number, T>;
+        height: IGetSet<number, T>;
+        minWidth: IGetSet<number, T>;
+        minHeight: IGetSet<number, T>;
+        dimension: IGetSet<any, T>;
+        data: IGetSetComputed<(group: any) => Array<any>, Array<any>, T>;
+        group: IGetSet<any, T>;
+        ordering: IGetSet<Accessor<any, any>, T>;
+        filterAll(): void;
+        select(selector: d3.Selection<any>|string): d3.Selection<any>;
+        selectAll(selector: d3.Selection<any>|string): d3.Selection<any>;
+        anchor(anchor: BaseMixin<any>|d3.Selection<any>|string, chartGroup?: string): d3.Selection<any>;
+        anchorName(): string;
+        svg: IGetSet<d3.Selection<any>, d3.Selection<any>>;
+        resetSvg(): void;
+        filterPrinter: IGetSet<(filters: Array<any>) => string, T>;
+        turnOnControls(): void;
+        turnOffControls(): void;
+        transitionDuration: IGetSet<number, T>;
+        render(): void;
+        redraw(): void;
+        redrawGroup(): void;
+        hasFilterHandler: IGetSet<(filters: Array<any>, filter: any) => boolean, T>;
+        hasFilter(filter?: any): boolean;
+        removeFilterHandler: IGetSet<(filters: Array<any>) => Array<any>, T>;
+        addFilterHandler: IGetSet<(filters: Array<any>) => Array<any>, T>;
+        resetFilterHandler: IGetSet<(filters: Array<any>) => Array<any>, T>;
+        filter: IGetSet<any, T>;
+        filters(): Array<any>;
+        onClick(datum: any): void;
+        filterHandler: IGetSet<(dimension: any, filter: any) => any, T>;
+        keyAccessor: IGetSet<Accessor<any, any>, T>;
+        valueAccessor: IGetSet<Accessor<any, any>, T>;
+        label: IGetSet<Accessor<any, string>, T>;
+        renderLabel: IGetSet<boolean, T>;
+        title: IGetSet<Accessor<any, string>, T>;
+        renderTitle: IGetSet<boolean, T>;
+        chartGroup: IGetSet<string, T>;
+        expireCache(): T;
+        legend: IGetSet<Legend, T>;
+        options(optionsObject: any): T;
+        renderlet(fn: (chart: T) => any): T;
+        on(event: string, fn: (chart: T) => any): T;
+    }
+
+    export interface Margins {
+        left: number;
+        top: number;
+        right: number;
+        bottom: number;
+    }
+
+    export interface MarginMixin<T> {
+        margins: IGetSet<Margins, T>
+    }
+
+    export interface ColorMixin<T> {
+        colors: IGetSet<Array<string> | Scale<string | d3.Color>, T>;
+        ordinalColors(r: Array<string>): void;
+        linearColors(r: Array<string>): void;
+        colorAccessor: IGetSet<Accessor<any, string>, T>;
+        colorDomain: IGetSet<Array<any>, T>;
+        calculateColorDomain(): void;
+        getColor(datum: any, index?: number): string;
+        colorCalculator: IGetSet<Accessor<any, string>, T>;
+    }
+
+    export interface CoordinateGridMixin<T> extends BaseMixin<T>, MarginMixin<T>, ColorMixin<T> {
+        rangeChart: IGetSet<BaseMixin<any>, T>;
+        zoomScale: IGetSet<Array<any>, T>;
+        zoomOutRestrict: IGetSet<boolean, T>;
+        g: IGetSet<d3.Selection<any>, T>;
+        mouseZoomable: IGetSet<boolean, T>;
+        chartBodyG(): d3.Selection<any>;
+        x: IGetSet<(n: any) => any, T>;
+        xUnits: IGetSet<UnitFunction, T>;
+        xAxis: IGetSet<d3.svg.Axis, T>;
+        elasticX: IGetSet<boolean, T>;
+        xAxisPadding: IGetSet<number, T>;
+        xUnitCount(): number;
+        useRightYAxis: IGetSet<boolean, T>;
+        isOrdinal(): boolean;
+        xAxisLabel: IBiGetSet<string, number, T>;
+        yAxisLabel: IBiGetSet<string, number, T>;
+        y: IGetSet<Scale<number>, T>;
+        yAxis: IGetSet<d3.svg.Axis, T>;
+        elasticY: IGetSet<boolean, T>;
+        renderHorizontalGridLines: IGetSet<boolean, T>;
+        renderVerticalGridLines: IGetSet<boolean, T>;
+        xAxisMin(): any;
+        xAxisMax(): any;
+        yAxisMin(): any;
+        yAxisMax(): any;
+        yAxisPadding: IGetSet<number, T>;
+        round: IGetSet<(value: any) => any, T>;
+        clipPadding: IGetSet<number, T>;
+        focus(range?: Array<any>): void;
+        brushOn: IGetSet<boolean, T>;
+    }
+
+    export interface StackMixin<T> {
+        stack(group: any, name?: string, accessor?: Accessor<any, any>): void;
+        hidableStacks: IGetSet<boolean, T>;
+        hideStack(name: string): void;
+        showStack(name: string): void;
+        // title(stackName: string, titleFn: Accessor<any, T>);
+        stackLayout: IGetSet<d3.layout.Stack<any[], any>, T>;
+    }
+
+    export interface CapMixin<T> {
+        cap: IGetSet<number, T>;
+        othersLabel: IGetSet<string, T>;
+        othersGrouper: IGetSet<(data: Array<any>) => Array<any>, T>;
+    }
+
+    export interface BubbleMixin<T> extends ColorMixin<T> {
+        r: IGetSet<Scale<number>, T>;
+        radiusValueAccessor: IGetSet<Accessor<any, number>, T>;
+        minRadiusWithLabel: IGetSet<number, T>;
+        maxBubbleRelativeSize: IGetSet<number, T>;
+    }
+
+    export interface PieChart extends CapMixin<PieChart>, ColorMixin<PieChart>, BaseMixin<PieChart> {
+        slicesCap: IGetSet<number, PieChart>;
+        innerRadius: IGetSet<number, PieChart>;
+        radius: IGetSet<number, PieChart>;
+        cx: IGetSet<number, PieChart>;
+        cy: IGetSet<number, PieChart>;
+        minAngleForLabel: IGetSet<number, PieChart>;
+    }
+
+    export interface BarChart extends StackMixin<BarChart>, CoordinateGridMixin<BarChart> {
+        centerBar: IGetSet<boolean, BarChart>;
+        barPadding: IGetSet<number, BarChart>;
+        outerPadding: IGetSet<number, BarChart>;
+        gap: IGetSet<number, BarChart>;
+        alwaysUseRounding: IGetSet<boolean, BarChart>;
+    }
+
+    export interface RenderDataPointOptions {
+        fillOpacity: number;
+        strokeOpacity: number;
+        radius: number;
+    }
+
+    export interface LineChart extends StackMixin<LineChart>, CoordinateGridMixin<LineChart> {
+        interpolate: IGetSet<string, LineChart>;
+        tension: IGetSet<number, LineChart>;
+        defined: IGetSet<Accessor<any, boolean>, LineChart>;
+        dashStyle: IGetSet<Array<number>, LineChart>;
+        renderArea: IGetSet<boolean, LineChart>;
+        dotRadius: IGetSet<number, LineChart>;
+        renderDataPoints: IGetSet<RenderDataPointOptions|any, LineChart>;
+    }
+
+    export interface DataCountWidgetHTML {
+        all: string;
+        some: string;
+    }
+
+    export interface DataCountWidget extends BaseMixin<DataCountWidget> {
+        html: IGetSet<DataCountWidgetHTML, DataCountWidget>;
+        formatNumber: IGetSet<Accessor<number, string>, DataCountWidget>;
+    }
+
+    export interface DataTableWidget extends BaseMixin<DataTableWidget> {
+        size: IGetSet<number, DataTableWidget>;
+        columns: IGetSet<Array<Accessor<any, any>|string|Array<Accessor<any, any>|string>>, DataTableWidget>;
+        sortBy: IGetSet<Accessor<any, any>, DataTableWidget>;
+        order: IGetSet<(a: any, b: any) => number, DataTableWidget>;
+    }
+
+    export interface DataGridWidget extends BaseMixin<DataGridWidget> {
+        size: IGetSet<number, DataTableWidget>;
+        html: IGetSet<Accessor<any, string>, DataTableWidget>;
+        htmlGroup: IGetSet<Accessor<any, string>, DataTableWidget>;
+        sortBy: IGetSet<Accessor<any, any>, DataTableWidget>;
+        order: IGetSet<(a: any, b: any) => number, DataTableWidget>;
+    }
+
+    export interface BubbleChart extends BubbleMixin<BubbleChart>, CoordinateGridMixin<BubbleChart> {
+        elasticRadius: IGetSet<boolean, BubbleChart>;
+    }
+
+    export interface ICompositeChart<T> extends CoordinateGridMixin<T> {
+        useRightAxisGridLines: IGetSet<boolean, ICompositeChart<T>>;
+        childOptions: IGetSet<any, ICompositeChart<T>>;
+        rightYAxisLabel: IGetSet<string, ICompositeChart<T>>;
+        compose: IGetSet<Array<BaseMixin<any>>, ICompositeChart<T>>;
+        children(): Array<BaseMixin<any>>;
+        shareColors: IGetSet<boolean, ICompositeChart<T>>;
+        shareTitle: IGetSet<boolean, ICompositeChart<T>>;
+        rightY: IGetSet<(n: any) => any, ICompositeChart<T>>;
+        rightYAxis: IGetSet<d3.svg.Axis, ICompositeChart<T>>;
+    }
+
+    export interface CompositeChart extends ICompositeChart<CompositeChart> {}
+
+    export interface SeriesChart extends ICompositeChart<SeriesChart> {
+        chart: IGetSet<(c: any) => BaseMixin<any>, SeriesChart>;
+        seriesAccessor: IGetSet<Accessor<any, any>, SeriesChart>;
+        seriesSort: IGetSet<(a: any, b: any) => number, SeriesChart>;
+        valueSort: IGetSet<(a: any, b: any) => number, SeriesChart>;
+    }
+
+    export interface GeoChoroplethLayer {
+        name: string;
+        keyAccessor: Accessor<any, any>;
+        data: any;
+    }
+
+    export interface GeoChoroplethChart extends ColorMixin<GeoChoroplethChart>, BaseMixin<GeoChoroplethChart> {
+        overlayGeoJson(json: any, name: string, keyAccessor: Accessor<any, any>): void;
+        projection: IGetSet<d3.geo.Projection, GeoChoroplethChart>;
+        geoJsons(): Array<GeoChoroplethLayer>;
+        geoPath(): d3.geo.Path;
+        removeGeoJson(name: string): void;
+    }
+
+    export interface BubbleOverlayChart extends BubbleMixin<BubbleOverlayChart>, BaseMixin<BubbleOverlayChart> {
+        point(name: string, x: number, y: number): void;
+    }
+
+    export interface RowChart extends CapMixin<RowChart>, MarginMixin<RowChart>, ColorMixin<RowChart>, BaseMixin<RowChart> {
+        x: IGetSet<Scale<number>, RowChart>;
+        renderTitleLabel: IGetSet<boolean, RowChart>;
+        xAxis: IGetSet<d3.svg.Axis, RowChart>;
+        fixedBarHeight: IGetSet<number, RowChart>;
+        gap: IGetSet<number, RowChart>;
+        elasticX: IGetSet<boolean, RowChart>;
+        labelOffsetX: IGetSet<number, RowChart>;
+        labelOffsetY: IGetSet<number, RowChart>;
+        titleLabelOffsetX: IGetSet<number, RowChart>;
+    }
+
+    export interface ScatterPlot extends CoordinateGridMixin<ScatterPlot> {
+        existenceAccessor: IGetSet<Accessor<any, boolean>, ScatterPlot>;
+        symbol: IGetSet<d3.svg.Symbol<any>, ScatterPlot>;
+        symbolSize: IGetSet<number, ScatterPlot>;
+        highlightedSize: IGetSet<number, ScatterPlot>;
+        hiddenSize: IGetSet<number, ScatterPlot>;
+    }
+
+    export interface NumberDisplayWidgetHTML {
+        one: string;
+        some: string;
+        none: string;
+    }
+
+    export interface NumberDisplayWidget extends BaseMixin<NumberDisplayWidget> {
+        html: IGetSet<NumberDisplayWidgetHTML, NumberDisplayWidget>;
+        value(): string;
+        formatNumber: IGetSet<Accessor<number, string>, NumberDisplayWidget>;
+    }
+
+    export interface HeatMap extends ColorMixin<HeatMap>, MarginMixin<HeatMap>, BaseMixin<HeatMap> {
+        colsLabel: IGetSet<Accessor<any, string>, HeatMap>;
+        rowsLabel: IGetSet<Accessor<any, string>, HeatMap>;
+        rows: IGetSet<Array<any>, HeatMap>;
+        cols: IGetSet<Array<any>, HeatMap>;
+        boxOnClick: IGetSet<(d: any) => void, HeatMap>;
+        xAxisOnClick: IGetSet<(d: any) => void, HeatMap>;
+        yAxisOnClick: IGetSet<(d: any) => void, HeatMap>;
+    }
+
+    export interface BoxPlot extends CoordinateGridMixin<BoxPlot> {
+        boxPadding: IGetSet<number, BoxPlot>;
+        outerPadding: IGetSet<number, BoxPlot>;
+        boxWidth: IGetSet<number, BoxPlot>;
+        tickFormat: IGetSet<Accessor<number, string>, BoxPlot>;
+    }
+
+    export interface ChartRegistry {
+        has(chart: BaseMixin<any>): boolean;
+        register(chart: BaseMixin<any>, group?: string): void;
+        deregister(chart: BaseMixin<any>, group?: string): void;
+        clear(group?: string): void;
+        list(group?: string): Array<BaseMixin<any>>;
+    }
+
+    export interface Base {
+        chartRegistry: ChartRegistry;
+        registerChart(chart: BaseMixin<any>, group?: string): void;
+        deregisterChart(chart: BaseMixin<any>, group?: string): void;
+        hasChart(chart: BaseMixin<any>): boolean;
+        deregisterAllCharts(group?: string): void;
+        filterAll(group?: string): void;
+        refocusAll(group?: string): void;
+        renderAll(group?: string): void;
+        redrawAll(group?: string): void;
+        disableTransitions: boolean;
+        transition(selections: d3.Selection<any>, duration: number, callback: (s: d3.Selection<any>) => void): void;
+
+        units: Units;
+        events: Events;
+        errors: Errors;
+        instanceOfChart(object: any): boolean;
+        logger: Logger;
+        override(object: any, fnName: string, newFn: Function): void;
+        printers: Printers;
+        pluck(n: string, f?: Accessor<any, any>): Accessor<any, any>;
+        round: Round;
+        utils: Utils;
+
+        legend(): Legend;
+
+        pieChart(parent: string, chartGroup?: string): PieChart;
+        barChart(parent: string, chartGroup?: string): BarChart;
+        lineChart(parent: string, chartGroup?: string): LineChart;
+        dataCount(parent: string, chartGroup?: string): DataCountWidget;
+        dataTable(parent: string, chartGroup?: string): DataTableWidget;
+        dataGrid(parent: string, chartGroup?: string): DataGridWidget;
+        bubbleChart(parent: string, chartGroup?: string): BubbleChart;
+        compositeChart(parent: string, chartGroup?: string): CompositeChart;
+        seriesChart(parent: string, chartGroup?: string): SeriesChart;
+        geoChoroplethChart(parent: string, chartGroup?: string): GeoChoroplethChart;
+        bubbleOverlayChart(parent: string, chartGroup?: string): BubbleOverlayChart;
+        rowChart(parent: string, chartGroup?: string): RowChart;
+        scatterPlot(parent: string, chartGroup?: string): ScatterPlot;
+        numberDisplay(parent: string, chartGroup?: string): NumberDisplayWidget;
+        heatMap(parent: string, chartGroup?: string): HeatMap;
+        boxPlot(parent: string, chartGroup?: string): BoxPlot;
+    }
+}
+
+declare var dc: DC.Base;
+
+declare module 'dc' {
+    export = dc;
+}
diff --git a/dc/tsconfig.json b/dc/tsconfig.json
new file mode 100644
index 0000000000..ebca68dc72
--- /dev/null
+++ b/dc/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "dc-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/dcjs/dc.d.ts b/dcjs/dc.d.ts
deleted file mode 100644
index afb8cc06c2..0000000000
--- a/dcjs/dc.d.ts
+++ /dev/null
@@ -1,450 +0,0 @@
-// Type definitions for DCJS
-// Project: https://github.com/dc-js/dc.js
-// Definitions by: hans windhoff <https://github.com/hansrwindhoff>, matt traynham <https://github.com/mtraynham>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// this makes only sense together with d3 and crossfilter so you need the d3.d.ts and crossfilter.d.ts files
-
-///<reference path="../d3/d3.d.ts" />
-///<reference path="../crossfilter/crossfilter.d.ts" />
-
-declare namespace DC {
-    // helper for get/set situation
-    export interface IGetSet<T, V> {
-        (): T;
-        (t: T): V;
-    }
-
-    export interface IBiGetSet<T, R, V> {
-        (): T;
-        (t: T, r?: R): V;
-    }
-
-    export interface IGetSetComputed<T, R, V> {
-        (): R;
-        (t: T): V;
-    }
-
-    export interface Scale<T> {
-        (x: any): T;
-
-        domain(values: any[]): Scale<T>;
-        domain(): any[];
-
-        range(values: T[]): Scale<T>;
-        range(): T[];
-    }
-
-    export interface Accessor<T, V> {
-        (datum: T, index?: number): V;
-    }
-
-    export interface UnitFunction {
-        (start: number, end: number, domain?: Array<any>): number|Array<any>;
-    }
-
-    export interface FloatPointUnits {
-        precision(precision: number): UnitFunction;
-    }
-
-    export interface Units {
-        integers: UnitFunction;
-        ordinal: UnitFunction;
-        fp: FloatPointUnits;
-    }
-
-    export interface Events {
-        trigger(fn: () => void, delay?: number): void;
-    }
-
-    export interface Errors {
-        Exception(msg: string): void;
-        InvalidStateException(msg: string): void;
-    }
-
-    export interface Filter {
-        isFiltered(value: any): boolean;
-    }
-
-    export interface Filters {
-        RangedFilter(low: any, high: any): Filter;
-        TwoDimensionalFilter(arr: Array<any>): Filter;
-        RangedTwoDimensionalFilter(arr: Array<any>): Filter;
-    }
-
-    export interface Logger {
-        enableDebugLog: boolean;
-        warn(msg: string): void;
-        debug(msg: string): void;
-        deprecate(fn: Function, msg: string): void;
-    }
-
-    export interface Printers {
-        filters(filters: Array<any>): string;
-        filter(filter: any): string;
-    }
-
-    export interface Round {
-        floor(n: number): number;
-        ceil(n: number): number;
-        round(n: number): number;
-    }
-
-    export interface Utils {
-        printSingleValue(filter: any): string;
-        add(l: any, r: any): any;
-        subtract(l: any, r: any): any;
-        isNumber(n: any): boolean;
-        isFloat(n: any): boolean;
-        isInteger(n: any): boolean;
-        isNegligible(n: any): boolean;
-        clamp(n: number, min: number, max: number): number;
-        uniqueId(): number;
-        nameToId(name: string): string;
-        appendOrSelect(parent: d3.Selection<any>, selector: string, tag: any): d3.Selection<any>;
-        safeNumber(n: any): number;
-    }
-
-    export interface Legend {
-        x: IGetSet<number, number>;
-        y: IGetSet<number, number>;
-        gap: IGetSet<number, number>;
-        itemHeight: IGetSet<number, number>;
-        horizontal: IGetSet<boolean, boolean>;
-        legendWidth: IGetSet<number, number>;
-        itemWidth: IGetSet<number, number>;
-        autoItemWidth: IGetSet<boolean, boolean>;
-        render: () => void;
-    }
-
-    export interface BaseMixin<T> {
-        width: IGetSet<number, T>;
-        height: IGetSet<number, T>;
-        minWidth: IGetSet<number, T>;
-        minHeight: IGetSet<number, T>;
-        dimension: IGetSet<any, T>;
-        data: IGetSetComputed<(group: any) => Array<any>, Array<any>, T>;
-        group: IGetSet<any, T>;
-        ordering: IGetSet<Accessor<any, any>, T>;
-        filterAll(): void;
-        select(selector: d3.Selection<any>|string): d3.Selection<any>;
-        selectAll(selector: d3.Selection<any>|string): d3.Selection<any>;
-        anchor(anchor: BaseMixin<any>|d3.Selection<any>|string, chartGroup?: string): d3.Selection<any>;
-        anchorName(): string;
-        svg: IGetSet<d3.Selection<any>, d3.Selection<any>>;
-        resetSvg(): void;
-        filterPrinter: IGetSet<(filters: Array<any>) => string, T>;
-        turnOnControls(): void;
-        turnOffControls(): void;
-        transitionDuration: IGetSet<number, T>;
-        render(): void;
-        redraw(): void;
-        redrawGroup(): void;
-        hasFilterHandler: IGetSet<(filters: Array<any>, filter: any) => boolean, T>;
-        hasFilter(filter?: any): boolean;
-        removeFilterHandler: IGetSet<(filters: Array<any>) => Array<any>, T>;
-        addFilterHandler: IGetSet<(filters: Array<any>) => Array<any>, T>;
-        resetFilterHandler: IGetSet<(filters: Array<any>) => Array<any>, T>;
-        filter: IGetSet<any, T>;
-        filters(): Array<any>;
-        onClick(datum: any): void;
-        filterHandler: IGetSet<(dimension: any, filter: any) => any, T>;
-        keyAccessor: IGetSet<Accessor<any, any>, T>;
-        valueAccessor: IGetSet<Accessor<any, any>, T>;
-        label: IGetSet<Accessor<any, string>, T>;
-        renderLabel: IGetSet<boolean, T>;
-        title: IGetSet<Accessor<any, string>, T>;
-        renderTitle: IGetSet<boolean, T>;
-        chartGroup: IGetSet<string, T>;
-        expireCache(): T;
-        legend: IGetSet<Legend, T>;
-        options(optionsObject: any): T;
-        renderlet(fn: (chart: T) => any): T;
-        on(event: string, fn: (chart: T) => any): T;
-    }
-
-    export interface Margins {
-        left: number;
-        top: number;
-        right: number;
-        bottom: number;
-    }
-
-    export interface MarginMixin<T> {
-        margins: IGetSet<Margins, T>
-    }
-
-    export interface ColorMixin<T> {
-        colors: IGetSet<Array<string> | Scale<string | d3.Color>, T>;
-        ordinalColors(r: Array<string>): void;
-        linearColors(r: Array<string>): void;
-        colorAccessor: IGetSet<Accessor<any, string>, T>;
-        colorDomain: IGetSet<Array<any>, T>;
-        calculateColorDomain(): void;
-        getColor(datum: any, index?: number): string;
-        colorCalculator: IGetSet<Accessor<any, string>, T>;
-    }
-
-    export interface CoordinateGridMixin<T> extends BaseMixin<T>, MarginMixin<T>, ColorMixin<T> {
-        rangeChart: IGetSet<BaseMixin<any>, T>;
-        zoomScale: IGetSet<Array<any>, T>;
-        zoomOutRestrict: IGetSet<boolean, T>;
-        g: IGetSet<d3.Selection<any>, T>;
-        mouseZoomable: IGetSet<boolean, T>;
-        chartBodyG(): d3.Selection<any>;
-        x: IGetSet<(n: any) => any, T>;
-        xUnits: IGetSet<UnitFunction, T>;
-        xAxis: IGetSet<d3.svg.Axis, T>;
-        elasticX: IGetSet<boolean, T>;
-        xAxisPadding: IGetSet<number, T>;
-        xUnitCount(): number;
-        useRightYAxis: IGetSet<boolean, T>;
-        isOrdinal(): boolean;
-        xAxisLabel: IBiGetSet<string, number, T>;
-        yAxisLabel: IBiGetSet<string, number, T>;
-        y: IGetSet<Scale<number>, T>;
-        yAxis: IGetSet<d3.svg.Axis, T>;
-        elasticY: IGetSet<boolean, T>;
-        renderHorizontalGridLines: IGetSet<boolean, T>;
-        renderVerticalGridLines: IGetSet<boolean, T>;
-        xAxisMin(): any;
-        xAxisMax(): any;
-        yAxisMin(): any;
-        yAxisMax(): any;
-        yAxisPadding: IGetSet<number, T>;
-        round: IGetSet<(value: any) => any, T>;
-        clipPadding: IGetSet<number, T>;
-        focus(range?: Array<any>): void;
-        brushOn: IGetSet<boolean, T>;
-    }
-
-    export interface StackMixin<T> {
-        stack(group: any, name?: string, accessor?: Accessor<any, any>): void;
-        hidableStacks: IGetSet<boolean, T>;
-        hideStack(name: string): void;
-        showStack(name: string): void;
-        // title(stackName: string, titleFn: Accessor<any, T>);
-        stackLayout: IGetSet<d3.layout.Stack<any[], any>, T>;
-    }
-
-    export interface CapMixin<T> {
-        cap: IGetSet<number, T>;
-        othersLabel: IGetSet<string, T>;
-        othersGrouper: IGetSet<(data: Array<any>) => Array<any>, T>;
-    }
-
-    export interface BubbleMixin<T> extends ColorMixin<T> {
-        r: IGetSet<Scale<number>, T>;
-        radiusValueAccessor: IGetSet<Accessor<any, number>, T>;
-        minRadiusWithLabel: IGetSet<number, T>;
-        maxBubbleRelativeSize: IGetSet<number, T>;
-    }
-
-    export interface PieChart extends CapMixin<PieChart>, ColorMixin<PieChart>, BaseMixin<PieChart> {
-        slicesCap: IGetSet<number, PieChart>;
-        innerRadius: IGetSet<number, PieChart>;
-        radius: IGetSet<number, PieChart>;
-        cx: IGetSet<number, PieChart>;
-        cy: IGetSet<number, PieChart>;
-        minAngleForLabel: IGetSet<number, PieChart>;
-    }
-
-    export interface BarChart extends StackMixin<BarChart>, CoordinateGridMixin<BarChart> {
-        centerBar: IGetSet<boolean, BarChart>;
-        barPadding: IGetSet<number, BarChart>;
-        outerPadding: IGetSet<number, BarChart>;
-        gap: IGetSet<number, BarChart>;
-        alwaysUseRounding: IGetSet<boolean, BarChart>;
-    }
-
-    export interface RenderDataPointOptions {
-        fillOpacity: number;
-        strokeOpacity: number;
-        radius: number;
-    }
-
-    export interface LineChart extends StackMixin<LineChart>, CoordinateGridMixin<LineChart> {
-        interpolate: IGetSet<string, LineChart>;
-        tension: IGetSet<number, LineChart>;
-        defined: IGetSet<Accessor<any, boolean>, LineChart>;
-        dashStyle: IGetSet<Array<number>, LineChart>;
-        renderArea: IGetSet<boolean, LineChart>;
-        dotRadius: IGetSet<number, LineChart>;
-        renderDataPoints: IGetSet<RenderDataPointOptions|any, LineChart>;
-    }
-
-    export interface DataCountWidgetHTML {
-        all: string;
-        some: string;
-    }
-
-    export interface DataCountWidget extends BaseMixin<DataCountWidget> {
-        html: IGetSet<DataCountWidgetHTML, DataCountWidget>;
-        formatNumber: IGetSet<Accessor<number, string>, DataCountWidget>;
-    }
-
-    export interface DataTableWidget extends BaseMixin<DataTableWidget> {
-        size: IGetSet<number, DataTableWidget>;
-        columns: IGetSet<Array<Accessor<any, any>|string|Array<Accessor<any, any>|string>>, DataTableWidget>;
-        sortBy: IGetSet<Accessor<any, any>, DataTableWidget>;
-        order: IGetSet<(a: any, b: any) => number, DataTableWidget>;
-    }
-
-    export interface DataGridWidget extends BaseMixin<DataGridWidget> {
-        size: IGetSet<number, DataTableWidget>;
-        html: IGetSet<Accessor<any, string>, DataTableWidget>;
-        htmlGroup: IGetSet<Accessor<any, string>, DataTableWidget>;
-        sortBy: IGetSet<Accessor<any, any>, DataTableWidget>;
-        order: IGetSet<(a: any, b: any) => number, DataTableWidget>;
-    }
-
-    export interface BubbleChart extends BubbleMixin<BubbleChart>, CoordinateGridMixin<BubbleChart> {
-        elasticRadius: IGetSet<boolean, BubbleChart>;
-    }
-
-    export interface ICompositeChart<T> extends CoordinateGridMixin<T> {
-        useRightAxisGridLines: IGetSet<boolean, ICompositeChart<T>>;
-        childOptions: IGetSet<any, ICompositeChart<T>>;
-        rightYAxisLabel: IGetSet<string, ICompositeChart<T>>;
-        compose: IGetSet<Array<BaseMixin<any>>, ICompositeChart<T>>;
-        children(): Array<BaseMixin<any>>;
-        shareColors: IGetSet<boolean, ICompositeChart<T>>;
-        shareTitle: IGetSet<boolean, ICompositeChart<T>>;
-        rightY: IGetSet<(n: any) => any, ICompositeChart<T>>;
-        rightYAxis: IGetSet<d3.svg.Axis, ICompositeChart<T>>;
-    }
-
-    export interface CompositeChart extends ICompositeChart<CompositeChart> {}
-
-    export interface SeriesChart extends ICompositeChart<SeriesChart> {
-        chart: IGetSet<(c: any) => BaseMixin<any>, SeriesChart>;
-        seriesAccessor: IGetSet<Accessor<any, any>, SeriesChart>;
-        seriesSort: IGetSet<(a: any, b: any) => number, SeriesChart>;
-        valueSort: IGetSet<(a: any, b: any) => number, SeriesChart>;
-    }
-
-    export interface GeoChoroplethLayer {
-        name: string;
-        keyAccessor: Accessor<any, any>;
-        data: any;
-    }
-
-    export interface GeoChoroplethChart extends ColorMixin<GeoChoroplethChart>, BaseMixin<GeoChoroplethChart> {
-        overlayGeoJson(json: any, name: string, keyAccessor: Accessor<any, any>): void;
-        projection: IGetSet<d3.geo.Projection, GeoChoroplethChart>;
-        geoJsons(): Array<GeoChoroplethLayer>;
-        geoPath(): d3.geo.Path;
-        removeGeoJson(name: string): void;
-    }
-
-    export interface BubbleOverlayChart extends BubbleMixin<BubbleOverlayChart>, BaseMixin<BubbleOverlayChart> {
-        point(name: string, x: number, y: number): void;
-    }
-
-    export interface RowChart extends CapMixin<RowChart>, MarginMixin<RowChart>, ColorMixin<RowChart>, BaseMixin<RowChart> {
-        x: IGetSet<Scale<number>, RowChart>;
-        renderTitleLabel: IGetSet<boolean, RowChart>;
-        xAxis: IGetSet<d3.svg.Axis, RowChart>;
-        fixedBarHeight: IGetSet<number, RowChart>;
-        gap: IGetSet<number, RowChart>;
-        elasticX: IGetSet<boolean, RowChart>;
-        labelOffsetX: IGetSet<number, RowChart>;
-        labelOffsetY: IGetSet<number, RowChart>;
-        titleLabelOffsetX: IGetSet<number, RowChart>;
-    }
-
-    export interface ScatterPlot extends CoordinateGridMixin<ScatterPlot> {
-        existenceAccessor: IGetSet<Accessor<any, boolean>, ScatterPlot>;
-        symbol: IGetSet<d3.svg.Symbol<any>, ScatterPlot>;
-        symbolSize: IGetSet<number, ScatterPlot>;
-        highlightedSize: IGetSet<number, ScatterPlot>;
-        hiddenSize: IGetSet<number, ScatterPlot>;
-    }
-
-    export interface NumberDisplayWidgetHTML {
-        one: string;
-        some: string;
-        none: string;
-    }
-
-    export interface NumberDisplayWidget extends BaseMixin<NumberDisplayWidget> {
-        html: IGetSet<NumberDisplayWidgetHTML, NumberDisplayWidget>;
-        value(): string;
-        formatNumber: IGetSet<Accessor<number, string>, NumberDisplayWidget>;
-    }
-
-    export interface HeatMap extends ColorMixin<HeatMap>, MarginMixin<HeatMap>, BaseMixin<HeatMap> {
-        colsLabel: IGetSet<Accessor<any, string>, HeatMap>;
-        rowsLabel: IGetSet<Accessor<any, string>, HeatMap>;
-        rows: IGetSet<Array<any>, HeatMap>;
-        cols: IGetSet<Array<any>, HeatMap>;
-        boxOnClick: IGetSet<(d: any) => void, HeatMap>;
-        xAxisOnClick: IGetSet<(d: any) => void, HeatMap>;
-        yAxisOnClick: IGetSet<(d: any) => void, HeatMap>;
-    }
-
-    export interface BoxPlot extends CoordinateGridMixin<BoxPlot> {
-        boxPadding: IGetSet<number, BoxPlot>;
-        outerPadding: IGetSet<number, BoxPlot>;
-        boxWidth: IGetSet<number, BoxPlot>;
-        tickFormat: IGetSet<Accessor<number, string>, BoxPlot>;
-    }
-
-    export interface ChartRegistry {
-        has(chart: BaseMixin<any>): boolean;
-        register(chart: BaseMixin<any>, group?: string): void;
-        deregister(chart: BaseMixin<any>, group?: string): void;
-        clear(group?: string): void;
-        list(group?: string): Array<BaseMixin<any>>;
-    }
-
-    export interface Base {
-        chartRegistry: ChartRegistry;
-        registerChart(chart: BaseMixin<any>, group?: string): void;
-        deregisterChart(chart: BaseMixin<any>, group?: string): void;
-        hasChart(chart: BaseMixin<any>): boolean;
-        deregisterAllCharts(group?: string): void;
-        filterAll(group?: string): void;
-        refocusAll(group?: string): void;
-        renderAll(group?: string): void;
-        redrawAll(group?: string): void;
-        disableTransitions: boolean;
-        transition(selections: d3.Selection<any>, duration: number, callback: (s: d3.Selection<any>) => void): void;
-
-        units: Units;
-        events: Events;
-        errors: Errors;
-        instanceOfChart(object: any): boolean;
-        logger: Logger;
-        override(object: any, fnName: string, newFn: Function): void;
-        printers: Printers;
-        pluck(n: string, f?: Accessor<any, any>): Accessor<any, any>;
-        round: Round;
-        utils: Utils;
-
-        legend(): Legend;
-
-        pieChart(parent: string, chartGroup?: string): PieChart;
-        barChart(parent: string, chartGroup?: string): BarChart;
-        lineChart(parent: string, chartGroup?: string): LineChart;
-        dataCount(parent: string, chartGroup?: string): DataCountWidget;
-        dataTable(parent: string, chartGroup?: string): DataTableWidget;
-        dataGrid(parent: string, chartGroup?: string): DataGridWidget;
-        bubbleChart(parent: string, chartGroup?: string): BubbleChart;
-        compositeChart(parent: string, chartGroup?: string): CompositeChart;
-        seriesChart(parent: string, chartGroup?: string): SeriesChart;
-        geoChoroplethChart(parent: string, chartGroup?: string): GeoChoroplethChart;
-        bubbleOverlayChart(parent: string, chartGroup?: string): BubbleOverlayChart;
-        rowChart(parent: string, chartGroup?: string): RowChart;
-        scatterPlot(parent: string, chartGroup?: string): ScatterPlot;
-        numberDisplay(parent: string, chartGroup?: string): NumberDisplayWidget;
-        heatMap(parent: string, chartGroup?: string): HeatMap;
-        boxPlot(parent: string, chartGroup?: string): BoxPlot;
-    }
-}
-
-declare var dc: DC.Base;
-
-declare module 'dc' {
-    export = dc;
-}
diff --git a/debounce/debounce-tests.ts b/debounce/debounce-tests.ts
index 947fbcdae5..14d7cab190 100644
--- a/debounce/debounce-tests.ts
+++ b/debounce/debounce-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="debounce.d.ts" />
 
 import debounce from "debounce";
 
diff --git a/debounce/debounce.d.ts b/debounce/debounce.d.ts
deleted file mode 100644
index 7aa24601a7..0000000000
--- a/debounce/debounce.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Type definitions for compose-function
-// Project: https://github.com/component/debounce
-// Definitions by: Denis Sokolov <https://github.com/denis-sokolov>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "debounce" {
-	// Overload on boolean constants would allow us to narrow further,
-	// but it is not implemented for TypeScript yet
-	function f<A extends Function>(f: A, interval?: number, immediate?: boolean): A
-	export default f;
-}
diff --git a/debounce/index.d.ts b/debounce/index.d.ts
new file mode 100644
index 0000000000..43b1630689
--- /dev/null
+++ b/debounce/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for compose-function
+// Project: https://github.com/component/debounce
+// Definitions by: Denis Sokolov <https://github.com/denis-sokolov>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+// Overload on boolean constants would allow us to narrow further,
+// but it is not implemented for TypeScript yet
+declare function f<A extends Function>(f: A, interval?: number, immediate?: boolean): A
+export default f;
diff --git a/debounce/tsconfig.json b/debounce/tsconfig.json
new file mode 100644
index 0000000000..e3c287ecb9
--- /dev/null
+++ b/debounce/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "debounce-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/debug/debug-tests.ts b/debug/debug-tests.ts
index a264003409..fc8d3c5e56 100644
--- a/debug/debug-tests.ts
+++ b/debug/debug-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="debug.d.ts" />
+
 
 import debug = require("debug");
 
diff --git a/debug/debug.d.ts b/debug/debug.d.ts
deleted file mode 100644
index 80d7fc30c4..0000000000
--- a/debug/debug.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// Type definitions for debug
-// Project: https://github.com/visionmedia/debug
-// Definitions by: Seon-Wook Park <https://github.com/swook>, Gal Talmor <https://github.com/galtalmor>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare var debug: debug.IDebug;
-
-// Support AMD require
-declare module 'debug' {
-    export = debug;
-}
-
-declare namespace debug {
-    export interface IDebug {
-        (namespace: string): debug.IDebugger,
-        coerce: (val: any) => any,
-        disable: () => void,
-        enable: (namespaces: string) => void,
-        enabled: (namespaces: string) => boolean,
-
-        names: string[],
-        skips: string[],
-
-        formatters: IFormatters
-    }
-
-    export interface IFormatters {
-        [formatter: string]: Function
-    }
-
-    export interface IDebugger {
-        (formatter: any, ...args: any[]): void;
-
-        enabled: boolean;
-        log: Function;
-        namespace: string;
-    }
-}
diff --git a/debug/index.d.ts b/debug/index.d.ts
new file mode 100644
index 0000000000..45d3ad02f3
--- /dev/null
+++ b/debug/index.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for debug
+// Project: https://github.com/visionmedia/debug
+// Definitions by: Seon-Wook Park <https://github.com/swook>, Gal Talmor <https://github.com/galtalmor>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var debug: debug.IDebug;
+
+export = debug;
+export as namespace debug;
+
+declare namespace debug {
+    export interface IDebug {
+        (namespace: string): debug.IDebugger,
+        coerce: (val: any) => any,
+        disable: () => void,
+        enable: (namespaces: string) => void,
+        enabled: (namespaces: string) => boolean,
+
+        names: string[],
+        skips: string[],
+
+        formatters: IFormatters
+    }
+
+    export interface IFormatters {
+        [formatter: string]: Function
+    }
+
+    export interface IDebugger {
+        (formatter: any, ...args: any[]): void;
+
+        enabled: boolean;
+        log: Function;
+        namespace: string;
+    }
+}
diff --git a/debug/tsconfig.json b/debug/tsconfig.json
new file mode 100644
index 0000000000..e4ef6fe090
--- /dev/null
+++ b/debug/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "debug-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/decamelize/decamelize-tests.ts b/decamelize/decamelize-tests.ts
index a4019ad42e..af35c41943 100644
--- a/decamelize/decamelize-tests.ts
+++ b/decamelize/decamelize-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./decamelize.d.ts" />
 
 import decamelize = require('decamelize');
 
diff --git a/decamelize/decamelize.d.ts b/decamelize/decamelize.d.ts
deleted file mode 100644
index 2209d1e856..0000000000
--- a/decamelize/decamelize.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Type definitions for decamelize
-// Project: https://github.com/sindresorhus/decamelize
-// Definitions by: Sam Verschueren <https://github.com/samverschueren>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "decamelize" {
-	function decamelize(input: string, separator?: string): string;
-	namespace decamelize {}
-	export = decamelize;
-}
\ No newline at end of file
diff --git a/decamelize/index.d.ts b/decamelize/index.d.ts
new file mode 100644
index 0000000000..5ee1f76f35
--- /dev/null
+++ b/decamelize/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for decamelize
+// Project: https://github.com/sindresorhus/decamelize
+// Definitions by: Sam Verschueren <https://github.com/samverschueren>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function decamelize(input: string, separator?: string): string;
+declare namespace decamelize { }
+export = decamelize;
diff --git a/decamelize/tsconfig.json b/decamelize/tsconfig.json
new file mode 100644
index 0000000000..8a2b0a4b91
--- /dev/null
+++ b/decamelize/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "decamelize-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/decimal.js/decimal.js-tests.ts b/decimal.js/decimal.js-tests.ts
index b151380d51..f05434a72f 100644
--- a/decimal.js/decimal.js-tests.ts
+++ b/decimal.js/decimal.js-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="decimal.js.d.ts" />
+
 var x = new Decimal(9)
 var y = new Decimal(x)
 
diff --git a/decimal.js/decimal.js.d.ts b/decimal.js/index.d.ts
similarity index 100%
rename from decimal.js/decimal.js.d.ts
rename to decimal.js/index.d.ts
diff --git a/decimal.js/tsconfig.json b/decimal.js/tsconfig.json
new file mode 100644
index 0000000000..3080ae8390
--- /dev/null
+++ b/decimal.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "decimal.js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/decorum/decorum-tests.ts b/decorum/decorum-tests.ts
index 4a51b09555..d5ef1b191f 100644
--- a/decorum/decorum-tests.ts
+++ b/decorum/decorum-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./decorum.d.ts" />
+
 
 import {Required} from 'decorum';
 import {Email} from 'decorum';
@@ -92,7 +92,7 @@ Validator.decorate(MyOtherModel, {
     ]
 });
 
-var otherValidator = Validator.new(new MyOtherModel());
+var otherValidator = Validator.new(MyOtherModel());
 otherValidator.validateField('foo', '');
 
 // Custom validator
diff --git a/decorum/decorum-tests.ts.tscparams b/decorum/decorum-tests.ts.tscparams
deleted file mode 100644
index 5300ee7222..0000000000
--- a/decorum/decorum-tests.ts.tscparams
+++ /dev/null
@@ -1,2 +0,0 @@
---experimentalDecorators
---target ES5
diff --git a/decorum/decorum.d.ts b/decorum/decorum.d.ts
deleted file mode 100644
index 07660acf9f..0000000000
--- a/decorum/decorum.d.ts
+++ /dev/null
@@ -1,436 +0,0 @@
-// Type definitions for Decorum JS v0.2.0
-// Project: https://github.com/dflor003/decorum
-// Definitions by: Danil Flores <https://github.com/dflor003>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'decorum' {
-    export = decorum;
-}
-
-declare namespace decorum {
-    /**
-     * A generic custom validation. Takes a predicate that will receive the proposed value as the first parameter and
-     * the current model state as the second.
-     * @param message The message to display when the predicate fails.
-     * @param predicate A lambda expression/function that determines if the value is valid. If it returns a falsy
-     *     value, the field will be considered invalid and will return the passed error message upon validation.
-     * @returns {function(Object, string): void} A field validation decorator.
-     */
-    export function Validation<TModel>(message: string | MessageHandler<CustomValidator<TModel>>, predicate: (value: any, model: TModel) => boolean): PropertyDecorator;
-
-    /**
-     * Validate's that the field is a valid email address. The format used is the same as the webkit browser's internal
-     * email validation format. For looser or stricter formats, use your own validation based on the @Pattern decorator.
-     * @param message [Optional] Overrides the default validation error message.
-     * @returns {function(Object, string): void} A field validation decorator.
-     */
-    export function Email(message?: string | MessageHandler<EmailValidator>): PropertyDecorator;
-
-    /**
-     * Sets the field's "friendly" name in validation error messages.
-     * @param name The field's friendly name
-     * @returns {function(Object, string): void} A field validation decorator.
-     */
-    export function FieldName(name: string): PropertyDecorator;
-
-    /**
-     * Validate's a field's EXACT length. Validation fails if the field is not EXACTLY the length passed.
-     * @param length The exact length the field must be.
-     * @param message [Optional] Overrides the default validation error message.
-     * @returns {function(Object, string): void} A field validation decorator.
-     */
-    export function Length(length: number, message?: string | MessageHandler<LengthValidator>): PropertyDecorator;
-
-    /**
-     * Validates a field's maximum length.
-     * @param maxLength The field's maximum length. Must be a positive integer greater than 1.
-     * @param message [Optional] Overrides the default validation error message.
-     * @returns {function(Object, string): void} A field validation decorator.
-     */
-    export function MaxLength(maxLength: number, message?: string | MessageHandler<MaxLengthValidator>): PropertyDecorator;
-
-    /**
-     * Validates the field's minimum length.
-     * @param minLength The field's minimum length. Must be a positive integer greater than 0
-     * @param message [Optional] Overrides the default validation error message.
-     * @returns {function(Object, string): void} A field validation decorator.
-     */
-    export function MinLength(minLength: number, message?: string | MessageHandler<MinLengthValidator>): PropertyDecorator;
-
-    /**
-     * Validates the field against a regular expression pattern.
-     * @param regex The regex to validate against. Should be a valid JavaScript {RegExp} instance.
-     * @param message [Optional] Overrides the default validation error message.
-     * @returns {function(Object, string): void} A field validation decorator.
-     */
-    export function Pattern(regex: RegExp, message?: string | MessageHandler<PatternValidator>): PropertyDecorator;
-
-    /**
-     * Marks the field as required.
-     * @param message [Optional] Overrides the default validation error message.
-     * @returns {function(Object, string): void} A field validation decorator.
-     */
-    export function Required(message?: string | MessageHandler<RequiredFieldValidator>): PropertyDecorator;
-
-    /**
-     * Validates that a given field only contains alpha values.
-     * @param message [Optional] Overrides the default validation error message.
-     * @returns {function(Object, string): void} A field validation decorator.
-     */
-    export function Alpha(message?: string | MessageHandler<PatternValidator>): PropertyDecorator;
-
-    /**
-     * Validates that a given field only contains alphanumeric values.
-     * @param message [Optional] Overrides the default validation error message.
-     * @returns {function(Object, string): void} A field validation decorator.
-     */
-    export function AlphaNumeric(message?: string | MessageHandler<PatternValidator>): PropertyDecorator;
-
-    /**
-     * A map from field name to array of field validation decorators.
-     */
-    export type ValidationDefinitions = {
-        [field: string]: PropertyDecorator[];
-    };
-
-    /**
-     * Static container for convenience methods related to field validation.
-     */
-    export class Validator {
-        /**
-         * Creates a new model validator for the given model. Model should be a valid class that has a valid constructor
-         * and a prototype.
-         * @param model The model to create the validator for.
-         * @returns {ModelValidator} An instance of {ModelValidator}
-         */
-        static new(model: any): ModelValidator;
-
-        /**
-         * Decorates the passed class with model validations. Use this when you do not have access to ES7 decorators.
-         * The object passed should be a valid class (ES6 class or ES5 function constructor).
-         * @param objectType The class to decorate.
-         * @param definitions One or more field validation definitions of the form { "fieldName": [ decorators ] }.
-         */
-        static decorate(objectType: any, definitions: ValidationDefinitions): void;
-
-        /**
-         * Creates an anonymous validator, immediately validates the model, and returns any validation errors on the
-         * model as a result.
-         * @param model The model to validate.
-         */
-        static validate(model: any): IValidationResult;
-
-        /**
-         * Adds a validator to the given object prototype for the given property. Meant to be used inside of validation
-         * decorators to inject the validation onto the object property.
-         * @param targetPrototype A valid object prototype to add to.
-         * @param property The property to add the validator for.
-         * @param validator The validator to add.
-         */
-        static addValidator(targetPrototype: Object, property: string, validator: BaseValidator): void;
-    }
-
-    /**
-     * Details about validation errors on a field.
-     */
-    export interface IFieldValidationError {
-        /**
-         * The property name of the field on the model.
-         */
-        field: string;
-
-        /**
-         * The "friendly" name of the field. If not set on the model via @FieldName(...), it will default to "Field".
-         */
-        fieldName: string;
-
-        /**
-         * One or more field validation errors. Empty if no errors.
-         */
-        errors: string[];
-    }
-
-    /**
-     * Result returned when a model is validated.
-     */
-    export interface IValidationResult {
-        /**
-         * Whether or not the model is valid.
-         */
-        isValid: boolean;
-
-        /**
-         * A map of field name to validation errors.
-         */
-        errors: IFieldValidationError[];
-    }
-
-    /**
-     * Wraps a model to allow the consuming class to call validation methods.
-     */
-    export class ModelValidator {
-        /**
-         * Creates a new model validator.
-         * @param model The model to validate. Should be a class that has a valid constructor function and prototype.
-         */
-        constructor(model: any);
-
-        /**
-         * Gets the validation options for the given field name.
-         * @param fieldKey         The name of the field to get options for.
-         * @returns {FieldOptions} The field options associated with that field or null if no validations defined
-         * for the field.
-         */
-        getValidationOptions(fieldKey: string): FieldOptions;
-
-        /**
-         * Validates the given field on this {ModelValidator}'s model. If a proposed value is passed, validate
-         * against that passed value; otherwise, use the field's current value on the model.
-         * @param fieldKey      The name of the field to validate.
-         * @param proposedValue [Optional] The proposed value to set on the field.
-         * @returns {string[]}  An array of field validation error messages if the field is invalid; otherwise,
-         * an empty array.
-         */
-        validateField(fieldKey: string, proposedValue?: any): string[];
-
-        /**
-         * Validate the entire model and return a result that indicates whether the model is valid or not and any
-         * errors
-         * that have occurred in an object indexed by field name on the model.
-         * @returns {IValidationResult} An object that contains whether the model is valid or not and errors by field
-         *     name.
-         */
-        validate(): IValidationResult;
-    }
-
-    /**
-     * Callback invoked when a validation needs to return an error. The first parameter is an object
-     * wrapping metadata about the field such as the field name, friendly name, value, etc.
-     * The second parameter is the validator instance that triggered the error.
-     */
-    export interface MessageHandler<TValidator extends BaseValidator> {
-        (opts: IMessageOpts, validator: TValidator): string;
-    }
-
-    /**
-     * Options passed to a field to aid in generating a message. Contains data about
-     * the field such as name, friendly name, and value.
-     */
-    export interface IMessageOpts {
-        /**
-         * The property name from the model. I.e. 'emailAddress', 'username', etc.
-         */
-        property: string;
-
-        /**
-         * The friendly name for the field. I.e. 'Email address', 'Password Confirmation', etc.
-         */
-        friendlyName: string;
-
-        /**
-         * The current value of the field at the time the validation error was generated.
-         */
-        value: string;
-    }
-
-    /**
-     * A map of validation "key" (unique name for a given type of validation) to message handler callback.
-     */
-    export interface IMessageHandlerMap {
-        [key: string]: MessageHandler<any>;
-    }
-
-    /**
-     * Mechanism for overriding validation errors to provide for custom or localized error messages.
-     * @type {{IMessageHandlerMap}}
-     */
-    export let MessageHandlers: IMessageHandlerMap;
-
-    /**
-     * Custom validation class.
-     */
-    export class CustomValidator<TModel> extends BaseValidator {
-        constructor(predicate: (value: any, model: TModel) => boolean, message: string | MessageHandler<CustomValidator<TModel>>);
-
-        getMessage(opts: IMessageOpts): string;
-
-        isValid(value: any, model: any): boolean;
-    }
-
-    /**
-     * An email validator.
-     */
-    export class EmailValidator extends PatternValidator {
-        static EmailRegex: RegExp;
-
-        constructor(message?: string | MessageHandler<EmailValidator>);
-
-        getMessage(opts: IMessageOpts): string;
-
-        getKey(): string;
-    }
-
-    /**
-     * An exact length validator.
-     */
-    export class LengthValidator extends BaseValidator {
-        length: number;
-
-        constructor(length: number, message?: string | MessageHandler<LengthValidator>);
-
-        getMessage(opts: IMessageOpts): string;
-
-        isValid(value: any): boolean;
-    }
-
-    /**
-     * A maximum length validator.
-     */
-    export class MaxLengthValidator extends BaseValidator {
-        maxLength: number;
-
-        constructor(maxLength: number, message?: string | MessageHandler<MaxLengthValidator>);
-
-        getMessage(opts: IMessageOpts): string;
-
-        isValid(value: string): boolean;
-    }
-
-    /**
-     * A minimum length validator.
-     */
-    export class MinLengthValidator extends BaseValidator {
-        minLength: number;
-
-        constructor(minLength: number, message?: string | MessageHandler<MinLengthValidator>);
-
-        getMessage(opts: IMessageOpts): string;
-
-        isValid(value: string): boolean;
-    }
-
-    /**
-     * A regular expression validator.
-     */
-    export class PatternValidator extends BaseValidator {
-        pattern: RegExp;
-
-        constructor(pattern: RegExp, message?: string | MessageHandler<PatternValidator>);
-
-        getMessage(opts: IMessageOpts): string;
-
-        isValid(value: any): boolean;
-    }
-
-    /**
-     * A field requiredness validator.
-     */
-    export class RequiredFieldValidator extends BaseValidator {
-        constructor(message?: string | MessageHandler<RequiredFieldValidator>);
-
-        validatesEmptyValue(): boolean;
-
-        getMessage(opts: IMessageOpts): string;
-
-        isValid(value: any): boolean;
-    }
-
-    /**
-     * Base abstract class for all validators. Methods that must be overridden:
-     *  getMessage(...) - Get error message to return when field is invalid.
-     *  isValid(...)    - Check validity of field given proposed value and the rest of the model.
-     */
-    export abstract class BaseValidator {
-        /**
-         * Initializes the {BaseValidator}
-         * @param validatorKey A unique "key" by which to identify this field validator i.e. length, maxlength,
-         *     required. Should be a valid JS property name.
-         * @param message A custom error message to return. Should be passed down from concrete class' constructors to
-         *     enable customizing error messages.
-         */
-        constructor(validatorKey: string, message: string | MessageHandler<any>);
-
-        /**
-         * Returns true if the validator instance was passed a custom error message.
-         */
-        hasCustomMessage: boolean;
-
-        /**
-         * Check whether this validator should process an "empty" value (i.e. null, undefined, empty string). Override
-         * this in derived classes to skip validators if the field value hasn't been set. Things like email, min/max
-         * length, and pattern should return false for this to ensure they don't get fired when the model is initially
-         * empty before a user has had a chance to input a value. Things like required should override this to true so
-         * that they are fired for empty values. Base implementation defaults to false
-         * @returns {boolean}
-         */
-        validatesEmptyValue(): boolean;
-
-        /**
-         * Gets the custom error message set on this validator.
-         * @param opts Metadata about the field such as name and friendly name.
-         * @returns {string} The custom error message or null if none has been set.
-         */
-        getCustomMessage(opts: IMessageOpts): string;
-
-        /**
-         * Gets the unique name for this validator.
-         * @returns {string} The unique name for this validator.
-         */
-        getKey(): string;
-
-        /**
-         * [Abstract] Gets the error message to display when a field fails validation by this validator.
-         * @param opts Metadata about the field such as name and friendly name.
-         */
-        abstract getMessage(opts: IMessageOpts): string;
-
-        /**
-         * [Abstract] Checks the passed value for validity.
-         * @param value The field's proposed value.
-         * @param model The rest of the model if cross-field validity checks are necessary.
-         */
-        abstract isValid(value: any, model: any): boolean;
-    }
-
-    /**
-     * Validation options for a given field including actual validators and meta data such as the field name.
-     */
-    export class FieldOptions {
-        constructor(property: string);
-
-        /**
-         * Gets the "friendly" name of the field for use in validation error messages. Defaults to just "Field".
-         * @returns {string}
-         */
-        getFriendlyName(): string;
-
-        /**
-         * Sets the "friendly" name of the field for use in validation error messages. This name will be used in the
-         * text of validation errors.
-         * @param name The new name to set.
-         */
-        setFriendlyName(name: string): void;
-
-        /**
-         * Add a validator to the list of validators for this field.
-         * @param validator The validator to add. Should be a class that extends from {BaseValidator}.
-         */
-        addValidator(validator: BaseValidator): void;
-
-        /**
-         * Gets the validators assigned to this field.
-         * @returns {BaseValidator[]} The validators for this field.
-         */
-        getValidators(): BaseValidator[];
-
-        /**
-         * Runs through all of the validators for the field given a particular value and returns any validation errors
-         * that may have occurred.
-         * @param value The value to validate.
-         * @param model The rest of the model. Used in custom cross-field validations.
-         * @returns {string[]} Any validation errors that may have occurred or an empty array if the value passed is
-         *     valid for the field.
-         */
-        validateValue(value: any, model: any): string[];
-    }
-}
diff --git a/decorum/index.d.ts b/decorum/index.d.ts
new file mode 100644
index 0000000000..d442e6d666
--- /dev/null
+++ b/decorum/index.d.ts
@@ -0,0 +1,435 @@
+// Type definitions for Decorum JS v0.2.0
+// Project: https://github.com/dflor003/decorum
+// Definitions by: Danil Flores <https://github.com/dflor003>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = decorum;
+export as namespace decorum;
+
+declare namespace decorum {
+    /**
+     * A generic custom validation. Takes a predicate that will receive the proposed value as the first parameter and
+     * the current model state as the second.
+     * @param message The message to display when the predicate fails.
+     * @param predicate A lambda expression/function that determines if the value is valid. If it returns a falsy
+     *     value, the field will be considered invalid and will return the passed error message upon validation.
+     * @returns {function(Object, string): void} A field validation decorator.
+     */
+    export function Validation<TModel>(message: string | MessageHandler<CustomValidator<TModel>>, predicate: (value: any, model: TModel) => boolean): PropertyDecorator;
+
+    /**
+     * Validate's that the field is a valid email address. The format used is the same as the webkit browser's internal
+     * email validation format. For looser or stricter formats, use your own validation based on the @Pattern decorator.
+     * @param message [Optional] Overrides the default validation error message.
+     * @returns {function(Object, string): void} A field validation decorator.
+     */
+    export function Email(message?: string | MessageHandler<EmailValidator>): PropertyDecorator;
+
+    /**
+     * Sets the field's "friendly" name in validation error messages.
+     * @param name The field's friendly name
+     * @returns {function(Object, string): void} A field validation decorator.
+     */
+    export function FieldName(name: string): PropertyDecorator;
+
+    /**
+     * Validate's a field's EXACT length. Validation fails if the field is not EXACTLY the length passed.
+     * @param length The exact length the field must be.
+     * @param message [Optional] Overrides the default validation error message.
+     * @returns {function(Object, string): void} A field validation decorator.
+     */
+    export function Length(length: number, message?: string | MessageHandler<LengthValidator>): PropertyDecorator;
+
+    /**
+     * Validates a field's maximum length.
+     * @param maxLength The field's maximum length. Must be a positive integer greater than 1.
+     * @param message [Optional] Overrides the default validation error message.
+     * @returns {function(Object, string): void} A field validation decorator.
+     */
+    export function MaxLength(maxLength: number, message?: string | MessageHandler<MaxLengthValidator>): PropertyDecorator;
+
+    /**
+     * Validates the field's minimum length.
+     * @param minLength The field's minimum length. Must be a positive integer greater than 0
+     * @param message [Optional] Overrides the default validation error message.
+     * @returns {function(Object, string): void} A field validation decorator.
+     */
+    export function MinLength(minLength: number, message?: string | MessageHandler<MinLengthValidator>): PropertyDecorator;
+
+    /**
+     * Validates the field against a regular expression pattern.
+     * @param regex The regex to validate against. Should be a valid JavaScript {RegExp} instance.
+     * @param message [Optional] Overrides the default validation error message.
+     * @returns {function(Object, string): void} A field validation decorator.
+     */
+    export function Pattern(regex: RegExp, message?: string | MessageHandler<PatternValidator>): PropertyDecorator;
+
+    /**
+     * Marks the field as required.
+     * @param message [Optional] Overrides the default validation error message.
+     * @returns {function(Object, string): void} A field validation decorator.
+     */
+    export function Required(message?: string | MessageHandler<RequiredFieldValidator>): PropertyDecorator;
+
+    /**
+     * Validates that a given field only contains alpha values.
+     * @param message [Optional] Overrides the default validation error message.
+     * @returns {function(Object, string): void} A field validation decorator.
+     */
+    export function Alpha(message?: string | MessageHandler<PatternValidator>): PropertyDecorator;
+
+    /**
+     * Validates that a given field only contains alphanumeric values.
+     * @param message [Optional] Overrides the default validation error message.
+     * @returns {function(Object, string): void} A field validation decorator.
+     */
+    export function AlphaNumeric(message?: string | MessageHandler<PatternValidator>): PropertyDecorator;
+
+    /**
+     * A map from field name to array of field validation decorators.
+     */
+    export type ValidationDefinitions = {
+        [field: string]: PropertyDecorator[];
+    };
+
+    /**
+     * Static container for convenience methods related to field validation.
+     */
+    export class Validator {
+        /**
+         * Creates a new model validator for the given model. Model should be a valid class that has a valid constructor
+         * and a prototype.
+         * @param model The model to create the validator for.
+         * @returns {ModelValidator} An instance of {ModelValidator}
+         */
+        static new(model: any): ModelValidator;
+
+        /**
+         * Decorates the passed class with model validations. Use this when you do not have access to ES7 decorators.
+         * The object passed should be a valid class (ES6 class or ES5 function constructor).
+         * @param objectType The class to decorate.
+         * @param definitions One or more field validation definitions of the form { "fieldName": [ decorators ] }.
+         */
+        static decorate(objectType: any, definitions: ValidationDefinitions): void;
+
+        /**
+         * Creates an anonymous validator, immediately validates the model, and returns any validation errors on the
+         * model as a result.
+         * @param model The model to validate.
+         */
+        static validate(model: any): IValidationResult;
+
+        /**
+         * Adds a validator to the given object prototype for the given property. Meant to be used inside of validation
+         * decorators to inject the validation onto the object property.
+         * @param targetPrototype A valid object prototype to add to.
+         * @param property The property to add the validator for.
+         * @param validator The validator to add.
+         */
+        static addValidator(targetPrototype: Object, property: string, validator: BaseValidator): void;
+    }
+
+    /**
+     * Details about validation errors on a field.
+     */
+    export interface IFieldValidationError {
+        /**
+         * The property name of the field on the model.
+         */
+        field: string;
+
+        /**
+         * The "friendly" name of the field. If not set on the model via @FieldName(...), it will default to "Field".
+         */
+        fieldName: string;
+
+        /**
+         * One or more field validation errors. Empty if no errors.
+         */
+        errors: string[];
+    }
+
+    /**
+     * Result returned when a model is validated.
+     */
+    export interface IValidationResult {
+        /**
+         * Whether or not the model is valid.
+         */
+        isValid: boolean;
+
+        /**
+         * A map of field name to validation errors.
+         */
+        errors: IFieldValidationError[];
+    }
+
+    /**
+     * Wraps a model to allow the consuming class to call validation methods.
+     */
+    export class ModelValidator {
+        /**
+         * Creates a new model validator.
+         * @param model The model to validate. Should be a class that has a valid constructor function and prototype.
+         */
+        constructor(model: any);
+
+        /**
+         * Gets the validation options for the given field name.
+         * @param fieldKey         The name of the field to get options for.
+         * @returns {FieldOptions} The field options associated with that field or null if no validations defined
+         * for the field.
+         */
+        getValidationOptions(fieldKey: string): FieldOptions;
+
+        /**
+         * Validates the given field on this {ModelValidator}'s model. If a proposed value is passed, validate
+         * against that passed value; otherwise, use the field's current value on the model.
+         * @param fieldKey      The name of the field to validate.
+         * @param proposedValue [Optional] The proposed value to set on the field.
+         * @returns {string[]}  An array of field validation error messages if the field is invalid; otherwise,
+         * an empty array.
+         */
+        validateField(fieldKey: string, proposedValue?: any): string[];
+
+        /**
+         * Validate the entire model and return a result that indicates whether the model is valid or not and any
+         * errors
+         * that have occurred in an object indexed by field name on the model.
+         * @returns {IValidationResult} An object that contains whether the model is valid or not and errors by field
+         *     name.
+         */
+        validate(): IValidationResult;
+    }
+
+    /**
+     * Callback invoked when a validation needs to return an error. The first parameter is an object
+     * wrapping metadata about the field such as the field name, friendly name, value, etc.
+     * The second parameter is the validator instance that triggered the error.
+     */
+    export interface MessageHandler<TValidator extends BaseValidator> {
+        (opts: IMessageOpts, validator: TValidator): string;
+    }
+
+    /**
+     * Options passed to a field to aid in generating a message. Contains data about
+     * the field such as name, friendly name, and value.
+     */
+    export interface IMessageOpts {
+        /**
+         * The property name from the model. I.e. 'emailAddress', 'username', etc.
+         */
+        property: string;
+
+        /**
+         * The friendly name for the field. I.e. 'Email address', 'Password Confirmation', etc.
+         */
+        friendlyName: string;
+
+        /**
+         * The current value of the field at the time the validation error was generated.
+         */
+        value: string;
+    }
+
+    /**
+     * A map of validation "key" (unique name for a given type of validation) to message handler callback.
+     */
+    export interface IMessageHandlerMap {
+        [key: string]: MessageHandler<any>;
+    }
+
+    /**
+     * Mechanism for overriding validation errors to provide for custom or localized error messages.
+     * @type {{IMessageHandlerMap}}
+     */
+    export let MessageHandlers: IMessageHandlerMap;
+
+    /**
+     * Custom validation class.
+     */
+    export class CustomValidator<TModel> extends BaseValidator {
+        constructor(predicate: (value: any, model: TModel) => boolean, message: string | MessageHandler<CustomValidator<TModel>>);
+
+        getMessage(opts: IMessageOpts): string;
+
+        isValid(value: any, model: any): boolean;
+    }
+
+    /**
+     * An email validator.
+     */
+    export class EmailValidator extends PatternValidator {
+        static EmailRegex: RegExp;
+
+        constructor(message?: string | MessageHandler<EmailValidator>);
+
+        getMessage(opts: IMessageOpts): string;
+
+        getKey(): string;
+    }
+
+    /**
+     * An exact length validator.
+     */
+    export class LengthValidator extends BaseValidator {
+        length: number;
+
+        constructor(length: number, message?: string | MessageHandler<LengthValidator>);
+
+        getMessage(opts: IMessageOpts): string;
+
+        isValid(value: any): boolean;
+    }
+
+    /**
+     * A maximum length validator.
+     */
+    export class MaxLengthValidator extends BaseValidator {
+        maxLength: number;
+
+        constructor(maxLength: number, message?: string | MessageHandler<MaxLengthValidator>);
+
+        getMessage(opts: IMessageOpts): string;
+
+        isValid(value: string): boolean;
+    }
+
+    /**
+     * A minimum length validator.
+     */
+    export class MinLengthValidator extends BaseValidator {
+        minLength: number;
+
+        constructor(minLength: number, message?: string | MessageHandler<MinLengthValidator>);
+
+        getMessage(opts: IMessageOpts): string;
+
+        isValid(value: string): boolean;
+    }
+
+    /**
+     * A regular expression validator.
+     */
+    export class PatternValidator extends BaseValidator {
+        pattern: RegExp;
+
+        constructor(pattern: RegExp, message?: string | MessageHandler<PatternValidator>);
+
+        getMessage(opts: IMessageOpts): string;
+
+        isValid(value: any): boolean;
+    }
+
+    /**
+     * A field requiredness validator.
+     */
+    export class RequiredFieldValidator extends BaseValidator {
+        constructor(message?: string | MessageHandler<RequiredFieldValidator>);
+
+        validatesEmptyValue(): boolean;
+
+        getMessage(opts: IMessageOpts): string;
+
+        isValid(value: any): boolean;
+    }
+
+    /**
+     * Base abstract class for all validators. Methods that must be overridden:
+     *  getMessage(...) - Get error message to return when field is invalid.
+     *  isValid(...)    - Check validity of field given proposed value and the rest of the model.
+     */
+    export abstract class BaseValidator {
+        /**
+         * Initializes the {BaseValidator}
+         * @param validatorKey A unique "key" by which to identify this field validator i.e. length, maxlength,
+         *     required. Should be a valid JS property name.
+         * @param message A custom error message to return. Should be passed down from concrete class' constructors to
+         *     enable customizing error messages.
+         */
+        constructor(validatorKey: string, message: string | MessageHandler<any>);
+
+        /**
+         * Returns true if the validator instance was passed a custom error message.
+         */
+        hasCustomMessage: boolean;
+
+        /**
+         * Check whether this validator should process an "empty" value (i.e. null, undefined, empty string). Override
+         * this in derived classes to skip validators if the field value hasn't been set. Things like email, min/max
+         * length, and pattern should return false for this to ensure they don't get fired when the model is initially
+         * empty before a user has had a chance to input a value. Things like required should override this to true so
+         * that they are fired for empty values. Base implementation defaults to false
+         * @returns {boolean}
+         */
+        validatesEmptyValue(): boolean;
+
+        /**
+         * Gets the custom error message set on this validator.
+         * @param opts Metadata about the field such as name and friendly name.
+         * @returns {string} The custom error message or null if none has been set.
+         */
+        getCustomMessage(opts: IMessageOpts): string;
+
+        /**
+         * Gets the unique name for this validator.
+         * @returns {string} The unique name for this validator.
+         */
+        getKey(): string;
+
+        /**
+         * [Abstract] Gets the error message to display when a field fails validation by this validator.
+         * @param opts Metadata about the field such as name and friendly name.
+         */
+        abstract getMessage(opts: IMessageOpts): string;
+
+        /**
+         * [Abstract] Checks the passed value for validity.
+         * @param value The field's proposed value.
+         * @param model The rest of the model if cross-field validity checks are necessary.
+         */
+        abstract isValid(value: any, model: any): boolean;
+    }
+
+    /**
+     * Validation options for a given field including actual validators and meta data such as the field name.
+     */
+    export class FieldOptions {
+        constructor(property: string);
+
+        /**
+         * Gets the "friendly" name of the field for use in validation error messages. Defaults to just "Field".
+         * @returns {string}
+         */
+        getFriendlyName(): string;
+
+        /**
+         * Sets the "friendly" name of the field for use in validation error messages. This name will be used in the
+         * text of validation errors.
+         * @param name The new name to set.
+         */
+        setFriendlyName(name: string): void;
+
+        /**
+         * Add a validator to the list of validators for this field.
+         * @param validator The validator to add. Should be a class that extends from {BaseValidator}.
+         */
+        addValidator(validator: BaseValidator): void;
+
+        /**
+         * Gets the validators assigned to this field.
+         * @returns {BaseValidator[]} The validators for this field.
+         */
+        getValidators(): BaseValidator[];
+
+        /**
+         * Runs through all of the validators for the field given a particular value and returns any validation errors
+         * that may have occurred.
+         * @param value The value to validate.
+         * @param model The rest of the model. Used in custom cross-field validations.
+         * @returns {string[]} Any validation errors that may have occurred or an empty array if the value passed is
+         *     valid for the field.
+         */
+        validateValue(value: any, model: any): string[];
+    }
+}
diff --git a/decorum/tsconfig.json b/decorum/tsconfig.json
new file mode 100644
index 0000000000..f86b1c6338
--- /dev/null
+++ b/decorum/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "experimentalDecorators": true,
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "decorum-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/deep-diff/deep-diff-tests.ts b/deep-diff/deep-diff-tests.ts
index 1392effb16..42abf98ee1 100644
--- a/deep-diff/deep-diff-tests.ts
+++ b/deep-diff/deep-diff-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./deep-diff.d.ts" />
+
 
 import _deepDiff = require('deep-diff');
 var diff = _deepDiff.diff;
diff --git a/deep-diff/deep-diff.d.ts b/deep-diff/index.d.ts
similarity index 100%
rename from deep-diff/deep-diff.d.ts
rename to deep-diff/index.d.ts
diff --git a/deep-diff/tsconfig.json b/deep-diff/tsconfig.json
new file mode 100644
index 0000000000..fd891f7a32
--- /dev/null
+++ b/deep-diff/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "deep-diff-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/deep-equal/deep-equal-tests.ts b/deep-equal/deep-equal-tests.ts
index 922dcf4495..2f4f238a4f 100644
--- a/deep-equal/deep-equal-tests.ts
+++ b/deep-equal/deep-equal-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./deep-equal.d.ts" />
 
 import * as deepEqual from "deep-equal";
 
diff --git a/deep-equal/deep-equal.d.ts b/deep-equal/deep-equal.d.ts
deleted file mode 100644
index 0afb0f402b..0000000000
--- a/deep-equal/deep-equal.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Type definitions for deep-equal
-// Project: https://github.com/substack/node-deep-equal
-// Definitions by: remojansen <https://github.com/remojansen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "deep-equal" {
-
-    interface DeepEqualOptions {
-        strict: boolean;
-    }
-
-    let deepEqual: (
-		actual: Object,
-		expected: Object,
-		opts?: DeepEqualOptions) => boolean;
-
-    export = deepEqual;
-}
\ No newline at end of file
diff --git a/deep-equal/index.d.ts b/deep-equal/index.d.ts
new file mode 100644
index 0000000000..eef762a4ea
--- /dev/null
+++ b/deep-equal/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for deep-equal
+// Project: https://github.com/substack/node-deep-equal
+// Definitions by: remojansen <https://github.com/remojansen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+interface DeepEqualOptions {
+    strict: boolean;
+}
+
+declare let deepEqual: (
+    actual: Object,
+    expected: Object,
+    opts?: DeepEqualOptions) => boolean;
+
+export = deepEqual;
diff --git a/deep-equal/tsconfig.json b/deep-equal/tsconfig.json
new file mode 100644
index 0000000000..52a61eec74
--- /dev/null
+++ b/deep-equal/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "deep-equal-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/deep-extend/deep-extend-tests.ts b/deep-extend/deep-extend-tests.ts
index f5e35af352..a69d60cfcc 100644
--- a/deep-extend/deep-extend-tests.ts
+++ b/deep-extend/deep-extend-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="deep-extend.d.ts" />
 
 import deepExtend = require('deep-extend');
 var obj1 = {
diff --git a/deep-extend/deep-extend.d.ts b/deep-extend/deep-extend.d.ts
deleted file mode 100644
index 164e337a95..0000000000
--- a/deep-extend/deep-extend.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Type definitions for open 0.4.1
-// Project: https://github.com/unclechu/node-deep-extend
-// Definitions by: rhysd <https://github.com/rhysd>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'deep-extend' {
-	/*
-	 * Recursive object extending.
-	 */
-	function deepExtend<T, U>(target: T, source: U): T & U;
-	function deepExtend<T, U, V>(target: T, source1: U, source2: V): T & U & V;
-	function deepExtend<T, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W;
-	function deepExtend(target: any, ...sources: any[]): any;
-	export = deepExtend;
-}
diff --git a/deep-extend/index.d.ts b/deep-extend/index.d.ts
new file mode 100644
index 0000000000..a23daa519b
--- /dev/null
+++ b/deep-extend/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for open 0.4.1
+// Project: https://github.com/unclechu/node-deep-extend
+// Definitions by: rhysd <https://github.com/rhysd>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/*
+ * Recursive object extending.
+ */
+declare function deepExtend<T, U>(target: T, source: U): T & U;
+declare function deepExtend<T, U, V>(target: T, source1: U, source2: V): T & U & V;
+declare function deepExtend<T, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W;
+declare function deepExtend(target: any, ...sources: any[]): any;
+export = deepExtend;
diff --git a/deep-extend/tsconfig.json b/deep-extend/tsconfig.json
new file mode 100644
index 0000000000..3c24b87ea6
--- /dev/null
+++ b/deep-extend/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "deep-extend-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/deep-freeze/deep-freeze-tests.ts b/deep-freeze/deep-freeze-tests.ts
index 8369d30871..4eeb1e9890 100644
--- a/deep-freeze/deep-freeze-tests.ts
+++ b/deep-freeze/deep-freeze-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="deep-freeze.d.ts" />
+
 
 import df = require('deep-freeze');
 
diff --git a/deep-freeze/deep-freeze.d.ts b/deep-freeze/deep-freeze.d.ts
deleted file mode 100644
index 8ab079d6de..0000000000
--- a/deep-freeze/deep-freeze.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Type definitions for deep-freeze
-// Project: https://github.com/substack/deep-freeze
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace DeepFreeze {
-   export interface DeepFreezeInterface {
-      <T>(obj: T): T;
-    }
-}
-
-declare module "deep-freeze" {
-    let deepFreeze: DeepFreeze.DeepFreezeInterface;
-    export = deepFreeze;
-}
diff --git a/deep-freeze/index.d.ts b/deep-freeze/index.d.ts
new file mode 100644
index 0000000000..92f6c8db2f
--- /dev/null
+++ b/deep-freeze/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for deep-freeze
+// Project: https://github.com/substack/deep-freeze
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var deepFreeze: DeepFreeze.DeepFreezeInterface;
+export = deepFreeze;
+
+declare namespace DeepFreeze {
+   export interface DeepFreezeInterface {
+      <T>(obj: T): T;
+    }
+}
diff --git a/deep-freeze/tsconfig.json b/deep-freeze/tsconfig.json
new file mode 100644
index 0000000000..68be412da4
--- /dev/null
+++ b/deep-freeze/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "deep-freeze-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/del/del-tests.ts b/del/del-tests.ts
index d3c45c9659..071fdcc3ad 100644
--- a/del/del-tests.ts
+++ b/del/del-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./del.d.ts"/>
 import del = require("del");
 
 var paths = ["build", "dist/**/*.js"];
diff --git a/del/del.d.ts b/del/del.d.ts
deleted file mode 100644
index 6ed59efa39..0000000000
--- a/del/del.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Type definitions for del v2.2.0
-// Project: https://github.com/sindresorhus/del
-// Definitions by: Asana <https://asana.com>, Aya Morisawa <https://github.com/AyaMorisawa>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../glob/glob.d.ts"/>
-
-declare module "del" {
-    import glob = require("glob");
-
-    function Del(pattern: string): Promise<string[]>;
-    function Del(pattern: string, options: Del.Options): Promise<string[]>;
-
-    function Del(patterns: string[]): Promise<string[]>;
-    function Del(patterns: string[], options: Del.Options): Promise<string[]>;
-
-    namespace Del {
-        function sync(pattern: string, options?: Options): string[];
-        function sync(patterns: string[], options?: Options): string[];
-
-        interface Options extends glob.IOptions {
-            force?: boolean;
-            dryRun?: boolean;
-        }
-    }
-
-    export = Del;
-}
diff --git a/del/index.d.ts b/del/index.d.ts
new file mode 100644
index 0000000000..e9c5e58557
--- /dev/null
+++ b/del/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for del v2.2.0
+// Project: https://github.com/sindresorhus/del
+// Definitions by: Asana <https://asana.com>, Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import glob = require("../glob");
+
+declare function Del(pattern: string): Promise<string[]>;
+declare function Del(pattern: string, options: Del.Options): Promise<string[]>;
+
+declare function Del(patterns: string[]): Promise<string[]>;
+declare function Del(patterns: string[], options: Del.Options): Promise<string[]>;
+
+declare namespace Del {
+    function sync(pattern: string, options?: Options): string[];
+    function sync(patterns: string[], options?: Options): string[];
+
+    interface Options extends glob.IOptions {
+        force?: boolean;
+        dryRun?: boolean;
+    }
+}
+
+export = Del;
diff --git a/del/tsconfig.json b/del/tsconfig.json
new file mode 100644
index 0000000000..f5a8907f0b
--- /dev/null
+++ b/del/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "del-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/denodeify/denodeify-tests.ts b/denodeify/denodeify-tests.ts
index 5179c061b7..92cac88436 100644
--- a/denodeify/denodeify-tests.ts
+++ b/denodeify/denodeify-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="denodeify.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import denodeify = require("denodeify");
 import fs = require('fs');
diff --git a/denodeify/denodeify.d.ts b/denodeify/denodeify.d.ts
deleted file mode 100644
index f2e27f4bd5..0000000000
--- a/denodeify/denodeify.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// Type definitions for denodeify 1.2.1
-// Project: https://github.com/matthew-andrews/denodeify
-// Definitions by: joaomoreno <https://github.com/joaomoreno/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "denodeify" {
-	function _<R>(fn: _.F0<R>, transformer?: _.M): () => Promise<R>;
-	function _<A,R>(fn: _.F1<A,R>, transformer?: _.M): (a:A) => Promise<R>;
-	function _<A,B,R>(fn: _.F2<A,B,R>, transformer?: _.M): (a:A, b:B) => Promise<R>;
-	function _<A,B,C,R>(fn: _.F3<A,B,C,R>, transformer?: _.M): (a:A, b:B, c:C) => Promise<R>;
-	function _<A,B,C,D,R>(fn: _.F4<A,B,C,D,R>, transformer?: _.M): (a:A, b:B, c:C, d:D) => Promise<R>;
-	function _<A,B,C,D,E,R>(fn: _.F5<A,B,C,D,E,R>, transformer?: _.M): (a:A, b:B, c:C, d:D, e:E) => Promise<R>;
-	function _<A,B,C,D,E,F,R>(fn: _.F6<A,B,C,D,E,F,R>, transformer?: _.M): (a:A, b:B, c:C, d:D, e:E, f:F) => Promise<R>;
-	function _<A,B,C,D,E,F,G,R>(fn: _.F7<A,B,C,D,E,F,G,R>, transformer?: _.M): (a:A, b:B, c:C, d:D, e:E, f:F, g:G) => Promise<R>;
-	function _<A,B,C,D,E,F,G,H,R>(fn: _.F8<A,B,C,D,E,F,G,H,R>, transformer?: _.M): (a:A, b:B, c:C, d:D, e:E, f:F, g:G, h:H) => Promise<R>;
-	function _(fn: _.F, transformer?: _.M): (...args: any[]) => Promise<any>;
-
-	module _ {
-		type Callback<R> = (err: Error, result: R) => any;
-		type F0<R> = (cb: Callback<R>) => any;
-		type F1<A,R> = (a:A, cb: Callback<R>) => any;
-		type F2<A,B,R> = (a:A, b:B, cb: Callback<R>) => any;
-		type F3<A,B,C,R> = (a:A, b:B, c:C, cb: Callback<R>) => any;
-		type F4<A,B,C,D,R> = (a:A, b:B, c:C, d:D, cb: Callback<R>) => any;
-		type F5<A,B,C,D,E,R> = (a:A, b:B, c:C, d:D, e:E, cb: Callback<R>) => any;
-		type F6<A,B,C,D,E,F,R> = (a:A, b:B, c:C, d:D, e:E, f:F, cb: Callback<R>) => any;
-		type F7<A,B,C,D,E,F,G,R> = (a:A, b:B, c:C, d:D, e:E, f:F, g:G, cb: Callback<R>) => any;
-		type F8<A,B,C,D,E,F,G,H,R> = (a:A, b:B, c:C, d:D, e:E, f:F, g:G, h:H, cb: Callback<R>) => any;
-		type F = (...args: any[]) => any;
-		type M = (err: Error, ...args: any[]) => any[];
-	}
-
-	export = _;
-}
diff --git a/denodeify/index.d.ts b/denodeify/index.d.ts
new file mode 100644
index 0000000000..d5283bf777
--- /dev/null
+++ b/denodeify/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for denodeify 1.2.1
+// Project: https://github.com/matthew-andrews/denodeify
+// Definitions by: joaomoreno <https://github.com/joaomoreno/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function _<R>(fn: _.F0<R>, transformer?: _.M): () => Promise<R>;
+declare function _<A, R>(fn: _.F1<A, R>, transformer?: _.M): (a: A) => Promise<R>;
+declare function _<A, B, R>(fn: _.F2<A, B, R>, transformer?: _.M): (a: A, b: B) => Promise<R>;
+declare function _<A, B, C, R>(fn: _.F3<A, B, C, R>, transformer?: _.M): (a: A, b: B, c: C) => Promise<R>;
+declare function _<A, B, C, D, R>(fn: _.F4<A, B, C, D, R>, transformer?: _.M): (a: A, b: B, c: C, d: D) => Promise<R>;
+declare function _<A, B, C, D, E, R>(fn: _.F5<A, B, C, D, E, R>, transformer?: _.M): (a: A, b: B, c: C, d: D, e: E) => Promise<R>;
+declare function _<A, B, C, D, E, F, R>(fn: _.F6<A, B, C, D, E, F, R>, transformer?: _.M): (a: A, b: B, c: C, d: D, e: E, f: F) => Promise<R>;
+declare function _<A, B, C, D, E, F, G, R>(fn: _.F7<A, B, C, D, E, F, G, R>, transformer?: _.M): (a: A, b: B, c: C, d: D, e: E, f: F, g: G) => Promise<R>;
+declare function _<A, B, C, D, E, F, G, H, R>(fn: _.F8<A, B, C, D, E, F, G, H, R>, transformer?: _.M): (a: A, b: B, c: C, d: D, e: E, f: F, g: G, h: H) => Promise<R>;
+declare function _(fn: _.F, transformer?: _.M): (...args: any[]) => Promise<any>;
+
+declare module _ {
+    type Callback<R> = (err: Error, result: R) => any;
+    type F0<R> = (cb: Callback<R>) => any;
+    type F1<A, R> = (a: A, cb: Callback<R>) => any;
+    type F2<A, B, R> = (a: A, b: B, cb: Callback<R>) => any;
+    type F3<A, B, C, R> = (a: A, b: B, c: C, cb: Callback<R>) => any;
+    type F4<A, B, C, D, R> = (a: A, b: B, c: C, d: D, cb: Callback<R>) => any;
+    type F5<A, B, C, D, E, R> = (a: A, b: B, c: C, d: D, e: E, cb: Callback<R>) => any;
+    type F6<A, B, C, D, E, F, R> = (a: A, b: B, c: C, d: D, e: E, f: F, cb: Callback<R>) => any;
+    type F7<A, B, C, D, E, F, G, R> = (a: A, b: B, c: C, d: D, e: E, f: F, g: G, cb: Callback<R>) => any;
+    type F8<A, B, C, D, E, F, G, H, R> = (a: A, b: B, c: C, d: D, e: E, f: F, g: G, h: H, cb: Callback<R>) => any;
+    type F = (...args: any[]) => any;
+    type M = (err: Error, ...args: any[]) => any[];
+}
+
+export = _;
diff --git a/denodeify/tsconfig.json b/denodeify/tsconfig.json
new file mode 100644
index 0000000000..5f596b882a
--- /dev/null
+++ b/denodeify/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "denodeify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/depd/depd-tests.ts b/depd/depd-tests.ts
index 14dfbe72c4..99330a757d 100644
--- a/depd/depd-tests.ts
+++ b/depd/depd-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="./depd.d.ts"/>
-
-import depd = require('depd');
+import depd = require('depd');
 
 var deprecate = depd("depd-tests");
 
diff --git a/depd/depd.d.ts b/depd/depd.d.ts
deleted file mode 100644
index 674bb21f32..0000000000
--- a/depd/depd.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for depd 1.1.0
-// Project: https://github.com/dougwilson/nodejs-depd
-// Definitions by: Zhiyuan Wang <https://github.com/danny8002/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-declare module 'depd' {
-    function depd(namespace: string): Deprecate;
-
-    interface Deprecate {
-        (message: string): void;
-        function(fn: Function, message?: string): Function;
-        property(obj: Object, prop: string, message: string): void;
-    }
-
-    export = depd;
-}
\ No newline at end of file
diff --git a/depd/index.d.ts b/depd/index.d.ts
new file mode 100644
index 0000000000..499cd99b88
--- /dev/null
+++ b/depd/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for depd 1.1.0
+// Project: https://github.com/dougwilson/nodejs-depd
+// Definitions by: Zhiyuan Wang <https://github.com/danny8002/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare function depd(namespace: string): Deprecate;
+
+interface Deprecate {
+    (message: string): void;
+    function(fn: Function, message?: string): Function;
+    property(obj: Object, prop: string, message: string): void;
+}
+
+export = depd;
diff --git a/depd/tsconfig.json b/depd/tsconfig.json
new file mode 100644
index 0000000000..62c0a183d6
--- /dev/null
+++ b/depd/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "depd-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/deployJava/deployJava-tests.ts b/deployJava/deployJava-tests.ts
index 3e4c491d87..b8ca98fc52 100644
--- a/deployJava/deployJava-tests.ts
+++ b/deployJava/deployJava-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="deployJava.d.ts" />
+
 
 /**
  * @summary Test for the method: "allowPlugin".
diff --git a/deployJava/deployJava.d.ts b/deployJava/index.d.ts
similarity index 100%
rename from deployJava/deployJava.d.ts
rename to deployJava/index.d.ts
diff --git a/deployJava/tsconfig.json b/deployJava/tsconfig.json
new file mode 100644
index 0000000000..ef8254ce3d
--- /dev/null
+++ b/deployJava/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "deployJava-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/detect-indent/detect-indent-tests.ts b/detect-indent/detect-indent-tests.ts
index 4ee02471b8..166b89d1ec 100644
--- a/detect-indent/detect-indent-tests.ts
+++ b/detect-indent/detect-indent-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="detect-indent.d.ts" />
 
 import di = require('detect-indent');
 
diff --git a/detect-indent/detect-indent.d.ts b/detect-indent/detect-indent.d.ts
deleted file mode 100644
index eb666199c6..0000000000
--- a/detect-indent/detect-indent.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Type definitions for detect-indent 0.1.3
-// Project: https://github.com/sindresorhus/detect-indent
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'detect-indent' {
-	interface DetectIndent {
-		(dir: string, alt?: string): string;
-	}
-	var _: DetectIndent;
-	export = _;
-}
-
diff --git a/detect-indent/index.d.ts b/detect-indent/index.d.ts
new file mode 100644
index 0000000000..15e82d0015
--- /dev/null
+++ b/detect-indent/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for detect-indent 0.1.3
+// Project: https://github.com/sindresorhus/detect-indent
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface DetectIndent {
+    (dir: string, alt?: string): string;
+}
+declare var _: DetectIndent;
+export = _;
diff --git a/detect-indent/tsconfig.json b/detect-indent/tsconfig.json
new file mode 100644
index 0000000000..5d8da03a2e
--- /dev/null
+++ b/detect-indent/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "detect-indent-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/devexpress-web/devexpress-web-tests.ts b/devexpress-web/devexpress-web-tests.ts
index 38c653921f..4fa6bbf377 100644
--- a/devexpress-web/devexpress-web-tests.ts
+++ b/devexpress-web/devexpress-web-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="devexpress-web.d.ts" />
+
 
 namespace Tests.Globals {
     function ASPxTest(): void {
diff --git a/devexpress-web/devexpress-web.d.ts b/devexpress-web/index.d.ts
similarity index 100%
rename from devexpress-web/devexpress-web.d.ts
rename to devexpress-web/index.d.ts
diff --git a/devexpress-web/tsconfig.json b/devexpress-web/tsconfig.json
new file mode 100644
index 0000000000..a5bd95b8cc
--- /dev/null
+++ b/devexpress-web/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "devexpress-web-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/devextreme/devextreme-15.1.3.d.ts b/devextreme/devextreme-15.1.3.d.ts
index 44fd7abbd1..432b6d4008 100644
--- a/devextreme/devextreme-15.1.3.d.ts
+++ b/devextreme/devextreme-15.1.3.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: DevExpress Inc. <http://devexpress.com/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../jquery/jquery.d.ts" />
+/// <reference types="jquery" />
 
 declare namespace DevExpress  {
     /** A mixin that provides a capability to fire and subscribe to events. */
diff --git a/devextreme/devextreme-15.1.4.d.ts b/devextreme/devextreme-15.1.4.d.ts
index 9357c6da07..44881ea912 100644
--- a/devextreme/devextreme-15.1.4.d.ts
+++ b/devextreme/devextreme-15.1.4.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: DevExpress Inc. <http://devexpress.com/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../jquery/jquery.d.ts" />
+/// <reference types="jquery" />
 
 declare namespace DevExpress {
     /** A mixin that provides a capability to fire and subscribe to events. */
diff --git a/devextreme/devextreme-15.1.5.d.ts b/devextreme/devextreme-15.1.5.d.ts
index fd6f0ea1b6..6e0fbdf7ae 100644
--- a/devextreme/devextreme-15.1.5.d.ts
+++ b/devextreme/devextreme-15.1.5.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: DevExpress Inc. <http://devexpress.com/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../jquery/jquery.d.ts" />
+/// <reference types="jquery" />
 
 declare namespace DevExpress {
     /** A mixin that provides a capability to fire and subscribe to events. */
diff --git a/devextreme/devextreme-15.1.6.d.ts b/devextreme/devextreme-15.1.6.d.ts
index 84a5038888..056ba14ee7 100644
--- a/devextreme/devextreme-15.1.6.d.ts
+++ b/devextreme/devextreme-15.1.6.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: DevExpress Inc. <http://devexpress.com/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../jquery/jquery.d.ts" />
+/// <reference types="jquery" />
 
 declare namespace DevExpress {
     /** A mixin that provides a capability to fire and subscribe to events. */
diff --git a/devextreme/devextreme-15.1.7.d.ts b/devextreme/devextreme-15.1.7.d.ts
index a2eeb19894..53f058c593 100644
--- a/devextreme/devextreme-15.1.7.d.ts
+++ b/devextreme/devextreme-15.1.7.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: DevExpress Inc. <http://devexpress.com/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../jquery/jquery.d.ts" />
+/// <reference types="jquery" />
 
 declare namespace DevExpress {
     /** A mixin that provides a capability to fire and subscribe to events. */
diff --git a/devextreme/devextreme-15.1.8.d.ts b/devextreme/devextreme-15.1.8.d.ts
index f0c3eeac34..447e0b15b9 100644
--- a/devextreme/devextreme-15.1.8.d.ts
+++ b/devextreme/devextreme-15.1.8.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: DevExpress Inc. <http://devexpress.com/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../jquery/jquery.d.ts" />
+/// <reference types="jquery" />
 
 declare namespace DevExpress {
     /** A mixin that provides a capability to fire and subscribe to events. */
diff --git a/devextreme/devextreme-15.2.4.d.ts b/devextreme/devextreme-15.2.4.d.ts
index a48987596b..bffccd11ca 100644
--- a/devextreme/devextreme-15.2.4.d.ts
+++ b/devextreme/devextreme-15.2.4.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: DevExpress Inc. <http://devexpress.com/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../jquery/jquery.d.ts" />
+/// <reference types="jquery" />
 
 declare namespace DevExpress {
     /** A mixin that provides a capability to fire and subscribe to events. */
diff --git a/devextreme/devextreme-15.2.5.d.ts b/devextreme/devextreme-15.2.5.d.ts
index 892b4f417c..f968fcb1e5 100644
--- a/devextreme/devextreme-15.2.5.d.ts
+++ b/devextreme/devextreme-15.2.5.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: DevExpress Inc. <http://devexpress.com/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../jquery/jquery.d.ts" />
+/// <reference types="jquery" />
 
 declare namespace DevExpress {
     /** A mixin that provides a capability to fire and subscribe to events. */
diff --git a/devextreme/devextreme-15.2.7.d.ts b/devextreme/devextreme-15.2.7.d.ts
new file mode 100644
index 0000000000..d12d4f4751
--- /dev/null
+++ b/devextreme/devextreme-15.2.7.d.ts
@@ -0,0 +1,7429 @@
+// Type definitions for DevExtreme 15.2.7
+// Project: http://js.devexpress.com/
+// Definitions by: DevExpress Inc. <http://devexpress.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace DevExpress {
+    /** A mixin that provides a capability to fire and subscribe to events. */
+    export interface EventsMixin<T> {
+        /** Subscribes to a specified event. */
+        on(eventName: string, eventHandler: Function): T;
+        /** Subscribes to the specified events. */
+        on(events: { [eventName: string]: Function; }): T;
+        /** Detaches all event handlers from the specified event. */
+        off(eventName: string): Object;
+        /** Detaches a particular event handler from the specified event. */
+        off(eventName: string, eventHandler: Function): T;
+    }
+    /** An object that serves as a namespace for the methods required to perform validation. */
+    export module validationEngine {
+        export interface IValidator {
+            validate(): ValidatorValidationResult;
+            reset(): void;
+        }
+        export interface ValidatorValidationResult {
+            isValid: boolean;
+            name?: string;
+            value: any;
+            brokenRule: any;
+            validationRules: any[];
+        }
+        export interface ValidationGroupValidationResult {
+            isValid: boolean;
+            brokenRules: any[];
+            validators: IValidator[];
+        }
+        export interface GroupConfig extends EventsMixin<GroupConfig>  {
+            group: any;
+            validators: IValidator[];
+            validate(): ValidationGroupValidationResult;
+            reset(): void;
+        }
+        /** Provides access to the object that represents the specified validation group. */
+        export function getGroupConfig(group: any): GroupConfig
+        /** Provides access to the object that represents the default validation group. */
+        export function getGroupConfig(): GroupConfig
+        /** Validates rules of the validators that belong to the specified validation group. */
+        export function validateGroup(group: any): ValidationGroupValidationResult;
+        /** Validates rules of the validators that belong to the default validation group. */
+        export function validateGroup(): ValidationGroupValidationResult;
+        /** Resets the values and validation result of the editors that belong to the specified validation group. */
+        export function resetGroup(group: any): void;
+        /** Resets the values and validation result of the editors that belong to the default validation group. */
+        export function resetGroup(): void;
+        /** Validates the rules that are defined within the dxValidator objects that are registered for the specified ViewModel. */
+        export function validateModel(model: Object): ValidationGroupValidationResult;
+        /** Registers all the dxValidator objects by which the fields of the specified ViewModel are extended. */
+        export function registerModelForValidation(model: Object) : void;
+    }
+    export var hardwareBackButton: JQueryCallback;
+    /** Processes the hardware back button click. */
+    export function processHardwareBackButton(): void;
+    /** Hides the last displayed overlay widget. */
+    export function hideTopOverlay(): boolean;
+    /** Specifies whether or not the entire application/site supports right-to-left representation. */
+    export var rtlEnabled: boolean;
+    /** Registers a new component in the DevExpress.ui namespace as a jQuery plugin, Angular directive and Knockout binding. */
+    export function registerComponent(name: string, componentClass: Object): void;
+    /** Registers a new component in the specified namespace as a jQuery plugin, Angular directive and Knockout binding. */
+    export function registerComponent(name: string, namespace: Object, componentClass: Object): void;
+    export function requestAnimationFrame(callback: Function): number;
+    export function cancelAnimationFrame(requestID: number): void;
+    /** Custom Knockout binding that links an HTML element with a specific action. */
+    export class Action { }
+    /** Used to get URLs that vary in a locally running application and the application running on production. */
+    export class EndpointSelector {
+        constructor(options: {
+            [key: string]: {
+                local?: string;
+                production?: string;
+            }
+        });
+        /** Returns a local or a productional URL depending on how the application is currently running. */
+        urlFor(key: string): string;
+    }
+    /** An object that serves as a namespace for the methods that are used to animate UI elements. */
+    export module fx {
+        /** Defines animation options. */
+        export interface AnimationOptions {
+            /** A function called after animation is completed. */
+            complete?: (element: JQuery, config: AnimationOptions) => void;
+            /** A number specifying wait time before animation execution. */
+            delay?: number;
+            /** A number specifying the time period to wait before the animation of the next stagger item starts. */
+            staggerDelay?: number;
+            /** A number specifying the time in milliseconds spent on animation. */
+            duration?: number;
+            /** A string specifying the type of an easing function used for animation. */
+            easing?: string;
+            /** Specifies the initial animation state. */
+            from?: any;
+            /** A function called before animation is started. */
+            start?: (element: JQuery, config: AnimationOptions) => void;
+            /** Specifies a final animation state. */
+            to?: any;
+            /** A string value specifying the animation type. */
+            type?: string;
+            /** Specifies the animation direction for the "slideIn" and "slideOut" animation types. */
+            direction?: string;
+        }
+        /** Animates the specified element. */
+        export function animate(element: HTMLElement, config: AnimationOptions): Object;
+        /** Returns a value indicating whether the specified element is being animated. */
+        export function isAnimating(element: HTMLElement): boolean;
+        /** Stops the animation. */
+        export function stop(element: HTMLElement, jumpToEnd: boolean): void;
+    }
+    /** The manager that performs several specified animations at a time. */
+    export class TransitionExecutor {
+        /** Deletes all the animations registered in the Transition Executor by using the enter(elements, animation) and leave(elements, animation) methods. */
+        reset(): void;
+        /** Registers a set of elements that should be animated as "entering" using the specified animation configuration. */
+        enter(elements: JQuery, animation: any): void;
+        /** Registers a set of elements that should be animated as "leaving" using the specified animation configuration. */
+        leave(elements: JQuery, animation: any): void;
+        /** Starts all the animations registered using the enter(elements, animation) and leave(elements, animation) methods beforehand. */
+        start(config: Object): JQueryPromise<void>;
+        /** Stops all started animations. */
+        stop(): void;
+    }
+    export class AnimationPresetCollection {
+        /** Resets all the changes made in the animation repository. */
+        resetToDefaults(): void;
+        /** Deletes the specified animation or clears all the animation repository, if an animation name is not passed. */
+        clear(name: string): void;
+        /** Adds the specified animation preset to the animation repository by the specified name. */
+        registerPreset(name: string, config: any): void;
+        /** Applies the changes made in the animation repository. */
+        applyChanges(): void;
+        /** Returns the configuration of the animation found in the animation repository by the specified name for the current device. */
+        getPreset(name: string): void;
+        /** Registers predefined animations in the animation repository. */
+        registerDefaultPresets(): void;
+    }
+    /** A repository of animations. */
+    export var animationPresets: AnimationPresetCollection;
+    /** The device object defines the device on which the application is running. */
+    export interface Device {
+        /** Indicates whether or not the device platform is Android. */
+        android?: boolean;
+        /** Specifies the type of the device on which the application is running. */
+        deviceType?: string;
+        /** Indicates whether or not the device platform is generic, which means that the application will look and behave according to a generic "light" or "dark" theme. */
+        generic?: boolean;
+        /** Indicates whether or not the device platform is iOS. */
+        ios?: boolean;
+        /** Indicates whether or not the device type is 'phone'. */
+        phone?: boolean;
+        /** Specifies the platform of the device on which the application is running. */
+        platform?: string;
+        /** Indicates whether or not the device type is 'tablet'. */
+        tablet?: boolean;
+        /** Specifies an array with the major and minor versions of the device platform. */
+        version?: Array<number>;
+        /** Indicates whether or not the device platform is Windows. */
+        win?: boolean;
+        /** Specifies a performance grade of the current device. */
+        grade?: string;
+    }
+    export class Devices implements EventsMixin<Devices> {
+        constructor(options: { window: Window });
+        /** Overrides actual device information to force the application to operate as if it was running on the specified device. */
+        current(deviceName: any): void;
+        /** Returns information about the current device. */
+        current(): Device;
+        orientationChanged: JQueryCallback;
+        /** Returns the current device orientation. */
+        orientation(): string;
+        /** Returns real information about the current device regardless of the value passed to the devices.current(deviceName) method. */
+        real(): Device;
+        on(eventName: "orientationChanged", eventHandler: (e: { orientation: string }) => void): Devices;
+        on(eventName: string, eventHandler: Function): Devices;
+        on(events: { [eventName: string]: Function; }): Devices;
+        off(eventName: "orientationChanged"): Devices;
+        off(eventName: string): Devices;
+        off(eventName: "orientationChanged", eventHandler: (e: { orientation: string }) => void): Devices;
+        off(eventName: string, eventHandler: Function): Devices;
+    }
+    /** An object that serves as a namespace for the methods and events specifying information on the current device. */
+    export var devices: Devices;
+    /** The position object specifies the widget positioning options. */
+    export interface PositionOptions {
+        /** The target element position that the widget is positioned against. */
+        at?: string;
+        /** The element within which the widget is positioned. */
+        boundary?: Element;
+        /** A string value holding horizontal and vertical offset from the window's boundaries. */
+        boundaryOffset?: string;
+        /** Specifies how to move the widget if it overflows the screen. */
+        collision?: any;
+        /** The position of the widget to align against the target element. */
+        my?: string;
+        /** The target element that the widget is positioned against. */
+        of?: HTMLElement;
+        /** A string value holding horizontal and vertical offset in pixels, separated by a space (e.g., "5 -10"). */
+        offset?: string;
+    }
+    export interface ComponentOptions {
+        /** A handler for the initialized event. */
+        onInitialized?: Function;
+        /** A handler for the optionChanged event. */
+        onOptionChanged?: Function;
+        /** A handler for the disposing event. */
+        onDisposing?: Function;
+    }
+    /** A base class for all components and widgets. */
+    export class Component {
+        constructor(options?: ComponentOptions)
+        /** Prevents the component from refreshing until the endUpdate method is called. */
+        beginUpdate(): void;
+        /** Enables the component to refresh after the beginUpdate method call. */
+        endUpdate(): void;
+        /** Returns an instance of this component class. */
+        instance(): Component;
+        /** Returns the configuration options of this component. */
+        option(): {
+            [optionKey: string]: any;
+        };
+        /** Sets one or more options of this component. */
+        option(options: {
+            [optionKey: string]: any;
+        }): void;
+        /** Gets the value of the specified configuration option of this component. */
+        option(optionName: string): any;
+        /** Sets a value to the specified configuration option of this component. */
+        option(optionName: string, optionValue: any): void;
+    }
+    export interface DOMComponentOptions extends ComponentOptions {
+        /** Specifies whether or not the current component supports a right-to-left representation. */
+        rtlEnabled?: boolean;
+        /** Specifies the height of the widget. */
+        height?: any;
+        /** Specifies the width of the widget. */
+        width?: any;
+    }
+    /** A base class for all components. */
+    export class DOMComponent extends Component {
+        constructor(element: JQuery, options?: DOMComponentOptions);
+        constructor(element: HTMLElement, options?: DOMComponentOptions);
+        /** Returns the root HTML element of the widget. */
+        element(): JQuery;
+        /** Specifies the device-dependent default configuration options for this component. */
+        static defaultOptions(rule: {
+            device?: any;
+            options?: any;
+        }): void;
+    }
+    export module data {
+        export interface ODataError extends Error {
+            httpStatus?: number;
+            errorDetails?: any;
+        }
+        export interface StoreOptions {
+            /** A handler for the modified event. */
+            onModified?: () => void;
+            /** A handler for the modifying event. */
+            onModifying?: () => void;
+            /** A handler for the removed event. */
+            onRemoved?: (key: any) => void;
+            /** A handler for the removing event. */
+            onRemoving?: (key: any) => void;
+            /** A handler for the updated event. */
+            onUpdated?: (key: any, values: Object) => void;
+            /** A handler for the updating event. */
+            onUpdating?: (key: any, values: Object) => void;
+            /** A handler for the loaded event. */
+            onLoaded?: (result: Array<any>) => void;
+            /** A handler for the loading event. */
+            onLoading?: (loadOptions: LoadOptions) => void;
+            /** A handler for the inserted event. */
+            onInserted?: (values: Object, key: any) => void;
+            /** A handler for the inserting event. */
+            onInserting?: (values: Object) => void;
+            /** Specifies the function called when the Store causes an error. */
+            errorHandler?: (e: Error) => void;
+            /** Specifies the key properties within the data associated with the Store. */
+            key?: any;
+        }
+        export interface LoadOptions {
+            filter?: Object;
+            sort?: Object;
+            select?: Object;
+            expand?: Object;
+            group?: Object;
+            skip?: number;
+            take?: number;
+            userData?: Object;
+            requireTotalCount?: boolean;
+        }
+        /** The base class for all Stores. */
+        export class Store implements EventsMixin<Store> {
+            constructor(options?: StoreOptions);
+            /** Returns the data item specified by the key. */
+            byKey(key: any): JQueryPromise<any>;
+            /** Adds an item to the data associated with this Store. */
+            insert(values: Object): JQueryPromise<any>;
+            /** Returns the key expression specified via the key configuration option. */
+            key(): any;
+            /** Returns the key of the Store item that matches the specified object. */
+            keyOf(obj: Object): any;
+            /** Starts loading data. */
+            load(obj?: LoadOptions): JQueryPromise<any[]>;
+            /** Removes the data item specified by the key. */
+            remove(key: any): JQueryPromise<any>;
+            /** Obtains the total count of items that will be returned by the load() function. */
+            totalCount(options?: {
+                filter?: Object;
+                group?: Object;
+            }): JQueryPromise<any>;
+            /** Updates the data item specified by the key. */
+            update(key: any, values: Object): JQueryPromise<any>;
+            on(eventName: "removing", eventHandler: (key: any) => void): Store;
+            on(eventName: "removed", eventHandler: (key: any) => void): Store;
+            on(eventName: "updating", eventHandler: (key: any, values: Object) => void): Store;
+            on(eventName: "updated", eventHandler: (key: any, values: Object) => void): Store;
+            on(eventName: "inserting", eventHandler: (values: Object) => void): Store;
+            on(eventName: "inserted", eventHandler: (values: Object, key: any) => void): Store;
+            on(eventName: "modifying", eventHandler: () => void): Store;
+            on(eventName: "modified", eventHandler: () => void): Store;
+            on(eventName: "loading", eventHandler: (loadOptions: LoadOptions) => void): Store;
+            on(eventName: "loaded", eventHandler: (result: Array<any>) => void): Store;
+            on(eventName: string, eventHandler: Function): Store;
+            on(events: { [eventName: string]: Function; }): Store;
+            off(eventName: "removing"): Store;
+            off(eventName: "removed"): Store;
+            off(eventName: "updating"): Store;
+            off(eventName: "updated"): Store;
+            off(eventName: "inserting"): Store;
+            off(eventName: "inserted"): Store;
+            off(eventName: "modifying"): Store;
+            off(eventName: "modified"): Store;
+            off(eventName: "loading"): Store;
+            off(eventName: "loaded"): Store;
+            off(eventName: string): Store;
+            off(eventName: "removing", eventHandler: (key: any) => void): Store;
+            off(eventName: "removed", eventHandler: (key: any) => void): Store;
+            off(eventName: "updating", eventHandler: (key: any, values: Object) => void): Store;
+            off(eventName: "updated", eventHandler: (key: any, values: Object) => void): Store;
+            off(eventName: "inserting", eventHandler: (values: Object) => void): Store;
+            off(eventName: "inserted", eventHandler: (values: Object, key: any) => void): Store;
+            off(eventName: "modifying", eventHandler: () => void): Store;
+            off(eventName: "modified", eventHandler: () => void): Store;
+            off(eventName: "loading", eventHandler: (loadOptions: LoadOptions) => void): Store;
+            off(eventName: "loaded", eventHandler: (result: Array<any>) => void): Store;
+            off(eventName: string, eventHandler: Function): Store;
+        }
+        export interface ArrayStoreOptions extends StoreOptions {
+            /** Specifies the array associated with this Store. */
+            data?: Array<any>;
+        }
+        /** A Store accessing an in-memory array. */
+        export class ArrayStore extends Store {
+            constructor(options?: ArrayStoreOptions);
+            /** Clears all data associated with the current ArrayStore. */
+            clear(): void;
+            /** Creates the Query object for the underlying array. */
+            createQuery(): Query;
+        }
+        interface Promise {
+            then(doneFn?: Function, failFn?: Function, progressFn?: Function): Promise;
+        }
+        export interface CustomStoreOptions extends StoreOptions {
+            /** The user implementation of the byKey(key, extraOptions) method. */
+            byKey?: (key: any) => Promise;
+            /** The user implementation of the insert(values) method. */
+            insert?: (values: Object) => Promise;
+            /** The user implementation of the load(options) method. */
+            load?: (options?: LoadOptions) => Promise;
+            /** The user implementation of the remove(key) method. */
+            remove?: (key: any) => Promise;
+            /** The user implementation of the totalCount(options) method. */
+            totalCount?: (options?: {
+                filter?: Object;
+                group?: Object;
+            }) => Promise;
+            /** The user implementation of the update(key, values) method. */
+            update?: (key: any, values: Object) => Promise;
+        }
+        /** A Store object that enables you to implement your own data access logic. */
+        export class CustomStore extends Store {
+            constructor(options: CustomStoreOptions);
+        }
+        export interface DataSourceOptions {
+            /** Specifies data filtering conditions. */
+            filter?: Object;
+            /** Specifies data grouping conditions. */
+            group?: Object;
+            /** The item mapping function. */
+            map?: (record: any) => any;
+            /** Specifies the maximum number of items the page can contain. */
+            pageSize?: number;
+            /** Specifies whether a DataSource loads data by pages, or all items at once. */
+            paginate?: boolean;
+            /** The data post processing function. */
+            postProcess?: (data: any[]) => any[];
+            /** Specifies a value by which the required items are searched. */
+            searchExpr?: Object;
+            /** Specifies the comparison operation used to search for the required items. */
+            searchOperation?: string;
+            /** Specifies the value to which the search expression is compared. */
+            searchValue?: Object;
+            /** Specifies the initial select option value. */
+            select?: Object;
+            /** An array of the strings that represent the names of the navigation properties to be loaded simultaneously with the OData store's entity. */
+            expand?: Object;
+            /** Specifies whether or not the DataSource instance requests the total count of items available in the storage. */
+            requireTotalCount?: boolean;
+            /** Specifies the initial sort option value. */
+            sort?: Object;
+            /** Specifies the underlying Store instance used to access data. */
+            store?: any;
+            /** A handler for the changed event. */
+            onChanged?: () => void;
+            /** A handler for the loadingChanged event. */
+            onLoadingChanged?: (isLoading: boolean) => void;
+            /** A handler for the loadError event. */
+            onLoadError?: (e?: Error) => void;
+        }
+        /** An object that provides access to a data web service or local data storage for collection container widgets. */
+        export class DataSource implements EventsMixin<DataSource> {
+            constructor(url: string);
+            constructor(data: Array<any>);
+            constructor(options: CustomStoreOptions);
+            constructor(options: DataSourceOptions);
+            /** Disposes all resources associated with this DataSource. */
+            dispose(): void;
+            /** Returns the current filter option value. */
+            filter(): Object;
+            /** Sets the filter option value. */
+            filter(filterExpr: Object): void;
+            /** Returns the current group option value. */
+            group(): Object;
+            /** Sets the group option value. */
+            group(groupExpr: Object): void;
+            /** Indicates whether or not the current page contains fewer items than the number of items specified by the pageSize configuration option. */
+            isLastPage(): boolean;
+            /** Indicates whether or not at least one load() method execution has successfully finished. */
+            isLoaded(): boolean;
+            /** Indicates whether or not the DataSource is currently being loaded. */
+            isLoading(): boolean;
+            /** Returns the array of items currently operated by the DataSource. */
+            items(): Array<any>;
+            /** Returns the key expression. */
+            key(): any;
+            /** Starts loading data. */
+            load(): JQueryPromise<Array<any>>;
+            /** Clears currently loaded DataSource items and calls the load() method. */
+            reload(): JQueryPromise<Array<any>>;
+            /** Returns an object that would be passed to the load() method of the underlying Store according to the current data shaping option values of the current DataSource instance. */
+            loadOptions(): Object;
+            /** Returns the current pageSize option value. */
+            pageSize(): number;
+            /** Sets the pageSize option value. */
+            pageSize(value: number): void;
+            /** Specifies the index of the currently loaded page. */
+            pageIndex(): number;
+            /** Specifies the index of the page to be loaded during the next load() method execution. */
+            pageIndex(newIndex: number): void;
+            /** Returns the current paginate option value. */
+            paginate(): boolean;
+            /** Sets the paginate option value. */
+            paginate(value: boolean): void;
+            /** Returns the searchExpr option value. */
+            searchExpr(): Object;
+            /** Sets the searchExpr option value. */
+            searchExpr(expr: Object): void;
+            /** Returns the currently specified search operation. */
+            searchOperation(): string;
+            /** Sets the current search operation. */
+            searchOperation(op: string): void;
+            /** Returns the searchValue option value. */
+            searchValue(): Object;
+            /** Sets the searchValue option value. */
+            searchValue(value: Object): void;
+            /** Returns the current select option value. */
+            select(): Object;
+            /** Sets the select option value. */
+            select(expr: Object): void;
+            /** Returns the current requireTotalCount option value. */
+            requireTotalCount(): boolean;
+            /** Sets the requireTotalCount option value. */
+            requireTotalCount(value: boolean): void;
+            /** Returns the current sort option value. */
+            sort(): Object;
+            /** Sets the sort option value. */
+            sort(sortExpr: Object): void;
+            /** Returns the underlying Store instance. */
+            store(): Store;
+            /** Returns the number of data items available in an underlying Store after the last load() operation without paging. */
+            totalCount(): number;
+            on(eventName: "loadingChanged", eventHandler: (isLoading: boolean) => void): DataSource;
+            on(eventName: "loadError", eventHandler: (e?: Error) => void): DataSource;
+            on(eventName: "changed", eventHandler: () => void): DataSource;
+            on(eventName: string, eventHandler: Function): DataSource;
+            on(events: { [eventName: string]: Function; }): DataSource;
+            off(eventName: "loadingChanged"): DataSource;
+            off(eventName: "loadError"): DataSource;
+            off(eventName: "changed"): DataSource;
+            off(eventName: string): DataSource;
+            off(eventName: "loadingChanged", eventHandler: (isLoading: boolean) => void): DataSource;
+            off(eventName: "loadError", eventHandler: (e?: Error) => void): DataSource;
+            off(eventName: "changed", eventHandler: () => void): DataSource;
+            off(eventName: string, eventHandler: Function): DataSource;
+        }
+        /** An object used to work with primitive data types not supported by JavaScript when accessing an OData web service. */
+        export class EdmLiteral {
+            /** Creates an EdmLiteral instance and assigns the specified value to it. */
+            constructor(value: string);
+            /** Returns a string representation of the value associated with this EdmLiteral object. */
+            valueOf(): string;
+        }
+        /** An object used to generate and hold the GUID. */
+        export class Guid {
+            /** Creates a new Guid instance that holds the specified GUID. */
+            constructor(value: string);
+            /** Creates a new Guid instance holding the generated GUID. */
+            constructor();
+            /** Returns a string representation of the Guid instance. */
+            toString(): string;
+            /** Returns a string representation of the Guid instance. */
+            valueOf(): string;
+        }
+        export interface LocalStoreOptions extends ArrayStoreOptions {
+            /** Specifies the time (in miliseconds) after the change operation, before the data is flushed. */
+            flushInterval?: number;
+            /** Specifies whether the data is flushed immediatelly after each change operation, or after the delay specified via the flushInterval option. */
+            immediate?: boolean;
+            /** The unique identifier used to distinguish the data within the HTML5 Web Storage. */
+            name?: string;
+        }
+        /** A Store providing access to the HTML5 Web Storage. */
+        export class LocalStore extends ArrayStore {
+            constructor(options?: LocalStoreOptions);
+            /** Removes all data associated with this Store. */
+            clear(): void;
+        }
+        export interface ODataContextOptions extends ODataStoreOptions {
+            /** Specifies the list of entities to be accessed via the ODataContext. */
+            entities?: Object;
+            /** Specifies the function called if the ODataContext causes an error. */
+            errorHandler?: (e: Error) => void;
+        }
+        /** Provides access to the entire OData service. */
+        export class ODataContext {
+            constructor(options?: ODataContextOptions);
+            /** Initiates the specified WebGet service operation that returns a value. For the information on service operations, refer to the OData documentation. */
+            get(operationName: string, params: Object): JQueryPromise<any>;
+            /** Initiates the specified WebGet service operation that returns nothing. For the information on service operations, refer to the OData documentation. */
+            invoke(operationName: string, params: Object, httpMethod: Object): JQueryPromise<any>;
+            /** Return a special proxy object to describe the entity link. */
+            objectLink(entityAlias: string, key: any): Object;
+        }
+        export interface ODataStoreOptions extends StoreOptions {
+            /** A function used to customize a web request before it is sent. */
+            beforeSend?: (request: {
+                url: string;
+                async: boolean;
+                method: string;
+                timeout: number;
+                params: Object;
+                payload: Object;
+                headers: Object;
+            }) => void;
+            /** Specifies whether the ODataStore uses the JSONP approach to access non-CORS-compatible remote services. */
+            jsonp?: boolean;
+            /** Specifies the type of the ODataStore key property. The following key types are supported out of the box: String, Int32, Int64, and Guid. */
+            keyType?: any;
+            /** Specifies whether or not dates found in the response are deserialized. */
+            deserializeDates?: boolean;
+            /** Specifies the URL of the data service being accessed via the current ODataContext. */
+            url?: string;
+            /** Specifies the version of the OData protocol used to interact with the data service. */
+            version?: number;
+            /** Specifies the value of the withCredentials field of the underlying jqXHR object. */
+            withCredentials?: boolean;
+        }
+        /** A Store providing access to a separate OData web service entity. */
+        export class ODataStore extends Store {
+            constructor(options?: ODataStoreOptions);
+            /** Creates the Query object for the OData endpoint. */
+            createQuery(loadOptions: Object): Object;
+            /** Returns the data item specified by the key. */
+            byKey(key: any, extraOptions?: { expand?: Object }): JQueryPromise<any>;
+        }
+        /** An universal chainable data query interface object. */
+        export interface Query {
+            /** Calculates a custom summary for the items in the current Query. */
+            aggregate(step: (accumulator: any, value: any) => any): JQueryPromise<any>;
+            /** Calculates a custom summary for the items in the current Query. */
+            aggregate(seed: any, step: (accumulator: any, value: any) => any, finalize: (result: any) => any): JQueryPromise<any>;
+            /** Calculates the average item value for the current Query. */
+            avg(getter: Object): JQueryPromise<any>;
+            /** Finds the item with the maximum getter value. */
+            max(getter: Object): JQueryPromise<any>;
+            /** Finds the item with the maximum value in the Query. */
+            max(): JQueryPromise<any>;
+            /** Finds the item with the minimum value in the Query. */
+            min(): JQueryPromise<any>;
+            /** Finds the item with the minimum getter value. */
+            min(getter: Object): JQueryPromise<any>;
+            /** Calculates the average item value for the current Query, if each Query item has a numeric type. */
+            avg(): JQueryPromise<any>;
+            /** Returns the total count of items in the current Query. */
+            count(): JQueryPromise<any>;
+            /** Executes the Query. */
+            enumerate(): JQueryPromise<any>;
+            /** Filters the current Query data. */
+            filter(criteria: Array<any>): Query;
+            /** Filters the current Query data. */
+            filter(predicate: (item: any) => boolean): Query;
+            /** Groups the current Query data. */
+            groupBy(getter: Object): Query;
+            /** Applies the specified transformation to each item. */
+            select(getter: Object): Query;
+            /** Limits the data item count. */
+            slice(skip: number, take?: number): Query;
+            /** Sorts current Query data. */
+            sortBy(getter: Object, desc: boolean): Query;
+            /** Sorts current Query data. */
+            sortBy(getter: Object): Query;
+            /** Calculates the sum of item getter values in the current Query. */
+            sum(getter: Object): JQueryPromise<any>;
+            /** Calculates the sum of item values in the current Query. */
+            sum(): JQueryPromise<any>;
+            /** Adds one more sorting condition to the current Query. */
+            thenBy(getter: Object): Query;
+            /** Adds one more sorting condition to the current Query. */
+            thenBy(getter: Object, desc: boolean): Query;
+            /** Returns the array of current Query items. */
+            toArray(): Array<any>;
+        }
+        /** The global data layer error handler. */
+        export var errorHandler: (e: Error) => void;
+        /** Encodes the specified string or array of bytes to base64 encoding. */
+        export function base64_encode(input: any): string;
+        /** Creates a Query instance. */
+        export function query(array: Array<any>): Query;
+        /** Creates a Query instance for accessing the remote service specified by a URL. */
+        export function query(url: string, queryOptions: Object): Query;
+        /** This section describes the utility objects provided by the DevExtreme data layer. */
+        export var utils: {
+            /** Compiles a getter function from the getter expression. */
+            compileGetter(expr: any): Function;
+            /** Compiles a setter function from the setter expression. */
+            compileSetter(expr: any): Function;
+            odata: {
+                /** Holds key value converters for OData. */
+                keyConverters: {
+                    String(value: any): string;
+                    Int32(value: any): number;
+                    Int64(value: any): EdmLiteral;
+                    Guid(value: any): Guid;
+                    Boolean(value: any): boolean;
+                    Single(value: any): EdmLiteral;
+                    Decimal(value: any): EdmLiteral;
+                };
+            }
+        }
+    }
+    /** An object that serves as a namespace for DevExtreme UI widgets as well as for methods implementing UI logic in DevExtreme sites/applications. */
+    export module ui {
+        export interface WidgetOptions extends DOMComponentOptions {
+            /** A Boolean value specifying whether or not the widget changes its state when interacting with a user. */
+            activeStateEnabled?: boolean;
+            /** A Boolean value specifying whether or not the widget can respond to user interaction. */
+            disabled?: boolean;
+            /** A Boolean value specifying whether or not the widget changes its state when being hovered by an end user. */
+            hoverStateEnabled?: boolean;
+            /** Specifies whether or not the widget can be focused. */
+            focusStateEnabled?: boolean;
+            /** Specifies a shortcut key that sets focus on the widget element. */
+            accessKey?: string;
+            /** A Boolean value specifying whether or not the widget is visible. */
+            visible?: boolean;
+            /** Specifies the widget tab index. */
+            tabIndex?: number;
+            /** Specifies the text of the hint displayed for the widget. */
+            hint?: string;
+        }
+        /** The base class for widgets. */
+        export class Widget extends DOMComponent {
+            constructor(options?: WidgetOptions);
+            /** Redraws the widget. */
+            repaint(): void;
+            /** Sets focus on the widget. */
+            focus(): void;
+            /** Registers a handler when a specified key is pressed. */
+            registerKeyHandler(key: string, handler: Function): void;
+        }
+        export interface CollectionWidgetOptions extends WidgetOptions {
+            /** A data source used to fetch data to be displayed by the widget. */
+            dataSource?: any;
+            /** The time period in milliseconds before the onItemHold event is raised. */
+            itemHoldTimeout?: number;
+            /** An array of items displayed by the widget. */
+            items?: Array<any>;
+            /** The template to be used for rendering items. */
+            itemTemplate?: any;
+            loopItemFocus?: boolean;
+            /** The text or HTML markup displayed by the widget if the item collection is empty. */
+            noDataText?: string;
+            onContentReady?: any;
+            /** A handler for the itemClick event. */
+            onItemClick?: any;
+            /** A handler for the itemContextMenu event. */
+            onItemContextMenu?: Function;
+            /** A handler for the itemHold event. */
+            onItemHold?: Function;
+            /** A handler for the itemRendered event. */
+            onItemRendered?: Function;
+            /** A handler for the selectionChanged event. */
+            onSelectionChanged?: Function;
+            /** The index of the currently selected widget item. */
+            selectedIndex?: number;
+            /** The selected item object. */
+            selectedItem?: Object;
+            /** An array of currently selected item objects. */
+            selectedItems?: Array<any>;
+            /** A handler for the itemDeleting event. */
+            onItemDeleting?: Function;
+            /** A handler for the itemDeleted event. */
+            onItemDeleted?: Function;
+            /** A handler for the itemReordered event. */
+            onItemReordered?: Function;
+        }
+        /** The base class for widgets containing an item collection. */
+        export class CollectionWidget extends Widget {
+            constructor(element: JQuery, options?: CollectionWidgetOptions);
+            constructor(element: HTMLElement, options?: CollectionWidgetOptions);
+            selectItem(itemElement: any): void;
+            unselectItem(itemElement: any): void;
+            deleteItem(itemElement: any): JQueryPromise<void>;
+            isItemSelected(itemElement: any): boolean;
+            reorderItem(itemElement: any, toItemElement: any): JQueryPromise<void>;
+        }
+        export interface DataExpressionMixinOptions {
+            /** A data source used to fetch data to be displayed by the widget. */
+            dataSource?: any;
+            /** Specifies the name of the data source item field whose value is displayed by the widget. */
+            displayExpr?: any;
+            /** Specifies the name of a data source item field whose value is held in the value configuration option. */
+            valueExpr?: any;
+            /** An array of items displayed by the widget. */
+            items?: Array<any>;
+            /** The template to be used for rendering items. */
+            itemTemplate?: any;
+            /** The currently selected value in the widget. */
+            value?: Object;
+        }
+        export interface EditorOptions extends WidgetOptions {
+            /** The currently specified value. */
+            value?: Object;
+            /** A handler for the valueChanged event. */
+            onValueChanged?: Function;
+            /** A Boolean value specifying whether or not the widget is read-only. */
+            readOnly?: boolean;
+            /** Holds the object that defines the error that occurred during validation. */
+            validationError?: Object;
+            /** Specifies whether the editor's value is valid. */
+            isValid?: boolean;
+            /** Specifies how the message about the validation rules that are not satisfied by this editor's value is displayed. */
+            validationMessageMode?: string;
+        }
+        /** A base class for editors. */
+        export class Editor extends Widget {
+            /** Resets the editor's value to undefined. */
+            reset(): void;
+        }
+        /** An object that serves as a namespace for methods displaying a message in an application/site. */
+        export var dialog: {
+            /** Creates an alert dialog message containing a single "OK" button. */
+            alert(message: string, title: string): JQueryPromise<void>;
+            /** Creates a confirm dialog that contains "Yes" and "No" buttons. */
+            confirm(message: string, title: string): JQueryPromise<boolean>;
+            /** Creates a custom dialog using the options specified by the passed configuration object. */
+            custom(options: { title?: string; message?: string; buttons?: Array<Object>; }): {
+                show(): JQueryPromise<any>;
+                hide(): void;
+                hide(value: any): void;
+            };
+        };
+        /** Creates a toast message. */
+        export function notify(message: any, type: string, displayTime: number): void;
+        /** Creates a toast message. */
+        export function notify(options: Object): void;
+        /** An object that serves as a namespace for the methods that work with DevExtreme CSS Themes. */
+        export var themes: {
+            /** Returns the name of the currently applied theme. */
+            current(): string;
+            /** Changes the current theme to the specified one. */
+            current(themeName: string): void;
+        };
+        /** Sets a specified template engine. */
+        export function setTemplateEngine(name: string): void;
+        /** Sets a custom template engine defined via custom compile and render functions. */
+        export function setTemplateEngine(options: Object): void;
+    }
+    /** An object that serves as a namespace for utility methods that can be helpful when working with the DevExtreme framework and UI widgets. */
+    export var utils: {
+        /** Sets parameters for the viewport meta tag. */
+        initMobileViewport(options: { allowZoom?: boolean; allowPan?: boolean; allowSelection?: boolean }): void;
+        /** Requests that the browser call a specified function to update animation before the next repaint. */
+        requestAnimationFrame(callback: Function): number;
+        /** Cancels an animation frame request scheduled with the requestAnimationFrame method. */
+        cancelAnimationFrame(requestID: number): void;
+    };
+    /** An object that serves as a namespace for DevExtreme Data Visualization Widgets. */
+    export module viz {
+        /** Applies a theme for the entire page with several DevExtreme visualization widgets. */
+        export function currentTheme(theme: string): void;
+        /** Applies a new theme (with the color scheme defined separately) for the entire page with several DevExtreme visualization widgets. */
+        export function currentTheme(platform: string, colorScheme: string): void;
+        /** Registers a new theme based on the existing one. */
+        export function registerTheme(customTheme: Object, baseTheme: string): void;
+        /** Applies a predefined or registered custom palette to all visualization widgets at once. */
+        export function currentPalette(paletteName: string): void;
+        /** Obtains the color sets of a predefined or registered palette. */
+        export function getPalette(paletteName: string): Object;
+        /** Registers a new palette. */
+        export function registerPalette(paletteName: string, palette: Object): void;
+    }
+}
+declare namespace DevExpress.ui {
+    export interface dxValidatorOptions extends DOMComponentOptions {
+        /** An array of validation rules to be checked for the editor with which the dxValidator object is associated. */
+        validationRules?: Array<any>;
+        /** Specifies the editor name to be used in the validation default messages. */
+        name?: string;
+        /** An object that specifies what and when to validate and how to apply the validation result. */
+        adapter?: Object;
+        /** Specifies the validation group the editor will be related to. */
+        validationGroup?: string;
+        /** A handler for the validated event. */
+        onValidated?: (params: validationEngine.ValidatorValidationResult) => void;
+    }
+    /** A widget that is used to validate the associated DevExtreme editors against the defined validation rules. */
+    export class dxValidator extends DOMComponent implements validationEngine.IValidator {
+        constructor(element: JQuery, options?: dxValidatorOptions);
+        constructor(element: Element, options?: dxValidatorOptions);
+        /** Validates the value of the editor that is controlled by the current dxValidator object against the list of the specified validation rules. */
+        validate(): validationEngine.ValidatorValidationResult;
+        /** Resets the value and validation result of the editor associated with the current dxValidator object. */
+        reset(): void;
+    }
+    /** The widget that is used in the Knockout and Angular approaches to combine the editors to be validated. */
+    export class dxValidationGroup extends DOMComponent {
+        constructor(element: JQuery);
+        constructor(element: Element);
+        /** Validates rules of the validators that belong to the current validation group. */
+        validate(): validationEngine.ValidationGroupValidationResult;
+        /** Resets the value and validation result of the editors that are included to the current validation group. */
+        reset(): void;
+    }
+    export interface dxValidationSummaryOptions extends CollectionWidgetOptions {
+        /** Specifies the validation group for which summary should be generated. */
+        validationGroup?: string;
+    }
+    /** A widget for displaying the result of checking validation rules for editors. */
+    export class dxValidationSummary extends CollectionWidget {
+        constructor(element: JQuery, options?: dxValidationSummaryOptions);
+        constructor(element: Element, options?: dxValidationSummaryOptions);
+    }
+    export interface dxResizableOptions extends DOMComponentOptions {
+        /** Specifies which borders of the widget element are used as a handle. */
+        handles?: string;
+        /** Specifies the lower width boundary for resizing. */
+        minWidth?: number;
+        /** Specifies the upper width boundary for resizing. */
+        maxWidth?: number;
+        /** Specifies the lower height boundary for resizing. */
+        minHeight?: number;
+        /** Specifies the upper height boundary for resizing. */
+        maxHeight?: number;
+        /** A handler for the resizeStart event. */
+        onResizeStart?: Function;
+        /** A handler for the resize event. */
+        onResize?: Function;
+        /** A handler for the resizeEnd event. */
+        onResizeEnd?: Function;
+    }
+    /** A widget that displays required content in a resizable element. */
+    export class dxResizable extends DOMComponent {
+        constructor(element: JQuery, options?: dxResizableOptions);
+        constructor(element: Element, options?: dxResizableOptions);
+    }
+    export interface dxTooltipOptions extends dxPopoverOptions {
+    }
+    /** A tooltip widget. */
+    export class dxTooltip extends dxPopover {
+        constructor(element: JQuery, options?: dxTooltipOptions);
+        constructor(element: Element, options?: dxTooltipOptions);
+    }
+    export interface dxDropDownListOptions extends dxDropDownEditorOptions, DataExpressionMixinOptions {
+        /** Returns the value currently displayed by the widget. */
+        displayValue?: string;
+        /** The minimum number of characters that must be entered into the text box to begin a search. */
+        minSearchLength?: number;
+        /** Specifies whether or not the widget displays unfiltered values until a user types a number of characters exceeding the minSearchLength option value. */
+        showDataBeforeSearch?: boolean;
+        /** Specifies the name of a data source item field or an expression whose value is compared to the search criterion. */
+        searchExpr?: Object;
+        /** Specifies the binary operation used to filter data. */
+        searchMode?: string;
+        /** Specifies the time delay, in milliseconds, after the last character has been typed in, before a search is executed. */
+        searchTimeout?: number;
+        /** A handler for the valueChanged event. */
+        onValueChanged?: Function;
+        /** Specifies DOM event names that update a widget's value. */
+        valueChangeEvent?: string;
+        /** Specifies whether or not the widget supports searching. */
+        searchEnabled?: boolean;
+        /**
+         * Specifies whether or not the widget displays items by pages.
+         * @deprecated dataSource.paginate.md
+         */
+        pagingEnabled?: boolean;
+        /** The text or HTML markup displayed by the widget if the item collection is empty. */
+        noDataText?: string;
+        /** A handler for the selectionChanged event. */
+        onSelectionChanged?: Function;
+        /** A handler for the itemClick event. */
+        onItemClick?: Function;
+        onContentReady?: Function;
+    }
+    /** A base class for drop-down list widgets. */
+    export class dxDropDownList extends dxDropDownEditor {
+        constructor(element: JQuery, options?: dxDropDownListOptions);
+        constructor(element: Element, options?: dxDropDownListOptions);
+    }
+    export interface dxToolbarOptions extends CollectionWidgetOptions {
+        /** The template used to render menu items. */
+        menuItemTemplate?: any;
+        /** Informs the widget about its location in a view HTML markup. */
+        renderAs?: string;
+    }
+    /** A toolbar widget. */
+    export class dxToolbar extends CollectionWidget {
+        constructor(element: JQuery, options?: dxToolbarOptions);
+        constructor(element: Element, options?: dxToolbarOptions);
+    }
+    export interface dxToastOptions extends dxOverlayOptions {
+        animation?: fx.AnimationOptions;
+        /** The time span in milliseconds during which the dxToast widget is visible. */
+        displayTime?: number;
+        height?: any;
+        /** The dxToast message text. */
+        message?: string;
+        position?: PositionOptions;
+        shading?: boolean;
+        /** Specifies the dxToast widget type. */
+        type?: string;
+        width?: any;
+        closeOnBackButton?: boolean;
+        /** A Boolean value specifying whether or not the toast is closed if a user swipes it out of the screen boundaries. */
+        closeOnSwipe?: boolean;
+        /** A Boolean value specifying whether or not the toast is closed if a user clicks it. */
+        closeOnClick?: boolean;
+    }
+    /** The toast message widget. */
+    export class dxToast extends dxOverlay {
+        constructor(element: JQuery, options?: dxToastOptions);
+        constructor(element: Element, options?: dxToastOptions);
+    }
+    export interface dxTextEditorOptions extends EditorOptions {
+        /** A handler for the change event. */
+        onChange?: Function;
+        /** A handler for the copy event. */
+        onCopy?: Function;
+        /** A handler for the cut event. */
+        onCut?: Function;
+        /** A handler for the enterKey event. */
+        onEnterKey?: Function;
+        /** A handler for the focusIn event. */
+        onFocusIn?: Function;
+        /** A handler for the focusOut event. */
+        onFocusOut?: Function;
+        /** A handler for the input event. */
+        onInput?: Function;
+        /** A handler for the keyDown event. */
+        onKeyDown?: Function;
+        /** A handler for the keyPress event. */
+        onKeyPress?: Function;
+        /** A handler for the keyUp event. */
+        onKeyUp?: Function;
+        /** A handler for the paste event. */
+        onPaste?: Function;
+        /** The text displayed by the widget when the widget value is empty. */
+        placeholder?: string;
+        /** Specifies whether to display the Clear button in the widget. */
+        showClearButton?: boolean;
+        /** Specifies the current value displayed by the widget. */
+        value?: any;
+        /** Specifies DOM event names that update a widget's value. */
+        valueChangeEvent?: string;
+        /** Specifies whether or not the widget checks the inner text for spelling mistakes. */
+        spellcheck?: boolean;
+        /** Specifies HTML attributes applied to the inner input element of the widget. */
+        attr?: Object;
+        /** The read-only option that holds the text displayed by the widget input element. */
+        text?: string;
+        focusStateEnabled?: boolean;
+        hoverStateEnabled?: boolean;
+        /** The editor mask that specifies the format of the entered string. */
+        mask?: string;
+        /** Specifies a mask placeholder character. */
+        maskChar?: string;
+        /** Specifies custom mask rules. */
+        maskRules?: Object;
+        /** A message displayed when the entered text does not match the specified pattern. */
+        maskInvalidMessage?: string;
+        /** Specifies whether the value option holds only characters entered by a user or prompt characters as well. */
+        useMaskedValue?: boolean;
+    }
+    /** A base class for text editing widgets. */
+    export class dxTextEditor extends Editor {
+        constructor(element: JQuery, options?: dxTextEditorOptions);
+        constructor(element: Element, options?: dxTextEditorOptions);
+        /** Removes focus from the input element. */
+        blur(): void;
+        /** Sets focus to the input element representing the widget. */
+        focus(): void;
+    }
+    export interface dxTextBoxOptions extends dxTextEditorOptions {
+        /** Specifies the maximum number of characters you can enter into the textbox. */
+        maxLength?: any;
+        /** The "mode" attribute value of the actual HTML input element representing the text box. */
+        mode?: string;
+    }
+    /** A single-line text box widget. */
+    export class dxTextBox extends dxTextEditor {
+        constructor(element: JQuery, options?: dxTextBoxOptions);
+        constructor(element: Element, options?: dxTextBoxOptions);
+    }
+    export interface dxTextAreaOptions extends dxTextBoxOptions {
+        /** Specifies whether or not the widget checks the inner text for spelling mistakes. */
+        spellcheck?: boolean;
+    }
+    /** A widget used to display and edit multi-line text. */
+    export class dxTextArea extends dxTextBox {
+        constructor(element: JQuery, options?: dxTextAreaOptions);
+        constructor(element: Element, options?: dxTextAreaOptions);
+    }
+    export interface dxTabsOptions extends CollectionWidgetOptions {
+        /** Specifies whether the widget enables an end-user to select only a single item or multiple items. */
+        selectionMode?: string;
+        /** Specifies whether or not an end-user can scroll tabs by swiping. */
+        scrollByContent?: boolean;
+        /** Specifies whether or not an end-user can scroll tabs. */
+        scrollingEnabled?: boolean;
+        /** A Boolean value that specifies the availability of navigation buttons. */
+        showNavButtons?: boolean;
+    }
+    /** A tab strip used to switch between pages. */
+    export class dxTabs extends CollectionWidget {
+        constructor(element: JQuery, options?: dxTabsOptions);
+        constructor(element: Element, options?: dxTabsOptions);
+    }
+    export interface dxTabPanelOptions extends dxMultiViewOptions {
+        /** A handler for the titleClick event. */
+        onTitleClick?: any;
+        /** A handler for the titleHold event. */
+        onTitleHold?: Function;
+        /** A handler for the titleRendered event. */
+        onTitleRendered?: Function;
+        /** The template to be used for rendering an item title. */
+        itemTitleTemplate?: any;
+        /** A Boolean value specifying if the list is scrolled by content. */
+        scrollByContent?: boolean;
+        /** A Boolean value specifying whether to enable or disable scrolling. */
+        scrollingEnabled?: boolean;
+        /** A Boolean value that specifies the availability of navigation buttons. */
+        showNavButtons?: boolean;
+    }
+    /** A widget used to display a view and to switch between several views by clicking the appropriate tabs. */
+    export class dxTabPanel extends dxMultiView {
+        constructor(element: JQuery, options?: dxTabPanelOptions);
+        constructor(element: Element, options?: dxTabPanelOptions);
+    }
+    export interface dxSelectBoxOptions extends dxDropDownListOptions {
+        /** Specifies DOM event names that update a widget's value. */
+        valueChangeEvent?: string;
+        /** The template to be used for rendering the widget text field. */
+        fieldTemplate?: any;
+        /** The text that is provided as a hint in the select box editor. */
+        placeholder?: string;
+        /** Specifies whether or not the widget allows an end-user to enter a custom value. */
+        fieldEditEnabled?: boolean;
+    }
+    /** A widget that allows you to select an item in a dropdown list. */
+    export class dxSelectBox extends dxDropDownList {
+        constructor(element: JQuery, options?: dxSelectBoxOptions);
+        constructor(element: Element, options?: dxSelectBoxOptions);
+    }
+    export interface dxTagBoxOptions extends dxSelectBoxOptions {
+        /** Holds the list of selected values. */
+        values?: Array<any>;
+        /** A read-only option that holds the last selected value. */
+        value?: Object;
+    }
+    /** A widget that allows you to select multiple items from a dropdown list. */
+    export class dxTagBox extends dxSelectBox {
+        constructor(element: JQuery, options?: dxTagBoxOptions);
+        constructor(element: Element, options?: dxTagBoxOptions);
+    }
+    export interface dxScrollViewOptions extends dxScrollableOptions {
+        /** A handler for the pullDown event. */
+        onPullDown?: Function;
+        /** Specifies the text shown in the pullDown panel when pulling the content down lowers the refresh threshold. */
+        pulledDownText?: string;
+        /** Specifies the text shown in the pullDown panel while pulling the content down to the refresh threshold. */
+        pullingDownText?: string;
+        /** A handler for the reachBottom event. */
+        onReachBottom?: Function;
+        /** Specifies the text shown in the pullDown panel displayed when content is scrolled to the bottom. */
+        reachBottomText?: string;
+        /** Specifies the text shown in the pullDown panel displayed when the content is being refreshed. */
+        refreshingText?: string;
+        /** Returns a value indicating if the scrollView content is larger then the widget container. */
+        isFull(): boolean;
+        /** Locks the widget until the release(preventScrollBottom) method is called and executes the function passed to the onPullDown option and the handler assigned to the pullDown event. */
+        refresh(): void;
+        /** Notifies the scroll view that data loading is finished. */
+        release(preventScrollBottom: boolean): JQueryPromise<void>;
+        /** Toggles the loading state of the widget. */
+        toggleLoading(showOrHide: boolean): void;
+    }
+    /** A widget used to display scrollable content. */
+    export class dxScrollView extends dxScrollable {
+        constructor(element: JQuery, options?: dxScrollViewOptions);
+        constructor(element: Element, options?: dxScrollViewOptions);
+    }
+    export interface dxScrollableLocation {
+        top?: number;
+        left?: number;
+    }
+    export interface dxScrollableOptions extends DOMComponentOptions {
+        /** A string value specifying the available scrolling directions. */
+        direction?: string;
+        /** A Boolean value specifying whether or not the widget can respond to user interaction. */
+        disabled?: boolean;
+        /** A handler for the scroll event. */
+        onScroll?: Function;
+        /** Specifies when the widget shows the scrollbar. */
+        showScrollbar?: string;
+        /** A handler for the update event. */
+        onUpdated?: Function;
+        /** Indicates whether to use native or simulated scrolling. */
+        useNative?: boolean;
+        /** A Boolean value specifying whether to enable or disable the bounce-back effect. */
+        bounceEnabled?: boolean;
+        /** A Boolean value specifying whether or not an end-user can scroll the widget content swiping it up or down. */
+        scrollByContent?: boolean;
+        /** A Boolean value specifying whether or not an end-user can scroll the widget content using the scrollbar. */
+        scrollByThumb?: boolean;
+    }
+    /** A widget used to display scrollable content. */
+    export class dxScrollable extends DOMComponent {
+        constructor(element: JQuery, options?: dxScrollableOptions);
+        constructor(element: Element, options?: dxScrollableOptions);
+        /** Returns the height of the scrollable widget in pixels. */
+        clientHeight(): number;
+        /** Returns the width of the scrollable widget in pixels. */
+        clientWidth(): number;
+        /** Returns an HTML element of the widget. */
+        content(): JQuery;
+        /** Scrolls the widget content by the specified number of pixels. */
+        scrollBy(distance: number): void;
+        /** Scrolls widget content by the specified number of pixels in horizontal and vertical directions. */
+        scrollBy(distanceObject: dxScrollableLocation): void;
+        /** Returns the height of the scrollable content in pixels. */
+        scrollHeight(): number;
+        /** Returns the current scroll position against the leftmost position. */
+        scrollLeft(): number;
+        /** Returns how far the scrollable content is scrolled from the top and from the left. */
+        scrollOffset(): dxScrollableLocation;
+        /** Scrolls widget content to the specified position. */
+        scrollTo(targetLocation: number): void;
+        /** Scrolls widget content to a specified position. */
+        scrollTo(targetLocation: dxScrollableLocation): void;
+        /** Scrolls widget content to the specified element. */
+        scrollToElement(element: Element): void;
+        /** Returns the current scroll position against the topmost position. */
+        scrollTop(): number;
+        /** Returns the width of the scrollable content in pixels. */
+        scrollWidth(): number;
+        /** Updates the dimensions of the scrollable contents. */
+        update(): void;
+    }
+    export interface dxRadioGroupOptions extends EditorOptions, DataExpressionMixinOptions {
+        activeStateEnabled?: boolean;
+        /** Specifies the radio group layout. */
+        layout?: string;
+    }
+    /** A widget that enables a user to select one item within a list of items represented by radio buttons. */
+    export class dxRadioGroup extends CollectionWidget {
+        constructor(element: JQuery, options?: dxRadioGroupOptions);
+        constructor(element: Element, options?: dxRadioGroupOptions);
+    }
+    export interface dxPopupOptions extends dxOverlayOptions {
+        animation?: fx.AnimationOptions;
+        /** Specifies whether or not to allow a user to drag the popup window. */
+        dragEnabled?: boolean;
+        /** A Boolean value specifying whether or not to display the widget in full-screen mode. */
+        fullScreen?: boolean;
+        position?: PositionOptions;
+        /** A Boolean value specifying whether or not to display the title in the popup window. */
+        showTitle?: boolean;
+        /** The title in the overlay window. */
+        title?: string;
+        /** A template to be used for rendering the widget title. */
+        titleTemplate?: any;
+        width?: any;
+        /** Specifies items displayed on the top or bottom toolbar of the popup window. */
+        buttons?: Array<any>;
+        /** Specifies whether or not the widget displays the Close button. */
+        showCloseButton?: boolean;
+        /** A handler for the titleRendered event. */
+        onTitleRendered?: Function;
+    }
+    /** A widget that displays required content in a popup window. */
+    export class dxPopup extends dxOverlay {
+        constructor(element: JQuery, options?: dxPopupOptions);
+        constructor(element: Element, options?: dxPopupOptions);
+    }
+    export interface dxPopoverOptions extends dxPopupOptions {
+        /** An object defining animation options of the widget. */
+        animation?: fx.AnimationOptions;
+        /** Specifies the height of the widget. */
+        height?: any;
+        /** An object defining widget positioning options. */
+        position?: PositionOptions;
+        shading?: boolean;
+        /** A Boolean value specifying whether or not to display the title in the overlay window. */
+        showTitle?: boolean;
+        /** The target element associated with a popover. */
+        target?: any;
+        /** Specifies the width of the widget. */
+        width?: any;
+    }
+    /** A widget that displays the required content in a popup window. */
+    export class dxPopover extends dxPopup {
+        constructor(element: JQuery, options?: dxPopoverOptions);
+        constructor(element: Element, options?: dxPopoverOptions);
+        /** Displays the widget for the specified target element. */
+        show(target?: any): JQueryPromise<void>;
+    }
+    export interface dxOverlayOptions extends WidgetOptions {
+        /** An object that defines the animation options of the widget. */
+        animation?: fx.AnimationOptions;
+        /** A Boolean value specifying whether or not the widget is closed if a user presses the Back hardware button. */
+        closeOnBackButton?: boolean;
+        /** A Boolean value specifying whether or not the widget is closed if a user clicks outside of the overlapping window. */
+        closeOnOutsideClick?: any;
+        /** A template to be used for rendering widget content. */
+        contentTemplate?: any;
+        /** Specifies whether widget content is rendered when the widget is shown or when rendering the widget. */
+        deferRendering?: boolean;
+        /** Specifies whether or not an end-user can drag the widget. */
+        dragEnabled?: boolean;
+        /** Specifies whether or not an end user can resize the widget. */
+        resizeEnabled?: boolean;
+        /** The height of the widget in pixels. */
+        height?: any;
+        /** Specifies the maximum height the widget can reach while resizing. */
+        maxHeight?: any;
+        /** Specifies the maximum width the widget can reach while resizing. */
+        maxWidth?: any;
+        /** Specifies the minimum height the widget can reach while resizing. */
+        minHeight?: any;
+        /** Specifies the minimum width the widget can reach while resizing. */
+        minWidth?: any;
+        /** A handler for the hidden event. */
+        onHidden?: Function;
+        /** A handler for the resizeStart event. */
+        onResizeStart?: Function;
+        /** A handler for the resize event. */
+        onResize?: Function;
+        /** A handler for the resizeEnd event. */
+        onResizeEnd?: Function;
+        /** A handler for the hiding event. */
+        onHiding?: Function;
+        /** An object defining widget positioning options. */
+        position?: PositionOptions;
+        /** A Boolean value specifying whether or not the main screen is inactive while the widget is active. */
+        shading?: boolean;
+        /** Specifies the shading color. */
+        shadingColor?: string;
+        /** A handler for the showing event. */
+        onShowing?: Function;
+        /** A handler for the shown event. */
+        onShown?: Function;
+        onContentReady?: Function;
+        /** A Boolean value specifying whether or not the widget is visible. */
+        visible?: boolean;
+        /** The widget width in pixels. */
+        width?: any;
+    }
+    /** A widget displaying the required content in an overlay window. */
+    export class dxOverlay extends Widget {
+        constructor(element: JQuery, options?: dxOverlayOptions);
+        constructor(element: Element, options?: dxOverlayOptions);
+        /** An HTML element of the widget. */
+        content(): JQuery;
+        /** Hides the widget. */
+        hide(): JQueryPromise<void>;
+        /** Recalculates the overlay's size and position. */
+        repaint(): void;
+        /** Shows the widget. */
+        show(): JQueryPromise<void>;
+        /** Toggles the visibility of the widget. */
+        toggle(showing: boolean): JQueryPromise<void>;
+        /** A static method that specifies the base z-index for all overlay widgets. */
+        static baseZIndex(zIndex: number): void;
+    }
+    export interface dxNumberBoxOptions extends dxTextEditorOptions {
+        /** The maximum value accepted by the number box. */
+        max?: number;
+        /** The minimum value accepted by the number box. */
+        min?: number;
+        /** Specifies whether or not to show spin buttons. */
+        showSpinButtons?: boolean;
+        useTouchSpinButtons?: boolean;
+        /** Specifies by which value the widget value changes when a spin button is clicked. */
+        step?: number;
+        /** The current number box value. */
+        value?: number;
+        /** The "mode" attribute value of the actual HTML input element representing the widget. */
+        mode?: string;
+    }
+    /** A textbox widget that enables a user to enter numeric values. */
+    export class dxNumberBox extends dxTextEditor {
+        constructor(element: JQuery, options?: dxNumberBoxOptions);
+        constructor(element: Element, options?: dxNumberBoxOptions);
+    }
+    export interface dxNavBarOptions extends dxTabsOptions {
+        scrollingEnabled?: boolean;
+    }
+    /** A widget that contains items used to navigate through application views. */
+    export class dxNavBar extends dxTabs {
+        constructor(element: JQuery, options?: dxNavBarOptions);
+        constructor(element: Element, options?: dxNavBarOptions);
+    }
+    export interface dxMultiViewOptions extends CollectionWidgetOptions {
+        /** Specifies whether or not to animate the displayed item change. */
+        animationEnabled?: boolean;
+        /** A Boolean value specifying whether or not to scroll back to the first item after the last item is swiped. */
+        loop?: boolean;
+        /** The index of the currently displayed item. */
+        selectedIndex?: number;
+        /** A Boolean value specifying whether or not to allow users to change the selected index by swiping. */
+        swipeEnabled?: boolean;
+        /** Specifies whether widget content is rendered when the widget is shown or when rendering the widget. */
+        deferRendering?: boolean;
+    }
+    /** A widget used to display a view and to switch between several views. */
+    export class dxMultiView extends CollectionWidget {
+        constructor(element: JQuery, options?: dxMultiViewOptions);
+        constructor(element: Element, options?: dxMultiViewOptions);
+    }
+    export interface dxMapOptions extends WidgetOptions {
+        /** Specifies whether or not the widget automatically adjusts center and zoom option values when adding a new marker or route or when creating a widget if it initially contains markers or routes. */
+        autoAdjust?: boolean;
+        center?: {
+            /** The latitude location displayed in the center of the widget. */
+            lat?: number;
+            /** The longitude location displayed in the center of the widget. */
+            lng?: number;
+        };
+        /** A handler for the click event. */
+        onClick?: any;
+        /** Specifies whether or not map widget controls are available. */
+        controls?: boolean;
+        /** Specifies the height of the widget. */
+        height?: any;
+        /** A key used to authenticate the application within the required map provider. */
+        key?: {
+            /** A key used to authenticate the application within the "Bing" map provider. */
+            bing?: string;
+            /** A key used to authenticate the application within the "Google" map provider. */
+            google?: string;
+            /** A key used to authenticate the application within the "Google Static" map provider. */
+            googleStatic?: string;
+        }
+        /** A handler for the markerAdded event. */
+        onMarkerAdded?: Function;
+        /** A URL pointing to the custom icon to be used for map markers. */
+        markerIconSrc?: string;
+        /** A handler for the markerRemoved event. */
+        onMarkerRemoved?: Function;
+        /** An array of markers displayed on a map. */
+        markers?: Array<any>;
+        /** The name of the current map data provider. */
+        provider?: string;
+        /** A handler for the ready event. */
+        onReady?: Function;
+        /** A handler for the routeAdded event. */
+        onRouteAdded?: Function;
+        /** A handler for the routeRemoved event. */
+        onRouteRemoved?: Function;
+        /** An array of routes shown on the map. */
+        routes?: Array<any>;
+        /** The type of a map to display. */
+        type?: string;
+        /** Specifies the width of the widget. */
+        width?: any;
+        /** The zoom level of the map. */
+        zoom?: number;
+    }
+    /** An interactive map widget. */
+    export class dxMap extends Widget {
+        constructor(element: JQuery, options?: dxMapOptions);
+        constructor(element: Element, options?: dxMapOptions);
+        /** Adds a marker to the map. */
+        addMarker(markerOptions: Object): JQueryPromise<Object>;
+        /** Adds a route to the map. */
+        addRoute(routeOptions: Object): JQueryPromise<Object>;
+        /** Removes a marker from the map. */
+        removeMarker(marker: Object): JQueryPromise<void>;
+        /** Removes a route from the map. */
+        removeRoute(route: any): JQueryPromise<void>;
+    }
+    export interface dxLookupOptions extends dxDropDownListOptions {
+        /** An object defining widget animation options. */
+        animation?: fx.AnimationOptions;
+        /** The text displayed on the Cancel button. */
+        cancelButtonText?: string;
+        /** The text displayed on the Clear button. */
+        clearButtonText?: string;
+        /** Specifies whether or not the widget cleans the search box when the popup window is displayed. */
+        cleanSearchOnOpening?: boolean;
+        /** A Boolean value specifying whether or not a widget is closed if a user clicks outside of the overlaying window. */
+        closeOnOutsideClick?: any;
+        /** The text displayed on the Apply button. */
+        applyButtonText?: string;
+        /** A Boolean value specifying whether or not to display the lookup in full-screen mode. */
+        fullScreen?: boolean;
+        focusStateEnabled?: boolean;
+        /** A Boolean value specifying whether or not to group widget items. */
+        grouped?: boolean;
+        /** The name of the template used to display a group header. */
+        groupTemplate?: any;
+        /** The text displayed on the button used to load the next page from the data source. */
+        nextButtonText?: string;
+        /** A handler for the pageLoading event. */
+        onPageLoading?: Function;
+        /** Specifies whether the next page is loaded when a user scrolls the widget to the bottom or when the "next" button is clicked. */
+        pageLoadMode?: string;
+        /** Specifies the text shown in the pullDown panel, which is displayed when the widget is scrolled to the bottom. */
+        pageLoadingText?: string;
+        /** The text displayed by the widget when nothing is selected. */
+        placeholder?: string;
+        /** The height of the widget popup element. */
+        popupHeight?: any;
+        /** The width of the widget popup element. */
+        popupWidth?: any;
+        /** An object defining widget positioning options. */
+        position?: PositionOptions;
+        /** Specifies the text displayed in the pullDown panel when the widget is pulled below the refresh threshold. */
+        pulledDownText?: string;
+        /** Specifies the text shown in the pullDown panel while the list is being pulled down to the refresh threshold. */
+        pullingDownText?: string;
+        /** A handler for the pullRefresh event. */
+        onPullRefresh?: Function;
+        /** A Boolean value specifying whether or not the widget supports the "pull down to refresh" gesture. */
+        pullRefreshEnabled?: boolean;
+        /** Specifies the text displayed in the pullDown panel while the widget is being refreshed. */
+        refreshingText?: string;
+        /** A handler for the scroll event. */
+        onScroll?: Function;
+        /** A Boolean value specifying whether or not the search bar is visible. */
+        searchEnabled?: boolean;
+        /** The text that is provided as a hint in the lookup's search bar. */
+        searchPlaceholder?: string;
+        /** A Boolean value specifying whether or not the main screen is inactive while the lookup is active. */
+        shading?: boolean;
+        /** Specifies whether to display the Cancel button in the lookup window. */
+        showCancelButton?: boolean;
+        /**
+         * A Boolean value specifying whether the widget loads the next page automatically when you reach the bottom of the list or when a button is clicked.
+         * @deprecated pageLoadMode.md
+         */
+        showNextButton?: boolean;
+        /** The title of the lookup window. */
+        title?: string;
+        /** A template to be used for rendering the widget title. */
+        titleTemplate?: any;
+        /** Specifies whether or not the widget uses native scrolling. */
+        useNativeScrolling?: boolean;
+        /** Specifies whether or not to show lookup contents in a dxPopover widget. */
+        usePopover?: boolean;
+        /** A handler for the valueChanged event. */
+        onValueChanged?: Function;
+        /** A handler for the titleRendered event. */
+        onTitleRendered?: Function;
+        /** A Boolean value specifying whether or not to display the title in the popup window. */
+        showPopupTitle?: boolean;
+        /** The template to be used for rendering the widget text field. */
+        fieldTemplate?: any;
+    }
+    /** A widget that allows a user to select predefined values from a lookup window. */
+    export class dxLookup extends dxDropDownList {
+        constructor(element: JQuery, options?: dxLookupOptions);
+        constructor(element: Element, options?: dxLookupOptions);
+        /** This section lists the data source fields that are used in a default template for lookup drop-down items. */
+    }
+    export interface dxLoadPanelOptions extends dxOverlayOptions {
+        /** An object defining the animation options of the widget. */
+        animation?: fx.AnimationOptions;
+        /** The delay in milliseconds after which the load panel is displayed. */
+        delay?: number;
+        /** The height of the widget. */
+        height?: number;
+        /** A URL pointing to an image to be used as a load indicator. */
+        indicatorSrc?: string;
+        /** The text displayed in the load panel. */
+        message?: string;
+        /** A Boolean value specifying whether or not to show a load indicator. */
+        showIndicator?: boolean;
+        /** A Boolean value specifying whether or not to show the pane behind the load indicator. */
+        showPane?: boolean;
+        /** The width of the widget. */
+        width?: number;
+    }
+    /** A widget used to indicate whether or not an element is loading. */
+    export class dxLoadPanel extends dxOverlay {
+        constructor(element: JQuery, options?: dxLoadPanelOptions);
+        constructor(element: Element, options?: dxLoadPanelOptions);
+    }
+    export interface dxLoadIndicatorOptions extends WidgetOptions {
+        /** Specifies the path to an image used as the indicator. */
+        indicatorSrc?: string;
+    }
+    /** The widget used to indicate the loading process. */
+    export class dxLoadIndicator extends Widget {
+        constructor(element: JQuery, options?: dxLoadIndicatorOptions);
+        constructor(element: Element, options?: dxLoadIndicatorOptions);
+    }
+    export interface dxListOptions extends CollectionWidgetOptions {
+        /** A Boolean value specifying whether or not to display a grouped list. */
+        grouped?: boolean;
+        /** The template to be used for rendering item groups. */
+        groupTemplate?: any;
+        onItemDeleting?: Function;
+        /** A handler for the itemDeleted event. */
+        onItemDeleted?: Function;
+        /** A handler for the groupRendered event. */
+        onGroupRendered?: Function;
+        /** A handler for the itemReordered event. */
+        onItemReordered?: Function;
+        /** A handler for the itemClick event. */
+        onItemClick?: any;
+        /** A handler for the itemSwipe event. */
+        onItemSwipe?: Function;
+        /** The text displayed on the button used to load the next page from the data source. */
+        nextButtonText?: string;
+        /** A handler for the pageLoading event. */
+        onPageLoading?: Function;
+        /** Specifies the text shown in the pullDown panel, which is displayed when the list is scrolled to the bottom. */
+        pageLoadingText?: string;
+        /** Specifies the text displayed in the pullDown panel when the list is pulled below the refresh threshold. */
+        pulledDownText?: string;
+        /** Specifies the text shown in the pullDown panel while the list is being pulled down to the refresh threshold. */
+        pullingDownText?: string;
+        /** A handler for the pullRefresh event. */
+        onPullRefresh?: Function;
+        /** A Boolean value specifying whether or not the widget supports the "pull down to refresh" gesture. */
+        pullRefreshEnabled?: boolean;
+        /** Specifies the text displayed in the pullDown panel while the list is being refreshed. */
+        refreshingText?: string;
+        /** A handler for the scroll event. */
+        onScroll?: Function;
+        /** A Boolean value specifying whether to enable or disable list scrolling. */
+        scrollingEnabled?: boolean;
+        /** Specifies when the widget shows the scrollbar. */
+        showScrollbar?: string;
+        /** Specifies whether or not the widget uses native scrolling. */
+        useNativeScrolling?: boolean;
+        /** A Boolean value specifying whether to enable or disable the bounce-back effect. */
+        bounceEnabled?: boolean;
+        /** A Boolean value specifying if the list is scrolled by content. */
+        scrollByContent?: boolean;
+        /** A Boolean value specifying if the list is scrolled using the scrollbar. */
+        scrollByThumb?: boolean;
+        onItemContextMenu?: Function;
+        onItemHold?: Function;
+        /** Specifies whether or not an end-user can collapse groups. */
+        collapsibleGroups?: boolean;
+        /** Specifies whether the next page is loaded when a user scrolls the widget to the bottom or when the "next" button is clicked. */
+        pageLoadMode?: string;
+        /** Specifies whether or not to display controls used to select list items. */
+        showSelectionControls?: boolean;
+        /** Specifies item selection mode. */
+        selectionMode?: string;
+        selectAllText?: string;
+        onSelectAllChanged?: Function;
+        /** Specifies the array of items for a context menu called for a list item. */
+        menuItems?: Array<any>;
+        /** Specifies whether an item context menu is shown when a user holds or swipes an item. */
+        menuMode?: string;
+        /** Specifies whether or not an end user can delete list items. */
+        allowItemDeleting?: boolean;
+        /** Specifies the way a user can delete items from the list. */
+        itemDeleteMode?: string;
+        /** Specifies whether or not an end user can reorder list items. */
+        allowItemReordering?: boolean;
+        /** Specifies whether or not to show the loading panel when the DataSource bound to the widget is loading data. */
+        indicateLoading?: boolean;
+        activeStateEnabled?: boolean;
+    }
+    /** A list widget. */
+    export class dxList extends CollectionWidget {
+        constructor(element: JQuery, options?: dxListOptions);
+        constructor(element: Element, options?: dxListOptions);
+        /** Returns the height of the widget in pixels. */
+        clientHeight(): number;
+        /** Removes the specified item from the list. */
+        deleteItem(itemIndex: any): JQueryPromise<void>;
+        /** Removes the specified item from the list. */
+        deleteItem(itemElement: Element): JQueryPromise<void>;
+        /** Returns a Boolean value that indicates whether or not the specified item is selected. */
+        isItemSelected(itemIndex: any): boolean;
+        /** Returns a Boolean value that indicates whether or not the specified item is selected. */
+        isItemSelected(itemElement: Element): boolean;
+        /** Reloads list data. */
+        reload(): void;
+        /** Moves the specified item to the specified position in the list. */
+        reorderItem(itemElement: Element, toItemElement: Element): JQueryPromise<void>;
+        /** Moves the specified item to the specified position in the list. */
+        reorderItem(itemIndex: any, toItemIndex: any): JQueryPromise<void>;
+        /** Scrolls the list content by the specified number of pixels. */
+        scrollBy(distance: number): void;
+        /** Returns the height of the list content in pixels. */
+        scrollHeight(): number;
+        /** Scrolls list content to the specified position. */
+        scrollTo(location: number): void;
+        /** Scrolls the list to the specified item. */
+        scrollToItem(itemElement: Element): void;
+        /** Scrolls the list to the specified item. */
+        scrollToItem(itemIndex: any): void;
+        /** Returns how far the list content is scrolled from the top. */
+        scrollTop(): number;
+        /** Selects the specified item from the list. */
+        selectItem(itemElement: Element): void;
+        /** Selects the specified item from the list. */
+        selectItem(itemIndex: any): void;
+        /** Deselects the specified item from the list. */
+        unselectItem(itemElement: Element): void;
+        /** Unselects the specified item from the list. */
+        unselectItem(itemIndex: any): void;
+        /** Updates the widget scrollbar according to widget content size. */
+        updateDimensions(): JQueryPromise<void>;
+        /** Expands the specified group. */
+        expandGroup(groupIndex: number): JQueryPromise<void>;
+        /** Collapses the specified group. */
+        collapseGroup(groupIndex: number): JQueryPromise<void>;
+    }
+    export interface dxGalleryOptions extends CollectionWidgetOptions {
+        /** The time, in milliseconds, spent on slide animation. */
+        animationDuration?: number;
+        /** Specifies whether or not to animate the displayed item change. */
+        animationEnabled?: boolean;
+        /** A Boolean value specifying whether or not to allow users to switch between items by clicking an indicator. */
+        indicatorEnabled?: boolean;
+        /** A Boolean value specifying whether or not to scroll back to the first item after the last item is swiped. */
+        loop?: boolean;
+        /** The index of the currently active gallery item. */
+        selectedIndex?: number;
+        /** A Boolean value specifying whether or not to display an indicator that points to the selected gallery item. */
+        showIndicator?: boolean;
+        /** A Boolean value that specifies the availability of the "Forward" and "Back" navigation buttons. */
+        showNavButtons?: boolean;
+        /** The time interval in milliseconds, after which the gallery switches to the next item. */
+        slideshowDelay?: number;
+        /** A Boolean value specifying whether or not to allow users to switch between items by swiping. */
+        swipeEnabled?: boolean;
+        /** Specifies whether or not to display parts of previous and next images along the sides of the current image. */
+        wrapAround?: boolean;
+        /** Specifies if the widget stretches images to fit the total gallery width. */
+        stretchImages?: boolean;
+        /** Specifies the width of an area used to display a single image. */
+        initialItemWidth?: number;
+    }
+    /** An image gallery widget. */
+    export class dxGallery extends CollectionWidget {
+        constructor(element: JQuery, options?: dxGalleryOptions);
+        constructor(element: Element, options?: dxGalleryOptions);
+        /** Shows the specified gallery item. */
+        goToItem(itemIndex: number, animation: boolean): JQueryPromise<any>;
+        /** Shows the next gallery item. */
+        nextItem(animation: boolean): JQueryPromise<any>;
+        /** Shows the previous gallery item. */
+        prevItem(animation: boolean): JQueryPromise<any>;
+    }
+    export interface dxDropDownEditorOptions extends dxTextBoxOptions {
+        /** Specifies the current value displayed by the widget. */
+        value?: Object;
+        /** A handler for the closed event. */
+        onClosed?: Function;
+        /** A handler for the opened event. */
+        onOpened?: Function;
+        /** Specifies whether or not the drop-down editor is displayed. */
+        opened?: boolean;
+        /** Specifies whether or not the widget allows an end-user to enter a custom value. */
+        fieldEditEnabled?: boolean;
+        /** Specifies the way an end-user applies the selected value. */
+        applyValueMode?: string;
+        /** Specifies whether widget content is rendered when the widget is shown or when rendering the widget. */
+        deferRendering?: boolean;
+        activeStateEnabled?: boolean;
+    }
+    /** A drop-down editor widget. */
+    export class dxDropDownEditor extends dxTextBox {
+        constructor(element: JQuery, options?: dxDropDownEditorOptions);
+        constructor(element: Element, options?: dxDropDownEditorOptions);
+        /** Closes the drop-down editor. */
+        close(): void;
+        /** Opens the drop-down editor. */
+        open(): void;
+        /** Resets the widget's value to null. */
+        reset(): void;
+        /** Returns an &lt;input&gt; element of the widget. */
+        field(): JQuery;
+        /** Returns an HTML element of the popup window content. */
+        content(): JQuery;
+    }
+    export interface dxDateBoxOptions extends dxTextEditorOptions {
+        /** A format used to display date/time information. */
+        format?: string;
+        /** A Globalize format string specifying the date display format. */
+        formatString?: string;
+        /** The last date that can be selected within the widget. */
+        max?: any;
+        /** The minimum date that can be selected within the widget. */
+        min?: any;
+        /** The text displayed by the widget when the widget value is not yet specified. This text is also used as a title of the date picker. */
+        placeholder?: string;
+        /**
+         * Specifies whether or not a user can pick out a date using the drop-down calendar.
+         * @deprecated Use 'pickerType' option instead.
+         */
+        useCalendar?: boolean;
+        /** An object or a value, specifying the date and time currently selected using the date box. */
+        value?: any;
+        /**
+         * Specifies whether or not the widget uses the native HTML input element.
+         * @deprecated Use 'pickerType' option instead.
+         */
+        useNative?: boolean;
+        /** Specifies the interval between neighboring values in the popup list in minutes. */
+        interval?: number;
+        /** Specifies the maximum zoom level of a calendar, which is used to pick the date. */
+        maxZoomLevel?: string;
+        /** Specifies the minimal zoom level of a calendar, which is used to pick the date. */
+        minZoomLevel?: string;
+        /** Specifies the type of date/time picker. */
+        pickerType?: string;
+        /** Specifies the message displayed if the typed value is not a valid date or time. */
+        invalidDateMessage?: string;
+        /** Specifies the message displayed if the specified date is later than the max value or earlier than the min value. */
+        dateOutOfRangeMessage?: string;
+        /** The text displayed on the Apply button. */
+        applyButtonText?: string;
+        /** The text displayed on the Cancel button. */
+        cancelButtonText?: string;
+    }
+    /** A date box widget. */
+    export class dxDateBox extends dxDropDownEditor {
+        constructor(element: JQuery, options?: dxDateBoxOptions);
+        constructor(element: Element, options?: dxDateBoxOptions);
+    }
+    export interface dxCheckBoxOptions extends EditorOptions {
+        activeStateEnabled?: boolean;
+        /** Specifies the widget state. */
+        value?: boolean;
+        /** Specifies the text displayed by the check box. */
+        text?: string;
+    }
+    /** A check box widget. */
+    export class dxCheckBox extends Editor {
+        constructor(element: JQuery, options?: dxCheckBoxOptions);
+        constructor(element: Element, options?: dxCheckBoxOptions);
+    }
+    export interface dxCalendarOptions extends EditorOptions {
+        activeStateEnabled?: boolean;
+        /** Specifies a date displayed on the current calendar page. */
+        currentDate?: Date;
+        /** Specifies the first day of a week. */
+        firstDayOfWeek?: number;
+        /** The latest date the widget allows to select. */
+        max?: Date;
+        /** The earliest date the widget allows to select. */
+        min?: Date;
+        /** Specifies whether or not the widget displays a button that selects the current date. */
+        showTodayButton?: boolean;
+        /** Specifies the current calendar zoom level. */
+        zoomLevel?: string;
+        /** Specifies the maximum zoom level of the calendar. */
+        maxZoomLevel?: string;
+        /** Specifies the minimum zoom level of the calendar. */
+        minZoomLevel?: string;
+        /** The template to be used for rendering calendar cells. */
+        cellTemplate?: any;
+    }
+    /** A calendar widget. */
+    export class dxCalendar extends Editor {
+        constructor(element: JQuery, options?: dxCalendarOptions);
+        constructor(element: Element, options?: dxCalendarOptions);
+    }
+    export interface dxButtonOptions extends WidgetOptions {
+        /** A Boolean value specifying whether or not the widget changes its state when interacting with a user. */
+        activeStateEnabled?: boolean;
+        /** A handler for the click event. */
+        onClick?: any;
+        /** Specifies the icon to be displayed on the button. */
+        icon?: string;
+        iconSrc?: string;
+        /** A template to be used for rendering the dxButton widget. */
+        template?: any;
+        /** The text displayed on the button. */
+        text?: string;
+        /** Specifies the button type. */
+        type?: string;
+        /** Specifies the name of the validation group to be accessed in the click event handler. */
+        validationGroup?: string;
+    }
+    /** A button widget. */
+    export class dxButton extends Widget {
+        constructor(element: JQuery, options?: dxButtonOptions);
+        constructor(element: Element, options?: dxButtonOptions);
+    }
+    export interface dxBoxOptions extends CollectionWidget {
+        /** Specifies how widget items are aligned along the main direction. */
+        align?: string;
+        /** Specifies the direction of item positioning in the widget. */
+        direction?: string;
+        /** Specifies how widget items are aligned cross-wise. */
+        crossAlign?: string;
+    }
+    /** A container widget used to arrange inner elements. */
+    export class dxBox extends CollectionWidget {
+        constructor(element: JQuery, options?: dxBoxOptions);
+        constructor(element: Element, options?: dxBoxOptions);
+    }
+    export interface dxResponsiveBoxOptions extends CollectionWidgetOptions {
+        /** Specifies the collection of rows for the grid used to position layout elements. */
+        rows?: Array<Object>;
+        /** Specifies the collection of columns for the grid used to position layout elements. */
+        cols?: Array<Object>;
+        /** Specifies the function returning the screen factor depending on the screen width. */
+        screenByWidth?: (width: number) => string;
+        /** Specifies the screen factor with which all elements are located in a single column. */
+        singleColumnScreen?: string;
+    }
+    /** A widget used to build an adaptive markup that is dependent on screen resolution. */
+    export class dxResponsiveBox extends CollectionWidget {
+        constructor(element: JQuery, options?: dxBoxOptions);
+        constructor(element: Element, options?: dxBoxOptions);
+    }
+    export interface dxAutocompleteOptions extends dxDropDownListOptions {
+        /** Specifies the current value displayed by the widget. */
+        value?: string;
+        /** The minimum number of characters that must be entered into the text box to begin a search. */
+        minSearchLength?: number;
+        /** Specifies the maximum count of items displayed by the widget. */
+        maxItemCount?: number;
+        /** Gets the currently selected item. */
+        selectedItem?: Object;
+    }
+    /** A textbox widget that supports autocompletion. */
+    export class dxAutocomplete extends dxDropDownList {
+        constructor(element: JQuery, options?: dxAutocompleteOptions);
+        constructor(element: Element, options?: dxAutocompleteOptions);
+        /** Opens the drop-down editor. */
+        open(): void;
+        /** Closes the drop-down editor. */
+        close(): void;
+    }
+    export interface dxAccordionOptions extends CollectionWidgetOptions {
+        /** A number specifying the time in milliseconds spent on the animation of the expanding or collapsing of a panel. */
+        animationDuration?: number;
+        /** Specifies the height of the widget. */
+        height?: any;
+        /** Specifies whether all items can be collapsed or whether at least one item must always be expanded. */
+        collapsible?: boolean;
+        /** Specifies whether the widget can expand several items or only a single item at once. */
+        multiple?: boolean;
+        /** The template to be used for rendering dxAccordion items. */
+        itemTemplate?: any;
+        /** A handler for the itemTitleClick event. */
+        onItemTitleClick?: any;
+        /** A handler for the itemTitleHold event. */
+        onItemTitleHold?: Function;
+        /** The template to be used for rendering an item title. */
+        itemTitleTemplate?: any;
+        /** The index number of the currently selected item. */
+        selectedIndex?: number;
+        /** Specifies whether widget content is rendered when the widget is shown or when rendering the widget. */
+        deferRendering?: boolean;
+    }
+    /** A widget that displays data source items on collapsible panels. */
+    export class dxAccordion extends CollectionWidget {
+        constructor(element: JQuery, options?: dxAccordionOptions);
+        constructor(element: Element, options?: dxAccordionOptions);
+        /** Collapses the specified item. */
+        collapseItem(index: number): JQueryPromise<dxAccordion>;
+        /** Expands the specified item. */
+        expandItem(index: number): JQueryPromise<dxAccordion>;
+        /** Updates the dimensions of the widget contents. */
+        updateDimensions(): JQueryPromise<dxAccordion>;
+    }
+    export interface dxFileUploaderOptions extends EditorOptions {
+        /** A read-only option that holds a File instance representing the selected file. */
+        value?: File;
+        /** Holds the File instances representing files selected in the widget. */
+        values?: Array<File>;
+        buttonText?: string;
+        /** The text displayed on the button that opens the file browser. */
+        selectButtonText?: string;
+        /** The text displayed on the button that starts uploading. */
+        uploadButtonText?: string;
+        /** Specifies the text displayed on the area to which an end-user can drop a file. */
+        labelText?: string;
+        /** Specifies the value passed to the name attribute of the underlying input element. */
+        name?: string;
+        /** Specifies whether the widget enables an end-user to select a single file or multiple files. */
+        multiple?: boolean;
+        /** Specifies a file type or several types accepted by the widget. */
+        accept?: string;
+        /** Specifies a target Url for the upload request. */
+        uploadUrl?: string;
+        /** Specifies if an end user can remove a file from the selection and interrupt uploading. */
+        allowCanceling?: boolean;
+        /** Specifies whether or not the widget displays the list of selected files. */
+        showFileList?: boolean;
+        /** Gets the current progress in percentages. */
+        progress?: number;
+        /** The message displayed by the widget when it is ready to upload the specified files. */
+        readyToUploadMessage?: string;
+        /** The message displayed by the widget when uploading is finished. */
+        uploadedMessage?: string;
+        /** The message displayed by the widget on uploading failure. */
+        uploadFailedMessage?: string;
+        /** Specifies how the widget uploads files. */
+        uploadMode?: string;
+        /** A handler for the uploaded event. */
+        onUploaded?: Function;
+        /** A handler for the uploaded event. */
+        onProgress?: Function;
+        /** A handler for the uploadError event. */
+        onUploadError?: Function;
+        /** A handler for the valueChanged event. */
+        onValueChanged?: Function;
+    }
+    /** A widget used to select and upload a file or multiple files. */
+    export class dxFileUploader extends Editor {
+        constructor(element: JQuery, options?: dxFileUploaderOptions);
+        constructor(element: Element, options?: dxFileUploaderOptions);
+    }
+    export interface dxTrackBarOptions extends EditorOptions {
+        /** The minimum value the widget can accept. */
+        min?: number;
+        /** The maximum value the widget can accept. */
+        max?: number;
+        /** The current widget value. */
+        value?: number;
+    }
+    /** A base class for track bar widgets. */
+    export class dxTrackBar extends Editor {
+        constructor(element: JQuery, options?: dxTrackBarOptions);
+        constructor(element: Element, options?: dxTrackBarOptions);
+    }
+    export interface dxProgressBarOptions extends dxTrackBarOptions {
+        /** Specifies a format for the progress status. */
+        statusFormat?: any;
+        /** Specifies whether or not the widget displays a progress status. */
+        showStatus?: boolean;
+        /** A handler for the complete event. */
+        onComplete?: Function;
+    }
+    /** A widget used to indicate progress. */
+    export class dxProgressBar extends dxTrackBar {
+        constructor(element: JQuery, options?: dxProgressBarOptions);
+        constructor(element: Element, options?: dxProgressBarOptions);
+    }
+    export interface dxSliderOptions extends dxTrackBarOptions {
+        activeStateEnabled?: boolean;
+        /** The slider step size. */
+        step?: number;
+        /** The current slider value. */
+        value?: number;
+        /** Specifies whether or not to highlight a range selected within the widget. */
+        showRange?: boolean;
+        /** Specifies the size of a step by which a slider handle is moved when a user uses the Page up or Page down keyboard shortcuts. */
+        keyStep?: number;
+        /** Specifies options for the slider tooltip. */
+        tooltip?: {
+            /** Specifies whether or not the tooltip is enabled. */
+            enabled?: boolean;
+            /** Specifies format for the tooltip. */
+            format?: any;
+            /** Specifies whether the tooltip is located over or under the slider. */
+            position?: string;
+            /** Specifies whether the widget always shows a tooltip or only when a pointer is over the slider. */
+            showMode?: string;
+        };
+        /** Specifies options for labels displayed at the min and max values. */
+        label?: {
+            /** Specifies whether or not slider labels are visible. */
+            visible?: boolean;
+            /** Specifies whether labels are located over or under the scale. */
+            position?: string;
+            /** Specifies a format for labels. */
+            format?: any;
+        };
+    }
+    /** A widget that allows a user to select a numeric value within a given range. */
+    export class dxSlider extends dxTrackBar {
+        constructor(element: JQuery, options?: dxSliderOptions);
+        constructor(element: Element, options?: dxSliderOptions);
+    }
+    export interface dxRangeSliderOptions extends dxSliderOptions {
+        /** The left edge of the interval currently selected using the range slider. */
+        start?: number;
+        /** The right edge of the interval currently selected using the range slider. */
+        end?: number;
+    }
+    /** A widget that enables a user to select a range of numeric values. */
+    export class dxRangeSlider extends dxSlider {
+        constructor(element: JQuery, options?: dxRangeSliderOptions);
+        constructor(element: Element, options?: dxRangeSliderOptions);
+    }
+    export interface dxFormItemLabel {
+        /** Specifies the label text. */
+        text?: string;
+        /** Specifies whether or not the label is visible. */
+        visible?: boolean;
+        /** Specifies whether or not a colon is displayed at the end of the current label. */
+        showColon?: boolean;
+        /** Specifies the location of a label against the editor. */
+        location?: string;
+        /** Specifies the label horizontal alignment. */
+        alignment?: string;
+    }
+    export interface dxFormItem {
+        /** Specifies the type of the current item. */
+        itemType?: string;
+        /** Specifies whether or not the current form item is visible. */
+        visible?: boolean;
+        /** Specifies the sequence number of the item in a form, group or tab. */
+        visibleIndex?: number;
+        /** Specifies a CSS class to be applied to the form item. */
+        cssClass?: string;
+        /** Specifies the number of columns spanned by the item. */
+        colSpan?: number;
+    }
+    export interface dxFormEmptyItem extends dxFormItem {
+        /** Specifies the form item name. */
+        name?: string;
+    }
+    export interface dxFormSimpleItem extends dxFormItem {
+        /** Specifies the path to the formData object field bound to the current form item. */
+        dataField?: string;
+        /** Specifies the form item name. */
+        name?: string;
+        /** Specifies which editor widget is used to display and edit the form item value. */
+        editorType?: string;
+        /** Specifies configuration options for the editor widget of the current form item. */
+        editorOptions?: Object;
+        /** A template to be used for rendering the form item. */
+        template?: any;
+        /** Specifies the help text displayed for the current form item. */
+        helpText?: string;
+        /** Specifies whether the current form item is required. */
+        isRequired?: boolean;
+        /** Specifies options for the form item label. */
+        label?: dxFormItemLabel;
+        /** An array of validation rules to be checked for the form item editor. */
+        validationRules?: Array<any>;
+    }
+    export interface dxFormGroupItem extends dxFormItem {
+        /** Specifies the group caption. */
+        caption?: string;
+        /** A template to be used for rendering the group item. */
+        template?: any;
+        /** The count of columns in the group layout. */
+        colCount?: number;
+        /** Specifies whether or not all group item labels are aligned. */
+        alignItemLabels?: boolean;
+        /** Holds an array of form items displayed within the group. */
+        items?: Array<dxFormItem>;
+    }
+    export interface dxFormTab {
+        /** Specifies the tab title. */
+        title?: string;
+        /** The count of columns in the tab layout. */
+        colCount?: number;
+        /** Specifies whether or not labels of items displayed within the current tab are aligned. */
+        alignItemLabels?: boolean;
+        /** Holds an array of form items displayed within the tab. */
+        items?: Array<dxFormItem>;
+        /** Specifies a badge text for the tab. */
+        badge?: string;
+        /** A Boolean value specifying whether or not the tab can respond to user interaction. */
+        disabled?: boolean;
+        /** Specifies the icon to be displayed on the tab. */
+        icon?: string;
+        /** The template to be used for rendering the tab. */
+        tabTemplate?: any;
+        /** The template to be used for rendering the tab content. */
+        template?: any;
+    }
+    export interface dxFormTabbedItem extends dxFormItem {
+        /** Holds a configuration object for the dxTabPanel widget used to display the current form item. */
+        tabPanelOptions?: Object;
+        /** An array of tab configuration objects. */
+        tabs?: Array<dxFormTab>;
+    }
+    export interface dxFormOptions extends WidgetOptions {
+        /** An object providing data for the form. */
+        formData?: Object;
+        /** The count of columns in the form layout. */
+        colCount?: any;
+        /** Specifies the location of a label against the editor. */
+        labelLocation?: string;
+        /** Specifies whether or not all editors on the form are read-only. */
+        readOnly?: boolean;
+        /** A handler for the fieldDataChanged event. */
+        onFieldDataChanged?: (e: Object) => void;
+        /** A handler for the editorEnterKey event. */
+        onEditorEnterKey?: (e: Object) => void;
+        /** Specifies a function that customizes a form item after it has been created. */
+        customizeItem?: Function;
+        /** The minimum column width used for calculating column count in the form layout. */
+        minColWidth?: number;
+        /** Specifies whether or not all root item labels are aligned. */
+        alignItemLabels?: boolean;
+        /** Specifies whether or not item labels in all groups are aligned. */
+        alignItemLabelsInAllGroups?: boolean;
+        /** Specifies whether or not a colon is displayed at the end of form labels. */
+        showColonAfterLabel?: boolean;
+        /** Specifies whether or not the required mark is displayed for required fields. */
+        showRequiredMark?: boolean;
+        /** Specifies whether or not the optional mark is displayed for optional fields. */
+        showOptionalMark?: boolean;
+        /** The text displayed for required fields. */
+        requiredMark?: string;
+        /** The text displayed for optional fields. */
+        optionalMark?: string;
+        /** Specifies the message that is shown for end-users a required field value is not specified. */
+        requiredMessage?: string;
+        /** Specifies whether or not the total validation summary is displayed on the form. */
+        showValidationSummary?: boolean;
+        /** Holds an array of form items. */
+        items?: Array<dxFormItem>;
+        /** A Boolean value specifying whether to enable or disable form scrolling. */
+        scrollingEnabled?: boolean;
+        onContentReady?: Function;
+    }
+    /** A form widget used to display and edit values of object fields. */
+    export class dxForm extends Widget {
+        constructor(element: JQuery, options?: dxFormOptions);
+        constructor(element: Element, options?: dxFormOptions);
+        /** Updates the specified field of the formData object and the corresponding editor on the form. */
+        updateData(dataField: string, value: any): void;
+        /** Updates the specified fields of the formData object and the corresponding editors on the form. */
+        updateData(data: Object): void;
+        /** Updates the value of a form item option. */
+        itemOption(field: string, option: string, value: any): void;
+        /** Updates the values of form item options. */
+        itemOption(field: string, options: Object): void;
+        /** Returns an editor instance associated with the specified formData field. */
+        getEditor(field: string): Object;
+        /** Updates the dimensions of the widget contents. */
+        updateDimensions(): JQueryPromise<void>;
+        /** Validates the values of all editors on the form against the list of the validation rules specified for each form item. */
+        validate(): Object;
+    }
+}
+interface JQuery {
+    dxProgressBar(): JQuery;
+    dxProgressBar(options: "instance"): DevExpress.ui.dxProgressBar;
+    dxProgressBar(options: string): any;
+    dxProgressBar(options: string, ...params: any[]): any;
+    dxProgressBar(options: DevExpress.ui.dxProgressBarOptions): JQuery;
+    dxSlider(): JQuery;
+    dxSlider(options: "instance"): DevExpress.ui.dxSlider;
+    dxSlider(options: string): any;
+    dxSlider(options: string, ...params: any[]): any;
+    dxSlider(options: DevExpress.ui.dxSliderOptions): JQuery;
+    dxRangeSlider(): JQuery;
+    dxRangeSlider(options: "instance"): DevExpress.ui.dxRangeSlider;
+    dxRangeSlider(options: string): any;
+    dxRangeSlider(options: string, ...params: any[]): any;
+    dxRangeSlider(options: DevExpress.ui.dxRangeSliderOptions): JQuery;
+    dxFileUploader(): JQuery;
+    dxFileUploader(options: "instance"): DevExpress.ui.dxFileUploader;
+    dxFileUploader(options: string): any;
+    dxFileUploader(options: string, ...params: any[]): any;
+    dxFileUploader(options: DevExpress.ui.dxFileUploaderOptions): JQuery;
+    dxValidator(): JQuery;
+    dxValidator(options: "instance"): DevExpress.ui.dxValidator;
+    dxValidator(options: string): any;
+    dxValidator(options: string, ...params: any[]): any;
+    dxValidator(options: DevExpress.ui.dxValidatorOptions): JQuery;
+    dxValidationGroup(): JQuery;
+    dxValidationGroup(options: "instance"): DevExpress.ui.dxValidationGroup;
+    dxValidationGroup(options: string): any;
+    dxValidationGroup(options: string, ...params: any[]): any;
+    dxValidationSummary(): JQuery;
+    dxValidationSummary(options: "instance"): DevExpress.ui.dxValidationSummary;
+    dxValidationSummary(options: string): any;
+    dxValidationSummary(options: string, ...params: any[]): any;
+    dxValidationSummary(options: DevExpress.ui.dxValidationSummaryOptions): JQuery;
+    dxTooltip(): JQuery;
+    dxTooltip(options: "instance"): DevExpress.ui.dxTooltip;
+    dxTooltip(options: string): any;
+    dxTooltip(options: string, ...params: any[]): any;
+    dxTooltip(options: DevExpress.ui.dxTooltipOptions): JQuery;
+    dxResizable(): JQuery;
+    dxResizable(options: "instance"): DevExpress.ui.dxResizable;
+    dxResizable(options: string): any;
+    dxResizable(options: string, ...params: any[]): any;
+    dxResizable(options: DevExpress.ui.dxResizableOptions): JQuery;
+    dxDropDownList(): JQuery;
+    dxDropDownList(options: "instance"): DevExpress.ui.dxDropDownList;
+    dxDropDownList(options: string): any;
+    dxDropDownList(options: string, ...params: any[]): any;
+    dxDropDownList(options: DevExpress.ui.dxDropDownListOptions): JQuery;
+    dxToolbar(): JQuery;
+    dxToolbar(options: "instance"): DevExpress.ui.dxToolbar;
+    dxToolbar(options: string): any;
+    dxToolbar(options: string, ...params: any[]): any;
+    dxToolbar(options: DevExpress.ui.dxToolbarOptions): JQuery;
+    dxToast(): JQuery;
+    dxToast(options: "instance"): DevExpress.ui.dxToast;
+    dxToast(options: string): any;
+    dxToast(options: string, ...params: any[]): any;
+    dxToast(options: DevExpress.ui.dxToastOptions): JQuery;
+    dxTextEditor(): JQuery;
+    dxTextEditor(options: "instance"): DevExpress.ui.dxTextEditor;
+    dxTextEditor(options: string): any;
+    dxTextEditor(options: string, ...params: any[]): any;
+    dxTextEditor(options: DevExpress.ui.dxTextEditorOptions): JQuery;
+    dxTextBox(): JQuery;
+    dxTextBox(options: "instance"): DevExpress.ui.dxTextBox;
+    dxTextBox(options: string): any;
+    dxTextBox(options: string, ...params: any[]): any;
+    dxTextBox(options: DevExpress.ui.dxTextBoxOptions): JQuery;
+    dxTextArea(): JQuery;
+    dxTextArea(options: "instance"): DevExpress.ui.dxTextArea;
+    dxTextArea(options: string): any;
+    dxTextArea(options: string, ...params: any[]): any;
+    dxTextArea(options: DevExpress.ui.dxTextAreaOptions): JQuery;
+    dxTabs(): JQuery;
+    dxTabs(options: "instance"): DevExpress.ui.dxTabs;
+    dxTabs(options: string): any;
+    dxTabs(options: string, ...params: any[]): any;
+    dxTabs(options: DevExpress.ui.dxTabsOptions): JQuery;
+    dxTabPanel(): JQuery;
+    dxTabPanel(options: "instance"): DevExpress.ui.dxTabPanel;
+    dxTabPanel(options: string): any;
+    dxTabPanel(options: string, ...params: any[]): any;
+    dxTabPanel(options: DevExpress.ui.dxTabPanelOptions): JQuery;
+    dxSelectBox(): JQuery;
+    dxSelectBox(options: "instance"): DevExpress.ui.dxSelectBox;
+    dxSelectBox(options: string): any;
+    dxSelectBox(options: string, ...params: any[]): any;
+    dxSelectBox(options: DevExpress.ui.dxSelectBoxOptions): JQuery;
+    dxTagBox(): JQuery;
+    dxTagBox(options: "instance"): DevExpress.ui.dxTagBox;
+    dxTagBox(options: string): any;
+    dxTagBox(options: string, ...params: any[]): any;
+    dxTagBox(options: DevExpress.ui.dxTagBoxOptions): JQuery;
+    dxScrollView(): JQuery;
+    dxScrollView(options: "instance"): DevExpress.ui.dxScrollView;
+    dxScrollView(options: string): any;
+    dxScrollView(options: string, ...params: any[]): any;
+    dxScrollView(options: DevExpress.ui.dxScrollViewOptions): JQuery;
+    dxScrollable(): JQuery;
+    dxScrollable(options: "instance"): DevExpress.ui.dxScrollable;
+    dxScrollable(options: string): any;
+    dxScrollable(options: string, ...params: any[]): any;
+    dxScrollable(options: DevExpress.ui.dxScrollableOptions): JQuery;
+    dxRadioGroup(): JQuery;
+    dxRadioGroup(options: "instance"): DevExpress.ui.dxRadioGroup;
+    dxRadioGroup(options: string): any;
+    dxRadioGroup(options: string, ...params: any[]): any;
+    dxRadioGroup(options: DevExpress.ui.dxRadioGroupOptions): JQuery;
+    dxPopup(): JQuery;
+    dxPopup(options: "instance"): DevExpress.ui.dxPopup;
+    dxPopup(options: string): any;
+    dxPopup(options: string, ...params: any[]): any;
+    dxPopup(options: DevExpress.ui.dxPopupOptions): JQuery;
+    dxPopover(): JQuery;
+    dxPopover(options: "instance"): DevExpress.ui.dxPopover;
+    dxPopover(options: string): any;
+    dxPopover(options: string, ...params: any[]): any;
+    dxPopover(options: DevExpress.ui.dxPopoverOptions): JQuery;
+    dxOverlay(): JQuery;
+    dxOverlay(options: "instance"): DevExpress.ui.dxOverlay;
+    dxOverlay(options: string): any;
+    dxOverlay(options: string, ...params: any[]): any;
+    dxOverlay(options: DevExpress.ui.dxOverlayOptions): JQuery;
+    dxNumberBox(): JQuery;
+    dxNumberBox(options: "instance"): DevExpress.ui.dxNumberBox;
+    dxNumberBox(options: string): any;
+    dxNumberBox(options: string, ...params: any[]): any;
+    dxNumberBox(options: DevExpress.ui.dxNumberBoxOptions): JQuery;
+    dxNavBar(): JQuery;
+    dxNavBar(options: "instance"): DevExpress.ui.dxNavBar;
+    dxNavBar(options: string): any;
+    dxNavBar(options: string, ...params: any[]): any;
+    dxNavBar(options: DevExpress.ui.dxNavBarOptions): JQuery;
+    dxMultiView(): JQuery;
+    dxMultiView(options: "instance"): DevExpress.ui.dxMultiView;
+    dxMultiView(options: string): any;
+    dxMultiView(options: string, ...params: any[]): any;
+    dxMultiView(options: DevExpress.ui.dxMultiViewOptions): JQuery;
+    dxMap(): JQuery;
+    dxMap(options: "instance"): DevExpress.ui.dxMap;
+    dxMap(options: string): any;
+    dxMap(options: string, ...params: any[]): any;
+    dxMap(options: DevExpress.ui.dxMapOptions): JQuery;
+    dxLookup(): JQuery;
+    dxLookup(options: "instance"): DevExpress.ui.dxLookup;
+    dxLookup(options: string): any;
+    dxLookup(options: string, ...params: any[]): any;
+    dxLookup(options: DevExpress.ui.dxLookupOptions): JQuery;
+    dxLoadPanel(): JQuery;
+    dxLoadPanel(options: "instance"): DevExpress.ui.dxLoadPanel;
+    dxLoadPanel(options: string): any;
+    dxLoadPanel(options: string, ...params: any[]): any;
+    dxLoadPanel(options: DevExpress.ui.dxLoadPanelOptions): JQuery;
+    dxLoadIndicator(): JQuery;
+    dxLoadIndicator(options: "instance"): DevExpress.ui.dxLoadIndicator;
+    dxLoadIndicator(options: string): any;
+    dxLoadIndicator(options: string, ...params: any[]): any;
+    dxLoadIndicator(options: DevExpress.ui.dxLoadIndicatorOptions): JQuery;
+    dxList(): JQuery;
+    dxList(options: "instance"): DevExpress.ui.dxList;
+    dxList(options: string): any;
+    dxList(options: string, ...params: any[]): any;
+    dxList(options: DevExpress.ui.dxListOptions): JQuery;
+    dxGallery(): JQuery;
+    dxGallery(options: "instance"): DevExpress.ui.dxGallery;
+    dxGallery(options: string): any;
+    dxGallery(options: string, ...params: any[]): any;
+    dxGallery(options: DevExpress.ui.dxGalleryOptions): JQuery;
+    dxDropDownEditor(): JQuery;
+    dxDropDownEditor(options: "instance"): DevExpress.ui.dxDropDownEditor;
+    dxDropDownEditor(options: string): any;
+    dxDropDownEditor(options: string, ...params: any[]): any;
+    dxDropDownEditor(options: DevExpress.ui.dxDropDownEditorOptions): JQuery;
+    dxDateBox(): JQuery;
+    dxDateBox(options: "instance"): DevExpress.ui.dxDateBox;
+    dxDateBox(options: string): any;
+    dxDateBox(options: string, ...params: any[]): any;
+    dxDateBox(options: DevExpress.ui.dxDateBoxOptions): JQuery;
+    dxCheckBox(): JQuery;
+    dxCheckBox(options: "instance"): DevExpress.ui.dxCheckBox;
+    dxCheckBox(options: string): any;
+    dxCheckBox(options: string, ...params: any[]): any;
+    dxCheckBox(options: DevExpress.ui.dxCheckBoxOptions): JQuery;
+    dxBox(): JQuery;
+    dxBox(options: "instance"): DevExpress.ui.dxBox;
+    dxBox(options: string): any;
+    dxBox(options: string, ...params: any[]): any;
+    dxBox(options: DevExpress.ui.dxBoxOptions): JQuery;
+    dxButton(): JQuery;
+    dxButton(options: "instance"): DevExpress.ui.dxButton;
+    dxButton(options: string): any;
+    dxButton(options: string, ...params: any[]): any;
+    dxButton(options: DevExpress.ui.dxButtonOptions): JQuery;
+    dxCalendar(): JQuery;
+    dxCalendar(options: "instance"): DevExpress.ui.dxCalendar;
+    dxCalendar(options: string): any;
+    dxCalendar(options: string, ...params: any[]): any;
+    dxCalendar(options: DevExpress.ui.dxCalendarOptions): JQuery;
+    dxAccordion(): JQuery;
+    dxAccordion(options: "instance"): DevExpress.ui.dxAccordion;
+    dxAccordion(options: string): any;
+    dxAccordion(options: string, ...params: any[]): any;
+    dxAccordion(options: DevExpress.ui.dxAccordionOptions): JQuery;
+    dxResponsiveBox(): JQuery;
+    dxResponsiveBox(options: "instance"): DevExpress.ui.dxResponsiveBox;
+    dxResponsiveBox(options: string): any;
+    dxResponsiveBox(options: string, ...params: any[]): any;
+    dxResponsiveBox(options: DevExpress.ui.dxResponsiveBoxOptions): JQuery;
+    dxAutocomplete(): JQuery;
+    dxAutocomplete(options: "instance"): DevExpress.ui.dxAutocomplete;
+    dxAutocomplete(options: string): any;
+    dxAutocomplete(options: string, ...params: any[]): any;
+    dxAutocomplete(options: DevExpress.ui.dxAutocompleteOptions): JQuery;
+    dxForm(): JQuery;
+    dxForm(options: "instance"): DevExpress.ui.dxForm;
+    dxForm(options: string): any;
+    dxForm(options: string, ...params: any[]): any;
+    dxForm(options: DevExpress.ui.dxForm): JQuery;
+}
+
+declare namespace DevExpress.ui {
+    export interface dxTileViewOptions extends CollectionWidgetOptions {
+        /** A Boolean value specifying whether or not the widget changes its state when interacting with a user. */
+        activeStateEnabled?: boolean;
+        /** Specifies the height of the base tile view item. */
+        baseItemHeight?: number;
+        /** Specifies the width of the base tile view item. */
+        baseItemWidth?: number;
+        /** Specifies whether tiles are placed horizontally or vertically. */
+        direction?: string;
+        /** Specifies the height of the widget. */
+        height?: any;
+        /** Specifies the distance in pixels between adjacent tiles. */
+        itemMargin?: number;
+        /** A Boolean value specifying whether or not to display a scrollbar. */
+        showScrollbar?: boolean;
+    }
+    /** A widget displaying several blocks of data as tiles. */
+    export class dxTileView extends CollectionWidget {
+        constructor(element: JQuery, options?: dxTileViewOptions);
+        constructor(element: Element, options?: dxTileViewOptions);
+        /** Returns the current scroll position of the widget content. */
+        scrollPosition(): number;
+    }
+    export interface dxSwitchOptions extends EditorOptions {
+	    activeStateEnabled?: boolean;
+        /** Text displayed when the widget is in a disabled state. */
+        offText?: string;
+        /** Text displayed when the widget is in an enabled state. */
+        onText?: string;
+        /** A Boolean value specifying whether the current switch state is "On" or "Off". */
+        value?: boolean;
+    }
+    /** A switch widget. */
+    export class dxSwitch extends Editor {
+        constructor(element: JQuery, options?: dxSwitchOptions);
+        constructor(element: Element, options?: dxSwitchOptions);
+    }
+    export interface dxSlideOutViewOptions extends WidgetOptions {
+        /** Specifies the current menu position. */
+        menuPosition?: string;
+        /** Specifies whether or not the menu panel is visible. */
+        menuVisible?: boolean;
+        /** Specifies whether or not the menu is shown when a user swipes the widget content. */
+        swipeEnabled?: boolean;
+        /** A template to be used for rendering menu panel content. */
+        menuTemplate?: any;
+        /** A template to be used for rendering widget content. */
+        contentTemplate?: any;
+    }
+    /** The widget that allows you to slide-out the current view to reveal a custom menu. */
+    export class dxSlideOutView extends Widget {
+        constructor(element: JQuery, options?: dxSlideOutViewOptions);
+        constructor(element: Element, options?: dxSlideOutViewOptions);
+        /** Returns an HTML element of the widget menu block. */
+        menuContent(): JQuery;
+        /** Returns an HTML element of the widget content block. */
+        content(): JQuery;
+        /** Displays the widget's menu block. */
+        showMenu(): JQueryPromise<void>;
+        /** Hides the widget's menu block. */
+        hideMenu(): JQueryPromise<void>;
+        /** Toggles the visibility of the widget's menu block. */
+        toggleMenuVisibility(): JQueryPromise<void>;
+    }
+    export interface dxSlideOutOptions extends CollectionWidgetOptions {
+        /** A Boolean value specifying whether or not the widget changes its state when interacting with a user. */
+        activeStateEnabled?: boolean;
+        /** A Boolean value specifying whether or not to display a grouped menu. */
+        menuGrouped?: boolean;
+        /** Specifies the current menu position. */
+        menuPosition?: string;
+        /** The name of the template used to display a group header. */
+        menuGroupTemplate?: any;
+        /** The template used to render menu items. */
+        menuItemTemplate?: any;
+        /** A handler for the menuGroupRendered event. */
+        onMenuGroupRendered?: Function;
+        /** A handler for the menuItemRendered event. */
+        onMenuItemRendered?: Function;
+        /** Specifies whether or not the slide-out menu is displayed. */
+        menuVisible?: boolean;
+        /** Indicates whether the menu can be shown/hidden by swiping the widget's main panel. */
+        swipeEnabled?: boolean;
+        /** A template to be used for rendering widget content. */
+        contentTemplate?: any;
+    }
+    /** The widget that allows you to slide-out the current view to reveal an item list. */
+    export class dxSlideOut extends CollectionWidget {
+        constructor(element: JQuery, options?: dxSlideOutOptions);
+        constructor(element: Element, options?: dxSlideOutOptions);
+        /** Hides the widget's slide-out menu. */
+        hideMenu(): JQueryPromise<void>;
+        /** Displays the widget's slide-out menu. */
+        showMenu(): JQueryPromise<void>;
+        /** Toggles the visibility of the widget's slide-out menu. */
+        toggleMenuVisibility(showing: boolean): JQueryPromise<void>;
+    }
+    export interface dxPivotOptions extends CollectionWidgetOptions {
+        /** The index of the currently active pivot item. */
+        selectedIndex?: number;
+        /** A Boolean value specifying whether or not to allow users to switch between items by swiping. */
+        swipeEnabled?: boolean;
+        /** A template to be used for rendering widget content. */
+        contentTemplate?: any;
+        /** The template to be used for rendering an item title. */
+        itemTitleTemplate?: any;
+    }
+    /** A widget that is similar to a traditional tab control, but optimized for the phone with simplified end-user interaction. */
+    export class dxPivot extends CollectionWidget {
+        constructor(element: JQuery, options?: dxPivotOptions);
+        constructor(element: Element, options?: dxPivotOptions);
+    }
+    export interface dxPanoramaOptions extends CollectionWidgetOptions {
+        /** An object exposing options for setting a background image for the panorama. */
+        backgroundImage?: {
+            /** Specifies the height of the panorama's background image. */
+            height?: number;
+            /** Specifies the URL of the image that is used as the panorama's background image. */
+            url?: string;
+            /** Specifies the width of the panorama's background image. */
+            width?: number;
+        };
+        /** The index of the currently active panorama item. */
+        selectedIndex?: number;
+        /** Specifies the widget content title. */
+        title?: string;
+    }
+    /** A widget displaying the required content in a long horizontal canvas that extends beyond the frames of the screen. */
+    export class dxPanorama extends CollectionWidget {
+        constructor(element: JQuery, options?: dxDropDownEditorOptions);
+        constructor(element: Element, options?: dxDropDownEditorOptions);
+    }
+    export interface dxDropDownMenuOptions extends WidgetOptions {
+        /** A handler for the buttonClick event. */
+        onButtonClick?: any;
+        /** The name of the icon to be displayed by the DropDownMenu button. */
+        buttonIcon?: string;
+        /** The text displayed in the DropDownMenu button. */
+        buttonText?: string;
+        buttonIconSrc?: string;
+        /** A data source used to fetch data to be displayed by the widget. */
+        dataSource?: any;
+        /** A handler for the itemClick event. */
+        onItemClick?: any;
+        /** An array of items displayed by the widget. */
+        items?: Array<any>;
+        /** The template to be used for rendering items. */
+        itemTemplate?: any;
+        /** Specifies whether or not to show the drop down menu within a dxPopover widget. */
+        usePopover?: boolean;
+        /** The width of the menu popup in pixels. */
+        popupWidth?: any;
+        /** The height of the menu popup in pixels. */
+        popupHeight?: any;
+        /** Specifies whether or not the drop-down menu is displayed. */
+        opened?: boolean;
+        hoverStateEnabled?: boolean;
+        activeStateEnabled?: boolean;
+    }
+    /** A drop-down menu widget. */
+    export class dxDropDownMenu extends Widget {
+        constructor(element: JQuery, options?: dxDropDownEditorOptions);
+        constructor(element: Element, options?: dxDropDownEditorOptions);
+        /** This section lists the data source fields that are used in a default template for drop-down menu items. */
+        /** Opens the drop-down menu. */
+        open(): void;
+        /** Closes the drop-down menu. */
+        close(): void;
+    }
+    export interface dxActionSheetOptions extends CollectionWidgetOptions {
+        /** A handler for the cancelClick event. */
+        onCancelClick?: any;
+        /** The text displayed in the button that closes the action sheet. */
+        cancelText?: string;
+        /** Specifies whether or not to display the Cancel button in action sheet. */
+        showCancelButton?: boolean;
+        /** A Boolean value specifying whether or not the title of the action sheet is visible. */
+        showTitle?: boolean;
+        /** Specifies the element the action sheet popover points at. */
+        target?: any;
+        /** The title of the action sheet. */
+        title?: string;
+        /** Specifies whether or not to show the action sheet within a dxPopover widget. */
+        usePopover?: boolean;
+        /** A Boolean value specifying whether or not the dxActionSheet widget is visible. */
+        visible?: boolean;
+    }
+    /** A widget consisting of a set of choices related to a certain task. */
+    export class dxActionSheet extends CollectionWidget {
+        constructor(element: JQuery, options?: dxActionSheetOptions);
+        constructor(element: Element, options?: dxActionSheetOptions);
+        /** Hides the widget. */
+        hide(): JQueryPromise<dxActionSheet>;
+        /** Shows the widget. */
+        show(): JQueryPromise<dxActionSheet>;
+        /** Shows or hides the widget depending on the Boolean value passed as the parameter. */
+        toggle(showing: boolean): JQueryPromise<dxActionSheet>;
+    }
+}
+interface JQuery {
+    dxTileView(): JQuery;
+    dxTileView(options: "instance"): DevExpress.ui.dxTileView;
+    dxTileView(options: string): any;
+    dxTileView(options: string, ...params: any[]): any;
+    dxTileView(options: DevExpress.ui.dxTileViewOptions): JQuery;
+    dxSwitch(): JQuery;
+    dxSwitch(options: "instance"): DevExpress.ui.dxSwitch;
+    dxSwitch(options: string): any;
+    dxSwitch(options: string, ...params: any[]): any;
+    dxSwitch(options: DevExpress.ui.dxSwitchOptions): JQuery;
+    dxSlideOut(): JQuery;
+    dxSlideOut(options: "instance"): DevExpress.ui.dxSlideOut;
+    dxSlideOut(options: string): any;
+    dxSlideOut(options: string, ...params: any[]): any;
+    dxSlideOut(options: DevExpress.ui.dxSlideOutOptions): JQuery;
+    dxPivot(): JQuery;
+    dxPivot(options: "instance"): DevExpress.ui.dxPivot;
+    dxPivot(options: string): any;
+    dxPivot(options: string, ...params: any[]): any;
+    dxPivot(options: DevExpress.ui.dxPivotOptions): JQuery;
+    dxPanorama(): JQuery;
+    dxPanorama(options: "instance"): DevExpress.ui.dxPanorama;
+    dxPanorama(options: string): any;
+    dxPanorama(options: string, ...params: any[]): any;
+    dxPanorama(options: DevExpress.ui.dxPanoramaOptions): JQuery;
+    dxActionSheet(): JQuery;
+    dxActionSheet(options: "instance"): DevExpress.ui.dxActionSheet;
+    dxActionSheet(options: string): any;
+    dxActionSheet(options: string, ...params: any[]): any;
+    dxActionSheet(options: DevExpress.ui.dxActionSheetOptions): JQuery;
+    dxDropDownMenu(): JQuery;
+    dxDropDownMenu(options: "instance"): DevExpress.ui.dxDropDownMenu;
+    dxDropDownMenu(options: string): any;
+    dxDropDownMenu(options: string, ...params: any[]): any;
+    dxDropDownMenu(options: DevExpress.ui.dxDropDownMenuOptions): JQuery;
+}
+declare namespace DevExpress.data {
+    export interface XmlaStoreOptions {
+        /** The HTTP address to an XMLA OLAP server. */
+        url?: string;
+        /** The name of the database associated with the Store. */
+        catalog?: string;
+        /** The cube name. */
+        cube?: string;
+        /** A function used to customize a web request before it is sent. */
+        beforeSend?: (request: Object) => void;
+    }
+    /** A Store that provides access to an OLAP cube using the XMLA standard. */
+    export class XmlaStore {
+        constructor(options: XmlaStoreOptions);
+    }
+    export interface PivotGridField {
+        index?: number;
+        /** A boolean value specifying whether or not the field is visible in the pivot grid and the Field Chooser. */
+        visible?: boolean;
+        /** Name of the data source field containing data for the pivot grid field. */
+        dataField?: string;
+        /** A caption that will be displayed in the pivot grid's field chooser to identify the field. */
+        caption?: string;
+        /** Specifies a type of field values. */
+        dataType?: string;
+        /** Specifies how the values of the current field are combined into groups. Cannot be used for the XmlaStore store type. */
+        groupInterval?: any;
+        /** Specifies how to aggregate field data. Cannot be used for the XmlaStore store type. */
+        summaryType?: string;
+        /** Allows you to use a custom aggregate function to calculate the summary values. Cannot be used for the XmlaStore store type. */
+        calculateCustomSummary?: (options: {
+            summaryProcess?: string;
+            value?: any;
+            totalValue?: any;
+        }) => void;
+        /** Specifies the function that determines how to split data from the data source into ranges for header items. Cannot be used for the XmlaStore store type. */
+        selector?: (data: Object) => any;
+        /** Type of the area where the field is located. */
+        area?: string;
+        /** Index among the other fields displayed within the same area. */
+        areaIndex?: number;
+        /** The name of the folder in which the field is located. */
+        displayFolder?: string;
+        /** The name of the group to which the field belongs. */
+        groupName?: string;
+        /** The index of the field within a group. */
+        groupIndex?: number;
+        /** Specifies the initial sort order of field values. */
+        sortOrder?: string;
+        /** Specifies how field data should be sorted. Can be used for the XmlaStore store type only. */
+        sortBy?: string;
+        /** Specifies the data field against which the header items of this field should be sorted. */
+        sortBySummaryField?: string;
+        /** The array of field names that specify a path to column/row whose summary field is used for sorting of this field's header items. */
+        sortBySummaryPath?: Array<any>;
+        /** The filter values for the current field. */
+        filterValues?: Array<any>;
+        /** The filter type for the current field. */
+        filterType?: string;
+        /** Indicates whether all header items of the field's header level are expanded. */
+        expanded?: boolean;
+        /** Specifies whether the field should be treated as a Data Field. */
+        isMeasure?: boolean;
+        /** Specifies a display format for field values. */
+        format?: string;
+        /** Specifies a callback function that returns the text to be displayed in the cells of a field. */
+        customizeText?: (cellInfo: { value: any; valueText: string }) => string;
+        /** Specifies a precision for formatted field values. */
+        precision?: number;
+        /** Specifies how to sort the header items. */
+        sortingMethod?: (a: Object, b: Object) => number;
+        /** Allows an end-user to change sorting options. */
+        allowSorting?: boolean;
+        /** Allows an end-user to sort columns by summary values. */
+        allowSortingBySummary?: boolean;
+        /** Allows an end-user to change filtering options. */
+        allowFiltering?: boolean;
+        /** Allows an end-user to expand/collapse all header items within a header level. */
+        allowExpandAll?: boolean;
+        /** Specifies the absolute width of the field in the pivot grid. */
+        width?: number;
+        /** Specifies the summary post-processing algorithm. */
+        summaryDisplayMode?: string;
+        /** Specifies whether to summarize each next summary value with the previous one by rows or columns. */
+        runningTotal?: string;
+        /** Specifies whether to allow the predefined summary post-processing functions ('absoluteVariation' and 'percentVariation') and runningTotal to take values of different groups into account. */
+        allowCrossGroupCalculation?: boolean;
+        /** Specifies a callback function that allows you to modify summary values after they are calculated. */
+        calculateSummaryValue?: (e: Object) => number;
+        /** Specifies whether or not to display Total values for the field. */
+        showTotals?: boolean;
+        /** Specifies whether or not to display Grand Total values for the field. */
+        showGrandTotals?: boolean;
+    }
+    export class SummaryCell {
+        /** Gets the parent cell in a specified direction. */
+        parent(direction: string): SummaryCell;
+        /** Gets all children cells in a specified direction. */
+        children(direction: string): Array<SummaryCell>;
+        /** Gets a partial Grand Total cell of a row or column. */
+        grandTotal(direction: string): SummaryCell;
+        /** Gets the Grand Total of the entire pivot grid. */
+        grandTotal(): SummaryCell;
+        /** Gets the cell next to the current one in a specified direction. */
+        next(direction: string): SummaryCell;
+        /** Gets the cell next to current in a specified direction. */
+        next(direction: string, allowCrossGroup: boolean): SummaryCell;
+        /** Gets the cell prior to the current one in a specified direction. */
+        prev(direction: string): SummaryCell;
+        /** Gets the cell previous to current in a specified direction. */
+        prev(direction: string, allowCrossGroup: boolean): SummaryCell;
+        /** Gets the child cell in a specified direction. */
+        child(direction: string, fieldValue: any): SummaryCell;
+        /** Gets the cell located by the path of the source cell with one field value changed. */
+        slice(field: PivotGridField, value: any): SummaryCell;
+        /** Gets the header cell of a row or column field to which the current cell belongs. */
+        field(area: string): PivotGridField;
+        /** Gets the value of the current cell. */
+        value(): any;
+        /** Gets the value of the current cell. */
+        value(isCalculatedValue: boolean): any;
+        /** Gets the value of any field linked with the current cell. */
+        value(field: PivotGridField): any;
+        /** Gets the value of any field linked with the current cell. */
+        value(field: PivotGridField, isCalculatedValue: boolean): any;
+    }
+    export interface PivotGridDataSourceOptions {
+        /** Specifies the underlying Store instance used to access data. */
+        store?: any;
+        /** Indicates whether or not the automatic field generation from data in the Store is enabled. */
+        retrieveFields?: boolean;
+        /** Specifies data filtering conditions. Cannot be used for the XmlaStore store type. */
+        filter?: Object;
+        /** An array of pivot grid fields. */
+        fields?: Array<PivotGridField>;
+        /** A handler for the changed event. */
+        onChanged?: () => void;
+        /** A handler for the loadingChanged event. */
+        onLoadingChanged?: (isLoading: boolean) => void;
+        /** A handler for the loadError event. */
+        onLoadError?: (e?: Object) => void;
+        /** A handler for the fieldsPrepared event. */
+        onFieldsPrepared?: (e?: Array<PivotGridField>) => void;
+    }
+    /** An object that provides access to data for the dxPivotGrid widget. */
+    export class PivotGridDataSource implements EventsMixin<PivotGridDataSource> {
+        constructor(options?: PivotGridDataSource);
+        /** Starts reloading data from any store and updating the data source. */
+        reload(): JQueryPromise<any>;
+        /** Starts updating the data source. Reloads data from the XMLA store only. */
+        load(): JQueryPromise<any>;
+        /** Indicates whether or not the PivotGridDataSource is currently being loaded. */
+        isLoading(): boolean;
+        /** Gets data displayed in a PivotGrid. */
+        getData(): Object;
+        /** Gets all fields within a specified area. */
+        getAreaFields(area: string, collectGroups: boolean): Array<PivotGridField>;
+        /** Gets all fields from the data source. */
+        fields(): Array<PivotGridField>;
+        /** Sets the fields option. */
+        fields(fields: Array<PivotGridField>): void;
+        /** Gets current options of a specified field. */
+        field(id: any): PivotGridField;
+        /** Sets one or more options of a specified field. */
+        field(id: any, field: PivotGridField): void;
+        /** Collapses a specified header item. */
+        collapseHeaderItem(area: string, path: Array<any>): void;
+        /** Expands a specified header item. */
+        expandHeaderItem(area: string, path: Array<any>): void;
+        /** Expands all header items of a field. */
+        expandAll(id: any): void;
+        /** Collapses all header items of a field. */
+        collapseAll(id: any): void;
+        /** Disposes of all resources associated with this PivotGridDataSource. */
+        dispose(): void;
+        /** Gets the current filter expression. Cannot be used for the XmlaStore store type. */
+        filter(): Object;
+        /** Applies a new filter expression. Cannot be used for the XmlaStore store type. */
+        filter(filterExpr: Object): void;
+        /** Provides access to a list of records (facts) that were used to calculate a specific summary. */
+        createDrillDownDataSource(options: {
+            columnPath?: Array<any>;
+            rowPath?: Array<any>;
+            dataIndex?: number;
+            maxRowCount?: number;
+            customColumns?: Array<string>;
+        }): DevExpress.data.DataSource;
+        /** Gets the current PivotGridDataSource state (fields configuration, sorting, filters, expanded headers, etc.) */
+        state(): Object;
+        /** Sets the PivotGridDataSource state. */
+        state(state: Object): void;
+        on(eventName: string, eventHandler: Function): PivotGridDataSource;
+        on(events: { [eventName: string]: Function; }): PivotGridDataSource;
+        off(eventName: string): PivotGridDataSource;
+        off(eventName: string, eventHandler: Function): PivotGridDataSource;
+    }
+}
+declare namespace DevExpress.ui {
+    export interface dxSchedulerOptions extends WidgetOptions {
+        /** Specifies a date displayed on the current scheduler view by default. */
+        currentDate?: Date;
+        /** The earliest date the widget allows you to select. */
+        min?: Date;
+        /** The latest date the widget allows you to select. */
+        max?: Date;
+        /** Specifies the view used in the scheduler by default. */
+        currentView?: string;
+        /** A data source used to fetch data to be displayed by the widget. */
+        dataSource?: any;
+        /** Specifies the first day of a week. */
+        firstDayOfWeek?: number;
+        /** The template to be used for rendering appointments. */
+        appointmentTemplate?: any;
+        /** The template to be used for rendering an appointment tooltip. */
+        appointmentTooltipTemplate?: any;
+        /** Lists the views to be available within the scheduler's View Selector. */
+        views?: Array<string>;
+        /** Specifies the resource kinds by which the scheduler's appointments are grouped in a timetable. */
+        groups?: Array<string>;
+        /** Specifies a start hour in the scheduler view's time interval. */
+        startDayHour?: number;
+        /** Specifies an end hour in the scheduler view's time interval. */
+        endDayHour?: number;
+        /** Specifies whether or not the "All-day" panel is visible. */
+        showAllDayPanel?: boolean;
+        /** Specifies cell duration in minutes. */
+        cellDuration?: number;
+        /** Specifies the edit mode for recurrent appointments. */
+        recurrenceEditMode?: string;
+        /** Specifies which editing operations an end-user can perform on appointments. */
+        editing?: {
+            /** Specifies whether or not an end-user can add appointments. */
+            allowAdding?: boolean;
+            /** Specifies whether or not an end-user can change appointment options. */
+            allowUpdating?: boolean;
+            /** Specifies whether or not an end-user can delete appointments. */
+            allowDeleting?: boolean;
+            /** Specifies whether or not an end-user can change an appointment duration. */
+            allowResizing?: boolean;
+            /** Specifies whether or not an end-user can drag appointments. */
+            allowDragging?: boolean;
+        }
+        /** Specifies an array of resources available in the scheduler. */
+        resources?: Array<{
+            /** Indicates whether or not several resources of this kind can be assigned to an appointment. */
+            allowMultiple?: boolean;
+            /**
+             * Indicates whether or not resources of this kind have priority in the color identification of the appointments that have resources of different kinds assigned.
+             * @deprecated Use the 'useColorAsDefault' property instead
+             */
+            mainColor?: boolean;
+            /** Indicates whether or not resources of this kind have priority in the color identification of the appointments that have resources of different kinds assigned. */
+            useColorAsDefault?: boolean;
+            /** A data source used to fetch resources to be available in the scheduler. */
+            dataSource?: any;
+            /** Specifies the resource object field whose value is displayed by the Resource editor in the Appointment popup window. */
+            displayExpr?: any;
+            /** Specifies the resource object field that is used as a value of the Resource editor in the Appointment popup window. */
+            valueExpr?: any;
+            /** The name of the appointment object field that specifies a resource of this kind. */
+            field?: string;
+            /** Specifies the label of the Appointment popup window field that allows end users to assign a resource of this kind. */
+            label?: string;
+        }>;
+        /** A handler for the AppointmentAdding event. */
+        onAppointmentAdding?: Function;
+        /** A handler for the appointmentAdded event. */
+        onAppointmentAdded?: Function;
+        /** A handler for the AppointmentUpdating event. */
+        onAppointmentUpdating?: Function;
+        /** A handler for the appointmentUpdated event. */
+        onAppointmentUpdated?: Function;
+        /** A handler for the AppointmentDeleting event. */
+        onAppointmentDeleting?: Function;
+        /** A handler for the appointmentDeleted event. */
+        onAppointmentDeleted?: Function;
+        /** A handler for the appointmentRendered event. */
+        onAppointmentRendered?: Function;
+        /** A handler for the appointmentClick event. */
+        onAppointmentClick?: any;
+        /** A handler for the appointmentDblClick event. */
+        onAppointmentDblClick?: any;
+        /** A handler for the cellClick event. */
+        onCellClick?: any;
+        /** A handler for the appointmentFormCreated event. */
+        onAppointmentFormCreated?: Function;
+        /** Specifies whether or not an end-user can scroll the view horizontally. */
+        horizontalScrollingEnabled?: boolean;
+        /** Specifies whether a user can switch views using tabs or a drop-down menu. */
+        useDropDownViewSwitcher?: boolean;
+        /** Specifies the name of the data source item field that defines the start of an appointment. */
+        startDateExpr?: string;
+        /** Specifies the name of the data source item field that defines the ending of an appointment. */
+        endDateExpr?: string;
+        /** Specifies the name of the data source item field that holds the subject of an appointment. */
+        textExpr?: string;
+        /** Specifies the name of the data source item field whose value holds the description of the corresponding appointment. */
+        descriptionExpr?: string;
+        /** Specifies the name of the data source item field whose value defines whether or not the corresponding appointment is an all-day appointment. */
+        allDayExpr?: string;
+        /** Specifies the name of the data source item field that defines a recurrence rule for generating recurring appointments. */
+        recurrenceRuleExpr?: string;
+        /** Specifies the name of the data source item field that defines exceptions for the current recurring appointment. */
+        recurrenceExceptionExpr?: string;
+        /** Specifies whether filtering is performed on the server or client side. */
+        remoteFiltering?: boolean;
+    }
+    /** A widget that displays scheduled data using different views and provides the capability to load, add and edit appointments. */
+    export class dxScheduler extends Widget {
+        constructor(element: JQuery, options?: dxSchedulerOptions);
+        constructor(element: Element, options?: dxSchedulerOptions);
+        /** Add the appointment defined by the object passed as a parameter to the data associated with the widget. */
+        addAppointment(appointment: Object): void;
+        /** Updates the appointment specified by the first method parameter by the appointment object specified by the second method parameter in the the data associated with the widget. */
+        updateAppointment(target: Object, appointment: Object): void;
+        /** Deletes the appointment defined by the parameter from the the data associated with the widget. */
+        deleteAppointment(appointment: Object): void;
+        /** Scrolls the scheduler work space to the specified time. */
+        scrollToTime(hours: number, minutes: number): void;
+        /** Displays the Appointment Details popup. */
+        showAppointmentPopup(appointmentData: Object, createNewAppointment?: boolean): void;
+    }
+    export interface dxColorBoxOptions extends dxDropDownEditorOptions {
+        /** Specifies the text displayed on the button that applies changes and closes the drop-down editor. */
+        applyButtonText?: string;
+        applyValueMode?: string;
+        /** Specifies the text displayed on the button that cancels changes and closes the drop-down editor. */
+        cancelButtonText?: string;
+        /** Specifies whether or not the widget value includes the alpha channel component. */
+        editAlphaChannel?: boolean;
+        /** Specifies the size of a step by which a handle is moved using a keyboard shortcut. */
+        keyStep?: number;
+    }
+    /** A widget used to specify a color value. */
+    export class dxColorBox extends dxDropDownEditor {
+        constructor(element: JQuery, options?: dxColorBoxOptions);
+        constructor(element: Element, options?: dxColorBoxOptions);
+    }
+    export interface HierarchicalCollectionWidgetOptions extends CollectionWidgetOptions {
+        /** Specifies the name of the data source item field whose value is displayed by the widget. */
+        displayExpr?: any;
+        /** Specifies the name of the data source item field used as a key. */
+        keyExpr?: any;
+        /** Specifies the name of the data source item field whose value defines whether or not the corresponding widget items is selected. */
+        selectedExpr?: any;
+        /** Specifies the name of the data source item field that contains an array of nested items. */
+        itemsExpr?: any;
+        /** Specifies the name of the data source item field whose value defines whether or not the corresponding widget item is disabled. */
+        disabledExpr?: any;
+        /** Specifies the name of the data source item field that holds the key of the parent item. */
+        parentIdExpr?: any;
+        /** Specifies the name of the data source item field whose value defines whether or not the corresponding widget items is expanded. */
+        expandedExpr?: any;
+        hoverStateEnabled?: boolean;
+        focusStateEnabled?: boolean;
+    }
+    export class HierarchicalCollectionWidget extends CollectionWidget {
+    }
+    export interface dxTreeViewOptions extends HierarchicalCollectionWidgetOptions {
+        /** Specifies whether or not to animate item collapsing and expanding. */
+        animationEnabled?: boolean;
+        /** Specifies whether a nested or plain array is used as a data source. */
+        dataStructure?: string;
+        /** Specifies whether or not a user can expand all tree view items by the "*" hot key. */
+        expandAllEnabled?: boolean;
+        /**
+         * Specifies whether or not a check box is displayed at each tree view item.
+         * @deprecated Use the showCheckBoxesMode option instead.
+         */
+        showCheckBoxes?: boolean;
+        /** Specifies the current check boxes display mode. */
+        showCheckBoxesMode?: string;
+        /** Specifies whether or not to select nodes recursively. */
+        selectNodesRecursive?: boolean;
+        /** Specifies whether or not all parent nodes of an initially expanded node are displayed expanded. */
+        expandNodesRecursive?: boolean;
+        /**
+         * Specifies whether the "Select All" check box is displayed over the tree view.
+         * @deprecated Use the showCheckBoxesMode option instead.
+         */
+        selectAllEnabled?: boolean;
+        /** Specifies the text displayed at the "Select All" check box. */
+        selectAllText?: string;
+        /** Specifies the name of the data source item field whose value defines whether or not the corresponding node includes child nodes. */
+        hasItemsExpr?: any;
+        /** Specifies if the virtual mode is enabled. */
+        virtualModeEnabled?: boolean;
+        /** Specifies the parent ID value of the root item. */
+        rootValue?: any;
+        /** Specifies the current value used to filter tree view items. */
+        searchValue?: string;
+        /** A string value specifying available scrolling directions. */
+        scrollDirection?: string;
+        /** A handler for the itemSelected event. */
+        onItemSelected?: Function;
+        /** A handler for the itemExpanded event. */
+        onItemExpanded?: Function;
+        /** A handler for the itemCollapsed event. */
+        onItemCollapsed?: Function;
+        onItemClick?: Function;
+        onItemContextMenu?: Function;
+        onItemRendered?: Function;
+        onItemHold?: Function;
+    }
+    /** A widget displaying specified data items as a tree. */
+    export class dxTreeView extends HierarchicalCollectionWidget {
+        constructor(element: JQuery, options?: dxTreeViewOptions);
+        constructor(element: Element, options?: dxTreeViewOptions);
+        /** Updates the tree view scrollbars according to the current size of the widget content. */
+        updateDimensions(): JQueryPromise<void>;
+        /** Selects the specified item. */
+        selectItem(itemElement: any): void;
+        /** Unselects the specified item. */
+        unselectItem(itemElement: any): void;
+        /** Expands the specified item. */
+        expandItem(itemElement: any): void;
+        /** Collapses the specified item. */
+        collapseItem(itemElement: any): void;
+        /** Returns all nodes of the tree view. */
+        getNodes(): Array<Object>;
+        /** Selects all widget items. */
+        selectAll(): void;
+        /** Unselects all widget items. */
+        unselectAll(): void;
+    }
+    export interface dxMenuBaseOptions extends HierarchicalCollectionWidgetOptions {
+        /** An object that defines the animation options of the widget. */
+        animation?: fx.AnimationOptions;
+        /** A Boolean value specifying whether or not the widget changes its state when interacting with a user. */
+        activeStateEnabled?: boolean;
+        /** Specifies the name of the CSS class associated with the menu. */
+        cssClass?: string;
+        /** Holds an array of menu items. */
+        items?: Array<any>;
+        /** Specifies whether or not an item becomes selected if an end-user clicks it. */
+        selectionByClick?: boolean;
+        /** Specifies the selection mode supported by the menu. */
+        selectionMode?: string;
+        /** Specifies options of submenu showing and hiding. */
+        showSubmenuMode?: {
+            /** Specifies the mode name. */
+            name?: string;
+            /** Specifies the delay of submenu show and hiding. */
+            delay?: {
+                /** The time span after which the submenu is shown. */
+                show?: number;
+                /** The time span after which the submenu is hidden. */
+                hide?: number;
+            };
+        };
+    }
+    export class dxMenuBase extends HierarchicalCollectionWidget {
+        constructor(element: JQuery, options?: dxMenuBaseOptions);
+        constructor(element: Element, options?: dxMenuBaseOptions);
+        /** Selects the specified item. */
+        selectItem(itemElement: any): void;
+        /** Unselects the specified item. */
+        unselectItem(itemElement: any): void;
+    }
+    export interface dxMenuOptions extends dxMenuBaseOptions {
+        /** Specifies whether or not the submenu is hidden when the mouse pointer leaves it. */
+        hideSubmenuOnMouseLeave?: boolean;
+        /** Specifies whether the menu has horizontal or vertical orientation. */
+        orientation?: string;
+        /** Specifies options for showing and hiding the first level submenu. */
+        showFirstSubmenuMode?: {
+            /** Specifies the mode name. */
+            name?: string;
+            /** Specifies the delay in submenu showing and hiding. */
+            delay?: {
+                /** The time span after which the submenu is shown. */
+                show?: number;
+                /** The time span after which the submenu is hidden. */
+                hide?: number;
+            };
+        };
+        /** Specifies the direction at which the submenus are displayed. */
+        submenuDirection?: string;
+        /** A handler for the submenuHidden event. */
+        onSubmenuHidden?: Function;
+        /** A handler for the submenuHiding event. */
+        onSubmenuHiding?: Function;
+        /** A handler for the submenuShowing event. */
+        onSubmenuShowing?: Function;
+        /** A handler for the submenuShown event. */
+        onSubmenuShown?: Function;
+    }
+    /** A menu widget. */
+    export class dxMenu extends dxMenuBase {
+        constructor(element: JQuery, options?: dxMenuOptions);
+        constructor(element: Element, options?: dxMenuOptions);
+    }
+    export interface dxContextMenuOptions extends dxMenuBaseOptions {
+        /** Holds an object that specifies options of alternative menu invocation. */
+        alternativeInvocationMode?: {
+            /** Specifies whether or not the standard context menu invocation (on a right mouse click or on a long tap) is disabled. */
+            enabled?: Boolean;
+            /** Specifies the element used to invoke the context menu. */
+            invokingElement?: any;
+        };
+        /** A handler for the hidden event. */
+        onHidden?: Function;
+        /** A handler for the hiding event. */
+        onHiding?: Function;
+        /** A handler for the positioning event. */
+        onPositioning?: Function;
+        /** A handler for the showing event. */
+        onShowing?: Function;
+        /** A handler for the shown event. */
+        onShown?: Function;
+        /** An object defining widget positioning options. */
+        position?: PositionOptions;
+        /** Specifies the direction at which submenus are displayed. */
+        submenuDirection?: string;
+        /** The target element associated with a popover. */
+        target?: any;
+        /** A Boolean value specifying whether or not the widget is visible. */
+        visible?: boolean;
+    }
+    /** A context menu widget. */
+    export class dxContextMenu extends dxMenuBase {
+        constructor(element: JQuery, options?: dxContextMenuOptions);
+        constructor(element: Element, options?: dxContextMenuOptions);
+        /** Toggles the visibility of the widget. */
+        toggle(showing: boolean): JQueryPromise<void>;
+        /** Shows the widget. */
+        show(): JQueryPromise<void>;
+        /** Hides the widget. */
+        hide(): JQueryPromise<void>;
+    }
+    export interface dxRemoteOperations {
+        /** Specifies whether or not filtering must be performed on the server side. */
+        filtering?: boolean;
+        /** Specifies whether or not paging must be performed on the server side. */
+        paging?: boolean;
+        /** Specifies whether or not sorting must be performed on the server side. */
+        sorting?: boolean;
+        /** Specifies whether or not grouping must be performed on the server side. */
+        grouping?: boolean;
+        /** Specifies whether or not summaries calculation must be performed on the server side. */
+        summary?: boolean;
+    }
+    export interface dxDataGridRow {
+        /** The data object represented by the row. */
+        data: Object;
+        /** The key of the data object represented by the row. */
+        key: any;
+        /** The visible index of the row. */
+        rowIndex: number;
+        /** The type of the row. */
+        rowType: string;
+    }
+    export interface dxDataGridColumn {
+        /** Specifies the content alignment within column cells. */
+        alignment?: string;
+        /** Specifies whether the values in a column can be edited at runtime. Setting this option makes sense only when editing is enabled for a grid. */
+        allowEditing?: boolean;
+        /** Specifies whether or not a column can be used for filtering grid records. Setting this option makes sense only when the filter row and column header filtering are visible. */
+        allowFiltering?: boolean;
+        /** Specifies whether or not to allow filtering by this column using its header. */
+        allowHeaderFiltering?: boolean;
+        /** Specifies whether or not the column can be anchored to a grid edge by end users. Setting this option makes sense only when the columnFixing | enabled option is set to true. */
+        allowFixing?: boolean;
+        /** Specifies if a column can be used for searching grid records. Setting this option makes sense only when the search panel is visible. */
+        allowSearch?: boolean;
+        /** Specifies whether a column can be used for grouping grid records at runtime. Setting this option makes sense only when the group panel is visible. */
+        allowGrouping?: boolean;
+        /** Specifies whether or not a column can be hidden by a user. Setting this option makes sense only when the column chooser is visible. */
+        allowHiding?: boolean;
+        /** Specifies whether or not a particular column can be used in column reordering. Setting this option makes sense only when the allowColumnReordering option is set to true. */
+        allowReordering?: boolean;
+        /** Specifies whether or not a particular column can be resized by a user. Setting this option makes sense only when the allowColumnResizing option is true. */
+        allowResizing?: boolean;
+        /** Specifies whether grid records can be sorted by a specific column at runtime. Setting this option makes sense only when the sorting mode differs from none. */
+        allowSorting?: boolean;
+        /** Specifies whether groups appear expanded or not when records are grouped by a specific column. Setting this option makes sense only when grouping is allowed for this column. */
+        autoExpandGroup?: boolean;
+        /** Specifies a callback function that returns a value to be displayed in a column cell. */
+        calculateCellValue?: (rowData: Object) => string;
+        /** Specifies a callback function to be invoked after the cell value is edited by an end-user and before the new value is saved to the data source. */
+        setCellValue?: (rowData: Object, value: any) => void;
+        /** Specifies a callback function that defines filters for customary calculated grid cells. */
+        calculateFilterExpression?: (filterValue: any, selectedFilterOperation: string, target: string) => Array<any>;
+        /** Specifies a caption for a column. */
+        caption?: string;
+        /** Specifies a custom template for grid column cells. */
+        cellTemplate?: any;
+        /** Specifies a CSS class to be applied to a column. */
+        cssClass?: string;
+        /** Specifies how to get a value to be displayed in a cell when it is not in an editing state. */
+        calculateDisplayValue?: any;
+        /** Specifies a field name or a function that returns a field name or a value to be used for grouping column cells. */
+        calculateGroupValue?: any;
+        /** Specifies a field name or a function that returns a field name or a value to be used for sorting column cells. */
+        calculateSortValue?: any;
+        /** Specifies a callback function that returns the text to be displayed in the cells of a column. */
+        customizeText?: (cellInfo: { value: any; valueText: string }) => string;
+        /** Specifies the field of a data source that provides data for a column. */
+        dataField?: string;
+        /** Specifies the required type of column values. */
+        dataType?: string;
+        /** Specifies a custom template for the cell of a grid column when it is in an editing state. */
+        editCellTemplate?: any;
+        /** Specifies configuration options for the editor widget of the current column. */
+        editorOptions?: Object;
+        /** Specifies whether HTML tags are displayed as plain text or applied to the values of the column. */
+        encodeHtml?: boolean;
+        /** In a boolean column, replaces all false items with a specified text. */
+        falseText?: string;
+        /** Specifies the set of available filter operations. */
+        filterOperations?: Array<any>;
+        /** Specifies a filter value for a column. */
+        filterValue?: any;
+        /** Specifies initial filter values for the column's header filter. */
+        filterValues?: Array<any>;
+        /** Specifies whether to include or exclude the records with the values selected in the column's header filter. */
+        filterType?: string;
+        /** Indicates whether the column takes part in horizontal grid scrolling or is anchored to a grid edge. */
+        fixed?: boolean;
+        /** Specifies the grid edge to which the column is anchored. */
+        fixedPosition?: string;
+        /** Specifies a format for the values displayed in a column. */
+        format?: string;
+        /** Specifies a custom template for the group cell of a grid column. */
+        groupCellTemplate?: any;
+        /** Specifies the index of a column when grid records are grouped by the values of this column. */
+        groupIndex?: number;
+        /** Specifies a custom template for the header of a grid column. */
+        headerCellTemplate?: any;
+        /** Specifies options of a lookup column. */
+        lookup?: {
+            /** Specifies whether or not a user can nullify values of a lookup column. */
+            allowClearing?: boolean;
+            /** Specifies the data source providing data for a lookup column. */
+            dataSource?: any;
+            /** Specifies the expression defining the data source field whose values must be displayed. */
+            displayExpr?: any;
+            /** Specifies the expression defining the data source field whose values must be replaced. */
+            valueExpr?: string;
+        };
+        /** Specifies column-level options for filtering using a column header filter. */
+        headerFilter?: {
+            /** Specifies the data source to be used for the header filter. */
+            dataSource?: any;
+            /** Specifies how header filter values should be combined into groups. */
+            groupInterval?: any;
+        };
+        /** Specifies a precision for formatted values displayed in a column. */
+        precision?: number;
+        /** Specifies a filter operation applied to a column. */
+        selectedFilterOperation?: string;
+        /** Specifies whether or not the column displays its values by using editors. */
+        showEditorAlways?: boolean;
+        /** Specifies whether or not to display the column when grid records are grouped by it. */
+        showWhenGrouped?: boolean;
+        /** Specifies the index of a column when grid records are sorted by the values of this column. */
+        sortIndex?: number;
+        /** Specifies the initial sort order of column values. */
+        sortOrder?: string;
+        /** In a boolean column, replaces all true items with a specified text. */
+        trueText?: string;
+        /** Specifies whether a column is visible or not. */
+        visible?: boolean;
+        /** Specifies the sequence number of the column in the grid. */
+        visibleIndex?: number;
+        /** Specifies a column width in pixels or percentages. */
+        width?: any;
+        /** Specifies an array of validation rules to be checked when updating column cell values. */
+        validationRules?: Array<Object>;
+        /** Specifies whether or not to display the header of a hidden column in the column chooser. */
+        showInColumnChooser?: boolean;
+        /** Specifies the identifier of the column. */
+        name?: string;
+        /** The form item configuration object. Used only when the editing mode is "form". */
+        formItem?: DevExpress.ui.dxFormItem;
+    }
+    export interface dxDataGridOptions extends WidgetOptions {
+        /** Specifies whether the outer borders of the grid are visible or not. */
+        showBorders?: boolean;
+        /** Indicates whether to show the error row for the grid. */
+        errorRowEnabled?: boolean;
+        /** A handler for the rowValidating event. */
+        onRowValidating?: (e: Object) => void;
+        /** A handler for the contextMenuPreparing event. */
+        onContextMenuPreparing?: (e: Object) => void;
+        /** A handler for the initNewRow event. */
+        onInitNewRow?: (e: { data: Object }) => void;
+        /** A handler for the rowInserted event. */
+        onRowInserted?: (e: { data: Object; key: any }) => void;
+        /** A handler for the rowInserting event. */
+        onRowInserting?: (e: { data: Object; cancel: any }) => void;
+        /** A handler for the rowRemoved event. */
+        onRowRemoved?: (e: { data: Object; key: any }) => void;
+        /** A handler for the rowRemoving event. */
+        onRowRemoving?: (e: { data: Object; key: any; cancel: any }) => void;
+        /** A handler for the rowUpdated event. */
+        onRowUpdated?: (e: { data: Object; key: any }) => void;
+        /** A handler for the rowUpdating event. */
+        onRowUpdating?: (e: { oldData: Object; newData: Object; key: any; cancel: any }) => void;
+        /** Enables a hint that appears when a user hovers the mouse pointer over a cell with truncated content. */
+        cellHintEnabled?: boolean;
+        /** Specifies whether or not grid columns can be reordered by a user. */
+        allowColumnReordering?: boolean;
+        /** Specifies whether or not grid columns can be resized by a user. */
+        allowColumnResizing?: boolean;
+        /** A handler for the cellClick event. */
+        onCellClick?: any;
+        /** A handler for the cellHoverChanged event. */
+        onCellHoverChanged?: (e: Object) => void;
+        /** A handler for the cellPrepared event. */
+        onCellPrepared?: (e: Object) => void;
+        /** Specifies whether or not the width of grid columns depends on column content. */
+        columnAutoWidth?: boolean;
+        /** Specifies the options of a column chooser. */
+        columnChooser?: {
+            /** Specifies text displayed by the column chooser panel when it does not contain any columns. */
+            emptyPanelText?: string;
+            /** Specifies whether a user can invoke the column chooser or not. */
+            enabled?: boolean;
+            /** Specifies the height of the column chooser panel. */
+            height?: number;
+            /** Specifies text displayed in the title of the column chooser panel. */
+            title?: string;
+            /** Specifies the width of the column chooser panel. */
+            width?: number;
+        };
+        /** Specifies options for column fixing. */
+        columnFixing?: {
+            /** Indicates if column fixing is enabled. */
+            enabled?: boolean;
+            /** Contains options that specify texts for column-fixing related commands in the column header's context menu. */
+            texts?: {
+                /** Specifies text for a context menu item that fixes the column for which the context menu is invoked. */
+                fix?: string;
+                /** Specifies text for a context menu item that unfixes the column for which the context menu is invoked. */
+                unfix?: string;
+                /** Specifies text for a context menu subitem that fixes a column, for which the context menu is invoked, to the left grid edge. */
+                leftPosition?: string;
+                /** Specifies text for a context menu subitem that fixes a column, for which the context menu is invoked, to the right grid edge. */
+                rightPosition?: string;
+            };
+        };
+        /** Specifies options for filtering using a column header filter. */
+        headerFilter?: {
+            /** Indicates whether or not the column header filter button is visible. */
+            visible?: boolean;
+            /** Specifies the height of the dropdown menu invoked when using a column header filter. */
+            height?: number;
+            /** Specifies the width of the dropdown menu invoked when using a column header filter. */
+            width?: number;
+            /** Contains options that specify texts for the dropdown menu invoked when you use a column header filter. */
+            texts?: {
+                /** Specifies text for the item specifying an empty value in the column header filter's dropdown menu. */
+                emptyValue?: string;
+                /** Specifies text for a button that closes the column header filter's dropdown menu and applies specified filtering. */
+                ok?: string;
+                /** Specifies text for a button that closes the column header filter's dropdown menu without applying performed selection. */
+                cancel?: string;
+            }
+        };
+        /** An array of grid columns. */
+        columns?: Array<dxDataGridColumn>;
+        onContentReady?: Function;
+        /** Specifies a function that customizes grid columns after they are created. */
+        customizeColumns?: (columns: Array<dxDataGridColumn>) => void;
+        /** Specifies a data source for the grid. */
+        dataSource?: any;
+        /** Specifies whether or not to enable data caching. */
+        cacheEnabled?: boolean;
+        /** A handler for the editingStart event. */
+        onEditingStart?: (e: {
+            data: Object;
+            key: any;
+            cancel: boolean;
+            column: dxDataGridColumn
+        }) => void;
+        /** A handler for the editorPrepared event. */
+        onEditorPrepared?: (e: Object) => void;
+        /** A handler for the editorPreparing event. */
+        onEditorPreparing?: (e: Object) => void;
+        /** Contains options that specify how grid content can be changed. */
+        editing?: {
+            editMode?: string;
+            editEnabled?: boolean;
+            insertEnabled?: boolean;
+            removeEnabled?: boolean;
+            /** Specifies how grid values can be edited manually. */
+            mode?: string;
+            /** Specifies whether or not grid records can be edited at runtime. */
+            allowUpdating?: boolean;
+            /** Specifies whether or not new grid records can be added at runtime. */
+            allowAdding?: boolean;
+            /** Specifies whether or not grid records can be deleted at runtime. */
+            allowDeleting?: boolean;
+            /** The form configuration object. Used only when the editing mode is "form". */
+            form?: DevExpress.ui.dxFormOptions;
+            /** Contains options that specify texts for editing-related grid controls. */
+            texts?: {
+                /** Specifies text for a hint that appears when a user hovers the mouse pointer over the "Save" button. Setting this option makes sense only when the editMode option is set to batch. */
+                saveAllChanges?: string;
+                /** Specifies text for a cancel button displayed when a row is in the editing state. Setting this option makes sense only when the allowUpdating option is set to true. */
+                cancelRowChanges?: string;
+                /** Specifies text for a hint that appears when a user hovers the mouse pointer over the "Revert" button. Setting this option makes sense only when the editMode option is set to batch. */
+                cancelAllChanges?: string;
+                /** Specifies a message to be displayed by a confirmation window. Setting this option makes sense only when the edit mode is "row". */
+                confirmDeleteMessage?: string;
+                /** Specifies text to be displayed in the title of a confirmation window. Setting this option makes sense only when the edit mode is "row". */
+                confirmDeleteTitle?: string;
+                /** Specifies text for a hint that appears when a user hovers the mouse pointer over the "Cancel changes" button. Setting this option makes sense only when the editMode option is set to cell and the validation capabilities are enabled. */
+                validationCancelChanges?: string;
+                /** Specifies text for a button that deletes a row from a grid. Setting this option makes sense only when the allowDeleting option is set to true. */
+                deleteRow?: string;
+                /** Specifies text for a hint that appears when a user hovers the mouse pointer over the "Add" button. Setting this option makes sense only when the allowAdding option is true. */
+                addRow?: string;
+                /** Specifies text for a button that turns a row into the editing state. Setting this option makes sense only when the allowUpdating option is set to true. */
+                editRow?: string;
+                /** Specifies text for a save button displayed when a row is in the editing state. Setting this option makes sense only when the allowUpdating option is set to true. */
+                saveRowChanges?: string;
+                /** Specifies text for a button that recovers a deleted row. Setting this option makes sense only if the grid uses the batch edit mode and the allowDeleting option is set to true. */
+                undeleteRow?: string;
+            };
+        };
+        /** Specifies filter row options. */
+        filterRow?: {
+            /** Specifies when to apply a filter. */
+            applyFilter?: string;
+            /** Specifies text for the hint that pops up when a user hovers the mouse pointer over the "Apply Filter" button. */
+            applyFilterText?: string;
+            /** Specifies descriptions for filter operations. */
+            operationDescriptions?: {
+                "=": string;
+                "<>": string;
+                "<": string;
+                "<=": string;
+                ">": string;
+                ">=": string;
+                "startswith": string;
+                "contains": string;
+                "notcontains": string;
+                "endswith": string;
+            };
+            /** Specifies text for the reset operation in a filter list. */
+            resetOperationText?: string;
+            /** Specifies text for the operation of clearing the applied filter when a select box is used. */
+            showAllText?: string;
+            /** Specifies text for the range start in the 'between' filter type. */
+            betweenStartText?: string;
+            /** Specifies text for the range end in the 'between' filter type. */
+            betweenEndText?: string;
+            /** Specifies whether or not an icon that allows the user to choose a filter operation is visible. */
+            showOperationChooser?: boolean;
+            /** Specifies whether the filter row is visible or not. */
+            visible?: boolean;
+        };
+        /** Specifies the behavior of grouped grid records. */
+        grouping?: {
+            /** Specifies whether the user can collapse grouped records in a grid or not. */
+            allowCollapsing?: boolean;
+            /** Specifies whether groups appear expanded or not. */
+            autoExpandAll?: boolean;
+            /** Specifies the message displayed in a group row when the corresponding group is continued from the previous page. */
+            groupContinuedMessage?: string;
+            /** Specifies the message displayed in a group row when the corresponding group continues on the next page. */
+            groupContinuesMessage?: string;
+        };
+        /** Specifies options that configure the group panel. */
+        groupPanel?: {
+            /** Specifies whether columns can be dragged onto or from the group panel. */
+            allowColumnDragging?: boolean;
+            /** Specifies text displayed by the group panel when it does not contain any columns. */
+            emptyPanelText?: string;
+            /** Specifies whether the group panel is visible or not. */
+            visible?: boolean;
+        };
+        /** Specifies options configuring the load panel. */
+        loadPanel?: {
+            /** Specifies whether to show the load panel or not. */
+            enabled?: boolean;
+            /** Specifies the height of the load panel in pixels. */
+            height?: number;
+            /** Specifies a URL pointing to an image to be used as a loading indicator. */
+            indicatorSrc?: string;
+            /** Specifies whether or not a loading indicator must be displayed on the load panel. */
+            showIndicator?: boolean;
+            /** Specifies whether or not the pane of the load panel must be displayed. */
+            showPane?: boolean;
+            /** Specifies text displayed by the load panel. */
+            text?: string;
+            /** Specifies the width of the load panel in pixels. */
+            width?: number;
+        };
+        /** Specifies text displayed when a grid does not contain any records. */
+        noDataText?: string;
+        /** Specifies the options of a grid pager. */
+        pager?: {
+            /** Specifies the page sizes that can be selected at runtime. */
+            allowedPageSizes?: any;
+            /** Specifies whether to show the page size selector or not. */
+            showPageSizeSelector?: boolean;
+            /** Specifies whether to show the pager or not. */
+            visible?: any;
+            /** Specifies the text accompanying the page navigator. */
+            infoText?: string;
+            /** Specifies whether or not to display the text accompanying the page navigator. This text is specified by the infoText option. */
+            showInfo?: boolean;
+            /** Specifies whether or not to display buttons that switch the grid to the previous or next page. */
+            showNavigationButtons?: boolean;
+        };
+        /** Specifies paging options. */
+        paging?: {
+            /** Specifies whether dxDataGrid loads data page by page or all at once. */
+            enabled?: boolean;
+            /** Specifies the grid page that should be displayed by default. */
+            pageIndex?: number;
+            /** Specifies the size of grid pages. */
+            pageSize?: number;
+        };
+        /** Specifies whether or not grid rows must be shaded in a different way. */
+        rowAlternationEnabled?: boolean;
+        /** Specifies whether to enable two-way data binding. */
+        twoWayBindingEnabled?: boolean;
+        /** A handler for the rowClick event. */
+        onRowClick?: any;
+        /** A handler for the rowPrepared event. */
+        onRowPrepared?: (e: Object) => void;
+        /** Specifies a custom template for grid rows. */
+        rowTemplate?: any;
+        /** A configuration object specifying scrolling options. */
+        scrolling?: {
+            /** Specifies the scrolling mode. */
+            mode?: string;
+            /** Specifies whether or not a grid must preload pages adjacent to the current page when using virtual scrolling. */
+            preloadEnabled?: boolean;
+            /** Specifies whether or not the widget uses native scrolling. */
+            useNative?: any;
+            /** Specifies the scrollbar display policy. */
+            showScrollbar?: string;
+            /** Specifies whether or not the scrolling by content is enabled. */
+            scrollByContent?: boolean;
+            /** Specifies whether or not the scrollbar thumb scrolling enabled. */
+            scrollByThumb?: boolean;
+        };
+        /** Specifies options of the search panel. */
+        searchPanel?: {
+            /** Specifies whether or not search strings in the located grid records should be highlighted. */
+            highlightSearchText?: boolean;
+            /** Specifies text displayed by the search panel when no search string was typed. */
+            placeholder?: string;
+            /** Specifies whether the search panel is visible or not. */
+            visible?: boolean;
+            /** Specifies the width of the search panel in pixels. */
+            width?: number;
+            /** Sets a search string for the search panel. */
+            text?: string;
+        };
+        /** Specifies the operations that must be performed on the server side. */
+        remoteOperations?: any;
+        /** Allows you to sort groups according to the values of group summary items. */
+        sortByGroupSummaryInfo?: Array<{
+            /** Specifies the group summary item whose values must be used to sort groups. */
+            summaryItem?: string;
+            /** Specifies the identifier of the column that must be used in grouping so that sorting by group summary item values be applied. */
+            groupColumn?: string;
+            /** Specifies the sort order of group summary item values. */
+            sortOrder?: string;
+        }>;
+        /** Allows you to build a master-detail interface in the grid. */
+        masterDetail?: {
+            /** Enables an end-user to expand/collapse detail sections. */
+            enabled?: boolean;
+            /** Specifies whether detail sections appear expanded or collapsed. */
+            autoExpandAll?: boolean;
+            /** Specifies the template for detail sections. */
+            template?: any;
+        };
+        /** Specifies options for exporting grid data. */
+        export?: {
+            /** Indicates if the export feature is enabled in the grid. */
+            enabled?: boolean;
+            /** Specifies a default name for the file to which grid data is exported. */
+            fileName?: string;
+            /** Specifies whether to enable Excel filtering for the exported data in the resulting XLSX file. */
+            excelFilterEnabled?: boolean;
+            /** Specifies whether to enable word wrapping for the exported data in the resulting XLSX file. */
+            excelWrapTextEnabled?: boolean;
+            /** Specifies the URL of the server-side proxy that streams the resulting file to the end user to enable export in IE8, IE9 and Safari browsers. */
+            proxyUrl?: string;
+            /** Indicates whether to allow end users to export not only the data displayed in the grid, but the selected rows only. */
+            allowExportSelectedData?: boolean;
+            /** Contains options that specify texts for the export-related commands and hints. */
+            texts?: {
+                /** Specifies text for the Export button when this button invokes a dropdown menu so you can choose the required export format. */
+                exportTo?: string;
+                /** Specifies text for the Export button's hint when this button exports to the XSLX format without invoking the drop-down menu. */
+                exportToExcel?: string;
+                /** Specifies text for the item in the Export dropdown menu that exports grid data to Excel. */
+                excelFormat?: string;
+                /** Specifies text for the option in the Export dropdown menu that allows you to choose whether to export all the grid data or the selected rows only. */
+                selectedRows?: string;
+            }
+        };
+        /** Specifies the keys of the records that must appear selected initially. */
+        selectedRowKeys?: Array<any>;
+        /** Specifies options of runtime selection. */
+        selection?: {
+            /** Specifies the checkbox row display policy in the multiple mode. */
+            showCheckBoxesMode?: string;
+            /** Specifies whether the user can select all grid records at once. */
+            allowSelectAll?: boolean;
+            /** Specifies the selection mode. */
+            mode?: string;
+        };
+        /** A handler for the dataErrorOccured event. */
+        onDataErrorOccurred?: (e: { error: Error }) => void;
+        /** A handler for the selectionChanged event. */
+        onSelectionChanged?: (e: {
+            currentSelectedRowKeys: Array<any>;
+            currentDeselectedRowKeys: Array<any>;
+            selectedRowKeys: Array<any>;
+            selectedRowsData: Array<any>;
+        }) => void;
+        /** A handler for the exporting event. */
+        onExporting?: (e: {
+            fileName: string;
+            cancel: boolean;
+        }) => void;
+        /** A handler for the fileSaving event. */
+        onFileSaving?: (e: {
+            fileName: string;
+            format: string;
+            data: any;
+            cancel: boolean;
+        }) => void;
+        /** A handler for the exported event. */
+        onExported?: (e: Object) => void;
+        /** A handler for the keyDown event. */
+        onKeyDown?: (e: Object) => void;
+        /** A handler for the rowExpanding event. */
+        onRowExpanding?: (e: Object) => void;
+        /** A handler for the rowExpanded event. */
+        onRowExpanded?: (e: Object) => void;
+        /** A handler for the rowCollapsing event. */
+        onRowCollapsing?: (e: Object) => void;
+        /** A handler for the rowCollapsed event. */
+        onRowCollapsed?: (e: Object) => void;
+        /** Specifies whether column headers are visible or not. */
+        showColumnHeaders?: boolean;
+        /** Specifies whether or not vertical lines separating one grid column from another are visible. */
+        showColumnLines?: boolean;
+        /** Specifies whether or not horizontal lines separating one grid row from another are visible. */
+        showRowLines?: boolean;
+        /** Specifies options of runtime sorting. */
+        sorting?: {
+            /** Specifies text for the context menu item that sets an ascending sort order in a column. */
+            ascendingText?: string;
+            /** Specifies text for the context menu item that resets sorting settings for a column. */
+            clearText?: string;
+            /** Specifies text for the context menu item that sets a descending sort order in a column. */
+            descendingText?: string;
+            /** Specifies the runtime sorting mode. */
+            mode?: string;
+        };
+        /** Specifies options of state storing. */
+        stateStoring?: {
+            /** Specifies a callback function that performs specific actions on state loading. */
+            customLoad?: () => JQueryPromise<Object>;
+            /** Specifies a callback function that performs specific actions on state saving. */
+            customSave?: (state: Object) => void;
+            /** Specifies whether or not a grid saves its state. */
+            enabled?: boolean;
+            /** Specifies the delay between the last change of a grid state and the operation of saving this state in milliseconds. */
+            savingTimeout?: number;
+            /** Specifies a unique key to be used for storing the grid state. */
+            storageKey?: string;
+            /** Specifies the type of storage to be used for state storing. */
+            type?: string;
+        };
+        /** Specifies the options of the grid summary. */
+        summary?: {
+            /** Contains options that specify text patterns for summary items. */
+            texts?: {
+                /** Specifies a pattern for the 'sum' summary items when they are displayed in the parent column. */
+                sum?: string;
+                /** Specifies a pattern for the 'sum' summary items displayed in a group row or in any other column rather than the parent one. */
+                sumOtherColumn?: string;
+                /** Specifies a pattern for the 'min' summary items when they are displayed in the parent column. */
+                min?: string;
+                /** Specifies a pattern for the 'min' summary items displayed in a group row or in any other column rather than the parent one. */
+                minOtherColumn?: string;
+                /** Specifies a pattern for the 'max' summary items when they are displayed in the parent column. */
+                max?: string;
+                /** Specifies a pattern for the 'max' summary items displayed in a group row or in any other column rather than the parent one. */
+                maxOtherColumn?: string;
+                /** Specifies a pattern for the 'avg' summary items when they are displayed in the parent column. */
+                avg?: string;
+                /** Specifies a pattern for the 'avg' summary items displayed in a group row or in any other column rather than the parent one. */
+                avgOtherColumn?: string;
+                /** Specifies a pattern for the 'count' summary items. */
+                count?: string;
+            };
+            /** Specifies items of the group summary. */
+            groupItems?: Array<{
+                /** Specifies the identifier of a summary item. */
+                name?: string;
+                /** Specifies the column that provides data for a group summary item. */
+                column?: string;
+                /** Customizes the text to be displayed in the summary item. */
+                customizeText?: (itemInfo: {
+                    value: any;
+                    valueText: string;
+                }) => string;
+                /** Specifies a pattern for the summary item text. */
+                displayFormat?: string;
+                /** Specifies a precision for the summary item value of a numeric format. */
+                precision?: number;
+                /** Specifies whether or not a summary item must be displayed in the group footer. */
+                showInGroupFooter?: boolean;
+                /** Indicates whether to display group summary items in parentheses after the group row header or to align them by the corresponding columns within the group row. */
+                alignByColumn?: boolean;
+                /** Specifies the column that must hold the summary item when this item is displayed in the group footer or aligned by a column in the group row. */
+                showInColumn?: string;
+                /** Specifies how to aggregate data for a summary item. */
+                summaryType?: string;
+                /** Specifies a format for the summary item value. */
+                valueFormat?: string;
+            }>;
+            /** Specifies items of the total summary. */
+            totalItems?: Array<{
+                /** Specifies the identifier of a summary item. */
+                name?: string;
+                /** Specifies the alignment of a summary item. */
+                alignment?: string;
+                /** Specifies the column that provides data for a summary item. */
+                column?: string;
+                /** Specifies a CSS class to be applied to a summary item. */
+                cssClass?: string;
+                /** Customizes the text to be displayed in the summary item. */
+                customizeText?: (itemInfo: {
+                    value: any;
+                    valueText: string;
+                }) => string;
+                /** Specifies a pattern for the summary item text. */
+                displayFormat?: string;
+                /** Specifies a precision for the summary item value of a numeric format. */
+                precision?: number;
+                /** Specifies the column that must hold the summary item. */
+                showInColumn?: string;
+                /** Specifies how to aggregate data for a summary item. */
+                summaryType?: string;
+                /** Specifies a format for the summary item value. */
+                valueFormat?: string;
+            }>;
+            /** Allows you to use a custom aggregate function to calculate the value of a summary item. */
+            calculateCustomSummary?: (options: {
+                component: dxDataGrid;
+                name?: string;
+                value: any;
+                totalValue: any;
+                summaryProcess: string
+            }) => void;
+        };
+        /** Specifies whether text that does not fit into a column should be wrapped. */
+        wordWrapEnabled?: boolean;
+    }
+    /** A data grid widget. */
+    export class dxDataGrid extends Widget {
+        constructor(element: JQuery, options?: dxDataGridOptions);
+        constructor(element: Element, options?: dxDataGridOptions);
+        /** Ungroups grid records. */
+        clearGrouping(): void;
+        /** Clears sorting settings of all grid columns at once. */
+        clearSorting(): void;
+        /** Allows you to obtain a cell by its row index and the data field of its column. */
+        getCellElement(rowIndex: number, dataField: string): any;
+        /** Allows you to obtain a cell by its row index and the visible index of its column. */
+        getCellElement(rowIndex: number, visibleColumnIndex: number): any;
+        /** Returns the current state of the grid. */
+        state(): Object;
+        /** Sets the grid state. */
+        state(state: Object): void;
+        /** Allows you to obtain the row index by a data key. */
+        getRowIndexByKey(key: any): number;
+        /** Allows you to obtain the data key by a row index. */
+        getKeyByRowIndex(rowIndex: number): any;
+        /** Adds a new column to a grid. */
+        addColumn(columnOptions: dxDataGridColumn): void;
+        /** Removes the column from the grid. */
+        deleteColumn(id: any): void;
+        /** Displays the load panel. */
+        beginCustomLoading(messageText: string): void;
+        /** Discards changes made in a grid. */
+        cancelEditData(): void;
+        /** Checks whether or not the grid contains unsaved changes. */
+        hasEditData(): boolean;
+        /** Clears all the filters of a specific type applied to grid records. */
+        clearFilter(): void;
+        /** Deselects all grid records. */
+        clearSelection(): void;
+        /** Draws the cell being edited from the editing state. Use this method when the edit mode is batch. */
+        closeEditCell(): void;
+        /** Collapses groups or master rows in a grid. */
+        collapseAll(groupIndex?: number): void;
+        /** Returns the number of data columns in a grid. */
+        columnCount(): number;
+        /** Returns the value of a specific column option. */
+        columnOption(id: any, optionName: string): any;
+        /** Sets an option of a specific column. */
+        columnOption(id: any, optionName: string, optionValue: any): void;
+        /** Returns the options of a column by an identifier. */
+        columnOption(id: any): Object;
+        /** Sets several options of a column at once. */
+        columnOption(id: any, options: Object): void;
+        /** Sets a specific cell into the editing state. */
+        editCell(rowIndex: number, visibleColumnIndex: number): void;
+        /** Sets a specific cell into the editing state. */
+        editCell(rowIndex: number, dataField: string): void;
+        /** Sets a specific row into the editing state. */
+        editRow(rowIndex: number): void;
+        /** Gets the cell value. */
+        cellValue(rowIndex: number, dataField: string): any;
+        /** Gets the cell value. */
+        cellValue(rowIndex: number, visibleColumnIndex: number): any;
+        /** Sets the cell value. */
+        cellValue(rowIndex: number, dataField: string, value: any): void;
+        /** Sets the cell value. */
+        cellValue(rowIndex: number, visibleColumnIndex: number, value: any): void;
+        /** Hides the load panel. */
+        endCustomLoading(): void;
+        /** Expands groups or master rows in a grid. */
+        expandAll(groupIndex: number): void;
+        /** Allows you to find out whether a specific group or master row is expanded or collapsed. */
+        isRowExpanded(key: any): boolean;
+        /** Allows you to expand a specific group or master row by its key. */
+        expandRow(key: any): void;
+        /** Allows you to collapse a specific group or master row by its key. */
+        collapseRow(key: any): void;
+        /** Applies a filter to the grid's data source. */
+        filter(filterExpr?: any): void;
+        /** Returns a filter expression applied to the grid's data source using the filter(filterExpr) method. */
+        filter(): any;
+        /** Returns a filter expression applied to the grid using all possible scenarious. */
+        getCombinedFilter(): any;
+        /** Gets the keys of currently selected grid records. */
+        getSelectedRowKeys(): Array<Object>;
+        /** Gets the data objects of currently selected grid records. */
+        getSelectedRowsData(): Array<Object>;
+        /** Hides the column chooser panel. */
+        hideColumnChooser(): void;
+        /** Adds a new data row to a grid. */
+        addRow(): void;
+        /**
+         * Adds a new data row to a grid.
+         * @deprecated Use the addRow() method instead.
+         */
+        insertRow(): void;
+        /** Returns the key corresponding to the passed data object. */
+        keyOf(obj: Object): any;
+        /** Switches a grid to a specified page. */
+        pageIndex(newIndex: number): void;
+        /** Gets the index of the current page. */
+        pageIndex(): number;
+        /** Sets the page size. */
+        pageSize(value: number): void;
+        /** Gets the current page size. */
+        pageSize(): number;
+        /** Refreshes grid data. */
+        refresh(): void;
+        /** Removes a specific row from a grid. */
+        deleteRow(rowIndex: number): void;
+        /**
+         * Removes a specific row from a grid.
+         * @deprecated Use the deleteRow() method instead.
+         */
+        removeRow(rowIndex: number): void;
+        /** Saves changes made in a grid. */
+        saveEditData(): void;
+        /** Searches grid records by a search string. */
+        searchByText(text: string): void;
+        /** Selects all grid records. */
+        selectAll(): void;
+        /** Deselects the rows that are currently selected within the applied filter. */
+        deselectAll(): void;
+        /** Selects specific grid records. */
+        selectRows(keys: Array<any>, preserve: boolean): void;
+        /** Deselects specific grid records. */
+        deselectRows(keys: Array<any>): void;
+        /** Selects grid rows by indexes. */
+        selectRowsByIndexes(indexes: Array<any>): void;
+        /** Allows you to find out whether a row is selected or not. */
+        isRowSelected(key: any): boolean;
+        /** Invokes the column chooser panel. */
+        showColumnChooser(): void;
+        startSelectionWithCheckboxes(): boolean;
+        /** Returns the number of records currently held by a grid. */
+        totalCount(): number;
+        /** Recovers a row deleted in the batch edit mode. */
+        undeleteRow(rowIndex: number): void;
+        /** Allows you to obtain a data object by its key. */
+        byKey(key: any): JQueryPromise<any>;
+        /** Gets the value of a total summary item. */
+        getTotalSummaryValue(summaryItemName: string): any;
+        /** Exports grid data to Excel. */
+        exportToExcel(selectionOnly: boolean): void;
+        /** Updates the grid to the size of its content. */
+        updateDimensions(): void;
+        /** Focuses the specified cell element in the grid. */
+        focus(element?: JQuery): void;
+    }
+    export interface dxPivotGridOptions extends WidgetOptions {
+        onContentReady?: Function;
+        /** Specifies a data source for the pivot grid. */
+        dataSource?: any;
+        useNativeScrolling?: any;
+        /** A configuration object specifying scrolling options. */
+        scrolling?: {
+            /** Specifies the scrolling mode. */
+            mode?: string;
+            /** Specifies whether or not the widget uses native scrolling. */
+            useNative?: any;
+        };
+        /** Allows an end-user to change sorting options. */
+        allowSorting?: boolean;
+        /** Allows an end-user to sort columns by summary values. */
+        allowSortingBySummary?: boolean;
+        /** Allows an end-user to change filtering options. */
+        allowFiltering?: boolean;
+        /** Allows an end-user to expand/collapse all header items within a header level. */
+        allowExpandAll?: boolean;
+        /** Specifies whether to display the Total rows. */
+        showRowTotals?: boolean;
+        /** Specifies whether to display the Grand Total row. */
+        showRowGrandTotals?: boolean;
+        /** Specifies whether to display the Total columns. */
+        showColumnTotals?: boolean;
+        /** Specifies whether to display the Grand Total column. */
+        showColumnGrandTotals?: boolean;
+        /** Specifies whether or not to hide rows and columns with no data. */
+        hideEmptySummaryCells?: boolean;
+        /** Specifies where to show the total rows or columns. */
+        showTotalsPrior?: string;
+        /** Specifies whether the outer borders of the grid are visible or not. */
+        showBorders?: boolean;
+        /** The Field Chooser configuration options. */
+        fieldChooser?: {
+            /** Enables or disables the field chooser. */
+            enabled?: boolean;
+            /** Specifies the field chooser layout. */
+            layout?: number;
+            /** Specifies the text to display as a title of the field chooser popup window. */
+            title?: string;
+            /** Specifies the field chooser width. */
+            width?: number;
+            /** Specifies the field chooser height. */
+            height?: number;
+            /** Strings that can be changed or localized in the pivot grid's integrated Field Chooser. */
+            texts?: {
+                /** The string to display instead of Row Fields. */
+                rowFields?: string;
+                /** The string to display instead of Column Fields. */
+                columnFields?: string;
+                /** The string to display instead of Data Fields. */
+                dataFields?: string;
+                /** The string to display instead of Filter Fields. */
+                filterFields?: string;
+                /** The string to display instead of All Fields. */
+                allFields?: string;
+            };
+        }
+        /** Strings that can be changed or localized in the dxPivotGrid widget. */
+        texts?: {
+            /** The string to display as a header of the Grand Total row and column. */
+            grandTotal?: string;
+            /** The string to display as a header of the Total row and column. */
+            total?: string;
+            /** Specifies the text displayed when a pivot grid does not contain any fields. */
+            noData?: string;
+            /** The string to display as a Show Field Chooser context menu item. */
+            showFieldChooser?: string;
+            /** The string to display as an Expand All context menu item. */
+            expandAll?: string;
+            /** The string to display as a Collapse All context menu item. */
+            collapseAll?: string;
+            /** The string to display as a Sort Column by Summary Value context menu item. */
+            sortColumnBySummary?: string;
+            /** The string to display as a Sort Row by Summary Value context menu item. */
+            sortRowBySummary?: string;
+            /** The string to display as a Remove All Sorting context menu item. */
+            removeAllSorting?: string;
+            /** The string to display as an Export to Excel file context menu item. */
+            exportToExcel?: string;
+        };
+        /** The Load panel configuration options. */
+        loadPanel?: {
+            /** Enables or disables the load panel. */
+            enabled?: boolean;
+            /** Specifies the height of the load panel. */
+            height?: number;
+            /** Specifies the URL pointing to an image that will be used as a load indicator. */
+            indicatorSrc?: string;
+            /** Specifies whether or not to show a load indicator. */
+            showIndicator?: boolean;
+            /** Specifies whether or not to show load panel background. */
+            showPane?: boolean;
+            /** Specifies the text to display inside a load panel. */
+            text?: string;
+            /** Specifies the width of the load panel. */
+            width?: number;
+        };
+        /** A handler for the cellClick event. */
+        onCellClick?: (e: any) => void;
+        /** A handler for the cellPrepared event. */
+        onCellPrepared?: (e: any) => void;
+        /** A handler for the contextMenuPreparing event. */
+        onContextMenuPreparing?: (e: Object) => void;
+        /** Specifies options for exporting pivot grid data. */
+        export?: {
+            /** Indicates whether the export feature is enabled for the pivot grid. */
+            enabled?: boolean;
+            /** Specifies a default name for the file to which grid data is exported. */
+            fileName?: string;
+            /** Specifies the URL of the server-side proxy that streams the resulting file to the end user to enable export in IE8, IE9 and Safari browsers. */
+            proxyUrl?: string;
+        };
+        /** A handler for the exporting event. */
+        onExporting?: (e: {
+            fileName: string;
+            cancel: boolean;
+        }) => void;
+        /** A handler for the fileSaving event. */
+        onFileSaving?: (e: {
+            fileName: string;
+            format: string;
+            data: any;
+            cancel: boolean;
+        }) => void;
+        /** A handler for the exported event. */
+        onExported?: (e: Object) => void;
+        /** A configuration object specifying options related to state storing. */
+        stateStoring?: {
+            /** Specifies a callback function that performs specific actions on state loading. */
+            customLoad?: () => JQueryPromise<Object>;
+            /** Specifies a callback function that performs specific actions on state saving. */
+            customSave?: (gridState: Object) => void;
+            /** Specifies whether or not a grid saves its state. */
+            enabled?: boolean;
+            /** Specifies the delay between the last change of a grid state and the operation of saving this state in milliseconds. */
+            savingTimeout?: number;
+            /** Specifies a unique key to be used for storing the grid state. */
+            storageKey?: string;
+            /** Specifies the type of storage to be used for state storing. */
+            type?: string;
+        };
+    }
+    /** A data summarization widget for multi-dimensional data analysis and data mining. */
+    export class dxPivotGrid extends Widget {
+        constructor(element: JQuery, options?: dxPivotGridOptions);
+        constructor(element: Element, options?: dxPivotGridOptions);
+        /** Gets the PivotGridDataSource instance. */
+        getDataSource(): DevExpress.data.PivotGridDataSource;
+        /** Gets the dxPopup instance of the field chooser window. */
+        getFieldChooserPopup(): DevExpress.ui.dxPopup;
+        /** Updates the widget to the size of its content. */
+        updateDimensions(): void;
+        /** Exports pivot grid data to the Excel file. */
+        exportToExcel(): void;
+    }
+    export interface dxPivotGridFieldChooserOptions extends WidgetOptions {
+        /** Specifies the height of the widget. */
+        height?: any;
+        /** Specifies the field chooser layout. */
+        layout?: number;
+        /** The data source of a dxPivotGrid widget. */
+        dataSource?: DevExpress.data.PivotGridDataSource;
+        onContentReady?: Function;
+        /** Strings that can be changed or localized in the dxPivotGridFieldChooser widget. */
+        texts?: {
+            /** The string to display instead of Row Fields. */
+            rowFields?: string;
+            /** The string to display instead of Column Fields. */
+            columnFields?: string;
+            /** The string to display instead of Data Fields. */
+            dataFields?: string;
+            /** The string to display instead of Filter Fields. */
+            filterFields?: string;
+            /** The string to display instead of All Fields. */
+            allFields?: string;
+        };
+    }
+    /** A complementary widget for dxPivotGrid that allows you to manage data displayed in the dxPivotGrid. */
+    export class dxPivotGridFieldChooser extends Widget {
+        constructor(element: JQuery, options?: dxPivotGridFieldChooserOptions);
+        constructor(element: Element, options?: dxPivotGridFieldChooserOptions);
+        /** Updates the widget to the size of its content. */
+        updateDimensions(): void;
+    }
+}
+interface JQuery {
+    dxTreeView(): JQuery;
+    dxTreeView(options: "instance"): DevExpress.ui.dxTreeView;
+    dxTreeView(options: string): any;
+    dxTreeView(options: string, ...params: any[]): any;
+    dxTreeView(options: DevExpress.ui.dxTreeViewOptions): JQuery;
+    dxMenuBase(): JQuery;
+    dxMenuBase(options: "instance"): DevExpress.ui.dxMenuBase;
+    dxMenuBase(options: string): any;
+    dxMenuBase(options: string, ...params: any[]): any;
+    dxMenuBase(options: DevExpress.ui.dxMenuBaseOptions): JQuery;
+    dxMenu(): JQuery;
+    dxMenu(options: "instance"): DevExpress.ui.dxMenu;
+    dxMenu(options: string): any;
+    dxMenu(options: string, ...params: any[]): any;
+    dxMenu(options: DevExpress.ui.dxMenuOptions): JQuery;
+    dxContextMenu(): JQuery;
+    dxContextMenu(options: "instance"): DevExpress.ui.dxContextMenu;
+    dxContextMenu(options: string): any;
+    dxContextMenu(options: string, ...params: any[]): any;
+    dxContextMenu(options: DevExpress.ui.dxContextMenuOptions): JQuery;
+    dxColorBox(): JQuery;
+    dxColorBox(options: "instance"): DevExpress.ui.dxColorBox;
+    dxColorBox(options: string): any;
+    dxColorBox(options: string, ...params: any[]): any;
+    dxColorBox(options: DevExpress.ui.dxColorBoxOptions): JQuery;
+    dxDataGrid(): JQuery;
+    dxDataGrid(options: "instance"): DevExpress.ui.dxDataGrid;
+    dxDataGrid(options: string): any;
+    dxDataGrid(options: string, ...params: any[]): any;
+    dxDataGrid(options: DevExpress.ui.dxDataGridOptions): JQuery;
+    dxPivotGrid(): JQuery;
+    dxPivotGrid(options: "instance"): DevExpress.ui.dxPivotGrid;
+    dxPivotGrid(options: string): any;
+    dxPivotGrid(options: string, ...params: any[]): any;
+    dxPivotGrid(options: DevExpress.ui.dxPivotGridOptions): JQuery;
+    dxPivotGridFieldChooser(): JQuery;
+    dxPivotGridFieldChooser(options: "instance"): DevExpress.ui.dxPivotGridFieldChooser;
+    dxPivotGridFieldChooser(options: string): any;
+    dxPivotGridFieldChooser(options: string, ...params: any[]): any;
+    dxPivotGridFieldChooser(options: DevExpress.ui.dxPivotGridFieldChooserOptions): JQuery;
+    dxScheduler(): JQuery;
+    dxScheduler(options: "instance"): DevExpress.ui.dxScheduler;
+    dxScheduler(options: string): any;
+    dxScheduler(options: string, ...params: any[]): any;
+    dxScheduler(options: DevExpress.ui.dxSchedulerOptions): JQuery;
+}
+declare namespace DevExpress.framework {
+    /** An object used to store information on the views displayed in an application. */
+    export class ViewCache {
+        viewRemoved: JQueryCallback;
+        /** Removes all the viewInfo objects from the cache. */
+        clear(): void;
+        /** Obtains a viewInfo object from the cache by the specified key. */
+        getView(key: string): Object;
+        /** Checks whether or not a viewInfo object is contained in the view cache under the specified key. */
+        hasView(key: string): boolean;
+        /** Removes a viewInfo object from the cache by the specified key. */
+        removeView(key: string): Object;
+        /** Adds the specified viewInfo object to the cache under the specified key. */
+        setView(key: string, viewInfo: Object): void;
+    }
+    export interface dxCommandOptions extends DOMComponentOptions {
+        /** Specifies an action performed when the execute() method of the command is called. */
+        onExecute?: any;
+        /** Indicates whether or not the widget that displays this command is disabled. */
+        disabled?: boolean;
+        /** Specifies whether the current command is rendered when a view is being rendered or after a view is shown. */
+        renderStage?: string;
+        /** Specifies the name of the icon shown inside the widget associated with this command. */
+        icon?: string;
+        iconSrc?: string;
+        /** The identifier of the command. */
+        id?: string;
+        /** Specifies the title of the widget associated with this command. */
+        title?: string;
+        /** Specifies the type of the button, if the command is rendered as a dxButton widget. */
+        type?: string;
+        /** A Boolean value specifying whether or not the widget associated with this command is visible. */
+        visible?: boolean;
+    }
+    /** A markup component used to define markup options for a command. */
+    export class dxCommand extends DOMComponent {
+        constructor(element: JQuery, options: dxCommandOptions);
+        constructor(options: dxCommandOptions);
+        /** Executes the action associated with this command. */
+        execute(): void;
+    }
+    /** An object responsible for routing. */
+    export class Router {
+        /** Adds a routing rule to the list of registered rules. */
+        register(pattern: string, defaults?: Object, constraints?: Object): void;
+        /** Decodes the specified URI to an object using the registered routing rules. */
+        parse(uri: string): Object;
+        /** Formats an object to a URI. */
+        format(obj: Object): string;
+    }
+    export interface StateManagerOptions {
+        /** A storage to which the state manager saves the application state. */
+        storage?: Object;
+    }
+    /** An object used to store the current application state. */
+    export class StateManager {
+        constructor(options?: StateManagerOptions);
+        /** Adds an object that implements an interface of a state source to the state manager's collection of state sources. */
+        addStateSource(stateSource: Object): void;
+        /** Removes a specified state source from the state manager's collection of state sources. */
+        removeStateSource(stateSource: Object): void;
+        /** Saves the current application state. */
+        saveState(): void;
+        /** Restores the application state that has been saved by the saveState() method to the state storage. */
+        restoreState(): void;
+        /** Removes the application state that has been saved by the saveState() method to the state storage. */
+        clearState(): void;
+    }
+    export module html {
+        export var layoutSets: Array<string>;
+        export var animationSets: { [animationSetName: string]: AnimationSet };
+        export interface AnimationSet {
+            [animationName: string]: any
+        }
+        export interface HtmlApplicationOptions {
+            /** Specifies where the commands that are defined in the application's views must be displayed. */
+            commandMapping?: Object;
+            /** Specifies whether or not view caching is disabled. */
+            disableViewCache?: boolean;
+            /** An array of layout controllers that should be used to show application views in the current navigation context. */
+            layoutSet?: any;
+            /** Specifies the animation presets that are used to animate different UI elements in the current application. */
+            animationSet?: AnimationSet;
+            /** Specifies whether the current application must behave as a mobile or web application. */
+            mode?: string;
+            /** Specifies the object that represents a root namespace of the application. */
+            namespace?: Object;
+            /** Specifies application behavior when the user navigates to a root view. */
+            navigateToRootViewMode?: string;
+            /** An array of dxCommand configuration objects used to define commands available from the application's global navigation. */
+            navigation?: Array<any>;
+            /** A state manager to be used in the application. */
+            stateManager?: StateManager;
+            /** Specifies the storage to be used by the application's state manager to store the application state. */
+            stateStorage?: Object;
+            /** Indicates whether on not to use the title of the previously displayed view as text on the Back button. */
+            useViewTitleAsBackText?: boolean;
+            /** A custom view cache to be used in the application. */
+            viewCache?: Object;
+            /** Specifies a limit for the views that can be cached. */
+            viewCacheSize?: number;
+            /** Specifies the current version of application templates. */
+            templatesVersion?: string;
+            /** Specifies options for the viewport meta tag of a mobile browser. */
+            viewPort?: JQuery;
+            /** A custom router to be used in the application. */
+            router?: Router;
+        }
+        /** An object used to manage views, as well as control the application life cycle. */
+        export class HtmlApplication implements EventsMixin<HtmlApplication> {
+            constructor(options: HtmlApplicationOptions);
+            afterViewSetup: JQueryCallback;
+            beforeViewSetup: JQueryCallback;
+            initialized: JQueryCallback;
+            navigating: JQueryCallback;
+            navigatingBack: JQueryCallback;
+            resolveLayoutController: JQueryCallback;
+            resolveViewCacheKey: JQueryCallback;
+            viewDisposed: JQueryCallback;
+            viewDisposing: JQueryCallback;
+            viewHidden: JQueryCallback;
+            viewRendered: JQueryCallback;
+            viewShowing: JQueryCallback;
+            viewShown: JQueryCallback;
+            /** Provides access to the ViewCache object. */
+            viewCache: ViewCache;
+            /** An array of dxCommand components that are created based on the application's navigation option value. */
+            navigation: Array<any>;
+            /** Provides access to the StateManager object. */
+            stateManager: StateManager;
+            /** Provides access to the Router object. */
+            router: Router;
+            /** Navigates to the URI preceding the current one in the navigation history. */
+            back(): void;
+            /** Returns a Boolean value indicating whether or not backwards navigation is currently possible. */
+            canBack(): boolean;
+            /** Calls the clearState() method of the application's StateManager object. */
+            clearState(): void;
+            /** Creates global navigation commands. */
+            createNavigation(navigationConfig: Array<any>): void;
+            /** Returns an HTML template of the specified view. */
+            getViewTemplate(viewName: string): JQuery;
+            /** Returns a configuration object used to create a dxView component for a specified view. */
+            getViewTemplateInfo(viewName: string): Object;
+            /** Adds a specified HTML template to a collection of view or layout templates. */
+            loadTemplates(source: any): JQueryPromise<any>;
+            /** Navigates to the specified URI. */
+            navigate(uri?: any, options?: Object): void;
+            /** Renders navigation commands to the navigation command containers that are located in the layouts used in the application. */
+            renderNavigation(): void;
+            /** Calls the restoreState() method of the application's StateManager object. */
+            restoreState(): void;
+            /** Calls the saveState method of the application's StateManager object. */
+            saveState(): void;
+            /** Provides access to the object that defines the current context to be considered when choosing an appropriate template for a view. */
+            templateContext(): Object;
+            on(eventName: "initialized", eventHandler: () => void): HtmlApplication;
+            on(eventName: "afterViewSetup", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            on(eventName: "beforeViewSetup", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            on(eventName: "navigating", eventHandler: (e: {
+                currentUri: string;
+                uri: string;
+                cancel: boolean;
+                options: {
+                    root: boolean;
+                    target: string;
+                    direction: string;
+                    rootInDetailPane: boolean;
+                    modal: boolean;
+                };
+            }) => void): HtmlApplication;
+            on(eventName: "navigatingBack", eventHandler: (e: {
+                cancel: boolean;
+                isHardwareButton: boolean;
+            }) => void): HtmlApplication;
+            on(eventName: "resolveLayoutController", eventHandler: (e: {
+                viewInfo: Object;
+                layoutController: Object;
+                availableLayoutControllers: Array<Object>;
+            }) => void): HtmlApplication;
+            on(eventName: "resolveViewCacheKey", eventHandler: (e: {
+                key: string;
+                navigationItem: Object;
+                routeData: Object;
+            }) => void): HtmlApplication;
+            on(eventName: "viewDisposed", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            on(eventName: "viewDisposing", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            on(eventName: "viewHidden", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            on(eventName: "viewRendered", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            on(eventName: "viewShowing", eventHandler: (e: {
+                viewInfo: Object;
+                direction: string;
+            }) => void): HtmlApplication;
+            on(eventName: "viewShown", eventHandler: (e: {
+                viewInfo: Object;
+                direction: string;
+            }) => void): HtmlApplication;
+            on(eventName: string, eventHandler: Function): HtmlApplication;
+            on(events: { [eventName: string]: Function; }): HtmlApplication;
+            off(eventName: "initialized"): HtmlApplication;
+            off(eventName: "afterViewSetup"): HtmlApplication;
+            off(eventName: "beforeViewSetup"): HtmlApplication;
+            off(eventName: "navigating"): HtmlApplication;
+            off(eventName: "navigatingBack"): HtmlApplication;
+            off(eventName: "resolveLayoutController"): HtmlApplication;
+            off(eventName: "resolveViewCacheKey"): HtmlApplication;
+            off(eventName: "viewDisposed"): HtmlApplication;
+            off(eventName: "viewDisposing"): HtmlApplication;
+            off(eventName: "viewHidden"): HtmlApplication;
+            off(eventName: "viewRendered"): HtmlApplication;
+            off(eventName: "viewShowing"): HtmlApplication;
+            off(eventName: "viewShown"): HtmlApplication;
+            off(eventName: string): HtmlApplication;
+            off(eventName: "initialized", eventHandler: () => void): HtmlApplication;
+            off(eventName: "afterViewSetup", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            off(eventName: "beforeViewSetup", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            off(eventName: "navigating", eventHandler: (e: {
+                currentUri: string;
+                uri: string;
+                cancel: boolean;
+                options: {
+                    root: boolean;
+                    target: string;
+                    direction: string;
+                    rootInDetailPane: boolean;
+                    modal: boolean;
+                };
+            }) => void): HtmlApplication;
+            off(eventName: "navigatingBack", eventHandler: (e: {
+                cancel: boolean;
+                isHardwareButton: boolean;
+            }) => void): HtmlApplication;
+            off(eventName: "resolveLayoutController", eventHandler: (e: {
+                viewInfo: Object;
+                layoutController: Object;
+                availableLayoutControllers: Array<Object>;
+            }) => void): HtmlApplication;
+            off(eventName: "resolveViewCacheKey", eventHandler: (e: {
+                key: string;
+                navigationItem: Object;
+                routeData: Object;
+            }) => void): HtmlApplication;
+            off(eventName: "viewDisposed", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            off(eventName: "viewDisposing", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            off(eventName: "viewHidden", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            off(eventName: "viewRendered", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            off(eventName: "viewShowing", eventHandler: (e: {
+                viewInfo: Object;
+                direction: string;
+            }) => void): HtmlApplication;
+            off(eventName: "viewShown", eventHandler: (e: {
+                viewInfo: Object;
+                direction: string;
+            }) => void): HtmlApplication;
+            off(eventName: string, eventHandler: Function): HtmlApplication;
+        }
+    }
+}
+declare namespace DevExpress.viz.core {
+    /**
+     * Applies a theme for the entire page with several DevExtreme visualization widgets.
+     * @deprecated Use the DevExpress.viz.currentTheme(theme) method instead.
+     */
+    export function currentTheme(theme: string): void;
+    /**
+     * Applies a new theme (with the color scheme defined separately) for the entire page with several DevExtreme visualization widgets.
+     * @deprecated Use the DevExpress.viz.currentTheme(platform, colorScheme) method instead.
+     */
+    export function currentTheme(platform: string, colorScheme: string): void;
+    /**
+     * Registers a new theme based on the existing one.
+     * @deprecated Use the DevExpress.viz.registerTheme(customTheme, baseTheme) method instead.
+     */
+    export function registerTheme(customTheme: Object, baseTheme: string): void;
+    /**
+     * Applies a predefined or registered custom palette to all visualization widgets at once.
+     * @deprecated Use the DevExpress.viz.currentPalette(paletteName) method instead.
+     */
+    export function currentPalette(paletteName: string): void;
+    /**
+     * Obtains the color sets of a predefined or registered palette.
+     * @deprecated Use the DevExpress.viz.getPalette(paletteName) method instead.
+     */
+    export function getPalette(paletteName: string): Object;
+    /**
+     * Registers a new palette.
+     * @deprecated Use the DevExpress.viz.registerPalette(paletteName, palette) method instead.
+     */
+    export function registerPalette(paletteName: string, palette: Object): void;
+    export interface Border {
+        /** Sets a border color for a selected series. */
+        color?: string;
+        /** Sets border visibility for a selected series. */
+        visible?: boolean;
+        /** Sets a border width for a selected series. */
+        width?: number;
+    }
+    export interface DashedBorder extends Border {
+        /** Specifies a dash style for the border of a selected series point. */
+        dashStyle?: string;
+    }
+    export interface DashedBorderWithOpacity extends DashedBorder {
+        /** Specifies the opacity of the tooltip's border. */
+        opacity?: number;
+    }
+    export interface Font {
+        /** Specifies the font color for a strip label. */
+        color?: string;
+        /** Specifies the font family for a strip label. */
+        family?: string;
+        /** Specifies the font opacity for a strip label. */
+        opacity?: number;
+        /** Specifies the font size for a strip label. */
+        size?: any;
+        /** Specifies the font weight for the text displayed in strips. */
+        weight?: number;
+    }
+    export interface Hatching {
+        direction?: string;
+        /** Specifies the opacity of hatching lines. */
+        opacity?: number;
+        /** Specifies the distance between hatching lines in pixels. */
+        step?: number;
+        /** Specifies the width of hatching lines in pixels. */
+        width?: number;
+    }
+    export interface Margins {
+        /** Specifies the distance in pixels between the bottom side of the title and the surrounding widget elements. */
+        bottom?: number;
+        /** Specifies the distance in pixels between the left side of the title and the surrounding widget elements. */
+        left?: number;
+        /** Specifies the distance between the right side of the title and surrounding widget elements in pixels. */
+        right?: number;
+        /** Specifies the distance between the top side of the title and surrounding widget elements in pixels. */
+        top?: number;
+    }
+    export interface Size {
+        /** Specifies the width of the widget. */
+        width?: number;
+        /** Specifies the height of the widget. */
+        height?: number;
+    }
+    export interface Title {
+        /** Specifies font options for the title. */
+        font?: viz.core.Font;
+        /** Specifies the widget title's horizontal position. */
+        horizontalAlignment?: string;
+       /** Specifies the widget title's position in the vertical direction. */
+        verticalAlignment?: string;
+        /** Specifies the distance between the title and surrounding widget elements in pixels. */
+        margin?: viz.core.Margins;
+         /** Specifies the height of the space reserved for the title. */
+        placeholderSize?: number;
+        /** Specifies text for the title. */
+        text?: string;
+        /** Specifies a subtitle for the widget. */
+        subtitle?: {
+            /** Specifies font options for the subtitle. */
+            font?: viz.core.Font;
+           /** Specifies text for the subtitle. */
+            text?: string;
+        }
+    }
+    export interface Tooltip {
+        /** Specifies the length of the tooltip's arrow in pixels. */
+        arrowLength?: number;
+        /** Specifies the appearance of the tooltip's border. */
+        border?: viz.core.DashedBorderWithOpacity;
+        /** Specifies a color for the tooltip. */
+        color?: string;
+        /** Specifies the z-index for tooltips. */
+        zIndex?: number;
+        /** Specifies the container to draw tooltips inside of it. */
+        container?: any;
+        /** Specifies text and appearance of a set of tooltips. */
+        customizeTooltip?: (arg: Object) => { color?: string; text?: string };
+        /** Specifies whether or not the tooltip is enabled. */
+        enabled?: boolean;
+        /** Specifies font options for the text displayed by the tooltip. */
+        font?: Font;
+        /** Specifies a format for the text displayed by the tooltip. */
+        format?: string;
+        /** Specifies the opacity of a tooltip. */
+        opacity?: number;
+        /** Specifies a distance from the tooltip's left/right boundaries to the inner text in pixels. */
+        paddingLeftRight?: number;
+        /** Specifies a distance from the tooltip's top/bottom boundaries to the inner text in pixels. */
+        paddingTopBottom?: number;
+        /** Specifies a precision for formatted values displayed by the tooltip. */
+        precision?: number;
+        /** Specifies options of the tooltip's shadow. */
+        shadow?: {
+            /** Specifies the blur distance of the tooltip's shadow. */
+            blur?: number;
+            /** Specifies the color of the tooltip's shadow. */
+            color?: string;
+            /** Specifies the horizontal offset of the tooltip's shadow relative to the tooltip in pixels. */
+            offsetX?: number;
+            /** Specifies the vertical offset of the tooltip's shadow relative to the tooltip in pixels. */
+            offsetY?: number;
+            /** Specifies the opacity of the tooltip's shadow. */
+            opacity?: number;
+        };
+    }
+    export interface Animation {
+        /** Determines how long animation runs. */
+        duration?: number;
+        /** Specifies the animation easing mode. */
+        easing?: string;
+        /** Indicates whether or not animation is enabled. */
+        enabled?: boolean;
+    }
+    export interface LoadingIndicator {
+        /** Specifies a color for the loading indicator background. */
+        backgroundColor?: string;
+        /** Specifies font options for the loading indicator text. */
+        font?: viz.core.Font;
+        /** Specifies whether to show the loading indicator or not. */
+        show?: boolean;
+        /** Specifies a text to be displayed by the loading indicator. */
+        text?: string;
+    }
+    export interface LegendBorder extends viz.core.DashedBorderWithOpacity {
+        /** Specifies a radius for the corners of the legend border. */
+        cornerRadius?: number;
+    }
+    export interface BaseLegend {
+        /** Specifies the color of the legend's background. */
+        backgroundColor?: string;
+        /** Specifies legend border settings. */
+        border?: viz.core.LegendBorder;
+        /** Specifies how many columns must be taken to arrange legend items. */
+        columnCount?: number;
+        /** Specifies the spacing between a pair of neighboring legend columns in pixels. */
+        columnItemSpacing?: number;
+        /** Specifies font options for legend items. */
+        font?: viz.core.Font;
+        /** Specifies the legend's position on the map. */
+        horizontalAlignment?: string;
+        /** Specifies the alignment of legend items. */
+        itemsAlignment?: string;
+        /** Specifies the position of text relative to the item marker. */
+        itemTextPosition?: string;
+        /** Specifies the distance between the legend and the container borders in pixels. */
+        margin?: viz.core.Margins;
+        /** Specifies the size of item markers in the legend in pixels. */
+        markerSize?: number;
+        /** Specifies whether to arrange legend items horizontally or vertically. */
+        orientation?: string;
+        /** Specifies the spacing between the legend left/right border and legend items in pixels. */
+        paddingLeftRight?: number;
+        /** Specifies the spacing between the legend top/bottom border and legend items in pixels. */
+        paddingTopBottom?: number;
+        /** Specifies how many rows must be taken to arrange legend items. */
+        rowCount?: number;
+        /** Specifies the spacing between a pair of neighboring legend rows in pixels. */
+        rowItemSpacing?: number;
+        /** Specifies the legend's position on the map. */
+        verticalAlignment?: string;
+        /** Specifies whether or not the legend is visible on the map. */
+        visible?: boolean;
+    }
+    export interface BaseWidgetOptions extends DOMComponentOptions {
+        /** A handler for the drawn event. */
+        onDrawn?: (e: {
+            component: BaseWidget;
+            element: Element;
+        }) => void;
+        /** A handler for the incidentOccurred event. */
+        onIncidentOccurred?: (
+        component: BaseWidget,
+        element: Element,
+        target: {
+            id: string;
+            type: string;
+            args: any;
+            text: string;
+            widget: string;
+            version: string;
+        }
+        ) => void;
+        /** Notifies a widget that it is embedded into an HTML page that uses a path modifier. */
+        pathModified?: boolean;
+        /** Specifies whether or not the widget supports right-to-left representation. */
+        rtlEnabled?: boolean;
+        /** Sets the name of the theme to be used in the widget. */
+        theme?: string;
+    }
+    /** This section describes options and methods that are common to all widgets. */
+    export class BaseWidget extends DOMComponent {
+        /** Returns the widget's SVG markup. */
+        svg(): string;
+    }
+}
+declare namespace DevExpress.viz.charts {
+    /** This section describes the fields and methods that can be used in code to manipulate the Series object. */
+    export interface BaseSeries {
+        /** Provides information about the state of the series object. */
+        fullState: number;
+        /** Returns the type of the series. */
+        type: string;
+        /** Unselects all the selected points of the series. The points are displayed in an initial style. */
+        clearSelection(): void;
+        /** Gets the color of a particular series. */
+        getColor(): string;
+        /** Gets points from the series point collection based on the specified argument. */
+        getPointsByArg(pointArg: any): Array<BasePoint>;
+        /** Gets a point from the series point collection based on the specified point position. */
+        getPointByPos(positionIndex: number): Object;
+        /** Selects the series. The series is displayed in a 'selected' style until another series is selected or the current series is deselected programmatically. */
+        select(): void;
+        /** Selects the specified point. The point is displayed in a 'selected' style. */
+        selectPoint(point: BasePoint): void;
+        /** Deselects the specified point. The point is displayed in an initial style. */
+        deselectPoint(point: BasePoint): void;
+        /** Returns an array of all points in the series. */
+        getAllPoints(): Array<BasePoint>;
+        /** Returns visible series points. */
+        getVisiblePoints(): Array<BasePoint>;
+        /** Returns the name of the series. */
+        name: string;
+        /** Returns the tag of the series. */
+        tag: string;
+        /** Hides a series. */
+        hide(): void;
+        /** Provides information about the hover state of a series. */
+        isHovered(): boolean;
+        /** Provides information about the selection state of a series. */
+        isSelected(): boolean;
+        /** Provides information about the visibility state of a series. */
+        isVisible(): boolean;
+        /** Makes a particular series visible. */
+        show(): void;
+    }
+    /** This section describes the methods that can be used in code to manipulate the Point object. */
+    export interface BasePoint {
+        /** Provides information about the state of the point object. */
+        fullState: number;
+        /** Returns the point's argument value that was set in the data source. */
+        originalArgument: any;
+        /** Returns the point's value that was set in the data source. */
+        originalValue: any;
+        /** Returns the tag of the point. */
+        tag: string;
+        /** Deselects the point. */
+        clearSelection(): void;
+        /** Gets the color of a particular point. */
+        getColor(): string;
+        /** Hides the tooltip of the point. */
+        hideTooltip(): void;
+        /** Provides information about the hover state of a point. */
+        isHovered(): boolean;
+        /** Provides information about the selection state of a point. */
+        isSelected(): boolean;
+        /** Selects the point. The point is displayed in a 'selected' style until another point is selected or the current point is deselected programmatically. */
+        select(): void;
+        /** Shows the tooltip of the point. */
+        showTooltip(): void;
+        /** Allows you to obtain the label of a series point. */
+        getLabel(): any;
+        /** Returns the series object to which the point belongs. */
+        series: BaseSeries;
+    }
+    /** This section describes the fields and methods that can be used in code to manipulate the Series object. */
+    export interface ChartSeries extends BaseSeries {
+        /** Returns the name of the series pane. */
+        pane: string;
+        /** Returns the name of the value axis of the series. */
+        axis: string;
+        selectPoint(point: ChartPoint): void;
+        deselectPoint(point: ChartPoint): void;
+        getAllPoints(): Array<ChartPoint>;
+        getVisiblePoints(): Array<ChartPoint>;
+    }
+    /** This section describes the methods that can be used in code to manipulate the Point object. */
+    export interface ChartPoint extends BasePoint {
+        /** Contains the close value of the point. This field is useful for points belonging to a series of the candle stick or stock type only. */
+        originalCloseValue: any;
+        /** Contains the high value of the point. This field is useful for points belonging to a series of the candle stick or stock type only. */
+        originalHighValue: any;
+        /** Contains the low value of the point. This field is useful for points belonging to a series of the candle stick or stock type only. */
+        originalLowValue: any;
+        /** Contains the first value of the point. This field is useful for points belonging to a series of the range area or range bar type only. */
+        originalMinValue: any;
+        /** Contains the open value of the point. This field is useful for points belonging to a series of the candle stick or stock type only. */
+        originalOpenValue: any;
+        /** Contains the size of the bubble as it was set in the data source. This field is useful for points belonging to a series of the bubble type only. */
+        size: any;
+        /** Gets the parameters of the point's minimum bounding rectangle (MBR). */
+        getBoundingRect(): { x: number; y: number; width: number; height: number; };
+        series: ChartSeries;
+    }
+    /** This section describes the methods that can be used in code to manipulate the Label object. */
+    export interface Label {
+        /** Gets the parameters of the label's minimum bounding rectangle (MBR). */
+        getBoundingRect(): { x: number; y: number; width: number; height: number; };
+        /** Hides the point label. */
+        hide(): void;
+        /** Shows the point label. */
+        show(): void;
+    }
+    export interface PieSeries extends BaseSeries {
+        selectPoint(point: PiePoint): void;
+        deselectPoint(point: PiePoint): void;
+        getAllPoints(): Array<PiePoint>;
+        getVisiblePoints(): Array<PiePoint>;
+    }
+    /** This section describes the methods that can be used in code to manipulate the Point object. */
+    export interface PiePoint extends BasePoint {
+        /** Gets the percentage value of the specific point. */
+        percent: any;
+        /** Provides information about the visibility state of a point. */
+        isVisible(): boolean;
+        /** Makes a specific point visible. */
+        show(): void;
+        /** Hides a specific point. */
+        hide(): void;
+        series: PieSeries;
+    }
+    /** This section describes the fields and methods that can be used in code to manipulate the Series object. */
+    export interface PolarSeries extends BaseSeries {
+        /** Returns the name of the value axis of the series. */
+        axis: string;
+        selectPoint(point: PolarPoint): void;
+        deselectPoint(point: PolarPoint): void;
+        getAllPoints(): Array<PolarPoint>;
+        getVisiblePoints(): Array<PolarPoint>;
+    }
+    /** This section describes the methods that can be used in code to manipulate the Point object. */
+    export interface PolarPoint extends BasePoint {
+        series: PolarSeries;
+    }
+    export interface Strip {
+        /** Specifies a color for a strip. */
+        color?: string;
+        /** An object that defines the label configuration options of a strip. */
+        label?: {
+            /** Specifies the text displayed in a strip. */
+            text?: string;
+        };
+        /** Specifies a start value for a strip. */
+        startValue?: any;
+        /** Specifies an end value for a strip. */
+        endValue?: any;
+    }
+    export interface BaseSeriesConfigLabel {
+        /** Specifies a format for arguments displayed by point labels. */
+        argumentFormat?: string;
+        /** Specifies a precision for formatted point arguments displayed in point labels. */
+        argumentPrecision?: number;
+        /** Specifies a background color for point labels. */
+        backgroundColor?: string;
+        /** Specifies border options for point labels. */
+        border?: viz.core.DashedBorder;
+        /** Specifies connector options for series point labels. */
+        connector?: {
+            /** Specifies the color of label connectors. */
+            color?: string;
+            /** Indicates whether or not label connectors are visible. */
+            visible?: boolean;
+            /** Specifies the width of label connectors. */
+            width?: number;
+        };
+        /** Specifies a callback function that returns the text to be displayed by point labels. */
+        customizeText?: (pointInfo: Object) => string;
+        /** Specifies font options for the text displayed in point labels. */
+        font?: viz.core.Font;
+        /** Specifies a format for the text displayed by point labels. */
+        format?: string;
+        position?: string;
+        /** Specifies a precision for formatted point values displayed in point labels. */
+        precision?: number;
+        /** Specifies the angle used to rotate point labels from their initial position. */
+        rotationAngle?: number;
+        /** Specifies the visibility of point labels. */
+        visible?: boolean;
+    }
+    export interface SeriesConfigLabel extends BaseSeriesConfigLabel {
+        /** Specifies whether or not to show a label when the point has a zero value. */
+        showForZeroValues?: boolean;
+    }
+    export interface ChartSeriesConfigLabel extends SeriesConfigLabel {
+        /** Specifies how to align point labels relative to the corresponding data points that they represent. */
+        alignment?: string;
+        /** Specifies how to shift point labels horizontally from their initial positions. */
+        horizontalOffset?: number;
+        /** Specifies how to shift point labels vertically from their initial positions. */
+        verticalOffset?: number;
+        /** Specifies a precision for the percentage values displayed in the labels of a full-stacked-like series. */
+        percentPrecision?: number;
+    }
+    export interface BaseCommonSeriesConfig {
+        /** Specifies the data source field that provides arguments for series points. */
+        argumentField?: string;
+        axis?: string;
+        /** An object defining the label configuration options for a series in the dxChart widget. */
+        label?: ChartSeriesConfigLabel;
+        /** Specifies border options for point labels. */
+        border?: viz.core.DashedBorder;
+        /** Specifies a series color. */
+        color?: string;
+        /** Specifies the dash style of the series' line. */
+        dashStyle?: string;
+        hoverMode?: string;
+        hoverStyle?: {
+            /** An object defining the border options for a hovered series. */
+            border?: viz.core.DashedBorder;
+            /** <p>Sets a color for a series when it is hovered over.</p> */
+            color?: string;
+            /** Specifies the dash style for the line in a hovered series. */
+            dashStyle?: string;
+            hatching?: viz.core.Hatching;
+            /** Specifies the width of a line in a hovered series. */
+            width?: number;
+        };
+        /** Specifies whether a chart ignores null data points or not. */
+        ignoreEmptyPoints?: boolean;
+        /** Specifies how many points are acceptable to be in a series to display all labels for these points. Otherwise, the labels will not be displayed. */
+        maxLabelCount?: number;
+        /** Specifies the minimal length of a displayed bar in pixels. */
+        minBarSize?: number;
+        /** Specifies opacity for a series. */
+        opacity?: number;
+        /** Specifies the series elements to highlight when the series is selected. */
+        selectionMode?: string;
+        selectionStyle?: {
+            /** An object defining the border options for a selected series. */
+            border?: viz.core.DashedBorder;
+            /** Sets a color for a series when it is selected. */
+            color?: string;
+            /** Specifies the dash style for the line in a selected series. */
+            dashStyle?: string;
+            hatching?: viz.core.Hatching;
+            /** Specifies the width of a line in a selected series. */
+            width?: number;
+        };
+        /** Specifies whether or not to show the series in the chart's legend. */
+        showInLegend?: boolean;
+        /** Specifies the name of the stack where the values of the _stackedBar_ series must be located. */
+        stack?: string;
+        /** Specifies the name of the data source field that provides data about a point. */
+        tagField?: string;
+        /** Specifies the data source field that provides values for series points. */
+        valueField?: string;
+        /** Specifies the visibility of a series. */
+        visible?: boolean;
+        /** Specifies a line width. */
+        width?: number;
+        /** Configures error bars. */
+        valueErrorBar?: {
+            /** Specifies whether error bars must be displayed in full or partially. */
+            displayMode?: string;
+            /** Specifies the data field that provides data for low error values. */
+            lowValueField?: string;
+            /** Specifies the data field that provides data for high error values. */
+            highValueField?: string;
+            /** Specifies how error bar values must be calculated. */
+            type?: string;
+            /** Specifies the value to be used for generating error bars. */
+            value?: number;
+            /** Specifies the color of error bars. */
+            color?: string;
+            /** Specifies the opacity of error bars. */
+            opacity?: number;
+            /** Specifies the length of the lines that indicate the error bar edges. */
+            edgeLength?: number;
+            /** Specifies the width of the error bar line. */
+            lineWidth?: number;
+        };
+    }
+    export interface CommonPointOptions {
+        /** Specifies border options for points in the line and area series. */
+        border?: viz.core.Border;
+        /** Specifies the points color. */
+        color?: string;
+        /** Specifies what series points to highlight when a point is hovered over. */
+        hoverMode?: string;
+        /** An object defining configuration options for a hovered point. */
+        hoverStyle?: {
+            /** An object defining the border options for a hovered point. */
+            border?: viz.core.Border;
+            /** Sets a color for a point when it is hovered over. */
+            color?: string;
+            /** Specifies the diameter of a hovered point in the series that represents data points as symbols (not as bars for instance). */
+            size?: number;
+        };
+        /** Specifies what series points to highlight when a point is selected. */
+        selectionMode?: string;
+        /** An object defining configuration options for a selected point. */
+        selectionStyle?: {
+            /** An object defining the border options for a selected point. */
+            border?: viz.core.Border;
+            /** <p>Sets a color for a point when it is selected.</p> */
+            color?: string;
+            /** Specifies the diameter of a selected point in the series that represents data points as symbols (not as bars for instance). */
+            size?: number;
+        };
+        /** Specifies the point diameter in pixels for those series that represent data points as symbols (not as bars for instance). */
+        size?: number;
+        /** Specifies a symbol for presenting points of the line and area series. */
+        symbol?: string;
+        visible?: boolean;
+    }
+    export interface ChartCommonPointOptions extends CommonPointOptions {
+        /** An object specifying the parameters of an image that is used as a point marker. */
+        image?: {
+            /** Specifies the height of an image that is used as a point marker. */
+            height?: any;
+            /** Specifies a URL leading to the image to be used as a point marker. */
+            url?: any;
+            /** Specifies the width of an image that is used as a point marker. */
+            width?: any;
+        };
+    }
+    export interface PolarCommonPointOptions extends CommonPointOptions {
+        /** An object specifying the parameters of an image that is used as a point marker. */
+        image?: {
+            /** Specifies the height of an image that is used as a point marker. */
+            height?: number;
+            /** Specifies a URL leading to the image to be used as a point marker. */
+            url?: string;
+            /** Specifies the width of an image that is used as a point marker. */
+            width?: number;
+        };
+    }
+    /** An object that defines configuration options for chart series. */
+    export interface CommonSeriesConfig extends BaseCommonSeriesConfig {
+        /** Specifies the data source field that provides a 'close' value for a _candleStick_ or _stock_ series. */
+        closeValueField?: string;
+        /** Specifies a radius for bar corners. */
+        cornerRadius?: number;
+        /** Specifies the data source field that provides a 'high' value for a _candleStick_ or _stock_ series. */
+        highValueField?: string;
+        /** Specifies the color for the body (rectangle) of a _candleStick_ series. */
+        innerColor?: string;
+        /** Specifies the data source field that provides a 'low' value for a _candleStick_ or _stock_ series. */
+        lowValueField?: string;
+        /** Specifies the data source field that provides an 'open' value for a _candleStick_ or _stock_ series. */
+        openValueField?: string;
+        /** Specifies the pane that will be used to display a series. */
+        pane?: string;
+        /** An object defining configuration options for points in line-, scatter- and area-like series. */
+        point?: ChartCommonPointOptions;
+        /** Specifies the data source field that provides values for one end of a range series. To set the data source field for the other end of the range series, use the rangeValue2Field property. */
+        rangeValue1Field?: string;
+        /** Specifies the data source field that provides values for the second end of a range series. To set the data source field for the other end of the range series, use the rangeValue1Field property. */
+        rangeValue2Field?: string;
+        /** Specifies reduction options for the stock or candleStick series. */
+        reduction?: {
+            /** Specifies a color for the points whose reduction level price is lower in comparison to the value in the previous point. */
+            color?: string;
+            /** Specifies for which price level (open, high, low or close) to enable reduction options in the series. */
+            level?: string;
+        };
+        /** Specifies the data source field that defines the size of bubbles. */
+        sizeField?: string;
+    }
+    export interface CommonSeriesSettings extends CommonSeriesConfig {
+        /** <p>An object that specifies configuration options for all series of the <i>area</i> type in the chart.</p> */
+        area?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _bar_ type in the chart. */
+        bar?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the bubble type in the chart. */
+        bubble?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _candleStick_ type in the chart. */
+        candlestick?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _fullStackedArea_ type in the chart. */
+        fullstackedarea?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the Full-Stacked Spline Area type in the chart. */
+        fullstackedsplinearea?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _fullStackedBar_ type in the chart. */
+        fullstackedbar?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _fullStackedLine_ type in the chart. */
+        fullstackedline?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the Full-Stacked Spline type in the chart. */
+        fullstackedspline?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _line_ type in the chart. */
+        line?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _rangeArea_ type in the chart. */
+        rangearea?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _rangeBar_ type in the chart. */
+        rangebar?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _scatter_ type in the chart. */
+        scatter?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _spline_ type in the chart. */
+        spline?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _splineArea_ type in the chart. */
+        splinearea?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _stackedArea_ type in the chart. */
+        stackedarea?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the Stacked Spline Area type in the chart. */
+        stackedsplinearea?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _stackedBar_ type in the chart. */
+        stackedbar?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _stackedLine_ type in the chart. */
+        stackedline?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the Stacked Spline type in the chart. */
+        stackedspline?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _stepArea_ type in the chart. */
+        steparea?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _stepLine_ type in the chart. */
+        stepline?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _stock_ type in the chart. */
+        stock?: CommonSeriesConfig;
+        /** Sets a series type. */
+        type?: string;
+    }
+    export interface SeriesConfig extends CommonSeriesConfig {
+        /** Specifies the name that identifies the series. */
+        name?: string;
+        /** Specifies data about a series. */
+        tag?: any;
+        /** Sets the series type. */
+        type?: string;
+    }
+    /** An object that defines configuration options for polar chart series. */
+    export interface CommonPolarSeriesConfig extends BaseCommonSeriesConfig {
+        /** Specifies whether or not to close the chart by joining the end point with the first point. */
+        closed?: boolean;
+        label?: SeriesConfigLabel;
+        point?: PolarCommonPointOptions;
+    }
+    export interface CommonPolarSeriesSettings extends CommonPolarSeriesConfig {
+        /** An object that specifies configuration options for all series of the <i>area</i> type in the chart. */
+        area?: CommonPolarSeriesConfig;
+        /** An object that specifies configuration options for all series of the _bar_ type in the chart. */
+        bar?: CommonPolarSeriesConfig;
+        /** An object that specifies configuration options for all series of the _line_ type in the chart. */
+        line?: CommonPolarSeriesConfig;
+        /** An object that specifies configuration options for all series of the _scatter_ type in the chart. */
+        scatter?: CommonPolarSeriesConfig;
+        /** An object that specifies configuration options for all series of the _stackedBar_ type in the chart. */
+        stackedbar?: CommonPolarSeriesConfig;
+        /** Sets a series type. */
+        type?: string;
+    }
+    export interface PolarSeriesConfig extends CommonPolarSeriesConfig {
+        /** Specifies the name that identifies the series. */
+        name?: string;
+        /** Specifies data about a series. */
+        tag?: any;
+        /** Sets the series type. */
+        type?: string;
+    }
+    export interface PieSeriesConfigLabel extends BaseSeriesConfigLabel {
+        /** Specifies how to shift labels from their initial position in a radial direction in pixels. */
+        radialOffset?: number;
+        /** Specifies a precision for the percentage values displayed in labels. */
+        percentPrecision?: number;
+    }
+    /** An object that defines configuration options for chart series. */
+    export interface CommonPieSeriesConfig {
+        /** Specifies the data source field that provides arguments for series points. */
+        argumentField?: string;
+        /** Specifies the required type for series arguments. */
+        argumentType?: string;
+        /** An object defining the series border configuration options. */
+        border?: viz.core.DashedBorder;
+        /** Specifies a series color. */
+        color?: string;
+        /** Specifies the chart elements to highlight when a series is hovered over. */
+        hoverMode?: string;
+        /** An object defining configuration options for a hovered series. */
+        hoverStyle?: {
+            /** An object defining the border options for a hovered series. */
+            border?: viz.core.DashedBorder;
+            /** Sets a color for the series when it is hovered over. */
+            color?: string;
+            /** Specifies the hatching options to be applied when a point is hovered over. */
+            hatching?: viz.core.Hatching;
+        };
+        /**
+         * Specifies the fraction of the inner radius relative to the total radius in the series of the 'doughnut' type.
+         * @deprecated use the 'innerRadius' option instead
+         */
+        innerRadius?: number;
+        /** An object defining the label configuration options. */
+        label?: PieSeriesConfigLabel;
+        /** Specifies how many points are acceptable to be in a series to display all labels for these points. Otherwise, the labels will not be displayed. */
+        maxLabelCount?: number;
+        /** Specifies a minimal size of a displayed pie segment. */
+        minSegmentSize?: number;
+        /**
+         * Specifies the direction in which the dxPieChart series points are located.
+         * @deprecated use the 'segmentsDirection' option instead
+         */
+        segmentsDirection?: string;
+        /** <p>Specifies the chart elements to highlight when the series is selected.</p> */
+        selectionMode?: string;
+        /** An object defining configuration options for the series when it is selected. */
+        selectionStyle?: {
+            /** An object defining the border options for a selected series. */
+            border?: viz.core.DashedBorder;
+            /** Sets a color for a series when it is selected. */
+            color?: string;
+            /** Specifies the hatching options to be applied when a point is selected. */
+            hatching?: viz.core.Hatching;
+        };
+        /** Specifies chart segment grouping options. */
+        smallValuesGrouping?: {
+            /** Specifies the name of the grouped chart segment. This name represents the segment in the chart legend. */
+            groupName?: string;
+            /** Specifies the segment grouping mode. */
+            mode?: string;
+            /** Specifies a threshold for segment values. */
+            threshold?: number;
+            /** Specifies how many segments must not be grouped. */
+            topCount?: number;
+        };
+        /**
+         * Specifies a start angle for a pie chart in arc degrees.
+         * @deprecated use the 'startAngle' option instead
+         */
+        startAngle?: number;
+        /** <p>Specifies the name of the data source field that provides data about a point.</p> */
+        tagField?: string;
+        /** Specifies the data source field that provides values for series points. */
+        valueField?: string;
+    }
+    export interface CommonPieSeriesSettings extends CommonPieSeriesConfig {
+        /**
+         * Specifies the type of the pie chart series.
+         * @deprecated use the 'type' option instead
+         */
+        type?: string;
+    }
+    export interface PieSeriesConfig extends CommonPieSeriesConfig {
+        /**
+         * Sets the series type.
+         * @deprecated use the 'type' option instead
+         */
+        type?: string;
+        /** Specifies the name that identifies the series. */
+        name?: string;
+        /** Specifies data about a series. */
+        tag?: any;
+    }
+    export interface SeriesTemplate {
+        /** Specifies a callback function that returns a series object with individual series settings. */
+        customizeSeries?: (seriesName: string) => SeriesConfig;
+        /** Specifies a data source field that represents the series name. */
+        nameField?: string;
+    }
+    export interface PolarSeriesTemplate {
+        /** Specifies a callback function that returns a series object with individual series settings. */
+        customizeSeries?: (seriesName: string) => PolarSeriesConfig;
+        /** Specifies a data source field that represents the series name. */
+        nameField?: string;
+    }
+    export interface ChartCommonConstantLineLabel {
+        /** Specifies font options for a constant line label. */
+        font?: viz.core.Font;
+        /** Specifies the position of the constant line label relative to the chart plot. */
+        position?: string;
+        /** Indicates whether or not to display labels for the axis constant lines. */
+        visible?: boolean;
+    }
+    export interface PolarCommonConstantLineLabel {
+        /** Indicates whether or not to display labels for the axis constant lines. */
+        visible?: boolean;
+        /** Specifies font options for a constant line label. */
+        font?: viz.core.Font;
+    }
+    export interface ConstantLineStyle {
+        /** Specifies a color for a constant line. */
+        color?: string;
+        /** Specifies a dash style for a constant line. */
+        dashStyle?: string;
+        /** Specifies a constant line width in pixels. */
+        width?: number;
+    }
+    export interface ChartCommonConstantLineStyle extends ConstantLineStyle {
+        /** An object defining constant line label options. */
+        label?: ChartCommonConstantLineLabel;
+        /** Specifies the space between the constant line label and the left/right side of the constant line. */
+        paddingLeftRight?: number;
+        /** Specifies the space between the constant line label and the top/bottom side of the constant line. */
+        paddingTopBottom?: number;
+    }
+    export interface PolarCommonConstantLineStyle extends ConstantLineStyle {
+        /** An object defining constant line label options. */
+        label?: PolarCommonConstantLineLabel;
+    }
+    export interface CommonAxisLabel {
+        /** Specifies font options for axis labels. */
+        font?: viz.core.Font;
+        /** Specifies the spacing between an axis and its labels in pixels. */
+        indentFromAxis?: number;
+        /** Indicates whether or not axis labels are visible. */
+        visible?: boolean;
+    }
+    export interface ChartCommonAxisLabel extends CommonAxisLabel {
+        /** Specifies the label's position relative to the tick (grid line). */
+        alignment?: string;
+        /** Specifies the overlap resolving algorithm to be applied to axis labels. */
+        overlappingBehavior?: {
+            /** Specifies how to arrange axis labels. */
+            mode?: string;
+            /** Specifies the angle used to rotate axis labels. */
+            rotationAngle?: number;
+            /** Specifies the spacing that must be set between staggered rows when the 'stagger' algorithm is applied. */
+            staggeringSpacing?: number;
+        };
+    }
+    export interface PolarCommonAxisLabel extends CommonAxisLabel {
+        /** Specifies the overlap resolving algorithm to be applied to axis labels. */
+        overlappingBehavior?: string;
+    }
+    export interface CommonAxisTitle {
+        /** Specifies font options for an axis title. */
+        font?: viz.core.Font;
+        /** Specifies a margin for an axis title in pixels. */
+        margin?: number;
+    }
+    export interface BaseCommonAxisSettings {
+        /** Specifies the color of the line that represents an axis. */
+        color?: string;
+        /** Specifies whether ticks/grid lines of a discrete axis are located between labels or cross the labels. */
+        discreteAxisDivisionMode?: string;
+        /** An object defining the configuration options for the grid lines of an axis in the dxPolarChart widget. */
+        grid?: {
+            /** Specifies a color for grid lines. */
+            color?: string;
+            /** Specifies an opacity for grid lines. */
+            opacity?: number;
+            /** Indicates whether or not the grid lines of an axis are visible. */
+            visible?: boolean;
+            /** Specifies the width of grid lines. */
+            width?: number;
+        };
+        /** Specifies the options of the minor grid. */
+        minorGrid?: {
+            /** Specifies a color for the lines of the minor grid. */
+            color?: string;
+            /** Specifies an opacity for the lines of the minor grid. */
+            opacity?: number;
+            /** Indicates whether the minor grid is visible or not. */
+            visible?: boolean;
+            /** Specifies a width for the lines of the minor grid. */
+            width?: number;
+        };
+        /** Indicates whether or not an axis is inverted. */
+        inverted?: boolean;
+        /** Specifies the opacity of the line that represents an axis. */
+        opacity?: number;
+        /** Indicates whether or not to set ticks/grid lines of a continuous axis of the 'date-time' type at the beginning of each date-time interval. */
+        setTicksAtUnitBeginning?: boolean;
+        /** An object defining the configuration options for axis ticks. */
+        tick?: {
+            /** Specifies ticks color. */
+            color?: string;
+            /** Specifies tick opacity. */
+            opacity?: number;
+            /** Indicates whether or not ticks are visible on an axis. */
+            visible?: boolean;
+            /** Specifies tick width. */
+            width?: number;
+            /** Specifies tick length. */
+            length?: number;
+        };
+        /** Specifies the options of the minor ticks. */
+        minorTick?: {
+            /** Specifies a color for the minor ticks. */
+            color?: string;
+            /** Specifies an opacity for the minor ticks. */
+            opacity?: number;
+            /** Indicates whether or not the minor ticks are displayed on an axis. */
+            visible?: boolean;
+            /** Specifies minor tick width. */
+            width?: number;
+            /** Specifies minor tick length. */
+            length?: number;
+        };
+        /** Indicates whether or not the line that represents an axis in a chart is visible. */
+        visible?: boolean;
+        /** Specifies the width of the line that represents an axis in the chart. */
+        width?: number;
+    }
+    export interface ChartCommonAxisSettings extends BaseCommonAxisSettings {
+        /** Specifies the appearance of all the widget's constant lines. */
+        constantLineStyle?: ChartCommonConstantLineStyle;
+        /** An object defining the label configuration options that are common for all axes in the dxChart widget. */
+        label?: ChartCommonAxisLabel;
+        /** Specifies a coefficient that determines the spacing between the maximum series point and the axis. */
+        maxValueMargin?: number;
+        /** Specifies a coefficient that determines the spacing between the minimum series point and the axis. */
+        minValueMargin?: number;
+        /** Specifies, in pixels, the space reserved for an axis. */
+        placeholderSize?: number;
+        /** An object defining configuration options for strip style. */
+        stripStyle?: {
+            /** An object defining the configuration options for a strip label style. */
+            label?: {
+                /** Specifies font options for a strip label. */
+                font?: viz.core.Font;
+                /** Specifies the label's position on a strip. */
+                horizontalAlignment?: string;
+                /** Specifies a label's position on a strip. */
+                verticalAlignment?: string;
+            };
+            /** Specifies the spacing, in pixels, between the left/right strip border and the strip label. */
+            paddingLeftRight?: number;
+            /** Specifies the spacing, in pixels, between the top/bottom strip borders and the strip label. */
+            paddingTopBottom?: number;
+        };
+        /** An object defining the title configuration options that are common for all axes in the dxChart widget. */
+        title?: CommonAxisTitle;
+        /** Indicates whether or not to display series with indents from axis boundaries. */
+        valueMarginsEnabled?: boolean;
+    }
+    export interface PolarCommonAxisSettings extends BaseCommonAxisSettings {
+        /** Specifies the appearance of all the widget's constant lines. */
+        constantLineStyle?: PolarCommonConstantLineStyle;
+        /** An object defining the label configuration options that are common for all axes in the dxPolarChart widget. */
+        label?: PolarCommonAxisLabel;
+        /** An object defining configuration options for strip style. */
+        stripStyle?: {
+            /** An object defining the configuration options for a strip label style. */
+            label?: {
+                /** Specifies font options for a strip label. */
+                font?: viz.core.Font;
+            };
+        };
+    }
+    export interface ChartConstantLineLabel extends ChartCommonConstantLineLabel {
+        /** Specifies the horizontal alignment of a constant line label. */
+        horizontalAlignment?: string;
+        /** Specifies the vertical alignment of a constant line label. */
+        verticalAlignment?: string;
+        /** Specifies the text to be displayed in a constant line label. */
+        text?: string;
+    }
+    export interface PolarConstantLineLabel extends PolarCommonConstantLineLabel {
+        /** Specifies the text to be displayed in a constant line label. */
+        text?: string;
+    }
+    export interface AxisLabel {
+        /** Specifies the text for a hint that appears when a user hovers the mouse pointer over a label on the value axis. */
+        customizeHint?: (argument: { value: any; valueText: string }) => string;
+        /** Specifies a callback function that returns the text to be displayed in value axis labels. */
+        customizeText?: (argument: { value: any; valueText: string }) => string;
+        /** Specifies a format for the text displayed by axis labels. */
+        format?: string;
+        /** Specifies a precision for the formatted value displayed in the axis labels. */
+        precision?: number;
+    }
+    export interface ChartAxisLabel extends ChartCommonAxisLabel, AxisLabel { }
+    export interface PolarAxisLabel extends PolarCommonAxisLabel, AxisLabel { }
+    export interface AxisTitle extends CommonAxisTitle {
+        /** Specifies the text for the value axis title. */
+        text?: string;
+    }
+    export interface ChartConstantLineStyle extends ChartCommonConstantLineStyle {
+        /** An object defining constant line label options. */
+        label?: ChartConstantLineLabel;
+    }
+    export interface ChartConstantLine extends ChartConstantLineStyle {
+        /** An object defining constant line label options. */
+        label?: ChartConstantLineLabel;
+        /** Specifies a value to be displayed by a constant line. */
+        value?: any;
+    }
+    export interface PolarConstantLine extends PolarCommonConstantLineStyle {
+        /** An object defining constant line label options. */
+        label?: PolarConstantLineLabel;
+        /** Specifies a value to be displayed by a constant line. */
+        value?: any;
+    }
+    export interface Axis {
+        /** Specifies a coefficient for dividing the value axis. */
+        axisDivisionFactor?: number;
+        /** Specifies the order in which discrete values are arranged on the value axis. */
+        categories?: Array<any>;
+        /** Specifies the value to be raised to a power when generating ticks for a logarithmic axis. */
+        logarithmBase?: number;
+        /** Specifies an interval between axis ticks/grid lines. */
+        tickInterval?: any;
+        /** Specifies the interval between minor ticks. */
+        minorTickInterval?: any;
+        /** Specifies the number of minor ticks between two neighboring major ticks. */
+        minorTickCount?: number;
+        /** Specifies the required type of the value axis. */
+        type?: string;
+        /** Specifies the pane on which the current value axis will be displayed. */
+        pane?: string;
+        /** Specifies options for value axis strips. */
+        strips?: Array<Strip>;
+    }
+    export interface ChartAxis extends ChartCommonAxisSettings, Axis {
+        /** Defines an array of the value axis constant lines. */
+        constantLines?: Array<ChartConstantLine>;
+        /** Specifies the appearance options for the constant lines of the value axis. */
+        constantLineStyle?: ChartCommonConstantLineStyle;
+        /** Specifies options for value axis labels. */
+        label?: ChartAxisLabel;
+        /** Specifies the maximum value on the value axis. */
+        max?: any;
+        /** Specifies the minimum value on the value axis. */
+        min?: any;
+        /** Specifies the position of the value axis on a chart. */
+        position?: string;
+        /** Specifies the title for a value axis. */
+        title?: AxisTitle;
+    }
+    export interface PolarAxis extends PolarCommonAxisSettings, Axis {
+        /** Defines an array of the value axis constant lines. */
+        constantLines?: Array<PolarConstantLine>;
+        /** Specifies options for value axis labels. */
+        label?: PolarAxisLabel;
+    }
+    export interface ArgumentAxis {
+        /** Specifies the desired type of axis values. */
+        argumentType?: string;
+        /** Specifies the elements that will be highlighted when the argument axis is hovered over. */
+        hoverMode?: string;
+    }
+    export interface ChartArgumentAxis extends ChartAxis, ArgumentAxis { }
+    export interface PolarArgumentAxis extends PolarAxis, ArgumentAxis {
+        /** Specifies the angle in arc degrees to which the argument axis should be rotated. The positive values rotate the axis clockwise. */
+        startAngle?: number;
+        /** Specifies whether or not to display the first point at the angle specified by the startAngle option. */
+        firstPointOnStartAngle?: boolean;
+        /** Specifies the value to be used as the origin for the argument axis. */
+        originValue?: number;
+        /** Specifies the period of the argument values in the data source. */
+        period?: number;
+    }
+    export interface ValueAxis {
+        /** Specifies the name of the value axis. */
+        name?: string;
+        /** Specifies whether or not to indicate a zero value on the value axis. */
+        showZero?: boolean;
+        /** Specifies the desired type of axis values. */
+        valueType?: string;
+    }
+    export interface ChartValueAxis extends ChartAxis, ValueAxis {
+        /** Specifies the spacing, in pixels, between multiple value axes in a chart. */
+        multipleAxesSpacing?: number;
+        /** Specifies the value by which the chart's value axes are synchronized. */
+        synchronizedValue?: number;
+    }
+    export interface PolarValueAxis extends PolarAxis, ValueAxis {
+        /** Indicates whether to display series with indents from axis boundaries. */
+        valueMarginsEnabled?: boolean;
+        /** Specifies a coefficient that determines the spacing between the maximum series point and the axis. */
+        maxValueMargin?: number;
+        /** Specifies a coefficient that determines the spacing between the minimum series point and the axis. */
+        minValueMargin?: number;
+        tick?: {
+            visible?: boolean;
+        }
+    }
+    export interface CommonPane {
+        /** Specifies a background color in a pane. */
+        backgroundColor?: string;
+        /** Specifies the border options of a chart's pane. */
+        border?: PaneBorder;
+    }
+    export interface Pane extends CommonPane {
+        /** Specifies the name of a pane. */
+        name?: string;
+    }
+    export interface PaneBorder extends viz.core.DashedBorderWithOpacity {
+        /** Specifies the bottom border's visibility state in a pane. */
+        bottom?: boolean;
+        /** Specifies the left border's visibility state in a pane. */
+        left?: boolean;
+        /** Specifies the right border's visibility state in a pane. */
+        right?: boolean;
+        /** Specifies the top border's visibility state in a pane. */
+        top?: boolean;
+    }
+    export interface ChartAnimation extends viz.core.Animation {
+        /** Specifies the maximum series point count in the chart that the animation supports. */
+        maxPointCountSupported?: number;
+    }
+    export interface BaseChartTooltip extends viz.core.Tooltip {
+        /** Specifies a format for arguments of the chart's series points. */
+        argumentFormat?: string;
+        /** Specifies a precision for formatted arguments displayed in tooltips. */
+        argumentPrecision?: number;
+        /** Specifies a precision for a percent value displayed in tooltips for stacked series and dxPieChart series. */
+        percentPrecision?: number;
+    }
+    export interface BaseChartOptions<TPoint> extends viz.core.BaseWidgetOptions {
+        /** Specifies adaptive layout options. */
+        adaptiveLayout?: {
+            /** Specifies the width of the widget that is small enough for the layout to begin adapting. */
+            width?: number;
+            /** Specifies the height of the widget that is small enough for the layout to begin adapting. */
+            height?: number;
+            /** Specifies whether or not point labels can be hidden when the layout is adapting. */
+            keepLabels?: boolean;
+        };
+        /** Specifies animation options. */
+        animation?: ChartAnimation;
+        /** Specifies a callback function that returns an object with options for a specific point label. */
+        customizeLabel?: (labelInfo: Object) => Object;
+        /** Specifies a callback function that returns an object with options for a specific point. */
+        customizePoint?: (pointInfo: Object) => Object;
+        /** Specifies a data source for the chart. */
+        dataSource?: any;
+        /** Specifies the appearance of the loading indicator. */
+        loadingIndicator?: viz.core.LoadingIndicator;
+        /** Specifies options of a dxChart's (dxPieChart's) legend. */
+        legend?: core.BaseLegend;
+        /** Specifies the blank space between the chart's extreme elements and the boundaries of the area provided for the widget (see size) in pixels. */
+        margin?: viz.core.Margins;
+        /** Sets the name of the palette to be used in the chart. Alternatively, an array of colors can be set as a custom palette to be used within this chart. */
+        palette?: any;
+        /** A handler for the done event. */
+        onDone?: (e: {
+            component: BaseChart;
+            element: Element;
+        }) => void;
+        /** A handler for the pointClick event. */
+        onPointClick?: any;
+        /** A handler for the pointHoverChanged event. */
+        onPointHoverChanged?: (e: {
+            component: BaseChart;
+            element: Element;
+            target: TPoint;
+        }) => void;
+        /** A handler for the pointSelectionChanged event. */
+        onPointSelectionChanged?: (e: {
+            component: BaseChart;
+            element: Element;
+            target: TPoint;
+        }) => void;
+        /** Specifies whether a single point or multiple points can be selected in the chart. */
+        pointSelectionMode?: string;
+        /** Specifies whether to redraw the widget when the size of the parent browser window changes or a mobile device rotates. */
+        redrawOnResize?: boolean;
+        /** Specifies options for the dxChart and dxPieChart widget series. */
+        series?: any;
+        /** Specifies the size of the widget in pixels. */
+        size?: viz.core.Size;
+        /** Specifies a title for the chart. */
+        title?: viz.core.Title;
+        /** Specifies tooltip options. */
+        tooltip?: BaseChartTooltip;
+        /** A handler for the tooltipShown event. */
+        onTooltipShown?: (e: {
+            component: BaseChart;
+            element: Element;
+            target: BasePoint;
+        }) => void;
+        /** A handler for the tooltipHidden event. */
+        onTooltipHidden?: (e: {
+            component: BaseChart;
+            element: Element;
+            target: BasePoint;
+        }) => void;
+    }
+    /** A base class for all chart widgets included in the ChartJS library. */
+    export class BaseChart extends viz.core.BaseWidget {
+        /** Deselects the chart's selected series. The series is displayed in an initial style. */
+        clearSelection(): void;
+        /** Gets the current size of the widget. */
+        getSize(): { width: number; height: number };
+        /** Returns an array of all series in the chart. */
+        getAllSeries(): Array<BaseSeries>;
+        /** Gets a series within the chart's series collection by the specified name (see the name option). */
+        getSeriesByName(seriesName: string): BaseSeries;
+        /** Gets a series within the chart's series collection by its position number. */
+        getSeriesByPos(seriesIndex: number): BaseSeries;
+        /** Displays the loading indicator. */
+        showLoadingIndicator(): void;
+        /** Conceals the loading indicator. */
+        hideLoadingIndicator(): void;
+        /** Hides all widget tooltips. */
+        hideTooltip(): void;
+        /** Redraws a widget. */
+        render(renderOptions?: {
+            force?: boolean;
+            animate?: boolean;
+            asyncSeriesRendering?: boolean;
+        }): void;
+    }
+    export interface AdvancedLegend extends core.BaseLegend {
+        /** Specifies the text for a hint that appears when a user hovers the mouse pointer over a legend item. */
+        customizeHint?: (seriesInfo: { seriesName: string; seriesIndex: number; seriesColor: string; }) => string;
+        /** <p>Specifies a callback function that returns the text to be displayed by legend items.</p> */
+        customizeText?: (seriesInfo: { seriesName: string; seriesIndex: number; seriesColor: string; }) => string;
+        /** Specifies what series elements to highlight when a corresponding item in the legend is hovered over. */
+        hoverMode?: string;
+    }
+    export interface AdvancedOptions<TPoint, TSeries> extends BaseChartOptions<TPoint> {
+        /** A handler for the argumentAxisClick event. */
+        onArgumentAxisClick?: any;
+        /** Specifies the color of the parent page element. */
+        containerBackgroundColor?: string;
+        /** An object providing options for managing data from a data source. */
+        dataPrepareSettings?: {
+            /** Specifies whether or not to validate the values from a data source. */
+            checkTypeForAllData?: boolean;
+            /** Specifies whether or not to convert the values from a data source into the data type of an axis. */
+            convertToAxisDataType?: boolean;
+            /** Specifies how to sort the series points. */
+            sortingMethod?: any;
+        };
+        /** A handler for the legendClick event. */
+        onLegendClick?: any;
+        /** A handler for the seriesClick event. */
+        onSeriesClick?: any;
+        /** A handler for the seriesHoverChanged event. */
+        onSeriesHoverChanged?: (e: {
+            component: BaseChart;
+            element: Element;
+            target: TSeries;
+        }) => void;
+        /** A handler for the seriesSelectionChanged event. */
+        onSeriesSelectionChanged?: (e: {
+            component: BaseChart;
+            element: Element;
+            target: TSeries;
+        }) => void;
+        /** Specifies whether a single series or multiple series can be selected in the chart. */
+        seriesSelectionMode?: string;
+        /** Specifies how the chart must behave when series point labels overlap. */
+        resolveLabelOverlapping?: string;
+        /** Specifies whether or not all bars in a series must have the same angle, or may have different angles if any points in other series are missing. */
+        equalBarWidth?: boolean;
+        /** Specifies a common bar width as a percentage from 0 to 1. */
+        barWidth?: number;
+    }
+    export interface Legend extends AdvancedLegend {
+        /** Specifies whether the legend is located outside or inside the chart's plot. */
+        position?: string;
+    }
+    export interface ChartTooltip extends BaseChartTooltip {
+        /** Specifies whether the tooltip must be located in the center of a bar or on its edge. Applies to the Bar and Bubble series. */
+        location?: string;
+        /** Specifies the kind of information to display in a tooltip. */
+        shared?: boolean;
+    }
+    export interface dxChartOptions extends AdvancedOptions<ChartPoint, ChartSeries> {
+        adaptiveLayout?: {
+            keepLabels?: boolean;
+        };
+        /** Indicates whether or not to synchronize value axes when they are displayed on a single pane. */
+        synchronizeMultiAxes?: boolean;
+        /** Specifies whether or not to filter the series points depending on their quantity. */
+        useAggregation?: boolean;
+        /** Indicates whether or not to adjust a value axis to the current minimum and maximum values of a zoomed chart. */
+        adjustOnZoom?: boolean;
+        /** Specifies argument axis options for the dxChart widget. */
+        argumentAxis?: ChartArgumentAxis;
+        /** An object defining the configuration options that are common for all axes of the dxChart widget. */
+        commonAxisSettings?: ChartCommonAxisSettings;
+        /** An object defining the configuration options that are common for all panes in the dxChart widget. */
+        commonPaneSettings?: CommonPane;
+        /** An object defining the configuration options that are common for all series of the dxChart widget. */
+        commonSeriesSettings?: CommonSeriesSettings;
+        /** An object that specifies the appearance options of the chart crosshair. */
+        crosshair?: {
+            /** Specifies a color for the crosshair lines. */
+            color?: string;
+            /** Specifies a dash style for the crosshair lines. */
+            dashStyle?: string;
+            /** Specifies whether to enable the crosshair or not. */
+            enabled?: boolean;
+            /** Specifies the opacity of the crosshair lines. */
+            opacity?: number;
+            /** Specifies the width of the crosshair lines. */
+            width?: number;
+            /** Specifies the appearance of the horizontal crosshair line. */
+            horizontalLine?: CrosshaierWithLabel;
+            /** Specifies the appearance of the vertical crosshair line. */
+            verticalLine?: CrosshaierWithLabel;
+            /** Specifies the options of the crosshair labels. */
+            label?: {
+                /** Specifies a color for the background of the crosshair labels. */
+                backgroundColor?: string;
+                /** Specifies whether the crosshair labels are visible or not. */
+                visible?: boolean;
+                /** Specifies font options for the text of the crosshair labels. */
+                font?: viz.core.Font;
+                /** Specifies the format of the values displayed by crosshair labels. */
+                format?: string;
+                /** Specifies a precision for formatted values. */
+                precision?: number;
+                /** Customizes the text displayed by the crosshair labels. */
+                customizeText?: (info: { value: any; valueText: string; point: ChartPoint; }) => string;
+            }
+        };
+        /** Specifies a default pane for the chart's series. */
+        defaultPane?: string;
+        /** Specifies a coefficient determining the diameter of the largest bubble. */
+        maxBubbleSize?: number;
+        /** Specifies the diameter of the smallest bubble measured in pixels. */
+        minBubbleSize?: number;
+        /** Defines the dxChart widget's <a href="/Documentation/Guide/Data_Visualization/Charts/Chart_Elements?version=15_2#Panes">pane(s)</a>. */
+        panes?: Array<Pane>;
+        /** Swaps the axes round so that the value axis becomes horizontal and the argument axes becomes vertical. */
+        rotated?: boolean;
+        /** Specifies the options of a chart's legend. */
+        legend?: Legend;
+        /** Specifies options for dxChart widget series. */
+        series?: Array<SeriesConfig>;
+        /** Defines options for the series template. */
+        seriesTemplate?: SeriesTemplate;
+        /** Specifies tooltip options. */
+        tooltip?: ChartTooltip;
+        /** Specifies value axis options for the dxChart widget. */
+        valueAxis?: Array<ChartValueAxis>;
+        /** Enables scrolling in your chart. */
+        scrollingMode?: string;
+        /** Enables zooming in your chart. */
+        zoomingMode?: string;
+        /** Specifies the settings of the scroll bar. */
+        scrollBar?: {
+            /** Specifies whether the scroll bar is visible or not. */
+            visible?: boolean;
+            /** Specifies the spacing between the scroll bar and the chart's plot in pixels. */
+            offset?: number;
+            /** Specifies the color of the scroll bar. */
+            color?: string;
+            /** Specifies the width of the scroll bar in pixels. */
+            width?: number;
+            /** Specifies the opacity of the scroll bar. */
+            opacity?: number;
+            /** Specifies the position of the scroll bar in the chart. */
+            position?: string;
+        };
+    }
+    /** A widget used to embed charts into HTML JS applications. */
+    export class dxChart extends BaseChart {
+        constructor(element: JQuery, options?: dxChartOptions);
+        constructor(element: Element, options?: dxChartOptions);
+        /** Sets the specified start and end values for the chart's argument axis. */
+        zoomArgument(startValue: any, endValue: any): void;
+    }
+    interface CrosshaierWithLabel extends viz.core.DashedBorderWithOpacity {
+        /** Configures the label that belongs to the horizontal crosshair line. */
+        label?: {
+            /** Specifies a color for the background of the label that belongs to the horizontal crosshair line. */
+            backgroundColor?: string;
+            /** Specifies whether the label of the horizontal crosshair line is visible or not. */
+            visible?: boolean;
+            /** Specifies font options for the text of the label that belongs to the horizontal crosshair line. */
+            font?: viz.core.Font;
+            /** Specifies the format of the values displayed by crosshair labels. */
+            format?: string;
+            /** Specifies a precision for formatted values. */
+            precision?: number;
+            /** Customizes the text displayed by the crosshair label that accompany the horizontal line. */
+            customizeText?: (info: { value: any; valueText: string; point: ChartPoint; }) => string;
+        }
+    }
+    export interface PolarChartTooltip extends BaseChartTooltip {
+        /** Specifies the kind of information to display in a tooltip. */
+        shared?: boolean;
+    }
+    export interface dxPolarChartOptions extends AdvancedOptions<PolarPoint, PolarSeries> {
+        /** Specifies adaptive layout options. */
+        adaptiveLayout?: {
+            width?: number;
+            height?: number;
+            /** Specifies whether or not point labels can be hidden when the layout is adapting. */
+            keepLabels?: boolean;
+        };
+        /** Indicates whether or not to display a "spider web". */
+        useSpiderWeb?: boolean;
+        /** Specifies argument axis options for the dxPolarChart widget. */
+        argumentAxis?: PolarArgumentAxis;
+        /** An object defining the configuration options that are common for all axes of the dxPolarChart widget. */
+        commonAxisSettings?: PolarCommonAxisSettings;
+        /** An object defining the configuration options that are common for all series of the dxPolarChart widget. */
+        commonSeriesSettings?: CommonPolarSeriesSettings;
+        /** Specifies the options of a chart's legend. */
+        legend?: AdvancedLegend;
+        /** Specifies options for dxPolarChart widget series. */
+        series?: Array<PolarSeriesConfig>;
+        /** Defines options for the series template. */
+        seriesTemplate?: PolarSeriesTemplate;
+        /** Specifies tooltip options. */
+        tooltip?: PolarChartTooltip;
+        /** Specifies value axis options for the dxPolarChart widget. */
+        valueAxis?: PolarValueAxis;
+    }
+    /** A chart widget displaying data in a polar coordinate system. */
+    export class dxPolarChart extends BaseChart {
+        constructor(element: JQuery, options?: dxPolarChartOptions);
+        constructor(element: Element, options?: dxPolarChartOptions);
+    }
+    export interface PieLegend extends core.BaseLegend {
+        /** Specifies what chart elements to highlight when a corresponding item in the legend is hovered over. */
+        hoverMode?: string;
+        /** Specifies the text for a hint that appears when a user hovers the mouse pointer over a legend item. */
+        customizeHint?: (pointInfo: { pointName: string; pointIndex: number; pointColor: string; }) => string;
+        /** Specifies a callback function that returns the text to be displayed by a legend item. */
+        customizeText?: (pointInfo: { pointName: string; pointIndex: number; pointColor: string; }) => string;
+    }
+    export interface dxPieChartOptions extends BaseChartOptions<PiePoint> {
+        /** Specifies adaptive layout options. */
+        adaptiveLayout?: {
+            /** Specifies whether or not point labels can be hidden when the layout is adapting. */
+            keepLabels?: boolean;
+        };
+        /** Specifies dxPieChart legend options. */
+        legend?: PieLegend;
+        /** Specifies options for the series of the dxPieChart widget. */
+        series?: Array<PieSeriesConfig>;
+        /** Specifies the diameter of the pie. */
+        diameter?: number;
+        /** Specifies the direction that the pie chart segments will occupy. */
+        segmentsDirection?: string;
+        /** Specifies the angle in arc degrees from which the first segment of a pie chart should start. */
+        startAngle?: number;
+        /** Specifies the fraction of the inner radius relative to the total radius in the series of the 'doughnut' type. The value should be between 0 and 1. */
+        innerRadius?: number;
+        /** A handler for the legendClick event. */
+        onLegendClick?: any;
+        /** Specifies how a chart must behave when series point labels overlap. */
+        resolveLabelOverlapping?: string;
+        /** An object defining the configuration options that are common for all series of the dxPieChart widget. */
+        commonSeriesSettings?: CommonPieSeriesSettings;
+        /** Specifies the type of the pie chart series. */
+        type?: string;
+    }
+    /** A circular chart widget for HTML JS applications. */
+    export class dxPieChart extends BaseChart {
+        constructor(element: JQuery, options?: dxPieChartOptions);
+        constructor(element: Element, options?: dxPieChartOptions);
+        /**
+         * Provides access to the dxPieChart series.
+         * @deprecated ..\..\BaseChart\3 Methods\getAllSeries().md
+         */
+        getSeries(): PieSeries;
+    }
+}
+interface JQuery {
+    dxChart(options?: DevExpress.viz.charts.dxChartOptions): JQuery;
+    dxChart(methodName: string, ...params: any[]): any;
+    dxChart(methodName: "instance"): DevExpress.viz.charts.dxChart;
+    dxPieChart(options?: DevExpress.viz.charts.dxPieChartOptions): JQuery;
+    dxPieChart(methodName: string, ...params: any[]): any;
+    dxPieChart(methodName: "instance"): DevExpress.viz.charts.dxPieChart;
+    dxPolarChart(options?: DevExpress.viz.charts.dxPolarChartOptions): JQuery;
+    dxPolarChart(methodName: string, ...params: any[]): any;
+    dxPolarChart(methodName: "instance"): DevExpress.viz.charts.dxPolarChart;
+}
+declare namespace DevExpress.viz.gauges {
+    export interface BaseRangeContainer {
+        /** Specifies a range container's background color. */
+        backgroundColor?: string;
+        /** Specifies the offset of the range container from an invisible scale line in pixels. */
+        offset?: number;
+        /** Sets the name of the palette or an array of colors to be used for coloring the gauge range container. */
+        palette?: any;
+        /** An array of objects representing ranges contained in the range container. */
+        ranges?: Array<{ startValue: number; endValue: number; color: string }>;
+        /** Specifies a color of a range. */
+        color?: string;
+        /** Specifies an end value of a range. */
+        endValue?: number;
+        /** Specifies a start value of a range. */
+        startValue?: number;
+    }
+    export interface ScaleTick {
+        /** Specifies the color of the scale's minor ticks. */
+        color?: string;
+        /**
+         * Specifies an array of custom minor ticks.
+         * @deprecated ..\customMinorTicks.md
+         */
+        customTickValues?: Array<any>;
+        /** Specifies the length of the scale's minor ticks. */
+        length?: number;
+        /**
+         * Indicates whether automatically calculated minor ticks are visible or not.
+         * @deprecated This functionality in not more available
+         */
+        showCalculatedTicks?: boolean;
+        /**
+         * Specifies an interval between minor ticks.
+         * @deprecated ..\minorTickInterval.md
+         */
+        tickInterval?: number;
+        /** Indicates whether scale minor ticks are visible or not. */
+        visible?: boolean;
+        /** Specifies the width of the scale's minor ticks. */
+        width?: number;
+    }
+    export interface ScaleMajorTick extends ScaleTick {
+        /**
+         * Specifies whether or not to expand the current major tick interval if labels overlap each other.
+         * @deprecated ..\label\overlappingBehavior\useAutoArrangement.md
+         */
+        useTicksAutoArrangement?: boolean;
+    }
+    export interface ScaleMinorTick extends ScaleTick {
+        /** Specifies the opacity of the scale's minor ticks. */
+        opacity?: number;
+    }
+    export interface BaseScaleLabel {
+        /** Specifies whether or not scale labels should be colored similarly to their corresponding ranges in the range container. */
+        useRangeColors?: boolean;
+        /** Specifies a callback function that returns the text to be displayed in scale labels. */
+        customizeText?: (scaleValue: { value: number; valueText: string }) => string;
+        /** Specifies the overlap resolving options to be applied to scale labels. */
+        overlappingBehavior?: {
+            /** Specifies whether or not to expand the current major tick interval if labels overlap each other. */
+            useAutoArrangement?: boolean;
+            /** Specifies what label to hide in case of overlapping. */
+            hideFirstOrLast?: string;
+        };
+        /** Specifies font options for the text displayed in the scale labels of the gauge. */
+        font?: viz.core.Font;
+        /** Specifies a format for the text displayed in scale labels. */
+        format?: string;
+        /** Specifies a precision for the formatted value displayed in the scale labels. */
+        precision?: number;
+        /** Specifies whether or not scale labels are visible on the gauge. */
+        visible?: boolean;
+    }
+    export interface BaseScale {
+        /** Specifies the end value for the scale of the gauge. */
+        endValue?: number;
+        /**
+         * Specifies whether or not to hide the first scale label.
+         * @deprecated This functionality in not more available
+         */
+        hideFirstLabel?: boolean;
+        /**
+         * Specifies whether or not to hide the first major tick on the scale.
+         * @deprecated This functionality in not more available
+         */
+        hideFirstTick?: boolean;
+        /**
+         * Specifies whether or not to hide the last scale label.
+         * @deprecated This functionality in not more available
+         */
+        hideLastLabel?: boolean;
+        /**
+         * Specifies whether or not to hide the last major tick on the scale.
+         * @deprecated This functionality in not more available
+         */
+        hideLastTick?: boolean;
+        /** Specifies an interval between major ticks. */
+        tickInterval?: number;
+        /** Specifies an interval between minor ticks. */
+        minorTickInterval?: number;
+        /** Specifies an array of custom major ticks. */
+        customTicks?: Array<any>;
+        /** Specifies an array of custom minor ticks. */
+        customMinorTicks?: Array<any>;
+        /** Specifies common options for scale labels. */
+        label?: BaseScaleLabel;
+        /**
+         * Specifies options of the gauge's major ticks.
+         * @deprecated ..\tick\tick.md
+         */
+        majorTick?: ScaleMajorTick;
+        /** Specifies options of the gauge's major ticks. */
+        tick?: {
+            /** Specifies the color of the scale's major ticks. */
+            color?: string;
+            /** Specifies the length of the scale's major ticks. */
+            length?: number;
+            /** Indicates whether scale major ticks are visible or not. */
+            visible?: boolean;
+            /** Specifies the width of the scale's major ticks. */
+            width?: number;
+            /** Specifies the opacity of the scale's major ticks. */
+            opacity?: number;
+        };
+        /** Specifies options of the gauge's minor ticks. */
+        minorTick?: ScaleMinorTick;
+        /** Specifies the start value for the scale of the gauge. */
+        startValue?: number;
+    }
+    export interface BaseValueIndicator {
+        /** Specifies the type of subvalue indicators. */
+        type?: string;
+        /** Specifies the background color for the indicator of the rangeBar type. */
+        backgroundColor?: string;
+        /** Specifies the base value for the indicator of the rangeBar type. */
+        baseValue?: number;
+        /** Specifies a color of the indicator. */
+        color?: string;
+        /** Specifies the range bar size for an indicator of the rangeBar type. */
+        size?: number;
+        text?: {
+            /** Specifies a callback function that returns the text to be displayed in an indicator. */
+            customizeText?: (indicatedValue: { value: number; valueText: string }) => string;
+            font?: viz.core.Font;
+            /** Specifies a format for the text displayed in an indicator. */
+            format?: string;
+            /** Specifies the range bar's label indent in pixels. */
+            indent?: number;
+            /** Specifies a precision for the formatted value displayed by an indicator. */
+            precision?: number;
+        };
+        offset?: number;
+        length?: number;
+        width?: number;
+        /** Specifies the length of an arrow for the indicator of the textCloud type in pixels. */
+        arrowLength?: number;
+        /** Sets the array of colors to be used for coloring subvalue indicators. */
+        palette?: Array<any>;
+        /** Specifies the distance between the needle and the center of a gauge for the indicator of a needle-like type. */
+        indentFromCenter?: number;
+        /** Specifies the second color for the indicator of the twoColorNeedle type. */
+        secondColor?: string;
+        /** Specifies the length of a twoNeedleColor type indicator tip as a percentage. */
+        secondFraction?: number;
+        /** Specifies the spindle's diameter in pixels for the indicator of a needle-like type. */
+        spindleSize?: number;
+        /** Specifies the inner diameter in pixels, so that the spindle has the shape of a ring. */
+        spindleGapSize?: number;
+        /** Specifies the orientation of the rangeBar indicator on a vertically oriented dxLinearGauge widget. */
+        horizontalOrientation?: string;
+        /** Specifies the orientation of the rangeBar indicator on a horizontally oriented dxLinearGauge widget. */
+        verticalOrientation?: string;
+    }
+    export interface SharedGaugeOptions {
+        /** Specifies animation options. */
+        animation?: viz.core.Animation;
+        /** Specifies the appearance of the loading indicator. */
+        loadingIndicator?: viz.core.LoadingIndicator;
+        /** Specifies whether to redraw the widget when the size of the parent browser window changes or a mobile device rotates. */
+        redrawOnResize?: boolean;
+        /** Specifies the size of the widget in pixels. */
+        size?: viz.core.Size;
+        /**
+         * Specifies a subtitle for the widget.
+         * @deprecated ..\..\..\BaseGauge\1 Configuration\title\subtitle\subtitle.md
+         */
+        subtitle?: {
+            /**
+             * Specifies font options for the subtitle.
+             * @deprecated ..\..\title\subtitle\font\font.md
+             */
+            font?: viz.core.Font;
+            /**
+             * Specifies a text for the subtitle.
+             * @deprecated ..\title\subtitle\text.md
+             */
+            text?: string;
+        };
+        /** Specifies a title for a gauge. */
+        title?: {
+            /** Specifies font options for the title. */
+            font?: viz.core.Font;
+            /**
+             * Specifies a title's position on the gauge.
+             * @deprecated basegaugeoptions_title_verticalAlignment and basegaugeoptions_title_horizontalAlignment
+             */
+            position?: string;
+            /** Specifies the distance between the title and surrounding gauge elements in pixels. */
+            margin?: viz.core.Margins;
+            /** Specifies the height of the space reserved for the title. */
+            placeholderSize?: number;
+            /** Specifies the gauge title's position in the vertical direction. */
+            verticalAlignment?: string;
+            /** Specifies the gauge title's horizontal position. */
+            horizontalAlignment?: string;
+            /** Specifies text for the title. */
+            text?: string;
+            /** Specifies a subtitle for the widget. */
+            subtitle?: {
+                /** Specifies font options for the subtitle. */
+                font?: viz.core.Font;
+                /** Specifies text for the subtitle. */
+                text?: string;
+            }
+        };
+        /** Specifies options for gauge tooltips. */
+        tooltip?: viz.core.Tooltip;
+        /** A handler for the tooltipShown event. */
+        onTooltipShown?: (e: {
+            component: dxBaseGauge;
+            element: Element;
+            target: {};
+        }) => void;
+        /** A handler for the tooltipHidden event. */
+        onTooltipHidden?: (e: {
+            component: dxBaseGauge;
+            element: Element;
+            target: {};
+        }) => void;
+    }
+    export interface BaseGaugeOptions extends viz.core.BaseWidgetOptions, SharedGaugeOptions {
+        /** Specifies the color of the parent page element. */
+        containerBackgroundColor?: string;
+        /** Specifies the blank space in pixels between the widget's extreme elements and the boundaries of the area provided for the widget (see the size option). */
+        margin?: viz.core.Margins;
+        /** Specifies options of the gauge's range container. */
+        rangeContainer?: BaseRangeContainer;
+        /** Specifies a gauge's scale options. */
+        scale?: BaseScale;
+        /** Specifies the appearance options of subvalue indicators. */
+        subvalueIndicator?: BaseValueIndicator;
+        /** Specifies a set of subvalues to be designated by the subvalue indicators. */
+        subvalues?: Array<number>;
+        /** Specifies the main value on a gauge. */
+        value?: number;
+        /** Specifies the appearance options of the value indicator. */
+        valueIndicator?: BaseValueIndicator;
+    }
+    /** A gauge widget. */
+    export class dxBaseGauge extends viz.core.BaseWidget {
+        /** Displays the loading indicator. */
+        showLoadingIndicator(): void;
+        /** Conceals the loading indicator. */
+        hideLoadingIndicator(): void;
+        /** Redraws a widget. */
+        render(): void;
+        /** Returns the main gauge value. */
+        value(): number;
+        /** Updates a gauge value. */
+        value(value: number): void;
+        /** Returns an array of gauge subvalues. */
+        subvalues(): Array<number>;
+        /** Updates gauge subvalues. */
+        subvalues(subvalues: Array<number>): void;
+    }
+    export interface LinearRangeContainer extends BaseRangeContainer {
+        /** Specifies the orientation of the range container on a vertically oriented dxLinearGauge widget. */
+        horizontalOrientation?: string;
+        /** Specifies the orientation of a range container on a horizontally oriented dxLinearGauge widget. */
+        verticalOrientation?: string;
+        /** Specifies the width of the range container's start and end boundaries in the dxLinearGauge widget. */
+        width?: any;
+        /** Specifies an end width of a range container. */
+        end?: number;
+        /** Specifies a start width of a range container. */
+        start?: number;
+    }
+    export interface LinearScaleLabel extends BaseScaleLabel {
+        /** Specifies the spacing between scale labels and ticks. */
+        indentFromTick?: number;
+    }
+    export interface LinearScale extends BaseScale {
+        /** Specifies the orientation of scale ticks on a vertically oriented dxLinearGauge widget. */
+        horizontalOrientation?: string;
+        label?: LinearScaleLabel;
+        /** Specifies the orientation of scale ticks on a horizontally oriented dxLinearGauge widget. */
+        verticalOrientation?: string;
+    }
+    export interface dxLinearGaugeOptions extends BaseGaugeOptions {
+        /** Specifies the options required to set the geometry of the dxLinearGauge widget. */
+        geometry?: {
+            /** Indicates whether to display the dxLinearGauge widget vertically or horizontally. */
+            orientation?: string;
+        };
+        /** Specifies gauge range container options. */
+        rangeContainer?: LinearRangeContainer;
+        scale?: LinearScale;
+    }
+    /** A widget that represents a gauge with a linear scale. */
+    export class dxLinearGauge extends dxBaseGauge {
+        constructor(element: JQuery, options?: dxLinearGaugeOptions);
+        constructor(element: Element, options?: dxLinearGaugeOptions);
+    }
+    export interface CircularRangeContainer extends BaseRangeContainer {
+        /** Specifies the orientation of the range container in the dxCircularGauge widget. */
+        orientation?: string;
+        /** Specifies the range container's width in pixels. */
+        width?: number;
+    }
+    export interface CircularScaleLabel extends BaseScaleLabel {
+        /** Specifies the spacing between scale labels and ticks. */
+        indentFromTick?: number;
+    }
+    export interface CircularScale extends BaseScale {
+        label?: CircularScaleLabel;
+        /** Specifies the orientation of scale ticks. */
+        orientation?: string;
+    }
+    export interface dxCircularGaugeOptions extends BaseGaugeOptions {
+        /** Specifies the options required to set the geometry of the dxCircularGauge widget. */
+        geometry?: {
+            /** Specifies the end angle of the circular gauge's arc. */
+            endAngle?: number;
+            /** Specifies the start angle of the circular gauge's arc. */
+            startAngle?: number;
+        };
+        /** Specifies gauge range container options. */
+        rangeContainer?: CircularRangeContainer;
+        scale?: CircularScale;
+    }
+    /** A widget that represents a gauge with a circular scale. */
+    export class dxCircularGauge extends dxBaseGauge {
+        constructor(element: JQuery, options?: dxCircularGaugeOptions);
+        constructor(element: Element, options?: dxCircularGaugeOptions);
+    }
+    export interface dxBarGaugeOptions extends viz.core.BaseWidgetOptions, SharedGaugeOptions {
+        /** Specifies a color for the remaining segment of the bar's track. */
+        backgroundColor?: string;
+        /** Specifies a distance between bars in pixels. */
+        barSpacing?: number;
+        /** Specifies a base value for bars. */
+        baseValue?: number;
+        /** Specifies an end value for the gauge's invisible scale. */
+        endValue?: number;
+        /** Defines the shape of the gauge's arc. */
+        geometry?: {
+            /** Specifies the end angle of the bar gauge's arc. */
+            endAngle?: number;
+            /** Specifies the start angle of the bar gauge's arc. */
+            startAngle?: number;
+        };
+        /** Specifies the options of the labels that accompany gauge bars. */
+        label?: {
+            /** Specifies a color for the label connector text. */
+            connectorColor?: string;
+            /** Specifies the width of the label connector in pixels. */
+            connectorWidth?: number;
+            /** Specifies a callback function that returns a text for labels. */
+            customizeText?: (barValue: { value: number; valueText: string }) => string;
+            /** Specifies font options for bar labels. */
+            font?: viz.core.Font;
+            /** Specifies a format for bar labels. */
+            format?: string;
+            /** Specifies the distance between the upper bar and bar labels in pixels. */
+            indent?: number;
+            /** Specifies a precision for the formatted value displayed by labels. */
+            precision?: number;
+            /** Specifies whether bar labels appear on a gauge or not. */
+            visible?: boolean;
+        };
+        /** Sets the name of the palette or an array of colors to be used for coloring the gauge range container. */
+        palette?: string;
+        /** Defines the radius of the bar that is closest to the center relatively to the radius of the topmost bar. */
+        relativeInnerRadius?: number;
+        /** Specifies a start value for the gauge's invisible scale. */
+        startValue?: number;
+        /** Specifies the array of values to be indicated on a bar gauge. */
+        values?: Array<number>;
+    }
+    /** A circular bar widget. */
+    export class dxBarGauge extends viz.core.BaseWidget {
+        constructor(element: JQuery, options?: dxBarGaugeOptions);
+        constructor(element: Element, options?: dxBarGaugeOptions);
+        /** Displays the loading indicator. */
+        showLoadingIndicator(): void;
+        /** Conceals the loading indicator. */
+        hideLoadingIndicator(): void;
+        /** Redraws the widget. */
+        render(): void;
+        /** Returns an array of gauge values. */
+        values(): Array<number>;
+        /** Updates the values displayed by a gauge. */
+        values(values: Array<number>): void;
+    }
+}
+interface JQuery {
+    dxLinearGauge(options?: DevExpress.viz.gauges.dxLinearGaugeOptions): JQuery;
+    dxLinearGauge(methodName: string, ...params: any[]): any;
+    dxLinearGauge(methodName: "instance"): DevExpress.viz.gauges.dxLinearGauge;
+    dxCircularGauge(options?: DevExpress.viz.gauges.dxCircularGaugeOptions): JQuery;
+    dxCircularGauge(methodName: string, ...params: any[]): any;
+    dxCircularGauge(methodName: "instance"): DevExpress.viz.gauges.dxCircularGauge;
+    dxBarGauge(options?: DevExpress.viz.gauges.dxBarGaugeOptions): JQuery;
+    dxBarGauge(methodName: string, ...params: any[]): any;
+    dxBarGauge(methodName: "instance"): DevExpress.viz.gauges.dxBarGauge;
+}
+declare namespace DevExpress.viz.rangeSelector {
+    export interface dxRangeSelectorOptions extends viz.core.BaseWidgetOptions {
+        /** Specifies the options for the range selector's background. */
+        background?: {
+            /** Specifies the background color for the dxRangeSelector. */
+            color?: string;
+            /** Specifies image options. */
+            image?: {
+                /** Specifies a location for the image in the background of a range selector. */
+                location?: string;
+                /** Specifies the image's URL. */
+                url?: string;
+            };
+            /** Indicates whether or not the background (background color and/or image) is visible. */
+            visible?: boolean;
+        };
+        /** Specifies a title for the range selector. */
+        title?: viz.core.Title;
+        /** Specifies the dxRangeSelector's behavior options. */
+        behavior?: {
+            /** Indicates whether or not you can swap sliders. */
+            allowSlidersSwap?: boolean;
+            /** Indicates whether or not animation is enabled. */
+            animationEnabled?: boolean;
+            /** Specifies when to call the onSelectedRangeChanged function. */
+            callSelectedRangeChanged?: string;
+            /** Indicates whether or not an end user can specify the range using a mouse, without the use of sliders. */
+            manualRangeSelectionEnabled?: boolean;
+            /** Indicates whether or not an end user can shift the selected range to the required location on a scale by clicking. */
+            moveSelectedRangeByClick?: boolean;
+            /** Indicates whether to snap a slider to ticks. */
+            snapToTicks?: boolean;
+        };
+        /** Specifies the options required to display a chart as the range selector's background. */
+        chart?: {
+            /** Specifies a coefficient for determining an indent from the bottom background boundary to the lowest chart point. */
+            bottomIndent?: number;
+            /** An object defining the common configuration options for the chart’s series. */
+            commonSeriesSettings?: viz.charts.CommonSeriesSettings;
+            /** An object providing options for managing data from a data source. */
+            dataPrepareSettings?: {
+                /** Specifies whether or not to validate values from a data source. */
+                checkTypeForAllData?: boolean;
+                /** Specifies whether or not to convert the values from a data source into the data type of an axis. */
+                convertToAxisDataType?: boolean;
+                /** Specifies how to sort series points. */
+                sortingMethod?: any;
+            };
+            /** Specifies whether all bars in a series must have the same width, or may have different widths if any points in other series are missing. */
+            equalBarWidth?: boolean;
+            /** Specifies a common bar width as a percentage from 0 to 1. */
+            barWidth?: number;
+            /** Sets the name of the palette to be used in the range selector's chart. Alternatively, an array of colors can be set as a custom palette to be used within this chart. */
+            palette?: any;
+            /** An object defining the chart’s series. */
+            series?: Array<viz.charts.SeriesConfig>;
+            /** Defines options for the series template. */
+            seriesTemplate?: viz.charts.SeriesTemplate;
+            /** Specifies a coefficient for determining an indent from the background's top boundary to the topmost chart point. */
+            topIndent?: number;
+            /** Specifies whether or not to filter the series points depending on their quantity. */
+            useAggregation?: boolean;
+            /** Specifies options for the chart's value axis. */
+            valueAxis?: {
+                /** Indicates whether or not the chart's value axis must be inverted. */
+                inverted?: boolean;
+                /** Specifies the value to be raised to a power when generating ticks for a logarithmic value axis. */
+                logarithmBase?: number;
+                /** Specifies the maximum value of the chart's value axis. */
+                max?: number;
+                /** Specifies the minimum value of the chart's value axis. */
+                min?: number;
+                /** Specifies the type of the value axis. */
+                type?: string;
+                /** Specifies the desired type of axis values. */
+                valueType?: string;
+            };
+        };
+        /** Specifies the color of the parent page element. */
+        containerBackgroundColor?: string;
+        /** Specifies a data source for the scale values and for the chart at the background. */
+        dataSource?: any;
+        /** Specifies the data source field that provides data for the scale. */
+        dataSourceField?: string;
+        /** Specifies the appearance of the loading indicator. */
+        loadingIndicator?: viz.core.LoadingIndicator;
+        /** Specifies the blank space in pixels between the dxRangeSelector widget's extreme elements and the boundaries of the area provided for the widget (see size). */
+        margin?: viz.core.Margins;
+        /** Specifies whether to redraw the widget when the size of the parent browser window changes or a mobile device rotates. */
+        redrawOnResize?: boolean;
+        /** Specifies options of the range selector's scale. */
+        scale?: {
+            /** Specifies the scale's end value. */
+            endValue?: any;
+            /** Specifies common options for scale labels. */
+            label?: {
+                /** Specifies a callback function that returns the text to be displayed in scale labels. */
+                customizeText?: (scaleValue: { value: any; valueText: string; }) => string;
+                /** Specifies font options for the text displayed in the range selector's scale labels. */
+                font?: viz.core.Font;
+                /** Specifies a format for the text displayed in scale labels. */
+                format?: string;
+                /** Specifies a precision for the formatted value displayed in the scale labels. */
+                precision?: number;
+                /** Specifies a spacing between scale labels and the background bottom edge. */
+                topIndent?: number;
+                /** Specifies whether or not the scale's labels are visible. */
+                visible?: boolean;
+            };
+            /** Specifies the value to be raised to a power when generating ticks for a logarithmic scale. */
+            logarithmBase?: number;
+            /**
+             * Specifies an interval between major ticks.
+             * @deprecated ..\tickInterval\tickInterval.md
+             */
+            majorTickInterval?: any;
+            /** Specifies an interval between axis ticks. */
+            tickInterval?: any;
+            /** Specifies options for the date-time scale's markers. */
+            marker?: {
+                /** Defines the options that can be set for the text that is displayed by the scale markers. */
+                label?: {
+                    /** Specifies a callback function that returns the text to be displayed in scale markers. */
+                    customizeText?: (markerValue: { value: any; valueText: string }) => string;
+                    /** Specifies a format for the text displayed in scale markers. */
+                    format?: string;
+                };
+                /** Specifies the height of the marker's separator. */
+                separatorHeight?: number;
+                /** Specifies the space between the marker label and the marker separator. */
+                textLeftIndent?: number;
+                /** Specifies the space between the marker's label and the top edge of the marker's separator. */
+                textTopIndent?: number;
+                /** Specified the indent between the marker and the scale lables. */
+                topIndent?: number;
+                /** Indicates whether scale markers are visible. */
+                visible?: boolean;
+            };
+            /** Specifies the maximum range that can be selected. */
+            maxRange?: any;
+            /** Specifies the number of minor ticks between neighboring major ticks. */
+            minorTickCount?: number;
+            /** Specifies an interval between minor ticks. */
+            minorTickInterval?: any;
+            /** Specifies the minimum range that can be selected. */
+            minRange?: any;
+            /** Specifies the height of the space reserved for the scale in pixels. */
+            placeholderHeight?: number;
+            /** Indicates whether or not to set ticks of a date-time scale at the beginning of each date-time interval. */
+            setTicksAtUnitBeginning?: boolean;
+            /** Specifies whether or not to show ticks for the boundary scale values, when neither major ticks nor minor ticks are created for these values. */
+            showCustomBoundaryTicks?: boolean;
+            /**
+             * Indicates whether or not to show minor ticks on the scale.
+             * @deprecated minorTick\visible.md
+             */
+            showMinorTicks?: boolean;
+            /** Specifies the scale's start value. */
+            startValue?: any;
+            /** Specifies options defining the appearance of scale ticks. */
+            tick?: {
+                /** Specifies the color of scale ticks (both major and minor ticks). */
+                color?: string;
+                /** Specifies the opacity of scale ticks (both major and minor ticks). */
+                opacity?: number;
+                /** Specifies the width of the scale's ticks (both major and minor ticks). */
+                width?: number;
+            };
+            /** Specifies options of the range selector's minor ticks. */
+            minorTick?: {
+                /** Specifies the color of the scale's minor ticks. */
+                color?: string;
+                /** Specifies the opacity of the scale's minor ticks. */
+                opacity?: number;
+                /** Specifies the width of the scale's minor ticks. */
+                width?: number;
+                /** Indicates whether scale minor ticks are visible or not. */
+                visible?: boolean;
+            };
+            /** Specifies the type of the scale. */
+            type?: string;
+            /** Specifies whether or not to expand the current tick interval if labels overlap each other. */
+            useTicksAutoArrangement?: boolean;
+            /** Specifies the type of values on the scale. */
+            valueType?: string;
+			/** Specifies the order of arguments on a discrete scale. */
+			categories?: Array<any>;
+        };
+        /** Specifies the range to be selected when displaying the dxRangeSelector. */
+        selectedRange?: {
+            /** Specifies the start value of the range to be selected when displaying the dxRangeSelector widget on a page. */
+            startValue?: any;
+            /** Specifies the end value of the range to be selected when displaying the dxRangeSelector widget on a page. */
+            endValue?: any;
+        };
+        /** Specifies the color of the selected range. */
+        selectedRangeColor?: string;
+        /** Range selector's indent options. */
+        indent?: {
+            /** Specifies range selector's left indent. */
+            left?: number;
+            /** Specifies range selector's right indent. */
+            right?: number;
+        };
+        /** A handler for the selectedRangeChanged event. */
+        onSelectedRangeChanged?: (e: {
+            startValue: any;
+            endValue: any;
+            component: dxRangeSelector;
+            element: Element;
+        }) => void;
+        /** Specifies range selector shutter options. */
+        shutter?: {
+            /** Specifies shutter color. */
+            color?: string;
+            /** Specifies the opacity of the color of shutters. */
+            opacity?: number;
+        };
+        /** Specifies in pixels the size of the dxRangeSelector widget. */
+        size?: viz.core.Size;
+        /** Specifies the appearance of the range selector's slider handles. */
+        sliderHandle?: {
+            /** Specifies the color of the slider handles. */
+            color?: string;
+            /** Specifies the opacity of the slider handles. */
+            opacity?: number;
+            /** Specifies the width of the slider handles. */
+            width?: number;
+        };
+        /** Defines the options of the range selector slider markers. */
+        sliderMarker?: {
+            /** Specifies the color of the slider markers. */
+            color?: string;
+            /** Specifies a callback function that returns the text to be displayed by slider markers. */
+            customizeText?: (scaleValue: { value: any; valueText: any; }) => string;
+            /** Specifies font options for the text displayed by the range selector slider markers. */
+            font?: viz.core.Font;
+            /** Specifies a format for the text displayed in slider markers. */
+            format?: string;
+            /** Specifies the color used for the slider marker text when the currently selected range does not match the minRange and maxRange values. */
+            invalidRangeColor?: string;
+            /**
+             * Specifies the empty space between the marker's border and the marker’s text.
+             * @deprecated Use the 'paddingTopBottom' and 'paddingLeftRight' options instead
+             */
+            padding?: number;
+            /** Specifies the empty space between the marker's top and bottom borders and the marker's text. */
+            paddingTopBottom?: number;
+            /** Specifies the empty space between the marker's left and right borders and the marker's text. */
+            paddingLeftRight?: number;
+            /** Specifies the placeholder height of the slider marker. */
+            placeholderHeight?: number;
+            /**
+             * Specifies in pixels the height and width of the space reserved for the range selector slider markers.
+             * @deprecated Use the 'placeholderHeight' and 'indent' options instead
+             */
+            placeholderSize?: {
+                /** Specifies the height of the placeholder for the left and right slider markers. */
+                height?: number;
+                /** Specifies the width of the placeholder for the left and right slider markers. */
+                width?: {
+                    /** Specifies the width of the left slider marker's placeholder. */
+                    left?: number;
+                    /** Specifies the width of the right slider marker's placeholder. */
+                    right?: number;
+                };
+            };
+            /** Specifies a precision for the formatted value displayed in slider markers. */
+            precision?: number;
+            /** Indicates whether or not the slider markers are visible. */
+            visible?: boolean;
+        };
+    }
+    /** A widget that allows end users to select a range of values on a scale. */
+    export class dxRangeSelector extends viz.core.BaseWidget {
+        constructor(element: JQuery, options?: dxRangeSelectorOptions);
+        constructor(element: Element, options?: dxRangeSelectorOptions);
+        /** Displays the loading indicator. */
+        showLoadingIndicator(): void;
+        /** Conceals the loading indicator. */
+        hideLoadingIndicator(): void;
+        /** Redraws a widget. */
+        render(skipChartAnimation?: boolean): void;
+        /** Returns the currently selected range. */
+        getSelectedRange(): { startValue: any; endValue: any; };
+        /** Sets a specified range. */
+        setSelectedRange(selectedRange: { startValue: any; endValue: any; }): void;
+    }
+}
+interface JQuery {
+    dxRangeSelector(options?: DevExpress.viz.rangeSelector.dxRangeSelectorOptions): JQuery;
+    dxRangeSelector(methodName: string, ...params: any[]): any;
+    dxRangeSelector(methodName: "instance"): DevExpress.viz.rangeSelector.dxRangeSelector;
+}
+declare namespace DevExpress.viz.map {
+    /** This section describes the fields and methods that can be used in code to manipulate the Layer object. */
+    export interface MapLayer {
+        /** The name of the layer. */
+        name: string;
+        /** The layer index in the layers array. */
+        index: number;
+        /** The layer type. Can be "area", "line" or "marker". */
+        type: string;
+        /** The type of the layer elements. */
+        elementType: string;
+        /** Gets all layer elements. */
+        getElements(): Array<MapLayerElement>;
+        /** Deselects all layer elements. */
+        clearSelection(): void;
+    }
+    /** This section describes the fields and methods that can be used in code to manipulate the Layer Element object. */
+    export interface MapLayerElement {
+        /** The parent layer of the layer element. */
+        layer: MapLayer;
+        /** Gets the layer element coordinates. */
+        coordinates(): Object;
+        /** Sets the value of an attribute. */
+        attribute(name: string, value: any): void;
+        /** Gets the value of an attribute. */
+        attribute(name: string): any;
+        /** Gets the selection state of the layer element. */
+        selected(): boolean;
+        /** Sets the selection state of the layer element. */
+        selected(state: boolean): void;
+        /** Applies the layer element settings and updates element appearance. */
+        applySettings(settings: any): void;
+    }
+    /**
+     * This section describes the fields and methods that can be used in code to manipulate the Area object.
+     * @deprecated Use the "Layer Element" instead
+     */
+    export interface Area {
+        /**
+         * Contains the element type.
+         * @deprecated ..\..\Layer\2 Fields\type.md
+         */
+        type: string;
+        /**
+         * Return the value of an attribute.
+         * @deprecated ..\..\Layer Element\3 Methods\attribute(name_value).md
+         */
+        attribute(name: string): any;
+        /**
+         * Provides information about the selection state of an area.
+         * @deprecated Use the "selected()" method of the Layer Element
+         */
+        selected(): boolean;
+        /**
+         * Sets a new selection state for an area.
+         * @deprecated Use the "selected(state)" method of the Layer Element
+         */
+        selected(state: boolean): void;
+        /**
+         * Applies the area settings specified as a parameter and updates the area appearance.
+         * @deprecated ..\..\Layer Element\3 Methods\applySettings(settings).md
+         */
+        applySettings(settings: any): void;
+    }
+    /**
+     * This section describes the fields and methods that can be used in code to manipulate the Markers object.
+     * @deprecated Use the "Layer Element" instead
+     */
+    export interface Marker {
+        /**
+         * Contains the descriptive text accompanying the map marker.
+         * @deprecated Get the text with the "attribute" method (using the "layers.label.dataField" value)
+         */
+        text: string;
+        /**
+         * Contains the type of the element.
+         * @deprecated ..\..\Layer\2 Fields\type.md
+         */
+        type: string;
+        /**
+         * Contains the URL of an image map marker.
+         * @deprecated Get the url with the "attribute" method (using the "layers.dataField" value)
+         */
+        url: string;
+        /**
+         * Contains the value of a bubble map marker.
+         * @deprecated Get the value with the "attribute" method (using the "layers.dataField" value)
+         */
+        value: number;
+        /**
+         * Contains the values of a pie map marker.
+         * @deprecated Get the values with the "attribute" method (using the "layers.dataField" value)
+         */
+        values: Array<number>;
+        /**
+         * Returns the value of an attribute.
+         * @deprecated ..\..\Layer Element\3 Methods\attribute(name_value).md
+         */
+        attribute(name: string): any;
+        /**
+         * Returns the coordinates of a specific marker.
+         * @deprecated ..\..\Layer Element\3 Methods\coordinates().md
+         */
+        coordinates(): Array<number>;
+        /**
+         * Provides information about the selection state of a marker.
+         * @deprecated Use the "selected()" method of the Layer Element
+         */
+        selected(): boolean;
+        /**
+         * Sets a new selection state for a marker.
+         * @deprecated Use the "selected(state)" method of the Layer Element
+         */
+        selected(state: boolean): void;
+        /**
+         * Applies the marker settings specified as a parameter and updates marker appearance.
+         * @deprecated ..\..\Layer Element\3 Methods\applySettings(settings).md
+         */
+        applySettings(settings: any): void;
+    }
+    export interface MapLayerSettings {
+        /** Specifies the layer name. */
+        name?: string;
+        /** Specifies layer type. */
+        type?: string;
+        /** Specifies the type of a marker element. Setting this option makes sense only if the layer type is "marker". */
+        elementType?: string;
+        /** Specifies a data source for the layer. */
+        data?: any;
+        /** Specifies the line width (for layers of a line type) or width of the layer elements border in pixels. */
+        borderWidth?: number;
+        /** Specifies a color for the border of the layer elements. */
+        borderColor?: string;
+        /** Specifies a color for layer elements. */
+        color?: string;
+        /** Specifies a color for the border of the layer element when it is hovered over. */
+        hoveredBorderColor?: string;
+        /** Specifies the pixel-measured line width (for layers of a line type) or width for the border of the layer element when it is hovered over. */
+        hoveredBorderWidth?: number;
+        /** Specifies a color for a layer element when it is hovered over. */
+        hoveredColor?: string;
+        /** Specifies a pixel-measured line width (for layers of a line type) or width for the border of the layer element when it is selected. */
+        selectedBorderWidth?: number;
+        /** Specifies a color for the border of the layer element when it is selected. */
+        selectedBorderColor?: string;
+        /** Specifies a color for the layer element when it is selected. */
+        selectedColor?: string;
+        /** Specifies the layer opacity (from 0 to 1). */
+        opacity?: number;
+        /** Specifies the size of markers. Setting this option makes sense only if the layer type is "marker" and the elementType is "dot", "pie" or "image". */
+        size?: number;
+        /** Specifies the pixel-measured diameter of the marker that represents the smallest value. Setting this option makes sense only if the layer type is "marker". */
+        minSize?: number;
+        /** Specifies the pixel-measured diameter of the marker that represents the biggest value. Setting this option makes sense only if the layer type is "marker". */
+        maxSize?: number;
+        /** Specifies whether or not to change the appearance of a layer element when it is hovered over. */
+        hoverEnabled?: boolean;
+        /** Specifies whether single or multiple map elements can be selected on a vector map. */
+        selectionMode?: string;
+        /** Specifies the name of the palette or a custom range of colors to be used for coloring a layer. */
+        palette?: any;
+        /** Specifies the number of colors in a palette. */
+        paletteSize?: number;
+        /** Allows you to paint layer elements with similar attributes in the same color. */
+        colorGroups?: Array<number>;
+        /** Specifies the field that provides data to be used for coloring of layer elements. */
+        colorGroupingField?: string;
+        /** Allows you to display bubbles with similar attributes in the same size. Setting this option makes sense only if the layer type is "marker" and the elementType is "bubble". */
+        sizeGroups?: Array<number>;
+        /** Specifies the field that provides data to be used for sizing bubble markers. Setting this option makes sense only if the layer type is "marker" and the elementType is "bubble". */
+        sizeGroupingField?: string;
+        /** Specifies the name of the attribute containing marker data. Setting this option makes sense only if the layer type is "marker" and the elementType is "bubble", "pie" or "image". */
+        dataField?: string;
+        /** Specifies the function that customizes each layer element individually. */
+        customize?: (eleemnts: Array<MapLayerElement>) => void;
+        /** Specifies marker label options. */
+        label?: {
+            /** The name of the data attribute containing marker texts. */
+            dataField?: string;
+            /** Enables marker labels. */
+            enabled?: boolean;
+            /** Specifies font options for marker labels. */
+            font?: viz.core.Font;
+        };
+    }
+    export interface AreaSettings {
+        /**
+         * Specifies the width of the area border in pixels.
+         * @deprecated ..\layers\borderWidth.md
+         */
+        borderWidth?: number;
+        /**
+         * Specifies a color for the area border.
+         * @deprecated ..\layers\borderColor.md
+         */
+        borderColor?: string;
+        /**
+         * Specifies a color for an area.
+         * @deprecated ..\layers\color.md
+         */
+        color?: string;
+        /**
+         * Specifies the function that customizes each area individually.
+         * @deprecated ..\layers\customize.md
+         */
+        customize?: (areaInfo: Area) => AreaSettings;
+        /**
+         * Specifies a color for the area border when the area is hovered over.
+         * @deprecated ..\layers\hoveredBorderColor.md
+         */
+        hoveredBorderColor?: string;
+        /**
+         * Specifies the pixel-measured width of the area border when the area is hovered over.
+         * @deprecated ..\layers\hoveredBorderWidth.md
+         */
+        hoveredBorderWidth?: number;
+        /**
+         * Specifies a color for an area when this area is hovered over.
+         * @deprecated ..\layers\hoveredColor.md
+         */
+        hoveredColor?: string;
+        /**
+         * Specifies whether or not to change the appearance of an area when it is hovered over.
+         * @deprecated ..\layers\hoverEnabled.md
+         */
+        hoverEnabled?: boolean;
+        /**
+         * Configures area labels.
+         * @deprecated ..\..\layers\label\label.md
+         */
+        label?: {
+            /**
+             * Specifies the data field that provides data for area labels.
+             * @deprecated ..\..\layers\label\dataField.md
+             */
+            dataField?: string;
+            /**
+             * Enables area labels.
+             * @deprecated ..\..\layers\label\enabled.md
+             */
+            enabled?: boolean;
+            /**
+             * Specifies font options for area labels.
+             * @deprecated ..\..\..\layers\label\font\font.md
+             */
+            font?: viz.core.Font;
+        };
+        /**
+         * Specifies the name of the palette or a custom range of colors to be used for coloring a map.
+         * @deprecated ..\layers\palette.md
+         */
+        palette?: any;
+        /**
+         * Specifies the number of colors in a palette.
+         * @deprecated ..\layers\paletteSize.md
+         */
+        paletteSize?: number;
+        /**
+         * Allows you to paint areas with similar attributes in the same color.
+         * @deprecated ..\layers\colorGroups.md
+         */
+        colorGroups?: Array<number>;
+        /**
+         * Specifies the field that provides data to be used for coloring areas.
+         * @deprecated ..\layers\colorGroupingField.md
+         */
+        colorGroupingField?: string;
+        /**
+         * Specifies a color for the area border when the area is selected.
+         * @deprecated ..\layers\selectedBorderColor.md
+         */
+        selectedBorderColor?: string;
+        /**
+         * Specifies a color for an area when this area is selected.
+         * @deprecated ..\layers\selectedColor.md
+         */
+        selectedColor?: string;
+        /**
+         * Specifies the pixel-measured width of the area border when the area is selected.
+         * @deprecated ..\layers\selectedBorderWidth.md
+         */
+        selectedBorderWidth?: number;
+        /**
+         * Specifies whether single or multiple areas can be selected on a vector map.
+         * @deprecated ..\layers\selectionMode.md
+         */
+        selectionMode?: string;
+    }
+    export interface MarkerSettings {
+        /**
+         * Specifies a color for the marker border.
+         * @deprecated ..\layers\borderColor.md
+         */
+        borderColor?: string;
+        /**
+         * Specifies the width of the marker border in pixels.
+         * @deprecated ..\layers\borderWidth.md
+         */
+        borderWidth?: number;
+        /**
+         * Specifies a color for a marker of the dot or bubble type.
+         * @deprecated ..\layers\color.md
+         */
+        color?: string;
+        /**
+         * Specifies the function that customizes each marker individually.
+         * @deprecated ..\layers\customize.md
+         */
+        customize?: (markerInfo: Marker) => MarkerSettings;
+        /**
+         * Specifies the pixel-measured width of the marker border when the marker is hovered over.
+         * @deprecated ..\layers\hoveredBorderWidth.md
+         */
+        hoveredBorderWidth?: number;
+        /**
+         * Specifies a color for the marker border when the marker is hovered over.
+         * @deprecated ..\layers\hoveredBorderColor.md
+         */
+        hoveredBorderColor?: string;
+        /**
+         * Specifies a color for a marker of the dot or bubble type when this marker is hovered over.
+         * @deprecated ..\layers\hoveredColor.md
+         */
+        hoveredColor?: string;
+        /**
+         * Specifies whether or not to change the appearance of a marker when it is hovered over.
+         * @deprecated ..\layers\hoverEnabled.md
+         */
+        hoverEnabled?: boolean;
+        /**
+         * Specifies marker label options.
+         * @deprecated ..\..\layers\label\label.md
+         */
+        label?: {
+            /**
+             * Enables marker labels.
+             * @deprecated ..\..\layers\label\enabled.md
+             */
+            enabled?: boolean;
+            /**
+             * Specifies font options for marker labels.
+             * @deprecated ..\..\..\layers\label\font\font.md
+             */
+            font?: viz.core.Font;
+        };
+        /**
+         * Specifies the pixel-measured diameter of the marker that represents the biggest value. Setting this option makes sense only if you use markers of the bubble type.
+         * @deprecated ..\layers\maxSize.md
+         */
+        maxSize?: number;
+        /**
+         * Specifies the pixel-measured diameter of the marker that represents the smallest value. Setting this option makes sense only if you use markers of the bubble type.
+         * @deprecated ..\layers\minSize.md
+         */
+        minSize?: number;
+        /**
+         * Specifies the opacity of markers. Setting this option makes sense only if you use markers of the bubble type.
+         * @deprecated ..\layers\opacity.md
+         */
+        opacity?: number;
+        /**
+         * Specifies the pixel-measured width of the marker border when the marker is selected.
+         * @deprecated ..\layers\selectedBorderWidth.md
+         */
+        selectedBorderWidth?: number;
+        /**
+         * Specifies a color for the marker border when the marker is selected.
+         * @deprecated ..\layers\selectedBorderColor.md
+         */
+        selectedBorderColor?: string;
+        /**
+         * Specifies a color for a marker of the dot or bubble type when this marker is selected.
+         * @deprecated ..\layers\selectedColor.md
+         */
+        selectedColor?: string;
+        /**
+         * Specifies whether a single or multiple markers can be selected on a vector map.
+         * @deprecated ..\layers\selectionMode.md
+         */
+        selectionMode?: string;
+        /**
+         * Specifies the size of markers. Setting this option makes sense for any type of marker except bubble.
+         * @deprecated ..\layers\size.md
+         */
+        size?: number;
+        /**
+         * Specifies the type of markers to be used on the map.
+         * @deprecated ..\layers\elementType.md
+         */
+        type?: string;
+        /**
+         * Specifies the name of a palette or a custom set of colors to be used for coloring markers of the pie type.
+         * @deprecated ..\layers\palette.md
+         */
+        palette?: any;
+        /**
+         * Allows you to paint markers with similar attributes in the same color.
+         * @deprecated ..\layers\colorGroups.md
+         */
+        colorGroups?: Array<number>;
+        /**
+         * Specifies the field that provides data to be used for coloring markers.
+         * @deprecated ..\layers\colorGroupingField.md
+         */
+        colorGroupingField?: string;
+        /**
+         * Allows you to display bubbles with similar attributes in the same size.
+         * @deprecated ..\layers\sizeGroups.md
+         */
+        sizeGroups?: Array<number>;
+        /**
+         * Specifies the field that provides data to be used for sizing bubble markers.
+         * @deprecated ..\layers\sizeGroupingField.md
+         */
+        sizeGroupingField?: string;
+    }
+    export interface dxVectorMapOptions extends viz.core.BaseWidgetOptions {
+        /**
+         * An object specifying options for the map areas.
+         * @deprecated Use the 'layers' option instead
+         */
+        areaSettings?: AreaSettings;
+        /** Specifies the options for the map background. */
+        background?: {
+            /** Specifies a color for the background border. */
+            borderColor?: string;
+            /** Specifies a color for the background. */
+            color?: string;
+        };
+        /** Specifies options for dxVectorMap widget layers. */
+        layers?: Array<MapLayerSettings>;
+        /** Specifies the map projection. */
+        projection?: Object;
+        /** Specifies the positioning of a map in geographical coordinates. */
+        bounds?: Array<number>;
+        /** Specifies the options of the control bar. */
+        controlBar?: {
+            /** Specifies a color for the outline of the control bar elements. */
+            borderColor?: string;
+            /** Specifies a color for the inner area of the control bar elements. */
+            color?: string;
+            /** Specifies whether or not to display the control bar. */
+            enabled?: boolean;
+            /** Specifies the margin of the control bar in pixels. */
+            margin?: number;
+            /** Specifies the position of the control bar. */
+            horizontalAlignment?: string;
+            /** Specifies the position of the control bar. */
+            verticalAlignment?: string;
+            /** Specifies the opacity of the Control_Bar. */
+            opacity?: number;
+        };
+        /** Specifies the appearance of the loading indicator. */
+        loadingIndicator?: viz.core.LoadingIndicator;
+        /**
+         * Specifies a data source for the map area.
+         * @deprecated Use the 'layers.data' option instead
+         */
+        mapData?: any;
+        /**
+         * Specifies a data source for the map markers.
+         * @deprecated Use the 'layers.data' option instead
+         */
+        markers?: any;
+        /**
+         * An object specifying options for the map markers.
+         * @deprecated Use the 'layers' option instead
+         */
+        markerSettings?: MarkerSettings;
+        /** Specifies the size of the dxVectorMap widget. */
+        size?: viz.core.Size;
+        /** Specifies a title for the vector map. */
+        title?: viz.core.Title;
+        /** Specifies tooltip options. */
+        tooltip?: viz.core.Tooltip;
+        /** Configures map legends. */
+        legends?: Array<Legend>;
+        /** Specifies whether or not the map should respond when a user rolls the mouse wheel. */
+        wheelEnabled?: boolean;
+        /** Specifies whether the map should respond to touch gestures. */
+        touchEnabled?: boolean;
+        /** Disables the zooming capability. */
+        zoomingEnabled?: boolean;
+        /** Specifies the geographical coordinates of the center for a map. */
+        center?: Array<number>;
+        /** A handler for the centerChanged event. */
+        onCenterChanged?: (e: {
+			center: Array<number>;
+			component: dxVectorMap;
+			element: Element;
+        }) => void;
+        /** A handler for the tooltipShown event. */
+        onTooltipShown?: (e: {
+            component: dxVectorMap;
+            element: Element;
+            target: {};
+        }) => void;
+        /** A handler for the tooltipHidden event. */
+        onTooltipHidden?: (e: {
+            component: dxVectorMap;
+            element: Element;
+            target: {};
+        }) => void;
+        /** Specifies a number that is used to zoom a map initially. */
+        zoomFactor?: number;
+        /** Specifies a map's maximum zoom factor. */
+        maxZoomFactor?: number;
+        /** A handler for the zoomFactorChanged event. */
+        onZoomFactorChanged?: (e: {
+            component: dxVectorMap;
+            element: Element;
+            zoomFactor: number;
+        }) => void;
+        /** A handler for the click event. */
+        onClick?: any;
+        /** A handler for the selectionChanged event. */
+        onSelectionChanged?: (e: {
+            component: dxVectorMap;
+            element: Element;
+            target: MapLayerElement;
+        }) => void;
+        /**
+         * A handler for the areaClick event.
+         * @deprecated Use the 'onClick' option instead
+         */
+        onAreaClick?: any;
+        /**
+         * A handler for the areaSelectionChanged event.
+         * @deprecated Use the 'onSelectionChanged' option instead
+         */
+        onAreaSelectionChanged?: (e: {
+            target: Area;
+            component: dxVectorMap;
+            element: Element;
+        }) => void;
+        /**
+         * A handler for the markerClick event.
+         * @deprecated Use the 'onClick' option instead
+         */
+        onMarkerClick?: any;
+        /**
+         * A handler for the markerSelectionChanged event.
+         * @deprecated Use the 'onSelecitonChanged' option instead
+         */
+        onMarkerSelectionChanged?: (e: {
+            target: Marker;
+            component: dxVectorMap;
+            element: Element;
+        }) => void;
+        /** Disables the panning capability. */
+        panningEnabled?: boolean;
+    }
+    export interface Legend extends viz.core.BaseLegend {
+        /** Specifies the color of item markers in the legend. The specified color applied only when the legend uses 'size' source. */
+        markerColor?: string;
+        /** Specifies text for legend items. */
+        customizeText?: (itemInfo: { start: number; end: number; index: number; color: string; size: number; }) => string;
+        /** Specifies text for a hint that appears when a user hovers the mouse pointer over the text of a legend item. */
+        customizeHint?: (itemInfo: { start: number; end: number; index: number; color: string; size: number }) => string;
+        /** Specifies the source of data for the legend. */
+        source?: {
+            /** Specifies a layer to which the legend belongs. */
+            layer?: string;
+            /** Specifies the type of the legend grouping. */
+            grouping?: string;
+        }
+    }
+    /** A vector map widget. */
+    export class dxVectorMap extends viz.core.BaseWidget {
+        constructor(element: JQuery, options?: dxVectorMapOptions);
+        constructor(element: Element, options?: dxVectorMapOptions);
+        /** Displays the loading indicator. */
+        showLoadingIndicator(): void;
+        /** Conceals the loading indicator. */
+        hideLoadingIndicator(): void;
+        /** Redraws a widget. */
+        render(): void;
+        /** Gets the current coordinates of the map center. */
+        center(): Array<number>;
+        /** Sets the coordinates of the map center. */
+        center(centerCoordinates: Array<number>): void;
+        /**
+         * Deselects all the selected areas on a map. The areas are displayed in their initial style after.
+         * @deprecated Use the 'clearSelection' method on a layer instead
+         */
+        clearAreaSelection(): void;
+        /**
+         * Deselects all the selected markers on a map. The markers are displayed in their initial style after.
+         * @deprecated Use the 'clearSelection' method on a layer instead
+         */
+        clearMarkerSelection(): void;
+        /** Deselects all the selected area and markers on a map at once. The areas and markers are displayed in their initial style after. */
+        clearSelection(): void;
+        /** Converts client area coordinates into map coordinates. */
+        convertCoordinates(x: number, y: number): Array<number>;
+        /** Gets all map layers. */
+        getLayers(): Array<MapLayer>;
+        /** Gets the layer by its index. */
+        getLayerByIndex(index: number): MapLayer;
+        /** Gets the layer by its name. */
+        getLayerByName(name: string): MapLayer;
+        /**
+         * Returns an array with all the map areas.
+         * @deprecated Use the 'getElements' method on a layer instead
+         */
+        getAreas(): Array<Area>;
+        /**
+         * Returns an array with all the map markers.
+         * @deprecated Use the 'getElements' method on a layer instead
+         */
+        getMarkers(): Array<Marker>;
+        /** Gets the current coordinates of the map viewport. */
+        viewport(): Array<any>;
+        /** Sets the coordinates of the map viewport. */
+        viewport(viewportCoordinates: Array<number>): void;
+        /** Gets the current value of the map zoom factor. */
+        zoomFactor(): number;
+        /** Sets the value of the map zoom factor. */
+        zoomFactor(zoomFactor: number): void;
+    }
+    export var projection: ProjectionCreator;
+    export interface ProjectionCreator {
+        /** Creates a new projection. */
+        (data: {
+            to?: (coordinates: Array<number>) => Array<number>;
+            from?: (coordinates: Array<number>) => Array<number>;
+            aspectRatio?: number;
+        }): Object;
+        /** Gets the default or custom projection from the projection storage. */
+        get(name: string): Object;
+        /** Adds a new projection to the internal projections storage. */
+        add(name: string, projection: Object): void;
+    }
+}
+interface JQuery {
+    dxVectorMap(options?: DevExpress.viz.map.dxVectorMapOptions): JQuery;
+    dxVectorMap(methodName: string, ...params: any[]): any;
+    dxVectorMap(methodName: "instance"): DevExpress.viz.map.dxVectorMap;
+}
+declare namespace DevExpress.viz.sparklines {
+    export interface SparklineTooltip extends viz.core.Tooltip {
+        /**
+         * Specifies how a tooltip is horizontally aligned relative to the graph.
+         * @deprecated Tooltip alignment is no more available.
+         */
+        horizontalAlignment?: string;
+        /**
+         * Specifies how a tooltip is vertically aligned relative to the graph.
+         * @deprecated Tooltip alignment is no more available.
+         */
+        verticalAlignment?: string;
+    }
+    export interface BaseSparklineOptions extends viz.core.BaseWidgetOptions {
+        /** Specifies the blank space between the widget's extreme elements and the boundaries of the area provided for the widget in pixels. */
+        margin?: viz.core.Margins;
+        /** Specifies the size of the widget. */
+        size?: viz.core.Size;
+        /** Specifies tooltip options. */
+        tooltip?: SparklineTooltip;
+        /** A handler for the tooltipShown event. */
+        onTooltipShown?: (e: {
+            component: BaseSparkline;
+            element: Element;
+        }) => void;
+        /** A handler for the tooltipHidden event. */
+        onTooltipHidden?: (e: {
+            component: BaseSparkline;
+            element: Element;
+        }) => void;
+    }
+    /** Overridden by descriptions for particular widgets. */
+    export class BaseSparkline extends viz.core.BaseWidget {
+        /** Redraws a widget. */
+        render(): void;
+    }
+    export interface dxBulletOptions extends BaseSparkline {
+        /** Specifies a color for the bullet bar. */
+        color?: string;
+        /** Specifies an end value for the invisible scale. */
+        endScaleValue?: number;
+        /** Specifies whether or not to show the target line. */
+        showTarget?: boolean;
+        /** Specifies whether or not to show the line indicating zero on the invisible scale. */
+        showZeroLevel?: boolean;
+        /** Specifies a start value for the invisible scale. */
+        startScaleValue?: number;
+        /** Specifies the value indicated by the target line. */
+        target?: number;
+        /** Specifies a color for both the target and zero level lines. */
+        targetColor?: string;
+        /** Specifies the width of the target line. */
+        targetWidth?: number;
+        /** Specifies the primary value indicated by the bullet bar. */
+        value?: number;
+    }
+    /** A bullet graph widget. */
+    export class dxBullet extends BaseSparkline {
+        constructor(element: JQuery, options?: dxBulletOptions);
+        constructor(element: Element, options?: dxBulletOptions);
+    }
+    export interface dxSparklineOptions extends BaseSparklineOptions {
+        /** Specifies the data source field that provides arguments for a sparkline. */
+        argumentField?: string;
+        /** Sets a color for the bars indicating negative values. Available for a sparkline of the bar type only. */
+        barNegativeColor?: string;
+        /** Sets a color for the bars indicating positive values. Available for a sparkline of the bar type only. */
+        barPositiveColor?: string;
+        /** Specifies a data source for the sparkline. */
+        dataSource?: Array<any>;
+        /** Sets a color for the boundary of both the first and last points on a sparkline. */
+        firstLastColor?: string;
+        /** Specifies whether a sparkline ignores null data points or not. */
+        ignoreEmptyPoints?: boolean;
+        /** Sets a color for a line on a sparkline. Available for the sparklines of the line- and area-like types. */
+        lineColor?: string;
+        /** Specifies a width for a line on a sparkline. Available for the sparklines of the line- and area-like types. */
+        lineWidth?: number;
+        /** Sets a color for the bars indicating the values that are less than the winloss threshold. Available for a sparkline of the winloss type only. */
+        lossColor?: string;
+        /** Sets a color for the boundary of the maximum point on a sparkline. */
+        maxColor?: string;
+        /** Sets a color for the boundary of the minimum point on a sparkline. */
+        minColor?: string;
+        /** Sets a color for points on a sparkline. Available for the sparklines of the line- and area-like types. */
+        pointColor?: string;
+        /** Specifies the diameter of sparkline points in pixels. Available for the sparklines of line- and area-like types. */
+        pointSize?: number;
+        /** Specifies a symbol to use as a point marker on a sparkline. Available for the sparklines of the line- and area-like types. */
+        pointSymbol?: string;
+        /** Specifies whether or not to indicate both the first and last values on a sparkline. */
+        showFirstLast?: boolean;
+        /** Specifies whether or not to indicate both the minimum and maximum values on a sparkline. */
+        showMinMax?: boolean;
+        /** Determines the type of a sparkline. */
+        type?: string;
+        /** Specifies the data source field that provides values for a sparkline. */
+        valueField?: string;
+        /** Sets a color for the bars indicating the values greater than a winloss threshold. Available for a sparkline of the winloss type only. */
+        winColor?: string;
+        /** Specifies a value that serves as a threshold for the sparkline of the winloss type. */
+        winlossThreshold?: number;
+        /** Specifies the minimum value of the sparkline value axis. */
+        minValue?: number;
+        /** Specifies the maximum value of the sparkline's value axis. */
+        maxValue?: number;
+    }
+    /** A sparkline widget. */
+    export class dxSparkline extends BaseSparkline {
+        constructor(element: JQuery, options?: dxSparklineOptions);
+        constructor(element: Element, options?: dxSparklineOptions);
+    }
+}
+interface JQuery {
+    dxBullet(options?: DevExpress.viz.sparklines.dxBulletOptions): JQuery;
+    dxBullet(methodName: string, ...params: any[]): any;
+    dxBullet(methodName: "instance"): DevExpress.viz.sparklines.dxBullet;
+    dxSparkline(options?: DevExpress.viz.sparklines.dxSparklineOptions): JQuery;
+    dxSparkline(methodName: string, ...params: any[]): any;
+    dxSparkline(methodName: "instance"): DevExpress.viz.sparklines.dxSparkline;
+}
diff --git a/devextreme/devextreme-tests.ts b/devextreme/devextreme-tests.ts
index 33e00bda32..a38aae1f05 100644
--- a/devextreme/devextreme-tests.ts
+++ b/devextreme/devextreme-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="devextreme.d.ts" />
+
 
 namespace Tests.ui {
     var dataGridOptions: DevExpress.ui.dxDataGridOptions = {
diff --git a/devextreme/devextreme.d.ts b/devextreme/devextreme.d.ts
deleted file mode 100644
index df967b19f3..0000000000
--- a/devextreme/devextreme.d.ts
+++ /dev/null
@@ -1,7429 +0,0 @@
-// Type definitions for DevExtreme 15.2.7
-// Project: http://js.devexpress.com/
-// Definitions by: DevExpress Inc. <http://devexpress.com/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace DevExpress {
-    /** A mixin that provides a capability to fire and subscribe to events. */
-    export interface EventsMixin<T> {
-        /** Subscribes to a specified event. */
-        on(eventName: string, eventHandler: Function): T;
-        /** Subscribes to the specified events. */
-        on(events: { [eventName: string]: Function; }): T;
-        /** Detaches all event handlers from the specified event. */
-        off(eventName: string): Object;
-        /** Detaches a particular event handler from the specified event. */
-        off(eventName: string, eventHandler: Function): T;
-    }
-    /** An object that serves as a namespace for the methods required to perform validation. */
-    export module validationEngine {
-        export interface IValidator {
-            validate(): ValidatorValidationResult;
-            reset(): void;
-        }
-        export interface ValidatorValidationResult {
-            isValid: boolean;
-            name?: string;
-            value: any;
-            brokenRule: any;
-            validationRules: any[];
-        }
-        export interface ValidationGroupValidationResult {
-            isValid: boolean;
-            brokenRules: any[];
-            validators: IValidator[];
-        }
-        export interface GroupConfig extends EventsMixin<GroupConfig>  {
-            group: any;
-            validators: IValidator[];
-            validate(): ValidationGroupValidationResult;
-            reset(): void;
-        }
-        /** Provides access to the object that represents the specified validation group. */
-        export function getGroupConfig(group: any): GroupConfig
-        /** Provides access to the object that represents the default validation group. */
-        export function getGroupConfig(): GroupConfig
-        /** Validates rules of the validators that belong to the specified validation group. */
-        export function validateGroup(group: any): ValidationGroupValidationResult;
-        /** Validates rules of the validators that belong to the default validation group. */
-        export function validateGroup(): ValidationGroupValidationResult;
-        /** Resets the values and validation result of the editors that belong to the specified validation group. */
-        export function resetGroup(group: any): void;
-        /** Resets the values and validation result of the editors that belong to the default validation group. */
-        export function resetGroup(): void;
-        /** Validates the rules that are defined within the dxValidator objects that are registered for the specified ViewModel. */
-        export function validateModel(model: Object): ValidationGroupValidationResult;
-        /** Registers all the dxValidator objects by which the fields of the specified ViewModel are extended. */
-        export function registerModelForValidation(model: Object) : void;
-    }
-    export var hardwareBackButton: JQueryCallback;
-    /** Processes the hardware back button click. */
-    export function processHardwareBackButton(): void;
-    /** Hides the last displayed overlay widget. */
-    export function hideTopOverlay(): boolean;
-    /** Specifies whether or not the entire application/site supports right-to-left representation. */
-    export var rtlEnabled: boolean;
-    /** Registers a new component in the DevExpress.ui namespace as a jQuery plugin, Angular directive and Knockout binding. */
-    export function registerComponent(name: string, componentClass: Object): void;
-    /** Registers a new component in the specified namespace as a jQuery plugin, Angular directive and Knockout binding. */
-    export function registerComponent(name: string, namespace: Object, componentClass: Object): void;
-    export function requestAnimationFrame(callback: Function): number;
-    export function cancelAnimationFrame(requestID: number): void;
-    /** Custom Knockout binding that links an HTML element with a specific action. */
-    export class Action { }
-    /** Used to get URLs that vary in a locally running application and the application running on production. */
-    export class EndpointSelector {
-        constructor(options: {
-            [key: string]: {
-                local?: string;
-                production?: string;
-            }
-        });
-        /** Returns a local or a productional URL depending on how the application is currently running. */
-        urlFor(key: string): string;
-    }
-    /** An object that serves as a namespace for the methods that are used to animate UI elements. */
-    export module fx {
-        /** Defines animation options. */
-        export interface AnimationOptions {
-            /** A function called after animation is completed. */
-            complete?: (element: JQuery, config: AnimationOptions) => void;
-            /** A number specifying wait time before animation execution. */
-            delay?: number;
-            /** A number specifying the time period to wait before the animation of the next stagger item starts. */
-            staggerDelay?: number;
-            /** A number specifying the time in milliseconds spent on animation. */
-            duration?: number;
-            /** A string specifying the type of an easing function used for animation. */
-            easing?: string;
-            /** Specifies the initial animation state. */
-            from?: any;
-            /** A function called before animation is started. */
-            start?: (element: JQuery, config: AnimationOptions) => void;
-            /** Specifies a final animation state. */
-            to?: any;
-            /** A string value specifying the animation type. */
-            type?: string;
-            /** Specifies the animation direction for the "slideIn" and "slideOut" animation types. */
-            direction?: string;
-        }
-        /** Animates the specified element. */
-        export function animate(element: HTMLElement, config: AnimationOptions): Object;
-        /** Returns a value indicating whether the specified element is being animated. */
-        export function isAnimating(element: HTMLElement): boolean;
-        /** Stops the animation. */
-        export function stop(element: HTMLElement, jumpToEnd: boolean): void;
-    }
-    /** The manager that performs several specified animations at a time. */
-    export class TransitionExecutor {
-        /** Deletes all the animations registered in the Transition Executor by using the enter(elements, animation) and leave(elements, animation) methods. */
-        reset(): void;
-        /** Registers a set of elements that should be animated as "entering" using the specified animation configuration. */
-        enter(elements: JQuery, animation: any): void;
-        /** Registers a set of elements that should be animated as "leaving" using the specified animation configuration. */
-        leave(elements: JQuery, animation: any): void;
-        /** Starts all the animations registered using the enter(elements, animation) and leave(elements, animation) methods beforehand. */
-        start(config: Object): JQueryPromise<void>;
-        /** Stops all started animations. */
-        stop(): void;
-    }
-    export class AnimationPresetCollection {
-        /** Resets all the changes made in the animation repository. */
-        resetToDefaults(): void;
-        /** Deletes the specified animation or clears all the animation repository, if an animation name is not passed. */
-        clear(name: string): void;
-        /** Adds the specified animation preset to the animation repository by the specified name. */
-        registerPreset(name: string, config: any): void;
-        /** Applies the changes made in the animation repository. */
-        applyChanges(): void;
-        /** Returns the configuration of the animation found in the animation repository by the specified name for the current device. */
-        getPreset(name: string): void;
-        /** Registers predefined animations in the animation repository. */
-        registerDefaultPresets(): void;
-    }
-    /** A repository of animations. */
-    export var animationPresets: AnimationPresetCollection;
-    /** The device object defines the device on which the application is running. */
-    export interface Device {
-        /** Indicates whether or not the device platform is Android. */
-        android?: boolean;
-        /** Specifies the type of the device on which the application is running. */
-        deviceType?: string;
-        /** Indicates whether or not the device platform is generic, which means that the application will look and behave according to a generic "light" or "dark" theme. */
-        generic?: boolean;
-        /** Indicates whether or not the device platform is iOS. */
-        ios?: boolean;
-        /** Indicates whether or not the device type is 'phone'. */
-        phone?: boolean;
-        /** Specifies the platform of the device on which the application is running. */
-        platform?: string;
-        /** Indicates whether or not the device type is 'tablet'. */
-        tablet?: boolean;
-        /** Specifies an array with the major and minor versions of the device platform. */
-        version?: Array<number>;
-        /** Indicates whether or not the device platform is Windows. */
-        win?: boolean;
-        /** Specifies a performance grade of the current device. */
-        grade?: string;
-    }
-    export class Devices implements EventsMixin<Devices> {
-        constructor(options: { window: Window });
-        /** Overrides actual device information to force the application to operate as if it was running on the specified device. */
-        current(deviceName: any): void;
-        /** Returns information about the current device. */
-        current(): Device;
-        orientationChanged: JQueryCallback;
-        /** Returns the current device orientation. */
-        orientation(): string;
-        /** Returns real information about the current device regardless of the value passed to the devices.current(deviceName) method. */
-        real(): Device;
-        on(eventName: "orientationChanged", eventHandler: (e: { orientation: string }) => void): Devices;
-        on(eventName: string, eventHandler: Function): Devices;
-        on(events: { [eventName: string]: Function; }): Devices;
-        off(eventName: "orientationChanged"): Devices;
-        off(eventName: string): Devices;
-        off(eventName: "orientationChanged", eventHandler: (e: { orientation: string }) => void): Devices;
-        off(eventName: string, eventHandler: Function): Devices;
-    }
-    /** An object that serves as a namespace for the methods and events specifying information on the current device. */
-    export var devices: Devices;
-    /** The position object specifies the widget positioning options. */
-    export interface PositionOptions {
-        /** The target element position that the widget is positioned against. */
-        at?: string;
-        /** The element within which the widget is positioned. */
-        boundary?: Element;
-        /** A string value holding horizontal and vertical offset from the window's boundaries. */
-        boundaryOffset?: string;
-        /** Specifies how to move the widget if it overflows the screen. */
-        collision?: any;
-        /** The position of the widget to align against the target element. */
-        my?: string;
-        /** The target element that the widget is positioned against. */
-        of?: HTMLElement;
-        /** A string value holding horizontal and vertical offset in pixels, separated by a space (e.g., "5 -10"). */
-        offset?: string;
-    }
-    export interface ComponentOptions {
-        /** A handler for the initialized event. */
-        onInitialized?: Function;
-        /** A handler for the optionChanged event. */
-        onOptionChanged?: Function;
-        /** A handler for the disposing event. */
-        onDisposing?: Function;
-    }
-    /** A base class for all components and widgets. */
-    export class Component {
-        constructor(options?: ComponentOptions)
-        /** Prevents the component from refreshing until the endUpdate method is called. */
-        beginUpdate(): void;
-        /** Enables the component to refresh after the beginUpdate method call. */
-        endUpdate(): void;
-        /** Returns an instance of this component class. */
-        instance(): Component;
-        /** Returns the configuration options of this component. */
-        option(): {
-            [optionKey: string]: any;
-        };
-        /** Sets one or more options of this component. */
-        option(options: {
-            [optionKey: string]: any;
-        }): void;
-        /** Gets the value of the specified configuration option of this component. */
-        option(optionName: string): any;
-        /** Sets a value to the specified configuration option of this component. */
-        option(optionName: string, optionValue: any): void;
-    }
-    export interface DOMComponentOptions extends ComponentOptions {
-        /** Specifies whether or not the current component supports a right-to-left representation. */
-        rtlEnabled?: boolean;
-        /** Specifies the height of the widget. */
-        height?: any;
-        /** Specifies the width of the widget. */
-        width?: any;
-    }
-    /** A base class for all components. */
-    export class DOMComponent extends Component {
-        constructor(element: JQuery, options?: DOMComponentOptions);
-        constructor(element: HTMLElement, options?: DOMComponentOptions);
-        /** Returns the root HTML element of the widget. */
-        element(): JQuery;
-        /** Specifies the device-dependent default configuration options for this component. */
-        static defaultOptions(rule: {
-            device?: any;
-            options?: any;
-        }): void;
-    }
-    export module data {
-        export interface ODataError extends Error {
-            httpStatus?: number;
-            errorDetails?: any;
-        }
-        export interface StoreOptions {
-            /** A handler for the modified event. */
-            onModified?: () => void;
-            /** A handler for the modifying event. */
-            onModifying?: () => void;
-            /** A handler for the removed event. */
-            onRemoved?: (key: any) => void;
-            /** A handler for the removing event. */
-            onRemoving?: (key: any) => void;
-            /** A handler for the updated event. */
-            onUpdated?: (key: any, values: Object) => void;
-            /** A handler for the updating event. */
-            onUpdating?: (key: any, values: Object) => void;
-            /** A handler for the loaded event. */
-            onLoaded?: (result: Array<any>) => void;
-            /** A handler for the loading event. */
-            onLoading?: (loadOptions: LoadOptions) => void;
-            /** A handler for the inserted event. */
-            onInserted?: (values: Object, key: any) => void;
-            /** A handler for the inserting event. */
-            onInserting?: (values: Object) => void;
-            /** Specifies the function called when the Store causes an error. */
-            errorHandler?: (e: Error) => void;
-            /** Specifies the key properties within the data associated with the Store. */
-            key?: any;
-        }
-        export interface LoadOptions {
-            filter?: Object;
-            sort?: Object;
-            select?: Object;
-            expand?: Object;
-            group?: Object;
-            skip?: number;
-            take?: number;
-            userData?: Object;
-            requireTotalCount?: boolean;
-        }
-        /** The base class for all Stores. */
-        export class Store implements EventsMixin<Store> {
-            constructor(options?: StoreOptions);
-            /** Returns the data item specified by the key. */
-            byKey(key: any): JQueryPromise<any>;
-            /** Adds an item to the data associated with this Store. */
-            insert(values: Object): JQueryPromise<any>;
-            /** Returns the key expression specified via the key configuration option. */
-            key(): any;
-            /** Returns the key of the Store item that matches the specified object. */
-            keyOf(obj: Object): any;
-            /** Starts loading data. */
-            load(obj?: LoadOptions): JQueryPromise<any[]>;
-            /** Removes the data item specified by the key. */
-            remove(key: any): JQueryPromise<any>;
-            /** Obtains the total count of items that will be returned by the load() function. */
-            totalCount(options?: {
-                filter?: Object;
-                group?: Object;
-            }): JQueryPromise<any>;
-            /** Updates the data item specified by the key. */
-            update(key: any, values: Object): JQueryPromise<any>;
-            on(eventName: "removing", eventHandler: (key: any) => void): Store;
-            on(eventName: "removed", eventHandler: (key: any) => void): Store;
-            on(eventName: "updating", eventHandler: (key: any, values: Object) => void): Store;
-            on(eventName: "updated", eventHandler: (key: any, values: Object) => void): Store;
-            on(eventName: "inserting", eventHandler: (values: Object) => void): Store;
-            on(eventName: "inserted", eventHandler: (values: Object, key: any) => void): Store;
-            on(eventName: "modifying", eventHandler: () => void): Store;
-            on(eventName: "modified", eventHandler: () => void): Store;
-            on(eventName: "loading", eventHandler: (loadOptions: LoadOptions) => void): Store;
-            on(eventName: "loaded", eventHandler: (result: Array<any>) => void): Store;
-            on(eventName: string, eventHandler: Function): Store;
-            on(events: { [eventName: string]: Function; }): Store;
-            off(eventName: "removing"): Store;
-            off(eventName: "removed"): Store;
-            off(eventName: "updating"): Store;
-            off(eventName: "updated"): Store;
-            off(eventName: "inserting"): Store;
-            off(eventName: "inserted"): Store;
-            off(eventName: "modifying"): Store;
-            off(eventName: "modified"): Store;
-            off(eventName: "loading"): Store;
-            off(eventName: "loaded"): Store;
-            off(eventName: string): Store;
-            off(eventName: "removing", eventHandler: (key: any) => void): Store;
-            off(eventName: "removed", eventHandler: (key: any) => void): Store;
-            off(eventName: "updating", eventHandler: (key: any, values: Object) => void): Store;
-            off(eventName: "updated", eventHandler: (key: any, values: Object) => void): Store;
-            off(eventName: "inserting", eventHandler: (values: Object) => void): Store;
-            off(eventName: "inserted", eventHandler: (values: Object, key: any) => void): Store;
-            off(eventName: "modifying", eventHandler: () => void): Store;
-            off(eventName: "modified", eventHandler: () => void): Store;
-            off(eventName: "loading", eventHandler: (loadOptions: LoadOptions) => void): Store;
-            off(eventName: "loaded", eventHandler: (result: Array<any>) => void): Store;
-            off(eventName: string, eventHandler: Function): Store;
-        }
-        export interface ArrayStoreOptions extends StoreOptions {
-            /** Specifies the array associated with this Store. */
-            data?: Array<any>;
-        }
-        /** A Store accessing an in-memory array. */
-        export class ArrayStore extends Store {
-            constructor(options?: ArrayStoreOptions);
-            /** Clears all data associated with the current ArrayStore. */
-            clear(): void;
-            /** Creates the Query object for the underlying array. */
-            createQuery(): Query;
-        }
-        interface Promise {
-            then(doneFn?: Function, failFn?: Function, progressFn?: Function): Promise;
-        }
-        export interface CustomStoreOptions extends StoreOptions {
-            /** The user implementation of the byKey(key, extraOptions) method. */
-            byKey?: (key: any) => Promise;
-            /** The user implementation of the insert(values) method. */
-            insert?: (values: Object) => Promise;
-            /** The user implementation of the load(options) method. */
-            load?: (options?: LoadOptions) => Promise;
-            /** The user implementation of the remove(key) method. */
-            remove?: (key: any) => Promise;
-            /** The user implementation of the totalCount(options) method. */
-            totalCount?: (options?: {
-                filter?: Object;
-                group?: Object;
-            }) => Promise;
-            /** The user implementation of the update(key, values) method. */
-            update?: (key: any, values: Object) => Promise;
-        }
-        /** A Store object that enables you to implement your own data access logic. */
-        export class CustomStore extends Store {
-            constructor(options: CustomStoreOptions);
-        }
-        export interface DataSourceOptions {
-            /** Specifies data filtering conditions. */
-            filter?: Object;
-            /** Specifies data grouping conditions. */
-            group?: Object;
-            /** The item mapping function. */
-            map?: (record: any) => any;
-            /** Specifies the maximum number of items the page can contain. */
-            pageSize?: number;
-            /** Specifies whether a DataSource loads data by pages, or all items at once. */
-            paginate?: boolean;
-            /** The data post processing function. */
-            postProcess?: (data: any[]) => any[];
-            /** Specifies a value by which the required items are searched. */
-            searchExpr?: Object;
-            /** Specifies the comparison operation used to search for the required items. */
-            searchOperation?: string;
-            /** Specifies the value to which the search expression is compared. */
-            searchValue?: Object;
-            /** Specifies the initial select option value. */
-            select?: Object;
-            /** An array of the strings that represent the names of the navigation properties to be loaded simultaneously with the OData store's entity. */
-            expand?: Object;
-            /** Specifies whether or not the DataSource instance requests the total count of items available in the storage. */
-            requireTotalCount?: boolean;
-            /** Specifies the initial sort option value. */
-            sort?: Object;
-            /** Specifies the underlying Store instance used to access data. */
-            store?: any;
-            /** A handler for the changed event. */
-            onChanged?: () => void;
-            /** A handler for the loadingChanged event. */
-            onLoadingChanged?: (isLoading: boolean) => void;
-            /** A handler for the loadError event. */
-            onLoadError?: (e?: Error) => void;
-        }
-        /** An object that provides access to a data web service or local data storage for collection container widgets. */
-        export class DataSource implements EventsMixin<DataSource> {
-            constructor(url: string);
-            constructor(data: Array<any>);
-            constructor(options: CustomStoreOptions);
-            constructor(options: DataSourceOptions);
-            /** Disposes all resources associated with this DataSource. */
-            dispose(): void;
-            /** Returns the current filter option value. */
-            filter(): Object;
-            /** Sets the filter option value. */
-            filter(filterExpr: Object): void;
-            /** Returns the current group option value. */
-            group(): Object;
-            /** Sets the group option value. */
-            group(groupExpr: Object): void;
-            /** Indicates whether or not the current page contains fewer items than the number of items specified by the pageSize configuration option. */
-            isLastPage(): boolean;
-            /** Indicates whether or not at least one load() method execution has successfully finished. */
-            isLoaded(): boolean;
-            /** Indicates whether or not the DataSource is currently being loaded. */
-            isLoading(): boolean;
-            /** Returns the array of items currently operated by the DataSource. */
-            items(): Array<any>;
-            /** Returns the key expression. */
-            key(): any;
-            /** Starts loading data. */
-            load(): JQueryPromise<Array<any>>;
-            /** Clears currently loaded DataSource items and calls the load() method. */
-            reload(): JQueryPromise<Array<any>>;
-            /** Returns an object that would be passed to the load() method of the underlying Store according to the current data shaping option values of the current DataSource instance. */
-            loadOptions(): Object;
-            /** Returns the current pageSize option value. */
-            pageSize(): number;
-            /** Sets the pageSize option value. */
-            pageSize(value: number): void;
-            /** Specifies the index of the currently loaded page. */
-            pageIndex(): number;
-            /** Specifies the index of the page to be loaded during the next load() method execution. */
-            pageIndex(newIndex: number): void;
-            /** Returns the current paginate option value. */
-            paginate(): boolean;
-            /** Sets the paginate option value. */
-            paginate(value: boolean): void;
-            /** Returns the searchExpr option value. */
-            searchExpr(): Object;
-            /** Sets the searchExpr option value. */
-            searchExpr(expr: Object): void;
-            /** Returns the currently specified search operation. */
-            searchOperation(): string;
-            /** Sets the current search operation. */
-            searchOperation(op: string): void;
-            /** Returns the searchValue option value. */
-            searchValue(): Object;
-            /** Sets the searchValue option value. */
-            searchValue(value: Object): void;
-            /** Returns the current select option value. */
-            select(): Object;
-            /** Sets the select option value. */
-            select(expr: Object): void;
-            /** Returns the current requireTotalCount option value. */
-            requireTotalCount(): boolean;
-            /** Sets the requireTotalCount option value. */
-            requireTotalCount(value: boolean): void;
-            /** Returns the current sort option value. */
-            sort(): Object;
-            /** Sets the sort option value. */
-            sort(sortExpr: Object): void;
-            /** Returns the underlying Store instance. */
-            store(): Store;
-            /** Returns the number of data items available in an underlying Store after the last load() operation without paging. */
-            totalCount(): number;
-            on(eventName: "loadingChanged", eventHandler: (isLoading: boolean) => void): DataSource;
-            on(eventName: "loadError", eventHandler: (e?: Error) => void): DataSource;
-            on(eventName: "changed", eventHandler: () => void): DataSource;
-            on(eventName: string, eventHandler: Function): DataSource;
-            on(events: { [eventName: string]: Function; }): DataSource;
-            off(eventName: "loadingChanged"): DataSource;
-            off(eventName: "loadError"): DataSource;
-            off(eventName: "changed"): DataSource;
-            off(eventName: string): DataSource;
-            off(eventName: "loadingChanged", eventHandler: (isLoading: boolean) => void): DataSource;
-            off(eventName: "loadError", eventHandler: (e?: Error) => void): DataSource;
-            off(eventName: "changed", eventHandler: () => void): DataSource;
-            off(eventName: string, eventHandler: Function): DataSource;
-        }
-        /** An object used to work with primitive data types not supported by JavaScript when accessing an OData web service. */
-        export class EdmLiteral {
-            /** Creates an EdmLiteral instance and assigns the specified value to it. */
-            constructor(value: string);
-            /** Returns a string representation of the value associated with this EdmLiteral object. */
-            valueOf(): string;
-        }
-        /** An object used to generate and hold the GUID. */
-        export class Guid {
-            /** Creates a new Guid instance that holds the specified GUID. */
-            constructor(value: string);
-            /** Creates a new Guid instance holding the generated GUID. */
-            constructor();
-            /** Returns a string representation of the Guid instance. */
-            toString(): string;
-            /** Returns a string representation of the Guid instance. */
-            valueOf(): string;
-        }
-        export interface LocalStoreOptions extends ArrayStoreOptions {
-            /** Specifies the time (in miliseconds) after the change operation, before the data is flushed. */
-            flushInterval?: number;
-            /** Specifies whether the data is flushed immediatelly after each change operation, or after the delay specified via the flushInterval option. */
-            immediate?: boolean;
-            /** The unique identifier used to distinguish the data within the HTML5 Web Storage. */
-            name?: string;
-        }
-        /** A Store providing access to the HTML5 Web Storage. */
-        export class LocalStore extends ArrayStore {
-            constructor(options?: LocalStoreOptions);
-            /** Removes all data associated with this Store. */
-            clear(): void;
-        }
-        export interface ODataContextOptions extends ODataStoreOptions {
-            /** Specifies the list of entities to be accessed via the ODataContext. */
-            entities?: Object;
-            /** Specifies the function called if the ODataContext causes an error. */
-            errorHandler?: (e: Error) => void;
-        }
-        /** Provides access to the entire OData service. */
-        export class ODataContext {
-            constructor(options?: ODataContextOptions);
-            /** Initiates the specified WebGet service operation that returns a value. For the information on service operations, refer to the OData documentation. */
-            get(operationName: string, params: Object): JQueryPromise<any>;
-            /** Initiates the specified WebGet service operation that returns nothing. For the information on service operations, refer to the OData documentation. */
-            invoke(operationName: string, params: Object, httpMethod: Object): JQueryPromise<any>;
-            /** Return a special proxy object to describe the entity link. */
-            objectLink(entityAlias: string, key: any): Object;
-        }
-        export interface ODataStoreOptions extends StoreOptions {
-            /** A function used to customize a web request before it is sent. */
-            beforeSend?: (request: {
-                url: string;
-                async: boolean;
-                method: string;
-                timeout: number;
-                params: Object;
-                payload: Object;
-                headers: Object;
-            }) => void;
-            /** Specifies whether the ODataStore uses the JSONP approach to access non-CORS-compatible remote services. */
-            jsonp?: boolean;
-            /** Specifies the type of the ODataStore key property. The following key types are supported out of the box: String, Int32, Int64, and Guid. */
-            keyType?: any;
-            /** Specifies whether or not dates found in the response are deserialized. */
-            deserializeDates?: boolean;
-            /** Specifies the URL of the data service being accessed via the current ODataContext. */
-            url?: string;
-            /** Specifies the version of the OData protocol used to interact with the data service. */
-            version?: number;
-            /** Specifies the value of the withCredentials field of the underlying jqXHR object. */
-            withCredentials?: boolean;
-        }
-        /** A Store providing access to a separate OData web service entity. */
-        export class ODataStore extends Store {
-            constructor(options?: ODataStoreOptions);
-            /** Creates the Query object for the OData endpoint. */
-            createQuery(loadOptions: Object): Object;
-            /** Returns the data item specified by the key. */
-            byKey(key: any, extraOptions?: { expand?: Object }): JQueryPromise<any>;
-        }
-        /** An universal chainable data query interface object. */
-        export interface Query {
-            /** Calculates a custom summary for the items in the current Query. */
-            aggregate(step: (accumulator: any, value: any) => any): JQueryPromise<any>;
-            /** Calculates a custom summary for the items in the current Query. */
-            aggregate(seed: any, step: (accumulator: any, value: any) => any, finalize: (result: any) => any): JQueryPromise<any>;
-            /** Calculates the average item value for the current Query. */
-            avg(getter: Object): JQueryPromise<any>;
-            /** Finds the item with the maximum getter value. */
-            max(getter: Object): JQueryPromise<any>;
-            /** Finds the item with the maximum value in the Query. */
-            max(): JQueryPromise<any>;
-            /** Finds the item with the minimum value in the Query. */
-            min(): JQueryPromise<any>;
-            /** Finds the item with the minimum getter value. */
-            min(getter: Object): JQueryPromise<any>;
-            /** Calculates the average item value for the current Query, if each Query item has a numeric type. */
-            avg(): JQueryPromise<any>;
-            /** Returns the total count of items in the current Query. */
-            count(): JQueryPromise<any>;
-            /** Executes the Query. */
-            enumerate(): JQueryPromise<any>;
-            /** Filters the current Query data. */
-            filter(criteria: Array<any>): Query;
-            /** Filters the current Query data. */
-            filter(predicate: (item: any) => boolean): Query;
-            /** Groups the current Query data. */
-            groupBy(getter: Object): Query;
-            /** Applies the specified transformation to each item. */
-            select(getter: Object): Query;
-            /** Limits the data item count. */
-            slice(skip: number, take?: number): Query;
-            /** Sorts current Query data. */
-            sortBy(getter: Object, desc: boolean): Query;
-            /** Sorts current Query data. */
-            sortBy(getter: Object): Query;
-            /** Calculates the sum of item getter values in the current Query. */
-            sum(getter: Object): JQueryPromise<any>;
-            /** Calculates the sum of item values in the current Query. */
-            sum(): JQueryPromise<any>;
-            /** Adds one more sorting condition to the current Query. */
-            thenBy(getter: Object): Query;
-            /** Adds one more sorting condition to the current Query. */
-            thenBy(getter: Object, desc: boolean): Query;
-            /** Returns the array of current Query items. */
-            toArray(): Array<any>;
-        }
-        /** The global data layer error handler. */
-        export var errorHandler: (e: Error) => void;
-        /** Encodes the specified string or array of bytes to base64 encoding. */
-        export function base64_encode(input: any): string;
-        /** Creates a Query instance. */
-        export function query(array: Array<any>): Query;
-        /** Creates a Query instance for accessing the remote service specified by a URL. */
-        export function query(url: string, queryOptions: Object): Query;
-        /** This section describes the utility objects provided by the DevExtreme data layer. */
-        export var utils: {
-            /** Compiles a getter function from the getter expression. */
-            compileGetter(expr: any): Function;
-            /** Compiles a setter function from the setter expression. */
-            compileSetter(expr: any): Function;
-            odata: {
-                /** Holds key value converters for OData. */
-                keyConverters: {
-                    String(value: any): string;
-                    Int32(value: any): number;
-                    Int64(value: any): EdmLiteral;
-                    Guid(value: any): Guid;
-                    Boolean(value: any): boolean;
-                    Single(value: any): EdmLiteral;
-                    Decimal(value: any): EdmLiteral;
-                };
-            }
-        }
-    }
-    /** An object that serves as a namespace for DevExtreme UI widgets as well as for methods implementing UI logic in DevExtreme sites/applications. */
-    export module ui {
-        export interface WidgetOptions extends DOMComponentOptions {
-            /** A Boolean value specifying whether or not the widget changes its state when interacting with a user. */
-            activeStateEnabled?: boolean;
-            /** A Boolean value specifying whether or not the widget can respond to user interaction. */
-            disabled?: boolean;
-            /** A Boolean value specifying whether or not the widget changes its state when being hovered by an end user. */
-            hoverStateEnabled?: boolean;
-            /** Specifies whether or not the widget can be focused. */
-            focusStateEnabled?: boolean;
-            /** Specifies a shortcut key that sets focus on the widget element. */
-            accessKey?: string;
-            /** A Boolean value specifying whether or not the widget is visible. */
-            visible?: boolean;
-            /** Specifies the widget tab index. */
-            tabIndex?: number;
-            /** Specifies the text of the hint displayed for the widget. */
-            hint?: string;
-        }
-        /** The base class for widgets. */
-        export class Widget extends DOMComponent {
-            constructor(options?: WidgetOptions);
-            /** Redraws the widget. */
-            repaint(): void;
-            /** Sets focus on the widget. */
-            focus(): void;
-            /** Registers a handler when a specified key is pressed. */
-            registerKeyHandler(key: string, handler: Function): void;
-        }
-        export interface CollectionWidgetOptions extends WidgetOptions {
-            /** A data source used to fetch data to be displayed by the widget. */
-            dataSource?: any;
-            /** The time period in milliseconds before the onItemHold event is raised. */
-            itemHoldTimeout?: number;
-            /** An array of items displayed by the widget. */
-            items?: Array<any>;
-            /** The template to be used for rendering items. */
-            itemTemplate?: any;
-            loopItemFocus?: boolean;
-            /** The text or HTML markup displayed by the widget if the item collection is empty. */
-            noDataText?: string;
-            onContentReady?: any;
-            /** A handler for the itemClick event. */
-            onItemClick?: any;
-            /** A handler for the itemContextMenu event. */
-            onItemContextMenu?: Function;
-            /** A handler for the itemHold event. */
-            onItemHold?: Function;
-            /** A handler for the itemRendered event. */
-            onItemRendered?: Function;
-            /** A handler for the selectionChanged event. */
-            onSelectionChanged?: Function;
-            /** The index of the currently selected widget item. */
-            selectedIndex?: number;
-            /** The selected item object. */
-            selectedItem?: Object;
-            /** An array of currently selected item objects. */
-            selectedItems?: Array<any>;
-            /** A handler for the itemDeleting event. */
-            onItemDeleting?: Function;
-            /** A handler for the itemDeleted event. */
-            onItemDeleted?: Function;
-            /** A handler for the itemReordered event. */
-            onItemReordered?: Function;
-        }
-        /** The base class for widgets containing an item collection. */
-        export class CollectionWidget extends Widget {
-            constructor(element: JQuery, options?: CollectionWidgetOptions);
-            constructor(element: HTMLElement, options?: CollectionWidgetOptions);
-            selectItem(itemElement: any): void;
-            unselectItem(itemElement: any): void;
-            deleteItem(itemElement: any): JQueryPromise<void>;
-            isItemSelected(itemElement: any): boolean;
-            reorderItem(itemElement: any, toItemElement: any): JQueryPromise<void>;
-        }
-        export interface DataExpressionMixinOptions {
-            /** A data source used to fetch data to be displayed by the widget. */
-            dataSource?: any;
-            /** Specifies the name of the data source item field whose value is displayed by the widget. */
-            displayExpr?: any;
-            /** Specifies the name of a data source item field whose value is held in the value configuration option. */
-            valueExpr?: any;
-            /** An array of items displayed by the widget. */
-            items?: Array<any>;
-            /** The template to be used for rendering items. */
-            itemTemplate?: any;
-            /** The currently selected value in the widget. */
-            value?: Object;
-        }
-        export interface EditorOptions extends WidgetOptions {
-            /** The currently specified value. */
-            value?: Object;
-            /** A handler for the valueChanged event. */
-            onValueChanged?: Function;
-            /** A Boolean value specifying whether or not the widget is read-only. */
-            readOnly?: boolean;
-            /** Holds the object that defines the error that occurred during validation. */
-            validationError?: Object;
-            /** Specifies whether the editor's value is valid. */
-            isValid?: boolean;
-            /** Specifies how the message about the validation rules that are not satisfied by this editor's value is displayed. */
-            validationMessageMode?: string;
-        }
-        /** A base class for editors. */
-        export class Editor extends Widget {
-            /** Resets the editor's value to undefined. */
-            reset(): void;
-        }
-        /** An object that serves as a namespace for methods displaying a message in an application/site. */
-        export var dialog: {
-            /** Creates an alert dialog message containing a single "OK" button. */
-            alert(message: string, title: string): JQueryPromise<void>;
-            /** Creates a confirm dialog that contains "Yes" and "No" buttons. */
-            confirm(message: string, title: string): JQueryPromise<boolean>;
-            /** Creates a custom dialog using the options specified by the passed configuration object. */
-            custom(options: { title?: string; message?: string; buttons?: Array<Object>; }): {
-                show(): JQueryPromise<any>;
-                hide(): void;
-                hide(value: any): void;
-            };
-        };
-        /** Creates a toast message. */
-        export function notify(message: any, type: string, displayTime: number): void;
-        /** Creates a toast message. */
-        export function notify(options: Object): void;
-        /** An object that serves as a namespace for the methods that work with DevExtreme CSS Themes. */
-        export var themes: {
-            /** Returns the name of the currently applied theme. */
-            current(): string;
-            /** Changes the current theme to the specified one. */
-            current(themeName: string): void;
-        };
-        /** Sets a specified template engine. */
-        export function setTemplateEngine(name: string): void;
-        /** Sets a custom template engine defined via custom compile and render functions. */
-        export function setTemplateEngine(options: Object): void;
-    }
-    /** An object that serves as a namespace for utility methods that can be helpful when working with the DevExtreme framework and UI widgets. */
-    export var utils: {
-        /** Sets parameters for the viewport meta tag. */
-        initMobileViewport(options: { allowZoom?: boolean; allowPan?: boolean; allowSelection?: boolean }): void;
-        /** Requests that the browser call a specified function to update animation before the next repaint. */
-        requestAnimationFrame(callback: Function): number;
-        /** Cancels an animation frame request scheduled with the requestAnimationFrame method. */
-        cancelAnimationFrame(requestID: number): void;
-    };
-    /** An object that serves as a namespace for DevExtreme Data Visualization Widgets. */
-    export module viz {
-        /** Applies a theme for the entire page with several DevExtreme visualization widgets. */
-        export function currentTheme(theme: string): void;
-        /** Applies a new theme (with the color scheme defined separately) for the entire page with several DevExtreme visualization widgets. */
-        export function currentTheme(platform: string, colorScheme: string): void;
-        /** Registers a new theme based on the existing one. */
-        export function registerTheme(customTheme: Object, baseTheme: string): void;
-        /** Applies a predefined or registered custom palette to all visualization widgets at once. */
-        export function currentPalette(paletteName: string): void;
-        /** Obtains the color sets of a predefined or registered palette. */
-        export function getPalette(paletteName: string): Object;
-        /** Registers a new palette. */
-        export function registerPalette(paletteName: string, palette: Object): void;
-    }
-}
-declare namespace DevExpress.ui {
-    export interface dxValidatorOptions extends DOMComponentOptions {
-        /** An array of validation rules to be checked for the editor with which the dxValidator object is associated. */
-        validationRules?: Array<any>;
-        /** Specifies the editor name to be used in the validation default messages. */
-        name?: string;
-        /** An object that specifies what and when to validate and how to apply the validation result. */
-        adapter?: Object;
-        /** Specifies the validation group the editor will be related to. */
-        validationGroup?: string;
-        /** A handler for the validated event. */
-        onValidated?: (params: validationEngine.ValidatorValidationResult) => void;
-    }
-    /** A widget that is used to validate the associated DevExtreme editors against the defined validation rules. */
-    export class dxValidator extends DOMComponent implements validationEngine.IValidator {
-        constructor(element: JQuery, options?: dxValidatorOptions);
-        constructor(element: Element, options?: dxValidatorOptions);
-        /** Validates the value of the editor that is controlled by the current dxValidator object against the list of the specified validation rules. */
-        validate(): validationEngine.ValidatorValidationResult;
-        /** Resets the value and validation result of the editor associated with the current dxValidator object. */
-        reset(): void;
-    }
-    /** The widget that is used in the Knockout and Angular approaches to combine the editors to be validated. */
-    export class dxValidationGroup extends DOMComponent {
-        constructor(element: JQuery);
-        constructor(element: Element);
-        /** Validates rules of the validators that belong to the current validation group. */
-        validate(): validationEngine.ValidationGroupValidationResult;
-        /** Resets the value and validation result of the editors that are included to the current validation group. */
-        reset(): void;
-    }
-    export interface dxValidationSummaryOptions extends CollectionWidgetOptions {
-        /** Specifies the validation group for which summary should be generated. */
-        validationGroup?: string;
-    }
-    /** A widget for displaying the result of checking validation rules for editors. */
-    export class dxValidationSummary extends CollectionWidget {
-        constructor(element: JQuery, options?: dxValidationSummaryOptions);
-        constructor(element: Element, options?: dxValidationSummaryOptions);
-    }
-    export interface dxResizableOptions extends DOMComponentOptions {
-        /** Specifies which borders of the widget element are used as a handle. */
-        handles?: string;
-        /** Specifies the lower width boundary for resizing. */
-        minWidth?: number;
-        /** Specifies the upper width boundary for resizing. */
-        maxWidth?: number;
-        /** Specifies the lower height boundary for resizing. */
-        minHeight?: number;
-        /** Specifies the upper height boundary for resizing. */
-        maxHeight?: number;
-        /** A handler for the resizeStart event. */
-        onResizeStart?: Function;
-        /** A handler for the resize event. */
-        onResize?: Function;
-        /** A handler for the resizeEnd event. */
-        onResizeEnd?: Function;
-    }
-    /** A widget that displays required content in a resizable element. */
-    export class dxResizable extends DOMComponent {
-        constructor(element: JQuery, options?: dxResizableOptions);
-        constructor(element: Element, options?: dxResizableOptions);
-    }
-    export interface dxTooltipOptions extends dxPopoverOptions {
-    }
-    /** A tooltip widget. */
-    export class dxTooltip extends dxPopover {
-        constructor(element: JQuery, options?: dxTooltipOptions);
-        constructor(element: Element, options?: dxTooltipOptions);
-    }
-    export interface dxDropDownListOptions extends dxDropDownEditorOptions, DataExpressionMixinOptions {
-        /** Returns the value currently displayed by the widget. */
-        displayValue?: string;
-        /** The minimum number of characters that must be entered into the text box to begin a search. */
-        minSearchLength?: number;
-        /** Specifies whether or not the widget displays unfiltered values until a user types a number of characters exceeding the minSearchLength option value. */
-        showDataBeforeSearch?: boolean;
-        /** Specifies the name of a data source item field or an expression whose value is compared to the search criterion. */
-        searchExpr?: Object;
-        /** Specifies the binary operation used to filter data. */
-        searchMode?: string;
-        /** Specifies the time delay, in milliseconds, after the last character has been typed in, before a search is executed. */
-        searchTimeout?: number;
-        /** A handler for the valueChanged event. */
-        onValueChanged?: Function;
-        /** Specifies DOM event names that update a widget's value. */
-        valueChangeEvent?: string;
-        /** Specifies whether or not the widget supports searching. */
-        searchEnabled?: boolean;
-        /**
-         * Specifies whether or not the widget displays items by pages.
-         * @deprecated dataSource.paginate.md
-         */
-        pagingEnabled?: boolean;
-        /** The text or HTML markup displayed by the widget if the item collection is empty. */
-        noDataText?: string;
-        /** A handler for the selectionChanged event. */
-        onSelectionChanged?: Function;
-        /** A handler for the itemClick event. */
-        onItemClick?: Function;
-        onContentReady?: Function;
-    }
-    /** A base class for drop-down list widgets. */
-    export class dxDropDownList extends dxDropDownEditor {
-        constructor(element: JQuery, options?: dxDropDownListOptions);
-        constructor(element: Element, options?: dxDropDownListOptions);
-    }
-    export interface dxToolbarOptions extends CollectionWidgetOptions {
-        /** The template used to render menu items. */
-        menuItemTemplate?: any;
-        /** Informs the widget about its location in a view HTML markup. */
-        renderAs?: string;
-    }
-    /** A toolbar widget. */
-    export class dxToolbar extends CollectionWidget {
-        constructor(element: JQuery, options?: dxToolbarOptions);
-        constructor(element: Element, options?: dxToolbarOptions);
-    }
-    export interface dxToastOptions extends dxOverlayOptions {
-        animation?: fx.AnimationOptions;
-        /** The time span in milliseconds during which the dxToast widget is visible. */
-        displayTime?: number;
-        height?: any;
-        /** The dxToast message text. */
-        message?: string;
-        position?: PositionOptions;
-        shading?: boolean;
-        /** Specifies the dxToast widget type. */
-        type?: string;
-        width?: any;
-        closeOnBackButton?: boolean;
-        /** A Boolean value specifying whether or not the toast is closed if a user swipes it out of the screen boundaries. */
-        closeOnSwipe?: boolean;
-        /** A Boolean value specifying whether or not the toast is closed if a user clicks it. */
-        closeOnClick?: boolean;
-    }
-    /** The toast message widget. */
-    export class dxToast extends dxOverlay {
-        constructor(element: JQuery, options?: dxToastOptions);
-        constructor(element: Element, options?: dxToastOptions);
-    }
-    export interface dxTextEditorOptions extends EditorOptions {
-        /** A handler for the change event. */
-        onChange?: Function;
-        /** A handler for the copy event. */
-        onCopy?: Function;
-        /** A handler for the cut event. */
-        onCut?: Function;
-        /** A handler for the enterKey event. */
-        onEnterKey?: Function;
-        /** A handler for the focusIn event. */
-        onFocusIn?: Function;
-        /** A handler for the focusOut event. */
-        onFocusOut?: Function;
-        /** A handler for the input event. */
-        onInput?: Function;
-        /** A handler for the keyDown event. */
-        onKeyDown?: Function;
-        /** A handler for the keyPress event. */
-        onKeyPress?: Function;
-        /** A handler for the keyUp event. */
-        onKeyUp?: Function;
-        /** A handler for the paste event. */
-        onPaste?: Function;
-        /** The text displayed by the widget when the widget value is empty. */
-        placeholder?: string;
-        /** Specifies whether to display the Clear button in the widget. */
-        showClearButton?: boolean;
-        /** Specifies the current value displayed by the widget. */
-        value?: any;
-        /** Specifies DOM event names that update a widget's value. */
-        valueChangeEvent?: string;
-        /** Specifies whether or not the widget checks the inner text for spelling mistakes. */
-        spellcheck?: boolean;
-        /** Specifies HTML attributes applied to the inner input element of the widget. */
-        attr?: Object;
-        /** The read-only option that holds the text displayed by the widget input element. */
-        text?: string;
-        focusStateEnabled?: boolean;
-        hoverStateEnabled?: boolean;
-        /** The editor mask that specifies the format of the entered string. */
-        mask?: string;
-        /** Specifies a mask placeholder character. */
-        maskChar?: string;
-        /** Specifies custom mask rules. */
-        maskRules?: Object;
-        /** A message displayed when the entered text does not match the specified pattern. */
-        maskInvalidMessage?: string;
-        /** Specifies whether the value option holds only characters entered by a user or prompt characters as well. */
-        useMaskedValue?: boolean;
-    }
-    /** A base class for text editing widgets. */
-    export class dxTextEditor extends Editor {
-        constructor(element: JQuery, options?: dxTextEditorOptions);
-        constructor(element: Element, options?: dxTextEditorOptions);
-        /** Removes focus from the input element. */
-        blur(): void;
-        /** Sets focus to the input element representing the widget. */
-        focus(): void;
-    }
-    export interface dxTextBoxOptions extends dxTextEditorOptions {
-        /** Specifies the maximum number of characters you can enter into the textbox. */
-        maxLength?: any;
-        /** The "mode" attribute value of the actual HTML input element representing the text box. */
-        mode?: string;
-    }
-    /** A single-line text box widget. */
-    export class dxTextBox extends dxTextEditor {
-        constructor(element: JQuery, options?: dxTextBoxOptions);
-        constructor(element: Element, options?: dxTextBoxOptions);
-    }
-    export interface dxTextAreaOptions extends dxTextBoxOptions {
-        /** Specifies whether or not the widget checks the inner text for spelling mistakes. */
-        spellcheck?: boolean;
-    }
-    /** A widget used to display and edit multi-line text. */
-    export class dxTextArea extends dxTextBox {
-        constructor(element: JQuery, options?: dxTextAreaOptions);
-        constructor(element: Element, options?: dxTextAreaOptions);
-    }
-    export interface dxTabsOptions extends CollectionWidgetOptions {
-        /** Specifies whether the widget enables an end-user to select only a single item or multiple items. */
-        selectionMode?: string;
-        /** Specifies whether or not an end-user can scroll tabs by swiping. */
-        scrollByContent?: boolean;
-        /** Specifies whether or not an end-user can scroll tabs. */
-        scrollingEnabled?: boolean;
-        /** A Boolean value that specifies the availability of navigation buttons. */
-        showNavButtons?: boolean;
-    }
-    /** A tab strip used to switch between pages. */
-    export class dxTabs extends CollectionWidget {
-        constructor(element: JQuery, options?: dxTabsOptions);
-        constructor(element: Element, options?: dxTabsOptions);
-    }
-    export interface dxTabPanelOptions extends dxMultiViewOptions {
-        /** A handler for the titleClick event. */
-        onTitleClick?: any;
-        /** A handler for the titleHold event. */
-        onTitleHold?: Function;
-        /** A handler for the titleRendered event. */
-        onTitleRendered?: Function;
-        /** The template to be used for rendering an item title. */
-        itemTitleTemplate?: any;
-        /** A Boolean value specifying if the list is scrolled by content. */
-        scrollByContent?: boolean;
-        /** A Boolean value specifying whether to enable or disable scrolling. */
-        scrollingEnabled?: boolean;
-        /** A Boolean value that specifies the availability of navigation buttons. */
-        showNavButtons?: boolean;
-    }
-    /** A widget used to display a view and to switch between several views by clicking the appropriate tabs. */
-    export class dxTabPanel extends dxMultiView {
-        constructor(element: JQuery, options?: dxTabPanelOptions);
-        constructor(element: Element, options?: dxTabPanelOptions);
-    }
-    export interface dxSelectBoxOptions extends dxDropDownListOptions {
-        /** Specifies DOM event names that update a widget's value. */
-        valueChangeEvent?: string;
-        /** The template to be used for rendering the widget text field. */
-        fieldTemplate?: any;
-        /** The text that is provided as a hint in the select box editor. */
-        placeholder?: string;
-        /** Specifies whether or not the widget allows an end-user to enter a custom value. */
-        fieldEditEnabled?: boolean;
-    }
-    /** A widget that allows you to select an item in a dropdown list. */
-    export class dxSelectBox extends dxDropDownList {
-        constructor(element: JQuery, options?: dxSelectBoxOptions);
-        constructor(element: Element, options?: dxSelectBoxOptions);
-    }
-    export interface dxTagBoxOptions extends dxSelectBoxOptions {
-        /** Holds the list of selected values. */
-        values?: Array<any>;
-        /** A read-only option that holds the last selected value. */
-        value?: Object;
-    }
-    /** A widget that allows you to select multiple items from a dropdown list. */
-    export class dxTagBox extends dxSelectBox {
-        constructor(element: JQuery, options?: dxTagBoxOptions);
-        constructor(element: Element, options?: dxTagBoxOptions);
-    }
-    export interface dxScrollViewOptions extends dxScrollableOptions {
-        /** A handler for the pullDown event. */
-        onPullDown?: Function;
-        /** Specifies the text shown in the pullDown panel when pulling the content down lowers the refresh threshold. */
-        pulledDownText?: string;
-        /** Specifies the text shown in the pullDown panel while pulling the content down to the refresh threshold. */
-        pullingDownText?: string;
-        /** A handler for the reachBottom event. */
-        onReachBottom?: Function;
-        /** Specifies the text shown in the pullDown panel displayed when content is scrolled to the bottom. */
-        reachBottomText?: string;
-        /** Specifies the text shown in the pullDown panel displayed when the content is being refreshed. */
-        refreshingText?: string;
-        /** Returns a value indicating if the scrollView content is larger then the widget container. */
-        isFull(): boolean;
-        /** Locks the widget until the release(preventScrollBottom) method is called and executes the function passed to the onPullDown option and the handler assigned to the pullDown event. */
-        refresh(): void;
-        /** Notifies the scroll view that data loading is finished. */
-        release(preventScrollBottom: boolean): JQueryPromise<void>;
-        /** Toggles the loading state of the widget. */
-        toggleLoading(showOrHide: boolean): void;
-    }
-    /** A widget used to display scrollable content. */
-    export class dxScrollView extends dxScrollable {
-        constructor(element: JQuery, options?: dxScrollViewOptions);
-        constructor(element: Element, options?: dxScrollViewOptions);
-    }
-    export interface dxScrollableLocation {
-        top?: number;
-        left?: number;
-    }
-    export interface dxScrollableOptions extends DOMComponentOptions {
-        /** A string value specifying the available scrolling directions. */
-        direction?: string;
-        /** A Boolean value specifying whether or not the widget can respond to user interaction. */
-        disabled?: boolean;
-        /** A handler for the scroll event. */
-        onScroll?: Function;
-        /** Specifies when the widget shows the scrollbar. */
-        showScrollbar?: string;
-        /** A handler for the update event. */
-        onUpdated?: Function;
-        /** Indicates whether to use native or simulated scrolling. */
-        useNative?: boolean;
-        /** A Boolean value specifying whether to enable or disable the bounce-back effect. */
-        bounceEnabled?: boolean;
-        /** A Boolean value specifying whether or not an end-user can scroll the widget content swiping it up or down. */
-        scrollByContent?: boolean;
-        /** A Boolean value specifying whether or not an end-user can scroll the widget content using the scrollbar. */
-        scrollByThumb?: boolean;
-    }
-    /** A widget used to display scrollable content. */
-    export class dxScrollable extends DOMComponent {
-        constructor(element: JQuery, options?: dxScrollableOptions);
-        constructor(element: Element, options?: dxScrollableOptions);
-        /** Returns the height of the scrollable widget in pixels. */
-        clientHeight(): number;
-        /** Returns the width of the scrollable widget in pixels. */
-        clientWidth(): number;
-        /** Returns an HTML element of the widget. */
-        content(): JQuery;
-        /** Scrolls the widget content by the specified number of pixels. */
-        scrollBy(distance: number): void;
-        /** Scrolls widget content by the specified number of pixels in horizontal and vertical directions. */
-        scrollBy(distanceObject: dxScrollableLocation): void;
-        /** Returns the height of the scrollable content in pixels. */
-        scrollHeight(): number;
-        /** Returns the current scroll position against the leftmost position. */
-        scrollLeft(): number;
-        /** Returns how far the scrollable content is scrolled from the top and from the left. */
-        scrollOffset(): dxScrollableLocation;
-        /** Scrolls widget content to the specified position. */
-        scrollTo(targetLocation: number): void;
-        /** Scrolls widget content to a specified position. */
-        scrollTo(targetLocation: dxScrollableLocation): void;
-        /** Scrolls widget content to the specified element. */
-        scrollToElement(element: Element): void;
-        /** Returns the current scroll position against the topmost position. */
-        scrollTop(): number;
-        /** Returns the width of the scrollable content in pixels. */
-        scrollWidth(): number;
-        /** Updates the dimensions of the scrollable contents. */
-        update(): void;
-    }
-    export interface dxRadioGroupOptions extends EditorOptions, DataExpressionMixinOptions {
-        activeStateEnabled?: boolean;
-        /** Specifies the radio group layout. */
-        layout?: string;
-    }
-    /** A widget that enables a user to select one item within a list of items represented by radio buttons. */
-    export class dxRadioGroup extends CollectionWidget {
-        constructor(element: JQuery, options?: dxRadioGroupOptions);
-        constructor(element: Element, options?: dxRadioGroupOptions);
-    }
-    export interface dxPopupOptions extends dxOverlayOptions {
-        animation?: fx.AnimationOptions;
-        /** Specifies whether or not to allow a user to drag the popup window. */
-        dragEnabled?: boolean;
-        /** A Boolean value specifying whether or not to display the widget in full-screen mode. */
-        fullScreen?: boolean;
-        position?: PositionOptions;
-        /** A Boolean value specifying whether or not to display the title in the popup window. */
-        showTitle?: boolean;
-        /** The title in the overlay window. */
-        title?: string;
-        /** A template to be used for rendering the widget title. */
-        titleTemplate?: any;
-        width?: any;
-        /** Specifies items displayed on the top or bottom toolbar of the popup window. */
-        buttons?: Array<any>;
-        /** Specifies whether or not the widget displays the Close button. */
-        showCloseButton?: boolean;
-        /** A handler for the titleRendered event. */
-        onTitleRendered?: Function;
-    }
-    /** A widget that displays required content in a popup window. */
-    export class dxPopup extends dxOverlay {
-        constructor(element: JQuery, options?: dxPopupOptions);
-        constructor(element: Element, options?: dxPopupOptions);
-    }
-    export interface dxPopoverOptions extends dxPopupOptions {
-        /** An object defining animation options of the widget. */
-        animation?: fx.AnimationOptions;
-        /** Specifies the height of the widget. */
-        height?: any;
-        /** An object defining widget positioning options. */
-        position?: PositionOptions;
-        shading?: boolean;
-        /** A Boolean value specifying whether or not to display the title in the overlay window. */
-        showTitle?: boolean;
-        /** The target element associated with a popover. */
-        target?: any;
-        /** Specifies the width of the widget. */
-        width?: any;
-    }
-    /** A widget that displays the required content in a popup window. */
-    export class dxPopover extends dxPopup {
-        constructor(element: JQuery, options?: dxPopoverOptions);
-        constructor(element: Element, options?: dxPopoverOptions);
-        /** Displays the widget for the specified target element. */
-        show(target?: any): JQueryPromise<void>;
-    }
-    export interface dxOverlayOptions extends WidgetOptions {
-        /** An object that defines the animation options of the widget. */
-        animation?: fx.AnimationOptions;
-        /** A Boolean value specifying whether or not the widget is closed if a user presses the Back hardware button. */
-        closeOnBackButton?: boolean;
-        /** A Boolean value specifying whether or not the widget is closed if a user clicks outside of the overlapping window. */
-        closeOnOutsideClick?: any;
-        /** A template to be used for rendering widget content. */
-        contentTemplate?: any;
-        /** Specifies whether widget content is rendered when the widget is shown or when rendering the widget. */
-        deferRendering?: boolean;
-        /** Specifies whether or not an end-user can drag the widget. */
-        dragEnabled?: boolean;
-        /** Specifies whether or not an end user can resize the widget. */
-        resizeEnabled?: boolean;
-        /** The height of the widget in pixels. */
-        height?: any;
-        /** Specifies the maximum height the widget can reach while resizing. */
-        maxHeight?: any;
-        /** Specifies the maximum width the widget can reach while resizing. */
-        maxWidth?: any;
-        /** Specifies the minimum height the widget can reach while resizing. */
-        minHeight?: any;
-        /** Specifies the minimum width the widget can reach while resizing. */
-        minWidth?: any;
-        /** A handler for the hidden event. */
-        onHidden?: Function;
-        /** A handler for the resizeStart event. */
-        onResizeStart?: Function;
-        /** A handler for the resize event. */
-        onResize?: Function;
-        /** A handler for the resizeEnd event. */
-        onResizeEnd?: Function;
-        /** A handler for the hiding event. */
-        onHiding?: Function;
-        /** An object defining widget positioning options. */
-        position?: PositionOptions;
-        /** A Boolean value specifying whether or not the main screen is inactive while the widget is active. */
-        shading?: boolean;
-        /** Specifies the shading color. */
-        shadingColor?: string;
-        /** A handler for the showing event. */
-        onShowing?: Function;
-        /** A handler for the shown event. */
-        onShown?: Function;
-        onContentReady?: Function;
-        /** A Boolean value specifying whether or not the widget is visible. */
-        visible?: boolean;
-        /** The widget width in pixels. */
-        width?: any;
-    }
-    /** A widget displaying the required content in an overlay window. */
-    export class dxOverlay extends Widget {
-        constructor(element: JQuery, options?: dxOverlayOptions);
-        constructor(element: Element, options?: dxOverlayOptions);
-        /** An HTML element of the widget. */
-        content(): JQuery;
-        /** Hides the widget. */
-        hide(): JQueryPromise<void>;
-        /** Recalculates the overlay's size and position. */
-        repaint(): void;
-        /** Shows the widget. */
-        show(): JQueryPromise<void>;
-        /** Toggles the visibility of the widget. */
-        toggle(showing: boolean): JQueryPromise<void>;
-        /** A static method that specifies the base z-index for all overlay widgets. */
-        static baseZIndex(zIndex: number): void;
-    }
-    export interface dxNumberBoxOptions extends dxTextEditorOptions {
-        /** The maximum value accepted by the number box. */
-        max?: number;
-        /** The minimum value accepted by the number box. */
-        min?: number;
-        /** Specifies whether or not to show spin buttons. */
-        showSpinButtons?: boolean;
-        useTouchSpinButtons?: boolean;
-        /** Specifies by which value the widget value changes when a spin button is clicked. */
-        step?: number;
-        /** The current number box value. */
-        value?: number;
-        /** The "mode" attribute value of the actual HTML input element representing the widget. */
-        mode?: string;
-    }
-    /** A textbox widget that enables a user to enter numeric values. */
-    export class dxNumberBox extends dxTextEditor {
-        constructor(element: JQuery, options?: dxNumberBoxOptions);
-        constructor(element: Element, options?: dxNumberBoxOptions);
-    }
-    export interface dxNavBarOptions extends dxTabsOptions {
-        scrollingEnabled?: boolean;
-    }
-    /** A widget that contains items used to navigate through application views. */
-    export class dxNavBar extends dxTabs {
-        constructor(element: JQuery, options?: dxNavBarOptions);
-        constructor(element: Element, options?: dxNavBarOptions);
-    }
-    export interface dxMultiViewOptions extends CollectionWidgetOptions {
-        /** Specifies whether or not to animate the displayed item change. */
-        animationEnabled?: boolean;
-        /** A Boolean value specifying whether or not to scroll back to the first item after the last item is swiped. */
-        loop?: boolean;
-        /** The index of the currently displayed item. */
-        selectedIndex?: number;
-        /** A Boolean value specifying whether or not to allow users to change the selected index by swiping. */
-        swipeEnabled?: boolean;
-        /** Specifies whether widget content is rendered when the widget is shown or when rendering the widget. */
-        deferRendering?: boolean;
-    }
-    /** A widget used to display a view and to switch between several views. */
-    export class dxMultiView extends CollectionWidget {
-        constructor(element: JQuery, options?: dxMultiViewOptions);
-        constructor(element: Element, options?: dxMultiViewOptions);
-    }
-    export interface dxMapOptions extends WidgetOptions {
-        /** Specifies whether or not the widget automatically adjusts center and zoom option values when adding a new marker or route or when creating a widget if it initially contains markers or routes. */
-        autoAdjust?: boolean;
-        center?: {
-            /** The latitude location displayed in the center of the widget. */
-            lat?: number;
-            /** The longitude location displayed in the center of the widget. */
-            lng?: number;
-        };
-        /** A handler for the click event. */
-        onClick?: any;
-        /** Specifies whether or not map widget controls are available. */
-        controls?: boolean;
-        /** Specifies the height of the widget. */
-        height?: any;
-        /** A key used to authenticate the application within the required map provider. */
-        key?: {
-            /** A key used to authenticate the application within the "Bing" map provider. */
-            bing?: string;
-            /** A key used to authenticate the application within the "Google" map provider. */
-            google?: string;
-            /** A key used to authenticate the application within the "Google Static" map provider. */
-            googleStatic?: string;
-        }
-        /** A handler for the markerAdded event. */
-        onMarkerAdded?: Function;
-        /** A URL pointing to the custom icon to be used for map markers. */
-        markerIconSrc?: string;
-        /** A handler for the markerRemoved event. */
-        onMarkerRemoved?: Function;
-        /** An array of markers displayed on a map. */
-        markers?: Array<any>;
-        /** The name of the current map data provider. */
-        provider?: string;
-        /** A handler for the ready event. */
-        onReady?: Function;
-        /** A handler for the routeAdded event. */
-        onRouteAdded?: Function;
-        /** A handler for the routeRemoved event. */
-        onRouteRemoved?: Function;
-        /** An array of routes shown on the map. */
-        routes?: Array<any>;
-        /** The type of a map to display. */
-        type?: string;
-        /** Specifies the width of the widget. */
-        width?: any;
-        /** The zoom level of the map. */
-        zoom?: number;
-    }
-    /** An interactive map widget. */
-    export class dxMap extends Widget {
-        constructor(element: JQuery, options?: dxMapOptions);
-        constructor(element: Element, options?: dxMapOptions);
-        /** Adds a marker to the map. */
-        addMarker(markerOptions: Object): JQueryPromise<Object>;
-        /** Adds a route to the map. */
-        addRoute(routeOptions: Object): JQueryPromise<Object>;
-        /** Removes a marker from the map. */
-        removeMarker(marker: Object): JQueryPromise<void>;
-        /** Removes a route from the map. */
-        removeRoute(route: any): JQueryPromise<void>;
-    }
-    export interface dxLookupOptions extends dxDropDownListOptions {
-        /** An object defining widget animation options. */
-        animation?: fx.AnimationOptions;
-        /** The text displayed on the Cancel button. */
-        cancelButtonText?: string;
-        /** The text displayed on the Clear button. */
-        clearButtonText?: string;
-        /** Specifies whether or not the widget cleans the search box when the popup window is displayed. */
-        cleanSearchOnOpening?: boolean;
-        /** A Boolean value specifying whether or not a widget is closed if a user clicks outside of the overlaying window. */
-        closeOnOutsideClick?: any;
-        /** The text displayed on the Apply button. */
-        applyButtonText?: string;
-        /** A Boolean value specifying whether or not to display the lookup in full-screen mode. */
-        fullScreen?: boolean;
-        focusStateEnabled?: boolean;
-        /** A Boolean value specifying whether or not to group widget items. */
-        grouped?: boolean;
-        /** The name of the template used to display a group header. */
-        groupTemplate?: any;
-        /** The text displayed on the button used to load the next page from the data source. */
-        nextButtonText?: string;
-        /** A handler for the pageLoading event. */
-        onPageLoading?: Function;
-        /** Specifies whether the next page is loaded when a user scrolls the widget to the bottom or when the "next" button is clicked. */
-        pageLoadMode?: string;
-        /** Specifies the text shown in the pullDown panel, which is displayed when the widget is scrolled to the bottom. */
-        pageLoadingText?: string;
-        /** The text displayed by the widget when nothing is selected. */
-        placeholder?: string;
-        /** The height of the widget popup element. */
-        popupHeight?: any;
-        /** The width of the widget popup element. */
-        popupWidth?: any;
-        /** An object defining widget positioning options. */
-        position?: PositionOptions;
-        /** Specifies the text displayed in the pullDown panel when the widget is pulled below the refresh threshold. */
-        pulledDownText?: string;
-        /** Specifies the text shown in the pullDown panel while the list is being pulled down to the refresh threshold. */
-        pullingDownText?: string;
-        /** A handler for the pullRefresh event. */
-        onPullRefresh?: Function;
-        /** A Boolean value specifying whether or not the widget supports the "pull down to refresh" gesture. */
-        pullRefreshEnabled?: boolean;
-        /** Specifies the text displayed in the pullDown panel while the widget is being refreshed. */
-        refreshingText?: string;
-        /** A handler for the scroll event. */
-        onScroll?: Function;
-        /** A Boolean value specifying whether or not the search bar is visible. */
-        searchEnabled?: boolean;
-        /** The text that is provided as a hint in the lookup's search bar. */
-        searchPlaceholder?: string;
-        /** A Boolean value specifying whether or not the main screen is inactive while the lookup is active. */
-        shading?: boolean;
-        /** Specifies whether to display the Cancel button in the lookup window. */
-        showCancelButton?: boolean;
-        /**
-         * A Boolean value specifying whether the widget loads the next page automatically when you reach the bottom of the list or when a button is clicked.
-         * @deprecated pageLoadMode.md
-         */
-        showNextButton?: boolean;
-        /** The title of the lookup window. */
-        title?: string;
-        /** A template to be used for rendering the widget title. */
-        titleTemplate?: any;
-        /** Specifies whether or not the widget uses native scrolling. */
-        useNativeScrolling?: boolean;
-        /** Specifies whether or not to show lookup contents in a dxPopover widget. */
-        usePopover?: boolean;
-        /** A handler for the valueChanged event. */
-        onValueChanged?: Function;
-        /** A handler for the titleRendered event. */
-        onTitleRendered?: Function;
-        /** A Boolean value specifying whether or not to display the title in the popup window. */
-        showPopupTitle?: boolean;
-        /** The template to be used for rendering the widget text field. */
-        fieldTemplate?: any;
-    }
-    /** A widget that allows a user to select predefined values from a lookup window. */
-    export class dxLookup extends dxDropDownList {
-        constructor(element: JQuery, options?: dxLookupOptions);
-        constructor(element: Element, options?: dxLookupOptions);
-        /** This section lists the data source fields that are used in a default template for lookup drop-down items. */
-    }
-    export interface dxLoadPanelOptions extends dxOverlayOptions {
-        /** An object defining the animation options of the widget. */
-        animation?: fx.AnimationOptions;
-        /** The delay in milliseconds after which the load panel is displayed. */
-        delay?: number;
-        /** The height of the widget. */
-        height?: number;
-        /** A URL pointing to an image to be used as a load indicator. */
-        indicatorSrc?: string;
-        /** The text displayed in the load panel. */
-        message?: string;
-        /** A Boolean value specifying whether or not to show a load indicator. */
-        showIndicator?: boolean;
-        /** A Boolean value specifying whether or not to show the pane behind the load indicator. */
-        showPane?: boolean;
-        /** The width of the widget. */
-        width?: number;
-    }
-    /** A widget used to indicate whether or not an element is loading. */
-    export class dxLoadPanel extends dxOverlay {
-        constructor(element: JQuery, options?: dxLoadPanelOptions);
-        constructor(element: Element, options?: dxLoadPanelOptions);
-    }
-    export interface dxLoadIndicatorOptions extends WidgetOptions {
-        /** Specifies the path to an image used as the indicator. */
-        indicatorSrc?: string;
-    }
-    /** The widget used to indicate the loading process. */
-    export class dxLoadIndicator extends Widget {
-        constructor(element: JQuery, options?: dxLoadIndicatorOptions);
-        constructor(element: Element, options?: dxLoadIndicatorOptions);
-    }
-    export interface dxListOptions extends CollectionWidgetOptions {
-        /** A Boolean value specifying whether or not to display a grouped list. */
-        grouped?: boolean;
-        /** The template to be used for rendering item groups. */
-        groupTemplate?: any;
-        onItemDeleting?: Function;
-        /** A handler for the itemDeleted event. */
-        onItemDeleted?: Function;
-        /** A handler for the groupRendered event. */
-        onGroupRendered?: Function;
-        /** A handler for the itemReordered event. */
-        onItemReordered?: Function;
-        /** A handler for the itemClick event. */
-        onItemClick?: any;
-        /** A handler for the itemSwipe event. */
-        onItemSwipe?: Function;
-        /** The text displayed on the button used to load the next page from the data source. */
-        nextButtonText?: string;
-        /** A handler for the pageLoading event. */
-        onPageLoading?: Function;
-        /** Specifies the text shown in the pullDown panel, which is displayed when the list is scrolled to the bottom. */
-        pageLoadingText?: string;
-        /** Specifies the text displayed in the pullDown panel when the list is pulled below the refresh threshold. */
-        pulledDownText?: string;
-        /** Specifies the text shown in the pullDown panel while the list is being pulled down to the refresh threshold. */
-        pullingDownText?: string;
-        /** A handler for the pullRefresh event. */
-        onPullRefresh?: Function;
-        /** A Boolean value specifying whether or not the widget supports the "pull down to refresh" gesture. */
-        pullRefreshEnabled?: boolean;
-        /** Specifies the text displayed in the pullDown panel while the list is being refreshed. */
-        refreshingText?: string;
-        /** A handler for the scroll event. */
-        onScroll?: Function;
-        /** A Boolean value specifying whether to enable or disable list scrolling. */
-        scrollingEnabled?: boolean;
-        /** Specifies when the widget shows the scrollbar. */
-        showScrollbar?: string;
-        /** Specifies whether or not the widget uses native scrolling. */
-        useNativeScrolling?: boolean;
-        /** A Boolean value specifying whether to enable or disable the bounce-back effect. */
-        bounceEnabled?: boolean;
-        /** A Boolean value specifying if the list is scrolled by content. */
-        scrollByContent?: boolean;
-        /** A Boolean value specifying if the list is scrolled using the scrollbar. */
-        scrollByThumb?: boolean;
-        onItemContextMenu?: Function;
-        onItemHold?: Function;
-        /** Specifies whether or not an end-user can collapse groups. */
-        collapsibleGroups?: boolean;
-        /** Specifies whether the next page is loaded when a user scrolls the widget to the bottom or when the "next" button is clicked. */
-        pageLoadMode?: string;
-        /** Specifies whether or not to display controls used to select list items. */
-        showSelectionControls?: boolean;
-        /** Specifies item selection mode. */
-        selectionMode?: string;
-        selectAllText?: string;
-        onSelectAllChanged?: Function;
-        /** Specifies the array of items for a context menu called for a list item. */
-        menuItems?: Array<any>;
-        /** Specifies whether an item context menu is shown when a user holds or swipes an item. */
-        menuMode?: string;
-        /** Specifies whether or not an end user can delete list items. */
-        allowItemDeleting?: boolean;
-        /** Specifies the way a user can delete items from the list. */
-        itemDeleteMode?: string;
-        /** Specifies whether or not an end user can reorder list items. */
-        allowItemReordering?: boolean;
-        /** Specifies whether or not to show the loading panel when the DataSource bound to the widget is loading data. */
-        indicateLoading?: boolean;
-        activeStateEnabled?: boolean;
-    }
-    /** A list widget. */
-    export class dxList extends CollectionWidget {
-        constructor(element: JQuery, options?: dxListOptions);
-        constructor(element: Element, options?: dxListOptions);
-        /** Returns the height of the widget in pixels. */
-        clientHeight(): number;
-        /** Removes the specified item from the list. */
-        deleteItem(itemIndex: any): JQueryPromise<void>;
-        /** Removes the specified item from the list. */
-        deleteItem(itemElement: Element): JQueryPromise<void>;
-        /** Returns a Boolean value that indicates whether or not the specified item is selected. */
-        isItemSelected(itemIndex: any): boolean;
-        /** Returns a Boolean value that indicates whether or not the specified item is selected. */
-        isItemSelected(itemElement: Element): boolean;
-        /** Reloads list data. */
-        reload(): void;
-        /** Moves the specified item to the specified position in the list. */
-        reorderItem(itemElement: Element, toItemElement: Element): JQueryPromise<void>;
-        /** Moves the specified item to the specified position in the list. */
-        reorderItem(itemIndex: any, toItemIndex: any): JQueryPromise<void>;
-        /** Scrolls the list content by the specified number of pixels. */
-        scrollBy(distance: number): void;
-        /** Returns the height of the list content in pixels. */
-        scrollHeight(): number;
-        /** Scrolls list content to the specified position. */
-        scrollTo(location: number): void;
-        /** Scrolls the list to the specified item. */
-        scrollToItem(itemElement: Element): void;
-        /** Scrolls the list to the specified item. */
-        scrollToItem(itemIndex: any): void;
-        /** Returns how far the list content is scrolled from the top. */
-        scrollTop(): number;
-        /** Selects the specified item from the list. */
-        selectItem(itemElement: Element): void;
-        /** Selects the specified item from the list. */
-        selectItem(itemIndex: any): void;
-        /** Deselects the specified item from the list. */
-        unselectItem(itemElement: Element): void;
-        /** Unselects the specified item from the list. */
-        unselectItem(itemIndex: any): void;
-        /** Updates the widget scrollbar according to widget content size. */
-        updateDimensions(): JQueryPromise<void>;
-        /** Expands the specified group. */
-        expandGroup(groupIndex: number): JQueryPromise<void>;
-        /** Collapses the specified group. */
-        collapseGroup(groupIndex: number): JQueryPromise<void>;
-    }
-    export interface dxGalleryOptions extends CollectionWidgetOptions {
-        /** The time, in milliseconds, spent on slide animation. */
-        animationDuration?: number;
-        /** Specifies whether or not to animate the displayed item change. */
-        animationEnabled?: boolean;
-        /** A Boolean value specifying whether or not to allow users to switch between items by clicking an indicator. */
-        indicatorEnabled?: boolean;
-        /** A Boolean value specifying whether or not to scroll back to the first item after the last item is swiped. */
-        loop?: boolean;
-        /** The index of the currently active gallery item. */
-        selectedIndex?: number;
-        /** A Boolean value specifying whether or not to display an indicator that points to the selected gallery item. */
-        showIndicator?: boolean;
-        /** A Boolean value that specifies the availability of the "Forward" and "Back" navigation buttons. */
-        showNavButtons?: boolean;
-        /** The time interval in milliseconds, after which the gallery switches to the next item. */
-        slideshowDelay?: number;
-        /** A Boolean value specifying whether or not to allow users to switch between items by swiping. */
-        swipeEnabled?: boolean;
-        /** Specifies whether or not to display parts of previous and next images along the sides of the current image. */
-        wrapAround?: boolean;
-        /** Specifies if the widget stretches images to fit the total gallery width. */
-        stretchImages?: boolean;
-        /** Specifies the width of an area used to display a single image. */
-        initialItemWidth?: number;
-    }
-    /** An image gallery widget. */
-    export class dxGallery extends CollectionWidget {
-        constructor(element: JQuery, options?: dxGalleryOptions);
-        constructor(element: Element, options?: dxGalleryOptions);
-        /** Shows the specified gallery item. */
-        goToItem(itemIndex: number, animation: boolean): JQueryPromise<any>;
-        /** Shows the next gallery item. */
-        nextItem(animation: boolean): JQueryPromise<any>;
-        /** Shows the previous gallery item. */
-        prevItem(animation: boolean): JQueryPromise<any>;
-    }
-    export interface dxDropDownEditorOptions extends dxTextBoxOptions {
-        /** Specifies the current value displayed by the widget. */
-        value?: Object;
-        /** A handler for the closed event. */
-        onClosed?: Function;
-        /** A handler for the opened event. */
-        onOpened?: Function;
-        /** Specifies whether or not the drop-down editor is displayed. */
-        opened?: boolean;
-        /** Specifies whether or not the widget allows an end-user to enter a custom value. */
-        fieldEditEnabled?: boolean;
-        /** Specifies the way an end-user applies the selected value. */
-        applyValueMode?: string;
-        /** Specifies whether widget content is rendered when the widget is shown or when rendering the widget. */
-        deferRendering?: boolean;
-        activeStateEnabled?: boolean;
-    }
-    /** A drop-down editor widget. */
-    export class dxDropDownEditor extends dxTextBox {
-        constructor(element: JQuery, options?: dxDropDownEditorOptions);
-        constructor(element: Element, options?: dxDropDownEditorOptions);
-        /** Closes the drop-down editor. */
-        close(): void;
-        /** Opens the drop-down editor. */
-        open(): void;
-        /** Resets the widget's value to null. */
-        reset(): void;
-        /** Returns an &lt;input&gt; element of the widget. */
-        field(): JQuery;
-        /** Returns an HTML element of the popup window content. */
-        content(): JQuery;
-    }
-    export interface dxDateBoxOptions extends dxTextEditorOptions {
-        /** A format used to display date/time information. */
-        format?: string;
-        /** A Globalize format string specifying the date display format. */
-        formatString?: string;
-        /** The last date that can be selected within the widget. */
-        max?: any;
-        /** The minimum date that can be selected within the widget. */
-        min?: any;
-        /** The text displayed by the widget when the widget value is not yet specified. This text is also used as a title of the date picker. */
-        placeholder?: string;
-        /**
-         * Specifies whether or not a user can pick out a date using the drop-down calendar.
-         * @deprecated Use 'pickerType' option instead.
-         */
-        useCalendar?: boolean;
-        /** An object or a value, specifying the date and time currently selected using the date box. */
-        value?: any;
-        /**
-         * Specifies whether or not the widget uses the native HTML input element.
-         * @deprecated Use 'pickerType' option instead.
-         */
-        useNative?: boolean;
-        /** Specifies the interval between neighboring values in the popup list in minutes. */
-        interval?: number;
-        /** Specifies the maximum zoom level of a calendar, which is used to pick the date. */
-        maxZoomLevel?: string;
-        /** Specifies the minimal zoom level of a calendar, which is used to pick the date. */
-        minZoomLevel?: string;
-        /** Specifies the type of date/time picker. */
-        pickerType?: string;
-        /** Specifies the message displayed if the typed value is not a valid date or time. */
-        invalidDateMessage?: string;
-        /** Specifies the message displayed if the specified date is later than the max value or earlier than the min value. */
-        dateOutOfRangeMessage?: string;
-        /** The text displayed on the Apply button. */
-        applyButtonText?: string;
-        /** The text displayed on the Cancel button. */
-        cancelButtonText?: string;
-    }
-    /** A date box widget. */
-    export class dxDateBox extends dxDropDownEditor {
-        constructor(element: JQuery, options?: dxDateBoxOptions);
-        constructor(element: Element, options?: dxDateBoxOptions);
-    }
-    export interface dxCheckBoxOptions extends EditorOptions {
-        activeStateEnabled?: boolean;
-        /** Specifies the widget state. */
-        value?: boolean;
-        /** Specifies the text displayed by the check box. */
-        text?: string;
-    }
-    /** A check box widget. */
-    export class dxCheckBox extends Editor {
-        constructor(element: JQuery, options?: dxCheckBoxOptions);
-        constructor(element: Element, options?: dxCheckBoxOptions);
-    }
-    export interface dxCalendarOptions extends EditorOptions {
-        activeStateEnabled?: boolean;
-        /** Specifies a date displayed on the current calendar page. */
-        currentDate?: Date;
-        /** Specifies the first day of a week. */
-        firstDayOfWeek?: number;
-        /** The latest date the widget allows to select. */
-        max?: Date;
-        /** The earliest date the widget allows to select. */
-        min?: Date;
-        /** Specifies whether or not the widget displays a button that selects the current date. */
-        showTodayButton?: boolean;
-        /** Specifies the current calendar zoom level. */
-        zoomLevel?: string;
-        /** Specifies the maximum zoom level of the calendar. */
-        maxZoomLevel?: string;
-        /** Specifies the minimum zoom level of the calendar. */
-        minZoomLevel?: string;
-        /** The template to be used for rendering calendar cells. */
-        cellTemplate?: any;
-    }
-    /** A calendar widget. */
-    export class dxCalendar extends Editor {
-        constructor(element: JQuery, options?: dxCalendarOptions);
-        constructor(element: Element, options?: dxCalendarOptions);
-    }
-    export interface dxButtonOptions extends WidgetOptions {
-        /** A Boolean value specifying whether or not the widget changes its state when interacting with a user. */
-        activeStateEnabled?: boolean;
-        /** A handler for the click event. */
-        onClick?: any;
-        /** Specifies the icon to be displayed on the button. */
-        icon?: string;
-        iconSrc?: string;
-        /** A template to be used for rendering the dxButton widget. */
-        template?: any;
-        /** The text displayed on the button. */
-        text?: string;
-        /** Specifies the button type. */
-        type?: string;
-        /** Specifies the name of the validation group to be accessed in the click event handler. */
-        validationGroup?: string;
-    }
-    /** A button widget. */
-    export class dxButton extends Widget {
-        constructor(element: JQuery, options?: dxButtonOptions);
-        constructor(element: Element, options?: dxButtonOptions);
-    }
-    export interface dxBoxOptions extends CollectionWidget {
-        /** Specifies how widget items are aligned along the main direction. */
-        align?: string;
-        /** Specifies the direction of item positioning in the widget. */
-        direction?: string;
-        /** Specifies how widget items are aligned cross-wise. */
-        crossAlign?: string;
-    }
-    /** A container widget used to arrange inner elements. */
-    export class dxBox extends CollectionWidget {
-        constructor(element: JQuery, options?: dxBoxOptions);
-        constructor(element: Element, options?: dxBoxOptions);
-    }
-    export interface dxResponsiveBoxOptions extends CollectionWidgetOptions {
-        /** Specifies the collection of rows for the grid used to position layout elements. */
-        rows?: Array<Object>;
-        /** Specifies the collection of columns for the grid used to position layout elements. */
-        cols?: Array<Object>;
-        /** Specifies the function returning the screen factor depending on the screen width. */
-        screenByWidth?: (width: number) => string;
-        /** Specifies the screen factor with which all elements are located in a single column. */
-        singleColumnScreen?: string;
-    }
-    /** A widget used to build an adaptive markup that is dependent on screen resolution. */
-    export class dxResponsiveBox extends CollectionWidget {
-        constructor(element: JQuery, options?: dxBoxOptions);
-        constructor(element: Element, options?: dxBoxOptions);
-    }
-    export interface dxAutocompleteOptions extends dxDropDownListOptions {
-        /** Specifies the current value displayed by the widget. */
-        value?: string;
-        /** The minimum number of characters that must be entered into the text box to begin a search. */
-        minSearchLength?: number;
-        /** Specifies the maximum count of items displayed by the widget. */
-        maxItemCount?: number;
-        /** Gets the currently selected item. */
-        selectedItem?: Object;
-    }
-    /** A textbox widget that supports autocompletion. */
-    export class dxAutocomplete extends dxDropDownList {
-        constructor(element: JQuery, options?: dxAutocompleteOptions);
-        constructor(element: Element, options?: dxAutocompleteOptions);
-        /** Opens the drop-down editor. */
-        open(): void;
-        /** Closes the drop-down editor. */
-        close(): void;
-    }
-    export interface dxAccordionOptions extends CollectionWidgetOptions {
-        /** A number specifying the time in milliseconds spent on the animation of the expanding or collapsing of a panel. */
-        animationDuration?: number;
-        /** Specifies the height of the widget. */
-        height?: any;
-        /** Specifies whether all items can be collapsed or whether at least one item must always be expanded. */
-        collapsible?: boolean;
-        /** Specifies whether the widget can expand several items or only a single item at once. */
-        multiple?: boolean;
-        /** The template to be used for rendering dxAccordion items. */
-        itemTemplate?: any;
-        /** A handler for the itemTitleClick event. */
-        onItemTitleClick?: any;
-        /** A handler for the itemTitleHold event. */
-        onItemTitleHold?: Function;
-        /** The template to be used for rendering an item title. */
-        itemTitleTemplate?: any;
-        /** The index number of the currently selected item. */
-        selectedIndex?: number;
-        /** Specifies whether widget content is rendered when the widget is shown or when rendering the widget. */
-        deferRendering?: boolean;
-    }
-    /** A widget that displays data source items on collapsible panels. */
-    export class dxAccordion extends CollectionWidget {
-        constructor(element: JQuery, options?: dxAccordionOptions);
-        constructor(element: Element, options?: dxAccordionOptions);
-        /** Collapses the specified item. */
-        collapseItem(index: number): JQueryPromise<dxAccordion>;
-        /** Expands the specified item. */
-        expandItem(index: number): JQueryPromise<dxAccordion>;
-        /** Updates the dimensions of the widget contents. */
-        updateDimensions(): JQueryPromise<dxAccordion>;
-    }
-    export interface dxFileUploaderOptions extends EditorOptions {
-        /** A read-only option that holds a File instance representing the selected file. */
-        value?: File;
-        /** Holds the File instances representing files selected in the widget. */
-        values?: Array<File>;
-        buttonText?: string;
-        /** The text displayed on the button that opens the file browser. */
-        selectButtonText?: string;
-        /** The text displayed on the button that starts uploading. */
-        uploadButtonText?: string;
-        /** Specifies the text displayed on the area to which an end-user can drop a file. */
-        labelText?: string;
-        /** Specifies the value passed to the name attribute of the underlying input element. */
-        name?: string;
-        /** Specifies whether the widget enables an end-user to select a single file or multiple files. */
-        multiple?: boolean;
-        /** Specifies a file type or several types accepted by the widget. */
-        accept?: string;
-        /** Specifies a target Url for the upload request. */
-        uploadUrl?: string;
-        /** Specifies if an end user can remove a file from the selection and interrupt uploading. */
-        allowCanceling?: boolean;
-        /** Specifies whether or not the widget displays the list of selected files. */
-        showFileList?: boolean;
-        /** Gets the current progress in percentages. */
-        progress?: number;
-        /** The message displayed by the widget when it is ready to upload the specified files. */
-        readyToUploadMessage?: string;
-        /** The message displayed by the widget when uploading is finished. */
-        uploadedMessage?: string;
-        /** The message displayed by the widget on uploading failure. */
-        uploadFailedMessage?: string;
-        /** Specifies how the widget uploads files. */
-        uploadMode?: string;
-        /** A handler for the uploaded event. */
-        onUploaded?: Function;
-        /** A handler for the uploaded event. */
-        onProgress?: Function;
-        /** A handler for the uploadError event. */
-        onUploadError?: Function;
-        /** A handler for the valueChanged event. */
-        onValueChanged?: Function;
-    }
-    /** A widget used to select and upload a file or multiple files. */
-    export class dxFileUploader extends Editor {
-        constructor(element: JQuery, options?: dxFileUploaderOptions);
-        constructor(element: Element, options?: dxFileUploaderOptions);
-    }
-    export interface dxTrackBarOptions extends EditorOptions {
-        /** The minimum value the widget can accept. */
-        min?: number;
-        /** The maximum value the widget can accept. */
-        max?: number;
-        /** The current widget value. */
-        value?: number;
-    }
-    /** A base class for track bar widgets. */
-    export class dxTrackBar extends Editor {
-        constructor(element: JQuery, options?: dxTrackBarOptions);
-        constructor(element: Element, options?: dxTrackBarOptions);
-    }
-    export interface dxProgressBarOptions extends dxTrackBarOptions {
-        /** Specifies a format for the progress status. */
-        statusFormat?: any;
-        /** Specifies whether or not the widget displays a progress status. */
-        showStatus?: boolean;
-        /** A handler for the complete event. */
-        onComplete?: Function;
-    }
-    /** A widget used to indicate progress. */
-    export class dxProgressBar extends dxTrackBar {
-        constructor(element: JQuery, options?: dxProgressBarOptions);
-        constructor(element: Element, options?: dxProgressBarOptions);
-    }
-    export interface dxSliderOptions extends dxTrackBarOptions {
-        activeStateEnabled?: boolean;
-        /** The slider step size. */
-        step?: number;
-        /** The current slider value. */
-        value?: number;
-        /** Specifies whether or not to highlight a range selected within the widget. */
-        showRange?: boolean;
-        /** Specifies the size of a step by which a slider handle is moved when a user uses the Page up or Page down keyboard shortcuts. */
-        keyStep?: number;
-        /** Specifies options for the slider tooltip. */
-        tooltip?: {
-            /** Specifies whether or not the tooltip is enabled. */
-            enabled?: boolean;
-            /** Specifies format for the tooltip. */
-            format?: any;
-            /** Specifies whether the tooltip is located over or under the slider. */
-            position?: string;
-            /** Specifies whether the widget always shows a tooltip or only when a pointer is over the slider. */
-            showMode?: string;
-        };
-        /** Specifies options for labels displayed at the min and max values. */
-        label?: {
-            /** Specifies whether or not slider labels are visible. */
-            visible?: boolean;
-            /** Specifies whether labels are located over or under the scale. */
-            position?: string;
-            /** Specifies a format for labels. */
-            format?: any;
-        };
-    }
-    /** A widget that allows a user to select a numeric value within a given range. */
-    export class dxSlider extends dxTrackBar {
-        constructor(element: JQuery, options?: dxSliderOptions);
-        constructor(element: Element, options?: dxSliderOptions);
-    }
-    export interface dxRangeSliderOptions extends dxSliderOptions {
-        /** The left edge of the interval currently selected using the range slider. */
-        start?: number;
-        /** The right edge of the interval currently selected using the range slider. */
-        end?: number;
-    }
-    /** A widget that enables a user to select a range of numeric values. */
-    export class dxRangeSlider extends dxSlider {
-        constructor(element: JQuery, options?: dxRangeSliderOptions);
-        constructor(element: Element, options?: dxRangeSliderOptions);
-    }
-    export interface dxFormItemLabel {
-        /** Specifies the label text. */
-        text?: string;
-        /** Specifies whether or not the label is visible. */
-        visible?: boolean;
-        /** Specifies whether or not a colon is displayed at the end of the current label. */
-        showColon?: boolean;
-        /** Specifies the location of a label against the editor. */
-        location?: string;
-        /** Specifies the label horizontal alignment. */
-        alignment?: string;
-    }
-    export interface dxFormItem {
-        /** Specifies the type of the current item. */
-        itemType?: string;
-        /** Specifies whether or not the current form item is visible. */
-        visible?: boolean;
-        /** Specifies the sequence number of the item in a form, group or tab. */
-        visibleIndex?: number;
-        /** Specifies a CSS class to be applied to the form item. */
-        cssClass?: string;
-        /** Specifies the number of columns spanned by the item. */
-        colSpan?: number;
-    }
-    export interface dxFormEmptyItem extends dxFormItem {
-        /** Specifies the form item name. */
-        name?: string;
-    }
-    export interface dxFormSimpleItem extends dxFormItem {
-        /** Specifies the path to the formData object field bound to the current form item. */
-        dataField?: string;
-        /** Specifies the form item name. */
-        name?: string;
-        /** Specifies which editor widget is used to display and edit the form item value. */
-        editorType?: string;
-        /** Specifies configuration options for the editor widget of the current form item. */
-        editorOptions?: Object;
-        /** A template to be used for rendering the form item. */
-        template?: any;
-        /** Specifies the help text displayed for the current form item. */
-        helpText?: string;
-        /** Specifies whether the current form item is required. */
-        isRequired?: boolean;
-        /** Specifies options for the form item label. */
-        label?: dxFormItemLabel;
-        /** An array of validation rules to be checked for the form item editor. */
-        validationRules?: Array<any>;
-    }
-    export interface dxFormGroupItem extends dxFormItem {
-        /** Specifies the group caption. */
-        caption?: string;
-        /** A template to be used for rendering the group item. */
-        template?: any;
-        /** The count of columns in the group layout. */
-        colCount?: number;
-        /** Specifies whether or not all group item labels are aligned. */
-        alignItemLabels?: boolean;
-        /** Holds an array of form items displayed within the group. */
-        items?: Array<dxFormItem>;
-    }
-    export interface dxFormTab {
-        /** Specifies the tab title. */
-        title?: string;
-        /** The count of columns in the tab layout. */
-        colCount?: number;
-        /** Specifies whether or not labels of items displayed within the current tab are aligned. */
-        alignItemLabels?: boolean;
-        /** Holds an array of form items displayed within the tab. */
-        items?: Array<dxFormItem>;
-        /** Specifies a badge text for the tab. */
-        badge?: string;
-        /** A Boolean value specifying whether or not the tab can respond to user interaction. */
-        disabled?: boolean;
-        /** Specifies the icon to be displayed on the tab. */
-        icon?: string;
-        /** The template to be used for rendering the tab. */
-        tabTemplate?: any;
-        /** The template to be used for rendering the tab content. */
-        template?: any;
-    }
-    export interface dxFormTabbedItem extends dxFormItem {
-        /** Holds a configuration object for the dxTabPanel widget used to display the current form item. */
-        tabPanelOptions?: Object;
-        /** An array of tab configuration objects. */
-        tabs?: Array<dxFormTab>;
-    }
-    export interface dxFormOptions extends WidgetOptions {
-        /** An object providing data for the form. */
-        formData?: Object;
-        /** The count of columns in the form layout. */
-        colCount?: any;
-        /** Specifies the location of a label against the editor. */
-        labelLocation?: string;
-        /** Specifies whether or not all editors on the form are read-only. */
-        readOnly?: boolean;
-        /** A handler for the fieldDataChanged event. */
-        onFieldDataChanged?: (e: Object) => void;
-        /** A handler for the editorEnterKey event. */
-        onEditorEnterKey?: (e: Object) => void;
-        /** Specifies a function that customizes a form item after it has been created. */
-        customizeItem?: Function;
-        /** The minimum column width used for calculating column count in the form layout. */
-        minColWidth?: number;
-        /** Specifies whether or not all root item labels are aligned. */
-        alignItemLabels?: boolean;
-        /** Specifies whether or not item labels in all groups are aligned. */
-        alignItemLabelsInAllGroups?: boolean;
-        /** Specifies whether or not a colon is displayed at the end of form labels. */
-        showColonAfterLabel?: boolean;
-        /** Specifies whether or not the required mark is displayed for required fields. */
-        showRequiredMark?: boolean;
-        /** Specifies whether or not the optional mark is displayed for optional fields. */
-        showOptionalMark?: boolean;
-        /** The text displayed for required fields. */
-        requiredMark?: string;
-        /** The text displayed for optional fields. */
-        optionalMark?: string;
-        /** Specifies the message that is shown for end-users a required field value is not specified. */
-        requiredMessage?: string;
-        /** Specifies whether or not the total validation summary is displayed on the form. */
-        showValidationSummary?: boolean;
-        /** Holds an array of form items. */
-        items?: Array<dxFormItem>;
-        /** A Boolean value specifying whether to enable or disable form scrolling. */
-        scrollingEnabled?: boolean;
-        onContentReady?: Function;
-    }
-    /** A form widget used to display and edit values of object fields. */
-    export class dxForm extends Widget {
-        constructor(element: JQuery, options?: dxFormOptions);
-        constructor(element: Element, options?: dxFormOptions);
-        /** Updates the specified field of the formData object and the corresponding editor on the form. */
-        updateData(dataField: string, value: any): void;
-        /** Updates the specified fields of the formData object and the corresponding editors on the form. */
-        updateData(data: Object): void;
-        /** Updates the value of a form item option. */
-        itemOption(field: string, option: string, value: any): void;
-        /** Updates the values of form item options. */
-        itemOption(field: string, options: Object): void;
-        /** Returns an editor instance associated with the specified formData field. */
-        getEditor(field: string): Object;
-        /** Updates the dimensions of the widget contents. */
-        updateDimensions(): JQueryPromise<void>;
-        /** Validates the values of all editors on the form against the list of the validation rules specified for each form item. */
-        validate(): Object;
-    }
-}
-interface JQuery {
-    dxProgressBar(): JQuery;
-    dxProgressBar(options: "instance"): DevExpress.ui.dxProgressBar;
-    dxProgressBar(options: string): any;
-    dxProgressBar(options: string, ...params: any[]): any;
-    dxProgressBar(options: DevExpress.ui.dxProgressBarOptions): JQuery;
-    dxSlider(): JQuery;
-    dxSlider(options: "instance"): DevExpress.ui.dxSlider;
-    dxSlider(options: string): any;
-    dxSlider(options: string, ...params: any[]): any;
-    dxSlider(options: DevExpress.ui.dxSliderOptions): JQuery;
-    dxRangeSlider(): JQuery;
-    dxRangeSlider(options: "instance"): DevExpress.ui.dxRangeSlider;
-    dxRangeSlider(options: string): any;
-    dxRangeSlider(options: string, ...params: any[]): any;
-    dxRangeSlider(options: DevExpress.ui.dxRangeSliderOptions): JQuery;
-    dxFileUploader(): JQuery;
-    dxFileUploader(options: "instance"): DevExpress.ui.dxFileUploader;
-    dxFileUploader(options: string): any;
-    dxFileUploader(options: string, ...params: any[]): any;
-    dxFileUploader(options: DevExpress.ui.dxFileUploaderOptions): JQuery;
-    dxValidator(): JQuery;
-    dxValidator(options: "instance"): DevExpress.ui.dxValidator;
-    dxValidator(options: string): any;
-    dxValidator(options: string, ...params: any[]): any;
-    dxValidator(options: DevExpress.ui.dxValidatorOptions): JQuery;
-    dxValidationGroup(): JQuery;
-    dxValidationGroup(options: "instance"): DevExpress.ui.dxValidationGroup;
-    dxValidationGroup(options: string): any;
-    dxValidationGroup(options: string, ...params: any[]): any;
-    dxValidationSummary(): JQuery;
-    dxValidationSummary(options: "instance"): DevExpress.ui.dxValidationSummary;
-    dxValidationSummary(options: string): any;
-    dxValidationSummary(options: string, ...params: any[]): any;
-    dxValidationSummary(options: DevExpress.ui.dxValidationSummaryOptions): JQuery;
-    dxTooltip(): JQuery;
-    dxTooltip(options: "instance"): DevExpress.ui.dxTooltip;
-    dxTooltip(options: string): any;
-    dxTooltip(options: string, ...params: any[]): any;
-    dxTooltip(options: DevExpress.ui.dxTooltipOptions): JQuery;
-    dxResizable(): JQuery;
-    dxResizable(options: "instance"): DevExpress.ui.dxResizable;
-    dxResizable(options: string): any;
-    dxResizable(options: string, ...params: any[]): any;
-    dxResizable(options: DevExpress.ui.dxResizableOptions): JQuery;
-    dxDropDownList(): JQuery;
-    dxDropDownList(options: "instance"): DevExpress.ui.dxDropDownList;
-    dxDropDownList(options: string): any;
-    dxDropDownList(options: string, ...params: any[]): any;
-    dxDropDownList(options: DevExpress.ui.dxDropDownListOptions): JQuery;
-    dxToolbar(): JQuery;
-    dxToolbar(options: "instance"): DevExpress.ui.dxToolbar;
-    dxToolbar(options: string): any;
-    dxToolbar(options: string, ...params: any[]): any;
-    dxToolbar(options: DevExpress.ui.dxToolbarOptions): JQuery;
-    dxToast(): JQuery;
-    dxToast(options: "instance"): DevExpress.ui.dxToast;
-    dxToast(options: string): any;
-    dxToast(options: string, ...params: any[]): any;
-    dxToast(options: DevExpress.ui.dxToastOptions): JQuery;
-    dxTextEditor(): JQuery;
-    dxTextEditor(options: "instance"): DevExpress.ui.dxTextEditor;
-    dxTextEditor(options: string): any;
-    dxTextEditor(options: string, ...params: any[]): any;
-    dxTextEditor(options: DevExpress.ui.dxTextEditorOptions): JQuery;
-    dxTextBox(): JQuery;
-    dxTextBox(options: "instance"): DevExpress.ui.dxTextBox;
-    dxTextBox(options: string): any;
-    dxTextBox(options: string, ...params: any[]): any;
-    dxTextBox(options: DevExpress.ui.dxTextBoxOptions): JQuery;
-    dxTextArea(): JQuery;
-    dxTextArea(options: "instance"): DevExpress.ui.dxTextArea;
-    dxTextArea(options: string): any;
-    dxTextArea(options: string, ...params: any[]): any;
-    dxTextArea(options: DevExpress.ui.dxTextAreaOptions): JQuery;
-    dxTabs(): JQuery;
-    dxTabs(options: "instance"): DevExpress.ui.dxTabs;
-    dxTabs(options: string): any;
-    dxTabs(options: string, ...params: any[]): any;
-    dxTabs(options: DevExpress.ui.dxTabsOptions): JQuery;
-    dxTabPanel(): JQuery;
-    dxTabPanel(options: "instance"): DevExpress.ui.dxTabPanel;
-    dxTabPanel(options: string): any;
-    dxTabPanel(options: string, ...params: any[]): any;
-    dxTabPanel(options: DevExpress.ui.dxTabPanelOptions): JQuery;
-    dxSelectBox(): JQuery;
-    dxSelectBox(options: "instance"): DevExpress.ui.dxSelectBox;
-    dxSelectBox(options: string): any;
-    dxSelectBox(options: string, ...params: any[]): any;
-    dxSelectBox(options: DevExpress.ui.dxSelectBoxOptions): JQuery;
-    dxTagBox(): JQuery;
-    dxTagBox(options: "instance"): DevExpress.ui.dxTagBox;
-    dxTagBox(options: string): any;
-    dxTagBox(options: string, ...params: any[]): any;
-    dxTagBox(options: DevExpress.ui.dxTagBoxOptions): JQuery;
-    dxScrollView(): JQuery;
-    dxScrollView(options: "instance"): DevExpress.ui.dxScrollView;
-    dxScrollView(options: string): any;
-    dxScrollView(options: string, ...params: any[]): any;
-    dxScrollView(options: DevExpress.ui.dxScrollViewOptions): JQuery;
-    dxScrollable(): JQuery;
-    dxScrollable(options: "instance"): DevExpress.ui.dxScrollable;
-    dxScrollable(options: string): any;
-    dxScrollable(options: string, ...params: any[]): any;
-    dxScrollable(options: DevExpress.ui.dxScrollableOptions): JQuery;
-    dxRadioGroup(): JQuery;
-    dxRadioGroup(options: "instance"): DevExpress.ui.dxRadioGroup;
-    dxRadioGroup(options: string): any;
-    dxRadioGroup(options: string, ...params: any[]): any;
-    dxRadioGroup(options: DevExpress.ui.dxRadioGroupOptions): JQuery;
-    dxPopup(): JQuery;
-    dxPopup(options: "instance"): DevExpress.ui.dxPopup;
-    dxPopup(options: string): any;
-    dxPopup(options: string, ...params: any[]): any;
-    dxPopup(options: DevExpress.ui.dxPopupOptions): JQuery;
-    dxPopover(): JQuery;
-    dxPopover(options: "instance"): DevExpress.ui.dxPopover;
-    dxPopover(options: string): any;
-    dxPopover(options: string, ...params: any[]): any;
-    dxPopover(options: DevExpress.ui.dxPopoverOptions): JQuery;
-    dxOverlay(): JQuery;
-    dxOverlay(options: "instance"): DevExpress.ui.dxOverlay;
-    dxOverlay(options: string): any;
-    dxOverlay(options: string, ...params: any[]): any;
-    dxOverlay(options: DevExpress.ui.dxOverlayOptions): JQuery;
-    dxNumberBox(): JQuery;
-    dxNumberBox(options: "instance"): DevExpress.ui.dxNumberBox;
-    dxNumberBox(options: string): any;
-    dxNumberBox(options: string, ...params: any[]): any;
-    dxNumberBox(options: DevExpress.ui.dxNumberBoxOptions): JQuery;
-    dxNavBar(): JQuery;
-    dxNavBar(options: "instance"): DevExpress.ui.dxNavBar;
-    dxNavBar(options: string): any;
-    dxNavBar(options: string, ...params: any[]): any;
-    dxNavBar(options: DevExpress.ui.dxNavBarOptions): JQuery;
-    dxMultiView(): JQuery;
-    dxMultiView(options: "instance"): DevExpress.ui.dxMultiView;
-    dxMultiView(options: string): any;
-    dxMultiView(options: string, ...params: any[]): any;
-    dxMultiView(options: DevExpress.ui.dxMultiViewOptions): JQuery;
-    dxMap(): JQuery;
-    dxMap(options: "instance"): DevExpress.ui.dxMap;
-    dxMap(options: string): any;
-    dxMap(options: string, ...params: any[]): any;
-    dxMap(options: DevExpress.ui.dxMapOptions): JQuery;
-    dxLookup(): JQuery;
-    dxLookup(options: "instance"): DevExpress.ui.dxLookup;
-    dxLookup(options: string): any;
-    dxLookup(options: string, ...params: any[]): any;
-    dxLookup(options: DevExpress.ui.dxLookupOptions): JQuery;
-    dxLoadPanel(): JQuery;
-    dxLoadPanel(options: "instance"): DevExpress.ui.dxLoadPanel;
-    dxLoadPanel(options: string): any;
-    dxLoadPanel(options: string, ...params: any[]): any;
-    dxLoadPanel(options: DevExpress.ui.dxLoadPanelOptions): JQuery;
-    dxLoadIndicator(): JQuery;
-    dxLoadIndicator(options: "instance"): DevExpress.ui.dxLoadIndicator;
-    dxLoadIndicator(options: string): any;
-    dxLoadIndicator(options: string, ...params: any[]): any;
-    dxLoadIndicator(options: DevExpress.ui.dxLoadIndicatorOptions): JQuery;
-    dxList(): JQuery;
-    dxList(options: "instance"): DevExpress.ui.dxList;
-    dxList(options: string): any;
-    dxList(options: string, ...params: any[]): any;
-    dxList(options: DevExpress.ui.dxListOptions): JQuery;
-    dxGallery(): JQuery;
-    dxGallery(options: "instance"): DevExpress.ui.dxGallery;
-    dxGallery(options: string): any;
-    dxGallery(options: string, ...params: any[]): any;
-    dxGallery(options: DevExpress.ui.dxGalleryOptions): JQuery;
-    dxDropDownEditor(): JQuery;
-    dxDropDownEditor(options: "instance"): DevExpress.ui.dxDropDownEditor;
-    dxDropDownEditor(options: string): any;
-    dxDropDownEditor(options: string, ...params: any[]): any;
-    dxDropDownEditor(options: DevExpress.ui.dxDropDownEditorOptions): JQuery;
-    dxDateBox(): JQuery;
-    dxDateBox(options: "instance"): DevExpress.ui.dxDateBox;
-    dxDateBox(options: string): any;
-    dxDateBox(options: string, ...params: any[]): any;
-    dxDateBox(options: DevExpress.ui.dxDateBoxOptions): JQuery;
-    dxCheckBox(): JQuery;
-    dxCheckBox(options: "instance"): DevExpress.ui.dxCheckBox;
-    dxCheckBox(options: string): any;
-    dxCheckBox(options: string, ...params: any[]): any;
-    dxCheckBox(options: DevExpress.ui.dxCheckBoxOptions): JQuery;
-    dxBox(): JQuery;
-    dxBox(options: "instance"): DevExpress.ui.dxBox;
-    dxBox(options: string): any;
-    dxBox(options: string, ...params: any[]): any;
-    dxBox(options: DevExpress.ui.dxBoxOptions): JQuery;
-    dxButton(): JQuery;
-    dxButton(options: "instance"): DevExpress.ui.dxButton;
-    dxButton(options: string): any;
-    dxButton(options: string, ...params: any[]): any;
-    dxButton(options: DevExpress.ui.dxButtonOptions): JQuery;
-    dxCalendar(): JQuery;
-    dxCalendar(options: "instance"): DevExpress.ui.dxCalendar;
-    dxCalendar(options: string): any;
-    dxCalendar(options: string, ...params: any[]): any;
-    dxCalendar(options: DevExpress.ui.dxCalendarOptions): JQuery;
-    dxAccordion(): JQuery;
-    dxAccordion(options: "instance"): DevExpress.ui.dxAccordion;
-    dxAccordion(options: string): any;
-    dxAccordion(options: string, ...params: any[]): any;
-    dxAccordion(options: DevExpress.ui.dxAccordionOptions): JQuery;
-    dxResponsiveBox(): JQuery;
-    dxResponsiveBox(options: "instance"): DevExpress.ui.dxResponsiveBox;
-    dxResponsiveBox(options: string): any;
-    dxResponsiveBox(options: string, ...params: any[]): any;
-    dxResponsiveBox(options: DevExpress.ui.dxResponsiveBoxOptions): JQuery;
-    dxAutocomplete(): JQuery;
-    dxAutocomplete(options: "instance"): DevExpress.ui.dxAutocomplete;
-    dxAutocomplete(options: string): any;
-    dxAutocomplete(options: string, ...params: any[]): any;
-    dxAutocomplete(options: DevExpress.ui.dxAutocompleteOptions): JQuery;
-    dxForm(): JQuery;
-    dxForm(options: "instance"): DevExpress.ui.dxForm;
-    dxForm(options: string): any;
-    dxForm(options: string, ...params: any[]): any;
-    dxForm(options: DevExpress.ui.dxForm): JQuery;
-}
-
-declare namespace DevExpress.ui {
-    export interface dxTileViewOptions extends CollectionWidgetOptions {
-        /** A Boolean value specifying whether or not the widget changes its state when interacting with a user. */
-        activeStateEnabled?: boolean;
-        /** Specifies the height of the base tile view item. */
-        baseItemHeight?: number;
-        /** Specifies the width of the base tile view item. */
-        baseItemWidth?: number;
-        /** Specifies whether tiles are placed horizontally or vertically. */
-        direction?: string;
-        /** Specifies the height of the widget. */
-        height?: any;
-        /** Specifies the distance in pixels between adjacent tiles. */
-        itemMargin?: number;
-        /** A Boolean value specifying whether or not to display a scrollbar. */
-        showScrollbar?: boolean;
-    }
-    /** A widget displaying several blocks of data as tiles. */
-    export class dxTileView extends CollectionWidget {
-        constructor(element: JQuery, options?: dxTileViewOptions);
-        constructor(element: Element, options?: dxTileViewOptions);
-        /** Returns the current scroll position of the widget content. */
-        scrollPosition(): number;
-    }
-    export interface dxSwitchOptions extends EditorOptions {
-	    activeStateEnabled?: boolean;
-        /** Text displayed when the widget is in a disabled state. */
-        offText?: string;
-        /** Text displayed when the widget is in an enabled state. */
-        onText?: string;
-        /** A Boolean value specifying whether the current switch state is "On" or "Off". */
-        value?: boolean;
-    }
-    /** A switch widget. */
-    export class dxSwitch extends Editor {
-        constructor(element: JQuery, options?: dxSwitchOptions);
-        constructor(element: Element, options?: dxSwitchOptions);
-    }
-    export interface dxSlideOutViewOptions extends WidgetOptions {
-        /** Specifies the current menu position. */
-        menuPosition?: string;
-        /** Specifies whether or not the menu panel is visible. */
-        menuVisible?: boolean;
-        /** Specifies whether or not the menu is shown when a user swipes the widget content. */
-        swipeEnabled?: boolean;
-        /** A template to be used for rendering menu panel content. */
-        menuTemplate?: any;
-        /** A template to be used for rendering widget content. */
-        contentTemplate?: any;
-    }
-    /** The widget that allows you to slide-out the current view to reveal a custom menu. */
-    export class dxSlideOutView extends Widget {
-        constructor(element: JQuery, options?: dxSlideOutViewOptions);
-        constructor(element: Element, options?: dxSlideOutViewOptions);
-        /** Returns an HTML element of the widget menu block. */
-        menuContent(): JQuery;
-        /** Returns an HTML element of the widget content block. */
-        content(): JQuery;
-        /** Displays the widget's menu block. */
-        showMenu(): JQueryPromise<void>;
-        /** Hides the widget's menu block. */
-        hideMenu(): JQueryPromise<void>;
-        /** Toggles the visibility of the widget's menu block. */
-        toggleMenuVisibility(): JQueryPromise<void>;
-    }
-    export interface dxSlideOutOptions extends CollectionWidgetOptions {
-        /** A Boolean value specifying whether or not the widget changes its state when interacting with a user. */
-        activeStateEnabled?: boolean;
-        /** A Boolean value specifying whether or not to display a grouped menu. */
-        menuGrouped?: boolean;
-        /** Specifies the current menu position. */
-        menuPosition?: string;
-        /** The name of the template used to display a group header. */
-        menuGroupTemplate?: any;
-        /** The template used to render menu items. */
-        menuItemTemplate?: any;
-        /** A handler for the menuGroupRendered event. */
-        onMenuGroupRendered?: Function;
-        /** A handler for the menuItemRendered event. */
-        onMenuItemRendered?: Function;
-        /** Specifies whether or not the slide-out menu is displayed. */
-        menuVisible?: boolean;
-        /** Indicates whether the menu can be shown/hidden by swiping the widget's main panel. */
-        swipeEnabled?: boolean;
-        /** A template to be used for rendering widget content. */
-        contentTemplate?: any;
-    }
-    /** The widget that allows you to slide-out the current view to reveal an item list. */
-    export class dxSlideOut extends CollectionWidget {
-        constructor(element: JQuery, options?: dxSlideOutOptions);
-        constructor(element: Element, options?: dxSlideOutOptions);
-        /** Hides the widget's slide-out menu. */
-        hideMenu(): JQueryPromise<void>;
-        /** Displays the widget's slide-out menu. */
-        showMenu(): JQueryPromise<void>;
-        /** Toggles the visibility of the widget's slide-out menu. */
-        toggleMenuVisibility(showing: boolean): JQueryPromise<void>;
-    }
-    export interface dxPivotOptions extends CollectionWidgetOptions {
-        /** The index of the currently active pivot item. */
-        selectedIndex?: number;
-        /** A Boolean value specifying whether or not to allow users to switch between items by swiping. */
-        swipeEnabled?: boolean;
-        /** A template to be used for rendering widget content. */
-        contentTemplate?: any;
-        /** The template to be used for rendering an item title. */
-        itemTitleTemplate?: any;
-    }
-    /** A widget that is similar to a traditional tab control, but optimized for the phone with simplified end-user interaction. */
-    export class dxPivot extends CollectionWidget {
-        constructor(element: JQuery, options?: dxPivotOptions);
-        constructor(element: Element, options?: dxPivotOptions);
-    }
-    export interface dxPanoramaOptions extends CollectionWidgetOptions {
-        /** An object exposing options for setting a background image for the panorama. */
-        backgroundImage?: {
-            /** Specifies the height of the panorama's background image. */
-            height?: number;
-            /** Specifies the URL of the image that is used as the panorama's background image. */
-            url?: string;
-            /** Specifies the width of the panorama's background image. */
-            width?: number;
-        };
-        /** The index of the currently active panorama item. */
-        selectedIndex?: number;
-        /** Specifies the widget content title. */
-        title?: string;
-    }
-    /** A widget displaying the required content in a long horizontal canvas that extends beyond the frames of the screen. */
-    export class dxPanorama extends CollectionWidget {
-        constructor(element: JQuery, options?: dxDropDownEditorOptions);
-        constructor(element: Element, options?: dxDropDownEditorOptions);
-    }
-    export interface dxDropDownMenuOptions extends WidgetOptions {
-        /** A handler for the buttonClick event. */
-        onButtonClick?: any;
-        /** The name of the icon to be displayed by the DropDownMenu button. */
-        buttonIcon?: string;
-        /** The text displayed in the DropDownMenu button. */
-        buttonText?: string;
-        buttonIconSrc?: string;
-        /** A data source used to fetch data to be displayed by the widget. */
-        dataSource?: any;
-        /** A handler for the itemClick event. */
-        onItemClick?: any;
-        /** An array of items displayed by the widget. */
-        items?: Array<any>;
-        /** The template to be used for rendering items. */
-        itemTemplate?: any;
-        /** Specifies whether or not to show the drop down menu within a dxPopover widget. */
-        usePopover?: boolean;
-        /** The width of the menu popup in pixels. */
-        popupWidth?: any;
-        /** The height of the menu popup in pixels. */
-        popupHeight?: any;
-        /** Specifies whether or not the drop-down menu is displayed. */
-        opened?: boolean;
-        hoverStateEnabled?: boolean;
-        activeStateEnabled?: boolean;
-    }
-    /** A drop-down menu widget. */
-    export class dxDropDownMenu extends Widget {
-        constructor(element: JQuery, options?: dxDropDownEditorOptions);
-        constructor(element: Element, options?: dxDropDownEditorOptions);
-        /** This section lists the data source fields that are used in a default template for drop-down menu items. */
-        /** Opens the drop-down menu. */
-        open(): void;
-        /** Closes the drop-down menu. */
-        close(): void;
-    }
-    export interface dxActionSheetOptions extends CollectionWidgetOptions {
-        /** A handler for the cancelClick event. */
-        onCancelClick?: any;
-        /** The text displayed in the button that closes the action sheet. */
-        cancelText?: string;
-        /** Specifies whether or not to display the Cancel button in action sheet. */
-        showCancelButton?: boolean;
-        /** A Boolean value specifying whether or not the title of the action sheet is visible. */
-        showTitle?: boolean;
-        /** Specifies the element the action sheet popover points at. */
-        target?: any;
-        /** The title of the action sheet. */
-        title?: string;
-        /** Specifies whether or not to show the action sheet within a dxPopover widget. */
-        usePopover?: boolean;
-        /** A Boolean value specifying whether or not the dxActionSheet widget is visible. */
-        visible?: boolean;
-    }
-    /** A widget consisting of a set of choices related to a certain task. */
-    export class dxActionSheet extends CollectionWidget {
-        constructor(element: JQuery, options?: dxActionSheetOptions);
-        constructor(element: Element, options?: dxActionSheetOptions);
-        /** Hides the widget. */
-        hide(): JQueryPromise<dxActionSheet>;
-        /** Shows the widget. */
-        show(): JQueryPromise<dxActionSheet>;
-        /** Shows or hides the widget depending on the Boolean value passed as the parameter. */
-        toggle(showing: boolean): JQueryPromise<dxActionSheet>;
-    }
-}
-interface JQuery {
-    dxTileView(): JQuery;
-    dxTileView(options: "instance"): DevExpress.ui.dxTileView;
-    dxTileView(options: string): any;
-    dxTileView(options: string, ...params: any[]): any;
-    dxTileView(options: DevExpress.ui.dxTileViewOptions): JQuery;
-    dxSwitch(): JQuery;
-    dxSwitch(options: "instance"): DevExpress.ui.dxSwitch;
-    dxSwitch(options: string): any;
-    dxSwitch(options: string, ...params: any[]): any;
-    dxSwitch(options: DevExpress.ui.dxSwitchOptions): JQuery;
-    dxSlideOut(): JQuery;
-    dxSlideOut(options: "instance"): DevExpress.ui.dxSlideOut;
-    dxSlideOut(options: string): any;
-    dxSlideOut(options: string, ...params: any[]): any;
-    dxSlideOut(options: DevExpress.ui.dxSlideOutOptions): JQuery;
-    dxPivot(): JQuery;
-    dxPivot(options: "instance"): DevExpress.ui.dxPivot;
-    dxPivot(options: string): any;
-    dxPivot(options: string, ...params: any[]): any;
-    dxPivot(options: DevExpress.ui.dxPivotOptions): JQuery;
-    dxPanorama(): JQuery;
-    dxPanorama(options: "instance"): DevExpress.ui.dxPanorama;
-    dxPanorama(options: string): any;
-    dxPanorama(options: string, ...params: any[]): any;
-    dxPanorama(options: DevExpress.ui.dxPanoramaOptions): JQuery;
-    dxActionSheet(): JQuery;
-    dxActionSheet(options: "instance"): DevExpress.ui.dxActionSheet;
-    dxActionSheet(options: string): any;
-    dxActionSheet(options: string, ...params: any[]): any;
-    dxActionSheet(options: DevExpress.ui.dxActionSheetOptions): JQuery;
-    dxDropDownMenu(): JQuery;
-    dxDropDownMenu(options: "instance"): DevExpress.ui.dxDropDownMenu;
-    dxDropDownMenu(options: string): any;
-    dxDropDownMenu(options: string, ...params: any[]): any;
-    dxDropDownMenu(options: DevExpress.ui.dxDropDownMenuOptions): JQuery;
-}
-declare namespace DevExpress.data {
-    export interface XmlaStoreOptions {
-        /** The HTTP address to an XMLA OLAP server. */
-        url?: string;
-        /** The name of the database associated with the Store. */
-        catalog?: string;
-        /** The cube name. */
-        cube?: string;
-        /** A function used to customize a web request before it is sent. */
-        beforeSend?: (request: Object) => void;
-    }
-    /** A Store that provides access to an OLAP cube using the XMLA standard. */
-    export class XmlaStore {
-        constructor(options: XmlaStoreOptions);
-    }
-    export interface PivotGridField {
-        index?: number;
-        /** A boolean value specifying whether or not the field is visible in the pivot grid and the Field Chooser. */
-        visible?: boolean;
-        /** Name of the data source field containing data for the pivot grid field. */
-        dataField?: string;
-        /** A caption that will be displayed in the pivot grid's field chooser to identify the field. */
-        caption?: string;
-        /** Specifies a type of field values. */
-        dataType?: string;
-        /** Specifies how the values of the current field are combined into groups. Cannot be used for the XmlaStore store type. */
-        groupInterval?: any;
-        /** Specifies how to aggregate field data. Cannot be used for the XmlaStore store type. */
-        summaryType?: string;
-        /** Allows you to use a custom aggregate function to calculate the summary values. Cannot be used for the XmlaStore store type. */
-        calculateCustomSummary?: (options: {
-            summaryProcess?: string;
-            value?: any;
-            totalValue?: any;
-        }) => void;
-        /** Specifies the function that determines how to split data from the data source into ranges for header items. Cannot be used for the XmlaStore store type. */
-        selector?: (data: Object) => any;
-        /** Type of the area where the field is located. */
-        area?: string;
-        /** Index among the other fields displayed within the same area. */
-        areaIndex?: number;
-        /** The name of the folder in which the field is located. */
-        displayFolder?: string;
-        /** The name of the group to which the field belongs. */
-        groupName?: string;
-        /** The index of the field within a group. */
-        groupIndex?: number;
-        /** Specifies the initial sort order of field values. */
-        sortOrder?: string;
-        /** Specifies how field data should be sorted. Can be used for the XmlaStore store type only. */
-        sortBy?: string;
-        /** Specifies the data field against which the header items of this field should be sorted. */
-        sortBySummaryField?: string;
-        /** The array of field names that specify a path to column/row whose summary field is used for sorting of this field's header items. */
-        sortBySummaryPath?: Array<any>;
-        /** The filter values for the current field. */
-        filterValues?: Array<any>;
-        /** The filter type for the current field. */
-        filterType?: string;
-        /** Indicates whether all header items of the field's header level are expanded. */
-        expanded?: boolean;
-        /** Specifies whether the field should be treated as a Data Field. */
-        isMeasure?: boolean;
-        /** Specifies a display format for field values. */
-        format?: string;
-        /** Specifies a callback function that returns the text to be displayed in the cells of a field. */
-        customizeText?: (cellInfo: { value: any; valueText: string }) => string;
-        /** Specifies a precision for formatted field values. */
-        precision?: number;
-        /** Specifies how to sort the header items. */
-        sortingMethod?: (a: Object, b: Object) => number;
-        /** Allows an end-user to change sorting options. */
-        allowSorting?: boolean;
-        /** Allows an end-user to sort columns by summary values. */
-        allowSortingBySummary?: boolean;
-        /** Allows an end-user to change filtering options. */
-        allowFiltering?: boolean;
-        /** Allows an end-user to expand/collapse all header items within a header level. */
-        allowExpandAll?: boolean;
-        /** Specifies the absolute width of the field in the pivot grid. */
-        width?: number;
-        /** Specifies the summary post-processing algorithm. */
-        summaryDisplayMode?: string;
-        /** Specifies whether to summarize each next summary value with the previous one by rows or columns. */
-        runningTotal?: string;
-        /** Specifies whether to allow the predefined summary post-processing functions ('absoluteVariation' and 'percentVariation') and runningTotal to take values of different groups into account. */
-        allowCrossGroupCalculation?: boolean;
-        /** Specifies a callback function that allows you to modify summary values after they are calculated. */
-        calculateSummaryValue?: (e: Object) => number;
-        /** Specifies whether or not to display Total values for the field. */
-        showTotals?: boolean;
-        /** Specifies whether or not to display Grand Total values for the field. */
-        showGrandTotals?: boolean;
-    }
-    export class SummaryCell {
-        /** Gets the parent cell in a specified direction. */
-        parent(direction: string): SummaryCell;
-        /** Gets all children cells in a specified direction. */
-        children(direction: string): Array<SummaryCell>;
-        /** Gets a partial Grand Total cell of a row or column. */
-        grandTotal(direction: string): SummaryCell;
-        /** Gets the Grand Total of the entire pivot grid. */
-        grandTotal(): SummaryCell;
-        /** Gets the cell next to the current one in a specified direction. */
-        next(direction: string): SummaryCell;
-        /** Gets the cell next to current in a specified direction. */
-        next(direction: string, allowCrossGroup: boolean): SummaryCell;
-        /** Gets the cell prior to the current one in a specified direction. */
-        prev(direction: string): SummaryCell;
-        /** Gets the cell previous to current in a specified direction. */
-        prev(direction: string, allowCrossGroup: boolean): SummaryCell;
-        /** Gets the child cell in a specified direction. */
-        child(direction: string, fieldValue: any): SummaryCell;
-        /** Gets the cell located by the path of the source cell with one field value changed. */
-        slice(field: PivotGridField, value: any): SummaryCell;
-        /** Gets the header cell of a row or column field to which the current cell belongs. */
-        field(area: string): PivotGridField;
-        /** Gets the value of the current cell. */
-        value(): any;
-        /** Gets the value of the current cell. */
-        value(isCalculatedValue: boolean): any;
-        /** Gets the value of any field linked with the current cell. */
-        value(field: PivotGridField): any;
-        /** Gets the value of any field linked with the current cell. */
-        value(field: PivotGridField, isCalculatedValue: boolean): any;
-    }
-    export interface PivotGridDataSourceOptions {
-        /** Specifies the underlying Store instance used to access data. */
-        store?: any;
-        /** Indicates whether or not the automatic field generation from data in the Store is enabled. */
-        retrieveFields?: boolean;
-        /** Specifies data filtering conditions. Cannot be used for the XmlaStore store type. */
-        filter?: Object;
-        /** An array of pivot grid fields. */
-        fields?: Array<PivotGridField>;
-        /** A handler for the changed event. */
-        onChanged?: () => void;
-        /** A handler for the loadingChanged event. */
-        onLoadingChanged?: (isLoading: boolean) => void;
-        /** A handler for the loadError event. */
-        onLoadError?: (e?: Object) => void;
-        /** A handler for the fieldsPrepared event. */
-        onFieldsPrepared?: (e?: Array<PivotGridField>) => void;
-    }
-    /** An object that provides access to data for the dxPivotGrid widget. */
-    export class PivotGridDataSource implements EventsMixin<PivotGridDataSource> {
-        constructor(options?: PivotGridDataSource);
-        /** Starts reloading data from any store and updating the data source. */
-        reload(): JQueryPromise<any>;
-        /** Starts updating the data source. Reloads data from the XMLA store only. */
-        load(): JQueryPromise<any>;
-        /** Indicates whether or not the PivotGridDataSource is currently being loaded. */
-        isLoading(): boolean;
-        /** Gets data displayed in a PivotGrid. */
-        getData(): Object;
-        /** Gets all fields within a specified area. */
-        getAreaFields(area: string, collectGroups: boolean): Array<PivotGridField>;
-        /** Gets all fields from the data source. */
-        fields(): Array<PivotGridField>;
-        /** Sets the fields option. */
-        fields(fields: Array<PivotGridField>): void;
-        /** Gets current options of a specified field. */
-        field(id: any): PivotGridField;
-        /** Sets one or more options of a specified field. */
-        field(id: any, field: PivotGridField): void;
-        /** Collapses a specified header item. */
-        collapseHeaderItem(area: string, path: Array<any>): void;
-        /** Expands a specified header item. */
-        expandHeaderItem(area: string, path: Array<any>): void;
-        /** Expands all header items of a field. */
-        expandAll(id: any): void;
-        /** Collapses all header items of a field. */
-        collapseAll(id: any): void;
-        /** Disposes of all resources associated with this PivotGridDataSource. */
-        dispose(): void;
-        /** Gets the current filter expression. Cannot be used for the XmlaStore store type. */
-        filter(): Object;
-        /** Applies a new filter expression. Cannot be used for the XmlaStore store type. */
-        filter(filterExpr: Object): void;
-        /** Provides access to a list of records (facts) that were used to calculate a specific summary. */
-        createDrillDownDataSource(options: {
-            columnPath?: Array<any>;
-            rowPath?: Array<any>;
-            dataIndex?: number;
-            maxRowCount?: number;
-            customColumns?: Array<string>;
-        }): DevExpress.data.DataSource;
-        /** Gets the current PivotGridDataSource state (fields configuration, sorting, filters, expanded headers, etc.) */
-        state(): Object;
-        /** Sets the PivotGridDataSource state. */
-        state(state: Object): void;
-        on(eventName: string, eventHandler: Function): PivotGridDataSource;
-        on(events: { [eventName: string]: Function; }): PivotGridDataSource;
-        off(eventName: string): PivotGridDataSource;
-        off(eventName: string, eventHandler: Function): PivotGridDataSource;
-    }
-}
-declare namespace DevExpress.ui {
-    export interface dxSchedulerOptions extends WidgetOptions {
-        /** Specifies a date displayed on the current scheduler view by default. */
-        currentDate?: Date;
-        /** The earliest date the widget allows you to select. */
-        min?: Date;
-        /** The latest date the widget allows you to select. */
-        max?: Date;
-        /** Specifies the view used in the scheduler by default. */
-        currentView?: string;
-        /** A data source used to fetch data to be displayed by the widget. */
-        dataSource?: any;
-        /** Specifies the first day of a week. */
-        firstDayOfWeek?: number;
-        /** The template to be used for rendering appointments. */
-        appointmentTemplate?: any;
-        /** The template to be used for rendering an appointment tooltip. */
-        appointmentTooltipTemplate?: any;
-        /** Lists the views to be available within the scheduler's View Selector. */
-        views?: Array<string>;
-        /** Specifies the resource kinds by which the scheduler's appointments are grouped in a timetable. */
-        groups?: Array<string>;
-        /** Specifies a start hour in the scheduler view's time interval. */
-        startDayHour?: number;
-        /** Specifies an end hour in the scheduler view's time interval. */
-        endDayHour?: number;
-        /** Specifies whether or not the "All-day" panel is visible. */
-        showAllDayPanel?: boolean;
-        /** Specifies cell duration in minutes. */
-        cellDuration?: number;
-        /** Specifies the edit mode for recurrent appointments. */
-        recurrenceEditMode?: string;
-        /** Specifies which editing operations an end-user can perform on appointments. */
-        editing?: {
-            /** Specifies whether or not an end-user can add appointments. */
-            allowAdding?: boolean;
-            /** Specifies whether or not an end-user can change appointment options. */
-            allowUpdating?: boolean;
-            /** Specifies whether or not an end-user can delete appointments. */
-            allowDeleting?: boolean;
-            /** Specifies whether or not an end-user can change an appointment duration. */
-            allowResizing?: boolean;
-            /** Specifies whether or not an end-user can drag appointments. */
-            allowDragging?: boolean;
-        }
-        /** Specifies an array of resources available in the scheduler. */
-        resources?: Array<{
-            /** Indicates whether or not several resources of this kind can be assigned to an appointment. */
-            allowMultiple?: boolean;
-            /**
-             * Indicates whether or not resources of this kind have priority in the color identification of the appointments that have resources of different kinds assigned.
-             * @deprecated Use the 'useColorAsDefault' property instead
-             */
-            mainColor?: boolean;
-            /** Indicates whether or not resources of this kind have priority in the color identification of the appointments that have resources of different kinds assigned. */
-            useColorAsDefault?: boolean;
-            /** A data source used to fetch resources to be available in the scheduler. */
-            dataSource?: any;
-            /** Specifies the resource object field whose value is displayed by the Resource editor in the Appointment popup window. */
-            displayExpr?: any;
-            /** Specifies the resource object field that is used as a value of the Resource editor in the Appointment popup window. */
-            valueExpr?: any;
-            /** The name of the appointment object field that specifies a resource of this kind. */
-            field?: string;
-            /** Specifies the label of the Appointment popup window field that allows end users to assign a resource of this kind. */
-            label?: string;
-        }>;
-        /** A handler for the AppointmentAdding event. */
-        onAppointmentAdding?: Function;
-        /** A handler for the appointmentAdded event. */
-        onAppointmentAdded?: Function;
-        /** A handler for the AppointmentUpdating event. */
-        onAppointmentUpdating?: Function;
-        /** A handler for the appointmentUpdated event. */
-        onAppointmentUpdated?: Function;
-        /** A handler for the AppointmentDeleting event. */
-        onAppointmentDeleting?: Function;
-        /** A handler for the appointmentDeleted event. */
-        onAppointmentDeleted?: Function;
-        /** A handler for the appointmentRendered event. */
-        onAppointmentRendered?: Function;
-        /** A handler for the appointmentClick event. */
-        onAppointmentClick?: any;
-        /** A handler for the appointmentDblClick event. */
-        onAppointmentDblClick?: any;
-        /** A handler for the cellClick event. */
-        onCellClick?: any;
-        /** A handler for the appointmentFormCreated event. */
-        onAppointmentFormCreated?: Function;
-        /** Specifies whether or not an end-user can scroll the view horizontally. */
-        horizontalScrollingEnabled?: boolean;
-        /** Specifies whether a user can switch views using tabs or a drop-down menu. */
-        useDropDownViewSwitcher?: boolean;
-        /** Specifies the name of the data source item field that defines the start of an appointment. */
-        startDateExpr?: string;
-        /** Specifies the name of the data source item field that defines the ending of an appointment. */
-        endDateExpr?: string;
-        /** Specifies the name of the data source item field that holds the subject of an appointment. */
-        textExpr?: string;
-        /** Specifies the name of the data source item field whose value holds the description of the corresponding appointment. */
-        descriptionExpr?: string;
-        /** Specifies the name of the data source item field whose value defines whether or not the corresponding appointment is an all-day appointment. */
-        allDayExpr?: string;
-        /** Specifies the name of the data source item field that defines a recurrence rule for generating recurring appointments. */
-        recurrenceRuleExpr?: string;
-        /** Specifies the name of the data source item field that defines exceptions for the current recurring appointment. */
-        recurrenceExceptionExpr?: string;
-        /** Specifies whether filtering is performed on the server or client side. */
-        remoteFiltering?: boolean;
-    }
-    /** A widget that displays scheduled data using different views and provides the capability to load, add and edit appointments. */
-    export class dxScheduler extends Widget {
-        constructor(element: JQuery, options?: dxSchedulerOptions);
-        constructor(element: Element, options?: dxSchedulerOptions);
-        /** Add the appointment defined by the object passed as a parameter to the data associated with the widget. */
-        addAppointment(appointment: Object): void;
-        /** Updates the appointment specified by the first method parameter by the appointment object specified by the second method parameter in the the data associated with the widget. */
-        updateAppointment(target: Object, appointment: Object): void;
-        /** Deletes the appointment defined by the parameter from the the data associated with the widget. */
-        deleteAppointment(appointment: Object): void;
-        /** Scrolls the scheduler work space to the specified time. */
-        scrollToTime(hours: number, minutes: number): void;
-        /** Displays the Appointment Details popup. */
-        showAppointmentPopup(appointmentData: Object, createNewAppointment?: boolean): void;
-    }
-    export interface dxColorBoxOptions extends dxDropDownEditorOptions {
-        /** Specifies the text displayed on the button that applies changes and closes the drop-down editor. */
-        applyButtonText?: string;
-        applyValueMode?: string;
-        /** Specifies the text displayed on the button that cancels changes and closes the drop-down editor. */
-        cancelButtonText?: string;
-        /** Specifies whether or not the widget value includes the alpha channel component. */
-        editAlphaChannel?: boolean;
-        /** Specifies the size of a step by which a handle is moved using a keyboard shortcut. */
-        keyStep?: number;
-    }
-    /** A widget used to specify a color value. */
-    export class dxColorBox extends dxDropDownEditor {
-        constructor(element: JQuery, options?: dxColorBoxOptions);
-        constructor(element: Element, options?: dxColorBoxOptions);
-    }
-    export interface HierarchicalCollectionWidgetOptions extends CollectionWidgetOptions {
-        /** Specifies the name of the data source item field whose value is displayed by the widget. */
-        displayExpr?: any;
-        /** Specifies the name of the data source item field used as a key. */
-        keyExpr?: any;
-        /** Specifies the name of the data source item field whose value defines whether or not the corresponding widget items is selected. */
-        selectedExpr?: any;
-        /** Specifies the name of the data source item field that contains an array of nested items. */
-        itemsExpr?: any;
-        /** Specifies the name of the data source item field whose value defines whether or not the corresponding widget item is disabled. */
-        disabledExpr?: any;
-        /** Specifies the name of the data source item field that holds the key of the parent item. */
-        parentIdExpr?: any;
-        /** Specifies the name of the data source item field whose value defines whether or not the corresponding widget items is expanded. */
-        expandedExpr?: any;
-        hoverStateEnabled?: boolean;
-        focusStateEnabled?: boolean;
-    }
-    export class HierarchicalCollectionWidget extends CollectionWidget {
-    }
-    export interface dxTreeViewOptions extends HierarchicalCollectionWidgetOptions {
-        /** Specifies whether or not to animate item collapsing and expanding. */
-        animationEnabled?: boolean;
-        /** Specifies whether a nested or plain array is used as a data source. */
-        dataStructure?: string;
-        /** Specifies whether or not a user can expand all tree view items by the "*" hot key. */
-        expandAllEnabled?: boolean;
-        /**
-         * Specifies whether or not a check box is displayed at each tree view item.
-         * @deprecated Use the showCheckBoxesMode option instead.
-         */
-        showCheckBoxes?: boolean;
-        /** Specifies the current check boxes display mode. */
-        showCheckBoxesMode?: string;
-        /** Specifies whether or not to select nodes recursively. */
-        selectNodesRecursive?: boolean;
-        /** Specifies whether or not all parent nodes of an initially expanded node are displayed expanded. */
-        expandNodesRecursive?: boolean;
-        /**
-         * Specifies whether the "Select All" check box is displayed over the tree view.
-         * @deprecated Use the showCheckBoxesMode option instead.
-         */
-        selectAllEnabled?: boolean;
-        /** Specifies the text displayed at the "Select All" check box. */
-        selectAllText?: string;
-        /** Specifies the name of the data source item field whose value defines whether or not the corresponding node includes child nodes. */
-        hasItemsExpr?: any;
-        /** Specifies if the virtual mode is enabled. */
-        virtualModeEnabled?: boolean;
-        /** Specifies the parent ID value of the root item. */
-        rootValue?: any;
-        /** Specifies the current value used to filter tree view items. */
-        searchValue?: string;
-        /** A string value specifying available scrolling directions. */
-        scrollDirection?: string;
-        /** A handler for the itemSelected event. */
-        onItemSelected?: Function;
-        /** A handler for the itemExpanded event. */
-        onItemExpanded?: Function;
-        /** A handler for the itemCollapsed event. */
-        onItemCollapsed?: Function;
-        onItemClick?: Function;
-        onItemContextMenu?: Function;
-        onItemRendered?: Function;
-        onItemHold?: Function;
-    }
-    /** A widget displaying specified data items as a tree. */
-    export class dxTreeView extends HierarchicalCollectionWidget {
-        constructor(element: JQuery, options?: dxTreeViewOptions);
-        constructor(element: Element, options?: dxTreeViewOptions);
-        /** Updates the tree view scrollbars according to the current size of the widget content. */
-        updateDimensions(): JQueryPromise<void>;
-        /** Selects the specified item. */
-        selectItem(itemElement: any): void;
-        /** Unselects the specified item. */
-        unselectItem(itemElement: any): void;
-        /** Expands the specified item. */
-        expandItem(itemElement: any): void;
-        /** Collapses the specified item. */
-        collapseItem(itemElement: any): void;
-        /** Returns all nodes of the tree view. */
-        getNodes(): Array<Object>;
-        /** Selects all widget items. */
-        selectAll(): void;
-        /** Unselects all widget items. */
-        unselectAll(): void;
-    }
-    export interface dxMenuBaseOptions extends HierarchicalCollectionWidgetOptions {
-        /** An object that defines the animation options of the widget. */
-        animation?: fx.AnimationOptions;
-        /** A Boolean value specifying whether or not the widget changes its state when interacting with a user. */
-        activeStateEnabled?: boolean;
-        /** Specifies the name of the CSS class associated with the menu. */
-        cssClass?: string;
-        /** Holds an array of menu items. */
-        items?: Array<any>;
-        /** Specifies whether or not an item becomes selected if an end-user clicks it. */
-        selectionByClick?: boolean;
-        /** Specifies the selection mode supported by the menu. */
-        selectionMode?: string;
-        /** Specifies options of submenu showing and hiding. */
-        showSubmenuMode?: {
-            /** Specifies the mode name. */
-            name?: string;
-            /** Specifies the delay of submenu show and hiding. */
-            delay?: {
-                /** The time span after which the submenu is shown. */
-                show?: number;
-                /** The time span after which the submenu is hidden. */
-                hide?: number;
-            };
-        };
-    }
-    export class dxMenuBase extends HierarchicalCollectionWidget {
-        constructor(element: JQuery, options?: dxMenuBaseOptions);
-        constructor(element: Element, options?: dxMenuBaseOptions);
-        /** Selects the specified item. */
-        selectItem(itemElement: any): void;
-        /** Unselects the specified item. */
-        unselectItem(itemElement: any): void;
-    }
-    export interface dxMenuOptions extends dxMenuBaseOptions {
-        /** Specifies whether or not the submenu is hidden when the mouse pointer leaves it. */
-        hideSubmenuOnMouseLeave?: boolean;
-        /** Specifies whether the menu has horizontal or vertical orientation. */
-        orientation?: string;
-        /** Specifies options for showing and hiding the first level submenu. */
-        showFirstSubmenuMode?: {
-            /** Specifies the mode name. */
-            name?: string;
-            /** Specifies the delay in submenu showing and hiding. */
-            delay?: {
-                /** The time span after which the submenu is shown. */
-                show?: number;
-                /** The time span after which the submenu is hidden. */
-                hide?: number;
-            };
-        };
-        /** Specifies the direction at which the submenus are displayed. */
-        submenuDirection?: string;
-        /** A handler for the submenuHidden event. */
-        onSubmenuHidden?: Function;
-        /** A handler for the submenuHiding event. */
-        onSubmenuHiding?: Function;
-        /** A handler for the submenuShowing event. */
-        onSubmenuShowing?: Function;
-        /** A handler for the submenuShown event. */
-        onSubmenuShown?: Function;
-    }
-    /** A menu widget. */
-    export class dxMenu extends dxMenuBase {
-        constructor(element: JQuery, options?: dxMenuOptions);
-        constructor(element: Element, options?: dxMenuOptions);
-    }
-    export interface dxContextMenuOptions extends dxMenuBaseOptions {
-        /** Holds an object that specifies options of alternative menu invocation. */
-        alternativeInvocationMode?: {
-            /** Specifies whether or not the standard context menu invocation (on a right mouse click or on a long tap) is disabled. */
-            enabled?: Boolean;
-            /** Specifies the element used to invoke the context menu. */
-            invokingElement?: any;
-        };
-        /** A handler for the hidden event. */
-        onHidden?: Function;
-        /** A handler for the hiding event. */
-        onHiding?: Function;
-        /** A handler for the positioning event. */
-        onPositioning?: Function;
-        /** A handler for the showing event. */
-        onShowing?: Function;
-        /** A handler for the shown event. */
-        onShown?: Function;
-        /** An object defining widget positioning options. */
-        position?: PositionOptions;
-        /** Specifies the direction at which submenus are displayed. */
-        submenuDirection?: string;
-        /** The target element associated with a popover. */
-        target?: any;
-        /** A Boolean value specifying whether or not the widget is visible. */
-        visible?: boolean;
-    }
-    /** A context menu widget. */
-    export class dxContextMenu extends dxMenuBase {
-        constructor(element: JQuery, options?: dxContextMenuOptions);
-        constructor(element: Element, options?: dxContextMenuOptions);
-        /** Toggles the visibility of the widget. */
-        toggle(showing: boolean): JQueryPromise<void>;
-        /** Shows the widget. */
-        show(): JQueryPromise<void>;
-        /** Hides the widget. */
-        hide(): JQueryPromise<void>;
-    }
-    export interface dxRemoteOperations {
-        /** Specifies whether or not filtering must be performed on the server side. */
-        filtering?: boolean;
-        /** Specifies whether or not paging must be performed on the server side. */
-        paging?: boolean;
-        /** Specifies whether or not sorting must be performed on the server side. */
-        sorting?: boolean;
-        /** Specifies whether or not grouping must be performed on the server side. */
-        grouping?: boolean;
-        /** Specifies whether or not summaries calculation must be performed on the server side. */
-        summary?: boolean;
-    }
-    export interface dxDataGridRow {
-        /** The data object represented by the row. */
-        data: Object;
-        /** The key of the data object represented by the row. */
-        key: any;
-        /** The visible index of the row. */
-        rowIndex: number;
-        /** The type of the row. */
-        rowType: string;
-    }
-    export interface dxDataGridColumn {
-        /** Specifies the content alignment within column cells. */
-        alignment?: string;
-        /** Specifies whether the values in a column can be edited at runtime. Setting this option makes sense only when editing is enabled for a grid. */
-        allowEditing?: boolean;
-        /** Specifies whether or not a column can be used for filtering grid records. Setting this option makes sense only when the filter row and column header filtering are visible. */
-        allowFiltering?: boolean;
-        /** Specifies whether or not to allow filtering by this column using its header. */
-        allowHeaderFiltering?: boolean;
-        /** Specifies whether or not the column can be anchored to a grid edge by end users. Setting this option makes sense only when the columnFixing | enabled option is set to true. */
-        allowFixing?: boolean;
-        /** Specifies if a column can be used for searching grid records. Setting this option makes sense only when the search panel is visible. */
-        allowSearch?: boolean;
-        /** Specifies whether a column can be used for grouping grid records at runtime. Setting this option makes sense only when the group panel is visible. */
-        allowGrouping?: boolean;
-        /** Specifies whether or not a column can be hidden by a user. Setting this option makes sense only when the column chooser is visible. */
-        allowHiding?: boolean;
-        /** Specifies whether or not a particular column can be used in column reordering. Setting this option makes sense only when the allowColumnReordering option is set to true. */
-        allowReordering?: boolean;
-        /** Specifies whether or not a particular column can be resized by a user. Setting this option makes sense only when the allowColumnResizing option is true. */
-        allowResizing?: boolean;
-        /** Specifies whether grid records can be sorted by a specific column at runtime. Setting this option makes sense only when the sorting mode differs from none. */
-        allowSorting?: boolean;
-        /** Specifies whether groups appear expanded or not when records are grouped by a specific column. Setting this option makes sense only when grouping is allowed for this column. */
-        autoExpandGroup?: boolean;
-        /** Specifies a callback function that returns a value to be displayed in a column cell. */
-        calculateCellValue?: (rowData: Object) => string;
-        /** Specifies a callback function to be invoked after the cell value is edited by an end-user and before the new value is saved to the data source. */
-        setCellValue?: (rowData: Object, value: any) => void;
-        /** Specifies a callback function that defines filters for customary calculated grid cells. */
-        calculateFilterExpression?: (filterValue: any, selectedFilterOperation: string, target: string) => Array<any>;
-        /** Specifies a caption for a column. */
-        caption?: string;
-        /** Specifies a custom template for grid column cells. */
-        cellTemplate?: any;
-        /** Specifies a CSS class to be applied to a column. */
-        cssClass?: string;
-        /** Specifies how to get a value to be displayed in a cell when it is not in an editing state. */
-        calculateDisplayValue?: any;
-        /** Specifies a field name or a function that returns a field name or a value to be used for grouping column cells. */
-        calculateGroupValue?: any;
-        /** Specifies a field name or a function that returns a field name or a value to be used for sorting column cells. */
-        calculateSortValue?: any;
-        /** Specifies a callback function that returns the text to be displayed in the cells of a column. */
-        customizeText?: (cellInfo: { value: any; valueText: string }) => string;
-        /** Specifies the field of a data source that provides data for a column. */
-        dataField?: string;
-        /** Specifies the required type of column values. */
-        dataType?: string;
-        /** Specifies a custom template for the cell of a grid column when it is in an editing state. */
-        editCellTemplate?: any;
-        /** Specifies configuration options for the editor widget of the current column. */
-        editorOptions?: Object;
-        /** Specifies whether HTML tags are displayed as plain text or applied to the values of the column. */
-        encodeHtml?: boolean;
-        /** In a boolean column, replaces all false items with a specified text. */
-        falseText?: string;
-        /** Specifies the set of available filter operations. */
-        filterOperations?: Array<any>;
-        /** Specifies a filter value for a column. */
-        filterValue?: any;
-        /** Specifies initial filter values for the column's header filter. */
-        filterValues?: Array<any>;
-        /** Specifies whether to include or exclude the records with the values selected in the column's header filter. */
-        filterType?: string;
-        /** Indicates whether the column takes part in horizontal grid scrolling or is anchored to a grid edge. */
-        fixed?: boolean;
-        /** Specifies the grid edge to which the column is anchored. */
-        fixedPosition?: string;
-        /** Specifies a format for the values displayed in a column. */
-        format?: string;
-        /** Specifies a custom template for the group cell of a grid column. */
-        groupCellTemplate?: any;
-        /** Specifies the index of a column when grid records are grouped by the values of this column. */
-        groupIndex?: number;
-        /** Specifies a custom template for the header of a grid column. */
-        headerCellTemplate?: any;
-        /** Specifies options of a lookup column. */
-        lookup?: {
-            /** Specifies whether or not a user can nullify values of a lookup column. */
-            allowClearing?: boolean;
-            /** Specifies the data source providing data for a lookup column. */
-            dataSource?: any;
-            /** Specifies the expression defining the data source field whose values must be displayed. */
-            displayExpr?: any;
-            /** Specifies the expression defining the data source field whose values must be replaced. */
-            valueExpr?: string;
-        };
-        /** Specifies column-level options for filtering using a column header filter. */
-        headerFilter?: {
-            /** Specifies the data source to be used for the header filter. */
-            dataSource?: any;
-            /** Specifies how header filter values should be combined into groups. */
-            groupInterval?: any;
-        };
-        /** Specifies a precision for formatted values displayed in a column. */
-        precision?: number;
-        /** Specifies a filter operation applied to a column. */
-        selectedFilterOperation?: string;
-        /** Specifies whether or not the column displays its values by using editors. */
-        showEditorAlways?: boolean;
-        /** Specifies whether or not to display the column when grid records are grouped by it. */
-        showWhenGrouped?: boolean;
-        /** Specifies the index of a column when grid records are sorted by the values of this column. */
-        sortIndex?: number;
-        /** Specifies the initial sort order of column values. */
-        sortOrder?: string;
-        /** In a boolean column, replaces all true items with a specified text. */
-        trueText?: string;
-        /** Specifies whether a column is visible or not. */
-        visible?: boolean;
-        /** Specifies the sequence number of the column in the grid. */
-        visibleIndex?: number;
-        /** Specifies a column width in pixels or percentages. */
-        width?: any;
-        /** Specifies an array of validation rules to be checked when updating column cell values. */
-        validationRules?: Array<Object>;
-        /** Specifies whether or not to display the header of a hidden column in the column chooser. */
-        showInColumnChooser?: boolean;
-        /** Specifies the identifier of the column. */
-        name?: string;
-        /** The form item configuration object. Used only when the editing mode is "form". */
-        formItem?: DevExpress.ui.dxFormItem;
-    }
-    export interface dxDataGridOptions extends WidgetOptions {
-        /** Specifies whether the outer borders of the grid are visible or not. */
-        showBorders?: boolean;
-        /** Indicates whether to show the error row for the grid. */
-        errorRowEnabled?: boolean;
-        /** A handler for the rowValidating event. */
-        onRowValidating?: (e: Object) => void;
-        /** A handler for the contextMenuPreparing event. */
-        onContextMenuPreparing?: (e: Object) => void;
-        /** A handler for the initNewRow event. */
-        onInitNewRow?: (e: { data: Object }) => void;
-        /** A handler for the rowInserted event. */
-        onRowInserted?: (e: { data: Object; key: any }) => void;
-        /** A handler for the rowInserting event. */
-        onRowInserting?: (e: { data: Object; cancel: any }) => void;
-        /** A handler for the rowRemoved event. */
-        onRowRemoved?: (e: { data: Object; key: any }) => void;
-        /** A handler for the rowRemoving event. */
-        onRowRemoving?: (e: { data: Object; key: any; cancel: any }) => void;
-        /** A handler for the rowUpdated event. */
-        onRowUpdated?: (e: { data: Object; key: any }) => void;
-        /** A handler for the rowUpdating event. */
-        onRowUpdating?: (e: { oldData: Object; newData: Object; key: any; cancel: any }) => void;
-        /** Enables a hint that appears when a user hovers the mouse pointer over a cell with truncated content. */
-        cellHintEnabled?: boolean;
-        /** Specifies whether or not grid columns can be reordered by a user. */
-        allowColumnReordering?: boolean;
-        /** Specifies whether or not grid columns can be resized by a user. */
-        allowColumnResizing?: boolean;
-        /** A handler for the cellClick event. */
-        onCellClick?: any;
-        /** A handler for the cellHoverChanged event. */
-        onCellHoverChanged?: (e: Object) => void;
-        /** A handler for the cellPrepared event. */
-        onCellPrepared?: (e: Object) => void;
-        /** Specifies whether or not the width of grid columns depends on column content. */
-        columnAutoWidth?: boolean;
-        /** Specifies the options of a column chooser. */
-        columnChooser?: {
-            /** Specifies text displayed by the column chooser panel when it does not contain any columns. */
-            emptyPanelText?: string;
-            /** Specifies whether a user can invoke the column chooser or not. */
-            enabled?: boolean;
-            /** Specifies the height of the column chooser panel. */
-            height?: number;
-            /** Specifies text displayed in the title of the column chooser panel. */
-            title?: string;
-            /** Specifies the width of the column chooser panel. */
-            width?: number;
-        };
-        /** Specifies options for column fixing. */
-        columnFixing?: {
-            /** Indicates if column fixing is enabled. */
-            enabled?: boolean;
-            /** Contains options that specify texts for column-fixing related commands in the column header's context menu. */
-            texts?: {
-                /** Specifies text for a context menu item that fixes the column for which the context menu is invoked. */
-                fix?: string;
-                /** Specifies text for a context menu item that unfixes the column for which the context menu is invoked. */
-                unfix?: string;
-                /** Specifies text for a context menu subitem that fixes a column, for which the context menu is invoked, to the left grid edge. */
-                leftPosition?: string;
-                /** Specifies text for a context menu subitem that fixes a column, for which the context menu is invoked, to the right grid edge. */
-                rightPosition?: string;
-            };
-        };
-        /** Specifies options for filtering using a column header filter. */
-        headerFilter?: {
-            /** Indicates whether or not the column header filter button is visible. */
-            visible?: boolean;
-            /** Specifies the height of the dropdown menu invoked when using a column header filter. */
-            height?: number;
-            /** Specifies the width of the dropdown menu invoked when using a column header filter. */
-            width?: number;
-            /** Contains options that specify texts for the dropdown menu invoked when you use a column header filter. */
-            texts?: {
-                /** Specifies text for the item specifying an empty value in the column header filter's dropdown menu. */
-                emptyValue?: string;
-                /** Specifies text for a button that closes the column header filter's dropdown menu and applies specified filtering. */
-                ok?: string;
-                /** Specifies text for a button that closes the column header filter's dropdown menu without applying performed selection. */
-                cancel?: string;
-            }
-        };
-        /** An array of grid columns. */
-        columns?: Array<dxDataGridColumn>;
-        onContentReady?: Function;
-        /** Specifies a function that customizes grid columns after they are created. */
-        customizeColumns?: (columns: Array<dxDataGridColumn>) => void;
-        /** Specifies a data source for the grid. */
-        dataSource?: any;
-        /** Specifies whether or not to enable data caching. */
-        cacheEnabled?: boolean;
-        /** A handler for the editingStart event. */
-        onEditingStart?: (e: {
-            data: Object;
-            key: any;
-            cancel: boolean;
-            column: dxDataGridColumn
-        }) => void;
-        /** A handler for the editorPrepared event. */
-        onEditorPrepared?: (e: Object) => void;
-        /** A handler for the editorPreparing event. */
-        onEditorPreparing?: (e: Object) => void;
-        /** Contains options that specify how grid content can be changed. */
-        editing?: {
-            editMode?: string;
-            editEnabled?: boolean;
-            insertEnabled?: boolean;
-            removeEnabled?: boolean;
-            /** Specifies how grid values can be edited manually. */
-            mode?: string;
-            /** Specifies whether or not grid records can be edited at runtime. */
-            allowUpdating?: boolean;
-            /** Specifies whether or not new grid records can be added at runtime. */
-            allowAdding?: boolean;
-            /** Specifies whether or not grid records can be deleted at runtime. */
-            allowDeleting?: boolean;
-            /** The form configuration object. Used only when the editing mode is "form". */
-            form?: DevExpress.ui.dxFormOptions;
-            /** Contains options that specify texts for editing-related grid controls. */
-            texts?: {
-                /** Specifies text for a hint that appears when a user hovers the mouse pointer over the "Save" button. Setting this option makes sense only when the editMode option is set to batch. */
-                saveAllChanges?: string;
-                /** Specifies text for a cancel button displayed when a row is in the editing state. Setting this option makes sense only when the allowUpdating option is set to true. */
-                cancelRowChanges?: string;
-                /** Specifies text for a hint that appears when a user hovers the mouse pointer over the "Revert" button. Setting this option makes sense only when the editMode option is set to batch. */
-                cancelAllChanges?: string;
-                /** Specifies a message to be displayed by a confirmation window. Setting this option makes sense only when the edit mode is "row". */
-                confirmDeleteMessage?: string;
-                /** Specifies text to be displayed in the title of a confirmation window. Setting this option makes sense only when the edit mode is "row". */
-                confirmDeleteTitle?: string;
-                /** Specifies text for a hint that appears when a user hovers the mouse pointer over the "Cancel changes" button. Setting this option makes sense only when the editMode option is set to cell and the validation capabilities are enabled. */
-                validationCancelChanges?: string;
-                /** Specifies text for a button that deletes a row from a grid. Setting this option makes sense only when the allowDeleting option is set to true. */
-                deleteRow?: string;
-                /** Specifies text for a hint that appears when a user hovers the mouse pointer over the "Add" button. Setting this option makes sense only when the allowAdding option is true. */
-                addRow?: string;
-                /** Specifies text for a button that turns a row into the editing state. Setting this option makes sense only when the allowUpdating option is set to true. */
-                editRow?: string;
-                /** Specifies text for a save button displayed when a row is in the editing state. Setting this option makes sense only when the allowUpdating option is set to true. */
-                saveRowChanges?: string;
-                /** Specifies text for a button that recovers a deleted row. Setting this option makes sense only if the grid uses the batch edit mode and the allowDeleting option is set to true. */
-                undeleteRow?: string;
-            };
-        };
-        /** Specifies filter row options. */
-        filterRow?: {
-            /** Specifies when to apply a filter. */
-            applyFilter?: string;
-            /** Specifies text for the hint that pops up when a user hovers the mouse pointer over the "Apply Filter" button. */
-            applyFilterText?: string;
-            /** Specifies descriptions for filter operations. */
-            operationDescriptions?: {
-                "=": string;
-                "<>": string;
-                "<": string;
-                "<=": string;
-                ">": string;
-                ">=": string;
-                "startswith": string;
-                "contains": string;
-                "notcontains": string;
-                "endswith": string;
-            };
-            /** Specifies text for the reset operation in a filter list. */
-            resetOperationText?: string;
-            /** Specifies text for the operation of clearing the applied filter when a select box is used. */
-            showAllText?: string;
-            /** Specifies text for the range start in the 'between' filter type. */
-            betweenStartText?: string;
-            /** Specifies text for the range end in the 'between' filter type. */
-            betweenEndText?: string;
-            /** Specifies whether or not an icon that allows the user to choose a filter operation is visible. */
-            showOperationChooser?: boolean;
-            /** Specifies whether the filter row is visible or not. */
-            visible?: boolean;
-        };
-        /** Specifies the behavior of grouped grid records. */
-        grouping?: {
-            /** Specifies whether the user can collapse grouped records in a grid or not. */
-            allowCollapsing?: boolean;
-            /** Specifies whether groups appear expanded or not. */
-            autoExpandAll?: boolean;
-            /** Specifies the message displayed in a group row when the corresponding group is continued from the previous page. */
-            groupContinuedMessage?: string;
-            /** Specifies the message displayed in a group row when the corresponding group continues on the next page. */
-            groupContinuesMessage?: string;
-        };
-        /** Specifies options that configure the group panel. */
-        groupPanel?: {
-            /** Specifies whether columns can be dragged onto or from the group panel. */
-            allowColumnDragging?: boolean;
-            /** Specifies text displayed by the group panel when it does not contain any columns. */
-            emptyPanelText?: string;
-            /** Specifies whether the group panel is visible or not. */
-            visible?: boolean;
-        };
-        /** Specifies options configuring the load panel. */
-        loadPanel?: {
-            /** Specifies whether to show the load panel or not. */
-            enabled?: boolean;
-            /** Specifies the height of the load panel in pixels. */
-            height?: number;
-            /** Specifies a URL pointing to an image to be used as a loading indicator. */
-            indicatorSrc?: string;
-            /** Specifies whether or not a loading indicator must be displayed on the load panel. */
-            showIndicator?: boolean;
-            /** Specifies whether or not the pane of the load panel must be displayed. */
-            showPane?: boolean;
-            /** Specifies text displayed by the load panel. */
-            text?: string;
-            /** Specifies the width of the load panel in pixels. */
-            width?: number;
-        };
-        /** Specifies text displayed when a grid does not contain any records. */
-        noDataText?: string;
-        /** Specifies the options of a grid pager. */
-        pager?: {
-            /** Specifies the page sizes that can be selected at runtime. */
-            allowedPageSizes?: any;
-            /** Specifies whether to show the page size selector or not. */
-            showPageSizeSelector?: boolean;
-            /** Specifies whether to show the pager or not. */
-            visible?: any;
-            /** Specifies the text accompanying the page navigator. */
-            infoText?: string;
-            /** Specifies whether or not to display the text accompanying the page navigator. This text is specified by the infoText option. */
-            showInfo?: boolean;
-            /** Specifies whether or not to display buttons that switch the grid to the previous or next page. */
-            showNavigationButtons?: boolean;
-        };
-        /** Specifies paging options. */
-        paging?: {
-            /** Specifies whether dxDataGrid loads data page by page or all at once. */
-            enabled?: boolean;
-            /** Specifies the grid page that should be displayed by default. */
-            pageIndex?: number;
-            /** Specifies the size of grid pages. */
-            pageSize?: number;
-        };
-        /** Specifies whether or not grid rows must be shaded in a different way. */
-        rowAlternationEnabled?: boolean;
-        /** Specifies whether to enable two-way data binding. */
-        twoWayBindingEnabled?: boolean;
-        /** A handler for the rowClick event. */
-        onRowClick?: any;
-        /** A handler for the rowPrepared event. */
-        onRowPrepared?: (e: Object) => void;
-        /** Specifies a custom template for grid rows. */
-        rowTemplate?: any;
-        /** A configuration object specifying scrolling options. */
-        scrolling?: {
-            /** Specifies the scrolling mode. */
-            mode?: string;
-            /** Specifies whether or not a grid must preload pages adjacent to the current page when using virtual scrolling. */
-            preloadEnabled?: boolean;
-            /** Specifies whether or not the widget uses native scrolling. */
-            useNative?: any;
-            /** Specifies the scrollbar display policy. */
-            showScrollbar?: string;
-            /** Specifies whether or not the scrolling by content is enabled. */
-            scrollByContent?: boolean;
-            /** Specifies whether or not the scrollbar thumb scrolling enabled. */
-            scrollByThumb?: boolean;
-        };
-        /** Specifies options of the search panel. */
-        searchPanel?: {
-            /** Specifies whether or not search strings in the located grid records should be highlighted. */
-            highlightSearchText?: boolean;
-            /** Specifies text displayed by the search panel when no search string was typed. */
-            placeholder?: string;
-            /** Specifies whether the search panel is visible or not. */
-            visible?: boolean;
-            /** Specifies the width of the search panel in pixels. */
-            width?: number;
-            /** Sets a search string for the search panel. */
-            text?: string;
-        };
-        /** Specifies the operations that must be performed on the server side. */
-        remoteOperations?: any;
-        /** Allows you to sort groups according to the values of group summary items. */
-        sortByGroupSummaryInfo?: Array<{
-            /** Specifies the group summary item whose values must be used to sort groups. */
-            summaryItem?: string;
-            /** Specifies the identifier of the column that must be used in grouping so that sorting by group summary item values be applied. */
-            groupColumn?: string;
-            /** Specifies the sort order of group summary item values. */
-            sortOrder?: string;
-        }>;
-        /** Allows you to build a master-detail interface in the grid. */
-        masterDetail?: {
-            /** Enables an end-user to expand/collapse detail sections. */
-            enabled?: boolean;
-            /** Specifies whether detail sections appear expanded or collapsed. */
-            autoExpandAll?: boolean;
-            /** Specifies the template for detail sections. */
-            template?: any;
-        };
-        /** Specifies options for exporting grid data. */
-        export?: {
-            /** Indicates if the export feature is enabled in the grid. */
-            enabled?: boolean;
-            /** Specifies a default name for the file to which grid data is exported. */
-            fileName?: string;
-            /** Specifies whether to enable Excel filtering for the exported data in the resulting XLSX file. */
-            excelFilterEnabled?: boolean;
-            /** Specifies whether to enable word wrapping for the exported data in the resulting XLSX file. */
-            excelWrapTextEnabled?: boolean;
-            /** Specifies the URL of the server-side proxy that streams the resulting file to the end user to enable export in IE8, IE9 and Safari browsers. */
-            proxyUrl?: string;
-            /** Indicates whether to allow end users to export not only the data displayed in the grid, but the selected rows only. */
-            allowExportSelectedData?: boolean;
-            /** Contains options that specify texts for the export-related commands and hints. */
-            texts?: {
-                /** Specifies text for the Export button when this button invokes a dropdown menu so you can choose the required export format. */
-                exportTo?: string;
-                /** Specifies text for the Export button's hint when this button exports to the XSLX format without invoking the drop-down menu. */
-                exportToExcel?: string;
-                /** Specifies text for the item in the Export dropdown menu that exports grid data to Excel. */
-                excelFormat?: string;
-                /** Specifies text for the option in the Export dropdown menu that allows you to choose whether to export all the grid data or the selected rows only. */
-                selectedRows?: string;
-            }
-        };
-        /** Specifies the keys of the records that must appear selected initially. */
-        selectedRowKeys?: Array<any>;
-        /** Specifies options of runtime selection. */
-        selection?: {
-            /** Specifies the checkbox row display policy in the multiple mode. */
-            showCheckBoxesMode?: string;
-            /** Specifies whether the user can select all grid records at once. */
-            allowSelectAll?: boolean;
-            /** Specifies the selection mode. */
-            mode?: string;
-        };
-        /** A handler for the dataErrorOccured event. */
-        onDataErrorOccurred?: (e: { error: Error }) => void;
-        /** A handler for the selectionChanged event. */
-        onSelectionChanged?: (e: {
-            currentSelectedRowKeys: Array<any>;
-            currentDeselectedRowKeys: Array<any>;
-            selectedRowKeys: Array<any>;
-            selectedRowsData: Array<any>;
-        }) => void;
-        /** A handler for the exporting event. */
-        onExporting?: (e: {
-            fileName: string;
-            cancel: boolean;
-        }) => void;
-        /** A handler for the fileSaving event. */
-        onFileSaving?: (e: {
-            fileName: string;
-            format: string;
-            data: any;
-            cancel: boolean;
-        }) => void;
-        /** A handler for the exported event. */
-        onExported?: (e: Object) => void;
-        /** A handler for the keyDown event. */
-        onKeyDown?: (e: Object) => void;
-        /** A handler for the rowExpanding event. */
-        onRowExpanding?: (e: Object) => void;
-        /** A handler for the rowExpanded event. */
-        onRowExpanded?: (e: Object) => void;
-        /** A handler for the rowCollapsing event. */
-        onRowCollapsing?: (e: Object) => void;
-        /** A handler for the rowCollapsed event. */
-        onRowCollapsed?: (e: Object) => void;
-        /** Specifies whether column headers are visible or not. */
-        showColumnHeaders?: boolean;
-        /** Specifies whether or not vertical lines separating one grid column from another are visible. */
-        showColumnLines?: boolean;
-        /** Specifies whether or not horizontal lines separating one grid row from another are visible. */
-        showRowLines?: boolean;
-        /** Specifies options of runtime sorting. */
-        sorting?: {
-            /** Specifies text for the context menu item that sets an ascending sort order in a column. */
-            ascendingText?: string;
-            /** Specifies text for the context menu item that resets sorting settings for a column. */
-            clearText?: string;
-            /** Specifies text for the context menu item that sets a descending sort order in a column. */
-            descendingText?: string;
-            /** Specifies the runtime sorting mode. */
-            mode?: string;
-        };
-        /** Specifies options of state storing. */
-        stateStoring?: {
-            /** Specifies a callback function that performs specific actions on state loading. */
-            customLoad?: () => JQueryPromise<Object>;
-            /** Specifies a callback function that performs specific actions on state saving. */
-            customSave?: (state: Object) => void;
-            /** Specifies whether or not a grid saves its state. */
-            enabled?: boolean;
-            /** Specifies the delay between the last change of a grid state and the operation of saving this state in milliseconds. */
-            savingTimeout?: number;
-            /** Specifies a unique key to be used for storing the grid state. */
-            storageKey?: string;
-            /** Specifies the type of storage to be used for state storing. */
-            type?: string;
-        };
-        /** Specifies the options of the grid summary. */
-        summary?: {
-            /** Contains options that specify text patterns for summary items. */
-            texts?: {
-                /** Specifies a pattern for the 'sum' summary items when they are displayed in the parent column. */
-                sum?: string;
-                /** Specifies a pattern for the 'sum' summary items displayed in a group row or in any other column rather than the parent one. */
-                sumOtherColumn?: string;
-                /** Specifies a pattern for the 'min' summary items when they are displayed in the parent column. */
-                min?: string;
-                /** Specifies a pattern for the 'min' summary items displayed in a group row or in any other column rather than the parent one. */
-                minOtherColumn?: string;
-                /** Specifies a pattern for the 'max' summary items when they are displayed in the parent column. */
-                max?: string;
-                /** Specifies a pattern for the 'max' summary items displayed in a group row or in any other column rather than the parent one. */
-                maxOtherColumn?: string;
-                /** Specifies a pattern for the 'avg' summary items when they are displayed in the parent column. */
-                avg?: string;
-                /** Specifies a pattern for the 'avg' summary items displayed in a group row or in any other column rather than the parent one. */
-                avgOtherColumn?: string;
-                /** Specifies a pattern for the 'count' summary items. */
-                count?: string;
-            };
-            /** Specifies items of the group summary. */
-            groupItems?: Array<{
-                /** Specifies the identifier of a summary item. */
-                name?: string;
-                /** Specifies the column that provides data for a group summary item. */
-                column?: string;
-                /** Customizes the text to be displayed in the summary item. */
-                customizeText?: (itemInfo: {
-                    value: any;
-                    valueText: string;
-                }) => string;
-                /** Specifies a pattern for the summary item text. */
-                displayFormat?: string;
-                /** Specifies a precision for the summary item value of a numeric format. */
-                precision?: number;
-                /** Specifies whether or not a summary item must be displayed in the group footer. */
-                showInGroupFooter?: boolean;
-                /** Indicates whether to display group summary items in parentheses after the group row header or to align them by the corresponding columns within the group row. */
-                alignByColumn?: boolean;
-                /** Specifies the column that must hold the summary item when this item is displayed in the group footer or aligned by a column in the group row. */
-                showInColumn?: string;
-                /** Specifies how to aggregate data for a summary item. */
-                summaryType?: string;
-                /** Specifies a format for the summary item value. */
-                valueFormat?: string;
-            }>;
-            /** Specifies items of the total summary. */
-            totalItems?: Array<{
-                /** Specifies the identifier of a summary item. */
-                name?: string;
-                /** Specifies the alignment of a summary item. */
-                alignment?: string;
-                /** Specifies the column that provides data for a summary item. */
-                column?: string;
-                /** Specifies a CSS class to be applied to a summary item. */
-                cssClass?: string;
-                /** Customizes the text to be displayed in the summary item. */
-                customizeText?: (itemInfo: {
-                    value: any;
-                    valueText: string;
-                }) => string;
-                /** Specifies a pattern for the summary item text. */
-                displayFormat?: string;
-                /** Specifies a precision for the summary item value of a numeric format. */
-                precision?: number;
-                /** Specifies the column that must hold the summary item. */
-                showInColumn?: string;
-                /** Specifies how to aggregate data for a summary item. */
-                summaryType?: string;
-                /** Specifies a format for the summary item value. */
-                valueFormat?: string;
-            }>;
-            /** Allows you to use a custom aggregate function to calculate the value of a summary item. */
-            calculateCustomSummary?: (options: {
-                component: dxDataGrid;
-                name?: string;
-                value: any;
-                totalValue: any;
-                summaryProcess: string
-            }) => void;
-        };
-        /** Specifies whether text that does not fit into a column should be wrapped. */
-        wordWrapEnabled?: boolean;
-    }
-    /** A data grid widget. */
-    export class dxDataGrid extends Widget {
-        constructor(element: JQuery, options?: dxDataGridOptions);
-        constructor(element: Element, options?: dxDataGridOptions);
-        /** Ungroups grid records. */
-        clearGrouping(): void;
-        /** Clears sorting settings of all grid columns at once. */
-        clearSorting(): void;
-        /** Allows you to obtain a cell by its row index and the data field of its column. */
-        getCellElement(rowIndex: number, dataField: string): any;
-        /** Allows you to obtain a cell by its row index and the visible index of its column. */
-        getCellElement(rowIndex: number, visibleColumnIndex: number): any;
-        /** Returns the current state of the grid. */
-        state(): Object;
-        /** Sets the grid state. */
-        state(state: Object): void;
-        /** Allows you to obtain the row index by a data key. */
-        getRowIndexByKey(key: any): number;
-        /** Allows you to obtain the data key by a row index. */
-        getKeyByRowIndex(rowIndex: number): any;
-        /** Adds a new column to a grid. */
-        addColumn(columnOptions: dxDataGridColumn): void;
-        /** Removes the column from the grid. */
-        deleteColumn(id: any): void;
-        /** Displays the load panel. */
-        beginCustomLoading(messageText: string): void;
-        /** Discards changes made in a grid. */
-        cancelEditData(): void;
-        /** Checks whether or not the grid contains unsaved changes. */
-        hasEditData(): boolean;
-        /** Clears all the filters of a specific type applied to grid records. */
-        clearFilter(): void;
-        /** Deselects all grid records. */
-        clearSelection(): void;
-        /** Draws the cell being edited from the editing state. Use this method when the edit mode is batch. */
-        closeEditCell(): void;
-        /** Collapses groups or master rows in a grid. */
-        collapseAll(groupIndex?: number): void;
-        /** Returns the number of data columns in a grid. */
-        columnCount(): number;
-        /** Returns the value of a specific column option. */
-        columnOption(id: any, optionName: string): any;
-        /** Sets an option of a specific column. */
-        columnOption(id: any, optionName: string, optionValue: any): void;
-        /** Returns the options of a column by an identifier. */
-        columnOption(id: any): Object;
-        /** Sets several options of a column at once. */
-        columnOption(id: any, options: Object): void;
-        /** Sets a specific cell into the editing state. */
-        editCell(rowIndex: number, visibleColumnIndex: number): void;
-        /** Sets a specific cell into the editing state. */
-        editCell(rowIndex: number, dataField: string): void;
-        /** Sets a specific row into the editing state. */
-        editRow(rowIndex: number): void;
-        /** Gets the cell value. */
-        cellValue(rowIndex: number, dataField: string): any;
-        /** Gets the cell value. */
-        cellValue(rowIndex: number, visibleColumnIndex: number): any;
-        /** Sets the cell value. */
-        cellValue(rowIndex: number, dataField: string, value: any): void;
-        /** Sets the cell value. */
-        cellValue(rowIndex: number, visibleColumnIndex: number, value: any): void;
-        /** Hides the load panel. */
-        endCustomLoading(): void;
-        /** Expands groups or master rows in a grid. */
-        expandAll(groupIndex: number): void;
-        /** Allows you to find out whether a specific group or master row is expanded or collapsed. */
-        isRowExpanded(key: any): boolean;
-        /** Allows you to expand a specific group or master row by its key. */
-        expandRow(key: any): void;
-        /** Allows you to collapse a specific group or master row by its key. */
-        collapseRow(key: any): void;
-        /** Applies a filter to the grid's data source. */
-        filter(filterExpr?: any): void;
-        /** Returns a filter expression applied to the grid's data source using the filter(filterExpr) method. */
-        filter(): any;
-        /** Returns a filter expression applied to the grid using all possible scenarious. */
-        getCombinedFilter(): any;
-        /** Gets the keys of currently selected grid records. */
-        getSelectedRowKeys(): Array<Object>;
-        /** Gets the data objects of currently selected grid records. */
-        getSelectedRowsData(): Array<Object>;
-        /** Hides the column chooser panel. */
-        hideColumnChooser(): void;
-        /** Adds a new data row to a grid. */
-        addRow(): void;
-        /**
-         * Adds a new data row to a grid.
-         * @deprecated Use the addRow() method instead.
-         */
-        insertRow(): void;
-        /** Returns the key corresponding to the passed data object. */
-        keyOf(obj: Object): any;
-        /** Switches a grid to a specified page. */
-        pageIndex(newIndex: number): void;
-        /** Gets the index of the current page. */
-        pageIndex(): number;
-        /** Sets the page size. */
-        pageSize(value: number): void;
-        /** Gets the current page size. */
-        pageSize(): number;
-        /** Refreshes grid data. */
-        refresh(): void;
-        /** Removes a specific row from a grid. */
-        deleteRow(rowIndex: number): void;
-        /**
-         * Removes a specific row from a grid.
-         * @deprecated Use the deleteRow() method instead.
-         */
-        removeRow(rowIndex: number): void;
-        /** Saves changes made in a grid. */
-        saveEditData(): void;
-        /** Searches grid records by a search string. */
-        searchByText(text: string): void;
-        /** Selects all grid records. */
-        selectAll(): void;
-        /** Deselects the rows that are currently selected within the applied filter. */
-        deselectAll(): void;
-        /** Selects specific grid records. */
-        selectRows(keys: Array<any>, preserve: boolean): void;
-        /** Deselects specific grid records. */
-        deselectRows(keys: Array<any>): void;
-        /** Selects grid rows by indexes. */
-        selectRowsByIndexes(indexes: Array<any>): void;
-        /** Allows you to find out whether a row is selected or not. */
-        isRowSelected(key: any): boolean;
-        /** Invokes the column chooser panel. */
-        showColumnChooser(): void;
-        startSelectionWithCheckboxes(): boolean;
-        /** Returns the number of records currently held by a grid. */
-        totalCount(): number;
-        /** Recovers a row deleted in the batch edit mode. */
-        undeleteRow(rowIndex: number): void;
-        /** Allows you to obtain a data object by its key. */
-        byKey(key: any): JQueryPromise<any>;
-        /** Gets the value of a total summary item. */
-        getTotalSummaryValue(summaryItemName: string): any;
-        /** Exports grid data to Excel. */
-        exportToExcel(selectionOnly: boolean): void;
-        /** Updates the grid to the size of its content. */
-        updateDimensions(): void;
-        /** Focuses the specified cell element in the grid. */
-        focus(element?: JQuery): void;
-    }
-    export interface dxPivotGridOptions extends WidgetOptions {
-        onContentReady?: Function;
-        /** Specifies a data source for the pivot grid. */
-        dataSource?: any;
-        useNativeScrolling?: any;
-        /** A configuration object specifying scrolling options. */
-        scrolling?: {
-            /** Specifies the scrolling mode. */
-            mode?: string;
-            /** Specifies whether or not the widget uses native scrolling. */
-            useNative?: any;
-        };
-        /** Allows an end-user to change sorting options. */
-        allowSorting?: boolean;
-        /** Allows an end-user to sort columns by summary values. */
-        allowSortingBySummary?: boolean;
-        /** Allows an end-user to change filtering options. */
-        allowFiltering?: boolean;
-        /** Allows an end-user to expand/collapse all header items within a header level. */
-        allowExpandAll?: boolean;
-        /** Specifies whether to display the Total rows. */
-        showRowTotals?: boolean;
-        /** Specifies whether to display the Grand Total row. */
-        showRowGrandTotals?: boolean;
-        /** Specifies whether to display the Total columns. */
-        showColumnTotals?: boolean;
-        /** Specifies whether to display the Grand Total column. */
-        showColumnGrandTotals?: boolean;
-        /** Specifies whether or not to hide rows and columns with no data. */
-        hideEmptySummaryCells?: boolean;
-        /** Specifies where to show the total rows or columns. */
-        showTotalsPrior?: string;
-        /** Specifies whether the outer borders of the grid are visible or not. */
-        showBorders?: boolean;
-        /** The Field Chooser configuration options. */
-        fieldChooser?: {
-            /** Enables or disables the field chooser. */
-            enabled?: boolean;
-            /** Specifies the field chooser layout. */
-            layout?: number;
-            /** Specifies the text to display as a title of the field chooser popup window. */
-            title?: string;
-            /** Specifies the field chooser width. */
-            width?: number;
-            /** Specifies the field chooser height. */
-            height?: number;
-            /** Strings that can be changed or localized in the pivot grid's integrated Field Chooser. */
-            texts?: {
-                /** The string to display instead of Row Fields. */
-                rowFields?: string;
-                /** The string to display instead of Column Fields. */
-                columnFields?: string;
-                /** The string to display instead of Data Fields. */
-                dataFields?: string;
-                /** The string to display instead of Filter Fields. */
-                filterFields?: string;
-                /** The string to display instead of All Fields. */
-                allFields?: string;
-            };
-        }
-        /** Strings that can be changed or localized in the dxPivotGrid widget. */
-        texts?: {
-            /** The string to display as a header of the Grand Total row and column. */
-            grandTotal?: string;
-            /** The string to display as a header of the Total row and column. */
-            total?: string;
-            /** Specifies the text displayed when a pivot grid does not contain any fields. */
-            noData?: string;
-            /** The string to display as a Show Field Chooser context menu item. */
-            showFieldChooser?: string;
-            /** The string to display as an Expand All context menu item. */
-            expandAll?: string;
-            /** The string to display as a Collapse All context menu item. */
-            collapseAll?: string;
-            /** The string to display as a Sort Column by Summary Value context menu item. */
-            sortColumnBySummary?: string;
-            /** The string to display as a Sort Row by Summary Value context menu item. */
-            sortRowBySummary?: string;
-            /** The string to display as a Remove All Sorting context menu item. */
-            removeAllSorting?: string;
-            /** The string to display as an Export to Excel file context menu item. */
-            exportToExcel?: string;
-        };
-        /** The Load panel configuration options. */
-        loadPanel?: {
-            /** Enables or disables the load panel. */
-            enabled?: boolean;
-            /** Specifies the height of the load panel. */
-            height?: number;
-            /** Specifies the URL pointing to an image that will be used as a load indicator. */
-            indicatorSrc?: string;
-            /** Specifies whether or not to show a load indicator. */
-            showIndicator?: boolean;
-            /** Specifies whether or not to show load panel background. */
-            showPane?: boolean;
-            /** Specifies the text to display inside a load panel. */
-            text?: string;
-            /** Specifies the width of the load panel. */
-            width?: number;
-        };
-        /** A handler for the cellClick event. */
-        onCellClick?: (e: any) => void;
-        /** A handler for the cellPrepared event. */
-        onCellPrepared?: (e: any) => void;
-        /** A handler for the contextMenuPreparing event. */
-        onContextMenuPreparing?: (e: Object) => void;
-        /** Specifies options for exporting pivot grid data. */
-        export?: {
-            /** Indicates whether the export feature is enabled for the pivot grid. */
-            enabled?: boolean;
-            /** Specifies a default name for the file to which grid data is exported. */
-            fileName?: string;
-            /** Specifies the URL of the server-side proxy that streams the resulting file to the end user to enable export in IE8, IE9 and Safari browsers. */
-            proxyUrl?: string;
-        };
-        /** A handler for the exporting event. */
-        onExporting?: (e: {
-            fileName: string;
-            cancel: boolean;
-        }) => void;
-        /** A handler for the fileSaving event. */
-        onFileSaving?: (e: {
-            fileName: string;
-            format: string;
-            data: any;
-            cancel: boolean;
-        }) => void;
-        /** A handler for the exported event. */
-        onExported?: (e: Object) => void;
-        /** A configuration object specifying options related to state storing. */
-        stateStoring?: {
-            /** Specifies a callback function that performs specific actions on state loading. */
-            customLoad?: () => JQueryPromise<Object>;
-            /** Specifies a callback function that performs specific actions on state saving. */
-            customSave?: (gridState: Object) => void;
-            /** Specifies whether or not a grid saves its state. */
-            enabled?: boolean;
-            /** Specifies the delay between the last change of a grid state and the operation of saving this state in milliseconds. */
-            savingTimeout?: number;
-            /** Specifies a unique key to be used for storing the grid state. */
-            storageKey?: string;
-            /** Specifies the type of storage to be used for state storing. */
-            type?: string;
-        };
-    }
-    /** A data summarization widget for multi-dimensional data analysis and data mining. */
-    export class dxPivotGrid extends Widget {
-        constructor(element: JQuery, options?: dxPivotGridOptions);
-        constructor(element: Element, options?: dxPivotGridOptions);
-        /** Gets the PivotGridDataSource instance. */
-        getDataSource(): DevExpress.data.PivotGridDataSource;
-        /** Gets the dxPopup instance of the field chooser window. */
-        getFieldChooserPopup(): DevExpress.ui.dxPopup;
-        /** Updates the widget to the size of its content. */
-        updateDimensions(): void;
-        /** Exports pivot grid data to the Excel file. */
-        exportToExcel(): void;
-    }
-    export interface dxPivotGridFieldChooserOptions extends WidgetOptions {
-        /** Specifies the height of the widget. */
-        height?: any;
-        /** Specifies the field chooser layout. */
-        layout?: number;
-        /** The data source of a dxPivotGrid widget. */
-        dataSource?: DevExpress.data.PivotGridDataSource;
-        onContentReady?: Function;
-        /** Strings that can be changed or localized in the dxPivotGridFieldChooser widget. */
-        texts?: {
-            /** The string to display instead of Row Fields. */
-            rowFields?: string;
-            /** The string to display instead of Column Fields. */
-            columnFields?: string;
-            /** The string to display instead of Data Fields. */
-            dataFields?: string;
-            /** The string to display instead of Filter Fields. */
-            filterFields?: string;
-            /** The string to display instead of All Fields. */
-            allFields?: string;
-        };
-    }
-    /** A complementary widget for dxPivotGrid that allows you to manage data displayed in the dxPivotGrid. */
-    export class dxPivotGridFieldChooser extends Widget {
-        constructor(element: JQuery, options?: dxPivotGridFieldChooserOptions);
-        constructor(element: Element, options?: dxPivotGridFieldChooserOptions);
-        /** Updates the widget to the size of its content. */
-        updateDimensions(): void;
-    }
-}
-interface JQuery {
-    dxTreeView(): JQuery;
-    dxTreeView(options: "instance"): DevExpress.ui.dxTreeView;
-    dxTreeView(options: string): any;
-    dxTreeView(options: string, ...params: any[]): any;
-    dxTreeView(options: DevExpress.ui.dxTreeViewOptions): JQuery;
-    dxMenuBase(): JQuery;
-    dxMenuBase(options: "instance"): DevExpress.ui.dxMenuBase;
-    dxMenuBase(options: string): any;
-    dxMenuBase(options: string, ...params: any[]): any;
-    dxMenuBase(options: DevExpress.ui.dxMenuBaseOptions): JQuery;
-    dxMenu(): JQuery;
-    dxMenu(options: "instance"): DevExpress.ui.dxMenu;
-    dxMenu(options: string): any;
-    dxMenu(options: string, ...params: any[]): any;
-    dxMenu(options: DevExpress.ui.dxMenuOptions): JQuery;
-    dxContextMenu(): JQuery;
-    dxContextMenu(options: "instance"): DevExpress.ui.dxContextMenu;
-    dxContextMenu(options: string): any;
-    dxContextMenu(options: string, ...params: any[]): any;
-    dxContextMenu(options: DevExpress.ui.dxContextMenuOptions): JQuery;
-    dxColorBox(): JQuery;
-    dxColorBox(options: "instance"): DevExpress.ui.dxColorBox;
-    dxColorBox(options: string): any;
-    dxColorBox(options: string, ...params: any[]): any;
-    dxColorBox(options: DevExpress.ui.dxColorBoxOptions): JQuery;
-    dxDataGrid(): JQuery;
-    dxDataGrid(options: "instance"): DevExpress.ui.dxDataGrid;
-    dxDataGrid(options: string): any;
-    dxDataGrid(options: string, ...params: any[]): any;
-    dxDataGrid(options: DevExpress.ui.dxDataGridOptions): JQuery;
-    dxPivotGrid(): JQuery;
-    dxPivotGrid(options: "instance"): DevExpress.ui.dxPivotGrid;
-    dxPivotGrid(options: string): any;
-    dxPivotGrid(options: string, ...params: any[]): any;
-    dxPivotGrid(options: DevExpress.ui.dxPivotGridOptions): JQuery;
-    dxPivotGridFieldChooser(): JQuery;
-    dxPivotGridFieldChooser(options: "instance"): DevExpress.ui.dxPivotGridFieldChooser;
-    dxPivotGridFieldChooser(options: string): any;
-    dxPivotGridFieldChooser(options: string, ...params: any[]): any;
-    dxPivotGridFieldChooser(options: DevExpress.ui.dxPivotGridFieldChooserOptions): JQuery;
-    dxScheduler(): JQuery;
-    dxScheduler(options: "instance"): DevExpress.ui.dxScheduler;
-    dxScheduler(options: string): any;
-    dxScheduler(options: string, ...params: any[]): any;
-    dxScheduler(options: DevExpress.ui.dxSchedulerOptions): JQuery;
-}
-declare namespace DevExpress.framework {
-    /** An object used to store information on the views displayed in an application. */
-    export class ViewCache {
-        viewRemoved: JQueryCallback;
-        /** Removes all the viewInfo objects from the cache. */
-        clear(): void;
-        /** Obtains a viewInfo object from the cache by the specified key. */
-        getView(key: string): Object;
-        /** Checks whether or not a viewInfo object is contained in the view cache under the specified key. */
-        hasView(key: string): boolean;
-        /** Removes a viewInfo object from the cache by the specified key. */
-        removeView(key: string): Object;
-        /** Adds the specified viewInfo object to the cache under the specified key. */
-        setView(key: string, viewInfo: Object): void;
-    }
-    export interface dxCommandOptions extends DOMComponentOptions {
-        /** Specifies an action performed when the execute() method of the command is called. */
-        onExecute?: any;
-        /** Indicates whether or not the widget that displays this command is disabled. */
-        disabled?: boolean;
-        /** Specifies whether the current command is rendered when a view is being rendered or after a view is shown. */
-        renderStage?: string;
-        /** Specifies the name of the icon shown inside the widget associated with this command. */
-        icon?: string;
-        iconSrc?: string;
-        /** The identifier of the command. */
-        id?: string;
-        /** Specifies the title of the widget associated with this command. */
-        title?: string;
-        /** Specifies the type of the button, if the command is rendered as a dxButton widget. */
-        type?: string;
-        /** A Boolean value specifying whether or not the widget associated with this command is visible. */
-        visible?: boolean;
-    }
-    /** A markup component used to define markup options for a command. */
-    export class dxCommand extends DOMComponent {
-        constructor(element: JQuery, options: dxCommandOptions);
-        constructor(options: dxCommandOptions);
-        /** Executes the action associated with this command. */
-        execute(): void;
-    }
-    /** An object responsible for routing. */
-    export class Router {
-        /** Adds a routing rule to the list of registered rules. */
-        register(pattern: string, defaults?: Object, constraints?: Object): void;
-        /** Decodes the specified URI to an object using the registered routing rules. */
-        parse(uri: string): Object;
-        /** Formats an object to a URI. */
-        format(obj: Object): string;
-    }
-    export interface StateManagerOptions {
-        /** A storage to which the state manager saves the application state. */
-        storage?: Object;
-    }
-    /** An object used to store the current application state. */
-    export class StateManager {
-        constructor(options?: StateManagerOptions);
-        /** Adds an object that implements an interface of a state source to the state manager's collection of state sources. */
-        addStateSource(stateSource: Object): void;
-        /** Removes a specified state source from the state manager's collection of state sources. */
-        removeStateSource(stateSource: Object): void;
-        /** Saves the current application state. */
-        saveState(): void;
-        /** Restores the application state that has been saved by the saveState() method to the state storage. */
-        restoreState(): void;
-        /** Removes the application state that has been saved by the saveState() method to the state storage. */
-        clearState(): void;
-    }
-    export module html {
-        export var layoutSets: Array<string>;
-        export var animationSets: { [animationSetName: string]: AnimationSet };
-        export interface AnimationSet {
-            [animationName: string]: any
-        }
-        export interface HtmlApplicationOptions {
-            /** Specifies where the commands that are defined in the application's views must be displayed. */
-            commandMapping?: Object;
-            /** Specifies whether or not view caching is disabled. */
-            disableViewCache?: boolean;
-            /** An array of layout controllers that should be used to show application views in the current navigation context. */
-            layoutSet?: any;
-            /** Specifies the animation presets that are used to animate different UI elements in the current application. */
-            animationSet?: AnimationSet;
-            /** Specifies whether the current application must behave as a mobile or web application. */
-            mode?: string;
-            /** Specifies the object that represents a root namespace of the application. */
-            namespace?: Object;
-            /** Specifies application behavior when the user navigates to a root view. */
-            navigateToRootViewMode?: string;
-            /** An array of dxCommand configuration objects used to define commands available from the application's global navigation. */
-            navigation?: Array<any>;
-            /** A state manager to be used in the application. */
-            stateManager?: StateManager;
-            /** Specifies the storage to be used by the application's state manager to store the application state. */
-            stateStorage?: Object;
-            /** Indicates whether on not to use the title of the previously displayed view as text on the Back button. */
-            useViewTitleAsBackText?: boolean;
-            /** A custom view cache to be used in the application. */
-            viewCache?: Object;
-            /** Specifies a limit for the views that can be cached. */
-            viewCacheSize?: number;
-            /** Specifies the current version of application templates. */
-            templatesVersion?: string;
-            /** Specifies options for the viewport meta tag of a mobile browser. */
-            viewPort?: JQuery;
-            /** A custom router to be used in the application. */
-            router?: Router;
-        }
-        /** An object used to manage views, as well as control the application life cycle. */
-        export class HtmlApplication implements EventsMixin<HtmlApplication> {
-            constructor(options: HtmlApplicationOptions);
-            afterViewSetup: JQueryCallback;
-            beforeViewSetup: JQueryCallback;
-            initialized: JQueryCallback;
-            navigating: JQueryCallback;
-            navigatingBack: JQueryCallback;
-            resolveLayoutController: JQueryCallback;
-            resolveViewCacheKey: JQueryCallback;
-            viewDisposed: JQueryCallback;
-            viewDisposing: JQueryCallback;
-            viewHidden: JQueryCallback;
-            viewRendered: JQueryCallback;
-            viewShowing: JQueryCallback;
-            viewShown: JQueryCallback;
-            /** Provides access to the ViewCache object. */
-            viewCache: ViewCache;
-            /** An array of dxCommand components that are created based on the application's navigation option value. */
-            navigation: Array<any>;
-            /** Provides access to the StateManager object. */
-            stateManager: StateManager;
-            /** Provides access to the Router object. */
-            router: Router;
-            /** Navigates to the URI preceding the current one in the navigation history. */
-            back(): void;
-            /** Returns a Boolean value indicating whether or not backwards navigation is currently possible. */
-            canBack(): boolean;
-            /** Calls the clearState() method of the application's StateManager object. */
-            clearState(): void;
-            /** Creates global navigation commands. */
-            createNavigation(navigationConfig: Array<any>): void;
-            /** Returns an HTML template of the specified view. */
-            getViewTemplate(viewName: string): JQuery;
-            /** Returns a configuration object used to create a dxView component for a specified view. */
-            getViewTemplateInfo(viewName: string): Object;
-            /** Adds a specified HTML template to a collection of view or layout templates. */
-            loadTemplates(source: any): JQueryPromise<any>;
-            /** Navigates to the specified URI. */
-            navigate(uri?: any, options?: Object): void;
-            /** Renders navigation commands to the navigation command containers that are located in the layouts used in the application. */
-            renderNavigation(): void;
-            /** Calls the restoreState() method of the application's StateManager object. */
-            restoreState(): void;
-            /** Calls the saveState method of the application's StateManager object. */
-            saveState(): void;
-            /** Provides access to the object that defines the current context to be considered when choosing an appropriate template for a view. */
-            templateContext(): Object;
-            on(eventName: "initialized", eventHandler: () => void): HtmlApplication;
-            on(eventName: "afterViewSetup", eventHandler: (e: {
-                viewInfo: Object;
-            }) => void): HtmlApplication;
-            on(eventName: "beforeViewSetup", eventHandler: (e: {
-                viewInfo: Object;
-            }) => void): HtmlApplication;
-            on(eventName: "navigating", eventHandler: (e: {
-                currentUri: string;
-                uri: string;
-                cancel: boolean;
-                options: {
-                    root: boolean;
-                    target: string;
-                    direction: string;
-                    rootInDetailPane: boolean;
-                    modal: boolean;
-                };
-            }) => void): HtmlApplication;
-            on(eventName: "navigatingBack", eventHandler: (e: {
-                cancel: boolean;
-                isHardwareButton: boolean;
-            }) => void): HtmlApplication;
-            on(eventName: "resolveLayoutController", eventHandler: (e: {
-                viewInfo: Object;
-                layoutController: Object;
-                availableLayoutControllers: Array<Object>;
-            }) => void): HtmlApplication;
-            on(eventName: "resolveViewCacheKey", eventHandler: (e: {
-                key: string;
-                navigationItem: Object;
-                routeData: Object;
-            }) => void): HtmlApplication;
-            on(eventName: "viewDisposed", eventHandler: (e: {
-                viewInfo: Object;
-            }) => void): HtmlApplication;
-            on(eventName: "viewDisposing", eventHandler: (e: {
-                viewInfo: Object;
-            }) => void): HtmlApplication;
-            on(eventName: "viewHidden", eventHandler: (e: {
-                viewInfo: Object;
-            }) => void): HtmlApplication;
-            on(eventName: "viewRendered", eventHandler: (e: {
-                viewInfo: Object;
-            }) => void): HtmlApplication;
-            on(eventName: "viewShowing", eventHandler: (e: {
-                viewInfo: Object;
-                direction: string;
-            }) => void): HtmlApplication;
-            on(eventName: "viewShown", eventHandler: (e: {
-                viewInfo: Object;
-                direction: string;
-            }) => void): HtmlApplication;
-            on(eventName: string, eventHandler: Function): HtmlApplication;
-            on(events: { [eventName: string]: Function; }): HtmlApplication;
-            off(eventName: "initialized"): HtmlApplication;
-            off(eventName: "afterViewSetup"): HtmlApplication;
-            off(eventName: "beforeViewSetup"): HtmlApplication;
-            off(eventName: "navigating"): HtmlApplication;
-            off(eventName: "navigatingBack"): HtmlApplication;
-            off(eventName: "resolveLayoutController"): HtmlApplication;
-            off(eventName: "resolveViewCacheKey"): HtmlApplication;
-            off(eventName: "viewDisposed"): HtmlApplication;
-            off(eventName: "viewDisposing"): HtmlApplication;
-            off(eventName: "viewHidden"): HtmlApplication;
-            off(eventName: "viewRendered"): HtmlApplication;
-            off(eventName: "viewShowing"): HtmlApplication;
-            off(eventName: "viewShown"): HtmlApplication;
-            off(eventName: string): HtmlApplication;
-            off(eventName: "initialized", eventHandler: () => void): HtmlApplication;
-            off(eventName: "afterViewSetup", eventHandler: (e: {
-                viewInfo: Object;
-            }) => void): HtmlApplication;
-            off(eventName: "beforeViewSetup", eventHandler: (e: {
-                viewInfo: Object;
-            }) => void): HtmlApplication;
-            off(eventName: "navigating", eventHandler: (e: {
-                currentUri: string;
-                uri: string;
-                cancel: boolean;
-                options: {
-                    root: boolean;
-                    target: string;
-                    direction: string;
-                    rootInDetailPane: boolean;
-                    modal: boolean;
-                };
-            }) => void): HtmlApplication;
-            off(eventName: "navigatingBack", eventHandler: (e: {
-                cancel: boolean;
-                isHardwareButton: boolean;
-            }) => void): HtmlApplication;
-            off(eventName: "resolveLayoutController", eventHandler: (e: {
-                viewInfo: Object;
-                layoutController: Object;
-                availableLayoutControllers: Array<Object>;
-            }) => void): HtmlApplication;
-            off(eventName: "resolveViewCacheKey", eventHandler: (e: {
-                key: string;
-                navigationItem: Object;
-                routeData: Object;
-            }) => void): HtmlApplication;
-            off(eventName: "viewDisposed", eventHandler: (e: {
-                viewInfo: Object;
-            }) => void): HtmlApplication;
-            off(eventName: "viewDisposing", eventHandler: (e: {
-                viewInfo: Object;
-            }) => void): HtmlApplication;
-            off(eventName: "viewHidden", eventHandler: (e: {
-                viewInfo: Object;
-            }) => void): HtmlApplication;
-            off(eventName: "viewRendered", eventHandler: (e: {
-                viewInfo: Object;
-            }) => void): HtmlApplication;
-            off(eventName: "viewShowing", eventHandler: (e: {
-                viewInfo: Object;
-                direction: string;
-            }) => void): HtmlApplication;
-            off(eventName: "viewShown", eventHandler: (e: {
-                viewInfo: Object;
-                direction: string;
-            }) => void): HtmlApplication;
-            off(eventName: string, eventHandler: Function): HtmlApplication;
-        }
-    }
-}
-declare namespace DevExpress.viz.core {
-    /**
-     * Applies a theme for the entire page with several DevExtreme visualization widgets.
-     * @deprecated Use the DevExpress.viz.currentTheme(theme) method instead.
-     */
-    export function currentTheme(theme: string): void;
-    /**
-     * Applies a new theme (with the color scheme defined separately) for the entire page with several DevExtreme visualization widgets.
-     * @deprecated Use the DevExpress.viz.currentTheme(platform, colorScheme) method instead.
-     */
-    export function currentTheme(platform: string, colorScheme: string): void;
-    /**
-     * Registers a new theme based on the existing one.
-     * @deprecated Use the DevExpress.viz.registerTheme(customTheme, baseTheme) method instead.
-     */
-    export function registerTheme(customTheme: Object, baseTheme: string): void;
-    /**
-     * Applies a predefined or registered custom palette to all visualization widgets at once.
-     * @deprecated Use the DevExpress.viz.currentPalette(paletteName) method instead.
-     */
-    export function currentPalette(paletteName: string): void;
-    /**
-     * Obtains the color sets of a predefined or registered palette.
-     * @deprecated Use the DevExpress.viz.getPalette(paletteName) method instead.
-     */
-    export function getPalette(paletteName: string): Object;
-    /**
-     * Registers a new palette.
-     * @deprecated Use the DevExpress.viz.registerPalette(paletteName, palette) method instead.
-     */
-    export function registerPalette(paletteName: string, palette: Object): void;
-    export interface Border {
-        /** Sets a border color for a selected series. */
-        color?: string;
-        /** Sets border visibility for a selected series. */
-        visible?: boolean;
-        /** Sets a border width for a selected series. */
-        width?: number;
-    }
-    export interface DashedBorder extends Border {
-        /** Specifies a dash style for the border of a selected series point. */
-        dashStyle?: string;
-    }
-    export interface DashedBorderWithOpacity extends DashedBorder {
-        /** Specifies the opacity of the tooltip's border. */
-        opacity?: number;
-    }
-    export interface Font {
-        /** Specifies the font color for a strip label. */
-        color?: string;
-        /** Specifies the font family for a strip label. */
-        family?: string;
-        /** Specifies the font opacity for a strip label. */
-        opacity?: number;
-        /** Specifies the font size for a strip label. */
-        size?: any;
-        /** Specifies the font weight for the text displayed in strips. */
-        weight?: number;
-    }
-    export interface Hatching {
-        direction?: string;
-        /** Specifies the opacity of hatching lines. */
-        opacity?: number;
-        /** Specifies the distance between hatching lines in pixels. */
-        step?: number;
-        /** Specifies the width of hatching lines in pixels. */
-        width?: number;
-    }
-    export interface Margins {
-        /** Specifies the distance in pixels between the bottom side of the title and the surrounding widget elements. */
-        bottom?: number;
-        /** Specifies the distance in pixels between the left side of the title and the surrounding widget elements. */
-        left?: number;
-        /** Specifies the distance between the right side of the title and surrounding widget elements in pixels. */
-        right?: number;
-        /** Specifies the distance between the top side of the title and surrounding widget elements in pixels. */
-        top?: number;
-    }
-    export interface Size {
-        /** Specifies the width of the widget. */
-        width?: number;
-        /** Specifies the height of the widget. */
-        height?: number;
-    }
-    export interface Title {
-        /** Specifies font options for the title. */
-        font?: viz.core.Font;
-        /** Specifies the widget title's horizontal position. */
-        horizontalAlignment?: string;
-       /** Specifies the widget title's position in the vertical direction. */
-        verticalAlignment?: string;
-        /** Specifies the distance between the title and surrounding widget elements in pixels. */
-        margin?: viz.core.Margins;
-         /** Specifies the height of the space reserved for the title. */
-        placeholderSize?: number;
-        /** Specifies text for the title. */
-        text?: string;
-        /** Specifies a subtitle for the widget. */
-        subtitle?: {
-            /** Specifies font options for the subtitle. */
-            font?: viz.core.Font;
-           /** Specifies text for the subtitle. */
-            text?: string;
-        }
-    }
-    export interface Tooltip {
-        /** Specifies the length of the tooltip's arrow in pixels. */
-        arrowLength?: number;
-        /** Specifies the appearance of the tooltip's border. */
-        border?: viz.core.DashedBorderWithOpacity;
-        /** Specifies a color for the tooltip. */
-        color?: string;
-        /** Specifies the z-index for tooltips. */
-        zIndex?: number;
-        /** Specifies the container to draw tooltips inside of it. */
-        container?: any;
-        /** Specifies text and appearance of a set of tooltips. */
-        customizeTooltip?: (arg: Object) => { color?: string; text?: string };
-        /** Specifies whether or not the tooltip is enabled. */
-        enabled?: boolean;
-        /** Specifies font options for the text displayed by the tooltip. */
-        font?: Font;
-        /** Specifies a format for the text displayed by the tooltip. */
-        format?: string;
-        /** Specifies the opacity of a tooltip. */
-        opacity?: number;
-        /** Specifies a distance from the tooltip's left/right boundaries to the inner text in pixels. */
-        paddingLeftRight?: number;
-        /** Specifies a distance from the tooltip's top/bottom boundaries to the inner text in pixels. */
-        paddingTopBottom?: number;
-        /** Specifies a precision for formatted values displayed by the tooltip. */
-        precision?: number;
-        /** Specifies options of the tooltip's shadow. */
-        shadow?: {
-            /** Specifies the blur distance of the tooltip's shadow. */
-            blur?: number;
-            /** Specifies the color of the tooltip's shadow. */
-            color?: string;
-            /** Specifies the horizontal offset of the tooltip's shadow relative to the tooltip in pixels. */
-            offsetX?: number;
-            /** Specifies the vertical offset of the tooltip's shadow relative to the tooltip in pixels. */
-            offsetY?: number;
-            /** Specifies the opacity of the tooltip's shadow. */
-            opacity?: number;
-        };
-    }
-    export interface Animation {
-        /** Determines how long animation runs. */
-        duration?: number;
-        /** Specifies the animation easing mode. */
-        easing?: string;
-        /** Indicates whether or not animation is enabled. */
-        enabled?: boolean;
-    }
-    export interface LoadingIndicator {
-        /** Specifies a color for the loading indicator background. */
-        backgroundColor?: string;
-        /** Specifies font options for the loading indicator text. */
-        font?: viz.core.Font;
-        /** Specifies whether to show the loading indicator or not. */
-        show?: boolean;
-        /** Specifies a text to be displayed by the loading indicator. */
-        text?: string;
-    }
-    export interface LegendBorder extends viz.core.DashedBorderWithOpacity {
-        /** Specifies a radius for the corners of the legend border. */
-        cornerRadius?: number;
-    }
-    export interface BaseLegend {
-        /** Specifies the color of the legend's background. */
-        backgroundColor?: string;
-        /** Specifies legend border settings. */
-        border?: viz.core.LegendBorder;
-        /** Specifies how many columns must be taken to arrange legend items. */
-        columnCount?: number;
-        /** Specifies the spacing between a pair of neighboring legend columns in pixels. */
-        columnItemSpacing?: number;
-        /** Specifies font options for legend items. */
-        font?: viz.core.Font;
-        /** Specifies the legend's position on the map. */
-        horizontalAlignment?: string;
-        /** Specifies the alignment of legend items. */
-        itemsAlignment?: string;
-        /** Specifies the position of text relative to the item marker. */
-        itemTextPosition?: string;
-        /** Specifies the distance between the legend and the container borders in pixels. */
-        margin?: viz.core.Margins;
-        /** Specifies the size of item markers in the legend in pixels. */
-        markerSize?: number;
-        /** Specifies whether to arrange legend items horizontally or vertically. */
-        orientation?: string;
-        /** Specifies the spacing between the legend left/right border and legend items in pixels. */
-        paddingLeftRight?: number;
-        /** Specifies the spacing between the legend top/bottom border and legend items in pixels. */
-        paddingTopBottom?: number;
-        /** Specifies how many rows must be taken to arrange legend items. */
-        rowCount?: number;
-        /** Specifies the spacing between a pair of neighboring legend rows in pixels. */
-        rowItemSpacing?: number;
-        /** Specifies the legend's position on the map. */
-        verticalAlignment?: string;
-        /** Specifies whether or not the legend is visible on the map. */
-        visible?: boolean;
-    }
-    export interface BaseWidgetOptions extends DOMComponentOptions {
-        /** A handler for the drawn event. */
-        onDrawn?: (e: {
-            component: BaseWidget;
-            element: Element;
-        }) => void;
-        /** A handler for the incidentOccurred event. */
-        onIncidentOccurred?: (
-        component: BaseWidget,
-        element: Element,
-        target: {
-            id: string;
-            type: string;
-            args: any;
-            text: string;
-            widget: string;
-            version: string;
-        }
-        ) => void;
-        /** Notifies a widget that it is embedded into an HTML page that uses a path modifier. */
-        pathModified?: boolean;
-        /** Specifies whether or not the widget supports right-to-left representation. */
-        rtlEnabled?: boolean;
-        /** Sets the name of the theme to be used in the widget. */
-        theme?: string;
-    }
-    /** This section describes options and methods that are common to all widgets. */
-    export class BaseWidget extends DOMComponent {
-        /** Returns the widget's SVG markup. */
-        svg(): string;
-    }
-}
-declare namespace DevExpress.viz.charts {
-    /** This section describes the fields and methods that can be used in code to manipulate the Series object. */
-    export interface BaseSeries {
-        /** Provides information about the state of the series object. */
-        fullState: number;
-        /** Returns the type of the series. */
-        type: string;
-        /** Unselects all the selected points of the series. The points are displayed in an initial style. */
-        clearSelection(): void;
-        /** Gets the color of a particular series. */
-        getColor(): string;
-        /** Gets points from the series point collection based on the specified argument. */
-        getPointsByArg(pointArg: any): Array<BasePoint>;
-        /** Gets a point from the series point collection based on the specified point position. */
-        getPointByPos(positionIndex: number): Object;
-        /** Selects the series. The series is displayed in a 'selected' style until another series is selected or the current series is deselected programmatically. */
-        select(): void;
-        /** Selects the specified point. The point is displayed in a 'selected' style. */
-        selectPoint(point: BasePoint): void;
-        /** Deselects the specified point. The point is displayed in an initial style. */
-        deselectPoint(point: BasePoint): void;
-        /** Returns an array of all points in the series. */
-        getAllPoints(): Array<BasePoint>;
-        /** Returns visible series points. */
-        getVisiblePoints(): Array<BasePoint>;
-        /** Returns the name of the series. */
-        name: string;
-        /** Returns the tag of the series. */
-        tag: string;
-        /** Hides a series. */
-        hide(): void;
-        /** Provides information about the hover state of a series. */
-        isHovered(): boolean;
-        /** Provides information about the selection state of a series. */
-        isSelected(): boolean;
-        /** Provides information about the visibility state of a series. */
-        isVisible(): boolean;
-        /** Makes a particular series visible. */
-        show(): void;
-    }
-    /** This section describes the methods that can be used in code to manipulate the Point object. */
-    export interface BasePoint {
-        /** Provides information about the state of the point object. */
-        fullState: number;
-        /** Returns the point's argument value that was set in the data source. */
-        originalArgument: any;
-        /** Returns the point's value that was set in the data source. */
-        originalValue: any;
-        /** Returns the tag of the point. */
-        tag: string;
-        /** Deselects the point. */
-        clearSelection(): void;
-        /** Gets the color of a particular point. */
-        getColor(): string;
-        /** Hides the tooltip of the point. */
-        hideTooltip(): void;
-        /** Provides information about the hover state of a point. */
-        isHovered(): boolean;
-        /** Provides information about the selection state of a point. */
-        isSelected(): boolean;
-        /** Selects the point. The point is displayed in a 'selected' style until another point is selected or the current point is deselected programmatically. */
-        select(): void;
-        /** Shows the tooltip of the point. */
-        showTooltip(): void;
-        /** Allows you to obtain the label of a series point. */
-        getLabel(): any;
-        /** Returns the series object to which the point belongs. */
-        series: BaseSeries;
-    }
-    /** This section describes the fields and methods that can be used in code to manipulate the Series object. */
-    export interface ChartSeries extends BaseSeries {
-        /** Returns the name of the series pane. */
-        pane: string;
-        /** Returns the name of the value axis of the series. */
-        axis: string;
-        selectPoint(point: ChartPoint): void;
-        deselectPoint(point: ChartPoint): void;
-        getAllPoints(): Array<ChartPoint>;
-        getVisiblePoints(): Array<ChartPoint>;
-    }
-    /** This section describes the methods that can be used in code to manipulate the Point object. */
-    export interface ChartPoint extends BasePoint {
-        /** Contains the close value of the point. This field is useful for points belonging to a series of the candle stick or stock type only. */
-        originalCloseValue: any;
-        /** Contains the high value of the point. This field is useful for points belonging to a series of the candle stick or stock type only. */
-        originalHighValue: any;
-        /** Contains the low value of the point. This field is useful for points belonging to a series of the candle stick or stock type only. */
-        originalLowValue: any;
-        /** Contains the first value of the point. This field is useful for points belonging to a series of the range area or range bar type only. */
-        originalMinValue: any;
-        /** Contains the open value of the point. This field is useful for points belonging to a series of the candle stick or stock type only. */
-        originalOpenValue: any;
-        /** Contains the size of the bubble as it was set in the data source. This field is useful for points belonging to a series of the bubble type only. */
-        size: any;
-        /** Gets the parameters of the point's minimum bounding rectangle (MBR). */
-        getBoundingRect(): { x: number; y: number; width: number; height: number; };
-        series: ChartSeries;
-    }
-    /** This section describes the methods that can be used in code to manipulate the Label object. */
-    export interface Label {
-        /** Gets the parameters of the label's minimum bounding rectangle (MBR). */
-        getBoundingRect(): { x: number; y: number; width: number; height: number; };
-        /** Hides the point label. */
-        hide(): void;
-        /** Shows the point label. */
-        show(): void;
-    }
-    export interface PieSeries extends BaseSeries {
-        selectPoint(point: PiePoint): void;
-        deselectPoint(point: PiePoint): void;
-        getAllPoints(): Array<PiePoint>;
-        getVisiblePoints(): Array<PiePoint>;
-    }
-    /** This section describes the methods that can be used in code to manipulate the Point object. */
-    export interface PiePoint extends BasePoint {
-        /** Gets the percentage value of the specific point. */
-        percent: any;
-        /** Provides information about the visibility state of a point. */
-        isVisible(): boolean;
-        /** Makes a specific point visible. */
-        show(): void;
-        /** Hides a specific point. */
-        hide(): void;
-        series: PieSeries;
-    }
-    /** This section describes the fields and methods that can be used in code to manipulate the Series object. */
-    export interface PolarSeries extends BaseSeries {
-        /** Returns the name of the value axis of the series. */
-        axis: string;
-        selectPoint(point: PolarPoint): void;
-        deselectPoint(point: PolarPoint): void;
-        getAllPoints(): Array<PolarPoint>;
-        getVisiblePoints(): Array<PolarPoint>;
-    }
-    /** This section describes the methods that can be used in code to manipulate the Point object. */
-    export interface PolarPoint extends BasePoint {
-        series: PolarSeries;
-    }
-    export interface Strip {
-        /** Specifies a color for a strip. */
-        color?: string;
-        /** An object that defines the label configuration options of a strip. */
-        label?: {
-            /** Specifies the text displayed in a strip. */
-            text?: string;
-        };
-        /** Specifies a start value for a strip. */
-        startValue?: any;
-        /** Specifies an end value for a strip. */
-        endValue?: any;
-    }
-    export interface BaseSeriesConfigLabel {
-        /** Specifies a format for arguments displayed by point labels. */
-        argumentFormat?: string;
-        /** Specifies a precision for formatted point arguments displayed in point labels. */
-        argumentPrecision?: number;
-        /** Specifies a background color for point labels. */
-        backgroundColor?: string;
-        /** Specifies border options for point labels. */
-        border?: viz.core.DashedBorder;
-        /** Specifies connector options for series point labels. */
-        connector?: {
-            /** Specifies the color of label connectors. */
-            color?: string;
-            /** Indicates whether or not label connectors are visible. */
-            visible?: boolean;
-            /** Specifies the width of label connectors. */
-            width?: number;
-        };
-        /** Specifies a callback function that returns the text to be displayed by point labels. */
-        customizeText?: (pointInfo: Object) => string;
-        /** Specifies font options for the text displayed in point labels. */
-        font?: viz.core.Font;
-        /** Specifies a format for the text displayed by point labels. */
-        format?: string;
-        position?: string;
-        /** Specifies a precision for formatted point values displayed in point labels. */
-        precision?: number;
-        /** Specifies the angle used to rotate point labels from their initial position. */
-        rotationAngle?: number;
-        /** Specifies the visibility of point labels. */
-        visible?: boolean;
-    }
-    export interface SeriesConfigLabel extends BaseSeriesConfigLabel {
-        /** Specifies whether or not to show a label when the point has a zero value. */
-        showForZeroValues?: boolean;
-    }
-    export interface ChartSeriesConfigLabel extends SeriesConfigLabel {
-        /** Specifies how to align point labels relative to the corresponding data points that they represent. */
-        alignment?: string;
-        /** Specifies how to shift point labels horizontally from their initial positions. */
-        horizontalOffset?: number;
-        /** Specifies how to shift point labels vertically from their initial positions. */
-        verticalOffset?: number;
-        /** Specifies a precision for the percentage values displayed in the labels of a full-stacked-like series. */
-        percentPrecision?: number;
-    }
-    export interface BaseCommonSeriesConfig {
-        /** Specifies the data source field that provides arguments for series points. */
-        argumentField?: string;
-        axis?: string;
-        /** An object defining the label configuration options for a series in the dxChart widget. */
-        label?: ChartSeriesConfigLabel;
-        /** Specifies border options for point labels. */
-        border?: viz.core.DashedBorder;
-        /** Specifies a series color. */
-        color?: string;
-        /** Specifies the dash style of the series' line. */
-        dashStyle?: string;
-        hoverMode?: string;
-        hoverStyle?: {
-            /** An object defining the border options for a hovered series. */
-            border?: viz.core.DashedBorder;
-            /** <p>Sets a color for a series when it is hovered over.</p> */
-            color?: string;
-            /** Specifies the dash style for the line in a hovered series. */
-            dashStyle?: string;
-            hatching?: viz.core.Hatching;
-            /** Specifies the width of a line in a hovered series. */
-            width?: number;
-        };
-        /** Specifies whether a chart ignores null data points or not. */
-        ignoreEmptyPoints?: boolean;
-        /** Specifies how many points are acceptable to be in a series to display all labels for these points. Otherwise, the labels will not be displayed. */
-        maxLabelCount?: number;
-        /** Specifies the minimal length of a displayed bar in pixels. */
-        minBarSize?: number;
-        /** Specifies opacity for a series. */
-        opacity?: number;
-        /** Specifies the series elements to highlight when the series is selected. */
-        selectionMode?: string;
-        selectionStyle?: {
-            /** An object defining the border options for a selected series. */
-            border?: viz.core.DashedBorder;
-            /** Sets a color for a series when it is selected. */
-            color?: string;
-            /** Specifies the dash style for the line in a selected series. */
-            dashStyle?: string;
-            hatching?: viz.core.Hatching;
-            /** Specifies the width of a line in a selected series. */
-            width?: number;
-        };
-        /** Specifies whether or not to show the series in the chart's legend. */
-        showInLegend?: boolean;
-        /** Specifies the name of the stack where the values of the _stackedBar_ series must be located. */
-        stack?: string;
-        /** Specifies the name of the data source field that provides data about a point. */
-        tagField?: string;
-        /** Specifies the data source field that provides values for series points. */
-        valueField?: string;
-        /** Specifies the visibility of a series. */
-        visible?: boolean;
-        /** Specifies a line width. */
-        width?: number;
-        /** Configures error bars. */
-        valueErrorBar?: {
-            /** Specifies whether error bars must be displayed in full or partially. */
-            displayMode?: string;
-            /** Specifies the data field that provides data for low error values. */
-            lowValueField?: string;
-            /** Specifies the data field that provides data for high error values. */
-            highValueField?: string;
-            /** Specifies how error bar values must be calculated. */
-            type?: string;
-            /** Specifies the value to be used for generating error bars. */
-            value?: number;
-            /** Specifies the color of error bars. */
-            color?: string;
-            /** Specifies the opacity of error bars. */
-            opacity?: number;
-            /** Specifies the length of the lines that indicate the error bar edges. */
-            edgeLength?: number;
-            /** Specifies the width of the error bar line. */
-            lineWidth?: number;
-        };
-    }
-    export interface CommonPointOptions {
-        /** Specifies border options for points in the line and area series. */
-        border?: viz.core.Border;
-        /** Specifies the points color. */
-        color?: string;
-        /** Specifies what series points to highlight when a point is hovered over. */
-        hoverMode?: string;
-        /** An object defining configuration options for a hovered point. */
-        hoverStyle?: {
-            /** An object defining the border options for a hovered point. */
-            border?: viz.core.Border;
-            /** Sets a color for a point when it is hovered over. */
-            color?: string;
-            /** Specifies the diameter of a hovered point in the series that represents data points as symbols (not as bars for instance). */
-            size?: number;
-        };
-        /** Specifies what series points to highlight when a point is selected. */
-        selectionMode?: string;
-        /** An object defining configuration options for a selected point. */
-        selectionStyle?: {
-            /** An object defining the border options for a selected point. */
-            border?: viz.core.Border;
-            /** <p>Sets a color for a point when it is selected.</p> */
-            color?: string;
-            /** Specifies the diameter of a selected point in the series that represents data points as symbols (not as bars for instance). */
-            size?: number;
-        };
-        /** Specifies the point diameter in pixels for those series that represent data points as symbols (not as bars for instance). */
-        size?: number;
-        /** Specifies a symbol for presenting points of the line and area series. */
-        symbol?: string;
-        visible?: boolean;
-    }
-    export interface ChartCommonPointOptions extends CommonPointOptions {
-        /** An object specifying the parameters of an image that is used as a point marker. */
-        image?: {
-            /** Specifies the height of an image that is used as a point marker. */
-            height?: any;
-            /** Specifies a URL leading to the image to be used as a point marker. */
-            url?: any;
-            /** Specifies the width of an image that is used as a point marker. */
-            width?: any;
-        };
-    }
-    export interface PolarCommonPointOptions extends CommonPointOptions {
-        /** An object specifying the parameters of an image that is used as a point marker. */
-        image?: {
-            /** Specifies the height of an image that is used as a point marker. */
-            height?: number;
-            /** Specifies a URL leading to the image to be used as a point marker. */
-            url?: string;
-            /** Specifies the width of an image that is used as a point marker. */
-            width?: number;
-        };
-    }
-    /** An object that defines configuration options for chart series. */
-    export interface CommonSeriesConfig extends BaseCommonSeriesConfig {
-        /** Specifies the data source field that provides a 'close' value for a _candleStick_ or _stock_ series. */
-        closeValueField?: string;
-        /** Specifies a radius for bar corners. */
-        cornerRadius?: number;
-        /** Specifies the data source field that provides a 'high' value for a _candleStick_ or _stock_ series. */
-        highValueField?: string;
-        /** Specifies the color for the body (rectangle) of a _candleStick_ series. */
-        innerColor?: string;
-        /** Specifies the data source field that provides a 'low' value for a _candleStick_ or _stock_ series. */
-        lowValueField?: string;
-        /** Specifies the data source field that provides an 'open' value for a _candleStick_ or _stock_ series. */
-        openValueField?: string;
-        /** Specifies the pane that will be used to display a series. */
-        pane?: string;
-        /** An object defining configuration options for points in line-, scatter- and area-like series. */
-        point?: ChartCommonPointOptions;
-        /** Specifies the data source field that provides values for one end of a range series. To set the data source field for the other end of the range series, use the rangeValue2Field property. */
-        rangeValue1Field?: string;
-        /** Specifies the data source field that provides values for the second end of a range series. To set the data source field for the other end of the range series, use the rangeValue1Field property. */
-        rangeValue2Field?: string;
-        /** Specifies reduction options for the stock or candleStick series. */
-        reduction?: {
-            /** Specifies a color for the points whose reduction level price is lower in comparison to the value in the previous point. */
-            color?: string;
-            /** Specifies for which price level (open, high, low or close) to enable reduction options in the series. */
-            level?: string;
-        };
-        /** Specifies the data source field that defines the size of bubbles. */
-        sizeField?: string;
-    }
-    export interface CommonSeriesSettings extends CommonSeriesConfig {
-        /** <p>An object that specifies configuration options for all series of the <i>area</i> type in the chart.</p> */
-        area?: CommonSeriesConfig;
-        /** An object that specifies configuration options for all series of the _bar_ type in the chart. */
-        bar?: CommonSeriesConfig;
-        /** An object that specifies configuration options for all series of the bubble type in the chart. */
-        bubble?: CommonSeriesConfig;
-        /** An object that specifies configuration options for all series of the _candleStick_ type in the chart. */
-        candlestick?: CommonSeriesConfig;
-        /** An object that specifies configuration options for all series of the _fullStackedArea_ type in the chart. */
-        fullstackedarea?: CommonSeriesConfig;
-        /** An object that specifies configuration options for all series of the Full-Stacked Spline Area type in the chart. */
-        fullstackedsplinearea?: CommonSeriesConfig;
-        /** An object that specifies configuration options for all series of the _fullStackedBar_ type in the chart. */
-        fullstackedbar?: CommonSeriesConfig;
-        /** An object that specifies configuration options for all series of the _fullStackedLine_ type in the chart. */
-        fullstackedline?: CommonSeriesConfig;
-        /** An object that specifies configuration options for all series of the Full-Stacked Spline type in the chart. */
-        fullstackedspline?: CommonSeriesConfig;
-        /** An object that specifies configuration options for all series of the _line_ type in the chart. */
-        line?: CommonSeriesConfig;
-        /** An object that specifies configuration options for all series of the _rangeArea_ type in the chart. */
-        rangearea?: CommonSeriesConfig;
-        /** An object that specifies configuration options for all series of the _rangeBar_ type in the chart. */
-        rangebar?: CommonSeriesConfig;
-        /** An object that specifies configuration options for all series of the _scatter_ type in the chart. */
-        scatter?: CommonSeriesConfig;
-        /** An object that specifies configuration options for all series of the _spline_ type in the chart. */
-        spline?: CommonSeriesConfig;
-        /** An object that specifies configuration options for all series of the _splineArea_ type in the chart. */
-        splinearea?: CommonSeriesConfig;
-        /** An object that specifies configuration options for all series of the _stackedArea_ type in the chart. */
-        stackedarea?: CommonSeriesConfig;
-        /** An object that specifies configuration options for all series of the Stacked Spline Area type in the chart. */
-        stackedsplinearea?: CommonSeriesConfig;
-        /** An object that specifies configuration options for all series of the _stackedBar_ type in the chart. */
-        stackedbar?: CommonSeriesConfig;
-        /** An object that specifies configuration options for all series of the _stackedLine_ type in the chart. */
-        stackedline?: CommonSeriesConfig;
-        /** An object that specifies configuration options for all series of the Stacked Spline type in the chart. */
-        stackedspline?: CommonSeriesConfig;
-        /** An object that specifies configuration options for all series of the _stepArea_ type in the chart. */
-        steparea?: CommonSeriesConfig;
-        /** An object that specifies configuration options for all series of the _stepLine_ type in the chart. */
-        stepline?: CommonSeriesConfig;
-        /** An object that specifies configuration options for all series of the _stock_ type in the chart. */
-        stock?: CommonSeriesConfig;
-        /** Sets a series type. */
-        type?: string;
-    }
-    export interface SeriesConfig extends CommonSeriesConfig {
-        /** Specifies the name that identifies the series. */
-        name?: string;
-        /** Specifies data about a series. */
-        tag?: any;
-        /** Sets the series type. */
-        type?: string;
-    }
-    /** An object that defines configuration options for polar chart series. */
-    export interface CommonPolarSeriesConfig extends BaseCommonSeriesConfig {
-        /** Specifies whether or not to close the chart by joining the end point with the first point. */
-        closed?: boolean;
-        label?: SeriesConfigLabel;
-        point?: PolarCommonPointOptions;
-    }
-    export interface CommonPolarSeriesSettings extends CommonPolarSeriesConfig {
-        /** An object that specifies configuration options for all series of the <i>area</i> type in the chart. */
-        area?: CommonPolarSeriesConfig;
-        /** An object that specifies configuration options for all series of the _bar_ type in the chart. */
-        bar?: CommonPolarSeriesConfig;
-        /** An object that specifies configuration options for all series of the _line_ type in the chart. */
-        line?: CommonPolarSeriesConfig;
-        /** An object that specifies configuration options for all series of the _scatter_ type in the chart. */
-        scatter?: CommonPolarSeriesConfig;
-        /** An object that specifies configuration options for all series of the _stackedBar_ type in the chart. */
-        stackedbar?: CommonPolarSeriesConfig;
-        /** Sets a series type. */
-        type?: string;
-    }
-    export interface PolarSeriesConfig extends CommonPolarSeriesConfig {
-        /** Specifies the name that identifies the series. */
-        name?: string;
-        /** Specifies data about a series. */
-        tag?: any;
-        /** Sets the series type. */
-        type?: string;
-    }
-    export interface PieSeriesConfigLabel extends BaseSeriesConfigLabel {
-        /** Specifies how to shift labels from their initial position in a radial direction in pixels. */
-        radialOffset?: number;
-        /** Specifies a precision for the percentage values displayed in labels. */
-        percentPrecision?: number;
-    }
-    /** An object that defines configuration options for chart series. */
-    export interface CommonPieSeriesConfig {
-        /** Specifies the data source field that provides arguments for series points. */
-        argumentField?: string;
-        /** Specifies the required type for series arguments. */
-        argumentType?: string;
-        /** An object defining the series border configuration options. */
-        border?: viz.core.DashedBorder;
-        /** Specifies a series color. */
-        color?: string;
-        /** Specifies the chart elements to highlight when a series is hovered over. */
-        hoverMode?: string;
-        /** An object defining configuration options for a hovered series. */
-        hoverStyle?: {
-            /** An object defining the border options for a hovered series. */
-            border?: viz.core.DashedBorder;
-            /** Sets a color for the series when it is hovered over. */
-            color?: string;
-            /** Specifies the hatching options to be applied when a point is hovered over. */
-            hatching?: viz.core.Hatching;
-        };
-        /**
-         * Specifies the fraction of the inner radius relative to the total radius in the series of the 'doughnut' type.
-         * @deprecated use the 'innerRadius' option instead
-         */
-        innerRadius?: number;
-        /** An object defining the label configuration options. */
-        label?: PieSeriesConfigLabel;
-        /** Specifies how many points are acceptable to be in a series to display all labels for these points. Otherwise, the labels will not be displayed. */
-        maxLabelCount?: number;
-        /** Specifies a minimal size of a displayed pie segment. */
-        minSegmentSize?: number;
-        /**
-         * Specifies the direction in which the dxPieChart series points are located.
-         * @deprecated use the 'segmentsDirection' option instead
-         */
-        segmentsDirection?: string;
-        /** <p>Specifies the chart elements to highlight when the series is selected.</p> */
-        selectionMode?: string;
-        /** An object defining configuration options for the series when it is selected. */
-        selectionStyle?: {
-            /** An object defining the border options for a selected series. */
-            border?: viz.core.DashedBorder;
-            /** Sets a color for a series when it is selected. */
-            color?: string;
-            /** Specifies the hatching options to be applied when a point is selected. */
-            hatching?: viz.core.Hatching;
-        };
-        /** Specifies chart segment grouping options. */
-        smallValuesGrouping?: {
-            /** Specifies the name of the grouped chart segment. This name represents the segment in the chart legend. */
-            groupName?: string;
-            /** Specifies the segment grouping mode. */
-            mode?: string;
-            /** Specifies a threshold for segment values. */
-            threshold?: number;
-            /** Specifies how many segments must not be grouped. */
-            topCount?: number;
-        };
-        /**
-         * Specifies a start angle for a pie chart in arc degrees.
-         * @deprecated use the 'startAngle' option instead
-         */
-        startAngle?: number;
-        /** <p>Specifies the name of the data source field that provides data about a point.</p> */
-        tagField?: string;
-        /** Specifies the data source field that provides values for series points. */
-        valueField?: string;
-    }
-    export interface CommonPieSeriesSettings extends CommonPieSeriesConfig {
-        /**
-         * Specifies the type of the pie chart series.
-         * @deprecated use the 'type' option instead
-         */
-        type?: string;
-    }
-    export interface PieSeriesConfig extends CommonPieSeriesConfig {
-        /**
-         * Sets the series type.
-         * @deprecated use the 'type' option instead
-         */
-        type?: string;
-        /** Specifies the name that identifies the series. */
-        name?: string;
-        /** Specifies data about a series. */
-        tag?: any;
-    }
-    export interface SeriesTemplate {
-        /** Specifies a callback function that returns a series object with individual series settings. */
-        customizeSeries?: (seriesName: string) => SeriesConfig;
-        /** Specifies a data source field that represents the series name. */
-        nameField?: string;
-    }
-    export interface PolarSeriesTemplate {
-        /** Specifies a callback function that returns a series object with individual series settings. */
-        customizeSeries?: (seriesName: string) => PolarSeriesConfig;
-        /** Specifies a data source field that represents the series name. */
-        nameField?: string;
-    }
-    export interface ChartCommonConstantLineLabel {
-        /** Specifies font options for a constant line label. */
-        font?: viz.core.Font;
-        /** Specifies the position of the constant line label relative to the chart plot. */
-        position?: string;
-        /** Indicates whether or not to display labels for the axis constant lines. */
-        visible?: boolean;
-    }
-    export interface PolarCommonConstantLineLabel {
-        /** Indicates whether or not to display labels for the axis constant lines. */
-        visible?: boolean;
-        /** Specifies font options for a constant line label. */
-        font?: viz.core.Font;
-    }
-    export interface ConstantLineStyle {
-        /** Specifies a color for a constant line. */
-        color?: string;
-        /** Specifies a dash style for a constant line. */
-        dashStyle?: string;
-        /** Specifies a constant line width in pixels. */
-        width?: number;
-    }
-    export interface ChartCommonConstantLineStyle extends ConstantLineStyle {
-        /** An object defining constant line label options. */
-        label?: ChartCommonConstantLineLabel;
-        /** Specifies the space between the constant line label and the left/right side of the constant line. */
-        paddingLeftRight?: number;
-        /** Specifies the space between the constant line label and the top/bottom side of the constant line. */
-        paddingTopBottom?: number;
-    }
-    export interface PolarCommonConstantLineStyle extends ConstantLineStyle {
-        /** An object defining constant line label options. */
-        label?: PolarCommonConstantLineLabel;
-    }
-    export interface CommonAxisLabel {
-        /** Specifies font options for axis labels. */
-        font?: viz.core.Font;
-        /** Specifies the spacing between an axis and its labels in pixels. */
-        indentFromAxis?: number;
-        /** Indicates whether or not axis labels are visible. */
-        visible?: boolean;
-    }
-    export interface ChartCommonAxisLabel extends CommonAxisLabel {
-        /** Specifies the label's position relative to the tick (grid line). */
-        alignment?: string;
-        /** Specifies the overlap resolving algorithm to be applied to axis labels. */
-        overlappingBehavior?: {
-            /** Specifies how to arrange axis labels. */
-            mode?: string;
-            /** Specifies the angle used to rotate axis labels. */
-            rotationAngle?: number;
-            /** Specifies the spacing that must be set between staggered rows when the 'stagger' algorithm is applied. */
-            staggeringSpacing?: number;
-        };
-    }
-    export interface PolarCommonAxisLabel extends CommonAxisLabel {
-        /** Specifies the overlap resolving algorithm to be applied to axis labels. */
-        overlappingBehavior?: string;
-    }
-    export interface CommonAxisTitle {
-        /** Specifies font options for an axis title. */
-        font?: viz.core.Font;
-        /** Specifies a margin for an axis title in pixels. */
-        margin?: number;
-    }
-    export interface BaseCommonAxisSettings {
-        /** Specifies the color of the line that represents an axis. */
-        color?: string;
-        /** Specifies whether ticks/grid lines of a discrete axis are located between labels or cross the labels. */
-        discreteAxisDivisionMode?: string;
-        /** An object defining the configuration options for the grid lines of an axis in the dxPolarChart widget. */
-        grid?: {
-            /** Specifies a color for grid lines. */
-            color?: string;
-            /** Specifies an opacity for grid lines. */
-            opacity?: number;
-            /** Indicates whether or not the grid lines of an axis are visible. */
-            visible?: boolean;
-            /** Specifies the width of grid lines. */
-            width?: number;
-        };
-        /** Specifies the options of the minor grid. */
-        minorGrid?: {
-            /** Specifies a color for the lines of the minor grid. */
-            color?: string;
-            /** Specifies an opacity for the lines of the minor grid. */
-            opacity?: number;
-            /** Indicates whether the minor grid is visible or not. */
-            visible?: boolean;
-            /** Specifies a width for the lines of the minor grid. */
-            width?: number;
-        };
-        /** Indicates whether or not an axis is inverted. */
-        inverted?: boolean;
-        /** Specifies the opacity of the line that represents an axis. */
-        opacity?: number;
-        /** Indicates whether or not to set ticks/grid lines of a continuous axis of the 'date-time' type at the beginning of each date-time interval. */
-        setTicksAtUnitBeginning?: boolean;
-        /** An object defining the configuration options for axis ticks. */
-        tick?: {
-            /** Specifies ticks color. */
-            color?: string;
-            /** Specifies tick opacity. */
-            opacity?: number;
-            /** Indicates whether or not ticks are visible on an axis. */
-            visible?: boolean;
-            /** Specifies tick width. */
-            width?: number;
-            /** Specifies tick length. */
-            length?: number;
-        };
-        /** Specifies the options of the minor ticks. */
-        minorTick?: {
-            /** Specifies a color for the minor ticks. */
-            color?: string;
-            /** Specifies an opacity for the minor ticks. */
-            opacity?: number;
-            /** Indicates whether or not the minor ticks are displayed on an axis. */
-            visible?: boolean;
-            /** Specifies minor tick width. */
-            width?: number;
-            /** Specifies minor tick length. */
-            length?: number;
-        };
-        /** Indicates whether or not the line that represents an axis in a chart is visible. */
-        visible?: boolean;
-        /** Specifies the width of the line that represents an axis in the chart. */
-        width?: number;
-    }
-    export interface ChartCommonAxisSettings extends BaseCommonAxisSettings {
-        /** Specifies the appearance of all the widget's constant lines. */
-        constantLineStyle?: ChartCommonConstantLineStyle;
-        /** An object defining the label configuration options that are common for all axes in the dxChart widget. */
-        label?: ChartCommonAxisLabel;
-        /** Specifies a coefficient that determines the spacing between the maximum series point and the axis. */
-        maxValueMargin?: number;
-        /** Specifies a coefficient that determines the spacing between the minimum series point and the axis. */
-        minValueMargin?: number;
-        /** Specifies, in pixels, the space reserved for an axis. */
-        placeholderSize?: number;
-        /** An object defining configuration options for strip style. */
-        stripStyle?: {
-            /** An object defining the configuration options for a strip label style. */
-            label?: {
-                /** Specifies font options for a strip label. */
-                font?: viz.core.Font;
-                /** Specifies the label's position on a strip. */
-                horizontalAlignment?: string;
-                /** Specifies a label's position on a strip. */
-                verticalAlignment?: string;
-            };
-            /** Specifies the spacing, in pixels, between the left/right strip border and the strip label. */
-            paddingLeftRight?: number;
-            /** Specifies the spacing, in pixels, between the top/bottom strip borders and the strip label. */
-            paddingTopBottom?: number;
-        };
-        /** An object defining the title configuration options that are common for all axes in the dxChart widget. */
-        title?: CommonAxisTitle;
-        /** Indicates whether or not to display series with indents from axis boundaries. */
-        valueMarginsEnabled?: boolean;
-    }
-    export interface PolarCommonAxisSettings extends BaseCommonAxisSettings {
-        /** Specifies the appearance of all the widget's constant lines. */
-        constantLineStyle?: PolarCommonConstantLineStyle;
-        /** An object defining the label configuration options that are common for all axes in the dxPolarChart widget. */
-        label?: PolarCommonAxisLabel;
-        /** An object defining configuration options for strip style. */
-        stripStyle?: {
-            /** An object defining the configuration options for a strip label style. */
-            label?: {
-                /** Specifies font options for a strip label. */
-                font?: viz.core.Font;
-            };
-        };
-    }
-    export interface ChartConstantLineLabel extends ChartCommonConstantLineLabel {
-        /** Specifies the horizontal alignment of a constant line label. */
-        horizontalAlignment?: string;
-        /** Specifies the vertical alignment of a constant line label. */
-        verticalAlignment?: string;
-        /** Specifies the text to be displayed in a constant line label. */
-        text?: string;
-    }
-    export interface PolarConstantLineLabel extends PolarCommonConstantLineLabel {
-        /** Specifies the text to be displayed in a constant line label. */
-        text?: string;
-    }
-    export interface AxisLabel {
-        /** Specifies the text for a hint that appears when a user hovers the mouse pointer over a label on the value axis. */
-        customizeHint?: (argument: { value: any; valueText: string }) => string;
-        /** Specifies a callback function that returns the text to be displayed in value axis labels. */
-        customizeText?: (argument: { value: any; valueText: string }) => string;
-        /** Specifies a format for the text displayed by axis labels. */
-        format?: string;
-        /** Specifies a precision for the formatted value displayed in the axis labels. */
-        precision?: number;
-    }
-    export interface ChartAxisLabel extends ChartCommonAxisLabel, AxisLabel { }
-    export interface PolarAxisLabel extends PolarCommonAxisLabel, AxisLabel { }
-    export interface AxisTitle extends CommonAxisTitle {
-        /** Specifies the text for the value axis title. */
-        text?: string;
-    }
-    export interface ChartConstantLineStyle extends ChartCommonConstantLineStyle {
-        /** An object defining constant line label options. */
-        label?: ChartConstantLineLabel;
-    }
-    export interface ChartConstantLine extends ChartConstantLineStyle {
-        /** An object defining constant line label options. */
-        label?: ChartConstantLineLabel;
-        /** Specifies a value to be displayed by a constant line. */
-        value?: any;
-    }
-    export interface PolarConstantLine extends PolarCommonConstantLineStyle {
-        /** An object defining constant line label options. */
-        label?: PolarConstantLineLabel;
-        /** Specifies a value to be displayed by a constant line. */
-        value?: any;
-    }
-    export interface Axis {
-        /** Specifies a coefficient for dividing the value axis. */
-        axisDivisionFactor?: number;
-        /** Specifies the order in which discrete values are arranged on the value axis. */
-        categories?: Array<any>;
-        /** Specifies the value to be raised to a power when generating ticks for a logarithmic axis. */
-        logarithmBase?: number;
-        /** Specifies an interval between axis ticks/grid lines. */
-        tickInterval?: any;
-        /** Specifies the interval between minor ticks. */
-        minorTickInterval?: any;
-        /** Specifies the number of minor ticks between two neighboring major ticks. */
-        minorTickCount?: number;
-        /** Specifies the required type of the value axis. */
-        type?: string;
-        /** Specifies the pane on which the current value axis will be displayed. */
-        pane?: string;
-        /** Specifies options for value axis strips. */
-        strips?: Array<Strip>;
-    }
-    export interface ChartAxis extends ChartCommonAxisSettings, Axis {
-        /** Defines an array of the value axis constant lines. */
-        constantLines?: Array<ChartConstantLine>;
-        /** Specifies the appearance options for the constant lines of the value axis. */
-        constantLineStyle?: ChartCommonConstantLineStyle;
-        /** Specifies options for value axis labels. */
-        label?: ChartAxisLabel;
-        /** Specifies the maximum value on the value axis. */
-        max?: any;
-        /** Specifies the minimum value on the value axis. */
-        min?: any;
-        /** Specifies the position of the value axis on a chart. */
-        position?: string;
-        /** Specifies the title for a value axis. */
-        title?: AxisTitle;
-    }
-    export interface PolarAxis extends PolarCommonAxisSettings, Axis {
-        /** Defines an array of the value axis constant lines. */
-        constantLines?: Array<PolarConstantLine>;
-        /** Specifies options for value axis labels. */
-        label?: PolarAxisLabel;
-    }
-    export interface ArgumentAxis {
-        /** Specifies the desired type of axis values. */
-        argumentType?: string;
-        /** Specifies the elements that will be highlighted when the argument axis is hovered over. */
-        hoverMode?: string;
-    }
-    export interface ChartArgumentAxis extends ChartAxis, ArgumentAxis { }
-    export interface PolarArgumentAxis extends PolarAxis, ArgumentAxis {
-        /** Specifies the angle in arc degrees to which the argument axis should be rotated. The positive values rotate the axis clockwise. */
-        startAngle?: number;
-        /** Specifies whether or not to display the first point at the angle specified by the startAngle option. */
-        firstPointOnStartAngle?: boolean;
-        /** Specifies the value to be used as the origin for the argument axis. */
-        originValue?: number;
-        /** Specifies the period of the argument values in the data source. */
-        period?: number;
-    }
-    export interface ValueAxis {
-        /** Specifies the name of the value axis. */
-        name?: string;
-        /** Specifies whether or not to indicate a zero value on the value axis. */
-        showZero?: boolean;
-        /** Specifies the desired type of axis values. */
-        valueType?: string;
-    }
-    export interface ChartValueAxis extends ChartAxis, ValueAxis {
-        /** Specifies the spacing, in pixels, between multiple value axes in a chart. */
-        multipleAxesSpacing?: number;
-        /** Specifies the value by which the chart's value axes are synchronized. */
-        synchronizedValue?: number;
-    }
-    export interface PolarValueAxis extends PolarAxis, ValueAxis {
-        /** Indicates whether to display series with indents from axis boundaries. */
-        valueMarginsEnabled?: boolean;
-        /** Specifies a coefficient that determines the spacing between the maximum series point and the axis. */
-        maxValueMargin?: number;
-        /** Specifies a coefficient that determines the spacing between the minimum series point and the axis. */
-        minValueMargin?: number;
-        tick?: {
-            visible?: boolean;
-        }
-    }
-    export interface CommonPane {
-        /** Specifies a background color in a pane. */
-        backgroundColor?: string;
-        /** Specifies the border options of a chart's pane. */
-        border?: PaneBorder;
-    }
-    export interface Pane extends CommonPane {
-        /** Specifies the name of a pane. */
-        name?: string;
-    }
-    export interface PaneBorder extends viz.core.DashedBorderWithOpacity {
-        /** Specifies the bottom border's visibility state in a pane. */
-        bottom?: boolean;
-        /** Specifies the left border's visibility state in a pane. */
-        left?: boolean;
-        /** Specifies the right border's visibility state in a pane. */
-        right?: boolean;
-        /** Specifies the top border's visibility state in a pane. */
-        top?: boolean;
-    }
-    export interface ChartAnimation extends viz.core.Animation {
-        /** Specifies the maximum series point count in the chart that the animation supports. */
-        maxPointCountSupported?: number;
-    }
-    export interface BaseChartTooltip extends viz.core.Tooltip {
-        /** Specifies a format for arguments of the chart's series points. */
-        argumentFormat?: string;
-        /** Specifies a precision for formatted arguments displayed in tooltips. */
-        argumentPrecision?: number;
-        /** Specifies a precision for a percent value displayed in tooltips for stacked series and dxPieChart series. */
-        percentPrecision?: number;
-    }
-    export interface BaseChartOptions<TPoint> extends viz.core.BaseWidgetOptions {
-        /** Specifies adaptive layout options. */
-        adaptiveLayout?: {
-            /** Specifies the width of the widget that is small enough for the layout to begin adapting. */
-            width?: number;
-            /** Specifies the height of the widget that is small enough for the layout to begin adapting. */
-            height?: number;
-            /** Specifies whether or not point labels can be hidden when the layout is adapting. */
-            keepLabels?: boolean;
-        };
-        /** Specifies animation options. */
-        animation?: ChartAnimation;
-        /** Specifies a callback function that returns an object with options for a specific point label. */
-        customizeLabel?: (labelInfo: Object) => Object;
-        /** Specifies a callback function that returns an object with options for a specific point. */
-        customizePoint?: (pointInfo: Object) => Object;
-        /** Specifies a data source for the chart. */
-        dataSource?: any;
-        /** Specifies the appearance of the loading indicator. */
-        loadingIndicator?: viz.core.LoadingIndicator;
-        /** Specifies options of a dxChart's (dxPieChart's) legend. */
-        legend?: core.BaseLegend;
-        /** Specifies the blank space between the chart's extreme elements and the boundaries of the area provided for the widget (see size) in pixels. */
-        margin?: viz.core.Margins;
-        /** Sets the name of the palette to be used in the chart. Alternatively, an array of colors can be set as a custom palette to be used within this chart. */
-        palette?: any;
-        /** A handler for the done event. */
-        onDone?: (e: {
-            component: BaseChart;
-            element: Element;
-        }) => void;
-        /** A handler for the pointClick event. */
-        onPointClick?: any;
-        /** A handler for the pointHoverChanged event. */
-        onPointHoverChanged?: (e: {
-            component: BaseChart;
-            element: Element;
-            target: TPoint;
-        }) => void;
-        /** A handler for the pointSelectionChanged event. */
-        onPointSelectionChanged?: (e: {
-            component: BaseChart;
-            element: Element;
-            target: TPoint;
-        }) => void;
-        /** Specifies whether a single point or multiple points can be selected in the chart. */
-        pointSelectionMode?: string;
-        /** Specifies whether to redraw the widget when the size of the parent browser window changes or a mobile device rotates. */
-        redrawOnResize?: boolean;
-        /** Specifies options for the dxChart and dxPieChart widget series. */
-        series?: any;
-        /** Specifies the size of the widget in pixels. */
-        size?: viz.core.Size;
-        /** Specifies a title for the chart. */
-        title?: viz.core.Title;
-        /** Specifies tooltip options. */
-        tooltip?: BaseChartTooltip;
-        /** A handler for the tooltipShown event. */
-        onTooltipShown?: (e: {
-            component: BaseChart;
-            element: Element;
-            target: BasePoint;
-        }) => void;
-        /** A handler for the tooltipHidden event. */
-        onTooltipHidden?: (e: {
-            component: BaseChart;
-            element: Element;
-            target: BasePoint;
-        }) => void;
-    }
-    /** A base class for all chart widgets included in the ChartJS library. */
-    export class BaseChart extends viz.core.BaseWidget {
-        /** Deselects the chart's selected series. The series is displayed in an initial style. */
-        clearSelection(): void;
-        /** Gets the current size of the widget. */
-        getSize(): { width: number; height: number };
-        /** Returns an array of all series in the chart. */
-        getAllSeries(): Array<BaseSeries>;
-        /** Gets a series within the chart's series collection by the specified name (see the name option). */
-        getSeriesByName(seriesName: string): BaseSeries;
-        /** Gets a series within the chart's series collection by its position number. */
-        getSeriesByPos(seriesIndex: number): BaseSeries;
-        /** Displays the loading indicator. */
-        showLoadingIndicator(): void;
-        /** Conceals the loading indicator. */
-        hideLoadingIndicator(): void;
-        /** Hides all widget tooltips. */
-        hideTooltip(): void;
-        /** Redraws a widget. */
-        render(renderOptions?: {
-            force?: boolean;
-            animate?: boolean;
-            asyncSeriesRendering?: boolean;
-        }): void;
-    }
-    export interface AdvancedLegend extends core.BaseLegend {
-        /** Specifies the text for a hint that appears when a user hovers the mouse pointer over a legend item. */
-        customizeHint?: (seriesInfo: { seriesName: string; seriesIndex: number; seriesColor: string; }) => string;
-        /** <p>Specifies a callback function that returns the text to be displayed by legend items.</p> */
-        customizeText?: (seriesInfo: { seriesName: string; seriesIndex: number; seriesColor: string; }) => string;
-        /** Specifies what series elements to highlight when a corresponding item in the legend is hovered over. */
-        hoverMode?: string;
-    }
-    export interface AdvancedOptions<TPoint, TSeries> extends BaseChartOptions<TPoint> {
-        /** A handler for the argumentAxisClick event. */
-        onArgumentAxisClick?: any;
-        /** Specifies the color of the parent page element. */
-        containerBackgroundColor?: string;
-        /** An object providing options for managing data from a data source. */
-        dataPrepareSettings?: {
-            /** Specifies whether or not to validate the values from a data source. */
-            checkTypeForAllData?: boolean;
-            /** Specifies whether or not to convert the values from a data source into the data type of an axis. */
-            convertToAxisDataType?: boolean;
-            /** Specifies how to sort the series points. */
-            sortingMethod?: any;
-        };
-        /** A handler for the legendClick event. */
-        onLegendClick?: any;
-        /** A handler for the seriesClick event. */
-        onSeriesClick?: any;
-        /** A handler for the seriesHoverChanged event. */
-        onSeriesHoverChanged?: (e: {
-            component: BaseChart;
-            element: Element;
-            target: TSeries;
-        }) => void;
-        /** A handler for the seriesSelectionChanged event. */
-        onSeriesSelectionChanged?: (e: {
-            component: BaseChart;
-            element: Element;
-            target: TSeries;
-        }) => void;
-        /** Specifies whether a single series or multiple series can be selected in the chart. */
-        seriesSelectionMode?: string;
-        /** Specifies how the chart must behave when series point labels overlap. */
-        resolveLabelOverlapping?: string;
-        /** Specifies whether or not all bars in a series must have the same angle, or may have different angles if any points in other series are missing. */
-        equalBarWidth?: boolean;
-        /** Specifies a common bar width as a percentage from 0 to 1. */
-        barWidth?: number;
-    }
-    export interface Legend extends AdvancedLegend {
-        /** Specifies whether the legend is located outside or inside the chart's plot. */
-        position?: string;
-    }
-    export interface ChartTooltip extends BaseChartTooltip {
-        /** Specifies whether the tooltip must be located in the center of a bar or on its edge. Applies to the Bar and Bubble series. */
-        location?: string;
-        /** Specifies the kind of information to display in a tooltip. */
-        shared?: boolean;
-    }
-    export interface dxChartOptions extends AdvancedOptions<ChartPoint, ChartSeries> {
-        adaptiveLayout?: {
-            keepLabels?: boolean;
-        };
-        /** Indicates whether or not to synchronize value axes when they are displayed on a single pane. */
-        synchronizeMultiAxes?: boolean;
-        /** Specifies whether or not to filter the series points depending on their quantity. */
-        useAggregation?: boolean;
-        /** Indicates whether or not to adjust a value axis to the current minimum and maximum values of a zoomed chart. */
-        adjustOnZoom?: boolean;
-        /** Specifies argument axis options for the dxChart widget. */
-        argumentAxis?: ChartArgumentAxis;
-        /** An object defining the configuration options that are common for all axes of the dxChart widget. */
-        commonAxisSettings?: ChartCommonAxisSettings;
-        /** An object defining the configuration options that are common for all panes in the dxChart widget. */
-        commonPaneSettings?: CommonPane;
-        /** An object defining the configuration options that are common for all series of the dxChart widget. */
-        commonSeriesSettings?: CommonSeriesSettings;
-        /** An object that specifies the appearance options of the chart crosshair. */
-        crosshair?: {
-            /** Specifies a color for the crosshair lines. */
-            color?: string;
-            /** Specifies a dash style for the crosshair lines. */
-            dashStyle?: string;
-            /** Specifies whether to enable the crosshair or not. */
-            enabled?: boolean;
-            /** Specifies the opacity of the crosshair lines. */
-            opacity?: number;
-            /** Specifies the width of the crosshair lines. */
-            width?: number;
-            /** Specifies the appearance of the horizontal crosshair line. */
-            horizontalLine?: CrosshaierWithLabel;
-            /** Specifies the appearance of the vertical crosshair line. */
-            verticalLine?: CrosshaierWithLabel;
-            /** Specifies the options of the crosshair labels. */
-            label?: {
-                /** Specifies a color for the background of the crosshair labels. */
-                backgroundColor?: string;
-                /** Specifies whether the crosshair labels are visible or not. */
-                visible?: boolean;
-                /** Specifies font options for the text of the crosshair labels. */
-                font?: viz.core.Font;
-                /** Specifies the format of the values displayed by crosshair labels. */
-                format?: string;
-                /** Specifies a precision for formatted values. */
-                precision?: number;
-                /** Customizes the text displayed by the crosshair labels. */
-                customizeText?: (info: { value: any; valueText: string; point: ChartPoint; }) => string;
-            }
-        };
-        /** Specifies a default pane for the chart's series. */
-        defaultPane?: string;
-        /** Specifies a coefficient determining the diameter of the largest bubble. */
-        maxBubbleSize?: number;
-        /** Specifies the diameter of the smallest bubble measured in pixels. */
-        minBubbleSize?: number;
-        /** Defines the dxChart widget's <a href="/Documentation/Guide/Data_Visualization/Charts/Chart_Elements?version=15_2#Panes">pane(s)</a>. */
-        panes?: Array<Pane>;
-        /** Swaps the axes round so that the value axis becomes horizontal and the argument axes becomes vertical. */
-        rotated?: boolean;
-        /** Specifies the options of a chart's legend. */
-        legend?: Legend;
-        /** Specifies options for dxChart widget series. */
-        series?: Array<SeriesConfig>;
-        /** Defines options for the series template. */
-        seriesTemplate?: SeriesTemplate;
-        /** Specifies tooltip options. */
-        tooltip?: ChartTooltip;
-        /** Specifies value axis options for the dxChart widget. */
-        valueAxis?: Array<ChartValueAxis>;
-        /** Enables scrolling in your chart. */
-        scrollingMode?: string;
-        /** Enables zooming in your chart. */
-        zoomingMode?: string;
-        /** Specifies the settings of the scroll bar. */
-        scrollBar?: {
-            /** Specifies whether the scroll bar is visible or not. */
-            visible?: boolean;
-            /** Specifies the spacing between the scroll bar and the chart's plot in pixels. */
-            offset?: number;
-            /** Specifies the color of the scroll bar. */
-            color?: string;
-            /** Specifies the width of the scroll bar in pixels. */
-            width?: number;
-            /** Specifies the opacity of the scroll bar. */
-            opacity?: number;
-            /** Specifies the position of the scroll bar in the chart. */
-            position?: string;
-        };
-    }
-    /** A widget used to embed charts into HTML JS applications. */
-    export class dxChart extends BaseChart {
-        constructor(element: JQuery, options?: dxChartOptions);
-        constructor(element: Element, options?: dxChartOptions);
-        /** Sets the specified start and end values for the chart's argument axis. */
-        zoomArgument(startValue: any, endValue: any): void;
-    }
-    interface CrosshaierWithLabel extends viz.core.DashedBorderWithOpacity {
-        /** Configures the label that belongs to the horizontal crosshair line. */
-        label?: {
-            /** Specifies a color for the background of the label that belongs to the horizontal crosshair line. */
-            backgroundColor?: string;
-            /** Specifies whether the label of the horizontal crosshair line is visible or not. */
-            visible?: boolean;
-            /** Specifies font options for the text of the label that belongs to the horizontal crosshair line. */
-            font?: viz.core.Font;
-            /** Specifies the format of the values displayed by crosshair labels. */
-            format?: string;
-            /** Specifies a precision for formatted values. */
-            precision?: number;
-            /** Customizes the text displayed by the crosshair label that accompany the horizontal line. */
-            customizeText?: (info: { value: any; valueText: string; point: ChartPoint; }) => string;
-        }
-    }
-    export interface PolarChartTooltip extends BaseChartTooltip {
-        /** Specifies the kind of information to display in a tooltip. */
-        shared?: boolean;
-    }
-    export interface dxPolarChartOptions extends AdvancedOptions<PolarPoint, PolarSeries> {
-        /** Specifies adaptive layout options. */
-        adaptiveLayout?: {
-            width?: number;
-            height?: number;
-            /** Specifies whether or not point labels can be hidden when the layout is adapting. */
-            keepLabels?: boolean;
-        };
-        /** Indicates whether or not to display a "spider web". */
-        useSpiderWeb?: boolean;
-        /** Specifies argument axis options for the dxPolarChart widget. */
-        argumentAxis?: PolarArgumentAxis;
-        /** An object defining the configuration options that are common for all axes of the dxPolarChart widget. */
-        commonAxisSettings?: PolarCommonAxisSettings;
-        /** An object defining the configuration options that are common for all series of the dxPolarChart widget. */
-        commonSeriesSettings?: CommonPolarSeriesSettings;
-        /** Specifies the options of a chart's legend. */
-        legend?: AdvancedLegend;
-        /** Specifies options for dxPolarChart widget series. */
-        series?: Array<PolarSeriesConfig>;
-        /** Defines options for the series template. */
-        seriesTemplate?: PolarSeriesTemplate;
-        /** Specifies tooltip options. */
-        tooltip?: PolarChartTooltip;
-        /** Specifies value axis options for the dxPolarChart widget. */
-        valueAxis?: PolarValueAxis;
-    }
-    /** A chart widget displaying data in a polar coordinate system. */
-    export class dxPolarChart extends BaseChart {
-        constructor(element: JQuery, options?: dxPolarChartOptions);
-        constructor(element: Element, options?: dxPolarChartOptions);
-    }
-    export interface PieLegend extends core.BaseLegend {
-        /** Specifies what chart elements to highlight when a corresponding item in the legend is hovered over. */
-        hoverMode?: string;
-        /** Specifies the text for a hint that appears when a user hovers the mouse pointer over a legend item. */
-        customizeHint?: (pointInfo: { pointName: string; pointIndex: number; pointColor: string; }) => string;
-        /** Specifies a callback function that returns the text to be displayed by a legend item. */
-        customizeText?: (pointInfo: { pointName: string; pointIndex: number; pointColor: string; }) => string;
-    }
-    export interface dxPieChartOptions extends BaseChartOptions<PiePoint> {
-        /** Specifies adaptive layout options. */
-        adaptiveLayout?: {
-            /** Specifies whether or not point labels can be hidden when the layout is adapting. */
-            keepLabels?: boolean;
-        };
-        /** Specifies dxPieChart legend options. */
-        legend?: PieLegend;
-        /** Specifies options for the series of the dxPieChart widget. */
-        series?: Array<PieSeriesConfig>;
-        /** Specifies the diameter of the pie. */
-        diameter?: number;
-        /** Specifies the direction that the pie chart segments will occupy. */
-        segmentsDirection?: string;
-        /** Specifies the angle in arc degrees from which the first segment of a pie chart should start. */
-        startAngle?: number;
-        /** Specifies the fraction of the inner radius relative to the total radius in the series of the 'doughnut' type. The value should be between 0 and 1. */
-        innerRadius?: number;
-        /** A handler for the legendClick event. */
-        onLegendClick?: any;
-        /** Specifies how a chart must behave when series point labels overlap. */
-        resolveLabelOverlapping?: string;
-        /** An object defining the configuration options that are common for all series of the dxPieChart widget. */
-        commonSeriesSettings?: CommonPieSeriesSettings;
-        /** Specifies the type of the pie chart series. */
-        type?: string;
-    }
-    /** A circular chart widget for HTML JS applications. */
-    export class dxPieChart extends BaseChart {
-        constructor(element: JQuery, options?: dxPieChartOptions);
-        constructor(element: Element, options?: dxPieChartOptions);
-        /**
-         * Provides access to the dxPieChart series.
-         * @deprecated ..\..\BaseChart\3 Methods\getAllSeries().md
-         */
-        getSeries(): PieSeries;
-    }
-}
-interface JQuery {
-    dxChart(options?: DevExpress.viz.charts.dxChartOptions): JQuery;
-    dxChart(methodName: string, ...params: any[]): any;
-    dxChart(methodName: "instance"): DevExpress.viz.charts.dxChart;
-    dxPieChart(options?: DevExpress.viz.charts.dxPieChartOptions): JQuery;
-    dxPieChart(methodName: string, ...params: any[]): any;
-    dxPieChart(methodName: "instance"): DevExpress.viz.charts.dxPieChart;
-    dxPolarChart(options?: DevExpress.viz.charts.dxPolarChartOptions): JQuery;
-    dxPolarChart(methodName: string, ...params: any[]): any;
-    dxPolarChart(methodName: "instance"): DevExpress.viz.charts.dxPolarChart;
-}
-declare namespace DevExpress.viz.gauges {
-    export interface BaseRangeContainer {
-        /** Specifies a range container's background color. */
-        backgroundColor?: string;
-        /** Specifies the offset of the range container from an invisible scale line in pixels. */
-        offset?: number;
-        /** Sets the name of the palette or an array of colors to be used for coloring the gauge range container. */
-        palette?: any;
-        /** An array of objects representing ranges contained in the range container. */
-        ranges?: Array<{ startValue: number; endValue: number; color: string }>;
-        /** Specifies a color of a range. */
-        color?: string;
-        /** Specifies an end value of a range. */
-        endValue?: number;
-        /** Specifies a start value of a range. */
-        startValue?: number;
-    }
-    export interface ScaleTick {
-        /** Specifies the color of the scale's minor ticks. */
-        color?: string;
-        /**
-         * Specifies an array of custom minor ticks.
-         * @deprecated ..\customMinorTicks.md
-         */
-        customTickValues?: Array<any>;
-        /** Specifies the length of the scale's minor ticks. */
-        length?: number;
-        /**
-         * Indicates whether automatically calculated minor ticks are visible or not.
-         * @deprecated This functionality in not more available
-         */
-        showCalculatedTicks?: boolean;
-        /**
-         * Specifies an interval between minor ticks.
-         * @deprecated ..\minorTickInterval.md
-         */
-        tickInterval?: number;
-        /** Indicates whether scale minor ticks are visible or not. */
-        visible?: boolean;
-        /** Specifies the width of the scale's minor ticks. */
-        width?: number;
-    }
-    export interface ScaleMajorTick extends ScaleTick {
-        /**
-         * Specifies whether or not to expand the current major tick interval if labels overlap each other.
-         * @deprecated ..\label\overlappingBehavior\useAutoArrangement.md
-         */
-        useTicksAutoArrangement?: boolean;
-    }
-    export interface ScaleMinorTick extends ScaleTick {
-        /** Specifies the opacity of the scale's minor ticks. */
-        opacity?: number;
-    }
-    export interface BaseScaleLabel {
-        /** Specifies whether or not scale labels should be colored similarly to their corresponding ranges in the range container. */
-        useRangeColors?: boolean;
-        /** Specifies a callback function that returns the text to be displayed in scale labels. */
-        customizeText?: (scaleValue: { value: number; valueText: string }) => string;
-        /** Specifies the overlap resolving options to be applied to scale labels. */
-        overlappingBehavior?: {
-            /** Specifies whether or not to expand the current major tick interval if labels overlap each other. */
-            useAutoArrangement?: boolean;
-            /** Specifies what label to hide in case of overlapping. */
-            hideFirstOrLast?: string;
-        };
-        /** Specifies font options for the text displayed in the scale labels of the gauge. */
-        font?: viz.core.Font;
-        /** Specifies a format for the text displayed in scale labels. */
-        format?: string;
-        /** Specifies a precision for the formatted value displayed in the scale labels. */
-        precision?: number;
-        /** Specifies whether or not scale labels are visible on the gauge. */
-        visible?: boolean;
-    }
-    export interface BaseScale {
-        /** Specifies the end value for the scale of the gauge. */
-        endValue?: number;
-        /**
-         * Specifies whether or not to hide the first scale label.
-         * @deprecated This functionality in not more available
-         */
-        hideFirstLabel?: boolean;
-        /**
-         * Specifies whether or not to hide the first major tick on the scale.
-         * @deprecated This functionality in not more available
-         */
-        hideFirstTick?: boolean;
-        /**
-         * Specifies whether or not to hide the last scale label.
-         * @deprecated This functionality in not more available
-         */
-        hideLastLabel?: boolean;
-        /**
-         * Specifies whether or not to hide the last major tick on the scale.
-         * @deprecated This functionality in not more available
-         */
-        hideLastTick?: boolean;
-        /** Specifies an interval between major ticks. */
-        tickInterval?: number;
-        /** Specifies an interval between minor ticks. */
-        minorTickInterval?: number;
-        /** Specifies an array of custom major ticks. */
-        customTicks?: Array<any>;
-        /** Specifies an array of custom minor ticks. */
-        customMinorTicks?: Array<any>;
-        /** Specifies common options for scale labels. */
-        label?: BaseScaleLabel;
-        /**
-         * Specifies options of the gauge's major ticks.
-         * @deprecated ..\tick\tick.md
-         */
-        majorTick?: ScaleMajorTick;
-        /** Specifies options of the gauge's major ticks. */
-        tick?: {
-            /** Specifies the color of the scale's major ticks. */
-            color?: string;
-            /** Specifies the length of the scale's major ticks. */
-            length?: number;
-            /** Indicates whether scale major ticks are visible or not. */
-            visible?: boolean;
-            /** Specifies the width of the scale's major ticks. */
-            width?: number;
-            /** Specifies the opacity of the scale's major ticks. */
-            opacity?: number;
-        };
-        /** Specifies options of the gauge's minor ticks. */
-        minorTick?: ScaleMinorTick;
-        /** Specifies the start value for the scale of the gauge. */
-        startValue?: number;
-    }
-    export interface BaseValueIndicator {
-        /** Specifies the type of subvalue indicators. */
-        type?: string;
-        /** Specifies the background color for the indicator of the rangeBar type. */
-        backgroundColor?: string;
-        /** Specifies the base value for the indicator of the rangeBar type. */
-        baseValue?: number;
-        /** Specifies a color of the indicator. */
-        color?: string;
-        /** Specifies the range bar size for an indicator of the rangeBar type. */
-        size?: number;
-        text?: {
-            /** Specifies a callback function that returns the text to be displayed in an indicator. */
-            customizeText?: (indicatedValue: { value: number; valueText: string }) => string;
-            font?: viz.core.Font;
-            /** Specifies a format for the text displayed in an indicator. */
-            format?: string;
-            /** Specifies the range bar's label indent in pixels. */
-            indent?: number;
-            /** Specifies a precision for the formatted value displayed by an indicator. */
-            precision?: number;
-        };
-        offset?: number;
-        length?: number;
-        width?: number;
-        /** Specifies the length of an arrow for the indicator of the textCloud type in pixels. */
-        arrowLength?: number;
-        /** Sets the array of colors to be used for coloring subvalue indicators. */
-        palette?: Array<any>;
-        /** Specifies the distance between the needle and the center of a gauge for the indicator of a needle-like type. */
-        indentFromCenter?: number;
-        /** Specifies the second color for the indicator of the twoColorNeedle type. */
-        secondColor?: string;
-        /** Specifies the length of a twoNeedleColor type indicator tip as a percentage. */
-        secondFraction?: number;
-        /** Specifies the spindle's diameter in pixels for the indicator of a needle-like type. */
-        spindleSize?: number;
-        /** Specifies the inner diameter in pixels, so that the spindle has the shape of a ring. */
-        spindleGapSize?: number;
-        /** Specifies the orientation of the rangeBar indicator on a vertically oriented dxLinearGauge widget. */
-        horizontalOrientation?: string;
-        /** Specifies the orientation of the rangeBar indicator on a horizontally oriented dxLinearGauge widget. */
-        verticalOrientation?: string;
-    }
-    export interface SharedGaugeOptions {
-        /** Specifies animation options. */
-        animation?: viz.core.Animation;
-        /** Specifies the appearance of the loading indicator. */
-        loadingIndicator?: viz.core.LoadingIndicator;
-        /** Specifies whether to redraw the widget when the size of the parent browser window changes or a mobile device rotates. */
-        redrawOnResize?: boolean;
-        /** Specifies the size of the widget in pixels. */
-        size?: viz.core.Size;
-        /**
-         * Specifies a subtitle for the widget.
-         * @deprecated ..\..\..\BaseGauge\1 Configuration\title\subtitle\subtitle.md
-         */
-        subtitle?: {
-            /**
-             * Specifies font options for the subtitle.
-             * @deprecated ..\..\title\subtitle\font\font.md
-             */
-            font?: viz.core.Font;
-            /**
-             * Specifies a text for the subtitle.
-             * @deprecated ..\title\subtitle\text.md
-             */
-            text?: string;
-        };
-        /** Specifies a title for a gauge. */
-        title?: {
-            /** Specifies font options for the title. */
-            font?: viz.core.Font;
-            /**
-             * Specifies a title's position on the gauge.
-             * @deprecated basegaugeoptions_title_verticalAlignment and basegaugeoptions_title_horizontalAlignment
-             */
-            position?: string;
-            /** Specifies the distance between the title and surrounding gauge elements in pixels. */
-            margin?: viz.core.Margins;
-            /** Specifies the height of the space reserved for the title. */
-            placeholderSize?: number;
-            /** Specifies the gauge title's position in the vertical direction. */
-            verticalAlignment?: string;
-            /** Specifies the gauge title's horizontal position. */
-            horizontalAlignment?: string;
-            /** Specifies text for the title. */
-            text?: string;
-            /** Specifies a subtitle for the widget. */
-            subtitle?: {
-                /** Specifies font options for the subtitle. */
-                font?: viz.core.Font;
-                /** Specifies text for the subtitle. */
-                text?: string;
-            }
-        };
-        /** Specifies options for gauge tooltips. */
-        tooltip?: viz.core.Tooltip;
-        /** A handler for the tooltipShown event. */
-        onTooltipShown?: (e: {
-            component: dxBaseGauge;
-            element: Element;
-            target: {};
-        }) => void;
-        /** A handler for the tooltipHidden event. */
-        onTooltipHidden?: (e: {
-            component: dxBaseGauge;
-            element: Element;
-            target: {};
-        }) => void;
-    }
-    export interface BaseGaugeOptions extends viz.core.BaseWidgetOptions, SharedGaugeOptions {
-        /** Specifies the color of the parent page element. */
-        containerBackgroundColor?: string;
-        /** Specifies the blank space in pixels between the widget's extreme elements and the boundaries of the area provided for the widget (see the size option). */
-        margin?: viz.core.Margins;
-        /** Specifies options of the gauge's range container. */
-        rangeContainer?: BaseRangeContainer;
-        /** Specifies a gauge's scale options. */
-        scale?: BaseScale;
-        /** Specifies the appearance options of subvalue indicators. */
-        subvalueIndicator?: BaseValueIndicator;
-        /** Specifies a set of subvalues to be designated by the subvalue indicators. */
-        subvalues?: Array<number>;
-        /** Specifies the main value on a gauge. */
-        value?: number;
-        /** Specifies the appearance options of the value indicator. */
-        valueIndicator?: BaseValueIndicator;
-    }
-    /** A gauge widget. */
-    export class dxBaseGauge extends viz.core.BaseWidget {
-        /** Displays the loading indicator. */
-        showLoadingIndicator(): void;
-        /** Conceals the loading indicator. */
-        hideLoadingIndicator(): void;
-        /** Redraws a widget. */
-        render(): void;
-        /** Returns the main gauge value. */
-        value(): number;
-        /** Updates a gauge value. */
-        value(value: number): void;
-        /** Returns an array of gauge subvalues. */
-        subvalues(): Array<number>;
-        /** Updates gauge subvalues. */
-        subvalues(subvalues: Array<number>): void;
-    }
-    export interface LinearRangeContainer extends BaseRangeContainer {
-        /** Specifies the orientation of the range container on a vertically oriented dxLinearGauge widget. */
-        horizontalOrientation?: string;
-        /** Specifies the orientation of a range container on a horizontally oriented dxLinearGauge widget. */
-        verticalOrientation?: string;
-        /** Specifies the width of the range container's start and end boundaries in the dxLinearGauge widget. */
-        width?: any;
-        /** Specifies an end width of a range container. */
-        end?: number;
-        /** Specifies a start width of a range container. */
-        start?: number;
-    }
-    export interface LinearScaleLabel extends BaseScaleLabel {
-        /** Specifies the spacing between scale labels and ticks. */
-        indentFromTick?: number;
-    }
-    export interface LinearScale extends BaseScale {
-        /** Specifies the orientation of scale ticks on a vertically oriented dxLinearGauge widget. */
-        horizontalOrientation?: string;
-        label?: LinearScaleLabel;
-        /** Specifies the orientation of scale ticks on a horizontally oriented dxLinearGauge widget. */
-        verticalOrientation?: string;
-    }
-    export interface dxLinearGaugeOptions extends BaseGaugeOptions {
-        /** Specifies the options required to set the geometry of the dxLinearGauge widget. */
-        geometry?: {
-            /** Indicates whether to display the dxLinearGauge widget vertically or horizontally. */
-            orientation?: string;
-        };
-        /** Specifies gauge range container options. */
-        rangeContainer?: LinearRangeContainer;
-        scale?: LinearScale;
-    }
-    /** A widget that represents a gauge with a linear scale. */
-    export class dxLinearGauge extends dxBaseGauge {
-        constructor(element: JQuery, options?: dxLinearGaugeOptions);
-        constructor(element: Element, options?: dxLinearGaugeOptions);
-    }
-    export interface CircularRangeContainer extends BaseRangeContainer {
-        /** Specifies the orientation of the range container in the dxCircularGauge widget. */
-        orientation?: string;
-        /** Specifies the range container's width in pixels. */
-        width?: number;
-    }
-    export interface CircularScaleLabel extends BaseScaleLabel {
-        /** Specifies the spacing between scale labels and ticks. */
-        indentFromTick?: number;
-    }
-    export interface CircularScale extends BaseScale {
-        label?: CircularScaleLabel;
-        /** Specifies the orientation of scale ticks. */
-        orientation?: string;
-    }
-    export interface dxCircularGaugeOptions extends BaseGaugeOptions {
-        /** Specifies the options required to set the geometry of the dxCircularGauge widget. */
-        geometry?: {
-            /** Specifies the end angle of the circular gauge's arc. */
-            endAngle?: number;
-            /** Specifies the start angle of the circular gauge's arc. */
-            startAngle?: number;
-        };
-        /** Specifies gauge range container options. */
-        rangeContainer?: CircularRangeContainer;
-        scale?: CircularScale;
-    }
-    /** A widget that represents a gauge with a circular scale. */
-    export class dxCircularGauge extends dxBaseGauge {
-        constructor(element: JQuery, options?: dxCircularGaugeOptions);
-        constructor(element: Element, options?: dxCircularGaugeOptions);
-    }
-    export interface dxBarGaugeOptions extends viz.core.BaseWidgetOptions, SharedGaugeOptions {
-        /** Specifies a color for the remaining segment of the bar's track. */
-        backgroundColor?: string;
-        /** Specifies a distance between bars in pixels. */
-        barSpacing?: number;
-        /** Specifies a base value for bars. */
-        baseValue?: number;
-        /** Specifies an end value for the gauge's invisible scale. */
-        endValue?: number;
-        /** Defines the shape of the gauge's arc. */
-        geometry?: {
-            /** Specifies the end angle of the bar gauge's arc. */
-            endAngle?: number;
-            /** Specifies the start angle of the bar gauge's arc. */
-            startAngle?: number;
-        };
-        /** Specifies the options of the labels that accompany gauge bars. */
-        label?: {
-            /** Specifies a color for the label connector text. */
-            connectorColor?: string;
-            /** Specifies the width of the label connector in pixels. */
-            connectorWidth?: number;
-            /** Specifies a callback function that returns a text for labels. */
-            customizeText?: (barValue: { value: number; valueText: string }) => string;
-            /** Specifies font options for bar labels. */
-            font?: viz.core.Font;
-            /** Specifies a format for bar labels. */
-            format?: string;
-            /** Specifies the distance between the upper bar and bar labels in pixels. */
-            indent?: number;
-            /** Specifies a precision for the formatted value displayed by labels. */
-            precision?: number;
-            /** Specifies whether bar labels appear on a gauge or not. */
-            visible?: boolean;
-        };
-        /** Sets the name of the palette or an array of colors to be used for coloring the gauge range container. */
-        palette?: string;
-        /** Defines the radius of the bar that is closest to the center relatively to the radius of the topmost bar. */
-        relativeInnerRadius?: number;
-        /** Specifies a start value for the gauge's invisible scale. */
-        startValue?: number;
-        /** Specifies the array of values to be indicated on a bar gauge. */
-        values?: Array<number>;
-    }
-    /** A circular bar widget. */
-    export class dxBarGauge extends viz.core.BaseWidget {
-        constructor(element: JQuery, options?: dxBarGaugeOptions);
-        constructor(element: Element, options?: dxBarGaugeOptions);
-        /** Displays the loading indicator. */
-        showLoadingIndicator(): void;
-        /** Conceals the loading indicator. */
-        hideLoadingIndicator(): void;
-        /** Redraws the widget. */
-        render(): void;
-        /** Returns an array of gauge values. */
-        values(): Array<number>;
-        /** Updates the values displayed by a gauge. */
-        values(values: Array<number>): void;
-    }
-}
-interface JQuery {
-    dxLinearGauge(options?: DevExpress.viz.gauges.dxLinearGaugeOptions): JQuery;
-    dxLinearGauge(methodName: string, ...params: any[]): any;
-    dxLinearGauge(methodName: "instance"): DevExpress.viz.gauges.dxLinearGauge;
-    dxCircularGauge(options?: DevExpress.viz.gauges.dxCircularGaugeOptions): JQuery;
-    dxCircularGauge(methodName: string, ...params: any[]): any;
-    dxCircularGauge(methodName: "instance"): DevExpress.viz.gauges.dxCircularGauge;
-    dxBarGauge(options?: DevExpress.viz.gauges.dxBarGaugeOptions): JQuery;
-    dxBarGauge(methodName: string, ...params: any[]): any;
-    dxBarGauge(methodName: "instance"): DevExpress.viz.gauges.dxBarGauge;
-}
-declare namespace DevExpress.viz.rangeSelector {
-    export interface dxRangeSelectorOptions extends viz.core.BaseWidgetOptions {
-        /** Specifies the options for the range selector's background. */
-        background?: {
-            /** Specifies the background color for the dxRangeSelector. */
-            color?: string;
-            /** Specifies image options. */
-            image?: {
-                /** Specifies a location for the image in the background of a range selector. */
-                location?: string;
-                /** Specifies the image's URL. */
-                url?: string;
-            };
-            /** Indicates whether or not the background (background color and/or image) is visible. */
-            visible?: boolean;
-        };
-        /** Specifies a title for the range selector. */
-        title?: viz.core.Title;
-        /** Specifies the dxRangeSelector's behavior options. */
-        behavior?: {
-            /** Indicates whether or not you can swap sliders. */
-            allowSlidersSwap?: boolean;
-            /** Indicates whether or not animation is enabled. */
-            animationEnabled?: boolean;
-            /** Specifies when to call the onSelectedRangeChanged function. */
-            callSelectedRangeChanged?: string;
-            /** Indicates whether or not an end user can specify the range using a mouse, without the use of sliders. */
-            manualRangeSelectionEnabled?: boolean;
-            /** Indicates whether or not an end user can shift the selected range to the required location on a scale by clicking. */
-            moveSelectedRangeByClick?: boolean;
-            /** Indicates whether to snap a slider to ticks. */
-            snapToTicks?: boolean;
-        };
-        /** Specifies the options required to display a chart as the range selector's background. */
-        chart?: {
-            /** Specifies a coefficient for determining an indent from the bottom background boundary to the lowest chart point. */
-            bottomIndent?: number;
-            /** An object defining the common configuration options for the chart’s series. */
-            commonSeriesSettings?: viz.charts.CommonSeriesSettings;
-            /** An object providing options for managing data from a data source. */
-            dataPrepareSettings?: {
-                /** Specifies whether or not to validate values from a data source. */
-                checkTypeForAllData?: boolean;
-                /** Specifies whether or not to convert the values from a data source into the data type of an axis. */
-                convertToAxisDataType?: boolean;
-                /** Specifies how to sort series points. */
-                sortingMethod?: any;
-            };
-            /** Specifies whether all bars in a series must have the same width, or may have different widths if any points in other series are missing. */
-            equalBarWidth?: boolean;
-            /** Specifies a common bar width as a percentage from 0 to 1. */
-            barWidth?: number;
-            /** Sets the name of the palette to be used in the range selector's chart. Alternatively, an array of colors can be set as a custom palette to be used within this chart. */
-            palette?: any;
-            /** An object defining the chart’s series. */
-            series?: Array<viz.charts.SeriesConfig>;
-            /** Defines options for the series template. */
-            seriesTemplate?: viz.charts.SeriesTemplate;
-            /** Specifies a coefficient for determining an indent from the background's top boundary to the topmost chart point. */
-            topIndent?: number;
-            /** Specifies whether or not to filter the series points depending on their quantity. */
-            useAggregation?: boolean;
-            /** Specifies options for the chart's value axis. */
-            valueAxis?: {
-                /** Indicates whether or not the chart's value axis must be inverted. */
-                inverted?: boolean;
-                /** Specifies the value to be raised to a power when generating ticks for a logarithmic value axis. */
-                logarithmBase?: number;
-                /** Specifies the maximum value of the chart's value axis. */
-                max?: number;
-                /** Specifies the minimum value of the chart's value axis. */
-                min?: number;
-                /** Specifies the type of the value axis. */
-                type?: string;
-                /** Specifies the desired type of axis values. */
-                valueType?: string;
-            };
-        };
-        /** Specifies the color of the parent page element. */
-        containerBackgroundColor?: string;
-        /** Specifies a data source for the scale values and for the chart at the background. */
-        dataSource?: any;
-        /** Specifies the data source field that provides data for the scale. */
-        dataSourceField?: string;
-        /** Specifies the appearance of the loading indicator. */
-        loadingIndicator?: viz.core.LoadingIndicator;
-        /** Specifies the blank space in pixels between the dxRangeSelector widget's extreme elements and the boundaries of the area provided for the widget (see size). */
-        margin?: viz.core.Margins;
-        /** Specifies whether to redraw the widget when the size of the parent browser window changes or a mobile device rotates. */
-        redrawOnResize?: boolean;
-        /** Specifies options of the range selector's scale. */
-        scale?: {
-            /** Specifies the scale's end value. */
-            endValue?: any;
-            /** Specifies common options for scale labels. */
-            label?: {
-                /** Specifies a callback function that returns the text to be displayed in scale labels. */
-                customizeText?: (scaleValue: { value: any; valueText: string; }) => string;
-                /** Specifies font options for the text displayed in the range selector's scale labels. */
-                font?: viz.core.Font;
-                /** Specifies a format for the text displayed in scale labels. */
-                format?: string;
-                /** Specifies a precision for the formatted value displayed in the scale labels. */
-                precision?: number;
-                /** Specifies a spacing between scale labels and the background bottom edge. */
-                topIndent?: number;
-                /** Specifies whether or not the scale's labels are visible. */
-                visible?: boolean;
-            };
-            /** Specifies the value to be raised to a power when generating ticks for a logarithmic scale. */
-            logarithmBase?: number;
-            /**
-             * Specifies an interval between major ticks.
-             * @deprecated ..\tickInterval\tickInterval.md
-             */
-            majorTickInterval?: any;
-            /** Specifies an interval between axis ticks. */
-            tickInterval?: any;
-            /** Specifies options for the date-time scale's markers. */
-            marker?: {
-                /** Defines the options that can be set for the text that is displayed by the scale markers. */
-                label?: {
-                    /** Specifies a callback function that returns the text to be displayed in scale markers. */
-                    customizeText?: (markerValue: { value: any; valueText: string }) => string;
-                    /** Specifies a format for the text displayed in scale markers. */
-                    format?: string;
-                };
-                /** Specifies the height of the marker's separator. */
-                separatorHeight?: number;
-                /** Specifies the space between the marker label and the marker separator. */
-                textLeftIndent?: number;
-                /** Specifies the space between the marker's label and the top edge of the marker's separator. */
-                textTopIndent?: number;
-                /** Specified the indent between the marker and the scale lables. */
-                topIndent?: number;
-                /** Indicates whether scale markers are visible. */
-                visible?: boolean;
-            };
-            /** Specifies the maximum range that can be selected. */
-            maxRange?: any;
-            /** Specifies the number of minor ticks between neighboring major ticks. */
-            minorTickCount?: number;
-            /** Specifies an interval between minor ticks. */
-            minorTickInterval?: any;
-            /** Specifies the minimum range that can be selected. */
-            minRange?: any;
-            /** Specifies the height of the space reserved for the scale in pixels. */
-            placeholderHeight?: number;
-            /** Indicates whether or not to set ticks of a date-time scale at the beginning of each date-time interval. */
-            setTicksAtUnitBeginning?: boolean;
-            /** Specifies whether or not to show ticks for the boundary scale values, when neither major ticks nor minor ticks are created for these values. */
-            showCustomBoundaryTicks?: boolean;
-            /**
-             * Indicates whether or not to show minor ticks on the scale.
-             * @deprecated minorTick\visible.md
-             */
-            showMinorTicks?: boolean;
-            /** Specifies the scale's start value. */
-            startValue?: any;
-            /** Specifies options defining the appearance of scale ticks. */
-            tick?: {
-                /** Specifies the color of scale ticks (both major and minor ticks). */
-                color?: string;
-                /** Specifies the opacity of scale ticks (both major and minor ticks). */
-                opacity?: number;
-                /** Specifies the width of the scale's ticks (both major and minor ticks). */
-                width?: number;
-            };
-            /** Specifies options of the range selector's minor ticks. */
-            minorTick?: {
-                /** Specifies the color of the scale's minor ticks. */
-                color?: string;
-                /** Specifies the opacity of the scale's minor ticks. */
-                opacity?: number;
-                /** Specifies the width of the scale's minor ticks. */
-                width?: number;
-                /** Indicates whether scale minor ticks are visible or not. */
-                visible?: boolean;
-            };
-            /** Specifies the type of the scale. */
-            type?: string;
-            /** Specifies whether or not to expand the current tick interval if labels overlap each other. */
-            useTicksAutoArrangement?: boolean;
-            /** Specifies the type of values on the scale. */
-            valueType?: string;
-			/** Specifies the order of arguments on a discrete scale. */
-			categories?: Array<any>;
-        };
-        /** Specifies the range to be selected when displaying the dxRangeSelector. */
-        selectedRange?: {
-            /** Specifies the start value of the range to be selected when displaying the dxRangeSelector widget on a page. */
-            startValue?: any;
-            /** Specifies the end value of the range to be selected when displaying the dxRangeSelector widget on a page. */
-            endValue?: any;
-        };
-        /** Specifies the color of the selected range. */
-        selectedRangeColor?: string;
-        /** Range selector's indent options. */
-        indent?: {
-            /** Specifies range selector's left indent. */
-            left?: number;
-            /** Specifies range selector's right indent. */
-            right?: number;
-        };
-        /** A handler for the selectedRangeChanged event. */
-        onSelectedRangeChanged?: (e: {
-            startValue: any;
-            endValue: any;
-            component: dxRangeSelector;
-            element: Element;
-        }) => void;
-        /** Specifies range selector shutter options. */
-        shutter?: {
-            /** Specifies shutter color. */
-            color?: string;
-            /** Specifies the opacity of the color of shutters. */
-            opacity?: number;
-        };
-        /** Specifies in pixels the size of the dxRangeSelector widget. */
-        size?: viz.core.Size;
-        /** Specifies the appearance of the range selector's slider handles. */
-        sliderHandle?: {
-            /** Specifies the color of the slider handles. */
-            color?: string;
-            /** Specifies the opacity of the slider handles. */
-            opacity?: number;
-            /** Specifies the width of the slider handles. */
-            width?: number;
-        };
-        /** Defines the options of the range selector slider markers. */
-        sliderMarker?: {
-            /** Specifies the color of the slider markers. */
-            color?: string;
-            /** Specifies a callback function that returns the text to be displayed by slider markers. */
-            customizeText?: (scaleValue: { value: any; valueText: any; }) => string;
-            /** Specifies font options for the text displayed by the range selector slider markers. */
-            font?: viz.core.Font;
-            /** Specifies a format for the text displayed in slider markers. */
-            format?: string;
-            /** Specifies the color used for the slider marker text when the currently selected range does not match the minRange and maxRange values. */
-            invalidRangeColor?: string;
-            /**
-             * Specifies the empty space between the marker's border and the marker’s text.
-             * @deprecated Use the 'paddingTopBottom' and 'paddingLeftRight' options instead
-             */
-            padding?: number;
-            /** Specifies the empty space between the marker's top and bottom borders and the marker's text. */
-            paddingTopBottom?: number;
-            /** Specifies the empty space between the marker's left and right borders and the marker's text. */
-            paddingLeftRight?: number;
-            /** Specifies the placeholder height of the slider marker. */
-            placeholderHeight?: number;
-            /**
-             * Specifies in pixels the height and width of the space reserved for the range selector slider markers.
-             * @deprecated Use the 'placeholderHeight' and 'indent' options instead
-             */
-            placeholderSize?: {
-                /** Specifies the height of the placeholder for the left and right slider markers. */
-                height?: number;
-                /** Specifies the width of the placeholder for the left and right slider markers. */
-                width?: {
-                    /** Specifies the width of the left slider marker's placeholder. */
-                    left?: number;
-                    /** Specifies the width of the right slider marker's placeholder. */
-                    right?: number;
-                };
-            };
-            /** Specifies a precision for the formatted value displayed in slider markers. */
-            precision?: number;
-            /** Indicates whether or not the slider markers are visible. */
-            visible?: boolean;
-        };
-    }
-    /** A widget that allows end users to select a range of values on a scale. */
-    export class dxRangeSelector extends viz.core.BaseWidget {
-        constructor(element: JQuery, options?: dxRangeSelectorOptions);
-        constructor(element: Element, options?: dxRangeSelectorOptions);
-        /** Displays the loading indicator. */
-        showLoadingIndicator(): void;
-        /** Conceals the loading indicator. */
-        hideLoadingIndicator(): void;
-        /** Redraws a widget. */
-        render(skipChartAnimation?: boolean): void;
-        /** Returns the currently selected range. */
-        getSelectedRange(): { startValue: any; endValue: any; };
-        /** Sets a specified range. */
-        setSelectedRange(selectedRange: { startValue: any; endValue: any; }): void;
-    }
-}
-interface JQuery {
-    dxRangeSelector(options?: DevExpress.viz.rangeSelector.dxRangeSelectorOptions): JQuery;
-    dxRangeSelector(methodName: string, ...params: any[]): any;
-    dxRangeSelector(methodName: "instance"): DevExpress.viz.rangeSelector.dxRangeSelector;
-}
-declare namespace DevExpress.viz.map {
-    /** This section describes the fields and methods that can be used in code to manipulate the Layer object. */
-    export interface MapLayer {
-        /** The name of the layer. */
-        name: string;
-        /** The layer index in the layers array. */
-        index: number;
-        /** The layer type. Can be "area", "line" or "marker". */
-        type: string;
-        /** The type of the layer elements. */
-        elementType: string;
-        /** Gets all layer elements. */
-        getElements(): Array<MapLayerElement>;
-        /** Deselects all layer elements. */
-        clearSelection(): void;
-    }
-    /** This section describes the fields and methods that can be used in code to manipulate the Layer Element object. */
-    export interface MapLayerElement {
-        /** The parent layer of the layer element. */
-        layer: MapLayer;
-        /** Gets the layer element coordinates. */
-        coordinates(): Object;
-        /** Sets the value of an attribute. */
-        attribute(name: string, value: any): void;
-        /** Gets the value of an attribute. */
-        attribute(name: string): any;
-        /** Gets the selection state of the layer element. */
-        selected(): boolean;
-        /** Sets the selection state of the layer element. */
-        selected(state: boolean): void;
-        /** Applies the layer element settings and updates element appearance. */
-        applySettings(settings: any): void;
-    }
-    /**
-     * This section describes the fields and methods that can be used in code to manipulate the Area object.
-     * @deprecated Use the "Layer Element" instead
-     */
-    export interface Area {
-        /**
-         * Contains the element type.
-         * @deprecated ..\..\Layer\2 Fields\type.md
-         */
-        type: string;
-        /**
-         * Return the value of an attribute.
-         * @deprecated ..\..\Layer Element\3 Methods\attribute(name_value).md
-         */
-        attribute(name: string): any;
-        /**
-         * Provides information about the selection state of an area.
-         * @deprecated Use the "selected()" method of the Layer Element
-         */
-        selected(): boolean;
-        /**
-         * Sets a new selection state for an area.
-         * @deprecated Use the "selected(state)" method of the Layer Element
-         */
-        selected(state: boolean): void;
-        /**
-         * Applies the area settings specified as a parameter and updates the area appearance.
-         * @deprecated ..\..\Layer Element\3 Methods\applySettings(settings).md
-         */
-        applySettings(settings: any): void;
-    }
-    /**
-     * This section describes the fields and methods that can be used in code to manipulate the Markers object.
-     * @deprecated Use the "Layer Element" instead
-     */
-    export interface Marker {
-        /**
-         * Contains the descriptive text accompanying the map marker.
-         * @deprecated Get the text with the "attribute" method (using the "layers.label.dataField" value)
-         */
-        text: string;
-        /**
-         * Contains the type of the element.
-         * @deprecated ..\..\Layer\2 Fields\type.md
-         */
-        type: string;
-        /**
-         * Contains the URL of an image map marker.
-         * @deprecated Get the url with the "attribute" method (using the "layers.dataField" value)
-         */
-        url: string;
-        /**
-         * Contains the value of a bubble map marker.
-         * @deprecated Get the value with the "attribute" method (using the "layers.dataField" value)
-         */
-        value: number;
-        /**
-         * Contains the values of a pie map marker.
-         * @deprecated Get the values with the "attribute" method (using the "layers.dataField" value)
-         */
-        values: Array<number>;
-        /**
-         * Returns the value of an attribute.
-         * @deprecated ..\..\Layer Element\3 Methods\attribute(name_value).md
-         */
-        attribute(name: string): any;
-        /**
-         * Returns the coordinates of a specific marker.
-         * @deprecated ..\..\Layer Element\3 Methods\coordinates().md
-         */
-        coordinates(): Array<number>;
-        /**
-         * Provides information about the selection state of a marker.
-         * @deprecated Use the "selected()" method of the Layer Element
-         */
-        selected(): boolean;
-        /**
-         * Sets a new selection state for a marker.
-         * @deprecated Use the "selected(state)" method of the Layer Element
-         */
-        selected(state: boolean): void;
-        /**
-         * Applies the marker settings specified as a parameter and updates marker appearance.
-         * @deprecated ..\..\Layer Element\3 Methods\applySettings(settings).md
-         */
-        applySettings(settings: any): void;
-    }
-    export interface MapLayerSettings {
-        /** Specifies the layer name. */
-        name?: string;
-        /** Specifies layer type. */
-        type?: string;
-        /** Specifies the type of a marker element. Setting this option makes sense only if the layer type is "marker". */
-        elementType?: string;
-        /** Specifies a data source for the layer. */
-        data?: any;
-        /** Specifies the line width (for layers of a line type) or width of the layer elements border in pixels. */
-        borderWidth?: number;
-        /** Specifies a color for the border of the layer elements. */
-        borderColor?: string;
-        /** Specifies a color for layer elements. */
-        color?: string;
-        /** Specifies a color for the border of the layer element when it is hovered over. */
-        hoveredBorderColor?: string;
-        /** Specifies the pixel-measured line width (for layers of a line type) or width for the border of the layer element when it is hovered over. */
-        hoveredBorderWidth?: number;
-        /** Specifies a color for a layer element when it is hovered over. */
-        hoveredColor?: string;
-        /** Specifies a pixel-measured line width (for layers of a line type) or width for the border of the layer element when it is selected. */
-        selectedBorderWidth?: number;
-        /** Specifies a color for the border of the layer element when it is selected. */
-        selectedBorderColor?: string;
-        /** Specifies a color for the layer element when it is selected. */
-        selectedColor?: string;
-        /** Specifies the layer opacity (from 0 to 1). */
-        opacity?: number;
-        /** Specifies the size of markers. Setting this option makes sense only if the layer type is "marker" and the elementType is "dot", "pie" or "image". */
-        size?: number;
-        /** Specifies the pixel-measured diameter of the marker that represents the smallest value. Setting this option makes sense only if the layer type is "marker". */
-        minSize?: number;
-        /** Specifies the pixel-measured diameter of the marker that represents the biggest value. Setting this option makes sense only if the layer type is "marker". */
-        maxSize?: number;
-        /** Specifies whether or not to change the appearance of a layer element when it is hovered over. */
-        hoverEnabled?: boolean;
-        /** Specifies whether single or multiple map elements can be selected on a vector map. */
-        selectionMode?: string;
-        /** Specifies the name of the palette or a custom range of colors to be used for coloring a layer. */
-        palette?: any;
-        /** Specifies the number of colors in a palette. */
-        paletteSize?: number;
-        /** Allows you to paint layer elements with similar attributes in the same color. */
-        colorGroups?: Array<number>;
-        /** Specifies the field that provides data to be used for coloring of layer elements. */
-        colorGroupingField?: string;
-        /** Allows you to display bubbles with similar attributes in the same size. Setting this option makes sense only if the layer type is "marker" and the elementType is "bubble". */
-        sizeGroups?: Array<number>;
-        /** Specifies the field that provides data to be used for sizing bubble markers. Setting this option makes sense only if the layer type is "marker" and the elementType is "bubble". */
-        sizeGroupingField?: string;
-        /** Specifies the name of the attribute containing marker data. Setting this option makes sense only if the layer type is "marker" and the elementType is "bubble", "pie" or "image". */
-        dataField?: string;
-        /** Specifies the function that customizes each layer element individually. */
-        customize?: (eleemnts: Array<MapLayerElement>) => void;
-        /** Specifies marker label options. */
-        label?: {
-            /** The name of the data attribute containing marker texts. */
-            dataField?: string;
-            /** Enables marker labels. */
-            enabled?: boolean;
-            /** Specifies font options for marker labels. */
-            font?: viz.core.Font;
-        };
-    }
-    export interface AreaSettings {
-        /**
-         * Specifies the width of the area border in pixels.
-         * @deprecated ..\layers\borderWidth.md
-         */
-        borderWidth?: number;
-        /**
-         * Specifies a color for the area border.
-         * @deprecated ..\layers\borderColor.md
-         */
-        borderColor?: string;
-        /**
-         * Specifies a color for an area.
-         * @deprecated ..\layers\color.md
-         */
-        color?: string;
-        /**
-         * Specifies the function that customizes each area individually.
-         * @deprecated ..\layers\customize.md
-         */
-        customize?: (areaInfo: Area) => AreaSettings;
-        /**
-         * Specifies a color for the area border when the area is hovered over.
-         * @deprecated ..\layers\hoveredBorderColor.md
-         */
-        hoveredBorderColor?: string;
-        /**
-         * Specifies the pixel-measured width of the area border when the area is hovered over.
-         * @deprecated ..\layers\hoveredBorderWidth.md
-         */
-        hoveredBorderWidth?: number;
-        /**
-         * Specifies a color for an area when this area is hovered over.
-         * @deprecated ..\layers\hoveredColor.md
-         */
-        hoveredColor?: string;
-        /**
-         * Specifies whether or not to change the appearance of an area when it is hovered over.
-         * @deprecated ..\layers\hoverEnabled.md
-         */
-        hoverEnabled?: boolean;
-        /**
-         * Configures area labels.
-         * @deprecated ..\..\layers\label\label.md
-         */
-        label?: {
-            /**
-             * Specifies the data field that provides data for area labels.
-             * @deprecated ..\..\layers\label\dataField.md
-             */
-            dataField?: string;
-            /**
-             * Enables area labels.
-             * @deprecated ..\..\layers\label\enabled.md
-             */
-            enabled?: boolean;
-            /**
-             * Specifies font options for area labels.
-             * @deprecated ..\..\..\layers\label\font\font.md
-             */
-            font?: viz.core.Font;
-        };
-        /**
-         * Specifies the name of the palette or a custom range of colors to be used for coloring a map.
-         * @deprecated ..\layers\palette.md
-         */
-        palette?: any;
-        /**
-         * Specifies the number of colors in a palette.
-         * @deprecated ..\layers\paletteSize.md
-         */
-        paletteSize?: number;
-        /**
-         * Allows you to paint areas with similar attributes in the same color.
-         * @deprecated ..\layers\colorGroups.md
-         */
-        colorGroups?: Array<number>;
-        /**
-         * Specifies the field that provides data to be used for coloring areas.
-         * @deprecated ..\layers\colorGroupingField.md
-         */
-        colorGroupingField?: string;
-        /**
-         * Specifies a color for the area border when the area is selected.
-         * @deprecated ..\layers\selectedBorderColor.md
-         */
-        selectedBorderColor?: string;
-        /**
-         * Specifies a color for an area when this area is selected.
-         * @deprecated ..\layers\selectedColor.md
-         */
-        selectedColor?: string;
-        /**
-         * Specifies the pixel-measured width of the area border when the area is selected.
-         * @deprecated ..\layers\selectedBorderWidth.md
-         */
-        selectedBorderWidth?: number;
-        /**
-         * Specifies whether single or multiple areas can be selected on a vector map.
-         * @deprecated ..\layers\selectionMode.md
-         */
-        selectionMode?: string;
-    }
-    export interface MarkerSettings {
-        /**
-         * Specifies a color for the marker border.
-         * @deprecated ..\layers\borderColor.md
-         */
-        borderColor?: string;
-        /**
-         * Specifies the width of the marker border in pixels.
-         * @deprecated ..\layers\borderWidth.md
-         */
-        borderWidth?: number;
-        /**
-         * Specifies a color for a marker of the dot or bubble type.
-         * @deprecated ..\layers\color.md
-         */
-        color?: string;
-        /**
-         * Specifies the function that customizes each marker individually.
-         * @deprecated ..\layers\customize.md
-         */
-        customize?: (markerInfo: Marker) => MarkerSettings;
-        /**
-         * Specifies the pixel-measured width of the marker border when the marker is hovered over.
-         * @deprecated ..\layers\hoveredBorderWidth.md
-         */
-        hoveredBorderWidth?: number;
-        /**
-         * Specifies a color for the marker border when the marker is hovered over.
-         * @deprecated ..\layers\hoveredBorderColor.md
-         */
-        hoveredBorderColor?: string;
-        /**
-         * Specifies a color for a marker of the dot or bubble type when this marker is hovered over.
-         * @deprecated ..\layers\hoveredColor.md
-         */
-        hoveredColor?: string;
-        /**
-         * Specifies whether or not to change the appearance of a marker when it is hovered over.
-         * @deprecated ..\layers\hoverEnabled.md
-         */
-        hoverEnabled?: boolean;
-        /**
-         * Specifies marker label options.
-         * @deprecated ..\..\layers\label\label.md
-         */
-        label?: {
-            /**
-             * Enables marker labels.
-             * @deprecated ..\..\layers\label\enabled.md
-             */
-            enabled?: boolean;
-            /**
-             * Specifies font options for marker labels.
-             * @deprecated ..\..\..\layers\label\font\font.md
-             */
-            font?: viz.core.Font;
-        };
-        /**
-         * Specifies the pixel-measured diameter of the marker that represents the biggest value. Setting this option makes sense only if you use markers of the bubble type.
-         * @deprecated ..\layers\maxSize.md
-         */
-        maxSize?: number;
-        /**
-         * Specifies the pixel-measured diameter of the marker that represents the smallest value. Setting this option makes sense only if you use markers of the bubble type.
-         * @deprecated ..\layers\minSize.md
-         */
-        minSize?: number;
-        /**
-         * Specifies the opacity of markers. Setting this option makes sense only if you use markers of the bubble type.
-         * @deprecated ..\layers\opacity.md
-         */
-        opacity?: number;
-        /**
-         * Specifies the pixel-measured width of the marker border when the marker is selected.
-         * @deprecated ..\layers\selectedBorderWidth.md
-         */
-        selectedBorderWidth?: number;
-        /**
-         * Specifies a color for the marker border when the marker is selected.
-         * @deprecated ..\layers\selectedBorderColor.md
-         */
-        selectedBorderColor?: string;
-        /**
-         * Specifies a color for a marker of the dot or bubble type when this marker is selected.
-         * @deprecated ..\layers\selectedColor.md
-         */
-        selectedColor?: string;
-        /**
-         * Specifies whether a single or multiple markers can be selected on a vector map.
-         * @deprecated ..\layers\selectionMode.md
-         */
-        selectionMode?: string;
-        /**
-         * Specifies the size of markers. Setting this option makes sense for any type of marker except bubble.
-         * @deprecated ..\layers\size.md
-         */
-        size?: number;
-        /**
-         * Specifies the type of markers to be used on the map.
-         * @deprecated ..\layers\elementType.md
-         */
-        type?: string;
-        /**
-         * Specifies the name of a palette or a custom set of colors to be used for coloring markers of the pie type.
-         * @deprecated ..\layers\palette.md
-         */
-        palette?: any;
-        /**
-         * Allows you to paint markers with similar attributes in the same color.
-         * @deprecated ..\layers\colorGroups.md
-         */
-        colorGroups?: Array<number>;
-        /**
-         * Specifies the field that provides data to be used for coloring markers.
-         * @deprecated ..\layers\colorGroupingField.md
-         */
-        colorGroupingField?: string;
-        /**
-         * Allows you to display bubbles with similar attributes in the same size.
-         * @deprecated ..\layers\sizeGroups.md
-         */
-        sizeGroups?: Array<number>;
-        /**
-         * Specifies the field that provides data to be used for sizing bubble markers.
-         * @deprecated ..\layers\sizeGroupingField.md
-         */
-        sizeGroupingField?: string;
-    }
-    export interface dxVectorMapOptions extends viz.core.BaseWidgetOptions {
-        /**
-         * An object specifying options for the map areas.
-         * @deprecated Use the 'layers' option instead
-         */
-        areaSettings?: AreaSettings;
-        /** Specifies the options for the map background. */
-        background?: {
-            /** Specifies a color for the background border. */
-            borderColor?: string;
-            /** Specifies a color for the background. */
-            color?: string;
-        };
-        /** Specifies options for dxVectorMap widget layers. */
-        layers?: Array<MapLayerSettings>;
-        /** Specifies the map projection. */
-        projection?: Object;
-        /** Specifies the positioning of a map in geographical coordinates. */
-        bounds?: Array<number>;
-        /** Specifies the options of the control bar. */
-        controlBar?: {
-            /** Specifies a color for the outline of the control bar elements. */
-            borderColor?: string;
-            /** Specifies a color for the inner area of the control bar elements. */
-            color?: string;
-            /** Specifies whether or not to display the control bar. */
-            enabled?: boolean;
-            /** Specifies the margin of the control bar in pixels. */
-            margin?: number;
-            /** Specifies the position of the control bar. */
-            horizontalAlignment?: string;
-            /** Specifies the position of the control bar. */
-            verticalAlignment?: string;
-            /** Specifies the opacity of the Control_Bar. */
-            opacity?: number;
-        };
-        /** Specifies the appearance of the loading indicator. */
-        loadingIndicator?: viz.core.LoadingIndicator;
-        /**
-         * Specifies a data source for the map area.
-         * @deprecated Use the 'layers.data' option instead
-         */
-        mapData?: any;
-        /**
-         * Specifies a data source for the map markers.
-         * @deprecated Use the 'layers.data' option instead
-         */
-        markers?: any;
-        /**
-         * An object specifying options for the map markers.
-         * @deprecated Use the 'layers' option instead
-         */
-        markerSettings?: MarkerSettings;
-        /** Specifies the size of the dxVectorMap widget. */
-        size?: viz.core.Size;
-        /** Specifies a title for the vector map. */
-        title?: viz.core.Title;
-        /** Specifies tooltip options. */
-        tooltip?: viz.core.Tooltip;
-        /** Configures map legends. */
-        legends?: Array<Legend>;
-        /** Specifies whether or not the map should respond when a user rolls the mouse wheel. */
-        wheelEnabled?: boolean;
-        /** Specifies whether the map should respond to touch gestures. */
-        touchEnabled?: boolean;
-        /** Disables the zooming capability. */
-        zoomingEnabled?: boolean;
-        /** Specifies the geographical coordinates of the center for a map. */
-        center?: Array<number>;
-        /** A handler for the centerChanged event. */
-        onCenterChanged?: (e: {
-			center: Array<number>;
-			component: dxVectorMap;
-			element: Element;
-        }) => void;
-        /** A handler for the tooltipShown event. */
-        onTooltipShown?: (e: {
-            component: dxVectorMap;
-            element: Element;
-            target: {};
-        }) => void;
-        /** A handler for the tooltipHidden event. */
-        onTooltipHidden?: (e: {
-            component: dxVectorMap;
-            element: Element;
-            target: {};
-        }) => void;
-        /** Specifies a number that is used to zoom a map initially. */
-        zoomFactor?: number;
-        /** Specifies a map's maximum zoom factor. */
-        maxZoomFactor?: number;
-        /** A handler for the zoomFactorChanged event. */
-        onZoomFactorChanged?: (e: {
-            component: dxVectorMap;
-            element: Element;
-            zoomFactor: number;
-        }) => void;
-        /** A handler for the click event. */
-        onClick?: any;
-        /** A handler for the selectionChanged event. */
-        onSelectionChanged?: (e: {
-            component: dxVectorMap;
-            element: Element;
-            target: MapLayerElement;
-        }) => void;
-        /**
-         * A handler for the areaClick event.
-         * @deprecated Use the 'onClick' option instead
-         */
-        onAreaClick?: any;
-        /**
-         * A handler for the areaSelectionChanged event.
-         * @deprecated Use the 'onSelectionChanged' option instead
-         */
-        onAreaSelectionChanged?: (e: {
-            target: Area;
-            component: dxVectorMap;
-            element: Element;
-        }) => void;
-        /**
-         * A handler for the markerClick event.
-         * @deprecated Use the 'onClick' option instead
-         */
-        onMarkerClick?: any;
-        /**
-         * A handler for the markerSelectionChanged event.
-         * @deprecated Use the 'onSelecitonChanged' option instead
-         */
-        onMarkerSelectionChanged?: (e: {
-            target: Marker;
-            component: dxVectorMap;
-            element: Element;
-        }) => void;
-        /** Disables the panning capability. */
-        panningEnabled?: boolean;
-    }
-    export interface Legend extends viz.core.BaseLegend {
-        /** Specifies the color of item markers in the legend. The specified color applied only when the legend uses 'size' source. */
-        markerColor?: string;
-        /** Specifies text for legend items. */
-        customizeText?: (itemInfo: { start: number; end: number; index: number; color: string; size: number; }) => string;
-        /** Specifies text for a hint that appears when a user hovers the mouse pointer over the text of a legend item. */
-        customizeHint?: (itemInfo: { start: number; end: number; index: number; color: string; size: number }) => string;
-        /** Specifies the source of data for the legend. */
-        source?: {
-            /** Specifies a layer to which the legend belongs. */
-            layer?: string;
-            /** Specifies the type of the legend grouping. */
-            grouping?: string;
-        }
-    }
-    /** A vector map widget. */
-    export class dxVectorMap extends viz.core.BaseWidget {
-        constructor(element: JQuery, options?: dxVectorMapOptions);
-        constructor(element: Element, options?: dxVectorMapOptions);
-        /** Displays the loading indicator. */
-        showLoadingIndicator(): void;
-        /** Conceals the loading indicator. */
-        hideLoadingIndicator(): void;
-        /** Redraws a widget. */
-        render(): void;
-        /** Gets the current coordinates of the map center. */
-        center(): Array<number>;
-        /** Sets the coordinates of the map center. */
-        center(centerCoordinates: Array<number>): void;
-        /**
-         * Deselects all the selected areas on a map. The areas are displayed in their initial style after.
-         * @deprecated Use the 'clearSelection' method on a layer instead
-         */
-        clearAreaSelection(): void;
-        /**
-         * Deselects all the selected markers on a map. The markers are displayed in their initial style after.
-         * @deprecated Use the 'clearSelection' method on a layer instead
-         */
-        clearMarkerSelection(): void;
-        /** Deselects all the selected area and markers on a map at once. The areas and markers are displayed in their initial style after. */
-        clearSelection(): void;
-        /** Converts client area coordinates into map coordinates. */
-        convertCoordinates(x: number, y: number): Array<number>;
-        /** Gets all map layers. */
-        getLayers(): Array<MapLayer>;
-        /** Gets the layer by its index. */
-        getLayerByIndex(index: number): MapLayer;
-        /** Gets the layer by its name. */
-        getLayerByName(name: string): MapLayer;
-        /**
-         * Returns an array with all the map areas.
-         * @deprecated Use the 'getElements' method on a layer instead
-         */
-        getAreas(): Array<Area>;
-        /**
-         * Returns an array with all the map markers.
-         * @deprecated Use the 'getElements' method on a layer instead
-         */
-        getMarkers(): Array<Marker>;
-        /** Gets the current coordinates of the map viewport. */
-        viewport(): Array<any>;
-        /** Sets the coordinates of the map viewport. */
-        viewport(viewportCoordinates: Array<number>): void;
-        /** Gets the current value of the map zoom factor. */
-        zoomFactor(): number;
-        /** Sets the value of the map zoom factor. */
-        zoomFactor(zoomFactor: number): void;
-    }
-    export var projection: ProjectionCreator;
-    export interface ProjectionCreator {
-        /** Creates a new projection. */
-        (data: {
-            to?: (coordinates: Array<number>) => Array<number>;
-            from?: (coordinates: Array<number>) => Array<number>;
-            aspectRatio?: number;
-        }): Object;
-        /** Gets the default or custom projection from the projection storage. */
-        get(name: string): Object;
-        /** Adds a new projection to the internal projections storage. */
-        add(name: string, projection: Object): void;
-    }
-}
-interface JQuery {
-    dxVectorMap(options?: DevExpress.viz.map.dxVectorMapOptions): JQuery;
-    dxVectorMap(methodName: string, ...params: any[]): any;
-    dxVectorMap(methodName: "instance"): DevExpress.viz.map.dxVectorMap;
-}
-declare namespace DevExpress.viz.sparklines {
-    export interface SparklineTooltip extends viz.core.Tooltip {
-        /**
-         * Specifies how a tooltip is horizontally aligned relative to the graph.
-         * @deprecated Tooltip alignment is no more available.
-         */
-        horizontalAlignment?: string;
-        /**
-         * Specifies how a tooltip is vertically aligned relative to the graph.
-         * @deprecated Tooltip alignment is no more available.
-         */
-        verticalAlignment?: string;
-    }
-    export interface BaseSparklineOptions extends viz.core.BaseWidgetOptions {
-        /** Specifies the blank space between the widget's extreme elements and the boundaries of the area provided for the widget in pixels. */
-        margin?: viz.core.Margins;
-        /** Specifies the size of the widget. */
-        size?: viz.core.Size;
-        /** Specifies tooltip options. */
-        tooltip?: SparklineTooltip;
-        /** A handler for the tooltipShown event. */
-        onTooltipShown?: (e: {
-            component: BaseSparkline;
-            element: Element;
-        }) => void;
-        /** A handler for the tooltipHidden event. */
-        onTooltipHidden?: (e: {
-            component: BaseSparkline;
-            element: Element;
-        }) => void;
-    }
-    /** Overridden by descriptions for particular widgets. */
-    export class BaseSparkline extends viz.core.BaseWidget {
-        /** Redraws a widget. */
-        render(): void;
-    }
-    export interface dxBulletOptions extends BaseSparkline {
-        /** Specifies a color for the bullet bar. */
-        color?: string;
-        /** Specifies an end value for the invisible scale. */
-        endScaleValue?: number;
-        /** Specifies whether or not to show the target line. */
-        showTarget?: boolean;
-        /** Specifies whether or not to show the line indicating zero on the invisible scale. */
-        showZeroLevel?: boolean;
-        /** Specifies a start value for the invisible scale. */
-        startScaleValue?: number;
-        /** Specifies the value indicated by the target line. */
-        target?: number;
-        /** Specifies a color for both the target and zero level lines. */
-        targetColor?: string;
-        /** Specifies the width of the target line. */
-        targetWidth?: number;
-        /** Specifies the primary value indicated by the bullet bar. */
-        value?: number;
-    }
-    /** A bullet graph widget. */
-    export class dxBullet extends BaseSparkline {
-        constructor(element: JQuery, options?: dxBulletOptions);
-        constructor(element: Element, options?: dxBulletOptions);
-    }
-    export interface dxSparklineOptions extends BaseSparklineOptions {
-        /** Specifies the data source field that provides arguments for a sparkline. */
-        argumentField?: string;
-        /** Sets a color for the bars indicating negative values. Available for a sparkline of the bar type only. */
-        barNegativeColor?: string;
-        /** Sets a color for the bars indicating positive values. Available for a sparkline of the bar type only. */
-        barPositiveColor?: string;
-        /** Specifies a data source for the sparkline. */
-        dataSource?: Array<any>;
-        /** Sets a color for the boundary of both the first and last points on a sparkline. */
-        firstLastColor?: string;
-        /** Specifies whether a sparkline ignores null data points or not. */
-        ignoreEmptyPoints?: boolean;
-        /** Sets a color for a line on a sparkline. Available for the sparklines of the line- and area-like types. */
-        lineColor?: string;
-        /** Specifies a width for a line on a sparkline. Available for the sparklines of the line- and area-like types. */
-        lineWidth?: number;
-        /** Sets a color for the bars indicating the values that are less than the winloss threshold. Available for a sparkline of the winloss type only. */
-        lossColor?: string;
-        /** Sets a color for the boundary of the maximum point on a sparkline. */
-        maxColor?: string;
-        /** Sets a color for the boundary of the minimum point on a sparkline. */
-        minColor?: string;
-        /** Sets a color for points on a sparkline. Available for the sparklines of the line- and area-like types. */
-        pointColor?: string;
-        /** Specifies the diameter of sparkline points in pixels. Available for the sparklines of line- and area-like types. */
-        pointSize?: number;
-        /** Specifies a symbol to use as a point marker on a sparkline. Available for the sparklines of the line- and area-like types. */
-        pointSymbol?: string;
-        /** Specifies whether or not to indicate both the first and last values on a sparkline. */
-        showFirstLast?: boolean;
-        /** Specifies whether or not to indicate both the minimum and maximum values on a sparkline. */
-        showMinMax?: boolean;
-        /** Determines the type of a sparkline. */
-        type?: string;
-        /** Specifies the data source field that provides values for a sparkline. */
-        valueField?: string;
-        /** Sets a color for the bars indicating the values greater than a winloss threshold. Available for a sparkline of the winloss type only. */
-        winColor?: string;
-        /** Specifies a value that serves as a threshold for the sparkline of the winloss type. */
-        winlossThreshold?: number;
-        /** Specifies the minimum value of the sparkline value axis. */
-        minValue?: number;
-        /** Specifies the maximum value of the sparkline's value axis. */
-        maxValue?: number;
-    }
-    /** A sparkline widget. */
-    export class dxSparkline extends BaseSparkline {
-        constructor(element: JQuery, options?: dxSparklineOptions);
-        constructor(element: Element, options?: dxSparklineOptions);
-    }
-}
-interface JQuery {
-    dxBullet(options?: DevExpress.viz.sparklines.dxBulletOptions): JQuery;
-    dxBullet(methodName: string, ...params: any[]): any;
-    dxBullet(methodName: "instance"): DevExpress.viz.sparklines.dxBullet;
-    dxSparkline(options?: DevExpress.viz.sparklines.dxSparklineOptions): JQuery;
-    dxSparkline(methodName: string, ...params: any[]): any;
-    dxSparkline(methodName: "instance"): DevExpress.viz.sparklines.dxSparkline;
-}
diff --git a/devextreme/index.d.ts b/devextreme/index.d.ts
new file mode 100644
index 0000000000..c386afd337
--- /dev/null
+++ b/devextreme/index.d.ts
@@ -0,0 +1,7443 @@
+// Type definitions for DevExtreme 15.2.9
+// Project: http://js.devexpress.com/
+// Definitions by: DevExpress Inc. <http://devexpress.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare module DevExpress {
+    /** A mixin that provides a capability to fire and subscribe to events. */
+    export interface EventsMixin<T> {
+        /** Subscribes to a specified event. */
+        on(eventName: string, eventHandler: Function): T;
+        /** Subscribes to the specified events. */
+        on(events: { [eventName: string]: Function; }): T;
+        /** Detaches all event handlers from the specified event. */
+        off(eventName: string): Object;
+        /** Detaches a particular event handler from the specified event. */
+        off(eventName: string, eventHandler: Function): T;
+    }
+    /** An object that serves as a namespace for the methods required to perform validation. */
+    export module validationEngine {
+        export interface IValidator {
+            validate(): ValidatorValidationResult;
+            reset(): void;
+        }
+        export interface ValidatorValidationResult {
+            isValid: boolean;
+            name?: string;
+            value: any;
+            brokenRule: any;
+            validationRules: any[];
+        }
+        export interface ValidationGroupValidationResult {
+            isValid: boolean;
+            brokenRules: any[];
+            validators: IValidator[];
+        }
+        export interface GroupConfig extends EventsMixin<GroupConfig>  {
+            group: any;
+            validators: IValidator[];
+            validate(): ValidationGroupValidationResult;
+            reset(): void;
+        }
+        /** Provides access to the object that represents the specified validation group. */
+        export function getGroupConfig(group: any): GroupConfig
+        /** Provides access to the object that represents the default validation group. */
+        export function getGroupConfig(): GroupConfig
+        /** Validates rules of the validators that belong to the specified validation group. */
+        export function validateGroup(group: any): ValidationGroupValidationResult;
+        /** Validates rules of the validators that belong to the default validation group. */
+        export function validateGroup(): ValidationGroupValidationResult;
+        /** Resets the values and validation result of the editors that belong to the specified validation group. */
+        export function resetGroup(group: any): void;
+        /** Resets the values and validation result of the editors that belong to the default validation group. */
+        export function resetGroup(): void;
+        /** Validates the rules that are defined within the dxValidator objects that are registered for the specified ViewModel. */
+        export function validateModel(model: Object): ValidationGroupValidationResult;
+        /** Registers all the dxValidator objects by which the fields of the specified ViewModel are extended. */
+        export function registerModelForValidation(model: Object) : void;
+    }
+    export var hardwareBackButton: JQueryCallback;
+    /** Processes the hardware back button click. */
+    export function processHardwareBackButton(): void;
+    /** Hides the last displayed overlay widget. */
+    export function hideTopOverlay(): boolean;
+    /** Specifies whether or not the entire application/site supports right-to-left representation. */
+    export var rtlEnabled: boolean;
+    /** Registers a new component in the DevExpress.ui namespace as a jQuery plugin, Angular directive and Knockout binding. */
+    export function registerComponent(name: string, componentClass: Object): void;
+    /** Registers a new component in the specified namespace as a jQuery plugin, Angular directive and Knockout binding. */
+    export function registerComponent(name: string, namespace: Object, componentClass: Object): void;
+    export function requestAnimationFrame(callback: Function): number;
+    export function cancelAnimationFrame(requestID: number): void;
+    /** Custom Knockout binding that links an HTML element with a specific action. */
+    export class Action { }
+    /** Used to get URLs that vary in a locally running application and the application running on production. */
+    export class EndpointSelector {
+        constructor(options: {
+            [key: string]: {
+                local?: string;
+                production?: string;
+            }
+        });
+        /** Returns a local or a productional URL depending on how the application is currently running. */
+        urlFor(key: string): string;
+    }
+    /** An object that serves as a namespace for the methods that are used to animate UI elements. */
+    export module fx {
+        /** Defines animation options. */
+        export interface AnimationOptions {
+            /** A function called after animation is completed. */
+            complete?: (element: JQuery, config: AnimationOptions) => void;
+            /** A number specifying wait time before animation execution. */
+            delay?: number;
+            /** A number specifying the time period to wait before the animation of the next stagger item starts. */
+            staggerDelay?: number;
+            /** A number specifying the time in milliseconds spent on animation. */
+            duration?: number;
+            /** A string specifying the type of an easing function used for animation. */
+            easing?: string;
+            /** Specifies the initial animation state. */
+            from?: any;
+            /** A function called before animation is started. */
+            start?: (element: JQuery, config: AnimationOptions) => void;
+            /** Specifies a final animation state. */
+            to?: any;
+            /** A string value specifying the animation type. */
+            type?: string;
+            /** Specifies the animation direction for the "slideIn" and "slideOut" animation types. */
+            direction?: string;
+        }
+        /** Animates the specified element. */
+        export function animate(element: HTMLElement, config: AnimationOptions): Object;
+        /** Returns a value indicating whether the specified element is being animated. */
+        export function isAnimating(element: HTMLElement): boolean;
+        /** Stops the animation. */
+        export function stop(element: HTMLElement, jumpToEnd: boolean): void;
+    }
+    /** The manager that performs several specified animations at a time. */
+    export class TransitionExecutor {
+        /** Deletes all the animations registered in the Transition Executor by using the enter(elements, animation) and leave(elements, animation) methods. */
+        reset(): void;
+        /** Registers a set of elements that should be animated as "entering" using the specified animation configuration. */
+        enter(elements: JQuery, animation: any): void;
+        /** Registers a set of elements that should be animated as "leaving" using the specified animation configuration. */
+        leave(elements: JQuery, animation: any): void;
+        /** Starts all the animations registered using the enter(elements, animation) and leave(elements, animation) methods beforehand. */
+        start(config: Object): JQueryPromise<void>;
+        /** Stops all started animations. */
+        stop(): void;
+    }
+    export class AnimationPresetCollection {
+        /** Resets all the changes made in the animation repository. */
+        resetToDefaults(): void;
+        /** Deletes the specified animation or clears all the animation repository, if an animation name is not passed. */
+        clear(name: string): void;
+        /** Adds the specified animation preset to the animation repository by the specified name. */
+        registerPreset(name: string, config: any): void;
+        /** Applies the changes made in the animation repository. */
+        applyChanges(): void;
+        /** Returns the configuration of the animation found in the animation repository by the specified name for the current device. */
+        getPreset(name: string): void;
+        /** Registers predefined animations in the animation repository. */
+        registerDefaultPresets(): void;
+    }
+    /** A repository of animations. */
+    export var animationPresets: AnimationPresetCollection;
+    /** The device object defines the device on which the application is running. */
+    export interface Device {
+        /** Indicates whether or not the device platform is Android. */
+        android?: boolean;
+        /** Specifies the type of the device on which the application is running. */
+        deviceType?: string;
+        /** Indicates whether or not the device platform is generic, which means that the application will look and behave according to a generic "light" or "dark" theme. */
+        generic?: boolean;
+        /** Indicates whether or not the device platform is iOS. */
+        ios?: boolean;
+        /** Indicates whether or not the device type is 'phone'. */
+        phone?: boolean;
+        /** Specifies the platform of the device on which the application is running. */
+        platform?: string;
+        /** Indicates whether or not the device type is 'tablet'. */
+        tablet?: boolean;
+        /** Specifies an array with the major and minor versions of the device platform. */
+        version?: Array<number>;
+        /** Indicates whether or not the device platform is Windows. */
+        win?: boolean;
+        /** Specifies a performance grade of the current device. */
+        grade?: string;
+    }
+    export class Devices implements EventsMixin<Devices> {
+        constructor(options: { window: Window });
+        /** Overrides actual device information to force the application to operate as if it was running on the specified device. */
+        current(deviceName: any): void;
+        /** Returns information about the current device. */
+        current(): Device;
+        orientationChanged: JQueryCallback;
+        /** Returns the current device orientation. */
+        orientation(): string;
+        /** Returns real information about the current device regardless of the value passed to the devices.current(deviceName) method. */
+        real(): Device;
+        on(eventName: "orientationChanged", eventHandler: (e: { orientation: string }) => void): Devices;
+        on(eventName: string, eventHandler: Function): Devices;
+        on(events: { [eventName: string]: Function; }): Devices;
+        off(eventName: "orientationChanged"): Devices;
+        off(eventName: string): Devices;
+        off(eventName: "orientationChanged", eventHandler: (e: { orientation: string }) => void): Devices;
+        off(eventName: string, eventHandler: Function): Devices;
+    }
+    /** An object that serves as a namespace for the methods and events specifying information on the current device. */
+    export var devices: Devices;
+    /** The position object specifies the widget positioning options. */
+    export interface PositionOptions {
+        /** The target element position that the widget is positioned against. */
+        at?: string;
+        /** The element within which the widget is positioned. */
+        boundary?: Element;
+        /** A string value holding horizontal and vertical offset from the window's boundaries. */
+        boundaryOffset?: string;
+        /** Specifies how to move the widget if it overflows the screen. */
+        collision?: any;
+        /** The position of the widget to align against the target element. */
+        my?: string;
+        /** The target element that the widget is positioned against. */
+        of?: HTMLElement;
+        /** A string value holding horizontal and vertical offset in pixels, separated by a space (e.g., "5 -10"). */
+        offset?: string;
+    }
+    export interface ComponentOptions {
+        /** A handler for the initialized event. */
+        onInitialized?: Function;
+        /** A handler for the optionChanged event. */
+        onOptionChanged?: Function;
+        /** A handler for the disposing event. */
+        onDisposing?: Function;
+    }
+    /** A base class for all components and widgets. */
+    export class Component {
+        constructor(options?: ComponentOptions)
+        /** Prevents the component from refreshing until the endUpdate method is called. */
+        beginUpdate(): void;
+        /** Enables the component to refresh after the beginUpdate method call. */
+        endUpdate(): void;
+        /** Returns an instance of this component class. */
+        instance(): Component;
+        /** Returns the configuration options of this component. */
+        option(): {
+            [optionKey: string]: any;
+        };
+        /** Sets one or more options of this component. */
+        option(options: {
+            [optionKey: string]: any;
+        }): void;
+        /** Gets the value of the specified configuration option of this component. */
+        option(optionName: string): any;
+        /** Sets a value to the specified configuration option of this component. */
+        option(optionName: string, optionValue: any): void;
+    }
+    export interface DOMComponentOptions extends ComponentOptions {
+        /** Specifies whether or not the current component supports a right-to-left representation. */
+        rtlEnabled?: boolean;
+        /** Specifies the height of the widget. */
+        height?: any;
+        /** Specifies the width of the widget. */
+        width?: any;
+    }
+    /** A base class for all components. */
+    export class DOMComponent extends Component {
+        constructor(element: JQuery, options?: DOMComponentOptions);
+        constructor(element: HTMLElement, options?: DOMComponentOptions);
+        /** Returns the root HTML element of the widget. */
+        element(): JQuery;
+        /** Specifies the device-dependent default configuration options for this component. */
+        static defaultOptions(rule: {
+            device?: any;
+            options?: any;
+        }): void;
+    }
+    export module data {
+        export interface ODataError extends Error {
+            httpStatus?: number;
+            errorDetails?: any;
+        }
+        export interface StoreOptions {
+            /** A handler for the modified event. */
+            onModified?: () => void;
+            /** A handler for the modifying event. */
+            onModifying?: () => void;
+            /** A handler for the removed event. */
+            onRemoved?: (key: any) => void;
+            /** A handler for the removing event. */
+            onRemoving?: (key: any) => void;
+            /** A handler for the updated event. */
+            onUpdated?: (key: any, values: Object) => void;
+            /** A handler for the updating event. */
+            onUpdating?: (key: any, values: Object) => void;
+            /** A handler for the loaded event. */
+            onLoaded?: (result: Array<any>) => void;
+            /** A handler for the loading event. */
+            onLoading?: (loadOptions: LoadOptions) => void;
+            /** A handler for the inserted event. */
+            onInserted?: (values: Object, key: any) => void;
+            /** A handler for the inserting event. */
+            onInserting?: (values: Object) => void;
+            /** Specifies the function called when the Store causes an error. */
+            errorHandler?: (e: Error) => void;
+            /** Specifies the key properties within the data associated with the Store. */
+            key?: any;
+        }
+        export interface LoadOptions {
+            filter?: Object;
+            sort?: Object;
+            select?: Object;
+            expand?: Object;
+            group?: Object;
+            skip?: number;
+            take?: number;
+            userData?: Object;
+            requireTotalCount?: boolean;
+        }
+        /** The base class for all Stores. */
+        export class Store implements EventsMixin<Store> {
+            constructor(options?: StoreOptions);
+            /** Returns the data item specified by the key. */
+            byKey(key: any): JQueryPromise<any>;
+            /** Adds an item to the data associated with this Store. */
+            insert(values: Object): JQueryPromise<any>;
+            /** Returns the key expression specified via the key configuration option. */
+            key(): any;
+            /** Returns the key of the Store item that matches the specified object. */
+            keyOf(obj: Object): any;
+            /** Starts loading data. */
+            load(obj?: LoadOptions): JQueryPromise<any[]>;
+            /** Removes the data item specified by the key. */
+            remove(key: any): JQueryPromise<any>;
+            /** Obtains the total count of items that will be returned by the load() function. */
+            totalCount(options?: {
+                filter?: Object;
+                group?: Object;
+            }): JQueryPromise<any>;
+            /** Updates the data item specified by the key. */
+            update(key: any, values: Object): JQueryPromise<any>;
+            on(eventName: "removing", eventHandler: (key: any) => void): Store;
+            on(eventName: "removed", eventHandler: (key: any) => void): Store;
+            on(eventName: "updating", eventHandler: (key: any, values: Object) => void): Store;
+            on(eventName: "updated", eventHandler: (key: any, values: Object) => void): Store;
+            on(eventName: "inserting", eventHandler: (values: Object) => void): Store;
+            on(eventName: "inserted", eventHandler: (values: Object, key: any) => void): Store;
+            on(eventName: "modifying", eventHandler: () => void): Store;
+            on(eventName: "modified", eventHandler: () => void): Store;
+            on(eventName: "loading", eventHandler: (loadOptions: LoadOptions) => void): Store;
+            on(eventName: "loaded", eventHandler: (result: Array<any>) => void): Store;
+            on(eventName: string, eventHandler: Function): Store;
+            on(events: { [eventName: string]: Function; }): Store;
+            off(eventName: "removing"): Store;
+            off(eventName: "removed"): Store;
+            off(eventName: "updating"): Store;
+            off(eventName: "updated"): Store;
+            off(eventName: "inserting"): Store;
+            off(eventName: "inserted"): Store;
+            off(eventName: "modifying"): Store;
+            off(eventName: "modified"): Store;
+            off(eventName: "loading"): Store;
+            off(eventName: "loaded"): Store;
+            off(eventName: string): Store;
+            off(eventName: "removing", eventHandler: (key: any) => void): Store;
+            off(eventName: "removed", eventHandler: (key: any) => void): Store;
+            off(eventName: "updating", eventHandler: (key: any, values: Object) => void): Store;
+            off(eventName: "updated", eventHandler: (key: any, values: Object) => void): Store;
+            off(eventName: "inserting", eventHandler: (values: Object) => void): Store;
+            off(eventName: "inserted", eventHandler: (values: Object, key: any) => void): Store;
+            off(eventName: "modifying", eventHandler: () => void): Store;
+            off(eventName: "modified", eventHandler: () => void): Store;
+            off(eventName: "loading", eventHandler: (loadOptions: LoadOptions) => void): Store;
+            off(eventName: "loaded", eventHandler: (result: Array<any>) => void): Store;
+            off(eventName: string, eventHandler: Function): Store;
+        }
+        export interface ArrayStoreOptions extends StoreOptions {
+            /** Specifies the array associated with this Store. */
+            data?: Array<any>;
+        }
+        /** A Store accessing an in-memory array. */
+        export class ArrayStore extends Store {
+            constructor(options?: ArrayStoreOptions);
+            /** Clears all data associated with the current ArrayStore. */
+            clear(): void;
+            /** Creates the Query object for the underlying array. */
+            createQuery(): Query;
+        }
+        interface Promise {
+            then(doneFn?: Function, failFn?: Function, progressFn?: Function): Promise;
+        }
+        export interface CustomStoreOptions extends StoreOptions {
+            /** The user implementation of the byKey(key, extraOptions) method. */
+            byKey?: (key: any) => Promise;
+            /** The user implementation of the insert(values) method. */
+            insert?: (values: Object) => Promise;
+            /** The user implementation of the load(options) method. */
+            load?: (options?: LoadOptions) => Promise;
+            /** The user implementation of the remove(key) method. */
+            remove?: (key: any) => Promise;
+            /** The user implementation of the totalCount(options) method. */
+            totalCount?: (options?: {
+                filter?: Object;
+                group?: Object;
+            }) => Promise;
+            /** The user implementation of the update(key, values) method. */
+            update?: (key: any, values: Object) => Promise;
+        }
+        /** A Store object that enables you to implement your own data access logic. */
+        export class CustomStore extends Store {
+            constructor(options: CustomStoreOptions);
+        }
+        export interface DataSourceOptions {
+            /** Specifies data filtering conditions. */
+            filter?: Object;
+            /** Specifies data grouping conditions. */
+            group?: Object;
+            /** The item mapping function. */
+            map?: (record: any) => any;
+            /** Specifies the maximum number of items the page can contain. */
+            pageSize?: number;
+            /** Specifies whether a DataSource loads data by pages, or all items at once. */
+            paginate?: boolean;
+            /** The data post processing function. */
+            postProcess?: (data: any[]) => any[];
+            /** Specifies a value by which the required items are searched. */
+            searchExpr?: Object;
+            /** Specifies the comparison operation used to search for the required items. */
+            searchOperation?: string;
+            /** Specifies the value to which the search expression is compared. */
+            searchValue?: Object;
+            /** Specifies the initial select option value. */
+            select?: Object;
+            /** An array of the strings that represent the names of the navigation properties to be loaded simultaneously with the OData store's entity. */
+            expand?: Object;
+            /** Specifies whether or not the DataSource instance requests the total count of items available in the storage. */
+            requireTotalCount?: boolean;
+            /** Specifies the initial sort option value. */
+            sort?: Object;
+            /** Specifies the underlying Store instance used to access data. */
+            store?: any;
+            /** A handler for the changed event. */
+            onChanged?: () => void;
+            /** A handler for the loadingChanged event. */
+            onLoadingChanged?: (isLoading: boolean) => void;
+            /** A handler for the loadError event. */
+            onLoadError?: (e?: Error) => void;
+        }
+        export interface OperationPromise<T> extends JQueryPromise<T> {
+            operationId: number;
+        }
+        /** An object that provides access to a data web service or local data storage for collection container widgets. */
+        export class DataSource implements EventsMixin<DataSource> {
+            constructor(url: string);
+            constructor(data: Array<any>);
+            constructor(options: CustomStoreOptions);
+            constructor(options: DataSourceOptions);
+            /** Disposes all resources associated with this DataSource. */
+            dispose(): void;
+            /** Returns the current filter option value. */
+            filter(): Object;
+            /** Sets the filter option value. */
+            filter(filterExpr: Object): void;
+            /** Returns the current group option value. */
+            group(): Object;
+            /** Sets the group option value. */
+            group(groupExpr: Object): void;
+            /** Indicates whether or not the current page contains fewer items than the number of items specified by the pageSize configuration option. */
+            isLastPage(): boolean;
+            /** Indicates whether or not at least one load() method execution has successfully finished. */
+            isLoaded(): boolean;
+            /** Indicates whether or not the DataSource is currently being loaded. */
+            isLoading(): boolean;
+            /** Returns the array of items currently operated by the DataSource. */
+            items(): Array<any>;
+            /** Returns the key expression. */
+            key(): any;
+            /** Starts loading data. */
+            load(): OperationPromise<Array<any>>;
+            /** Clears currently loaded DataSource items and calls the load() method. */
+            reload(): OperationPromise<Array<any>>;
+            /** Returns an object that would be passed to the load() method of the underlying Store according to the current data shaping option values of the current DataSource instance. */
+            loadOptions(): Object;
+            /** Returns the current pageSize option value. */
+            pageSize(): number;
+            /** Sets the pageSize option value. */
+            pageSize(value: number): void;
+            /** Specifies the index of the currently loaded page. */
+            pageIndex(): number;
+            /** Specifies the index of the page to be loaded during the next load() method execution. */
+            pageIndex(newIndex: number): void;
+            /** Returns the current paginate option value. */
+            paginate(): boolean;
+            /** Sets the paginate option value. */
+            paginate(value: boolean): void;
+            /** Returns the searchExpr option value. */
+            searchExpr(): Object;
+            /** Sets the searchExpr option value. */
+            searchExpr(expr: Object): void;
+            /** Returns the currently specified search operation. */
+            searchOperation(): string;
+            /** Sets the current search operation. */
+            searchOperation(op: string): void;
+            /** Returns the searchValue option value. */
+            searchValue(): Object;
+            /** Sets the searchValue option value. */
+            searchValue(value: Object): void;
+            /** Returns the current select option value. */
+            select(): Object;
+            /** Sets the select option value. */
+            select(expr: Object): void;
+            /** Returns the current requireTotalCount option value. */
+            requireTotalCount(): boolean;
+            /** Sets the requireTotalCount option value. */
+            requireTotalCount(value: boolean): void;
+            /** Returns the current sort option value. */
+            sort(): Object;
+            /** Sets the sort option value. */
+            sort(sortExpr: Object): void;
+            /** Returns the underlying Store instance. */
+            store(): Store;
+            /** Returns the number of data items available in an underlying Store after the last load() operation without paging. */
+            totalCount(): number;
+            cancel(operationId: number): boolean;
+            on(eventName: "loadingChanged", eventHandler: (isLoading: boolean) => void): DataSource;
+            on(eventName: "loadError", eventHandler: (e?: Error) => void): DataSource;
+            on(eventName: "changed", eventHandler: () => void): DataSource;
+            on(eventName: string, eventHandler: Function): DataSource;
+            on(events: { [eventName: string]: Function; }): DataSource;
+            off(eventName: "loadingChanged"): DataSource;
+            off(eventName: "loadError"): DataSource;
+            off(eventName: "changed"): DataSource;
+            off(eventName: string): DataSource;
+            off(eventName: "loadingChanged", eventHandler: (isLoading: boolean) => void): DataSource;
+            off(eventName: "loadError", eventHandler: (e?: Error) => void): DataSource;
+            off(eventName: "changed", eventHandler: () => void): DataSource;
+            off(eventName: string, eventHandler: Function): DataSource;
+        }
+        /** An object used to work with primitive data types not supported by JavaScript when accessing an OData web service. */
+        export class EdmLiteral {
+            /** Creates an EdmLiteral instance and assigns the specified value to it. */
+            constructor(value: string);
+            /** Returns a string representation of the value associated with this EdmLiteral object. */
+            valueOf(): string;
+        }
+        /** An object used to generate and hold the GUID. */
+        export class Guid {
+            /** Creates a new Guid instance that holds the specified GUID. */
+            constructor(value: string);
+            /** Creates a new Guid instance holding the generated GUID. */
+            constructor();
+            /** Returns a string representation of the Guid instance. */
+            toString(): string;
+            /** Returns a string representation of the Guid instance. */
+            valueOf(): string;
+        }
+        export interface LocalStoreOptions extends ArrayStoreOptions {
+            /** Specifies the time (in miliseconds) after the change operation, before the data is flushed. */
+            flushInterval?: number;
+            /** Specifies whether the data is flushed immediatelly after each change operation, or after the delay specified via the flushInterval option. */
+            immediate?: boolean;
+            /** The unique identifier used to distinguish the data within the HTML5 Web Storage. */
+            name?: string;
+        }
+        /** A Store providing access to the HTML5 Web Storage. */
+        export class LocalStore extends ArrayStore {
+            constructor(options?: LocalStoreOptions);
+            /** Removes all data associated with this Store. */
+            clear(): void;
+        }
+        export interface ODataContextOptions extends ODataStoreOptions {
+            /** Specifies the list of entities to be accessed via the ODataContext. */
+            entities?: Object;
+            /** Specifies the function called if the ODataContext causes an error. */
+            errorHandler?: (e: Error) => void;
+        }
+        /** Provides access to the entire OData service. */
+        export class ODataContext {
+            constructor(options?: ODataContextOptions);
+            /** Initiates the specified WebGet service operation that returns a value. For the information on service operations, refer to the OData documentation. */
+            get(operationName: string, params: Object): JQueryPromise<any>;
+            /** Initiates the specified WebGet service operation that returns nothing. For the information on service operations, refer to the OData documentation. */
+            invoke(operationName: string, params: Object, httpMethod: Object): JQueryPromise<any>;
+            /** Return a special proxy object to describe the entity link. */
+            objectLink(entityAlias: string, key: any): Object;
+        }
+        export interface ODataStoreOptions extends StoreOptions {
+            /** A function used to customize a web request before it is sent. */
+            beforeSend?: (request: {
+                url: string;
+                async: boolean;
+                method: string;
+                timeout: number;
+                params: Object;
+                payload: Object;
+                headers: Object;
+            }) => void;
+            /** Specifies whether the ODataStore uses the JSONP approach to access non-CORS-compatible remote services. */
+            jsonp?: boolean;
+            /** Specifies the type of the ODataStore key property. The following key types are supported out of the box: String, Int32, Int64, and Guid. */
+            keyType?: any;
+            /** Specifies whether or not dates found in the response are deserialized. */
+            deserializeDates?: boolean;
+            /** Specifies the URL of the data service being accessed via the current ODataContext. */
+            url?: string;
+            /** Specifies the version of the OData protocol used to interact with the data service. */
+            version?: number;
+            /** Specifies the value of the withCredentials field of the underlying jqXHR object. */
+            withCredentials?: boolean;
+        }
+        /** A Store providing access to a separate OData web service entity. */
+        export class ODataStore extends Store {
+            constructor(options?: ODataStoreOptions);
+            /** Creates the Query object for the OData endpoint. */
+            createQuery(loadOptions: Object): Object;
+            /** Returns the data item specified by the key. */
+            byKey(key: any, extraOptions?: { expand?: Object }): JQueryPromise<any>;
+        }
+        /** An universal chainable data query interface object. */
+        export interface Query {
+            /** Calculates a custom summary for the items in the current Query. */
+            aggregate(step: (accumulator: any, value: any) => any): JQueryPromise<any>;
+            /** Calculates a custom summary for the items in the current Query. */
+            aggregate(seed: any, step: (accumulator: any, value: any) => any, finalize: (result: any) => any): JQueryPromise<any>;
+            /** Calculates the average item value for the current Query. */
+            avg(getter: Object): JQueryPromise<any>;
+            /** Finds the item with the maximum getter value. */
+            max(getter: Object): JQueryPromise<any>;
+            /** Finds the item with the maximum value in the Query. */
+            max(): JQueryPromise<any>;
+            /** Finds the item with the minimum value in the Query. */
+            min(): JQueryPromise<any>;
+            /** Finds the item with the minimum getter value. */
+            min(getter: Object): JQueryPromise<any>;
+            /** Calculates the average item value for the current Query, if each Query item has a numeric type. */
+            avg(): JQueryPromise<any>;
+            /** Returns the total count of items in the current Query. */
+            count(): JQueryPromise<any>;
+            /** Executes the Query. */
+            enumerate(): JQueryPromise<any>;
+            /** Filters the current Query data. */
+            filter(criteria: Array<any>): Query;
+            /** Filters the current Query data. */
+            filter(predicate: (item: any) => boolean): Query;
+            /** Groups the current Query data. */
+            groupBy(getter: Object): Query;
+            /** Applies the specified transformation to each item. */
+            select(getter: Object): Query;
+            /** Limits the data item count. */
+            slice(skip: number, take?: number): Query;
+            /** Sorts current Query data. */
+            sortBy(getter: Object, desc: boolean): Query;
+            /** Sorts current Query data. */
+            sortBy(getter: Object): Query;
+            /** Calculates the sum of item getter values in the current Query. */
+            sum(getter: Object): JQueryPromise<any>;
+            /** Calculates the sum of item values in the current Query. */
+            sum(): JQueryPromise<any>;
+            /** Adds one more sorting condition to the current Query. */
+            thenBy(getter: Object): Query;
+            /** Adds one more sorting condition to the current Query. */
+            thenBy(getter: Object, desc: boolean): Query;
+            /** Returns the array of current Query items. */
+            toArray(): Array<any>;
+        }
+        /** The global data layer error handler. */
+        export var errorHandler: (e: Error) => void;
+        /** Encodes the specified string or array of bytes to base64 encoding. */
+        export function base64_encode(input: any): string;
+        /** Creates a Query instance. */
+        export function query(array: Array<any>): Query;
+        /** Creates a Query instance for accessing the remote service specified by a URL. */
+        export function query(url: string, queryOptions: Object): Query;
+        /** This section describes the utility objects provided by the DevExtreme data layer. */
+        export var utils: {
+            /** Compiles a getter function from the getter expression. */
+            compileGetter(expr: any): Function;
+            /** Compiles a setter function from the setter expression. */
+            compileSetter(expr: any): Function;
+            odata: {
+                /** Holds key value converters for OData. */
+                keyConverters: {
+                    String(value: any): string;
+                    Int32(value: any): number;
+                    Int64(value: any): EdmLiteral;
+                    Guid(value: any): Guid;
+                    Boolean(value: any): boolean;
+                    Single(value: any): EdmLiteral;
+                    Decimal(value: any): EdmLiteral;
+                };
+            }
+        }
+    }
+    /** An object that serves as a namespace for DevExtreme UI widgets as well as for methods implementing UI logic in DevExtreme sites/applications. */
+    export module ui {
+        export interface WidgetOptions extends DOMComponentOptions {
+            /** A Boolean value specifying whether or not the widget changes its state when interacting with a user. */
+            activeStateEnabled?: boolean;
+            /** A Boolean value specifying whether or not the widget can respond to user interaction. */
+            disabled?: boolean;
+            /** A Boolean value specifying whether or not the widget changes its state when being hovered by an end user. */
+            hoverStateEnabled?: boolean;
+            /** Specifies whether or not the widget can be focused. */
+            focusStateEnabled?: boolean;
+            /** Specifies a shortcut key that sets focus on the widget element. */
+            accessKey?: string;
+            /** A Boolean value specifying whether or not the widget is visible. */
+            visible?: boolean;
+            /** Specifies the widget tab index. */
+            tabIndex?: number;
+            /** Specifies the text of the hint displayed for the widget. */
+            hint?: string;
+        }
+        /** The base class for widgets. */
+        export class Widget extends DOMComponent {
+            constructor(options?: WidgetOptions);
+            /** Redraws the widget. */
+            repaint(): void;
+            /** Sets focus on the widget. */
+            focus(): void;
+            /** Registers a handler when a specified key is pressed. */
+            registerKeyHandler(key: string, handler: Function): void;
+        }
+        export interface CollectionWidgetOptions extends WidgetOptions {
+            /** A data source used to fetch data to be displayed by the widget. */
+            dataSource?: any;
+            /** The time period in milliseconds before the onItemHold event is raised. */
+            itemHoldTimeout?: number;
+            /** An array of items displayed by the widget. */
+            items?: Array<any>;
+            /** The template to be used for rendering items. */
+            itemTemplate?: any;
+            loopItemFocus?: boolean;
+            /** The text or HTML markup displayed by the widget if the item collection is empty. */
+            noDataText?: string;
+            onContentReady?: any;
+            /** A handler for the itemClick event. */
+            onItemClick?: any;
+            /** A handler for the itemContextMenu event. */
+            onItemContextMenu?: Function;
+            /** A handler for the itemHold event. */
+            onItemHold?: Function;
+            /** A handler for the itemRendered event. */
+            onItemRendered?: Function;
+            /** A handler for the selectionChanged event. */
+            onSelectionChanged?: Function;
+            /** The index of the currently selected widget item. */
+            selectedIndex?: number;
+            /** The selected item object. */
+            selectedItem?: Object;
+            /** An array of currently selected item objects. */
+            selectedItems?: Array<any>;
+            /** A handler for the itemDeleting event. */
+            onItemDeleting?: Function;
+            /** A handler for the itemDeleted event. */
+            onItemDeleted?: Function;
+            /** A handler for the itemReordered event. */
+            onItemReordered?: Function;
+        }
+        /** The base class for widgets containing an item collection. */
+        export class CollectionWidget extends Widget {
+            constructor(element: JQuery, options?: CollectionWidgetOptions);
+            constructor(element: HTMLElement, options?: CollectionWidgetOptions);
+            selectItem(itemElement: any): void;
+            unselectItem(itemElement: any): void;
+            deleteItem(itemElement: any): JQueryPromise<void>;
+            isItemSelected(itemElement: any): boolean;
+            reorderItem(itemElement: any, toItemElement: any): JQueryPromise<void>;
+        }
+        export interface DataExpressionMixinOptions {
+            /** A data source used to fetch data to be displayed by the widget. */
+            dataSource?: any;
+            /** Specifies the name of the data source item field whose value is displayed by the widget. */
+            displayExpr?: any;
+            /** Specifies the name of a data source item field whose value is held in the value configuration option. */
+            valueExpr?: any;
+            /** An array of items displayed by the widget. */
+            items?: Array<any>;
+            /** The template to be used for rendering items. */
+            itemTemplate?: any;
+            /** The currently selected value in the widget. */
+            value?: Object;
+        }
+        export interface EditorOptions extends WidgetOptions {
+            /** The currently specified value. */
+            value?: Object;
+            /** A handler for the valueChanged event. */
+            onValueChanged?: Function;
+            /** A Boolean value specifying whether or not the widget is read-only. */
+            readOnly?: boolean;
+            /** Holds the object that defines the error that occurred during validation. */
+            validationError?: Object;
+            /** Specifies whether the editor's value is valid. */
+            isValid?: boolean;
+            /** Specifies how the message about the validation rules that are not satisfied by this editor's value is displayed. */
+            validationMessageMode?: string;
+        }
+        /** A base class for editors. */
+        export class Editor extends Widget {
+            /** Resets the editor's value to undefined. */
+            reset(): void;
+        }
+        /** An object that serves as a namespace for methods displaying a message in an application/site. */
+        export var dialog: {
+            /** Creates an alert dialog message containing a single "OK" button. */
+            alert(message: string, title: string): JQueryPromise<void>;
+            /** Creates a confirm dialog that contains "Yes" and "No" buttons. */
+            confirm(message: string, title: string): JQueryPromise<boolean>;
+            /** Creates a custom dialog using the options specified by the passed configuration object. */
+            custom(options: { title?: string; message?: string; buttons?: Array<Object>; }): {
+                show(): JQueryPromise<any>;
+                hide(): void;
+                hide(value: any): void;
+            };
+        };
+        /** Creates a toast message. */
+        export function notify(message: any, type: string, displayTime: number): void;
+        /** Creates a toast message. */
+        export function notify(options: Object): void;
+        /** An object that serves as a namespace for the methods that work with DevExtreme CSS Themes. */
+        export var themes: {
+            /** Returns the name of the currently applied theme. */
+            current(): string;
+            /** Changes the current theme to the specified one. */
+            current(themeName: string): void;
+        };
+        /** Sets a specified template engine. */
+        export function setTemplateEngine(name: string): void;
+        /** Sets a custom template engine defined via custom compile and render functions. */
+        export function setTemplateEngine(options: Object): void;
+    }
+    /** An object that serves as a namespace for utility methods that can be helpful when working with the DevExtreme framework and UI widgets. */
+    export var utils: {
+        /** Sets parameters for the viewport meta tag. */
+        initMobileViewport(options: { allowZoom?: boolean; allowPan?: boolean; allowSelection?: boolean }): void;
+        /** Requests that the browser call a specified function to update animation before the next repaint. */
+        requestAnimationFrame(callback: Function): number;
+        /** Cancels an animation frame request scheduled with the requestAnimationFrame method. */
+        cancelAnimationFrame(requestID: number): void;
+    };
+    /** An object that serves as a namespace for DevExtreme Data Visualization Widgets. */
+    export module viz {
+        /** Applies a theme for the entire page with several DevExtreme visualization widgets. */
+        export function currentTheme(theme: string): void;
+        /** Applies a new theme (with the color scheme defined separately) for the entire page with several DevExtreme visualization widgets. */
+        export function currentTheme(platform: string, colorScheme: string): void;
+        /** Registers a new theme based on the existing one. */
+        export function registerTheme(customTheme: Object, baseTheme: string): void;
+        /** Applies a predefined or registered custom palette to all visualization widgets at once. */
+        export function currentPalette(paletteName: string): void;
+        /** Obtains the color sets of a predefined or registered palette. */
+        export function getPalette(paletteName: string): Object;
+        /** Registers a new palette. */
+        export function registerPalette(paletteName: string, palette: Object): void;
+    }
+}
+declare module DevExpress.ui {
+    export interface dxValidatorOptions extends DOMComponentOptions {
+        /** An array of validation rules to be checked for the editor with which the dxValidator object is associated. */
+        validationRules?: Array<any>;
+        /** Specifies the editor name to be used in the validation default messages. */
+        name?: string;
+        /** An object that specifies what and when to validate and how to apply the validation result. */
+        adapter?: Object;
+        /** Specifies the validation group the editor will be related to. */
+        validationGroup?: string;
+        /** A handler for the validated event. */
+        onValidated?: (params: validationEngine.ValidatorValidationResult) => void;
+    }
+    /** A widget that is used to validate the associated DevExtreme editors against the defined validation rules. */
+    export class dxValidator extends DOMComponent implements validationEngine.IValidator {
+        constructor(element: JQuery, options?: dxValidatorOptions);
+        constructor(element: Element, options?: dxValidatorOptions);
+        /** Validates the value of the editor that is controlled by the current dxValidator object against the list of the specified validation rules. */
+        validate(): validationEngine.ValidatorValidationResult;
+        /** Resets the value and validation result of the editor associated with the current dxValidator object. */
+        reset(): void;
+    }
+    /** The widget that is used in the Knockout and Angular approaches to combine the editors to be validated. */
+    export class dxValidationGroup extends DOMComponent {
+        constructor(element: JQuery);
+        constructor(element: Element);
+        /** Validates rules of the validators that belong to the current validation group. */
+        validate(): validationEngine.ValidationGroupValidationResult;
+        /** Resets the value and validation result of the editors that are included to the current validation group. */
+        reset(): void;
+    }
+    export interface dxValidationSummaryOptions extends CollectionWidgetOptions {
+        /** Specifies the validation group for which summary should be generated. */
+        validationGroup?: string;
+    }
+    /** A widget for displaying the result of checking validation rules for editors. */
+    export class dxValidationSummary extends CollectionWidget {
+        constructor(element: JQuery, options?: dxValidationSummaryOptions);
+        constructor(element: Element, options?: dxValidationSummaryOptions);
+    }
+    export interface dxResizableOptions extends DOMComponentOptions {
+        /** Specifies which borders of the widget element are used as a handle. */
+        handles?: string;
+        /** Specifies the lower width boundary for resizing. */
+        minWidth?: number;
+        /** Specifies the upper width boundary for resizing. */
+        maxWidth?: number;
+        /** Specifies the lower height boundary for resizing. */
+        minHeight?: number;
+        /** Specifies the upper height boundary for resizing. */
+        maxHeight?: number;
+        /** A handler for the resizeStart event. */
+        onResizeStart?: Function;
+        /** A handler for the resize event. */
+        onResize?: Function;
+        /** A handler for the resizeEnd event. */
+        onResizeEnd?: Function;
+    }
+    /** A widget that displays required content in a resizable element. */
+    export class dxResizable extends DOMComponent {
+        constructor(element: JQuery, options?: dxResizableOptions);
+        constructor(element: Element, options?: dxResizableOptions);
+    }
+    export interface dxTooltipOptions extends dxPopoverOptions {
+    }
+    /** A tooltip widget. */
+    export class dxTooltip extends dxPopover {
+        constructor(element: JQuery, options?: dxTooltipOptions);
+        constructor(element: Element, options?: dxTooltipOptions);
+    }
+    export interface dxDropDownListOptions extends dxDropDownEditorOptions, DataExpressionMixinOptions {
+        /** Returns the value currently displayed by the widget. */
+        displayValue?: string;
+        /** The minimum number of characters that must be entered into the text box to begin a search. */
+        minSearchLength?: number;
+        /** Specifies whether or not the widget displays unfiltered values until a user types a number of characters exceeding the minSearchLength option value. */
+        showDataBeforeSearch?: boolean;
+        /** Specifies the name of a data source item field or an expression whose value is compared to the search criterion. */
+        searchExpr?: Object;
+        /** Specifies the binary operation used to filter data. */
+        searchMode?: string;
+        /** Specifies the time delay, in milliseconds, after the last character has been typed in, before a search is executed. */
+        searchTimeout?: number;
+        /** A handler for the valueChanged event. */
+        onValueChanged?: Function;
+        /** Specifies DOM event names that update a widget's value. */
+        valueChangeEvent?: string;
+        /** Specifies whether or not the widget supports searching. */
+        searchEnabled?: boolean;
+        /**
+         * Specifies whether or not the widget displays items by pages.
+         * @deprecated dataSource.paginate.md
+         */
+        pagingEnabled?: boolean;
+        /** The text or HTML markup displayed by the widget if the item collection is empty. */
+        noDataText?: string;
+        /** A handler for the selectionChanged event. */
+        onSelectionChanged?: Function;
+        /** A handler for the itemClick event. */
+        onItemClick?: Function;
+        onContentReady?: Function;
+    }
+    /** A base class for drop-down list widgets. */
+    export class dxDropDownList extends dxDropDownEditor {
+        constructor(element: JQuery, options?: dxDropDownListOptions);
+        constructor(element: Element, options?: dxDropDownListOptions);
+    }
+    export interface dxToolbarOptions extends CollectionWidgetOptions {
+        /** The template used to render menu items. */
+        menuItemTemplate?: any;
+        /** Informs the widget about its location in a view HTML markup. */
+        renderAs?: string;
+    }
+    /** A toolbar widget. */
+    export class dxToolbar extends CollectionWidget {
+        constructor(element: JQuery, options?: dxToolbarOptions);
+        constructor(element: Element, options?: dxToolbarOptions);
+    }
+    export interface dxToastOptions extends dxOverlayOptions {
+        animation?: fx.AnimationOptions;
+        /** The time span in milliseconds during which the dxToast widget is visible. */
+        displayTime?: number;
+        height?: any;
+        /** The dxToast message text. */
+        message?: string;
+        position?: PositionOptions;
+        shading?: boolean;
+        /** Specifies the dxToast widget type. */
+        type?: string;
+        width?: any;
+        closeOnBackButton?: boolean;
+        /** A Boolean value specifying whether or not the toast is closed if a user swipes it out of the screen boundaries. */
+        closeOnSwipe?: boolean;
+        /** A Boolean value specifying whether or not the toast is closed if a user clicks it. */
+        closeOnClick?: boolean;
+    }
+    /** The toast message widget. */
+    export class dxToast extends dxOverlay {
+        constructor(element: JQuery, options?: dxToastOptions);
+        constructor(element: Element, options?: dxToastOptions);
+    }
+    export interface dxTextEditorOptions extends EditorOptions {
+        /** A handler for the change event. */
+        onChange?: Function;
+        /** A handler for the copy event. */
+        onCopy?: Function;
+        /** A handler for the cut event. */
+        onCut?: Function;
+        /** A handler for the enterKey event. */
+        onEnterKey?: Function;
+        /** A handler for the focusIn event. */
+        onFocusIn?: Function;
+        /** A handler for the focusOut event. */
+        onFocusOut?: Function;
+        /** A handler for the input event. */
+        onInput?: Function;
+        /** A handler for the keyDown event. */
+        onKeyDown?: Function;
+        /** A handler for the keyPress event. */
+        onKeyPress?: Function;
+        /** A handler for the keyUp event. */
+        onKeyUp?: Function;
+        /** A handler for the paste event. */
+        onPaste?: Function;
+        /** The text displayed by the widget when the widget value is empty. */
+        placeholder?: string;
+        /** Specifies whether to display the Clear button in the widget. */
+        showClearButton?: boolean;
+        /** Specifies the current value displayed by the widget. */
+        value?: any;
+        /** Specifies DOM event names that update a widget's value. */
+        valueChangeEvent?: string;
+        /** Specifies whether or not the widget checks the inner text for spelling mistakes. */
+        spellcheck?: boolean;
+        /** Specifies HTML attributes applied to the inner input element of the widget. */
+        attr?: Object;
+        /** The read-only option that holds the text displayed by the widget input element. */
+        text?: string;
+        focusStateEnabled?: boolean;
+        hoverStateEnabled?: boolean;
+        /** The editor mask that specifies the format of the entered string. */
+        mask?: string;
+        /** Specifies a mask placeholder character. */
+        maskChar?: string;
+        /** Specifies custom mask rules. */
+        maskRules?: Object;
+        /** A message displayed when the entered text does not match the specified pattern. */
+        maskInvalidMessage?: string;
+        /** Specifies whether the value option holds only characters entered by a user or prompt characters as well. */
+        useMaskedValue?: boolean;
+    }
+    /** A base class for text editing widgets. */
+    export class dxTextEditor extends Editor {
+        constructor(element: JQuery, options?: dxTextEditorOptions);
+        constructor(element: Element, options?: dxTextEditorOptions);
+        /** Removes focus from the input element. */
+        blur(): void;
+        /** Sets focus to the input element representing the widget. */
+        focus(): void;
+    }
+    export interface dxTextBoxOptions extends dxTextEditorOptions {
+        /** Specifies the maximum number of characters you can enter into the textbox. */
+        maxLength?: any;
+        /** The "mode" attribute value of the actual HTML input element representing the text box. */
+        mode?: string;
+    }
+    /** A single-line text box widget. */
+    export class dxTextBox extends dxTextEditor {
+        constructor(element: JQuery, options?: dxTextBoxOptions);
+        constructor(element: Element, options?: dxTextBoxOptions);
+    }
+    export interface dxTextAreaOptions extends dxTextBoxOptions {
+        /** Specifies whether or not the widget checks the inner text for spelling mistakes. */
+        spellcheck?: boolean;
+    }
+    /** A widget used to display and edit multi-line text. */
+    export class dxTextArea extends dxTextBox {
+        constructor(element: JQuery, options?: dxTextAreaOptions);
+        constructor(element: Element, options?: dxTextAreaOptions);
+    }
+    export interface dxTabsOptions extends CollectionWidgetOptions {
+        /** Specifies whether the widget enables an end-user to select only a single item or multiple items. */
+        selectionMode?: string;
+        /** Specifies whether or not an end-user can scroll tabs by swiping. */
+        scrollByContent?: boolean;
+        /** Specifies whether or not an end-user can scroll tabs. */
+        scrollingEnabled?: boolean;
+        /** A Boolean value that specifies the availability of navigation buttons. */
+        showNavButtons?: boolean;
+    }
+    /** A tab strip used to switch between pages. */
+    export class dxTabs extends CollectionWidget {
+        constructor(element: JQuery, options?: dxTabsOptions);
+        constructor(element: Element, options?: dxTabsOptions);
+    }
+    export interface dxTabPanelOptions extends dxMultiViewOptions {
+        /** A handler for the titleClick event. */
+        onTitleClick?: any;
+        /** A handler for the titleHold event. */
+        onTitleHold?: Function;
+        /** A handler for the titleRendered event. */
+        onTitleRendered?: Function;
+        /** The template to be used for rendering an item title. */
+        itemTitleTemplate?: any;
+        /** A Boolean value specifying if the list is scrolled by content. */
+        scrollByContent?: boolean;
+        /** A Boolean value specifying whether to enable or disable scrolling. */
+        scrollingEnabled?: boolean;
+        /** A Boolean value that specifies the availability of navigation buttons. */
+        showNavButtons?: boolean;
+    }
+    /** A widget used to display a view and to switch between several views by clicking the appropriate tabs. */
+    export class dxTabPanel extends dxMultiView {
+        constructor(element: JQuery, options?: dxTabPanelOptions);
+        constructor(element: Element, options?: dxTabPanelOptions);
+    }
+    export interface dxSelectBoxOptions extends dxDropDownListOptions {
+        /** Specifies DOM event names that update a widget's value. */
+        valueChangeEvent?: string;
+        /** The template to be used for rendering the widget text field. */
+        fieldTemplate?: any;
+        /** The text that is provided as a hint in the select box editor. */
+        placeholder?: string;
+        /** Specifies whether or not the widget allows an end-user to enter a custom value. */
+        fieldEditEnabled?: boolean;
+    }
+    /** A widget that allows you to select an item in a dropdown list. */
+    export class dxSelectBox extends dxDropDownList {
+        constructor(element: JQuery, options?: dxSelectBoxOptions);
+        constructor(element: Element, options?: dxSelectBoxOptions);
+    }
+    export interface dxTagBoxOptions extends dxSelectBoxOptions {
+        /** Holds the list of selected values. */
+        values?: Array<any>;
+        /** A read-only option that holds the last selected value. */
+        value?: Object;
+    }
+    /** A widget that allows you to select multiple items from a dropdown list. */
+    export class dxTagBox extends dxSelectBox {
+        constructor(element: JQuery, options?: dxTagBoxOptions);
+        constructor(element: Element, options?: dxTagBoxOptions);
+    }
+    export interface dxScrollViewOptions extends dxScrollableOptions {
+        /** A handler for the pullDown event. */
+        onPullDown?: Function;
+        /** Specifies the text shown in the pullDown panel when pulling the content down lowers the refresh threshold. */
+        pulledDownText?: string;
+        /** Specifies the text shown in the pullDown panel while pulling the content down to the refresh threshold. */
+        pullingDownText?: string;
+        /** A handler for the reachBottom event. */
+        onReachBottom?: Function;
+        /** Specifies the text shown in the pullDown panel displayed when content is scrolled to the bottom. */
+        reachBottomText?: string;
+        /** Specifies the text shown in the pullDown panel displayed when the content is being refreshed. */
+        refreshingText?: string;
+        /** Returns a value indicating if the scrollView content is larger then the widget container. */
+        isFull(): boolean;
+        /** Locks the widget until the release(preventScrollBottom) method is called and executes the function passed to the onPullDown option and the handler assigned to the pullDown event. */
+        refresh(): void;
+        /** Notifies the scroll view that data loading is finished. */
+        release(preventScrollBottom: boolean): JQueryPromise<void>;
+        /** Toggles the loading state of the widget. */
+        toggleLoading(showOrHide: boolean): void;
+    }
+    /** A widget used to display scrollable content. */
+    export class dxScrollView extends dxScrollable {
+        constructor(element: JQuery, options?: dxScrollViewOptions);
+        constructor(element: Element, options?: dxScrollViewOptions);
+    }
+    export interface dxScrollableLocation {
+        top?: number;
+        left?: number;
+    }
+    export interface dxScrollableOptions extends DOMComponentOptions {
+        /** A string value specifying the available scrolling directions. */
+        direction?: string;
+        /** A Boolean value specifying whether or not the widget can respond to user interaction. */
+        disabled?: boolean;
+        /** A handler for the scroll event. */
+        onScroll?: Function;
+        /** Specifies when the widget shows the scrollbar. */
+        showScrollbar?: string;
+        /** A handler for the update event. */
+        onUpdated?: Function;
+        /** Indicates whether to use native or simulated scrolling. */
+        useNative?: boolean;
+        /** A Boolean value specifying whether to enable or disable the bounce-back effect. */
+        bounceEnabled?: boolean;
+        /** A Boolean value specifying whether or not an end-user can scroll the widget content swiping it up or down. */
+        scrollByContent?: boolean;
+        /** A Boolean value specifying whether or not an end-user can scroll the widget content using the scrollbar. */
+        scrollByThumb?: boolean;
+    }
+    /** A widget used to display scrollable content. */
+    export class dxScrollable extends DOMComponent {
+        constructor(element: JQuery, options?: dxScrollableOptions);
+        constructor(element: Element, options?: dxScrollableOptions);
+        /** Returns the height of the scrollable widget in pixels. */
+        clientHeight(): number;
+        /** Returns the width of the scrollable widget in pixels. */
+        clientWidth(): number;
+        /** Returns an HTML element of the widget. */
+        content(): JQuery;
+        /** Scrolls the widget content by the specified number of pixels. */
+        scrollBy(distance: number): void;
+        /** Scrolls widget content by the specified number of pixels in horizontal and vertical directions. */
+        scrollBy(distanceObject: dxScrollableLocation): void;
+        /** Returns the height of the scrollable content in pixels. */
+        scrollHeight(): number;
+        /** Returns the current scroll position against the leftmost position. */
+        scrollLeft(): number;
+        /** Returns how far the scrollable content is scrolled from the top and from the left. */
+        scrollOffset(): dxScrollableLocation;
+        /** Scrolls widget content to the specified position. */
+        scrollTo(targetLocation: number): void;
+        /** Scrolls widget content to a specified position. */
+        scrollTo(targetLocation: dxScrollableLocation): void;
+        /** Scrolls widget content to the specified element. */
+        scrollToElement(element: Element): void;
+        /** Returns the current scroll position against the topmost position. */
+        scrollTop(): number;
+        /** Returns the width of the scrollable content in pixels. */
+        scrollWidth(): number;
+        /** Updates the dimensions of the scrollable contents. */
+        update(): void;
+    }
+    export interface dxRadioGroupOptions extends EditorOptions, DataExpressionMixinOptions {
+        activeStateEnabled?: boolean;
+        /** Specifies the radio group layout. */
+        layout?: string;
+    }
+    /** A widget that enables a user to select one item within a list of items represented by radio buttons. */
+    export class dxRadioGroup extends CollectionWidget {
+        constructor(element: JQuery, options?: dxRadioGroupOptions);
+        constructor(element: Element, options?: dxRadioGroupOptions);
+    }
+    export interface dxPopupOptions extends dxOverlayOptions {
+        animation?: fx.AnimationOptions;
+        /** Specifies whether or not to allow a user to drag the popup window. */
+        dragEnabled?: boolean;
+        /** A Boolean value specifying whether or not to display the widget in full-screen mode. */
+        fullScreen?: boolean;
+        position?: PositionOptions;
+        /** A Boolean value specifying whether or not to display the title in the popup window. */
+        showTitle?: boolean;
+        /** The title in the overlay window. */
+        title?: string;
+        /** A template to be used for rendering the widget title. */
+        titleTemplate?: any;
+        width?: any;
+        /** Specifies items displayed on the top or bottom toolbar of the popup window. */
+        buttons?: Array<any>;
+        /** Specifies whether or not the widget displays the Close button. */
+        showCloseButton?: boolean;
+        /** A handler for the titleRendered event. */
+        onTitleRendered?: Function;
+    }
+    /** A widget that displays required content in a popup window. */
+    export class dxPopup extends dxOverlay {
+        constructor(element: JQuery, options?: dxPopupOptions);
+        constructor(element: Element, options?: dxPopupOptions);
+    }
+    export interface dxPopoverOptions extends dxPopupOptions {
+        /** An object defining animation options of the widget. */
+        animation?: fx.AnimationOptions;
+        /** Specifies the height of the widget. */
+        height?: any;
+        /** An object defining widget positioning options. */
+        position?: PositionOptions;
+        shading?: boolean;
+        /** A Boolean value specifying whether or not to display the title in the overlay window. */
+        showTitle?: boolean;
+        /** The target element associated with a popover. */
+        target?: any;
+        /** Specifies the width of the widget. */
+        width?: any;
+    }
+    /** A widget that displays the required content in a popup window. */
+    export class dxPopover extends dxPopup {
+        constructor(element: JQuery, options?: dxPopoverOptions);
+        constructor(element: Element, options?: dxPopoverOptions);
+        /** Displays the widget for the specified target element. */
+        show(target?: any): JQueryPromise<void>;
+    }
+    export interface dxOverlayOptions extends WidgetOptions {
+        /** An object that defines the animation options of the widget. */
+        animation?: fx.AnimationOptions;
+        /** A Boolean value specifying whether or not the widget is closed if a user presses the Back hardware button. */
+        closeOnBackButton?: boolean;
+        /** A Boolean value specifying whether or not the widget is closed if a user clicks outside of the overlapping window. */
+        closeOnOutsideClick?: any;
+        /** A template to be used for rendering widget content. */
+        contentTemplate?: any;
+        /** Specifies whether widget content is rendered when the widget is shown or when rendering the widget. */
+        deferRendering?: boolean;
+        /** Specifies whether or not an end-user can drag the widget. */
+        dragEnabled?: boolean;
+        /** Specifies whether or not an end user can resize the widget. */
+        resizeEnabled?: boolean;
+        /** The height of the widget in pixels. */
+        height?: any;
+        /** Specifies the maximum height the widget can reach while resizing. */
+        maxHeight?: any;
+        /** Specifies the maximum width the widget can reach while resizing. */
+        maxWidth?: any;
+        /** Specifies the minimum height the widget can reach while resizing. */
+        minHeight?: any;
+        /** Specifies the minimum width the widget can reach while resizing. */
+        minWidth?: any;
+        /** A handler for the hidden event. */
+        onHidden?: Function;
+        /** A handler for the resizeStart event. */
+        onResizeStart?: Function;
+        /** A handler for the resize event. */
+        onResize?: Function;
+        /** A handler for the resizeEnd event. */
+        onResizeEnd?: Function;
+        /** A handler for the hiding event. */
+        onHiding?: Function;
+        /** An object defining widget positioning options. */
+        position?: PositionOptions;
+        /** A Boolean value specifying whether or not the main screen is inactive while the widget is active. */
+        shading?: boolean;
+        /** Specifies the shading color. */
+        shadingColor?: string;
+        /** A handler for the showing event. */
+        onShowing?: Function;
+        /** A handler for the shown event. */
+        onShown?: Function;
+        onContentReady?: Function;
+        /** A Boolean value specifying whether or not the widget is visible. */
+        visible?: boolean;
+        /** The widget width in pixels. */
+        width?: any;
+    }
+    /** A widget displaying the required content in an overlay window. */
+    export class dxOverlay extends Widget {
+        constructor(element: JQuery, options?: dxOverlayOptions);
+        constructor(element: Element, options?: dxOverlayOptions);
+        /** An HTML element of the widget. */
+        content(): JQuery;
+        /** Hides the widget. */
+        hide(): JQueryPromise<void>;
+        /** Recalculates the overlay's size and position. */
+        repaint(): void;
+        /** Shows the widget. */
+        show(): JQueryPromise<void>;
+        /** Toggles the visibility of the widget. */
+        toggle(showing: boolean): JQueryPromise<void>;
+        /** A static method that specifies the base z-index for all overlay widgets. */
+        static baseZIndex(zIndex: number): void;
+    }
+    export interface dxNumberBoxOptions extends dxTextEditorOptions {
+        /** The maximum value accepted by the number box. */
+        max?: number;
+        /** The minimum value accepted by the number box. */
+        min?: number;
+        /** Specifies whether or not to show spin buttons. */
+        showSpinButtons?: boolean;
+        useTouchSpinButtons?: boolean;
+        /** Specifies by which value the widget value changes when a spin button is clicked. */
+        step?: number;
+        /** The current number box value. */
+        value?: number;
+        /** The "mode" attribute value of the actual HTML input element representing the widget. */
+        mode?: string;
+    }
+    /** A textbox widget that enables a user to enter numeric values. */
+    export class dxNumberBox extends dxTextEditor {
+        constructor(element: JQuery, options?: dxNumberBoxOptions);
+        constructor(element: Element, options?: dxNumberBoxOptions);
+    }
+    export interface dxNavBarOptions extends dxTabsOptions {
+        scrollingEnabled?: boolean;
+    }
+    /** A widget that contains items used to navigate through application views. */
+    export class dxNavBar extends dxTabs {
+        constructor(element: JQuery, options?: dxNavBarOptions);
+        constructor(element: Element, options?: dxNavBarOptions);
+    }
+    export interface dxMultiViewOptions extends CollectionWidgetOptions {
+        /** Specifies whether or not to animate the displayed item change. */
+        animationEnabled?: boolean;
+        /** A Boolean value specifying whether or not to scroll back to the first item after the last item is swiped. */
+        loop?: boolean;
+        /** The index of the currently displayed item. */
+        selectedIndex?: number;
+        /** A Boolean value specifying whether or not to allow users to change the selected index by swiping. */
+        swipeEnabled?: boolean;
+        /** Specifies whether widget content is rendered when the widget is shown or when rendering the widget. */
+        deferRendering?: boolean;
+    }
+    /** A widget used to display a view and to switch between several views. */
+    export class dxMultiView extends CollectionWidget {
+        constructor(element: JQuery, options?: dxMultiViewOptions);
+        constructor(element: Element, options?: dxMultiViewOptions);
+    }
+    export interface dxMapOptions extends WidgetOptions {
+        /** Specifies whether or not the widget automatically adjusts center and zoom option values when adding a new marker or route, or when creating a widget if it initially contains markers or routes. */
+        autoAdjust?: boolean;
+        center?: {
+            /** The latitude location displayed in the center of the widget. */
+            lat?: number;
+            /** The longitude location displayed in the center of the widget. */
+            lng?: number;
+        };
+        /** A handler for the click event. */
+        onClick?: any;
+        /** Specifies whether or not map widget controls are available. */
+        controls?: boolean;
+        /** Specifies the height of the widget. */
+        height?: any;
+        /** A key used to authenticate the application within the required map provider. */
+        key?: {
+            /** A key used to authenticate the application within the "Bing" map provider. */
+            bing?: string;
+            /** A key used to authenticate the application within the "Google" map provider. */
+            google?: string;
+            /** A key used to authenticate the application within the "Google Static" map provider. */
+            googleStatic?: string;
+        }
+        /** A handler for the markerAdded event. */
+        onMarkerAdded?: Function;
+        /** A URL pointing to the custom icon to be used for map markers. */
+        markerIconSrc?: string;
+        /** A handler for the markerRemoved event. */
+        onMarkerRemoved?: Function;
+        /** An array of markers displayed on a map. */
+        markers?: Array<any>;
+        /** The name of the current map data provider. */
+        provider?: string;
+        /** A handler for the ready event. */
+        onReady?: Function;
+        /** A handler for the routeAdded event. */
+        onRouteAdded?: Function;
+        /** A handler for the routeRemoved event. */
+        onRouteRemoved?: Function;
+        /** An array of routes shown on the map. */
+        routes?: Array<any>;
+        /** The type of a map to display. */
+        type?: string;
+        /** Specifies the width of the widget. */
+        width?: any;
+        /** The zoom level of the map. */
+        zoom?: number;
+    }
+    /** An interactive map widget. */
+    export class dxMap extends Widget {
+        constructor(element: JQuery, options?: dxMapOptions);
+        constructor(element: Element, options?: dxMapOptions);
+        /** Adds a marker to the map. */
+        addMarker(markerOptions: Object): JQueryPromise<Object>;
+        /** Adds a route to the map. */
+        addRoute(routeOptions: Object): JQueryPromise<Object>;
+        /** Removes a marker from the map. */
+        removeMarker(marker: Object): JQueryPromise<void>;
+        /** Removes a route from the map. */
+        removeRoute(route: any): JQueryPromise<void>;
+    }
+    export interface dxLookupOptions extends dxDropDownListOptions {
+        /** An object defining widget animation options. */
+        animation?: fx.AnimationOptions;
+        /** The text displayed on the Cancel button. */
+        cancelButtonText?: string;
+        /** The text displayed on the Clear button. */
+        clearButtonText?: string;
+        /** Specifies whether or not the widget cleans the search box when the popup window is displayed. */
+        cleanSearchOnOpening?: boolean;
+        /** A Boolean value specifying whether or not a widget is closed if a user clicks outside of the overlaying window. */
+        closeOnOutsideClick?: any;
+        /** The text displayed on the Apply button. */
+        applyButtonText?: string;
+        /** A Boolean value specifying whether or not to display the lookup in full-screen mode. */
+        fullScreen?: boolean;
+        focusStateEnabled?: boolean;
+        /** A Boolean value specifying whether or not to group widget items. */
+        grouped?: boolean;
+        /** The name of the template used to display a group header. */
+        groupTemplate?: any;
+        /** The text displayed on the button used to load the next page from the data source. */
+        nextButtonText?: string;
+        /** A handler for the pageLoading event. */
+        onPageLoading?: Function;
+        /** Specifies whether the next page is loaded when a user scrolls the widget to the bottom or when the "next" button is clicked. */
+        pageLoadMode?: string;
+        /** Specifies the text shown in the pullDown panel, which is displayed when the widget is scrolled to the bottom. */
+        pageLoadingText?: string;
+        /** The text displayed by the widget when nothing is selected. */
+        placeholder?: string;
+        /** The height of the widget popup element. */
+        popupHeight?: any;
+        /** The width of the widget popup element. */
+        popupWidth?: any;
+        /** An object defining widget positioning options. */
+        position?: PositionOptions;
+        /** Specifies the text displayed in the pullDown panel when the widget is pulled below the refresh threshold. */
+        pulledDownText?: string;
+        /** Specifies the text shown in the pullDown panel while the list is being pulled down to the refresh threshold. */
+        pullingDownText?: string;
+        /** A handler for the pullRefresh event. */
+        onPullRefresh?: Function;
+        /** A Boolean value specifying whether or not the widget supports the "pull down to refresh" gesture. */
+        pullRefreshEnabled?: boolean;
+        /** Specifies the text displayed in the pullDown panel while the widget is being refreshed. */
+        refreshingText?: string;
+        /** A handler for the scroll event. */
+        onScroll?: Function;
+        /** A Boolean value specifying whether or not the search bar is visible. */
+        searchEnabled?: boolean;
+        /** The text that is provided as a hint in the lookup's search bar. */
+        searchPlaceholder?: string;
+        /** A Boolean value specifying whether or not the main screen is inactive while the lookup is active. */
+        shading?: boolean;
+        /** Specifies whether to display the Cancel button in the lookup window. */
+        showCancelButton?: boolean;
+        /**
+         * A Boolean value specifying whether the widget loads the next page automatically when you reach the bottom of the list or when a button is clicked.
+         * @deprecated pageLoadMode.md
+         */
+        showNextButton?: boolean;
+        /** The title of the lookup window. */
+        title?: string;
+        /** A template to be used for rendering the widget title. */
+        titleTemplate?: any;
+        /** Specifies whether or not the widget uses native scrolling. */
+        useNativeScrolling?: boolean;
+        /** Specifies whether or not to show lookup contents in a dxPopover widget. */
+        usePopover?: boolean;
+        /** A handler for the valueChanged event. */
+        onValueChanged?: Function;
+        /** A handler for the titleRendered event. */
+        onTitleRendered?: Function;
+        /** A Boolean value specifying whether or not to display the title in the popup window. */
+        showPopupTitle?: boolean;
+        /** The template to be used for rendering the widget text field. */
+        fieldTemplate?: any;
+    }
+    /** A widget that allows a user to select predefined values from a lookup window. */
+    export class dxLookup extends dxDropDownList {
+        constructor(element: JQuery, options?: dxLookupOptions);
+        constructor(element: Element, options?: dxLookupOptions);
+        /** This section lists the data source fields that are used in a default template for lookup drop-down items. */
+    }
+    export interface dxLoadPanelOptions extends dxOverlayOptions {
+        /** An object defining the animation options of the widget. */
+        animation?: fx.AnimationOptions;
+        /** The delay in milliseconds after which the load panel is displayed. */
+        delay?: number;
+        /** The height of the widget. */
+        height?: number;
+        /** A URL pointing to an image to be used as a load indicator. */
+        indicatorSrc?: string;
+        /** The text displayed in the load panel. */
+        message?: string;
+        /** A Boolean value specifying whether or not to show a load indicator. */
+        showIndicator?: boolean;
+        /** A Boolean value specifying whether or not to show the pane behind the load indicator. */
+        showPane?: boolean;
+        /** The width of the widget. */
+        width?: number;
+    }
+    /** A widget used to indicate whether or not an element is loading. */
+    export class dxLoadPanel extends dxOverlay {
+        constructor(element: JQuery, options?: dxLoadPanelOptions);
+        constructor(element: Element, options?: dxLoadPanelOptions);
+    }
+    export interface dxLoadIndicatorOptions extends WidgetOptions {
+        /** Specifies the path to an image used as the indicator. */
+        indicatorSrc?: string;
+    }
+    /** The widget used to indicate the loading process. */
+    export class dxLoadIndicator extends Widget {
+        constructor(element: JQuery, options?: dxLoadIndicatorOptions);
+        constructor(element: Element, options?: dxLoadIndicatorOptions);
+    }
+    export interface dxListOptions extends CollectionWidgetOptions {
+        /** A Boolean value specifying whether or not to display a grouped list. */
+        grouped?: boolean;
+        /** The template to be used for rendering item groups. */
+        groupTemplate?: any;
+        onItemDeleting?: Function;
+        /** A handler for the itemDeleted event. */
+        onItemDeleted?: Function;
+        /** A handler for the groupRendered event. */
+        onGroupRendered?: Function;
+        /** A handler for the itemReordered event. */
+        onItemReordered?: Function;
+        /** A handler for the itemClick event. */
+        onItemClick?: any;
+        /** A handler for the itemSwipe event. */
+        onItemSwipe?: Function;
+        /** The text displayed on the button used to load the next page from the data source. */
+        nextButtonText?: string;
+        /** A handler for the pageLoading event. */
+        onPageLoading?: Function;
+        /** Specifies the text shown in the pullDown panel, which is displayed when the list is scrolled to the bottom. */
+        pageLoadingText?: string;
+        /** Specifies the text displayed in the pullDown panel when the list is pulled below the refresh threshold. */
+        pulledDownText?: string;
+        /** Specifies the text shown in the pullDown panel while the list is being pulled down to the refresh threshold. */
+        pullingDownText?: string;
+        /** A handler for the pullRefresh event. */
+        onPullRefresh?: Function;
+        /** A Boolean value specifying whether or not the widget supports the "pull down to refresh" gesture. */
+        pullRefreshEnabled?: boolean;
+        /** Specifies the text displayed in the pullDown panel while the list is being refreshed. */
+        refreshingText?: string;
+        /** A handler for the scroll event. */
+        onScroll?: Function;
+        /** A Boolean value specifying whether to enable or disable list scrolling. */
+        scrollingEnabled?: boolean;
+        /** Specifies when the widget shows the scrollbar. */
+        showScrollbar?: string;
+        /** Specifies whether or not the widget uses native scrolling. */
+        useNativeScrolling?: boolean;
+        /** A Boolean value specifying whether to enable or disable the bounce-back effect. */
+        bounceEnabled?: boolean;
+        /** A Boolean value specifying if the list is scrolled by content. */
+        scrollByContent?: boolean;
+        /** A Boolean value specifying if the list is scrolled using the scrollbar. */
+        scrollByThumb?: boolean;
+        onItemContextMenu?: Function;
+        onItemHold?: Function;
+        /** Specifies whether or not an end-user can collapse groups. */
+        collapsibleGroups?: boolean;
+        /** Specifies whether the next page is loaded when a user scrolls the widget to the bottom or when the "next" button is clicked. */
+        pageLoadMode?: string;
+        /** Specifies whether or not to display controls used to select list items. */
+        showSelectionControls?: boolean;
+        /** Specifies item selection mode. */
+        selectionMode?: string;
+        selectAllText?: string;
+        onSelectAllChanged?: Function;
+        /** Specifies the array of items for a context menu called for a list item. */
+        menuItems?: Array<any>;
+        /** Specifies whether an item context menu is shown when a user holds or swipes an item. */
+        menuMode?: string;
+        /** Specifies whether or not an end user can delete list items. */
+        allowItemDeleting?: boolean;
+        /** Specifies the way a user can delete items from the list. */
+        itemDeleteMode?: string;
+        /** Specifies whether or not an end user can reorder list items. */
+        allowItemReordering?: boolean;
+        /** Specifies whether or not to show the loading panel when the DataSource bound to the widget is loading data. */
+        indicateLoading?: boolean;
+        activeStateEnabled?: boolean;
+    }
+    /** A list widget. */
+    export class dxList extends CollectionWidget {
+        constructor(element: JQuery, options?: dxListOptions);
+        constructor(element: Element, options?: dxListOptions);
+        /** Returns the height of the widget in pixels. */
+        clientHeight(): number;
+        /** Removes the specified item from the list. */
+        deleteItem(itemIndex: any): JQueryPromise<void>;
+        /** Removes the specified item from the list. */
+        deleteItem(itemElement: Element): JQueryPromise<void>;
+        /** Returns a Boolean value that indicates whether or not the specified item is selected. */
+        isItemSelected(itemIndex: any): boolean;
+        /** Returns a Boolean value that indicates whether or not the specified item is selected. */
+        isItemSelected(itemElement: Element): boolean;
+        /** Reloads list data. */
+        reload(): void;
+        /** Moves the specified item to the specified position in the list. */
+        reorderItem(itemElement: Element, toItemElement: Element): JQueryPromise<void>;
+        /** Moves the specified item to the specified position in the list. */
+        reorderItem(itemIndex: any, toItemIndex: any): JQueryPromise<void>;
+        /** Scrolls the list content by the specified number of pixels. */
+        scrollBy(distance: number): void;
+        /** Returns the height of the list content in pixels. */
+        scrollHeight(): number;
+        /** Scrolls list content to the specified position. */
+        scrollTo(location: number): void;
+        /** Scrolls the list to the specified item. */
+        scrollToItem(itemElement: Element): void;
+        /** Scrolls the list to the specified item. */
+        scrollToItem(itemIndex: any): void;
+        /** Returns how far the list content is scrolled from the top. */
+        scrollTop(): number;
+        /** Selects the specified item from the list. */
+        selectItem(itemElement: Element): void;
+        /** Selects the specified item from the list. */
+        selectItem(itemIndex: any): void;
+        /** Deselects the specified item from the list. */
+        unselectItem(itemElement: Element): void;
+        /** Unselects the specified item from the list. */
+        unselectItem(itemIndex: any): void;
+        /** Updates the widget scrollbar according to widget content size. */
+        updateDimensions(): JQueryPromise<void>;
+        /** Expands the specified group. */
+        expandGroup(groupIndex: number): JQueryPromise<void>;
+        /** Collapses the specified group. */
+        collapseGroup(groupIndex: number): JQueryPromise<void>;
+    }
+    export interface dxGalleryOptions extends CollectionWidgetOptions {
+        /** The time, in milliseconds, spent on slide animation. */
+        animationDuration?: number;
+        /** Specifies whether or not to animate the displayed item change. */
+        animationEnabled?: boolean;
+        /** A Boolean value specifying whether or not to allow users to switch between items by clicking an indicator. */
+        indicatorEnabled?: boolean;
+        /** A Boolean value specifying whether or not to scroll back to the first item after the last item is swiped. */
+        loop?: boolean;
+        /** The index of the currently active gallery item. */
+        selectedIndex?: number;
+        /** A Boolean value specifying whether or not to display an indicator that points to the selected gallery item. */
+        showIndicator?: boolean;
+        /** A Boolean value that specifies the availability of the "Forward" and "Back" navigation buttons. */
+        showNavButtons?: boolean;
+        /** The time interval in milliseconds, after which the gallery switches to the next item. */
+        slideshowDelay?: number;
+        /** A Boolean value specifying whether or not to allow users to switch between items by swiping. */
+        swipeEnabled?: boolean;
+        /** Specifies whether or not to display parts of previous and next images along the sides of the current image. */
+        wrapAround?: boolean;
+        /** Specifies if the widget stretches images to fit the total gallery width. */
+        stretchImages?: boolean;
+        /** Specifies the width of an area used to display a single image. */
+        initialItemWidth?: number;
+    }
+    /** An image gallery widget. */
+    export class dxGallery extends CollectionWidget {
+        constructor(element: JQuery, options?: dxGalleryOptions);
+        constructor(element: Element, options?: dxGalleryOptions);
+        /** Shows the specified gallery item. */
+        goToItem(itemIndex: number, animation: boolean): JQueryPromise<any>;
+        /** Shows the next gallery item. */
+        nextItem(animation: boolean): JQueryPromise<any>;
+        /** Shows the previous gallery item. */
+        prevItem(animation: boolean): JQueryPromise<any>;
+    }
+    export interface dxDropDownEditorOptions extends dxTextBoxOptions {
+        /** Specifies the current value displayed by the widget. */
+        value?: Object;
+        /** A handler for the closed event. */
+        onClosed?: Function;
+        /** A handler for the opened event. */
+        onOpened?: Function;
+        /** Specifies whether or not the drop-down editor is displayed. */
+        opened?: boolean;
+        /** Specifies whether or not the widget allows an end-user to enter a custom value. */
+        fieldEditEnabled?: boolean;
+        /** Specifies the way an end-user applies the selected value. */
+        applyValueMode?: string;
+        /** Specifies whether widget content is rendered when the widget is shown or when rendering the widget. */
+        deferRendering?: boolean;
+        activeStateEnabled?: boolean;
+    }
+    /** A drop-down editor widget. */
+    export class dxDropDownEditor extends dxTextBox {
+        constructor(element: JQuery, options?: dxDropDownEditorOptions);
+        constructor(element: Element, options?: dxDropDownEditorOptions);
+        /** Closes the drop-down editor. */
+        close(): void;
+        /** Opens the drop-down editor. */
+        open(): void;
+        /** Resets the widget's value to null. */
+        reset(): void;
+        /** Returns an &lt;input&gt; element of the widget. */
+        field(): JQuery;
+        /** Returns an HTML element of the popup window content. */
+        content(): JQuery;
+    }
+    export interface dxDateBoxOptions extends dxTextEditorOptions {
+        /** A format used to display date/time information. */
+        format?: string;
+        /** A Globalize format string specifying the date display format. */
+        formatString?: string;
+        /** The last date that can be selected within the widget. */
+        max?: any;
+        /** The minimum date that can be selected within the widget. */
+        min?: any;
+        /** The text displayed by the widget when the widget value is not yet specified. This text is also used as a title of the date picker. */
+        placeholder?: string;
+        /**
+         * Specifies whether or not a user can pick out a date using the drop-down calendar.
+         * @deprecated Use 'pickerType' option instead.
+         */
+        useCalendar?: boolean;
+        /** An object or a value, specifying the date and time currently selected using the date box. */
+        value?: any;
+        /**
+         * Specifies whether or not the widget uses the native HTML input element.
+         * @deprecated Use 'pickerType' option instead.
+         */
+        useNative?: boolean;
+        /** Specifies the interval between neighboring values in the popup list in minutes. */
+        interval?: number;
+        /** Specifies the maximum zoom level of a calendar, which is used to pick the date. */
+        maxZoomLevel?: string;
+        /** Specifies the minimal zoom level of a calendar, which is used to pick the date. */
+        minZoomLevel?: string;
+        /** Specifies the type of date/time picker. */
+        pickerType?: string;
+        /** Specifies the message displayed if the typed value is not a valid date or time. */
+        invalidDateMessage?: string;
+        /** Specifies the message displayed if the specified date is later than the max value or earlier than the min value. */
+        dateOutOfRangeMessage?: string;
+        /** The text displayed on the Apply button. */
+        applyButtonText?: string;
+        /** The text displayed on the Cancel button. */
+        cancelButtonText?: string;
+    }
+    /** A date box widget. */
+    export class dxDateBox extends dxDropDownEditor {
+        constructor(element: JQuery, options?: dxDateBoxOptions);
+        constructor(element: Element, options?: dxDateBoxOptions);
+    }
+    export interface dxCheckBoxOptions extends EditorOptions {
+        activeStateEnabled?: boolean;
+        /** Specifies the widget state. */
+        value?: boolean;
+        /** Specifies the text displayed by the check box. */
+        text?: string;
+    }
+    /** A check box widget. */
+    export class dxCheckBox extends Editor {
+        constructor(element: JQuery, options?: dxCheckBoxOptions);
+        constructor(element: Element, options?: dxCheckBoxOptions);
+    }
+    export interface dxCalendarOptions extends EditorOptions {
+        activeStateEnabled?: boolean;
+        /** Specifies a date displayed on the current calendar page. */
+        currentDate?: Date;
+        /** Specifies the first day of a week. */
+        firstDayOfWeek?: number;
+        /** The latest date the widget allows to select. */
+        max?: Date;
+        /** The earliest date the widget allows to select. */
+        min?: Date;
+        /** Specifies whether or not the widget displays a button that selects the current date. */
+        showTodayButton?: boolean;
+        /** Specifies the current calendar zoom level. */
+        zoomLevel?: string;
+        /** Specifies the maximum zoom level of the calendar. */
+        maxZoomLevel?: string;
+        /** Specifies the minimum zoom level of the calendar. */
+        minZoomLevel?: string;
+        /** The template to be used for rendering calendar cells. */
+        cellTemplate?: any;
+    }
+    /** A calendar widget. */
+    export class dxCalendar extends Editor {
+        constructor(element: JQuery, options?: dxCalendarOptions);
+        constructor(element: Element, options?: dxCalendarOptions);
+    }
+    export interface dxButtonOptions extends WidgetOptions {
+        /** A Boolean value specifying whether or not the widget changes its state when interacting with a user. */
+        activeStateEnabled?: boolean;
+        /** A handler for the click event. */
+        onClick?: any;
+        /** Specifies the icon to be displayed on the button. */
+        icon?: string;
+        iconSrc?: string;
+        /** A template to be used for rendering the dxButton widget. */
+        template?: any;
+        /** The text displayed on the button. */
+        text?: string;
+        /** Specifies the button type. */
+        type?: string;
+        /** Specifies the name of the validation group to be accessed in the click event handler. */
+        validationGroup?: string;
+    }
+    /** A button widget. */
+    export class dxButton extends Widget {
+        constructor(element: JQuery, options?: dxButtonOptions);
+        constructor(element: Element, options?: dxButtonOptions);
+    }
+    export interface dxBoxOptions extends CollectionWidget {
+        /** Specifies how widget items are aligned along the main direction. */
+        align?: string;
+        /** Specifies the direction of item positioning in the widget. */
+        direction?: string;
+        /** Specifies how widget items are aligned cross-wise. */
+        crossAlign?: string;
+    }
+    /** A container widget used to arrange inner elements. */
+    export class dxBox extends CollectionWidget {
+        constructor(element: JQuery, options?: dxBoxOptions);
+        constructor(element: Element, options?: dxBoxOptions);
+    }
+    export interface dxResponsiveBoxOptions extends CollectionWidgetOptions {
+        /** Specifies the collection of rows for the grid used to position layout elements. */
+        rows?: Array<Object>;
+        /** Specifies the collection of columns for the grid used to position layout elements. */
+        cols?: Array<Object>;
+        /** Specifies the function returning the screen factor depending on the screen width. */
+        screenByWidth?: (width: number) => string;
+        /** Specifies the screen factor with which all elements are located in a single column. */
+        singleColumnScreen?: string;
+    }
+    /** A widget used to build an adaptive markup that is dependent on screen resolution. */
+    export class dxResponsiveBox extends CollectionWidget {
+        constructor(element: JQuery, options?: dxBoxOptions);
+        constructor(element: Element, options?: dxBoxOptions);
+    }
+    export interface dxAutocompleteOptions extends dxDropDownListOptions {
+        /** Specifies the current value displayed by the widget. */
+        value?: string;
+        /** The minimum number of characters that must be entered into the text box to begin a search. */
+        minSearchLength?: number;
+        /** Specifies the maximum count of items displayed by the widget. */
+        maxItemCount?: number;
+        /** Gets the currently selected item. */
+        selectedItem?: Object;
+    }
+    /** A textbox widget that supports autocompletion. */
+    export class dxAutocomplete extends dxDropDownList {
+        constructor(element: JQuery, options?: dxAutocompleteOptions);
+        constructor(element: Element, options?: dxAutocompleteOptions);
+        /** Opens the drop-down editor. */
+        open(): void;
+        /** Closes the drop-down editor. */
+        close(): void;
+    }
+    export interface dxAccordionOptions extends CollectionWidgetOptions {
+        /** A number specifying the time in milliseconds spent on the animation of the expanding or collapsing of a panel. */
+        animationDuration?: number;
+        /** Specifies the height of the widget. */
+        height?: any;
+        /** Specifies whether all items can be collapsed or whether at least one item must always be expanded. */
+        collapsible?: boolean;
+        /** Specifies whether the widget can expand several items or only a single item at once. */
+        multiple?: boolean;
+        /** The template to be used for rendering dxAccordion items. */
+        itemTemplate?: any;
+        /** A handler for the itemTitleClick event. */
+        onItemTitleClick?: any;
+        /** A handler for the itemTitleHold event. */
+        onItemTitleHold?: Function;
+        /** The template to be used for rendering an item title. */
+        itemTitleTemplate?: any;
+        /** The index number of the currently selected item. */
+        selectedIndex?: number;
+        /** Specifies whether widget content is rendered when the widget is shown or when rendering the widget. */
+        deferRendering?: boolean;
+    }
+    /** A widget that displays data source items on collapsible panels. */
+    export class dxAccordion extends CollectionWidget {
+        constructor(element: JQuery, options?: dxAccordionOptions);
+        constructor(element: Element, options?: dxAccordionOptions);
+        /** Collapses the specified item. */
+        collapseItem(index: number): JQueryPromise<dxAccordion>;
+        /** Expands the specified item. */
+        expandItem(index: number): JQueryPromise<dxAccordion>;
+        /** Updates the dimensions of the widget contents. */
+        updateDimensions(): JQueryPromise<dxAccordion>;
+    }
+    export interface dxFileUploaderOptions extends EditorOptions {
+        /** A read-only option that holds a File instance representing the selected file. */
+        value?: File;
+        /** Holds the File instances representing files selected in the widget. */
+        values?: Array<File>;
+        buttonText?: string;
+        /** The text displayed on the button that opens the file browser. */
+        selectButtonText?: string;
+        /** The text displayed on the button that starts uploading. */
+        uploadButtonText?: string;
+        /** Specifies the text displayed on the area to which an end-user can drop a file. */
+        labelText?: string;
+        /** Specifies the value passed to the name attribute of the underlying input element. */
+        name?: string;
+        /** Specifies whether the widget enables an end-user to select a single file or multiple files. */
+        multiple?: boolean;
+        /** Specifies a file type or several types accepted by the widget. */
+        accept?: string;
+        /** Specifies a target Url for the upload request. */
+        uploadUrl?: string;
+        /** Specifies if an end user can remove a file from the selection and interrupt uploading. */
+        allowCanceling?: boolean;
+        /** Specifies whether or not the widget displays the list of selected files. */
+        showFileList?: boolean;
+        /** Gets the current progress in percentages. */
+        progress?: number;
+        /** The message displayed by the widget when it is ready to upload the specified files. */
+        readyToUploadMessage?: string;
+        /** The message displayed by the widget when uploading is finished. */
+        uploadedMessage?: string;
+        /** The message displayed by the widget on uploading failure. */
+        uploadFailedMessage?: string;
+        /** Specifies how the widget uploads files. */
+        uploadMode?: string;
+        /** A handler for the uploaded event. */
+        onUploaded?: Function;
+        /** A handler for the uploaded event. */
+        onProgress?: Function;
+        /** A handler for the uploadError event. */
+        onUploadError?: Function;
+        /** A handler for the valueChanged event. */
+        onValueChanged?: Function;
+    }
+    /** A widget used to select and upload a file or multiple files. */
+    export class dxFileUploader extends Editor {
+        constructor(element: JQuery, options?: dxFileUploaderOptions);
+        constructor(element: Element, options?: dxFileUploaderOptions);
+    }
+    export interface dxTrackBarOptions extends EditorOptions {
+        /** The minimum value the widget can accept. */
+        min?: number;
+        /** The maximum value the widget can accept. */
+        max?: number;
+        /** The current widget value. */
+        value?: number;
+    }
+    /** A base class for track bar widgets. */
+    export class dxTrackBar extends Editor {
+        constructor(element: JQuery, options?: dxTrackBarOptions);
+        constructor(element: Element, options?: dxTrackBarOptions);
+    }
+    export interface dxProgressBarOptions extends dxTrackBarOptions {
+        /** Specifies a format for the progress status. */
+        statusFormat?: any;
+        /** Specifies whether or not the widget displays a progress status. */
+        showStatus?: boolean;
+        /** A handler for the complete event. */
+        onComplete?: Function;
+    }
+    /** A widget used to indicate progress. */
+    export class dxProgressBar extends dxTrackBar {
+        constructor(element: JQuery, options?: dxProgressBarOptions);
+        constructor(element: Element, options?: dxProgressBarOptions);
+    }
+    export interface dxSliderOptions extends dxTrackBarOptions {
+        activeStateEnabled?: boolean;
+        /** The slider step size. */
+        step?: number;
+        /** The current slider value. */
+        value?: number;
+        /** Specifies whether or not to highlight a range selected within the widget. */
+        showRange?: boolean;
+        /** Specifies the size of a step by which a slider handle is moved when a user uses the Page up or Page down keyboard shortcuts. */
+        keyStep?: number;
+        /** Specifies options for the slider tooltip. */
+        tooltip?: {
+            /** Specifies whether or not the tooltip is enabled. */
+            enabled?: boolean;
+            /** Specifies format for the tooltip. */
+            format?: any;
+            /** Specifies whether the tooltip is located over or under the slider. */
+            position?: string;
+            /** Specifies whether the widget always shows a tooltip or only when a pointer is over the slider. */
+            showMode?: string;
+        };
+        /** Specifies options for labels displayed at the min and max values. */
+        label?: {
+            /** Specifies whether or not slider labels are visible. */
+            visible?: boolean;
+            /** Specifies whether labels are located over or under the scale. */
+            position?: string;
+            /** Specifies a format for labels. */
+            format?: any;
+        };
+    }
+    /** A widget that allows a user to select a numeric value within a given range. */
+    export class dxSlider extends dxTrackBar {
+        constructor(element: JQuery, options?: dxSliderOptions);
+        constructor(element: Element, options?: dxSliderOptions);
+    }
+    export interface dxRangeSliderOptions extends dxSliderOptions {
+        /** The left edge of the interval currently selected using the range slider. */
+        start?: number;
+        /** The right edge of the interval currently selected using the range slider. */
+        end?: number;
+    }
+    /** A widget that enables a user to select a range of numeric values. */
+    export class dxRangeSlider extends dxSlider {
+        constructor(element: JQuery, options?: dxRangeSliderOptions);
+        constructor(element: Element, options?: dxRangeSliderOptions);
+    }
+    export interface dxFormItemLabel {
+        /** Specifies the label text. */
+        text?: string;
+        /** Specifies whether or not the label is visible. */
+        visible?: boolean;
+        /** Specifies whether or not a colon is displayed at the end of the current label. */
+        showColon?: boolean;
+        /** Specifies the location of a label against the editor. */
+        location?: string;
+        /** Specifies the label horizontal alignment. */
+        alignment?: string;
+    }
+    export interface dxFormItem {
+        /** Specifies the type of the current item. */
+        itemType?: string;
+        /** Specifies whether or not the current form item is visible. */
+        visible?: boolean;
+        /** Specifies the sequence number of the item in a form, group or tab. */
+        visibleIndex?: number;
+        /** Specifies a CSS class to be applied to the form item. */
+        cssClass?: string;
+        /** Specifies the number of columns spanned by the item. */
+        colSpan?: number;
+    }
+    export interface dxFormEmptyItem extends dxFormItem {
+        /** Specifies the form item name. */
+        name?: string;
+    }
+    export interface dxFormSimpleItem extends dxFormItem {
+        /** Specifies the path to the formData object field bound to the current form item. */
+        dataField?: string;
+        /** Specifies the form item name. */
+        name?: string;
+        /** Specifies which editor widget is used to display and edit the form item value. */
+        editorType?: string;
+        /** Specifies configuration options for the editor widget of the current form item. */
+        editorOptions?: Object;
+        /** A template to be used for rendering the form item. */
+        template?: any;
+        /** Specifies the help text displayed for the current form item. */
+        helpText?: string;
+        /** Specifies whether the current form item is required. */
+        isRequired?: boolean;
+        /** Specifies options for the form item label. */
+        label?: dxFormItemLabel;
+        /** An array of validation rules to be checked for the form item editor. */
+        validationRules?: Array<any>;
+    }
+    export interface dxFormGroupItem extends dxFormItem {
+        /** Specifies the group caption. */
+        caption?: string;
+        /** A template to be used for rendering the group item. */
+        template?: any;
+        /** The count of columns in the group layout. */
+        colCount?: number;
+        /** Specifies whether or not all group item labels are aligned. */
+        alignItemLabels?: boolean;
+        /** Holds an array of form items displayed within the group. */
+        items?: Array<dxFormItem>;
+    }
+    export interface dxFormTab {
+        /** Specifies the tab title. */
+        title?: string;
+        /** The count of columns in the tab layout. */
+        colCount?: number;
+        /** Specifies whether or not labels of items displayed within the current tab are aligned. */
+        alignItemLabels?: boolean;
+        /** Holds an array of form items displayed within the tab. */
+        items?: Array<dxFormItem>;
+        /** Specifies a badge text for the tab. */
+        badge?: string;
+        /** A Boolean value specifying whether or not the tab can respond to user interaction. */
+        disabled?: boolean;
+        /** Specifies the icon to be displayed on the tab. */
+        icon?: string;
+        /** The template to be used for rendering the tab. */
+        tabTemplate?: any;
+        /** The template to be used for rendering the tab content. */
+        template?: any;
+    }
+    export interface dxFormTabbedItem extends dxFormItem {
+        /** Holds a configuration object for the dxTabPanel widget used to display the current form item. */
+        tabPanelOptions?: Object;
+        /** An array of tab configuration objects. */
+        tabs?: Array<dxFormTab>;
+    }
+    export interface dxFormOptions extends WidgetOptions {
+        /** An object providing data for the form. */
+        formData?: Object;
+        /** The count of columns in the form layout. */
+        colCount?: any;
+        /** Specifies the location of a label against the editor. */
+        labelLocation?: string;
+        /** Specifies whether or not all editors on the form are read-only. */
+        readOnly?: boolean;
+        /** A handler for the fieldDataChanged event. */
+        onFieldDataChanged?: (e: Object) => void;
+        /** A handler for the editorEnterKey event. */
+        onEditorEnterKey?: (e: Object) => void;
+        /** Specifies a function that customizes a form item after it has been created. */
+        customizeItem?: Function;
+        /** The minimum column width used for calculating column count in the form layout. */
+        minColWidth?: number;
+        /** Specifies whether or not all root item labels are aligned. */
+        alignItemLabels?: boolean;
+        /** Specifies whether or not item labels in all groups are aligned. */
+        alignItemLabelsInAllGroups?: boolean;
+        /** Specifies whether or not a colon is displayed at the end of form labels. */
+        showColonAfterLabel?: boolean;
+        /** Specifies whether or not the required mark is displayed for required fields. */
+        showRequiredMark?: boolean;
+        /** Specifies whether or not the optional mark is displayed for optional fields. */
+        showOptionalMark?: boolean;
+        /** The text displayed for required fields. */
+        requiredMark?: string;
+        /** The text displayed for optional fields. */
+        optionalMark?: string;
+        /** Specifies the message that is shown for end-users if a required field value is not specified. */
+        requiredMessage?: string;
+        /** Specifies whether or not the total validation summary is displayed on the form. */
+        showValidationSummary?: boolean;
+        /** Holds an array of form items. */
+        items?: Array<dxFormItem>;
+        /** A Boolean value specifying whether to enable or disable form scrolling. */
+        scrollingEnabled?: boolean;
+        onContentReady?: Function;
+    }
+    /** A form widget used to display and edit values of object fields. */
+    export class dxForm extends Widget {
+        constructor(element: JQuery, options?: dxFormOptions);
+        constructor(element: Element, options?: dxFormOptions);
+        /** Updates the specified field of the formData object and the corresponding editor on the form. */
+        updateData(dataField: string, value: any): void;
+        /** Updates the specified fields of the formData object and the corresponding editors on the form. */
+        updateData(data: Object): void;
+        /** Updates the value of a form item option. */
+        itemOption(field: string, option: string, value: any): void;
+        /** Updates the values of form item options. */
+        itemOption(field: string, options: Object): void;
+        /** Returns an editor instance associated with the specified formData field. */
+        getEditor(field: string): Object;
+        /** Updates the dimensions of the widget contents. */
+        updateDimensions(): JQueryPromise<void>;
+        /** Validates the values of all editors on the form against the list of the validation rules specified for each form item. */
+        validate(): Object;
+    }
+}
+interface JQuery {
+    dxProgressBar(): JQuery;
+    dxProgressBar(options: "instance"): DevExpress.ui.dxProgressBar;
+    dxProgressBar(options: string): any;
+    dxProgressBar(options: string, ...params: any[]): any;
+    dxProgressBar(options: DevExpress.ui.dxProgressBarOptions): JQuery;
+    dxSlider(): JQuery;
+    dxSlider(options: "instance"): DevExpress.ui.dxSlider;
+    dxSlider(options: string): any;
+    dxSlider(options: string, ...params: any[]): any;
+    dxSlider(options: DevExpress.ui.dxSliderOptions): JQuery;
+    dxRangeSlider(): JQuery;
+    dxRangeSlider(options: "instance"): DevExpress.ui.dxRangeSlider;
+    dxRangeSlider(options: string): any;
+    dxRangeSlider(options: string, ...params: any[]): any;
+    dxRangeSlider(options: DevExpress.ui.dxRangeSliderOptions): JQuery;
+    dxFileUploader(): JQuery;
+    dxFileUploader(options: "instance"): DevExpress.ui.dxFileUploader;
+    dxFileUploader(options: string): any;
+    dxFileUploader(options: string, ...params: any[]): any;
+    dxFileUploader(options: DevExpress.ui.dxFileUploaderOptions): JQuery;
+    dxValidator(): JQuery;
+    dxValidator(options: "instance"): DevExpress.ui.dxValidator;
+    dxValidator(options: string): any;
+    dxValidator(options: string, ...params: any[]): any;
+    dxValidator(options: DevExpress.ui.dxValidatorOptions): JQuery;
+    dxValidationGroup(): JQuery;
+    dxValidationGroup(options: "instance"): DevExpress.ui.dxValidationGroup;
+    dxValidationGroup(options: string): any;
+    dxValidationGroup(options: string, ...params: any[]): any;
+    dxValidationSummary(): JQuery;
+    dxValidationSummary(options: "instance"): DevExpress.ui.dxValidationSummary;
+    dxValidationSummary(options: string): any;
+    dxValidationSummary(options: string, ...params: any[]): any;
+    dxValidationSummary(options: DevExpress.ui.dxValidationSummaryOptions): JQuery;
+    dxTooltip(): JQuery;
+    dxTooltip(options: "instance"): DevExpress.ui.dxTooltip;
+    dxTooltip(options: string): any;
+    dxTooltip(options: string, ...params: any[]): any;
+    dxTooltip(options: DevExpress.ui.dxTooltipOptions): JQuery;
+    dxResizable(): JQuery;
+    dxResizable(options: "instance"): DevExpress.ui.dxResizable;
+    dxResizable(options: string): any;
+    dxResizable(options: string, ...params: any[]): any;
+    dxResizable(options: DevExpress.ui.dxResizableOptions): JQuery;
+    dxDropDownList(): JQuery;
+    dxDropDownList(options: "instance"): DevExpress.ui.dxDropDownList;
+    dxDropDownList(options: string): any;
+    dxDropDownList(options: string, ...params: any[]): any;
+    dxDropDownList(options: DevExpress.ui.dxDropDownListOptions): JQuery;
+    dxToolbar(): JQuery;
+    dxToolbar(options: "instance"): DevExpress.ui.dxToolbar;
+    dxToolbar(options: string): any;
+    dxToolbar(options: string, ...params: any[]): any;
+    dxToolbar(options: DevExpress.ui.dxToolbarOptions): JQuery;
+    dxToast(): JQuery;
+    dxToast(options: "instance"): DevExpress.ui.dxToast;
+    dxToast(options: string): any;
+    dxToast(options: string, ...params: any[]): any;
+    dxToast(options: DevExpress.ui.dxToastOptions): JQuery;
+    dxTextEditor(): JQuery;
+    dxTextEditor(options: "instance"): DevExpress.ui.dxTextEditor;
+    dxTextEditor(options: string): any;
+    dxTextEditor(options: string, ...params: any[]): any;
+    dxTextEditor(options: DevExpress.ui.dxTextEditorOptions): JQuery;
+    dxTextBox(): JQuery;
+    dxTextBox(options: "instance"): DevExpress.ui.dxTextBox;
+    dxTextBox(options: string): any;
+    dxTextBox(options: string, ...params: any[]): any;
+    dxTextBox(options: DevExpress.ui.dxTextBoxOptions): JQuery;
+    dxTextArea(): JQuery;
+    dxTextArea(options: "instance"): DevExpress.ui.dxTextArea;
+    dxTextArea(options: string): any;
+    dxTextArea(options: string, ...params: any[]): any;
+    dxTextArea(options: DevExpress.ui.dxTextAreaOptions): JQuery;
+    dxTabs(): JQuery;
+    dxTabs(options: "instance"): DevExpress.ui.dxTabs;
+    dxTabs(options: string): any;
+    dxTabs(options: string, ...params: any[]): any;
+    dxTabs(options: DevExpress.ui.dxTabsOptions): JQuery;
+    dxTabPanel(): JQuery;
+    dxTabPanel(options: "instance"): DevExpress.ui.dxTabPanel;
+    dxTabPanel(options: string): any;
+    dxTabPanel(options: string, ...params: any[]): any;
+    dxTabPanel(options: DevExpress.ui.dxTabPanelOptions): JQuery;
+    dxSelectBox(): JQuery;
+    dxSelectBox(options: "instance"): DevExpress.ui.dxSelectBox;
+    dxSelectBox(options: string): any;
+    dxSelectBox(options: string, ...params: any[]): any;
+    dxSelectBox(options: DevExpress.ui.dxSelectBoxOptions): JQuery;
+    dxTagBox(): JQuery;
+    dxTagBox(options: "instance"): DevExpress.ui.dxTagBox;
+    dxTagBox(options: string): any;
+    dxTagBox(options: string, ...params: any[]): any;
+    dxTagBox(options: DevExpress.ui.dxTagBoxOptions): JQuery;
+    dxScrollView(): JQuery;
+    dxScrollView(options: "instance"): DevExpress.ui.dxScrollView;
+    dxScrollView(options: string): any;
+    dxScrollView(options: string, ...params: any[]): any;
+    dxScrollView(options: DevExpress.ui.dxScrollViewOptions): JQuery;
+    dxScrollable(): JQuery;
+    dxScrollable(options: "instance"): DevExpress.ui.dxScrollable;
+    dxScrollable(options: string): any;
+    dxScrollable(options: string, ...params: any[]): any;
+    dxScrollable(options: DevExpress.ui.dxScrollableOptions): JQuery;
+    dxRadioGroup(): JQuery;
+    dxRadioGroup(options: "instance"): DevExpress.ui.dxRadioGroup;
+    dxRadioGroup(options: string): any;
+    dxRadioGroup(options: string, ...params: any[]): any;
+    dxRadioGroup(options: DevExpress.ui.dxRadioGroupOptions): JQuery;
+    dxPopup(): JQuery;
+    dxPopup(options: "instance"): DevExpress.ui.dxPopup;
+    dxPopup(options: string): any;
+    dxPopup(options: string, ...params: any[]): any;
+    dxPopup(options: DevExpress.ui.dxPopupOptions): JQuery;
+    dxPopover(): JQuery;
+    dxPopover(options: "instance"): DevExpress.ui.dxPopover;
+    dxPopover(options: string): any;
+    dxPopover(options: string, ...params: any[]): any;
+    dxPopover(options: DevExpress.ui.dxPopoverOptions): JQuery;
+    dxOverlay(): JQuery;
+    dxOverlay(options: "instance"): DevExpress.ui.dxOverlay;
+    dxOverlay(options: string): any;
+    dxOverlay(options: string, ...params: any[]): any;
+    dxOverlay(options: DevExpress.ui.dxOverlayOptions): JQuery;
+    dxNumberBox(): JQuery;
+    dxNumberBox(options: "instance"): DevExpress.ui.dxNumberBox;
+    dxNumberBox(options: string): any;
+    dxNumberBox(options: string, ...params: any[]): any;
+    dxNumberBox(options: DevExpress.ui.dxNumberBoxOptions): JQuery;
+    dxNavBar(): JQuery;
+    dxNavBar(options: "instance"): DevExpress.ui.dxNavBar;
+    dxNavBar(options: string): any;
+    dxNavBar(options: string, ...params: any[]): any;
+    dxNavBar(options: DevExpress.ui.dxNavBarOptions): JQuery;
+    dxMultiView(): JQuery;
+    dxMultiView(options: "instance"): DevExpress.ui.dxMultiView;
+    dxMultiView(options: string): any;
+    dxMultiView(options: string, ...params: any[]): any;
+    dxMultiView(options: DevExpress.ui.dxMultiViewOptions): JQuery;
+    dxMap(): JQuery;
+    dxMap(options: "instance"): DevExpress.ui.dxMap;
+    dxMap(options: string): any;
+    dxMap(options: string, ...params: any[]): any;
+    dxMap(options: DevExpress.ui.dxMapOptions): JQuery;
+    dxLookup(): JQuery;
+    dxLookup(options: "instance"): DevExpress.ui.dxLookup;
+    dxLookup(options: string): any;
+    dxLookup(options: string, ...params: any[]): any;
+    dxLookup(options: DevExpress.ui.dxLookupOptions): JQuery;
+    dxLoadPanel(): JQuery;
+    dxLoadPanel(options: "instance"): DevExpress.ui.dxLoadPanel;
+    dxLoadPanel(options: string): any;
+    dxLoadPanel(options: string, ...params: any[]): any;
+    dxLoadPanel(options: DevExpress.ui.dxLoadPanelOptions): JQuery;
+    dxLoadIndicator(): JQuery;
+    dxLoadIndicator(options: "instance"): DevExpress.ui.dxLoadIndicator;
+    dxLoadIndicator(options: string): any;
+    dxLoadIndicator(options: string, ...params: any[]): any;
+    dxLoadIndicator(options: DevExpress.ui.dxLoadIndicatorOptions): JQuery;
+    dxList(): JQuery;
+    dxList(options: "instance"): DevExpress.ui.dxList;
+    dxList(options: string): any;
+    dxList(options: string, ...params: any[]): any;
+    dxList(options: DevExpress.ui.dxListOptions): JQuery;
+    dxGallery(): JQuery;
+    dxGallery(options: "instance"): DevExpress.ui.dxGallery;
+    dxGallery(options: string): any;
+    dxGallery(options: string, ...params: any[]): any;
+    dxGallery(options: DevExpress.ui.dxGalleryOptions): JQuery;
+    dxDropDownEditor(): JQuery;
+    dxDropDownEditor(options: "instance"): DevExpress.ui.dxDropDownEditor;
+    dxDropDownEditor(options: string): any;
+    dxDropDownEditor(options: string, ...params: any[]): any;
+    dxDropDownEditor(options: DevExpress.ui.dxDropDownEditorOptions): JQuery;
+    dxDateBox(): JQuery;
+    dxDateBox(options: "instance"): DevExpress.ui.dxDateBox;
+    dxDateBox(options: string): any;
+    dxDateBox(options: string, ...params: any[]): any;
+    dxDateBox(options: DevExpress.ui.dxDateBoxOptions): JQuery;
+    dxCheckBox(): JQuery;
+    dxCheckBox(options: "instance"): DevExpress.ui.dxCheckBox;
+    dxCheckBox(options: string): any;
+    dxCheckBox(options: string, ...params: any[]): any;
+    dxCheckBox(options: DevExpress.ui.dxCheckBoxOptions): JQuery;
+    dxBox(): JQuery;
+    dxBox(options: "instance"): DevExpress.ui.dxBox;
+    dxBox(options: string): any;
+    dxBox(options: string, ...params: any[]): any;
+    dxBox(options: DevExpress.ui.dxBoxOptions): JQuery;
+    dxButton(): JQuery;
+    dxButton(options: "instance"): DevExpress.ui.dxButton;
+    dxButton(options: string): any;
+    dxButton(options: string, ...params: any[]): any;
+    dxButton(options: DevExpress.ui.dxButtonOptions): JQuery;
+    dxCalendar(): JQuery;
+    dxCalendar(options: "instance"): DevExpress.ui.dxCalendar;
+    dxCalendar(options: string): any;
+    dxCalendar(options: string, ...params: any[]): any;
+    dxCalendar(options: DevExpress.ui.dxCalendarOptions): JQuery;
+    dxAccordion(): JQuery;
+    dxAccordion(options: "instance"): DevExpress.ui.dxAccordion;
+    dxAccordion(options: string): any;
+    dxAccordion(options: string, ...params: any[]): any;
+    dxAccordion(options: DevExpress.ui.dxAccordionOptions): JQuery;
+    dxResponsiveBox(): JQuery;
+    dxResponsiveBox(options: "instance"): DevExpress.ui.dxResponsiveBox;
+    dxResponsiveBox(options: string): any;
+    dxResponsiveBox(options: string, ...params: any[]): any;
+    dxResponsiveBox(options: DevExpress.ui.dxResponsiveBoxOptions): JQuery;
+    dxAutocomplete(): JQuery;
+    dxAutocomplete(options: "instance"): DevExpress.ui.dxAutocomplete;
+    dxAutocomplete(options: string): any;
+    dxAutocomplete(options: string, ...params: any[]): any;
+    dxAutocomplete(options: DevExpress.ui.dxAutocompleteOptions): JQuery;
+    dxForm(): JQuery;
+    dxForm(options: "instance"): DevExpress.ui.dxForm;
+    dxForm(options: string): any;
+    dxForm(options: string, ...params: any[]): any;
+    dxForm(options: DevExpress.ui.dxFormOptions): JQuery;
+}
+
+declare module DevExpress.ui {
+    export interface dxTileViewOptions extends CollectionWidgetOptions {
+        /** A Boolean value specifying whether or not the widget changes its state when interacting with a user. */
+        activeStateEnabled?: boolean;
+        /** Specifies the height of the base tile view item. */
+        baseItemHeight?: number;
+        /** Specifies the width of the base tile view item. */
+        baseItemWidth?: number;
+        /** Specifies whether tiles are placed horizontally or vertically. */
+        direction?: string;
+        /** Specifies the height of the widget. */
+        height?: any;
+        /** Specifies the distance in pixels between adjacent tiles. */
+        itemMargin?: number;
+        /** A Boolean value specifying whether or not to display a scrollbar. */
+        showScrollbar?: boolean;
+    }
+    /** A widget displaying several blocks of data as tiles. */
+    export class dxTileView extends CollectionWidget {
+        constructor(element: JQuery, options?: dxTileViewOptions);
+        constructor(element: Element, options?: dxTileViewOptions);
+        /** Returns the current scroll position of the widget content. */
+        scrollPosition(): number;
+    }
+    export interface dxSwitchOptions extends EditorOptions {
+	    activeStateEnabled?: boolean;
+        /** Text displayed when the widget is in a disabled state. */
+        offText?: string;
+        /** Text displayed when the widget is in an enabled state. */
+        onText?: string;
+        /** A Boolean value specifying whether the current switch state is "On" or "Off". */
+        value?: boolean;
+    }
+    /** A switch widget. */
+    export class dxSwitch extends Editor {
+        constructor(element: JQuery, options?: dxSwitchOptions);
+        constructor(element: Element, options?: dxSwitchOptions);
+    }
+    export interface dxSlideOutViewOptions extends WidgetOptions {
+        /** Specifies the current menu position. */
+        menuPosition?: string;
+        /** Specifies whether or not the menu panel is visible. */
+        menuVisible?: boolean;
+        /** Specifies whether or not the menu is shown when a user swipes the widget content. */
+        swipeEnabled?: boolean;
+        /** A template to be used for rendering menu panel content. */
+        menuTemplate?: any;
+        /** A template to be used for rendering widget content. */
+        contentTemplate?: any;
+    }
+    /** The widget that allows you to slide-out the current view to reveal a custom menu. */
+    export class dxSlideOutView extends Widget {
+        constructor(element: JQuery, options?: dxSlideOutViewOptions);
+        constructor(element: Element, options?: dxSlideOutViewOptions);
+        /** Returns an HTML element of the widget menu block. */
+        menuContent(): JQuery;
+        /** Returns an HTML element of the widget content block. */
+        content(): JQuery;
+        /** Displays the widget's menu block. */
+        showMenu(): JQueryPromise<void>;
+        /** Hides the widget's menu block. */
+        hideMenu(): JQueryPromise<void>;
+        /** Toggles the visibility of the widget's menu block. */
+        toggleMenuVisibility(): JQueryPromise<void>;
+    }
+    export interface dxSlideOutOptions extends CollectionWidgetOptions {
+        /** A Boolean value specifying whether or not the widget changes its state when interacting with a user. */
+        activeStateEnabled?: boolean;
+        /** A Boolean value specifying whether or not to display a grouped menu. */
+        menuGrouped?: boolean;
+        /** Specifies the current menu position. */
+        menuPosition?: string;
+        /** The name of the template used to display a group header. */
+        menuGroupTemplate?: any;
+        /** The template used to render menu items. */
+        menuItemTemplate?: any;
+        /** A handler for the menuGroupRendered event. */
+        onMenuGroupRendered?: Function;
+        /** A handler for the menuItemRendered event. */
+        onMenuItemRendered?: Function;
+        /** Specifies whether or not the slide-out menu is displayed. */
+        menuVisible?: boolean;
+        /** Indicates whether the menu can be shown/hidden by swiping the widget's main panel. */
+        swipeEnabled?: boolean;
+        /** A template to be used for rendering widget content. */
+        contentTemplate?: any;
+    }
+    /** The widget that allows you to slide-out the current view to reveal an item list. */
+    export class dxSlideOut extends CollectionWidget {
+        constructor(element: JQuery, options?: dxSlideOutOptions);
+        constructor(element: Element, options?: dxSlideOutOptions);
+        /** Hides the widget's slide-out menu. */
+        hideMenu(): JQueryPromise<void>;
+        /** Displays the widget's slide-out menu. */
+        showMenu(): JQueryPromise<void>;
+        /** Toggles the visibility of the widget's slide-out menu. */
+        toggleMenuVisibility(showing: boolean): JQueryPromise<void>;
+    }
+    export interface dxPivotOptions extends CollectionWidgetOptions {
+        /** The index of the currently active pivot item. */
+        selectedIndex?: number;
+        /** A Boolean value specifying whether or not to allow users to switch between items by swiping. */
+        swipeEnabled?: boolean;
+        /** A template to be used for rendering widget content. */
+        contentTemplate?: any;
+        /** The template to be used for rendering an item title. */
+        itemTitleTemplate?: any;
+    }
+    /** A widget that is similar to a traditional tab control, but optimized for the phone with simplified end-user interaction. */
+    export class dxPivot extends CollectionWidget {
+        constructor(element: JQuery, options?: dxPivotOptions);
+        constructor(element: Element, options?: dxPivotOptions);
+    }
+    export interface dxPanoramaOptions extends CollectionWidgetOptions {
+        /** An object exposing options for setting a background image for the panorama. */
+        backgroundImage?: {
+            /** Specifies the height of the panorama's background image. */
+            height?: number;
+            /** Specifies the URL of the image that is used as the panorama's background image. */
+            url?: string;
+            /** Specifies the width of the panorama's background image. */
+            width?: number;
+        };
+        /** The index of the currently active panorama item. */
+        selectedIndex?: number;
+        /** Specifies the widget content title. */
+        title?: string;
+    }
+    /** A widget displaying the required content in a long horizontal canvas that extends beyond the frames of the screen. */
+    export class dxPanorama extends CollectionWidget {
+        constructor(element: JQuery, options?: dxDropDownEditorOptions);
+        constructor(element: Element, options?: dxDropDownEditorOptions);
+    }
+    export interface dxDropDownMenuOptions extends WidgetOptions {
+        /** A handler for the buttonClick event. */
+        onButtonClick?: any;
+        /** The name of the icon to be displayed by the DropDownMenu button. */
+        buttonIcon?: string;
+        /** The text displayed in the DropDownMenu button. */
+        buttonText?: string;
+        buttonIconSrc?: string;
+        /** A data source used to fetch data to be displayed by the widget. */
+        dataSource?: any;
+        /** A handler for the itemClick event. */
+        onItemClick?: any;
+        /** An array of items displayed by the widget. */
+        items?: Array<any>;
+        /** The template to be used for rendering items. */
+        itemTemplate?: any;
+        /** Specifies whether or not to show the drop down menu within a dxPopover widget. */
+        usePopover?: boolean;
+        /** The width of the menu popup in pixels. */
+        popupWidth?: any;
+        /** The height of the menu popup in pixels. */
+        popupHeight?: any;
+        /** Specifies whether or not the drop-down menu is displayed. */
+        opened?: boolean;
+        hoverStateEnabled?: boolean;
+        activeStateEnabled?: boolean;
+    }
+    /** A drop-down menu widget. */
+    export class dxDropDownMenu extends Widget {
+        constructor(element: JQuery, options?: dxDropDownEditorOptions);
+        constructor(element: Element, options?: dxDropDownEditorOptions);
+        /** This section lists the data source fields that are used in a default template for drop-down menu items. */
+        /** Opens the drop-down menu. */
+        open(): void;
+        /** Closes the drop-down menu. */
+        close(): void;
+    }
+    export interface dxActionSheetOptions extends CollectionWidgetOptions {
+        /** A handler for the cancelClick event. */
+        onCancelClick?: any;
+        /** The text displayed in the button that closes the action sheet. */
+        cancelText?: string;
+        /** Specifies whether or not to display the Cancel button in action sheet. */
+        showCancelButton?: boolean;
+        /** A Boolean value specifying whether or not the title of the action sheet is visible. */
+        showTitle?: boolean;
+        /** Specifies the element the action sheet popover points at. */
+        target?: any;
+        /** The title of the action sheet. */
+        title?: string;
+        /** Specifies whether or not to show the action sheet within a dxPopover widget. */
+        usePopover?: boolean;
+        /** A Boolean value specifying whether or not the dxActionSheet widget is visible. */
+        visible?: boolean;
+    }
+    /** A widget consisting of a set of choices related to a certain task. */
+    export class dxActionSheet extends CollectionWidget {
+        constructor(element: JQuery, options?: dxActionSheetOptions);
+        constructor(element: Element, options?: dxActionSheetOptions);
+        /** Hides the widget. */
+        hide(): JQueryPromise<dxActionSheet>;
+        /** Shows the widget. */
+        show(): JQueryPromise<dxActionSheet>;
+        /** Shows or hides the widget depending on the Boolean value passed as the parameter. */
+        toggle(showing: boolean): JQueryPromise<dxActionSheet>;
+    }
+}
+interface JQuery {
+    dxTileView(): JQuery;
+    dxTileView(options: "instance"): DevExpress.ui.dxTileView;
+    dxTileView(options: string): any;
+    dxTileView(options: string, ...params: any[]): any;
+    dxTileView(options: DevExpress.ui.dxTileViewOptions): JQuery;
+    dxSwitch(): JQuery;
+    dxSwitch(options: "instance"): DevExpress.ui.dxSwitch;
+    dxSwitch(options: string): any;
+    dxSwitch(options: string, ...params: any[]): any;
+    dxSwitch(options: DevExpress.ui.dxSwitchOptions): JQuery;
+    dxSlideOut(): JQuery;
+    dxSlideOut(options: "instance"): DevExpress.ui.dxSlideOut;
+    dxSlideOut(options: string): any;
+    dxSlideOut(options: string, ...params: any[]): any;
+    dxSlideOut(options: DevExpress.ui.dxSlideOutOptions): JQuery;
+    dxPivot(): JQuery;
+    dxPivot(options: "instance"): DevExpress.ui.dxPivot;
+    dxPivot(options: string): any;
+    dxPivot(options: string, ...params: any[]): any;
+    dxPivot(options: DevExpress.ui.dxPivotOptions): JQuery;
+    dxPanorama(): JQuery;
+    dxPanorama(options: "instance"): DevExpress.ui.dxPanorama;
+    dxPanorama(options: string): any;
+    dxPanorama(options: string, ...params: any[]): any;
+    dxPanorama(options: DevExpress.ui.dxPanoramaOptions): JQuery;
+    dxActionSheet(): JQuery;
+    dxActionSheet(options: "instance"): DevExpress.ui.dxActionSheet;
+    dxActionSheet(options: string): any;
+    dxActionSheet(options: string, ...params: any[]): any;
+    dxActionSheet(options: DevExpress.ui.dxActionSheetOptions): JQuery;
+    dxDropDownMenu(): JQuery;
+    dxDropDownMenu(options: "instance"): DevExpress.ui.dxDropDownMenu;
+    dxDropDownMenu(options: string): any;
+    dxDropDownMenu(options: string, ...params: any[]): any;
+    dxDropDownMenu(options: DevExpress.ui.dxDropDownMenuOptions): JQuery;
+}
+declare module DevExpress.data {
+    export interface XmlaStoreOptions {
+        /** The HTTP address to an XMLA OLAP server. */
+        url?: string;
+        /** The name of the database associated with the Store. */
+        catalog?: string;
+        /** The cube name. */
+        cube?: string;
+        /** A function used to customize a web request before it is sent. */
+        beforeSend?: (request: Object) => void;
+    }
+    /** A Store that provides access to an OLAP cube using the XMLA standard. */
+    export class XmlaStore {
+        constructor(options: XmlaStoreOptions);
+    }
+    export interface PivotGridField {
+        index?: number;
+        /** A boolean value specifying whether or not the field is visible in the pivot grid and the Field Chooser. */
+        visible?: boolean;
+        /** Name of the data source field containing data for the pivot grid field. */
+        dataField?: string;
+        /** A caption that will be displayed in the pivot grid's field chooser to identify the field. */
+        caption?: string;
+        /** Specifies a type of field values. */
+        dataType?: string;
+        /** Specifies how the values of the current field are combined into groups. Cannot be used for the XmlaStore store type. */
+        groupInterval?: any;
+        /** Specifies how to aggregate field data. Cannot be used for the XmlaStore store type. */
+        summaryType?: string;
+        /** Allows you to use a custom aggregate function to calculate the summary values. Cannot be used for the XmlaStore store type. */
+        calculateCustomSummary?: (options: {
+            summaryProcess?: string;
+            value?: any;
+            totalValue?: any;
+        }) => void;
+        /** Specifies the function that determines how to split data from the data source into ranges for header items. Cannot be used for the XmlaStore store type. */
+        selector?: (data: Object) => any;
+        /** Type of the area where the field is located. */
+        area?: string;
+        /** Index among the other fields displayed within the same area. */
+        areaIndex?: number;
+        /** The name of the folder in which the field is located. */
+        displayFolder?: string;
+        /** The name of the group to which the field belongs. */
+        groupName?: string;
+        /** The index of the field within a group. */
+        groupIndex?: number;
+        /** Specifies the sort order of field values. */
+        sortOrder?: string;
+        /** Specifies how field data should be sorted. Can be used for the XmlaStore store type only. */
+        sortBy?: string;
+        /** Sorts the header items of this field by the summary values of another field. */
+        sortBySummaryField?: string;
+        /** The array of field names that specify a path to column/row whose summary field is used for sorting of this field's header items. */
+        sortBySummaryPath?: Array<any>;
+        /** The filter values for the current field. */
+        filterValues?: Array<any>;
+        /** The filter type for the current field. */
+        filterType?: string;
+        /** Indicates whether all header items of the field's header level are expanded. */
+        expanded?: boolean;
+        /** Specifies whether the field should be treated as a Data Field. */
+        isMeasure?: boolean;
+        /** Specifies a display format for field values. */
+        format?: string;
+        /** Specifies a callback function that returns the text to be displayed in the cells of a field. */
+        customizeText?: (cellInfo: { value: any; valueText: string }) => string;
+        /** Specifies a precision for formatted field values. */
+        precision?: number;
+        /** Specifies how to sort the header items. */
+        sortingMethod?: (a: Object, b: Object) => number;
+        /** Allows an end-user to change sorting options. */
+        allowSorting?: boolean;
+        /** Allows an end-user to sort columns by summary values. */
+        allowSortingBySummary?: boolean;
+        /** Allows an end-user to change filtering options. */
+        allowFiltering?: boolean;
+        /** Allows an end-user to expand/collapse all header items within a header level. */
+        allowExpandAll?: boolean;
+        /** Specifies the absolute width of the field in the pivot grid. */
+        width?: number;
+        /** Specifies the summary post-processing algorithm. */
+        summaryDisplayMode?: string;
+        /** Specifies whether to summarize each next summary value with the previous one by rows or columns. */
+        runningTotal?: string;
+        /** Specifies whether to allow the predefined summary post-processing functions ('absoluteVariation' and 'percentVariation') and runningTotal to take values of different groups into account. */
+        allowCrossGroupCalculation?: boolean;
+        /** Specifies a callback function that allows you to modify summary values after they are calculated. */
+        calculateSummaryValue?: (e: Object) => number;
+        /** Specifies whether or not to display Total values for the field. */
+        showTotals?: boolean;
+        /** Specifies whether or not to display Grand Total values for the field. */
+        showGrandTotals?: boolean;
+    }
+    export class SummaryCell {
+        /** Gets the parent cell in a specified direction. */
+        parent(direction: string): SummaryCell;
+        /** Gets all children cells in a specified direction. */
+        children(direction: string): Array<SummaryCell>;
+        /** Gets a partial Grand Total cell of a row or column. */
+        grandTotal(direction: string): SummaryCell;
+        /** Gets the Grand Total of the entire pivot grid. */
+        grandTotal(): SummaryCell;
+        /** Gets the cell next to the current one in a specified direction. */
+        next(direction: string): SummaryCell;
+        /** Gets the cell next to current in a specified direction. */
+        next(direction: string, allowCrossGroup: boolean): SummaryCell;
+        /** Gets the cell prior to the current one in a specified direction. */
+        prev(direction: string): SummaryCell;
+        /** Gets the cell previous to current in a specified direction. */
+        prev(direction: string, allowCrossGroup: boolean): SummaryCell;
+        /** Gets the child cell in a specified direction. */
+        child(direction: string, fieldValue: any): SummaryCell;
+        /** Gets the cell located by the path of the source cell with one field value changed. */
+        slice(field: PivotGridField, value: any): SummaryCell;
+        /** Gets the header cell of a row or column field to which the current cell belongs. */
+        field(area: string): PivotGridField;
+        /** Gets the value of the current cell. */
+        value(): any;
+        /** Gets the value of the current cell. */
+        value(isCalculatedValue: boolean): any;
+        /** Gets the value of any field linked with the current cell. */
+        value(field: PivotGridField): any;
+        /** Gets the value of any field linked with the current cell. */
+        value(field: PivotGridField, isCalculatedValue: boolean): any;
+    }
+    export interface PivotGridDataSourceOptions {
+        /** Specifies the underlying Store instance used to access data. */
+        store?: any;
+        /** Indicates whether or not the automatic field generation from data in the Store is enabled. */
+        retrieveFields?: boolean;
+        /** Specifies data filtering conditions. Cannot be used for the XmlaStore store type. */
+        filter?: Object;
+        /** An array of pivot grid fields. */
+        fields?: Array<PivotGridField>;
+        /** A handler for the changed event. */
+        onChanged?: () => void;
+        /** A handler for the loadingChanged event. */
+        onLoadingChanged?: (isLoading: boolean) => void;
+        /** A handler for the loadError event. */
+        onLoadError?: (e?: Object) => void;
+        /** A handler for the fieldsPrepared event. */
+        onFieldsPrepared?: (e?: Array<PivotGridField>) => void;
+    }
+    /** An object that provides access to data for the dxPivotGrid widget. */
+    export class PivotGridDataSource implements EventsMixin<PivotGridDataSource> {
+        constructor(options?: PivotGridDataSource);
+        /** Starts reloading data from any store and updating the data source. */
+        reload(): JQueryPromise<any>;
+        /** Starts updating the data source. Reloads data from the XMLA store only. */
+        load(): JQueryPromise<any>;
+        /** Indicates whether or not the PivotGridDataSource is currently being loaded. */
+        isLoading(): boolean;
+        /** Gets data displayed in a PivotGrid. */
+        getData(): Object;
+        /** Gets all fields within a specified area. */
+        getAreaFields(area: string, collectGroups: boolean): Array<PivotGridField>;
+        /** Gets all fields from the data source. */
+        fields(): Array<PivotGridField>;
+        /** Sets the fields option. */
+        fields(fields: Array<PivotGridField>): void;
+        /** Gets current options of a specified field. */
+        field(id: any): PivotGridField;
+        /** Sets one or more options of a specified field. */
+        field(id: any, field: PivotGridField): void;
+        /** Collapses a specified header item. */
+        collapseHeaderItem(area: string, path: Array<any>): void;
+        /** Expands a specified header item. */
+        expandHeaderItem(area: string, path: Array<any>): void;
+        /** Expands all header items of a field. */
+        expandAll(id: any): void;
+        /** Collapses all header items of a field. */
+        collapseAll(id: any): void;
+        /** Disposes of all resources associated with this PivotGridDataSource. */
+        dispose(): void;
+        /** Gets the current filter expression. Cannot be used for the XmlaStore store type. */
+        filter(): Object;
+        /** Applies a new filter expression. Cannot be used for the XmlaStore store type. */
+        filter(filterExpr: Object): void;
+        /** Provides access to a list of records (facts) that were used to calculate a specific summary. */
+        createDrillDownDataSource(options: {
+            columnPath?: Array<any>;
+            rowPath?: Array<any>;
+            dataIndex?: number;
+            maxRowCount?: number;
+            customColumns?: Array<string>;
+        }): DevExpress.data.DataSource;
+        /** Gets the current PivotGridDataSource state (fields configuration, sorting, filters, expanded headers, etc.) */
+        state(): Object;
+        /** Sets the PivotGridDataSource state. */
+        state(state: Object): void;
+        on(eventName: string, eventHandler: Function): PivotGridDataSource;
+        on(events: { [eventName: string]: Function; }): PivotGridDataSource;
+        off(eventName: string): PivotGridDataSource;
+        off(eventName: string, eventHandler: Function): PivotGridDataSource;
+    }
+}
+declare module DevExpress.ui {
+    export interface dxSchedulerOptions extends WidgetOptions {
+        /** Specifies a date displayed on the current scheduler view by default. */
+        currentDate?: Date;
+        /** The earliest date the widget allows you to select. */
+        min?: Date;
+        /** The latest date the widget allows you to select. */
+        max?: Date;
+        /** Specifies the view used in the scheduler by default. */
+        currentView?: string;
+        /** A data source used to fetch data to be displayed by the widget. */
+        dataSource?: any;
+        /** Specifies the first day of a week. */
+        firstDayOfWeek?: number;
+        /** The template to be used for rendering appointments. */
+        appointmentTemplate?: any;
+        /** The template to be used for rendering an appointment tooltip. */
+        appointmentTooltipTemplate?: any;
+        /** Lists the views to be available within the scheduler's View Selector. */
+        views?: Array<string>;
+        /** Specifies the resource kinds by which the scheduler's appointments are grouped in a timetable. */
+        groups?: Array<string>;
+        /** Specifies a start hour in the scheduler view's time interval. */
+        startDayHour?: number;
+        /** Specifies an end hour in the scheduler view's time interval. */
+        endDayHour?: number;
+        /** Specifies whether or not the "All-day" panel is visible. */
+        showAllDayPanel?: boolean;
+        /** Specifies cell duration in minutes. */
+        cellDuration?: number;
+        /** Specifies the edit mode for recurring appointments. */
+        recurrenceEditMode?: string;
+        /** Specifies which editing operations an end-user can perform on appointments. */
+        editing?: {
+            /** Specifies whether or not an end-user can add appointments. */
+            allowAdding?: boolean;
+            /** Specifies whether or not an end-user can change appointment options. */
+            allowUpdating?: boolean;
+            /** Specifies whether or not an end-user can delete appointments. */
+            allowDeleting?: boolean;
+            /** Specifies whether or not an end-user can change an appointment duration. */
+            allowResizing?: boolean;
+            /** Specifies whether or not an end-user can drag appointments. */
+            allowDragging?: boolean;
+        }
+        /** Specifies an array of resources available in the scheduler. */
+        resources?: Array<{
+            /** Indicates whether or not several resources of this kind can be assigned to an appointment. */
+            allowMultiple?: boolean;
+            /**
+             * Indicates whether or not resources of this kind have priority in the color identification of the appointments that have resources of different kinds assigned.
+             * @deprecated Use the 'useColorAsDefault' property instead
+             */
+            mainColor?: boolean;
+            /** Indicates whether or not resources of this kind have priority in the color identification of the appointments that have resources of different kinds assigned. */
+            useColorAsDefault?: boolean;
+            /** A data source used to fetch resources to be available in the scheduler. */
+            dataSource?: any;
+            /** Specifies the resource object field whose value is displayed by the Resource editor in the Appointment popup window. */
+            displayExpr?: any;
+            /** Specifies the resource object field that is used as a value of the Resource editor in the Appointment popup window. */
+            valueExpr?: any;
+            /** The name of the appointment object field that specifies a resource of this kind. */
+            field?: string;
+            /** Specifies the label of the Appointment popup window field that allows end users to assign a resource of this kind. */
+            label?: string;
+        }>;
+        /** A handler for the AppointmentAdding event. */
+        onAppointmentAdding?: Function;
+        /** A handler for the appointmentAdded event. */
+        onAppointmentAdded?: Function;
+        /** A handler for the AppointmentUpdating event. */
+        onAppointmentUpdating?: Function;
+        /** A handler for the appointmentUpdated event. */
+        onAppointmentUpdated?: Function;
+        /** A handler for the AppointmentDeleting event. */
+        onAppointmentDeleting?: Function;
+        /** A handler for the appointmentDeleted event. */
+        onAppointmentDeleted?: Function;
+        /** A handler for the appointmentRendered event. */
+        onAppointmentRendered?: Function;
+        /** A handler for the appointmentClick event. */
+        onAppointmentClick?: any;
+        /** A handler for the appointmentDblClick event. */
+        onAppointmentDblClick?: any;
+        /** A handler for the cellClick event. */
+        onCellClick?: any;
+        /** A handler for the appointmentFormCreated event. */
+        onAppointmentFormCreated?: Function;
+        /** Specifies whether or not an end-user can scroll the view horizontally. */
+        horizontalScrollingEnabled?: boolean;
+        /** Specifies whether a user can switch views using tabs or a drop-down menu. */
+        useDropDownViewSwitcher?: boolean;
+        /** Specifies the name of the data source item field that defines the start of an appointment. */
+        startDateExpr?: string;
+        /** Specifies the name of the data source item field that defines the ending of an appointment. */
+        endDateExpr?: string;
+        /** Specifies the name of the data source item field that holds the subject of an appointment. */
+        textExpr?: string;
+        /** Specifies the name of the data source item field whose value holds the description of the corresponding appointment. */
+        descriptionExpr?: string;
+        /** Specifies the name of the data source item field whose value defines whether or not the corresponding appointment is an all-day appointment. */
+        allDayExpr?: string;
+        /** Specifies the name of the data source item field that defines a recurrence rule for generating recurring appointments. */
+        recurrenceRuleExpr?: string;
+        /** Specifies the name of the data source item field that defines exceptions for the current recurring appointment. */
+        recurrenceExceptionExpr?: string;
+        /** Specifies whether filtering is performed on the server or client side. */
+        remoteFiltering?: boolean;
+    }
+    /** A widget that displays scheduled data using different views and provides the capability to load, add and edit appointments. */
+    export class dxScheduler extends Widget {
+        constructor(element: JQuery, options?: dxSchedulerOptions);
+        constructor(element: Element, options?: dxSchedulerOptions);
+        /** Add the appointment defined by the object passed as a parameter to the data associated with the widget. */
+        addAppointment(appointment: Object): void;
+        /** Updates the appointment specified by the first method parameter by the appointment object specified by the second method parameter in the the data associated with the widget. */
+        updateAppointment(target: Object, appointment: Object): void;
+        /** Deletes the appointment defined by the parameter from the the data associated with the widget. */
+        deleteAppointment(appointment: Object): void;
+        /** Scrolls the scheduler work space to the specified time of the specified day. */
+        scrollToTime(hours: number, minutes: number, date: Date): void;
+        /** Displayes the Appointment Details popup. */
+        showAppointmentPopup(appointmentData: Object, createNewAppointment?: boolean, currentAppointmentData?: Object): void;
+    }
+    export interface dxColorBoxOptions extends dxDropDownEditorOptions {
+        /** Specifies the text displayed on the button that applies changes and closes the drop-down editor. */
+        applyButtonText?: string;
+        applyValueMode?: string;
+        /** Specifies the text displayed on the button that cancels changes and closes the drop-down editor. */
+        cancelButtonText?: string;
+        /** Specifies whether or not the widget value includes the alpha channel component. */
+        editAlphaChannel?: boolean;
+        /** Specifies the size of a step by which a handle is moved using a keyboard shortcut. */
+        keyStep?: number;
+    }
+    /** A widget used to specify a color value. */
+    export class dxColorBox extends dxDropDownEditor {
+        constructor(element: JQuery, options?: dxColorBoxOptions);
+        constructor(element: Element, options?: dxColorBoxOptions);
+    }
+    export interface HierarchicalCollectionWidgetOptions extends CollectionWidgetOptions {
+        /** Specifies the name of the data source item field whose value is displayed by the widget. */
+        displayExpr?: any;
+        /** Specifies the name of the data source item field used as a key. */
+        keyExpr?: any;
+        /** Specifies the name of the data source item field whose value defines whether or not the corresponding widget items is selected. */
+        selectedExpr?: any;
+        /** Specifies the name of the data source item field that contains an array of nested items. */
+        itemsExpr?: any;
+        /** Specifies the name of the data source item field whose value defines whether or not the corresponding widget item is disabled. */
+        disabledExpr?: any;
+        /** Specifies the name of the data source item field that holds the key of the parent item. */
+        parentIdExpr?: any;
+        /** Specifies the name of the data source item field whose value defines whether or not the corresponding widget items is expanded. */
+        expandedExpr?: any;
+        hoverStateEnabled?: boolean;
+        focusStateEnabled?: boolean;
+    }
+    export class HierarchicalCollectionWidget extends CollectionWidget {
+    }
+    export interface dxTreeViewOptions extends HierarchicalCollectionWidgetOptions {
+        /** Specifies whether or not to animate item collapsing and expanding. */
+        animationEnabled?: boolean;
+        /** Specifies whether a nested or plain array is used as a data source. */
+        dataStructure?: string;
+        /** Specifies whether or not a user can expand all tree view items by the "*" hot key. */
+        expandAllEnabled?: boolean;
+        /**
+         * Specifies whether or not a check box is displayed at each tree view item.
+         * @deprecated Use the showCheckBoxesMode option instead.
+         */
+        showCheckBoxes?: boolean;
+        /** Specifies the current check boxes display mode. */
+        showCheckBoxesMode?: string;
+        /** Specifies whether or not to select nodes recursively. */
+        selectNodesRecursive?: boolean;
+        /** Specifies whether or not all parent nodes of an initially expanded node are displayed expanded. */
+        expandNodesRecursive?: boolean;
+        /**
+         * Specifies whether the "Select All" check box is displayed over the tree view.
+         * @deprecated Use the showCheckBoxesMode option instead.
+         */
+        selectAllEnabled?: boolean;
+        /** Specifies the text displayed at the "Select All" check box. */
+        selectAllText?: string;
+        /** Specifies the name of the data source item field whose value defines whether or not the corresponding node includes child nodes. */
+        hasItemsExpr?: any;
+        /** Specifies if the virtual mode is enabled. */
+        virtualModeEnabled?: boolean;
+        /** Specifies the parent ID value of the root item. */
+        rootValue?: any;
+        /** Specifies the current value used to filter tree view items. */
+        searchValue?: string;
+        /** A string value specifying available scrolling directions. */
+        scrollDirection?: string;
+        /** A handler for the itemSelected event. */
+        onItemSelected?: Function;
+        /** A handler for the itemExpanded event. */
+        onItemExpanded?: Function;
+        /** A handler for the itemCollapsed event. */
+        onItemCollapsed?: Function;
+        onItemClick?: Function;
+        onItemContextMenu?: Function;
+        onItemRendered?: Function;
+        onItemHold?: Function;
+    }
+    /** A widget displaying specified data items as a tree. */
+    export class dxTreeView extends HierarchicalCollectionWidget {
+        constructor(element: JQuery, options?: dxTreeViewOptions);
+        constructor(element: Element, options?: dxTreeViewOptions);
+        /** Updates the tree view scrollbars according to the current size of the widget content. */
+        updateDimensions(): JQueryPromise<void>;
+        /** Selects the specified item. */
+        selectItem(itemElement: any): void;
+        /** Unselects the specified item. */
+        unselectItem(itemElement: any): void;
+        /** Expands the specified item. */
+        expandItem(itemElement: any): void;
+        /** Collapses the specified item. */
+        collapseItem(itemElement: any): void;
+        /** Returns all nodes of the tree view. */
+        getNodes(): Array<Object>;
+        /** Selects all widget items. */
+        selectAll(): void;
+        /** Unselects all widget items. */
+        unselectAll(): void;
+    }
+    export interface dxMenuBaseOptions extends HierarchicalCollectionWidgetOptions {
+        /** An object that defines the animation options of the widget. */
+        animation?: fx.AnimationOptions;
+        /** A Boolean value specifying whether or not the widget changes its state when interacting with a user. */
+        activeStateEnabled?: boolean;
+        /** Specifies the name of the CSS class associated with the menu. */
+        cssClass?: string;
+        /** Holds an array of menu items. */
+        items?: Array<any>;
+        /** Specifies whether or not an item becomes selected if an end-user clicks it. */
+        selectionByClick?: boolean;
+        /** Specifies the selection mode supported by the menu. */
+        selectionMode?: string;
+        /** Specifies options of submenu showing and hiding. */
+        showSubmenuMode?: {
+            /** Specifies the mode name. */
+            name?: string;
+            /** Specifies the delay of submenu show and hiding. */
+            delay?: {
+                /** The time span after which the submenu is shown. */
+                show?: number;
+                /** The time span after which the submenu is hidden. */
+                hide?: number;
+            };
+        };
+    }
+    export class dxMenuBase extends HierarchicalCollectionWidget {
+        constructor(element: JQuery, options?: dxMenuBaseOptions);
+        constructor(element: Element, options?: dxMenuBaseOptions);
+        /** Selects the specified item. */
+        selectItem(itemElement: any): void;
+        /** Unselects the specified item. */
+        unselectItem(itemElement: any): void;
+    }
+    export interface dxMenuOptions extends dxMenuBaseOptions {
+        /** Specifies whether or not the submenu is hidden when the mouse pointer leaves it. */
+        hideSubmenuOnMouseLeave?: boolean;
+        /** Specifies whether the menu has horizontal or vertical orientation. */
+        orientation?: string;
+        /** Specifies options for showing and hiding the first level submenu. */
+        showFirstSubmenuMode?: {
+            /** Specifies the mode name. */
+            name?: string;
+            /** Specifies the delay in submenu showing and hiding. */
+            delay?: {
+                /** The time span after which the submenu is shown. */
+                show?: number;
+                /** The time span after which the submenu is hidden. */
+                hide?: number;
+            };
+        };
+        /** Specifies the direction at which the submenus are displayed. */
+        submenuDirection?: string;
+        /** A handler for the submenuHidden event. */
+        onSubmenuHidden?: Function;
+        /** A handler for the submenuHiding event. */
+        onSubmenuHiding?: Function;
+        /** A handler for the submenuShowing event. */
+        onSubmenuShowing?: Function;
+        /** A handler for the submenuShown event. */
+        onSubmenuShown?: Function;
+    }
+    /** A menu widget. */
+    export class dxMenu extends dxMenuBase {
+        constructor(element: JQuery, options?: dxMenuOptions);
+        constructor(element: Element, options?: dxMenuOptions);
+    }
+    export interface dxContextMenuOptions extends dxMenuBaseOptions {
+        /** Holds an object that specifies options of alternative menu invocation. */
+        alternativeInvocationMode?: {
+            /** Specifies whether or not the standard context menu invocation (on a right mouse click or on a long tap) is disabled. */
+            enabled?: Boolean;
+            /** Specifies the element used to invoke the context menu. */
+            invokingElement?: any;
+        };
+        /** A handler for the hidden event. */
+        onHidden?: Function;
+        /** A handler for the hiding event. */
+        onHiding?: Function;
+        /** A handler for the positioning event. */
+        onPositioning?: Function;
+        /** A handler for the showing event. */
+        onShowing?: Function;
+        /** A handler for the shown event. */
+        onShown?: Function;
+        /** An object defining widget positioning options. */
+        position?: PositionOptions;
+        /** Specifies the direction at which submenus are displayed. */
+        submenuDirection?: string;
+        /** The target element associated with a popover. */
+        target?: any;
+        /** A Boolean value specifying whether or not the widget is visible. */
+        visible?: boolean;
+    }
+    /** A context menu widget. */
+    export class dxContextMenu extends dxMenuBase {
+        constructor(element: JQuery, options?: dxContextMenuOptions);
+        constructor(element: Element, options?: dxContextMenuOptions);
+        /** Toggles the visibility of the widget. */
+        toggle(showing: boolean): JQueryPromise<void>;
+        /** Shows the widget. */
+        show(): JQueryPromise<void>;
+        /** Hides the widget. */
+        hide(): JQueryPromise<void>;
+    }
+    export interface dxRemoteOperations {
+        /** Specifies whether or not filtering must be performed on the server side. */
+        filtering?: boolean;
+        /** Specifies whether or not paging must be performed on the server side. */
+        paging?: boolean;
+        /** Specifies whether or not sorting must be performed on the server side. */
+        sorting?: boolean;
+        /** Specifies whether or not grouping must be performed on the server side. */
+        grouping?: boolean;
+        /** Specifies whether or not summaries calculation must be performed on the server side. */
+        summary?: boolean;
+    }
+    export interface dxDataGridRow {
+        /** The data object represented by the row. */
+        data: Object;
+        /** The key of the data object represented by the row. */
+        key: any;
+        /** The visible index of the row. */
+        rowIndex: number;
+        /** The type of the row. */
+        rowType: string;
+    }
+    export interface dxDataGridColumn {
+        /** Specifies the content alignment within column cells. */
+        alignment?: string;
+        /** Specifies whether the values in a column can be edited at runtime. Setting this option makes sense only when editing is enabled for a grid. */
+        allowEditing?: boolean;
+        /** Specifies whether or not a column can be used for filtering grid records. Setting this option makes sense only when the filter row and column header filtering are visible. */
+        allowFiltering?: boolean;
+        /** Specifies whether or not to allow filtering by this column using its header. */
+        allowHeaderFiltering?: boolean;
+        /** Specifies whether or not the column can be anchored to a grid edge by end users. Setting this option makes sense only when the columnFixing | enabled option is set to true. */
+        allowFixing?: boolean;
+        /** Specifies if a column can be used for searching grid records. Setting this option makes sense only when the search panel is visible. */
+        allowSearch?: boolean;
+        /** Specifies whether a column can be used for grouping grid records at runtime. Setting this option makes sense only when the group panel is visible. */
+        allowGrouping?: boolean;
+        /** Specifies whether or not a column can be hidden by a user. Setting this option makes sense only when the column chooser is visible. */
+        allowHiding?: boolean;
+        /** Specifies whether or not a particular column can be used in column reordering. Setting this option makes sense only when the allowColumnReordering option is set to true. */
+        allowReordering?: boolean;
+        /** Specifies whether or not a particular column can be resized by a user. Setting this option makes sense only when the allowColumnResizing option is true. */
+        allowResizing?: boolean;
+        /** Specifies whether grid records can be sorted by a specific column at runtime. Setting this option makes sense only when the sorting mode differs from none. */
+        allowSorting?: boolean;
+        /** Specifies whether groups appear expanded or not when records are grouped by a specific column. Setting this option makes sense only when grouping is allowed for this column. */
+        autoExpandGroup?: boolean;
+        /** Specifies a callback function that returns a value to be displayed in a column cell. */
+        calculateCellValue?: (rowData: Object) => string;
+        /** Specifies a callback function to be invoked after the cell value is edited by an end-user and before the new value is saved to the data source. */
+        setCellValue?: (rowData: Object, value: any) => void;
+        /** Specifies a callback function that defines filters for customary calculated grid cells. */
+        calculateFilterExpression?: (filterValue: any, selectedFilterOperation: string, target: string) => Array<any>;
+        /** Specifies a caption for a column. */
+        caption?: string;
+        /** Specifies a custom template for grid column cells. */
+        cellTemplate?: any;
+        /** Specifies a CSS class to be applied to a column. */
+        cssClass?: string;
+        /** Specifies how to get a value to be displayed in a cell when it is not in an editing state. */
+        calculateDisplayValue?: any;
+        /** Specifies a field name or a function that returns a field name or a value to be used for grouping column cells. */
+        calculateGroupValue?: any;
+        /** Specifies a field name or a function that returns a field name or a value to be used for sorting column cells. */
+        calculateSortValue?: any;
+        /** Specifies a callback function that returns the text to be displayed in the cells of a column. */
+        customizeText?: (cellInfo: { value: any; valueText: string }) => string;
+        /** Specifies the field of a data source that provides data for a column. */
+        dataField?: string;
+        /** Specifies the required type of column values. */
+        dataType?: string;
+        /** Specifies a custom template for the cell of a grid column when it is in an editing state. */
+        editCellTemplate?: any;
+        /** Specifies configuration options for the editor widget of the current column. */
+        editorOptions?: Object;
+        /** Specifies whether HTML tags are displayed as plain text or applied to the values of the column. */
+        encodeHtml?: boolean;
+        /** In a boolean column, replaces all false items with a specified text. */
+        falseText?: string;
+        /** Specifies the set of available filter operations. */
+        filterOperations?: Array<any>;
+        /** Specifies a filter value for a column. */
+        filterValue?: any;
+        /** Specifies initial filter values for the column's header filter. */
+        filterValues?: Array<any>;
+        /** Specifies whether to include or exclude the records with the values selected in the column's header filter. */
+        filterType?: string;
+        /** Indicates whether the column takes part in horizontal grid scrolling or is anchored to a grid edge. */
+        fixed?: boolean;
+        /** Specifies the grid edge to which the column is anchored. */
+        fixedPosition?: string;
+        /** Specifies a format for the values displayed in a column. */
+        format?: string;
+        /** Specifies a custom template for the group cell of a grid column. */
+        groupCellTemplate?: any;
+        /** Specifies the index of a column when grid records are grouped by the values of this column. */
+        groupIndex?: number;
+        /** Specifies a custom template for the header of a grid column. */
+        headerCellTemplate?: any;
+        /** Specifies options of a lookup column. */
+        lookup?: {
+            /** Specifies whether or not a user can nullify values of a lookup column. */
+            allowClearing?: boolean;
+            /** Specifies the data source providing data for a lookup column. */
+            dataSource?: any;
+            /** Specifies the expression defining the data source field whose values must be displayed. */
+            displayExpr?: any;
+            /** Specifies the expression defining the data source field whose values must be replaced. */
+            valueExpr?: string;
+        };
+        /** Specifies column-level options for filtering using a column header filter. */
+        headerFilter?: {
+            /** Specifies the data source to be used for the header filter. */
+            dataSource?: any;
+            /** Specifies how header filter values should be combined into groups. */
+            groupInterval?: any;
+        };
+        /** Specifies a precision for formatted values displayed in a column. */
+        precision?: number;
+        /** Specifies a filter operation applied to a column. */
+        selectedFilterOperation?: string;
+        /** Specifies whether or not the column displays its values by using editors. */
+        showEditorAlways?: boolean;
+        /** Specifies whether or not to display the column when grid records are grouped by it. */
+        showWhenGrouped?: boolean;
+        /** Specifies the index of a column when grid records are sorted by the values of this column. */
+        sortIndex?: number;
+        /** Specifies the initial sort order of column values. */
+        sortOrder?: string;
+        /** In a boolean column, replaces all true items with a specified text. */
+        trueText?: string;
+        /** Specifies whether a column is visible or not. */
+        visible?: boolean;
+        /** Specifies the sequence number of the column in the grid. */
+        visibleIndex?: number;
+        /** Specifies a column width in pixels or percentages. */
+        width?: any;
+        /** Specifies an array of validation rules to be checked when updating column cell values. */
+        validationRules?: Array<Object>;
+        /** Specifies whether or not to display the header of a hidden column in the column chooser. */
+        showInColumnChooser?: boolean;
+        /** Specifies the identifier of the column. */
+        name?: string;
+        /** The form item configuration object. Used only when the editing mode is "form". */
+        formItem?: DevExpress.ui.dxFormItem;
+    }
+    export interface dxDataGridOptions extends WidgetOptions {
+        /** Specifies whether the outer borders of the grid are visible or not. */
+        showBorders?: boolean;
+        /** Indicates whether to show the error row for the grid. */
+        errorRowEnabled?: boolean;
+        /** A handler for the rowValidating event. */
+        onRowValidating?: (e: Object) => void;
+        /** A handler for the contextMenuPreparing event. */
+        onContextMenuPreparing?: (e: Object) => void;
+        /** A handler for the initNewRow event. */
+        onInitNewRow?: (e: { data: Object }) => void;
+        /** A handler for the rowInserted event. */
+        onRowInserted?: (e: { data: Object; key: any }) => void;
+        /** A handler for the rowInserting event. */
+        onRowInserting?: (e: { data: Object; cancel: any }) => void;
+        /** A handler for the rowRemoved event. */
+        onRowRemoved?: (e: { data: Object; key: any }) => void;
+        /** A handler for the rowRemoving event. */
+        onRowRemoving?: (e: { data: Object; key: any; cancel: any }) => void;
+        /** A handler for the rowUpdated event. */
+        onRowUpdated?: (e: { data: Object; key: any }) => void;
+        /** A handler for the rowUpdating event. */
+        onRowUpdating?: (e: { oldData: Object; newData: Object; key: any; cancel: any }) => void;
+        /** Enables a hint that appears when a user hovers the mouse pointer over a cell with truncated content. */
+        cellHintEnabled?: boolean;
+        /** Specifies whether or not grid columns can be reordered by a user. */
+        allowColumnReordering?: boolean;
+        /** Specifies whether or not grid columns can be resized by a user. */
+        allowColumnResizing?: boolean;
+        /** A handler for the cellClick event. */
+        onCellClick?: any;
+        /** A handler for the cellHoverChanged event. */
+        onCellHoverChanged?: (e: Object) => void;
+        /** A handler for the cellPrepared event. */
+        onCellPrepared?: (e: Object) => void;
+        /** Specifies whether or not the width of grid columns depends on column content. */
+        columnAutoWidth?: boolean;
+        /** Specifies the options of a column chooser. */
+        columnChooser?: {
+            /** Specifies text displayed by the column chooser panel when it does not contain any columns. */
+            emptyPanelText?: string;
+            /** Specifies whether a user can invoke the column chooser or not. */
+            enabled?: boolean;
+            /** Specifies the height of the column chooser panel. */
+            height?: number;
+            /** Specifies text displayed in the title of the column chooser panel. */
+            title?: string;
+            /** Specifies the width of the column chooser panel. */
+            width?: number;
+        };
+        /** Specifies options for column fixing. */
+        columnFixing?: {
+            /** Indicates if column fixing is enabled. */
+            enabled?: boolean;
+            /** Contains options that specify texts for column-fixing related commands in the column header's context menu. */
+            texts?: {
+                /** Specifies text for a context menu item that fixes the column for which the context menu is invoked. */
+                fix?: string;
+                /** Specifies text for a context menu item that unfixes the column for which the context menu is invoked. */
+                unfix?: string;
+                /** Specifies text for a context menu subitem that fixes a column, for which the context menu is invoked, to the left grid edge. */
+                leftPosition?: string;
+                /** Specifies text for a context menu subitem that fixes a column, for which the context menu is invoked, to the right grid edge. */
+                rightPosition?: string;
+            };
+        };
+        /** Specifies options for filtering using a column header filter. */
+        headerFilter?: {
+            /** Indicates whether or not the column header filter button is visible. */
+            visible?: boolean;
+            /** Specifies the height of the dropdown menu invoked when using a column header filter. */
+            height?: number;
+            /** Specifies the width of the dropdown menu invoked when using a column header filter. */
+            width?: number;
+            /** Contains options that specify texts for the dropdown menu invoked when you use a column header filter. */
+            texts?: {
+                /** Specifies text for the item specifying an empty value in the column header filter's dropdown menu. */
+                emptyValue?: string;
+                /** Specifies text for a button that closes the column header filter's dropdown menu and applies specified filtering. */
+                ok?: string;
+                /** Specifies text for a button that closes the column header filter's dropdown menu without applying performed selection. */
+                cancel?: string;
+            }
+        };
+        /** An array of grid columns. */
+        columns?: Array<dxDataGridColumn>;
+        onContentReady?: Function;
+        /** Specifies a function that customizes grid columns after they are created. */
+        customizeColumns?: (columns: Array<dxDataGridColumn>) => void;
+        /** Specifies a data source for the grid. */
+        dataSource?: any;
+        /** Specifies whether or not to enable data caching. */
+        cacheEnabled?: boolean;
+        /** A handler for the editingStart event. */
+        onEditingStart?: (e: {
+            data: Object;
+            key: any;
+            cancel: boolean;
+            column: dxDataGridColumn
+        }) => void;
+        /** A handler for the editorPrepared event. */
+        onEditorPrepared?: (e: Object) => void;
+        /** A handler for the editorPreparing event. */
+        onEditorPreparing?: (e: Object) => void;
+        /** Contains options that specify how grid content can be changed. */
+        editing?: {
+            editMode?: string;
+            editEnabled?: boolean;
+            insertEnabled?: boolean;
+            removeEnabled?: boolean;
+            /** Specifies how grid values can be edited manually. */
+            mode?: string;
+            /** Specifies whether or not grid records can be edited at runtime. */
+            allowUpdating?: boolean;
+            /** Specifies whether or not new grid records can be added at runtime. */
+            allowAdding?: boolean;
+            /** Specifies whether or not grid records can be deleted at runtime. */
+            allowDeleting?: boolean;
+            /** The form configuration object. Used only when the editing mode is "form". */
+            form?: DevExpress.ui.dxFormOptions;
+            /** Contains options that specify texts for editing-related grid controls. */
+            texts?: {
+                /** Specifies text for a hint that appears when a user hovers the mouse pointer over the "Save" button. Setting this option makes sense only when the editMode option is set to batch. */
+                saveAllChanges?: string;
+                /** Specifies text for a cancel button displayed when a row is in the editing state. Setting this option makes sense only when the allowUpdating option is set to true. */
+                cancelRowChanges?: string;
+                /** Specifies text for a hint that appears when a user hovers the mouse pointer over the "Revert" button. Setting this option makes sense only when the editMode option is set to batch. */
+                cancelAllChanges?: string;
+                /** Specifies a message to be displayed by a confirmation window. Setting this option makes sense only when the edit mode is "row". */
+                confirmDeleteMessage?: string;
+                /** Specifies text to be displayed in the title of a confirmation window. Setting this option makes sense only when the edit mode is "row". */
+                confirmDeleteTitle?: string;
+                /** Specifies text for a hint that appears when a user hovers the mouse pointer over the "Cancel changes" button. Setting this option makes sense only when the editMode option is set to cell and the validation capabilities are enabled. */
+                validationCancelChanges?: string;
+                /** Specifies text for a button that deletes a row from a grid. Setting this option makes sense only when the allowDeleting option is set to true. */
+                deleteRow?: string;
+                /** Specifies text for a hint that appears when a user hovers the mouse pointer over the "Add" button. Setting this option makes sense only when the allowAdding option is true. */
+                addRow?: string;
+                /** Specifies text for a button that turns a row into the editing state. Setting this option makes sense only when the allowUpdating option is set to true. */
+                editRow?: string;
+                /** Specifies text for a save button displayed when a row is in the editing state. Setting this option makes sense only when the allowUpdating option is set to true. */
+                saveRowChanges?: string;
+                /** Specifies text for a button that recovers a deleted row. Setting this option makes sense only if the grid uses the batch edit mode and the allowDeleting option is set to true. */
+                undeleteRow?: string;
+            };
+        };
+        /** Specifies filter row options. */
+        filterRow?: {
+            /** Specifies when to apply a filter. */
+            applyFilter?: string;
+            /** Specifies text for the hint that pops up when a user hovers the mouse pointer over the "Apply Filter" button. */
+            applyFilterText?: string;
+            /** Specifies descriptions for filter operations. */
+            operationDescriptions?: {
+                "=": string;
+                "<>": string;
+                "<": string;
+                "<=": string;
+                ">": string;
+                ">=": string;
+                "startswith": string;
+                "contains": string;
+                "notcontains": string;
+                "endswith": string;
+            };
+            /** Specifies text for the reset operation in a filter list. */
+            resetOperationText?: string;
+            /** Specifies text for the operation of clearing the applied filter when a select box is used. */
+            showAllText?: string;
+            /** Specifies text for the range start in the 'between' filter type. */
+            betweenStartText?: string;
+            /** Specifies text for the range end in the 'between' filter type. */
+            betweenEndText?: string;
+            /** Specifies whether or not an icon that allows the user to choose a filter operation is visible. */
+            showOperationChooser?: boolean;
+            /** Specifies whether the filter row is visible or not. */
+            visible?: boolean;
+        };
+        /** Specifies the behavior of grouped grid records. */
+        grouping?: {
+            /** Specifies whether the user can collapse grouped records in a grid or not. */
+            allowCollapsing?: boolean;
+            /** Specifies whether groups appear expanded or not. */
+            autoExpandAll?: boolean;
+            /** Specifies the message displayed in a group row when the corresponding group is continued from the previous page. */
+            groupContinuedMessage?: string;
+            /** Specifies the message displayed in a group row when the corresponding group continues on the next page. */
+            groupContinuesMessage?: string;
+        };
+        /** Specifies options that configure the group panel. */
+        groupPanel?: {
+            /** Specifies whether columns can be dragged onto or from the group panel. */
+            allowColumnDragging?: boolean;
+            /** Specifies text displayed by the group panel when it does not contain any columns. */
+            emptyPanelText?: string;
+            /** Specifies whether the group panel is visible or not. */
+            visible?: boolean;
+        };
+        /** Specifies options configuring the load panel. */
+        loadPanel?: {
+            /** Specifies whether to show the load panel or not. */
+            enabled?: boolean;
+            /** Specifies the height of the load panel in pixels. */
+            height?: number;
+            /** Specifies a URL pointing to an image to be used as a loading indicator. */
+            indicatorSrc?: string;
+            /** Specifies whether or not a loading indicator must be displayed on the load panel. */
+            showIndicator?: boolean;
+            /** Specifies whether or not the pane of the load panel must be displayed. */
+            showPane?: boolean;
+            /** Specifies text displayed by the load panel. */
+            text?: string;
+            /** Specifies the width of the load panel in pixels. */
+            width?: number;
+        };
+        /** Specifies text displayed when a grid does not contain any records. */
+        noDataText?: string;
+        /** Specifies the options of a grid pager. */
+        pager?: {
+            /** Specifies the page sizes that can be selected at runtime. */
+            allowedPageSizes?: any;
+            /** Specifies whether to show the page size selector or not. */
+            showPageSizeSelector?: boolean;
+            /** Specifies whether to show the pager or not. */
+            visible?: any;
+            /** Specifies the text accompanying the page navigator. */
+            infoText?: string;
+            /** Specifies whether or not to display the text accompanying the page navigator. This text is specified by the infoText option. */
+            showInfo?: boolean;
+            /** Specifies whether or not to display buttons that switch the grid to the previous or next page. */
+            showNavigationButtons?: boolean;
+        };
+        /** Specifies paging options. */
+        paging?: {
+            /** Specifies whether dxDataGrid loads data page by page or all at once. */
+            enabled?: boolean;
+            /** Specifies the grid page that should be displayed by default. */
+            pageIndex?: number;
+            /** Specifies the size of grid pages. */
+            pageSize?: number;
+        };
+        /** Specifies whether or not grid rows must be shaded in a different way. */
+        rowAlternationEnabled?: boolean;
+        /** Specifies whether to enable two-way data binding. */
+        twoWayBindingEnabled?: boolean;
+        /** A handler for the rowClick event. */
+        onRowClick?: any;
+        /** A handler for the rowPrepared event. */
+        onRowPrepared?: (e: Object) => void;
+        /** Specifies a custom template for grid rows. */
+        rowTemplate?: any;
+        /** A configuration object specifying scrolling options. */
+        scrolling?: {
+            /** Specifies the scrolling mode. */
+            mode?: string;
+            /** Specifies whether or not a grid must preload pages adjacent to the current page when using virtual scrolling. */
+            preloadEnabled?: boolean;
+            /** Specifies whether or not the widget uses native scrolling. */
+            useNative?: any;
+            /** Specifies the scrollbar display policy. */
+            showScrollbar?: string;
+            /** Specifies whether or not the scrolling by content is enabled. */
+            scrollByContent?: boolean;
+            /** Specifies whether or not the scrollbar thumb scrolling enabled. */
+            scrollByThumb?: boolean;
+        };
+        /** Specifies options of the search panel. */
+        searchPanel?: {
+            /** Specifies whether or not search strings in the located grid records should be highlighted. */
+            highlightSearchText?: boolean;
+            /** Specifies text displayed by the search panel when no search string was typed. */
+            placeholder?: string;
+            /** Specifies whether the search panel is visible or not. */
+            visible?: boolean;
+            /** Specifies the width of the search panel in pixels. */
+            width?: number;
+            /** Sets a search string for the search panel. */
+            text?: string;
+        };
+        /** Specifies the operations that must be performed on the server side. */
+        remoteOperations?: any;
+        /** Allows you to sort groups according to the values of group summary items. */
+        sortByGroupSummaryInfo?: Array<{
+            /** Specifies the group summary item whose values must be used to sort groups. */
+            summaryItem?: string;
+            /** Specifies the identifier of the column that must be used in grouping so that sorting by group summary item values be applied. */
+            groupColumn?: string;
+            /** Specifies the sort order of group summary item values. */
+            sortOrder?: string;
+        }>;
+        /** Allows you to build a master-detail interface in the grid. */
+        masterDetail?: {
+            /** Enables an end-user to expand/collapse detail sections. */
+            enabled?: boolean;
+            /** Specifies whether detail sections appear expanded or collapsed. */
+            autoExpandAll?: boolean;
+            /** Specifies the template for detail sections. */
+            template?: any;
+        };
+        /** Specifies options for exporting grid data. */
+        export?: {
+            /** Indicates if the export feature is enabled in the grid. */
+            enabled?: boolean;
+            /** Specifies a default name for the file to which grid data is exported. */
+            fileName?: string;
+            /** Specifies whether to enable Excel filtering for the exported data in the resulting XLSX file. */
+            excelFilterEnabled?: boolean;
+            /** Specifies whether to enable word wrapping for the exported data in the resulting XLSX file. */
+            excelWrapTextEnabled?: boolean;
+            /** Specifies the URL of the server-side proxy that streams the resulting file to the end user to enable export in IE8, IE9 and Safari browsers. */
+            proxyUrl?: string;
+            /** Indicates whether to allow end users to export not only the data displayed in the grid, but the selected rows only. */
+            allowExportSelectedData?: boolean;
+            /** Contains options that specify texts for the export-related commands and hints. */
+            texts?: {
+                /** Specifies text for the Export button when this button invokes a dropdown menu so you can choose the required export format. */
+                exportTo?: string;
+                /** Specifies text for the Export button's hint when this button exports to the XSLX format without invoking the drop-down menu. */
+                exportToExcel?: string;
+                /** Specifies text for the item in the Export dropdown menu that exports grid data to Excel. */
+                excelFormat?: string;
+                /** Specifies text for the option in the Export dropdown menu that allows you to choose whether to export all the grid data or the selected rows only. */
+                selectedRows?: string;
+            }
+        };
+        /** Specifies the keys of the records that must appear selected initially. */
+        selectedRowKeys?: Array<any>;
+        /** Specifies options of runtime selection. */
+        selection?: {
+            /** Specifies the checkbox row display policy in the multiple mode. */
+            showCheckBoxesMode?: string;
+            /** Specifies whether the user can select all grid records at once. */
+            allowSelectAll?: boolean;
+            /** Specifies the selection mode. */
+            mode?: string;
+        };
+        /** A handler for the dataErrorOccured event. */
+        onDataErrorOccurred?: (e: { error: Error }) => void;
+        /** A handler for the selectionChanged event. */
+        onSelectionChanged?: (e: {
+            currentSelectedRowKeys: Array<any>;
+            currentDeselectedRowKeys: Array<any>;
+            selectedRowKeys: Array<any>;
+            selectedRowsData: Array<any>;
+        }) => void;
+        /** A handler for the exporting event. */
+        onExporting?: (e: {
+            fileName: string;
+            cancel: boolean;
+        }) => void;
+        /** A handler for the fileSaving event. */
+        onFileSaving?: (e: {
+            fileName: string;
+            format: string;
+            data: any;
+            cancel: boolean;
+        }) => void;
+        /** A handler for the exported event. */
+        onExported?: (e: Object) => void;
+        /** A handler for the keyDown event. */
+        onKeyDown?: (e: Object) => void;
+        /** A handler for the rowExpanding event. */
+        onRowExpanding?: (e: Object) => void;
+        /** A handler for the rowExpanded event. */
+        onRowExpanded?: (e: Object) => void;
+        /** A handler for the rowCollapsing event. */
+        onRowCollapsing?: (e: Object) => void;
+        /** A handler for the rowCollapsed event. */
+        onRowCollapsed?: (e: Object) => void;
+        /** Specifies whether column headers are visible or not. */
+        showColumnHeaders?: boolean;
+        /** Specifies whether or not vertical lines separating one grid column from another are visible. */
+        showColumnLines?: boolean;
+        /** Specifies whether or not horizontal lines separating one grid row from another are visible. */
+        showRowLines?: boolean;
+        /** Specifies options of runtime sorting. */
+        sorting?: {
+            /** Specifies text for the context menu item that sets an ascending sort order in a column. */
+            ascendingText?: string;
+            /** Specifies text for the context menu item that resets sorting settings for a column. */
+            clearText?: string;
+            /** Specifies text for the context menu item that sets a descending sort order in a column. */
+            descendingText?: string;
+            /** Specifies the runtime sorting mode. */
+            mode?: string;
+        };
+        /** Specifies options of state storing. */
+        stateStoring?: {
+            /** Specifies a callback function that performs specific actions on state loading. */
+            customLoad?: () => JQueryPromise<Object>;
+            /** Specifies a callback function that performs specific actions on state saving. */
+            customSave?: (state: Object) => void;
+            /** Specifies whether or not a grid saves its state. */
+            enabled?: boolean;
+            /** Specifies the delay between the last change of a grid state and the operation of saving this state in milliseconds. */
+            savingTimeout?: number;
+            /** Specifies a unique key to be used for storing the grid state. */
+            storageKey?: string;
+            /** Specifies the type of storage to be used for state storing. */
+            type?: string;
+        };
+        /** Specifies the options of the grid summary. */
+        summary?: {
+            /** Contains options that specify text patterns for summary items. */
+            texts?: {
+                /** Specifies a pattern for the 'sum' summary items when they are displayed in the parent column. */
+                sum?: string;
+                /** Specifies a pattern for the 'sum' summary items displayed in a group row or in any other column rather than the parent one. */
+                sumOtherColumn?: string;
+                /** Specifies a pattern for the 'min' summary items when they are displayed in the parent column. */
+                min?: string;
+                /** Specifies a pattern for the 'min' summary items displayed in a group row or in any other column rather than the parent one. */
+                minOtherColumn?: string;
+                /** Specifies a pattern for the 'max' summary items when they are displayed in the parent column. */
+                max?: string;
+                /** Specifies a pattern for the 'max' summary items displayed in a group row or in any other column rather than the parent one. */
+                maxOtherColumn?: string;
+                /** Specifies a pattern for the 'avg' summary items when they are displayed in the parent column. */
+                avg?: string;
+                /** Specifies a pattern for the 'avg' summary items displayed in a group row or in any other column rather than the parent one. */
+                avgOtherColumn?: string;
+                /** Specifies a pattern for the 'count' summary items. */
+                count?: string;
+            };
+            /** Specifies items of the group summary. */
+            groupItems?: Array<{
+                /** Specifies the identifier of a summary item. */
+                name?: string;
+                /** Specifies the column that provides data for a group summary item. */
+                column?: string;
+                /** Customizes the text to be displayed in the summary item. */
+                customizeText?: (itemInfo: {
+                    value: any;
+                    valueText: string;
+                }) => string;
+                /** Specifies a pattern for the summary item text. */
+                displayFormat?: string;
+                /** Specifies a precision for the summary item value of a numeric format. */
+                precision?: number;
+                /** Specifies whether or not a summary item must be displayed in the group footer. */
+                showInGroupFooter?: boolean;
+                /** Indicates whether to display group summary items in parentheses after the group row header or to align them by the corresponding columns within the group row. */
+                alignByColumn?: boolean;
+                /** Specifies the column that must hold the summary item when this item is displayed in the group footer or aligned by a column in the group row. */
+                showInColumn?: string;
+                /** Specifies how to aggregate data for a summary item. */
+                summaryType?: string;
+                /** Specifies a format for the summary item value. */
+                valueFormat?: string;
+                /** Specifies whether or not to skip empty strings, null and undefined values when calculating a summary. */
+                skipEmptyValues?: boolean;
+            }>;
+            /** Specifies items of the total summary. */
+            totalItems?: Array<{
+                /** Specifies the identifier of a summary item. */
+                name?: string;
+                /** Specifies the alignment of a summary item. */
+                alignment?: string;
+                /** Specifies the column that provides data for a summary item. */
+                column?: string;
+                /** Specifies a CSS class to be applied to a summary item. */
+                cssClass?: string;
+                /** Customizes the text to be displayed in the summary item. */
+                customizeText?: (itemInfo: {
+                    value: any;
+                    valueText: string;
+                }) => string;
+                /** Specifies a pattern for the summary item text. */
+                displayFormat?: string;
+                /** Specifies a precision for the summary item value of a numeric format. */
+                precision?: number;
+                /** Specifies the column that must hold the summary item. */
+                showInColumn?: string;
+                /** Specifies how to aggregate data for a summary item. */
+                summaryType?: string;
+                /** Specifies a format for the summary item value. */
+                valueFormat?: string;
+                /** Specifies whether or not to skip empty strings, null and undefined values when calculating a summary. */
+                skipEmptyValues?: boolean;
+            }>;
+            /** Specifies whether or not to skip empty strings, null and undefined values when calculating a summary. */
+            skipEmptyValues?: boolean;
+            /** Allows you to use a custom aggregate function to calculate the value of a summary item. */
+            calculateCustomSummary?: (options: {
+                component: dxDataGrid;
+                name?: string;
+                value: any;
+                totalValue: any;
+                summaryProcess: string
+            }) => void;
+        };
+        /** Specifies whether text that does not fit into a column should be wrapped. */
+        wordWrapEnabled?: boolean;
+    }
+    /** A data grid widget. */
+    export class dxDataGrid extends Widget {
+        constructor(element: JQuery, options?: dxDataGridOptions);
+        constructor(element: Element, options?: dxDataGridOptions);
+        /** Ungroups grid records. */
+        clearGrouping(): void;
+        /** Clears sorting settings of all grid columns at once. */
+        clearSorting(): void;
+        /** Allows you to obtain a cell by its row index and the data field of its column. */
+        getCellElement(rowIndex: number, dataField: string): any;
+        /** Allows you to obtain a cell by its row index and the visible index of its column. */
+        getCellElement(rowIndex: number, visibleColumnIndex: number): any;
+        /** Returns the current state of the grid. */
+        state(): Object;
+        /** Sets the grid state. */
+        state(state: Object): void;
+        /** Allows you to obtain the row index by a data key. */
+        getRowIndexByKey(key: any): number;
+        /** Allows you to obtain the data key by a row index. */
+        getKeyByRowIndex(rowIndex: number): any;
+        /** Adds a new column to a grid. */
+        addColumn(columnOptions: dxDataGridColumn): void;
+        /** Removes the column from the grid. */
+        deleteColumn(id: any): void;
+        /** Displays the load panel. */
+        beginCustomLoading(messageText: string): void;
+        /** Discards changes made in a grid. */
+        cancelEditData(): void;
+        /** Checks whether or not the grid contains unsaved changes. */
+        hasEditData(): boolean;
+        /** Clears all the filters of a specific type applied to grid records. */
+        clearFilter(): void;
+        /** Deselects all grid records. */
+        clearSelection(): void;
+        /** Draws the cell being edited from the editing state. Use this method when the edit mode is batch. */
+        closeEditCell(): void;
+        /** Collapses groups or master rows in a grid. */
+        collapseAll(groupIndex?: number): void;
+        /** Returns the number of data columns in a grid. */
+        columnCount(): number;
+        /** Returns the value of a specific column option. */
+        columnOption(id: any, optionName: string): any;
+        /** Sets an option of a specific column. */
+        columnOption(id: any, optionName: string, optionValue: any): void;
+        /** Returns the options of a column by an identifier. */
+        columnOption(id: any): Object;
+        /** Sets several options of a column at once. */
+        columnOption(id: any, options: Object): void;
+        /** Sets a specific cell into the editing state. */
+        editCell(rowIndex: number, visibleColumnIndex: number): void;
+        /** Sets a specific cell into the editing state. */
+        editCell(rowIndex: number, dataField: string): void;
+        /** Sets a specific row into the editing state. */
+        editRow(rowIndex: number): void;
+        /** Gets the cell value. */
+        cellValue(rowIndex: number, dataField: string): any;
+        /** Gets the cell value. */
+        cellValue(rowIndex: number, visibleColumnIndex: number): any;
+        /** Sets the cell value. */
+        cellValue(rowIndex: number, dataField: string, value: any): void;
+        /** Sets the cell value. */
+        cellValue(rowIndex: number, visibleColumnIndex: number, value: any): void;
+        /** Hides the load panel. */
+        endCustomLoading(): void;
+        /** Expands groups or master rows in a grid. */
+        expandAll(groupIndex: number): void;
+        /** Allows you to find out whether a specific group or master row is expanded or collapsed. */
+        isRowExpanded(key: any): boolean;
+        /** Allows you to expand a specific group or master row by its key. */
+        expandRow(key: any): void;
+        /** Allows you to collapse a specific group or master row by its key. */
+        collapseRow(key: any): void;
+        /** Applies a filter to the grid's data source. */
+        filter(filterExpr?: any): void;
+        /** Returns a filter expression applied to the grid's data source using the filter(filterExpr) method. */
+        filter(): any;
+        /** Returns a filter expression applied to the grid using all possible scenarious. */
+        getCombinedFilter(): any;
+        /** Gets the keys of currently selected grid records. */
+        getSelectedRowKeys(): Array<Object>;
+        /** Gets the data objects of currently selected grid records. */
+        getSelectedRowsData(): Array<Object>;
+        /** Hides the column chooser panel. */
+        hideColumnChooser(): void;
+        /** Adds a new data row to a grid. */
+        addRow(): void;
+        /**
+         * Adds a new data row to a grid.
+         * @deprecated Use the addRow() method instead.
+         */
+        insertRow(): void;
+        /** Returns the key corresponding to the passed data object. */
+        keyOf(obj: Object): any;
+        /** Switches a grid to a specified page. */
+        pageIndex(newIndex: number): void;
+        /** Gets the index of the current page. */
+        pageIndex(): number;
+        /** Sets the page size. */
+        pageSize(value: number): void;
+        /** Gets the current page size. */
+        pageSize(): number;
+        /** Refreshes grid data. */
+        refresh(): void;
+        /** Removes a specific row from a grid. */
+        deleteRow(rowIndex: number): void;
+        /**
+         * Removes a specific row from a grid.
+         * @deprecated Use the deleteRow() method instead.
+         */
+        removeRow(rowIndex: number): void;
+        /** Saves changes made in a grid. */
+        saveEditData(): void;
+        /** Searches grid records by a search string. */
+        searchByText(text: string): void;
+        /** Selects all grid records. */
+        selectAll(): void;
+        /** Deselects the rows that are currently selected within the applied filter. */
+        deselectAll(): void;
+        /** Selects specific grid records. */
+        selectRows(keys: Array<any>, preserve: boolean): void;
+        /** Deselects specific grid records. */
+        deselectRows(keys: Array<any>): void;
+        /** Selects grid rows by indexes. */
+        selectRowsByIndexes(indexes: Array<any>): void;
+        /** Allows you to find out whether a row is selected or not. */
+        isRowSelected(key: any): boolean;
+        /** Invokes the column chooser panel. */
+        showColumnChooser(): void;
+        startSelectionWithCheckboxes(): boolean;
+        /** Returns the number of records currently held by a grid. */
+        totalCount(): number;
+        /** Recovers a row deleted in the batch edit mode. */
+        undeleteRow(rowIndex: number): void;
+        /** Allows you to obtain a data object by its key. */
+        byKey(key: any): JQueryPromise<any>;
+        /** Gets the value of a total summary item. */
+        getTotalSummaryValue(summaryItemName: string): any;
+        /** Exports grid data to Excel. */
+        exportToExcel(selectionOnly: boolean): void;
+        /** Updates the grid to the size of its content. */
+        updateDimensions(): void;
+        /** Focuses the specified cell element in the grid. */
+        focus(element?: JQuery): void;
+    }
+    export interface dxPivotGridOptions extends WidgetOptions {
+        onContentReady?: Function;
+        /** Specifies a data source for the pivot grid. */
+        dataSource?: any;
+        useNativeScrolling?: any;
+        /** A configuration object specifying scrolling options. */
+        scrolling?: {
+            /** Specifies the scrolling mode. */
+            mode?: string;
+            /** Specifies whether or not the widget uses native scrolling. */
+            useNative?: any;
+        };
+        /** Allows an end-user to change sorting options. */
+        allowSorting?: boolean;
+        /** Allows an end-user to sort columns by summary values. */
+        allowSortingBySummary?: boolean;
+        /** Allows an end-user to change filtering options. */
+        allowFiltering?: boolean;
+        /** Allows an end-user to expand/collapse all header items within a header level. */
+        allowExpandAll?: boolean;
+        /** Specifies whether to display the Total rows. */
+        showRowTotals?: boolean;
+        /** Specifies whether to display the Grand Total row. */
+        showRowGrandTotals?: boolean;
+        /** Specifies whether to display the Total columns. */
+        showColumnTotals?: boolean;
+        /** Specifies whether to display the Grand Total column. */
+        showColumnGrandTotals?: boolean;
+        /** Specifies whether or not to hide rows and columns with no data. */
+        hideEmptySummaryCells?: boolean;
+        /** Specifies where to show the total rows or columns. */
+        showTotalsPrior?: string;
+        /** Specifies whether the outer borders of the grid are visible or not. */
+        showBorders?: boolean;
+        /** The Field Chooser configuration options. */
+        fieldChooser?: {
+            /** Enables or disables the field chooser. */
+            enabled?: boolean;
+            /** Specifies the field chooser layout. */
+            layout?: number;
+            /** Specifies the text to display as a title of the field chooser popup window. */
+            title?: string;
+            /** Specifies the field chooser width. */
+            width?: number;
+            /** Specifies the field chooser height. */
+            height?: number;
+            /** Strings that can be changed or localized in the pivot grid's integrated Field Chooser. */
+            texts?: {
+                /** The string to display instead of Row Fields. */
+                rowFields?: string;
+                /** The string to display instead of Column Fields. */
+                columnFields?: string;
+                /** The string to display instead of Data Fields. */
+                dataFields?: string;
+                /** The string to display instead of Filter Fields. */
+                filterFields?: string;
+                /** The string to display instead of All Fields. */
+                allFields?: string;
+            };
+        }
+        /** Strings that can be changed or localized in the dxPivotGrid widget. */
+        texts?: {
+            /** The string to display as a header of the Grand Total row and column. */
+            grandTotal?: string;
+            /** The string to display as a header of the Total row and column. */
+            total?: string;
+            /** Specifies the text displayed when a pivot grid does not contain any fields. */
+            noData?: string;
+            /** The string to display as a Show Field Chooser context menu item. */
+            showFieldChooser?: string;
+            /** The string to display as an Expand All context menu item. */
+            expandAll?: string;
+            /** The string to display as a Collapse All context menu item. */
+            collapseAll?: string;
+            /** The string to display as a Sort Column by Summary Value context menu item. */
+            sortColumnBySummary?: string;
+            /** The string to display as a Sort Row by Summary Value context menu item. */
+            sortRowBySummary?: string;
+            /** The string to display as a Remove All Sorting context menu item. */
+            removeAllSorting?: string;
+            /** The string to display as an Export to Excel file context menu item. */
+            exportToExcel?: string;
+        };
+        /** Specifies options configuring the load panel. */
+        loadPanel?: {
+            /** Enables or disables the load panel. */
+            enabled?: boolean;
+            /** Specifies the height of the load panel. */
+            height?: number;
+            /** Specifies the URL pointing to an image that will be used as a load indicator. */
+            indicatorSrc?: string;
+            /** Specifies whether or not to show a load indicator. */
+            showIndicator?: boolean;
+            /** Specifies whether or not to show load panel background. */
+            showPane?: boolean;
+            /** Specifies the text to display inside a load panel. */
+            text?: string;
+            /** Specifies the width of the load panel. */
+            width?: number;
+        };
+        /** A handler for the cellClick event. */
+        onCellClick?: (e: any) => void;
+        /** A handler for the cellPrepared event. */
+        onCellPrepared?: (e: any) => void;
+        /** A handler for the contextMenuPreparing event. */
+        onContextMenuPreparing?: (e: Object) => void;
+        /** Specifies options for exporting pivot grid data. */
+        export?: {
+            /** Indicates whether the export feature is enabled for the pivot grid. */
+            enabled?: boolean;
+            /** Specifies a default name for the file to which grid data is exported. */
+            fileName?: string;
+            /** Specifies the URL of the server-side proxy that streams the resulting file to the end user to enable export in IE8, IE9 and Safari browsers. */
+            proxyUrl?: string;
+        };
+        /** A handler for the exporting event. */
+        onExporting?: (e: {
+            fileName: string;
+            cancel: boolean;
+        }) => void;
+        /** A handler for the fileSaving event. */
+        onFileSaving?: (e: {
+            fileName: string;
+            format: string;
+            data: any;
+            cancel: boolean;
+        }) => void;
+        /** A handler for the exported event. */
+        onExported?: (e: Object) => void;
+        /** A configuration object specifying options related to state storing. */
+        stateStoring?: {
+            /** Specifies a callback function that performs specific actions on state loading. */
+            customLoad?: () => JQueryPromise<Object>;
+            /** Specifies a callback function that performs specific actions on state saving. */
+            customSave?: (gridState: Object) => void;
+            /** Specifies whether or not a grid saves its state. */
+            enabled?: boolean;
+            /** Specifies the delay between the last change of a grid state and the operation of saving this state in milliseconds. */
+            savingTimeout?: number;
+            /** Specifies a unique key to be used for storing the grid state. */
+            storageKey?: string;
+            /** Specifies the type of storage to be used for state storing. */
+            type?: string;
+        };
+    }
+    /** A data summarization widget for multi-dimensional data analysis and data mining. */
+    export class dxPivotGrid extends Widget {
+        constructor(element: JQuery, options?: dxPivotGridOptions);
+        constructor(element: Element, options?: dxPivotGridOptions);
+        /** Gets the PivotGridDataSource instance. */
+        getDataSource(): DevExpress.data.PivotGridDataSource;
+        /** Gets the dxPopup instance of the field chooser window. */
+        getFieldChooserPopup(): DevExpress.ui.dxPopup;
+        /** Updates the widget to the size of its content. */
+        updateDimensions(): void;
+        /** Exports pivot grid data to the Excel file. */
+        exportToExcel(): void;
+    }
+    export interface dxPivotGridFieldChooserOptions extends WidgetOptions {
+        /** Specifies the height of the widget. */
+        height?: any;
+        /** Specifies the field chooser layout. */
+        layout?: number;
+        /** The data source of a dxPivotGrid widget. */
+        dataSource?: DevExpress.data.PivotGridDataSource;
+        onContentReady?: Function;
+        /** Strings that can be changed or localized in the dxPivotGridFieldChooser widget. */
+        texts?: {
+            /** The string to display instead of Row Fields. */
+            rowFields?: string;
+            /** The string to display instead of Column Fields. */
+            columnFields?: string;
+            /** The string to display instead of Data Fields. */
+            dataFields?: string;
+            /** The string to display instead of Filter Fields. */
+            filterFields?: string;
+            /** The string to display instead of All Fields. */
+            allFields?: string;
+        };
+    }
+    /** A complementary widget for dxPivotGrid that allows you to manage data displayed in the dxPivotGrid. */
+    export class dxPivotGridFieldChooser extends Widget {
+        constructor(element: JQuery, options?: dxPivotGridFieldChooserOptions);
+        constructor(element: Element, options?: dxPivotGridFieldChooserOptions);
+        /** Updates the widget to the size of its content. */
+        updateDimensions(): void;
+    }
+}
+interface JQuery {
+    dxTreeView(): JQuery;
+    dxTreeView(options: "instance"): DevExpress.ui.dxTreeView;
+    dxTreeView(options: string): any;
+    dxTreeView(options: string, ...params: any[]): any;
+    dxTreeView(options: DevExpress.ui.dxTreeViewOptions): JQuery;
+    dxMenuBase(): JQuery;
+    dxMenuBase(options: "instance"): DevExpress.ui.dxMenuBase;
+    dxMenuBase(options: string): any;
+    dxMenuBase(options: string, ...params: any[]): any;
+    dxMenuBase(options: DevExpress.ui.dxMenuBaseOptions): JQuery;
+    dxMenu(): JQuery;
+    dxMenu(options: "instance"): DevExpress.ui.dxMenu;
+    dxMenu(options: string): any;
+    dxMenu(options: string, ...params: any[]): any;
+    dxMenu(options: DevExpress.ui.dxMenuOptions): JQuery;
+    dxContextMenu(): JQuery;
+    dxContextMenu(options: "instance"): DevExpress.ui.dxContextMenu;
+    dxContextMenu(options: string): any;
+    dxContextMenu(options: string, ...params: any[]): any;
+    dxContextMenu(options: DevExpress.ui.dxContextMenuOptions): JQuery;
+    dxColorBox(): JQuery;
+    dxColorBox(options: "instance"): DevExpress.ui.dxColorBox;
+    dxColorBox(options: string): any;
+    dxColorBox(options: string, ...params: any[]): any;
+    dxColorBox(options: DevExpress.ui.dxColorBoxOptions): JQuery;
+    dxDataGrid(): JQuery;
+    dxDataGrid(options: "instance"): DevExpress.ui.dxDataGrid;
+    dxDataGrid(options: string): any;
+    dxDataGrid(options: string, ...params: any[]): any;
+    dxDataGrid(options: DevExpress.ui.dxDataGridOptions): JQuery;
+    dxPivotGrid(): JQuery;
+    dxPivotGrid(options: "instance"): DevExpress.ui.dxPivotGrid;
+    dxPivotGrid(options: string): any;
+    dxPivotGrid(options: string, ...params: any[]): any;
+    dxPivotGrid(options: DevExpress.ui.dxPivotGridOptions): JQuery;
+    dxPivotGridFieldChooser(): JQuery;
+    dxPivotGridFieldChooser(options: "instance"): DevExpress.ui.dxPivotGridFieldChooser;
+    dxPivotGridFieldChooser(options: string): any;
+    dxPivotGridFieldChooser(options: string, ...params: any[]): any;
+    dxPivotGridFieldChooser(options: DevExpress.ui.dxPivotGridFieldChooserOptions): JQuery;
+    dxScheduler(): JQuery;
+    dxScheduler(options: "instance"): DevExpress.ui.dxScheduler;
+    dxScheduler(options: string): any;
+    dxScheduler(options: string, ...params: any[]): any;
+    dxScheduler(options: DevExpress.ui.dxSchedulerOptions): JQuery;
+}
+declare module DevExpress.framework {
+    /** An object used to store information on the views displayed in an application. */
+    export class ViewCache {
+        viewRemoved: JQueryCallback;
+        /** Removes all the viewInfo objects from the cache. */
+        clear(): void;
+        /** Obtains a viewInfo object from the cache by the specified key. */
+        getView(key: string): Object;
+        /** Checks whether or not a viewInfo object is contained in the view cache under the specified key. */
+        hasView(key: string): boolean;
+        /** Removes a viewInfo object from the cache by the specified key. */
+        removeView(key: string): Object;
+        /** Adds the specified viewInfo object to the cache under the specified key. */
+        setView(key: string, viewInfo: Object): void;
+    }
+    export interface dxCommandOptions extends DOMComponentOptions {
+        /** Specifies an action performed when the execute() method of the command is called. */
+        onExecute?: any;
+        /** Indicates whether or not the widget that displays this command is disabled. */
+        disabled?: boolean;
+        /** Specifies whether the current command is rendered when a view is being rendered or after a view is shown. */
+        renderStage?: string;
+        /** Specifies the name of the icon shown inside the widget associated with this command. */
+        icon?: string;
+        iconSrc?: string;
+        /** The identifier of the command. */
+        id?: string;
+        /** Specifies the title of the widget associated with this command. */
+        title?: string;
+        /** Specifies the type of the button, if the command is rendered as a dxButton widget. */
+        type?: string;
+        /** A Boolean value specifying whether or not the widget associated with this command is visible. */
+        visible?: boolean;
+    }
+    /** A markup component used to define markup options for a command. */
+    export class dxCommand extends DOMComponent {
+        constructor(element: JQuery, options: dxCommandOptions);
+        constructor(options: dxCommandOptions);
+        /** Executes the action associated with this command. */
+        execute(): void;
+    }
+    /** An object responsible for routing. */
+    export class Router {
+        /** Adds a routing rule to the list of registered rules. */
+        register(pattern: string, defaults?: Object, constraints?: Object): void;
+        /** Decodes the specified URI to an object using the registered routing rules. */
+        parse(uri: string): Object;
+        /** Formats an object to a URI. */
+        format(obj: Object): string;
+    }
+    export interface StateManagerOptions {
+        /** A storage to which the state manager saves the application state. */
+        storage?: Object;
+    }
+    /** An object used to store the current application state. */
+    export class StateManager {
+        constructor(options?: StateManagerOptions);
+        /** Adds an object that implements an interface of a state source to the state manager's collection of state sources. */
+        addStateSource(stateSource: Object): void;
+        /** Removes a specified state source from the state manager's collection of state sources. */
+        removeStateSource(stateSource: Object): void;
+        /** Saves the current application state. */
+        saveState(): void;
+        /** Restores the application state that has been saved by the saveState() method to the state storage. */
+        restoreState(): void;
+        /** Removes the application state that has been saved by the saveState() method to the state storage. */
+        clearState(): void;
+    }
+    export module html {
+        export var layoutSets: Array<string>;
+        export var animationSets: { [animationSetName: string]: AnimationSet };
+        export interface AnimationSet {
+            [animationName: string]: any
+        }
+        export interface HtmlApplicationOptions {
+            /** Specifies where the commands that are defined in the application's views must be displayed. */
+            commandMapping?: Object;
+            /** Specifies whether or not view caching is disabled. */
+            disableViewCache?: boolean;
+            /** An array of layout controllers that should be used to show application views in the current navigation context. */
+            layoutSet?: any;
+            /** Specifies the animation presets that are used to animate different UI elements in the current application. */
+            animationSet?: AnimationSet;
+            /** Specifies whether the current application must behave as a mobile or web application. */
+            mode?: string;
+            /** Specifies the object that represents a root namespace of the application. */
+            namespace?: Object;
+            /** Specifies application behavior when the user navigates to a root view. */
+            navigateToRootViewMode?: string;
+            /** An array of dxCommand configuration objects used to define commands available from the application's global navigation. */
+            navigation?: Array<any>;
+            /** A state manager to be used in the application. */
+            stateManager?: StateManager;
+            /** Specifies the storage to be used by the application's state manager to store the application state. */
+            stateStorage?: Object;
+            /** Indicates whether on not to use the title of the previously displayed view as text on the Back button. */
+            useViewTitleAsBackText?: boolean;
+            /** A custom view cache to be used in the application. */
+            viewCache?: Object;
+            /** Specifies a limit for the views that can be cached. */
+            viewCacheSize?: number;
+            /** Specifies the current version of application templates. */
+            templatesVersion?: string;
+            /** Specifies options for the viewport meta tag of a mobile browser. */
+            viewPort?: JQuery;
+            /** A custom router to be used in the application. */
+            router?: Router;
+        }
+        /** An object used to manage views, as well as control the application life cycle. */
+        export class HtmlApplication implements EventsMixin<HtmlApplication> {
+            constructor(options: HtmlApplicationOptions);
+            afterViewSetup: JQueryCallback;
+            beforeViewSetup: JQueryCallback;
+            initialized: JQueryCallback;
+            navigating: JQueryCallback;
+            navigatingBack: JQueryCallback;
+            resolveLayoutController: JQueryCallback;
+            resolveViewCacheKey: JQueryCallback;
+            viewDisposed: JQueryCallback;
+            viewDisposing: JQueryCallback;
+            viewHidden: JQueryCallback;
+            viewRendered: JQueryCallback;
+            viewShowing: JQueryCallback;
+            viewShown: JQueryCallback;
+            /** Provides access to the ViewCache object. */
+            viewCache: ViewCache;
+            /** An array of dxCommand components that are created based on the application's navigation option value. */
+            navigation: Array<any>;
+            /** Provides access to the StateManager object. */
+            stateManager: StateManager;
+            /** Provides access to the Router object. */
+            router: Router;
+            /** Navigates to the URI preceding the current one in the navigation history. */
+            back(): void;
+            /** Returns a Boolean value indicating whether or not backwards navigation is currently possible. */
+            canBack(): boolean;
+            /** Calls the clearState() method of the application's StateManager object. */
+            clearState(): void;
+            /** Creates global navigation commands. */
+            createNavigation(navigationConfig: Array<any>): void;
+            /** Returns an HTML template of the specified view. */
+            getViewTemplate(viewName: string): JQuery;
+            /** Returns a configuration object used to create a dxView component for a specified view. */
+            getViewTemplateInfo(viewName: string): Object;
+            /** Adds a specified HTML template to a collection of view or layout templates. */
+            loadTemplates(source: any): JQueryPromise<any>;
+            /** Navigates to the specified URI. */
+            navigate(uri?: any, options?: Object): void;
+            /** Renders navigation commands to the navigation command containers that are located in the layouts used in the application. */
+            renderNavigation(): void;
+            /** Calls the restoreState() method of the application's StateManager object. */
+            restoreState(): void;
+            /** Calls the saveState method of the application's StateManager object. */
+            saveState(): void;
+            /** Provides access to the object that defines the current context to be considered when choosing an appropriate template for a view. */
+            templateContext(): Object;
+            on(eventName: "initialized", eventHandler: () => void): HtmlApplication;
+            on(eventName: "afterViewSetup", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            on(eventName: "beforeViewSetup", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            on(eventName: "navigating", eventHandler: (e: {
+                currentUri: string;
+                uri: string;
+                cancel: boolean;
+                options: {
+                    root: boolean;
+                    target: string;
+                    direction: string;
+                    rootInDetailPane: boolean;
+                    modal: boolean;
+                };
+            }) => void): HtmlApplication;
+            on(eventName: "navigatingBack", eventHandler: (e: {
+                cancel: boolean;
+                isHardwareButton: boolean;
+            }) => void): HtmlApplication;
+            on(eventName: "resolveLayoutController", eventHandler: (e: {
+                viewInfo: Object;
+                layoutController: Object;
+                availableLayoutControllers: Array<Object>;
+            }) => void): HtmlApplication;
+            on(eventName: "resolveViewCacheKey", eventHandler: (e: {
+                key: string;
+                navigationItem: Object;
+                routeData: Object;
+            }) => void): HtmlApplication;
+            on(eventName: "viewDisposed", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            on(eventName: "viewDisposing", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            on(eventName: "viewHidden", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            on(eventName: "viewRendered", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            on(eventName: "viewShowing", eventHandler: (e: {
+                viewInfo: Object;
+                direction: string;
+            }) => void): HtmlApplication;
+            on(eventName: "viewShown", eventHandler: (e: {
+                viewInfo: Object;
+                direction: string;
+            }) => void): HtmlApplication;
+            on(eventName: string, eventHandler: Function): HtmlApplication;
+            on(events: { [eventName: string]: Function; }): HtmlApplication;
+            off(eventName: "initialized"): HtmlApplication;
+            off(eventName: "afterViewSetup"): HtmlApplication;
+            off(eventName: "beforeViewSetup"): HtmlApplication;
+            off(eventName: "navigating"): HtmlApplication;
+            off(eventName: "navigatingBack"): HtmlApplication;
+            off(eventName: "resolveLayoutController"): HtmlApplication;
+            off(eventName: "resolveViewCacheKey"): HtmlApplication;
+            off(eventName: "viewDisposed"): HtmlApplication;
+            off(eventName: "viewDisposing"): HtmlApplication;
+            off(eventName: "viewHidden"): HtmlApplication;
+            off(eventName: "viewRendered"): HtmlApplication;
+            off(eventName: "viewShowing"): HtmlApplication;
+            off(eventName: "viewShown"): HtmlApplication;
+            off(eventName: string): HtmlApplication;
+            off(eventName: "initialized", eventHandler: () => void): HtmlApplication;
+            off(eventName: "afterViewSetup", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            off(eventName: "beforeViewSetup", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            off(eventName: "navigating", eventHandler: (e: {
+                currentUri: string;
+                uri: string;
+                cancel: boolean;
+                options: {
+                    root: boolean;
+                    target: string;
+                    direction: string;
+                    rootInDetailPane: boolean;
+                    modal: boolean;
+                };
+            }) => void): HtmlApplication;
+            off(eventName: "navigatingBack", eventHandler: (e: {
+                cancel: boolean;
+                isHardwareButton: boolean;
+            }) => void): HtmlApplication;
+            off(eventName: "resolveLayoutController", eventHandler: (e: {
+                viewInfo: Object;
+                layoutController: Object;
+                availableLayoutControllers: Array<Object>;
+            }) => void): HtmlApplication;
+            off(eventName: "resolveViewCacheKey", eventHandler: (e: {
+                key: string;
+                navigationItem: Object;
+                routeData: Object;
+            }) => void): HtmlApplication;
+            off(eventName: "viewDisposed", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            off(eventName: "viewDisposing", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            off(eventName: "viewHidden", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            off(eventName: "viewRendered", eventHandler: (e: {
+                viewInfo: Object;
+            }) => void): HtmlApplication;
+            off(eventName: "viewShowing", eventHandler: (e: {
+                viewInfo: Object;
+                direction: string;
+            }) => void): HtmlApplication;
+            off(eventName: "viewShown", eventHandler: (e: {
+                viewInfo: Object;
+                direction: string;
+            }) => void): HtmlApplication;
+            off(eventName: string, eventHandler: Function): HtmlApplication;
+        }
+    }
+}
+declare module DevExpress.viz.core {
+    /**
+     * Applies a theme for the entire page with several DevExtreme visualization widgets.
+     * @deprecated Use the DevExpress.viz.currentTheme(theme) method instead.
+     */
+    export function currentTheme(theme: string): void;
+    /**
+     * Applies a new theme (with the color scheme defined separately) for the entire page with several DevExtreme visualization widgets.
+     * @deprecated Use the DevExpress.viz.currentTheme(platform, colorScheme) method instead.
+     */
+    export function currentTheme(platform: string, colorScheme: string): void;
+    /**
+     * Registers a new theme based on the existing one.
+     * @deprecated Use the DevExpress.viz.registerTheme(customTheme, baseTheme) method instead.
+     */
+    export function registerTheme(customTheme: Object, baseTheme: string): void;
+    /**
+     * Applies a predefined or registered custom palette to all visualization widgets at once.
+     * @deprecated Use the DevExpress.viz.currentPalette(paletteName) method instead.
+     */
+    export function currentPalette(paletteName: string): void;
+    /**
+     * Obtains the color sets of a predefined or registered palette.
+     * @deprecated Use the DevExpress.viz.getPalette(paletteName) method instead.
+     */
+    export function getPalette(paletteName: string): Object;
+    /**
+     * Registers a new palette.
+     * @deprecated Use the DevExpress.viz.registerPalette(paletteName, palette) method instead.
+     */
+    export function registerPalette(paletteName: string, palette: Object): void;
+    export interface Border {
+        /** Sets a border color for a selected series. */
+        color?: string;
+        /** Sets border visibility for a selected series. */
+        visible?: boolean;
+        /** Sets a border width for a selected series. */
+        width?: number;
+    }
+    export interface DashedBorder extends Border {
+        /** Specifies a dash style for the border of a selected series point. */
+        dashStyle?: string;
+    }
+    export interface DashedBorderWithOpacity extends DashedBorder {
+        /** Specifies the opacity of the tooltip's border. */
+        opacity?: number;
+    }
+    export interface Font {
+        /** Specifies the font color for a strip label. */
+        color?: string;
+        /** Specifies the font family for a strip label. */
+        family?: string;
+        /** Specifies the font opacity for a strip label. */
+        opacity?: number;
+        /** Specifies the font size for a strip label. */
+        size?: any;
+        /** Specifies the font weight for the text displayed in strips. */
+        weight?: number;
+    }
+    export interface Hatching {
+        direction?: string;
+        /** Specifies the opacity of hatching lines. */
+        opacity?: number;
+        /** Specifies the distance between hatching lines in pixels. */
+        step?: number;
+        /** Specifies the width of hatching lines in pixels. */
+        width?: number;
+    }
+    export interface Margins {
+        /** Specifies the distance in pixels between the bottom side of the title and the surrounding widget elements. */
+        bottom?: number;
+        /** Specifies the distance in pixels between the left side of the title and the surrounding widget elements. */
+        left?: number;
+        /** Specifies the distance between the right side of the title and surrounding widget elements in pixels. */
+        right?: number;
+        /** Specifies the distance between the top side of the title and surrounding widget elements in pixels. */
+        top?: number;
+    }
+    export interface Size {
+        /** Specifies the width of the widget. */
+        width?: number;
+        /** Specifies the height of the widget. */
+        height?: number;
+    }
+    export interface Title {
+        /** Specifies font options for the title. */
+        font?: viz.core.Font;
+        /** Specifies the widget title's horizontal position. */
+        horizontalAlignment?: string;
+       /** Specifies the widget title's position in the vertical direction. */
+        verticalAlignment?: string;
+        /** Specifies the distance between the title and surrounding widget elements in pixels. */
+        margin?: viz.core.Margins;
+         /** Specifies the height of the space reserved for the title. */
+        placeholderSize?: number;
+        /** Specifies text for the title. */
+        text?: string;
+        /** Specifies a subtitle for the widget. */
+        subtitle?: {
+            /** Specifies font options for the subtitle. */
+            font?: viz.core.Font;
+           /** Specifies text for the subtitle. */
+            text?: string;
+        }
+    }
+    export interface Tooltip {
+        /** Specifies the length of the tooltip's arrow in pixels. */
+        arrowLength?: number;
+        /** Specifies the appearance of the tooltip's border. */
+        border?: viz.core.DashedBorderWithOpacity;
+        /** Specifies a color for the tooltip. */
+        color?: string;
+        /** Specifies the z-index for tooltips. */
+        zIndex?: number;
+        /** Specifies the container to draw tooltips inside of it. */
+        container?: any;
+        /** Specifies text and appearance of a set of tooltips. */
+        customizeTooltip?: (arg: Object) => { color?: string; text?: string };
+        /** Specifies whether or not the tooltip is enabled. */
+        enabled?: boolean;
+        /** Specifies font options for the text displayed by the tooltip. */
+        font?: Font;
+        /** Specifies a format for the text displayed by the tooltip. */
+        format?: string;
+        /** Specifies the opacity of a tooltip. */
+        opacity?: number;
+        /** Specifies a distance from the tooltip's left/right boundaries to the inner text in pixels. */
+        paddingLeftRight?: number;
+        /** Specifies a distance from the tooltip's top/bottom boundaries to the inner text in pixels. */
+        paddingTopBottom?: number;
+        /** Specifies a precision for formatted values displayed by the tooltip. */
+        precision?: number;
+        /** Specifies options of the tooltip's shadow. */
+        shadow?: {
+            /** Specifies the blur distance of the tooltip's shadow. */
+            blur?: number;
+            /** Specifies the color of the tooltip's shadow. */
+            color?: string;
+            /** Specifies the horizontal offset of the tooltip's shadow relative to the tooltip in pixels. */
+            offsetX?: number;
+            /** Specifies the vertical offset of the tooltip's shadow relative to the tooltip in pixels. */
+            offsetY?: number;
+            /** Specifies the opacity of the tooltip's shadow. */
+            opacity?: number;
+        };
+    }
+    export interface Animation {
+        /** Determines how long animation runs. */
+        duration?: number;
+        /** Specifies the animation easing mode. */
+        easing?: string;
+        /** Indicates whether or not animation is enabled. */
+        enabled?: boolean;
+    }
+    export interface LoadingIndicator {
+        /** Specifies a color for the loading indicator background. */
+        backgroundColor?: string;
+        /** Specifies font options for the loading indicator text. */
+        font?: viz.core.Font;
+        /** Specifies whether to show the loading indicator or not. */
+        show?: boolean;
+        /** Specifies a text to be displayed by the loading indicator. */
+        text?: string;
+    }
+    export interface LegendBorder extends viz.core.DashedBorderWithOpacity {
+        /** Specifies a radius for the corners of the legend border. */
+        cornerRadius?: number;
+    }
+    export interface BaseLegend {
+        /** Specifies the color of the legend's background. */
+        backgroundColor?: string;
+        /** Specifies legend border settings. */
+        border?: viz.core.LegendBorder;
+        /** Specifies how many columns must be taken to arrange legend items. */
+        columnCount?: number;
+        /** Specifies the spacing between a pair of neighboring legend columns in pixels. */
+        columnItemSpacing?: number;
+        /** Specifies font options for legend items. */
+        font?: viz.core.Font;
+        /** Specifies the legend's position on the map. */
+        horizontalAlignment?: string;
+        /** Specifies the alignment of legend items. */
+        itemsAlignment?: string;
+        /** Specifies the position of text relative to the item marker. */
+        itemTextPosition?: string;
+        /** Specifies the distance between the legend and the container borders in pixels. */
+        margin?: viz.core.Margins;
+        /** Specifies the size of item markers in the legend in pixels. */
+        markerSize?: number;
+        /** Specifies whether to arrange legend items horizontally or vertically. */
+        orientation?: string;
+        /** Specifies the spacing between the legend left/right border and legend items in pixels. */
+        paddingLeftRight?: number;
+        /** Specifies the spacing between the legend top/bottom border and legend items in pixels. */
+        paddingTopBottom?: number;
+        /** Specifies how many rows must be taken to arrange legend items. */
+        rowCount?: number;
+        /** Specifies the spacing between a pair of neighboring legend rows in pixels. */
+        rowItemSpacing?: number;
+        /** Specifies the legend's position on the map. */
+        verticalAlignment?: string;
+        /** Specifies whether or not the legend is visible on the map. */
+        visible?: boolean;
+    }
+    export interface BaseWidgetOptions extends DOMComponentOptions {
+        /** A handler for the drawn event. */
+        onDrawn?: (e: {
+            component: BaseWidget;
+            element: Element;
+        }) => void;
+        /** A handler for the incidentOccurred event. */
+        onIncidentOccurred?: (
+        component: BaseWidget,
+        element: Element,
+        target: {
+            id: string;
+            type: string;
+            args: any;
+            text: string;
+            widget: string;
+            version: string;
+        }
+        ) => void;
+        /** Notifies a widget that it is embedded into an HTML page that uses a path modifier. */
+        pathModified?: boolean;
+        /** Specifies whether or not the widget supports right-to-left representation. */
+        rtlEnabled?: boolean;
+        /** Sets the name of the theme to be used in the widget. */
+        theme?: string;
+    }
+    /** This section describes options and methods that are common to all widgets. */
+    export class BaseWidget extends DOMComponent {
+        /** Returns the widget's SVG markup. */
+        svg(): string;
+    }
+}
+declare module DevExpress.viz.charts {
+    /** This section describes the fields and methods that can be used in code to manipulate the Series object. */
+    export interface BaseSeries {
+        /** Provides information about the state of the series object. */
+        fullState: number;
+        /** Returns the type of the series. */
+        type: string;
+        /** Unselects all the selected points of the series. The points are displayed in an initial style. */
+        clearSelection(): void;
+        /** Gets the color of a particular series. */
+        getColor(): string;
+        /** Gets points from the series point collection based on the specified argument. */
+        getPointsByArg(pointArg: any): Array<BasePoint>;
+        /** Gets a point from the series point collection based on the specified point position. */
+        getPointByPos(positionIndex: number): Object;
+        /** Selects the series. The series is displayed in a 'selected' style until another series is selected or the current series is deselected programmatically. */
+        select(): void;
+        /** Selects the specified point. The point is displayed in a 'selected' style. */
+        selectPoint(point: BasePoint): void;
+        /** Deselects the specified point. The point is displayed in an initial style. */
+        deselectPoint(point: BasePoint): void;
+        /** Returns an array of all points in the series. */
+        getAllPoints(): Array<BasePoint>;
+        /** Returns visible series points. */
+        getVisiblePoints(): Array<BasePoint>;
+        /** Returns the name of the series. */
+        name: string;
+        /** Returns the tag of the series. */
+        tag: string;
+        /** Hides a series. */
+        hide(): void;
+        /** Provides information about the hover state of a series. */
+        isHovered(): boolean;
+        /** Provides information about the selection state of a series. */
+        isSelected(): boolean;
+        /** Provides information about the visibility state of a series. */
+        isVisible(): boolean;
+        /** Makes a particular series visible. */
+        show(): void;
+    }
+    /** This section describes the methods that can be used in code to manipulate the Point object. */
+    export interface BasePoint {
+        /** Provides information about the state of the point object. */
+        fullState: number;
+        /** Returns the point's argument value that was set in the data source. */
+        originalArgument: any;
+        /** Returns the point's value that was set in the data source. */
+        originalValue: any;
+        /** Returns the tag of the point. */
+        tag: string;
+        /** Deselects the point. */
+        clearSelection(): void;
+        /** Gets the color of a particular point. */
+        getColor(): string;
+        /** Hides the tooltip of the point. */
+        hideTooltip(): void;
+        /** Provides information about the hover state of a point. */
+        isHovered(): boolean;
+        /** Provides information about the selection state of a point. */
+        isSelected(): boolean;
+        /** Selects the point. The point is displayed in a 'selected' style until another point is selected or the current point is deselected programmatically. */
+        select(): void;
+        /** Shows the tooltip of the point. */
+        showTooltip(): void;
+        /** Allows you to obtain the label of a series point. */
+        getLabel(): any;
+        /** Returns the series object to which the point belongs. */
+        series: BaseSeries;
+    }
+    /** This section describes the fields and methods that can be used in code to manipulate the Series object. */
+    export interface ChartSeries extends BaseSeries {
+        /** Returns the name of the series pane. */
+        pane: string;
+        /** Returns the name of the value axis of the series. */
+        axis: string;
+        selectPoint(point: ChartPoint): void;
+        deselectPoint(point: ChartPoint): void;
+        getAllPoints(): Array<ChartPoint>;
+        getVisiblePoints(): Array<ChartPoint>;
+    }
+    /** This section describes the methods that can be used in code to manipulate the Point object. */
+    export interface ChartPoint extends BasePoint {
+        /** Contains the close value of the point. This field is useful for points belonging to a series of the candle stick or stock type only. */
+        originalCloseValue: any;
+        /** Contains the high value of the point. This field is useful for points belonging to a series of the candle stick or stock type only. */
+        originalHighValue: any;
+        /** Contains the low value of the point. This field is useful for points belonging to a series of the candle stick or stock type only. */
+        originalLowValue: any;
+        /** Contains the first value of the point. This field is useful for points belonging to a series of the range area or range bar type only. */
+        originalMinValue: any;
+        /** Contains the open value of the point. This field is useful for points belonging to a series of the candle stick or stock type only. */
+        originalOpenValue: any;
+        /** Contains the size of the bubble as it was set in the data source. This field is useful for points belonging to a series of the bubble type only. */
+        size: any;
+        /** Gets the parameters of the point's minimum bounding rectangle (MBR). */
+        getBoundingRect(): { x: number; y: number; width: number; height: number; };
+        series: ChartSeries;
+    }
+    /** This section describes the methods that can be used in code to manipulate the Label object. */
+    export interface Label {
+        /** Gets the parameters of the label's minimum bounding rectangle (MBR). */
+        getBoundingRect(): { x: number; y: number; width: number; height: number; };
+        /** Hides the point label. */
+        hide(): void;
+        /** Shows the point label. */
+        show(): void;
+    }
+    export interface PieSeries extends BaseSeries {
+        selectPoint(point: PiePoint): void;
+        deselectPoint(point: PiePoint): void;
+        getAllPoints(): Array<PiePoint>;
+        getVisiblePoints(): Array<PiePoint>;
+    }
+    /** This section describes the methods that can be used in code to manipulate the Point object. */
+    export interface PiePoint extends BasePoint {
+        /** Gets the percentage value of the specific point. */
+        percent: any;
+        /** Provides information about the visibility state of a point. */
+        isVisible(): boolean;
+        /** Makes a specific point visible. */
+        show(): void;
+        /** Hides a specific point. */
+        hide(): void;
+        series: PieSeries;
+    }
+    /** This section describes the fields and methods that can be used in code to manipulate the Series object. */
+    export interface PolarSeries extends BaseSeries {
+        /** Returns the name of the value axis of the series. */
+        axis: string;
+        selectPoint(point: PolarPoint): void;
+        deselectPoint(point: PolarPoint): void;
+        getAllPoints(): Array<PolarPoint>;
+        getVisiblePoints(): Array<PolarPoint>;
+    }
+    /** This section describes the methods that can be used in code to manipulate the Point object. */
+    export interface PolarPoint extends BasePoint {
+        series: PolarSeries;
+    }
+    export interface Strip {
+        /** Specifies a color for a strip. */
+        color?: string;
+        /** An object that defines the label configuration options of a strip. */
+        label?: {
+            /** Specifies the text displayed in a strip. */
+            text?: string;
+        };
+        /** Specifies a start value for a strip. */
+        startValue?: any;
+        /** Specifies an end value for a strip. */
+        endValue?: any;
+    }
+    export interface BaseSeriesConfigLabel {
+        /** Specifies a format for arguments displayed by point labels. */
+        argumentFormat?: string;
+        /** Specifies a precision for formatted point arguments displayed in point labels. */
+        argumentPrecision?: number;
+        /** Specifies a background color for point labels. */
+        backgroundColor?: string;
+        /** Specifies border options for point labels. */
+        border?: viz.core.DashedBorder;
+        /** Specifies connector options for series point labels. */
+        connector?: {
+            /** Specifies the color of label connectors. */
+            color?: string;
+            /** Indicates whether or not label connectors are visible. */
+            visible?: boolean;
+            /** Specifies the width of label connectors. */
+            width?: number;
+        };
+        /** Specifies a callback function that returns the text to be displayed by point labels. */
+        customizeText?: (pointInfo: Object) => string;
+        /** Specifies font options for the text displayed in point labels. */
+        font?: viz.core.Font;
+        /** Specifies a format for the text displayed by point labels. */
+        format?: string;
+        position?: string;
+        /** Specifies a precision for formatted point values displayed in point labels. */
+        precision?: number;
+        /** Specifies the angle used to rotate point labels from their initial position. */
+        rotationAngle?: number;
+        /** Specifies the visibility of point labels. */
+        visible?: boolean;
+    }
+    export interface SeriesConfigLabel extends BaseSeriesConfigLabel {
+        /** Specifies whether or not to show a label when the point has a zero value. */
+        showForZeroValues?: boolean;
+    }
+    export interface ChartSeriesConfigLabel extends SeriesConfigLabel {
+        /** Specifies how to align point labels relative to the corresponding data points that they represent. */
+        alignment?: string;
+        /** Specifies how to shift point labels horizontally from their initial positions. */
+        horizontalOffset?: number;
+        /** Specifies how to shift point labels vertically from their initial positions. */
+        verticalOffset?: number;
+        /** Specifies a precision for the percentage values displayed in the labels of a full-stacked-like series. */
+        percentPrecision?: number;
+    }
+    export interface BaseCommonSeriesConfig {
+        /** Specifies the data source field that provides arguments for series points. */
+        argumentField?: string;
+        axis?: string;
+        /** An object defining the label configuration options for a series in the dxChart widget. */
+        label?: ChartSeriesConfigLabel;
+        /** Specifies border options for point labels. */
+        border?: viz.core.DashedBorder;
+        /** Specifies a series color. */
+        color?: string;
+        /** Specifies the dash style of the series' line. */
+        dashStyle?: string;
+        hoverMode?: string;
+        hoverStyle?: {
+            /** An object defining the border options for a hovered series. */
+            border?: viz.core.DashedBorder;
+            /** <p>Sets a color for a series when it is hovered over.</p> */
+            color?: string;
+            /** Specifies the dash style for the line in a hovered series. */
+            dashStyle?: string;
+            hatching?: viz.core.Hatching;
+            /** Specifies the width of a line in a hovered series. */
+            width?: number;
+        };
+        /** Specifies whether a chart ignores null data points or not. */
+        ignoreEmptyPoints?: boolean;
+        /** Specifies how many points are acceptable to be in a series to display all labels for these points. Otherwise, the labels will not be displayed. */
+        maxLabelCount?: number;
+        /** Specifies the minimal length of a displayed bar in pixels. */
+        minBarSize?: number;
+        /** Specifies opacity for a series. */
+        opacity?: number;
+        /** Specifies the series elements to highlight when the series is selected. */
+        selectionMode?: string;
+        selectionStyle?: {
+            /** An object defining the border options for a selected series. */
+            border?: viz.core.DashedBorder;
+            /** Sets a color for a series when it is selected. */
+            color?: string;
+            /** Specifies the dash style for the line in a selected series. */
+            dashStyle?: string;
+            hatching?: viz.core.Hatching;
+            /** Specifies the width of a line in a selected series. */
+            width?: number;
+        };
+        /** Specifies whether or not to show the series in the chart's legend. */
+        showInLegend?: boolean;
+        /** Specifies the name of the stack where the values of the _stackedBar_ series must be located. */
+        stack?: string;
+        /** Specifies the name of the data source field that provides data about a point. */
+        tagField?: string;
+        /** Specifies the data source field that provides values for series points. */
+        valueField?: string;
+        /** Specifies the visibility of a series. */
+        visible?: boolean;
+        /** Specifies a line width. */
+        width?: number;
+        /** Configures error bars. */
+        valueErrorBar?: {
+            /** Specifies whether error bars must be displayed in full or partially. */
+            displayMode?: string;
+            /** Specifies the data field that provides data for low error values. */
+            lowValueField?: string;
+            /** Specifies the data field that provides data for high error values. */
+            highValueField?: string;
+            /** Specifies how error bar values must be calculated. */
+            type?: string;
+            /** Specifies the value to be used for generating error bars. */
+            value?: number;
+            /** Specifies the color of error bars. */
+            color?: string;
+            /** Specifies the opacity of error bars. */
+            opacity?: number;
+            /** Specifies the length of the lines that indicate the error bar edges. */
+            edgeLength?: number;
+            /** Specifies the width of the error bar line. */
+            lineWidth?: number;
+        };
+    }
+    export interface CommonPointOptions {
+        /** Specifies border options for points in the line and area series. */
+        border?: viz.core.Border;
+        /** Specifies the points color. */
+        color?: string;
+        /** Specifies what series points to highlight when a point is hovered over. */
+        hoverMode?: string;
+        /** An object defining configuration options for a hovered point. */
+        hoverStyle?: {
+            /** An object defining the border options for a hovered point. */
+            border?: viz.core.Border;
+            /** Sets a color for a point when it is hovered over. */
+            color?: string;
+            /** Specifies the diameter of a hovered point in the series that represents data points as symbols (not as bars for instance). */
+            size?: number;
+        };
+        /** Specifies what series points to highlight when a point is selected. */
+        selectionMode?: string;
+        /** An object defining configuration options for a selected point. */
+        selectionStyle?: {
+            /** An object defining the border options for a selected point. */
+            border?: viz.core.Border;
+            /** <p>Sets a color for a point when it is selected.</p> */
+            color?: string;
+            /** Specifies the diameter of a selected point in the series that represents data points as symbols (not as bars for instance). */
+            size?: number;
+        };
+        /** Specifies the point diameter in pixels for those series that represent data points as symbols (not as bars for instance). */
+        size?: number;
+        /** Specifies a symbol for presenting points of the line and area series. */
+        symbol?: string;
+        visible?: boolean;
+    }
+    export interface ChartCommonPointOptions extends CommonPointOptions {
+        /** An object specifying the parameters of an image that is used as a point marker. */
+        image?: {
+            /** Specifies the height of an image that is used as a point marker. */
+            height?: any;
+            /** Specifies a URL leading to the image to be used as a point marker. */
+            url?: any;
+            /** Specifies the width of an image that is used as a point marker. */
+            width?: any;
+        };
+    }
+    export interface PolarCommonPointOptions extends CommonPointOptions {
+        /** An object specifying the parameters of an image that is used as a point marker. */
+        image?: {
+            /** Specifies the height of an image that is used as a point marker. */
+            height?: number;
+            /** Specifies a URL leading to the image to be used as a point marker. */
+            url?: string;
+            /** Specifies the width of an image that is used as a point marker. */
+            width?: number;
+        };
+    }
+    /** An object that defines configuration options for chart series. */
+    export interface CommonSeriesConfig extends BaseCommonSeriesConfig {
+        /** Specifies the data source field that provides a 'close' value for a _candleStick_ or _stock_ series. */
+        closeValueField?: string;
+        /** Specifies a radius for bar corners. */
+        cornerRadius?: number;
+        /** Specifies the data source field that provides a 'high' value for a _candleStick_ or _stock_ series. */
+        highValueField?: string;
+        /** Specifies the color for the body (rectangle) of a _candleStick_ series. */
+        innerColor?: string;
+        /** Specifies the data source field that provides a 'low' value for a _candleStick_ or _stock_ series. */
+        lowValueField?: string;
+        /** Specifies the data source field that provides an 'open' value for a _candleStick_ or _stock_ series. */
+        openValueField?: string;
+        /** Specifies the pane that will be used to display a series. */
+        pane?: string;
+        /** An object defining configuration options for points in line-, scatter- and area-like series. */
+        point?: ChartCommonPointOptions;
+        /** Specifies the data source field that provides values for one end of a range series. To set the data source field for the other end of the range series, use the rangeValue2Field property. */
+        rangeValue1Field?: string;
+        /** Specifies the data source field that provides values for the second end of a range series. To set the data source field for the other end of the range series, use the rangeValue1Field property. */
+        rangeValue2Field?: string;
+        /** Specifies reduction options for the stock or candleStick series. */
+        reduction?: {
+            /** Specifies a color for the points whose reduction level price is lower in comparison to the value in the previous point. */
+            color?: string;
+            /** Specifies for which price level (open, high, low or close) to enable reduction options in the series. */
+            level?: string;
+        };
+        /** Specifies the data source field that defines the size of bubbles. */
+        sizeField?: string;
+    }
+    export interface CommonSeriesSettings extends CommonSeriesConfig {
+        /** <p>An object that specifies configuration options for all series of the <i>area</i> type in the chart.</p> */
+        area?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _bar_ type in the chart. */
+        bar?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the bubble type in the chart. */
+        bubble?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _candleStick_ type in the chart. */
+        candlestick?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _fullStackedArea_ type in the chart. */
+        fullstackedarea?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the Full-Stacked Spline Area type in the chart. */
+        fullstackedsplinearea?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _fullStackedBar_ type in the chart. */
+        fullstackedbar?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _fullStackedLine_ type in the chart. */
+        fullstackedline?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the Full-Stacked Spline type in the chart. */
+        fullstackedspline?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _line_ type in the chart. */
+        line?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _rangeArea_ type in the chart. */
+        rangearea?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _rangeBar_ type in the chart. */
+        rangebar?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _scatter_ type in the chart. */
+        scatter?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _spline_ type in the chart. */
+        spline?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _splineArea_ type in the chart. */
+        splinearea?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _stackedArea_ type in the chart. */
+        stackedarea?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the Stacked Spline Area type in the chart. */
+        stackedsplinearea?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _stackedBar_ type in the chart. */
+        stackedbar?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _stackedLine_ type in the chart. */
+        stackedline?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the Stacked Spline type in the chart. */
+        stackedspline?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _stepArea_ type in the chart. */
+        steparea?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _stepLine_ type in the chart. */
+        stepline?: CommonSeriesConfig;
+        /** An object that specifies configuration options for all series of the _stock_ type in the chart. */
+        stock?: CommonSeriesConfig;
+        /** Sets a series type. */
+        type?: string;
+    }
+    export interface SeriesConfig extends CommonSeriesConfig {
+        /** Specifies the name that identifies the series. */
+        name?: string;
+        /** Specifies data about a series. */
+        tag?: any;
+        /** Sets the series type. */
+        type?: string;
+    }
+    /** An object that defines configuration options for polar chart series. */
+    export interface CommonPolarSeriesConfig extends BaseCommonSeriesConfig {
+        /** Specifies whether or not to close the chart by joining the end point with the first point. */
+        closed?: boolean;
+        label?: SeriesConfigLabel;
+        point?: PolarCommonPointOptions;
+    }
+    export interface CommonPolarSeriesSettings extends CommonPolarSeriesConfig {
+        /** An object that specifies configuration options for all series of the <i>area</i> type in the chart. */
+        area?: CommonPolarSeriesConfig;
+        /** An object that specifies configuration options for all series of the _bar_ type in the chart. */
+        bar?: CommonPolarSeriesConfig;
+        /** An object that specifies configuration options for all series of the _line_ type in the chart. */
+        line?: CommonPolarSeriesConfig;
+        /** An object that specifies configuration options for all series of the _scatter_ type in the chart. */
+        scatter?: CommonPolarSeriesConfig;
+        /** An object that specifies configuration options for all series of the _stackedBar_ type in the chart. */
+        stackedbar?: CommonPolarSeriesConfig;
+        /** Sets a series type. */
+        type?: string;
+    }
+    export interface PolarSeriesConfig extends CommonPolarSeriesConfig {
+        /** Specifies the name that identifies the series. */
+        name?: string;
+        /** Specifies data about a series. */
+        tag?: any;
+        /** Sets the series type. */
+        type?: string;
+    }
+    export interface PieSeriesConfigLabel extends BaseSeriesConfigLabel {
+        /** Specifies how to shift labels from their initial position in a radial direction in pixels. */
+        radialOffset?: number;
+        /** Specifies a precision for the percentage values displayed in labels. */
+        percentPrecision?: number;
+    }
+    /** An object that defines configuration options for chart series. */
+    export interface CommonPieSeriesConfig {
+        /** Specifies the data source field that provides arguments for series points. */
+        argumentField?: string;
+        /** Specifies the required type for series arguments. */
+        argumentType?: string;
+        /** An object defining the series border configuration options. */
+        border?: viz.core.DashedBorder;
+        /** Specifies a series color. */
+        color?: string;
+        /** Specifies the chart elements to highlight when a series is hovered over. */
+        hoverMode?: string;
+        /** An object defining configuration options for a hovered series. */
+        hoverStyle?: {
+            /** An object defining the border options for a hovered series. */
+            border?: viz.core.DashedBorder;
+            /** Sets a color for the series when it is hovered over. */
+            color?: string;
+            /** Specifies the hatching options to be applied when a point is hovered over. */
+            hatching?: viz.core.Hatching;
+        };
+        /**
+         * Specifies the fraction of the inner radius relative to the total radius in the series of the 'doughnut' type.
+         * @deprecated use the 'innerRadius' option instead
+         */
+        innerRadius?: number;
+        /** An object defining the label configuration options. */
+        label?: PieSeriesConfigLabel;
+        /** Specifies how many points are acceptable to be in a series to display all labels for these points. Otherwise, the labels will not be displayed. */
+        maxLabelCount?: number;
+        /** Specifies a minimal size of a displayed pie segment. */
+        minSegmentSize?: number;
+        /**
+         * Specifies the direction in which the dxPieChart series points are located.
+         * @deprecated use the 'segmentsDirection' option instead
+         */
+        segmentsDirection?: string;
+        /** <p>Specifies the chart elements to highlight when the series is selected.</p> */
+        selectionMode?: string;
+        /** An object defining configuration options for the series when it is selected. */
+        selectionStyle?: {
+            /** An object defining the border options for a selected series. */
+            border?: viz.core.DashedBorder;
+            /** Sets a color for a series when it is selected. */
+            color?: string;
+            /** Specifies the hatching options to be applied when a point is selected. */
+            hatching?: viz.core.Hatching;
+        };
+        /** Specifies chart segment grouping options. */
+        smallValuesGrouping?: {
+            /** Specifies the name of the grouped chart segment. This name represents the segment in the chart legend. */
+            groupName?: string;
+            /** Specifies the segment grouping mode. */
+            mode?: string;
+            /** Specifies a threshold for segment values. */
+            threshold?: number;
+            /** Specifies how many segments must not be grouped. */
+            topCount?: number;
+        };
+        /**
+         * Specifies a start angle for a pie chart in arc degrees.
+         * @deprecated use the 'startAngle' option instead
+         */
+        startAngle?: number;
+        /** <p>Specifies the name of the data source field that provides data about a point.</p> */
+        tagField?: string;
+        /** Specifies the data source field that provides values for series points. */
+        valueField?: string;
+    }
+    export interface CommonPieSeriesSettings extends CommonPieSeriesConfig {
+        /**
+         * Specifies the type of the pie chart series.
+         * @deprecated use the 'type' option instead
+         */
+        type?: string;
+    }
+    export interface PieSeriesConfig extends CommonPieSeriesConfig {
+        /**
+         * Sets the series type.
+         * @deprecated use the 'type' option instead
+         */
+        type?: string;
+        /** Specifies the name that identifies the series. */
+        name?: string;
+        /** Specifies data about a series. */
+        tag?: any;
+    }
+    export interface SeriesTemplate {
+        /** Specifies a callback function that returns a series object with individual series settings. */
+        customizeSeries?: (seriesName: string) => SeriesConfig;
+        /** Specifies a data source field that represents the series name. */
+        nameField?: string;
+    }
+    export interface PolarSeriesTemplate {
+        /** Specifies a callback function that returns a series object with individual series settings. */
+        customizeSeries?: (seriesName: string) => PolarSeriesConfig;
+        /** Specifies a data source field that represents the series name. */
+        nameField?: string;
+    }
+    export interface ChartCommonConstantLineLabel {
+        /** Specifies font options for a constant line label. */
+        font?: viz.core.Font;
+        /** Specifies the position of the constant line label relative to the chart plot. */
+        position?: string;
+        /** Indicates whether or not to display labels for the axis constant lines. */
+        visible?: boolean;
+    }
+    export interface PolarCommonConstantLineLabel {
+        /** Indicates whether or not to display labels for the axis constant lines. */
+        visible?: boolean;
+        /** Specifies font options for a constant line label. */
+        font?: viz.core.Font;
+    }
+    export interface ConstantLineStyle {
+        /** Specifies a color for a constant line. */
+        color?: string;
+        /** Specifies a dash style for a constant line. */
+        dashStyle?: string;
+        /** Specifies a constant line width in pixels. */
+        width?: number;
+    }
+    export interface ChartCommonConstantLineStyle extends ConstantLineStyle {
+        /** An object defining constant line label options. */
+        label?: ChartCommonConstantLineLabel;
+        /** Specifies the space between the constant line label and the left/right side of the constant line. */
+        paddingLeftRight?: number;
+        /** Specifies the space between the constant line label and the top/bottom side of the constant line. */
+        paddingTopBottom?: number;
+    }
+    export interface PolarCommonConstantLineStyle extends ConstantLineStyle {
+        /** An object defining constant line label options. */
+        label?: PolarCommonConstantLineLabel;
+    }
+    export interface CommonAxisLabel {
+        /** Specifies font options for axis labels. */
+        font?: viz.core.Font;
+        /** Specifies the spacing between an axis and its labels in pixels. */
+        indentFromAxis?: number;
+        /** Indicates whether or not axis labels are visible. */
+        visible?: boolean;
+    }
+    export interface ChartCommonAxisLabel extends CommonAxisLabel {
+        /** Specifies the label's position relative to the tick (grid line). */
+        alignment?: string;
+        /** Specifies the overlap resolving algorithm to be applied to axis labels. */
+        overlappingBehavior?: {
+            /** Specifies how to arrange axis labels. */
+            mode?: string;
+            /** Specifies the angle used to rotate axis labels. */
+            rotationAngle?: number;
+            /** Specifies the spacing that must be set between staggered rows when the 'stagger' algorithm is applied. */
+            staggeringSpacing?: number;
+        };
+    }
+    export interface PolarCommonAxisLabel extends CommonAxisLabel {
+        /** Specifies the overlap resolving algorithm to be applied to axis labels. */
+        overlappingBehavior?: string;
+    }
+    export interface CommonAxisTitle {
+        /** Specifies font options for an axis title. */
+        font?: viz.core.Font;
+        /** Specifies a margin for an axis title in pixels. */
+        margin?: number;
+    }
+    export interface BaseCommonAxisSettings {
+        /** Specifies the color of the line that represents an axis. */
+        color?: string;
+        /** Specifies whether ticks/grid lines of a discrete axis are located between labels or cross the labels. */
+        discreteAxisDivisionMode?: string;
+        /** An object defining the configuration options for the grid lines of an axis in the dxPolarChart widget. */
+        grid?: {
+            /** Specifies a color for grid lines. */
+            color?: string;
+            /** Specifies an opacity for grid lines. */
+            opacity?: number;
+            /** Indicates whether or not the grid lines of an axis are visible. */
+            visible?: boolean;
+            /** Specifies the width of grid lines. */
+            width?: number;
+        };
+        /** Specifies the options of the minor grid. */
+        minorGrid?: {
+            /** Specifies a color for the lines of the minor grid. */
+            color?: string;
+            /** Specifies an opacity for the lines of the minor grid. */
+            opacity?: number;
+            /** Indicates whether the minor grid is visible or not. */
+            visible?: boolean;
+            /** Specifies a width for the lines of the minor grid. */
+            width?: number;
+        };
+        /** Indicates whether or not an axis is inverted. */
+        inverted?: boolean;
+        /** Specifies the opacity of the line that represents an axis. */
+        opacity?: number;
+        /** Indicates whether or not to set ticks/grid lines of a continuous axis of the 'date-time' type at the beginning of each date-time interval. */
+        setTicksAtUnitBeginning?: boolean;
+        /** An object defining the configuration options for axis ticks. */
+        tick?: {
+            /** Specifies ticks color. */
+            color?: string;
+            /** Specifies tick opacity. */
+            opacity?: number;
+            /** Indicates whether or not ticks are visible on an axis. */
+            visible?: boolean;
+            /** Specifies tick width. */
+            width?: number;
+            /** Specifies tick length. */
+            length?: number;
+        };
+        /** Specifies the options of the minor ticks. */
+        minorTick?: {
+            /** Specifies a color for the minor ticks. */
+            color?: string;
+            /** Specifies an opacity for the minor ticks. */
+            opacity?: number;
+            /** Indicates whether or not the minor ticks are displayed on an axis. */
+            visible?: boolean;
+            /** Specifies minor tick width. */
+            width?: number;
+            /** Specifies minor tick length. */
+            length?: number;
+        };
+        /** Indicates whether or not the line that represents an axis in a chart is visible. */
+        visible?: boolean;
+        /** Specifies the width of the line that represents an axis in the chart. */
+        width?: number;
+    }
+    export interface ChartCommonAxisSettings extends BaseCommonAxisSettings {
+        /** Specifies the appearance of all the widget's constant lines. */
+        constantLineStyle?: ChartCommonConstantLineStyle;
+        /** An object defining the label configuration options that are common for all axes in the dxChart widget. */
+        label?: ChartCommonAxisLabel;
+        /** Specifies a coefficient that determines the spacing between the maximum series point and the axis. */
+        maxValueMargin?: number;
+        /** Specifies a coefficient that determines the spacing between the minimum series point and the axis. */
+        minValueMargin?: number;
+        /** Specifies, in pixels, the space reserved for an axis. */
+        placeholderSize?: number;
+        /** An object defining configuration options for strip style. */
+        stripStyle?: {
+            /** An object defining the configuration options for a strip label style. */
+            label?: {
+                /** Specifies font options for a strip label. */
+                font?: viz.core.Font;
+                /** Specifies the label's position on a strip. */
+                horizontalAlignment?: string;
+                /** Specifies a label's position on a strip. */
+                verticalAlignment?: string;
+            };
+            /** Specifies the spacing, in pixels, between the left/right strip border and the strip label. */
+            paddingLeftRight?: number;
+            /** Specifies the spacing, in pixels, between the top/bottom strip borders and the strip label. */
+            paddingTopBottom?: number;
+        };
+        /** An object defining the title configuration options that are common for all axes in the dxChart widget. */
+        title?: CommonAxisTitle;
+        /** Indicates whether or not to display series with indents from axis boundaries. */
+        valueMarginsEnabled?: boolean;
+    }
+    export interface PolarCommonAxisSettings extends BaseCommonAxisSettings {
+        /** Specifies the appearance of all the widget's constant lines. */
+        constantLineStyle?: PolarCommonConstantLineStyle;
+        /** An object defining the label configuration options that are common for all axes in the dxPolarChart widget. */
+        label?: PolarCommonAxisLabel;
+        /** An object defining configuration options for strip style. */
+        stripStyle?: {
+            /** An object defining the configuration options for a strip label style. */
+            label?: {
+                /** Specifies font options for a strip label. */
+                font?: viz.core.Font;
+            };
+        };
+    }
+    export interface ChartConstantLineLabel extends ChartCommonConstantLineLabel {
+        /** Specifies the horizontal alignment of a constant line label. */
+        horizontalAlignment?: string;
+        /** Specifies the vertical alignment of a constant line label. */
+        verticalAlignment?: string;
+        /** Specifies the text to be displayed in a constant line label. */
+        text?: string;
+    }
+    export interface PolarConstantLineLabel extends PolarCommonConstantLineLabel {
+        /** Specifies the text to be displayed in a constant line label. */
+        text?: string;
+    }
+    export interface AxisLabel {
+        /** Specifies the text for a hint that appears when a user hovers the mouse pointer over a label on the value axis. */
+        customizeHint?: (argument: { value: any; valueText: string }) => string;
+        /** Specifies a callback function that returns the text to be displayed in value axis labels. */
+        customizeText?: (argument: { value: any; valueText: string }) => string;
+        /** Specifies a format for the text displayed by axis labels. */
+        format?: string;
+        /** Specifies a precision for the formatted value displayed in the axis labels. */
+        precision?: number;
+    }
+    export interface ChartAxisLabel extends ChartCommonAxisLabel, AxisLabel { }
+    export interface PolarAxisLabel extends PolarCommonAxisLabel, AxisLabel { }
+    export interface AxisTitle extends CommonAxisTitle {
+        /** Specifies the text for the value axis title. */
+        text?: string;
+    }
+    export interface ChartConstantLineStyle extends ChartCommonConstantLineStyle {
+        /** An object defining constant line label options. */
+        label?: ChartConstantLineLabel;
+    }
+    export interface ChartConstantLine extends ChartConstantLineStyle {
+        /** An object defining constant line label options. */
+        label?: ChartConstantLineLabel;
+        /** Specifies a value to be displayed by a constant line. */
+        value?: any;
+    }
+    export interface PolarConstantLine extends PolarCommonConstantLineStyle {
+        /** An object defining constant line label options. */
+        label?: PolarConstantLineLabel;
+        /** Specifies a value to be displayed by a constant line. */
+        value?: any;
+    }
+    export interface Axis {
+        /** Specifies a coefficient for dividing the value axis. */
+        axisDivisionFactor?: number;
+        /** Specifies the order in which discrete values are arranged on the value axis. */
+        categories?: Array<any>;
+        /** Specifies the value to be raised to a power when generating ticks for a logarithmic axis. */
+        logarithmBase?: number;
+        /** Specifies an interval between axis ticks/grid lines. */
+        tickInterval?: any;
+        /** Specifies the interval between minor ticks. */
+        minorTickInterval?: any;
+        /** Specifies the number of minor ticks between two neighboring major ticks. */
+        minorTickCount?: number;
+        /** Specifies the required type of the value axis. */
+        type?: string;
+        /** Specifies the pane on which the current value axis will be displayed. */
+        pane?: string;
+        /** Specifies options for value axis strips. */
+        strips?: Array<Strip>;
+    }
+    export interface ChartAxis extends ChartCommonAxisSettings, Axis {
+        /** Defines an array of the value axis constant lines. */
+        constantLines?: Array<ChartConstantLine>;
+        /** Specifies the appearance options for the constant lines of the value axis. */
+        constantLineStyle?: ChartCommonConstantLineStyle;
+        /** Specifies options for value axis labels. */
+        label?: ChartAxisLabel;
+        /** Specifies the maximum value on the value axis. */
+        max?: any;
+        /** Specifies the minimum value on the value axis. */
+        min?: any;
+        /** Specifies the position of the value axis on a chart. */
+        position?: string;
+        /** Specifies the title for a value axis. */
+        title?: AxisTitle;
+    }
+    export interface PolarAxis extends PolarCommonAxisSettings, Axis {
+        /** Defines an array of the value axis constant lines. */
+        constantLines?: Array<PolarConstantLine>;
+        /** Specifies options for value axis labels. */
+        label?: PolarAxisLabel;
+    }
+    export interface ArgumentAxis {
+        /** Specifies the desired type of axis values. */
+        argumentType?: string;
+        /** Specifies the elements that will be highlighted when the argument axis is hovered over. */
+        hoverMode?: string;
+    }
+    export interface ChartArgumentAxis extends ChartAxis, ArgumentAxis { }
+    export interface PolarArgumentAxis extends PolarAxis, ArgumentAxis {
+        /** Specifies the angle in arc degrees to which the argument axis should be rotated. The positive values rotate the axis clockwise. */
+        startAngle?: number;
+        /** Specifies whether or not to display the first point at the angle specified by the startAngle option. */
+        firstPointOnStartAngle?: boolean;
+        /** Specifies the value to be used as the origin for the argument axis. */
+        originValue?: number;
+        /** Specifies the period of the argument values in the data source. */
+        period?: number;
+    }
+    export interface ValueAxis {
+        /** Specifies the name of the value axis. */
+        name?: string;
+        /** Specifies whether or not to indicate a zero value on the value axis. */
+        showZero?: boolean;
+        /** Specifies the desired type of axis values. */
+        valueType?: string;
+    }
+    export interface ChartValueAxis extends ChartAxis, ValueAxis {
+        /** Specifies the spacing, in pixels, between multiple value axes in a chart. */
+        multipleAxesSpacing?: number;
+        /** Specifies the value by which the chart's value axes are synchronized. */
+        synchronizedValue?: number;
+    }
+    export interface PolarValueAxis extends PolarAxis, ValueAxis {
+        /** Indicates whether to display series with indents from axis boundaries. */
+        valueMarginsEnabled?: boolean;
+        /** Specifies a coefficient that determines the spacing between the maximum series point and the axis. */
+        maxValueMargin?: number;
+        /** Specifies a coefficient that determines the spacing between the minimum series point and the axis. */
+        minValueMargin?: number;
+        tick?: {
+            visible?: boolean;
+        }
+    }
+    export interface CommonPane {
+        /** Specifies a background color in a pane. */
+        backgroundColor?: string;
+        /** Specifies the border options of a chart's pane. */
+        border?: PaneBorder;
+    }
+    export interface Pane extends CommonPane {
+        /** Specifies the name of a pane. */
+        name?: string;
+    }
+    export interface PaneBorder extends viz.core.DashedBorderWithOpacity {
+        /** Specifies the bottom border's visibility state in a pane. */
+        bottom?: boolean;
+        /** Specifies the left border's visibility state in a pane. */
+        left?: boolean;
+        /** Specifies the right border's visibility state in a pane. */
+        right?: boolean;
+        /** Specifies the top border's visibility state in a pane. */
+        top?: boolean;
+    }
+    export interface ChartAnimation extends viz.core.Animation {
+        /** Specifies the maximum series point count in the chart that the animation supports. */
+        maxPointCountSupported?: number;
+    }
+    export interface BaseChartTooltip extends viz.core.Tooltip {
+        /** Specifies a format for arguments of the chart's series points. */
+        argumentFormat?: string;
+        /** Specifies a precision for formatted arguments displayed in tooltips. */
+        argumentPrecision?: number;
+        /** Specifies a precision for a percent value displayed in tooltips for stacked series and dxPieChart series. */
+        percentPrecision?: number;
+    }
+    export interface BaseChartOptions<TPoint> extends viz.core.BaseWidgetOptions {
+        /** Specifies adaptive layout options. */
+        adaptiveLayout?: {
+            /** Specifies the width of the widget that is small enough for the layout to begin adapting. */
+            width?: number;
+            /** Specifies the height of the widget that is small enough for the layout to begin adapting. */
+            height?: number;
+            /** Specifies whether or not point labels can be hidden when the layout is adapting. */
+            keepLabels?: boolean;
+        };
+        /** Specifies animation options. */
+        animation?: ChartAnimation;
+        /** Specifies a callback function that returns an object with options for a specific point label. */
+        customizeLabel?: (labelInfo: Object) => Object;
+        /** Specifies a callback function that returns an object with options for a specific point. */
+        customizePoint?: (pointInfo: Object) => Object;
+        /** Specifies a data source for the chart. */
+        dataSource?: any;
+        /** Specifies the appearance of the loading indicator. */
+        loadingIndicator?: viz.core.LoadingIndicator;
+        /** Specifies options of a dxChart's (dxPieChart's) legend. */
+        legend?: core.BaseLegend;
+        /** Specifies the blank space between the chart's extreme elements and the boundaries of the area provided for the widget (see size) in pixels. */
+        margin?: viz.core.Margins;
+        /** Sets the name of the palette to be used in the chart. Alternatively, an array of colors can be set as a custom palette to be used within this chart. */
+        palette?: any;
+        /** A handler for the done event. */
+        onDone?: (e: {
+            component: BaseChart;
+            element: Element;
+        }) => void;
+        /** A handler for the pointClick event. */
+        onPointClick?: any;
+        /** A handler for the pointHoverChanged event. */
+        onPointHoverChanged?: (e: {
+            component: BaseChart;
+            element: Element;
+            target: TPoint;
+        }) => void;
+        /** A handler for the pointSelectionChanged event. */
+        onPointSelectionChanged?: (e: {
+            component: BaseChart;
+            element: Element;
+            target: TPoint;
+        }) => void;
+        /** Specifies whether a single point or multiple points can be selected in the chart. */
+        pointSelectionMode?: string;
+        /** Specifies whether to redraw the widget when the size of the parent browser window changes or a mobile device rotates. */
+        redrawOnResize?: boolean;
+        /** Specifies options for the dxChart and dxPieChart widget series. */
+        series?: any;
+        /** Specifies the size of the widget in pixels. */
+        size?: viz.core.Size;
+        /** Specifies a title for the chart. */
+        title?: viz.core.Title;
+        /** Specifies tooltip options. */
+        tooltip?: BaseChartTooltip;
+        /** A handler for the tooltipShown event. */
+        onTooltipShown?: (e: {
+            component: BaseChart;
+            element: Element;
+            target: BasePoint;
+        }) => void;
+        /** A handler for the tooltipHidden event. */
+        onTooltipHidden?: (e: {
+            component: BaseChart;
+            element: Element;
+            target: BasePoint;
+        }) => void;
+    }
+    /** A base class for all chart widgets included in the ChartJS library. */
+    export class BaseChart extends viz.core.BaseWidget {
+        /** Deselects the chart's selected series. The series is displayed in an initial style. */
+        clearSelection(): void;
+        /** Gets the current size of the widget. */
+        getSize(): { width: number; height: number };
+        /** Returns an array of all series in the chart. */
+        getAllSeries(): Array<BaseSeries>;
+        /** Gets a series within the chart's series collection by the specified name (see the name option). */
+        getSeriesByName(seriesName: string): BaseSeries;
+        /** Gets a series within the chart's series collection by its position number. */
+        getSeriesByPos(seriesIndex: number): BaseSeries;
+        /** Displays the loading indicator. */
+        showLoadingIndicator(): void;
+        /** Conceals the loading indicator. */
+        hideLoadingIndicator(): void;
+        /** Hides all widget tooltips. */
+        hideTooltip(): void;
+        /** Redraws a widget. */
+        render(renderOptions?: {
+            force?: boolean;
+            animate?: boolean;
+            asyncSeriesRendering?: boolean;
+        }): void;
+    }
+    export interface AdvancedLegend extends core.BaseLegend {
+        /** Specifies the text for a hint that appears when a user hovers the mouse pointer over a legend item. */
+        customizeHint?: (seriesInfo: { seriesName: string; seriesIndex: number; seriesColor: string; }) => string;
+        /** <p>Specifies a callback function that returns the text to be displayed by legend items.</p> */
+        customizeText?: (seriesInfo: { seriesName: string; seriesIndex: number; seriesColor: string; }) => string;
+        /** Specifies what series elements to highlight when a corresponding item in the legend is hovered over. */
+        hoverMode?: string;
+    }
+    export interface AdvancedOptions<TPoint, TSeries> extends BaseChartOptions<TPoint> {
+        /** A handler for the argumentAxisClick event. */
+        onArgumentAxisClick?: any;
+        /** Specifies the color of the parent page element. */
+        containerBackgroundColor?: string;
+        /** An object providing options for managing data from a data source. */
+        dataPrepareSettings?: {
+            /** Specifies whether or not to validate the values from a data source. */
+            checkTypeForAllData?: boolean;
+            /** Specifies whether or not to convert the values from a data source into the data type of an axis. */
+            convertToAxisDataType?: boolean;
+            /** Specifies how to sort the series points. */
+            sortingMethod?: any;
+        };
+        /** A handler for the legendClick event. */
+        onLegendClick?: any;
+        /** A handler for the seriesClick event. */
+        onSeriesClick?: any;
+        /** A handler for the seriesHoverChanged event. */
+        onSeriesHoverChanged?: (e: {
+            component: BaseChart;
+            element: Element;
+            target: TSeries;
+        }) => void;
+        /** A handler for the seriesSelectionChanged event. */
+        onSeriesSelectionChanged?: (e: {
+            component: BaseChart;
+            element: Element;
+            target: TSeries;
+        }) => void;
+        /** Specifies whether a single series or multiple series can be selected in the chart. */
+        seriesSelectionMode?: string;
+        /** Specifies how the chart must behave when series point labels overlap. */
+        resolveLabelOverlapping?: string;
+        /** Specifies whether or not all bars in a series must have the same angle, or may have different angles if any points in other series are missing. */
+        equalBarWidth?: boolean;
+        /** Specifies a common bar width as a percentage from 0 to 1. */
+        barWidth?: number;
+        /** Forces the widget to treat negative values as zeroes. Applies to stacked-like series only. */
+        negativesAsZeroes?: boolean;
+    }
+    export interface Legend extends AdvancedLegend {
+        /** Specifies whether the legend is located outside or inside the chart's plot. */
+        position?: string;
+    }
+    export interface ChartTooltip extends BaseChartTooltip {
+        /** Specifies whether the tooltip must be located in the center of a bar or on its edge. Applies to the Bar and Bubble series. */
+        location?: string;
+        /** Specifies the kind of information to display in a tooltip. */
+        shared?: boolean;
+    }
+    export interface dxChartOptions extends AdvancedOptions<ChartPoint, ChartSeries> {
+        adaptiveLayout?: {
+            keepLabels?: boolean;
+        };
+        /** Indicates whether or not to synchronize value axes when they are displayed on a single pane. */
+        synchronizeMultiAxes?: boolean;
+        /** Specifies whether or not to filter the series points depending on their quantity. */
+        useAggregation?: boolean;
+        /** Indicates whether or not to adjust a value axis to the current minimum and maximum values of a zoomed chart. */
+        adjustOnZoom?: boolean;
+        /** Specifies argument axis options for the dxChart widget. */
+        argumentAxis?: ChartArgumentAxis;
+        /** An object defining the configuration options that are common for all axes of the dxChart widget. */
+        commonAxisSettings?: ChartCommonAxisSettings;
+        /** An object defining the configuration options that are common for all panes in the dxChart widget. */
+        commonPaneSettings?: CommonPane;
+        /** An object defining the configuration options that are common for all series of the dxChart widget. */
+        commonSeriesSettings?: CommonSeriesSettings;
+        /** An object that specifies the appearance options of the chart crosshair. */
+        crosshair?: {
+            /** Specifies a color for the crosshair lines. */
+            color?: string;
+            /** Specifies a dash style for the crosshair lines. */
+            dashStyle?: string;
+            /** Specifies whether to enable the crosshair or not. */
+            enabled?: boolean;
+            /** Specifies the opacity of the crosshair lines. */
+            opacity?: number;
+            /** Specifies the width of the crosshair lines. */
+            width?: number;
+            /** Specifies the appearance of the horizontal crosshair line. */
+            horizontalLine?: CrosshaierWithLabel;
+            /** Specifies the appearance of the vertical crosshair line. */
+            verticalLine?: CrosshaierWithLabel;
+            /** Specifies the options of the crosshair labels. */
+            label?: {
+                /** Specifies a color for the background of the crosshair labels. */
+                backgroundColor?: string;
+                /** Specifies whether the crosshair labels are visible or not. */
+                visible?: boolean;
+                /** Specifies font options for the text of the crosshair labels. */
+                font?: viz.core.Font;
+                /** Specifies the format of the values displayed by crosshair labels. */
+                format?: string;
+                /** Specifies a precision for formatted values. */
+                precision?: number;
+                /** Customizes the text displayed by the crosshair labels. */
+                customizeText?: (info: { value: any; valueText: string; point: ChartPoint; }) => string;
+            }
+        };
+        /** Specifies a default pane for the chart series. */
+        defaultPane?: string;
+        /** Specifies a coefficient determining the diameter of the largest bubble. */
+        maxBubbleSize?: number;
+        /** Specifies the diameter of the smallest bubble measured in pixels. */
+        minBubbleSize?: number;
+        /** Defines the dxChart widget's <a href="/Documentation/Guide/Data_Visualization/Charts/Chart_Elements?version=15_2#Panes">pane(s)</a>. */
+        panes?: Array<Pane>;
+        /** Swaps the axes round so that the value axis becomes horizontal and the argument axes becomes vertical. */
+        rotated?: boolean;
+        /** Specifies the options of a chart's legend. */
+        legend?: Legend;
+        /** Specifies options for dxChart widget series. */
+        series?: Array<SeriesConfig>;
+        /** Defines options for the series template. */
+        seriesTemplate?: SeriesTemplate;
+        /** Specifies tooltip options. */
+        tooltip?: ChartTooltip;
+        /** Specifies value axis options for the dxChart widget. */
+        valueAxis?: Array<ChartValueAxis>;
+        /** Enables scrolling in your chart. */
+        scrollingMode?: string;
+        /** Enables zooming in your chart. */
+        zoomingMode?: string;
+        /** Specifies the settings of the scroll bar. */
+        scrollBar?: {
+            /** Specifies whether the scroll bar is visible or not. */
+            visible?: boolean;
+            /** Specifies the spacing between the scroll bar and the chart's plot in pixels. */
+            offset?: number;
+            /** Specifies the color of the scroll bar. */
+            color?: string;
+            /** Specifies the width of the scroll bar in pixels. */
+            width?: number;
+            /** Specifies the opacity of the scroll bar. */
+            opacity?: number;
+            /** Specifies the position of the scroll bar in the chart. */
+            position?: string;
+        };
+    }
+    /** A widget used to embed charts into HTML JS applications. */
+    export class dxChart extends BaseChart {
+        constructor(element: JQuery, options?: dxChartOptions);
+        constructor(element: Element, options?: dxChartOptions);
+        /** Sets the specified start and end values for the chart's argument axis. */
+        zoomArgument(startValue: any, endValue: any): void;
+    }
+    interface CrosshaierWithLabel extends viz.core.DashedBorderWithOpacity {
+        /** Configures the label that belongs to the horizontal crosshair line. */
+        label?: {
+            /** Specifies a color for the background of the label that belongs to the horizontal crosshair line. */
+            backgroundColor?: string;
+            /** Specifies whether the label of the horizontal crosshair line is visible or not. */
+            visible?: boolean;
+            /** Specifies font options for the text of the label that belongs to the horizontal crosshair line. */
+            font?: viz.core.Font;
+            /** Specifies the format of the values displayed by crosshair labels. */
+            format?: string;
+            /** Specifies a precision for formatted values. */
+            precision?: number;
+            /** Customizes the text displayed by the crosshair label that accompany the horizontal line. */
+            customizeText?: (info: { value: any; valueText: string; point: ChartPoint; }) => string;
+        }
+    }
+    export interface PolarChartTooltip extends BaseChartTooltip {
+        /** Specifies the kind of information to display in a tooltip. */
+        shared?: boolean;
+    }
+    export interface dxPolarChartOptions extends AdvancedOptions<PolarPoint, PolarSeries> {
+        /** Specifies adaptive layout options. */
+        adaptiveLayout?: {
+            width?: number;
+            height?: number;
+            /** Specifies whether or not point labels can be hidden when the layout is adapting. */
+            keepLabels?: boolean;
+        };
+        /** Indicates whether or not to display a "spider web". */
+        useSpiderWeb?: boolean;
+        /** Specifies argument axis options for the dxPolarChart widget. */
+        argumentAxis?: PolarArgumentAxis;
+        /** An object defining the configuration options that are common for all axes of the dxPolarChart widget. */
+        commonAxisSettings?: PolarCommonAxisSettings;
+        /** An object defining the configuration options that are common for all series of the dxPolarChart widget. */
+        commonSeriesSettings?: CommonPolarSeriesSettings;
+        /** Specifies the options of a chart's legend. */
+        legend?: AdvancedLegend;
+        /** Specifies options for dxPolarChart widget series. */
+        series?: Array<PolarSeriesConfig>;
+        /** Defines options for the series template. */
+        seriesTemplate?: PolarSeriesTemplate;
+        /** Specifies tooltip options. */
+        tooltip?: PolarChartTooltip;
+        /** Specifies value axis options for the dxPolarChart widget. */
+        valueAxis?: PolarValueAxis;
+    }
+    /** A chart widget displaying data in a polar coordinate system. */
+    export class dxPolarChart extends BaseChart {
+        constructor(element: JQuery, options?: dxPolarChartOptions);
+        constructor(element: Element, options?: dxPolarChartOptions);
+    }
+    export interface PieLegend extends core.BaseLegend {
+        /** Specifies what chart elements to highlight when a corresponding item in the legend is hovered over. */
+        hoverMode?: string;
+        /** Specifies the text for a hint that appears when a user hovers the mouse pointer over a legend item. */
+        customizeHint?: (pointInfo: { pointName: string; pointIndex: number; pointColor: string; }) => string;
+        /** Specifies a callback function that returns the text to be displayed by a legend item. */
+        customizeText?: (pointInfo: { pointName: string; pointIndex: number; pointColor: string; }) => string;
+    }
+    export interface dxPieChartOptions extends BaseChartOptions<PiePoint> {
+        /** Specifies adaptive layout options. */
+        adaptiveLayout?: {
+            /** Specifies whether or not point labels can be hidden when the layout is adapting. */
+            keepLabels?: boolean;
+        };
+        /** Specifies dxPieChart legend options. */
+        legend?: PieLegend;
+        /** Specifies options for the series of the dxPieChart widget. */
+        series?: Array<PieSeriesConfig>;
+        /** Specifies the diameter of the pie. */
+        diameter?: number;
+        /** Specifies the direction that the pie chart segments will occupy. */
+        segmentsDirection?: string;
+        /** Specifies the angle in arc degrees from which the first segment of a pie chart should start. */
+        startAngle?: number;
+        /** Specifies the fraction of the inner radius relative to the total radius in the series of the 'doughnut' type. The value should be between 0 and 1. */
+        innerRadius?: number;
+        /** A handler for the legendClick event. */
+        onLegendClick?: any;
+        /** Specifies how a chart must behave when series point labels overlap. */
+        resolveLabelOverlapping?: string;
+        /** An object defining the configuration options that are common for all series of the dxPieChart widget. */
+        commonSeriesSettings?: CommonPieSeriesSettings;
+        /** Specifies the type of the pie chart series. */
+        type?: string;
+    }
+    /** A circular chart widget for HTML JS applications. */
+    export class dxPieChart extends BaseChart {
+        constructor(element: JQuery, options?: dxPieChartOptions);
+        constructor(element: Element, options?: dxPieChartOptions);
+        /**
+         * Provides access to the dxPieChart series.
+         * @deprecated ..\..\BaseChart\3 Methods\getAllSeries().md
+         */
+        getSeries(): PieSeries;
+    }
+}
+interface JQuery {
+    dxChart(options?: DevExpress.viz.charts.dxChartOptions): JQuery;
+    dxChart(methodName: string, ...params: any[]): any;
+    dxChart(methodName: "instance"): DevExpress.viz.charts.dxChart;
+    dxPieChart(options?: DevExpress.viz.charts.dxPieChartOptions): JQuery;
+    dxPieChart(methodName: string, ...params: any[]): any;
+    dxPieChart(methodName: "instance"): DevExpress.viz.charts.dxPieChart;
+    dxPolarChart(options?: DevExpress.viz.charts.dxPolarChartOptions): JQuery;
+    dxPolarChart(methodName: string, ...params: any[]): any;
+    dxPolarChart(methodName: "instance"): DevExpress.viz.charts.dxPolarChart;
+}
+declare module DevExpress.viz.gauges {
+    export interface BaseRangeContainer {
+        /** Specifies a range container's background color. */
+        backgroundColor?: string;
+        /** Specifies the offset of the range container from an invisible scale line in pixels. */
+        offset?: number;
+        /** Sets the name of the palette or an array of colors to be used for coloring the gauge range container. */
+        palette?: any;
+        /** An array of objects representing ranges contained in the range container. */
+        ranges?: Array<{ startValue: number; endValue: number; color: string }>;
+        /** Specifies a color of a range. */
+        color?: string;
+        /** Specifies an end value of a range. */
+        endValue?: number;
+        /** Specifies a start value of a range. */
+        startValue?: number;
+    }
+    export interface ScaleTick {
+        /** Specifies the color of the scale's minor ticks. */
+        color?: string;
+        /**
+         * Specifies an array of custom minor ticks.
+         * @deprecated ..\customMinorTicks.md
+         */
+        customTickValues?: Array<any>;
+        /** Specifies the length of the scale's minor ticks. */
+        length?: number;
+        /**
+         * Indicates whether automatically calculated minor ticks are visible or not.
+         * @deprecated This functionality in not more available
+         */
+        showCalculatedTicks?: boolean;
+        /**
+         * Specifies an interval between minor ticks.
+         * @deprecated ..\minorTickInterval.md
+         */
+        tickInterval?: number;
+        /** Indicates whether scale minor ticks are visible or not. */
+        visible?: boolean;
+        /** Specifies the width of the scale's minor ticks. */
+        width?: number;
+    }
+    export interface ScaleMajorTick extends ScaleTick {
+        /**
+         * Specifies whether or not to expand the current major tick interval if labels overlap each other.
+         * @deprecated ..\label\overlappingBehavior\useAutoArrangement.md
+         */
+        useTicksAutoArrangement?: boolean;
+    }
+    export interface ScaleMinorTick extends ScaleTick {
+        /** Specifies the opacity of the scale's minor ticks. */
+        opacity?: number;
+    }
+    export interface BaseScaleLabel {
+        /** Specifies whether or not scale labels should be colored similarly to their corresponding ranges in the range container. */
+        useRangeColors?: boolean;
+        /** Specifies a callback function that returns the text to be displayed in scale labels. */
+        customizeText?: (scaleValue: { value: number; valueText: string }) => string;
+        /** Specifies the overlap resolving options to be applied to scale labels. */
+        overlappingBehavior?: {
+            /** Specifies whether or not to expand the current major tick interval if labels overlap each other. */
+            useAutoArrangement?: boolean;
+            /** Specifies what label to hide in case of overlapping. */
+            hideFirstOrLast?: string;
+        };
+        /** Specifies font options for the text displayed in the scale labels of the gauge. */
+        font?: viz.core.Font;
+        /** Specifies a format for the text displayed in scale labels. */
+        format?: string;
+        /** Specifies a precision for the formatted value displayed in the scale labels. */
+        precision?: number;
+        /** Specifies whether or not scale labels are visible on the gauge. */
+        visible?: boolean;
+    }
+    export interface BaseScale {
+        /** Specifies the end value for the scale of the gauge. */
+        endValue?: number;
+        /**
+         * Specifies whether or not to hide the first scale label.
+         * @deprecated This functionality in not more available
+         */
+        hideFirstLabel?: boolean;
+        /**
+         * Specifies whether or not to hide the first major tick on the scale.
+         * @deprecated This functionality in not more available
+         */
+        hideFirstTick?: boolean;
+        /**
+         * Specifies whether or not to hide the last scale label.
+         * @deprecated This functionality in not more available
+         */
+        hideLastLabel?: boolean;
+        /**
+         * Specifies whether or not to hide the last major tick on the scale.
+         * @deprecated This functionality in not more available
+         */
+        hideLastTick?: boolean;
+        /** Specifies an interval between major ticks. */
+        tickInterval?: number;
+        /** Specifies an interval between minor ticks. */
+        minorTickInterval?: number;
+        /** Specifies an array of custom major ticks. */
+        customTicks?: Array<any>;
+        /** Specifies an array of custom minor ticks. */
+        customMinorTicks?: Array<any>;
+        /** Specifies common options for scale labels. */
+        label?: BaseScaleLabel;
+        /**
+         * Specifies options of the gauge's major ticks.
+         * @deprecated ..\tick\tick.md
+         */
+        majorTick?: ScaleMajorTick;
+        /** Specifies options of the gauge's major ticks. */
+        tick?: {
+            /** Specifies the color of the scale's major ticks. */
+            color?: string;
+            /** Specifies the length of the scale's major ticks. */
+            length?: number;
+            /** Indicates whether scale major ticks are visible or not. */
+            visible?: boolean;
+            /** Specifies the width of the scale's major ticks. */
+            width?: number;
+            /** Specifies the opacity of the scale's major ticks. */
+            opacity?: number;
+        };
+        /** Specifies options of the gauge's minor ticks. */
+        minorTick?: ScaleMinorTick;
+        /** Specifies the start value for the scale of the gauge. */
+        startValue?: number;
+    }
+    export interface BaseValueIndicator {
+        /** Specifies the type of subvalue indicators. */
+        type?: string;
+        /** Specifies the background color for the indicator of the rangeBar type. */
+        backgroundColor?: string;
+        /** Specifies the base value for the indicator of the rangeBar type. */
+        baseValue?: number;
+        /** Specifies a color of the indicator. */
+        color?: string;
+        /** Specifies the range bar size for an indicator of the rangeBar type. */
+        size?: number;
+        text?: {
+            /** Specifies a callback function that returns the text to be displayed in an indicator. */
+            customizeText?: (indicatedValue: { value: number; valueText: string }) => string;
+            font?: viz.core.Font;
+            /** Specifies a format for the text displayed in an indicator. */
+            format?: string;
+            /** Specifies the range bar's label indent in pixels. */
+            indent?: number;
+            /** Specifies a precision for the formatted value displayed by an indicator. */
+            precision?: number;
+        };
+        offset?: number;
+        length?: number;
+        width?: number;
+        /** Specifies the length of an arrow for the indicator of the textCloud type in pixels. */
+        arrowLength?: number;
+        /** Sets the array of colors to be used for coloring subvalue indicators. */
+        palette?: Array<any>;
+        /** Specifies the distance between the needle and the center of a gauge for the indicator of a needle-like type. */
+        indentFromCenter?: number;
+        /** Specifies the second color for the indicator of the twoColorNeedle type. */
+        secondColor?: string;
+        /** Specifies the length of a twoNeedleColor type indicator tip as a percentage. */
+        secondFraction?: number;
+        /** Specifies the spindle's diameter in pixels for the indicator of a needle-like type. */
+        spindleSize?: number;
+        /** Specifies the inner diameter in pixels, so that the spindle has the shape of a ring. */
+        spindleGapSize?: number;
+        /** Specifies the orientation of the rangeBar indicator on a vertically oriented dxLinearGauge widget. */
+        horizontalOrientation?: string;
+        /** Specifies the orientation of the rangeBar indicator on a horizontally oriented dxLinearGauge widget. */
+        verticalOrientation?: string;
+    }
+    export interface SharedGaugeOptions {
+        /** Specifies animation options. */
+        animation?: viz.core.Animation;
+        /** Specifies the appearance of the loading indicator. */
+        loadingIndicator?: viz.core.LoadingIndicator;
+        /** Specifies whether to redraw the widget when the size of the parent browser window changes or a mobile device rotates. */
+        redrawOnResize?: boolean;
+        /** Specifies the size of the widget in pixels. */
+        size?: viz.core.Size;
+        /**
+         * Specifies a subtitle for the widget.
+         * @deprecated ..\..\..\BaseGauge\1 Configuration\title\subtitle\subtitle.md
+         */
+        subtitle?: {
+            /**
+             * Specifies font options for the subtitle.
+             * @deprecated ..\..\title\subtitle\font\font.md
+             */
+            font?: viz.core.Font;
+            /**
+             * Specifies a text for the subtitle.
+             * @deprecated ..\title\subtitle\text.md
+             */
+            text?: string;
+        };
+        /** Specifies a title for a gauge. */
+        title?: {
+            /** Specifies font options for the title. */
+            font?: viz.core.Font;
+            /**
+             * Specifies a title's position on the gauge.
+             * @deprecated basegaugeoptions_title_verticalAlignment and basegaugeoptions_title_horizontalAlignment
+             */
+            position?: string;
+            /** Specifies the distance between the title and surrounding gauge elements in pixels. */
+            margin?: viz.core.Margins;
+            /** Specifies the height of the space reserved for the title. */
+            placeholderSize?: number;
+            /** Specifies the gauge title's position in the vertical direction. */
+            verticalAlignment?: string;
+            /** Specifies the gauge title's horizontal position. */
+            horizontalAlignment?: string;
+            /** Specifies text for the title. */
+            text?: string;
+            /** Specifies a subtitle for the widget. */
+            subtitle?: {
+                /** Specifies font options for the subtitle. */
+                font?: viz.core.Font;
+                /** Specifies text for the subtitle. */
+                text?: string;
+            }
+        };
+        /** Specifies options for gauge tooltips. */
+        tooltip?: viz.core.Tooltip;
+        /** A handler for the tooltipShown event. */
+        onTooltipShown?: (e: {
+            component: dxBaseGauge;
+            element: Element;
+            target: {};
+        }) => void;
+        /** A handler for the tooltipHidden event. */
+        onTooltipHidden?: (e: {
+            component: dxBaseGauge;
+            element: Element;
+            target: {};
+        }) => void;
+    }
+    export interface BaseGaugeOptions extends viz.core.BaseWidgetOptions, SharedGaugeOptions {
+        /** Specifies the color of the parent page element. */
+        containerBackgroundColor?: string;
+        /** Specifies the blank space in pixels between the widget's extreme elements and the boundaries of the area provided for the widget (see the size option). */
+        margin?: viz.core.Margins;
+        /** Specifies options of the gauge's range container. */
+        rangeContainer?: BaseRangeContainer;
+        /** Specifies a gauge's scale options. */
+        scale?: BaseScale;
+        /** Specifies the appearance options of subvalue indicators. */
+        subvalueIndicator?: BaseValueIndicator;
+        /** Specifies a set of subvalues to be designated by the subvalue indicators. */
+        subvalues?: Array<number>;
+        /** Specifies the main value on a gauge. */
+        value?: number;
+        /** Specifies the appearance options of the value indicator. */
+        valueIndicator?: BaseValueIndicator;
+    }
+    /** A gauge widget. */
+    export class dxBaseGauge extends viz.core.BaseWidget {
+        /** Displays the loading indicator. */
+        showLoadingIndicator(): void;
+        /** Conceals the loading indicator. */
+        hideLoadingIndicator(): void;
+        /** Redraws a widget. */
+        render(): void;
+        /** Returns the main gauge value. */
+        value(): number;
+        /** Updates a gauge value. */
+        value(value: number): void;
+        /** Returns an array of gauge subvalues. */
+        subvalues(): Array<number>;
+        /** Updates gauge subvalues. */
+        subvalues(subvalues: Array<number>): void;
+    }
+    export interface LinearRangeContainer extends BaseRangeContainer {
+        /** Specifies the orientation of the range container on a vertically oriented dxLinearGauge widget. */
+        horizontalOrientation?: string;
+        /** Specifies the orientation of a range container on a horizontally oriented dxLinearGauge widget. */
+        verticalOrientation?: string;
+        /** Specifies the width of the range container's start and end boundaries in the dxLinearGauge widget. */
+        width?: any;
+        /** Specifies an end width of a range container. */
+        end?: number;
+        /** Specifies a start width of a range container. */
+        start?: number;
+    }
+    export interface LinearScaleLabel extends BaseScaleLabel {
+        /** Specifies the spacing between scale labels and ticks. */
+        indentFromTick?: number;
+    }
+    export interface LinearScale extends BaseScale {
+        /** Specifies the orientation of scale ticks on a vertically oriented dxLinearGauge widget. */
+        horizontalOrientation?: string;
+        label?: LinearScaleLabel;
+        /** Specifies the orientation of scale ticks on a horizontally oriented dxLinearGauge widget. */
+        verticalOrientation?: string;
+    }
+    export interface dxLinearGaugeOptions extends BaseGaugeOptions {
+        /** Specifies the options required to set the geometry of the dxLinearGauge widget. */
+        geometry?: {
+            /** Indicates whether to display the dxLinearGauge widget vertically or horizontally. */
+            orientation?: string;
+        };
+        /** Specifies gauge range container options. */
+        rangeContainer?: LinearRangeContainer;
+        scale?: LinearScale;
+    }
+    /** A widget that represents a gauge with a linear scale. */
+    export class dxLinearGauge extends dxBaseGauge {
+        constructor(element: JQuery, options?: dxLinearGaugeOptions);
+        constructor(element: Element, options?: dxLinearGaugeOptions);
+    }
+    export interface CircularRangeContainer extends BaseRangeContainer {
+        /** Specifies the orientation of the range container in the dxCircularGauge widget. */
+        orientation?: string;
+        /** Specifies the range container's width in pixels. */
+        width?: number;
+    }
+    export interface CircularScaleLabel extends BaseScaleLabel {
+        /** Specifies the spacing between scale labels and ticks. */
+        indentFromTick?: number;
+    }
+    export interface CircularScale extends BaseScale {
+        label?: CircularScaleLabel;
+        /** Specifies the orientation of scale ticks. */
+        orientation?: string;
+    }
+    export interface dxCircularGaugeOptions extends BaseGaugeOptions {
+        /** Specifies the options required to set the geometry of the dxCircularGauge widget. */
+        geometry?: {
+            /** Specifies the end angle of the circular gauge's arc. */
+            endAngle?: number;
+            /** Specifies the start angle of the circular gauge's arc. */
+            startAngle?: number;
+        };
+        /** Specifies gauge range container options. */
+        rangeContainer?: CircularRangeContainer;
+        scale?: CircularScale;
+    }
+    /** A widget that represents a gauge with a circular scale. */
+    export class dxCircularGauge extends dxBaseGauge {
+        constructor(element: JQuery, options?: dxCircularGaugeOptions);
+        constructor(element: Element, options?: dxCircularGaugeOptions);
+    }
+    export interface dxBarGaugeOptions extends viz.core.BaseWidgetOptions, SharedGaugeOptions {
+        /** Specifies a color for the remaining segment of the bar's track. */
+        backgroundColor?: string;
+        /** Specifies a distance between bars in pixels. */
+        barSpacing?: number;
+        /** Specifies a base value for bars. */
+        baseValue?: number;
+        /** Specifies an end value for the gauge's invisible scale. */
+        endValue?: number;
+        /** Defines the shape of the gauge's arc. */
+        geometry?: {
+            /** Specifies the end angle of the bar gauge's arc. */
+            endAngle?: number;
+            /** Specifies the start angle of the bar gauge's arc. */
+            startAngle?: number;
+        };
+        /** Specifies the options of the labels that accompany gauge bars. */
+        label?: {
+            /** Specifies a color for the label connector text. */
+            connectorColor?: string;
+            /** Specifies the width of the label connector in pixels. */
+            connectorWidth?: number;
+            /** Specifies a callback function that returns a text for labels. */
+            customizeText?: (barValue: { value: number; valueText: string }) => string;
+            /** Specifies font options for bar labels. */
+            font?: viz.core.Font;
+            /** Specifies a format for bar labels. */
+            format?: string;
+            /** Specifies the distance between the upper bar and bar labels in pixels. */
+            indent?: number;
+            /** Specifies a precision for the formatted value displayed by labels. */
+            precision?: number;
+            /** Specifies whether bar labels appear on a gauge or not. */
+            visible?: boolean;
+        };
+        /** Sets the name of the palette or an array of colors to be used for coloring the gauge range container. */
+        palette?: string;
+        /** Defines the radius of the bar that is closest to the center relatively to the radius of the topmost bar. */
+        relativeInnerRadius?: number;
+        /** Specifies a start value for the gauge's invisible scale. */
+        startValue?: number;
+        /** Specifies the array of values to be indicated on a bar gauge. */
+        values?: Array<number>;
+    }
+    /** A circular bar widget. */
+    export class dxBarGauge extends viz.core.BaseWidget {
+        constructor(element: JQuery, options?: dxBarGaugeOptions);
+        constructor(element: Element, options?: dxBarGaugeOptions);
+        /** Displays the loading indicator. */
+        showLoadingIndicator(): void;
+        /** Conceals the loading indicator. */
+        hideLoadingIndicator(): void;
+        /** Redraws the widget. */
+        render(): void;
+        /** Returns an array of gauge values. */
+        values(): Array<number>;
+        /** Updates the values displayed by a gauge. */
+        values(values: Array<number>): void;
+    }
+}
+interface JQuery {
+    dxLinearGauge(options?: DevExpress.viz.gauges.dxLinearGaugeOptions): JQuery;
+    dxLinearGauge(methodName: string, ...params: any[]): any;
+    dxLinearGauge(methodName: "instance"): DevExpress.viz.gauges.dxLinearGauge;
+    dxCircularGauge(options?: DevExpress.viz.gauges.dxCircularGaugeOptions): JQuery;
+    dxCircularGauge(methodName: string, ...params: any[]): any;
+    dxCircularGauge(methodName: "instance"): DevExpress.viz.gauges.dxCircularGauge;
+    dxBarGauge(options?: DevExpress.viz.gauges.dxBarGaugeOptions): JQuery;
+    dxBarGauge(methodName: string, ...params: any[]): any;
+    dxBarGauge(methodName: "instance"): DevExpress.viz.gauges.dxBarGauge;
+}
+declare module DevExpress.viz.rangeSelector {
+    export interface dxRangeSelectorOptions extends viz.core.BaseWidgetOptions {
+        /** Specifies the options for the range selector's background. */
+        background?: {
+            /** Specifies the background color for the dxRangeSelector. */
+            color?: string;
+            /** Specifies image options. */
+            image?: {
+                /** Specifies a location for the image in the background of a range selector. */
+                location?: string;
+                /** Specifies the image's URL. */
+                url?: string;
+            };
+            /** Indicates whether or not the background (background color and/or image) is visible. */
+            visible?: boolean;
+        };
+        /** Specifies a title for the range selector. */
+        title?: viz.core.Title;
+        /** Specifies the dxRangeSelector's behavior options. */
+        behavior?: {
+            /** Indicates whether or not you can swap sliders. */
+            allowSlidersSwap?: boolean;
+            /** Indicates whether or not animation is enabled. */
+            animationEnabled?: boolean;
+            /** Specifies when to call the onSelectedRangeChanged function. */
+            callSelectedRangeChanged?: string;
+            /** Indicates whether or not an end user can specify the range using a mouse, without the use of sliders. */
+            manualRangeSelectionEnabled?: boolean;
+            /** Indicates whether or not an end user can shift the selected range to the required location on a scale by clicking. */
+            moveSelectedRangeByClick?: boolean;
+            /** Indicates whether to snap a slider to ticks. */
+            snapToTicks?: boolean;
+        };
+        /** Specifies the options required to display a chart as the range selector's background. */
+        chart?: {
+            /** Specifies a coefficient for determining an indent from the bottom background boundary to the lowest chart point. */
+            bottomIndent?: number;
+            /** An object defining the common configuration options for the chart’s series. */
+            commonSeriesSettings?: viz.charts.CommonSeriesSettings;
+            /** An object providing options for managing data from a data source. */
+            dataPrepareSettings?: {
+                /** Specifies whether or not to validate values from a data source. */
+                checkTypeForAllData?: boolean;
+                /** Specifies whether or not to convert the values from a data source into the data type of an axis. */
+                convertToAxisDataType?: boolean;
+                /** Specifies how to sort series points. */
+                sortingMethod?: any;
+            };
+            /** Specifies whether all bars in a series must have the same width, or may have different widths if any points in other series are missing. */
+            equalBarWidth?: boolean;
+            /** Specifies a common bar width as a percentage from 0 to 1. */
+            barWidth?: number;
+            /** Forces the widget to treat negative values as zeroes. Applies to stacked-like series only. */
+            negativesAsZeroes?: boolean;
+            /** Sets the name of the palette to be used in the range selector's chart. Alternatively, an array of colors can be set as a custom palette to be used within this chart. */
+            palette?: any;
+            /** An object defining the chart’s series. */
+            series?: Array<viz.charts.SeriesConfig>;
+            /** Defines options for the series template. */
+            seriesTemplate?: viz.charts.SeriesTemplate;
+            /** Specifies a coefficient for determining an indent from the background's top boundary to the topmost chart point. */
+            topIndent?: number;
+            /** Specifies whether or not to filter the series points depending on their quantity. */
+            useAggregation?: boolean;
+            /** Specifies options for the chart's value axis. */
+            valueAxis?: {
+                /** Indicates whether or not the chart's value axis must be inverted. */
+                inverted?: boolean;
+                /** Specifies the value to be raised to a power when generating ticks for a logarithmic value axis. */
+                logarithmBase?: number;
+                /** Specifies the maximum value of the chart's value axis. */
+                max?: number;
+                /** Specifies the minimum value of the chart's value axis. */
+                min?: number;
+                /** Specifies the type of the value axis. */
+                type?: string;
+                /** Specifies the desired type of axis values. */
+                valueType?: string;
+            };
+        };
+        /** Specifies the color of the parent page element. */
+        containerBackgroundColor?: string;
+        /** Specifies a data source for the scale values and for the chart at the background. */
+        dataSource?: any;
+        /** Specifies the data source field that provides data for the scale. */
+        dataSourceField?: string;
+        /** Specifies the appearance of the loading indicator. */
+        loadingIndicator?: viz.core.LoadingIndicator;
+        /** Specifies the blank space in pixels between the dxRangeSelector widget's extreme elements and the boundaries of the area provided for the widget (see size). */
+        margin?: viz.core.Margins;
+        /** Specifies whether to redraw the widget when the size of the parent browser window changes or a mobile device rotates. */
+        redrawOnResize?: boolean;
+        /** Specifies options of the range selector's scale. */
+        scale?: {
+            /** Specifies the scale's end value. */
+            endValue?: any;
+            /** Specifies common options for scale labels. */
+            label?: {
+                /** Specifies a callback function that returns the text to be displayed in scale labels. */
+                customizeText?: (scaleValue: { value: any; valueText: string; }) => string;
+                /** Specifies font options for the text displayed in the range selector's scale labels. */
+                font?: viz.core.Font;
+                /** Specifies a format for the text displayed in scale labels. */
+                format?: string;
+                /** Specifies a precision for the formatted value displayed in the scale labels. */
+                precision?: number;
+                /** Specifies a spacing between scale labels and the background bottom edge. */
+                topIndent?: number;
+                /** Specifies whether or not the scale's labels are visible. */
+                visible?: boolean;
+            };
+            /** Specifies the value to be raised to a power when generating ticks for a logarithmic scale. */
+            logarithmBase?: number;
+            /**
+             * Specifies an interval between major ticks.
+             * @deprecated ..\tickInterval\tickInterval.md
+             */
+            majorTickInterval?: any;
+            /** Specifies an interval between axis ticks. */
+            tickInterval?: any;
+            /** Specifies options for the date-time scale's markers. */
+            marker?: {
+                /** Defines the options that can be set for the text that is displayed by the scale markers. */
+                label?: {
+                    /** Specifies a callback function that returns the text to be displayed in scale markers. */
+                    customizeText?: (markerValue: { value: any; valueText: string }) => string;
+                    /** Specifies a format for the text displayed in scale markers. */
+                    format?: string;
+                };
+                /** Specifies the height of the marker's separator. */
+                separatorHeight?: number;
+                /** Specifies the space between the marker label and the marker separator. */
+                textLeftIndent?: number;
+                /** Specifies the space between the marker's label and the top edge of the marker's separator. */
+                textTopIndent?: number;
+                /** Specified the indent between the marker and the scale lables. */
+                topIndent?: number;
+                /** Indicates whether scale markers are visible. */
+                visible?: boolean;
+            };
+            /** Specifies the maximum range that can be selected. */
+            maxRange?: any;
+            /** Specifies the number of minor ticks between neighboring major ticks. */
+            minorTickCount?: number;
+            /** Specifies an interval between minor ticks. */
+            minorTickInterval?: any;
+            /** Specifies the minimum range that can be selected. */
+            minRange?: any;
+            /** Specifies the height of the space reserved for the scale in pixels. */
+            placeholderHeight?: number;
+            /** Indicates whether or not to set ticks of a date-time scale at the beginning of each date-time interval. */
+            setTicksAtUnitBeginning?: boolean;
+            /** Specifies whether or not to show ticks for the boundary scale values, when neither major ticks nor minor ticks are created for these values. */
+            showCustomBoundaryTicks?: boolean;
+            /**
+             * Indicates whether or not to show minor ticks on the scale.
+             * @deprecated minorTick\visible.md
+             */
+            showMinorTicks?: boolean;
+            /** Specifies the scale's start value. */
+            startValue?: any;
+            /** Specifies options defining the appearance of scale ticks. */
+            tick?: {
+                /** Specifies the color of scale ticks (both major and minor ticks). */
+                color?: string;
+                /** Specifies the opacity of scale ticks (both major and minor ticks). */
+                opacity?: number;
+                /** Specifies the width of the scale's ticks (both major and minor ticks). */
+                width?: number;
+            };
+            /** Specifies options of the range selector's minor ticks. */
+            minorTick?: {
+                /** Specifies the color of the scale's minor ticks. */
+                color?: string;
+                /** Specifies the opacity of the scale's minor ticks. */
+                opacity?: number;
+                /** Specifies the width of the scale's minor ticks. */
+                width?: number;
+                /** Indicates whether scale minor ticks are visible or not. */
+                visible?: boolean;
+            };
+            /** Specifies the type of the scale. */
+            type?: string;
+            /** Specifies whether or not to expand the current tick interval if labels overlap each other. */
+            useTicksAutoArrangement?: boolean;
+            /** Specifies the type of values on the scale. */
+            valueType?: string;
+			/** Specifies the order of arguments on a discrete scale. */
+			categories?: Array<any>;
+        };
+        /** Specifies the range to be selected when displaying the dxRangeSelector. */
+        selectedRange?: {
+            /** Specifies the start value of the range to be selected when displaying the dxRangeSelector widget on a page. */
+            startValue?: any;
+            /** Specifies the end value of the range to be selected when displaying the dxRangeSelector widget on a page. */
+            endValue?: any;
+        };
+        /** Specifies the color of the selected range. */
+        selectedRangeColor?: string;
+        /** Range selector's indent options. */
+        indent?: {
+            /** Specifies range selector's left indent. */
+            left?: number;
+            /** Specifies range selector's right indent. */
+            right?: number;
+        };
+        /** A handler for the selectedRangeChanged event. */
+        onSelectedRangeChanged?: (e: {
+            startValue: any;
+            endValue: any;
+            component: dxRangeSelector;
+            element: Element;
+        }) => void;
+        /** Specifies range selector shutter options. */
+        shutter?: {
+            /** Specifies shutter color. */
+            color?: string;
+            /** Specifies the opacity of the color of shutters. */
+            opacity?: number;
+        };
+        /** Specifies in pixels the size of the dxRangeSelector widget. */
+        size?: viz.core.Size;
+        /** Specifies the appearance of the range selector's slider handles. */
+        sliderHandle?: {
+            /** Specifies the color of the slider handles. */
+            color?: string;
+            /** Specifies the opacity of the slider handles. */
+            opacity?: number;
+            /** Specifies the width of the slider handles. */
+            width?: number;
+        };
+        /** Defines the options of the range selector slider markers. */
+        sliderMarker?: {
+            /** Specifies the color of the slider markers. */
+            color?: string;
+            /** Specifies a callback function that returns the text to be displayed by slider markers. */
+            customizeText?: (scaleValue: { value: any; valueText: any; }) => string;
+            /** Specifies font options for the text displayed by the range selector slider markers. */
+            font?: viz.core.Font;
+            /** Specifies a format for the text displayed in slider markers. */
+            format?: string;
+            /** Specifies the color used for the slider marker text when the currently selected range does not match the minRange and maxRange values. */
+            invalidRangeColor?: string;
+            /**
+             * Specifies the empty space between the marker's border and the marker’s text.
+             * @deprecated Use the 'paddingTopBottom' and 'paddingLeftRight' options instead
+             */
+            padding?: number;
+            /** Specifies the empty space between the marker's top and bottom borders and the marker's text. */
+            paddingTopBottom?: number;
+            /** Specifies the empty space between the marker's left and right borders and the marker's text. */
+            paddingLeftRight?: number;
+            /** Specifies the placeholder height of the slider marker. */
+            placeholderHeight?: number;
+            /**
+             * Specifies in pixels the height and width of the space reserved for the range selector slider markers.
+             * @deprecated Use the 'placeholderHeight' and 'indent' options instead
+             */
+            placeholderSize?: {
+                /** Specifies the height of the placeholder for the left and right slider markers. */
+                height?: number;
+                /** Specifies the width of the placeholder for the left and right slider markers. */
+                width?: {
+                    /** Specifies the width of the left slider marker's placeholder. */
+                    left?: number;
+                    /** Specifies the width of the right slider marker's placeholder. */
+                    right?: number;
+                };
+            };
+            /** Specifies a precision for the formatted value displayed in slider markers. */
+            precision?: number;
+            /** Indicates whether or not the slider markers are visible. */
+            visible?: boolean;
+        };
+    }
+    /** A widget that allows end users to select a range of values on a scale. */
+    export class dxRangeSelector extends viz.core.BaseWidget {
+        constructor(element: JQuery, options?: dxRangeSelectorOptions);
+        constructor(element: Element, options?: dxRangeSelectorOptions);
+        /** Displays the loading indicator. */
+        showLoadingIndicator(): void;
+        /** Conceals the loading indicator. */
+        hideLoadingIndicator(): void;
+        /** Redraws a widget. */
+        render(skipChartAnimation?: boolean): void;
+        /** Returns the currently selected range. */
+        getSelectedRange(): { startValue: any; endValue: any; };
+        /** Sets a specified range. */
+        setSelectedRange(selectedRange: { startValue: any; endValue: any; }): void;
+    }
+}
+interface JQuery {
+    dxRangeSelector(options?: DevExpress.viz.rangeSelector.dxRangeSelectorOptions): JQuery;
+    dxRangeSelector(methodName: string, ...params: any[]): any;
+    dxRangeSelector(methodName: "instance"): DevExpress.viz.rangeSelector.dxRangeSelector;
+}
+declare module DevExpress.viz.map {
+    /** This section describes the fields and methods that can be used in code to manipulate the Layer object. */
+    export interface MapLayer {
+        /** The name of the layer. */
+        name: string;
+        /** The layer index in the layers array. */
+        index: number;
+        /** The layer type. Can be "area", "line" or "marker". */
+        type: string;
+        /** The type of the layer elements. */
+        elementType: string;
+        /** Gets all layer elements. */
+        getElements(): Array<MapLayerElement>;
+        /** Deselects all layer elements. */
+        clearSelection(): void;
+    }
+    /** This section describes the fields and methods that can be used in code to manipulate the Layer Element object. */
+    export interface MapLayerElement {
+        /** The parent layer of the layer element. */
+        layer: MapLayer;
+        /** Gets the layer element coordinates. */
+        coordinates(): Object;
+        /** Sets the value of an attribute. */
+        attribute(name: string, value: any): void;
+        /** Gets the value of an attribute. */
+        attribute(name: string): any;
+        /** Gets the selection state of the layer element. */
+        selected(): boolean;
+        /** Sets the selection state of the layer element. */
+        selected(state: boolean): void;
+        /** Applies the layer element settings and updates element appearance. */
+        applySettings(settings: any): void;
+    }
+    /**
+     * This section describes the fields and methods that can be used in code to manipulate the Area object.
+     * @deprecated Use the "Layer Element" instead
+     */
+    export interface Area {
+        /**
+         * Contains the element type.
+         * @deprecated ..\..\Layer\2 Fields\type.md
+         */
+        type: string;
+        /**
+         * Return the value of an attribute.
+         * @deprecated ..\..\Layer Element\3 Methods\attribute(name_value).md
+         */
+        attribute(name: string): any;
+        /**
+         * Provides information about the selection state of an area.
+         * @deprecated Use the "selected()" method of the Layer Element
+         */
+        selected(): boolean;
+        /**
+         * Sets a new selection state for an area.
+         * @deprecated Use the "selected(state)" method of the Layer Element
+         */
+        selected(state: boolean): void;
+        /**
+         * Applies the area settings specified as a parameter and updates the area appearance.
+         * @deprecated ..\..\Layer Element\3 Methods\applySettings(settings).md
+         */
+        applySettings(settings: any): void;
+    }
+    /**
+     * This section describes the fields and methods that can be used in code to manipulate the Markers object.
+     * @deprecated Use the "Layer Element" instead
+     */
+    export interface Marker {
+        /**
+         * Contains the descriptive text accompanying the map marker.
+         * @deprecated Get the text with the "attribute" method (using the "layers.label.dataField" value)
+         */
+        text: string;
+        /**
+         * Contains the type of the element.
+         * @deprecated ..\..\Layer\2 Fields\type.md
+         */
+        type: string;
+        /**
+         * Contains the URL of an image map marker.
+         * @deprecated Get the url with the "attribute" method (using the "layers.dataField" value)
+         */
+        url: string;
+        /**
+         * Contains the value of a bubble map marker.
+         * @deprecated Get the value with the "attribute" method (using the "layers.dataField" value)
+         */
+        value: number;
+        /**
+         * Contains the values of a pie map marker.
+         * @deprecated Get the values with the "attribute" method (using the "layers.dataField" value)
+         */
+        values: Array<number>;
+        /**
+         * Returns the value of an attribute.
+         * @deprecated ..\..\Layer Element\3 Methods\attribute(name_value).md
+         */
+        attribute(name: string): any;
+        /**
+         * Returns the coordinates of a specific marker.
+         * @deprecated ..\..\Layer Element\3 Methods\coordinates().md
+         */
+        coordinates(): Array<number>;
+        /**
+         * Provides information about the selection state of a marker.
+         * @deprecated Use the "selected()" method of the Layer Element
+         */
+        selected(): boolean;
+        /**
+         * Sets a new selection state for a marker.
+         * @deprecated Use the "selected(state)" method of the Layer Element
+         */
+        selected(state: boolean): void;
+        /**
+         * Applies the marker settings specified as a parameter and updates marker appearance.
+         * @deprecated ..\..\Layer Element\3 Methods\applySettings(settings).md
+         */
+        applySettings(settings: any): void;
+    }
+    export interface MapLayerSettings {
+        /** Specifies the layer name. */
+        name?: string;
+        /** Specifies layer type. */
+        type?: string;
+        /** Specifies the type of a marker element. Setting this option makes sense only if the layer type is "marker". */
+        elementType?: string;
+        /** Specifies a data source for the layer. */
+        data?: any;
+        /** Specifies the line width (for layers of a line type) or width of the layer elements border in pixels. */
+        borderWidth?: number;
+        /** Specifies a color for the border of the layer elements. */
+        borderColor?: string;
+        /** Specifies a color for layer elements. */
+        color?: string;
+        /** Specifies a color for the border of the layer element when it is hovered over. */
+        hoveredBorderColor?: string;
+        /** Specifies the pixel-measured line width (for layers of a line type) or width for the border of the layer element when it is hovered over. */
+        hoveredBorderWidth?: number;
+        /** Specifies a color for a layer element when it is hovered over. */
+        hoveredColor?: string;
+        /** Specifies a pixel-measured line width (for layers of a line type) or width for the border of the layer element when it is selected. */
+        selectedBorderWidth?: number;
+        /** Specifies a color for the border of the layer element when it is selected. */
+        selectedBorderColor?: string;
+        /** Specifies a color for the layer element when it is selected. */
+        selectedColor?: string;
+        /** Specifies the layer opacity (from 0 to 1). */
+        opacity?: number;
+        /** Specifies the size of markers. Setting this option makes sense only if the layer type is "marker" and the elementType is "dot", "pie" or "image". */
+        size?: number;
+        /** Specifies the pixel-measured diameter of the marker that represents the smallest value. Setting this option makes sense only if the layer type is "marker". */
+        minSize?: number;
+        /** Specifies the pixel-measured diameter of the marker that represents the biggest value. Setting this option makes sense only if the layer type is "marker". */
+        maxSize?: number;
+        /** Specifies whether or not to change the appearance of a layer element when it is hovered over. */
+        hoverEnabled?: boolean;
+        /** Specifies whether single or multiple map elements can be selected on a vector map. */
+        selectionMode?: string;
+        /** Specifies the name of the palette or a custom range of colors to be used for coloring a layer. */
+        palette?: any;
+        /** Specifies the number of colors in a palette. */
+        paletteSize?: number;
+        /** Allows you to paint layer elements with similar attributes in the same color. */
+        colorGroups?: Array<number>;
+        /** Specifies the field that provides data to be used for coloring of layer elements. */
+        colorGroupingField?: string;
+        /** Allows you to display bubbles with similar attributes in the same size. Setting this option makes sense only if the layer type is "marker" and the elementType is "bubble". */
+        sizeGroups?: Array<number>;
+        /** Specifies the field that provides data to be used for sizing bubble markers. Setting this option makes sense only if the layer type is "marker" and the elementType is "bubble". */
+        sizeGroupingField?: string;
+        /** Specifies the name of the attribute containing marker data. Setting this option makes sense only if the layer type is "marker" and the elementType is "bubble", "pie" or "image". */
+        dataField?: string;
+        /** Specifies the function that customizes each layer element individually. */
+        customize?: (eleemnts: Array<MapLayerElement>) => void;
+        /** Specifies marker label options. */
+        label?: {
+            /** The name of the data attribute containing marker texts. */
+            dataField?: string;
+            /** Enables marker labels. */
+            enabled?: boolean;
+            /** Specifies font options for marker labels. */
+            font?: viz.core.Font;
+        };
+    }
+    export interface AreaSettings {
+        /**
+         * Specifies the width of the area border in pixels.
+         * @deprecated ..\layers\borderWidth.md
+         */
+        borderWidth?: number;
+        /**
+         * Specifies a color for the area border.
+         * @deprecated ..\layers\borderColor.md
+         */
+        borderColor?: string;
+        /**
+         * Specifies a color for an area.
+         * @deprecated ..\layers\color.md
+         */
+        color?: string;
+        /**
+         * Specifies the function that customizes each area individually.
+         * @deprecated ..\layers\customize.md
+         */
+        customize?: (areaInfo: Area) => AreaSettings;
+        /**
+         * Specifies a color for the area border when the area is hovered over.
+         * @deprecated ..\layers\hoveredBorderColor.md
+         */
+        hoveredBorderColor?: string;
+        /**
+         * Specifies the pixel-measured width of the area border when the area is hovered over.
+         * @deprecated ..\layers\hoveredBorderWidth.md
+         */
+        hoveredBorderWidth?: number;
+        /**
+         * Specifies a color for an area when this area is hovered over.
+         * @deprecated ..\layers\hoveredColor.md
+         */
+        hoveredColor?: string;
+        /**
+         * Specifies whether or not to change the appearance of an area when it is hovered over.
+         * @deprecated ..\layers\hoverEnabled.md
+         */
+        hoverEnabled?: boolean;
+        /**
+         * Configures area labels.
+         * @deprecated ..\..\layers\label\label.md
+         */
+        label?: {
+            /**
+             * Specifies the data field that provides data for area labels.
+             * @deprecated ..\..\layers\label\dataField.md
+             */
+            dataField?: string;
+            /**
+             * Enables area labels.
+             * @deprecated ..\..\layers\label\enabled.md
+             */
+            enabled?: boolean;
+            /**
+             * Specifies font options for area labels.
+             * @deprecated ..\..\..\layers\label\font\font.md
+             */
+            font?: viz.core.Font;
+        };
+        /**
+         * Specifies the name of the palette or a custom range of colors to be used for coloring a map.
+         * @deprecated ..\layers\palette.md
+         */
+        palette?: any;
+        /**
+         * Specifies the number of colors in a palette.
+         * @deprecated ..\layers\paletteSize.md
+         */
+        paletteSize?: number;
+        /**
+         * Allows you to paint areas with similar attributes in the same color.
+         * @deprecated ..\layers\colorGroups.md
+         */
+        colorGroups?: Array<number>;
+        /**
+         * Specifies the field that provides data to be used for coloring areas.
+         * @deprecated ..\layers\colorGroupingField.md
+         */
+        colorGroupingField?: string;
+        /**
+         * Specifies a color for the area border when the area is selected.
+         * @deprecated ..\layers\selectedBorderColor.md
+         */
+        selectedBorderColor?: string;
+        /**
+         * Specifies a color for an area when this area is selected.
+         * @deprecated ..\layers\selectedColor.md
+         */
+        selectedColor?: string;
+        /**
+         * Specifies the pixel-measured width of the area border when the area is selected.
+         * @deprecated ..\layers\selectedBorderWidth.md
+         */
+        selectedBorderWidth?: number;
+        /**
+         * Specifies whether single or multiple areas can be selected on a vector map.
+         * @deprecated ..\layers\selectionMode.md
+         */
+        selectionMode?: string;
+    }
+    export interface MarkerSettings {
+        /**
+         * Specifies a color for the marker border.
+         * @deprecated ..\layers\borderColor.md
+         */
+        borderColor?: string;
+        /**
+         * Specifies the width of the marker border in pixels.
+         * @deprecated ..\layers\borderWidth.md
+         */
+        borderWidth?: number;
+        /**
+         * Specifies a color for a marker of the dot or bubble type.
+         * @deprecated ..\layers\color.md
+         */
+        color?: string;
+        /**
+         * Specifies the function that customizes each marker individually.
+         * @deprecated ..\layers\customize.md
+         */
+        customize?: (markerInfo: Marker) => MarkerSettings;
+        /**
+         * Specifies the pixel-measured width of the marker border when the marker is hovered over.
+         * @deprecated ..\layers\hoveredBorderWidth.md
+         */
+        hoveredBorderWidth?: number;
+        /**
+         * Specifies a color for the marker border when the marker is hovered over.
+         * @deprecated ..\layers\hoveredBorderColor.md
+         */
+        hoveredBorderColor?: string;
+        /**
+         * Specifies a color for a marker of the dot or bubble type when this marker is hovered over.
+         * @deprecated ..\layers\hoveredColor.md
+         */
+        hoveredColor?: string;
+        /**
+         * Specifies whether or not to change the appearance of a marker when it is hovered over.
+         * @deprecated ..\layers\hoverEnabled.md
+         */
+        hoverEnabled?: boolean;
+        /**
+         * Specifies marker label options.
+         * @deprecated ..\..\layers\label\label.md
+         */
+        label?: {
+            /**
+             * Enables marker labels.
+             * @deprecated ..\..\layers\label\enabled.md
+             */
+            enabled?: boolean;
+            /**
+             * Specifies font options for marker labels.
+             * @deprecated ..\..\..\layers\label\font\font.md
+             */
+            font?: viz.core.Font;
+        };
+        /**
+         * Specifies the pixel-measured diameter of the marker that represents the biggest value. Setting this option makes sense only if you use markers of the bubble type.
+         * @deprecated ..\layers\maxSize.md
+         */
+        maxSize?: number;
+        /**
+         * Specifies the pixel-measured diameter of the marker that represents the smallest value. Setting this option makes sense only if you use markers of the bubble type.
+         * @deprecated ..\layers\minSize.md
+         */
+        minSize?: number;
+        /**
+         * Specifies the opacity of markers. Setting this option makes sense only if you use markers of the bubble type.
+         * @deprecated ..\layers\opacity.md
+         */
+        opacity?: number;
+        /**
+         * Specifies the pixel-measured width of the marker border when the marker is selected.
+         * @deprecated ..\layers\selectedBorderWidth.md
+         */
+        selectedBorderWidth?: number;
+        /**
+         * Specifies a color for the marker border when the marker is selected.
+         * @deprecated ..\layers\selectedBorderColor.md
+         */
+        selectedBorderColor?: string;
+        /**
+         * Specifies a color for a marker of the dot or bubble type when this marker is selected.
+         * @deprecated ..\layers\selectedColor.md
+         */
+        selectedColor?: string;
+        /**
+         * Specifies whether a single or multiple markers can be selected on a vector map.
+         * @deprecated ..\layers\selectionMode.md
+         */
+        selectionMode?: string;
+        /**
+         * Specifies the size of markers. Setting this option makes sense for any type of marker except bubble.
+         * @deprecated ..\layers\size.md
+         */
+        size?: number;
+        /**
+         * Specifies the type of markers to be used on the map.
+         * @deprecated ..\layers\elementType.md
+         */
+        type?: string;
+        /**
+         * Specifies the name of a palette or a custom set of colors to be used for coloring markers of the pie type.
+         * @deprecated ..\layers\palette.md
+         */
+        palette?: any;
+        /**
+         * Allows you to paint markers with similar attributes in the same color.
+         * @deprecated ..\layers\colorGroups.md
+         */
+        colorGroups?: Array<number>;
+        /**
+         * Specifies the field that provides data to be used for coloring markers.
+         * @deprecated ..\layers\colorGroupingField.md
+         */
+        colorGroupingField?: string;
+        /**
+         * Allows you to display bubbles with similar attributes in the same size.
+         * @deprecated ..\layers\sizeGroups.md
+         */
+        sizeGroups?: Array<number>;
+        /**
+         * Specifies the field that provides data to be used for sizing bubble markers.
+         * @deprecated ..\layers\sizeGroupingField.md
+         */
+        sizeGroupingField?: string;
+    }
+    export interface dxVectorMapOptions extends viz.core.BaseWidgetOptions {
+        /**
+         * An object specifying options for the map areas.
+         * @deprecated Use the 'layers' option instead
+         */
+        areaSettings?: AreaSettings;
+        /** Specifies the options for the map background. */
+        background?: {
+            /** Specifies a color for the background border. */
+            borderColor?: string;
+            /** Specifies a color for the background. */
+            color?: string;
+        };
+        /** Specifies options for dxVectorMap widget layers. */
+        layers?: Array<MapLayerSettings>;
+        /** Specifies the map projection. */
+        projection?: Object;
+        /** Specifies the positioning of a map in geographical coordinates. */
+        bounds?: Array<number>;
+        /** Specifies the options of the control bar. */
+        controlBar?: {
+            /** Specifies a color for the outline of the control bar elements. */
+            borderColor?: string;
+            /** Specifies a color for the inner area of the control bar elements. */
+            color?: string;
+            /** Specifies whether or not to display the control bar. */
+            enabled?: boolean;
+            /** Specifies the margin of the control bar in pixels. */
+            margin?: number;
+            /** Specifies the position of the control bar. */
+            horizontalAlignment?: string;
+            /** Specifies the position of the control bar. */
+            verticalAlignment?: string;
+            /** Specifies the opacity of the Control_Bar. */
+            opacity?: number;
+        };
+        /** Specifies the appearance of the loading indicator. */
+        loadingIndicator?: viz.core.LoadingIndicator;
+        /**
+         * Specifies a data source for the map area.
+         * @deprecated Use the 'layers.data' option instead
+         */
+        mapData?: any;
+        /**
+         * Specifies a data source for the map markers.
+         * @deprecated Use the 'layers.data' option instead
+         */
+        markers?: any;
+        /**
+         * An object specifying options for the map markers.
+         * @deprecated Use the 'layers' option instead
+         */
+        markerSettings?: MarkerSettings;
+        /** Specifies the size of the dxVectorMap widget. */
+        size?: viz.core.Size;
+        /** Specifies a title for the vector map. */
+        title?: viz.core.Title;
+        /** Specifies tooltip options. */
+        tooltip?: viz.core.Tooltip;
+        /** Configures map legends. */
+        legends?: Array<Legend>;
+        /** Specifies whether or not the map should respond when a user rolls the mouse wheel. */
+        wheelEnabled?: boolean;
+        /** Specifies whether the map should respond to touch gestures. */
+        touchEnabled?: boolean;
+        /** Disables the zooming capability. */
+        zoomingEnabled?: boolean;
+        /** Specifies the geographical coordinates of the center for a map. */
+        center?: Array<number>;
+        /** A handler for the centerChanged event. */
+        onCenterChanged?: (e: {
+			center: Array<number>;
+			component: dxVectorMap;
+			element: Element;
+        }) => void;
+        /** A handler for the tooltipShown event. */
+        onTooltipShown?: (e: {
+            component: dxVectorMap;
+            element: Element;
+            target: {};
+        }) => void;
+        /** A handler for the tooltipHidden event. */
+        onTooltipHidden?: (e: {
+            component: dxVectorMap;
+            element: Element;
+            target: {};
+        }) => void;
+        /** Specifies a number that is used to zoom a map initially. */
+        zoomFactor?: number;
+        /** Specifies a map's maximum zoom factor. */
+        maxZoomFactor?: number;
+        /** A handler for the zoomFactorChanged event. */
+        onZoomFactorChanged?: (e: {
+            component: dxVectorMap;
+            element: Element;
+            zoomFactor: number;
+        }) => void;
+        /** A handler for the click event. */
+        onClick?: any;
+        /** A handler for the selectionChanged event. */
+        onSelectionChanged?: (e: {
+            component: dxVectorMap;
+            element: Element;
+            target: MapLayerElement;
+        }) => void;
+        /**
+         * A handler for the areaClick event.
+         * @deprecated Use the 'onClick' option instead
+         */
+        onAreaClick?: any;
+        /**
+         * A handler for the areaSelectionChanged event.
+         * @deprecated Use the 'onSelectionChanged' option instead
+         */
+        onAreaSelectionChanged?: (e: {
+            target: Area;
+            component: dxVectorMap;
+            element: Element;
+        }) => void;
+        /**
+         * A handler for the markerClick event.
+         * @deprecated Use the 'onClick' option instead
+         */
+        onMarkerClick?: any;
+        /**
+         * A handler for the markerSelectionChanged event.
+         * @deprecated Use the 'onSelecitonChanged' option instead
+         */
+        onMarkerSelectionChanged?: (e: {
+            target: Marker;
+            component: dxVectorMap;
+            element: Element;
+        }) => void;
+        /** Disables the panning capability. */
+        panningEnabled?: boolean;
+    }
+    export interface Legend extends viz.core.BaseLegend {
+        /** Specifies the color of item markers in the legend. The specified color applied only when the legend uses 'size' source. */
+        markerColor?: string;
+        /** Specifies text for legend items. */
+        customizeText?: (itemInfo: { start: number; end: number; index: number; color: string; size: number; }) => string;
+        /** Specifies text for a hint that appears when a user hovers the mouse pointer over the text of a legend item. */
+        customizeHint?: (itemInfo: { start: number; end: number; index: number; color: string; size: number }) => string;
+        /** Specifies the source of data for the legend. */
+        source?: {
+            /** Specifies a layer to which the legend belongs. */
+            layer?: string;
+            /** Specifies the type of the legend grouping. */
+            grouping?: string;
+        }
+    }
+    /** A vector map widget. */
+    export class dxVectorMap extends viz.core.BaseWidget {
+        constructor(element: JQuery, options?: dxVectorMapOptions);
+        constructor(element: Element, options?: dxVectorMapOptions);
+        /** Displays the loading indicator. */
+        showLoadingIndicator(): void;
+        /** Conceals the loading indicator. */
+        hideLoadingIndicator(): void;
+        /** Redraws a widget. */
+        render(): void;
+        /** Gets the current coordinates of the map center. */
+        center(): Array<number>;
+        /** Sets the coordinates of the map center. */
+        center(centerCoordinates: Array<number>): void;
+        /**
+         * Deselects all the selected areas on a map. The areas are displayed in their initial style after.
+         * @deprecated Use the 'clearSelection' method on a layer instead
+         */
+        clearAreaSelection(): void;
+        /**
+         * Deselects all the selected markers on a map. The markers are displayed in their initial style after.
+         * @deprecated Use the 'clearSelection' method on a layer instead
+         */
+        clearMarkerSelection(): void;
+        /** Deselects all the selected area and markers on a map at once. The areas and markers are displayed in their initial style after. */
+        clearSelection(): void;
+        /** Converts client area coordinates into map coordinates. */
+        convertCoordinates(x: number, y: number): Array<number>;
+        /** Gets all map layers. */
+        getLayers(): Array<MapLayer>;
+        /** Gets the layer by its index. */
+        getLayerByIndex(index: number): MapLayer;
+        /** Gets the layer by its name. */
+        getLayerByName(name: string): MapLayer;
+        /**
+         * Returns an array with all the map areas.
+         * @deprecated Use the 'getElements' method on a layer instead
+         */
+        getAreas(): Array<Area>;
+        /**
+         * Returns an array with all the map markers.
+         * @deprecated Use the 'getElements' method on a layer instead
+         */
+        getMarkers(): Array<Marker>;
+        /** Gets the current coordinates of the map viewport. */
+        viewport(): Array<any>;
+        /** Sets the coordinates of the map viewport. */
+        viewport(viewportCoordinates: Array<number>): void;
+        /** Gets the current value of the map zoom factor. */
+        zoomFactor(): number;
+        /** Sets the value of the map zoom factor. */
+        zoomFactor(zoomFactor: number): void;
+    }
+    export var projection: ProjectionCreator;
+    export interface ProjectionCreator {
+        /** Creates a new projection. */
+        (data: {
+            to?: (coordinates: Array<number>) => Array<number>;
+            from?: (coordinates: Array<number>) => Array<number>;
+            aspectRatio?: number;
+        }): Object;
+        /** Gets the default or custom projection from the projection storage. */
+        get(name: string): Object;
+        /** Adds a new projection to the internal projections storage. */
+        add(name: string, projection: Object): void;
+    }
+}
+interface JQuery {
+    dxVectorMap(options?: DevExpress.viz.map.dxVectorMapOptions): JQuery;
+    dxVectorMap(methodName: string, ...params: any[]): any;
+    dxVectorMap(methodName: "instance"): DevExpress.viz.map.dxVectorMap;
+}
+declare module DevExpress.viz.sparklines {
+    export interface SparklineTooltip extends viz.core.Tooltip {
+        /**
+         * Specifies how a tooltip is horizontally aligned relative to the graph.
+         * @deprecated Tooltip alignment is no more available.
+         */
+        horizontalAlignment?: string;
+        /**
+         * Specifies how a tooltip is vertically aligned relative to the graph.
+         * @deprecated Tooltip alignment is no more available.
+         */
+        verticalAlignment?: string;
+    }
+    export interface BaseSparklineOptions extends viz.core.BaseWidgetOptions {
+        /** Specifies the blank space between the widget's extreme elements and the boundaries of the area provided for the widget in pixels. */
+        margin?: viz.core.Margins;
+        /** Specifies the size of the widget. */
+        size?: viz.core.Size;
+        /** Specifies tooltip options. */
+        tooltip?: SparklineTooltip;
+        /** A handler for the tooltipShown event. */
+        onTooltipShown?: (e: {
+            component: BaseSparkline;
+            element: Element;
+        }) => void;
+        /** A handler for the tooltipHidden event. */
+        onTooltipHidden?: (e: {
+            component: BaseSparkline;
+            element: Element;
+        }) => void;
+    }
+    /** Overridden by descriptions for particular widgets. */
+    export class BaseSparkline extends viz.core.BaseWidget {
+        /** Redraws a widget. */
+        render(): void;
+    }
+    export interface dxBulletOptions extends BaseSparkline {
+        /** Specifies a color for the bullet bar. */
+        color?: string;
+        /** Specifies an end value for the invisible scale. */
+        endScaleValue?: number;
+        /** Specifies whether or not to show the target line. */
+        showTarget?: boolean;
+        /** Specifies whether or not to show the line indicating zero on the invisible scale. */
+        showZeroLevel?: boolean;
+        /** Specifies a start value for the invisible scale. */
+        startScaleValue?: number;
+        /** Specifies the value indicated by the target line. */
+        target?: number;
+        /** Specifies a color for both the target and zero level lines. */
+        targetColor?: string;
+        /** Specifies the width of the target line. */
+        targetWidth?: number;
+        /** Specifies the primary value indicated by the bullet bar. */
+        value?: number;
+    }
+    /** A bullet graph widget. */
+    export class dxBullet extends BaseSparkline {
+        constructor(element: JQuery, options?: dxBulletOptions);
+        constructor(element: Element, options?: dxBulletOptions);
+    }
+    export interface dxSparklineOptions extends BaseSparklineOptions {
+        /** Specifies the data source field that provides arguments for a sparkline. */
+        argumentField?: string;
+        /** Sets a color for the bars indicating negative values. Available for a sparkline of the bar type only. */
+        barNegativeColor?: string;
+        /** Sets a color for the bars indicating positive values. Available for a sparkline of the bar type only. */
+        barPositiveColor?: string;
+        /** Specifies a data source for the sparkline. */
+        dataSource?: Array<any>;
+        /** Sets a color for the boundary of both the first and last points on a sparkline. */
+        firstLastColor?: string;
+        /** Specifies whether a sparkline ignores null data points or not. */
+        ignoreEmptyPoints?: boolean;
+        /** Sets a color for a line on a sparkline. Available for the sparklines of the line- and area-like types. */
+        lineColor?: string;
+        /** Specifies a width for a line on a sparkline. Available for the sparklines of the line- and area-like types. */
+        lineWidth?: number;
+        /** Sets a color for the bars indicating the values that are less than the winloss threshold. Available for a sparkline of the winloss type only. */
+        lossColor?: string;
+        /** Sets a color for the boundary of the maximum point on a sparkline. */
+        maxColor?: string;
+        /** Sets a color for the boundary of the minimum point on a sparkline. */
+        minColor?: string;
+        /** Sets a color for points on a sparkline. Available for the sparklines of the line- and area-like types. */
+        pointColor?: string;
+        /** Specifies the diameter of sparkline points in pixels. Available for the sparklines of line- and area-like types. */
+        pointSize?: number;
+        /** Specifies a symbol to use as a point marker on a sparkline. Available for the sparklines of the line- and area-like types. */
+        pointSymbol?: string;
+        /** Specifies whether or not to indicate both the first and last values on a sparkline. */
+        showFirstLast?: boolean;
+        /** Specifies whether or not to indicate both the minimum and maximum values on a sparkline. */
+        showMinMax?: boolean;
+        /** Determines the type of a sparkline. */
+        type?: string;
+        /** Specifies the data source field that provides values for a sparkline. */
+        valueField?: string;
+        /** Sets a color for the bars indicating the values greater than a winloss threshold. Available for a sparkline of the winloss type only. */
+        winColor?: string;
+        /** Specifies a value that serves as a threshold for the sparkline of the winloss type. */
+        winlossThreshold?: number;
+        /** Specifies the minimum value of the sparkline value axis. */
+        minValue?: number;
+        /** Specifies the maximum value of the sparkline's value axis. */
+        maxValue?: number;
+    }
+    /** A sparkline widget. */
+    export class dxSparkline extends BaseSparkline {
+        constructor(element: JQuery, options?: dxSparklineOptions);
+        constructor(element: Element, options?: dxSparklineOptions);
+    }
+}
+interface JQuery {
+    dxBullet(options?: DevExpress.viz.sparklines.dxBulletOptions): JQuery;
+    dxBullet(methodName: string, ...params: any[]): any;
+    dxBullet(methodName: "instance"): DevExpress.viz.sparklines.dxBullet;
+    dxSparkline(options?: DevExpress.viz.sparklines.dxSparklineOptions): JQuery;
+    dxSparkline(methodName: string, ...params: any[]): any;
+    dxSparkline(methodName: "instance"): DevExpress.viz.sparklines.dxSparkline;
+}
diff --git a/devextreme/tsconfig.json b/devextreme/tsconfig.json
new file mode 100644
index 0000000000..7b13cd4de4
--- /dev/null
+++ b/devextreme/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "devextreme-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/dexie/dexie-tests.ts b/dexie/dexie-tests.ts
index 10597dfd4b..7eb6a75dbb 100644
--- a/dexie/dexie-tests.ts
+++ b/dexie/dexie-tests.ts
@@ -1,4 +1,4 @@
-import Dexie from "./dexie";
+import Dexie from "dexie";
 
 interface IFriend {
     id?: number,
diff --git a/dexie/dexie.d.ts b/dexie/index.d.ts
similarity index 100%
rename from dexie/dexie.d.ts
rename to dexie/index.d.ts
diff --git a/dexie/tsconfig.json b/dexie/tsconfig.json
index 4ec77382dc..0d00efa12c 100644
--- a/dexie/tsconfig.json
+++ b/dexie/tsconfig.json
@@ -1,10 +1,17 @@
 {
     "compilerOptions": {
-        "module": "es6",
+        "module": "commonjs",
         "target": "es6",
         "noImplicitAny": true,
-        "removeComments": false,
-        "sourceMap": true,
-        "outDir": "out/ts"
-    }
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dexie-tests.ts"
+    ]
 }
\ No newline at end of file
diff --git a/dhtmlxgantt/dhtmlxgantt-tests.ts b/dhtmlxgantt/dhtmlxgantt-tests.ts
index 1bfc7a089f..cf64a94d79 100644
--- a/dhtmlxgantt/dhtmlxgantt-tests.ts
+++ b/dhtmlxgantt/dhtmlxgantt-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="dhtmlxgantt.d.ts" />
+
 
 //date operations
 var start: Date = gantt.date.week_start(new Date());
diff --git a/dhtmlxgantt/dhtmlxgantt-tests.ts.tscparams b/dhtmlxgantt/dhtmlxgantt-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/dhtmlxgantt/dhtmlxgantt-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/dhtmlxgantt/dhtmlxgantt.d.ts.tscparams b/dhtmlxgantt/dhtmlxgantt.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/dhtmlxgantt/dhtmlxgantt.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/dhtmlxgantt/dhtmlxgantt.d.ts b/dhtmlxgantt/index.d.ts
similarity index 100%
rename from dhtmlxgantt/dhtmlxgantt.d.ts
rename to dhtmlxgantt/index.d.ts
diff --git a/dhtmlxgantt/tsconfig.json b/dhtmlxgantt/tsconfig.json
new file mode 100644
index 0000000000..9eae9e5660
--- /dev/null
+++ b/dhtmlxgantt/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dhtmlxgantt-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dhtmlxscheduler/dhtmlxscheduler-tests.ts b/dhtmlxscheduler/dhtmlxscheduler-tests.ts
index 2f1f2d9ce8..bafeabe1ca 100644
--- a/dhtmlxscheduler/dhtmlxscheduler-tests.ts
+++ b/dhtmlxscheduler/dhtmlxscheduler-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="dhtmlxscheduler.d.ts" />
+
 
 //date operations
 var start: Date = scheduler.date.week_start(new Date());
diff --git a/dhtmlxscheduler/dhtmlxscheduler-tests.ts.tscparams b/dhtmlxscheduler/dhtmlxscheduler-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/dhtmlxscheduler/dhtmlxscheduler-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/dhtmlxscheduler/dhtmlxscheduler.d.ts.tscparams b/dhtmlxscheduler/dhtmlxscheduler.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/dhtmlxscheduler/dhtmlxscheduler.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/dhtmlxscheduler/dhtmlxscheduler.d.ts b/dhtmlxscheduler/index.d.ts
similarity index 100%
rename from dhtmlxscheduler/dhtmlxscheduler.d.ts
rename to dhtmlxscheduler/index.d.ts
diff --git a/dhtmlxscheduler/tsconfig.json b/dhtmlxscheduler/tsconfig.json
new file mode 100644
index 0000000000..07114555e4
--- /dev/null
+++ b/dhtmlxscheduler/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dhtmlxscheduler-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/di-lite/di-lite-tests.ts b/di-lite/di-lite-tests.ts
index 13bc9e3ddb..efe45738ae 100644
--- a/di-lite/di-lite-tests.ts
+++ b/di-lite/di-lite-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="di-lite.d.ts" />
+
 
 interface Dependency {
     dependencies?: string;
diff --git a/di-lite/di-lite.d.ts b/di-lite/index.d.ts
similarity index 100%
rename from di-lite/di-lite.d.ts
rename to di-lite/index.d.ts
diff --git a/di-lite/tsconfig.json b/di-lite/tsconfig.json
new file mode 100644
index 0000000000..edfe10ffa3
--- /dev/null
+++ b/di-lite/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "di-lite-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/diff-match-patch/diff-match-patch-tests.ts b/diff-match-patch/diff-match-patch-tests.ts
index f1e5d2d42e..9226d7be4a 100644
--- a/diff-match-patch/diff-match-patch-tests.ts
+++ b/diff-match-patch/diff-match-patch-tests.ts
@@ -1,4 +1,3 @@
-///<reference path="./diff-match-patch.d.ts" />
 
 import DiffMatchPatch = require("diff-match-patch");
 
diff --git a/diff-match-patch/diff-match-patch.d.ts b/diff-match-patch/diff-match-patch.d.ts
deleted file mode 100644
index 028fe9d65c..0000000000
--- a/diff-match-patch/diff-match-patch.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-// Type definitions for diff-match-patch v1.0.0
-// Project: https://www.npmjs.com/package/diff-match-patch
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "diff-match-patch" {
-    type Diff = [number, string];
-
-    export class diff_match_patch {
-        static new (): diff_match_patch;
-
-        Diff_Timeout: number;
-        Diff_EditCost: number;
-        Match_Threshold: number;
-        Match_Distance: number;
-        Patch_DeleteThreshold: number;
-        Patch_Margin: number;
-        Match_MaxBits: number;
-
-        diff_main(text1: string, text2: string, opt_checklines?: boolean, opt_deadline?: number): Diff[];
-        diff_commonPrefix(text1: string, text2: string): number;
-        diff_commonSuffix(text1: string, text2: string): number;
-        diff_cleanupSemantic(diffs: Diff[]): void;
-        diff_cleanupSemanticLossless(diffs: Diff[]): void;
-        diff_cleanupEfficiency(diffs: Diff[]): void;
-        diff_cleanupMerge(diffs: Diff[]): void;
-        diff_xIndex(diffs: Diff[], loc: number): number;
-        diff_prettyHtml(diffs: Diff[]): string;
-        diff_text1(diffs: Diff[]): string;
-        diff_text2(diffs: Diff[]): string;
-        diff_levenshtein(diffs: Diff[]): number;
-        diff_toDelta(diffs: Diff[]): string;
-        diff_fromDelta(text1: string, delta: string): Diff[];
-    }
-
-    export var DIFF_DELETE: number;
-    export var DIFF_INSERT: number;
-    export var DIFF_EQUAL: number;
-}
diff --git a/diff-match-patch/index.d.ts b/diff-match-patch/index.d.ts
new file mode 100644
index 0000000000..5435faa1fb
--- /dev/null
+++ b/diff-match-patch/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for diff-match-patch v1.0.0
+// Project: https://www.npmjs.com/package/diff-match-patch
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+type Diff = [number, string];
+
+export declare class diff_match_patch {
+    static new(): diff_match_patch;
+
+    Diff_Timeout: number;
+    Diff_EditCost: number;
+    Match_Threshold: number;
+    Match_Distance: number;
+    Patch_DeleteThreshold: number;
+    Patch_Margin: number;
+    Match_MaxBits: number;
+
+    diff_main(text1: string, text2: string, opt_checklines?: boolean, opt_deadline?: number): Diff[];
+    diff_commonPrefix(text1: string, text2: string): number;
+    diff_commonSuffix(text1: string, text2: string): number;
+    diff_cleanupSemantic(diffs: Diff[]): void;
+    diff_cleanupSemanticLossless(diffs: Diff[]): void;
+    diff_cleanupEfficiency(diffs: Diff[]): void;
+    diff_cleanupMerge(diffs: Diff[]): void;
+    diff_xIndex(diffs: Diff[], loc: number): number;
+    diff_prettyHtml(diffs: Diff[]): string;
+    diff_text1(diffs: Diff[]): string;
+    diff_text2(diffs: Diff[]): string;
+    diff_levenshtein(diffs: Diff[]): number;
+    diff_toDelta(diffs: Diff[]): string;
+    diff_fromDelta(text1: string, delta: string): Diff[];
+}
+
+export declare var DIFF_DELETE: number;
+export declare var DIFF_INSERT: number;
+export declare var DIFF_EQUAL: number;
diff --git a/diff-match-patch/tsconfig.json b/diff-match-patch/tsconfig.json
new file mode 100644
index 0000000000..1f464256f1
--- /dev/null
+++ b/diff-match-patch/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "diff-match-patch-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/diff/diff-tests.ts b/diff/diff-tests.ts
index 46d367bf68..fb6f7216ad 100644
--- a/diff/diff-tests.ts
+++ b/diff/diff-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./diff.d.ts" />
+
 
 import jsdiff = require('diff');
 
diff --git a/diff/diff.d.ts b/diff/diff.d.ts
deleted file mode 100644
index b1f947300b..0000000000
--- a/diff/diff.d.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-// Type definitions for diff
-// Project: https://github.com/kpdecker/jsdiff
-// Definitions by: vvakame <https://github.com/vvakame/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace JsDiff {
-    interface IDiffResult {
-        value: string;
-        count?: number;
-        added?: boolean;
-        removed?: boolean;
-    }
-
-    interface IBestPath {
-        newPos: number;
-        componenets: IDiffResult[];
-    }
-
-    class Diff {
-        ignoreWhitespace:boolean;
-
-        constructor(ignoreWhitespace?:boolean);
-
-        diff(oldString:string, newString:string):IDiffResult[];
-
-        pushComponent(components:IDiffResult[], value:string, added:boolean, removed:boolean):void;
-
-        extractCommon(basePath:IBestPath, newString:string, oldString:string, diagonalPath:number):number;
-
-        equals(left:string, right:string):boolean;
-
-        join(left:string, right:string):string;
-
-        tokenize(value:string):any; // return types are string or string[]
-    }
-
-    function diffChars(oldStr:string, newStr:string):IDiffResult[];
-
-    function diffWords(oldStr:string, newStr:string):IDiffResult[];
-
-    function diffWordsWithSpace(oldStr:string, newStr:string):IDiffResult[];
-
-    function diffJson(oldObj: Object, newObj: Object): IDiffResult[];
-
-    function diffLines(oldStr:string, newStr:string):IDiffResult[];
-
-    function diffCss(oldStr:string, newStr:string):IDiffResult[];
-
-    function createPatch(fileName:string, oldStr:string, newStr:string, oldHeader:string, newHeader:string):string;
-
-    function applyPatch(oldStr:string, uniDiff:string):string;
-
-    function convertChangesToXML(changes:IDiffResult[]):string;
-
-    function convertChangesToDMP(changes:IDiffResult[]):{0: number; 1:string;}[];
-}
-
-declare module "diff" {
-    export = JsDiff;
-}
diff --git a/diff/index.d.ts b/diff/index.d.ts
new file mode 100644
index 0000000000..bd8acd078d
--- /dev/null
+++ b/diff/index.d.ts
@@ -0,0 +1,59 @@
+// Type definitions for diff
+// Project: https://github.com/kpdecker/jsdiff
+// Definitions by: vvakame <https://github.com/vvakame/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = JsDiff;
+export as namespace JsDiff;
+
+declare namespace JsDiff {
+    interface IDiffResult {
+        value: string;
+        count?: number;
+        added?: boolean;
+        removed?: boolean;
+    }
+
+    interface IBestPath {
+        newPos: number;
+        componenets: IDiffResult[];
+    }
+
+    class Diff {
+        ignoreWhitespace:boolean;
+
+        constructor(ignoreWhitespace?:boolean);
+
+        diff(oldString:string, newString:string):IDiffResult[];
+
+        pushComponent(components:IDiffResult[], value:string, added:boolean, removed:boolean):void;
+
+        extractCommon(basePath:IBestPath, newString:string, oldString:string, diagonalPath:number):number;
+
+        equals(left:string, right:string):boolean;
+
+        join(left:string, right:string):string;
+
+        tokenize(value:string):any; // return types are string or string[]
+    }
+
+    function diffChars(oldStr:string, newStr:string):IDiffResult[];
+
+    function diffWords(oldStr:string, newStr:string):IDiffResult[];
+
+    function diffWordsWithSpace(oldStr:string, newStr:string):IDiffResult[];
+
+    function diffJson(oldObj: Object, newObj: Object): IDiffResult[];
+
+    function diffLines(oldStr:string, newStr:string):IDiffResult[];
+
+    function diffCss(oldStr:string, newStr:string):IDiffResult[];
+
+    function createPatch(fileName:string, oldStr:string, newStr:string, oldHeader:string, newHeader:string):string;
+
+    function applyPatch(oldStr:string, uniDiff:string):string;
+
+    function convertChangesToXML(changes:IDiffResult[]):string;
+
+    function convertChangesToDMP(changes:IDiffResult[]):{0: number; 1:string;}[];
+}
diff --git a/diff/tsconfig.json b/diff/tsconfig.json
new file mode 100644
index 0000000000..a1f9e05a66
--- /dev/null
+++ b/diff/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "diff-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/docCookies/docCookies-tests.ts b/docCookies/docCookies-tests.ts
index 49205b6fb1..2b26c63970 100644
--- a/docCookies/docCookies-tests.ts
+++ b/docCookies/docCookies-tests.ts
@@ -3,7 +3,7 @@
 // Definitions by: Jon Egerton <https://github.com/jonegerton>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="docCookies.d.ts" />
+
 
 docCookies.setItem("test0", "Hello world!");
 docCookies.setItem("test1", "Unicode test: \u00E0\u00E8\u00EC\u00F2\u00F9", Infinity);
diff --git a/docCookies/docCookies.d.ts b/docCookies/index.d.ts
similarity index 100%
rename from docCookies/docCookies.d.ts
rename to docCookies/index.d.ts
diff --git a/docCookies/tsconfig.json b/docCookies/tsconfig.json
new file mode 100644
index 0000000000..9e0cacf043
--- /dev/null
+++ b/docCookies/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "docCookies-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dock-spawn/dock-spawn-tests.ts b/dock-spawn/dock-spawn-tests.ts
index 7bda821dec..5a33dcac13 100644
--- a/dock-spawn/dock-spawn-tests.ts
+++ b/dock-spawn/dock-spawn-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="dock-spawn.d.ts" />
+
 
 var dockManagerDiv = document.createElement('div'),
     panelDiv1 = document.createElement('div'),
diff --git a/dock-spawn/dock-spawn.d.ts b/dock-spawn/index.d.ts
similarity index 100%
rename from dock-spawn/dock-spawn.d.ts
rename to dock-spawn/index.d.ts
diff --git a/dock-spawn/tsconfig.json b/dock-spawn/tsconfig.json
new file mode 100644
index 0000000000..398a990f06
--- /dev/null
+++ b/dock-spawn/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dock-spawn-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/docopt/docopt-tests.ts b/docopt/docopt-tests.ts
index b8c1a2c25b..e4850d4ea1 100644
--- a/docopt/docopt-tests.ts
+++ b/docopt/docopt-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="docopt.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 var doc = `
 Usage:
diff --git a/docopt/docopt.d.ts b/docopt/docopt.d.ts
deleted file mode 100644
index 8976c6fe36..0000000000
--- a/docopt/docopt.d.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-// Type definitions for Docopt v0.6.2
-// Project: http://docopt.org/
-// Definitions by: Giovanni Bassi <https://github.com/giggio/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface DocoptOption {
-    /** is an optional argument vector. It defaults to the arguments passed to your program (process.argv[2..]). You can also supply it with an array of strings, as with process.argv. For example: ['--verbose', '-o', 'hai.txt'] */
-    argv?: Array<string>,
-    /** (default:true) specifies whether the parser should automatically print the help message (supplied as doc) in case -h or --help options are encountered. After showing the usage-message, the program will terminate. If you want to handle -h or --help options manually (the same as other options), set help=false. */
-    help?: boolean,
-    /** (default:null) is an optional argument that specifies the version of your program. If supplied, then, if the parser encounters --version option, it will print the supplied version and terminate. version could be any printable object, but most likely a string, e.g. '2.1.0rc1'. */
-    version?: any,
-    /** (default false) If set to true will disallow mixing options and positional argument. I.e. after first positional argument, all arguments will be interpreted as positional even if the look like options. This can be used for strict compatibility with POSIX, or if you want to dispatch your arguments to other programs. */
-    options_first?: boolean,
-    /** (default true) If set to false will cause docopt to throw exceptions instead of printing the error to console and terminating the application. This flag is mainly for testing purposes. */
-    exit?: boolean
-}
-declare module "docopt" {
-    /**
-     * @param doc should be a string with the help message, written according to rules of the docopt language.
-     */
-    export function docopt(doc: string, options: DocoptOption): any;
-}
diff --git a/docopt/index.d.ts b/docopt/index.d.ts
new file mode 100644
index 0000000000..05d0da4524
--- /dev/null
+++ b/docopt/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for Docopt v0.6.2
+// Project: http://docopt.org/
+// Definitions by: Giovanni Bassi <https://github.com/giggio/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * @param doc should be a string with the help message, written according to rules of the docopt language.
+ */
+declare function docopt(doc: string, options: DocoptOption): any;
+
+export = docopt;
+
+interface DocoptOption {
+    /** is an optional argument vector. It defaults to the arguments passed to your program (process.argv[2..]). You can also supply it with an array of strings, as with process.argv. For example: ['--verbose', '-o', 'hai.txt'] */
+    argv?: Array<string>,
+    /** (default:true) specifies whether the parser should automatically print the help message (supplied as doc) in case -h or --help options are encountered. After showing the usage-message, the program will terminate. If you want to handle -h or --help options manually (the same as other options), set help=false. */
+    help?: boolean,
+    /** (default:null) is an optional argument that specifies the version of your program. If supplied, then, if the parser encounters --version option, it will print the supplied version and terminate. version could be any printable object, but most likely a string, e.g. '2.1.0rc1'. */
+    version?: any,
+    /** (default false) If set to true will disallow mixing options and positional argument. I.e. after first positional argument, all arguments will be interpreted as positional even if the look like options. This can be used for strict compatibility with POSIX, or if you want to dispatch your arguments to other programs. */
+    options_first?: boolean,
+    /** (default true) If set to false will cause docopt to throw exceptions instead of printing the error to console and terminating the application. This flag is mainly for testing purposes. */
+    exit?: boolean
+}
diff --git a/docopt/tsconfig.json b/docopt/tsconfig.json
new file mode 100644
index 0000000000..04150bf64a
--- /dev/null
+++ b/docopt/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "docopt-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/documentdb-server/documentdb-server-tests.ts b/documentdb-server/documentdb-server-tests.ts
index 722fdbec5c..0cc3dc55bd 100644
--- a/documentdb-server/documentdb-server-tests.ts
+++ b/documentdb-server/documentdb-server-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="documentdb-server.d.ts" />
+
 
 // Samples taken from http://dl.windowsazure.com/documentDB/jsserverdocs/Collection.html
 function chain() {
diff --git a/documentdb-server/documentdb-server.d.ts b/documentdb-server/index.d.ts
similarity index 100%
rename from documentdb-server/documentdb-server.d.ts
rename to documentdb-server/index.d.ts
diff --git a/documentdb-server/tsconfig.json b/documentdb-server/tsconfig.json
new file mode 100644
index 0000000000..7a537a26f6
--- /dev/null
+++ b/documentdb-server/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "documentdb-server-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/documentdb/documentdb-tests.ts b/documentdb/documentdb-tests.ts
index ae0c66b892..34d6b5236b 100644
--- a/documentdb/documentdb-tests.ts
+++ b/documentdb/documentdb-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="documentdb.d.ts" />
 
 import docDB = require('documentdb');
 var docDBClient = new docDB.DocumentClient('host', { masterKey: 'masterKey' });
diff --git a/documentdb/documentdb.d.ts b/documentdb/documentdb.d.ts
deleted file mode 100644
index 1d901179a6..0000000000
--- a/documentdb/documentdb.d.ts
+++ /dev/null
@@ -1,415 +0,0 @@
-// Type definitions for DocumentDB
-// Project: https://github.com/Azure/azure-documentdb-node
-// Definitions by: Noel Abrahams <https://github.com/NoelAbrahams>, Brett Gutstein <https://github.com/brettferdosi>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/documentdb
-
-declare module 'documentdb' {
-
-    /** The feed options and query methods.*/
-    interface FeedOptions {
-
-        /** Max number of items to be returned in the enumeration operation. */
-        maxItemCount?: number;
-
-        /** Opaque token for continuing the enumeration. */
-        continuation?: string;
-
-        /** Token for use with Session consistency. */
-        sessionToken?: string;
-    }
-
-    /** Options that can be specified for a request issued to the DocumentDB servers. */
-    interface RequestOptions {
-
-        /** Indicates what is the pre trigger to be invoked before the operation. */
-        preTriggerInclude?: string;
-
-        /** Indicates what is the post trigger to be invoked after the operation. */
-        postTriggerInclude?: string;
-
-        /** Conditions Associated with the request. */
-        accessCondition?: {
-
-            /** Conditional HTTP method header type.*/
-            type: string;
-
-            /** Conditional HTTP method header value.*/
-            condition: string
-        };
-
-        /** Specifies indexing directives (index, do not index ..etc).*/
-        indexingDirective?: string;
-
-        /** Consistency level required by the client. */
-        consistencyLevel?: string;
-
-        /** Token for use with Session consistency.*/
-        sessionToken?: string;
-
-        /** Expiry time (in seconds) for resource token associated with permission (applicable only for requests on permissions).*/
-        resourceTokenExpirySeconds?: number;
-
-        /** Disables the automatic id generation. If id is missing in the body and this option is true, an error will be returned. */
-        disableAutomaticIdGeneration?: boolean;
-    }
-    
-    /** The Sql query parameter. */
-    interface SqlParameter {
-        /** The name of the parameter. */
-        name: string;
-        
-        /** The value of the parameter. */
-        value: any;
-    }
-    
-    /** The Sql query specification. */
-    interface SqlQuerySpec {
-        /** The body of the query. */
-        query: string;
-        
-        /** The array of SqlParameters. */
-        parameters: SqlParameter[];
-    }
-    
-    /** Represents the error object returned from a failed query. */
-    interface QueryError {
-
-        /** The response code corresponding to the error. */
-        code: number;
-
-        /** A string representing the error information. */
-        body: string; //{ code: string; message: string; };
-    }
-
-    /**
-    * The callback to execute after the request execution.
-    * @param error            -       Will contain error information if an error occurs, undefined otherwise.
-    * @param resource         -       An object that represents the requested resource (Db, collection, document ... etc) if no error happens.
-    * @param responseHeaders  -       An object that contain the response headers.
-    */
-    interface RequestCallback<TResult> {
-        (error: QueryError, resource: TResult, responseHeaders: any): void;
-    }
-
-    /** Represents the result returned from a query. */
-    interface QueryIterator<TResultRow> {
-
-        toArray(callback: (error: QueryError, result: TResultRow[]) => void): void;
-    }
-
-    /** Reprents an object with a unique identifier. */
-    interface UniqueId {
-
-        /** The user-defined unique identifier for a document or other DocumentDB object (database, collection, procedure...) */
-        id: string;
-    }
-
-    /** Represents the common meta data for all DocumentDB objects. */
-    interface AbstractMeta extends UniqueId {
-
-        /** The self link.*/
-        _self: string;
-
-        /** The time the object was created.*/
-        _ts: string;
-
-        _rid?: string;
-        _etag?: string;
-
-        _attachments?: string;
-    }
-
-    /** Represents a custom document for storing in DocumentDB  */
-    interface NewDocument<TContent> extends UniqueId {
-
-        /** A custom property for containing the actual JSON object representing the document. 
-          * Define a custom property in order to disambiguate the JSON document from the metadata added by Azure.
-          * This property is optional and the name is application-specific.
-          */
-        //doc: TContent;
-    }
-
-    /** Represents a document retrieved from storage. 
-      * This differs from a new document by the properties in AbstractMeta, which are added by the system.
-      */
-    interface RetrievedDocument<TContent> extends NewDocument<TContent>, AbstractMeta {
-
-    }
-
-    /** Represents the meta data for a database. */
-    interface DatabaseMeta extends AbstractMeta {
-    }
-
-    /** Represents the meta data for a collection. */
-    interface CollectionMeta extends AbstractMeta {
-    }
-
-    /** Represents the meta data for a stored procedure. */
-    interface ProcedureMeta extends AbstractMeta {
-        body: string;
-    }
-    
-    /** Represents the meta data for a trigger. */
-    interface TriggerMeta extends AbstractMeta {
-        body: string;
-        triggerType: string;
-        triggerOperation: string;
-    }
-
-    /** An object that is used for authenticating requests and must contains one of the options. */
-    export interface AuthOptions {
-
-        /** The authorization master key to use to create the client. */
-        masterKey?: string;
-
-        /** An object that contains resources tokens. Keys for the object are resource Ids and values are the resource tokens.*/
-        resourceTokens?: any;
-
-        /** An array of {@link Permission} objects. */
-        permissionFeed?: any[];
-    }
-
-    /** Represents a DocumentDB stored procecedure. */
-    export interface Procedure extends UniqueId {
-
-        /** The function representing the stored procedure. */
-        body(...params: any[]): void;
-    }
-    
-    /** Represents a DocumentDB trigger. */
-    export interface Trigger extends UniqueId {
-        /** The type of the trigger. Should be either 'pre' or 'post'. */
-        triggerType: string;
-        
-        /** The trigger operation. Should be one of 'all', 'create', 'update', 'delete', or 'replace'. */
-        triggerOperation: string;
-        
-        /** The function representing the trigger. */
-        body(...params: any[]): void;
-    }
-
-    /** Represents DocumentDB collection. */
-    export interface Collection extends UniqueId {
-
-        indexingPolicy?: IndexingPolicy;
-    }
-
-    /** The Indexing Path
-    * <p> Indexing paths hints to optimize indexing. <br>
-    *     Indexing paths allow tradeoff between indexing storage and query performance
-    * </p>
-    */
-    interface IndexingPath {
-
-        /** The indexing type(range or hash) {@link IndexType}.*/
-        IndexType: string;
-
-        /** Path to be indexed.*/
-        Path: string;
-
-        /** Precision for this particular Index type for numeric data. */
-        NumericPrecision: number;
-
-        /** Precision for this particular Index type for string data. */
-        StringPrecision: number;
-    }
-
-    /**  The Indexing Policy represents the indexing policy configuration for a collection. */
-    interface IndexingPolicy {
-
-        /** Specifies whether automatic indexing is enabled for a collection.
-            <p>In automatic indexing, documents can be explicitly excluded from indexing using {@link RequestOptions}.
-             In manual indexing, documents can be explicitly included. </p> */
-        automatic: boolean;
-
-        /** The indexing mode (consistent or lazy) {@link IndexingMode}. */
-        indexingMode: string;
-
-        /** An array of {@link IndexingPath} represents The paths to be incuded for indexing. */
-        IncludedPath: IndexingPath[];
-
-        /** An array of strings representing the paths to be excluded from indexing. */
-        ExcludedPaths: string[];
-    }
-
-    /** Provides a client-side logical representation of the Azure DocumentDB database account. This client is used to configure and execute requests against the service.
-      */
-    export class DocumentClient {
-        /**
-         * Constructs a DocumentClient.
-         * @param urlConnection           - The service endpoint to use to create the client.
-         * @param auth                    - An object that is used for authenticating requests and must contains one of the options.
-         * @param [connectionPolicy]      - An instance of {@link ConnectionPolicy} class. This parameter is optional and the default connectionPolicy will be used if omitted.
-         * @param [consistencyLevel]      - An optional parameter that represents the consistency level. It can take any value from {@link ConsistencyLevel}.
-        */
-        constructor(urlConnection: string, auth: AuthOptions, connectionPolicy?: any, consistencyLevel?: string);
-
-        /** Send a request for creating a database. 
-         * <p>
-         *  A database manages users, permissions and a set of collections.  <br>
-         *  Each Azure DocumentDB Database Account is able to support multiple independent named databases, with the database being the logical container for data. <br>
-         *  Each Database consists of one or more collections, each of which in turn contain one or more documents. Since databases are an an administrative resource, the Service Master Key will be required in order to access and successfully complete any action using the User APIs. <br>
-         * </p>
-         * @param body      - A json object that represents The database to be created.
-         * @param [options] - The request options.
-         * @param callback  - The callback for the request.
-        */
-        public createDatabase(body: UniqueId, options: RequestOptions, callback: RequestCallback<DatabaseMeta>): void;
-
-        /**
-         * Creates a collection.
-         * <p>
-         * A collection is a named logical container for documents. <br>
-         * A database may contain zero or more named collections and each collection consists of zero or more JSON documents. <br>
-         * Being schema-free, the documents in a collection do not need to share the same structure or fields. <br>
-         * Since collections are application resources, they can be authorized using either the master key or resource keys. <br>
-         * </p>
-         * @param databaseLink  - The self-link of the database.
-         * @param body          - Represents the body of the collection.
-         * @param [options]     - The request options.
-         * @param callback      - The callback for the request.
-         */
-        public createCollection(databaseLink: string, body: Collection, options: RequestOptions, callback: RequestCallback<CollectionMeta>): void;
-
-        /**
-         * Create a StoredProcedure.
-         * <p>
-         * DocumentDB allows stored procedures to be executed in the storage tier, directly against a document collection. The script <br>
-         * gets executed under ACID transactions on the primary storage partition of the specified collection. For additional details, <br>
-         * refer to the server-side JavaScript API documentation. 
-         * </p>
-         * @param collectionLink    - The self-link of the collection.
-         * @param procedure         - Represents the body of the stored procedure.
-         * @param [options]         - The request options.
-         * @param callback          - The callback for the request.
-         */
-        public createStoredProcedure(collectionLink: string, procedure: Procedure, options: RequestOptions, callback: RequestCallback<ProcedureMeta>): void;
-        
-        /**
-         * Create a trigger.
-         * <p>
-         * DocumentDB supports pre and post triggers defined in JavaScript to be executed on creates, updates and deletes. <br>
-         * For additional details, refer to the server-side JavaScript API documentation.
-         * </p>
-         * @param collectionLink  - The self-link of the collection.
-         * @param trigger         - Represents the body of the trigger.
-         * @param [options]       - The request options.
-         * @param callback        - The callback for the request.
-         */
-        public createTrigger(collectionLink: string, trigger: Trigger, options: RequestOptions, callback: RequestCallback<TriggerMeta>): void;
-
-        /**
-         * Create a document.
-         * <p> 
-         * There is no set schema for JSON documents. They may contain any number of custom properties as well as an optional list of attachments. <br>
-         * A Document is an application resource and can be authorized using the master key or resource keys
-         * </p>
-         * @param collectionLink    - The self-link of the collection.
-         * @param document          - Represents the body of the document. Can contain any number of user defined properties.
-         * @param [options]         - The request options.
-         * @param callback 			- The callback for the request.
-         */
-        public createDocument<TDocument>(collectionSelfLink: string, document: NewDocument<TDocument>, options: RequestOptions, callback: RequestCallback<RetrievedDocument<TDocument>>): void;
-
-        /**
-         * Execute the StoredProcedure represented by the object.
-         * @param procedureLink - The self-link of the stored procedure.
-         * @param [params]      - Represents the parameters of the stored procedure.
-         * @param callback      - The callback for the request.
-         */
-        public executeStoredProcedure<TDocument>(procedureLink: string, params: any[], callback: RequestCallback<TDocument>): void;
-
-        /** Lists all databases that satisfy a query. 
-         * @param query     - A SQL query string.
-         * @param [options] - The feed options.
-         * @returns         - An instance of QueryIterator to handle reading feed.
-         */
-        public queryDatabases(query: string | SqlQuerySpec): QueryIterator<DatabaseMeta>;
-
-        /**
-         * Query the collections for the database.
-         * @param databaseLink  - The self-link of the database.
-         * @param query         - A SQL query string.
-         * @param [options]     - Represents the feed options.
-         * @returns             - An instance of queryIterator to handle reading feed.
-         */
-        public queryCollections(databaseLink: string, query: string | SqlQuerySpec): QueryIterator<CollectionMeta>;
-
-        /**
-         * Query the storedProcedures for the collection.
-         * @param collectionLink    - The self-link of the collection.
-         * @param query             - A SQL query string.
-         * @param [options]         - Represents the feed options.
-         * @returns                 - An instance of queryIterator to handle reading feed.
-         */
-        public queryStoredProcedures(collectionLink: string, query: string | SqlQuerySpec): QueryIterator<ProcedureMeta>;
-
-        /**
-        * Query the documents for the collection.
-        * @param collectionLink - The self-link of the collection.
-        * @param query          - A SQL query string.
-        * @param [options]      - Represents the feed options.
-        * @returns              - An instance of queryIterator to handle reading feed.
-        */
-        public queryDocuments<TDocument>(collectionLink: string, query: string | SqlQuerySpec, options?: FeedOptions): QueryIterator<RetrievedDocument<TDocument>>;
-
-        /**
-         * Query the triggers for the collection.
-         * @param {string} collectionLink         - The self-link of the collection.
-         * @param {SqlQuerySpec | string} query   - A SQL query.
-         * @param {FeedOptions} [options]         - Represents the feed options.
-         * @returns {QueryIterator}               - An instance of queryIterator to handle reading feed.
-         */
-        public queryTriggers(collectionLink: string, query: string | SqlQuerySpec, options?: FeedOptions): QueryIterator<TriggerMeta>;
-        
-        /**
-         * Delete the document object.
-         * @param documentLink  - The self-link of the document.
-         * @param [options]     - The request options.
-         * @param callback      - The callback for the request. 
-        */
-        public deleteDocument(documentLink: string, options: RequestOptions, callback: RequestCallback<void>): void;
-
-        /**
-         * Delete the database object.
-         * @param databaseLink  - The self-link of the database.
-         * @param [options]     - The request options.
-         * @param callback      - The callback for the request. 
-        */
-        public deleteDatabase(databaseLink: string, options: RequestOptions, callback: RequestCallback<void>): void;
-
-        /**
-         * Delete the collection object.
-         * @param collectionLink    - The self-link of the collection.
-         * @param [options]         - The request options.
-         * @param callback          - The callback for the request. 
-        */
-        public deleteCollection(collectionLink: string, options: RequestOptions, callback: RequestCallback<void>): void;
-
-        /**
-         * Delete the StoredProcedure object.
-         * @param procedureLink - The self-link of the stored procedure.
-         * @param [options]     - The request options.
-         * @param callback      - The callback for the request.
-        */
-        public deleteStoredProcedure(procedureLink: string, options: RequestOptions, callback: RequestCallback<void>): void;
-        
-        /**
-         * Replace the document object.
-         * @param {string} documentLink      - The self-link of the document.
-         * @param {object} document          - Represent the new document body.
-         * @param {RequestOptions} [options] - The request options.
-         * @param {RequestCallback} callback - The callback for the request.
-         */
-        public replaceDocument<TDocument>(documentLink: string, document: NewDocument<TDocument>, options: RequestOptions, callback: RequestCallback<RetrievedDocument<TDocument>>): void;
-        
-        /**
-         * Replace the StoredProcedure object.
-         * @param procedureLink - The self-link of the stored procedure.
-         * @param procedure     - Represent the new procedure body.
-         * @param [options]     - The request options.
-         * @param callback      - The callback for the request.
-         */
-        public replaceStoredProcedure(procedureLink: string, procedure: Procedure, options: RequestOptions, callback: RequestCallback<ProcedureMeta>): void;
-    }
-}
\ No newline at end of file
diff --git a/documentdb/index.d.ts b/documentdb/index.d.ts
new file mode 100644
index 0000000000..d5ef5f1350
--- /dev/null
+++ b/documentdb/index.d.ts
@@ -0,0 +1,414 @@
+// Type definitions for DocumentDB
+// Project: https://github.com/Azure/azure-documentdb-node
+// Definitions by: Noel Abrahams <https://github.com/NoelAbrahams>, Brett Gutstein <https://github.com/brettferdosi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/documentdb
+
+
+
+/** The feed options and query methods.*/
+interface FeedOptions {
+
+    /** Max number of items to be returned in the enumeration operation. */
+    maxItemCount?: number;
+
+    /** Opaque token for continuing the enumeration. */
+    continuation?: string;
+
+    /** Token for use with Session consistency. */
+    sessionToken?: string;
+}
+
+/** Options that can be specified for a request issued to the DocumentDB servers. */
+interface RequestOptions {
+
+    /** Indicates what is the pre trigger to be invoked before the operation. */
+    preTriggerInclude?: string;
+
+    /** Indicates what is the post trigger to be invoked after the operation. */
+    postTriggerInclude?: string;
+
+    /** Conditions Associated with the request. */
+    accessCondition?: {
+
+        /** Conditional HTTP method header type.*/
+        type: string;
+
+        /** Conditional HTTP method header value.*/
+        condition: string
+    };
+
+    /** Specifies indexing directives (index, do not index ..etc).*/
+    indexingDirective?: string;
+
+    /** Consistency level required by the client. */
+    consistencyLevel?: string;
+
+    /** Token for use with Session consistency.*/
+    sessionToken?: string;
+
+    /** Expiry time (in seconds) for resource token associated with permission (applicable only for requests on permissions).*/
+    resourceTokenExpirySeconds?: number;
+
+    /** Disables the automatic id generation. If id is missing in the body and this option is true, an error will be returned. */
+    disableAutomaticIdGeneration?: boolean;
+}
+
+/** The Sql query parameter. */
+interface SqlParameter {
+    /** The name of the parameter. */
+    name: string;
+
+    /** The value of the parameter. */
+    value: any;
+}
+
+/** The Sql query specification. */
+interface SqlQuerySpec {
+    /** The body of the query. */
+    query: string;
+
+    /** The array of SqlParameters. */
+    parameters: SqlParameter[];
+}
+
+/** Represents the error object returned from a failed query. */
+interface QueryError {
+
+    /** The response code corresponding to the error. */
+    code: number;
+
+    /** A string representing the error information. */
+    body: string; //{ code: string; message: string; };
+}
+
+/**
+* The callback to execute after the request execution.
+* @param error            -       Will contain error information if an error occurs, undefined otherwise.
+* @param resource         -       An object that represents the requested resource (Db, collection, document ... etc) if no error happens.
+* @param responseHeaders  -       An object that contain the response headers.
+*/
+interface RequestCallback<TResult> {
+    (error: QueryError, resource: TResult, responseHeaders: any): void;
+}
+
+/** Represents the result returned from a query. */
+interface QueryIterator<TResultRow> {
+
+    toArray(callback: (error: QueryError, result: TResultRow[]) => void): void;
+}
+
+/** Reprents an object with a unique identifier. */
+interface UniqueId {
+
+    /** The user-defined unique identifier for a document or other DocumentDB object (database, collection, procedure...) */
+    id: string;
+}
+
+/** Represents the common meta data for all DocumentDB objects. */
+interface AbstractMeta extends UniqueId {
+
+    /** The self link.*/
+    _self: string;
+
+    /** The time the object was created.*/
+    _ts: string;
+
+    _rid?: string;
+    _etag?: string;
+
+    _attachments?: string;
+}
+
+/** Represents a custom document for storing in DocumentDB  */
+interface NewDocument<TContent> extends UniqueId {
+
+    /** A custom property for containing the actual JSON object representing the document. 
+      * Define a custom property in order to disambiguate the JSON document from the metadata added by Azure.
+      * This property is optional and the name is application-specific.
+      */
+    //doc: TContent;
+}
+
+/** Represents a document retrieved from storage. 
+  * This differs from a new document by the properties in AbstractMeta, which are added by the system.
+  */
+interface RetrievedDocument<TContent> extends NewDocument<TContent>, AbstractMeta {
+
+}
+
+/** Represents the meta data for a database. */
+interface DatabaseMeta extends AbstractMeta {
+}
+
+/** Represents the meta data for a collection. */
+interface CollectionMeta extends AbstractMeta {
+}
+
+/** Represents the meta data for a stored procedure. */
+interface ProcedureMeta extends AbstractMeta {
+    body: string;
+}
+
+/** Represents the meta data for a trigger. */
+interface TriggerMeta extends AbstractMeta {
+    body: string;
+    triggerType: string;
+    triggerOperation: string;
+}
+
+/** An object that is used for authenticating requests and must contains one of the options. */
+export interface AuthOptions {
+
+    /** The authorization master key to use to create the client. */
+    masterKey?: string;
+
+    /** An object that contains resources tokens. Keys for the object are resource Ids and values are the resource tokens.*/
+    resourceTokens?: any;
+
+    /** An array of {@link Permission} objects. */
+    permissionFeed?: any[];
+}
+
+/** Represents a DocumentDB stored procecedure. */
+export interface Procedure extends UniqueId {
+
+    /** The function representing the stored procedure. */
+    body(...params: any[]): void;
+}
+
+/** Represents a DocumentDB trigger. */
+export interface Trigger extends UniqueId {
+    /** The type of the trigger. Should be either 'pre' or 'post'. */
+    triggerType: string;
+
+    /** The trigger operation. Should be one of 'all', 'create', 'update', 'delete', or 'replace'. */
+    triggerOperation: string;
+
+    /** The function representing the trigger. */
+    body(...params: any[]): void;
+}
+
+/** Represents DocumentDB collection. */
+export interface Collection extends UniqueId {
+
+    indexingPolicy?: IndexingPolicy;
+}
+
+/** The Indexing Path
+* <p> Indexing paths hints to optimize indexing. <br>
+*     Indexing paths allow tradeoff between indexing storage and query performance
+* </p>
+*/
+interface IndexingPath {
+
+    /** The indexing type(range or hash) {@link IndexType}.*/
+    IndexType: string;
+
+    /** Path to be indexed.*/
+    Path: string;
+
+    /** Precision for this particular Index type for numeric data. */
+    NumericPrecision: number;
+
+    /** Precision for this particular Index type for string data. */
+    StringPrecision: number;
+}
+
+/**  The Indexing Policy represents the indexing policy configuration for a collection. */
+interface IndexingPolicy {
+
+    /** Specifies whether automatic indexing is enabled for a collection.
+        <p>In automatic indexing, documents can be explicitly excluded from indexing using {@link RequestOptions}.
+         In manual indexing, documents can be explicitly included. </p> */
+    automatic: boolean;
+
+    /** The indexing mode (consistent or lazy) {@link IndexingMode}. */
+    indexingMode: string;
+
+    /** An array of {@link IndexingPath} represents The paths to be incuded for indexing. */
+    IncludedPath: IndexingPath[];
+
+    /** An array of strings representing the paths to be excluded from indexing. */
+    ExcludedPaths: string[];
+}
+
+/** Provides a client-side logical representation of the Azure DocumentDB database account. This client is used to configure and execute requests against the service.
+  */
+export declare class DocumentClient {
+    /**
+     * Constructs a DocumentClient.
+     * @param urlConnection           - The service endpoint to use to create the client.
+     * @param auth                    - An object that is used for authenticating requests and must contains one of the options.
+     * @param [connectionPolicy]      - An instance of {@link ConnectionPolicy} class. This parameter is optional and the default connectionPolicy will be used if omitted.
+     * @param [consistencyLevel]      - An optional parameter that represents the consistency level. It can take any value from {@link ConsistencyLevel}.
+    */
+    constructor(urlConnection: string, auth: AuthOptions, connectionPolicy?: any, consistencyLevel?: string);
+
+    /** Send a request for creating a database. 
+     * <p>
+     *  A database manages users, permissions and a set of collections.  <br>
+     *  Each Azure DocumentDB Database Account is able to support multiple independent named databases, with the database being the logical container for data. <br>
+     *  Each Database consists of one or more collections, each of which in turn contain one or more documents. Since databases are an an administrative resource, the Service Master Key will be required in order to access and successfully complete any action using the User APIs. <br>
+     * </p>
+     * @param body      - A json object that represents The database to be created.
+     * @param [options] - The request options.
+     * @param callback  - The callback for the request.
+    */
+    public createDatabase(body: UniqueId, options: RequestOptions, callback: RequestCallback<DatabaseMeta>): void;
+
+    /**
+     * Creates a collection.
+     * <p>
+     * A collection is a named logical container for documents. <br>
+     * A database may contain zero or more named collections and each collection consists of zero or more JSON documents. <br>
+     * Being schema-free, the documents in a collection do not need to share the same structure or fields. <br>
+     * Since collections are application resources, they can be authorized using either the master key or resource keys. <br>
+     * </p>
+     * @param databaseLink  - The self-link of the database.
+     * @param body          - Represents the body of the collection.
+     * @param [options]     - The request options.
+     * @param callback      - The callback for the request.
+     */
+    public createCollection(databaseLink: string, body: Collection, options: RequestOptions, callback: RequestCallback<CollectionMeta>): void;
+
+    /**
+     * Create a StoredProcedure.
+     * <p>
+     * DocumentDB allows stored procedures to be executed in the storage tier, directly against a document collection. The script <br>
+     * gets executed under ACID transactions on the primary storage partition of the specified collection. For additional details, <br>
+     * refer to the server-side JavaScript API documentation. 
+     * </p>
+     * @param collectionLink    - The self-link of the collection.
+     * @param procedure         - Represents the body of the stored procedure.
+     * @param [options]         - The request options.
+     * @param callback          - The callback for the request.
+     */
+    public createStoredProcedure(collectionLink: string, procedure: Procedure, options: RequestOptions, callback: RequestCallback<ProcedureMeta>): void;
+
+    /**
+     * Create a trigger.
+     * <p>
+     * DocumentDB supports pre and post triggers defined in JavaScript to be executed on creates, updates and deletes. <br>
+     * For additional details, refer to the server-side JavaScript API documentation.
+     * </p>
+     * @param collectionLink  - The self-link of the collection.
+     * @param trigger         - Represents the body of the trigger.
+     * @param [options]       - The request options.
+     * @param callback        - The callback for the request.
+     */
+    public createTrigger(collectionLink: string, trigger: Trigger, options: RequestOptions, callback: RequestCallback<TriggerMeta>): void;
+
+    /**
+     * Create a document.
+     * <p> 
+     * There is no set schema for JSON documents. They may contain any number of custom properties as well as an optional list of attachments. <br>
+     * A Document is an application resource and can be authorized using the master key or resource keys
+     * </p>
+     * @param collectionLink    - The self-link of the collection.
+     * @param document          - Represents the body of the document. Can contain any number of user defined properties.
+     * @param [options]         - The request options.
+     * @param callback 			- The callback for the request.
+     */
+    public createDocument<TDocument>(collectionSelfLink: string, document: NewDocument<TDocument>, options: RequestOptions, callback: RequestCallback<RetrievedDocument<TDocument>>): void;
+
+    /**
+     * Execute the StoredProcedure represented by the object.
+     * @param procedureLink - The self-link of the stored procedure.
+     * @param [params]      - Represents the parameters of the stored procedure.
+     * @param callback      - The callback for the request.
+     */
+    public executeStoredProcedure<TDocument>(procedureLink: string, params: any[], callback: RequestCallback<TDocument>): void;
+
+    /** Lists all databases that satisfy a query. 
+     * @param query     - A SQL query string.
+     * @param [options] - The feed options.
+     * @returns         - An instance of QueryIterator to handle reading feed.
+     */
+    public queryDatabases(query: string | SqlQuerySpec): QueryIterator<DatabaseMeta>;
+
+    /**
+     * Query the collections for the database.
+     * @param databaseLink  - The self-link of the database.
+     * @param query         - A SQL query string.
+     * @param [options]     - Represents the feed options.
+     * @returns             - An instance of queryIterator to handle reading feed.
+     */
+    public queryCollections(databaseLink: string, query: string | SqlQuerySpec): QueryIterator<CollectionMeta>;
+
+    /**
+     * Query the storedProcedures for the collection.
+     * @param collectionLink    - The self-link of the collection.
+     * @param query             - A SQL query string.
+     * @param [options]         - Represents the feed options.
+     * @returns                 - An instance of queryIterator to handle reading feed.
+     */
+    public queryStoredProcedures(collectionLink: string, query: string | SqlQuerySpec): QueryIterator<ProcedureMeta>;
+
+    /**
+    * Query the documents for the collection.
+    * @param collectionLink - The self-link of the collection.
+    * @param query          - A SQL query string.
+    * @param [options]      - Represents the feed options.
+    * @returns              - An instance of queryIterator to handle reading feed.
+    */
+    public queryDocuments<TDocument>(collectionLink: string, query: string | SqlQuerySpec, options?: FeedOptions): QueryIterator<RetrievedDocument<TDocument>>;
+
+    /**
+     * Query the triggers for the collection.
+     * @param {string} collectionLink         - The self-link of the collection.
+     * @param {SqlQuerySpec | string} query   - A SQL query.
+     * @param {FeedOptions} [options]         - Represents the feed options.
+     * @returns {QueryIterator}               - An instance of queryIterator to handle reading feed.
+     */
+    public queryTriggers(collectionLink: string, query: string | SqlQuerySpec, options?: FeedOptions): QueryIterator<TriggerMeta>;
+
+    /**
+     * Delete the document object.
+     * @param documentLink  - The self-link of the document.
+     * @param [options]     - The request options.
+     * @param callback      - The callback for the request. 
+    */
+    public deleteDocument(documentLink: string, options: RequestOptions, callback: RequestCallback<void>): void;
+
+    /**
+     * Delete the database object.
+     * @param databaseLink  - The self-link of the database.
+     * @param [options]     - The request options.
+     * @param callback      - The callback for the request. 
+    */
+    public deleteDatabase(databaseLink: string, options: RequestOptions, callback: RequestCallback<void>): void;
+
+    /**
+     * Delete the collection object.
+     * @param collectionLink    - The self-link of the collection.
+     * @param [options]         - The request options.
+     * @param callback          - The callback for the request. 
+    */
+    public deleteCollection(collectionLink: string, options: RequestOptions, callback: RequestCallback<void>): void;
+
+    /**
+     * Delete the StoredProcedure object.
+     * @param procedureLink - The self-link of the stored procedure.
+     * @param [options]     - The request options.
+     * @param callback      - The callback for the request.
+    */
+    public deleteStoredProcedure(procedureLink: string, options: RequestOptions, callback: RequestCallback<void>): void;
+
+    /**
+     * Replace the document object.
+     * @param {string} documentLink      - The self-link of the document.
+     * @param {object} document          - Represent the new document body.
+     * @param {RequestOptions} [options] - The request options.
+     * @param {RequestCallback} callback - The callback for the request.
+     */
+    public replaceDocument<TDocument>(documentLink: string, document: NewDocument<TDocument>, options: RequestOptions, callback: RequestCallback<RetrievedDocument<TDocument>>): void;
+
+    /**
+     * Replace the StoredProcedure object.
+     * @param procedureLink - The self-link of the stored procedure.
+     * @param procedure     - Represent the new procedure body.
+     * @param [options]     - The request options.
+     * @param callback      - The callback for the request.
+     */
+    public replaceStoredProcedure(procedureLink: string, procedure: Procedure, options: RequestOptions, callback: RequestCallback<ProcedureMeta>): void;
+}
diff --git a/documentdb/tsconfig.json b/documentdb/tsconfig.json
new file mode 100644
index 0000000000..8ccf655ea1
--- /dev/null
+++ b/documentdb/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "documentdb-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dojo/README.md b/dojo/README.md
index 0e82ab4386..e5a09883d4 100644
--- a/dojo/README.md
+++ b/dojo/README.md
@@ -68,8 +68,8 @@ the equivalent TypeScript version is next, explanation of each section below:
 
 /// <amd-dependency path="dijit/form/TextBox" />
 
-/// <reference path="../typings/dojo.d.ts" />
-/// <reference path="../typings/dijit.d.ts" />
+/// <reference types="dojo" />
+/// <reference types="dijit" />
 
 declare var require: (moduleId: string) => any;
 
diff --git a/dojo/dijit.d.ts b/dojo/dijit.d.ts
index 8d3e99b6b5..742881cc90 100644
--- a/dojo/dijit.d.ts
+++ b/dojo/dijit.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./dojo.d.ts" />
+
 
 declare module dijit {
     /**
diff --git a/dojo/dojox.NodeList.d.ts b/dojo/dojox.NodeList.d.ts
index 317f8dc65d..8718756b5c 100644
--- a/dojo/dojox.NodeList.d.ts
+++ b/dojo/dojox.NodeList.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dojo.d.ts" />
+
 declare namespace dojox {
 
     namespace NodeList {
diff --git a/dojo/dojox.app.d.ts b/dojo/dojox.app.d.ts
index 416938d4a1..add6a1dbb8 100644
--- a/dojo/dojox.app.d.ts
+++ b/dojo/dojox.app.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dijit.d.ts" />
-/// <reference path="dojox.mobile.d.ts" />
+
+
 declare namespace dojox {
         namespace app {
         /**
diff --git a/dojo/dojox.atom.d.ts b/dojo/dojox.atom.d.ts
index 96e97c1615..8990f88ac0 100644
--- a/dojo/dojox.atom.d.ts
+++ b/dojo/dojox.atom.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dijit.d.ts" />
+
 declare namespace dojox {
 
     namespace atom {
diff --git a/dojo/dojox.av.d.ts b/dojo/dojox.av.d.ts
index bc04e0bbb7..be7e88fe8d 100644
--- a/dojo/dojox.av.d.ts
+++ b/dojo/dojox.av.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dijit.d.ts" />
+
 declare namespace dojox {
 
     namespace av {
diff --git a/dojo/dojox.calc.d.ts b/dojo/dojox.calc.d.ts
index a700455d00..6d67f544c6 100644
--- a/dojo/dojox.calc.d.ts
+++ b/dojo/dojox.calc.d.ts
@@ -3,9 +3,9 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dijit.d.ts" />
-/// <reference path="dojox.charting.d.ts" />
-/// <reference path="dojox.geo.d.ts" />
+
+
+
  declare namespace dojox {
 
     namespace calc {
diff --git a/dojo/dojox.calendar.d.ts b/dojo/dojox.calendar.d.ts
index 2ab5c8b6d1..87230e3195 100644
--- a/dojo/dojox.calendar.d.ts
+++ b/dojo/dojox.calendar.d.ts
@@ -3,9 +3,9 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dojo.d.ts" />
-/// <reference path="dijit.d.ts" />
-/// <reference path="dojox.widget.d.ts" />
+
+
+
 declare namespace dojox {
 
     namespace calendar {
diff --git a/dojo/dojox.charting.d.ts b/dojo/dojox.charting.d.ts
index 002d760b40..4e543d0eaa 100644
--- a/dojo/dojox.charting.d.ts
+++ b/dojo/dojox.charting.d.ts
@@ -3,9 +3,9 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dijit.d.ts" />
-/// <reference path="dojox.gfx.d.ts" />
-/// <reference path="dojox.geo.d.ts" />
+
+
+
 declare namespace dojox {
 
         namespace charting {
diff --git a/dojo/dojox.color.d.ts b/dojo/dojox.color.d.ts
index bd4b2b6015..0ea9b03dd4 100644
--- a/dojo/dojox.color.d.ts
+++ b/dojo/dojox.color.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dojo.d.ts" />
+
 declare namespace dojox {
 
     /**
diff --git a/dojo/dojox.data.d.ts b/dojo/dojox.data.d.ts
index b12697f40b..54b143462a 100644
--- a/dojo/dojox.data.d.ts
+++ b/dojo/dojox.data.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dojo.d.ts" />
+
 declare namespace dojox {
 
 
diff --git a/dojo/dojox.dgauges.d.ts b/dojo/dojox.dgauges.d.ts
index 30318670fb..cbbfd2ecab 100644
--- a/dojo/dojox.dgauges.d.ts
+++ b/dojo/dojox.dgauges.d.ts
@@ -3,10 +3,10 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dijit.d.ts" />
-/// <reference path="dojox.gfx.d.ts" />
-/// <reference path="dojox.geo.d.ts" />
-/// <reference path="dojox.widget.d.ts" />
+
+
+
+
 declare namespace dojox {
 
     namespace dgauges {
diff --git a/dojo/dojox.dnd.d.ts b/dojo/dojox.dnd.d.ts
index d805185634..fc7474d005 100644
--- a/dojo/dojox.dnd.d.ts
+++ b/dojo/dojox.dnd.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dojo.d.ts" />
+
 declare namespace dojox {
 
     namespace dnd {
diff --git a/dojo/dojox.drawing.d.ts b/dojo/dojox.drawing.d.ts
index d1f2924236..211acc9bb0 100644
--- a/dojo/dojox.drawing.d.ts
+++ b/dojo/dojox.drawing.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dijit.d.ts" />
+
 declare namespace dojox {
 
     /**
diff --git a/dojo/dojox.dtl.d.ts b/dojo/dojox.dtl.d.ts
index 8117e1b7ac..f6355a2084 100644
--- a/dojo/dojox.dtl.d.ts
+++ b/dojo/dojox.dtl.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dojo.d.ts" />
-/// <reference path="dijit.d.ts" />
+
+
 declare namespace dojox {
 
     /**
diff --git a/dojo/dojox.editor.d.ts b/dojo/dojox.editor.d.ts
index 6b0388cdfd..19eceb9390 100644
--- a/dojo/dojox.editor.d.ts
+++ b/dojo/dojox.editor.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dijit.d.ts" />
+
 declare namespace dojox {
 
     namespace editor {
diff --git a/dojo/dojox.embed.d.ts b/dojo/dojox.embed.d.ts
index 915472c38a..fcb41822ee 100644
--- a/dojo/dojox.embed.d.ts
+++ b/dojo/dojox.embed.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dijit.d.ts" />
+
 declare namespace dojox {
     namespace embed {
         /**
diff --git a/dojo/dojox.form.d.ts b/dojo/dojox.form.d.ts
index 8b6d4929c8..8de71b1d1f 100644
--- a/dojo/dojox.form.d.ts
+++ b/dojo/dojox.form.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dijit.d.ts" />
+
 declare namespace dojox {
 
     namespace form {
diff --git a/dojo/dojox.fx.d.ts b/dojo/dojox.fx.d.ts
index 3c1633720f..50e735fee6 100644
--- a/dojo/dojox.fx.d.ts
+++ b/dojo/dojox.fx.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dijit.d.ts" />
+
 declare namespace dojox {
 
     /**
diff --git a/dojo/dojox.gauges.d.ts b/dojo/dojox.gauges.d.ts
index f727ee4412..2bd28edeb2 100644
--- a/dojo/dojox.gauges.d.ts
+++ b/dojo/dojox.gauges.d.ts
@@ -3,9 +3,9 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dijit.d.ts" />
-/// <reference path="dojox.gfx.d.ts" />
-/// <reference path="dojox.geo.d.ts" />
+
+
+
 declare namespace dojox {
 
     namespace gauges {
diff --git a/dojo/dojox.geo.d.ts b/dojo/dojox.geo.d.ts
index 4414ba3d5c..b28314b758 100644
--- a/dojo/dojox.geo.d.ts
+++ b/dojo/dojox.geo.d.ts
@@ -3,9 +3,9 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dojo.d.ts" />
-/// <reference path="dijit.d.ts" />
-/// <reference path="dojox.gfx.d.ts" />
+
+
+
 declare namespace dojox {
 
     namespace geo {
diff --git a/dojo/dojox.gfx.d.ts b/dojo/dojox.gfx.d.ts
index 0dd3c2f674..1fb6612aea 100644
--- a/dojo/dojox.gfx.d.ts
+++ b/dojo/dojox.gfx.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dojo.d.ts" />
+
 declare namespace dojox {
 
     /**
diff --git a/dojo/dojox.gfx3d.d.ts b/dojo/dojox.gfx3d.d.ts
index 0b5e314039..0d8388f39f 100644
--- a/dojo/dojox.gfx3d.d.ts
+++ b/dojo/dojox.gfx3d.d.ts
@@ -3,9 +3,9 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dojo.d.ts" />
-/// <reference path="dojox.gfx.d.ts" />
-/// <reference path="dojox.geo.d.ts" />
+
+
+
 declare namespace dojox {
 
     /**
diff --git a/dojo/dojox.grid.d.ts b/dojo/dojox.grid.d.ts
index fbe558e44c..53ad4424c0 100644
--- a/dojo/dojox.grid.d.ts
+++ b/dojo/dojox.grid.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dijit.d.ts" />
+
 declare namespace dojox {
 
     namespace grid {
diff --git a/dojo/dojox.highlight.d.ts b/dojo/dojox.highlight.d.ts
index 2ea82ed137..f33c32b81e 100644
--- a/dojo/dojox.highlight.d.ts
+++ b/dojo/dojox.highlight.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dijit.d.ts" />
+
 declare namespace dojox {
 
     /**
diff --git a/dojo/dojox.image.d.ts b/dojo/dojox.image.d.ts
index 5e0b4c45d8..4dd000ca6f 100644
--- a/dojo/dojox.image.d.ts
+++ b/dojo/dojox.image.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dijit.d.ts" />
+
 declare namespace dojox {
     /**
      * Permalink: http://dojotoolkit.org/api/1.9/dojox/image.html
diff --git a/dojo/dojox.layout.d.ts b/dojo/dojox.layout.d.ts
index 1fb2553484..aa056eae59 100644
--- a/dojo/dojox.layout.d.ts
+++ b/dojo/dojox.layout.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dojo.d.ts" />
-/// <reference path="dijit.d.ts" />
+
+
 declare namespace dojox {
 
     namespace layout {
diff --git a/dojo/dojox.main.d.ts b/dojo/dojox.main.d.ts
index ec42d63c77..abc3b6a031 100644
--- a/dojo/dojox.main.d.ts
+++ b/dojo/dojox.main.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dojox.gfx.d.ts" />
-/// <reference path="dojox.date.d.ts" />
+
+
 declare namespace dojox {
 
     /**
diff --git a/dojo/dojox.mdnd.d.ts b/dojo/dojox.mdnd.d.ts
index 098b543911..e8fd4b7e84 100644
--- a/dojo/dojox.mdnd.d.ts
+++ b/dojo/dojox.mdnd.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dojo.d.ts" />
+
 declare namespace dojox {
 
     namespace mdnd {
diff --git a/dojo/dojox.mobile.d.ts b/dojo/dojox.mobile.d.ts
index 3dbfacdb14..03e8b2714c 100644
--- a/dojo/dojox.mobile.d.ts
+++ b/dojo/dojox.mobile.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dojo.d.ts" />
-/// <reference path="dijit.d.ts" />
+
+
 declare namespace dojox {
 
     /**
diff --git a/dojo/dojox.mvc.d.ts b/dojo/dojox.mvc.d.ts
index 0dfff1d207..292eb0d355 100644
--- a/dojo/dojox.mvc.d.ts
+++ b/dojo/dojox.mvc.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dijit.d.ts" />
+
 declare namespace dojox {
     /**
      * Permalink: http://dojotoolkit.org/api/1.9/dojox/mvc.html
diff --git a/dojo/dojox.rpc.d.ts b/dojo/dojox.rpc.d.ts
index 50b9a1b4ee..3bb8757e1a 100644
--- a/dojo/dojox.rpc.d.ts
+++ b/dojo/dojox.rpc.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dojo.d.ts" />
+
 declare namespace dojox {
 
     namespace rpc {
diff --git a/dojo/dojox.sketch.d.ts b/dojo/dojox.sketch.d.ts
index 20378514b8..ed0030e743 100644
--- a/dojo/dojox.sketch.d.ts
+++ b/dojo/dojox.sketch.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dojo.d.ts" />
-/// <reference path="dijit.d.ts" />
+
+
 declare namespace dojox {
     /**
      * Permalink: http://dojotoolkit.org/api/1.9/dojox/sketch.html
diff --git a/dojo/dojox.treemap.d.ts b/dojo/dojox.treemap.d.ts
index 178fbf4cd1..917a23ebf4 100644
--- a/dojo/dojox.treemap.d.ts
+++ b/dojo/dojox.treemap.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dijit.d.ts" />
-/// <reference path="dojox.widget.d.ts" />
+
+
 declare namespace dojox {
 
     namespace treemap {
diff --git a/dojo/dojox.widget.d.ts b/dojo/dojox.widget.d.ts
index cccf46b92c..f0ec86f0f1 100644
--- a/dojo/dojox.widget.d.ts
+++ b/dojo/dojox.widget.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Michael Van Sickle <https://github.com/vansimke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="dijit.d.ts" />
-/// <reference path="dojox.layout.d.ts" />
+
+
 declare namespace dojox {
 
     namespace widget {
diff --git a/dojo/dojo.d.ts b/dojo/index.d.ts
similarity index 100%
rename from dojo/dojo.d.ts
rename to dojo/index.d.ts
diff --git a/dojo/tsconfig.json b/dojo/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/dojo/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dom4/dom4-tests.ts b/dom4/dom4-tests.ts
index 9d1a7220d9..35867f2e43 100644
--- a/dom4/dom4-tests.ts
+++ b/dom4/dom4-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="./dom4.d.ts" />
-
 function testDocument() {
     document.query(".container-a").classList;
     document.queryAll(".container-b")[0].className;
diff --git a/dom4/dom4.d.ts b/dom4/dom4.d.ts
deleted file mode 100644
index 6139a6f7ea..0000000000
--- a/dom4/dom4.d.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-// Type definitions for dom4 v1.5
-// Project: https://github.com/WebReflection/dom4
-// Definitions by: Adi Dahiya <https://github.com/adidahiya>, Gilad Gray <https://github.com/giladgray>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-interface ParentNode {
-    /**
-     * Returns the child elements.
-     */
-    children: HTMLCollection;
-
-    /**
-     * Returns the first child that is an element, and null otherwise.
-     */
-    firstElementChild: Element;
-
-    /**
-     * Returns the last child that is an element, and null otherwise.
-     */
-    lastElementChild: Element;
-
-    /**
-     * Returns the number of children that are elements.
-     */
-    childElementCount: number;
-
-    /**
-     * Returns the first element that is a descendant of node that matches relativeSelectors.
-     */
-    query(relativeSelectors: string): Element;
-
-    /**
-     * Returns all element descendants of node that match relativeSelectors.
-     */
-    queryAll(relativeSelectors: string): Elements;
-}
-
-interface Element extends ParentNode {
-    /**
-     * Returns the first (starting at element) inclusive ancestor that matches selectors, and null otherwise.
-     */
-    closest(selectors: string): Element;
-
-    /**
-     * Returns true if matching selectors against element’s root yields element, and false otherwise.
-     */
-    matches(selectors: string): boolean;
-}
-
-interface Elements extends ParentNode, Array<Element> {
-}
-
-interface Document extends ParentNode {
-}
-
-interface DocumentFragment extends ParentNode {
-}
diff --git a/dom4/index.d.ts b/dom4/index.d.ts
new file mode 100644
index 0000000000..5c6538e5b3
--- /dev/null
+++ b/dom4/index.d.ts
@@ -0,0 +1,42 @@
+// Type definitions for dom4 v1.5
+// Project: https://github.com/WebReflection/dom4
+// Definitions by: Adi Dahiya <https://github.com/adidahiya>, Gilad Gray <https://github.com/giladgray>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+interface ParentNode {
+    /**
+     * Returns the child elements.
+     */
+    children: HTMLCollection;
+
+    /**
+     * Returns the first element that is a descendant of node that matches relativeSelectors.
+     */
+    query(relativeSelectors: string): Element;
+
+    /**
+     * Returns all element descendants of node that match relativeSelectors.
+     */
+    queryAll(relativeSelectors: string): Elements;
+}
+
+interface Element extends ParentNode {
+    /**
+     * Returns the first (starting at element) inclusive ancestor that matches selectors, and null otherwise.
+     */
+    closest(selectors: string): Element;
+
+    /**
+     * Returns true if matching selectors against element’s root yields element, and false otherwise.
+     */
+    matches(selectors: string): boolean;
+}
+
+interface Elements extends ElementTraversal, ParentNode, Array<Element> {
+}
+
+interface Document extends ElementTraversal, ParentNode {
+}
+
+interface DocumentFragment extends ElementTraversal, ParentNode {
+}
diff --git a/dom4/tsconfig.json b/dom4/tsconfig.json
new file mode 100644
index 0000000000..3960d603f5
--- /dev/null
+++ b/dom4/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dom4-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/domo/domo-tests.ts b/domo/domo-tests.ts
index cce14fb681..55be3376e1 100644
--- a/domo/domo-tests.ts
+++ b/domo/domo-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="domo.d.ts" />
 
-function opacity(pct) {
+
+function opacity(pct: number) {
     return { opacity: String(pct / 100), filter: "alpha(opacity=" + pct + ")" }
 }
 
@@ -31,7 +31,7 @@ var blue = "#3B5998";
 var gray = "#3B3B3B";
 var defaultRadius = 10;
 
-function roundedCorners(radius) {
+function roundedCorners(radius: number) {
     return {
         borderRadius: radius,
         WebkitBorderRadius: radius,
@@ -58,9 +58,3 @@ var normalStyles =
         STYLE.on("a img", { borderWidth: 0 })
     );
 
-var domo = domo.global(false);
-
-domo.HTML(
-  domo.HEAD(domo.TITLE("Hello, world.")),
-  domo.BODY("Hello, world.")
-);
\ No newline at end of file
diff --git a/domo/domo-tests.ts.tscparams b/domo/domo-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/domo/domo-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/domo/domo.d.ts b/domo/index.d.ts
similarity index 100%
rename from domo/domo.d.ts
rename to domo/index.d.ts
diff --git a/domo/tsconfig.json b/domo/tsconfig.json
new file mode 100644
index 0000000000..58c0633836
--- /dev/null
+++ b/domo/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "domo-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dompurify/dompurify-tests.ts b/dompurify/dompurify-tests.ts
index 5cc6e067b5..eb07cfcf14 100644
--- a/dompurify/dompurify-tests.ts
+++ b/dompurify/dompurify-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="dompurify.d.ts" />
+
 
 import dompurify = require('dompurify');
 
diff --git a/dompurify/dompurify.d.ts b/dompurify/index.d.ts
similarity index 100%
rename from dompurify/dompurify.d.ts
rename to dompurify/index.d.ts
diff --git a/dompurify/tsconfig.json b/dompurify/tsconfig.json
new file mode 100644
index 0000000000..3f59c350a6
--- /dev/null
+++ b/dompurify/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dompurify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/domready/domready-tests.ts b/domready/domready-tests.ts
index 3f4768c215..01be4213f4 100644
--- a/domready/domready-tests.ts
+++ b/domready/domready-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="domready.d.ts" />
+import domready = require("domready");
 
 domready(function () {
   // dom is loaded!
diff --git a/domready/domready.d.ts b/domready/domready.d.ts
deleted file mode 100644
index 80981b74a5..0000000000
--- a/domready/domready.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Type definitions for domready
-// Project: https://github.com/ded/domready
-// Definitions by: Christian Holm Nielsen <https://github.com/dotnetnerd>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare function domready(callback: () => any) : void;
-
-declare module "domready" {
-    export = domready;
-}
diff --git a/domready/index.d.ts b/domready/index.d.ts
new file mode 100644
index 0000000000..9548757894
--- /dev/null
+++ b/domready/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for domready
+// Project: https://github.com/ded/domready
+// Definitions by: Christian Holm Nielsen <https://github.com/dotnetnerd>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function domready(callback: () => any) : void;
+
+export = domready;
+export as namespace domready;
\ No newline at end of file
diff --git a/domready/tsconfig.json b/domready/tsconfig.json
new file mode 100644
index 0000000000..063b409597
--- /dev/null
+++ b/domready/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "domready-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/donna/donna-tests.ts b/donna/donna-tests.ts
index a1695e42a2..42951e2320 100644
--- a/donna/donna-tests.ts
+++ b/donna/donna-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./donna.d.ts" />
+
 
 import donna = require("donna");
 var metadata = donna.generateMetadata(['/path/to/my-module', '/path/to/another-module']);
diff --git a/donna/donna.d.ts b/donna/donna.d.ts
deleted file mode 100644
index 3971a0ef53..0000000000
--- a/donna/donna.d.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// Type definitions for donna
-// Project: https://github.com/atom/donna
-// Definitions by: vvakame <https://github.com/vvakame/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "donna" {
-    function generateMetadata(modules: string[]): DonnaTypes.Metadata;
-}
-
-declare namespace DonnaTypes {
-    interface Metadata {
-        files: { [filePath: string]: File; };
-    }
-
-    interface File {
-        objects: { [line: number]: Line; };
-        exports: any;
-    }
-
-    interface Line {
-        [row: number]: Object;
-    }
-
-    interface Object {
-        type: string;
-        name: string;
-        bindingType: string;
-        paramNames?: string[];
-        classProperties?: any[];
-        prototypeProperties?: number[][];
-        doc?: string;
-        range: number[][];
-
-    }
-}
diff --git a/donna/index.d.ts b/donna/index.d.ts
new file mode 100644
index 0000000000..0b47420998
--- /dev/null
+++ b/donna/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for donna
+// Project: https://github.com/atom/donna
+// Definitions by: vvakame <https://github.com/vvakame/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function generateMetadata(modules: string[]): DonnaTypes.Metadata;
+
+declare namespace DonnaTypes {
+    interface Metadata {
+        files: { [filePath: string]: File; };
+    }
+
+    interface File {
+        objects: { [line: number]: Line; };
+        exports: any;
+    }
+
+    interface Line {
+        [row: number]: Object;
+    }
+
+    interface Object {
+        type: string;
+        name: string;
+        bindingType: string;
+        paramNames?: string[];
+        classProperties?: any[];
+        prototypeProperties?: number[][];
+        doc?: string;
+        range: number[][];
+
+    }
+}
diff --git a/donna/tsconfig.json b/donna/tsconfig.json
new file mode 100644
index 0000000000..2b1c6a04dc
--- /dev/null
+++ b/donna/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "donna-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dot-case/dot-case-tests.ts b/dot-case/dot-case-tests.ts
index d5713aeba8..391724317a 100644
--- a/dot-case/dot-case-tests.ts
+++ b/dot-case/dot-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="dot-case.d.ts" />
 
 import dotCase = require('dot-case');
 
diff --git a/dot-case/dot-case.d.ts b/dot-case/dot-case.d.ts
deleted file mode 100644
index 93921f56e2..0000000000
--- a/dot-case/dot-case.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for dot-case
-// Project: https://github.com/blakeembrey/dot-case
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "dot-case" {
-	function dotCase(string: string, locale?: string): string;
-	export = dotCase;
-}
diff --git a/dot-case/index.d.ts b/dot-case/index.d.ts
new file mode 100644
index 0000000000..8f11ee3b3c
--- /dev/null
+++ b/dot-case/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for dot-case
+// Project: https://github.com/blakeembrey/dot-case
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function dotCase(string: string, locale?: string): string;
+export = dotCase;
diff --git a/dot-case/tsconfig.json b/dot-case/tsconfig.json
new file mode 100644
index 0000000000..6c8b4724f6
--- /dev/null
+++ b/dot-case/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dot-case-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dot-prop/dot-prop-tests.ts b/dot-prop/dot-prop-tests.ts
index 605a72de35..b7687bb64b 100644
--- a/dot-prop/dot-prop-tests.ts
+++ b/dot-prop/dot-prop-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./dot-prop.d.ts" />
 
 import * as dotProp from 'dot-prop';
 
diff --git a/dot-prop/dot-prop.d.ts b/dot-prop/dot-prop.d.ts
deleted file mode 100644
index 9ad2eb1a9d..0000000000
--- a/dot-prop/dot-prop.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for dot-prop
-// Project: https://github.com/sindresorhus/dot-prop
-// Definitions by: Sam Verschueren <https://github.com/samverschueren>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "dot-prop" {
-	export function get(object: any, path: string): any;
-	export function set(object: any, path: string, value: any): void;
-}
diff --git a/dot-prop/index.d.ts b/dot-prop/index.d.ts
new file mode 100644
index 0000000000..b8d9ce406c
--- /dev/null
+++ b/dot-prop/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for dot-prop
+// Project: https://github.com/sindresorhus/dot-prop
+// Definitions by: Sam Verschueren <https://github.com/samverschueren>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export declare function get(object: any, path: string): any;
+export declare function set(object: any, path: string, value: any): void;
diff --git a/dot-prop/tsconfig.json b/dot-prop/tsconfig.json
new file mode 100644
index 0000000000..542b016a33
--- /dev/null
+++ b/dot-prop/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dot-prop-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dot/dot-tests.ts b/dot/dot-tests.ts
index 59e6cff759..fb189e3c34 100644
--- a/dot/dot-tests.ts
+++ b/dot/dot-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="dot.d.ts" />
+
 
 var headertmpl = "<h1>{{=it.title}}</h1>";
 
diff --git a/dot/dot.d.ts b/dot/index.d.ts
similarity index 100%
rename from dot/dot.d.ts
rename to dot/index.d.ts
diff --git a/dot/tsconfig.json b/dot/tsconfig.json
new file mode 100644
index 0000000000..65544a0c7e
--- /dev/null
+++ b/dot/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dot-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dotdotdot/dotdotdot-tests.ts b/dotdotdot/dotdotdot-tests.ts
index 95fe346745..6bfe424b8c 100644
--- a/dotdotdot/dotdotdot-tests.ts
+++ b/dotdotdot/dotdotdot-tests.ts
@@ -1,5 +1,4 @@
-///<reference path="dotdotdot.d.ts" />
-///<reference path="../jquery/jquery.d.ts" />
+///<reference types="jquery" />
 
 $("span").dotdotdot({ ellipsis: ":::" });
 $("span").dotdotdot({ wrap: "letter" });
diff --git a/dotdotdot/dotdotdot.d.ts b/dotdotdot/index.d.ts
similarity index 100%
rename from dotdotdot/dotdotdot.d.ts
rename to dotdotdot/index.d.ts
diff --git a/dotdotdot/tsconfig.json b/dotdotdot/tsconfig.json
new file mode 100644
index 0000000000..36c359d357
--- /dev/null
+++ b/dotdotdot/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dotdotdot-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dotenv/dotenv-tests.ts b/dotenv/dotenv-tests.ts
index 555c104c96..ea54a99b6d 100644
--- a/dotenv/dotenv-tests.ts
+++ b/dotenv/dotenv-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="dotenv.d.ts" />
+
 
 import dotenv = require('dotenv');
 
diff --git a/dotenv/dotenv.d.ts b/dotenv/dotenv.d.ts
deleted file mode 100644
index b18e9bd03b..0000000000
--- a/dotenv/dotenv.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// Type definitions for dotenv 2.0.0
-// Project: https://github.com/motdotla/dotenv
-// Definitions by: Jussi Kinnula <https://github.com/jussikinnula/>
-// Definitions: https://github.com/jussikinnula/DefinitelyTyped
-
-interface dotenvOptions {
-    silent?: boolean;
-    path?: string;
-    encoding?: string;
-}
-
-declare module 'dotenv' {
-    export function config(options?: dotenvOptions): boolean;
-}
diff --git a/dotenv/index.d.ts b/dotenv/index.d.ts
new file mode 100644
index 0000000000..7391133781
--- /dev/null
+++ b/dotenv/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for dotenv 2.0.0
+// Project: https://github.com/motdotla/dotenv
+// Definitions by: Jussi Kinnula <https://github.com/jussikinnula/>
+// Definitions: https://github.com/jussikinnula/DefinitelyTyped
+
+export function config(options?: dotenvOptions): boolean;
+
+interface dotenvOptions {
+    silent?: boolean;
+    path?: string;
+    encoding?: string;
+}
diff --git a/dotenv/tsconfig.json b/dotenv/tsconfig.json
new file mode 100644
index 0000000000..639d164f43
--- /dev/null
+++ b/dotenv/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dotenv-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/doublearray/doublearray-tests.ts b/doublearray/doublearray-tests.ts
index e54a58fd0f..98f2b52fb7 100644
--- a/doublearray/doublearray-tests.ts
+++ b/doublearray/doublearray-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="doublearray.d.ts" />
+
 
 // https://github.com/takuyaa/doublearray/blob/master/README.md
 var words = [
diff --git a/doublearray/doublearray.d.ts b/doublearray/index.d.ts
similarity index 100%
rename from doublearray/doublearray.d.ts
rename to doublearray/index.d.ts
diff --git a/doublearray/tsconfig.json b/doublearray/tsconfig.json
new file mode 100644
index 0000000000..8fb951cbba
--- /dev/null
+++ b/doublearray/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "doublearray-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/draft-js/draft-js-tests.tsx b/draft-js/draft-js-tests.tsx
index 91706cd7e0..a04b5fe35e 100644
--- a/draft-js/draft-js-tests.tsx
+++ b/draft-js/draft-js-tests.tsx
@@ -1,6 +1,5 @@
-/// <reference path="draft-js.d.ts" />
-/// <reference path="../react/react-global.d.ts" />
-/// <reference path="../react/react-dom.d.ts"/>
+/// <reference types="react" />
+/// <reference types="react-dom"/>
 
 import * as React from "react";
 
diff --git a/draft-js/draft-js.d.ts b/draft-js/draft-js.d.ts
deleted file mode 100644
index ac5eb21f33..0000000000
--- a/draft-js/draft-js.d.ts
+++ /dev/null
@@ -1,277 +0,0 @@
-// Type definitions for draft-js 0.2.2
-// Project: https://github.com/facebook/draft-js
-// Definitions by: Pavel Evsegneev <https://github.com/Ahineya>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-declare module "draft-js" {
-    namespace Draft {
-        interface IEditor {
-            new(): Editor
-        }
-
-        interface EditorState {
-            getCurrentContent(): ContentState,
-            getSelection(): SelectionState,
-            getCurrentInlineStyle(): any,
-            getBlockTree(): any,
-
-            createEmpty(decorator?: any): EditorState,
-            createWithContent(contentState: ContentState, decorator?: any): EditorState,
-            create(config: any): EditorState,
-            push(editorState: EditorState, contentState: ContentState, actionType: string): EditorState,
-            undo(editorState: EditorState): EditorState,
-            redo(editorState: EditorState): EditorState,
-            acceptSelection(editorState: EditorState, selectionState: SelectionState): EditorState,
-            forceSelection(editorState: EditorState, selectionState: SelectionState): EditorState,
-
-            moveFocusToEnd(editorState: EditorState): EditorState
-        }
-
-        interface CompositeDecorator {
-            getDecorations(): Array<any>,
-            getComponentForKey(): any,
-            getPropsForKey(): any
-        }
-
-        interface Entity {
-            create(type: string, mutability: string, data?: Object): EntityInstance,
-            add(instance: EntityInstance): string,
-            get(key: string): EntityInstance,
-            mergeData(key: string, toMerge: any): EntityInstance,
-            replaceData(key: string, newData: any): EntityInstance
-        }
-
-        interface EntityInstance {
-            getData(): any,
-            getKey(): string,
-            getMutability(): string
-        }
-
-        interface BlockMapBuilder {
-            createFromArray(blocks: Array<ContentBlock>): BlockMap
-        }
-
-        interface CharacterMetadata {
-            create(config?: any): CharacterMetadata,
-
-            applyStyle(record: CharacterMetadata,
-                       style: string): CharacterMetadata,
-
-            removeStyle(record: CharacterMetadata,
-                        style: string): CharacterMetadata,
-
-            applyEntity(record: CharacterMetadata,
-                        entityKey?: string): CharacterMetadata,
-
-            getStyle(): any,
-            hasStyle(style: string): boolean,
-
-            getEntity(): string
-        }
-
-        interface IContentBlock {
-            new(draftContentBlock: any): ContentBlock;
-        }
-        interface ContentBlock {
-            key: string,
-            type: string,
-            text: string,
-            characterList: any,
-            depth: number,
-
-            getKey(): string,
-            getType(): string,
-            getText(): string,
-            getCharacterList(): any,
-            getLength(): number,
-            getDepth(): number,
-            getInlineStyleAt(offset: number): any,
-            getEntityAt(offset: number): string,
-            findStyleRanges(filterFn: Function, callback: Function): void,
-            findEntityRanges(filterFn: Function, callback: Function): void
-
-        }
-
-        interface ContentState {
-            createFromText(text: string): ContentState,
-            createFromBlockArray(blocks: Array<ContentBlock>): ContentState,
-
-            getBlockMap(): BlockMap,
-            getSelectionBefore(): SelectionState,
-            getSelectionAfter(): SelectionState,
-
-            getBlockForKey(key: string): ContentBlock,
-            getKeyBefore(key: string): string,
-            getKeyAfter(key: string): string,
-
-            getBlockBefore(key: string): ContentBlock,
-            getBlockAfter(key: string): ContentBlock,
-
-            getBlocksAsArray(): Array<ContentBlock>,
-
-            getPlainText(): string,
-            hasText(): boolean,
-
-            set(key: string, value: any): ContentState,
-            toJS(): any
-        }
-
-        interface ISelectionState {
-            new(draftSelectionState: any): SelectionState;
-            createEmpty(blockKey: string): SelectionState;
-        }
-
-        interface SelectionState {
-            getStartKey(): string,
-            getStartOffset(): number,
-            getEndKey(): string,
-            getEndOffset(): number,
-            getAnchorKey(): string,
-            getAnchorOffset(): number,
-            getFocusKey(): string,
-            getFocusOffset(): number,
-
-            getIsBackward(): boolean,
-            getHasFocus(): boolean,
-            isCollapsed(): boolean,
-
-            hasEdgeWithin(blockKey: string, start: number, end: number): boolean,
-            serialize(): string,
-
-            get(key: string): any,
-            set(key: string, value: any): SelectionState
-        }
-
-        interface BlockMap {
-            get(key: string): ContentBlock,
-            set(key: string, value: any): BlockMap,
-            delete(key: string): BlockMap,
-            find(cb: any): ContentBlock
-        }
-
-        interface Modifier {
-            replaceText(contentState: ContentState,
-                        rangeToReplace: SelectionState,
-                        text: string,
-                        inlineStyle?: any,
-                        entityKey?: string): ContentState,
-
-            insertText(contentState: ContentState,
-                       targetRange: SelectionState,
-                       text: string,
-                       inlineStyle?: any,
-                       entityKey?: string): ContentState,
-
-            moveText(contentState: ContentState,
-                     removalRange: SelectionState,
-                     targetRange: SelectionState): ContentState,
-
-            replaceWithFragment(contentState: ContentState,
-                                targetRange: SelectionState,
-                                fragment: BlockMap): ContentState,
-
-            removeRange(contentState: ContentState,
-                        rangeToRemove: SelectionState,
-                        removalDirection: string): ContentState,
-
-            splitBlock(contentState: ContentState,
-                       selectionState: SelectionState): ContentState,
-
-            applyInlineStyle(contentState: ContentState,
-                             selectionState: SelectionState,
-                             inlineStyle: string): ContentState,
-
-            removeInlineStyle(contentState: ContentState,
-                              selectionState: SelectionState,
-                              inlineStyle: string): ContentState,
-
-            setBlockType(contentState: ContentState,
-                         selectionState: SelectionState,
-                         blockType: string): ContentState,
-
-            applyEntity(contentState: ContentState,
-                        selectionState: SelectionState,
-                        entityKey: string): ContentState
-        }
-
-        interface RichUtils {
-            currentBlockContainsLink(editorState: EditorState): boolean,
-            getCurrentBlockType(editor: EditorState): string,
-            handleKeyCommand(editorState: EditorState, command: string): any,
-            insertSoftNewline(editorState: EditorState): EditorState,
-            onBackspace(editorState: EditorState): EditorState,
-            onDelete(editorState: EditorState): EditorState,
-            onTab(event: Event, editorState: EditorState, maxDepth: number): EditorState,
-            toggleBlockType(editorState: EditorState, blockType: string): EditorState,
-            toggleCode(editorState: EditorState): EditorState,
-            toggleLink(editorState: EditorState, targetSelection: SelectionState, entityKey: string): EditorState,
-            tryToRemoveBlockStyle(editorState: EditorState): EditorState
-        }
-
-        interface EditorProps {
-            editorState: EditorState,
-            onChange(editorState: EditorState): void,
-
-            placeholder?: string,
-            textAlignment?: any,
-            blockRendererFn?: (ContentBlock: ContentBlock) => any,
-            blockStyleFn?: (ContentBlock: ContentBlock) => string,
-            customStyleMap?: any,
-
-            readOnly?: boolean,
-            spellCheck?: boolean,
-            stripPastedStyles?: boolean,
-
-            handleReturn?: (e: any) => boolean,
-            handleKeyCommand?: (command: string) => boolean,
-            handleBeforeInput?: (chars: string) => boolean,
-            handlePastedFiles?: (files: Array<Blob>) => boolean,
-            handleDroppedFiles?: (selection: SelectionState, files: Array<Blob>) => boolean,
-            handleDrop?: (selection: SelectionState, dataTransfer: any, isInternal: any) => boolean,
-
-            onEscape?: (e: any) => void,
-            onTab?: (e: any) => void,
-            onUpArrow?: (e: any) => void,
-            onDownArrow?: (e: any) => void,
-
-            suppressContentEditableWarning?: any,
-
-            onBlur?: (e: any) => void,
-            onFocus?: (e: any) => void
-        }
-
-        interface Editor {
-            props: EditorProps
-            state: any,
-            refs: any,
-            context: any,
-            setState(): any,
-            render(): any,
-            forceUpdate(): any
-        }
-
-        var Editor: IEditor;
-        var EditorState: EditorState;
-
-        var CompositeDecorator: CompositeDecorator;
-        var Entity: Entity;
-        var EntityInstance: EntityInstance;
-
-        var BlockMapBuilder: BlockMapBuilder;
-        var CharacterMetadata: CharacterMetadata;
-        var ContentBlock: IContentBlock;
-        var ContentState: ContentState;
-        var SelectionState: ISelectionState;
-
-        var Modifier: Modifier;
-        var RichUtils: RichUtils;
-
-        function convertFromRaw(rawState: any): Array<ContentBlock>;
-
-        function convertToRaw(contentState: ContentState): any;
-
-        function genKey(): string
-    }
-
-    export = Draft;
-
-}
diff --git a/draft-js/index.d.ts b/draft-js/index.d.ts
new file mode 100644
index 0000000000..7ab650acde
--- /dev/null
+++ b/draft-js/index.d.ts
@@ -0,0 +1,275 @@
+// Type definitions for draft-js 0.2.2
+// Project: https://github.com/facebook/draft-js
+// Definitions by: Pavel Evsegneev <https://github.com/Ahineya>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace Draft {
+    interface IEditor {
+        new (): Editor
+    }
+
+    interface EditorState {
+        getCurrentContent(): ContentState,
+        getSelection(): SelectionState,
+        getCurrentInlineStyle(): any,
+        getBlockTree(): any,
+
+        createEmpty(decorator?: any): EditorState,
+        createWithContent(contentState: ContentState, decorator?: any): EditorState,
+        create(config: any): EditorState,
+        push(editorState: EditorState, contentState: ContentState, actionType: string): EditorState,
+        undo(editorState: EditorState): EditorState,
+        redo(editorState: EditorState): EditorState,
+        acceptSelection(editorState: EditorState, selectionState: SelectionState): EditorState,
+        forceSelection(editorState: EditorState, selectionState: SelectionState): EditorState,
+
+        moveFocusToEnd(editorState: EditorState): EditorState
+    }
+
+    interface CompositeDecorator {
+        getDecorations(): Array<any>,
+        getComponentForKey(): any,
+        getPropsForKey(): any
+    }
+
+    interface Entity {
+        create(type: string, mutability: string, data?: Object): EntityInstance,
+        add(instance: EntityInstance): string,
+        get(key: string): EntityInstance,
+        mergeData(key: string, toMerge: any): EntityInstance,
+        replaceData(key: string, newData: any): EntityInstance
+    }
+
+    interface EntityInstance {
+        getData(): any,
+        getKey(): string,
+        getMutability(): string
+    }
+
+    interface BlockMapBuilder {
+        createFromArray(blocks: Array<ContentBlock>): BlockMap
+    }
+
+    interface CharacterMetadata {
+        create(config?: any): CharacterMetadata,
+
+        applyStyle(record: CharacterMetadata,
+            style: string): CharacterMetadata,
+
+        removeStyle(record: CharacterMetadata,
+            style: string): CharacterMetadata,
+
+        applyEntity(record: CharacterMetadata,
+            entityKey?: string): CharacterMetadata,
+
+        getStyle(): any,
+        hasStyle(style: string): boolean,
+
+        getEntity(): string
+    }
+
+    interface IContentBlock {
+        new (draftContentBlock: any): ContentBlock;
+    }
+    interface ContentBlock {
+        key: string,
+        type: string,
+        text: string,
+        characterList: any,
+        depth: number,
+
+        getKey(): string,
+        getType(): string,
+        getText(): string,
+        getCharacterList(): any,
+        getLength(): number,
+        getDepth(): number,
+        getInlineStyleAt(offset: number): any,
+        getEntityAt(offset: number): string,
+        findStyleRanges(filterFn: Function, callback: Function): void,
+        findEntityRanges(filterFn: Function, callback: Function): void
+
+    }
+
+    interface ContentState {
+        createFromText(text: string): ContentState,
+        createFromBlockArray(blocks: Array<ContentBlock>): ContentState,
+
+        getBlockMap(): BlockMap,
+        getSelectionBefore(): SelectionState,
+        getSelectionAfter(): SelectionState,
+
+        getBlockForKey(key: string): ContentBlock,
+        getKeyBefore(key: string): string,
+        getKeyAfter(key: string): string,
+
+        getBlockBefore(key: string): ContentBlock,
+        getBlockAfter(key: string): ContentBlock,
+
+        getBlocksAsArray(): Array<ContentBlock>,
+
+        getPlainText(): string,
+        hasText(): boolean,
+
+        set(key: string, value: any): ContentState,
+        toJS(): any
+    }
+
+    interface ISelectionState {
+        new (draftSelectionState: any): SelectionState;
+        createEmpty(blockKey: string): SelectionState;
+    }
+
+    interface SelectionState {
+        getStartKey(): string,
+        getStartOffset(): number,
+        getEndKey(): string,
+        getEndOffset(): number,
+        getAnchorKey(): string,
+        getAnchorOffset(): number,
+        getFocusKey(): string,
+        getFocusOffset(): number,
+
+        getIsBackward(): boolean,
+        getHasFocus(): boolean,
+        isCollapsed(): boolean,
+
+        hasEdgeWithin(blockKey: string, start: number, end: number): boolean,
+        serialize(): string,
+
+        get(key: string): any,
+        set(key: string, value: any): SelectionState
+    }
+
+    interface BlockMap {
+        get(key: string): ContentBlock,
+        set(key: string, value: any): BlockMap,
+        delete(key: string): BlockMap,
+        find(cb: any): ContentBlock
+    }
+
+    interface Modifier {
+        replaceText(contentState: ContentState,
+            rangeToReplace: SelectionState,
+            text: string,
+            inlineStyle?: any,
+            entityKey?: string): ContentState,
+
+        insertText(contentState: ContentState,
+            targetRange: SelectionState,
+            text: string,
+            inlineStyle?: any,
+            entityKey?: string): ContentState,
+
+        moveText(contentState: ContentState,
+            removalRange: SelectionState,
+            targetRange: SelectionState): ContentState,
+
+        replaceWithFragment(contentState: ContentState,
+            targetRange: SelectionState,
+            fragment: BlockMap): ContentState,
+
+        removeRange(contentState: ContentState,
+            rangeToRemove: SelectionState,
+            removalDirection: string): ContentState,
+
+        splitBlock(contentState: ContentState,
+            selectionState: SelectionState): ContentState,
+
+        applyInlineStyle(contentState: ContentState,
+            selectionState: SelectionState,
+            inlineStyle: string): ContentState,
+
+        removeInlineStyle(contentState: ContentState,
+            selectionState: SelectionState,
+            inlineStyle: string): ContentState,
+
+        setBlockType(contentState: ContentState,
+            selectionState: SelectionState,
+            blockType: string): ContentState,
+
+        applyEntity(contentState: ContentState,
+            selectionState: SelectionState,
+            entityKey: string): ContentState
+    }
+
+    interface RichUtils {
+        currentBlockContainsLink(editorState: EditorState): boolean,
+        getCurrentBlockType(editor: EditorState): string,
+        handleKeyCommand(editorState: EditorState, command: string): any,
+        insertSoftNewline(editorState: EditorState): EditorState,
+        onBackspace(editorState: EditorState): EditorState,
+        onDelete(editorState: EditorState): EditorState,
+        onTab(event: Event, editorState: EditorState, maxDepth: number): EditorState,
+        toggleBlockType(editorState: EditorState, blockType: string): EditorState,
+        toggleCode(editorState: EditorState): EditorState,
+        toggleLink(editorState: EditorState, targetSelection: SelectionState, entityKey: string): EditorState,
+        tryToRemoveBlockStyle(editorState: EditorState): EditorState
+    }
+
+    interface EditorProps {
+        editorState: EditorState,
+        onChange(editorState: EditorState): void,
+
+        placeholder?: string,
+        textAlignment?: any,
+        blockRendererFn?: (ContentBlock: ContentBlock) => any,
+        blockStyleFn?: (ContentBlock: ContentBlock) => string,
+        customStyleMap?: any,
+
+        readOnly?: boolean,
+        spellCheck?: boolean,
+        stripPastedStyles?: boolean,
+
+        handleReturn?: (e: any) => boolean,
+        handleKeyCommand?: (command: string) => boolean,
+        handleBeforeInput?: (chars: string) => boolean,
+        handlePastedFiles?: (files: Array<Blob>) => boolean,
+        handleDroppedFiles?: (selection: SelectionState, files: Array<Blob>) => boolean,
+        handleDrop?: (selection: SelectionState, dataTransfer: any, isInternal: any) => boolean,
+
+        onEscape?: (e: any) => void,
+        onTab?: (e: any) => void,
+        onUpArrow?: (e: any) => void,
+        onDownArrow?: (e: any) => void,
+
+        suppressContentEditableWarning?: any,
+
+        onBlur?: (e: any) => void,
+        onFocus?: (e: any) => void
+    }
+
+    interface Editor {
+        props: EditorProps
+        state: any,
+        refs: any,
+        context: any,
+        setState(): any,
+        render(): any,
+        forceUpdate(): any
+    }
+
+    var Editor: IEditor;
+    var EditorState: EditorState;
+
+    var CompositeDecorator: CompositeDecorator;
+    var Entity: Entity;
+    var EntityInstance: EntityInstance;
+
+    var BlockMapBuilder: BlockMapBuilder;
+    var CharacterMetadata: CharacterMetadata;
+    var ContentBlock: IContentBlock;
+    var ContentState: ContentState;
+    var SelectionState: ISelectionState;
+
+    var Modifier: Modifier;
+    var RichUtils: RichUtils;
+
+    function convertFromRaw(rawState: any): Array<ContentBlock>;
+
+    function convertToRaw(contentState: ContentState): any;
+
+    function genKey(): string
+}
+
+export = Draft;
diff --git a/draft-js/tsconfig.json b/draft-js/tsconfig.json
new file mode 100644
index 0000000000..96cb41c49a
--- /dev/null
+++ b/draft-js/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "draft-js-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/dragula/dragula-amd-tests.ts b/dragula/dragula-amd-tests.ts
index 0dcca91e23..f473f4ecc8 100644
--- a/dragula/dragula-amd-tests.ts
+++ b/dragula/dragula-amd-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./dragula.d.ts" />
+
 
 import dragula = require("dragula");
 
diff --git a/dragula/dragula-tests.ts b/dragula/dragula-tests.ts
index f5481f1d89..d5b28e37dd 100644
--- a/dragula/dragula-tests.ts
+++ b/dragula/dragula-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="dragula.d.ts" />
+import dragula = require("dragula");
 
 var d1 = dragula([document.querySelector('#left'), document.querySelector('#right')]);
 
diff --git a/dragula/dragula.d.ts b/dragula/dragula.d.ts
deleted file mode 100644
index a00929e8f3..0000000000
--- a/dragula/dragula.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// Type definitions for dragula v2.1.2
-// Project: http://bevacqua.github.io/dragula/
-// Definitions by: Paul Welter <https://github.com/pwelter34/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace dragula {
-    interface DragulaOptions {
-        containers?: Element[];
-        isContainer?: (el?: Element) => boolean;
-        moves?: (el?: Element, container?: Element, handle?: Element) => boolean;
-        accepts?: (el?: Element, target?: Element, source?: Element, sibling?: Element) => boolean;
-        invalid?: (el?: Element, target?: Element) => boolean;
-        direction?: string;
-        copy?: boolean;
-        revertOnSpill?: boolean;
-        removeOnSpill?: boolean;
-        delay?: boolean | number;
-        mirrorContainer?: Element;
-    }
-
-    interface Drake {
-        containers: Element[];
-        dragging: boolean;
-        start(item:Element): void;
-        end(): void;
-        cancel(revert:boolean): void;
-        cancel(): void;
-        remove(): void;
-        on(events: string, callback: Function): void;
-        destroy(): void;
-    }
-
-    interface Dragula {
-        (containers: Element[], options: DragulaOptions): Drake;
-        (containers: Element, options: DragulaOptions): Drake;
-        (containers: Element[]): Drake;
-        (options: DragulaOptions): Drake;
-        (): Drake;
-    }
-}
-
-declare var dragula: dragula.Dragula;
-
-declare module "dragula" {
-    export = dragula;
-}
diff --git a/dragula/index.d.ts b/dragula/index.d.ts
new file mode 100644
index 0000000000..98ff1f3108
--- /dev/null
+++ b/dragula/index.d.ts
@@ -0,0 +1,45 @@
+// Type definitions for dragula v2.1.2
+// Project: http://bevacqua.github.io/dragula/
+// Definitions by: Paul Welter <https://github.com/pwelter34/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var dragula: dragula.Dragula;
+
+export = dragula;
+export as namespace dragula;
+
+declare namespace dragula {
+    interface DragulaOptions {
+        containers?: Element[];
+        isContainer?: (el?: Element) => boolean;
+        moves?: (el?: Element, container?: Element, handle?: Element) => boolean;
+        accepts?: (el?: Element, target?: Element, source?: Element, sibling?: Element) => boolean;
+        invalid?: (el?: Element, target?: Element) => boolean;
+        direction?: string;
+        copy?: boolean;
+        revertOnSpill?: boolean;
+        removeOnSpill?: boolean;
+        delay?: boolean | number;
+        mirrorContainer?: Element;
+    }
+
+    interface Drake {
+        containers: Element[];
+        dragging: boolean;
+        start(item:Element): void;
+        end(): void;
+        cancel(revert:boolean): void;
+        cancel(): void;
+        remove(): void;
+        on(events: string, callback: Function): void;
+        destroy(): void;
+    }
+
+    interface Dragula {
+        (containers: Element[], options: DragulaOptions): Drake;
+        (containers: Element, options: DragulaOptions): Drake;
+        (containers: Element[]): Drake;
+        (options: DragulaOptions): Drake;
+        (): Drake;
+    }
+}
diff --git a/dragula/tsconfig.json b/dragula/tsconfig.json
new file mode 100644
index 0000000000..cc6c8fe1e8
--- /dev/null
+++ b/dragula/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dragula-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/drop/drop-tests.ts b/drop/drop-tests.ts
index cc19621fbd..b36573062a 100644
--- a/drop/drop-tests.ts
+++ b/drop/drop-tests.ts
@@ -1,5 +1,5 @@
-///<reference path="../tether/tether.d.ts" />
-///<reference path="drop.d.ts" />
+///<reference types="tether" />
+import Drop = require("drop");
 
 var yellowBox = document.querySelector(".yellow");
 var greenBox = document.querySelector(".green");
diff --git a/drop/drop.d.ts b/drop/drop.d.ts
deleted file mode 100644
index a642ad9edd..0000000000
--- a/drop/drop.d.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-// Type definitions for Drop v1.4
-// Project: http://github.hubspot.com/drop/
-// Definitions by: Adi Dahiya <https://github.com/adidahiya>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../tether/tether.d.ts" />
-
-// global Drop constructor
-declare class Drop {
-    constructor(options: Drop.IDropOptions);
-
-    public content: HTMLElement;
-    public element: HTMLElement;
-    public tether: Tether;
-    public open(): void;
-    public close(): void;
-    public remove(): void;
-    public toggle(): void;
-    public isOpened(): boolean;
-    public position(): void;
-    public destroy(): void;
-
-    /*
-     * Drop instances fire "open" and "close" events.
-     */
-    public on(event: string, handler: Function, context?: any): void;
-    public once(event: string, handler: Function, context?: any): void;
-    public off(event: string, handler?: Function): void;
-
-    public static createContext(options: Drop.IDropContextOptions): Drop;
-}
-
-declare namespace Drop {
-    interface IDropContextOptions {
-        classPrefix?: string;
-        defaults?: IDropOptions;
-    }
-
-    interface IDropOptions {
-        target?: Element;
-        content?: Element | string | ((drop?: Drop) => string) | ((drop?: Drop) => Element);
-        position?: string;
-        openOn?: string;
-        classes?: string;
-        constrainToWindow?: boolean;
-        constrainToScrollParent?: boolean;
-        remove?: boolean;
-        beforeClose?: () => boolean;
-        tetherOptions?: Tether.ITetherOptions;
-    }
-}
-
-declare module "drop" {
-    export = Drop;
-}
-
diff --git a/drop/index.d.ts b/drop/index.d.ts
new file mode 100644
index 0000000000..a16554ff48
--- /dev/null
+++ b/drop/index.d.ts
@@ -0,0 +1,55 @@
+// Type definitions for Drop v1.4
+// Project: http://github.hubspot.com/drop/
+// Definitions by: Adi Dahiya <https://github.com/adidahiya>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="tether" />
+
+export = Drop;
+export as namespace Drop;
+
+// global Drop constructor
+declare class Drop {
+    constructor(options: Drop.IDropOptions);
+
+    public content: HTMLElement;
+    public element: HTMLElement;
+    public tether: Tether;
+    public open(): void;
+    public close(): void;
+    public remove(): void;
+    public toggle(): void;
+    public isOpened(): boolean;
+    public position(): void;
+    public destroy(): void;
+
+    /*
+     * Drop instances fire "open" and "close" events.
+     */
+    public on(event: string, handler: Function, context?: any): void;
+    public once(event: string, handler: Function, context?: any): void;
+    public off(event: string, handler?: Function): void;
+
+    public static createContext(options: Drop.IDropContextOptions): Drop;
+}
+
+declare namespace Drop {
+    interface IDropContextOptions {
+        classPrefix?: string;
+        defaults?: IDropOptions;
+    }
+
+    interface IDropOptions {
+        target?: Element;
+        content?: Element | string | ((drop?: Drop) => string) | ((drop?: Drop) => Element);
+        position?: string;
+        openOn?: string;
+        classes?: string;
+        constrainToWindow?: boolean;
+        constrainToScrollParent?: boolean;
+        remove?: boolean;
+        beforeClose?: () => boolean;
+        tetherOptions?: Tether.ITetherOptions;
+    }
+}
+
diff --git a/drop/tsconfig.json b/drop/tsconfig.json
new file mode 100644
index 0000000000..9464865fd0
--- /dev/null
+++ b/drop/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "drop-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dropboxjs/dropboxjs-tests.ts b/dropboxjs/dropboxjs-tests.ts
index ad8e608a44..84d6ff4cd6 100644
--- a/dropboxjs/dropboxjs-tests.ts
+++ b/dropboxjs/dropboxjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="dropboxjs.d.ts" />
+
 
 var browserClient = new Dropbox.Client({ key: "your-key-here" });
 
diff --git a/dropboxjs/dropboxjs.d.ts b/dropboxjs/index.d.ts
similarity index 100%
rename from dropboxjs/dropboxjs.d.ts
rename to dropboxjs/index.d.ts
diff --git a/dropboxjs/tsconfig.json b/dropboxjs/tsconfig.json
new file mode 100644
index 0000000000..cbd2027815
--- /dev/null
+++ b/dropboxjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dropboxjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dropzone/dropzone-commonjs-tests.ts b/dropzone/dropzone-commonjs-tests.ts
index c25b339e87..8b5fd0a693 100644
--- a/dropzone/dropzone-commonjs-tests.ts
+++ b/dropzone/dropzone-commonjs-tests.ts
@@ -4,6 +4,9 @@ import Dropzone = require("dropzone");
 
 const dropzoneFromString = new Dropzone(".test");
 const dropzoneFromElement = new Dropzone(document.getElementById("test"));
+const dropzoneRenameFunction = function(name: string){
+	return name;
+};
 
 const dropzoneWithOptions = new Dropzone(".test", {
 	url: "/some/url",
@@ -25,10 +28,12 @@ const dropzoneWithOptions = new Dropzone(".test", {
 	clickable: true,
 	ignoreHiddenFiles: true,
 	acceptedFiles: "image/*",
+	renameFilename: dropzoneRenameFunction,
 	autoProcessQueue: true,
 	autoQueue: true,
 	addRemoveLinks: true,
 	previewsContainer: "<div></div>",
+	hiddenInputContainer: document.createElement("input"),
 	capture: "camera",
 
 	dictDefaultMessage: "",
diff --git a/dropzone/dropzone-tests.ts b/dropzone/dropzone-tests.ts
index 3893f7c1a1..43b950068f 100644
--- a/dropzone/dropzone-tests.ts
+++ b/dropzone/dropzone-tests.ts
@@ -1,7 +1,8 @@
-/// <reference path="./dropzone.d.ts"/>
-
 const dropzoneFromString = new Dropzone(".test");
 const dropzoneFromElement = new Dropzone(document.getElementById("test"));
+const dropzoneRenameFunction = function (name:string):string {
+  return name + 'new';
+};
 
 const dropzoneWithOptions = new Dropzone(".test", {
 	url: "/some/url",
@@ -26,10 +27,12 @@ const dropzoneWithOptions = new Dropzone(".test", {
 	clickable: true,
 	ignoreHiddenFiles: true,
 	acceptedFiles: "image/*",
+	renameFilename: dropzoneRenameFunction,
 	autoProcessQueue: true,
 	autoQueue: true,
 	addRemoveLinks: true,
 	previewsContainer: "<div></div>",
+	hiddenInputContainer: document.createElement("input"),
 	capture: "camera",
 
 	dictDefaultMessage: "",
diff --git a/dropzone/dropzone.d.ts b/dropzone/dropzone.d.ts
deleted file mode 100644
index 788cdc08e6..0000000000
--- a/dropzone/dropzone.d.ts
+++ /dev/null
@@ -1,271 +0,0 @@
-// Type definitions for Dropzone 4.0.1
-// Project: http://www.dropzonejs.com/
-// Definitions by: Natan Vivo <https://github.com/nvivo>, Andy Hawkins <https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com>, Vasya Aksyonov <https://github.com/outring>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface DropzoneResizeInfo {
-	srcX?:number;
-	srcY?:number;
-	trgX?:number;
-	trgY?:number;
-	srcWidth?:number;
-	srcHeight?:number;
-	trgWidth?:number;
-	trgHeight?:number;
-	optWidth?:number;
-	optHeight?:number;
-}
-
-interface DropzoneFile extends File {
-	previewElement: HTMLElement;
-	previewTemplate: HTMLElement;
-	previewsContainer: HTMLElement;
-	status: string;
-	accepted: boolean;
-}
-
-interface DropzoneOptions {
-	url?: string;
-	method?: string;
-	withCredentials?: boolean;
-	parallelUploads?: number;
-	uploadMultiple?: boolean;
-	maxFilesize?: number;
-	paramName?: string;
-	createImageThumbnails?: boolean;
-	maxThumbnailFilesize?: number;
-	thumbnailWidth?: number;
-	thumbnailHeight?: number;
-	filesizeBase?: number;
-	maxFiles?: number;
-	params?: {};
-	headers?: {};
-	clickable?: boolean|string|HTMLElement|(string|HTMLElement)[];
-	ignoreHiddenFiles?: boolean;
-	acceptedFiles?: string;
-	autoProcessQueue?: boolean;
-	autoQueue?: boolean;
-	addRemoveLinks?: boolean;
-	previewsContainer?: boolean|string|HTMLElement;
-	capture?: string;
-
-	dictDefaultMessage?: string;
-	dictFallbackMessage?: string;
-	dictFallbackText?: string;
-	dictFileTooBig?: string;
-	dictInvalidFileType?: string;
-	dictResponseError?: string;
-	dictCancelUpload?: string;
-	dictCancelUploadConfirmation?: string;
-	dictRemoveFile?: string;
-	dictRemoveFileConfirmation?: string;
-	dictMaxFilesExceeded?: string;
-
-	accept?(file:DropzoneFile, done:(error?:string|Error) => void):void;
-	init?():void;
-	forceFallback?: boolean;
-	fallback?():void;
-	resize?(file:DropzoneFile):DropzoneResizeInfo;
-
-	drop?(e:DragEvent):void;
-	dragstart?(e:DragEvent):void;
-	dragend?(e:DragEvent):void;
-	dragenter?(e:DragEvent):void;
-	dragover?(e:DragEvent):void;
-	dragleave?(e:DragEvent):void;
-	paste?(e:DragEvent):void;
-
-	reset?():void;
-
-	addedfile?(file:DropzoneFile):void;
-	addedfiles?(files:DropzoneFile[]):void;
-	removedfile?(file:DropzoneFile):void;
-	thumbnail?(file:DropzoneFile, dataUrl:string):void;
-
-	error?(file:DropzoneFile, message:string|Error, xhr:XMLHttpRequest):void;
-	errormultiple?(files:DropzoneFile[], message:string|Error, xhr:XMLHttpRequest):void;
-
-	processing?(file:DropzoneFile):void;
-	processingmultiple?(files:DropzoneFile[]):void;
-
-	uploadprogress?(file:DropzoneFile, progress:number, bytesSent:number):void;
-	totaluploadprogress?(totalProgress:number, totalBytes:number, totalBytesSent:number):void;
-
-	sending?(file:DropzoneFile, xhr:XMLHttpRequest, formData:{}):void;
-	sendingmultiple?(files:DropzoneFile[], xhr:XMLHttpRequest, formData:{}):void;
-
-	success?(file: DropzoneFile, response: Object|string): void;
-	successmultiple?(files:DropzoneFile[], responseText:string):void;
-
-	canceled?(file:DropzoneFile):void;
-	canceledmultiple?(file:DropzoneFile[]):void;
-
-	complete?(file:DropzoneFile):void;
-	completemultiple?(file:DropzoneFile[]):void;
-
-	maxfilesexceeded?(file:DropzoneFile):void;
-	maxfilesreached?(files:DropzoneFile[]):void;
-	queuecomplete?():void;
-
-	previewTemplate?: string;
-}
-
-declare class Dropzone {
-	constructor(container:string|HTMLElement, options?:DropzoneOptions);
-
-	static autoDiscover:boolean;
-	static options:any;
-	static confirm:(question:string, accepted:() => void, rejected?:() => void) => void;
-
-	static ADDED:string;
-	static QUEUED:string;
-	static ACCEPTED:string;
-	static UPLOADING:string;
-	static PROCESSING:string;
-	static CANCELED:string;
-	static ERROR:string;
-	static SUCCESS:string;
-
-	files:DropzoneFile[];
-
-	enable():void;
-
-	disable():void;
-
-	destroy():Dropzone;
-
-	addFile(file:DropzoneFile):void;
-
-	removeFile(file:DropzoneFile):void;
-
-	removeAllFiles(cancelIfNecessary?:boolean):void;
-
-	processQueue():void;
-
-	cancelUpload(file:DropzoneFile):void;
-
-	processFiles(files:DropzoneFile[]):void;
-
-	processFile(file:DropzoneFile):void;
-
-	uploadFile(file:DropzoneFile):void;
-
-	getAcceptedFiles():DropzoneFile[];
-
-	getRejectedFiles():DropzoneFile[];
-
-	getQueuedFiles():DropzoneFile[];
-
-	getUploadingFiles():DropzoneFile[];
-
-	accept(file:DropzoneFile, done:(error?:string|Error) => void):void;
-
-	getActiveFiles():DropzoneFile[];
-
-	getFilesWithStatus(status:string):DropzoneFile[];
-
-	enqueueFile(file:DropzoneFile):void;
-
-	enqueueFiles(file:DropzoneFile[]):void;
-
-	createThumbnail(file:DropzoneFile, callback?:(...args:any[]) => void):any;
-
-	createThumbnailFromUrl(file:DropzoneFile, url:string, callback?:(...args:any[]) => void):any;
-
-	on(eventName:string, callback:(...args:any[]) => void):void;
-
-	off(eventName:string):void;
-
-	emit(eventName:string, ...args:any[]):void;
-
-	on(eventName:"drop", callback:(e:DragEvent) => any):void;
-	on(eventName:"dragstart", callback:(e:DragEvent) => any):void;
-	on(eventName:"dragend", callback:(e:DragEvent) => any):void;
-	on(eventName:"dragenter", callback:(e:DragEvent) => any):void;
-	on(eventName:"dragover", callback:(e:DragEvent) => any):void;
-	on(eventName:"dragleave", callback:(e:DragEvent) => any):void;
-	on(eventName:"paste", callback:(e:DragEvent) => any):void;
-
-	on(eventName:"reset"):void;
-
-	on(eventName:"addedfile", callback:(file:DropzoneFile) => any):void;
-	on(eventName:"addedfiles", callback:(files:DropzoneFile[]) => any):void;
-	on(eventName:"removedfile", callback:(file:DropzoneFile) => any):void;
-	on(eventName:"thumbnail", callback:(file:DropzoneFile, dataUrl:string) => any):void;
-
-	on(eventName:"error", callback:(file:DropzoneFile, message:string|Error) => any):void;
-	on(eventName:"errormultiple", callback:(files:DropzoneFile[], message:string|Error) => any):void;
-
-	on(eventName:"processing", callback:(file:DropzoneFile) => any):void;
-	on(eventName:"processingmultiple", callback:(files:DropzoneFile[]) => any):void;
-
-	on(eventName:"uploadprogress", callback:(file:DropzoneFile, progress:number, bytesSent:number) => any):void;
-	on(eventName:"totaluploadprogress", callback:(totalProgress:number, totalBytes:number, totalBytesSent:number) => any):void;
-
-	on(eventName:"sending", callback:(file:DropzoneFile, xhr:XMLHttpRequest, formData:{}) => any):void;
-	on(eventName:"sendingmultiple", callback:(files:DropzoneFile[], xhr:XMLHttpRequest, formData:{}) => any):void;
-
-	on(eventName:"success", callback:(file:DropzoneFile) => any):void;
-	on(eventName:"successmultiple", callback:(files:DropzoneFile[]) => any):void;
-
-	on(eventName:"canceled", callback:(file:DropzoneFile) => any):void;
-	on(eventName:"canceledmultiple", callback:(file:DropzoneFile[]) => any):void;
-
-	on(eventName:"complete", callback:(file:DropzoneFile) => any):void;
-	on(eventName:"completemultiple", callback:(file:DropzoneFile[]) => any):void;
-
-	on(eventName:"maxfilesexceeded", callback:(file:DropzoneFile) => any):void;
-	on(eventName:"maxfilesreached", callback:(files:DropzoneFile[]) => any):void;
-	on(eventName:"queuecomplete"):void;
-
-	emit(eventName:"drop", e:DragEvent):void;
-	emit(eventName:"dragstart", e:DragEvent):void;
-	emit(eventName:"dragend", e:DragEvent):void;
-	emit(eventName:"dragenter", e:DragEvent):void;
-	emit(eventName:"dragover", e:DragEvent):void;
-	emit(eventName:"dragleave", e:DragEvent):void;
-	emit(eventName:"paste", e:DragEvent):void;
-
-	emit(eventName:"reset"):void;
-
-	emit(eventName:"addedfile", file:DropzoneFile):void;
-	emit(eventName:"addedfiles", files:DropzoneFile[]):void;
-	emit(eventName:"removedfile", file:DropzoneFile):void;
-	emit(eventName:"thumbnail", file:DropzoneFile, dataUrl:string):void;
-
-	emit(eventName:"error", file:DropzoneFile, message:string|Error):void;
-	emit(eventName:"errormultiple", files:DropzoneFile[], message:string|Error):void;
-
-	emit(eventName:"processing", file:DropzoneFile):void;
-	emit(eventName:"processingmultiple", files:DropzoneFile[]):void;
-
-	emit(eventName:"uploadprogress", file:DropzoneFile, progress:number, bytesSent:number):void;
-	emit(eventName:"totaluploadprogress", totalProgress:number, totalBytes:number, totalBytesSent:number):void;
-
-	emit(eventName:"sending", file:DropzoneFile, xhr:XMLHttpRequest, formData:{}):void;
-	emit(eventName:"sendingmultiple", files:DropzoneFile[], xhr:XMLHttpRequest, formData:{}):void;
-
-	emit(eventName:"success", file:DropzoneFile):void;
-	emit(eventName:"successmultiple", files:DropzoneFile[]):void;
-
-	emit(eventName:"canceled", file:DropzoneFile):void;
-	emit(eventName:"canceledmultiple", file:DropzoneFile[]):void;
-
-	emit(eventName:"complete", file:DropzoneFile):void;
-	emit(eventName:"completemultiple", file:DropzoneFile[]):void;
-
-	emit(eventName:"maxfilesexceeded", file:DropzoneFile):void;
-	emit(eventName:"maxfilesreached", files:DropzoneFile[]):void;
-	emit(eventName:"queuecomplete"):void;
-
-}
-
-interface JQuery {
-	dropzone(options:DropzoneOptions): Dropzone;
-}
-
-declare module "dropzone" {
-	export = Dropzone;
-}
diff --git a/dropzone/index.d.ts b/dropzone/index.d.ts
new file mode 100644
index 0000000000..34a367526c
--- /dev/null
+++ b/dropzone/index.d.ts
@@ -0,0 +1,273 @@
+// Type definitions for Dropzone 4.3.0
+// Project: http://www.dropzonejs.com/
+// Definitions by: Natan Vivo <https://github.com/nvivo>, Andy Hawkins <https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com>, Vasya Aksyonov <https://github.com/outring>, Simon Huber <https://github.com/renuo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface DropzoneResizeInfo {
+	srcX?:number;
+	srcY?:number;
+	trgX?:number;
+	trgY?:number;
+	srcWidth?:number;
+	srcHeight?:number;
+	trgWidth?:number;
+	trgHeight?:number;
+	optWidth?:number;
+	optHeight?:number;
+}
+
+interface DropzoneFile extends File {
+	previewElement: HTMLElement;
+	previewTemplate: HTMLElement;
+	previewsContainer: HTMLElement;
+	status: string;
+	accepted: boolean;
+}
+
+interface DropzoneOptions {
+	url?: string;
+	method?: string;
+	withCredentials?: boolean;
+	parallelUploads?: number;
+	uploadMultiple?: boolean;
+	maxFilesize?: number;
+	paramName?: string;
+	createImageThumbnails?: boolean;
+	maxThumbnailFilesize?: number;
+	thumbnailWidth?: number;
+	thumbnailHeight?: number;
+	filesizeBase?: number;
+	maxFiles?: number;
+	params?: {};
+	headers?: {};
+	clickable?: boolean|string|HTMLElement|(string|HTMLElement)[];
+	ignoreHiddenFiles?: boolean;
+	acceptedFiles?: string;
+	renameFilename?(name:string): string;
+	autoProcessQueue?: boolean;
+	autoQueue?: boolean;
+	addRemoveLinks?: boolean;
+	previewsContainer?: boolean|string|HTMLElement;
+	hiddenInputContainer?: HTMLElement;
+	capture?: string;
+
+	dictDefaultMessage?: string;
+	dictFallbackMessage?: string;
+	dictFallbackText?: string;
+	dictFileTooBig?: string;
+	dictInvalidFileType?: string;
+	dictResponseError?: string;
+	dictCancelUpload?: string;
+	dictCancelUploadConfirmation?: string;
+	dictRemoveFile?: string;
+	dictRemoveFileConfirmation?: string;
+	dictMaxFilesExceeded?: string;
+
+	accept?(file:DropzoneFile, done:(error?:string|Error) => void):void;
+	init?():void;
+	forceFallback?: boolean;
+	fallback?():void;
+	resize?(file:DropzoneFile):DropzoneResizeInfo;
+
+	drop?(e:DragEvent):void;
+	dragstart?(e:DragEvent):void;
+	dragend?(e:DragEvent):void;
+	dragenter?(e:DragEvent):void;
+	dragover?(e:DragEvent):void;
+	dragleave?(e:DragEvent):void;
+	paste?(e:DragEvent):void;
+
+	reset?():void;
+
+	addedfile?(file:DropzoneFile):void;
+	addedfiles?(files:DropzoneFile[]):void;
+	removedfile?(file:DropzoneFile):void;
+	thumbnail?(file:DropzoneFile, dataUrl:string):void;
+
+	error?(file:DropzoneFile, message:string|Error, xhr:XMLHttpRequest):void;
+	errormultiple?(files:DropzoneFile[], message:string|Error, xhr:XMLHttpRequest):void;
+
+	processing?(file:DropzoneFile):void;
+	processingmultiple?(files:DropzoneFile[]):void;
+
+	uploadprogress?(file:DropzoneFile, progress:number, bytesSent:number):void;
+	totaluploadprogress?(totalProgress:number, totalBytes:number, totalBytesSent:number):void;
+
+	sending?(file:DropzoneFile, xhr:XMLHttpRequest, formData:{}):void;
+	sendingmultiple?(files:DropzoneFile[], xhr:XMLHttpRequest, formData:{}):void;
+
+	success?(file: DropzoneFile, response: Object|string): void;
+	successmultiple?(files:DropzoneFile[], responseText:string):void;
+
+	canceled?(file:DropzoneFile):void;
+	canceledmultiple?(file:DropzoneFile[]):void;
+
+	complete?(file:DropzoneFile):void;
+	completemultiple?(file:DropzoneFile[]):void;
+
+	maxfilesexceeded?(file:DropzoneFile):void;
+	maxfilesreached?(files:DropzoneFile[]):void;
+	queuecomplete?():void;
+
+	previewTemplate?: string;
+}
+
+declare class Dropzone {
+	constructor(container:string|HTMLElement, options?:DropzoneOptions);
+
+	static autoDiscover:boolean;
+	static options:any;
+	static confirm:(question:string, accepted:() => void, rejected?:() => void) => void;
+
+	static ADDED:string;
+	static QUEUED:string;
+	static ACCEPTED:string;
+	static UPLOADING:string;
+	static PROCESSING:string;
+	static CANCELED:string;
+	static ERROR:string;
+	static SUCCESS:string;
+
+	files:DropzoneFile[];
+
+	enable():void;
+
+	disable():void;
+
+	destroy():Dropzone;
+
+	addFile(file:DropzoneFile):void;
+
+	removeFile(file:DropzoneFile):void;
+
+	removeAllFiles(cancelIfNecessary?:boolean):void;
+
+	processQueue():void;
+
+	cancelUpload(file:DropzoneFile):void;
+
+	processFiles(files:DropzoneFile[]):void;
+
+	processFile(file:DropzoneFile):void;
+
+	uploadFile(file:DropzoneFile):void;
+
+	getAcceptedFiles():DropzoneFile[];
+
+	getRejectedFiles():DropzoneFile[];
+
+	getQueuedFiles():DropzoneFile[];
+
+	getUploadingFiles():DropzoneFile[];
+
+	accept(file:DropzoneFile, done:(error?:string|Error) => void):void;
+
+	getActiveFiles():DropzoneFile[];
+
+	getFilesWithStatus(status:string):DropzoneFile[];
+
+	enqueueFile(file:DropzoneFile):void;
+
+	enqueueFiles(file:DropzoneFile[]):void;
+
+	createThumbnail(file:DropzoneFile, callback?:(...args:any[]) => void):any;
+
+	createThumbnailFromUrl(file:DropzoneFile, url:string, callback?:(...args:any[]) => void):any;
+
+	on(eventName:string, callback:(...args:any[]) => void):void;
+
+	off(eventName:string):void;
+
+	emit(eventName:string, ...args:any[]):void;
+
+	on(eventName:"drop", callback:(e:DragEvent) => any):void;
+	on(eventName:"dragstart", callback:(e:DragEvent) => any):void;
+	on(eventName:"dragend", callback:(e:DragEvent) => any):void;
+	on(eventName:"dragenter", callback:(e:DragEvent) => any):void;
+	on(eventName:"dragover", callback:(e:DragEvent) => any):void;
+	on(eventName:"dragleave", callback:(e:DragEvent) => any):void;
+	on(eventName:"paste", callback:(e:DragEvent) => any):void;
+
+	on(eventName:"reset"):void;
+
+	on(eventName:"addedfile", callback:(file:DropzoneFile) => any):void;
+	on(eventName:"addedfiles", callback:(files:DropzoneFile[]) => any):void;
+	on(eventName:"removedfile", callback:(file:DropzoneFile) => any):void;
+	on(eventName:"thumbnail", callback:(file:DropzoneFile, dataUrl:string) => any):void;
+
+	on(eventName:"error", callback:(file:DropzoneFile, message:string|Error) => any):void;
+	on(eventName:"errormultiple", callback:(files:DropzoneFile[], message:string|Error) => any):void;
+
+	on(eventName:"processing", callback:(file:DropzoneFile) => any):void;
+	on(eventName:"processingmultiple", callback:(files:DropzoneFile[]) => any):void;
+
+	on(eventName:"uploadprogress", callback:(file:DropzoneFile, progress:number, bytesSent:number) => any):void;
+	on(eventName:"totaluploadprogress", callback:(totalProgress:number, totalBytes:number, totalBytesSent:number) => any):void;
+
+	on(eventName:"sending", callback:(file:DropzoneFile, xhr:XMLHttpRequest, formData:{}) => any):void;
+	on(eventName:"sendingmultiple", callback:(files:DropzoneFile[], xhr:XMLHttpRequest, formData:{}) => any):void;
+
+	on(eventName:"success", callback:(file:DropzoneFile) => any):void;
+	on(eventName:"successmultiple", callback:(files:DropzoneFile[]) => any):void;
+
+	on(eventName:"canceled", callback:(file:DropzoneFile) => any):void;
+	on(eventName:"canceledmultiple", callback:(file:DropzoneFile[]) => any):void;
+
+	on(eventName:"complete", callback:(file:DropzoneFile) => any):void;
+	on(eventName:"completemultiple", callback:(file:DropzoneFile[]) => any):void;
+
+	on(eventName:"maxfilesexceeded", callback:(file:DropzoneFile) => any):void;
+	on(eventName:"maxfilesreached", callback:(files:DropzoneFile[]) => any):void;
+	on(eventName:"queuecomplete"):void;
+
+	emit(eventName:"drop", e:DragEvent):void;
+	emit(eventName:"dragstart", e:DragEvent):void;
+	emit(eventName:"dragend", e:DragEvent):void;
+	emit(eventName:"dragenter", e:DragEvent):void;
+	emit(eventName:"dragover", e:DragEvent):void;
+	emit(eventName:"dragleave", e:DragEvent):void;
+	emit(eventName:"paste", e:DragEvent):void;
+
+	emit(eventName:"reset"):void;
+
+	emit(eventName:"addedfile", file:DropzoneFile):void;
+	emit(eventName:"addedfiles", files:DropzoneFile[]):void;
+	emit(eventName:"removedfile", file:DropzoneFile):void;
+	emit(eventName:"thumbnail", file:DropzoneFile, dataUrl:string):void;
+
+	emit(eventName:"error", file:DropzoneFile, message:string|Error):void;
+	emit(eventName:"errormultiple", files:DropzoneFile[], message:string|Error):void;
+
+	emit(eventName:"processing", file:DropzoneFile):void;
+	emit(eventName:"processingmultiple", files:DropzoneFile[]):void;
+
+	emit(eventName:"uploadprogress", file:DropzoneFile, progress:number, bytesSent:number):void;
+	emit(eventName:"totaluploadprogress", totalProgress:number, totalBytes:number, totalBytesSent:number):void;
+
+	emit(eventName:"sending", file:DropzoneFile, xhr:XMLHttpRequest, formData:{}):void;
+	emit(eventName:"sendingmultiple", files:DropzoneFile[], xhr:XMLHttpRequest, formData:{}):void;
+
+	emit(eventName:"success", file:DropzoneFile):void;
+	emit(eventName:"successmultiple", files:DropzoneFile[]):void;
+
+	emit(eventName:"canceled", file:DropzoneFile):void;
+	emit(eventName:"canceledmultiple", file:DropzoneFile[]):void;
+
+	emit(eventName:"complete", file:DropzoneFile):void;
+	emit(eventName:"completemultiple", file:DropzoneFile[]):void;
+
+	emit(eventName:"maxfilesexceeded", file:DropzoneFile):void;
+	emit(eventName:"maxfilesreached", files:DropzoneFile[]):void;
+	emit(eventName:"queuecomplete"):void;
+
+}
+
+interface JQuery {
+	dropzone(options:DropzoneOptions): Dropzone;
+}
+
+declare module "dropzone" {
+	export = Dropzone;
+}
diff --git a/dropzone/tsconfig.json b/dropzone/tsconfig.json
new file mode 100644
index 0000000000..77d92545e6
--- /dev/null
+++ b/dropzone/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dropzone-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dsv/dsv-tests.ts b/dsv/dsv-tests.ts
index 93ff59f04c..983eaef4c6 100644
--- a/dsv/dsv-tests.ts
+++ b/dsv/dsv-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="dsv.d.ts" />
+
 
 import dsv = require("dsv");
 
diff --git a/dsv/dsv.d.ts b/dsv/dsv.d.ts
deleted file mode 100644
index b8f268ee96..0000000000
--- a/dsv/dsv.d.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-// Type definitions for dsv
-// Project: https://www.npmjs.com/package/dsv
-// Definitions by: Jason Swearingen <https://jasonswearingen.github.io>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-//commonjs loader
-declare module "dsv" {
-
-	/** A parser and formatter for DSV (CSV and TSV) files.
-Extracted from D3. */
-    var loader: (
-		/** the symbol used to seperate cells in the row.*/
-		delimiter: string,
-		/** example: "text/plain" */
-		encoding?: string) => _dsv.Dsv;
-    export = loader;
-}
-
-declare module _dsv {
-	/** A parser and formatter for DSV (CSV and TSV) files.
-Extracted from D3. */
-	export class Dsv {
-		/** Parses the specified string, which is the contents of a CSV file, returning an array of objects representing the parsed rows. 
-		The string is assumed to be RFC4180-compliant. 
-		Unlike the parseRows method, this method requires that the first line of the CSV file contains a comma-separated list of column names; 
-		these column names become the attributes on the returned objects. 
-		For example, consider the following CSV file:
-
-Year,Make,Model,Length
-1997,Ford,E350,2.34
-2000,Mercury,Cougar,2.38
-
-The resulting JavaScript array is:
-
-[  {"Year": "1997", "Make": "Ford", "Model": "E350", "Length": "2.34"},
-  {"Year": "2000", "Make": "Mercury", "Model": "Cougar", "Length": "2.38"} ]
-		 */
-		public parse<TRow>(
-			table: string, 
-			/** coerce cells (strings) into different types or modify them. return null to strip this row from the output results. */
-			accessor?: (row: any) => TRow
-			): TRow[];
-		/** Parses the specified string, which is the contents of a CSV file, returning an array of arrays representing the parsed rows. The string is assumed to be RFC4180-compliant. Unlike the parse method, this method treats the header line as a standard row, and should be used whenever the CSV file does not contain a header. Each row is represented as an array rather than an object. Rows may have variable length. For example, consider the following CSV file:
-
-1997,Ford,E350,2.34
-2000,Mercury,Cougar,2.38
-The resulting JavaScript array is:
-
-[  ["1997", "Ford", "E350", "2.34"],
-  ["2000", "Mercury", "Cougar", "2.38"] ]
-Note that the values themselves are always strings; they will not be automatically converted to numbers. See parse for details.*/
-		public parseRows<TRow>(
-			table: string,
-			/** coerce cells (strings) into different types or modify them. return null to strip this row from the output results.*/
-			accessor?: (row: string[]) => TRow
-			): TRow[];
-		/** Converts the specified array of rows into comma-separated values format, returning a string. This operation is the reverse of parse. Each row will be separated by a newline (\n), and each column within each row will be separated by a comma (,). Values that contain either commas, double-quotes (") or newlines will be escaped using double-quotes.
-
-Each row should be an object, and all object properties will be converted into fields. For greater control over which properties are converted, convert the rows into arrays containing only the properties that should be converted and use formatRows. */
-		public format(rows: any[]): string;
-		/** Converts the specified array of rows into comma-separated values format, returning a string. This operation is the reverse of parseRows. Each row will be separated by a newline (\n), and each column within each row will be separated by a comma (,). Values that contain either commas, double-quotes (") or newlines will be escaped using double-quotes. */
-		public formatRows(rows: any[]): string;
-
-
-	}
-
-}
\ No newline at end of file
diff --git a/dsv/index.d.ts b/dsv/index.d.ts
new file mode 100644
index 0000000000..2fac461110
--- /dev/null
+++ b/dsv/index.d.ts
@@ -0,0 +1,65 @@
+// Type definitions for dsv
+// Project: https://www.npmjs.com/package/dsv
+// Definitions by: Jason Swearingen <https://jasonswearingen.github.io>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+	/** A parser and formatter for DSV (CSV and TSV) files.
+Extracted from D3. */
+declare var loader: (
+	/** the symbol used to seperate cells in the row.*/
+	delimiter: string,
+	/** example: "text/plain" */
+	encoding?: string) => _dsv.Dsv;
+export = loader;
+export as namespace d3_dsv;
+
+declare module _dsv {
+	/** A parser and formatter for DSV (CSV and TSV) files.
+Extracted from D3. */
+	export class Dsv {
+		/** Parses the specified string, which is the contents of a CSV file, returning an array of objects representing the parsed rows. 
+		The string is assumed to be RFC4180-compliant. 
+		Unlike the parseRows method, this method requires that the first line of the CSV file contains a comma-separated list of column names; 
+		these column names become the attributes on the returned objects. 
+		For example, consider the following CSV file:
+
+Year,Make,Model,Length
+1997,Ford,E350,2.34
+2000,Mercury,Cougar,2.38
+
+The resulting JavaScript array is:
+
+[  {"Year": "1997", "Make": "Ford", "Model": "E350", "Length": "2.34"},
+  {"Year": "2000", "Make": "Mercury", "Model": "Cougar", "Length": "2.38"} ]
+		 */
+		public parse<TRow>(
+			table: string, 
+			/** coerce cells (strings) into different types or modify them. return null to strip this row from the output results. */
+			accessor?: (row: any) => TRow
+			): TRow[];
+		/** Parses the specified string, which is the contents of a CSV file, returning an array of arrays representing the parsed rows. The string is assumed to be RFC4180-compliant. Unlike the parse method, this method treats the header line as a standard row, and should be used whenever the CSV file does not contain a header. Each row is represented as an array rather than an object. Rows may have variable length. For example, consider the following CSV file:
+
+1997,Ford,E350,2.34
+2000,Mercury,Cougar,2.38
+The resulting JavaScript array is:
+
+[  ["1997", "Ford", "E350", "2.34"],
+  ["2000", "Mercury", "Cougar", "2.38"] ]
+Note that the values themselves are always strings; they will not be automatically converted to numbers. See parse for details.*/
+		public parseRows<TRow>(
+			table: string,
+			/** coerce cells (strings) into different types or modify them. return null to strip this row from the output results.*/
+			accessor?: (row: string[]) => TRow
+			): TRow[];
+		/** Converts the specified array of rows into comma-separated values format, returning a string. This operation is the reverse of parse. Each row will be separated by a newline (\n), and each column within each row will be separated by a comma (,). Values that contain either commas, double-quotes (") or newlines will be escaped using double-quotes.
+
+Each row should be an object, and all object properties will be converted into fields. For greater control over which properties are converted, convert the rows into arrays containing only the properties that should be converted and use formatRows. */
+		public format(rows: any[]): string;
+		/** Converts the specified array of rows into comma-separated values format, returning a string. This operation is the reverse of parseRows. Each row will be separated by a newline (\n), and each column within each row will be separated by a comma (,). Values that contain either commas, double-quotes (") or newlines will be escaped using double-quotes. */
+		public formatRows(rows: any[]): string;
+
+
+	}
+
+}
\ No newline at end of file
diff --git a/dsv/tsconfig.json b/dsv/tsconfig.json
new file mode 100644
index 0000000000..16dbdf7f10
--- /dev/null
+++ b/dsv/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dsv-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dts-bundle/dts-bundle-tests.ts b/dts-bundle/dts-bundle-tests.ts
index 63ba70ca0b..ef8fae6044 100644
--- a/dts-bundle/dts-bundle-tests.ts
+++ b/dts-bundle/dts-bundle-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="./dts-bundle.d.ts"/>
-/// <reference path="../node/node.d.ts"/>
+/// <reference types="node"/>
 import dts = require("dts-bundle");
 import os = require("os");
 
diff --git a/dts-bundle/dts-bundle.d.ts b/dts-bundle/dts-bundle.d.ts
deleted file mode 100644
index 501e0da200..0000000000
--- a/dts-bundle/dts-bundle.d.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-// Type definitions for dts-bundle
-// Project: https://github.com/TypeStrong/dts-bundle
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "dts-bundle" {
-    interface Options {
-        name: string;
-        main: string;
-        baseDir?: string;
-        exclude?: RegExp;
-        externals?: boolean;
-        indent?: string;
-        newLine?: string;
-        out?: string;
-        prefix?: string;
-        removeSource?: boolean;
-        separator?: string;
-        verbose?: boolean;
-    }
-
-    export function bundle(opts: Options): void;
-}
\ No newline at end of file
diff --git a/dts-bundle/index.d.ts b/dts-bundle/index.d.ts
new file mode 100644
index 0000000000..ffdbed678f
--- /dev/null
+++ b/dts-bundle/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for dts-bundle
+// Project: https://github.com/TypeStrong/dts-bundle
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface Options {
+    name: string;
+    main: string;
+    baseDir?: string;
+    exclude?: RegExp;
+    externals?: boolean;
+    indent?: string;
+    newLine?: string;
+    out?: string;
+    prefix?: string;
+    removeSource?: boolean;
+    separator?: string;
+    verbose?: boolean;
+}
+
+export declare function bundle(opts: Options): void;
diff --git a/dts-bundle/tsconfig.json b/dts-bundle/tsconfig.json
new file mode 100644
index 0000000000..b063f5147f
--- /dev/null
+++ b/dts-bundle/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dts-bundle-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/durandal/durandal-1.x.d.ts b/durandal/durandal-1.x.d.ts
index a017b6c9e8..92896b61b5 100644
--- a/durandal/durandal-1.x.d.ts
+++ b/durandal/durandal-1.x.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Evan Larsen <http://nouvosoft.com/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../knockout/knockout.d.ts" />
+/// <reference types="jquery" />
+/// <reference types="knockout" />
 
 declare module "durandal/system" {
     /**
diff --git a/durandal/durandal-1.x.d.ts.tscparams b/durandal/durandal-1.x.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/durandal/durandal-1.x.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/durandal/durandal.d.ts b/durandal/durandal.d.ts
deleted file mode 100644
index c5ec79ae61..0000000000
--- a/durandal/durandal.d.ts
+++ /dev/null
@@ -1,1812 +0,0 @@
-// Type definitions for Durandal 2.1.0
-// Project: http://durandaljs.com
-// Definitions by: Blue Spire <https://github.com/BlueSpire>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/**
- * Durandal 2.1.0 Copyright (c) 2012 Blue Spire Consulting, Inc. All Rights Reserved.
- * Available via the MIT license.
- * see: http://durandaljs.com or https://github.com/BlueSpire/Durandal for details.
- */
-
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../knockout/knockout.d.ts" />
-
-// By default, Durandal uses JQuery's Defer/Promise implementation, but durandal supports injecting/configuring
-// usage of different JavaScript Defer/Promise libraries (f.ex. Q or ES6 Promise polyfills).
-// You might therefore want to use a different interface from a community typings file or your custom unified interface.
-// When using f.ex. Q as Defer/Promise library replace the lines below with:
-
-// <reference path="../q/Q.d.ts" />
-// interface DurandalPromise<T> extends Q.Promise<T>
-// interface DurandalDeferred<T> extends Q.Deferred<T>
-
-interface DurandalPromise<T> extends JQueryPromise<T> { }
-interface DurandalDeferred<T> extends JQueryDeferred<T> { }
-
-/**
- * The system module encapsulates the most basic features used by other modules.
- * @requires require
- * @requires jquery
- */
-declare module 'durandal/system' {
-    var theModule: DurandalSystemModule;
-    export = theModule;
-}
-
-interface DurandalSystemModule {
-    /**
-     * Durandal's version.
-     */
-    version: string;
-
-    /**
-     * A noop function.
-     */
-    noop: Function;
-
-    /**
-     * Gets the module id for the specified object.
-     * @param {object} obj The object whose module id you wish to determine.
-     * @returns {string} The module id.
-     */
-    getModuleId(obj: any): string;
-
-    /**
-     * Sets the module id for the specified object.
-     * @param {object} obj The object whose module id you wish to set.
-     * @param {string} id The id to set for the specified object.
-     */
-    setModuleId(obj: any, id: string): void;
-
-    /**
-     * Resolves the default object instance for a module. If the module is an object, the module is returned. If the module is a function, that function is called with `new` and it's result is returned.
-     * @param {object} module The module to use to get/create the default object for.
-     * @returns {object} The default object for the module.
-     */
-    resolveObject(module: any): any;
-
-    /**
-     * Gets/Sets whether or not Durandal is in debug mode.
-     * @param {boolean} [enable] Turns on/off debugging.
-     * @returns {boolean} Whether or not Durandal is current debugging.
-     */
-    debug(enable?: boolean): boolean;
-
-    /**
-     * Logs data to the console. Pass any number of parameters to be logged. Log output is not processed if the framework is not running in debug mode.
-     * @param {object} info* The objects to log.
-     */
-    log(...msgs: any[]): void;
-
-    /**
-     * Logs an error.
-     * @param {string} obj The error to report.
-     */
-    error(error: string): void;
-
-    /**
-     * Logs an error.
-     * @param {Error} obj The error to report.
-     */
-    error(error: Error): void;
-
-    /**
-     * Asserts a condition by throwing an error if the condition fails.
-     * @param {boolean} condition The condition to check.
-     * @param {string} message The message to report in the error if the condition check fails.
-     */
-    assert(condition: boolean, message: string): void;
-
-    /**
-     * Creates a deferred object which can be used to create a promise. Optionally pass a function action to perform which will be passed an object used in resolving the promise.
-     * @param {function} [action] The action to defer. You will be passed the deferred object as a paramter.
-     * @returns {Deferred} The deferred object.
-     */
-    defer<T>(action?: (dfd: DurandalDeferred<T>) => void): DurandalDeferred<T>;
-
-    /**
-     * Creates a simple V4 UUID. This should not be used as a PK in your database. It can be used to generate internal, unique ids. For a more robust solution see [node-uuid](https://github.com/broofa/node-uuid).
-     * @returns {string} The guid.
-     */
-    guid(): string;
-
-    /**
-     * Uses require.js to obtain a module. This function returns a promise which resolves with the module instance.
-     * @param {string} moduleId The id of the module to load.
-     * @returns {Promise} A promise for the loaded module.
-     */
-    acquire(moduleId: string): DurandalPromise<any>;
-
-    /**
-     * Uses require.js to obtain an array of modules. This function returns a promise which resolves with the modules instances in an array.
-     * @param {string[]} moduleIds The ids of the modules to load.
-     * @returns {Promise} A promise for the loaded module.
-     */
-    acquire(modules: string[]): DurandalPromise<any[]>;
-
-    /**
-     * Uses require.js to obtain multiple modules. This function returns a promise which resolves with the module instances in an array.
-     * @param {string} moduleIds* The ids of the modules to load.
-     * @returns {Promise} A promise for the loaded module.
-     */
-    acquire(...moduleIds: string[]): DurandalPromise<any[]>;
-
-    /**
-     * Extends the first object with the properties of the following objects.
-     * @param {object} obj The target object to extend.
-     * @param {object} extension* Uses to extend the target object.
-    */
-    extend(obj: any, ...extensions: any[]): any;
-
-    /**
-     * Uses a setTimeout to wait the specified milliseconds.
-     * @param {number} milliseconds The number of milliseconds to wait.
-     * @returns {Promise}
-    */
-    wait(milliseconds: number): DurandalPromise<any>;
-
-    /**
-     * Gets all the owned keys of the specified object.
-     * @param {object} object The object whose owned keys should be returned.
-     * @returns {string[]} The keys.
-     */
-    keys(obj: any): string[];
-
-    /**
-     * Determines if the specified object is an html element.
-     * @param {object} object The object to check.
-     * @returns {boolean} True if matches the type, false otherwise.
-     */
-    isElement(obj: any): boolean;
-
-    /**
-     * Determines if the specified object is an array.
-     * @param {object} object The object to check.
-     * @returns {boolean} True if matches the type, false otherwise.
-     */
-    isArray(obj: any): boolean;
-
-    /**
-     * Determines if the specified object is a boolean.
-     * @param {object} object The object to check.
-     * @returns {boolean} True if matches the type, false otherwise.
-     */
-    isObject(obj: any): boolean;
-
-    /**
-     * Determines if the specified object is a promise.
-     * @param {object} object The object to check.
-     * @returns {boolean} True if matches the type, false otherwise.
-     */
-    isPromise(obj: any): boolean;
-
-    /**
-     * Determines if the specified object is a function arguments object.
-     * @param {object} object The object to check.
-     * @returns {boolean} True if matches the type, false otherwise.
-     */
-    isArguments(obj: any): boolean;
-
-    /**
-     * Determines if the specified object is a function.
-     * @param {object} object The object to check.
-     * @returns {boolean} True if matches the type, false otherwise.
-     */
-    isFunction(obj: any): boolean;
-
-    /**
-     * Determines if the specified object is a string.
-     * @param {object} object The object to check.
-     * @returns {boolean} True if matches the type, false otherwise.
-     */
-    isString(obj: any): boolean;
-
-    /**
-     * Determines if the specified object is a number.
-     * @param {object} object The object to check.
-     * @returns {boolean} True if matches the type, false otherwise.
-     */
-    isNumber(obj: any): boolean;
-
-    /**
-     * Determines if the specified object is a date.
-     * @param {object} object The object to check.
-     * @returns {boolean} True if matches the type, false otherwise.
-     */
-    isDate(obj: any): boolean;
-
-    /**
-     * Determines if the specified object is a boolean.
-     * @param {object} object The object to check.
-     * @returns {boolean} True if matches the type, false otherwise.
-     */
-    isBoolean(obj: any): boolean;
-}
-
-/**
- * The viewEngine module provides information to the viewLocator module which is used to locate the view's source file. The viewEngine also transforms a view id into a view instance.
- * @requires system
- * @requires jquery
- */
-declare module 'durandal/viewEngine' {
-    var theModule: DurandalViewEngineModule;
-    export = theModule;
-}
-
-interface DurandalViewEngineModule {
-    /**
-     * The file extension that view source files are expected to have.
-     * @default .html
-    */
-    viewExtension: string;
-
-    /**
-     * The name of the RequireJS loader plugin used by the viewLocator to obtain the view source. (Use requirejs to map the plugin's full path).
-     * @default text
-    */
-    viewPlugin: string;
-
-    /**
-    * Parameters passed to the RequireJS loader plugin used by the viewLocator to obtain the view source.
-    * @default The empty string by default.
-    */
-    viewPluginParameters: string;
-
-    /**
-     * Determines if the url is a url for a view, according to the view engine.
-     * @param {string} url The potential view url.
-     * @returns {boolean} True if the url is a view url, false otherwise.
-    */
-    isViewUrl(url: string): boolean;
-
-    /**
-     * Converts a view url into a view id.
-     * @param {string} url The url to convert.
-     * @returns {string} The view id.
-    */
-    convertViewUrlToViewId(url: string): string;
-
-    /**
-     * Converts a view id into a full RequireJS path.
-     * @param {string} viewId The view id to convert.
-     * @returns {string} The require path.
-    */
-    convertViewIdToRequirePath(viewId: string): string;
-
-    /**
-     * Parses the view engine recognized markup and returns DOM elements.
-     * @param {string} markup The markup to parse.
-     * @returns {HTMLElement[]} The elements.
-    */
-    parseMarkup(markup: string): Node[];
-
-    /**
-     * Calls `parseMarkup` and then pipes the results through `ensureSingleElement`.
-     * @param {string} markup The markup to process.
-     * @returns {HTMLElement} The view.
-    */
-    processMarkup(markup: string): HTMLElement;
-
-    /**
-     * Converts an array of elements into a single element. White space and comments are removed. If a single element does not remain, then the elements are wrapped.
-     * @param {HTMLElement[]} allElements The elements.
-     * @returns {HTMLElement} A single element.
-    */
-    ensureSingleElement(allElements: Node[]): HTMLElement;
-
-    /**
-    * Gets the view associated with the id from the cache of parsed views.
-    * @param {string} id The view id to lookup in the cache.
-    * @return {DOMElement|null} The cached view or null if it's not in the cache.
-    */
-    tryGetViewFromCache(id: string): HTMLElement;
-
-    /**
-     * Puts the view associated with the id into the cache of parsed views.
-     * @param {string} id The view id whose view should be cached.
-     * @param {DOMElement} view The view to cache.
-     */
-    putViewInCache(id: string, view: HTMLElement): void;
-
-    /**
-     * Creates the view associated with the view id.
-     * @param {string} viewId The view id whose view should be created.
-     * @returns {DurandalPromise<HTMLElement>} A promise of the view.
-    */
-    createView(viewId: string): DurandalPromise<HTMLElement>;
-
-    /**
-     * Called when a view cannot be found to provide the opportunity to locate or generate a fallback view. Mainly used to ease development.
-     * @param {string} viewId The view id whose view should be created.
-     * @param {string} requirePath The require path that was attempted.
-     * @param {Error} requirePath The error that was returned from the attempt to locate the default view.
-     * @returns {Promise} A promise for the fallback view.
-    */
-    createFallbackView(viewId: string, requirePath: string, err: Error): DurandalPromise<HTMLElement>;
-}
-
-/**
- * Durandal events originate from backbone.js but also combine some ideas from signals.js as well as some additional improvements.
- * Events can be installed into any object and are installed into the `app` module by default for convenient app-wide eventing.
- * @requires system
- */
-declare module 'durandal/events' {
-    var theModule: DurandalEventModule;
-    export = theModule;
-}
-
-/**
- * The binder joins an object instance and a DOM element tree by applying databinding and/or invoking binding lifecycle callbacks (binding and bindingComplete).
- * @requires system
- * @requires knockout
- */
-declare module 'durandal/binder' {
-    interface BindingInstruction {
-        applyBindings: boolean;
-    }
-
-    /**
-     * Called before every binding operation. Does nothing by default.
-     * @param {object} data The data that is about to be bound.
-     * @param {DOMElement} view The view that is about to be bound.
-     * @param {object} instruction The object that carries the binding instructions.
-    */
-    export var binding: (data: any, view: HTMLElement, instruction: BindingInstruction) => void;
-
-    /**
-     * Called after every binding operation. Does nothing by default.
-     * @param {object} data The data that has just been bound.
-     * @param {DOMElement} view The view that has just been bound.
-     * @param {object} instruction The object that carries the binding instructions.
-    */
-    export var bindingComplete: (data: any, view: HTMLElement, instruction: BindingInstruction) => void;
-
-    /**
-     * Indicates whether or not the binding system should throw errors or not.
-     * @default false The binding system will not throw errors by default. Instead it will log them.
-    */
-    export var throwOnErrors: boolean;
-
-    /**
-     * Gets the binding instruction that was associated with a view when it was bound.
-     * @param {DOMElement} view The view that was previously bound.
-     * @returns {object} The object that carries the binding instructions.
-    */
-    export function getBindingInstruction(view: HTMLElement): BindingInstruction;
-
-    /**
-     * Binds the view, preserving the existing binding context. Optionally, a new context can be created, parented to the previous context.
-     * @param {KnockoutBindingContext} bindingContext The current binding context.
-     * @param {DOMElement} view The view to bind.
-     * @param {object} [obj] The data to bind to, causing the creation of a child binding context if present.
-     * @param {string} [dataAlias] An alias for $data if present.
-    */
-    export function bindContext(bindingContext: KnockoutBindingContext, view: HTMLElement, obj?: any, dataAlias?: string): BindingInstruction;
-
-    /**
-     * Binds the view, preserving the existing binding context. Optionally, a new context can be created, parented to the previous context.
-     * @param {object} obj The data to bind to.
-     * @param {DOMElement} view The view to bind.
-    */
-    export function bind(obj: any, view: HTMLElement): BindingInstruction;
-}
-
-/**
- * The activator module encapsulates all logic related to screen/component activation.
- * An activator is essentially an asynchronous state machine that understands a particular state transition protocol.
- * The protocol ensures that the following series of events always occur: `canDeactivate` (previous state), `canActivate` (new state), `deactivate` (previous state), `activate` (new state).
- * Each of the _can_ callbacks may return a boolean, affirmative value or promise for one of those. If either of the _can_ functions yields a false result, then activation halts.
- * @requires system
- * @requires knockout
- */
-declare module 'durandal/activator' {
-    /**
-     * The default settings used by activators.
-     * @property {ActivatorSettings} defaults
-    */
-    export var defaults: DurandalActivatorSettings;
-
-    /**
-    * Creates a new activator.
-     * @method create
-     * @param {object} [initialActiveItem] The item which should be immediately activated upon creation of the ativator.
-     * @param {ActivatorSettings} [settings] Per activator overrides of the default activator settings.
-     * @returns {Activator} The created activator.
-    */
-    export function create<T>(initialActiveItem?: T, settings?: DurandalActivatorSettings): DurandalActivator<T>;
-
-    /**
-     * Determines whether or not the provided object is an activator or not.
-     * @method isActivator
-     * @param {object} object Any object you wish to verify as an activator or not.
-     * @returns {boolean} True if the object is an activator; false otherwise.
-    */
-    export function isActivator(object: any): boolean;
-}
-
-/**
- * The viewLocator module collaborates with the viewEngine module to provide views (literally dom sub-trees) to other parts of the framework as needed. The primary consumer of the viewLocator is the composition module.
- * @requires system
- * @requires viewEngine
- */
-declare module 'durandal/viewLocator' {
-    var theModule: DurandalViewLocatorModule;
-    export = theModule;
-}
-
-interface DurandalViewLocatorModule {
-    /**
-     * Allows you to set up a convention for mapping module folders to view folders. It is a convenience method that customizes `convertModuleIdToViewId` and `translateViewIdToArea` under the covers.
-     * @param {string} [modulesPath] A string to match in the path and replace with the viewsPath. If not specified, the match is 'viewmodels'.
-     * @param {string} [viewsPath] The replacement for the modulesPath. If not specified, the replacement is 'views'.
-     * @param {string} [areasPath] Partial views are mapped to the "views" folder if not specified. Use this parameter to change their location.
-    */
-    useConvention(modulesPath?: string, viewsPath?: string, areasPath?: string): void;
-
-    /**
-     * Maps an object instance to a view instance.
-     * @param {object} obj The object to locate the view for.
-     * @param {string} [area] The area to translate the view to.
-     * @param {DOMElement[]} [elementsToSearch] An existing set of elements to search first.
-     * @returns {Promise} A promise of the view.
-    */
-    locateViewForObject(obj: any, area: string, elementsToSearch?: HTMLElement[]): DurandalPromise<HTMLElement>;
-
-    /**
-     * Converts a module id into a view id. By default the ids are the same.
-     * @param {string} moduleId The module id.
-     * @returns {string} The view id.
-    */
-    convertModuleIdToViewId(moduleId: string): string;
-
-    /**
-     * If no view id can be determined, this function is called to genreate one. By default it attempts to determine the object's type and use that.
-     * @param {object} obj The object to determine the fallback id for.
-     * @returns {string} The view id.
-    */
-    determineFallbackViewId(obj: any): string;
-
-    /**
-     * Takes a view id and translates it into a particular area. By default, no translation occurs.
-     * @param {string} viewId The view id.
-     * @param {string} area The area to translate the view to.
-     * @returns {string} The translated view id.
-    */
-    translateViewIdToArea(viewId: string, area: string): string;
-
-    /**
-     * Locates the specified view.
-     * @param {string|DOMElement} view A view. It will be immediately returned.
-     * @param {string} [area] The area to translate the view to.
-     * @param {DOMElement[]} [elementsToSearch] An existing set of elements to search first.
-     * @returns {Promise} A promise of the view.
-    */
-    locateView(view: HTMLElement, area?: string, elementsToSearch?: HTMLElement[]): DurandalPromise<HTMLElement>;
-
-    /**
-     * Locates the specified view.
-     * @param {string|DOMElement} viewUrlOrId A view url or view id to locate.
-     * @param {string} [area] The area to translate the view to.
-     * @param {DOMElement[]} [elementsToSearch] An existing set of elements to search first.
-     * @returns {Promise} A promise of the view.
-    */
-    locateView(viewUrlOrId: string, area?: string, elementsToSearch?: HTMLElement[]): DurandalPromise<HTMLElement>;
-}
-
-/**
- * The composition module encapsulates all functionality related to visual composition.
- * @requires system
- * @requires viewLocator
- * @requires binder
- * @requires viewEngine
- * @requires activator
- * @requires jquery
- * @requires knockout
- */
-declare module 'durandal/composition' {
-    interface CompositionTransation {
-        /**
-         * Registers a callback which will be invoked when the current composition transaction has completed. The transaction includes all parent and children compositions.
-         * @param {function} callback The callback to be invoked when composition is complete.
-        */
-        complete(callback: Function): void;
-    }
-
-    interface CompositionContext {
-        mode: string;
-        parent: HTMLElement;
-        activeView: HTMLElement;
-        triggerAttach(): void;
-        bindingContext?: KnockoutBindingContext;
-        cacheViews?: boolean;
-        viewElements?: HTMLElement[];
-        model?: any;
-        view?: any;
-        area?: string;
-        preserveContext?: boolean;
-        activate?: boolean;
-        strategy?: (context: CompositionContext) => DurandalPromise<HTMLElement>;
-        composingNewView: boolean;
-        child: HTMLElement;
-        binding?: (child: HTMLElement, parent: HTMLElement, context: CompositionContext) => void;
-        attached?: (child: HTMLElement, parent: HTMLElement, context: CompositionContext) => void;
-        compositionComplete?: (child: HTMLElement, parent: HTMLElement, context: CompositionContext) => void;
-        transition?: string;
-    }
-
-    /**
-     * Converts a transition name to its moduleId.
-     * @param {string} name The name of the transtion.
-     * @returns {string} The moduleId.
-    */
-    export function convertTransitionToModuleId(name: string): string;
-
-    /**
-     * The name of the transition to use in all compositions.
-     * @default null
-    */
-    export var defaultTransitionName: string;
-
-    /**
-     * Represents the currently executing composition transaction.
-     */
-    export var current: CompositionTransation;
-
-    /**
-     * Registers a binding handler that will be invoked when the current composition transaction is complete.
-     * @param {string} name The name of the binding handler.
-     * @param {object} [config] The binding handler instance. If none is provided, the name will be used to look up an existing handler which will then be converted to a composition handler.
-     * @param {function} [initOptionsFactory] If the registered binding needs to return options from its init call back to knockout, this function will server as a factory for those options. It will receive the same parameters that the init function does.
-    */
-    export function addBindingHandler(name: string, config?: KnockoutBindingHandler, initOptionsFactory?: (element?: HTMLElement, valueAccessor?: any, allBindingsAccessor?: any, viewModel?: any, bindingContext?: KnockoutBindingContext) => any): void;
-
-    /**
-     * Gets an object keyed with all the elements that are replacable parts, found within the supplied elements. The key will be the part name and the value will be the element itself.
-     * @param {DOMElement[]} elements The elements to search for parts.
-     * @returns {object} An object keyed by part.
-    */
-    export function getParts(elements: HTMLElement[]): any;
-
-    /**
-     * Gets an object keyed with all the elements that are replacable parts, found within the supplied element. The key will be the part name and the value will be the element itself.
-     * @param {DOMElement} element The element to search for parts.
-     * @returns {object} An object keyed by part.
-    */
-    export function getParts(element: HTMLElement): any;
-
-    /**
-     * Eecutes the default view location strategy.
-     * @param {object} context The composition context containing the model and possibly existing viewElements.
-     * @returns {promise} A promise for the view.
-    */
-    export var defaultStrategy: (context: CompositionContext) => DurandalPromise<HTMLElement>;
-
-    /**
-     * Initiates a composition.
-     * @param {DOMElement} element The DOMElement or knockout virtual element that serves as the parent for the composition.
-     * @param {object} settings The composition settings.
-     * @param {object} [bindingContext] The current binding context.
-    */
-    export function compose(element: HTMLElement, settings: CompositionContext, bindingContext: KnockoutBindingContext): void;
-}
-
-/**
- * The app module controls app startup, plugin loading/configuration and root visual display.
- * @requires system
- * @requires viewEngine
- * @requires composition
- * @requires events
- * @requires jquery
- */
-declare module 'durandal/app' {
-    var theModule: DurandalAppModule;
-    export = theModule;
-}
-
-/**
- * The dialog module enables the display of message boxes, custom modal dialogs and other overlays or slide-out UI abstractions. Dialogs are constructed by the composition system which interacts with a user defined dialog context. The dialog module enforced the activator lifecycle.
- * @requires system
- * @requires app
- * @requires composition
- * @requires activator
- * @requires viewEngine
- * @requires jquery
- * @requires knockout
- */
-declare module 'plugins/dialog' {
-    import composition = require('durandal/composition');
-
-    /**
-    * Models a message box's message, title and options.
-    * @class
-    */
-    class Box {
-        constructor(message: string, title?: string, options?: string[], autoclose?: boolean, settings?: Object);
-
-        /**
-         * Selects an option and closes the message box, returning the selected option through the dialog system's promise.
-         * @param {string} dialogResult The result to select.
-         */
-        selectOption(dialogResult: string): void;
-
-        /**
-         * Provides the view to the composition system.
-         * @returns {DOMElement} The view of the message box.
-         */
-        getView(): HTMLElement;
-
-        /**
-         * Configures a custom view to use when displaying message boxes.
-         * @method setViewUrl
-         * @param {string} viewUrl The view url relative to the base url which the view locator will use to find the message box's view.
-         */
-        static setViewUrl(viewUrl: string): void;
-
-        /**
-         * The title to be used for the message box if one is not provided.
-         * @default Application
-         * @static
-         */
-        static defaultTitle: string;
-
-        /**
-         * The options to display in the message box if none are specified.
-         * @default ['Ok']
-         * @static
-         */
-        static defaultOptions: string[];
-
-        /**
-        * Sets the classes and styles used throughout the message box markup.
-        * @method setDefaults
-        * @param {object} settings A settings object containing the following optional properties: buttonClass, primaryButtonClass, secondaryButtonClass, class, style.
-        */
-        static setDefaults(settings: Object): void;
-
-        /**
-         * The markup for the message box's view.
-         */
-        static defaultViewMarkup: string;
-    }
-
-    interface DialogContext {
-        /**
-         * In this function, you are expected to add a DOM element to the tree which will serve as the "host" for the modal's composed view. You must add a property called host to the modalWindow object which references the dom element. It is this host which is passed to the composition module.
-         * @param {Dialog} theDialog The dialog model.
-        */
-        addHost(theDialog: Dialog): void;
-
-        /**
-         * This function is expected to remove any DOM machinery associated with the specified dialog and do any other necessary cleanup.
-         * @param {Dialog} theDialog The dialog model.
-        */
-        removeHost(theDialog: Dialog): void;
-
-        /**
-         * This function is called after the modal is fully composed into the DOM, allowing your implementation to do any final modifications, such as positioning or animation. You can obtain the original dialog object by using `getDialog` on context.model.
-         * @param {DOMElement} child The dialog view.
-         * @param {DOMElement} parent The parent view.
-         * @param {object} context The composition context.
-        */
-        compositionComplete(child: HTMLElement, parent: HTMLElement, context: composition.CompositionContext): void;
-    }
-
-    interface Dialog {
-        owner: any;
-        context: DialogContext;
-        activator: DurandalActivator<any>;
-        close(): DurandalPromise<any>;
-        settings: composition.CompositionContext;
-    }
-
-    /**
-     * The constructor function used to create message boxes.
-    */
-    export var MessageBox: Box;
-
-    /**
-     * The css zIndex that the last dialog was displayed at.
-    */
-    export var currentZIndex: number;
-
-    /**
-     * Gets the next css zIndex at which a dialog should be displayed.
-     * @returns {number} The next usable zIndex.
-    */
-    export function getNextZIndex(): number;
-
-    /**
-     * Determines whether or not there are any dialogs open.
-     * @returns {boolean} True if a dialog is open. false otherwise.
-    */
-    export function isOpen(): boolean;
-
-    /**
-     * Gets the dialog context by name or returns the default context if no name is specified.
-     * @param {string} [name] The name of the context to retrieve.
-     * @returns {DialogContext} True context.
-    */
-    export function getContext(name: string): DialogContext;
-
-    /**
-     * Adds (or replaces) a dialog context.
-     * @param {string} name The name of the context to add.
-     * @param {DialogContext} dialogContext The context to add.
-    */
-    export function addContext(name: string, modalContext: DialogContext): void;
-
-    /**
-     * Gets the dialog model that is associated with the specified object.
-     * @param {object} obj The object for whom to retrieve the dialog.
-     * @returns {Dialog} The dialog model.
-    */
-    export function getDialog(obj: any): Dialog;
-
-    /**
-     * Closes the dialog associated with the specified object.
-     * @param {object} obj The object whose dialog should be closed.
-     * @param {object} results* The results to return back to the dialog caller after closing.
-    */
-    export function close(obj: any, ...results: any[]): void;
-
-    /**
-     * Shows a dialog.
-     * @param {object|string} obj The object (or moduleId) to display as a dialog.
-     * @param {object} [activationData] The data that should be passed to the object upon activation.
-     * @param {string} [context] The name of the dialog context to use. Uses the default context if none is specified.
-     * @returns {Promise} A promise that resolves when the dialog is closed and returns any data passed at the time of closing.
-    */
-    export function show(obj: any, activationData?: any, context?: string): DurandalPromise<any>;
-
-    /**
-     * Shows a message box.
-     * @param {string} message The message to display in the dialog.
-     * @param {string} [title] The title message.
-     * @param {string[]} [options] The options to provide to the user.
-     * @param {boolean} [autoclose] Automatically close the the message box when clicking outside?
-     * @param {Object} [settings] Custom settings for this instance of the messsage box, used to change classes and styles.
-     * @returns {Promise} A promise that resolves when the message box is closed and returns the selected option.
-    */
-    export function showMessage(message: string, title?: string, options?: string[], autoclose?: boolean, settings?: Object): DurandalPromise<string>;
-
-    /**
-     * Shows a message box.
-     * @param {string} message The message to display in the dialog.
-     * @param {string} [title] The title message.
-     * @param {DialogButton[]} [options] The options to provide to the user.
-     * @param {boolean} [autoclose] Automatically close the the message box when clicking outside?
-     * @param {Object} [settings] Custom settings for this instance of the messsage box, used to change classes and styles.
-     * @returns {Promise} A promise that resolves when the message box is closed and returns the selected option.
-    */
-    export function showMessage(message: string, title?: string, options?: DialogButton[], autoclose?: boolean, settings?: Object): DurandalPromise<any>;
-
-    /**
-     * Installs this module into Durandal; called by the framework. Adds `app.showDialog` and `app.showMessage` convenience methods.
-     * @param {object} [config] Add a `messageBox` property to supply a custom message box constructor. Add a `messageBoxView` property to supply custom view markup for the built-in message box. You can also use messageBoxViewUrl to specify the view url.
-    */
-    export function install(config: Object): void;
-}
-
-/**
- * This module is based on Backbone's core history support. It abstracts away the low level details of working with browser history and url changes in order to provide a solid foundation for a router.
- * @requires system
- * @requires jquery
- */
-declare module 'plugins/history' {
-    /**
-     * The setTimeout interval used when the browser does not support hash change events.
-     * @default 50
-    */
-    export var interval: number;
-
-    /**
-     * Indicates whether or not the history module is actively tracking history.
-    */
-    export var active: boolean;
-
-    /**
-     * Gets the true hash value. Cannot use location.hash directly due to a bug in Firefox where location.hash will always be decoded.
-     * @param {string} [window] The optional window instance
-     * @returns {string} The hash.
-     */
-    export function getHash(window?: Window): string;
-
-    /**
-     * Get the cross-browser normalized URL fragment, either from the URL, the hash, or the override.
-     * @param {string} fragment The fragment.
-     * @param {boolean} forcePushState Should we force push state?
-     * @returns {string} he fragment.
-     */
-    export function getFragment(fragment: string, forcePushState: boolean): string;
-
-    /**
-     * Activate the hash change handling, returning `true` if the current URL matches an existing route, and `false` otherwise.
-     * @param {HistoryOptions} options.
-     * @returns {boolean|undefined} Returns true/false from loading the url unless the silent option was selected.
-     */
-    export function activate(options: DurandalHistoryOptions): boolean;
-
-    /**
-     * Disable history, perhaps temporarily. Not useful in a real app, but possibly useful for unit testing Routers.
-     */
-    export function deactivate(): void;
-
-    /**
-     * Checks the current URL to see if it has changed, and if it has, calls `loadUrl`, normalizing across the hidden iframe.
-     * @returns {boolean} Returns true/false from loading the url.
-     */
-    export function checkUrl(): boolean;
-
-    /**
-     * Attempts to load the current URL fragment. A pass-through to options.routeHandler.
-     * @returns {boolean} Returns true/false from the route handler.
-     */
-    export function loadUrl(): boolean;
-
-    /**
-     * Save a fragment into the hash history, or replace the URL state if the
-     * 'replace' option is passed. You are responsible for properly URL-encoding
-     * the fragment in advance.
-     * The options object can contain `trigger: false` if you wish to not have the
-     * route callback be fired, or `replace: true`, if
-     * you wish to modify the current URL without adding an entry to the history.
-     * @param {string} fragment The url fragment to navigate to.
-     * @param {object|boolean} options An options object with optional trigger and replace flags. You can also pass a boolean directly to set the trigger option. Trigger is `true` by default.
-     * @return {boolean} Returns true/false from loading the url.
-     */
-    export function navigate(fragment: string, trigger?: boolean): boolean;
-
-    /**
-     * Save a fragment into the hash history, or replace the URL state if the
-     * 'replace' option is passed. You are responsible for properly URL-encoding
-     * the fragment in advance.
-     * The options object can contain `trigger: false` if you wish to not have the
-     * route callback be fired, or `replace: true`, if
-     * you wish to modify the current URL without adding an entry to the history.
-     * @param {string} fragment The url fragment to navigate to.
-     * @param {object|boolean} options An options object with optional trigger and replace flags. You can also pass a boolean directly to set the trigger option. Trigger is `true` by default.
-     * @return {boolean} Returns true/false from loading the url.
-     */
-    export function navigate(fragment: string, options: DurandalNavigationOptions): boolean;
-
-    /**
-     * Navigates back in the browser history.
-     */
-    export function navigateBack(): void;
-}
-
-/**
- * Enables common http request scenarios.
- * @requires jquery
- * @requires knockout
- */
-declare module 'plugins/http' {
-    /**
-     * The name of the callback parameter to inject into jsonp requests by default.
-     * @default callback
-    */
-    export var callbackParam: string;
-
-    /**
-    * Converts the data to JSON.
-    * @param {object} data The data to convert to JSON.
-    * @return {string} JSON.
-    */
-    export function toJSON(data: Object): string;
-
-    /**
-     * Makes an HTTP GET request.
-     * @param {string} url The url to send the get request to.
-     * @param {object} [query] An optional key/value object to transform into query string parameters.
-     * @param {object} [headers] The data to add to the request header.  It will be converted to JSON. If the data contains Knockout observables, they will be converted into normal properties before serialization.
-     * @returns {Promise} A promise of the get response data.
-    */
-    export function get(url: string, query?: Object, headers?: Object): DurandalPromise<any>;
-
-    /**
-     * Makes an JSONP request.
-     * @param {string} url The url to send the get request to.
-     * @param {object} [query] An optional key/value object to transform into query string parameters.
-     * @param {string} [callbackParam] The name of the callback parameter the api expects (overrides the default callbackParam).
-     * @param {object} [headers] The data to add to the request header.  It will be converted to JSON. If the data contains Knockout observables, they will be converted into normal properties before serialization.
-     * @returns {Promise} A promise of the response data.
-    */
-    export function jsonp(url: string, query?: Object, callbackParam?: string, headers?: Object): DurandalPromise<any>;
-
-    /**
-     * Makes an HTTP POST request.
-     * @param {string} url The url to send the post request to.
-     * @param {object} data The data to post. It will be converted to JSON. If the data contains Knockout observables, they will be converted into normal properties before serialization.
-     * @param {object} [headers] The data to add to the request header.  It will be converted to JSON. If the data contains Knockout observables, they will be converted into normal properties before serialization.
-     * @returns {Promise} A promise of the response data.
-    */
-    export function post(url: string, data: Object, headers?: Object): DurandalPromise<any>;
-
-    /**
-    * Makes an HTTP PUT request.
-    * @method put
-    * @param {string} url The url to send the put request to.
-    * @param {object} data The data to put. It will be converted to JSON. If the data contains Knockout observables, they will be converted into normal properties before serialization.
-    * @param {object} [headers] The data to add to the request header.  It will be converted to JSON. If the data contains Knockout observables, they will be converted into normal properties before serialization.
-    * @return {Promise} A promise of the response data.
-    */
-    export function put(url: string, data: Object, headers?: Object): DurandalPromise<any>;
-
-    /**
-    * Makes an HTTP DELETE request.
-    * @method remove
-    * @param {string} url The url to send the delete request to.
-    * @param {object} [query] An optional key/value object to transform into query string parameters.
-    * @param {object} [headers] The data to add to the request header.  It will be converted to JSON. If the data contains Knockout observables, they will be converted into normal properties before serialization.
-    * @return {Promise} A promise of the get response data.
-    */
-    export function remove(url: string, query?: Object, headers?: Object): DurandalPromise<any>;
-}
-
-/**
- * Enables automatic observability of plain javascript object for ES5 compatible browsers. Also, converts promise properties into observables that are updated when the promise resolves.
- * @requires system
- * @requires binder
- * @requires knockout
- */
-declare module 'plugins/observable' {
-    function observable(obj: any, property: string): KnockoutObservable<any>;
-
-    namespace observable {
-        /**
-         * Converts an entire object into an observable object by re-writing its attributes using ES5 getters and setters. Attributes beginning with '_' or '$' are ignored.
-         * @param {object} obj The target object to convert.
-         */
-        export function convertObject(obj: any): void;
-
-        /**
-         * Converts a normal property into an observable property using ES5 getters and setters.
-         * @param {object} obj The target object on which the property to convert lives.
-         * @param {string} propertyName The name of the property to convert.
-         * @param {object} [original] The original value of the property. If not specified, it will be retrieved from the object.
-         * @returns {KnockoutObservable} The underlying observable.
-         */
-        export function convertProperty(obj: any, propertyName: string, original?: any): KnockoutObservable<any>;
-
-        /**
-         * Defines a computed property using ES5 getters and setters.
-         * @param {object} obj The target object on which to create the property.
-         * @param {string} propertyName The name of the property to define.
-         * @param {function|object} evaluatorOrOptions The Knockout computed function or computed options object.
-         * @returns {KnockoutComputed} The underlying computed observable.
-         */
-        export function defineProperty<T>(obj: any, propertyName: string, evaluatorOrOptions?: KnockoutComputedDefine<T>): KnockoutComputed<T>;
-
-        /**
-         * Installs the plugin into the view model binder's `beforeBind` hook so that objects are automatically converted before being bound.
-         */
-        export function install(config: Object): void;
-    }
-
-    export = observable;
-}
-
-/**
- * Serializes and deserializes data to/from JSON.
- * @requires system
- */
-declare module 'plugins/serializer' {
-    interface SerializerOptions {
-        /**
-         * The default replacer function used during serialization. By default properties starting with '_' or '$' are removed from the serialized object.
-         * @param {string} key The object key to check.
-         * @param {object} value The object value to check.
-         * @returns {object} The value to serialize.
-        */
-        replacer?: (key: string, value: any) => any;
-
-        /**
-         * The amount of space to use for indentation when writing out JSON.
-         * @default undefined
-        */
-        space: any;
-    }
-
-    interface DeserializerOptions {
-        /**
-         * Gets the type id for an object instance, using the configured `typeAttribute`.
-         * @param {object} object The object to serialize.
-         * @returns {string} The type.
-        */
-        getTypeId: (object: any) => string;
-
-        /**
-         * Gets the constructor based on the type id.
-         * @param {string} typeId The type id.
-         * @returns {Function} The constructor.
-        */
-        getConstructor: (typeId: string) => () => any;
-
-        /**
-         * The default reviver function used during deserialization. By default is detects type properties on objects and uses them to re-construct the correct object using the provided constructor mapping.
-         * @param {string} key The attribute key.
-         * @param {object} value The object value associated with the key.
-         * @returns {object} The value.
-        */
-        reviver: (key: string, value: any) => any;
-    }
-
-    /**
-     * The name of the attribute that the serializer should use to identify an object's type.
-     * @default type
-    */
-    export var typeAttribute: string;
-
-    /**
-     * The amount of space to use for indentation when writing out JSON.
-     * @default undefined
-    */
-    export var space: any;
-
-    /**
-     * The default replacer function used during serialization. By default properties starting with '_' or '$' are removed from the serialized object.
-     * @param {string} key The object key to check.
-     * @param {object} value The object value to check.
-     * @returns {object} The value to serialize.
-    */
-    export function replacer(key: string, value: any): any;
-
-    /**
-     * Serializes the object.
-     * @param {object} object The object to serialize.
-     * @param {object} [settings] Settings can specify a replacer or space to override the serializer defaults.
-     * @returns {string} The JSON string.
-    */
-    export function serialize(object: any, settings?: string): string;
-
-    /**
-     * Serializes the object.
-     * @param {object} object The object to serialize.
-     * @param {object} [settings] Settings can specify a replacer or space to override the serializer defaults.
-     * @returns {string} The JSON string.
-    */
-    export function serialize(object: any, settings?: number): string;
-
-    /**
-     * Serializes the object.
-     * @param {object} object The object to serialize.
-     * @param {object} [settings] Settings can specify a replacer or space to override the serializer defaults.
-     * @returns {string} The JSON string.
-    */
-    export function serialize(object: any, settings?: SerializerOptions): string;
-
-    /**
-     * Gets the type id for an object instance, using the configured `typeAttribute`.
-     * @param {object} object The object to serialize.
-     * @returns {string} The type.
-    */
-    export function getTypeId(object: any): string;
-
-    /**
-     * Maps type ids to object constructor functions. Keys are type ids and values are functions.
-    */
-    export var typeMap: any;
-
-    /**
-    * Adds a type id/constructor function mampping to the `typeMap`.
-    * @param {string} typeId The type id.
-    * @param {function} constructor The constructor.
-    */
-    export function registerType(typeId: string, constructor: () => any): void;
-
-    /**
-     * The default reviver function used during deserialization. By default is detects type properties on objects and uses them to re-construct the correct object using the provided constructor mapping.
-     * @param {string} key The attribute key.
-     * @param {object} value The object value associated with the key.
-     * @param {function} getTypeId A custom function used to get the type id from a value.
-     * @param {object} getConstructor A custom function used to get the constructor function associated with a type id.
-     * @returns {object} The value.
-    */
-    export function reviver(key: string, value: any, getTypeId: (value: any) => string, getConstructor: (id: string) => () => any): any;
-
-    /**
-     * Deserialize the JSON.
-     * @param {text} text The JSON string.
-     * @param {DeserializerOptions} settings Settings can specify a reviver, getTypeId function or getConstructor function.
-     * @returns {object} The deserialized object.
-    */
-    export function deserialize<T>(text: string, settings?: DeserializerOptions): T;
-
-    /**
-    * Clone the object.
-    * @param {object} obj The object to clone.
-    * @param {object} [settings] Settings can specify any of the options allowed by the serialize or deserialize methods.
-    * @return {object} The new clone.
-    */
-    export function clone<T>(obj: T, settings?: Object): T;
-}
-
-/**
- * Layers the widget sugar on top of the composition system.
- * @requires system
- * @requires composition
- * @requires jquery
- * @requires knockout
- */
-declare module 'plugins/widget' {
-    interface WidgetSettings {
-        kind: string;
-        model?: any;
-        view?: any;
-    }
-
-    /**
-     * Creates a ko binding handler for the specified kind.
-     * @param {string} kind The kind to create a custom binding handler for.
-    */
-    export function registerKind(kind: string): void;
-
-    /**
-     * Maps views and module to the kind identifier if a non-standard pattern is desired.
-     * @param {string} kind The kind name.
-     * @param {string} [viewId] The unconventional view id to map the kind to.
-     * @param {string} [moduleId] The unconventional module id to map the kind to.
-    */
-    export function mapKind(kind: string, viewId?: string, moduleId?: string): void;
-
-    /**
-     * Maps a kind name to it's module id. First it looks up a custom mapped kind, then falls back to `convertKindToModulePath`.
-     * @param {string} kind The kind name.
-     * @returns {string} The module id.
-    */
-    export function mapKindToModuleId(kind: string): string;
-
-    /**
-     * Converts a kind name to it's module path. Used to conventionally map kinds who aren't explicitly mapped through `mapKind`.
-     * @param {string} kind The kind name.
-     * @returns {string} The module path.
-    */
-    export function convertKindToModulePath(kind: string): string;
-
-    /**
-     * Maps a kind name to it's view id. First it looks up a custom mapped kind, then falls back to `convertKindToViewPath`.
-     * @param {string} kind The kind name.
-     * @returns {string} The view id.
-    */
-    export function mapKindToViewId(kind: string): string;
-
-    /**
-     * Converts a kind name to it's view id. Used to conventionally map kinds who aren't explicitly mapped through `mapKind`.
-     * @param {string} kind The kind name.
-     * @returns {string} The view id.
-    */
-    export function convertKindToViewPath(kind: string): string;
-
-    /**
-     * Creates a widget.
-     * @param {DOMElement} element The DOMElement or knockout virtual element that serves as the target element for the widget.
-     * @param {object} settings The widget settings.
-     * @param {object} [bindingContext] The current binding context.
-    */
-    export function create(element: HTMLElement, settings: WidgetSettings, bindingContext?: KnockoutBindingContext): void;
-}
-
-/**
- * Connects the history module's url and history tracking support to Durandal's activation and composition engine allowing you to easily build navigation-style applications.
- * @requires system
- * @requires app
- * @requires activator
- * @requires events
- * @requires composition
- * @requires history
- * @requires knockout
- * @requires jquery
- */
-declare module 'plugins/router' {
-    var theModule: DurandalRootRouter;
-    export = theModule;
-}
-
-interface DurandalEventSubscription {
-    /**
-     * Attaches a callback to the event subscription.
-     * @param {function} callback The callback function to invoke when the event is triggered.
-     * @param {object} [context] An object to use as `this` when invoking the `callback`.
-     * @chainable
-     */
-    then(thenCallback: Function, context?: any): DurandalEventSubscription;
-
-    /**
-     * Attaches a callback to the event subscription.
-     * @param {function} [callback] The callback function to invoke when the event is triggered. If `callback` is not provided, the previous callback will be re-activated.
-     * @param {object} [context] An object to use as `this` when invoking the `callback`.
-     * @chainable
-     */
-    on(thenCallback: Function, context?: any): DurandalEventSubscription;
-
-    /**
-     * Cancels the subscription.
-     * @chainable
-     */
-    off(): DurandalEventSubscription;
-}
-
-interface DurandalEventSupport<T> {
-    /**
-     * Creates a subscription or registers a callback for the specified event.
-     * @param {string} events One or more events, separated by white space.
-     * @returns {Subscription} A subscription is returned.
-     */
-    on(events: string): DurandalEventSubscription;
-
-    /**
-     * Creates a subscription or registers a callback for the specified event.
-     * @param {string} events One or more events, separated by white space.
-     * @param {function} [callback] The callback function to invoke when the event is triggered.
-     * @param {object} [context] An object to use as `this` when invoking the `callback`.
-     * @returns {Events} The events object is returned for chaining.
-     */
-    on(events: string, callback: Function, context?: any): T;
-
-    /**
-     * Removes the callbacks for the specified events.
-     * @param {string} [events] One or more events, separated by white space to turn off. If no events are specified, then the callbacks will be removed.
-     * @param {function} [callback] The callback function to remove. If `callback` is not provided, all callbacks for the specified events will be removed.
-     * @param {object} [context] The object that was used as `this`. Callbacks with this context will be removed.
-     * @chainable
-     */
-    off(events: string, callback: Function, context?: any): T;
-
-    /**
-     * Triggers the specified events.
-     * @param {string} [events] One or more events, separated by white space to trigger.
-     * @chainable
-     */
-    trigger(events: string, ...eventArgs: any[]): T;
-
-    /**
-     * Creates a function that will trigger the specified events when called. Simplifies proxying jQuery (or other) events through to the events object.
-     * @param {string} events One or more events, separated by white space to trigger by invoking the returned function.
-     * @returns {function} Calling the function will invoke the previously specified events on the events object.
-     */
-    proxy(events: string): Function;
-}
-
-interface DurandalEventModule {
-    new (): DurandalEventSupport<Object>;
-    includeIn(targetObject: any): void;
-}
-
-interface DialogButton {
-    text: string;
-    value: any;
-}
-
-interface DurandalAppModule extends DurandalEventSupport<DurandalAppModule> {
-    /**
-     * The title of your application.
-    */
-    title: string;
-
-    /**
-     * Shows a dialog via the dialog plugin.
-     * @param {object|string} obj The object (or moduleId) to display as a dialog.
-     * @param {object} [activationData] The data that should be passed to the object upon activation.
-     * @param {string} [context] The name of the dialog context to use. Uses the default context if none is specified.
-     * @returns {Promise} A promise that resolves when the dialog is closed and returns any data passed at the time of closing.
-    */
-    showDialog(obj: any, activationData?: any, context?: string): DurandalPromise<any>;
-
-    /**
-     * Closes the dialog associated with the specified object. via the dialog plugin.
-     * @param {object} obj The object whose dialog should be closed.
-     * @param {object} results* The results to return back to the dialog caller after closing.
-     */
-    closeDialog(obj: any, ...results: any[]): void;
-
-    /**
-     * Shows a message box via the dialog plugin.
-     * @param {string} message The message to display in the dialog.
-     * @param {string} [title] The title message.
-     * @param {string[]} [options] The options to provide to the user.
-     * @param {boolean} [autoclose] Automatically close the the message box when clicking outside?
-     * @param {Object} [settings] Custom settings for this instance of the messsage box, used to change classes and styles.
-     * @returns {Promise} A promise that resolves when the message box is closed and returns the selected option.
-     */
-    showMessage(message: string, title?: string, options?: string[], autoclose?: boolean, settings?: Object): DurandalPromise<string>;
-
-    /**
-     * Shows a message box.
-     * @param {string} message The message to display in the dialog.
-     * @param {string} [title] The title message.
-     * @param {DialogButton[]} [options] The options to provide to the user.
-     * @param {boolean} [autoclose] Automatically close the the message box when clicking outside?
-     * @param {Object} [settings] Custom settings for this instance of the messsage box, used to change classes and styles.
-     * @returns {Promise} A promise that resolves when the message box is closed and returns the selected option.
-     */
-    showMessage(message: string, title?: string, options?: DialogButton[], autoclose?: boolean, settings?: Object): DurandalPromise<any>;
-
-    /**
-     * Configures one or more plugins to be loaded and installed into the application.
-     * @method configurePlugins
-     * @param {object} config Keys are plugin names. Values can be truthy, to simply install the plugin, or a configuration object to pass to the plugin.
-     * @param {string} [baseUrl] The base url to load the plugins from.
-    */
-    configurePlugins(config: Object, baseUrl?: string): void;
-
-    /**
-     * Starts the application.
-     * @returns {promise}
-    */
-    start(): DurandalPromise<any>;
-
-    /**
-     * Sets the root module/view for the application.
-     * @param {string} root The root view or module.
-     * @param {string} [transition] The transition to use from the previous root (or splash screen) into the new root.
-     * @param {string} [applicationHost] The application host element id. By default the id 'applicationHost' will be used.
-    */
-    setRoot(root: any, transition?: string, applicationHost?: string): void;
-
-    /**
-     * Sets the root module/view for the application.
-     * @param {string} root The root view or module.
-     * @param {string} [transition] The transition to use from the previous root (or splash screen) into the new root.
-     * @param {string} [applicationHost] The application host element. By default the id 'applicationHost' will be used.
-    */
-    setRoot(root: any, transition?: string, applicationHost?: HTMLElement): void;
-}
-
-interface DurandalActivatorSettings {
-    /**
-     * The default value passed to an object's deactivate function as its close parameter.
-     * @default true
-    */
-    closeOnDeactivate: boolean;
-
-    /**
-     * Lower-cased words which represent a truthy value.
-     * @default ['yes', 'ok', 'true']
-    */
-    affirmations: string[];
-
-    /**
-     * Interprets the response of a `canActivate` or `canDeactivate` call using the known affirmative values in the `affirmations` array.
-     * @param {object} value
-     * @returns {boolean}
-    */
-    interpretResponse(value: any): boolean;
-
-    /**
-     * Determines whether or not the current item and the new item are the same.
-     * @param {object} currentItem
-     * @param {object} newItem
-     * @param {object} currentActivationData
-     * @param {object} newActivationData
-     * @returns {boolean}
-    */
-    areSameItem(currentItem: any, newItem: any, currentActivationData: any, newActivationData: any): boolean;
-
-    /**
-     * Called immediately before the new item is activated.
-     * @param {object} newItem
-    */
-    beforeActivate(newItem: any): any;
-
-    /**
-     * Called immediately after the old item is deactivated.
-     * @param {object} oldItem The previous item.
-     * @param {boolean} close Whether or not the previous item was closed.
-     * @param {function} setter The activate item setter function.
-    */
-    afterDeactivate(oldItem: any, close: boolean, setter: Function): void;
-}
-
-interface DurandalActivator<T> extends KnockoutComputed<T> {
-    /**
-     * The settings for this activator.
-    */
-    settings: DurandalActivatorSettings;
-
-    /**
-     * An observable which indicates whether or not the activator is currently in the process of activating an instance.
-     * @returns {boolean}
-    */
-    isActivating: KnockoutObservable<boolean>;
-
-    /**
-     * Determines whether or not the specified item can be deactivated.
-     * @param {object} item The item to check.
-     * @param {boolean} close Whether or not to check if close is possible.
-     * @returns {promise}
-    */
-    canDeactivateItem(item: T, close: boolean): DurandalPromise<boolean>;
-
-    /**
-     * Deactivates the specified item.
-     * @param {object} item The item to deactivate.
-     * @param {boolean} close Whether or not to close the item.
-     * @returns {promise}
-    */
-    deactivateItem(item: T, close: boolean): DurandalPromise<boolean>;
-
-    /**
-     * Determines whether or not the specified item can be activated.
-     * @param {object} item The item to check.
-     * @param {object} activationData Data associated with the activation.
-     * @returns {promise}
-    */
-    canActivateItem(newItem: T, activationData?: any): DurandalPromise<boolean>;
-
-    /**
-     * Activates the specified item.
-     * @param {object} newItem The item to activate.
-     * @param {object} newActivationData Data associated with the activation.
-     * @returns {promise}
-    */
-    activateItem(newItem: T, activationData?: any): DurandalPromise<boolean>;
-
-    /**
-     * Determines whether or not the activator, in its current state, can be activated.
-     * @returns {promise}
-    */
-    canActivate(): DurandalPromise<boolean>;
-
-    /**
-     * Activates the activator, in its current state.
-     * @returns {promise}
-    */
-    activate(): DurandalPromise<boolean>;
-
-    /**
-     * Determines whether or not the activator, in its current state, can be deactivated.
-     * @returns {promise}
-    */
-    canDeactivate(close: boolean): DurandalPromise<boolean>;
-
-    /**
-     * Deactivates the activator, in its current state.
-     * @returns {promise}
-    */
-    deactivate(close: boolean): DurandalPromise<boolean>;
-
-    /**
-      * Adds canActivate, activate, canDeactivate and deactivate functions to the provided model which pass through to the corresponding functions on the activator.
-      */
-    includeIn(includeIn: any): void;
-
-    /**
-      * Sets up a collection representing a pool of objects which the activator will activate. See below for details. Activators without an item bool always close their values on deactivate. Activators with an items pool only deactivate, but do not close them.
-      */
-    forItems(items: any[]): DurandalActivator<T>;
-}
-
-interface DurandalHistoryOptions {
-    /**
-     * The function that will be called back when the fragment changes.
-     */
-    routeHandler?: (fragment: string) => void;
-
-    /**
-     * The url root used to extract the fragment when using push state.
-     */
-    root?: string;
-
-    /**
-     * Use hash change when present.
-     * @default true
-     */
-    hashChange?: boolean;
-
-    /**
-     * Use push state when present.
-     * @default false
-     */
-    pushState?: boolean;
-
-    /**
-     * Prevents loading of the current url when activating history.
-     * @default false
-     */
-    silent?: boolean;
-
-    /**
-     * Override default history init behavior by navigating directly to this route.
-     */
-    startRoute?: string;
-}
-
-interface DurandalNavigationOptions {
-    trigger: boolean;
-    replace: boolean;
-}
-
-interface DurandalRouteConfiguration {
-    title?: any;
-    moduleId?: string;
-    hash?: string;
-    route?: string | string[];
-    routePattern?: RegExp;
-    isActive?: KnockoutComputed<boolean>;
-    nav?: any;
-    hasChildRoutes?: boolean;
-    viewUrl?: string;
-}
-
-interface DurandalRouteInstruction {
-    fragment: string;
-    queryString: string;
-    config: DurandalRouteConfiguration;
-    params: any[];
-    queryParams: { [index: string]: any };
-}
-
-interface DurandalRelativeRouteSettings {
-    moduleId?: string;
-    route?: string;
-    fromParent?: boolean;
-	dynamicHash?: string;
-}
-
-interface DurandalRouterBase<T> extends DurandalEventSupport<T> {
-    /**
-     * The route handlers that are registered. Each handler consists of a `routePattern` and a `callback`.
-    */
-    handlers: { routePattern: RegExp; callback: (fragment: string) => void; }[];
-
-    /**
-     * The route configs that are registered.
-    */
-    routes: DurandalRouteConfiguration[];
-
-    /**
-     * The active item/screen based on the current navigation state.
-    */
-    activeItem: DurandalActivator<any>;
-
-    /**
-     * The route configurations that have been designated as displayable in a nav ui (nav:true).
-    */
-    navigationModel: KnockoutObservableArray<DurandalRouteConfiguration>;
-
-    /**
-     * Indicates that the router (or a child router) is currently in the process of navigating.
-    */
-    isNavigating: KnockoutComputed<boolean>;
-
-    /**
-     * An observable surfacing the active routing instruction that is currently being processed or has recently finished processing.
-     * The instruction object has `config`, `fragment`, `queryString`, `params` and `queryParams` properties.
-    */
-    activeInstruction: KnockoutObservable<DurandalRouteInstruction>;
-
-    /**
-     * Parses a query string into an object.
-     * @param {string} queryString The query string to parse.
-     * @returns {object} An object keyed according to the query string parameters.
-     */
-    parseQueryString(queryString: string): Object;
-
-    /**
-     * Add a route to be tested when the url fragment changes.
-     * @param {RegEx} routePattern The route pattern to test against.
-     * @param {function} callback The callback to execute when the route pattern is matched.
-     */
-    route(routePattern: RegExp, callback: (fragment: string) => void): void;
-
-    /**
-     * Attempt to load the specified URL fragment. If a route succeeds with a match, returns `true`. If no defined routes matches the fragment, returns `false`.
-     * @param {string} fragment The URL fragment to find a match for.
-     * @returns {boolean} True if a match was found, false otherwise.
-     */
-    loadUrl(fragment: string): boolean;
-
-    /**
-     * Updates the document title based on the activated module instance, the routing instruction and the app.title.
-     * @param {object} instance The activated module.
-     * @param {object} instruction The routing instruction associated with the action. It has a `config` property that references the original route mapping config.
-     */
-    updateDocumentTitle(instance: Object, instruction: DurandalRouteInstruction): void;
-
-    /**
-     * Save a fragment into the hash history, or replace the URL state if the
-     * 'replace' option is passed. You are responsible for properly URL-encoding
-     * the fragment in advance.
-     * The options object can contain `trigger: false` if you wish to not have the
-     * route callback be fired, or `replace: true`, if
-     * you wish to modify the current URL without adding an entry to the history.
-     * @param {string} fragment The url fragment to navigate to.
-     * @param {object|boolean} options An options object with optional trigger and replace flags. You can also pass a boolean directly to set the trigger option. Trigger is `true` by default.
-     * @return {boolean} Returns true/false from loading the url.
-     */
-    navigate(fragment: string, trigger?: boolean): boolean;
-
-    /**
-     * Save a fragment into the hash history, or replace the URL state if the
-     * 'replace' option is passed. You are responsible for properly URL-encoding
-     * the fragment in advance.
-     * The options object can contain `trigger: false` if you wish to not have the
-     * route callback be fired, or `replace: true`, if
-     * you wish to modify the current URL without adding an entry to the history.
-     * @param {string} fragment The url fragment to navigate to.
-     * @param {object|boolean} options An options object with optional trigger and replace flags. You can also pass a boolean directly to set the trigger option. Trigger is `true` by default.
-     * @return {boolean} Returns true/false from loading the url.
-     */
-    navigate(fragment: string, options: DurandalNavigationOptions): boolean;
-
-    /**
-     * Navigates back in the browser history.
-     */
-    navigateBack(): void;
-
-    /**
-     * Converts a route to a hash suitable for binding to a link's href.
-     * @param {string} route
-     * @returns {string} The hash.
-     */
-    convertRouteToHash(route: string): string;
-
-    /**
-     * Converts a route to a module id. This is only called if no module id is supplied as part of the route mapping.
-     * @param {string} route
-     * @returns {string} The module id.
-     */
-    convertRouteToModuleId(route: string): string;
-
-    /**
-     * Converts a route to a displayable title. This is only called if no title is specified as part of the route mapping.
-     * @method convertRouteToTitle
-     * @param {string} route
-     * @returns {string} The title.
-     */
-    convertRouteToTitle(route: string): string;
-
-    /**
-     * Maps route patterns to modules.
-     * @param {string} route A route.
-     * @chainable
-     */
-    map(route: string): T;
-
-    /**
-     * Maps route patterns to modules.
-     * @param {string} route A route pattern.
-     * @param {string} moduleId The module id to map the route to.
-     * @chainable
-     */
-    map(route: string, moduleId: string): T;
-
-    /**
-     * Maps route patterns to modules.
-     * @param {RegExp} route A route pattern.
-     * @param {string} moduleId The module id to map the route to.
-     * @chainable
-     */
-    map(route: RegExp, moduleId: string): T;
-
-    /**
-     * Maps route patterns to modules.
-     * @param {string} route A route pattern.
-     * @param {RouteConfiguration} config The route's configuration.
-     * @chainable
-     */
-    map(route: string, config: DurandalRouteConfiguration): T;
-
-    /**
-     * Maps route patterns to modules.
-     * @method map
-     * @param {RegExp} route A route pattern.
-     * @param {RouteConfiguration} config The route's configuration.
-     * @chainable
-     */
-    map(route: RegExp, config: DurandalRouteConfiguration): T;
-
-    /**
-     * Maps route patterns to modules.
-     * @param {RouteConfiguration} config The route's configuration.
-     * @chainable
-     */
-    map(config: DurandalRouteConfiguration): T;
-
-    /**
-     * Maps route patterns to modules.
-     * @param {RouteConfiguration[]} configs An array of route configurations.
-     * @chainable
-     */
-    map(configs: DurandalRouteConfiguration[]): T;
-
-    /**
-     * Builds an observable array designed to bind a navigation UI to. The model will exist in the `navigationModel` property.
-     * @param {number} defaultOrder The default order to use for navigation visible routes that don't specify an order. The defualt is 100.
-     * @chainable
-     */
-    buildNavigationModel(defaultOrder?: number): T;
-
-    /**
-     * Configures the router to map unknown routes to modules at the same path.
-     * @chainable
-     */
-    mapUnknownRoutes(): T;
-
-    /**
-     * Configures the router use the specified module id for all unknown routes.
-     * @param {string} notFoundModuleId Represents the module id to route all unknown routes to.
-     * @param {string} [replaceRoute] Optionally provide a route to replace the url with.
-     * @chainable
-     */
-    mapUnknownRoutes(notFoundModuleId: string, replaceRoute?: string): T;
-
-    /**
-     * Configures how the router will handle unknown routes.
-     * @param {function} callback Called back with the route instruction containing the route info. The function can then modify the instruction by adding a moduleId and the router will take over from there.
-     * @chainable
-     */
-    mapUnknownRoutes(callback: (instruction: DurandalRouteInstruction) => void): T;
-
-    /**
-     * Configures how the router will handle unknown routes.
-     * @param {RouteConfiguration} config The route configuration to use for unknown routes.
-     * @chainable
-     */
-    mapUnknownRoutes(config: DurandalRouteConfiguration): T;
-
-    /**
-     * Resets the router by removing handlers, routes, event handlers and previously configured options.
-     * @chainable
-     */
-    reset(): T;
-
-    /**
-     * Makes all configured routes and/or module ids relative to a certain base url.
-     * @param {string} settings The value is used as the base for routes and module ids.
-     * @chainable
-     */
-    makeRelative(settings: string): T;
-
-    /**
-     * Makes all configured routes and/or module ids relative to a certain base url.
-     * @param {RelativeRouteSettings} settings If an object, you can specify `route` and `moduleId` separately. In place of specifying route, you can set `fromParent:true` to make routes automatically relative to the parent router's active route.
-     * @chainable
-     */
-    makeRelative(settings: DurandalRelativeRouteSettings): T;
-
-    /**
-     * Creates a child router.
-     * @returns {Router} The child router.
-     */
-    createChildRouter(): T;
-
-    /**
-     * Inspects routes and modules before activation. Can be used to protect access by cancelling navigation or redirecting.
-     * @param {object} instance The module instance that is about to be activated by the router.
-     * @param {object} instruction The route instruction. The instruction object has config, fragment, queryString, params and queryParams properties.
-     * @returns {Promise|Boolean|String} If a boolean, determines whether or not the route should activate or be cancelled. If a string, causes a redirect to the specified route. Can also be a promise for either of these value types.
-     */
-    guardRoute?: (instance: Object, instruction: DurandalRouteInstruction) => DurandalPromise<boolean | string> | boolean | string;
-
-    /**
-     * Parent router of the current child router.
-     */
-    parent?: DurandalRouter;
-}
-
-interface DurandalRouter extends DurandalRouterBase<DurandalRouter> { }
-
-interface DurandalRootRouter extends DurandalRouterBase<DurandalRootRouter> {
-    /**
-     * Makes the RegExp generated for routes case sensitive, rather than the default of case insensitive.
-     */
-    makeRoutesCaseSensitive(): void;
-
-    /**
-     * Activates the router and the underlying history tracking mechanism.
-     * @returns {Promise} A promise that resolves when the router is ready.
-     */
-    activate(options?: DurandalHistoryOptions): DurandalPromise<any>;
-
-    /**
-     * Disable history, perhaps temporarily. Not useful in a real app, but possibly useful for unit testing Routers.
-     */
-    deactivate(): void;
-
-    /**
-     * Installs the router's custom ko binding handler.
-     */
-    install(): void;
-}
diff --git a/durandal/index.d.ts b/durandal/index.d.ts
new file mode 100644
index 0000000000..72a4e7ecd0
--- /dev/null
+++ b/durandal/index.d.ts
@@ -0,0 +1,1812 @@
+// Type definitions for Durandal 2.1.0
+// Project: http://durandaljs.com
+// Definitions by: Blue Spire <https://github.com/BlueSpire>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Durandal 2.1.0 Copyright (c) 2012 Blue Spire Consulting, Inc. All Rights Reserved.
+ * Available via the MIT license.
+ * see: http://durandaljs.com or https://github.com/BlueSpire/Durandal for details.
+ */
+
+/// <reference types="jquery" />
+/// <reference types="knockout" />
+
+// By default, Durandal uses JQuery's Defer/Promise implementation, but durandal supports injecting/configuring
+// usage of different JavaScript Defer/Promise libraries (f.ex. Q or ES6 Promise polyfills).
+// You might therefore want to use a different interface from a community typings file or your custom unified interface.
+// When using f.ex. Q as Defer/Promise library replace the lines below with:
+
+// <reference types="Q" />
+// interface DurandalPromise<T> extends Q.Promise<T>
+// interface DurandalDeferred<T> extends Q.Deferred<T>
+
+interface DurandalPromise<T> extends JQueryPromise<T> { }
+interface DurandalDeferred<T> extends JQueryDeferred<T> { }
+
+/**
+ * The system module encapsulates the most basic features used by other modules.
+ * @requires require
+ * @requires jquery
+ */
+declare module 'durandal/system' {
+    var theModule: DurandalSystemModule;
+    export = theModule;
+}
+
+interface DurandalSystemModule {
+    /**
+     * Durandal's version.
+     */
+    version: string;
+
+    /**
+     * A noop function.
+     */
+    noop: Function;
+
+    /**
+     * Gets the module id for the specified object.
+     * @param {object} obj The object whose module id you wish to determine.
+     * @returns {string} The module id.
+     */
+    getModuleId(obj: any): string;
+
+    /**
+     * Sets the module id for the specified object.
+     * @param {object} obj The object whose module id you wish to set.
+     * @param {string} id The id to set for the specified object.
+     */
+    setModuleId(obj: any, id: string): void;
+
+    /**
+     * Resolves the default object instance for a module. If the module is an object, the module is returned. If the module is a function, that function is called with `new` and it's result is returned.
+     * @param {object} module The module to use to get/create the default object for.
+     * @returns {object} The default object for the module.
+     */
+    resolveObject(module: any): any;
+
+    /**
+     * Gets/Sets whether or not Durandal is in debug mode.
+     * @param {boolean} [enable] Turns on/off debugging.
+     * @returns {boolean} Whether or not Durandal is current debugging.
+     */
+    debug(enable?: boolean): boolean;
+
+    /**
+     * Logs data to the console. Pass any number of parameters to be logged. Log output is not processed if the framework is not running in debug mode.
+     * @param {object} info* The objects to log.
+     */
+    log(...msgs: any[]): void;
+
+    /**
+     * Logs an error.
+     * @param {string} obj The error to report.
+     */
+    error(error: string): void;
+
+    /**
+     * Logs an error.
+     * @param {Error} obj The error to report.
+     */
+    error(error: Error): void;
+
+    /**
+     * Asserts a condition by throwing an error if the condition fails.
+     * @param {boolean} condition The condition to check.
+     * @param {string} message The message to report in the error if the condition check fails.
+     */
+    assert(condition: boolean, message: string): void;
+
+    /**
+     * Creates a deferred object which can be used to create a promise. Optionally pass a function action to perform which will be passed an object used in resolving the promise.
+     * @param {function} [action] The action to defer. You will be passed the deferred object as a paramter.
+     * @returns {Deferred} The deferred object.
+     */
+    defer<T>(action?: (dfd: DurandalDeferred<T>) => void): DurandalDeferred<T>;
+
+    /**
+     * Creates a simple V4 UUID. This should not be used as a PK in your database. It can be used to generate internal, unique ids. For a more robust solution see [node-uuid](https://github.com/broofa/node-uuid).
+     * @returns {string} The guid.
+     */
+    guid(): string;
+
+    /**
+     * Uses require.js to obtain a module. This function returns a promise which resolves with the module instance.
+     * @param {string} moduleId The id of the module to load.
+     * @returns {Promise} A promise for the loaded module.
+     */
+    acquire(moduleId: string): DurandalPromise<any>;
+
+    /**
+     * Uses require.js to obtain an array of modules. This function returns a promise which resolves with the modules instances in an array.
+     * @param {string[]} moduleIds The ids of the modules to load.
+     * @returns {Promise} A promise for the loaded module.
+     */
+    acquire(modules: string[]): DurandalPromise<any[]>;
+
+    /**
+     * Uses require.js to obtain multiple modules. This function returns a promise which resolves with the module instances in an array.
+     * @param {string} moduleIds* The ids of the modules to load.
+     * @returns {Promise} A promise for the loaded module.
+     */
+    acquire(...moduleIds: string[]): DurandalPromise<any[]>;
+
+    /**
+     * Extends the first object with the properties of the following objects.
+     * @param {object} obj The target object to extend.
+     * @param {object} extension* Uses to extend the target object.
+    */
+    extend(obj: any, ...extensions: any[]): any;
+
+    /**
+     * Uses a setTimeout to wait the specified milliseconds.
+     * @param {number} milliseconds The number of milliseconds to wait.
+     * @returns {Promise}
+    */
+    wait(milliseconds: number): DurandalPromise<any>;
+
+    /**
+     * Gets all the owned keys of the specified object.
+     * @param {object} object The object whose owned keys should be returned.
+     * @returns {string[]} The keys.
+     */
+    keys(obj: any): string[];
+
+    /**
+     * Determines if the specified object is an html element.
+     * @param {object} object The object to check.
+     * @returns {boolean} True if matches the type, false otherwise.
+     */
+    isElement(obj: any): boolean;
+
+    /**
+     * Determines if the specified object is an array.
+     * @param {object} object The object to check.
+     * @returns {boolean} True if matches the type, false otherwise.
+     */
+    isArray(obj: any): boolean;
+
+    /**
+     * Determines if the specified object is a boolean.
+     * @param {object} object The object to check.
+     * @returns {boolean} True if matches the type, false otherwise.
+     */
+    isObject(obj: any): boolean;
+
+    /**
+     * Determines if the specified object is a promise.
+     * @param {object} object The object to check.
+     * @returns {boolean} True if matches the type, false otherwise.
+     */
+    isPromise(obj: any): boolean;
+
+    /**
+     * Determines if the specified object is a function arguments object.
+     * @param {object} object The object to check.
+     * @returns {boolean} True if matches the type, false otherwise.
+     */
+    isArguments(obj: any): boolean;
+
+    /**
+     * Determines if the specified object is a function.
+     * @param {object} object The object to check.
+     * @returns {boolean} True if matches the type, false otherwise.
+     */
+    isFunction(obj: any): boolean;
+
+    /**
+     * Determines if the specified object is a string.
+     * @param {object} object The object to check.
+     * @returns {boolean} True if matches the type, false otherwise.
+     */
+    isString(obj: any): boolean;
+
+    /**
+     * Determines if the specified object is a number.
+     * @param {object} object The object to check.
+     * @returns {boolean} True if matches the type, false otherwise.
+     */
+    isNumber(obj: any): boolean;
+
+    /**
+     * Determines if the specified object is a date.
+     * @param {object} object The object to check.
+     * @returns {boolean} True if matches the type, false otherwise.
+     */
+    isDate(obj: any): boolean;
+
+    /**
+     * Determines if the specified object is a boolean.
+     * @param {object} object The object to check.
+     * @returns {boolean} True if matches the type, false otherwise.
+     */
+    isBoolean(obj: any): boolean;
+}
+
+/**
+ * The viewEngine module provides information to the viewLocator module which is used to locate the view's source file. The viewEngine also transforms a view id into a view instance.
+ * @requires system
+ * @requires jquery
+ */
+declare module 'durandal/viewEngine' {
+    var theModule: DurandalViewEngineModule;
+    export = theModule;
+}
+
+interface DurandalViewEngineModule {
+    /**
+     * The file extension that view source files are expected to have.
+     * @default .html
+    */
+    viewExtension: string;
+
+    /**
+     * The name of the RequireJS loader plugin used by the viewLocator to obtain the view source. (Use requirejs to map the plugin's full path).
+     * @default text
+    */
+    viewPlugin: string;
+
+    /**
+    * Parameters passed to the RequireJS loader plugin used by the viewLocator to obtain the view source.
+    * @default The empty string by default.
+    */
+    viewPluginParameters: string;
+
+    /**
+     * Determines if the url is a url for a view, according to the view engine.
+     * @param {string} url The potential view url.
+     * @returns {boolean} True if the url is a view url, false otherwise.
+    */
+    isViewUrl(url: string): boolean;
+
+    /**
+     * Converts a view url into a view id.
+     * @param {string} url The url to convert.
+     * @returns {string} The view id.
+    */
+    convertViewUrlToViewId(url: string): string;
+
+    /**
+     * Converts a view id into a full RequireJS path.
+     * @param {string} viewId The view id to convert.
+     * @returns {string} The require path.
+    */
+    convertViewIdToRequirePath(viewId: string): string;
+
+    /**
+     * Parses the view engine recognized markup and returns DOM elements.
+     * @param {string} markup The markup to parse.
+     * @returns {HTMLElement[]} The elements.
+    */
+    parseMarkup(markup: string): Node[];
+
+    /**
+     * Calls `parseMarkup` and then pipes the results through `ensureSingleElement`.
+     * @param {string} markup The markup to process.
+     * @returns {HTMLElement} The view.
+    */
+    processMarkup(markup: string): HTMLElement;
+
+    /**
+     * Converts an array of elements into a single element. White space and comments are removed. If a single element does not remain, then the elements are wrapped.
+     * @param {HTMLElement[]} allElements The elements.
+     * @returns {HTMLElement} A single element.
+    */
+    ensureSingleElement(allElements: Node[]): HTMLElement;
+
+    /**
+    * Gets the view associated with the id from the cache of parsed views.
+    * @param {string} id The view id to lookup in the cache.
+    * @return {DOMElement|null} The cached view or null if it's not in the cache.
+    */
+    tryGetViewFromCache(id: string): HTMLElement;
+
+    /**
+     * Puts the view associated with the id into the cache of parsed views.
+     * @param {string} id The view id whose view should be cached.
+     * @param {DOMElement} view The view to cache.
+     */
+    putViewInCache(id: string, view: HTMLElement): void;
+
+    /**
+     * Creates the view associated with the view id.
+     * @param {string} viewId The view id whose view should be created.
+     * @returns {DurandalPromise<HTMLElement>} A promise of the view.
+    */
+    createView(viewId: string): DurandalPromise<HTMLElement>;
+
+    /**
+     * Called when a view cannot be found to provide the opportunity to locate or generate a fallback view. Mainly used to ease development.
+     * @param {string} viewId The view id whose view should be created.
+     * @param {string} requirePath The require path that was attempted.
+     * @param {Error} requirePath The error that was returned from the attempt to locate the default view.
+     * @returns {Promise} A promise for the fallback view.
+    */
+    createFallbackView(viewId: string, requirePath: string, err: Error): DurandalPromise<HTMLElement>;
+}
+
+/**
+ * Durandal events originate from backbone.js but also combine some ideas from signals.js as well as some additional improvements.
+ * Events can be installed into any object and are installed into the `app` module by default for convenient app-wide eventing.
+ * @requires system
+ */
+declare module 'durandal/events' {
+    var theModule: DurandalEventModule;
+    export = theModule;
+}
+
+/**
+ * The binder joins an object instance and a DOM element tree by applying databinding and/or invoking binding lifecycle callbacks (binding and bindingComplete).
+ * @requires system
+ * @requires knockout
+ */
+declare module 'durandal/binder' {
+    interface BindingInstruction {
+        applyBindings: boolean;
+    }
+
+    /**
+     * Called before every binding operation. Does nothing by default.
+     * @param {object} data The data that is about to be bound.
+     * @param {DOMElement} view The view that is about to be bound.
+     * @param {object} instruction The object that carries the binding instructions.
+    */
+    export var binding: (data: any, view: HTMLElement, instruction: BindingInstruction) => void;
+
+    /**
+     * Called after every binding operation. Does nothing by default.
+     * @param {object} data The data that has just been bound.
+     * @param {DOMElement} view The view that has just been bound.
+     * @param {object} instruction The object that carries the binding instructions.
+    */
+    export var bindingComplete: (data: any, view: HTMLElement, instruction: BindingInstruction) => void;
+
+    /**
+     * Indicates whether or not the binding system should throw errors or not.
+     * @default false The binding system will not throw errors by default. Instead it will log them.
+    */
+    export var throwOnErrors: boolean;
+
+    /**
+     * Gets the binding instruction that was associated with a view when it was bound.
+     * @param {DOMElement} view The view that was previously bound.
+     * @returns {object} The object that carries the binding instructions.
+    */
+    export function getBindingInstruction(view: HTMLElement): BindingInstruction;
+
+    /**
+     * Binds the view, preserving the existing binding context. Optionally, a new context can be created, parented to the previous context.
+     * @param {KnockoutBindingContext} bindingContext The current binding context.
+     * @param {DOMElement} view The view to bind.
+     * @param {object} [obj] The data to bind to, causing the creation of a child binding context if present.
+     * @param {string} [dataAlias] An alias for $data if present.
+    */
+    export function bindContext(bindingContext: KnockoutBindingContext, view: HTMLElement, obj?: any, dataAlias?: string): BindingInstruction;
+
+    /**
+     * Binds the view, preserving the existing binding context. Optionally, a new context can be created, parented to the previous context.
+     * @param {object} obj The data to bind to.
+     * @param {DOMElement} view The view to bind.
+    */
+    export function bind(obj: any, view: HTMLElement): BindingInstruction;
+}
+
+/**
+ * The activator module encapsulates all logic related to screen/component activation.
+ * An activator is essentially an asynchronous state machine that understands a particular state transition protocol.
+ * The protocol ensures that the following series of events always occur: `canDeactivate` (previous state), `canActivate` (new state), `deactivate` (previous state), `activate` (new state).
+ * Each of the _can_ callbacks may return a boolean, affirmative value or promise for one of those. If either of the _can_ functions yields a false result, then activation halts.
+ * @requires system
+ * @requires knockout
+ */
+declare module 'durandal/activator' {
+    /**
+     * The default settings used by activators.
+     * @property {ActivatorSettings} defaults
+    */
+    export var defaults: DurandalActivatorSettings;
+
+    /**
+    * Creates a new activator.
+     * @method create
+     * @param {object} [initialActiveItem] The item which should be immediately activated upon creation of the ativator.
+     * @param {ActivatorSettings} [settings] Per activator overrides of the default activator settings.
+     * @returns {Activator} The created activator.
+    */
+    export function create<T>(initialActiveItem?: T, settings?: DurandalActivatorSettings): DurandalActivator<T>;
+
+    /**
+     * Determines whether or not the provided object is an activator or not.
+     * @method isActivator
+     * @param {object} object Any object you wish to verify as an activator or not.
+     * @returns {boolean} True if the object is an activator; false otherwise.
+    */
+    export function isActivator(object: any): boolean;
+}
+
+/**
+ * The viewLocator module collaborates with the viewEngine module to provide views (literally dom sub-trees) to other parts of the framework as needed. The primary consumer of the viewLocator is the composition module.
+ * @requires system
+ * @requires viewEngine
+ */
+declare module 'durandal/viewLocator' {
+    var theModule: DurandalViewLocatorModule;
+    export = theModule;
+}
+
+interface DurandalViewLocatorModule {
+    /**
+     * Allows you to set up a convention for mapping module folders to view folders. It is a convenience method that customizes `convertModuleIdToViewId` and `translateViewIdToArea` under the covers.
+     * @param {string} [modulesPath] A string to match in the path and replace with the viewsPath. If not specified, the match is 'viewmodels'.
+     * @param {string} [viewsPath] The replacement for the modulesPath. If not specified, the replacement is 'views'.
+     * @param {string} [areasPath] Partial views are mapped to the "views" folder if not specified. Use this parameter to change their location.
+    */
+    useConvention(modulesPath?: string, viewsPath?: string, areasPath?: string): void;
+
+    /**
+     * Maps an object instance to a view instance.
+     * @param {object} obj The object to locate the view for.
+     * @param {string} [area] The area to translate the view to.
+     * @param {DOMElement[]} [elementsToSearch] An existing set of elements to search first.
+     * @returns {Promise} A promise of the view.
+    */
+    locateViewForObject(obj: any, area: string, elementsToSearch?: HTMLElement[]): DurandalPromise<HTMLElement>;
+
+    /**
+     * Converts a module id into a view id. By default the ids are the same.
+     * @param {string} moduleId The module id.
+     * @returns {string} The view id.
+    */
+    convertModuleIdToViewId(moduleId: string): string;
+
+    /**
+     * If no view id can be determined, this function is called to genreate one. By default it attempts to determine the object's type and use that.
+     * @param {object} obj The object to determine the fallback id for.
+     * @returns {string} The view id.
+    */
+    determineFallbackViewId(obj: any): string;
+
+    /**
+     * Takes a view id and translates it into a particular area. By default, no translation occurs.
+     * @param {string} viewId The view id.
+     * @param {string} area The area to translate the view to.
+     * @returns {string} The translated view id.
+    */
+    translateViewIdToArea(viewId: string, area: string): string;
+
+    /**
+     * Locates the specified view.
+     * @param {string|DOMElement} view A view. It will be immediately returned.
+     * @param {string} [area] The area to translate the view to.
+     * @param {DOMElement[]} [elementsToSearch] An existing set of elements to search first.
+     * @returns {Promise} A promise of the view.
+    */
+    locateView(view: HTMLElement, area?: string, elementsToSearch?: HTMLElement[]): DurandalPromise<HTMLElement>;
+
+    /**
+     * Locates the specified view.
+     * @param {string|DOMElement} viewUrlOrId A view url or view id to locate.
+     * @param {string} [area] The area to translate the view to.
+     * @param {DOMElement[]} [elementsToSearch] An existing set of elements to search first.
+     * @returns {Promise} A promise of the view.
+    */
+    locateView(viewUrlOrId: string, area?: string, elementsToSearch?: HTMLElement[]): DurandalPromise<HTMLElement>;
+}
+
+/**
+ * The composition module encapsulates all functionality related to visual composition.
+ * @requires system
+ * @requires viewLocator
+ * @requires binder
+ * @requires viewEngine
+ * @requires activator
+ * @requires jquery
+ * @requires knockout
+ */
+declare module 'durandal/composition' {
+    interface CompositionTransation {
+        /**
+         * Registers a callback which will be invoked when the current composition transaction has completed. The transaction includes all parent and children compositions.
+         * @param {function} callback The callback to be invoked when composition is complete.
+        */
+        complete(callback: Function): void;
+    }
+
+    interface CompositionContext {
+        mode: string;
+        parent: HTMLElement;
+        activeView: HTMLElement;
+        triggerAttach(): void;
+        bindingContext?: KnockoutBindingContext;
+        cacheViews?: boolean;
+        viewElements?: HTMLElement[];
+        model?: any;
+        view?: any;
+        area?: string;
+        preserveContext?: boolean;
+        activate?: boolean;
+        strategy?: (context: CompositionContext) => DurandalPromise<HTMLElement>;
+        composingNewView: boolean;
+        child: HTMLElement;
+        binding?: (child: HTMLElement, parent: HTMLElement, context: CompositionContext) => void;
+        attached?: (child: HTMLElement, parent: HTMLElement, context: CompositionContext) => void;
+        compositionComplete?: (child: HTMLElement, parent: HTMLElement, context: CompositionContext) => void;
+        transition?: string;
+    }
+
+    /**
+     * Converts a transition name to its moduleId.
+     * @param {string} name The name of the transtion.
+     * @returns {string} The moduleId.
+    */
+    export function convertTransitionToModuleId(name: string): string;
+
+    /**
+     * The name of the transition to use in all compositions.
+     * @default null
+    */
+    export var defaultTransitionName: string;
+
+    /**
+     * Represents the currently executing composition transaction.
+     */
+    export var current: CompositionTransation;
+
+    /**
+     * Registers a binding handler that will be invoked when the current composition transaction is complete.
+     * @param {string} name The name of the binding handler.
+     * @param {object} [config] The binding handler instance. If none is provided, the name will be used to look up an existing handler which will then be converted to a composition handler.
+     * @param {function} [initOptionsFactory] If the registered binding needs to return options from its init call back to knockout, this function will server as a factory for those options. It will receive the same parameters that the init function does.
+    */
+    export function addBindingHandler(name: string, config?: KnockoutBindingHandler, initOptionsFactory?: (element?: HTMLElement, valueAccessor?: any, allBindingsAccessor?: any, viewModel?: any, bindingContext?: KnockoutBindingContext) => any): void;
+
+    /**
+     * Gets an object keyed with all the elements that are replacable parts, found within the supplied elements. The key will be the part name and the value will be the element itself.
+     * @param {DOMElement[]} elements The elements to search for parts.
+     * @returns {object} An object keyed by part.
+    */
+    export function getParts(elements: HTMLElement[]): any;
+
+    /**
+     * Gets an object keyed with all the elements that are replacable parts, found within the supplied element. The key will be the part name and the value will be the element itself.
+     * @param {DOMElement} element The element to search for parts.
+     * @returns {object} An object keyed by part.
+    */
+    export function getParts(element: HTMLElement): any;
+
+    /**
+     * Eecutes the default view location strategy.
+     * @param {object} context The composition context containing the model and possibly existing viewElements.
+     * @returns {promise} A promise for the view.
+    */
+    export var defaultStrategy: (context: CompositionContext) => DurandalPromise<HTMLElement>;
+
+    /**
+     * Initiates a composition.
+     * @param {DOMElement} element The DOMElement or knockout virtual element that serves as the parent for the composition.
+     * @param {object} settings The composition settings.
+     * @param {object} [bindingContext] The current binding context.
+    */
+    export function compose(element: HTMLElement, settings: CompositionContext, bindingContext: KnockoutBindingContext): void;
+}
+
+/**
+ * The app module controls app startup, plugin loading/configuration and root visual display.
+ * @requires system
+ * @requires viewEngine
+ * @requires composition
+ * @requires events
+ * @requires jquery
+ */
+declare module 'durandal/app' {
+    var theModule: DurandalAppModule;
+    export = theModule;
+}
+
+/**
+ * The dialog module enables the display of message boxes, custom modal dialogs and other overlays or slide-out UI abstractions. Dialogs are constructed by the composition system which interacts with a user defined dialog context. The dialog module enforced the activator lifecycle.
+ * @requires system
+ * @requires app
+ * @requires composition
+ * @requires activator
+ * @requires viewEngine
+ * @requires jquery
+ * @requires knockout
+ */
+declare module 'plugins/dialog' {
+    import composition = require('durandal/composition');
+
+    /**
+    * Models a message box's message, title and options.
+    * @class
+    */
+    class Box {
+        constructor(message: string, title?: string, options?: string[], autoclose?: boolean, settings?: Object);
+
+        /**
+         * Selects an option and closes the message box, returning the selected option through the dialog system's promise.
+         * @param {string} dialogResult The result to select.
+         */
+        selectOption(dialogResult: string): void;
+
+        /**
+         * Provides the view to the composition system.
+         * @returns {DOMElement} The view of the message box.
+         */
+        getView(): HTMLElement;
+
+        /**
+         * Configures a custom view to use when displaying message boxes.
+         * @method setViewUrl
+         * @param {string} viewUrl The view url relative to the base url which the view locator will use to find the message box's view.
+         */
+        static setViewUrl(viewUrl: string): void;
+
+        /**
+         * The title to be used for the message box if one is not provided.
+         * @default Application
+         * @static
+         */
+        static defaultTitle: string;
+
+        /**
+         * The options to display in the message box if none are specified.
+         * @default ['Ok']
+         * @static
+         */
+        static defaultOptions: string[];
+
+        /**
+        * Sets the classes and styles used throughout the message box markup.
+        * @method setDefaults
+        * @param {object} settings A settings object containing the following optional properties: buttonClass, primaryButtonClass, secondaryButtonClass, class, style.
+        */
+        static setDefaults(settings: Object): void;
+
+        /**
+         * The markup for the message box's view.
+         */
+        static defaultViewMarkup: string;
+    }
+
+    interface DialogContext {
+        /**
+         * In this function, you are expected to add a DOM element to the tree which will serve as the "host" for the modal's composed view. You must add a property called host to the modalWindow object which references the dom element. It is this host which is passed to the composition module.
+         * @param {Dialog} theDialog The dialog model.
+        */
+        addHost(theDialog: Dialog): void;
+
+        /**
+         * This function is expected to remove any DOM machinery associated with the specified dialog and do any other necessary cleanup.
+         * @param {Dialog} theDialog The dialog model.
+        */
+        removeHost(theDialog: Dialog): void;
+
+        /**
+         * This function is called after the modal is fully composed into the DOM, allowing your implementation to do any final modifications, such as positioning or animation. You can obtain the original dialog object by using `getDialog` on context.model.
+         * @param {DOMElement} child The dialog view.
+         * @param {DOMElement} parent The parent view.
+         * @param {object} context The composition context.
+        */
+        compositionComplete(child: HTMLElement, parent: HTMLElement, context: composition.CompositionContext): void;
+    }
+
+    interface Dialog {
+        owner: any;
+        context: DialogContext;
+        activator: DurandalActivator<any>;
+        close(): DurandalPromise<any>;
+        settings: composition.CompositionContext;
+    }
+
+    /**
+     * The constructor function used to create message boxes.
+    */
+    export var MessageBox: Box;
+
+    /**
+     * The css zIndex that the last dialog was displayed at.
+    */
+    export var currentZIndex: number;
+
+    /**
+     * Gets the next css zIndex at which a dialog should be displayed.
+     * @returns {number} The next usable zIndex.
+    */
+    export function getNextZIndex(): number;
+
+    /**
+     * Determines whether or not there are any dialogs open.
+     * @returns {boolean} True if a dialog is open. false otherwise.
+    */
+    export function isOpen(): boolean;
+
+    /**
+     * Gets the dialog context by name or returns the default context if no name is specified.
+     * @param {string} [name] The name of the context to retrieve.
+     * @returns {DialogContext} True context.
+    */
+    export function getContext(name: string): DialogContext;
+
+    /**
+     * Adds (or replaces) a dialog context.
+     * @param {string} name The name of the context to add.
+     * @param {DialogContext} dialogContext The context to add.
+    */
+    export function addContext(name: string, modalContext: DialogContext): void;
+
+    /**
+     * Gets the dialog model that is associated with the specified object.
+     * @param {object} obj The object for whom to retrieve the dialog.
+     * @returns {Dialog} The dialog model.
+    */
+    export function getDialog(obj: any): Dialog;
+
+    /**
+     * Closes the dialog associated with the specified object.
+     * @param {object} obj The object whose dialog should be closed.
+     * @param {object} results* The results to return back to the dialog caller after closing.
+    */
+    export function close(obj: any, ...results: any[]): void;
+
+    /**
+     * Shows a dialog.
+     * @param {object|string} obj The object (or moduleId) to display as a dialog.
+     * @param {object} [activationData] The data that should be passed to the object upon activation.
+     * @param {string} [context] The name of the dialog context to use. Uses the default context if none is specified.
+     * @returns {Promise} A promise that resolves when the dialog is closed and returns any data passed at the time of closing.
+    */
+    export function show(obj: any, activationData?: any, context?: string): DurandalPromise<any>;
+
+    /**
+     * Shows a message box.
+     * @param {string} message The message to display in the dialog.
+     * @param {string} [title] The title message.
+     * @param {string[]} [options] The options to provide to the user.
+     * @param {boolean} [autoclose] Automatically close the the message box when clicking outside?
+     * @param {Object} [settings] Custom settings for this instance of the messsage box, used to change classes and styles.
+     * @returns {Promise} A promise that resolves when the message box is closed and returns the selected option.
+    */
+    export function showMessage(message: string, title?: string, options?: string[], autoclose?: boolean, settings?: Object): DurandalPromise<string>;
+
+    /**
+     * Shows a message box.
+     * @param {string} message The message to display in the dialog.
+     * @param {string} [title] The title message.
+     * @param {DialogButton[]} [options] The options to provide to the user.
+     * @param {boolean} [autoclose] Automatically close the the message box when clicking outside?
+     * @param {Object} [settings] Custom settings for this instance of the messsage box, used to change classes and styles.
+     * @returns {Promise} A promise that resolves when the message box is closed and returns the selected option.
+    */
+    export function showMessage(message: string, title?: string, options?: DialogButton[], autoclose?: boolean, settings?: Object): DurandalPromise<any>;
+
+    /**
+     * Installs this module into Durandal; called by the framework. Adds `app.showDialog` and `app.showMessage` convenience methods.
+     * @param {object} [config] Add a `messageBox` property to supply a custom message box constructor. Add a `messageBoxView` property to supply custom view markup for the built-in message box. You can also use messageBoxViewUrl to specify the view url.
+    */
+    export function install(config: Object): void;
+}
+
+/**
+ * This module is based on Backbone's core history support. It abstracts away the low level details of working with browser history and url changes in order to provide a solid foundation for a router.
+ * @requires system
+ * @requires jquery
+ */
+declare module 'plugins/history' {
+    /**
+     * The setTimeout interval used when the browser does not support hash change events.
+     * @default 50
+    */
+    export var interval: number;
+
+    /**
+     * Indicates whether or not the history module is actively tracking history.
+    */
+    export var active: boolean;
+
+    /**
+     * Gets the true hash value. Cannot use location.hash directly due to a bug in Firefox where location.hash will always be decoded.
+     * @param {string} [window] The optional window instance
+     * @returns {string} The hash.
+     */
+    export function getHash(window?: Window): string;
+
+    /**
+     * Get the cross-browser normalized URL fragment, either from the URL, the hash, or the override.
+     * @param {string} fragment The fragment.
+     * @param {boolean} forcePushState Should we force push state?
+     * @returns {string} he fragment.
+     */
+    export function getFragment(fragment: string, forcePushState: boolean): string;
+
+    /**
+     * Activate the hash change handling, returning `true` if the current URL matches an existing route, and `false` otherwise.
+     * @param {HistoryOptions} options.
+     * @returns {boolean|undefined} Returns true/false from loading the url unless the silent option was selected.
+     */
+    export function activate(options: DurandalHistoryOptions): boolean;
+
+    /**
+     * Disable history, perhaps temporarily. Not useful in a real app, but possibly useful for unit testing Routers.
+     */
+    export function deactivate(): void;
+
+    /**
+     * Checks the current URL to see if it has changed, and if it has, calls `loadUrl`, normalizing across the hidden iframe.
+     * @returns {boolean} Returns true/false from loading the url.
+     */
+    export function checkUrl(): boolean;
+
+    /**
+     * Attempts to load the current URL fragment. A pass-through to options.routeHandler.
+     * @returns {boolean} Returns true/false from the route handler.
+     */
+    export function loadUrl(): boolean;
+
+    /**
+     * Save a fragment into the hash history, or replace the URL state if the
+     * 'replace' option is passed. You are responsible for properly URL-encoding
+     * the fragment in advance.
+     * The options object can contain `trigger: false` if you wish to not have the
+     * route callback be fired, or `replace: true`, if
+     * you wish to modify the current URL without adding an entry to the history.
+     * @param {string} fragment The url fragment to navigate to.
+     * @param {object|boolean} options An options object with optional trigger and replace flags. You can also pass a boolean directly to set the trigger option. Trigger is `true` by default.
+     * @return {boolean} Returns true/false from loading the url.
+     */
+    export function navigate(fragment: string, trigger?: boolean): boolean;
+
+    /**
+     * Save a fragment into the hash history, or replace the URL state if the
+     * 'replace' option is passed. You are responsible for properly URL-encoding
+     * the fragment in advance.
+     * The options object can contain `trigger: false` if you wish to not have the
+     * route callback be fired, or `replace: true`, if
+     * you wish to modify the current URL without adding an entry to the history.
+     * @param {string} fragment The url fragment to navigate to.
+     * @param {object|boolean} options An options object with optional trigger and replace flags. You can also pass a boolean directly to set the trigger option. Trigger is `true` by default.
+     * @return {boolean} Returns true/false from loading the url.
+     */
+    export function navigate(fragment: string, options: DurandalNavigationOptions): boolean;
+
+    /**
+     * Navigates back in the browser history.
+     */
+    export function navigateBack(): void;
+}
+
+/**
+ * Enables common http request scenarios.
+ * @requires jquery
+ * @requires knockout
+ */
+declare module 'plugins/http' {
+    /**
+     * The name of the callback parameter to inject into jsonp requests by default.
+     * @default callback
+    */
+    export var callbackParam: string;
+
+    /**
+    * Converts the data to JSON.
+    * @param {object} data The data to convert to JSON.
+    * @return {string} JSON.
+    */
+    export function toJSON(data: Object): string;
+
+    /**
+     * Makes an HTTP GET request.
+     * @param {string} url The url to send the get request to.
+     * @param {object} [query] An optional key/value object to transform into query string parameters.
+     * @param {object} [headers] The data to add to the request header.  It will be converted to JSON. If the data contains Knockout observables, they will be converted into normal properties before serialization.
+     * @returns {Promise} A promise of the get response data.
+    */
+    export function get(url: string, query?: Object, headers?: Object): DurandalPromise<any>;
+
+    /**
+     * Makes an JSONP request.
+     * @param {string} url The url to send the get request to.
+     * @param {object} [query] An optional key/value object to transform into query string parameters.
+     * @param {string} [callbackParam] The name of the callback parameter the api expects (overrides the default callbackParam).
+     * @param {object} [headers] The data to add to the request header.  It will be converted to JSON. If the data contains Knockout observables, they will be converted into normal properties before serialization.
+     * @returns {Promise} A promise of the response data.
+    */
+    export function jsonp(url: string, query?: Object, callbackParam?: string, headers?: Object): DurandalPromise<any>;
+
+    /**
+     * Makes an HTTP POST request.
+     * @param {string} url The url to send the post request to.
+     * @param {object} data The data to post. It will be converted to JSON. If the data contains Knockout observables, they will be converted into normal properties before serialization.
+     * @param {object} [headers] The data to add to the request header.  It will be converted to JSON. If the data contains Knockout observables, they will be converted into normal properties before serialization.
+     * @returns {Promise} A promise of the response data.
+    */
+    export function post(url: string, data: Object, headers?: Object): DurandalPromise<any>;
+
+    /**
+    * Makes an HTTP PUT request.
+    * @method put
+    * @param {string} url The url to send the put request to.
+    * @param {object} data The data to put. It will be converted to JSON. If the data contains Knockout observables, they will be converted into normal properties before serialization.
+    * @param {object} [headers] The data to add to the request header.  It will be converted to JSON. If the data contains Knockout observables, they will be converted into normal properties before serialization.
+    * @return {Promise} A promise of the response data.
+    */
+    export function put(url: string, data: Object, headers?: Object): DurandalPromise<any>;
+
+    /**
+    * Makes an HTTP DELETE request.
+    * @method remove
+    * @param {string} url The url to send the delete request to.
+    * @param {object} [query] An optional key/value object to transform into query string parameters.
+    * @param {object} [headers] The data to add to the request header.  It will be converted to JSON. If the data contains Knockout observables, they will be converted into normal properties before serialization.
+    * @return {Promise} A promise of the get response data.
+    */
+    export function remove(url: string, query?: Object, headers?: Object): DurandalPromise<any>;
+}
+
+/**
+ * Enables automatic observability of plain javascript object for ES5 compatible browsers. Also, converts promise properties into observables that are updated when the promise resolves.
+ * @requires system
+ * @requires binder
+ * @requires knockout
+ */
+declare module 'plugins/observable' {
+    function observable(obj: any, property: string): KnockoutObservable<any>;
+
+    namespace observable {
+        /**
+         * Converts an entire object into an observable object by re-writing its attributes using ES5 getters and setters. Attributes beginning with '_' or '$' are ignored.
+         * @param {object} obj The target object to convert.
+         */
+        export function convertObject(obj: any): void;
+
+        /**
+         * Converts a normal property into an observable property using ES5 getters and setters.
+         * @param {object} obj The target object on which the property to convert lives.
+         * @param {string} propertyName The name of the property to convert.
+         * @param {object} [original] The original value of the property. If not specified, it will be retrieved from the object.
+         * @returns {KnockoutObservable} The underlying observable.
+         */
+        export function convertProperty(obj: any, propertyName: string, original?: any): KnockoutObservable<any>;
+
+        /**
+         * Defines a computed property using ES5 getters and setters.
+         * @param {object} obj The target object on which to create the property.
+         * @param {string} propertyName The name of the property to define.
+         * @param {function|object} evaluatorOrOptions The Knockout computed function or computed options object.
+         * @returns {KnockoutComputed} The underlying computed observable.
+         */
+        export function defineProperty<T>(obj: any, propertyName: string, evaluatorOrOptions?: KnockoutComputedDefine<T>): KnockoutComputed<T>;
+
+        /**
+         * Installs the plugin into the view model binder's `beforeBind` hook so that objects are automatically converted before being bound.
+         */
+        export function install(config: Object): void;
+    }
+
+    export = observable;
+}
+
+/**
+ * Serializes and deserializes data to/from JSON.
+ * @requires system
+ */
+declare module 'plugins/serializer' {
+    interface SerializerOptions {
+        /**
+         * The default replacer function used during serialization. By default properties starting with '_' or '$' are removed from the serialized object.
+         * @param {string} key The object key to check.
+         * @param {object} value The object value to check.
+         * @returns {object} The value to serialize.
+        */
+        replacer?: (key: string, value: any) => any;
+
+        /**
+         * The amount of space to use for indentation when writing out JSON.
+         * @default undefined
+        */
+        space: any;
+    }
+
+    interface DeserializerOptions {
+        /**
+         * Gets the type id for an object instance, using the configured `typeAttribute`.
+         * @param {object} object The object to serialize.
+         * @returns {string} The type.
+        */
+        getTypeId: (object: any) => string;
+
+        /**
+         * Gets the constructor based on the type id.
+         * @param {string} typeId The type id.
+         * @returns {Function} The constructor.
+        */
+        getConstructor: (typeId: string) => () => any;
+
+        /**
+         * The default reviver function used during deserialization. By default is detects type properties on objects and uses them to re-construct the correct object using the provided constructor mapping.
+         * @param {string} key The attribute key.
+         * @param {object} value The object value associated with the key.
+         * @returns {object} The value.
+        */
+        reviver: (key: string, value: any) => any;
+    }
+
+    /**
+     * The name of the attribute that the serializer should use to identify an object's type.
+     * @default type
+    */
+    export var typeAttribute: string;
+
+    /**
+     * The amount of space to use for indentation when writing out JSON.
+     * @default undefined
+    */
+    export var space: any;
+
+    /**
+     * The default replacer function used during serialization. By default properties starting with '_' or '$' are removed from the serialized object.
+     * @param {string} key The object key to check.
+     * @param {object} value The object value to check.
+     * @returns {object} The value to serialize.
+    */
+    export function replacer(key: string, value: any): any;
+
+    /**
+     * Serializes the object.
+     * @param {object} object The object to serialize.
+     * @param {object} [settings] Settings can specify a replacer or space to override the serializer defaults.
+     * @returns {string} The JSON string.
+    */
+    export function serialize(object: any, settings?: string): string;
+
+    /**
+     * Serializes the object.
+     * @param {object} object The object to serialize.
+     * @param {object} [settings] Settings can specify a replacer or space to override the serializer defaults.
+     * @returns {string} The JSON string.
+    */
+    export function serialize(object: any, settings?: number): string;
+
+    /**
+     * Serializes the object.
+     * @param {object} object The object to serialize.
+     * @param {object} [settings] Settings can specify a replacer or space to override the serializer defaults.
+     * @returns {string} The JSON string.
+    */
+    export function serialize(object: any, settings?: SerializerOptions): string;
+
+    /**
+     * Gets the type id for an object instance, using the configured `typeAttribute`.
+     * @param {object} object The object to serialize.
+     * @returns {string} The type.
+    */
+    export function getTypeId(object: any): string;
+
+    /**
+     * Maps type ids to object constructor functions. Keys are type ids and values are functions.
+    */
+    export var typeMap: any;
+
+    /**
+    * Adds a type id/constructor function mampping to the `typeMap`.
+    * @param {string} typeId The type id.
+    * @param {function} constructor The constructor.
+    */
+    export function registerType(typeId: string, constructor: () => any): void;
+
+    /**
+     * The default reviver function used during deserialization. By default is detects type properties on objects and uses them to re-construct the correct object using the provided constructor mapping.
+     * @param {string} key The attribute key.
+     * @param {object} value The object value associated with the key.
+     * @param {function} getTypeId A custom function used to get the type id from a value.
+     * @param {object} getConstructor A custom function used to get the constructor function associated with a type id.
+     * @returns {object} The value.
+    */
+    export function reviver(key: string, value: any, getTypeId: (value: any) => string, getConstructor: (id: string) => () => any): any;
+
+    /**
+     * Deserialize the JSON.
+     * @param {text} text The JSON string.
+     * @param {DeserializerOptions} settings Settings can specify a reviver, getTypeId function or getConstructor function.
+     * @returns {object} The deserialized object.
+    */
+    export function deserialize<T>(text: string, settings?: DeserializerOptions): T;
+
+    /**
+    * Clone the object.
+    * @param {object} obj The object to clone.
+    * @param {object} [settings] Settings can specify any of the options allowed by the serialize or deserialize methods.
+    * @return {object} The new clone.
+    */
+    export function clone<T>(obj: T, settings?: Object): T;
+}
+
+/**
+ * Layers the widget sugar on top of the composition system.
+ * @requires system
+ * @requires composition
+ * @requires jquery
+ * @requires knockout
+ */
+declare module 'plugins/widget' {
+    interface WidgetSettings {
+        kind: string;
+        model?: any;
+        view?: any;
+    }
+
+    /**
+     * Creates a ko binding handler for the specified kind.
+     * @param {string} kind The kind to create a custom binding handler for.
+    */
+    export function registerKind(kind: string): void;
+
+    /**
+     * Maps views and module to the kind identifier if a non-standard pattern is desired.
+     * @param {string} kind The kind name.
+     * @param {string} [viewId] The unconventional view id to map the kind to.
+     * @param {string} [moduleId] The unconventional module id to map the kind to.
+    */
+    export function mapKind(kind: string, viewId?: string, moduleId?: string): void;
+
+    /**
+     * Maps a kind name to it's module id. First it looks up a custom mapped kind, then falls back to `convertKindToModulePath`.
+     * @param {string} kind The kind name.
+     * @returns {string} The module id.
+    */
+    export function mapKindToModuleId(kind: string): string;
+
+    /**
+     * Converts a kind name to it's module path. Used to conventionally map kinds who aren't explicitly mapped through `mapKind`.
+     * @param {string} kind The kind name.
+     * @returns {string} The module path.
+    */
+    export function convertKindToModulePath(kind: string): string;
+
+    /**
+     * Maps a kind name to it's view id. First it looks up a custom mapped kind, then falls back to `convertKindToViewPath`.
+     * @param {string} kind The kind name.
+     * @returns {string} The view id.
+    */
+    export function mapKindToViewId(kind: string): string;
+
+    /**
+     * Converts a kind name to it's view id. Used to conventionally map kinds who aren't explicitly mapped through `mapKind`.
+     * @param {string} kind The kind name.
+     * @returns {string} The view id.
+    */
+    export function convertKindToViewPath(kind: string): string;
+
+    /**
+     * Creates a widget.
+     * @param {DOMElement} element The DOMElement or knockout virtual element that serves as the target element for the widget.
+     * @param {object} settings The widget settings.
+     * @param {object} [bindingContext] The current binding context.
+    */
+    export function create(element: HTMLElement, settings: WidgetSettings, bindingContext?: KnockoutBindingContext): void;
+}
+
+/**
+ * Connects the history module's url and history tracking support to Durandal's activation and composition engine allowing you to easily build navigation-style applications.
+ * @requires system
+ * @requires app
+ * @requires activator
+ * @requires events
+ * @requires composition
+ * @requires history
+ * @requires knockout
+ * @requires jquery
+ */
+declare module 'plugins/router' {
+    var theModule: DurandalRootRouter;
+    export = theModule;
+}
+
+interface DurandalEventSubscription {
+    /**
+     * Attaches a callback to the event subscription.
+     * @param {function} callback The callback function to invoke when the event is triggered.
+     * @param {object} [context] An object to use as `this` when invoking the `callback`.
+     * @chainable
+     */
+    then(thenCallback: Function, context?: any): DurandalEventSubscription;
+
+    /**
+     * Attaches a callback to the event subscription.
+     * @param {function} [callback] The callback function to invoke when the event is triggered. If `callback` is not provided, the previous callback will be re-activated.
+     * @param {object} [context] An object to use as `this` when invoking the `callback`.
+     * @chainable
+     */
+    on(thenCallback: Function, context?: any): DurandalEventSubscription;
+
+    /**
+     * Cancels the subscription.
+     * @chainable
+     */
+    off(): DurandalEventSubscription;
+}
+
+interface DurandalEventSupport<T> {
+    /**
+     * Creates a subscription or registers a callback for the specified event.
+     * @param {string} events One or more events, separated by white space.
+     * @returns {Subscription} A subscription is returned.
+     */
+    on(events: string): DurandalEventSubscription;
+
+    /**
+     * Creates a subscription or registers a callback for the specified event.
+     * @param {string} events One or more events, separated by white space.
+     * @param {function} [callback] The callback function to invoke when the event is triggered.
+     * @param {object} [context] An object to use as `this` when invoking the `callback`.
+     * @returns {Events} The events object is returned for chaining.
+     */
+    on(events: string, callback: Function, context?: any): T;
+
+    /**
+     * Removes the callbacks for the specified events.
+     * @param {string} [events] One or more events, separated by white space to turn off. If no events are specified, then the callbacks will be removed.
+     * @param {function} [callback] The callback function to remove. If `callback` is not provided, all callbacks for the specified events will be removed.
+     * @param {object} [context] The object that was used as `this`. Callbacks with this context will be removed.
+     * @chainable
+     */
+    off(events: string, callback: Function, context?: any): T;
+
+    /**
+     * Triggers the specified events.
+     * @param {string} [events] One or more events, separated by white space to trigger.
+     * @chainable
+     */
+    trigger(events: string, ...eventArgs: any[]): T;
+
+    /**
+     * Creates a function that will trigger the specified events when called. Simplifies proxying jQuery (or other) events through to the events object.
+     * @param {string} events One or more events, separated by white space to trigger by invoking the returned function.
+     * @returns {function} Calling the function will invoke the previously specified events on the events object.
+     */
+    proxy(events: string): Function;
+}
+
+interface DurandalEventModule {
+    new (): DurandalEventSupport<Object>;
+    includeIn(targetObject: any): void;
+}
+
+interface DialogButton {
+    text: string;
+    value: any;
+}
+
+interface DurandalAppModule extends DurandalEventSupport<DurandalAppModule> {
+    /**
+     * The title of your application.
+    */
+    title: string;
+
+    /**
+     * Shows a dialog via the dialog plugin.
+     * @param {object|string} obj The object (or moduleId) to display as a dialog.
+     * @param {object} [activationData] The data that should be passed to the object upon activation.
+     * @param {string} [context] The name of the dialog context to use. Uses the default context if none is specified.
+     * @returns {Promise} A promise that resolves when the dialog is closed and returns any data passed at the time of closing.
+    */
+    showDialog(obj: any, activationData?: any, context?: string): DurandalPromise<any>;
+
+    /**
+     * Closes the dialog associated with the specified object. via the dialog plugin.
+     * @param {object} obj The object whose dialog should be closed.
+     * @param {object} results* The results to return back to the dialog caller after closing.
+     */
+    closeDialog(obj: any, ...results: any[]): void;
+
+    /**
+     * Shows a message box via the dialog plugin.
+     * @param {string} message The message to display in the dialog.
+     * @param {string} [title] The title message.
+     * @param {string[]} [options] The options to provide to the user.
+     * @param {boolean} [autoclose] Automatically close the the message box when clicking outside?
+     * @param {Object} [settings] Custom settings for this instance of the messsage box, used to change classes and styles.
+     * @returns {Promise} A promise that resolves when the message box is closed and returns the selected option.
+     */
+    showMessage(message: string, title?: string, options?: string[], autoclose?: boolean, settings?: Object): DurandalPromise<string>;
+
+    /**
+     * Shows a message box.
+     * @param {string} message The message to display in the dialog.
+     * @param {string} [title] The title message.
+     * @param {DialogButton[]} [options] The options to provide to the user.
+     * @param {boolean} [autoclose] Automatically close the the message box when clicking outside?
+     * @param {Object} [settings] Custom settings for this instance of the messsage box, used to change classes and styles.
+     * @returns {Promise} A promise that resolves when the message box is closed and returns the selected option.
+     */
+    showMessage(message: string, title?: string, options?: DialogButton[], autoclose?: boolean, settings?: Object): DurandalPromise<any>;
+
+    /**
+     * Configures one or more plugins to be loaded and installed into the application.
+     * @method configurePlugins
+     * @param {object} config Keys are plugin names. Values can be truthy, to simply install the plugin, or a configuration object to pass to the plugin.
+     * @param {string} [baseUrl] The base url to load the plugins from.
+    */
+    configurePlugins(config: Object, baseUrl?: string): void;
+
+    /**
+     * Starts the application.
+     * @returns {promise}
+    */
+    start(): DurandalPromise<any>;
+
+    /**
+     * Sets the root module/view for the application.
+     * @param {string} root The root view or module.
+     * @param {string} [transition] The transition to use from the previous root (or splash screen) into the new root.
+     * @param {string} [applicationHost] The application host element id. By default the id 'applicationHost' will be used.
+    */
+    setRoot(root: any, transition?: string, applicationHost?: string): void;
+
+    /**
+     * Sets the root module/view for the application.
+     * @param {string} root The root view or module.
+     * @param {string} [transition] The transition to use from the previous root (or splash screen) into the new root.
+     * @param {string} [applicationHost] The application host element. By default the id 'applicationHost' will be used.
+    */
+    setRoot(root: any, transition?: string, applicationHost?: HTMLElement): void;
+}
+
+interface DurandalActivatorSettings {
+    /**
+     * The default value passed to an object's deactivate function as its close parameter.
+     * @default true
+    */
+    closeOnDeactivate: boolean;
+
+    /**
+     * Lower-cased words which represent a truthy value.
+     * @default ['yes', 'ok', 'true']
+    */
+    affirmations: string[];
+
+    /**
+     * Interprets the response of a `canActivate` or `canDeactivate` call using the known affirmative values in the `affirmations` array.
+     * @param {object} value
+     * @returns {boolean}
+    */
+    interpretResponse(value: any): boolean;
+
+    /**
+     * Determines whether or not the current item and the new item are the same.
+     * @param {object} currentItem
+     * @param {object} newItem
+     * @param {object} currentActivationData
+     * @param {object} newActivationData
+     * @returns {boolean}
+    */
+    areSameItem(currentItem: any, newItem: any, currentActivationData: any, newActivationData: any): boolean;
+
+    /**
+     * Called immediately before the new item is activated.
+     * @param {object} newItem
+    */
+    beforeActivate(newItem: any): any;
+
+    /**
+     * Called immediately after the old item is deactivated.
+     * @param {object} oldItem The previous item.
+     * @param {boolean} close Whether or not the previous item was closed.
+     * @param {function} setter The activate item setter function.
+    */
+    afterDeactivate(oldItem: any, close: boolean, setter: Function): void;
+}
+
+interface DurandalActivator<T> extends KnockoutComputed<T> {
+    /**
+     * The settings for this activator.
+    */
+    settings: DurandalActivatorSettings;
+
+    /**
+     * An observable which indicates whether or not the activator is currently in the process of activating an instance.
+     * @returns {boolean}
+    */
+    isActivating: KnockoutObservable<boolean>;
+
+    /**
+     * Determines whether or not the specified item can be deactivated.
+     * @param {object} item The item to check.
+     * @param {boolean} close Whether or not to check if close is possible.
+     * @returns {promise}
+    */
+    canDeactivateItem(item: T, close: boolean): DurandalPromise<boolean>;
+
+    /**
+     * Deactivates the specified item.
+     * @param {object} item The item to deactivate.
+     * @param {boolean} close Whether or not to close the item.
+     * @returns {promise}
+    */
+    deactivateItem(item: T, close: boolean): DurandalPromise<boolean>;
+
+    /**
+     * Determines whether or not the specified item can be activated.
+     * @param {object} item The item to check.
+     * @param {object} activationData Data associated with the activation.
+     * @returns {promise}
+    */
+    canActivateItem(newItem: T, activationData?: any): DurandalPromise<boolean>;
+
+    /**
+     * Activates the specified item.
+     * @param {object} newItem The item to activate.
+     * @param {object} newActivationData Data associated with the activation.
+     * @returns {promise}
+    */
+    activateItem(newItem: T, activationData?: any): DurandalPromise<boolean>;
+
+    /**
+     * Determines whether or not the activator, in its current state, can be activated.
+     * @returns {promise}
+    */
+    canActivate(): DurandalPromise<boolean>;
+
+    /**
+     * Activates the activator, in its current state.
+     * @returns {promise}
+    */
+    activate(): DurandalPromise<boolean>;
+
+    /**
+     * Determines whether or not the activator, in its current state, can be deactivated.
+     * @returns {promise}
+    */
+    canDeactivate(close: boolean): DurandalPromise<boolean>;
+
+    /**
+     * Deactivates the activator, in its current state.
+     * @returns {promise}
+    */
+    deactivate(close: boolean): DurandalPromise<boolean>;
+
+    /**
+      * Adds canActivate, activate, canDeactivate and deactivate functions to the provided model which pass through to the corresponding functions on the activator.
+      */
+    includeIn(includeIn: any): void;
+
+    /**
+      * Sets up a collection representing a pool of objects which the activator will activate. See below for details. Activators without an item bool always close their values on deactivate. Activators with an items pool only deactivate, but do not close them.
+      */
+    forItems(items: any[]): DurandalActivator<T>;
+}
+
+interface DurandalHistoryOptions {
+    /**
+     * The function that will be called back when the fragment changes.
+     */
+    routeHandler?: (fragment: string) => void;
+
+    /**
+     * The url root used to extract the fragment when using push state.
+     */
+    root?: string;
+
+    /**
+     * Use hash change when present.
+     * @default true
+     */
+    hashChange?: boolean;
+
+    /**
+     * Use push state when present.
+     * @default false
+     */
+    pushState?: boolean;
+
+    /**
+     * Prevents loading of the current url when activating history.
+     * @default false
+     */
+    silent?: boolean;
+
+    /**
+     * Override default history init behavior by navigating directly to this route.
+     */
+    startRoute?: string;
+}
+
+interface DurandalNavigationOptions {
+    trigger: boolean;
+    replace: boolean;
+}
+
+interface DurandalRouteConfiguration {
+    title?: any;
+    moduleId?: string;
+    hash?: string;
+    route?: string | string[];
+    routePattern?: RegExp;
+    isActive?: KnockoutComputed<boolean>;
+    nav?: any;
+    hasChildRoutes?: boolean;
+    viewUrl?: string;
+}
+
+interface DurandalRouteInstruction {
+    fragment: string;
+    queryString: string;
+    config: DurandalRouteConfiguration;
+    params: any[];
+    queryParams: { [index: string]: any };
+}
+
+interface DurandalRelativeRouteSettings {
+    moduleId?: string;
+    route?: string;
+    fromParent?: boolean;
+	dynamicHash?: string;
+}
+
+interface DurandalRouterBase<T> extends DurandalEventSupport<T> {
+    /**
+     * The route handlers that are registered. Each handler consists of a `routePattern` and a `callback`.
+    */
+    handlers: { routePattern: RegExp; callback: (fragment: string) => void; }[];
+
+    /**
+     * The route configs that are registered.
+    */
+    routes: DurandalRouteConfiguration[];
+
+    /**
+     * The active item/screen based on the current navigation state.
+    */
+    activeItem: DurandalActivator<any>;
+
+    /**
+     * The route configurations that have been designated as displayable in a nav ui (nav:true).
+    */
+    navigationModel: KnockoutObservableArray<DurandalRouteConfiguration>;
+
+    /**
+     * Indicates that the router (or a child router) is currently in the process of navigating.
+    */
+    isNavigating: KnockoutComputed<boolean>;
+
+    /**
+     * An observable surfacing the active routing instruction that is currently being processed or has recently finished processing.
+     * The instruction object has `config`, `fragment`, `queryString`, `params` and `queryParams` properties.
+    */
+    activeInstruction: KnockoutObservable<DurandalRouteInstruction>;
+
+    /**
+     * Parses a query string into an object.
+     * @param {string} queryString The query string to parse.
+     * @returns {object} An object keyed according to the query string parameters.
+     */
+    parseQueryString(queryString: string): Object;
+
+    /**
+     * Add a route to be tested when the url fragment changes.
+     * @param {RegEx} routePattern The route pattern to test against.
+     * @param {function} callback The callback to execute when the route pattern is matched.
+     */
+    route(routePattern: RegExp, callback: (fragment: string) => void): void;
+
+    /**
+     * Attempt to load the specified URL fragment. If a route succeeds with a match, returns `true`. If no defined routes matches the fragment, returns `false`.
+     * @param {string} fragment The URL fragment to find a match for.
+     * @returns {boolean} True if a match was found, false otherwise.
+     */
+    loadUrl(fragment: string): boolean;
+
+    /**
+     * Updates the document title based on the activated module instance, the routing instruction and the app.title.
+     * @param {object} instance The activated module.
+     * @param {object} instruction The routing instruction associated with the action. It has a `config` property that references the original route mapping config.
+     */
+    updateDocumentTitle(instance: Object, instruction: DurandalRouteInstruction): void;
+
+    /**
+     * Save a fragment into the hash history, or replace the URL state if the
+     * 'replace' option is passed. You are responsible for properly URL-encoding
+     * the fragment in advance.
+     * The options object can contain `trigger: false` if you wish to not have the
+     * route callback be fired, or `replace: true`, if
+     * you wish to modify the current URL without adding an entry to the history.
+     * @param {string} fragment The url fragment to navigate to.
+     * @param {object|boolean} options An options object with optional trigger and replace flags. You can also pass a boolean directly to set the trigger option. Trigger is `true` by default.
+     * @return {boolean} Returns true/false from loading the url.
+     */
+    navigate(fragment: string, trigger?: boolean): boolean;
+
+    /**
+     * Save a fragment into the hash history, or replace the URL state if the
+     * 'replace' option is passed. You are responsible for properly URL-encoding
+     * the fragment in advance.
+     * The options object can contain `trigger: false` if you wish to not have the
+     * route callback be fired, or `replace: true`, if
+     * you wish to modify the current URL without adding an entry to the history.
+     * @param {string} fragment The url fragment to navigate to.
+     * @param {object|boolean} options An options object with optional trigger and replace flags. You can also pass a boolean directly to set the trigger option. Trigger is `true` by default.
+     * @return {boolean} Returns true/false from loading the url.
+     */
+    navigate(fragment: string, options: DurandalNavigationOptions): boolean;
+
+    /**
+     * Navigates back in the browser history.
+     */
+    navigateBack(): void;
+
+    /**
+     * Converts a route to a hash suitable for binding to a link's href.
+     * @param {string} route
+     * @returns {string} The hash.
+     */
+    convertRouteToHash(route: string): string;
+
+    /**
+     * Converts a route to a module id. This is only called if no module id is supplied as part of the route mapping.
+     * @param {string} route
+     * @returns {string} The module id.
+     */
+    convertRouteToModuleId(route: string): string;
+
+    /**
+     * Converts a route to a displayable title. This is only called if no title is specified as part of the route mapping.
+     * @method convertRouteToTitle
+     * @param {string} route
+     * @returns {string} The title.
+     */
+    convertRouteToTitle(route: string): string;
+
+    /**
+     * Maps route patterns to modules.
+     * @param {string} route A route.
+     * @chainable
+     */
+    map(route: string): T;
+
+    /**
+     * Maps route patterns to modules.
+     * @param {string} route A route pattern.
+     * @param {string} moduleId The module id to map the route to.
+     * @chainable
+     */
+    map(route: string, moduleId: string): T;
+
+    /**
+     * Maps route patterns to modules.
+     * @param {RegExp} route A route pattern.
+     * @param {string} moduleId The module id to map the route to.
+     * @chainable
+     */
+    map(route: RegExp, moduleId: string): T;
+
+    /**
+     * Maps route patterns to modules.
+     * @param {string} route A route pattern.
+     * @param {RouteConfiguration} config The route's configuration.
+     * @chainable
+     */
+    map(route: string, config: DurandalRouteConfiguration): T;
+
+    /**
+     * Maps route patterns to modules.
+     * @method map
+     * @param {RegExp} route A route pattern.
+     * @param {RouteConfiguration} config The route's configuration.
+     * @chainable
+     */
+    map(route: RegExp, config: DurandalRouteConfiguration): T;
+
+    /**
+     * Maps route patterns to modules.
+     * @param {RouteConfiguration} config The route's configuration.
+     * @chainable
+     */
+    map(config: DurandalRouteConfiguration): T;
+
+    /**
+     * Maps route patterns to modules.
+     * @param {RouteConfiguration[]} configs An array of route configurations.
+     * @chainable
+     */
+    map(configs: DurandalRouteConfiguration[]): T;
+
+    /**
+     * Builds an observable array designed to bind a navigation UI to. The model will exist in the `navigationModel` property.
+     * @param {number} defaultOrder The default order to use for navigation visible routes that don't specify an order. The defualt is 100.
+     * @chainable
+     */
+    buildNavigationModel(defaultOrder?: number): T;
+
+    /**
+     * Configures the router to map unknown routes to modules at the same path.
+     * @chainable
+     */
+    mapUnknownRoutes(): T;
+
+    /**
+     * Configures the router use the specified module id for all unknown routes.
+     * @param {string} notFoundModuleId Represents the module id to route all unknown routes to.
+     * @param {string} [replaceRoute] Optionally provide a route to replace the url with.
+     * @chainable
+     */
+    mapUnknownRoutes(notFoundModuleId: string, replaceRoute?: string): T;
+
+    /**
+     * Configures how the router will handle unknown routes.
+     * @param {function} callback Called back with the route instruction containing the route info. The function can then modify the instruction by adding a moduleId and the router will take over from there.
+     * @chainable
+     */
+    mapUnknownRoutes(callback: (instruction: DurandalRouteInstruction) => void): T;
+
+    /**
+     * Configures how the router will handle unknown routes.
+     * @param {RouteConfiguration} config The route configuration to use for unknown routes.
+     * @chainable
+     */
+    mapUnknownRoutes(config: DurandalRouteConfiguration): T;
+
+    /**
+     * Resets the router by removing handlers, routes, event handlers and previously configured options.
+     * @chainable
+     */
+    reset(): T;
+
+    /**
+     * Makes all configured routes and/or module ids relative to a certain base url.
+     * @param {string} settings The value is used as the base for routes and module ids.
+     * @chainable
+     */
+    makeRelative(settings: string): T;
+
+    /**
+     * Makes all configured routes and/or module ids relative to a certain base url.
+     * @param {RelativeRouteSettings} settings If an object, you can specify `route` and `moduleId` separately. In place of specifying route, you can set `fromParent:true` to make routes automatically relative to the parent router's active route.
+     * @chainable
+     */
+    makeRelative(settings: DurandalRelativeRouteSettings): T;
+
+    /**
+     * Creates a child router.
+     * @returns {Router} The child router.
+     */
+    createChildRouter(): T;
+
+    /**
+     * Inspects routes and modules before activation. Can be used to protect access by cancelling navigation or redirecting.
+     * @param {object} instance The module instance that is about to be activated by the router.
+     * @param {object} instruction The route instruction. The instruction object has config, fragment, queryString, params and queryParams properties.
+     * @returns {Promise|Boolean|String} If a boolean, determines whether or not the route should activate or be cancelled. If a string, causes a redirect to the specified route. Can also be a promise for either of these value types.
+     */
+    guardRoute?: (instance: Object, instruction: DurandalRouteInstruction) => DurandalPromise<boolean | string> | boolean | string;
+
+    /**
+     * Parent router of the current child router.
+     */
+    parent?: DurandalRouter;
+}
+
+interface DurandalRouter extends DurandalRouterBase<DurandalRouter> { }
+
+interface DurandalRootRouter extends DurandalRouterBase<DurandalRootRouter> {
+    /**
+     * Makes the RegExp generated for routes case sensitive, rather than the default of case insensitive.
+     */
+    makeRoutesCaseSensitive(): void;
+
+    /**
+     * Activates the router and the underlying history tracking mechanism.
+     * @returns {Promise} A promise that resolves when the router is ready.
+     */
+    activate(options?: DurandalHistoryOptions): DurandalPromise<any>;
+
+    /**
+     * Disable history, perhaps temporarily. Not useful in a real app, but possibly useful for unit testing Routers.
+     */
+    deactivate(): void;
+
+    /**
+     * Installs the router's custom ko binding handler.
+     */
+    install(): void;
+}
diff --git a/durandal/tsconfig.json b/durandal/tsconfig.json
new file mode 100644
index 0000000000..98c460c2f5
--- /dev/null
+++ b/durandal/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "files": [
+        "index.d.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/dustjs-linkedin/dustjs-linkedin-tests.ts b/dustjs-linkedin/dustjs-linkedin-tests.ts
index 97a2fffc05..d23c649ef0 100644
--- a/dustjs-linkedin/dustjs-linkedin-tests.ts
+++ b/dustjs-linkedin/dustjs-linkedin-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="dustjs-linkedin.d.ts"/>
-
 import dust = require("dustjs-linkedin");
 
 //
diff --git a/dustjs-linkedin/dustjs-linkedin-tests.ts.tscparams b/dustjs-linkedin/dustjs-linkedin-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/dustjs-linkedin/dustjs-linkedin-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/dustjs-linkedin/dustjs-linkedin.d.ts b/dustjs-linkedin/dustjs-linkedin.d.ts
deleted file mode 100644
index 70bd288a39..0000000000
--- a/dustjs-linkedin/dustjs-linkedin.d.ts
+++ /dev/null
@@ -1,168 +0,0 @@
-// Type definitions for linkedin dustjs 1.2.1
-// Project: https://github.com/linkedin/dustjs
-// Definitions by: Marcelo Dezem <http://github.com/mdezem>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-//
-// Due to a lack of documentation it's not possible
-// to know which methods are intended to be public and which 
-// are intended to be used internally by the framework.
-// All the interfaces definitions here exposes only the methods 
-// that are documented in some way (tutorials, guides, references, etc.).
-// 
-// Fell free to include other methods. If possible let me know about.
-//
-
-declare module "dustjs-linkedin" {
-
-    /**
-    * A template compiled into a js function.
-    */
-    export interface Template {
-        (chk: Chunk, ctx: Context): Chunk;
-    }
-
-    export interface Chunk {
-        /**
-        * Writes data to this chunk's buffer. 
-        */
-        write(data: string): Chunk;
-
-        /**
-        * Writes data to this chunk's buffer and marks it as flushable. This method must be called on any chunks created via chunk.map. Do not call this method on a handler's main chunk -- dust.render and dust.stream take care of this for you.
-        */
-        end(data: string): Chunk;
-
-        /**
-        * Creates a new chunk and passes it to callback. Use map to wrap asynchronous functions and to partition the template for streaming.
-        */
-        map(callback: (chunk: Chunk) => any): Chunk;
-
-        /**
-        * Convenience method to apply filters to a stream.
-        */
-        tap(callback: (value: any) => any): Chunk;
-
-        /**
-        * Removes the head tap function from the list.
-        */
-        untap(): Chunk;
-
-        /**
-        * Renders a template block, such as a default block or an else block.
-        */
-        render(body: any, context: Context): Chunk;
-
-        /**
-        * Sets an error on this chunk and immediately flushes the output.
-        */
-        setError(err: any): Chunk;
-    }
-
-    export interface Context {
-        /**
-        * Retrieves the value at key from the context stack.
-        */
-        get (key: string): any;
-
-        /**
-        * Pushes an arbitrary value onto the context stack and returns a new context instance. Specify index and/or length to enable enumeration helpers.
-        */
-        push(head: any, idx?: number, len?: number): Context;
-
-        /**
-        * Returns a new context instance consisting only of the value at head, plus any previously defined global object.
-        */
-        rebase(head: any): Context;
-
-        /**
-        * Returns the head of the context stack.
-        */
-        current(): any;
-    }
-
-    export interface Stream {
-        flush(): void;
-        emit(evt: string, data: any): void;
-
-        /*
-        * Registers an event listener. Streams accept a single listener for a given event.
-        * @param evt the event. Possible values are data, end, error (maybe more, look in the source).
-        */
-        on(evt: string, callback: (data?: any) => any);
-
-        pipe(stream: Stream): Stream;
-    }
-
-    /**
-    * register a template into the cache.
-    * @param name the unique template name. 
-    * @param tmpl the template function. 
-    */
-    export function register(name: string, tmpl: Template): void;
-
-    /**
-    * compile a template body into a string of JavaScript source code
-    * @param source the template string
-    * @param name the name used to register the compiled template into the internal cache. See render().
-    * @strip strip whitespaces from the output. Defaults to false.
-    */
-    export function compile(source: string, name: string, strip?: boolean): string;
-
-    /**
-    * Compiles source directly into a JavaScript function that takes a context and an optional callback (see dust.renderSource). Registers the template under [name] if this argument is supplied.
-    * @param source the template string
-    * @param name the template name (optional). 
-    */
-    export function compileFn(source: string, name?: string): Template;
-
-    /**
-    * Evaluates a compiled source string. 
-    */
-    export function loadSource(compiled: string): Template;
-
-    /**
-    * Renders the named template and calls callback on completion.context may be a plain object or an instance of dust.Context.
-    * @param name the template name.
-    * @param context a plain object or an instance of dust.Context.
-    */
-    export function render(name: string, context: any, callback: (err: any, out: string) => any);
-    export function render(name: string, context: Context, callback: (err: any, out: string) => any);
-
-    /**
-    * Compiles and renders source, invoking callback on completion. If no callback is supplied this function returns a Stream object. Use this function when precompilation is not required.
-    * @param source the template string.
-    * @param context a plain object or an instance of dust.Context.
-    * @param callback (optional). If supplied the callback will be called passing the result string. If omitted, renderSource() will return a dust.Stream object.
-    */
-    export function renderSource(source: string, context: any): Stream;
-    export function renderSource(source: string, context: Context): Stream;
-    export function renderSource(source: string, context: any, callback: (err: any, out: string) => any): void;
-    export function renderSource(source: string, context: Context, callback: (err: any, out: string) => any): void;
-
-    /**
-    * Streams the named template. context may be a plain object or an instance of dust.Context. Returns an instance of dust.Stream.
-    * @param name the template name.
-    * @param context a plain object or an instance of dust.Context.
-    */
-    export function stream(name: string, context: any): Stream;
-    export function stream(name: string, context: Context): Stream;
-
-    /**
-    * Manufactures a dust.Context instance with its global object set to object.
-    * @param global a plain object or an instance of dust.Context.
-    */
-    export function makeBase(global: any): Context;
-    export function makeBase(global: Context): Context;
-
-    export function escapeHtml(html: string): string;
-    export function escapeJs(js: string): string;
-
-    var helpers: {
-        [key: string]: (chk: Chunk, ctx: Context, bodies?: any, params?: any) => any;
-    };
-
-    var filters: {
-        [key: string]: (value: string) => string;
-    };
-}
\ No newline at end of file
diff --git a/dustjs-linkedin/dustjs-linkedin.d.ts.tscparams b/dustjs-linkedin/dustjs-linkedin.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/dustjs-linkedin/dustjs-linkedin.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/dustjs-linkedin/index.d.ts b/dustjs-linkedin/index.d.ts
new file mode 100644
index 0000000000..5f7f3586d6
--- /dev/null
+++ b/dustjs-linkedin/index.d.ts
@@ -0,0 +1,167 @@
+// Type definitions for linkedin dustjs 1.2.1
+// Project: https://github.com/linkedin/dustjs
+// Definitions by: Marcelo Dezem <http://github.com/mdezem>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+//
+// Due to a lack of documentation it's not possible
+// to know which methods are intended to be public and which 
+// are intended to be used internally by the framework.
+// All the interfaces definitions here exposes only the methods 
+// that are documented in some way (tutorials, guides, references, etc.).
+// 
+// Fell free to include other methods. If possible let me know about.
+//
+
+
+
+/**
+* A template compiled into a js function.
+*/
+export interface Template {
+    (chk: Chunk, ctx: Context): Chunk;
+}
+
+export interface Chunk {
+    /**
+    * Writes data to this chunk's buffer. 
+    */
+    write(data: string): Chunk;
+
+    /**
+    * Writes data to this chunk's buffer and marks it as flushable. This method must be called on any chunks created via chunk.map. Do not call this method on a handler's main chunk -- dust.render and dust.stream take care of this for you.
+    */
+    end(data: string): Chunk;
+
+    /**
+    * Creates a new chunk and passes it to callback. Use map to wrap asynchronous functions and to partition the template for streaming.
+    */
+    map(callback: (chunk: Chunk) => any): Chunk;
+
+    /**
+    * Convenience method to apply filters to a stream.
+    */
+    tap(callback: (value: any) => any): Chunk;
+
+    /**
+    * Removes the head tap function from the list.
+    */
+    untap(): Chunk;
+
+    /**
+    * Renders a template block, such as a default block or an else block.
+    */
+    render(body: any, context: Context): Chunk;
+
+    /**
+    * Sets an error on this chunk and immediately flushes the output.
+    */
+    setError(err: any): Chunk;
+}
+
+export interface Context {
+    /**
+    * Retrieves the value at key from the context stack.
+    */
+    get(key: string): any;
+
+    /**
+    * Pushes an arbitrary value onto the context stack and returns a new context instance. Specify index and/or length to enable enumeration helpers.
+    */
+    push(head: any, idx?: number, len?: number): Context;
+
+    /**
+    * Returns a new context instance consisting only of the value at head, plus any previously defined global object.
+    */
+    rebase(head: any): Context;
+
+    /**
+    * Returns the head of the context stack.
+    */
+    current(): any;
+}
+
+export interface Stream {
+    flush(): void;
+    emit(evt: string, data: any): void;
+
+    /*
+    * Registers an event listener. Streams accept a single listener for a given event.
+    * @param evt the event. Possible values are data, end, error (maybe more, look in the source).
+    */
+    on(evt: string, callback: (data?: any) => any): any;
+
+    pipe(stream: Stream): Stream;
+}
+
+/**
+* register a template into the cache.
+* @param name the unique template name. 
+* @param tmpl the template function. 
+*/
+export declare function register(name: string, tmpl: Template): void;
+
+/**
+* compile a template body into a string of JavaScript source code
+* @param source the template string
+* @param name the name used to register the compiled template into the internal cache. See render().
+* @strip strip whitespaces from the output. Defaults to false.
+*/
+export declare function compile(source: string, name: string, strip?: boolean): string;
+
+/**
+* Compiles source directly into a JavaScript function that takes a context and an optional callback (see dust.renderSource). Registers the template under [name] if this argument is supplied.
+* @param source the template string
+* @param name the template name (optional). 
+*/
+export declare function compileFn(source: string, name?: string): Template;
+
+/**
+* Evaluates a compiled source string. 
+*/
+export declare function loadSource(compiled: string): Template;
+
+/**
+* Renders the named template and calls callback on completion.context may be a plain object or an instance of dust.Context.
+* @param name the template name.
+* @param context a plain object or an instance of dust.Context.
+*/
+export declare function render(name: string, context: any, callback: (err: any, out: string) => any): void;
+export declare function render(name: string, context: Context, callback: (err: any, out: string) => any): void;
+
+/**
+* Compiles and renders source, invoking callback on completion. If no callback is supplied this function returns a Stream object. Use this function when precompilation is not required.
+* @param source the template string.
+* @param context a plain object or an instance of dust.Context.
+* @param callback (optional). If supplied the callback will be called passing the result string. If omitted, renderSource() will return a dust.Stream object.
+*/
+export declare function renderSource(source: string, context: any): Stream;
+export declare function renderSource(source: string, context: Context): Stream;
+export declare function renderSource(source: string, context: any, callback: (err: any, out: string) => any): void;
+export declare function renderSource(source: string, context: Context, callback: (err: any, out: string) => any): void;
+
+/**
+* Streams the named template. context may be a plain object or an instance of dust.Context. Returns an instance of dust.Stream.
+* @param name the template name.
+* @param context a plain object or an instance of dust.Context.
+*/
+export declare function stream(name: string, context: any): Stream;
+export declare function stream(name: string, context: Context): Stream;
+
+/**
+* Manufactures a dust.Context instance with its global object set to object.
+* @param global a plain object or an instance of dust.Context.
+*/
+export declare function makeBase(global: any): Context;
+export declare function makeBase(global: Context): Context;
+
+export declare function escapeHtml(html: string): string;
+export declare function escapeJs(js: string): string;
+
+declare var helpers: {
+    [key: string]: (chk: Chunk, ctx: Context, bodies?: any, params?: any) => any;
+};
+
+declare var filters: {
+    [key: string]: (value: string) => string;
+};
diff --git a/dustjs-linkedin/tsconfig.json b/dustjs-linkedin/tsconfig.json
new file mode 100644
index 0000000000..f6cca882d4
--- /dev/null
+++ b/dustjs-linkedin/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dustjs-linkedin-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dw-bxslider-4/dw-bxslider-4-tests.ts b/dw-bxslider-4/dw-bxslider-4-tests.ts
index d4138cca10..e20f748a5d 100644
--- a/dw-bxslider-4/dw-bxslider-4-tests.ts
+++ b/dw-bxslider-4/dw-bxslider-4-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="dw-bxslider-4.d.ts" />
+/// <reference types="jquery" />
+
 
 // examples from http://bxslider.com/examples
 
diff --git a/dw-bxslider-4/dw-bxslider-4.d.ts b/dw-bxslider-4/dw-bxslider-4.d.ts
deleted file mode 100644
index 3b63698e18..0000000000
--- a/dw-bxslider-4/dw-bxslider-4.d.ts
+++ /dev/null
@@ -1,623 +0,0 @@
-// Type definitions for bxSlider v4.2.5
-// Project: https://github.com/stevenwanderski/bxslider-4
-// Definitions by: Piotr Sałkowski <https://github.com/namerci>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../jquery/jquery.d.ts"/>
-
-interface bxSliderOptions {
-    /**
-     * mode Type of transition between slides
-     * 
-     * default: 'horizontal'
-     * options: 'horizontal', 'vertical', 'fade'
-     */
-    mode?: string
-
-    /**
-     * speed Slide transition duration (in ms)
-     * 
-     * default: 500
-     * options: integer
-     */
-    speed?: number
-
-    /**
-     * slideMargin Margin between each slide
-     * 
-     * default: 0
-     * options: integer
-     */
-    slideMargin?: number
-
-    /**
-     * startSlide Starting slide index (zero-based)
-     * 
-     * default: 0
-     * options: integer
-     */
-    startSlide?: number
-
-    /**
-     * randomStart Start slider on a random slide
-     * 
-     * default: false
-     * options: boolean (true / false)
-     */
-    randomStart?: boolean
-
-    /**
-     * slideSelector Element to use as slides (ex. 'div.slide').
-     * Note: by default, bxSlider will use all immediate children of the slider element
-     * 
-     * default: ''
-     * options: jQuery selector
-     */
-    slideSelector?: string
-
-    /**
-     * infiniteLoop If true, clicking "Next" while on the last slide will transition to the first slide and vice-versa
-     * 
-     * default: true
-     * options: boolean (true / false)
-     */
-    infiniteLoop?: boolean
-
-    /**
-     * hideControlOnEnd If true, "Prev" and "Next" controls will receive a class disabled when slide is the first or the last
-     * Note: Only used when infiniteLoop: false
-     * 
-     * default: false
-     * options: boolean (true / false)
-     */
-    hideControlOnEnd?: boolean
-
-    /**
-     * easing The type of "easing" to use during transitions. If using CSS transitions, include a value for the transition-timing-function property. If not using CSS transitions, you may include plugins/jquery.easing.1.3.js for many options.
-     * See http://gsgd.co.uk/sandbox/jquery/easing/ for more info.
-     * 
-     * default: null
-     * options: if using CSS: 'linear', 'ease', 'ease-in', 'ease-out', 'ease-in-out', 'cubic-bezier(n,n,n,n)'. If not using CSS: 'swing', 'linear' (see the above file for more options)
-     */
-    easing?: string
-
-    /**
-     * captions Include image captions. Captions are derived from the image's title attribute
-     * 
-     * default: false
-     * options: boolean (true / false)
-     */
-    captions?: boolean
-
-    /**
-     * ticker Use slider in ticker mode (similar to a news ticker)
-     * 
-     * default: false
-     * options: boolean (true / false)
-     */
-    ticker?: boolean
-
-    /**
-     * tickerHover Ticker will pause when mouse hovers over slider. Note: this functionality does NOT work if using CSS transitions!
-     * 
-     * default: false
-     * options: boolean (true / false)
-     */
-    tickerHover?: boolean
-
-    /**
-     * adaptiveHeight Dynamically adjust slider height based on each slide's height
-     * 
-     * default: false
-     * options: boolean (true / false)
-     */
-    adaptiveHeight?: boolean
-
-    /**
-     * adaptiveHeightSpeed Slide height transition duration (in ms). Note: only used if adaptiveHeight: true
-     * 
-     * default: 500
-     * options: integer
-     */
-    adaptiveHeightSpeed?: number
-
-    /**
-     * video If any slides contain video, set this to true. Also, include plugins/jquery.fitvids.js
-     * See http://fitvidsjs.com/ for more info
-     * 
-     * default: false
-     * options: boolean (true / false)
-     */
-    video?: boolean
-
-    /**
-     * responsive Enable or disable auto resize of the slider. Useful if you need to use fixed width sliders.
-     * 
-     * default: true
-     * options: boolean (true / false)
-     */
-    responsive?: boolean
-
-    /**
-     * useCSS If true, CSS transitions will be used for horizontal and vertical slide animations (this uses native hardware acceleration). If false, jQuery animate() will be used.
-     * 
-     * default: true
-     * options: boolean (true / false)
-     */
-    useCSS?: boolean
-
-    /**
-     * preloadImages If 'all', preloads all images before starting the slider. If 'visible', preloads only images in the initially visible slides before starting the slider (tip: use 'visible' if all slides are identical dimensions)
-     * 
-     * default: 'visible'
-     * options: 'all', 'visible'
-     */
-    preloadImages?: string
-
-    /**
-     * touchEnabled If true, slider will allow touch swipe transitions
-     * 
-     * default: true
-     * options: boolean (true / false)
-     */
-    touchEnabled?: boolean
-
-    /**
-     * swipeThreshold Amount of pixels a touch swipe needs to exceed in order to execute a slide transition. Note: only used if touchEnabled: true
-     * 
-     * default: 50
-     * options: integer
-     */
-    swipeThreshold?: number
-
-    /**
-     * oneToOneTouch If true, non-fade slides follow the finger as it swipes
-     * 
-     * default: true
-     * options: boolean (true / false)
-     */
-    oneToOneTouch?: boolean
-
-    /**
-     * preventDefaultSwipeX If true, touch screen will not move along the x-axis as the finger swipes
-     * 
-     * default: true
-     * options: boolean (true / false)
-     */
-    preventDefaultSwipeX?: boolean
-
-    /**
-     * preventDefaultSwipeY If true, touch screen will not move along the y-axis as the finger swipes
-     * 
-     * default: false
-     * options: boolean (true / false)
-     */
-    preventDefaultSwipeY?: boolean
-
-    /**
-     * wrapperClass Class to wrap the slider in. Change to prevent from using default bxSlider styles.
-     * 
-     * default: 'bx-wrapper'
-     * options: string
-     */
-    wrapperClass?: string
-
-    /**
-     * pager If true, a pager will be added
-     * 
-     * default: true
-     * options: boolean (true / false)
-     */
-    pager?: boolean
-
-    /**
-     * pagerType If 'full', a pager link will be generated for each slide. If 'short', a x / y pager will be used (ex. 1 / 5)
-     * 
-     * default: 'full'
-     * options: 'full', 'short'
-     */
-    pagerType?: string
-
-    /**
-     * pagerShortSeparator If pagerType: 'short', pager will use this value as the separating character
-     * 
-     * default: ' / '
-     * options: string
-     */
-    pagerShortSeparator?: string
-
-    /**
-     * pagerSelector Element used to populate the populate the pager. By default, the pager is appended to the bx-viewport
-     * 
-     * default: ''
-     * options: jQuery selector
-     */
-    pagerSelector?: string
-
-    /**
-     * pagerCustom Parent element to be used as the pager. Parent element must contain a <a data-slide-index="x"> element for each slide. See example here. Not for use with dynamic carousels.
-     * 
-     * default: null
-     * options: jQuery selector
-     */
-    pagerCustom?: string
-
-    /**
-     * buildPager If supplied, function is called on every slide element, and the returned value is used as the pager item markup.
-     * See examples for detailed implementation
-     * 
-     * default: null
-     * options: functoin(slideIndex)
-     */
-     buildPager?: (slideIndex: number) => void;
-
-
-    /**
-     * controls If true, "Next" / "Prev" controls will be added
-     * 
-     * default: true
-     * options: boolean (true / false)
-     */
-    controls?: boolean
-
-    /**
-     * nextText Text to be used for the "Next" control
-     * 
-     * default: 'Next'
-     * options: string
-     */
-    nextText?: string
-
-    /**
-     * prevText Text to be used for the "Prev" control
-     * 
-     * default: 'Prev'
-     * options: string
-     */
-    prevText?: string
-
-    /**
-     * nextSelector Element used to populate the "Next" control
-     * 
-     * default: null
-     * options: jQuery selector
-     */
-    nextSelector?: string
-
-    /**
-     * prevSelector Element used to populate the "Prev" control
-     * 
-     * default: null
-     * options: jQuery selector
-     */
-    prevSelector?: string
-
-    /**
-     * autoControls If true, "Start" / "Stop" controls will be added
-     * 
-     * default: false
-     * options: boolean (true / false)
-     */
-    autoControls?: boolean
-
-    /**
-     * startText Text to be used for the "Start" control
-     * 
-     * default: 'Start'
-     * options: string
-     */
-    startText?: string
-
-    /**
-     * stopText Text to be used for the "Stop" control
-     * 
-     * default: 'Stop'
-     * options: string
-     */
-    stopText?: string
-
-    /**
-     * autoControlsCombine When slideshow is playing only "Stop" control is displayed and vice-versa
-     * 
-     * default: false
-     * options: boolean (true / false)
-     */
-    autoControlsCombine?: boolean
-
-    /**
-     * autoControlsSelector Element used to populate the auto controls
-     * 
-     * default: null
-     * options: jQuery selector
-     */
-    autoControlsSelector?: string
-
-    /**
-     * keyboardEnabled Allows for keyboard control of visible slider. Keypress ignored if slider not visible.
-     * 
-     * default: false
-     * options: boolean (true / false)
-     */
-    keyboardEnabled?: boolean
-
-    /**
-     * auto Slides will automatically transition
-     * 
-     * default: false
-     * options: boolean (true / false)
-     */
-    auto?: boolean
-
-    /**
-     * stopAutoOnClick Auto will stop on interaction with controls
-     * 
-     * default: false
-     * options: boolean (true / false)
-     */
-    stopAutoOnClick?: boolean
-
-    /**
-     * pause The amount of time (in ms) between each auto transition
-     * 
-     * default: 4000
-     * options: integer
-     */
-    pause?: number
-
-    /**
-     * autoStart Auto show starts playing on load. If false, slideshow will start when the "Start" control is clicked
-     * 
-     * default: true
-     * options: boolean (true / false)
-     */
-    autoStart?: boolean
-
-    /**
-     * autoDirection The direction of auto show slide transitions
-     * 
-     * default: 'next'
-     * options: 'next', 'prev'
-     */
-    autoDirection?: string
-
-    /**
-     * autoHover Auto show will pause when mouse hovers over slider
-     * 
-     * default: false
-     * options: boolean (true / false)
-     */
-    autoHover?: boolean
-
-    /**
-     * autoDelay Time (in ms) auto show should wait before starting
-     * 
-     * default: 0
-     * options: integer
-     */
-    autoDelay?: number
-
-    /**
-     * minSlides The minimum number of slides to be shown. Slides will be sized down if carousel becomes smaller than the original size.
-     * 
-     * default: 1
-     * options: integer
-     */
-    minSlides?: number
-
-    /**
-     * maxSlides The maximum number of slides to be shown. Slides will be sized up if carousel becomes larger than the original size.
-     * 
-     * default: 1
-     * options: integer
-     */
-    maxSlides?: number
-
-    /**
-     * moveSlides The number of slides to move on transition. This value must be >= minSlides, and <= maxSlides. If zero (default), the number of fully-visible slides will be used.
-     * 
-     * default: 0
-     * options: integer
-     */
-    moveSlides?: number
-
-    /**
-     * slideWidth The width of each slide. This setting is required for all horizontal carousels!
-     * 
-     * default: 0
-     * options: integer
-     */
-    slideWidth?: number
-
-    /**
-     * shrinkItems The Carousel will only show whole items and shrink the images to fit the viewport based on maxSlides/MinSlides.
-     * 
-     * default: false
-     * options: boolean (true / false)
-     */
-    shrinkItems?: boolean
-
-    /**
-     * ariaLive Adds Aria Live attribute to slider.
-     * 
-     * default: true
-     * options: boolean (true / false)
-     */
-    ariaLive?: boolean
-
-    /**
-     * ariaHidden Adds Aria Hidden attribute to any nonvisible slides.
-     * 
-     * default: true
-     * options: boolean (true / false)
-     */
-    ariaHidden?: boolean
-
-    /**
-     * onSliderLoad Executes immediately after the slider is fully loaded
-     * 
-     * default: function(){}
-     * options: function(currentIndex){ // your code here }
-     * arguments:
-     *   currentIndex: element index of the current slide
-     */
-    onSliderLoad?: (currentIndex?: number) => void;
-
-    /**
-     * onSliderResize Executes immediately after the slider is resized
-     * 
-     * default: function(){}
-     * options: function(currentIndex){ // your code here }
-     * arguments:
-     *   currentIndex: element index of the current slide
-     */
-    onSliderResize?: (currentIndex?: number) => void;
-
-    /**
-     * onSlideBefore Executes immediately before each slide transition.
-     * 
-     * default: function(){}
-     * options: function($slideElement, oldIndex, newIndex){ // your code here }
-     * arguments:
-     *   $slideElement: jQuery element of the destination element
-     *   oldIndex: element index of the previous slide (before the transition)
-     *   newIndex: element index of the destination slide (after the transition)
-     */
-    onSlideBefore?: ($slideElement?: JQuery, oldIndex?: number, newIndex?: number) => void;
-
-    /**
-     * onSlideAfter Executes immediately after each slide transition. Function argument is the current slide element (when transition completes).
-     * 
-     * default: function(){}
-     * options: function($slideElement, oldIndex, newIndex){ // your code here }
-     * arguments:
-     *   $slideElement: jQuery element of the destination element
-     *   oldIndex: element index of the previous slide (before the transition)
-     *   newIndex: element index of the destination slide (after the transition)
-     */
-    onSlideAfter?: ($slideElement?: JQuery, oldIndex?: number, newIndex?: number) => void;
-
-    /**
-     * onSlideNext Executes immediately before each "Next" slide transition. Function argument is the target (next) slide element.
-     * 
-     * default: function(){}
-     * options: function($slideElement, oldIndex, newIndex){ // your code here }
-     * arguments:
-     *   $slideElement: jQuery element of the destination element
-     *   oldIndex: element index of the previous slide (before the transition)
-     *   newIndex: element index of the destination slide (after the transition)
-     */
-    onSlideNext?: ($slideElement?: JQuery, oldIndex?: number, newIndex?: number) => void;
-
-    /**
-     * onSlidePrev Executes immediately before each "Prev" slide transition. Function argument is the target (prev) slide element.
-     * 
-     * default: function(){}
-     * options: function($slideElement, oldIndex, newIndex){ // your code here }
-     * arguments:
-     *   $slideElement: jQuery element of the destination element
-     *   oldIndex: element index of the previous slide (before the transition)
-     *   newIndex: element index of the destination slide (after the transition)
-     */
-    onSlidePrev?: ($slideElement?: JQuery, oldIndex?: number, newIndex?: number) => void;
-}
-
-interface bxSlider {
-
-    /**
-     * goToSlide Performs a slide transition to the supplied slide index (zero-based)
-     * 
-     * example:
-     * slider = $('.bxslider').bxSlider();
-     * slider.goToSlide(3);
-     */
-    goToSlide: (index: number) => void;
-
-    /**
-     * goToNextSlide Performs a "Next" slide transition
-     * 
-     * example:
-     * slider = $('.bxslider').bxSlider();
-     * slider.goToNextSlide();
-     */
-    goToNextSlide: () => void;
-
-    /**
-     * goToPrevSlide Performs a "Prev" slide transition
-     * 
-     * example:
-     * slider = $('.bxslider').bxSlider();
-     * slider.goToPrevSlide();
-     */
-    goToPrevSlide: () => void;
-
-    /**
-     * startAuto Starts the auto show. Provide an argument false to prevent the auto controls from being updated.
-     * 
-     * example:
-     * slider = $('.bxslider').bxSlider();
-     * slider.startAuto();
-     */
-    startAuto: (preventControlUpdate?: boolean) => void;
-
-    /**
-     * stopAuto Stops the auto show. Provide an argument false to prevent the auto controls from being updated.
-     * 
-     * example:
-     * slider = $('.bxslider').bxSlider();
-     * slider.stopAuto();
-     */
-    stopAuto: (preventControlUpdate?: boolean) => void;
-
-    /**
-     * getCurrentSlide Returns the current active slide
-     * 
-     * example:
-     * slider = $('.bxslider').bxSlider();
-     * var current = slider.getCurrentSlide();
-     */
-    getCurrentSlide: () => number;
-
-    /**
-     * getSlideCount Returns the total number of slides in the slider
-     * 
-     * example:
-     * slider = $('.bxslider').bxSlider();
-     * var slideQty = slider.getSlideCount();
-     */
-    getSlideCount: () => number;
-
-    /**
-     * redrawSlider Redraw the slider. Useful when needing to redraw a hidden slider after it is unhidden.
-     * 
-     * example:
-     * slider = $('.bxslider').bxSlider();
-     * slider.redrawSlider();
-     */
-    redrawSlider: () => void;
-
-    /**
-     * reloadSlider Reload the slider. Useful when adding slides on the fly. Accepts an optional settings object. See here for an example.
-     * 
-     * example:
-     * slider = $('.bxslider').bxSlider();
-     * slider.reloadSlider();
-     */
-    reloadSlider: (settings?: bxSliderOptions) => void;
-
-    /**
-     * destroySlider Destroy the slider. This reverts all slider elements back to their original state (before calling the slider).
-     * 
-     * example:
-     * slider = $('.bxslider').bxSlider();
-     * slider.destroySlider();
-     */
-    destroySlider: () => void;
-}
-
-interface JQuery {
-    /**
-     * Creates a bxSlider from the current element.
-     * @param options
-     */
-    bxSlider(options?:bxSliderOptions): bxSlider;
-}
\ No newline at end of file
diff --git a/dw-bxslider-4/index.d.ts b/dw-bxslider-4/index.d.ts
new file mode 100644
index 0000000000..eb33295767
--- /dev/null
+++ b/dw-bxslider-4/index.d.ts
@@ -0,0 +1,623 @@
+// Type definitions for bxSlider v4.2.5
+// Project: https://github.com/stevenwanderski/bxslider-4
+// Definitions by: Piotr Sałkowski <https://github.com/namerci>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="jquery"/>
+
+interface bxSliderOptions {
+    /**
+     * mode Type of transition between slides
+     * 
+     * default: 'horizontal'
+     * options: 'horizontal', 'vertical', 'fade'
+     */
+    mode?: string
+
+    /**
+     * speed Slide transition duration (in ms)
+     * 
+     * default: 500
+     * options: integer
+     */
+    speed?: number
+
+    /**
+     * slideMargin Margin between each slide
+     * 
+     * default: 0
+     * options: integer
+     */
+    slideMargin?: number
+
+    /**
+     * startSlide Starting slide index (zero-based)
+     * 
+     * default: 0
+     * options: integer
+     */
+    startSlide?: number
+
+    /**
+     * randomStart Start slider on a random slide
+     * 
+     * default: false
+     * options: boolean (true / false)
+     */
+    randomStart?: boolean
+
+    /**
+     * slideSelector Element to use as slides (ex. 'div.slide').
+     * Note: by default, bxSlider will use all immediate children of the slider element
+     * 
+     * default: ''
+     * options: jQuery selector
+     */
+    slideSelector?: string
+
+    /**
+     * infiniteLoop If true, clicking "Next" while on the last slide will transition to the first slide and vice-versa
+     * 
+     * default: true
+     * options: boolean (true / false)
+     */
+    infiniteLoop?: boolean
+
+    /**
+     * hideControlOnEnd If true, "Prev" and "Next" controls will receive a class disabled when slide is the first or the last
+     * Note: Only used when infiniteLoop: false
+     * 
+     * default: false
+     * options: boolean (true / false)
+     */
+    hideControlOnEnd?: boolean
+
+    /**
+     * easing The type of "easing" to use during transitions. If using CSS transitions, include a value for the transition-timing-function property. If not using CSS transitions, you may include plugins/jquery.easing.1.3.js for many options.
+     * See http://gsgd.co.uk/sandbox/jquery/easing/ for more info.
+     * 
+     * default: null
+     * options: if using CSS: 'linear', 'ease', 'ease-in', 'ease-out', 'ease-in-out', 'cubic-bezier(n,n,n,n)'. If not using CSS: 'swing', 'linear' (see the above file for more options)
+     */
+    easing?: string
+
+    /**
+     * captions Include image captions. Captions are derived from the image's title attribute
+     * 
+     * default: false
+     * options: boolean (true / false)
+     */
+    captions?: boolean
+
+    /**
+     * ticker Use slider in ticker mode (similar to a news ticker)
+     * 
+     * default: false
+     * options: boolean (true / false)
+     */
+    ticker?: boolean
+
+    /**
+     * tickerHover Ticker will pause when mouse hovers over slider. Note: this functionality does NOT work if using CSS transitions!
+     * 
+     * default: false
+     * options: boolean (true / false)
+     */
+    tickerHover?: boolean
+
+    /**
+     * adaptiveHeight Dynamically adjust slider height based on each slide's height
+     * 
+     * default: false
+     * options: boolean (true / false)
+     */
+    adaptiveHeight?: boolean
+
+    /**
+     * adaptiveHeightSpeed Slide height transition duration (in ms). Note: only used if adaptiveHeight: true
+     * 
+     * default: 500
+     * options: integer
+     */
+    adaptiveHeightSpeed?: number
+
+    /**
+     * video If any slides contain video, set this to true. Also, include plugins/jquery.fitvids.js
+     * See http://fitvidsjs.com/ for more info
+     * 
+     * default: false
+     * options: boolean (true / false)
+     */
+    video?: boolean
+
+    /**
+     * responsive Enable or disable auto resize of the slider. Useful if you need to use fixed width sliders.
+     * 
+     * default: true
+     * options: boolean (true / false)
+     */
+    responsive?: boolean
+
+    /**
+     * useCSS If true, CSS transitions will be used for horizontal and vertical slide animations (this uses native hardware acceleration). If false, jQuery animate() will be used.
+     * 
+     * default: true
+     * options: boolean (true / false)
+     */
+    useCSS?: boolean
+
+    /**
+     * preloadImages If 'all', preloads all images before starting the slider. If 'visible', preloads only images in the initially visible slides before starting the slider (tip: use 'visible' if all slides are identical dimensions)
+     * 
+     * default: 'visible'
+     * options: 'all', 'visible'
+     */
+    preloadImages?: string
+
+    /**
+     * touchEnabled If true, slider will allow touch swipe transitions
+     * 
+     * default: true
+     * options: boolean (true / false)
+     */
+    touchEnabled?: boolean
+
+    /**
+     * swipeThreshold Amount of pixels a touch swipe needs to exceed in order to execute a slide transition. Note: only used if touchEnabled: true
+     * 
+     * default: 50
+     * options: integer
+     */
+    swipeThreshold?: number
+
+    /**
+     * oneToOneTouch If true, non-fade slides follow the finger as it swipes
+     * 
+     * default: true
+     * options: boolean (true / false)
+     */
+    oneToOneTouch?: boolean
+
+    /**
+     * preventDefaultSwipeX If true, touch screen will not move along the x-axis as the finger swipes
+     * 
+     * default: true
+     * options: boolean (true / false)
+     */
+    preventDefaultSwipeX?: boolean
+
+    /**
+     * preventDefaultSwipeY If true, touch screen will not move along the y-axis as the finger swipes
+     * 
+     * default: false
+     * options: boolean (true / false)
+     */
+    preventDefaultSwipeY?: boolean
+
+    /**
+     * wrapperClass Class to wrap the slider in. Change to prevent from using default bxSlider styles.
+     * 
+     * default: 'bx-wrapper'
+     * options: string
+     */
+    wrapperClass?: string
+
+    /**
+     * pager If true, a pager will be added
+     * 
+     * default: true
+     * options: boolean (true / false)
+     */
+    pager?: boolean
+
+    /**
+     * pagerType If 'full', a pager link will be generated for each slide. If 'short', a x / y pager will be used (ex. 1 / 5)
+     * 
+     * default: 'full'
+     * options: 'full', 'short'
+     */
+    pagerType?: string
+
+    /**
+     * pagerShortSeparator If pagerType: 'short', pager will use this value as the separating character
+     * 
+     * default: ' / '
+     * options: string
+     */
+    pagerShortSeparator?: string
+
+    /**
+     * pagerSelector Element used to populate the populate the pager. By default, the pager is appended to the bx-viewport
+     * 
+     * default: ''
+     * options: jQuery selector
+     */
+    pagerSelector?: string
+
+    /**
+     * pagerCustom Parent element to be used as the pager. Parent element must contain a <a data-slide-index="x"> element for each slide. See example here. Not for use with dynamic carousels.
+     * 
+     * default: null
+     * options: jQuery selector
+     */
+    pagerCustom?: string
+
+    /**
+     * buildPager If supplied, function is called on every slide element, and the returned value is used as the pager item markup.
+     * See examples for detailed implementation
+     * 
+     * default: null
+     * options: functoin(slideIndex)
+     */
+     buildPager?: (slideIndex: number) => void;
+
+
+    /**
+     * controls If true, "Next" / "Prev" controls will be added
+     * 
+     * default: true
+     * options: boolean (true / false)
+     */
+    controls?: boolean
+
+    /**
+     * nextText Text to be used for the "Next" control
+     * 
+     * default: 'Next'
+     * options: string
+     */
+    nextText?: string
+
+    /**
+     * prevText Text to be used for the "Prev" control
+     * 
+     * default: 'Prev'
+     * options: string
+     */
+    prevText?: string
+
+    /**
+     * nextSelector Element used to populate the "Next" control
+     * 
+     * default: null
+     * options: jQuery selector
+     */
+    nextSelector?: string
+
+    /**
+     * prevSelector Element used to populate the "Prev" control
+     * 
+     * default: null
+     * options: jQuery selector
+     */
+    prevSelector?: string
+
+    /**
+     * autoControls If true, "Start" / "Stop" controls will be added
+     * 
+     * default: false
+     * options: boolean (true / false)
+     */
+    autoControls?: boolean
+
+    /**
+     * startText Text to be used for the "Start" control
+     * 
+     * default: 'Start'
+     * options: string
+     */
+    startText?: string
+
+    /**
+     * stopText Text to be used for the "Stop" control
+     * 
+     * default: 'Stop'
+     * options: string
+     */
+    stopText?: string
+
+    /**
+     * autoControlsCombine When slideshow is playing only "Stop" control is displayed and vice-versa
+     * 
+     * default: false
+     * options: boolean (true / false)
+     */
+    autoControlsCombine?: boolean
+
+    /**
+     * autoControlsSelector Element used to populate the auto controls
+     * 
+     * default: null
+     * options: jQuery selector
+     */
+    autoControlsSelector?: string
+
+    /**
+     * keyboardEnabled Allows for keyboard control of visible slider. Keypress ignored if slider not visible.
+     * 
+     * default: false
+     * options: boolean (true / false)
+     */
+    keyboardEnabled?: boolean
+
+    /**
+     * auto Slides will automatically transition
+     * 
+     * default: false
+     * options: boolean (true / false)
+     */
+    auto?: boolean
+
+    /**
+     * stopAutoOnClick Auto will stop on interaction with controls
+     * 
+     * default: false
+     * options: boolean (true / false)
+     */
+    stopAutoOnClick?: boolean
+
+    /**
+     * pause The amount of time (in ms) between each auto transition
+     * 
+     * default: 4000
+     * options: integer
+     */
+    pause?: number
+
+    /**
+     * autoStart Auto show starts playing on load. If false, slideshow will start when the "Start" control is clicked
+     * 
+     * default: true
+     * options: boolean (true / false)
+     */
+    autoStart?: boolean
+
+    /**
+     * autoDirection The direction of auto show slide transitions
+     * 
+     * default: 'next'
+     * options: 'next', 'prev'
+     */
+    autoDirection?: string
+
+    /**
+     * autoHover Auto show will pause when mouse hovers over slider
+     * 
+     * default: false
+     * options: boolean (true / false)
+     */
+    autoHover?: boolean
+
+    /**
+     * autoDelay Time (in ms) auto show should wait before starting
+     * 
+     * default: 0
+     * options: integer
+     */
+    autoDelay?: number
+
+    /**
+     * minSlides The minimum number of slides to be shown. Slides will be sized down if carousel becomes smaller than the original size.
+     * 
+     * default: 1
+     * options: integer
+     */
+    minSlides?: number
+
+    /**
+     * maxSlides The maximum number of slides to be shown. Slides will be sized up if carousel becomes larger than the original size.
+     * 
+     * default: 1
+     * options: integer
+     */
+    maxSlides?: number
+
+    /**
+     * moveSlides The number of slides to move on transition. This value must be >= minSlides, and <= maxSlides. If zero (default), the number of fully-visible slides will be used.
+     * 
+     * default: 0
+     * options: integer
+     */
+    moveSlides?: number
+
+    /**
+     * slideWidth The width of each slide. This setting is required for all horizontal carousels!
+     * 
+     * default: 0
+     * options: integer
+     */
+    slideWidth?: number
+
+    /**
+     * shrinkItems The Carousel will only show whole items and shrink the images to fit the viewport based on maxSlides/MinSlides.
+     * 
+     * default: false
+     * options: boolean (true / false)
+     */
+    shrinkItems?: boolean
+
+    /**
+     * ariaLive Adds Aria Live attribute to slider.
+     * 
+     * default: true
+     * options: boolean (true / false)
+     */
+    ariaLive?: boolean
+
+    /**
+     * ariaHidden Adds Aria Hidden attribute to any nonvisible slides.
+     * 
+     * default: true
+     * options: boolean (true / false)
+     */
+    ariaHidden?: boolean
+
+    /**
+     * onSliderLoad Executes immediately after the slider is fully loaded
+     * 
+     * default: function(){}
+     * options: function(currentIndex){ // your code here }
+     * arguments:
+     *   currentIndex: element index of the current slide
+     */
+    onSliderLoad?: (currentIndex?: number) => void;
+
+    /**
+     * onSliderResize Executes immediately after the slider is resized
+     * 
+     * default: function(){}
+     * options: function(currentIndex){ // your code here }
+     * arguments:
+     *   currentIndex: element index of the current slide
+     */
+    onSliderResize?: (currentIndex?: number) => void;
+
+    /**
+     * onSlideBefore Executes immediately before each slide transition.
+     * 
+     * default: function(){}
+     * options: function($slideElement, oldIndex, newIndex){ // your code here }
+     * arguments:
+     *   $slideElement: jQuery element of the destination element
+     *   oldIndex: element index of the previous slide (before the transition)
+     *   newIndex: element index of the destination slide (after the transition)
+     */
+    onSlideBefore?: ($slideElement?: JQuery, oldIndex?: number, newIndex?: number) => void;
+
+    /**
+     * onSlideAfter Executes immediately after each slide transition. Function argument is the current slide element (when transition completes).
+     * 
+     * default: function(){}
+     * options: function($slideElement, oldIndex, newIndex){ // your code here }
+     * arguments:
+     *   $slideElement: jQuery element of the destination element
+     *   oldIndex: element index of the previous slide (before the transition)
+     *   newIndex: element index of the destination slide (after the transition)
+     */
+    onSlideAfter?: ($slideElement?: JQuery, oldIndex?: number, newIndex?: number) => void;
+
+    /**
+     * onSlideNext Executes immediately before each "Next" slide transition. Function argument is the target (next) slide element.
+     * 
+     * default: function(){}
+     * options: function($slideElement, oldIndex, newIndex){ // your code here }
+     * arguments:
+     *   $slideElement: jQuery element of the destination element
+     *   oldIndex: element index of the previous slide (before the transition)
+     *   newIndex: element index of the destination slide (after the transition)
+     */
+    onSlideNext?: ($slideElement?: JQuery, oldIndex?: number, newIndex?: number) => void;
+
+    /**
+     * onSlidePrev Executes immediately before each "Prev" slide transition. Function argument is the target (prev) slide element.
+     * 
+     * default: function(){}
+     * options: function($slideElement, oldIndex, newIndex){ // your code here }
+     * arguments:
+     *   $slideElement: jQuery element of the destination element
+     *   oldIndex: element index of the previous slide (before the transition)
+     *   newIndex: element index of the destination slide (after the transition)
+     */
+    onSlidePrev?: ($slideElement?: JQuery, oldIndex?: number, newIndex?: number) => void;
+}
+
+interface bxSlider {
+
+    /**
+     * goToSlide Performs a slide transition to the supplied slide index (zero-based)
+     * 
+     * example:
+     * slider = $('.bxslider').bxSlider();
+     * slider.goToSlide(3);
+     */
+    goToSlide: (index: number) => void;
+
+    /**
+     * goToNextSlide Performs a "Next" slide transition
+     * 
+     * example:
+     * slider = $('.bxslider').bxSlider();
+     * slider.goToNextSlide();
+     */
+    goToNextSlide: () => void;
+
+    /**
+     * goToPrevSlide Performs a "Prev" slide transition
+     * 
+     * example:
+     * slider = $('.bxslider').bxSlider();
+     * slider.goToPrevSlide();
+     */
+    goToPrevSlide: () => void;
+
+    /**
+     * startAuto Starts the auto show. Provide an argument false to prevent the auto controls from being updated.
+     * 
+     * example:
+     * slider = $('.bxslider').bxSlider();
+     * slider.startAuto();
+     */
+    startAuto: (preventControlUpdate?: boolean) => void;
+
+    /**
+     * stopAuto Stops the auto show. Provide an argument false to prevent the auto controls from being updated.
+     * 
+     * example:
+     * slider = $('.bxslider').bxSlider();
+     * slider.stopAuto();
+     */
+    stopAuto: (preventControlUpdate?: boolean) => void;
+
+    /**
+     * getCurrentSlide Returns the current active slide
+     * 
+     * example:
+     * slider = $('.bxslider').bxSlider();
+     * var current = slider.getCurrentSlide();
+     */
+    getCurrentSlide: () => number;
+
+    /**
+     * getSlideCount Returns the total number of slides in the slider
+     * 
+     * example:
+     * slider = $('.bxslider').bxSlider();
+     * var slideQty = slider.getSlideCount();
+     */
+    getSlideCount: () => number;
+
+    /**
+     * redrawSlider Redraw the slider. Useful when needing to redraw a hidden slider after it is unhidden.
+     * 
+     * example:
+     * slider = $('.bxslider').bxSlider();
+     * slider.redrawSlider();
+     */
+    redrawSlider: () => void;
+
+    /**
+     * reloadSlider Reload the slider. Useful when adding slides on the fly. Accepts an optional settings object. See here for an example.
+     * 
+     * example:
+     * slider = $('.bxslider').bxSlider();
+     * slider.reloadSlider();
+     */
+    reloadSlider: (settings?: bxSliderOptions) => void;
+
+    /**
+     * destroySlider Destroy the slider. This reverts all slider elements back to their original state (before calling the slider).
+     * 
+     * example:
+     * slider = $('.bxslider').bxSlider();
+     * slider.destroySlider();
+     */
+    destroySlider: () => void;
+}
+
+interface JQuery {
+    /**
+     * Creates a bxSlider from the current element.
+     * @param options
+     */
+    bxSlider(options?:bxSliderOptions): bxSlider;
+}
\ No newline at end of file
diff --git a/dw-bxslider-4/tsconfig.json b/dw-bxslider-4/tsconfig.json
new file mode 100644
index 0000000000..63cca8919d
--- /dev/null
+++ b/dw-bxslider-4/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dw-bxslider-4-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dymo-label-framework/dymo-label-framework-tests.ts b/dymo-label-framework/dymo-label-framework-tests.ts
index b64625eaab..3160023964 100644
--- a/dymo-label-framework/dymo-label-framework-tests.ts
+++ b/dymo-label-framework/dymo-label-framework-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="dymo-label-framework.d.ts" />
+
 
 var f = dymo.label.framework;
 
diff --git a/dymo-label-framework/dymo-label-framework.d.ts b/dymo-label-framework/index.d.ts
similarity index 100%
rename from dymo-label-framework/dymo-label-framework.d.ts
rename to dymo-label-framework/index.d.ts
diff --git a/dymo-label-framework/tsconfig.json b/dymo-label-framework/tsconfig.json
new file mode 100644
index 0000000000..3fc88c61b6
--- /dev/null
+++ b/dymo-label-framework/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dymo-label-framework-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/dynatable/dynatable-tests.ts b/dynatable/dynatable-tests.ts
index 25f3fb2572..acba41092a 100644
--- a/dynatable/dynatable-tests.ts
+++ b/dynatable/dynatable-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="dynatable.d.ts"/>
-
+/// <reference types="jquery"/>
 
 // Using the global setup option
 // =============================
diff --git a/dynatable/dynatable.d.ts b/dynatable/dynatable.d.ts
deleted file mode 100644
index 7b8899d345..0000000000
--- a/dynatable/dynatable.d.ts
+++ /dev/null
@@ -1,1155 +0,0 @@
-// Type definitions for jquery.dynatable v0.3.1
-// Project: http://www.dynatable.com/
-// Definitions by: François Massart <https://github.com/francoismassart/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface JQuery {
-    /**
-    * @constructor
-    */
-    dynatable: JQueryDynatable.Dynatable;
-}
-
-/** Static members of jQuery (those on $ and jQuery themselves) */
-interface JQueryStatic {
-    /**
-     * Global dynatable plugin setting defaults
-     *
-     * @param options The configuration options to be set globally
-     */
-    dynatableSetup(options: JQueryDynatable.Options): void;
-}
-
-declare namespace JQueryDynatable {
-    interface Features {
-        /**
-         * Enable the pagination feature
-         *
-         * @default true
-         */
-        paginate?: boolean;
-        /**
-         * Enable the sorting feature
-         *
-         * @default true
-         */
-        sort?: boolean;
-        /**
-         * Enable the pushState feature
-         * Used to update the page URL parameters and cache the query result for the browser's forward- and back-buttons
-         *
-         * @default true
-         */
-        pushState?: boolean;
-        /**
-         * Enable the search feature
-         *
-         * @default true
-         */
-        search?: boolean;
-        /**
-         * Enable the recordCount feature
-         * When pagination is enabled, dynatable will also show the currently displayed records and the total number of records
-         *
-         * @default true
-         */
-        recordCount?: boolean;
-        /**
-         * Enable the perPageSelect feature
-         * The perPageSelect will insert a form control filled with the options from `perPageOptions`
-         *
-         * @default true
-         */
-        perPageSelect?: boolean;
-    }
-    interface Column {
-        index: number;
-        label: string;
-        /**
-         * Determined by the `data-dynatable-column` or using the `defaultColumnIdStyle`
-         *
-         * @example
-         * // Using the `defaultColumnIdStyle` of `camelCase`
-         * // `<th>Favorite Music</th>` would be translated into the id `favoriteMusic`
-         */
-        id: string;
-        /**
-         * Function that returns the cell data to be written inside the cell
-         *
-         * @param record A data object representing the current line of data
-         * @return The data for the current cell
-         *
-         * @example
-         * function exampleAttributeWriter(record) {
-         *     return record[this.id];
-         * };
-         */
-        attributeWriter: (record: any) => any;
-        /**
-         * Function that interprets the cell html data in order to convert it into data
-         *
-         * @param cell A html node of the target cell
-         * @param record A data object representing the current line of data
-         * @return the html content for the current cell
-         *
-         * @example
-         * function exampleAttributeReader(cell, record) {
-         *     return $(cell).html();
-         * };
-         */
-        attributeReader: (cell: Element, record: any) => string;
-        /** List of ids for sorting, generated by the plugin, can be tweaked by using `data-dynatable-sorts` */
-        sorts: Array<string>;
-        hidden: boolean;
-        /**
-         * Detected internally by dynatable.
-         * Possible values are:
-         *
-         * @enum('left', 'right', 'center', 'justify', 'initial', 'inherit')
-         */
-        textAlign: string;
-    }
-    interface Table {
-        /**
-         * By default, dynatable converts headings to JSON attribute names using:
-         *
-         * @enum('camelCase', 'trimDash', 'dashed', 'underscore', 'lowercase')
-         * @default 'camelCase'
-         * @see http://www.dynatable.com/#converting-attribute-names
-         *
-         * @example
-         * // Given the html `<th>Favorite Music</th>` column header
-         * // `camelCase` would translate it to id `favoriteMusic`
-         * // `trimDash` would translate it to id `Favorite-Music`
-         * // `dashed` would translate it to id `favorite-music`
-         * // `underscore` would translate it to id `favorite_music`
-         * // `lowercase` would translate it to id `favorite music`
-         */
-        defaultColumnIdStyle?: string;
-        /** Generated internally by the plugin, will be reset by the DomColumns at init */
-        columns?: Array<JQueryDynatable.Column>;
-        /**
-         * Selector used by dynatable in order to find the table header row
-         *
-         * @default 'thead tr'
-         */
-        headRowSelector?: string;
-        /**
-         * Selector used by dynatable in order to find the table body rows
-         *
-         * @default 'tbody tr'
-         */
-        bodyRowSelector?: string;
-        /**
-         * Optional classname that can be added by dynatable to the header cells
-         *
-         * @default null
-         */
-        headRowClass?: string;
-    }
-    interface Inputs {
-        /**
-         * Allows you to provide an array of jQuery objects which point to our filter inputs.
-         * The inputs musts have a name attribute value matching a columnId in order to work.
-         * Input values must strictly match the data from the cell...
-         * Searching for "Lux" won't show "Luxembourg" event if it starts if the same letters!
-         *
-         * @default null
-         * @see http://www.dynatable.com/#querying
-         *
-         * @example
-         * $('#search-year')
-         */
-        queries?: JQuery;
-        /**
-         * @todo Find out how this `inputs.sorts` setting is useful + show an example
-         * @default null
-         * @see http://www.dynatable.com/#sorting
-         */
-        sorts?: any;
-        /**
-         * Allows you to define the accepted modifier keys to trigger a multisort action
-         *
-         * @default ['ctrlKey', 'shiftKey', 'metaKey']
-         * @see https://en.wikipedia.org/wiki/Modifier_key
-         */
-        multisort?: Array<string>;
-        /**
-         * @todo Find out how this `inputs.page` setting is useful + show an example
-         * @default null
-         */
-        page?: any;
-        /**
-         * The events attached to the search/filtering inputs elements
-         *
-         * @default 'blur change'
-         */
-        queryEvent?: string;
-        /**
-         * The jQuery object pointing to a target where to insert the recordCount html
-         *
-         * @default null
-         *
-         * @example
-         * $('#chart-status-text')
-         */
-        recordCountTarget?: JQuery;
-        /**
-         * Determines where the recordCount is inserted
-         *
-         * @enum('before', 'after')
-         * @default 'after'
-         * @see http://api.jquery.com/category/manipulation/dom-insertion-outside/
-         */
-        recordCountPlacement?: string;
-        /**
-         * The target inside next to which the pagination block will be inserted (before or after).
-         * You can use a selector string, an Element or a JQuery.
-         *
-         * @default null
-         */
-        paginationLinkTarget?: string|Element|JQuery;
-        /**
-         * Determines where the pagination links are inserted
-         *
-         * @enum('before', 'after')
-         * @default 'after'
-         * @see http://api.jquery.com/category/manipulation/dom-insertion-outside/
-         */
-        paginationLinkPlacement?: string;
-        /**
-         * The classname to be injected on the `<ul>` containing the pagination
-         *
-         * @default 'dynatable-pagination-links'
-         */
-        paginationClass?: string;
-        /**
-         * The classname to be injected on every pagination link
-         *
-         * @default 'dynatable-page-link'
-         */
-        paginationLinkClass?: string;
-        /**
-         * The classname to be injected on the previous page link
-         *
-         * @default 'dynatable-page-prev'
-         */
-        paginationPrevClass?: string;
-        /**
-         * The classname to be injected on the next page link
-         *
-         * @default 'dynatable-page-next'
-         */
-        paginationNextClass?: string;
-        /**
-         * The classname to be injected on the current page link
-         *
-         * @default 'dynatable-active-page'
-         */
-        paginationActiveClass?: string;
-        /**
-         * The classname to be injected on the disabled page links
-         *
-         * @default 'dynatable-disabled-page'
-         */
-        paginationDisabledClass?: string;
-        /**
-         * Text content for the previous page link
-         *
-         * @default 'Previous'
-         */
-        paginationPrev?: string;
-        /**
-         * Text content for the next page link
-         *
-         * @default 'Next'
-         */
-        paginationNext?: string;
-        /**
-         * Define the number of page number links shown inside the pagination
-         *
-         * @default [1,2,2,1]
-         */
-        paginationGap?: Array<number>;
-        /**
-         * The target next to which the search block will be inserted (before or after).
-         * You can use a selector string, an Element or a JQuery.
-         *
-         * @default null
-         */
-        searchTarget?: string|Element|JQuery;
-        /**
-         * Determines where the search field is inserted
-         *
-         * @enum('before', 'after')
-         * @default 'before'
-         * @see http://api.jquery.com/category/manipulation/dom-insertion-outside/
-         */
-        searchPlacement?: string;
-        /**
-         * Text preceding the search field
-         *
-         * @default 'Search: '
-         */
-        searchText?: string;
-        /**
-         * The target next to which the per page pagination block will be inserted (before or after).
-         * You can use a selector string, an Element or a jQuery object.
-         *
-         * @default null
-         */
-        perPageTarget?: string|Element|JQuery;
-        /**
-         * Determines where the perPage menu is inserted
-         *
-         * @enum('before', 'after')
-         * @default 'before'
-         * @see http://api.jquery.com/category/manipulation/dom-insertion-outside/
-         */
-        perPagePlacement?: string;
-        /**
-         * Text content preceding the items per page <select>
-         *
-         * @default 'Show: '
-         */
-        perPageText?: string;
-        /**
-         * Text content introducing the pagination
-         *
-         * @default 'Pages: '
-         */
-        pageText?: string;
-        /**
-         * Text content used inside the recordsCount
-         *
-         * @default '{pageLowerBound} to {pageUpperBound} of'
-         */
-        recordCountPageBoundTemplate?: string;
-        /**
-         * Text content used inside the recordsCount
-         *
-         * @default '{recordsShown} of'
-         */
-        recordCountPageUnboundedTemplate?: string;
-        /**
-         * Text content used inside the recordsCount
-         *
-         * @default '{recordsQueryCount} {collectionName}'
-         */
-        recordCountTotalTemplate?: string;
-        /**
-         * Text content used inside the recordsCount
-         *
-         * @default ' (filtered from {recordsTotal} total records)'
-         */
-        recordCountFilteredTemplate?: string;
-        /**
-         * Text content used inside the recordsCount
-         *
-         * @default 'Showing '
-         */
-        recordCountText?: string;
-        /**
-         * Text content used inside the recordsCount
-         *
-         * @default '{text} {pageTemplate} {totalTemplate} {filteredTemplate}'
-         */
-        recordCountTextTemplate?: string;
-        /**
-         * Text content used inside the recordsCount
-         *
-         * @default '<span id="dynatable-record-count-{elementId}" class="dynatable-record-count">{textTemplate}</span>'
-         */
-        recordCountTemplate?: string;
-        /**
-         * Text content injected inside the processingIndicator
-         *
-         * @default 'Processing...'
-         */
-        processingText?: string;
-    }
-    interface Dataset {
-        /**
-         * Enable the `ajax` mode
-         *
-         * @default false
-         */
-        ajax?: boolean;
-        /**
-         * A string containing the URL to which the request is sent.
-         *
-         * @default null
-         */
-        ajaxUrl?: string;
-        /**
-         * Defining the `cache` setting for the jQuery's ajax call...
-         * true or false for dataType 'script' and 'jsonp'
-         *
-         * @default null
-         * @see http://api.jquery.com/jQuery.ajax
-         */
-        ajaxCache?: boolean;
-        /**
-         * Send the ajax request automatically
-         *
-         * @default false
-         */
-        ajaxOnLoad?: boolean;
-        /**
-         * Defining the `method` setting for the jQuery's ajax call...
-         * The HTTP method to use for the request (e.g. "POST", "GET", "PUT").
-         *
-         * @enum('GET', 'POST')
-         * @default 'GET'
-         * @todo Check if other methods could be used... ('GET', 'PUT', 'HEAD', 'POST', 'PATCH', 'TRACE', 'DELETE', 'CONNECT', 'OPTIONS', 'IS_AWARE', 'IS_EAGER', 'PROPFIND', 'IS_OPTIONAL', 'IS_REQUIRED', 'IS_CONSTRUCTOR', 'IS_INSTANTIATOR')
-         */
-        ajaxMethod?: string;
-        /**
-         * The type of data that you're expecting back from the server.
-         * If none is specified, jQuery will try to infer it based on the MIME type of the response...
-         *
-         * @enum('xml', 'html', 'script', 'json', 'jsonp', 'text')
-         * @default 'json'
-         * @see http://api.jquery.com/jQuery.ajax
-         */
-        ajaxDataType?: string;
-        /**
-         * Name of the property in the dataset that contains the total number of records
-         *
-         * @default null
-         */
-        totalRecordCount?: string;
-        /**
-         * Object describing the current request's filtering
-         *
-         * @default {}
-         */
-        queries?: Object;
-        /**
-         * Name of the property in the dataset that contains the total number of records for the current query
-         *
-         * @default null
-         */
-        queryRecordCount?: string;
-        /**
-         * The page represented in the for the current dataset
-         *
-         * @default null
-         */
-        page?: number;
-        /**
-         * The default number of items loaded per page
-         *
-         * @default 10
-         */
-        perPageDefault?: number;
-        /**
-         * The default options available in the perPage menu built by dynatable
-         *
-         * @default [10,20,50,100]
-         */
-        perPageOptions?: Array<number>;
-        /**
-         * Object describing the current request's sorting
-         *
-         * @default {}
-         */
-        sorts?: Object;
-        /**
-         * The sorting keys (generated by dynatable)
-         *
-         * @default null
-         */
-        sortsKeys?: Array<string>;
-        /**
-         * The sorting types (generated by dynatable)
-         * It will hosts the type of object to sort (string, number, etc.)
-         *
-         * @default {}
-         */
-        sortTypes?: Object;
-        /**
-         * The core data (generated or loaded by dynatable)
-         *
-         * @default null
-         */
-        records?: any;
-    }
-    interface Writers {
-        /**
-         * Function that write the data inside each row
-         *
-         * @param rowIndex The index of the current row (from 0 to the perPage value)
-         * @param record A data object containing all the data for the current record (current line)
-         * @param columns  An array of columns
-         * @param cellWriter A reference to the function responsible for writing inside the cell
-         * @return the data for the current cell
-         *
-         * @default defaultRowWriter
-         *
-         * @example
-         * function exampleRowWriter(rowIndex, record, columns, cellWriter) {
-         *     var tr = '';
-         *     // grab the record's attribute for each column
-         *     for (var i = 0, len = columns.length; i < len; i++) {
-         *         tr += cellWriter(columns[i], record);
-         *     }
-         *     return '<tr>' + tr + '</tr>';
-         * };
-         */
-        _rowWriter?: (rowIndex: number, record: any, columns: Array<Column>, cellWriter: Function) => string;
-        /**
-         * Function that returns the HTML code that will be injected for the cell
-         *
-         * @param column The column object describing the config for the current column
-         * @param record A data object representing the current line of data
-         * @return the data for the current cell
-         *
-         * @default defaultCellWriter
-         *
-         * @example
-         * function exampleCellWriter(column, record) {
-         *     var html = column.attributeWriter(record),
-         *     td = '<td';
-         *
-         *     if (column.hidden || column.textAlign) {
-         *         td += ' style="';
-         *
-         *         // keep cells for hidden column headers hidden
-         *         if (column.hidden) {
-         *             td += 'display: none;';
-         *         }
-         *
-         *         // keep cells aligned as their column headers are aligned
-         *         if (column.textAlign) {
-         *             td += 'text-align: ' + column.textAlign + ';';
-         *         }
-         *
-         *         td += '"';
-         *     }
-         *
-         *     return td + '>' + html + '</td>';
-         * };
-         */
-        _cellWriter?: (column: Column, record: any) => string;
-        /**
-         * Function that returns the cell data to be written inside the cell
-         *
-         * @param record A data object representing the current line of data
-         * @return the data for the current cell
-         *
-         * @default defaultAttributeWriter
-         *
-         * @example
-         * function exampleAttributeWriter(record) {
-         *     // `this` is the column object in settings.columns
-         *    return record[this.id];
-         * };
-         */
-        _attributeWriter?: (record: any) => any;
-    }
-    interface Readers {
-        /**
-         * Function that interprets the row into data
-         *
-         * @param index The index of the current row (from 0 to the perPage value)
-         * @param thisRef
-         * @param record
-         * @return the data for the current row
-         *
-         * @default null
-         *
-         * @example
-         * function exampleRowReader(index, this, record) {
-         *     //...
-         * };
-         */
-        _rowReader?: (index: number, thisRef: any, record: any) => any;
-        /**
-         * Function that interprets the cell into data
-         *
-         * @param cell A html node of the target cell
-         * @param record A data object representing the current line of data
-         * @return the data for the current cell
-         *
-         * @default defaultAttributeReader
-         *
-         * @example
-         * function exampleAttributeReader(cell, record) {
-         *    return $(cell).html();
-         * };
-         */
-        _attributeReader?: (cell: Element, record: any) => any;
-    }
-    interface Params {
-        /**
-         * @default 'dynatable'
-         */
-        dynatable?: string;
-        /**
-         * @default 'queries'
-         */
-        queries?: string;
-        /**
-         * @default 'sorts'
-         */
-        sorts?: string;
-        /**
-         * @default 'page'
-         */
-        page?: string;
-        /**
-         * @default 'perPage'
-         */
-        perPage?: string;
-        /**
-         * @default 'offset'
-         */
-        offset?: string;
-        /**
-         * @default 'records'
-         */
-        records?: string;
-        /**
-         * @default null
-         */
-        record?: Object;
-        /**
-         * @default 'queryRecordCount'
-         */
-        queryRecordCount?: string;
-        /**
-         * @default 'totalRecordCount'
-         */
-        totalRecordCount?: string;
-    }
-    interface Options {
-        features?: Features;
-        table?: Table;
-        inputs?: Inputs;
-        dataset?: Dataset;
-        writers?: Writers;
-        readers?: Readers;
-        params?: Params;
-    }
-    interface DOM {
-        /**
-         * Manually update the dom with the current record set...
-         * This can be useful after multiple calls to `domcolumns.add()` with `skipUpdate` set to true.
-         * This way we improve performance by generating the DOM only once.
-         */
-        update(): void;
-    }
-    interface DOMColumns {
-        /**
-         * Add a new column at runtime
-         *
-         * @param $column A jQuery object containing the html markup for the `th`
-         * @param position The position index indicating where we want to insert the new column
-         * @param skipAppend A boolean allowing to skip the appending of the column header to table
-         * @param skipUpdate A boolean allowing to skip the call to `dom.update()`
-         */
-        add($column: JQuery, position: number, skipAppend?: boolean, skipUpdate?: boolean): void;
-        /**
-         * Add several `data-` attributes on the provided `$cell`
-         *
-         * @param $cell A jQuery object pointing to the target cell
-         * @return the modified jQuery object `$cell`
-         */
-        attachGeneratedAttributes($cell: JQuery): JQuery;
-        /**
-         * Generate a jQuery object if none is provided and decorate it by calling `attachGeneratedAttributes`
-         *
-         * @param $cell An optional jQuery object pointing to the target cell
-         */
-        generate($cell?: JQuery): JQuery;
-        /**
-         * Parse the table header row, analyse its cells and save the columns.
-         *
-         * @return Could return an `$.error()` if nothing is found.
-         */
-        getFromTable(): void|JQuery;
-        /** Initializes `settings.table.columns` array and calls `getFromTable()` */
-        init(): void;
-        /**
-         * Check if the `$element` is valid (if it is a `table`)
-         *
-         * @return A boolean
-         */
-        initOnLoad(): boolean;
-        /**
-         * Generate a jQuery object  if none is provided and decorate it by calling `attachGeneratedAttributes`
-         *
-         * @param columnIndexOrId A number (the column index) or a string (the column id)
-         */
-        remove(columnIndexOrId: number|string): void;
-        /**
-         * Remove the column from `settings.table.columns`
-         *
-         * @param index A number (the column index)
-         */
-        removeFromArray(index: number): void;
-        /**
-         * Remove the column from the DOM
-         *
-         * @param columnId A string matching the id used in `data-dynatable-column` attribute
-         */
-        removeFromTable(columnId: string): void;
-    }
-    interface InputsSearch {
-        /** Inject the search form at the target location */
-        attach(): void;
-        /**
-         * Build the html markup for the search form
-         *
-         * @return The jQuery object for the search form
-         */
-        create(): JQuery;
-        /** Call the `attach()` method */
-        init(): void;
-        /**
-         * Check if the search feature is enabled in `settings.features`
-         *
-         * @return A boolean
-         */
-        initOnLoad(): boolean;
-    }
-    interface PaginationLinks {
-        /** Insert the pagination links inside the page */
-        attach(): void;
-        /**
-         * Generate a string containing the html of a pagination link
-         *
-         * @param page The page number
-         * @param label The text of the link (could be Previous, Next or a number)
-         * @param linkClass The classname for the `<a>`
-         * @param conditional Do we want to use the conditionalClass
-         * @param conditionalClass The classname for both the `<li>` and its `<a>`
-         * @return A string containing html markup
-         */
-        buildLink(page: number, label: string|number, linkClass: string, conditional: boolean, conditionalClass: string): string;
-        /**
-         * Build the `<ul>` and creates the event listeners
-         *
-         * @return A string containing html markup
-         */
-        create(): string;
-        /** Call the attach method */
-        init(): void;
-        /**
-         * Check if the paginate feature is enabled in `settings.features`
-         *
-         * @return A boolean
-         */
-        initOnLoad(): boolean;
-    }
-    interface PaginationPage {
-        /** Parse the current window.location in order to determine the target page */
-        init(): void;
-        /**
-         * Check if the paginate feature is enabled in `settings.features`
-         *
-         * @return A boolean
-         */
-        initOnLoad(): boolean;
-        /**
-         * Set the page in the dataset
-         *
-         * @param page The new page number
-         */
-        set(page: number): void;
-    }
-    interface PaginationPerPage {
-        /** Insert the pagination per page inside the page */
-        attach(): void;
-        /**
-         * Generate the html markup for the pagination per page
-         *
-         * @return A jQuery object containing the `<label>` and the `<select>`
-         */
-        create(): JQuery;
-        /** Set up the pagination per page */
-        init(): void;
-        /**
-         * Check if the paginate feature is enabled in `settings.features`
-         *
-         * @return A boolean
-         */
-        initOnLoad(): boolean;
-        /**
-         * Set the new value for the pagination per page
-         *
-         * @param number The new number of items visible per page
-         * @param skipResetPage By default (false) it sends you to page 1
-         */
-        set(number: number, skipResetPage?: boolean): void;
-    }
-    interface ProcessingIndicator {
-        /** Insert the processing indicator inside the page */
-        attach(): void;
-        /**
-         * Generate the html markup for the processing indicator
-         *
-         * @return A jQuery object containing the generated html
-         */
-        create(): JQuery;
-        /** Hide the processing indicator */
-        hide(): void;
-        /** Set up the processing indicator */
-        init(): void;
-        /**
-         * Position the processing indicator at the center
-         *
-         * @return A jQuery object containing the processing indicator
-         */
-        position(): JQuery;
-        /** Show the processing indicator */
-        show(): void;
-    }
-    interface Queries {
-        /**
-         * Add a new condition in the queries
-         *
-         * @param name The key for for the query
-         * @param value The value we wish to find
-         * @return A reference to the related Dynatable object
-         */
-        add(name: string, value: any): Dynatable;
-        /** functions object for Queries */
-        functions: QueriesFunctions;
-        /** Set up the initial search parameters */
-        init(): void;
-        /**
-         * Check if search feature is enabled
-         *
-         * @return A boolean if search feature is enabled
-         */
-        initOnLoad(): boolean;
-        /**
-         * Remove the query from the dataset
-         *
-         * @param name The key for for the query to be removed
-         * @return A reference to the related Dynatable object
-         */
-        remove(name: string): Dynatable;
-        /**  Run a search with all the saved queries */
-        run(): any;
-        /**
-         * Shortcut for performing simple query from built-in search
-         *
-         * @param q The value that will be searched for
-         */
-        runSearch(q: any): void;
-        /** Set up the input fields for creating queries */
-        setupInputs(): void;
-    }
-    interface QueriesFunctions {
-        /**
-         * Search in all of the properties of the provided single record
-         *
-         * @param record A data object with all the properties of the current line
-         * @param queryValue The researched value
-         * @return A boolean indicating if a match was found
-         */
-        search(record: any, queryValue: string): boolean;
-    }
-    interface Records {
-        /**
-         * Count records from table
-         *
-         * @return The length of the records Array
-         */
-        count(): number;
-        /**
-         * Get initial recordset to populate table
-         * if ajax, call ajaxUrl
-         * otherwise, initialize from in-table records
-         *
-         * @return An Array with the records
-         */
-        getFromTable(): Array<Object>;
-        /** Create and init the records */
-        init(): void;
-        /**
-         * Check if ajax feature is enabled
-         *
-         * @return A boolean if ajax feature is enabled
-         */
-        initOnLoad(): boolean;
-        /**
-         * Get the first and the last indexes based on current page and number of items per page
-         *
-         * @return An Array with the first index ([0]) and the last index ([1])
-         */
-        pageBounds(): Array<number>;
-        /** Update the records with the new page */
-        paginate(): void;
-        /** Reset the records */
-        resetOriginal(): void;
-        /**
-         * Call the appropriated sort function
-         *
-         * @return The number (-1, 0 or +1) representing the comparison
-         */
-        sort(): number;
-        /**
-         * Merge ajax response json with cached data including (meta-data and records)
-         *
-         * @param data The new data
-         */
-        updateFromJson(data: any): void;
-    }
-    interface RecordsCount {
-        /** Insert the record count inside the page */
-        attach(): void;
-        /**
-         * Generate the html markup for the record count
-         *
-         * @return A jQuery object containing the generated html
-         */
-        create(): JQuery;
-        /** Create and init the records count */
-        init(): void;
-        /**
-         * Check if recordCount feature is enabled
-         *
-         * @return A boolean if recordCount feature is enabled
-         */
-        initOnLoad(): boolean;
-    }
-    interface Settings {
-        dataset: Dataset;
-        features: Features;
-        inputs: Inputs;
-        params: Params;
-        readers: Readers;
-        table: Table;
-        writers: Writers;
-    }
-    interface Sorts {
-        /**
-         * Add a new sort in sortKeys
-         *
-         * @param attr The key for for the sorting
-         * @param direction The sorting direction (-1 or +1)
-         * @return A reference to the related Dynatable object
-         */
-        add(attr: string, direction: number): Dynatable;
-        /** Remove all the sortKeys */
-        clear(): void;
-        /** functions object for Sorts */
-        functions: SortsFunctions;
-        /**
-         * Try to intelligently guess which sort function to use based on the type of attribute values.
-         *
-         * @param a The first record
-         * @param b The second record
-         * @param attr The key of the property
-         * @return A string containing one of the types ('string' or 'number')
-         */
-        guessType(a: any, b: any, attr: string): string;
-        /** Create and init the sorts */
-        init(): void;
-        /**
-         * Check if sort feature is enabled
-         *
-         * @return A boolean if sort feature is enabled
-         */
-        initOnLoad(): boolean;
-        /**
-         * Remove a sort attribute from the sortKeys
-         *
-         * @param attr The key to be removed from the sorting
-         * @return A reference to the related Dynatable object
-         */
-        remove(attr: string): Dynatable;
-    }
-    interface SortsFunctions {
-        /**
-         * Sorting between 2 numbers
-         *
-         * @param a The first record
-         * @param b The second record
-         * @param attr The key of the property
-         * @param direction The number describingthe order: ASC (+1), DESC (-1) or none (0)
-         * @return The number (-1, 0 or +1) representing the comparison
-         */
-        number(a: any, b: any, attr: string, direction: number): number;
-        /**
-         * Restores the original order we had...
-         *
-         * @param a The first record
-         * @param b The second record
-         * @return The number (-1, 0 or +1) representing the comparison
-         */
-        originalPlacement(a: any, b: any): number;
-        /**
-         * Sorting between 2 strings
-         *
-         * @param a The first record
-         * @param b The second record
-         * @param attr The key of the property
-         * @param direction The number describingthe order: ASC (+1), DESC (-1) or none (0)
-         * @return The number (-1, 0 or +1) representing the comparison
-         */
-        string(a: any, b: any, attr: string, direction: number): number;
-    }
-    interface SortsHeaders {
-        /**
-         * Inject the arrow down inside the $link
-         *
-         * @param $link The jQuery object to be used
-         */
-        appendArrowDown($link: JQuery): void;
-        /**
-         * Inject the arrow up inside the $link
-         *
-         * @param $link The jQuery object to be used
-         */
-        appendArrowUp($link: JQuery): void;
-        /** Go through each cell and call `attachOne` */
-        attach(): void;
-        /**
-         * If sorting is allowed for the provided cell, it injects the hml generated by `create`
-         *
-         * @param cell The cell Element to be parsed
-         */
-        attachOne(cell: Element): void;
-        /**
-         * Generate the html markup to be inserted inside the header of the sortable column
-         *
-         * @param cell An Element which point to the cell in the header row
-         * @return A jQuery object containing the markup of the link
-         */
-        create(cell: Element): JQuery;
-        /** Create and init the sorts */
-        init(): void;
-        /**
-         * Check if sort feature is enabled
-         *
-         * @return A boolean if sort feature is enabled
-         */
-        initOnLoad(): boolean;
-        /** Remove all the sort headers from the table */
-        removeAll(): void;
-        /** Remove all arrows Elements from the table */
-        removeAllArrows(): void;
-        /**
-         * Remove the arrow found inside the provided $link
-         *
-         * @param $link The jQuery object containing the `<a>` markup in the sortable headers
-         */
-        removeArrow($link: JQuery): void;
-        /**
-         * Remove the link generated by dynatable inside the sortable header
-         * and restore its original html content
-         *
-         * @param cell The cell Element that will be parsed
-         */
-        removeOne(cell: Element): void;
-        /**
-         * @todo learn more about this method and document it
-         *
-         * @param $link The jQuery object to be used
-         * @param column The Column object that will be used
-         * @return A boolean which is true if supplied test function passes for ALL items in an array
-         */
-        sortedByColumn($link: JQuery, column: Column): boolean;
-        /**
-         * Inspect the settings to determine the order to use
-         *
-         * @param column The Column object that will be used
-         * @return A number (-1 or +1) describing the order to use (DESC or ASC)
-         */
-        sortedByColumnValue(column: Column): number;
-        /**
-         * Refresh the [multi] sorting of the dataset
-         *
-         * @param $e The event object (of the click on the table sortable header)
-         * @param $link The header link
-         * @param column The Column object to be sorted
-         */
-        toggleSort(e: Event, $link: JQuery, column: Column): void;
-    }
-    interface State {
-        /** Set up a listener for popstate event on window */
-        init(): void;
-        /**
-         * Check if pushState option is true, and if browser supports it
-         *
-         * @return A boolean
-         */
-        initOnLoad(): boolean;
-        /**
-         * Handler for the popstate event
-         *
-         * @param event The native popstate event
-         */
-        pop(event: Event): void;
-        /**
-         * Update the URL data using pushState
-         *
-         * @param data An object with the parameters we want to push
-         */
-        push(data: Object): void;
-    }
-    interface Dynatable {
-        /**
-        * Initialize Dynatable plugin
-        *
-        * @param options An optional object that allow you to change the default configuration options
-        */
-        (options?: Options): JQuery;
-        /**
-         * Each dynatable instance inherits from this,
-         * set properties specific to instance
-         *
-         * @param element The html node to be used by dynatable
-         * @param options The JQueryDynatable.Options object which contains all the settings
-         * @return A reference to the current and brand new dynatable object
-         */
-        init(element: Element, options: Options): Dynatable;
-        /**
-         * Call the process method on all the components of this dynatable
-         *
-         * @param skipPushState A boolean allowing to skip the update the query string in the URL
-         */
-        process(skipPushState?: boolean): void;
-        /** The `element` encapsulated inside a jQuery object */
-        $element: JQuery;
-        /** The `dom` API */
-        dom: DOM;
-        /** The `domColumns` API */
-        domColumns: DOMColumns;
-        /** The native element on which the dynatable plugin was called */
-        element: Element
-        /** The `inputsSearch` API */
-        inputsSearch: InputsSearch;
-        /** The `paginationLinks` API */
-        paginationLinks: PaginationLinks;
-        /** The `paginationPage` API */
-        paginationPage: PaginationPage;
-        /** The `paginationPerPage` API */
-        paginationPerPage: PaginationPerPage;
-        /** The `processingIndicator` API */
-        processingIndicator: ProcessingIndicator;
-        /** The `queries` API */
-        queries: Queries;
-        /** The `records` API */
-        records: Records;
-        /** The `recordsCount` API */
-        recordsCount: RecordsCount;
-        /** The `settings` API */
-        settings: Settings;
-        /** The `sorts` API */
-        sorts: Sorts;
-        /** The `sortsHeaders` API */
-        sortsHeaders: SortsHeaders;
-        /** The `state` API */
-        state: State;
-    }
-}
-
-//declare var dynatable: JQueryDynatable.Dynatable;
diff --git a/dynatable/index.d.ts b/dynatable/index.d.ts
new file mode 100644
index 0000000000..774b617674
--- /dev/null
+++ b/dynatable/index.d.ts
@@ -0,0 +1,1155 @@
+// Type definitions for jquery.dynatable v0.3.1
+// Project: http://www.dynatable.com/
+// Definitions by: François Massart <https://github.com/francoismassart/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface JQuery {
+    /**
+    * @constructor
+    */
+    dynatable: JQueryDynatable.Dynatable;
+}
+
+/** Static members of jQuery (those on $ and jQuery themselves) */
+interface JQueryStatic {
+    /**
+     * Global dynatable plugin setting defaults
+     *
+     * @param options The configuration options to be set globally
+     */
+    dynatableSetup(options: JQueryDynatable.Options): void;
+}
+
+declare namespace JQueryDynatable {
+    interface Features {
+        /**
+         * Enable the pagination feature
+         *
+         * @default true
+         */
+        paginate?: boolean;
+        /**
+         * Enable the sorting feature
+         *
+         * @default true
+         */
+        sort?: boolean;
+        /**
+         * Enable the pushState feature
+         * Used to update the page URL parameters and cache the query result for the browser's forward- and back-buttons
+         *
+         * @default true
+         */
+        pushState?: boolean;
+        /**
+         * Enable the search feature
+         *
+         * @default true
+         */
+        search?: boolean;
+        /**
+         * Enable the recordCount feature
+         * When pagination is enabled, dynatable will also show the currently displayed records and the total number of records
+         *
+         * @default true
+         */
+        recordCount?: boolean;
+        /**
+         * Enable the perPageSelect feature
+         * The perPageSelect will insert a form control filled with the options from `perPageOptions`
+         *
+         * @default true
+         */
+        perPageSelect?: boolean;
+    }
+    interface Column {
+        index: number;
+        label: string;
+        /**
+         * Determined by the `data-dynatable-column` or using the `defaultColumnIdStyle`
+         *
+         * @example
+         * // Using the `defaultColumnIdStyle` of `camelCase`
+         * // `<th>Favorite Music</th>` would be translated into the id `favoriteMusic`
+         */
+        id: string;
+        /**
+         * Function that returns the cell data to be written inside the cell
+         *
+         * @param record A data object representing the current line of data
+         * @return The data for the current cell
+         *
+         * @example
+         * function exampleAttributeWriter(record) {
+         *     return record[this.id];
+         * };
+         */
+        attributeWriter: (record: any) => any;
+        /**
+         * Function that interprets the cell html data in order to convert it into data
+         *
+         * @param cell A html node of the target cell
+         * @param record A data object representing the current line of data
+         * @return the html content for the current cell
+         *
+         * @example
+         * function exampleAttributeReader(cell, record) {
+         *     return $(cell).html();
+         * };
+         */
+        attributeReader: (cell: Element, record: any) => string;
+        /** List of ids for sorting, generated by the plugin, can be tweaked by using `data-dynatable-sorts` */
+        sorts: Array<string>;
+        hidden: boolean;
+        /**
+         * Detected internally by dynatable.
+         * Possible values are:
+         *
+         * @enum('left', 'right', 'center', 'justify', 'initial', 'inherit')
+         */
+        textAlign: string;
+    }
+    interface Table {
+        /**
+         * By default, dynatable converts headings to JSON attribute names using:
+         *
+         * @enum('camelCase', 'trimDash', 'dashed', 'underscore', 'lowercase')
+         * @default 'camelCase'
+         * @see http://www.dynatable.com/#converting-attribute-names
+         *
+         * @example
+         * // Given the html `<th>Favorite Music</th>` column header
+         * // `camelCase` would translate it to id `favoriteMusic`
+         * // `trimDash` would translate it to id `Favorite-Music`
+         * // `dashed` would translate it to id `favorite-music`
+         * // `underscore` would translate it to id `favorite_music`
+         * // `lowercase` would translate it to id `favorite music`
+         */
+        defaultColumnIdStyle?: string;
+        /** Generated internally by the plugin, will be reset by the DomColumns at init */
+        columns?: Array<JQueryDynatable.Column>;
+        /**
+         * Selector used by dynatable in order to find the table header row
+         *
+         * @default 'thead tr'
+         */
+        headRowSelector?: string;
+        /**
+         * Selector used by dynatable in order to find the table body rows
+         *
+         * @default 'tbody tr'
+         */
+        bodyRowSelector?: string;
+        /**
+         * Optional classname that can be added by dynatable to the header cells
+         *
+         * @default null
+         */
+        headRowClass?: string;
+    }
+    interface Inputs {
+        /**
+         * Allows you to provide an array of jQuery objects which point to our filter inputs.
+         * The inputs musts have a name attribute value matching a columnId in order to work.
+         * Input values must strictly match the data from the cell...
+         * Searching for "Lux" won't show "Luxembourg" event if it starts if the same letters!
+         *
+         * @default null
+         * @see http://www.dynatable.com/#querying
+         *
+         * @example
+         * $('#search-year')
+         */
+        queries?: JQuery;
+        /**
+         * @todo Find out how this `inputs.sorts` setting is useful + show an example
+         * @default null
+         * @see http://www.dynatable.com/#sorting
+         */
+        sorts?: any;
+        /**
+         * Allows you to define the accepted modifier keys to trigger a multisort action
+         *
+         * @default ['ctrlKey', 'shiftKey', 'metaKey']
+         * @see https://en.wikipedia.org/wiki/Modifier_key
+         */
+        multisort?: Array<string>;
+        /**
+         * @todo Find out how this `inputs.page` setting is useful + show an example
+         * @default null
+         */
+        page?: any;
+        /**
+         * The events attached to the search/filtering inputs elements
+         *
+         * @default 'blur change'
+         */
+        queryEvent?: string;
+        /**
+         * The jQuery object pointing to a target where to insert the recordCount html
+         *
+         * @default null
+         *
+         * @example
+         * $('#chart-status-text')
+         */
+        recordCountTarget?: JQuery;
+        /**
+         * Determines where the recordCount is inserted
+         *
+         * @enum('before', 'after')
+         * @default 'after'
+         * @see http://api.jquery.com/category/manipulation/dom-insertion-outside/
+         */
+        recordCountPlacement?: string;
+        /**
+         * The target inside next to which the pagination block will be inserted (before or after).
+         * You can use a selector string, an Element or a JQuery.
+         *
+         * @default null
+         */
+        paginationLinkTarget?: string|Element|JQuery;
+        /**
+         * Determines where the pagination links are inserted
+         *
+         * @enum('before', 'after')
+         * @default 'after'
+         * @see http://api.jquery.com/category/manipulation/dom-insertion-outside/
+         */
+        paginationLinkPlacement?: string;
+        /**
+         * The classname to be injected on the `<ul>` containing the pagination
+         *
+         * @default 'dynatable-pagination-links'
+         */
+        paginationClass?: string;
+        /**
+         * The classname to be injected on every pagination link
+         *
+         * @default 'dynatable-page-link'
+         */
+        paginationLinkClass?: string;
+        /**
+         * The classname to be injected on the previous page link
+         *
+         * @default 'dynatable-page-prev'
+         */
+        paginationPrevClass?: string;
+        /**
+         * The classname to be injected on the next page link
+         *
+         * @default 'dynatable-page-next'
+         */
+        paginationNextClass?: string;
+        /**
+         * The classname to be injected on the current page link
+         *
+         * @default 'dynatable-active-page'
+         */
+        paginationActiveClass?: string;
+        /**
+         * The classname to be injected on the disabled page links
+         *
+         * @default 'dynatable-disabled-page'
+         */
+        paginationDisabledClass?: string;
+        /**
+         * Text content for the previous page link
+         *
+         * @default 'Previous'
+         */
+        paginationPrev?: string;
+        /**
+         * Text content for the next page link
+         *
+         * @default 'Next'
+         */
+        paginationNext?: string;
+        /**
+         * Define the number of page number links shown inside the pagination
+         *
+         * @default [1,2,2,1]
+         */
+        paginationGap?: Array<number>;
+        /**
+         * The target next to which the search block will be inserted (before or after).
+         * You can use a selector string, an Element or a JQuery.
+         *
+         * @default null
+         */
+        searchTarget?: string|Element|JQuery;
+        /**
+         * Determines where the search field is inserted
+         *
+         * @enum('before', 'after')
+         * @default 'before'
+         * @see http://api.jquery.com/category/manipulation/dom-insertion-outside/
+         */
+        searchPlacement?: string;
+        /**
+         * Text preceding the search field
+         *
+         * @default 'Search: '
+         */
+        searchText?: string;
+        /**
+         * The target next to which the per page pagination block will be inserted (before or after).
+         * You can use a selector string, an Element or a jQuery object.
+         *
+         * @default null
+         */
+        perPageTarget?: string|Element|JQuery;
+        /**
+         * Determines where the perPage menu is inserted
+         *
+         * @enum('before', 'after')
+         * @default 'before'
+         * @see http://api.jquery.com/category/manipulation/dom-insertion-outside/
+         */
+        perPagePlacement?: string;
+        /**
+         * Text content preceding the items per page <select>
+         *
+         * @default 'Show: '
+         */
+        perPageText?: string;
+        /**
+         * Text content introducing the pagination
+         *
+         * @default 'Pages: '
+         */
+        pageText?: string;
+        /**
+         * Text content used inside the recordsCount
+         *
+         * @default '{pageLowerBound} to {pageUpperBound} of'
+         */
+        recordCountPageBoundTemplate?: string;
+        /**
+         * Text content used inside the recordsCount
+         *
+         * @default '{recordsShown} of'
+         */
+        recordCountPageUnboundedTemplate?: string;
+        /**
+         * Text content used inside the recordsCount
+         *
+         * @default '{recordsQueryCount} {collectionName}'
+         */
+        recordCountTotalTemplate?: string;
+        /**
+         * Text content used inside the recordsCount
+         *
+         * @default ' (filtered from {recordsTotal} total records)'
+         */
+        recordCountFilteredTemplate?: string;
+        /**
+         * Text content used inside the recordsCount
+         *
+         * @default 'Showing '
+         */
+        recordCountText?: string;
+        /**
+         * Text content used inside the recordsCount
+         *
+         * @default '{text} {pageTemplate} {totalTemplate} {filteredTemplate}'
+         */
+        recordCountTextTemplate?: string;
+        /**
+         * Text content used inside the recordsCount
+         *
+         * @default '<span id="dynatable-record-count-{elementId}" class="dynatable-record-count">{textTemplate}</span>'
+         */
+        recordCountTemplate?: string;
+        /**
+         * Text content injected inside the processingIndicator
+         *
+         * @default 'Processing...'
+         */
+        processingText?: string;
+    }
+    interface Dataset {
+        /**
+         * Enable the `ajax` mode
+         *
+         * @default false
+         */
+        ajax?: boolean;
+        /**
+         * A string containing the URL to which the request is sent.
+         *
+         * @default null
+         */
+        ajaxUrl?: string;
+        /**
+         * Defining the `cache` setting for the jQuery's ajax call...
+         * true or false for dataType 'script' and 'jsonp'
+         *
+         * @default null
+         * @see http://api.jquery.com/jQuery.ajax
+         */
+        ajaxCache?: boolean;
+        /**
+         * Send the ajax request automatically
+         *
+         * @default false
+         */
+        ajaxOnLoad?: boolean;
+        /**
+         * Defining the `method` setting for the jQuery's ajax call...
+         * The HTTP method to use for the request (e.g. "POST", "GET", "PUT").
+         *
+         * @enum('GET', 'POST')
+         * @default 'GET'
+         * @todo Check if other methods could be used... ('GET', 'PUT', 'HEAD', 'POST', 'PATCH', 'TRACE', 'DELETE', 'CONNECT', 'OPTIONS', 'IS_AWARE', 'IS_EAGER', 'PROPFIND', 'IS_OPTIONAL', 'IS_REQUIRED', 'IS_CONSTRUCTOR', 'IS_INSTANTIATOR')
+         */
+        ajaxMethod?: string;
+        /**
+         * The type of data that you're expecting back from the server.
+         * If none is specified, jQuery will try to infer it based on the MIME type of the response...
+         *
+         * @enum('xml', 'html', 'script', 'json', 'jsonp', 'text')
+         * @default 'json'
+         * @see http://api.jquery.com/jQuery.ajax
+         */
+        ajaxDataType?: string;
+        /**
+         * Name of the property in the dataset that contains the total number of records
+         *
+         * @default null
+         */
+        totalRecordCount?: string;
+        /**
+         * Object describing the current request's filtering
+         *
+         * @default {}
+         */
+        queries?: Object;
+        /**
+         * Name of the property in the dataset that contains the total number of records for the current query
+         *
+         * @default null
+         */
+        queryRecordCount?: string;
+        /**
+         * The page represented in the for the current dataset
+         *
+         * @default null
+         */
+        page?: number;
+        /**
+         * The default number of items loaded per page
+         *
+         * @default 10
+         */
+        perPageDefault?: number;
+        /**
+         * The default options available in the perPage menu built by dynatable
+         *
+         * @default [10,20,50,100]
+         */
+        perPageOptions?: Array<number>;
+        /**
+         * Object describing the current request's sorting
+         *
+         * @default {}
+         */
+        sorts?: Object;
+        /**
+         * The sorting keys (generated by dynatable)
+         *
+         * @default null
+         */
+        sortsKeys?: Array<string>;
+        /**
+         * The sorting types (generated by dynatable)
+         * It will hosts the type of object to sort (string, number, etc.)
+         *
+         * @default {}
+         */
+        sortTypes?: Object;
+        /**
+         * The core data (generated or loaded by dynatable)
+         *
+         * @default null
+         */
+        records?: any;
+    }
+    interface Writers {
+        /**
+         * Function that write the data inside each row
+         *
+         * @param rowIndex The index of the current row (from 0 to the perPage value)
+         * @param record A data object containing all the data for the current record (current line)
+         * @param columns  An array of columns
+         * @param cellWriter A reference to the function responsible for writing inside the cell
+         * @return the data for the current cell
+         *
+         * @default defaultRowWriter
+         *
+         * @example
+         * function exampleRowWriter(rowIndex, record, columns, cellWriter) {
+         *     var tr = '';
+         *     // grab the record's attribute for each column
+         *     for (var i = 0, len = columns.length; i < len; i++) {
+         *         tr += cellWriter(columns[i], record);
+         *     }
+         *     return '<tr>' + tr + '</tr>';
+         * };
+         */
+        _rowWriter?: (rowIndex: number, record: any, columns: Array<Column>, cellWriter: Function) => string;
+        /**
+         * Function that returns the HTML code that will be injected for the cell
+         *
+         * @param column The column object describing the config for the current column
+         * @param record A data object representing the current line of data
+         * @return the data for the current cell
+         *
+         * @default defaultCellWriter
+         *
+         * @example
+         * function exampleCellWriter(column, record) {
+         *     var html = column.attributeWriter(record),
+         *     td = '<td';
+         *
+         *     if (column.hidden || column.textAlign) {
+         *         td += ' style="';
+         *
+         *         // keep cells for hidden column headers hidden
+         *         if (column.hidden) {
+         *             td += 'display: none;';
+         *         }
+         *
+         *         // keep cells aligned as their column headers are aligned
+         *         if (column.textAlign) {
+         *             td += 'text-align: ' + column.textAlign + ';';
+         *         }
+         *
+         *         td += '"';
+         *     }
+         *
+         *     return td + '>' + html + '</td>';
+         * };
+         */
+        _cellWriter?: (column: Column, record: any) => string;
+        /**
+         * Function that returns the cell data to be written inside the cell
+         *
+         * @param record A data object representing the current line of data
+         * @return the data for the current cell
+         *
+         * @default defaultAttributeWriter
+         *
+         * @example
+         * function exampleAttributeWriter(record) {
+         *     // `this` is the column object in settings.columns
+         *    return record[this.id];
+         * };
+         */
+        _attributeWriter?: (record: any) => any;
+    }
+    interface Readers {
+        /**
+         * Function that interprets the row into data
+         *
+         * @param index The index of the current row (from 0 to the perPage value)
+         * @param thisRef
+         * @param record
+         * @return the data for the current row
+         *
+         * @default null
+         *
+         * @example
+         * function exampleRowReader(index, this, record) {
+         *     //...
+         * };
+         */
+        _rowReader?: (index: number, thisRef: any, record: any) => any;
+        /**
+         * Function that interprets the cell into data
+         *
+         * @param cell A html node of the target cell
+         * @param record A data object representing the current line of data
+         * @return the data for the current cell
+         *
+         * @default defaultAttributeReader
+         *
+         * @example
+         * function exampleAttributeReader(cell, record) {
+         *    return $(cell).html();
+         * };
+         */
+        _attributeReader?: (cell: Element, record: any) => any;
+    }
+    interface Params {
+        /**
+         * @default 'dynatable'
+         */
+        dynatable?: string;
+        /**
+         * @default 'queries'
+         */
+        queries?: string;
+        /**
+         * @default 'sorts'
+         */
+        sorts?: string;
+        /**
+         * @default 'page'
+         */
+        page?: string;
+        /**
+         * @default 'perPage'
+         */
+        perPage?: string;
+        /**
+         * @default 'offset'
+         */
+        offset?: string;
+        /**
+         * @default 'records'
+         */
+        records?: string;
+        /**
+         * @default null
+         */
+        record?: Object;
+        /**
+         * @default 'queryRecordCount'
+         */
+        queryRecordCount?: string;
+        /**
+         * @default 'totalRecordCount'
+         */
+        totalRecordCount?: string;
+    }
+    interface Options {
+        features?: Features;
+        table?: Table;
+        inputs?: Inputs;
+        dataset?: Dataset;
+        writers?: Writers;
+        readers?: Readers;
+        params?: Params;
+    }
+    interface DOM {
+        /**
+         * Manually update the dom with the current record set...
+         * This can be useful after multiple calls to `domcolumns.add()` with `skipUpdate` set to true.
+         * This way we improve performance by generating the DOM only once.
+         */
+        update(): void;
+    }
+    interface DOMColumns {
+        /**
+         * Add a new column at runtime
+         *
+         * @param $column A jQuery object containing the html markup for the `th`
+         * @param position The position index indicating where we want to insert the new column
+         * @param skipAppend A boolean allowing to skip the appending of the column header to table
+         * @param skipUpdate A boolean allowing to skip the call to `dom.update()`
+         */
+        add($column: JQuery, position: number, skipAppend?: boolean, skipUpdate?: boolean): void;
+        /**
+         * Add several `data-` attributes on the provided `$cell`
+         *
+         * @param $cell A jQuery object pointing to the target cell
+         * @return the modified jQuery object `$cell`
+         */
+        attachGeneratedAttributes($cell: JQuery): JQuery;
+        /**
+         * Generate a jQuery object if none is provided and decorate it by calling `attachGeneratedAttributes`
+         *
+         * @param $cell An optional jQuery object pointing to the target cell
+         */
+        generate($cell?: JQuery): JQuery;
+        /**
+         * Parse the table header row, analyse its cells and save the columns.
+         *
+         * @return Could return an `$.error()` if nothing is found.
+         */
+        getFromTable(): void|JQuery;
+        /** Initializes `settings.table.columns` array and calls `getFromTable()` */
+        init(): void;
+        /**
+         * Check if the `$element` is valid (if it is a `table`)
+         *
+         * @return A boolean
+         */
+        initOnLoad(): boolean;
+        /**
+         * Generate a jQuery object  if none is provided and decorate it by calling `attachGeneratedAttributes`
+         *
+         * @param columnIndexOrId A number (the column index) or a string (the column id)
+         */
+        remove(columnIndexOrId: number|string): void;
+        /**
+         * Remove the column from `settings.table.columns`
+         *
+         * @param index A number (the column index)
+         */
+        removeFromArray(index: number): void;
+        /**
+         * Remove the column from the DOM
+         *
+         * @param columnId A string matching the id used in `data-dynatable-column` attribute
+         */
+        removeFromTable(columnId: string): void;
+    }
+    interface InputsSearch {
+        /** Inject the search form at the target location */
+        attach(): void;
+        /**
+         * Build the html markup for the search form
+         *
+         * @return The jQuery object for the search form
+         */
+        create(): JQuery;
+        /** Call the `attach()` method */
+        init(): void;
+        /**
+         * Check if the search feature is enabled in `settings.features`
+         *
+         * @return A boolean
+         */
+        initOnLoad(): boolean;
+    }
+    interface PaginationLinks {
+        /** Insert the pagination links inside the page */
+        attach(): void;
+        /**
+         * Generate a string containing the html of a pagination link
+         *
+         * @param page The page number
+         * @param label The text of the link (could be Previous, Next or a number)
+         * @param linkClass The classname for the `<a>`
+         * @param conditional Do we want to use the conditionalClass
+         * @param conditionalClass The classname for both the `<li>` and its `<a>`
+         * @return A string containing html markup
+         */
+        buildLink(page: number, label: string|number, linkClass: string, conditional: boolean, conditionalClass: string): string;
+        /**
+         * Build the `<ul>` and creates the event listeners
+         *
+         * @return A string containing html markup
+         */
+        create(): string;
+        /** Call the attach method */
+        init(): void;
+        /**
+         * Check if the paginate feature is enabled in `settings.features`
+         *
+         * @return A boolean
+         */
+        initOnLoad(): boolean;
+    }
+    interface PaginationPage {
+        /** Parse the current window.location in order to determine the target page */
+        init(): void;
+        /**
+         * Check if the paginate feature is enabled in `settings.features`
+         *
+         * @return A boolean
+         */
+        initOnLoad(): boolean;
+        /**
+         * Set the page in the dataset
+         *
+         * @param page The new page number
+         */
+        set(page: number): void;
+    }
+    interface PaginationPerPage {
+        /** Insert the pagination per page inside the page */
+        attach(): void;
+        /**
+         * Generate the html markup for the pagination per page
+         *
+         * @return A jQuery object containing the `<label>` and the `<select>`
+         */
+        create(): JQuery;
+        /** Set up the pagination per page */
+        init(): void;
+        /**
+         * Check if the paginate feature is enabled in `settings.features`
+         *
+         * @return A boolean
+         */
+        initOnLoad(): boolean;
+        /**
+         * Set the new value for the pagination per page
+         *
+         * @param number The new number of items visible per page
+         * @param skipResetPage By default (false) it sends you to page 1
+         */
+        set(number: number, skipResetPage?: boolean): void;
+    }
+    interface ProcessingIndicator {
+        /** Insert the processing indicator inside the page */
+        attach(): void;
+        /**
+         * Generate the html markup for the processing indicator
+         *
+         * @return A jQuery object containing the generated html
+         */
+        create(): JQuery;
+        /** Hide the processing indicator */
+        hide(): void;
+        /** Set up the processing indicator */
+        init(): void;
+        /**
+         * Position the processing indicator at the center
+         *
+         * @return A jQuery object containing the processing indicator
+         */
+        position(): JQuery;
+        /** Show the processing indicator */
+        show(): void;
+    }
+    interface Queries {
+        /**
+         * Add a new condition in the queries
+         *
+         * @param name The key for for the query
+         * @param value The value we wish to find
+         * @return A reference to the related Dynatable object
+         */
+        add(name: string, value: any): Dynatable;
+        /** functions object for Queries */
+        functions: QueriesFunctions;
+        /** Set up the initial search parameters */
+        init(): void;
+        /**
+         * Check if search feature is enabled
+         *
+         * @return A boolean if search feature is enabled
+         */
+        initOnLoad(): boolean;
+        /**
+         * Remove the query from the dataset
+         *
+         * @param name The key for for the query to be removed
+         * @return A reference to the related Dynatable object
+         */
+        remove(name: string): Dynatable;
+        /**  Run a search with all the saved queries */
+        run(): any;
+        /**
+         * Shortcut for performing simple query from built-in search
+         *
+         * @param q The value that will be searched for
+         */
+        runSearch(q: any): void;
+        /** Set up the input fields for creating queries */
+        setupInputs(): void;
+    }
+    interface QueriesFunctions {
+        /**
+         * Search in all of the properties of the provided single record
+         *
+         * @param record A data object with all the properties of the current line
+         * @param queryValue The researched value
+         * @return A boolean indicating if a match was found
+         */
+        search(record: any, queryValue: string): boolean;
+    }
+    interface Records {
+        /**
+         * Count records from table
+         *
+         * @return The length of the records Array
+         */
+        count(): number;
+        /**
+         * Get initial recordset to populate table
+         * if ajax, call ajaxUrl
+         * otherwise, initialize from in-table records
+         *
+         * @return An Array with the records
+         */
+        getFromTable(): Array<Object>;
+        /** Create and init the records */
+        init(): void;
+        /**
+         * Check if ajax feature is enabled
+         *
+         * @return A boolean if ajax feature is enabled
+         */
+        initOnLoad(): boolean;
+        /**
+         * Get the first and the last indexes based on current page and number of items per page
+         *
+         * @return An Array with the first index ([0]) and the last index ([1])
+         */
+        pageBounds(): Array<number>;
+        /** Update the records with the new page */
+        paginate(): void;
+        /** Reset the records */
+        resetOriginal(): void;
+        /**
+         * Call the appropriated sort function
+         *
+         * @return The number (-1, 0 or +1) representing the comparison
+         */
+        sort(): number;
+        /**
+         * Merge ajax response json with cached data including (meta-data and records)
+         *
+         * @param data The new data
+         */
+        updateFromJson(data: any): void;
+    }
+    interface RecordsCount {
+        /** Insert the record count inside the page */
+        attach(): void;
+        /**
+         * Generate the html markup for the record count
+         *
+         * @return A jQuery object containing the generated html
+         */
+        create(): JQuery;
+        /** Create and init the records count */
+        init(): void;
+        /**
+         * Check if recordCount feature is enabled
+         *
+         * @return A boolean if recordCount feature is enabled
+         */
+        initOnLoad(): boolean;
+    }
+    interface Settings {
+        dataset: Dataset;
+        features: Features;
+        inputs: Inputs;
+        params: Params;
+        readers: Readers;
+        table: Table;
+        writers: Writers;
+    }
+    interface Sorts {
+        /**
+         * Add a new sort in sortKeys
+         *
+         * @param attr The key for for the sorting
+         * @param direction The sorting direction (-1 or +1)
+         * @return A reference to the related Dynatable object
+         */
+        add(attr: string, direction: number): Dynatable;
+        /** Remove all the sortKeys */
+        clear(): void;
+        /** functions object for Sorts */
+        functions: SortsFunctions;
+        /**
+         * Try to intelligently guess which sort function to use based on the type of attribute values.
+         *
+         * @param a The first record
+         * @param b The second record
+         * @param attr The key of the property
+         * @return A string containing one of the types ('string' or 'number')
+         */
+        guessType(a: any, b: any, attr: string): string;
+        /** Create and init the sorts */
+        init(): void;
+        /**
+         * Check if sort feature is enabled
+         *
+         * @return A boolean if sort feature is enabled
+         */
+        initOnLoad(): boolean;
+        /**
+         * Remove a sort attribute from the sortKeys
+         *
+         * @param attr The key to be removed from the sorting
+         * @return A reference to the related Dynatable object
+         */
+        remove(attr: string): Dynatable;
+    }
+    interface SortsFunctions {
+        /**
+         * Sorting between 2 numbers
+         *
+         * @param a The first record
+         * @param b The second record
+         * @param attr The key of the property
+         * @param direction The number describingthe order: ASC (+1), DESC (-1) or none (0)
+         * @return The number (-1, 0 or +1) representing the comparison
+         */
+        number(a: any, b: any, attr: string, direction: number): number;
+        /**
+         * Restores the original order we had...
+         *
+         * @param a The first record
+         * @param b The second record
+         * @return The number (-1, 0 or +1) representing the comparison
+         */
+        originalPlacement(a: any, b: any): number;
+        /**
+         * Sorting between 2 strings
+         *
+         * @param a The first record
+         * @param b The second record
+         * @param attr The key of the property
+         * @param direction The number describingthe order: ASC (+1), DESC (-1) or none (0)
+         * @return The number (-1, 0 or +1) representing the comparison
+         */
+        string(a: any, b: any, attr: string, direction: number): number;
+    }
+    interface SortsHeaders {
+        /**
+         * Inject the arrow down inside the $link
+         *
+         * @param $link The jQuery object to be used
+         */
+        appendArrowDown($link: JQuery): void;
+        /**
+         * Inject the arrow up inside the $link
+         *
+         * @param $link The jQuery object to be used
+         */
+        appendArrowUp($link: JQuery): void;
+        /** Go through each cell and call `attachOne` */
+        attach(): void;
+        /**
+         * If sorting is allowed for the provided cell, it injects the hml generated by `create`
+         *
+         * @param cell The cell Element to be parsed
+         */
+        attachOne(cell: Element): void;
+        /**
+         * Generate the html markup to be inserted inside the header of the sortable column
+         *
+         * @param cell An Element which point to the cell in the header row
+         * @return A jQuery object containing the markup of the link
+         */
+        create(cell: Element): JQuery;
+        /** Create and init the sorts */
+        init(): void;
+        /**
+         * Check if sort feature is enabled
+         *
+         * @return A boolean if sort feature is enabled
+         */
+        initOnLoad(): boolean;
+        /** Remove all the sort headers from the table */
+        removeAll(): void;
+        /** Remove all arrows Elements from the table */
+        removeAllArrows(): void;
+        /**
+         * Remove the arrow found inside the provided $link
+         *
+         * @param $link The jQuery object containing the `<a>` markup in the sortable headers
+         */
+        removeArrow($link: JQuery): void;
+        /**
+         * Remove the link generated by dynatable inside the sortable header
+         * and restore its original html content
+         *
+         * @param cell The cell Element that will be parsed
+         */
+        removeOne(cell: Element): void;
+        /**
+         * @todo learn more about this method and document it
+         *
+         * @param $link The jQuery object to be used
+         * @param column The Column object that will be used
+         * @return A boolean which is true if supplied test function passes for ALL items in an array
+         */
+        sortedByColumn($link: JQuery, column: Column): boolean;
+        /**
+         * Inspect the settings to determine the order to use
+         *
+         * @param column The Column object that will be used
+         * @return A number (-1 or +1) describing the order to use (DESC or ASC)
+         */
+        sortedByColumnValue(column: Column): number;
+        /**
+         * Refresh the [multi] sorting of the dataset
+         *
+         * @param $e The event object (of the click on the table sortable header)
+         * @param $link The header link
+         * @param column The Column object to be sorted
+         */
+        toggleSort(e: Event, $link: JQuery, column: Column): void;
+    }
+    interface State {
+        /** Set up a listener for popstate event on window */
+        init(): void;
+        /**
+         * Check if pushState option is true, and if browser supports it
+         *
+         * @return A boolean
+         */
+        initOnLoad(): boolean;
+        /**
+         * Handler for the popstate event
+         *
+         * @param event The native popstate event
+         */
+        pop(event: Event): void;
+        /**
+         * Update the URL data using pushState
+         *
+         * @param data An object with the parameters we want to push
+         */
+        push(data: Object): void;
+    }
+    interface Dynatable {
+        /**
+        * Initialize Dynatable plugin
+        *
+        * @param options An optional object that allow you to change the default configuration options
+        */
+        (options?: Options): JQuery;
+        /**
+         * Each dynatable instance inherits from this,
+         * set properties specific to instance
+         *
+         * @param element The html node to be used by dynatable
+         * @param options The JQueryDynatable.Options object which contains all the settings
+         * @return A reference to the current and brand new dynatable object
+         */
+        init(element: Element, options: Options): Dynatable;
+        /**
+         * Call the process method on all the components of this dynatable
+         *
+         * @param skipPushState A boolean allowing to skip the update the query string in the URL
+         */
+        process(skipPushState?: boolean): void;
+        /** The `element` encapsulated inside a jQuery object */
+        $element: JQuery;
+        /** The `dom` API */
+        dom: DOM;
+        /** The `domColumns` API */
+        domColumns: DOMColumns;
+        /** The native element on which the dynatable plugin was called */
+        element: Element
+        /** The `inputsSearch` API */
+        inputsSearch: InputsSearch;
+        /** The `paginationLinks` API */
+        paginationLinks: PaginationLinks;
+        /** The `paginationPage` API */
+        paginationPage: PaginationPage;
+        /** The `paginationPerPage` API */
+        paginationPerPage: PaginationPerPage;
+        /** The `processingIndicator` API */
+        processingIndicator: ProcessingIndicator;
+        /** The `queries` API */
+        queries: Queries;
+        /** The `records` API */
+        records: Records;
+        /** The `recordsCount` API */
+        recordsCount: RecordsCount;
+        /** The `settings` API */
+        settings: Settings;
+        /** The `sorts` API */
+        sorts: Sorts;
+        /** The `sortsHeaders` API */
+        sortsHeaders: SortsHeaders;
+        /** The `state` API */
+        state: State;
+    }
+}
+
+//declare var dynatable: JQueryDynatable.Dynatable;
diff --git a/dynatable/tsconfig.json b/dynatable/tsconfig.json
new file mode 100644
index 0000000000..b0d09a5e0b
--- /dev/null
+++ b/dynatable/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "dynatable-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/each/each-tests.ts b/each/each-tests.ts
index 4b07c694d7..89f5e81ccb 100644
--- a/each/each-tests.ts
+++ b/each/each-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="each.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 function testEach() {
 	var EachStaticClass: EachStatic = function (array: any[]) {
diff --git a/each/each.d.ts b/each/index.d.ts
similarity index 100%
rename from each/each.d.ts
rename to each/index.d.ts
diff --git a/each/tsconfig.json b/each/tsconfig.json
new file mode 100644
index 0000000000..639d5468e4
--- /dev/null
+++ b/each/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "each-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/easeljs/easeljs-tests.ts b/easeljs/easeljs-tests.ts
index 2e4b854c61..26a239d5ca 100644
--- a/easeljs/easeljs-tests.ts
+++ b/easeljs/easeljs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="easeljs.d.ts" />
+
 
 var stage: any;
 var myContext2D: any;
diff --git a/easeljs/easeljs.d.ts b/easeljs/easeljs.d.ts
deleted file mode 100644
index a76e72b350..0000000000
--- a/easeljs/easeljs.d.ts
+++ /dev/null
@@ -1,1029 +0,0 @@
-// Type definitions for EaselJS 0.8.0
-// Project: http://www.createjs.com/#!/EaselJS
-// Definitions by: Pedro Ferreira <https://bitbucket.org/drk4>, Chris Smith <https://github.com/evilangelist>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/*
-    Copyright (c) 2012 Pedro Ferreira
-    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-// Library documentation : http://www.createjs.com/Docs/EaselJS/modules/EaselJS.html
-
-/// <reference path="../createjs-lib/createjs-lib.d.ts" />
-/// <reference path="../tweenjs/tweenjs.d.ts" />
-
-// rename the native MouseEvent, to avoid conflict with createjs's MouseEvent
-interface NativeMouseEvent extends MouseEvent {
-
-}
-
-declare namespace createjs {
-    export class AlphaMapFilter extends Filter {
-        constructor(alphaMap: HTMLImageElement | HTMLCanvasElement);
-
-        // properties
-        alphaMap: HTMLImageElement | HTMLCanvasElement;
-
-        // methods
-        clone(): AlphaMapFilter;
-    }
-
-    export class AlphaMaskFilter extends Filter {
-        constructor(mask: HTMLImageElement | HTMLCanvasElement);
-
-        // properties
-        mask: HTMLImageElement | HTMLCanvasElement;
-
-        // methods
-        clone(): AlphaMaskFilter;
-    }
-
-
-    export class Bitmap extends DisplayObject {
-        constructor(imageOrUrl: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement | string);
-
-        // properties
-        image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement;
-        sourceRect: Rectangle;
-
-        // methods
-        clone(): Bitmap;
-    }
-
-
-    export class BitmapText extends DisplayObject {
-        constructor(text?:string, spriteSheet?:SpriteSheet);
-
-        static maxPoolSize: number;
-
-        // properties
-        letterSpacing: number;
-        lineHeight: number;
-        spaceWidth: number;
-        spriteSheet: SpriteSheet;
-        text: string;
-    }
-
-    export class BlurFilter extends Filter {
-        constructor(blurX?: number, blurY?: number, quality?: number);
-
-        // properties
-        blurX: number;
-        blurY: number;
-        quality: number;
-
-        // methods
-        clone(): BlurFilter;
-    }
-
-    export class ButtonHelper {
-        constructor(target: Sprite, outLabel?: string, overLabel?: string, downLabel?: string, play?: boolean, hitArea?: DisplayObject, hitLabel?: string);
-        constructor(target: MovieClip, outLabel?: string, overLabel?: string, downLabel?: string, play?: boolean, hitArea?: DisplayObject, hitLabel?: string);
-
-        // properties
-        downLabel: string | number;
-        outLabel: string | number;
-        overLabel: string | number;
-        play: boolean;
-        target: MovieClip | Sprite;
-        enabled: boolean;
-
-        // methods
-        /**
-         * @deprecated - use the 'enabled' property instead
-         */
-        setEnabled(value: boolean): void;
-        /**
-         * @deprecated - use the 'enabled' property instead
-         */
-        getEnabled(): boolean;
-        toString(): string;
-    }
-
-    export class ColorFilter extends Filter {
-        constructor(redMultiplier?: number, greenMultiplier?: number, blueMultiplier?: number, alphaMultiplier?: number, redOffset?: number, greenOffset?: number, blueOffset?: number, alphaOffset?: number);
-
-        // properties
-        alphaMultiplier: number;
-        alphaOffset: number;
-        blueMultiplier: number;
-        blueOffset: number;
-        greenMultiplier: number;
-        greenOffset: number;
-        redMultiplier: number;
-        redOffset: number;
-
-        // methods
-        clone(): ColorFilter;
-    }
-
-    export class ColorMatrix {
-        constructor(brightness?: number, contrast?: number, saturation?: number, hue?: number);
-
-        // methods
-        adjustBrightness(value: number): ColorMatrix;
-        adjustColor(brightness: number, contrast: number, saturation: number, hue: number): ColorMatrix;
-        adjustContrast(value: number): ColorMatrix;
-        adjustHue(value: number): ColorMatrix;
-        adjustSaturation(value: number): ColorMatrix;
-        clone(): ColorMatrix;
-        concat(...matrix: number[]): ColorMatrix;
-        concat(matrix: ColorMatrix): ColorMatrix;
-        copy(...matrix: number[]): ColorMatrix;
-        copy(matrix: ColorMatrix): ColorMatrix;
-        reset(): ColorMatrix;
-        setColor( brightness: number, contrast: number, saturation: number, hue: number ): ColorMatrix;
-        toArray(): number[];
-        toString(): string;
-    }
-
-    export class ColorMatrixFilter extends Filter {
-        constructor(matrix: number[] | ColorMatrix);
-
-        // properties
-        matrix: number[] | ColorMatrix;
-
-        // methods
-        clone(): ColorMatrixFilter;
-    }
-
-
-    export class Container extends DisplayObject {
-        constructor();
-
-        // properties
-        children: DisplayObject[];
-        mouseChildren: boolean;
-        numChildren: number;
-        tickChildren: boolean;
-
-        // methods
-        addChild<T extends DisplayObject>(child: T): T;
-        addChild<T extends DisplayObject>(child0: DisplayObject, lastChild: T): T;
-        addChild<T extends DisplayObject>(child0: DisplayObject, child1: DisplayObject, lastChild: T): T;
-        addChild<T extends DisplayObject>(child0: DisplayObject, child1: DisplayObject, child2: DisplayObject, lastChild: T): T;
-        addChild(...children: DisplayObject[]): DisplayObject;
-        addChildAt<T extends DisplayObject>(child: T, index: number): T;
-        addChildAt<T extends DisplayObject>(child0: DisplayObject, lastChild: T, index: number): T;
-        addChildAt<T extends DisplayObject>(child0: DisplayObject, child1: DisplayObject, lastChild: T, index: number): T;
-        addChildAt(...childOrIndex: (DisplayObject|number)[]): DisplayObject; // actually (...child: DisplayObject[], index: number)
-
-        clone(recursive?: boolean): Container;
-        contains(child: DisplayObject): boolean;
-        getChildAt(index: number): DisplayObject;
-        getChildByName(name: string): DisplayObject;
-        getChildIndex(child: DisplayObject): number;
-        /**
-         * @deprecated - use numChildren property instead.
-         */
-        getNumChildren(): number;
-        getObjectsUnderPoint(x: number, y: number, mode: number): DisplayObject[];
-        getObjectUnderPoint(x: number, y: number, mode: number): DisplayObject;
-        removeAllChildren(): void;
-        removeChild(...child: DisplayObject[]): boolean;
-        removeChildAt(...index: number[]): boolean;
-        setChildIndex(child: DisplayObject, index: number): void;
-        sortChildren(sortFunction: (a: DisplayObject, b: DisplayObject) => number): void;
-        swapChildren(child1: DisplayObject, child2: DisplayObject): void;
-        swapChildrenAt(index1: number, index2: number): void;
-    }
-
-    export class DisplayObject extends EventDispatcher {
-        constructor();
-
-        // properties
-        alpha: number;
-        cacheCanvas: HTMLCanvasElement | Object;
-        cacheID: number;
-        compositeOperation: string;
-        cursor: string;
-        filters: Filter[];
-        hitArea: DisplayObject;
-        id: number;
-        mask: Shape;
-        mouseEnabled: boolean;
-        name: string;
-        parent: Container;
-        regX: number;
-        regY: number;
-        rotation: number;
-        scaleX: number;
-        scaleY: number;
-        shadow: Shadow;
-        skewX: number;
-        skewY: number;
-        snapToPixel: boolean;
-        stage: Stage;
-        static suppressCrossDomainErrors: boolean;
-        tickEnabled: boolean;
-        transformMatrix: Matrix2D;
-        visible: boolean;
-        x: number;
-        y: number;
-
-        // methods
-        cache(x: number, y: number, width: number, height: number, scale?: number): void;
-        clone(): DisplayObject;
-        draw(ctx: CanvasRenderingContext2D, ignoreCache?: boolean): boolean;
-        getBounds(): Rectangle;
-        getCacheDataURL(): string;
-        getConcatenatedDisplayProps(props?: DisplayProps): DisplayProps;
-        getConcatenatedMatrix(mtx?: Matrix2D): Matrix2D;
-        getMatrix(matrix?: Matrix2D): Matrix2D;
-        /**
-         * @deprecated
-         */
-        getStage(): Stage;
-        getTransformedBounds(): Rectangle;
-        globalToLocal(x: number, y: number, pt?: Point | Object): Point;
-        hitTest(x: number, y: number): boolean;
-        isVisible(): boolean;
-        localToGlobal(x: number, y: number, pt?: Point | Object): Point;
-        localToLocal(x: number, y: number, target: DisplayObject, pt?: Point | Object): Point;
-        set(props: Object): DisplayObject;
-        setBounds(x: number, y: number, width: number, height: number): void;
-        setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, regX?: number, regY?: number): DisplayObject;
-        uncache(): void;
-        updateCache(compositeOperation?: string): void;
-        updateContext(ctx: CanvasRenderingContext2D): void;
-    }
-
-    export class DisplayProps {
-        constructor(visible?: number, alpha?: number, shadow?: number, compositeOperation?: number, matrix?: number);
-
-        // properties
-        alpha: number;
-        compositeOperation: string;
-        matrix: Matrix2D;
-        shadow: Shadow;
-        visible: boolean;
-
-        // methods
-        append(visible: boolean, alpha: number, shadow: Shadow, compositeOperation: string, matrix?: Matrix2D): DisplayProps;
-        clone(): DisplayProps;
-        identity(): DisplayProps;
-        prepend(visible: boolean, alpha: number, shadow: Shadow, compositeOperation: string, matrix?: Matrix2D): DisplayProps;
-        setValues(visible?: boolean, alpha?: number, shadow?: number, compositeOperation?: number, matrix?: number): DisplayProps;
-    }
-
-
-    export class DOMElement extends DisplayObject {
-        constructor(htmlElement: HTMLElement);
-
-        // properties
-        htmlElement: HTMLElement;
-
-        // methods
-        clone(): DisplayObject; // throw error
-        set(props: Object): DOMElement;
-        setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, regX?: number, regY?: number): DOMElement;
-    }
-
-
-    export class EaselJS {
-        // properties
-        static buildDate: string;
-        static version: string;
-    }
-
-    export class Filter {
-        constructor();
-
-        // methods
-        applyFilter(ctx: CanvasRenderingContext2D, x: number, y: number, width: number, height: number, targetCtx?: CanvasRenderingContext2D, targetX?: number, targetY?: number): boolean;
-        clone(): Filter;
-        getBounds(): Rectangle;
-        toString(): string;
-    }
-
-    export class Graphics {
-        constructor();
-
-        // properties
-        static BASE_64: Object;
-        static beginCmd: Graphics.BeginPath;
-        command: Object;
-        instructions: Object[]; // array of graphics command objects (Graphics.Fill, etc)
-        static STROKE_CAPS_MAP: string[];
-        static STROKE_JOINTS_MAP: string[];
-
-        // methods
-        append(command: Object, clean?: boolean): Graphics;
-        arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise: boolean): Graphics;
-        arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): Graphics;
-        beginBitmapFill(image: Object, repetition?: string, matrix?: Matrix2D): Graphics;
-        beginBitmapStroke(image: Object, repetition?: string): Graphics;
-        beginFill(color: string): Graphics;
-        beginLinearGradientFill(colors: string[], ratios: number[], x0: number, y0: number, x1: number, y1: number): Graphics;
-        beginLinearGradientStroke(colors: string[], ratios: number[], x0: number, y0: number, x1: number, y1: number): Graphics;
-        beginRadialGradientFill(colors: string[], ratios: number[], x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): Graphics;
-        beginRadialGradientStroke(colors: string[], ratios: number[], x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): Graphics;
-        beginStroke(color: string): Graphics;
-        bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): Graphics;
-        clear(): Graphics;
-        clone(): Graphics;
-        closePath(): Graphics;
-        curveTo(cpx: number, cpy: number, x: number, y: number): Graphics;
-        decodePath(str: string): Graphics;
-        draw(ctx: CanvasRenderingContext2D): void;
-        drawAsPath(ctx: CanvasRenderingContext2D): void;
-        drawCircle(x: number, y: number, radius: number): Graphics;
-        drawEllipse(x: number, y: number, w: number, h: number): Graphics;
-        drawPolyStar(x: number, y: number, radius: number, sides: number, pointSize: number, angle: number): Graphics;
-        drawRect(x: number, y: number, w: number, h: number): Graphics;
-        drawRoundRect(x: number, y: number, w: number, h: number, radius: number): Graphics;
-        drawRoundRectComplex(x: number, y: number, w: number, h: number, radiusTL: number, radiusTR: number, radiusBR: number, radisBL: number): Graphics;
-        endFill(): Graphics;
-        endStroke(): Graphics;
-        static getHSL(hue: number, saturation: number, lightness: number, alpha?: number): string;
-        /**
-         * @deprecated - use the instructions property instead
-         */
-        getInstructions(): Object[];
-        static getRGB(r: number, g: number, b: number, alpha?: number): string;
-        inject(callback: (data: any) => any,  data: any): Graphics; // deprecated
-        isEmpty(): boolean;
-        lineTo(x: number, y: number): Graphics;
-        moveTo(x: number, y: number): Graphics;
-        quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): Graphics;
-        rect(x: number, y: number, w: number, h: number): Graphics;
-        setStrokeStyle(thickness: number, caps?: string | number, joints?: string | number, miterLimit?: number, ignoreScale?: boolean): Graphics;
-        setStrokeDash(segments?: number[], offset?: number): Graphics;
-        store(): Graphics;
-        toString(): string;
-        unstore(): Graphics;
-
-
-        // tiny API - short forms of methods above
-        a(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise: boolean): Graphics;
-        at(x1: number, y1: number, x2: number, y2: number, radius: number): Graphics;
-        bf(image: Object, repetition?: string, matrix?: Matrix2D): Graphics;
-        bs(image: Object, repetition?: string): Graphics;
-        f(color: string): Graphics;
-        lf(colors: string[], ratios: number[], x0: number, y0: number, x1: number, y1: number): Graphics;
-        ls(colors: string[], ratios: number[], x0: number, y0: number, x1: number, y1: number): Graphics;
-        rf(colors: string[], ratios: number[], x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): Graphics;
-        rs(colors: string[], ratios: number[], x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): Graphics;
-        s(color: string): Graphics;
-        bt(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): Graphics;
-        c(): Graphics;
-        cp(): Graphics;
-        p(str: string): Graphics;
-        dc(x: number, y: number, radius: number): Graphics;
-        de(x: number, y: number, w: number, h: number): Graphics;
-        dp(x: number, y: number, radius: number, sides: number, pointSize: number, angle: number): Graphics;
-        dr(x: number, y: number, w: number, h: number): Graphics;
-        rr(x: number, y: number, w: number, h: number, radius: number): Graphics;
-        rc(x: number, y: number, w: number, h: number, radiusTL: number, radiusTR: number, radiusBR: number, radisBL: number): Graphics;
-        ef(): Graphics;
-        es(): Graphics;
-        lt(x: number, y: number): Graphics;
-        mt(x: number, y: number): Graphics;
-        qt(cpx: number, cpy: number, x: number, y: number): Graphics;
-        r(x: number, y: number, w: number, h: number): Graphics;
-        ss(thickness: number, caps?: string | number, joints?: string | number, miterLimit?: number, ignoreScale?: boolean): Graphics;
-        sd(segments?: number[], offset?: number): Graphics;
-    }
-
-
-    namespace Graphics
-        {
-        export class Arc
-            {
-            constructor(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise: number);
-
-            // properties
-            anticlockwise: number;
-            endAngle: number;
-            radius: number;
-            startAngle: number;
-            x: number;
-            y: number;
-            }
-
-        export class ArcTo
-            {
-            constructor(x1: number, y1: number, x2: number, y2: number, radius: number);
-
-            // properties
-            x1: number;
-            y1: number;
-            x2: number;
-            y2: number;
-            radius: number;
-            }
-
-        export class BeginPath
-            {
-
-            }
-
-        export class BezierCurveTo
-            {
-            constructor(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number);
-
-            // properties
-            cp1x: number;
-            cp1y: number;
-            cp2x: number;
-            cp2y: number;
-            x: number;
-            y: number;
-            }
-
-        export class Circle
-            {
-            constructor(x: number, y: number, radius: number);
-
-            // properties
-            x: number;
-            y: number;
-            radius: number;
-            }
-
-        export class ClosePath
-            {
-
-            }
-
-        export class Fill
-            {
-            constructor(style: Object, matrix?: Matrix2D);
-
-            // properties
-            style: Object;
-            matrix: Matrix2D;
-
-            // methods
-            bitmap(image: HTMLImageElement, repetition?: string): Fill;
-            linearGradient(colors: number[], ratios: number[], x0: number, y0: number, x1: number, y1: number): Fill;
-            radialGradient(colors: number[], ratios: number[], x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): Fill;
-            }
-
-        export class LineTo
-            {
-            constructor(x: number, y: number);
-
-            // properties
-            x: number;
-            y: number;
-            }
-
-        export class MoveTo
-            {
-            constructor(x: number, y: number);
-
-            x: number;
-            y: number;
-            }
-
-        export class PolyStar
-            {
-            constructor(x: number, y: number, radius: number, sides: number, pointSize: number, angle: number);
-
-            // properties
-            angle: number;
-            pointSize: number;
-            radius: number;
-            sides: number;
-            x: number;
-            y: number;
-            }
-
-        export class QuadraticCurveTo
-            {
-            constructor(cpx: number, cpy: number, x: number, y: number);
-
-            // properties
-            cpx: number;
-            cpy: number;
-            x: number;
-            y: number;
-            }
-
-        export class Rect
-            {
-            constructor(x: number, y: number, w: number, h: number);
-
-            // properties
-            x: number;
-            y: number;
-            w: number;
-            h: number;
-            }
-
-        export class RoundRect
-            {
-            constructor(x: number, y: number, w: number, h: number, radiusTL: number, radiusTR: number, radiusBR: number, radiusBL: number);
-
-            // properties
-            x: number;
-            y: number;
-            w: number;
-            h: number;
-            radiusTL: number;
-            radiusTR: number;
-            radiusBR: number;
-            radiusBL: number;
-            }
-
-        export class Stroke
-            {
-            constructor(style: Object, ignoreScale: boolean);
-
-            // properties
-            style: Object;
-            ignoreScale: boolean;
-
-            // methods
-            bitmap(image: HTMLImageElement, repetition?: string): Stroke;
-            linearGradient(colors: number[], ratios: number[], x0: number, y0: number, x1: number, y1: number): Stroke;
-            radialGradient(colors: number[], ratios: number[], x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): Stroke;
-            }
-
-        export class StrokeStyle
-            {
-            constructor(width: number, caps: string, joints: number, miterLimit: number);
-
-            // properties
-            caps: string;
-            joints: string;
-            miterLimit: number;
-            width: number;
-            }
-        }
-
-
-
-    export class Matrix2D {
-        constructor(a?: number, b?: number, c?: number, d?: number, tx?: number, ty?: number);
-
-        // properties
-        a: number;
-        b: number;
-        c: number;
-        d: number;
-        static DEG_TO_RAD: number;
-        static identity: Matrix2D;
-        tx: number;
-        ty: number;
-
-        // methods
-        append(a: number, b: number, c: number, d: number, tx: number, ty: number): Matrix2D;
-        appendMatrix(matrix: Matrix2D): Matrix2D;
-        appendTransform(x: number, y: number, scaleX: number, scaleY: number, rotation: number, skewX: number, skewY: number, regX?: number, regY?: number): Matrix2D;
-        clone(): Matrix2D;
-        copy(matrix: Matrix2D): Matrix2D;
-        decompose(): {x: number; y: number; scaleX: number; scaleY: number; rotation: number; skewX: number; skewY: number};
-        decompose(target: Object): Matrix2D;
-        equals(matrix: Matrix2D): boolean;
-        identity(): Matrix2D;
-        invert(): Matrix2D;
-        isIdentity(): boolean;
-        prepend(a: number, b: number, c: number, d: number, tx: number, ty: number): Matrix2D;
-        prependMatrix(matrix: Matrix2D): Matrix2D;
-        prependTransform(x: number, y: number, scaleX: number, scaleY: number, rotation: number, skewX: number, skewY: number, regX?: number, regY?: number): Matrix2D;
-        rotate(angle: number): Matrix2D;
-        scale(x: number, y: number): Matrix2D;
-        setValues(a?: number, b?: number, c?: number, d?: number, tx?: number, ty?: number): Matrix2D;
-        skew(skewX: number, skewY: number): Matrix2D;
-        toString(): string;
-        transformPoint(x: number, y: number, pt?: Point | Object): Point;
-        translate(x: number, y: number): Matrix2D;
-    }
-
-
-    export class MouseEvent extends Event {
-        constructor(type: string, bubbles: boolean, cancelable: boolean, stageX: number, stageY: number, nativeEvent: NativeMouseEvent, pointerID: number, primary: boolean, rawX: number, rawY: number);
-
-        // properties
-        isTouch: boolean;
-        localX: number;
-        localY: number;
-        nativeEvent: NativeMouseEvent;
-        pointerID: number;
-        primary: boolean;
-        rawX: number;
-        rawY: number;
-        stageX: number;
-        stageY: number;
-        mouseMoveOutside: boolean;
-
-        // methods
-        clone(): MouseEvent;
-
-        // EventDispatcher mixins
-        addEventListener(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): Function;
-        addEventListener(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): Function;
-        addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): Object;
-        addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): Object;
-        dispatchEvent(eventObj: Object | string | Event, target?: Object): boolean;
-        hasEventListener(type: string): boolean;
-        off(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): void;
-        off(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): void;
-        off(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): void;
-        off(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): void;
-        off(type: string, listener: Function, useCapture?: boolean): void; // It is necessary for "arguments.callee"
-        on(type: string, listener: (eventObj: Object) => boolean, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function;
-        on(type: string, listener: (eventObj: Object) => void, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function;
-        on(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Object;
-        on(type: string, listener: { handleEvent: (eventObj: Object) => void; }, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Object;
-        removeAllEventListeners(type?: string): void;
-        removeEventListener(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): void;
-        removeEventListener(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): void;
-        removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): void;
-        removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): void;
-        removeEventListener(type: string, listener: Function, useCapture?: boolean): void; // It is necessary for "arguments.callee"
-        toString(): string;
-        willTrigger(type: string): boolean;
-    }
-
-
-    export class MovieClip extends Container {
-        constructor(mode?: string, startPosition?: number, loop?: boolean, labels?: Object);
-
-        // properties
-        actionsEnabled: boolean;
-        autoReset: boolean;
-        static buildDate: string;
-        currentFrame: number;
-        currentLabel: string;
-        frameBounds: Rectangle[];
-        framerate: number;
-        static INDEPENDENT: string;
-        labels: Object[];
-        loop: boolean;
-        mode: string;
-        paused: boolean;
-        static SINGLE_FRAME: string;
-        startPosition: number;
-        static SYNCHED: string;
-        timeline: Timeline;
-        static version: string;
-
-        // methods
-        advance(time?: number): void;
-        clone(): MovieClip; // not supported
-        /**
-         * @deprecated - use 'currentLabel' property instead
-         */
-        getCurrentLabel(): string;  // deprecated
-        /**
-         * @deprecated - use 'labels' property instead
-         */
-        getLabels(): Object[];
-        gotoAndPlay(positionOrLabel: string | number): void;
-        gotoAndStop(positionOrLabel: string | number): void;
-        play(): void;
-        stop(): void;
-    }
-
-    export class MovieClipPlugin {
-        // methods
-        tween(tween: Tween, prop: string, value: string | number | boolean, startValues: any[], endValues: any[], ratio: number, wait: Object, end: Object): void;
-    }
-
-    export class Point {
-        constructor(x?: number, y?: number);
-
-        // properties
-        x: number;
-        y: number;
-
-        // methods
-        clone(): Point;
-        copy(point: Point): Point;
-        setValues(x?: number, y?: number): Point;
-        toString(): string;
-    }
-
-    export class Rectangle {
-        constructor(x?: number, y?: number, width?: number, height?: number);
-
-        // properties
-        height: number;
-        width: number;
-        x: number;
-        y: number;
-
-        // methods
-        clone(): Rectangle;
-        contains(x: number, y: number, width?: number, height?: number): boolean;
-        copy(rectangle: Rectangle): Rectangle;
-        extend(x: number, y: number, width?: number, height?: number): Rectangle;
-        intersection(rect: Rectangle): Rectangle;
-        intersects(rect: Rectangle): boolean;
-        isEmpty(): boolean;
-        setValues(x?: number, y?: number, width?: number, height?: number): Rectangle;
-        toString(): string;
-        union(rect: Rectangle): Rectangle;
-    }
-
-
-    export class Shadow {
-        constructor(color: string, offsetX: number, offsetY: number, blur: number);
-
-        // properties
-        blur: number;
-        color: string;
-        static identity: Shadow;
-        offsetX: number;
-        offsetY: number;
-
-        // methods
-        clone(): Shadow;
-        toString(): string;
-    }
-
-
-    export class Shape extends DisplayObject {
-        constructor(graphics?: Graphics);
-
-        // properties
-        graphics: Graphics;
-
-        // methods
-        clone(recursive?: boolean): Shape;
-        set(props: Object): Shape;
-        setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, regX?: number, regY?: number): Shape;
-    }
-
-
-    export class Sprite extends DisplayObject {
-        constructor(spriteSheet: SpriteSheet, frameOrAnimation?: string | number);
-
-        // properties
-        currentAnimation: string;
-        currentAnimationFrame: number;
-        currentFrame: number;
-        framerate: number;
-        /**
-         * @deprecated
-         */
-        offset: number;
-        paused: boolean;
-        spriteSheet: SpriteSheet;
-
-        // methods
-        advance(time?: number): void;
-        clone(): Sprite;
-        getBounds(): Rectangle;
-        gotoAndPlay(frameOrAnimation: string | number): void;
-        gotoAndStop(frameOrAnimation: string | number): void;
-        play(): void;
-        set(props: Object): Sprite;
-        setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, regX?: number, regY?: number): Sprite;
-        stop(): void;
-
-    }
-
-    export class SpriteContainer extends Container
-        {
-        constructor(spriteSheet?: SpriteSheet);
-
-        spriteSheet: SpriteSheet;
-        }
-
-    // what is returned from SpriteSheet.getAnimation(string)
-    interface SpriteSheetAnimation {
-        frames: number[];
-        speed: number;
-        name: string;
-        next: string;
-    }
-
-    // what is returned from SpriteSheet.getFrame(number)
-    interface SpriteSheetFrame {
-        image: HTMLImageElement;
-        rect: Rectangle;
-    }
-
-    export class SpriteSheet extends EventDispatcher {
-        constructor(data: Object);
-
-        // properties
-        animations: string[];
-        complete: boolean;
-        framerate: number;
-
-        // methods
-        clone(): SpriteSheet;
-        getAnimation(name: string): SpriteSheetAnimation;
-        /**
-         * @deprecated - use the 'animations' property instead
-         */
-        getAnimations(): string[];
-        getFrame(frameIndex: number): SpriteSheetFrame;
-        getFrameBounds(frameIndex: number, rectangle?: Rectangle): Rectangle;
-        getNumFrames(animation: string): number;
-    }
-
-
-    export class SpriteSheetBuilder extends EventDispatcher {
-        constructor();
-
-        // properties
-        maxHeight: number;
-        maxWidth: number;
-        padding: number;
-        progress: number;
-        scale: number;
-        spriteSheet: SpriteSheet;
-        timeSlice: number;
-
-        // methods
-        addAnimation(name: string, frames: number[], next?: string|boolean, frequency?: number): void;
-        addFrame(source: DisplayObject, sourceRect?: Rectangle, scale?: number, setupFunction?: () => any, setupData?: Object): number;
-        addMovieClip(source: MovieClip, sourceRect?: Rectangle, scale?: number, setupFunction?: () => any, setupData?: Object, labelFunction?: () => any): void;
-        build(): SpriteSheet;
-        buildAsync(timeSlice?: number): void;
-        clone(): void; // throw error
-        stopAsync(): void;
-    }
-
-    export class SpriteSheetUtils {
-        /**
-         * @deprecated
-         */
-        static addFlippedFrames(spriteSheet: SpriteSheet, horizontal?: boolean, vertical?: boolean, both?: boolean): void; // deprecated
-        static extractFrame(spriteSheet: SpriteSheet, frameOrAnimation: number | string): HTMLImageElement;
-        /**
-         * @deprecated
-         */
-        static mergeAlpha(rgbImage: HTMLImageElement, alphaImage: HTMLImageElement, canvas?: HTMLCanvasElement): HTMLCanvasElement; // deprecated
-    }
-
-    export class SpriteStage extends Stage
-        {
-        constructor(canvas: HTMLCanvasElement | string, preserveDrawingBuffer?: boolean, antialias?: boolean);
-
-        // properties
-        static INDICES_PER_BOX: number;
-        isWebGL: boolean;
-        static MAX_BOXES_POINTS_INCREMENT: number;
-        static MAX_INDEX_SIZE: number;
-        static NUM_VERTEX_PROPERTIES: number;
-        static NUM_VERTEX_PROPERTIES_PER_BOX: number;
-        static POINTS_PER_BOX: number;
-
-        // methods
-        clearImageTexture(image: Object): void;
-        updateViewport(width: number, height: number): void;
-        }
-
-    export class Stage extends Container {
-        constructor(canvas: HTMLCanvasElement | string | Object);
-
-        // properties
-        autoClear: boolean;
-        canvas: HTMLCanvasElement | Object;
-        drawRect: Rectangle;
-        handleEvent: Function;
-        mouseInBounds: boolean;
-        mouseMoveOutside: boolean;
-        mouseX: number;
-        mouseY: number;
-        nextStage: Stage;
-        /**
-         * @deprecated
-         */
-        preventSelection: boolean;
-        snapToPixelEnabled: boolean;  // deprecated
-        tickOnUpdate: boolean;
-
-        // methods
-        clear(): void;
-        clone(): Stage;
-        enableDOMEvents(enable?: boolean): void;
-        enableMouseOver(frequency?: number): void;
-        tick(props?: Object): void;
-        toDataURL(backgroundColor: string, mimeType: string): string;
-        update(...arg: any[]): void;
-
-    }
-
-
-    export class Text extends DisplayObject {
-        constructor(text?: string, font?: string, color?: string);
-
-        // properties
-        color: string;
-        font: string;
-        lineHeight: number;
-        lineWidth: number;
-        maxWidth: number;
-        outline: number;
-        text: string;
-        textAlign: string;
-        textBaseline: string;
-
-        // methods
-        clone(): Text;
-        getMeasuredHeight(): number;
-        getMeasuredLineHeight(): number;
-        getMeasuredWidth(): number;
-        getMetrics(): Object;
-        set(props: Object): Text;
-        setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, regX?: number, regY?: number): Text;
-    }
-
-    export class Ticker {
-        // properties
-        static framerate: number;
-        static interval: number;
-        static maxDelta: number;
-        static paused: boolean;
-        static RAF: string;
-        static RAF_SYNCHED: string;
-        static TIMEOUT: string;
-        static timingMode: string;
-        /**
-         * @deprecated
-         */
-        static useRAF: boolean;
-
-        // methods
-        static getEventTime(runTime?: boolean): number;
-        /**
-         * @deprecated - use the 'framerate' property instead
-         */
-        static getFPS(): number;
-        /**
-         * @deprecated - use the 'interval' property instead
-         */
-        static getInterval(): number;
-        static getMeasuredFPS(ticks?: number): number;
-        static getMeasuredTickTime(ticks?: number): number;
-        /**
-         * @deprecated - use the 'paused' property instead
-         */
-        static getPaused(): boolean;
-        static getTicks(pauseable?: boolean): number;
-        static getTime(runTime?: boolean): number;
-        static init(): void;
-        static reset(): void;
-        /**
-         * @deprecated - use the 'framerate' property instead
-         */
-        static setFPS(value: number): void;
-        /**
-         * @deprecated - use the 'interval' property instead
-         */
-        static setInterval(interval: number): void;
-        /**
-         * @deprecated - use the 'paused' property instead
-         */
-        static setPaused(value: boolean): void;
-
-        // EventDispatcher mixins
-        static addEventListener(type: string, listener: Stage, useCapture?: boolean): Stage;
-        static addEventListener(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): Function;
-        static addEventListener(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): Function;
-        static addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): Object;
-        static addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): Object;
-        static dispatchEvent(eventObj: Object | string | Event, target?: Object): boolean;
-        static hasEventListener(type: string): boolean;
-        static off(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): void;
-        static off(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): void;
-        static off(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): void;
-        static off(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): void;
-        static off(type: string, listener: Function, useCapture?: boolean): void; // It is necessary for "arguments.callee"
-        static on(type: string, listener: (eventObj: Object) => boolean, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function;
-        static on(type: string, listener: (eventObj: Object) => void, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function;
-        static on(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Object;
-        static on(type: string, listener: { handleEvent: (eventObj: Object) => void; }, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Object;
-        static removeAllEventListeners(type?: string): void;
-        static removeEventListener(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): void;
-        static removeEventListener(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): void;
-        static removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): void;
-        static removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): void;
-        static removeEventListener(type: string, listener: Function, useCapture?: boolean): void; // It is necessary for "arguments.callee"
-        static toString(): string;
-        static willTrigger(type: string): boolean;
-    }
-
-    export class TickerEvent {
-        // properties
-        target: Object;
-        type: string;
-        paused: boolean;
-        delta: number;
-        time: number;
-        runTime: number;
-    }
-
-    export class Touch {
-        // methods
-        static disable(stage: Stage): void;
-        static enable(stage: Stage, singleTouch?: boolean, allowDefault?: boolean): boolean;
-        static isSupported(): boolean;
-    }
-
-    export class UID {
-        // methods
-        static get(): number;
-    }
-}
diff --git a/easeljs/index.d.ts b/easeljs/index.d.ts
new file mode 100644
index 0000000000..73408291ac
--- /dev/null
+++ b/easeljs/index.d.ts
@@ -0,0 +1,1029 @@
+// Type definitions for EaselJS 0.8.0
+// Project: http://www.createjs.com/#!/EaselJS
+// Definitions by: Pedro Ferreira <https://bitbucket.org/drk4>, Chris Smith <https://github.com/evilangelist>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*
+    Copyright (c) 2012 Pedro Ferreira
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+// Library documentation : http://www.createjs.com/Docs/EaselJS/modules/EaselJS.html
+
+/// <reference types="createjs-lib" />
+/// <reference types="tweenjs" />
+
+// rename the native MouseEvent, to avoid conflict with createjs's MouseEvent
+interface NativeMouseEvent extends MouseEvent {
+
+}
+
+declare namespace createjs {
+    export class AlphaMapFilter extends Filter {
+        constructor(alphaMap: HTMLImageElement | HTMLCanvasElement);
+
+        // properties
+        alphaMap: HTMLImageElement | HTMLCanvasElement;
+
+        // methods
+        clone(): AlphaMapFilter;
+    }
+
+    export class AlphaMaskFilter extends Filter {
+        constructor(mask: HTMLImageElement | HTMLCanvasElement);
+
+        // properties
+        mask: HTMLImageElement | HTMLCanvasElement;
+
+        // methods
+        clone(): AlphaMaskFilter;
+    }
+
+
+    export class Bitmap extends DisplayObject {
+        constructor(imageOrUrl: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement | string);
+
+        // properties
+        image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement;
+        sourceRect: Rectangle;
+
+        // methods
+        clone(): Bitmap;
+    }
+
+
+    export class BitmapText extends DisplayObject {
+        constructor(text?:string, spriteSheet?:SpriteSheet);
+
+        static maxPoolSize: number;
+
+        // properties
+        letterSpacing: number;
+        lineHeight: number;
+        spaceWidth: number;
+        spriteSheet: SpriteSheet;
+        text: string;
+    }
+
+    export class BlurFilter extends Filter {
+        constructor(blurX?: number, blurY?: number, quality?: number);
+
+        // properties
+        blurX: number;
+        blurY: number;
+        quality: number;
+
+        // methods
+        clone(): BlurFilter;
+    }
+
+    export class ButtonHelper {
+        constructor(target: Sprite, outLabel?: string, overLabel?: string, downLabel?: string, play?: boolean, hitArea?: DisplayObject, hitLabel?: string);
+        constructor(target: MovieClip, outLabel?: string, overLabel?: string, downLabel?: string, play?: boolean, hitArea?: DisplayObject, hitLabel?: string);
+
+        // properties
+        downLabel: string | number;
+        outLabel: string | number;
+        overLabel: string | number;
+        play: boolean;
+        target: MovieClip | Sprite;
+        enabled: boolean;
+
+        // methods
+        /**
+         * @deprecated - use the 'enabled' property instead
+         */
+        setEnabled(value: boolean): void;
+        /**
+         * @deprecated - use the 'enabled' property instead
+         */
+        getEnabled(): boolean;
+        toString(): string;
+    }
+
+    export class ColorFilter extends Filter {
+        constructor(redMultiplier?: number, greenMultiplier?: number, blueMultiplier?: number, alphaMultiplier?: number, redOffset?: number, greenOffset?: number, blueOffset?: number, alphaOffset?: number);
+
+        // properties
+        alphaMultiplier: number;
+        alphaOffset: number;
+        blueMultiplier: number;
+        blueOffset: number;
+        greenMultiplier: number;
+        greenOffset: number;
+        redMultiplier: number;
+        redOffset: number;
+
+        // methods
+        clone(): ColorFilter;
+    }
+
+    export class ColorMatrix {
+        constructor(brightness?: number, contrast?: number, saturation?: number, hue?: number);
+
+        // methods
+        adjustBrightness(value: number): ColorMatrix;
+        adjustColor(brightness: number, contrast: number, saturation: number, hue: number): ColorMatrix;
+        adjustContrast(value: number): ColorMatrix;
+        adjustHue(value: number): ColorMatrix;
+        adjustSaturation(value: number): ColorMatrix;
+        clone(): ColorMatrix;
+        concat(...matrix: number[]): ColorMatrix;
+        concat(matrix: ColorMatrix): ColorMatrix;
+        copy(...matrix: number[]): ColorMatrix;
+        copy(matrix: ColorMatrix): ColorMatrix;
+        reset(): ColorMatrix;
+        setColor( brightness: number, contrast: number, saturation: number, hue: number ): ColorMatrix;
+        toArray(): number[];
+        toString(): string;
+    }
+
+    export class ColorMatrixFilter extends Filter {
+        constructor(matrix: number[] | ColorMatrix);
+
+        // properties
+        matrix: number[] | ColorMatrix;
+
+        // methods
+        clone(): ColorMatrixFilter;
+    }
+
+
+    export class Container extends DisplayObject {
+        constructor();
+
+        // properties
+        children: DisplayObject[];
+        mouseChildren: boolean;
+        numChildren: number;
+        tickChildren: boolean;
+
+        // methods
+        addChild<T extends DisplayObject>(child: T): T;
+        addChild<T extends DisplayObject>(child0: DisplayObject, lastChild: T): T;
+        addChild<T extends DisplayObject>(child0: DisplayObject, child1: DisplayObject, lastChild: T): T;
+        addChild<T extends DisplayObject>(child0: DisplayObject, child1: DisplayObject, child2: DisplayObject, lastChild: T): T;
+        addChild(...children: DisplayObject[]): DisplayObject;
+        addChildAt<T extends DisplayObject>(child: T, index: number): T;
+        addChildAt<T extends DisplayObject>(child0: DisplayObject, lastChild: T, index: number): T;
+        addChildAt<T extends DisplayObject>(child0: DisplayObject, child1: DisplayObject, lastChild: T, index: number): T;
+        addChildAt(...childOrIndex: (DisplayObject|number)[]): DisplayObject; // actually (...child: DisplayObject[], index: number)
+
+        clone(recursive?: boolean): Container;
+        contains(child: DisplayObject): boolean;
+        getChildAt(index: number): DisplayObject;
+        getChildByName(name: string): DisplayObject;
+        getChildIndex(child: DisplayObject): number;
+        /**
+         * @deprecated - use numChildren property instead.
+         */
+        getNumChildren(): number;
+        getObjectsUnderPoint(x: number, y: number, mode: number): DisplayObject[];
+        getObjectUnderPoint(x: number, y: number, mode: number): DisplayObject;
+        removeAllChildren(): void;
+        removeChild(...child: DisplayObject[]): boolean;
+        removeChildAt(...index: number[]): boolean;
+        setChildIndex(child: DisplayObject, index: number): void;
+        sortChildren(sortFunction: (a: DisplayObject, b: DisplayObject) => number): void;
+        swapChildren(child1: DisplayObject, child2: DisplayObject): void;
+        swapChildrenAt(index1: number, index2: number): void;
+    }
+
+    export class DisplayObject extends EventDispatcher {
+        constructor();
+
+        // properties
+        alpha: number;
+        cacheCanvas: HTMLCanvasElement | Object;
+        cacheID: number;
+        compositeOperation: string;
+        cursor: string;
+        filters: Filter[];
+        hitArea: DisplayObject;
+        id: number;
+        mask: Shape;
+        mouseEnabled: boolean;
+        name: string;
+        parent: Container;
+        regX: number;
+        regY: number;
+        rotation: number;
+        scaleX: number;
+        scaleY: number;
+        shadow: Shadow;
+        skewX: number;
+        skewY: number;
+        snapToPixel: boolean;
+        stage: Stage;
+        static suppressCrossDomainErrors: boolean;
+        tickEnabled: boolean;
+        transformMatrix: Matrix2D;
+        visible: boolean;
+        x: number;
+        y: number;
+
+        // methods
+        cache(x: number, y: number, width: number, height: number, scale?: number): void;
+        clone(): DisplayObject;
+        draw(ctx: CanvasRenderingContext2D, ignoreCache?: boolean): boolean;
+        getBounds(): Rectangle;
+        getCacheDataURL(): string;
+        getConcatenatedDisplayProps(props?: DisplayProps): DisplayProps;
+        getConcatenatedMatrix(mtx?: Matrix2D): Matrix2D;
+        getMatrix(matrix?: Matrix2D): Matrix2D;
+        /**
+         * @deprecated
+         */
+        getStage(): Stage;
+        getTransformedBounds(): Rectangle;
+        globalToLocal(x: number, y: number, pt?: Point | Object): Point;
+        hitTest(x: number, y: number): boolean;
+        isVisible(): boolean;
+        localToGlobal(x: number, y: number, pt?: Point | Object): Point;
+        localToLocal(x: number, y: number, target: DisplayObject, pt?: Point | Object): Point;
+        set(props: Object): DisplayObject;
+        setBounds(x: number, y: number, width: number, height: number): void;
+        setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, regX?: number, regY?: number): DisplayObject;
+        uncache(): void;
+        updateCache(compositeOperation?: string): void;
+        updateContext(ctx: CanvasRenderingContext2D): void;
+    }
+
+    export class DisplayProps {
+        constructor(visible?: number, alpha?: number, shadow?: number, compositeOperation?: number, matrix?: number);
+
+        // properties
+        alpha: number;
+        compositeOperation: string;
+        matrix: Matrix2D;
+        shadow: Shadow;
+        visible: boolean;
+
+        // methods
+        append(visible: boolean, alpha: number, shadow: Shadow, compositeOperation: string, matrix?: Matrix2D): DisplayProps;
+        clone(): DisplayProps;
+        identity(): DisplayProps;
+        prepend(visible: boolean, alpha: number, shadow: Shadow, compositeOperation: string, matrix?: Matrix2D): DisplayProps;
+        setValues(visible?: boolean, alpha?: number, shadow?: number, compositeOperation?: number, matrix?: number): DisplayProps;
+    }
+
+
+    export class DOMElement extends DisplayObject {
+        constructor(htmlElement: HTMLElement);
+
+        // properties
+        htmlElement: HTMLElement;
+
+        // methods
+        clone(): DisplayObject; // throw error
+        set(props: Object): DOMElement;
+        setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, regX?: number, regY?: number): DOMElement;
+    }
+
+
+    export class EaselJS {
+        // properties
+        static buildDate: string;
+        static version: string;
+    }
+
+    export class Filter {
+        constructor();
+
+        // methods
+        applyFilter(ctx: CanvasRenderingContext2D, x: number, y: number, width: number, height: number, targetCtx?: CanvasRenderingContext2D, targetX?: number, targetY?: number): boolean;
+        clone(): Filter;
+        getBounds(): Rectangle;
+        toString(): string;
+    }
+
+    export class Graphics {
+        constructor();
+
+        // properties
+        static BASE_64: Object;
+        static beginCmd: Graphics.BeginPath;
+        command: Object;
+        instructions: Object[]; // array of graphics command objects (Graphics.Fill, etc)
+        static STROKE_CAPS_MAP: string[];
+        static STROKE_JOINTS_MAP: string[];
+
+        // methods
+        append(command: Object, clean?: boolean): Graphics;
+        arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise: boolean): Graphics;
+        arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): Graphics;
+        beginBitmapFill(image: Object, repetition?: string, matrix?: Matrix2D): Graphics;
+        beginBitmapStroke(image: Object, repetition?: string): Graphics;
+        beginFill(color: string): Graphics;
+        beginLinearGradientFill(colors: string[], ratios: number[], x0: number, y0: number, x1: number, y1: number): Graphics;
+        beginLinearGradientStroke(colors: string[], ratios: number[], x0: number, y0: number, x1: number, y1: number): Graphics;
+        beginRadialGradientFill(colors: string[], ratios: number[], x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): Graphics;
+        beginRadialGradientStroke(colors: string[], ratios: number[], x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): Graphics;
+        beginStroke(color: string): Graphics;
+        bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): Graphics;
+        clear(): Graphics;
+        clone(): Graphics;
+        closePath(): Graphics;
+        curveTo(cpx: number, cpy: number, x: number, y: number): Graphics;
+        decodePath(str: string): Graphics;
+        draw(ctx: CanvasRenderingContext2D): void;
+        drawAsPath(ctx: CanvasRenderingContext2D): void;
+        drawCircle(x: number, y: number, radius: number): Graphics;
+        drawEllipse(x: number, y: number, w: number, h: number): Graphics;
+        drawPolyStar(x: number, y: number, radius: number, sides: number, pointSize: number, angle: number): Graphics;
+        drawRect(x: number, y: number, w: number, h: number): Graphics;
+        drawRoundRect(x: number, y: number, w: number, h: number, radius: number): Graphics;
+        drawRoundRectComplex(x: number, y: number, w: number, h: number, radiusTL: number, radiusTR: number, radiusBR: number, radisBL: number): Graphics;
+        endFill(): Graphics;
+        endStroke(): Graphics;
+        static getHSL(hue: number, saturation: number, lightness: number, alpha?: number): string;
+        /**
+         * @deprecated - use the instructions property instead
+         */
+        getInstructions(): Object[];
+        static getRGB(r: number, g: number, b: number, alpha?: number): string;
+        inject(callback: (data: any) => any,  data: any): Graphics; // deprecated
+        isEmpty(): boolean;
+        lineTo(x: number, y: number): Graphics;
+        moveTo(x: number, y: number): Graphics;
+        quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): Graphics;
+        rect(x: number, y: number, w: number, h: number): Graphics;
+        setStrokeStyle(thickness: number, caps?: string | number, joints?: string | number, miterLimit?: number, ignoreScale?: boolean): Graphics;
+        setStrokeDash(segments?: number[], offset?: number): Graphics;
+        store(): Graphics;
+        toString(): string;
+        unstore(): Graphics;
+
+
+        // tiny API - short forms of methods above
+        a(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise: boolean): Graphics;
+        at(x1: number, y1: number, x2: number, y2: number, radius: number): Graphics;
+        bf(image: Object, repetition?: string, matrix?: Matrix2D): Graphics;
+        bs(image: Object, repetition?: string): Graphics;
+        f(color: string): Graphics;
+        lf(colors: string[], ratios: number[], x0: number, y0: number, x1: number, y1: number): Graphics;
+        ls(colors: string[], ratios: number[], x0: number, y0: number, x1: number, y1: number): Graphics;
+        rf(colors: string[], ratios: number[], x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): Graphics;
+        rs(colors: string[], ratios: number[], x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): Graphics;
+        s(color: string): Graphics;
+        bt(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): Graphics;
+        c(): Graphics;
+        cp(): Graphics;
+        p(str: string): Graphics;
+        dc(x: number, y: number, radius: number): Graphics;
+        de(x: number, y: number, w: number, h: number): Graphics;
+        dp(x: number, y: number, radius: number, sides: number, pointSize: number, angle: number): Graphics;
+        dr(x: number, y: number, w: number, h: number): Graphics;
+        rr(x: number, y: number, w: number, h: number, radius: number): Graphics;
+        rc(x: number, y: number, w: number, h: number, radiusTL: number, radiusTR: number, radiusBR: number, radisBL: number): Graphics;
+        ef(): Graphics;
+        es(): Graphics;
+        lt(x: number, y: number): Graphics;
+        mt(x: number, y: number): Graphics;
+        qt(cpx: number, cpy: number, x: number, y: number): Graphics;
+        r(x: number, y: number, w: number, h: number): Graphics;
+        ss(thickness: number, caps?: string | number, joints?: string | number, miterLimit?: number, ignoreScale?: boolean): Graphics;
+        sd(segments?: number[], offset?: number): Graphics;
+    }
+
+
+    namespace Graphics
+        {
+        export class Arc
+            {
+            constructor(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise: number);
+
+            // properties
+            anticlockwise: number;
+            endAngle: number;
+            radius: number;
+            startAngle: number;
+            x: number;
+            y: number;
+            }
+
+        export class ArcTo
+            {
+            constructor(x1: number, y1: number, x2: number, y2: number, radius: number);
+
+            // properties
+            x1: number;
+            y1: number;
+            x2: number;
+            y2: number;
+            radius: number;
+            }
+
+        export class BeginPath
+            {
+
+            }
+
+        export class BezierCurveTo
+            {
+            constructor(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number);
+
+            // properties
+            cp1x: number;
+            cp1y: number;
+            cp2x: number;
+            cp2y: number;
+            x: number;
+            y: number;
+            }
+
+        export class Circle
+            {
+            constructor(x: number, y: number, radius: number);
+
+            // properties
+            x: number;
+            y: number;
+            radius: number;
+            }
+
+        export class ClosePath
+            {
+
+            }
+
+        export class Fill
+            {
+            constructor(style: Object, matrix?: Matrix2D);
+
+            // properties
+            style: Object;
+            matrix: Matrix2D;
+
+            // methods
+            bitmap(image: HTMLImageElement, repetition?: string): Fill;
+            linearGradient(colors: number[], ratios: number[], x0: number, y0: number, x1: number, y1: number): Fill;
+            radialGradient(colors: number[], ratios: number[], x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): Fill;
+            }
+
+        export class LineTo
+            {
+            constructor(x: number, y: number);
+
+            // properties
+            x: number;
+            y: number;
+            }
+
+        export class MoveTo
+            {
+            constructor(x: number, y: number);
+
+            x: number;
+            y: number;
+            }
+
+        export class PolyStar
+            {
+            constructor(x: number, y: number, radius: number, sides: number, pointSize: number, angle: number);
+
+            // properties
+            angle: number;
+            pointSize: number;
+            radius: number;
+            sides: number;
+            x: number;
+            y: number;
+            }
+
+        export class QuadraticCurveTo
+            {
+            constructor(cpx: number, cpy: number, x: number, y: number);
+
+            // properties
+            cpx: number;
+            cpy: number;
+            x: number;
+            y: number;
+            }
+
+        export class Rect
+            {
+            constructor(x: number, y: number, w: number, h: number);
+
+            // properties
+            x: number;
+            y: number;
+            w: number;
+            h: number;
+            }
+
+        export class RoundRect
+            {
+            constructor(x: number, y: number, w: number, h: number, radiusTL: number, radiusTR: number, radiusBR: number, radiusBL: number);
+
+            // properties
+            x: number;
+            y: number;
+            w: number;
+            h: number;
+            radiusTL: number;
+            radiusTR: number;
+            radiusBR: number;
+            radiusBL: number;
+            }
+
+        export class Stroke
+            {
+            constructor(style: Object, ignoreScale: boolean);
+
+            // properties
+            style: Object;
+            ignoreScale: boolean;
+
+            // methods
+            bitmap(image: HTMLImageElement, repetition?: string): Stroke;
+            linearGradient(colors: number[], ratios: number[], x0: number, y0: number, x1: number, y1: number): Stroke;
+            radialGradient(colors: number[], ratios: number[], x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): Stroke;
+            }
+
+        export class StrokeStyle
+            {
+            constructor(width: number, caps: string, joints: number, miterLimit: number);
+
+            // properties
+            caps: string;
+            joints: string;
+            miterLimit: number;
+            width: number;
+            }
+        }
+
+
+
+    export class Matrix2D {
+        constructor(a?: number, b?: number, c?: number, d?: number, tx?: number, ty?: number);
+
+        // properties
+        a: number;
+        b: number;
+        c: number;
+        d: number;
+        static DEG_TO_RAD: number;
+        static identity: Matrix2D;
+        tx: number;
+        ty: number;
+
+        // methods
+        append(a: number, b: number, c: number, d: number, tx: number, ty: number): Matrix2D;
+        appendMatrix(matrix: Matrix2D): Matrix2D;
+        appendTransform(x: number, y: number, scaleX: number, scaleY: number, rotation: number, skewX: number, skewY: number, regX?: number, regY?: number): Matrix2D;
+        clone(): Matrix2D;
+        copy(matrix: Matrix2D): Matrix2D;
+        decompose(): {x: number; y: number; scaleX: number; scaleY: number; rotation: number; skewX: number; skewY: number};
+        decompose(target: Object): Matrix2D;
+        equals(matrix: Matrix2D): boolean;
+        identity(): Matrix2D;
+        invert(): Matrix2D;
+        isIdentity(): boolean;
+        prepend(a: number, b: number, c: number, d: number, tx: number, ty: number): Matrix2D;
+        prependMatrix(matrix: Matrix2D): Matrix2D;
+        prependTransform(x: number, y: number, scaleX: number, scaleY: number, rotation: number, skewX: number, skewY: number, regX?: number, regY?: number): Matrix2D;
+        rotate(angle: number): Matrix2D;
+        scale(x: number, y: number): Matrix2D;
+        setValues(a?: number, b?: number, c?: number, d?: number, tx?: number, ty?: number): Matrix2D;
+        skew(skewX: number, skewY: number): Matrix2D;
+        toString(): string;
+        transformPoint(x: number, y: number, pt?: Point | Object): Point;
+        translate(x: number, y: number): Matrix2D;
+    }
+
+
+    export class MouseEvent extends Event {
+        constructor(type: string, bubbles: boolean, cancelable: boolean, stageX: number, stageY: number, nativeEvent: NativeMouseEvent, pointerID: number, primary: boolean, rawX: number, rawY: number);
+
+        // properties
+        isTouch: boolean;
+        localX: number;
+        localY: number;
+        nativeEvent: NativeMouseEvent;
+        pointerID: number;
+        primary: boolean;
+        rawX: number;
+        rawY: number;
+        stageX: number;
+        stageY: number;
+        mouseMoveOutside: boolean;
+
+        // methods
+        clone(): MouseEvent;
+
+        // EventDispatcher mixins
+        addEventListener(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): Function;
+        addEventListener(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): Function;
+        addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): Object;
+        addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): Object;
+        dispatchEvent(eventObj: Object | string | Event, target?: Object): boolean;
+        hasEventListener(type: string): boolean;
+        off(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): void;
+        off(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): void;
+        off(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): void;
+        off(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): void;
+        off(type: string, listener: Function, useCapture?: boolean): void; // It is necessary for "arguments.callee"
+        on(type: string, listener: (eventObj: Object) => boolean, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function;
+        on(type: string, listener: (eventObj: Object) => void, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function;
+        on(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Object;
+        on(type: string, listener: { handleEvent: (eventObj: Object) => void; }, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Object;
+        removeAllEventListeners(type?: string): void;
+        removeEventListener(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): void;
+        removeEventListener(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): void;
+        removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): void;
+        removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): void;
+        removeEventListener(type: string, listener: Function, useCapture?: boolean): void; // It is necessary for "arguments.callee"
+        toString(): string;
+        willTrigger(type: string): boolean;
+    }
+
+
+    export class MovieClip extends Container {
+        constructor(mode?: string, startPosition?: number, loop?: boolean, labels?: Object);
+
+        // properties
+        actionsEnabled: boolean;
+        autoReset: boolean;
+        static buildDate: string;
+        currentFrame: number;
+        currentLabel: string;
+        frameBounds: Rectangle[];
+        framerate: number;
+        static INDEPENDENT: string;
+        labels: Object[];
+        loop: boolean;
+        mode: string;
+        paused: boolean;
+        static SINGLE_FRAME: string;
+        startPosition: number;
+        static SYNCHED: string;
+        timeline: Timeline;
+        static version: string;
+
+        // methods
+        advance(time?: number): void;
+        clone(): MovieClip; // not supported
+        /**
+         * @deprecated - use 'currentLabel' property instead
+         */
+        getCurrentLabel(): string;  // deprecated
+        /**
+         * @deprecated - use 'labels' property instead
+         */
+        getLabels(): Object[];
+        gotoAndPlay(positionOrLabel: string | number): void;
+        gotoAndStop(positionOrLabel: string | number): void;
+        play(): void;
+        stop(): void;
+    }
+
+    export class MovieClipPlugin {
+        // methods
+        tween(tween: Tween, prop: string, value: string | number | boolean, startValues: any[], endValues: any[], ratio: number, wait: Object, end: Object): void;
+    }
+
+    export class Point {
+        constructor(x?: number, y?: number);
+
+        // properties
+        x: number;
+        y: number;
+
+        // methods
+        clone(): Point;
+        copy(point: Point): Point;
+        setValues(x?: number, y?: number): Point;
+        toString(): string;
+    }
+
+    export class Rectangle {
+        constructor(x?: number, y?: number, width?: number, height?: number);
+
+        // properties
+        height: number;
+        width: number;
+        x: number;
+        y: number;
+
+        // methods
+        clone(): Rectangle;
+        contains(x: number, y: number, width?: number, height?: number): boolean;
+        copy(rectangle: Rectangle): Rectangle;
+        extend(x: number, y: number, width?: number, height?: number): Rectangle;
+        intersection(rect: Rectangle): Rectangle;
+        intersects(rect: Rectangle): boolean;
+        isEmpty(): boolean;
+        setValues(x?: number, y?: number, width?: number, height?: number): Rectangle;
+        toString(): string;
+        union(rect: Rectangle): Rectangle;
+    }
+
+
+    export class Shadow {
+        constructor(color: string, offsetX: number, offsetY: number, blur: number);
+
+        // properties
+        blur: number;
+        color: string;
+        static identity: Shadow;
+        offsetX: number;
+        offsetY: number;
+
+        // methods
+        clone(): Shadow;
+        toString(): string;
+    }
+
+
+    export class Shape extends DisplayObject {
+        constructor(graphics?: Graphics);
+
+        // properties
+        graphics: Graphics;
+
+        // methods
+        clone(recursive?: boolean): Shape;
+        set(props: Object): Shape;
+        setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, regX?: number, regY?: number): Shape;
+    }
+
+
+    export class Sprite extends DisplayObject {
+        constructor(spriteSheet: SpriteSheet, frameOrAnimation?: string | number);
+
+        // properties
+        currentAnimation: string;
+        currentAnimationFrame: number;
+        currentFrame: number;
+        framerate: number;
+        /**
+         * @deprecated
+         */
+        offset: number;
+        paused: boolean;
+        spriteSheet: SpriteSheet;
+
+        // methods
+        advance(time?: number): void;
+        clone(): Sprite;
+        getBounds(): Rectangle;
+        gotoAndPlay(frameOrAnimation: string | number): void;
+        gotoAndStop(frameOrAnimation: string | number): void;
+        play(): void;
+        set(props: Object): Sprite;
+        setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, regX?: number, regY?: number): Sprite;
+        stop(): void;
+
+    }
+
+    export class SpriteContainer extends Container
+        {
+        constructor(spriteSheet?: SpriteSheet);
+
+        spriteSheet: SpriteSheet;
+        }
+
+    // what is returned from SpriteSheet.getAnimation(string)
+    interface SpriteSheetAnimation {
+        frames: number[];
+        speed: number;
+        name: string;
+        next: string;
+    }
+
+    // what is returned from SpriteSheet.getFrame(number)
+    interface SpriteSheetFrame {
+        image: HTMLImageElement;
+        rect: Rectangle;
+    }
+
+    export class SpriteSheet extends EventDispatcher {
+        constructor(data: Object);
+
+        // properties
+        animations: string[];
+        complete: boolean;
+        framerate: number;
+
+        // methods
+        clone(): SpriteSheet;
+        getAnimation(name: string): SpriteSheetAnimation;
+        /**
+         * @deprecated - use the 'animations' property instead
+         */
+        getAnimations(): string[];
+        getFrame(frameIndex: number): SpriteSheetFrame;
+        getFrameBounds(frameIndex: number, rectangle?: Rectangle): Rectangle;
+        getNumFrames(animation: string): number;
+    }
+
+
+    export class SpriteSheetBuilder extends EventDispatcher {
+        constructor();
+
+        // properties
+        maxHeight: number;
+        maxWidth: number;
+        padding: number;
+        progress: number;
+        scale: number;
+        spriteSheet: SpriteSheet;
+        timeSlice: number;
+
+        // methods
+        addAnimation(name: string, frames: number[], next?: string|boolean, frequency?: number): void;
+        addFrame(source: DisplayObject, sourceRect?: Rectangle, scale?: number, setupFunction?: () => any, setupData?: Object): number;
+        addMovieClip(source: MovieClip, sourceRect?: Rectangle, scale?: number, setupFunction?: () => any, setupData?: Object, labelFunction?: () => any): void;
+        build(): SpriteSheet;
+        buildAsync(timeSlice?: number): void;
+        clone(): void; // throw error
+        stopAsync(): void;
+    }
+
+    export class SpriteSheetUtils {
+        /**
+         * @deprecated
+         */
+        static addFlippedFrames(spriteSheet: SpriteSheet, horizontal?: boolean, vertical?: boolean, both?: boolean): void; // deprecated
+        static extractFrame(spriteSheet: SpriteSheet, frameOrAnimation: number | string): HTMLImageElement;
+        /**
+         * @deprecated
+         */
+        static mergeAlpha(rgbImage: HTMLImageElement, alphaImage: HTMLImageElement, canvas?: HTMLCanvasElement): HTMLCanvasElement; // deprecated
+    }
+
+    export class SpriteStage extends Stage
+        {
+        constructor(canvas: HTMLCanvasElement | string, preserveDrawingBuffer?: boolean, antialias?: boolean);
+
+        // properties
+        static INDICES_PER_BOX: number;
+        isWebGL: boolean;
+        static MAX_BOXES_POINTS_INCREMENT: number;
+        static MAX_INDEX_SIZE: number;
+        static NUM_VERTEX_PROPERTIES: number;
+        static NUM_VERTEX_PROPERTIES_PER_BOX: number;
+        static POINTS_PER_BOX: number;
+
+        // methods
+        clearImageTexture(image: Object): void;
+        updateViewport(width: number, height: number): void;
+        }
+
+    export class Stage extends Container {
+        constructor(canvas: HTMLCanvasElement | string | Object);
+
+        // properties
+        autoClear: boolean;
+        canvas: HTMLCanvasElement | Object;
+        drawRect: Rectangle;
+        handleEvent: Function;
+        mouseInBounds: boolean;
+        mouseMoveOutside: boolean;
+        mouseX: number;
+        mouseY: number;
+        nextStage: Stage;
+        /**
+         * @deprecated
+         */
+        preventSelection: boolean;
+        snapToPixelEnabled: boolean;  // deprecated
+        tickOnUpdate: boolean;
+
+        // methods
+        clear(): void;
+        clone(): Stage;
+        enableDOMEvents(enable?: boolean): void;
+        enableMouseOver(frequency?: number): void;
+        tick(props?: Object): void;
+        toDataURL(backgroundColor: string, mimeType: string): string;
+        update(...arg: any[]): void;
+
+    }
+
+
+    export class Text extends DisplayObject {
+        constructor(text?: string, font?: string, color?: string);
+
+        // properties
+        color: string;
+        font: string;
+        lineHeight: number;
+        lineWidth: number;
+        maxWidth: number;
+        outline: number;
+        text: string;
+        textAlign: string;
+        textBaseline: string;
+
+        // methods
+        clone(): Text;
+        getMeasuredHeight(): number;
+        getMeasuredLineHeight(): number;
+        getMeasuredWidth(): number;
+        getMetrics(): Object;
+        set(props: Object): Text;
+        setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, regX?: number, regY?: number): Text;
+    }
+
+    export class Ticker {
+        // properties
+        static framerate: number;
+        static interval: number;
+        static maxDelta: number;
+        static paused: boolean;
+        static RAF: string;
+        static RAF_SYNCHED: string;
+        static TIMEOUT: string;
+        static timingMode: string;
+        /**
+         * @deprecated
+         */
+        static useRAF: boolean;
+
+        // methods
+        static getEventTime(runTime?: boolean): number;
+        /**
+         * @deprecated - use the 'framerate' property instead
+         */
+        static getFPS(): number;
+        /**
+         * @deprecated - use the 'interval' property instead
+         */
+        static getInterval(): number;
+        static getMeasuredFPS(ticks?: number): number;
+        static getMeasuredTickTime(ticks?: number): number;
+        /**
+         * @deprecated - use the 'paused' property instead
+         */
+        static getPaused(): boolean;
+        static getTicks(pauseable?: boolean): number;
+        static getTime(runTime?: boolean): number;
+        static init(): void;
+        static reset(): void;
+        /**
+         * @deprecated - use the 'framerate' property instead
+         */
+        static setFPS(value: number): void;
+        /**
+         * @deprecated - use the 'interval' property instead
+         */
+        static setInterval(interval: number): void;
+        /**
+         * @deprecated - use the 'paused' property instead
+         */
+        static setPaused(value: boolean): void;
+
+        // EventDispatcher mixins
+        static addEventListener(type: string, listener: Stage, useCapture?: boolean): Stage;
+        static addEventListener(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): Function;
+        static addEventListener(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): Function;
+        static addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): Object;
+        static addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): Object;
+        static dispatchEvent(eventObj: Object | string | Event, target?: Object): boolean;
+        static hasEventListener(type: string): boolean;
+        static off(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): void;
+        static off(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): void;
+        static off(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): void;
+        static off(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): void;
+        static off(type: string, listener: Function, useCapture?: boolean): void; // It is necessary for "arguments.callee"
+        static on(type: string, listener: (eventObj: Object) => boolean, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function;
+        static on(type: string, listener: (eventObj: Object) => void, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function;
+        static on(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Object;
+        static on(type: string, listener: { handleEvent: (eventObj: Object) => void; }, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Object;
+        static removeAllEventListeners(type?: string): void;
+        static removeEventListener(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): void;
+        static removeEventListener(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): void;
+        static removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): void;
+        static removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): void;
+        static removeEventListener(type: string, listener: Function, useCapture?: boolean): void; // It is necessary for "arguments.callee"
+        static toString(): string;
+        static willTrigger(type: string): boolean;
+    }
+
+    export class TickerEvent {
+        // properties
+        target: Object;
+        type: string;
+        paused: boolean;
+        delta: number;
+        time: number;
+        runTime: number;
+    }
+
+    export class Touch {
+        // methods
+        static disable(stage: Stage): void;
+        static enable(stage: Stage, singleTouch?: boolean, allowDefault?: boolean): boolean;
+        static isSupported(): boolean;
+    }
+
+    export class UID {
+        // methods
+        static get(): number;
+    }
+}
diff --git a/easeljs/tsconfig.json b/easeljs/tsconfig.json
new file mode 100644
index 0000000000..2c86de699b
--- /dev/null
+++ b/easeljs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "easeljs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/easy-api-request/easy-api-request-tests.ts b/easy-api-request/easy-api-request-tests.ts
index 38a4b68ddb..02b2bc92bf 100644
--- a/easy-api-request/easy-api-request-tests.ts
+++ b/easy-api-request/easy-api-request-tests.ts
@@ -2,8 +2,7 @@
  * Created by karl on 14/07/15.
  */
 
-/// <reference path="../express/express.d.ts" />
-/// <reference path="./easy-api-request.d.ts" />
+
 
 import express = require('express');
 import APIRequest = require('easy-api-request');
diff --git a/easy-api-request/easy-api-request.d.ts b/easy-api-request/easy-api-request.d.ts
deleted file mode 100644
index 46accbb37c..0000000000
--- a/easy-api-request/easy-api-request.d.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-// Type definitions for easy-api-request
-// Project: https://github.com/DeadAlready/easy-api-request
-// Definitions by: Karl Düüna <https://github.com/DeadAlready/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../q/Q.d.ts" />
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../request/request.d.ts" />
-/// <reference path="../bunyan/bunyan.d.ts" />
-/// <reference path="../express/express.d.ts" />
-
-declare module "easy-api-request" {
-    import stream = require('stream');
-    import http = require('http');
-    import request = require('request');
-    import bunyan = require('bunyan');
-    import express = require('express');
-
-    export function create(opts: {
-        name: any;
-        config: {
-            url: string;
-            internal?: boolean;
-            headers?: string[];
-            cookies?: string[];
-            replyCookies?: string[];
-            jSend?: boolean;
-            opts?: Object;
-        };
-    }): void;
-
-    import Q = require('q');
-    interface Result {
-        response: http.IncomingMessage;
-        body: any;
-        err?: any;
-        data?: any;
-    }
-    class BaseRequest {
-        protected base: request.Request;
-        protected req: express.Request;
-        protected log: bunyan.Logger;
-        protected replyCookies: string[];
-        protected jSend: boolean;
-        constructor(opts: any);
-        _parseOptions(args: IArguments, type: string): {
-            opts: any;
-            cb: any;
-        };
-        _do(args: IArguments, type?: string): any;
-        _request(opts?: any, cb?:any): any;
-
-        get(url?: any, opts?: any, cb?: any): any;
-        post(url?: any, opts?: any, cb?: any): any;
-        patch(url?: any, opts?: any, cb?: any): any;
-        del(url?: any, opts?: any, cb?: any): any;
-    }
-
-    class StreamRequest extends BaseRequest {
-        _request(opts: Object): stream.Stream;
-
-        get(url: string, params: Object): stream.Stream;
-        get(opts: Object): stream.Stream;
-        get(url: string): stream.Stream;
-
-        post(url: string, params: Object): stream.Stream;
-        post(opts: Object): stream.Stream;
-        post(url: string): stream.Stream;
-
-        patch(url: string, params: Object): stream.Stream;
-        patch(opts: Object): stream.Stream;
-        patch(url: string): stream.Stream;
-
-        del(url: string, params: Object): stream.Stream;
-        del(opts: Object): stream.Stream;
-        del(url: string): stream.Stream;
-    }
-
-    class CBPromiseRequest extends BaseRequest {
-        _request(opts: Object): stream.Stream;
-
-        get(url: string, params: Object, cb:(err?:any, resp?: Result) => void): void;
-        get(url: string, cb:(err?:any, resp?: Result) => void): void;
-        get(opts: Object, cb:(err?:any, resp?: Result) => void): void;
-        get(url: string, params: Object): Q.Promise<Result>;
-        get(opts: Object): Q.Promise<Result>;
-        get(url: string): Q.Promise<Result>;
-
-        post(url: string, params: Object, cb:(err?:any, resp?: Result) => void): void;
-        post(url: string, cb:(err?:any, resp?: Result) => void): void;
-        post(opts: Object, cb:(err?:any, resp?: Result) => void): void;
-        post(url: string, params: Object): Q.Promise<Result>;
-        post(opts: Object): Q.Promise<Result>;
-        post(url: string): Q.Promise<Result>;
-
-        patch(url: string, params: Object, cb:(err?:any, resp?: Result) => void): void;
-        patch(url: string, cb:(err?:any, resp?: Result) => void): void;
-        patch(opts: Object, cb:(err?:any, resp?: Result) => void): void;
-        patch(url: string, params: Object): Q.Promise<Result>;
-        patch(opts: Object): Q.Promise<Result>;
-        patch(url: string): Q.Promise<Result>;
-
-        del(url: string, params: Object, cb:(err?:any, resp?: Result) => void): void;
-        del(url: string, cb:(err?:any, resp?: Result) => void): void;
-        del(opts: Object, cb:(err?:any, resp?: Result) => void): void;
-        del(url: string, params: Object): Q.Promise<Result>;
-        del(opts: Object): Q.Promise<Result>;
-        del(url: string): Q.Promise<Result>;
-    }
-
-    export interface RequestMaker {
-        (): CBPromiseRequest;
-        (stream: boolean): StreamRequest | CBPromiseRequest;
-    }
-}
diff --git a/easy-api-request/index.d.ts b/easy-api-request/index.d.ts
new file mode 100644
index 0000000000..5ba12d9d97
--- /dev/null
+++ b/easy-api-request/index.d.ts
@@ -0,0 +1,110 @@
+// Type definitions for easy-api-request
+// Project: https://github.com/DeadAlready/easy-api-request
+// Definitions by: Karl Düüna <https://github.com/DeadAlready/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="Q" />
+/// <reference types="node" />
+
+import stream = require('stream');
+import http = require('http');
+import request = require('request');
+import bunyan = require('bunyan');
+import express = require('express');
+
+export declare function create(opts: {
+    name: any;
+    config: {
+        url: string;
+        internal?: boolean;
+        headers?: string[];
+        cookies?: string[];
+        replyCookies?: string[];
+        jSend?: boolean;
+        opts?: Object;
+    };
+}): void;
+
+import Q = require('q');
+interface Result {
+    response: http.IncomingMessage;
+    body: any;
+    err?: any;
+    data?: any;
+}
+declare class BaseRequest {
+    protected base: request.Request;
+    protected req: express.Request;
+    protected log: bunyan.Logger;
+    protected replyCookies: string[];
+    protected jSend: boolean;
+    constructor(opts: any);
+    _parseOptions(args: IArguments, type: string): {
+        opts: any;
+        cb: any;
+    };
+    _do(args: IArguments, type?: string): any;
+    _request(opts?: any, cb?: any): any;
+
+    get(url?: any, opts?: any, cb?: any): any;
+    post(url?: any, opts?: any, cb?: any): any;
+    patch(url?: any, opts?: any, cb?: any): any;
+    del(url?: any, opts?: any, cb?: any): any;
+}
+
+declare class StreamRequest extends BaseRequest {
+    _request(opts: Object): stream.Stream;
+
+    get(url: string, params: Object): stream.Stream;
+    get(opts: Object): stream.Stream;
+    get(url: string): stream.Stream;
+
+    post(url: string, params: Object): stream.Stream;
+    post(opts: Object): stream.Stream;
+    post(url: string): stream.Stream;
+
+    patch(url: string, params: Object): stream.Stream;
+    patch(opts: Object): stream.Stream;
+    patch(url: string): stream.Stream;
+
+    del(url: string, params: Object): stream.Stream;
+    del(opts: Object): stream.Stream;
+    del(url: string): stream.Stream;
+}
+
+declare class CBPromiseRequest extends BaseRequest {
+    _request(opts: Object): stream.Stream;
+
+    get(url: string, params: Object, cb: (err?: any, resp?: Result) => void): void;
+    get(url: string, cb: (err?: any, resp?: Result) => void): void;
+    get(opts: Object, cb: (err?: any, resp?: Result) => void): void;
+    get(url: string, params: Object): Q.Promise<Result>;
+    get(opts: Object): Q.Promise<Result>;
+    get(url: string): Q.Promise<Result>;
+
+    post(url: string, params: Object, cb: (err?: any, resp?: Result) => void): void;
+    post(url: string, cb: (err?: any, resp?: Result) => void): void;
+    post(opts: Object, cb: (err?: any, resp?: Result) => void): void;
+    post(url: string, params: Object): Q.Promise<Result>;
+    post(opts: Object): Q.Promise<Result>;
+    post(url: string): Q.Promise<Result>;
+
+    patch(url: string, params: Object, cb: (err?: any, resp?: Result) => void): void;
+    patch(url: string, cb: (err?: any, resp?: Result) => void): void;
+    patch(opts: Object, cb: (err?: any, resp?: Result) => void): void;
+    patch(url: string, params: Object): Q.Promise<Result>;
+    patch(opts: Object): Q.Promise<Result>;
+    patch(url: string): Q.Promise<Result>;
+
+    del(url: string, params: Object, cb: (err?: any, resp?: Result) => void): void;
+    del(url: string, cb: (err?: any, resp?: Result) => void): void;
+    del(opts: Object, cb: (err?: any, resp?: Result) => void): void;
+    del(url: string, params: Object): Q.Promise<Result>;
+    del(opts: Object): Q.Promise<Result>;
+    del(url: string): Q.Promise<Result>;
+}
+
+export interface RequestMaker {
+    (): CBPromiseRequest;
+    (stream: boolean): StreamRequest | CBPromiseRequest;
+}
diff --git a/easy-api-request/tsconfig.json b/easy-api-request/tsconfig.json
new file mode 100644
index 0000000000..fab6cedbfd
--- /dev/null
+++ b/easy-api-request/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "easy-api-request-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/easy-jsend/easy-jsend-tests.ts b/easy-jsend/easy-jsend-tests.ts
index 9d7814254d..705fe5b7e1 100644
--- a/easy-jsend/easy-jsend-tests.ts
+++ b/easy-jsend/easy-jsend-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="./easy-jsend.d.ts" />
-/// <reference path="../mongoose/mongoose.d.ts" />
+
 
 import mongoose = require('mongoose');
 import express = require('express');
diff --git a/easy-jsend/easy-jsend.d.ts b/easy-jsend/easy-jsend.d.ts
deleted file mode 100644
index aee692179b..0000000000
--- a/easy-jsend/easy-jsend.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// Type definitions for easy-jsend
-// Project: https://github.com/DeadAlready/easy-jsend
-// Definitions by: Karl Düüna <https://github.com/DeadAlready/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare namespace Express {
-
-    interface MakePartialInput {
-        model:any;
-        opts: {
-            limit: number;
-            skip: number;
-        };
-        search: Object;
-        result: any;
-    }
-
-    interface PartialInput {
-        limit?: number;
-        offset: number;
-        count: number;
-        data: any;
-    }
-
-    export interface Response {
-        success (data?: any, status?: number): void;
-        fail (data: any, status?: number): void;
-        error (err: any, status?: number): void;
-        partial? (data: PartialInput, status?: number): void;
-        makePartial? (data: MakePartialInput): void;
-    }
-}
-
-declare module "easy-jsend" {
-    export function init(conf?:{partial:boolean}): void;
-}
diff --git a/easy-jsend/index.d.ts b/easy-jsend/index.d.ts
new file mode 100644
index 0000000000..e433dc1630
--- /dev/null
+++ b/easy-jsend/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for easy-jsend
+// Project: https://github.com/DeadAlready/easy-jsend
+// Definitions by: Karl Düüna <https://github.com/DeadAlready/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare namespace Express {
+
+    interface MakePartialInput {
+        model:any;
+        opts: {
+            limit: number;
+            skip: number;
+        };
+        search: Object;
+        result: any;
+    }
+
+    interface PartialInput {
+        limit?: number;
+        offset: number;
+        count: number;
+        data: any;
+    }
+
+    export interface Response {
+        success (data?: any, status?: number): void;
+        fail (data: any, status?: number): void;
+        error (err: any, status?: number): void;
+        partial? (data: PartialInput, status?: number): void;
+        makePartial? (data: MakePartialInput): void;
+    }
+}
+
+declare module "easy-jsend" {
+    export function init(conf?:{partial:boolean}): void;
+}
diff --git a/easy-jsend/tsconfig.json b/easy-jsend/tsconfig.json
new file mode 100644
index 0000000000..6a9ed16b99
--- /dev/null
+++ b/easy-jsend/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "easy-jsend-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/easy-session/easy-session-tests.ts b/easy-session/easy-session-tests.ts
index 2053b634c3..d707e89230 100644
--- a/easy-session/easy-session-tests.ts
+++ b/easy-session/easy-session-tests.ts
@@ -1,6 +1,5 @@
-/// <reference path="./easy-session.d.ts" />
-/// <reference path="../express-session/express-session.d.ts" />
-/// <reference path="../cookie-parser/cookie-parser.d.ts" />
+
+/// <reference types="express-session" />
 
 import express = require('express');
 import session = require('express-session');
diff --git a/easy-session/easy-session.d.ts b/easy-session/easy-session.d.ts
deleted file mode 100644
index 8e887a6926..0000000000
--- a/easy-session/easy-session.d.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-// Type definitions for easy-session
-// Project: https://github.com/DeadAlready/node-easy-session
-// Definitions by: Karl Düüna <https://github.com/DeadAlready/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare namespace Express {
-    interface ErrorCallback {
-        (err?: any): void;
-    }
-    export interface Session {
-        login(callback: Function): void;
-        login(extend: Object, callback: ErrorCallback): void;
-        login(role: string, callback: ErrorCallback): void;
-        login(role: string, extend: Object, callback: ErrorCallback): void;
-        logout(callback: ErrorCallback): void;
-        isLoggedIn(role?: string): boolean;
-        isGuest(): boolean;
-        isFresh(): boolean;
-        setRole(role: string): Session;
-        getRole(): string;
-        hasRole(role: string): boolean;
-    }
-}
-
-declare module "easy-session" {
-    import express = require('express');
-
-    interface SessionOptions {
-        ipCheck?: boolean;
-        uaCheck?: boolean;
-        freshTimeout?: number;
-        maxFreshTimeout?: number;
-    }
-
-    export function main(session: any, options?: SessionOptions): express.RequestHandler;
-    export function isLoggedIn(errorCallback?: Function): express.RequestHandler;
-    export function isFresh(errorCallback?: Function): express.RequestHandler;
-    export function checkRole(role: string, errorCallback?: Function): express.RequestHandler;
-}
diff --git a/easy-session/index.d.ts b/easy-session/index.d.ts
new file mode 100644
index 0000000000..4216f5037d
--- /dev/null
+++ b/easy-session/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for easy-session
+// Project: https://github.com/DeadAlready/node-easy-session
+// Definitions by: Karl Düüna <https://github.com/DeadAlready/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare namespace Express {
+    interface ErrorCallback {
+        (err?: any): void;
+    }
+    export interface Session {
+        login(callback: Function): void;
+        login(extend: Object, callback: ErrorCallback): void;
+        login(role: string, callback: ErrorCallback): void;
+        login(role: string, extend: Object, callback: ErrorCallback): void;
+        logout(callback: ErrorCallback): void;
+        isLoggedIn(role?: string): boolean;
+        isGuest(): boolean;
+        isFresh(): boolean;
+        setRole(role: string): Session;
+        getRole(): string;
+        hasRole(role: string): boolean;
+    }
+}
+
+declare module "easy-session" {
+    import express = require('express');
+
+    interface SessionOptions {
+        ipCheck?: boolean;
+        uaCheck?: boolean;
+        freshTimeout?: number;
+        maxFreshTimeout?: number;
+    }
+
+    export function main(session: any, options?: SessionOptions): express.RequestHandler;
+    export function isLoggedIn(errorCallback?: Function): express.RequestHandler;
+    export function isFresh(errorCallback?: Function): express.RequestHandler;
+    export function checkRole(role: string, errorCallback?: Function): express.RequestHandler;
+}
diff --git a/easy-session/tsconfig.json b/easy-session/tsconfig.json
new file mode 100644
index 0000000000..33e750cb43
--- /dev/null
+++ b/easy-session/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "easy-session-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/easy-table/easy-table-0.2.0-tests.ts b/easy-table/easy-table-0.2.0-tests.ts
index 93a4516bf5..3887d08f66 100644
--- a/easy-table/easy-table-0.2.0-tests.ts
+++ b/easy-table/easy-table-0.2.0-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="easy-table.d.ts" />
 
 import EasyTable = require('easy-table');
 
diff --git a/easy-table/easy-table-0.2.0.d.ts b/easy-table/easy-table-0.2.0.d.ts
index 46fc170c16..1aaf7df01a 100644
--- a/easy-table/easy-table-0.2.0.d.ts
+++ b/easy-table/easy-table-0.2.0.d.ts
@@ -3,39 +3,38 @@
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "easy-table" {
-	class EasyTable {
-		constructor();
 
-		cell(label: string, value: any, printer?: EasyTable.CellPrinter, width?: number):void;
-		newRow(): void;
-		toString(): string;
-		printTransposed(): string;
-		print(): string;
-		sort(fields: string): void;
-		sort(comparer: (a: any, b: any) => number): void;
-		total(label: string, accumulator: EasyTable.Accumulator, totalPrinter: EasyTable.CellPrinter): void;
-	}
+declare class EasyTable {
+    constructor();
 
-	namespace EasyTable {
-		function printArray(array: any[], cellPrinter?: CellPrinter, tablePrinter?: Printer): string;
-		function printObject(object: any, cellPrinter?: CellPrinter, tablePrinter?: Printer): string;
-
-		//printer helpers
-		function Number(length: number): CellPrinter;
-		function RightPadder(char: string): CellPrinter;
-		function LeftPadder(char: string): CellPrinter;
-
-		interface CellPrinter extends Function {
-			(obj: any, cell: (label: string, value: any, width?: number) => void):string;
-		}
-		interface Printer extends Function {
-			(table: EasyTable):string;
-		}
-		interface Accumulator extends Function {
-			(sum: number, val: number, index: number, length: number):number;
-		}
-	}
-
-	export = EasyTable;
+    cell(label: string, value: any, printer?: EasyTable.CellPrinter, width?: number): void;
+    newRow(): void;
+    toString(): string;
+    printTransposed(): string;
+    print(): string;
+    sort(fields: string): void;
+    sort(comparer: (a: any, b: any) => number): void;
+    total(label: string, accumulator: EasyTable.Accumulator, totalPrinter: EasyTable.CellPrinter): void;
 }
+
+declare namespace EasyTable {
+    function printArray(array: any[], cellPrinter?: CellPrinter, tablePrinter?: Printer): string;
+    function printObject(object: any, cellPrinter?: CellPrinter, tablePrinter?: Printer): string;
+
+    //printer helpers
+    function Number(length: number): CellPrinter;
+    function RightPadder(char: string): CellPrinter;
+    function LeftPadder(char: string): CellPrinter;
+
+    interface CellPrinter extends Function {
+        (obj: any, cell: (label: string, value: any, width?: number) => void): string;
+    }
+    interface Printer extends Function {
+        (table: EasyTable): string;
+    }
+    interface Accumulator extends Function {
+        (sum: number, val: number, index: number, length: number): number;
+    }
+}
+
+export = EasyTable;
diff --git a/easy-table/easy-table-tests.ts b/easy-table/easy-table-tests.ts
index 911031d90d..8eba36ce6e 100644
--- a/easy-table/easy-table-tests.ts
+++ b/easy-table/easy-table-tests.ts
@@ -1,4 +1,3 @@
-///<reference path="easy-table.d.ts" />
 
 import Table = require("easy-table");
 
diff --git a/easy-table/easy-table.d.ts b/easy-table/easy-table.d.ts
deleted file mode 100644
index ff5bf0928a..0000000000
--- a/easy-table/easy-table.d.ts
+++ /dev/null
@@ -1,223 +0,0 @@
-// Type definitions for easy-table
-// Project: https://github.com/eldargab/easy-table
-// Definitions by: Niklas Mollenhauer <https://github.com/nikeee>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "easy-table"
-{
-	class EasyTable {
-
-		/**
-		 * String to separate columns
-		 */
-		public separator: string;
-
-		/**
-		 * Default printer
-		 */
-		public static string(value: any): string;
-
-		/**
-		 * Create a printer which right aligns the content by padding with `ch` on the left
-		 *
-		 * @param {String} ch
-		 * @returns {Function}
-		 */
-		public static leftPadder<T>(ch: string): CellPrinter<T>;
-
-		public static padLeft: CellPrinter<string>;
-
-		/**
-		 * Create a printer which pads with `ch` on the right
-		 *
-		 * @param {String} ch
-		 * @returns {Function}
-		 */
-		public static rightPadder<T>(ch: string): CellPrinter<T>;
-
-		// public static padRight: CellPrinter<string>;
-
-		/**
-		 * Create a printer for numbers
-		 *
-		 * Will do right alignment and optionally fix the number of digits after decimal point
-		 *
-		 * @param {Number} [digits] - Number of digits for fixpoint notation
-		 * @returns {Function}
-		 */
-		public static number(digits?: number): CellPrinter<number>;
-
-		public constructor();
-
-		/**
-		 * Push the current row to the table and start a new one
-		 *
-		 * @returns {Table} `this`
-		 */
-		public newRow(): EasyTable;
-
-		/**
-		 * Write cell in the current row
-		 *
-		 * @param {String} col          - Column name
-		 * @param {Any} val             - Cell value
-		 * @param {Function} [printer]  - Printer function to format the value
-		 * @returns {Table} `this`
-		 */
-		public cell<T>(col: string, val: T, printer?: CellPrinter<T>): EasyTable;
-
-		/**
-		 * Get list of columns in printing order
-		 *
-		 * @returns {string[]}
-		 */
-		public columns(): string[];
-
-		/**
-		 * Format just rows, i.e. print the table without headers and totals
-		 *
-		 * @returns {String} String representaion of the table
-		 */
-		public print(): string;
-
-		/**
-		 * Format the table
-		 *
-		 * @returns {String}
-		 */
-		public toString(): string;
-
-		/**
-		 * Push delimeter row to the table (with each cell filled with dashs during printing)
-		 *
-		 * @param {String[]} [cols]
-		 * @returns {Table} `this`
-		 */
-		public pushDelimeter(cols?: string[]): EasyTable;
-
-		/**
-		 * Compute all totals and yield the results to `cb`
-		 *
-		 * @param {Function} cb - Callback function with signature `(column, value, printer)`
-		 */
-		public forEachTotal<T>(cb: (column: string, value: T, printer: CellPrinter<T>) => void): void;
-
-		/**
-		 * Format the table so that each row represents column and each column represents row
-		 *
-		 * @param {IPrintColumnOptions} [opts]
-		 * @returns {String}
-		 */
-		public printTransposed<T>(opts?: PrintColumnOptions<T>): string;
-
-		/**
-		 * Sort the table
-		 *
-		 * @param {Function|string[]} [cmp] - Either compare function or a list of columns to sort on
-		 * @returns {Table} `this`
-		 */
-		public sort(cmp?: string[]): EasyTable;
-		/**
-		 * Sort the table
-		 *
-		 * @param {Function|string[]} [cmp] - Either compare function or a list of columns to sort on
-		 * @returns {Table} `this`
-		 */
-		public sort<T>(cmp?: CompareFunction<T>): EasyTable;
-
-		/**
-		 * Add a total for the column
-		 *
-		 * @param {String} col - column name
-		 * @param {Object} [opts]
-		 * @returns {Table} `this`
-		 */
-		public total<T>(col: string, opts?: TotalOptions<T>): EasyTable;
-		/**
-		 * Predefined helpers for totals
-		 */
-		public static aggr: Aggregators;
-
-		/**
-		 * Print the array or object
-		 *
-		 * @param {Array|Object} obj - Object to print
-		 * @param {Function|Object} [format] - Format options
-		 * @param {Function} [cb] - Table post processing and formating
-		 * @returns {String}
-		 */
-		public static print<T>(obj: T | T[], format?: FormatFunction<T> | FormatObject, cb?: TablePostProcessing): string;
-
-		/**
-		 * Same as `Table.print()` but yields the result to `console.log()`
-		 */
-		public static log<T>(obj: T | T[], format?: FormatFunction<T> | FormatObject, cb?: TablePostProcessing): void;
-		/**
-		 * Same as `.toString()` but yields the result to `console.log()`
-		 */
-		public log(): void;
-	}
-
-	type CellPrinter<T> = (val: T, width: number) => string;
-	type CompareFunction<T> = (a: T, b: T) => number;
-	type ReduceFunction<T> = (acc: T, val: T, idx: number, length: number) => T;
-	type FormatFunction<T> = (obj: T, cell: (name: string, val: any) => void) => void;
-	type TablePostProcessing = (result: EasyTable) => string;
-
-	interface PrintColumnOptions<T> {
-		/**
-		 * Column separation string
-		 */
-		separator?: string;
-		/**
-		 * Printer to format column names
-		 */
-		namePrinter?: CellPrinter<T>;
-	}
-
-	interface Aggregators {
-		/**
-		 * Create a printer which formats the value with `printer`,
-		 * adds the `prefix` to it and right aligns the whole thing
-		 *
-		 * @param {String} prefix
-		 * @param {Function} printer
-		 * @returns {printer}
-		 */
-		printer<T>(prefix: string, printer: CellPrinter<T>): CellPrinter<T>;
-		/**
-		 * Sum reduction
-		 */
-		sum: any;
-		/**
-		 * Average reduction
-		 */
-		avg: any;
-	}
-
-	interface TotalOptions<T> {
-		/**
-		 * reduce(acc, val, idx, length) function to compute the total value
-		 */
-		reduce?: ReduceFunction<T>;
-		/**
-		 * Printer to format the total cell
-		 */
-		printer?: CellPrinter<T>;
-		/**
-		 * Initial value for reduction
-		 */
-		init?: T;
-	}
-
-	interface FormatObject {
-		[key: string]: ColumnFormat<any>;
-	}
-
-	interface ColumnFormat<T> {
-		name?: string;
-		printer?: CellPrinter<T>
-	}
-
-	export = EasyTable;
-}
diff --git a/easy-table/index.d.ts b/easy-table/index.d.ts
new file mode 100644
index 0000000000..f75d74861b
--- /dev/null
+++ b/easy-table/index.d.ts
@@ -0,0 +1,221 @@
+// Type definitions for easy-table
+// Project: https://github.com/eldargab/easy-table
+// Definitions by: Niklas Mollenhauer <https://github.com/nikeee>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare class EasyTable {
+
+    /**
+     * String to separate columns
+     */
+    public separator: string;
+
+    /**
+     * Default printer
+     */
+    public static string(value: any): string;
+
+    /**
+     * Create a printer which right aligns the content by padding with `ch` on the left
+     *
+     * @param {String} ch
+     * @returns {Function}
+     */
+    public static leftPadder<T>(ch: string): CellPrinter<T>;
+
+    public static padLeft: CellPrinter<string>;
+
+    /**
+     * Create a printer which pads with `ch` on the right
+     *
+     * @param {String} ch
+     * @returns {Function}
+     */
+    public static rightPadder<T>(ch: string): CellPrinter<T>;
+
+    // public static padRight: CellPrinter<string>;
+
+    /**
+     * Create a printer for numbers
+     *
+     * Will do right alignment and optionally fix the number of digits after decimal point
+     *
+     * @param {Number} [digits] - Number of digits for fixpoint notation
+     * @returns {Function}
+     */
+    public static number(digits?: number): CellPrinter<number>;
+
+    public constructor();
+
+    /**
+     * Push the current row to the table and start a new one
+     *
+     * @returns {Table} `this`
+     */
+    public newRow(): EasyTable;
+
+    /**
+     * Write cell in the current row
+     *
+     * @param {String} col          - Column name
+     * @param {Any} val             - Cell value
+     * @param {Function} [printer]  - Printer function to format the value
+     * @returns {Table} `this`
+     */
+    public cell<T>(col: string, val: T, printer?: CellPrinter<T>): EasyTable;
+
+    /**
+     * Get list of columns in printing order
+     *
+     * @returns {string[]}
+     */
+    public columns(): string[];
+
+    /**
+     * Format just rows, i.e. print the table without headers and totals
+     *
+     * @returns {String} String representaion of the table
+     */
+    public print(): string;
+
+    /**
+     * Format the table
+     *
+     * @returns {String}
+     */
+    public toString(): string;
+
+    /**
+     * Push delimeter row to the table (with each cell filled with dashs during printing)
+     *
+     * @param {String[]} [cols]
+     * @returns {Table} `this`
+     */
+    public pushDelimeter(cols?: string[]): EasyTable;
+
+    /**
+     * Compute all totals and yield the results to `cb`
+     *
+     * @param {Function} cb - Callback function with signature `(column, value, printer)`
+     */
+    public forEachTotal<T>(cb: (column: string, value: T, printer: CellPrinter<T>) => void): void;
+
+    /**
+     * Format the table so that each row represents column and each column represents row
+     *
+     * @param {IPrintColumnOptions} [opts]
+     * @returns {String}
+     */
+    public printTransposed<T>(opts?: PrintColumnOptions<T>): string;
+
+    /**
+     * Sort the table
+     *
+     * @param {Function|string[]} [cmp] - Either compare function or a list of columns to sort on
+     * @returns {Table} `this`
+     */
+    public sort(cmp?: string[]): EasyTable;
+    /**
+     * Sort the table
+     *
+     * @param {Function|string[]} [cmp] - Either compare function or a list of columns to sort on
+     * @returns {Table} `this`
+     */
+    public sort<T>(cmp?: CompareFunction<T>): EasyTable;
+
+    /**
+     * Add a total for the column
+     *
+     * @param {String} col - column name
+     * @param {Object} [opts]
+     * @returns {Table} `this`
+     */
+    public total<T>(col: string, opts?: TotalOptions<T>): EasyTable;
+    /**
+     * Predefined helpers for totals
+     */
+    public static aggr: Aggregators;
+
+    /**
+     * Print the array or object
+     *
+     * @param {Array|Object} obj - Object to print
+     * @param {Function|Object} [format] - Format options
+     * @param {Function} [cb] - Table post processing and formating
+     * @returns {String}
+     */
+    public static print<T>(obj: T | T[], format?: FormatFunction<T> | FormatObject, cb?: TablePostProcessing): string;
+
+    /**
+     * Same as `Table.print()` but yields the result to `console.log()`
+     */
+    public static log<T>(obj: T | T[], format?: FormatFunction<T> | FormatObject, cb?: TablePostProcessing): void;
+    /**
+     * Same as `.toString()` but yields the result to `console.log()`
+     */
+    public log(): void;
+}
+
+type CellPrinter<T> = (val: T, width: number) => string;
+type CompareFunction<T> = (a: T, b: T) => number;
+type ReduceFunction<T> = (acc: T, val: T, idx: number, length: number) => T;
+type FormatFunction<T> = (obj: T, cell: (name: string, val: any) => void) => void;
+type TablePostProcessing = (result: EasyTable) => string;
+
+interface PrintColumnOptions<T> {
+    /**
+     * Column separation string
+     */
+    separator?: string;
+    /**
+     * Printer to format column names
+     */
+    namePrinter?: CellPrinter<T>;
+}
+
+interface Aggregators {
+    /**
+     * Create a printer which formats the value with `printer`,
+     * adds the `prefix` to it and right aligns the whole thing
+     *
+     * @param {String} prefix
+     * @param {Function} printer
+     * @returns {printer}
+     */
+    printer<T>(prefix: string, printer: CellPrinter<T>): CellPrinter<T>;
+    /**
+     * Sum reduction
+     */
+    sum: any;
+    /**
+     * Average reduction
+     */
+    avg: any;
+}
+
+interface TotalOptions<T> {
+    /**
+     * reduce(acc, val, idx, length) function to compute the total value
+     */
+    reduce?: ReduceFunction<T>;
+    /**
+     * Printer to format the total cell
+     */
+    printer?: CellPrinter<T>;
+    /**
+     * Initial value for reduction
+     */
+    init?: T;
+}
+
+interface FormatObject {
+    [key: string]: ColumnFormat<any>;
+}
+
+interface ColumnFormat<T> {
+    name?: string;
+    printer?: CellPrinter<T>
+}
+
+export = EasyTable;
diff --git a/easy-table/tsconfig.json b/easy-table/tsconfig.json
new file mode 100644
index 0000000000..77acddfdd4
--- /dev/null
+++ b/easy-table/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "easy-table-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/easy-x-headers/easy-x-headers-tests.ts b/easy-x-headers/easy-x-headers-tests.ts
index 9a306ea6ae..6887570225 100644
--- a/easy-x-headers/easy-x-headers-tests.ts
+++ b/easy-x-headers/easy-x-headers-tests.ts
@@ -2,8 +2,8 @@
  * Created by karl on 14/07/15.
  */
 
-/// <reference path="../express/express.d.ts" />
-/// <reference path="./easy-x-headers.d.ts" />
+
+
 
 import express = require('express');
 import xHeaders = require('easy-x-headers');
diff --git a/easy-x-headers/easy-x-headers.d.ts b/easy-x-headers/easy-x-headers.d.ts
deleted file mode 100644
index 96143dc78d..0000000000
--- a/easy-x-headers/easy-x-headers.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Type definitions for easy-x-headers
-// Project: https://github.com/DeadAlready/easy-x-headers
-// Definitions by: Karl Düüna <https://github.com/DeadAlready/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare namespace Express {
-    export interface Request {
-        info: any;
-    }
-}
-
-declare module "easy-x-headers" {
-    import express = require('express');
-
-    export function getMiddleware(defaults?: Object): express.RequestHandler;
-}
diff --git a/easy-x-headers/index.d.ts b/easy-x-headers/index.d.ts
new file mode 100644
index 0000000000..c9d6c97e2b
--- /dev/null
+++ b/easy-x-headers/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for easy-x-headers
+// Project: https://github.com/DeadAlready/easy-x-headers
+// Definitions by: Karl Düüna <https://github.com/DeadAlready/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare namespace Express {
+    export interface Request {
+        info: any;
+    }
+}
+
+declare module "easy-x-headers" {
+    import express = require('express');
+
+    export function getMiddleware(defaults?: Object): express.RequestHandler;
+}
diff --git a/easy-x-headers/tsconfig.json b/easy-x-headers/tsconfig.json
new file mode 100644
index 0000000000..1be5a7202b
--- /dev/null
+++ b/easy-x-headers/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "easy-x-headers-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/easy-xapi-supertest/easy-xapi-supertest-tests.ts b/easy-xapi-supertest/easy-xapi-supertest-tests.ts
index 5b43ce0614..76dad2c8f8 100644
--- a/easy-xapi-supertest/easy-xapi-supertest-tests.ts
+++ b/easy-xapi-supertest/easy-xapi-supertest-tests.ts
@@ -2,8 +2,7 @@
  * Created by karl on 14/07/15.
  */
 
-/// <reference path="../express/express.d.ts" />
-/// <reference path="./easy-xapi-supertest.d.ts" />
+
 
 import express = require('express');
 import eSupertest = require('easy-xapi-supertest');
diff --git a/easy-xapi-supertest/easy-xapi-supertest.d.ts b/easy-xapi-supertest/easy-xapi-supertest.d.ts
deleted file mode 100644
index 5a8525e0a4..0000000000
--- a/easy-xapi-supertest/easy-xapi-supertest.d.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// Type definitions for easy-x-headers
-// Project: https://github.com/DeadAlready/easy-x-headers
-// Definitions by: Karl Düüna <https://github.com/DeadAlready/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "easy-xapi-supertest" {
-    import express = require('express');
-
-    export interface BodyAgent {
-        send(data: Object): any;
-        attach(arg1: any, arg2?: any): any;
-    }
-
-    export interface Agent {
-        get(url:string): any;
-        delete(url:string): any;
-        post(url:string): BodyAgent;
-        patch(url:string): BodyAgent;
-        put(url:string): BodyAgent;
-    }
-
-    interface getAgent {
-        (...args:any[]): Agent
-    }
-
-    export function getAgentFactory(app: express.Application, transform?: Function): getAgent;
-}
diff --git a/easy-xapi-supertest/index.d.ts b/easy-xapi-supertest/index.d.ts
new file mode 100644
index 0000000000..df7eda856a
--- /dev/null
+++ b/easy-xapi-supertest/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for easy-x-headers
+// Project: https://github.com/DeadAlready/easy-x-headers
+// Definitions by: Karl Düüna <https://github.com/DeadAlready/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+
+import express = require('express');
+
+export interface BodyAgent {
+    send(data: Object): any;
+    attach(arg1: any, arg2?: any): any;
+}
+
+export interface Agent {
+    get(url: string): any;
+    delete(url: string): any;
+    post(url: string): BodyAgent;
+    patch(url: string): BodyAgent;
+    put(url: string): BodyAgent;
+}
+
+interface getAgent {
+    (...args: any[]): Agent
+}
+
+export declare function getAgentFactory(app: express.Application, transform?: Function): getAgent;
diff --git a/easy-xapi-supertest/tsconfig.json b/easy-xapi-supertest/tsconfig.json
new file mode 100644
index 0000000000..09c91b4ee8
--- /dev/null
+++ b/easy-xapi-supertest/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "easy-xapi-supertest-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/easy-xapi-utils/easy-xapi-utils-tests.ts b/easy-xapi-utils/easy-xapi-utils-tests.ts
index d80a7976ca..2ad20c915a 100644
--- a/easy-xapi-utils/easy-xapi-utils-tests.ts
+++ b/easy-xapi-utils/easy-xapi-utils-tests.ts
@@ -2,9 +2,8 @@
  * Created by karl on 14/07/15.
  */
 
-/// <reference path="../express/express.d.ts" />
-/// <reference path="../easy-xapi/easy-xapi.d.ts" />
-/// <reference path="./easy-xapi-utils.d.ts" />
+
+/// <reference types="easy-xapi" />
 
 import express = require('express');
 import eXapi = require('easy-xapi');
diff --git a/easy-xapi-utils/easy-xapi-utils.d.ts b/easy-xapi-utils/easy-xapi-utils.d.ts
deleted file mode 100644
index b49a7d37f5..0000000000
--- a/easy-xapi-utils/easy-xapi-utils.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Type definitions for easy-xapi-utils
-// Project: https://github.com/DeadAlready/easy-xapi-utils
-// Definitions by: Karl Düüna <https://github.com/DeadAlready/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-/// <reference path="../easy-jsend/easy-jsend.d.ts" />
-/// <reference path="../easy-x-headers/easy-x-headers.d.ts" />
-
-declare module "easy-xapi-utils" {
-    import express = require('express');
-
-    export function isLoggedIn(role?: string): express.RequestHandler;
-    export function isLoggedOut(): express.RequestHandler;
-    export function hasRole(role: string): express.RequestHandler;
-}
diff --git a/easy-xapi-utils/index.d.ts b/easy-xapi-utils/index.d.ts
new file mode 100644
index 0000000000..a4e5f568e6
--- /dev/null
+++ b/easy-xapi-utils/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for easy-xapi-utils
+// Project: https://github.com/DeadAlready/easy-xapi-utils
+// Definitions by: Karl Düüna <https://github.com/DeadAlready/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="easy-jsend" />
+/// <reference types="easy-x-headers" />
+
+
+import express = require('express');
+
+export declare function isLoggedIn(role?: string): express.RequestHandler;
+export declare function isLoggedOut(): express.RequestHandler;
+export declare function hasRole(role: string): express.RequestHandler;
diff --git a/easy-xapi-utils/tsconfig.json b/easy-xapi-utils/tsconfig.json
new file mode 100644
index 0000000000..30af5ad4e4
--- /dev/null
+++ b/easy-xapi-utils/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "easy-xapi-utils-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/easy-xapi/easy-xapi-tests.ts b/easy-xapi/easy-xapi-tests.ts
index 70c5351d4c..fbdf90044c 100644
--- a/easy-xapi/easy-xapi-tests.ts
+++ b/easy-xapi/easy-xapi-tests.ts
@@ -2,8 +2,8 @@
  * Created by karl on 14/07/15.
  */
 
-/// <reference path="../express/express.d.ts" />
-/// <reference path="./easy-xapi.d.ts" />
+
+
 
 import express = require('express');
 import eXapi = require('easy-xapi');
diff --git a/easy-xapi/easy-xapi.d.ts b/easy-xapi/easy-xapi.d.ts
deleted file mode 100644
index 0a7e424945..0000000000
--- a/easy-xapi/easy-xapi.d.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-// Type definitions for easy-xapi
-// Project: https://github.com/DeadAlready/easy-xapi
-// Definitions by: Karl Düüna <https://github.com/DeadAlready/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-/// <reference path="../easy-jsend/easy-jsend.d.ts" />
-/// <reference path="../bunyan/bunyan.d.ts" />
-
-declare namespace Express {
-    export interface Request {
-        log: any;
-    }
-}
-
-declare module "easy-xapi" {
-    import express = require('express');
-    import http = require('http');
-    import bunyan = require('bunyan');
-
-    interface InitConfig {
-        jSend?: {partial: boolean};
-    }
-
-    interface Config {
-        root: string;
-        port: number;
-        name: string;
-        xHeaderDefaults?: Object;
-        log: {
-            name: string;
-            level: string
-        }
-        mount: (app: express.Application) => void
-    }
-
-    interface Result {
-        express: any;
-        app: express.Application;
-        server: http.Server;
-        log: bunyan.Logger;
-        listen: () => void;
-    }
-
-    export function init(conf: InitConfig): void;
-    export function create(conf: Config): Result;
-}
diff --git a/easy-xapi/index.d.ts b/easy-xapi/index.d.ts
new file mode 100644
index 0000000000..7e19328ca0
--- /dev/null
+++ b/easy-xapi/index.d.ts
@@ -0,0 +1,46 @@
+// Type definitions for easy-xapi
+// Project: https://github.com/DeadAlready/easy-xapi
+// Definitions by: Karl Düüna <https://github.com/DeadAlready/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="easy-jsend" />
+
+declare namespace Express {
+    export interface Request {
+        log: any;
+    }
+}
+
+declare module "easy-xapi" {
+    import express = require('express');
+    import http = require('http');
+    import bunyan = require('bunyan');
+
+    interface InitConfig {
+        jSend?: {partial: boolean};
+    }
+
+    interface Config {
+        root: string;
+        port: number;
+        name: string;
+        xHeaderDefaults?: Object;
+        log: {
+            name: string;
+            level: string
+        }
+        mount: (app: express.Application) => void
+    }
+
+    interface Result {
+        express: any;
+        app: express.Application;
+        server: http.Server;
+        log: bunyan.Logger;
+        listen: () => void;
+    }
+
+    export function init(conf: InitConfig): void;
+    export function create(conf: Config): Result;
+}
diff --git a/easy-xapi/tsconfig.json b/easy-xapi/tsconfig.json
new file mode 100644
index 0000000000..04803fe0fe
--- /dev/null
+++ b/easy-xapi/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "easy-xapi-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/easystarjs/easystarjs-tests.ts b/easystarjs/easystarjs-tests.ts
index c76f70cbfe..206e5bf2cc 100644
--- a/easystarjs/easystarjs-tests.ts
+++ b/easystarjs/easystarjs-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="easystarjs.d.ts"/>
-
 // For node.js compile using: tsc --module commonjs easystarjs-tests.ts
 // then run using: node easystarjs-tests.js
 import EasyStar = require('easystarjs');
diff --git a/easystarjs/easystarjs.d.ts b/easystarjs/easystarjs.d.ts
deleted file mode 100644
index 6faec22d3b..0000000000
--- a/easystarjs/easystarjs.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-// Type definitions for EasyStar.js 0.1.6
-// Project: http://easystarjs.com/
-// Definitions by: Magnus Gustafsson <https://github.com/borundin>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped  
-
-/*
- easystarjs.d.ts may be freely distributed under the MIT license.
- */
-
-declare namespace easystarjs
-{
-    class js
-    {
-        new (): js;
-        setGrid(grid: number[][]): void;
-        setAcceptableTiles(tiles: number[]): void;
-        findPath(startX: number, startY: number, endX: number, endY: number, callback: (path: Position[]) => void): void;
-        calculate(): void;
-        setIterationsPerCalculation(iterations: number): void;
-        avoidAdditionalPoint(x: number, y: number): void;
-        stopAvoidingAdditionalPoint(x: number, y: number): void;
-        stopAvoidingAllAdditionalPoints(): void;
-        enableDiagonals(): void;
-        disableDiagonals(): void;
-        setTileCost(tileType: number, multiplicativeCost: number): void;
-    }
-
-    interface Position
-    {
-        x: number;
-        y: number;
-    }
-}
-
-declare module "easystarjs" {
-    export = easystarjs;
-}
diff --git a/easystarjs/index.d.ts b/easystarjs/index.d.ts
new file mode 100644
index 0000000000..c4da0c51a7
--- /dev/null
+++ b/easystarjs/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for EasyStar.js 0.1.6
+// Project: http://easystarjs.com/
+// Definitions by: Magnus Gustafsson <https://github.com/borundin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped  
+
+/*
+ easystarjs.d.ts may be freely distributed under the MIT license.
+ */
+
+export = easystarjs;
+
+declare namespace easystarjs
+{
+    class js
+    {
+        new (): js;
+        setGrid(grid: number[][]): void;
+        setAcceptableTiles(tiles: number[]): void;
+        findPath(startX: number, startY: number, endX: number, endY: number, callback: (path: Position[]) => void): void;
+        calculate(): void;
+        setIterationsPerCalculation(iterations: number): void;
+        avoidAdditionalPoint(x: number, y: number): void;
+        stopAvoidingAdditionalPoint(x: number, y: number): void;
+        stopAvoidingAllAdditionalPoints(): void;
+        enableDiagonals(): void;
+        disableDiagonals(): void;
+        setTileCost(tileType: number, multiplicativeCost: number): void;
+    }
+
+    interface Position
+    {
+        x: number;
+        y: number;
+    }
+}
\ No newline at end of file
diff --git a/easystarjs/tsconfig.json b/easystarjs/tsconfig.json
new file mode 100644
index 0000000000..d2ab7b4520
--- /dev/null
+++ b/easystarjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "easystarjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/egg.js/egg.js-tests.ts b/egg.js/egg.js-tests.ts
index d9eeefc86e..3da20f63db 100644
--- a/egg.js/egg.js-tests.ts
+++ b/egg.js/egg.js-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="egg.js.d.ts" />
+
 
 var egg = new Egg();
 egg
diff --git a/egg.js/egg.js.d.ts b/egg.js/egg.js.d.ts
deleted file mode 100644
index 5a94753f44..0000000000
--- a/egg.js/egg.js.d.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-// Type definitions for Egg.js 0.0.1
-// Project: https://github.com/mikeflynn/egg.js/
-// Definitions by: Markus Peloso <https://github.com/ToastHawaii/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare var egg: Egg;
-
-declare module "egg" {
-    export = egg;
-}
-
-/**
- * Egg.js is a simple JS library that has no prerequisites and allows you to easily add web easter
- * eggs by watching the user's key strokes.
- */
-declare class Egg {
-    /**
-     * Egg.js is a simple JS library that has no prerequisites and allows you to easily add web easter
-     * eggs by watching the user's key strokes.
-     */
-    constructor();
-    /**
-     * Egg.js is a simple JS library that has no prerequisites and allows you to easily add web easter
-     * eggs by watching the user's key strokes.
-     * @param keySequence You need to pass it the character sequence to trigger the easter egg
-     *                    callback (which can either be in plain English or JavaScript key codes).
-     * @param fn A function to trigger when it happens.
-     */
-    constructor(keySequence: string, fn: () => any);
-    /**
-     * Egg.js is a simple JS library that has no prerequisites and allows you to easily add web easter
-     * eggs by watching the user's key strokes.
-     * @param keySequence You need to pass it the character sequence to trigger the easter egg
-     *                    callback (which can either be in plain English or JavaScript key codes).
-     * @param fn A function to trigger when it happens.
-     * @param metadata An optional set of metadata.
-     */
-    constructor(keySequence: string, fn: () => any, metadata: any);
-    /**
-     * Use to add in your easter eggs.
-     * @param keySequence You need to pass it the character sequence to trigger the easter egg
-     *                    callback (which can either be in plain English or JavaScript key codes).
-     * @param fn A function to trigger when it happens.
-     */
-    AddCode(keySequence: string, fn: () => any): Egg;
-    /**
-     * Use to add in your easter eggs.
-     * @param keySequence You need to pass it the character sequence to trigger the easter egg
-     *                    callback (which can either be in plain English or JavaScript key codes).
-     * @param fn A function to trigger when it happens.
-     * @param metadata An optional set of metadata.
-     */
-    AddCode(keySequence: string, fn: () => any, metadata: any): Egg;
-    /**
-     * Add a hook, that will run after any egg code is triggered. You could use it to fire a Google
-     * Analytics event or send out a tweet that someone finally found your easter egg. Hooks get
-     * access to the whole Egg.js object so you can pull information about the easter egg that
-     * fired via this.activeEgg.
-     * @param fn A function to trigger when it happens.
-     */
-    AddHook(fn: () => any): Egg;
-    /**
-     * Start listening to key codes.
-     */
-    Listen(): Egg;
-    /**
-     * Use to add in your easter eggs.
-     * @param keySequence You need to pass it the character sequence to trigger the easter egg
-     *                    callback (which can either be in plain English or JavaScript key codes).
-     * @param fn A function to trigger when it happens.
-     */
-    addCode(keySequence: string, fn: () => any): Egg;
-    /**
-     * Use to add in your easter eggs.
-     * @param keySequence You need to pass it the character sequence to trigger the easter egg
-     *                    callback (which can either be in plain English or JavaScript key codes).
-     * @param fn A function to trigger when it happens.
-     * @param metadata An optional set of metadata.
-     */
-    addCode(keySequence: string, fn: () => any, metadata: any): Egg;
-    /**
-     * Add a hook, that will run after any egg code is triggered. You could use it to fire a Google
-     * Analytics event or send out a tweet that someone finally found your easter egg. Hooks get
-     * access to the whole Egg.js object so you can pull information about the easter egg that
-     * fired via this.activeEgg.
-     * @param fn A function to trigger when it happens.
-     */
-    addHook(fn: () => any): Egg;
-    /**
-     * Start listening to key codes.
-     */
-    listen(): Egg;
-}
\ No newline at end of file
diff --git a/egg.js/index.d.ts b/egg.js/index.d.ts
new file mode 100644
index 0000000000..61f1541bfd
--- /dev/null
+++ b/egg.js/index.d.ts
@@ -0,0 +1,89 @@
+// Type definitions for Egg.js 0.0.1
+// Project: https://github.com/mikeflynn/egg.js/
+// Definitions by: Markus Peloso <https://github.com/ToastHawaii/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var egg: Egg;
+
+/**
+ * Egg.js is a simple JS library that has no prerequisites and allows you to easily add web easter
+ * eggs by watching the user's key strokes.
+ */
+declare class Egg {
+    /**
+     * Egg.js is a simple JS library that has no prerequisites and allows you to easily add web easter
+     * eggs by watching the user's key strokes.
+     */
+    constructor();
+    /**
+     * Egg.js is a simple JS library that has no prerequisites and allows you to easily add web easter
+     * eggs by watching the user's key strokes.
+     * @param keySequence You need to pass it the character sequence to trigger the easter egg
+     *                    callback (which can either be in plain English or JavaScript key codes).
+     * @param fn A function to trigger when it happens.
+     */
+    constructor(keySequence: string, fn: () => any);
+    /**
+     * Egg.js is a simple JS library that has no prerequisites and allows you to easily add web easter
+     * eggs by watching the user's key strokes.
+     * @param keySequence You need to pass it the character sequence to trigger the easter egg
+     *                    callback (which can either be in plain English or JavaScript key codes).
+     * @param fn A function to trigger when it happens.
+     * @param metadata An optional set of metadata.
+     */
+    constructor(keySequence: string, fn: () => any, metadata: any);
+    /**
+     * Use to add in your easter eggs.
+     * @param keySequence You need to pass it the character sequence to trigger the easter egg
+     *                    callback (which can either be in plain English or JavaScript key codes).
+     * @param fn A function to trigger when it happens.
+     */
+    AddCode(keySequence: string, fn: () => any): Egg;
+    /**
+     * Use to add in your easter eggs.
+     * @param keySequence You need to pass it the character sequence to trigger the easter egg
+     *                    callback (which can either be in plain English or JavaScript key codes).
+     * @param fn A function to trigger when it happens.
+     * @param metadata An optional set of metadata.
+     */
+    AddCode(keySequence: string, fn: () => any, metadata: any): Egg;
+    /**
+     * Add a hook, that will run after any egg code is triggered. You could use it to fire a Google
+     * Analytics event or send out a tweet that someone finally found your easter egg. Hooks get
+     * access to the whole Egg.js object so you can pull information about the easter egg that
+     * fired via this.activeEgg.
+     * @param fn A function to trigger when it happens.
+     */
+    AddHook(fn: () => any): Egg;
+    /**
+     * Start listening to key codes.
+     */
+    Listen(): Egg;
+    /**
+     * Use to add in your easter eggs.
+     * @param keySequence You need to pass it the character sequence to trigger the easter egg
+     *                    callback (which can either be in plain English or JavaScript key codes).
+     * @param fn A function to trigger when it happens.
+     */
+    addCode(keySequence: string, fn: () => any): Egg;
+    /**
+     * Use to add in your easter eggs.
+     * @param keySequence You need to pass it the character sequence to trigger the easter egg
+     *                    callback (which can either be in plain English or JavaScript key codes).
+     * @param fn A function to trigger when it happens.
+     * @param metadata An optional set of metadata.
+     */
+    addCode(keySequence: string, fn: () => any, metadata: any): Egg;
+    /**
+     * Add a hook, that will run after any egg code is triggered. You could use it to fire a Google
+     * Analytics event or send out a tweet that someone finally found your easter egg. Hooks get
+     * access to the whole Egg.js object so you can pull information about the easter egg that
+     * fired via this.activeEgg.
+     * @param fn A function to trigger when it happens.
+     */
+    addHook(fn: () => any): Egg;
+    /**
+     * Start listening to key codes.
+     */
+    listen(): Egg;
+}
\ No newline at end of file
diff --git a/egg.js/tsconfig.json b/egg.js/tsconfig.json
new file mode 100644
index 0000000000..e12dcc83c4
--- /dev/null
+++ b/egg.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "egg.js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ejs-locals/ejs-locals-tests.ts b/ejs-locals/ejs-locals-tests.ts
index 079837a5f7..b7e41ca49e 100644
--- a/ejs-locals/ejs-locals-tests.ts
+++ b/ejs-locals/ejs-locals-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../express/express.d.ts" />
-/// <reference path="ejs-locals.d.ts" />
+
 
 import express = require('express');
 import ejsLocals = require('ejs-locals');
diff --git a/ejs-locals/ejs-locals.d.ts b/ejs-locals/ejs-locals.d.ts
deleted file mode 100644
index 2cf598b266..0000000000
--- a/ejs-locals/ejs-locals.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Type definitions for ejs-locals
-// Project: https://github.com/randometc/ejs-locals
-// Definitions by: jt000 <https://github.com/jt000>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "ejs-locals" {
-
-    function ejsLocals(): Function;
-
-    export = ejsLocals;
-}
\ No newline at end of file
diff --git a/ejs-locals/index.d.ts b/ejs-locals/index.d.ts
new file mode 100644
index 0000000000..6398ee199f
--- /dev/null
+++ b/ejs-locals/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for ejs-locals
+// Project: https://github.com/randometc/ejs-locals
+// Definitions by: jt000 <https://github.com/jt000>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare function ejsLocals(): Function;
+
+export = ejsLocals;
diff --git a/ejs-locals/tsconfig.json b/ejs-locals/tsconfig.json
new file mode 100644
index 0000000000..ba3a8268e1
--- /dev/null
+++ b/ejs-locals/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ejs-locals-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ejs/ejs-tests.ts b/ejs/ejs-tests.ts
index fd03dd1e09..b5b46f03b5 100644
--- a/ejs/ejs-tests.ts
+++ b/ejs/ejs-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="ejs.d.ts"/>
 import ejs = require("ejs");
 var people = ['geddy', 'neil', 'alex'];
 var    html = ejs.render('<%= people.join(", "); %>', { people: people });
diff --git a/ejs/ejs.d.ts b/ejs/ejs.d.ts
deleted file mode 100644
index 6e2347fbc5..0000000000
--- a/ejs/ejs.d.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-// Type definitions for ejs.js v2.3.3
-// Project: http://ejs.co/
-// Definitions by: Ben Liddicott <https://github.com/benliddicott/DefinitelyTyped>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-declare module "ejs" {
-    namespace Ejs {
-        type Data = { [name: string]: any };
-        type Dependencies = string[];
-        var cache: Cache;
-        var localsName: string;
-        function resolveInclude(name: string, filename: string): string;
-        function compile(template: string, opts?: Options): (TemplateFunction);
-        function render(template: string, data?: Data, opts?: Options): string;
-        function renderFile(path: string, data?: Data, opts?: Options, cb?: Function): any;// TODO RenderFileCallback return type
-        function clearCache(): any;
-
-        function TemplateFunction(data: Data): any;
-        interface TemplateFunction {
-            dependencies: Dependencies;
-        }
-        interface Options {
-            cache?: any;
-            filename?: string;
-            context?: any;
-            compileDebug?: boolean;
-            client?: boolean;
-            delimiter?: string;
-            debug?: any;
-            _with?: boolean;
-        }
-        class Template {
-            constructor(text: string, opts: Options);
-            opts: Options;
-            templateText: string;
-            mode: string;
-            truncate: boolean;
-            currentLine: number;
-            source: string;
-            dependencies: Dependencies;
-            createRegex(): RegExp;
-            compile(): TemplateFunction;
-            generateSource(): any;
-            parseTemplateText(): string[];
-            scanLine(line: string): any;
-
-        }
-        namespace Template {
-            interface MODES {
-                EVAL: string;
-                ESCAPED: string;
-                RAW: string;
-                COMMENT: string;
-                LITERAL: string;
-            }
-        }
-        function escapeRegexChars(s: string): string;
-        function escapeXML(markup: string): string;
-        function shallowCopy<T1>(to: T1, fro: any): T1;
-        interface Cache {
-            _data: { [name: string]: any };
-            set(key: string, val: any): any;
-            get(key: string): any;
-        }
-        var cache: Cache;
-        function resolve(from1: string, to: string): string;
-        function resolve(from1: string, from2: string, to: string): string;
-        function resolve(from1: string, from2: string, from3: string, to: string): string;
-        function resolve(from1: string, from2: string, from3: string, from4: string, to: string): string;
-        function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, to: string): string;
-        function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, to: string): string;
-        function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, from7: string, to: string): string;
-        function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, from7: string, from8: string, to: string): string;
-        function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, from7: string, from8: string, from9: string, to: string): string;
-        function resolve(...args: string[]): string;
-        function normalize(path: string): string;
-        function isAbsolute(path: string): boolean;
-        function join(...args: string[]): string;
-        function relative(from: string, to: string): string;
-        var sep: string;
-        var delimiter: string;
-        function dirname(path: string): string;
-        function basename(path: string): string;
-        function extname(path: string): string;
-        function filter(xs: any, f: any): any; // TODO WHUT?
-
-
-    }
-    export = Ejs;
-}
diff --git a/ejs/index.d.ts b/ejs/index.d.ts
new file mode 100644
index 0000000000..e77656a418
--- /dev/null
+++ b/ejs/index.d.ts
@@ -0,0 +1,90 @@
+// Type definitions for ejs.js v2.3.3
+// Project: http://ejs.co/
+// Definitions by: Ben Liddicott <https://github.com/benliddicott/DefinitelyTyped>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare namespace Ejs {
+    type Data = { [name: string]: any };
+    type Dependencies = string[];
+    var cache: Cache;
+    var localsName: string;
+    function resolveInclude(name: string, filename: string): string;
+    function compile(template: string, opts?: Options): (TemplateFunction);
+    function render(template: string, data?: Data, opts?: Options): string;
+    function renderFile(path: string, data?: Data, opts?: Options, cb?: Function): any;// TODO RenderFileCallback return type
+    function clearCache(): any;
+
+    function TemplateFunction(data: Data): any;
+    interface TemplateFunction {
+        dependencies: Dependencies;
+    }
+    interface Options {
+        cache?: any;
+        filename?: string;
+        context?: any;
+        compileDebug?: boolean;
+        client?: boolean;
+        delimiter?: string;
+        debug?: any;
+        _with?: boolean;
+    }
+    class Template {
+        constructor(text: string, opts: Options);
+        opts: Options;
+        templateText: string;
+        mode: string;
+        truncate: boolean;
+        currentLine: number;
+        source: string;
+        dependencies: Dependencies;
+        createRegex(): RegExp;
+        compile(): TemplateFunction;
+        generateSource(): any;
+        parseTemplateText(): string[];
+        scanLine(line: string): any;
+
+    }
+    namespace Template {
+        interface MODES {
+            EVAL: string;
+            ESCAPED: string;
+            RAW: string;
+            COMMENT: string;
+            LITERAL: string;
+        }
+    }
+    function escapeRegexChars(s: string): string;
+    function escapeXML(markup: string): string;
+    function shallowCopy<T1>(to: T1, fro: any): T1;
+    interface Cache {
+        _data: { [name: string]: any };
+        set(key: string, val: any): any;
+        get(key: string): any;
+    }
+    var cache: Cache;
+    function resolve(from1: string, to: string): string;
+    function resolve(from1: string, from2: string, to: string): string;
+    function resolve(from1: string, from2: string, from3: string, to: string): string;
+    function resolve(from1: string, from2: string, from3: string, from4: string, to: string): string;
+    function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, to: string): string;
+    function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, to: string): string;
+    function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, from7: string, to: string): string;
+    function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, from7: string, from8: string, to: string): string;
+    function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, from7: string, from8: string, from9: string, to: string): string;
+    function resolve(...args: string[]): string;
+    function normalize(path: string): string;
+    function isAbsolute(path: string): boolean;
+    function join(...args: string[]): string;
+    function relative(from: string, to: string): string;
+    var sep: string;
+    var delimiter: string;
+    function dirname(path: string): string;
+    function basename(path: string): string;
+    function extname(path: string): string;
+    function filter(xs: any, f: any): any; // TODO WHUT?
+
+
+}
+export = Ejs;
diff --git a/ejs/tsconfig.json b/ejs/tsconfig.json
new file mode 100644
index 0000000000..bc3a10e98a
--- /dev/null
+++ b/ejs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ejs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/electron-builder/electron-builder-tests.ts b/electron-builder/electron-builder-tests.ts
index d37de84c5c..8ae7479882 100644
--- a/electron-builder/electron-builder-tests.ts
+++ b/electron-builder/electron-builder-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./electron-builder.d.ts" />
+
 
 import * as factory from "electron-builder";
 const builder = factory.init();
diff --git a/electron-builder/electron-builder.d.ts b/electron-builder/electron-builder.d.ts
deleted file mode 100644
index 2ed7cd2782..0000000000
--- a/electron-builder/electron-builder.d.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-// Type definitions for electron-builder v2.0.2
-// Project: https://github.com/loopline-systems/electron-builder
-// Definitions by: Maxime LUCE <https://github.com/SomaticIT/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare namespace ElectronBuilder {
-
-    /** Electron-builder Options. */
-    export interface Options {
-        /** Source application path. */
-        appPath: string;
-
-        /** Platforms to build. Allowed values: win, osx, all. */
-        platform: string;
-
-        /** Path or Object. Configuration for build. */
-        config: string | Config;
-
-        /** The output directory. */
-        out?: string;
-
-    }
-
-    /** Build configuration by platforms. */
-    export interface Config {
-        /** Configurations for Mac OS X. */
-        osx: {
-            /** Installer title. */
-            title: string;
-            /** Installer background. */
-            background: string;
-            /** Installer icon. */
-            icon: string;
-            /** Installer icon size. */
-            "icon-size": number;
-            /** Installer custom contents. */
-            contents: [OsxContents, OsxContents]
-        };
-
-        /** Configurations for Windows. */
-        win: {
-            /** Installer title. */
-            title: string;
-            /** Installer icon. */
-            icon: string;
-        };
-    }
-
-    /** OSX Installer custom contents. */
-    export interface OsxContents {
-        /** Horizontal position on installer screen (in pixels). */
-        x: number;
-        /** Vertical position on installer screen (in pixels). */
-        y: number;
-        /** Content type. Allowed values are "file", "link". */
-        type: string;
-        /** Link only. Customize link destination path. */
-        path?: string;
-    }
-
-    /** Electron-builder done callback. */
-    export interface Callback {
-        /**
-         * Callback wich is called when electron-builder is done.
-         * @param err - Contains errors if any.
-         */
-        (err: Error): void
-    }
-
-    /** Prototype for electron-builder. */
-    export interface Builder {
-        /**
-         * Build the installer for given platform.
-         *
-         * @param opts - Options to configure installer.
-         * @param callback - Callback which is called when building is done or an error occured.
-         */
-        build(opts: Options, callback: Callback): void;
-    }
-}
-
-declare module "electron-builder" {
-    export function init(): ElectronBuilder.Builder;
-}
-
-interface NodeRequireFunction {
-    (id: "electron-builder"): { init(): ElectronBuilder.Builder };
-}
diff --git a/electron-builder/index.d.ts b/electron-builder/index.d.ts
new file mode 100644
index 0000000000..3daa291b55
--- /dev/null
+++ b/electron-builder/index.d.ts
@@ -0,0 +1,90 @@
+// Type definitions for electron-builder v2.0.2
+// Project: https://github.com/loopline-systems/electron-builder
+// Definitions by: Maxime LUCE <https://github.com/SomaticIT/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare namespace ElectronBuilder {
+
+    /** Electron-builder Options. */
+    export interface Options {
+        /** Source application path. */
+        appPath: string;
+
+        /** Platforms to build. Allowed values: win, osx, all. */
+        platform: string;
+
+        /** Path or Object. Configuration for build. */
+        config: string | Config;
+
+        /** The output directory. */
+        out?: string;
+
+    }
+
+    /** Build configuration by platforms. */
+    export interface Config {
+        /** Configurations for Mac OS X. */
+        osx: {
+            /** Installer title. */
+            title: string;
+            /** Installer background. */
+            background: string;
+            /** Installer icon. */
+            icon: string;
+            /** Installer icon size. */
+            "icon-size": number;
+            /** Installer custom contents. */
+            contents: [OsxContents, OsxContents]
+        };
+
+        /** Configurations for Windows. */
+        win: {
+            /** Installer title. */
+            title: string;
+            /** Installer icon. */
+            icon: string;
+        };
+    }
+
+    /** OSX Installer custom contents. */
+    export interface OsxContents {
+        /** Horizontal position on installer screen (in pixels). */
+        x: number;
+        /** Vertical position on installer screen (in pixels). */
+        y: number;
+        /** Content type. Allowed values are "file", "link". */
+        type: string;
+        /** Link only. Customize link destination path. */
+        path?: string;
+    }
+
+    /** Electron-builder done callback. */
+    export interface Callback {
+        /**
+         * Callback wich is called when electron-builder is done.
+         * @param err - Contains errors if any.
+         */
+        (err: Error): void
+    }
+
+    /** Prototype for electron-builder. */
+    export interface Builder {
+        /**
+         * Build the installer for given platform.
+         *
+         * @param opts - Options to configure installer.
+         * @param callback - Callback which is called when building is done or an error occured.
+         */
+        build(opts: Options, callback: Callback): void;
+    }
+}
+
+declare module "electron-builder" {
+    export function init(): ElectronBuilder.Builder;
+}
+
+interface NodeRequireFunction {
+    (id: "electron-builder"): { init(): ElectronBuilder.Builder };
+}
diff --git a/electron-builder/tsconfig.json b/electron-builder/tsconfig.json
new file mode 100644
index 0000000000..b4b0d72ab7
--- /dev/null
+++ b/electron-builder/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "electron-builder-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/electron-json-storage/electron-json-storage-tests.ts b/electron-json-storage/electron-json-storage-tests.ts
index 3a0c43bce1..dd0504f8b6 100644
--- a/electron-json-storage/electron-json-storage-tests.ts
+++ b/electron-json-storage/electron-json-storage-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../github-electron/github-electron.d.ts" />
-/// <reference path="electron-json-storage.d.ts" />
+/// <reference types="electron" />
 
 import electron = require('electron');
 import storage = require('electron-json-storage');
diff --git a/electron-json-storage/electron-json-storage.d.ts b/electron-json-storage/electron-json-storage.d.ts
deleted file mode 100644
index 0ea790638f..0000000000
--- a/electron-json-storage/electron-json-storage.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Type definitions for electron-json-storage
-// Project: https://github.com/jviotti/electron-json-storage
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "electron-json-storage" {
-	export function get(key: string, callback: (error: any, data: Object) => void): void;
-	export function set(key: string, json: Object, callback: (error: any) => void): void;
-	export function has(key: string, callback: (error: any, hasKey: boolean) => void): void;
-	export function keys(callback: (error: any, keys: string[]) => void): void;
-	export function remove(key: string, callback: (error: any) => void): void;
-	export function clear(callback: (error: any) => void): void;
-}
diff --git a/electron-json-storage/index.d.ts b/electron-json-storage/index.d.ts
new file mode 100644
index 0000000000..23b26920af
--- /dev/null
+++ b/electron-json-storage/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for electron-json-storage
+// Project: https://github.com/jviotti/electron-json-storage
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export declare function get(key: string, callback: (error: any, data: Object) => void): void;
+export declare function set(key: string, json: Object, callback: (error: any) => void): void;
+export declare function has(key: string, callback: (error: any, hasKey: boolean) => void): void;
+export declare function keys(callback: (error: any, keys: string[]) => void): void;
+export declare function remove(key: string, callback: (error: any) => void): void;
+export declare function clear(callback: (error: any) => void): void;
diff --git a/electron-json-storage/tsconfig.json b/electron-json-storage/tsconfig.json
new file mode 100644
index 0000000000..112c09f91a
--- /dev/null
+++ b/electron-json-storage/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "electron-json-storage-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/electron-packager/electron-packager-tests.ts b/electron-packager/electron-packager-tests.ts
index 00a29143a4..bf6122bb2f 100644
--- a/electron-packager/electron-packager-tests.ts
+++ b/electron-packager/electron-packager-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./electron-packager.d.ts" />
+
 
 import * as packager from "electron-packager";
 
diff --git a/electron-packager/electron-packager.d.ts b/electron-packager/electron-packager.d.ts
deleted file mode 100644
index 6ffcf4774c..0000000000
--- a/electron-packager/electron-packager.d.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-// Type definitions for electron-packager v5.1.0
-// Project: https://github.com/maxogden/electron-packager
-// Definitions by: Maxime LUCE <https://github.com/SomaticIT/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare namespace ElectronPackager {
-    /** Electron-packager Options. */
-    export interface Options {
-        /** The source directory. */
-        dir: string;
-        /** The application name. */
-        name: string;
-        /**
-         * Allowed values: linux, win32, darwin, all. Not required if `all` is used.
-         * Arbitrary combinations of individual platforms are also supported via a comma-delimited string or array of strings.
-         */
-        platform?: string | string[];
-        /** Allowed values: ia32, x64, all Not required if `all` is used. */
-        arch?: string;
-        /** Electron version (without the "v"). See https://github.com/atom/electron/releases. */
-        version: string;
-
-        /** Shortcut for `--arch=all --platform=all`. */
-        all?: boolean;
-        /** The output directory. */
-        out?: string;
-        /**
-         * Currently you must look for conversion tools in order to supply an icon in the format required by the platform:
-         * - OS X: `.icns`
-         * - Windows: `.ico`
-         *
-         * For Linux builds, this option is not required, as the dock/window list icon is set via the icon option in the BrowserWindow contructor.
-         * Setting the icon in the file manager is not currently supported.
-         *
-         * If the file extension is omitted, it is auto-completed to the correct extension based on the platform,
-         * including when `--platform=all` is in effect.
-         */
-        icon?: string;
-
-        /** The bundle identifier to use in the app plist. */
-        "app-bundle-id"?: string;
-        /** The release version to set for the app. */
-        "app-version"?: string;
-        /** The build version to set for the app (OS X only). */
-        "build-version"?: string;
-        /** The bundle identifier to use in the app helper plist. */
-        "helper-bundle-id"?: string;
-        /** Object hash of application metadata to embed into the executable (Windows only). */
-        "version-string"?: VersionString;
-
-        /** The directory of cached electron downloads. Defaults to "$HOME/.electron". */
-        cache?: string;
-        /** Do not copy files into App whose filenames regex .match this string. */
-        ignore?: RegExp;
-        /** Runs `npm prune --production` on the app. */
-        prune?: boolean;
-        /** If output directory for a platform already exists, replaces it rather than skipping it. */
-        overwrite?: boolean;
-        /** Packages the source code within your app into an archive. */
-        asar?: boolean;
-        /** Unpacks the files to app.asar.unpacked directory whose filenames regex .match this string. */
-        "asar-unpack"?: string;
-        /** Should contain the identity to be used when running `codesign` (OS X only). */
-        sign?: string;
-    }
-
-    /** Object hash of application metadata to embed into the executable (Windows only). */
-    export interface VersionString {
-        CompanyName?: string;
-        LegalCopyright?: string;
-        FileDescription?: string;
-        OriginalFilename?: string;
-        FileVersion?: string;
-        ProductVersion?: string;
-        ProductName?: string;
-        InternalName?: string;
-    }
-
-    /** Electron-packager done callback. */
-    export interface Callback {
-        /**
-         * Callback which is called when electron-packager is done.
-         *
-         * @param err - Contains errors if any.
-         * @param appPath - Path(s) to the newly created application(s).
-         */
-        (err: Error, appPath: string|string[]): void
-    }
-
-    /** Electron-packager function */
-    export interface Packager {
-        /**
-         * This will:
-         * - Find or download the correct release of Electron
-         * - Use that version of electron to create a app in <out>/<appname>-<platform>-<arch>
-         *
-         * You should be able to launch the app on the platform you built for. If not, check your settings and try again.
-         *
-         * @param opts - Options to configure packaging.
-         * @param callback - Callback which is called when packaging is done or an error occured.
-         */
-        (opts: Options, callback: Callback): void;
-    }
-}
-
-declare module "electron-packager" {
-    const packager: ElectronPackager.Packager;
-    export = packager;
-}
-
-interface NodeRequireFunction {
-    (id: "electron-packager"): ElectronPackager.Packager;
-}
diff --git a/electron-packager/index.d.ts b/electron-packager/index.d.ts
new file mode 100644
index 0000000000..e5fe985761
--- /dev/null
+++ b/electron-packager/index.d.ts
@@ -0,0 +1,115 @@
+// Type definitions for electron-packager v5.1.0
+// Project: https://github.com/maxogden/electron-packager
+// Definitions by: Maxime LUCE <https://github.com/SomaticIT/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare namespace ElectronPackager {
+    /** Electron-packager Options. */
+    export interface Options {
+        /** The source directory. */
+        dir: string;
+        /** The application name. */
+        name: string;
+        /**
+         * Allowed values: linux, win32, darwin, all. Not required if `all` is used.
+         * Arbitrary combinations of individual platforms are also supported via a comma-delimited string or array of strings.
+         */
+        platform?: string | string[];
+        /** Allowed values: ia32, x64, all Not required if `all` is used. */
+        arch?: string;
+        /** Electron version (without the "v"). See https://github.com/atom/electron/releases. */
+        version: string;
+
+        /** Shortcut for `--arch=all --platform=all`. */
+        all?: boolean;
+        /** The output directory. */
+        out?: string;
+        /**
+         * Currently you must look for conversion tools in order to supply an icon in the format required by the platform:
+         * - OS X: `.icns`
+         * - Windows: `.ico`
+         *
+         * For Linux builds, this option is not required, as the dock/window list icon is set via the icon option in the BrowserWindow contructor.
+         * Setting the icon in the file manager is not currently supported.
+         *
+         * If the file extension is omitted, it is auto-completed to the correct extension based on the platform,
+         * including when `--platform=all` is in effect.
+         */
+        icon?: string;
+
+        /** The bundle identifier to use in the app plist. */
+        "app-bundle-id"?: string;
+        /** The release version to set for the app. */
+        "app-version"?: string;
+        /** The build version to set for the app (OS X only). */
+        "build-version"?: string;
+        /** The bundle identifier to use in the app helper plist. */
+        "helper-bundle-id"?: string;
+        /** Object hash of application metadata to embed into the executable (Windows only). */
+        "version-string"?: VersionString;
+
+        /** The directory of cached electron downloads. Defaults to "$HOME/.electron". */
+        cache?: string;
+        /** Do not copy files into App whose filenames regex .match this string. */
+        ignore?: RegExp;
+        /** Runs `npm prune --production` on the app. */
+        prune?: boolean;
+        /** If output directory for a platform already exists, replaces it rather than skipping it. */
+        overwrite?: boolean;
+        /** Packages the source code within your app into an archive. */
+        asar?: boolean;
+        /** Unpacks the files to app.asar.unpacked directory whose filenames regex .match this string. */
+        "asar-unpack"?: string;
+        /** Should contain the identity to be used when running `codesign` (OS X only). */
+        sign?: string;
+    }
+
+    /** Object hash of application metadata to embed into the executable (Windows only). */
+    export interface VersionString {
+        CompanyName?: string;
+        LegalCopyright?: string;
+        FileDescription?: string;
+        OriginalFilename?: string;
+        FileVersion?: string;
+        ProductVersion?: string;
+        ProductName?: string;
+        InternalName?: string;
+    }
+
+    /** Electron-packager done callback. */
+    export interface Callback {
+        /**
+         * Callback which is called when electron-packager is done.
+         *
+         * @param err - Contains errors if any.
+         * @param appPath - Path(s) to the newly created application(s).
+         */
+        (err: Error, appPath: string|string[]): void
+    }
+
+    /** Electron-packager function */
+    export interface Packager {
+        /**
+         * This will:
+         * - Find or download the correct release of Electron
+         * - Use that version of electron to create a app in <out>/<appname>-<platform>-<arch>
+         *
+         * You should be able to launch the app on the platform you built for. If not, check your settings and try again.
+         *
+         * @param opts - Options to configure packaging.
+         * @param callback - Callback which is called when packaging is done or an error occured.
+         */
+        (opts: Options, callback: Callback): void;
+    }
+}
+
+declare module "electron-packager" {
+    const packager: ElectronPackager.Packager;
+    export = packager;
+}
+
+interface NodeRequireFunction {
+    (id: "electron-packager"): ElectronPackager.Packager;
+}
diff --git a/electron-packager/tsconfig.json b/electron-packager/tsconfig.json
new file mode 100644
index 0000000000..2909617582
--- /dev/null
+++ b/electron-packager/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "electron-packager-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/electron-window-state/electron-window-state-tests.ts b/electron-window-state/electron-window-state-tests.ts
index 2d1dfbfe72..8a345d0ec9 100644
--- a/electron-window-state/electron-window-state-tests.ts
+++ b/electron-window-state/electron-window-state-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="electron-window-state.d.ts" />
+
 
 import {app, BrowserWindow} from 'electron';
 import windowStateKeeper = require('electron-window-state');
@@ -24,8 +24,8 @@ app.on('ready', function () {
 const s2 = windowStateKeeper({
   defaultWidth: 1000,
   defaultHeight: 800,
-  file: __dirname + '/foo.json',
-  path: __dirname,
+  file: '' + '/foo.json',
+  path: '',
   maximize: true,
   fullScreen: false,
 });
diff --git a/electron-window-state/electron-window-state.d.ts b/electron-window-state/electron-window-state.d.ts
deleted file mode 100644
index dfcb297e4f..0000000000
--- a/electron-window-state/electron-window-state.d.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-// Type definitions for electron-window-state 2.0.0
-// Project: https://github.com/mawie81/electron-window-state
-// Definitions by: rhysd <https://github.com/rhysd>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../github-electron/github-electron.d.ts" />
-
-declare namespace ElectronWindowState {
-	interface WindowState {
-		/*
-		 * The saved x coordinate of the loaded state.
-		 * undefined if the state has not been saved yet.
-		 */
-		x: number;
-		/*
-		 * The saved y coordinate of the loaded state.
-		 * undefined if the state has not been saved yet.
-		 */
-		y: number;
-		/*
-		 * The saved width of loaded state.
-		 * defaultWidth if the state has not been saved yet.
-		 */
-		width: number;
-		/*
-		 * The saved heigth of loaded state.
-		 * defaultHeight if the state has not been saved yet.
-		 */
-		height: number;
-		/*
-		 * true if the window state was saved while the the window was maximized.
-		 * undefined if the state has not been saved yet.
-		 */
-		isMaximized: boolean;
-		/*
-		 * true if the window state was saved while the the window was in full screen
-		 * mode. undefined if the state has not been saved yet.
-		 */
-		isFullScreen: boolean;
-		/*
-		 * Register listeners on the given BrowserWindow for events that are related
-		 * to size or position changes (resize, move).
-		 * It will also restore the window's maximized or full screen state.
-		 * When the window is closed we automatically remove the listeners and save the state.
-		 */
-		manage(win: Electron.BrowserWindow): void;
-		/*
-		 * Saves the current state of the given BrowserWindow.
-		 * This exists mostly for legacy purposes, and in most cases it's better to just use manage.
-		 */
-		saveState(win: Electron.BrowserWindow): void;
-	}
-	interface WindowStateKeeperOptions {
-		/*
-		 * The width that should be returned if no file exists yet. Defaults to 800.
-		 */
-		defaultWidth?: number;
-		/*
-		 * The height that should be returned if no file exists yet. Defaults to 600.
-		 */
-		defaultHeight?: number;
-		/*
-		 * The path where the state file should be written to.
-		 * Defaults to app.getPath('userData')
-		 */
-		path?: string;
-		/*
-		 * The name of file. Defaults to window-state.json
-		 */
-		file?: string;
-		/*
-		 * Should we automatically maximize the window,
-		 * if it was last closed maximized. Defaults to true
-		 */
-		maximize?: boolean;
-		/*
-		 * Should we automatically restore the window to full screen,
-		 * if it was last closed full screen. Defaults to true
-		 */
-		fullScreen?: boolean;
-	}
-}
-
-declare module 'electron-window-state' {
-	/*
-	 * Load the previous state with fallback to defaults
-	 */
-	function windowStateKeeper(opts: ElectronWindowState.WindowStateKeeperOptions): ElectronWindowState.WindowState;
-	export = windowStateKeeper;
-}
diff --git a/electron-window-state/index.d.ts b/electron-window-state/index.d.ts
new file mode 100644
index 0000000000..1ff10ed7d5
--- /dev/null
+++ b/electron-window-state/index.d.ts
@@ -0,0 +1,88 @@
+// Type definitions for electron-window-state 2.0.0
+// Project: https://github.com/mawie81/electron-window-state
+// Definitions by: rhysd <https://github.com/rhysd>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="electron" />
+
+/*
+ * Load the previous state with fallback to defaults
+ */
+declare function windowStateKeeper(opts: ElectronWindowState.WindowStateKeeperOptions): ElectronWindowState.WindowState;
+export = windowStateKeeper;
+
+declare namespace ElectronWindowState {
+	interface WindowState {
+		/*
+		 * The saved x coordinate of the loaded state.
+		 * undefined if the state has not been saved yet.
+		 */
+		x: number;
+		/*
+		 * The saved y coordinate of the loaded state.
+		 * undefined if the state has not been saved yet.
+		 */
+		y: number;
+		/*
+		 * The saved width of loaded state.
+		 * defaultWidth if the state has not been saved yet.
+		 */
+		width: number;
+		/*
+		 * The saved heigth of loaded state.
+		 * defaultHeight if the state has not been saved yet.
+		 */
+		height: number;
+		/*
+		 * true if the window state was saved while the the window was maximized.
+		 * undefined if the state has not been saved yet.
+		 */
+		isMaximized: boolean;
+		/*
+		 * true if the window state was saved while the the window was in full screen
+		 * mode. undefined if the state has not been saved yet.
+		 */
+		isFullScreen: boolean;
+		/*
+		 * Register listeners on the given BrowserWindow for events that are related
+		 * to size or position changes (resize, move).
+		 * It will also restore the window's maximized or full screen state.
+		 * When the window is closed we automatically remove the listeners and save the state.
+		 */
+		manage(win: Electron.BrowserWindow): void;
+		/*
+		 * Saves the current state of the given BrowserWindow.
+		 * This exists mostly for legacy purposes, and in most cases it's better to just use manage.
+		 */
+		saveState(win: Electron.BrowserWindow): void;
+	}
+	interface WindowStateKeeperOptions {
+		/*
+		 * The width that should be returned if no file exists yet. Defaults to 800.
+		 */
+		defaultWidth?: number;
+		/*
+		 * The height that should be returned if no file exists yet. Defaults to 600.
+		 */
+		defaultHeight?: number;
+		/*
+		 * The path where the state file should be written to.
+		 * Defaults to app.getPath('userData')
+		 */
+		path?: string;
+		/*
+		 * The name of file. Defaults to window-state.json
+		 */
+		file?: string;
+		/*
+		 * Should we automatically maximize the window,
+		 * if it was last closed maximized. Defaults to true
+		 */
+		maximize?: boolean;
+		/*
+		 * Should we automatically restore the window to full screen,
+		 * if it was last closed full screen. Defaults to true
+		 */
+		fullScreen?: boolean;
+	}
+}
diff --git a/electron-window-state/tsconfig.json b/electron-window-state/tsconfig.json
new file mode 100644
index 0000000000..4bc0c64b3a
--- /dev/null
+++ b/electron-window-state/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "electron-window-state-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/github-electron/.editorconfig b/electron/.editorconfig
similarity index 100%
rename from github-electron/.editorconfig
rename to electron/.editorconfig
diff --git a/electron/electron-prebuilt-tests.ts b/electron/electron-prebuilt-tests.ts
new file mode 100644
index 0000000000..2f503fa5b6
--- /dev/null
+++ b/electron/electron-prebuilt-tests.ts
@@ -0,0 +1,7 @@
+
+/// <reference types="node" />
+
+import electron = require('electron-prebuilt');
+import child_process = require('child_process');
+
+child_process.spawn(electron);
diff --git a/github-electron/electron-prebuilt.d.ts b/electron/electron-prebuilt.d.ts
similarity index 100%
rename from github-electron/electron-prebuilt.d.ts
rename to electron/electron-prebuilt.d.ts
diff --git a/github-electron/github-electron-main-tests.ts b/electron/github-electron-main-tests.ts
similarity index 92%
rename from github-electron/github-electron-main-tests.ts
rename to electron/github-electron-main-tests.ts
index b8b95c5c99..aa8eb6d968 100644
--- a/github-electron/github-electron-main-tests.ts
+++ b/electron/github-electron-main-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./github-electron.d.ts" />
+
 import {
 	app,
 	autoUpdater,
@@ -65,7 +65,7 @@ app.on('ready', () => {
 
 	mainWindow.webContents.openDevTools();
 	mainWindow.webContents.toggleDevTools();
-	mainWindow.webContents.openDevTools({detach: true});
+	mainWindow.webContents.openDevTools({mode: 'detach'});
 	mainWindow.webContents.closeDevTools();
 	mainWindow.webContents.addWorkSpace('/path/to/workspace');
 	mainWindow.webContents.removeWorkSpace('/path/to/workspace');
@@ -337,14 +337,21 @@ win.on('closed', () => {
 win.loadURL('https://github.com');
 win.show();
 
+var toolbarRect = document.getElementById('toolbar').getBoundingClientRect();
+win.setSheetOffset(toolbarRect.height);
+
 // content-tracing
 // https://github.com/atom/electron/blob/master/docs/api/content-tracing.md
 
-contentTracing.startRecording('*', contentTracing.DEFAULT_OPTIONS, () => {
-	console.log('Tracing started');
+const options = {
+	categoryFilter: '*',
+	traceOptions: 'record-until-full,enable-sampling'
+}
 
-	setTimeout(() => {
-		contentTracing.stopRecording('', path => {
+contentTracing.startRecording(options, function() {
+	console.log('Tracing started');
+	setTimeout(function() {
+		contentTracing.stopRecording('', function(path) {
 			console.log('Tracing data recorded to ' + path);
 		});
 	}, 5000);
@@ -408,7 +415,7 @@ var menuItem = new MenuItem({});
 
 menuItem.label = 'Hello World!';
 menuItem.click = (menuItem, browserWindow) => {
-    console.log('click', menuItem, browserWindow);
+	console.log('click', menuItem, browserWindow);
 };
 
 // menu
@@ -513,12 +520,20 @@ var template = <Electron.MenuItemOptions[]>[
 			{
 				label: 'Reload',
 				accelerator: 'Command+R',
-				click: () => { BrowserWindow.getFocusedWindow().webContents.reloadIgnoringCache(); }
+				click: (item, focusedWindow) => {
+					if (focusedWindow) {
+						focusedWindow.webContents.reloadIgnoringCache();
+					}
+				}
 			},
 			{
 				label: 'Toggle DevTools',
 				accelerator: 'Alt+Command+I',
-				click: () => { BrowserWindow.getFocusedWindow().webContents.toggleDevTools(); }
+				click: (item, focusedWindow) => {
+					if (focusedWindow) {
+						focusedWindow.webContents.toggleDevTools();
+					}
+				}
 			}
 		]
 	},
@@ -644,7 +659,7 @@ app.on('ready', () => {
 	appIcon.setToolTip('This is my application.');
 	appIcon.setContextMenu(contextMenu);
 	appIcon.setImage('/path/to/new/icon');
-    appIcon.popUpContextMenu(contextMenu, {x: 100, y: 100});
+	appIcon.popUpContextMenu(contextMenu, {x: 100, y: 100});
 
 	appIcon.on('click', (event, bounds) => {
 		console.log('click', event, bounds);
@@ -699,6 +714,18 @@ var image = clipboard.readImage();
 var appIcon3 = new Tray(image);
 var appIcon4 = new Tray('/Users/somebody/images/icon.png');
 
+// process
+// https://github.com/electron/electron/blob/master/docs/api/process.md
+
+console.log(process.type);
+console.log(process.resourcesPath);
+console.log(process.mas);
+console.log(process.windowsStore);
+process.noAsar = true;
+process.crash();
+process.hang();
+process.setFdLimit(8192);
+
 // screen
 // https://github.com/atom/electron/blob/master/docs/api/screen.md
 
@@ -745,7 +772,7 @@ shell.openItem('/home/user/Desktop/test.txt');
 shell.moveItemToTrash('/home/user/Desktop/test.txt');
 
 shell.openExternal('https://github.com', {
-    activate: false
+	activate: false
 });
 
 shell.beep();
@@ -775,7 +802,7 @@ session.defaultSession.cookies.get({ url : "http://www.github.com" }, (error, co
 var cookie = { url : "http://www.github.com", name : "dummy_name", value : "dummy" };
 session.defaultSession.cookies.set(cookie, (error) => {
 	if (error) {
-    	console.error(error);
+		console.error(error);
 	}
 });
 
@@ -815,3 +842,24 @@ session.defaultSession.enableNetworkEmulation({
 session.defaultSession.setCertificateVerifyProc((hostname, cert, callback) => {
 	callback((hostname === 'github.com') ? true : false);
 });
+
+session.defaultSession.setPermissionRequestHandler(function(webContents, permission, callback) {
+	if (webContents.getURL() === 'github.com') {
+		if (permission == "notifications") {
+			callback(false);
+			return;
+		}
+	}
+
+	callback(true);
+});
+
+// Modify the user agent for all requests to the following urls.
+var filter = {
+	urls: ["https://*.github.com/*", "*://electron.github.io"]
+};
+
+session.defaultSession.webRequest.onBeforeSendHeaders(filter, function(details, callback) {
+	details.requestHeaders['User-Agent'] = "MyAgent";
+	callback({cancel: false, requestHeaders: details.requestHeaders});
+});
diff --git a/github-electron/github-electron-renderer-tests.ts b/electron/github-electron-renderer-tests.ts
similarity index 95%
rename from github-electron/github-electron-renderer-tests.ts
rename to electron/github-electron-renderer-tests.ts
index 37faae9dbb..195c2beb8f 100644
--- a/github-electron/github-electron-renderer-tests.ts
+++ b/electron/github-electron-renderer-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./github-electron.d.ts" />
+
 import {
 	ipcRenderer,
 	remote,
@@ -171,6 +171,16 @@ var image = clipboard.readImage();
 var appIcon3 = new Tray(image);
 var appIcon4 = new Tray('/Users/somebody/images/icon.png');
 
+// https://github.com/electron/electron/blob/master/docs/api/process.md
+
+// preload.js
+var _setImmediate = setImmediate;
+var _clearImmediate = clearImmediate;
+process.once('loaded', function() {
+	global.setImmediate = _setImmediate;
+	global.clearImmediate = _clearImmediate;
+});
+
 // screen
 // https://github.com/atom/electron/blob/master/docs/api/screen.md
 
diff --git a/electron/index.d.ts b/electron/index.d.ts
new file mode 100644
index 0000000000..ff0115b930
--- /dev/null
+++ b/electron/index.d.ts
@@ -0,0 +1,4514 @@
+// Type definitions for Electron v0.37.7
+// Project: http://electron.atom.io/
+// Definitions by: jedmao <https://github.com/jedmao/>, rhysd <https://rhysd.github.io>, Milan Burda <https://github.com/miniak/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare namespace Electron {
+
+	class EventEmitter implements NodeJS.EventEmitter {
+		addListener(event: string, listener: Function): this;
+		on(event: string, listener: Function): this;
+		once(event: string, listener: Function): this;
+		removeListener(event: string, listener: Function): this;
+		removeAllListeners(event?: string): this;
+		setMaxListeners(n: number): this;
+		getMaxListeners(): number;
+		listeners(event: string): Function[];
+		emit(event: string, ...args: any[]): boolean;
+		listenerCount(type: string): number;
+	}
+
+	interface Event {
+		preventDefault: Function;
+		sender: EventEmitter;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/app.md
+
+	/**
+	 * The app module is responsible for controlling the application's lifecycle.
+	 */
+	interface App extends NodeJS.EventEmitter {
+		/**
+		 * Emitted when the application has finished basic startup.
+		 * On Windows and Linux, the will-finish-launching event
+		 * is the same as the ready event; on OS X, this event represents
+		 * the applicationWillFinishLaunching notification of NSApplication.
+		 * You would usually set up listeners for the open-file and open-url events here,
+		 * and start the crash reporter and auto updater.
+		 *
+		 * In most cases, you should just do everything in the ready event handler.
+		 */
+		on(event: 'will-finish-launching', listener: Function): this;
+		/**
+		 * Emitted when Electron has finished initialization.
+		 */
+		on(event: 'ready', listener: Function): this;
+		/**
+		 * Emitted when all windows have been closed.
+		 *
+		 * This event is only emitted when the application is not going to quit.
+		 * If the user pressed Cmd + Q, or the developer called app.quit(),
+		 * Electron will first try to close all the windows and then emit the will-quit event,
+		 * and in this case the window-all-closed event would not be emitted.
+		 */
+		on(event: 'window-all-closed', listener: Function): this;
+		/**
+		 * Emitted before the application starts closing its windows.
+		 * Calling event.preventDefault() will prevent the default behaviour, which is terminating the application.
+		 */
+		on(event: 'before-quit', listener: (event: Event) => void): this;
+		/**
+		 * Emitted when all windows have been closed and the application will quit.
+		 * Calling event.preventDefault() will prevent the default behaviour, which is terminating the application.
+		 */
+		on(event: 'will-quit', listener: (event: Event) => void): this;
+		/**
+		 * Emitted when the application is quitting.
+		 */
+		on(event: 'quit', listener: (event: Event, exitCode: number) => void): this;
+		/**
+		 * Emitted when the user wants to open a file with the application.
+		 * The open-file event is usually emitted when the application is already open
+		 * and the OS wants to reuse the application to open the file.
+		 * open-file is also emitted when a file is dropped onto the dock and the application
+		 * is not yet running. Make sure to listen for the open-file event very early
+		 * in your application startup to handle this case (even before the ready event is emitted).
+		 *
+		 * You should call event.preventDefault() if you want to handle this event.
+		 *
+		 * Note: This is only implemented on OS X.
+		 */
+		on(event: 'open-file', listener: (event: Event, url: string) => void): this;
+		/**
+		 * Emitted when the user wants to open a URL with the application.
+		 * The URL scheme must be registered to be opened by your application.
+		 *
+		 * You should call event.preventDefault() if you want to handle this event.
+		 *
+		 * Note: This is only implemented on OS X.
+		 */
+		on(event: 'open-url', listener: (event: Event, url: string) => void): this;
+		/**
+		 * Emitted when the application is activated, which usually happens when clicks on the applications’s dock icon.
+		 * Note: This is only implemented on OS X.
+		 */
+		on(event: 'activate', listener: Function): this;
+		/**
+		 * Emitted when a browserWindow gets blurred.
+		 */
+		on(event: 'browser-window-blur', listener: (event: Event, browserWindow: BrowserWindow) => void): this;
+		/**
+		 * Emitted when a browserWindow gets focused.
+		 */
+		on(event: 'browser-window-focus', listener: (event: Event, browserWindow: BrowserWindow) => void): this;
+		/**
+		 * Emitted when a new browserWindow is created.
+		 */
+		on(event: 'browser-window-created', listener: (event: Event, browserWindow: BrowserWindow) => void): this;
+		/**
+		 * Emitted when failed to verify the certificate for url, to trust the certificate
+		 * you should prevent the default behavior with event.preventDefault() and call callback(true).
+		 */
+		on(event: 'certificate-error', listener: (event: Event,
+			webContents: WebContents,
+			url: string,
+			error: string,
+			certificate: Certificate,
+			callback: (trust: boolean) => void
+		) => void): this;
+		/**
+		 * Emitted when a client certificate is requested.
+		 *
+		 * The url corresponds to the navigation entry requesting the client certificate
+		 * and callback needs to be called with an entry filtered from the list.
+		 * Using event.preventDefault() prevents the application from using the first certificate from the store.
+		 */
+		on(event: 'select-client-certificate', listener: (event: Event,
+			webContents: WebContents,
+			url: string,
+			certificateList: Certificate[],
+			callback: (certificate: Certificate) => void
+		) => void): this;
+		/**
+		 * Emitted when webContents wants to do basic auth.
+		 *
+		 * The default behavior is to cancel all authentications, to override this
+		 * you should prevent the default behavior with event.preventDefault()
+		 * and call callback(username, password) with the credentials.
+		 */
+		on(event: 'login', listener: (event: Event,
+			webContents: WebContents,
+			request: LoginRequest,
+			authInfo: LoginAuthInfo,
+			callback: (username: string, password: string) => void
+		) => void): this;
+		/**
+		 * Emitted when the gpu process crashes.
+		 */
+		on(event: 'gpu-process-crashed', listener: Function): this;
+		/**
+		 * Emitted when the system’s Dark Mode theme is toggled.
+		 * Note: This is only implemented on OS X.
+		 */
+		on(event: 'platform-theme-changed', listener: Function): this;
+		on(event: string, listener: Function): this;
+		/**
+		 * Try to close all windows. The before-quit event will first be emitted.
+		 * If all windows are successfully closed, the will-quit event will be emitted
+		 * and by default the application would be terminated.
+		 *
+		 * This method guarantees all beforeunload and unload handlers are correctly
+		 * executed. It is possible that a window cancels the quitting by returning
+		 * false in beforeunload handler.
+		 */
+		quit(): void;
+		/**
+		 * Exits immediately with exitCode.
+		 * All windows will be closed immediately without asking user
+		 * and the before-quit and will-quit events will not be emitted.
+		 */
+		exit(exitCode: number): void;
+		/**
+		 * On Linux, focuses on the first visible window.
+		 * On OS X, makes the application the active app.
+		 * On Windows, focuses on the application’s first window.
+		 */
+		focus(): void;
+		/**
+		 * Hides all application windows without minimizing them.
+		 * Note: This is only implemented on OS X.
+		 */
+		hide(): void;
+		/**
+		 * Shows application windows after they were hidden. Does not automatically focus them.
+		 * Note: This is only implemented on OS X.
+		 */
+		show(): void;
+		/**
+		 * Returns the current application directory.
+		 */
+		getAppPath(): string;
+		/**
+		 * @returns The path to a special directory or file associated with name.
+		 * On failure an Error would throw.
+		 */
+		getPath(name: AppPathName): string;
+		/**
+		 * Overrides the path to a special directory or file associated with name.
+		 * If the path specifies a directory that does not exist, the directory will
+		 * be created by this method. On failure an Error would throw.
+		 *
+		 * You can only override paths of names defined in app.getPath.
+		 *
+		 * By default web pages' cookies and caches will be stored under userData
+		 * directory, if you want to change this location, you have to override the
+		 * userData path before the ready event of app module gets emitted.
+		 */
+		setPath(name: AppPathName, path: string): void;
+		/**
+		 * @returns The version of loaded application, if no version is found in
+		 * application's package.json, the version of current bundle or executable.
+		 */
+		getVersion(): string;
+		/**
+		 * @returns The current application's name, the name in package.json would be used.
+		 * Usually the name field of package.json is a short lowercased name, according to
+		 * the spec of npm modules. So usually you should also specify a productName field,
+		 * which is your application's full capitalized name, and it will be preferred over
+		 * name by Electron.
+		 */
+		getName(): string;
+		/**
+		 * Overrides the current application's name.
+		 */
+		setName(name: string): void;
+		/**
+		  * @returns The current application locale.
+		  */
+		getLocale(): string;
+		/**
+		 * Adds path to recent documents list.
+		 *
+		 * This list is managed by the system, on Windows you can visit the list from
+		 * task bar, and on Mac you can visit it from dock menu.
+		 *
+		 * Note: This is only implemented on OS X and Windows.
+		 */
+		addRecentDocument(path: string): void;
+		/**
+		 * Clears the recent documents list.
+		 *
+		 * Note: This is only implemented on OS X and Windows.
+		 */
+		clearRecentDocuments(): void;
+		/**
+		 * Sets the current executable as the default handler for a protocol (aka URI scheme).
+		 * Once registered, all links with your-protocol:// will be openend with the current executable.
+		 * The whole link, including protocol, will be passed to your application as a parameter.
+		 *
+		 * Note: This is only implemented on OS X and Windows.
+		 *       On OS X, you can only register protocols that have been added to your app's info.plist.
+		 */
+		setAsDefaultProtocolClient(protocol: string): void;
+		/**
+		 * Removes the current executable as the default handler for a protocol (aka URI scheme).
+		 *
+		 * Note: This API is only available on Windows.
+		 *       On OS X, removing the app will automatically remove the app as the default protocol handler.
+		 */
+		removeAsDefaultProtocolClient(protocol: string): void;
+		/**
+		 * Adds tasks to the Tasks category of JumpList on Windows.
+		 *
+		 * Note: This API is only available on Windows.
+		 */
+		setUserTasks(tasks: Task[]): void;
+		/**
+		 * Dynamically sets whether to always send credentials for HTTP NTLM or Negotiate authentication.
+		 * Normally, Electron will only send NTLM/Kerberos credentials for URLs that fall under
+		 * "Local Intranet" sites (i.e. are in the same domain as you).
+		 * However, this detection often fails when corporate networks are badly configured,
+		 * so this lets you co-opt this behavior and enable it for all URLs.
+		 */
+		allowNTLMCredentialsForAllDomains(allow: boolean): void;
+		/**
+		 * This method makes your application a Single Instance Application instead of allowing
+		 * multiple instances of your app to run, this will ensure that only a single instance
+		 * of your app is running, and other instances signal this instance and exit.
+		 */
+		makeSingleInstance(callback: (args: string[], workingDirectory: string) => boolean): boolean;
+		/**
+		 * Changes the Application User Model ID to id.
+		 */
+		setAppUserModelId(id: string): void;
+		/**
+		 * This method returns true if DWM composition (Aero Glass) is enabled,
+		 * and false otherwise. You can use it to determine if you should create
+		 * a transparent window or not (transparent windows won’t work correctly when DWM composition is disabled).
+		 *
+		 * Note: This is only implemented on Windows.
+		 */
+		isAeroGlassEnabled(): boolean;
+		/**
+		 * @returns If the system is in Dark Mode.
+		 * Note: This is only implemented on OS X.
+		 */
+		isDarkMode(): boolean;
+		/**
+		 * Imports the certificate in pkcs12 format into the platform certificate store.
+		 * @param callback Called with the result of import operation, a value of 0 indicates success
+		 * while any other value indicates failure according to chromium net_error_list.
+		 *
+		 * Note: This API is only available on Linux.
+		 */
+		importCertificate(options: ImportCertificateOptions, callback: (result: number) => void): void;
+		commandLine: CommandLine;
+		/**
+		 * Note: This API is only available on Mac.
+		 */
+		dock: Dock;
+	}
+
+	type AppPathName = 'home'|'appData'|'userData'|'temp'|'exe'|'module'|'desktop'|'documents'|'downloads'|'music'|'pictures'|'videos';
+
+	interface ImportCertificateOptions {
+		/**
+		 * Path for the pkcs12 file.
+		 */
+		certificate: string;
+		/**
+		 * Passphrase for the certificate.
+		 */
+		password: string;
+	}
+
+	interface CommandLine {
+		/**
+		 * Append a switch [with optional value] to Chromium's command line.
+		 *
+		 * Note: This will not affect process.argv, and is mainly used by developers
+		 * to control some low-level Chromium behaviors.
+		 */
+		appendSwitch(_switch: string, value?: string|number): void;
+		/**
+		 * Append an argument to Chromium's command line. The argument will quoted properly.
+		 *
+		 * Note: This will not affect process.argv.
+		 */
+		appendArgument(value: string): void;
+	}
+
+	interface Dock {
+		/**
+		 * When critical is passed, the dock icon will bounce until either the
+		 * application becomes active or the request is canceled.
+		 *
+		 * When informational is passed, the dock icon will bounce for one second.
+		 * However, the request remains active until either the application becomes
+		 * active or the request is canceled.
+		 *
+		 * @param type The default is informational.
+		 * @returns An ID representing the request.
+		 */
+		bounce(type?: 'critical' | 'informational'): number;
+		/**
+		 * Cancel the bounce of id.
+		 *
+		 * Note: This API is only available on Mac.
+		 */
+		cancelBounce(id: number): void;
+		/**
+		 * Sets the string to be displayed in the dock’s badging area.
+		 *
+		 * Note: This API is only available on Mac.
+		 */
+		setBadge(text: string): void;
+		/**
+		 * Returns the badge string of the dock.
+		 *
+		 * Note: This API is only available on Mac.
+		 */
+		getBadge(): string;
+		/**
+		 * Hides the dock icon.
+		 *
+		 * Note: This API is only available on Mac.
+		 */
+		hide(): void;
+		/**
+		 * Shows the dock icon.
+		 *
+		 * Note: This API is only available on Mac.
+		 */
+		show(): void;
+		/**
+		 * Sets the application dock menu.
+		 *
+		 * Note: This API is only available on Mac.
+		 */
+		setMenu(menu: Menu): void;
+		/**
+		 * Sets the image associated with this dock icon.
+		 *
+		 * Note: This API is only available on Mac.
+		 */
+		setIcon(icon: NativeImage | string): void;
+	}
+
+	interface Task {
+		/**
+		 * Path of the program to execute, usually you should specify process.execPath
+		 * which opens current program.
+		 */
+		program: string;
+		/**
+		 * The arguments of command line when program is executed.
+		 */
+		arguments: string;
+		/**
+		 * The string to be displayed in a JumpList.
+		 */
+		title: string;
+		/**
+		 * Description of this task.
+		 */
+		description?: string;
+		/**
+		 * The absolute path to an icon to be displayed in a JumpList, it can be
+		 * arbitrary resource file that contains an icon, usually you can specify
+		 * process.execPath to show the icon of the program.
+		 */
+		iconPath: string;
+		/**
+		 * The icon index in the icon file. If an icon file consists of two or more
+		 * icons, set this value to identify the icon. If an icon file consists of
+		 * one icon, this value is 0.
+		 */
+		iconIndex?: number;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/auto-updater.md
+
+	/**
+	 * This module provides an interface for the Squirrel auto-updater framework.
+	 */
+	interface AutoUpdater extends NodeJS.EventEmitter {
+		/**
+		 * Emitted when there is an error while updating.
+		 */
+		on(event: 'error', listener: (error: Error) => void): this;
+		/**
+		 * Emitted when checking if an update has started.
+		 */
+		on(event: 'checking-for-update', listener: Function): this;
+		/**
+		 * Emitted when there is an available update. The update is downloaded automatically.
+		 */
+		on(event: 'update-available', listener: Function): this;
+		/**
+		 * Emitted when there is no available update.
+		 */
+		on(event: 'update-not-available', listener: Function): this;
+		/**
+		 * Emitted when an update has been downloaded.
+		 * Note: On Windows only releaseName is available.
+		 */
+		on(event: 'update-downloaded', listener: (event: Event, releaseNotes: string, releaseName: string, releaseDate: Date, updateURL: string) => void): this;
+		on(event: string, listener: Function): this;
+		/**
+		 * Set the url and initialize the auto updater.
+		 * The url cannot be changed once it is set.
+		 */
+		setFeedURL(url: string): void;
+		/**
+		 * Ask the server whether there is an update, you have to call setFeedURL
+		 * before using this API
+		 */
+		checkForUpdates(): void;
+		/**
+		 * Restarts the app and installs the update after it has been downloaded.
+		 * It should only be called after update-downloaded has been emitted.
+		 */
+		quitAndInstall(): void;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/browser-window.md
+
+	/**
+	 * The BrowserWindow class gives you ability to create a browser window.
+	 * You can also create a window without chrome by using Frameless Window API.
+	 */
+	class BrowserWindow extends EventEmitter {
+		/**
+		 * Emitted when the document changed its title,
+		 * calling event.preventDefault() would prevent the native window’s title to change.
+		 */
+		on(event: 'page-title-updated', listener: (event: Event) => void): this;
+		/**
+		 * Emitted when the window is going to be closed. It’s emitted before the beforeunload
+		 * and unload event of the DOM. Calling event.preventDefault() will cancel the close.
+		 */
+		on(event: 'close', listener: (event: Event) => void): this;
+		/**
+		 * Emitted when the window is closed. After you have received this event
+		 * you should remove the reference to the window and avoid using it anymore.
+		 */
+		on(event: 'closed', listener: Function): this;
+		/**
+		 * Emitted when the web page becomes unresponsive.
+		 */
+		on(event: 'unresponsive', listener: Function): this;
+		/**
+		 * Emitted when the unresponsive web page becomes responsive again.
+		 */
+		on(event: 'responsive', listener: Function): this;
+		/**
+		 * Emitted when the window loses focus.
+		 */
+		on(event: 'blur', listener: Function): this;
+		/**
+		 * Emitted when the window gains focus.
+		 */
+		on(event: 'focus', listener: Function): this;
+		/**
+		 * Emitted when the window is shown.
+		 */
+		on(event: 'show', listener: Function): this;
+		/**
+		 * Emitted when the window is hidden.
+		 */
+		on(event: 'hide', listener: Function): this;
+		/**
+		 * Emitted when window is maximized.
+		 */
+		on(event: 'maximize', listener: Function): this;
+		/**
+		 * Emitted when the window exits from maximized state.
+		 */
+		on(event: 'unmaximize', listener: Function): this;
+		/**
+		 * Emitted when the window is minimized.
+		 */
+		on(event: 'minimize', listener: Function): this;
+		/**
+		 * Emitted when the window is restored from minimized state.
+		 */
+		on(event: 'restore', listener: Function): this;
+		/**
+		 * Emitted when the window is getting resized.
+		 */
+		on(event: 'resize', listener: Function): this;
+		/**
+		 * Emitted when the window is getting moved to a new position.
+		 */
+		on(event: 'move', listener: Function): this;
+		/**
+		 * Emitted when the window enters full screen state.
+		 */
+		on(event: 'enter-full-screen', listener: Function): this;
+		/**
+		 * Emitted when the window leaves full screen state.
+		 */
+		on(event: 'leave-full-screen', listener: Function): this;
+		/**
+		 * Emitted when the window enters full screen state triggered by HTML API.
+		 */
+		on(event: 'enter-html-full-screen', listener: Function): this;
+		/**
+		 * Emitted when the window leaves full screen state triggered by HTML API.
+		 */
+		on(event: 'leave-html-full-screen', listener: Function): this;
+		/**
+		 * Emitted when an App Command is invoked. These are typically related
+		 * to keyboard media keys or browser commands, as well as the "Back" /
+		 * "Forward" buttons built into some mice on Windows.
+		 * Note: This is only implemented on Windows.
+		 */
+		on(event: 'app-command', listener: (event: Event, command: string) => void): this;
+		/**
+		 * Emitted when scroll wheel event phase has begun.
+		 * Note: This is only implemented on OS X.
+		 */
+		on(event: 'scroll-touch-begin', listener: Function): this;
+		/**
+		 * Emitted when scroll wheel event phase has ended.
+		 * Note: This is only implemented on OS X.
+		 */
+		on(event: 'scroll-touch-end', listener: Function): this;
+		/**
+		 * Emitted on 3-finger swipe.
+		 * Note: This is only implemented on OS X.
+		 */
+		on(event: 'swipe', listener: (event: Event, direction: SwipeDirection) => void): this;
+		on(event: string, listener: Function): this;
+		constructor(options?: BrowserWindowOptions);
+		/**
+		 * @returns All opened browser windows.
+		 */
+		static getAllWindows(): BrowserWindow[];
+		/**
+		 * @returns The window that is focused in this application.
+		 */
+		static getFocusedWindow(): BrowserWindow;
+		/**
+		 * Find a window according to the webContents it owns.
+		 */
+		static fromWebContents(webContents: WebContents): BrowserWindow;
+		/**
+		 * Find a window according to its ID.
+		 */
+		static fromId(id: number): BrowserWindow;
+		/**
+		 * Adds devtools extension located at path. The extension will be remembered
+		 * so you only need to call this API once, this API is not for programming use.
+		 * @returns The extension's name.
+		 */
+		static addDevToolsExtension(path: string): string;
+		/**
+		 * Remove a devtools extension.
+		 * @param name The name of the devtools extension to remove.
+		 */
+		static removeDevToolsExtension(name: string): void;
+		/**
+		 * The WebContents object this window owns, all web page related events and
+		 * operations would be done via it.
+		 * Note: Users should never store this object because it may become null when
+		 * the renderer process (web page) has crashed.
+		 */
+		webContents: WebContents;
+		/**
+		 * Get the unique ID of this window.
+		 */
+		id: number;
+		/**
+		 * Force closing the window, the unload and beforeunload event won't be emitted
+		 * for the web page, and close event would also not be emitted for this window,
+		 * but it would guarantee the closed event to be emitted.
+		 * You should only use this method when the renderer process (web page) has crashed.
+		 */
+		destroy(): void;
+		/**
+		 * Try to close the window, this has the same effect with user manually clicking
+		 * the close button of the window. The web page may cancel the close though,
+		 * see the close event.
+		 */
+		close(): void;
+		/**
+		 * Focus on the window.
+		 */
+		focus(): void;
+		/**
+		 * Remove focus on the window.
+		 */
+		blur(): void;
+		/**
+		 * @returns Whether the window is focused.
+		 */
+		isFocused(): boolean;
+		/**
+		 * Shows and gives focus to the window.
+		 */
+		show(): void;
+		/**
+		 * Shows the window but doesn't focus on it.
+		 */
+		showInactive(): void;
+		/**
+		 * Hides the window.
+		 */
+		hide(): void;
+		/**
+		 * @returns Whether the window is visible to the user.
+		 */
+		isVisible(): boolean;
+		/**
+		 * Maximizes the window.
+		 */
+		maximize(): void;
+		/**
+		 * Unmaximizes the window.
+		 */
+		unmaximize(): void;
+		/**
+		 * @returns Whether the window is maximized.
+		 */
+		isMaximized(): boolean;
+		/**
+		 * Minimizes the window. On some platforms the minimized window will be
+		 * shown in the Dock.
+		 */
+		minimize(): void;
+		/**
+		 * Restores the window from minimized state to its previous state.
+		 */
+		restore(): void;
+		/**
+		 * @returns Whether the window is minimized.
+		 */
+		isMinimized(): boolean;
+		/**
+		 * Sets whether the window should be in fullscreen mode.
+		 */
+		setFullScreen(flag: boolean): void;
+		/**
+		 * @returns Whether the window is in fullscreen mode.
+		 */
+		isFullScreen(): boolean;
+		/**
+		 * This will have a window maintain an aspect ratio.
+		 * The extra size allows a developer to have space, specified in pixels,
+		 * not included within the aspect ratio calculations.
+		 * This API already takes into account the difference between a window’s size and its content size.
+		 *
+		 * Note: This API is available only on OS X.
+		 */
+		setAspectRatio(aspectRatio: number, extraSize?: Dimension): void;
+		/**
+		 * Resizes and moves the window to width, height, x, y.
+		 */
+		setBounds(options: Rectangle, animate?: boolean): void;
+		/**
+		 * @returns The window's width, height, x and y values.
+		 */
+		getBounds(): Rectangle;
+		/**
+		 * Resizes the window to width and height.
+		 */
+		setSize(width: number, height: number, animate?: boolean): void;
+		/**
+		 * @returns The window's width and height.
+		 */
+		getSize(): number[];
+		/**
+		 * Resizes the window's client area (e.g. the web page) to width and height.
+		 */
+		setContentSize(width: number, height: number, animate?: boolean): void;
+		/**
+		 * @returns The window's client area's width and height.
+		 */
+		getContentSize(): number[];
+		/**
+		 * Sets the minimum size of window to width and height.
+		 */
+		setMinimumSize(width: number, height: number): void;
+		/**
+		 * @returns The window's minimum width and height.
+		 */
+		getMinimumSize(): number[];
+		/**
+		 * Sets the maximum size of window to width and height.
+		 */
+		setMaximumSize(width: number, height: number): void;
+		/**
+		 * @returns The window's maximum width and height.
+		 */
+		getMaximumSize(): number[];
+		/**
+		 * Sets whether the window can be manually resized by user.
+		 */
+		setResizable(resizable: boolean): void;
+		/**
+		 * @returns Whether the window can be manually resized by user.
+		 */
+		isResizable(): boolean;
+		/**
+		 * Sets whether the window can be moved by user. On Linux does nothing.
+		 * Note: This API is available only on OS X and Windows.
+		 */
+		setMovable(movable: boolean): void;
+		/**
+		 * Note: This API is available only on OS X and Windows.
+		 * @returns Whether the window can be moved by user. On Linux always returns true.
+		 */
+		isMovable(): boolean;
+		/**
+		 * Sets whether the window can be manually minimized by user. On Linux does nothing.
+		 * Note: This API is available only on OS X and Windows.
+		 */
+		setMinimizable(minimizable: boolean): void;
+		/**
+		 * Note: This API is available only on OS X and Windows.
+		 * @returns Whether the window can be manually minimized by user. On Linux always returns true.
+		 */
+		isMinimizable(): boolean;
+		/**
+		 * Sets whether the window can be manually maximized by user. On Linux does nothing.
+		 * Note: This API is available only on OS X and Windows.
+		 */
+		setMaximizable(maximizable: boolean): void;
+		/**
+		 * Note: This API is available only on OS X and Windows.
+		 * @returns Whether the window can be manually maximized by user. On Linux always returns true.
+		 */
+		isMaximizable(): boolean;
+		/**
+		 * Sets whether the maximize/zoom window button toggles fullscreen mode or maximizes the window.
+		 */
+		setFullScreenable(fullscreenable: boolean): void;
+		/**
+		 * @returns Whether the maximize/zoom window button toggles fullscreen mode or maximizes the window.
+		 */
+		isFullScreenable(): boolean;
+		/**
+		 * Sets whether the window can be manually closed by user. On Linux does nothing.
+		 * Note: This API is available only on OS X and Windows.
+		 */
+		setClosable(closable: boolean): void;
+		/**
+		 * Note: This API is available only on OS X and Windows.
+		 * @returns Whether the window can be manually closed by user. On Linux always returns true.
+		 */
+		isClosable(): boolean;
+		/**
+		 * Sets whether the window should show always on top of other windows. After
+		 * setting this, the window is still a normal window, not a toolbox window
+		 * which can not be focused on.
+		 */
+		setAlwaysOnTop(flag: boolean): void;
+		/**
+		 * @returns Whether the window is always on top of other windows.
+		 */
+		isAlwaysOnTop(): boolean;
+		/**
+		 * Moves window to the center of the screen.
+		 */
+		center(): void;
+		/**
+		 * Moves window to x and y.
+		 */
+		setPosition(x: number, y: number, animate?: boolean): void;
+		/**
+		 * @returns The window's current position.
+		 */
+		getPosition(): number[];
+		/**
+		 * Changes the title of native window to title.
+		 */
+		setTitle(title: string): void;
+		/**
+		 * Note: The title of web page can be different from the title of the native window.
+		 * @returns The title of the native window.
+		 */
+		getTitle(): string;
+		/**
+		 * Changes the attachment point for sheets on Mac OS X.
+		 * Note: This API is available only on OS X.
+		 */
+		setSheetOffset(offset: number): void;
+		/**
+		 * Starts or stops flashing the window to attract user's attention.
+		 */
+		flashFrame(flag: boolean): void;
+		/**
+		 * Makes the window do not show in Taskbar.
+		 */
+		setSkipTaskbar(skip: boolean): void;
+		/**
+		 * Enters or leaves the kiosk mode.
+		 */
+		setKiosk(flag: boolean): void;
+		/**
+		 * @returns Whether the window is in kiosk mode.
+		 */
+		isKiosk(): boolean;
+		/**
+		 * The native type of the handle is HWND on Windows, NSView* on OS X,
+		 * and Window (unsigned long) on Linux.
+		 * @returns The platform-specific handle of the window as Buffer.
+		 */
+		getNativeWindowHandle(): Buffer;
+		/**
+		 * Hooks a windows message. The callback is called when the message is received in the WndProc.
+		 * Note: This API is available only on Windows.
+		 */
+		hookWindowMessage(message: number, callback: Function): void;
+		/**
+		 * @returns Whether the message is hooked.
+		 */
+		isWindowMessageHooked(message: number): boolean;
+		/**
+		 * Unhook the window message.
+		 */
+		unhookWindowMessage(message: number): void;
+		/**
+		 * Unhooks all of the window messages.
+		 */
+		unhookAllWindowMessages(): void;
+		/**
+		 * Sets the pathname of the file the window represents, and the icon of the
+		 * file will show in window's title bar.
+		 * Note: This API is available only on OS X.
+		 */
+		setRepresentedFilename(filename: string): void;
+		/**
+		 * Note: This API is available only on OS X.
+		 * @returns The pathname of the file the window represents.
+		 */
+		getRepresentedFilename(): string;
+		/**
+		 * Specifies whether the window’s document has been edited, and the icon in
+		 * title bar will become grey when set to true.
+		 * Note: This API is available only on OS X.
+		 */
+		setDocumentEdited(edited: boolean): void;
+		/**
+		 * Note: This API is available only on OS X.
+		 * @returns Whether the window's document has been edited.
+		 */
+		isDocumentEdited(): boolean;
+		focusOnWebView(): void;
+		blurWebView(): void;
+		/**
+		 * Captures the snapshot of page within rect, upon completion the callback
+		 * will be called. Omitting the rect would capture the whole visible page.
+		 * Note: Be sure to read documents on remote buffer in remote if you are going
+		 * to use this API in renderer process.
+		 * @param callback Supplies the image that stores data of the snapshot.
+		 */
+		capturePage(rect: Rectangle, callback: (image: NativeImage) => void): void;
+		capturePage(callback: (image: NativeImage) => void): void;
+		/**
+		 * Same with webContents.print([options])
+		 */
+		print(options?: PrintOptions): void;
+		/**
+		 * Same with webContents.printToPDF([options])
+		 */
+		printToPDF(options: PrintToPDFOptions, callback: (error: Error, data: Buffer) => void): void;
+		/**
+		 * Same with webContents.loadURL(url).
+		 */
+		loadURL(url: string, options?: LoadURLOptions): void;
+		/**
+		 * Same with webContents.reload.
+		 */
+		reload(): void;
+		/**
+		 * Sets the menu as the window top menu.
+		 * Note: This API is not available on OS X.
+		 */
+		setMenu(menu: Menu): void;
+		/**
+		 * Sets the progress value in the progress bar.
+		 * On Linux platform, only supports Unity desktop environment, you need to
+		 * specify the *.desktop file name to desktopName field in package.json.
+		 * By default, it will assume app.getName().desktop.
+		 * @param progress Valid range is [0, 1.0]. If < 0, the progress bar is removed.
+		 * If greater than 0, it becomes indeterminate.
+		 */
+		setProgressBar(progress: number): void;
+		/**
+		 * Sets a 16px overlay onto the current Taskbar icon, usually used to convey
+		 * some sort of application status or to passively notify the user.
+		 * Note: This API is only available on Windows 7 or above.
+		 * @param overlay The icon to display on the bottom right corner of the Taskbar
+		 * icon. If this parameter is null, the overlay is cleared
+		 * @param description Provided to Accessibility screen readers.
+		 */
+		setOverlayIcon(overlay: NativeImage, description: string): void;
+		/**
+		 * Sets whether the window should have a shadow. On Windows and Linux does nothing.
+		 * Note: This API is available only on OS X.
+		 */
+		setHasShadow(hasShadow: boolean): void;
+		/**
+		 * Note: This API is available only on OS X.
+		 * @returns whether the window has a shadow. On Windows and Linux always returns true.
+		 */
+		hasShadow(): boolean;
+		/**
+		 * Add a thumbnail toolbar with a specified set of buttons to the thumbnail image
+		 * of a window in a taskbar button layout.
+		 * @returns Whether the thumbnail has been added successfully.
+		 */
+		setThumbarButtons(buttons: ThumbarButton[]): boolean;
+		/**
+		 * Shows pop-up dictionary that searches the selected word on the page.
+		 * Note: This API is available only on OS X.
+		 */
+		showDefinitionForSelection(): void;
+		/**
+		 * Sets whether the window menu bar should hide itself automatically. Once set
+		 * the menu bar will only show when users press the single Alt key.
+		 * If the menu bar is already visible, calling setAutoHideMenuBar(true) won't
+		 * hide it immediately.
+		 */
+		setAutoHideMenuBar(hide: boolean): void;
+		/**
+		 * @returns Whether menu bar automatically hides itself.
+		 */
+		isMenuBarAutoHide(): boolean;
+		/**
+		 * Sets whether the menu bar should be visible. If the menu bar is auto-hide,
+		 * users can still bring up the menu bar by pressing the single Alt key.
+		 */
+		setMenuBarVisibility(visibile: boolean): void;
+		/**
+		 * @returns Whether the menu bar is visible.
+		 */
+		isMenuBarVisible(): boolean;
+		/**
+		 * Sets whether the window should be visible on all workspaces.
+		 * Note: This API does nothing on Windows.
+		 */
+		setVisibleOnAllWorkspaces(visible: boolean): void;
+		/**
+		 * Note: This API always returns false on Windows.
+		 * @returns Whether the window is visible on all workspaces.
+		 */
+		isVisibleOnAllWorkspaces(): boolean;
+		/**
+		 * Ignore all moused events that happened in the window.
+		 * Note: This API is available only on OS X.
+		 */
+		setIgnoreMouseEvents(ignore: boolean): void;
+	}
+
+	type SwipeDirection = 'up' | 'right' | 'down' | 'left';
+
+	type ThumbarButtonFlags = 'enabled' | 'disabled' | 'dismissonclick' | 'nobackground' | 'hidden' | 'noninteractive';
+
+	interface ThumbarButton {
+		icon: NativeImage | string;
+		click: Function;
+		tooltip?: string;
+		flags?: ThumbarButtonFlags[];
+	}
+
+	interface WebPreferences {
+		/**
+		 * Whether node integration is enabled.
+		 * Default: true.
+		 */
+		nodeIntegration?: boolean;
+		/**
+		 * Specifies a script that will be loaded before other scripts run in the page.
+		 * This script will always have access to node APIs no matter whether node integration is turned on or off.
+		 * The value should be the absolute file path to the script.
+		 * When node integration is turned off, the preload script can reintroduce
+		 * Node global symbols back to the global scope.
+		 */
+		preload?: string;
+		/**
+		 * Sets the session used by the page. Instead of passing the Session object directly,
+		 * you can also choose to use the partition option instead, which accepts a partition string.
+		 * When both session and partition are provided, session would be preferred.
+		 * Default: the default session.
+		 */
+		session?: Session;
+		/**
+		 * Sets the session used by the page according to the session’s partition string.
+		 * If partition starts with persist:, the page will use a persistent session available
+		 * to all pages in the app with the same partition. if there is no persist: prefix,
+		 * the page will use an in-memory session. By assigning the same partition,
+		 * multiple pages can share the same session.
+		 * Default: the default session.
+		 */
+		partition?: string;
+		/**
+		 * The default zoom factor of the page, 3.0 represents 300%.
+		 * Default: 1.0.
+		 */
+		zoomFactor?: number;
+		/**
+		 * Enables JavaScript support.
+		 * Default: true.
+		 */
+		javascript?: boolean;
+		/**
+		 * When setting false, it will disable the same-origin policy (Usually using testing
+		 * websites by people), and set allowDisplayingInsecureContent and allowRunningInsecureContent
+		 * to true if these two options are not set by user.
+		 * Default: true.
+		 */
+		webSecurity?: boolean;
+		/**
+		 * Allow an https page to display content like images from http URLs.
+		 * Default: false.
+		 */
+		allowDisplayingInsecureContent?: boolean;
+		/**
+		 * Allow a https page to run JavaScript, CSS or plugins from http URLs.
+		 * Default: false.
+		 */
+		allowRunningInsecureContent?: boolean;
+		/**
+		 * Enables image support.
+		 * Default: true.
+		 */
+		images?: boolean;
+		/**
+		 * Make TextArea elements resizable.
+		 * Default: true.
+		 */
+		textAreasAreResizable?: boolean;
+		/**
+		 * Enables WebGL support.
+		 * Default: true.
+		 */
+		webgl?: boolean;
+		/**
+		 * Enables WebAudio support.
+		 * Default: true.
+		 */
+		webaudio?: boolean;
+		/**
+		 * Whether plugins should be enabled.
+		 * Default: false.
+		 */
+		plugins?: boolean;
+		/**
+		 * Enables Chromium’s experimental features.
+		 * Default: false.
+		 */
+		experimentalFeatures?: boolean;
+		/**
+		 * Enables Chromium’s experimental canvas features.
+		 * Default: false.
+		 */
+		experimentalCanvasFeatures?: boolean;
+		/**
+		 * Enables DirectWrite font rendering system on Windows.
+		 * Default: true.
+		 */
+		directWrite?: boolean;
+		/**
+		 * A list of feature strings separated by ",".
+		 */
+		blinkFeatures?: string;
+		/**
+		 * Sets the default font for the font-family.
+		 */
+		defaultFontFamily?: {
+			/**
+			 * Default: Times New Roman.
+			 */
+			standard?: string;
+			/**
+			 * Default: Times New Roman.
+			 */
+			serif?: string;
+			/**
+			 * Default: Arial.
+			 */
+			sansSerif?: string;
+			/**
+			 * Default: Courier New.
+			 */
+			monospace?: string;
+		};
+		/**
+		 * Default: 16.
+		 */
+		defaultFontSize?: number;
+		/**
+		 * Default: 13.
+		 */
+		defaultMonospaceFontSize?: number;
+		/**
+		 * Default: 0.
+		 */
+		minimumFontSize?: number;
+		/**
+		 * Default: ISO-8859-1.
+		 */
+		defaultEncoding?: string;
+		/**
+		 * Whether to throttle animations and timers when the page becomes background.
+		 * Default: true
+		 */
+		backgroundThrottling?: boolean;
+	}
+
+	interface BrowserWindowOptions extends Rectangle {
+		/**
+		 * Window’s width in pixels.
+		 * Default: 800.
+		 */
+		width?: number;
+		/**
+		 * Window’s height in pixels.
+		 * Default: 600.
+		 */
+		height?: number;
+		/**
+		 * Window’s left offset from screen.
+		 * Default: center the window.
+		 */
+		x?: number;
+		/**
+		 * Window’s top offset from screen.
+		 * Default: center the window.
+		 */
+		y?: number;
+		/**
+		 * The width and height would be used as web page’s size, which means
+		 * the actual window’s size will include window frame’s size and be slightly larger.
+		 * Default: false.
+		 */
+		useContentSize?: boolean;
+		/**
+		 * Show window in the center of the screen.
+		 * Default: true
+		 */
+		center?: boolean;
+		/**
+		 * Window’s minimum width.
+		 * Default: 0.
+		 */
+		minWidth?: number;
+		/**
+		 * Window’s minimum height.
+		 * Default: 0.
+		 */
+		minHeight?: number;
+		/**
+		 * Window’s maximum width.
+		 * Default: no limit.
+		 */
+		maxWidth?: number;
+		/**
+		 * Window’s maximum height.
+		 * Default: no limit.
+		 */
+		maxHeight?: number;
+		/**
+		 * Whether window is resizable.
+		 * Default: true.
+		 */
+		resizable?: boolean;
+		/**
+		 * Whether window is movable.
+		 * Note: This is not implemented on Linux.
+		 * Default: true.
+		 */
+		movable?: boolean;
+		/**
+		 * Whether window is minimizable.
+		 * Note: This is not implemented on Linux.
+		 * Default: true.
+		 */
+		minimizable?: boolean;
+		/**
+		 * Whether window is maximizable.
+		 * Note: This is not implemented on Linux.
+		 * Default: true.
+		 */
+		maximizable?: boolean;
+		/**
+		 * Whether window is closable.
+		 * Note: This is not implemented on Linux.
+		 * Default: true.
+		 */
+		closable?: boolean;
+		/**
+		 * Whether the window should always stay on top of other windows.
+		 * Default: false.
+		 */
+		alwaysOnTop?: boolean;
+		/**
+		 * Whether the window should show in fullscreen.
+		 * When explicity set to false the fullscreen button will be hidden or disabled on OS X.
+		 * Default: false.
+		 */
+		fullscreen?: boolean;
+		/**
+		 * Whether the maximize/zoom button on OS X should toggle full screen mode or maximize window.
+		 * Default: true.
+		 */
+		fullscreenable?: boolean;
+		/**
+		 * Whether to show the window in taskbar.
+		 * Default: false.
+		 */
+		skipTaskbar?: boolean;
+		/**
+		 * The kiosk mode.
+		 * Default: false.
+		 */
+		kiosk?: boolean;
+		/**
+		 * Default window title.
+		 * Default: "Electron".
+		 */
+		title?: string;
+		/**
+		 * The window icon, when omitted on Windows the executable’s icon would be used as window icon.
+		 */
+		icon?: NativeImage|string;
+		/**
+		 * Whether window should be shown when created.
+		 * Default: true.
+		 */
+		show?: boolean;
+		/**
+		 * Specify false to create a Frameless Window.
+		 * Default: true.
+		 */
+		frame?: boolean;
+		/**
+		 * Whether the web view accepts a single mouse-down event that simultaneously activates the window.
+		 * Default: false.
+		 */
+		acceptFirstMouse?: boolean;
+		/**
+		 * Whether to hide cursor when typing.
+		 * Default: false.
+		 */
+		disableAutoHideCursor?: boolean;
+		/**
+		 * Auto hide the menu bar unless the Alt key is pressed.
+		 * Default: true.
+		 */
+		autoHideMenuBar?: boolean;
+		/**
+		 * Enable the window to be resized larger than screen.
+		 * Default: false.
+		 */
+		enableLargerThanScreen?: boolean;
+		/**
+		 * Window’s background color as Hexadecimal value, like #66CD00 or #FFF or #80FFFFFF (alpha is supported).
+		 * Default: #FFF (white).
+		 */
+		backgroundColor?: string;
+		/**
+		 * Whether window should have a shadow.
+		 * Note: This is only implemented on OS X.
+		 * Default: true.
+		 */
+		hasShadow?: boolean;
+		/**
+		 * Forces using dark theme for the window.
+		 * Note: Only works on some GTK+3 desktop environments.
+		 * Default: false.
+		 */
+		darkTheme?: boolean;
+		/**
+		 * Makes the window transparent.
+		 * Default: false.
+		 */
+		transparent?: boolean;
+		/**
+		 * The type of window, default is normal window.
+		 */
+		type?: BrowserWindowType;
+		/**
+		 * The style of window title bar.
+		 */
+		titleBarStyle?: 'default' | 'hidden' | 'hidden-inset';
+		/**
+		 * Settings of web page’s features.
+		 */
+		webPreferences?: WebPreferences;
+	}
+
+	type BrowserWindowType = BrowserWindowTypeLinux | BrowserWindowTypeMac;
+	type BrowserWindowTypeLinux = 'desktop' | 'dock' | 'toolbar' | 'splash' | 'notification';
+	type BrowserWindowTypeMac = 'desktop' | 'textured';
+
+	interface Rectangle {
+		x?: number;
+		y?: number;
+		width?: number;
+		height?: number;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/clipboard.md
+
+	/**
+	 * The clipboard module provides methods to perform copy and paste operations.
+	 */
+	interface Clipboard {
+		/**
+		 * @returns The contents of the clipboard as plain text.
+		 */
+		readText(type?: ClipboardType): string;
+		/**
+		 * Writes the text into the clipboard as plain text.
+		 */
+		writeText(text: string, type?: ClipboardType): void;
+		/**
+		 * @returns The contents of the clipboard as markup.
+		 */
+		readHtml(type?: ClipboardType): string;
+		/**
+		 * Writes markup to the clipboard.
+		 */
+		writeHtml(markup: string, type?: ClipboardType): void;
+		/**
+		 * @returns The contents of the clipboard as a NativeImage.
+		 */
+		readImage(type?: ClipboardType): NativeImage;
+		/**
+		 * Writes the image into the clipboard.
+		 */
+		writeImage(image: NativeImage, type?: ClipboardType): void;
+		/**
+		 * @returns The contents of the clipboard as RTF.
+		 */
+		readRtf(type?: ClipboardType): string;
+		/**
+		 * Writes the text into the clipboard in RTF.
+		 */
+		writeRtf(text: string, type?: ClipboardType): void;
+		/**
+		 * Clears everything in clipboard.
+		 */
+		clear(type?: ClipboardType): void;
+		/**
+		 * @returns Array available formats for the clipboard type.
+		 */
+		availableFormats(type?: ClipboardType): string[];
+		/**
+		 * Returns whether the clipboard supports the format of specified data.
+		 * Note: This API is experimental and could be removed in future.
+		 * @returns Whether the clipboard has data in the specified format.
+		 */
+		has(format: string, type?: ClipboardType): boolean;
+		/**
+		 * Reads the data in the clipboard of the specified format.
+		 * Note: This API is experimental and could be removed in future.
+		 */
+		read(format: string, type?: ClipboardType): string | NativeImage;
+		/**
+		 * Writes data to the clipboard.
+		 */
+		write(data: {
+			text?: string;
+			rtf?: string;
+			html?: string;
+			image?: NativeImage;
+		}, type?: ClipboardType): void;
+	}
+
+	type ClipboardType = '' | 'selection';
+
+	// https://github.com/electron/electron/blob/master/docs/api/content-tracing.md
+
+	/**
+	 * The content-tracing module is used to collect tracing data generated by the underlying Chromium content module.
+	 * This module does not include a web interface so you need to open chrome://tracing/
+	 * in a Chrome browser and load the generated file to view the result.
+	 */
+	interface ContentTracing {
+		/**
+		 * Get a set of category groups. The category groups can change as new code paths are reached.
+		 *
+		 * @param callback Called once all child processes have acknowledged the getCategories request.
+		 */
+		getCategories(callback: (categoryGroups: string[]) => void): void;
+		/**
+		 * Start recording on all processes. Recording begins immediately locally and asynchronously
+		 * on child processes as soon as they receive the EnableRecording request.
+		 *
+		 * @param callback Called once all child processes have acknowledged the startRecording request.
+		 */
+		startRecording(options: ContentTracingOptions, callback: Function): void;
+		/**
+		 * Stop recording on all processes. Child processes typically are caching trace data and
+		 * only rarely flush and send trace data back to the main process. That is because it may
+		 * be an expensive operation to send the trace data over IPC, and we would like to avoid
+		 * much runtime overhead of tracing. So, to end tracing, we must asynchronously ask all
+		 * child processes to flush any pending trace data.
+		 *
+		 * @param resultFilePath Trace data will be written into this file if it is not empty,
+		 * or into a temporary file.
+		 * @param callback Called once all child processes have acknowledged the stopRecording request.
+		 */
+		stopRecording(resultFilePath: string, callback: (filePath: string) => void): void;
+		/**
+		 * Start monitoring on all processes. Monitoring begins immediately locally and asynchronously
+		 * on child processes as soon as they receive the startMonitoring request.
+		 *
+		 * @param callback Called once all child processes have acked to the startMonitoring request.
+		 */
+		startMonitoring(options: ContentTracingOptions, callback: Function): void;
+		/**
+		 * Stop monitoring on all processes.
+		 *
+		 * @param callback Called once all child processes have acknowledged the stopMonitoring request.
+		 */
+		stopMonitoring(callback: Function): void;
+		/**
+		 * Get the current monitoring traced data. Child processes typically are caching trace data
+		 * and only rarely flush and send trace data back to the main process. That is because it may
+		 * be an expensive operation to send the trace data over IPC, and we would like to avoid much
+		 * runtime overhead of tracing. So, to end tracing, we must asynchronously ask all child
+		 * processes to flush any pending trace data.
+		 *
+		 * @param callback Called once all child processes have acknowledged the captureMonitoringSnapshot request.
+		 */
+		captureMonitoringSnapshot(resultFilePath: string, callback: (filePath: string) => void): void;
+		/**
+		 * Get the maximum usage across processes of trace buffer as a percentage of the full state.
+		 *
+		 * @param callback Called when the TraceBufferUsage value is determined.
+		 */
+		getTraceBufferUsage(callback: Function): void;
+		/**
+		 * @param callback Called every time the given event occurs on any process.
+		 */
+		setWatchEvent(categoryName: string, eventName: string, callback: Function): void;
+		/**
+		 * Cancel the watch event. This may lead to a race condition with the watch event callback if tracing is enabled.
+		 */
+		cancelWatchEvent(): void;
+	}
+
+	interface ContentTracingOptions {
+		/**
+		 * Filter to control what category groups should be traced.
+		 * A filter can have an optional - prefix to exclude category groups
+		 * that contain a matching category. Having both included and excluded
+		 * category patterns in the same list is not supported.
+		 *
+		 * Examples:
+		 *   test_MyTest*
+		 *   test_MyTest*,test_OtherStuff
+		 *   -excluded_category1,-excluded_category2
+		 */
+		categoryFilter: string;
+		/**
+		 * Controls what kind of tracing is enabled, it is a comma-delimited list.
+		 *
+		 * Possible options are:
+		 *   record-until-full
+		 *   record-continuously
+		 *   trace-to-console
+		 *   enable-sampling
+		 *   enable-systrace
+		 *
+		 * The first 3 options are trace recoding modes and hence mutually exclusive.
+		 * If more than one trace recording modes appear in the traceOptions string,
+		 * the last one takes precedence. If none of the trace recording modes are specified,
+		 * recording mode is record-until-full.
+		 *
+		 * The trace option will first be reset to the default option (record_mode set
+		 * to record-until-full, enable_sampling and enable_systrace set to false)
+		 * before options parsed from traceOptions are applied on it.
+		 */
+		traceOptions: string;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/crash-reporter.md
+
+	/**
+	 * The crash-reporter module enables sending your app's crash reports.
+	 */
+	interface CrashReporter {
+		/**
+		 * You are required to call this method before using other crashReporter APIs.
+		 *
+		 * Note: On OS X, Electron uses a new crashpad client, which is different from breakpad
+		 * on Windows and Linux. To enable the crash collection feature, you are required to call
+		 * the crashReporter.start API to initialize crashpad in the main process and in each
+		 * renderer process from which you wish to collect crash reports.
+		 */
+		start(options: CrashReporterStartOptions): void;
+		/**
+		 * @returns The crash report. When there was no crash report
+		 * sent or the crash reporter is not started, null will be returned.
+		 */
+		getLastCrashReport(): CrashReport;
+		/**
+		 * @returns All uploaded crash reports.
+		 */
+		getUploadedReports(): CrashReport[];
+	}
+
+	interface CrashReporterStartOptions {
+		/**
+		 * Default: Electron
+		 */
+		productName?: string;
+		companyName: string;
+		/**
+		 * URL that crash reports would be sent to as POST.
+		 */
+		submitURL: string;
+		/**
+		 * Send the crash report without user interaction.
+		 * Default: true.
+		 */
+		autoSubmit?: boolean;
+		/**
+		 * Default: false.
+		 */
+		ignoreSystemCrashHandler?: boolean;
+		/**
+		 * An object you can define that will be sent along with the report.
+		 * Only string properties are sent correctly, nested objects are not supported.
+		 */
+		extra?: {[prop: string]: string};
+	}
+
+	interface CrashReport {
+		id: string;
+		date: Date;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/desktop-capturer.md
+
+	/**
+	 * The desktopCapturer module can be used to get available sources
+	 * that can be used to be captured with getUserMedia.
+	 */
+	interface DesktopCapturer {
+		/**
+		 * Starts a request to get all desktop sources.
+		 *
+		 * Note: There is no guarantee that the size of source.thumbnail is always
+		 * the same as the thumnbailSize in options. It also depends on the scale of the screen or window.
+		 */
+		getSources(options: DesktopCapturerOptions, callback: (error: Error, sources: DesktopCapturerSource[]) => any): void;
+	}
+
+	interface DesktopCapturerOptions {
+		/**
+		 * The types of desktop sources to be captured.
+		 */
+		types?: ('screen' | 'window')[];
+		/**
+		 * The suggested size that thumbnail should be scaled.
+		 * Default: {width: 150, height: 150}
+		 */
+		thumbnailSize?: Dimension;
+	}
+
+	interface DesktopCapturerSource {
+		/**
+		 * The id of the captured window or screen used in navigator.webkitGetUserMedia.
+		 * The format looks like window:XX or screen:XX where XX is a random generated number.
+		 */
+		id: string;
+		/**
+		 * The described name of the capturing screen or window.
+		 * If the source is a screen, the name will be Entire Screen or Screen <index>;
+		 * if it is a window, the name will be the window’s title.
+		 */
+		name: string;
+		/**
+		 * A thumbnail image.
+		 */
+		thumbnail: NativeImage;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/dialog.md
+
+	/**
+	 * The dialog module provides APIs to show native system dialogs, such as opening files or alerting,
+	 * so web applications can deliver the same user experience as native applications.
+	 */
+	interface Dialog {
+		/**
+		 * Note: On Windows and Linux an open dialog can not be both a file selector and a directory selector,
+		 * so if you set properties to ['openFile', 'openDirectory'] on these platforms, a directory selector will be shown.
+		 *
+		 * @param callback If supplied, the API call will be asynchronous.
+		 * @returns On success, returns an array of file paths chosen by the user,
+		 * otherwise returns undefined.
+		 */
+		showOpenDialog(browserWindow: BrowserWindow, options: OpenDialogOptions, callback?: (fileNames: string[]) => void): string[];
+		/**
+		 * Note: On Windows and Linux an open dialog can not be both a file selector and a directory selector,
+		 * so if you set properties to ['openFile', 'openDirectory'] on these platforms, a directory selector will be shown.
+		 *
+		 * @param callback If supplied, the API call will be asynchronous.
+		 * @returns On success, returns an array of file paths chosen by the user,
+		 * otherwise returns undefined.
+		 */
+		showOpenDialog(options: OpenDialogOptions, callback?: (fileNames: string[]) => void): string[];
+		/**
+		 * @param callback If supplied, the API call will be asynchronous.
+		 * @returns On success, returns the path of file chosen by the user, otherwise
+		 * returns undefined.
+		 */
+		showSaveDialog(browserWindow: BrowserWindow, options: SaveDialogOptions, callback?: (fileName: string) => void): string;
+		/**
+		 * @param callback If supplied, the API call will be asynchronous.
+		 * @returns On success, returns the path of file chosen by the user, otherwise
+		 * returns undefined.
+		 */
+		showSaveDialog(options: SaveDialogOptions, callback?: (fileName: string) => void): string;
+		/**
+		 * Shows a message box. It will block until the message box is closed.
+		 * @param callback If supplied, the API call will be asynchronous.
+		 * @returns The index of the clicked button.
+		 */
+		showMessageBox(browserWindow: BrowserWindow, options: ShowMessageBoxOptions, callback?: (response: number) => void): number;
+		/**
+		 * Shows a message box. It will block until the message box is closed.
+		 * @param callback If supplied, the API call will be asynchronous.
+		 * @returns The index of the clicked button.
+		 */
+		showMessageBox(options: ShowMessageBoxOptions, callback?: (response: number) => void): number;
+		/**
+		 * Displays a modal dialog that shows an error message.
+		 *
+		 * This API can be called safely before the ready event the app module emits,
+		 * it is usually used to report errors in early stage of startup.
+		 * If called before the app readyevent on Linux, the message will be emitted to stderr,
+		 * and no GUI dialog will appear.
+		 */
+		showErrorBox(title: string, content: string): void;
+	}
+
+	interface OpenDialogOptions {
+		title?: string;
+		defaultPath?: string;
+		/**
+		 * File types that can be displayed or selected.
+		 */
+		filters?: {
+			name: string;
+			/**
+			 * Extensions without wildcards or dots (e.g. 'png' is good but '.png' and '*.png' are bad).
+			 * To show all files, use the '*' wildcard (no other wildcard is supported).
+			 */
+			extensions: string[];
+		}[];
+		/**
+		 * Contains which features the dialog should use.
+		 */
+		properties?: ('openFile' | 'openDirectory' | 'multiSelections' | 'createDirectory')[];
+	}
+
+	interface SaveDialogOptions {
+		title?: string;
+		defaultPath?: string;
+		/**
+		 * File types that can be displayed, see dialog.showOpenDialog for an example.
+		 */
+		filters?: {
+			name: string;
+			extensions: string[];
+		}[];
+	}
+
+	interface ShowMessageBoxOptions {
+		/**
+		 * On Windows, "question" displays the same icon as "info", unless you set an icon using the "icon" option.
+		 */
+		type?: 'none' | 'info' | 'error' | 'question' | 'warning';
+		/**
+		 * Texts for buttons.
+		 */
+		buttons?: string[];
+		/**
+		 * Index of the button in the buttons array which will be selected by default when the message box opens.
+		 */
+		defaultId?: number;
+		/**
+		 * Title of the message box (some platforms will not show it).
+		 */
+		title?: string;
+		/**
+		 * Contents of the message box.
+		 */
+		message?: string;
+		/**
+		 * Extra information of the message.
+		 */
+		detail?: string;
+		icon?: NativeImage;
+		/**
+		 * The value will be returned when user cancels the dialog instead of clicking the buttons of the dialog.
+		 * By default it is the index of the buttons that have "cancel" or "no" as label,
+		 * or 0 if there is no such buttons. On OS X and Windows the index of "Cancel" button
+		 * will always be used as cancelId, not matter whether it is already specified.
+		 */
+		cancelId?: number;
+		/**
+		 * On Windows Electron will try to figure out which one of the buttons are common buttons
+		 * (like "Cancel" or "Yes"), and show the others as command links in the dialog.
+		 * This can make the dialog appear in the style of modern Windows apps.
+		 * If you don’t like this behavior, you can set noLink to true.
+		 */
+		noLink?: boolean;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/download-item.md
+
+	/**
+	 * DownloadItem represents a download item in Electron.
+	 */
+	interface DownloadItem extends NodeJS.EventEmitter {
+		/**
+		 * Emits when the downloadItem gets updated.
+		 */
+		on(event: 'updated', listener: Function): this;
+		/**
+		 * Emits when the download is in a terminal state. This includes a completed download,
+		 * a cancelled download (via downloadItem.cancel()), and interrupted download that can’t be resumed.
+		 */
+		on(event: 'done', listener: (event: Event, state: 'completed' | 'cancelled' | 'interrupted') => void): this;
+		on(event: string, listener: Function): this;
+		/**
+		 * Set the save file path of the download item.
+		 * Note: The API is only available in session’s will-download callback function.
+		 * If user doesn’t set the save path via the API, Electron will use the original
+		 * routine to determine the save path (Usually prompts a save dialog).
+		 */
+		setSavePath(path: string): void;
+		/**
+		 * Pauses the download.
+		 */
+		pause(): void;
+		/**
+		 * Resumes the download that has been paused.
+		 */
+		resume(): void;
+		/**
+		 * Cancels the download operation.
+		 */
+		cancel(): void;
+		/**
+		 * @returns The origin url where the item is downloaded from.
+		 */
+		getURL(): string;
+		/**
+		 * @returns The mime type.
+		 */
+		getMimeType(): string;
+		/**
+		 * @returns Whether the download has user gesture.
+		 */
+		hasUserGesture(): boolean;
+		/**
+		 * @returns The file name of the download item.
+		 * Note: The file name is not always the same as the actual one saved in local disk.
+		 * If user changes the file name in a prompted download saving dialog,
+		 * the actual name of saved file will be different.
+		 */
+		getFilename(): string;
+		/**
+		 * @returns The total size in bytes of the download item. If the size is unknown, it returns 0.
+		 */
+		getTotalBytes(): number;
+		/**
+		 * @returns The received bytes of the download item.
+		 */
+		getReceivedBytes(): number;
+		/**
+		 * @returns The Content-Disposition field from the response header.
+		 */
+		getContentDisposition(): string;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/global-shortcut.md
+
+	/**
+	 * The globalShortcut module can register/unregister a global keyboard shortcut
+	 * with the operating system so that you can customize the operations for various shortcuts.
+	 * Note: The shortcut is global; it will work even if the app does not have the keyboard focus.
+	 * You should not use this module until the ready event of the app module is emitted.
+	 */
+	interface GlobalShortcut {
+		/**
+		 * Registers a global shortcut of accelerator.
+		 * @param accelerator Represents a keyboard shortcut. It can contain modifiers
+		 * and key codes, combined by the "+" character.
+		 * @param callback Called when the registered shortcut is pressed by the user.
+		 */
+		register(accelerator: string, callback: Function): void;
+		/**
+		 * @param accelerator Represents a keyboard shortcut. It can contain modifiers
+		 * and key codes, combined by the "+" character.
+		 * @returns Whether the accelerator is registered.
+		 */
+		isRegistered(accelerator: string): boolean;
+		/**
+		 * Unregisters the global shortcut of keycode.
+		 * @param accelerator Represents a keyboard shortcut. It can contain modifiers
+		 * and key codes, combined by the "+" character.
+		 */
+		unregister(accelerator: string): void;
+		/**
+		 * Unregisters all the global shortcuts.
+		 */
+		unregisterAll(): void;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/ipc-main.md
+
+	/**
+	 * The ipcMain module handles asynchronous and synchronous messages
+	 * sent from a renderer process (web page).
+	 * Messages sent from a renderer will be emitted to this module.
+	 */
+	interface IpcMain extends NodeJS.EventEmitter {
+		addListener(channel: string, listener: IpcMainEventListener): this;
+		on(channel: string, listener: IpcMainEventListener): this;
+		once(channel: string, listener: IpcMainEventListener): this;
+		removeListener(channel: string, listener: IpcMainEventListener): this;
+		removeAllListeners(channel?: string): this;
+	}
+
+	type IpcMainEventListener = (event: IpcMainEvent, ...args: any[]) => void;
+
+	interface IpcMainEvent {
+		/**
+		 * Set this to the value to be returned in a synchronous message.
+		 */
+		returnValue?: any;
+		/**
+		 * Returns the webContents that sent the message, you can call sender.send
+		 * to reply to the asynchronous message.
+		 */
+		sender: WebContents;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/ipc-renderer.md
+
+	/**
+	 * The ipcRenderer module provides a few methods so you can send synchronous
+	 * and asynchronous messages from the render process (web page) to the main process.
+	 * You can also receive replies from the main process.
+	 */
+	interface IpcRenderer extends NodeJS.EventEmitter {
+		addListener(channel: string, listener: IpcRendererEventListener): this;
+		on(channel: string, listener: IpcRendererEventListener): this;
+		once(channel: string, listener: IpcRendererEventListener): this;
+		removeListener(channel: string, listener: IpcRendererEventListener): this;
+		removeAllListeners(channel?: string): this;
+		/**
+		 * Send ...args to the renderer via channel in asynchronous message, the main
+		 * process can handle it by listening to the channel event of ipc module.
+		 */
+		send(channel: string, ...args: any[]): void;
+		/**
+		 * Send ...args to the renderer via channel in synchronous message, and returns
+		 * the result sent from main process. The main process can handle it by listening
+		 * to the channel event of ipc module, and returns by setting event.returnValue.
+		 * Note: Usually developers should never use this API, since sending synchronous
+		 * message would block the whole renderer process.
+		 * @returns The result sent from the main process.
+		 */
+		sendSync(channel: string, ...args: any[]): any;
+		/**
+		 * Like ipc.send but the message will be sent to the host page instead of the main process.
+		 * This is mainly used by the page in <webview> to communicate with host page.
+		 */
+		sendToHost(channel: string, ...args: any[]): void;
+	}
+
+	type IpcRendererEventListener = (event: IpcRendererEvent, ...args: any[]) => void;
+
+	interface IpcRendererEvent {
+		/**
+		 * You can call sender.send to reply to the asynchronous message.
+		 */
+		sender: IpcRenderer;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/menu-item.md
+	// https://github.com/electron/electron/blob/master/docs/api/accelerator.md
+
+	/**
+	 * The MenuItem allows you to add items to an application or context menu.
+	 */
+	class MenuItem {
+		/**
+		 * Create a new menu item.
+		 */
+		constructor(options: MenuItemOptions);
+
+		click: (menuItem: MenuItem, browserWindow: BrowserWindow) => void;
+		/**
+		 * Read-only property.
+		 */
+		type: MenuItemType;
+		/**
+		 * Read-only property.
+		 */
+		role: MenuItemRole | MenuItemRoleMac;
+		/**
+		 * Read-only property.
+		 */
+		accelerator: string;
+		/**
+		 * Read-only property.
+		 */
+		icon: NativeImage | string;
+		/**
+		 * Read-only property.
+		 */
+		submenu: Menu | MenuItemOptions[];
+
+		label: string;
+		sublabel: string;
+		enabled: boolean;
+		visible: boolean;
+		checked: boolean;
+	}
+
+	type MenuItemType = 'normal' | 'separator' | 'submenu' | 'checkbox' | 'radio';
+	type MenuItemRole = 'undo' | 'redo' | 'cut' | 'copy' | 'paste' | 'selectall' | 'minimize' | 'close';
+	type MenuItemRoleMac = 'about' | 'hide' | 'hideothers' | 'unhide' | 'front' | 'window' | 'help' | 'services';
+
+	interface MenuItemOptions {
+		/**
+		 * Callback when the menu item is clicked.
+		 */
+		click?: (menuItem: MenuItem, browserWindow: BrowserWindow) => void;
+		/**
+		 * Can be normal, separator, submenu, checkbox or radio.
+		 */
+		type?: MenuItemType;
+		label?: string;
+		sublabel?: string;
+		/**
+		 * An accelerator is string that represents a keyboard shortcut, it can contain
+		 * multiple modifiers and key codes, combined by the + character.
+		 *
+		 * Examples:
+		 *   CommandOrControl+A
+		 *   CommandOrControl+Shift+Z
+		 *
+		 * Platform notice:
+		 *   On Linux and Windows, the Command key would not have any effect,
+		 *   you can use CommandOrControl which represents Command on OS X and Control on
+		 *   Linux and Windows to define some accelerators.
+		 *
+		 *   Use Alt instead of Option. The Option key only exists on OS X, whereas
+		 *   the Alt key is available on all platforms.
+		 *
+		 *   The Super key is mapped to the Windows key on Windows and Linux and Cmd on OS X.
+		 *
+		 * Available modifiers:
+		 *   Command (or Cmd for short)
+		 *   Control (or Ctrl for short)
+		 *   CommandOrControl (or CmdOrCtrl for short)
+		 *   Alt
+		 *   Option
+		 *   AltGr
+		 *   Shift
+		 *   Super
+		 *
+		 * Available key codes:
+		 *   0 to 9
+		 *   A to Z
+		 *   F1 to F24
+		 *   Punctuations like ~, !, @, #, $, etc.
+		 *   Plus
+		 *   Space
+		 *   Backspace
+		 *   Delete
+		 *   Insert
+		 *   Return (or Enter as alias)
+		 *   Up, Down, Left and Right
+		 *   Home and End
+		 *   PageUp and PageDown
+		 *   Escape (or Esc for short)
+		 *   VolumeUp, VolumeDown and VolumeMute
+		 *   MediaNextTrack, MediaPreviousTrack, MediaStop and MediaPlayPause
+		 *   PrintScreen
+		 */
+		accelerator?: string;
+		/**
+		 * In Electron for the APIs that take images, you can pass either file paths
+		 * or NativeImage instances. When passing null, an empty image will be used.
+		 */
+		icon?: NativeImage|string;
+		/**
+		 * If false, the menu item will be greyed out and unclickable.
+		 */
+		enabled?: boolean;
+		/**
+		 * If false, the menu item will be entirely hidden.
+		 */
+		visible?: boolean;
+		/**
+		 * Should only be specified for 'checkbox' or 'radio' type menu items.
+		 */
+		checked?: boolean;
+		/**
+		 * Should be specified for submenu type menu item, when it's specified the
+		 * type: 'submenu' can be omitted for the menu item
+		 */
+		submenu?: Menu|MenuItemOptions[];
+		/**
+		 * Unique within a single menu. If defined then it can be used as a reference
+		 * to this item by the position attribute.
+		 */
+		id?: string;
+		/**
+		 * This field allows fine-grained definition of the specific location within
+		 * a given menu.
+		 */
+		position?: string;
+		/**
+		 * Define the action of the menu item, when specified the click property will be ignored
+		 */
+		role?: MenuItemRole | MenuItemRoleMac;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/menu.md
+
+	/**
+	 * The Menu class is used to create native menus that can be used as application
+	 * menus and context menus. This module is a main process module which can be used
+	 * in a render process via the remote module.
+	 *
+	 * Each menu consists of multiple menu items, and each menu item can have a submenu.
+	 */
+	class Menu extends EventEmitter {
+		/**
+		 * Creates a new menu.
+		 */
+		constructor();
+		/**
+		 * Sets menu as the application menu on OS X. On Windows and Linux, the menu
+		 * will be set as each window's top menu.
+		 */
+		static setApplicationMenu(menu: Menu): void;
+		/**
+		 * Sends the action to the first responder of application.
+		 * This is used for emulating default Cocoa menu behaviors,
+		 * usually you would just use the role property of MenuItem.
+		 *
+		 * Note: This method is OS X only.
+		 */
+		static sendActionToFirstResponder(action: string): void;
+		/**
+		 * @param template Generally, just an array of options for constructing MenuItem.
+		 * You can also attach other fields to element of the template, and they will
+		 * become properties of the constructed menu items.
+		 */
+		static buildFromTemplate(template: MenuItemOptions[]): Menu;
+		/**
+		 * Popups this menu as a context menu in the browserWindow. You can optionally
+		 * provide a (x,y) coordinate to place the menu at, otherwise it will be placed
+		 * at the current mouse cursor position.
+		 * @param x Horizontal coordinate where the menu will be placed.
+		 * @param y Vertical coordinate where the menu will be placed.
+		 */
+		popup(browserWindow?: BrowserWindow, x?: number, y?: number): void;
+		/**
+		 * Appends the menuItem to the menu.
+		 */
+		append(menuItem: MenuItem): void;
+		/**
+		 * Inserts the menuItem to the pos position of the menu.
+		 */
+		insert(position: number, menuItem: MenuItem): void;
+		/**
+		 * @returns an array containing the menu’s items.
+		 */
+		items: MenuItem[];
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/native-image.md
+
+	/**
+	 * This class is used to represent an image.
+	 */
+	class NativeImage {
+		/**
+		 * Creates an empty NativeImage instance.
+		 */
+		static createEmpty(): NativeImage;
+		/**
+		 * Creates a new NativeImage instance from file located at path.
+		 */
+		static createFromPath(path: string): NativeImage;
+		/**
+		 * Creates a new NativeImage instance from buffer.
+		 * @param scaleFactor 1.0 by default.
+		 */
+		static createFromBuffer(buffer: Buffer, scaleFactor?: number): NativeImage;
+		/**
+		 * Creates a new NativeImage instance from dataURL
+		 */
+		static createFromDataURL(dataURL: string): NativeImage;
+		/**
+		 * @returns Buffer Contains the image's PNG encoded data.
+		 */
+		toPng(): Buffer;
+		/**
+		 * @returns Buffer Contains the image's JPEG encoded data.
+		 */
+		toJpeg(quality: number): Buffer;
+		/**
+		 * @returns string The data URL of the image.
+		 */
+		toDataURL(): string;
+		/**
+		 * The native type of the handle is NSImage* on OS X.
+		 * Note: This is only implemented on OS X.
+		 * @returns The platform-specific handle of the image as Buffer.
+		 */
+		getNativeHandle(): Buffer;
+		/**
+		 * @returns boolean Whether the image is empty.
+		 */
+		isEmpty(): boolean;
+		/**
+		 * @returns {} The size of the image.
+		 */
+		getSize(): Dimension;
+		/**
+		 * Marks the image as template image.
+		 */
+		setTemplateImage(option: boolean): void;
+		/**
+		 * Returns a boolean whether the image is a template image.
+		 */
+		isTemplateImage(): boolean;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/power-monitor.md
+
+	/**
+	 * The power-monitor module is used to monitor power state changes.
+	 * You should not use this module until the ready event of the app module is emitted.
+	 */
+	interface PowerMonitor extends NodeJS.EventEmitter {
+		/**
+		 * Emitted when the system is suspending.
+		 */
+		on(event: 'suspend', listener: Function): this;
+		/**
+		 * Emitted when system is resuming.
+		 */
+		on(event: 'resume', listener: Function): this;
+		/**
+		 * Emitted when the system changes to AC power.
+		 */
+		on(event: 'on-ac', listener: Function): this;
+		/**
+		 * Emitted when system changes to battery power.
+		 */
+		on(event: 'on-battery', listener: Function): this;
+		on(event: string, listener: Function): this;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/power-save-blocker.md
+
+	/**
+	 * The powerSaveBlocker module is used to block the system from entering
+	 * low-power (sleep) mode and thus allowing the app to keep the system and screen active.
+	 */
+	interface PowerSaveBlocker {
+		/**
+		 * Starts preventing the system from entering lower-power mode.
+		 * @returns an integer identifying the power save blocker.
+		 * Note: prevent-display-sleep has higher has precedence over prevent-app-suspension.
+		 */
+		start(type: 'prevent-app-suspension' | 'prevent-display-sleep'): number;
+		/**
+		 * @param id The power save blocker id returned by powerSaveBlocker.start.
+		 * Stops the specified power save blocker.
+		 */
+		stop(id: number): void;
+		/**
+		 * @param id The power save blocker id returned by powerSaveBlocker.start.
+		 * @returns a boolean whether the corresponding powerSaveBlocker has started.
+		 */
+		isStarted(id: number): boolean;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/protocol.md
+
+	/**
+	 * The protocol module can register a custom protocol or intercept an existing protocol.
+	 */
+	interface Protocol {
+		/**
+		 * Registers custom schemes as standard schemes.
+		 */
+		registerStandardSchemes(schemes: string[]): void;
+		/**
+		 * Registers custom schemes to handle service workers.
+		 */
+		registerServiceWorkerSchemes(schemes: string[]): void;
+		/**
+		 * Registers a protocol of scheme that will send the file as a response.
+		 */
+		registerFileProtocol(scheme: string, handler: (request: ProtocolRequest, callback: FileProtocolCallback) => void, completion?: (error: Error) => void): void;
+		/**
+		 * Registers a protocol of scheme that will send a Buffer as a response.
+		 */
+		registerBufferProtocol(scheme: string, handler: (request: ProtocolRequest, callback: BufferProtocolCallback) => void, completion?: (error: Error) => void): void;
+		/**
+		 * Registers a protocol of scheme that will send a String as a response.
+		 */
+		registerStringProtocol(scheme: string, handler: (request: ProtocolRequest, callback: StringProtocolCallback) => void, completion?: (error: Error) => void): void;
+		/**
+		 * Registers a protocol of scheme that will send an HTTP request as a response.
+		 */
+		registerHttpProtocol(scheme: string, handler: (request: ProtocolRequest, callback: HttpProtocolCallback) => void, completion?: (error: Error) => void): void;
+		/**
+		 * Unregisters the custom protocol of scheme.
+		 */
+		unregisterProtocol(scheme: string, completion?: (error: Error) => void): void;
+		/**
+		 * The callback will be called with a boolean that indicates whether there is already a handler for scheme.
+		 */
+		isProtocolHandled(scheme: string, callback: (handled: boolean) => void): void;
+		/**
+		 * Intercepts scheme protocol and uses handler as the protocol’s new handler which sends a file as a response.
+		 */
+		interceptFileProtocol(scheme: string, handler: (request: ProtocolRequest, callback: FileProtocolCallback) => void, completion?: (error: Error) => void): void;
+		/**
+		 * Intercepts scheme protocol and uses handler as the protocol’s new handler which sends a String as a response.
+		 */
+		interceptStringProtocol(scheme: string, handler: (request: ProtocolRequest, callback: BufferProtocolCallback) => void, completion?: (error: Error) => void): void;
+		/**
+		 * Intercepts scheme protocol and uses handler as the protocol’s new handler which sends a Buffer as a response.
+		 */
+		interceptBufferProtocol(scheme: string, handler: (request: ProtocolRequest, callback: StringProtocolCallback) => void, completion?: (error: Error) => void): void;
+		/**
+		 * Intercepts scheme protocol and uses handler as the protocol’s new handler which sends a new HTTP request as a response.
+		 */
+		interceptHttpProtocol(scheme: string, handler: (request: ProtocolRequest, callback: HttpProtocolCallback) => void, completion?: (error: Error) => void): void;
+		/**
+		 * Remove the interceptor installed for scheme and restore its original handler.
+		 */
+		uninterceptProtocol(scheme: string, completion?: (error: Error) => void): void;
+	}
+
+	interface ProtocolRequest {
+		url: string;
+		referrer: string;
+		method: string;
+		uploadData?: {
+			bytes: Buffer,
+			file: string
+		}[];
+	}
+
+	interface ProtocolCallback {
+		(error: number): void;
+		(obj: {
+			error: number
+		}): void;
+		(): void;
+	}
+
+	interface FileProtocolCallback extends ProtocolCallback {
+		(filePath: string): void;
+		(obj: {
+			path: string
+		}): void;
+	}
+
+	interface BufferProtocolCallback extends ProtocolCallback {
+		(buffer: Buffer): void;
+		(obj: {
+			data: Buffer,
+			mimeType: string,
+			charset?: string
+		}): void;
+	}
+
+	interface StringProtocolCallback extends ProtocolCallback {
+		(str: string): void;
+		(obj: {
+			data: Buffer,
+			mimeType: string,
+			charset?: string
+		}): void;
+	}
+
+	interface HttpProtocolCallback extends ProtocolCallback {
+		(redirectRequest: {
+			url: string;
+			method: string;
+			session?: Object;
+			uploadData?: {
+				contentType: string;
+				data: string;
+			};
+		}): void;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/remote.md
+
+	/**
+	 * The remote module provides a simple way to do inter-process communication (IPC)
+	 * between the renderer process (web page) and the main process.
+	 */
+	interface Remote extends CommonElectron {
+		/**
+		 * @returns The object returned by require(module) in the main process.
+		 */
+		require(module: string): any;
+		/**
+		 * @returns The BrowserWindow object which this web page belongs to.
+		 */
+		getCurrentWindow(): BrowserWindow;
+		/**
+		 * @returns The WebContents object of this web page.
+		 */
+		getCurrentWebContents(): WebContents;
+		/**
+		 * @returns The global variable of name (e.g. global[name]) in the main process.
+		 */
+		getGlobal(name: string): any;
+		/**
+		 * Returns the process object in the main process. This is the same as
+		 * remote.getGlobal('process'), but gets cached.
+		 */
+		process: NodeJS.Process;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/screen.md
+
+	/**
+	 * The Display object represents a physical display connected to the system.
+	 * A fake Display may exist on a headless system, or a Display may correspond to a remote, virtual display.
+	 */
+	interface Display {
+		/**
+		 * Unique identifier associated with the display.
+		 */
+		id: number;
+		bounds: Bounds;
+		workArea: Bounds;
+		size: Dimension;
+		workAreaSize: Dimension;
+		/**
+		 * Output device’s pixel scale factor.
+		 */
+		scaleFactor: number;
+		/**
+		 * Can be 0, 1, 2, 3, each represents screen rotation in clock-wise degrees of 0, 90, 180, 270.
+		 */
+		rotation: number;
+		touchSupport: 'available' | 'unavailable' | 'unknown';
+	}
+
+	type Bounds = {
+		x: number;
+		y: number;
+		width: number;
+		height: number;
+	}
+
+	type Dimension = {
+		width: number;
+		height: number;
+	}
+
+	type Point = {
+		x: number;
+		y: number;
+	}
+
+	type DisplayMetrics = 'bounds' | 'workArea' | 'scaleFactor' | 'rotation';
+
+	/**
+	 * The screen module retrieves information about screen size, displays, cursor position, etc.
+	 * You can not use this module until the ready event of the app module is emitted.
+	 */
+	interface Screen extends NodeJS.EventEmitter {
+		/**
+		 * Emitted when newDisplay has been added.
+		 */
+		on(event: 'display-added', listener: (event: Event, newDisplay: Display) => void): this;
+		/**
+		 * Emitted when oldDisplay has been removed.
+		 */
+		on(event: 'display-removed', listener: (event: Event, oldDisplay: Display) => void): this;
+		/**
+		 * Emitted when one or more metrics change in a display.
+		 */
+		on(event: 'display-metrics-changed', listener: (event: Event, display: Display, changedMetrics: DisplayMetrics[]) => void): this;
+		on(event: string, listener: Function): this;
+		/**
+		 * @returns The current absolute position of the mouse pointer.
+		 */
+		getCursorScreenPoint(): Point;
+		/**
+		 * @returns The primary display.
+		 */
+		getPrimaryDisplay(): Display;
+		/**
+		 * @returns An array of displays that are currently available.
+		 */
+		getAllDisplays(): Display[];
+		/**
+		 * @returns The display nearest the specified point.
+		 */
+		getDisplayNearestPoint(point: Point): Display;
+		/**
+		 * @returns The display that most closely intersects the provided bounds.
+		 */
+		getDisplayMatching(rect: Bounds): Display;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/session.md
+
+	/**
+	 * The session module can be used to create new Session objects.
+	 * You can also access the session of existing pages by using
+	 * the session property of webContents which is a property of BrowserWindow.
+	 */
+	class Session extends EventEmitter {
+		/**
+		 * @returns a new Session instance from partition string.
+		 */
+		static fromPartition(partition: string): Session;
+		/**
+		 * @returns the default session object of the app.
+		 */
+		static defaultSession: Session;
+		/**
+		 * Emitted when Electron is about to download item in webContents.
+		 * Calling event.preventDefault() will cancel the download
+		 * and item will not be available from next tick of the process.
+		 */
+		on(event: 'will-download', listener: (event: Event, item: DownloadItem, webContents: WebContents) => void): this;
+		on(event: string, listener: Function): this;
+		/**
+		 * The cookies gives you ability to query and modify cookies.
+		 */
+		cookies: SessionCookies;
+		/**
+		 * @returns the session’s current cache size.
+		 */
+		getCacheSize(callback: (size: number) => void): void;
+		/**
+		 * Clears the session’s HTTP cache.
+		 */
+		clearCache(callback: Function): void;
+		/**
+		 * Clears the data of web storages.
+		 */
+		clearStorageData(callback: Function): void;
+		/**
+		 * Clears the data of web storages.
+		 */
+		clearStorageData(options: ClearStorageDataOptions, callback: Function): void;
+		/**
+		 * Writes any unwritten DOMStorage data to disk.
+		 */
+		flushStorageData(): void;
+		/**
+		 * Sets the proxy settings.
+		 */
+		setProxy(config: string, callback: Function): void;
+		/**
+		 * Resolves the proxy information for url.
+		 */
+		resolveProxy(url: URL, callback: (proxy: string) => void): void;
+		/**
+		 * Sets download saving directory.
+		 * By default, the download directory will be the Downloads under the respective app folder.
+		 */
+		setDownloadPath(path: string): void;
+		/**
+		 * Emulates network with the given configuration for the session.
+		 */
+		enableNetworkEmulation(options: NetworkEmulationOptions): void;
+		/**
+		 * Disables any network emulation already active for the session.
+		 * Resets to the original network configuration.
+		 */
+		disableNetworkEmulation(): void;
+		/**
+		 * Sets the certificate verify proc for session, the proc will be called
+		 * whenever a server certificate verification is requested.
+		 *
+		 * Calling setCertificateVerifyProc(null) will revert back to default certificate verify proc.
+		 */
+		setCertificateVerifyProc(proc: (hostname: string, cert: Certificate, callback: (accepted: boolean) => void) => void): void;
+		/**
+		 * Sets the handler which can be used to respond to permission requests for the session.
+		 */
+		setPermissionRequestHandler(handler: (webContents: WebContents, permission: Permission, callback: (allow: boolean) => void) => void): void;
+		/**
+		 * Clears the host resolver cache.
+		 */
+		clearHostResolverCache(callback: Function): void;
+		/**
+		 * The webRequest API set allows to intercept and modify contents of a request at various stages of its lifetime.
+		 */
+		webRequest: WebRequest;
+	}
+
+	type Permission = 'media' | 'geolocation' | 'notifications' | 'midiSysex' | 'pointerLock' | 'fullscreen' | 'openExternal';
+
+	interface ClearStorageDataOptions {
+		/**
+		 * Should follow window.location.origin’s representation scheme://host:port.
+		 */
+		origin?: string;
+		/**
+		 *  The types of storages to clear.
+		 */
+		storages?: ('appcache' | 'cookies' | 'filesystem' | 'indexdb' | 'localstorage' | 'shadercache' | 'websql' | 'serviceworkers')[];
+		/**
+		 * The types of quotas to clear.
+		 */
+		quotas?: ('temporary' | 'persistent' | 'syncable')[];
+	}
+
+	interface NetworkEmulationOptions {
+		/**
+		 * Whether to emulate network outage.
+		 */
+		offline?: boolean;
+		/**
+		 * RTT in ms.
+		 */
+		latency?: number;
+		/**
+		 * Download rate in Bps.
+		 */
+		downloadThroughput?: number;
+		/**
+		 * Upload rate in Bps.
+		 */
+		uploadThroughput?: number;
+	}
+
+	interface CookieFilter {
+		/**
+		 * Retrieves cookies which are associated with url. Empty implies retrieving cookies of all urls.
+		 */
+		url?: string;
+		/**
+		 * Filters cookies by name.
+		 */
+		name?: string;
+		/**
+		 * Retrieves cookies whose domains match or are subdomains of domains.
+		 */
+		domain?: string;
+		/**
+		 * Retrieves cookies whose path matches path.
+		 */
+		path?: string;
+		/**
+		 * Filters cookies by their Secure property.
+		 */
+		secure?: boolean;
+		/**
+		 * Filters out session or persistent cookies.
+		 */
+		session?: boolean;
+	}
+
+	interface Cookie {
+		/**
+		 * The name of the cookie.
+		 */
+		name: string;
+		/**
+		 * The value of the cookie.
+		 */
+		value: string;
+		/**
+		 * The domain of the cookie.
+		 */
+		domain: string;
+		/**
+		 * Whether the cookie is a host-only cookie.
+		 */
+		hostOnly: string;
+		/**
+		 * The path of the cookie.
+		 */
+		path: string;
+		/**
+		 * Whether the cookie is marked as secure.
+		 */
+		secure: boolean;
+		/**
+		 * Whether the cookie is marked as HTTP only.
+		 */
+		httpOnly: boolean;
+		/**
+		 * Whether the cookie is a session cookie or a persistent cookie with an expiration date.
+		 */
+		session: boolean;
+		/**
+		 * The expiration date of the cookie as the number of seconds since the UNIX epoch.
+		 * Not provided for session cookies.
+		 */
+		expirationDate?: number;
+	}
+
+	interface CookieDetails {
+		/**
+		 * The URL associated with the cookie.
+		 */
+		url: string;
+		/**
+		 * The name of the cookie.
+		 * Default: empty.
+		 */
+		name?: string;
+		/**
+		 * The value of the cookie.
+		 * Default: empty.
+		 */
+		value?: string;
+		/**
+		 * The domain of the cookie.
+		 * Default: empty.
+		 */
+		domain?: string;
+		/**
+		 * The path of the cookie.
+		 * Default: empty.
+		 */
+		path?: string;
+		/**
+		 * Whether the cookie should be marked as secure.
+		 * Default: false.
+		 */
+		secure?: boolean;
+		/**
+		 * Whether the cookie should be marked as HTTP only.
+		 * Default: false.
+		 */
+		httpOnly?: boolean;
+		/**
+		 * The expiration date of the cookie as the number of seconds since the UNIX epoch.
+		 * If omitted, the cookie becomes a session cookie.
+		 */
+		expirationDate?: number;
+	}
+
+	interface SessionCookies {
+		/**
+		 * Sends a request to get all cookies matching filter.
+		 */
+		get(filter: CookieFilter, callback: (error: Error, cookies: Cookie[]) => void): void;
+		/**
+		 * Sets the cookie with details.
+		 */
+		set(details: CookieDetails, callback: (error: Error) => void): void;
+		/**
+		 * Removes the cookies matching url and name.
+		 */
+		remove(url: string, name: string, callback: (error: Error) => void): void;
+	}
+
+	/**
+	 * Each API accepts an optional filter and a listener, the listener will be called when the API's event has happened.
+	 * Passing null as listener will unsubscribe from the event.
+	 *
+	 * The filter will be used to filter out the requests that do not match the URL patterns.
+	 * If the filter is omitted then all requests will be matched.
+	 *
+	 * For certain events the listener is passed with a callback,
+	 * which should be called with an response object when listener has done its work.
+	 */
+	interface WebRequest {
+		/**
+		 * The listener will be called when a request is about to occur.
+		 */
+		onBeforeRequest(listener: (details: WebRequest.BeforeRequestDetails, callback: WebRequest.BeforeRequestCallback) => void): void;
+		/**
+		 * The listener will be called when a request is about to occur.
+		 */
+		onBeforeRequest(filter: WebRequest.Filter, listener: (details: WebRequest.BeforeRequestDetails, callback: WebRequest.BeforeRequestCallback) => void): void;
+		/**
+		 * The listener will be called before sending an HTTP request, once the request headers are available.
+		 * This may occur after a TCP connection is made to the server, but before any http data is sent.
+		 */
+		onBeforeSendHeaders(listener: (details: WebRequest.BeforeSendHeadersDetails, callback: WebRequest.BeforeSendHeadersCallback) => void): void;
+		/**
+		 * The listener will be called before sending an HTTP request, once the request headers are available.
+		 * This may occur after a TCP connection is made to the server, but before any http data is sent.
+		 */
+		onBeforeSendHeaders(filter: WebRequest.Filter, listener: (details: WebRequest.BeforeSendHeadersDetails, callback: WebRequest.BeforeSendHeadersCallback) => void): void;
+		/**
+		 * The listener will be called just before a request is going to be sent to the server,
+		 * modifications of previous onBeforeSendHeaders response are visible by the time this listener is fired.
+		 */
+		onSendHeaders(listener: (details: WebRequest.SendHeadersDetails) => void): void;
+		/**
+		 * The listener will be called just before a request is going to be sent to the server,
+		 * modifications of previous onBeforeSendHeaders response are visible by the time this listener is fired.
+		 */
+		onSendHeaders(filter: WebRequest.Filter, listener: (details: WebRequest.SendHeadersDetails) => void): void;
+		/**
+		 * The listener will be called when HTTP response headers of a request have been received.
+		 */
+		onHeadersReceived(listener: (details: WebRequest.HeadersReceivedDetails, callback: WebRequest.HeadersReceivedCallback) => void): void;
+		/**
+		 * The listener will be called when HTTP response headers of a request have been received.
+		 */
+		onHeadersReceived(filter: WebRequest.Filter, listener: (details: WebRequest.HeadersReceivedDetails, callback: WebRequest.HeadersReceivedCallback) => void): void;
+		/**
+		 * The listener will be called when first byte of the response body is received.
+		 * For HTTP requests, this means that the status line and response headers are available.
+		 */
+		onResponseStarted(listener: (details: WebRequest.ResponseStartedDetails) => void): void;
+		/**
+		 * The listener will be called when first byte of the response body is received.
+		 * For HTTP requests, this means that the status line and response headers are available.
+		 */
+		onResponseStarted(filter: WebRequest.Filter, listener: (details: WebRequest.ResponseStartedDetails) => void): void;
+		/**
+		 * The listener will be called when a server initiated redirect is about to occur.
+		 */
+		onBeforeRedirect(listener: (details: WebRequest.BeforeRedirectDetails) => void): void;
+		/**
+		 * The listener will be called when a server initiated redirect is about to occur.
+		 */
+		onBeforeRedirect(filter: WebRequest.Filter, listener: (details: WebRequest.BeforeRedirectDetails) => void): void;
+		/**
+		 * The listener will be called when a request is completed.
+		 */
+		onCompleted(listener: (details: WebRequest.CompletedDetails) => void): void;
+		/**
+		 * The listener will be called when a request is completed.
+		 */
+		onCompleted(filter: WebRequest.Filter, listener: (details: WebRequest.CompletedDetails) => void): void;
+		/**
+		 * The listener will be called when an error occurs.
+		 */
+		onErrorOccurred(listener: (details: WebRequest.ErrorOccurredDetails) => void): void;
+		/**
+		 * The listener will be called when an error occurs.
+		 */
+		onErrorOccurred(filter: WebRequest.Filter, listener: (details: WebRequest.ErrorOccurredDetails) => void): void;
+	}
+
+	namespace WebRequest {
+		interface Filter {
+			urls: string[];
+		}
+
+		interface Details {
+			id: number;
+			url: string;
+			method: string;
+			resourceType: string;
+			timestamp: number;
+		}
+
+		interface UploadData {
+			/**
+			 * Content being sent.
+			 */
+			bytes: Buffer;
+			/**
+			 * Path of file being uploaded.
+			 */
+			file: string;
+		}
+
+		interface BeforeRequestDetails extends Details {
+			uploadData?: UploadData[];
+		}
+
+		type BeforeRequestCallback = (response: {
+			cancel?: boolean;
+			/**
+			 * The original request is prevented from being sent or completed, and is instead redirected to the given URL.
+			 */
+			redirectURL?: string;
+		}) => void;
+
+		interface BeforeSendHeadersDetails extends Details {
+			requestHeaders: Headers;
+		}
+
+		type BeforeSendHeadersCallback = (response: {
+			cancel?: boolean;
+			/**
+			 * When provided, request will be made with these headers.
+			 */
+			requestHeaders?: Headers;
+		}) => void;
+
+		interface SendHeadersDetails extends Details {
+			requestHeaders: Headers;
+		}
+
+		interface HeadersReceivedDetails extends Details {
+			statusLine: string;
+			statusCode: number;
+			responseHeaders: Headers;
+		}
+
+		type HeadersReceivedCallback = (response: {
+			cancel?: boolean;
+			/**
+			 * When provided, the server is assumed to have responded with these headers.
+			 */
+			responseHeaders?: Headers;
+			/**
+			 * Should be provided when overriding responseHeaders to change header status
+			 * otherwise original response header's status will be used.
+			 */
+			statusLine?: string;
+		}) => void;
+
+		interface ResponseStartedDetails extends Details {
+			responseHeaders: Headers;
+			fromCache: boolean;
+			statusCode: number;
+			statusLine: string;
+		}
+
+		interface BeforeRedirectDetails extends Details {
+			redirectURL: string;
+			statusCode: number;
+			ip?: string;
+			fromCache: boolean;
+			responseHeaders: Headers;
+		}
+
+		interface CompletedDetails extends Details {
+			responseHeaders: Headers;
+			fromCache: boolean;
+			statusCode: number;
+			statusLine: string;
+		}
+
+		interface ErrorOccurredDetails extends Details {
+			fromCache: boolean;
+			error: string;
+		}
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/shell.md
+
+	/**
+	 * The shell module provides functions related to desktop integration.
+	 */
+	interface Shell {
+		/**
+		 * Show the given file in a file manager. If possible, select the file.
+		 */
+		showItemInFolder(fullPath: string): void;
+		/**
+		 * Open the given file in the desktop's default manner.
+		 */
+		openItem(fullPath: string): void;
+		/**
+		 * Open the given external protocol URL in the desktop's default manner
+		 * (e.g., mailto: URLs in the default mail user agent).
+		 * @returns true if an application was available to open the URL, false otherwise.
+		 */
+		openExternal(url: string, options?: {
+			/**
+			 * Bring the opened application to the foreground.
+			 * Default: true.
+			 */
+			activate: boolean;
+		}): boolean;
+		/**
+		 * Move the given file to trash.
+		 * @returns boolean status for the operation.
+		 */
+		moveItemToTrash(fullPath: string): boolean;
+		/**
+		 * Play the beep sound.
+		 */
+		beep(): void;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/tray.md
+
+	/**
+	 * A Tray represents an icon in an operating system's notification area.
+	 */
+	interface Tray extends NodeJS.EventEmitter {
+		/**
+		 * Emitted when the tray icon is clicked.
+		 * Note: The bounds payload is only implemented on OS X and Windows.
+		 */
+		on(event: 'click', listener: (modifiers: Modifiers, bounds: Bounds) => void): this;
+		/**
+		 * Emitted when the tray icon is right clicked.
+		 * Note: This is only implemented on OS X and Windows.
+		 */
+		on(event: 'right-click', listener: (modifiers: Modifiers, bounds: Bounds) => void): this;
+		/**
+		 * Emitted when the tray icon is double clicked.
+		 * Note: This is only implemented on OS X and Windows.
+		 */
+		on(event: 'double-click', listener: (modifiers: Modifiers, bounds: Bounds) => void): this;
+		/**
+		 * Emitted when the tray balloon shows.
+		 * Note: This is only implemented on Windows.
+		 */
+		on(event: 'balloon-show', listener: Function): this;
+		/**
+		 * Emitted when the tray balloon is clicked.
+		 * Note: This is only implemented on Windows.
+		 */
+		on(event: 'balloon-click', listener: Function): this;
+		/**
+		 * Emitted when the tray balloon is closed because of timeout or user manually closes it.
+		 * Note: This is only implemented on Windows.
+		 */
+		on(event: 'balloon-closed', listener: Function): this;
+		/**
+		 * Emitted when any dragged items are dropped on the tray icon.
+		 * Note: This is only implemented on OS X.
+		 */
+		on(event: 'drop', listener: Function): this;
+		/**
+		 * Emitted when dragged files are dropped in the tray icon.
+		 * Note: This is only implemented on OS X
+		 */
+		on(event: 'drop-files', listener: (event: Event, files: string[]) => void): this;
+		/**
+		 * Emitted when a drag operation enters the tray icon.
+		 * Note: This is only implemented on OS X
+		 */
+		on(event: 'drag-enter', listener: Function): this;
+		/**
+		 * Emitted when a drag operation exits the tray icon.
+		 * Note: This is only implemented on OS X
+		 */
+		on(event: 'drag-leave', listener: Function): this;
+		/**
+		 * Emitted when a drag operation ends on the tray or ends at another location.
+		 * Note: This is only implemented on OS X
+		 */
+		on(event: 'drag-end', listener: Function): this;
+		on(event: string, listener: Function): this;
+		/**
+		 * Creates a new tray icon associated with the image.
+		 */
+		new(image: NativeImage|string): Tray;
+		/**
+		 * Destroys the tray icon immediately.
+		 */
+		destroy(): void;
+		/**
+		 * Sets the image associated with this tray icon.
+		 */
+		setImage(image: NativeImage|string): void;
+		/**
+		 * Sets the image associated with this tray icon when pressed.
+		 */
+		setPressedImage(image: NativeImage): void;
+		/**
+		 * Sets the hover text for this tray icon.
+		 */
+		setToolTip(toolTip: string): void;
+		/**
+		 * Sets the title displayed aside of the tray icon in the status bar.
+		 * Note: This is only implemented on OS X.
+		 */
+		setTitle(title: string): void;
+		/**
+		 * Sets whether the tray icon is highlighted when it is clicked.
+		 * Note: This is only implemented on OS X.
+		 */
+		setHighlightMode(highlight: boolean): void;
+		/**
+		 * Displays a tray balloon.
+		 * Note: This is only implemented on Windows.
+		 */
+		displayBalloon(options?: {
+			icon?: NativeImage;
+			title?: string;
+			content?: string;
+		}): void;
+		/**
+		 * Popups the context menu of tray icon. When menu is passed,
+		 * the menu will showed instead of the tray's context menu.
+		 * The position is only available on Windows, and it is (0, 0) by default.
+		 * Note: This is only implemented on OS X and Windows.
+		 */
+		popUpContextMenu(menu?: Menu, position?: Point): void;
+		/**
+		 * Sets the context menu for this icon.
+		 */
+		setContextMenu(menu: Menu): void;
+	}
+
+	interface Modifiers {
+		altKey: boolean;
+		shiftKey: boolean;
+		ctrlKey: boolean;
+		metaKey: boolean;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/web-contents.md
+
+	/**
+	 * A WebContents is responsible for rendering and controlling a web page.
+	 */
+	interface WebContents extends NodeJS.EventEmitter {
+		/**
+		 * Emitted when the navigation is done, i.e. the spinner of the tab has stopped spinning,
+		 * and the onload event was dispatched.
+		 */
+		on(event: 'did-finish-load', listener: Function): this;
+		/**
+		 * This event is like did-finish-load but emitted when the load failed or was cancelled,
+		 * e.g. window.stop() is invoked.
+		 */
+		on(event: 'did-fail-load', listener: (event: Event, errorCode: number, errorDescription: string, validatedURL: string, isMainFrame: boolean) => void): this;
+		/**
+		 * Emitted when a frame has done navigation.
+		 */
+		on(event: 'did-frame-finish-load', listener: (event: Event, isMainFrame: boolean) => void): this;
+		/**
+		 * Corresponds to the points in time when the spinner of the tab started spinning.
+		 */
+		on(event: 'did-start-loading', listener: Function): this;
+		/**
+		 * Corresponds to the points in time when the spinner of the tab stopped spinning.
+		 */
+		on(event: 'did-stop-loading', listener: Function): this;
+		/**
+		 * Emitted when details regarding a requested resource are available.
+		 * status indicates the socket connection to download the resource.
+		 */
+		on(event: 'did-get-response-details', listener: (event: Event,
+			status: boolean,
+			newURL: string,
+			originalURL: string,
+			httpResponseCode: number,
+			requestMethod: string,
+			referrer: string,
+			headers: Headers,
+			resourceType: string
+		) => void): this;
+		/**
+		 * Emitted when a redirect is received while requesting a resource.
+		 */
+		on(event: 'did-get-redirect-request', listener: (event: Event,
+			oldURL: string,
+			newURL: string,
+			isMainFrame: boolean,
+			httpResponseCode: number,
+			requestMethod: string,
+			referrer: string,
+			headers: Headers
+		) => void): this;
+		/**
+		 * Emitted when the document in the given frame is loaded.
+		 */
+		on(event: 'dom-ready', listener: (event: Event) => void): this;
+		/**
+		 * Emitted when page receives favicon URLs.
+		 */
+		on(event: 'page-favicon-updated', listener: (event: Event, favicons: string[]) => void): this;
+		/**
+		 * Emitted when the page requests to open a new window for a url.
+		 * It could be requested by window.open or an external link like <a target='_blank'>.
+		 *
+		 * By default a new BrowserWindow will be created for the url.
+		 *
+		 * Calling event.preventDefault() will prevent creating new windows.
+		 */
+		on(event: 'new-window', listener: (event: Event,
+			url: string,
+			frameName: string,
+			disposition: NewWindowDisposition,
+			options: BrowserWindowOptions
+		) => void): this;
+		/**
+		 * Emitted when a user or the page wants to start navigation.
+		 * It can happen when the window.location object is changed or a user clicks a link in the page.
+		 *
+		 * This event will not emit when the navigation is started programmatically with APIs like
+		 * webContents.loadURL and webContents.back.
+		 *
+		 * It is also not emitted for in-page navigations, such as clicking anchor links
+		 * or updating the window.location.hash. Use did-navigate-in-page event for this purpose.
+		 *
+		 * Calling event.preventDefault() will prevent the navigation.
+		 */
+		on(event: 'will-navigate', listener: (event: Event, url: string) => void): this;
+		/**
+		 * Emitted when a navigation is done.
+		 *
+		 * This event is not emitted for in-page navigations, such as clicking anchor links
+		 * or updating the window.location.hash. Use did-navigate-in-page event for this purpose.
+		 */
+		on(event: 'did-navigate', listener: (event: Event, url: string) => void): this;
+		/**
+		 * Emitted when an in-page navigation happened.
+		 *
+		 * When in-page navigation happens, the page URL changes but does not cause
+		 * navigation outside of the page. Examples of this occurring are when anchor links
+		 * are clicked or when the DOM hashchange event is triggered.
+		 */
+		on(event: 'did-navigate-in-page', listener: (event: Event, url: string) => void): this;
+		/**
+		 * Emitted when the renderer process has crashed.
+		 */
+		on(event: 'crashed', listener: Function): this;
+		/**
+		 * Emitted when a plugin process has crashed.
+		 */
+		on(event: 'plugin-crashed', listener: (event: Event, name: string, version: string) => void): this;
+		/**
+		 * Emitted when webContents is destroyed.
+		 */
+		on(event: 'destroyed', listener: Function): this;
+		/**
+		 * Emitted when DevTools is opened.
+		 */
+		on(event: 'devtools-opened', listener: Function): this;
+		/**
+		 * Emitted when DevTools is closed.
+		 */
+		on(event: 'devtools-closed', listener: Function): this;
+		/**
+		 * Emitted when DevTools is focused / opened.
+		 */
+		on(event: 'devtools-focused', listener: Function): this;
+		/**
+		 * Emitted when failed to verify the certificate for url.
+		 * The usage is the same with the "certificate-error" event of app.
+		 */
+		on(event: 'certificate-error', listener: (event: Event,
+			url: string,
+			error: string,
+			certificate: Certificate,
+			callback: (trust: boolean) => void
+		) => void): this;
+		/**
+		 * Emitted when a client certificate is requested.
+		 * The usage is the same with the "select-client-certificate" event of app.
+		 */
+		on(event: 'select-client-certificate', listener: (event: Event,
+			url: string,
+			certificateList: Certificate[],
+			callback: (certificate: Certificate) => void
+		) => void): this;
+		/**
+		 * Emitted when webContents wants to do basic auth.
+		 * The usage is the same with the "login" event of app.
+		 */
+		on(event: 'login', listener: (event: Event,
+			request: LoginRequest,
+			authInfo: LoginAuthInfo,
+			callback: (username: string, password: string) => void
+		) => void): this;
+		/**
+		 * Emitted when a result is available for webContents.findInPage request.
+		 */
+		on(event: 'found-in-page', listener: (event: Event, result: FoundInPageResult) => void): this;
+		/**
+		 * Emitted when media starts playing.
+		 */
+		on(event: 'media-started-playing', listener: Function): this;
+		/**
+		 * Emitted when media is paused or done playing.
+		 */
+		on(event: 'media-paused', listener: Function): this;
+		/**
+		 * Emitted when a page’s theme color changes. This is usually due to encountering a meta tag:
+		 * <meta name='theme-color' content='#ff0000'>
+		 */
+		on(event: 'did-change-theme-color', listener: Function): this;
+		/**
+		 * Emitted when the cursor’s type changes.
+		 * If the type parameter is custom, the image parameter will hold the custom cursor image
+		 * in a NativeImage, and the scale will hold scaling information for the image.
+		 */
+		on(event: 'cursor-changed', listener: (event: Event, type: CursorType, image?: NativeImage, scale?: number) => void): this;
+		on(event: string, listener: Function): this;
+		/**
+		 * Loads the url in the window.
+		 * @param url Must contain the protocol prefix (e.g., the http:// or file://).
+		 */
+		loadURL(url: string, options?: LoadURLOptions): void;
+		/**
+		 * Initiates a download of the resource at url without navigating.
+		 * The will-download event of session will be triggered.
+		 */
+		downloadURL(url: string): void;
+		/**
+		 * @returns The URL of current web page.
+		 */
+		getURL(): string;
+		/**
+		 * @returns The title of web page.
+		 */
+		getTitle(): string;
+		/**
+		 * @returns The favicon of the web page.
+		 */
+		getFavicon(): NativeImage;
+		/**
+		 * @returns Whether web page is still loading resources.
+		 */
+		isLoading(): boolean;
+		/**
+		 * @returns Whether the main frame (and not just iframes or frames within it) is still loading.
+		 */
+		isLoadingMainFrame(): boolean;
+		/**
+		 * @returns Whether web page is waiting for a first-response for the main
+		 * resource of the page.
+		 */
+		isWaitingForResponse(): boolean;
+		/**
+		 * Stops any pending navigation.
+		 */
+		stop(): void;
+		/**
+		 * Reloads current page.
+		 */
+		reload(): void;
+		/**
+		 * Reloads current page and ignores cache.
+		 */
+		reloadIgnoringCache(): void;
+		/**
+		 * @returns Whether the web page can go back.
+		 */
+		canGoBack(): boolean;
+		/**
+		 * @returns Whether the web page can go forward.
+		 */
+		canGoForward(): boolean;
+		/**
+		 * @returns Whether the web page can go to offset.
+		 */
+		canGoToOffset(offset: number): boolean;
+		/**
+		 * Clears the navigation history.
+		 */
+		clearHistory(): void;
+		/**
+		 * Makes the web page go back.
+		 */
+		goBack(): void;
+		/**
+		 * Makes the web page go forward.
+		 */
+		goForward(): void;
+		/**
+		 * Navigates to the specified absolute index.
+		 */
+		goToIndex(index: number): void;
+		/**
+		 * Navigates to the specified offset from the "current entry".
+		 */
+		goToOffset(offset: number): void;
+		/**
+		 * @returns Whether the renderer process has crashed.
+		 */
+		isCrashed(): boolean;
+		/**
+		 * Overrides the user agent for this page.
+		 */
+		setUserAgent(userAgent: string): void;
+		/**
+		 * @returns The user agent for this web page.
+		 */
+		getUserAgent(): string;
+		/**
+		 * Injects CSS into this page.
+		 */
+		insertCSS(css: string): void;
+		/**
+		 * Evaluates code in page.
+		 * @param code Code to evaluate.
+		 */
+		executeJavaScript(code: string, userGesture?: boolean, callback?: (result: any) => void): void;
+		/**
+		 * Mute the audio on the current web page.
+		 */
+		setAudioMuted(muted: boolean): void;
+		/**
+		 * @returns Whether this page has been muted.
+		 */
+		isAudioMuted(): boolean;
+		/**
+		 * Executes Edit -> Undo command in page.
+		 */
+		undo(): void;
+		/**
+		 * Executes Edit -> Redo command in page.
+		 */
+		redo(): void;
+		/**
+		 * Executes Edit -> Cut command in page.
+		 */
+		cut(): void;
+		/**
+		 * Executes Edit -> Copy command in page.
+		 */
+		copy(): void;
+		/**
+		 * Executes Edit -> Paste command in page.
+		 */
+		paste(): void;
+		/**
+		 * Executes Edit -> Paste and Match Style in page.
+		 */
+		pasteAndMatchStyle(): void;
+		/**
+		 * Executes Edit -> Delete command in page.
+		 */
+		delete(): void;
+		/**
+		 * Executes Edit -> Select All command in page.
+		 */
+		selectAll(): void;
+		/**
+		 * Executes Edit -> Unselect command in page.
+		 */
+		unselect(): void;
+		/**
+		 * Executes Edit -> Replace command in page.
+		 */
+		replace(text: string): void;
+		/**
+		 * Executes Edit -> Replace Misspelling command in page.
+		 */
+		replaceMisspelling(text: string): void;
+		/**
+		 * Inserts text to the focused element.
+		 */
+		insertText(text: string): void;
+		/**
+		 * Starts a request to find all matches for the text in the web page.
+		 * The result of the request can be obtained by subscribing to found-in-page event.
+		 * @returns The request id used for the request.
+		 */
+		findInPage(text: string, options?: FindInPageOptions): number;
+		/**
+		 * Stops any findInPage request for the webContents with the provided action.
+		 */
+		stopFindInPage(action: StopFindInPageAtion): void;
+		/**
+		 * Checks if any serviceworker is registered.
+		 */
+		hasServiceWorker(callback: (hasServiceWorker: boolean) => void): void;
+		/**
+		 * Unregisters any serviceworker if present.
+		 */
+		unregisterServiceWorker(callback: (isFulfilled: boolean) => void): void;
+		/**
+		 * Prints window's web page. When silent is set to false, Electron will pick up system's default printer and default settings for printing.
+		 * Calling window.print() in web page is equivalent to call WebContents.print({silent: false, printBackground: false}).
+		 * Note: On Windows, the print API relies on pdf.dll. If your application doesn't need print feature, you can safely remove pdf.dll in saving binary size.
+		 */
+		print(options?: PrintOptions): void;
+		/**
+		 * Prints windows' web page as PDF with Chromium's preview printing custom settings.
+		 */
+		printToPDF(options: PrintToPDFOptions, callback: (error: Error, data: Buffer) => void): void;
+		/**
+		 * Adds the specified path to DevTools workspace.
+		 */
+		addWorkSpace(path: string): void;
+		/**
+		 * Removes the specified path from DevTools workspace.
+		 */
+		removeWorkSpace(path: string): void;
+		/**
+		 * Opens the developer tools.
+		 */
+		openDevTools(options?: {
+			/**
+			 * Opens the devtools with specified dock state. Defaults to last used dock state.
+			 */
+			mode?: 'right' | 'bottom' | 'undocked' | 'detach'
+		}): void;
+		/**
+		 * Closes the developer tools.
+		 */
+		closeDevTools(): void;
+		/**
+		 * Returns whether the developer tools are opened.
+		 */
+		isDevToolsOpened(): boolean;
+		/**
+		 * Returns whether the developer tools are focussed.
+		 */
+		isDevToolsFocused(): boolean;
+		/**
+		 * Toggle the developer tools.
+		 */
+		toggleDevTools(): void;
+		/**
+		 * Starts inspecting element at position (x, y).
+		 */
+		inspectElement(x: number, y: number): void;
+		/**
+		 * Opens the developer tools for the service worker context.
+		 */
+		inspectServiceWorker(): void;
+		/**
+		 * Send args.. to the web page via channel in asynchronous message, the web page
+		 * can handle it by listening to the channel event of ipc module.
+		 * Note:
+		 *   1. The IPC message handler in web pages do not have a event parameter,
+		 *      which is different from the handlers on the main process.
+		 *   2. There is no way to send synchronous messages from the main process
+		 *      to a renderer process, because it would be very easy to cause dead locks.
+		 */
+		send(channel: string, ...args: any[]): void;
+		/**
+		 * Enable device emulation with the given parameters.
+		 */
+		enableDeviceEmulation(parameters: DeviceEmulationParameters): void;
+		/**
+		 * Disable device emulation.
+		 */
+		disableDeviceEmulation(): void;
+		/**
+		 * Sends an input event to the page.
+		 */
+		sendInputEvent(event: SendInputEvent): void;
+		/**
+		 * Begin subscribing for presentation events and captured frames,
+		 * The callback will be called when there is a presentation event.
+		 */
+		beginFrameSubscription(callback: (
+			/**
+			 * The frameBuffer is a Buffer that contains raw pixel data.
+			 * On most machines, the pixel data is effectively stored in 32bit BGRA format,
+			 * but the actual representation depends on the endianness of the processor
+			 * (most modern processors are little-endian, on machines with big-endian
+			 * processors the data is in 32bit ARGB format).
+			 */
+			frameBuffer: Buffer
+		) => void): void;
+		/**
+		 * End subscribing for frame presentation events.
+		 */
+		endFrameSubscription(): void;
+		/**
+		 * @returns If the process of saving page has been initiated successfully.
+		 */
+		savePage(fullPath: string, saveType: 'HTMLOnly' | 'HTMLComplete' | 'MHTML', callback?: (eror: Error) => void): boolean;
+		/**
+		 * @returns The session object used by this webContents.
+		 */
+		session: Session;
+		/**
+		 * @returns The WebContents that might own this WebContents.
+		 */
+		hostWebContents: WebContents;
+		/**
+		 * @returns The WebContents of DevTools for this WebContents.
+		 * Note: Users should never store this object because it may become null
+		 * when the DevTools has been closed.
+		 */
+		devToolsWebContents: WebContents;
+		/**
+		 * @returns Debugger API
+		 */
+		debugger: Debugger;
+	}
+
+	interface Headers {
+		[key: string]: string;
+	}
+
+	type NewWindowDisposition = 'default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'other';
+
+	/**
+	 * Specifies the action to take place when ending webContents.findInPage request.
+	 * 'clearSelection' - Translate the selection into a normal selection.
+	 * 'keepSelection' - Clear the selection.
+	 * 'activateSelection' - Focus and click the selection node.
+	 */
+	type StopFindInPageAtion = 'clearSelection' | 'keepSelection' | 'activateSelection';
+
+	type CursorType = 'default' | 'crosshair' | 'pointer' | 'text' | 'wait' | 'help' | 'e-resize' | 'n-resize' | 'ne-resize' | 'nw-resize' | 's-resize' | 'se-resize' | 'sw-resize' | 'w-resize' | 'ns-resize' | 'ew-resize' | 'nesw-resize' | 'nwse-resize' | 'col-resize' | 'row-resize' | 'm-panning' | 'e-panning' | 'n-panning' | 'ne-panning' | 'nw-panning' | 's-panning' | 'se-panning' |'sw-panning' | 'w-panning' | 'move' | 'vertical-text' | 'cell' | 'context-menu' | 'alias' | 'progress' | 'nodrop' | 'copy' | 'none' | 'not-allowed' | 'zoom-in' | 'zoom-out' | 'grab' | 'grabbing' | 'custom';
+
+	interface LoadURLOptions {
+		/**
+		 * HTTP Referrer URL.
+		 */
+		httpReferrer?: string;
+		/**
+		 * User agent originating the request.
+		 */
+		userAgent?: string;
+		/**
+		 * Extra headers separated by "\n"
+		 */
+		extraHeaders?: string;
+	}
+
+	interface PrintOptions {
+		/**
+		 * Don't ask user for print settings.
+		 * Defaults: false.
+		 */
+		silent?: boolean;
+		/**
+		 * Also prints the background color and image of the web page.
+		 * Defaults: false.
+		 */
+		printBackground?: boolean;
+	}
+
+	interface PrintToPDFOptions {
+		/**
+		 * Specify the type of margins to use.
+		 *   0 - default
+		 *   1 - none
+		 *   2 - minimum
+		 * Default: 0
+		 */
+		marginsType?: number;
+		/**
+		 * Specify page size of the generated PDF.
+		 * Default: A4.
+		 */
+		pageSize?: 'A3' | 'A4' | 'A5' | 'Legal' | 'Letter' | 'Tabloid';
+		/**
+		 * Whether to print CSS backgrounds.
+		 * Default: false.
+		 */
+		printBackground?: boolean;
+		/**
+		 * Whether to print selection only.
+		 * Default: false.
+		 */
+		printSelectionOnly?: boolean;
+		/**
+		 * true for landscape, false for portrait.
+		 * Default: false.
+		 */
+		landscape?: boolean;
+	}
+
+	interface Certificate {
+		/**
+		 * PEM encoded data
+		 */
+		data: Buffer;
+		issuerName: string;
+	}
+
+	interface LoginRequest {
+		method: string;
+		url: string;
+		referrer: string;
+	}
+
+	interface LoginAuthInfo {
+		isProxy: boolean;
+		scheme: string;
+		host: string;
+		port: number;
+		realm: string;
+	}
+
+	interface FindInPageOptions {
+		/**
+		 * Whether to search forward or backward, defaults to true
+		 */
+		forward?: boolean;
+		/**
+		 * Whether the operation is first request or a follow up, defaults to false.
+		 */
+		findNext?: boolean;
+		/**
+		 * Whether search should be case-sensitive, defaults to false.
+		 */
+		matchCase?: boolean;
+		/**
+		 * Whether to look only at the start of words. defaults to false.
+		 */
+		wordStart?: boolean;
+		/**
+		 * When combined with wordStart, accepts a match in the middle of a word
+		 * if the match begins with an uppercase letter followed by a lowercase
+		 * or non-letter. Accepts several other intra-word matches, defaults to false.
+		 */
+		medialCapitalAsWordStart?: boolean;
+	}
+
+	interface FoundInPageResult {
+		requestId: number;
+		/**
+		 * Indicates if more responses are to follow.
+		 */
+		finalUpdate: boolean;
+		/**
+		 * Position of the active match.
+		 */
+		activeMatchOrdinal?: number;
+		/**
+		 * Number of Matches.
+		 */
+		matches?: number;
+		/**
+		 * Coordinates of first match region.
+		 */
+		selectionArea?: Bounds;
+	}
+
+	interface DeviceEmulationParameters {
+		/**
+		 * Specify the screen type to emulated
+		 * Default: desktop
+		 */
+		screenPosition?: 'desktop' | 'mobile';
+		/**
+		 * Set the emulated screen size (screenPosition == mobile)
+		 */
+		screenSize?: Dimension;
+		/**
+		 * Position the view on the screen (screenPosition == mobile)
+		 * Default: {x: 0, y: 0}
+		 */
+		viewPosition?: Point;
+		/**
+		 * Set the device scale factor (if zero defaults to original device scale factor)
+		 * Default: 0
+		 */
+		deviceScaleFactor: number;
+		/**
+		 * Set the emulated view size (empty means no override).
+		 */
+		viewSize?: Dimension;
+		/**
+		 * Whether emulated view should be scaled down if necessary to fit into available space
+		 * Default: false
+		 */
+		fitToView?: boolean;
+		/**
+		 * Offset of the emulated view inside available space (not in fit to view mode)
+		 * Default: {x: 0, y: 0}
+		 */
+		offset?: Point;
+		/**
+		 * Scale of emulated view inside available space (not in fit to view mode)
+		 * Default: 1
+		 */
+		scale: number;
+	}
+
+	interface SendInputEvent {
+		type: 'mouseDown' | 'mouseUp' | 'mouseEnter' | 'mouseLeave' | 'contextMenu' | 'mouseWheel' | 'mouseMove' | 'keyDown' | 'keyUp' | 'char';
+		modifiers: ('shift' | 'control' | 'alt' | 'meta' | 'isKeypad' | 'isAutoRepeat' | 'leftButtonDown' | 'middleButtonDown' | 'rightButtonDown' | 'capsLock' | 'numLock' | 'left' | 'right')[];
+	}
+
+	interface SendInputKeyboardEvent extends SendInputEvent {
+		keyCode: string;
+	}
+
+	interface SendInputMouseEvent extends SendInputEvent {
+		x: number;
+		y: number;
+		button?: 'left' | 'middle' | 'right';
+		globalX?: number;
+		globalY?: number;
+		movementX?: number;
+		movementY?: number;
+		clickCount?: number;
+	}
+
+	interface SendInputMouseWheelEvent extends SendInputEvent {
+		deltaX?: number;
+		deltaY?: number;
+		wheelTicksX?: number;
+		wheelTicksY?: number;
+		accelerationRatioX?: number;
+		accelerationRatioY?: number;
+		hasPreciseScrollingDeltas?: number;
+		canScroll?: boolean;
+	}
+
+	/**
+	 * Debugger API serves as an alternate transport for remote debugging protocol.
+	 */
+	interface Debugger extends NodeJS.EventEmitter {
+		/**
+		 * Attaches the debugger to the webContents.
+		 * @param protocolVersion Requested debugging protocol version.
+		 */
+		attach(protocolVersion?: string): void;
+		/**
+		 * @returns Whether a debugger is attached to the webContents.
+		 */
+		isAttached(): boolean;
+		/**
+		 * Detaches the debugger from the webContents.
+		 */
+		detach(): void;
+		/**
+		 * Send given command to the debugging target.
+		 * @param method Method name, should be one of the methods defined by the remote debugging protocol.
+		 * @param commandParams JSON object with request parameters.
+		 * @param callback Response defined by the ‘returns’ attribute of the command description in the remote debugging protocol.
+		 */
+		sendCommand(method: string, commandParams?: any, callback?: (error: Error, result: any) => void): void;
+		/**
+		 * Emitted when debugging session is terminated. This happens either when
+		 * webContents is closed or devtools is invoked for the attached webContents.
+		 */
+		on(event: 'detach', listener: (event: Event, reason: string) => void): this;
+		/**
+		 * Emitted whenever debugging target issues instrumentation event.
+		 * Event parameters defined by the ‘parameters’ attribute in the remote debugging protocol.
+		 */
+		on(event: 'message', listener: (event: Event, method: string, params: any) => void): this;
+		on(event: string, listener: Function): this;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/web-frame.md
+
+	/**
+	 * The web-frame module allows you to customize the rendering of the current web page.
+	 */
+	interface WebFrame {
+		/**
+		 * Changes the zoom factor to the specified factor, zoom factor is
+		 * zoom percent / 100, so 300% = 3.0.
+		 */
+		setZoomFactor(factor: number): void;
+		/**
+		 * @returns The current zoom factor.
+		 */
+		getZoomFactor(): number;
+		/**
+		 * Changes the zoom level to the specified level, 0 is "original size", and each
+		 * increment above or below represents zooming 20% larger or smaller to default
+		 * limits of 300% and 50% of original size, respectively.
+		 */
+		setZoomLevel(level: number): void;
+		/**
+		 * @returns The current zoom level.
+		 */
+		getZoomLevel(): number;
+		/**
+		 * Sets the maximum and minimum zoom level.
+		 */
+		setZoomLevelLimits(minimumLevel: number, maximumLevel: number): void;
+		/**
+		 * Sets a provider for spell checking in input fields and text areas.
+		 */
+		setSpellCheckProvider(language: string, autoCorrectWord: boolean, provider: {
+			/**
+			 * @returns Whether the word passed is correctly spelled.
+			 */
+			spellCheck: (text: string) => boolean;
+		}): void;
+		/**
+		 * Sets the scheme as secure scheme. Secure schemes do not trigger mixed content
+		 * warnings. For example, https and data are secure schemes because they cannot be
+		 * corrupted by active network attackers.
+		 */
+		registerURLSchemeAsSecure(scheme: string): void;
+		/**
+		 * Resources will be loaded from this scheme regardless of the current page’s Content Security Policy.
+		 */
+		registerURLSchemeAsBypassingCSP(scheme: string): void;
+		/**
+		 * Registers the scheme as secure, bypasses content security policy for resources,
+		 * allows registering ServiceWorker and supports fetch API.
+		 */
+		registerURLSchemeAsPrivileged(scheme: string): void;
+		/**
+		 * Inserts text to the focused element.
+		 */
+		insertText(text: string): void;
+		/**
+		 * Evaluates `code` in page.
+		 * In the browser window some HTML APIs like `requestFullScreen` can only be
+		 * invoked by a gesture from the user. Setting `userGesture` to `true` will remove
+		 * this limitation.
+		 */
+		executeJavaScript(code: string, userGesture?: boolean, callback?: (result: any) => void): void;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/web-view-tag.md
+
+	/**
+	 * Use the webview tag to embed 'guest' content (such as web pages) in your Electron app.
+	 * The guest content is contained within the webview container.
+	 * An embedded page within your app controls how the guest content is laid out and rendered.
+	 *
+	 * Unlike an iframe, the webview runs in a separate process than your app.
+	 * It doesn't have the same permissions as your web page and all interactions between your app
+	 * and embedded content will be asynchronous. This keeps your app safe from the embedded content.
+	 */
+	interface WebViewElement extends HTMLElement {
+		/**
+		 * Returns the visible URL. Writing to this attribute initiates top-level navigation.
+		 * Assigning src its own value will reload the current page.
+		 * The src attribute can also accept data URLs, such as data:text/plain,Hello, world!.
+		 */
+		src: string;
+		/**
+		 * If "on", the webview container will automatically resize within the bounds specified
+		 * by the attributes minwidth, minheight, maxwidth, and maxheight.
+		 * These constraints do not impact the webview unless autosize is enabled.
+		 * When autosize is enabled, the webview container size cannot be less than
+		 * the minimum values or greater than the maximum.
+		 */
+		autosize: string;
+		/**
+		 * If "on", the guest page in webview will have node integration and can use node APIs
+		 * like require and process to access low level system resources.
+		 */
+		nodeintegration: string;
+		/**
+		 * If "on", the guest page in webview will be able to use browser plugins.
+		 */
+		plugins: string;
+		/**
+		 * Specifies a script that will be loaded before other scripts run in the guest page.
+		 * The protocol of script's URL must be either file: or asar:,
+		 * because it will be loaded by require in guest page under the hood.
+		 *
+		 * When the guest page doesn't have node integration this script will still have access to all Node APIs,
+		 * but global objects injected by Node will be deleted after this script has finished executing.
+		 */
+		preload: string;
+		/**
+		 * Sets the referrer URL for the guest page.
+		 */
+		httpreferrer: string;
+		/**
+		 * Sets the user agent for the guest page before the page is navigated to.
+		 * Once the page is loaded, use the setUserAgent method to change the user agent.
+		 */
+		useragent: string;
+		/**
+		 * If "on", the guest page will have web security disabled.
+		 */
+		disablewebsecurity: string;
+		/**
+		 * Sets the session used by the page. If partition starts with persist:,
+		 * the page will use a persistent session available to all pages in the app with the same partition.
+		 * If there is no persist: prefix, the page will use an in-memory session.
+		 * By assigning the same partition, multiple pages can share the same session.
+		 * If the partition is unset then default session of the app will be used.
+		 *
+		 * This value can only be modified before the first navigation,
+		 * since the session of an active renderer process cannot change.
+		 * Subsequent attempts to modify the value will fail with a DOM exception.
+		 */
+		partition: string;
+		/**
+		 * If "on", the guest page will be allowed to open new windows.
+		 */
+		allowpopups: string;
+		/**
+		 * A list of strings which specifies the blink features to be enabled separated by ,.
+		 */
+		blinkfeatures: string;
+		/**
+		 * Loads the url in the webview, the url must contain the protocol prefix, e.g. the http:// or file://.
+		 */
+		loadURL(url: string, options?: LoadURLOptions): void;
+		/**
+		 * @returns URL of guest page.
+		 */
+		getURL(): string;
+		/**
+		 * @returns The title of guest page.
+		 */
+		getTitle(): string;
+		/**
+		 * @returns Whether guest page is still loading resources.
+		 */
+		isLoading(): boolean;
+		/**
+		 * Returns a boolean whether the guest page is waiting for a first-response for the main resource of the page.
+		 */
+		isWaitingForResponse(): boolean;
+		/**
+		 * Stops any pending navigation.
+		 */
+		stop(): void;
+		/**
+		 * Reloads the guest page.
+		 */
+		reload(): void;
+		/**
+		 * Reloads the guest page and ignores cache.
+		 */
+		reloadIgnoringCache(): void;
+		/**
+		 * @returns Whether the guest page can go back.
+		 */
+		canGoBack(): boolean;
+		/**
+		 * @returns Whether the guest page can go forward.
+		 */
+		canGoForward(): boolean;
+		/**
+		 * @returns Whether the guest page can go to offset.
+		 */
+		canGoToOffset(offset: number): boolean;
+		/**
+		 * Clears the navigation history.
+		 */
+		clearHistory(): void;
+		/**
+		 * Makes the guest page go back.
+		 */
+		goBack(): void;
+		/**
+		 * Makes the guest page go forward.
+		 */
+		goForward(): void;
+		/**
+		 * Navigates to the specified absolute index.
+		 */
+		goToIndex(index: number): void;
+		/**
+		 * Navigates to the specified offset from the "current entry".
+		 */
+		goToOffset(offset: boolean): void;
+		/**
+		 * @returns Whether the renderer process has crashed.
+		 */
+		isCrashed(): boolean;
+		/**
+		 * Overrides the user agent for the guest page.
+		 */
+		setUserAgent(userAgent: string): void;
+		/**
+		 * @returns The user agent for guest page.
+		 */
+		getUserAgent(): string;
+		/**
+		 * Injects CSS into the guest page.
+		 */
+		insertCSS(css: string): void;
+		/**
+		 * Evaluates code in page. If userGesture is set, it will create the user gesture context in the page.
+		 * HTML APIs like requestFullScreen, which require user action, can take advantage of this option for automation.
+		 */
+		executeJavaScript(code: string, userGesture?: boolean, callback?: (result: any) => void): void;
+		/**
+		 * Opens a DevTools window for guest page.
+		 */
+		openDevTools(): void;
+		/**
+		 * Closes the DevTools window of guest page.
+		 */
+		closeDevTools(): void;
+		/**
+		 * @returns Whether guest page has a DevTools window attached.
+		 */
+		isDevToolsOpened(): boolean;
+		/**
+		 * @returns Whether DevTools window of guest page is focused.
+		 */
+		isDevToolsFocused(): boolean;
+		/**
+		 * Starts inspecting element at position (x, y) of guest page.
+		 */
+		inspectElement(x: number, y: number): void;
+		/**
+		 * Opens the DevTools for the service worker context present in the guest page.
+		 */
+		inspectServiceWorker(): void;
+		/**
+		 * Set guest page muted.
+		 */
+		setAudioMuted(muted: boolean): void;
+		/**
+		 * @returns Whether guest page has been muted.
+		 */
+		isAudioMuted(): boolean;
+		/**
+		 * Executes editing command undo in page.
+		 */
+		undo(): void;
+		/**
+		 * Executes editing command redo in page.
+		 */
+		redo(): void;
+		/**
+		 * Executes editing command cut in page.
+		 */
+		cut(): void;
+		/**
+		 * Executes editing command copy in page.
+		 */
+		copy(): void;
+		/**
+		 * Executes editing command paste in page.
+		 */
+		paste(): void;
+		/**
+		 * Executes editing command pasteAndMatchStyle in page.
+		 */
+		pasteAndMatchStyle(): void;
+		/**
+		 * Executes editing command delete in page.
+		 */
+		delete(): void;
+		/**
+		 * Executes editing command selectAll in page.
+		 */
+		selectAll(): void;
+		/**
+		 * Executes editing command unselect in page.
+		 */
+		unselect(): void;
+		/**
+		 * Executes editing command replace in page.
+		 */
+		replace(text: string): void;
+		/**
+		 * Executes editing command replaceMisspelling in page.
+		 */
+		replaceMisspelling(text: string): void;
+		/**
+		 * Inserts text to the focused element.
+		 */
+		insertText(text: string): void;
+		/**
+		 * Starts a request to find all matches for the text in the web page.
+		 * The result of the request can be obtained by subscribing to found-in-page event.
+		 * @returns The request id used for the request.
+		 */
+		findInPage(text: string, options?: FindInPageOptions): number;
+		/**
+		 * Stops any findInPage request for the webview with the provided action.
+		 */
+		stopFindInPage(action: StopFindInPageAtion): void;
+		/**
+		 * Prints webview's web page. Same with webContents.print([options]).
+		 */
+		print(options?: PrintOptions): void;
+		/**
+		 * Prints webview's web page as PDF, Same with webContents.printToPDF(options, callback)
+		 */
+		printToPDF(options: PrintToPDFOptions, callback: (error: Error, data: Buffer) => void): void;
+		/**
+		 * Send an asynchronous message to renderer process via channel, you can also send arbitrary arguments.
+		 * The renderer process can handle the message by listening to the channel event with the ipcRenderer module.
+		 * See webContents.send for examples.
+		 */
+		send(channel: string, ...args: any[]): void;
+		/**
+		 * Sends an input event to the page.
+		 * See webContents.sendInputEvent for detailed description of event object.
+		 */
+		sendInputEvent(event: SendInputEvent): void
+		/**
+		 * @returns The WebContents associated with this webview.
+		 */
+		getWebContents(): WebContents;
+		/**
+		 * Fired when a load has committed. This includes navigation within the current document
+		 * as well as subframe document-level loads, but does not include asynchronous resource loads.
+		 */
+		addEventListener(type: 'load-commit', listener: (event: WebViewElement.LoadCommitEvent) => void, useCapture?: boolean): void;
+		/**
+		 * Fired when the navigation is done, i.e. the spinner of the tab will stop spinning, and the onload event is dispatched.
+		 */
+		addEventListener(type: 'did-finish-load', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
+		/**
+		 * This event is like did-finish-load, but fired when the load failed or was cancelled, e.g. window.stop() is invoked.
+		 */
+		addEventListener(type: 'did-fail-load', listener: (event: WebViewElement.DidFailLoadEvent) => void, useCapture?: boolean): void;
+		/**
+		 * Fired when a frame has done navigation.
+		 */
+		addEventListener(type: 'did-frame-finish-load', listener: (event: WebViewElement.DidFrameFinishLoadEvent) => void, useCapture?: boolean): void;
+		/**
+		 * Corresponds to the points in time when the spinner of the tab starts spinning.
+		 */
+		addEventListener(type: 'did-start-loading', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
+		/**
+		 * Corresponds to the points in time when the spinner of the tab stops spinning.
+		 */
+		addEventListener(type: 'did-stop-loading', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
+		/**
+		 * Fired when details regarding a requested resource is available.
+		 * status indicates socket connection to download the resource.
+		 */
+		addEventListener(type: 'did-get-response-details', listener: (event: WebViewElement.DidGetResponseDetails) => void, useCapture?: boolean): void;
+		/**
+		 * Fired when a redirect was received while requesting a resource.
+		 */
+		addEventListener(type: 'did-get-redirect-request', listener: (event: WebViewElement.DidGetRedirectRequestEvent) => void, useCapture?: boolean): void;
+		/**
+		 * Fired when document in the given frame is loaded.
+		 */
+		addEventListener(type: 'dom-ready', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
+		/**
+		 * Fired when page title is set during navigation. explicitSet is false when title is synthesized from file URL.
+		 */
+		addEventListener(type: 'page-title-updated', listener: (event: WebViewElement.PageTitleUpdatedEvent) => void, useCapture?: boolean): void;
+		/**
+		 * Fired when page receives favicon URLs.
+		 */
+		addEventListener(type: 'page-favicon-updated', listener: (event: WebViewElement.PageFaviconUpdatedEvent) => void, useCapture?: boolean): void;
+		/**
+		 * Fired when page enters fullscreen triggered by HTML API.
+		 */
+		addEventListener(type: 'enter-html-full-screen', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
+		/**
+		 * Fired when page leaves fullscreen triggered by HTML API.
+		 */
+		addEventListener(type: 'leave-html-full-screen', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
+		/**
+		 * Fired when the guest window logs a console message.
+		 */
+		addEventListener(type: 'console-message', listener: (event: WebViewElement.ConsoleMessageEvent) => void, useCapture?: boolean): void;
+		/**
+		 * Fired when a result is available for webview.findInPage request.
+		 */
+		addEventListener(type: 'found-in-page', listener: (event: WebViewElement.FoundInPageEvent) => void, useCapture?: boolean): void;
+		/**
+		 * Fired when the guest page attempts to open a new browser window.
+		 */
+		addEventListener(type: 'new-window', listener: (event: WebViewElement.NewWindowEvent) => void, useCapture?: boolean): void;
+		/**
+		 * Emitted when a user or the page wants to start navigation.
+		 * It can happen when the window.location object is changed or a user clicks a link in the page.
+		 *
+		 * This event will not emit when the navigation is started programmatically with APIs
+		 * like <webview>.loadURL and <webview>.back.
+		 *
+		 * It is also not emitted during in-page navigation, such as clicking anchor links
+		 * or updating the window.location.hash. Use did-navigate-in-page event for this purpose.
+		 *
+		 * Calling event.preventDefault() does NOT have any effect.
+		 */
+		addEventListener(type: 'will-navigate', listener: (event: WebViewElement.NavigateEvent) => void, useCapture?: boolean): void;
+		/**
+		 * Emitted when a navigation is done.
+		 *
+		 * This event is not emitted for in-page navigations, such as clicking anchor links
+		 * or updating the window.location.hash. Use did-navigate-in-page event for this purpose.
+		 */
+		addEventListener(type: 'did-navigate', listener: (event: WebViewElement.NavigateEvent) => void, useCapture?: boolean): void;
+		/**
+		 * Emitted when an in-page navigation happened.
+		 *
+		 * When in-page navigation happens, the page URL changes but does not cause
+		 * navigation outside of the page. Examples of this occurring are when anchor links
+		 * are clicked or when the DOM hashchange event is triggered.
+		 */
+		addEventListener(type: 'did-navigate-in-page', listener: (event: WebViewElement.NavigateEvent) => void, useCapture?: boolean): void;
+		/**
+		 * Fired when the guest page attempts to close itself.
+		 */
+		addEventListener(type: 'close', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
+		/**
+		 * Fired when the guest page has sent an asynchronous message to embedder page.
+		 */
+		addEventListener(type: 'ipc-message', listener: (event: WebViewElement.IpcMessageEvent) => void, useCapture?: boolean): void;
+		/**
+		 * Fired when the renderer process is crashed.
+		 */
+		addEventListener(type: 'crashed', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
+		/**
+		 * Fired when the gpu process is crashed.
+		 */
+		addEventListener(type: 'gpu-crashed', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
+		/**
+		 * Fired when a plugin process is crashed.
+		 */
+		addEventListener(type: 'plugin-crashed', listener: (event: WebViewElement.PluginCrashedEvent) => void, useCapture?: boolean): void;
+		/**
+		 * Fired when the WebContents is destroyed.
+		 */
+		addEventListener(type: 'destroyed', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
+		/**
+		 * Emitted when media starts playing.
+		 */
+		addEventListener(type: 'media-started-playing', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
+		/**
+		 * Emitted when media is paused or done playing.
+		 */
+		addEventListener(type: 'media-paused', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
+		/**
+		 * Emitted when a page's theme color changes. This is usually due to encountering a meta tag:
+		 * <meta name='theme-color' content='#ff0000'>
+		 */
+		addEventListener(type: 'did-change-theme-color', listener: (event: WebViewElement.DidChangeThemeColorEvent) => void, useCapture?: boolean): void;
+		/**
+		 * Emitted when DevTools is opened.
+		 */
+		addEventListener(type: 'devtools-opened', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
+		/**
+		 * Emitted when DevTools is closed.
+		 */
+		addEventListener(type: 'devtools-closed', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
+		/**
+		 * Emitted when DevTools is focused / opened.
+		 */
+		addEventListener(type: 'devtools-focused', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
+		addEventListener(type: string, listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
+	}
+
+	namespace WebViewElement {
+		type Event = ElectronPrivate.GlobalEvent;
+
+		interface LoadCommitEvent extends Event  {
+			url: string;
+			isMainFrame: boolean;
+		}
+
+		interface DidFailLoadEvent extends Event  {
+			errorCode: number;
+			errorDescription: string;
+			validatedURL: string;
+			isMainFrame: boolean;
+		}
+
+		interface DidFrameFinishLoadEvent extends Event  {
+			isMainFrame: boolean;
+		}
+
+		interface DidGetResponseDetails extends Event  {
+			status: boolean;
+			newURL: string;
+			originalURL: string;
+			httpResponseCode: number;
+			requestMethod: string;
+			referrer: string;
+			headers: Headers;
+			resourceType: string;
+		}
+
+		interface DidGetRedirectRequestEvent extends Event {
+			oldURL: string;
+			newURL: string;
+			isMainFrame: boolean;
+			httpResponseCode: number;
+			requestMethod: string;
+			referrer: string;
+			headers: Headers;
+		}
+
+		interface PageTitleUpdatedEvent extends Event {
+			title: string;
+			explicitSet: string;
+		}
+
+		interface PageFaviconUpdatedEvent extends Event {
+			favicons: string[];
+		}
+
+		interface ConsoleMessageEvent extends Event {
+			level: number;
+			message: string;
+			line: number;
+			sourceId: string;
+		}
+
+		interface FoundInPageEvent extends Event {
+			result: FoundInPageResult;
+		}
+
+		interface NewWindowEvent extends Event {
+			url: string;
+			frameName: string;
+			disposition: NewWindowDisposition;
+			options: BrowserWindowOptions;
+		}
+
+		interface NavigateEvent extends Event {
+			url: string;
+		}
+
+		interface IpcMessageEvent extends Event {
+			channel: string;
+			args: any[];
+		}
+
+		interface PluginCrashedEvent extends Event {
+			name: string;
+			version: string;
+		}
+
+		interface DidChangeThemeColorEvent extends Event {
+			themeColor: string;
+		}
+	}
+
+	/**
+	 * The BrowserWindowProxy object is returned from window.open and provides limited functionality with the child window.
+	 */
+	interface BrowserWindowProxy {
+		/**
+		 * Removes focus from the child window.
+		 */
+		blur(): void;
+		/**
+		 * Forcefully closes the child window without calling its unload event.
+		 */
+		close(): void;
+		/**
+		 * Set to true after the child window gets closed.
+		 */
+		closed: boolean;
+		/**
+		 * Evaluates the code in the child window.
+		 */
+		eval(code: string): void;
+		/**
+		 * Focuses the child window (brings the window to front).
+		 */
+		focus(): void;
+		/**
+		 * Sends a message to the child window with the specified origin or * for no origin preference.
+		 * In addition to these methods, the child window implements window.opener object with no
+		 * properties and a single method.
+		 */
+		postMessage(message: string, targetOrigin: string): void;
+	}
+
+	// https://github.com/electron/electron/blob/master/docs/api/synopsis.md
+
+	interface CommonElectron {
+		clipboard: Electron.Clipboard;
+		crashReporter: Electron.CrashReporter;
+		nativeImage: typeof Electron.NativeImage;
+		shell: Electron.Shell;
+
+		app: Electron.App;
+		autoUpdater: Electron.AutoUpdater;
+		BrowserWindow: typeof Electron.BrowserWindow;
+		contentTracing: Electron.ContentTracing;
+		dialog: Electron.Dialog;
+		ipcMain: Electron.IpcMain;
+		globalShortcut: Electron.GlobalShortcut;
+		Menu: typeof Electron.Menu;
+		MenuItem: typeof Electron.MenuItem;
+		powerMonitor: Electron.PowerMonitor;
+		powerSaveBlocker: Electron.PowerSaveBlocker;
+		protocol: Electron.Protocol;
+		screen: Electron.Screen;
+		session: typeof Electron.Session;
+		Tray: Electron.Tray;
+		hideInternalModules(): void;
+	}
+
+	interface ElectronMainAndRenderer extends CommonElectron {
+		desktopCapturer: Electron.DesktopCapturer;
+		ipcRenderer: Electron.IpcRenderer;
+		remote: Electron.Remote;
+		webFrame: Electron.WebFrame;
+	}
+}
+
+declare namespace ElectronPrivate {
+	type GlobalEvent = Event;
+}
+
+interface Document {
+	createElement(tagName: 'webview'): Electron.WebViewElement;
+}
+
+// https://github.com/electron/electron/blob/master/docs/api/window-open.md
+
+interface Window {
+	/**
+	 * Creates a new window.
+	 */
+	open(url: string, frameName?: string, features?: string): Electron.BrowserWindowProxy;
+}
+
+// https://github.com/electron/electron/blob/master/docs/api/file-object.md
+
+interface File {
+	/**
+	 * Exposes the real path of the filesystem.
+	 */
+	path: string;
+}
+
+// https://github.com/electron/electron/blob/master/docs/api/process.md
+
+declare namespace NodeJS {
+	interface Process {
+		/**
+		 * Process's type
+		 */
+		type: 'browser' | 'renderer';
+		/**
+		 * Path to JavaScript source code.
+		 */
+		resourcesPath: string;
+		/**
+		 * For Mac App Store build, this value is true, for other builds it is undefined.
+		 */
+		mas?: boolean;
+		/**
+		 * If the app is running as a Windows Store app (appx), this value is true, for other builds it is undefined.
+		 */
+		windowsStore?: boolean;
+		/**
+		 * Emitted when Electron has loaded its internal initialization script
+		 * and is beginning to load the web page or the main script.
+		 */
+		on(event: 'loaded', listener: Function): this;
+		on(event: string, listener: Function): this;
+		/**
+		 * Setting this to true can disable the support for asar archives in Node's built-in modules.
+		 */
+		noAsar?: boolean;
+		/**
+		 * Causes the main thread of the current process crash;
+		 */
+		crash(): void;
+		/**
+		 * Causes the main thread of the current process hang.
+		 */
+		hang(): void;
+		/**
+		 * Sets the file descriptor soft limit to maxDescriptors or the OS hard limit,
+		 * whichever is lower for the current process.
+		 *
+		 * Note: This API is only available on Mac and Linux.
+		 */
+		setFdLimit(maxDescriptors: number): void;
+	}
+}
+
+declare module 'electron' {
+	var electron: Electron.ElectronMainAndRenderer;
+	export = electron;
+}
+
+interface NodeRequireFunction {
+	(moduleName: 'electron'): Electron.ElectronMainAndRenderer;
+}
diff --git a/electron/tsconfig.json b/electron/tsconfig.json
new file mode 100644
index 0000000000..d62a773f48
--- /dev/null
+++ b/electron/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "github-electron-renderer-tests.ts",
+        "github-electron-main-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/element-resize-event/element-resize-event-tests.ts b/element-resize-event/element-resize-event-tests.ts
index 55594eefa0..96c859cdae 100644
--- a/element-resize-event/element-resize-event-tests.ts
+++ b/element-resize-event/element-resize-event-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="element-resize-event.d.ts" />
 
 import ere = require("element-resize-event");
 
diff --git a/element-resize-event/element-resize-event.d.ts b/element-resize-event/element-resize-event.d.ts
deleted file mode 100644
index 3152568f8a..0000000000
--- a/element-resize-event/element-resize-event.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for element-resize-event 1.0.1
-// Project: https://github.com/KyleAMathews/element-resize-event
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "element-resize-event" {
-	function elementResizeEvent(domNode: Element, callback: () => void): void;
-	export = elementResizeEvent;
-}
diff --git a/element-resize-event/index.d.ts b/element-resize-event/index.d.ts
new file mode 100644
index 0000000000..e500d2e7f9
--- /dev/null
+++ b/element-resize-event/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for element-resize-event 1.0.1
+// Project: https://github.com/KyleAMathews/element-resize-event
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function elementResizeEvent(domNode: Element, callback: () => void): void;
+export = elementResizeEvent;
diff --git a/element-resize-event/tsconfig.json b/element-resize-event/tsconfig.json
new file mode 100644
index 0000000000..d50a59d85e
--- /dev/null
+++ b/element-resize-event/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "element-resize-event-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/elm/elm-tests.ts b/elm/elm-tests.ts
index dd0c601975..ce70d123ec 100644
--- a/elm/elm-tests.ts
+++ b/elm/elm-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="elm.d.ts" />
+
 
 // Based on https://gist.github.com/evancz/8521339
 
diff --git a/elm/elm.d.ts b/elm/index.d.ts
similarity index 100%
rename from elm/elm.d.ts
rename to elm/index.d.ts
diff --git a/elm/tsconfig.json b/elm/tsconfig.json
new file mode 100644
index 0000000000..690e73f398
--- /dev/null
+++ b/elm/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "elm-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/email-addresses/email-addresses-tests.ts b/email-addresses/email-addresses-tests.ts
index b43289d86c..7bf713e2c5 100644
--- a/email-addresses/email-addresses-tests.ts
+++ b/email-addresses/email-addresses-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="email-addresses.d.ts"/>
-
 import addrs = require('email-addresses');
 
 var result: Object;
diff --git a/email-addresses/email-addresses.d.ts b/email-addresses/email-addresses.d.ts
deleted file mode 100644
index c8cd74d1a0..0000000000
--- a/email-addresses/email-addresses.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for email-addresses 2.0.1
-// Project: https://github.com/jackbowman/email-addresses
-// Definitions by: John Grimsey <https://github.com/johngrimsey>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "email-addresses" {
-    function parseOneAddress(opts: any): any;
-    function parseAddressList(opts: any): any;
-}
diff --git a/email-addresses/index.d.ts b/email-addresses/index.d.ts
new file mode 100644
index 0000000000..85161906ea
--- /dev/null
+++ b/email-addresses/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for email-addresses 2.0.1
+// Project: https://github.com/jackbowman/email-addresses
+// Definitions by: John Grimsey <https://github.com/johngrimsey>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function parseOneAddress(opts: any): any;
+export function parseAddressList(opts: any): any;
diff --git a/email-addresses/tsconfig.json b/email-addresses/tsconfig.json
new file mode 100644
index 0000000000..85808f1b59
--- /dev/null
+++ b/email-addresses/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "email-addresses-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/email-templates/email-templates-tests.ts b/email-templates/email-templates-tests.ts
index 9b70728106..7a0c6791a2 100644
--- a/email-templates/email-templates-tests.ts
+++ b/email-templates/email-templates-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="email-templates.d.ts"/>
-
 import EmailTemplates = require('email-templates');
 
 var EmailTemplate = EmailTemplates.EmailTemplate;
diff --git a/email-templates/email-templates.d.ts b/email-templates/index.d.ts
similarity index 100%
rename from email-templates/email-templates.d.ts
rename to email-templates/index.d.ts
diff --git a/email-templates/tsconfig.json b/email-templates/tsconfig.json
new file mode 100644
index 0000000000..0056e0c2f1
--- /dev/null
+++ b/email-templates/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "email-templates-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/email-validator/email-validator-tests.ts b/email-validator/email-validator-tests.ts
index 61d4c6dfa6..81450bcab1 100644
--- a/email-validator/email-validator-tests.ts
+++ b/email-validator/email-validator-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="email-validator.d.ts" />
 
 import emailValidator = require('email-validator');
 import { validate } from 'email-validator';
diff --git a/email-validator/email-validator.d.ts b/email-validator/email-validator.d.ts
deleted file mode 100644
index 299ebb19f6..0000000000
--- a/email-validator/email-validator.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Type definitions for email-validator 1.0.3
-// Project: https://github.com/Sembiance/email-validator
-// Definitions by: Paul Lessing <https://github.com/paullessing>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "email-validator" {
-    export function validate(email: String): boolean;
-}
diff --git a/email-validator/index.d.ts b/email-validator/index.d.ts
new file mode 100644
index 0000000000..ad0fb761be
--- /dev/null
+++ b/email-validator/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for email-validator 1.0.3
+// Project: https://github.com/Sembiance/email-validator
+// Definitions by: Paul Lessing <https://github.com/paullessing>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export declare function validate(email: String): boolean;
diff --git a/email-validator/tsconfig.json b/email-validator/tsconfig.json
new file mode 100644
index 0000000000..0ea36e4b8b
--- /dev/null
+++ b/email-validator/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "email-validator-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ember/ember-tests.ts b/ember/ember-tests.ts
index 33ff6be0b2..103fb0146e 100644
--- a/ember/ember-tests.ts
+++ b/ember/ember-tests.ts
@@ -1,7 +1,3 @@
-/// <reference path="ember.d.ts" />
-/// <reference path="../handlebars/handlebars-1.0.0.d.ts" />
-
-
 var App : any;
 
 App = Em.Application.create<Em.Application>();
diff --git a/ember/ember.d.ts b/ember/ember.d.ts
deleted file mode 100644
index c24661d763..0000000000
--- a/ember/ember.d.ts
+++ /dev/null
@@ -1,3492 +0,0 @@
-// Type definitions for Ember.js 1.11.3
-// Project: http://emberjs.com/
-// Definitions by: Jed Mao <https://github.com/jedmao>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../handlebars/handlebars-1.0.0.d.ts" />
-
-declare var Handlebars: HandlebarsStatic;
-
-declare namespace EmberStates {
-
-    interface Transition {
-        targetName: string;
-        urlMethod: string;
-        intent: any;
-        params: {}|any;
-        pivotHandler: any;
-        resolveIndex: number;
-        handlerInfos: any;
-        resolvedModels: {}|any;
-        isActive: boolean;
-        state: any;
-        queryParams: {}|any;
-        queryParamsOnly: boolean;
-
-        isTransition: boolean;
-
-        /**
-          The Transition's internal promise. Calling `.then` on this property
-          is that same as calling `.then` on the Transition object itself, but
-          this property is exposed for when you want to pass around a
-          Transition's promise, but not the Transition object itself, since
-          Transition object can be externally `abort`ed, while the promise
-          cannot.
-         */
-        promise: Ember.RSVP.Promise;
-
-        /**
-          Custom state can be stored on a Transition's `data` object.
-          This can be useful for decorating a Transition within an earlier
-          hook and shared with a later hook. Properties set on `data` will
-          be copied to new transitions generated by calling `retry` on this
-          transition.
-         */
-        data: any;
-
-        /**
-          A standard promise hook that resolves if the transition
-          succeeds and rejects if it fails/redirects/aborts.
-
-          Forwards to the internal `promise` property which you can
-          use in situations where you want to pass around a thennable,
-          but not the Transition itself.
-
-          @arg {Function} onFulfilled
-          @arg {Function} onRejected
-          @arg {String} label optional string for labeling the promise. Useful for tooling.
-          @return {Promise}
-         */
-        then(onFulfilled: Function, onRejected?: Function, label?: string): Ember.RSVP.Promise;
-
-        /**
-          Forwards to the internal `promise` property which you can
-          use in situations where you want to pass around a thennable,
-          but not the Transition itself.
-
-          @method catch
-          @arg {Function} onRejection
-          @arg {String} label optional string for labeling the promise.
-          Useful for tooling.
-          @return {Promise}
-         */
-        catch(onRejection: Function, label?: string): Ember.RSVP.Promise;
-
-        /**
-          Forwards to the internal `promise` property which you can
-          use in situations where you want to pass around a thennable,
-          but not the Transition itself.
-
-          @method finally
-          @arg {Function} callback
-          @arg {String} label optional string for labeling the promise.
-          Useful for tooling.
-          @return {Promise}
-         */
-        finally(callback: Function, label?: string): Ember.RSVP.Promise;
-
-        /**
-         Aborts the Transition. Note you can also implicitly abort a transition
-         by initiating another transition while a previous one is underway.
-        */
-        abort(): EmberStates.Transition;
-        normalize(manager: Ember.StateManager, contexts: any[]): void;
-
-        /**
-         Retries a previously-aborted transition (making sure to abort the
-         transition if it's still active). Returns a new transition that
-         represents the new attempt to transition.
-        */
-        retry(): EmberStates.Transition;
-
-        /**
-          Sets the URL-changing method to be employed at the end of a
-          successful transition. By default, a new Transition will just
-          use `updateURL`, but passing 'replace' to this method will
-          cause the URL to update using 'replaceWith' instead. Omitting
-          a parameter will disable the URL change, allowing for transitions
-          that don't update the URL at completion (this is also used for
-          handleURL, since the URL has already changed before the
-          transition took place).
-
-          @arg {String} method the type of URL-changing method to use
-            at the end of a transition. Accepted values are 'replace',
-            falsy values, or any other non-falsy value (which is
-            interpreted as an updateURL transition).
-
-          @return {Transition} this transition
-         */
-        method(method: string): EmberStates.Transition;
-
-        /**
-          Fires an event on the current list of resolved/resolving
-          handlers within this transition. Useful for firing events
-          on route hierarchies that haven't fully been entered yet.
-
-          Note: This method is also aliased as `send`
-
-          @arg {Boolean} [ignoreFailure=false] a boolean specifying whether unhandled events throw an error
-          @arg {String} name the name of the event to fire
-         */
-        trigger(ignoreFailure:boolean, eventName: string): void;
-        /**
-          Fires an event on the current list of resolved/resolving
-          handlers within this transition. Useful for firing events
-          on route hierarchies that haven't fully been entered yet.
-
-          Note: This method is also aliased as `send`
-
-          @arg {String} name the name of the event to fire
-         */
-        trigger(eventName: string): void;
-
-        /**
-          Transitions are aborted and their promises rejected
-          when redirects occur; this method returns a promise
-          that will follow any redirects that occur and fulfill
-          with the value fulfilled by any redirecting transitions
-          that occur.
-
-          @return {Promise} a promise that fulfills with the same
-            value that the final redirecting transition fulfills with
-         */
-        followRedirects(): Ember.RSVP.Promise;
-    }
-
-}
-
-declare namespace EmberTesting {
-
-    namespace Test {
-
-        class Adapter {
-            asyncEnd(): void;
-            asyncStart(): void;
-            exception(error: string): void;
-        }
-
-        class QUnitAdapter extends Adapter { }
-
-    }
-
-}
-
-interface Function {
-    observes(...args: string[]): Function;
-    observesBefore(...args: string[]): Function;
-    on(...args: string[]): Function;
-    property(...args: string[]): Function;
-}
-
-interface String {
-    camelize(): string;
-    capitalize(): string;
-    classify(): string;
-    dasherize(): string;
-    decamelize(): string;
-    fmt(...args: string[]): string;
-    htmlSafe(): typeof Handlebars.SafeString;
-    loc(...args: string[]): string;
-    underscore(): string;
-    w(): string[];
-}
-
-interface Array<T> {
-    constructor(arr: any[]): void;
-    activate(): void;
-    addArrayObserver(target: any, opts?: EnumerableConfigurationOptions): any[];
-    addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): any[];
-    any(callback: Function, target?: any): boolean;
-    anyBy(key: string, value?: string): boolean;
-    arrayContentDidChange(startIdx: number, removeAmt: number, addAmt: number): any[];
-    arrayContentWillChange(startIdx: number, removeAmt: number, addAmt: number): any[];
-    someProperty(key: string, value?: any): boolean;
-    clear(): any[];
-    compact(): any[];
-    contains(obj: any): boolean;
-    enumerableContentDidChange(start: number, removing: number, adding: number): any;
-    enumerableContentDidChange(start: number, removing: Ember.Enumerable, adding: number): any;
-    enumerableContentDidChange(start: number, removing: number, adding: Ember.Enumerable): any;
-    enumerableContentDidChange(start: number, removing: Ember.Enumerable, adding: Ember.Enumerable): any;
-    enumerableContentDidChange(removing: number, adding: number): any;
-    enumerableContentDidChange(removing: Ember.Enumerable, adding: number): any;
-    enumerableContentDidChange(removing: number, adding: Ember.Enumerable): any;
-    enumerableContentDidChange(removing: Ember.Enumerable, adding: Ember.Enumerable): any;
-    enumerableContentWillChange(removing: number, adding: number): any[];
-    enumerableContentWillChange(removing: Ember.Enumerable, adding: number): any[];
-    enumerableContentWillChange(removing: number, adding: Ember.Enumerable): any[];
-    enumerableContentWillChange(removing: Ember.Enumerable, adding: Ember.Enumerable): any[];
-    every(callback: Function, target?: any): boolean;
-    everyBy(key: string, value?: string): boolean;
-    everyProperty(key: string, value?: any): boolean;
-    filter(callback: Function, target?: any): any[];
-    filterBy(key: string, value?: string): any[];
-
- /**
-    Returns the first item in the array for which the callback returns true.
-    This method works similar to the `filter()` method defined in JavaScript 1.6
-    except that it will stop working on the array once a match is found.
-    The callback method you provide should have the following signature (all
-    parameters are optional):
-    ```javascript
-    function(item, index, enumerable);
-    ```
-    - `item` is the current item in the iteration.
-    - `index` is the current index in the iteration.
-    - `enumerable` is the enumerable object itself.
-    It should return the `true` to include the item in the results, `false`
-    otherwise.
-    Note that in addition to a callback, you can also pass an optional target
-    object that will be set as `this` on the context. This is a good way
-    to give your iterator function access to the current object.
-    @function find
-    @arg callback The callback to execute
-    @arg {Object} [target] The target object to use
-    @return {Object} Found item or `undefined`.
-*/
-    find(callback: Function, target?: any): any;
-    findBy(key: string, value?: string): any;
-    forEach(callback: Function, target?: any): any;
-    getEach(key: string): any[];
-    indexOf(object: any, startAt?: number): number;
-    insertAt(idx: number, object: any): any[];
-    invoke(methodName: string, ...args: any[]): any[];
-    lastIndexOf(object: any, startAt?: number): number;
-    map(callback: Function, target?: any): any[];
-    mapBy(key: string): any[];
-    nextObject(index: number, previousObject: any, context: any): any;
-    objectAt(idx: number): any;
-    objectsAt(...args: number[]): any[];
-    popObject(): any;
-    pushObject(obj: any): any;
-    pushObjects(...args: any[]): any[];
-    reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
-    reject: ItemIndexEnumerableCallbackTarget;
-    rejectBy(key: string, value?: string): any[];
-    removeArrayObserver(target: any, opts: EnumerableConfigurationOptions): any[];
-    removeAt(start: number, len: number): any;
-    removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): any[];
-    replace(idx: number, amt: number, objects: any[]): void;
-    reverseObjects(): any[];
-    setEach(key: string, value?: any): any;
-    setObjects(objects: any[]): any[];
-    shiftObject(): any;
-    slice(beginIndex?: number, endIndex?: number): any[];
-    some(callback: Function, target?: any): boolean;
-    toArray(): any[];
-    uniq(): any[];
-    unshiftObject(object: any): any;
-    unshiftObjects(objects: any[]): any[];
-    without(value: any): any[];
-    '[]': any[];
-    '@each': Ember.EachProxy;
-    Boolean: boolean;
-    firstObject: any;
-    hasEnumerableObservers: boolean;
-    lastObject: any;
-    addObject(object: any): any;
-    addObjects(objects: Ember.Enumerable): any[];
-    removeObject(object: any): any;
-    removeObjects(objects: Ember.Enumerable): any[];
-    addObserver: ModifyObserver;
-    beginPropertyChanges(): any[];
-    cacheFor(keyName: string): any;
-    decrementProperty(keyName: string, decrement?: number): number;
-    endPropertyChanges(): any[];
-    get(keyName: string): any;
-    getProperties(...args: string[]): {};
-    getProperties(keys: string[]): {};
-    getWithDefault(keyName: string, defaultValue: any): any;
-    hasObserverFor(key: string): boolean;
-    incrementProperty(keyName: string, increment?: number): number;
-    notifyPropertyChange(keyName: string): any[];
-    propertyDidChange(keyName: string): any[];
-    propertyWillChange(keyName: string): any[];
-    removeObserver(key: string, target: any, method: string): Ember.Observable;
-    removeObserver(key: string, target: any, method: Function): Ember.Observable;
-    set(keyName: string, value: any): any[];
-    setProperties(hash: {}): any[];
-    toggleProperty(keyName: string): any;
-    copy(deep: boolean): any[];
-    frozenCopy(): any[];
-    // 1.3
-    isAny(key: string, value?: string): boolean;
-    isEvery(key: string, value?: string): boolean;
-}
-
-interface ApplicationCreateArguments {
-    customEvents?: {};
-    rootElement?: string;
-    /**
-    Basic logging of successful transitions.
-    **/
-    LOG_TRANSITIONS?: boolean;
-    /**
-    Detailed logging of all routing steps.
-    **/
-    LOG_TRANSITIONS_INTERNAL?: boolean;
-}
-
-interface ApplicationInitializerArguments {
-    name?: string;
-    initialize?: ApplicationInitializerFunction;
-}
-
-interface ApplicationInitializerFunction {
-    (container: Ember.Container, application: Ember.Application): void;
-}
-
-interface CoreObjectArguments {
-    /**
-    An overridable method called when objects are instantiated. By default, does nothing unless it is
-    overridden during class definition. NOTE: If you do override init for a framework class like Ember.View
-    or Ember.ArrayController, be sure to call this._super() in your init declaration! If you don't, Ember
-    may not have an opportunity to do important setup work, and you'll see strange behavior in your application.
-    **/
-    init?: Function;
-    /**
-    Override to implement teardown.
-    **/
-    willDestroy?: Function;
-
-    [propName: string]: any;
-}
-
-interface EnumerableConfigurationOptions {
-    willChange?: boolean ;
-    didChange?: boolean ;
-}
-
-interface ItemIndexEnumerableCallbackTarget {
-    (callback: ItemIndexEnumerableCallback, target?: any): any[];
-}
-
-interface ItemIndexEnumerableCallback {
-    (item: any, index: number, enumerable: Ember.Enumerable): void;
-}
-
-interface ReduceCallback {
-    (previousValue: any, item: any, index: number, enumerable: Ember.Enumerable): void;
-}
-
-interface TransitionsHash {
-    contexts: any[];
-    exitStates: Ember.State[];
-    enterStates: Ember.State[];
-    resolveState: Ember.State;
-}
-
-interface ActionsHash {
-    willTransition?: Function;
-    error?: Function;
-}
-
-interface DisconnectOutletOptions {
-    outlet?: string;
-    parentView?: string;
-}
-
-interface RenderOptions {
-    into?: string;
-    controller?: string;
-    model?: any;
-    outlet?: string;
-    view?: string;
-}
-
-interface ModifyObserver {
-    (obj: any, path: string, target: any, method?: Function): void;
-    (obj: any, path: string, target: any, method?: string): void;
-    (obj: any, path: string, func: Function, method?: Function): void;
-    (obj: any, path: string, func: Function, method?: string): void;
-}
-
-declare namespace Ember {
-    /**
-    Alias for jQuery.
-    **/
-    // ReSharper disable once DuplicatingLocalDeclaration
-    var $: JQueryStatic;
-    /**
-    Creates an Ember.NativeArray from an Array like object. Does not modify the original object.
-    Ember.A is not needed if Ember.EXTEND_PROTOTYPES is true (the default value). However, it is
-    recommended that you use Ember.A when creating addons for ember or when you can not garentee
-    that Ember.EXTEND_PROTOTYPES will be true.
-    **/
-    function A(arr?: any[]): NativeArray;
-    /**
-    The Ember.ActionHandler mixin implements support for moving an actions property to an _actions
-    property at extend time, and adding _actions to the object's mergedProperties list.
-    **/
-    class ActionHandlerMixin {
-        /**
-        Triggers a named action on the ActionHandler
-        **/
-        send(name: string, ...args: any[]): void;
-        /**
-        The collection of functions, keyed by name, available on this ActionHandler as action targets.
-        **/
-        actions: ActionsHash;
-    }
-    /**
-    An instance of Ember.Application is the starting point for every Ember application. It helps to
-    instantiate, initialize and coordinate the many objects that make up your app.
-    **/
-    class Application extends Namespace {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        static initializer(args?: ApplicationInitializerArguments): void;
-        /**
-        Call advanceReadiness after any asynchronous setup logic has completed.
-        Each call to deferReadiness must be matched by a call to advanceReadiness
-        or the application will never become ready and routing will not begin.
-        **/
-        advanceReadiness(): void;
-        /**
-        Use this to defer readiness until some condition is true.
-
-        This allows you to perform asynchronous setup logic and defer
-        booting your application until the setup has finished.
-
-        However, if the setup requires a loading UI, it might be better
-        to use the router for this purpose.
-        */
-        deferReadiness(): void;
-        /**
-        defines an injection or typeInjection
-        **/
-        inject(factoryNameOrType: string, property: string, injectionName: string): void;
-        /**
-        This injects the test helpers into the window's scope. If a function of the
-        same name has already been defined it will be cached (so that it can be reset
-        if the helper is removed with `unregisterHelper` or `removeTestHelpers`).
-        Any callbacks registered with `onInjectHelpers` will be called once the
-        helpers have been injected.
-        **/
-        injectTestHelpers(): void;
-        /**
-        registers a factory for later injection
-        @param fullName type:name (e.g., 'model:user')
-        @param factory (e.g., App.Person)
-        **/
-        register(fullName: string, factory: Function, options?: {}): void;
-        /**
-        This removes all helpers that have been registered, and resets and functions
-        that were overridden by the helpers.
-        **/
-        removeTestHelpers(): void;
-        /**
-        Reset the application. This is typically used only in tests.
-        **/
-        reset(): void;
-        /**
-        This hook defers the readiness of the application, so that you can start
-        the app when your tests are ready to run. It also sets the router's
-        location to 'none', so that the window's location will not be modified
-        (preventing both accidental leaking of state between tests and interference
-        with your testing framework).
-        **/
-        setupForTesting(): void;
-        /**
-        The DOM events for which the event dispatcher should listen.
-        */
-        customEvents: {};
-        /**
-        The Ember.EventDispatcher responsible for delegating events to this application's views.
-        **/
-        eventDispatcher: EventDispatcher;
-        /**
-        Set this to provide an alternate class to Ember.DefaultResolver
-        **/
-        resolver: DefaultResolver;
-        /**
-        The root DOM element of the Application. This can be specified as an
-        element or a jQuery-compatible selector string.
-
-        This is the element that will be passed to the Application's, eventDispatcher,
-        which sets up the listeners for event delegation. Every view in your application
-        should be a child of the element you specify here.
-        **/
-        rootElement: HTMLElement;
-        /**
-        Called when the Application has become ready.
-        The call will be delayed until the DOM has become ready.
-        **/
-        ready: Function;
-        /**
-        Application's router.
-        **/
-        Router: Router;
-    }
-    /**
-    This module implements Observer-friendly Array-like behavior. This mixin is picked up by the
-    Array class as well as other controllers, etc. that want to appear to be arrays.
-    **/
-    class Array implements Enumerable {
-        addArrayObserver(target: any, opts?: EnumerableConfigurationOptions): any[];
-        addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        any(callback: Function, target?: any): boolean;
-        anyBy(key: string, value?: string): boolean;
-        arrayContentDidChange(startIdx: number, removeAmt: number, addAmt: number): any[];
-        arrayContentWillChange(startIdx: number, removeAmt: number, addAmt: number): any[];
-        someProperty(key: string, value?: string): boolean;
-        compact(): any[];
-        contains(obj: any): boolean;
-        enumerableContentDidChange(start: number, removing: number, adding: number): any;
-        enumerableContentDidChange(start: number, removing: Enumerable, adding: number): any;
-        enumerableContentDidChange(start: number, removing: number, adding: Enumerable): any;
-        enumerableContentDidChange(start: number, removing: Enumerable, adding: Enumerable): any;
-        enumerableContentDidChange(removing: number, adding: number): any;
-        enumerableContentDidChange(removing: Enumerable, adding: number): any;
-        enumerableContentDidChange(removing: number, adding: Enumerable): any;
-        enumerableContentDidChange(removing: Enumerable, adding: Enumerable): any;
-        enumerableContentWillChange(removing: number, adding: number): Enumerable;
-        enumerableContentWillChange(removing: Enumerable, adding: number): Enumerable;
-        enumerableContentWillChange(removing: number, adding: Enumerable): Enumerable;
-        enumerableContentWillChange(removing: Enumerable, adding: Enumerable): Enumerable;
-        every(callback: Function, target?: any): boolean;
-        everyBy(key: string, value?: string): boolean;
-        everyProperty(key: string, value?: string): boolean;
-        filter(callback: Function, target: any): any[];
-        filterBy(key: string, value?: string): any[];
-        find(callback: Function, target?: any): any;
-        findBy(key: string, value?: string): any;
-        forEach(callback: Function, target?: any): any;
-        getEach(key: string): any[];
-        indexOf(object: any, startAt: number): number;
-        invoke(methodName: string, ...args: any[]): any[];
-        lastIndexOf(object: any, startAt: number): number;
-        map: ItemIndexEnumerableCallbackTarget;
-        mapBy(key: string): any[];
-        nextObject(index: number, previousObject: any, context: any): any;
-        objectAt(idx: number): any;
-        objectsAt(...args: number[]): any[];
-        reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
-        reject: ItemIndexEnumerableCallbackTarget;
-        rejectBy(key: string, value?: string): any[];
-        removeArrayObserver(target: any, opts: EnumerableConfigurationOptions): any[];
-        removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        setEach(key: string, value?: any): any;
-        slice(beginIndex?: number, endIndex?: number): any[];
-        some(callback: Function, target?: any): boolean;
-        toArray(): any[];
-        uniq(): Enumerable;
-        without(value: any): Enumerable;
-    '@each': EachProxy;
-        Boolean: boolean;
-    '[]': any[];
-        firstObject: any;
-        hasEnumerableObservers: boolean;
-        lastObject: any;
-        length: number;
-    }
-    /**
-    Provides a way for you to publish a collection of objects so that you can easily bind to the
-    collection from a Handlebars #each helper, an Ember.CollectionView, or other controllers.
-    **/
-    class ArrayController extends ArrayProxy implements SortableMixin, ControllerMixin {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        lookupItemController(object: any): string;
-        arrangedContent: any;
-        itemController: string;
-        sortAscending: boolean;
-        sortFunction: Comparable;
-        sortProperties: any[];
-        replaceRoute(name: string, ...args: any[]): void;
-        transitionToRoute(name: string, ...args: any[]): void;
-        controllers: {};
-        needs: string[];
-        target: any;
-        model: any;
-        queryParams: any;
-        send(name: string, ...args: any[]): void;
-        actions: {};
-
-    }
-    /**
-    Array polyfills to support ES5 features in older browsers.
-    **/
-    var ArrayPolyfills: {
-        map: typeof Array.prototype.map;
-        forEach: typeof Array.prototype.forEach;
-        indexOf: typeof Array.prototype.indexOf;
-    };
-    /**
-    An ArrayProxy wraps any other object that implements Ember.Array and/or Ember.MutableArray,
-    forwarding all requests. This makes it very useful for a number of binding use cases or other cases
-    where being able to swap out the underlying array is useful.
-    **/
-    class ArrayProxy extends Object implements MutableArray {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        addArrayObserver(target: any, opts?: EnumerableConfigurationOptions): any[];
-        addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        any(callback: Function, target?: any): boolean;
-        anyBy(key: string, value?: string): boolean;
-        arrayContentDidChange(startIdx: number, removeAmt: number, addAmt: number): any[];
-        arrayContentWillChange(startIdx: number, removeAmt: number, addAmt: number): any[];
-        someProperty(key: string, value?: string): boolean;
-        clear(): any[];
-        compact(): any[];
-        contains(obj: any): boolean;
-        enumerableContentDidChange(start: number, removing: number, adding: number): any;
-        enumerableContentDidChange(start: number, removing: Enumerable, adding: number): any;
-        enumerableContentDidChange(start: number, removing: number, adding: Enumerable): any;
-        enumerableContentDidChange(start: number, removing: Enumerable, adding: Enumerable): any;
-        enumerableContentDidChange(removing: number, adding: number): any;
-        enumerableContentDidChange(removing: Enumerable, adding: number): any;
-        enumerableContentDidChange(removing: number, adding: Enumerable): any;
-        enumerableContentDidChange(removing: Enumerable, adding: Enumerable): any;
-        enumerableContentWillChange(removing: number, adding: number): Enumerable;
-        enumerableContentWillChange(removing: Enumerable, adding: number): Enumerable;
-        enumerableContentWillChange(removing: number, adding: Enumerable): Enumerable;
-        enumerableContentWillChange(removing: Enumerable, adding: Enumerable): Enumerable;
-        every(callback: Function, target?: any): boolean;
-        everyBy(key: string, value?: string): boolean;
-        everyProperty(key: string, value?: string): boolean;
-        filter(callback: Function, target: any): any[];
-        filterBy(key: string, value?: string): any[];
-        find(callback: Function, target: any): any;
-        findBy(key: string, value?: string): any;
-        forEach(callback: Function, target?: any): any;
-        getEach(key: string): any[];
-        indexOf(object: any, startAt: number): number;
-        insertAt(idx: number, object: any): any[];
-        invoke(methodName: string, ...args: any[]): any[];
-        lastIndexOf(object: any, startAt: number): number;
-        map: ItemIndexEnumerableCallbackTarget;
-        mapBy(key: string): any[];
-        nextObject(index: number, previousObject: any, context: any): any;
-        objectAt(idx: number): any;
-        objectAtContent(idx: number): any;
-        objectsAt(...args: number[]): any[];
-        popObject(): any;
-        pushObject(obj: any): any;
-        pushObjects(...args: any[]): any[];
-        reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
-        reject: ItemIndexEnumerableCallbackTarget;
-        rejectBy(key: string, value?: string): any[];
-        removeArrayObserver(target: any, opts: EnumerableConfigurationOptions): any[];
-        removeAt(start: number, len: number): any;
-        removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        replace(idx: number, amt: number, objects: any[]): any;
-        replaceContent(idx: number, amt: number, objects: any[]): void;
-        reverseObjects(): any[];
-        setEach(key: string, value?: any): any;
-        setObjects(objects: any[]): any[];
-        shiftObject(): any;
-        slice(beginIndex?: number, endIndex?: number): any[];
-        some(callback: Function, target?: any): boolean;
-        toArray(): any[];
-        uniq(): Enumerable;
-        unshiftObject(object: any): any;
-        unshiftObjects(objects: any[]): any[];
-        without(value: any): Enumerable;
-    '[]': any[];
-    '@each': EachProxy;
-        Boolean: boolean;
-        firstObject: any;
-        hasEnumerableObservers: boolean;
-        lastObject: any;
-        length: number;
-        addObject(object: any): any;
-        addObjects(objects: Enumerable): MutableEnumberable;
-        removeObject(object: any): any;
-        removeObjects(objects: Enumerable): MutableEnumberable;
-    }
-    var BOOTED: boolean;
-    /**
-    Connects the properties of two objects so that whenever the value of one property changes,
-    the other property will be changed also.
-    **/
-    class Binding {
-        constructor(toPath: string, fromPath: string);
-        connect(obj: any): Binding;
-        copy(): Binding;
-        disconnect(obj: any): Binding;
-        from(path: string): Binding;
-        static oneWay(from: string, flag?: boolean): Binding;
-        to(path: string): Binding;
-        to(pathTuple: any[]): Binding;
-        toString(): string;
-    }
-    class Button extends View implements TargetActionSupport {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        triggerAction(opts: {}): boolean;
-    }
-    /**
-    The internal class used to create text inputs when the {{input}} helper is used
-    with type of checkbox. See Handlebars.helpers.input for usage details.
-    **/
-    class Checkbox extends View {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-    }
-    /**
-    An Ember.View descendent responsible for managing a collection (an array or array-like object)
-    by maintaining a child view object and associated DOM representation for each item in the array
-    and ensuring that child views and their associated rendered HTML are updated when items in the
-    array are added, removed, or replaced.
-    **/
-    class CollectionView extends ContainerView {
-        arrayDidChange(content: any[], start: number, removed: number, added: number): void;
-        arrayWillChange(content: any[], start: number, removed: number): void;
-        createChildView(viewClass: {}, attrs?: {}): CollectionView;
-        destroy(): CollectionView;
-        init(): void;
-        static CONTAINER_MAP: {};
-        content: any[];
-        emptyView: View;
-        itemViewClass: View;
-    }
-    /**
-    Implements some standard methods for comparing objects. Add this mixin to any class
-    you create that can compare its instances.
-    **/
-    class Comparable {
-        compare(a: any, b: any): number;
-    }
-    /**
-    A view that is completely isolated. Property access in its templates go to the view object
-    and actions are targeted at the view object. There is no access to the surrounding context or
-    outer controller; all contextual information is passed in.
-    **/
-    class Component extends View {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        sendAction(action: string, context: any): void;
-        targetObject: Controller;
-    }
-    /**
-    A computed property transforms an objects function into a property.
-    By default the function backing the computed property will only be called once and the result
-    will be cached. You can specify various properties that your computed property is dependent on.
-    This will force the cached result to be recomputed if the dependencies are modified.
-    **/
-    class ComputedProperty {
-        cacheable(aFlag?: boolean): ComputedProperty;
-        get(keyName: string): any;
-        meta(meta: {}): ComputedProperty;
-        property(...args: string[]): ComputedProperty;
-        readOnly(): ComputedProperty;
-        set(keyName: string, newValue: any, oldValue: string): any;
-        // ReSharper disable UsingOfReservedWord
-        volatile(): ComputedProperty;
-        // ReSharper restore UsingOfReservedWord
-    }
-    class Container {
-        constructor(parent: Container);
-        parent: Container;
-        children: any[];
-        resolver: Function;
-        registry: {};
-        cache: {};
-        typeInjections: {};
-        injections: {};
-        child(): Container;
-        set(object: {}, key: string, value: any): void;
-        /**
-        registers a factory for later injection
-        @param fullName type:name (e.g., 'model:user')
-        @param factory (e.g., App.Person)
-        **/
-        register(fullName: string, factory: Function, options?: {}): void;
-        unregister(fullName: string): void;
-        resolve(fullName: string): Function;
-        describe(fullName: string): string;
-        normalize(fullName: string): string;
-        makeToString(factory: any, fullName: string): Function;
-        lookup(fullName: string, options?: {}): any;
-        lookupFactory(fullName: string): any;
-        has(fullName: string): boolean;
-        optionsForType(type: string, options: {}): void;
-        options(type: string, options: {}): void;
-        injection(factoryName: string, property: string, injectionName: string): void;
-        factoryInjection(factoryName: string, property: string, injectionName: string): void;
-        destroy(): void;
-        reset(): void;
-    }
-    /**
-    An Ember.View subclass that implements Ember.MutableArray allowing programatic
-    management of its child views.
-    **/
-    class ContainerView extends View {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-    }
-    class Controller extends Object implements ControllerMixin {
-        replaceRoute(name: string, ...args: any[]): void;
-        transitionToRoute(name: string, ...args: any[]): void;
-        controllers: {};
-        model: any;
-        needs: string[];
-        queryParams: any;
-        target: any;
-        send(name: string, ...args: any[]): void;
-        actions: ActionsHash;
-    }
-    /**
-    Additional methods for the ControllerMixin.
-    **/
-    class ControllerMixin extends ActionHandlerMixin {
-        replaceRoute(name: string, ...args: any[]): void;
-        transitionToRoute(name: string, ...args: any[]): void;
-        controllers: {};
-        model : any;
-        needs: string[];
-        queryParams: any;
-        target: any;
-    }
-    /**
-    Implements some standard methods for copying an object. Add this mixin to any object you
-    create that can create a copy of itself. This mixin is added automatically to the built-in array.
-    You should generally implement the copy() method to return a copy of the receiver.
-    Note that frozenCopy() will only work if you also implement Ember.Freezable.
-    **/
-    class Copyable {
-        copy(deep: boolean): Copyable;
-        frozenCopy(): Copyable;
-    }
-    class CoreObject {
-        /**
-        An overridable method called when objects are instantiated. By default,
-        does nothing unless it is overridden during class definition.
-        @method init
-        **/
-        init(): void;
-
-        /**
-        Defines the properties that will be concatenated from the superclass (instead of overridden).
-        @property concatenatedProperties
-        @type Array
-        @default null
-        **/
-        concatenatedProperties: any[];
-
-        /**
-        Destroyed object property flag. If this property is true the observers and bindings were
-        already removed by the effect of calling the destroy() method.
-        @property isDestroyed
-        @default false
-        **/
-        isDestroyed: boolean;
-        /**
-        Destruction scheduled flag. The destroy() method has been called. The object stays intact
-        until the end of the run loop at which point the isDestroyed flag is set.
-        @property isDestroying
-        @default false
-        **/
-        isDestroying: boolean;
-
-        /**
-        Destroys an object by setting the `isDestroyed` flag and removing its
-        metadata, which effectively destroys observers and bindings.
-        If you try to set a property on a destroyed object, an exception will be
-        raised.
-        Note that destruction is scheduled for the end of the run loop and does not
-        happen immediately.  It will set an isDestroying flag immediately.
-        @method destroy
-        @return {Ember.Object} receiver
-        */
-        destroy(): CoreObject;
-
-        /**
-        Override to implement teardown.
-        @method willDestroy
-        */
-        willDestroy(): void;
-
-        /**
-        Returns a string representation which attempts to provide more information than Javascript's toString
-        typically does, in a generic way for all Ember objects (e.g., "<App.Person:ember1024>").
-        @method toString
-        @return {String} string representation
-        **/
-        toString(): string;
-
-        static isClass: boolean;
-        static isMethod: boolean;
-
-        /**
-        Creates a new subclass.
-        @method extend
-        @static
-        @param {Object} [args] - Object containing values to use within the new class
-        **/
-        static extend<T>(args?: CoreObjectArguments): T;
-        /**
-        Creates a new subclass.
-        @method extend
-        @static
-        @param {Mixin} [mixins] - One or more Mixin classes
-        @param {Object} [args] - Object containing values to use within the new class
-        **/
-        static extend<T>(mixins?: Mixin, args?: CoreObjectArguments): T;
-
-        /**
-        Creates a new subclass.
-        @method extend
-        @param {Object} [args] - Object containing values to use within the new class
-        Non-static method because Ember classes aren't currently 'real' TypeScript classes.
-        **/
-        extend<T>(args ?: CoreObjectArguments): T;
-        /**
-        Creates a new subclass.
-        @method extend
-        @param {Mixin} [mixins] - One or more Mixin classes
-        @param {Object} [args] - Object containing values to use within the new class
-        Non-static method because Ember classes aren't currently 'real' TypeScript classes.
-        **/
-        extend<T>(mixins ? : Mixin, args ?: CoreObjectArguments): T;
-
-        /**
-        Equivalent to doing extend(arguments).create(). If possible use the normal create method instead.
-        @method createWithMixins
-        @static
-        @param [args]
-        **/
-        static createWithMixins<T extends {}>(args?: {}): T;
-
-        /**
-        Creates an instance of the class.
-        @method create
-        @static
-        @param [args] - A hash containing values with which to initialize the newly instantiated object.
-        **/
-        static create<T extends {}>(args?: {}): T;
-
-        /**
-        Augments a constructor's prototype with additional properties and functions.
-        To add functions and properties to the constructor itself, see reopenClass.
-        @method reopen
-        **/
-        static reopen<T extends {}>(args?: {}): T;
-
-        /**
-        Augments a constructor's own properties and functions.
-        To add functions and properties to instances of a constructor by extending the
-        constructor's prototype see reopen.
-        @method reopenClass
-        **/
-        static reopenClass<T extends {}>(args?: {}): T;
-
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-
-        /**
-        Returns the original hash that was passed to meta().
-        @method metaForProperty
-        @static
-        @param key {String} property name
-        **/
-        static metaForProperty(key: string): {};
-
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-
-        @method eachComputedProperty
-        @static
-        @param {Function} callback
-        @param {Object} binding
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-    }
-    /**
-    An abstract class that exists to give view-like behavior to both Ember's main view class Ember.View
-    and other classes like Ember._SimpleMetamorphView that don't need the fully functionaltiy of Ember.View.
-    Unless you have specific needs for CoreView, you will use Ember.View in your applications.
-    **/
-    class CoreView extends Object implements ActionHandlerMixin {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        send(name: string, ...args: any[]): void;
-        actions: ActionsHash;
-        parentView: CoreView;
-    }
-    class DAG {
-        add(name: string): any;
-        map(name: string, value: any): void;
-        addEdge(fromName: string, toName: string): void;
-        topsort(fn: Function): void;
-        addEdges(name: string, value: any, before: any, after: any): void;
-        names: any[];
-        vertices: {};
-    }
-    function DEFAULT_GETTER_FUNCTION(name: string): Function;
-    /**
-    The DefaultResolver defines the default lookup rules to resolve container lookups before consulting
-    the container for registered items:
-    templates are looked up on Ember.TEMPLATES
-    other names are looked up on the application after converting the name.
-    For example, controller:post looks up App.PostController by default.
-    **/
-    class DefaultResolver {
-        resolve(fullName: string): {};
-        namespace: Application;
-    }
-    class Deferred {
-        reject(value: any): void;
-        resolve(value: any): void;
-        then(resolve: Function, reject: Function): void;
-    }
-    class DeferredMixin extends Mixin {
-        reject(value: any): void;
-        resolve(value: any): void;
-        then(resolve: Function, reject: Function): void;
-    }
-    /**
-    Objects of this type can implement an interface to respond to requests to get and set.
-    The default implementation handles simple properties.
-    You generally won't need to create or subclass this directly.
-    **/
-    class Descriptor { }
-    var EMPTY_META: {}; // TODO: define interface
-    var ENV: {};
-    var EXTEND_PROTOTYPES: boolean;
-    /**
-    This is the object instance returned when you get the @each property on an array. It uses
-    the unknownProperty handler to automatically create EachArray instances for property names.
-    **/
-    class EachProxy extends Object {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        unknownProperty(keyName: string, value: any): any[];
-    }
-    /**
-    This mixin defines the common interface implemented by enumerable objects in Ember. Most of these
-    methods follow the standard Array iteration API defined up to JavaScript 1.8 (excluding language-specific
-    features that cannot be emulated in older versions of JavaScript).
-    This mixin is applied automatically to the Array class on page load, so you can use any of these methods
-    on simple arrays. If Array already implements one of these methods, the mixin will not override them.
-    **/
-    class Enumerable {
-        addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        any(callback: Function, target?: any): boolean;
-        anyBy(key: string, value?: string): boolean;
-        someProperty(key: string, value?: string): boolean;
-        compact(): any[];
-        contains(obj: any): boolean;
-        enumerableContentDidChange(start: number, removing: number, adding: number): any;
-        enumerableContentDidChange(start: number, removing: Enumerable, adding: number): any;
-        enumerableContentDidChange(start: number, removing: number, adding: Enumerable): any;
-        enumerableContentDidChange(start: number, removing: Enumerable, adding: Enumerable): any;
-        enumerableContentDidChange(removing: number, adding: number): any;
-        enumerableContentDidChange(removing: Enumerable, adding: number): any;
-        enumerableContentDidChange(removing: number, adding: Enumerable): any;
-        enumerableContentDidChange(removing: Enumerable, adding: Enumerable): any;
-        enumerableContentWillChange(removing: number, adding: number): Enumerable;
-        enumerableContentWillChange(removing: Enumerable, adding: number): Enumerable;
-        enumerableContentWillChange(removing: number, adding: Enumerable): Enumerable;
-        enumerableContentWillChange(removing: Enumerable, adding: Enumerable): Enumerable;
-        every(callback: Function, target?: any): boolean;
-        everyBy(key: string, value?: string): boolean;
-        everyProperty(key: string, value?: string): boolean;
-        filter(callback: Function, target: any): any[];
-        filterBy(key: string, value?: string): any[];
-        find(callback: Function, target: any): any;
-        findBy(key: string, value?: string): any;
-        forEach(callback: Function, target?: any): any;
-        getEach(key: string): any[];
-        invoke(methodName: string, ...args: any[]): any[];
-        map: ItemIndexEnumerableCallbackTarget;
-        mapBy(key: string): any[];
-        nextObject(index: number, previousObject: any, context: any): any;
-        reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
-        reject: ItemIndexEnumerableCallbackTarget;
-        rejectBy(key: string, value?: string): any[];
-        removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        setEach(key: string, value?: any): any;
-        some(callback: Function, target?: any): boolean;
-        toArray(): any[];
-        uniq(): Enumerable;
-        without(value: any): Enumerable;
-    '[]': any[];
-        firstObject: any;
-        hasEnumerableObservers: boolean;
-        lastObject: any;
-    }
-    var EnumerableUtils: {}; // TODO: define interface
-    /**
-    A subclass of the JavaScript Error object for use in Ember.
-    **/
-    // Restore this to 'typeof Error' when https://github.com/Microsoft/TypeScript/issues/983 is resolved
-    // ReSharper disable once DuplicatingLocalDeclaration
-    var Error: any; // typeof Error;
-    /**
-    Handles delegating browser events to their corresponding Ember.Views. For example, when you click on
-    a view, Ember.EventDispatcher ensures that that view's mouseDown method gets called.
-    **/
-    class EventDispatcher extends Object {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        events: {};
-    }
-    /**
-    This mixin allows for Ember objects to subscribe to and emit events.
-    You can also chain multiple event subscriptions.
-    **/
-    class Evented {
-        has(name: string): boolean;
-        off(name: string, target: any, method: Function): Evented;
-        on(name: string, target: any, method: Function): Evented;
-        one(name: string, target: any, method: Function): Evented;
-        trigger(name: string, ...args: string[]): void;
-    }
-    var FROZEN_ERROR: string;
-    class Freezable {
-        freeze(): Freezable;
-        isFrozen: boolean;
-    }
-    var GUID_KEY: string;
-    namespace Handlebars {
-        function compile(string: string): Function;
-        function get(root: any, path: string, options?: {}): any;
-        function helper(name: string, func: Function, dependentKeys?: string): void;
-        function helper(name: string, view: View, dependentKeys?: string): void;
-        class helpers {
-            action(actionName: string, context: any, options?: {}): void;
-            bindAttr(options?: {}): string;
-            connectOutlet(outletName: string, view: {}): void;
-            control(path: string, modelPath: string, options?: {}): string;
-            debugger(property: string): void;
-            disconnectOutlet(outletName: string): void;
-            each(name: string, path: string, options?: {}): void;
-            if(context: Function, options?: {}): string;
-            init(): void;
-            input(options?: {}): void;
-            linkTo(routeName: string, context: any, options?: {}): string;
-            loc(str: string): void;
-            log(property: string): void;
-            outlet(property: string): string;
-            partial(partialName: string): void;
-            render(name: string, context?: string, options?: {}): string;
-            textarea(options?: {}): void;
-            unbound(property: string): string;
-            unless(context: Function, options?: {}): string;
-            view(path: string, options?: {}): string;
-            with(context: Function, options?: {}): string;
-            yield(options?: {}): string;
-        }
-        function precompile(string: string): void;
-        function registerBoundHelper(name: string, func: Function, dependentKeys?: string): void;
-        class Compiler { }
-        class JavaScriptCompiler { }
-        function registerHelper(name: string, fn: Function, inverse?: boolean): void;
-        function registerPartial(name: string, str: any): void;
-        function K(): any;
-        function createFrame(objec: any): any;
-        function Exception(message: string): void;
-        class SafeString {
-            constructor(str: string);
-            static toString(): string;
-        }
-        function parse(string: string): any;
-        function print(ast: any): void;
-        var logger: typeof Ember.Logger;
-        function log(level: string, str: string): void;
-        function compile(environment: any, options?: any, context?: any, asObject?: any): any;
-    }
-    class HashLocation extends Object {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-    }
-    class HistoryLocation extends Object {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        rootURL: string;
-    }
-    var IS_BINDING: RegExp;
-    class Instrumentation {
-        getProperties(obj: any, list: any[]): {};
-        getProperties(obj: any, ...args: string[]): {};
-        instrument(name: string, payload: any, callback: Function, binding: any): void;
-        reset(): void;
-        subscribe(pattern: string, object: any): void;
-        unsubscribe(subscriber: any): void;
-    }
-    var K: Function;
-    var LOG_BINDINGS: boolean;
-    var LOG_STACKTRACE_ON_DEPRECATION: boolean;
-    var LOG_VERSION: boolean;
-    class LinkView extends View {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        init(): void;
-        active: any;
-        activeClass: string;
-        attributeBindings: any;
-        classNameBindings: string[];
-        disabled: any;
-        disabledClass: string;
-        eventName: string;
-        href: any;
-        loading: any;
-        loadingClass: string;
-        loadingHref: string;
-        rel: any;
-        replace: boolean;
-        title: any;
-        click: Function;
-    }
-    class Location {
-        create(options?: {}): any;
-        registerImplementation(name: string, implementation: any): void;
-    }
-    var Logger: {
-        assert(param: any): void;
-        debug(...args: any[]): void;
-        error(...args: any[]): void;
-        info(...args: any[]): void;
-        log(...args: any[]): void;
-        warn(...args: any[]): void;
-    };
-    function MANDATORY_SETTER_FUNCTION(value: string): void;
-    var META_KEY: string;
-    class Map {
-        copy(): Map;
-        static create(): Map;
-        forEach(callback: Function, self: any): void;
-        get(key: any): any;
-        has(key: any): boolean;
-        remove(key: any): boolean;
-        set(key: any, value: any): void;
-        length: number;
-    }
-    class MapWithDefault extends Map {
-        copy(): MapWithDefault;
-        static create(): MapWithDefault;
-    }
-    class Mixin {
-        apply(obj: any): any;
-        /**
-        Creates an instance of the class.
-        @param arguments A hash containing values with which to initialize the newly instantiated object.
-        **/
-        static create<T extends Mixin>(...args: CoreObjectArguments[]): T;
-        detect(obj: any): boolean;
-        reopen<T extends Mixin>(args?: {}): T;
-    }
-    class MutableArray implements Array, MutableEnumberable {
-        addArrayObserver(target: any, opts?: EnumerableConfigurationOptions): any[];
-        addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        any(callback: Function, target?: any): boolean;
-        anyBy(key: string, value?: string): boolean;
-        arrayContentDidChange(startIdx: number, removeAmt: number, addAmt: number): any[];
-        arrayContentWillChange(startIdx: number, removeAmt: number, addAmt: number): any[];
-        someProperty(key: string, value?: string): boolean;
-        clear(): any[];
-        compact(): any[];
-        contains(obj: any): boolean;
-        enumerableContentDidChange(start: number, removing: number, adding: number): any;
-        enumerableContentDidChange(start: number, removing: Enumerable, adding: number): any;
-        enumerableContentDidChange(start: number, removing: number, adding: Enumerable): any;
-        enumerableContentDidChange(start: number, removing: Enumerable, adding: Enumerable): any;
-        enumerableContentDidChange(removing: number, adding: number): any;
-        enumerableContentDidChange(removing: Enumerable, adding: number): any;
-        enumerableContentDidChange(removing: number, adding: Enumerable): any;
-        enumerableContentDidChange(removing: Enumerable, adding: Enumerable): any;
-        enumerableContentWillChange(removing: number, adding: number): Enumerable;
-        enumerableContentWillChange(removing: Enumerable, adding: number): Enumerable;
-        enumerableContentWillChange(removing: number, adding: Enumerable): Enumerable;
-        enumerableContentWillChange(removing: Enumerable, adding: Enumerable): Enumerable;
-        every(callback: Function, target?: any): boolean;
-        everyBy(key: string, value?: string): boolean;
-        everyProperty(key: string, value?: string): boolean;
-        filter(callback: Function, target: any): any[];
-        filterBy(key: string, value?: string): any[];
-        find(callback: Function, target: any): any;
-        findBy(key: string, value?: string): any;
-        forEach(callback: Function, target?: any): any;
-        getEach(key: string): any[];
-        indexOf(object: any, startAt: number): number;
-        insertAt(idx: number, object: any): any[];
-        invoke(methodName: string, ...args: any[]): any[];
-        lastIndexOf(object: any, startAt: number): number;
-        map: ItemIndexEnumerableCallbackTarget;
-        mapBy(key: string): any[];
-        nextObject(index: number, previousObject: any, context: any): any;
-        objectAt(idx: number): any;
-        objectsAt(...args: number[]): any[];
-        popObject(): any;
-        pushObject(obj: any): any;
-        pushObjects(...args: any[]): any[];
-        reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
-        reject: ItemIndexEnumerableCallbackTarget;
-        rejectBy(key: string, value?: string): any[];
-        removeArrayObserver(target: any, opts: EnumerableConfigurationOptions): any[];
-        removeAt(start: number, len: number): any;
-        removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        replace(idx: number, amt: number, objects: any[]): any;
-        reverseObjects(): any[];
-        setEach(key: string, value?: any): any;
-        setObjects(objects: any[]): any[];
-        shiftObject(): any;
-        slice(beginIndex?: number, endIndex?: number): any[];
-        some(callback: Function, target?: any): boolean;
-        toArray(): any[];
-        uniq(): Enumerable;
-        unshiftObject(object: any): any;
-        unshiftObjects(objects: any[]): any[];
-        without(value: any): Enumerable;
-        '[]': any[];
-        '@each': EachProxy;
-        Boolean: boolean;
-        firstObject: any;
-        hasEnumerableObservers: boolean;
-        lastObject: any;
-        length: number;
-        addObject(object: any): any;
-        addObjects(objects: Enumerable): MutableEnumberable;
-        removeObject(object: any): any;
-        removeObjects(objects: Enumerable): MutableEnumberable;
-    }
-    class MutableEnumberable implements Enumerable {
-        addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        addObject(object: any): any;
-        addObjects(objects: Enumerable): MutableEnumberable;
-        any(callback: Function, target?: any): boolean;
-        anyBy(key: string, value?: string): boolean;
-        someProperty(key: string, value?: string): boolean;
-        compact(): any[];
-        contains(obj: any): boolean;
-        enumerableContentDidChange(start: number, removing: number, adding: number): any;
-        enumerableContentDidChange(start: number, removing: Enumerable, adding: number): any;
-        enumerableContentDidChange(start: number, removing: number, adding: Enumerable): any;
-        enumerableContentDidChange(start: number, removing: Enumerable, adding: Enumerable): any;
-        enumerableContentDidChange(removing: number, adding: number): any;
-        enumerableContentDidChange(removing: Enumerable, adding: number): any;
-        enumerableContentDidChange(removing: number, adding: Enumerable): any;
-        enumerableContentDidChange(removing: Enumerable, adding: Enumerable): any;
-        enumerableContentWillChange(removing: number, adding: number): Enumerable;
-        enumerableContentWillChange(removing: Enumerable, adding: number): Enumerable;
-        enumerableContentWillChange(removing: number, adding: Enumerable): Enumerable;
-        enumerableContentWillChange(removing: Enumerable, adding: Enumerable): Enumerable;
-        every(callback: Function, target?: any): boolean;
-        everyBy(key: string, value?: string): boolean;
-        everyProperty(key: string, value?: string): boolean;
-        filter(callback: Function, target: any): any[];
-        filterBy(key: string, value?: string): any[];
-        find(callback: Function, target: any): any;
-        findBy(key: string, value?: string): any;
-        forEach(callback: Function, target?: any): any;
-        getEach(key: string): any[];
-        invoke(methodName: string, ...args: any[]): any[];
-        map: ItemIndexEnumerableCallbackTarget;
-        mapBy(key: string): any[];
-        nextObject(index: number, previousObject: any, context: any): any;
-        reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
-        reject: ItemIndexEnumerableCallbackTarget;
-        rejectBy(key: string, value?: string): any[];
-        removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        removeObject(object: any): any;
-        removeObjects(objects: Enumerable): MutableEnumberable;
-        setEach(key: string, value?: any): any;
-        some(callback: Function, target?: any): boolean;
-        toArray(): any[];
-        uniq(): Enumerable;
-        without(value: any): Enumerable;
-    '[]': any[];
-        firstObject: any;
-        hasEnumerableObservers: boolean;
-        lastObject: any;
-    }
-    var NAME_KEY: string;
-    class Namespace extends Object {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-    }
-    class NativeArray implements MutableArray, Observable, Copyable {
-        constructor(arr: any[]);
-        static activate(): void;
-        addArrayObserver(target: any, opts?: EnumerableConfigurationOptions): any[];
-        addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        any(callback: Function, target?: any): boolean;
-        anyBy(key: string, value?: string): boolean;
-        arrayContentDidChange(startIdx: number, removeAmt: number, addAmt: number): any[];
-        arrayContentWillChange(startIdx: number, removeAmt: number, addAmt: number): any[];
-        someProperty(key: string, value?: any): boolean;
-        clear(): any[];
-        compact(): any[];
-        contains(obj: any): boolean;
-        enumerableContentDidChange(start: number, removing: number, adding: number): any;
-        enumerableContentDidChange(start: number, removing: Enumerable, adding: number): any;
-        enumerableContentDidChange(start: number, removing: number, adding: Enumerable): any;
-        enumerableContentDidChange(start: number, removing: Enumerable, adding: Enumerable): any;
-        enumerableContentDidChange(removing: number, adding: number): any;
-        enumerableContentDidChange(removing: Enumerable, adding: number): any;
-        enumerableContentDidChange(removing: number, adding: Enumerable): any;
-        enumerableContentDidChange(removing: Enumerable, adding: Enumerable): any;
-        enumerableContentWillChange(removing: number, adding: number): Enumerable;
-        enumerableContentWillChange(removing: Enumerable, adding: number): Enumerable;
-        enumerableContentWillChange(removing: number, adding: Enumerable): Enumerable;
-        enumerableContentWillChange(removing: Enumerable, adding: Enumerable): Enumerable;
-        every(callback: Function, target?: any): boolean;
-        everyBy(key: string, value?: string): boolean;
-        everyProperty(key: string, value?: any): boolean;
-        filter(callback: Function, target: any): any[];
-        filterBy(key: string, value?: string): any[];
-        find(callback: Function, target: any): any;
-        findBy(key: string, value?: string): any;
-        forEach(callback: Function, target?: any): any;
-        getEach(key: string): any[];
-        indexOf(object: any, startAt: number): number;
-        insertAt(idx: number, object: any): any[];
-        invoke(methodName: string, ...args: any[]): any[];
-        lastIndexOf(object: any, startAt: number): number;
-        map: ItemIndexEnumerableCallbackTarget;
-        mapBy(key: string): any[];
-        nextObject(index: number, previousObject: any, context: any): any;
-        objectAt(idx: number): any;
-        objectsAt(...args: number[]): any[];
-        popObject(): any;
-        pushObject(obj: any): any;
-        pushObjects(...args: any[]): any[];
-        reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
-        reject: ItemIndexEnumerableCallbackTarget;
-        rejectBy(key: string, value?: string): any[];
-        removeArrayObserver(target: any, opts: EnumerableConfigurationOptions): any[];
-        removeAt(start: number, len: number): any;
-        removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        replace(idx: number, amt: number, objects: any[]): any;
-        reverseObjects(): any[];
-        setEach(key: string, value?: any): any;
-        setObjects(objects: any[]): any[];
-        shiftObject(): any;
-        slice(beginIndex?: number, endIndex?: number): any[];
-        some(callback: Function, target?: any): boolean;
-        toArray(): any[];
-        uniq(): Enumerable;
-        unshiftObject(object: any): any;
-        unshiftObjects(objects: any[]): any[];
-        without(value: any): Enumerable;
-        '[]': any[];
-        '@each': EachProxy;
-        Boolean: boolean;
-        firstObject: any;
-        hasEnumerableObservers: boolean;
-        lastObject: any;
-        length: number;
-        addObject(object: any): any;
-        addObjects(objects: Enumerable): MutableEnumberable;
-        removeObject(object: any): any;
-        removeObjects(objects: Enumerable): MutableEnumberable;
-        addObserver: ModifyObserver;
-        beginPropertyChanges(): Observable;
-        cacheFor(keyName: string): any;
-        decrementProperty(keyName: string, decrement?: number): number;
-        endPropertyChanges(): Observable;
-        get(keyName: string): any;
-        getProperties(...args: string[]): {};
-        getProperties(keys: string[]): {};
-        getWithDefault(keyName: string, defaultValue: any): any;
-        hasObserverFor(key: string): boolean;
-        incrementProperty(keyName: string, increment?: number): number;
-        notifyPropertyChange(keyName: string): Observable;
-        propertyDidChange(keyName: string): Observable;
-        propertyWillChange(keyName: string): Observable;
-        removeObserver(key: string, target: any, method: string): void;
-        removeObserver(key: string, target: any, method: Function): void;
-        set(keyName: string, value: any): Observable;
-        setProperties(hash: {}): Observable;
-        toggleProperty(keyName: string): any;
-        copy(deep: boolean): Copyable;
-        frozenCopy(): Copyable;
-    }
-    class NoneLocation extends Object {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-    }
-    var ORDER_DEFINITION: string[];
-    class Object extends CoreObject implements Observable {
-        addObserver: ModifyObserver;
-        beginPropertyChanges(): Observable;
-        cacheFor(keyName: string): any;
-        decrementProperty(keyName: string, decrement?: number): number;
-        endPropertyChanges(): Observable;
-
-        /**
-         * Retrieves the value of a property from the object
-         * @param keyName
-         * @returns {}
-         */
-        get(keyName: string): any;
-
-        /**
-         * Retrieves the value of a property from the object
-         * @param keyName
-         * @returns {}
-         */
-        get<T>(keyName: string): T;
-
-        getProperties(...args: string[]): {};
-        getProperties(keys: string[]): {};
-        getWithDefault(keyName: string, defaultValue: any): any;
-        hasObserverFor(key: string): boolean;
-        incrementProperty(keyName: string, increment?: number): number;
-        notifyPropertyChange(keyName: string): Observable;
-        propertyDidChange(keyName: string): Observable;
-        propertyWillChange(keyName: string): Observable;
-        removeObserver(key: string, target: any, method: string): Observable;
-        removeObserver(key: string, target: any, method: Function): Observable;
-        set(keyName: string, value: any): Observable;
-        setProperties(hash: {}): Observable;
-        toggleProperty(keyName: string): any;
-    }
-    class ObjectController extends ObjectProxy implements ControllerMixin {
-        replaceRoute(name: string, ...args: any[]): void;
-        transitionToRoute(name: string, ...args: any[]): void;
-        controllers: Object;
-        needs: string[];
-        target: any;
-        model: any;
-        queryParams: any;
-        send(name: string, ...args: any[]): void;
-        actions: {};
-    }
-    class ObjectProxy extends Object {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        /**
-        The object whose properties will be forwarded.
-        **/
-        content: Object;
-    }
-    class Observable {
-        addObserver: ModifyObserver;
-        beginPropertyChanges(): Observable;
-        cacheFor(keyName: string): any;
-        decrementProperty(keyName: string, decrement?: number): number;
-        endPropertyChanges(): Observable;
-        get(keyName: string): any;
-        getProperties(...args: string[]): {};
-        getProperties(keys: string[]): {};
-        getWithDefault(keyName: string, defaultValue: any): any;
-        hasObserverFor(key: string): boolean;
-        incrementProperty(keyName: string, increment?: number): number;
-        notifyPropertyChange(keyName: string): Observable;
-        propertyDidChange(keyName: string): Observable;
-        propertyWillChange(keyName: string): Observable;
-        removeObserver(key: string, target: {}, method: string): void;
-        removeObserver(key: string, target: {}, method: Function): void;
-        set(keyName: string, value: any): Observable;
-        setProperties(hash: {}): Observable;
-        /**
-        Set the value of a boolean property to the opposite of its current value.
-        */
-        toggleProperty(keyName: string): boolean;
-    }
-    class OrderedSet {
-        add(obj: any): void;
-        clear(): void;
-        copy(): OrderedSet;
-        static create(): OrderedSet;
-        forEach(fn: Function, self: any): void;
-        has(obj: any): boolean;
-        isEmpty(): boolean;
-        remove(obj: any): void;
-        toArray(): any[];
-    }
-
-    // FYI - RSVP source comes from https://github.com/tildeio/rsvp.js/blob/master/lib/rsvp/promise.js
-    namespace RSVP {
-        interface PromiseResolve {
-            (value?: any): void;
-        }
-        interface PromiseReject {
-            (reason?: any): void;
-        }
-        interface PromiseResolverFunction {
-            (resolve: PromiseResolve, reject: PromiseReject): void;
-        }
-
-        class Promise {
-
-            /**
-              Promise objects represent the eventual result of an asynchronous operation. The
-              primary way of interacting with a promise is through its `then` method, which
-              registers callbacks to receive either a promise's eventual value or the reason
-              why the promise cannot be fulfilled.
-              @class RSVP.Promise
-              @param {function} resolver
-              @param {String} label optional string for labeling the promise.
-              Useful for tooling.
-              @constructor
-            */
-            constructor(resolver: PromiseResolverFunction, label?: string);
-
-            /**
-              The primary way of interacting with a promise is through its `then` method,
-              which registers callbacks to receive either a promise's eventual value or the
-              reason why the promise cannot be fulfilled.
-              @method then
-              @param {Function} onFulfilled
-              @param {Function} onRejected
-              @param {String} label optional string for labeling the promise.
-              Useful for tooling.
-              @return {Promise}
-            */
-            then(onFulfilled?: Function, onRejected?: Function): Promise;
-
-            /**
-            `catch` is simply sugar for `then(undefined, onRejection)` which makes it the same
-            as the catch block of a try/catch statement.
-
-            @method catch
-            @param {Function} onRejection
-            @param {String} label optional string for labeling the promise.
-            Useful for tooling.
-            @return {Promise}
-            */
-            catch(onRejection: Function, label?: string): Promise;
-
-            /**
-            `finally` will be invoked regardless of the promise's fate just as native
-            try/catch/finally behaves
-
-            @method finally
-            @param {Function} callback
-            @param {String} label optional string for labeling the promise.
-            Useful for tooling.
-            @return {Promise}
-            */
-            finally(callback: Function, label?: string): Promise;
-        }
-    }
-    class RenderBuffer {
-        addClass(className: string): RenderBuffer;
-        attr(name: string, value: any): any;
-        element(): HTMLElement;
-        id(id: string): RenderBuffer;
-        prop(name: string, value: string): any;
-        push(string: string): RenderBuffer;
-        removeAttr(name: string): RenderBuffer;
-        removeProp(name: string): RenderBuffer;
-        string(): string;
-        style(name: string, value: string): RenderBuffer;
-        classes: any[];
-        elementAttributes: {};
-        elementId: string;
-        elementProperties: {};
-        elementStyle: {};
-        elementTag: string;
-        parentBuffer: RenderBuffer;
-    }
-
-    /**
-      The `Ember.Route` class is used to define individual routes. Refer to
-      the [routing guide](http://emberjs.com/guides/routing/) for documentation.
-    */
-    class Route extends Object implements ActionHandlerMixin, Evented {
-
-        static isClass: boolean;
-        static isMethod: boolean;
-
-        /**
-        This hook is executed when the router enters the route. It is not executed
-        when the model for the route changes.
-        @method activate
-        */
-        activate: Function;
-
-        /**
-        This hook is called after this route's model has resolved.
-        It follows identical async/promise semantics to `beforeModel`
-        but is provided the route's resolved model in addition to
-        the `transition`, and is therefore suited to performing
-        logic that can only take place after the model has already
-        resolved.
-
-        Refer to documentation for `beforeModel` for a description
-        of transition-pausing semantics when a promise is returned
-        from this hook.
-        @method afterModel
-        @param {Object} resolvedModel the value returned from `model`,
-            or its resolved value if it was a promise
-        @param {Transition} transition
-        @return {Promise} if the value returned from this hook is
-            a promise, the transition will pause until the transition
-            resolves. Otherwise, non-promise return values are not
-            utilized in any way.
-        */
-        afterModel(resolvedModel: any, transition: EmberStates.Transition): RSVP.Promise;
-
-        /**
-        This hook is the first of the route entry validation hooks
-        called when an attempt is made to transition into a route
-        or one of its children. It is called before `model` and
-        `afterModel`, and is appropriate for cases when:
-        1) A decision can be made to redirect elsewhere without
-            needing to resolve the model first.
-        2) Any async operations need to occur first before the
-            model is attempted to be resolved.
-        This hook is provided the current `transition` attempt
-        as a parameter, which can be used to `.abort()` the transition,
-        save it for a later `.retry()`, or retrieve values set
-        on it from a previous hook. You can also just call
-        `this.transitionTo` to another route to implicitly
-        abort the `transition`.
-        You can return a promise from this hook to pause the
-        transition until the promise resolves (or rejects). This could
-        be useful, for instance, for retrieving async code from
-        the server that is required to enter a route.
-
-        @method beforeModel
-        @param {Transition} transition
-        @return {Promise} if the value returned from this hook is
-            a promise, the transition will pause until the transition
-            resolves. Otherwise, non-promise return values are not
-            utilized in any way.
-        */
-        beforeModel(transition: EmberStates.Transition): RSVP.Promise;
-
-        /**
-        The controller associated with this route.
-
-        @property controller
-        @type Ember.Controller
-        @since 1.6.0
-        */
-        controller: Controller;
-
-        /**
-        Returns the controller for a particular route or name.
-        The controller instance must already have been created, either through entering the
-        associated route or using `generateController`.
-
-        @method controllerFor
-        @param {String} name the name of the route or controller
-        @return {Ember.Controller}
-        */
-        controllerFor(name: string): Controller;
-
-        /**
-        The name of the controller to associate with this route.
-        By default, Ember will lookup a route's controller that matches the name
-        of the route (i.e. `App.PostController` for `App.PostRoute`). However,
-        if you would like to define a specific controller to use, you can do so
-        using this property.
-        This is useful in many ways, as the controller specified will be:
-        * passed to the `setupController` method.
-        * used as the controller for the view being rendered by the route.
-        * returned from a call to `controllerFor` for the route.
-        @property controllerName
-        @type String
-        @default null
-        @since 1.4.0
-        */
-        controllerName: string;
-
-        /**
-        This hook is executed when the router completely exits this route. It is
-        not executed when the model for the route changes.
-        @method deactivate
-        */
-        deactivate: Function;
-
-        /**
-        Deserializes value of the query parameter based on defaultValueType
-        @method deserializeQueryParam
-        @param {Object} value
-        @param {String} urlKey
-        @param {String} defaultValueType
-        */
-        deserializeQueryParam(value: any, urlKey: string, defaultValueType: string): any;
-
-        /**
-        Disconnects a view that has been rendered into an outlet.
-        You may pass any or all of the following options to `disconnectOutlet`:
-        * `outlet`: the name of the outlet to clear (default: 'main')
-        * `parentView`: the name of the view containing the outlet to clear
-            (default: the view rendered by the parent route)
-
-        @method disconnectOutlet
-        @param {Object|String} options the options hash or outlet name
-        */
-        disconnectOutlet(options: DisconnectOutletOptions|string): void;
-
-        /**
-        @method findModel
-        @param {String} type the model type
-        @param {Object} value the value passed to find
-        */
-        findModel(type: string, value: any): any;
-
-        /**
-        Generates a controller for a route.
-        If the optional model is passed then the controller type is determined automatically,
-        e.g., an ArrayController for arrays.
-
-        @method generateController
-        @param {String} name the name of the controller
-        @param {Object} model the model to infer the type of the controller (optional)
-        */
-        generateController(name: string, model: {}): Controller;
-
-        /**
-        Perform a synchronous transition into another route without attempting
-        to resolve promises, update the URL, or abort any currently active
-        asynchronous transitions (i.e. regular transitions caused by
-        `transitionTo` or URL changes).
-        This method is handy for performing intermediate transitions on the
-        way to a final destination route, and is called internally by the
-        default implementations of the `error` and `loading` handlers.
-        @method intermediateTransitionTo
-        @param {String} name the name of the route
-        @param {...Object} models the model(s) to be used while transitioning
-        to the route.
-        @since 1.2.0
-        */
-        intermediateTransitionTo(name: string, ...models: any[]): void;
-
-        /**
-        A hook you can implement to convert the URL into the model for
-        this route.
-
-        @method model
-        @param {Object} params the parameters extracted from the URL
-        @param {Transition} transition
-        @return {Object|Promise} the model for this route. If
-            a promise is returned, the transition will pause until
-            the promise resolves, and the resolved value of the promise
-            will be used as the model for this route.
-        */
-        model(params: {}, transition: EmberStates.Transition): any|RSVP.Promise;
-
-        /**
-        Returns the model of a parent (or any ancestor) route
-        in a route hierarchy.  During a transition, all routes
-        must resolve a model object, and if a route
-        needs access to a parent route's model in order to
-        resolve a model (or just reuse the model from a parent),
-        it can call `this.modelFor(theNameOfParentRoute)` to
-        retrieve it.
-
-        @method modelFor
-        @param {String} name the name of the route
-        @return {Object} the model object
-        */
-        modelFor(name: string): {};
-
-        /**
-        Retrieves parameters, for current route using the state.params
-        variable and getQueryParamsFor, using the supplied routeName.
-        @method paramsFor
-        @param {String} name
-        */
-        paramsFor(name: string) : any;
-
-        /**
-        Configuration hash for this route's queryParams.
-        @property queryParams
-        @for Ember.Route
-        @type Hash
-        */
-        queryParams: {};
-
-        /**
-        Refresh the model on this route and any child routes, firing the
-        `beforeModel`, `model`, and `afterModel` hooks in a similar fashion
-        to how routes are entered when transitioning in from other route.
-        The current route params (e.g. `article_id`) will be passed in
-        to the respective model hooks, and if a different model is returned,
-        `setupController` and associated route hooks will re-fire as well.
-        An example usage of this method is re-querying the server for the
-        latest information using the same parameters as when the route
-        was first entered.
-        Note that this will cause `model` hooks to fire even on routes
-        that were provided a model object when the route was initially
-        entered.
-        @method refresh
-        @return {Transition} the transition object associated with this
-            attempted transition
-        @since 1.4.0
-        */
-        redirect(): EmberStates.Transition;
-
-
-        /**
-        Refresh the model on this route and any child routes, firing the
-        `beforeModel`, `model`, and `afterModel` hooks in a similar fashion
-        to how routes are entered when transitioning in from other route.
-        The current route params (e.g. `article_id`) will be passed in
-        to the respective model hooks, and if a different model is returned,
-        `setupController` and associated route hooks will re-fire as well.
-        An example usage of this method is re-querying the server for the
-        latest information using the same parameters as when the route
-        was first entered.
-        Note that this will cause `model` hooks to fire even on routes
-        that were provided a model object when the route was initially
-        entered.
-        @method refresh
-        @return {Transition} the transition object associated with this
-            attempted transition
-        @since 1.4.0
-        */
-        refresh(): EmberStates.Transition;
-
-        /**
-        `render` is used to render a template into a region of another template
-        (indicated by an `{{outlet}}`). `render` is used both during the entry
-        phase of routing (via the `renderTemplate` hook) and later in response to
-        user interaction.
-
-        @method render
-        @param {String} name the name of the template to render
-        @param {Object} [options] the options
-        @param {String} [options.into] the template to render into,
-                        referenced by name. Defaults to the parent template
-        @param {String} [options.outlet] the outlet inside `options.template` to render into.
-                        Defaults to 'main'
-        @param {String|Object} [options.controller] the controller to use for this template,
-                        referenced by name or as a controller instance. Defaults to the Route's paired controller
-        @param {Object} [options.model] the model object to set on `options.controller`.
-                        Defaults to the return value of the Route's model hook
-        */
-        render(name: string, options?: RenderOptions): void;
-
-        /**
-        A hook you can use to render the template for the current route.
-        This method is called with the controller for the current route and the
-        model supplied by the `model` hook. By default, it renders the route's
-        template, configured with the controller for the route.
-        This method can be overridden to set up and render additional or
-        alternative templates.
-
-        @method renderTemplate
-        @param {Object} controller the route's controller
-        @param {Object} model the route's model
-        */
-        renderTemplate(controller: Controller, model: {}): void;
-
-        /**
-        Transition into another route while replacing the current URL, if possible.
-        This will replace the current history entry instead of adding a new one.
-        Beside that, it is identical to `transitionTo` in all other respects. See
-        'transitionTo' for additional information regarding multiple models.
-
-        @method replaceWith
-        @param {String} name the name of the route or a URL
-        @param {...Object} models the model(s) or identifier(s) to be used while
-            transitioning to the route.
-        @return {Transition} the transition object associated with this
-            attempted transition
-        */
-        replaceWith(name: string, ...models: any[]): void;
-
-        /**
-        A hook you can use to reset controller values either when the model
-        changes or the route is exiting.
-
-        @method resetController
-        @param {Controller} controller instance
-        @param {Boolean} isExiting
-        @param {Object} transition
-        @since 1.7.0
-        */
-        resetController(controller: Ember.Controller, isExiting: boolean, transition: any): void;
-
-        /**
-        A hook you can implement to convert the route's model into parameters
-        for the URL.
-
-        The default `serialize` method will insert the model's `id` into the
-        route's dynamic segment (in this case, `:post_id`) if the segment contains '_id'.
-        If the route has multiple dynamic segments or does not contain '_id', `serialize`
-        will return `Ember.getProperties(model, params)`
-        This method is called when `transitionTo` is called with a context
-        in order to populate the URL.
-        @method serialize
-        @param {Object} model the route's model
-        @param {Array} params an Array of parameter names for the current
-            route (in the example, `['post_id']`.
-        @return {Object} the serialized parameters
-        */
-        serialize(model: {}, params: string[]): string;
-
-        /**
-        Serializes value of the query parameter based on defaultValueType
-        @method serializeQueryParam
-        @param {Object} value
-        @param {String} urlKey
-        @param {String} defaultValueType
-        */
-        serializeQueryParam(value: any, urlKey: string, defaultValueType: string): string;
-
-        /**
-        Serializes the query parameter key
-        @method serializeQueryParamKey
-        @param {String} controllerPropertyName
-        */
-        serializeQueryParamKey(controllerPropertyName: string): string;
-
-        /**
-        A hook you can use to setup the controller for the current route.
-        This method is called with the controller for the current route and the
-        model supplied by the `model` hook.
-        By default, the `setupController` hook sets the `model` property of
-        the controller to the `model`.
-        If you implement the `setupController` hook in your Route, it will
-        prevent this default behavior. If you want to preserve that behavior
-        when implementing your `setupController` function, make sure to call
-        `_super`
-        @method setupController
-        @param {Controller} controller instance
-        @param {Object} model
-        */
-        setupController(controller: Controller, model: {}): void;
-
-        /**
-        Store property provides a hook for data persistence libraries to inject themselves.
-        By default, this store property provides the exact same functionality previously
-        in the model hook.
-        Currently, the required interface is:
-        `store.find(modelName, findArguments)`
-        @method store
-        @param {Object} store
-        */
-        store(store: any): any;
-
-        /**
-        The name of the template to use by default when rendering this routes
-        template.
-        This is similar with `viewName`, but is useful when you just want a custom
-        template without a view.
-
-        @property templateName
-        @type String
-        @default null
-        @since 1.4.0
-        */
-        templateName: string;
-
-        /**
-        Transition the application into another route. The route may
-        be either a single route or route path
-
-        @method transitionTo
-        @param {String} name the name of the route or a URL
-        @param {...Object} models the model(s) or identifier(s) to be used while
-        transitioning to the route.
-        @param {Object} [options] optional hash with a queryParams property
-        containing a mapping of query parameters
-        @return {Transition} the transition object associated with this
-        attempted transition
-        */
-        transitionTo(name: string, ...object: any[]): EmberStates.Transition;
-
-        /**
-        The name of the view to use by default when rendering this routes template.
-        When rendering a template, the route will, by default, determine the
-        template and view to use from the name of the route itself. If you need to
-        define a specific view, set this property.
-        This is useful when multiple routes would benefit from using the same view
-        because it doesn't require a custom `renderTemplate` method.
-        @property viewName
-        @type String
-        @default null
-        @since 1.4.0
-        */
-        viewName: string;
-
-        // ActionHandlerMixin methods
-
-        /**
-        Sends an action to the router, which will delegate it to the currently
-        active route hierarchy per the bubbling rules explained under actions
-
-        @method send
-        @param {String} actionName The action to trigger
-        @param {*} context a context to send with the action
-        */
-        send(name: string, ...args: any[]): void;
-
-        /**
-        The collection of functions, keyed by name, available on this
-        `ActionHandler` as action targets.
-        These functions will be invoked when a matching `{{action}}` is triggered
-        from within a template and the application's current route is this route.
-        Actions can also be invoked from other parts of your application
-        via `ActionHandler#send`.
-        The `actions` hash will inherit action handlers from
-        the `actions` hash defined on extended parent classes
-        or mixins rather than just replace the entire hash.
-
-        Within a Controller, Route, View or Component's action handler,
-        the value of the `this` context is the Controller, Route, View or
-        Component object:
-
-        It is also possible to call `this._super.apply(this, arguments)` from within an
-        action handler if it overrides a handler defined on a parent
-        class or mixin.
-
-        ## Bubbling
-        By default, an action will stop bubbling once a handler defined
-        on the `actions` hash handles it. To continue bubbling the action,
-        you must return `true` from the handler
-
-        @property actions
-        @type Hash
-        @default null
-        */
-        actions: ActionsHash;
-
-        // Evented methods
-
-        /**
-        Subscribes to a named event with given function.
-
-        An optional target can be passed in as the 2nd argument that will
-        be set as the "this" for the callback. This is a good way to give your
-        function access to the object triggering the event. When the target
-        parameter is used the callback becomes the third argument.
-
-        @method on
-        @param {String} name The name of the event
-        @param {Object} [target] The "this" binding for the callback
-        @param {Function} method The callback to execute
-        @return this
-        */
-        on(name: string, target: any, method: Function): Evented;
-
-        /**
-        Subscribes a function to a named event and then cancels the subscription
-        after the first time the event is triggered. It is good to use ``one`` when
-        you only care about the first time an event has taken place.
-        This function takes an optional 2nd argument that will become the "this"
-        value for the callback. If this argument is passed then the 3rd argument
-        becomes the function.
-
-        @method one
-        @param {String} name The name of the event
-        @param {Object} [target] The "this" binding for the callback
-        @param {Function} method The callback to execute
-        @return this
-        */
-        one(name: string, target: any, method: Function): Evented;
-
-        /**
-        Triggers a named event for the object. Any additional arguments
-        will be passed as parameters to the functions that are subscribed to the
-        event.
-
-        @method trigger
-        @param {String} name The name of the event
-        @param {Object...} args Optional arguments to pass on
-        */
-        trigger(name: string, ...args: string[]): void;
-
-        /**
-        Cancels subscription for given name, target, and method.
-
-        @method off
-        @param {String} name The name of the event
-        @param {Object} target The target of the subscription
-        @param {Function} method The function of the subscription
-        @return this
-        */
-        off(name: string, target:any , method: Function): Evented;
-
-        /**
-        Checks to see if object has any subscriptions for named event.
-
-        @method has
-        @param {String} name The name of the event
-        @return {Boolean} does the object have a subscription for event
-        */
-        has(name: string): boolean;
-    }
-
-    class Router extends Object {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        map(callback: Function): Router;
-    }
-    class RouterDSL {
-        resource(name: string, options?: {}, callback?: Function): void;
-        resource(name: string, callback: Function): void;
-        route(name: string, options?: {}): void;
-    }
-    var SHIM_ES5: boolean;
-    var STRINGS: boolean;
-    class Select extends View {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        content: any[];
-        groupView: View;
-        multiple: boolean;
-        optionGroupPath: string;
-        optionLabelPath: string;
-        optionValuePath: string;
-        optionView: View;
-        prompt: string;
-        selection: any;
-        value: string;
-    }
-    class SelectOption extends View {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-    }
-    class Set extends CoreObject implements MutableEnumberable, Copyable, Freezable {
-        addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Set;
-        addObject(object: any): any;
-        addObjects(objects: Enumerable): Set;
-        any(callback: Function, target?: any): boolean;
-        anyBy(key: string, value?: string): boolean;
-        someProperty(key: string, value?: string): boolean;
-        compact(): any[];
-        contains(obj: any): boolean;
-        enumerableContentDidChange(start: number, removing: number, adding: number): any;
-        enumerableContentDidChange(start: number, removing: Enumerable, adding: number): any;
-        enumerableContentDidChange(start: number, removing: number, adding: Enumerable): any;
-        enumerableContentDidChange(start: number, removing: Enumerable, adding: Enumerable): any;
-        enumerableContentDidChange(removing: number, adding: number): any;
-        enumerableContentDidChange(removing: Enumerable, adding: number): any;
-        enumerableContentDidChange(removing: number, adding: Enumerable): any;
-        enumerableContentDidChange(removing: Enumerable, adding: Enumerable): any;
-        enumerableContentWillChange(removing: number, adding: number): Set;
-        enumerableContentWillChange(removing: Enumerable, adding: number): Set;
-        enumerableContentWillChange(removing: number, adding: Enumerable): Set;
-        enumerableContentWillChange(removing: Enumerable, adding: Enumerable): Set;
-        every(callback: Function, target?: any): boolean;
-        everyBy(key: string, value?: string): boolean;
-        everyProperty(key: string, value?: string): boolean;
-        filter(callback: Function, target: any): any[];
-        filterBy(key: string, value?: string): any[];
-        find(callback: Function, target: any): any;
-        findBy(key: string, value?: string): any;
-        forEach(callback: Function, target?: any): any;
-        getEach(key: string): any[];
-        invoke(methodName: string, ...args: any[]): any[];
-        map: ItemIndexEnumerableCallbackTarget;
-        mapBy(key: string): any[];
-        nextObject(index: number, previousObject: any, context: any): any;
-        reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
-        reject: ItemIndexEnumerableCallbackTarget;
-        rejectBy(key: string, value?: string): any[];
-        removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Set;
-        removeObject(object: any): any;
-        removeObjects(objects: Enumerable): Set;
-        setEach(key: string, value?: any): any;
-        some(callback: Function, target?: any): boolean;
-        toArray(): any[];
-        uniq(): Set;
-        without(value: any): Set;
-        '[]': any[];
-        firstObject: any;
-        hasEnumerableObservers: boolean;
-        lastObject: any;
-        copy(deep: boolean): Set;
-        frozenCopy(): Set;
-        freeze(): Set;
-        isFrozen: boolean;
-        add(obj: any): Set;
-        addEach(...args: any[]): Set;
-        clear(): Set;
-        isEqual(obj: Set): boolean;
-        pop(): any;
-        push(obj: any): Set;
-        remove(obj: any): Set;
-        removeEach(...args: any[]): Set;
-        shift(): any;
-        unshift(obj: any): Set;
-        length: number;
-    }
-    class SortableMixin implements MutableEnumberable {
-        addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        addObject(object: any): any;
-        addObjects(objects: Enumerable): MutableEnumberable;
-        any(callback: Function, target?: any): boolean;
-        anyBy(key: string, value?: string): boolean;
-        someProperty(key: string, value?: string): boolean;
-        compact(): any[];
-        contains(obj: any): boolean;
-        enumerableContentDidChange(start: number, removing: number, adding: number): any;
-        enumerableContentDidChange(start: number, removing: Enumerable, adding: number): any;
-        enumerableContentDidChange(start: number, removing: number, adding: Enumerable): any;
-        enumerableContentDidChange(start: number, removing: Enumerable, adding: Enumerable): any;
-        enumerableContentDidChange(removing: number, adding: number): any;
-        enumerableContentDidChange(removing: Enumerable, adding: number): any;
-        enumerableContentDidChange(removing: number, adding: Enumerable): any;
-        enumerableContentDidChange(removing: Enumerable, adding: Enumerable): any;
-        enumerableContentWillChange(removing: number, adding: number): Enumerable;
-        enumerableContentWillChange(removing: Enumerable, adding: number): Enumerable;
-        enumerableContentWillChange(removing: number, adding: Enumerable): Enumerable;
-        enumerableContentWillChange(removing: Enumerable, adding: Enumerable): Enumerable;
-        every(callback: Function, target?: any): boolean;
-        everyBy(key: string, value?: string): boolean;
-        everyProperty(key: string, value?: string): boolean;
-        filter(callback: Function, target: any): any[];
-        filterBy(key: string, value?: string): any[];
-        find(callback: Function, target: any): any;
-        findBy(key: string, value?: string): any;
-        forEach(callback: Function, target?: any): any;
-        getEach(key: string): any[];
-        invoke(methodName: string, ...args: any[]): any[];
-        map: ItemIndexEnumerableCallbackTarget;
-        mapBy(key: string): any[];
-        nextObject(index: number, previousObject: any, context: any): any;
-        reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
-        reject: ItemIndexEnumerableCallbackTarget;
-        rejectBy(key: string, value?: string): any[];
-        removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
-        removeObject(object: any): any;
-        removeObjects(objects: Enumerable): MutableEnumberable;
-        setEach(key: string, value?: any): any;
-        some(callback: Function, target?: any): boolean;
-        toArray(): any[];
-        uniq(): Enumerable;
-        without(value: any): Enumerable;
-        '[]': any[];
-        arrangedContent: any;
-        firstObject: any;
-        hasEnumerableObservers: boolean;
-        lastObject: any;
-        sortAscending: boolean;
-        sortFunction: Comparable;
-        sortProperties: any[];
-    }
-    class State extends Object implements Evented {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        has(name: string): boolean;
-        off(name: string, target: any, method: Function): State;
-        on(name: string, target: any, method: Function): State;
-        one(name: string, target: any, method: Function): State;
-        trigger(name: string, ...args: string[]): void;
-        getPathsCache(stateManager: {}, path: string): {};
-        init(): void;
-        setPathsCache(stateManager: {}, path: string, transitions: any): void;
-        static transitionTo(target: string): void;
-        hasContext: boolean;
-        isLeaf: boolean;
-        name: string;
-        parentState: State;
-        path: string;
-        enter: Function;
-        exit: Function;
-        setup: Function;
-    }
-    class StateManager extends State {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        contextFreeTransition(currentState: State, path: string): TransitionsHash;
-        enterState(transition: TransitionsHash): void;
-        getState(name: string): State;
-        getStateByPath(root: State, path: string): State;
-        getStateMeta(state: State, key: string): any;
-        getStatesInPath(root: State, path: string): State[];
-        goToState(path: string, context: any): void;
-        send(event: string): void;
-        setStateMeta(state: State, key: string, value: any): any;
-        stateMetaFor(state: State): {};
-        transitionTo(path: string, context: any): void;
-        triggerSetupContext(transitions: TransitionsHash): void;
-        unhandledEvent(manager: StateManager, event: string): any;
-        currentPath: string;
-        currentState: State;
-        errorOnUnhandledEvents: boolean;
-        transitionEvent: string;
-    }
-    namespace String {
-        function camelize(str: string): string;
-        function capitalize(str: string): string;
-        function classify(str: string): string;
-        function dasherize(str: string): string;
-        function decamelize(str: string): string;
-        function fmt(...args: string[]): string;
-        function htmlSafe(str: string): void; // TODO: @returns Handlebars.SafeStringStatic;
-        function loc(...args: string[]): string;
-        function underscore(str: string): string;
-        function w(str: string): string[];
-    }
-    var TEMPLATES: {};
-    class TargetActionSupport {
-        triggerAction(opts: {}): boolean;
-    }
-    class Test {
-        click(selector: string): RSVP.Promise;
-        fillin(selector: string, text: string): RSVP.Promise;
-        find(selector: string): JQuery;
-        findWithAssert(selector: string): JQuery;
-        injectTestHelpers(): void;
-        keyEvent(selector: string, type: string, keyCode: number): RSVP.Promise;
-        static oninjectHelpers(callback: Function): void;
-        static promise(resolver: Function): RSVP.Promise;
-        static registerHelper(name: string, helperMethod: Function): void;
-        removeTestHelpers(): void;
-        setupForTesting(): void;
-        static unregisterHelper(name: string): void;
-        visit(url: string): RSVP.Promise;
-        wait(value: any): RSVP.Promise;
-        static adapter: Object;
-        testHelpers: {};
-    }
-    class TextArea extends View implements TextSupport {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        cancel(event: Function): void;
-        focusIn(event: Function): void;
-        focusOut(event: Function): void;
-        insertNewLine(event: Function): void;
-        keyPress(event: Function): void;
-        action: string;
-        bubbles: boolean;
-        onEvent: string;
-    }
-    class TextField extends View implements TextSupport {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        cancel(event: Function): void;
-        focusIn(event: Function): void;
-        focusOut(event: Function): void;
-        insertNewLine(event: Function): void;
-        keyPress(event: Function): void;
-        action: string;
-        bubbles: boolean;
-        onEvent: string;
-        pattern: string;
-        size: string;
-        type: string;
-        value: string;
-    }
-    class TextSupport {
-        cancel(event: Function): void;
-        focusIn(event: Function): void;
-        focusOut(event: Function): void;
-        insertNewLine(event: Function): void;
-        keyPress(event: Function): void;
-        action: string;
-        bubbles: boolean;
-        onEvent: string;
-    }
-    var VERSION: string;
-    class View extends CoreView {
-        static detect(obj: any): boolean;
-        static detectInstance(obj: any): boolean;
-        /**
-        Iterate over each computed property for the class, passing its name and any
-        associated metadata (see metaForProperty) to the callback.
-        **/
-        static eachComputedProperty(callback: Function, binding: {}): void;
-        /**
-        Returns the original hash that was passed to meta().
-        @param key property name
-        **/
-        static metaForProperty(key: string): {};
-        static isClass: boolean;
-        static isMethod: boolean;
-        $(): JQuery;
-        append(): View;
-        // ReSharper disable InconsistentNaming
-        appendTo(A: string): View;
-        appendTo(A: HTMLElement): View;
-        appendTo(A: JQuery): View;
-        // ReSharper restore InconsistentNaming
-        createChildView(viewClass: {}, attrs?: {}): View;
-        createChildView(viewClass: string, attrs?: {}): View;
-        createElement(): View;
-        destroy(): View;
-        destroyElement(): View;
-        findElementInParentElement(parentElement: HTMLElement): HTMLElement;
-        remove(): View;
-        removeAllChildren(): View;
-        removeChild(view: View): View;
-        removeFromParent(): View;
-        render(buffer: RenderBuffer): void;
-        // ReSharper disable InconsistentNaming
-        replaceIn(A: string): View;
-        replaceIn(A: HTMLElement): View;
-        replaceIn(A: JQuery): View;
-        // ReSharper restore InconsistentNaming
-        rerender(): void;
-        ariaRole: string;
-        attributeBindings: any;
-        classNameBindings: string[];
-        classNames: string[];
-        context: any;
-        controller: any;
-        element: HTMLElement;
-        isView: boolean;
-        isVisible: boolean;
-        layout: Function;
-        layoutName: string;
-        nearestChildOf: View;
-        nearestOfType: View;
-        nearestWithProperty: View;
-        tagName: string;
-        template: Function;
-        templateName: string;
-        templates: {};
-        views: {};
-        didInsertElement: Function;
-        parentViewDidChange: Function;
-        willClearRender: Function;
-        willDestroyElement: Function;
-        willInsertElement: Function;
-    }
-    class ViewTargetActionSupport extends Mixin {
-        target: any;
-        actionContext: any;
-    }
-    var ViewUtils: {}; // TODO: define interface
-    function addBeforeObserver(obj: any, path: string, target: any, method: Function): any;
-    function addListener(obj: any, eventName: string, target: any, method: Function, once?: boolean): void;
-    function addListener(obj: any, eventName: string, target: any, method: string, once?: boolean): void;
-    function addListener(obj: any, eventName: string, func: Function, method: Function, once?: boolean): void;
-    function addListener(obj: any, eventName: string, func: Function, method: string, once?: boolean): void;
-    var addObserver: ModifyObserver;
-    /**
-    Ember.alias is deprecated. Please use Ember.aliasMethod or Ember.computed.alias instead.
-    **/
-    var alias: typeof deprecateFunc;
-    function aliasMethod(methodName: string): Descriptor;
-    var anyUnprocessedMixins: boolean;
-    function assert(desc: string, test: boolean): void;
-    function beforeObserver(func: Function, propertyName: string): Function;
-    function beforeObserversFor(obj: any, path: string): string[];
-    function beginPropertyChanges(): void;
-    function bind(obj: any, to: string, from: string): Binding;
-    function cacheFor(obj: any, key: string): any;
-    function canInvoke(obj: any, methodName: string): boolean;
-    function changeProperties(callback: Function, binding?: any): void;
-    function compare(v: any, w: any): number;
-    // ReSharper disable once DuplicatingLocalDeclaration
-    var computed: {
-        (...args: any[]): ComputedProperty;
-        alias(dependentKey: string): ComputedProperty;
-        and(...args: string[]): ComputedProperty;
-        any(...args: string[]): ComputedProperty;
-        bool(dependentKey: string): ComputedProperty;
-        defaultTo(defaultPath: string): ComputedProperty;
-        empty(dependentKey: string): ComputedProperty;
-        equal(dependentKey: string, value: any): ComputedProperty;
-        gt(dependentKey: string, value: number): ComputedProperty;
-        gte(dependentKey: string, value: number): ComputedProperty;
-        lt(dependentKey: string, value: number): ComputedProperty;
-        lte(dependentKey: string, value: number): ComputedProperty;
-        map(...args: string[]): ComputedProperty;
-        match(dependentKey: string, regexp: RegExp): ComputedProperty;
-        none(dependentKey: string): ComputedProperty;
-        not(dependentKey: string): ComputedProperty;
-        notEmpty(dependentKey: string): ComputedProperty;
-        oneWay(dependentKey: string): ComputedProperty;
-        or(...args: string[]): ComputedProperty;
-    };
-    // ReSharper disable DuplicatingLocalDeclaration
-    var config: {};
-    // ReSharper restore DuplicatingLocalDeclaration
-    function controllerFor(container: Container, controllerName: string, lookupOptions?: {}): Controller;
-    function copy(obj: any, deep: boolean): any;
-    /**
-    Creates an instance of the CoreObject class.
-    @param arguments A hash containing values with which to initialize the newly instantiated object.
-    **/
-    function create(arguments?: {}): CoreObject;
-    function debug(message: string): void;
-    function defineProperty(obj: any, keyName: string, desc: {}): void;
-    function deprecate(message: string, test?: boolean): void;
-    function deprecateFunc(message: string, func: Function): Function;
-    function destroy(obj: any): void;
-    /**
-    Ember.empty is deprecated. Please use Ember.isEmpty instead.
-    **/
-    // ReSharper disable once DuplicatingLocalDeclaration
-    var empty: typeof deprecateFunc;
-    function endPropertyChanges(): void;
-    // ReSharper disable once DuplicatingLocalDeclaration
-    var exports: {};
-    function finishChains(obj: any): void;
-    function flushPendingChains(): void;
-    function generateController(container: Container, controllerName: string, context: any): Controller;
-    function generateGuid(obj: any, prefix?: string): string;
-    function get(obj: any, keyName: string): any;
-    function getMeta(obj: any, property: string): any;
-    /**
-    getPath is deprecated since get now supports paths.
-    **/
-    var getPath: typeof deprecateFunc;
-    function getWithDefault(root: string, key: string, defaultValue: any): any;
-    function guidFor(obj: any): string;
-    function handleErrors(func: Function, context: any): any;
-    function hasListeners(context: any, name: string): boolean;
-    function hasOwnProperty(prop: string): boolean;
-    function immediateObserver(func: Function, ...propertyNames: any[]): Function;
-    var imports: {};
-    function inspect(obj: any): string;
-    function instrument(name: string, payload: any, callback: Function, binding: any): void;
-    function isArray(obj: any): boolean;
-    function isEmpty(obj: any): boolean;
-    function isEqual(a: any, b: any): boolean;
-    function isGlobalPath(path: string): boolean;
-    var isNamespace: boolean;
-    function isNone(obj: any): boolean;
-    function isPrototypeOf(obj: {}): boolean;
-    function isWatching(obj: any, key: string): boolean;
-    function keys(obj: any): any[];
-    function listenersDiff(obj: any, eventName: string, otherActions: any[]): any[];
-    function listenersFor(obj: any, eventName: string): any[];
-    function listenersUnion(obj: any, eventName: string, otherActions: any[]): void;
-    // ReSharper disable once DuplicatingLocalDeclaration
-    var lookup: {}; // TODO: define interface
-    function makeArray(obj: any): any[];
-    function merge(original: any, updates: any): any;
-    function meta(obj: any, writable?: boolean): {};
-    function metaPath(obj: any, path: string, writable?: boolean): any;
-    function mixin(obj: any, ...args: any[]): any;
-    /**
-    Ember.none is deprecated. Please use Ember.isNone instead.
-    **/
-    var none: typeof deprecateFunc;
-    function normalizeTuple(target: any, path: string): any[];
-    function observer(...args: any[]): Function;
-    function observersFor(obj: any, path: string): any[];
-    function onLoad(name: string, callback: Function): void;
-    function oneWay(obj: any, to: string, from: string): Binding;
-    var onError: Error;
-    function overrideChains(obj: any, keyName: string, m: any): boolean;
-    // ReSharper disable once DuplicatingLocalDeclaration
-    var platform: {
-        addBeforeObserver: ModifyObserver;
-        addObserver: ModifyObserver;
-        defineProperty(obj: any, keyName: string, desc: {}): void;
-        removeBeforeObserver: ModifyObserver;
-        removeObserver: ModifyObserver;
-        hasPropertyAccessors: boolean;
-    };
-    function propertyDidChange(obj: any, keyName: string): void;
-    function propertyIsEnumerable(prop: string): boolean;
-    function propertyWillChange(obj: any, keyName: string): void;
-    function removeBeforeObserver(obj: any, path: string, target: any, method: Function): any;
-    function removeChainWatcher(obj: any, keyName: string, node: any): void;
-    function removeListener(obj: any, eventName: string, target: any, method: Function): void;
-    function removeListener(obj: any, eventName: string, target: any, method: string): void;
-    function removeListener(obj: any, eventName: string, func: Function, method: Function): void;
-    function removeListener(obj: any, eventName: string, func: Function, method: string): void;
-    function removeObserver(obj: any, path: string, target: any, method: Function): any;
-    function required(): Descriptor;
-    function rewatch(obj: any): void;
-    var run: {
-        (target: any, method: Function): void;
-        begin(): void;
-        cancel(timer: any): void;
-        debounce(target: any, method: Function, ...args: any[]): void;
-        debounce(target: any, method: string, ...args: any[]): void;
-        end(): void;
-        join(target: any, method: Function, ...args: any[]): any;
-        join(target: any, method: string, ...args: any[]): any;
-        later(target: any, method: Function, ...args: any[]): string;
-        later(target: any, method: string, ...args: any[]): string;
-        next(target: any, method: Function, ...args: any[]): number;
-        next(target: any, method: string, ...args: any[]): number;
-        once(target: any, method: Function, ...args: any[]): number;
-        once(target: any, method: string, ...args: any[]): number;
-        schedule(queue: string, target: any, method: Function, ...args: any[]): void;
-        schedule(queue: string, target: any, method: string, ...args: any[]): void;
-        scheduleOnce(queue: string, target: any, method: Function, ...args: any[]): void;
-        scheduleOnce(queue: string, target: any, method: string, ...args: any[]): void;
-        sync(): void;
-        throttle(target: any, method: Function, ...args: any[]): void;
-        throttle(target: any, method: string, ...args: any[]): void;
-        queues: any[];
-    };
-    function runLoadHooks(name: string, object: any): void;
-    function sendEvent(obj: any, eventName: string, params?: any[], actions?: any[]): boolean;
-    function set(obj: any, keyName: string, value: any): any;
-    function setMeta(obj: any, property: string, value: any): void;
-    /**
-    setPath is deprecated since set now supports paths.
-    **/
-    var setPath: typeof deprecateFunc;
-    function setProperties(self: any, hash: {}): any;
-    function subscribe(pattern: string, object: any): void;
-    function toLocaleString(): string;
-    function toString(): string;
-    function tryCatchFinally(tryable: Function, catchable: Function, finalizer: Function, binding?: any): any;
-    function tryFinally(tryable: Function, finalizer: Function, binding?: any): any;
-    function tryInvoke(obj: any, methodName: string, args?: any[]): any;
-    function trySet(obj: any, path: string, value: any): void;
-    /**
-    trySetPath has been renamed to trySet.
-    **/
-    var trySetPath: typeof deprecateFunc;
-    function typeOf(item: any): string;
-    function unwatch(obj: any, keyPath: string): void;
-    function unwatchKey(obj: any, keyName: string): void;
-    function unwatchPath(obj: any, keyPath: string): void;
-    // ReSharper disable once DuplicatingLocalDeclaration
-    var uuid: number;
-    function valueOf(): {};
-    function warn(message: string, test?: boolean): void;
-    function watch(obj: any, keyPath: string): void;
-    function watchKey(obj: any, keyName: string): void;
-    function watchPath(obj: any, keyPath: string): void;
-    function watchedEvents(obj: {}): any[];
-    function wrap(func: Function, superFunc: Function): Function;
-}
-
-// ReSharper disable DuplicatingLocalDeclaration
-declare namespace Em {
-    /**
-    Alias for jQuery.
-    **/
-    var $: typeof Ember.$;
-    var A: typeof Ember.A;
-    class ActionHandlerMixin extends Ember.ActionHandlerMixin { }
-    class Application extends Ember.Application { }
-    class Array extends Ember.Array { }
-    class ArrayController extends Ember.ArrayController { }
-    var ArrayPolyfills: typeof Ember.ArrayPolyfills;
-    class ArrayProxy extends Ember.ArrayProxy { }
-    var BOOTED: typeof Ember.BOOTED;
-    class Binding extends Ember.Binding { }
-    class Button extends Ember.Button { }
-    class Checkbox extends Ember.Checkbox { }
-    class CollectionView extends Ember.CollectionView { }
-    class Comparable extends Ember.Comparable { }
-    class Component extends Ember.Component { }
-    class ComputedProperty extends Ember.ComputedProperty { }
-    class Container extends Ember.Container { }
-    class ContainerView extends Ember.ContainerView { }
-    class Controller extends Ember.Controller { }
-    class ControllerMixin extends Ember.ControllerMixin { }
-    class Copyable extends Ember.Copyable { }
-    class CoreObject extends Ember.CoreObject { }
-    class CoreView extends Ember.CoreView { }
-    class DAG extends Ember.DAG { }
-    var DEFAULT_GETTER_FUNCTION: typeof Ember.DEFAULT_GETTER_FUNCTION;
-    class DefaultResolver extends Ember.DefaultResolver { }
-    class Deffered extends Ember.Deferred { }
-    class DeferredMixin extends Ember.DeferredMixin { }
-    class Descriptor extends Ember.Descriptor { }
-    var EMPTY_META: typeof Ember.EMPTY_META;
-    var ENV: typeof Ember.ENV;
-    var EXTEND_PROTOTYPES: typeof Ember.EXTEND_PROTOTYPES;
-    class EachProxy extends Ember.EachProxy { }
-    class Enumerable extends Ember.Enumerable { }
-    var EnumerableUtils: typeof Ember.EnumerableUtils;
-    var Error: typeof Ember.Error;
-    class EventDispatcher extends Ember.EventDispatcher { }
-    class Evented extends Ember.Evented { }
-    var FROZEN_ERROR: typeof Ember.FROZEN_ERROR;
-    class Freezable extends Ember.Freezable { }
-    var GUID_KEY: typeof Ember.GUID_KEY;
-    namespace Handlebars {
-        var compile: typeof Ember.Handlebars.compile;
-        var get: typeof Ember.Handlebars.get;
-        var helper: typeof Ember.Handlebars.helper;
-        class helpers extends Ember.Handlebars.helpers { }
-        var precompile: typeof Ember.Handlebars.precompile;
-        var registerBoundHelper: typeof Ember.Handlebars.registerBoundHelper;
-        class Compiler extends Ember.Handlebars.Compiler { }
-        class JavaScriptCompiler extends Ember.Handlebars.JavaScriptCompiler { }
-        var registerHelper: typeof Ember.Handlebars.registerHelper;
-        var registerPartial: typeof Ember.Handlebars.registerPartial;
-        var K: typeof Ember.Handlebars.K;
-        var createFrame: typeof Ember.Handlebars.createFrame;
-        var Exception: typeof Ember.Handlebars.Exception;
-        class SafeString extends Ember.Handlebars.SafeString { }
-        var parse: typeof Ember.Handlebars.parse;
-        var print: typeof Ember.Handlebars.print;
-        var logger: typeof Ember.Handlebars.logger;
-        var log: typeof Ember.Handlebars.log;
-    }
-    class HashLocation extends Ember.HashLocation { }
-    class HistoryLocation extends Ember.HistoryLocation { }
-    var IS_BINDING: typeof Ember.IS_BINDING;
-    class Instrumentation extends Ember.Instrumentation { }
-    var K: typeof Ember.K;
-    var LOG_BINDINGS: typeof Ember.LOG_BINDINGS;
-    var LOG_STACKTRACE_ON_DEPRECATION: typeof Ember.LOG_STACKTRACE_ON_DEPRECATION;
-    var LOG_VERSION: typeof Ember.LOG_VERSION;
-    class LinkView extends Ember.LinkView { }
-    class Location extends Ember.Location { }
-    var Logger: typeof Ember.Logger;
-    var MANDATORY_SETTER_FUNCTION: typeof Ember.MANDATORY_SETTER_FUNCTION;
-    var META_KEY: typeof Ember.META_KEY;
-    class Map extends Ember.Map { }
-    class MapWithDefault extends Ember.MapWithDefault { }
-    class Mixin extends Ember.Mixin { }
-    class MutableArray extends Ember.MutableArray { }
-    class MutableEnumerable extends Ember.MutableEnumberable { }
-    var NAME_KEY: typeof Ember.NAME_KEY;
-    class Namespace extends Ember.Namespace { }
-    class NativeArray extends Ember.NativeArray { }
-    class NoneLocation extends Ember.NoneLocation { }
-    var ORDER_DEFINITION: typeof Ember.ORDER_DEFINITION;
-    class Object extends Ember.Object { }
-    class ObjectController extends Ember.ObjectController { }
-    class ObjectProxy extends Ember.ObjectProxy { }
-    class Observable extends Ember.Observable { }
-    class OrderedSet extends Ember.OrderedSet { }
-    namespace RSVP {
-        interface PromiseResolve extends Ember.RSVP.PromiseResolve { }
-        interface PromiseReject extends Ember.RSVP.PromiseReject { }
-        interface PromiseResolverFunction extends Ember.RSVP.PromiseResolverFunction { }
-        class Promise extends Ember.RSVP.Promise { }
-    }
-    class RenderBuffer extends Ember.RenderBuffer { }
-    class Route extends Ember.Route { }
-    class Router extends Ember.Router { }
-    class RouterDSL extends Ember.RouterDSL { }
-    var SHIM_ES5: typeof Ember.SHIM_ES5;
-    var STRINGS: typeof Ember.STRINGS;
-    class Select extends Ember.Select { }
-    class SelectOption extends Ember.SelectOption { }
-    class Set extends Ember.Set { }
-    class SortableMixin extends Ember.SortableMixin { }
-    class State extends Ember.State { }
-    class StateManager extends Ember.StateManager { }
-    namespace String {
-        var camelize: typeof Ember.String.camelize;
-        var capitalize: typeof Ember.String.capitalize;
-        var classify: typeof Ember.String.classify;
-        var dasherize: typeof Ember.String.dasherize;
-        var decamelize: typeof Ember.String.decamelize;
-        var fmt: typeof Ember.String.fmt;
-        var htmlSafe: typeof Ember.String.htmlSafe;
-        var loc: typeof Ember.String.loc;
-        var underscore: typeof Ember.String.underscore;
-        var w: typeof Ember.String.w;
-    }
-    var TEMPLATES: typeof Ember.TEMPLATES;
-    class TargetActionSupport extends Ember.TargetActionSupport { }
-    class Test extends Ember.Test { }
-    class TextArea extends Ember.TextArea { }
-    class TextField extends Ember.TextField { }
-    class TextSupport extends Ember.TextSupport { }
-    var VERSION: typeof Ember.VERSION;
-    class View extends Ember.View { }
-    class ViewTargetActionSupport extends Ember.ViewTargetActionSupport { }
-    var ViewUtils: typeof Ember.ViewUtils;
-    var addBeforeObserver: typeof Ember.addBeforeObserver;
-    var addListener: typeof Ember.addListener;
-    var addObserver: typeof Ember.addObserver;
-    var alias: typeof Ember.alias;
-    var aliasMethod: typeof Ember.aliasMethod;
-    var anyUnprocessedMixins: typeof Ember.anyUnprocessedMixins;
-    var assert: typeof Ember.assert;
-    var beforeObserver: typeof Ember.beforeObserver;
-    var beforeObserversFor: typeof Ember.beforeObserversFor;
-    var beginPropertyChanges: typeof Ember.beginPropertyChanges;
-    var bind: typeof Ember.bind;
-    var cacheFor: typeof Ember.cacheFor;
-    var canInvoke: typeof Ember.canInvoke;
-    var changeProperties: typeof Ember.changeProperties;
-    var compare: typeof Ember.compare;
-    var computed: typeof Ember.computed;
-    var config: typeof Ember.config;
-    var controllerFor: typeof Ember.controllerFor;
-    var copy: typeof Ember.copy;
-    var create: typeof Ember.create;
-    var debug: typeof Ember.debug;
-    var defineProperty: typeof Ember.defineProperty;
-    var deprecate: typeof Ember.deprecate;
-    var deprecateFunc: typeof Ember.deprecateFunc;
-    var destroy: typeof Ember.destroy;
-    var empty: typeof deprecateFunc;
-    var endPropertyChanges: typeof Ember.endPropertyChanges;
-    var exports: typeof Ember.exports;
-    var finishChains: typeof Ember.finishChains;
-    var flushPendingChains: typeof Ember.flushPendingChains;
-    var generateController: typeof Ember.generateController;
-    var generateGuid: typeof Ember.generateGuid;
-    var get: typeof Ember.get;
-    var getMeta: typeof Ember.getMeta;
-    var getPath: typeof Ember.getPath;
-    var getWithDefault: typeof Ember.getWithDefault;
-    var guidFor: typeof Ember.guidFor;
-    var handleErrors: typeof Ember.handleErrors;
-    var hasListeners: typeof Ember.hasListeners;
-    var hasOwnProperty: typeof Ember.hasOwnProperty;
-    var immediateObserver: typeof Ember.immediateObserver;
-    var imports: typeof Ember.imports;
-    var inspect: typeof Ember.inspect;
-    var instrument: typeof Ember.instrument;
-    var isArray: typeof Ember.isArray;
-    var isEmpty: typeof Ember.isEmpty;
-    var isEqual: typeof Ember.isEqual;
-    var isGlobalPath: typeof Ember.isGlobalPath;
-    var isNamespace: typeof Ember.isNamespace;
-    var isNone: typeof Ember.isNone;
-    var isPrototypeOf: typeof Ember.isPrototypeOf;
-    var isWatching: typeof Ember.isWatching;
-    var keys: typeof Ember.keys;
-    var listenersDiff: typeof Ember.listenersDiff;
-    var listenersFor: typeof Ember.listenersFor;
-    var listenersUnion: typeof Ember.listenersUnion;
-    var lookup: typeof Ember.lookup;
-    var makeArray: typeof Ember.makeArray;
-    var merge: typeof Ember.merge;
-    var meta: typeof Ember.meta;
-    var metaPath: typeof Ember.metaPath;
-    var mixin: typeof Ember.mixin;
-    var none: typeof Ember.none;
-    var normalizeTuple: typeof Ember.normalizeTuple;
-    var observer: typeof Ember.observer;
-    var observersFor: typeof Ember.observersFor;
-    var onLoad: typeof Ember.onLoad;
-    var oneWay: typeof Ember.oneWay;
-    var onError: typeof Ember.onError;
-    var overrideChains: typeof Ember.overrideChains;
-    var platform: typeof Ember.platform;
-    var propertyDidChange: typeof Ember.propertyDidChange;
-    var propertyIsEnumerable: typeof Ember.propertyIsEnumerable;
-    var propertyWillChange: typeof Ember.propertyWillChange;
-    var removeBeforeObserver: typeof Ember.removeBeforeObserver;
-    var removeChainWatcher: typeof Ember.removeChainWatcher;
-    var removeListener: typeof Ember.removeListener;
-    var removeObserver: typeof Ember.removeObserver;
-    var required: typeof Ember.required;
-    var rewatch: typeof Ember.rewatch;
-    var run: typeof Ember.run;
-    var runLoadHooks: typeof Ember.runLoadHooks;
-    var sendEvent: typeof Ember.sendEvent;
-    var set: typeof Ember.set;
-    var setMeta: typeof Ember.setMeta;
-    var setPath: typeof Ember.setPath;
-    var setProperties: typeof Ember.setProperties;
-    var subscribe: typeof Ember.subscribe;
-    var toLocaleString: typeof Ember.toLocaleString;
-    var toString: typeof Ember.toString;
-    var tryCatchFinally: typeof Ember.tryCatchFinally;
-    var tryFinally: typeof Ember.tryFinally;
-    var tryInvoke: typeof Ember.tryInvoke;
-    var trySet: typeof Ember.trySet;
-    var trySetPath: typeof Ember.trySetPath;
-    var typeOf: typeof Ember.typeOf;
-    var unwatch: typeof Ember.unwatch;
-    var unwatchKey: typeof Ember.unwatchKey;
-    var unwatchPath: typeof Ember.unwatchPath;
-    var uuid: typeof Ember.uuid;
-    var valueOf: typeof Ember.valueOf;
-    var warn: typeof Ember.warn;
-    var watch: typeof Ember.watch;
-    var watchKey: typeof Ember.watchKey;
-    var watchPath: typeof Ember.watchPath;
-    var watchedEvents: typeof Ember.watchedEvents;
-    var wrap: typeof Ember.wrap;
-}
-
-/**
- * External ambient module - to allow "import Ember = require('Ember');" to work correctly
- */
-
-declare module "Ember" {
-
-    var $: typeof Ember.$;
-    var A: typeof Ember.A;
-    class ActionHandlerMixin extends Ember.ActionHandlerMixin { }
-    class Application extends Ember.Application { }
-    class Array extends Ember.Array { }
-    class ArrayController extends Ember.ArrayController { }
-    var ArrayPolyfills: typeof Ember.ArrayPolyfills;
-    class ArrayProxy extends Ember.ArrayProxy { }
-    var BOOTED: typeof Ember.BOOTED;
-    class Binding extends Ember.Binding { }
-    class Button extends Ember.Button { }
-    class Checkbox extends Ember.Checkbox { }
-    class CollectionView extends Ember.CollectionView { }
-    class Comparable extends Ember.Comparable { }
-    class Component extends Ember.Component { }
-    class ComputedProperty extends Ember.ComputedProperty { }
-    class Container extends Ember.Container { }
-    class ContainerView extends Ember.ContainerView { }
-    class Controller extends Ember.Controller { }
-    class ControllerMixin extends Ember.ControllerMixin { }
-    class Copyable extends Ember.Copyable { }
-    class CoreObject extends Ember.CoreObject { }
-    class CoreView extends Ember.CoreView { }
-    class DAG extends Ember.DAG { }
-    var DEFAULT_GETTER_FUNCTION: typeof Ember.DEFAULT_GETTER_FUNCTION;
-    class DefaultResolver extends Ember.DefaultResolver { }
-    class Deffered extends Ember.Deferred { }
-    class DeferredMixin extends Ember.DeferredMixin { }
-    class Descriptor extends Ember.Descriptor { }
-    var EMPTY_META: typeof Ember.EMPTY_META;
-    var ENV: typeof Ember.ENV;
-    var EXTEND_PROTOTYPES: typeof Ember.EXTEND_PROTOTYPES;
-    class EachProxy extends Ember.EachProxy { }
-    class Enumerable extends Ember.Enumerable { }
-    var EnumerableUtils: typeof Ember.EnumerableUtils;
-    var Error: typeof Ember.Error;
-    class EventDispatcher extends Ember.EventDispatcher { }
-    class Evented extends Ember.Evented { }
-    var FROZEN_ERROR: typeof Ember.FROZEN_ERROR;
-    class Freezable extends Ember.Freezable { }
-    var GUID_KEY: typeof Ember.GUID_KEY;
-    namespace Handlebars {
-        var compile: typeof Ember.Handlebars.compile;
-        var get: typeof Ember.Handlebars.get;
-        var helper: typeof Ember.Handlebars.helper;
-        class helpers extends Ember.Handlebars.helpers { }
-        var precompile: typeof Ember.Handlebars.precompile;
-        var registerBoundHelper: typeof Ember.Handlebars.registerBoundHelper;
-        class Compiler extends Ember.Handlebars.Compiler { }
-        class JavaScriptCompiler extends Ember.Handlebars.JavaScriptCompiler { }
-        var registerHelper: typeof Ember.Handlebars.registerHelper;
-        var registerPartial: typeof Ember.Handlebars.registerPartial;
-        var K: typeof Ember.Handlebars.K;
-        var createFrame: typeof Ember.Handlebars.createFrame;
-        var Exception: typeof Ember.Handlebars.Exception;
-        class SafeString extends Ember.Handlebars.SafeString { }
-        var parse: typeof Ember.Handlebars.parse;
-        var print: typeof Ember.Handlebars.print;
-        var logger: typeof Ember.Handlebars.logger;
-        var log: typeof Ember.Handlebars.log;
-    }
-    class HashLocation extends Ember.HashLocation { }
-    class HistoryLocation extends Ember.HistoryLocation { }
-    var IS_BINDING: typeof Ember.IS_BINDING;
-    class Instrumentation extends Ember.Instrumentation { }
-    var K: typeof Ember.K;
-    var LOG_BINDINGS: typeof Ember.LOG_BINDINGS;
-    var LOG_STACKTRACE_ON_DEPRECATION: typeof Ember.LOG_STACKTRACE_ON_DEPRECATION;
-    var LOG_VERSION: typeof Ember.LOG_VERSION;
-    class LinkView extends Ember.LinkView { }
-    class Location extends Ember.Location { }
-    var Logger: typeof Ember.Logger;
-    var MANDATORY_SETTER_FUNCTION: typeof Ember.MANDATORY_SETTER_FUNCTION;
-    var META_KEY: typeof Ember.META_KEY;
-    class Map extends Ember.Map { }
-    class MapWithDefault extends Ember.MapWithDefault { }
-    class Mixin extends Ember.Mixin { }
-    class MutableArray extends Ember.MutableArray { }
-    class MutableEnumerable extends Ember.MutableEnumberable { }
-    var NAME_KEY: typeof Ember.NAME_KEY;
-    class Namespace extends Ember.Namespace { }
-    class NativeArray extends Ember.NativeArray { }
-    class NoneLocation extends Ember.NoneLocation { }
-    var ORDER_DEFINITION: typeof Ember.ORDER_DEFINITION;
-    class Object extends Ember.Object { }
-    class ObjectController extends Ember.ObjectController { }
-    class ObjectProxy extends Ember.ObjectProxy { }
-    class Observable extends Ember.Observable { }
-    class OrderedSet extends Ember.OrderedSet { }
-    namespace RSVP {
-        interface PromiseResolve extends Ember.RSVP.PromiseResolve { }
-        interface PromiseReject extends Ember.RSVP.PromiseReject { }
-        interface PromiseResolverFunction extends Ember.RSVP.PromiseResolverFunction { }
-        class Promise extends Ember.RSVP.Promise { }
-    }
-    class RenderBuffer extends Ember.RenderBuffer { }
-    class Route extends Ember.Route { }
-    class Router extends Ember.Router { }
-    class RouterDSL extends Ember.RouterDSL { }
-    var SHIM_ES5: typeof Ember.SHIM_ES5;
-    var STRINGS: typeof Ember.STRINGS;
-    class Select extends Ember.Select { }
-    class SelectOption extends Ember.SelectOption { }
-    class Set extends Ember.Set { }
-    class SortableMixin extends Ember.SortableMixin { }
-    class State extends Ember.State { }
-    class StateManager extends Ember.StateManager { }
-    namespace String {
-        var camelize: typeof Ember.String.camelize;
-        var capitalize: typeof Ember.String.capitalize;
-        var classify: typeof Ember.String.classify;
-        var dasherize: typeof Ember.String.dasherize;
-        var decamelize: typeof Ember.String.decamelize;
-        var fmt: typeof Ember.String.fmt;
-        var htmlSafe: typeof Ember.String.htmlSafe;
-        var loc: typeof Ember.String.loc;
-        var underscore: typeof Ember.String.underscore;
-        var w: typeof Ember.String.w;
-    }
-    var TEMPLATES: typeof Ember.TEMPLATES;
-    class TargetActionSupport extends Ember.TargetActionSupport { }
-    class Test extends Ember.Test { }
-    class TextArea extends Ember.TextArea { }
-    class TextField extends Ember.TextField { }
-    class TextSupport extends Ember.TextSupport { }
-    var VERSION: typeof Ember.VERSION;
-    class View extends Ember.View { }
-    class ViewTargetActionSupport extends Ember.ViewTargetActionSupport { }
-    var ViewUtils: typeof Ember.ViewUtils;
-    var addBeforeObserver: typeof Ember.addBeforeObserver;
-    var addListener: typeof Ember.addListener;
-    var addObserver: typeof Ember.addObserver;
-    var alias: typeof Ember.alias;
-    var aliasMethod: typeof Ember.aliasMethod;
-    var anyUnprocessedMixins: typeof Ember.anyUnprocessedMixins;
-    var assert: typeof Ember.assert;
-    var beforeObserver: typeof Ember.beforeObserver;
-    var beforeObserversFor: typeof Ember.beforeObserversFor;
-    var beginPropertyChanges: typeof Ember.beginPropertyChanges;
-    var bind: typeof Ember.bind;
-    var cacheFor: typeof Ember.cacheFor;
-    var canInvoke: typeof Ember.canInvoke;
-    var changeProperties: typeof Ember.changeProperties;
-    var compare: typeof Ember.compare;
-    var computed: typeof Ember.computed;
-    var config: typeof Ember.config;
-    var controllerFor: typeof Ember.controllerFor;
-    var copy: typeof Ember.copy;
-    var create: typeof Ember.create;
-    var debug: typeof Ember.debug;
-    var defineProperty: typeof Ember.defineProperty;
-    var deprecate: typeof Ember.deprecate;
-    var deprecateFunc: typeof Ember.deprecateFunc;
-    var destroy: typeof Ember.destroy;
-    var empty: typeof Ember.deprecateFunc;
-    var endPropertyChanges: typeof Ember.endPropertyChanges;
-    var exports: typeof Ember.exports;
-    var finishChains: typeof Ember.finishChains;
-    var flushPendingChains: typeof Ember.flushPendingChains;
-    var generateController: typeof Ember.generateController;
-    var generateGuid: typeof Ember.generateGuid;
-    var get: typeof Ember.get;
-    var getMeta: typeof Ember.getMeta;
-    var getPath: typeof Ember.getPath;
-    var getWithDefault: typeof Ember.getWithDefault;
-    var guidFor: typeof Ember.guidFor;
-    var handleErrors: typeof Ember.handleErrors;
-    var hasListeners: typeof Ember.hasListeners;
-    var hasOwnProperty: typeof Ember.hasOwnProperty;
-    var immediateObserver: typeof Ember.immediateObserver;
-    var imports: typeof Ember.imports;
-    var inspect: typeof Ember.inspect;
-    var instrument: typeof Ember.instrument;
-    var isArray: typeof Ember.isArray;
-    var isEmpty: typeof Ember.isEmpty;
-    var isEqual: typeof Ember.isEqual;
-    var isGlobalPath: typeof Ember.isGlobalPath;
-    var isNamespace: typeof Ember.isNamespace;
-    var isNone: typeof Ember.isNone;
-    var isPrototypeOf: typeof Ember.isPrototypeOf;
-    var isWatching: typeof Ember.isWatching;
-    var keys: typeof Ember.keys;
-    var listenersDiff: typeof Ember.listenersDiff;
-    var listenersFor: typeof Ember.listenersFor;
-    var listenersUnion: typeof Ember.listenersUnion;
-    var lookup: typeof Ember.lookup;
-    var makeArray: typeof Ember.makeArray;
-    var merge: typeof Ember.merge;
-    var meta: typeof Ember.meta;
-    var metaPath: typeof Ember.metaPath;
-    var mixin: typeof Ember.mixin;
-    var none: typeof Ember.none;
-    var normalizeTuple: typeof Ember.normalizeTuple;
-    var observer: typeof Ember.observer;
-    var observersFor: typeof Ember.observersFor;
-    var onLoad: typeof Ember.onLoad;
-    var oneWay: typeof Ember.oneWay;
-    var onError: typeof Ember.onError;
-    var overrideChains: typeof Ember.overrideChains;
-    var platform: typeof Ember.platform;
-    var propertyDidChange: typeof Ember.propertyDidChange;
-    var propertyIsEnumerable: typeof Ember.propertyIsEnumerable;
-    var propertyWillChange: typeof Ember.propertyWillChange;
-    var removeBeforeObserver: typeof Ember.removeBeforeObserver;
-    var removeChainWatcher: typeof Ember.removeChainWatcher;
-    var removeListener: typeof Ember.removeListener;
-    var removeObserver: typeof Ember.removeObserver;
-    var required: typeof Ember.required;
-    var rewatch: typeof Ember.rewatch;
-    var run: typeof Ember.run;
-    var runLoadHooks: typeof Ember.runLoadHooks;
-    var sendEvent: typeof Ember.sendEvent;
-    var set: typeof Ember.set;
-    var setMeta: typeof Ember.setMeta;
-    var setPath: typeof Ember.setPath;
-    var setProperties: typeof Ember.setProperties;
-    var subscribe: typeof Ember.subscribe;
-    var toLocaleString: typeof Ember.toLocaleString;
-    var toString: typeof Ember.toString;
-    var tryCatchFinally: typeof Ember.tryCatchFinally;
-    var tryFinally: typeof Ember.tryFinally;
-    var tryInvoke: typeof Ember.tryInvoke;
-    var trySet: typeof Ember.trySet;
-    var trySetPath: typeof Ember.trySetPath;
-    var typeOf: typeof Ember.typeOf;
-    var unwatch: typeof Ember.unwatch;
-    var unwatchKey: typeof Ember.unwatchKey;
-    var unwatchPath: typeof Ember.unwatchPath;
-    var uuid: typeof Ember.uuid;
-    var valueOf: typeof Ember.valueOf;
-    var warn: typeof Ember.warn;
-    var watch: typeof Ember.watch;
-    var watchKey: typeof Ember.watchKey;
-    var watchPath: typeof Ember.watchPath;
-    var watchedEvents: typeof Ember.watchedEvents;
-    var wrap: typeof Ember.wrap;
-}
diff --git a/ember/index.d.ts b/ember/index.d.ts
new file mode 100644
index 0000000000..c278c17bd6
--- /dev/null
+++ b/ember/index.d.ts
@@ -0,0 +1,3490 @@
+// Type definitions for Ember.js 1.11.3
+// Project: http://emberjs.com/
+// Definitions by: Jed Mao <https://github.com/jedmao>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+/// <reference types="handlebars" />
+
+declare namespace EmberStates {
+
+    interface Transition {
+        targetName: string;
+        urlMethod: string;
+        intent: any;
+        params: {}|any;
+        pivotHandler: any;
+        resolveIndex: number;
+        handlerInfos: any;
+        resolvedModels: {}|any;
+        isActive: boolean;
+        state: any;
+        queryParams: {}|any;
+        queryParamsOnly: boolean;
+
+        isTransition: boolean;
+
+        /**
+          The Transition's internal promise. Calling `.then` on this property
+          is that same as calling `.then` on the Transition object itself, but
+          this property is exposed for when you want to pass around a
+          Transition's promise, but not the Transition object itself, since
+          Transition object can be externally `abort`ed, while the promise
+          cannot.
+         */
+        promise: Ember.RSVP.Promise;
+
+        /**
+          Custom state can be stored on a Transition's `data` object.
+          This can be useful for decorating a Transition within an earlier
+          hook and shared with a later hook. Properties set on `data` will
+          be copied to new transitions generated by calling `retry` on this
+          transition.
+         */
+        data: any;
+
+        /**
+          A standard promise hook that resolves if the transition
+          succeeds and rejects if it fails/redirects/aborts.
+
+          Forwards to the internal `promise` property which you can
+          use in situations where you want to pass around a thennable,
+          but not the Transition itself.
+
+          @arg {Function} onFulfilled
+          @arg {Function} onRejected
+          @arg {String} label optional string for labeling the promise. Useful for tooling.
+          @return {Promise}
+         */
+        then(onFulfilled: Function, onRejected?: Function, label?: string): Ember.RSVP.Promise;
+
+        /**
+          Forwards to the internal `promise` property which you can
+          use in situations where you want to pass around a thennable,
+          but not the Transition itself.
+
+          @method catch
+          @arg {Function} onRejection
+          @arg {String} label optional string for labeling the promise.
+          Useful for tooling.
+          @return {Promise}
+         */
+        catch(onRejection: Function, label?: string): Ember.RSVP.Promise;
+
+        /**
+          Forwards to the internal `promise` property which you can
+          use in situations where you want to pass around a thennable,
+          but not the Transition itself.
+
+          @method finally
+          @arg {Function} callback
+          @arg {String} label optional string for labeling the promise.
+          Useful for tooling.
+          @return {Promise}
+         */
+        finally(callback: Function, label?: string): Ember.RSVP.Promise;
+
+        /**
+         Aborts the Transition. Note you can also implicitly abort a transition
+         by initiating another transition while a previous one is underway.
+        */
+        abort(): EmberStates.Transition;
+        normalize(manager: Ember.StateManager, contexts: any[]): void;
+
+        /**
+         Retries a previously-aborted transition (making sure to abort the
+         transition if it's still active). Returns a new transition that
+         represents the new attempt to transition.
+        */
+        retry(): EmberStates.Transition;
+
+        /**
+          Sets the URL-changing method to be employed at the end of a
+          successful transition. By default, a new Transition will just
+          use `updateURL`, but passing 'replace' to this method will
+          cause the URL to update using 'replaceWith' instead. Omitting
+          a parameter will disable the URL change, allowing for transitions
+          that don't update the URL at completion (this is also used for
+          handleURL, since the URL has already changed before the
+          transition took place).
+
+          @arg {String} method the type of URL-changing method to use
+            at the end of a transition. Accepted values are 'replace',
+            falsy values, or any other non-falsy value (which is
+            interpreted as an updateURL transition).
+
+          @return {Transition} this transition
+         */
+        method(method: string): EmberStates.Transition;
+
+        /**
+          Fires an event on the current list of resolved/resolving
+          handlers within this transition. Useful for firing events
+          on route hierarchies that haven't fully been entered yet.
+
+          Note: This method is also aliased as `send`
+
+          @arg {Boolean} [ignoreFailure=false] a boolean specifying whether unhandled events throw an error
+          @arg {String} name the name of the event to fire
+         */
+        trigger(ignoreFailure:boolean, eventName: string): void;
+        /**
+          Fires an event on the current list of resolved/resolving
+          handlers within this transition. Useful for firing events
+          on route hierarchies that haven't fully been entered yet.
+
+          Note: This method is also aliased as `send`
+
+          @arg {String} name the name of the event to fire
+         */
+        trigger(eventName: string): void;
+
+        /**
+          Transitions are aborted and their promises rejected
+          when redirects occur; this method returns a promise
+          that will follow any redirects that occur and fulfill
+          with the value fulfilled by any redirecting transitions
+          that occur.
+
+          @return {Promise} a promise that fulfills with the same
+            value that the final redirecting transition fulfills with
+         */
+        followRedirects(): Ember.RSVP.Promise;
+    }
+
+}
+
+declare namespace EmberTesting {
+
+    namespace Test {
+
+        class Adapter {
+            asyncEnd(): void;
+            asyncStart(): void;
+            exception(error: string): void;
+        }
+
+        class QUnitAdapter extends Adapter { }
+
+    }
+
+}
+
+interface Function {
+    observes(...args: string[]): Function;
+    observesBefore(...args: string[]): Function;
+    on(...args: string[]): Function;
+    property(...args: string[]): Function;
+}
+
+interface String {
+    camelize(): string;
+    capitalize(): string;
+    classify(): string;
+    dasherize(): string;
+    decamelize(): string;
+    fmt(...args: string[]): string;
+    htmlSafe(): typeof Handlebars.SafeString;
+    loc(...args: string[]): string;
+    underscore(): string;
+    w(): string[];
+}
+
+interface Array<T> {
+    constructor(arr: any[]): void;
+    activate(): void;
+    addArrayObserver(target: any, opts?: EnumerableConfigurationOptions): any[];
+    addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): any[];
+    any(callback: Function, target?: any): boolean;
+    anyBy(key: string, value?: string): boolean;
+    arrayContentDidChange(startIdx: number, removeAmt: number, addAmt: number): any[];
+    arrayContentWillChange(startIdx: number, removeAmt: number, addAmt: number): any[];
+    someProperty(key: string, value?: any): boolean;
+    clear(): any[];
+    compact(): any[];
+    contains(obj: any): boolean;
+    enumerableContentDidChange(start: number, removing: number, adding: number): any;
+    enumerableContentDidChange(start: number, removing: Ember.Enumerable, adding: number): any;
+    enumerableContentDidChange(start: number, removing: number, adding: Ember.Enumerable): any;
+    enumerableContentDidChange(start: number, removing: Ember.Enumerable, adding: Ember.Enumerable): any;
+    enumerableContentDidChange(removing: number, adding: number): any;
+    enumerableContentDidChange(removing: Ember.Enumerable, adding: number): any;
+    enumerableContentDidChange(removing: number, adding: Ember.Enumerable): any;
+    enumerableContentDidChange(removing: Ember.Enumerable, adding: Ember.Enumerable): any;
+    enumerableContentWillChange(removing: number, adding: number): any[];
+    enumerableContentWillChange(removing: Ember.Enumerable, adding: number): any[];
+    enumerableContentWillChange(removing: number, adding: Ember.Enumerable): any[];
+    enumerableContentWillChange(removing: Ember.Enumerable, adding: Ember.Enumerable): any[];
+    every(callback: Function, target?: any): boolean;
+    everyBy(key: string, value?: string): boolean;
+    everyProperty(key: string, value?: any): boolean;
+    filter(callback: Function, target?: any): any[];
+    filterBy(key: string, value?: string): any[];
+
+ /**
+    Returns the first item in the array for which the callback returns true.
+    This method works similar to the `filter()` method defined in JavaScript 1.6
+    except that it will stop working on the array once a match is found.
+    The callback method you provide should have the following signature (all
+    parameters are optional):
+    ```javascript
+    function(item, index, enumerable);
+    ```
+    - `item` is the current item in the iteration.
+    - `index` is the current index in the iteration.
+    - `enumerable` is the enumerable object itself.
+    It should return the `true` to include the item in the results, `false`
+    otherwise.
+    Note that in addition to a callback, you can also pass an optional target
+    object that will be set as `this` on the context. This is a good way
+    to give your iterator function access to the current object.
+    @function find
+    @arg callback The callback to execute
+    @arg {Object} [target] The target object to use
+    @return {Object} Found item or `undefined`.
+*/
+    find(callback: Function, target?: any): any;
+    findBy(key: string, value?: string): any;
+    forEach(callback: Function, target?: any): any;
+    getEach(key: string): any[];
+    indexOf(object: any, startAt?: number): number;
+    insertAt(idx: number, object: any): any[];
+    invoke(methodName: string, ...args: any[]): any[];
+    lastIndexOf(object: any, startAt?: number): number;
+    map(callback: Function, target?: any): any[];
+    mapBy(key: string): any[];
+    nextObject(index: number, previousObject: any, context: any): any;
+    objectAt(idx: number): any;
+    objectsAt(...args: number[]): any[];
+    popObject(): any;
+    pushObject(obj: any): any;
+    pushObjects(...args: any[]): any[];
+    reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
+    reject: ItemIndexEnumerableCallbackTarget;
+    rejectBy(key: string, value?: string): any[];
+    removeArrayObserver(target: any, opts: EnumerableConfigurationOptions): any[];
+    removeAt(start: number, len: number): any;
+    removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): any[];
+    replace(idx: number, amt: number, objects: any[]): void;
+    reverseObjects(): any[];
+    setEach(key: string, value?: any): any;
+    setObjects(objects: any[]): any[];
+    shiftObject(): any;
+    slice(beginIndex?: number, endIndex?: number): any[];
+    some(callback: Function, target?: any): boolean;
+    toArray(): any[];
+    uniq(): any[];
+    unshiftObject(object: any): any;
+    unshiftObjects(objects: any[]): any[];
+    without(value: any): any[];
+    '[]': any[];
+    '@each': Ember.EachProxy;
+    Boolean: boolean;
+    firstObject: any;
+    hasEnumerableObservers: boolean;
+    lastObject: any;
+    addObject(object: any): any;
+    addObjects(objects: Ember.Enumerable): any[];
+    removeObject(object: any): any;
+    removeObjects(objects: Ember.Enumerable): any[];
+    addObserver: ModifyObserver;
+    beginPropertyChanges(): any[];
+    cacheFor(keyName: string): any;
+    decrementProperty(keyName: string, decrement?: number): number;
+    endPropertyChanges(): any[];
+    get(keyName: string): any;
+    getProperties(...args: string[]): {};
+    getProperties(keys: string[]): {};
+    getWithDefault(keyName: string, defaultValue: any): any;
+    hasObserverFor(key: string): boolean;
+    incrementProperty(keyName: string, increment?: number): number;
+    notifyPropertyChange(keyName: string): any[];
+    propertyDidChange(keyName: string): any[];
+    propertyWillChange(keyName: string): any[];
+    removeObserver(key: string, target: any, method: string): Ember.Observable;
+    removeObserver(key: string, target: any, method: Function): Ember.Observable;
+    set(keyName: string, value: any): any[];
+    setProperties(hash: {}): any[];
+    toggleProperty(keyName: string): any;
+    copy(deep: boolean): any[];
+    frozenCopy(): any[];
+    // 1.3
+    isAny(key: string, value?: string): boolean;
+    isEvery(key: string, value?: string): boolean;
+}
+
+interface ApplicationCreateArguments {
+    customEvents?: {};
+    rootElement?: string;
+    /**
+    Basic logging of successful transitions.
+    **/
+    LOG_TRANSITIONS?: boolean;
+    /**
+    Detailed logging of all routing steps.
+    **/
+    LOG_TRANSITIONS_INTERNAL?: boolean;
+}
+
+interface ApplicationInitializerArguments {
+    name?: string;
+    initialize?: ApplicationInitializerFunction;
+}
+
+interface ApplicationInitializerFunction {
+    (container: Ember.Container, application: Ember.Application): void;
+}
+
+interface CoreObjectArguments {
+    /**
+    An overridable method called when objects are instantiated. By default, does nothing unless it is
+    overridden during class definition. NOTE: If you do override init for a framework class like Ember.View
+    or Ember.ArrayController, be sure to call this._super() in your init declaration! If you don't, Ember
+    may not have an opportunity to do important setup work, and you'll see strange behavior in your application.
+    **/
+    init?: Function;
+    /**
+    Override to implement teardown.
+    **/
+    willDestroy?: Function;
+
+    [propName: string]: any;
+}
+
+interface EnumerableConfigurationOptions {
+    willChange?: boolean ;
+    didChange?: boolean ;
+}
+
+interface ItemIndexEnumerableCallbackTarget {
+    (callback: ItemIndexEnumerableCallback, target?: any): any[];
+}
+
+interface ItemIndexEnumerableCallback {
+    (item: any, index: number, enumerable: Ember.Enumerable): void;
+}
+
+interface ReduceCallback {
+    (previousValue: any, item: any, index: number, enumerable: Ember.Enumerable): void;
+}
+
+interface TransitionsHash {
+    contexts: any[];
+    exitStates: Ember.State[];
+    enterStates: Ember.State[];
+    resolveState: Ember.State;
+}
+
+interface ActionsHash {
+    willTransition?: Function;
+    error?: Function;
+}
+
+interface DisconnectOutletOptions {
+    outlet?: string;
+    parentView?: string;
+}
+
+interface RenderOptions {
+    into?: string;
+    controller?: string;
+    model?: any;
+    outlet?: string;
+    view?: string;
+}
+
+interface ModifyObserver {
+    (obj: any, path: string, target: any, method?: Function): void;
+    (obj: any, path: string, target: any, method?: string): void;
+    (obj: any, path: string, func: Function, method?: Function): void;
+    (obj: any, path: string, func: Function, method?: string): void;
+}
+
+declare namespace Ember {
+    /**
+    Alias for jQuery.
+    **/
+    // ReSharper disable once DuplicatingLocalDeclaration
+    var $: JQueryStatic;
+    /**
+    Creates an Ember.NativeArray from an Array like object. Does not modify the original object.
+    Ember.A is not needed if Ember.EXTEND_PROTOTYPES is true (the default value). However, it is
+    recommended that you use Ember.A when creating addons for ember or when you can not garentee
+    that Ember.EXTEND_PROTOTYPES will be true.
+    **/
+    function A(arr?: any[]): NativeArray;
+    /**
+    The Ember.ActionHandler mixin implements support for moving an actions property to an _actions
+    property at extend time, and adding _actions to the object's mergedProperties list.
+    **/
+    class ActionHandlerMixin {
+        /**
+        Triggers a named action on the ActionHandler
+        **/
+        send(name: string, ...args: any[]): void;
+        /**
+        The collection of functions, keyed by name, available on this ActionHandler as action targets.
+        **/
+        actions: ActionsHash;
+    }
+    /**
+    An instance of Ember.Application is the starting point for every Ember application. It helps to
+    instantiate, initialize and coordinate the many objects that make up your app.
+    **/
+    class Application extends Namespace {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+        static initializer(args?: ApplicationInitializerArguments): void;
+        /**
+        Call advanceReadiness after any asynchronous setup logic has completed.
+        Each call to deferReadiness must be matched by a call to advanceReadiness
+        or the application will never become ready and routing will not begin.
+        **/
+        advanceReadiness(): void;
+        /**
+        Use this to defer readiness until some condition is true.
+
+        This allows you to perform asynchronous setup logic and defer
+        booting your application until the setup has finished.
+
+        However, if the setup requires a loading UI, it might be better
+        to use the router for this purpose.
+        */
+        deferReadiness(): void;
+        /**
+        defines an injection or typeInjection
+        **/
+        inject(factoryNameOrType: string, property: string, injectionName: string): void;
+        /**
+        This injects the test helpers into the window's scope. If a function of the
+        same name has already been defined it will be cached (so that it can be reset
+        if the helper is removed with `unregisterHelper` or `removeTestHelpers`).
+        Any callbacks registered with `onInjectHelpers` will be called once the
+        helpers have been injected.
+        **/
+        injectTestHelpers(): void;
+        /**
+        registers a factory for later injection
+        @param fullName type:name (e.g., 'model:user')
+        @param factory (e.g., App.Person)
+        **/
+        register(fullName: string, factory: Function, options?: {}): void;
+        /**
+        This removes all helpers that have been registered, and resets and functions
+        that were overridden by the helpers.
+        **/
+        removeTestHelpers(): void;
+        /**
+        Reset the application. This is typically used only in tests.
+        **/
+        reset(): void;
+        /**
+        This hook defers the readiness of the application, so that you can start
+        the app when your tests are ready to run. It also sets the router's
+        location to 'none', so that the window's location will not be modified
+        (preventing both accidental leaking of state between tests and interference
+        with your testing framework).
+        **/
+        setupForTesting(): void;
+        /**
+        The DOM events for which the event dispatcher should listen.
+        */
+        customEvents: {};
+        /**
+        The Ember.EventDispatcher responsible for delegating events to this application's views.
+        **/
+        eventDispatcher: EventDispatcher;
+        /**
+        Set this to provide an alternate class to Ember.DefaultResolver
+        **/
+        resolver: DefaultResolver;
+        /**
+        The root DOM element of the Application. This can be specified as an
+        element or a jQuery-compatible selector string.
+
+        This is the element that will be passed to the Application's, eventDispatcher,
+        which sets up the listeners for event delegation. Every view in your application
+        should be a child of the element you specify here.
+        **/
+        rootElement: HTMLElement;
+        /**
+        Called when the Application has become ready.
+        The call will be delayed until the DOM has become ready.
+        **/
+        ready: Function;
+        /**
+        Application's router.
+        **/
+        Router: Router;
+    }
+    /**
+    This module implements Observer-friendly Array-like behavior. This mixin is picked up by the
+    Array class as well as other controllers, etc. that want to appear to be arrays.
+    **/
+    class Array implements Enumerable {
+        addArrayObserver(target: any, opts?: EnumerableConfigurationOptions): any[];
+        addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
+        any(callback: Function, target?: any): boolean;
+        anyBy(key: string, value?: string): boolean;
+        arrayContentDidChange(startIdx: number, removeAmt: number, addAmt: number): any[];
+        arrayContentWillChange(startIdx: number, removeAmt: number, addAmt: number): any[];
+        someProperty(key: string, value?: string): boolean;
+        compact(): any[];
+        contains(obj: any): boolean;
+        enumerableContentDidChange(start: number, removing: number, adding: number): any;
+        enumerableContentDidChange(start: number, removing: Enumerable, adding: number): any;
+        enumerableContentDidChange(start: number, removing: number, adding: Enumerable): any;
+        enumerableContentDidChange(start: number, removing: Enumerable, adding: Enumerable): any;
+        enumerableContentDidChange(removing: number, adding: number): any;
+        enumerableContentDidChange(removing: Enumerable, adding: number): any;
+        enumerableContentDidChange(removing: number, adding: Enumerable): any;
+        enumerableContentDidChange(removing: Enumerable, adding: Enumerable): any;
+        enumerableContentWillChange(removing: number, adding: number): Enumerable;
+        enumerableContentWillChange(removing: Enumerable, adding: number): Enumerable;
+        enumerableContentWillChange(removing: number, adding: Enumerable): Enumerable;
+        enumerableContentWillChange(removing: Enumerable, adding: Enumerable): Enumerable;
+        every(callback: Function, target?: any): boolean;
+        everyBy(key: string, value?: string): boolean;
+        everyProperty(key: string, value?: string): boolean;
+        filter(callback: Function, target: any): any[];
+        filterBy(key: string, value?: string): any[];
+        find(callback: Function, target?: any): any;
+        findBy(key: string, value?: string): any;
+        forEach(callback: Function, target?: any): any;
+        getEach(key: string): any[];
+        indexOf(object: any, startAt: number): number;
+        invoke(methodName: string, ...args: any[]): any[];
+        lastIndexOf(object: any, startAt: number): number;
+        map: ItemIndexEnumerableCallbackTarget;
+        mapBy(key: string): any[];
+        nextObject(index: number, previousObject: any, context: any): any;
+        objectAt(idx: number): any;
+        objectsAt(...args: number[]): any[];
+        reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
+        reject: ItemIndexEnumerableCallbackTarget;
+        rejectBy(key: string, value?: string): any[];
+        removeArrayObserver(target: any, opts: EnumerableConfigurationOptions): any[];
+        removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
+        setEach(key: string, value?: any): any;
+        slice(beginIndex?: number, endIndex?: number): any[];
+        some(callback: Function, target?: any): boolean;
+        toArray(): any[];
+        uniq(): Enumerable;
+        without(value: any): Enumerable;
+    '@each': EachProxy;
+        Boolean: boolean;
+    '[]': any[];
+        firstObject: any;
+        hasEnumerableObservers: boolean;
+        lastObject: any;
+        length: number;
+    }
+    /**
+    Provides a way for you to publish a collection of objects so that you can easily bind to the
+    collection from a Handlebars #each helper, an Ember.CollectionView, or other controllers.
+    **/
+    class ArrayController extends ArrayProxy implements SortableMixin, ControllerMixin {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+        lookupItemController(object: any): string;
+        arrangedContent: any;
+        itemController: string;
+        sortAscending: boolean;
+        sortFunction: Comparable;
+        sortProperties: any[];
+        replaceRoute(name: string, ...args: any[]): void;
+        transitionToRoute(name: string, ...args: any[]): void;
+        controllers: {};
+        needs: string[];
+        target: any;
+        model: any;
+        queryParams: any;
+        send(name: string, ...args: any[]): void;
+        actions: {};
+
+    }
+    /**
+    Array polyfills to support ES5 features in older browsers.
+    **/
+    var ArrayPolyfills: {
+        map: typeof Array.prototype.map;
+        forEach: typeof Array.prototype.forEach;
+        indexOf: typeof Array.prototype.indexOf;
+    };
+    /**
+    An ArrayProxy wraps any other object that implements Ember.Array and/or Ember.MutableArray,
+    forwarding all requests. This makes it very useful for a number of binding use cases or other cases
+    where being able to swap out the underlying array is useful.
+    **/
+    class ArrayProxy extends Object implements MutableArray {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+        addArrayObserver(target: any, opts?: EnumerableConfigurationOptions): any[];
+        addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
+        any(callback: Function, target?: any): boolean;
+        anyBy(key: string, value?: string): boolean;
+        arrayContentDidChange(startIdx: number, removeAmt: number, addAmt: number): any[];
+        arrayContentWillChange(startIdx: number, removeAmt: number, addAmt: number): any[];
+        someProperty(key: string, value?: string): boolean;
+        clear(): any[];
+        compact(): any[];
+        contains(obj: any): boolean;
+        enumerableContentDidChange(start: number, removing: number, adding: number): any;
+        enumerableContentDidChange(start: number, removing: Enumerable, adding: number): any;
+        enumerableContentDidChange(start: number, removing: number, adding: Enumerable): any;
+        enumerableContentDidChange(start: number, removing: Enumerable, adding: Enumerable): any;
+        enumerableContentDidChange(removing: number, adding: number): any;
+        enumerableContentDidChange(removing: Enumerable, adding: number): any;
+        enumerableContentDidChange(removing: number, adding: Enumerable): any;
+        enumerableContentDidChange(removing: Enumerable, adding: Enumerable): any;
+        enumerableContentWillChange(removing: number, adding: number): Enumerable;
+        enumerableContentWillChange(removing: Enumerable, adding: number): Enumerable;
+        enumerableContentWillChange(removing: number, adding: Enumerable): Enumerable;
+        enumerableContentWillChange(removing: Enumerable, adding: Enumerable): Enumerable;
+        every(callback: Function, target?: any): boolean;
+        everyBy(key: string, value?: string): boolean;
+        everyProperty(key: string, value?: string): boolean;
+        filter(callback: Function, target: any): any[];
+        filterBy(key: string, value?: string): any[];
+        find(callback: Function, target: any): any;
+        findBy(key: string, value?: string): any;
+        forEach(callback: Function, target?: any): any;
+        getEach(key: string): any[];
+        indexOf(object: any, startAt: number): number;
+        insertAt(idx: number, object: any): any[];
+        invoke(methodName: string, ...args: any[]): any[];
+        lastIndexOf(object: any, startAt: number): number;
+        map: ItemIndexEnumerableCallbackTarget;
+        mapBy(key: string): any[];
+        nextObject(index: number, previousObject: any, context: any): any;
+        objectAt(idx: number): any;
+        objectAtContent(idx: number): any;
+        objectsAt(...args: number[]): any[];
+        popObject(): any;
+        pushObject(obj: any): any;
+        pushObjects(...args: any[]): any[];
+        reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
+        reject: ItemIndexEnumerableCallbackTarget;
+        rejectBy(key: string, value?: string): any[];
+        removeArrayObserver(target: any, opts: EnumerableConfigurationOptions): any[];
+        removeAt(start: number, len: number): any;
+        removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
+        replace(idx: number, amt: number, objects: any[]): any;
+        replaceContent(idx: number, amt: number, objects: any[]): void;
+        reverseObjects(): any[];
+        setEach(key: string, value?: any): any;
+        setObjects(objects: any[]): any[];
+        shiftObject(): any;
+        slice(beginIndex?: number, endIndex?: number): any[];
+        some(callback: Function, target?: any): boolean;
+        toArray(): any[];
+        uniq(): Enumerable;
+        unshiftObject(object: any): any;
+        unshiftObjects(objects: any[]): any[];
+        without(value: any): Enumerable;
+    '[]': any[];
+    '@each': EachProxy;
+        Boolean: boolean;
+        firstObject: any;
+        hasEnumerableObservers: boolean;
+        lastObject: any;
+        length: number;
+        addObject(object: any): any;
+        addObjects(objects: Enumerable): MutableEnumberable;
+        removeObject(object: any): any;
+        removeObjects(objects: Enumerable): MutableEnumberable;
+    }
+    var BOOTED: boolean;
+    /**
+    Connects the properties of two objects so that whenever the value of one property changes,
+    the other property will be changed also.
+    **/
+    class Binding {
+        constructor(toPath: string, fromPath: string);
+        connect(obj: any): Binding;
+        copy(): Binding;
+        disconnect(obj: any): Binding;
+        from(path: string): Binding;
+        static oneWay(from: string, flag?: boolean): Binding;
+        to(path: string): Binding;
+        to(pathTuple: any[]): Binding;
+        toString(): string;
+    }
+    class Button extends View implements TargetActionSupport {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+        triggerAction(opts: {}): boolean;
+    }
+    /**
+    The internal class used to create text inputs when the {{input}} helper is used
+    with type of checkbox. See Handlebars.helpers.input for usage details.
+    **/
+    class Checkbox extends View {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+    }
+    /**
+    An Ember.View descendent responsible for managing a collection (an array or array-like object)
+    by maintaining a child view object and associated DOM representation for each item in the array
+    and ensuring that child views and their associated rendered HTML are updated when items in the
+    array are added, removed, or replaced.
+    **/
+    class CollectionView extends ContainerView {
+        arrayDidChange(content: any[], start: number, removed: number, added: number): void;
+        arrayWillChange(content: any[], start: number, removed: number): void;
+        createChildView(viewClass: {}, attrs?: {}): CollectionView;
+        destroy(): CollectionView;
+        init(): void;
+        static CONTAINER_MAP: {};
+        content: any[];
+        emptyView: View;
+        itemViewClass: View;
+    }
+    /**
+    Implements some standard methods for comparing objects. Add this mixin to any class
+    you create that can compare its instances.
+    **/
+    class Comparable {
+        compare(a: any, b: any): number;
+    }
+    /**
+    A view that is completely isolated. Property access in its templates go to the view object
+    and actions are targeted at the view object. There is no access to the surrounding context or
+    outer controller; all contextual information is passed in.
+    **/
+    class Component extends View {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+        sendAction(action: string, context: any): void;
+        targetObject: Controller;
+    }
+    /**
+    A computed property transforms an objects function into a property.
+    By default the function backing the computed property will only be called once and the result
+    will be cached. You can specify various properties that your computed property is dependent on.
+    This will force the cached result to be recomputed if the dependencies are modified.
+    **/
+    class ComputedProperty {
+        cacheable(aFlag?: boolean): ComputedProperty;
+        get(keyName: string): any;
+        meta(meta: {}): ComputedProperty;
+        property(...args: string[]): ComputedProperty;
+        readOnly(): ComputedProperty;
+        set(keyName: string, newValue: any, oldValue: string): any;
+        // ReSharper disable UsingOfReservedWord
+        volatile(): ComputedProperty;
+        // ReSharper restore UsingOfReservedWord
+    }
+    class Container {
+        constructor(parent: Container);
+        parent: Container;
+        children: any[];
+        resolver: Function;
+        registry: {};
+        cache: {};
+        typeInjections: {};
+        injections: {};
+        child(): Container;
+        set(object: {}, key: string, value: any): void;
+        /**
+        registers a factory for later injection
+        @param fullName type:name (e.g., 'model:user')
+        @param factory (e.g., App.Person)
+        **/
+        register(fullName: string, factory: Function, options?: {}): void;
+        unregister(fullName: string): void;
+        resolve(fullName: string): Function;
+        describe(fullName: string): string;
+        normalize(fullName: string): string;
+        makeToString(factory: any, fullName: string): Function;
+        lookup(fullName: string, options?: {}): any;
+        lookupFactory(fullName: string): any;
+        has(fullName: string): boolean;
+        optionsForType(type: string, options: {}): void;
+        options(type: string, options: {}): void;
+        injection(factoryName: string, property: string, injectionName: string): void;
+        factoryInjection(factoryName: string, property: string, injectionName: string): void;
+        destroy(): void;
+        reset(): void;
+    }
+    /**
+    An Ember.View subclass that implements Ember.MutableArray allowing programatic
+    management of its child views.
+    **/
+    class ContainerView extends View {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+    }
+    class Controller extends Object implements ControllerMixin {
+        replaceRoute(name: string, ...args: any[]): void;
+        transitionToRoute(name: string, ...args: any[]): void;
+        controllers: {};
+        model: any;
+        needs: string[];
+        queryParams: any;
+        target: any;
+        send(name: string, ...args: any[]): void;
+        actions: ActionsHash;
+    }
+    /**
+    Additional methods for the ControllerMixin.
+    **/
+    class ControllerMixin extends ActionHandlerMixin {
+        replaceRoute(name: string, ...args: any[]): void;
+        transitionToRoute(name: string, ...args: any[]): void;
+        controllers: {};
+        model : any;
+        needs: string[];
+        queryParams: any;
+        target: any;
+    }
+    /**
+    Implements some standard methods for copying an object. Add this mixin to any object you
+    create that can create a copy of itself. This mixin is added automatically to the built-in array.
+    You should generally implement the copy() method to return a copy of the receiver.
+    Note that frozenCopy() will only work if you also implement Ember.Freezable.
+    **/
+    class Copyable {
+        copy(deep: boolean): Copyable;
+        frozenCopy(): Copyable;
+    }
+    class CoreObject {
+        /**
+        An overridable method called when objects are instantiated. By default,
+        does nothing unless it is overridden during class definition.
+        @method init
+        **/
+        init(): void;
+
+        /**
+        Defines the properties that will be concatenated from the superclass (instead of overridden).
+        @property concatenatedProperties
+        @type Array
+        @default null
+        **/
+        concatenatedProperties: any[];
+
+        /**
+        Destroyed object property flag. If this property is true the observers and bindings were
+        already removed by the effect of calling the destroy() method.
+        @property isDestroyed
+        @default false
+        **/
+        isDestroyed: boolean;
+        /**
+        Destruction scheduled flag. The destroy() method has been called. The object stays intact
+        until the end of the run loop at which point the isDestroyed flag is set.
+        @property isDestroying
+        @default false
+        **/
+        isDestroying: boolean;
+
+        /**
+        Destroys an object by setting the `isDestroyed` flag and removing its
+        metadata, which effectively destroys observers and bindings.
+        If you try to set a property on a destroyed object, an exception will be
+        raised.
+        Note that destruction is scheduled for the end of the run loop and does not
+        happen immediately.  It will set an isDestroying flag immediately.
+        @method destroy
+        @return {Ember.Object} receiver
+        */
+        destroy(): CoreObject;
+
+        /**
+        Override to implement teardown.
+        @method willDestroy
+        */
+        willDestroy(): void;
+
+        /**
+        Returns a string representation which attempts to provide more information than Javascript's toString
+        typically does, in a generic way for all Ember objects (e.g., "<App.Person:ember1024>").
+        @method toString
+        @return {String} string representation
+        **/
+        toString(): string;
+
+        static isClass: boolean;
+        static isMethod: boolean;
+
+        /**
+        Creates a new subclass.
+        @method extend
+        @static
+        @param {Object} [args] - Object containing values to use within the new class
+        **/
+        static extend<T>(args?: CoreObjectArguments): T;
+        /**
+        Creates a new subclass.
+        @method extend
+        @static
+        @param {Mixin} [mixins] - One or more Mixin classes
+        @param {Object} [args] - Object containing values to use within the new class
+        **/
+        static extend<T>(mixins?: Mixin, args?: CoreObjectArguments): T;
+
+        /**
+        Creates a new subclass.
+        @method extend
+        @param {Object} [args] - Object containing values to use within the new class
+        Non-static method because Ember classes aren't currently 'real' TypeScript classes.
+        **/
+        extend<T>(args ?: CoreObjectArguments): T;
+        /**
+        Creates a new subclass.
+        @method extend
+        @param {Mixin} [mixins] - One or more Mixin classes
+        @param {Object} [args] - Object containing values to use within the new class
+        Non-static method because Ember classes aren't currently 'real' TypeScript classes.
+        **/
+        extend<T>(mixins ? : Mixin, args ?: CoreObjectArguments): T;
+
+        /**
+        Equivalent to doing extend(arguments).create(). If possible use the normal create method instead.
+        @method createWithMixins
+        @static
+        @param [args]
+        **/
+        static createWithMixins<T extends {}>(args?: {}): T;
+
+        /**
+        Creates an instance of the class.
+        @method create
+        @static
+        @param [args] - A hash containing values with which to initialize the newly instantiated object.
+        **/
+        static create<T extends {}>(args?: {}): T;
+
+        /**
+        Augments a constructor's prototype with additional properties and functions.
+        To add functions and properties to the constructor itself, see reopenClass.
+        @method reopen
+        **/
+        static reopen<T extends {}>(args?: {}): T;
+
+        /**
+        Augments a constructor's own properties and functions.
+        To add functions and properties to instances of a constructor by extending the
+        constructor's prototype see reopen.
+        @method reopenClass
+        **/
+        static reopenClass<T extends {}>(args?: {}): T;
+
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+
+        /**
+        Returns the original hash that was passed to meta().
+        @method metaForProperty
+        @static
+        @param key {String} property name
+        **/
+        static metaForProperty(key: string): {};
+
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+
+        @method eachComputedProperty
+        @static
+        @param {Function} callback
+        @param {Object} binding
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+    }
+    /**
+    An abstract class that exists to give view-like behavior to both Ember's main view class Ember.View
+    and other classes like Ember._SimpleMetamorphView that don't need the fully functionaltiy of Ember.View.
+    Unless you have specific needs for CoreView, you will use Ember.View in your applications.
+    **/
+    class CoreView extends Object implements ActionHandlerMixin {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+        send(name: string, ...args: any[]): void;
+        actions: ActionsHash;
+        parentView: CoreView;
+    }
+    class DAG {
+        add(name: string): any;
+        map(name: string, value: any): void;
+        addEdge(fromName: string, toName: string): void;
+        topsort(fn: Function): void;
+        addEdges(name: string, value: any, before: any, after: any): void;
+        names: any[];
+        vertices: {};
+    }
+    function DEFAULT_GETTER_FUNCTION(name: string): Function;
+    /**
+    The DefaultResolver defines the default lookup rules to resolve container lookups before consulting
+    the container for registered items:
+    templates are looked up on Ember.TEMPLATES
+    other names are looked up on the application after converting the name.
+    For example, controller:post looks up App.PostController by default.
+    **/
+    class DefaultResolver {
+        resolve(fullName: string): {};
+        namespace: Application;
+    }
+    class Deferred {
+        reject(value: any): void;
+        resolve(value: any): void;
+        then(resolve: Function, reject: Function): void;
+    }
+    class DeferredMixin extends Mixin {
+        reject(value: any): void;
+        resolve(value: any): void;
+        then(resolve: Function, reject: Function): void;
+    }
+    /**
+    Objects of this type can implement an interface to respond to requests to get and set.
+    The default implementation handles simple properties.
+    You generally won't need to create or subclass this directly.
+    **/
+    class Descriptor { }
+    var EMPTY_META: {}; // TODO: define interface
+    var ENV: {};
+    var EXTEND_PROTOTYPES: boolean;
+    /**
+    This is the object instance returned when you get the @each property on an array. It uses
+    the unknownProperty handler to automatically create EachArray instances for property names.
+    **/
+    class EachProxy extends Object {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+        unknownProperty(keyName: string, value: any): any[];
+    }
+    /**
+    This mixin defines the common interface implemented by enumerable objects in Ember. Most of these
+    methods follow the standard Array iteration API defined up to JavaScript 1.8 (excluding language-specific
+    features that cannot be emulated in older versions of JavaScript).
+    This mixin is applied automatically to the Array class on page load, so you can use any of these methods
+    on simple arrays. If Array already implements one of these methods, the mixin will not override them.
+    **/
+    class Enumerable {
+        addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
+        any(callback: Function, target?: any): boolean;
+        anyBy(key: string, value?: string): boolean;
+        someProperty(key: string, value?: string): boolean;
+        compact(): any[];
+        contains(obj: any): boolean;
+        enumerableContentDidChange(start: number, removing: number, adding: number): any;
+        enumerableContentDidChange(start: number, removing: Enumerable, adding: number): any;
+        enumerableContentDidChange(start: number, removing: number, adding: Enumerable): any;
+        enumerableContentDidChange(start: number, removing: Enumerable, adding: Enumerable): any;
+        enumerableContentDidChange(removing: number, adding: number): any;
+        enumerableContentDidChange(removing: Enumerable, adding: number): any;
+        enumerableContentDidChange(removing: number, adding: Enumerable): any;
+        enumerableContentDidChange(removing: Enumerable, adding: Enumerable): any;
+        enumerableContentWillChange(removing: number, adding: number): Enumerable;
+        enumerableContentWillChange(removing: Enumerable, adding: number): Enumerable;
+        enumerableContentWillChange(removing: number, adding: Enumerable): Enumerable;
+        enumerableContentWillChange(removing: Enumerable, adding: Enumerable): Enumerable;
+        every(callback: Function, target?: any): boolean;
+        everyBy(key: string, value?: string): boolean;
+        everyProperty(key: string, value?: string): boolean;
+        filter(callback: Function, target: any): any[];
+        filterBy(key: string, value?: string): any[];
+        find(callback: Function, target: any): any;
+        findBy(key: string, value?: string): any;
+        forEach(callback: Function, target?: any): any;
+        getEach(key: string): any[];
+        invoke(methodName: string, ...args: any[]): any[];
+        map: ItemIndexEnumerableCallbackTarget;
+        mapBy(key: string): any[];
+        nextObject(index: number, previousObject: any, context: any): any;
+        reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
+        reject: ItemIndexEnumerableCallbackTarget;
+        rejectBy(key: string, value?: string): any[];
+        removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
+        setEach(key: string, value?: any): any;
+        some(callback: Function, target?: any): boolean;
+        toArray(): any[];
+        uniq(): Enumerable;
+        without(value: any): Enumerable;
+    '[]': any[];
+        firstObject: any;
+        hasEnumerableObservers: boolean;
+        lastObject: any;
+    }
+    var EnumerableUtils: {}; // TODO: define interface
+    /**
+    A subclass of the JavaScript Error object for use in Ember.
+    **/
+    // Restore this to 'typeof Error' when https://github.com/Microsoft/TypeScript/issues/983 is resolved
+    // ReSharper disable once DuplicatingLocalDeclaration
+    var Error: any; // typeof Error;
+    /**
+    Handles delegating browser events to their corresponding Ember.Views. For example, when you click on
+    a view, Ember.EventDispatcher ensures that that view's mouseDown method gets called.
+    **/
+    class EventDispatcher extends Object {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+        events: {};
+    }
+    /**
+    This mixin allows for Ember objects to subscribe to and emit events.
+    You can also chain multiple event subscriptions.
+    **/
+    class Evented {
+        has(name: string): boolean;
+        off(name: string, target: any, method: Function): Evented;
+        on(name: string, target: any, method: Function): Evented;
+        one(name: string, target: any, method: Function): Evented;
+        trigger(name: string, ...args: string[]): void;
+    }
+    var FROZEN_ERROR: string;
+    class Freezable {
+        freeze(): Freezable;
+        isFrozen: boolean;
+    }
+    var GUID_KEY: string;
+    namespace Handlebars {
+        function compile(string: string): Function;
+        function get(root: any, path: string, options?: {}): any;
+        function helper(name: string, func: Function, dependentKeys?: string): void;
+        function helper(name: string, view: View, dependentKeys?: string): void;
+        class helpers {
+            action(actionName: string, context: any, options?: {}): void;
+            bindAttr(options?: {}): string;
+            connectOutlet(outletName: string, view: {}): void;
+            control(path: string, modelPath: string, options?: {}): string;
+            debugger(property: string): void;
+            disconnectOutlet(outletName: string): void;
+            each(name: string, path: string, options?: {}): void;
+            if(context: Function, options?: {}): string;
+            init(): void;
+            input(options?: {}): void;
+            linkTo(routeName: string, context: any, options?: {}): string;
+            loc(str: string): void;
+            log(property: string): void;
+            outlet(property: string): string;
+            partial(partialName: string): void;
+            render(name: string, context?: string, options?: {}): string;
+            textarea(options?: {}): void;
+            unbound(property: string): string;
+            unless(context: Function, options?: {}): string;
+            view(path: string, options?: {}): string;
+            with(context: Function, options?: {}): string;
+            yield(options?: {}): string;
+        }
+        function precompile(string: string): void;
+        function registerBoundHelper(name: string, func: Function, dependentKeys?: string): void;
+        class Compiler { }
+        class JavaScriptCompiler { }
+        function registerHelper(name: string, fn: Function, inverse?: boolean): void;
+        function registerPartial(name: string, str: any): void;
+        function K(): any;
+        function createFrame(objec: any): any;
+        function Exception(message: string): void;
+        class SafeString {
+            constructor(str: string);
+            static toString(): string;
+        }
+        function parse(string: string): any;
+        function print(ast: any): void;
+        var logger: typeof Ember.Logger;
+        function log(level: string, str: string): void;
+        function compile(environment: any, options?: any, context?: any, asObject?: any): any;
+    }
+    class HashLocation extends Object {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+    }
+    class HistoryLocation extends Object {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+        rootURL: string;
+    }
+    var IS_BINDING: RegExp;
+    class Instrumentation {
+        getProperties(obj: any, list: any[]): {};
+        getProperties(obj: any, ...args: string[]): {};
+        instrument(name: string, payload: any, callback: Function, binding: any): void;
+        reset(): void;
+        subscribe(pattern: string, object: any): void;
+        unsubscribe(subscriber: any): void;
+    }
+    var K: Function;
+    var LOG_BINDINGS: boolean;
+    var LOG_STACKTRACE_ON_DEPRECATION: boolean;
+    var LOG_VERSION: boolean;
+    class LinkView extends View {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+        init(): void;
+        active: any;
+        activeClass: string;
+        attributeBindings: any;
+        classNameBindings: string[];
+        disabled: any;
+        disabledClass: string;
+        eventName: string;
+        href: any;
+        loading: any;
+        loadingClass: string;
+        loadingHref: string;
+        rel: any;
+        replace: boolean;
+        title: any;
+        click: Function;
+    }
+    class Location {
+        create(options?: {}): any;
+        registerImplementation(name: string, implementation: any): void;
+    }
+    var Logger: {
+        assert(param: any): void;
+        debug(...args: any[]): void;
+        error(...args: any[]): void;
+        info(...args: any[]): void;
+        log(...args: any[]): void;
+        warn(...args: any[]): void;
+    };
+    function MANDATORY_SETTER_FUNCTION(value: string): void;
+    var META_KEY: string;
+    class Map {
+        copy(): Map;
+        static create(): Map;
+        forEach(callback: Function, self: any): void;
+        get(key: any): any;
+        has(key: any): boolean;
+        remove(key: any): boolean;
+        set(key: any, value: any): void;
+        length: number;
+    }
+    class MapWithDefault extends Map {
+        copy(): MapWithDefault;
+        static create(): MapWithDefault;
+    }
+    class Mixin {
+        apply(obj: any): any;
+        /**
+        Creates an instance of the class.
+        @param arguments A hash containing values with which to initialize the newly instantiated object.
+        **/
+        static create<T extends Mixin>(...args: CoreObjectArguments[]): T;
+        detect(obj: any): boolean;
+        reopen<T extends Mixin>(args?: {}): T;
+    }
+    class MutableArray implements Array, MutableEnumberable {
+        addArrayObserver(target: any, opts?: EnumerableConfigurationOptions): any[];
+        addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
+        any(callback: Function, target?: any): boolean;
+        anyBy(key: string, value?: string): boolean;
+        arrayContentDidChange(startIdx: number, removeAmt: number, addAmt: number): any[];
+        arrayContentWillChange(startIdx: number, removeAmt: number, addAmt: number): any[];
+        someProperty(key: string, value?: string): boolean;
+        clear(): any[];
+        compact(): any[];
+        contains(obj: any): boolean;
+        enumerableContentDidChange(start: number, removing: number, adding: number): any;
+        enumerableContentDidChange(start: number, removing: Enumerable, adding: number): any;
+        enumerableContentDidChange(start: number, removing: number, adding: Enumerable): any;
+        enumerableContentDidChange(start: number, removing: Enumerable, adding: Enumerable): any;
+        enumerableContentDidChange(removing: number, adding: number): any;
+        enumerableContentDidChange(removing: Enumerable, adding: number): any;
+        enumerableContentDidChange(removing: number, adding: Enumerable): any;
+        enumerableContentDidChange(removing: Enumerable, adding: Enumerable): any;
+        enumerableContentWillChange(removing: number, adding: number): Enumerable;
+        enumerableContentWillChange(removing: Enumerable, adding: number): Enumerable;
+        enumerableContentWillChange(removing: number, adding: Enumerable): Enumerable;
+        enumerableContentWillChange(removing: Enumerable, adding: Enumerable): Enumerable;
+        every(callback: Function, target?: any): boolean;
+        everyBy(key: string, value?: string): boolean;
+        everyProperty(key: string, value?: string): boolean;
+        filter(callback: Function, target: any): any[];
+        filterBy(key: string, value?: string): any[];
+        find(callback: Function, target: any): any;
+        findBy(key: string, value?: string): any;
+        forEach(callback: Function, target?: any): any;
+        getEach(key: string): any[];
+        indexOf(object: any, startAt: number): number;
+        insertAt(idx: number, object: any): any[];
+        invoke(methodName: string, ...args: any[]): any[];
+        lastIndexOf(object: any, startAt: number): number;
+        map: ItemIndexEnumerableCallbackTarget;
+        mapBy(key: string): any[];
+        nextObject(index: number, previousObject: any, context: any): any;
+        objectAt(idx: number): any;
+        objectsAt(...args: number[]): any[];
+        popObject(): any;
+        pushObject(obj: any): any;
+        pushObjects(...args: any[]): any[];
+        reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
+        reject: ItemIndexEnumerableCallbackTarget;
+        rejectBy(key: string, value?: string): any[];
+        removeArrayObserver(target: any, opts: EnumerableConfigurationOptions): any[];
+        removeAt(start: number, len: number): any;
+        removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
+        replace(idx: number, amt: number, objects: any[]): any;
+        reverseObjects(): any[];
+        setEach(key: string, value?: any): any;
+        setObjects(objects: any[]): any[];
+        shiftObject(): any;
+        slice(beginIndex?: number, endIndex?: number): any[];
+        some(callback: Function, target?: any): boolean;
+        toArray(): any[];
+        uniq(): Enumerable;
+        unshiftObject(object: any): any;
+        unshiftObjects(objects: any[]): any[];
+        without(value: any): Enumerable;
+        '[]': any[];
+        '@each': EachProxy;
+        Boolean: boolean;
+        firstObject: any;
+        hasEnumerableObservers: boolean;
+        lastObject: any;
+        length: number;
+        addObject(object: any): any;
+        addObjects(objects: Enumerable): MutableEnumberable;
+        removeObject(object: any): any;
+        removeObjects(objects: Enumerable): MutableEnumberable;
+    }
+    class MutableEnumberable implements Enumerable {
+        addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
+        addObject(object: any): any;
+        addObjects(objects: Enumerable): MutableEnumberable;
+        any(callback: Function, target?: any): boolean;
+        anyBy(key: string, value?: string): boolean;
+        someProperty(key: string, value?: string): boolean;
+        compact(): any[];
+        contains(obj: any): boolean;
+        enumerableContentDidChange(start: number, removing: number, adding: number): any;
+        enumerableContentDidChange(start: number, removing: Enumerable, adding: number): any;
+        enumerableContentDidChange(start: number, removing: number, adding: Enumerable): any;
+        enumerableContentDidChange(start: number, removing: Enumerable, adding: Enumerable): any;
+        enumerableContentDidChange(removing: number, adding: number): any;
+        enumerableContentDidChange(removing: Enumerable, adding: number): any;
+        enumerableContentDidChange(removing: number, adding: Enumerable): any;
+        enumerableContentDidChange(removing: Enumerable, adding: Enumerable): any;
+        enumerableContentWillChange(removing: number, adding: number): Enumerable;
+        enumerableContentWillChange(removing: Enumerable, adding: number): Enumerable;
+        enumerableContentWillChange(removing: number, adding: Enumerable): Enumerable;
+        enumerableContentWillChange(removing: Enumerable, adding: Enumerable): Enumerable;
+        every(callback: Function, target?: any): boolean;
+        everyBy(key: string, value?: string): boolean;
+        everyProperty(key: string, value?: string): boolean;
+        filter(callback: Function, target: any): any[];
+        filterBy(key: string, value?: string): any[];
+        find(callback: Function, target: any): any;
+        findBy(key: string, value?: string): any;
+        forEach(callback: Function, target?: any): any;
+        getEach(key: string): any[];
+        invoke(methodName: string, ...args: any[]): any[];
+        map: ItemIndexEnumerableCallbackTarget;
+        mapBy(key: string): any[];
+        nextObject(index: number, previousObject: any, context: any): any;
+        reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
+        reject: ItemIndexEnumerableCallbackTarget;
+        rejectBy(key: string, value?: string): any[];
+        removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
+        removeObject(object: any): any;
+        removeObjects(objects: Enumerable): MutableEnumberable;
+        setEach(key: string, value?: any): any;
+        some(callback: Function, target?: any): boolean;
+        toArray(): any[];
+        uniq(): Enumerable;
+        without(value: any): Enumerable;
+    '[]': any[];
+        firstObject: any;
+        hasEnumerableObservers: boolean;
+        lastObject: any;
+    }
+    var NAME_KEY: string;
+    class Namespace extends Object {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+    }
+    class NativeArray implements MutableArray, Observable, Copyable {
+        constructor(arr: any[]);
+        static activate(): void;
+        addArrayObserver(target: any, opts?: EnumerableConfigurationOptions): any[];
+        addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
+        any(callback: Function, target?: any): boolean;
+        anyBy(key: string, value?: string): boolean;
+        arrayContentDidChange(startIdx: number, removeAmt: number, addAmt: number): any[];
+        arrayContentWillChange(startIdx: number, removeAmt: number, addAmt: number): any[];
+        someProperty(key: string, value?: any): boolean;
+        clear(): any[];
+        compact(): any[];
+        contains(obj: any): boolean;
+        enumerableContentDidChange(start: number, removing: number, adding: number): any;
+        enumerableContentDidChange(start: number, removing: Enumerable, adding: number): any;
+        enumerableContentDidChange(start: number, removing: number, adding: Enumerable): any;
+        enumerableContentDidChange(start: number, removing: Enumerable, adding: Enumerable): any;
+        enumerableContentDidChange(removing: number, adding: number): any;
+        enumerableContentDidChange(removing: Enumerable, adding: number): any;
+        enumerableContentDidChange(removing: number, adding: Enumerable): any;
+        enumerableContentDidChange(removing: Enumerable, adding: Enumerable): any;
+        enumerableContentWillChange(removing: number, adding: number): Enumerable;
+        enumerableContentWillChange(removing: Enumerable, adding: number): Enumerable;
+        enumerableContentWillChange(removing: number, adding: Enumerable): Enumerable;
+        enumerableContentWillChange(removing: Enumerable, adding: Enumerable): Enumerable;
+        every(callback: Function, target?: any): boolean;
+        everyBy(key: string, value?: string): boolean;
+        everyProperty(key: string, value?: any): boolean;
+        filter(callback: Function, target: any): any[];
+        filterBy(key: string, value?: string): any[];
+        find(callback: Function, target: any): any;
+        findBy(key: string, value?: string): any;
+        forEach(callback: Function, target?: any): any;
+        getEach(key: string): any[];
+        indexOf(object: any, startAt: number): number;
+        insertAt(idx: number, object: any): any[];
+        invoke(methodName: string, ...args: any[]): any[];
+        lastIndexOf(object: any, startAt: number): number;
+        map: ItemIndexEnumerableCallbackTarget;
+        mapBy(key: string): any[];
+        nextObject(index: number, previousObject: any, context: any): any;
+        objectAt(idx: number): any;
+        objectsAt(...args: number[]): any[];
+        popObject(): any;
+        pushObject(obj: any): any;
+        pushObjects(...args: any[]): any[];
+        reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
+        reject: ItemIndexEnumerableCallbackTarget;
+        rejectBy(key: string, value?: string): any[];
+        removeArrayObserver(target: any, opts: EnumerableConfigurationOptions): any[];
+        removeAt(start: number, len: number): any;
+        removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
+        replace(idx: number, amt: number, objects: any[]): any;
+        reverseObjects(): any[];
+        setEach(key: string, value?: any): any;
+        setObjects(objects: any[]): any[];
+        shiftObject(): any;
+        slice(beginIndex?: number, endIndex?: number): any[];
+        some(callback: Function, target?: any): boolean;
+        toArray(): any[];
+        uniq(): Enumerable;
+        unshiftObject(object: any): any;
+        unshiftObjects(objects: any[]): any[];
+        without(value: any): Enumerable;
+        '[]': any[];
+        '@each': EachProxy;
+        Boolean: boolean;
+        firstObject: any;
+        hasEnumerableObservers: boolean;
+        lastObject: any;
+        length: number;
+        addObject(object: any): any;
+        addObjects(objects: Enumerable): MutableEnumberable;
+        removeObject(object: any): any;
+        removeObjects(objects: Enumerable): MutableEnumberable;
+        addObserver: ModifyObserver;
+        beginPropertyChanges(): Observable;
+        cacheFor(keyName: string): any;
+        decrementProperty(keyName: string, decrement?: number): number;
+        endPropertyChanges(): Observable;
+        get(keyName: string): any;
+        getProperties(...args: string[]): {};
+        getProperties(keys: string[]): {};
+        getWithDefault(keyName: string, defaultValue: any): any;
+        hasObserverFor(key: string): boolean;
+        incrementProperty(keyName: string, increment?: number): number;
+        notifyPropertyChange(keyName: string): Observable;
+        propertyDidChange(keyName: string): Observable;
+        propertyWillChange(keyName: string): Observable;
+        removeObserver(key: string, target: any, method: string): void;
+        removeObserver(key: string, target: any, method: Function): void;
+        set(keyName: string, value: any): Observable;
+        setProperties(hash: {}): Observable;
+        toggleProperty(keyName: string): any;
+        copy(deep: boolean): Copyable;
+        frozenCopy(): Copyable;
+    }
+    class NoneLocation extends Object {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+    }
+    var ORDER_DEFINITION: string[];
+    class Object extends CoreObject implements Observable {
+        addObserver: ModifyObserver;
+        beginPropertyChanges(): Observable;
+        cacheFor(keyName: string): any;
+        decrementProperty(keyName: string, decrement?: number): number;
+        endPropertyChanges(): Observable;
+
+        /**
+         * Retrieves the value of a property from the object
+         * @param keyName
+         * @returns {}
+         */
+        get(keyName: string): any;
+
+        /**
+         * Retrieves the value of a property from the object
+         * @param keyName
+         * @returns {}
+         */
+        get<T>(keyName: string): T;
+
+        getProperties(...args: string[]): {};
+        getProperties(keys: string[]): {};
+        getWithDefault(keyName: string, defaultValue: any): any;
+        hasObserverFor(key: string): boolean;
+        incrementProperty(keyName: string, increment?: number): number;
+        notifyPropertyChange(keyName: string): Observable;
+        propertyDidChange(keyName: string): Observable;
+        propertyWillChange(keyName: string): Observable;
+        removeObserver(key: string, target: any, method: string): Observable;
+        removeObserver(key: string, target: any, method: Function): Observable;
+        set(keyName: string, value: any): Observable;
+        setProperties(hash: {}): Observable;
+        toggleProperty(keyName: string): any;
+    }
+    class ObjectController extends ObjectProxy implements ControllerMixin {
+        replaceRoute(name: string, ...args: any[]): void;
+        transitionToRoute(name: string, ...args: any[]): void;
+        controllers: Object;
+        needs: string[];
+        target: any;
+        model: any;
+        queryParams: any;
+        send(name: string, ...args: any[]): void;
+        actions: {};
+    }
+    class ObjectProxy extends Object {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+        /**
+        The object whose properties will be forwarded.
+        **/
+        content: Object;
+    }
+    class Observable {
+        addObserver: ModifyObserver;
+        beginPropertyChanges(): Observable;
+        cacheFor(keyName: string): any;
+        decrementProperty(keyName: string, decrement?: number): number;
+        endPropertyChanges(): Observable;
+        get(keyName: string): any;
+        getProperties(...args: string[]): {};
+        getProperties(keys: string[]): {};
+        getWithDefault(keyName: string, defaultValue: any): any;
+        hasObserverFor(key: string): boolean;
+        incrementProperty(keyName: string, increment?: number): number;
+        notifyPropertyChange(keyName: string): Observable;
+        propertyDidChange(keyName: string): Observable;
+        propertyWillChange(keyName: string): Observable;
+        removeObserver(key: string, target: {}, method: string): void;
+        removeObserver(key: string, target: {}, method: Function): void;
+        set(keyName: string, value: any): Observable;
+        setProperties(hash: {}): Observable;
+        /**
+        Set the value of a boolean property to the opposite of its current value.
+        */
+        toggleProperty(keyName: string): boolean;
+    }
+    class OrderedSet {
+        add(obj: any): void;
+        clear(): void;
+        copy(): OrderedSet;
+        static create(): OrderedSet;
+        forEach(fn: Function, self: any): void;
+        has(obj: any): boolean;
+        isEmpty(): boolean;
+        remove(obj: any): void;
+        toArray(): any[];
+    }
+
+    // FYI - RSVP source comes from https://github.com/tildeio/rsvp.js/blob/master/lib/rsvp/promise.js
+    namespace RSVP {
+        interface PromiseResolve {
+            (value?: any): void;
+        }
+        interface PromiseReject {
+            (reason?: any): void;
+        }
+        interface PromiseResolverFunction {
+            (resolve: PromiseResolve, reject: PromiseReject): void;
+        }
+
+        class Promise {
+
+            /**
+              Promise objects represent the eventual result of an asynchronous operation. The
+              primary way of interacting with a promise is through its `then` method, which
+              registers callbacks to receive either a promise's eventual value or the reason
+              why the promise cannot be fulfilled.
+              @class RSVP.Promise
+              @param {function} resolver
+              @param {String} label optional string for labeling the promise.
+              Useful for tooling.
+              @constructor
+            */
+            constructor(resolver: PromiseResolverFunction, label?: string);
+
+            /**
+              The primary way of interacting with a promise is through its `then` method,
+              which registers callbacks to receive either a promise's eventual value or the
+              reason why the promise cannot be fulfilled.
+              @method then
+              @param {Function} onFulfilled
+              @param {Function} onRejected
+              @param {String} label optional string for labeling the promise.
+              Useful for tooling.
+              @return {Promise}
+            */
+            then(onFulfilled?: Function, onRejected?: Function): Promise;
+
+            /**
+            `catch` is simply sugar for `then(undefined, onRejection)` which makes it the same
+            as the catch block of a try/catch statement.
+
+            @method catch
+            @param {Function} onRejection
+            @param {String} label optional string for labeling the promise.
+            Useful for tooling.
+            @return {Promise}
+            */
+            catch(onRejection: Function, label?: string): Promise;
+
+            /**
+            `finally` will be invoked regardless of the promise's fate just as native
+            try/catch/finally behaves
+
+            @method finally
+            @param {Function} callback
+            @param {String} label optional string for labeling the promise.
+            Useful for tooling.
+            @return {Promise}
+            */
+            finally(callback: Function, label?: string): Promise;
+        }
+    }
+    class RenderBuffer {
+        addClass(className: string): RenderBuffer;
+        attr(name: string, value: any): any;
+        element(): HTMLElement;
+        id(id: string): RenderBuffer;
+        prop(name: string, value: string): any;
+        push(string: string): RenderBuffer;
+        removeAttr(name: string): RenderBuffer;
+        removeProp(name: string): RenderBuffer;
+        string(): string;
+        style(name: string, value: string): RenderBuffer;
+        classes: any[];
+        elementAttributes: {};
+        elementId: string;
+        elementProperties: {};
+        elementStyle: {};
+        elementTag: string;
+        parentBuffer: RenderBuffer;
+    }
+
+    /**
+      The `Ember.Route` class is used to define individual routes. Refer to
+      the [routing guide](http://emberjs.com/guides/routing/) for documentation.
+    */
+    class Route extends Object implements ActionHandlerMixin, Evented {
+
+        static isClass: boolean;
+        static isMethod: boolean;
+
+        /**
+        This hook is executed when the router enters the route. It is not executed
+        when the model for the route changes.
+        @method activate
+        */
+        activate: Function;
+
+        /**
+        This hook is called after this route's model has resolved.
+        It follows identical async/promise semantics to `beforeModel`
+        but is provided the route's resolved model in addition to
+        the `transition`, and is therefore suited to performing
+        logic that can only take place after the model has already
+        resolved.
+
+        Refer to documentation for `beforeModel` for a description
+        of transition-pausing semantics when a promise is returned
+        from this hook.
+        @method afterModel
+        @param {Object} resolvedModel the value returned from `model`,
+            or its resolved value if it was a promise
+        @param {Transition} transition
+        @return {Promise} if the value returned from this hook is
+            a promise, the transition will pause until the transition
+            resolves. Otherwise, non-promise return values are not
+            utilized in any way.
+        */
+        afterModel(resolvedModel: any, transition: EmberStates.Transition): RSVP.Promise;
+
+        /**
+        This hook is the first of the route entry validation hooks
+        called when an attempt is made to transition into a route
+        or one of its children. It is called before `model` and
+        `afterModel`, and is appropriate for cases when:
+        1) A decision can be made to redirect elsewhere without
+            needing to resolve the model first.
+        2) Any async operations need to occur first before the
+            model is attempted to be resolved.
+        This hook is provided the current `transition` attempt
+        as a parameter, which can be used to `.abort()` the transition,
+        save it for a later `.retry()`, or retrieve values set
+        on it from a previous hook. You can also just call
+        `this.transitionTo` to another route to implicitly
+        abort the `transition`.
+        You can return a promise from this hook to pause the
+        transition until the promise resolves (or rejects). This could
+        be useful, for instance, for retrieving async code from
+        the server that is required to enter a route.
+
+        @method beforeModel
+        @param {Transition} transition
+        @return {Promise} if the value returned from this hook is
+            a promise, the transition will pause until the transition
+            resolves. Otherwise, non-promise return values are not
+            utilized in any way.
+        */
+        beforeModel(transition: EmberStates.Transition): RSVP.Promise;
+
+        /**
+        The controller associated with this route.
+
+        @property controller
+        @type Ember.Controller
+        @since 1.6.0
+        */
+        controller: Controller;
+
+        /**
+        Returns the controller for a particular route or name.
+        The controller instance must already have been created, either through entering the
+        associated route or using `generateController`.
+
+        @method controllerFor
+        @param {String} name the name of the route or controller
+        @return {Ember.Controller}
+        */
+        controllerFor(name: string): Controller;
+
+        /**
+        The name of the controller to associate with this route.
+        By default, Ember will lookup a route's controller that matches the name
+        of the route (i.e. `App.PostController` for `App.PostRoute`). However,
+        if you would like to define a specific controller to use, you can do so
+        using this property.
+        This is useful in many ways, as the controller specified will be:
+        * passed to the `setupController` method.
+        * used as the controller for the view being rendered by the route.
+        * returned from a call to `controllerFor` for the route.
+        @property controllerName
+        @type String
+        @default null
+        @since 1.4.0
+        */
+        controllerName: string;
+
+        /**
+        This hook is executed when the router completely exits this route. It is
+        not executed when the model for the route changes.
+        @method deactivate
+        */
+        deactivate: Function;
+
+        /**
+        Deserializes value of the query parameter based on defaultValueType
+        @method deserializeQueryParam
+        @param {Object} value
+        @param {String} urlKey
+        @param {String} defaultValueType
+        */
+        deserializeQueryParam(value: any, urlKey: string, defaultValueType: string): any;
+
+        /**
+        Disconnects a view that has been rendered into an outlet.
+        You may pass any or all of the following options to `disconnectOutlet`:
+        * `outlet`: the name of the outlet to clear (default: 'main')
+        * `parentView`: the name of the view containing the outlet to clear
+            (default: the view rendered by the parent route)
+
+        @method disconnectOutlet
+        @param {Object|String} options the options hash or outlet name
+        */
+        disconnectOutlet(options: DisconnectOutletOptions|string): void;
+
+        /**
+        @method findModel
+        @param {String} type the model type
+        @param {Object} value the value passed to find
+        */
+        findModel(type: string, value: any): any;
+
+        /**
+        Generates a controller for a route.
+        If the optional model is passed then the controller type is determined automatically,
+        e.g., an ArrayController for arrays.
+
+        @method generateController
+        @param {String} name the name of the controller
+        @param {Object} model the model to infer the type of the controller (optional)
+        */
+        generateController(name: string, model: {}): Controller;
+
+        /**
+        Perform a synchronous transition into another route without attempting
+        to resolve promises, update the URL, or abort any currently active
+        asynchronous transitions (i.e. regular transitions caused by
+        `transitionTo` or URL changes).
+        This method is handy for performing intermediate transitions on the
+        way to a final destination route, and is called internally by the
+        default implementations of the `error` and `loading` handlers.
+        @method intermediateTransitionTo
+        @param {String} name the name of the route
+        @param {...Object} models the model(s) to be used while transitioning
+        to the route.
+        @since 1.2.0
+        */
+        intermediateTransitionTo(name: string, ...models: any[]): void;
+
+        /**
+        A hook you can implement to convert the URL into the model for
+        this route.
+
+        @method model
+        @param {Object} params the parameters extracted from the URL
+        @param {Transition} transition
+        @return {Object|Promise} the model for this route. If
+            a promise is returned, the transition will pause until
+            the promise resolves, and the resolved value of the promise
+            will be used as the model for this route.
+        */
+        model(params: {}, transition: EmberStates.Transition): any|RSVP.Promise;
+
+        /**
+        Returns the model of a parent (or any ancestor) route
+        in a route hierarchy.  During a transition, all routes
+        must resolve a model object, and if a route
+        needs access to a parent route's model in order to
+        resolve a model (or just reuse the model from a parent),
+        it can call `this.modelFor(theNameOfParentRoute)` to
+        retrieve it.
+
+        @method modelFor
+        @param {String} name the name of the route
+        @return {Object} the model object
+        */
+        modelFor(name: string): {};
+
+        /**
+        Retrieves parameters, for current route using the state.params
+        variable and getQueryParamsFor, using the supplied routeName.
+        @method paramsFor
+        @param {String} name
+        */
+        paramsFor(name: string) : any;
+
+        /**
+        Configuration hash for this route's queryParams.
+        @property queryParams
+        @for Ember.Route
+        @type Hash
+        */
+        queryParams: {};
+
+        /**
+        Refresh the model on this route and any child routes, firing the
+        `beforeModel`, `model`, and `afterModel` hooks in a similar fashion
+        to how routes are entered when transitioning in from other route.
+        The current route params (e.g. `article_id`) will be passed in
+        to the respective model hooks, and if a different model is returned,
+        `setupController` and associated route hooks will re-fire as well.
+        An example usage of this method is re-querying the server for the
+        latest information using the same parameters as when the route
+        was first entered.
+        Note that this will cause `model` hooks to fire even on routes
+        that were provided a model object when the route was initially
+        entered.
+        @method refresh
+        @return {Transition} the transition object associated with this
+            attempted transition
+        @since 1.4.0
+        */
+        redirect(): EmberStates.Transition;
+
+
+        /**
+        Refresh the model on this route and any child routes, firing the
+        `beforeModel`, `model`, and `afterModel` hooks in a similar fashion
+        to how routes are entered when transitioning in from other route.
+        The current route params (e.g. `article_id`) will be passed in
+        to the respective model hooks, and if a different model is returned,
+        `setupController` and associated route hooks will re-fire as well.
+        An example usage of this method is re-querying the server for the
+        latest information using the same parameters as when the route
+        was first entered.
+        Note that this will cause `model` hooks to fire even on routes
+        that were provided a model object when the route was initially
+        entered.
+        @method refresh
+        @return {Transition} the transition object associated with this
+            attempted transition
+        @since 1.4.0
+        */
+        refresh(): EmberStates.Transition;
+
+        /**
+        `render` is used to render a template into a region of another template
+        (indicated by an `{{outlet}}`). `render` is used both during the entry
+        phase of routing (via the `renderTemplate` hook) and later in response to
+        user interaction.
+
+        @method render
+        @param {String} name the name of the template to render
+        @param {Object} [options] the options
+        @param {String} [options.into] the template to render into,
+                        referenced by name. Defaults to the parent template
+        @param {String} [options.outlet] the outlet inside `options.template` to render into.
+                        Defaults to 'main'
+        @param {String|Object} [options.controller] the controller to use for this template,
+                        referenced by name or as a controller instance. Defaults to the Route's paired controller
+        @param {Object} [options.model] the model object to set on `options.controller`.
+                        Defaults to the return value of the Route's model hook
+        */
+        render(name: string, options?: RenderOptions): void;
+
+        /**
+        A hook you can use to render the template for the current route.
+        This method is called with the controller for the current route and the
+        model supplied by the `model` hook. By default, it renders the route's
+        template, configured with the controller for the route.
+        This method can be overridden to set up and render additional or
+        alternative templates.
+
+        @method renderTemplate
+        @param {Object} controller the route's controller
+        @param {Object} model the route's model
+        */
+        renderTemplate(controller: Controller, model: {}): void;
+
+        /**
+        Transition into another route while replacing the current URL, if possible.
+        This will replace the current history entry instead of adding a new one.
+        Beside that, it is identical to `transitionTo` in all other respects. See
+        'transitionTo' for additional information regarding multiple models.
+
+        @method replaceWith
+        @param {String} name the name of the route or a URL
+        @param {...Object} models the model(s) or identifier(s) to be used while
+            transitioning to the route.
+        @return {Transition} the transition object associated with this
+            attempted transition
+        */
+        replaceWith(name: string, ...models: any[]): void;
+
+        /**
+        A hook you can use to reset controller values either when the model
+        changes or the route is exiting.
+
+        @method resetController
+        @param {Controller} controller instance
+        @param {Boolean} isExiting
+        @param {Object} transition
+        @since 1.7.0
+        */
+        resetController(controller: Ember.Controller, isExiting: boolean, transition: any): void;
+
+        /**
+        A hook you can implement to convert the route's model into parameters
+        for the URL.
+
+        The default `serialize` method will insert the model's `id` into the
+        route's dynamic segment (in this case, `:post_id`) if the segment contains '_id'.
+        If the route has multiple dynamic segments or does not contain '_id', `serialize`
+        will return `Ember.getProperties(model, params)`
+        This method is called when `transitionTo` is called with a context
+        in order to populate the URL.
+        @method serialize
+        @param {Object} model the route's model
+        @param {Array} params an Array of parameter names for the current
+            route (in the example, `['post_id']`.
+        @return {Object} the serialized parameters
+        */
+        serialize(model: {}, params: string[]): string;
+
+        /**
+        Serializes value of the query parameter based on defaultValueType
+        @method serializeQueryParam
+        @param {Object} value
+        @param {String} urlKey
+        @param {String} defaultValueType
+        */
+        serializeQueryParam(value: any, urlKey: string, defaultValueType: string): string;
+
+        /**
+        Serializes the query parameter key
+        @method serializeQueryParamKey
+        @param {String} controllerPropertyName
+        */
+        serializeQueryParamKey(controllerPropertyName: string): string;
+
+        /**
+        A hook you can use to setup the controller for the current route.
+        This method is called with the controller for the current route and the
+        model supplied by the `model` hook.
+        By default, the `setupController` hook sets the `model` property of
+        the controller to the `model`.
+        If you implement the `setupController` hook in your Route, it will
+        prevent this default behavior. If you want to preserve that behavior
+        when implementing your `setupController` function, make sure to call
+        `_super`
+        @method setupController
+        @param {Controller} controller instance
+        @param {Object} model
+        */
+        setupController(controller: Controller, model: {}): void;
+
+        /**
+        Store property provides a hook for data persistence libraries to inject themselves.
+        By default, this store property provides the exact same functionality previously
+        in the model hook.
+        Currently, the required interface is:
+        `store.find(modelName, findArguments)`
+        @method store
+        @param {Object} store
+        */
+        store(store: any): any;
+
+        /**
+        The name of the template to use by default when rendering this routes
+        template.
+        This is similar with `viewName`, but is useful when you just want a custom
+        template without a view.
+
+        @property templateName
+        @type String
+        @default null
+        @since 1.4.0
+        */
+        templateName: string;
+
+        /**
+        Transition the application into another route. The route may
+        be either a single route or route path
+
+        @method transitionTo
+        @param {String} name the name of the route or a URL
+        @param {...Object} models the model(s) or identifier(s) to be used while
+        transitioning to the route.
+        @param {Object} [options] optional hash with a queryParams property
+        containing a mapping of query parameters
+        @return {Transition} the transition object associated with this
+        attempted transition
+        */
+        transitionTo(name: string, ...object: any[]): EmberStates.Transition;
+
+        /**
+        The name of the view to use by default when rendering this routes template.
+        When rendering a template, the route will, by default, determine the
+        template and view to use from the name of the route itself. If you need to
+        define a specific view, set this property.
+        This is useful when multiple routes would benefit from using the same view
+        because it doesn't require a custom `renderTemplate` method.
+        @property viewName
+        @type String
+        @default null
+        @since 1.4.0
+        */
+        viewName: string;
+
+        // ActionHandlerMixin methods
+
+        /**
+        Sends an action to the router, which will delegate it to the currently
+        active route hierarchy per the bubbling rules explained under actions
+
+        @method send
+        @param {String} actionName The action to trigger
+        @param {*} context a context to send with the action
+        */
+        send(name: string, ...args: any[]): void;
+
+        /**
+        The collection of functions, keyed by name, available on this
+        `ActionHandler` as action targets.
+        These functions will be invoked when a matching `{{action}}` is triggered
+        from within a template and the application's current route is this route.
+        Actions can also be invoked from other parts of your application
+        via `ActionHandler#send`.
+        The `actions` hash will inherit action handlers from
+        the `actions` hash defined on extended parent classes
+        or mixins rather than just replace the entire hash.
+
+        Within a Controller, Route, View or Component's action handler,
+        the value of the `this` context is the Controller, Route, View or
+        Component object:
+
+        It is also possible to call `this._super.apply(this, arguments)` from within an
+        action handler if it overrides a handler defined on a parent
+        class or mixin.
+
+        ## Bubbling
+        By default, an action will stop bubbling once a handler defined
+        on the `actions` hash handles it. To continue bubbling the action,
+        you must return `true` from the handler
+
+        @property actions
+        @type Hash
+        @default null
+        */
+        actions: ActionsHash;
+
+        // Evented methods
+
+        /**
+        Subscribes to a named event with given function.
+
+        An optional target can be passed in as the 2nd argument that will
+        be set as the "this" for the callback. This is a good way to give your
+        function access to the object triggering the event. When the target
+        parameter is used the callback becomes the third argument.
+
+        @method on
+        @param {String} name The name of the event
+        @param {Object} [target] The "this" binding for the callback
+        @param {Function} method The callback to execute
+        @return this
+        */
+        on(name: string, target: any, method: Function): Evented;
+
+        /**
+        Subscribes a function to a named event and then cancels the subscription
+        after the first time the event is triggered. It is good to use ``one`` when
+        you only care about the first time an event has taken place.
+        This function takes an optional 2nd argument that will become the "this"
+        value for the callback. If this argument is passed then the 3rd argument
+        becomes the function.
+
+        @method one
+        @param {String} name The name of the event
+        @param {Object} [target] The "this" binding for the callback
+        @param {Function} method The callback to execute
+        @return this
+        */
+        one(name: string, target: any, method: Function): Evented;
+
+        /**
+        Triggers a named event for the object. Any additional arguments
+        will be passed as parameters to the functions that are subscribed to the
+        event.
+
+        @method trigger
+        @param {String} name The name of the event
+        @param {Object...} args Optional arguments to pass on
+        */
+        trigger(name: string, ...args: string[]): void;
+
+        /**
+        Cancels subscription for given name, target, and method.
+
+        @method off
+        @param {String} name The name of the event
+        @param {Object} target The target of the subscription
+        @param {Function} method The function of the subscription
+        @return this
+        */
+        off(name: string, target:any , method: Function): Evented;
+
+        /**
+        Checks to see if object has any subscriptions for named event.
+
+        @method has
+        @param {String} name The name of the event
+        @return {Boolean} does the object have a subscription for event
+        */
+        has(name: string): boolean;
+    }
+
+    class Router extends Object {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+        map(callback: Function): Router;
+    }
+    class RouterDSL {
+        resource(name: string, options?: {}, callback?: Function): void;
+        resource(name: string, callback: Function): void;
+        route(name: string, options?: {}): void;
+    }
+    var SHIM_ES5: boolean;
+    var STRINGS: boolean;
+    class Select extends View {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+        content: any[];
+        groupView: View;
+        multiple: boolean;
+        optionGroupPath: string;
+        optionLabelPath: string;
+        optionValuePath: string;
+        optionView: View;
+        prompt: string;
+        selection: any;
+        value: string;
+    }
+    class SelectOption extends View {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+    }
+    class Set extends CoreObject implements MutableEnumberable, Copyable, Freezable {
+        addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Set;
+        addObject(object: any): any;
+        addObjects(objects: Enumerable): Set;
+        any(callback: Function, target?: any): boolean;
+        anyBy(key: string, value?: string): boolean;
+        someProperty(key: string, value?: string): boolean;
+        compact(): any[];
+        contains(obj: any): boolean;
+        enumerableContentDidChange(start: number, removing: number, adding: number): any;
+        enumerableContentDidChange(start: number, removing: Enumerable, adding: number): any;
+        enumerableContentDidChange(start: number, removing: number, adding: Enumerable): any;
+        enumerableContentDidChange(start: number, removing: Enumerable, adding: Enumerable): any;
+        enumerableContentDidChange(removing: number, adding: number): any;
+        enumerableContentDidChange(removing: Enumerable, adding: number): any;
+        enumerableContentDidChange(removing: number, adding: Enumerable): any;
+        enumerableContentDidChange(removing: Enumerable, adding: Enumerable): any;
+        enumerableContentWillChange(removing: number, adding: number): Set;
+        enumerableContentWillChange(removing: Enumerable, adding: number): Set;
+        enumerableContentWillChange(removing: number, adding: Enumerable): Set;
+        enumerableContentWillChange(removing: Enumerable, adding: Enumerable): Set;
+        every(callback: Function, target?: any): boolean;
+        everyBy(key: string, value?: string): boolean;
+        everyProperty(key: string, value?: string): boolean;
+        filter(callback: Function, target: any): any[];
+        filterBy(key: string, value?: string): any[];
+        find(callback: Function, target: any): any;
+        findBy(key: string, value?: string): any;
+        forEach(callback: Function, target?: any): any;
+        getEach(key: string): any[];
+        invoke(methodName: string, ...args: any[]): any[];
+        map: ItemIndexEnumerableCallbackTarget;
+        mapBy(key: string): any[];
+        nextObject(index: number, previousObject: any, context: any): any;
+        reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
+        reject: ItemIndexEnumerableCallbackTarget;
+        rejectBy(key: string, value?: string): any[];
+        removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Set;
+        removeObject(object: any): any;
+        removeObjects(objects: Enumerable): Set;
+        setEach(key: string, value?: any): any;
+        some(callback: Function, target?: any): boolean;
+        toArray(): any[];
+        uniq(): Set;
+        without(value: any): Set;
+        '[]': any[];
+        firstObject: any;
+        hasEnumerableObservers: boolean;
+        lastObject: any;
+        copy(deep: boolean): Set;
+        frozenCopy(): Set;
+        freeze(): Set;
+        isFrozen: boolean;
+        add(obj: any): Set;
+        addEach(...args: any[]): Set;
+        clear(): Set;
+        isEqual(obj: Set): boolean;
+        pop(): any;
+        push(obj: any): Set;
+        remove(obj: any): Set;
+        removeEach(...args: any[]): Set;
+        shift(): any;
+        unshift(obj: any): Set;
+        length: number;
+    }
+    class SortableMixin implements MutableEnumberable {
+        addEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
+        addObject(object: any): any;
+        addObjects(objects: Enumerable): MutableEnumberable;
+        any(callback: Function, target?: any): boolean;
+        anyBy(key: string, value?: string): boolean;
+        someProperty(key: string, value?: string): boolean;
+        compact(): any[];
+        contains(obj: any): boolean;
+        enumerableContentDidChange(start: number, removing: number, adding: number): any;
+        enumerableContentDidChange(start: number, removing: Enumerable, adding: number): any;
+        enumerableContentDidChange(start: number, removing: number, adding: Enumerable): any;
+        enumerableContentDidChange(start: number, removing: Enumerable, adding: Enumerable): any;
+        enumerableContentDidChange(removing: number, adding: number): any;
+        enumerableContentDidChange(removing: Enumerable, adding: number): any;
+        enumerableContentDidChange(removing: number, adding: Enumerable): any;
+        enumerableContentDidChange(removing: Enumerable, adding: Enumerable): any;
+        enumerableContentWillChange(removing: number, adding: number): Enumerable;
+        enumerableContentWillChange(removing: Enumerable, adding: number): Enumerable;
+        enumerableContentWillChange(removing: number, adding: Enumerable): Enumerable;
+        enumerableContentWillChange(removing: Enumerable, adding: Enumerable): Enumerable;
+        every(callback: Function, target?: any): boolean;
+        everyBy(key: string, value?: string): boolean;
+        everyProperty(key: string, value?: string): boolean;
+        filter(callback: Function, target: any): any[];
+        filterBy(key: string, value?: string): any[];
+        find(callback: Function, target: any): any;
+        findBy(key: string, value?: string): any;
+        forEach(callback: Function, target?: any): any;
+        getEach(key: string): any[];
+        invoke(methodName: string, ...args: any[]): any[];
+        map: ItemIndexEnumerableCallbackTarget;
+        mapBy(key: string): any[];
+        nextObject(index: number, previousObject: any, context: any): any;
+        reduce(callback: ReduceCallback, initialValue: any, reducerProperty: string): any;
+        reject: ItemIndexEnumerableCallbackTarget;
+        rejectBy(key: string, value?: string): any[];
+        removeEnumerableObserver(target: any, opts: EnumerableConfigurationOptions): Enumerable;
+        removeObject(object: any): any;
+        removeObjects(objects: Enumerable): MutableEnumberable;
+        setEach(key: string, value?: any): any;
+        some(callback: Function, target?: any): boolean;
+        toArray(): any[];
+        uniq(): Enumerable;
+        without(value: any): Enumerable;
+        '[]': any[];
+        arrangedContent: any;
+        firstObject: any;
+        hasEnumerableObservers: boolean;
+        lastObject: any;
+        sortAscending: boolean;
+        sortFunction: Comparable;
+        sortProperties: any[];
+    }
+    class State extends Object implements Evented {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+        has(name: string): boolean;
+        off(name: string, target: any, method: Function): State;
+        on(name: string, target: any, method: Function): State;
+        one(name: string, target: any, method: Function): State;
+        trigger(name: string, ...args: string[]): void;
+        getPathsCache(stateManager: {}, path: string): {};
+        init(): void;
+        setPathsCache(stateManager: {}, path: string, transitions: any): void;
+        static transitionTo(target: string): void;
+        hasContext: boolean;
+        isLeaf: boolean;
+        name: string;
+        parentState: State;
+        path: string;
+        enter: Function;
+        exit: Function;
+        setup: Function;
+    }
+    class StateManager extends State {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+        contextFreeTransition(currentState: State, path: string): TransitionsHash;
+        enterState(transition: TransitionsHash): void;
+        getState(name: string): State;
+        getStateByPath(root: State, path: string): State;
+        getStateMeta(state: State, key: string): any;
+        getStatesInPath(root: State, path: string): State[];
+        goToState(path: string, context: any): void;
+        send(event: string): void;
+        setStateMeta(state: State, key: string, value: any): any;
+        stateMetaFor(state: State): {};
+        transitionTo(path: string, context: any): void;
+        triggerSetupContext(transitions: TransitionsHash): void;
+        unhandledEvent(manager: StateManager, event: string): any;
+        currentPath: string;
+        currentState: State;
+        errorOnUnhandledEvents: boolean;
+        transitionEvent: string;
+    }
+    namespace String {
+        function camelize(str: string): string;
+        function capitalize(str: string): string;
+        function classify(str: string): string;
+        function dasherize(str: string): string;
+        function decamelize(str: string): string;
+        function fmt(...args: string[]): string;
+        function htmlSafe(str: string): void; // TODO: @returns Handlebars.SafeStringStatic;
+        function loc(...args: string[]): string;
+        function underscore(str: string): string;
+        function w(str: string): string[];
+    }
+    var TEMPLATES: {};
+    class TargetActionSupport {
+        triggerAction(opts: {}): boolean;
+    }
+    class Test {
+        click(selector: string): RSVP.Promise;
+        fillin(selector: string, text: string): RSVP.Promise;
+        find(selector: string): JQuery;
+        findWithAssert(selector: string): JQuery;
+        injectTestHelpers(): void;
+        keyEvent(selector: string, type: string, keyCode: number): RSVP.Promise;
+        static oninjectHelpers(callback: Function): void;
+        static promise(resolver: Function): RSVP.Promise;
+        static registerHelper(name: string, helperMethod: Function): void;
+        removeTestHelpers(): void;
+        setupForTesting(): void;
+        static unregisterHelper(name: string): void;
+        visit(url: string): RSVP.Promise;
+        wait(value: any): RSVP.Promise;
+        static adapter: Object;
+        testHelpers: {};
+    }
+    class TextArea extends View implements TextSupport {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+        cancel(event: Function): void;
+        focusIn(event: Function): void;
+        focusOut(event: Function): void;
+        insertNewLine(event: Function): void;
+        keyPress(event: Function): void;
+        action: string;
+        bubbles: boolean;
+        onEvent: string;
+    }
+    class TextField extends View implements TextSupport {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+        cancel(event: Function): void;
+        focusIn(event: Function): void;
+        focusOut(event: Function): void;
+        insertNewLine(event: Function): void;
+        keyPress(event: Function): void;
+        action: string;
+        bubbles: boolean;
+        onEvent: string;
+        pattern: string;
+        size: string;
+        type: string;
+        value: string;
+    }
+    class TextSupport {
+        cancel(event: Function): void;
+        focusIn(event: Function): void;
+        focusOut(event: Function): void;
+        insertNewLine(event: Function): void;
+        keyPress(event: Function): void;
+        action: string;
+        bubbles: boolean;
+        onEvent: string;
+    }
+    var VERSION: string;
+    class View extends CoreView {
+        static detect(obj: any): boolean;
+        static detectInstance(obj: any): boolean;
+        /**
+        Iterate over each computed property for the class, passing its name and any
+        associated metadata (see metaForProperty) to the callback.
+        **/
+        static eachComputedProperty(callback: Function, binding: {}): void;
+        /**
+        Returns the original hash that was passed to meta().
+        @param key property name
+        **/
+        static metaForProperty(key: string): {};
+        static isClass: boolean;
+        static isMethod: boolean;
+        $(): JQuery;
+        append(): View;
+        // ReSharper disable InconsistentNaming
+        appendTo(A: string): View;
+        appendTo(A: HTMLElement): View;
+        appendTo(A: JQuery): View;
+        // ReSharper restore InconsistentNaming
+        createChildView(viewClass: {}, attrs?: {}): View;
+        createChildView(viewClass: string, attrs?: {}): View;
+        createElement(): View;
+        destroy(): View;
+        destroyElement(): View;
+        findElementInParentElement(parentElement: HTMLElement): HTMLElement;
+        remove(): View;
+        removeAllChildren(): View;
+        removeChild(view: View): View;
+        removeFromParent(): View;
+        render(buffer: RenderBuffer): void;
+        // ReSharper disable InconsistentNaming
+        replaceIn(A: string): View;
+        replaceIn(A: HTMLElement): View;
+        replaceIn(A: JQuery): View;
+        // ReSharper restore InconsistentNaming
+        rerender(): void;
+        ariaRole: string;
+        attributeBindings: any;
+        classNameBindings: string[];
+        classNames: string[];
+        context: any;
+        controller: any;
+        element: HTMLElement;
+        isView: boolean;
+        isVisible: boolean;
+        layout: Function;
+        layoutName: string;
+        nearestChildOf: View;
+        nearestOfType: View;
+        nearestWithProperty: View;
+        tagName: string;
+        template: Function;
+        templateName: string;
+        templates: {};
+        views: {};
+        didInsertElement: Function;
+        parentViewDidChange: Function;
+        willClearRender: Function;
+        willDestroyElement: Function;
+        willInsertElement: Function;
+    }
+    class ViewTargetActionSupport extends Mixin {
+        target: any;
+        actionContext: any;
+    }
+    var ViewUtils: {}; // TODO: define interface
+    function addBeforeObserver(obj: any, path: string, target: any, method: Function): any;
+    function addListener(obj: any, eventName: string, target: any, method: Function, once?: boolean): void;
+    function addListener(obj: any, eventName: string, target: any, method: string, once?: boolean): void;
+    function addListener(obj: any, eventName: string, func: Function, method: Function, once?: boolean): void;
+    function addListener(obj: any, eventName: string, func: Function, method: string, once?: boolean): void;
+    var addObserver: ModifyObserver;
+    /**
+    Ember.alias is deprecated. Please use Ember.aliasMethod or Ember.computed.alias instead.
+    **/
+    var alias: typeof deprecateFunc;
+    function aliasMethod(methodName: string): Descriptor;
+    var anyUnprocessedMixins: boolean;
+    function assert(desc: string, test: boolean): void;
+    function beforeObserver(func: Function, propertyName: string): Function;
+    function beforeObserversFor(obj: any, path: string): string[];
+    function beginPropertyChanges(): void;
+    function bind(obj: any, to: string, from: string): Binding;
+    function cacheFor(obj: any, key: string): any;
+    function canInvoke(obj: any, methodName: string): boolean;
+    function changeProperties(callback: Function, binding?: any): void;
+    function compare(v: any, w: any): number;
+    // ReSharper disable once DuplicatingLocalDeclaration
+    var computed: {
+        (...args: any[]): ComputedProperty;
+        alias(dependentKey: string): ComputedProperty;
+        and(...args: string[]): ComputedProperty;
+        any(...args: string[]): ComputedProperty;
+        bool(dependentKey: string): ComputedProperty;
+        defaultTo(defaultPath: string): ComputedProperty;
+        empty(dependentKey: string): ComputedProperty;
+        equal(dependentKey: string, value: any): ComputedProperty;
+        gt(dependentKey: string, value: number): ComputedProperty;
+        gte(dependentKey: string, value: number): ComputedProperty;
+        lt(dependentKey: string, value: number): ComputedProperty;
+        lte(dependentKey: string, value: number): ComputedProperty;
+        map(...args: string[]): ComputedProperty;
+        match(dependentKey: string, regexp: RegExp): ComputedProperty;
+        none(dependentKey: string): ComputedProperty;
+        not(dependentKey: string): ComputedProperty;
+        notEmpty(dependentKey: string): ComputedProperty;
+        oneWay(dependentKey: string): ComputedProperty;
+        or(...args: string[]): ComputedProperty;
+    };
+    // ReSharper disable DuplicatingLocalDeclaration
+    var config: {};
+    // ReSharper restore DuplicatingLocalDeclaration
+    function controllerFor(container: Container, controllerName: string, lookupOptions?: {}): Controller;
+    function copy(obj: any, deep: boolean): any;
+    /**
+    Creates an instance of the CoreObject class.
+    @param arguments A hash containing values with which to initialize the newly instantiated object.
+    **/
+    function create(arguments?: {}): CoreObject;
+    function debug(message: string): void;
+    function defineProperty(obj: any, keyName: string, desc: {}): void;
+    function deprecate(message: string, test?: boolean): void;
+    function deprecateFunc(message: string, func: Function): Function;
+    function destroy(obj: any): void;
+    /**
+    Ember.empty is deprecated. Please use Ember.isEmpty instead.
+    **/
+    // ReSharper disable once DuplicatingLocalDeclaration
+    var empty: typeof deprecateFunc;
+    function endPropertyChanges(): void;
+    // ReSharper disable once DuplicatingLocalDeclaration
+    var exports: {};
+    function finishChains(obj: any): void;
+    function flushPendingChains(): void;
+    function generateController(container: Container, controllerName: string, context: any): Controller;
+    function generateGuid(obj: any, prefix?: string): string;
+    function get(obj: any, keyName: string): any;
+    function getMeta(obj: any, property: string): any;
+    /**
+    getPath is deprecated since get now supports paths.
+    **/
+    var getPath: typeof deprecateFunc;
+    function getWithDefault(root: string, key: string, defaultValue: any): any;
+    function guidFor(obj: any): string;
+    function handleErrors(func: Function, context: any): any;
+    function hasListeners(context: any, name: string): boolean;
+    function hasOwnProperty(prop: string): boolean;
+    function immediateObserver(func: Function, ...propertyNames: any[]): Function;
+    var imports: {};
+    function inspect(obj: any): string;
+    function instrument(name: string, payload: any, callback: Function, binding: any): void;
+    function isArray(obj: any): boolean;
+    function isEmpty(obj: any): boolean;
+    function isEqual(a: any, b: any): boolean;
+    function isGlobalPath(path: string): boolean;
+    var isNamespace: boolean;
+    function isNone(obj: any): boolean;
+    function isPrototypeOf(obj: {}): boolean;
+    function isWatching(obj: any, key: string): boolean;
+    function keys(obj: any): any[];
+    function listenersDiff(obj: any, eventName: string, otherActions: any[]): any[];
+    function listenersFor(obj: any, eventName: string): any[];
+    function listenersUnion(obj: any, eventName: string, otherActions: any[]): void;
+    // ReSharper disable once DuplicatingLocalDeclaration
+    var lookup: {}; // TODO: define interface
+    function makeArray(obj: any): any[];
+    function merge(original: any, updates: any): any;
+    function meta(obj: any, writable?: boolean): {};
+    function metaPath(obj: any, path: string, writable?: boolean): any;
+    function mixin(obj: any, ...args: any[]): any;
+    /**
+    Ember.none is deprecated. Please use Ember.isNone instead.
+    **/
+    var none: typeof deprecateFunc;
+    function normalizeTuple(target: any, path: string): any[];
+    function observer(...args: any[]): Function;
+    function observersFor(obj: any, path: string): any[];
+    function onLoad(name: string, callback: Function): void;
+    function oneWay(obj: any, to: string, from: string): Binding;
+    var onError: Error;
+    function overrideChains(obj: any, keyName: string, m: any): boolean;
+    // ReSharper disable once DuplicatingLocalDeclaration
+    var platform: {
+        addBeforeObserver: ModifyObserver;
+        addObserver: ModifyObserver;
+        defineProperty(obj: any, keyName: string, desc: {}): void;
+        removeBeforeObserver: ModifyObserver;
+        removeObserver: ModifyObserver;
+        hasPropertyAccessors: boolean;
+    };
+    function propertyDidChange(obj: any, keyName: string): void;
+    function propertyIsEnumerable(prop: string): boolean;
+    function propertyWillChange(obj: any, keyName: string): void;
+    function removeBeforeObserver(obj: any, path: string, target: any, method: Function): any;
+    function removeChainWatcher(obj: any, keyName: string, node: any): void;
+    function removeListener(obj: any, eventName: string, target: any, method: Function): void;
+    function removeListener(obj: any, eventName: string, target: any, method: string): void;
+    function removeListener(obj: any, eventName: string, func: Function, method: Function): void;
+    function removeListener(obj: any, eventName: string, func: Function, method: string): void;
+    function removeObserver(obj: any, path: string, target: any, method: Function): any;
+    function required(): Descriptor;
+    function rewatch(obj: any): void;
+    var run: {
+        (target: any, method: Function): void;
+        begin(): void;
+        cancel(timer: any): void;
+        debounce(target: any, method: Function, ...args: any[]): void;
+        debounce(target: any, method: string, ...args: any[]): void;
+        end(): void;
+        join(target: any, method: Function, ...args: any[]): any;
+        join(target: any, method: string, ...args: any[]): any;
+        later(target: any, method: Function, ...args: any[]): string;
+        later(target: any, method: string, ...args: any[]): string;
+        next(target: any, method: Function, ...args: any[]): number;
+        next(target: any, method: string, ...args: any[]): number;
+        once(target: any, method: Function, ...args: any[]): number;
+        once(target: any, method: string, ...args: any[]): number;
+        schedule(queue: string, target: any, method: Function, ...args: any[]): void;
+        schedule(queue: string, target: any, method: string, ...args: any[]): void;
+        scheduleOnce(queue: string, target: any, method: Function, ...args: any[]): void;
+        scheduleOnce(queue: string, target: any, method: string, ...args: any[]): void;
+        sync(): void;
+        throttle(target: any, method: Function, ...args: any[]): void;
+        throttle(target: any, method: string, ...args: any[]): void;
+        queues: any[];
+    };
+    function runLoadHooks(name: string, object: any): void;
+    function sendEvent(obj: any, eventName: string, params?: any[], actions?: any[]): boolean;
+    function set(obj: any, keyName: string, value: any): any;
+    function setMeta(obj: any, property: string, value: any): void;
+    /**
+    setPath is deprecated since set now supports paths.
+    **/
+    var setPath: typeof deprecateFunc;
+    function setProperties(self: any, hash: {}): any;
+    function subscribe(pattern: string, object: any): void;
+    function toLocaleString(): string;
+    function toString(): string;
+    function tryCatchFinally(tryable: Function, catchable: Function, finalizer: Function, binding?: any): any;
+    function tryFinally(tryable: Function, finalizer: Function, binding?: any): any;
+    function tryInvoke(obj: any, methodName: string, args?: any[]): any;
+    function trySet(obj: any, path: string, value: any): void;
+    /**
+    trySetPath has been renamed to trySet.
+    **/
+    var trySetPath: typeof deprecateFunc;
+    function typeOf(item: any): string;
+    function unwatch(obj: any, keyPath: string): void;
+    function unwatchKey(obj: any, keyName: string): void;
+    function unwatchPath(obj: any, keyPath: string): void;
+    // ReSharper disable once DuplicatingLocalDeclaration
+    var uuid: number;
+    function valueOf(): {};
+    function warn(message: string, test?: boolean): void;
+    function watch(obj: any, keyPath: string): void;
+    function watchKey(obj: any, keyName: string): void;
+    function watchPath(obj: any, keyPath: string): void;
+    function watchedEvents(obj: {}): any[];
+    function wrap(func: Function, superFunc: Function): Function;
+}
+
+// ReSharper disable DuplicatingLocalDeclaration
+declare namespace Em {
+    /**
+    Alias for jQuery.
+    **/
+    var $: typeof Ember.$;
+    var A: typeof Ember.A;
+    class ActionHandlerMixin extends Ember.ActionHandlerMixin { }
+    class Application extends Ember.Application { }
+    class Array extends Ember.Array { }
+    class ArrayController extends Ember.ArrayController { }
+    var ArrayPolyfills: typeof Ember.ArrayPolyfills;
+    class ArrayProxy extends Ember.ArrayProxy { }
+    var BOOTED: typeof Ember.BOOTED;
+    class Binding extends Ember.Binding { }
+    class Button extends Ember.Button { }
+    class Checkbox extends Ember.Checkbox { }
+    class CollectionView extends Ember.CollectionView { }
+    class Comparable extends Ember.Comparable { }
+    class Component extends Ember.Component { }
+    class ComputedProperty extends Ember.ComputedProperty { }
+    class Container extends Ember.Container { }
+    class ContainerView extends Ember.ContainerView { }
+    class Controller extends Ember.Controller { }
+    class ControllerMixin extends Ember.ControllerMixin { }
+    class Copyable extends Ember.Copyable { }
+    class CoreObject extends Ember.CoreObject { }
+    class CoreView extends Ember.CoreView { }
+    class DAG extends Ember.DAG { }
+    var DEFAULT_GETTER_FUNCTION: typeof Ember.DEFAULT_GETTER_FUNCTION;
+    class DefaultResolver extends Ember.DefaultResolver { }
+    class Deffered extends Ember.Deferred { }
+    class DeferredMixin extends Ember.DeferredMixin { }
+    class Descriptor extends Ember.Descriptor { }
+    var EMPTY_META: typeof Ember.EMPTY_META;
+    var ENV: typeof Ember.ENV;
+    var EXTEND_PROTOTYPES: typeof Ember.EXTEND_PROTOTYPES;
+    class EachProxy extends Ember.EachProxy { }
+    class Enumerable extends Ember.Enumerable { }
+    var EnumerableUtils: typeof Ember.EnumerableUtils;
+    var Error: typeof Ember.Error;
+    class EventDispatcher extends Ember.EventDispatcher { }
+    class Evented extends Ember.Evented { }
+    var FROZEN_ERROR: typeof Ember.FROZEN_ERROR;
+    class Freezable extends Ember.Freezable { }
+    var GUID_KEY: typeof Ember.GUID_KEY;
+    namespace Handlebars {
+        var compile: typeof Ember.Handlebars.compile;
+        var get: typeof Ember.Handlebars.get;
+        var helper: typeof Ember.Handlebars.helper;
+        class helpers extends Ember.Handlebars.helpers { }
+        var precompile: typeof Ember.Handlebars.precompile;
+        var registerBoundHelper: typeof Ember.Handlebars.registerBoundHelper;
+        class Compiler extends Ember.Handlebars.Compiler { }
+        class JavaScriptCompiler extends Ember.Handlebars.JavaScriptCompiler { }
+        var registerHelper: typeof Ember.Handlebars.registerHelper;
+        var registerPartial: typeof Ember.Handlebars.registerPartial;
+        var K: typeof Ember.Handlebars.K;
+        var createFrame: typeof Ember.Handlebars.createFrame;
+        var Exception: typeof Ember.Handlebars.Exception;
+        class SafeString extends Ember.Handlebars.SafeString { }
+        var parse: typeof Ember.Handlebars.parse;
+        var print: typeof Ember.Handlebars.print;
+        var logger: typeof Ember.Handlebars.logger;
+        var log: typeof Ember.Handlebars.log;
+    }
+    class HashLocation extends Ember.HashLocation { }
+    class HistoryLocation extends Ember.HistoryLocation { }
+    var IS_BINDING: typeof Ember.IS_BINDING;
+    class Instrumentation extends Ember.Instrumentation { }
+    var K: typeof Ember.K;
+    var LOG_BINDINGS: typeof Ember.LOG_BINDINGS;
+    var LOG_STACKTRACE_ON_DEPRECATION: typeof Ember.LOG_STACKTRACE_ON_DEPRECATION;
+    var LOG_VERSION: typeof Ember.LOG_VERSION;
+    class LinkView extends Ember.LinkView { }
+    class Location extends Ember.Location { }
+    var Logger: typeof Ember.Logger;
+    var MANDATORY_SETTER_FUNCTION: typeof Ember.MANDATORY_SETTER_FUNCTION;
+    var META_KEY: typeof Ember.META_KEY;
+    class Map extends Ember.Map { }
+    class MapWithDefault extends Ember.MapWithDefault { }
+    class Mixin extends Ember.Mixin { }
+    class MutableArray extends Ember.MutableArray { }
+    class MutableEnumerable extends Ember.MutableEnumberable { }
+    var NAME_KEY: typeof Ember.NAME_KEY;
+    class Namespace extends Ember.Namespace { }
+    class NativeArray extends Ember.NativeArray { }
+    class NoneLocation extends Ember.NoneLocation { }
+    var ORDER_DEFINITION: typeof Ember.ORDER_DEFINITION;
+    class Object extends Ember.Object { }
+    class ObjectController extends Ember.ObjectController { }
+    class ObjectProxy extends Ember.ObjectProxy { }
+    class Observable extends Ember.Observable { }
+    class OrderedSet extends Ember.OrderedSet { }
+    namespace RSVP {
+        interface PromiseResolve extends Ember.RSVP.PromiseResolve { }
+        interface PromiseReject extends Ember.RSVP.PromiseReject { }
+        interface PromiseResolverFunction extends Ember.RSVP.PromiseResolverFunction { }
+        class Promise extends Ember.RSVP.Promise { }
+    }
+    class RenderBuffer extends Ember.RenderBuffer { }
+    class Route extends Ember.Route { }
+    class Router extends Ember.Router { }
+    class RouterDSL extends Ember.RouterDSL { }
+    var SHIM_ES5: typeof Ember.SHIM_ES5;
+    var STRINGS: typeof Ember.STRINGS;
+    class Select extends Ember.Select { }
+    class SelectOption extends Ember.SelectOption { }
+    class Set extends Ember.Set { }
+    class SortableMixin extends Ember.SortableMixin { }
+    class State extends Ember.State { }
+    class StateManager extends Ember.StateManager { }
+    namespace String {
+        var camelize: typeof Ember.String.camelize;
+        var capitalize: typeof Ember.String.capitalize;
+        var classify: typeof Ember.String.classify;
+        var dasherize: typeof Ember.String.dasherize;
+        var decamelize: typeof Ember.String.decamelize;
+        var fmt: typeof Ember.String.fmt;
+        var htmlSafe: typeof Ember.String.htmlSafe;
+        var loc: typeof Ember.String.loc;
+        var underscore: typeof Ember.String.underscore;
+        var w: typeof Ember.String.w;
+    }
+    var TEMPLATES: typeof Ember.TEMPLATES;
+    class TargetActionSupport extends Ember.TargetActionSupport { }
+    class Test extends Ember.Test { }
+    class TextArea extends Ember.TextArea { }
+    class TextField extends Ember.TextField { }
+    class TextSupport extends Ember.TextSupport { }
+    var VERSION: typeof Ember.VERSION;
+    class View extends Ember.View { }
+    class ViewTargetActionSupport extends Ember.ViewTargetActionSupport { }
+    var ViewUtils: typeof Ember.ViewUtils;
+    var addBeforeObserver: typeof Ember.addBeforeObserver;
+    var addListener: typeof Ember.addListener;
+    var addObserver: typeof Ember.addObserver;
+    var alias: typeof Ember.alias;
+    var aliasMethod: typeof Ember.aliasMethod;
+    var anyUnprocessedMixins: typeof Ember.anyUnprocessedMixins;
+    var assert: typeof Ember.assert;
+    var beforeObserver: typeof Ember.beforeObserver;
+    var beforeObserversFor: typeof Ember.beforeObserversFor;
+    var beginPropertyChanges: typeof Ember.beginPropertyChanges;
+    var bind: typeof Ember.bind;
+    var cacheFor: typeof Ember.cacheFor;
+    var canInvoke: typeof Ember.canInvoke;
+    var changeProperties: typeof Ember.changeProperties;
+    var compare: typeof Ember.compare;
+    var computed: typeof Ember.computed;
+    var config: typeof Ember.config;
+    var controllerFor: typeof Ember.controllerFor;
+    var copy: typeof Ember.copy;
+    var create: typeof Ember.create;
+    var debug: typeof Ember.debug;
+    var defineProperty: typeof Ember.defineProperty;
+    var deprecate: typeof Ember.deprecate;
+    var deprecateFunc: typeof Ember.deprecateFunc;
+    var destroy: typeof Ember.destroy;
+    var empty: typeof deprecateFunc;
+    var endPropertyChanges: typeof Ember.endPropertyChanges;
+    var exports: typeof Ember.exports;
+    var finishChains: typeof Ember.finishChains;
+    var flushPendingChains: typeof Ember.flushPendingChains;
+    var generateController: typeof Ember.generateController;
+    var generateGuid: typeof Ember.generateGuid;
+    var get: typeof Ember.get;
+    var getMeta: typeof Ember.getMeta;
+    var getPath: typeof Ember.getPath;
+    var getWithDefault: typeof Ember.getWithDefault;
+    var guidFor: typeof Ember.guidFor;
+    var handleErrors: typeof Ember.handleErrors;
+    var hasListeners: typeof Ember.hasListeners;
+    var hasOwnProperty: typeof Ember.hasOwnProperty;
+    var immediateObserver: typeof Ember.immediateObserver;
+    var imports: typeof Ember.imports;
+    var inspect: typeof Ember.inspect;
+    var instrument: typeof Ember.instrument;
+    var isArray: typeof Ember.isArray;
+    var isEmpty: typeof Ember.isEmpty;
+    var isEqual: typeof Ember.isEqual;
+    var isGlobalPath: typeof Ember.isGlobalPath;
+    var isNamespace: typeof Ember.isNamespace;
+    var isNone: typeof Ember.isNone;
+    var isPrototypeOf: typeof Ember.isPrototypeOf;
+    var isWatching: typeof Ember.isWatching;
+    var keys: typeof Ember.keys;
+    var listenersDiff: typeof Ember.listenersDiff;
+    var listenersFor: typeof Ember.listenersFor;
+    var listenersUnion: typeof Ember.listenersUnion;
+    var lookup: typeof Ember.lookup;
+    var makeArray: typeof Ember.makeArray;
+    var merge: typeof Ember.merge;
+    var meta: typeof Ember.meta;
+    var metaPath: typeof Ember.metaPath;
+    var mixin: typeof Ember.mixin;
+    var none: typeof Ember.none;
+    var normalizeTuple: typeof Ember.normalizeTuple;
+    var observer: typeof Ember.observer;
+    var observersFor: typeof Ember.observersFor;
+    var onLoad: typeof Ember.onLoad;
+    var oneWay: typeof Ember.oneWay;
+    var onError: typeof Ember.onError;
+    var overrideChains: typeof Ember.overrideChains;
+    var platform: typeof Ember.platform;
+    var propertyDidChange: typeof Ember.propertyDidChange;
+    var propertyIsEnumerable: typeof Ember.propertyIsEnumerable;
+    var propertyWillChange: typeof Ember.propertyWillChange;
+    var removeBeforeObserver: typeof Ember.removeBeforeObserver;
+    var removeChainWatcher: typeof Ember.removeChainWatcher;
+    var removeListener: typeof Ember.removeListener;
+    var removeObserver: typeof Ember.removeObserver;
+    var required: typeof Ember.required;
+    var rewatch: typeof Ember.rewatch;
+    var run: typeof Ember.run;
+    var runLoadHooks: typeof Ember.runLoadHooks;
+    var sendEvent: typeof Ember.sendEvent;
+    var set: typeof Ember.set;
+    var setMeta: typeof Ember.setMeta;
+    var setPath: typeof Ember.setPath;
+    var setProperties: typeof Ember.setProperties;
+    var subscribe: typeof Ember.subscribe;
+    var toLocaleString: typeof Ember.toLocaleString;
+    var toString: typeof Ember.toString;
+    var tryCatchFinally: typeof Ember.tryCatchFinally;
+    var tryFinally: typeof Ember.tryFinally;
+    var tryInvoke: typeof Ember.tryInvoke;
+    var trySet: typeof Ember.trySet;
+    var trySetPath: typeof Ember.trySetPath;
+    var typeOf: typeof Ember.typeOf;
+    var unwatch: typeof Ember.unwatch;
+    var unwatchKey: typeof Ember.unwatchKey;
+    var unwatchPath: typeof Ember.unwatchPath;
+    var uuid: typeof Ember.uuid;
+    var valueOf: typeof Ember.valueOf;
+    var warn: typeof Ember.warn;
+    var watch: typeof Ember.watch;
+    var watchKey: typeof Ember.watchKey;
+    var watchPath: typeof Ember.watchPath;
+    var watchedEvents: typeof Ember.watchedEvents;
+    var wrap: typeof Ember.wrap;
+}
+
+/**
+ * External ambient module - to allow "import Ember = require('Ember');" to work correctly
+ */
+
+declare module "Ember" {
+
+    var $: typeof Ember.$;
+    var A: typeof Ember.A;
+    class ActionHandlerMixin extends Ember.ActionHandlerMixin { }
+    class Application extends Ember.Application { }
+    class Array extends Ember.Array { }
+    class ArrayController extends Ember.ArrayController { }
+    var ArrayPolyfills: typeof Ember.ArrayPolyfills;
+    class ArrayProxy extends Ember.ArrayProxy { }
+    var BOOTED: typeof Ember.BOOTED;
+    class Binding extends Ember.Binding { }
+    class Button extends Ember.Button { }
+    class Checkbox extends Ember.Checkbox { }
+    class CollectionView extends Ember.CollectionView { }
+    class Comparable extends Ember.Comparable { }
+    class Component extends Ember.Component { }
+    class ComputedProperty extends Ember.ComputedProperty { }
+    class Container extends Ember.Container { }
+    class ContainerView extends Ember.ContainerView { }
+    class Controller extends Ember.Controller { }
+    class ControllerMixin extends Ember.ControllerMixin { }
+    class Copyable extends Ember.Copyable { }
+    class CoreObject extends Ember.CoreObject { }
+    class CoreView extends Ember.CoreView { }
+    class DAG extends Ember.DAG { }
+    var DEFAULT_GETTER_FUNCTION: typeof Ember.DEFAULT_GETTER_FUNCTION;
+    class DefaultResolver extends Ember.DefaultResolver { }
+    class Deffered extends Ember.Deferred { }
+    class DeferredMixin extends Ember.DeferredMixin { }
+    class Descriptor extends Ember.Descriptor { }
+    var EMPTY_META: typeof Ember.EMPTY_META;
+    var ENV: typeof Ember.ENV;
+    var EXTEND_PROTOTYPES: typeof Ember.EXTEND_PROTOTYPES;
+    class EachProxy extends Ember.EachProxy { }
+    class Enumerable extends Ember.Enumerable { }
+    var EnumerableUtils: typeof Ember.EnumerableUtils;
+    var Error: typeof Ember.Error;
+    class EventDispatcher extends Ember.EventDispatcher { }
+    class Evented extends Ember.Evented { }
+    var FROZEN_ERROR: typeof Ember.FROZEN_ERROR;
+    class Freezable extends Ember.Freezable { }
+    var GUID_KEY: typeof Ember.GUID_KEY;
+    namespace Handlebars {
+        var compile: typeof Ember.Handlebars.compile;
+        var get: typeof Ember.Handlebars.get;
+        var helper: typeof Ember.Handlebars.helper;
+        class helpers extends Ember.Handlebars.helpers { }
+        var precompile: typeof Ember.Handlebars.precompile;
+        var registerBoundHelper: typeof Ember.Handlebars.registerBoundHelper;
+        class Compiler extends Ember.Handlebars.Compiler { }
+        class JavaScriptCompiler extends Ember.Handlebars.JavaScriptCompiler { }
+        var registerHelper: typeof Ember.Handlebars.registerHelper;
+        var registerPartial: typeof Ember.Handlebars.registerPartial;
+        var K: typeof Ember.Handlebars.K;
+        var createFrame: typeof Ember.Handlebars.createFrame;
+        var Exception: typeof Ember.Handlebars.Exception;
+        class SafeString extends Ember.Handlebars.SafeString { }
+        var parse: typeof Ember.Handlebars.parse;
+        var print: typeof Ember.Handlebars.print;
+        var logger: typeof Ember.Handlebars.logger;
+        var log: typeof Ember.Handlebars.log;
+    }
+    class HashLocation extends Ember.HashLocation { }
+    class HistoryLocation extends Ember.HistoryLocation { }
+    var IS_BINDING: typeof Ember.IS_BINDING;
+    class Instrumentation extends Ember.Instrumentation { }
+    var K: typeof Ember.K;
+    var LOG_BINDINGS: typeof Ember.LOG_BINDINGS;
+    var LOG_STACKTRACE_ON_DEPRECATION: typeof Ember.LOG_STACKTRACE_ON_DEPRECATION;
+    var LOG_VERSION: typeof Ember.LOG_VERSION;
+    class LinkView extends Ember.LinkView { }
+    class Location extends Ember.Location { }
+    var Logger: typeof Ember.Logger;
+    var MANDATORY_SETTER_FUNCTION: typeof Ember.MANDATORY_SETTER_FUNCTION;
+    var META_KEY: typeof Ember.META_KEY;
+    class Map extends Ember.Map { }
+    class MapWithDefault extends Ember.MapWithDefault { }
+    class Mixin extends Ember.Mixin { }
+    class MutableArray extends Ember.MutableArray { }
+    class MutableEnumerable extends Ember.MutableEnumberable { }
+    var NAME_KEY: typeof Ember.NAME_KEY;
+    class Namespace extends Ember.Namespace { }
+    class NativeArray extends Ember.NativeArray { }
+    class NoneLocation extends Ember.NoneLocation { }
+    var ORDER_DEFINITION: typeof Ember.ORDER_DEFINITION;
+    class Object extends Ember.Object { }
+    class ObjectController extends Ember.ObjectController { }
+    class ObjectProxy extends Ember.ObjectProxy { }
+    class Observable extends Ember.Observable { }
+    class OrderedSet extends Ember.OrderedSet { }
+    namespace RSVP {
+        interface PromiseResolve extends Ember.RSVP.PromiseResolve { }
+        interface PromiseReject extends Ember.RSVP.PromiseReject { }
+        interface PromiseResolverFunction extends Ember.RSVP.PromiseResolverFunction { }
+        class Promise extends Ember.RSVP.Promise { }
+    }
+    class RenderBuffer extends Ember.RenderBuffer { }
+    class Route extends Ember.Route { }
+    class Router extends Ember.Router { }
+    class RouterDSL extends Ember.RouterDSL { }
+    var SHIM_ES5: typeof Ember.SHIM_ES5;
+    var STRINGS: typeof Ember.STRINGS;
+    class Select extends Ember.Select { }
+    class SelectOption extends Ember.SelectOption { }
+    class Set extends Ember.Set { }
+    class SortableMixin extends Ember.SortableMixin { }
+    class State extends Ember.State { }
+    class StateManager extends Ember.StateManager { }
+    namespace String {
+        var camelize: typeof Ember.String.camelize;
+        var capitalize: typeof Ember.String.capitalize;
+        var classify: typeof Ember.String.classify;
+        var dasherize: typeof Ember.String.dasherize;
+        var decamelize: typeof Ember.String.decamelize;
+        var fmt: typeof Ember.String.fmt;
+        var htmlSafe: typeof Ember.String.htmlSafe;
+        var loc: typeof Ember.String.loc;
+        var underscore: typeof Ember.String.underscore;
+        var w: typeof Ember.String.w;
+    }
+    var TEMPLATES: typeof Ember.TEMPLATES;
+    class TargetActionSupport extends Ember.TargetActionSupport { }
+    class Test extends Ember.Test { }
+    class TextArea extends Ember.TextArea { }
+    class TextField extends Ember.TextField { }
+    class TextSupport extends Ember.TextSupport { }
+    var VERSION: typeof Ember.VERSION;
+    class View extends Ember.View { }
+    class ViewTargetActionSupport extends Ember.ViewTargetActionSupport { }
+    var ViewUtils: typeof Ember.ViewUtils;
+    var addBeforeObserver: typeof Ember.addBeforeObserver;
+    var addListener: typeof Ember.addListener;
+    var addObserver: typeof Ember.addObserver;
+    var alias: typeof Ember.alias;
+    var aliasMethod: typeof Ember.aliasMethod;
+    var anyUnprocessedMixins: typeof Ember.anyUnprocessedMixins;
+    var assert: typeof Ember.assert;
+    var beforeObserver: typeof Ember.beforeObserver;
+    var beforeObserversFor: typeof Ember.beforeObserversFor;
+    var beginPropertyChanges: typeof Ember.beginPropertyChanges;
+    var bind: typeof Ember.bind;
+    var cacheFor: typeof Ember.cacheFor;
+    var canInvoke: typeof Ember.canInvoke;
+    var changeProperties: typeof Ember.changeProperties;
+    var compare: typeof Ember.compare;
+    var computed: typeof Ember.computed;
+    var config: typeof Ember.config;
+    var controllerFor: typeof Ember.controllerFor;
+    var copy: typeof Ember.copy;
+    var create: typeof Ember.create;
+    var debug: typeof Ember.debug;
+    var defineProperty: typeof Ember.defineProperty;
+    var deprecate: typeof Ember.deprecate;
+    var deprecateFunc: typeof Ember.deprecateFunc;
+    var destroy: typeof Ember.destroy;
+    var empty: typeof Ember.deprecateFunc;
+    var endPropertyChanges: typeof Ember.endPropertyChanges;
+    var exports: typeof Ember.exports;
+    var finishChains: typeof Ember.finishChains;
+    var flushPendingChains: typeof Ember.flushPendingChains;
+    var generateController: typeof Ember.generateController;
+    var generateGuid: typeof Ember.generateGuid;
+    var get: typeof Ember.get;
+    var getMeta: typeof Ember.getMeta;
+    var getPath: typeof Ember.getPath;
+    var getWithDefault: typeof Ember.getWithDefault;
+    var guidFor: typeof Ember.guidFor;
+    var handleErrors: typeof Ember.handleErrors;
+    var hasListeners: typeof Ember.hasListeners;
+    var hasOwnProperty: typeof Ember.hasOwnProperty;
+    var immediateObserver: typeof Ember.immediateObserver;
+    var imports: typeof Ember.imports;
+    var inspect: typeof Ember.inspect;
+    var instrument: typeof Ember.instrument;
+    var isArray: typeof Ember.isArray;
+    var isEmpty: typeof Ember.isEmpty;
+    var isEqual: typeof Ember.isEqual;
+    var isGlobalPath: typeof Ember.isGlobalPath;
+    var isNamespace: typeof Ember.isNamespace;
+    var isNone: typeof Ember.isNone;
+    var isPrototypeOf: typeof Ember.isPrototypeOf;
+    var isWatching: typeof Ember.isWatching;
+    var keys: typeof Ember.keys;
+    var listenersDiff: typeof Ember.listenersDiff;
+    var listenersFor: typeof Ember.listenersFor;
+    var listenersUnion: typeof Ember.listenersUnion;
+    var lookup: typeof Ember.lookup;
+    var makeArray: typeof Ember.makeArray;
+    var merge: typeof Ember.merge;
+    var meta: typeof Ember.meta;
+    var metaPath: typeof Ember.metaPath;
+    var mixin: typeof Ember.mixin;
+    var none: typeof Ember.none;
+    var normalizeTuple: typeof Ember.normalizeTuple;
+    var observer: typeof Ember.observer;
+    var observersFor: typeof Ember.observersFor;
+    var onLoad: typeof Ember.onLoad;
+    var oneWay: typeof Ember.oneWay;
+    var onError: typeof Ember.onError;
+    var overrideChains: typeof Ember.overrideChains;
+    var platform: typeof Ember.platform;
+    var propertyDidChange: typeof Ember.propertyDidChange;
+    var propertyIsEnumerable: typeof Ember.propertyIsEnumerable;
+    var propertyWillChange: typeof Ember.propertyWillChange;
+    var removeBeforeObserver: typeof Ember.removeBeforeObserver;
+    var removeChainWatcher: typeof Ember.removeChainWatcher;
+    var removeListener: typeof Ember.removeListener;
+    var removeObserver: typeof Ember.removeObserver;
+    var required: typeof Ember.required;
+    var rewatch: typeof Ember.rewatch;
+    var run: typeof Ember.run;
+    var runLoadHooks: typeof Ember.runLoadHooks;
+    var sendEvent: typeof Ember.sendEvent;
+    var set: typeof Ember.set;
+    var setMeta: typeof Ember.setMeta;
+    var setPath: typeof Ember.setPath;
+    var setProperties: typeof Ember.setProperties;
+    var subscribe: typeof Ember.subscribe;
+    var toLocaleString: typeof Ember.toLocaleString;
+    var toString: typeof Ember.toString;
+    var tryCatchFinally: typeof Ember.tryCatchFinally;
+    var tryFinally: typeof Ember.tryFinally;
+    var tryInvoke: typeof Ember.tryInvoke;
+    var trySet: typeof Ember.trySet;
+    var trySetPath: typeof Ember.trySetPath;
+    var typeOf: typeof Ember.typeOf;
+    var unwatch: typeof Ember.unwatch;
+    var unwatchKey: typeof Ember.unwatchKey;
+    var unwatchPath: typeof Ember.unwatchPath;
+    var uuid: typeof Ember.uuid;
+    var valueOf: typeof Ember.valueOf;
+    var warn: typeof Ember.warn;
+    var watch: typeof Ember.watch;
+    var watchKey: typeof Ember.watchKey;
+    var watchPath: typeof Ember.watchPath;
+    var watchedEvents: typeof Ember.watchedEvents;
+    var wrap: typeof Ember.wrap;
+}
diff --git a/ember/tsconfig.json b/ember/tsconfig.json
new file mode 100644
index 0000000000..0f66f1dfa2
--- /dev/null
+++ b/ember/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ember-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/emissary/emissary-tests.ts b/emissary/emissary-tests.ts
index 3785f52668..9d3b3260a5 100644
--- a/emissary/emissary-tests.ts
+++ b/emissary/emissary-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./emissary.d.ts" />
+
 
 import emissary = require("emissary");
 
diff --git a/emissary/emissary.d.ts b/emissary/emissary.d.ts
deleted file mode 100644
index 2b0e0fbbcf..0000000000
--- a/emissary/emissary.d.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-// Type definitions for emissary
-// Project: https://github.com/atom/emissary
-// Definitions by: vvakame <https://github.com/vvakame/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../mixto/mixto.d.ts" />
-
-declare namespace Emissary {
-	interface IEmitterStatic extends Mixto.IMixinStatic {
-		new ():IEmitter;
-	}
-
-	interface IEmitter {
-		on(eventNames:string, handler:Function):any; // return value type are Signal
-		once(eventName:string, handler:Function):any; // return value type are Signal
-		signal(eventName:string):void;
-		behavior(eventName:string, initialValue:any):void;
-		emit(eventName:string, ...args:any[]):void;
-		off(eventNames:string, handler:Function):void;
-		pauseEvents(eventNames:string):void;
-		resumeEvents(eventNames:string):void;
-		incrementSubscriptionCount(eventName:string):number;
-		decrementSubscriptionCount(eventName:string):number;
-		getSubscriptionCount(eventName:string):number;
-		hasSubscriptions(eventName:string):boolean;
-	}
-
-	interface ISubscriberStatic extends Mixto.IMixinStatic {
-		new ():ISubscriber;
-	}
-
-	interface ISubscriber {
-		subscribeWith(eventEmitter:any, methodName:string, args:any):ISubscription;
-
-		addSubscription(subscription:any):ISubscription;
-
-		subscribe(eventEmitterOrSubscription:any, ...args:any[]):ISubscription;
-
-		subscribeToCommand(eventEmitter:any, ...args:any[]):ISubscription;
-
-		unsubscribe(object?:any):any;
-	}
-
-	interface ISubscriptionStatic {
-		new (emitter: any, eventNames:string, handler:Function):ISubscription;
-	}
-
-	interface ISubscription extends IEmitter {
-		cancelled:boolean;
-
-		off():any;
-	}
-}
-
-declare module "emissary" {
-	var Emitter:Emissary.IEmitterStatic;
-	var Subscriber:Emissary.ISubscriberStatic;
-	var Signal:Function;   // TODO
-	var Behavior:Function; // TODO
-	var combine:Function;  // TODO
-}
diff --git a/emissary/index.d.ts b/emissary/index.d.ts
new file mode 100644
index 0000000000..fc9ee6e38d
--- /dev/null
+++ b/emissary/index.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for emissary
+// Project: https://github.com/atom/emissary
+// Definitions by: vvakame <https://github.com/vvakame/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="mixto" />
+
+declare namespace Emissary {
+	interface IEmitterStatic extends Mixto.IMixinStatic {
+		new ():IEmitter;
+	}
+
+	interface IEmitter {
+		on(eventNames:string, handler:Function):any; // return value type are Signal
+		once(eventName:string, handler:Function):any; // return value type are Signal
+		signal(eventName:string):void;
+		behavior(eventName:string, initialValue:any):void;
+		emit(eventName:string, ...args:any[]):void;
+		off(eventNames:string, handler:Function):void;
+		pauseEvents(eventNames:string):void;
+		resumeEvents(eventNames:string):void;
+		incrementSubscriptionCount(eventName:string):number;
+		decrementSubscriptionCount(eventName:string):number;
+		getSubscriptionCount(eventName:string):number;
+		hasSubscriptions(eventName:string):boolean;
+	}
+
+	interface ISubscriberStatic extends Mixto.IMixinStatic {
+		new ():ISubscriber;
+	}
+
+	interface ISubscriber {
+		subscribeWith(eventEmitter:any, methodName:string, args:any):ISubscription;
+
+		addSubscription(subscription:any):ISubscription;
+
+		subscribe(eventEmitterOrSubscription:any, ...args:any[]):ISubscription;
+
+		subscribeToCommand(eventEmitter:any, ...args:any[]):ISubscription;
+
+		unsubscribe(object?:any):any;
+	}
+
+	interface ISubscriptionStatic {
+		new (emitter: any, eventNames:string, handler:Function):ISubscription;
+	}
+
+	interface ISubscription extends IEmitter {
+		cancelled:boolean;
+
+		off():any;
+	}
+}
+
+
+export var Emitter:Emissary.IEmitterStatic;
+export var Subscriber:Emissary.ISubscriberStatic;
+export var Signal:Function;   // TODO
+export var Behavior:Function; // TODO
+export var combine:Function;  // TODO
+
diff --git a/emissary/tsconfig.json b/emissary/tsconfig.json
new file mode 100644
index 0000000000..09e78eaccf
--- /dev/null
+++ b/emissary/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "emissary-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/empower/empower-tests.ts b/empower/empower-tests.ts
index 27b1894c6a..0ed1df04ef 100644
--- a/empower/empower-tests.ts
+++ b/empower/empower-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./empower.d.ts" />
+import empower = require("empower");
 
 var baseAssert:any;
 var fakeFormatter:any;
diff --git a/empower/empower.d.ts b/empower/empower.d.ts
deleted file mode 100644
index 56a9757be5..0000000000
--- a/empower/empower.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Type definitions for empower
-// Project: https://github.com/twada/empower
-// Definitions by: vvakame <https://github.com/vvakame>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare function empower(originalAssert:any, formatter:any, options?:empower.Options):any;
-
-declare namespace empower {
-    export interface Options {
-        destructive?: boolean;
-        modifyMessageOnRethrow?: boolean;
-        saveContextOnRethrow?: boolean;
-        patterns?: string[];
-    }
-}
-
-declare module "empower" {
-    export = empower;
-}
diff --git a/empower/index.d.ts b/empower/index.d.ts
new file mode 100644
index 0000000000..19e64045fa
--- /dev/null
+++ b/empower/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for empower
+// Project: https://github.com/twada/empower
+// Definitions by: vvakame <https://github.com/vvakame>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function empower(originalAssert:any, formatter:any, options?:empower.Options):any;
+
+export = empower;
+export as namespace empower;
+
+declare namespace empower {
+    export interface Options {
+        destructive?: boolean;
+        modifyMessageOnRethrow?: boolean;
+        saveContextOnRethrow?: boolean;
+        patterns?: string[];
+    }
+}
diff --git a/empower/tsconfig.json b/empower/tsconfig.json
new file mode 100644
index 0000000000..b71ff40df6
--- /dev/null
+++ b/empower/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "empower-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/emscripten/emscripten-tests.ts b/emscripten/emscripten-tests.ts
index 76342ae187..0c7f99b710 100644
--- a/emscripten/emscripten-tests.ts
+++ b/emscripten/emscripten-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="emscripten.d.ts" />
+
 
 
 /// Module
diff --git a/emscripten/emscripten.d.ts b/emscripten/index.d.ts
similarity index 100%
rename from emscripten/emscripten.d.ts
rename to emscripten/index.d.ts
diff --git a/emscripten/tsconfig.json b/emscripten/tsconfig.json
new file mode 100644
index 0000000000..0afcbd2118
--- /dev/null
+++ b/emscripten/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "emscripten-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/encoding-japanese/encoding-japanese-tests.ts b/encoding-japanese/encoding-japanese-tests.ts
new file mode 100644
index 0000000000..5004213f23
--- /dev/null
+++ b/encoding-japanese/encoding-japanese-tests.ts
@@ -0,0 +1,94 @@
+
+import * as Encoding from 'encoding-japanese';
+
+// Convert character encoding to Shift_JIS from UTF-8.
+var utf8Array_1 = new Uint8Array([1, 2, 3]);
+var utf8Array_2 = [1, 2, 3];
+var utf8Array_3 = new Buffer([1, 2, 3]);
+var sjisArray = Encoding.convert(utf8Array_1, 'SJIS', 'UTF8');
+var sjisArray = Encoding.convert(utf8Array_2, 'UTF16', 'UTF8');
+var sjisArray = Encoding.convert(utf8Array_3, 'EUCJP', 'UTF8');
+
+// Convert character encoding by automatic detection (AUTO detect).
+var utf8Array = utf8Array_1;
+var sjisArray1 = Encoding.convert(utf8Array, 'SJIS');
+// or  
+var sjisArray2 = Encoding.convert(utf8Array, 'SJIS', 'AUTO');
+
+// Detect the character encoding.
+// The return value be one of the "Available Encodings" below.
+var detected = Encoding.detect(utf8Array);
+if (detected === 'UTF8') {
+  console.log('Encoding is UTF-8');
+}
+
+var sjisArray3 = Encoding.convert(utf8Array, {
+  to: 'SJIS', // to_encoding
+  from: 'UTF8' // from_encoding
+});
+
+var utf8String = 'ã\u0081\u0093ã\u0082\u0093ã\u0081«ã\u0081¡ã\u0081¯';
+var unicodeString = Encoding.convert(utf8String, {
+  to: 'UNICODE',
+  from: 'UTF8',
+  type: 'string' // Specify 'string' type. (Return as string)
+});
+console.log(unicodeString); // こんにちは
+
+var utf16Array = Encoding.convert(utf8Array, {
+  to: 'UTF16', // to_encoding
+  from: 'UTF8', // from_encoding
+  bom: true // With BOM
+});
+
+var utf16leArray = Encoding.convert(utf8Array, {
+  to: 'UTF16', // to_encoding
+  from: 'UTF8', // from_encoding
+  bom: 'LE' // With BOM (little-endian)
+});
+
+var utf16beArray = Encoding.convert(utf8Array, {
+  to: 'UTF16BE',
+  from: 'UTF8'
+});
+
+// Detect character encoding by automatic. (AUTO detect).
+var detected2 = Encoding.detect(utf8Array);
+if (detected2 === 'UTF8') {
+  console.log('Encoding is UTF-8');
+}
+
+// Detect character encoding by specific encoding name.
+var isSJIS = Encoding.detect(sjisArray, 'SJIS');
+if (isSJIS) {
+  console.log('Encoding is SJIS');
+}
+
+var sjisArray4 = [
+  130, 177, 130, 241, 130, 201, 130, 191, 130, 205, 129,
+  65, 130, 217, 130, 176, 129, 153, 130, 210, 130, 230
+];
+
+var encoded = Encoding.urlEncode(sjisArray4);
+console.log(encoded);
+// output:
+// '%82%B1%82%F1%82%C9%82%BF%82%CD%81A%82%D9%82%B0%81%99%82%D2%82%E6'
+
+var decoded = Encoding.urlDecode(encoded);
+console.log(decoded);
+// output: [
+//   130, 177, 130, 241, 130, 201, 130, 191, 130, 205, 129,
+//    65, 130, 217, 130, 176, 129, 153, 130, 210, 130, 230
+// ]
+
+var sjisArray5 = [
+  130, 177, 130, 241, 130, 201, 130, 191, 130, 205
+];
+var encoded2 = Encoding.base64Encode(sjisArray5);
+console.log(encoded2); // 'grGC8YLJgr+CzQ=='
+
+var decoded2 = Encoding.base64Decode(encoded2);
+console.log(decoded2);
+// [130, 177, 130, 241, 130, 201, 130, 191, 130, 205]
+
+
diff --git a/encoding-japanese/index.d.ts b/encoding-japanese/index.d.ts
new file mode 100644
index 0000000000..308eef4968
--- /dev/null
+++ b/encoding-japanese/index.d.ts
@@ -0,0 +1,47 @@
+// Type definitions for encoding-japanese v1.0.24
+// Project: https://github.com/polygonplanet/encoding.js
+// Definitions by: rhysd <https://rhysd.github.io>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+export type Encoding =
+    "UTF32" | "UTF16" | "UTF16BE" |
+    "UTF16LE" | "BINARY" | "ASCII" |
+    "JIS" | "UTF8" | "EUCJP" |
+    "SJIS" | "UNICODE" | "AUTO";
+type RawType = string | Uint8Array | number[] | Buffer;
+
+interface ConvertOptions {
+    to: Encoding;
+    from?: Encoding;
+    type?: "string" | "arraybuffer" | "array";
+    bom?: boolean | string;
+}
+
+export declare function detect(data: RawType, encodings?: Encoding | Encoding[]): Encoding;
+export declare function convert(data: RawType, to: Encoding, from?: Encoding): number[];
+export declare function convert(data: RawType, options: ConvertOptions): string | ArrayBuffer | number[];
+export declare function urlEncode(data: number[] | Uint8Array): string;
+export declare function urlDecode(data: string): number[];
+export declare function base64Encode(data: number[] | Uint8Array): string;
+export declare function base64Decode(data: string): number[];
+export declare function codeToString(data: number[] | Uint8Array): string;
+export declare function stringToCode(data: string): number[];
+export declare function toHankakuCase(data: number[]): number[];
+export declare function toHankakuCase(data: string): string;
+export declare function toZenkakuCase(data: number[]): number[];
+export declare function toZenkakuCase(data: string): string;
+export declare function toHiraganaCase(data: number[]): number[];
+export declare function toHiraganaCase(data: string): string;
+export declare function toKatakanaCase(data: number[]): number[];
+export declare function toKatakanaCase(data: string): string;
+export declare function toHankanaCase(data: number[]): number[];
+export declare function toHankanaCase(data: string): string;
+export declare function toZenkanaCase(data: number[]): number[];
+export declare function toZenkanaCase(data: string): string;
+export declare function toHankakuSpace(data: number[]): number[];
+export declare function toHankakuSpace(data: string): string;
+export declare function toZenkakuSpace(data: number[]): number[];
+export declare function toZenkakuSpace(data: string): string;
diff --git a/encoding-japanese/tsconfig.json b/encoding-japanese/tsconfig.json
new file mode 100644
index 0000000000..cdcb56d155
--- /dev/null
+++ b/encoding-japanese/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "encoding-japanese-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/envify/envify-tests.ts b/envify/envify-tests.ts
index 52387a3e6c..dd603e4b4c 100644
--- a/envify/envify-tests.ts
+++ b/envify/envify-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="envify.d.ts" />
-/// <reference path="../browserify/browserify.d.ts" />
+
 
 import browserify = require('browserify');
 import envify = require('envify/custom');
diff --git a/envify/envify.d.ts b/envify/envify.d.ts
deleted file mode 100644
index 28825d0399..0000000000
--- a/envify/envify.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Type definitions for envify
-// Project: https://github.com/hughsk/envify
-// Definitions by: Qubo <https://github.com/tkQubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "envify" {
-	var envify: (file: string, environment: { [name: string]: any }) => NodeJS.ReadWriteStream;
-	export = envify;
-}
-
-declare module "envify/custom" {
-	function envify(environment: { [name: string]: any }): (file: string, environment: { [name: string]: any }) => NodeJS.ReadWriteStream;
-	export = envify;
-}
diff --git a/envify/index.d.ts b/envify/index.d.ts
new file mode 100644
index 0000000000..39fda2345c
--- /dev/null
+++ b/envify/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for envify
+// Project: https://github.com/hughsk/envify
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare module "envify" {
+	var envify: (file: string, environment: { [name: string]: any }) => NodeJS.ReadWriteStream;
+	export = envify;
+}
+
+declare module "envify/custom" {
+	function envify(environment: { [name: string]: any }): (file: string, environment: { [name: string]: any }) => NodeJS.ReadWriteStream;
+	export = envify;
+}
diff --git a/envify/tsconfig.json b/envify/tsconfig.json
new file mode 100644
index 0000000000..4fbacfb0b8
--- /dev/null
+++ b/envify/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "envify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/enzyme/enzyme-tests.tsx b/enzyme/enzyme-tests.tsx
index 56767b4ab3..41a630f0eb 100644
--- a/enzyme/enzyme-tests.tsx
+++ b/enzyme/enzyme-tests.tsx
@@ -1,5 +1,5 @@
-/// <reference path="enzyme.d.ts" />
-/// <reference path="../react/react.d.ts"/>
+
+/// <reference types="react"/>
 
 import { shallow, mount, render, describeWithDOM, spyLifecycle } from "enzyme";
 import * as React from "react";
diff --git a/enzyme/enzyme.d.ts b/enzyme/enzyme.d.ts
deleted file mode 100644
index 9047fbf728..0000000000
--- a/enzyme/enzyme.d.ts
+++ /dev/null
@@ -1,411 +0,0 @@
-// Type definitions for Enzyme v1.2.0
-// Project: https://github.com/airbnb/enzyme
-// Definitions by: Marian Palkus <https://github.com/MarianPalkus>, Cap3 <http://www.cap3.de>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../react/react.d.ts" />
-
-declare module "enzyme" {
-
-    import {ReactElement, Component, StatelessComponent, ComponentClass, HTMLAttributes} from "react";
-
-    export class ElementClass extends Component<any, any> {
-    }
-
-    /**
-     * Many methods in Enzyme's API accept a selector as an argument. Selectors in Enzyme can fall into one of the
-     * following three categories:
-     *
-     *  1. A Valid CSS Selector
-     *  2. A React Component Constructor
-     *  3. A React Component's displayName
-     */
-    export type EnzymeSelector = String | typeof ElementClass;
-
-    interface CommonWrapper<P, S> {
-        /**
-         * Find every node in the render tree that matches the provided selector.
-         * @param selector The selector to match.
-         */
-        find<P2>(component: ComponentClass<P2>): CommonWrapper<P2, any>;
-        find<P2>(statelessComponent: StatelessComponent<P2>): CommonWrapper<P2, {}>;
-        find(selector: string): CommonWrapper<HTMLAttributes, any>;
-
-        /**
-         * Finds every node in the render tree that returns true for the provided predicate function.
-         * @param predicate
-         */
-        findWhere(predicate: (wrapper: CommonWrapper<any, any>) => Boolean): CommonWrapper<any, any>;
-
-        /**
-         * Removes nodes in the current wrapper that do not match the provided selector.
-         * @param selector The selector to match.
-         */
-        filter<P2>(component: ComponentClass<P2>): CommonWrapper<P2, any>;
-        filter<P2>(statelessComponent: StatelessComponent<P2>): CommonWrapper<P2, {}>;
-        filter(selector: string): CommonWrapper<HTMLAttributes, any>;
-
-        /**
-         * Returns a new wrapper with only the nodes of the current wrapper that, when passed into the provided predicate function, return true.
-         * @param predicate
-         */
-        filterWhere(predicate: (wrapper: this) => Boolean): this;
-
-        /**
-         * Returns whether or not the current wrapper has a node anywhere in it's render tree that looks like the one passed in.
-         * @param node
-         */
-        contains(node: ReactElement<any>): Boolean;
-
-        /**
-         * Returns whether or not the current node has a className prop including the passed in class name.
-         * @param className
-         */
-        hasClass(className: String): Boolean;
-
-        /**
-         * Returns whether or not the current node matches a provided selector.
-         * @param selector
-         */
-        is(selector: EnzymeSelector): Boolean;
-
-        /**
-         * Returns a new wrapper with only the nodes of the current wrapper that don't match the provided selector.
-         * This method is effectively the negation or inverse of filter.
-         * @param selector
-         */
-        not(selector: EnzymeSelector): this;
-
-        /**
-         * Returns a new wrapper with all of the children of the node(s) in the current wrapper. Optionally, a selector
-         * can be provided and it will filter the children by this selector.
-         * @param [selector]
-         */
-        children<P2>(component: ComponentClass<P2>): CommonWrapper<P2, any>;
-        children<P2>(statelessComponent: StatelessComponent<P2>): CommonWrapper<P2, {}>;
-        children(selector: string): CommonWrapper<HTMLAttributes, any>;
-        children(): CommonWrapper<any, any>;
-
-        /**
-         * Returns a wrapper around all of the parents/ancestors of the wrapper. Does not include the node in the
-         * current wrapper. Optionally, a selector can be provided and it will filter the parents by this selector.
-         *
-         * Note: can only be called on a wrapper of a single node.
-         * @param [selector]
-         */
-        parents<P2>(component: ComponentClass<P2>): CommonWrapper<P2, any>;
-        parents<P2>(statelessComponent: StatelessComponent<P2>): CommonWrapper<P2, {}>;
-        parents(selector: string): CommonWrapper<HTMLAttributes, any>;
-        parents(): CommonWrapper<any, any>;
-
-        /**
-         * Returns a wrapper with the direct parent of the node in the current wrapper.
-         */
-        parent(): CommonWrapper<any, any>;
-
-        /**
-         * Returns a wrapper of the first element that matches the selector by traversing up through the current node's
-         * ancestors in the tree, starting with itself.
-         *
-         * Note: can only be called on a wrapper of a single node.
-         * @param selector
-         */
-        closest<P2>(component: ComponentClass<P2>): CommonWrapper<P2, any>;
-        closest<P2>(statelessComponent: StatelessComponent<P2>): CommonWrapper<P2, {}>;
-        closest(selector: string): CommonWrapper<HTMLAttributes, any>;
-
-        /**
-         * Returns a string of the rendered text of the current render tree. This function should be looked at with
-         * skepticism if being used to test what the actual HTML output of the component will be. If that is what you
-         * would like to test, use enzyme's render function instead.
-         *
-         * Note: can only be called on a wrapper of a single node.
-         */
-        text(): String;
-
-        /**
-         * Returns a string of the rendered HTML markup of the current render tree.
-         *
-         * Note: can only be called on a wrapper of a single node.
-         */
-        html(): String;
-
-        /**
-         * Returns the node at a given index of the current wrapper.
-         * @param index
-         */
-        get(index: number): ReactElement<any>;
-
-        /**
-         * Returns a wrapper around the node at a given index of the current wrapper.
-         * @param index
-         */
-        at(index: number): this;
-
-        /**
-         * Reduce the set of matched nodes to the first in the set.
-         */
-        first(): this;
-
-        /**
-         * Reduce the set of matched nodes to the last in the set.
-         */
-        last(): this;
-
-        /**
-         * Returns the state hash for the root node of the wrapper. Optionally pass in a prop name and it will return just that value.
-         * @param [key]
-         */
-        state(key?: String): any;
-
-        /**
-         * Returns the props hash for the current node of the wrapper.
-         *
-         * NOTE: can only be called on a wrapper of a single node.
-         */
-        props(): P;
-
-        /**
-         * Returns the prop value for the node of the current wrapper with the provided key.
-         *
-         * NOTE: can only be called on a wrapper of a single node.
-         * @param key
-         */
-        prop(key: String): any;
-
-        /**
-         * Simulate events.
-         * Returns itself.
-         * @param event
-         * @param args?
-         */
-        simulate(event: string, ...args: any[]): this;
-
-        /**
-         * A method to invoke setState() on the root component instance similar to how you might in the definition of
-         * the component, and re-renders. This method is useful for testing your component in hard to achieve states,
-         * however should be used sparingly. If possible, you should utilize your component's external API in order to
-         * get it into whatever state you want to test, in order to be as accurate of a test as possible. This is not
-         * always practical, however.
-         * Returns itself.
-         *
-         * NOTE: can only be called on a wrapper instance that is also the root instance.
-         * @param state
-         */
-        setState(state: S): this;
-
-        /**
-         * A method that sets the props of the root component, and re-renders. Useful for when you are wanting to test
-         * how the component behaves over time with changing props. Calling this, for instance, will call the
-         * componentWillReceiveProps lifecycle method.
-         *
-         * Similar to setState, this method accepts a props object and will merge it in with the already existing props.
-         * Returns itself.
-         *
-         * NOTE: can only be called on a wrapper instance that is also the root instance.
-         * @param state
-         */
-        setProps(props: P): this;
-
-        /**
-         * A method that sets the context of the root component, and re-renders. Useful for when you are wanting to
-         * test how the component behaves over time with changing contexts.
-         * Returns itself.
-         *
-         * NOTE: can only be called on a wrapper instance that is also the root instance.
-         * @param state
-         */
-        setContext(context: Object): this;
-
-        /**
-         * Gets the instance of the component being rendered as the root node passed into shallow().
-         *
-         * NOTE: can only be called on a wrapper instance that is also the root instance.
-         */
-        instance(): Component<P, S>;
-
-        /**
-         * Forces a re-render. Useful to run before checking the render output if something external may be updating
-         * the state of the component somewhere.
-         * Returns itself.
-         *
-         * NOTE: can only be called on a wrapper instance that is also the root instance.
-         */
-        update(): this;
-
-        /**
-         * Returns an html-like string of the wrapper for debugging purposes. Useful to print out to the console when
-         * tests are not passing when you expect them to.
-         */
-        debug(): String;
-
-        /**
-         * Returns the type of the current node of this wrapper. If it's a composite component, this will be the
-         * component constructor. If it's native DOM node, it will be a string of the tag name.
-         *
-         * Note: can only be called on a wrapper of a single node.
-         */
-        type(): String | Function;
-
-        /**
-         * Iterates through each node of the current wrapper and executes the provided function with a wrapper around
-         * the corresponding node passed in as the first argument.
-         *
-         * Returns itself.
-         * @param fn A callback to be run for every node in the collection. Should expect a ShallowWrapper as the first
-         *              argument, and will be run with a context of the original instance.
-         */
-        forEach(fn: (wrapper: this) => any): this;
-
-        /**
-         * Maps the current array of nodes to another array. Each node is passed in as a ShallowWrapper to the map
-         * function.
-         * Returns an array of the returned values from the mapping function..
-         * @param fn A mapping function to be run for every node in the collection, the results of which will be mapped
-         *              to the returned array. Should expect a ShallowWrapper as the first argument, and will be run
-         *              with a context of the original instance.
-         */
-        map<V>(fn: (wrapper: this) => V): V[];
-
-        /**
-         * Applies the provided reducing function to every node in the wrapper to reduce to a single value. Each node
-         * is passed in as a ShallowWrapper, and is processed from left to right.
-         * @param fn
-         * @param initialValue
-         */
-        reduce<R>(fn: (prevVal: R, wrapper: this, index: number) => R, initialValue?: R): R[];
-
-        /**
-         * Applies the provided reducing function to every node in the wrapper to reduce to a single value.
-         * Each node is passed in as a ShallowWrapper, and is processed from right to left.
-         * @param fn
-         * @param initialValue
-         */
-        reduceRight<R>(fn: (prevVal: R, wrapper: this, index: number) => R, initialValue?: R): R[];
-
-        /**
-         * Returns whether or not any of the nodes in the wrapper match the provided selector.
-         * @param selector
-         */
-        some(selector: EnzymeSelector): Boolean;
-
-        /**
-         * Returns whether or not any of the nodes in the wrapper pass the provided predicate function.
-         * @param fn
-         */
-        someWhere(fn: (wrapper: this) => Boolean): Boolean;
-
-        /**
-         * Returns whether or not all of the nodes in the wrapper match the provided selector.
-         * @param selector
-         */
-        every(selector: EnzymeSelector): Boolean;
-
-        /**
-         * Returns whether or not any of the nodes in the wrapper pass the provided predicate function.
-         * @param fn
-         */
-        everyWhere(fn: (wrapper: this) => Boolean): Boolean;
-
-        length: number;
-    }
-
-    export interface ShallowWrapper<P, S> extends CommonWrapper<P, S> {
-        shallow(): ShallowWrapper<P, S>;
-        render(): CheerioWrapper<P, S>;
-
-        /**
-         * Find every node in the render tree that matches the provided selector.
-         * @param selector The selector to match.
-         */
-        find<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
-        find<P2>(statelessComponent: (props: P2) => JSX.Element): ShallowWrapper<P2, {}>;
-        find(selector: string): ShallowWrapper<HTMLAttributes, any>;
-
-        /**
-         * Removes nodes in the current wrapper that do not match the provided selector.
-         * @param selector The selector to match.
-         */
-        filter<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
-        filter<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, {}>;
-        filter(selector: string): ShallowWrapper<HTMLAttributes, any>;
-
-        /**
-         * Finds every node in the render tree that returns true for the provided predicate function.
-         * @param predicate
-         */
-        findWhere(predicate: (wrapper: CommonWrapper<any, any>) => Boolean): ShallowWrapper<any, any>;
-
-        /**
-         * Returns a new wrapper with all of the children of the node(s) in the current wrapper. Optionally, a selector
-         * can be provided and it will filter the children by this selector.
-         * @param [selector]
-         */
-        children<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
-        children<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, {}>;
-        children(selector: string): ShallowWrapper<HTMLAttributes, any>;
-        children(): ShallowWrapper<any, any>;
-
-        /**
-         * Returns a wrapper around all of the parents/ancestors of the wrapper. Does not include the node in the
-         * current wrapper. Optionally, a selector can be provided and it will filter the parents by this selector.
-         *
-         * Note: can only be called on a wrapper of a single node.
-         * @param [selector]
-         */
-        parents<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
-        parents<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, {}>;
-        parents(selector: string): ShallowWrapper<HTMLAttributes, any>;
-        parents(): ShallowWrapper<any, any>;
-
-        /**
-         * Returns a wrapper of the first element that matches the selector by traversing up through the current node's
-         * ancestors in the tree, starting with itself.
-         *
-         * Note: can only be called on a wrapper of a single node.
-         * @param selector
-         */
-        closest<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
-        closest<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, {}>;
-        closest(selector: string): ShallowWrapper<HTMLAttributes, any>;
-
-        /**
-         * Returns a wrapper with the direct parent of the node in the current wrapper.
-         */
-        parent(): ShallowWrapper<any, any>;
-    }
-
-    export interface ReactWrapper<P, S> extends CommonWrapper<P, S> {
-
-    }
-
-    export interface CheerioWrapper<P, S> extends CommonWrapper<P, S> {
-
-    }
-
-    /**
-     * Shallow rendering is useful to constrain yourself to testing a component as a unit, and to ensure that
-     * your tests aren't indirectly asserting on behavior of child components.
-     * @param node
-     * @param [options]
-     */
-    export function shallow<P, S>(node: ReactElement<P>, options?: any): ShallowWrapper<P, S>;
-
-    /**
-     * Mounts and renders a react component into the document and provides a testing wrapper around it.
-     * @param node
-     * @param [options]
-     */
-    export function mount<P, S>(node: ReactElement<P>, options?: any): ReactWrapper<P, S>;
-
-    /**
-     * Render react components to static HTML and analyze the resulting HTML structure.
-     * @param node
-     * @param [options]
-     */
-    export function render<P, S>(node: ReactElement<P>, options?: any): CheerioWrapper<P, S>;
-
-    export function describeWithDOM(description: String, fn: Function): void;
-
-    export function spyLifecycle(component: typeof Component): void;
-}
\ No newline at end of file
diff --git a/enzyme/index.d.ts b/enzyme/index.d.ts
new file mode 100644
index 0000000000..3966e1cb14
--- /dev/null
+++ b/enzyme/index.d.ts
@@ -0,0 +1,410 @@
+// Type definitions for Enzyme v1.2.0
+// Project: https://github.com/airbnb/enzyme
+// Definitions by: Marian Palkus <https://github.com/MarianPalkus>, Cap3 <http://www.cap3.de>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="react" />
+
+
+
+import {ReactElement, Component, StatelessComponent, ComponentClass, HTMLAttributes} from "react";
+
+export declare class ElementClass extends Component<any, any> {
+}
+
+/**
+ * Many methods in Enzyme's API accept a selector as an argument. Selectors in Enzyme can fall into one of the
+ * following three categories:
+ *
+ *  1. A Valid CSS Selector
+ *  2. A React Component Constructor
+ *  3. A React Component's displayName
+ */
+export type EnzymeSelector = String | typeof ElementClass;
+
+interface CommonWrapper<P, S> {
+    /**
+     * Find every node in the render tree that matches the provided selector.
+     * @param selector The selector to match.
+     */
+    find<P2>(component: ComponentClass<P2>): CommonWrapper<P2, any>;
+    find<P2>(statelessComponent: StatelessComponent<P2>): CommonWrapper<P2, {}>;
+    find(selector: string): CommonWrapper<HTMLAttributes, any>;
+
+    /**
+     * Finds every node in the render tree that returns true for the provided predicate function.
+     * @param predicate
+     */
+    findWhere(predicate: (wrapper: CommonWrapper<any, any>) => Boolean): CommonWrapper<any, any>;
+
+    /**
+     * Removes nodes in the current wrapper that do not match the provided selector.
+     * @param selector The selector to match.
+     */
+    filter<P2>(component: ComponentClass<P2>): CommonWrapper<P2, any>;
+    filter<P2>(statelessComponent: StatelessComponent<P2>): CommonWrapper<P2, {}>;
+    filter(selector: string): CommonWrapper<HTMLAttributes, any>;
+
+    /**
+     * Returns a new wrapper with only the nodes of the current wrapper that, when passed into the provided predicate function, return true.
+     * @param predicate
+     */
+    filterWhere(predicate: (wrapper: this) => Boolean): this;
+
+    /**
+     * Returns whether or not the current wrapper has a node anywhere in it's render tree that looks like the one passed in.
+     * @param node
+     */
+    contains(node: ReactElement<any>): Boolean;
+
+    /**
+     * Returns whether or not the current node has a className prop including the passed in class name.
+     * @param className
+     */
+    hasClass(className: String): Boolean;
+
+    /**
+     * Returns whether or not the current node matches a provided selector.
+     * @param selector
+     */
+    is(selector: EnzymeSelector): Boolean;
+
+    /**
+     * Returns a new wrapper with only the nodes of the current wrapper that don't match the provided selector.
+     * This method is effectively the negation or inverse of filter.
+     * @param selector
+     */
+    not(selector: EnzymeSelector): this;
+
+    /**
+     * Returns a new wrapper with all of the children of the node(s) in the current wrapper. Optionally, a selector
+     * can be provided and it will filter the children by this selector.
+     * @param [selector]
+     */
+    children<P2>(component: ComponentClass<P2>): CommonWrapper<P2, any>;
+    children<P2>(statelessComponent: StatelessComponent<P2>): CommonWrapper<P2, {}>;
+    children(selector: string): CommonWrapper<HTMLAttributes, any>;
+    children(): CommonWrapper<any, any>;
+
+    /**
+     * Returns a wrapper around all of the parents/ancestors of the wrapper. Does not include the node in the
+     * current wrapper. Optionally, a selector can be provided and it will filter the parents by this selector.
+     *
+     * Note: can only be called on a wrapper of a single node.
+     * @param [selector]
+     */
+    parents<P2>(component: ComponentClass<P2>): CommonWrapper<P2, any>;
+    parents<P2>(statelessComponent: StatelessComponent<P2>): CommonWrapper<P2, {}>;
+    parents(selector: string): CommonWrapper<HTMLAttributes, any>;
+    parents(): CommonWrapper<any, any>;
+
+    /**
+     * Returns a wrapper with the direct parent of the node in the current wrapper.
+     */
+    parent(): CommonWrapper<any, any>;
+
+    /**
+     * Returns a wrapper of the first element that matches the selector by traversing up through the current node's
+     * ancestors in the tree, starting with itself.
+     *
+     * Note: can only be called on a wrapper of a single node.
+     * @param selector
+     */
+    closest<P2>(component: ComponentClass<P2>): CommonWrapper<P2, any>;
+    closest<P2>(statelessComponent: StatelessComponent<P2>): CommonWrapper<P2, {}>;
+    closest(selector: string): CommonWrapper<HTMLAttributes, any>;
+
+    /**
+     * Returns a string of the rendered text of the current render tree. This function should be looked at with
+     * skepticism if being used to test what the actual HTML output of the component will be. If that is what you
+     * would like to test, use enzyme's render function instead.
+     *
+     * Note: can only be called on a wrapper of a single node.
+     */
+    text(): String;
+
+    /**
+     * Returns a string of the rendered HTML markup of the current render tree.
+     *
+     * Note: can only be called on a wrapper of a single node.
+     */
+    html(): String;
+
+    /**
+     * Returns the node at a given index of the current wrapper.
+     * @param index
+     */
+    get(index: number): ReactElement<any>;
+
+    /**
+     * Returns a wrapper around the node at a given index of the current wrapper.
+     * @param index
+     */
+    at(index: number): this;
+
+    /**
+     * Reduce the set of matched nodes to the first in the set.
+     */
+    first(): this;
+
+    /**
+     * Reduce the set of matched nodes to the last in the set.
+     */
+    last(): this;
+
+    /**
+     * Returns the state hash for the root node of the wrapper. Optionally pass in a prop name and it will return just that value.
+     * @param [key]
+     */
+    state(key?: String): any;
+
+    /**
+     * Returns the props hash for the current node of the wrapper.
+     *
+     * NOTE: can only be called on a wrapper of a single node.
+     */
+    props(): P;
+
+    /**
+     * Returns the prop value for the node of the current wrapper with the provided key.
+     *
+     * NOTE: can only be called on a wrapper of a single node.
+     * @param key
+     */
+    prop(key: String): any;
+
+    /**
+     * Simulate events.
+     * Returns itself.
+     * @param event
+     * @param args?
+     */
+    simulate(event: string, ...args: any[]): this;
+
+    /**
+     * A method to invoke setState() on the root component instance similar to how you might in the definition of
+     * the component, and re-renders. This method is useful for testing your component in hard to achieve states,
+     * however should be used sparingly. If possible, you should utilize your component's external API in order to
+     * get it into whatever state you want to test, in order to be as accurate of a test as possible. This is not
+     * always practical, however.
+     * Returns itself.
+     *
+     * NOTE: can only be called on a wrapper instance that is also the root instance.
+     * @param state
+     */
+    setState(state: S): this;
+
+    /**
+     * A method that sets the props of the root component, and re-renders. Useful for when you are wanting to test
+     * how the component behaves over time with changing props. Calling this, for instance, will call the
+     * componentWillReceiveProps lifecycle method.
+     *
+     * Similar to setState, this method accepts a props object and will merge it in with the already existing props.
+     * Returns itself.
+     *
+     * NOTE: can only be called on a wrapper instance that is also the root instance.
+     * @param state
+     */
+    setProps(props: P): this;
+
+    /**
+     * A method that sets the context of the root component, and re-renders. Useful for when you are wanting to
+     * test how the component behaves over time with changing contexts.
+     * Returns itself.
+     *
+     * NOTE: can only be called on a wrapper instance that is also the root instance.
+     * @param state
+     */
+    setContext(context: Object): this;
+
+    /**
+     * Gets the instance of the component being rendered as the root node passed into shallow().
+     *
+     * NOTE: can only be called on a wrapper instance that is also the root instance.
+     */
+    instance(): Component<P, S>;
+
+    /**
+     * Forces a re-render. Useful to run before checking the render output if something external may be updating
+     * the state of the component somewhere.
+     * Returns itself.
+     *
+     * NOTE: can only be called on a wrapper instance that is also the root instance.
+     */
+    update(): this;
+
+    /**
+     * Returns an html-like string of the wrapper for debugging purposes. Useful to print out to the console when
+     * tests are not passing when you expect them to.
+     */
+    debug(): String;
+
+    /**
+     * Returns the type of the current node of this wrapper. If it's a composite component, this will be the
+     * component constructor. If it's native DOM node, it will be a string of the tag name.
+     *
+     * Note: can only be called on a wrapper of a single node.
+     */
+    type(): String | Function;
+
+    /**
+     * Iterates through each node of the current wrapper and executes the provided function with a wrapper around
+     * the corresponding node passed in as the first argument.
+     *
+     * Returns itself.
+     * @param fn A callback to be run for every node in the collection. Should expect a ShallowWrapper as the first
+     *              argument, and will be run with a context of the original instance.
+     */
+    forEach(fn: (wrapper: this) => any): this;
+
+    /**
+     * Maps the current array of nodes to another array. Each node is passed in as a ShallowWrapper to the map
+     * function.
+     * Returns an array of the returned values from the mapping function..
+     * @param fn A mapping function to be run for every node in the collection, the results of which will be mapped
+     *              to the returned array. Should expect a ShallowWrapper as the first argument, and will be run
+     *              with a context of the original instance.
+     */
+    map<V>(fn: (wrapper: this) => V): V[];
+
+    /**
+     * Applies the provided reducing function to every node in the wrapper to reduce to a single value. Each node
+     * is passed in as a ShallowWrapper, and is processed from left to right.
+     * @param fn
+     * @param initialValue
+     */
+    reduce<R>(fn: (prevVal: R, wrapper: this, index: number) => R, initialValue?: R): R[];
+
+    /**
+     * Applies the provided reducing function to every node in the wrapper to reduce to a single value.
+     * Each node is passed in as a ShallowWrapper, and is processed from right to left.
+     * @param fn
+     * @param initialValue
+     */
+    reduceRight<R>(fn: (prevVal: R, wrapper: this, index: number) => R, initialValue?: R): R[];
+
+    /**
+     * Returns whether or not any of the nodes in the wrapper match the provided selector.
+     * @param selector
+     */
+    some(selector: EnzymeSelector): Boolean;
+
+    /**
+     * Returns whether or not any of the nodes in the wrapper pass the provided predicate function.
+     * @param fn
+     */
+    someWhere(fn: (wrapper: this) => Boolean): Boolean;
+
+    /**
+     * Returns whether or not all of the nodes in the wrapper match the provided selector.
+     * @param selector
+     */
+    every(selector: EnzymeSelector): Boolean;
+
+    /**
+     * Returns whether or not any of the nodes in the wrapper pass the provided predicate function.
+     * @param fn
+     */
+    everyWhere(fn: (wrapper: this) => Boolean): Boolean;
+
+    length: number;
+}
+
+export interface ShallowWrapper<P, S> extends CommonWrapper<P, S> {
+    shallow(): ShallowWrapper<P, S>;
+    render(): CheerioWrapper<P, S>;
+
+    /**
+     * Find every node in the render tree that matches the provided selector.
+     * @param selector The selector to match.
+     */
+    find<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
+    find<P2>(statelessComponent: (props: P2) => JSX.Element): ShallowWrapper<P2, {}>;
+    find(selector: string): ShallowWrapper<HTMLAttributes, any>;
+
+    /**
+     * Removes nodes in the current wrapper that do not match the provided selector.
+     * @param selector The selector to match.
+     */
+    filter<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
+    filter<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, {}>;
+    filter(selector: string): ShallowWrapper<HTMLAttributes, any>;
+
+    /**
+     * Finds every node in the render tree that returns true for the provided predicate function.
+     * @param predicate
+     */
+    findWhere(predicate: (wrapper: CommonWrapper<any, any>) => Boolean): ShallowWrapper<any, any>;
+
+    /**
+     * Returns a new wrapper with all of the children of the node(s) in the current wrapper. Optionally, a selector
+     * can be provided and it will filter the children by this selector.
+     * @param [selector]
+     */
+    children<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
+    children<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, {}>;
+    children(selector: string): ShallowWrapper<HTMLAttributes, any>;
+    children(): ShallowWrapper<any, any>;
+
+    /**
+     * Returns a wrapper around all of the parents/ancestors of the wrapper. Does not include the node in the
+     * current wrapper. Optionally, a selector can be provided and it will filter the parents by this selector.
+     *
+     * Note: can only be called on a wrapper of a single node.
+     * @param [selector]
+     */
+    parents<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
+    parents<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, {}>;
+    parents(selector: string): ShallowWrapper<HTMLAttributes, any>;
+    parents(): ShallowWrapper<any, any>;
+
+    /**
+     * Returns a wrapper of the first element that matches the selector by traversing up through the current node's
+     * ancestors in the tree, starting with itself.
+     *
+     * Note: can only be called on a wrapper of a single node.
+     * @param selector
+     */
+    closest<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
+    closest<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, {}>;
+    closest(selector: string): ShallowWrapper<HTMLAttributes, any>;
+
+    /**
+     * Returns a wrapper with the direct parent of the node in the current wrapper.
+     */
+    parent(): ShallowWrapper<any, any>;
+}
+
+export interface ReactWrapper<P, S> extends CommonWrapper<P, S> {
+
+}
+
+export interface CheerioWrapper<P, S> extends CommonWrapper<P, S> {
+
+}
+
+/**
+ * Shallow rendering is useful to constrain yourself to testing a component as a unit, and to ensure that
+ * your tests aren't indirectly asserting on behavior of child components.
+ * @param node
+ * @param [options]
+ */
+export declare function shallow<P, S>(node: ReactElement<P>, options?: any): ShallowWrapper<P, S>;
+
+/**
+ * Mounts and renders a react component into the document and provides a testing wrapper around it.
+ * @param node
+ * @param [options]
+ */
+export declare function mount<P, S>(node: ReactElement<P>, options?: any): ReactWrapper<P, S>;
+
+/**
+ * Render react components to static HTML and analyze the resulting HTML structure.
+ * @param node
+ * @param [options]
+ */
+export declare function render<P, S>(node: ReactElement<P>, options?: any): CheerioWrapper<P, S>;
+
+export declare function describeWithDOM(description: String, fn: Function): void;
+
+export declare function spyLifecycle(component: typeof Component): void;
diff --git a/enzyme/tsconfig.json b/enzyme/tsconfig.json
new file mode 100644
index 0000000000..c5d060ef26
--- /dev/null
+++ b/enzyme/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "enzyme-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/eonasdan-bootstrap-datetimepicker/eonasdan-bootstrap-datetimepicker-tests.ts b/eonasdan-bootstrap-datetimepicker/eonasdan-bootstrap-datetimepicker-tests.ts
index 22ca50bab5..d84c6cd5a6 100644
--- a/eonasdan-bootstrap-datetimepicker/eonasdan-bootstrap-datetimepicker-tests.ts
+++ b/eonasdan-bootstrap-datetimepicker/eonasdan-bootstrap-datetimepicker-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="eonasdan-bootstrap-datetimepicker.d.ts"/>
+import * as moment from 'moment';
 
 // Minimum Setup
 $("#datetimepicker1").datetimepicker();
diff --git a/eonasdan-bootstrap-datetimepicker/eonasdan-bootstrap-datetimepicker.d.ts b/eonasdan-bootstrap-datetimepicker/eonasdan-bootstrap-datetimepicker.d.ts
deleted file mode 100644
index 1bb8e70a02..0000000000
--- a/eonasdan-bootstrap-datetimepicker/eonasdan-bootstrap-datetimepicker.d.ts
+++ /dev/null
@@ -1,1246 +0,0 @@
-// Type definitions for Bootstrap v3 Datepicker v4.17.37
-// Project: http://eonasdan.github.io/bootstrap-datetimepicker
-// Definitions by: Markus Peloso <https://github.com/ToastHawaii>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="../moment/moment.d.ts"/>
-
-declare namespace EonasdanBootstrapDatetimepicker {
-    type DateComparable = string | Date | moment.Moment;
-
-    type UseCurrent = "year" | "month" | "day" | "hour" | "minute";
-
-    interface Icons {
-        /**
-         * Default: "glyphicon glyphicon-chevron-right"
-         */
-        time?: string;
-
-        /**
-         * Default: "glyphicon glyphicon-calendar"
-         */
-        date?: string;
-
-        /**
-         * Default: "glyphicon glyphicon-chevron-up"
-         */
-        up?: string;
-
-        /**
-         * Default: "glyphicon glyphicon-time"
-         */
-        down?: string;
-
-        /**
-         * Default: "glyphicon glyphicon-screenshot"
-         */
-        previous?: string;
-
-        /**
-         * Default: "glyphicon glyphicon-chevron-left"
-         */
-        next?: string;
-
-        /**
-         * Default: "glyphicon glyphicon-chevron-down"
-         */
-        today?: string;
-
-        /**
-         * Default: "glyphicon glyphicon-trash"
-         */
-        clear?: string;
-
-        /**
-         * Default: "glyphicon glyphicon-remove"
-         */
-        close?: string;
-    }
-
-    const enum DayOfWeek {
-        Sunday = 0,
-        Monday = 1,
-        Tuesday = 2,
-        Wednesday = 3,
-        Thursday = 4,
-        Friday = 5,
-        Saturday = 6
-    }
-
-    type ViewMode = "days" | "months" | "years" | "decades";
-
-    type ToolbarPlacement = "default" | "top" | "bottom";
-
-    interface WidgetPositioning {
-        horizontal?: "auto" | "left" | "right";
-        vertical?: "auto" | "top" | "bottom";
-    }
-
-    interface KeyBinds {
-        up?: (widget: JQuery | boolean) => any;
-        down?: (widget: JQuery | boolean) => any;
-        "control up"?: (widget: JQuery | boolean) => any;
-        "control down"?: (widget: JQuery | boolean) => any;
-        left?: (widget: JQuery | boolean) => any;
-        right?: (widget: JQuery | boolean) => any;
-        pageUp?: (widget: JQuery | boolean) => any;
-        pageDown?: (widget: JQuery | boolean) => any;
-        enter?: () => any;
-        escape?: () => any;
-        "control space"?: (widget: JQuery) => any;
-        t?: () => any;
-        delete?: () => any;
-    }
-
-    type FromTo = [moment.Moment, moment.Moment];
-
-    interface Tooltips {
-        /**
-         * Default: "Go to today"
-         */
-        today?: string;
-
-        /**
-         * Default: "Clear selection"
-         */
-        clear?: string;
-
-        /**
-         * Default: "Close the picker"
-         */
-        close?: string;
-
-        /**
-         * Default: "Select Month"
-         */
-        selectMonth?: string;
-
-        /**
-         * Default: "Previous Month"
-         */
-        prevMonth?: string;
-
-        /**
-         * Default: "Next Month"
-         */
-        nextMonth?: string;
-
-        /**
-         * Default: "Select Year"
-         */
-        selectYear?: string;
-
-        /**
-         * Default: "Previous Year"
-         */
-        prevYear?: string;
-
-        /**
-         * Default: "Next Year"
-         */
-        nextYear?: string;
-
-        /**
-         * Default: "Select Decade"
-         */
-        selectDecade?: string;
-
-        /**
-         * Default: "Previous Decade"
-         */
-        prevDecade?: string;
-
-        /**
-         * Default: "Next Decade"
-         */
-        nextDecade?: string;
-
-        /**
-         * Default: "Previous Century"
-         */
-        prevCentury?: string;
-
-        /**
-         * Default: "Next Century"
-         */
-        nextCentury?: string;
-
-        /**
-         * Default: "Pick Hour"
-         */
-        pickHour?: string;
-
-        /**
-         * Default: "Increment Hour"
-         */
-        incrementHour?: string;
-
-        /**
-         * Default: "Decrement Hour"
-         */
-        decrementHour?: string;
-
-        /**
-         * Default: "Pick Minute"
-         */
-        pickMinute?: string;
-
-        /**
-         * Default: "Increment Minute"
-         */
-        incrementMinute?: string;
-
-        /**
-         * Default: "Decrement Minute"
-         */
-        decrementMinute?: string;
-
-        /**
-         * Default: "Pick Second"
-         */
-        pickSecond?: string;
-
-        /**
-         * Default: "Increment Second"
-         */
-        incrementSecond?: string;
-
-        /**
-         * Default: "Decrement Second"
-         */
-        decrementSecond?: string;
-
-        /**
-         * Default:  "Toggle Period"
-         */
-        togglePeriod?: string;
-
-        /**
-         * Default: "Select Time"
-         */
-        selectTime?: string;
-    }
-
-    type ParseInputDateFunction = (inputDate: string) => moment.Moment;
-
-    interface OptionsBase {
-        /**
-         * Default: "Etc/UTC"
-         */
-        timeZone?: string;
-
-        /**
-         * See momentjs' docs for valid formats. Format also dictates what components are shown, e.g. MM/dd/YYYY will not display the time picker.
-         * Default: false
-         */
-        format?: string | boolean;
-
-        /**
-         * Changes the heading of the datepicker when in "days" view.
-         * Default: "MMMM YYYY"
-         */
-        dayViewHeaderFormat?: string;
-
-        /**
-         * Allows for several input formats to be valid.
-         * Default: false
-         */
-        extraFormats?: string[] | boolean;
-
-        /**
-         * Number of minutes the up/down arrow's will move the minutes value in the time picker.
-         * Default: 1
-         */
-        stepping?: number;
-
-        /**
-         * Prevents date/time selections before this date.
-         * minDate will override defaultDate and useCurrent if either of these settings are the same day since both options are invalid according to the rules you've selected.
-         * Default: false
-         */
-        minDate?: DateComparable | boolean;
-
-        /**
-         * Prevents date/time selections after this date.
-         * maxDate will override defaultDate and useCurrent if either of these settings are the same day since both options are invalid according to the rules you've selected.
-         * Default: false
-         */
-        maxDate?: DateComparable | boolean;
-
-        /**
-         * On show, will set the picker to the current date/time
-         * Default: true
-         */
-        useCurrent?: boolean | UseCurrent;
-
-        /**
-         * Using a Bootstraps collapse to switch between date/time pickers.
-         * Default: true
-         */
-        collapse?: boolean;
-
-        /**
-         * See momentjs for valid locales.
-         * You must include moment-with-locales.js or a local js file.
-         * Default: moment.locale()
-         */
-        locale?: string;
-
-        /**
-         * Sets the picker default date/time. Overrides useCurrent
-         * Default: false
-         */
-        defaultDate?: DateComparable | boolean;
-
-        /**
-         * Change the default icons for the pickers functions
-         * Default: {
-         *              time: "glyphicon glyphicon-time",
-         *              date: "glyphicon glyphicon-calendar",
-         *              up: "glyphicon glyphicon-chevron-up",
-         *              down: "glyphicon glyphicon-chevron-down",
-         *              previous: "glyphicon glyphicon-chevron-left",
-         *              next: "glyphicon glyphicon-chevron-right",
-         *              today: "glyphicon glyphicon-screenshot",
-         *              clear: "glyphicon glyphicon-trash",
-         *              close: "glyphicon glyphicon-remove"
-         *          }
-         */
-        icons?: Icons;
-
-        /**
-         * Defines if moment should use strict date parsing when considering a date to be valid
-         * Default: false
-         */
-        useStrict?: boolean;
-
-        /**
-         * Shows the picker side by side when using the time and date together.
-         * Default: false
-         */
-        sideBySide?: boolean;
-
-        /**
-         * Accepts: array of numbers from 0-6
-         * Disables the section of days of the week, e.g. weekends.
-         * Default: false
-         */
-        daysOfWeekDisabled?: DayOfWeek[] | boolean;
-
-        /**
-         * Shows the week of the year to the left of first day of the week.
-         * Default: false
-         */
-        calendarWeeks?: boolean;
-
-        /**
-         * The default view to display when the picker is shown.
-         * Note: To limit the picker to selecting, for instance the year and month, use format: MM/YYYY
-         * Default: "days"
-         */
-        viewMode?: ViewMode;
-
-        /**
-         * Changes the placement of the icon toolbar.
-         * Default: "default"
-         */
-        toolbarPlacement?: ToolbarPlacement;
-
-        /**
-         * Show the "Today" button in the icon toolbar.
-         * Clicking the "Today" button will set the calendar view and set the date to now.
-         * Default: false
-         */
-        showTodayButton?: boolean;
-
-        /**
-         * Show the "Clear" button in the icon toolbar.
-         * Clicking the "Clear" button will set the calendar to null.
-         * Default: false
-         */
-        showClear?: boolean;
-
-        /**
-         * Show the "Close" button in the icon toolbar.
-         * Clicking the "Close" button will call hide()
-         * Default: false
-         */
-        showClose?: boolean;
-
-        /**
-         * Accepts: object with the all or one of the parameters above
-         * horizontal: 'auto', 'left', 'right'
-         * vertical: 'auto', 'top', 'bottom'
-         * Default: {
-         *              horizontal: 'auto'
-         *              vertical: 'auto'
-         *          }
-         */
-        widgetPositioning?: WidgetPositioning;
-
-        /**
-         * On picker show, places the widget at the identifier (string) or jQuery object if the element has css position: "relative"
-         * Default: null
-         */
-        widgetParent?: string | JQuery;
-
-        /**
-         * Will cause the date picker to stay open after selecting a date if no time components are being used.
-         * Default: false
-         */
-        keepOpen?: boolean;
-
-        /**
-         * Will display the picker inline without the need of a input field. This will also hide borders and shadows.
-         * Default: false
-         */
-        inline?: boolean;
-
-        /**
-         * Default: ".datepickerinput"
-         */
-        datepickerInput?: string;
-
-        /**
-         * Will cause the date picker to not revert or overwrite invalid dates.
-         * Default: false
-         */
-        keepInvalid?: boolean;
-
-        /**
-         * Allows for custom events to fire on keyboard press.
-         * For example:
-         *                keybinds:
-         *                {
-         *                		up: (widget) => console.log(widget),
-         *                		"control up": (widget) => console.log(widget)
-         *                }
-         * The widget parameter is false, if the datepicker is closed.
-         * Default: {
-         *          up: function (widget) {
-         *              if (widget.find(".datepicker").is(":visible")) {
-         *                  this.date(this.date().clone().subtract(7, "d"));
-         *              } else {
-         *                  this.date(this.date().clone().add(1, "m"));
-         *              }
-         *          },
-         *          down: function (widget) {
-         *              if (!widget) {
-         *                  this.show();
-         *              }
-         *              else if (widget.find(".datepicker").is(":visible")) {
-         *                  this.date(this.date().clone().add(7, "d"));
-         *              } else {
-         *                  this.date(this.date().clone().subtract(1, "m"));
-         *              }
-         *          },
-         *          "control up": function (widget) {
-         *              if (widget.find(".datepicker").is(":visible")) {
-         *                  this.date(this.date().clone().subtract(1, "y"));
-         *              } else {
-         *                  this.date(this.date().clone().add(1, "h"));
-         *              }
-         *          },
-         *          "control down": function (widget) {
-         *              if (widget.find(".datepicker").is(":visible")) {
-         *                  this.date(this.date().clone().add(1, "y"));
-         *              } else {
-         *                  this.date(this.date().clone().subtract(1, "h"));
-         *              }
-         *          },
-         *          left: function (widget) {
-         *              if (widget.find(".datepicker").is(":visible")) {
-         *                  this.date(this.date().clone().subtract(1, "d"));
-         *              }
-         *          },
-         *          right: function (widget) {
-         *              if (widget.find(".datepicker").is(":visible")) {
-         *                  this.date(this.date().clone().add(1, "d"));
-         *              }
-         *          },
-         *          pageUp: function (widget) {
-         *              if (widget.find(".datepicker").is(":visible")) {
-         *                  this.date(this.date().clone().subtract(1, "M"));
-         *              }
-         *          },
-         *          pageDown: function (widget) {
-         *              if (widget.find(".datepicker").is(":visible")) {
-         *                  this.date(this.date().clone().add(1, "M"));
-         *              }
-         *          },
-         *          enter: function () {
-         *              this.hide();
-         *          },
-         *          escape: function () {
-         *              this.hide();
-         *          },
-         *          "control space": function (widget) {
-         *              if (widget.find(".timepicker").is(":visible")) {
-         *                  widget.find(".btn[data-action="togglePeriod"]").click();
-         *              }
-         *          },
-         *          t: function () {
-         *              this.date(moment());
-         *          },
-         *          "delete": function () {
-         *              this.clear();
-         *          }
-         *       }
-         */
-        keyBinds?: KeyBinds;
-
-        /**
-         * Will cause the date picker to stay open after a blur event.
-         * Default: false
-         */
-        debug?: boolean;
-
-        /**
-         * Allow date picker show event to fire even when the associated input element has the readonly="readonly" property.
-         * Default: false
-         */
-        ignoreReadonly?: boolean;
-
-        /**
-         * Disables time selection between the given moments.
-         * For example:
-         * [[moment({ h: 0 }), moment({ h: 8 })], [moment({ h: 18 }), moment({ h: 24 })]]
-         * Default: false
-         */
-        disabledTimeIntervals?: boolean | FromTo[];
-
-        /**
-        * If true, the picker will show on textbox focus and icon click when used in a button group
-        * Default: false
-        */
-        allowInputToggle?: boolean;
-
-        /**
-         * If false, the textbox will not be given focus when the picker is shown
-         * Default: true
-         */
-        focusOnShow?: boolean;
-
-        /**
-         * This will change the viewDate without changing or setting the selected date.
-         * Default: false
-         */
-        viewDate?: DateComparable | boolean;
-
-        /**
-         * This will change the tooltips over each icon to a custom string
-         * Default: {
-         *              today: "Go to today",
-         *              clear: "Clear selection",
-         *              close: "Close the picker",
-         *              selectMonth: "Select Month",
-         *              prevMonth: "Previous Month",
-         *              nextMonth: "Next Month",
-         *              selectYear: "Select Year",
-         *              prevYear: "Previous Year",
-         *              nextYear: "Next Year",
-         *              selectDecade: "Select Decade",
-         *              prevDecade: "Previous Decade",
-         *              nextDecade: "Next Decade",
-         *              prevCentury: "Previous Century",
-         *              nextCentury: "Next Century"
-         *          }
-         */
-        tooltips?: Tooltips;
-
-        /**
-         * Allows custom input formatting.
-         * For example:
-         * The user can enter "yesterday" or "30 days ago".
-         */
-        parseInputDate?: ParseInputDateFunction;
-    }
-
-    type IndexedDates = { [/** Dates as "YYYY-MM-DD keys */ date: string]: boolean };
-
-    type IndexedHours = { [/** Hours as "0" - "23" keys */ hour: string]: boolean };
-
-    interface GetOptions extends OptionsBase {
-        /**
-         * Disables selection of dates in the array, e.g. holidays
-         * IMPORTANT! The getter returns an Object NOT an Array, with keys being the dates, values being true.
-         * For example:
-         * disabledDates = ["2010-10-10"]; -> disabledDated will be { "2010-01-01": true }
-         * Default: false
-         */
-        disabledDates?: IndexedDates | boolean;
-
-        /**
-         * Enables selection of dates NOT in the array, e.g. holidays
-         * IMPORTANT! The getter returns an Object NOT an Array, with keys being the dates, values being true.
-         * For example:
-         * enabledDates = ["2010-10-10"]; -> enabledDated will be { "2010-01-01": true }
-         * Default: false
-         */
-        enabledDates?: IndexedDates | boolean;
-
-        /**
-         * Will allow or disallow hour selections (much like disabledTimeIntervals) but will affect all days.
-         * IMPORTANT! The getter returns an Object NOT an Array, with keys being the hours, values being true.
-         * For example:
-         * enabledHours = [0, 1]; -> enabledHours will be { "0": true, "1": true }
-         * Default: false
-         */
-        enabledHours?: IndexedHours | boolean;
-
-        /**
-         * Will allow or disallow hour selections (much like disabledTimeIntervals) but will affect all days.
-         * IMPORTANT! The getter returns an Object NOT an Array, with keys being the hours, values being true.
-         * For example:
-         * disabledHours = [0, 1]; -> disabledHours will be { "0": true, "1": true }
-         * Default: false
-         */
-        disabledHours?: IndexedHours | boolean;
-    }
-
-    interface SetOptions extends OptionsBase {
-        /**
-         * Disables selection of dates in the array, e.g. holidays
-         * IMPORTANT! The getter returns an Object NOT an Array, with keys being the dates, values being true.
-         * For example:
-         * disabledDates = ["2010-10-10"]; -> disabledDated will be { "2010-01-01": true }
-         * Default: false
-         */
-        disabledDates?: DateComparable[] | boolean;
-
-        /**
-         * Enables selection of dates NOT in the array, e.g. holidays
-         * IMPORTANT! The getter returns an Object NOT an Array, with keys being the dates, values being true.
-         * For example:
-         * enabledDates = ["2010-10-10"]; -> enabledDated will be { "2010-01-01": true }
-         * Default: false
-         */
-        enabledDates?: DateComparable[] | boolean;
-
-        /**
-         * Will allow or disallow hour selections (much like disabledTimeIntervals) but will affect all days.
-         * IMPORTANT! The getter returns an Object NOT an Array, with keys being the hours, values being true.
-         * For example:
-         * enabledHours = [0, 1]; -> enabledHours will be { "0": true, "1": true }
-         * Default: false
-         */
-        enabledHours?: number[] | boolean;
-
-        /**
-         * Will allow or disallow hour selections (much like disabledTimeIntervals) but will affect all days.
-         * IMPORTANT! The getter returns an Object NOT an Array, with keys being the hours, values being true.
-         * For example:
-         * disabledHours = [0, 1]; -> disabledHours will be { "0": true, "1": true }
-         * Default: false
-         */
-        disabledHours?: number[] | boolean;
-    }
-
-    interface Datetimepicker {
-        /**
-         * Destroys the widget and removes all attached event listeners.
-         */
-        destroy(): void;
-
-        /**
-         * Shows or hides the widget.
-         * Emits:
-         * - dp.hide - if the widget is hidden after the toggle call
-         * - dp.show - if the widget is show after the toggle call
-         * - dp.change - if the widget is opened for the first time and the input element is empty and options.useCurrent != false
-         */
-        toggle(): Datetimepicker;
-
-        /**
-         * Shows the widget.
-         * Emits:
-         * - dp.show - if the widget was hidden before that call
-         * - dp.change - if the widget is opened for the first time and the useCurrent is set to true or to a granularity value and the input element the component is attached to has an empty value
-         */
-        show(): Datetimepicker;
-
-        /**
-         * Hides the widget.
-         * Emits:
-         * - dp.hide - if the widget was visible before that call
-         */
-        hide(): Datetimepicker;
-
-        /**
-         * Disables the input element, the component is attached to, by adding a disabled="true" attribute to it. If the widget was visible before that call it is hidden.
-         * Emits:
-         * - dp.hide - if the widget was visible before that call
-         */
-        disable(): Datetimepicker;
-
-        /**
-         * Enables the input element, the component is attached to, by removing disabled attribute from it.
-         */
-        enable(): Datetimepicker;
-
-        /**
-         * Returns the component's model current date, a moment object or null if not set.
-         */
-        date(): moment.Moment;
-
-        /**
-         * Takes string, Date, moment, null parameter and sets the components model current moment to it.
-         * Passing a null value unsets the components model current moment.
-         * Parsing of the newDate parameter is made using moment library with the options.format and options.useStrict components configuration.
-         * Throws:
-         * - TypeError - in case the newDate cannot be parsed
-         *
-         * Emits:
-         * - dp.change - in case newDate is different from current moment
-         */
-        date(date: DateComparable): Datetimepicker;
-
-        /**
-        * Clears the datepicker by setting the value to null.
-        */
-        clear(): Datetimepicker;
-
-        /**
-         * For the moment this function will only prevent the picker from calling hide() on blur so that the picker can be inspected.
-         */
-        debug(): Datetimepicker;
-
-        /**
-         * Returns the components current options object.
-         * Note that the changing the values of the returned object does not change the components actual configuration.
-         */
-        options(): GetOptions
-        /**
-         * Takes an object variable with option key:value properties and configures the component. Use this to update multiple options on the component.
-         */
-        options(options: SetOptions): Datetimepicker
-
-        //////////////////////////////////////////////////////////////////////////////////////
-        //// Below are the getters/setters for the properties of the 'options(): Options' ////
-        //////////////////////////////////////////////////////////////////////////////////////
-
-        /**
-         * Returns the component's options.timeZone.
-         */
-        timeZone(): string;
-
-        timeZone(newZone: string): Datetimepicker;
-
-        /**
-         * Returns the options.disabledDates option.
-         * IMPORTANT! The getter returns an Object NOT an Array, with keys being the dates, values being true.
-         * For example:
-         * disabledDates = ["2010-10-10"]; -> disabledDated will be { "2010-01-01": true }
-         */
-        disabledDates(): IndexedDates | boolean;
-
-        /**
-         * Takes an array of values and disallows the user to select those days.
-         * Setting this takes precedence over options.minDate, options.maxDate configuration.
-         * Also calling this function removes the configuration of options.enabledDates if such exist.
-         * Note: These values are matched with Day granularity.
-         */
-        disabledDates(dates: DateComparable[] | boolean): Datetimepicker;
-
-        /**
-         * Returns the options.enabledDates option.
-         * IMPORTANT! The getter returns an Object NOT an Array, with keys being the dates, values being true.
-         * For example:
-         * enabledDates = ["2010-10-10"]; -> enabledDated will be { "2010-01-01": true }
-         */
-        enabledDates(): IndexedDates | boolean;
-
-        /**
-         * Takes an array of values and allows the user to select only from those days.
-         * Setting this takes precedence over options.minDate, options.maxDate configuration.
-         * Also calling this function with boolean:false removes the configuration of options.disabledDates if such exist.
-         * Note: These values are matched with Day granularity.
-         */
-        enabledDates(dates: DateComparable[] | boolean): Datetimepicker;
-
-        /**
-         * Returns a moment with the options.defaultDate option configuration or false if not set.
-         */
-        defaultDate(): moment.Moment | boolean;
-
-        /**
-         * Will set the picker's inital date.
-         * If a boolean:false value is passed the options.defaultDate parameter is cleared.
-         * Throws:
-         * - TypeError - if the provided date doesn't pass validation, including disabledDates, enabledDates, minDate, maxDate, and daysOfWeekDisabled
-         * - TypeError - if the provided date cannot be parsed by momentjs
-         */
-        defaultDate(dates: DateComparable | boolean): Datetimepicker;
-
-        /**
-         * Returns the options.useCurrent option configuration.
-         */
-        useCurrent(): boolean | UseCurrent;
-
-        /**
-         * Takes a boolean or string.
-         * If a boolean true is passed and the components model moment is not set (either through setDate or through a valid value on the input element the component is attached to) then the first time the user opens the datetimepicker widget the value is initialized to the current moment of the action.
-         * If a false boolean is passed then no initialization happens on the input element.
-         * You can select the granularity on the initialized moment by passing one of the following strings ("year", "month", "day", "hour", "minute") in the variable.
-         * If for example you pass "day" to the useCurrent function and the input field is empty the first time the user opens the datetimepicker widget the input text will be initialized to the current datetime with day granularity (ie if currentTime = 2014-08-10 13:32:33 the input value will be initialized to 2014-08-10 00:00:00)
-         * Note: If the options.defaultDate is set or the input element the component is attached to has already a value that takes precedence and the functionality of useCurrent is not triggered!
-         */
-        useCurrent(useCurrent: boolean | UseCurrent): Datetimepicker;
-
-        /**
-         * Returns the currently set moment of the options.minDate or false if not set.
-         */
-        minDate(): moment.Moment | boolean;
-
-        /**
-         * Takes a parameter and disallows the user to select a moment that is before that moment.
-         * If a boolean:false value is passed the options.minDate parameter is cleared and there is no restriction to the miminum moment the user can select.
-         * Note: If the parameter is after the currently selected moment the currently selected moment changes to minDate parameter
-         * Throws:
-         * - TypeError - if the parameter cannot be parsed using the options.format and options.useStrict configuration settings
-         * - TypeError - if the parameter is after options.maxDate
-         *
-         * Emits:
-         * - dp.change - if the new minDate is after currently selected moment
-         * - dp.error - if the new minDate is after currently selected moment
-         */
-        minDate(minDate: DateComparable | boolean): Datetimepicker;
-
-        /**
-         * Returns the currently set moment of the options.maxDate or false if not set.
-         */
-        maxDate(): moment.Moment | boolean;
-
-        /**
-         * Takes a parameter and disallows the user to select a moment that is after that moment.
-         * If a boolean:false value is passed options.maxDate is cleared and there is no restriction to the maximum moment the user can select.
-         * Note: If the parameter is before the currently selected moment the currently selected moment changes to maxDate
-         * Throws:
-         * - TypeError - if the parameter cannot be parsed using the options.format and options.useStrict configuration settings
-         * - TypeError - if the parameter is before options.minDate
-         *
-         * Emits:
-         * - dp.change - if the new maxDate is after currently selected moment
-         * - dp.error - if the new maxDate is after currently selected moment
-         */
-        maxDate(maxDate: DateComparable | boolean): Datetimepicker;
-
-        /**
-         * Returns the options.daysOfWeekDisabled configuration
-         * IMPORTANT! Throws exception if not set explicitly https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1459
-         */
-        daysOfWeekDisabled(): DayOfWeek[];
-
-        /**
-         * Takes an [ Number:0 to 6 ] and disallow the user to select weekdays that exist in this array.
-         * This has lower priority over the options.minDate, options.maxDate, options.disabledDates and options.enabledDates configuration settings.
-         * Emits:
-         * - dp.change - if the currently selected moment falls in the values passed on the daysOfWeek parameter.
-         * - dp.error - if the currently selected moment falls in the values passed on the daysOfWeek parameter.
-         */
-        daysOfWeekDisabled(daysOfWeek: DayOfWeek[]): Datetimepicker;
-
-        /**
-         * Returns the component's options.format.
-         */
-        format(): string | boolean;
-
-        /**
-         * Takes a moment.js format string and sets the components options.format.
-         * This is used for displaying and also for parsing input strings either from the input element the component is attached to or the date() function.
-         * The parameter can also be a boolean:false in which case the format is set to the locale's L LT.
-         * Note: this is also used to determine if the TimePicker sub component will display the hours in 12 or 24 format. (if "a" or "h" exists in the passed string then a 12 hour mode is set)
-         */
-        format(format: string | boolean): Datetimepicker;
-
-        /**
-         * Returns a boolean or array with the options.extraFormats option configuration.
-         */
-        extraFormats(): string[] | boolean;
-
-        /**
-         * Takes an array of valid input moment format options, or boolean:false.
-         */
-        extraFormats(formats: string[] | boolean): Datetimepicker;
-
-        /**
-         * Returns the currently set locale of the options.locale.
-         */
-        locale(): string;
-
-        /**
-         * Takes a string of any valid moment locale e.g. de for German.
-         * Throws:
-         * - TypeError - if the locale is not loaded via a separate script or moment-with-locales
-         */
-        locale(newLocale: string): Datetimepicker;
-
-        /**
-         * Returns a number with the options.stepping option configuration.
-         */
-        stepping(): number;
-
-        /**
-         * This will be the amount the up/down arrows move the minute value with a time picker.
-         */
-        stepping(step: number): Datetimepicker;
-
-        /**
-         * Returns a boolean of the options.sideBySide.
-         */
-        sideBySide(): boolean;
-
-        /**
-         * If sideBySide is true and the time picker is used, both components will display side by side instead of collapsing.
-         */
-        sideBySide(sideBySide: boolean): Datetimepicker;
-
-        /**
-         * Returns the options.collapse option configuration.
-         */
-        collapse(): boolean;
-
-        /**
-         * If set to false the picker will display similar to sideBySide except vertical.
-         */
-        collapse(collapse: boolean): Datetimepicker;
-
-        /**
-         * Returns options.icons.
-         */
-        icons(): Icons;
-
-        /**
-         * Takes an Object of strings.
-         * Throws:
-         * - TypeError - if icons parameter is not an Object
-         */
-        icons(icons: Icons): Datetimepicker;
-
-        /**
-         * Returns the options.useStrict
-         */
-        useStrict(): boolean;
-
-        /**
-         * If useStrict is true, momentjs parsing rules will be stricter when determining if a date is valid or not.
-         */
-        useStrict(useStrict: boolean): Datetimepicker;
-
-        /**
-         * Returns the options.widgetPositioning object.
-         */
-        widgetPositioning(): WidgetPositioning;
-
-        /**
-         * WidgetPositioning defines where the dropdown with the widget will appear relative to the input element the component is attached to.
-         * "auto" is the default value for both horizontal and vertical keys and it tries to automatically place the dropdown in a position that is visible to the user.
-         * Usually you should not override those options unless you have a special need in your layout.
-         */
-        widgetPositioning(positioningObject: WidgetPositioning): Datetimepicker;
-
-        /**
-         * Returns the options.viewMode.
-         */
-        viewMode(): ViewMode;
-
-        /**
-         * Takes a string. Valid values are "days", "months", "years" and "decades"
-         * Throws:
-         * - TypeError - if newViewMode parameter is not an a string or if newViewMode is not a valid value
-         */
-        viewMode(newViewMode: ViewMode): Datetimepicker;
-
-        /**
-         * Returns the current options.calendarWeeks option configuration.
-         */
-        calendarWeeks(): boolean;
-
-        /**
-         * Set if the week numbers will appear to the left on the days view.
-         */
-        calendarWeeks(calendarWeeks: boolean): Datetimepicker;
-
-        /**
-         * Returns the options.showClear option.
-         */
-        showClear(): boolean;
-
-        /**
-         * Set if the clear date button will appear on the widget.
-         */
-        showClear(showClear: boolean): Datetimepicker;
-
-        /**
-         * Returns the options.showTodayButton option.
-         */
-        showTodayButton(): boolean;
-
-        /**
-         * Set if the Today button will appear on the widget.
-         */
-        showTodayButton(showTodayButton: boolean): Datetimepicker;
-
-        /**
-         * Returns the options.toolbarplacement option.
-         */
-        toolbarPlacement(): ToolbarPlacement;
-
-        /**
-        * Changes the placement of the toolbar where the today, clear, component switch icon are located.
-        * See valid values at DatetimepickerOptions.toolbarplacement
-        * Throws:
-        * - TypeError if the parameter is not a valid value
-        */
-        toolbarPlacement(toolbarPlacement: ToolbarPlacement): Datetimepicker;
-
-        /**
-         * Returns the options.dayViewHeaderFormat option.
-         */
-        dayViewHeaderFormat(): string;
-
-        /**
-         * Used to customize the header of the day view.
-         */
-        dayViewHeaderFormat(dayViewHeaderFormat: string): Datetimepicker;
-
-        /**
-         * Returns the currently set options.keyBinds option.
-         */
-        keyBinds(): KeyBinds;
-
-        /**
-         * Allows for several keyBinding functions to be specified for ease of access or accessibility.
-         */
-        keyBinds(keyBinds: KeyBinds): Datetimepicker;
-
-        /**
-         * Returns the options.inline option.
-         */
-        inline(): boolean;
-
-        /**
-         * Used to customize the header of the day view.
-         */
-        inline(inline: boolean): Datetimepicker;
-
-        /**
-         * Returns the options.ignoreReadonly option.
-         */
-        ignoreReadonly(): boolean;
-
-        /**
-         * Set this to true to allow the picker to be used even if the input field is readonly. This will not bypass the disabled property.
-         */
-        ignoreReadonly(ignoreReadonly: boolean): Datetimepicker;
-
-        /**
-         * Returns the options.showClose option.
-         */
-        showClose(): boolean;
-
-        /**
-         * If true, an icon will be displayed on the toolbar that will hide the picker.
-         */
-        showClose(showClose: boolean): Datetimepicker;
-
-        /**
-         * Returns the options.keepInvalid option.
-         */
-        keepInvalid(): boolean;
-
-        /**
-         * If true, invalid dates will not be reverted to a previous selection or changed.
-         */
-        keepInvalid(keepInvalid: boolean): Datetimepicker;
-
-        /**
-         * Returns the options.datepickerInput option.
-         */
-        datepickerInput(): string;
-
-        datepickerInput(datepickerInput: string): Datetimepicker;
-
-        /**
-         * Returns the options.allowInputToggle option.
-         */
-        allowInputToggle(): boolean;
-
-        /**
-         * If true, the picker will show on textbox focus and icon click when used in a button group.
-         */
-        allowInputToggle(allowInputToggle: boolean): Datetimepicker;
-
-        /**
-         * Returns the options.focusOnShow option.
-         */
-        focusOnShow(): boolean;
-
-        /**
-         * If false, the textbox will not be given focus when the picker is shown.
-         */
-        focusOnShow(focusOnShow: boolean): Datetimepicker;
-
-        /**
-         * Returns the options.disabledTimeIntervals option.
-         */
-        disabledTimeIntervals(): FromTo[] | boolean;
-
-        /**
-         * Disables time selection between the given moments.
-         * For example:
-         * disabledTimeIntervals: [[moment({ h: 0 }), moment({ h: 8 })], [moment({ h: 18 }), moment({ h: 24 })]]
-         * Will disable times between 12-8am and 6-12pm today
-         */
-        disabledTimeIntervals(disabledTimeIntervals: FromTo[] | boolean): Datetimepicker;
-
-        /**
-         * Returns the options.disabledHours option.
-         * IMPORTANT! The getter returns an Object NOT an Array, with keys being the hours, values being true.
-         * For example:
-         * enabledHours = [0, 1]; -> enabledHours will be { "0": true, "1": true }
-         */
-        disabledHours(): IndexedHours | boolean;
-
-        /**
-         * Must be in 24 hour format. Will disallow hour selections (much like disabledTimeIntervals) but will affect all days.
-         * Note: Like en/disabledDates, the en/disabledHours options are mutually exclusive and will reset one of the options back to false.
-         * For example:
-         * disabledHours: [0, 1, 2, 3, 4, 5, 6, 7, 8, 18, 19, 20, 21, 22, 23, 24]
-         * enabledHours: [9, 10, 11, 12, 13, 14, 15, 16]
-         */
-        disabledHours(disabledHours: number[] | boolean): Datetimepicker;
-
-        /**
-         * Returns the options.enabledHours option.
-         * IMPORTANT! The getter returns an Object NOT an Array, with keys being the hours, values being true.
-         * For example:
-         * disabledHours = [0, 1]; -> disabledHours will be { "0": true, "1": true }
-         */
-        enabledHours(): IndexedHours | boolean;
-
-        /**
-         * Must be in 24 hour format. Will allow hour selections (much like enabledTimeIntervals) but will affect all days.
-         * Note: Like en/disabledDates, the en/disabledHours options are mutually exclusive and will reset one of the options back to false.
-         * For example:
-         * disabledHours: [0, 1, 2, 3, 4, 5, 6, 7, 8, 18, 19, 20, 21, 22, 23, 24]
-         * enabledHours: [9, 10, 11, 12, 13, 14, 15, 16]
-        */
-        enabledHours(enabledHours: number[] | boolean): Datetimepicker;
-
-        /**
-         * Returns the options.viewDate option.
-         */
-        viewDate(): moment.Moment | boolean;
-
-        /**
-         * This will change the viewDate without changing or setting the selected date.
-         */
-        viewDate(viewDate: DateComparable | boolean): Datetimepicker;
-
-        /**
-         * Returns the options.parseInputDate option.
-         */
-        parseInputDate(): ParseInputDateFunction;
-
-        /**
-         * Allows custom input formatting.
-         * For example:
-         * The user can enter "yesterday"" or "30 days ago".
-         */
-        parseInputDate(parseInputDate: ParseInputDateFunction): Datetimepicker;
-
-        /**
-         * Returns the options.tooltips option.
-         */
-        tooltips(): Tooltips;
-
-        /**
-         * Sets the tooltips for icons.
-         * Throws:
-         * - TypeError - if tooltips parameter is not an Object
-         */
-        tooltips(tooltips: Tooltips): Datetimepicker;
-    }
-
-    interface HideEventObject extends JQueryEventObject {
-        /**
-         * The currently set date. Type: moment object (clone)
-         */
-        date: moment.Moment;
-    }
-
-    interface ChangeEventObject extends JQueryEventObject {
-        /**
-         * Date the picker changed to. Type: moment object (clone)
-         */
-        date: moment.Moment;
-
-        /**
-         * Previous date. Type: moment object (clone) or false in the event of a null
-         */
-        oldDate: moment.Moment | boolean;
-    }
-
-    interface ErrorEventObject extends JQueryEventObject {
-        /**
-         * The invalid date. Type: moment object (clone)
-         */
-        date: moment.Moment;
-    }
-
-    interface UpdateEventObject extends JQueryEventObject {
-        /**
-         * Change type as a momentjs format token. string e.g. yyyy on year change
-         */
-        change: string;
-
-        /**
-         * New viewDate.
-         */
-        viewDate: moment.Moment;
-    }
-}
-
-interface JQuery {
-    datetimepicker(): JQuery;
-    datetimepicker(options: EonasdanBootstrapDatetimepicker.SetOptions): JQuery;
-
-    data(key: "DateTimePicker"): EonasdanBootstrapDatetimepicker.Datetimepicker;
-
-    off(events: "dp.change", selector?: string, handler?: (eventobject: EonasdanBootstrapDatetimepicker.ChangeEventObject) => any): JQuery;
-    off(events: "dp.change", handler: (eventobject: EonasdanBootstrapDatetimepicker.ChangeEventObject) => any): JQuery;
-
-    on(events: "dp.change", selector: string, data: any, handler?: (eventobject: EonasdanBootstrapDatetimepicker.ChangeEventObject) => any): JQuery;
-    on(events: "dp.change", selector: string, handler: (eventobject: EonasdanBootstrapDatetimepicker.ChangeEventObject) => any): JQuery;
-    on(events: "dp.change", handler: (eventObject: EonasdanBootstrapDatetimepicker.ChangeEventObject) => any): JQuery;
-
-    off(events: "dp.show", selector?: string, handler?: (eventobject: JQueryEventObject) => any): JQuery;
-    off(events: "dp.show", handler: (eventobject: JQueryEventObject) => any): JQuery;
-
-    on(events: "dp.show", selector: string, data: any, handler?: (eventobject: JQueryEventObject) => any): JQuery;
-    on(events: "dp.show", selector: string, handler: (eventobject: JQueryEventObject) => any): JQuery;
-    on(events: "dp.show", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    off(events: "dp.hide", selector?: string, handler?: (eventobject: EonasdanBootstrapDatetimepicker.HideEventObject) => any): JQuery;
-    off(events: "dp.hide", handler: (eventobject: EonasdanBootstrapDatetimepicker.HideEventObject) => any): JQuery;
-
-    on(events: "dp.hide", selector: string, data: any, handler?: (eventobject: EonasdanBootstrapDatetimepicker.HideEventObject) => any): JQuery;
-    on(events: "dp.hide", selector: string, handler: (eventobject: EonasdanBootstrapDatetimepicker.HideEventObject) => any): JQuery;
-    on(events: "dp.hide", handler: (eventObject: EonasdanBootstrapDatetimepicker.HideEventObject) => any): JQuery;
-
-    off(events: "dp.error", selector?: string, handler?: (eventobject: EonasdanBootstrapDatetimepicker.ErrorEventObject) => any): JQuery;
-    off(events: "dp.error", handler: (eventobject: EonasdanBootstrapDatetimepicker.ErrorEventObject) => any): JQuery;
-
-    on(events: "dp.error", selector: string, data: any, handler?: (eventobject: EonasdanBootstrapDatetimepicker.ErrorEventObject) => any): JQuery;
-    on(events: "dp.error", selector: string, handler: (eventobject: EonasdanBootstrapDatetimepicker.ErrorEventObject) => any): JQuery;
-    on(events: "dp.error", handler: (eventObject: EonasdanBootstrapDatetimepicker.ErrorEventObject) => any): JQuery;
-
-    off(events: "dp.update", selector?: string, handler?: (eventobject: EonasdanBootstrapDatetimepicker.UpdateEventObject) => any): JQuery;
-    off(events: "dp.update", handler: (eventobject: EonasdanBootstrapDatetimepicker.UpdateEventObject) => any): JQuery;
-
-    on(events: "dp.update", selector: string, data: any, handler?: (eventobject: EonasdanBootstrapDatetimepicker.UpdateEventObject) => any): JQuery;
-    on(events: "dp.update", selector: string, handler: (eventobject: EonasdanBootstrapDatetimepicker.UpdateEventObject) => any): JQuery;
-    on(events: "dp.update", handler: (eventObject: EonasdanBootstrapDatetimepicker.UpdateEventObject) => any): JQuery;
-}
diff --git a/eonasdan-bootstrap-datetimepicker/index.d.ts b/eonasdan-bootstrap-datetimepicker/index.d.ts
new file mode 100644
index 0000000000..80fb5284e5
--- /dev/null
+++ b/eonasdan-bootstrap-datetimepicker/index.d.ts
@@ -0,0 +1,1249 @@
+// Type definitions for Bootstrap v3 Datepicker v4.17.37
+// Project: http://eonasdan.github.io/bootstrap-datetimepicker
+// Definitions by: Markus Peloso <https://github.com/ToastHawaii>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+import * as moment from '../moment';
+
+export as namespace EonasdanBootstrapDatetimepicker;
+
+export type DateComparable = string | Date | moment.Moment;
+
+export type UseCurrent = "year" | "month" | "day" | "hour" | "minute";
+
+export interface Icons {
+    /**
+     * Default: "glyphicon glyphicon-chevron-right"
+     */
+    time?: string;
+
+    /**
+     * Default: "glyphicon glyphicon-calendar"
+     */
+    date?: string;
+
+    /**
+     * Default: "glyphicon glyphicon-chevron-up"
+     */
+    up?: string;
+
+    /**
+     * Default: "glyphicon glyphicon-time"
+     */
+    down?: string;
+
+    /**
+     * Default: "glyphicon glyphicon-screenshot"
+     */
+    previous?: string;
+
+    /**
+     * Default: "glyphicon glyphicon-chevron-left"
+     */
+    next?: string;
+
+    /**
+     * Default: "glyphicon glyphicon-chevron-down"
+     */
+    today?: string;
+
+    /**
+     * Default: "glyphicon glyphicon-trash"
+     */
+    clear?: string;
+
+    /**
+     * Default: "glyphicon glyphicon-remove"
+     */
+    close?: string;
+}
+
+export declare const enum DayOfWeek {
+    Sunday = 0,
+    Monday = 1,
+    Tuesday = 2,
+    Wednesday = 3,
+    Thursday = 4,
+    Friday = 5,
+    Saturday = 6
+}
+
+export type ViewMode = "days" | "months" | "years" | "decades";
+
+export type ToolbarPlacement = "default" | "top" | "bottom";
+
+export interface WidgetPositioning {
+    horizontal?: "auto" | "left" | "right";
+    vertical?: "auto" | "top" | "bottom";
+}
+
+export interface KeyBinds {
+    up?: (widget: JQuery | boolean) => any;
+    down?: (widget: JQuery | boolean) => any;
+    "control up"?: (widget: JQuery | boolean) => any;
+    "control down"?: (widget: JQuery | boolean) => any;
+    left?: (widget: JQuery | boolean) => any;
+    right?: (widget: JQuery | boolean) => any;
+    pageUp?: (widget: JQuery | boolean) => any;
+    pageDown?: (widget: JQuery | boolean) => any;
+    enter?: () => any;
+    escape?: () => any;
+    "control space"?: (widget: JQuery) => any;
+    t?: () => any;
+    delete?: () => any;
+}
+
+export type FromTo = [moment.Moment, moment.Moment];
+
+export interface Tooltips {
+    /**
+     * Default: "Go to today"
+     */
+    today?: string;
+
+    /**
+     * Default: "Clear selection"
+     */
+    clear?: string;
+
+    /**
+     * Default: "Close the picker"
+     */
+    close?: string;
+
+    /**
+     * Default: "Select Month"
+     */
+    selectMonth?: string;
+
+    /**
+     * Default: "Previous Month"
+     */
+    prevMonth?: string;
+
+    /**
+     * Default: "Next Month"
+     */
+    nextMonth?: string;
+
+    /**
+     * Default: "Select Year"
+     */
+    selectYear?: string;
+
+    /**
+     * Default: "Previous Year"
+     */
+    prevYear?: string;
+
+    /**
+     * Default: "Next Year"
+     */
+    nextYear?: string;
+
+    /**
+     * Default: "Select Decade"
+     */
+    selectDecade?: string;
+
+    /**
+     * Default: "Previous Decade"
+     */
+    prevDecade?: string;
+
+    /**
+     * Default: "Next Decade"
+     */
+    nextDecade?: string;
+
+    /**
+     * Default: "Previous Century"
+     */
+    prevCentury?: string;
+
+    /**
+     * Default: "Next Century"
+     */
+    nextCentury?: string;
+
+    /**
+     * Default: "Pick Hour"
+     */
+    pickHour?: string;
+
+    /**
+     * Default: "Increment Hour"
+     */
+    incrementHour?: string;
+
+    /**
+     * Default: "Decrement Hour"
+     */
+    decrementHour?: string;
+
+    /**
+     * Default: "Pick Minute"
+     */
+    pickMinute?: string;
+
+    /**
+     * Default: "Increment Minute"
+     */
+    incrementMinute?: string;
+
+    /**
+     * Default: "Decrement Minute"
+     */
+    decrementMinute?: string;
+
+    /**
+     * Default: "Pick Second"
+     */
+    pickSecond?: string;
+
+    /**
+     * Default: "Increment Second"
+     */
+    incrementSecond?: string;
+
+    /**
+     * Default: "Decrement Second"
+     */
+    decrementSecond?: string;
+
+    /**
+     * Default:  "Toggle Period"
+     */
+    togglePeriod?: string;
+
+    /**
+     * Default: "Select Time"
+     */
+    selectTime?: string;
+}
+
+export type ParseInputDateFunction = (inputDate: string) => moment.Moment;
+
+export interface OptionsBase {
+    /**
+     * Default: "Etc/UTC"
+     */
+    timeZone?: string;
+
+    /**
+     * See momentjs' docs for valid formats. Format also dictates what components are shown, e.g. MM/dd/YYYY will not display the time picker.
+     * Default: false
+     */
+    format?: string | boolean;
+
+    /**
+     * Changes the heading of the datepicker when in "days" view.
+     * Default: "MMMM YYYY"
+     */
+    dayViewHeaderFormat?: string;
+
+    /**
+     * Allows for several input formats to be valid.
+     * Default: false
+     */
+    extraFormats?: string[] | boolean;
+
+    /**
+     * Number of minutes the up/down arrow's will move the minutes value in the time picker.
+     * Default: 1
+     */
+    stepping?: number;
+
+    /**
+     * Prevents date/time selections before this date.
+     * minDate will override defaultDate and useCurrent if either of these settings are the same day since both options are invalid according to the rules you've selected.
+     * Default: false
+     */
+    minDate?: DateComparable | boolean;
+
+    /**
+     * Prevents date/time selections after this date.
+     * maxDate will override defaultDate and useCurrent if either of these settings are the same day since both options are invalid according to the rules you've selected.
+     * Default: false
+     */
+    maxDate?: DateComparable | boolean;
+
+    /**
+     * On show, will set the picker to the current date/time
+     * Default: true
+     */
+    useCurrent?: boolean | UseCurrent;
+
+    /**
+     * Using a Bootstraps collapse to switch between date/time pickers.
+     * Default: true
+     */
+    collapse?: boolean;
+
+    /**
+     * See momentjs for valid locales.
+     * You must include moment-with-locales.js or a local js file.
+     * Default: moment.locale()
+     */
+    locale?: string;
+
+    /**
+     * Sets the picker default date/time. Overrides useCurrent
+     * Default: false
+     */
+    defaultDate?: DateComparable | boolean;
+
+    /**
+     * Change the default icons for the pickers functions
+     * Default: {
+     *              time: "glyphicon glyphicon-time",
+     *              date: "glyphicon glyphicon-calendar",
+     *              up: "glyphicon glyphicon-chevron-up",
+     *              down: "glyphicon glyphicon-chevron-down",
+     *              previous: "glyphicon glyphicon-chevron-left",
+     *              next: "glyphicon glyphicon-chevron-right",
+     *              today: "glyphicon glyphicon-screenshot",
+     *              clear: "glyphicon glyphicon-trash",
+     *              close: "glyphicon glyphicon-remove"
+     *          }
+     */
+    icons?: Icons;
+
+    /**
+     * Defines if moment should use strict date parsing when considering a date to be valid
+     * Default: false
+     */
+    useStrict?: boolean;
+
+    /**
+     * Shows the picker side by side when using the time and date together.
+     * Default: false
+     */
+    sideBySide?: boolean;
+
+    /**
+     * Accepts: array of numbers from 0-6
+     * Disables the section of days of the week, e.g. weekends.
+     * Default: false
+     */
+    daysOfWeekDisabled?: DayOfWeek[] | boolean;
+
+    /**
+     * Shows the week of the year to the left of first day of the week.
+     * Default: false
+     */
+    calendarWeeks?: boolean;
+
+    /**
+     * The default view to display when the picker is shown.
+     * Note: To limit the picker to selecting, for instance the year and month, use format: MM/YYYY
+     * Default: "days"
+     */
+    viewMode?: ViewMode;
+
+    /**
+     * Changes the placement of the icon toolbar.
+     * Default: "default"
+     */
+    toolbarPlacement?: ToolbarPlacement;
+
+    /**
+     * Show the "Today" button in the icon toolbar.
+     * Clicking the "Today" button will set the calendar view and set the date to now.
+     * Default: false
+     */
+    showTodayButton?: boolean;
+
+    /**
+     * Show the "Clear" button in the icon toolbar.
+     * Clicking the "Clear" button will set the calendar to null.
+     * Default: false
+     */
+    showClear?: boolean;
+
+    /**
+     * Show the "Close" button in the icon toolbar.
+     * Clicking the "Close" button will call hide()
+     * Default: false
+     */
+    showClose?: boolean;
+
+    /**
+     * Accepts: object with the all or one of the parameters above
+     * horizontal: 'auto', 'left', 'right'
+     * vertical: 'auto', 'top', 'bottom'
+     * Default: {
+     *              horizontal: 'auto'
+     *              vertical: 'auto'
+     *          }
+     */
+    widgetPositioning?: WidgetPositioning;
+
+    /**
+     * On picker show, places the widget at the identifier (string) or jQuery object if the element has css position: "relative"
+     * Default: null
+     */
+    widgetParent?: string | JQuery;
+
+    /**
+     * Will cause the date picker to stay open after selecting a date if no time components are being used.
+     * Default: false
+     */
+    keepOpen?: boolean;
+
+    /**
+     * Will display the picker inline without the need of a input field. This will also hide borders and shadows.
+     * Default: false
+     */
+    inline?: boolean;
+
+    /**
+     * Default: ".datepickerinput"
+     */
+    datepickerInput?: string;
+
+    /**
+     * Will cause the date picker to not revert or overwrite invalid dates.
+     * Default: false
+     */
+    keepInvalid?: boolean;
+
+    /**
+     * Allows for custom events to fire on keyboard press.
+     * For example:
+     *                keybinds:
+     *                {
+     *                		up: (widget) => console.log(widget),
+     *                		"control up": (widget) => console.log(widget)
+     *                }
+     * The widget parameter is false, if the datepicker is closed.
+     * Default: {
+     *          up: function (widget) {
+     *              if (widget.find(".datepicker").is(":visible")) {
+     *                  this.date(this.date().clone().subtract(7, "d"));
+     *              } else {
+     *                  this.date(this.date().clone().add(1, "m"));
+     *              }
+     *          },
+     *          down: function (widget) {
+     *              if (!widget) {
+     *                  this.show();
+     *              }
+     *              else if (widget.find(".datepicker").is(":visible")) {
+     *                  this.date(this.date().clone().add(7, "d"));
+     *              } else {
+     *                  this.date(this.date().clone().subtract(1, "m"));
+     *              }
+     *          },
+     *          "control up": function (widget) {
+     *              if (widget.find(".datepicker").is(":visible")) {
+     *                  this.date(this.date().clone().subtract(1, "y"));
+     *              } else {
+     *                  this.date(this.date().clone().add(1, "h"));
+     *              }
+     *          },
+     *          "control down": function (widget) {
+     *              if (widget.find(".datepicker").is(":visible")) {
+     *                  this.date(this.date().clone().add(1, "y"));
+     *              } else {
+     *                  this.date(this.date().clone().subtract(1, "h"));
+     *              }
+     *          },
+     *          left: function (widget) {
+     *              if (widget.find(".datepicker").is(":visible")) {
+     *                  this.date(this.date().clone().subtract(1, "d"));
+     *              }
+     *          },
+     *          right: function (widget) {
+     *              if (widget.find(".datepicker").is(":visible")) {
+     *                  this.date(this.date().clone().add(1, "d"));
+     *              }
+     *          },
+     *          pageUp: function (widget) {
+     *              if (widget.find(".datepicker").is(":visible")) {
+     *                  this.date(this.date().clone().subtract(1, "M"));
+     *              }
+     *          },
+     *          pageDown: function (widget) {
+     *              if (widget.find(".datepicker").is(":visible")) {
+     *                  this.date(this.date().clone().add(1, "M"));
+     *              }
+     *          },
+     *          enter: function () {
+     *              this.hide();
+     *          },
+     *          escape: function () {
+     *              this.hide();
+     *          },
+     *          "control space": function (widget) {
+     *              if (widget.find(".timepicker").is(":visible")) {
+     *                  widget.find(".btn[data-action="togglePeriod"]").click();
+     *              }
+     *          },
+     *          t: function () {
+     *              this.date(moment());
+     *          },
+     *          "delete": function () {
+     *              this.clear();
+     *          }
+     *       }
+     */
+    keyBinds?: KeyBinds;
+
+    /**
+     * Will cause the date picker to stay open after a blur event.
+     * Default: false
+     */
+    debug?: boolean;
+
+    /**
+     * Allow date picker show event to fire even when the associated input element has the readonly="readonly" property.
+     * Default: false
+     */
+    ignoreReadonly?: boolean;
+
+    /**
+     * Disables time selection between the given moments.
+     * For example:
+     * [[moment({ h: 0 }), moment({ h: 8 })], [moment({ h: 18 }), moment({ h: 24 })]]
+     * Default: false
+     */
+    disabledTimeIntervals?: boolean | FromTo[];
+
+    /**
+    * If true, the picker will show on textbox focus and icon click when used in a button group
+    * Default: false
+    */
+    allowInputToggle?: boolean;
+
+    /**
+     * If false, the textbox will not be given focus when the picker is shown
+     * Default: true
+     */
+    focusOnShow?: boolean;
+
+    /**
+     * This will change the viewDate without changing or setting the selected date.
+     * Default: false
+     */
+    viewDate?: DateComparable | boolean;
+
+    /**
+     * This will change the tooltips over each icon to a custom string
+     * Default: {
+     *              today: "Go to today",
+     *              clear: "Clear selection",
+     *              close: "Close the picker",
+     *              selectMonth: "Select Month",
+     *              prevMonth: "Previous Month",
+     *              nextMonth: "Next Month",
+     *              selectYear: "Select Year",
+     *              prevYear: "Previous Year",
+     *              nextYear: "Next Year",
+     *              selectDecade: "Select Decade",
+     *              prevDecade: "Previous Decade",
+     *              nextDecade: "Next Decade",
+     *              prevCentury: "Previous Century",
+     *              nextCentury: "Next Century"
+     *          }
+     */
+    tooltips?: Tooltips;
+
+    /**
+     * Allows custom input formatting.
+     * For example:
+     * The user can enter "yesterday" or "30 days ago".
+     */
+    parseInputDate?: ParseInputDateFunction;
+}
+
+export type IndexedDates = { [/** Dates as "YYYY-MM-DD keys */ date: string]: boolean };
+
+export type IndexedHours = { [/** Hours as "0" - "23" keys */ hour: string]: boolean };
+
+export interface GetOptions extends OptionsBase {
+    /**
+     * Disables selection of dates in the array, e.g. holidays
+     * IMPORTANT! The getter returns an Object NOT an Array, with keys being the dates, values being true.
+     * For example:
+     * disabledDates = ["2010-10-10"]; -> disabledDated will be { "2010-01-01": true }
+     * Default: false
+     */
+    disabledDates?: IndexedDates | boolean;
+
+    /**
+     * Enables selection of dates NOT in the array, e.g. holidays
+     * IMPORTANT! The getter returns an Object NOT an Array, with keys being the dates, values being true.
+     * For example:
+     * enabledDates = ["2010-10-10"]; -> enabledDated will be { "2010-01-01": true }
+     * Default: false
+     */
+    enabledDates?: IndexedDates | boolean;
+
+    /**
+     * Will allow or disallow hour selections (much like disabledTimeIntervals) but will affect all days.
+     * IMPORTANT! The getter returns an Object NOT an Array, with keys being the hours, values being true.
+     * For example:
+     * enabledHours = [0, 1]; -> enabledHours will be { "0": true, "1": true }
+     * Default: false
+     */
+    enabledHours?: IndexedHours | boolean;
+
+    /**
+     * Will allow or disallow hour selections (much like disabledTimeIntervals) but will affect all days.
+     * IMPORTANT! The getter returns an Object NOT an Array, with keys being the hours, values being true.
+     * For example:
+     * disabledHours = [0, 1]; -> disabledHours will be { "0": true, "1": true }
+     * Default: false
+     */
+    disabledHours?: IndexedHours | boolean;
+}
+
+export interface SetOptions extends OptionsBase {
+    /**
+     * Disables selection of dates in the array, e.g. holidays
+     * IMPORTANT! The getter returns an Object NOT an Array, with keys being the dates, values being true.
+     * For example:
+     * disabledDates = ["2010-10-10"]; -> disabledDated will be { "2010-01-01": true }
+     * Default: false
+     */
+    disabledDates?: DateComparable[] | boolean;
+
+    /**
+     * Enables selection of dates NOT in the array, e.g. holidays
+     * IMPORTANT! The getter returns an Object NOT an Array, with keys being the dates, values being true.
+     * For example:
+     * enabledDates = ["2010-10-10"]; -> enabledDated will be { "2010-01-01": true }
+     * Default: false
+     */
+    enabledDates?: DateComparable[] | boolean;
+
+    /**
+     * Will allow or disallow hour selections (much like disabledTimeIntervals) but will affect all days.
+     * IMPORTANT! The getter returns an Object NOT an Array, with keys being the hours, values being true.
+     * For example:
+     * enabledHours = [0, 1]; -> enabledHours will be { "0": true, "1": true }
+     * Default: false
+     */
+    enabledHours?: number[] | boolean;
+
+    /**
+     * Will allow or disallow hour selections (much like disabledTimeIntervals) but will affect all days.
+     * IMPORTANT! The getter returns an Object NOT an Array, with keys being the hours, values being true.
+     * For example:
+     * disabledHours = [0, 1]; -> disabledHours will be { "0": true, "1": true }
+     * Default: false
+     */
+    disabledHours?: number[] | boolean;
+}
+
+export interface Datetimepicker {
+    /**
+     * Destroys the widget and removes all attached event listeners.
+     */
+    destroy(): void;
+
+    /**
+     * Shows or hides the widget.
+     * Emits:
+     * - dp.hide - if the widget is hidden after the toggle call
+     * - dp.show - if the widget is show after the toggle call
+     * - dp.change - if the widget is opened for the first time and the input element is empty and options.useCurrent != false
+     */
+    toggle(): Datetimepicker;
+
+    /**
+     * Shows the widget.
+     * Emits:
+     * - dp.show - if the widget was hidden before that call
+     * - dp.change - if the widget is opened for the first time and the useCurrent is set to true or to a granularity value and the input element the component is attached to has an empty value
+     */
+    show(): Datetimepicker;
+
+    /**
+     * Hides the widget.
+     * Emits:
+     * - dp.hide - if the widget was visible before that call
+     */
+    hide(): Datetimepicker;
+
+    /**
+     * Disables the input element, the component is attached to, by adding a disabled="true" attribute to it. If the widget was visible before that call it is hidden.
+     * Emits:
+     * - dp.hide - if the widget was visible before that call
+     */
+    disable(): Datetimepicker;
+
+    /**
+     * Enables the input element, the component is attached to, by removing disabled attribute from it.
+     */
+    enable(): Datetimepicker;
+
+    /**
+     * Returns the component's model current date, a moment object or null if not set.
+     */
+    date(): moment.Moment;
+
+    /**
+     * Takes string, Date, moment, null parameter and sets the components model current moment to it.
+     * Passing a null value unsets the components model current moment.
+     * Parsing of the newDate parameter is made using moment library with the options.format and options.useStrict components configuration.
+     * Throws:
+     * - TypeError - in case the newDate cannot be parsed
+     *
+     * Emits:
+     * - dp.change - in case newDate is different from current moment
+     */
+    date(date: DateComparable): Datetimepicker;
+
+    /**
+    * Clears the datepicker by setting the value to null.
+    */
+    clear(): Datetimepicker;
+
+    /**
+     * For the moment this function will only prevent the picker from calling hide() on blur so that the picker can be inspected.
+     */
+    debug(): Datetimepicker;
+
+    /**
+     * Returns the components current options object.
+     * Note that the changing the values of the returned object does not change the components actual configuration.
+     */
+    options(): GetOptions
+    /**
+     * Takes an object variable with option key:value properties and configures the component. Use this to update multiple options on the component.
+     */
+    options(options: SetOptions): Datetimepicker
+
+    //////////////////////////////////////////////////////////////////////////////////////
+    //// Below are the getters/setters for the properties of the 'options(): Options' ////
+    //////////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Returns the component's options.timeZone.
+     */
+    timeZone(): string;
+
+    timeZone(newZone: string): Datetimepicker;
+
+    /**
+     * Returns the options.disabledDates option.
+     * IMPORTANT! The getter returns an Object NOT an Array, with keys being the dates, values being true.
+     * For example:
+     * disabledDates = ["2010-10-10"]; -> disabledDated will be { "2010-01-01": true }
+     */
+    disabledDates(): IndexedDates | boolean;
+
+    /**
+     * Takes an array of values and disallows the user to select those days.
+     * Setting this takes precedence over options.minDate, options.maxDate configuration.
+     * Also calling this function removes the configuration of options.enabledDates if such exist.
+     * Note: These values are matched with Day granularity.
+     */
+    disabledDates(dates: DateComparable[] | boolean): Datetimepicker;
+
+    /**
+     * Returns the options.enabledDates option.
+     * IMPORTANT! The getter returns an Object NOT an Array, with keys being the dates, values being true.
+     * For example:
+     * enabledDates = ["2010-10-10"]; -> enabledDated will be { "2010-01-01": true }
+     */
+    enabledDates(): IndexedDates | boolean;
+
+    /**
+     * Takes an array of values and allows the user to select only from those days.
+     * Setting this takes precedence over options.minDate, options.maxDate configuration.
+     * Also calling this function with boolean:false removes the configuration of options.disabledDates if such exist.
+     * Note: These values are matched with Day granularity.
+     */
+    enabledDates(dates: DateComparable[] | boolean): Datetimepicker;
+
+    /**
+     * Returns a moment with the options.defaultDate option configuration or false if not set.
+     */
+    defaultDate(): moment.Moment | boolean;
+
+    /**
+     * Will set the picker's inital date.
+     * If a boolean:false value is passed the options.defaultDate parameter is cleared.
+     * Throws:
+     * - TypeError - if the provided date doesn't pass validation, including disabledDates, enabledDates, minDate, maxDate, and daysOfWeekDisabled
+     * - TypeError - if the provided date cannot be parsed by momentjs
+     */
+    defaultDate(dates: DateComparable | boolean): Datetimepicker;
+
+    /**
+     * Returns the options.useCurrent option configuration.
+     */
+    useCurrent(): boolean | UseCurrent;
+
+    /**
+     * Takes a boolean or string.
+     * If a boolean true is passed and the components model moment is not set (either through setDate or through a valid value on the input element the component is attached to) then the first time the user opens the datetimepicker widget the value is initialized to the current moment of the action.
+     * If a false boolean is passed then no initialization happens on the input element.
+     * You can select the granularity on the initialized moment by passing one of the following strings ("year", "month", "day", "hour", "minute") in the variable.
+     * If for example you pass "day" to the useCurrent function and the input field is empty the first time the user opens the datetimepicker widget the input text will be initialized to the current datetime with day granularity (ie if currentTime = 2014-08-10 13:32:33 the input value will be initialized to 2014-08-10 00:00:00)
+     * Note: If the options.defaultDate is set or the input element the component is attached to has already a value that takes precedence and the functionality of useCurrent is not triggered!
+     */
+    useCurrent(useCurrent: boolean | UseCurrent): Datetimepicker;
+
+    /**
+     * Returns the currently set moment of the options.minDate or false if not set.
+     */
+    minDate(): moment.Moment | boolean;
+
+    /**
+     * Takes a parameter and disallows the user to select a moment that is before that moment.
+     * If a boolean:false value is passed the options.minDate parameter is cleared and there is no restriction to the miminum moment the user can select.
+     * Note: If the parameter is after the currently selected moment the currently selected moment changes to minDate parameter
+     * Throws:
+     * - TypeError - if the parameter cannot be parsed using the options.format and options.useStrict configuration settings
+     * - TypeError - if the parameter is after options.maxDate
+     *
+     * Emits:
+     * - dp.change - if the new minDate is after currently selected moment
+     * - dp.error - if the new minDate is after currently selected moment
+     */
+    minDate(minDate: DateComparable | boolean): Datetimepicker;
+
+    /**
+     * Returns the currently set moment of the options.maxDate or false if not set.
+     */
+    maxDate(): moment.Moment | boolean;
+
+    /**
+     * Takes a parameter and disallows the user to select a moment that is after that moment.
+     * If a boolean:false value is passed options.maxDate is cleared and there is no restriction to the maximum moment the user can select.
+     * Note: If the parameter is before the currently selected moment the currently selected moment changes to maxDate
+     * Throws:
+     * - TypeError - if the parameter cannot be parsed using the options.format and options.useStrict configuration settings
+     * - TypeError - if the parameter is before options.minDate
+     *
+     * Emits:
+     * - dp.change - if the new maxDate is after currently selected moment
+     * - dp.error - if the new maxDate is after currently selected moment
+     */
+    maxDate(maxDate: DateComparable | boolean): Datetimepicker;
+
+    /**
+     * Returns the options.daysOfWeekDisabled configuration
+     * IMPORTANT! Throws exception if not set explicitly https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1459
+     */
+    daysOfWeekDisabled(): DayOfWeek[];
+
+    /**
+     * Takes an [ Number:0 to 6 ] and disallow the user to select weekdays that exist in this array.
+     * This has lower priority over the options.minDate, options.maxDate, options.disabledDates and options.enabledDates configuration settings.
+     * Emits:
+     * - dp.change - if the currently selected moment falls in the values passed on the daysOfWeek parameter.
+     * - dp.error - if the currently selected moment falls in the values passed on the daysOfWeek parameter.
+     */
+    daysOfWeekDisabled(daysOfWeek: DayOfWeek[]): Datetimepicker;
+
+    /**
+     * Returns the component's options.format.
+     */
+    format(): string | boolean;
+
+    /**
+     * Takes a moment.js format string and sets the components options.format.
+     * This is used for displaying and also for parsing input strings either from the input element the component is attached to or the date() function.
+     * The parameter can also be a boolean:false in which case the format is set to the locale's L LT.
+     * Note: this is also used to determine if the TimePicker sub component will display the hours in 12 or 24 format. (if "a" or "h" exists in the passed string then a 12 hour mode is set)
+     */
+    format(format: string | boolean): Datetimepicker;
+
+    /**
+     * Returns a boolean or array with the options.extraFormats option configuration.
+     */
+    extraFormats(): string[] | boolean;
+
+    /**
+     * Takes an array of valid input moment format options, or boolean:false.
+     */
+    extraFormats(formats: string[] | boolean): Datetimepicker;
+
+    /**
+     * Returns the currently set locale of the options.locale.
+     */
+    locale(): string;
+
+    /**
+     * Takes a string of any valid moment locale e.g. de for German.
+     * Throws:
+     * - TypeError - if the locale is not loaded via a separate script or moment-with-locales
+     */
+    locale(newLocale: string): Datetimepicker;
+
+    /**
+     * Returns a number with the options.stepping option configuration.
+     */
+    stepping(): number;
+
+    /**
+     * This will be the amount the up/down arrows move the minute value with a time picker.
+     */
+    stepping(step: number): Datetimepicker;
+
+    /**
+     * Returns a boolean of the options.sideBySide.
+     */
+    sideBySide(): boolean;
+
+    /**
+     * If sideBySide is true and the time picker is used, both components will display side by side instead of collapsing.
+     */
+    sideBySide(sideBySide: boolean): Datetimepicker;
+
+    /**
+     * Returns the options.collapse option configuration.
+     */
+    collapse(): boolean;
+
+    /**
+     * If set to false the picker will display similar to sideBySide except vertical.
+     */
+    collapse(collapse: boolean): Datetimepicker;
+
+    /**
+     * Returns options.icons.
+     */
+    icons(): Icons;
+
+    /**
+     * Takes an Object of strings.
+     * Throws:
+     * - TypeError - if icons parameter is not an Object
+     */
+    icons(icons: Icons): Datetimepicker;
+
+    /**
+     * Returns the options.useStrict
+     */
+    useStrict(): boolean;
+
+    /**
+     * If useStrict is true, momentjs parsing rules will be stricter when determining if a date is valid or not.
+     */
+    useStrict(useStrict: boolean): Datetimepicker;
+
+    /**
+     * Returns the options.widgetPositioning object.
+     */
+    widgetPositioning(): WidgetPositioning;
+
+    /**
+     * WidgetPositioning defines where the dropdown with the widget will appear relative to the input element the component is attached to.
+     * "auto" is the default value for both horizontal and vertical keys and it tries to automatically place the dropdown in a position that is visible to the user.
+     * Usually you should not override those options unless you have a special need in your layout.
+     */
+    widgetPositioning(positioningObject: WidgetPositioning): Datetimepicker;
+
+    /**
+     * Returns the options.viewMode.
+     */
+    viewMode(): ViewMode;
+
+    /**
+     * Takes a string. Valid values are "days", "months", "years" and "decades"
+     * Throws:
+     * - TypeError - if newViewMode parameter is not an a string or if newViewMode is not a valid value
+     */
+    viewMode(newViewMode: ViewMode): Datetimepicker;
+
+    /**
+     * Returns the current options.calendarWeeks option configuration.
+     */
+    calendarWeeks(): boolean;
+
+    /**
+     * Set if the week numbers will appear to the left on the days view.
+     */
+    calendarWeeks(calendarWeeks: boolean): Datetimepicker;
+
+    /**
+     * Returns the options.showClear option.
+     */
+    showClear(): boolean;
+
+    /**
+     * Set if the clear date button will appear on the widget.
+     */
+    showClear(showClear: boolean): Datetimepicker;
+
+    /**
+     * Returns the options.showTodayButton option.
+     */
+    showTodayButton(): boolean;
+
+    /**
+     * Set if the Today button will appear on the widget.
+     */
+    showTodayButton(showTodayButton: boolean): Datetimepicker;
+
+    /**
+     * Returns the options.toolbarplacement option.
+     */
+    toolbarPlacement(): ToolbarPlacement;
+
+    /**
+    * Changes the placement of the toolbar where the today, clear, component switch icon are located.
+    * See valid values at DatetimepickerOptions.toolbarplacement
+    * Throws:
+    * - TypeError if the parameter is not a valid value
+    */
+    toolbarPlacement(toolbarPlacement: ToolbarPlacement): Datetimepicker;
+
+    /**
+     * Returns the options.dayViewHeaderFormat option.
+     */
+    dayViewHeaderFormat(): string;
+
+    /**
+     * Used to customize the header of the day view.
+     */
+    dayViewHeaderFormat(dayViewHeaderFormat: string): Datetimepicker;
+
+    /**
+     * Returns the currently set options.keyBinds option.
+     */
+    keyBinds(): KeyBinds;
+
+    /**
+     * Allows for several keyBinding functions to be specified for ease of access or accessibility.
+     */
+    keyBinds(keyBinds: KeyBinds): Datetimepicker;
+
+    /**
+     * Returns the options.inline option.
+     */
+    inline(): boolean;
+
+    /**
+     * Used to customize the header of the day view.
+     */
+    inline(inline: boolean): Datetimepicker;
+
+    /**
+     * Returns the options.ignoreReadonly option.
+     */
+    ignoreReadonly(): boolean;
+
+    /**
+     * Set this to true to allow the picker to be used even if the input field is readonly. This will not bypass the disabled property.
+     */
+    ignoreReadonly(ignoreReadonly: boolean): Datetimepicker;
+
+    /**
+     * Returns the options.showClose option.
+     */
+    showClose(): boolean;
+
+    /**
+     * If true, an icon will be displayed on the toolbar that will hide the picker.
+     */
+    showClose(showClose: boolean): Datetimepicker;
+
+    /**
+     * Returns the options.keepInvalid option.
+     */
+    keepInvalid(): boolean;
+
+    /**
+     * If true, invalid dates will not be reverted to a previous selection or changed.
+     */
+    keepInvalid(keepInvalid: boolean): Datetimepicker;
+
+    /**
+     * Returns the options.datepickerInput option.
+     */
+    datepickerInput(): string;
+
+    datepickerInput(datepickerInput: string): Datetimepicker;
+
+    /**
+     * Returns the options.allowInputToggle option.
+     */
+    allowInputToggle(): boolean;
+
+    /**
+     * If true, the picker will show on textbox focus and icon click when used in a button group.
+     */
+    allowInputToggle(allowInputToggle: boolean): Datetimepicker;
+
+    /**
+     * Returns the options.focusOnShow option.
+     */
+    focusOnShow(): boolean;
+
+    /**
+     * If false, the textbox will not be given focus when the picker is shown.
+     */
+    focusOnShow(focusOnShow: boolean): Datetimepicker;
+
+    /**
+     * Returns the options.disabledTimeIntervals option.
+     */
+    disabledTimeIntervals(): FromTo[] | boolean;
+
+    /**
+     * Disables time selection between the given moments.
+     * For example:
+     * disabledTimeIntervals: [[moment({ h: 0 }), moment({ h: 8 })], [moment({ h: 18 }), moment({ h: 24 })]]
+     * Will disable times between 12-8am and 6-12pm today
+     */
+    disabledTimeIntervals(disabledTimeIntervals: FromTo[] | boolean): Datetimepicker;
+
+    /**
+     * Returns the options.disabledHours option.
+     * IMPORTANT! The getter returns an Object NOT an Array, with keys being the hours, values being true.
+     * For example:
+     * enabledHours = [0, 1]; -> enabledHours will be { "0": true, "1": true }
+     */
+    disabledHours(): IndexedHours | boolean;
+
+    /**
+     * Must be in 24 hour format. Will disallow hour selections (much like disabledTimeIntervals) but will affect all days.
+     * Note: Like en/disabledDates, the en/disabledHours options are mutually exclusive and will reset one of the options back to false.
+     * For example:
+     * disabledHours: [0, 1, 2, 3, 4, 5, 6, 7, 8, 18, 19, 20, 21, 22, 23, 24]
+     * enabledHours: [9, 10, 11, 12, 13, 14, 15, 16]
+     */
+    disabledHours(disabledHours: number[] | boolean): Datetimepicker;
+
+    /**
+     * Returns the options.enabledHours option.
+     * IMPORTANT! The getter returns an Object NOT an Array, with keys being the hours, values being true.
+     * For example:
+     * disabledHours = [0, 1]; -> disabledHours will be { "0": true, "1": true }
+     */
+    enabledHours(): IndexedHours | boolean;
+
+    /**
+     * Must be in 24 hour format. Will allow hour selections (much like enabledTimeIntervals) but will affect all days.
+     * Note: Like en/disabledDates, the en/disabledHours options are mutually exclusive and will reset one of the options back to false.
+     * For example:
+     * disabledHours: [0, 1, 2, 3, 4, 5, 6, 7, 8, 18, 19, 20, 21, 22, 23, 24]
+     * enabledHours: [9, 10, 11, 12, 13, 14, 15, 16]
+    */
+    enabledHours(enabledHours: number[] | boolean): Datetimepicker;
+
+    /**
+     * Returns the options.viewDate option.
+     */
+    viewDate(): moment.Moment | boolean;
+
+    /**
+     * This will change the viewDate without changing or setting the selected date.
+     */
+    viewDate(viewDate: DateComparable | boolean): Datetimepicker;
+
+    /**
+     * Returns the options.parseInputDate option.
+     */
+    parseInputDate(): ParseInputDateFunction;
+
+    /**
+     * Allows custom input formatting.
+     * For example:
+     * The user can enter "yesterday"" or "30 days ago".
+     */
+    parseInputDate(parseInputDate: ParseInputDateFunction): Datetimepicker;
+
+    /**
+     * Returns the options.tooltips option.
+     */
+    tooltips(): Tooltips;
+
+    /**
+     * Sets the tooltips for icons.
+     * Throws:
+     * - TypeError - if tooltips parameter is not an Object
+     */
+    tooltips(tooltips: Tooltips): Datetimepicker;
+}
+
+export interface HideEventObject extends JQueryEventObject {
+    /**
+     * The currently set date. Type: moment object (clone)
+     */
+    date: moment.Moment;
+}
+
+export interface ChangeEventObject extends JQueryEventObject {
+    /**
+     * Date the picker changed to. Type: moment object (clone)
+     */
+    date: moment.Moment;
+
+    /**
+     * Previous date. Type: moment object (clone) or false in the event of a null
+     */
+    oldDate: moment.Moment | boolean;
+}
+
+export interface ErrorEventObject extends JQueryEventObject {
+    /**
+     * The invalid date. Type: moment object (clone)
+     */
+    date: moment.Moment;
+}
+
+export interface UpdateEventObject extends JQueryEventObject {
+    /**
+     * Change type as a momentjs format token. string e.g. yyyy on year change
+     */
+    change: string;
+
+    /**
+     * New viewDate.
+     */
+    viewDate: moment.Moment;
+}
+
+declare global {
+    interface JQuery {
+        datetimepicker(): JQuery;
+        datetimepicker(options: SetOptions): JQuery;
+
+        data(key: "DateTimePicker"): Datetimepicker;
+
+        off(events: "dp.change", selector?: string, handler?: (eventobject: ChangeEventObject) => any): JQuery;
+        off(events: "dp.change", handler: (eventobject: ChangeEventObject) => any): JQuery;
+
+        on(events: "dp.change", selector: string, data: any, handler?: (eventobject: ChangeEventObject) => any): JQuery;
+        on(events: "dp.change", selector: string, handler: (eventobject: ChangeEventObject) => any): JQuery;
+        on(events: "dp.change", handler: (eventObject: ChangeEventObject) => any): JQuery;
+
+        off(events: "dp.show", selector?: string, handler?: (eventobject: JQueryEventObject) => any): JQuery;
+        off(events: "dp.show", handler: (eventobject: JQueryEventObject) => any): JQuery;
+
+        on(events: "dp.show", selector: string, data: any, handler?: (eventobject: JQueryEventObject) => any): JQuery;
+        on(events: "dp.show", selector: string, handler: (eventobject: JQueryEventObject) => any): JQuery;
+        on(events: "dp.show", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+        off(events: "dp.hide", selector?: string, handler?: (eventobject: HideEventObject) => any): JQuery;
+        off(events: "dp.hide", handler: (eventobject: HideEventObject) => any): JQuery;
+
+        on(events: "dp.hide", selector: string, data: any, handler?: (eventobject: HideEventObject) => any): JQuery;
+        on(events: "dp.hide", selector: string, handler: (eventobject: HideEventObject) => any): JQuery;
+        on(events: "dp.hide", handler: (eventObject: HideEventObject) => any): JQuery;
+
+        off(events: "dp.error", selector?: string, handler?: (eventobject: ErrorEventObject) => any): JQuery;
+        off(events: "dp.error", handler: (eventobject: ErrorEventObject) => any): JQuery;
+
+        on(events: "dp.error", selector: string, data: any, handler?: (eventobject: ErrorEventObject) => any): JQuery;
+        on(events: "dp.error", selector: string, handler: (eventobject: ErrorEventObject) => any): JQuery;
+        on(events: "dp.error", handler: (eventObject: ErrorEventObject) => any): JQuery;
+
+        off(events: "dp.update", selector?: string, handler?: (eventobject: UpdateEventObject) => any): JQuery;
+        off(events: "dp.update", handler: (eventobject: UpdateEventObject) => any): JQuery;
+
+        on(events: "dp.update", selector: string, data: any, handler?: (eventobject: UpdateEventObject) => any): JQuery;
+        on(events: "dp.update", selector: string, handler: (eventobject: UpdateEventObject) => any): JQuery;
+        on(events: "dp.update", handler: (eventObject: UpdateEventObject) => any): JQuery;
+    }
+}
diff --git a/eonasdan-bootstrap-datetimepicker/tsconfig.json b/eonasdan-bootstrap-datetimepicker/tsconfig.json
new file mode 100644
index 0000000000..fc9a9c90bc
--- /dev/null
+++ b/eonasdan-bootstrap-datetimepicker/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "eonasdan-bootstrap-datetimepicker-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/epiceditor/epiceditor-tests.ts b/epiceditor/epiceditor-tests.ts
index c5c8ab9ed2..6acfa10421 100644
--- a/epiceditor/epiceditor-tests.ts
+++ b/epiceditor/epiceditor-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="epiceditor.d.ts" />
+
 
 var editor = new EpicEditor().load();
 
@@ -45,10 +45,10 @@ editor.exitFullscreen();
 editor.reflow();
 editor.reflow('height');
 
-var marked;
+var marked: any;
 var opts = {
     container: 'epiceditor',
-    textarea: null,
+    textarea: <any>null,
     basePath: 'epiceditor',
     clientSideStorage: true,
     localStorageName: 'epiceditor',
diff --git a/epiceditor/epiceditor-tests.ts.tscparams b/epiceditor/epiceditor-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/epiceditor/epiceditor-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/epiceditor/epiceditor.d.ts b/epiceditor/epiceditor.d.ts
deleted file mode 100644
index 325e35535e..0000000000
--- a/epiceditor/epiceditor.d.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-// Type definitions for EpicEditor 0.2
-// Project: http://epiceditor.com/
-// Definitions by: Boris Yankov <https://github.com/borisyankov>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-interface EpicEditorOptions {
-    container?: any;
-    textarea?: any;
-    basePath?: string;
-    clientSideStorage?: boolean;
-    localStorageName?: string;
-    useNativeFullsreen?: boolean;
-    parser?: any;
-    file?: {
-        name: string;
-        defaultContent: string;
-        autoSave: any;
-    };
-    theme?: {
-        base: string;
-        preview: string;
-        editor: string;
-    };
-    focusOnLoad?: boolean;
-    shortcut?: {
-        modifier: number;
-        fullscreen: number;
-        preview: number;
-    };
-    string?: {
-        togglePreview: string;
-        toggleEdit: string;
-        toggleFullscreen: string;
-    };
-}
-
-declare class EpicEditor {
-    constructor();
-    constructor(options: EpicEditorOptions);
-
-    load(callback?: Function): EpicEditor;
-    unload(callback?: Function): EpicEditor;
-    getElement(element: string): any;
-    is(state: string): boolean;
-    open(filename: string);
-    importFile(filename?: string, content?: string): void;
-    exportFile(filename?: string, type?: string): any;
-    rename(oldName: string, newName: string): void;
-    save(): void;
-    remove(filename: string): void;
-    getFiles(filename?: string): any;
-    on(event: string, handler: Function): void;
-    emit(event: string): void;
-    removeListener(event: string, handler?: Function): void;
-    preview(): void;
-    edit(): void;
-    enterFullscreen(): void;
-    exitFullscreen(): void;
-    reflow(type?: string): void;
-}
\ No newline at end of file
diff --git a/epiceditor/epiceditor.d.ts.tscparams b/epiceditor/epiceditor.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/epiceditor/epiceditor.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/epiceditor/index.d.ts b/epiceditor/index.d.ts
new file mode 100644
index 0000000000..9517c35b29
--- /dev/null
+++ b/epiceditor/index.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for EpicEditor 0.2
+// Project: http://epiceditor.com/
+// Definitions by: Boris Yankov <https://github.com/borisyankov>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface EpicEditorOptions {
+    container?: any;
+    textarea?: any;
+    basePath?: string;
+    clientSideStorage?: boolean;
+    localStorageName?: string;
+    useNativeFullsreen?: boolean;
+    parser?: any;
+    file?: {
+        name: string;
+        defaultContent: string;
+        autoSave: any;
+    };
+    theme?: {
+        base: string;
+        preview: string;
+        editor: string;
+    };
+    focusOnLoad?: boolean;
+    shortcut?: {
+        modifier: number;
+        fullscreen: number;
+        preview: number;
+    };
+    string?: {
+        togglePreview: string;
+        toggleEdit: string;
+        toggleFullscreen: string;
+    };
+}
+
+declare class EpicEditor {
+    constructor();
+    constructor(options: EpicEditorOptions);
+
+    load(callback?: Function): EpicEditor;
+    unload(callback?: Function): EpicEditor;
+    getElement(element: string): any;
+    is(state: string): boolean;
+    open(filename: string): any;
+    importFile(filename?: string, content?: string): void;
+    exportFile(filename?: string, type?: string): any;
+    rename(oldName: string, newName: string): void;
+    save(): void;
+    remove(filename: string): void;
+    getFiles(filename?: string): any;
+    on(event: string, handler: Function): void;
+    emit(event: string): void;
+    removeListener(event: string, handler?: Function): void;
+    preview(): void;
+    edit(): void;
+    enterFullscreen(): void;
+    exitFullscreen(): void;
+    reflow(type?: string): void;
+}
\ No newline at end of file
diff --git a/epiceditor/tsconfig.json b/epiceditor/tsconfig.json
new file mode 100644
index 0000000000..3824f0a076
--- /dev/null
+++ b/epiceditor/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "epiceditor-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/eq.js/eq.js.d.ts b/eq.js/eq.js.d.ts
deleted file mode 100644
index 8f2b051ad8..0000000000
--- a/eq.js/eq.js.d.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-// Type definitions for eq.js
-// Project: https://github.com/Snugug/eq.js
-// Definitions by: Stephen Lautier <https://github.com/stephenlautier>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare var eqjs: eq.EqjsStatic;
-
-// Support AMD require
-declare module 'eqjs' {
-	export = eqjs;
-}
-
-declare namespace eq {
-	type AvailableElementType = HTMLElement|HTMLElement[]|NodeList|JQuery;
-
-	interface EqjsStatic {
-
-		/**
-		 * List of all nodes.
-		 */
-		nodes: EqjsNodesTable;
-
-		/**
-		 * Number of nodes in eqjs.nodes.
-		 */
-		nodesLength: number;
-
-		/**
-		 * Runs through all nodes and finds their widths and points
-		 * @param nodes
-		 * @param callback function to use as a callback once query and nodeWrites have finished
-		 */
-		query(nodes: AvailableElementType, callback?: Function): void;
-
-		/**
-		 *  Refreshes the list of nodes for eqjs to work with
-		 */
-		refreshNodes(): void;
-
-		/**
-		 * Sorts a simple object (key: value) by value and returns a sorted object.
-		 * @param obj e.g. "small: 380, medium: 490, large: 600"
-		 * @returns {}
-		 */
-		sortObj(obj: string): EqjsKeyValuePair[];
-
-		/**
-		 * Runs through all nodes and writes their eq status.
-		 * @param nodes An array or NodeList of nodes to query
-		 * @returns {}
-		 */
-		nodeWrites(nodes?: AvailableElementType): void;
-	}
-
-	interface EqjsKeyValuePair {
-		key: string;
-		value: number;
-	}
-
-	interface EqjsNodesTable {
-		[index: number]: HTMLElement;
-	}
-
-}
-
-// Support jQuery selectors.
-interface JQuery { }
diff --git a/eq.js/eq.js.tests.ts b/eq.js/eq.js.tests.ts
index 4a2192bec7..60303a869c 100644
--- a/eq.js/eq.js.tests.ts
+++ b/eq.js/eq.js.tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="eq.js.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+
+/// <reference types="jquery" />
 
 var nodes = document.getElementsByClassName(".test-container");
 var node = document.getElementById("#test-container");
diff --git a/eq.js/index.d.ts b/eq.js/index.d.ts
new file mode 100644
index 0000000000..5876649f3e
--- /dev/null
+++ b/eq.js/index.d.ts
@@ -0,0 +1,67 @@
+// Type definitions for eq.js
+// Project: https://github.com/Snugug/eq.js
+// Definitions by: Stephen Lautier <https://github.com/stephenlautier>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var eqjs: eq.EqjsStatic;
+
+// Support AMD require
+declare module 'eq.js' {
+	export = eqjs;
+}
+
+declare namespace eq {
+	type AvailableElementType = HTMLElement|HTMLElement[]|NodeList|JQuery;
+
+	interface EqjsStatic {
+
+		/**
+		 * List of all nodes.
+		 */
+		nodes: EqjsNodesTable;
+
+		/**
+		 * Number of nodes in eqjs.nodes.
+		 */
+		nodesLength: number;
+
+		/**
+		 * Runs through all nodes and finds their widths and points
+		 * @param nodes
+		 * @param callback function to use as a callback once query and nodeWrites have finished
+		 */
+		query(nodes: AvailableElementType, callback?: Function): void;
+
+		/**
+		 *  Refreshes the list of nodes for eqjs to work with
+		 */
+		refreshNodes(): void;
+
+		/**
+		 * Sorts a simple object (key: value) by value and returns a sorted object.
+		 * @param obj e.g. "small: 380, medium: 490, large: 600"
+		 * @returns {}
+		 */
+		sortObj(obj: string): EqjsKeyValuePair[];
+
+		/**
+		 * Runs through all nodes and writes their eq status.
+		 * @param nodes An array or NodeList of nodes to query
+		 * @returns {}
+		 */
+		nodeWrites(nodes?: AvailableElementType): void;
+	}
+
+	interface EqjsKeyValuePair {
+		key: string;
+		value: number;
+	}
+
+	interface EqjsNodesTable {
+		[index: number]: HTMLElement;
+	}
+
+}
+
+// Support jQuery selectors.
+interface JQuery { }
diff --git a/eq.js/tsconfig.json b/eq.js/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/eq.js/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/error-stack-parser/error-stack-parser-tests.ts b/error-stack-parser/error-stack-parser-tests.ts
index b0fa8e4cc3..c8b9198261 100644
--- a/error-stack-parser/error-stack-parser-tests.ts
+++ b/error-stack-parser/error-stack-parser-tests.ts
@@ -1,3 +1,3 @@
-/// <reference path="error-stack-parser.d.ts" />
+
 
 ErrorStackParser.parse(new Error('Boom'));
diff --git a/error-stack-parser/error-stack-parser.d.ts b/error-stack-parser/index.d.ts
similarity index 100%
rename from error-stack-parser/error-stack-parser.d.ts
rename to error-stack-parser/index.d.ts
diff --git a/error-stack-parser/tsconfig.json b/error-stack-parser/tsconfig.json
new file mode 100644
index 0000000000..4c55ce6aa6
--- /dev/null
+++ b/error-stack-parser/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "error-stack-parser-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/errorhandler/errorhandler-tests.ts b/errorhandler/errorhandler-tests.ts
index 1316888e32..f6a35dd19d 100644
--- a/errorhandler/errorhandler-tests.ts
+++ b/errorhandler/errorhandler-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="errorhandler.d.ts" />
 
 import * as express from 'express';
 import * as errorhandler from 'errorhandler';
diff --git a/errorhandler/errorhandler.d.ts b/errorhandler/errorhandler.d.ts
deleted file mode 100644
index bb1674c1e5..0000000000
--- a/errorhandler/errorhandler.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// Type definitions for errorhandler
-// Project: https://github.com/expressjs/errorhandler
-// Definitions by: Santi Albo <https://github.com/santialbo/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "errorhandler" {
-    import * as express from 'express';
-
-    function errorHandler(options?: errorHandler.Options): express.ErrorRequestHandler;
-
-    namespace errorHandler {
-        interface LoggingCallback {
-            (err: Error, str: string, req: express.Request, res: express.Response): void;
-        }
-
-        interface Options {
-            /**
-             * Defaults to true.
-             *
-             * Possible values:
-             *   true       : Log errors using console.error(str).
-             *   false      : Only send the error back in the response.
-             *   A function : pass the error to a function for handling.
-             */
-            log: boolean | LoggingCallback;
-        }
-    }
-
-    export = errorHandler;
-}
diff --git a/errorhandler/index.d.ts b/errorhandler/index.d.ts
new file mode 100644
index 0000000000..f9fcf71327
--- /dev/null
+++ b/errorhandler/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for errorhandler
+// Project: https://github.com/expressjs/errorhandler
+// Definitions by: Santi Albo <https://github.com/santialbo/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+
+import * as express from 'express';
+
+declare function errorHandler(options?: errorHandler.Options): express.ErrorRequestHandler;
+
+declare namespace errorHandler {
+    interface LoggingCallback {
+        (err: Error, str: string, req: express.Request, res: express.Response): void;
+    }
+
+    interface Options {
+        /**
+         * Defaults to true.
+         *
+         * Possible values:
+         *   true       : Log errors using console.error(str).
+         *   false      : Only send the error back in the response.
+         *   A function : pass the error to a function for handling.
+         */
+        log: boolean | LoggingCallback;
+    }
+}
+
+export = errorHandler;
diff --git a/errorhandler/tsconfig.json b/errorhandler/tsconfig.json
new file mode 100644
index 0000000000..e5aa080264
--- /dev/null
+++ b/errorhandler/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "errorhandler-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/es6-collections/es6-collections-tests.ts b/es6-collections/es6-collections-tests.ts
index 735c76738f..e48d911f73 100644
--- a/es6-collections/es6-collections-tests.ts
+++ b/es6-collections/es6-collections-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="es6-collections.d.ts" />
+
 
 interface Point { x: number; y: number; }
 let a: any;
diff --git a/es6-collections/es6-collections-tests.ts.tscparams b/es6-collections/es6-collections-tests.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/es6-collections/es6-collections-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/es6-collections/es6-collections.d.ts.tscparams b/es6-collections/es6-collections.d.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/es6-collections/es6-collections.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/es6-collections/es6-collections.d.ts b/es6-collections/index.d.ts
similarity index 100%
rename from es6-collections/es6-collections.d.ts
rename to es6-collections/index.d.ts
diff --git a/es6-collections/tsconfig.json b/es6-collections/tsconfig.json
new file mode 100644
index 0000000000..49c185abc6
--- /dev/null
+++ b/es6-collections/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es5",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "es6-collections-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/es6-promise/es6-promise-commonjs-tests.ts b/es6-promise/es6-promise-commonjs-tests.ts
index b5a2fcbe49..ed2ff5a830 100644
--- a/es6-promise/es6-promise-commonjs-tests.ts
+++ b/es6-promise/es6-promise-commonjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="es6-promise.d.ts" />
+
 
 import rsvp = require('es6-promise');
 var Promise = rsvp.Promise;
diff --git a/es6-promise/es6-promise-commonjs-tests.ts.tscparams b/es6-promise/es6-promise-commonjs-tests.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/es6-promise/es6-promise-commonjs-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/es6-promise/es6-promise-tests.ts b/es6-promise/es6-promise-tests.ts
index ac4f92d3d5..ac9910df46 100644
--- a/es6-promise/es6-promise-tests.ts
+++ b/es6-promise/es6-promise-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="es6-promise.d.ts" />
+
 
 
 var promiseString: Promise<string>,
@@ -80,9 +80,8 @@ promiseNumber = catchWithSimpleResult;
 var catchWithPromiseResult = promiseString.catch(error => Promise.resolve(10));
 promiseNumber = catchWithPromiseResult;
 
-promiseString = promiseString.catch<string>(function () {
+promiseString = promiseString.catch<string>(function (): string {
   throw new Error('Better error msg');
-  return null;
 });
 
 //examples coming from http://www.html5rocks.com/en/tutorials/es6/promises/
diff --git a/es6-promise/es6-promise-tests.ts.tscparams b/es6-promise/es6-promise-tests.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/es6-promise/es6-promise-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/es6-promise/es6-promise.d.ts b/es6-promise/es6-promise.d.ts
deleted file mode 100644
index ec0c222385..0000000000
--- a/es6-promise/es6-promise.d.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-// Type definitions for es6-promise
-// Project: https://github.com/jakearchibald/ES6-Promise
-// Definitions by: François de Campredon <https://github.com/fdecampredon/>, vvakame <https://github.com/vvakame>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface Thenable<T> {
-    then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => U | Thenable<U>): Thenable<U>;
-    then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => void): Thenable<U>;
-    catch<U>(onRejected?: (error: any) => U | Thenable<U>): Thenable<U>;
-}
-
-declare class Promise<T> implements Thenable<T> {
-	/**
-	 * If you call resolve in the body of the callback passed to the constructor,
-	 * your promise is fulfilled with result object passed to resolve.
-	 * If you call reject your promise is rejected with the object passed to reject.
-	 * For consistency and debugging (eg stack traces), obj should be an instanceof Error.
-	 * Any errors thrown in the constructor callback will be implicitly passed to reject().
-	 */
-	constructor(callback: (resolve : (value?: T | Thenable<T>) => void, reject: (error?: any) => void) => void);
-
-	/**
-	 * onFulfilled is called when/if "promise" resolves. onRejected is called when/if "promise" rejects.
-	 * Both are optional, if either/both are omitted the next onFulfilled/onRejected in the chain is called.
-	 * Both callbacks have a single parameter , the fulfillment value or rejection reason.
-	 * "then" returns a new promise equivalent to the value you return from onFulfilled/onRejected after being passed through Promise.resolve.
-	 * If an error is thrown in the callback, the returned promise rejects with that error.
-	 *
-	 * @param onFulfilled called when/if "promise" resolves
-	 * @param onRejected called when/if "promise" rejects
-	 */
-    then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => U | Thenable<U>): Promise<U>;
-    then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => void): Promise<U>;
-
-	/**
-	 * Sugar for promise.then(undefined, onRejected)
-	 *
-	 * @param onRejected called when/if "promise" rejects
-	 */
-	catch<U>(onRejected?: (error: any) => U | Thenable<U>): Promise<U>;
-}
-
-declare namespace Promise {
-	/**
-	 * Make a new promise from the thenable.
-	 * A thenable is promise-like in as far as it has a "then" method.
-	 */
-	function resolve<T>(value?: T | Thenable<T>): Promise<T>;
-
-	/**
-	 * Make a promise that rejects to obj. For consistency and debugging (eg stack traces), obj should be an instanceof Error
-	 */
-	function reject(error: any): Promise<any>;
-	function reject<T>(error: T): Promise<T>;
-
-	/**
-	 * Make a promise that fulfills when every item in the array fulfills, and rejects if (and when) any item rejects.
-	 * the array passed to all can be a mixture of promise-like objects and other objects.
-	 * The fulfillment value is an array (in order) of fulfillment values. The rejection value is the first rejection value.
-	 */
-	function all<T>(promises: (T | Thenable<T>)[]): Promise<T[]>;
-
-	/**
-	 * Make a Promise that fulfills when any item fulfills, and rejects if any item rejects.
-	 */
-	function race<T>(promises: (T | Thenable<T>)[]): Promise<T>;
-}
-
-declare module 'es6-promise' {
-	var foo: typeof Promise; // Temp variable to reference Promise in local context
-	namespace rsvp {
-		export var Promise: typeof foo;
-	}
-	export = rsvp;
-}
diff --git a/es6-promise/es6-promise.d.ts.tscparams b/es6-promise/es6-promise.d.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/es6-promise/es6-promise.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/es6-promise/index.d.ts b/es6-promise/index.d.ts
new file mode 100644
index 0000000000..001330fd24
--- /dev/null
+++ b/es6-promise/index.d.ts
@@ -0,0 +1,84 @@
+// Type definitions for es6-promise
+// Project: https://github.com/jakearchibald/ES6-Promise
+// Definitions by: François de Campredon <https://github.com/fdecampredon/>, vvakame <https://github.com/vvakame>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface Thenable<T> {
+    then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => U | Thenable<U>): Thenable<U>;
+    then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => void): Thenable<U>;
+    catch<U>(onRejected?: (error: any) => U | Thenable<U>): Thenable<U>;
+}
+
+declare class Promise<T> implements Thenable<T> {
+	/**
+	 * If you call resolve in the body of the callback passed to the constructor,
+	 * your promise is fulfilled with result object passed to resolve.
+	 * If you call reject your promise is rejected with the object passed to reject.
+	 * For consistency and debugging (eg stack traces), obj should be an instanceof Error.
+	 * Any errors thrown in the constructor callback will be implicitly passed to reject().
+	 */
+	constructor(callback: (resolve : (value?: T | Thenable<T>) => void, reject: (error?: any) => void) => void);
+
+	/**
+	 * onFulfilled is called when/if "promise" resolves. onRejected is called when/if "promise" rejects.
+	 * Both are optional, if either/both are omitted the next onFulfilled/onRejected in the chain is called.
+	 * Both callbacks have a single parameter , the fulfillment value or rejection reason.
+	 * "then" returns a new promise equivalent to the value you return from onFulfilled/onRejected after being passed through Promise.resolve.
+	 * If an error is thrown in the callback, the returned promise rejects with that error.
+	 *
+	 * @param onFulfilled called when/if "promise" resolves
+	 * @param onRejected called when/if "promise" rejects
+	 */
+    then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => U | Thenable<U>): Promise<U>;
+    then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => void): Promise<U>;
+
+	/**
+	 * Sugar for promise.then(undefined, onRejected)
+	 *
+	 * @param onRejected called when/if "promise" rejects
+	 */
+	catch<U>(onRejected?: (error: any) => U | Thenable<U>): Promise<U>;
+}
+
+declare namespace Promise {
+	/**
+	 * Make a new promise from the thenable.
+	 * A thenable is promise-like in as far as it has a "then" method.
+	 */
+	function resolve<T>(value?: T | Thenable<T>): Promise<T>;
+
+	/**
+	 * Make a promise that rejects to obj. For consistency and debugging (eg stack traces), obj should be an instanceof Error
+	 */
+	function reject(error: any): Promise<any>;
+	function reject<T>(error: T): Promise<T>;
+
+	/**
+	 * Make a promise that fulfills when every item in the array fulfills, and rejects if (and when) any item rejects.
+	 * the array passed to all can be a mixture of promise-like objects and other objects.
+	 * The fulfillment value is an array (in order) of fulfillment values. The rejection value is the first rejection value.
+	 */
+	function all<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: [T1 | Thenable<T1>, T2 | Thenable<T2>, T3 | Thenable<T3>, T4 | Thenable <T4>, T5 | Thenable<T5>, T6 | Thenable<T6>, T7 | Thenable<T7>, T8 | Thenable<T8>, T9 | Thenable<T9>, T10 | Thenable<T10>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>;
+    function all<T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: [T1 | Thenable<T1>, T2 | Thenable<T2>, T3 | Thenable<T3>, T4 | Thenable <T4>, T5 | Thenable<T5>, T6 | Thenable<T6>, T7 | Thenable<T7>, T8 | Thenable<T8>, T9 | Thenable<T9>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>;
+    function all<T1, T2, T3, T4, T5, T6, T7, T8>(values: [T1 | Thenable<T1>, T2 | Thenable<T2>, T3 | Thenable<T3>, T4 | Thenable <T4>, T5 | Thenable<T5>, T6 | Thenable<T6>, T7 | Thenable<T7>, T8 | Thenable<T8>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8]>;
+    function all<T1, T2, T3, T4, T5, T6, T7>(values: [T1 | Thenable<T1>, T2 | Thenable<T2>, T3 | Thenable<T3>, T4 | Thenable <T4>, T5 | Thenable<T5>, T6 | Thenable<T6>, T7 | Thenable<T7>]): Promise<[T1, T2, T3, T4, T5, T6, T7]>;
+    function all<T1, T2, T3, T4, T5, T6>(values: [T1 | Thenable<T1>, T2 | Thenable<T2>, T3 | Thenable<T3>, T4 | Thenable <T4>, T5 | Thenable<T5>, T6 | Thenable<T6>]): Promise<[T1, T2, T3, T4, T5, T6]>;
+    function all<T1, T2, T3, T4, T5>(values: [T1 | Thenable<T1>, T2 | Thenable<T2>, T3 | Thenable<T3>, T4 | Thenable <T4>, T5 | Thenable<T5>]): Promise<[T1, T2, T3, T4, T5]>;
+    function all<T1, T2, T3, T4>(values: [T1 | Thenable<T1>, T2 | Thenable<T2>, T3 | Thenable<T3>, T4 | Thenable <T4>]): Promise<[T1, T2, T3, T4]>;
+    function all<T1, T2, T3>(values: [T1 | Thenable<T1>, T2 | Thenable<T2>, T3 | Thenable<T3>]): Promise<[T1, T2, T3]>;
+    function all<T1, T2>(values: [T1 | Thenable<T1>, T2 | Thenable<T2>]): Promise<[T1, T2]>;
+    function all<T>(values: (T | Thenable<T>)[]): Promise<T[]>;
+
+	/**
+	 * Make a Promise that fulfills when any item fulfills, and rejects if any item rejects.
+	 */
+	function race<T>(promises: (T | Thenable<T>)[]): Promise<T>;
+}
+
+declare module 'es6-promise' {
+	var foo: typeof Promise; // Temp variable to reference Promise in local context
+	namespace rsvp {
+		export var Promise: typeof foo;
+	}
+	export = rsvp;
+}
diff --git a/es6-promise/tsconfig.json b/es6-promise/tsconfig.json
new file mode 100644
index 0000000000..8a0fb0dd43
--- /dev/null
+++ b/es6-promise/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es5",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "es6-promise-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/es6-shim/es6-shim-tests.ts b/es6-shim/es6-shim-tests.ts
index f04850f1ba..ed89d2ac35 100644
--- a/es6-shim/es6-shim-tests.ts
+++ b/es6-shim/es6-shim-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="es6-shim.d.ts" />
+
 
 interface Point { x: number; y: number; }
 interface Point3D extends Point { z: number; }
diff --git a/es6-shim/es6-shim-tests.ts.tscparams b/es6-shim/es6-shim-tests.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/es6-shim/es6-shim-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/es6-shim/es6-shim.d.ts.tscparams b/es6-shim/es6-shim.d.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/es6-shim/es6-shim.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/es6-shim/es6-shim.d.ts b/es6-shim/index.d.ts
similarity index 100%
rename from es6-shim/es6-shim.d.ts
rename to es6-shim/index.d.ts
diff --git a/es6-shim/tsconfig.json b/es6-shim/tsconfig.json
new file mode 100644
index 0000000000..40699a6d39
--- /dev/null
+++ b/es6-shim/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es5",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "es6-shim-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/escape-html/escape-html-tests.ts b/escape-html/escape-html-tests.ts
index 0c8266559d..463c60457c 100644
--- a/escape-html/escape-html-tests.ts
+++ b/escape-html/escape-html-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./escape-html.d.ts" />
 
 import * as escapeHTML from "escape-html";
 
diff --git a/escape-html/escape-html.d.ts b/escape-html/escape-html.d.ts
deleted file mode 100644
index f3b57e005a..0000000000
--- a/escape-html/escape-html.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Type definitions for escape-html
-// Project: https://github.com/component/escape-html
-// Definitions by: Elisée MAURER <https://github.com/elisee/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "escape-html" {
-  function escapeHTML(text: string): string;
-  namespace escapeHTML {}
-
-  export = escapeHTML;
-}
diff --git a/escape-html/index.d.ts b/escape-html/index.d.ts
new file mode 100644
index 0000000000..fc81a2179a
--- /dev/null
+++ b/escape-html/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for escape-html
+// Project: https://github.com/component/escape-html
+// Definitions by: Elisée MAURER <https://github.com/elisee/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function escapeHTML(text: string): string;
+declare namespace escapeHTML { }
+
+export = escapeHTML;
diff --git a/escape-html/tsconfig.json b/escape-html/tsconfig.json
new file mode 100644
index 0000000000..8227299442
--- /dev/null
+++ b/escape-html/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "escape-html-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/escape-latex/escape-latex-tests.ts b/escape-latex/escape-latex-tests.ts
index 7a5b74dfe5..0ffcd48ae0 100644
--- a/escape-latex/escape-latex-tests.ts
+++ b/escape-latex/escape-latex-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="escape-latex.d.ts" />
 
 import lescape = require('escape-latex');
 
diff --git a/escape-latex/escape-latex.d.ts b/escape-latex/escape-latex.d.ts
deleted file mode 100644
index 5835bad0d9..0000000000
--- a/escape-latex/escape-latex.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for escape-latex 0.1.2
-// Project: https://github.com/dangmai/escape-latex
-// Definitions by: Oliver Schneider <https://github.com/olsio>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'escape-latex' {
-    function lescape(texString: string): string;
-    export = lescape;
-}
\ No newline at end of file
diff --git a/escape-latex/index.d.ts b/escape-latex/index.d.ts
new file mode 100644
index 0000000000..3f29741aae
--- /dev/null
+++ b/escape-latex/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for escape-latex 0.1.2
+// Project: https://github.com/dangmai/escape-latex
+// Definitions by: Oliver Schneider <https://github.com/olsio>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function lescape(texString: string): string;
+export = lescape;
diff --git a/escape-latex/tsconfig.json b/escape-latex/tsconfig.json
new file mode 100644
index 0000000000..6a919e03ae
--- /dev/null
+++ b/escape-latex/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "escape-latex-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/escape-string-regexp/escape-string-regexp-tests.ts b/escape-string-regexp/escape-string-regexp-tests.ts
index 0e9e9e54c8..c763916398 100644
--- a/escape-string-regexp/escape-string-regexp-tests.ts
+++ b/escape-string-regexp/escape-string-regexp-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="escape-string-regexp.d.ts"/>
-
 import escapeStringRegexp = require('escape-string-regexp');
 
 var inputString: string = '^abc$';
diff --git a/escape-string-regexp/escape-string-regexp.d.ts b/escape-string-regexp/escape-string-regexp.d.ts
deleted file mode 100644
index 6e04533087..0000000000
--- a/escape-string-regexp/escape-string-regexp.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for escape-string-regexp
-// Project: https://github.com/sindresorhus/escape-string-regexp
-// Definitions by: kruncher <https://github.com/kruncher/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "escape-string-regexp" {
-
-  function escapeStringRegexp(str: string): string;
-
-  export = escapeStringRegexp;
-
-}
diff --git a/escape-string-regexp/index.d.ts b/escape-string-regexp/index.d.ts
new file mode 100644
index 0000000000..4e3ac47458
--- /dev/null
+++ b/escape-string-regexp/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for escape-string-regexp
+// Project: https://github.com/sindresorhus/escape-string-regexp
+// Definitions by: kruncher <https://github.com/kruncher/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare function escapeStringRegexp(str: string): string;
+
+export = escapeStringRegexp;
diff --git a/escape-string-regexp/tsconfig.json b/escape-string-regexp/tsconfig.json
new file mode 100644
index 0000000000..fb8f2b61b6
--- /dev/null
+++ b/escape-string-regexp/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "escape-string-regexp-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/esprima/esprima-tests.ts b/esprima/esprima-tests.ts
index f1a0f7ad92..c4cbec5240 100644
--- a/esprima/esprima-tests.ts
+++ b/esprima/esprima-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../estree/estree.d.ts" />
-/// <reference path="esprima.d.ts" />
+/// <reference types="estree" />
+
 
 import esprima = require('esprima');
 
diff --git a/esprima/esprima.d.ts b/esprima/esprima.d.ts
deleted file mode 100644
index bd5f4009d2..0000000000
--- a/esprima/esprima.d.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-// Type definitions for Esprima v2.1.0
-// Project: http://esprima.org
-// Definitions by: teppeis <https://github.com/teppeis>, RReverser <https://github.com/RReverser>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../estree/estree.d.ts" />
-
-declare namespace esprima {
-
-    const version: string;
-
-    function parse(code: string, options?: Options): ESTree.Program;
-    function tokenize(code: string, options?: Options): Array<Token>;
-
-    interface Token {
-        type: string;
-        value: string;
-    }
-
-    interface Comment extends ESTree.Node {
-        value: string;
-    }
-
-    interface Options {
-        loc?: boolean;
-        range?: boolean;
-        raw?: boolean;
-        tokens?: boolean;
-        comment?: boolean;
-        attachComment?: boolean;
-        tolerant?: boolean;
-        source?: boolean;
-    }
-
-    const Syntax: {
-        AssignmentExpression: string,
-        AssignmentPattern: string,
-        ArrayExpression: string,
-        ArrayPattern: string,
-        ArrowFunctionExpression: string,
-        BlockStatement: string,
-        BinaryExpression: string,
-        BreakStatement: string,
-        CallExpression: string,
-        CatchClause: string,
-        ClassBody: string,
-        ClassDeclaration: string,
-        ClassExpression: string,
-        ConditionalExpression: string,
-        ContinueStatement: string,
-        DoWhileStatement: string,
-        DebuggerStatement: string,
-        EmptyStatement: string,
-        ExportAllDeclaration: string,
-        ExportDefaultDeclaration: string,
-        ExportNamedDeclaration: string,
-        ExportSpecifier: string,
-        ExpressionStatement: string,
-        ForStatement: string,
-        ForOfStatement: string,
-        ForInStatement: string,
-        FunctionDeclaration: string,
-        FunctionExpression: string,
-        Identifier: string,
-        IfStatement: string,
-        ImportDeclaration: string,
-        ImportDefaultSpecifier: string,
-        ImportNamespaceSpecifier: string,
-        ImportSpecifier: string,
-        Literal: string,
-        LabeledStatement: string,
-        LogicalExpression: string,
-        MemberExpression: string,
-        MethodDefinition: string,
-        NewExpression: string,
-        ObjectExpression: string,
-        ObjectPattern: string,
-        Program: string,
-        Property: string,
-        RestElement: string,
-        ReturnStatement: string,
-        SequenceExpression: string,
-        SpreadElement: string,
-        Super: string,
-        SwitchCase: string,
-        SwitchStatement: string,
-        TaggedTemplateExpression: string,
-        TemplateElement: string,
-        TemplateLiteral: string,
-        ThisExpression: string,
-        ThrowStatement: string,
-        TryStatement: string,
-        UnaryExpression: string,
-        UpdateExpression: string,
-        VariableDeclaration: string,
-        VariableDeclarator: string,
-        WhileStatement: string,
-        WithStatement: string,
-        YieldExpression: string
-    };
-
-}
-
-declare module "esprima" {
-    export = esprima
-}
diff --git a/esprima/index.d.ts b/esprima/index.d.ts
new file mode 100644
index 0000000000..150a917d86
--- /dev/null
+++ b/esprima/index.d.ts
@@ -0,0 +1,105 @@
+// Type definitions for Esprima v2.1.0
+// Project: http://esprima.org
+// Definitions by: teppeis <https://github.com/teppeis>, RReverser <https://github.com/RReverser>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="estree" />
+
+export = esprima;
+export as namespace esprima;
+
+declare namespace esprima {
+
+    const version: string;
+
+    function parse(code: string, options?: Options): ESTree.Program;
+    function tokenize(code: string, options?: Options): Array<Token>;
+
+    interface Token {
+        type: string;
+        value: string;
+    }
+
+    interface Comment extends ESTree.Node {
+        value: string;
+    }
+
+    interface Options {
+        loc?: boolean;
+        range?: boolean;
+        raw?: boolean;
+        tokens?: boolean;
+        comment?: boolean;
+        attachComment?: boolean;
+        tolerant?: boolean;
+        source?: boolean;
+    }
+
+    const Syntax: {
+        AssignmentExpression: string,
+        AssignmentPattern: string,
+        ArrayExpression: string,
+        ArrayPattern: string,
+        ArrowFunctionExpression: string,
+        BlockStatement: string,
+        BinaryExpression: string,
+        BreakStatement: string,
+        CallExpression: string,
+        CatchClause: string,
+        ClassBody: string,
+        ClassDeclaration: string,
+        ClassExpression: string,
+        ConditionalExpression: string,
+        ContinueStatement: string,
+        DoWhileStatement: string,
+        DebuggerStatement: string,
+        EmptyStatement: string,
+        ExportAllDeclaration: string,
+        ExportDefaultDeclaration: string,
+        ExportNamedDeclaration: string,
+        ExportSpecifier: string,
+        ExpressionStatement: string,
+        ForStatement: string,
+        ForOfStatement: string,
+        ForInStatement: string,
+        FunctionDeclaration: string,
+        FunctionExpression: string,
+        Identifier: string,
+        IfStatement: string,
+        ImportDeclaration: string,
+        ImportDefaultSpecifier: string,
+        ImportNamespaceSpecifier: string,
+        ImportSpecifier: string,
+        Literal: string,
+        LabeledStatement: string,
+        LogicalExpression: string,
+        MemberExpression: string,
+        MethodDefinition: string,
+        NewExpression: string,
+        ObjectExpression: string,
+        ObjectPattern: string,
+        Program: string,
+        Property: string,
+        RestElement: string,
+        ReturnStatement: string,
+        SequenceExpression: string,
+        SpreadElement: string,
+        Super: string,
+        SwitchCase: string,
+        SwitchStatement: string,
+        TaggedTemplateExpression: string,
+        TemplateElement: string,
+        TemplateLiteral: string,
+        ThisExpression: string,
+        ThrowStatement: string,
+        TryStatement: string,
+        UnaryExpression: string,
+        UpdateExpression: string,
+        VariableDeclaration: string,
+        VariableDeclarator: string,
+        WhileStatement: string,
+        WithStatement: string,
+        YieldExpression: string
+    };
+
+}
diff --git a/esprima/tsconfig.json b/esprima/tsconfig.json
new file mode 100644
index 0000000000..004387ae66
--- /dev/null
+++ b/esprima/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "esprima-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/estree/estree-tests.ts b/estree/estree-tests.ts
index 4c132925bf..758eafe797 100644
--- a/estree/estree-tests.ts
+++ b/estree/estree-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="estree.d.ts" />
+
 
 var program: ESTree.Program;
 var statement: ESTree.Statement;
diff --git a/estree/flow.d.ts b/estree/flow.d.ts
index a79e1ca7f6..76c76008e6 100644
--- a/estree/flow.d.ts
+++ b/estree/flow.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: RReverser <https://github.com/RReverser>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./estree.d.ts" />
+
 
 declare namespace ESTree {
   interface FlowTypeAnnotation extends Node {}
diff --git a/estree/estree.d.ts b/estree/index.d.ts
similarity index 100%
rename from estree/estree.d.ts
rename to estree/index.d.ts
diff --git a/estree/tsconfig.json b/estree/tsconfig.json
new file mode 100644
index 0000000000..cdbdee4182
--- /dev/null
+++ b/estree/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "estree-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/evaporate/evaporate-tests.ts b/evaporate/evaporate-tests.ts
index 559d61fe71..ea4a4ac9bf 100644
--- a/evaporate/evaporate-tests.ts
+++ b/evaporate/evaporate-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./evaporate.d.ts" />
+import Evaporate = require("evaporate");
 
 function test_upload() {
   var evaporate = new Evaporate({});
diff --git a/evaporate/evaporate.d.ts b/evaporate/evaporate.d.ts
deleted file mode 100644
index 2a67455461..0000000000
--- a/evaporate/evaporate.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Type definitions for EvaporateJS
-// Project: https://github.com/TTLabs/EvaporateJS
-// Definitions by: Andrew Kuklewicz <https://github.com/kookster/>, Chris Rhoden <https://github.com/chrisrhoden>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-declare class Evaporate {
-  cancel(id:string): boolean;
-  constructor(config:any);
-  add(config:any): string;
-}
-
-declare module 'evaporate' {
-  export = Evaporate;
-}
diff --git a/evaporate/index.d.ts b/evaporate/index.d.ts
new file mode 100644
index 0000000000..df34a35388
--- /dev/null
+++ b/evaporate/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for EvaporateJS
+// Project: https://github.com/TTLabs/EvaporateJS
+// Definitions by: Andrew Kuklewicz <https://github.com/kookster/>, Chris Rhoden <https://github.com/chrisrhoden>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = Evaporate;
+
+declare class Evaporate {
+  cancel(id:string): boolean;
+  constructor(config:any);
+  add(config:any): string;
+}
diff --git a/evaporate/tsconfig.json b/evaporate/tsconfig.json
new file mode 100644
index 0000000000..b0f423a607
--- /dev/null
+++ b/evaporate/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "evaporate-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/event-kit/event-kit-tests.ts b/event-kit/event-kit-tests.ts
index 223ecc5070..8c5969f756 100644
--- a/event-kit/event-kit-tests.ts
+++ b/event-kit/event-kit-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./event-kit.d.ts" />
+
 
 import { Disposable, CompositeDisposable, Emitter } from "event-kit";
 
diff --git a/event-kit/event-kit.d.ts b/event-kit/event-kit.d.ts
deleted file mode 100644
index d920a4f6ea..0000000000
--- a/event-kit/event-kit.d.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-// Type definitions for event-kit v1.2.0
-// Project: https://github.com/atom/event-kit
-// Definitions by: Vadim Macagon <https://github.com/enlight/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace AtomEventKit {
-	interface IDisposable {
-		dispose(): void;
-	}
-
-	/** Static side of the Disposable class. */
-	interface DisposableStatic {
-		prototype: Disposable;
-		new (disposalAction: Function): Disposable;
-	}
-
-	/** Instance side of the Disposable class. */
-	interface Disposable extends IDisposable {
-		disposed: boolean;
-
-		constructor: DisposableStatic;
-	}
-
-	/** A class that represent a handle to a resource that can be disposed. */
-	var Disposable: DisposableStatic;
-
-	/** Static side of the CompositeDisposable class. */
-	interface CompositeDisposableStatic {
-		prototype: CompositeDisposable;
-		new (...disposables: IDisposable[]): CompositeDisposable;
-	}
-
-	/** Instance side of the CompositeDisposable class. */
-	interface CompositeDisposable extends IDisposable {
-		disposed: boolean;
-
-		constructor: CompositeDisposableStatic;
-		add(...disposables: IDisposable[]): void;
-		remove(disposable: IDisposable): void;
-		clear(): void;
-	}
-
-	/**
-	 * A class that aggregates multiple [[Disposable]] instances together into a single disposable,
-	 * so that they can all be disposed as a group.
-	 */
-	var CompositeDisposable: CompositeDisposableStatic;
-
-	/** Static side of the Emitter class. */
-	interface EmitterStatic {
-		prototype: Emitter;
-		new (): Emitter;
-	}
-
-	/** Instance side of the Emitter class. */
-	interface Emitter {
-		isDisposed: boolean;
-
-		constructor: EmitterStatic;
-		dispose(): void;
-		/**
-		* Registers a handler to be invoked whenever the given event is emitted.
-		* @return An object that will unregister the handler when disposed.
-		*/
-		on(eventName: string, handler: (value: any) => void, unshift?: boolean): Disposable;
-		/**
-		* Registers a handler to be invoked *before* all previously registered handlers for
-		* the given event.
-		* @return An object that will unregister the handler when disposed.
-		*/
-		preempt(eventName: string, handler: (value: any) => void): Disposable;
-		/** Invokes any registered handlers for the given event. */
-		emit(eventName: string, value: any): void;
-	}
-
-	/** A utility class for implementing event-based APIs. */
-	var Emitter: EmitterStatic;
-}
-
-declare module "event-kit" {
-	export = AtomEventKit;
-}
diff --git a/event-kit/index.d.ts b/event-kit/index.d.ts
new file mode 100644
index 0000000000..de4e7a485c
--- /dev/null
+++ b/event-kit/index.d.ts
@@ -0,0 +1,80 @@
+// Type definitions for event-kit v1.2.0
+// Project: https://github.com/atom/event-kit
+// Definitions by: Vadim Macagon <https://github.com/enlight/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = AtomEventKit;
+
+declare namespace AtomEventKit {
+	interface IDisposable {
+		dispose(): void;
+	}
+
+	/** Static side of the Disposable class. */
+	interface DisposableStatic {
+		prototype: Disposable;
+		new (disposalAction: Function): Disposable;
+	}
+
+	/** Instance side of the Disposable class. */
+	interface Disposable extends IDisposable {
+		disposed: boolean;
+
+		constructor: DisposableStatic;
+	}
+
+	/** A class that represent a handle to a resource that can be disposed. */
+	var Disposable: DisposableStatic;
+
+	/** Static side of the CompositeDisposable class. */
+	interface CompositeDisposableStatic {
+		prototype: CompositeDisposable;
+		new (...disposables: IDisposable[]): CompositeDisposable;
+	}
+
+	/** Instance side of the CompositeDisposable class. */
+	interface CompositeDisposable extends IDisposable {
+		disposed: boolean;
+
+		constructor: CompositeDisposableStatic;
+		add(...disposables: IDisposable[]): void;
+		remove(disposable: IDisposable): void;
+		clear(): void;
+	}
+
+	/**
+	 * A class that aggregates multiple [[Disposable]] instances together into a single disposable,
+	 * so that they can all be disposed as a group.
+	 */
+	var CompositeDisposable: CompositeDisposableStatic;
+
+	/** Static side of the Emitter class. */
+	interface EmitterStatic {
+		prototype: Emitter;
+		new (): Emitter;
+	}
+
+	/** Instance side of the Emitter class. */
+	interface Emitter {
+		isDisposed: boolean;
+
+		constructor: EmitterStatic;
+		dispose(): void;
+		/**
+		* Registers a handler to be invoked whenever the given event is emitted.
+		* @return An object that will unregister the handler when disposed.
+		*/
+		on(eventName: string, handler: (value: any) => void, unshift?: boolean): Disposable;
+		/**
+		* Registers a handler to be invoked *before* all previously registered handlers for
+		* the given event.
+		* @return An object that will unregister the handler when disposed.
+		*/
+		preempt(eventName: string, handler: (value: any) => void): Disposable;
+		/** Invokes any registered handlers for the given event. */
+		emit(eventName: string, value: any): void;
+	}
+
+	/** A utility class for implementing event-based APIs. */
+	var Emitter: EmitterStatic;
+}
diff --git a/event-kit/tsconfig.json b/event-kit/tsconfig.json
new file mode 100644
index 0000000000..af60393c4c
--- /dev/null
+++ b/event-kit/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "event-kit-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/event-loop-lag/event-loop-lag-tests.ts b/event-loop-lag/event-loop-lag-tests.ts
index 39de40705a..5603ed881e 100644
--- a/event-loop-lag/event-loop-lag-tests.ts
+++ b/event-loop-lag/event-loop-lag-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="event-loop-lag.d.ts" />
 
 import lag = require("event-loop-lag");
 
diff --git a/event-loop-lag/event-loop-lag.d.ts b/event-loop-lag/event-loop-lag.d.ts
deleted file mode 100644
index fa1b1d8215..0000000000
--- a/event-loop-lag/event-loop-lag.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// Type definitions for event-loop-lag 1.0.3
-// Project: https://github.com/pebble/event-loop-lag
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "event-loop-lag" {
-	
-	/**
-	 * Accepts a number of milliseconds representing how often to refresh the event loop lag measurement and returns a function you can call to receive the latest lag measurement in milliseconds.
-	 */
-	function lag(interval: number): () => number;
-	
-	export = lag;	
-}
diff --git a/event-loop-lag/index.d.ts b/event-loop-lag/index.d.ts
new file mode 100644
index 0000000000..81ac388ee1
--- /dev/null
+++ b/event-loop-lag/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for event-loop-lag 1.0.3
+// Project: https://github.com/pebble/event-loop-lag
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+/**
+ * Accepts a number of milliseconds representing how often to refresh the event loop lag measurement and returns a function you can call to receive the latest lag measurement in milliseconds.
+ */
+declare function lag(interval: number): () => number;
+
+export = lag;
diff --git a/event-loop-lag/tsconfig.json b/event-loop-lag/tsconfig.json
new file mode 100644
index 0000000000..69b51a434e
--- /dev/null
+++ b/event-loop-lag/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "event-loop-lag-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/event-stream/event-stream-tests.ts b/event-stream/event-stream-tests.ts
index 7be9160fc2..cdb541b382 100644
--- a/event-stream/event-stream-tests.ts
+++ b/event-stream/event-stream-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="./event-stream.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import gulp = require("gulp");
 import * as es from "event-stream";
diff --git a/event-stream/event-stream.d.ts b/event-stream/event-stream.d.ts
deleted file mode 100644
index 85d676d339..0000000000
--- a/event-stream/event-stream.d.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-// Type definitions for event-stream v3.3.2
-// Project: https://github.com/dominictarr/event-stream
-// Definitions by: David Gardiner <https://github.com/flcdrg/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'event-stream'
-{
-    import * as stream from 'stream';
-
-    /**
-     * Create a through stream from an asynchronous function
-     * 
-     * @param asyncFunction
-     */
-    export function map(asyncFunction: Function): stream.Stream;
-
-    /**
-     * Same as map, but the callback is called synchronously. Based on es.through
-     * @param syncFunction
-     */
-    export function mapSync(syncFunction: Function): stream.Stream;
-
-    /**
-     * Break up a stream and reassemble it so that each line is a chunk. matcher may be a String, or a RegExp
-     * 
-     * @param matcher
-     */
-    export function split(matcher: string | RegExp): stream.Stream;
-
-    /**
-     * Create a through stream that emits separator between each chunk, just like Array#join
-     * 
-     * @param separator
-     */
-    export function join(separator: string): stream.Stream;
-
-    /**
-     * Merges streams into one and returns it. Incoming data will be emitted as soon it comes into - no ordering will be applied
-     * (for example: data1 data1 data2 data1 data2 - where data1 and data2 is data from two streams).
-     * Counts how many streams were passed to it and emits end only when all streams emitted end.
-     * 
-     * @param stream
-     */
-    export function concat(...stream: stream.Stream[]): stream.Stream;
-
-    /**
-     * Merges streams into one and returns it. Incoming data will be emitted as soon it comes into - no ordering will be applied
-     * (for example: data1 data1 data2 data1 data2 - where data1 and data2 is data from two streams).
-     * Counts how many streams were passed to it and emits end only when all streams emitted end.
-     * 
-     * @param stream
-     */
-    export function concat(streamArray:stream.Stream[]): stream.Stream;
-
-    /**
-     * Merges streams into one and returns it. Incoming data will be emitted as soon it comes into - no ordering will be applied
-     * (for example: data1 data1 data2 data1 data2 - where data1 and data2 is data from two streams).
-     * Counts how many streams were passed to it and emits end only when all streams emitted end.
-     * 
-     * @param stream
-     */
-    export function merge(...stream: stream.Stream[]): stream.Stream;
-
-    /**
-     * Merges streams into one and returns it. Incoming data will be emitted as soon it comes into - no ordering will be applied
-     * (for example: data1 data1 data2 data1 data2 - where data1 and data2 is data from two streams).
-     * Counts how many streams were passed to it and emits end only when all streams emitted end.
-     * 
-     * @param stream
-     */
-    export function merge(streamArray: stream.Stream[]): stream.Stream;
-
-    /**
-     * Replace all occurrences of from with to
-     * @param from
-     * @param to
-     */
-    export function replace(from: string | RegExp, to: string | RegExp): stream.Stream;
-
-    /**
-     * Convenience function for parsing JSON chunks. For newline separated JSON, use with es.split.
-     * By default it logs parsing errors by console.error; for another behaviour, transforms created by es.parse({error: true})
-     * will emit error events for exceptions thrown from JSON.parse, unmodified.
-     */
-    export function parse(): any;
-
-    /**
-     * convert javascript objects into lines of text. The text will have whitespace escaped and have a \n appended, so it will be compatible with es.parse
-     */
-    export function stringify(): stream.Stream;
-
-    /**
-     * create a readable stream (that respects pause) from an async function.
-     * 
-     * @param asyncFunction
-     */
-    export function readable(asyncFunction: Function): stream.Stream;
-
-    /**
-     * Create a readable stream from an Array.
-     * 
-     * @param array
-     */
-    export function readArray(array: any[]): stream.Stream;
-
-    /**
-     * create a writeable stream from a callback
-     * 
-     * @param callback
-     */
-    export function writeArray(callback: Function): stream.Stream;
-
-    /**
-     * A stream that buffers all chunks when paused
-     */
-    export function pause(): stream.Stream | void;
-
-    /**
-     * Takes a writable stream and a readable stream and makes them appear as a readable writable stream.
-     * 
-     * @param writeStream
-     * @param readStream
-     */
-    export function duplex(writeStream: stream.Writable, readStream: stream.Readable): stream.Stream;
-
-    /**
-     * Create a through stream from a child process
-     * 
-     * @param child_process
-     */
-    export function child(child_process: any): stream.Stream;
-
-    /**
-     * waits for stream to emit 'end'. joins chunks of a stream into a single string or buffer.
-     * Takes an optional callback, which will be passed the complete string/buffer when it receives the 'end' event.
-     * 
-     * @param callback
-     */
-    export function wait(callback: Function): stream.Stream;
-}
\ No newline at end of file
diff --git a/event-stream/index.d.ts b/event-stream/index.d.ts
new file mode 100644
index 0000000000..6b78d7fc9a
--- /dev/null
+++ b/event-stream/index.d.ts
@@ -0,0 +1,140 @@
+// Type definitions for event-stream v3.3.2
+// Project: https://github.com/dominictarr/event-stream
+// Definitions by: David Gardiner <https://github.com/flcdrg/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import * as stream from 'stream';
+
+/**
+ * Create a through stream from an asynchronous function
+ * 
+ * @param asyncFunction
+ */
+export declare function map(asyncFunction: Function): stream.Stream;
+
+/**
+ * Same as map, but the callback is called synchronously. Based on es.through
+ * @param syncFunction
+ */
+export declare function mapSync(syncFunction: Function): stream.Stream;
+
+/**
+ * Break up a stream and reassemble it so that each line is a chunk. matcher may be a String, or a RegExp
+ * 
+ * @param matcher
+ */
+export declare function split(matcher: string | RegExp): stream.Stream;
+
+/**
+ * Create a through stream that emits separator between each chunk, just like Array#join
+ * 
+ * @param separator
+ */
+export declare function join(separator: string): stream.Stream;
+
+/**
+ * Merges streams into one and returns it. Incoming data will be emitted as soon it comes into - no ordering will be applied
+ * (for example: data1 data1 data2 data1 data2 - where data1 and data2 is data from two streams).
+ * Counts how many streams were passed to it and emits end only when all streams emitted end.
+ * 
+ * @param stream
+ */
+export declare function concat(...stream: stream.Stream[]): stream.Stream;
+
+/**
+ * Merges streams into one and returns it. Incoming data will be emitted as soon it comes into - no ordering will be applied
+ * (for example: data1 data1 data2 data1 data2 - where data1 and data2 is data from two streams).
+ * Counts how many streams were passed to it and emits end only when all streams emitted end.
+ * 
+ * @param stream
+ */
+export declare function concat(streamArray: stream.Stream[]): stream.Stream;
+
+/**
+ * Merges streams into one and returns it. Incoming data will be emitted as soon it comes into - no ordering will be applied
+ * (for example: data1 data1 data2 data1 data2 - where data1 and data2 is data from two streams).
+ * Counts how many streams were passed to it and emits end only when all streams emitted end.
+ * 
+ * @param stream
+ */
+export declare function merge(...stream: stream.Stream[]): stream.Stream;
+
+/**
+ * Merges streams into one and returns it. Incoming data will be emitted as soon it comes into - no ordering will be applied
+ * (for example: data1 data1 data2 data1 data2 - where data1 and data2 is data from two streams).
+ * Counts how many streams were passed to it and emits end only when all streams emitted end.
+ * 
+ * @param stream
+ */
+export declare function merge(streamArray: stream.Stream[]): stream.Stream;
+
+/**
+ * Replace all occurrences of from with to
+ * @param from
+ * @param to
+ */
+export declare function replace(from: string | RegExp, to: string | RegExp): stream.Stream;
+
+/**
+ * Convenience function for parsing JSON chunks. For newline separated JSON, use with es.split.
+ * By default it logs parsing errors by console.error; for another behaviour, transforms created by es.parse({error: true})
+ * will emit error events for exceptions thrown from JSON.parse, unmodified.
+ */
+export declare function parse(): any;
+
+/**
+ * convert javascript objects into lines of text. The text will have whitespace escaped and have a \n appended, so it will be compatible with es.parse
+ */
+export declare function stringify(): stream.Stream;
+
+/**
+ * create a readable stream (that respects pause) from an async function.
+ * 
+ * @param asyncFunction
+ */
+export declare function readable(asyncFunction: Function): stream.Stream;
+
+/**
+ * Create a readable stream from an Array.
+ * 
+ * @param array
+ */
+export declare function readArray(array: any[]): stream.Stream;
+
+/**
+ * create a writeable stream from a callback
+ * 
+ * @param callback
+ */
+export declare function writeArray(callback: Function): stream.Stream;
+
+/**
+ * A stream that buffers all chunks when paused
+ */
+export declare function pause(): stream.Stream | void;
+
+/**
+ * Takes a writable stream and a readable stream and makes them appear as a readable writable stream.
+ * 
+ * @param writeStream
+ * @param readStream
+ */
+export declare function duplex(writeStream: stream.Writable, readStream: stream.Readable): stream.Stream;
+
+/**
+ * Create a through stream from a child process
+ * 
+ * @param child_process
+ */
+export declare function child(child_process: any): stream.Stream;
+
+/**
+ * waits for stream to emit 'end'. joins chunks of a stream into a single string or buffer.
+ * Takes an optional callback, which will be passed the complete string/buffer when it receives the 'end' event.
+ * 
+ * @param callback
+ */
+export declare function wait(callback: Function): stream.Stream;
diff --git a/event-stream/tsconfig.json b/event-stream/tsconfig.json
new file mode 100644
index 0000000000..ed7435bc63
--- /dev/null
+++ b/event-stream/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "event-stream-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/eventemitter2/eventemitter2-tests.ts b/eventemitter2/eventemitter2-tests.ts
index 747f2e87b6..936366c0b9 100644
--- a/eventemitter2/eventemitter2-tests.ts
+++ b/eventemitter2/eventemitter2-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="eventemitter2.d.ts"/>
-
 // Example for CommonJS/AMD
 /*
 import eventemitter2 = require("eventemitter2");
diff --git a/eventemitter2/eventemitter2.d.ts b/eventemitter2/index.d.ts
similarity index 100%
rename from eventemitter2/eventemitter2.d.ts
rename to eventemitter2/index.d.ts
diff --git a/eventemitter2/tsconfig.json b/eventemitter2/tsconfig.json
new file mode 100644
index 0000000000..1324765611
--- /dev/null
+++ b/eventemitter2/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "eventemitter2-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/eventemitter3/eventemitter3-tests.ts b/eventemitter3/eventemitter3-tests.ts
index 6c5733bec7..c0a532fc87 100644
--- a/eventemitter3/eventemitter3-tests.ts
+++ b/eventemitter3/eventemitter3-tests.ts
@@ -1,6 +1,5 @@
-///<reference path="eventemitter3.d.ts" />
-///<reference path="../node/node.d.ts" />
-///<reference path="../mocha/mocha.d.ts" />
+///<reference types="node" />
+///<reference types="mocha" />
 'use strict';
 
 import EventEmitter = require('eventemitter3');
@@ -30,7 +29,7 @@ declare namespace Assume {
 let assume = Assume.assume;
 
 class EventEmitterTest {
-    v: EventEmitter3.EventEmitter;
+    v: any;
 
     constructor() {
         this.v = new EventEmitter();
@@ -55,40 +54,40 @@ class EventEmitterTest {
 
     on() {
         var fn = () => console.log(1);
-        var v1: EventEmitter3.EventEmitter = this.v.on('click', fn);
-        var v2: EventEmitter3.EventEmitter = this.v.on('click', fn, this);
+        var v1 = this.v.on('click', fn);
+        var v2 = this.v.on('click', fn, this);
     }
 
     once() {
         var fn = () => console.log(1);
-        var v1: EventEmitter3.EventEmitter = this.v.once('click', fn);
-        var v2: EventEmitter3.EventEmitter = this.v.once('click', fn, this);
+        var v1 = this.v.once('click', fn);
+        var v2 = this.v.once('click', fn, this);
     }
 
     removeListener() {
         var fn = () => console.log(1);
-        var v1: EventEmitter3.EventEmitter = this.v.removeListener('click', fn);
-        var v2: EventEmitter3.EventEmitter = this.v.removeListener('click', fn, true);
+        var v1 = this.v.removeListener('click', fn);
+        var v2 = this.v.removeListener('click', fn, true);
     }
 
     removeAllListeners() {
-        var v1: EventEmitter3.EventEmitter = this.v.removeAllListeners('click');
+        var v1 = this.v.removeAllListeners('click');
     }
 
     off() {
         var fn = () => console.log(1);
-        var v1: EventEmitter3.EventEmitter = this.v.off('click', fn);
-        var v2: EventEmitter3.EventEmitter = this.v.off('click', fn, true);
+        var v1 = this.v.off('click', fn);
+        var v2 = this.v.off('click', fn, true);
     }
 
     addListener() {
         var fn = () => console.log(1);
-        var v1: EventEmitter3.EventEmitter = this.v.addListener('click', fn);
-        var v2: EventEmitter3.EventEmitter = this.v.addListener('click', fn, this);
+        var v1 = this.v.addListener('click', fn);
+        var v2 = this.v.addListener('click', fn, this);
     }
 
     setMaxListeners() {
-        var v1: EventEmitter3.EventEmitter = this.v.setMaxListeners();
+        var v1 = this.v.setMaxListeners();
     }
 }
 
@@ -256,7 +255,7 @@ describe('EventEmitter', function tests() {
     it('receives the emitted events', function (done) {
       var e = new EventEmitter();
 
-      e.on('data', function (a: string, b: EventEmitter3.EventEmitter, c: Date, d: void, undef: void) {
+      e.on('data', function (a: string, b: any, c: Date, d: void, undef: void) {
         assume(a).equals('foo');
         assume(b).equals(e);
         assume(c).is.instanceOf(Date);
diff --git a/eventemitter3/eventemitter3.d.ts b/eventemitter3/eventemitter3.d.ts
deleted file mode 100644
index 0d692b8247..0000000000
--- a/eventemitter3/eventemitter3.d.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-// Type definitions for EventEmitter3 1.1.1
-// Project: https://github.com/primus/eventemitter3
-// Definitions by: Yuichi Murata <https://github.com/mrk21>, Leon Yu <https://github.com/leonyu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace EventEmitter3 {
-    interface EventEmitter3Static {
-        new (): EventEmitter;
-        prefixed: string | boolean;
-    }
-    class EventEmitter {
-        /**
-         * Minimal EventEmitter interface that is molded against the Node.js
-         * EventEmitter interface.
-         *
-         * @constructor
-         * @api public
-         */
-        constructor();
-
-        /**
-         * Return a list of assigned event listeners.
-         *
-         * @param {String} event The events that should be listed.
-         * @returns {Array}
-         * @api public
-         */
-        listeners(event?: string): Function[];
-
-        /**
-         * Return a list of assigned event listeners.
-         *
-         * @param {String} event The events that should be listed.
-         * @param {Boolean} exists We only need to know if there are listeners.
-         * @returns {Boolean}
-         * @api public
-         */
-        listeners(event: string, param: boolean): boolean;
-
-        /**
-         * Emit an event to all registered event listeners.
-         *
-         * @param {String} event The name of the event.
-         * @returns {Boolean} Indication if we've emitted an event.
-         * @api public
-         */
-        emit(event: string, ...args: any[]): boolean;
-
-        /**
-         * Register a new EventListener for the given event.
-         *
-         * @param {String} event Name of the event.
-         * @param {Function} fn Callback function.
-         * @param {Mixed} [context=this] The context of the function.
-         * @api public
-         */
-        on(event: string, fn: Function, context?: any): EventEmitter;
-
-        /**
-         * Add an EventListener that's only called once.
-         *
-         * @param {String} event Name of the event.
-         * @param {Function} fn Callback function.
-         * @param {Mixed} [context=this] The context of the function.
-         * @api public
-         */
-        once(event: string, fn: Function, context?: any): EventEmitter;
-
-        /**
-         * Remove event listeners.
-         *
-         * @param {String} event The event we want to remove.
-         * @param {Function} fn The listener that we need to find.
-         * @param {Mixed} context Only remove listeners matching this context.
-         * @param {Boolean} once Only remove once listeners.
-         * @api public
-         */
-        removeListener(event: string, fn?: Function, context?: any, once?: boolean): EventEmitter;
-
-        /**
-         * Remove all listeners or only the listeners for the specified event.
-         *
-         * @param {String} event The event want to remove all listeners for.
-         * @api public
-         */
-        removeAllListeners(event?: string): EventEmitter;
-
-        /**
-         * Remove event listeners.
-         *
-         * @param {String} event The event we want to remove.
-         * @param {Function} fn The listener that we need to find.
-         * @param {Mixed} context Only remove listeners matching this context.
-         * @param {Boolean} once Only remove once listeners.
-         * @api public
-         */
-        off(event: string, fn?: Function, context?: any, once?: boolean): EventEmitter;
-
-        /**
-         * Register a new EventListener for the given event.
-         *
-         * @param {String} event Name of the event.
-         * @param {Function} fn Callback function.
-         * @param {Mixed} [context=this] The context of the function.
-         * @api public
-         */
-        addListener(event: string, fn: Function, context?: any): EventEmitter;
-
-        /**
-         * This function doesn't apply anymore.
-         * @deprecated
-         */
-        setMaxListeners(): EventEmitter;
-    }
-}
-
-declare module 'eventemitter3' {
-    //
-    // Expose the module.
-    //
-    var EventEmitter3: EventEmitter3.EventEmitter3Static;
-    export = EventEmitter3;
-}
diff --git a/eventemitter3/index.d.ts b/eventemitter3/index.d.ts
new file mode 100644
index 0000000000..63e1cd12e1
--- /dev/null
+++ b/eventemitter3/index.d.ts
@@ -0,0 +1,121 @@
+// Type definitions for EventEmitter3 1.1.1
+// Project: https://github.com/primus/eventemitter3
+// Definitions by: Yuichi Murata <https://github.com/mrk21>, Leon Yu <https://github.com/leonyu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+//
+// Expose the module.
+//
+declare var event_emitter3: EventEmitter3.EventEmitter3Static;
+export = event_emitter3;
+
+declare namespace EventEmitter3 {
+    interface EventEmitter3Static {
+        new (): EventEmitter;
+        prefixed: string | boolean;
+    }
+    class EventEmitter {
+        /**
+         * Minimal EventEmitter interface that is molded against the Node.js
+         * EventEmitter interface.
+         *
+         * @constructor
+         * @api public
+         */
+        constructor();
+
+        /**
+         * Return a list of assigned event listeners.
+         *
+         * @param {String} event The events that should be listed.
+         * @returns {Array}
+         * @api public
+         */
+        listeners(event?: string): Function[];
+
+        /**
+         * Return a list of assigned event listeners.
+         *
+         * @param {String} event The events that should be listed.
+         * @param {Boolean} exists We only need to know if there are listeners.
+         * @returns {Boolean}
+         * @api public
+         */
+        listeners(event: string, param: boolean): boolean;
+
+        /**
+         * Emit an event to all registered event listeners.
+         *
+         * @param {String} event The name of the event.
+         * @returns {Boolean} Indication if we've emitted an event.
+         * @api public
+         */
+        emit(event: string, ...args: any[]): boolean;
+
+        /**
+         * Register a new EventListener for the given event.
+         *
+         * @param {String} event Name of the event.
+         * @param {Function} fn Callback function.
+         * @param {Mixed} [context=this] The context of the function.
+         * @api public
+         */
+        on(event: string, fn: Function, context?: any): EventEmitter;
+
+        /**
+         * Add an EventListener that's only called once.
+         *
+         * @param {String} event Name of the event.
+         * @param {Function} fn Callback function.
+         * @param {Mixed} [context=this] The context of the function.
+         * @api public
+         */
+        once(event: string, fn: Function, context?: any): EventEmitter;
+
+        /**
+         * Remove event listeners.
+         *
+         * @param {String} event The event we want to remove.
+         * @param {Function} fn The listener that we need to find.
+         * @param {Mixed} context Only remove listeners matching this context.
+         * @param {Boolean} once Only remove once listeners.
+         * @api public
+         */
+        removeListener(event: string, fn?: Function, context?: any, once?: boolean): EventEmitter;
+
+        /**
+         * Remove all listeners or only the listeners for the specified event.
+         *
+         * @param {String} event The event want to remove all listeners for.
+         * @api public
+         */
+        removeAllListeners(event?: string): EventEmitter;
+
+        /**
+         * Remove event listeners.
+         *
+         * @param {String} event The event we want to remove.
+         * @param {Function} fn The listener that we need to find.
+         * @param {Mixed} context Only remove listeners matching this context.
+         * @param {Boolean} once Only remove once listeners.
+         * @api public
+         */
+        off(event: string, fn?: Function, context?: any, once?: boolean): EventEmitter;
+
+        /**
+         * Register a new EventListener for the given event.
+         *
+         * @param {String} event Name of the event.
+         * @param {Function} fn Callback function.
+         * @param {Mixed} [context=this] The context of the function.
+         * @api public
+         */
+        addListener(event: string, fn: Function, context?: any): EventEmitter;
+
+        /**
+         * This function doesn't apply anymore.
+         * @deprecated
+         */
+        setMaxListeners(): EventEmitter;
+    }
+}
diff --git a/eventemitter3/tsconfig.json b/eventemitter3/tsconfig.json
new file mode 100644
index 0000000000..00b9c0748b
--- /dev/null
+++ b/eventemitter3/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "eventemitter3-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/evernote/evernote-tests.ts b/evernote/evernote-tests.ts
index ce84750fab..76598a83be 100644
--- a/evernote/evernote-tests.ts
+++ b/evernote/evernote-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="evernote.d.ts"/>
-
 import { Evernote } from "evernote";
 
 var client = new Evernote.Client({ token: "abcdef", sandbox: true });
diff --git a/evernote/evernote.d.ts b/evernote/evernote.d.ts
deleted file mode 100644
index d8a2fe0ac4..0000000000
--- a/evernote/evernote.d.ts
+++ /dev/null
@@ -1,6322 +0,0 @@
-// Type definitions for evernote v 1.25.8
-// Project: https://www.npmjs.com/package/evernote
-// Definitions by: Zachary Collins <https://github.com/corps/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../thrift/thrift.d.ts"/>
-
-declare module "evernote" {
-    import { Thrift } from "thrift";
-
-    namespace Evernote {
-        interface Callback<T> {
-            (err: EDAMUserException|EDAMSystemException|EDAMNotFoundException, v: T): void
-        }
-
-        interface ClientConfig {
-            consumerKey?: string
-            consumerSecret?: string
-            sandbox?: boolean
-            token?: string
-            serviceHost?: string
-            additionalHeaders?: { [k: string]: string }
-            secret?: string
-        }
-
-        class Client {
-            static "new": (config: ClientConfig) => Client
-            constructor(config: ClientConfig);
-            getNoteStore(): NoteStoreClient;
-            getUserStore(): UserStoreClient;
-        }
-
-
-        /**
-         * Numeric codes indicating the type of error that occurred on the
-         * service.
-         * <dl>
-         *     <dt>UNKNOWN</dt>
-         *         <dd>No information available about the error</dd>
-         *     <dt>BAD_DATA_FORMAT</dt>
-         *         <dd>The format of the request data was incorrect</dd>
-         *     <dt>PERMISSION_DENIED</dt>
-         *         <dd>Not permitted to perform action</dd>
-         *     <dt>INTERNAL_ERROR</dt>
-         *         <dd>Unexpected problem with the service</dd>
-         *     <dt>DATA_REQUIRED</dt>
-         *         <dd>A required parameter/field was absent</dd>
-         *     <dt>LIMIT_REACHED</dt>
-         *         <dd>Operation denied due to data model limit</dd>
-         *     <dt>QUOTA_REACHED</dt>
-         *         <dd>Operation denied due to user storage limit</dd>
-         *     <dt>INVALID_AUTH</dt>
-         *         <dd>Username and/or password incorrect</dd>
-         *     <dt>AUTH_EXPIRED</dt>
-         *         <dd>Authentication token expired</dd>
-         *     <dt>DATA_CONFLICT</dt>
-         *         <dd>Change denied due to data model conflict</dd>
-         *     <dt>ENML_VALIDATION</dt>
-         *         <dd>Content of submitted note was malformed</dd>
-         *     <dt>SHARD_UNAVAILABLE</dt>
-         *         <dd>Service shard with account data is temporarily down</dd>
-         *     <dt>LEN_TOO_SHORT</dt>
-         *         <dd>Operation denied due to data model limit, where something such
-         *                 as a string length was too short</dd>
-         *     <dt>LEN_TOO_LONG</dt>
-         *         <dd>Operation denied due to data model limit, where something such
-         *                 as a string length was too long</dd>
-         *     <dt>TOO_FEW</dt>
-         *         <dd>Operation denied due to data model limit, where there were
-         *                 too few of something.</dd>
-         *     <dt>TOO_MANY</dt>
-         *         <dd>Operation denied due to data model limit, where there were
-         *                 too many of something.</dd>
-         *     <dt>UNSUPPORTED_OPERATION</dt>
-         *         <dd>Operation denied because it is currently unsupported.</dd>
-         *     <dt>TAKEN_DOWN</dt>
-         *         <dd>Operation denied because access to the corresponding object is
-         *                 prohibited in response to a take-down notice.</dd>
-         *     <dt>RATE_LIMIT_REACHED</dt>
-         *         <dd>Operation denied because the calling application has reached
-         *                 its hourly API call limit for this user.</dd>
-         * </dl>
-         */
-        enum EDAMErrorCode {
-            'UNKNOWN' = 1,
-            'BAD_DATA_FORMAT' = 2,
-            'PERMISSION_DENIED' = 3,
-            'INTERNAL_ERROR' = 4,
-            'DATA_REQUIRED' = 5,
-            'LIMIT_REACHED' = 6,
-            'QUOTA_REACHED' = 7,
-            'INVALID_AUTH' = 8,
-            'AUTH_EXPIRED' = 9,
-            'DATA_CONFLICT' = 10,
-            'ENML_VALIDATION' = 11,
-            'SHARD_UNAVAILABLE' = 12,
-            'LEN_TOO_SHORT' = 13,
-            'LEN_TOO_LONG' = 14,
-            'TOO_FEW' = 15,
-            'TOO_MANY' = 16,
-            'UNSUPPORTED_OPERATION' = 17,
-            'TAKEN_DOWN' = 18,
-            'RATE_LIMIT_REACHED' = 19,
-        }
-
-        /**
-         * This exception is thrown by EDAM procedures when a call fails as a result of
-         * a problem that a caller may be able to resolve.    For example, if the user
-         * attempts to add a note to their account which would exceed their storage
-         * quota, this type of exception may be thrown to indicate the source of the
-         * error so that they can choose an alternate action.
-         *
-         * This exception would not be used for internal system errors that do not
-         * reflect user actions, but rather reflect a problem within the service that
-         * the user cannot resolve.
-         *
-         * errorCode:    The numeric code indicating the type of error that occurred.
-         *     must be one of the values of EDAMErrorCode.
-         *
-         * parameter:    If the error applied to a particular input parameter, this will
-         *     indicate which parameter.
-         */
-        class EDAMUserException extends Thrift.TException {
-            errorCode: EDAMErrorCode;
-            parameter: string;
-
-            constructor(args?: { errorCode: EDAMErrorCode; parameter?: string; });
-        }
-
-        /**
-         * This exception is thrown by EDAM procedures when a call fails as a result of
-         * a problem in the service that could not be changed through caller action.
-         *
-         * errorCode:    The numeric code indicating the type of error that occurred.
-         *     must be one of the values of EDAMErrorCode.
-         *
-         * message:    This may contain additional information about the error
-         *
-         * rateLimitDuration:    Indicates the minimum number of seconds that an application should
-         *     expect subsequent API calls for this user to fail. The application should not retry
-         *     API requests for the user until at least this many seconds have passed. Present only
-         *     when errorCode is RATE_LIMIT_REACHED,
-         */
-        class EDAMSystemException extends Thrift.TException {
-            errorCode: EDAMErrorCode;
-            message: string;
-            rateLimitDuration: number;
-
-            constructor(args?: { errorCode: EDAMErrorCode; message?: string; rateLimitDuration?: number; });
-        }
-
-        /**
-         * This exception is thrown by EDAM procedures when a caller asks to perform
-         * an operation on an object that does not exist.    This may be thrown based on an invalid
-         * primary identifier (e.g. a bad GUID), or when the caller refers to an object
-         * by another unique identifier (e.g. a User's email address).
-         *
-         * identifier:    A description of the object that was not found on the server.
-         *     For example, "Note.notebookGuid" when a caller attempts to create a note in a
-         *     notebook that does not exist in the user's account.
-         *
-         * key:    The value passed from the client in the identifier, which was not
-         *     found. For example, the GUID that was not found.
-         */
-        class EDAMNotFoundException extends Thrift.TException {
-            identifier: string;
-            key: string;
-
-            constructor(args?: { identifier?: string; key?: string; });
-        }
-        /**
-         * Minimum length of any string-based attribute, in Unicode chars
-         */
-        var EDAM_ATTRIBUTE_LEN_MIN: number;
-
-        /**
-         * Maximum length of any string-based attribute, in Unicode chars
-         */
-        var EDAM_ATTRIBUTE_LEN_MAX: number;
-
-        /**
-         * Any string-based attribute must match the provided regular expression.
-         * This excludes all Unicode line endings and control characters.
-         */
-        var EDAM_ATTRIBUTE_REGEX: string;
-
-        /**
-         * The maximum number of values that can be stored in a list-based attribute
-         * (e.g. see UserAttributes.recentMailedAddresses)
-         */
-        var EDAM_ATTRIBUTE_LIST_MAX: number;
-
-        /**
-         * The maximum number of entries that can be stored in a map-based attribute
-         * such as applicationData fields in Resources and Notes.
-         */
-        var EDAM_ATTRIBUTE_MAP_MAX: number;
-
-        /**
-         * The minimum length of a GUID generated by the Evernote service
-         */
-        var EDAM_GUID_LEN_MIN: number;
-
-        /**
-         * The maximum length of a GUID generated by the Evernote service
-         */
-        var EDAM_GUID_LEN_MAX: number;
-
-        /**
-         * GUIDs generated by the Evernote service will match the provided pattern
-         */
-        var EDAM_GUID_REGEX: string;
-
-        /**
-         * The minimum length of any email address
-         */
-        var EDAM_EMAIL_LEN_MIN: number;
-
-        /**
-         * The maximum length of any email address
-         */
-        var EDAM_EMAIL_LEN_MAX: number;
-
-        /**
-         * A regular expression that matches the part of an email address before
-         * the '@' symbol.
-         */
-        var EDAM_EMAIL_LOCAL_REGEX: string;
-
-        /**
-         * A regular expression that matches the part of an email address after
-         * the '@' symbol.
-         */
-        var EDAM_EMAIL_DOMAIN_REGEX: string;
-
-        /**
-         * A regular expression that must match any email address given to Evernote.
-         * Email addresses must comply with RFC 2821 and 2822.
-         */
-        var EDAM_EMAIL_REGEX: string;
-
-        /**
-         * A regular expression that must match any VAT ID given to Evernote.
-         * ref http://en.wikipedia.org/wiki/VAT_identification_number
-         * ref http://my.safaribooksonline.com/book/programming/regular-expressions/9780596802837/4dot-validation-and-formatting/id2995136
-         */
-        var EDAM_VAT_REGEX: string;
-
-        /**
-         * The minimum length of a timezone specification string
-         */
-        var EDAM_TIMEZONE_LEN_MIN: number;
-
-        /**
-         * The maximum length of a timezone specification string
-         */
-        var EDAM_TIMEZONE_LEN_MAX: number;
-
-        /**
-         * Any timezone string given to Evernote must match the provided pattern.
-         * This permits either a locale-based standard timezone or a GMT offset.
-         * E.g.:<ul>
-         *        <li>America/Los_Angeles</li>
-         *        <li>GMT+08:00</li>
-         * </ul>
-         */
-        var EDAM_TIMEZONE_REGEX: string;
-
-        /**
-         * The minimum length of any MIME type string given to Evernote
-         */
-        var EDAM_MIME_LEN_MIN: number;
-
-        /**
-         * The maximum length of any MIME type string given to Evernote
-         */
-        var EDAM_MIME_LEN_MAX: number;
-
-        /**
-         * Any MIME type string given to Evernote must match the provided pattern.
-         * E.g.:    image/gif
-         */
-        var EDAM_MIME_REGEX: string;
-
-        /**
-         * Canonical MIME type string for GIF image resources
-         */
-        var EDAM_MIME_TYPE_GIF: string;
-
-        /**
-         * Canonical MIME type string for JPEG image resources
-         */
-        var EDAM_MIME_TYPE_JPEG: string;
-
-        /**
-         * Canonical MIME type string for PNG image resources
-         */
-        var EDAM_MIME_TYPE_PNG: string;
-
-        /**
-         * Canonical MIME type string for WAV audio resources
-         */
-        var EDAM_MIME_TYPE_WAV: string;
-
-        /**
-         * Canonical MIME type string for MP3 audio resources
-         */
-        var EDAM_MIME_TYPE_MP3: string;
-
-        /**
-         * Canonical MIME type string for AMR audio resources
-         */
-        var EDAM_MIME_TYPE_AMR: string;
-
-        /**
-         * Canonical MIME type string for AAC audio resources
-         */
-        var EDAM_MIME_TYPE_AAC: string;
-
-        /**
-         * Canonical MIME type string for MP4 audio resources
-         */
-        var EDAM_MIME_TYPE_M4A: string;
-
-        /**
-         * Canonical MIME type string for MP4 video resources
-         */
-        var EDAM_MIME_TYPE_MP4_VIDEO: string;
-
-        /**
-         * Canonical MIME type string for Evernote Ink resources
-         */
-        var EDAM_MIME_TYPE_INK: string;
-
-        /**
-         * Canonical MIME type string for PDF resources
-         */
-        var EDAM_MIME_TYPE_PDF: string;
-
-        /**
-         * MIME type used for attachments of an unspecified type
-         */
-        var EDAM_MIME_TYPE_DEFAULT: string;
-
-        /**
-         * The set of resource MIME types that are expected to be handled
-         * correctly by all of the major Evernote client applications.
-         */
-        var EDAM_MIME_TYPES: string[];
-
-        /**
-         * The set of MIME types that Evernote will parse and index for
-         * searching. With exception of images, and PDFs, which are
-         * handled in a different way.
-         */
-        var EDAM_INDEXABLE_RESOURCE_MIME_TYPES: string[];
-
-        /**
-         * The minimum length of a user search query string in Unicode chars
-         */
-        var EDAM_SEARCH_QUERY_LEN_MIN: number;
-
-        /**
-         * The maximum length of a user search query string in Unicode chars
-         */
-        var EDAM_SEARCH_QUERY_LEN_MAX: number;
-
-        /**
-         * Search queries must match the provided pattern.    This is used for
-         * both ad-hoc queries and SavedSearch.query fields.
-         * This excludes all control characters and line/paragraph separators.
-         */
-        var EDAM_SEARCH_QUERY_REGEX: string;
-
-        /**
-         * The exact length of a MD5 hash checksum, in binary bytes.
-         * This is the exact length that must be matched for any binary hash
-         * value.
-         */
-        var EDAM_HASH_LEN: number;
-
-        /**
-         * The minimum length of an Evernote username
-         */
-        var EDAM_USER_USERNAME_LEN_MIN: number;
-
-        /**
-         * The maximum length of an Evernote username
-         */
-        var EDAM_USER_USERNAME_LEN_MAX: number;
-
-        /**
-         * Any Evernote User.username field must match this pattern.    This
-         * restricts usernames to a format that could permit use as a domain
-         * name component.    E.g. "username.whatever.evernote.com"
-         */
-        var EDAM_USER_USERNAME_REGEX: string;
-
-        /**
-         * Minimum length of the User.name field
-         */
-        var EDAM_USER_NAME_LEN_MIN: number;
-
-        /**
-         * Maximum length of the User.name field
-         */
-        var EDAM_USER_NAME_LEN_MAX: number;
-
-        /**
-         * The User.name field must match this pattern, which excludes line
-         * endings and control characters.
-         */
-        var EDAM_USER_NAME_REGEX: string;
-
-        /**
-         * The minimum length of a Tag.name, in Unicode characters
-         */
-        var EDAM_TAG_NAME_LEN_MIN: number;
-
-        /**
-         * The maximum length of a Tag.name, in Unicode characters
-         */
-        var EDAM_TAG_NAME_LEN_MAX: number;
-
-        /**
-         * All Tag.name fields must match this pattern.
-         * This excludes control chars, commas or line/paragraph separators.
-         * The string may not begin or end with whitespace.
-         */
-        var EDAM_TAG_NAME_REGEX: string;
-
-        /**
-         * The minimum length of a Note.title, in Unicode characters
-         */
-        var EDAM_NOTE_TITLE_LEN_MIN: number;
-
-        /**
-         * The maximum length of a Note.title, in Unicode characters
-         */
-        var EDAM_NOTE_TITLE_LEN_MAX: number;
-
-        /**
-         * All Note.title fields must match this pattern.
-         * This excludes control chars or line/paragraph separators.
-         * The string may not begin or end with whitespace.
-         */
-        var EDAM_NOTE_TITLE_REGEX: string;
-
-        /**
-         * Minimum length of a Note.content field.
-         * Note.content fields must comply with the ENML DTD.
-         */
-        var EDAM_NOTE_CONTENT_LEN_MIN: number;
-
-        /**
-         * Maximum length of a Note.content field
-         * Note.content fields must comply with the ENML DTD.
-         */
-        var EDAM_NOTE_CONTENT_LEN_MAX: number;
-
-        /**
-         * Minimum length of an application name, which is the key in an
-         * applicationData LazyMap found in entities such as Resources and
-         * Notes.
-         */
-        var EDAM_APPLICATIONDATA_NAME_LEN_MIN: number;
-
-        /**
-         * Maximum length of an application name, which is the key in an
-         * applicationData LazyMap found in entities such as Resources and
-         * Notes.
-         */
-        var EDAM_APPLICATIONDATA_NAME_LEN_MAX: number;
-
-        /**
-         * Minimum length of an applicationData value in a LazyMap, found
-         * in entities such as Resources and Notes.
-         */
-        var EDAM_APPLICATIONDATA_VALUE_LEN_MIN: number;
-
-        /**
-         * Maximum length of an applicationData value in a LazyMap, found
-         * in entities such as Resources and Notes.    Note, however, that
-         * the sum of the size of hte key and value is constrained by
-         * EDAM_APPLICATIONDATA_ENTRY_LEN_MAX, so the maximum length, in
-         * practice, depends upon the key value being used.
-         */
-        var EDAM_APPLICATIONDATA_VALUE_LEN_MAX: number;
-
-        /**
-         * The total length of an entry in an applicationData LazyMap, which
-         * is the sum of the length of the key and the value for the entry.
-         */
-        var EDAM_APPLICATIONDATA_ENTRY_LEN_MAX: number;
-
-        /**
-         * An application name must match this regex.    An application
-         * name is the key portion of an entry in an applicationData
-         * map as found in entities such as Resources and Notes.
-         * Note that even if both the name and value regexes match,
-         * it is still necessary to check the sum of the lengths
-         * against EDAM_APPLICATIONDATA_ENTRY_LEN_MAX.
-         */
-        var EDAM_APPLICATIONDATA_NAME_REGEX: string;
-
-        /**
-         * An applicationData map value must match this regex.
-         * Note that even if both the name and value regexes match,
-         * it is still necessary to check the sum of the lengths
-         * against EDAM_APPLICATIONDATA_ENTRY_LEN_MAX.
-         */
-        var EDAM_APPLICATIONDATA_VALUE_REGEX: string;
-
-        /**
-         * The minimum length of a Notebook.name, in Unicode characters
-         */
-        var EDAM_NOTEBOOK_NAME_LEN_MIN: number;
-
-        /**
-         * The maximum length of a Notebook.name, in Unicode characters
-         */
-        var EDAM_NOTEBOOK_NAME_LEN_MAX: number;
-
-        /**
-         * All Notebook.name fields must match this pattern.
-         * This excludes control chars or line/paragraph separators.
-         * The string may not begin or end with whitespace.
-         */
-        var EDAM_NOTEBOOK_NAME_REGEX: string;
-
-        /**
-         * The minimum length of a Notebook.stack, in Unicode characters
-         */
-        var EDAM_NOTEBOOK_STACK_LEN_MIN: number;
-
-        /**
-         * The maximum length of a Notebook.stack, in Unicode characters
-         */
-        var EDAM_NOTEBOOK_STACK_LEN_MAX: number;
-
-        /**
-         * All Notebook.stack fields must match this pattern.
-         * This excludes control chars or line/paragraph separators.
-         * The string may not begin or end with whitespace.
-         */
-        var EDAM_NOTEBOOK_STACK_REGEX: string;
-
-        /**
-         * The minimum length of a public notebook URI component
-         */
-        var EDAM_PUBLISHING_URI_LEN_MIN: number;
-
-        /**
-         * The maximum length of a public notebook URI component
-         */
-        var EDAM_PUBLISHING_URI_LEN_MAX: number;
-
-        /**
-         * A public notebook URI component must match the provided pattern
-         */
-        var EDAM_PUBLISHING_URI_REGEX: string;
-
-        /**
-         * The set of strings that may not be used as a publishing URI
-         */
-        var EDAM_PUBLISHING_URI_PROHIBITED: string[];
-
-        /**
-         * The minimum length of a Publishing.publicDescription field.
-         */
-        var EDAM_PUBLISHING_DESCRIPTION_LEN_MIN: number;
-
-        /**
-         * The maximum length of a Publishing.publicDescription field.
-         */
-        var EDAM_PUBLISHING_DESCRIPTION_LEN_MAX: number;
-
-        /**
-         * Any public notebook's Publishing.publicDescription field must match
-         * this pattern.
-         * No control chars or line/paragraph separators, and can't start or
-         * end with whitespace.
-         */
-        var EDAM_PUBLISHING_DESCRIPTION_REGEX: string;
-
-        /**
-         * The minimum length of a SavedSearch.name field
-         */
-        var EDAM_SAVED_SEARCH_NAME_LEN_MIN: number;
-
-        /**
-         * The maximum length of a SavedSearch.name field
-         */
-        var EDAM_SAVED_SEARCH_NAME_LEN_MAX: number;
-
-        /**
-         * SavedSearch.name fields must match this pattern.
-         * No control chars or line/paragraph separators, and can't start or
-         * end with whitespace.
-         */
-        var EDAM_SAVED_SEARCH_NAME_REGEX: string;
-
-        /**
-         * The minimum length of an Evernote user password
-         */
-        var EDAM_USER_PASSWORD_LEN_MIN: number;
-
-        /**
-         * The maximum length of an Evernote user password
-         */
-        var EDAM_USER_PASSWORD_LEN_MAX: number;
-
-        /**
-         * Evernote user passwords must match this regular expression
-         */
-        var EDAM_USER_PASSWORD_REGEX: string;
-
-        /**
-         * The maximum length of an Evernote Business URI
-         */
-        var EDAM_BUSINESS_URI_LEN_MAX: number;
-
-        /**
-         * The maximum number of Tags per Note
-         */
-        var EDAM_NOTE_TAGS_MAX: number;
-
-        /**
-         * The maximum number of Resources per Note
-         */
-        var EDAM_NOTE_RESOURCES_MAX: number;
-
-        /**
-         * Maximum number of Tags per account
-         */
-        var EDAM_USER_TAGS_MAX: number;
-
-        /**
-         * Maximum number of Tags per business account.
-         */
-        var EDAM_BUSINESS_TAGS_MAX: number;
-
-        /**
-         * Maximum number of SavedSearches per account
-         */
-        var EDAM_USER_SAVED_SEARCHES_MAX: number;
-
-        /**
-         * Maximum number of Notes per user
-         */
-        var EDAM_USER_NOTES_MAX: number;
-
-        /**
-         * Maximum number of Notes per business account
-         */
-        var EDAM_BUSINESS_NOTES_MAX: number;
-
-        /**
-         * Maximum number of Notebooks per user
-         */
-        var EDAM_USER_NOTEBOOKS_MAX: number;
-
-        /**
-         * Maximum number of Notebooks in a business account
-         */
-        var EDAM_BUSINESS_NOTEBOOKS_MAX: number;
-
-        /**
-         * Maximum number of recent email addresses that are maintained
-         * (see UserAttributes.recentMailedAddresses)
-         */
-        var EDAM_USER_RECENT_MAILED_ADDRESSES_MAX: number;
-
-        /**
-         * The number of emails of any type that can be sent by a user with a Free
-         * account from the service per day.    If an email is sent to two different
-         * recipients, this counts as two emails.
-         */
-        var EDAM_USER_MAIL_LIMIT_DAILY_FREE: number;
-
-        /**
-         * The number of emails of any type that can be sent by a user with a Premium
-         * account from the service per day.    If an email is sent to two different
-         * recipients, this counts as two emails.
-         */
-        var EDAM_USER_MAIL_LIMIT_DAILY_PREMIUM: number;
-
-        /**
-         * The number of bytes of new data that may be uploaded to a Free user's
-         * account each month.
-         */
-        var EDAM_USER_UPLOAD_LIMIT_FREE: number;
-
-        /**
-         * The number of bytes of new data that may be uploaded to a Premium user's
-         * account each month.
-         */
-        var EDAM_USER_UPLOAD_LIMIT_PREMIUM: number;
-
-        /**
-         * The number of bytes of new data that may be uploaded to a Business user's
-         * personal account each month. Note that content uploaded into the Business
-         * notebooks by the user does not count against this limit.
-         */
-        var EDAM_USER_UPLOAD_LIMIT_BUSINESS: number;
-
-        /**
-         * Maximum total size of a Note that can be added to a Free account.
-         * The size of a note is calculated as:
-         * ENML content length (in Unicode characters) plus the sum of all resource
-         * sizes (in bytes).
-         */
-        var EDAM_NOTE_SIZE_MAX_FREE: number;
-
-        /**
-         * Maximum total size of a Note that can be added to a Premium account.
-         * The size of a note is calculated as:
-         * ENML content length (in Unicode characters) plus the sum of all resource
-         * sizes (in bytes).
-         */
-        var EDAM_NOTE_SIZE_MAX_PREMIUM: number;
-
-        /**
-         * Maximum size of a resource, in bytes, for Free accounts
-         */
-        var EDAM_RESOURCE_SIZE_MAX_FREE: number;
-
-        /**
-         * Maximum size of a resource, in bytes, for Premium accounts
-         */
-        var EDAM_RESOURCE_SIZE_MAX_PREMIUM: number;
-
-        /**
-         * Maximum number of linked notebooks per account, for a free
-         * account.
-         */
-        var EDAM_USER_LINKED_NOTEBOOK_MAX: number;
-
-        /**
-         * Maximum number of linked notebooks per account, for a premium
-         * account.    Users who are part of an active business are also
-         * covered under "premium".
-         */
-        var EDAM_USER_LINKED_NOTEBOOK_MAX_PREMIUM: number;
-
-        /**
-         * Maximum number of shared notebooks per notebook
-         */
-        var EDAM_NOTEBOOK_SHARED_NOTEBOOK_MAX: number;
-
-        /**
-         * The minimum length of the content class attribute of a note.
-         */
-        var EDAM_NOTE_CONTENT_CLASS_LEN_MIN: number;
-
-        /**
-         * The maximum length of the content class attribute of a note.
-         */
-        var EDAM_NOTE_CONTENT_CLASS_LEN_MAX: number;
-
-        /**
-         * The regular expression that the content class of a note must match
-         * to be valid.
-         */
-        var EDAM_NOTE_CONTENT_CLASS_REGEX: string;
-
-        /**
-         * The content class prefix used for all notes created by Evernote Hello.
-         * This prefix can be used to assemble individual content class strings,
-         * or can be used to create a wildcard search to get all notes created by
-         * Hello. When performing a wildcard search via filtered sync chunks or
-         * search strings, the * character must be appended to this constant.
-         */
-        var EDAM_HELLO_APP_CONTENT_CLASS_PREFIX: string;
-
-        /**
-         * The content class prefix used for all notes created by Evernote Food.
-         * This prefix can be used to assemble individual content class strings,
-         * or can be used to create a wildcard search to get all notes created by
-         * Food. When performing a wildcard search via filtered sync chunks or
-         * search strings, the * character must be appended to this constant.
-         */
-        var EDAM_FOOD_APP_CONTENT_CLASS_PREFIX: string;
-
-        /**
-         * The content class prefix used for structured notes created by Evernote
-         * Hello that represents an encounter with a person. When performing a
-         * wildcard search via filtered sync chunks or search strings, the *
-         * character must be appended to this constant.
-         */
-        var EDAM_CONTENT_CLASS_HELLO_ENCOUNTER: string;
-
-        /**
-         * The content class prefix used for structured notes created by Evernote
-         * Hello that represents the user's profile. When performing a
-         * wildcard search via filtered sync chunks or search strings, the *
-         * character must be appended to this constant.
-         */
-        var EDAM_CONTENT_CLASS_HELLO_PROFILE: string;
-
-        /**
-         * The content class prefix used for structured notes created by
-         * Evernote Food that captures the experience of a particular meal.
-         * When performing a wildcard search via filtered sync chunks or search
-         * strings, the * character must be appended to this constant.
-         */
-        var EDAM_CONTENT_CLASS_FOOD_MEAL: string;
-
-        /**
-         * The content class prefix used for structured notes created by Evernote
-         * Skitch. When performing a wildcard search via filtered sync chunks
-         * or search strings, the * character must be appended to this constant.
-         */
-        var EDAM_CONTENT_CLASS_SKITCH_PREFIX: string;
-
-        /**
-         * The content class value used for structured image notes created by Evernote
-         * Skitch.
-         */
-        var EDAM_CONTENT_CLASS_SKITCH: string;
-
-        /**
-         * The content class value used for structured PDF notes created by Evernote
-         * Skitch.
-         */
-        var EDAM_CONTENT_CLASS_SKITCH_PDF: string;
-
-        /**
-         * The content class prefix used for structured notes created by Evernote
-         * Penultimate. When performing a wildcard search via filtered sync chunks
-         * or search strings, the * character must be appended to this constant.
-         */
-        var EDAM_CONTENT_CLASS_PENULTIMATE_PREFIX: string;
-
-        /**
-         * The content class value used for structured notes created by Evernote
-         * Penultimate that represents a Penultimate notebook.
-         */
-        var EDAM_CONTENT_CLASS_PENULTIMATE_NOTEBOOK: string;
-
-        /**
-         * The minimum length of the plain text in a findRelated query, assuming that
-         * plaintext is being provided.
-         */
-        var EDAM_RELATED_PLAINTEXT_LEN_MIN: number;
-
-        /**
-         * The maximum length of the plain text in a findRelated query, assuming that
-         * plaintext is being provided.
-         */
-        var EDAM_RELATED_PLAINTEXT_LEN_MAX: number;
-
-        /**
-         * The maximum number of notes that will be returned from a findRelated()
-         * query.
-         */
-        var EDAM_RELATED_MAX_NOTES: number;
-
-        /**
-         * The maximum number of notebooks that will be returned from a findRelated()
-         * query.
-         */
-        var EDAM_RELATED_MAX_NOTEBOOKS: number;
-
-        /**
-         * The maximum number of tags that will be returned from a findRelated() query.
-         */
-        var EDAM_RELATED_MAX_TAGS: number;
-
-        /**
-         * The minimum length, in Unicode characters, of a description for a business
-         * notebook.
-         */
-        var EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_LEN_MIN: number;
-
-        /**
-         * The maximum length, in Unicode characters, of a description for a business
-         * notebook.
-         */
-        var EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_LEN_MAX: number;
-
-        /**
-         * All business notebook descriptions must match this pattern.
-         * This excludes control chars or line/paragraph separators.
-         * The string may not begin or end with whitespace.
-         */
-        var EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_REGEX: string;
-
-        /**
-         * The maximum length of a business phone number.
-         */
-        var EDAM_BUSINESS_PHONE_NUMBER_LEN_MAX: number;
-
-        /**
-         * Minimum length of a preference name
-         */
-        var EDAM_PREFERENCE_NAME_LEN_MIN: number;
-
-        /**
-         * Maximum length of a preference name
-         */
-        var EDAM_PREFERENCE_NAME_LEN_MAX: number;
-
-        /**
-         * Minimum length of a preference value
-         */
-        var EDAM_PREFERENCE_VALUE_LEN_MIN: number;
-
-        /**
-         * Maximum length of a preference value
-         */
-        var EDAM_PREFERENCE_VALUE_LEN_MAX: number;
-
-        /**
-         * Maximum number of name/value pairs allowed
-         */
-        var EDAM_MAX_PREFERENCES: number;
-
-        /**
-         * Maximum number of values per preference name
-         */
-        var EDAM_MAX_VALUES_PER_PREFERENCE: number;
-
-        /**
-         * A preference name must match this regex.
-         */
-        var EDAM_PREFERENCE_NAME_REGEX: string;
-
-        /**
-         * A preference value must match this regex.
-         */
-        var EDAM_PREFERENCE_VALUE_REGEX: string;
-
-        /**
-         * The name of the preferences entry that contains shortcuts.
-         */
-        var EDAM_PREFERENCE_SHORTCUTS: string;
-
-        /**
-         * The maximum number of shortcuts that a user may have.
-         */
-        var EDAM_PREFERENCE_SHORTCUTS_MAX_VALUES: number;
-
-        /**
-         * Maximum length of the device identifier string associated with long sessions.
-         */
-        var EDAM_DEVICE_ID_LEN_MAX: number;
-
-        /**
-         * Regular expression for device identifier strings associated with long sessions.
-         */
-        var EDAM_DEVICE_ID_REGEX: string;
-
-        /**
-         * Maximum length of the device description string associated with long sessions.
-         */
-        var EDAM_DEVICE_DESCRIPTION_LEN_MAX: number;
-
-        /**
-         * Regular expression for device description strings associated with long sessions.
-         */
-        var EDAM_DEVICE_DESCRIPTION_REGEX: string;
-
-        /**
-         * Maximum number of search suggestions that can be returned
-         */
-        var EDAM_SEARCH_SUGGESTIONS_MAX: number;
-
-        /**
-         * Maximum length of the search suggestion prefix
-         */
-        var EDAM_SEARCH_SUGGESTIONS_PREFIX_LEN_MAX: number;
-
-        /**
-         * Minimum length of the search suggestion prefix
-         */
-        var EDAM_SEARCH_SUGGESTIONS_PREFIX_LEN_MIN: number;
-        class NoteStoreClient {
-            seqid: number;
-
-            /**
-             * Asks the NoteStore to provide information about the status of the user
-             * account corresponding to the provided authentication token.
-             */
-            getSyncState(cb: Callback<SyncState>): void;
-
-            /**
-             * Asks the NoteStore to provide information about the status of the user
-             * account corresponding to the provided authentication token.
-             * This version of 'getSyncState' allows the client to upload coarse-
-             * grained usage metrics to the service.
-             *
-             * @param clientMetrics    see the documentation of the ClientUsageMetrics
-             *     structure for an explanation of the fields that clients can pass to
-             *     the service.
-             */
-            getSyncStateWithMetrics(clientMetrics: ClientUsageMetrics, cb: Callback<SyncState>): void;
-
-            /**
-             * Asks the NoteStore to provide the state of the account in order of
-             * last modification.    This request retrieves one block of the server's
-             * state so that a client can make several small requests against a large
-             * account rather than getting the entire state in one big message.
-             * This call gives fine-grained control of the data that will
-             * be received by a client by omitting data elements that a client doesn't
-             * need. This may reduce network traffic and sync times.
-             *
-             * @param afterUSN
-             *     The client can pass this value to ask only for objects that
-             *     have been updated after a certain point.    This allows the client to
-             *     receive updates after its last checkpoint rather than doing a full
-             *     synchronization on every pass.    The default value of "0" indicates
-             *     that the client wants to get objects from the start of the account.
-             *
-             * @param maxEntries
-             *     The maximum number of modified objects that should be
-             *     returned in the result SyncChunk.    This can be used to limit the size
-             *     of each individual message to be friendly for network transfer.
-             *
-             * @param filter
-             *     The caller must set some of the flags in this structure to specify which
-             *     data types should be returned during the synchronization.    See
-             *     the SyncChunkFilter structure for information on each flag.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "afterUSN" - if negative
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "maxEntries" - if less than 1
-             *     </li>
-             * </ul>
-             */
-            getFilteredSyncChunk(afterUSN: number, maxEntries: number, filter: SyncChunkFilter, cb: Callback<SyncState>): void;
-
-            /**
-             * Asks the NoteStore to provide information about the status of a linked
-             * notebook that has been shared with the caller, or that is public to the
-             * world.
-             * This will return a result that is similar to getSyncState, but may omit
-             * SyncState.uploaded if the caller doesn't have permission to write to
-             * the linked notebook.
-             *
-             * This function must be called on the shard that owns the referenced
-             * notebook.    (I.e. the shardId in /shard/shardId/edam/note must be the
-             * same as LinkedNotebook.shardId.)
-             *
-             * @param authenticationToken
-             *     This should be an authenticationToken for the guest who has received
-             *     the invitation to the share.    (I.e. this should not be the result of
-             *     NoteStore.authenticateToSharedNotebook)
-             *
-             * @param linkedNotebook
-             *     This structure should contain identifying information and permissions
-             *     to access the notebook in question.
-             */
-            getLinkedNotebookSyncState(linkedNotebook: LinkedNotebook, cb: Callback<SyncState>): void;
-
-            /**
-             * Asks the NoteStore to provide information about the contents of a linked
-             * notebook that has been shared with the caller, or that is public to the
-             * world.
-             * This will return a result that is similar to getSyncChunk, but will only
-             * contain entries that are visible to the caller.    I.e. only that particular
-             * Notebook will be visible, along with its Notes, and Tags on those Notes.
-             *
-             * This function must be called on the shard that owns the referenced
-             * notebook.    (I.e. the shardId in /shard/shardId/edam/note must be the
-             * same as LinkedNotebook.shardId.)
-             *
-             * @param authenticationToken
-             *     This should be an authenticationToken for the guest who has received
-             *     the invitation to the share.    (I.e. this should not be the result of
-             *     NoteStore.authenticateToSharedNotebook)
-             *
-             * @param linkedNotebook
-             *     This structure should contain identifying information and permissions
-             *     to access the notebook in question.    This must contain the valid fields
-             *     for either a shared notebook (e.g. shareKey)
-             *     or a public notebook (e.g. username, uri)
-             *
-             * @param afterUSN
-             *     The client can pass this value to ask only for objects that
-             *     have been updated after a certain point.    This allows the client to
-             *     receive updates after its last checkpoint rather than doing a full
-             *     synchronization on every pass.    The default value of "0" indicates
-             *     that the client wants to get objects from the start of the account.
-             *
-             * @param maxEntries
-             *     The maximum number of modified objects that should be
-             *     returned in the result SyncChunk.    This can be used to limit the size
-             *     of each individual message to be friendly for network transfer.
-             *     Applications should not request more than 256 objects at a time,
-             *     and must handle the case where the service returns less than the
-             *     requested number of objects in a given request even though more
-             *     objects are available on the service.
-             *
-             * @param fullSyncOnly
-             *     If true, then the client only wants initial data for a full sync.
-             *     In this case, the service will not return any expunged objects,
-             *     and will not return any Resources, since these are also provided
-             *     in their corresponding Notes.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "afterUSN" - if negative
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "maxEntries" - if less than 1
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "LinkedNotebook" - if the provided information doesn't match any
-             *         valid notebook
-             *     </li>
-             *     <li> "LinkedNotebook.uri" - if the provided public URI doesn't match any
-             *         valid notebook
-             *     </li>
-             *     <li> "SharedNotebook.id" - if the provided information indicates a
-             *            shared notebook that no longer exists
-             *     </li>
-             * </ul>
-             */
-            getLinkedNotebookSyncChunk(linkedNotebook: LinkedNotebook, afterUSN: number, maxEntries: number, fullSyncOnly: boolean, cb: Callback<SyncChunk>): void;
-
-            /**
-             * Returns a list of all of the notebooks in the account.
-             */
-            listNotebooks(cb: Callback<Notebook[]>): void;
-
-            /**
-             * Returns the current state of the notebook with the provided GUID.
-             * The notebook may be active or deleted (but not expunged).
-             *
-             * @param guid
-             *     The GUID of the notebook to be retrieved.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Notebook.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Notebook" - private notebook, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Notebook.guid" - tag not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            getNotebook(guid: string, cb: Callback<Notebook>): void;
-
-            /**
-             * Returns the notebook that should be used to store new notes in the
-             * user's account when no other notebooks are specified.
-             */
-            getDefaultNotebook(cb: Callback<Notebook>): void;
-
-            /**
-             * Asks the service to make a notebook with the provided name.
-             *
-             * @param notebook
-             *     The desired fields for the notebook must be provided on this
-             *     object.    The name of the notebook must be set, and either the 'active'
-             *     or 'defaultNotebook' fields may be set by the client at creation.
-             *     If a notebook exists in the account with the same name (via
-             *     case-insensitive compare), this will throw an EDAMUserException.
-             *
-             * @return
-             *     The newly created Notebook.    The server-side GUID will be
-             *     saved in this object's 'guid' field.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Notebook.name" - invalid length or pattern
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Notebook.stack" - invalid length or pattern
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Publishing.uri" - if publishing set but bad uri
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Publishing.publicDescription" - if too long
-             *     </li>
-             *     <li> DATA_CONFLICT "Notebook.name" - name already in use
-             *     </li>
-             *     <li> DATA_CONFLICT "Publishing.uri" - if URI already in use
-             *     </li>
-             *     <li> DATA_REQUIRED "Publishing.uri" - if publishing set but uri missing
-             *     </li>
-             *     <li> LIMIT_REACHED "Notebook" - at max number of notebooks
-             *     </li>
-             * </ul>
-             */
-            createNotebook(notebook: Notebook, cb: Callback<Notebook>): void;
-
-            /**
-             * Submits notebook changes to the service.    The provided data must include
-             * the notebook's guid field for identification.
-             *
-             * @param notebook
-             *     The notebook object containing the requested changes.
-             *
-             * @return
-             *     The Update Sequence Number for this change within the account.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Notebook.name" - invalid length or pattern
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Notebook.stack" - invalid length or pattern
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Publishing.uri" - if publishing set but bad uri
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Publishing.publicDescription" - if too long
-             *     </li>
-             *     <li> DATA_CONFLICT "Notebook.name" - name already in use
-             *     </li>
-             *     <li> DATA_CONFLICT "Publishing.uri" - if URI already in use
-             *     </li>
-             *     <li> DATA_REQUIRED "Publishing.uri" - if publishing set but uri missing
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Notebook.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            updateNotebook(notebook: Notebook, cb: Callback<number>): void;
-
-            /**
-             * Permanently removes the notebook from the user's account.
-             * After this action, the notebook is no longer available for undeletion, etc.
-             * If the notebook contains any Notes, they will be moved to the current
-             * default notebook and moved into the trash (i.e. Note.active=false).
-             * <p/>
-             * NOTE: This function is generally not available to third party applications.
-             * Calls will result in an EDAMUserException with the error code
-             * PERMISSION_DENIED.
-             *
-             * @param guid
-             *     The GUID of the notebook to delete.
-             *
-             * @return
-             *     The Update Sequence Number for this change within the account.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Notebook.guid" - if the parameter is missing
-             *     </li>
-             *     <li> LIMIT_REACHED "Notebook" - trying to expunge the last Notebook
-             *     </li>
-             *     <li> PERMISSION_DENIED "Notebook" - private notebook, user doesn't own
-             *     </li>
-             * </ul>
-             */
-            expungeNotebook(guid: string, cb: Callback<number>): void;
-
-            /**
-             * Returns a list of the tags in the account.    Evernote does not support
-             * the undeletion of tags, so this will only include active tags.
-             */
-            listTags(cb: Callback<Tag[]>): void;
-
-            /**
-             * Returns a list of the tags that are applied to at least one note within
-             * the provided notebook.    If the notebook is public, the authenticationToken
-             * may be ignored.
-             *
-             * @param notebookGuid
-             *        the GUID of the notebook to use to find tags
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Notebook.guid" - notebook not found by GUID
-             *     </li>
-             * </ul>
-             */
-            listTagsByNotebook(notebookGuid: string, cb: Callback<Tag[]>): void;
-
-            /**
-             * Returns the current state of the Tag with the provided GUID.
-             *
-             * @param guid
-             *     The GUID of the tag to be retrieved.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Tag.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Tag" - private Tag, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Tag.guid" - tag not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            getTag(guid: string, cb: Callback<Tag>): void;
-
-            /**
-             * Asks the service to make a tag with a set of information.
-             *
-             * @param tag
-             *     The desired list of fields for the tag are specified in this
-             *     object.    The caller must specify the tag name, and may provide
-             *     the parentGUID.
-             *
-             * @return
-             *     The newly created Tag.    The server-side GUID will be
-             *     saved in this object.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Tag.name" - invalid length or pattern
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Tag.parentGuid" - malformed GUID
-             *     </li>
-             *     <li> DATA_CONFLICT "Tag.name" - name already in use
-             *     </li>
-             *     <li> LIMIT_REACHED "Tag" - at max number of tags
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Tag.parentGuid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            createTag(tag: Tag, cb: Callback<Tag>): void;
-
-            /**
-             * Submits tag changes to the service.    The provided data must include
-             * the tag's guid field for identification.    The service will apply
-             * updates to the following tag fields:    name, parentGuid
-             *
-             * @param tag
-             *     The tag object containing the requested changes.
-             *
-             * @return
-             *     The Update Sequence Number for this change within the account.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Tag.name" - invalid length or pattern
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Tag.parentGuid" - malformed GUID
-             *     </li>
-             *     <li> DATA_CONFLICT "Tag.name" - name already in use
-             *     </li>
-             *     <li> DATA_CONFLICT "Tag.parentGuid" - can't set parent: circular
-             *     </li>
-             *     <li> PERMISSION_DENIED "Tag" - user doesn't own tag
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Tag.guid" - tag not found, by GUID
-             *     </li>
-             *     <li> "Tag.parentGuid" - parent not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            updateTag(tag: Tag, cb: Callback<number>): void;
-
-            /**
-             * Removes the provided tag from every note that is currently tagged with
-             * this tag.    If this operation is successful, the tag will still be in
-             * the account, but it will not be tagged on any notes.
-             *
-             * This function is not indended for use by full synchronizing clients, since
-             * it does not provide enough result information to the client to reconcile
-             * the local state without performing a follow-up sync from the service.    This
-             * is intended for "thin clients" that need to efficiently support this as
-             * a UI operation.
-             *
-             * @param guid
-             *     The GUID of the tag to remove from all notes.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Tag.guid" - if the guid parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Tag" - user doesn't own tag
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Tag.guid" - tag not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            untagAll(guid: string, cb: Callback<void>): void;
-
-            /**
-             * Permanently deletes the tag with the provided GUID, if present.
-             * <p/>
-             * NOTE: This function is generally not available to third party applications.
-             * Calls will result in an EDAMUserException with the error code
-             * PERMISSION_DENIED.
-             *
-             * @param guid
-             *     The GUID of the tag to delete.
-             *
-             * @return
-             *     The Update Sequence Number for this change within the account.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Tag.guid" - if the guid parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Tag" - user doesn't own tag
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Tag.guid" - tag not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            expungeTag(guid: string, cb: Callback<number>): void;
-
-            /**
-             * Returns a list of the searches in the account.    Evernote does not support
-             * the undeletion of searches, so this will only include active searches.
-             */
-            listSearches(cb: Callback<SavedSearch[]>): void;
-
-            /**
-             * Returns the current state of the search with the provided GUID.
-             *
-             * @param guid
-             *     The GUID of the search to be retrieved.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "SavedSearch.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "SavedSearch" - private Tag, user doesn't own
-             *     </li>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "SavedSearch.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            getSearch(guid: string, cb: Callback<SavedSearch>): void;
-
-            /**
-             * Asks the service to make a saved search with a set of information.
-             *
-             * @param search
-             *     The desired list of fields for the search are specified in this
-             *     object. The caller must specify the name and query for the
-             *     search, and may optionally specify a search scope.
-             *     The SavedSearch.format field is ignored by the service.
-             *
-             * @return
-             *     The newly created SavedSearch.    The server-side GUID will be
-             *     saved in this object.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "SavedSearch.name" - invalid length or pattern
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "SavedSearch.query" - invalid length
-             *     </li>
-             *     <li> DATA_CONFLICT "SavedSearch.name" - name already in use
-             *     </li>
-             *     <li> LIMIT_REACHED "SavedSearch" - at max number of searches
-             *     </li>
-             * </ul>
-             */
-            createSearch(search: SavedSearch, cb: Callback<SavedSearch>): void;
-
-            /**
-             * Submits search changes to the service. The provided data must include
-             * the search's guid field for identification. The service will apply
-             * updates to the following search fields: name, query, and scope.
-             *
-             * @param search
-             *     The search object containing the requested changes.
-             *
-             * @return
-             *     The Update Sequence Number for this change within the account.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "SavedSearch.name" - invalid length or pattern
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "SavedSearch.query" - invalid length
-             *     </li>
-             *     <li> DATA_CONFLICT "SavedSearch.name" - name already in use
-             *     </li>
-             *     <li> PERMISSION_DENIED "SavedSearch" - user doesn't own tag
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "SavedSearch.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            updateSearch(search: SavedSearch, cb: Callback<number>): number;
-
-            /**
-             * Permanently deletes the saved search with the provided GUID, if present.
-             * <p/>
-             * NOTE: This function is generally not available to third party applications.
-             * Calls will result in an EDAMUserException with the error code
-             * PERMISSION_DENIED.
-             *
-             * @param guid
-             *     The GUID of the search to delete.
-             *
-             * @return
-             *     The Update Sequence Number for this change within the account.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "SavedSearch.guid" - if the guid parameter is empty
-             *     </li>
-             *     <li> PERMISSION_DENIED "SavedSearch" - user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "SavedSearch.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            expungeSearch(guid: string, cb: Callback<number>): void;
-
-            /**
-             * DEPRECATED. Use findNotesMetadata.
-             */
-            findNotes(filter: NoteFilter, offset: number, maxNotes: number, cb: Callback<NoteList>): void;
-
-            /**
-             * Finds the position of a note within a sorted subset of all of the user's
-             * notes. This may be useful for thin clients that are displaying a paginated
-             * listing of a large account, which need to know where a particular note
-             * sits in the list without retrieving all notes first.
-             *
-             * @param authenticationToken
-             *     Must be a valid token for the user's account unless the NoteFilter
-             *     'notebookGuid' is the GUID of a public notebook.
-             *
-             * @param filter
-             *     The list of criteria that will constrain the notes to be returned.
-             *
-             * @param guid
-             *     The GUID of the note to be retrieved.
-             *
-             * @return
-             *     If the note with the provided GUID is found within the matching note
-             *     list, this will return the offset of that note within that list (where
-             *     the first offset is 0).    If the note is not found within the set of
-             *     notes, this will return -1.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "offset" - not between 0 and EDAM_USER_NOTES_MAX
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "maxNotes" - not between 0 and EDAM_USER_NOTES_MAX
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.notebookGuid" - if malformed
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.tagGuids" - if any are malformed
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.words" - if search string too long
-             *     </li>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Notebook.guid" - not found, by GUID
-             *     </li>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            findNoteOffset(filter: NoteFilter, guid: string, cb: Callback<number>): void;
-
-            /**
-             * Used to find the high-level information about a set of the notes from a
-             * user's account based on various criteria specified via a NoteFilter object.
-             * <p/>
-             * Web applications that wish to periodically check for new content in a user's
-             * Evernote account should consider using webhooks instead of polling this API.
-             * See http://dev.evernote.com/documentation/cloud/chapters/polling_notification.php
-             * for more information.
-             *
-             * @param authenticationToken
-             *     Must be a valid token for the user's account unless the NoteFilter
-             *     'notebookGuid' is the GUID of a public notebook.
-             *
-             * @param filter
-             *     The list of criteria that will constrain the notes to be returned.
-             *
-             * @param offset
-             *     The numeric index of the first note to show within the sorted
-             *     results.    The numbering scheme starts with "0".    This can be used for
-             *     pagination.
-             *
-             * @param maxNotes
-             *     The mximum notes to return in this query.    The service will return a set
-             *     of notes that is no larger than this number, but may return fewer notes
-             *     if needed.    The NoteList.totalNotes field in the return value will
-             *     indicate whether there are more values available after the returned set.
-             *
-             * @param resultSpec
-             *     This specifies which information should be returned for each matching
-             *     Note. The fields on this structure can be used to eliminate data that
-             *     the client doesn't need, which will reduce the time and bandwidth
-             *     to receive and process the reply.
-             *
-             * @return
-             *     The list of notes that match the criteria.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "offset" - not between 0 and EDAM_USER_NOTES_MAX
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "maxNotes" - not between 0 and EDAM_USER_NOTES_MAX
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.notebookGuid" - if malformed
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.tagGuids" - if any are malformed
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.words" - if search string too long
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Notebook.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            findNotesMetadata(filter: NoteFilter, offset: number, maxNotes: number, resultSpec: NotesMetadataResultSpec, cb: Callback<NotesMetadataList>): void;
-
-            /**
-             * This function is used to determine how many notes are found for each
-             * notebook and tag in the user's account, given a current set of filter
-             * parameters that determine the current selection.    This function will
-             * return a structure that gives the note count for each notebook and tag
-             * that has at least one note under the requested filter.    Any notebook or
-             * tag that has zero notes in the filtered set will not be listed in the
-             * reply to this function (so they can be assumed to be 0).
-             *
-             * @param authenticationToken
-             *     Must be a valid token for the user's account unless the NoteFilter
-             *     'notebookGuid' is the GUID of a public notebook.
-             *
-             * @param filter
-             *     The note selection filter that is currently being applied.    The note
-             *     counts are to be calculated with this filter applied to the total set
-             *     of notes in the user's account.
-             *
-             * @param withTrash
-             *     If true, then the NoteCollectionCounts.trashCount will be calculated
-             *     and supplied in the reply. Otherwise, the trash value will be omitted.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.notebookGuid" - if malformed
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.notebookGuids" - if any are malformed
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.words" - if search string too long
-             *     </li>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Notebook.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            findNoteCounts(filter: NoteFilter, withTrash: boolean, cb: Callback<NoteCollectionCounts>): void;
-
-            /**
-             * Returns the current state of the note in the service with the provided
-             * GUID.    The ENML contents of the note will only be provided if the
-             * 'withContent' parameter is true.    The service will include the meta-data
-             * for each resource in the note, but the binary contents of the resources
-             * and their recognition data will be omitted.
-             * If the Note is found in a public notebook, the authenticationToken
-             * will be ignored (so it could be an empty string).    The applicationData
-             * fields are returned as keysOnly.
-             *
-             * @param guid
-             *     The GUID of the note to be retrieved.
-             *
-             * @param withContent
-             *     If true, the note will include the ENML contents of its
-             *     'content' field.
-             *
-             * @param withResourcesData
-             *     If true, any Resource elements in this Note will include the binary
-             *     contents of their 'data' field's body.
-             *
-             * @param withResourcesRecognition
-             *     If true, any Resource elements will include the binary contents of the
-             *     'recognition' field's body if recognition data is present.
-             *
-             * @param withResourcesAlternateData
-             *     If true, any Resource elements in this Note will include the binary
-             *     contents of their 'alternateData' fields' body, if an alternate form
-             *     is present.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            getNote(guid: string, withContent: boolean, withResourcesData: boolean, withResourcesRecognition: boolean, withResourcesAlternateData: boolean, cb: Callback<Note>): void;
-
-            /**
-             * Get all of the application data for the note identified by GUID,
-             * with values returned within the LazyMap fullMap field.
-             * If there are no applicationData entries, then a LazyMap
-             * with an empty fullMap will be returned. If your application
-             * only needs to fetch its own applicationData entry, use
-             * getNoteApplicationDataEntry instead.
-             */
-            getNoteApplicationData(guid: string, cb: Callback<LazyMap>): void;
-
-            /**
-             * Get the value of a single entry in the applicationData map
-             * for the note identified by GUID.
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - note not found, by GUID</li>
-             *     <li> "NoteAttributes.applicationData.key" - note not found, by key</li>
-             * </ul>
-             */
-            getNoteApplicationDataEntry(guid: string, key: string, cb: Callback<string>): void;
-
-            /**
-             * Update, or create, an entry in the applicationData map for
-             * the note identified by guid.
-             */
-            setNoteApplicationDataEntry(guid: string, key: string, value: string, cb: Callback<number>): void;
-
-            /**
-             * Remove an entry identified by 'key' from the applicationData map for
-             * the note identified by 'guid'. Silently ignores an unset of a
-             * non-existing key.
-             */
-            unsetNoteApplicationDataEntry(guid: string, key: string, cb: Callback<number>): void;
-
-            /**
-             * Returns XHTML contents of the note with the provided GUID.
-             * If the Note is found in a public notebook, the authenticationToken
-             * will be ignored (so it could be an empty string).
-             *
-             * @param guid
-             *     The GUID of the note to be retrieved.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            getNoteContent(guid: string, cb: Callback<string>): void;
-
-            /**
-             * Returns a block of the extracted plain text contents of the note with the
-             * provided GUID.    This text can be indexed for search purposes by a light
-             * client that doesn't have capabilities to extract all of the searchable
-             * text content from the note and its resources.
-             *
-             * If the Note is found in a public notebook, the authenticationToken
-             * will be ignored (so it could be an empty string).
-             *
-             * @param guid
-             *     The GUID of the note to be retrieved.
-             *
-             * @param noteOnly
-             *     If true, this will only return the text extracted from the ENML contents
-             *     of the note itself.    If false, this will also include the extracted text
-             *     from any text-bearing resources (PDF, recognized images)
-             *
-             * @param tokenizeForIndexing
-             *     If true, this will break the text into cleanly separated and sanitized
-             *     tokens.    If false, this will return the more raw text extraction, with
-             *     its original punctuation, capitalization, spacing, etc.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            getNoteSearchText(guid: string, noteOnly: boolean, tokenizeForIndexing: boolean, cb: Callback<string>): void;
-
-            /**
-             * Returns a block of the extracted plain text contents of the resource with
-             * the provided GUID.    This text can be indexed for search purposes by a light
-             * client that doesn't have capability to extract all of the searchable
-             * text content from a resource.
-             *
-             * If the Resource is found in a public notebook, the authenticationToken
-             * will be ignored (so it could be an empty string).
-             *
-             * @param guid
-             *     The GUID of the resource to be retrieved.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Resource.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            getResourceSearchText(guid: string, cb: Callback<string>): void;
-
-            /**
-             * Returns a list of the names of the tags for the note with the provided
-             * guid.    This can be used with authentication to get the tags for a
-             * user's own note, or can be used without valid authentication to retrieve
-             * the names of the tags for a note in a public notebook.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            getNoteTagNames(guid: string, cb: Callback<string[]>): void;
-
-            /**
-             * Asks the service to make a note with the provided set of information.
-             *
-             * @param note
-             *     A Note object containing the desired fields to be populated on
-             *     the service.
-             *
-             * @return
-             *     The newly created Note from the service.    The server-side
-             *     GUIDs for the Note and any Resources will be saved in this object.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Note.title" - invalid length or pattern
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Note.content" - invalid length for ENML content
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Resource.mime" - invalid resource MIME type
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteAttributes.*" - bad resource string
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "ResourceAttributes.*" - bad resource string
-             *     </li>
-             *     <li> DATA_CONFLICT "Note.deleted" - deleted time set on active note
-             *     </li>
-             *     <li> DATA_REQUIRED "Resource.data" - resource data body missing
-             *     </li>
-             *     <li> ENML_VALIDATION "*" - note content doesn't validate against DTD
-             *     </li>
-             *     <li> LIMIT_REACHED "Note" - at max number per account
-             *     </li>
-             *     <li> LIMIT_REACHED "Note.size" - total note size too large
-             *     </li>
-             *     <li> LIMIT_REACHED "Note.resources" - too many resources on Note
-             *     </li>
-             *     <li> LIMIT_REACHED "Note.tagGuids" - too many Tags on Note
-             *     </li>
-             *     <li> LIMIT_REACHED "Resource.data.size" - resource too large
-             *     </li>
-             *     <li> LIMIT_REACHED "NoteAttribute.*" - attribute string too long
-             *     </li>
-             *     <li> LIMIT_REACHED "ResourceAttribute.*" - attribute string too long
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note.notebookGuid" - NB not owned by user
-             *     </li>
-             *     <li> QUOTA_REACHED "Accounting.uploadLimit" - note exceeds upload quota
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Tag.name" - Note.tagNames was provided, and one
-             *         of the specified tags had an invalid length or pattern
-             *     </li>
-             *     <li> LIMIT_REACHED "Tag" - Note.tagNames was provided, and the required
-             *         new tags would exceed the maximum number per account
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.notebookGuid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            createNote(note: Note, cb: Callback<Note>): void;
-
-            /**
-             * Submit a set of changes to a note to the service.    The provided data
-             * must include the note's guid field for identification. The note's
-             * title must also be set.
-             *
-             * @param note
-             *     A Note object containing the desired fields to be populated on
-             *     the service. With the exception of the note's title and guid, fields
-             *     that are not being changed do not need to be set. If the content is not
-             *     being modified, note.content should be left unset. If the list of
-             *     resources is not being modified, note.resources should be left unset.
-             *
-             * @return
-             *     The metadata (no contents) for the Note on the server after the update
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Note.title" - invalid length or pattern
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Note.content" - invalid length for ENML body
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteAttributes.*" - bad resource string
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "ResourceAttributes.*" - bad resource string
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Resource.mime" - invalid resource MIME type
-             *     </li>
-             *     <li> DATA_CONFLICT "Note.deleted" - deleted time set on active note
-             *     </li>
-             *     <li> DATA_REQUIRED "Resource.data" - resource data body missing
-             *     </li>
-             *     <li> ENML_VALIDATION "*" - note content doesn't validate against DTD
-             *     </li>
-             *     <li> LIMIT_REACHED "Note.tagGuids" - too many Tags on Note
-             *     </li>
-             *     <li> LIMIT_REACHED "Note.resources" - too many resources on Note
-             *     </li>
-             *     <li> LIMIT_REACHED "Note.size" - total note size too large
-             *     </li>
-             *     <li> LIMIT_REACHED "Resource.data.size" - resource too large
-             *     </li>
-             *     <li> LIMIT_REACHED "NoteAttribute.*" - attribute string too long
-             *     </li>
-             *     <li> LIMIT_REACHED "ResourceAttribute.*" - attribute string too long
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note" - user doesn't own
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note.notebookGuid" - user doesn't own destination
-             *     </li>
-             *     <li> QUOTA_REACHED "Accounting.uploadLimit" - note exceeds upload quota
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Tag.name" - Note.tagNames was provided, and one
-             *         of the specified tags had an invalid length or pattern
-             *     </li>
-             *     <li> LIMIT_REACHED "Tag" - Note.tagNames was provided, and the required
-             *         new tags would exceed the maximum number per account
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - note not found, by GUID
-             *     </li>
-             *     <li> "Note.notebookGuid" - if notebookGuid provided, but not found
-             *     </li>
-             * </ul>
-             */
-            updateNote(note: Note, cb: Callback<Note>): void;
-
-            /**
-             * Moves the note into the trash. The note may still be undeleted, unless it
-             * is expunged.    This is equivalent to calling updateNote() after setting
-             * Note.active = false
-             *
-             * @param guid
-             *     The GUID of the note to delete.
-             *
-             * @return
-             *     The Update Sequence Number for this change within the account.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> PERMISSION_DENIED "Note" - user doesn't have permission to
-             *                    update the note.
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> DATA_CONFLICT "Note.guid" - the note is already deleted
-             *     </li>
-             * </ul>
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            deleteNote(guid: string, cb: Callback<number>): void;
-
-            /**
-             * Permanently removes a Note, and all of its Resources,
-             * from the service.
-             * <p/>
-             * NOTE: This function is not available to third party applications.
-             * Calls will result in an EDAMUserException with the error code
-             * PERMISSION_DENIED.
-             *
-             * @param guid
-             *     The GUID of the note to delete.
-             *
-             * @return
-             *     The Update Sequence Number for this change within the account.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> PERMISSION_DENIED "Note" - user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            expungeNote(guid: string, cb: Callback<number>): void;
-
-            /**
-             * Permanently removes a list of Notes, and all of their Resources, from
-             * the service.    This should be invoked with a small number of Note GUIDs
-             * (e.g. 100 or less) on each call.    To expunge a larger number of notes,
-             * call this method multiple times.    This should also be used to reduce the
-             * number of Notes in a notebook before calling expungeNotebook() or
-             * in the trash before calling expungeInactiveNotes(), since these calls may
-             * be prohibitively slow if there are more than a few hundred notes.
-             * If an exception is thrown for any of the GUIDs, then none of the notes
-             * will be deleted.    I.e. this call can be treated as an atomic transaction.
-             * <p/>
-             * NOTE: This function is not available to third party applications.
-             * Calls will result in an EDAMUserException with the error code
-             * PERMISSION_DENIED.
-             *
-             * @param noteGuids
-             *     The list of GUIDs for the Notes to remove.
-             *
-             * @return
-             *     The account's updateCount at the end of this operation
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> PERMISSION_DENIED "Note" - user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            expungeNotes(noteGuids: string[], cb: Callback<number>): void;
-
-            /**
-             * Permanently removes all of the Notes that are currently marked as
-             * inactive.    This is equivalent to "emptying the trash", and these Notes
-             * will be gone permanently.
-             * <p/>
-             * This operation may be relatively slow if the account contains a large
-             * number of inactive Notes.
-             * <p/>
-             * NOTE: This function is not available to third party applications.
-             * Calls will result in an EDAMUserException with the error code
-             * PERMISSION_DENIED.
-             *
-             * @return
-             *        The number of notes that were expunged.
-             */
-            expungeInactiveNotes(cb: Callback<number>): void;
-
-            /**
-             * Performs a deep copy of the Note with the provided GUID 'noteGuid' into
-             * the Notebook with the provided GUID 'toNotebookGuid'.
-             * The caller must be the owner of both the Note and the Notebook.
-             * This creates a new Note in the destination Notebook with new content and
-             * Resources that match all of the content and Resources from the original
-             * Note, but with new GUID identifiers.
-             * The original Note is not modified by this operation.
-             * The copied note is considered as an "upload" for the purpose of upload
-             * transfer limit calculation, so its size is added to the upload count for
-             * the owner.
-             *
-             * @param noteGuid
-             *     The GUID of the Note to copy.
-             *
-             * @param toNotebookGuid
-             *     The GUID of the Notebook that should receive the new Note.
-             *
-             * @return
-             *     The metadata for the new Note that was created.    This will include the
-             *     new GUID for this Note (and any copied Resources), but will not include
-             *     the content body or the binary bodies of any Resources.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> LIMIT_REACHED "Note" - at max number per account
-             *     </li>
-             *     <li> PERMISSION_DENIED "Notebook.guid" - destination not owned by user
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note" - user doesn't own
-             *     </li>
-             *     <li> QUOTA_REACHED "Accounting.uploadLimit" - note exceeds upload quota
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Notebook.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            copyNote(noteGuid: string, toNotebookGuid: string, cb: Callback<Note>): void;
-
-            /**
-             * Returns a list of the prior versions of a particular note that are
-             * saved within the service.    These prior versions are stored to provide a
-             * recovery from unintentional removal of content from a note. The identifiers
-             * that are returned by this call can be used with getNoteVersion to retrieve
-             * the previous note.
-             * The identifiers will be listed from the most recent versions to the oldest.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            listNoteVersions(noteGuid: string, cb: Callback<NoteVersionId[]>): void;
-
-            /**
-             * This can be used to retrieve a previous version of a Note after it has been
-             * updated within the service.    The caller must identify the note (via its
-             * guid) and the version (via the updateSequenceNumber of that version).
-             * to find a listing of the stored version USNs for a note, call
-             * listNoteVersions.
-             * This call is only available for notes in Premium accounts.    (I.e. access
-             * to past versions of Notes is a Premium-only feature.)
-             *
-             * @param noteGuid
-             *     The GUID of the note to be retrieved.
-             *
-             * @param updateSequenceNum
-             *     The USN of the version of the note that is being retrieved
-             *
-             * @param withResourcesData
-             *     If true, any Resource elements in this Note will include the binary
-             *     contents of their 'data' field's body.
-             *
-             * @param withResourcesRecognition
-             *     If true, any Resource elements will include the binary contents of the
-             *     'recognition' field's body if recognition data is present.
-             *
-             * @param withResourcesAlternateData
-             *     If true, any Resource elements in this Note will include the binary
-             *     contents of their 'alternateData' fields' body, if an alternate form
-             *     is present.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
-             *     </li>
-             *     <li> PERMISSION_DENIED "updateSequenceNum" -
-             *         The account isn't permitted to access previous versions of notes.
-             *         (i.e. this is a Free account.)
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             *     <li> "Note.updateSequenceNumber" - the Note doesn't have a version with
-             *            the corresponding USN.
-             *     </li>
-             * </ul>
-             */
-            getNoteVersion(noteGuid: string, updateSequenceNum: number, withResourcesData: boolean, withResourcesRecognition: boolean, withResourcesAlternateData: boolean, cb: Callback<Note>): void;
-
-            /**
-             * Returns the current state of the resource in the service with the
-             * provided GUID.
-             * If the Resource is found in a public notebook, the authenticationToken
-             * will be ignored (so it could be an empty string).    Only the
-             * keys for the applicationData will be returned.
-             *
-             * @param guid
-             *     The GUID of the resource to be retrieved.
-             *
-             * @param withData
-             *     If true, the Resource will include the binary contents of the
-             *     'data' field's body.
-             *
-             * @param withRecognition
-             *     If true, the Resource will include the binary contents of the
-             *     'recognition' field's body if recognition data is present.
-             *
-             * @param withAttributes
-             *     If true, the Resource will include the attributes
-             *
-             * @param withAlternateData
-             *     If true, the Resource will include the binary contents of the
-             *     'alternateData' field's body, if an alternate form is present.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Resource.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            getResource(guid: string, withData: boolean, withRecognition: boolean, withAttributes: boolean, withAlternateData: boolean, cb: Callback<Resource>): void;
-
-            /**
-             * Get all of the application data for the Resource identified by GUID,
-             * with values returned within the LazyMap fullMap field.
-             * If there are no applicationData entries, then a LazyMap
-             * with an empty fullMap will be returned. If your application
-             * only needs to fetch its own applicationData entry, use
-             * getResourceApplicationDataEntry instead.
-             */
-            getResourceApplicationData(guid: string, cb: Callback<LazyMap>): void;
-
-            /**
-             * Get the value of a single entry in the applicationData map
-             * for the Resource identified by GUID.
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Resource.guid" - Resource not found, by GUID</li>
-             *     <li> "ResourceAttributes.applicationData.key" - Resource not found, by key</li>
-             * </ul>
-             */
-            getResourceApplicationDataEntry(guid: string, key: string, cb: Callback<string>): void;
-
-            /**
-             * Update, or create, an entry in the applicationData map for
-             * the Resource identified by guid.
-             */
-            setResourceApplicationDataEntry(guid: string, key: string, value: string, cb: Callback<number>): void;
-
-            /**
-             * Remove an entry identified by 'key' from the applicationData map for
-             * the Resource identified by 'guid'.
-             */
-            unsetResourceApplicationDataEntry(guid: string, key: string, cb: Callback<number>): void;
-
-            /**
-             * Submit a set of changes to a resource to the service.    This can be used
-             * to update the meta-data about the resource, but cannot be used to change
-             * the binary contents of the resource (including the length and hash).    These
-             * cannot be changed directly without creating a new resource and removing the
-             * old one via updateNote.
-             *
-             * @param resource
-             *     A Resource object containing the desired fields to be populated on
-             *     the service.    The service will attempt to update the resource with the
-             *     following fields from the client:
-             *     <ul>
-             *            <li>guid:    must be provided to identify the resource
-             *            </li>
-             *            <li>mime
-             *            </li>
-             *            <li>width
-             *            </li>
-             *            <li>height
-             *            </li>
-             *            <li>duration
-             *            </li>
-             *            <li>attributes:    optional.    if present, the set of attributes will
-             *                     be replaced.
-             *            </li>
-             *     </ul>
-             *
-             * @return
-             *     The Update Sequence Number of the resource after the changes have been
-             *     applied.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Resource.mime" - invalid resource MIME type
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "ResourceAttributes.*" - bad resource string
-             *     </li>
-             *     <li> LIMIT_REACHED "ResourceAttribute.*" - attribute string too long
-             *     </li>
-             *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Resource.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            updateResource(resource: Resource, cb: Callback<number>): void;
-
-            /**
-             * Returns binary data of the resource with the provided GUID.    For
-             * example, if this were an image resource, this would contain the
-             * raw bits of the image.
-             * If the Resource is found in a public notebook, the authenticationToken
-             * will be ignored (so it could be an empty string).
-             *
-             * @param guid
-             *     The GUID of the resource to be retrieved.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Resource.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            getResourceData(guid: string, cb: Callback<string>): void;
-
-            /**
-             * Returns the current state of a resource, referenced by containing
-             * note GUID and resource content hash.
-             *
-             * @param noteGuid
-             *     The GUID of the note that holds the resource to be retrieved.
-             *
-             * @param contentHash
-             *     The MD5 checksum of the resource within that note. Note that
-             *     this is the binary checksum, for example from Resource.data.bodyHash,
-             *     and not the hex-encoded checksum that is used within an en-media
-             *     tag in a note body.
-             *
-             * @param withData
-             *     If true, the Resource will include the binary contents of the
-             *     'data' field's body.
-             *
-             * @param withRecognition
-             *     If true, the Resource will include the binary contents of the
-             *     'recognition' field's body.
-             *
-             * @param withAlternateData
-             *     If true, the Resource will include the binary contents of the
-             *     'alternateData' field's body, if an alternate form is present.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> DATA_REQUIRED "Note.guid" - noteGuid param missing
-             *     </li>
-             *     <li> DATA_REQUIRED "Note.contentHash" - contentHash param missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note" - not found, by guid
-             *     </li>
-             *     <li> "Resource" - not found, by hash
-             *     </li>
-             * </ul>
-             */
-            getResourceByHash(noteGuid: string, contentHash: string, withData: boolean, withRecognition: boolean, withAlternateData: boolean, cb: Callback<Resource>): void;
-
-            /**
-             * Returns the binary contents of the recognition index for the resource
-             * with the provided GUID.    If the caller asks about a resource that has
-             * no recognition data, this will throw EDAMNotFoundException.
-             * If the Resource is found in a public notebook, the authenticationToken
-             * will be ignored (so it could be an empty string).
-             *
-             * @param guid
-             *     The GUID of the resource whose recognition data should be retrieved.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Resource.guid" - not found, by GUID
-             *     </li>
-             *     <li> "Resource.recognition" - resource has no recognition
-             *     </li>
-             * </ul>
-             */
-            getResourceRecognition(guid: string, cb: Callback<string>): void;
-
-            /**
-             * If the Resource with the provided GUID has an alternate data representation
-             * (indicated via the Resource.alternateData field), then this request can
-             * be used to retrieve the binary contents of that alternate data file.
-             * If the caller asks about a resource that has no alternate data form, this
-             * will throw EDAMNotFoundException.
-             *
-             * @param guid
-             *        The GUID of the resource whose recognition data should be retrieved.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Resource.guid" - not found, by GUID
-             *     </li>
-             *     <li> "Resource.alternateData" - resource has no recognition
-             *     </li>
-             * </ul>
-             */
-            getResourceAlternateData(guid: string, cb: Callback<string>): void;
-
-            /**
-             * Returns the set of attributes for the Resource with the provided GUID.
-             * If the Resource is found in a public notebook, the authenticationToken
-             * will be ignored (so it could be an empty string).
-             *
-             * @param guid
-             *     The GUID of the resource whose attributes should be retrieved.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Resource.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            getResourceAttributes(guid: string, cb: Callback<ResourceAttributes>): void;
-
-            /**
-             * <p>
-             * Looks for a user account with the provided userId on this NoteStore
-             * shard and determines whether that account contains a public notebook
-             * with the given URI.    If the account is not found, or no public notebook
-             * exists with this URI, this will throw an EDAMNotFoundException,
-             * otherwise this will return the information for that Notebook.
-             * </p>
-             * <p>
-             * If a notebook is visible on the web with a full URL like
-             * http://www.evernote.com/pub/sethdemo/api
-             * Then 'sethdemo' is the username that can be used to look up the userId,
-             * and 'api' is the publicUri.
-             * </p>
-             *
-             * @param userId
-             *        The numeric identifier for the user who owns the public notebook.
-             *        To find this value based on a username string, you can invoke
-             *        UserStore.getPublicUserInfo
-             *
-             * @param publicUri
-             *        The uri string for the public notebook, from Notebook.publishing.uri.
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li>"Publishing.uri" - not found, by URI</li>
-             * </ul>
-             *
-             * @throws EDAMSystemException <ul>
-             *     <li> TAKEN_DOWN "PublicNotebook" - The specified public notebook is
-             *         taken down (for all requesters).</li>
-             *     <li> TAKEN_DOWN "Country" - The specified public notebook is taken
-             *         down for the requester because of an IP-based country lookup.</li>
-             * </ul>
-             */
-            getPublicNotebook(userId: number, publicUri: string, cb: Callback<Notebook>): void;
-
-            /**
-             * Used to construct a shared notebook object. The constructed notebook will
-             * contain a "share key" which serve as a unique identifer and access token
-             * for a user to access the notebook of the shared notebook owner.
-             *
-             * @param sharedNotebook
-             *     A shared notebook object populated with the email address of the share
-             *     recipient, the notebook guid and the access permissions. All other
-             *     attributes of the shared object are ignored. The SharedNotebook.allowPreview
-             *     field must be explicitly set with either a true or false value.
-             *
-             * @return
-             *     The fully populated SharedNotebook object including the server assigned
-             *     share id and shareKey which can both be used to uniquely identify the
-             *     SharedNotebook.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li>BAD_DATA_FORMAT "SharedNotebook.email" - if the email was not valid</li>
-             *     <li>BAD_DATA_FORMAT "requireLogin" - if the SharedNotebook.allowPreview field was
-             *             not set, and the SharedNotebook.requireLogin was also not set or was set to
-             *             false.</li>
-             *     <li>PERMISSION_DENIED "SharedNotebook.recipientSettings" - if
-             *             recipientSettings is set in the sharedNotebook.    Only the recipient
-             *             can set these values via the setSharedNotebookRecipientSettings
-             *             method.
-             *     </li>
-             *     </ul>
-             * @throws EDAMNotFoundException <ul>
-             *     <li>Notebook.guid - if the notebookGuid is not a valid GUID for the user.
-             *     </li>
-             *     </ul>
-             */
-            createSharedNotebook(sharedNotebook: SharedNotebook, cb: Callback<SharedNotebook>): void;
-
-            /**
-             * Update a SharedNotebook object.
-             *
-             * @param authenticationToken
-             *     Must be an authentication token from the owner or a shared notebook
-             *     authentication token or business authentication token with sufficient
-             *     permissions to change invitations for a notebook.
-             *
-             * @param sharedNotebook
-             *    The SharedNotebook object containing the requested changes.
-             *    The "id" of the shared notebook must be set to allow the service
-             *    to identify the SharedNotebook to be updated. In addition, you MUST set
-             *    the email, permission, and allowPreview fields to the desired values.
-             *    All other fields will be ignored if set.
-             *
-             * @return
-             *    The Update Serial Number for this change within the account.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li>UNSUPPORTED_OPERATION "updateSharedNotebook" - if this service instance does not support shared notebooks.</li>
-             *     <li>BAD_DATA_FORMAT "SharedNotebook.email" - if the email was not valid.</li>
-             *     <li>DATA_REQUIRED "SharedNotebook.id" - if the id field was not set.</li>
-             *     <li>DATA_REQUIRED "SharedNotebook.privilege" - if the privilege field was not set.</li>
-             *     <li>DATA_REQUIRED "SharedNotebook.allowPreview" - if the allowPreview field was not set.</li>
-             *     </ul>
-             * @throws EDAMNotFoundException <ul>
-             *     <li>SharedNotebook.id - if no shared notebook with the specified ID was found.
-             *     </ul>
-             */
-            updateSharedNotebook(sharedNotebook: SharedNotebook, cb: Callback<number>): void;
-
-            /**
-             * Set values for the recipient settings associated with a shared notebook.    Having
-             * update rights to the shared notebook record itself has no effect on this call;
-             * only the recipient of the shared notebook can can the recipient settings.
-             *
-             * If you do <i>not</i> wish to, or cannot, change one of the reminderNotifyEmail or
-             * reminderNotifyInApp fields, you must leave that field unset in recipientSettings.
-             * This method will skip that field for updates and leave the existing state as
-             * it is.
-             *
-             * @return The update sequence number of the account to which the shared notebook
-             *     belongs, which is the account from which we are sharing a notebook.
-             *
-             * @throws EDAMNotFoundException "sharedNotebookId" - Thrown if the service does not
-             *     have a shared notebook record for the sharedNotebookId on the given shard.    If you
-             *     receive this exception, it is probable that the shared notebook record has
-             *     been revoked or expired, or that you accessed the wrong shard.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li>PEMISSION_DENIED "authenticationToken" - If you do not have permission to set
-             *             the recipient settings for the shared notebook.    Only the recipient has
-             *             permission to do this.
-             *     <li>DATA_CONFLICT "recipientSettings.reminderNotifyEmail" - Setting whether
-             *             or not you want to receive reminder e-mail notifications is possible on
-             *             a business notebook in the business to which the user belongs.    All
-             *             others can safely unset the reminderNotifyEmail field from the
-             *             recipientSettings parameter.
-             * </ul>
-             */
-            setSharedNotebookRecipientSettings(sharedNotebookId: number, recipientSettings: SharedNotebookRecipientSettings, cb: Callback<number>): void;
-
-            /**
-             * Send a reminder message to some or all of the email addresses that a notebook has been
-             * shared with. The message includes the current link to view the notebook.
-             * @param authenticationToken
-             *     The auth token of the user with permissions to share the notebook
-             * @param notebookGuid
-             *     The guid of the shared notebook
-             * @param messageText
-             *    User provided text to include in the email
-             * @param recipients
-             *    The email addresses of the recipients. If this list is empty then all of the
-             *    users that the notebook has been shared with are emailed.
-             *    If an email address doesn't correspond to share invite members then that address
-             *    is ignored.
-             * @return
-             *    The number of messages sent
-             * @throws EDAMUserException <ul>
-             *     <li> LIMIT_REACHED "(recipients)" -
-             *         The email can't be sent because this would exceed the user's daily
-             *         email limit.
-             *     </li>
-             *     <li> PERMISSION_DENIED "Notebook.guid" - The user doesn't have permission to
-             *         send a message for the specified notebook.
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Notebook.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            sendMessageToSharedNotebookMembers(notebookGuid: string, messageText: string, recipients: string[], cb: Callback<number>): void;
-
-            /**
-             * Lists the collection of shared notebooks for all notebooks in the
-             * users account.
-             *
-             * @return
-             *    The list of all SharedNotebooks for the user
-             */
-            listSharedNotebooks(cb: Callback<SharedNotebook[]>): void;
-
-            /**
-             * Expunges the SharedNotebooks in the user's account using the
-             * SharedNotebook.id as the identifier.
-             * <p/>
-             * NOTE: This function is generally not available to third party applications.
-             * Calls will result in an EDAMUserException with the error code
-             * PERMISSION_DENIED.
-             *
-             * @param
-             *     sharedNotebookIds - a list of ShardNotebook.id longs identifying the
-             *             objects to delete permanently.
-             *
-             * @return
-             *     The account's update sequence number.
-             */
-            expungeSharedNotebooks(sharedNotebookIds: number[], cb: Callback<number>): void;
-
-            /**
-             * Asks the service to make a linked notebook with the provided name, username
-             * of the owner and identifiers provided. A linked notebook can be either a
-             * link to a public notebook or to a private shared notebook.
-             *
-             * @param linkedNotebook
-             *     The desired fields for the linked notebook must be provided on this
-             *     object.    The name of the linked notebook must be set. Either a username
-             *     uri or a shard id and share key must be provided otherwise a
-             *     EDAMUserException is thrown.
-             *
-             * @return
-             *     The newly created LinkedNotebook.    The server-side id will be
-             *     saved in this object's 'id' field.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "LinkedNotebook.name" - invalid length or pattern
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "LinkedNotebook.username" - bad username format
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "LinkedNotebook.uri" -
-             *         if public notebook set but bad uri
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "LinkedNotebook.shareKey" -
-             *         if private notebook set but bad shareKey
-             *     </li>
-             *     <li> DATA_REQUIRED "LinkedNotebook.shardId" -
-             *         if private notebook but shard id not provided
-             *     </li>
-             * </ul>
-             */
-            createLinkedNotebook(linkedNotebook: LinkedNotebook, cb: Callback<LinkedNotebook>): void;
-
-            /**
-             * @param linkedNotebook
-             *     Updates the name of a linked notebook.
-             *
-             * @return
-             *     The Update Sequence Number for this change within the account.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "LinkedNotebook.name" - invalid length or pattern
-             *     </li>
-             * </ul>
-             */
-            updateLinkedNotebook(linkedNotebook: LinkedNotebook, cb: Callback<number>): void;
-
-            /**
-             * Returns a list of linked notebooks
-             */
-            listLinkedNotebooks(cb: Callback<LinkedNotebook[]>): void;
-
-            /**
-             * Permanently expunges the linked notebook from the account.
-             * <p/>
-             * NOTE: This function is generally not available to third party applications.
-             * Calls will result in an EDAMUserException with the error code
-             * PERMISSION_DENIED.
-             *
-             * @param guid
-             *     The LinkedNotebook.guid field of the LinkedNotebook to permanently remove
-             *     from the account.
-             */
-            expungeLinkedNotebook(guid: string, cb: Callback<number>): void;
-
-            /**
-             * Asks the service to produce an authentication token that can be used to
-             * access the contents of a shared notebook from someone else's account.
-             * This authenticationToken can be used with the various other NoteStore
-             * calls to find and retrieve notes, and if the permissions in the shared
-             * notebook are sufficient, to make changes to the contents of the notebook.
-             *
-             * @param shareKey
-             *     The 'shareKey' identifier from the SharedNotebook that was granted to
-             *     some recipient.    This string internally encodes the notebook identifier
-             *     and a security signature.
-             *
-             * @param authenticationToken
-             *     If a non-empty string is provided, this is the full user-based
-             *     authentication token that identifies the user who is currently logged in
-             *     and trying to access the shared notebook.    This may be required if the
-             *     notebook was created with 'requireLogin'.
-             *     If this string is empty, the service will attempt to authenticate to the
-             *     shared notebook without any logged in user.
-             *
-             * @throws EDAMSystemException <ul>
-             *     <li> BAD_DATA_FORMAT "shareKey" - invalid shareKey string
-             *     </li>
-             *     <li> INVALID_AUTH "shareKey" - bad signature on shareKey string
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "SharedNotebook.id" - the shared notebook no longer exists
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> DATA_REQUIRED "authenticationToken" - the share requires login, and
-             *                    no valid authentication token was provided.
-             *     </li>
-             *     <li> PERMISSION_DENIED "SharedNotebook.username" - share requires login,
-             *                    and another username has already been bound to this notebook.
-             *     </li>
-             * </ul>
-             */
-            authenticateToSharedNotebook(shareKey: string, cb: Callback<AuthenticationResult>): void;
-
-            /**
-             * This function is used to retrieve extended information about a shared
-             * notebook by a guest who has already authenticated to access that notebook.
-             * This requires an 'authenticationToken' parameter which should be the
-             * resut of a call to authenticateToSharedNotebook(...).
-             * I.e. this is the token that gives access to the particular shared notebook
-             * in someone else's account -- it's not the authenticationToken for the
-             * owner of the notebook itself.
-             *
-             * @param authenticationToken
-             *     Should be the authentication token retrieved from the reply of
-             *     authenticateToSharedNotebook(), proving access to a particular shared
-             *     notebook.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> PERMISSION_DENIED "authenticationToken" -
-             *                    authentication token doesn't correspond to a valid shared notebook
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "SharedNotebook.id" - the shared notebook no longer exists
-             *     </li>
-             * </ul>
-             */
-            getSharedNotebookByAuth(cb: Callback<SharedNotebook>): void;
-
-            /**
-             * Attempts to send a single note to one or more email recipients.
-             * <p/>
-             * NOTE: This function is generally not available to third party applications.
-             * Calls will result in an EDAMUserException with the error code
-             * PERMISSION_DENIED.
-             *
-             * @param authenticationToken
-             *        The note will be sent as the user logged in via this token, using that
-             *        user's registered email address.    If the authenticated user doesn't
-             *        have permission to read that note, the emailing will fail.
-             *
-             * @param parameters
-             *        The note must be specified either by GUID (in which case it will be
-             *        sent using the existing data in the service), or else the full Note
-             *        must be passed to this call.    This also specifies the additional
-             *        email fields that will be used in the email.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> LIMIT_REACHED "NoteEmailParameters.toAddresses" -
-             *         The email can't be sent because this would exceed the user's daily
-             *         email limit.
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "(email address)" -
-             *         email address malformed
-             *     </li>
-             *     <li> DATA_REQUIRED "NoteEmailParameters.toAddresses" -
-             *         if there are no To: or Cc: addresses provided.
-             *     </li>
-             *     <li> DATA_REQUIRED "Note.title" -
-             *         if the caller provides a Note parameter with no title
-             *     </li>
-             *     <li> DATA_REQUIRED "Note.content" -
-             *         if the caller provides a Note parameter with no content
-             *     </li>
-             *     <li> ENML_VALIDATION "*" - note content doesn't validate against DTD
-             *     </li>
-             *     <li> DATA_REQUIRED "NoteEmailParameters.note" -
-             *         if no guid or note provided
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            emailNote(parameters: NoteEmailParameters, cb: Callback<void>): void;
-
-            /**
-             * If this note is not already shared (via its own direct URL), then this
-             * will start sharing that note.
-             * This will return the secret "Note Key" for this note that
-             * can currently be used in conjunction with the Note's GUID to gain direct
-             * read-only access to the Note.
-             * If the note is already shared, then this won't make any changes to the
-             * note, and the existing "Note Key" will be returned.    The only way to change
-             * the Note Key for an existing note is to stopSharingNote first, and then
-             * call this function.
-             *
-             * @param guid
-             *     The GUID of the note to be shared.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            shareNote(guid: string, cb: Callback<string>): void;
-
-            /**
-             * If this note is not already shared then this will stop sharing that note
-             * and invalidate its "Note Key", so any existing URLs to access that Note
-             * will stop working.
-             * If the Note is not shared, then this function will do nothing.
-             *
-             * @param guid
-             *     The GUID of the note to be un-shared.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            stopSharingNote(guid: string, cb: Callback<void>): void;
-
-            /**
-             * Asks the service to produce an authentication token that can be used to
-             * access the contents of a single Note which was individually shared
-             * from someone's account.
-             * This authenticationToken can be used with the various other NoteStore
-             * calls to find and retrieve the Note and its directly-referenced children.
-             *
-             * @param guid
-             *     The GUID identifying this Note on this shard.
-             *
-             * @param noteKey
-             *     The 'noteKey' identifier from the Note that was originally created via
-             *     a call to shareNote() and then given to a recipient to access.
-             *
-             * @param authenticationToken
-             *     An optional authenticationToken that identifies the user accessing the
-             *     shared note. This parameter may be required to access some shared notes.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> PERMISSION_DENIED "Note" - the Note with that GUID is either not
-             *         shared, or the noteKey doesn't match the current key for this note
-             *     </li>
-             *     <li> PERMISSION_DENIED "authenticationToken" - an authentication token is
-             *         required to access this Note, but either no authentication token or a
-             *         "non-owner" authentication token was provided.
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "guid" - the note with that GUID is not found
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMSystemException <ul>
-             *     <li> TAKEN_DOWN "Note" - The specified shared note is taken down (for
-             *         all requesters).
-             *     </li>
-             *     <li> TAKEN_DOWN "Country" - The specified shared note is taken down
-             *         for the requester because of an IP-based country lookup.
-             *     </ul>
-             * </ul>
-             */
-            authenticateToSharedNote(guid: string, noteKey: string, cb: Callback<AuthenticationResult>): void;
-
-            /**
-             * Identify related entities on the service, such as notes,
-             * notebooks, and tags related to notes or content.
-             *
-             * @param query
-             *     The information about which we are finding related entities.
-             *
-             * @param resultSpec
-             *     Allows the client to indicate the type and quantity of
-             *     information to be returned, allowing a saving of time and
-             *     bandwidth.
-             *
-             * @return
-             *     The result of the query, with information considered
-             *     to likely be relevantly related to the information
-             *     described by the query.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li>BAD_DATA_FORMAT "RelatedQuery.plainText" - If you provided a
-             *         a zero-length plain text value.
-             *     </li>
-             *     <li>BAD_DATA_FORMAT "RelatedQuery.noteGuid" - If you provided an
-             *         invalid Note GUID, that is, one that does not match the constraints
-             *         defined by EDAM_GUID_LEN_MIN, EDAM_GUID_LEN_MAX, EDAM_GUID_REGEX.
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.notebookGuid" - if malformed
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.tagGuids" - if any are malformed
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.words" - if search string too long
-             *     </li>
-             *     <li>PERMISSION_DENIED "Note" - If the caller does not have access to
-             *         the note identified by RelatedQuery.noteGuid.
-             *     </li>
-             *     <li>DATA_REQUIRED "RelatedResultSpec" - If you did not not set any values
-             *         in the result spec.
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li>"RelatedQuery.noteGuid" - the note with that GUID is not
-             *         found, if that field has been set in the query.
-             *     </li>
-             * </ul>
-             */
-            findRelated(query: RelatedQuery, resultSpec: RelatedResultSpec, cb: Callback<RelatedResult>): void;
-        }
-        /**
-         *    This structure encapsulates the information about the state of the
-         *    user's account for the purpose of "state based" synchronization.
-         * <dl>
-         *    <dt>currentTime</dt>
-         *        <dd>
-         *        The server's current date and time.
-         *        </dd>
-         *
-         *    <dt>fullSyncBefore</dt>
-         *        <dd>
-         *        The cutoff date and time for client caches to be
-         *        updated via incremental synchronization.    Any clients that were last
-         *        synched with the server before this date/time must do a full resync of all
-         *        objects.    This cutoff point will change over time as archival data is
-         *        deleted or special circumstances on the service require resynchronization.
-         *        </dd>
-         *
-         *    <dt>updateCount</dt>
-         *        <dd>
-         *        Indicates the total number of transactions that have
-         *        been committed within the account.    This reflects (for example) the
-         *        number of discrete additions or modifications that have been made to
-         *        the data in this account (tags, notes, resources, etc.).
-         *        This number is the "high water mark" for Update Sequence Numbers (USN)
-         *        within the account.
-         *        </dd>
-         *
-         *    <dt>uploaded</dt>
-         *        <dd>
-         *        The total number of bytes that have been uploaded to
-         *        this account in the current monthly period.    This can be compared against
-         *        Accounting.uploadLimit (from the UserStore) to determine how close the user
-         *        is to their monthly upload limit.
-         *        This value may not be present if the SyncState has been retrieved by
-         *        a caller that only has read access to the account.
-         *        </dd>
-         *    </dl>
-         */
-        class SyncState {
-            currentTime: number;
-            fullSyncBefore: number;
-            updateCount: number;
-            uploaded: number;
-
-            constructor(args?: { currentTime: number; fullSyncBefore: number; updateCount: number; uploaded?: number; });
-        }
-
-        /**
-         *    This structure is given out by the NoteStore when a client asks to
-         *    receive the current state of an account.    The client asks for the server's
-         *    state one chunk at a time in order to allow clients to retrieve the state
-         *    of a large account without needing to transfer the entire account in
-         *    a single message.
-         *
-         *    The server always gives SyncChunks using an ascending series of Update
-         *    Sequence Numbers (USNs).
-         *
-         * <dl>
-         *    <dt>currentTime</dt>
-         *        <dd>
-         *        The server's current date and time.
-         *        </dd>
-         *
-         *    <dt>chunkHighUSN</dt>
-         *        <dd>
-         *        The highest USN for any of the data objects represented
-         *        in this sync chunk.    If there are no objects in the chunk, this will not be
-         *        set.
-         *        </dd>
-         *
-         *    <dt>updateCount</dt>
-         *        <dd>
-         *        The total number of updates that have been performed in
-         *        the service for this account.    This is equal to the highest USN within the
-         *        account at the point that this SyncChunk was generated.    If updateCount
-         *        and chunkHighUSN are identical, that means that this is the last chunk
-         *        in the account ... there is no more recent information.
-         *        </dd>
-         *
-         *    <dt>notes</dt>
-         *        <dd>
-         *        If present, this is a list of non-expunged notes that
-         *        have a USN in this chunk.    This will include notes that are "deleted"
-         *        but not expunged (i.e. in the trash).    The notes will include their list
-         *        of tags and resources, but the note content, resource content, resource
-         *        recognition data and resource alternate data will not be supplied.
-         *        </dd>
-         *
-         *    <dt>notebooks</dt>
-         *        <dd>
-         *        If present, this is a list of non-expunged notebooks that
-         *        have a USN in this chunk.    This will include notebooks that are "deleted"
-         *        but not expunged (i.e. in the trash).
-         *        </dd>
-         *
-         *    <dt>tags</dt>
-         *        <dd>
-         *        If present, this is a list of the non-expunged tags that have a
-         *        USN in this chunk.
-         *        </dd>
-         *
-         *    <dt>searches</dt>
-         *        <dd>
-         *        If present, this is a list of non-expunged searches that
-         *        have a USN in this chunk.
-         *        </dd>
-         *
-         *    <dt>resources</dt>
-         *        <dd>
-         *        If present, this is a list of the non-expunged resources
-         *        that have a USN in this chunk.    This will include the metadata for each
-         *        resource, but not its binary contents or recognition data, which must be
-         *        retrieved separately.
-         *        </dd>
-         *
-         *    <dt>expungedNotes</dt>
-         *        <dd>
-         *        If present, the GUIDs of all of the notes that were
-         *        permanently expunged in this chunk.
-         *        </dd>
-         *
-         *    <dt>expungedNotebooks</dt>
-         *        <dd>
-         *        If present, the GUIDs of all of the notebooks that
-         *        were permanently expunged in this chunk.    When a notebook is expunged,
-         *        this implies that all of its child notes (and their resources) were
-         *        also expunged.
-         *        </dd>
-         *
-         *    <dt>expungedTags</dt>
-         *        <dd>
-         *        If present, the GUIDs of all of the tags that were
-         *        permanently expunged in this chunk.
-         *        </dd>
-         *
-         *    <dt>expungedSearches</dt>
-         *        <dd>
-         *        If present, the GUIDs of all of the saved searches
-         *        that were permanently expunged in this chunk.
-         *        </dd>
-         *
-         *    <dt>linkedNotebooks</dt>
-         *        <dd>
-         *        If present, this is a list of non-expunged LinkedNotebooks that
-         *        have a USN in this chunk.
-         *        </dd>
-         *
-         *    <dt>expungedLinkedNotebooks</dt>
-         *        <dd>
-         *        If present, the GUIDs of all of the LinkedNotebooks
-         *        that were permanently expunged in this chunk.
-         *        </dd>
-         *    </dl>
-         */
-        class SyncChunk {
-            currentTime: number;
-            chunkHighUSN: number;
-            updateCount: number;
-            notes: Note[];
-            notebooks: Notebook[];
-            tags: Tag[];
-            searches: SavedSearch[];
-            resources: Resource[];
-            expungedNotes: string[];
-            expungedNotebooks: string[];
-            expungedTags: string[];
-            expungedSearches: string[];
-            linkedNotebooks: LinkedNotebook[];
-            expungedLinkedNotebooks: string[];
-
-            constructor(args?: { currentTime: number; chunkHighUSN?: number; updateCount: number; notes?: Note[]; notebooks?: Notebook[]; tags?: Tag[]; searches?: SavedSearch[]; resources?: Resource[]; expungedNotes?: string[]; expungedNotebooks?: string[]; expungedTags?: string[]; expungedSearches?: string[]; linkedNotebooks?: LinkedNotebook[]; expungedLinkedNotebooks?: string[]; });
-        }
-
-        /**
-         *    This structure is used with the 'getFilteredSyncChunk' call to provide
-         *    fine-grained control over the data that's returned when a client needs
-         *    to synchronize with the service. Each flag in this structure specifies
-         *    whether to include one class of data in the results of that call.
-         *
-         * <dl>
-         *    <dt>includeNotes</dt>
-         *        <dd>
-         *        If true, then the server will include the SyncChunks.notes field
-         *        </dd>
-         *
-         *    <dt>includeNoteResources</dt>
-         *        <dd>
-         *        If true, then the server will include the 'resources' field on all of
-         *        the Notes that are in SyncChunk.notes.
-         *        If 'includeNotes' is false, then this will have no effect.
-         *        </dd>
-         *
-         *    <dt>includeNoteAttributes</dt>
-         *        <dd>
-         *        If true, then the server will include the 'attributes' field on all of
-         *        the Notes that are in SyncChunks.notes.
-         *        If 'includeNotes' is false, then this will have no effect.
-         *        </dd>
-         *
-         *    <dt>includeNotebooks</dt>
-         *        <dd>
-         *        If true, then the server will include the SyncChunks.notebooks field
-         *        </dd>
-         *
-         *    <dt>includeTags</dt>
-         *        <dd>
-         *        If true, then the server will include the SyncChunks.tags field
-         *        </dd>
-         *
-         *    <dt>includeSearches</dt>
-         *        <dd>
-         *        If true, then the server will include the SyncChunks.searches field
-         *        </dd>
-         *
-         *    <dt>includeResources</dt>
-         *        <dd>
-         *        If true, then the server will include the SyncChunks.resources field.
-         *        Since the Resources are also provided with their Note
-         *        (in the Notes.resources list), this is primarily useful for clients that
-         *        want to watch for changes to individual Resources due to recognition data
-         *        being added.
-         *        </dd>
-         *
-         *    <dt>includeLinkedNotebooks</dt>
-         *        <dd>
-         *        If true, then the server will include the SyncChunks.linkedNotebooks field.
-         *        </dd>
-         *
-         *    <dt>includeExpunged</dt>
-         *        <dd>
-         *        If true, then the server will include the 'expunged' data for any type
-         *        of included data.    For example, if 'includeTags' and 'includeExpunged'
-         *        are both true, then the SyncChunks.expungedTags field will be set with
-         *        the GUIDs of tags that have been expunged from the server.
-         *        </dd>
-         *
-         *    <dt>includeNoteApplicationDataFullMap</dt>
-         *        <dd>
-         *        If true, then the values for the applicationData map will be filled
-         *        in, assuming notes and note attributes are being returned.    Otherwise,
-         *        only the keysOnly field will be filled in.
-         *        </dd>
-         *
-         *    <dt>includeResourceApplicationDataFullMap</dt>
-         *        <dd>
-         *        If true, then the fullMap values for the applicationData map will be
-         *        filled in, assuming resources and resource attributes are being returned
-         *        (includeResources is true).    Otherwise, only the keysOnly field will be
-         *        filled in.
-         *        </dd>
-         *
-         *    <dt>includeNoteResourceApplicationDataFullMap</dt>
-         *        <dd>
-         *        If true, then the fullMap values for the applicationData map will be
-         *        filled in for resources found inside of notes, assuming resources are
-         *        being returned in notes (includeNoteResources is true).    Otherwise,
-         *        only the keysOnly field will be filled in.
-         *        </dd>
-         *
-         *    <dt>requireNoteContentClass</dt>
-         *        <dd>
-         *        If set, then only send notes whose content class matches this value.
-         *        The value can be a literal match or, if the last character is an
-         *        asterisk, a prefix match.
-         *        </dd>
-         *    </dl>
-         */
-        class SyncChunkFilter {
-            includeNotes: boolean;
-            includeNoteResources: boolean;
-            includeNoteAttributes: boolean;
-            includeNotebooks: boolean;
-            includeTags: boolean;
-            includeSearches: boolean;
-            includeResources: boolean;
-            includeLinkedNotebooks: boolean;
-            includeExpunged: boolean;
-            includeNoteApplicationDataFullMap: boolean;
-            includeResourceApplicationDataFullMap: boolean;
-            includeNoteResourceApplicationDataFullMap: boolean;
-            requireNoteContentClass: string;
-
-            constructor(args?: { includeNotes?: boolean; includeNoteResources?: boolean; includeNoteAttributes?: boolean; includeNotebooks?: boolean; includeTags?: boolean; includeSearches?: boolean; includeResources?: boolean; includeLinkedNotebooks?: boolean; includeExpunged?: boolean; includeNoteApplicationDataFullMap?: boolean; includeResourceApplicationDataFullMap?: boolean; includeNoteResourceApplicationDataFullMap?: boolean; requireNoteContentClass?: string; });
-        }
-
-        /**
-         *    A list of criteria that are used to indicate which notes are desired from
-         *    the account.    This is used in queries to the NoteStore to determine
-         *    which notes should be retrieved.
-         *
-         * <dl>
-         *    <dt>order</dt>
-         *        <dd>
-         *        The NoteSortOrder value indicating what criterion should be
-         *        used to sort the results of the filter.
-         *        </dd>
-         *
-         *    <dt>ascending</dt>
-         *        <dd>
-         *        If true, the results will be ascending in the requested
-         *        sort order.    If false, the results will be descending.
-         *        </dd>
-         *
-         *    <dt>words</dt>
-         *        <dd>
-         *        If present, a search query string that will filter the set of notes to be returned.
-         *        Accepts the full search grammar documented in the Evernote API Overview.
-         *        </dd>
-         *
-         *    <dt>notebookGuid</dt>
-         *        <dd>
-         *        If present, the Guid of the notebook that must contain
-         *        the notes.
-         *        </dd>
-         *
-         *    <dt>tagGuids</dt>
-         *        <dd>
-         *        If present, the list of tags (by GUID) that must be present
-         *        on the notes.
-         *        </dd>
-         *
-         *    <dt>timeZone</dt>
-         *        <dd>
-         *        The zone ID for the user, which will be used to interpret
-         *        any dates or times in the queries that do not include their desired zone
-         *        information.
-         *        For example, if a query requests notes created "yesterday", this
-         *        will be evaluated from the provided time zone, if provided.
-         *        The format must be encoded as a standard zone ID such as
-         *        "America/Los_Angeles".
-         *        </dd>
-         *
-         *    <dt>inactive</dt>
-         *        <dd>
-         *        If true, then only notes that are not active (i.e. notes in
-         *        the Trash) will be returned. Otherwise, only active notes will be returned.
-         *        There is no way to find both active and inactive notes in a single query.
-         *        </dd>
-         *
-         *    <dt>emphasized</dt>
-         *        <dd>
-         *        If present, a search query string that may or may not influence the notes
-         *        to be returned, both in terms of coverage as well as of order. Think of it
-         *        as a wish list, not a requirement.
-         *        Accepts the full search grammar documented in the Evernote API Overview.
-         *        </dd>
-         *    </dl>
-         */
-        class NoteFilter {
-            order: number;
-            ascending: boolean;
-            words: string;
-            notebookGuid: string;
-            tagGuids: string[];
-            timeZone: string;
-            inactive: boolean;
-            emphasized: string;
-
-            constructor(args?: { order?: number; ascending?: boolean; words?: string; notebookGuid?: string; tagGuids?: string[]; timeZone?: string; inactive?: boolean; emphasized?: string; });
-        }
-
-        /**
-         *    A small structure for returning a list of notes out of a larger set.
-         *
-         * <dl>
-         *    <dt>startIndex</dt>
-         *        <dd>
-         *        The starting index within the overall set of notes.    This
-         *        is also the number of notes that are "before" this list in the set.
-         *        </dd>
-         *
-         *    <dt>totalNotes</dt>
-         *        <dd>
-         *        The number of notes in the larger set.    This can be used
-         *        to calculate how many notes are "after" this note in the set.
-         *        (I.e.    remaining = totalNotes - (startIndex + notes.length)    )
-         *        </dd>
-         *
-         *    <dt>notes</dt>
-         *        <dd>
-         *        The list of notes from this range.    The Notes will include all
-         *        metadata (attributes, resources, etc.), but will not include the ENML
-         *        content of the note or the binary contents of any resources.
-         *        </dd>
-         *
-         *    <dt>stoppedWords</dt>
-         *        <dd>
-         *        If the NoteList was produced using a text based search
-         *        query that included words that are not indexed or searched by the service,
-         *        this will include a list of those ignored words.
-         *        </dd>
-         *
-         *    <dt>searchedWords</dt>
-         *        <dd>
-         *        If the NoteList was produced using a text based search
-         *        query that included viable search words or quoted expressions, this will
-         *        include a list of those words.    Any stopped words will not be included
-         *        in this list.
-         *        </dd>
-         *
-         *    <dt>updateCount</dt>
-         *        <dd>
-         *        Indicates the total number of transactions that have
-         *        been committed within the account.    This reflects (for example) the
-         *        number of discrete additions or modifications that have been made to
-         *        the data in this account (tags, notes, resources, etc.).
-         *        This number is the "high water mark" for Update Sequence Numbers (USN)
-         *        within the account.
-         *        </dd>
-         *    </dl>
-         */
-        class NoteList {
-            startIndex: number;
-            totalNotes: number;
-            notes: Note[];
-            stoppedWords: string[];
-            searchedWords: string[];
-            updateCount: number;
-
-            constructor(args?: { startIndex: number; totalNotes: number; notes: Note[]; stoppedWords?: string[]; searchedWords?: string[]; updateCount?: number; });
-        }
-
-        /**
-         * This structure is used in the set of results returned by the
-         * findNotesMetadata function.    It represents the high-level information about
-         * a single Note, without some of the larger deep structure.    This allows
-         * for the information about a list of Notes to be returned relatively quickly
-         * with less marshalling and data transfer to remote clients.
-         * Most fields in this structure are identical to the corresponding field in
-         * the Note structure, with the exception of:
-         *
-         * <dl>
-         * <dt>largestResourceMime</dt>
-         *     <dd>If set, then this will contain the MIME type of the largest Resource
-         *     (in bytes) within the Note.    This may be useful, for example, to choose
-         *     an appropriate icon or thumbnail to represent the Note.
-         *     </dd>
-         *
-         * <dt>largestResourceSize</dt>
-         *    <dd>If set, this will contain the size of the largest Resource file, in
-         *    bytes, within the Note.    This may be useful, for example, to decide whether
-         *    to ask the server for a thumbnail to represent the Note.
-         *    </dd>
-         * </dl>
-         */
-        class NoteMetadata {
-            guid: string;
-            title: string;
-            contentLength: number;
-            created: number;
-            updated: number;
-            deleted: number;
-            updateSequenceNum: number;
-            notebookGuid: string;
-            tagGuids: string[];
-            attributes: NoteAttributes;
-            largestResourceMime: string;
-            largestResourceSize: number;
-
-            constructor(args?: { guid: string; title?: string; contentLength?: number; created?: number; updated?: number; deleted?: number; updateSequenceNum?: number; notebookGuid?: string; tagGuids?: string[]; attributes?: NoteAttributes; largestResourceMime?: string; largestResourceSize?: number; });
-        }
-
-        /**
-         *    This structure is returned from calls to the findNotesMetadata function to
-         *    give the high-level metadata about a subset of Notes that are found to
-         *    match a specified NoteFilter in a search.
-         *
-         * <dl>
-         *    <dt>startIndex</dt>
-         *        <dd>
-         *        The starting index within the overall set of notes.    This
-         *        is also the number of notes that are "before" this list in the set.
-         *        </dd>
-         *
-         *    <dt>totalNotes</dt>
-         *        <dd>
-         *        The number of notes in the larger set.    This can be used
-         *        to calculate how many notes are "after" this note in the set.
-         *        (I.e.    remaining = totalNotes - (startIndex + notes.length)    )
-         *        </dd>
-         *
-         *    <dt>notes</dt>
-         *        <dd>
-         *        The list of metadata for Notes in this range.    The set of optional fields
-         *        that are set in each metadata structure will depend on the
-         *        NotesMetadataResultSpec provided by the caller when the search was
-         *        performed.    Only the 'guid' field will be guaranteed to be set in each
-         *        Note.
-         *        </dd>
-         *
-         *    <dt>stoppedWords</dt>
-         *        <dd>
-         *        If the NoteList was produced using a text based search
-         *        query that included words that are not indexed or searched by the service,
-         *        this will include a list of those ignored words.
-         *        </dd>
-         *
-         *    <dt>searchedWords</dt>
-         *        <dd>
-         *        If the NoteList was produced using a text based search
-         *        query that included viable search words or quoted expressions, this will
-         *        include a list of those words.    Any stopped words will not be included
-         *        in this list.
-         *        </dd>
-         *
-         *    <dt>updateCount</dt>
-         *        <dd>
-         *        Indicates the total number of transactions that have
-         *        been committed within the account.    This reflects (for example) the
-         *        number of discrete additions or modifications that have been made to
-         *        the data in this account (tags, notes, resources, etc.).
-         *        This number is the "high water mark" for Update Sequence Numbers (USN)
-         *        within the account.
-         *        </dd>
-         *    </dl>
-         */
-        class NotesMetadataList {
-            startIndex: number;
-            totalNotes: number;
-            notes: NoteMetadata[];
-            stoppedWords: string[];
-            searchedWords: string[];
-            updateCount: number;
-
-            constructor(args?: { startIndex: number; totalNotes: number; notes: NoteMetadata[]; stoppedWords?: string[]; searchedWords?: string[]; updateCount?: number; });
-        }
-
-        /**
-         * This structure is provided to the findNotesMetadata function to specify
-         * the subset of fields that should be included in each NoteMetadata element
-         * that is returned in the NotesMetadataList.
-         * Each field on this structure is a boolean flag that indicates whether the
-         * corresponding field should be included in the NoteMetadata structure when
-         * it is returned.    For example, if the 'includeTitle' field is set on this
-         * structure when calling findNotesMetadata, then each NoteMetadata in the
-         * list should have its 'title' field set.
-         * If one of the fields in this spec is not set, then it will be treated as
-         * 'false' by the server, so the default behavior is to include nothing in
-         * replies (but the mandatory GUID)
-         */
-        class NotesMetadataResultSpec {
-            includeTitle: boolean;
-            includeContentLength: boolean;
-            includeCreated: boolean;
-            includeUpdated: boolean;
-            includeDeleted: boolean;
-            includeUpdateSequenceNum: boolean;
-            includeNotebookGuid: boolean;
-            includeTagGuids: boolean;
-            includeAttributes: boolean;
-            includeLargestResourceMime: boolean;
-            includeLargestResourceSize: boolean;
-
-            constructor(args?: { includeTitle?: boolean; includeContentLength?: boolean; includeCreated?: boolean; includeUpdated?: boolean; includeDeleted?: boolean; includeUpdateSequenceNum?: boolean; includeNotebookGuid?: boolean; includeTagGuids?: boolean; includeAttributes?: boolean; includeLargestResourceMime?: boolean; includeLargestResourceSize?: boolean; });
-        }
-
-        /**
-         *    A data structure representing the number of notes for each notebook
-         *    and tag with a non-zero set of applicable notes.
-         *
-         * <dl>
-         *    <dt>notebookCounts</dt>
-         *        <dd>
-         *        A mapping from the Notebook GUID to the number of
-         *        notes (from some selection) that are in the corresponding notebook.
-         *        </dd>
-         *
-         *    <dt>tagCounts</dt>
-         *        <dd>
-         *        A mapping from the Tag GUID to the number of notes (from some
-         *        selection) that have the corresponding tag.
-         *        </dd>
-         *
-         *    <dt>trashCount</dt>
-         *        <dd>
-         *        If this is set, then this is the number of notes that are in the trash.
-         *        If this is not set, then the number of notes in the trash hasn't been
-         *        reported.    (I.e. if there are no notes in the trash, this will be set
-         *        to 0.)
-         *        </dd>
-         *    </dl>
-         */
-        class NoteCollectionCounts {
-            notebookCounts: { [k: string]: number; };
-            tagCounts: { [k: string]: number; };
-            trashCount: number;
-
-            constructor(args?: { notebookCounts?: { [k: string]: number; }; tagCounts?: { [k: string]: number; }; trashCount?: number; });
-        }
-
-        /**
-         * Parameters that must be given to the NoteStore emailNote call. These allow
-         * the caller to specify the note to send, the recipient addresses, etc.
-         *
-         * <dl>
-         *    <dt>guid</dt>
-         *        <dd>
-         *            If set, this must be the GUID of a note within the user's account that
-         *            should be retrieved from the service and sent as email.    If not set,
-         *            the 'note' field must be provided instead.
-         *        </dd>
-         *
-         *    <dt>note</dt>
-         *        <dd>
-         *            If the 'guid' field is not set, this field must be provided, including
-         *            the full contents of the note note (and all of its Resources) to send.
-         *            This can be used for a Note that as not been created in the service,
-         *            for example by a local client with local notes.
-         *        </dd>
-         *
-         *    <dt>toAddresses</dt>
-         *        <dd>
-         *            If provided, this should contain a list of the SMTP email addresses
-         *            that should be included in the "To:" line of the email.
-         *            Callers must specify at least one "to" or "cc" email address.
-         *        </dd>
-         *
-         *    <dt>ccAddresses</dt>
-         *        <dd>
-         *            If provided, this should contain a list of the SMTP email addresses
-         *            that should be included in the "Cc:" line of the email.
-         *            Callers must specify at least one "to" or "cc" email address.
-         *        </dd>
-         *
-         *    <dt>subject</dt>
-         *        <dd>
-         *            If provided, this should contain the subject line of the email that
-         *            will be sent.    If not provided, the title of the note will be used
-         *            as the subject of the email.
-         *        </dd>
-         *
-         *    <dt>message</dt>
-         *        <dd>
-         *            If provided, this is additional personal text that should be included
-         *            into the email as a message from the owner to the recipient(s).
-         *        </dd>
-         * </dl>
-         */
-        class NoteEmailParameters {
-            guid: string;
-            note: Note;
-            toAddresses: string[];
-            ccAddresses: string[];
-            subject: string;
-            message: string;
-
-            constructor(args?: { guid?: string; note?: Note; toAddresses?: string[]; ccAddresses?: string[]; subject?: string; message?: string; });
-        }
-
-        /**
-         * Identifying information about previous versions of a note that are backed up
-         * within Evernote's servers.    Used in the return value of the listNoteVersions
-         * call.
-         *
-         * <dl>
-         *    <dt>updateSequenceNum</dt>
-         *    <dd>
-         *        The update sequence number for the Note when it last had this content.
-         *        This serves to uniquely identify each version of the note, since USN
-         *        values are unique within an account for each update.
-         *    </dd>
-         *    <dt>updated</dt>
-         *    <dd>
-         *        The 'updated' time that was set on the Note when it had this version
-         *        of the content.    This is the user-modifiable modification time on the
-         *        note, so it's not reliable for guaranteeing the order of various
-         *        versions.    (E.g. if someone modifies the note, then changes this time
-         *        manually into the past and then updates the note again.)
-         *    </dd>
-         *    <dt>saved</dt>
-         *    <dd>
-         *        A timestamp that holds the date and time when this version of the note
-         *        was backed up by Evernote's servers.    This
-         *    </dd>
-         *    <dt>title</dt>
-         *    <dd>
-         *        The title of the note when this particular version was saved.    (The
-         *        current title of the note may differ from this value.)
-         *    </dd>
-         * </dl>
-         */
-        class NoteVersionId {
-            updateSequenceNum: number;
-            updated: number;
-            saved: number;
-            title: string;
-
-            constructor(args?: { updateSequenceNum: number; updated: number; saved: number; title: string; });
-        }
-
-        /**
-         * This structure is passed from clients to the Evernote service when they wish
-         * to relay coarse-grained usage metrics to the service to help improve
-         * products.
-         *
-         * <dl>
-         *    <dt>sessions</dt>
-         *    <dd>
-         *        This field contains a count of the number of usage "sessions" that have
-         *        occurred with this client which have not previously been reported to
-         *        the service.
-         *        A "session" is defined as one of the 96 fifteen-minute intervals of the
-         *        day when someone used Evernote's interface at least once.
-         *        So if a user interacts with an Evernote client at 12:18, 12:24, and 12:36,
-         *        and then the client synchronizes at 12:39, it would report that there were
-         *        two previously-unreported sessions (one session for the 12:15-12:30 time
-         *        period, and one for the 12:30-12:45 period).
-         *        If the user used Evernote again at 12:41 and synchronized at 12:43, it
-         *        would not report any new sessions, because the 12:30-12:45 session had
-         *        already been reported.
-         *    </dd>
-         * </dl>
-         */
-        class ClientUsageMetrics {
-            sessions: number;
-
-            constructor(args?: { sessions?: number; });
-        }
-
-        /**
-         * A description of the thing for which we are searching for related
-         * entities.
-         *
-         * You must specify either <em>noteGuid</em> or <em>plainText</em>, but
-         * not both. <em>filter</em> and <em>referenceUri</em> are optional.
-         *
-         * <dl>
-         * <dt>noteGuid</dt>
-         * <dd>The GUID of an existing note in your account for which related
-         *         entities will be found.</dd>
-         *
-         * <dt>plainText</dt>
-         * <dd>A string of plain text for which to find related entities.
-         *         You should provide a text block with a number of characters between
-         *         EDAM_RELATED_PLAINTEXT_LEN_MIN and EDAM_RELATED_PLAINTEXT_LEN_MAX.
-         *         </dd>
-         *
-         * <dt>filter</dt>
-         * <dd>The list of criteria that will constrain the notes being considered
-         *         related.
-         *         Please note that some of the parameters may be ignored, such as
-         *         <em>order</em> and <em>ascending</em>.
-         * </dd>
-         *
-         * <dt>referenceUri</dt>
-         * <dd>A URI string specifying a reference entity, around which "relatedness"
-         *         should be based. This can be an URL pointing to a web page, for example.
-         * </dd>
-         * </dl>
-         */
-        class RelatedQuery {
-            noteGuid: string;
-            plainText: string;
-            filter: NoteFilter;
-            referenceUri: string;
-
-            constructor(args?: { noteGuid?: string; plainText?: string; filter?: NoteFilter; referenceUri?: string; });
-        }
-
-        /**
-         * The result of calling findRelated().    The contents of the notes,
-         * notebooks, and tags fields will be in decreasing order of expected
-         * relevance.    It is possible that fewer results than requested will be
-         * returned even if there are enough distinct entities in the account
-         * in cases where the relevance is estimated to be low.
-         *
-         * <dl>
-         * <dt>notes</dt>
-         * <dd>If notes have been requested to be included, this will be the
-         *         list of notes.</dd>
-         *
-         * <dt>notebooks</dt>
-         * <dd>If notebooks have been requested to be included, this will be the
-         *         list of notebooks.</dd>
-         *
-         * <dt>tags</dt>
-         * <dd>If tags have been requested to be included, this will be the list
-         *         of tags.</dd>
-         * </dl>
-         *
-         * <dt>containingNotebooks</dt>
-         * <dd>If <code>includeContainingNotebooks</code> is set to <code>true</code>
-         *         in the RelatedResultSpec, return the list of notebooks to
-         *         to which the returned related notes belong. The notebooks in this
-         *         list will occur once per notebook GUID and are represented as
-         *         NotebookDescriptor objects.</dd>
-         * </dl>
-         * </dl>
-         */
-        class RelatedResult {
-            notes: Note[];
-            notebooks: Notebook[];
-            tags: Tag[];
-            containingNotebooks: NotebookDescriptor[];
-
-            constructor(args?: { notes?: Note[]; notebooks?: Notebook[]; tags?: Tag[]; containingNotebooks?: NotebookDescriptor[]; });
-        }
-
-        /**
-         * A description of the thing for which the service will find related
-         * entities, via findRelated(), together with a description of what
-         * type of entities and how many you are seeking in the
-         * RelatedResult.
-         *
-         * <dl>
-         * <dt>maxNotes</dt>
-         * <dd>Return notes that are related to the query, but no more than
-         *         this many.    Any value greater than EDAM_RELATED_MAX_NOTES
-         *         will be silently capped.    If you do not set this field, then
-         *         no notes will be returned.</dd>
-         *
-         * <dt>maxNotebooks</dt>
-         * <dd>Return notebooks that are related to the query, but no more than
-         *         this many.    Any value greater than EDAM_RELATED_MAX_NOTEBOOKS
-         *         will be silently capped.    If you do not set this field, then
-         *         no notebooks will be returned.</dd>
-         *
-         * <dt>maxTags</dt>
-         * <dd>Return tags that are related to the query, but no more than
-         *         this many.    Any value greater than EDAM_RELATED_MAX_TAGS
-         *         will be silently capped.    If you do not set this field, then
-         *         no tags will be returned.</dd>
-         * </dl>
-         *
-         * <dt>writableNotebooksOnly</dt>
-         * <dd>Require that all returned related notebooks are writable.
-         *         The user will be able to create notes in all returned notebooks.
-         *         However, individual notes returned may still belong to notebooks
-         *         in which the user lacks the ability to create notes.</dd>
-         * </dl>
-         *
-         * <dt>includeContainingNotebooks</dt>
-         * <dd>If set to <code>true</code>, return the containingNotebooks field
-         *         in the RelatedResult, which will contain the list of notebooks to
-         *         to which the returned related notes belong.</dd>
-         * </dl>
-         * </dl>
-         */
-        class RelatedResultSpec {
-            maxNotes: number;
-            maxNotebooks: number;
-            maxTags: number;
-            writableNotebooksOnly: boolean;
-            includeContainingNotebooks: boolean;
-
-            constructor(args?: { maxNotes?: number; maxNotebooks?: number; maxTags?: number; writableNotebooksOnly?: boolean; includeContainingNotebooks?: boolean; });
-        }
-        /**
-         * This enumeration defines the possible permission levels for a user.
-         * Free accounts will have a level of NORMAL and paid Premium accounts
-         * will have a level of PREMIUM.
-         */
-        enum PrivilegeLevel {
-            'NORMAL' = 1,
-            'PREMIUM' = 3,
-            'VIP' = 5,
-            'MANAGER' = 7,
-            'SUPPORT' = 8,
-            'ADMIN' = 9,
-        }
-
-        /**
-         * Every search query is specified as a sequence of characters.
-         * Currently, only the USER query format is supported.
-         */
-        enum QueryFormat {
-            'USER' = 1,
-            'SEXP' = 2,
-        }
-
-        /**
-         * This enumeration defines the possible sort ordering for notes when
-         * they are returned from a search result.
-         */
-        enum NoteSortOrder {
-            'CREATED' = 1,
-            'UPDATED' = 2,
-            'RELEVANCE' = 3,
-            'UPDATE_SEQUENCE_NUMBER' = 4,
-            'TITLE' = 5,
-        }
-
-        /**
-         * This enumeration defines the possible states of a premium account
-         *
-         * NONE:        the user has never attempted to become a premium subscriber
-         *
-         * PENDING: the user has requested a premium account but their charge has not
-         *     been confirmed
-         *
-         * ACTIVE:    the user has been charged and their premium account is in good
-         *    standing
-         *
-         * FAILED:    the system attempted to charge the was denied. Their premium
-         *     privileges have been revoked. We will periodically attempt to re-validate
-         *     their order.
-         *
-         * CANCELLATION_PENDING: the user has requested that no further charges be made
-         *     but the current account is still active.
-         *
-         * CANCELED: the premium account was canceled either because of failure to pay
-         *     or user cancelation. No more attempts will be made to activate the account.
-         */
-        enum PremiumOrderStatus {
-            'NONE' = 0,
-            'PENDING' = 1,
-            'ACTIVE' = 2,
-            'FAILED' = 3,
-            'CANCELLATION_PENDING' = 4,
-            'CANCELED' = 5,
-        }
-
-        /**
-         * Privilege levels for accessing shared notebooks.
-         *
-         * READ_NOTEBOOK: Recipient is able to read the contents of the shared notebook
-         *     but does to have access to information about other recipients of the
-         *     notebook or the activity stream information.
-         *
-         * MODIFY_NOTEBOOK_PLUS_ACTIVITY: Recipient has rights to read and modify the contents
-         *     of the shared notebook, including the right to move notes to the trash and to create
-         *     notes in the notebook.    The recipient can also access information about other
-         *     recipients and the activity stream.
-         *
-         * READ_NOTEBOOK_PLUS_ACTIVITY: Recipient has READ_NOTEBOOK rights and can also
-         *     access information about other recipients and the activity stream.
-         *
-         * GROUP: If the user belongs to a group, such as a Business, that has a defined
-         *     privilege level, use the privilege level of the group as the privilege for
-         *     the individual.
-         *
-         * FULL_ACCESS: Recipient has full rights to the shared notebook and recipient lists,
-         *     including privilege to revoke and create invitations and to change privilege
-         *     levels on invitations for individuals.    This privilege level is primarily intended
-         *     for use by individual shares.
-         *
-         * BUSINESS_FULL_ACCESS: Intended for use with Business Notebooks, a
-         * BUSINESS_FULL_ACCESS level is FULL_ACCESS with the additional rights to
-         * change how the notebook will appear in the business library, including the
-         * rights to publish and unpublish the notebook from the library.
-         */
-        enum SharedNotebookPrivilegeLevel {
-            'READ_NOTEBOOK' = 0,
-            'MODIFY_NOTEBOOK_PLUS_ACTIVITY' = 1,
-            'READ_NOTEBOOK_PLUS_ACTIVITY' = 2,
-            'GROUP' = 3,
-            'FULL_ACCESS' = 4,
-            'BUSINESS_FULL_ACCESS' = 5,
-        }
-
-        /**
-         * Enumeration of the roles that a User can have within a sponsored group.
-         *
-         * GROUP_MEMBER: The user is a member of the group with no special privileges.
-         *
-         * GROUP_ADMIN: The user is an administrator within the group.
-         *
-         * GROUP_OWNER: The user is the owner of the group.
-         */
-        enum SponsoredGroupRole {
-            'GROUP_MEMBER' = 1,
-            'GROUP_ADMIN' = 2,
-            'GROUP_OWNER' = 3,
-        }
-
-        /**
-         * Enumeration of the roles that a User can have within an Evernote Business account.
-         *
-         * ADMIN: The user is an administrator of the Evernote Business account.
-         *
-         * NORMAL: The user is a regular user within the Evernote Business account.
-         */
-        enum BusinessUserRole {
-            'ADMIN' = 1,
-            'NORMAL' = 2,
-        }
-
-        /**
-         * An enumeration describing restrictions on the domain of shared notebook
-         * instances that are valid for a given operation, as used, for example, in
-         * NotebookRestrictions.
-         *
-         * ONLY_JOINED_OR_PREVIEW: The domain consists of shared notebooks that
-         *     "belong" to the recipient or still available for preview by any recipient.
-         *     Shared notebooks that the recipient has joined (the username has already been
-         *     assigned to our user) are in the domain.    Additionally, shared notebooks
-         *     that allow preview and have not yet been joined are in the domain.
-         *
-         * NO_SHARED_NOTEBOOKS: No shared notebooks are applicable to the operation.
-         */
-        enum SharedNotebookInstanceRestrictions {
-            'ONLY_JOINED_OR_PREVIEW' = 1,
-            'NO_SHARED_NOTEBOOKS' = 2,
-        }
-
-        /**
-         * An enumeration describing the configuration state related to receiving
-         * reminder e-mails from the service.    Reminder e-mails summarize notes
-         * based on their Note.attributes.reminderTime values.
-         *
-         * DO_NOT_SEND: The user has selected to not receive reminder e-mail.
-         *
-         * SEND_DAILY_EMAIL: The user has selected to receive reminder e-mail for those
-         *     days when there is a reminder.
-         */
-        enum ReminderEmailConfig {
-            'DO_NOT_SEND' = 1,
-            'SEND_DAILY_EMAIL' = 2,
-        }
-
-        /**
-         *    In several places, EDAM exchanges blocks of bytes of data for a component
-         *    which may be relatively large.    For example:    the contents of a clipped
-         *    HTML note, the bytes of an embedded image, or the recognition XML for
-         *    a large image.    This structure is used in the protocol to represent
-         *    any of those large blocks of data when they are transmitted or when
-         *    they are only referenced their metadata.
-         *
-         * <dl>
-         *    <dt>bodyHash</dt>
-         *        <dd>This field carries a one-way hash of the contents of the
-         *        data body, in binary form.    The hash function is MD5<br/>
-         *        Length:    EDAM_HASH_LEN (exactly)
-         *        </dd>
-         *
-         *    <dt>size</dt>
-         *        <dd>The length, in bytes, of the data body.
-         *        </dd>
-         *
-         *    <dt>body</dt>
-         *        <dd>This field is set to contain the binary contents of the data
-         *        whenever the resource is being transferred.    If only metadata is
-         *        being exchanged, this field will be empty.    For example, a client could
-         *        notify the service about the change to an attribute for a resource
-         *        without transmitting the binary resource contents.
-         *        </dd>
-         *    </dl>
-         */
-        class Data {
-            bodyHash: string;
-            size: number;
-            body: string;
-
-            constructor(args?: { bodyHash?: string; size?: number; body?: string; });
-        }
-
-        /**
-         *    A structure holding the optional attributes that can be stored
-         *    on a User.    These are generally less critical than the core User fields.
-         *
-         * <dl>
-         *    <dt>defaultLocationName</dt>
-         *        <dd>the location string that should be associated
-         *        with the user in order to determine where notes are taken if not otherwise
-         *        specified.<br/>
-         *        Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
-         *        </dd>
-         *
-         *    <dt>defaultLatitude</dt>
-         *        <dd>if set, this is the latitude that should be
-         *        assigned to any notes that have no other latitude information.
-         *        </dd>
-         *
-         *    <dt>defaultLongitude</dt>
-         *        <dd>if set, this is the longitude that should be
-         *        assigned to any notes that have no other longitude information.
-         *        </dd>
-         *
-         *    <dt>preactivation</dt>
-         *        <dd>if set, the user account is not yet confirmed for
-         *        login.    I.e. the account has been created, but we are still waiting for
-         *        the user to complete the activation step.
-         *        </dd>
-         *
-         *    <dt>viewedPromotions</dt>
-         *        <dd>a list of promotions the user has seen.
-         *         This list may occasionally be modified by the system when promotions are
-         *         no longer available.<br/>
-         *         Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
-         *        </dd>
-         *
-         *    <dt>incomingEmailAddress</dt>
-         *        <dd>if set, this is the email address that the
-         *         user may send email to in order to add an email note directly into the
-         *         account via the SMTP email gateway.    This is the part of the email
-         *         address before the '@' symbol ... our domain is not included.
-         *         If this is not set, the user may not add notes via the gateway.<br/>
-         *         Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
-         *        </dd>
-         *
-         *    <dt>recentMailedAddresses</dt>
-         *        <dd>if set, this will contain a list of email
-         *         addresses that have recently been used as recipients
-         *         of outbound emails by the user.    This can be used to pre-populate a
-         *         list of possible destinations when a user wishes to send a note via
-         *         email.<br/>
-         *         Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX each<br/>
-         *         Max:    EDAM_USER_RECENT_MAILED_ADDRESSES_MAX entries
-         *        </dd>
-         *
-         *    <dt>comments</dt>
-         *        <dd>Free-form text field that may hold general support
-         *         information, etc.<br/>
-         *         Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
-         *        </dd>
-         *
-         *    <dt>dateAgreedToTermsOfService</dt>
-         *        <dd>The date/time when the user agreed to
-         *         the terms of service.    This can be used as the effective "start date"
-         *         for the account.
-         *        </dd>
-         *
-         *    <dt>maxReferrals</dt>
-         *        <dd>The number of referrals that the user is permitted
-         *         to make.
-         *        </dd>
-         *
-         *    <dt>referralCount</dt>
-         *        <dd>The number of referrals sent from this account.
-         *        </dd>
-         *
-         *    <dt>refererCode</dt>
-         *        <dd>A code indicating where the user was sent from. AKA
-         *         promotion code
-         *        </dd>
-         *
-         *    <dt>sentEmailDate</dt>
-         *        <dd>The most recent date when the user sent outbound
-         *         emails from the service.    Used with sentEmailCount to limit the number
-         *         of emails that can be sent per day.
-         *        </dd>
-         *
-         *    <dt>sentEmailCount</dt>
-         *        <dd>The number of emails that were sent from the user
-         *         via the service on sentEmailDate.    Used to enforce a limit on the number
-         *         of emails per user per day to prevent spamming.
-         *        </dd>
-         *
-         *    <dt>dailyEmailLimit</dt>
-         *        <dd>If set, this is the maximum number of emails that
-         *         may be sent in a given day from this account.    If unset, the server will
-         *         use the configured default limit.
-         *        </dd>
-         *
-         *    <dt>emailOptOutDate</dt>
-         *        <dd>If set, this is the date when the user asked
-         *         to be excluded from offers and promotions sent by Evernote.    If not set,
-         *         then the user currently agrees to receive these messages.
-         *        </dd>
-         *
-         *    <dt>partnerEmailOptInDate</dt>
-         *        <dd>If set, this is the date when the user asked
-         *         to be included in offers and promotions sent by Evernote's partners.
-         *         If not sent, then the user currently does not agree to receive these
-         *         emails.
-         *        </dd>
-         *
-         *    <dt>preferredLanguage</dt>
-         *        <dd>a 2 character language codes based on:
-         *                http://ftp.ics.uci.edu/pub/ietf/http/related/iso639.txt used for
-         *             localization purposes to determine what language to use for the web
-         *             interface and for other direct communication (e.g. emails).
-         *        </dd>
-         *
-         *    <dt>preferredCountry</dt>
-         *        <dd>Preferred country code based on ISO 3166-1-alpha-2 indicating the
-         *        users preferred country</dd>
-         *
-         *    <dt>clipFullPage</dt>
-         *        <dd>Boolean flag set to true if the user wants to clip full pages by
-         *        default when they use the web clipper without a selection.</dd>
-         *
-         *    <dt>twitterUserName</dt>
-         *        <dd>The username of the account of someone who has chosen to enable
-         *        Twittering into Evernote.    This value is subject to change, since users
-         *        may change their Twitter user name.</dd>
-         *
-         *    <dt>twitterId</dt>
-         *        <dd>The unique identifier of the user's Twitter account if that user
-         *        has chosen to enable Twittering into Evernote.</dd>
-         *
-         *    <dt>groupName</dt>
-         *        <dd>A name identifier used to identify a particular set of branding and
-         *         light customization.</dd>
-         *
-         *    <dt>recognitionLanguage</dt>
-         *        <dd>a 2 character language codes based on:
-         *                http://ftp.ics.uci.edu/pub/ietf/http/related/iso639.txt
-         *                If set, this is used to determine the language that should be used
-         *                when processing images and PDF files to find text.
-         *                If not set, then the 'preferredLanguage' will be used.
-         *        </dd>
-         *
-         *    <dt>educationalInstitution</dt>
-         *        <dd>a flag indicating that the user is part of an educational institution which
-         *        makes them eligible for discounts on bulk purchases
-         *        </dd>
-         *
-         *    <dt>businessAddress</dt>
-         *        <dd>A string recording the business address of a Sponsored Account user who has requested invoicing.
-         *        </dd>
-         *
-         *    <dt>hideSponsorBilling</dt>
-         *        <dd>A flag indicating whether to hide the billing information on a sponsored
-         *                account owner's settings page
-         *        </dd>
-         *
-         *    <dt>taxExempt</dt>
-         *        <dd>A flag indicating the user's sponsored group is exempt from sale tax
-         *        </dd>
-         *
-         *    <dt>useEmailAutoFiling</dt>
-         *        <dd>A flag indicating whether the user chooses to allow Evernote to automatically
-         *                file and tag emailed notes
-         *        </dd>
-         *
-         *    <dt>reminderEmailConfig</dt>
-         *        <dd>Configuration state for whether or not the user wishes to receive
-         *                reminder e-mail.    This setting applies to both the reminder e-mail sent
-         *                for personal reminder notes and for the reminder e-mail sent for reminder
-         *                notes in the user's business notebooks that the user has configured for
-         *                e-mail notifications.
-         *        </dd>
-         *    </dl>
-         */
-        class UserAttributes {
-            defaultLocationName: string;
-            defaultLatitude: number;
-            defaultLongitude: number;
-            preactivation: boolean;
-            viewedPromotions: string[];
-            incomingEmailAddress: string;
-            recentMailedAddresses: string[];
-            comments: string;
-            dateAgreedToTermsOfService: number;
-            maxReferrals: number;
-            referralCount: number;
-            refererCode: string;
-            sentEmailDate: number;
-            sentEmailCount: number;
-            dailyEmailLimit: number;
-            emailOptOutDate: number;
-            partnerEmailOptInDate: number;
-            preferredLanguage: string;
-            preferredCountry: string;
-            clipFullPage: boolean;
-            twitterUserName: string;
-            twitterId: string;
-            groupName: string;
-            recognitionLanguage: string;
-            referralProof: string;
-            educationalDiscount: boolean;
-            businessAddress: string;
-            hideSponsorBilling: boolean;
-            taxExempt: boolean;
-            useEmailAutoFiling: boolean;
-            reminderEmailConfig: ReminderEmailConfig;
-
-            constructor(args?: { defaultLocationName?: string; defaultLatitude?: number; defaultLongitude?: number; preactivation?: boolean; viewedPromotions?: string[]; incomingEmailAddress?: string; recentMailedAddresses?: string[]; comments?: string; dateAgreedToTermsOfService?: number; maxReferrals?: number; referralCount?: number; refererCode?: string; sentEmailDate?: number; sentEmailCount?: number; dailyEmailLimit?: number; emailOptOutDate?: number; partnerEmailOptInDate?: number; preferredLanguage?: string; preferredCountry?: string; clipFullPage?: boolean; twitterUserName?: string; twitterId?: string; groupName?: string; recognitionLanguage?: string; referralProof?: string; educationalDiscount?: boolean; businessAddress?: string; hideSponsorBilling?: boolean; taxExempt?: boolean; useEmailAutoFiling?: boolean; reminderEmailConfig?: ReminderEmailConfig; });
-        }
-
-        /**
-         *    This represents the bookkeeping information for the user's subscription.
-         *
-         * <dl>
-         *    <dt>uploadLimit</dt>
-         *        <dd>The number of bytes that can be uploaded to the account
-         *        in the current month.    For new notes that are created, this is the length
-         *        of the note content (in Unicode characters) plus the size of each resource
-         *        (in bytes).    For edited notes, this is the the difference between the old
-         *        length and the new length (if this is greater than 0) plus the size of
-         *        each new resource.
-         *        </dd>
-         *    <dt>uploadLimitEnd</dt>
-         *        <dd>The date and time when the current upload limit
-         *        expires.    At this time, the monthly upload count reverts to 0 and a new
-         *        limit is imposed.    This date and time is exclusive, so this is effectively
-         *        the start of the new month.
-         *        </dd>
-         *    <dt>uploadLimitNextMonth</dt>
-         *        <dd> When uploadLimitEnd is reached, the service
-         *        will change uploadLimit to uploadLimitNextMonth. If a premium account is
-         *        canceled, this mechanism will reset the quota appropriately.
-         *        </dd>
-         *    <dt>premiumServiceStatus</dt>
-         *        <dd>Indicates the phases of a premium account
-         *        during the billing process.
-         *        </dd>
-         *    <dt>premiumOrderNumber</dt>
-         *        <dd>The order number used by the commerce system to
-         *        process recurring payments
-         *        </dd>
-         *    <dt>premiumServiceStart</dt>
-         *        <dd>The start date when this premium promotion
-         *        began (this number will get overwritten if a premium service is canceled
-         *        and then re-activated).
-         *        </dd>
-         *    <dt>premiumCommerceService</dt>
-         *        <dd>The commerce system used (paypal, Google
-         *        checkout, etc)
-         *        </dd>
-         *    <dt>premiumServiceSKU</dt>
-         *        <dd>The code associated with the purchase eg. monthly
-         *        or annual purchase. Clients should interpret this value and localize it.
-         *        </dd>
-         *    <dt>lastSuccessfulCharge</dt>
-         *        <dd>Date the last time the user was charged.
-         *        Null if never charged.
-         *        </dd>
-         *    <dt>lastFailedCharge</dt>
-         *        <dd>Date the last time a charge was attempted and
-         *        failed.
-         *        </dd>
-         *    <dt>lastFailedChargeReason</dt>
-         *        <dd>Reason provided for the charge failure
-         *        </dd>
-         *    <dt>nextPaymentDue</dt>
-         *        <dd>The end of the billing cycle. This could be in the
-         *        past if there are failed charges.
-         *        </dd>
-         *    <dt>premiumLockUntil</dt>
-         *        <dd>An internal variable to manage locking operations
-         *        on the commerce variables.
-         *        </dd>
-         *    <dt>updated</dt>
-         *        <dd>The date any modification where made to this record.
-         *        </dd>
-         *    <dt>premiumSubscriptionNumber</dt>
-         *        <dd>The number number identifying the
-         *        recurring subscription used to make the recurring charges.
-         *        </dd>
-         *    <dt>lastRequestedCharge</dt>
-         *        <dd>Date charge last attempted</dd>
-         *    <dt>currency</dt>
-         *        <dd>ISO 4217 currency code</dd>
-         *    <dt>unitPrice</dt>
-         *        <dd>charge in the smallest unit of the currency (e.g. cents for USD)</dd>
-         *    <dt>businessId</dt>
-         *        <dd><i>DEPRECATED:</i>See BusinessUserInfo.</dd>
-         *    <dt>businessName</dt>
-         *        <dd><i>DEPRECATED:</i>See BusinessUserInfo.</dd>
-         *    <dt>businessRole</dt>
-         *        <dd><i>DEPRECATED:</i>See BusinessUserInfo.</dd>
-         *    <dt>unitDiscount</dt>
-         *        <dd>discount per seat in negative amount and smallest unit of the currency (e.g. cents for USD)</dd>
-         *    <dt>nextChargeDate</dt>
-         *        <dd>The next time the user will be charged, may or may not be the same as nextPaymentDue</dd>
-         *    </dl>
-         */
-        class Accounting {
-            uploadLimit: number;
-            uploadLimitEnd: number;
-            uploadLimitNextMonth: number;
-            premiumServiceStatus: PremiumOrderStatus;
-            premiumOrderNumber: string;
-            premiumCommerceService: string;
-            premiumServiceStart: number;
-            premiumServiceSKU: string;
-            lastSuccessfulCharge: number;
-            lastFailedCharge: number;
-            lastFailedChargeReason: string;
-            nextPaymentDue: number;
-            premiumLockUntil: number;
-            updated: number;
-            premiumSubscriptionNumber: string;
-            lastRequestedCharge: number;
-            currency: string;
-            unitPrice: number;
-            businessId: number;
-            businessName: string;
-            businessRole: BusinessUserRole;
-            unitDiscount: number;
-            nextChargeDate: number;
-
-            constructor(args?: { uploadLimit?: number; uploadLimitEnd?: number; uploadLimitNextMonth?: number; premiumServiceStatus?: PremiumOrderStatus; premiumOrderNumber?: string; premiumCommerceService?: string; premiumServiceStart?: number; premiumServiceSKU?: string; lastSuccessfulCharge?: number; lastFailedCharge?: number; lastFailedChargeReason?: string; nextPaymentDue?: number; premiumLockUntil?: number; updated?: number; premiumSubscriptionNumber?: string; lastRequestedCharge?: number; currency?: string; unitPrice?: number; businessId?: number; businessName?: string; businessRole?: BusinessUserRole; unitDiscount?: number; nextChargeDate?: number; });
-        }
-
-        /**
-         * This structure is used to provide information about an Evernote Business
-         * membership, for members who are part of a business.
-         *
-         * <dl>
-         * <dt>businessId</dt>
-         *     <dd>The ID of the Evernote Business account that the user is a member of.
-         * <dt>businessName</dt>
-         *     <dd>The human-readable name of the Evernote Business account that the user
-         *             is a member of.</dd>
-         * <dt>role</dt>
-         *     <dd>The role of the user within the Evernote Business account that
-         *             they are a member of.</dd>
-         * <dt>email</dt>
-         *     <dd>An e-mail address that will be used by the service in the context of your
-         *             Evernote Business activities.    For example, this e-mail address will be used
-         *             when you e-mail a business note, when you update notes in the account of
-         *             your business, etc.    The business e-mail cannot be used for identification
-         *             purposes such as for logging into the service.
-         *     </dd>
-         * </dl>
-         */
-        class BusinessUserInfo {
-            businessId: number;
-            businessName: string;
-            role: BusinessUserRole;
-            email: string;
-
-            constructor(args?: { businessId?: number; businessName?: string; role?: BusinessUserRole; email?: string; });
-        }
-
-        /**
-         *    This structure is used to provide information about a user's Premium account.
-         * <dl>
-         *    <dt>currentTime</dt>
-         *        <dd>
-         *        The server-side date and time when this data was generated.
-         *        </dd>
-         *    <dt>premium</dt>
-         *        <dd>
-         *        True if the user's account is Premium.
-         *        </dd>
-         *    <dt>premiumRecurring</dt>
-         *        <dd>
-         *        True if the user's account is Premium and has a recurring payment method.
-         *        </dd>
-         *    <dt>premiumExpirationDate</dt>
-         *        <dd>
-         *        The date when the user's Premium account expires, or the date when the
-         *        user's account is due for payment if it has a recurring payment method.
-         *        </dd>
-         *    <dt>premiumExtendable</dt>
-         *        <dd>
-         *        True if the user is eligible for purchasing Premium account extensions.
-         *        </dd>
-         *    <dt>premiumPending</dt>
-         *        <dd>
-         *        True if the user's Premium account is pending payment confirmation
-         *        </dd>
-         *    <dt>premiumCancellationPending</dt>
-         *        <dd>
-         *        True if the user has requested that no further charges to be made; the
-         *        Premium account will remain active until it expires.
-         *        </dd>
-         *    <dt>canPurchaseUploadAllowance</dt>
-         *        <dd>
-         *        True if the user is eligible for purchasing additional upload allowance.
-         *        </dd>
-         *    <dt>sponsoredGroupName</dt>
-         *        <dd>
-         *        The name of the sponsored group that the user is part of.
-         *        </dd>
-         *    <dt>sponsoredGroupRole</dt>
-         *        <dd>
-         *        DEPRECATED - will be removed in a future update.
-         *        </dd>
-         *    <dt>premiumUpgradable</dt>
-         *        <dd>
-         *        True if the user is eligible for purchasing Premium account upgrade.
-         *        </dd>
-         *    </dl>
-         */
-        class PremiumInfo {
-            currentTime: number;
-            premium: boolean;
-            premiumRecurring: boolean;
-            premiumExpirationDate: number;
-            premiumExtendable: boolean;
-            premiumPending: boolean;
-            premiumCancellationPending: boolean;
-            canPurchaseUploadAllowance: boolean;
-            sponsoredGroupName: string;
-            sponsoredGroupRole: SponsoredGroupRole;
-            premiumUpgradable: boolean;
-
-            constructor(args?: { currentTime: number; premium: boolean; premiumRecurring: boolean; premiumExpirationDate?: number; premiumExtendable: boolean; premiumPending: boolean; premiumCancellationPending: boolean; canPurchaseUploadAllowance: boolean; sponsoredGroupName?: string; sponsoredGroupRole?: SponsoredGroupRole; premiumUpgradable?: boolean; });
-        }
-
-        /**
-         *    This represents the information about a single user account.
-         * <dl>
-         *    <dt>id</dt>
-         *        <dd>The unique numeric identifier for the account, which will not
-         *        change for the lifetime of the account.
-         *        </dd>
-         *
-         *    <dt>username</dt>
-         *        <dd>The name that uniquely identifies a single user account. This name
-         *        may be presented by the user, along with their password, to log into
-         *        their account.
-         *        May only contain a-z, 0-9, or '-', and may not start or end with the '-'
-         *        <br/>
-         *        Length:    EDAM_USER_USERNAME_LEN_MIN - EDAM_USER_USERNAME_LEN_MAX
-         *        <br/>
-         *        Regex:    EDAM_USER_USERNAME_REGEX
-         *        </dd>
-         *
-         *    <dt>email</dt>
-         *        <dd>The email address registered for the user.    Must comply with
-         *        RFC 2821 and RFC 2822.<br/>
-         *        Third party applications that authenticate using OAuth do not have
-         *        access to this field.
-         *        Length:    EDAM_EMAIL_LEN_MIN - EDAM_EMAIL_LEN_MAX
-         *        <br/>
-         *        Regex:    EDAM_EMAIL_REGEX
-         *        </dd>
-         *
-         *    <dt>name</dt>
-         *        <dd>The printable name of the user, which may be a combination
-         *        of given and family names.    This is used instead of separate "first"
-         *        and "last" names due to variations in international name format/order.
-         *        May not start or end with a whitespace character.    May contain any
-         *        character but carriage return or newline (Unicode classes Zl and Zp).
-         *        <br/>
-         *        Length:    EDAM_USER_NAME_LEN_MIN - EDAM_USER_NAME_LEN_MAX
-         *        <br/>
-         *        Regex:    EDAM_USER_NAME_REGEX
-         *        </dd>
-         *
-         *    <dt>timezone</dt>
-         *        <dd>The zone ID for the user's default location.    If present,
-         *        this may be used to localize the display of any timestamp for which no
-         *        other timezone is available.
-         *        The format must be encoded as a standard zone ID such as
-         *        "America/Los_Angeles" or "GMT+08:00"
-         *        <br/>
-         *        Length:    EDAM_TIMEZONE_LEN_MIN - EDAM_TIMEZONE_LEN_MAX
-         *        <br/>
-         *        Regex:    EDAM_TIMEZONE_REGEX
-         *        </dd>
-         *
-         *    <dt>privilege</dt>
-         *        <dd>The level of access permitted for the user.
-         *        </dd>
-         *
-         *    <dt>created</dt>
-         *        <dd>The date and time when this user account was created in the
-         *        service.
-         *        </dd>
-         *
-         *    <dt>updated</dt>
-         *        <dd>The date and time when this user account was last modified
-         *        in the service.
-         *        </dd>
-         *
-         *    <dt>deleted</dt>
-         *        <dd>If the account has been deleted from the system (e.g. as
-         *        the result of a legal request by the user), the date and time of the
-         *        deletion will be represented here.    If not, this value will not be set.
-         *        </dd>
-         *
-         *    <dt>active</dt>
-         *        <dd>If the user account is available for login and
-         *        synchronization, this flag will be set to true.
-         *        </dd>
-         *
-         *    <dt>shardId</dt>
-         *        <dd>DEPRECATED - Client applications should have no need to use this field.
-         *        </dd>
-         *
-         *    <dt>attributes</dt>
-         *        <dd>If present, this will contain a list of the attributes
-         *        for this user account.
-         *        </dd>
-         *
-         *    <dt>accounting</dt>
-         *        <dd>Bookkeeping information for the user's subscription.
-         *        </dd>
-         *
-         *    <dt>premiumInfo</dt>
-         *        <dd>If present, this will contain a set of commerce information
-         *        relating to the user's premium service level.
-         *        </dd>
-         *
-         *    <dt>businessUserInfo</dt>
-         *        <dd>If present, this will contain a set of business information
-         *        relating to the user's business membership.    If not present, the
-         *        user is not currently part of a business.
-         *        </dd>
-         *    </dl>
-         */
-        class User {
-            id: number;
-            username: string;
-            email: string;
-            name: string;
-            timezone: string;
-            privilege: PrivilegeLevel;
-            created: number;
-            updated: number;
-            deleted: number;
-            active: boolean;
-            shardId: string;
-            attributes: UserAttributes;
-            accounting: Accounting;
-            premiumInfo: PremiumInfo;
-            businessUserInfo: BusinessUserInfo;
-
-            constructor(args?: { id?: number; username?: string; email?: string; name?: string; timezone?: string; privilege?: PrivilegeLevel; created?: number; updated?: number; deleted?: number; active?: boolean; shardId?: string; attributes?: UserAttributes; accounting?: Accounting; premiumInfo?: PremiumInfo; businessUserInfo?: BusinessUserInfo; });
-        }
-
-        /**
-         *    A tag within a user's account is a unique name which may be organized
-         *    a simple hierarchy.
-         * <dl>
-         *    <dt>guid</dt>
-         *        <dd>The unique identifier of this tag. Will be set by the service,
-         *        so may be omitted by the client when creating the Tag.
-         *        <br/>
-         *        Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
-         *        <br/>
-         *        Regex:    EDAM_GUID_REGEX
-         *        </dd>
-         *
-         *    <dt>name</dt>
-         *        <dd>A sequence of characters representing the tag's identifier.
-         *        Case is preserved, but is ignored for comparisons.
-         *        This means that an account may only have one tag with a given name, via
-         *        case-insensitive comparison, so an account may not have both "food" and
-         *        "Food" tags.
-         *        May not contain a comma (','), and may not begin or end with a space.
-         *        <br/>
-         *        Length:    EDAM_TAG_NAME_LEN_MIN - EDAM_TAG_NAME_LEN_MAX
-         *        <br/>
-         *        Regex:    EDAM_TAG_NAME_REGEX
-         *        </dd>
-         *
-         *    <dt>parentGuid</dt>
-         *        <dd>If this is set, then this is the GUID of the tag that
-         *        holds this tag within the tag organizational hierarchy.    If this is
-         *        not set, then the tag has no parent and it is a "top level" tag.
-         *        Cycles are not allowed (e.g. a->parent->parent == a) and will be
-         *        rejected by the service.
-         *        <br/>
-         *        Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
-         *        <br/>
-         *        Regex:    EDAM_GUID_REGEX
-         *        </dd>
-         *
-         *    <dt>updateSequenceNum</dt>
-         *        <dd>A number identifying the last transaction to
-         *        modify the state of this object.    The USN values are sequential within an
-         *        account, and can be used to compare the order of modifications within the
-         *        service.
-         *        </dd>
-         *    </dl>
-         */
-        class Tag {
-            guid: string;
-            name: string;
-            parentGuid: string;
-            updateSequenceNum: number;
-
-            constructor(args?: { guid?: string; name?: string; parentGuid?: string; updateSequenceNum?: number; });
-        }
-
-        /**
-         * A structure that wraps a map of name/value pairs whose values are not
-         * always present in the structure in order to reduce space when obtaining
-         * batches of entities that contain the map.
-         *
-         * When the server provides the client with a LazyMap, it will fill in either
-         * the keysOnly field or the fullMap field, but never both, based on the API
-         * and parameters.
-         *
-         * When a client provides a LazyMap to the server as part of an update to
-         * an object, the server will only update the LazyMap if the fullMap field is
-         * set. If the fullMap field is not set, the server will not make any changes
-         * to the map.
-         *
-         * Check the API documentation of the individual calls involving the LazyMap
-         * for full details including the constraints of the names and values of the
-         * map.
-         *
-         * <dl>
-         * <dt>keysOnly</dt>
-         *     <dd>The set of keys for the map.    This field is ignored by the
-         *             server when set.
-         *     </dd>
-         *
-         * <dt>fullMap</dt>
-         *     <dd>The complete map, including all keys and values.
-         *     </dd>
-         * </dl>
-         */
-        class LazyMap {
-            keysOnly: string[];
-            fullMap: { [k: string]: string; };
-
-            constructor(args?: { keysOnly?: string[]; fullMap?: { [k: string]: string; }; });
-        }
-
-        /**
-         * Structure holding the optional attributes of a Resource
-         * <dl>
-         * <dt>sourceURL</dt>
-         *     <dd>the original location where the resource was hosted
-         *     <br/>
-         *        Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
-         *     </dd>
-         *
-         * <dt>timestamp</dt>
-         *     <dd>the date and time that is associated with this resource
-         *     (e.g. the time embedded in an image from a digital camera with a clock)
-         *     </dd>
-         *
-         * <dt>latitude</dt>
-         *     <dd>the latitude where the resource was captured
-         *     </dd>
-         *
-         * <dt>longitude</dt>
-         *     <dd>the longitude where the resource was captured
-         *     </dd>
-         *
-         * <dt>altitude</dt>
-         *     <dd>the altitude where the resource was captured
-         *     </dd>
-         *
-         * <dt>cameraMake</dt>
-         *     <dd>information about an image's camera, e.g. as embedded in
-         *     the image's EXIF data
-         *     <br/>
-         *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
-         *     </dd>
-         *
-         * <dt>cameraModel</dt>
-         *     <dd>information about an image's camera, e.g. as embedded
-         *     in the image's EXIF data
-         *     <br/>
-         *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
-         *     </dd>
-         *
-         * <dt>clientWillIndex</dt>
-         *     <dd>if true, then the original client that submitted
-         *     the resource plans to submit the recognition index for this resource at a
-         *     later time.
-         *     </dd>
-         *
-         * <dt>recoType</dt>
-         *     <dd>DEPRECATED - this field is no longer set by the service, so should
-         *         be ignored.
-         *     </dd>
-         *
-         * <dt>fileName</dt>
-         *     <dd>if the resource came from a source that provided an
-         *     explicit file name, the original name will be stored here.    Many resources
-         *     come from unnamed sources, so this will not always be set.
-         *     </dd>
-         *
-         * <dt>attachment</dt>
-         *     <dd>this will be true if the resource should be displayed as an attachment,
-         *     or false if the resource should be displayed inline (if possible).
-         *     </dd>
-         *
-         * <dt>applicationData</dt>
-         * <dd>Provides a location for applications to store a relatively small
-         * (4kb) blob of data associated with a Resource that is not visible to the user
-         * and that is opaque to the Evernote service. A single application may use at most
-         * one entry in this map, using its API consumer key as the map key. See the
-         * documentation for LazyMap for a description of when the actual map values
-         * are returned by the service.
-         * <p>To safely add or modify your application's entry in the map, use
-         * NoteStore.setResourceApplicationDataEntry. To safely remove your application's
-         * entry from the map, use NoteStore.unsetResourceApplicationDataEntry.</p>
-         * Minimum length of a name (key): EDAM_APPLICATIONDATA_NAME_LEN_MIN
-         * <br/>
-         * Sum max size of key and value: EDAM_APPLICATIONDATA_ENTRY_LEN_MAX
-         * <br/>
-         * Syntax regex for name (key): EDAM_APPLICATIONDATA_NAME_REGEX
-         * </dd>
-         *
-         * </dl>
-         */
-        class ResourceAttributes {
-            sourceURL: string;
-            timestamp: number;
-            latitude: number;
-            longitude: number;
-            altitude: number;
-            cameraMake: string;
-            cameraModel: string;
-            clientWillIndex: boolean;
-            recoType: string;
-            fileName: string;
-            attachment: boolean;
-            applicationData: LazyMap;
-
-            constructor(args?: { sourceURL?: string; timestamp?: number; latitude?: number; longitude?: number; altitude?: number; cameraMake?: string; cameraModel?: string; clientWillIndex?: boolean; recoType?: string; fileName?: string; attachment?: boolean; applicationData?: LazyMap; });
-        }
-
-        /**
-         * Every media file that is embedded or attached to a note is represented
-         * through a Resource entry.
-         * <dl>
-         * <dt>guid</dt>
-         *     <dd>The unique identifier of this resource.    Will be set whenever
-         *     a resource is retrieved from the service, but may be null when a client
-         *     is creating a resource.
-         *     <br/>
-         *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_GUID_REGEX
-         *     </dd>
-         *
-         * <dt>noteGuid</dt>
-         *     <dd>The unique identifier of the Note that holds this
-         *     Resource. Will be set whenever the resource is retrieved from the service,
-         *     but may be null when a client is creating a resource.
-         *     <br/>
-         *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_GUID_REGEX
-         *     </dd>
-         *
-         * <dt>data</dt>
-         *     <dd>The contents of the resource.
-         *     Maximum length:    The data.body is limited to EDAM_RESOURCE_SIZE_MAX_FREE
-         *     for free accounts and EDAM_RESOURCE_SIZE_MAX_PREMIUM for premium accounts.
-         *     </dd>
-         *
-         * <dt>mime</dt>
-         *     <dd>The MIME type for the embedded resource.    E.g. "image/gif"
-         *     <br/>
-         *     Length:    EDAM_MIME_LEN_MIN - EDAM_MIME_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_MIME_REGEX
-         *     </dd>
-         *
-         * <dt>width</dt>
-         *     <dd>If set, this contains the display width of this resource, in
-         *     pixels.
-         *     </dd>
-         *
-         * <dt>height</dt>
-         *     <dd>If set, this contains the display height of this resource,
-         *     in pixels.
-         *     </dd>
-         *
-         * <dt>duration</dt>
-         *     <dd>DEPRECATED: ignored.
-         *     </dd>
-         *
-         * <dt>active</dt>
-         *     <dd>DEPRECATED: ignored.
-         *     </dd>
-         *
-         * <dt>recognition</dt>
-         *     <dd>If set, this will hold the encoded data that provides
-         *     information on search and recognition within this resource.
-         *     </dd>
-         *
-         * <dt>attributes</dt>
-         *     <dd>A list of the attributes for this resource.
-         *     </dd>
-         *
-         * <dt>updateSequenceNum</dt>
-         *     <dd>A number identifying the last transaction to
-         *     modify the state of this object. The USN values are sequential within an
-         *     account, and can be used to compare the order of modifications within the
-         *     service.
-         *     </dd>
-         *
-         * <dt>alternateData</dt>
-         *     <dd>Some Resources may be assigned an alternate data format by the service
-         *     which may be more appropriate for indexing or rendering than the original
-         *     data provided by the user.    In these cases, the alternate data form will
-         *     be available via this Data element.    If a Resource has no alternate form,
-         *     this field will be unset.</dd>
-         * </dl>
-         */
-        class Resource {
-            guid: string;
-            noteGuid: string;
-            data: Data;
-            mime: string;
-            width: number;
-            height: number;
-            duration: number;
-            active: boolean;
-            recognition: Data;
-            attributes: ResourceAttributes;
-            updateSequenceNum: number;
-            alternateData: Data;
-
-            constructor(args?: { guid?: string; noteGuid?: string; data?: Data; mime?: string; width?: number; height?: number; duration?: number; active?: boolean; recognition?: Data; attributes?: ResourceAttributes; updateSequenceNum?: number; alternateData?: Data; });
-        }
-
-        /**
-         * The list of optional attributes that can be stored on a note.
-         * <dl>
-         * <dt>subjectDate</dt>
-         *     <dd>time that the note refers to
-         *     </dd>
-         *
-         * <dt>latitude</dt>
-         *     <dd>the latitude where the note was taken
-         *     </dd>
-         *
-         * <dt>longitude</dt>
-         *     <dd>the longitude where the note was taken
-         *     </dd>
-         *
-         * <dt>altitude</dt>
-         *     <dd>the altitude where the note was taken
-         *     </dd>
-         *
-         * <dt>author</dt>
-         *     <dd>the author of the content of the note
-         *     <br/>
-         *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
-         *     </dd>
-         *
-         * <dt>source</dt>
-         *     <dd>the method that the note was added to the account, if the
-         *     note wasn't directly authored in an Evernote desktop client.
-         *     <br/>
-         *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
-         *     </dd>
-         *
-         * <dt>sourceURL</dt>
-         *     <dd>the original location where the resource was hosted. For web clips,
-         *     this will be the URL of the page that was clipped.
-         *     <br/>
-         *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
-         *     </dd>
-         *
-         * <dt>sourceApplication</dt>
-         *     <dd>an identifying string for the application that
-         *     created this note.    This string does not have a guaranteed syntax or
-         *     structure -- it is intended for human inspection and tracking.
-         *     <br/>
-         *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
-         *     </dd>
-         *
-         * <dt>shareDate</dt>
-         *    <dd>The date and time when this note was directly shared via its own URL.
-         *    This is only set on notes that were individually shared - it is independent
-         *    of any notebook-level sharing of the containing notebook. This field
-         *    is treated as "read-only" for clients; the server will ignore changes
-         *    to this field from an external client.
-         *    </dd>
-         *
-         * <dt>reminderOrder</dt>
-         * <dd>The set of notes with this parameter set are considered
-         * "reminders" and are to be treated specially by clients to give them
-         * higher UI prominence within a notebook.    The value is used to sort
-         * the reminder notes within the notebook with higher values
-         * representing greater prominence.    Outside of the context of a
-         * notebook, the value of this parameter is undefined.    The value is
-         * not intended to be compared to the values of reminder notes in
-         * other notebooks.    In order to allow clients to place a note at a
-         * higher precedence than other notes, you should never set a value
-         * greater than the current time (as defined for a Timetstamp). To
-         * place a note at higher precedence than existing notes, set the
-         * value to the current time as defined for a timestamp (milliseconds
-         * since the epoch).    Synchronizing clients must remember the time when
-         * the update was performed, using the local clock on the client,
-         * and use that value when they later upload the note to the service.
-         * Clients must not set the reminderOrder to the reminderTime as the
-         * reminderTime could be in the future.    Those two fields are never
-         * intended to be related.    The correct value for reminderOrder field
-         * for new notes is the "current" time when the user indicated that
-         * the note is a reminder.    Clients may implement a separate
-         * "sort by date" feature to show notes ordered by reminderTime.
-         * Whenever a reminderDoneTime or reminderTime is set but a
-         * reminderOrder is not set, the server will fill in the current
-         * server time for the reminderOrder field.</dd>
-         *
-         * <dt>reminderDoneTime</dt>
-         * <dd>The date and time when a user dismissed/"marked done" the reminder
-         * on the note.    Users typically do not manually set this value directly
-         * as it is set to the time when the user dismissed/"marked done" the
-         * reminder.</dd>
-         *
-         * <dt>reminderTime</dt>
-         * <dd>The date and time a user has selected to be reminded of the note.
-         * A note with this value set is known as a "reminder" and the user can
-         * be reminded, via e-mail or client-specific notifications, of the note
-         * when the time is reached or about to be reached.    When a user sets
-         * a reminder time on a note that has a reminder done time, and that
-         * reminder time is in the future, then the reminder done time should be
-         * cleared.    This should happen regardless of any existing reminder time
-         * that may have previously existed on the note.</dd>
-         *
-         * <dt>placeName</dt>
-         * <dd>Allows the user to assign a human-readable location name associated
-         * with a note. Users may assign values like 'Home' and 'Work'. Place
-         * names may also be populated with values from geonames database
-         * (e.g., a restaurant name). Applications are encouraged to normalize values
-         * so that grouping values by place name provides a useful result. Applications
-         * MUST NOT automatically add place name values based on geolocation without
-         * confirmation from the user; that is, the value in this field should be
-         * more useful than a simple automated lookup based on the note's latitude
-         * and longitude.</dd>
-         *
-         * <dt>contentClass</dt>
-         * <dd>The class (or type) of note. This field is used to indicate to
-         * clients that special structured information is represented within
-         * the note such that special rules apply when making
-         * modifications. If contentClass is set and the client
-         * application does not specifically support the specified class,
-         * the client MUST treat the note as read-only. In this case, the
-         * client MAY modify the note's notebook and tags via the
-         * Note.notebookGuid and Note.tagGuids fields.    The client MAY also
-         * modify the reminderOrder field as well as the reminderTime and
-         * reminderDoneTime fields.
-         * <p>Applications should set contentClass only when they are creating notes
-         * that contain structured information that needs to be maintained in order
-         * for the user to be able to use the note within that application.
-         * Setting contentClass makes a note read-only in other applications, so
-         * there is a trade-off when an application chooses to use contentClass.
-         * Applications that set contentClass when creating notes must use a contentClass
-         * string of the form <i>CompanyName.ApplicationName</i> to ensure uniqueness.</p>
-         * Length restrictions: EDAM_NOTE_CONTENT_CLASS_LEN_MIN, EDAM_NOTE_CONTENT_CLASS_LEN_MAX
-         * <br/>
-         * Regex: EDAM_NOTE_CONTENT_CLASS_REGEX
-         * </dd>
-         *
-         * <dt>applicationData</dt>
-         * <dd>Provides a location for applications to store a relatively small
-         * (4kb) blob of data that is not meant to be visible to the user and
-         * that is opaque to the Evernote service. A single application may use at most
-         * one entry in this map, using its API consumer key as the map key. See the
-         * documentation for LazyMap for a description of when the actual map values
-         * are returned by the service.
-         * <p>To safely add or modify your application's entry in the map, use
-         * NoteStore.setNoteApplicationDataEntry. To safely remove your application's
-         * entry from the map, use NoteStore.unsetNoteApplicationDataEntry.</p>
-         * Minimum length of a name (key): EDAM_APPLICATIONDATA_NAME_LEN_MIN
-         * <br/>
-         * Sum max size of key and value: EDAM_APPLICATIONDATA_ENTRY_LEN_MAX
-         * <br/>
-         * Syntax regex for name (key): EDAM_APPLICATIONDATA_NAME_REGEX
-         * </dd>
-         *
-         * <dt>creatorId</dt>
-         * <dd>The numeric user ID of the user who originally created the note.</dd>
-         *
-         * <dt>lastEditedBy</dt>
-         * <dd>An indication of who made the last change to the note.    If you are
-         * accessing the note via a shared notebook to which you have modification
-         * rights, or if you are the owner of the notebook to which the note belongs,
-         * then you have access to the value.    In this case, the value will be
-         * unset if the owner of the notebook containing the note was the last to
-         * make the modification, else it will be a string describing the
-         * guest who made the last edit.    If you do not have access to this value,
-         * it will be left unset.    This field is read-only by clients.    The server
-         * will ignore all values set by clients into this field.</dd>
-         *
-         * <dt>lastEditorId</dt>
-         * <dd>The numeric user ID of the user described in lastEditedBy.</dd>
-         *
-         * <dt>classifications</dt>
-         * <dd>A map of classifications applied to the note by clients or by the
-         * Evernote service. The key is the string name of the classification type,
-         * and the value is a constant that begins with CLASSIFICATION_.</dd>
-         *
-         * </dl>
-         */
-        class NoteAttributes {
-            subjectDate: number;
-            latitude: number;
-            longitude: number;
-            altitude: number;
-            author: string;
-            source: string;
-            sourceURL: string;
-            sourceApplication: string;
-            shareDate: number;
-            reminderOrder: number;
-            reminderDoneTime: number;
-            reminderTime: number;
-            placeName: string;
-            contentClass: string;
-            applicationData: LazyMap;
-            lastEditedBy: string;
-            classifications: { [k: string]: string; };
-            creatorId: number;
-            lastEditorId: number;
-
-            constructor(args?: { subjectDate?: number; latitude?: number; longitude?: number; altitude?: number; author?: string; source?: string; sourceURL?: string; sourceApplication?: string; shareDate?: number; reminderOrder?: number; reminderDoneTime?: number; reminderTime?: number; placeName?: string; contentClass?: string; applicationData?: LazyMap; lastEditedBy?: string; classifications?: { [k: string]: string; }; creatorId?: number; lastEditorId?: number; });
-        }
-
-        /**
-         * Represents a single note in the user's account.
-         *
-         * <dl>
-         * <dt>guid</dt>
-         *     <dd>The unique identifier of this note.    Will be set by the
-         *     server, but will be omitted by clients calling NoteStore.createNote()
-         *     <br/>
-         *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_GUID_REGEX
-         *     </dd>
-         *
-         * <dt>title</dt>
-         *     <dd>The subject of the note.    Can't begin or end with a space.
-         *     <br/>
-         *     Length:    EDAM_NOTE_TITLE_LEN_MIN - EDAM_NOTE_TITLE_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_NOTE_TITLE_REGEX
-         *     </dd>
-         *
-         * <dt>content</dt>
-         *     <dd>The XHTML block that makes up the note.    This is
-         *     the canonical form of the note's contents, so will include abstract
-         *     Evernote tags for internal resource references.    A client may create
-         *     a separate transformed version of this content for internal presentation,
-         *     but the same canonical bytes should be used for transmission and
-         *     comparison unless the user chooses to modify their content.
-         *     <br/>
-         *     Length:    EDAM_NOTE_CONTENT_LEN_MIN - EDAM_NOTE_CONTENT_LEN_MAX
-         *     </dd>
-         *
-         * <dt>contentHash</dt>
-         *     <dd>The binary MD5 checksum of the UTF-8 encoded content
-         *     body. This will always be set by the server, but clients may choose to omit
-         *     this when they submit a note with content.
-         *     <br/>
-         *     Length:    EDAM_HASH_LEN (exactly)
-         *     </dd>
-         *
-         * <dt>contentLength</dt>
-         *     <dd>The number of Unicode characters in the content of
-         *     the note.    This will always be set by the service, but clients may choose
-         *     to omit this value when they submit a Note.
-         *     </dd>
-         *
-         * <dt>created</dt>
-         *     <dd>The date and time when the note was created in one of the
-         *     clients.    In most cases, this will match the user's sense of when
-         *     the note was created, and ordering between notes will be based on
-         *     ordering of this field.    However, this is not a "reliable" timestamp
-         *     if a client has an incorrect clock, so it cannot provide a true absolute
-         *     ordering between notes.    Notes created directly through the service
-         *     (e.g. via the web GUI) will have an absolutely ordered "created" value.
-         *     </dd>
-         *
-         * <dt>updated</dt>
-         *     <dd>The date and time when the note was last modified in one of
-         *     the clients.    In most cases, this will match the user's sense of when
-         *     the note was modified, but this field may not be absolutely reliable
-         *     due to the possibility of client clock errors.
-         *     </dd>
-         *
-         * <dt>deleted</dt>
-         *     <dd>If present, the note is considered "deleted", and this
-         *     stores the date and time when the note was deleted by one of the clients.
-         *     In most cases, this will match the user's sense of when the note was
-         *     deleted, but this field may be unreliable due to the possibility of
-         *     client clock errors.
-         *     </dd>
-         *
-         * <dt>active</dt>
-         *     <dd>If the note is available for normal actions and viewing,
-         *     this flag will be set to true.
-         *     </dd>
-         *
-         * <dt>updateSequenceNum</dt>
-         *     <dd>A number identifying the last transaction to
-         *     modify the state of this note (including changes to the note's attributes
-         *     or resources).    The USN values are sequential within an account,
-         *     and can be used to compare the order of modifications within the service.
-         *     </dd>
-         *
-         * <dt>notebookGuid</dt>
-         *     <dd>The unique identifier of the notebook that contains
-         *     this note.    If no notebookGuid is provided on a call to createNote(), the
-         *     default notebook will be used instead.
-         *     <br/>
-         *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_GUID_REGEX
-         *     </dd>
-         *
-         * <dt>tagGuids</dt>
-         *     <dd>A list of the GUID identifiers for tags that are applied to this note.
-         *     This may be provided in a call to createNote() to unambiguously
-         *     the tags that should be assigned to the new note.    Alternately, clients
-         *     may pass the names of desired tags via the 'tagNames' field during
-         *     note creation.
-         *     If the list of tags are omitted on a call to createNote(), then
-         *     the server will assume that no changes have been made to the resources.
-         *     Maximum:    EDAM_NOTE_TAGS_MAX tags per note
-         *     </dd>
-         *
-         * <dt>resources</dt>
-         *     <dd>The list of resources that are embedded within this note.
-         *     If the list of resources are omitted on a call to updateNote(), then
-         *     the server will assume that no changes have been made to the resources.
-         *     The binary contents of the resources must be provided when the resource
-         *     is first sent to the service, but it will be omitted by the service when
-         *     the Note is returned in the future.
-         *     Maximum:    EDAM_NOTE_RESOURCES_MAX resources per note
-         *     </dd>
-         *
-         * <dt>attributes</dt>
-         *     <dd>A list of the attributes for this note.
-         *     If the list of attributes are omitted on a call to updateNote(), then
-         *     the server will assume that no changes have been made to the resources.
-         *     </dd>
-         *
-         * <dt>tagNames</dt>
-         *     <dd>May be provided by clients during calls to createNote() as an
-         *     alternative to providing the tagGuids of existing tags.    If any tagNames
-         *     are provided during createNote(), these will be found, or created if they
-         *     don't already exist.    Created tags will have no parent (they will be at
-         *     the top level of the tag panel).
-         *     </dd>
-         * </dl>
-         */
-        class Note {
-            guid: string;
-            title: string;
-            content: string;
-            contentHash: string;
-            contentLength: number;
-            created: number;
-            updated: number;
-            deleted: number;
-            active: boolean;
-            updateSequenceNum: number;
-            notebookGuid: string;
-            tagGuids: string[];
-            resources: Resource[];
-            attributes: NoteAttributes;
-            tagNames: string[];
-
-            constructor(args?: { guid?: string; title?: string; content?: string; contentHash?: string; contentLength?: number; created?: number; updated?: number; deleted?: number; active?: boolean; updateSequenceNum?: number; notebookGuid?: string; tagGuids?: string[]; resources?: Resource[]; attributes?: NoteAttributes; tagNames?: string[]; });
-        }
-
-        /**
-         * If a Notebook has been opened to the public, the Notebook will have a
-         * reference to one of these structures, which gives the location and optional
-         * description of the externally-visible public Notebook.
-         * <dl>
-         * <dt>uri</dt>
-         *     <dd>If this field is present, then the notebook is published for
-         *     mass consumption on the Internet under the provided URI, which is
-         *     relative to a defined base publishing URI defined by the service.
-         *     This field can only be modified via the web service GUI ... publishing
-         *     cannot be modified via an offline client.
-         *     <br/>
-         *     Length:    EDAM_PUBLISHING_URI_LEN_MIN - EDAM_PUBLISHING_URI_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_PUBLISHING_URI_REGEX
-         *     </dd>
-         *
-         * <dt>order</dt>
-         *     <dd>When the notes are publicly displayed, they will be sorted
-         *     based on the requested criteria.
-         *     </dd>
-         *
-         * <dt>ascending</dt>
-         *     <dd>If this is set to true, then the public notes will be
-         *     displayed in ascending order (e.g. from oldest to newest).    Otherwise,
-         *     the notes will be displayed in descending order (e.g. newest to oldest).
-         *     </dd>
-         *
-         * <dt>publicDescription</dt>
-         *     <dd>This field may be used to provide a short
-         *     description of the notebook, which may be displayed when (e.g.) the
-         *     notebook is shown in a public view.    Can't begin or end with a space.
-         *     <br/>
-         *     Length:    EDAM_PUBLISHING_DESCRIPTION_LEN_MIN -
-         *                        EDAM_PUBLISHING_DESCRIPTION_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_PUBLISHING_DESCRIPTION_REGEX
-         *     </dd>
-         *
-         * </dl>
-         */
-        class Publishing {
-            uri: string;
-            order: NoteSortOrder;
-            ascending: boolean;
-            publicDescription: string;
-
-            constructor(args?: { uri?: string; order?: NoteSortOrder; ascending?: boolean; publicDescription?: string; });
-        }
-
-        /**
-         * If a Notebook contained in an Evernote Business account has been published
-         * the to business library, the Notebook will have a reference to one of these
-         * structures, which specifies how the Notebook will be represented in the
-         * library.
-         *
-         * <dl>
-         * <dt>notebookDescription</dt>
-         *     <dd>A short description of the notebook's content that will be displayed
-         *             in the business library user interface. The description may not begin
-         *             or end with whitespace.
-         *     <br/>
-         *     Length: EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_LEN_MIN -
-         *                     EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_REGEX
-         *     </dd>
-         *
-         * <dt>privilege</dt>
-         *     <dd>The privileges that will be granted to users who join the notebook through
-         *             the business library.
-         *     </dd>
-         *
-         * <dt>recommended</dt>
-         *     <dd>Whether the notebook should be "recommended" when displayed in the business
-         *             library user interface.
-         *     </dd>
-         * </dl>
-         */
-        class BusinessNotebook {
-            notebookDescription: string;
-            privilege: SharedNotebookPrivilegeLevel;
-            recommended: boolean;
-
-            constructor(args?: { notebookDescription?: string; privilege?: SharedNotebookPrivilegeLevel; recommended?: boolean; });
-        }
-
-        /**
-         * A structure defining the scope of a SavedSearch.
-         *
-         * <dl>
-         *     <dt>includeAccount</dt>
-         *     <dd>The search should include notes from the account that contains the SavedSearch.</dd>
-         *
-         *     <dt>includePersonalLinkedNotebooks</dt>
-         *     <dd>The search should include notes within those shared notebooks
-         *     that the user has joined that are NOT business notebooks.</dd>
-         *
-         *     <dt>includeBusinessLinkedNotebooks</dt>
-         *     <dd>The search should include notes within those shared notebooks
-         *     that the user has joined that are business notebooks in the business that
-         *     the user is currently a member of.</dd>
-         * </dl>
-         */
-        class SavedSearchScope {
-            includeAccount: boolean;
-            includePersonalLinkedNotebooks: boolean;
-            includeBusinessLinkedNotebooks: boolean;
-
-            constructor(args?: { includeAccount?: boolean; includePersonalLinkedNotebooks?: boolean; includeBusinessLinkedNotebooks?: boolean; });
-        }
-
-        /**
-         * A named search associated with the account that can be quickly re-used.
-         * <dl>
-         * <dt>guid</dt>
-         *     <dd>The unique identifier of this search.    Will be set by the
-         *     service, so may be omitted by the client when creating.
-         *     <br/>
-         *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_GUID_REGEX
-         *     </dd>
-         *
-         * <dt>name</dt>
-         *     <dd>The name of the saved search to display in the GUI.    The
-         *     account may only contain one search with a given name (case-insensitive
-         *     compare). Can't begin or end with a space.
-         *     <br/>
-         *     Length:    EDAM_SAVED_SEARCH_NAME_LEN_MIN - EDAM_SAVED_SEARCH_NAME_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_SAVED_SEARCH_NAME_REGEX
-         *     </dd>
-         *
-         * <dt>query</dt>
-         *     <dd>A string expressing the search to be performed.
-         *     <br/>
-         *     Length:    EDAM_SAVED_SEARCH_QUERY_LEN_MIN - EDAM_SAVED_SEARCH_QUERY_LEN_MAX
-         *     </dd>
-         *
-         * <dt>format</dt>
-         *     <dd>The format of the query string, to determine how to parse
-         *     and process it.
-         *     </dd>
-         *
-         * <dt>updateSequenceNum</dt>
-         *     <dd>A number identifying the last transaction to
-         *     modify the state of this object.    The USN values are sequential within an
-         *     account, and can be used to compare the order of modifications within the
-         *     service.
-         *     </dd>
-         *
-         * <dt>scope</dt>
-         *     <dd><p>Specifies the set of notes that should be included in the search, if
-         *        possible.</p>
-         *        <p>Clients are expected to search as much of the desired scope as possible,
-         *        with the understanding that a given client may not be able to cover the full
-         *        specified scope. For example, when executing a search that includes notes in both
-         *        the owner's account and business notebooks, a mobile client may choose to only
-         *        search within the user's account because it is not capable of searching both
-         *        scopes simultaneously. When a search across multiple scopes is not possible,
-         *        a client may choose which scope to search based on the current application
-         *        context. If a client cannot search any of the desired scopes, it should refuse
-         *        to execute the search.</p>
-         *        </dd>
-         * </dl>
-         */
-        class SavedSearch {
-            guid: string;
-            name: string;
-            query: string;
-            format: QueryFormat;
-            updateSequenceNum: number;
-            scope: SavedSearchScope;
-
-            constructor(args?: { guid?: string; name?: string; query?: string; format?: QueryFormat; updateSequenceNum?: number; scope?: SavedSearchScope; });
-        }
-
-        /**
-         * Settings meant for the recipient of a shared notebook, such as
-         * for indicating which types of notifications the recipient wishes
-         * for reminders, etc.
-         *
-         * The reminderNotifyEmail and reminderNotifyInApp fields have a
-         * 3-state read value but a 2-state write value.    On read, it is
-         * possible to observe "unset", true, or false.    The initial state is
-         * "unset".    When you choose to set a value, you may set it to either
-         * true or false, but you cannot unset the value.    Once one of these
-         * members has a true/false value, it will always have a true/false
-         * value.
-         *
-         * <dl>
-         * <dt>reminderNotifyEmail</dt>
-         * <dd>Indicates that the user wishes to receive daily e-mail notifications
-         *         for reminders associated with the shared notebook.    This may be
-         *         true only for business notebooks that belong to the business of
-         *         which the user is a member.    You may only set this value on a
-         *         notebook in your business.</dd>
-         * <dt>reminderNotifyInApp</dt>
-         * <dd>Indicates that the user wishes to receive notifications for
-         *         reminders by applications that support providing such
-         *         notifications.    The exact nature of the notification is defined
-         *         by the individual applications.</dd>
-         * </dl>
-         *
-         */
-        class SharedNotebookRecipientSettings {
-            reminderNotifyEmail: boolean;
-            reminderNotifyInApp: boolean;
-
-            constructor(args?: { reminderNotifyEmail?: boolean; reminderNotifyInApp?: boolean; });
-        }
-
-        /**
-         * Shared notebooks represent a relationship between a notebook and a single
-         * share invitation recipient.
-         * <dl>
-         * <dt>id</dt>
-         * <dd>the primary identifier of the share</dd>
-         *
-         * <dt>userId</dt>
-         * <dd>the user id of the owner of the notebook</dd>
-         *
-         * <dt>notebookGuid</dt>
-         * <dd>the GUID of the associated notebook shared.</dd>
-         *
-         * <dt>email</dt>
-         * <dd>the email address of the recipient - used by the notebook
-         * owner to identify who they shared with.</dd>
-         *
-         * <dt>notebookModifiable</dt>
-         * <dd>(DEPRECATED) a flag indicating the share is read/write -otherwise it's read
-         *         only.    This field is deprecated in favor of the new "privilege" field.</dd>
-         *
-         * <dt>requireLogin</dt>
-         * <dd>(DEPRECATED) indicates that a user must login to access the share.    This
-         *         field is deprecated and will be "true" for all new shared notebooks.    It
-         *         is read-only and ignored when creating or modifying a shared notebook,
-         *         except that a shared notebook can be modified to require login.
-         *         See "allowPreview" for information on privileges and shared notebooks.</dd>
-         *
-         * <dt>serviceCreated</dt>
-         * <dd>the date the owner first created the share with the specific email
-         *     address</dd>
-         *
-         * <dt>serviceUpdated</dt>
-         * <dd>the date the shared notebook was last updated on the service.    This
-         *         will be updated when authenticateToSharedNotebook is called the first
-         *         time with a shared notebook requiring login (i.e. when the username is
-         *         bound to that shared notebook).</dd>
-         *
-         * <dt>username</dt>
-         * <dd>the username of the user who can access this share.
-         *     Once it's assigned it cannot be changed.</dd>
-         *
-         * <dt>privilege</dt>
-         * <dd>The privilege level granted to the notebook, activity stream, and
-         *         invitations.    See the corresponding enumeration for details.</dd>
-         *
-         * <dt>allowPreview</dt>
-         * <dd>Whether or not to grant "READ_NOTEBOOK" privilege without an
-         *         authentication token, for authenticateToSharedNotebook(...).    With
-         *         the change to "requireLogin" always being true for new shared
-         *         notebooks, this is the only way to access a shared notebook without
-         *         an authorization token.    This setting expires after the first use
-         *         of authenticateToSharedNotebook(...) with a valid authentication
-         *         token.</dd>
-         *
-         * <dt>recipientSettings</dt>
-         * <dd>Settings intended for use only by the recipient of this shared
-         *         notebook.    You should skip setting this value unless you want
-         *         to change the value contained inside the structure, and only if
-         *         you are the recipient.</dd>
-         * </dl>
-         */
-        class SharedNotebook {
-            id: number;
-            userId: number;
-            notebookGuid: string;
-            email: string;
-            notebookModifiable: boolean;
-            requireLogin: boolean;
-            serviceCreated: number;
-            serviceUpdated: number;
-            shareKey: string;
-            username: string;
-            privilege: SharedNotebookPrivilegeLevel;
-            allowPreview: boolean;
-            recipientSettings: SharedNotebookRecipientSettings;
-
-            constructor(args?: { id?: number; userId?: number; notebookGuid?: string; email?: string; notebookModifiable?: boolean; requireLogin?: boolean; serviceCreated?: number; serviceUpdated?: number; shareKey?: string; username?: string; privilege?: SharedNotebookPrivilegeLevel; allowPreview?: boolean; recipientSettings?: SharedNotebookRecipientSettings; });
-        }
-
-        /**
-         * This structure captures information about the types of operations
-         * that cannot be performed on a given notebook with a type of
-         * authenticated access and credentials.    The values filled into this
-         * structure are based on then-current values in the server database
-         * for shared notebooks and notebook publishing records, as well as
-         * information related to the authentication token.    Information from
-         * the authentication token includes the application that is accessing
-         * the server, as defined by the permissions granted by consumer (api)
-         * key, and the method used to obtain the token, for example via
-         * authenticateToSharedNotebook, authenticateToBusiness, etc.    Note
-         * that changes to values in this structure that are the result of
-         * shared notebook or publishing record changes are communicated to
-         * the client via a change in the notebook USN during sync.    It is
-         * important to use the same access method, parameters, and consumer
-         * key in order obtain correct results from the sync engine.
-         *
-         * The server has the final say on what is allowed as values may
-         * change between calls to obtain NotebookRestrictions instances
-         * and to operate on data on the service.
-         *
-         * If the following are set and true, then the given restriction is
-         * in effect, as accessed by the same authentication token from which
-         * the values were obtained.
-         *
-         * <dt>noReadNotes</dt>
-         *     <dd>The client is not able to read notes from the service and
-         *     the notebook is write-only.
-         *     </dd>
-         * <dt>noCreateNotes</dt>
-         *     <dd>The client may not create new notes in the notebook.
-         *     </dd>
-         * <dt>noUpdateNotes</dt>
-         *     <dd>The client may not update notes currently in the notebook.
-         *     </dd>
-         * <dt>noExpungeNotes</dt>
-         *     <dd>The client may not expunge notes currently in the notebook.
-         *     </dd>
-         * <dt>noShareNotes</dt>
-         *     <dd>The client may not share notes in the notebook via the
-         *     shareNote method.
-         *     </dd>
-         * <dt>noEmailNotes</dt>
-         *     <dd>The client may not e-mail notes via the Evernote service by
-         *     using the emailNote method.
-         *     </dd>
-         * <dt>noSendMessageToRecipients</dt>
-         *     <dd>The client may not send messages to the share recipients of
-         *     the notebook.
-         *     </dd>
-         * <dt>noUpdateNotebook</dt>
-         *     <dd>The client may not update the Notebook object itself, for
-         *     example, via the updateNotebook method.
-         *     </dd>
-         * <dt>noExpungeNotebook</dt>
-         *     <dd>The client may not expunge the Notebook object itself, for
-         *     example, via the expungeNotebook method.
-         *     </dd>
-         * <dt>noSetDefaultNotebook</dt>
-         *     <dd>The client may not set this notebook to be the default notebook.
-         *     The caller should leave Notebook.defaultNotebook unset.
-         *     </dd>
-         * <dt>noSetNotebookStack</dt>
-         *     <dd>If the client is able to update the Notebook, the Notebook.stack
-         *     value may not be set.
-         *     </dd>
-         * <dt>noPublishToPublic</dt>
-         *     <dd>The client may not change the publish the notebook to the public.
-         *     For example, business notebooks may not be shared publicly.
-         *     </dd>
-         * <dt>noPublishToBusinessLibrary</dt>
-         *     <dd>The client may not publish the notebook to the business library.
-         *     </dd>
-         * <dt>noCreateTags</dt>
-         *     <dd>The client may not complete an operation that results in a new tag
-         *     being created in the owner's account.
-         *     </dd>
-         * <dt>noUpdateTags</dt>
-         *     <dd>The client may not update tags in the owner's account.
-         *     </dd>
-         * <dt>noExpungeTags</dt>
-         *     <dd>The client may not expunge tags in the owner's account.
-         *     </dd>
-         * <dt>noSetParentTag</dt>
-         *     <dd>If the client is able to create or update tags in the owner's account,
-         *     then they will not be able to set the parent tag.    Leave the value unset.
-         *     </dd>
-         * <dt>noCreateSharedNotebooks</dt>
-         *     <dd>The client is unable to create shared notebooks for the notebook.
-         *     </dd>
-         * <dt>updateWhichSharedNotebookRestrictions</dt>
-         *     <dd>Restrictions on which shared notebook instances can be updated.    If the
-         *     value is not set or null, then the client can update any of the shared notebooks
-         *     associated with the notebook on which the NotebookRestrictions are defined.
-         *     See the enumeration for further details.
-         *     </dd>
-         * <dt>expungeWhichSharedNotebookRestrictions</dt>
-         *     <dd>Restrictions on which shared notebook instances can be expunged.    If the
-         *     value is not set or null, then the client can expunge any of the shared notebooks
-         *     associated with the notebook on which the NotebookRestrictions are defined.
-         *     See the enumeration for further details.
-         *     </dd>
-         */
-        class NotebookRestrictions {
-            noReadNotes: boolean;
-            noCreateNotes: boolean;
-            noUpdateNotes: boolean;
-            noExpungeNotes: boolean;
-            noShareNotes: boolean;
-            noEmailNotes: boolean;
-            noSendMessageToRecipients: boolean;
-            noUpdateNotebook: boolean;
-            noExpungeNotebook: boolean;
-            noSetDefaultNotebook: boolean;
-            noSetNotebookStack: boolean;
-            noPublishToPublic: boolean;
-            noPublishToBusinessLibrary: boolean;
-            noCreateTags: boolean;
-            noUpdateTags: boolean;
-            noExpungeTags: boolean;
-            noSetParentTag: boolean;
-            noCreateSharedNotebooks: boolean;
-            updateWhichSharedNotebookRestrictions: SharedNotebookInstanceRestrictions;
-            expungeWhichSharedNotebookRestrictions: SharedNotebookInstanceRestrictions;
-
-            constructor(args?: { noReadNotes?: boolean; noCreateNotes?: boolean; noUpdateNotes?: boolean; noExpungeNotes?: boolean; noShareNotes?: boolean; noEmailNotes?: boolean; noSendMessageToRecipients?: boolean; noUpdateNotebook?: boolean; noExpungeNotebook?: boolean; noSetDefaultNotebook?: boolean; noSetNotebookStack?: boolean; noPublishToPublic?: boolean; noPublishToBusinessLibrary?: boolean; noCreateTags?: boolean; noUpdateTags?: boolean; noExpungeTags?: boolean; noSetParentTag?: boolean; noCreateSharedNotebooks?: boolean; updateWhichSharedNotebookRestrictions?: SharedNotebookInstanceRestrictions; expungeWhichSharedNotebookRestrictions?: SharedNotebookInstanceRestrictions; });
-        }
-
-        /**
-         * A unique container for a set of notes.
-         * <dl>
-         * <dt>guid</dt>
-         *     <dd>The unique identifier of this notebook.
-         *     <br/>
-         *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_GUID_REGEX
-         *     </dd>
-         *
-         * <dt>name</dt>
-         *     <dd>A sequence of characters representing the name of the
-         *     notebook.    May be changed by clients, but the account may not contain two
-         *     notebooks with names that are equal via a case-insensitive comparison.
-         *     Can't begin or end with a space.
-         *     <br/>
-         *     Length:    EDAM_NOTEBOOK_NAME_LEN_MIN - EDAM_NOTEBOOK_NAME_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_NOTEBOOK_NAME_REGEX
-         *     </dd>
-         *
-         * <dt>updateSequenceNum</dt>
-         *     <dd>A number identifying the last transaction to
-         *     modify the state of this object.    The USN values are sequential within an
-         *     account, and can be used to compare the order of modifications within the
-         *     service.
-         *     </dd>
-         *
-         * <dt>defaultNotebook</dt>
-         *     <dd>If true, this notebook should be used for new notes
-         *     whenever the user has not (or cannot) specify a desired target notebook.
-         *     For example, if a note is submitted via SMTP email.
-         *     The service will maintain at most one defaultNotebook per account.
-         *     If a second notebook is created or updated with defaultNotebook set to
-         *     true, the service will automatically update the prior notebook's
-         *     defaultNotebook field to false.    If the default notebook is deleted
-         *     (i.e. "active" set to false), the "defaultNotebook" field will be
-         *     set to false by the service.    If the account has no default notebook
-         *     set, the service will use the most recent notebook as the default.
-         *     </dd>
-         *
-         * <dt>serviceCreated</dt>
-         *     <dd>The time when this notebook was created on the
-         *     service. This will be set on the service during creation, and the service
-         *     will provide this value when it returns a Notebook to a client.
-         *     The service will ignore this value if it is sent by clients.
-         *     </dd>
-         *
-         * <dt>serviceUpdated</dt>
-         *     <dd>The time when this notebook was last modified on the
-         *     service.    This will be set on the service during creation, and the service
-         *     will provide this value when it returns a Notebook to a client.
-         *     The service will ignore this value if it is sent by clients.
-         *     </dd>
-         *
-         * <dt>publishing</dt>
-         *     <dd>If the Notebook has been opened for public access, or
-         *     business users shared with their business (i.e. if 'published' is
-         *     set to true), then this will point to the set of publishing
-         *     information for the Notebook (URI, description, etc.).    A
-         *     Notebook cannot be published without providing this information,
-         *     but it will persist for later use if publishing is ever disabled
-         *     on the Notebook.    Clients that do not wish to change the
-         *     publishing behavior of a Notebook should not set this value when
-         *     calling NoteStore.updateNotebook().
-         *     </dd>
-         *
-         * <dt>published</dt>
-         *     <dd>If this is set to true, then the Notebook will be
-         *     accessible either to the public, or for business users to their business,
-         *     via the 'publishing' specification, which must also be set.    If this is set
-         *     to false, the Notebook will not be available to the public (or business).
-         *     Clients that do not wish to change the publishing behavior of a Notebook
-         *     should not set this value when calling NoteStore.updateNotebook().
-         *     </dd>
-         *
-         * <dt>stack</dt>
-         *     <dd>If this is set, then the notebook is visually contained within a stack
-         *     of notebooks with this name.    All notebooks in the same account with the
-         *     same 'stack' field are considered to be in the same stack.
-         *     Notebooks with no stack set are "top level" and not contained within a
-         *     stack.
-         *     </dd>
-         *
-         * <dt>sharedNotebookIds</dt>
-         *     <dd><i>DEPRECATED</i> - replaced by sharedNotebooks.</dd>
-         *
-         * <dt>sharedNotebooks</dt>
-         *     <dd>The list of recipients to whom this notebook has been shared
-         *     (one SharedNotebook object per recipient email address). This field will
-         *     be unset if you do not have permission to access this data. If you are
-         *     accessing the notebook as the owner or via a shared notebook that is
-         *     modifiable, then you have access to this data and the value will be set.
-         *     This field is read-only. Clients may not make changes to shared notebooks
-         *     via this field.
-         *     </dd>
-         *
-         * <dt>businessNotebook</dt>
-         *     <dd>If the notebook is part of a business account and has been published to the
-         *     business library, this will contain information for the library listing.
-         *     The presence or absence of this field is not a reliable test of whether a given
-         *     notebook is in fact a business notebook - the field is only used when a notebook is or
-         *     has been published to the business library.
-         *     </dd>
-         *
-         * <dt>contact</dt>
-         *     <dd>Intended for use with Business accounts, this field identifies the user who
-         *     has been designated as the "contact".    For notebooks created in business
-         *     accounts, the server will automatically set this value to the user who created
-         *     the notebook unless Notebook.contact.username has been set, in which that value
-         *     will be used.    When updating a notebook, it is common to leave Notebook.contact
-         *     field unset, indicating that no change to the value is being requested and that
-         *     the existing value, if any, should be preserved.
-         *     </dd>
-         *
-         * </dl>
-         */
-        class Notebook {
-            guid: string;
-            name: string;
-            updateSequenceNum: number;
-            defaultNotebook: boolean;
-            serviceCreated: number;
-            serviceUpdated: number;
-            publishing: Publishing;
-            published: boolean;
-            stack: string;
-            sharedNotebookIds: number[];
-            sharedNotebooks: SharedNotebook[];
-            businessNotebook: BusinessNotebook;
-            contact: User;
-            restrictions: NotebookRestrictions;
-
-            constructor(args?: { guid?: string; name?: string; updateSequenceNum?: number; defaultNotebook?: boolean; serviceCreated?: number; serviceUpdated?: number; publishing?: Publishing; published?: boolean; stack?: string; sharedNotebookIds?: number[]; sharedNotebooks?: SharedNotebook[]; businessNotebook?: BusinessNotebook; contact?: User; restrictions?: NotebookRestrictions; });
-        }
-
-        /**
-         * A link in an users account that refers them to a public or individual share in
-         * another user's account.
-         *
-         * <dl>
-         * <dt>shareName</dt>
-         * <dd>the display name of the shared notebook.
-         *     The link owner can change this.</dd>
-         *
-         * <dt>username</dt>
-         * <dd>the username of the user who owns the shared or public notebook</dd>
-         *
-         * <dt>shardId</dt>
-         * <dd>the shard ID of the notebook if the notebook is not public</dt>
-         *
-         * <dt>shareKey</dt>
-         * <dd>the secret key that provides access to the shared notebook</dd>
-         *
-         * <dt>uri</dt>
-         * <dd>the identifier of the public notebook</dd>
-         *
-         * <dt>guid</dt>
-         *     <dd>The unique identifier of this linked notebook.    Will be set whenever
-         *     a linked notebook is retrieved from the service, but may be null when a client
-         *     is creating a linked notebook.
-         *     <br/>
-         *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_GUID_REGEX
-         *     </dd>
-         *
-         * <dt>updateSequenceNum</dt>
-         *     <dd>A number identifying the last transaction to
-         *     modify the state of this object.    The USN values are sequential within an
-         *     account, and can be used to compare the order of modifications within the
-         *     service.
-         *     </dd>
-         *
-         * <dt>noteStoreUrl</dt>
-         *     <dd>
-         *     This field will contain the full URL that clients should use to make
-         *     NoteStore requests to the server shard that contains that notebook's data.
-         *     I.e. this is the URL that should be used to create the Thrift HTTP client
-         *     transport to send messages to the NoteStore service for the account.
-         *     </dd>
-         *
-         * <dt>webApiUrlPrefix:</dt>
-         *     <dd>
-         *     This field will contain the initial part of the URLs that should be used
-         *     to make requests to Evernote's thin client "web API", which provide
-         *     optimized operations for clients that aren't capable of manipulating
-         *     the full contents of accounts via the full Thrift data model. Clients
-         *     should concatenate the relative path for the various servlets onto the
-         *     end of this string to construct the full URL, as documented on our
-         *     developer web site.
-         *     </dd>
-         *
-         * <dt>stack</dt>
-         *     <dd>If this is set, then the notebook is visually contained within a stack
-         *     of notebooks with this name.    All notebooks in the same account with the
-         *     same 'stack' field are considered to be in the same stack.
-         *     Notebooks with no stack set are "top level" and not contained within a
-         *     stack.    The link owner can change this and this field is for the benefit
-         *     of the link owner.
-         *     </dd>
-         *
-         * <dt>businessId</dt>
-         *     <dd>If set, this will be the unique identifier for the business that owns
-         *     the notebook to which the linked notebook refers.
-         *
-         * </dl>
-         */
-        class LinkedNotebook {
-            shareName: string;
-            username: string;
-            shardId: string;
-            shareKey: string;
-            uri: string;
-            guid: string;
-            updateSequenceNum: number;
-            noteStoreUrl: string;
-            webApiUrlPrefix: string;
-            stack: string;
-            businessId: number;
-
-            constructor(args?: { shareName?: string; username?: string; shardId?: string; shareKey?: string; uri?: string; guid?: string; updateSequenceNum?: number; noteStoreUrl?: string; webApiUrlPrefix?: string; stack?: string; businessId?: number; });
-        }
-
-        /**
-         * A structure that describes a notebook or a user's relationship with
-         * a notebook. NotebookDescriptor is expected to remain a lighter-weight
-         * structure when compared to Notebook.
-         * <dl>
-         * <dt>guid</dt>
-         *     <dd>The unique identifier of the notebook.
-         *     </dd>
-         *
-         * <dt>notebookDisplayName</dt>
-         *     <dd>A sequence of characters representing the name of the
-         *     notebook.
-         *     </dd>
-         *
-         * <dt>contactName</dt>
-         *     <dd>The User.name value of the notebook's "contact".
-         *     </dd>
-         *
-         * <dt>hasSharedNotebook</dt>
-         *     <dd>Whether a SharedNotebook record exists between the calling user and this
-         *     notebook.
-         *     </dd>
-         *
-         * <dt>joinedUserCount</dt>
-         *     <dd>The number of users who have joined this notebook.
-         *     </dd>
-         *
-         * </dl>
-         */
-        class NotebookDescriptor {
-            guid: string;
-            notebookDisplayName: string;
-            contactName: string;
-            hasSharedNotebook: boolean;
-            joinedUserCount: number;
-
-            constructor(args?: { guid?: string; notebookDisplayName?: string; contactName?: string; hasSharedNotebook?: boolean; joinedUserCount?: number; });
-        }
-
-        /**
-         * A value for the "recipe" key in the "classifications" map in NoteAttributes
-         * that indicates the user has classified a note as being a non-recipe.
-         */
-        var CLASSIFICATION_RECIPE_USER_NON_RECIPE: string;
-
-        /**
-         * A value for the "recipe" key in the "classifications" map in NoteAttributes
-         * that indicates the user has classified a note as being a recipe.
-         */
-        var CLASSIFICATION_RECIPE_USER_RECIPE: string;
-
-        /**
-         * A value for the "recipe" key in the "classifications" map in NoteAttributes
-         * that indicates the Evernote service has classified a note as being a recipe.
-         */
-        var CLASSIFICATION_RECIPE_SERVICE_RECIPE: string;
-
-        /**
-         * Standardized value for the 'source' NoteAttribute for notes that
-         * were clipped from the web in some manner.
-         */
-        var EDAM_NOTE_SOURCE_WEB_CLIP: string;
-
-        /**
-         * Standardized value for the 'source' NoteAttribute for notes that
-         * were clipped from an email message.
-         */
-        var EDAM_NOTE_SOURCE_MAIL_CLIP: string;
-
-        /**
-         * Standardized value for the 'source' NoteAttribute for notes that
-         * were created via email sent to Evernote's email interface.
-         */
-        var EDAM_NOTE_SOURCE_MAIL_SMTP_GATEWAY: string;
-        /**
-         * Service:    UserStore
-         * <p>
-         * The UserStore service is primarily used by EDAM clients to establish
-         * authentication via username and password over a trusted connection (e.g.
-         * SSL).    A client's first call to this interface should be checkVersion() to
-         * ensure that the client's software is up to date.
-         * </p>
-         * All calls which require an authenticationToken may throw an
-         * EDAMUserException for the following reasons:
-         *    <ul>
-         *     <li> AUTH_EXPIRED "authenticationToken" - token has expired
-         *     <li> BAD_DATA_FORMAT "authenticationToken" - token is malformed
-         *     <li> DATA_REQUIRED "authenticationToken" - token is empty
-         *     <li> INVALID_AUTH "authenticationToken" - token signature is invalid
-         * </ul>
-         */
-        class UserStoreClient {
-            seqid: number;
-
-            /**
-             * This should be the first call made by a client to the EDAM service.    It
-             * tells the service what protocol version is used by the client.    The
-             * service will then return true if the client is capable of talking to
-             * the service, and false if the client's protocol version is incompatible
-             * with the service, so the client must upgrade.    If a client receives a
-             * false value, it should report the incompatibility to the user and not
-             * continue with any more EDAM requests (UserStore or NoteStore).
-             *
-             * @param clientName
-             *     This string provides some information about the client for
-             *     tracking/logging on the service.    It should provide information about
-             *     the client's software and platform. The structure should be:
-             *     application/version; platform/version; [ device/version ]
-             *     E.g. "Evernote Windows/3.0.1; Windows/XP SP3".
-             *
-             * @param edamVersionMajor
-             *     This should be the major protocol version that was compiled by the
-             *     client.    This should be the current value of the EDAM_VERSION_MAJOR
-             *     constant for the client.
-             *
-             * @param edamVersionMinor
-             *     This should be the major protocol version that was compiled by the
-             *     client.    This should be the current value of the EDAM_VERSION_MINOR
-             *     constant for the client.
-             */
-            checkVersion(clientName: string, edamVersionMajor: number, edamVersionMinor: number, cb: Callback<boolean>): void;
-
-            /**
-             * This provides bootstrap information to the client. Various bootstrap
-             * profiles and settings may be used by the client to configure itself.
-             *
-             * @param locale
-             *     The client's current locale, expressed in language[_country]
-             *     format. E.g., "en_US". See ISO-639 and ISO-3166 for valid
-             *     language and country codes.
-             *
-             * @return
-             *     The bootstrap information suitable for this client.
-             */
-            getBootstrapInfo(locale: string, cb: Callback<BootstrapInfo>): void;
-
-            /**
-             * Revoke an existing long lived authentication token. This can be used to
-             * revoke OAuth tokens or tokens created by calling authenticateLongSession,
-             * and allows a user to effectively log out of Evernote from the perspective
-             * of the application that holds the token. The authentication token that is
-             * passed is immediately revoked and may not be used to call any authenticated
-             * EDAM function.
-             *
-             * @param authenticationToken the authentication token to revoke.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> DATA_REQUIRED "authenticationToken" - no authentication token provided
-             *     <li> BAD_DATA_FORMAT "authenticationToken" - the authentication token is not well formed
-             *     <li> INVALID_AUTH "authenticationToken" - the authentication token is invalid
-             *     <li> AUTH_EXPIRED "authenticationToken" - the authentication token is expired or
-             *         is already revoked.
-             * </ul>
-             */
-            revokeLongSession(cb: Callback<void>): void;
-
-            /**
-             * This is used to take an existing authentication token that grants access
-             * to an individual user account (returned from 'authenticate',
-             * 'authenticateLongSession' or an OAuth authorization) and obtain an additional
-             * authentication token that may be used to access business notebooks if the user
-             * is a member of an Evernote Business account.
-             *
-             * The resulting authentication token may be used to make NoteStore API calls
-             * against the business using the NoteStore URL returned in the result.
-             *
-             * @param authenticationToken
-             *     The authentication token for the user. This may not be a shared authentication
-             *     token (returned by NoteStore.authenticateToSharedNotebook or
-             *     NoteStore.authenticateToSharedNote) or a business authentication token.
-             *
-             * @return
-             *     The result of the authentication, with the token granting access to the
-             *     business in the result's 'authenticationToken' field. The URL that must
-             *     be used to access the business account NoteStore will be returned in the
-             *     result's 'noteStoreUrl' field.    The 'User' field will
-             *     not be set in the result.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> PERMISSION_DENIED "authenticationToken" - the provided authentication token
-             *                is a shared or business authentication token. </li>
-             *     <li> PERMISSION_DENIED "Business" - the user identified by the provided
-             *                authentication token is not currently a member of a business. </li>
-             *     <li> PERMISSION_DENIED "Business.status" - the business that the user is a
-             *                member of is not currently in an active status. </li>
-             * </ul>
-             */
-            authenticateToBusiness(cb: Callback<AuthenticationResult>): void;
-
-            /**
-             * Returns the User corresponding to the provided authentication token,
-             * or throws an exception if this token is not valid.
-             * The level of detail provided in the returned User structure depends on
-             * the access level granted by the token, so a web service client may receive
-             * fewer fields than an integrated desktop client.
-             */
-            getUser(cb: Callback<User>): void;
-
-            /**
-             * Asks the UserStore about the publicly available location information for
-             * a particular username.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> DATA_REQUIRED "username" - username is empty
-             * </ul>
-             */
-            getPublicUserInfo(username: string, cb: Callback<PublicUserInfo>): void;
-
-
-            /**
-             * Returns the URL that should be used to talk to the NoteStore for the
-             * account represented by the provided authenticationToken.
-             * This method isn't needed by most clients, who can retrieve the correct
-             * NoteStore URL from the AuthenticationResult returned from the authenticate
-             * or refreshAuthentication calls. This method is typically only needed
-             * to look up the correct URL for a long-lived session token (e.g. for an
-             * OAuth web service).
-             */
-            getNoteStoreUrl(cb: Callback<string>): void;
-        }
-        /**
-         *    This structure is used to provide publicly-available user information
-         *    about a particular account.
-         * <dl>
-         *    <dt>userId:</dt>
-         *        <dd>
-         *        The unique numeric user identifier for the user account.
-         *        </dd>
-         *    <dt>shardId:</dt>
-         *        <dd>
-         *        DEPRECATED - Client applications should have no need to use this field.
-         *        </dd>
-         *    <dt>privilege:</dt>
-         *        <dd>
-         *        The privilege level of the account, to determine whether
-         *        this is a Premium or Free account.
-         *        </dd>
-         *    <dt>noteStoreUrl:</dt>
-         *        <dd>
-         *        This field will contain the full URL that clients should use to make
-         *        NoteStore requests to the server shard that contains that user's data.
-         *        I.e. this is the URL that should be used to create the Thrift HTTP client
-         *        transport to send messages to the NoteStore service for the account.
-         *        </dd>
-         *    <dt>webApiUrlPrefix:</dt>
-         *        <dd>
-         *        This field will contain the initial part of the URLs that should be used
-         *        to make requests to Evernote's thin client "web API", which provide
-         *        optimized operations for clients that aren't capable of manipulating
-         *        the full contents of accounts via the full Thrift data model. Clients
-         *        should concatenate the relative path for the various servlets onto the
-         *        end of this string to construct the full URL, as documented on our
-         *        developer web site.
-         *        </dd>
-         *    </dl>
-         */
-        class PublicUserInfo {
-            userId: number;
-            shardId: string;
-            privilege: PrivilegeLevel;
-            username: string;
-            noteStoreUrl: string;
-            webApiUrlPrefix: string;
-
-            constructor(args?: { userId: number; shardId: string; privilege?: PrivilegeLevel; username?: string; noteStoreUrl?: string; webApiUrlPrefix?: string; });
-        }
-
-        /**
-         *    When an authentication (or re-authentication) is performed, this structure
-         *    provides the result to the client.
-         * <dl>
-         *    <dt>currentTime:</dt>
-         *        <dd>
-         *        The server-side date and time when this result was
-         *        generated.
-         *        </dd>
-         *    <dt>authenticationToken:</dt>
-         *        <dd>
-         *        Holds an opaque, ASCII-encoded token that can be
-         *        used by the client to perform actions on a NoteStore.
-         *        </dd>
-         *    <dt>expiration:</dt>
-         *        <dd>
-         *        Holds the server-side date and time when the
-         *        authentication token will expire.
-         *        This time can be compared to "currentTime" to produce an expiration
-         *        time that can be reconciled with the client's local clock.
-         *        </dd>
-         *    <dt>user:</dt>
-         *        <dd>
-         *        Holds the information about the account which was
-         *        authenticated if this was a full authentication.    May be absent if this
-         *        particular authentication did not require user information.
-         *        </dd>
-         *    <dt>publicUserInfo:</dt>
-         *        <dd>
-         *        If this authentication result was achieved without full permissions to
-         *        access the full User structure, this field may be set to give back
-         *        a more limited public set of data.
-         *        </dd>
-         *    <dt>noteStoreUrl:</dt>
-         *        <dd>
-         *        This field will contain the full URL that clients should use to make
-         *        NoteStore requests to the server shard that contains that user's data.
-         *        I.e. this is the URL that should be used to create the Thrift HTTP client
-         *        transport to send messages to the NoteStore service for the account.
-         *        </dd>
-         *    <dt>webApiUrlPrefix:</dt>
-         *        <dd>
-         *        This field will contain the initial part of the URLs that should be used
-         *        to make requests to Evernote's thin client "web API", which provide
-         *        optimized operations for clients that aren't capable of manipulating
-         *        the full contents of accounts via the full Thrift data model. Clients
-         *        should concatenate the relative path for the various servlets onto the
-         *        end of this string to construct the full URL, as documented on our
-         *        developer web site.
-         *        </dd>
-         *    <dt>secondFactorRequired:</dt>
-         *        <dd>
-         *        If set to true, this field indicates that the user has enabled two-factor
-         *        authentication and must enter their second factor in order to complete
-         *        authentication. In this case the value of authenticationResult will be
-         *        a short-lived authentication token that may only be used to make a
-         *        subsequent call to completeTwoFactorAuthentication.
-         *        </dd>
-         *    <dt>secondFactorDeliveryHint:</dt>
-         *        <dd>
-         *        When secondFactorRequired is set to true, this field may contain a string
-         *        describing the second factor delivery method that the user has configured.
-         *        This will typically be an obfuscated mobile device number, such as
-         *        "(xxx) xxx-x095". This string can be displayed to the user to remind them
-         *        how to obtain the required second factor.
-         *        TODO do we need to differentiate between SMS and voice delivery?
-         *        </dd>
-         *    </dl>
-         */
-        class AuthenticationResult {
-            currentTime: number;
-            authenticationToken: string;
-            expiration: number;
-            user: User;
-            publicUserInfo: PublicUserInfo;
-            noteStoreUrl: string;
-            webApiUrlPrefix: string;
-            secondFactorRequired: boolean;
-            secondFactorDeliveryHint: string;
-
-            constructor(args?: { currentTime: number; authenticationToken: string; expiration: number; user?: User; publicUserInfo?: PublicUserInfo; noteStoreUrl?: string; webApiUrlPrefix?: string; secondFactorRequired?: boolean; secondFactorDeliveryHint?: string; });
-        }
-
-        /**
-         *    This structure describes a collection of bootstrap settings.
-         * <dl>
-         *    <dt>serviceHost:</dt>
-         *        <dd>
-         *        The hostname and optional port for composing Evernote web service URLs.
-         *        This URL can be used to access the UserStore and related services,
-         *        but must not be used to compose the NoteStore URL. Client applications
-         *        must handle serviceHost values that include only the hostname
-         *        (e.g. www.evernote.com) or both the hostname and port (e.g. www.evernote.com:8080).
-         *        If no port is specified, or if port 443 is specified, client applications must
-         *        use the scheme "https" when composing URLs. Otherwise, a client must use the
-         *        scheme "http".
-         *    </dd>
-         *    <dt>marketingUrl:</dt>
-         *        <dd>
-         *        The URL stem for the Evernote corporate marketing website, e.g. http://www.evernote.com.
-         *        This stem can be used to compose website URLs. For example, the URL of the Evernote
-         *        Trunk is composed by appending "/about/trunk/" to the value of marketingUrl.
-         *        </dd>
-         *    <dt>supportUrl:</dt>
-         *        <dd>
-         *        The full URL for the Evernote customer support website, e.g. https://support.evernote.com.
-         *        </dd>
-         *    <dt>accountEmailDomain:</dt>
-         *        <dd>
-         *        The domain used for an Evernote user's incoming email address, which allows notes to
-         *        be emailed into an account. E.g. m.evernote.com.
-         *        </dd>
-         *    <dt>enableFacebookSharing:</dt>
-         *        <dd>
-         *        Whether the client application should enable sharing of notes on Facebook.
-         *        </dd>
-         *    <dt>enableGiftSubscriptions:</dt>
-         *        <dd>
-         *        Whether the client application should enable gift subscriptions.
-         *        </dd>
-         *    <dt>enableSupportTickets:</dt>
-         *        <dd>
-         *        Whether the client application should enable in-client creation of support tickets.
-         *        </dd>
-         *    <dt>enableSharedNotebooks:</dt>
-         *        <dd>
-         *        Whether the client application should enable shared notebooks.
-         *        </dd>
-         *    <dt>enableSingleNoteSharing:</dt>
-         *        <dd>
-         *        Whether the client application should enable single note sharing.
-         *        </dd>
-         *    <dt>enableSponsoredAccounts:</dt>
-         *        <dd>
-         *        Whether the client application should enable sponsored accounts.
-         *        </dd>
-         *    <dt>enableTwitterSharing:</dt>
-         *        <dd>
-         *        Whether the client application should enable sharing of notes on Twitter.
-         *        </dd>
-         *    </dl>
-         */
-        class BootstrapSettings {
-            serviceHost: string;
-            marketingUrl: string;
-            supportUrl: string;
-            accountEmailDomain: string;
-            enableFacebookSharing: boolean;
-            enableGiftSubscriptions: boolean;
-            enableSupportTickets: boolean;
-            enableSharedNotebooks: boolean;
-            enableSingleNoteSharing: boolean;
-            enableSponsoredAccounts: boolean;
-            enableTwitterSharing: boolean;
-            enableLinkedInSharing: boolean;
-            enablePublicNotebooks: boolean;
-
-            constructor(args?: { serviceHost: string; marketingUrl: string; supportUrl: string; accountEmailDomain: string; enableFacebookSharing?: boolean; enableGiftSubscriptions?: boolean; enableSupportTickets?: boolean; enableSharedNotebooks?: boolean; enableSingleNoteSharing?: boolean; enableSponsoredAccounts?: boolean; enableTwitterSharing?: boolean; enableLinkedInSharing?: boolean; enablePublicNotebooks?: boolean; });
-        }
-
-        /**
-         *    This structure describes a collection of bootstrap settings.
-         * <dl>
-         *    <dt>name:</dt>
-         *        <dd>
-         *        The unique name of the profile, which is guaranteed to remain consistent across
-         *        calls to getBootstrapInfo.
-         *        </dd>
-         *    <dt>settings:</dt>
-         *        <dd>
-         *        The settings for this profile.
-         *        </dd>
-         *    </dl>
-         */
-        class BootstrapProfile {
-            name: string;
-            settings: BootstrapSettings;
-
-            constructor(args?: { name: string; settings: BootstrapSettings; });
-        }
-
-        /**
-         *    This structure describes a collection of bootstrap profiles.
-         * <dl>
-         *    <dt>profiles:</dt>
-         *        <dd>
-         *        List of one or more bootstrap profiles, in descending
-         *        preference order.
-         *        </dd>
-         *    </dl>
-         */
-        class BootstrapInfo {
-            profiles: BootstrapProfile[];
-
-            constructor(args?: { profiles: BootstrapProfile[]; });
-        }
-
-        /**
-         * The major version number for the current revision of the EDAM protocol.
-         * Clients pass this to the service using UserStore.checkVersion at the
-         * beginning of a session to confirm that they are not out of date.
-         */
-        var EDAM_VERSION_MAJOR: number;
-
-        /**
-         * The minor version number for the current revision of the EDAM protocol.
-         * Clients pass this to the service using UserStore.checkVersion at the
-         * beginning of a session to confirm that they are not out of date.
-         */
-        var EDAM_VERSION_MINOR: number;
-
-    }
-}
diff --git a/evernote/index.d.ts b/evernote/index.d.ts
new file mode 100644
index 0000000000..18e0e13e1c
--- /dev/null
+++ b/evernote/index.d.ts
@@ -0,0 +1,6318 @@
+// Type definitions for evernote v 1.25.8
+// Project: https://www.npmjs.com/package/evernote
+// Definitions by: Zachary Collins <https://github.com/corps/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Thrift } from "thrift";
+
+declare namespace Evernote {
+    interface Callback<T> {
+        (err: EDAMUserException | EDAMSystemException | EDAMNotFoundException, v: T): void
+    }
+
+    interface ClientConfig {
+        consumerKey?: string
+        consumerSecret?: string
+        sandbox?: boolean
+        token?: string
+        serviceHost?: string
+        additionalHeaders?: { [k: string]: string }
+        secret?: string
+    }
+
+    class Client {
+        static "new": (config: ClientConfig) => Client
+        constructor(config: ClientConfig);
+        getNoteStore(): NoteStoreClient;
+        getUserStore(): UserStoreClient;
+    }
+
+
+    /**
+     * Numeric codes indicating the type of error that occurred on the
+     * service.
+     * <dl>
+     *     <dt>UNKNOWN</dt>
+     *         <dd>No information available about the error</dd>
+     *     <dt>BAD_DATA_FORMAT</dt>
+     *         <dd>The format of the request data was incorrect</dd>
+     *     <dt>PERMISSION_DENIED</dt>
+     *         <dd>Not permitted to perform action</dd>
+     *     <dt>INTERNAL_ERROR</dt>
+     *         <dd>Unexpected problem with the service</dd>
+     *     <dt>DATA_REQUIRED</dt>
+     *         <dd>A required parameter/field was absent</dd>
+     *     <dt>LIMIT_REACHED</dt>
+     *         <dd>Operation denied due to data model limit</dd>
+     *     <dt>QUOTA_REACHED</dt>
+     *         <dd>Operation denied due to user storage limit</dd>
+     *     <dt>INVALID_AUTH</dt>
+     *         <dd>Username and/or password incorrect</dd>
+     *     <dt>AUTH_EXPIRED</dt>
+     *         <dd>Authentication token expired</dd>
+     *     <dt>DATA_CONFLICT</dt>
+     *         <dd>Change denied due to data model conflict</dd>
+     *     <dt>ENML_VALIDATION</dt>
+     *         <dd>Content of submitted note was malformed</dd>
+     *     <dt>SHARD_UNAVAILABLE</dt>
+     *         <dd>Service shard with account data is temporarily down</dd>
+     *     <dt>LEN_TOO_SHORT</dt>
+     *         <dd>Operation denied due to data model limit, where something such
+     *                 as a string length was too short</dd>
+     *     <dt>LEN_TOO_LONG</dt>
+     *         <dd>Operation denied due to data model limit, where something such
+     *                 as a string length was too long</dd>
+     *     <dt>TOO_FEW</dt>
+     *         <dd>Operation denied due to data model limit, where there were
+     *                 too few of something.</dd>
+     *     <dt>TOO_MANY</dt>
+     *         <dd>Operation denied due to data model limit, where there were
+     *                 too many of something.</dd>
+     *     <dt>UNSUPPORTED_OPERATION</dt>
+     *         <dd>Operation denied because it is currently unsupported.</dd>
+     *     <dt>TAKEN_DOWN</dt>
+     *         <dd>Operation denied because access to the corresponding object is
+     *                 prohibited in response to a take-down notice.</dd>
+     *     <dt>RATE_LIMIT_REACHED</dt>
+     *         <dd>Operation denied because the calling application has reached
+     *                 its hourly API call limit for this user.</dd>
+     * </dl>
+     */
+    enum EDAMErrorCode {
+        'UNKNOWN' = 1,
+        'BAD_DATA_FORMAT' = 2,
+        'PERMISSION_DENIED' = 3,
+        'INTERNAL_ERROR' = 4,
+        'DATA_REQUIRED' = 5,
+        'LIMIT_REACHED' = 6,
+        'QUOTA_REACHED' = 7,
+        'INVALID_AUTH' = 8,
+        'AUTH_EXPIRED' = 9,
+        'DATA_CONFLICT' = 10,
+        'ENML_VALIDATION' = 11,
+        'SHARD_UNAVAILABLE' = 12,
+        'LEN_TOO_SHORT' = 13,
+        'LEN_TOO_LONG' = 14,
+        'TOO_FEW' = 15,
+        'TOO_MANY' = 16,
+        'UNSUPPORTED_OPERATION' = 17,
+        'TAKEN_DOWN' = 18,
+        'RATE_LIMIT_REACHED' = 19,
+    }
+
+    /**
+     * This exception is thrown by EDAM procedures when a call fails as a result of
+     * a problem that a caller may be able to resolve.    For example, if the user
+     * attempts to add a note to their account which would exceed their storage
+     * quota, this type of exception may be thrown to indicate the source of the
+     * error so that they can choose an alternate action.
+     *
+     * This exception would not be used for internal system errors that do not
+     * reflect user actions, but rather reflect a problem within the service that
+     * the user cannot resolve.
+     *
+     * errorCode:    The numeric code indicating the type of error that occurred.
+     *     must be one of the values of EDAMErrorCode.
+     *
+     * parameter:    If the error applied to a particular input parameter, this will
+     *     indicate which parameter.
+     */
+    class EDAMUserException extends Thrift.TException {
+        errorCode: EDAMErrorCode;
+        parameter: string;
+
+        constructor(args?: { errorCode: EDAMErrorCode; parameter?: string; });
+    }
+
+    /**
+     * This exception is thrown by EDAM procedures when a call fails as a result of
+     * a problem in the service that could not be changed through caller action.
+     *
+     * errorCode:    The numeric code indicating the type of error that occurred.
+     *     must be one of the values of EDAMErrorCode.
+     *
+     * message:    This may contain additional information about the error
+     *
+     * rateLimitDuration:    Indicates the minimum number of seconds that an application should
+     *     expect subsequent API calls for this user to fail. The application should not retry
+     *     API requests for the user until at least this many seconds have passed. Present only
+     *     when errorCode is RATE_LIMIT_REACHED,
+     */
+    class EDAMSystemException extends Thrift.TException {
+        errorCode: EDAMErrorCode;
+        message: string;
+        rateLimitDuration: number;
+
+        constructor(args?: { errorCode: EDAMErrorCode; message?: string; rateLimitDuration?: number; });
+    }
+
+    /**
+     * This exception is thrown by EDAM procedures when a caller asks to perform
+     * an operation on an object that does not exist.    This may be thrown based on an invalid
+     * primary identifier (e.g. a bad GUID), or when the caller refers to an object
+     * by another unique identifier (e.g. a User's email address).
+     *
+     * identifier:    A description of the object that was not found on the server.
+     *     For example, "Note.notebookGuid" when a caller attempts to create a note in a
+     *     notebook that does not exist in the user's account.
+     *
+     * key:    The value passed from the client in the identifier, which was not
+     *     found. For example, the GUID that was not found.
+     */
+    class EDAMNotFoundException extends Thrift.TException {
+        identifier: string;
+        key: string;
+
+        constructor(args?: { identifier?: string; key?: string; });
+    }
+    /**
+     * Minimum length of any string-based attribute, in Unicode chars
+     */
+    var EDAM_ATTRIBUTE_LEN_MIN: number;
+
+    /**
+     * Maximum length of any string-based attribute, in Unicode chars
+     */
+    var EDAM_ATTRIBUTE_LEN_MAX: number;
+
+    /**
+     * Any string-based attribute must match the provided regular expression.
+     * This excludes all Unicode line endings and control characters.
+     */
+    var EDAM_ATTRIBUTE_REGEX: string;
+
+    /**
+     * The maximum number of values that can be stored in a list-based attribute
+     * (e.g. see UserAttributes.recentMailedAddresses)
+     */
+    var EDAM_ATTRIBUTE_LIST_MAX: number;
+
+    /**
+     * The maximum number of entries that can be stored in a map-based attribute
+     * such as applicationData fields in Resources and Notes.
+     */
+    var EDAM_ATTRIBUTE_MAP_MAX: number;
+
+    /**
+     * The minimum length of a GUID generated by the Evernote service
+     */
+    var EDAM_GUID_LEN_MIN: number;
+
+    /**
+     * The maximum length of a GUID generated by the Evernote service
+     */
+    var EDAM_GUID_LEN_MAX: number;
+
+    /**
+     * GUIDs generated by the Evernote service will match the provided pattern
+     */
+    var EDAM_GUID_REGEX: string;
+
+    /**
+     * The minimum length of any email address
+     */
+    var EDAM_EMAIL_LEN_MIN: number;
+
+    /**
+     * The maximum length of any email address
+     */
+    var EDAM_EMAIL_LEN_MAX: number;
+
+    /**
+     * A regular expression that matches the part of an email address before
+     * the '@' symbol.
+     */
+    var EDAM_EMAIL_LOCAL_REGEX: string;
+
+    /**
+     * A regular expression that matches the part of an email address after
+     * the '@' symbol.
+     */
+    var EDAM_EMAIL_DOMAIN_REGEX: string;
+
+    /**
+     * A regular expression that must match any email address given to Evernote.
+     * Email addresses must comply with RFC 2821 and 2822.
+     */
+    var EDAM_EMAIL_REGEX: string;
+
+    /**
+     * A regular expression that must match any VAT ID given to Evernote.
+     * ref http://en.wikipedia.org/wiki/VAT_identification_number
+     * ref http://my.safaribooksonline.com/book/programming/regular-expressions/9780596802837/4dot-validation-and-formatting/id2995136
+     */
+    var EDAM_VAT_REGEX: string;
+
+    /**
+     * The minimum length of a timezone specification string
+     */
+    var EDAM_TIMEZONE_LEN_MIN: number;
+
+    /**
+     * The maximum length of a timezone specification string
+     */
+    var EDAM_TIMEZONE_LEN_MAX: number;
+
+    /**
+     * Any timezone string given to Evernote must match the provided pattern.
+     * This permits either a locale-based standard timezone or a GMT offset.
+     * E.g.:<ul>
+     *        <li>America/Los_Angeles</li>
+     *        <li>GMT+08:00</li>
+     * </ul>
+     */
+    var EDAM_TIMEZONE_REGEX: string;
+
+    /**
+     * The minimum length of any MIME type string given to Evernote
+     */
+    var EDAM_MIME_LEN_MIN: number;
+
+    /**
+     * The maximum length of any MIME type string given to Evernote
+     */
+    var EDAM_MIME_LEN_MAX: number;
+
+    /**
+     * Any MIME type string given to Evernote must match the provided pattern.
+     * E.g.:    image/gif
+     */
+    var EDAM_MIME_REGEX: string;
+
+    /**
+     * Canonical MIME type string for GIF image resources
+     */
+    var EDAM_MIME_TYPE_GIF: string;
+
+    /**
+     * Canonical MIME type string for JPEG image resources
+     */
+    var EDAM_MIME_TYPE_JPEG: string;
+
+    /**
+     * Canonical MIME type string for PNG image resources
+     */
+    var EDAM_MIME_TYPE_PNG: string;
+
+    /**
+     * Canonical MIME type string for WAV audio resources
+     */
+    var EDAM_MIME_TYPE_WAV: string;
+
+    /**
+     * Canonical MIME type string for MP3 audio resources
+     */
+    var EDAM_MIME_TYPE_MP3: string;
+
+    /**
+     * Canonical MIME type string for AMR audio resources
+     */
+    var EDAM_MIME_TYPE_AMR: string;
+
+    /**
+     * Canonical MIME type string for AAC audio resources
+     */
+    var EDAM_MIME_TYPE_AAC: string;
+
+    /**
+     * Canonical MIME type string for MP4 audio resources
+     */
+    var EDAM_MIME_TYPE_M4A: string;
+
+    /**
+     * Canonical MIME type string for MP4 video resources
+     */
+    var EDAM_MIME_TYPE_MP4_VIDEO: string;
+
+    /**
+     * Canonical MIME type string for Evernote Ink resources
+     */
+    var EDAM_MIME_TYPE_INK: string;
+
+    /**
+     * Canonical MIME type string for PDF resources
+     */
+    var EDAM_MIME_TYPE_PDF: string;
+
+    /**
+     * MIME type used for attachments of an unspecified type
+     */
+    var EDAM_MIME_TYPE_DEFAULT: string;
+
+    /**
+     * The set of resource MIME types that are expected to be handled
+     * correctly by all of the major Evernote client applications.
+     */
+    var EDAM_MIME_TYPES: string[];
+
+    /**
+     * The set of MIME types that Evernote will parse and index for
+     * searching. With exception of images, and PDFs, which are
+     * handled in a different way.
+     */
+    var EDAM_INDEXABLE_RESOURCE_MIME_TYPES: string[];
+
+    /**
+     * The minimum length of a user search query string in Unicode chars
+     */
+    var EDAM_SEARCH_QUERY_LEN_MIN: number;
+
+    /**
+     * The maximum length of a user search query string in Unicode chars
+     */
+    var EDAM_SEARCH_QUERY_LEN_MAX: number;
+
+    /**
+     * Search queries must match the provided pattern.    This is used for
+     * both ad-hoc queries and SavedSearch.query fields.
+     * This excludes all control characters and line/paragraph separators.
+     */
+    var EDAM_SEARCH_QUERY_REGEX: string;
+
+    /**
+     * The exact length of a MD5 hash checksum, in binary bytes.
+     * This is the exact length that must be matched for any binary hash
+     * value.
+     */
+    var EDAM_HASH_LEN: number;
+
+    /**
+     * The minimum length of an Evernote username
+     */
+    var EDAM_USER_USERNAME_LEN_MIN: number;
+
+    /**
+     * The maximum length of an Evernote username
+     */
+    var EDAM_USER_USERNAME_LEN_MAX: number;
+
+    /**
+     * Any Evernote User.username field must match this pattern.    This
+     * restricts usernames to a format that could permit use as a domain
+     * name component.    E.g. "username.whatever.evernote.com"
+     */
+    var EDAM_USER_USERNAME_REGEX: string;
+
+    /**
+     * Minimum length of the User.name field
+     */
+    var EDAM_USER_NAME_LEN_MIN: number;
+
+    /**
+     * Maximum length of the User.name field
+     */
+    var EDAM_USER_NAME_LEN_MAX: number;
+
+    /**
+     * The User.name field must match this pattern, which excludes line
+     * endings and control characters.
+     */
+    var EDAM_USER_NAME_REGEX: string;
+
+    /**
+     * The minimum length of a Tag.name, in Unicode characters
+     */
+    var EDAM_TAG_NAME_LEN_MIN: number;
+
+    /**
+     * The maximum length of a Tag.name, in Unicode characters
+     */
+    var EDAM_TAG_NAME_LEN_MAX: number;
+
+    /**
+     * All Tag.name fields must match this pattern.
+     * This excludes control chars, commas or line/paragraph separators.
+     * The string may not begin or end with whitespace.
+     */
+    var EDAM_TAG_NAME_REGEX: string;
+
+    /**
+     * The minimum length of a Note.title, in Unicode characters
+     */
+    var EDAM_NOTE_TITLE_LEN_MIN: number;
+
+    /**
+     * The maximum length of a Note.title, in Unicode characters
+     */
+    var EDAM_NOTE_TITLE_LEN_MAX: number;
+
+    /**
+     * All Note.title fields must match this pattern.
+     * This excludes control chars or line/paragraph separators.
+     * The string may not begin or end with whitespace.
+     */
+    var EDAM_NOTE_TITLE_REGEX: string;
+
+    /**
+     * Minimum length of a Note.content field.
+     * Note.content fields must comply with the ENML DTD.
+     */
+    var EDAM_NOTE_CONTENT_LEN_MIN: number;
+
+    /**
+     * Maximum length of a Note.content field
+     * Note.content fields must comply with the ENML DTD.
+     */
+    var EDAM_NOTE_CONTENT_LEN_MAX: number;
+
+    /**
+     * Minimum length of an application name, which is the key in an
+     * applicationData LazyMap found in entities such as Resources and
+     * Notes.
+     */
+    var EDAM_APPLICATIONDATA_NAME_LEN_MIN: number;
+
+    /**
+     * Maximum length of an application name, which is the key in an
+     * applicationData LazyMap found in entities such as Resources and
+     * Notes.
+     */
+    var EDAM_APPLICATIONDATA_NAME_LEN_MAX: number;
+
+    /**
+     * Minimum length of an applicationData value in a LazyMap, found
+     * in entities such as Resources and Notes.
+     */
+    var EDAM_APPLICATIONDATA_VALUE_LEN_MIN: number;
+
+    /**
+     * Maximum length of an applicationData value in a LazyMap, found
+     * in entities such as Resources and Notes.    Note, however, that
+     * the sum of the size of hte key and value is constrained by
+     * EDAM_APPLICATIONDATA_ENTRY_LEN_MAX, so the maximum length, in
+     * practice, depends upon the key value being used.
+     */
+    var EDAM_APPLICATIONDATA_VALUE_LEN_MAX: number;
+
+    /**
+     * The total length of an entry in an applicationData LazyMap, which
+     * is the sum of the length of the key and the value for the entry.
+     */
+    var EDAM_APPLICATIONDATA_ENTRY_LEN_MAX: number;
+
+    /**
+     * An application name must match this regex.    An application
+     * name is the key portion of an entry in an applicationData
+     * map as found in entities such as Resources and Notes.
+     * Note that even if both the name and value regexes match,
+     * it is still necessary to check the sum of the lengths
+     * against EDAM_APPLICATIONDATA_ENTRY_LEN_MAX.
+     */
+    var EDAM_APPLICATIONDATA_NAME_REGEX: string;
+
+    /**
+     * An applicationData map value must match this regex.
+     * Note that even if both the name and value regexes match,
+     * it is still necessary to check the sum of the lengths
+     * against EDAM_APPLICATIONDATA_ENTRY_LEN_MAX.
+     */
+    var EDAM_APPLICATIONDATA_VALUE_REGEX: string;
+
+    /**
+     * The minimum length of a Notebook.name, in Unicode characters
+     */
+    var EDAM_NOTEBOOK_NAME_LEN_MIN: number;
+
+    /**
+     * The maximum length of a Notebook.name, in Unicode characters
+     */
+    var EDAM_NOTEBOOK_NAME_LEN_MAX: number;
+
+    /**
+     * All Notebook.name fields must match this pattern.
+     * This excludes control chars or line/paragraph separators.
+     * The string may not begin or end with whitespace.
+     */
+    var EDAM_NOTEBOOK_NAME_REGEX: string;
+
+    /**
+     * The minimum length of a Notebook.stack, in Unicode characters
+     */
+    var EDAM_NOTEBOOK_STACK_LEN_MIN: number;
+
+    /**
+     * The maximum length of a Notebook.stack, in Unicode characters
+     */
+    var EDAM_NOTEBOOK_STACK_LEN_MAX: number;
+
+    /**
+     * All Notebook.stack fields must match this pattern.
+     * This excludes control chars or line/paragraph separators.
+     * The string may not begin or end with whitespace.
+     */
+    var EDAM_NOTEBOOK_STACK_REGEX: string;
+
+    /**
+     * The minimum length of a public notebook URI component
+     */
+    var EDAM_PUBLISHING_URI_LEN_MIN: number;
+
+    /**
+     * The maximum length of a public notebook URI component
+     */
+    var EDAM_PUBLISHING_URI_LEN_MAX: number;
+
+    /**
+     * A public notebook URI component must match the provided pattern
+     */
+    var EDAM_PUBLISHING_URI_REGEX: string;
+
+    /**
+     * The set of strings that may not be used as a publishing URI
+     */
+    var EDAM_PUBLISHING_URI_PROHIBITED: string[];
+
+    /**
+     * The minimum length of a Publishing.publicDescription field.
+     */
+    var EDAM_PUBLISHING_DESCRIPTION_LEN_MIN: number;
+
+    /**
+     * The maximum length of a Publishing.publicDescription field.
+     */
+    var EDAM_PUBLISHING_DESCRIPTION_LEN_MAX: number;
+
+    /**
+     * Any public notebook's Publishing.publicDescription field must match
+     * this pattern.
+     * No control chars or line/paragraph separators, and can't start or
+     * end with whitespace.
+     */
+    var EDAM_PUBLISHING_DESCRIPTION_REGEX: string;
+
+    /**
+     * The minimum length of a SavedSearch.name field
+     */
+    var EDAM_SAVED_SEARCH_NAME_LEN_MIN: number;
+
+    /**
+     * The maximum length of a SavedSearch.name field
+     */
+    var EDAM_SAVED_SEARCH_NAME_LEN_MAX: number;
+
+    /**
+     * SavedSearch.name fields must match this pattern.
+     * No control chars or line/paragraph separators, and can't start or
+     * end with whitespace.
+     */
+    var EDAM_SAVED_SEARCH_NAME_REGEX: string;
+
+    /**
+     * The minimum length of an Evernote user password
+     */
+    var EDAM_USER_PASSWORD_LEN_MIN: number;
+
+    /**
+     * The maximum length of an Evernote user password
+     */
+    var EDAM_USER_PASSWORD_LEN_MAX: number;
+
+    /**
+     * Evernote user passwords must match this regular expression
+     */
+    var EDAM_USER_PASSWORD_REGEX: string;
+
+    /**
+     * The maximum length of an Evernote Business URI
+     */
+    var EDAM_BUSINESS_URI_LEN_MAX: number;
+
+    /**
+     * The maximum number of Tags per Note
+     */
+    var EDAM_NOTE_TAGS_MAX: number;
+
+    /**
+     * The maximum number of Resources per Note
+     */
+    var EDAM_NOTE_RESOURCES_MAX: number;
+
+    /**
+     * Maximum number of Tags per account
+     */
+    var EDAM_USER_TAGS_MAX: number;
+
+    /**
+     * Maximum number of Tags per business account.
+     */
+    var EDAM_BUSINESS_TAGS_MAX: number;
+
+    /**
+     * Maximum number of SavedSearches per account
+     */
+    var EDAM_USER_SAVED_SEARCHES_MAX: number;
+
+    /**
+     * Maximum number of Notes per user
+     */
+    var EDAM_USER_NOTES_MAX: number;
+
+    /**
+     * Maximum number of Notes per business account
+     */
+    var EDAM_BUSINESS_NOTES_MAX: number;
+
+    /**
+     * Maximum number of Notebooks per user
+     */
+    var EDAM_USER_NOTEBOOKS_MAX: number;
+
+    /**
+     * Maximum number of Notebooks in a business account
+     */
+    var EDAM_BUSINESS_NOTEBOOKS_MAX: number;
+
+    /**
+     * Maximum number of recent email addresses that are maintained
+     * (see UserAttributes.recentMailedAddresses)
+     */
+    var EDAM_USER_RECENT_MAILED_ADDRESSES_MAX: number;
+
+    /**
+     * The number of emails of any type that can be sent by a user with a Free
+     * account from the service per day.    If an email is sent to two different
+     * recipients, this counts as two emails.
+     */
+    var EDAM_USER_MAIL_LIMIT_DAILY_FREE: number;
+
+    /**
+     * The number of emails of any type that can be sent by a user with a Premium
+     * account from the service per day.    If an email is sent to two different
+     * recipients, this counts as two emails.
+     */
+    var EDAM_USER_MAIL_LIMIT_DAILY_PREMIUM: number;
+
+    /**
+     * The number of bytes of new data that may be uploaded to a Free user's
+     * account each month.
+     */
+    var EDAM_USER_UPLOAD_LIMIT_FREE: number;
+
+    /**
+     * The number of bytes of new data that may be uploaded to a Premium user's
+     * account each month.
+     */
+    var EDAM_USER_UPLOAD_LIMIT_PREMIUM: number;
+
+    /**
+     * The number of bytes of new data that may be uploaded to a Business user's
+     * personal account each month. Note that content uploaded into the Business
+     * notebooks by the user does not count against this limit.
+     */
+    var EDAM_USER_UPLOAD_LIMIT_BUSINESS: number;
+
+    /**
+     * Maximum total size of a Note that can be added to a Free account.
+     * The size of a note is calculated as:
+     * ENML content length (in Unicode characters) plus the sum of all resource
+     * sizes (in bytes).
+     */
+    var EDAM_NOTE_SIZE_MAX_FREE: number;
+
+    /**
+     * Maximum total size of a Note that can be added to a Premium account.
+     * The size of a note is calculated as:
+     * ENML content length (in Unicode characters) plus the sum of all resource
+     * sizes (in bytes).
+     */
+    var EDAM_NOTE_SIZE_MAX_PREMIUM: number;
+
+    /**
+     * Maximum size of a resource, in bytes, for Free accounts
+     */
+    var EDAM_RESOURCE_SIZE_MAX_FREE: number;
+
+    /**
+     * Maximum size of a resource, in bytes, for Premium accounts
+     */
+    var EDAM_RESOURCE_SIZE_MAX_PREMIUM: number;
+
+    /**
+     * Maximum number of linked notebooks per account, for a free
+     * account.
+     */
+    var EDAM_USER_LINKED_NOTEBOOK_MAX: number;
+
+    /**
+     * Maximum number of linked notebooks per account, for a premium
+     * account.    Users who are part of an active business are also
+     * covered under "premium".
+     */
+    var EDAM_USER_LINKED_NOTEBOOK_MAX_PREMIUM: number;
+
+    /**
+     * Maximum number of shared notebooks per notebook
+     */
+    var EDAM_NOTEBOOK_SHARED_NOTEBOOK_MAX: number;
+
+    /**
+     * The minimum length of the content class attribute of a note.
+     */
+    var EDAM_NOTE_CONTENT_CLASS_LEN_MIN: number;
+
+    /**
+     * The maximum length of the content class attribute of a note.
+     */
+    var EDAM_NOTE_CONTENT_CLASS_LEN_MAX: number;
+
+    /**
+     * The regular expression that the content class of a note must match
+     * to be valid.
+     */
+    var EDAM_NOTE_CONTENT_CLASS_REGEX: string;
+
+    /**
+     * The content class prefix used for all notes created by Evernote Hello.
+     * This prefix can be used to assemble individual content class strings,
+     * or can be used to create a wildcard search to get all notes created by
+     * Hello. When performing a wildcard search via filtered sync chunks or
+     * search strings, the * character must be appended to this constant.
+     */
+    var EDAM_HELLO_APP_CONTENT_CLASS_PREFIX: string;
+
+    /**
+     * The content class prefix used for all notes created by Evernote Food.
+     * This prefix can be used to assemble individual content class strings,
+     * or can be used to create a wildcard search to get all notes created by
+     * Food. When performing a wildcard search via filtered sync chunks or
+     * search strings, the * character must be appended to this constant.
+     */
+    var EDAM_FOOD_APP_CONTENT_CLASS_PREFIX: string;
+
+    /**
+     * The content class prefix used for structured notes created by Evernote
+     * Hello that represents an encounter with a person. When performing a
+     * wildcard search via filtered sync chunks or search strings, the *
+     * character must be appended to this constant.
+     */
+    var EDAM_CONTENT_CLASS_HELLO_ENCOUNTER: string;
+
+    /**
+     * The content class prefix used for structured notes created by Evernote
+     * Hello that represents the user's profile. When performing a
+     * wildcard search via filtered sync chunks or search strings, the *
+     * character must be appended to this constant.
+     */
+    var EDAM_CONTENT_CLASS_HELLO_PROFILE: string;
+
+    /**
+     * The content class prefix used for structured notes created by
+     * Evernote Food that captures the experience of a particular meal.
+     * When performing a wildcard search via filtered sync chunks or search
+     * strings, the * character must be appended to this constant.
+     */
+    var EDAM_CONTENT_CLASS_FOOD_MEAL: string;
+
+    /**
+     * The content class prefix used for structured notes created by Evernote
+     * Skitch. When performing a wildcard search via filtered sync chunks
+     * or search strings, the * character must be appended to this constant.
+     */
+    var EDAM_CONTENT_CLASS_SKITCH_PREFIX: string;
+
+    /**
+     * The content class value used for structured image notes created by Evernote
+     * Skitch.
+     */
+    var EDAM_CONTENT_CLASS_SKITCH: string;
+
+    /**
+     * The content class value used for structured PDF notes created by Evernote
+     * Skitch.
+     */
+    var EDAM_CONTENT_CLASS_SKITCH_PDF: string;
+
+    /**
+     * The content class prefix used for structured notes created by Evernote
+     * Penultimate. When performing a wildcard search via filtered sync chunks
+     * or search strings, the * character must be appended to this constant.
+     */
+    var EDAM_CONTENT_CLASS_PENULTIMATE_PREFIX: string;
+
+    /**
+     * The content class value used for structured notes created by Evernote
+     * Penultimate that represents a Penultimate notebook.
+     */
+    var EDAM_CONTENT_CLASS_PENULTIMATE_NOTEBOOK: string;
+
+    /**
+     * The minimum length of the plain text in a findRelated query, assuming that
+     * plaintext is being provided.
+     */
+    var EDAM_RELATED_PLAINTEXT_LEN_MIN: number;
+
+    /**
+     * The maximum length of the plain text in a findRelated query, assuming that
+     * plaintext is being provided.
+     */
+    var EDAM_RELATED_PLAINTEXT_LEN_MAX: number;
+
+    /**
+     * The maximum number of notes that will be returned from a findRelated()
+     * query.
+     */
+    var EDAM_RELATED_MAX_NOTES: number;
+
+    /**
+     * The maximum number of notebooks that will be returned from a findRelated()
+     * query.
+     */
+    var EDAM_RELATED_MAX_NOTEBOOKS: number;
+
+    /**
+     * The maximum number of tags that will be returned from a findRelated() query.
+     */
+    var EDAM_RELATED_MAX_TAGS: number;
+
+    /**
+     * The minimum length, in Unicode characters, of a description for a business
+     * notebook.
+     */
+    var EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_LEN_MIN: number;
+
+    /**
+     * The maximum length, in Unicode characters, of a description for a business
+     * notebook.
+     */
+    var EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_LEN_MAX: number;
+
+    /**
+     * All business notebook descriptions must match this pattern.
+     * This excludes control chars or line/paragraph separators.
+     * The string may not begin or end with whitespace.
+     */
+    var EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_REGEX: string;
+
+    /**
+     * The maximum length of a business phone number.
+     */
+    var EDAM_BUSINESS_PHONE_NUMBER_LEN_MAX: number;
+
+    /**
+     * Minimum length of a preference name
+     */
+    var EDAM_PREFERENCE_NAME_LEN_MIN: number;
+
+    /**
+     * Maximum length of a preference name
+     */
+    var EDAM_PREFERENCE_NAME_LEN_MAX: number;
+
+    /**
+     * Minimum length of a preference value
+     */
+    var EDAM_PREFERENCE_VALUE_LEN_MIN: number;
+
+    /**
+     * Maximum length of a preference value
+     */
+    var EDAM_PREFERENCE_VALUE_LEN_MAX: number;
+
+    /**
+     * Maximum number of name/value pairs allowed
+     */
+    var EDAM_MAX_PREFERENCES: number;
+
+    /**
+     * Maximum number of values per preference name
+     */
+    var EDAM_MAX_VALUES_PER_PREFERENCE: number;
+
+    /**
+     * A preference name must match this regex.
+     */
+    var EDAM_PREFERENCE_NAME_REGEX: string;
+
+    /**
+     * A preference value must match this regex.
+     */
+    var EDAM_PREFERENCE_VALUE_REGEX: string;
+
+    /**
+     * The name of the preferences entry that contains shortcuts.
+     */
+    var EDAM_PREFERENCE_SHORTCUTS: string;
+
+    /**
+     * The maximum number of shortcuts that a user may have.
+     */
+    var EDAM_PREFERENCE_SHORTCUTS_MAX_VALUES: number;
+
+    /**
+     * Maximum length of the device identifier string associated with long sessions.
+     */
+    var EDAM_DEVICE_ID_LEN_MAX: number;
+
+    /**
+     * Regular expression for device identifier strings associated with long sessions.
+     */
+    var EDAM_DEVICE_ID_REGEX: string;
+
+    /**
+     * Maximum length of the device description string associated with long sessions.
+     */
+    var EDAM_DEVICE_DESCRIPTION_LEN_MAX: number;
+
+    /**
+     * Regular expression for device description strings associated with long sessions.
+     */
+    var EDAM_DEVICE_DESCRIPTION_REGEX: string;
+
+    /**
+     * Maximum number of search suggestions that can be returned
+     */
+    var EDAM_SEARCH_SUGGESTIONS_MAX: number;
+
+    /**
+     * Maximum length of the search suggestion prefix
+     */
+    var EDAM_SEARCH_SUGGESTIONS_PREFIX_LEN_MAX: number;
+
+    /**
+     * Minimum length of the search suggestion prefix
+     */
+    var EDAM_SEARCH_SUGGESTIONS_PREFIX_LEN_MIN: number;
+    class NoteStoreClient {
+        seqid: number;
+
+        /**
+         * Asks the NoteStore to provide information about the status of the user
+         * account corresponding to the provided authentication token.
+         */
+        getSyncState(cb: Callback<SyncState>): void;
+
+        /**
+         * Asks the NoteStore to provide information about the status of the user
+         * account corresponding to the provided authentication token.
+         * This version of 'getSyncState' allows the client to upload coarse-
+         * grained usage metrics to the service.
+         *
+         * @param clientMetrics    see the documentation of the ClientUsageMetrics
+         *     structure for an explanation of the fields that clients can pass to
+         *     the service.
+         */
+        getSyncStateWithMetrics(clientMetrics: ClientUsageMetrics, cb: Callback<SyncState>): void;
+
+        /**
+         * Asks the NoteStore to provide the state of the account in order of
+         * last modification.    This request retrieves one block of the server's
+         * state so that a client can make several small requests against a large
+         * account rather than getting the entire state in one big message.
+         * This call gives fine-grained control of the data that will
+         * be received by a client by omitting data elements that a client doesn't
+         * need. This may reduce network traffic and sync times.
+         *
+         * @param afterUSN
+         *     The client can pass this value to ask only for objects that
+         *     have been updated after a certain point.    This allows the client to
+         *     receive updates after its last checkpoint rather than doing a full
+         *     synchronization on every pass.    The default value of "0" indicates
+         *     that the client wants to get objects from the start of the account.
+         *
+         * @param maxEntries
+         *     The maximum number of modified objects that should be
+         *     returned in the result SyncChunk.    This can be used to limit the size
+         *     of each individual message to be friendly for network transfer.
+         *
+         * @param filter
+         *     The caller must set some of the flags in this structure to specify which
+         *     data types should be returned during the synchronization.    See
+         *     the SyncChunkFilter structure for information on each flag.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "afterUSN" - if negative
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "maxEntries" - if less than 1
+         *     </li>
+         * </ul>
+         */
+        getFilteredSyncChunk(afterUSN: number, maxEntries: number, filter: SyncChunkFilter, cb: Callback<SyncState>): void;
+
+        /**
+         * Asks the NoteStore to provide information about the status of a linked
+         * notebook that has been shared with the caller, or that is public to the
+         * world.
+         * This will return a result that is similar to getSyncState, but may omit
+         * SyncState.uploaded if the caller doesn't have permission to write to
+         * the linked notebook.
+         *
+         * This function must be called on the shard that owns the referenced
+         * notebook.    (I.e. the shardId in /shard/shardId/edam/note must be the
+         * same as LinkedNotebook.shardId.)
+         *
+         * @param authenticationToken
+         *     This should be an authenticationToken for the guest who has received
+         *     the invitation to the share.    (I.e. this should not be the result of
+         *     NoteStore.authenticateToSharedNotebook)
+         *
+         * @param linkedNotebook
+         *     This structure should contain identifying information and permissions
+         *     to access the notebook in question.
+         */
+        getLinkedNotebookSyncState(linkedNotebook: LinkedNotebook, cb: Callback<SyncState>): void;
+
+        /**
+         * Asks the NoteStore to provide information about the contents of a linked
+         * notebook that has been shared with the caller, or that is public to the
+         * world.
+         * This will return a result that is similar to getSyncChunk, but will only
+         * contain entries that are visible to the caller.    I.e. only that particular
+         * Notebook will be visible, along with its Notes, and Tags on those Notes.
+         *
+         * This function must be called on the shard that owns the referenced
+         * notebook.    (I.e. the shardId in /shard/shardId/edam/note must be the
+         * same as LinkedNotebook.shardId.)
+         *
+         * @param authenticationToken
+         *     This should be an authenticationToken for the guest who has received
+         *     the invitation to the share.    (I.e. this should not be the result of
+         *     NoteStore.authenticateToSharedNotebook)
+         *
+         * @param linkedNotebook
+         *     This structure should contain identifying information and permissions
+         *     to access the notebook in question.    This must contain the valid fields
+         *     for either a shared notebook (e.g. shareKey)
+         *     or a public notebook (e.g. username, uri)
+         *
+         * @param afterUSN
+         *     The client can pass this value to ask only for objects that
+         *     have been updated after a certain point.    This allows the client to
+         *     receive updates after its last checkpoint rather than doing a full
+         *     synchronization on every pass.    The default value of "0" indicates
+         *     that the client wants to get objects from the start of the account.
+         *
+         * @param maxEntries
+         *     The maximum number of modified objects that should be
+         *     returned in the result SyncChunk.    This can be used to limit the size
+         *     of each individual message to be friendly for network transfer.
+         *     Applications should not request more than 256 objects at a time,
+         *     and must handle the case where the service returns less than the
+         *     requested number of objects in a given request even though more
+         *     objects are available on the service.
+         *
+         * @param fullSyncOnly
+         *     If true, then the client only wants initial data for a full sync.
+         *     In this case, the service will not return any expunged objects,
+         *     and will not return any Resources, since these are also provided
+         *     in their corresponding Notes.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "afterUSN" - if negative
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "maxEntries" - if less than 1
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "LinkedNotebook" - if the provided information doesn't match any
+         *         valid notebook
+         *     </li>
+         *     <li> "LinkedNotebook.uri" - if the provided public URI doesn't match any
+         *         valid notebook
+         *     </li>
+         *     <li> "SharedNotebook.id" - if the provided information indicates a
+         *            shared notebook that no longer exists
+         *     </li>
+         * </ul>
+         */
+        getLinkedNotebookSyncChunk(linkedNotebook: LinkedNotebook, afterUSN: number, maxEntries: number, fullSyncOnly: boolean, cb: Callback<SyncChunk>): void;
+
+        /**
+         * Returns a list of all of the notebooks in the account.
+         */
+        listNotebooks(cb: Callback<Notebook[]>): void;
+
+        /**
+         * Returns the current state of the notebook with the provided GUID.
+         * The notebook may be active or deleted (but not expunged).
+         *
+         * @param guid
+         *     The GUID of the notebook to be retrieved.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Notebook.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Notebook" - private notebook, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Notebook.guid" - tag not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        getNotebook(guid: string, cb: Callback<Notebook>): void;
+
+        /**
+         * Returns the notebook that should be used to store new notes in the
+         * user's account when no other notebooks are specified.
+         */
+        getDefaultNotebook(cb: Callback<Notebook>): void;
+
+        /**
+         * Asks the service to make a notebook with the provided name.
+         *
+         * @param notebook
+         *     The desired fields for the notebook must be provided on this
+         *     object.    The name of the notebook must be set, and either the 'active'
+         *     or 'defaultNotebook' fields may be set by the client at creation.
+         *     If a notebook exists in the account with the same name (via
+         *     case-insensitive compare), this will throw an EDAMUserException.
+         *
+         * @return
+         *     The newly created Notebook.    The server-side GUID will be
+         *     saved in this object's 'guid' field.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Notebook.name" - invalid length or pattern
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Notebook.stack" - invalid length or pattern
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Publishing.uri" - if publishing set but bad uri
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Publishing.publicDescription" - if too long
+         *     </li>
+         *     <li> DATA_CONFLICT "Notebook.name" - name already in use
+         *     </li>
+         *     <li> DATA_CONFLICT "Publishing.uri" - if URI already in use
+         *     </li>
+         *     <li> DATA_REQUIRED "Publishing.uri" - if publishing set but uri missing
+         *     </li>
+         *     <li> LIMIT_REACHED "Notebook" - at max number of notebooks
+         *     </li>
+         * </ul>
+         */
+        createNotebook(notebook: Notebook, cb: Callback<Notebook>): void;
+
+        /**
+         * Submits notebook changes to the service.    The provided data must include
+         * the notebook's guid field for identification.
+         *
+         * @param notebook
+         *     The notebook object containing the requested changes.
+         *
+         * @return
+         *     The Update Sequence Number for this change within the account.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Notebook.name" - invalid length or pattern
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Notebook.stack" - invalid length or pattern
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Publishing.uri" - if publishing set but bad uri
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Publishing.publicDescription" - if too long
+         *     </li>
+         *     <li> DATA_CONFLICT "Notebook.name" - name already in use
+         *     </li>
+         *     <li> DATA_CONFLICT "Publishing.uri" - if URI already in use
+         *     </li>
+         *     <li> DATA_REQUIRED "Publishing.uri" - if publishing set but uri missing
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Notebook.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        updateNotebook(notebook: Notebook, cb: Callback<number>): void;
+
+        /**
+         * Permanently removes the notebook from the user's account.
+         * After this action, the notebook is no longer available for undeletion, etc.
+         * If the notebook contains any Notes, they will be moved to the current
+         * default notebook and moved into the trash (i.e. Note.active=false).
+         * <p/>
+         * NOTE: This function is generally not available to third party applications.
+         * Calls will result in an EDAMUserException with the error code
+         * PERMISSION_DENIED.
+         *
+         * @param guid
+         *     The GUID of the notebook to delete.
+         *
+         * @return
+         *     The Update Sequence Number for this change within the account.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Notebook.guid" - if the parameter is missing
+         *     </li>
+         *     <li> LIMIT_REACHED "Notebook" - trying to expunge the last Notebook
+         *     </li>
+         *     <li> PERMISSION_DENIED "Notebook" - private notebook, user doesn't own
+         *     </li>
+         * </ul>
+         */
+        expungeNotebook(guid: string, cb: Callback<number>): void;
+
+        /**
+         * Returns a list of the tags in the account.    Evernote does not support
+         * the undeletion of tags, so this will only include active tags.
+         */
+        listTags(cb: Callback<Tag[]>): void;
+
+        /**
+         * Returns a list of the tags that are applied to at least one note within
+         * the provided notebook.    If the notebook is public, the authenticationToken
+         * may be ignored.
+         *
+         * @param notebookGuid
+         *        the GUID of the notebook to use to find tags
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Notebook.guid" - notebook not found by GUID
+         *     </li>
+         * </ul>
+         */
+        listTagsByNotebook(notebookGuid: string, cb: Callback<Tag[]>): void;
+
+        /**
+         * Returns the current state of the Tag with the provided GUID.
+         *
+         * @param guid
+         *     The GUID of the tag to be retrieved.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Tag.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Tag" - private Tag, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Tag.guid" - tag not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        getTag(guid: string, cb: Callback<Tag>): void;
+
+        /**
+         * Asks the service to make a tag with a set of information.
+         *
+         * @param tag
+         *     The desired list of fields for the tag are specified in this
+         *     object.    The caller must specify the tag name, and may provide
+         *     the parentGUID.
+         *
+         * @return
+         *     The newly created Tag.    The server-side GUID will be
+         *     saved in this object.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Tag.name" - invalid length or pattern
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Tag.parentGuid" - malformed GUID
+         *     </li>
+         *     <li> DATA_CONFLICT "Tag.name" - name already in use
+         *     </li>
+         *     <li> LIMIT_REACHED "Tag" - at max number of tags
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Tag.parentGuid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        createTag(tag: Tag, cb: Callback<Tag>): void;
+
+        /**
+         * Submits tag changes to the service.    The provided data must include
+         * the tag's guid field for identification.    The service will apply
+         * updates to the following tag fields:    name, parentGuid
+         *
+         * @param tag
+         *     The tag object containing the requested changes.
+         *
+         * @return
+         *     The Update Sequence Number for this change within the account.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Tag.name" - invalid length or pattern
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Tag.parentGuid" - malformed GUID
+         *     </li>
+         *     <li> DATA_CONFLICT "Tag.name" - name already in use
+         *     </li>
+         *     <li> DATA_CONFLICT "Tag.parentGuid" - can't set parent: circular
+         *     </li>
+         *     <li> PERMISSION_DENIED "Tag" - user doesn't own tag
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Tag.guid" - tag not found, by GUID
+         *     </li>
+         *     <li> "Tag.parentGuid" - parent not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        updateTag(tag: Tag, cb: Callback<number>): void;
+
+        /**
+         * Removes the provided tag from every note that is currently tagged with
+         * this tag.    If this operation is successful, the tag will still be in
+         * the account, but it will not be tagged on any notes.
+         *
+         * This function is not indended for use by full synchronizing clients, since
+         * it does not provide enough result information to the client to reconcile
+         * the local state without performing a follow-up sync from the service.    This
+         * is intended for "thin clients" that need to efficiently support this as
+         * a UI operation.
+         *
+         * @param guid
+         *     The GUID of the tag to remove from all notes.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Tag.guid" - if the guid parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Tag" - user doesn't own tag
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Tag.guid" - tag not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        untagAll(guid: string, cb: Callback<void>): void;
+
+        /**
+         * Permanently deletes the tag with the provided GUID, if present.
+         * <p/>
+         * NOTE: This function is generally not available to third party applications.
+         * Calls will result in an EDAMUserException with the error code
+         * PERMISSION_DENIED.
+         *
+         * @param guid
+         *     The GUID of the tag to delete.
+         *
+         * @return
+         *     The Update Sequence Number for this change within the account.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Tag.guid" - if the guid parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Tag" - user doesn't own tag
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Tag.guid" - tag not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        expungeTag(guid: string, cb: Callback<number>): void;
+
+        /**
+         * Returns a list of the searches in the account.    Evernote does not support
+         * the undeletion of searches, so this will only include active searches.
+         */
+        listSearches(cb: Callback<SavedSearch[]>): void;
+
+        /**
+         * Returns the current state of the search with the provided GUID.
+         *
+         * @param guid
+         *     The GUID of the search to be retrieved.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "SavedSearch.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "SavedSearch" - private Tag, user doesn't own
+         *     </li>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "SavedSearch.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        getSearch(guid: string, cb: Callback<SavedSearch>): void;
+
+        /**
+         * Asks the service to make a saved search with a set of information.
+         *
+         * @param search
+         *     The desired list of fields for the search are specified in this
+         *     object. The caller must specify the name and query for the
+         *     search, and may optionally specify a search scope.
+         *     The SavedSearch.format field is ignored by the service.
+         *
+         * @return
+         *     The newly created SavedSearch.    The server-side GUID will be
+         *     saved in this object.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "SavedSearch.name" - invalid length or pattern
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "SavedSearch.query" - invalid length
+         *     </li>
+         *     <li> DATA_CONFLICT "SavedSearch.name" - name already in use
+         *     </li>
+         *     <li> LIMIT_REACHED "SavedSearch" - at max number of searches
+         *     </li>
+         * </ul>
+         */
+        createSearch(search: SavedSearch, cb: Callback<SavedSearch>): void;
+
+        /**
+         * Submits search changes to the service. The provided data must include
+         * the search's guid field for identification. The service will apply
+         * updates to the following search fields: name, query, and scope.
+         *
+         * @param search
+         *     The search object containing the requested changes.
+         *
+         * @return
+         *     The Update Sequence Number for this change within the account.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "SavedSearch.name" - invalid length or pattern
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "SavedSearch.query" - invalid length
+         *     </li>
+         *     <li> DATA_CONFLICT "SavedSearch.name" - name already in use
+         *     </li>
+         *     <li> PERMISSION_DENIED "SavedSearch" - user doesn't own tag
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "SavedSearch.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        updateSearch(search: SavedSearch, cb: Callback<number>): number;
+
+        /**
+         * Permanently deletes the saved search with the provided GUID, if present.
+         * <p/>
+         * NOTE: This function is generally not available to third party applications.
+         * Calls will result in an EDAMUserException with the error code
+         * PERMISSION_DENIED.
+         *
+         * @param guid
+         *     The GUID of the search to delete.
+         *
+         * @return
+         *     The Update Sequence Number for this change within the account.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "SavedSearch.guid" - if the guid parameter is empty
+         *     </li>
+         *     <li> PERMISSION_DENIED "SavedSearch" - user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "SavedSearch.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        expungeSearch(guid: string, cb: Callback<number>): void;
+
+        /**
+         * DEPRECATED. Use findNotesMetadata.
+         */
+        findNotes(filter: NoteFilter, offset: number, maxNotes: number, cb: Callback<NoteList>): void;
+
+        /**
+         * Finds the position of a note within a sorted subset of all of the user's
+         * notes. This may be useful for thin clients that are displaying a paginated
+         * listing of a large account, which need to know where a particular note
+         * sits in the list without retrieving all notes first.
+         *
+         * @param authenticationToken
+         *     Must be a valid token for the user's account unless the NoteFilter
+         *     'notebookGuid' is the GUID of a public notebook.
+         *
+         * @param filter
+         *     The list of criteria that will constrain the notes to be returned.
+         *
+         * @param guid
+         *     The GUID of the note to be retrieved.
+         *
+         * @return
+         *     If the note with the provided GUID is found within the matching note
+         *     list, this will return the offset of that note within that list (where
+         *     the first offset is 0).    If the note is not found within the set of
+         *     notes, this will return -1.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "offset" - not between 0 and EDAM_USER_NOTES_MAX
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "maxNotes" - not between 0 and EDAM_USER_NOTES_MAX
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.notebookGuid" - if malformed
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.tagGuids" - if any are malformed
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.words" - if search string too long
+         *     </li>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Notebook.guid" - not found, by GUID
+         *     </li>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        findNoteOffset(filter: NoteFilter, guid: string, cb: Callback<number>): void;
+
+        /**
+         * Used to find the high-level information about a set of the notes from a
+         * user's account based on various criteria specified via a NoteFilter object.
+         * <p/>
+         * Web applications that wish to periodically check for new content in a user's
+         * Evernote account should consider using webhooks instead of polling this API.
+         * See http://dev.evernote.com/documentation/cloud/chapters/polling_notification.php
+         * for more information.
+         *
+         * @param authenticationToken
+         *     Must be a valid token for the user's account unless the NoteFilter
+         *     'notebookGuid' is the GUID of a public notebook.
+         *
+         * @param filter
+         *     The list of criteria that will constrain the notes to be returned.
+         *
+         * @param offset
+         *     The numeric index of the first note to show within the sorted
+         *     results.    The numbering scheme starts with "0".    This can be used for
+         *     pagination.
+         *
+         * @param maxNotes
+         *     The mximum notes to return in this query.    The service will return a set
+         *     of notes that is no larger than this number, but may return fewer notes
+         *     if needed.    The NoteList.totalNotes field in the return value will
+         *     indicate whether there are more values available after the returned set.
+         *
+         * @param resultSpec
+         *     This specifies which information should be returned for each matching
+         *     Note. The fields on this structure can be used to eliminate data that
+         *     the client doesn't need, which will reduce the time and bandwidth
+         *     to receive and process the reply.
+         *
+         * @return
+         *     The list of notes that match the criteria.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "offset" - not between 0 and EDAM_USER_NOTES_MAX
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "maxNotes" - not between 0 and EDAM_USER_NOTES_MAX
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.notebookGuid" - if malformed
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.tagGuids" - if any are malformed
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.words" - if search string too long
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Notebook.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        findNotesMetadata(filter: NoteFilter, offset: number, maxNotes: number, resultSpec: NotesMetadataResultSpec, cb: Callback<NotesMetadataList>): void;
+
+        /**
+         * This function is used to determine how many notes are found for each
+         * notebook and tag in the user's account, given a current set of filter
+         * parameters that determine the current selection.    This function will
+         * return a structure that gives the note count for each notebook and tag
+         * that has at least one note under the requested filter.    Any notebook or
+         * tag that has zero notes in the filtered set will not be listed in the
+         * reply to this function (so they can be assumed to be 0).
+         *
+         * @param authenticationToken
+         *     Must be a valid token for the user's account unless the NoteFilter
+         *     'notebookGuid' is the GUID of a public notebook.
+         *
+         * @param filter
+         *     The note selection filter that is currently being applied.    The note
+         *     counts are to be calculated with this filter applied to the total set
+         *     of notes in the user's account.
+         *
+         * @param withTrash
+         *     If true, then the NoteCollectionCounts.trashCount will be calculated
+         *     and supplied in the reply. Otherwise, the trash value will be omitted.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.notebookGuid" - if malformed
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.notebookGuids" - if any are malformed
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.words" - if search string too long
+         *     </li>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Notebook.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        findNoteCounts(filter: NoteFilter, withTrash: boolean, cb: Callback<NoteCollectionCounts>): void;
+
+        /**
+         * Returns the current state of the note in the service with the provided
+         * GUID.    The ENML contents of the note will only be provided if the
+         * 'withContent' parameter is true.    The service will include the meta-data
+         * for each resource in the note, but the binary contents of the resources
+         * and their recognition data will be omitted.
+         * If the Note is found in a public notebook, the authenticationToken
+         * will be ignored (so it could be an empty string).    The applicationData
+         * fields are returned as keysOnly.
+         *
+         * @param guid
+         *     The GUID of the note to be retrieved.
+         *
+         * @param withContent
+         *     If true, the note will include the ENML contents of its
+         *     'content' field.
+         *
+         * @param withResourcesData
+         *     If true, any Resource elements in this Note will include the binary
+         *     contents of their 'data' field's body.
+         *
+         * @param withResourcesRecognition
+         *     If true, any Resource elements will include the binary contents of the
+         *     'recognition' field's body if recognition data is present.
+         *
+         * @param withResourcesAlternateData
+         *     If true, any Resource elements in this Note will include the binary
+         *     contents of their 'alternateData' fields' body, if an alternate form
+         *     is present.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        getNote(guid: string, withContent: boolean, withResourcesData: boolean, withResourcesRecognition: boolean, withResourcesAlternateData: boolean, cb: Callback<Note>): void;
+
+        /**
+         * Get all of the application data for the note identified by GUID,
+         * with values returned within the LazyMap fullMap field.
+         * If there are no applicationData entries, then a LazyMap
+         * with an empty fullMap will be returned. If your application
+         * only needs to fetch its own applicationData entry, use
+         * getNoteApplicationDataEntry instead.
+         */
+        getNoteApplicationData(guid: string, cb: Callback<LazyMap>): void;
+
+        /**
+         * Get the value of a single entry in the applicationData map
+         * for the note identified by GUID.
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - note not found, by GUID</li>
+         *     <li> "NoteAttributes.applicationData.key" - note not found, by key</li>
+         * </ul>
+         */
+        getNoteApplicationDataEntry(guid: string, key: string, cb: Callback<string>): void;
+
+        /**
+         * Update, or create, an entry in the applicationData map for
+         * the note identified by guid.
+         */
+        setNoteApplicationDataEntry(guid: string, key: string, value: string, cb: Callback<number>): void;
+
+        /**
+         * Remove an entry identified by 'key' from the applicationData map for
+         * the note identified by 'guid'. Silently ignores an unset of a
+         * non-existing key.
+         */
+        unsetNoteApplicationDataEntry(guid: string, key: string, cb: Callback<number>): void;
+
+        /**
+         * Returns XHTML contents of the note with the provided GUID.
+         * If the Note is found in a public notebook, the authenticationToken
+         * will be ignored (so it could be an empty string).
+         *
+         * @param guid
+         *     The GUID of the note to be retrieved.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        getNoteContent(guid: string, cb: Callback<string>): void;
+
+        /**
+         * Returns a block of the extracted plain text contents of the note with the
+         * provided GUID.    This text can be indexed for search purposes by a light
+         * client that doesn't have capabilities to extract all of the searchable
+         * text content from the note and its resources.
+         *
+         * If the Note is found in a public notebook, the authenticationToken
+         * will be ignored (so it could be an empty string).
+         *
+         * @param guid
+         *     The GUID of the note to be retrieved.
+         *
+         * @param noteOnly
+         *     If true, this will only return the text extracted from the ENML contents
+         *     of the note itself.    If false, this will also include the extracted text
+         *     from any text-bearing resources (PDF, recognized images)
+         *
+         * @param tokenizeForIndexing
+         *     If true, this will break the text into cleanly separated and sanitized
+         *     tokens.    If false, this will return the more raw text extraction, with
+         *     its original punctuation, capitalization, spacing, etc.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        getNoteSearchText(guid: string, noteOnly: boolean, tokenizeForIndexing: boolean, cb: Callback<string>): void;
+
+        /**
+         * Returns a block of the extracted plain text contents of the resource with
+         * the provided GUID.    This text can be indexed for search purposes by a light
+         * client that doesn't have capability to extract all of the searchable
+         * text content from a resource.
+         *
+         * If the Resource is found in a public notebook, the authenticationToken
+         * will be ignored (so it could be an empty string).
+         *
+         * @param guid
+         *     The GUID of the resource to be retrieved.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Resource.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        getResourceSearchText(guid: string, cb: Callback<string>): void;
+
+        /**
+         * Returns a list of the names of the tags for the note with the provided
+         * guid.    This can be used with authentication to get the tags for a
+         * user's own note, or can be used without valid authentication to retrieve
+         * the names of the tags for a note in a public notebook.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        getNoteTagNames(guid: string, cb: Callback<string[]>): void;
+
+        /**
+         * Asks the service to make a note with the provided set of information.
+         *
+         * @param note
+         *     A Note object containing the desired fields to be populated on
+         *     the service.
+         *
+         * @return
+         *     The newly created Note from the service.    The server-side
+         *     GUIDs for the Note and any Resources will be saved in this object.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Note.title" - invalid length or pattern
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Note.content" - invalid length for ENML content
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Resource.mime" - invalid resource MIME type
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteAttributes.*" - bad resource string
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "ResourceAttributes.*" - bad resource string
+         *     </li>
+         *     <li> DATA_CONFLICT "Note.deleted" - deleted time set on active note
+         *     </li>
+         *     <li> DATA_REQUIRED "Resource.data" - resource data body missing
+         *     </li>
+         *     <li> ENML_VALIDATION "*" - note content doesn't validate against DTD
+         *     </li>
+         *     <li> LIMIT_REACHED "Note" - at max number per account
+         *     </li>
+         *     <li> LIMIT_REACHED "Note.size" - total note size too large
+         *     </li>
+         *     <li> LIMIT_REACHED "Note.resources" - too many resources on Note
+         *     </li>
+         *     <li> LIMIT_REACHED "Note.tagGuids" - too many Tags on Note
+         *     </li>
+         *     <li> LIMIT_REACHED "Resource.data.size" - resource too large
+         *     </li>
+         *     <li> LIMIT_REACHED "NoteAttribute.*" - attribute string too long
+         *     </li>
+         *     <li> LIMIT_REACHED "ResourceAttribute.*" - attribute string too long
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note.notebookGuid" - NB not owned by user
+         *     </li>
+         *     <li> QUOTA_REACHED "Accounting.uploadLimit" - note exceeds upload quota
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Tag.name" - Note.tagNames was provided, and one
+         *         of the specified tags had an invalid length or pattern
+         *     </li>
+         *     <li> LIMIT_REACHED "Tag" - Note.tagNames was provided, and the required
+         *         new tags would exceed the maximum number per account
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.notebookGuid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        createNote(note: Note, cb: Callback<Note>): void;
+
+        /**
+         * Submit a set of changes to a note to the service.    The provided data
+         * must include the note's guid field for identification. The note's
+         * title must also be set.
+         *
+         * @param note
+         *     A Note object containing the desired fields to be populated on
+         *     the service. With the exception of the note's title and guid, fields
+         *     that are not being changed do not need to be set. If the content is not
+         *     being modified, note.content should be left unset. If the list of
+         *     resources is not being modified, note.resources should be left unset.
+         *
+         * @return
+         *     The metadata (no contents) for the Note on the server after the update
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Note.title" - invalid length or pattern
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Note.content" - invalid length for ENML body
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteAttributes.*" - bad resource string
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "ResourceAttributes.*" - bad resource string
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Resource.mime" - invalid resource MIME type
+         *     </li>
+         *     <li> DATA_CONFLICT "Note.deleted" - deleted time set on active note
+         *     </li>
+         *     <li> DATA_REQUIRED "Resource.data" - resource data body missing
+         *     </li>
+         *     <li> ENML_VALIDATION "*" - note content doesn't validate against DTD
+         *     </li>
+         *     <li> LIMIT_REACHED "Note.tagGuids" - too many Tags on Note
+         *     </li>
+         *     <li> LIMIT_REACHED "Note.resources" - too many resources on Note
+         *     </li>
+         *     <li> LIMIT_REACHED "Note.size" - total note size too large
+         *     </li>
+         *     <li> LIMIT_REACHED "Resource.data.size" - resource too large
+         *     </li>
+         *     <li> LIMIT_REACHED "NoteAttribute.*" - attribute string too long
+         *     </li>
+         *     <li> LIMIT_REACHED "ResourceAttribute.*" - attribute string too long
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note" - user doesn't own
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note.notebookGuid" - user doesn't own destination
+         *     </li>
+         *     <li> QUOTA_REACHED "Accounting.uploadLimit" - note exceeds upload quota
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Tag.name" - Note.tagNames was provided, and one
+         *         of the specified tags had an invalid length or pattern
+         *     </li>
+         *     <li> LIMIT_REACHED "Tag" - Note.tagNames was provided, and the required
+         *         new tags would exceed the maximum number per account
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - note not found, by GUID
+         *     </li>
+         *     <li> "Note.notebookGuid" - if notebookGuid provided, but not found
+         *     </li>
+         * </ul>
+         */
+        updateNote(note: Note, cb: Callback<Note>): void;
+
+        /**
+         * Moves the note into the trash. The note may still be undeleted, unless it
+         * is expunged.    This is equivalent to calling updateNote() after setting
+         * Note.active = false
+         *
+         * @param guid
+         *     The GUID of the note to delete.
+         *
+         * @return
+         *     The Update Sequence Number for this change within the account.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> PERMISSION_DENIED "Note" - user doesn't have permission to
+         *                    update the note.
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> DATA_CONFLICT "Note.guid" - the note is already deleted
+         *     </li>
+         * </ul>
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        deleteNote(guid: string, cb: Callback<number>): void;
+
+        /**
+         * Permanently removes a Note, and all of its Resources,
+         * from the service.
+         * <p/>
+         * NOTE: This function is not available to third party applications.
+         * Calls will result in an EDAMUserException with the error code
+         * PERMISSION_DENIED.
+         *
+         * @param guid
+         *     The GUID of the note to delete.
+         *
+         * @return
+         *     The Update Sequence Number for this change within the account.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> PERMISSION_DENIED "Note" - user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        expungeNote(guid: string, cb: Callback<number>): void;
+
+        /**
+         * Permanently removes a list of Notes, and all of their Resources, from
+         * the service.    This should be invoked with a small number of Note GUIDs
+         * (e.g. 100 or less) on each call.    To expunge a larger number of notes,
+         * call this method multiple times.    This should also be used to reduce the
+         * number of Notes in a notebook before calling expungeNotebook() or
+         * in the trash before calling expungeInactiveNotes(), since these calls may
+         * be prohibitively slow if there are more than a few hundred notes.
+         * If an exception is thrown for any of the GUIDs, then none of the notes
+         * will be deleted.    I.e. this call can be treated as an atomic transaction.
+         * <p/>
+         * NOTE: This function is not available to third party applications.
+         * Calls will result in an EDAMUserException with the error code
+         * PERMISSION_DENIED.
+         *
+         * @param noteGuids
+         *     The list of GUIDs for the Notes to remove.
+         *
+         * @return
+         *     The account's updateCount at the end of this operation
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> PERMISSION_DENIED "Note" - user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        expungeNotes(noteGuids: string[], cb: Callback<number>): void;
+
+        /**
+         * Permanently removes all of the Notes that are currently marked as
+         * inactive.    This is equivalent to "emptying the trash", and these Notes
+         * will be gone permanently.
+         * <p/>
+         * This operation may be relatively slow if the account contains a large
+         * number of inactive Notes.
+         * <p/>
+         * NOTE: This function is not available to third party applications.
+         * Calls will result in an EDAMUserException with the error code
+         * PERMISSION_DENIED.
+         *
+         * @return
+         *        The number of notes that were expunged.
+         */
+        expungeInactiveNotes(cb: Callback<number>): void;
+
+        /**
+         * Performs a deep copy of the Note with the provided GUID 'noteGuid' into
+         * the Notebook with the provided GUID 'toNotebookGuid'.
+         * The caller must be the owner of both the Note and the Notebook.
+         * This creates a new Note in the destination Notebook with new content and
+         * Resources that match all of the content and Resources from the original
+         * Note, but with new GUID identifiers.
+         * The original Note is not modified by this operation.
+         * The copied note is considered as an "upload" for the purpose of upload
+         * transfer limit calculation, so its size is added to the upload count for
+         * the owner.
+         *
+         * @param noteGuid
+         *     The GUID of the Note to copy.
+         *
+         * @param toNotebookGuid
+         *     The GUID of the Notebook that should receive the new Note.
+         *
+         * @return
+         *     The metadata for the new Note that was created.    This will include the
+         *     new GUID for this Note (and any copied Resources), but will not include
+         *     the content body or the binary bodies of any Resources.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> LIMIT_REACHED "Note" - at max number per account
+         *     </li>
+         *     <li> PERMISSION_DENIED "Notebook.guid" - destination not owned by user
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note" - user doesn't own
+         *     </li>
+         *     <li> QUOTA_REACHED "Accounting.uploadLimit" - note exceeds upload quota
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Notebook.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        copyNote(noteGuid: string, toNotebookGuid: string, cb: Callback<Note>): void;
+
+        /**
+         * Returns a list of the prior versions of a particular note that are
+         * saved within the service.    These prior versions are stored to provide a
+         * recovery from unintentional removal of content from a note. The identifiers
+         * that are returned by this call can be used with getNoteVersion to retrieve
+         * the previous note.
+         * The identifiers will be listed from the most recent versions to the oldest.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        listNoteVersions(noteGuid: string, cb: Callback<NoteVersionId[]>): void;
+
+        /**
+         * This can be used to retrieve a previous version of a Note after it has been
+         * updated within the service.    The caller must identify the note (via its
+         * guid) and the version (via the updateSequenceNumber of that version).
+         * to find a listing of the stored version USNs for a note, call
+         * listNoteVersions.
+         * This call is only available for notes in Premium accounts.    (I.e. access
+         * to past versions of Notes is a Premium-only feature.)
+         *
+         * @param noteGuid
+         *     The GUID of the note to be retrieved.
+         *
+         * @param updateSequenceNum
+         *     The USN of the version of the note that is being retrieved
+         *
+         * @param withResourcesData
+         *     If true, any Resource elements in this Note will include the binary
+         *     contents of their 'data' field's body.
+         *
+         * @param withResourcesRecognition
+         *     If true, any Resource elements will include the binary contents of the
+         *     'recognition' field's body if recognition data is present.
+         *
+         * @param withResourcesAlternateData
+         *     If true, any Resource elements in this Note will include the binary
+         *     contents of their 'alternateData' fields' body, if an alternate form
+         *     is present.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
+         *     </li>
+         *     <li> PERMISSION_DENIED "updateSequenceNum" -
+         *         The account isn't permitted to access previous versions of notes.
+         *         (i.e. this is a Free account.)
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         *     <li> "Note.updateSequenceNumber" - the Note doesn't have a version with
+         *            the corresponding USN.
+         *     </li>
+         * </ul>
+         */
+        getNoteVersion(noteGuid: string, updateSequenceNum: number, withResourcesData: boolean, withResourcesRecognition: boolean, withResourcesAlternateData: boolean, cb: Callback<Note>): void;
+
+        /**
+         * Returns the current state of the resource in the service with the
+         * provided GUID.
+         * If the Resource is found in a public notebook, the authenticationToken
+         * will be ignored (so it could be an empty string).    Only the
+         * keys for the applicationData will be returned.
+         *
+         * @param guid
+         *     The GUID of the resource to be retrieved.
+         *
+         * @param withData
+         *     If true, the Resource will include the binary contents of the
+         *     'data' field's body.
+         *
+         * @param withRecognition
+         *     If true, the Resource will include the binary contents of the
+         *     'recognition' field's body if recognition data is present.
+         *
+         * @param withAttributes
+         *     If true, the Resource will include the attributes
+         *
+         * @param withAlternateData
+         *     If true, the Resource will include the binary contents of the
+         *     'alternateData' field's body, if an alternate form is present.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Resource.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        getResource(guid: string, withData: boolean, withRecognition: boolean, withAttributes: boolean, withAlternateData: boolean, cb: Callback<Resource>): void;
+
+        /**
+         * Get all of the application data for the Resource identified by GUID,
+         * with values returned within the LazyMap fullMap field.
+         * If there are no applicationData entries, then a LazyMap
+         * with an empty fullMap will be returned. If your application
+         * only needs to fetch its own applicationData entry, use
+         * getResourceApplicationDataEntry instead.
+         */
+        getResourceApplicationData(guid: string, cb: Callback<LazyMap>): void;
+
+        /**
+         * Get the value of a single entry in the applicationData map
+         * for the Resource identified by GUID.
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Resource.guid" - Resource not found, by GUID</li>
+         *     <li> "ResourceAttributes.applicationData.key" - Resource not found, by key</li>
+         * </ul>
+         */
+        getResourceApplicationDataEntry(guid: string, key: string, cb: Callback<string>): void;
+
+        /**
+         * Update, or create, an entry in the applicationData map for
+         * the Resource identified by guid.
+         */
+        setResourceApplicationDataEntry(guid: string, key: string, value: string, cb: Callback<number>): void;
+
+        /**
+         * Remove an entry identified by 'key' from the applicationData map for
+         * the Resource identified by 'guid'.
+         */
+        unsetResourceApplicationDataEntry(guid: string, key: string, cb: Callback<number>): void;
+
+        /**
+         * Submit a set of changes to a resource to the service.    This can be used
+         * to update the meta-data about the resource, but cannot be used to change
+         * the binary contents of the resource (including the length and hash).    These
+         * cannot be changed directly without creating a new resource and removing the
+         * old one via updateNote.
+         *
+         * @param resource
+         *     A Resource object containing the desired fields to be populated on
+         *     the service.    The service will attempt to update the resource with the
+         *     following fields from the client:
+         *     <ul>
+         *            <li>guid:    must be provided to identify the resource
+         *            </li>
+         *            <li>mime
+         *            </li>
+         *            <li>width
+         *            </li>
+         *            <li>height
+         *            </li>
+         *            <li>duration
+         *            </li>
+         *            <li>attributes:    optional.    if present, the set of attributes will
+         *                     be replaced.
+         *            </li>
+         *     </ul>
+         *
+         * @return
+         *     The Update Sequence Number of the resource after the changes have been
+         *     applied.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Resource.mime" - invalid resource MIME type
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "ResourceAttributes.*" - bad resource string
+         *     </li>
+         *     <li> LIMIT_REACHED "ResourceAttribute.*" - attribute string too long
+         *     </li>
+         *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Resource.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        updateResource(resource: Resource, cb: Callback<number>): void;
+
+        /**
+         * Returns binary data of the resource with the provided GUID.    For
+         * example, if this were an image resource, this would contain the
+         * raw bits of the image.
+         * If the Resource is found in a public notebook, the authenticationToken
+         * will be ignored (so it could be an empty string).
+         *
+         * @param guid
+         *     The GUID of the resource to be retrieved.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Resource.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        getResourceData(guid: string, cb: Callback<string>): void;
+
+        /**
+         * Returns the current state of a resource, referenced by containing
+         * note GUID and resource content hash.
+         *
+         * @param noteGuid
+         *     The GUID of the note that holds the resource to be retrieved.
+         *
+         * @param contentHash
+         *     The MD5 checksum of the resource within that note. Note that
+         *     this is the binary checksum, for example from Resource.data.bodyHash,
+         *     and not the hex-encoded checksum that is used within an en-media
+         *     tag in a note body.
+         *
+         * @param withData
+         *     If true, the Resource will include the binary contents of the
+         *     'data' field's body.
+         *
+         * @param withRecognition
+         *     If true, the Resource will include the binary contents of the
+         *     'recognition' field's body.
+         *
+         * @param withAlternateData
+         *     If true, the Resource will include the binary contents of the
+         *     'alternateData' field's body, if an alternate form is present.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> DATA_REQUIRED "Note.guid" - noteGuid param missing
+         *     </li>
+         *     <li> DATA_REQUIRED "Note.contentHash" - contentHash param missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note" - not found, by guid
+         *     </li>
+         *     <li> "Resource" - not found, by hash
+         *     </li>
+         * </ul>
+         */
+        getResourceByHash(noteGuid: string, contentHash: string, withData: boolean, withRecognition: boolean, withAlternateData: boolean, cb: Callback<Resource>): void;
+
+        /**
+         * Returns the binary contents of the recognition index for the resource
+         * with the provided GUID.    If the caller asks about a resource that has
+         * no recognition data, this will throw EDAMNotFoundException.
+         * If the Resource is found in a public notebook, the authenticationToken
+         * will be ignored (so it could be an empty string).
+         *
+         * @param guid
+         *     The GUID of the resource whose recognition data should be retrieved.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Resource.guid" - not found, by GUID
+         *     </li>
+         *     <li> "Resource.recognition" - resource has no recognition
+         *     </li>
+         * </ul>
+         */
+        getResourceRecognition(guid: string, cb: Callback<string>): void;
+
+        /**
+         * If the Resource with the provided GUID has an alternate data representation
+         * (indicated via the Resource.alternateData field), then this request can
+         * be used to retrieve the binary contents of that alternate data file.
+         * If the caller asks about a resource that has no alternate data form, this
+         * will throw EDAMNotFoundException.
+         *
+         * @param guid
+         *        The GUID of the resource whose recognition data should be retrieved.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Resource.guid" - not found, by GUID
+         *     </li>
+         *     <li> "Resource.alternateData" - resource has no recognition
+         *     </li>
+         * </ul>
+         */
+        getResourceAlternateData(guid: string, cb: Callback<string>): void;
+
+        /**
+         * Returns the set of attributes for the Resource with the provided GUID.
+         * If the Resource is found in a public notebook, the authenticationToken
+         * will be ignored (so it could be an empty string).
+         *
+         * @param guid
+         *     The GUID of the resource whose attributes should be retrieved.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Resource.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        getResourceAttributes(guid: string, cb: Callback<ResourceAttributes>): void;
+
+        /**
+         * <p>
+         * Looks for a user account with the provided userId on this NoteStore
+         * shard and determines whether that account contains a public notebook
+         * with the given URI.    If the account is not found, or no public notebook
+         * exists with this URI, this will throw an EDAMNotFoundException,
+         * otherwise this will return the information for that Notebook.
+         * </p>
+         * <p>
+         * If a notebook is visible on the web with a full URL like
+         * http://www.evernote.com/pub/sethdemo/api
+         * Then 'sethdemo' is the username that can be used to look up the userId,
+         * and 'api' is the publicUri.
+         * </p>
+         *
+         * @param userId
+         *        The numeric identifier for the user who owns the public notebook.
+         *        To find this value based on a username string, you can invoke
+         *        UserStore.getPublicUserInfo
+         *
+         * @param publicUri
+         *        The uri string for the public notebook, from Notebook.publishing.uri.
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li>"Publishing.uri" - not found, by URI</li>
+         * </ul>
+         *
+         * @throws EDAMSystemException <ul>
+         *     <li> TAKEN_DOWN "PublicNotebook" - The specified public notebook is
+         *         taken down (for all requesters).</li>
+         *     <li> TAKEN_DOWN "Country" - The specified public notebook is taken
+         *         down for the requester because of an IP-based country lookup.</li>
+         * </ul>
+         */
+        getPublicNotebook(userId: number, publicUri: string, cb: Callback<Notebook>): void;
+
+        /**
+         * Used to construct a shared notebook object. The constructed notebook will
+         * contain a "share key" which serve as a unique identifer and access token
+         * for a user to access the notebook of the shared notebook owner.
+         *
+         * @param sharedNotebook
+         *     A shared notebook object populated with the email address of the share
+         *     recipient, the notebook guid and the access permissions. All other
+         *     attributes of the shared object are ignored. The SharedNotebook.allowPreview
+         *     field must be explicitly set with either a true or false value.
+         *
+         * @return
+         *     The fully populated SharedNotebook object including the server assigned
+         *     share id and shareKey which can both be used to uniquely identify the
+         *     SharedNotebook.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li>BAD_DATA_FORMAT "SharedNotebook.email" - if the email was not valid</li>
+         *     <li>BAD_DATA_FORMAT "requireLogin" - if the SharedNotebook.allowPreview field was
+         *             not set, and the SharedNotebook.requireLogin was also not set or was set to
+         *             false.</li>
+         *     <li>PERMISSION_DENIED "SharedNotebook.recipientSettings" - if
+         *             recipientSettings is set in the sharedNotebook.    Only the recipient
+         *             can set these values via the setSharedNotebookRecipientSettings
+         *             method.
+         *     </li>
+         *     </ul>
+         * @throws EDAMNotFoundException <ul>
+         *     <li>Notebook.guid - if the notebookGuid is not a valid GUID for the user.
+         *     </li>
+         *     </ul>
+         */
+        createSharedNotebook(sharedNotebook: SharedNotebook, cb: Callback<SharedNotebook>): void;
+
+        /**
+         * Update a SharedNotebook object.
+         *
+         * @param authenticationToken
+         *     Must be an authentication token from the owner or a shared notebook
+         *     authentication token or business authentication token with sufficient
+         *     permissions to change invitations for a notebook.
+         *
+         * @param sharedNotebook
+         *    The SharedNotebook object containing the requested changes.
+         *    The "id" of the shared notebook must be set to allow the service
+         *    to identify the SharedNotebook to be updated. In addition, you MUST set
+         *    the email, permission, and allowPreview fields to the desired values.
+         *    All other fields will be ignored if set.
+         *
+         * @return
+         *    The Update Serial Number for this change within the account.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li>UNSUPPORTED_OPERATION "updateSharedNotebook" - if this service instance does not support shared notebooks.</li>
+         *     <li>BAD_DATA_FORMAT "SharedNotebook.email" - if the email was not valid.</li>
+         *     <li>DATA_REQUIRED "SharedNotebook.id" - if the id field was not set.</li>
+         *     <li>DATA_REQUIRED "SharedNotebook.privilege" - if the privilege field was not set.</li>
+         *     <li>DATA_REQUIRED "SharedNotebook.allowPreview" - if the allowPreview field was not set.</li>
+         *     </ul>
+         * @throws EDAMNotFoundException <ul>
+         *     <li>SharedNotebook.id - if no shared notebook with the specified ID was found.
+         *     </ul>
+         */
+        updateSharedNotebook(sharedNotebook: SharedNotebook, cb: Callback<number>): void;
+
+        /**
+         * Set values for the recipient settings associated with a shared notebook.    Having
+         * update rights to the shared notebook record itself has no effect on this call;
+         * only the recipient of the shared notebook can can the recipient settings.
+         *
+         * If you do <i>not</i> wish to, or cannot, change one of the reminderNotifyEmail or
+         * reminderNotifyInApp fields, you must leave that field unset in recipientSettings.
+         * This method will skip that field for updates and leave the existing state as
+         * it is.
+         *
+         * @return The update sequence number of the account to which the shared notebook
+         *     belongs, which is the account from which we are sharing a notebook.
+         *
+         * @throws EDAMNotFoundException "sharedNotebookId" - Thrown if the service does not
+         *     have a shared notebook record for the sharedNotebookId on the given shard.    If you
+         *     receive this exception, it is probable that the shared notebook record has
+         *     been revoked or expired, or that you accessed the wrong shard.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li>PEMISSION_DENIED "authenticationToken" - If you do not have permission to set
+         *             the recipient settings for the shared notebook.    Only the recipient has
+         *             permission to do this.
+         *     <li>DATA_CONFLICT "recipientSettings.reminderNotifyEmail" - Setting whether
+         *             or not you want to receive reminder e-mail notifications is possible on
+         *             a business notebook in the business to which the user belongs.    All
+         *             others can safely unset the reminderNotifyEmail field from the
+         *             recipientSettings parameter.
+         * </ul>
+         */
+        setSharedNotebookRecipientSettings(sharedNotebookId: number, recipientSettings: SharedNotebookRecipientSettings, cb: Callback<number>): void;
+
+        /**
+         * Send a reminder message to some or all of the email addresses that a notebook has been
+         * shared with. The message includes the current link to view the notebook.
+         * @param authenticationToken
+         *     The auth token of the user with permissions to share the notebook
+         * @param notebookGuid
+         *     The guid of the shared notebook
+         * @param messageText
+         *    User provided text to include in the email
+         * @param recipients
+         *    The email addresses of the recipients. If this list is empty then all of the
+         *    users that the notebook has been shared with are emailed.
+         *    If an email address doesn't correspond to share invite members then that address
+         *    is ignored.
+         * @return
+         *    The number of messages sent
+         * @throws EDAMUserException <ul>
+         *     <li> LIMIT_REACHED "(recipients)" -
+         *         The email can't be sent because this would exceed the user's daily
+         *         email limit.
+         *     </li>
+         *     <li> PERMISSION_DENIED "Notebook.guid" - The user doesn't have permission to
+         *         send a message for the specified notebook.
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Notebook.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        sendMessageToSharedNotebookMembers(notebookGuid: string, messageText: string, recipients: string[], cb: Callback<number>): void;
+
+        /**
+         * Lists the collection of shared notebooks for all notebooks in the
+         * users account.
+         *
+         * @return
+         *    The list of all SharedNotebooks for the user
+         */
+        listSharedNotebooks(cb: Callback<SharedNotebook[]>): void;
+
+        /**
+         * Expunges the SharedNotebooks in the user's account using the
+         * SharedNotebook.id as the identifier.
+         * <p/>
+         * NOTE: This function is generally not available to third party applications.
+         * Calls will result in an EDAMUserException with the error code
+         * PERMISSION_DENIED.
+         *
+         * @param
+         *     sharedNotebookIds - a list of ShardNotebook.id longs identifying the
+         *             objects to delete permanently.
+         *
+         * @return
+         *     The account's update sequence number.
+         */
+        expungeSharedNotebooks(sharedNotebookIds: number[], cb: Callback<number>): void;
+
+        /**
+         * Asks the service to make a linked notebook with the provided name, username
+         * of the owner and identifiers provided. A linked notebook can be either a
+         * link to a public notebook or to a private shared notebook.
+         *
+         * @param linkedNotebook
+         *     The desired fields for the linked notebook must be provided on this
+         *     object.    The name of the linked notebook must be set. Either a username
+         *     uri or a shard id and share key must be provided otherwise a
+         *     EDAMUserException is thrown.
+         *
+         * @return
+         *     The newly created LinkedNotebook.    The server-side id will be
+         *     saved in this object's 'id' field.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "LinkedNotebook.name" - invalid length or pattern
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "LinkedNotebook.username" - bad username format
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "LinkedNotebook.uri" -
+         *         if public notebook set but bad uri
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "LinkedNotebook.shareKey" -
+         *         if private notebook set but bad shareKey
+         *     </li>
+         *     <li> DATA_REQUIRED "LinkedNotebook.shardId" -
+         *         if private notebook but shard id not provided
+         *     </li>
+         * </ul>
+         */
+        createLinkedNotebook(linkedNotebook: LinkedNotebook, cb: Callback<LinkedNotebook>): void;
+
+        /**
+         * @param linkedNotebook
+         *     Updates the name of a linked notebook.
+         *
+         * @return
+         *     The Update Sequence Number for this change within the account.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "LinkedNotebook.name" - invalid length or pattern
+         *     </li>
+         * </ul>
+         */
+        updateLinkedNotebook(linkedNotebook: LinkedNotebook, cb: Callback<number>): void;
+
+        /**
+         * Returns a list of linked notebooks
+         */
+        listLinkedNotebooks(cb: Callback<LinkedNotebook[]>): void;
+
+        /**
+         * Permanently expunges the linked notebook from the account.
+         * <p/>
+         * NOTE: This function is generally not available to third party applications.
+         * Calls will result in an EDAMUserException with the error code
+         * PERMISSION_DENIED.
+         *
+         * @param guid
+         *     The LinkedNotebook.guid field of the LinkedNotebook to permanently remove
+         *     from the account.
+         */
+        expungeLinkedNotebook(guid: string, cb: Callback<number>): void;
+
+        /**
+         * Asks the service to produce an authentication token that can be used to
+         * access the contents of a shared notebook from someone else's account.
+         * This authenticationToken can be used with the various other NoteStore
+         * calls to find and retrieve notes, and if the permissions in the shared
+         * notebook are sufficient, to make changes to the contents of the notebook.
+         *
+         * @param shareKey
+         *     The 'shareKey' identifier from the SharedNotebook that was granted to
+         *     some recipient.    This string internally encodes the notebook identifier
+         *     and a security signature.
+         *
+         * @param authenticationToken
+         *     If a non-empty string is provided, this is the full user-based
+         *     authentication token that identifies the user who is currently logged in
+         *     and trying to access the shared notebook.    This may be required if the
+         *     notebook was created with 'requireLogin'.
+         *     If this string is empty, the service will attempt to authenticate to the
+         *     shared notebook without any logged in user.
+         *
+         * @throws EDAMSystemException <ul>
+         *     <li> BAD_DATA_FORMAT "shareKey" - invalid shareKey string
+         *     </li>
+         *     <li> INVALID_AUTH "shareKey" - bad signature on shareKey string
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "SharedNotebook.id" - the shared notebook no longer exists
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> DATA_REQUIRED "authenticationToken" - the share requires login, and
+         *                    no valid authentication token was provided.
+         *     </li>
+         *     <li> PERMISSION_DENIED "SharedNotebook.username" - share requires login,
+         *                    and another username has already been bound to this notebook.
+         *     </li>
+         * </ul>
+         */
+        authenticateToSharedNotebook(shareKey: string, cb: Callback<AuthenticationResult>): void;
+
+        /**
+         * This function is used to retrieve extended information about a shared
+         * notebook by a guest who has already authenticated to access that notebook.
+         * This requires an 'authenticationToken' parameter which should be the
+         * resut of a call to authenticateToSharedNotebook(...).
+         * I.e. this is the token that gives access to the particular shared notebook
+         * in someone else's account -- it's not the authenticationToken for the
+         * owner of the notebook itself.
+         *
+         * @param authenticationToken
+         *     Should be the authentication token retrieved from the reply of
+         *     authenticateToSharedNotebook(), proving access to a particular shared
+         *     notebook.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> PERMISSION_DENIED "authenticationToken" -
+         *                    authentication token doesn't correspond to a valid shared notebook
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "SharedNotebook.id" - the shared notebook no longer exists
+         *     </li>
+         * </ul>
+         */
+        getSharedNotebookByAuth(cb: Callback<SharedNotebook>): void;
+
+        /**
+         * Attempts to send a single note to one or more email recipients.
+         * <p/>
+         * NOTE: This function is generally not available to third party applications.
+         * Calls will result in an EDAMUserException with the error code
+         * PERMISSION_DENIED.
+         *
+         * @param authenticationToken
+         *        The note will be sent as the user logged in via this token, using that
+         *        user's registered email address.    If the authenticated user doesn't
+         *        have permission to read that note, the emailing will fail.
+         *
+         * @param parameters
+         *        The note must be specified either by GUID (in which case it will be
+         *        sent using the existing data in the service), or else the full Note
+         *        must be passed to this call.    This also specifies the additional
+         *        email fields that will be used in the email.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> LIMIT_REACHED "NoteEmailParameters.toAddresses" -
+         *         The email can't be sent because this would exceed the user's daily
+         *         email limit.
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "(email address)" -
+         *         email address malformed
+         *     </li>
+         *     <li> DATA_REQUIRED "NoteEmailParameters.toAddresses" -
+         *         if there are no To: or Cc: addresses provided.
+         *     </li>
+         *     <li> DATA_REQUIRED "Note.title" -
+         *         if the caller provides a Note parameter with no title
+         *     </li>
+         *     <li> DATA_REQUIRED "Note.content" -
+         *         if the caller provides a Note parameter with no content
+         *     </li>
+         *     <li> ENML_VALIDATION "*" - note content doesn't validate against DTD
+         *     </li>
+         *     <li> DATA_REQUIRED "NoteEmailParameters.note" -
+         *         if no guid or note provided
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        emailNote(parameters: NoteEmailParameters, cb: Callback<void>): void;
+
+        /**
+         * If this note is not already shared (via its own direct URL), then this
+         * will start sharing that note.
+         * This will return the secret "Note Key" for this note that
+         * can currently be used in conjunction with the Note's GUID to gain direct
+         * read-only access to the Note.
+         * If the note is already shared, then this won't make any changes to the
+         * note, and the existing "Note Key" will be returned.    The only way to change
+         * the Note Key for an existing note is to stopSharingNote first, and then
+         * call this function.
+         *
+         * @param guid
+         *     The GUID of the note to be shared.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        shareNote(guid: string, cb: Callback<string>): void;
+
+        /**
+         * If this note is not already shared then this will stop sharing that note
+         * and invalidate its "Note Key", so any existing URLs to access that Note
+         * will stop working.
+         * If the Note is not shared, then this function will do nothing.
+         *
+         * @param guid
+         *     The GUID of the note to be un-shared.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        stopSharingNote(guid: string, cb: Callback<void>): void;
+
+        /**
+         * Asks the service to produce an authentication token that can be used to
+         * access the contents of a single Note which was individually shared
+         * from someone's account.
+         * This authenticationToken can be used with the various other NoteStore
+         * calls to find and retrieve the Note and its directly-referenced children.
+         *
+         * @param guid
+         *     The GUID identifying this Note on this shard.
+         *
+         * @param noteKey
+         *     The 'noteKey' identifier from the Note that was originally created via
+         *     a call to shareNote() and then given to a recipient to access.
+         *
+         * @param authenticationToken
+         *     An optional authenticationToken that identifies the user accessing the
+         *     shared note. This parameter may be required to access some shared notes.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> PERMISSION_DENIED "Note" - the Note with that GUID is either not
+         *         shared, or the noteKey doesn't match the current key for this note
+         *     </li>
+         *     <li> PERMISSION_DENIED "authenticationToken" - an authentication token is
+         *         required to access this Note, but either no authentication token or a
+         *         "non-owner" authentication token was provided.
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "guid" - the note with that GUID is not found
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMSystemException <ul>
+         *     <li> TAKEN_DOWN "Note" - The specified shared note is taken down (for
+         *         all requesters).
+         *     </li>
+         *     <li> TAKEN_DOWN "Country" - The specified shared note is taken down
+         *         for the requester because of an IP-based country lookup.
+         *     </ul>
+         * </ul>
+         */
+        authenticateToSharedNote(guid: string, noteKey: string, cb: Callback<AuthenticationResult>): void;
+
+        /**
+         * Identify related entities on the service, such as notes,
+         * notebooks, and tags related to notes or content.
+         *
+         * @param query
+         *     The information about which we are finding related entities.
+         *
+         * @param resultSpec
+         *     Allows the client to indicate the type and quantity of
+         *     information to be returned, allowing a saving of time and
+         *     bandwidth.
+         *
+         * @return
+         *     The result of the query, with information considered
+         *     to likely be relevantly related to the information
+         *     described by the query.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li>BAD_DATA_FORMAT "RelatedQuery.plainText" - If you provided a
+         *         a zero-length plain text value.
+         *     </li>
+         *     <li>BAD_DATA_FORMAT "RelatedQuery.noteGuid" - If you provided an
+         *         invalid Note GUID, that is, one that does not match the constraints
+         *         defined by EDAM_GUID_LEN_MIN, EDAM_GUID_LEN_MAX, EDAM_GUID_REGEX.
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.notebookGuid" - if malformed
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.tagGuids" - if any are malformed
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.words" - if search string too long
+         *     </li>
+         *     <li>PERMISSION_DENIED "Note" - If the caller does not have access to
+         *         the note identified by RelatedQuery.noteGuid.
+         *     </li>
+         *     <li>DATA_REQUIRED "RelatedResultSpec" - If you did not not set any values
+         *         in the result spec.
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li>"RelatedQuery.noteGuid" - the note with that GUID is not
+         *         found, if that field has been set in the query.
+         *     </li>
+         * </ul>
+         */
+        findRelated(query: RelatedQuery, resultSpec: RelatedResultSpec, cb: Callback<RelatedResult>): void;
+    }
+    /**
+     *    This structure encapsulates the information about the state of the
+     *    user's account for the purpose of "state based" synchronization.
+     * <dl>
+     *    <dt>currentTime</dt>
+     *        <dd>
+     *        The server's current date and time.
+     *        </dd>
+     *
+     *    <dt>fullSyncBefore</dt>
+     *        <dd>
+     *        The cutoff date and time for client caches to be
+     *        updated via incremental synchronization.    Any clients that were last
+     *        synched with the server before this date/time must do a full resync of all
+     *        objects.    This cutoff point will change over time as archival data is
+     *        deleted or special circumstances on the service require resynchronization.
+     *        </dd>
+     *
+     *    <dt>updateCount</dt>
+     *        <dd>
+     *        Indicates the total number of transactions that have
+     *        been committed within the account.    This reflects (for example) the
+     *        number of discrete additions or modifications that have been made to
+     *        the data in this account (tags, notes, resources, etc.).
+     *        This number is the "high water mark" for Update Sequence Numbers (USN)
+     *        within the account.
+     *        </dd>
+     *
+     *    <dt>uploaded</dt>
+     *        <dd>
+     *        The total number of bytes that have been uploaded to
+     *        this account in the current monthly period.    This can be compared against
+     *        Accounting.uploadLimit (from the UserStore) to determine how close the user
+     *        is to their monthly upload limit.
+     *        This value may not be present if the SyncState has been retrieved by
+     *        a caller that only has read access to the account.
+     *        </dd>
+     *    </dl>
+     */
+    class SyncState {
+        currentTime: number;
+        fullSyncBefore: number;
+        updateCount: number;
+        uploaded: number;
+
+        constructor(args?: { currentTime: number; fullSyncBefore: number; updateCount: number; uploaded?: number; });
+    }
+
+    /**
+     *    This structure is given out by the NoteStore when a client asks to
+     *    receive the current state of an account.    The client asks for the server's
+     *    state one chunk at a time in order to allow clients to retrieve the state
+     *    of a large account without needing to transfer the entire account in
+     *    a single message.
+     *
+     *    The server always gives SyncChunks using an ascending series of Update
+     *    Sequence Numbers (USNs).
+     *
+     * <dl>
+     *    <dt>currentTime</dt>
+     *        <dd>
+     *        The server's current date and time.
+     *        </dd>
+     *
+     *    <dt>chunkHighUSN</dt>
+     *        <dd>
+     *        The highest USN for any of the data objects represented
+     *        in this sync chunk.    If there are no objects in the chunk, this will not be
+     *        set.
+     *        </dd>
+     *
+     *    <dt>updateCount</dt>
+     *        <dd>
+     *        The total number of updates that have been performed in
+     *        the service for this account.    This is equal to the highest USN within the
+     *        account at the point that this SyncChunk was generated.    If updateCount
+     *        and chunkHighUSN are identical, that means that this is the last chunk
+     *        in the account ... there is no more recent information.
+     *        </dd>
+     *
+     *    <dt>notes</dt>
+     *        <dd>
+     *        If present, this is a list of non-expunged notes that
+     *        have a USN in this chunk.    This will include notes that are "deleted"
+     *        but not expunged (i.e. in the trash).    The notes will include their list
+     *        of tags and resources, but the note content, resource content, resource
+     *        recognition data and resource alternate data will not be supplied.
+     *        </dd>
+     *
+     *    <dt>notebooks</dt>
+     *        <dd>
+     *        If present, this is a list of non-expunged notebooks that
+     *        have a USN in this chunk.    This will include notebooks that are "deleted"
+     *        but not expunged (i.e. in the trash).
+     *        </dd>
+     *
+     *    <dt>tags</dt>
+     *        <dd>
+     *        If present, this is a list of the non-expunged tags that have a
+     *        USN in this chunk.
+     *        </dd>
+     *
+     *    <dt>searches</dt>
+     *        <dd>
+     *        If present, this is a list of non-expunged searches that
+     *        have a USN in this chunk.
+     *        </dd>
+     *
+     *    <dt>resources</dt>
+     *        <dd>
+     *        If present, this is a list of the non-expunged resources
+     *        that have a USN in this chunk.    This will include the metadata for each
+     *        resource, but not its binary contents or recognition data, which must be
+     *        retrieved separately.
+     *        </dd>
+     *
+     *    <dt>expungedNotes</dt>
+     *        <dd>
+     *        If present, the GUIDs of all of the notes that were
+     *        permanently expunged in this chunk.
+     *        </dd>
+     *
+     *    <dt>expungedNotebooks</dt>
+     *        <dd>
+     *        If present, the GUIDs of all of the notebooks that
+     *        were permanently expunged in this chunk.    When a notebook is expunged,
+     *        this implies that all of its child notes (and their resources) were
+     *        also expunged.
+     *        </dd>
+     *
+     *    <dt>expungedTags</dt>
+     *        <dd>
+     *        If present, the GUIDs of all of the tags that were
+     *        permanently expunged in this chunk.
+     *        </dd>
+     *
+     *    <dt>expungedSearches</dt>
+     *        <dd>
+     *        If present, the GUIDs of all of the saved searches
+     *        that were permanently expunged in this chunk.
+     *        </dd>
+     *
+     *    <dt>linkedNotebooks</dt>
+     *        <dd>
+     *        If present, this is a list of non-expunged LinkedNotebooks that
+     *        have a USN in this chunk.
+     *        </dd>
+     *
+     *    <dt>expungedLinkedNotebooks</dt>
+     *        <dd>
+     *        If present, the GUIDs of all of the LinkedNotebooks
+     *        that were permanently expunged in this chunk.
+     *        </dd>
+     *    </dl>
+     */
+    class SyncChunk {
+        currentTime: number;
+        chunkHighUSN: number;
+        updateCount: number;
+        notes: Note[];
+        notebooks: Notebook[];
+        tags: Tag[];
+        searches: SavedSearch[];
+        resources: Resource[];
+        expungedNotes: string[];
+        expungedNotebooks: string[];
+        expungedTags: string[];
+        expungedSearches: string[];
+        linkedNotebooks: LinkedNotebook[];
+        expungedLinkedNotebooks: string[];
+
+        constructor(args?: { currentTime: number; chunkHighUSN?: number; updateCount: number; notes?: Note[]; notebooks?: Notebook[]; tags?: Tag[]; searches?: SavedSearch[]; resources?: Resource[]; expungedNotes?: string[]; expungedNotebooks?: string[]; expungedTags?: string[]; expungedSearches?: string[]; linkedNotebooks?: LinkedNotebook[]; expungedLinkedNotebooks?: string[]; });
+    }
+
+    /**
+     *    This structure is used with the 'getFilteredSyncChunk' call to provide
+     *    fine-grained control over the data that's returned when a client needs
+     *    to synchronize with the service. Each flag in this structure specifies
+     *    whether to include one class of data in the results of that call.
+     *
+     * <dl>
+     *    <dt>includeNotes</dt>
+     *        <dd>
+     *        If true, then the server will include the SyncChunks.notes field
+     *        </dd>
+     *
+     *    <dt>includeNoteResources</dt>
+     *        <dd>
+     *        If true, then the server will include the 'resources' field on all of
+     *        the Notes that are in SyncChunk.notes.
+     *        If 'includeNotes' is false, then this will have no effect.
+     *        </dd>
+     *
+     *    <dt>includeNoteAttributes</dt>
+     *        <dd>
+     *        If true, then the server will include the 'attributes' field on all of
+     *        the Notes that are in SyncChunks.notes.
+     *        If 'includeNotes' is false, then this will have no effect.
+     *        </dd>
+     *
+     *    <dt>includeNotebooks</dt>
+     *        <dd>
+     *        If true, then the server will include the SyncChunks.notebooks field
+     *        </dd>
+     *
+     *    <dt>includeTags</dt>
+     *        <dd>
+     *        If true, then the server will include the SyncChunks.tags field
+     *        </dd>
+     *
+     *    <dt>includeSearches</dt>
+     *        <dd>
+     *        If true, then the server will include the SyncChunks.searches field
+     *        </dd>
+     *
+     *    <dt>includeResources</dt>
+     *        <dd>
+     *        If true, then the server will include the SyncChunks.resources field.
+     *        Since the Resources are also provided with their Note
+     *        (in the Notes.resources list), this is primarily useful for clients that
+     *        want to watch for changes to individual Resources due to recognition data
+     *        being added.
+     *        </dd>
+     *
+     *    <dt>includeLinkedNotebooks</dt>
+     *        <dd>
+     *        If true, then the server will include the SyncChunks.linkedNotebooks field.
+     *        </dd>
+     *
+     *    <dt>includeExpunged</dt>
+     *        <dd>
+     *        If true, then the server will include the 'expunged' data for any type
+     *        of included data.    For example, if 'includeTags' and 'includeExpunged'
+     *        are both true, then the SyncChunks.expungedTags field will be set with
+     *        the GUIDs of tags that have been expunged from the server.
+     *        </dd>
+     *
+     *    <dt>includeNoteApplicationDataFullMap</dt>
+     *        <dd>
+     *        If true, then the values for the applicationData map will be filled
+     *        in, assuming notes and note attributes are being returned.    Otherwise,
+     *        only the keysOnly field will be filled in.
+     *        </dd>
+     *
+     *    <dt>includeResourceApplicationDataFullMap</dt>
+     *        <dd>
+     *        If true, then the fullMap values for the applicationData map will be
+     *        filled in, assuming resources and resource attributes are being returned
+     *        (includeResources is true).    Otherwise, only the keysOnly field will be
+     *        filled in.
+     *        </dd>
+     *
+     *    <dt>includeNoteResourceApplicationDataFullMap</dt>
+     *        <dd>
+     *        If true, then the fullMap values for the applicationData map will be
+     *        filled in for resources found inside of notes, assuming resources are
+     *        being returned in notes (includeNoteResources is true).    Otherwise,
+     *        only the keysOnly field will be filled in.
+     *        </dd>
+     *
+     *    <dt>requireNoteContentClass</dt>
+     *        <dd>
+     *        If set, then only send notes whose content class matches this value.
+     *        The value can be a literal match or, if the last character is an
+     *        asterisk, a prefix match.
+     *        </dd>
+     *    </dl>
+     */
+    class SyncChunkFilter {
+        includeNotes: boolean;
+        includeNoteResources: boolean;
+        includeNoteAttributes: boolean;
+        includeNotebooks: boolean;
+        includeTags: boolean;
+        includeSearches: boolean;
+        includeResources: boolean;
+        includeLinkedNotebooks: boolean;
+        includeExpunged: boolean;
+        includeNoteApplicationDataFullMap: boolean;
+        includeResourceApplicationDataFullMap: boolean;
+        includeNoteResourceApplicationDataFullMap: boolean;
+        requireNoteContentClass: string;
+
+        constructor(args?: { includeNotes?: boolean; includeNoteResources?: boolean; includeNoteAttributes?: boolean; includeNotebooks?: boolean; includeTags?: boolean; includeSearches?: boolean; includeResources?: boolean; includeLinkedNotebooks?: boolean; includeExpunged?: boolean; includeNoteApplicationDataFullMap?: boolean; includeResourceApplicationDataFullMap?: boolean; includeNoteResourceApplicationDataFullMap?: boolean; requireNoteContentClass?: string; });
+    }
+
+    /**
+     *    A list of criteria that are used to indicate which notes are desired from
+     *    the account.    This is used in queries to the NoteStore to determine
+     *    which notes should be retrieved.
+     *
+     * <dl>
+     *    <dt>order</dt>
+     *        <dd>
+     *        The NoteSortOrder value indicating what criterion should be
+     *        used to sort the results of the filter.
+     *        </dd>
+     *
+     *    <dt>ascending</dt>
+     *        <dd>
+     *        If true, the results will be ascending in the requested
+     *        sort order.    If false, the results will be descending.
+     *        </dd>
+     *
+     *    <dt>words</dt>
+     *        <dd>
+     *        If present, a search query string that will filter the set of notes to be returned.
+     *        Accepts the full search grammar documented in the Evernote API Overview.
+     *        </dd>
+     *
+     *    <dt>notebookGuid</dt>
+     *        <dd>
+     *        If present, the Guid of the notebook that must contain
+     *        the notes.
+     *        </dd>
+     *
+     *    <dt>tagGuids</dt>
+     *        <dd>
+     *        If present, the list of tags (by GUID) that must be present
+     *        on the notes.
+     *        </dd>
+     *
+     *    <dt>timeZone</dt>
+     *        <dd>
+     *        The zone ID for the user, which will be used to interpret
+     *        any dates or times in the queries that do not include their desired zone
+     *        information.
+     *        For example, if a query requests notes created "yesterday", this
+     *        will be evaluated from the provided time zone, if provided.
+     *        The format must be encoded as a standard zone ID such as
+     *        "America/Los_Angeles".
+     *        </dd>
+     *
+     *    <dt>inactive</dt>
+     *        <dd>
+     *        If true, then only notes that are not active (i.e. notes in
+     *        the Trash) will be returned. Otherwise, only active notes will be returned.
+     *        There is no way to find both active and inactive notes in a single query.
+     *        </dd>
+     *
+     *    <dt>emphasized</dt>
+     *        <dd>
+     *        If present, a search query string that may or may not influence the notes
+     *        to be returned, both in terms of coverage as well as of order. Think of it
+     *        as a wish list, not a requirement.
+     *        Accepts the full search grammar documented in the Evernote API Overview.
+     *        </dd>
+     *    </dl>
+     */
+    class NoteFilter {
+        order: number;
+        ascending: boolean;
+        words: string;
+        notebookGuid: string;
+        tagGuids: string[];
+        timeZone: string;
+        inactive: boolean;
+        emphasized: string;
+
+        constructor(args?: { order?: number; ascending?: boolean; words?: string; notebookGuid?: string; tagGuids?: string[]; timeZone?: string; inactive?: boolean; emphasized?: string; });
+    }
+
+    /**
+     *    A small structure for returning a list of notes out of a larger set.
+     *
+     * <dl>
+     *    <dt>startIndex</dt>
+     *        <dd>
+     *        The starting index within the overall set of notes.    This
+     *        is also the number of notes that are "before" this list in the set.
+     *        </dd>
+     *
+     *    <dt>totalNotes</dt>
+     *        <dd>
+     *        The number of notes in the larger set.    This can be used
+     *        to calculate how many notes are "after" this note in the set.
+     *        (I.e.    remaining = totalNotes - (startIndex + notes.length)    )
+     *        </dd>
+     *
+     *    <dt>notes</dt>
+     *        <dd>
+     *        The list of notes from this range.    The Notes will include all
+     *        metadata (attributes, resources, etc.), but will not include the ENML
+     *        content of the note or the binary contents of any resources.
+     *        </dd>
+     *
+     *    <dt>stoppedWords</dt>
+     *        <dd>
+     *        If the NoteList was produced using a text based search
+     *        query that included words that are not indexed or searched by the service,
+     *        this will include a list of those ignored words.
+     *        </dd>
+     *
+     *    <dt>searchedWords</dt>
+     *        <dd>
+     *        If the NoteList was produced using a text based search
+     *        query that included viable search words or quoted expressions, this will
+     *        include a list of those words.    Any stopped words will not be included
+     *        in this list.
+     *        </dd>
+     *
+     *    <dt>updateCount</dt>
+     *        <dd>
+     *        Indicates the total number of transactions that have
+     *        been committed within the account.    This reflects (for example) the
+     *        number of discrete additions or modifications that have been made to
+     *        the data in this account (tags, notes, resources, etc.).
+     *        This number is the "high water mark" for Update Sequence Numbers (USN)
+     *        within the account.
+     *        </dd>
+     *    </dl>
+     */
+    class NoteList {
+        startIndex: number;
+        totalNotes: number;
+        notes: Note[];
+        stoppedWords: string[];
+        searchedWords: string[];
+        updateCount: number;
+
+        constructor(args?: { startIndex: number; totalNotes: number; notes: Note[]; stoppedWords?: string[]; searchedWords?: string[]; updateCount?: number; });
+    }
+
+    /**
+     * This structure is used in the set of results returned by the
+     * findNotesMetadata function.    It represents the high-level information about
+     * a single Note, without some of the larger deep structure.    This allows
+     * for the information about a list of Notes to be returned relatively quickly
+     * with less marshalling and data transfer to remote clients.
+     * Most fields in this structure are identical to the corresponding field in
+     * the Note structure, with the exception of:
+     *
+     * <dl>
+     * <dt>largestResourceMime</dt>
+     *     <dd>If set, then this will contain the MIME type of the largest Resource
+     *     (in bytes) within the Note.    This may be useful, for example, to choose
+     *     an appropriate icon or thumbnail to represent the Note.
+     *     </dd>
+     *
+     * <dt>largestResourceSize</dt>
+     *    <dd>If set, this will contain the size of the largest Resource file, in
+     *    bytes, within the Note.    This may be useful, for example, to decide whether
+     *    to ask the server for a thumbnail to represent the Note.
+     *    </dd>
+     * </dl>
+     */
+    class NoteMetadata {
+        guid: string;
+        title: string;
+        contentLength: number;
+        created: number;
+        updated: number;
+        deleted: number;
+        updateSequenceNum: number;
+        notebookGuid: string;
+        tagGuids: string[];
+        attributes: NoteAttributes;
+        largestResourceMime: string;
+        largestResourceSize: number;
+
+        constructor(args?: { guid: string; title?: string; contentLength?: number; created?: number; updated?: number; deleted?: number; updateSequenceNum?: number; notebookGuid?: string; tagGuids?: string[]; attributes?: NoteAttributes; largestResourceMime?: string; largestResourceSize?: number; });
+    }
+
+    /**
+     *    This structure is returned from calls to the findNotesMetadata function to
+     *    give the high-level metadata about a subset of Notes that are found to
+     *    match a specified NoteFilter in a search.
+     *
+     * <dl>
+     *    <dt>startIndex</dt>
+     *        <dd>
+     *        The starting index within the overall set of notes.    This
+     *        is also the number of notes that are "before" this list in the set.
+     *        </dd>
+     *
+     *    <dt>totalNotes</dt>
+     *        <dd>
+     *        The number of notes in the larger set.    This can be used
+     *        to calculate how many notes are "after" this note in the set.
+     *        (I.e.    remaining = totalNotes - (startIndex + notes.length)    )
+     *        </dd>
+     *
+     *    <dt>notes</dt>
+     *        <dd>
+     *        The list of metadata for Notes in this range.    The set of optional fields
+     *        that are set in each metadata structure will depend on the
+     *        NotesMetadataResultSpec provided by the caller when the search was
+     *        performed.    Only the 'guid' field will be guaranteed to be set in each
+     *        Note.
+     *        </dd>
+     *
+     *    <dt>stoppedWords</dt>
+     *        <dd>
+     *        If the NoteList was produced using a text based search
+     *        query that included words that are not indexed or searched by the service,
+     *        this will include a list of those ignored words.
+     *        </dd>
+     *
+     *    <dt>searchedWords</dt>
+     *        <dd>
+     *        If the NoteList was produced using a text based search
+     *        query that included viable search words or quoted expressions, this will
+     *        include a list of those words.    Any stopped words will not be included
+     *        in this list.
+     *        </dd>
+     *
+     *    <dt>updateCount</dt>
+     *        <dd>
+     *        Indicates the total number of transactions that have
+     *        been committed within the account.    This reflects (for example) the
+     *        number of discrete additions or modifications that have been made to
+     *        the data in this account (tags, notes, resources, etc.).
+     *        This number is the "high water mark" for Update Sequence Numbers (USN)
+     *        within the account.
+     *        </dd>
+     *    </dl>
+     */
+    class NotesMetadataList {
+        startIndex: number;
+        totalNotes: number;
+        notes: NoteMetadata[];
+        stoppedWords: string[];
+        searchedWords: string[];
+        updateCount: number;
+
+        constructor(args?: { startIndex: number; totalNotes: number; notes: NoteMetadata[]; stoppedWords?: string[]; searchedWords?: string[]; updateCount?: number; });
+    }
+
+    /**
+     * This structure is provided to the findNotesMetadata function to specify
+     * the subset of fields that should be included in each NoteMetadata element
+     * that is returned in the NotesMetadataList.
+     * Each field on this structure is a boolean flag that indicates whether the
+     * corresponding field should be included in the NoteMetadata structure when
+     * it is returned.    For example, if the 'includeTitle' field is set on this
+     * structure when calling findNotesMetadata, then each NoteMetadata in the
+     * list should have its 'title' field set.
+     * If one of the fields in this spec is not set, then it will be treated as
+     * 'false' by the server, so the default behavior is to include nothing in
+     * replies (but the mandatory GUID)
+     */
+    class NotesMetadataResultSpec {
+        includeTitle: boolean;
+        includeContentLength: boolean;
+        includeCreated: boolean;
+        includeUpdated: boolean;
+        includeDeleted: boolean;
+        includeUpdateSequenceNum: boolean;
+        includeNotebookGuid: boolean;
+        includeTagGuids: boolean;
+        includeAttributes: boolean;
+        includeLargestResourceMime: boolean;
+        includeLargestResourceSize: boolean;
+
+        constructor(args?: { includeTitle?: boolean; includeContentLength?: boolean; includeCreated?: boolean; includeUpdated?: boolean; includeDeleted?: boolean; includeUpdateSequenceNum?: boolean; includeNotebookGuid?: boolean; includeTagGuids?: boolean; includeAttributes?: boolean; includeLargestResourceMime?: boolean; includeLargestResourceSize?: boolean; });
+    }
+
+    /**
+     *    A data structure representing the number of notes for each notebook
+     *    and tag with a non-zero set of applicable notes.
+     *
+     * <dl>
+     *    <dt>notebookCounts</dt>
+     *        <dd>
+     *        A mapping from the Notebook GUID to the number of
+     *        notes (from some selection) that are in the corresponding notebook.
+     *        </dd>
+     *
+     *    <dt>tagCounts</dt>
+     *        <dd>
+     *        A mapping from the Tag GUID to the number of notes (from some
+     *        selection) that have the corresponding tag.
+     *        </dd>
+     *
+     *    <dt>trashCount</dt>
+     *        <dd>
+     *        If this is set, then this is the number of notes that are in the trash.
+     *        If this is not set, then the number of notes in the trash hasn't been
+     *        reported.    (I.e. if there are no notes in the trash, this will be set
+     *        to 0.)
+     *        </dd>
+     *    </dl>
+     */
+    class NoteCollectionCounts {
+        notebookCounts: { [k: string]: number; };
+        tagCounts: { [k: string]: number; };
+        trashCount: number;
+
+        constructor(args?: { notebookCounts?: { [k: string]: number; }; tagCounts?: { [k: string]: number; }; trashCount?: number; });
+    }
+
+    /**
+     * Parameters that must be given to the NoteStore emailNote call. These allow
+     * the caller to specify the note to send, the recipient addresses, etc.
+     *
+     * <dl>
+     *    <dt>guid</dt>
+     *        <dd>
+     *            If set, this must be the GUID of a note within the user's account that
+     *            should be retrieved from the service and sent as email.    If not set,
+     *            the 'note' field must be provided instead.
+     *        </dd>
+     *
+     *    <dt>note</dt>
+     *        <dd>
+     *            If the 'guid' field is not set, this field must be provided, including
+     *            the full contents of the note note (and all of its Resources) to send.
+     *            This can be used for a Note that as not been created in the service,
+     *            for example by a local client with local notes.
+     *        </dd>
+     *
+     *    <dt>toAddresses</dt>
+     *        <dd>
+     *            If provided, this should contain a list of the SMTP email addresses
+     *            that should be included in the "To:" line of the email.
+     *            Callers must specify at least one "to" or "cc" email address.
+     *        </dd>
+     *
+     *    <dt>ccAddresses</dt>
+     *        <dd>
+     *            If provided, this should contain a list of the SMTP email addresses
+     *            that should be included in the "Cc:" line of the email.
+     *            Callers must specify at least one "to" or "cc" email address.
+     *        </dd>
+     *
+     *    <dt>subject</dt>
+     *        <dd>
+     *            If provided, this should contain the subject line of the email that
+     *            will be sent.    If not provided, the title of the note will be used
+     *            as the subject of the email.
+     *        </dd>
+     *
+     *    <dt>message</dt>
+     *        <dd>
+     *            If provided, this is additional personal text that should be included
+     *            into the email as a message from the owner to the recipient(s).
+     *        </dd>
+     * </dl>
+     */
+    class NoteEmailParameters {
+        guid: string;
+        note: Note;
+        toAddresses: string[];
+        ccAddresses: string[];
+        subject: string;
+        message: string;
+
+        constructor(args?: { guid?: string; note?: Note; toAddresses?: string[]; ccAddresses?: string[]; subject?: string; message?: string; });
+    }
+
+    /**
+     * Identifying information about previous versions of a note that are backed up
+     * within Evernote's servers.    Used in the return value of the listNoteVersions
+     * call.
+     *
+     * <dl>
+     *    <dt>updateSequenceNum</dt>
+     *    <dd>
+     *        The update sequence number for the Note when it last had this content.
+     *        This serves to uniquely identify each version of the note, since USN
+     *        values are unique within an account for each update.
+     *    </dd>
+     *    <dt>updated</dt>
+     *    <dd>
+     *        The 'updated' time that was set on the Note when it had this version
+     *        of the content.    This is the user-modifiable modification time on the
+     *        note, so it's not reliable for guaranteeing the order of various
+     *        versions.    (E.g. if someone modifies the note, then changes this time
+     *        manually into the past and then updates the note again.)
+     *    </dd>
+     *    <dt>saved</dt>
+     *    <dd>
+     *        A timestamp that holds the date and time when this version of the note
+     *        was backed up by Evernote's servers.    This
+     *    </dd>
+     *    <dt>title</dt>
+     *    <dd>
+     *        The title of the note when this particular version was saved.    (The
+     *        current title of the note may differ from this value.)
+     *    </dd>
+     * </dl>
+     */
+    class NoteVersionId {
+        updateSequenceNum: number;
+        updated: number;
+        saved: number;
+        title: string;
+
+        constructor(args?: { updateSequenceNum: number; updated: number; saved: number; title: string; });
+    }
+
+    /**
+     * This structure is passed from clients to the Evernote service when they wish
+     * to relay coarse-grained usage metrics to the service to help improve
+     * products.
+     *
+     * <dl>
+     *    <dt>sessions</dt>
+     *    <dd>
+     *        This field contains a count of the number of usage "sessions" that have
+     *        occurred with this client which have not previously been reported to
+     *        the service.
+     *        A "session" is defined as one of the 96 fifteen-minute intervals of the
+     *        day when someone used Evernote's interface at least once.
+     *        So if a user interacts with an Evernote client at 12:18, 12:24, and 12:36,
+     *        and then the client synchronizes at 12:39, it would report that there were
+     *        two previously-unreported sessions (one session for the 12:15-12:30 time
+     *        period, and one for the 12:30-12:45 period).
+     *        If the user used Evernote again at 12:41 and synchronized at 12:43, it
+     *        would not report any new sessions, because the 12:30-12:45 session had
+     *        already been reported.
+     *    </dd>
+     * </dl>
+     */
+    class ClientUsageMetrics {
+        sessions: number;
+
+        constructor(args?: { sessions?: number; });
+    }
+
+    /**
+     * A description of the thing for which we are searching for related
+     * entities.
+     *
+     * You must specify either <em>noteGuid</em> or <em>plainText</em>, but
+     * not both. <em>filter</em> and <em>referenceUri</em> are optional.
+     *
+     * <dl>
+     * <dt>noteGuid</dt>
+     * <dd>The GUID of an existing note in your account for which related
+     *         entities will be found.</dd>
+     *
+     * <dt>plainText</dt>
+     * <dd>A string of plain text for which to find related entities.
+     *         You should provide a text block with a number of characters between
+     *         EDAM_RELATED_PLAINTEXT_LEN_MIN and EDAM_RELATED_PLAINTEXT_LEN_MAX.
+     *         </dd>
+     *
+     * <dt>filter</dt>
+     * <dd>The list of criteria that will constrain the notes being considered
+     *         related.
+     *         Please note that some of the parameters may be ignored, such as
+     *         <em>order</em> and <em>ascending</em>.
+     * </dd>
+     *
+     * <dt>referenceUri</dt>
+     * <dd>A URI string specifying a reference entity, around which "relatedness"
+     *         should be based. This can be an URL pointing to a web page, for example.
+     * </dd>
+     * </dl>
+     */
+    class RelatedQuery {
+        noteGuid: string;
+        plainText: string;
+        filter: NoteFilter;
+        referenceUri: string;
+
+        constructor(args?: { noteGuid?: string; plainText?: string; filter?: NoteFilter; referenceUri?: string; });
+    }
+
+    /**
+     * The result of calling findRelated().    The contents of the notes,
+     * notebooks, and tags fields will be in decreasing order of expected
+     * relevance.    It is possible that fewer results than requested will be
+     * returned even if there are enough distinct entities in the account
+     * in cases where the relevance is estimated to be low.
+     *
+     * <dl>
+     * <dt>notes</dt>
+     * <dd>If notes have been requested to be included, this will be the
+     *         list of notes.</dd>
+     *
+     * <dt>notebooks</dt>
+     * <dd>If notebooks have been requested to be included, this will be the
+     *         list of notebooks.</dd>
+     *
+     * <dt>tags</dt>
+     * <dd>If tags have been requested to be included, this will be the list
+     *         of tags.</dd>
+     * </dl>
+     *
+     * <dt>containingNotebooks</dt>
+     * <dd>If <code>includeContainingNotebooks</code> is set to <code>true</code>
+     *         in the RelatedResultSpec, return the list of notebooks to
+     *         to which the returned related notes belong. The notebooks in this
+     *         list will occur once per notebook GUID and are represented as
+     *         NotebookDescriptor objects.</dd>
+     * </dl>
+     * </dl>
+     */
+    class RelatedResult {
+        notes: Note[];
+        notebooks: Notebook[];
+        tags: Tag[];
+        containingNotebooks: NotebookDescriptor[];
+
+        constructor(args?: { notes?: Note[]; notebooks?: Notebook[]; tags?: Tag[]; containingNotebooks?: NotebookDescriptor[]; });
+    }
+
+    /**
+     * A description of the thing for which the service will find related
+     * entities, via findRelated(), together with a description of what
+     * type of entities and how many you are seeking in the
+     * RelatedResult.
+     *
+     * <dl>
+     * <dt>maxNotes</dt>
+     * <dd>Return notes that are related to the query, but no more than
+     *         this many.    Any value greater than EDAM_RELATED_MAX_NOTES
+     *         will be silently capped.    If you do not set this field, then
+     *         no notes will be returned.</dd>
+     *
+     * <dt>maxNotebooks</dt>
+     * <dd>Return notebooks that are related to the query, but no more than
+     *         this many.    Any value greater than EDAM_RELATED_MAX_NOTEBOOKS
+     *         will be silently capped.    If you do not set this field, then
+     *         no notebooks will be returned.</dd>
+     *
+     * <dt>maxTags</dt>
+     * <dd>Return tags that are related to the query, but no more than
+     *         this many.    Any value greater than EDAM_RELATED_MAX_TAGS
+     *         will be silently capped.    If you do not set this field, then
+     *         no tags will be returned.</dd>
+     * </dl>
+     *
+     * <dt>writableNotebooksOnly</dt>
+     * <dd>Require that all returned related notebooks are writable.
+     *         The user will be able to create notes in all returned notebooks.
+     *         However, individual notes returned may still belong to notebooks
+     *         in which the user lacks the ability to create notes.</dd>
+     * </dl>
+     *
+     * <dt>includeContainingNotebooks</dt>
+     * <dd>If set to <code>true</code>, return the containingNotebooks field
+     *         in the RelatedResult, which will contain the list of notebooks to
+     *         to which the returned related notes belong.</dd>
+     * </dl>
+     * </dl>
+     */
+    class RelatedResultSpec {
+        maxNotes: number;
+        maxNotebooks: number;
+        maxTags: number;
+        writableNotebooksOnly: boolean;
+        includeContainingNotebooks: boolean;
+
+        constructor(args?: { maxNotes?: number; maxNotebooks?: number; maxTags?: number; writableNotebooksOnly?: boolean; includeContainingNotebooks?: boolean; });
+    }
+    /**
+     * This enumeration defines the possible permission levels for a user.
+     * Free accounts will have a level of NORMAL and paid Premium accounts
+     * will have a level of PREMIUM.
+     */
+    enum PrivilegeLevel {
+        'NORMAL' = 1,
+        'PREMIUM' = 3,
+        'VIP' = 5,
+        'MANAGER' = 7,
+        'SUPPORT' = 8,
+        'ADMIN' = 9,
+    }
+
+    /**
+     * Every search query is specified as a sequence of characters.
+     * Currently, only the USER query format is supported.
+     */
+    enum QueryFormat {
+        'USER' = 1,
+        'SEXP' = 2,
+    }
+
+    /**
+     * This enumeration defines the possible sort ordering for notes when
+     * they are returned from a search result.
+     */
+    enum NoteSortOrder {
+        'CREATED' = 1,
+        'UPDATED' = 2,
+        'RELEVANCE' = 3,
+        'UPDATE_SEQUENCE_NUMBER' = 4,
+        'TITLE' = 5,
+    }
+
+    /**
+     * This enumeration defines the possible states of a premium account
+     *
+     * NONE:        the user has never attempted to become a premium subscriber
+     *
+     * PENDING: the user has requested a premium account but their charge has not
+     *     been confirmed
+     *
+     * ACTIVE:    the user has been charged and their premium account is in good
+     *    standing
+     *
+     * FAILED:    the system attempted to charge the was denied. Their premium
+     *     privileges have been revoked. We will periodically attempt to re-validate
+     *     their order.
+     *
+     * CANCELLATION_PENDING: the user has requested that no further charges be made
+     *     but the current account is still active.
+     *
+     * CANCELED: the premium account was canceled either because of failure to pay
+     *     or user cancelation. No more attempts will be made to activate the account.
+     */
+    enum PremiumOrderStatus {
+        'NONE' = 0,
+        'PENDING' = 1,
+        'ACTIVE' = 2,
+        'FAILED' = 3,
+        'CANCELLATION_PENDING' = 4,
+        'CANCELED' = 5,
+    }
+
+    /**
+     * Privilege levels for accessing shared notebooks.
+     *
+     * READ_NOTEBOOK: Recipient is able to read the contents of the shared notebook
+     *     but does to have access to information about other recipients of the
+     *     notebook or the activity stream information.
+     *
+     * MODIFY_NOTEBOOK_PLUS_ACTIVITY: Recipient has rights to read and modify the contents
+     *     of the shared notebook, including the right to move notes to the trash and to create
+     *     notes in the notebook.    The recipient can also access information about other
+     *     recipients and the activity stream.
+     *
+     * READ_NOTEBOOK_PLUS_ACTIVITY: Recipient has READ_NOTEBOOK rights and can also
+     *     access information about other recipients and the activity stream.
+     *
+     * GROUP: If the user belongs to a group, such as a Business, that has a defined
+     *     privilege level, use the privilege level of the group as the privilege for
+     *     the individual.
+     *
+     * FULL_ACCESS: Recipient has full rights to the shared notebook and recipient lists,
+     *     including privilege to revoke and create invitations and to change privilege
+     *     levels on invitations for individuals.    This privilege level is primarily intended
+     *     for use by individual shares.
+     *
+     * BUSINESS_FULL_ACCESS: Intended for use with Business Notebooks, a
+     * BUSINESS_FULL_ACCESS level is FULL_ACCESS with the additional rights to
+     * change how the notebook will appear in the business library, including the
+     * rights to publish and unpublish the notebook from the library.
+     */
+    enum SharedNotebookPrivilegeLevel {
+        'READ_NOTEBOOK' = 0,
+        'MODIFY_NOTEBOOK_PLUS_ACTIVITY' = 1,
+        'READ_NOTEBOOK_PLUS_ACTIVITY' = 2,
+        'GROUP' = 3,
+        'FULL_ACCESS' = 4,
+        'BUSINESS_FULL_ACCESS' = 5,
+    }
+
+    /**
+     * Enumeration of the roles that a User can have within a sponsored group.
+     *
+     * GROUP_MEMBER: The user is a member of the group with no special privileges.
+     *
+     * GROUP_ADMIN: The user is an administrator within the group.
+     *
+     * GROUP_OWNER: The user is the owner of the group.
+     */
+    enum SponsoredGroupRole {
+        'GROUP_MEMBER' = 1,
+        'GROUP_ADMIN' = 2,
+        'GROUP_OWNER' = 3,
+    }
+
+    /**
+     * Enumeration of the roles that a User can have within an Evernote Business account.
+     *
+     * ADMIN: The user is an administrator of the Evernote Business account.
+     *
+     * NORMAL: The user is a regular user within the Evernote Business account.
+     */
+    enum BusinessUserRole {
+        'ADMIN' = 1,
+        'NORMAL' = 2,
+    }
+
+    /**
+     * An enumeration describing restrictions on the domain of shared notebook
+     * instances that are valid for a given operation, as used, for example, in
+     * NotebookRestrictions.
+     *
+     * ONLY_JOINED_OR_PREVIEW: The domain consists of shared notebooks that
+     *     "belong" to the recipient or still available for preview by any recipient.
+     *     Shared notebooks that the recipient has joined (the username has already been
+     *     assigned to our user) are in the domain.    Additionally, shared notebooks
+     *     that allow preview and have not yet been joined are in the domain.
+     *
+     * NO_SHARED_NOTEBOOKS: No shared notebooks are applicable to the operation.
+     */
+    enum SharedNotebookInstanceRestrictions {
+        'ONLY_JOINED_OR_PREVIEW' = 1,
+        'NO_SHARED_NOTEBOOKS' = 2,
+    }
+
+    /**
+     * An enumeration describing the configuration state related to receiving
+     * reminder e-mails from the service.    Reminder e-mails summarize notes
+     * based on their Note.attributes.reminderTime values.
+     *
+     * DO_NOT_SEND: The user has selected to not receive reminder e-mail.
+     *
+     * SEND_DAILY_EMAIL: The user has selected to receive reminder e-mail for those
+     *     days when there is a reminder.
+     */
+    enum ReminderEmailConfig {
+        'DO_NOT_SEND' = 1,
+        'SEND_DAILY_EMAIL' = 2,
+    }
+
+    /**
+     *    In several places, EDAM exchanges blocks of bytes of data for a component
+     *    which may be relatively large.    For example:    the contents of a clipped
+     *    HTML note, the bytes of an embedded image, or the recognition XML for
+     *    a large image.    This structure is used in the protocol to represent
+     *    any of those large blocks of data when they are transmitted or when
+     *    they are only referenced their metadata.
+     *
+     * <dl>
+     *    <dt>bodyHash</dt>
+     *        <dd>This field carries a one-way hash of the contents of the
+     *        data body, in binary form.    The hash function is MD5<br/>
+     *        Length:    EDAM_HASH_LEN (exactly)
+     *        </dd>
+     *
+     *    <dt>size</dt>
+     *        <dd>The length, in bytes, of the data body.
+     *        </dd>
+     *
+     *    <dt>body</dt>
+     *        <dd>This field is set to contain the binary contents of the data
+     *        whenever the resource is being transferred.    If only metadata is
+     *        being exchanged, this field will be empty.    For example, a client could
+     *        notify the service about the change to an attribute for a resource
+     *        without transmitting the binary resource contents.
+     *        </dd>
+     *    </dl>
+     */
+    class Data {
+        bodyHash: string;
+        size: number;
+        body: string;
+
+        constructor(args?: { bodyHash?: string; size?: number; body?: string; });
+    }
+
+    /**
+     *    A structure holding the optional attributes that can be stored
+     *    on a User.    These are generally less critical than the core User fields.
+     *
+     * <dl>
+     *    <dt>defaultLocationName</dt>
+     *        <dd>the location string that should be associated
+     *        with the user in order to determine where notes are taken if not otherwise
+     *        specified.<br/>
+     *        Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
+     *        </dd>
+     *
+     *    <dt>defaultLatitude</dt>
+     *        <dd>if set, this is the latitude that should be
+     *        assigned to any notes that have no other latitude information.
+     *        </dd>
+     *
+     *    <dt>defaultLongitude</dt>
+     *        <dd>if set, this is the longitude that should be
+     *        assigned to any notes that have no other longitude information.
+     *        </dd>
+     *
+     *    <dt>preactivation</dt>
+     *        <dd>if set, the user account is not yet confirmed for
+     *        login.    I.e. the account has been created, but we are still waiting for
+     *        the user to complete the activation step.
+     *        </dd>
+     *
+     *    <dt>viewedPromotions</dt>
+     *        <dd>a list of promotions the user has seen.
+     *         This list may occasionally be modified by the system when promotions are
+     *         no longer available.<br/>
+     *         Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
+     *        </dd>
+     *
+     *    <dt>incomingEmailAddress</dt>
+     *        <dd>if set, this is the email address that the
+     *         user may send email to in order to add an email note directly into the
+     *         account via the SMTP email gateway.    This is the part of the email
+     *         address before the '@' symbol ... our domain is not included.
+     *         If this is not set, the user may not add notes via the gateway.<br/>
+     *         Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
+     *        </dd>
+     *
+     *    <dt>recentMailedAddresses</dt>
+     *        <dd>if set, this will contain a list of email
+     *         addresses that have recently been used as recipients
+     *         of outbound emails by the user.    This can be used to pre-populate a
+     *         list of possible destinations when a user wishes to send a note via
+     *         email.<br/>
+     *         Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX each<br/>
+     *         Max:    EDAM_USER_RECENT_MAILED_ADDRESSES_MAX entries
+     *        </dd>
+     *
+     *    <dt>comments</dt>
+     *        <dd>Free-form text field that may hold general support
+     *         information, etc.<br/>
+     *         Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
+     *        </dd>
+     *
+     *    <dt>dateAgreedToTermsOfService</dt>
+     *        <dd>The date/time when the user agreed to
+     *         the terms of service.    This can be used as the effective "start date"
+     *         for the account.
+     *        </dd>
+     *
+     *    <dt>maxReferrals</dt>
+     *        <dd>The number of referrals that the user is permitted
+     *         to make.
+     *        </dd>
+     *
+     *    <dt>referralCount</dt>
+     *        <dd>The number of referrals sent from this account.
+     *        </dd>
+     *
+     *    <dt>refererCode</dt>
+     *        <dd>A code indicating where the user was sent from. AKA
+     *         promotion code
+     *        </dd>
+     *
+     *    <dt>sentEmailDate</dt>
+     *        <dd>The most recent date when the user sent outbound
+     *         emails from the service.    Used with sentEmailCount to limit the number
+     *         of emails that can be sent per day.
+     *        </dd>
+     *
+     *    <dt>sentEmailCount</dt>
+     *        <dd>The number of emails that were sent from the user
+     *         via the service on sentEmailDate.    Used to enforce a limit on the number
+     *         of emails per user per day to prevent spamming.
+     *        </dd>
+     *
+     *    <dt>dailyEmailLimit</dt>
+     *        <dd>If set, this is the maximum number of emails that
+     *         may be sent in a given day from this account.    If unset, the server will
+     *         use the configured default limit.
+     *        </dd>
+     *
+     *    <dt>emailOptOutDate</dt>
+     *        <dd>If set, this is the date when the user asked
+     *         to be excluded from offers and promotions sent by Evernote.    If not set,
+     *         then the user currently agrees to receive these messages.
+     *        </dd>
+     *
+     *    <dt>partnerEmailOptInDate</dt>
+     *        <dd>If set, this is the date when the user asked
+     *         to be included in offers and promotions sent by Evernote's partners.
+     *         If not sent, then the user currently does not agree to receive these
+     *         emails.
+     *        </dd>
+     *
+     *    <dt>preferredLanguage</dt>
+     *        <dd>a 2 character language codes based on:
+     *                http://ftp.ics.uci.edu/pub/ietf/http/related/iso639.txt used for
+     *             localization purposes to determine what language to use for the web
+     *             interface and for other direct communication (e.g. emails).
+     *        </dd>
+     *
+     *    <dt>preferredCountry</dt>
+     *        <dd>Preferred country code based on ISO 3166-1-alpha-2 indicating the
+     *        users preferred country</dd>
+     *
+     *    <dt>clipFullPage</dt>
+     *        <dd>Boolean flag set to true if the user wants to clip full pages by
+     *        default when they use the web clipper without a selection.</dd>
+     *
+     *    <dt>twitterUserName</dt>
+     *        <dd>The username of the account of someone who has chosen to enable
+     *        Twittering into Evernote.    This value is subject to change, since users
+     *        may change their Twitter user name.</dd>
+     *
+     *    <dt>twitterId</dt>
+     *        <dd>The unique identifier of the user's Twitter account if that user
+     *        has chosen to enable Twittering into Evernote.</dd>
+     *
+     *    <dt>groupName</dt>
+     *        <dd>A name identifier used to identify a particular set of branding and
+     *         light customization.</dd>
+     *
+     *    <dt>recognitionLanguage</dt>
+     *        <dd>a 2 character language codes based on:
+     *                http://ftp.ics.uci.edu/pub/ietf/http/related/iso639.txt
+     *                If set, this is used to determine the language that should be used
+     *                when processing images and PDF files to find text.
+     *                If not set, then the 'preferredLanguage' will be used.
+     *        </dd>
+     *
+     *    <dt>educationalInstitution</dt>
+     *        <dd>a flag indicating that the user is part of an educational institution which
+     *        makes them eligible for discounts on bulk purchases
+     *        </dd>
+     *
+     *    <dt>businessAddress</dt>
+     *        <dd>A string recording the business address of a Sponsored Account user who has requested invoicing.
+     *        </dd>
+     *
+     *    <dt>hideSponsorBilling</dt>
+     *        <dd>A flag indicating whether to hide the billing information on a sponsored
+     *                account owner's settings page
+     *        </dd>
+     *
+     *    <dt>taxExempt</dt>
+     *        <dd>A flag indicating the user's sponsored group is exempt from sale tax
+     *        </dd>
+     *
+     *    <dt>useEmailAutoFiling</dt>
+     *        <dd>A flag indicating whether the user chooses to allow Evernote to automatically
+     *                file and tag emailed notes
+     *        </dd>
+     *
+     *    <dt>reminderEmailConfig</dt>
+     *        <dd>Configuration state for whether or not the user wishes to receive
+     *                reminder e-mail.    This setting applies to both the reminder e-mail sent
+     *                for personal reminder notes and for the reminder e-mail sent for reminder
+     *                notes in the user's business notebooks that the user has configured for
+     *                e-mail notifications.
+     *        </dd>
+     *    </dl>
+     */
+    class UserAttributes {
+        defaultLocationName: string;
+        defaultLatitude: number;
+        defaultLongitude: number;
+        preactivation: boolean;
+        viewedPromotions: string[];
+        incomingEmailAddress: string;
+        recentMailedAddresses: string[];
+        comments: string;
+        dateAgreedToTermsOfService: number;
+        maxReferrals: number;
+        referralCount: number;
+        refererCode: string;
+        sentEmailDate: number;
+        sentEmailCount: number;
+        dailyEmailLimit: number;
+        emailOptOutDate: number;
+        partnerEmailOptInDate: number;
+        preferredLanguage: string;
+        preferredCountry: string;
+        clipFullPage: boolean;
+        twitterUserName: string;
+        twitterId: string;
+        groupName: string;
+        recognitionLanguage: string;
+        referralProof: string;
+        educationalDiscount: boolean;
+        businessAddress: string;
+        hideSponsorBilling: boolean;
+        taxExempt: boolean;
+        useEmailAutoFiling: boolean;
+        reminderEmailConfig: ReminderEmailConfig;
+
+        constructor(args?: { defaultLocationName?: string; defaultLatitude?: number; defaultLongitude?: number; preactivation?: boolean; viewedPromotions?: string[]; incomingEmailAddress?: string; recentMailedAddresses?: string[]; comments?: string; dateAgreedToTermsOfService?: number; maxReferrals?: number; referralCount?: number; refererCode?: string; sentEmailDate?: number; sentEmailCount?: number; dailyEmailLimit?: number; emailOptOutDate?: number; partnerEmailOptInDate?: number; preferredLanguage?: string; preferredCountry?: string; clipFullPage?: boolean; twitterUserName?: string; twitterId?: string; groupName?: string; recognitionLanguage?: string; referralProof?: string; educationalDiscount?: boolean; businessAddress?: string; hideSponsorBilling?: boolean; taxExempt?: boolean; useEmailAutoFiling?: boolean; reminderEmailConfig?: ReminderEmailConfig; });
+    }
+
+    /**
+     *    This represents the bookkeeping information for the user's subscription.
+     *
+     * <dl>
+     *    <dt>uploadLimit</dt>
+     *        <dd>The number of bytes that can be uploaded to the account
+     *        in the current month.    For new notes that are created, this is the length
+     *        of the note content (in Unicode characters) plus the size of each resource
+     *        (in bytes).    For edited notes, this is the the difference between the old
+     *        length and the new length (if this is greater than 0) plus the size of
+     *        each new resource.
+     *        </dd>
+     *    <dt>uploadLimitEnd</dt>
+     *        <dd>The date and time when the current upload limit
+     *        expires.    At this time, the monthly upload count reverts to 0 and a new
+     *        limit is imposed.    This date and time is exclusive, so this is effectively
+     *        the start of the new month.
+     *        </dd>
+     *    <dt>uploadLimitNextMonth</dt>
+     *        <dd> When uploadLimitEnd is reached, the service
+     *        will change uploadLimit to uploadLimitNextMonth. If a premium account is
+     *        canceled, this mechanism will reset the quota appropriately.
+     *        </dd>
+     *    <dt>premiumServiceStatus</dt>
+     *        <dd>Indicates the phases of a premium account
+     *        during the billing process.
+     *        </dd>
+     *    <dt>premiumOrderNumber</dt>
+     *        <dd>The order number used by the commerce system to
+     *        process recurring payments
+     *        </dd>
+     *    <dt>premiumServiceStart</dt>
+     *        <dd>The start date when this premium promotion
+     *        began (this number will get overwritten if a premium service is canceled
+     *        and then re-activated).
+     *        </dd>
+     *    <dt>premiumCommerceService</dt>
+     *        <dd>The commerce system used (paypal, Google
+     *        checkout, etc)
+     *        </dd>
+     *    <dt>premiumServiceSKU</dt>
+     *        <dd>The code associated with the purchase eg. monthly
+     *        or annual purchase. Clients should interpret this value and localize it.
+     *        </dd>
+     *    <dt>lastSuccessfulCharge</dt>
+     *        <dd>Date the last time the user was charged.
+     *        Null if never charged.
+     *        </dd>
+     *    <dt>lastFailedCharge</dt>
+     *        <dd>Date the last time a charge was attempted and
+     *        failed.
+     *        </dd>
+     *    <dt>lastFailedChargeReason</dt>
+     *        <dd>Reason provided for the charge failure
+     *        </dd>
+     *    <dt>nextPaymentDue</dt>
+     *        <dd>The end of the billing cycle. This could be in the
+     *        past if there are failed charges.
+     *        </dd>
+     *    <dt>premiumLockUntil</dt>
+     *        <dd>An internal variable to manage locking operations
+     *        on the commerce variables.
+     *        </dd>
+     *    <dt>updated</dt>
+     *        <dd>The date any modification where made to this record.
+     *        </dd>
+     *    <dt>premiumSubscriptionNumber</dt>
+     *        <dd>The number number identifying the
+     *        recurring subscription used to make the recurring charges.
+     *        </dd>
+     *    <dt>lastRequestedCharge</dt>
+     *        <dd>Date charge last attempted</dd>
+     *    <dt>currency</dt>
+     *        <dd>ISO 4217 currency code</dd>
+     *    <dt>unitPrice</dt>
+     *        <dd>charge in the smallest unit of the currency (e.g. cents for USD)</dd>
+     *    <dt>businessId</dt>
+     *        <dd><i>DEPRECATED:</i>See BusinessUserInfo.</dd>
+     *    <dt>businessName</dt>
+     *        <dd><i>DEPRECATED:</i>See BusinessUserInfo.</dd>
+     *    <dt>businessRole</dt>
+     *        <dd><i>DEPRECATED:</i>See BusinessUserInfo.</dd>
+     *    <dt>unitDiscount</dt>
+     *        <dd>discount per seat in negative amount and smallest unit of the currency (e.g. cents for USD)</dd>
+     *    <dt>nextChargeDate</dt>
+     *        <dd>The next time the user will be charged, may or may not be the same as nextPaymentDue</dd>
+     *    </dl>
+     */
+    class Accounting {
+        uploadLimit: number;
+        uploadLimitEnd: number;
+        uploadLimitNextMonth: number;
+        premiumServiceStatus: PremiumOrderStatus;
+        premiumOrderNumber: string;
+        premiumCommerceService: string;
+        premiumServiceStart: number;
+        premiumServiceSKU: string;
+        lastSuccessfulCharge: number;
+        lastFailedCharge: number;
+        lastFailedChargeReason: string;
+        nextPaymentDue: number;
+        premiumLockUntil: number;
+        updated: number;
+        premiumSubscriptionNumber: string;
+        lastRequestedCharge: number;
+        currency: string;
+        unitPrice: number;
+        businessId: number;
+        businessName: string;
+        businessRole: BusinessUserRole;
+        unitDiscount: number;
+        nextChargeDate: number;
+
+        constructor(args?: { uploadLimit?: number; uploadLimitEnd?: number; uploadLimitNextMonth?: number; premiumServiceStatus?: PremiumOrderStatus; premiumOrderNumber?: string; premiumCommerceService?: string; premiumServiceStart?: number; premiumServiceSKU?: string; lastSuccessfulCharge?: number; lastFailedCharge?: number; lastFailedChargeReason?: string; nextPaymentDue?: number; premiumLockUntil?: number; updated?: number; premiumSubscriptionNumber?: string; lastRequestedCharge?: number; currency?: string; unitPrice?: number; businessId?: number; businessName?: string; businessRole?: BusinessUserRole; unitDiscount?: number; nextChargeDate?: number; });
+    }
+
+    /**
+     * This structure is used to provide information about an Evernote Business
+     * membership, for members who are part of a business.
+     *
+     * <dl>
+     * <dt>businessId</dt>
+     *     <dd>The ID of the Evernote Business account that the user is a member of.
+     * <dt>businessName</dt>
+     *     <dd>The human-readable name of the Evernote Business account that the user
+     *             is a member of.</dd>
+     * <dt>role</dt>
+     *     <dd>The role of the user within the Evernote Business account that
+     *             they are a member of.</dd>
+     * <dt>email</dt>
+     *     <dd>An e-mail address that will be used by the service in the context of your
+     *             Evernote Business activities.    For example, this e-mail address will be used
+     *             when you e-mail a business note, when you update notes in the account of
+     *             your business, etc.    The business e-mail cannot be used for identification
+     *             purposes such as for logging into the service.
+     *     </dd>
+     * </dl>
+     */
+    class BusinessUserInfo {
+        businessId: number;
+        businessName: string;
+        role: BusinessUserRole;
+        email: string;
+
+        constructor(args?: { businessId?: number; businessName?: string; role?: BusinessUserRole; email?: string; });
+    }
+
+    /**
+     *    This structure is used to provide information about a user's Premium account.
+     * <dl>
+     *    <dt>currentTime</dt>
+     *        <dd>
+     *        The server-side date and time when this data was generated.
+     *        </dd>
+     *    <dt>premium</dt>
+     *        <dd>
+     *        True if the user's account is Premium.
+     *        </dd>
+     *    <dt>premiumRecurring</dt>
+     *        <dd>
+     *        True if the user's account is Premium and has a recurring payment method.
+     *        </dd>
+     *    <dt>premiumExpirationDate</dt>
+     *        <dd>
+     *        The date when the user's Premium account expires, or the date when the
+     *        user's account is due for payment if it has a recurring payment method.
+     *        </dd>
+     *    <dt>premiumExtendable</dt>
+     *        <dd>
+     *        True if the user is eligible for purchasing Premium account extensions.
+     *        </dd>
+     *    <dt>premiumPending</dt>
+     *        <dd>
+     *        True if the user's Premium account is pending payment confirmation
+     *        </dd>
+     *    <dt>premiumCancellationPending</dt>
+     *        <dd>
+     *        True if the user has requested that no further charges to be made; the
+     *        Premium account will remain active until it expires.
+     *        </dd>
+     *    <dt>canPurchaseUploadAllowance</dt>
+     *        <dd>
+     *        True if the user is eligible for purchasing additional upload allowance.
+     *        </dd>
+     *    <dt>sponsoredGroupName</dt>
+     *        <dd>
+     *        The name of the sponsored group that the user is part of.
+     *        </dd>
+     *    <dt>sponsoredGroupRole</dt>
+     *        <dd>
+     *        DEPRECATED - will be removed in a future update.
+     *        </dd>
+     *    <dt>premiumUpgradable</dt>
+     *        <dd>
+     *        True if the user is eligible for purchasing Premium account upgrade.
+     *        </dd>
+     *    </dl>
+     */
+    class PremiumInfo {
+        currentTime: number;
+        premium: boolean;
+        premiumRecurring: boolean;
+        premiumExpirationDate: number;
+        premiumExtendable: boolean;
+        premiumPending: boolean;
+        premiumCancellationPending: boolean;
+        canPurchaseUploadAllowance: boolean;
+        sponsoredGroupName: string;
+        sponsoredGroupRole: SponsoredGroupRole;
+        premiumUpgradable: boolean;
+
+        constructor(args?: { currentTime: number; premium: boolean; premiumRecurring: boolean; premiumExpirationDate?: number; premiumExtendable: boolean; premiumPending: boolean; premiumCancellationPending: boolean; canPurchaseUploadAllowance: boolean; sponsoredGroupName?: string; sponsoredGroupRole?: SponsoredGroupRole; premiumUpgradable?: boolean; });
+    }
+
+    /**
+     *    This represents the information about a single user account.
+     * <dl>
+     *    <dt>id</dt>
+     *        <dd>The unique numeric identifier for the account, which will not
+     *        change for the lifetime of the account.
+     *        </dd>
+     *
+     *    <dt>username</dt>
+     *        <dd>The name that uniquely identifies a single user account. This name
+     *        may be presented by the user, along with their password, to log into
+     *        their account.
+     *        May only contain a-z, 0-9, or '-', and may not start or end with the '-'
+     *        <br/>
+     *        Length:    EDAM_USER_USERNAME_LEN_MIN - EDAM_USER_USERNAME_LEN_MAX
+     *        <br/>
+     *        Regex:    EDAM_USER_USERNAME_REGEX
+     *        </dd>
+     *
+     *    <dt>email</dt>
+     *        <dd>The email address registered for the user.    Must comply with
+     *        RFC 2821 and RFC 2822.<br/>
+     *        Third party applications that authenticate using OAuth do not have
+     *        access to this field.
+     *        Length:    EDAM_EMAIL_LEN_MIN - EDAM_EMAIL_LEN_MAX
+     *        <br/>
+     *        Regex:    EDAM_EMAIL_REGEX
+     *        </dd>
+     *
+     *    <dt>name</dt>
+     *        <dd>The printable name of the user, which may be a combination
+     *        of given and family names.    This is used instead of separate "first"
+     *        and "last" names due to variations in international name format/order.
+     *        May not start or end with a whitespace character.    May contain any
+     *        character but carriage return or newline (Unicode classes Zl and Zp).
+     *        <br/>
+     *        Length:    EDAM_USER_NAME_LEN_MIN - EDAM_USER_NAME_LEN_MAX
+     *        <br/>
+     *        Regex:    EDAM_USER_NAME_REGEX
+     *        </dd>
+     *
+     *    <dt>timezone</dt>
+     *        <dd>The zone ID for the user's default location.    If present,
+     *        this may be used to localize the display of any timestamp for which no
+     *        other timezone is available.
+     *        The format must be encoded as a standard zone ID such as
+     *        "America/Los_Angeles" or "GMT+08:00"
+     *        <br/>
+     *        Length:    EDAM_TIMEZONE_LEN_MIN - EDAM_TIMEZONE_LEN_MAX
+     *        <br/>
+     *        Regex:    EDAM_TIMEZONE_REGEX
+     *        </dd>
+     *
+     *    <dt>privilege</dt>
+     *        <dd>The level of access permitted for the user.
+     *        </dd>
+     *
+     *    <dt>created</dt>
+     *        <dd>The date and time when this user account was created in the
+     *        service.
+     *        </dd>
+     *
+     *    <dt>updated</dt>
+     *        <dd>The date and time when this user account was last modified
+     *        in the service.
+     *        </dd>
+     *
+     *    <dt>deleted</dt>
+     *        <dd>If the account has been deleted from the system (e.g. as
+     *        the result of a legal request by the user), the date and time of the
+     *        deletion will be represented here.    If not, this value will not be set.
+     *        </dd>
+     *
+     *    <dt>active</dt>
+     *        <dd>If the user account is available for login and
+     *        synchronization, this flag will be set to true.
+     *        </dd>
+     *
+     *    <dt>shardId</dt>
+     *        <dd>DEPRECATED - Client applications should have no need to use this field.
+     *        </dd>
+     *
+     *    <dt>attributes</dt>
+     *        <dd>If present, this will contain a list of the attributes
+     *        for this user account.
+     *        </dd>
+     *
+     *    <dt>accounting</dt>
+     *        <dd>Bookkeeping information for the user's subscription.
+     *        </dd>
+     *
+     *    <dt>premiumInfo</dt>
+     *        <dd>If present, this will contain a set of commerce information
+     *        relating to the user's premium service level.
+     *        </dd>
+     *
+     *    <dt>businessUserInfo</dt>
+     *        <dd>If present, this will contain a set of business information
+     *        relating to the user's business membership.    If not present, the
+     *        user is not currently part of a business.
+     *        </dd>
+     *    </dl>
+     */
+    class User {
+        id: number;
+        username: string;
+        email: string;
+        name: string;
+        timezone: string;
+        privilege: PrivilegeLevel;
+        created: number;
+        updated: number;
+        deleted: number;
+        active: boolean;
+        shardId: string;
+        attributes: UserAttributes;
+        accounting: Accounting;
+        premiumInfo: PremiumInfo;
+        businessUserInfo: BusinessUserInfo;
+
+        constructor(args?: { id?: number; username?: string; email?: string; name?: string; timezone?: string; privilege?: PrivilegeLevel; created?: number; updated?: number; deleted?: number; active?: boolean; shardId?: string; attributes?: UserAttributes; accounting?: Accounting; premiumInfo?: PremiumInfo; businessUserInfo?: BusinessUserInfo; });
+    }
+
+    /**
+     *    A tag within a user's account is a unique name which may be organized
+     *    a simple hierarchy.
+     * <dl>
+     *    <dt>guid</dt>
+     *        <dd>The unique identifier of this tag. Will be set by the service,
+     *        so may be omitted by the client when creating the Tag.
+     *        <br/>
+     *        Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
+     *        <br/>
+     *        Regex:    EDAM_GUID_REGEX
+     *        </dd>
+     *
+     *    <dt>name</dt>
+     *        <dd>A sequence of characters representing the tag's identifier.
+     *        Case is preserved, but is ignored for comparisons.
+     *        This means that an account may only have one tag with a given name, via
+     *        case-insensitive comparison, so an account may not have both "food" and
+     *        "Food" tags.
+     *        May not contain a comma (','), and may not begin or end with a space.
+     *        <br/>
+     *        Length:    EDAM_TAG_NAME_LEN_MIN - EDAM_TAG_NAME_LEN_MAX
+     *        <br/>
+     *        Regex:    EDAM_TAG_NAME_REGEX
+     *        </dd>
+     *
+     *    <dt>parentGuid</dt>
+     *        <dd>If this is set, then this is the GUID of the tag that
+     *        holds this tag within the tag organizational hierarchy.    If this is
+     *        not set, then the tag has no parent and it is a "top level" tag.
+     *        Cycles are not allowed (e.g. a->parent->parent == a) and will be
+     *        rejected by the service.
+     *        <br/>
+     *        Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
+     *        <br/>
+     *        Regex:    EDAM_GUID_REGEX
+     *        </dd>
+     *
+     *    <dt>updateSequenceNum</dt>
+     *        <dd>A number identifying the last transaction to
+     *        modify the state of this object.    The USN values are sequential within an
+     *        account, and can be used to compare the order of modifications within the
+     *        service.
+     *        </dd>
+     *    </dl>
+     */
+    class Tag {
+        guid: string;
+        name: string;
+        parentGuid: string;
+        updateSequenceNum: number;
+
+        constructor(args?: { guid?: string; name?: string; parentGuid?: string; updateSequenceNum?: number; });
+    }
+
+    /**
+     * A structure that wraps a map of name/value pairs whose values are not
+     * always present in the structure in order to reduce space when obtaining
+     * batches of entities that contain the map.
+     *
+     * When the server provides the client with a LazyMap, it will fill in either
+     * the keysOnly field or the fullMap field, but never both, based on the API
+     * and parameters.
+     *
+     * When a client provides a LazyMap to the server as part of an update to
+     * an object, the server will only update the LazyMap if the fullMap field is
+     * set. If the fullMap field is not set, the server will not make any changes
+     * to the map.
+     *
+     * Check the API documentation of the individual calls involving the LazyMap
+     * for full details including the constraints of the names and values of the
+     * map.
+     *
+     * <dl>
+     * <dt>keysOnly</dt>
+     *     <dd>The set of keys for the map.    This field is ignored by the
+     *             server when set.
+     *     </dd>
+     *
+     * <dt>fullMap</dt>
+     *     <dd>The complete map, including all keys and values.
+     *     </dd>
+     * </dl>
+     */
+    class LazyMap {
+        keysOnly: string[];
+        fullMap: { [k: string]: string; };
+
+        constructor(args?: { keysOnly?: string[]; fullMap?: { [k: string]: string; }; });
+    }
+
+    /**
+     * Structure holding the optional attributes of a Resource
+     * <dl>
+     * <dt>sourceURL</dt>
+     *     <dd>the original location where the resource was hosted
+     *     <br/>
+     *        Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
+     *     </dd>
+     *
+     * <dt>timestamp</dt>
+     *     <dd>the date and time that is associated with this resource
+     *     (e.g. the time embedded in an image from a digital camera with a clock)
+     *     </dd>
+     *
+     * <dt>latitude</dt>
+     *     <dd>the latitude where the resource was captured
+     *     </dd>
+     *
+     * <dt>longitude</dt>
+     *     <dd>the longitude where the resource was captured
+     *     </dd>
+     *
+     * <dt>altitude</dt>
+     *     <dd>the altitude where the resource was captured
+     *     </dd>
+     *
+     * <dt>cameraMake</dt>
+     *     <dd>information about an image's camera, e.g. as embedded in
+     *     the image's EXIF data
+     *     <br/>
+     *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
+     *     </dd>
+     *
+     * <dt>cameraModel</dt>
+     *     <dd>information about an image's camera, e.g. as embedded
+     *     in the image's EXIF data
+     *     <br/>
+     *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
+     *     </dd>
+     *
+     * <dt>clientWillIndex</dt>
+     *     <dd>if true, then the original client that submitted
+     *     the resource plans to submit the recognition index for this resource at a
+     *     later time.
+     *     </dd>
+     *
+     * <dt>recoType</dt>
+     *     <dd>DEPRECATED - this field is no longer set by the service, so should
+     *         be ignored.
+     *     </dd>
+     *
+     * <dt>fileName</dt>
+     *     <dd>if the resource came from a source that provided an
+     *     explicit file name, the original name will be stored here.    Many resources
+     *     come from unnamed sources, so this will not always be set.
+     *     </dd>
+     *
+     * <dt>attachment</dt>
+     *     <dd>this will be true if the resource should be displayed as an attachment,
+     *     or false if the resource should be displayed inline (if possible).
+     *     </dd>
+     *
+     * <dt>applicationData</dt>
+     * <dd>Provides a location for applications to store a relatively small
+     * (4kb) blob of data associated with a Resource that is not visible to the user
+     * and that is opaque to the Evernote service. A single application may use at most
+     * one entry in this map, using its API consumer key as the map key. See the
+     * documentation for LazyMap for a description of when the actual map values
+     * are returned by the service.
+     * <p>To safely add or modify your application's entry in the map, use
+     * NoteStore.setResourceApplicationDataEntry. To safely remove your application's
+     * entry from the map, use NoteStore.unsetResourceApplicationDataEntry.</p>
+     * Minimum length of a name (key): EDAM_APPLICATIONDATA_NAME_LEN_MIN
+     * <br/>
+     * Sum max size of key and value: EDAM_APPLICATIONDATA_ENTRY_LEN_MAX
+     * <br/>
+     * Syntax regex for name (key): EDAM_APPLICATIONDATA_NAME_REGEX
+     * </dd>
+     *
+     * </dl>
+     */
+    class ResourceAttributes {
+        sourceURL: string;
+        timestamp: number;
+        latitude: number;
+        longitude: number;
+        altitude: number;
+        cameraMake: string;
+        cameraModel: string;
+        clientWillIndex: boolean;
+        recoType: string;
+        fileName: string;
+        attachment: boolean;
+        applicationData: LazyMap;
+
+        constructor(args?: { sourceURL?: string; timestamp?: number; latitude?: number; longitude?: number; altitude?: number; cameraMake?: string; cameraModel?: string; clientWillIndex?: boolean; recoType?: string; fileName?: string; attachment?: boolean; applicationData?: LazyMap; });
+    }
+
+    /**
+     * Every media file that is embedded or attached to a note is represented
+     * through a Resource entry.
+     * <dl>
+     * <dt>guid</dt>
+     *     <dd>The unique identifier of this resource.    Will be set whenever
+     *     a resource is retrieved from the service, but may be null when a client
+     *     is creating a resource.
+     *     <br/>
+     *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_GUID_REGEX
+     *     </dd>
+     *
+     * <dt>noteGuid</dt>
+     *     <dd>The unique identifier of the Note that holds this
+     *     Resource. Will be set whenever the resource is retrieved from the service,
+     *     but may be null when a client is creating a resource.
+     *     <br/>
+     *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_GUID_REGEX
+     *     </dd>
+     *
+     * <dt>data</dt>
+     *     <dd>The contents of the resource.
+     *     Maximum length:    The data.body is limited to EDAM_RESOURCE_SIZE_MAX_FREE
+     *     for free accounts and EDAM_RESOURCE_SIZE_MAX_PREMIUM for premium accounts.
+     *     </dd>
+     *
+     * <dt>mime</dt>
+     *     <dd>The MIME type for the embedded resource.    E.g. "image/gif"
+     *     <br/>
+     *     Length:    EDAM_MIME_LEN_MIN - EDAM_MIME_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_MIME_REGEX
+     *     </dd>
+     *
+     * <dt>width</dt>
+     *     <dd>If set, this contains the display width of this resource, in
+     *     pixels.
+     *     </dd>
+     *
+     * <dt>height</dt>
+     *     <dd>If set, this contains the display height of this resource,
+     *     in pixels.
+     *     </dd>
+     *
+     * <dt>duration</dt>
+     *     <dd>DEPRECATED: ignored.
+     *     </dd>
+     *
+     * <dt>active</dt>
+     *     <dd>DEPRECATED: ignored.
+     *     </dd>
+     *
+     * <dt>recognition</dt>
+     *     <dd>If set, this will hold the encoded data that provides
+     *     information on search and recognition within this resource.
+     *     </dd>
+     *
+     * <dt>attributes</dt>
+     *     <dd>A list of the attributes for this resource.
+     *     </dd>
+     *
+     * <dt>updateSequenceNum</dt>
+     *     <dd>A number identifying the last transaction to
+     *     modify the state of this object. The USN values are sequential within an
+     *     account, and can be used to compare the order of modifications within the
+     *     service.
+     *     </dd>
+     *
+     * <dt>alternateData</dt>
+     *     <dd>Some Resources may be assigned an alternate data format by the service
+     *     which may be more appropriate for indexing or rendering than the original
+     *     data provided by the user.    In these cases, the alternate data form will
+     *     be available via this Data element.    If a Resource has no alternate form,
+     *     this field will be unset.</dd>
+     * </dl>
+     */
+    class Resource {
+        guid: string;
+        noteGuid: string;
+        data: Data;
+        mime: string;
+        width: number;
+        height: number;
+        duration: number;
+        active: boolean;
+        recognition: Data;
+        attributes: ResourceAttributes;
+        updateSequenceNum: number;
+        alternateData: Data;
+
+        constructor(args?: { guid?: string; noteGuid?: string; data?: Data; mime?: string; width?: number; height?: number; duration?: number; active?: boolean; recognition?: Data; attributes?: ResourceAttributes; updateSequenceNum?: number; alternateData?: Data; });
+    }
+
+    /**
+     * The list of optional attributes that can be stored on a note.
+     * <dl>
+     * <dt>subjectDate</dt>
+     *     <dd>time that the note refers to
+     *     </dd>
+     *
+     * <dt>latitude</dt>
+     *     <dd>the latitude where the note was taken
+     *     </dd>
+     *
+     * <dt>longitude</dt>
+     *     <dd>the longitude where the note was taken
+     *     </dd>
+     *
+     * <dt>altitude</dt>
+     *     <dd>the altitude where the note was taken
+     *     </dd>
+     *
+     * <dt>author</dt>
+     *     <dd>the author of the content of the note
+     *     <br/>
+     *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
+     *     </dd>
+     *
+     * <dt>source</dt>
+     *     <dd>the method that the note was added to the account, if the
+     *     note wasn't directly authored in an Evernote desktop client.
+     *     <br/>
+     *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
+     *     </dd>
+     *
+     * <dt>sourceURL</dt>
+     *     <dd>the original location where the resource was hosted. For web clips,
+     *     this will be the URL of the page that was clipped.
+     *     <br/>
+     *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
+     *     </dd>
+     *
+     * <dt>sourceApplication</dt>
+     *     <dd>an identifying string for the application that
+     *     created this note.    This string does not have a guaranteed syntax or
+     *     structure -- it is intended for human inspection and tracking.
+     *     <br/>
+     *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
+     *     </dd>
+     *
+     * <dt>shareDate</dt>
+     *    <dd>The date and time when this note was directly shared via its own URL.
+     *    This is only set on notes that were individually shared - it is independent
+     *    of any notebook-level sharing of the containing notebook. This field
+     *    is treated as "read-only" for clients; the server will ignore changes
+     *    to this field from an external client.
+     *    </dd>
+     *
+     * <dt>reminderOrder</dt>
+     * <dd>The set of notes with this parameter set are considered
+     * "reminders" and are to be treated specially by clients to give them
+     * higher UI prominence within a notebook.    The value is used to sort
+     * the reminder notes within the notebook with higher values
+     * representing greater prominence.    Outside of the context of a
+     * notebook, the value of this parameter is undefined.    The value is
+     * not intended to be compared to the values of reminder notes in
+     * other notebooks.    In order to allow clients to place a note at a
+     * higher precedence than other notes, you should never set a value
+     * greater than the current time (as defined for a Timetstamp). To
+     * place a note at higher precedence than existing notes, set the
+     * value to the current time as defined for a timestamp (milliseconds
+     * since the epoch).    Synchronizing clients must remember the time when
+     * the update was performed, using the local clock on the client,
+     * and use that value when they later upload the note to the service.
+     * Clients must not set the reminderOrder to the reminderTime as the
+     * reminderTime could be in the future.    Those two fields are never
+     * intended to be related.    The correct value for reminderOrder field
+     * for new notes is the "current" time when the user indicated that
+     * the note is a reminder.    Clients may implement a separate
+     * "sort by date" feature to show notes ordered by reminderTime.
+     * Whenever a reminderDoneTime or reminderTime is set but a
+     * reminderOrder is not set, the server will fill in the current
+     * server time for the reminderOrder field.</dd>
+     *
+     * <dt>reminderDoneTime</dt>
+     * <dd>The date and time when a user dismissed/"marked done" the reminder
+     * on the note.    Users typically do not manually set this value directly
+     * as it is set to the time when the user dismissed/"marked done" the
+     * reminder.</dd>
+     *
+     * <dt>reminderTime</dt>
+     * <dd>The date and time a user has selected to be reminded of the note.
+     * A note with this value set is known as a "reminder" and the user can
+     * be reminded, via e-mail or client-specific notifications, of the note
+     * when the time is reached or about to be reached.    When a user sets
+     * a reminder time on a note that has a reminder done time, and that
+     * reminder time is in the future, then the reminder done time should be
+     * cleared.    This should happen regardless of any existing reminder time
+     * that may have previously existed on the note.</dd>
+     *
+     * <dt>placeName</dt>
+     * <dd>Allows the user to assign a human-readable location name associated
+     * with a note. Users may assign values like 'Home' and 'Work'. Place
+     * names may also be populated with values from geonames database
+     * (e.g., a restaurant name). Applications are encouraged to normalize values
+     * so that grouping values by place name provides a useful result. Applications
+     * MUST NOT automatically add place name values based on geolocation without
+     * confirmation from the user; that is, the value in this field should be
+     * more useful than a simple automated lookup based on the note's latitude
+     * and longitude.</dd>
+     *
+     * <dt>contentClass</dt>
+     * <dd>The class (or type) of note. This field is used to indicate to
+     * clients that special structured information is represented within
+     * the note such that special rules apply when making
+     * modifications. If contentClass is set and the client
+     * application does not specifically support the specified class,
+     * the client MUST treat the note as read-only. In this case, the
+     * client MAY modify the note's notebook and tags via the
+     * Note.notebookGuid and Note.tagGuids fields.    The client MAY also
+     * modify the reminderOrder field as well as the reminderTime and
+     * reminderDoneTime fields.
+     * <p>Applications should set contentClass only when they are creating notes
+     * that contain structured information that needs to be maintained in order
+     * for the user to be able to use the note within that application.
+     * Setting contentClass makes a note read-only in other applications, so
+     * there is a trade-off when an application chooses to use contentClass.
+     * Applications that set contentClass when creating notes must use a contentClass
+     * string of the form <i>CompanyName.ApplicationName</i> to ensure uniqueness.</p>
+     * Length restrictions: EDAM_NOTE_CONTENT_CLASS_LEN_MIN, EDAM_NOTE_CONTENT_CLASS_LEN_MAX
+     * <br/>
+     * Regex: EDAM_NOTE_CONTENT_CLASS_REGEX
+     * </dd>
+     *
+     * <dt>applicationData</dt>
+     * <dd>Provides a location for applications to store a relatively small
+     * (4kb) blob of data that is not meant to be visible to the user and
+     * that is opaque to the Evernote service. A single application may use at most
+     * one entry in this map, using its API consumer key as the map key. See the
+     * documentation for LazyMap for a description of when the actual map values
+     * are returned by the service.
+     * <p>To safely add or modify your application's entry in the map, use
+     * NoteStore.setNoteApplicationDataEntry. To safely remove your application's
+     * entry from the map, use NoteStore.unsetNoteApplicationDataEntry.</p>
+     * Minimum length of a name (key): EDAM_APPLICATIONDATA_NAME_LEN_MIN
+     * <br/>
+     * Sum max size of key and value: EDAM_APPLICATIONDATA_ENTRY_LEN_MAX
+     * <br/>
+     * Syntax regex for name (key): EDAM_APPLICATIONDATA_NAME_REGEX
+     * </dd>
+     *
+     * <dt>creatorId</dt>
+     * <dd>The numeric user ID of the user who originally created the note.</dd>
+     *
+     * <dt>lastEditedBy</dt>
+     * <dd>An indication of who made the last change to the note.    If you are
+     * accessing the note via a shared notebook to which you have modification
+     * rights, or if you are the owner of the notebook to which the note belongs,
+     * then you have access to the value.    In this case, the value will be
+     * unset if the owner of the notebook containing the note was the last to
+     * make the modification, else it will be a string describing the
+     * guest who made the last edit.    If you do not have access to this value,
+     * it will be left unset.    This field is read-only by clients.    The server
+     * will ignore all values set by clients into this field.</dd>
+     *
+     * <dt>lastEditorId</dt>
+     * <dd>The numeric user ID of the user described in lastEditedBy.</dd>
+     *
+     * <dt>classifications</dt>
+     * <dd>A map of classifications applied to the note by clients or by the
+     * Evernote service. The key is the string name of the classification type,
+     * and the value is a constant that begins with CLASSIFICATION_.</dd>
+     *
+     * </dl>
+     */
+    class NoteAttributes {
+        subjectDate: number;
+        latitude: number;
+        longitude: number;
+        altitude: number;
+        author: string;
+        source: string;
+        sourceURL: string;
+        sourceApplication: string;
+        shareDate: number;
+        reminderOrder: number;
+        reminderDoneTime: number;
+        reminderTime: number;
+        placeName: string;
+        contentClass: string;
+        applicationData: LazyMap;
+        lastEditedBy: string;
+        classifications: { [k: string]: string; };
+        creatorId: number;
+        lastEditorId: number;
+
+        constructor(args?: { subjectDate?: number; latitude?: number; longitude?: number; altitude?: number; author?: string; source?: string; sourceURL?: string; sourceApplication?: string; shareDate?: number; reminderOrder?: number; reminderDoneTime?: number; reminderTime?: number; placeName?: string; contentClass?: string; applicationData?: LazyMap; lastEditedBy?: string; classifications?: { [k: string]: string; }; creatorId?: number; lastEditorId?: number; });
+    }
+
+    /**
+     * Represents a single note in the user's account.
+     *
+     * <dl>
+     * <dt>guid</dt>
+     *     <dd>The unique identifier of this note.    Will be set by the
+     *     server, but will be omitted by clients calling NoteStore.createNote()
+     *     <br/>
+     *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_GUID_REGEX
+     *     </dd>
+     *
+     * <dt>title</dt>
+     *     <dd>The subject of the note.    Can't begin or end with a space.
+     *     <br/>
+     *     Length:    EDAM_NOTE_TITLE_LEN_MIN - EDAM_NOTE_TITLE_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_NOTE_TITLE_REGEX
+     *     </dd>
+     *
+     * <dt>content</dt>
+     *     <dd>The XHTML block that makes up the note.    This is
+     *     the canonical form of the note's contents, so will include abstract
+     *     Evernote tags for internal resource references.    A client may create
+     *     a separate transformed version of this content for internal presentation,
+     *     but the same canonical bytes should be used for transmission and
+     *     comparison unless the user chooses to modify their content.
+     *     <br/>
+     *     Length:    EDAM_NOTE_CONTENT_LEN_MIN - EDAM_NOTE_CONTENT_LEN_MAX
+     *     </dd>
+     *
+     * <dt>contentHash</dt>
+     *     <dd>The binary MD5 checksum of the UTF-8 encoded content
+     *     body. This will always be set by the server, but clients may choose to omit
+     *     this when they submit a note with content.
+     *     <br/>
+     *     Length:    EDAM_HASH_LEN (exactly)
+     *     </dd>
+     *
+     * <dt>contentLength</dt>
+     *     <dd>The number of Unicode characters in the content of
+     *     the note.    This will always be set by the service, but clients may choose
+     *     to omit this value when they submit a Note.
+     *     </dd>
+     *
+     * <dt>created</dt>
+     *     <dd>The date and time when the note was created in one of the
+     *     clients.    In most cases, this will match the user's sense of when
+     *     the note was created, and ordering between notes will be based on
+     *     ordering of this field.    However, this is not a "reliable" timestamp
+     *     if a client has an incorrect clock, so it cannot provide a true absolute
+     *     ordering between notes.    Notes created directly through the service
+     *     (e.g. via the web GUI) will have an absolutely ordered "created" value.
+     *     </dd>
+     *
+     * <dt>updated</dt>
+     *     <dd>The date and time when the note was last modified in one of
+     *     the clients.    In most cases, this will match the user's sense of when
+     *     the note was modified, but this field may not be absolutely reliable
+     *     due to the possibility of client clock errors.
+     *     </dd>
+     *
+     * <dt>deleted</dt>
+     *     <dd>If present, the note is considered "deleted", and this
+     *     stores the date and time when the note was deleted by one of the clients.
+     *     In most cases, this will match the user's sense of when the note was
+     *     deleted, but this field may be unreliable due to the possibility of
+     *     client clock errors.
+     *     </dd>
+     *
+     * <dt>active</dt>
+     *     <dd>If the note is available for normal actions and viewing,
+     *     this flag will be set to true.
+     *     </dd>
+     *
+     * <dt>updateSequenceNum</dt>
+     *     <dd>A number identifying the last transaction to
+     *     modify the state of this note (including changes to the note's attributes
+     *     or resources).    The USN values are sequential within an account,
+     *     and can be used to compare the order of modifications within the service.
+     *     </dd>
+     *
+     * <dt>notebookGuid</dt>
+     *     <dd>The unique identifier of the notebook that contains
+     *     this note.    If no notebookGuid is provided on a call to createNote(), the
+     *     default notebook will be used instead.
+     *     <br/>
+     *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_GUID_REGEX
+     *     </dd>
+     *
+     * <dt>tagGuids</dt>
+     *     <dd>A list of the GUID identifiers for tags that are applied to this note.
+     *     This may be provided in a call to createNote() to unambiguously
+     *     the tags that should be assigned to the new note.    Alternately, clients
+     *     may pass the names of desired tags via the 'tagNames' field during
+     *     note creation.
+     *     If the list of tags are omitted on a call to createNote(), then
+     *     the server will assume that no changes have been made to the resources.
+     *     Maximum:    EDAM_NOTE_TAGS_MAX tags per note
+     *     </dd>
+     *
+     * <dt>resources</dt>
+     *     <dd>The list of resources that are embedded within this note.
+     *     If the list of resources are omitted on a call to updateNote(), then
+     *     the server will assume that no changes have been made to the resources.
+     *     The binary contents of the resources must be provided when the resource
+     *     is first sent to the service, but it will be omitted by the service when
+     *     the Note is returned in the future.
+     *     Maximum:    EDAM_NOTE_RESOURCES_MAX resources per note
+     *     </dd>
+     *
+     * <dt>attributes</dt>
+     *     <dd>A list of the attributes for this note.
+     *     If the list of attributes are omitted on a call to updateNote(), then
+     *     the server will assume that no changes have been made to the resources.
+     *     </dd>
+     *
+     * <dt>tagNames</dt>
+     *     <dd>May be provided by clients during calls to createNote() as an
+     *     alternative to providing the tagGuids of existing tags.    If any tagNames
+     *     are provided during createNote(), these will be found, or created if they
+     *     don't already exist.    Created tags will have no parent (they will be at
+     *     the top level of the tag panel).
+     *     </dd>
+     * </dl>
+     */
+    class Note {
+        guid: string;
+        title: string;
+        content: string;
+        contentHash: string;
+        contentLength: number;
+        created: number;
+        updated: number;
+        deleted: number;
+        active: boolean;
+        updateSequenceNum: number;
+        notebookGuid: string;
+        tagGuids: string[];
+        resources: Resource[];
+        attributes: NoteAttributes;
+        tagNames: string[];
+
+        constructor(args?: { guid?: string; title?: string; content?: string; contentHash?: string; contentLength?: number; created?: number; updated?: number; deleted?: number; active?: boolean; updateSequenceNum?: number; notebookGuid?: string; tagGuids?: string[]; resources?: Resource[]; attributes?: NoteAttributes; tagNames?: string[]; });
+    }
+
+    /**
+     * If a Notebook has been opened to the public, the Notebook will have a
+     * reference to one of these structures, which gives the location and optional
+     * description of the externally-visible public Notebook.
+     * <dl>
+     * <dt>uri</dt>
+     *     <dd>If this field is present, then the notebook is published for
+     *     mass consumption on the Internet under the provided URI, which is
+     *     relative to a defined base publishing URI defined by the service.
+     *     This field can only be modified via the web service GUI ... publishing
+     *     cannot be modified via an offline client.
+     *     <br/>
+     *     Length:    EDAM_PUBLISHING_URI_LEN_MIN - EDAM_PUBLISHING_URI_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_PUBLISHING_URI_REGEX
+     *     </dd>
+     *
+     * <dt>order</dt>
+     *     <dd>When the notes are publicly displayed, they will be sorted
+     *     based on the requested criteria.
+     *     </dd>
+     *
+     * <dt>ascending</dt>
+     *     <dd>If this is set to true, then the public notes will be
+     *     displayed in ascending order (e.g. from oldest to newest).    Otherwise,
+     *     the notes will be displayed in descending order (e.g. newest to oldest).
+     *     </dd>
+     *
+     * <dt>publicDescription</dt>
+     *     <dd>This field may be used to provide a short
+     *     description of the notebook, which may be displayed when (e.g.) the
+     *     notebook is shown in a public view.    Can't begin or end with a space.
+     *     <br/>
+     *     Length:    EDAM_PUBLISHING_DESCRIPTION_LEN_MIN -
+     *                        EDAM_PUBLISHING_DESCRIPTION_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_PUBLISHING_DESCRIPTION_REGEX
+     *     </dd>
+     *
+     * </dl>
+     */
+    class Publishing {
+        uri: string;
+        order: NoteSortOrder;
+        ascending: boolean;
+        publicDescription: string;
+
+        constructor(args?: { uri?: string; order?: NoteSortOrder; ascending?: boolean; publicDescription?: string; });
+    }
+
+    /**
+     * If a Notebook contained in an Evernote Business account has been published
+     * the to business library, the Notebook will have a reference to one of these
+     * structures, which specifies how the Notebook will be represented in the
+     * library.
+     *
+     * <dl>
+     * <dt>notebookDescription</dt>
+     *     <dd>A short description of the notebook's content that will be displayed
+     *             in the business library user interface. The description may not begin
+     *             or end with whitespace.
+     *     <br/>
+     *     Length: EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_LEN_MIN -
+     *                     EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_REGEX
+     *     </dd>
+     *
+     * <dt>privilege</dt>
+     *     <dd>The privileges that will be granted to users who join the notebook through
+     *             the business library.
+     *     </dd>
+     *
+     * <dt>recommended</dt>
+     *     <dd>Whether the notebook should be "recommended" when displayed in the business
+     *             library user interface.
+     *     </dd>
+     * </dl>
+     */
+    class BusinessNotebook {
+        notebookDescription: string;
+        privilege: SharedNotebookPrivilegeLevel;
+        recommended: boolean;
+
+        constructor(args?: { notebookDescription?: string; privilege?: SharedNotebookPrivilegeLevel; recommended?: boolean; });
+    }
+
+    /**
+     * A structure defining the scope of a SavedSearch.
+     *
+     * <dl>
+     *     <dt>includeAccount</dt>
+     *     <dd>The search should include notes from the account that contains the SavedSearch.</dd>
+     *
+     *     <dt>includePersonalLinkedNotebooks</dt>
+     *     <dd>The search should include notes within those shared notebooks
+     *     that the user has joined that are NOT business notebooks.</dd>
+     *
+     *     <dt>includeBusinessLinkedNotebooks</dt>
+     *     <dd>The search should include notes within those shared notebooks
+     *     that the user has joined that are business notebooks in the business that
+     *     the user is currently a member of.</dd>
+     * </dl>
+     */
+    class SavedSearchScope {
+        includeAccount: boolean;
+        includePersonalLinkedNotebooks: boolean;
+        includeBusinessLinkedNotebooks: boolean;
+
+        constructor(args?: { includeAccount?: boolean; includePersonalLinkedNotebooks?: boolean; includeBusinessLinkedNotebooks?: boolean; });
+    }
+
+    /**
+     * A named search associated with the account that can be quickly re-used.
+     * <dl>
+     * <dt>guid</dt>
+     *     <dd>The unique identifier of this search.    Will be set by the
+     *     service, so may be omitted by the client when creating.
+     *     <br/>
+     *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_GUID_REGEX
+     *     </dd>
+     *
+     * <dt>name</dt>
+     *     <dd>The name of the saved search to display in the GUI.    The
+     *     account may only contain one search with a given name (case-insensitive
+     *     compare). Can't begin or end with a space.
+     *     <br/>
+     *     Length:    EDAM_SAVED_SEARCH_NAME_LEN_MIN - EDAM_SAVED_SEARCH_NAME_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_SAVED_SEARCH_NAME_REGEX
+     *     </dd>
+     *
+     * <dt>query</dt>
+     *     <dd>A string expressing the search to be performed.
+     *     <br/>
+     *     Length:    EDAM_SAVED_SEARCH_QUERY_LEN_MIN - EDAM_SAVED_SEARCH_QUERY_LEN_MAX
+     *     </dd>
+     *
+     * <dt>format</dt>
+     *     <dd>The format of the query string, to determine how to parse
+     *     and process it.
+     *     </dd>
+     *
+     * <dt>updateSequenceNum</dt>
+     *     <dd>A number identifying the last transaction to
+     *     modify the state of this object.    The USN values are sequential within an
+     *     account, and can be used to compare the order of modifications within the
+     *     service.
+     *     </dd>
+     *
+     * <dt>scope</dt>
+     *     <dd><p>Specifies the set of notes that should be included in the search, if
+     *        possible.</p>
+     *        <p>Clients are expected to search as much of the desired scope as possible,
+     *        with the understanding that a given client may not be able to cover the full
+     *        specified scope. For example, when executing a search that includes notes in both
+     *        the owner's account and business notebooks, a mobile client may choose to only
+     *        search within the user's account because it is not capable of searching both
+     *        scopes simultaneously. When a search across multiple scopes is not possible,
+     *        a client may choose which scope to search based on the current application
+     *        context. If a client cannot search any of the desired scopes, it should refuse
+     *        to execute the search.</p>
+     *        </dd>
+     * </dl>
+     */
+    class SavedSearch {
+        guid: string;
+        name: string;
+        query: string;
+        format: QueryFormat;
+        updateSequenceNum: number;
+        scope: SavedSearchScope;
+
+        constructor(args?: { guid?: string; name?: string; query?: string; format?: QueryFormat; updateSequenceNum?: number; scope?: SavedSearchScope; });
+    }
+
+    /**
+     * Settings meant for the recipient of a shared notebook, such as
+     * for indicating which types of notifications the recipient wishes
+     * for reminders, etc.
+     *
+     * The reminderNotifyEmail and reminderNotifyInApp fields have a
+     * 3-state read value but a 2-state write value.    On read, it is
+     * possible to observe "unset", true, or false.    The initial state is
+     * "unset".    When you choose to set a value, you may set it to either
+     * true or false, but you cannot unset the value.    Once one of these
+     * members has a true/false value, it will always have a true/false
+     * value.
+     *
+     * <dl>
+     * <dt>reminderNotifyEmail</dt>
+     * <dd>Indicates that the user wishes to receive daily e-mail notifications
+     *         for reminders associated with the shared notebook.    This may be
+     *         true only for business notebooks that belong to the business of
+     *         which the user is a member.    You may only set this value on a
+     *         notebook in your business.</dd>
+     * <dt>reminderNotifyInApp</dt>
+     * <dd>Indicates that the user wishes to receive notifications for
+     *         reminders by applications that support providing such
+     *         notifications.    The exact nature of the notification is defined
+     *         by the individual applications.</dd>
+     * </dl>
+     *
+     */
+    class SharedNotebookRecipientSettings {
+        reminderNotifyEmail: boolean;
+        reminderNotifyInApp: boolean;
+
+        constructor(args?: { reminderNotifyEmail?: boolean; reminderNotifyInApp?: boolean; });
+    }
+
+    /**
+     * Shared notebooks represent a relationship between a notebook and a single
+     * share invitation recipient.
+     * <dl>
+     * <dt>id</dt>
+     * <dd>the primary identifier of the share</dd>
+     *
+     * <dt>userId</dt>
+     * <dd>the user id of the owner of the notebook</dd>
+     *
+     * <dt>notebookGuid</dt>
+     * <dd>the GUID of the associated notebook shared.</dd>
+     *
+     * <dt>email</dt>
+     * <dd>the email address of the recipient - used by the notebook
+     * owner to identify who they shared with.</dd>
+     *
+     * <dt>notebookModifiable</dt>
+     * <dd>(DEPRECATED) a flag indicating the share is read/write -otherwise it's read
+     *         only.    This field is deprecated in favor of the new "privilege" field.</dd>
+     *
+     * <dt>requireLogin</dt>
+     * <dd>(DEPRECATED) indicates that a user must login to access the share.    This
+     *         field is deprecated and will be "true" for all new shared notebooks.    It
+     *         is read-only and ignored when creating or modifying a shared notebook,
+     *         except that a shared notebook can be modified to require login.
+     *         See "allowPreview" for information on privileges and shared notebooks.</dd>
+     *
+     * <dt>serviceCreated</dt>
+     * <dd>the date the owner first created the share with the specific email
+     *     address</dd>
+     *
+     * <dt>serviceUpdated</dt>
+     * <dd>the date the shared notebook was last updated on the service.    This
+     *         will be updated when authenticateToSharedNotebook is called the first
+     *         time with a shared notebook requiring login (i.e. when the username is
+     *         bound to that shared notebook).</dd>
+     *
+     * <dt>username</dt>
+     * <dd>the username of the user who can access this share.
+     *     Once it's assigned it cannot be changed.</dd>
+     *
+     * <dt>privilege</dt>
+     * <dd>The privilege level granted to the notebook, activity stream, and
+     *         invitations.    See the corresponding enumeration for details.</dd>
+     *
+     * <dt>allowPreview</dt>
+     * <dd>Whether or not to grant "READ_NOTEBOOK" privilege without an
+     *         authentication token, for authenticateToSharedNotebook(...).    With
+     *         the change to "requireLogin" always being true for new shared
+     *         notebooks, this is the only way to access a shared notebook without
+     *         an authorization token.    This setting expires after the first use
+     *         of authenticateToSharedNotebook(...) with a valid authentication
+     *         token.</dd>
+     *
+     * <dt>recipientSettings</dt>
+     * <dd>Settings intended for use only by the recipient of this shared
+     *         notebook.    You should skip setting this value unless you want
+     *         to change the value contained inside the structure, and only if
+     *         you are the recipient.</dd>
+     * </dl>
+     */
+    class SharedNotebook {
+        id: number;
+        userId: number;
+        notebookGuid: string;
+        email: string;
+        notebookModifiable: boolean;
+        requireLogin: boolean;
+        serviceCreated: number;
+        serviceUpdated: number;
+        shareKey: string;
+        username: string;
+        privilege: SharedNotebookPrivilegeLevel;
+        allowPreview: boolean;
+        recipientSettings: SharedNotebookRecipientSettings;
+
+        constructor(args?: { id?: number; userId?: number; notebookGuid?: string; email?: string; notebookModifiable?: boolean; requireLogin?: boolean; serviceCreated?: number; serviceUpdated?: number; shareKey?: string; username?: string; privilege?: SharedNotebookPrivilegeLevel; allowPreview?: boolean; recipientSettings?: SharedNotebookRecipientSettings; });
+    }
+
+    /**
+     * This structure captures information about the types of operations
+     * that cannot be performed on a given notebook with a type of
+     * authenticated access and credentials.    The values filled into this
+     * structure are based on then-current values in the server database
+     * for shared notebooks and notebook publishing records, as well as
+     * information related to the authentication token.    Information from
+     * the authentication token includes the application that is accessing
+     * the server, as defined by the permissions granted by consumer (api)
+     * key, and the method used to obtain the token, for example via
+     * authenticateToSharedNotebook, authenticateToBusiness, etc.    Note
+     * that changes to values in this structure that are the result of
+     * shared notebook or publishing record changes are communicated to
+     * the client via a change in the notebook USN during sync.    It is
+     * important to use the same access method, parameters, and consumer
+     * key in order obtain correct results from the sync engine.
+     *
+     * The server has the final say on what is allowed as values may
+     * change between calls to obtain NotebookRestrictions instances
+     * and to operate on data on the service.
+     *
+     * If the following are set and true, then the given restriction is
+     * in effect, as accessed by the same authentication token from which
+     * the values were obtained.
+     *
+     * <dt>noReadNotes</dt>
+     *     <dd>The client is not able to read notes from the service and
+     *     the notebook is write-only.
+     *     </dd>
+     * <dt>noCreateNotes</dt>
+     *     <dd>The client may not create new notes in the notebook.
+     *     </dd>
+     * <dt>noUpdateNotes</dt>
+     *     <dd>The client may not update notes currently in the notebook.
+     *     </dd>
+     * <dt>noExpungeNotes</dt>
+     *     <dd>The client may not expunge notes currently in the notebook.
+     *     </dd>
+     * <dt>noShareNotes</dt>
+     *     <dd>The client may not share notes in the notebook via the
+     *     shareNote method.
+     *     </dd>
+     * <dt>noEmailNotes</dt>
+     *     <dd>The client may not e-mail notes via the Evernote service by
+     *     using the emailNote method.
+     *     </dd>
+     * <dt>noSendMessageToRecipients</dt>
+     *     <dd>The client may not send messages to the share recipients of
+     *     the notebook.
+     *     </dd>
+     * <dt>noUpdateNotebook</dt>
+     *     <dd>The client may not update the Notebook object itself, for
+     *     example, via the updateNotebook method.
+     *     </dd>
+     * <dt>noExpungeNotebook</dt>
+     *     <dd>The client may not expunge the Notebook object itself, for
+     *     example, via the expungeNotebook method.
+     *     </dd>
+     * <dt>noSetDefaultNotebook</dt>
+     *     <dd>The client may not set this notebook to be the default notebook.
+     *     The caller should leave Notebook.defaultNotebook unset.
+     *     </dd>
+     * <dt>noSetNotebookStack</dt>
+     *     <dd>If the client is able to update the Notebook, the Notebook.stack
+     *     value may not be set.
+     *     </dd>
+     * <dt>noPublishToPublic</dt>
+     *     <dd>The client may not change the publish the notebook to the public.
+     *     For example, business notebooks may not be shared publicly.
+     *     </dd>
+     * <dt>noPublishToBusinessLibrary</dt>
+     *     <dd>The client may not publish the notebook to the business library.
+     *     </dd>
+     * <dt>noCreateTags</dt>
+     *     <dd>The client may not complete an operation that results in a new tag
+     *     being created in the owner's account.
+     *     </dd>
+     * <dt>noUpdateTags</dt>
+     *     <dd>The client may not update tags in the owner's account.
+     *     </dd>
+     * <dt>noExpungeTags</dt>
+     *     <dd>The client may not expunge tags in the owner's account.
+     *     </dd>
+     * <dt>noSetParentTag</dt>
+     *     <dd>If the client is able to create or update tags in the owner's account,
+     *     then they will not be able to set the parent tag.    Leave the value unset.
+     *     </dd>
+     * <dt>noCreateSharedNotebooks</dt>
+     *     <dd>The client is unable to create shared notebooks for the notebook.
+     *     </dd>
+     * <dt>updateWhichSharedNotebookRestrictions</dt>
+     *     <dd>Restrictions on which shared notebook instances can be updated.    If the
+     *     value is not set or null, then the client can update any of the shared notebooks
+     *     associated with the notebook on which the NotebookRestrictions are defined.
+     *     See the enumeration for further details.
+     *     </dd>
+     * <dt>expungeWhichSharedNotebookRestrictions</dt>
+     *     <dd>Restrictions on which shared notebook instances can be expunged.    If the
+     *     value is not set or null, then the client can expunge any of the shared notebooks
+     *     associated with the notebook on which the NotebookRestrictions are defined.
+     *     See the enumeration for further details.
+     *     </dd>
+     */
+    class NotebookRestrictions {
+        noReadNotes: boolean;
+        noCreateNotes: boolean;
+        noUpdateNotes: boolean;
+        noExpungeNotes: boolean;
+        noShareNotes: boolean;
+        noEmailNotes: boolean;
+        noSendMessageToRecipients: boolean;
+        noUpdateNotebook: boolean;
+        noExpungeNotebook: boolean;
+        noSetDefaultNotebook: boolean;
+        noSetNotebookStack: boolean;
+        noPublishToPublic: boolean;
+        noPublishToBusinessLibrary: boolean;
+        noCreateTags: boolean;
+        noUpdateTags: boolean;
+        noExpungeTags: boolean;
+        noSetParentTag: boolean;
+        noCreateSharedNotebooks: boolean;
+        updateWhichSharedNotebookRestrictions: SharedNotebookInstanceRestrictions;
+        expungeWhichSharedNotebookRestrictions: SharedNotebookInstanceRestrictions;
+
+        constructor(args?: { noReadNotes?: boolean; noCreateNotes?: boolean; noUpdateNotes?: boolean; noExpungeNotes?: boolean; noShareNotes?: boolean; noEmailNotes?: boolean; noSendMessageToRecipients?: boolean; noUpdateNotebook?: boolean; noExpungeNotebook?: boolean; noSetDefaultNotebook?: boolean; noSetNotebookStack?: boolean; noPublishToPublic?: boolean; noPublishToBusinessLibrary?: boolean; noCreateTags?: boolean; noUpdateTags?: boolean; noExpungeTags?: boolean; noSetParentTag?: boolean; noCreateSharedNotebooks?: boolean; updateWhichSharedNotebookRestrictions?: SharedNotebookInstanceRestrictions; expungeWhichSharedNotebookRestrictions?: SharedNotebookInstanceRestrictions; });
+    }
+
+    /**
+     * A unique container for a set of notes.
+     * <dl>
+     * <dt>guid</dt>
+     *     <dd>The unique identifier of this notebook.
+     *     <br/>
+     *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_GUID_REGEX
+     *     </dd>
+     *
+     * <dt>name</dt>
+     *     <dd>A sequence of characters representing the name of the
+     *     notebook.    May be changed by clients, but the account may not contain two
+     *     notebooks with names that are equal via a case-insensitive comparison.
+     *     Can't begin or end with a space.
+     *     <br/>
+     *     Length:    EDAM_NOTEBOOK_NAME_LEN_MIN - EDAM_NOTEBOOK_NAME_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_NOTEBOOK_NAME_REGEX
+     *     </dd>
+     *
+     * <dt>updateSequenceNum</dt>
+     *     <dd>A number identifying the last transaction to
+     *     modify the state of this object.    The USN values are sequential within an
+     *     account, and can be used to compare the order of modifications within the
+     *     service.
+     *     </dd>
+     *
+     * <dt>defaultNotebook</dt>
+     *     <dd>If true, this notebook should be used for new notes
+     *     whenever the user has not (or cannot) specify a desired target notebook.
+     *     For example, if a note is submitted via SMTP email.
+     *     The service will maintain at most one defaultNotebook per account.
+     *     If a second notebook is created or updated with defaultNotebook set to
+     *     true, the service will automatically update the prior notebook's
+     *     defaultNotebook field to false.    If the default notebook is deleted
+     *     (i.e. "active" set to false), the "defaultNotebook" field will be
+     *     set to false by the service.    If the account has no default notebook
+     *     set, the service will use the most recent notebook as the default.
+     *     </dd>
+     *
+     * <dt>serviceCreated</dt>
+     *     <dd>The time when this notebook was created on the
+     *     service. This will be set on the service during creation, and the service
+     *     will provide this value when it returns a Notebook to a client.
+     *     The service will ignore this value if it is sent by clients.
+     *     </dd>
+     *
+     * <dt>serviceUpdated</dt>
+     *     <dd>The time when this notebook was last modified on the
+     *     service.    This will be set on the service during creation, and the service
+     *     will provide this value when it returns a Notebook to a client.
+     *     The service will ignore this value if it is sent by clients.
+     *     </dd>
+     *
+     * <dt>publishing</dt>
+     *     <dd>If the Notebook has been opened for public access, or
+     *     business users shared with their business (i.e. if 'published' is
+     *     set to true), then this will point to the set of publishing
+     *     information for the Notebook (URI, description, etc.).    A
+     *     Notebook cannot be published without providing this information,
+     *     but it will persist for later use if publishing is ever disabled
+     *     on the Notebook.    Clients that do not wish to change the
+     *     publishing behavior of a Notebook should not set this value when
+     *     calling NoteStore.updateNotebook().
+     *     </dd>
+     *
+     * <dt>published</dt>
+     *     <dd>If this is set to true, then the Notebook will be
+     *     accessible either to the public, or for business users to their business,
+     *     via the 'publishing' specification, which must also be set.    If this is set
+     *     to false, the Notebook will not be available to the public (or business).
+     *     Clients that do not wish to change the publishing behavior of a Notebook
+     *     should not set this value when calling NoteStore.updateNotebook().
+     *     </dd>
+     *
+     * <dt>stack</dt>
+     *     <dd>If this is set, then the notebook is visually contained within a stack
+     *     of notebooks with this name.    All notebooks in the same account with the
+     *     same 'stack' field are considered to be in the same stack.
+     *     Notebooks with no stack set are "top level" and not contained within a
+     *     stack.
+     *     </dd>
+     *
+     * <dt>sharedNotebookIds</dt>
+     *     <dd><i>DEPRECATED</i> - replaced by sharedNotebooks.</dd>
+     *
+     * <dt>sharedNotebooks</dt>
+     *     <dd>The list of recipients to whom this notebook has been shared
+     *     (one SharedNotebook object per recipient email address). This field will
+     *     be unset if you do not have permission to access this data. If you are
+     *     accessing the notebook as the owner or via a shared notebook that is
+     *     modifiable, then you have access to this data and the value will be set.
+     *     This field is read-only. Clients may not make changes to shared notebooks
+     *     via this field.
+     *     </dd>
+     *
+     * <dt>businessNotebook</dt>
+     *     <dd>If the notebook is part of a business account and has been published to the
+     *     business library, this will contain information for the library listing.
+     *     The presence or absence of this field is not a reliable test of whether a given
+     *     notebook is in fact a business notebook - the field is only used when a notebook is or
+     *     has been published to the business library.
+     *     </dd>
+     *
+     * <dt>contact</dt>
+     *     <dd>Intended for use with Business accounts, this field identifies the user who
+     *     has been designated as the "contact".    For notebooks created in business
+     *     accounts, the server will automatically set this value to the user who created
+     *     the notebook unless Notebook.contact.username has been set, in which that value
+     *     will be used.    When updating a notebook, it is common to leave Notebook.contact
+     *     field unset, indicating that no change to the value is being requested and that
+     *     the existing value, if any, should be preserved.
+     *     </dd>
+     *
+     * </dl>
+     */
+    class Notebook {
+        guid: string;
+        name: string;
+        updateSequenceNum: number;
+        defaultNotebook: boolean;
+        serviceCreated: number;
+        serviceUpdated: number;
+        publishing: Publishing;
+        published: boolean;
+        stack: string;
+        sharedNotebookIds: number[];
+        sharedNotebooks: SharedNotebook[];
+        businessNotebook: BusinessNotebook;
+        contact: User;
+        restrictions: NotebookRestrictions;
+
+        constructor(args?: { guid?: string; name?: string; updateSequenceNum?: number; defaultNotebook?: boolean; serviceCreated?: number; serviceUpdated?: number; publishing?: Publishing; published?: boolean; stack?: string; sharedNotebookIds?: number[]; sharedNotebooks?: SharedNotebook[]; businessNotebook?: BusinessNotebook; contact?: User; restrictions?: NotebookRestrictions; });
+    }
+
+    /**
+     * A link in an users account that refers them to a public or individual share in
+     * another user's account.
+     *
+     * <dl>
+     * <dt>shareName</dt>
+     * <dd>the display name of the shared notebook.
+     *     The link owner can change this.</dd>
+     *
+     * <dt>username</dt>
+     * <dd>the username of the user who owns the shared or public notebook</dd>
+     *
+     * <dt>shardId</dt>
+     * <dd>the shard ID of the notebook if the notebook is not public</dt>
+     *
+     * <dt>shareKey</dt>
+     * <dd>the secret key that provides access to the shared notebook</dd>
+     *
+     * <dt>uri</dt>
+     * <dd>the identifier of the public notebook</dd>
+     *
+     * <dt>guid</dt>
+     *     <dd>The unique identifier of this linked notebook.    Will be set whenever
+     *     a linked notebook is retrieved from the service, but may be null when a client
+     *     is creating a linked notebook.
+     *     <br/>
+     *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_GUID_REGEX
+     *     </dd>
+     *
+     * <dt>updateSequenceNum</dt>
+     *     <dd>A number identifying the last transaction to
+     *     modify the state of this object.    The USN values are sequential within an
+     *     account, and can be used to compare the order of modifications within the
+     *     service.
+     *     </dd>
+     *
+     * <dt>noteStoreUrl</dt>
+     *     <dd>
+     *     This field will contain the full URL that clients should use to make
+     *     NoteStore requests to the server shard that contains that notebook's data.
+     *     I.e. this is the URL that should be used to create the Thrift HTTP client
+     *     transport to send messages to the NoteStore service for the account.
+     *     </dd>
+     *
+     * <dt>webApiUrlPrefix:</dt>
+     *     <dd>
+     *     This field will contain the initial part of the URLs that should be used
+     *     to make requests to Evernote's thin client "web API", which provide
+     *     optimized operations for clients that aren't capable of manipulating
+     *     the full contents of accounts via the full Thrift data model. Clients
+     *     should concatenate the relative path for the various servlets onto the
+     *     end of this string to construct the full URL, as documented on our
+     *     developer web site.
+     *     </dd>
+     *
+     * <dt>stack</dt>
+     *     <dd>If this is set, then the notebook is visually contained within a stack
+     *     of notebooks with this name.    All notebooks in the same account with the
+     *     same 'stack' field are considered to be in the same stack.
+     *     Notebooks with no stack set are "top level" and not contained within a
+     *     stack.    The link owner can change this and this field is for the benefit
+     *     of the link owner.
+     *     </dd>
+     *
+     * <dt>businessId</dt>
+     *     <dd>If set, this will be the unique identifier for the business that owns
+     *     the notebook to which the linked notebook refers.
+     *
+     * </dl>
+     */
+    class LinkedNotebook {
+        shareName: string;
+        username: string;
+        shardId: string;
+        shareKey: string;
+        uri: string;
+        guid: string;
+        updateSequenceNum: number;
+        noteStoreUrl: string;
+        webApiUrlPrefix: string;
+        stack: string;
+        businessId: number;
+
+        constructor(args?: { shareName?: string; username?: string; shardId?: string; shareKey?: string; uri?: string; guid?: string; updateSequenceNum?: number; noteStoreUrl?: string; webApiUrlPrefix?: string; stack?: string; businessId?: number; });
+    }
+
+    /**
+     * A structure that describes a notebook or a user's relationship with
+     * a notebook. NotebookDescriptor is expected to remain a lighter-weight
+     * structure when compared to Notebook.
+     * <dl>
+     * <dt>guid</dt>
+     *     <dd>The unique identifier of the notebook.
+     *     </dd>
+     *
+     * <dt>notebookDisplayName</dt>
+     *     <dd>A sequence of characters representing the name of the
+     *     notebook.
+     *     </dd>
+     *
+     * <dt>contactName</dt>
+     *     <dd>The User.name value of the notebook's "contact".
+     *     </dd>
+     *
+     * <dt>hasSharedNotebook</dt>
+     *     <dd>Whether a SharedNotebook record exists between the calling user and this
+     *     notebook.
+     *     </dd>
+     *
+     * <dt>joinedUserCount</dt>
+     *     <dd>The number of users who have joined this notebook.
+     *     </dd>
+     *
+     * </dl>
+     */
+    class NotebookDescriptor {
+        guid: string;
+        notebookDisplayName: string;
+        contactName: string;
+        hasSharedNotebook: boolean;
+        joinedUserCount: number;
+
+        constructor(args?: { guid?: string; notebookDisplayName?: string; contactName?: string; hasSharedNotebook?: boolean; joinedUserCount?: number; });
+    }
+
+    /**
+     * A value for the "recipe" key in the "classifications" map in NoteAttributes
+     * that indicates the user has classified a note as being a non-recipe.
+     */
+    var CLASSIFICATION_RECIPE_USER_NON_RECIPE: string;
+
+    /**
+     * A value for the "recipe" key in the "classifications" map in NoteAttributes
+     * that indicates the user has classified a note as being a recipe.
+     */
+    var CLASSIFICATION_RECIPE_USER_RECIPE: string;
+
+    /**
+     * A value for the "recipe" key in the "classifications" map in NoteAttributes
+     * that indicates the Evernote service has classified a note as being a recipe.
+     */
+    var CLASSIFICATION_RECIPE_SERVICE_RECIPE: string;
+
+    /**
+     * Standardized value for the 'source' NoteAttribute for notes that
+     * were clipped from the web in some manner.
+     */
+    var EDAM_NOTE_SOURCE_WEB_CLIP: string;
+
+    /**
+     * Standardized value for the 'source' NoteAttribute for notes that
+     * were clipped from an email message.
+     */
+    var EDAM_NOTE_SOURCE_MAIL_CLIP: string;
+
+    /**
+     * Standardized value for the 'source' NoteAttribute for notes that
+     * were created via email sent to Evernote's email interface.
+     */
+    var EDAM_NOTE_SOURCE_MAIL_SMTP_GATEWAY: string;
+    /**
+     * Service:    UserStore
+     * <p>
+     * The UserStore service is primarily used by EDAM clients to establish
+     * authentication via username and password over a trusted connection (e.g.
+     * SSL).    A client's first call to this interface should be checkVersion() to
+     * ensure that the client's software is up to date.
+     * </p>
+     * All calls which require an authenticationToken may throw an
+     * EDAMUserException for the following reasons:
+     *    <ul>
+     *     <li> AUTH_EXPIRED "authenticationToken" - token has expired
+     *     <li> BAD_DATA_FORMAT "authenticationToken" - token is malformed
+     *     <li> DATA_REQUIRED "authenticationToken" - token is empty
+     *     <li> INVALID_AUTH "authenticationToken" - token signature is invalid
+     * </ul>
+     */
+    class UserStoreClient {
+        seqid: number;
+
+        /**
+         * This should be the first call made by a client to the EDAM service.    It
+         * tells the service what protocol version is used by the client.    The
+         * service will then return true if the client is capable of talking to
+         * the service, and false if the client's protocol version is incompatible
+         * with the service, so the client must upgrade.    If a client receives a
+         * false value, it should report the incompatibility to the user and not
+         * continue with any more EDAM requests (UserStore or NoteStore).
+         *
+         * @param clientName
+         *     This string provides some information about the client for
+         *     tracking/logging on the service.    It should provide information about
+         *     the client's software and platform. The structure should be:
+         *     application/version; platform/version; [ device/version ]
+         *     E.g. "Evernote Windows/3.0.1; Windows/XP SP3".
+         *
+         * @param edamVersionMajor
+         *     This should be the major protocol version that was compiled by the
+         *     client.    This should be the current value of the EDAM_VERSION_MAJOR
+         *     constant for the client.
+         *
+         * @param edamVersionMinor
+         *     This should be the major protocol version that was compiled by the
+         *     client.    This should be the current value of the EDAM_VERSION_MINOR
+         *     constant for the client.
+         */
+        checkVersion(clientName: string, edamVersionMajor: number, edamVersionMinor: number, cb: Callback<boolean>): void;
+
+        /**
+         * This provides bootstrap information to the client. Various bootstrap
+         * profiles and settings may be used by the client to configure itself.
+         *
+         * @param locale
+         *     The client's current locale, expressed in language[_country]
+         *     format. E.g., "en_US". See ISO-639 and ISO-3166 for valid
+         *     language and country codes.
+         *
+         * @return
+         *     The bootstrap information suitable for this client.
+         */
+        getBootstrapInfo(locale: string, cb: Callback<BootstrapInfo>): void;
+
+        /**
+         * Revoke an existing long lived authentication token. This can be used to
+         * revoke OAuth tokens or tokens created by calling authenticateLongSession,
+         * and allows a user to effectively log out of Evernote from the perspective
+         * of the application that holds the token. The authentication token that is
+         * passed is immediately revoked and may not be used to call any authenticated
+         * EDAM function.
+         *
+         * @param authenticationToken the authentication token to revoke.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> DATA_REQUIRED "authenticationToken" - no authentication token provided
+         *     <li> BAD_DATA_FORMAT "authenticationToken" - the authentication token is not well formed
+         *     <li> INVALID_AUTH "authenticationToken" - the authentication token is invalid
+         *     <li> AUTH_EXPIRED "authenticationToken" - the authentication token is expired or
+         *         is already revoked.
+         * </ul>
+         */
+        revokeLongSession(cb: Callback<void>): void;
+
+        /**
+         * This is used to take an existing authentication token that grants access
+         * to an individual user account (returned from 'authenticate',
+         * 'authenticateLongSession' or an OAuth authorization) and obtain an additional
+         * authentication token that may be used to access business notebooks if the user
+         * is a member of an Evernote Business account.
+         *
+         * The resulting authentication token may be used to make NoteStore API calls
+         * against the business using the NoteStore URL returned in the result.
+         *
+         * @param authenticationToken
+         *     The authentication token for the user. This may not be a shared authentication
+         *     token (returned by NoteStore.authenticateToSharedNotebook or
+         *     NoteStore.authenticateToSharedNote) or a business authentication token.
+         *
+         * @return
+         *     The result of the authentication, with the token granting access to the
+         *     business in the result's 'authenticationToken' field. The URL that must
+         *     be used to access the business account NoteStore will be returned in the
+         *     result's 'noteStoreUrl' field.    The 'User' field will
+         *     not be set in the result.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> PERMISSION_DENIED "authenticationToken" - the provided authentication token
+         *                is a shared or business authentication token. </li>
+         *     <li> PERMISSION_DENIED "Business" - the user identified by the provided
+         *                authentication token is not currently a member of a business. </li>
+         *     <li> PERMISSION_DENIED "Business.status" - the business that the user is a
+         *                member of is not currently in an active status. </li>
+         * </ul>
+         */
+        authenticateToBusiness(cb: Callback<AuthenticationResult>): void;
+
+        /**
+         * Returns the User corresponding to the provided authentication token,
+         * or throws an exception if this token is not valid.
+         * The level of detail provided in the returned User structure depends on
+         * the access level granted by the token, so a web service client may receive
+         * fewer fields than an integrated desktop client.
+         */
+        getUser(cb: Callback<User>): void;
+
+        /**
+         * Asks the UserStore about the publicly available location information for
+         * a particular username.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> DATA_REQUIRED "username" - username is empty
+         * </ul>
+         */
+        getPublicUserInfo(username: string, cb: Callback<PublicUserInfo>): void;
+
+
+        /**
+         * Returns the URL that should be used to talk to the NoteStore for the
+         * account represented by the provided authenticationToken.
+         * This method isn't needed by most clients, who can retrieve the correct
+         * NoteStore URL from the AuthenticationResult returned from the authenticate
+         * or refreshAuthentication calls. This method is typically only needed
+         * to look up the correct URL for a long-lived session token (e.g. for an
+         * OAuth web service).
+         */
+        getNoteStoreUrl(cb: Callback<string>): void;
+    }
+    /**
+     *    This structure is used to provide publicly-available user information
+     *    about a particular account.
+     * <dl>
+     *    <dt>userId:</dt>
+     *        <dd>
+     *        The unique numeric user identifier for the user account.
+     *        </dd>
+     *    <dt>shardId:</dt>
+     *        <dd>
+     *        DEPRECATED - Client applications should have no need to use this field.
+     *        </dd>
+     *    <dt>privilege:</dt>
+     *        <dd>
+     *        The privilege level of the account, to determine whether
+     *        this is a Premium or Free account.
+     *        </dd>
+     *    <dt>noteStoreUrl:</dt>
+     *        <dd>
+     *        This field will contain the full URL that clients should use to make
+     *        NoteStore requests to the server shard that contains that user's data.
+     *        I.e. this is the URL that should be used to create the Thrift HTTP client
+     *        transport to send messages to the NoteStore service for the account.
+     *        </dd>
+     *    <dt>webApiUrlPrefix:</dt>
+     *        <dd>
+     *        This field will contain the initial part of the URLs that should be used
+     *        to make requests to Evernote's thin client "web API", which provide
+     *        optimized operations for clients that aren't capable of manipulating
+     *        the full contents of accounts via the full Thrift data model. Clients
+     *        should concatenate the relative path for the various servlets onto the
+     *        end of this string to construct the full URL, as documented on our
+     *        developer web site.
+     *        </dd>
+     *    </dl>
+     */
+    class PublicUserInfo {
+        userId: number;
+        shardId: string;
+        privilege: PrivilegeLevel;
+        username: string;
+        noteStoreUrl: string;
+        webApiUrlPrefix: string;
+
+        constructor(args?: { userId: number; shardId: string; privilege?: PrivilegeLevel; username?: string; noteStoreUrl?: string; webApiUrlPrefix?: string; });
+    }
+
+    /**
+     *    When an authentication (or re-authentication) is performed, this structure
+     *    provides the result to the client.
+     * <dl>
+     *    <dt>currentTime:</dt>
+     *        <dd>
+     *        The server-side date and time when this result was
+     *        generated.
+     *        </dd>
+     *    <dt>authenticationToken:</dt>
+     *        <dd>
+     *        Holds an opaque, ASCII-encoded token that can be
+     *        used by the client to perform actions on a NoteStore.
+     *        </dd>
+     *    <dt>expiration:</dt>
+     *        <dd>
+     *        Holds the server-side date and time when the
+     *        authentication token will expire.
+     *        This time can be compared to "currentTime" to produce an expiration
+     *        time that can be reconciled with the client's local clock.
+     *        </dd>
+     *    <dt>user:</dt>
+     *        <dd>
+     *        Holds the information about the account which was
+     *        authenticated if this was a full authentication.    May be absent if this
+     *        particular authentication did not require user information.
+     *        </dd>
+     *    <dt>publicUserInfo:</dt>
+     *        <dd>
+     *        If this authentication result was achieved without full permissions to
+     *        access the full User structure, this field may be set to give back
+     *        a more limited public set of data.
+     *        </dd>
+     *    <dt>noteStoreUrl:</dt>
+     *        <dd>
+     *        This field will contain the full URL that clients should use to make
+     *        NoteStore requests to the server shard that contains that user's data.
+     *        I.e. this is the URL that should be used to create the Thrift HTTP client
+     *        transport to send messages to the NoteStore service for the account.
+     *        </dd>
+     *    <dt>webApiUrlPrefix:</dt>
+     *        <dd>
+     *        This field will contain the initial part of the URLs that should be used
+     *        to make requests to Evernote's thin client "web API", which provide
+     *        optimized operations for clients that aren't capable of manipulating
+     *        the full contents of accounts via the full Thrift data model. Clients
+     *        should concatenate the relative path for the various servlets onto the
+     *        end of this string to construct the full URL, as documented on our
+     *        developer web site.
+     *        </dd>
+     *    <dt>secondFactorRequired:</dt>
+     *        <dd>
+     *        If set to true, this field indicates that the user has enabled two-factor
+     *        authentication and must enter their second factor in order to complete
+     *        authentication. In this case the value of authenticationResult will be
+     *        a short-lived authentication token that may only be used to make a
+     *        subsequent call to completeTwoFactorAuthentication.
+     *        </dd>
+     *    <dt>secondFactorDeliveryHint:</dt>
+     *        <dd>
+     *        When secondFactorRequired is set to true, this field may contain a string
+     *        describing the second factor delivery method that the user has configured.
+     *        This will typically be an obfuscated mobile device number, such as
+     *        "(xxx) xxx-x095". This string can be displayed to the user to remind them
+     *        how to obtain the required second factor.
+     *        TODO do we need to differentiate between SMS and voice delivery?
+     *        </dd>
+     *    </dl>
+     */
+    class AuthenticationResult {
+        currentTime: number;
+        authenticationToken: string;
+        expiration: number;
+        user: User;
+        publicUserInfo: PublicUserInfo;
+        noteStoreUrl: string;
+        webApiUrlPrefix: string;
+        secondFactorRequired: boolean;
+        secondFactorDeliveryHint: string;
+
+        constructor(args?: { currentTime: number; authenticationToken: string; expiration: number; user?: User; publicUserInfo?: PublicUserInfo; noteStoreUrl?: string; webApiUrlPrefix?: string; secondFactorRequired?: boolean; secondFactorDeliveryHint?: string; });
+    }
+
+    /**
+     *    This structure describes a collection of bootstrap settings.
+     * <dl>
+     *    <dt>serviceHost:</dt>
+     *        <dd>
+     *        The hostname and optional port for composing Evernote web service URLs.
+     *        This URL can be used to access the UserStore and related services,
+     *        but must not be used to compose the NoteStore URL. Client applications
+     *        must handle serviceHost values that include only the hostname
+     *        (e.g. www.evernote.com) or both the hostname and port (e.g. www.evernote.com:8080).
+     *        If no port is specified, or if port 443 is specified, client applications must
+     *        use the scheme "https" when composing URLs. Otherwise, a client must use the
+     *        scheme "http".
+     *    </dd>
+     *    <dt>marketingUrl:</dt>
+     *        <dd>
+     *        The URL stem for the Evernote corporate marketing website, e.g. http://www.evernote.com.
+     *        This stem can be used to compose website URLs. For example, the URL of the Evernote
+     *        Trunk is composed by appending "/about/trunk/" to the value of marketingUrl.
+     *        </dd>
+     *    <dt>supportUrl:</dt>
+     *        <dd>
+     *        The full URL for the Evernote customer support website, e.g. https://support.evernote.com.
+     *        </dd>
+     *    <dt>accountEmailDomain:</dt>
+     *        <dd>
+     *        The domain used for an Evernote user's incoming email address, which allows notes to
+     *        be emailed into an account. E.g. m.evernote.com.
+     *        </dd>
+     *    <dt>enableFacebookSharing:</dt>
+     *        <dd>
+     *        Whether the client application should enable sharing of notes on Facebook.
+     *        </dd>
+     *    <dt>enableGiftSubscriptions:</dt>
+     *        <dd>
+     *        Whether the client application should enable gift subscriptions.
+     *        </dd>
+     *    <dt>enableSupportTickets:</dt>
+     *        <dd>
+     *        Whether the client application should enable in-client creation of support tickets.
+     *        </dd>
+     *    <dt>enableSharedNotebooks:</dt>
+     *        <dd>
+     *        Whether the client application should enable shared notebooks.
+     *        </dd>
+     *    <dt>enableSingleNoteSharing:</dt>
+     *        <dd>
+     *        Whether the client application should enable single note sharing.
+     *        </dd>
+     *    <dt>enableSponsoredAccounts:</dt>
+     *        <dd>
+     *        Whether the client application should enable sponsored accounts.
+     *        </dd>
+     *    <dt>enableTwitterSharing:</dt>
+     *        <dd>
+     *        Whether the client application should enable sharing of notes on Twitter.
+     *        </dd>
+     *    </dl>
+     */
+    class BootstrapSettings {
+        serviceHost: string;
+        marketingUrl: string;
+        supportUrl: string;
+        accountEmailDomain: string;
+        enableFacebookSharing: boolean;
+        enableGiftSubscriptions: boolean;
+        enableSupportTickets: boolean;
+        enableSharedNotebooks: boolean;
+        enableSingleNoteSharing: boolean;
+        enableSponsoredAccounts: boolean;
+        enableTwitterSharing: boolean;
+        enableLinkedInSharing: boolean;
+        enablePublicNotebooks: boolean;
+
+        constructor(args?: { serviceHost: string; marketingUrl: string; supportUrl: string; accountEmailDomain: string; enableFacebookSharing?: boolean; enableGiftSubscriptions?: boolean; enableSupportTickets?: boolean; enableSharedNotebooks?: boolean; enableSingleNoteSharing?: boolean; enableSponsoredAccounts?: boolean; enableTwitterSharing?: boolean; enableLinkedInSharing?: boolean; enablePublicNotebooks?: boolean; });
+    }
+
+    /**
+     *    This structure describes a collection of bootstrap settings.
+     * <dl>
+     *    <dt>name:</dt>
+     *        <dd>
+     *        The unique name of the profile, which is guaranteed to remain consistent across
+     *        calls to getBootstrapInfo.
+     *        </dd>
+     *    <dt>settings:</dt>
+     *        <dd>
+     *        The settings for this profile.
+     *        </dd>
+     *    </dl>
+     */
+    class BootstrapProfile {
+        name: string;
+        settings: BootstrapSettings;
+
+        constructor(args?: { name: string; settings: BootstrapSettings; });
+    }
+
+    /**
+     *    This structure describes a collection of bootstrap profiles.
+     * <dl>
+     *    <dt>profiles:</dt>
+     *        <dd>
+     *        List of one or more bootstrap profiles, in descending
+     *        preference order.
+     *        </dd>
+     *    </dl>
+     */
+    class BootstrapInfo {
+        profiles: BootstrapProfile[];
+
+        constructor(args?: { profiles: BootstrapProfile[]; });
+    }
+
+    /**
+     * The major version number for the current revision of the EDAM protocol.
+     * Clients pass this to the service using UserStore.checkVersion at the
+     * beginning of a session to confirm that they are not out of date.
+     */
+    var EDAM_VERSION_MAJOR: number;
+
+    /**
+     * The minor version number for the current revision of the EDAM protocol.
+     * Clients pass this to the service using UserStore.checkVersion at the
+     * beginning of a session to confirm that they are not out of date.
+     */
+    var EDAM_VERSION_MINOR: number;
+
+}
diff --git a/evernote/tsconfig.json b/evernote/tsconfig.json
new file mode 100644
index 0000000000..6be1d71870
--- /dev/null
+++ b/evernote/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "evernote-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/exit/exit-tests.ts b/exit/exit-tests.ts
index 0b5b51dc8f..2a6865cf98 100644
--- a/exit/exit-tests.ts
+++ b/exit/exit-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="exit.d.ts" />
 
 import exit = require('exit');
 
diff --git a/exit/exit.d.ts b/exit/exit.d.ts
deleted file mode 100644
index 76443a382c..0000000000
--- a/exit/exit.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for exit 0.1.2
-// Project: https://github.com/cowboy/node-exit
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'exit' {
-	function exit(code: number): void;
-	export = exit;
-}
diff --git a/exit/index.d.ts b/exit/index.d.ts
new file mode 100644
index 0000000000..bab76c5513
--- /dev/null
+++ b/exit/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for exit 0.1.2
+// Project: https://github.com/cowboy/node-exit
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function exit(code: number): void;
+export = exit;
diff --git a/exit/tsconfig.json b/exit/tsconfig.json
new file mode 100644
index 0000000000..9dc672a970
--- /dev/null
+++ b/exit/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "exit-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/expect.js/expect.js-commonjs-tests.ts b/expect.js/expect.js-commonjs-tests.ts
index 58e1a34588..52442be9a2 100644
--- a/expect.js/expect.js-commonjs-tests.ts
+++ b/expect.js/expect.js-commonjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="expect.js.d.ts" />
+
 
 import expect = require("expect.js");
 
diff --git a/expect.js/expect.js-tests.ts b/expect.js/expect.js-tests.ts
index 38b5ab3a83..77ce3ea30e 100644
--- a/expect.js/expect.js-tests.ts
+++ b/expect.js/expect.js-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="expect.js.d.ts" />
+
 
 function test_expect() {
     expect();
diff --git a/expect.js/expect.js.d.ts b/expect.js/index.d.ts
similarity index 100%
rename from expect.js/expect.js.d.ts
rename to expect.js/index.d.ts
diff --git a/expect.js/tsconfig.json b/expect.js/tsconfig.json
new file mode 100644
index 0000000000..106d16dcb2
--- /dev/null
+++ b/expect.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "expect.js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/expect/expect-tests.ts b/expect/expect-tests.ts
index a0d2bf792b..09277eec1f 100644
--- a/expect/expect-tests.ts
+++ b/expect/expect-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="./expect.d.ts" />
-/// <reference path="../mocha/mocha.d.ts"" />
+
+/// <reference types="mocha"" />
 
 import expect,
       {Expectation, Extension, Spy, createSpy, isSpy, assert, spyOn, extend, restoreSpies}
diff --git a/expect/expect.d.ts b/expect/expect.d.ts
deleted file mode 100644
index 038ae5111a..0000000000
--- a/expect/expect.d.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-// Type definitions for Expect v1.13.4
-// Project: https://github.com/mjackson/expect
-// Definitions by: Justin Reidy <https://github.com/jmreidy/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "expect" {
-    export class Expectation {
-      constructor(actual:any);
-      toExist(message?:string):Expectation;
-      toBeTruthy(message?:string):Expectation;
-      toNotExist(message?:string):Expectation;
-      toBeFalsy(message?:string):Expectation;
-      toBe(value:any, message?:string):Expectation;
-      toNotBe(value:any, message?:string):Expectation;
-      toEqual(value:any, message?:string):Expectation;
-      toNotEqual(value:any, message?:string):Expectation;
-      toThrow(value?:any, message?:string):Expectation;
-      toNotThrow(value?:any, message?:string):Expectation;
-      toBeA(value:any, message?:string):Expectation;
-      toBeAn(value:any, message?:string):Expectation;
-      toNotBeA(value:any, message?:string):Expectation;
-      toNotBeAn(value:any, message?:string):Expectation;
-      toMatch(value:any, message?:string):Expectation;
-      toNotMatch(value:any, message?:string):Expectation;
-      toBeLessThan(value:any, message?:string):Expectation;
-      toBeFewerThan(value:any, message?:string):Expectation;
-      toBeGreaterThan(value:any, message?:string):Expectation;
-      toBeMoreThan(value:any, message?:string):Expectation;
-      toInclude(value:any, compareValues?:any, message?:string):Expectation;
-      toContain(value:any, compareValues?:any, message?:string):Expectation;
-      toExclude(value:any, compareValues?:any, message?:string):Expectation;
-      toNotContain(value:any, compareValues?:any, message?:string):Expectation;
-      toHaveBeenCalled(message?:string):Expectation;
-      toHaveBeenCalledWith(...args:Array<any>):Expectation;
-      toNotHaveBeenCalled(message?:string):Expectation;
-      withContext(context:any):Expectation;
-      withArgs(...args:Array<any>):Expectation;
-    }
-
-    export interface Extension {
-      [name:string]:(args?:Array<any>) => void;
-    }
-
-    export interface Call {
-      context: Spy;
-      arguments: Array<any>;
-    }
-
-    export interface Spy {
-      __isSpy:Boolean;
-      calls:Array<Call>;
-      andCall(fn:Function):Spy;
-      andCallThrough():Spy;
-      andThrow(object:Object):Spy;
-      andReturn(value:any):Spy;
-      getLastCall():Call;
-      restore():void;
-      destroy():void;
-    }
-
-    function expect(actual:any):Expectation;
-
-    export function createSpy(fn?:Function, restore?:Function):Spy;
-    export function spyOn(object:Object, methodName:string):Spy;
-    export function isSpy(object:any):Boolean;
-    export function restoreSpies():void;
-    export function assert(condition:any, messageFormat:string, ...extraArgs:Array<any>):void;
-    export function extend(extension:Extension):void;
-
-    export default expect;
-}
diff --git a/expect/index.d.ts b/expect/index.d.ts
new file mode 100644
index 0000000000..f2c25f6225
--- /dev/null
+++ b/expect/index.d.ts
@@ -0,0 +1,70 @@
+// Type definitions for Expect v1.13.4
+// Project: https://github.com/mjackson/expect
+// Definitions by: Justin Reidy <https://github.com/jmreidy/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export declare class Expectation {
+    constructor(actual: any);
+    toExist(message?: string): Expectation;
+    toBeTruthy(message?: string): Expectation;
+    toNotExist(message?: string): Expectation;
+    toBeFalsy(message?: string): Expectation;
+    toBe(value: any, message?: string): Expectation;
+    toNotBe(value: any, message?: string): Expectation;
+    toEqual(value: any, message?: string): Expectation;
+    toNotEqual(value: any, message?: string): Expectation;
+    toThrow(value?: any, message?: string): Expectation;
+    toNotThrow(value?: any, message?: string): Expectation;
+    toBeA(value: any, message?: string): Expectation;
+    toBeAn(value: any, message?: string): Expectation;
+    toNotBeA(value: any, message?: string): Expectation;
+    toNotBeAn(value: any, message?: string): Expectation;
+    toMatch(value: any, message?: string): Expectation;
+    toNotMatch(value: any, message?: string): Expectation;
+    toBeLessThan(value: any, message?: string): Expectation;
+    toBeFewerThan(value: any, message?: string): Expectation;
+    toBeGreaterThan(value: any, message?: string): Expectation;
+    toBeMoreThan(value: any, message?: string): Expectation;
+    toInclude(value: any, compareValues?: any, message?: string): Expectation;
+    toContain(value: any, compareValues?: any, message?: string): Expectation;
+    toExclude(value: any, compareValues?: any, message?: string): Expectation;
+    toNotContain(value: any, compareValues?: any, message?: string): Expectation;
+    toHaveBeenCalled(message?: string): Expectation;
+    toHaveBeenCalledWith(...args: Array<any>): Expectation;
+    toNotHaveBeenCalled(message?: string): Expectation;
+    withContext(context: any): Expectation;
+    withArgs(...args: Array<any>): Expectation;
+}
+
+export interface Extension {
+    [name: string]: (args?: Array<any>) => void;
+}
+
+export interface Call {
+    context: Spy;
+    arguments: Array<any>;
+}
+
+export interface Spy {
+    __isSpy: Boolean;
+    calls: Array<Call>;
+    andCall(fn: Function): Spy;
+    andCallThrough(): Spy;
+    andThrow(object: Object): Spy;
+    andReturn(value: any): Spy;
+    getLastCall(): Call;
+    restore(): void;
+    destroy(): void;
+}
+
+declare function expect(actual: any): Expectation;
+
+export declare function createSpy(fn?: Function, restore?: Function): Spy;
+export declare function spyOn(object: Object, methodName: string): Spy;
+export declare function isSpy(object: any): Boolean;
+export declare function restoreSpies(): void;
+export declare function assert(condition: any, messageFormat: string, ...extraArgs: Array<any>): void;
+export declare function extend(extension: Extension): void;
+
+export default expect;
diff --git a/expect/tsconfig.json b/expect/tsconfig.json
new file mode 100644
index 0000000000..c044132cc7
--- /dev/null
+++ b/expect/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "expect-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/expectations/expectations-tests.ts b/expectations/expectations-tests.ts
index 17192cbe8c..b0cef0aa0f 100644
--- a/expectations/expectations-tests.ts
+++ b/expectations/expectations-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path='../mocha/mocha.d.ts' />
-
-/// <reference path='expectations.d.ts' />
+/// <reference types="mocha" />
 
 // transplant from https://github.com/spmason/expectations/blob/695c25bd35bb1751533a8082a5aa378e3e1b381f/test/expect.tests.js
 
diff --git a/expectations/expectations.d.ts b/expectations/index.d.ts
similarity index 100%
rename from expectations/expectations.d.ts
rename to expectations/index.d.ts
diff --git a/expectations/tsconfig.json b/expectations/tsconfig.json
new file mode 100644
index 0000000000..b12eccd9fb
--- /dev/null
+++ b/expectations/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "expectations-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/express-brute-memcached/express-brute-memcached-tests.ts b/express-brute-memcached/express-brute-memcached-tests.ts
index 4efb4bdb56..37dadf6189 100644
--- a/express-brute-memcached/express-brute-memcached-tests.ts
+++ b/express-brute-memcached/express-brute-memcached-tests.ts
@@ -1,7 +1,3 @@
-/// <reference path="../express-brute/express-brute.d.ts"/>
-/// <reference path="../mongodb/mongodb.d.ts"/>
-/// <reference path="express-brute-memcached.d.ts"/>
-
 import * as express from "express";
 import * as ExpressBrute from "express-brute";
 import MemcachedStore from "express-brute-memcached";
diff --git a/express-brute-memcached/express-brute-memcached.d.ts b/express-brute-memcached/express-brute-memcached.d.ts
deleted file mode 100644
index 6fcee383fa..0000000000
--- a/express-brute-memcached/express-brute-memcached.d.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-// Type definitions for express-brute-memcached
-// Project: https://github.com/AdamPflug/express-brute-memcached
-// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "express-brute-memcached" {
-    /**
-     * @summary Memcached options.
-     * @interface
-     */
-    interface MemcachedStoreOptions {
-         prefix: string;
-
-         /**
-          * @summary Maximum key size allowed.
-          * @type {number}
-          */
-         maxKeySize: number;
-
-         /**
-          * @summary Maximum expiration time of keys (in seconds).
-          * @type {number}
-          */
-         maxExpiration: number;
-
-         /**
-          * @summary Maximum size of a value.
-          * @type {number}
-          */
-         maxValue: number;
-
-         /**
-          * @summary Maximum size of the connection pool.
-          * @type {number}
-          */
-         poolSize: number;
-
-         /**
-          * @summary Hashing algorithm used to generate the  hashRing  values
-          * @type {string}
-          */
-         algorithm: string;
-
-         /**
-          * @summary Time between reconnection attempts (in milliseconds).
-          * @type {number}
-          */
-         reconnect: number;
-
-         /**
-          * @summary Time after which Memcached sends a connection timeout (in milliseconds).
-          * @type {number}
-          */
-         timeout: number;
-
-         /**
-          * @summary Number of socket allocation retries per request.
-          * @type {number}
-          */
-         retries: number;
-
-         /**
-          * @summary Number of failed-attempts to a server before it is regarded as 'dead'.
-          * @type {number}
-          */
-         failures: number;
-
-         /**
-          * @summary Time between a server failure and an attempt to set it up back in service.
-          * @type {number}
-          */
-         retry: number;
-
-         /**
-          * @summary If true, authorizes the automatic removal of dead servers from the pool.
-          * @type {boolean}
-          */
-         remove: boolean;
-
-         /**
-          * @summary An array of  server_locations  to replace servers that fail and that are removed from the consistent hashing scheme.
-          * @type {Array}
-          */
-         failOverServers: Array<any>;
-
-         /**
-          * @summary True, whether to use  md5  as hashing scheme when keys exceed  maxKeySize .
-          * @type
-          */
-         keyCompression: boolean;
-
-         /**
-          * @summary Idle timeout for the connections.
-          * @type {number}
-          */
-         idle: number;
-    }
-
-    /**
-     * @summary A memcached store adapter.
-     * @class
-     */
-    export default class MemcachedStore {
-        /**
-         * @summary Constructor.
-         * @constructor
-         * @param {string|Array}    hosts   The collection.
-         * @param {Object}          options The otpions.
-         */
-        constructor(hosts: string|Array<string>, options?: MemcachedStoreOptions);
-    }
-}
diff --git a/express-brute-memcached/index.d.ts b/express-brute-memcached/index.d.ts
new file mode 100644
index 0000000000..8930045ee3
--- /dev/null
+++ b/express-brute-memcached/index.d.ts
@@ -0,0 +1,110 @@
+// Type definitions for express-brute-memcached
+// Project: https://github.com/AdamPflug/express-brute-memcached
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * @summary Memcached options.
+ * @interface
+ */
+export interface MemcachedStoreOptions {
+    prefix: string;
+
+    /**
+     * @summary Maximum key size allowed.
+     * @type {number}
+     */
+    maxKeySize: number;
+
+    /**
+     * @summary Maximum expiration time of keys (in seconds).
+     * @type {number}
+     */
+    maxExpiration: number;
+
+    /**
+     * @summary Maximum size of a value.
+     * @type {number}
+     */
+    maxValue: number;
+
+    /**
+     * @summary Maximum size of the connection pool.
+     * @type {number}
+     */
+    poolSize: number;
+
+    /**
+     * @summary Hashing algorithm used to generate the  hashRing  values
+     * @type {string}
+     */
+    algorithm: string;
+
+    /**
+     * @summary Time between reconnection attempts (in milliseconds).
+     * @type {number}
+     */
+    reconnect: number;
+
+    /**
+     * @summary Time after which Memcached sends a connection timeout (in milliseconds).
+     * @type {number}
+     */
+    timeout: number;
+
+    /**
+     * @summary Number of socket allocation retries per request.
+     * @type {number}
+     */
+    retries: number;
+
+    /**
+     * @summary Number of failed-attempts to a server before it is regarded as 'dead'.
+     * @type {number}
+     */
+    failures: number;
+
+    /**
+     * @summary Time between a server failure and an attempt to set it up back in service.
+     * @type {number}
+     */
+    retry: number;
+
+    /**
+     * @summary If true, authorizes the automatic removal of dead servers from the pool.
+     * @type {boolean}
+     */
+    remove: boolean;
+
+    /**
+     * @summary An array of  server_locations  to replace servers that fail and that are removed from the consistent hashing scheme.
+     * @type {Array}
+     */
+    failOverServers: Array<any>;
+
+    /**
+     * @summary True, whether to use  md5  as hashing scheme when keys exceed  maxKeySize .
+     * @type
+     */
+    keyCompression: boolean;
+
+    /**
+     * @summary Idle timeout for the connections.
+     * @type {number}
+     */
+    idle: number;
+}
+
+/**
+ * @summary A memcached store adapter.
+ * @class
+ */
+export default class MemcachedStore {
+    /**
+     * @summary Constructor.
+     * @constructor
+     * @param {string|Array}    hosts   The collection.
+     * @param {Object}          options The otpions.
+     */
+    constructor(hosts: string | Array<string>, options?: MemcachedStoreOptions);
+}
diff --git a/express-brute-memcached/tsconfig.json b/express-brute-memcached/tsconfig.json
new file mode 100644
index 0000000000..71c30d9bf7
--- /dev/null
+++ b/express-brute-memcached/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-brute-memcached-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/express-brute-mongo/express-brute-mongo-tests.ts b/express-brute-mongo/express-brute-mongo-tests.ts
index a4512782be..23fdab05a8 100644
--- a/express-brute-mongo/express-brute-mongo-tests.ts
+++ b/express-brute-mongo/express-brute-mongo-tests.ts
@@ -1,8 +1,4 @@
-/// <reference path="../express-brute/express-brute.d.ts"/>
-/// <reference path="../mongodb/mongodb.d.ts"/>
-/// <reference path="express-brute-mongo.d.ts"/>
-
-import express = require("express");
+import express = require("../express");
 import ExpressBrute = require("express-brute");
 import MongoStore = require("express-brute-mongo");
 import mongodb = require("mongodb");
diff --git a/express-brute-mongo/express-brute-mongo.d.ts b/express-brute-mongo/express-brute-mongo.d.ts
deleted file mode 100644
index 602a944a31..0000000000
--- a/express-brute-mongo/express-brute-mongo.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// Type definitions for express-brute-mongo
-// Project: https://github.com/auth0/express-brute-mongo
-// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "express-brute-mongo" {
-    /**
-     * @summary MongoDB store adapter.
-     * @class
-     */
-    export = class MongoStore {
-        /**
-         * @summary Constructor.
-         * @constructor
-         * @param {Function} getCollection The collection.
-         * @param {Object}   options       The otpions.
-         */
-        constructor(getCollection: (collection: any) => void, options?: Object);
-    }
-}
diff --git a/express-brute-mongo/index.d.ts b/express-brute-mongo/index.d.ts
new file mode 100644
index 0000000000..cf248f8883
--- /dev/null
+++ b/express-brute-mongo/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for express-brute-mongo
+// Project: https://github.com/auth0/express-brute-mongo
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+
+/**
+ * @summary MongoDB store adapter.
+ * @class
+ */
+export = class MongoStore {
+    /**
+     * @summary Constructor.
+     * @constructor
+     * @param {Function} getCollection The collection.
+     * @param {Object}   options       The otpions.
+     */
+    constructor(getCollection: (collection: any) => void, options?: Object);
+}
diff --git a/express-brute-mongo/tsconfig.json b/express-brute-mongo/tsconfig.json
new file mode 100644
index 0000000000..793bacc820
--- /dev/null
+++ b/express-brute-mongo/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-brute-mongo-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/express-brute/express-brute-tests.ts b/express-brute/express-brute-tests.ts
index ea0f2f5b4d..ac6a11fe9f 100644
--- a/express-brute/express-brute-tests.ts
+++ b/express-brute/express-brute-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="express-brute.d.ts"/>
-
-import express = require("express");
+import express = require("../express");
 import ExpressBrute = require("express-brute");
 
 var store = new ExpressBrute.MemoryStore();
diff --git a/express-brute/express-brute.d.ts b/express-brute/express-brute.d.ts
deleted file mode 100644
index 37df68af64..0000000000
--- a/express-brute/express-brute.d.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-// Type definitions for express-brute
-// Project: https://github.com/AdamPflug/express-brute
-// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "express-brute" {
-    import express = require("express");
-
-    /**
-     * @summary Options for {@link MemoryStore} class.
-     * @interface
-     */
-    interface MemoryStoreOptions {
-        /**
-         * @summary Key prefix.
-         * @type {string}
-         */
-        prefix: string;
-    }
-
-    /**
-     * @summary Options for {@link ExpressBrute#getMiddleware} class.
-     * @interface
-     */
-    interface ExpressBruteMiddleware {
-        /**
-         * @summary Allows you to override the value of failCallback for this middleware.
-         * @type {Function}
-         */
-        failCallback: Function;
-
-        /**
-         * @summary Disregard IP address when matching requests if set to true. Defaults to false.
-         * @type {boolean}
-         */
-        ignoreIP: boolean;
-
-        /**
-         * @summary Key.
-         * @type {any}
-         */
-        key: any;
-    }
-
-    /**
-     * @summary Options for {@link ExpressBrute} class.
-     * @interface
-     */
-    interface ExpressBruteOptions {
-        freeRetries: number;
-        proxyDepth: number;
-        attachResetToRequest: boolean;
-        refreshTimeoutOnRequest: boolean;
-        minWait: number;
-        maxWait: number;
-        lifetime: number;
-        failCallback: (req: express.Request, res: express.Response, next: Function, nextValidRequestDate: any) => void;
-        handleStoreError: any;
-}
-
-/**
- * @summary Middleware.
- * @class
- */
-class ExpressBrute {
-    /**
-     * @summary Constructor.
-     * @constructor
-     * @param {any} store The store.
-     */
-    constructor(store: any);
-
-    /**
-     * @summary Generates middleware that will bounce requests with the same key and IP address that happen faster than the current wait time by calling failCallback.
-     * @param {Object} options The options.
-     */
-    getMiddleware(options: ExpressBruteMiddleware): express.RequestHandler;
-
-    /**
-     * @summary Uses the current proxy trust settings to get the current IP from a request object.
-     * @param {Request} request The HTTP request.
-     * @return {RequestHandler} The Request handler.
-     */
-    getIPFromRequest(request: express.Request): express.RequestHandler;
-
-    /**
-     * @summary Middleware that will bounce requests that happen faster than the current wait time by calling failCallback.
-     * @param {Request}     request     The HTTP request.
-     * @param {Response}    response    The HTTP response.
-     * @param {Function}    next        The next middleware.
-     * @return {RequestHandler} The Request handler.
-     */
-    prevent(request: express.Request, response: express.Response, next: Function): express.RequestHandler;
-
-    /**
-     * @summary Resets the wait time between requests back to its initial value.
-     * @param {string}      ip      The IP address.
-     * @param {string}      key     The key. response.
-     * @param {Function}    next    The next middleware.
-     * @return {RequestHandler} The Request handler.
-     */
-    reset(ip: string, key: string, next: Function): express.RequestHandler;
-}
-
-namespace ExpressBrute {
-    /**
-     * @summary In-memory store.
-     * @class
-     */
-    export class MemoryStore {
-        /**
-         * @summary Constructor.
-         * @constructor
-         * @param {Object} options The options.
-         */
-        constructor(options?: MemoryStoreOptions);
-        /**
-         * @summary Gets key value.
-         * @param {string}      key     The key name.
-         * @param {Function}    callbck The callback.
-         */
-        get(key: string, callback: (error: any, data: Object) => void): void;
-
-        /**
-         * @summary Sets the key value.
-         * @param {string}      key      The name.
-         * @param {string}      value    The value.
-         * @param {number}      lifetime The lifetime.
-         * @param {Function}    callback The callback.
-         */
-        set(key: string, value: any, lifetime: number, callback: (error: any) => void): void;
-
-        /**
-         * @summary Deletes the key.
-         * @param {string}      key      The name.
-         * @param {Function}    callback The callback.
-         */
-        reset(key: string, callback: (error: any) => void): void;
-    }
-}
-
-export = ExpressBrute;
-}
diff --git a/express-brute/index.d.ts b/express-brute/index.d.ts
new file mode 100644
index 0000000000..bd378c89b3
--- /dev/null
+++ b/express-brute/index.d.ts
@@ -0,0 +1,144 @@
+// Type definitions for express-brute
+// Project: https://github.com/AdamPflug/express-brute
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+
+import express = require("../express");
+
+/**
+ * @summary Options for {@link MemoryStore} class.
+ * @interface
+ */
+interface MemoryStoreOptions {
+    /**
+     * @summary Key prefix.
+     * @type {string}
+     */
+    prefix: string;
+}
+
+/**
+ * @summary Options for {@link ExpressBrute#getMiddleware} class.
+ * @interface
+ */
+interface ExpressBruteMiddleware {
+    /**
+     * @summary Allows you to override the value of failCallback for this middleware.
+     * @type {Function}
+     */
+    failCallback: Function;
+
+    /**
+     * @summary Disregard IP address when matching requests if set to true. Defaults to false.
+     * @type {boolean}
+     */
+    ignoreIP: boolean;
+
+    /**
+     * @summary Key.
+     * @type {any}
+     */
+    key: any;
+}
+
+/**
+ * @summary Options for {@link ExpressBrute} class.
+ * @interface
+ */
+interface ExpressBruteOptions {
+    freeRetries: number;
+    proxyDepth: number;
+    attachResetToRequest: boolean;
+    refreshTimeoutOnRequest: boolean;
+    minWait: number;
+    maxWait: number;
+    lifetime: number;
+    failCallback: (req: express.Request, res: express.Response, next: Function, nextValidRequestDate: any) => void;
+    handleStoreError: any;
+}
+
+/**
+ * @summary Middleware.
+ * @class
+ */
+declare class ExpressBrute {
+    /**
+     * @summary Constructor.
+     * @constructor
+     * @param {any} store The store.
+     */
+    constructor(store: any);
+
+    /**
+     * @summary Generates middleware that will bounce requests with the same key and IP address that happen faster than the current wait time by calling failCallback.
+     * @param {Object} options The options.
+     */
+    getMiddleware(options: ExpressBruteMiddleware): express.RequestHandler;
+
+    /**
+     * @summary Uses the current proxy trust settings to get the current IP from a request object.
+     * @param {Request} request The HTTP request.
+     * @return {RequestHandler} The Request handler.
+     */
+    getIPFromRequest(request: express.Request): express.RequestHandler;
+
+    /**
+     * @summary Middleware that will bounce requests that happen faster than the current wait time by calling failCallback.
+     * @param {Request}     request     The HTTP request.
+     * @param {Response}    response    The HTTP response.
+     * @param {Function}    next        The next middleware.
+     * @return {RequestHandler} The Request handler.
+     */
+    prevent(request: express.Request, response: express.Response, next: Function): express.RequestHandler;
+
+    /**
+     * @summary Resets the wait time between requests back to its initial value.
+     * @param {string}      ip      The IP address.
+     * @param {string}      key     The key. response.
+     * @param {Function}    next    The next middleware.
+     * @return {RequestHandler} The Request handler.
+     */
+    reset(ip: string, key: string, next: Function): express.RequestHandler;
+}
+
+declare namespace ExpressBrute {
+    /**
+     * @summary In-memory store.
+     * @class
+     */
+    export class MemoryStore {
+        /**
+         * @summary Constructor.
+         * @constructor
+         * @param {Object} options The options.
+         */
+        constructor(options?: MemoryStoreOptions);
+        /**
+         * @summary Gets key value.
+         * @param {string}      key     The key name.
+         * @param {Function}    callbck The callback.
+         */
+        get(key: string, callback: (error: any, data: Object) => void): void;
+
+        /**
+         * @summary Sets the key value.
+         * @param {string}      key      The name.
+         * @param {string}      value    The value.
+         * @param {number}      lifetime The lifetime.
+         * @param {Function}    callback The callback.
+         */
+        set(key: string, value: any, lifetime: number, callback: (error: any) => void): void;
+
+        /**
+         * @summary Deletes the key.
+         * @param {string}      key      The name.
+         * @param {Function}    callback The callback.
+         */
+        reset(key: string, callback: (error: any) => void): void;
+    }
+}
+
+export = ExpressBrute;
diff --git a/express-brute/tsconfig.json b/express-brute/tsconfig.json
new file mode 100644
index 0000000000..752053d8a1
--- /dev/null
+++ b/express-brute/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-brute-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/express-debug/express-debug-tests.ts b/express-debug/express-debug-tests.ts
index 6f702856ed..270ba5db70 100644
--- a/express-debug/express-debug-tests.ts
+++ b/express-debug/express-debug-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="express-debug.d.ts" />
 
 import express = require('express');
 import debug = require('express-debug');
diff --git a/express-debug/express-debug.d.ts b/express-debug/express-debug.d.ts
deleted file mode 100644
index f4faf5ee69..0000000000
--- a/express-debug/express-debug.d.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-// Type definitions for express-debug 1.1.1
-// Project: https://github.com/devoidfury/express-debug
-// Definitions by: Federico Bond <https://github.com/federicobond/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/* =================== USAGE ===================
-
-    import debug = require('express-debug');
-    debug(app, options);
-
- =============================================== */
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "express-debug" {
-    import express = require('express');
-
-    interface CustomPanel {
-        name: string;
-
-        template: string;
-
-        process(locals: any): any;
-
-        standalone?: boolean;
-
-        initialize?(req: express.Request): void;
-
-        finalize?(req: express.Request): void;
-
-        pre_render?(req: express.Request): void;
-
-        post_render?(req: express.Request): void;
-
-        options?: any;
-    }
-
-    /**
-     * Node.js middleware for serving a favicon.
-     */
-    function debug(app: express.Application, settings?: {
-        /**
-         * How deep to recurse through printed objects. This is the default unless the
-         * print_obj function is passed an options object with a 'depth' property.
-         */
-        depth?: number;
-
-        /**
-         * Absolute path to a css file to include and override EDT's default css.
-         */
-        theme?: string;
-
-        /**
-         * Additional panels to show.
-         */
-        extra_panels?: CustomPanel[];
-
-        /**
-         * Allows changing the default panel.
-         */
-        panels?: string[];
-
-        /**
-         * Path to render standalone express-debug.
-         */
-        path?: string;
-
-        /**
-         * If you need to add arbitrary attributes to the containing element of EDT,
-         * this allows you to.
-         */
-        extra_attrs?: string;
-
-        /**
-         * Global option to determine sort order of printed object values. false for
-         * default order, true for basic default sort, or a function to use for sort.
-         */
-        sort?: boolean | ((a: number, b: number) => number);
-
-    }): void;
-
-    export = debug;
-}
diff --git a/express-debug/index.d.ts b/express-debug/index.d.ts
new file mode 100644
index 0000000000..2a0fbd6d51
--- /dev/null
+++ b/express-debug/index.d.ts
@@ -0,0 +1,82 @@
+// Type definitions for express-debug 1.1.1
+// Project: https://github.com/devoidfury/express-debug
+// Definitions by: Federico Bond <https://github.com/federicobond/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* =================== USAGE ===================
+
+    import debug = require('express-debug');
+    debug(app, options);
+
+ =============================================== */
+
+
+
+
+import express = require('express');
+
+interface CustomPanel {
+    name: string;
+
+    template: string;
+
+    process(locals: any): any;
+
+    standalone?: boolean;
+
+    initialize?(req: express.Request): void;
+
+    finalize?(req: express.Request): void;
+
+    pre_render?(req: express.Request): void;
+
+    post_render?(req: express.Request): void;
+
+    options?: any;
+}
+
+/**
+ * Node.js middleware for serving a favicon.
+ */
+declare function debug(app: express.Application, settings?: {
+    /**
+     * How deep to recurse through printed objects. This is the default unless the
+     * print_obj function is passed an options object with a 'depth' property.
+     */
+    depth?: number;
+
+    /**
+     * Absolute path to a css file to include and override EDT's default css.
+     */
+    theme?: string;
+
+    /**
+     * Additional panels to show.
+     */
+    extra_panels?: CustomPanel[];
+
+    /**
+     * Allows changing the default panel.
+     */
+    panels?: string[];
+
+    /**
+     * Path to render standalone express-debug.
+     */
+    path?: string;
+
+    /**
+     * If you need to add arbitrary attributes to the containing element of EDT,
+     * this allows you to.
+     */
+    extra_attrs?: string;
+
+    /**
+     * Global option to determine sort order of printed object values. false for
+     * default order, true for basic default sort, or a function to use for sort.
+     */
+    sort?: boolean | ((a: number, b: number) => number);
+
+}): void;
+
+export = debug;
diff --git a/express-debug/tsconfig.json b/express-debug/tsconfig.json
new file mode 100644
index 0000000000..34bc09436d
--- /dev/null
+++ b/express-debug/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-debug-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/express-graphql/express-graphql-tests.ts b/express-graphql/express-graphql-tests.ts
index ec9e48ea43..e64b1a2140 100644
--- a/express-graphql/express-graphql-tests.ts
+++ b/express-graphql/express-graphql-tests.ts
@@ -1,7 +1,5 @@
-/// <reference path="./express-graphql.d.ts" />
-/// <reference path="../express/express.d.ts" />
 
-var express = require("express");
+var express = require("../express");
 var graphqlHTTP = require("express-graphql");
 var app = express();
 
diff --git a/express-graphql/express-graphql.d.ts b/express-graphql/express-graphql.d.ts
deleted file mode 100644
index 25f36967fe..0000000000
--- a/express-graphql/express-graphql.d.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// Type definitions for express-graphql
-// Project: https://www.npmjs.org/package/express-graphql
-// Definitions by: Isman Usoh <https://github.com/isman-usoh>, Nitin Tutlani <https://github.com/nitintutlani>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "express-graphql" {
-    import { Request, Response } from "express";
-
-    /**
-     * Used to configure the graphQLHTTP middleware by providing a schema
-     * and other configuration options.
-     */
-    export type Options = ((req: Request) => OptionsObj) | OptionsObj
-    export type OptionsObj = {
-        /**
-         * A GraphQL schema from graphql-js.
-         */
-        schema: Object,
-
-        /**
-         * An object to pass as the rootValue to the graphql() function.
-         */
-        rootValue?: Object,
-
-        /**
-         * A boolean to configure whether the output should be pretty-printed.
-         */
-        pretty?: boolean,
-
-        /**
-         * An optional function which will be used to format any errors produced by
-         * fulfilling a GraphQL operation. If no function is provided, GraphQL's
-         * default spec-compliant `formatError` function will be used.
-         */
-        formatError?: Function,
-
-        /**
-         * A boolean to optionally enable GraphiQL mode.
-         */
-        graphiql?: boolean,
-    };
-
-    type Middleware = (request: Request, response: Response) => void;
-
-    /**
-     * Middleware for express; takes an options object or function as input to
-     * configure behavior, and returns an express middleware.
-     */
-    export default function graphqlHTTP(options: Options): Middleware;
-}
diff --git a/express-graphql/index.d.ts b/express-graphql/index.d.ts
new file mode 100644
index 0000000000..3645d1701d
--- /dev/null
+++ b/express-graphql/index.d.ts
@@ -0,0 +1,51 @@
+// Type definitions for express-graphql
+// Project: https://www.npmjs.org/package/express-graphql
+// Definitions by: Isman Usoh <https://github.com/isman-usoh>, Nitin Tutlani <https://github.com/nitintutlani>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+
+import { Request, Response } from "express";
+
+/**
+ * Used to configure the graphQLHTTP middleware by providing a schema
+ * and other configuration options.
+ */
+export type Options = ((req: Request) => OptionsObj) | OptionsObj
+export type OptionsObj = {
+    /**
+     * A GraphQL schema from graphql-js.
+     */
+    schema: Object,
+
+    /**
+     * An object to pass as the rootValue to the graphql() function.
+     */
+    rootValue?: Object,
+
+    /**
+     * A boolean to configure whether the output should be pretty-printed.
+     */
+    pretty?: boolean,
+
+    /**
+     * An optional function which will be used to format any errors produced by
+     * fulfilling a GraphQL operation. If no function is provided, GraphQL's
+     * default spec-compliant `formatError` function will be used.
+     */
+    formatError?: Function,
+
+    /**
+     * A boolean to optionally enable GraphiQL mode.
+     */
+    graphiql?: boolean,
+};
+
+type Middleware = (request: Request, response: Response) => void;
+
+/**
+ * Middleware for express; takes an options object or function as input to
+ * configure behavior, and returns an express middleware.
+ */
+export default function graphqlHTTP(options: Options): Middleware;
diff --git a/express-graphql/tsconfig.json b/express-graphql/tsconfig.json
new file mode 100644
index 0000000000..0cd6b6642b
--- /dev/null
+++ b/express-graphql/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-graphql-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/express-handlebars/express-handlebars-tests.ts b/express-handlebars/express-handlebars-tests.ts
index 982ff23679..4251c985fe 100644
--- a/express-handlebars/express-handlebars-tests.ts
+++ b/express-handlebars/express-handlebars-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../express/express.d.ts" />
-/// <reference path="express-handlebars.d.ts" />
+/// <reference types="node" />
+
+
 
 import express = require('express');
 import exphbs = require('express-handlebars');
diff --git a/express-handlebars/express-handlebars.d.ts b/express-handlebars/index.d.ts
similarity index 100%
rename from express-handlebars/express-handlebars.d.ts
rename to express-handlebars/index.d.ts
diff --git a/express-handlebars/tsconfig.json b/express-handlebars/tsconfig.json
new file mode 100644
index 0000000000..d453c5d28e
--- /dev/null
+++ b/express-handlebars/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-handlebars-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/express-jwt/express-jwt-tests.ts b/express-jwt/express-jwt-tests.ts
index 64bda77f25..190c85ce4b 100644
--- a/express-jwt/express-jwt-tests.ts
+++ b/express-jwt/express-jwt-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./express-jwt.d.ts" />
 
 import express = require('express');
 import jwt = require('express-jwt');
diff --git a/express-jwt/express-jwt.d.ts b/express-jwt/express-jwt.d.ts
deleted file mode 100644
index 1aec6606fe..0000000000
--- a/express-jwt/express-jwt.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-// Type definitions for express-jwt
-// Project: https://www.npmjs.org/package/express-jwt
-// Definitions by: Wonshik Kim <https://github.com/wokim/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-/// <reference path="../express-unless/express-unless.d.ts" />
-
-declare module "express-jwt" {
-    import express = require('express');
-    import unless = require('express-unless');
-
-    function jwt(options: jwt.Options): jwt.RequestHandler;
-
-    interface IDoneCallback<T> {
-        (err: Error, result: T): void;
-    }
-
-    type ICallback = <T>(req: express.Request, payload: T, done: IDoneCallback<boolean>) => void;
-
-    namespace jwt {
-        export interface Options {
-            secret: string|Buffer|ICallback;
-            userProperty?: string;
-            skip?: string[];
-            credentialsRequired?: boolean;
-            isRevoked?: boolean;
-            requestProperty?: string;
-            getToken?: ICallback;
-            [property: string]: any;
-        }
-        export interface RequestHandler extends express.RequestHandler {
-            unless?: typeof unless;
-        }
-    }
-    export = jwt;
-}
diff --git a/express-jwt/index.d.ts b/express-jwt/index.d.ts
new file mode 100644
index 0000000000..960021c647
--- /dev/null
+++ b/express-jwt/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for express-jwt
+// Project: https://www.npmjs.org/package/express-jwt
+// Definitions by: Wonshik Kim <https://github.com/wokim/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+import express = require('express');
+import unless = require('express-unless');
+
+declare function jwt(options: jwt.Options): jwt.RequestHandler;
+
+interface IDoneCallback<T> {
+    (err: Error, result: T): void;
+}
+
+type ICallback = <T>(req: express.Request, payload: T, done: IDoneCallback<boolean>) => void;
+
+declare namespace jwt {
+    export interface Options {
+        secret: string | Buffer | ICallback;
+        userProperty?: string;
+        skip?: string[];
+        credentialsRequired?: boolean;
+        isRevoked?: boolean;
+        requestProperty?: string;
+        getToken?: ICallback;
+        [property: string]: any;
+    }
+    export interface RequestHandler extends express.RequestHandler {
+        unless?: typeof unless;
+    }
+}
+export = jwt;
diff --git a/express-jwt/tsconfig.json b/express-jwt/tsconfig.json
new file mode 100644
index 0000000000..5c0d943fbb
--- /dev/null
+++ b/express-jwt/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-jwt-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/express-less/express-less-tests.ts b/express-less/express-less-tests.ts
index 3fee687f24..621e89c267 100644
--- a/express-less/express-less-tests.ts
+++ b/express-less/express-less-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./express-less.d.ts" />
 
 import express = require('express');
 import expressLess = require('express-less');
diff --git a/express-less/express-less.d.ts b/express-less/express-less.d.ts
deleted file mode 100644
index be52234d20..0000000000
--- a/express-less/express-less.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Type definitions for express-less
-// Project: https://www.npmjs.com/package/express-less
-// Definitions by: xyb <https://github.com/xieyubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "express-less" {
-    import express = require('express');
-
-    function less(root: string, options?: less.Options): express.RequestHandler;
-
-    namespace less {
-        export interface Options {
-            debug?: boolean;
-            compress?: boolean;
-        }
-    }
-
-    export = less;
-}
diff --git a/express-less/index.d.ts b/express-less/index.d.ts
new file mode 100644
index 0000000000..c414e759f7
--- /dev/null
+++ b/express-less/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for express-less
+// Project: https://www.npmjs.com/package/express-less
+// Definitions by: xyb <https://github.com/xieyubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+
+import express = require('express');
+
+declare function less(root: string, options?: less.Options): express.RequestHandler;
+
+declare namespace less {
+    export interface Options {
+        debug?: boolean;
+        compress?: boolean;
+    }
+}
+
+export = less;
diff --git a/express-less/tsconfig.json b/express-less/tsconfig.json
new file mode 100644
index 0000000000..a7b898cb88
--- /dev/null
+++ b/express-less/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-less-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/express-minify/express-minify-tests.ts b/express-minify/express-minify-tests.ts
index b6ff963cef..ed02137f64 100644
--- a/express-minify/express-minify-tests.ts
+++ b/express-minify/express-minify-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="express-minify.d.ts" />
+
 
 import express = require('express');
 import minify = require('express-minify');
diff --git a/express-minify/express-minify.d.ts b/express-minify/express-minify.d.ts
deleted file mode 100644
index f3f7d15c0b..0000000000
--- a/express-minify/express-minify.d.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-// Type definitions for express-minify v0.1.6
-// Project: https://github.com/SummerWish/express-minify
-// Definitions by: Borislav Zhivkov <https://github.com/borislavjivkov/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-/// <reference path="../uglify-js/uglify-js.d.ts" />
-
-declare namespace Express {
-    interface Response extends ExpressMinifyInterfaces.ExpressMinifyResponse {}
-}
-
-declare namespace ExpressMinifyInterfaces {
-    interface ExpressMinifyOptions {
-        /**
-         * The directory for cache storage (must be writeable). Pass false to cache in the memory (not recommended).
-         */
-        cache?: string | boolean;
-
-        /**
-         * Customize UglifyJS instance (require('uglify-js')).
-         */
-        uglifyJS?: NodeRequire;
-
-        /**
-         * Customize cssmin instance (require('cssmin')).
-         */
-        cssmin?: NodeRequire;
-
-        /**
-         * Handle compiling errors or minifying errors. You can determine what to respond when facing such errors.
-         */
-        onerror?: Function;
-
-        /**
-         * Matches JavaScript content-type.
-         */
-        js_match?: RegExp;
-
-        /**
-         * Matches CSS content-type.
-         */
-        css_match?: RegExp;
-
-        /**
-         * Matches SASS content-type.
-         */
-        sass_match?: RegExp;
-
-        /**
-         * Matches LESS content-type.
-         */
-        less_match?: RegExp;
-
-        /**
-         * Matches Stylus content-type.
-         */
-        stylus_match?: RegExp;
-
-        /**
-         * Matches CoffeeScript content-type.
-         */
-        coffee_match?: RegExp;
-
-        /**
-         * Matches JSON content-type.
-         */
-        json_match?: RegExp;
-    }
-
-    interface ExpressMinifyResponse {
-        /**
-         * Pass true to disable all kind of processing: no compiling, no minifying.
-         */
-        _skip: boolean;
-
-        /**
-         * Pass true to disable minifying, suitable for already-minified contents.
-         */
-        _no_minify: boolean;
-
-        /**
-         * Pass true to disable caching the response data, suitable for dynamic contents.
-         */
-        _no_cache: boolean;
-
-        /**
-         * Pass false to disable mangling names
-         */
-        _uglifyMangle: boolean;
-
-        /**
-         * Pass an object if you wish to specify additional UglifyJS
-         */
-        _uglifyOutput: Object;
-
-        /**
-         * Pass an object to specify custom UglifyJS compressor options (pass false to skip).
-         */
-        _uglifyCompress: Object | boolean;
-    }
-}
-
-declare module "express-minify" {
-    import express = require('express');
-
-    function minify(options?: ExpressMinifyInterfaces.ExpressMinifyOptions): express.RequestHandler;
-    export = minify;
-}
diff --git a/express-minify/index.d.ts b/express-minify/index.d.ts
new file mode 100644
index 0000000000..60bccf44ff
--- /dev/null
+++ b/express-minify/index.d.ts
@@ -0,0 +1,108 @@
+// Type definitions for express-minify v0.1.6
+// Project: https://github.com/SummerWish/express-minify
+// Definitions by: Borislav Zhivkov <https://github.com/borislavjivkov/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare namespace Express {
+    interface Response extends ExpressMinifyInterfaces.ExpressMinifyResponse {}
+}
+
+declare namespace ExpressMinifyInterfaces {
+    interface ExpressMinifyOptions {
+        /**
+         * The directory for cache storage (must be writeable). Pass false to cache in the memory (not recommended).
+         */
+        cache?: string | boolean;
+
+        /**
+         * Customize UglifyJS instance (require('uglify-js')).
+         */
+        uglifyJS?: NodeRequire;
+
+        /**
+         * Customize cssmin instance (require('cssmin')).
+         */
+        cssmin?: NodeRequire;
+
+        /**
+         * Handle compiling errors or minifying errors. You can determine what to respond when facing such errors.
+         */
+        onerror?: Function;
+
+        /**
+         * Matches JavaScript content-type.
+         */
+        js_match?: RegExp;
+
+        /**
+         * Matches CSS content-type.
+         */
+        css_match?: RegExp;
+
+        /**
+         * Matches SASS content-type.
+         */
+        sass_match?: RegExp;
+
+        /**
+         * Matches LESS content-type.
+         */
+        less_match?: RegExp;
+
+        /**
+         * Matches Stylus content-type.
+         */
+        stylus_match?: RegExp;
+
+        /**
+         * Matches CoffeeScript content-type.
+         */
+        coffee_match?: RegExp;
+
+        /**
+         * Matches JSON content-type.
+         */
+        json_match?: RegExp;
+    }
+
+    interface ExpressMinifyResponse {
+        /**
+         * Pass true to disable all kind of processing: no compiling, no minifying.
+         */
+        _skip: boolean;
+
+        /**
+         * Pass true to disable minifying, suitable for already-minified contents.
+         */
+        _no_minify: boolean;
+
+        /**
+         * Pass true to disable caching the response data, suitable for dynamic contents.
+         */
+        _no_cache: boolean;
+
+        /**
+         * Pass false to disable mangling names
+         */
+        _uglifyMangle: boolean;
+
+        /**
+         * Pass an object if you wish to specify additional UglifyJS
+         */
+        _uglifyOutput: Object;
+
+        /**
+         * Pass an object to specify custom UglifyJS compressor options (pass false to skip).
+         */
+        _uglifyCompress: Object | boolean;
+    }
+}
+
+declare module "express-minify" {
+    import express = require('express');
+
+    function minify(options?: ExpressMinifyInterfaces.ExpressMinifyOptions): express.RequestHandler;
+    export = minify;
+}
diff --git a/express-minify/tsconfig.json b/express-minify/tsconfig.json
new file mode 100644
index 0000000000..809a57e045
--- /dev/null
+++ b/express-minify/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-minify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/express-myconnection/express-myconnection-tests.ts b/express-myconnection/express-myconnection-tests.ts
index e789f9cb52..ea744f926b 100644
--- a/express-myconnection/express-myconnection-tests.ts
+++ b/express-myconnection/express-myconnection-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./express-myconnection.d.ts" />
+
 
 import express = require('express');
 import mysql = require('mysql');
diff --git a/express-myconnection/express-myconnection.d.ts b/express-myconnection/express-myconnection.d.ts
deleted file mode 100644
index 5901c6c6ca..0000000000
--- a/express-myconnection/express-myconnection.d.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// Type definitions for express-myconnection v1.0.4
-// Project: https://www.npmjs.org/package/express-myconnection
-// Definitions by: Michael Ferris <https://github.com/Cellule/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-/// <reference path="../mysql/mysql.d.ts" />
-
-declare namespace mysql{
-  export interface IConnection {}
-  export interface IError {}
-}
-
-declare namespace Express {
-
-  export interface Request {
-    getConnection?: (callback: (err: mysql.IError, connection: mysql.IConnection) => void) => void;
-  }
-}
-
-declare module "express-myconnection" {
-  import express = require('express');
-  import mysql = require('mysql');
-
-  function connection(mysql: mysql.IMySql, dbConfig: mysql.IConnectionConfig, strategy: string): express.RequestHandler;
-
-  export = connection;
-}
-
diff --git a/express-myconnection/index.d.ts b/express-myconnection/index.d.ts
new file mode 100644
index 0000000000..d1c7132daf
--- /dev/null
+++ b/express-myconnection/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for express-myconnection v1.0.4
+// Project: https://www.npmjs.org/package/express-myconnection
+// Definitions by: Michael Ferris <https://github.com/Cellule/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare namespace mysql{
+  export interface IConnection {}
+  export interface IError {}
+}
+
+declare namespace Express {
+
+  export interface Request {
+    getConnection?: (callback: (err: mysql.IError, connection: mysql.IConnection) => void) => void;
+  }
+}
+
+declare module "express-myconnection" {
+  import express = require('express');
+  import mysql = require('mysql');
+
+  function connection(mysql: mysql.IMySql, dbConfig: mysql.IConnectionConfig, strategy: string): express.RequestHandler;
+
+  export = connection;
+}
+
diff --git a/express-myconnection/tsconfig.json b/express-myconnection/tsconfig.json
new file mode 100644
index 0000000000..315e915f93
--- /dev/null
+++ b/express-myconnection/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-myconnection-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/express-openapi/express-openapi-tests.ts b/express-openapi/express-openapi-tests.ts
index a17e21bff3..a72b6f2e48 100644
--- a/express-openapi/express-openapi-tests.ts
+++ b/express-openapi/express-openapi-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../express/express.d.ts" />
-/// <reference path="express-openapi.d.ts" />
+
 
 import express = require('express');
 import openapi = require('express-openapi');
diff --git a/express-openapi/express-openapi.d.ts b/express-openapi/express-openapi.d.ts
deleted file mode 100644
index 6487f230d7..0000000000
--- a/express-openapi/express-openapi.d.ts
+++ /dev/null
@@ -1,351 +0,0 @@
-// Type definitions for express-openapi 0.11.x
-// Project: https://github.com/kogosoftwarellc/express-openapi
-// Definitions by: TANAKA Koichi <https://github.com/mugeso/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/* =================== USAGE ===================
- import express = require('express');
- import bodyParser = require('body-parser');
- import openapi = require('express-openapi');
- import cors = require('cors');
-
- var app = express();
- app.use(cors());
- app.use(bodyParser.json());
-
- var api: openapi.InitializedApi;
- api = openapi.initialize({
- apiDoc: require('./api-doc.js'),
- app: app,
- routes: './api-routes'
- });
-
- app.use(function(err, req, res, next) {
- res.status(err.status).json(err);
- });
-
- app.listen(3000);
- =============================================== */
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "express-openapi" {
-    import express = require('express');
-
-    export function initialize(args:Args):InitializedApi;
-
-    export interface InitializedApi {
-        apiDoc: OpenApi.ApiDefinition;
-    }
-
-    export module OpenApi {
-        export interface ApiDefinition {
-            swagger: string
-            info: InfoObject
-            host?: string
-            basePath?: string
-            schemes?: string[]
-            consumes?: MimeTypes
-            produces?: MimeTypes
-            paths: PathsObject
-            definitions?: DefinitionsObject
-            parameters?: ParametersDefinitionsObject
-            responses?: ResponsesDefinitionsObject
-            securityDefinitions?: SecurityDefinitionsObject
-            security?: SecurityRequirementObject[]
-            tags?: TagObject[]
-            externalDocs?: ExternalDocumentationObject
-        }
-
-        type MimeTypes = string[]
-
-        export interface InfoObject {
-            title: string
-            description?: string
-            termsOfService?: string
-            contact?: ContactObject
-            license?: LicenseObject
-            version: string
-        }
-
-        export interface ContactObject {
-            name?: string
-            url?: string
-            email?: string
-        }
-
-        export interface LicenseObject {
-            name: string
-            url?: string
-        }
-
-        export interface PathsObject {
-            [index: string]: PathItemObject|any
-        }
-
-        export interface PathItemObject {
-            $ref?: string
-            get?: OperationObject
-            put?: OperationObject
-            post?: OperationObject
-            'delete'?: OperationObject
-            options?: OperationObject
-            head?: OperationObject
-            patch?: OperationObject
-            parameters?: Parameters
-        }
-
-        export interface OperationObject {
-            tags?: string[]
-            summary?: string
-            description?: string
-            externalDocs?: ExternalDocumentationObject
-            operationId?: string
-            consumes?: MimeTypes
-            produces?: MimeTypes
-            parameters?: Parameters
-            responses: ResponsesObject
-            schemes?: string[]
-            deprecated?: boolean
-            security?: SecurityRequirementObject[],
-            [index: string]: any
-        }
-
-        export interface DefinitionsObject {
-            [index: string]: SchemaObject
-        }
-
-        export interface ResponsesObject {
-            [index: string]: Response|any
-            'default': Response
-        }
-
-        type Response = ResponseObject|ReferenceObject
-
-        export interface ResponsesDefinitionsObject {
-            [index: string]: ResponseObject
-        }
-
-        export interface ResponseObject {
-            description: string
-            schema?: Schema
-            headers?: HeadersObject
-            examples?: ExampleObject
-        }
-
-        export interface HeadersObject {
-            [index: string]: HeaderObject
-        }
-
-        export interface HeaderObject extends ItemsObject {
-        }
-
-        export interface ExampleObject {
-            [index: string]: any
-        }
-
-        export interface SecurityDefinitionsObject {
-            [index: string]: SecuritySchemeObject
-        }
-
-        export interface SecuritySchemeObject {
-            type: string
-            description?: string
-            name: string
-            'in': string
-            flow: string
-            authorizationUrl: string
-            tokenUrl: string
-            scopes: ScopesObject
-        }
-
-        export interface ScopesObject {
-            [index: string]: any
-        }
-
-        export interface SecurityRequirementObject {
-            [index: string]: string[]
-        }
-
-        export interface TagObject {
-            name: string
-            description?: string
-            externalDocs?: ExternalDocumentationObject
-        }
-
-        export interface ItemsObject {
-            type: string
-            format?: string
-            items?: ItemsObject
-            collectionFormat?: string
-            'default'?: any
-            maximum?: number
-            exclusiveMaximum?: boolean
-            minimum?: number
-            exclusiveMinimum?: boolean
-            maxLength?: number
-            minLength?: number
-            pattern?: string
-            maxItems?: number
-            minItems?: number
-            uniqueItems?: boolean
-            'enum'?: any[]
-            multipleOf?: number
-        }
-
-        export interface ParametersDefinitionsObject {
-            [index: string]: ParameterObject
-        }
-
-        type Parameters = (ReferenceObject|Parameter)[]
-
-        type Parameter = (InBodyParameterObject|GeneralParameterObject);
-
-        interface ParameterObject {
-            name: string
-            'in': string
-            description?: string
-            required?: boolean
-        }
-
-        export interface InBodyParameterObject extends ParameterObject {
-            schema: Schema
-        }
-
-        export interface GeneralParameterObject extends ParameterObject, ItemsObject {
-            allowEmptyValue?: boolean
-        }
-
-        export interface ReferenceObject {
-            $ref: string
-        }
-
-        export interface ExternalDocumentationObject {
-            [index: string]: any
-            description?: string
-            url: string
-        }
-
-        type Schema = SchemaObject | ReferenceObject
-
-        export interface SchemaObject extends IJsonSchema {
-            [index: string]: any
-            discriminator?: string
-            readOnly?: boolean
-            xml?: XMLObject
-            externalDocs: ExternalDocumentationObject
-            example: any
-        }
-
-        export interface XMLObject {
-            [index: string]: any
-            name?: string
-            namespace?: string
-            prefix?: string
-            attribute?: boolean
-            wrapped?: boolean
-        }
-    }
-
-    export interface Args {
-        apiDoc: OpenApi.ApiDefinition
-        app: express.Application
-        routes: string
-        docPath: string
-        errorTransformer(openapiError: OpenapiError, jsonschemaError: JsonschemaError): any
-        exposeApiDocs: boolean
-        validateApiDoc: boolean
-        customFormats: CustomFormats
-    }
-
-    export interface OperationFunction extends express.RequestHandler {
-        apiDoc?: OpenApi.OperationObject;
-    }
-
-    export interface OperationHandlerArray {
-        apiDoc?: OpenApi.OperationObject;
-        [index: number]: express.RequestHandler;
-    }
-
-    export type Operation = OperationFunction | OperationHandlerArray;
-
-    export interface PathModule {
-        parameters?: OpenApi.Parameters;
-        get?: Operation;
-        put?: Operation;
-        post?: Operation;
-        delete?: Operation;
-        patch?: Operation;
-        options?: Operation;
-        head?: Operation;
-    }
-
-    export interface OpenapiError {
-        errorCode: string
-        location: string
-        message: string
-        path: string
-    }
-
-    export interface CustomFormats {
-        [index: string]: CustomFormatValidator
-    }
-
-    // Following 2 interfaces are part of jsonschema package.
-    interface JsonschemaError {
-        property: string
-        message: string
-        schema: string|IJsonSchema
-        instance: any
-        name: string
-        argument: any
-        stack: string
-        toString(): string
-    }
-
-    interface CustomFormatValidator {
-        (input: any): boolean
-    }
-
-    interface IJsonSchema {
-        id?: string
-        $schema?: string
-        title?: string
-        description?: string
-        multipleOf?: number
-        maximum?: number
-        exclusiveMaximum?: boolean
-        minimum?: number
-        exclusiveMinimum?: boolean
-        maxLength?: number
-        minLength?: number
-        pattern?: string
-        additionalItems?: boolean | IJsonSchema
-        items?: IJsonSchema | IJsonSchema[]
-        maxItems?: number
-        minItems?: number
-        uniqueItems?: boolean
-        maxProperties?: number
-        minProperties?: number
-        required?: string[]
-        additionalProperties?: boolean | IJsonSchema
-        definitions?: {
-            [name: string]: IJsonSchema
-        }
-        properties?: {
-            [name: string]: IJsonSchema
-        }
-        patternProperties?: {
-            [name: string]: IJsonSchema
-        }
-        dependencies?: {
-            [name: string]: IJsonSchema | string[]
-        }
-        'enum'?: any[]
-        type?: string | string[]
-        allOf?: IJsonSchema[]
-        anyOf?: IJsonSchema[]
-        oneOf?: IJsonSchema[]
-        not?: IJsonSchema
-    }
-}
diff --git a/express-openapi/index.d.ts b/express-openapi/index.d.ts
new file mode 100644
index 0000000000..c60c4f0a8a
--- /dev/null
+++ b/express-openapi/index.d.ts
@@ -0,0 +1,350 @@
+// Type definitions for express-openapi 0.11.x
+// Project: https://github.com/kogosoftwarellc/express-openapi
+// Definitions by: TANAKA Koichi <https://github.com/mugeso/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* =================== USAGE ===================
+ import express = require('express');
+ import bodyParser = require('body-parser');
+ import openapi = require('express-openapi');
+ import cors = require('cors');
+
+ var app = express();
+ app.use(cors());
+ app.use(bodyParser.json());
+
+ var api: openapi.InitializedApi;
+ api = openapi.initialize({
+ apiDoc: require('./api-doc.js'),
+ app: app,
+ routes: './api-routes'
+ });
+
+ app.use(function(err, req, res, next) {
+ res.status(err.status).json(err);
+ });
+
+ app.listen(3000);
+ =============================================== */
+
+
+
+
+import express = require('express');
+
+export declare function initialize(args: Args): InitializedApi;
+
+export interface InitializedApi {
+    apiDoc: OpenApi.ApiDefinition;
+}
+
+export declare module OpenApi {
+    export interface ApiDefinition {
+        swagger: string
+        info: InfoObject
+        host?: string
+        basePath?: string
+        schemes?: string[]
+        consumes?: MimeTypes
+        produces?: MimeTypes
+        paths: PathsObject
+        definitions?: DefinitionsObject
+        parameters?: ParametersDefinitionsObject
+        responses?: ResponsesDefinitionsObject
+        securityDefinitions?: SecurityDefinitionsObject
+        security?: SecurityRequirementObject[]
+        tags?: TagObject[]
+        externalDocs?: ExternalDocumentationObject
+    }
+
+    type MimeTypes = string[]
+
+    export interface InfoObject {
+        title: string
+        description?: string
+        termsOfService?: string
+        contact?: ContactObject
+        license?: LicenseObject
+        version: string
+    }
+
+    export interface ContactObject {
+        name?: string
+        url?: string
+        email?: string
+    }
+
+    export interface LicenseObject {
+        name: string
+        url?: string
+    }
+
+    export interface PathsObject {
+        [index: string]: PathItemObject | any
+    }
+
+    export interface PathItemObject {
+        $ref?: string
+        get?: OperationObject
+        put?: OperationObject
+        post?: OperationObject
+        'delete'?: OperationObject
+        options?: OperationObject
+        head?: OperationObject
+        patch?: OperationObject
+        parameters?: Parameters
+    }
+
+    export interface OperationObject {
+        tags?: string[]
+        summary?: string
+        description?: string
+        externalDocs?: ExternalDocumentationObject
+        operationId?: string
+        consumes?: MimeTypes
+        produces?: MimeTypes
+        parameters?: Parameters
+        responses: ResponsesObject
+        schemes?: string[]
+        deprecated?: boolean
+        security?: SecurityRequirementObject[],
+        [index: string]: any
+    }
+
+    export interface DefinitionsObject {
+        [index: string]: SchemaObject
+    }
+
+    export interface ResponsesObject {
+        [index: string]: Response | any
+        'default': Response
+    }
+
+    type Response = ResponseObject | ReferenceObject
+
+    export interface ResponsesDefinitionsObject {
+        [index: string]: ResponseObject
+    }
+
+    export interface ResponseObject {
+        description: string
+        schema?: Schema
+        headers?: HeadersObject
+        examples?: ExampleObject
+    }
+
+    export interface HeadersObject {
+        [index: string]: HeaderObject
+    }
+
+    export interface HeaderObject extends ItemsObject {
+    }
+
+    export interface ExampleObject {
+        [index: string]: any
+    }
+
+    export interface SecurityDefinitionsObject {
+        [index: string]: SecuritySchemeObject
+    }
+
+    export interface SecuritySchemeObject {
+        type: string
+        description?: string
+        name: string
+        'in': string
+        flow: string
+        authorizationUrl: string
+        tokenUrl: string
+        scopes: ScopesObject
+    }
+
+    export interface ScopesObject {
+        [index: string]: any
+    }
+
+    export interface SecurityRequirementObject {
+        [index: string]: string[]
+    }
+
+    export interface TagObject {
+        name: string
+        description?: string
+        externalDocs?: ExternalDocumentationObject
+    }
+
+    export interface ItemsObject {
+        type: string
+        format?: string
+        items?: ItemsObject
+        collectionFormat?: string
+        'default'?: any
+        maximum?: number
+        exclusiveMaximum?: boolean
+        minimum?: number
+        exclusiveMinimum?: boolean
+        maxLength?: number
+        minLength?: number
+        pattern?: string
+        maxItems?: number
+        minItems?: number
+        uniqueItems?: boolean
+        'enum'?: any[]
+        multipleOf?: number
+    }
+
+    export interface ParametersDefinitionsObject {
+        [index: string]: ParameterObject
+    }
+
+    type Parameters = (ReferenceObject | Parameter)[]
+
+    type Parameter = (InBodyParameterObject | GeneralParameterObject);
+
+    interface ParameterObject {
+        name: string
+        'in': string
+        description?: string
+        required?: boolean
+    }
+
+    export interface InBodyParameterObject extends ParameterObject {
+        schema: Schema
+    }
+
+    export interface GeneralParameterObject extends ParameterObject, ItemsObject {
+        allowEmptyValue?: boolean
+    }
+
+    export interface ReferenceObject {
+        $ref: string
+    }
+
+    export interface ExternalDocumentationObject {
+        [index: string]: any
+        description?: string
+        url: string
+    }
+
+    type Schema = SchemaObject | ReferenceObject
+
+    export interface SchemaObject extends IJsonSchema {
+        [index: string]: any
+        discriminator?: string
+        readOnly?: boolean
+        xml?: XMLObject
+        externalDocs: ExternalDocumentationObject
+        example: any
+    }
+
+    export interface XMLObject {
+        [index: string]: any
+        name?: string
+        namespace?: string
+        prefix?: string
+        attribute?: boolean
+        wrapped?: boolean
+    }
+}
+
+export interface Args {
+    apiDoc: OpenApi.ApiDefinition
+    app: express.Application
+    routes: string
+    docPath: string
+    errorTransformer(openapiError: OpenapiError, jsonschemaError: JsonschemaError): any
+    exposeApiDocs: boolean
+    validateApiDoc: boolean
+    customFormats: CustomFormats
+}
+
+export interface OperationFunction extends express.RequestHandler {
+    apiDoc?: OpenApi.OperationObject;
+}
+
+export interface OperationHandlerArray {
+    apiDoc?: OpenApi.OperationObject;
+    [index: number]: express.RequestHandler;
+}
+
+export type Operation = OperationFunction | OperationHandlerArray;
+
+export interface PathModule {
+    parameters?: OpenApi.Parameters;
+    get?: Operation;
+    put?: Operation;
+    post?: Operation;
+    delete?: Operation;
+    patch?: Operation;
+    options?: Operation;
+    head?: Operation;
+}
+
+export interface OpenapiError {
+    errorCode: string
+    location: string
+    message: string
+    path: string
+}
+
+export interface CustomFormats {
+    [index: string]: CustomFormatValidator
+}
+
+// Following 2 interfaces are part of jsonschema package.
+interface JsonschemaError {
+    property: string
+    message: string
+    schema: string | IJsonSchema
+    instance: any
+    name: string
+    argument: any
+    stack: string
+    toString(): string
+}
+
+interface CustomFormatValidator {
+    (input: any): boolean
+}
+
+interface IJsonSchema {
+    id?: string
+    $schema?: string
+    title?: string
+    description?: string
+    multipleOf?: number
+    maximum?: number
+    exclusiveMaximum?: boolean
+    minimum?: number
+    exclusiveMinimum?: boolean
+    maxLength?: number
+    minLength?: number
+    pattern?: string
+    additionalItems?: boolean | IJsonSchema
+    items?: IJsonSchema | IJsonSchema[]
+    maxItems?: number
+    minItems?: number
+    uniqueItems?: boolean
+    maxProperties?: number
+    minProperties?: number
+    required?: string[]
+    additionalProperties?: boolean | IJsonSchema
+    definitions?: {
+        [name: string]: IJsonSchema
+    }
+    properties?: {
+        [name: string]: IJsonSchema
+    }
+    patternProperties?: {
+        [name: string]: IJsonSchema
+    }
+    dependencies?: {
+        [name: string]: IJsonSchema | string[]
+    }
+    'enum'?: any[]
+    type?: string | string[]
+    allOf?: IJsonSchema[]
+    anyOf?: IJsonSchema[]
+    oneOf?: IJsonSchema[]
+    not?: IJsonSchema
+}
diff --git a/express-openapi/tsconfig.json b/express-openapi/tsconfig.json
new file mode 100644
index 0000000000..539c3ba7be
--- /dev/null
+++ b/express-openapi/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-openapi-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/express-partials/express-partials-tests.ts b/express-partials/express-partials-tests.ts
index 5ed5b8add0..288916c80e 100644
--- a/express-partials/express-partials-tests.ts
+++ b/express-partials/express-partials-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../express/express.d.ts" />
-/// <reference path="express-partials.d.ts" />
+
 
 import express = require('express');
 import partials = require('express-partials');
diff --git a/express-partials/express-partials.d.ts b/express-partials/express-partials.d.ts
deleted file mode 100644
index c12b7c05f2..0000000000
--- a/express-partials/express-partials.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// Type definitions for express-partials
-// Project: https://github.com/publicclass/express-partials
-// Definitions by: jt000 <https://github.com/jt000>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "express-partials" {
-    import express = require('express');
-
-    function expressPartials(options?: any): express.RequestHandler;
-
-    export = expressPartials;
-}
\ No newline at end of file
diff --git a/express-partials/index.d.ts b/express-partials/index.d.ts
new file mode 100644
index 0000000000..fb043b1307
--- /dev/null
+++ b/express-partials/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for express-partials
+// Project: https://github.com/publicclass/express-partials
+// Definitions by: jt000 <https://github.com/jt000>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+
+import express = require('express');
+
+declare function expressPartials(options?: any): express.RequestHandler;
+
+export = expressPartials;
diff --git a/express-partials/tsconfig.json b/express-partials/tsconfig.json
new file mode 100644
index 0000000000..281b376da6
--- /dev/null
+++ b/express-partials/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-partials-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/express-route-fs/express-route-fs-tests.ts b/express-route-fs/express-route-fs-tests.ts
index 1516d80dca..4411b855e4 100644
--- a/express-route-fs/express-route-fs-tests.ts
+++ b/express-route-fs/express-route-fs-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="express-route-fs.d.ts" />
-/// <reference path="../express/express.d.ts" />
 
 import express = require('express');
 import routeFs = require('express-route-fs');
diff --git a/express-route-fs/express-route-fs.d.ts b/express-route-fs/express-route-fs.d.ts
deleted file mode 100644
index 0b9cdc2fc8..0000000000
--- a/express-route-fs/express-route-fs.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// Type definitions for express-route-fs v0.1.0
-// Project: https://github.com/kripod/express-route-fs
-// Definitions by: Kristóf Poduszló <https://github.com/kripod>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "express-route-fs" {
-    /**
-     Sets up file system-based routing in Express.
-     @param {Object} app Express application object.
-     @param {Object[]} [options] Options for setting up routes.
-     */
-    function routeFs(app: any, options?: any): void;
-    export = routeFs;
-}
diff --git a/express-route-fs/index.d.ts b/express-route-fs/index.d.ts
new file mode 100644
index 0000000000..a16f7dd171
--- /dev/null
+++ b/express-route-fs/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for express-route-fs v0.1.0
+// Project: https://github.com/kripod/express-route-fs
+// Definitions by: Kristóf Poduszló <https://github.com/kripod>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/**
+ Sets up file system-based routing in Express.
+ @param {Object} app Express application object.
+ @param {Object[]} [options] Options for setting up routes.
+ */
+declare function routeFs(app: any, options?: any): void;
+export = routeFs;
diff --git a/express-route-fs/tsconfig.json b/express-route-fs/tsconfig.json
new file mode 100644
index 0000000000..719948ffca
--- /dev/null
+++ b/express-route-fs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-route-fs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/express-serve-static-core/express-serve-static-core-tests.ts b/express-serve-static-core/express-serve-static-core-tests.ts
index a89769c939..5803337a65 100644
--- a/express-serve-static-core/express-serve-static-core-tests.ts
+++ b/express-serve-static-core/express-serve-static-core-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="express-serve-static-core.d.ts" />
+
 
 import * as express from 'express-serve-static-core';
 
diff --git a/express-serve-static-core/express-serve-static-core.d.ts b/express-serve-static-core/express-serve-static-core.d.ts
deleted file mode 100644
index 70817018a9..0000000000
--- a/express-serve-static-core/express-serve-static-core.d.ts
+++ /dev/null
@@ -1,1062 +0,0 @@
-// Type definitions for Express 4.x
-// Project: http://expressjs.com
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// This extracts the core definitions from express to prevent a circular dependency between express and serve-static
-/// <reference path="../node/node.d.ts" />
-
-declare namespace Express {
-
-    // These open interfaces may be extended in an application-specific manner via declaration merging.
-    // See for example method-override.d.ts (https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/method-override/method-override.d.ts)
-    export interface Request { }
-    export interface Response { }
-    export interface Application { }
-}
-
-declare module "express-serve-static-core" {
-    import * as http from "http";
-
-    interface IRoute {
-        path: string;
-        stack: any;
-        all(...handler: RequestHandler[]): IRoute;
-        get(...handler: RequestHandler[]): IRoute;
-        post(...handler: RequestHandler[]): IRoute;
-        put(...handler: RequestHandler[]): IRoute;
-        delete(...handler: RequestHandler[]): IRoute;
-        patch(...handler: RequestHandler[]): IRoute;
-        options(...handler: RequestHandler[]): IRoute;
-        head(...handler: RequestHandler[]): IRoute;
-    }
-
-    interface IRouterMatcher<T> {
-        (name: string | RegExp, ...handlers: RequestHandler[]): T;
-    }
-
-    interface IRouter<T> extends RequestHandler {
-        /**
-            * Map the given param placeholder `name`(s) to the given callback(s).
-            *
-            * Parameter mapping is used to provide pre-conditions to routes
-            * which use normalized placeholders. For example a _:user_id_ parameter
-            * could automatically load a user's information from the database without
-            * any additional code,
-            *
-            * The callback uses the samesignature as middleware, the only differencing
-            * being that the value of the placeholder is passed, in this case the _id_
-            * of the user. Once the `next()` function is invoked, just like middleware
-            * it will continue on to execute the route, or subsequent parameter functions.
-            *
-            *      app.param('user_id', function(req, res, next, id){
-            *        User.find(id, function(err, user){
-            *          if (err) {
-            *            next(err);
-            *          } else if (user) {
-            *            req.user = user;
-            *            next();
-            *          } else {
-            *            next(new Error('failed to load user'));
-            *          }
-            *        });
-            *      });
-            *
-            * @param name
-            * @param fn
-            */
-        param(name: string, handler: RequestParamHandler): T;
-        param(name: string, matcher: RegExp): T;
-        param(name: string, mapper: (param: any) => any): T;
-        // Alternatively, you can pass only a callback, in which case you have the opportunity to alter the app.param() API
-        param(callback: (name: string, matcher: RegExp) => RequestParamHandler): T;
-
-        /**
-            * Special-cased "all" method, applying the given route `path`,
-            * middleware, and callback to _every_ HTTP method.
-            *
-            * @param path
-            * @param fn
-            */
-        all: IRouterMatcher<T>;
-        get: IRouterMatcher<T>;
-        post: IRouterMatcher<T>;
-        put: IRouterMatcher<T>;
-        delete: IRouterMatcher<T>;
-        patch: IRouterMatcher<T>;
-        options: IRouterMatcher<T>;
-        head: IRouterMatcher<T>;
-
-        route(path: string): IRoute;
-
-        use(...handler: RequestHandler[]): T;
-        use(handler: ErrorRequestHandler | RequestHandler): T;
-        use(path: string, ...handler: RequestHandler[]): T;
-        use(path: string, handler: ErrorRequestHandler | RequestHandler): T;
-        use(path: string[], ...handler: RequestHandler[]): T;
-        use(path: string[], handler: ErrorRequestHandler): T;
-        use(path: RegExp, ...handler: RequestHandler[]): T;
-        use(path: RegExp, handler: ErrorRequestHandler): T;
-        use(path: string, router: Router): T;
-    }
-
-
-    export interface Router extends IRouter<Router> { }
-
-    interface CookieOptions {
-        maxAge?: number;
-        signed?: boolean;
-        expires?: Date;
-        httpOnly?: boolean;
-        path?: string;
-        domain?: string;
-        secure?: boolean;
-    }
-
-    interface Errback { (err: Error): void; }
-
-    interface Request extends http.ServerRequest, Express.Request {
-
-        /**
-            * Return request header.
-            *
-            * The `Referrer` header field is special-cased,
-            * both `Referrer` and `Referer` are interchangeable.
-            *
-            * Examples:
-            *
-            *     req.get('Content-Type');
-            *     // => "text/plain"
-            *
-            *     req.get('content-type');
-            *     // => "text/plain"
-            *
-            *     req.get('Something');
-            *     // => undefined
-            *
-            * Aliased as `req.header()`.
-            *
-            * @param name
-            */
-        get(name: string): string;
-
-        header(name: string): string;
-
-        headers: { [key: string]: string; };
-
-        /**
-            * Check if the given `type(s)` is acceptable, returning
-            * the best match when true, otherwise `undefined`, in which
-            * case you should respond with 406 "Not Acceptable".
-            *
-            * The `type` value may be a single mime type string
-            * such as "application/json", the extension name
-            * such as "json", a comma-delimted list such as "json, html, text/plain",
-            * or an array `["json", "html", "text/plain"]`. When a list
-            * or array is given the _best_ match, if any is returned.
-            *
-            * Examples:
-            *
-            *     // Accept: text/html
-            *     req.accepts('html');
-            *     // => "html"
-            *
-            *     // Accept: text/*, application/json
-            *     req.accepts('html');
-            *     // => "html"
-            *     req.accepts('text/html');
-            *     // => "text/html"
-            *     req.accepts('json, text');
-            *     // => "json"
-            *     req.accepts('application/json');
-            *     // => "application/json"
-            *
-            *     // Accept: text/*, application/json
-            *     req.accepts('image/png');
-            *     req.accepts('png');
-            *     // => undefined
-            *
-            *     // Accept: text/*;q=.5, application/json
-            *     req.accepts(['html', 'json']);
-            *     req.accepts('html, json');
-            *     // => "json"
-            */
-        accepts(type: string): string;
-
-        accepts(type: string[]): string;
-
-        /**
-            * Returns the first accepted charset of the specified character sets,
-            * based on the request’s Accept-Charset HTTP header field.
-            * If none of the specified charsets is accepted, returns false.
-            *
-            * For more information, or if you have issues or concerns, see accepts.
-            * @param charset
-            */
-        acceptsCharsets(charset?: string | string[]): string[];
-
-        /**
-            * Returns the first accepted encoding of the specified encodings,
-            * based on the request’s Accept-Encoding HTTP header field.
-            * If none of the specified encodings is accepted, returns false.
-            *
-            * For more information, or if you have issues or concerns, see accepts.
-            * @param encoding
-            */
-        acceptsEncodings(encoding?: string | string[]): string[];
-
-        /**
-            * Returns the first accepted language of the specified languages,
-            * based on the request’s Accept-Language HTTP header field.
-            * If none of the specified languages is accepted, returns false.
-            *
-            * For more information, or if you have issues or concerns, see accepts.
-            *
-            * @param lang
-            */
-        acceptsLanguages(lang?: string | string[]): string[];
-
-        /**
-            * Parse Range header field,
-            * capping to the given `size`.
-            *
-            * Unspecified ranges such as "0-" require
-            * knowledge of your resource length. In
-            * the case of a byte range this is of course
-            * the total number of bytes. If the Range
-            * header field is not given `null` is returned,
-            * `-1` when unsatisfiable, `-2` when syntactically invalid.
-            *
-            * NOTE: remember that ranges are inclusive, so
-            * for example "Range: users=0-3" should respond
-            * with 4 users when available, not 3.
-            *
-            * @param size
-            */
-        range(size: number): any[];
-
-        /**
-            * Return an array of Accepted media types
-            * ordered from highest quality to lowest.
-            */
-        accepted: MediaType[];
-
-        /**
-            * Return the value of param `name` when present or `defaultValue`.
-            *
-            *  - Checks route placeholders, ex: _/user/:id_
-            *  - Checks body params, ex: id=12, {"id":12}
-            *  - Checks query string params, ex: ?id=12
-            *
-            * To utilize request bodies, `req.body`
-            * should be an object. This can be done by using
-            * the `connect.bodyParser()` middleware.
-            *
-            * @param name
-            * @param defaultValue
-            */
-        param(name: string, defaultValue?: any): string;
-
-        /**
-            * Check if the incoming request contains the "Content-Type"
-            * header field, and it contains the give mime `type`.
-            *
-            * Examples:
-            *
-            *      // With Content-Type: text/html; charset=utf-8
-            *      req.is('html');
-            *      req.is('text/html');
-            *      req.is('text/*');
-            *      // => true
-            *
-            *      // When Content-Type is application/json
-            *      req.is('json');
-            *      req.is('application/json');
-            *      req.is('application/*');
-            *      // => true
-            *
-            *      req.is('html');
-            *      // => false
-            *
-            * @param type
-            */
-        is(type: string): boolean;
-
-        /**
-            * Return the protocol string "http" or "https"
-            * when requested with TLS. When the "trust proxy"
-            * setting is enabled the "X-Forwarded-Proto" header
-            * field will be trusted. If you're running behind
-            * a reverse proxy that supplies https for you this
-            * may be enabled.
-            */
-        protocol: string;
-
-        /**
-            * Short-hand for:
-            *
-            *    req.protocol == 'https'
-            */
-        secure: boolean;
-
-        /**
-            * Return the remote address, or when
-            * "trust proxy" is `true` return
-            * the upstream addr.
-            */
-        ip: string;
-
-        /**
-            * When "trust proxy" is `true`, parse
-            * the "X-Forwarded-For" ip address list.
-            *
-            * For example if the value were "client, proxy1, proxy2"
-            * you would receive the array `["client", "proxy1", "proxy2"]`
-            * where "proxy2" is the furthest down-stream.
-            */
-        ips: string[];
-
-        /**
-            * Return subdomains as an array.
-            *
-            * Subdomains are the dot-separated parts of the host before the main domain of
-            * the app. By default, the domain of the app is assumed to be the last two
-            * parts of the host. This can be changed by setting "subdomain offset".
-            *
-            * For example, if the domain is "tobi.ferrets.example.com":
-            * If "subdomain offset" is not set, req.subdomains is `["ferrets", "tobi"]`.
-            * If "subdomain offset" is 3, req.subdomains is `["tobi"]`.
-            */
-        subdomains: string[];
-
-        /**
-            * Short-hand for `url.parse(req.url).pathname`.
-            */
-        path: string;
-
-        /**
-            * Parse the "Host" header field hostname.
-            */
-        hostname: string;
-
-        /**
-            * @deprecated Use hostname instead.
-            */
-        host: string;
-
-        /**
-            * Check if the request is fresh, aka
-            * Last-Modified and/or the ETag
-            * still match.
-            */
-        fresh: boolean;
-
-        /**
-            * Check if the request is stale, aka
-            * "Last-Modified" and / or the "ETag" for the
-            * resource has changed.
-            */
-        stale: boolean;
-
-        /**
-            * Check if the request was an _XMLHttpRequest_.
-            */
-        xhr: boolean;
-
-        //body: { username: string; password: string; remember: boolean; title: string; };
-        body: any;
-
-        //cookies: { string; remember: boolean; };
-        cookies: any;
-
-        method: string;
-
-        params: any;
-
-        user: any;
-
-        authenticatedUser: any;
-
-        /**
-            * Clear cookie `name`.
-            *
-            * @param name
-            * @param options
-            */
-        clearCookie(name: string, options?: any): Response;
-
-        query: any;
-
-        route: any;
-
-        signedCookies: any;
-
-        originalUrl: string;
-
-        url: string;
-
-        baseUrl: string;
-
-        app: Application;
-    }
-
-    interface MediaType {
-        value: string;
-        quality: number;
-        type: string;
-        subtype: string;
-    }
-
-    interface Send {
-        (status: number, body?: any): Response;
-        (body: any): Response;
-    }
-
-    interface Response extends http.ServerResponse, Express.Response {
-        /**
-            * Set status `code`.
-            *
-            * @param code
-            */
-        status(code: number): Response;
-
-        /**
-            * Set the response HTTP status code to `statusCode` and send its string representation as the response body.
-            * @link http://expressjs.com/4x/api.html#res.sendStatus
-            *
-            * Examples:
-            *
-            *    res.sendStatus(200); // equivalent to res.status(200).send('OK')
-            *    res.sendStatus(403); // equivalent to res.status(403).send('Forbidden')
-            *    res.sendStatus(404); // equivalent to res.status(404).send('Not Found')
-            *    res.sendStatus(500); // equivalent to res.status(500).send('Internal Server Error')
-            *
-            * @param code
-            */
-        sendStatus(code: number): Response;
-
-        /**
-            * Set Link header field with the given `links`.
-            *
-            * Examples:
-            *
-            *    res.links({
-            *      next: 'http://api.example.com/users?page=2',
-            *      last: 'http://api.example.com/users?page=5'
-            *    });
-            *
-            * @param links
-            */
-        links(links: any): Response;
-
-        /**
-            * Send a response.
-            *
-            * Examples:
-            *
-            *     res.send(new Buffer('wahoo'));
-            *     res.send({ some: 'json' });
-            *     res.send('<p>some html</p>');
-            *     res.send(404, 'Sorry, cant find that');
-            *     res.send(404);
-            */
-        send: Send;
-
-        /**
-            * Send JSON response.
-            *
-            * Examples:
-            *
-            *     res.json(null);
-            *     res.json({ user: 'tj' });
-            *     res.json(500, 'oh noes!');
-            *     res.json(404, 'I dont have that');
-            */
-        json: Send;
-
-        /**
-            * Send JSON response with JSONP callback support.
-            *
-            * Examples:
-            *
-            *     res.jsonp(null);
-            *     res.jsonp({ user: 'tj' });
-            *     res.jsonp(500, 'oh noes!');
-            *     res.jsonp(404, 'I dont have that');
-            */
-        jsonp: Send;
-
-        /**
-            * Transfer the file at the given `path`.
-            *
-            * Automatically sets the _Content-Type_ response header field.
-            * The callback `fn(err)` is invoked when the transfer is complete
-            * or when an error occurs. Be sure to check `res.sentHeader`
-            * if you wish to attempt responding, as the header and some data
-            * may have already been transferred.
-            *
-            * Options:
-            *
-            *   - `maxAge`   defaulting to 0 (can be string converted by `ms`)
-            *   - `root`     root directory for relative filenames
-            *   - `headers`  object of headers to serve with file
-            *   - `dotfiles` serve dotfiles, defaulting to false; can be `"allow"` to send them
-            *
-            * Other options are passed along to `send`.
-            *
-            * Examples:
-            *
-            *  The following example illustrates how `res.sendFile()` may
-            *  be used as an alternative for the `static()` middleware for
-            *  dynamic situations. The code backing `res.sendFile()` is actually
-            *  the same code, so HTTP cache support etc is identical.
-            *
-            *     app.get('/user/:uid/photos/:file', function(req, res){
-            *       var uid = req.params.uid
-            *         , file = req.params.file;
-            *
-            *       req.user.mayViewFilesFrom(uid, function(yes){
-            *         if (yes) {
-            *           res.sendFile('/uploads/' + uid + '/' + file);
-            *         } else {
-            *           res.send(403, 'Sorry! you cant see that.');
-            *         }
-            *       });
-            *     });
-            *
-            * @api public
-            */
-        sendFile(path: string): void;
-        sendFile(path: string, options: any): void;
-        sendFile(path: string, fn: Errback): void;
-        sendFile(path: string, options: any, fn: Errback): void;
-
-        /**
-            * @deprecated Use sendFile instead.
-            */
-        sendfile(path: string): void;
-        /**
-            * @deprecated Use sendFile instead.
-            */
-        sendfile(path: string, options: any): void;
-        /**
-            * @deprecated Use sendFile instead.
-            */
-        sendfile(path: string, fn: Errback): void;
-        /**
-            * @deprecated Use sendFile instead.
-            */
-        sendfile(path: string, options: any, fn: Errback): void;
-
-        /**
-            * Transfer the file at the given `path` as an attachment.
-            *
-            * Optionally providing an alternate attachment `filename`,
-            * and optional callback `fn(err)`. The callback is invoked
-            * when the data transfer is complete, or when an error has
-            * ocurred. Be sure to check `res.headerSent` if you plan to respond.
-            *
-            * This method uses `res.sendfile()`.
-            */
-        download(path: string): void;
-        download(path: string, filename: string): void;
-        download(path: string, fn: Errback): void;
-        download(path: string, filename: string, fn: Errback): void;
-
-        /**
-            * Set _Content-Type_ response header with `type` through `mime.lookup()`
-            * when it does not contain "/", or set the Content-Type to `type` otherwise.
-            *
-            * Examples:
-            *
-            *     res.type('.html');
-            *     res.type('html');
-            *     res.type('json');
-            *     res.type('application/json');
-            *     res.type('png');
-            *
-            * @param type
-            */
-        contentType(type: string): Response;
-
-        /**
-            * Set _Content-Type_ response header with `type` through `mime.lookup()`
-            * when it does not contain "/", or set the Content-Type to `type` otherwise.
-            *
-            * Examples:
-            *
-            *     res.type('.html');
-            *     res.type('html');
-            *     res.type('json');
-            *     res.type('application/json');
-            *     res.type('png');
-            *
-            * @param type
-            */
-        type(type: string): Response;
-
-        /**
-            * Respond to the Acceptable formats using an `obj`
-            * of mime-type callbacks.
-            *
-            * This method uses `req.accepted`, an array of
-            * acceptable types ordered by their quality values.
-            * When "Accept" is not present the _first_ callback
-            * is invoked, otherwise the first match is used. When
-            * no match is performed the server responds with
-            * 406 "Not Acceptable".
-            *
-            * Content-Type is set for you, however if you choose
-            * you may alter this within the callback using `res.type()`
-            * or `res.set('Content-Type', ...)`.
-            *
-            *    res.format({
-            *      'text/plain': function(){
-            *        res.send('hey');
-            *      },
-            *
-            *      'text/html': function(){
-            *        res.send('<p>hey</p>');
-            *      },
-            *
-            *      'appliation/json': function(){
-            *        res.send({ message: 'hey' });
-            *      }
-            *    });
-            *
-            * In addition to canonicalized MIME types you may
-            * also use extnames mapped to these types:
-            *
-            *    res.format({
-            *      text: function(){
-            *        res.send('hey');
-            *      },
-            *
-            *      html: function(){
-            *        res.send('<p>hey</p>');
-            *      },
-            *
-            *      json: function(){
-            *        res.send({ message: 'hey' });
-            *      }
-            *    });
-            *
-            * By default Express passes an `Error`
-            * with a `.status` of 406 to `next(err)`
-            * if a match is not made. If you provide
-            * a `.default` callback it will be invoked
-            * instead.
-            *
-            * @param obj
-            */
-        format(obj: any): Response;
-
-        /**
-            * Set _Content-Disposition_ header to _attachment_ with optional `filename`.
-            *
-            * @param filename
-            */
-        attachment(filename?: string): Response;
-
-        /**
-            * Set header `field` to `val`, or pass
-            * an object of header fields.
-            *
-            * Examples:
-            *
-            *    res.set('Foo', ['bar', 'baz']);
-            *    res.set('Accept', 'application/json');
-            *    res.set({ Accept: 'text/plain', 'X-API-Key': 'tobi' });
-            *
-            * Aliased as `res.header()`.
-            */
-        set(field: any): Response;
-        set(field: string, value?: string): Response;
-
-        header(field: any): Response;
-        header(field: string, value?: string): Response;
-
-        // Property indicating if HTTP headers has been sent for the response.
-        headersSent: boolean;
-
-        /**
-            * Get value for header `field`.
-            *
-            * @param field
-            */
-        get(field: string): string;
-
-        /**
-            * Clear cookie `name`.
-            *
-            * @param name
-            * @param options
-            */
-        clearCookie(name: string, options?: any): Response;
-
-        /**
-            * Set cookie `name` to `val`, with the given `options`.
-            *
-            * Options:
-            *
-            *    - `maxAge`   max-age in milliseconds, converted to `expires`
-            *    - `signed`   sign the cookie
-            *    - `path`     defaults to "/"
-            *
-            * Examples:
-            *
-            *    // "Remember Me" for 15 minutes
-            *    res.cookie('rememberme', '1', { expires: new Date(Date.now() + 900000), httpOnly: true });
-            *
-            *    // save as above
-            *    res.cookie('rememberme', '1', { maxAge: 900000, httpOnly: true })
-            */
-        cookie(name: string, val: string, options: CookieOptions): Response;
-        cookie(name: string, val: any, options: CookieOptions): Response;
-        cookie(name: string, val: any): Response;
-
-        /**
-            * Set the location header to `url`.
-            *
-            * The given `url` can also be the name of a mapped url, for
-            * example by default express supports "back" which redirects
-            * to the _Referrer_ or _Referer_ headers or "/".
-            *
-            * Examples:
-            *
-            *    res.location('/foo/bar').;
-            *    res.location('http://example.com');
-            *    res.location('../login'); // /blog/post/1 -> /blog/login
-            *
-            * Mounting:
-            *
-            *   When an application is mounted and `res.location()`
-            *   is given a path that does _not_ lead with "/" it becomes
-            *   relative to the mount-point. For example if the application
-            *   is mounted at "/blog", the following would become "/blog/login".
-            *
-            *      res.location('login');
-            *
-            *   While the leading slash would result in a location of "/login":
-            *
-            *      res.location('/login');
-            *
-            * @param url
-            */
-        location(url: string): Response;
-
-        /**
-            * Redirect to the given `url` with optional response `status`
-            * defaulting to 302.
-            *
-            * The resulting `url` is determined by `res.location()`, so
-            * it will play nicely with mounted apps, relative paths,
-            * `"back"` etc.
-            *
-            * Examples:
-            *
-            *    res.redirect('/foo/bar');
-            *    res.redirect('http://example.com');
-            *    res.redirect(301, 'http://example.com');
-            *    res.redirect('http://example.com', 301);
-            *    res.redirect('../login'); // /blog/post/1 -> /blog/login
-            */
-        redirect(url: string): void;
-        redirect(status: number, url: string): void;
-        redirect(url: string, status: number): void;
-
-        /**
-            * Render `view` with the given `options` and optional callback `fn`.
-            * When a callback function is given a response will _not_ be made
-            * automatically, otherwise a response of _200_ and _text/html_ is given.
-            *
-            * Options:
-            *
-            *  - `cache`     boolean hinting to the engine it should cache
-            *  - `filename`  filename of the view being rendered
-            */
-        render(view: string, options?: Object, callback?: (err: Error, html: string) => void): void;
-        render(view: string, callback?: (err: Error, html: string) => void): void;
-
-        locals: any;
-
-        charset: string;
-    }
-
-    interface NextFunction {
-        (err?: any): void;
-    }
-
-    interface ErrorRequestHandler {
-        (err: any, req: Request, res: Response, next: NextFunction): any;
-    }
-
-
-    interface Handler extends RequestHandler { }
-
-    interface RequestParamHandler {
-        (req: Request, res: Response, next: NextFunction, param: any): any;
-    }
-
-    interface Application extends IRouter<Application>, Express.Application {
-        /**
-            * Initialize the server.
-            *
-            *   - setup default configuration
-            *   - setup default middleware
-            *   - setup route reflection methods
-            */
-        init(): void;
-
-        /**
-            * Initialize application configuration.
-            */
-        defaultConfiguration(): void;
-
-        /**
-            * Register the given template engine callback `fn`
-            * as `ext`.
-            *
-            * By default will `require()` the engine based on the
-            * file extension. For example if you try to render
-            * a "foo.jade" file Express will invoke the following internally:
-            *
-            *     app.engine('jade', require('jade').__express);
-            *
-            * For engines that do not provide `.__express` out of the box,
-            * or if you wish to "map" a different extension to the template engine
-            * you may use this method. For example mapping the EJS template engine to
-            * ".html" files:
-            *
-            *     app.engine('html', require('ejs').renderFile);
-            *
-            * In this case EJS provides a `.renderFile()` method with
-            * the same signature that Express expects: `(path, options, callback)`,
-            * though note that it aliases this method as `ejs.__express` internally
-            * so if you're using ".ejs" extensions you dont need to do anything.
-            *
-            * Some template engines do not follow this convention, the
-            * [Consolidate.js](https://github.com/visionmedia/consolidate.js)
-            * library was created to map all of node's popular template
-            * engines to follow this convention, thus allowing them to
-            * work seamlessly within Express.
-            */
-        engine(ext: string, fn: Function): Application;
-
-        /**
-            * Assign `setting` to `val`, or return `setting`'s value.
-            *
-            *    app.set('foo', 'bar');
-            *    app.get('foo');
-            *    // => "bar"
-            *    app.set('foo', ['bar', 'baz']);
-            *    app.get('foo');
-            *    // => ["bar", "baz"]
-            *
-            * Mounted servers inherit their parent server's settings.
-            *
-            * @param setting
-            * @param val
-            */
-        set(setting: string, val: any): Application;
-        get: {
-            (name: string): any; // Getter
-            (name: string | RegExp, ...handlers: RequestHandler[]): Application;
-        };
-
-        /**
-            * Return the app's absolute pathname
-            * based on the parent(s) that have
-            * mounted it.
-            *
-            * For example if the application was
-            * mounted as "/admin", which itself
-            * was mounted as "/blog" then the
-            * return value would be "/blog/admin".
-            */
-        path(): string;
-
-        /**
-            * Check if `setting` is enabled (truthy).
-            *
-            *    app.enabled('foo')
-            *    // => false
-            *
-            *    app.enable('foo')
-            *    app.enabled('foo')
-            *    // => true
-            */
-        enabled(setting: string): boolean;
-
-        /**
-            * Check if `setting` is disabled.
-            *
-            *    app.disabled('foo')
-            *    // => true
-            *
-            *    app.enable('foo')
-            *    app.disabled('foo')
-            *    // => false
-            *
-            * @param setting
-            */
-        disabled(setting: string): boolean;
-
-        /**
-            * Enable `setting`.
-            *
-            * @param setting
-            */
-        enable(setting: string): Application;
-
-        /**
-            * Disable `setting`.
-            *
-            * @param setting
-            */
-        disable(setting: string): Application;
-
-        /**
-            * Configure callback for zero or more envs,
-            * when no `env` is specified that callback will
-            * be invoked for all environments. Any combination
-            * can be used multiple times, in any order desired.
-            *
-            * Examples:
-            *
-            *    app.configure(function(){
-            *      // executed for all envs
-            *    });
-            *
-            *    app.configure('stage', function(){
-            *      // executed staging env
-            *    });
-            *
-            *    app.configure('stage', 'production', function(){
-            *      // executed for stage and production
-            *    });
-            *
-            * Note:
-            *
-            *  These callbacks are invoked immediately, and
-            *  are effectively sugar for the following:
-            *
-            *     var env = process.env.NODE_ENV || 'development';
-            *
-            *      switch (env) {
-            *        case 'development':
-            *          ...
-            *          break;
-            *        case 'stage':
-            *          ...
-            *          break;
-            *        case 'production':
-            *          ...
-            *          break;
-            *      }
-            *
-            * @param env
-            * @param fn
-            */
-        configure(fn: Function): Application;
-        configure(env0: string, fn: Function): Application;
-        configure(env0: string, env1: string, fn: Function): Application;
-        configure(env0: string, env1: string, env2: string, fn: Function): Application;
-        configure(env0: string, env1: string, env2: string, env3: string, fn: Function): Application;
-        configure(env0: string, env1: string, env2: string, env3: string, env4: string, fn: Function): Application;
-
-        /**
-            * Render the given view `name` name with `options`
-            * and a callback accepting an error and the
-            * rendered template string.
-            *
-            * Example:
-            *
-            *    app.render('email', { name: 'Tobi' }, function(err, html){
-            *      // ...
-            *    })
-            *
-            * @param name
-            * @param options or fn
-            * @param fn
-            */
-        render(name: string, options?: Object, callback?: (err: Error, html: string) => void): void;
-        render(name: string, callback: (err: Error, html: string) => void): void;
-
-
-        /**
-            * Listen for connections.
-            *
-            * A node `http.Server` is returned, with this
-            * application (which is a `Function`) as its
-            * callback. If you wish to create both an HTTP
-            * and HTTPS server you may do so with the "http"
-            * and "https" modules as shown here:
-            *
-            *    var http = require('http')
-            *      , https = require('https')
-            *      , express = require('express')
-            *      , app = express();
-            *
-            *    http.createServer(app).listen(80);
-            *    https.createServer({ ... }, app).listen(443);
-            */
-        listen(port: number, hostname: string, backlog: number, callback?: Function): http.Server;
-        listen(port: number, hostname: string, callback?: Function): http.Server;
-        listen(port: number, callback?: Function): http.Server;
-        listen(path: string, callback?: Function): http.Server;
-        listen(handle: any, listeningListener?: Function): http.Server;
-
-        route(path: string): IRoute;
-
-        router: string;
-
-        settings: any;
-
-        resource: any;
-
-        map: any;
-
-        locals: any;
-
-        /**
-            * The app.routes object houses all of the routes defined mapped by the
-            * associated HTTP verb. This object may be used for introspection
-            * capabilities, for example Express uses this internally not only for
-            * routing but to provide default OPTIONS behaviour unless app.options()
-            * is used. Your application or framework may also remove routes by
-            * simply by removing them from this object.
-            */
-        routes: any;
-    }
-
-    interface Express extends Application {
-        /**
-            * Framework version.
-            */
-        version: string;
-
-        /**
-            * Expose mime.
-            */
-        mime: string;
-
-        (): Application;
-
-        /**
-        * Create an express application.
-        */
-        createApplication(): Application;
-
-        createServer(): Application;
-
-        application: any;
-
-        request: Request;
-
-        response: Response;
-    }
-
-    interface RequestHandler {
-        (req: Request, res: Response, next: NextFunction): any;
-    }
-}
diff --git a/express-serve-static-core/index.d.ts b/express-serve-static-core/index.d.ts
new file mode 100644
index 0000000000..4066c36baf
--- /dev/null
+++ b/express-serve-static-core/index.d.ts
@@ -0,0 +1,1062 @@
+// Type definitions for Express 4.x
+// Project: http://expressjs.com
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// This extracts the core definitions from express to prevent a circular dependency between express and serve-static
+/// <reference types="node" />
+
+declare namespace Express {
+
+    // These open interfaces may be extended in an application-specific manner via declaration merging.
+    // See for example method-override.d.ts (https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/method-override/method-override.d.ts)
+    export interface Request { }
+    export interface Response { }
+    export interface Application { }
+}
+
+declare module "express-serve-static-core" {
+    import * as http from "http";
+
+    interface IRoute {
+        path: string;
+        stack: any;
+        all(...handler: RequestHandler[]): IRoute;
+        get(...handler: RequestHandler[]): IRoute;
+        post(...handler: RequestHandler[]): IRoute;
+        put(...handler: RequestHandler[]): IRoute;
+        delete(...handler: RequestHandler[]): IRoute;
+        patch(...handler: RequestHandler[]): IRoute;
+        options(...handler: RequestHandler[]): IRoute;
+        head(...handler: RequestHandler[]): IRoute;
+    }
+
+    interface IRouterMatcher<T> {
+        (name: string | RegExp, ...handlers: RequestHandler[]): T;
+    }
+
+    interface IRouter<T> extends RequestHandler {
+        /**
+            * Map the given param placeholder `name`(s) to the given callback(s).
+            *
+            * Parameter mapping is used to provide pre-conditions to routes
+            * which use normalized placeholders. For example a _:user_id_ parameter
+            * could automatically load a user's information from the database without
+            * any additional code,
+            *
+            * The callback uses the samesignature as middleware, the only differencing
+            * being that the value of the placeholder is passed, in this case the _id_
+            * of the user. Once the `next()` function is invoked, just like middleware
+            * it will continue on to execute the route, or subsequent parameter functions.
+            *
+            *      app.param('user_id', function(req, res, next, id){
+            *        User.find(id, function(err, user){
+            *          if (err) {
+            *            next(err);
+            *          } else if (user) {
+            *            req.user = user;
+            *            next();
+            *          } else {
+            *            next(new Error('failed to load user'));
+            *          }
+            *        });
+            *      });
+            *
+            * @param name
+            * @param fn
+            */
+        param(name: string, handler: RequestParamHandler): T;
+        param(name: string, matcher: RegExp): T;
+        param(name: string, mapper: (param: any) => any): T;
+        // Alternatively, you can pass only a callback, in which case you have the opportunity to alter the app.param() API
+        param(callback: (name: string, matcher: RegExp) => RequestParamHandler): T;
+
+        /**
+            * Special-cased "all" method, applying the given route `path`,
+            * middleware, and callback to _every_ HTTP method.
+            *
+            * @param path
+            * @param fn
+            */
+        all: IRouterMatcher<T>;
+        get: IRouterMatcher<T>;
+        post: IRouterMatcher<T>;
+        put: IRouterMatcher<T>;
+        delete: IRouterMatcher<T>;
+        patch: IRouterMatcher<T>;
+        options: IRouterMatcher<T>;
+        head: IRouterMatcher<T>;
+
+        route(path: string): IRoute;
+
+        use(...handler: RequestHandler[]): T;
+        use(handler: ErrorRequestHandler | RequestHandler): T;
+        use(path: string, ...handler: RequestHandler[]): T;
+        use(path: string, handler: ErrorRequestHandler | RequestHandler): T;
+        use(path: string[], ...handler: RequestHandler[]): T;
+        use(path: string[], handler: ErrorRequestHandler): T;
+        use(path: RegExp, ...handler: RequestHandler[]): T;
+        use(path: RegExp, handler: ErrorRequestHandler): T;
+        use(path: string, router: Router): T;
+    }
+
+
+    export interface Router extends IRouter<Router> { }
+
+    interface CookieOptions {
+        maxAge?: number;
+        signed?: boolean;
+        expires?: Date;
+        httpOnly?: boolean;
+        path?: string;
+        domain?: string;
+        secure?: boolean;
+    }
+
+    interface Errback { (err: Error): void; }
+
+    interface Request extends http.ServerRequest, Express.Request {
+
+        /**
+            * Return request header.
+            *
+            * The `Referrer` header field is special-cased,
+            * both `Referrer` and `Referer` are interchangeable.
+            *
+            * Examples:
+            *
+            *     req.get('Content-Type');
+            *     // => "text/plain"
+            *
+            *     req.get('content-type');
+            *     // => "text/plain"
+            *
+            *     req.get('Something');
+            *     // => undefined
+            *
+            * Aliased as `req.header()`.
+            *
+            * @param name
+            */
+        get(name: string): string;
+
+        header(name: string): string;
+
+        headers: { [key: string]: string; };
+
+        /**
+            * Check if the given `type(s)` is acceptable, returning
+            * the best match when true, otherwise `undefined`, in which
+            * case you should respond with 406 "Not Acceptable".
+            *
+            * The `type` value may be a single mime type string
+            * such as "application/json", the extension name
+            * such as "json", a comma-delimted list such as "json, html, text/plain",
+            * or an array `["json", "html", "text/plain"]`. When a list
+            * or array is given the _best_ match, if any is returned.
+            *
+            * Examples:
+            *
+            *     // Accept: text/html
+            *     req.accepts('html');
+            *     // => "html"
+            *
+            *     // Accept: text/*, application/json
+            *     req.accepts('html');
+            *     // => "html"
+            *     req.accepts('text/html');
+            *     // => "text/html"
+            *     req.accepts('json, text');
+            *     // => "json"
+            *     req.accepts('application/json');
+            *     // => "application/json"
+            *
+            *     // Accept: text/*, application/json
+            *     req.accepts('image/png');
+            *     req.accepts('png');
+            *     // => undefined
+            *
+            *     // Accept: text/*;q=.5, application/json
+            *     req.accepts(['html', 'json']);
+            *     req.accepts('html, json');
+            *     // => "json"
+            */
+        accepts(type: string): string;
+
+        accepts(type: string[]): string;
+
+        /**
+            * Returns the first accepted charset of the specified character sets,
+            * based on the request’s Accept-Charset HTTP header field.
+            * If none of the specified charsets is accepted, returns false.
+            *
+            * For more information, or if you have issues or concerns, see accepts.
+            * @param charset
+            */
+        acceptsCharsets(charset?: string | string[]): string[];
+
+        /**
+            * Returns the first accepted encoding of the specified encodings,
+            * based on the request’s Accept-Encoding HTTP header field.
+            * If none of the specified encodings is accepted, returns false.
+            *
+            * For more information, or if you have issues or concerns, see accepts.
+            * @param encoding
+            */
+        acceptsEncodings(encoding?: string | string[]): string[];
+
+        /**
+            * Returns the first accepted language of the specified languages,
+            * based on the request’s Accept-Language HTTP header field.
+            * If none of the specified languages is accepted, returns false.
+            *
+            * For more information, or if you have issues or concerns, see accepts.
+            *
+            * @param lang
+            */
+        acceptsLanguages(lang?: string | string[]): string[];
+
+        /**
+            * Parse Range header field,
+            * capping to the given `size`.
+            *
+            * Unspecified ranges such as "0-" require
+            * knowledge of your resource length. In
+            * the case of a byte range this is of course
+            * the total number of bytes. If the Range
+            * header field is not given `null` is returned,
+            * `-1` when unsatisfiable, `-2` when syntactically invalid.
+            *
+            * NOTE: remember that ranges are inclusive, so
+            * for example "Range: users=0-3" should respond
+            * with 4 users when available, not 3.
+            *
+            * @param size
+            */
+        range(size: number): any[];
+
+        /**
+            * Return an array of Accepted media types
+            * ordered from highest quality to lowest.
+            */
+        accepted: MediaType[];
+
+        /**
+            * Return the value of param `name` when present or `defaultValue`.
+            *
+            *  - Checks route placeholders, ex: _/user/:id_
+            *  - Checks body params, ex: id=12, {"id":12}
+            *  - Checks query string params, ex: ?id=12
+            *
+            * To utilize request bodies, `req.body`
+            * should be an object. This can be done by using
+            * the `connect.bodyParser()` middleware.
+            *
+            * @param name
+            * @param defaultValue
+            */
+        param(name: string, defaultValue?: any): string;
+
+        /**
+            * Check if the incoming request contains the "Content-Type"
+            * header field, and it contains the give mime `type`.
+            *
+            * Examples:
+            *
+            *      // With Content-Type: text/html; charset=utf-8
+            *      req.is('html');
+            *      req.is('text/html');
+            *      req.is('text/*');
+            *      // => true
+            *
+            *      // When Content-Type is application/json
+            *      req.is('json');
+            *      req.is('application/json');
+            *      req.is('application/*');
+            *      // => true
+            *
+            *      req.is('html');
+            *      // => false
+            *
+            * @param type
+            */
+        is(type: string): boolean;
+
+        /**
+            * Return the protocol string "http" or "https"
+            * when requested with TLS. When the "trust proxy"
+            * setting is enabled the "X-Forwarded-Proto" header
+            * field will be trusted. If you're running behind
+            * a reverse proxy that supplies https for you this
+            * may be enabled.
+            */
+        protocol: string;
+
+        /**
+            * Short-hand for:
+            *
+            *    req.protocol == 'https'
+            */
+        secure: boolean;
+
+        /**
+            * Return the remote address, or when
+            * "trust proxy" is `true` return
+            * the upstream addr.
+            */
+        ip: string;
+
+        /**
+            * When "trust proxy" is `true`, parse
+            * the "X-Forwarded-For" ip address list.
+            *
+            * For example if the value were "client, proxy1, proxy2"
+            * you would receive the array `["client", "proxy1", "proxy2"]`
+            * where "proxy2" is the furthest down-stream.
+            */
+        ips: string[];
+
+        /**
+            * Return subdomains as an array.
+            *
+            * Subdomains are the dot-separated parts of the host before the main domain of
+            * the app. By default, the domain of the app is assumed to be the last two
+            * parts of the host. This can be changed by setting "subdomain offset".
+            *
+            * For example, if the domain is "tobi.ferrets.example.com":
+            * If "subdomain offset" is not set, req.subdomains is `["ferrets", "tobi"]`.
+            * If "subdomain offset" is 3, req.subdomains is `["tobi"]`.
+            */
+        subdomains: string[];
+
+        /**
+            * Short-hand for `url.parse(req.url).pathname`.
+            */
+        path: string;
+
+        /**
+            * Parse the "Host" header field hostname.
+            */
+        hostname: string;
+
+        /**
+            * @deprecated Use hostname instead.
+            */
+        host: string;
+
+        /**
+            * Check if the request is fresh, aka
+            * Last-Modified and/or the ETag
+            * still match.
+            */
+        fresh: boolean;
+
+        /**
+            * Check if the request is stale, aka
+            * "Last-Modified" and / or the "ETag" for the
+            * resource has changed.
+            */
+        stale: boolean;
+
+        /**
+            * Check if the request was an _XMLHttpRequest_.
+            */
+        xhr: boolean;
+
+        //body: { username: string; password: string; remember: boolean; title: string; };
+        body: any;
+
+        //cookies: { string; remember: boolean; };
+        cookies: any;
+
+        method: string;
+
+        params: any;
+
+        user: any;
+
+        authenticatedUser: any;
+
+        /**
+            * Clear cookie `name`.
+            *
+            * @param name
+            * @param options
+            */
+        clearCookie(name: string, options?: any): Response;
+
+        query: any;
+
+        route: any;
+
+        signedCookies: any;
+
+        originalUrl: string;
+
+        url: string;
+
+        baseUrl: string;
+
+        app: Application;
+    }
+
+    interface MediaType {
+        value: string;
+        quality: number;
+        type: string;
+        subtype: string;
+    }
+
+    interface Send {
+        (status: number, body?: any): Response;
+        (body: any): Response;
+    }
+
+    interface Response extends http.ServerResponse, Express.Response {
+        /**
+            * Set status `code`.
+            *
+            * @param code
+            */
+        status(code: number): Response;
+
+        /**
+            * Set the response HTTP status code to `statusCode` and send its string representation as the response body.
+            * @link http://expressjs.com/4x/api.html#res.sendStatus
+            *
+            * Examples:
+            *
+            *    res.sendStatus(200); // equivalent to res.status(200).send('OK')
+            *    res.sendStatus(403); // equivalent to res.status(403).send('Forbidden')
+            *    res.sendStatus(404); // equivalent to res.status(404).send('Not Found')
+            *    res.sendStatus(500); // equivalent to res.status(500).send('Internal Server Error')
+            *
+            * @param code
+            */
+        sendStatus(code: number): Response;
+
+        /**
+            * Set Link header field with the given `links`.
+            *
+            * Examples:
+            *
+            *    res.links({
+            *      next: 'http://api.example.com/users?page=2',
+            *      last: 'http://api.example.com/users?page=5'
+            *    });
+            *
+            * @param links
+            */
+        links(links: any): Response;
+
+        /**
+            * Send a response.
+            *
+            * Examples:
+            *
+            *     res.send(new Buffer('wahoo'));
+            *     res.send({ some: 'json' });
+            *     res.send('<p>some html</p>');
+            *     res.send(404, 'Sorry, cant find that');
+            *     res.send(404);
+            */
+        send: Send;
+
+        /**
+            * Send JSON response.
+            *
+            * Examples:
+            *
+            *     res.json(null);
+            *     res.json({ user: 'tj' });
+            *     res.json(500, 'oh noes!');
+            *     res.json(404, 'I dont have that');
+            */
+        json: Send;
+
+        /**
+            * Send JSON response with JSONP callback support.
+            *
+            * Examples:
+            *
+            *     res.jsonp(null);
+            *     res.jsonp({ user: 'tj' });
+            *     res.jsonp(500, 'oh noes!');
+            *     res.jsonp(404, 'I dont have that');
+            */
+        jsonp: Send;
+
+        /**
+            * Transfer the file at the given `path`.
+            *
+            * Automatically sets the _Content-Type_ response header field.
+            * The callback `fn(err)` is invoked when the transfer is complete
+            * or when an error occurs. Be sure to check `res.sentHeader`
+            * if you wish to attempt responding, as the header and some data
+            * may have already been transferred.
+            *
+            * Options:
+            *
+            *   - `maxAge`   defaulting to 0 (can be string converted by `ms`)
+            *   - `root`     root directory for relative filenames
+            *   - `headers`  object of headers to serve with file
+            *   - `dotfiles` serve dotfiles, defaulting to false; can be `"allow"` to send them
+            *
+            * Other options are passed along to `send`.
+            *
+            * Examples:
+            *
+            *  The following example illustrates how `res.sendFile()` may
+            *  be used as an alternative for the `static()` middleware for
+            *  dynamic situations. The code backing `res.sendFile()` is actually
+            *  the same code, so HTTP cache support etc is identical.
+            *
+            *     app.get('/user/:uid/photos/:file', function(req, res){
+            *       var uid = req.params.uid
+            *         , file = req.params.file;
+            *
+            *       req.user.mayViewFilesFrom(uid, function(yes){
+            *         if (yes) {
+            *           res.sendFile('/uploads/' + uid + '/' + file);
+            *         } else {
+            *           res.send(403, 'Sorry! you cant see that.');
+            *         }
+            *       });
+            *     });
+            *
+            * @api public
+            */
+        sendFile(path: string): void;
+        sendFile(path: string, options: any): void;
+        sendFile(path: string, fn: Errback): void;
+        sendFile(path: string, options: any, fn: Errback): void;
+
+        /**
+            * @deprecated Use sendFile instead.
+            */
+        sendfile(path: string): void;
+        /**
+            * @deprecated Use sendFile instead.
+            */
+        sendfile(path: string, options: any): void;
+        /**
+            * @deprecated Use sendFile instead.
+            */
+        sendfile(path: string, fn: Errback): void;
+        /**
+            * @deprecated Use sendFile instead.
+            */
+        sendfile(path: string, options: any, fn: Errback): void;
+
+        /**
+            * Transfer the file at the given `path` as an attachment.
+            *
+            * Optionally providing an alternate attachment `filename`,
+            * and optional callback `fn(err)`. The callback is invoked
+            * when the data transfer is complete, or when an error has
+            * ocurred. Be sure to check `res.headerSent` if you plan to respond.
+            *
+            * This method uses `res.sendfile()`.
+            */
+        download(path: string): void;
+        download(path: string, filename: string): void;
+        download(path: string, fn: Errback): void;
+        download(path: string, filename: string, fn: Errback): void;
+
+        /**
+            * Set _Content-Type_ response header with `type` through `mime.lookup()`
+            * when it does not contain "/", or set the Content-Type to `type` otherwise.
+            *
+            * Examples:
+            *
+            *     res.type('.html');
+            *     res.type('html');
+            *     res.type('json');
+            *     res.type('application/json');
+            *     res.type('png');
+            *
+            * @param type
+            */
+        contentType(type: string): Response;
+
+        /**
+            * Set _Content-Type_ response header with `type` through `mime.lookup()`
+            * when it does not contain "/", or set the Content-Type to `type` otherwise.
+            *
+            * Examples:
+            *
+            *     res.type('.html');
+            *     res.type('html');
+            *     res.type('json');
+            *     res.type('application/json');
+            *     res.type('png');
+            *
+            * @param type
+            */
+        type(type: string): Response;
+
+        /**
+            * Respond to the Acceptable formats using an `obj`
+            * of mime-type callbacks.
+            *
+            * This method uses `req.accepted`, an array of
+            * acceptable types ordered by their quality values.
+            * When "Accept" is not present the _first_ callback
+            * is invoked, otherwise the first match is used. When
+            * no match is performed the server responds with
+            * 406 "Not Acceptable".
+            *
+            * Content-Type is set for you, however if you choose
+            * you may alter this within the callback using `res.type()`
+            * or `res.set('Content-Type', ...)`.
+            *
+            *    res.format({
+            *      'text/plain': function(){
+            *        res.send('hey');
+            *      },
+            *
+            *      'text/html': function(){
+            *        res.send('<p>hey</p>');
+            *      },
+            *
+            *      'appliation/json': function(){
+            *        res.send({ message: 'hey' });
+            *      }
+            *    });
+            *
+            * In addition to canonicalized MIME types you may
+            * also use extnames mapped to these types:
+            *
+            *    res.format({
+            *      text: function(){
+            *        res.send('hey');
+            *      },
+            *
+            *      html: function(){
+            *        res.send('<p>hey</p>');
+            *      },
+            *
+            *      json: function(){
+            *        res.send({ message: 'hey' });
+            *      }
+            *    });
+            *
+            * By default Express passes an `Error`
+            * with a `.status` of 406 to `next(err)`
+            * if a match is not made. If you provide
+            * a `.default` callback it will be invoked
+            * instead.
+            *
+            * @param obj
+            */
+        format(obj: any): Response;
+
+        /**
+            * Set _Content-Disposition_ header to _attachment_ with optional `filename`.
+            *
+            * @param filename
+            */
+        attachment(filename?: string): Response;
+
+        /**
+            * Set header `field` to `val`, or pass
+            * an object of header fields.
+            *
+            * Examples:
+            *
+            *    res.set('Foo', ['bar', 'baz']);
+            *    res.set('Accept', 'application/json');
+            *    res.set({ Accept: 'text/plain', 'X-API-Key': 'tobi' });
+            *
+            * Aliased as `res.header()`.
+            */
+        set(field: any): Response;
+        set(field: string, value?: string): Response;
+
+        header(field: any): Response;
+        header(field: string, value?: string): Response;
+
+        // Property indicating if HTTP headers has been sent for the response.
+        headersSent: boolean;
+
+        /**
+            * Get value for header `field`.
+            *
+            * @param field
+            */
+        get(field: string): string;
+
+        /**
+            * Clear cookie `name`.
+            *
+            * @param name
+            * @param options
+            */
+        clearCookie(name: string, options?: any): Response;
+
+        /**
+            * Set cookie `name` to `val`, with the given `options`.
+            *
+            * Options:
+            *
+            *    - `maxAge`   max-age in milliseconds, converted to `expires`
+            *    - `signed`   sign the cookie
+            *    - `path`     defaults to "/"
+            *
+            * Examples:
+            *
+            *    // "Remember Me" for 15 minutes
+            *    res.cookie('rememberme', '1', { expires: new Date(Date.now() + 900000), httpOnly: true });
+            *
+            *    // save as above
+            *    res.cookie('rememberme', '1', { maxAge: 900000, httpOnly: true })
+            */
+        cookie(name: string, val: string, options: CookieOptions): Response;
+        cookie(name: string, val: any, options: CookieOptions): Response;
+        cookie(name: string, val: any): Response;
+
+        /**
+            * Set the location header to `url`.
+            *
+            * The given `url` can also be the name of a mapped url, for
+            * example by default express supports "back" which redirects
+            * to the _Referrer_ or _Referer_ headers or "/".
+            *
+            * Examples:
+            *
+            *    res.location('/foo/bar').;
+            *    res.location('http://example.com');
+            *    res.location('../login'); // /blog/post/1 -> /blog/login
+            *
+            * Mounting:
+            *
+            *   When an application is mounted and `res.location()`
+            *   is given a path that does _not_ lead with "/" it becomes
+            *   relative to the mount-point. For example if the application
+            *   is mounted at "/blog", the following would become "/blog/login".
+            *
+            *      res.location('login');
+            *
+            *   While the leading slash would result in a location of "/login":
+            *
+            *      res.location('/login');
+            *
+            * @param url
+            */
+        location(url: string): Response;
+
+        /**
+            * Redirect to the given `url` with optional response `status`
+            * defaulting to 302.
+            *
+            * The resulting `url` is determined by `res.location()`, so
+            * it will play nicely with mounted apps, relative paths,
+            * `"back"` etc.
+            *
+            * Examples:
+            *
+            *    res.redirect('/foo/bar');
+            *    res.redirect('http://example.com');
+            *    res.redirect(301, 'http://example.com');
+            *    res.redirect('http://example.com', 301);
+            *    res.redirect('../login'); // /blog/post/1 -> /blog/login
+            */
+        redirect(url: string): void;
+        redirect(status: number, url: string): void;
+        redirect(url: string, status: number): void;
+
+        /**
+            * Render `view` with the given `options` and optional callback `fn`.
+            * When a callback function is given a response will _not_ be made
+            * automatically, otherwise a response of _200_ and _text/html_ is given.
+            *
+            * Options:
+            *
+            *  - `cache`     boolean hinting to the engine it should cache
+            *  - `filename`  filename of the view being rendered
+            */
+        render(view: string, options?: Object, callback?: (err: Error, html: string) => void): void;
+        render(view: string, callback?: (err: Error, html: string) => void): void;
+
+        locals: any;
+
+        charset: string;
+    }
+
+    interface NextFunction {
+        (err?: any): void;
+    }
+
+    interface ErrorRequestHandler {
+        (err: any, req: Request, res: Response, next: NextFunction): any;
+    }
+
+
+    interface Handler extends RequestHandler { }
+
+    interface RequestParamHandler {
+        (req: Request, res: Response, next: NextFunction, param: any): any;
+    }
+
+    interface Application extends IRouter<Application>, Express.Application {
+        /**
+            * Initialize the server.
+            *
+            *   - setup default configuration
+            *   - setup default middleware
+            *   - setup route reflection methods
+            */
+        init(): void;
+
+        /**
+            * Initialize application configuration.
+            */
+        defaultConfiguration(): void;
+
+        /**
+            * Register the given template engine callback `fn`
+            * as `ext`.
+            *
+            * By default will `require()` the engine based on the
+            * file extension. For example if you try to render
+            * a "foo.jade" file Express will invoke the following internally:
+            *
+            *     app.engine('jade', require('jade').__express);
+            *
+            * For engines that do not provide `.__express` out of the box,
+            * or if you wish to "map" a different extension to the template engine
+            * you may use this method. For example mapping the EJS template engine to
+            * ".html" files:
+            *
+            *     app.engine('html', require('ejs').renderFile);
+            *
+            * In this case EJS provides a `.renderFile()` method with
+            * the same signature that Express expects: `(path, options, callback)`,
+            * though note that it aliases this method as `ejs.__express` internally
+            * so if you're using ".ejs" extensions you dont need to do anything.
+            *
+            * Some template engines do not follow this convention, the
+            * [Consolidate.js](https://github.com/visionmedia/consolidate.js)
+            * library was created to map all of node's popular template
+            * engines to follow this convention, thus allowing them to
+            * work seamlessly within Express.
+            */
+        engine(ext: string, fn: Function): Application;
+
+        /**
+            * Assign `setting` to `val`, or return `setting`'s value.
+            *
+            *    app.set('foo', 'bar');
+            *    app.get('foo');
+            *    // => "bar"
+            *    app.set('foo', ['bar', 'baz']);
+            *    app.get('foo');
+            *    // => ["bar", "baz"]
+            *
+            * Mounted servers inherit their parent server's settings.
+            *
+            * @param setting
+            * @param val
+            */
+        set(setting: string, val: any): Application;
+        get: {
+            (name: string): any; // Getter
+            (name: string | RegExp, ...handlers: RequestHandler[]): Application;
+        };
+
+        /**
+            * Return the app's absolute pathname
+            * based on the parent(s) that have
+            * mounted it.
+            *
+            * For example if the application was
+            * mounted as "/admin", which itself
+            * was mounted as "/blog" then the
+            * return value would be "/blog/admin".
+            */
+        path(): string;
+
+        /**
+            * Check if `setting` is enabled (truthy).
+            *
+            *    app.enabled('foo')
+            *    // => false
+            *
+            *    app.enable('foo')
+            *    app.enabled('foo')
+            *    // => true
+            */
+        enabled(setting: string): boolean;
+
+        /**
+            * Check if `setting` is disabled.
+            *
+            *    app.disabled('foo')
+            *    // => true
+            *
+            *    app.enable('foo')
+            *    app.disabled('foo')
+            *    // => false
+            *
+            * @param setting
+            */
+        disabled(setting: string): boolean;
+
+        /**
+            * Enable `setting`.
+            *
+            * @param setting
+            */
+        enable(setting: string): Application;
+
+        /**
+            * Disable `setting`.
+            *
+            * @param setting
+            */
+        disable(setting: string): Application;
+
+        /**
+            * Configure callback for zero or more envs,
+            * when no `env` is specified that callback will
+            * be invoked for all environments. Any combination
+            * can be used multiple times, in any order desired.
+            *
+            * Examples:
+            *
+            *    app.configure(function(){
+            *      // executed for all envs
+            *    });
+            *
+            *    app.configure('stage', function(){
+            *      // executed staging env
+            *    });
+            *
+            *    app.configure('stage', 'production', function(){
+            *      // executed for stage and production
+            *    });
+            *
+            * Note:
+            *
+            *  These callbacks are invoked immediately, and
+            *  are effectively sugar for the following:
+            *
+            *     var env = process.env.NODE_ENV || 'development';
+            *
+            *      switch (env) {
+            *        case 'development':
+            *          ...
+            *          break;
+            *        case 'stage':
+            *          ...
+            *          break;
+            *        case 'production':
+            *          ...
+            *          break;
+            *      }
+            *
+            * @param env
+            * @param fn
+            */
+        configure(fn: Function): Application;
+        configure(env0: string, fn: Function): Application;
+        configure(env0: string, env1: string, fn: Function): Application;
+        configure(env0: string, env1: string, env2: string, fn: Function): Application;
+        configure(env0: string, env1: string, env2: string, env3: string, fn: Function): Application;
+        configure(env0: string, env1: string, env2: string, env3: string, env4: string, fn: Function): Application;
+
+        /**
+            * Render the given view `name` name with `options`
+            * and a callback accepting an error and the
+            * rendered template string.
+            *
+            * Example:
+            *
+            *    app.render('email', { name: 'Tobi' }, function(err, html){
+            *      // ...
+            *    })
+            *
+            * @param name
+            * @param options or fn
+            * @param fn
+            */
+        render(name: string, options?: Object, callback?: (err: Error, html: string) => void): void;
+        render(name: string, callback: (err: Error, html: string) => void): void;
+
+
+        /**
+            * Listen for connections.
+            *
+            * A node `http.Server` is returned, with this
+            * application (which is a `Function`) as its
+            * callback. If you wish to create both an HTTP
+            * and HTTPS server you may do so with the "http"
+            * and "https" modules as shown here:
+            *
+            *    var http = require('http')
+            *      , https = require('https')
+            *      , express = require('express')
+            *      , app = express();
+            *
+            *    http.createServer(app).listen(80);
+            *    https.createServer({ ... }, app).listen(443);
+            */
+        listen(port: number, hostname: string, backlog: number, callback?: Function): http.Server;
+        listen(port: number, hostname: string, callback?: Function): http.Server;
+        listen(port: number, callback?: Function): http.Server;
+        listen(path: string, callback?: Function): http.Server;
+        listen(handle: any, listeningListener?: Function): http.Server;
+
+        route(path: string): IRoute;
+
+        router: string;
+
+        settings: any;
+
+        resource: any;
+
+        map: any;
+
+        locals: any;
+
+        /**
+            * The app.routes object houses all of the routes defined mapped by the
+            * associated HTTP verb. This object may be used for introspection
+            * capabilities, for example Express uses this internally not only for
+            * routing but to provide default OPTIONS behaviour unless app.options()
+            * is used. Your application or framework may also remove routes by
+            * simply by removing them from this object.
+            */
+        routes: any;
+    }
+
+    interface Express extends Application {
+        /**
+            * Framework version.
+            */
+        version: string;
+
+        /**
+            * Expose mime.
+            */
+        mime: string;
+
+        (): Application;
+
+        /**
+        * Create an express application.
+        */
+        createApplication(): Application;
+
+        createServer(): Application;
+
+        application: any;
+
+        request: Request;
+
+        response: Response;
+    }
+
+    interface RequestHandler {
+        (req: Request, res: Response, next: NextFunction): any;
+    }
+}
diff --git a/express-serve-static-core/tsconfig.json b/express-serve-static-core/tsconfig.json
new file mode 100644
index 0000000000..b64e880fd9
--- /dev/null
+++ b/express-serve-static-core/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-serve-static-core-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/express-session/express-session-tests.ts b/express-session/express-session-tests.ts
index 1e1f909b14..b36a04b42f 100644
--- a/express-session/express-session-tests.ts
+++ b/express-session/express-session-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./express-session.d.ts" />
+
 
 import express = require('express');
 import session = require('express-session');
diff --git a/express-session/express-session.d.ts b/express-session/express-session.d.ts
deleted file mode 100644
index 156e9404fc..0000000000
--- a/express-session/express-session.d.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-// Type definitions for express-session
-// Project: https://www.npmjs.org/package/express-session
-// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-/// <reference path="../node/node.d.ts" />
-
-declare namespace Express {
-
-  export interface Request {
-    session?: Session;
-  }
-
-  export interface Session {
-    [key: string]: any;
-
-    regenerate: (callback: (err: any) => void) => void;
-    destroy: (callback: (err: any) => void) => void;
-    reload: (callback: (err: any) => void) => void;
-    save: (callback: (err: any) => void) => void;
-    touch: (callback: (err: any) => void) => void;
-
-    cookie: SessionCookie;
-  }
-  export interface SessionCookie {
-    originalMaxAge: number;
-    path: string;
-    maxAge: number;
-    secure?: boolean;
-    httpOnly: boolean;
-    domain?: string;
-    expires: Date;
-    serialize: (name: string, value: string) => string;
-  }
-}
-
-declare module "express-session" {
-  import express = require('express');
-  import node = require('events');
-
-  function session(options?: session.SessionOptions): express.RequestHandler;
-
-  namespace session {
-    export interface SessionOptions {
-      secret: string;
-      name?: string;
-      store?: Store | MemoryStore;
-      cookie?: express.CookieOptions;
-      genid?: (req: express.Request) => string;
-      rolling?: boolean;
-      resave?: boolean;
-      proxy?: boolean;
-      saveUninitialized?: boolean;
-      unset?: string;
-    }
-
-	export interface BaseMemoryStore {
-      get: (sid: string, callback: (err: any, session: Express.Session) => void) => void;
-      set: (sid: string, session: Express.Session, callback: (err: any) => void) => void;
-      destroy: (sid: string, callback: (err: any) => void) => void;
-      length?: (callback: (err: any, length: number) => void) => void;
-      clear?: (callback: (err: any) => void) => void;
-    }
-
-    export abstract class Store extends node.EventEmitter {
-	  constructor(config?: any);
-
-	  regenerate (req: express.Request, fn: (err: any) => any): void;
-      load (sid: string, fn: (err: any, session: Express.Session) => any): void;
-      createSession (req: express.Request, sess: Express.Session): void;
-      
-      get: (sid: string, callback: (err: any, session: Express.Session) => void) => void;
-      set: (sid: string, session: Express.Session, callback: (err: any) => void) => void;
-      destroy: (sid: string, callback: (err: any) => void) => void;
-      all: (callback: (err: any, obj: { [sid: string]: Express.Session; }) => void) => void;
-      length: (callback: (err: any, length: number) => void) => void;
-      clear: (callback: (err: any) => void) => void;
-    }
-
-    export class MemoryStore implements BaseMemoryStore {
-      get: (sid: string, callback: (err: any, session: Express.Session) => void) => void;
-      set: (sid: string, session: Express.Session, callback: (err: any) => void) => void;
-      destroy: (sid: string, callback: (err: any) => void) => void;
-      all: (callback: (err: any, obj: { [sid: string]: Express.Session; }) => void) => void;
-      length: (callback: (err: any, length: number) => void) => void;
-      clear: (callback: (err: any) => void) => void;
-    }
-  }
-
-  export = session;
-}
-
diff --git a/express-session/index.d.ts b/express-session/index.d.ts
new file mode 100644
index 0000000000..2f2cf68142
--- /dev/null
+++ b/express-session/index.d.ts
@@ -0,0 +1,93 @@
+// Type definitions for express-session
+// Project: https://www.npmjs.org/package/express-session
+// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="node" />
+
+declare namespace Express {
+
+  export interface Request {
+    session?: Session;
+  }
+
+  export interface Session {
+    [key: string]: any;
+
+    regenerate: (callback: (err: any) => void) => void;
+    destroy: (callback: (err: any) => void) => void;
+    reload: (callback: (err: any) => void) => void;
+    save: (callback: (err: any) => void) => void;
+    touch: (callback: (err: any) => void) => void;
+
+    cookie: SessionCookie;
+  }
+  export interface SessionCookie {
+    originalMaxAge: number;
+    path: string;
+    maxAge: number;
+    secure?: boolean;
+    httpOnly: boolean;
+    domain?: string;
+    expires: Date;
+    serialize: (name: string, value: string) => string;
+  }
+}
+
+declare module "express-session" {
+  import express = require('express');
+  import node = require('events');
+
+  function session(options?: session.SessionOptions): express.RequestHandler;
+
+  namespace session {
+    export interface SessionOptions {
+      secret: string;
+      name?: string;
+      store?: Store | MemoryStore;
+      cookie?: express.CookieOptions;
+      genid?: (req: express.Request) => string;
+      rolling?: boolean;
+      resave?: boolean;
+      proxy?: boolean;
+      saveUninitialized?: boolean;
+      unset?: string;
+    }
+
+	export interface BaseMemoryStore {
+      get: (sid: string, callback: (err: any, session: Express.Session) => void) => void;
+      set: (sid: string, session: Express.Session, callback: (err: any) => void) => void;
+      destroy: (sid: string, callback: (err: any) => void) => void;
+      length?: (callback: (err: any, length: number) => void) => void;
+      clear?: (callback: (err: any) => void) => void;
+    }
+
+    export abstract class Store extends node.EventEmitter {
+	  constructor(config?: any);
+
+	  regenerate (req: express.Request, fn: (err: any) => any): void;
+      load (sid: string, fn: (err: any, session: Express.Session) => any): void;
+      createSession (req: express.Request, sess: Express.Session): void;
+      
+      get: (sid: string, callback: (err: any, session: Express.Session) => void) => void;
+      set: (sid: string, session: Express.Session, callback: (err: any) => void) => void;
+      destroy: (sid: string, callback: (err: any) => void) => void;
+      all: (callback: (err: any, obj: { [sid: string]: Express.Session; }) => void) => void;
+      length: (callback: (err: any, length: number) => void) => void;
+      clear: (callback: (err: any) => void) => void;
+    }
+
+    export class MemoryStore implements BaseMemoryStore {
+      get: (sid: string, callback: (err: any, session: Express.Session) => void) => void;
+      set: (sid: string, session: Express.Session, callback: (err: any) => void) => void;
+      destroy: (sid: string, callback: (err: any) => void) => void;
+      all: (callback: (err: any, obj: { [sid: string]: Express.Session; }) => void) => void;
+      length: (callback: (err: any, length: number) => void) => void;
+      clear: (callback: (err: any) => void) => void;
+    }
+  }
+
+  export = session;
+}
+
diff --git a/express-session/tsconfig.json b/express-session/tsconfig.json
new file mode 100644
index 0000000000..f9dd8a5923
--- /dev/null
+++ b/express-session/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-session-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/express-unless/express-unless-tests.ts b/express-unless/express-unless-tests.ts
index a6d57d486a..4a90728f1c 100644
--- a/express-unless/express-unless-tests.ts
+++ b/express-unless/express-unless-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./express-unless.d.ts" />
 
 import express = require('express');
 import unless = require('express-unless');
diff --git a/express-unless/express-unless.d.ts b/express-unless/express-unless.d.ts
deleted file mode 100644
index 81b3b08d02..0000000000
--- a/express-unless/express-unless.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// Type definitions for express-unless
-// Project: https://www.npmjs.org/package/express-unless
-// Definitions by: Wonshik Kim <https://github.com/wokim/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "express-unless" {
-    import express = require('express');
-
-    function unless(options:unless.Options): express.RequestHandler;
-
-    namespace unless {
-        export interface Options {
-            custom?: (req: express.Request) => boolean;
-            path?: any; // TODO: union type 'string|string[]' is not supported yet
-            ext?: any; // TODO: union type 'string|string[]' is not supported yet
-            method?: any; // TODO: union type 'string|string[]' is not supported yet
-        }
-        export interface RequestHandler extends express.RequestHandler {
-            unless?: typeof unless;
-        }
-    }
-
-    export = unless;
-}
diff --git a/express-unless/index.d.ts b/express-unless/index.d.ts
new file mode 100644
index 0000000000..e13157d074
--- /dev/null
+++ b/express-unless/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for express-unless
+// Project: https://www.npmjs.org/package/express-unless
+// Definitions by: Wonshik Kim <https://github.com/wokim/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+
+import express = require('express');
+
+declare function unless(options: unless.Options): express.RequestHandler;
+
+declare namespace unless {
+    export interface Options {
+        custom?: (req: express.Request) => boolean;
+        path?: any; // TODO: union type 'string|string[]' is not supported yet
+        ext?: any; // TODO: union type 'string|string[]' is not supported yet
+        method?: any; // TODO: union type 'string|string[]' is not supported yet
+    }
+    export interface RequestHandler extends express.RequestHandler {
+        unless?: typeof unless;
+    }
+}
+
+export = unless;
diff --git a/express-unless/tsconfig.json b/express-unless/tsconfig.json
new file mode 100644
index 0000000000..6f9cd474f3
--- /dev/null
+++ b/express-unless/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-unless-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/express-useragent/express-useragent-tests.ts b/express-useragent/express-useragent-tests.ts
index b4d613d8b6..93b0c20eb6 100644
--- a/express-useragent/express-useragent-tests.ts
+++ b/express-useragent/express-useragent-tests.ts
@@ -1,8 +1,8 @@
 
-/// <reference path="../express/express.d.ts" />
-/// <reference path="./express-useragent.d.ts" />
 
-import express = require("express");
+
+
+import express = require("../express");
 import useragent = require("express-useragent");
 
 var app = express();
diff --git a/express-useragent/express-useragent.d.ts b/express-useragent/express-useragent.d.ts
deleted file mode 100644
index 4ea3d91d73..0000000000
--- a/express-useragent/express-useragent.d.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-// Type definitions for express-useragent 0.2.4
-// Project: https://www.npmjs.org/package/express-useragent
-// Definitions by: Isman Usoh <https://github.com/isman-usoh/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare namespace Express {
-    interface ExpressUserAgent {
-        isMobile: boolean;
-        isTablet: boolean;
-        isiPad: boolean;
-        isiPod: boolean;
-        isiPhone: boolean;
-        isAndroid: boolean;
-        isBlackberry: boolean;
-        isOpera: boolean;
-        isIE: boolean;
-        isEdge: boolean;
-        isIECompatibilityMode: boolean;
-        isSafari: boolean;
-        isFirefox: boolean;
-        isWebkit: boolean;
-        isChrome: boolean;
-        isKonqueror: boolean;
-        isOmniWeb: boolean;
-        isSeaMonkey: boolean;
-        isFlock: boolean;
-        isAmaya: boolean;
-        isEpiphany: boolean;
-        isDesktop: boolean;
-        isWindows: boolean;
-        isWindowsPhone: boolean;
-        isLinux: boolean;
-        isLinux64: boolean;
-        isMac: boolean;
-        isChromeOS: boolean;
-        isBada: boolean;
-        isSamsung: boolean;
-        isRaspberry: boolean;
-        isBot: boolean;
-        isCurl: boolean;
-        isAndroidTablet: boolean;
-        isWinJs: boolean;
-        isKindleFire: boolean;
-        isSilk: boolean;
-        isCaptive: boolean;
-        isSmartTV: boolean;
-        silkAccelerated: boolean;
-        browser: string;
-        version: string;
-        os: string;
-        platform: string;
-        geoIp: any;
-        source: string;
-    }
-
-    interface Request {
-        useragent?: ExpressUserAgent;
-    }
-}
-
-declare module "express-useragent" {
-    import express = require("express");
-
-    export function parse(source: string): Express.ExpressUserAgent;
-    export function express(): (req: express.Request, res: express.Response, next?: Function) => void;
-}
diff --git a/express-useragent/index.d.ts b/express-useragent/index.d.ts
new file mode 100644
index 0000000000..db04de3a59
--- /dev/null
+++ b/express-useragent/index.d.ts
@@ -0,0 +1,73 @@
+// Type definitions for express-useragent 0.2.4
+// Project: https://www.npmjs.org/package/express-useragent
+// Definitions by: Isman Usoh <https://github.com/isman-usoh/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare namespace Express {
+   
+    interface Request {
+        useragent?: ExpressUseragent.UserAgent;
+    }
+}
+
+declare namespace ExpressUseragent {
+    import express = Express;
+    
+    interface UserAgent {
+        isMobile: boolean;
+        isTablet: boolean;
+        isiPad: boolean;
+        isiPod: boolean;
+        isiPhone: boolean;
+        isAndroid: boolean;
+        isBlackberry: boolean;
+        isOpera: boolean;
+        isIE: boolean;
+        isEdge: boolean;
+        isIECompatibilityMode: boolean;
+        isSafari: boolean;
+        isFirefox: boolean;
+        isWebkit: boolean;
+        isChrome: boolean;
+        isKonqueror: boolean;
+        isOmniWeb: boolean;
+        isSeaMonkey: boolean;
+        isFlock: boolean;
+        isAmaya: boolean;
+        isEpiphany: boolean;
+        isDesktop: boolean;
+        isWindows: boolean;
+        isWindowsPhone: boolean;
+        isLinux: boolean;
+        isLinux64: boolean;
+        isMac: boolean;
+        isChromeOS: boolean;
+        isBada: boolean;
+        isSamsung: boolean;
+        isRaspberry: boolean;
+        isBot: boolean;
+        isCurl: boolean;
+        isAndroidTablet: boolean;
+        isWinJs: boolean;
+        isKindleFire: boolean;
+        isSilk: boolean;
+        isCaptive: boolean;
+        isSmartTV: boolean;
+        silkAccelerated: boolean;
+        browser: string;
+        version: string;
+        os: string;
+        platform: string;
+        geoIp: any;
+        source: string;
+    }
+
+    function parse(source: string): UserAgent;
+    function express(): (req: express.Request, res: express.Response, next?: Function) => void;
+}
+
+declare module "express-useragent" {
+    export = ExpressUseragent;
+}
diff --git a/express-useragent/tsconfig.json b/express-useragent/tsconfig.json
new file mode 100644
index 0000000000..324a7ee4b9
--- /dev/null
+++ b/express-useragent/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-useragent-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/express-validator/express-validator-tests.ts b/express-validator/express-validator-tests.ts
index 74bd277e46..8f4f9bab9c 100644
--- a/express-validator/express-validator-tests.ts
+++ b/express-validator/express-validator-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./express-validator.d.ts"/>
-
 /* Usage Example from https://github.com/ctavan/express-validator */
 
 import util = require('util')
diff --git a/express-validator/express-validator.d.ts b/express-validator/express-validator.d.ts
deleted file mode 100644
index 93665b381f..0000000000
--- a/express-validator/express-validator.d.ts
+++ /dev/null
@@ -1,198 +0,0 @@
-// Type definitions for express-validator 2.9.0
-// Project: https://github.com/ctavan/express-validator
-// Definitions by: Nathan Ridley <https://github.com/axefrog/>, Jonathan Häberle <http://dreampulse.de>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-// Add RequestValidation Interface on to Express's Request Interface.
-declare namespace Express {
-	interface Request extends ExpressValidator.RequestValidation {}
-}
-
-// External express-validator module.
-declare module "express-validator" {
-	import express = require('express');
-
-	/**
-	 *
-	 * @middlewareOptions see: https://github.com/ctavan/express-validator#middleware-options
-	 */
-	function ExpressValidator(middlewareOptions?:any):express.RequestHandler;
-
-	export = ExpressValidator;
-}
-
-// Internal Module.
-declare namespace ExpressValidator {
-
-	export interface ValidationError {
-		msg: string;
-		param: string;
-	}
-
-	interface ValidatorFunction { (item: string, message: string): Validator; }
-	interface SanitizerFunction { (item: string): Sanitizer; }
-	interface Dictionary<T> { [key: string]: T; }
-
-	export interface RequestValidation {
-		assert: ValidatorFunction;
-		check: ValidatorFunction;
-		checkBody: ValidatorFunction;
-		checkFiles: ValidatorFunction;
-		checkHeader: ValidatorFunction;
-		checkParams: ValidatorFunction;
-		checkQuery: ValidatorFunction;
-		validate: ValidatorFunction;
-
-		filter: SanitizerFunction;
-		sanitize: SanitizerFunction;
-
-		onValidationError(errback: (msg: string) => void): void;
-		validationErrors(mapped?: boolean): Dictionary<any> | any[];
-	}
-
-	export interface Validator {
-		/**
-		 * Alias for regex()
-		 */
-		is(): Validator;
-		/**
-		 * Alias for notRegex()
-		 */
-		not(): Validator;
-		isEmail(): Validator;
-		/**
-		 * Accepts http, https, ftp
-		 */
-		isUrl(): Validator;
-
-		/**
-		 * Combines isIPv4 and isIPv6
-		 */
-		isIP(): Validator;
-		isIPv4(): Validator;
-		isIPv6(): Validator;
-		isMACAddress(): Validator;
-		isAlpha(): Validator;
-		isAlphanumeric(): Validator;
-		isNumeric(): Validator;
-		isHexadecimal(): Validator;
-		/**
-		 * Accepts valid hexcolors with or without # prefix
-		 */
-		isHexColor(): Validator;
-		/**
-		 * isNumeric accepts zero padded numbers, e.g. '001', isInt doesn't
-		 */
-		isInt(): Validator;
-		isLowercase(): Validator;
-		isUppercase(): Validator;
-		isDecimal(): Validator;
-		/**
-		 * Alias for isDecimal
-		 */
-		isFloat(): Validator;
-		/**
-		 * Check if length is 0
-		 */
-		notNull(): Validator;
-		isNull(): Validator;
-		/**
-		 * Not just whitespace (input.trim().length !== 0)
-		 */
-		notEmpty(): Validator;
-		equals(equals:any): Validator;
-		contains(str:string): Validator;
-		notContains(str:string): Validator;
-		/**
-		 * Usage: regex(/[a-z]/i) or regex('[a-z]','i')
-		 */
-		regex(pattern:string, modifiers:string): Validator;
-		notRegex(pattern:string, modifiers:string): Validator;
-		/**
-		 * max is optional
-		 */
-		len(min:number, max?:number): Validator;
-		/**
-		 * Version can be 3, 4 or 5 or empty, see http://en.wikipedia.org/wiki/Universally_unique_identifier
-		 */
-		isUUID(version:number): Validator;
-		/**
-		 * Alias for isUUID(3)
-		 */
-		isUUIDv3(): Validator;
-		/**
-		 * Alias for isUUID(4)
-		 */
-		isUUIDv4(): Validator;
-		/**
-		 * Alias for isUUID(5)
-		 */
-		isUUIDv5(): Validator;
-		/**
-		 * Uses Date.parse() - regex is probably a better choice
-		 */
-		isDate(): Validator;
-		/**
-		 * Argument is optional and defaults to today. Comparison is non-inclusive
-		 */
-		isAfter(date:Date): Validator;
-		/**
-		 * Argument is optional and defaults to today. Comparison is non-inclusive
-		 */
-		isBefore(date:Date): Validator;
-		isIn(options:string): Validator;
-		isIn(options:string[]): Validator;
-		notIn(options:string): Validator;
-		notIn(options:string[]): Validator;
-		max(val:string): Validator;
-		min(val:string): Validator;
-		/**
-		 * Will work against Visa, MasterCard, American Express, Discover, Diners Club, and JCB card numbering formats
-		 */
-		isCreditCard(): Validator;
-		/**
-		 * Check an input only when the input exists
-		 */
-		optional(): Validator;
-	}
-
-	interface Sanitizer {
-		/**
-		 * Trim optional `chars`, default is to trim whitespace (\r\n\t )
-		 */
-		trim(...chars:string[]): Sanitizer;
-		ltrim(...chars:string[]): Sanitizer;
-		rtrim(...chars:string[]): Sanitizer;
-		ifNull(replace:any): Sanitizer;
-		toFloat(): Sanitizer;
-		toInt(): Sanitizer;
-		/**
-		 * True unless str = '0', 'false', or str.length == 0
-		 */
-		toBoolean(): Sanitizer;
-		/**
-		 * False unless str = '1' or 'true'
-		 */
-		toBooleanStrict(): Sanitizer;
-		/**
-		 * Decode HTML entities
-		 */
-		entityDecode(): Sanitizer;
-		entityEncode(): Sanitizer;
-		/**
-		 * Escape &, <, >, and "
-		 */
-		escape(): Sanitizer;
-		/**
-		 * Remove common XSS attack vectors from user-supplied HTML
-		 */
-		xss(): Sanitizer;
-		/**
-		 * Remove common XSS attack vectors from images
-		 */
-		xss(fromImages:boolean): Sanitizer;
-	}
-
-}
diff --git a/express-validator/index.d.ts b/express-validator/index.d.ts
new file mode 100644
index 0000000000..05ba652555
--- /dev/null
+++ b/express-validator/index.d.ts
@@ -0,0 +1,204 @@
+// Type definitions for express-validator 2.9.0
+// Project: https://github.com/ctavan/express-validator
+// Definitions by: Nathan Ridley <https://github.com/axefrog/>, Jonathan Häberle <http://dreampulse.de>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+// Add RequestValidation Interface on to Express's Request Interface.
+declare namespace Express {
+	interface Request extends ExpressValidator.RequestValidation {}
+}
+
+// External express-validator module.
+declare module "express-validator" {
+	import express = require('express');
+
+	/**
+	 *
+	 * @middlewareOptions see: https://github.com/ctavan/express-validator#middleware-options
+	 */
+	function ExpressValidator(middlewareOptions?:any):express.RequestHandler;
+
+	export = ExpressValidator;
+}
+
+// Internal Module.
+declare namespace ExpressValidator {
+
+	export interface ValidationError {
+		msg: string;
+		param: string;
+	}
+
+	interface ValidatorFunction { (item: string, message: string): Validator; }
+	interface SanitizerFunction { (item: string): Sanitizer; }
+	interface Dictionary<T> { [key: string]: T; }
+
+	export interface RequestValidation {
+		assert: ValidatorFunction;
+		check: ValidatorFunction;
+		checkBody: ValidatorFunction;
+		checkFiles: ValidatorFunction;
+		checkHeader: ValidatorFunction;
+		checkParams: ValidatorFunction;
+		checkQuery: ValidatorFunction;
+		validate: ValidatorFunction;
+
+		filter: SanitizerFunction;
+		sanitize: SanitizerFunction;
+
+		onValidationError(errback: (msg: string) => void): void;
+		validationErrors(mapped?: boolean): Dictionary<any> | any[];
+	}
+
+	export interface Validator {
+		/**
+		 * Alias for regex()
+		 */
+		is(): Validator;
+		/**
+		 * Alias for notRegex()
+		 */
+		not(): Validator;
+		isEmail(): Validator;
+		/**
+		 * Accepts http, https, ftp
+		 */
+		isUrl(): Validator;
+
+		/**
+		 * Combines isIPv4 and isIPv6
+		 */
+		isIP(): Validator;
+		isIPv4(): Validator;
+		isIPv6(): Validator;
+		isMACAddress(): Validator;
+		isAlpha(): Validator;
+		isAlphanumeric(): Validator;
+		isNumeric(): Validator;
+		isHexadecimal(): Validator;
+		/**
+		 * Accepts valid hexcolors with or without # prefix
+		 */
+		isHexColor(): Validator;
+		/**
+		 * isNumeric accepts zero padded numbers, e.g. '001', isInt doesn't
+		 */
+		isInt(): Validator;
+		isLowercase(): Validator;
+		isUppercase(): Validator;
+		isDecimal(): Validator;
+		/**
+		 * Alias for isDecimal
+		 */
+		isFloat(): Validator;
+		/**
+		 * Check if length is 0
+		 */
+		notNull(): Validator;
+		isNull(): Validator;
+		/**
+		 * Not just whitespace (input.trim().length !== 0)
+		 */
+		notEmpty(): Validator;
+		equals(equals:any): Validator;
+		contains(str:string): Validator;
+		notContains(str:string): Validator;
+		/**
+		 * Usage: regex(/[a-z]/i) or regex('[a-z]','i')
+		 */
+		regex(pattern:string, modifiers:string): Validator;
+		notRegex(pattern:string, modifiers:string): Validator;
+		/**
+		 * max is optional
+		 */
+		len(min:number, max?:number): Validator;
+		/**
+		 * Version can be 3, 4 or 5 or empty, see http://en.wikipedia.org/wiki/Universally_unique_identifier
+		 */
+		isUUID(version:number): Validator;
+		/**
+		 * Alias for isUUID(3)
+		 */
+		isUUIDv3(): Validator;
+		/**
+		 * Alias for isUUID(4)
+		 */
+		isUUIDv4(): Validator;
+		/**
+		 * Alias for isUUID(5)
+		 */
+		isUUIDv5(): Validator;
+		/**
+		 * Uses Date.parse() - regex is probably a better choice
+		 */
+		isDate(): Validator;
+		/**
+		 * Argument is optional and defaults to today. Comparison is non-inclusive
+		 */
+		isAfter(date:Date): Validator;
+		/**
+		 * Argument is optional and defaults to today. Comparison is non-inclusive
+		 */
+		isBefore(date:Date): Validator;
+		isIn(options:string): Validator;
+		isIn(options:string[]): Validator;
+		notIn(options:string): Validator;
+		notIn(options:string[]): Validator;
+		max(val:string): Validator;
+		min(val:string): Validator;
+		/**
+		 * Will work against Visa, MasterCard, American Express, Discover, Diners Club, and JCB card numbering formats
+		 */
+		isCreditCard(): Validator;
+		/**
+		 * Check an input only when the input exists
+		 */
+		optional(): Validator;
+	}
+
+	interface Sanitizer {
+		/**
+		 * Trim optional `chars`, default is to trim whitespace (\r\n\t )
+		 */
+		trim(...chars:string[]): Sanitizer;
+		ltrim(...chars:string[]): Sanitizer;
+		rtrim(...chars:string[]): Sanitizer;
+		ifNull(replace:any): Sanitizer;
+		toFloat(): Sanitizer;
+		toInt(): Sanitizer;
+		/**
+		 * True unless str = '0', 'false', or str.length == 0
+		 */
+		toBoolean(): Sanitizer;
+		/**
+		 * False unless str = '1' or 'true'
+		 */
+		toBooleanStrict(): Sanitizer;
+		/**
+		 * Decode HTML entities
+		 */
+		
+		/**
+     		* Convert the input string to a date, or null if the input is not a date.
+     		*/
+    		toDate(): Sanitizer;
+    
+		entityDecode(): Sanitizer;
+		entityEncode(): Sanitizer;
+		/**
+		 * Escape &, <, >, and "
+		 */
+		escape(): Sanitizer;
+		/**
+		 * Remove common XSS attack vectors from user-supplied HTML
+		 */
+		xss(): Sanitizer;
+		/**
+		 * Remove common XSS attack vectors from images
+		 */
+		xss(fromImages:boolean): Sanitizer;
+	}
+
+}
diff --git a/express-validator/tsconfig.json b/express-validator/tsconfig.json
new file mode 100644
index 0000000000..30f040f482
--- /dev/null
+++ b/express-validator/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-validator-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/express/express-tests.ts b/express/express-tests.ts
index 11f8fd44fd..e68ab83edf 100644
--- a/express/express-tests.ts
+++ b/express/express-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="express.d.ts" />
-
-import * as express from 'express';
+import * as express from './';
 var app = express();
 
 app.engine('jade', require('jade').__express);
diff --git a/express/express.d.ts b/express/express.d.ts
deleted file mode 100644
index 4ab7eb1c90..0000000000
--- a/express/express.d.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-// Type definitions for Express 4.x
-// Project: http://expressjs.com
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/* =================== USAGE ===================
-
-    import * as express from "express";
-    var app = express();
-
- =============================================== */
-
-/// <reference path="../serve-static/serve-static.d.ts" />
-/// <reference path="../express-serve-static-core/express-serve-static-core.d.ts" />
-
-declare module "express" {
-    import * as serveStatic from "serve-static";
-    import * as core from "express-serve-static-core";
-
-    /**
-     * Creates an Express application. The express() function is a top-level function exported by the express module.
-     */
-    function e(): core.Express;
-
-    namespace e {
-
-        /**
-         * This is the only built-in middleware function in Express. It serves static files and is based on serve-static.
-         */
-        var static: typeof serveStatic;
-
-        export function Router(options?: any): core.Router;
-
-        interface Application extends core.Application { }
-        interface CookieOptions extends core.CookieOptions { }
-        interface Errback extends core.Errback { }
-        interface ErrorRequestHandler extends core.ErrorRequestHandler { }
-        interface Express extends core.Express { }
-        interface Handler extends core.Handler { }
-        interface IRoute extends core.IRoute { }
-        interface IRouter<T> extends core.IRouter<T> { }
-        interface IRouterMatcher<T> extends core.IRouterMatcher<T> { }
-        interface MediaType extends core.MediaType { }
-        interface NextFunction extends core.NextFunction { }
-        interface Request extends core.Request { }
-        interface RequestHandler extends core.RequestHandler { }
-        interface RequestParamHandler extends core.RequestParamHandler { }
-        export interface Response extends core.Response { }
-        interface Router extends core.Router { }
-        interface Send extends core.Send { }
-    }
-
-    export = e;
-}
diff --git a/express/index.d.ts b/express/index.d.ts
new file mode 100644
index 0000000000..dabb3c8245
--- /dev/null
+++ b/express/index.d.ts
@@ -0,0 +1,52 @@
+// Type definitions for Express 4.x
+// Project: http://expressjs.com
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* =================== USAGE ===================
+
+    import * as express from "express";
+    var app = express();
+
+ =============================================== */
+
+/// <reference types="express-serve-static-core" />
+
+
+import * as serveStatic from "../serve-static";
+import * as core from "express-serve-static-core";
+
+/**
+ * Creates an Express application. The express() function is a top-level function exported by the express module.
+ */
+declare function e(): core.Express;
+
+declare namespace e {
+
+    /**
+     * This is the only built-in middleware function in Express. It serves static files and is based on serve-static.
+     */
+    var static: typeof serveStatic;
+
+    export function Router(options?: any): core.Router;
+
+    interface Application extends core.Application { }
+    interface CookieOptions extends core.CookieOptions { }
+    interface Errback extends core.Errback { }
+    interface ErrorRequestHandler extends core.ErrorRequestHandler { }
+    interface Express extends core.Express { }
+    interface Handler extends core.Handler { }
+    interface IRoute extends core.IRoute { }
+    interface IRouter<T> extends core.IRouter<T> { }
+    interface IRouterMatcher<T> extends core.IRouterMatcher<T> { }
+    interface MediaType extends core.MediaType { }
+    interface NextFunction extends core.NextFunction { }
+    interface Request extends core.Request { }
+    interface RequestHandler extends core.RequestHandler { }
+    interface RequestParamHandler extends core.RequestParamHandler { }
+    export interface Response extends core.Response { }
+    interface Router extends core.Router { }
+    interface Send extends core.Send { }
+}
+
+export = e;
diff --git a/express/tsconfig.json b/express/tsconfig.json
new file mode 100644
index 0000000000..93f7985b27
--- /dev/null
+++ b/express/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/extend/extend-tests.ts b/extend/extend-tests.ts
index 059aa22baf..12a3147d2a 100644
--- a/extend/extend-tests.ts
+++ b/extend/extend-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../node/node.d.ts" />
-/// <reference path="extend.d.ts" />
+/// <reference types="node" />
 
 import assert = require('assert');
 import extend = require('extend');
diff --git a/extend/extend.d.ts b/extend/extend.d.ts
deleted file mode 100644
index cda9f07a13..0000000000
--- a/extend/extend.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Type definitions for extend v2.0.0
-// Project: https://www.npmjs.com/package/extend
-// Definitions by: Stefan Steinhart <https://github.com/reppners>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-declare module "extend" {
-
-    function extend(deepOrObject:boolean | Object, ...objectN: Object[]): any;
-    namespace extend {}
-    export = extend;
-}
diff --git a/extend/index.d.ts b/extend/index.d.ts
new file mode 100644
index 0000000000..e0af478a47
--- /dev/null
+++ b/extend/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for extend v2.0.0
+// Project: https://www.npmjs.com/package/extend
+// Definitions by: Stefan Steinhart <https://github.com/reppners>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function extend(deepOrObject: boolean | Object, ...objectN: Object[]): any;
+declare namespace extend { }
+export = extend;
diff --git a/extend/tsconfig.json b/extend/tsconfig.json
new file mode 100644
index 0000000000..68832918e7
--- /dev/null
+++ b/extend/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "extend-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/extended-listbox/extended-listbox-tests.ts b/extended-listbox/extended-listbox-tests.ts
index 8016ccee72..0ca2f862b1 100644
--- a/extended-listbox/extended-listbox-tests.ts
+++ b/extended-listbox/extended-listbox-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="extended-listbox.d.ts" />
+
 
 
 var $test = $("#test");
diff --git a/extended-listbox/extended-listbox.d.ts b/extended-listbox/extended-listbox.d.ts
deleted file mode 100644
index 6b3c0b5732..0000000000
--- a/extended-listbox/extended-listbox.d.ts
+++ /dev/null
@@ -1,183 +0,0 @@
-// Type definitions for extended-listbox 1.1.x
-// Project: https://github.com/code-chris/extended-listbox
-// Definitions by: Christian Kotzbauer <https://github.com/code-chris>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface ListboxItem {
-    /** display text */
-    text?: string;
-
-    /** unique identifier, if not set it will be generated */
-    id?: string;
-
-    /** index position from the item in the list; only used for manual addItem api calls */
-    index?: number;
-
-    /** determines if the item should be clickable */
-    disabled?: boolean;
-
-    /** determines if the item is selected */
-    selected?: boolean;
-
-    /** determines if the item has childItems */
-    groupHeader?: boolean;
-
-    /** display text or id of the parent; only used for manual addItem api calls */
-    parentGroupId?: string;
-
-    /** list of childItems */
-    childItems?: any[];
-}
-
-interface ListboxSearchBarButtonOptions {
-    /** determines if the button is visible */
-    visible?: boolean;
-
-    /** css class for the i-tag of the button */
-    icon?: string;
-
-    /** callback for button click */
-    onClick?: () => void;
-}
-
-interface ListBoxOptions {
-    /** determines if the searchBar is visible */
-    searchBar?: boolean;
-
-    /** watermark (placeholder) for the searchBar */
-    searchBarWatermark?: string;
-
-    /** settings for the searchBar button */
-    searchBarButton?: ListboxSearchBarButtonOptions;
-
-    /** determines if multiple items can be selected */
-    multiple?: boolean;
-
-    /** function which returns a array of items */
-    getItems?: () => any;
-
-    /** callback for selection changes */
-    onValueChanged?: (event: ListboxEvent) => void;
-
-    /** callback for searchBar text changes */
-    onFilterChanged?: (event: ListboxEvent) => void;
-
-    /** callback for item changes (item added, item removed, item order) */
-    onItemsChanged?: (event: ListboxEvent) => void;
-
-    /** callback for enter keyPress event on an item */
-    onItemEnterPressed?: (event: ListboxEvent) => void;
-
-    /** callback for doubleClick event on an item */
-    onItemDoubleClicked?: (event: ListboxEvent) => void;
-}
-
-interface ListboxEvent {
-    /** unique event name */
-    eventName: string;
-
-    /** target object for which event is triggered */
-    target: JQuery;
-
-    /** any object */
-    args: any;
-}
-
-interface ExtendedListboxInstance {
-    /** DOM element of the listbox root */
-    target: JQuery;
-
-    /** Adds a new item to the list */
-    addItem(item: string|ListboxItem): string;
-
-    /** Removes a item from the list */
-    removeItem(identifier: string): void;
-
-    /** Reverts all changes from the DOM */
-    destroy(): void;
-
-    /** Resets the selection state of all items */
-    clearSelection(): void;
-
-    /** Returns a item object for the given id or display text */
-    getItem(identifier: string): ListboxItem;
-
-    /** Returns all item objects */
-    getItems(): ListboxItem[];
-
-    /** Returns all ListboxItem's which are selected */
-    getSelection(): ListboxItem[];
-
-    /** Decreases the index of the matching item by one */
-    moveItemUp(identifier: string): number;
-
-    /** Increases the index of the matching item by one */
-    moveItemDown(identifier: string): number;
-
-    /** Moves item to the bottom of the list */
-    moveItemToBottom(identifier: string): number;
-
-    /** Moves item to the top of the list */
-    moveItemToTop(identifier: string): number;
-
-    /** Enables or disables the whole list and all childs */
-    enable(state: boolean): void;
-
-    /** callback for selection changes */
-    onValueChanged(callback: (event: ListboxEvent) => void): void;
-
-    /** callback for item changes (item added, item removed, item order) */
-    onItemsChanged(callback: (event: ListboxEvent) => void): void;
-
-    /** callback for searchBar text changes */
-    onFilterChanged(callback: (event: ListboxEvent) => void): void;
-
-    /** callback for enter keyPress event on an item */
-    onItemEnterPressed(callback: (event: ListboxEvent) => void): void;
-
-    /** callback for doubleClick event on an item */
-    onItemDoubleClicked(callback: (event: ListboxEvent) => void): void;
-}
-
-interface JQuery {
-    /** constructs a new instance of Listbox on the given DOM item or returns existing */
-    listbox(): ExtendedListboxInstance|ExtendedListboxInstance[];
-
-    /** constructs a new instance of Listbox on the given DOM item */
-    listbox(options: ListBoxOptions): ExtendedListboxInstance|ExtendedListboxInstance[];
-
-    /** @deprecated: use method in ExtendedListboxInstance */
-    listbox(methodName: 'addItem'): string;
-
-    /** @deprecated: use method in ExtendedListboxInstance */
-    listbox(methodName: 'removeItem'): void;
-
-    /** @deprecated: use method in ExtendedListboxInstance */
-    listbox(methodName: 'destroy'): void;
-
-    /** @deprecated: use method in ExtendedListboxInstance */
-    listbox(methodName: 'getItem'): ListboxItem;
-
-    /** @deprecated: use method in ExtendedListboxInstance */
-    listbox(methodName: 'getItems'): ListboxItem[];
-
-    /** @deprecated: use method in ExtendedListboxInstance */
-    listbox(methodName: 'moveItemUp'): number;
-
-    /** @deprecated: use method in ExtendedListboxInstance */
-    listbox(methodName: 'moveItemDown'): number;
-
-    /** @deprecated: use method in ExtendedListboxInstance */
-    listbox(methodName: 'clearSelection'): void;
-
-    /** @deprecated: use method in ExtendedListboxInstance */
-    listbox(methodName: 'enable'): void;
-
-    /** @deprecated: use method in ExtendedListboxInstance */
-    listbox(methodName: string): any;
-
-    /** @deprecated: use method in ExtendedListboxInstance */
-    listbox(methodName: string, methodParameter: any): any;
-}
diff --git a/extended-listbox/index.d.ts b/extended-listbox/index.d.ts
new file mode 100644
index 0000000000..eb5f0eec04
--- /dev/null
+++ b/extended-listbox/index.d.ts
@@ -0,0 +1,183 @@
+// Type definitions for extended-listbox 1.1.x
+// Project: https://github.com/code-chris/extended-listbox
+// Definitions by: Christian Kotzbauer <https://github.com/code-chris>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface ListboxItem {
+    /** display text */
+    text?: string;
+
+    /** unique identifier, if not set it will be generated */
+    id?: string;
+
+    /** index position from the item in the list; only used for manual addItem api calls */
+    index?: number;
+
+    /** determines if the item should be clickable */
+    disabled?: boolean;
+
+    /** determines if the item is selected */
+    selected?: boolean;
+
+    /** determines if the item has childItems */
+    groupHeader?: boolean;
+
+    /** display text or id of the parent; only used for manual addItem api calls */
+    parentGroupId?: string;
+
+    /** list of childItems */
+    childItems?: any[];
+}
+
+interface ListboxSearchBarButtonOptions {
+    /** determines if the button is visible */
+    visible?: boolean;
+
+    /** css class for the i-tag of the button */
+    icon?: string;
+
+    /** callback for button click */
+    onClick?: () => void;
+}
+
+interface ListBoxOptions {
+    /** determines if the searchBar is visible */
+    searchBar?: boolean;
+
+    /** watermark (placeholder) for the searchBar */
+    searchBarWatermark?: string;
+
+    /** settings for the searchBar button */
+    searchBarButton?: ListboxSearchBarButtonOptions;
+
+    /** determines if multiple items can be selected */
+    multiple?: boolean;
+
+    /** function which returns a array of items */
+    getItems?: () => any;
+
+    /** callback for selection changes */
+    onValueChanged?: (event: ListboxEvent) => void;
+
+    /** callback for searchBar text changes */
+    onFilterChanged?: (event: ListboxEvent) => void;
+
+    /** callback for item changes (item added, item removed, item order) */
+    onItemsChanged?: (event: ListboxEvent) => void;
+
+    /** callback for enter keyPress event on an item */
+    onItemEnterPressed?: (event: ListboxEvent) => void;
+
+    /** callback for doubleClick event on an item */
+    onItemDoubleClicked?: (event: ListboxEvent) => void;
+}
+
+interface ListboxEvent {
+    /** unique event name */
+    eventName: string;
+
+    /** target object for which event is triggered */
+    target: JQuery;
+
+    /** any object */
+    args: any;
+}
+
+interface ExtendedListboxInstance {
+    /** DOM element of the listbox root */
+    target: JQuery;
+
+    /** Adds a new item to the list */
+    addItem(item: string|ListboxItem): string;
+
+    /** Removes a item from the list */
+    removeItem(identifier: string): void;
+
+    /** Reverts all changes from the DOM */
+    destroy(): void;
+
+    /** Resets the selection state of all items */
+    clearSelection(): void;
+
+    /** Returns a item object for the given id or display text */
+    getItem(identifier: string): ListboxItem;
+
+    /** Returns all item objects */
+    getItems(): ListboxItem[];
+
+    /** Returns all ListboxItem's which are selected */
+    getSelection(): ListboxItem[];
+
+    /** Decreases the index of the matching item by one */
+    moveItemUp(identifier: string): number;
+
+    /** Increases the index of the matching item by one */
+    moveItemDown(identifier: string): number;
+
+    /** Moves item to the bottom of the list */
+    moveItemToBottom(identifier: string): number;
+
+    /** Moves item to the top of the list */
+    moveItemToTop(identifier: string): number;
+
+    /** Enables or disables the whole list and all childs */
+    enable(state: boolean): void;
+
+    /** callback for selection changes */
+    onValueChanged(callback: (event: ListboxEvent) => void): void;
+
+    /** callback for item changes (item added, item removed, item order) */
+    onItemsChanged(callback: (event: ListboxEvent) => void): void;
+
+    /** callback for searchBar text changes */
+    onFilterChanged(callback: (event: ListboxEvent) => void): void;
+
+    /** callback for enter keyPress event on an item */
+    onItemEnterPressed(callback: (event: ListboxEvent) => void): void;
+
+    /** callback for doubleClick event on an item */
+    onItemDoubleClicked(callback: (event: ListboxEvent) => void): void;
+}
+
+interface JQuery {
+    /** constructs a new instance of Listbox on the given DOM item or returns existing */
+    listbox(): ExtendedListboxInstance|ExtendedListboxInstance[];
+
+    /** constructs a new instance of Listbox on the given DOM item */
+    listbox(options: ListBoxOptions): ExtendedListboxInstance|ExtendedListboxInstance[];
+
+    /** @deprecated: use method in ExtendedListboxInstance */
+    listbox(methodName: 'addItem'): string;
+
+    /** @deprecated: use method in ExtendedListboxInstance */
+    listbox(methodName: 'removeItem'): void;
+
+    /** @deprecated: use method in ExtendedListboxInstance */
+    listbox(methodName: 'destroy'): void;
+
+    /** @deprecated: use method in ExtendedListboxInstance */
+    listbox(methodName: 'getItem'): ListboxItem;
+
+    /** @deprecated: use method in ExtendedListboxInstance */
+    listbox(methodName: 'getItems'): ListboxItem[];
+
+    /** @deprecated: use method in ExtendedListboxInstance */
+    listbox(methodName: 'moveItemUp'): number;
+
+    /** @deprecated: use method in ExtendedListboxInstance */
+    listbox(methodName: 'moveItemDown'): number;
+
+    /** @deprecated: use method in ExtendedListboxInstance */
+    listbox(methodName: 'clearSelection'): void;
+
+    /** @deprecated: use method in ExtendedListboxInstance */
+    listbox(methodName: 'enable'): void;
+
+    /** @deprecated: use method in ExtendedListboxInstance */
+    listbox(methodName: string): any;
+
+    /** @deprecated: use method in ExtendedListboxInstance */
+    listbox(methodName: string, methodParameter: any): any;
+}
diff --git a/extended-listbox/tsconfig.json b/extended-listbox/tsconfig.json
new file mode 100644
index 0000000000..8ae01eb561
--- /dev/null
+++ b/extended-listbox/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "extended-listbox-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/extjs/ExtJS-tests.ts b/extjs/ExtJS-tests.ts
index 121acbd3ba..0d5266ccb0 100644
--- a/extjs/ExtJS-tests.ts
+++ b/extjs/ExtJS-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="ExtJS.d.ts" />
+
 
 namespace MyApp.view {
     export interface CompanyGridPanel extends Ext.grid.IPanel {
@@ -13,7 +13,7 @@ Ext.define("MyApp.view.CompanyGridPanel", <Ext.grid.IPanel>{
         companyStore: null
     },
 
-    initComponent: function () {
+    initComponent: function() {
         Ext.applyIf(this, {
             itemId: "companyGridPanel",
             title: "Company Listing",
@@ -21,43 +21,43 @@ Ext.define("MyApp.view.CompanyGridPanel", <Ext.grid.IPanel>{
             columnLines: true,
 
             columns: [
-              <Ext.grid.column.IColumn>{
-                  xtype: "gridcolumn",
-                  dataIndex: "company",
-                  text: "Company",
-                  flex: 1
-              }, <Ext.grid.column.INumber>{
-                  xtype: "numbercolumn",
-                  dataIndex: "price",
-                  text: "Price",
-                  renderer: Ext.util.Format.usMoney
-              }, <Ext.grid.column.INumber>{
-                  xtype: "numbercolumn",
-                  dataIndex: "change",
-                  text: "Change",
-                  format: "0.00"
-              }, <Ext.grid.column.INumber>{
-                  xtype: "numbercolumn",
-                  dataIndex: "pctChange",
-                  text: "% Change",
-                  format: "0.00"
-              }, <Ext.grid.column.IDate>{
-                  xtype: "datecolumn",
-                  dataIndex: "lastChange",
-                  text: "Last Change"
-              }, <Ext.grid.column.IColumn>{
-                  xtype: "gridcolumn",
-                  dataIndex: "industry",
-                  text: "Industry"
-              }
+        <Ext.grid.column.IColumn>{
+          xtype: "gridcolumn",
+          dataIndex: "company",
+          text: "Company",
+          flex: 1
+        }, <Ext.grid.column.INumber>{
+          xtype: "numbercolumn",
+          dataIndex: "price",
+          text: "Price",
+          renderer: Ext.util.Format.usMoney
+        }, <Ext.grid.column.INumber>{
+          xtype: "numbercolumn",
+          dataIndex: "change",
+          text: "Change",
+          format: "0.00"
+        }, <Ext.grid.column.INumber>{
+          xtype: "numbercolumn",
+          dataIndex: "pctChange",
+          text: "% Change",
+          format: "0.00"
+        }, <Ext.grid.column.IDate>{
+          xtype: "datecolumn",
+          dataIndex: "lastChange",
+          text: "Last Change"
+        }, <Ext.grid.column.IColumn>{
+          xtype: "gridcolumn",
+          dataIndex: "industry",
+          text: "Industry"
+        }
             ],
 
             tbar: [
-              <Ext.form.field.ICheckbox>{
-                  xtype: "checkbox",
-                  itemId: "manufacturingFilter",
-                  boxLabel: "Show only Manufacturing companies"
-              }
+        <Ext.form.field.ICheckbox>{
+          xtype: "checkbox",
+          itemId: "manufacturingFilter",
+          boxLabel: "Show only Manufacturing companies"
+        }
             ]
         });
 
@@ -80,7 +80,7 @@ function test_events() {
     gridPanel.fireEvent("select", null, this);
 }
 
-function testEventHandler( grid, record, index, eventOptions) {
+function testEventHandler(grid: any, record: any, index: any, eventOptions: any) {
     return true;
 }
 
diff --git a/extjs/ExtJS-tests.ts.tscparams b/extjs/ExtJS-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/extjs/ExtJS-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/extjs/ExtJS.d.ts b/extjs/index.d.ts
similarity index 100%
rename from extjs/ExtJS.d.ts
rename to extjs/index.d.ts
diff --git a/extjs/tsconfig.json b/extjs/tsconfig.json
new file mode 100644
index 0000000000..17cbc67956
--- /dev/null
+++ b/extjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "extjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/eyes/eyes-tests.ts b/eyes/eyes-tests.ts
index 156054ba1c..2775aff7c4 100644
--- a/eyes/eyes-tests.ts
+++ b/eyes/eyes-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="eyes.d.ts" />
 
 import eyes = require('eyes');
 
diff --git a/eyes/eyes.d.ts b/eyes/eyes.d.ts
deleted file mode 100644
index a2b103ccad..0000000000
--- a/eyes/eyes.d.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-// Type definitions for eyes 0.1.8
-// Project: https://github.com/cloudhead/eyes.js
-// Definitions by: bryn austin bellomy <https://github.com/brynbellomy>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../node/node.d.ts"/>
-
-declare module "eyes"
-{
-    import stream = require('stream');
-
-    export function inspector(options?:EyesOptions): InspectorFunction;
-    export function inspect(thing:any, label?:string): void;
-
-    export interface InspectorFunction {
-        (thing:any, label?:string): string;
-    }
-
-    export interface EyesOptions
-    {
-        /** Styles applied to stdout */
-        styles?: {                
-            /** Overall base style applied to everything */
-            all?: string;
-            /** Style when printing inspection labels, like 'array' in `array: [1, 2, 3]` */
-            label?: string;
-            /** Style when printing objects which don't have a literal representation, such as functions */
-            other?: string;
-            /** Style when printing the keys in object literals, like 'a' in `{a: 1}` */
-            key?: string;
-            /** Style when printing `null`, `undefined`, etc. */
-            special?: string;
-            /** Style when printing strings */
-            string?: string;
-            /** Style when printing numbers */
-            number?: string;
-            /** Style when printing booleans */
-            bool?: string;
-            /** Style when printing RegExps */
-            regexp?: string;
-        };
-
-        /** Indent object literals */
-        pretty?: boolean;         
-        /** Don't output functions at all */
-        hideFunctions?: boolean;  
-        /** Stream to write to, or null */
-        stream?: stream.Writable; 
-        /** Truncate output if longer */
-        maxLength?: number;       
-    }
-}
-
-
diff --git a/eyes/index.d.ts b/eyes/index.d.ts
new file mode 100644
index 0000000000..3307d9d484
--- /dev/null
+++ b/eyes/index.d.ts
@@ -0,0 +1,49 @@
+// Type definitions for eyes 0.1.8
+// Project: https://github.com/cloudhead/eyes.js
+// Definitions by: bryn austin bellomy <https://github.com/brynbellomy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="node"/>
+
+
+import stream = require('stream');
+
+export declare function inspector(options?: EyesOptions): InspectorFunction;
+export declare function inspect(thing: any, label?: string): void;
+
+export interface InspectorFunction {
+    (thing: any, label?: string): string;
+}
+
+export interface EyesOptions {
+    /** Styles applied to stdout */
+    styles?: {
+        /** Overall base style applied to everything */
+        all?: string;
+        /** Style when printing inspection labels, like 'array' in `array: [1, 2, 3]` */
+        label?: string;
+        /** Style when printing objects which don't have a literal representation, such as functions */
+        other?: string;
+        /** Style when printing the keys in object literals, like 'a' in `{a: 1}` */
+        key?: string;
+        /** Style when printing `null`, `undefined`, etc. */
+        special?: string;
+        /** Style when printing strings */
+        string?: string;
+        /** Style when printing numbers */
+        number?: string;
+        /** Style when printing booleans */
+        bool?: string;
+        /** Style when printing RegExps */
+        regexp?: string;
+    };
+
+    /** Indent object literals */
+    pretty?: boolean;
+    /** Don't output functions at all */
+    hideFunctions?: boolean;
+    /** Stream to write to, or null */
+    stream?: stream.Writable;
+    /** Truncate output if longer */
+    maxLength?: number;
+}
diff --git a/eyes/tsconfig.json b/eyes/tsconfig.json
new file mode 100644
index 0000000000..aba901556f
--- /dev/null
+++ b/eyes/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "eyes-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fabricjs/fabricjs-tests.ts b/fabric/fabricjs-tests.ts
similarity index 99%
rename from fabricjs/fabricjs-tests.ts
rename to fabric/fabricjs-tests.ts
index af5f6dd0e8..91f4224ff5 100644
--- a/fabricjs/fabricjs-tests.ts
+++ b/fabric/fabricjs-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="fabricjs.d.ts" />
-
 function sample1() {
   var canvas = new fabric.Canvas('c', {
     hoverCursor: 'pointer',
@@ -100,7 +98,6 @@ function sample3() {
   function applyFilterValue(index: number, prop: string, value: any) {
     var obj: fabric.IImage = <fabric.IImage>canvas.getActiveObject();
     if (obj.filters[index]) {
-      obj.filters[index][prop] = value;
       obj.applyFilters(canvas.renderAll.bind(canvas));
     }
   }
diff --git a/fabricjs/fabricjs.d.ts b/fabric/index.d.ts
similarity index 100%
rename from fabricjs/fabricjs.d.ts
rename to fabric/index.d.ts
diff --git a/fabric/tsconfig.json b/fabric/tsconfig.json
new file mode 100644
index 0000000000..ac5f0d2ae9
--- /dev/null
+++ b/fabric/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "fabricjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fabricjs/fabricjs-tests.ts.tscparams b/fabricjs/fabricjs-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/fabricjs/fabricjs-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/facebook-js-sdk/facebook-js-sdk-tests.ts b/facebook-js-sdk/facebook-js-sdk-tests.ts
index 49e615f529..d9f8dc20d3 100644
--- a/facebook-js-sdk/facebook-js-sdk-tests.ts
+++ b/facebook-js-sdk/facebook-js-sdk-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="facebook-js-sdk.d.ts" />
+
 
 FB.init({
    appId: '***********',
diff --git a/facebook-js-sdk/facebook-js-sdk.d.ts b/facebook-js-sdk/index.d.ts
similarity index 100%
rename from facebook-js-sdk/facebook-js-sdk.d.ts
rename to facebook-js-sdk/index.d.ts
diff --git a/facebook-js-sdk/tsconfig.json b/facebook-js-sdk/tsconfig.json
new file mode 100644
index 0000000000..a986f1c81d
--- /dev/null
+++ b/facebook-js-sdk/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "facebook-js-sdk-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/facebook-pixel/facebook-pixel-tests.ts b/facebook-pixel/facebook-pixel-tests.ts
index 718a972c23..c26c8b109d 100644
--- a/facebook-pixel/facebook-pixel-tests.ts
+++ b/facebook-pixel/facebook-pixel-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="facebook-pixel.d.ts" />
+
 
 fbq('init', '<FB_PIXEL_ID>');
 fbq('track', 'PageView');
diff --git a/facebook-pixel/facebook-pixel.d.ts b/facebook-pixel/index.d.ts
similarity index 100%
rename from facebook-pixel/facebook-pixel.d.ts
rename to facebook-pixel/index.d.ts
diff --git a/facebook-pixel/tsconfig.json b/facebook-pixel/tsconfig.json
new file mode 100644
index 0000000000..d77e7ca1ae
--- /dev/null
+++ b/facebook-pixel/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "facebook-pixel-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/faker/faker-tests.ts b/faker/faker-tests.ts
index 77f3a2c2ca..8a53560412 100644
--- a/faker/faker-tests.ts
+++ b/faker/faker-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="faker.d.ts" />
+
 
 let resultStr: string;
 let resultBool: boolean;
diff --git a/faker/faker.d.ts b/faker/index.d.ts
similarity index 100%
rename from faker/faker.d.ts
rename to faker/index.d.ts
diff --git a/faker/tsconfig.json b/faker/tsconfig.json
new file mode 100644
index 0000000000..cfe1ad3e35
--- /dev/null
+++ b/faker/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "faker-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/falcor-express/falcor-express-tests.ts b/falcor-express/falcor-express-tests.ts
new file mode 100644
index 0000000000..f4a4ed8b52
--- /dev/null
+++ b/falcor-express/falcor-express-tests.ts
@@ -0,0 +1,24 @@
+
+/// <reference types="falcor" />
+/// <reference types="falcor-router" />
+
+import express = require('express');
+import Router = require('falcor-router');
+import falcorExpress = require('falcor-express')
+
+const app = express();
+class MyRouter extends Router.createClass([{
+    route: 'greeting',
+    get() {
+        return {json: {greeting: 'Hello, world'}};
+    }
+}]){
+    constructor() {
+        super();
+    }
+}
+
+app.use('/model.json', falcorExpress.dataSourceRoute((req, res) => new MyRouter()));
+
+app.listen(3000);
+
diff --git a/falcor-express/index.d.ts b/falcor-express/index.d.ts
new file mode 100644
index 0000000000..b149df75b9
--- /dev/null
+++ b/falcor-express/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for falcor-express 0.1.2
+// Project: https://github.com/Netflix/falcor-express
+// Definitions by: Quramy <https://github.com/Quramy/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference types="falcor" />
+
+
+
+import {Request, Response, Handler} from 'express';
+import {DataSource} from 'falcor';
+declare function dataSourceRoute(getDataSource: (req: Request, res: Response) => DataSource): Handler;
diff --git a/falcor-express/tsconfig.json b/falcor-express/tsconfig.json
new file mode 100644
index 0000000000..fcf1edff3e
--- /dev/null
+++ b/falcor-express/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "falcor-express-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/falcor-http-datasource/falcor-http-datasource-tests.ts b/falcor-http-datasource/falcor-http-datasource-tests.ts
new file mode 100644
index 0000000000..b341274a19
--- /dev/null
+++ b/falcor-http-datasource/falcor-http-datasource-tests.ts
@@ -0,0 +1,6 @@
+import HttpDataSource from 'falcor-http-datasource';
+import {Model} from 'falcor';
+
+const model = new Model({
+    source: new HttpDataSource('/model.json')
+});
diff --git a/falcor-http-datasource/index.d.ts b/falcor-http-datasource/index.d.ts
new file mode 100644
index 0000000000..9465b31e70
--- /dev/null
+++ b/falcor-http-datasource/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for falcor-http-datasource 0.1.3
+// Project: https://github.com/Netflix/falcor-http-datasource
+// Definitions by: Quramy <https://github.com/Quramy/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference types="falcor" />
+
+declare namespace FalcorHttpDataSource {
+
+    /**
+     * A HttpDataSource object is a {@link DataSource} can be used to retrieve data from a remote JSONGraph object using the browser's XMLHttpRequest.
+     **/
+    class XMlHttpSource extends FalcorModel.DataSource {
+        constructor(jsonGraphUrl: string);
+    }
+}
+
+declare module 'falcor-http-datasource' {
+    import XMlHttpSource = FalcorHttpDataSource.XMlHttpSource;
+    export {XMlHttpSource};
+    export default XMlHttpSource;
+}
+
diff --git a/falcor-http-datasource/tsconfig.json b/falcor-http-datasource/tsconfig.json
new file mode 100644
index 0000000000..bc5018e6df
--- /dev/null
+++ b/falcor-http-datasource/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "falcor-http-datasource-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/falcor-json-graph/falcor-json-graph-tests.ts b/falcor-json-graph/falcor-json-graph-tests.ts
new file mode 100644
index 0000000000..992ede0053
--- /dev/null
+++ b/falcor-json-graph/falcor-json-graph-tests.ts
@@ -0,0 +1,39 @@
+
+
+import {Key, KeySet, Path, PathSet, ref, atom, error, pathValue, pathInvalidation} from 'falcor-json-graph';
+
+const stringKey: Key = "productsById";
+const numberKey: Key = 10;
+const booleanKey: Key = true;
+
+const keySet01: KeySet = stringKey;
+const keySet02: KeySet = [stringKey];
+const KeySet03: KeySet = {from: 1, to: 10};
+const KeySet04: KeySet = ["name", {from: 0, length: 10}];
+
+const path0: Path =  ["productsById", "1234", "name"];
+const path1: Path = [stringKey, numberKey, booleanKey];
+
+const pathSet01: PathSet =  ["productsById", ["1234", "5678"], ["name", "price"]];
+const pathSet02: PathSet =  ["products", [{from: 0, length: 10}, "length"], ["name", "price"]];
+
+var ref01 = ref(['hoge']);
+var ref02 = ref(['hoge'], {$expires: 1000});
+console.log(ref02.$type, ref02.value, ref02.$expires);
+
+var atom01 = atom('hoge');
+var atom02 = atom('hoge', {$expires: 1000});
+console.log(atom02.$type, atom02.value, atom02.$expires);
+
+var err01 = error('some error!');
+var err02 = error('some error!', {$expires: 1000});
+console.log(err02.$type === 'error', ref02.value, ref02.$expires);
+
+var pv01 = pathValue('hoge', 'FOO');
+var pv02 = pathValue('hoge[0].bar', 'FOO');
+var pv03 = pathValue('hoge[0...100].bar', 'FOO');
+var pv04 = pathValue(['hoge', {from: 0, to: 100}, 'bar'], 'FOO');
+console.log(pv04.path, pv04.value);
+
+var ip01 = pathInvalidation('hoge');
+console.log(ip01.path, ip01.invalidate);
diff --git a/falcor-json-graph/index.d.ts b/falcor-json-graph/index.d.ts
new file mode 100644
index 0000000000..d2bb47563b
--- /dev/null
+++ b/falcor-json-graph/index.d.ts
@@ -0,0 +1,102 @@
+// Type definitions for falcor-json-graph 1.1.7
+// Project: https://github.com/Netflix/falcor-json-graph
+// Definitions by: Quramy <https://github.com/Quramy/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+export = FalcorJsonGraph;
+
+declare namespace FalcorJsonGraph {
+
+    // NOTE: The following types are described at https://github.com/Netflix/falcor/tree/master/lib/typedefs .
+
+    /**
+     * An atom allows you to treat a JSON value as atomic regardless of its type, ensuring that a JSON object or array is always returned in its entirety. The JSON value must be treated as immutable. Atoms can also be used to associate metadata with a JSON value. This metadata can be used to influence the way values are handled.
+     **/
+    interface Atom extends Sentinel {
+        $type: 'atom';
+        value: any;
+    }
+
+    interface Error extends Sentinel {
+        $type: 'error';
+        value: any;
+    }
+
+    interface InvalidPath {
+        path: PathSet;
+        invalidate: boolean;
+    }
+    /**
+     * A part of a {@link Path} that can be any JSON value type. All types are coerced to string, except null. This makes the number 1 and the string "1" equivalent.
+     **/
+    type Key = string | number | boolean;
+
+    /**
+     * A part of a {@link PathSet} that can be either a {@link Key}, {@link Range}, or Array of either.
+     **/
+    type KeySet = Key | Range | Array<Key | Range>;
+
+    /**
+     * An ordered list of {@link Key}s that point to a value in a {@link JSONGraph}.
+     **/
+    type Path = Array<Key>;
+
+    /**
+     * An ordered list of {@link KeySet}s that point to location(s) in the {@link JSONGraph}. It enables pointing to multiple locations in a more terse format than a set of {@link Path}s and is generally more efficient to evaluate.
+     **/
+    type PathSet = Array<KeySet>;
+
+    /**
+     * A wrapper around a path and its value.
+     **/
+    interface PathValue {
+        path: string | PathSet;
+        value: any;
+    }
+
+    /**
+     * An envelope that wraps a JSON object.
+     **/
+    interface JSONEnvelope<T> {
+        json: T;
+    }
+
+    /**
+     * JavaScript Object Notation Graph (JSONGraph) is a notation for expressing graphs in JSON. For more information, see the [JSONGraph Guide]{@link http://netflix.github.io/falcor/documentation/jsongraph.html}.
+     **/
+    type JSONGraph = any;
+
+    /**
+     * An envelope that wraps a {@link JSONGraph} fragment.
+     **/
+    interface JSONGraphEnvelope {
+        jsonGraph: JSONGraph;
+        paths?: Array<PathSet>;
+        invalidate?: Array<PathSet>;
+    }
+
+    /**
+     * Describe a range of integers. Must contain either a "to" or "length" property.
+     **/
+    interface Range {
+        from?: number;
+        to?: number;
+        length?: number;
+    }
+
+    interface Reference extends Sentinel {
+        $type: 'reference';
+        value: Path;
+    }
+
+    interface Sentinel {
+        $expires?: number;
+    }
+
+    function ref(path: string | FalcorJsonGraph.PathSet, props?: FalcorJsonGraph.Sentinel): FalcorJsonGraph.Reference;
+    function atom (value: any, props?: FalcorJsonGraph.Sentinel): FalcorJsonGraph.Atom;
+    function error(errorValue: any, props?: FalcorJsonGraph.Sentinel): FalcorJsonGraph.Error;
+    function pathValue(path: string | FalcorJsonGraph.PathSet, value: any): FalcorJsonGraph.PathValue;
+    function pathInvalidation(path: string | FalcorJsonGraph.PathSet): FalcorJsonGraph.InvalidPath;
+}
+
diff --git a/falcor-json-graph/tsconfig.json b/falcor-json-graph/tsconfig.json
new file mode 100644
index 0000000000..b8e819e448
--- /dev/null
+++ b/falcor-json-graph/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "falcor-json-graph-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/falcor-router/falcor-router-tests.ts b/falcor-router/falcor-router-tests.ts
new file mode 100644
index 0000000000..fd2ffa7da1
--- /dev/null
+++ b/falcor-router/falcor-router-tests.ts
@@ -0,0 +1,102 @@
+
+
+import falcor = require('falcor');
+import Router = require('falcor-router');
+
+new Router([]);
+new Router([], {});
+new Router([], {debug: true});
+new Router([], {maxPaths: 10});
+new Router([], {maxRefFollow: 10});
+new Router([{route: "greeting", get: () =>({path:["greeting"], value: "Hello World"})}]);
+
+new falcor.Model({source: new Router([])});
+
+class MyRouter extends Router.createClass([]) {
+    constructor() {
+        super({debug: true, maxPaths: 10, maxRefFollow: 10});
+    }
+}
+new falcor.Model({source: new MyRouter()});
+
+new Router([{
+    route: 'todos.length',
+    get() {
+        return {path: 'todos.length', value: 10};
+    },
+}]);
+
+new Router([{
+    route: 'todos.length',
+    get() {
+        return [{path: 'todos.length', value: 10}];
+    },
+}]);
+
+new Router([{
+    route: 'todos.length',
+    get() {
+        return {json: { todos: {length : 10}}};
+    }
+}]);
+
+new Router([{
+    route: 'todos.length',
+    get() {
+        return new Promise<falcor.PathValue>(resolve => {
+            resolve({path: 'todos.length', value: 10});
+        });
+    },
+}]);
+
+new Router([{
+    route: 'todos.length',
+    get() {
+        return new Promise<falcor.PathValue[]>(resolve => {
+            resolve([{path: 'todos.length', value: 10}]);
+        });
+    },
+}]);
+
+new Router([{
+    route: 'todos.length',
+    get() {
+        return new Promise<falcor.JSONEnvelope<any>>(resolve => {
+            resolve({json: { todos: {length : 10}}});
+        });
+    }
+}]);
+
+new Router([{
+    route: 'todos[{integers:indicies}]',
+    get(pathset: FalcorRouter.RoutePathSet & {indicies: number[]}) {
+        return pathset.indicies.map(idx => {
+            const id = 'id' + idx;
+            return {
+                path: `todos[${idx}]`,
+                value: {
+                    $type: 'ref',
+                    value: `todosById.${id}`
+                }
+            }
+        });
+    }
+}]);
+
+new Router([{
+    route: 'todos[{integers:number}]',
+    set(jsonGraph) {
+        return {json: jsonGraph};
+    }
+}]);
+
+new Router([{
+    route: 'todos.push',
+    call(callpath, args) {
+        return [
+            {path: 'json.todos.length', value: 11},
+            {path: 'json.todos[10].name', value: args[0].name}
+        ];
+    }
+}]);
+
diff --git a/falcor-router/index.d.ts b/falcor-router/index.d.ts
new file mode 100644
index 0000000000..b645901c42
--- /dev/null
+++ b/falcor-router/index.d.ts
@@ -0,0 +1,59 @@
+// Type definitions for falcor-router 0.4.0
+// Project: https://github.com/Netflix/falcor-router
+// Definitions by: Quramy <https://github.com/Quramy/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference types="falcor" />
+declare namespace FalcorRouter {
+
+    import DataSource = FalcorModel.DataSource;
+
+    class Router extends DataSource {
+
+        constructor(routes: Array<RouteDefinition>, options?: RouterOptions);
+
+        /**
+         * When a route misses on a call, get, or set the unhandledDataSource will
+         * have a chance to fulfill that request.
+         **/
+        routeUnhandledPathsTo(dataSource: DataSource): void;
+
+        static createClass(routes?: Array<RouteDefinition>): typeof CreatedRouter;
+    }
+
+    class CreatedRouter extends Router {
+        constructor(options?: RouterOptions);
+    }
+
+    interface Route {
+        route: string;
+    }
+
+    type RoutePathSet = FalcorJsonGraph.PathSet;
+
+    interface CallRoute extends Route {
+        call(callPath: RoutePathSet, args: Array<any>): RouteResult | Promise<RouteResult>;
+    }
+
+    interface GetRoute extends Route {
+        get(pathset: RoutePathSet): RouteResult | Promise<RouteResult>;
+    }
+
+    interface SetRoute extends Route {
+        set(jsonGraph: FalcorJsonGraph.JSONGraph): RouteResult | Promise<RouteResult>;
+    }
+
+    type RouteDefinition = GetRoute | SetRoute | CallRoute;
+    type RouteResult = FalcorJsonGraph.PathValue | Array<FalcorJsonGraph.PathValue> | FalcorJsonGraph.JSONEnvelope<any>;
+
+    interface RouterOptions {
+        debug?: boolean;
+        maxPaths?: number;
+        maxRefFollow?: number;
+    }
+}
+
+declare module 'falcor-router' {
+    export = FalcorRouter.Router;
+}
+
diff --git a/falcor-router/tsconfig.json b/falcor-router/tsconfig.json
new file mode 100644
index 0000000000..e934d38485
--- /dev/null
+++ b/falcor-router/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "falcor-router-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/falcor/falcor-browser-tests.ts b/falcor/falcor-browser-tests.ts
new file mode 100644
index 0000000000..073d777679
--- /dev/null
+++ b/falcor/falcor-browser-tests.ts
@@ -0,0 +1,18 @@
+
+
+var model = new falcor.Model({source: new falcor.HttpDataSource('/model.json')});
+
+model.get('greeting').then(response => {
+    document.write(response.json.greeting);
+});
+
+model.set({
+    json: {
+        someAtom: falcor.atom('value'),
+        someRef: falcor.ref('someAtom'),
+        someError: falcor.error('an error'),
+    }
+});
+
+model.set(falcor.pathValue('greeting', 'Hello, world'));
+
diff --git a/falcor/falcor-browser.d.ts b/falcor/falcor-browser.d.ts
new file mode 100644
index 0000000000..2ee488c2af
--- /dev/null
+++ b/falcor/falcor-browser.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for falcor 0.1.17
+// Project: http://netflix.github.io/falcor/
+// Definitions by: Quramy <https://github.com/Quramy/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+
+/// <reference types="falcor-http-datasource" />
+
+declare interface FalcorStatic {
+    Model: typeof FalcorModel.Model;
+    DataSource: typeof FalcorModel.DataSource;
+    HttpDataSource: typeof FalcorHttpDataSource.XMlHttpSource;
+    ref: typeof FalcorJsonGraph.ref;
+    atom: typeof FalcorJsonGraph.atom;
+    error: typeof FalcorJsonGraph.error;
+    pathValue: typeof FalcorJsonGraph.pathValue;
+}
+
+declare var falcor: FalcorStatic;
+
diff --git a/falcor/falcor-tests.ts b/falcor/falcor-tests.ts
new file mode 100644
index 0000000000..35cf7810ba
--- /dev/null
+++ b/falcor/falcor-tests.ts
@@ -0,0 +1,132 @@
+
+
+import falcor = require('falcor');
+
+let dataSource: falcor.DataSource;
+dataSource.get([['someParam']]).subscribe(jsonGraphEnvelope => {
+    console.log(jsonGraphEnvelope.jsonGraph);
+});
+dataSource.set({
+    jsonGraph: {
+        someParam: 'value',
+    },
+    paths: [['someParam']]
+}).subscribe(jsonGraphEnvelope => {
+    console.log(jsonGraphEnvelope.jsonGraph);
+});
+
+dataSource.call(['items', 'push']);
+dataSource.call(['items', 'push'], [{id: 'i003', name: 'item003'}]);
+dataSource.call(['items', 'push'], [{id: 'i003', name: 'item003'}], [['id', 'name']]);
+dataSource.call(['items', 'push'], [{id: 'i003', name: 'item003'}], [['id', 'name']], [['length']]).subscribe(jsonGraphEnvelope => {
+    console.log(jsonGraphEnvelope.jsonGraph);
+    console.log(jsonGraphEnvelope.invalidate);
+    console.log(jsonGraphEnvelope.paths[0]);
+});
+
+new falcor.Model();
+new falcor.Model({});
+new falcor.Model({
+    source: dataSource,
+    cache: {},
+    maxSize: 100,
+    collectRatio: 0.5,
+    comparator: (a, b) => {
+        return a === b;
+    },
+    errorSelector: (jsonGraphError: any) => {
+        console.error(jsonGraphError);
+    },
+    onChange: () => {
+        console.log('Changed!');
+    }
+});
+
+const model = new falcor.Model({
+    cache: {
+        itemsById: {
+            i01: {id: 'i01', name: 'item 01'},
+            i27: {id: 'i27', name: 'item 27'},
+        },
+        items: [
+            {$type: 'ref', value: ['itemsById', 'i01']},
+            {$type: 'ref', value: ['itemsById', 'i27']},
+        ],
+    }
+});
+
+model.get('items[0].name');
+model.get(['items', 0, 'name']);
+model.get(['items', {from: 0, to: 1}, 'name']);
+model.get(['items', {from: 0, length: 2, hoge: 3}, 'name']);
+model.get('items[0].name', 'items[1].name');
+
+model.set({path: 'items[0].name', value: 'ITEM 01'}, {path: ['items', 1, 'name'], value: 'ITEM 27'});
+model.set({
+    itemsById: {
+        i01: {
+            name: 'ITEM 01'
+        }
+    }
+});
+
+model.preload();
+model.preload(['items', 0, 'name']);
+model.preload(['items', 0, 'name'], ['items', 1, 'name']);
+model.preload(['items', {from: 0, to: 1}, 'name']);
+
+model.call('items.push');
+model.call(['items', 'push']);
+model.call('items.push', [{id: 'i02', name: 'item02'}], ["length"]);
+model.call('items.push', [{id: 'i02', name: 'item02'}], ["name", "length"], []);
+
+model.invalidate();
+model.invalidate(['items', 0, 'name']);
+model.invalidate(['items', 0, 'name'], ['items', 1, 'name']);
+model.invalidate(['items', {from: 0, to: 1}, 'name']);
+
+model.get('items[0].["name", "id"]').then(res => {
+    const derefedModel = model.deref(res.json.items[0])
+    derefedModel.get('name', 'id');
+});
+
+model.getValue('items[0].name').subscribe();
+model.getValue(['items', 0, 'name']).subscribe();
+
+model.setValue('items[0].name', 'item001').subscribe();
+model.setValue(['items', 0, 'name'], 'item001').subscribe();
+
+model.setCache({itemsById: {}});
+
+const cache = model.getCache();
+
+let version: number;
+version = model.getVersion();
+version = model.getVersion(['items']);
+
+const delayedBatchingModel: falcor.Model = model.batch(100);
+delayedBatchingModel.unbatch();
+
+const teabModel: falcor.Model = model.treatErrorsAsValues();
+
+const sourceFromModel: falcor.DataSource = model.asDataSource();
+
+const boxingModel: falcor.Model = model.boxValues();
+const unboxingModel: falcor.Model = boxingModel.unboxValues();
+const noDataSourceModel: falcor.Model = model.withoutDataSource();
+const somePath: falcor.Path = model.getPath();
+
+const modelResponse = model.get<{items: {length: number}}>('items.length');
+
+modelResponse.subscribe();
+modelResponse.subscribe(res => res.json.items.length);
+modelResponse.subscribe(res => res.json.items.length, error => console.error.bind(error));
+modelResponse.subscribe(res => res.json.items.length, error => console.error.bind(error), () => null);
+
+const subscription = modelResponse.subscribe(res => res);
+subscription.dispose();
+
+modelResponse.then(res => res.json.items.length);
+modelResponse.then(res => res, error => console.error.bind(error));
+modelResponse.then<number>(res => res.json.items.length).then((l: number) => l + 1);
+
diff --git a/falcor/index.d.ts b/falcor/index.d.ts
new file mode 100644
index 0000000000..519c643fd4
--- /dev/null
+++ b/falcor/index.d.ts
@@ -0,0 +1,276 @@
+// Type definitions for falcor 0.1.17
+// Project: http://netflix.github.io/falcor/
+// Definitions by: Quramy <https://github.com/Quramy/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference types="falcor-json-graph" />
+
+export = FalcorModel;
+export as namespace falcor;
+
+declare namespace FalcorModel {
+
+    /////////////////////////////////////////////////////
+    //  Global types
+    /////////////////////////////////////////////////////
+
+    export import Atom = FalcorJsonGraph.Atom;
+    export import Error = FalcorJsonGraph.Error;
+    export import Key = FalcorJsonGraph.Key;
+    export import KeySet = FalcorJsonGraph.KeySet;
+    export import Path = FalcorJsonGraph.Path;
+    export import PathSet = FalcorJsonGraph.PathSet;
+    export import PathValue = FalcorJsonGraph.PathValue;
+    export import JSONEnvelope = FalcorJsonGraph.JSONEnvelope;
+    export import JSONGraph = FalcorJsonGraph.JSONGraph;
+    export import JSONGraphEnvelope = FalcorJsonGraph.JSONGraphEnvelope;
+    export import Range = FalcorJsonGraph.Range;
+    export import Reference = FalcorJsonGraph.Reference;
+
+    /////////////////////////////////////////////////////
+    //  DataSource
+    /////////////////////////////////////////////////////
+
+    /**
+     * A DataSource is an interface which can be implemented to expose JSON Graph information to a Model. Every DataSource is associated with a single JSON Graph object. Models execute JSON Graph operations (get, set, and call) to retrieve values from the DataSource’s JSON Graph object. DataSources may retrieve JSON Graph information from anywhere, including device memory, a remote machine, or even a lazily-run computation.
+     **/
+    abstract class DataSource {
+
+        /**
+         * The get method retrieves values from the DataSource's associated JSONGraph object.
+         **/
+        get(pathSets: Array<PathSet>): Observable<JSONGraphEnvelope>;
+
+
+        /**
+         * The set method accepts values to set in the DataSource's associated JSONGraph object.
+         **/
+        set(jsonGraphEnvelope: JSONGraphEnvelope): Observable<JSONGraphEnvelope>;
+
+
+        /**
+         * Invokes a function in the DataSource's JSONGraph object.
+         **/
+        call(functionPath: Path, args?: Array<any>, refSuffixes?: Array<PathSet>, thisPaths?: Array<PathSet>): Observable<JSONGraphEnvelope>;
+    }
+
+
+    /////////////////////////////////////////////////////
+    //  Model
+    /////////////////////////////////////////////////////
+
+    interface ModelOptions {
+        source?: DataSource;
+        cache?: JSONGraph;
+        maxSize?: number;
+        collectRatio?: number;
+        errorSelector?: ModelErrorSelector;
+        onChange?: ModelOnChange;
+        comparator?: ModelComparator;
+    }
+
+    /**
+     * This callback is invoked when the Model's cache is changed.
+     **/
+    interface ModelOnChange {
+        (): void;
+    }
+
+    /**
+     * This function is invoked on every JSONGraph Error retrieved from the DataSource. This function allows Error objects to be transformed before being stored in the Model's cache.
+     **/
+    interface ModelErrorSelector {
+        (jsonGraphError: any): any;
+    }
+
+    /**
+     * This function is invoked every time a value in the Model cache is about to be replaced with a new value. If the function returns true, the existing value is replaced with a new value and the version flag on all of the value's ancestors in the tree are incremented.
+     **/
+    interface ModelComparator {
+        (existingValue: any, newValue: any): boolean;
+    }
+
+    /**
+     * A Model object is used to execute commands against a {@link JSONGraph} object. {@link Model}s can work with a local JSONGraph cache, or it can work with a remote {@link JSONGraph} object through a {@link DataSource}.
+     **/
+    class Model {
+        constructor(options?: ModelOptions);
+
+        /**
+         * The get method retrieves several {@link Path}s or {@link PathSet}s from a {@link Model}. The get method loads each value into a JSON object and returns in a ModelResponse.
+         **/
+        get(...path: Array<string | PathSet>): ModelResponse<JSONEnvelope<any>>;
+        get<T>(...path: Array<string | PathSet>): ModelResponse<JSONEnvelope<T>>;
+
+        /**
+         * Sets the value at one or more places in the JSONGraph model. The set method accepts one or more {@link PathValue}s, each of which is a combination of a location in the document and the value to place there.  In addition to accepting  {@link PathValue}s, the set method also returns the values after the set operation is complete.
+         **/
+        set(...args: Array<PathValue>): ModelResponse<JSONEnvelope<any>>;
+        set<T>(...args: Array<PathValue>): ModelResponse<JSONEnvelope<T>>;
+        set(jsonGraph: JSONGraph): ModelResponse<JSONEnvelope<any>>;
+        set<T>(jsonGraph: JSONGraph): ModelResponse<JSONEnvelope<T>>;
+
+        /**
+         * The preload method retrieves several {@link Path}s or {@link PathSet}s from a {@link Model} and loads them into the Model cache.
+         **/
+        preload(...path: Array<PathSet>): void;
+
+        /**
+         * Invokes a function in the JSON Graph.
+         **/
+        // NOTE: In http://netflix.github.io/falcor/doc/Model.html#call, it says that refPaths should be an array<PathSet>.
+        // However, model implementation returns an error with setting refPaths as Array<PathSet> and it works with refPaths as PathSet.
+        // So refPaths is defined as a PathSet in this .d.ts.
+        call(functionPath: string | Path, args?: Array<any>, refPaths?: PathSet, thisPaths?: Array<PathSet>): ModelResponse<JSONEnvelope<any>>;
+        call<T>(functionPath: string | Path, args?: Array<any>, refPaths?: PathSet, thisPaths?: Array<PathSet>): ModelResponse<JSONEnvelope<T>>;
+
+        /**
+         * The invalidate method synchronously removes several {@link Path}s or {@link PathSet}s from a {@link Model} cache.
+         **/
+        invalidate(...path: Array<PathSet>): void;
+
+        /**
+         * Returns a new {@link Model} bound to a location within the {@link JSONGraph}. The bound location is never a {@link Reference}: any {@link Reference}s encountered while resolving the bound {@link Path} are always replaced with the {@link Reference}s target value. For subsequent operations on the {@link Model}, all paths will be evaluated relative to the bound path. Deref allows you to:
+         * - Expose only a fragment of the {@link JSONGraph} to components, rather than the entire graph
+         * - Hide the location of a {@link JSONGraph} fragment from components
+         * - Optimize for executing multiple operations and path looksup at/below the same location in the {@link JSONGraph}
+         **/
+        deref(responseObject: any): Model;
+
+        /**
+         * Get data for a single {@link Path}.
+         **/
+        getValue(path: string | Path): ModelResponse<any>;
+        getValue<T>(path: string | Path): ModelResponse<T>;
+
+        /**
+         * Set value for a single {@link Path}.
+         **/
+        setValue(path: string | Path, value: any): ModelResponse<any>;
+        setValue<T>(path: string | Path, value: any): ModelResponse<T>;
+
+        /**
+         * Set the local cache to a {@link JSONGraph} fragment. This method can be a useful way of mocking a remote document, or restoring the local cache from a previously stored state.
+         **/
+        setCache(jsonGraph: JSONGraph): void;
+
+        /**
+         * Get the local {@link JSONGraph} cache. This method can be a useful to store the state of the cache.
+         **/
+        getCache(...path: Array<PathSet>): JSONGraph;
+
+        /**
+         * Retrieves a number which is incremented every single time a value is changed underneath the Model or the object at an optionally-provided Path beneath the Model.
+         **/
+        getVersion(path?: Path): number;
+
+        /**
+         * Returns a clone of the {@link Model} that enables batching. Within the configured time period, paths for get operations are collected and sent to the {@link DataSource} in a batch. Batching can be more efficient if the {@link DataSource} access the network, potentially reducing the number of HTTP requests to the server.
+         **/
+        batch(schedulerOrDelay?: number | Scheduler): Model;       // FIXME what's a valid type for scheduler?
+
+        /**
+         * Returns a clone of the {@link Model} that disables batching. This is the default mode. Each get operation will be executed on the {@link DataSource} separately.
+         **/
+        unbatch(): Model;
+
+        /**
+         * Returns a clone of the {@link Model} that treats errors as values. Errors will be reported in the same callback used to report data. Errors will appear as objects in responses, rather than being sent to the {@link Observable~onErrorCallback} callback of the {@link ModelResponse}.
+         **/
+        treatErrorsAsValues(): Model;
+
+        /**
+         * Adapts a Model to the {@link DataSource} interface.
+         **/
+        asDataSource(): DataSource;
+
+        /**
+         * Returns a clone of the {@link Model} that boxes values returning the wrapper ({@link Atom}, {@link Reference}, or {@link Error}), rather than the value inside it. This allows any metadata attached to the wrapper to be inspected.
+         **/
+        boxValues(): Model;
+
+        /**
+         * Returns a clone of the {@link Model} that unboxes values, returning the value inside of the wrapper ({@link Atom}, {@link Reference}, or {@link Error}), rather than the wrapper itself. This is the default mode.
+         **/
+        unboxValues(): Model;
+
+        /**
+         * Returns a clone of the {@link Model} that only uses the local {@link JSONGraph} and never uses a {@link DataSource} to retrieve missing paths.
+         **/
+        withoutDataSource(): Model;
+
+        /**
+         * Returns the {@link Path} to the object within the JSON Graph that this Model references.
+         **/
+        getPath(): Path;
+    }
+
+
+    /////////////////////////////////////////////////////
+    //  ModelResponse
+    /////////////////////////////////////////////////////
+
+    class ModelResponse<T> extends Observable<T>{
+        constructor(observable: Observable<T>);
+        progressively(): ModelResponse<JSONEnvelope<T>>;
+        forEach(onNext: (value: T) => void, onError?: (error: Error) => void, onCompleted?: () => void): Subscription;
+        then(onFulfilled?: (value: T) => any | Thenable<any>, onRejected?: (error: any) => void): Thenable<any>;
+        then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => void): Thenable<U>;
+    }
+
+    interface Thenable<T> {
+        then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => U | Thenable<U>): Thenable<U>;
+        then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => void): Thenable<U>;
+    }
+
+
+    /////////////////////////////////////////////////////
+    //  Observable
+    /////////////////////////////////////////////////////
+
+    class Observable<T>{
+
+        /**
+         * The forEach method is a synonym for {@link Observable.prototype.subscribe} and triggers the execution of the Observable, causing the values within to be pushed to a callback. An Observable is like a pipe of water that is closed. When forEach is called, we open the valve and the values within are pushed at us.  These values can be received using either callbacks or an {@link Observer} object.
+         **/
+        forEach(onNext?: ObservableOnNextCallback<T>, onError?: ObservableOnErrorCallback , onCompleted?: ObservableOnCompletedCallback ): Subscription;
+
+        /**
+         * The subscribe method is a synonym for {@link Observable.prototype.forEach} and triggers the execution of the Observable, causing the values within to be pushed to a callback. An Observable is like a pipe of water that is closed. When forEach is called, we open the valve and the values within are pushed at us.  These values can be received using either callbacks or an {@link Observer} object.
+         **/
+        subscribe(onNext?: ObservableOnNextCallback<T>, onError?: ObservableOnErrorCallback , onCompleted?: ObservableOnCompletedCallback ): Subscription;
+    }
+
+    /**
+     * This callback accepts a value that was emitted while evaluating the operation underlying the {@link Observable} stream.
+     **/
+    interface ObservableOnNextCallback<T> {
+        (value: T): void;
+    }
+
+    /**
+     * This callback accepts an error that occurred while evaluating the operation underlying the {@link Observable} stream. When this callback is invoked, the {@link Observable} stream ends and no more values will be received by the {@link Observable~onNextCallback}.
+     **/
+    interface ObservableOnErrorCallback  {
+        (error: Error): void;
+    }
+
+    /**
+     * This callback is invoked when the {@link Observable} stream ends. When this callback is invoked the {@link Observable} stream has ended, and therefore the {@link Observable~onNextCallback} will not receive any more values.
+     **/
+    interface ObservableOnCompletedCallback  {
+        (): void;
+    }
+
+    class Subscription {
+        /**
+         * When this method is called on the Subscription, the Observable that created the Subscription will stop sending values to the callbacks passed when the Subscription was created.
+         **/
+        dispose(): void;
+    }
+
+    interface Scheduler {
+		catch(handler: (exception: any) => boolean): Scheduler;
+		catchException(handler: (exception: any) => boolean): Scheduler;
+	}
+}
diff --git a/falcor/tsconfig.json b/falcor/tsconfig.json
new file mode 100644
index 0000000000..43759aee17
--- /dev/null
+++ b/falcor/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "falcor-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/famous/famous-tests.ts b/famous/famous-tests.ts
index 81ad495f87..9c35b87738 100644
--- a/famous/famous-tests.ts
+++ b/famous/famous-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./famous.d.ts" />
+
 
 import { Node, Size, FamousEngine } from 'famous/core'
 import { DOMElement } from 'famous/dom-renderables'
diff --git a/famous/famous.d.ts b/famous/index.d.ts
similarity index 100%
rename from famous/famous.d.ts
rename to famous/index.d.ts
diff --git a/famous/tsconfig.json b/famous/tsconfig.json
new file mode 100644
index 0000000000..29953fb075
--- /dev/null
+++ b/famous/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "famous-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fancybox/fancybox-tests.ts b/fancybox/fancybox-tests.ts
index 722820e572..2d5743c950 100644
--- a/fancybox/fancybox-tests.ts
+++ b/fancybox/fancybox-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="fancybox.d.ts" />
+/// <reference types="jquery" />
+
 
 $('.fancybox').fancybox();
 $('.fancybox').fancybox({
diff --git a/fancybox/fancybox-tests.ts.tscparams b/fancybox/fancybox-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/fancybox/fancybox-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/fancybox/fancybox.d.ts b/fancybox/fancybox.d.ts
deleted file mode 100644
index f130acb3d6..0000000000
--- a/fancybox/fancybox.d.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-// Type definitions for fancyBox 2.1
-// Project: https://github.com/fancyapps/fancyBox
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface FancyboxOptions extends FancyboxCallback {
-    padding?: any; // number or []
-    margin?: any; // number or []
-    width?: any; // number or []
-    height?: any; // number or []
-    minWidth?: number;
-    minHeight?: number;
-    maxWidth?: number;
-    maxHeight?: number;
-    autoSize?: boolean;
-    autoHeight?: boolean;
-    autoWidth?: boolean;
-    autoResize?: boolean;
-    autoCenter?: boolean;
-    fitToView?: boolean;
-    aspectRatio?: boolean;
-    topRatio?: number;
-    leftRatio?: number;
-    scrolling?: string;
-    wrapCSS?: string;
-    arrows?: boolean;
-    closeBtn?: boolean;
-    closeClick?: boolean;
-    nextClick?: boolean;
-    mouseWheel?: boolean;
-    autoPlay?: boolean;
-    playSpeed?: number;
-    preload?: number;
-    modal?: boolean;
-    loop?: boolean;
-    ajax?: any;
-    iframe?: any;
-    swf?: any;
-    keys?: any;
-    direction?: any;
-    scrollOutside?: boolean;
-    index?: number;
-    type?: string;
-    href?: string;
-    content?: string;
-    title?: string;
-    tpl?: any;
-
-    openEffect?: string;
-    closeEffect?: string;
-    nextEffect?: string;
-    prevEffect?: string;
-
-    openSpeed?: number;
-    closeSpeed?: number;
-    nextSpeed?: number;
-    prevSpeed?: number;
-
-    openEasing?: string;
-    closeEasing?: string;
-    nextEasing?: string;
-    prevEasing?: string;
-
-    openOpacity?: boolean;
-    closeOpacity?: boolean;
-
-    openMethod?: string;
-    closeMethod?: string;
-    nextMethod?: string;
-    prevMethod?: string;
-
-    helpers?: any;
-}
-
-interface FancyboxMethods {
-    open(group?: any[], options?: FancyboxOptions);
-    cancel();
-    close(force?: boolean);
-    play();
-    next();
-    prev();
-    jumpto(index?: number);
-    reposition();
-    update();
-    toggle();
-    showLoading();
-    hideLoading();
-
-    (options: FancyboxOptions): void;
-    (selector: string, options?: FancyboxOptions): void;
-    (selector: JQuery, options?: FancyboxOptions): void;
-    (group?: any[], options?: FancyboxOptions): void;
-}
-
-interface FancyboxCallback {
-    onCancel?: Function;
-    beforeLoad?: Function;
-    afterLoad?: Function;
-    beforeShow?: Function;
-    afterShow?: Function;
-    beforeClose?: Function;
-    afterClose?: Function;
-    onUpdate?: Function;
-    onPlayStart?: Function;
-    onPlayEnd?: Function;
-}
-
-interface FancyboxThumbnailHelperOptions {
-    width?: number;
-    height?: number;
-    source?: any;
-    position?: string;
-}
-
-interface FancyboxButtonHelperOptions {
-    tpl?: string;
-    position?: string;
-}
-
-interface JQuery {
-    fancybox: FancyboxMethods;
-}
-
-interface JQueryStatic {
-    fancybox: FancyboxMethods;
-}
\ No newline at end of file
diff --git a/fancybox/fancybox.d.ts.tscparams b/fancybox/fancybox.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/fancybox/fancybox.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/fancybox/index.d.ts b/fancybox/index.d.ts
new file mode 100644
index 0000000000..736d096279
--- /dev/null
+++ b/fancybox/index.d.ts
@@ -0,0 +1,131 @@
+// Type definitions for fancyBox 2.1
+// Project: https://github.com/fancyapps/fancyBox
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="jquery" />
+
+interface FancyboxOptions extends FancyboxCallback {
+    padding?: any; // number or []
+    margin?: any; // number or []
+    width?: any; // number or []
+    height?: any; // number or []
+    minWidth?: number;
+    minHeight?: number;
+    maxWidth?: number;
+    maxHeight?: number;
+    autoSize?: boolean;
+    autoHeight?: boolean;
+    autoWidth?: boolean;
+    autoResize?: boolean;
+    autoCenter?: boolean;
+    fitToView?: boolean;
+    aspectRatio?: boolean;
+    topRatio?: number;
+    leftRatio?: number;
+    scrolling?: string;
+    wrapCSS?: string;
+    arrows?: boolean;
+    closeBtn?: boolean;
+    closeClick?: boolean;
+    nextClick?: boolean;
+    mouseWheel?: boolean;
+    autoPlay?: boolean;
+    playSpeed?: number;
+    preload?: number;
+    modal?: boolean;
+    loop?: boolean;
+    ajax?: any;
+    iframe?: any;
+    swf?: any;
+    keys?: any;
+    direction?: any;
+    scrollOutside?: boolean;
+    index?: number;
+    type?: string;
+    href?: string;
+    content?: string;
+    title?: string;
+    tpl?: any;
+
+    openEffect?: string;
+    closeEffect?: string;
+    nextEffect?: string;
+    prevEffect?: string;
+
+    openSpeed?: number;
+    closeSpeed?: number;
+    nextSpeed?: number;
+    prevSpeed?: number;
+
+    openEasing?: string;
+    closeEasing?: string;
+    nextEasing?: string;
+    prevEasing?: string;
+
+    openOpacity?: boolean;
+    closeOpacity?: boolean;
+
+    openMethod?: string;
+    closeMethod?: string;
+    nextMethod?: string;
+    prevMethod?: string;
+
+    helpers?: any;
+    live?: boolean;
+    parent?: string;
+}
+
+interface FancyboxMethods {
+    open(group?: any[], options?: FancyboxOptions);
+    cancel();
+    close(force?: boolean);
+    play();
+    next();
+    prev();
+    jumpto(index?: number);
+    reposition();
+    update();
+    toggle();
+    showLoading();
+    hideLoading();
+
+    (options: FancyboxOptions): void;
+    (selector: string, options?: FancyboxOptions): void;
+    (selector: JQuery, options?: FancyboxOptions): void;
+    (group?: any[], options?: FancyboxOptions): void;
+}
+
+interface FancyboxCallback {
+    onCancel?: Function;
+    beforeLoad?: Function;
+    afterLoad?: Function;
+    beforeShow?: Function;
+    afterShow?: Function;
+    beforeClose?: Function;
+    afterClose?: Function;
+    onUpdate?: Function;
+    onPlayStart?: Function;
+    onPlayEnd?: Function;
+}
+
+interface FancyboxThumbnailHelperOptions {
+    width?: number;
+    height?: number;
+    source?: any;
+    position?: string;
+}
+
+interface FancyboxButtonHelperOptions {
+    tpl?: string;
+    position?: string;
+}
+
+interface JQuery {
+    fancybox: FancyboxMethods;
+}
+
+interface JQueryStatic {
+    fancybox: FancyboxMethods;
+}
diff --git a/fancybox/tsconfig.json b/fancybox/tsconfig.json
new file mode 100644
index 0000000000..aea440bb42
--- /dev/null
+++ b/fancybox/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "fancybox-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/farbtastic/farbtastic-tests.ts b/farbtastic/farbtastic-tests.ts
index ac5eb40747..950c1c294d 100644
--- a/farbtastic/farbtastic-tests.ts
+++ b/farbtastic/farbtastic-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="farbtastic.d.ts" />
+
 
 var callback = () => {};
 var domNode = document.createElement("div");
diff --git a/farbtastic/farbtastic.d.ts b/farbtastic/farbtastic.d.ts
deleted file mode 100644
index 921f407e30..0000000000
--- a/farbtastic/farbtastic.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// Type definitions for Farbtastic: jQuery Color Wheel v2.0.0-alpha.1
-// Project: http://mattfarina.github.io/farbtastic/
-// Definitions by: Matt Brooks <https://github.com/EnableSoftware>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace JQueryFarbtastic {
-    type Placeholder = string | Element | JQuery;
-    type CallbackFunction = (color: string) => any;
-    type Callback = CallbackFunction | Placeholder;
-
-    interface Options {
-        callback?: Callback;
-        width?: number;
-        wheelWidth?: number;
-    }
-
-    interface Farbtastic {
-        linked: CallbackFunction | JQuery;
-        color: string;
-        hsl: number[];
-
-        linkTo(callback: Callback): Farbtastic;
-        setColor(color: string | number[]): Farbtastic;
-        setHSL(hsl: number[]): Farbtastic;
-    }
-}
-
-interface JQueryStatic {
-    farbtastic(placeholder: JQueryFarbtastic.Placeholder, callback: JQueryFarbtastic.Callback): JQueryFarbtastic.Farbtastic;
-    farbtastic(placeholder: JQueryFarbtastic.Placeholder, options: JQueryFarbtastic.Options): JQueryFarbtastic.Farbtastic;
-    farbtastic(placeholder: JQueryFarbtastic.Placeholder): JQueryFarbtastic.Farbtastic;
-}
-
-interface JQuery {
-    farbtastic(callback: JQueryFarbtastic.Callback): JQuery;
-    farbtastic(options: JQueryFarbtastic.Options): JQuery;
-    farbtastic(): JQuery;
-}
diff --git a/farbtastic/index.d.ts b/farbtastic/index.d.ts
new file mode 100644
index 0000000000..6f6081982e
--- /dev/null
+++ b/farbtastic/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for Farbtastic: jQuery Color Wheel v2.0.0-alpha.1
+// Project: http://mattfarina.github.io/farbtastic/
+// Definitions by: Matt Brooks <https://github.com/EnableSoftware>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace JQueryFarbtastic {
+    type Placeholder = string | Element | JQuery;
+    type CallbackFunction = (color: string) => any;
+    type Callback = CallbackFunction | Placeholder;
+
+    interface Options {
+        callback?: Callback;
+        width?: number;
+        wheelWidth?: number;
+    }
+
+    interface Farbtastic {
+        linked: CallbackFunction | JQuery;
+        color: string;
+        hsl: number[];
+
+        linkTo(callback: Callback): Farbtastic;
+        setColor(color: string | number[]): Farbtastic;
+        setHSL(hsl: number[]): Farbtastic;
+    }
+}
+
+interface JQueryStatic {
+    farbtastic(placeholder: JQueryFarbtastic.Placeholder, callback: JQueryFarbtastic.Callback): JQueryFarbtastic.Farbtastic;
+    farbtastic(placeholder: JQueryFarbtastic.Placeholder, options: JQueryFarbtastic.Options): JQueryFarbtastic.Farbtastic;
+    farbtastic(placeholder: JQueryFarbtastic.Placeholder): JQueryFarbtastic.Farbtastic;
+}
+
+interface JQuery {
+    farbtastic(callback: JQueryFarbtastic.Callback): JQuery;
+    farbtastic(options: JQueryFarbtastic.Options): JQuery;
+    farbtastic(): JQuery;
+}
diff --git a/farbtastic/tsconfig.json b/farbtastic/tsconfig.json
new file mode 100644
index 0000000000..973f8c6bc8
--- /dev/null
+++ b/farbtastic/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "farbtastic-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fast-stats/fast-stats-tests.ts b/fast-stats/fast-stats-tests.ts
index 9c3e7f9664..43dfa2c38d 100644
--- a/fast-stats/fast-stats-tests.ts
+++ b/fast-stats/fast-stats-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="fast-stats.d.ts" />
 
 import faststats = require("fast-stats");
 import Stats = faststats.Stats;
diff --git a/fast-stats/fast-stats.d.ts b/fast-stats/fast-stats.d.ts
deleted file mode 100644
index e0324ee31a..0000000000
--- a/fast-stats/fast-stats.d.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-// Type definitions for fast-stats 0.0.2
-// Project: https://github.com/bluesmoon/node-faststats
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'fast-stats' {
-
-	export interface StatsOpts {
-		/**
-		 * Tells fast-stats to maintain a histogram of your dataset using this parameter as the least count, or precision.
-		 * By default, fast-stats will not maintain buckets since it does not know the least count and range of your dataset in advance.
-		 * This option is required if you need to use the distribution() method.
-		 */
-		bucket_precision?: number;
-		
-		/**
-		 * Tells fast-stats to maintain a histogram of your dataset using these custom buckets.
-		 * Each number in the array is the upper limit of a bucket. The lower limit of the first bucket is 0, the lower limit for all other buckets is the upper limit of the previous bucket.
-		 * If you use both bucket_precision and buckets, buckets takes precedence.
-		 */
-		buckets?: number[];
-		
-		/**
-		 * Tells fast-stats how to extend the pre-defined buckets if data exceeding the range is added. This is useful to capture data above your range, in multiple buckets, but with low precision so you do not end up with a large number of empty buckets.
-		 * By default this is not defined, so buckets will not be extended and all data beyond the end range will end up in the last bucket.
-		 */
-		bucket_extension_interval?: number;
-		
-		/**
-		 * Tells fast-stats not to store actual data values. This is useful to reduce memory utilisation for large datasets, however it comes with a few caveats.
-		 * - You can no longer get an exact median or other percentile value out of your dataset, however you could use bucketing (see bucket_precision above) to get an approximate percentile value.
-		 * - You can no longer run an exact iqr filter or a band_pass filter on the data, however you could use bucketing to get an approximate filtered object.
-		 * - You can no longer get at the entire dataset or remove data from the dataset.
-		 * The mean, standard deviation and margin of error calculations are unaffected by this parameter. If you use bucketing, and only care about the mean, standard deviation and margin of error or an approximate median or percentile value, set this option to false.
-		 * By default, store_data is true.
-		 */
-		store_data?: boolean;
-		
-		/**
-		 * Tells fast-stats whether the data you pass in is a sample (true) or the entire (false default) population.
-		 * The standard deviation algorithm differs for populations v/s samples.
-		 */
-		sampling?: boolean; 
-	}
-	
-	/**
-	 * Distribution bucket
-	 */
-	export interface Bucket {
-		/**
-		 * Bucket midpoint
-		 */
-		bucket: number;
-		/**
-		 * [<bucket low>, <bucket high>],
-		 */
-		range:  number[];
-		/**
-		 * Number of datapoints
-		 */
-		count:  number;
-	}		
-
-	/**
-	 * A NodeJS library to do statistical analysis of numeric datasets.
-	 * When doing statistical analysis of data, the most common usage pattern is to run multiple statistical methods on the same set of data. Some of these methods use others. For example, to calculate the standard deviation of a dataset, we first need the mean.
-	 * Additionally, some methods can be calculated quickly as data is inserted, thereby reducing the number of loops required to run through the data during processing.
-	 * Fast stats maintains a running cache of several summary values as data is inserted making final calculation very fast. It trades off a small amount of additional memory usage for a large reduction in execution time.	 
-	 */
-	export class Stats {
-		constructor(opts?: StatsOpts);
-		
-		/**
-		 * Add elements to back
-		 */
-		push(...args: number[]): void;
-		push(args: number[]): void;		
-
-		/**
-		 * Remove element from back
-		 */
-		pop(): number;
-		
-		/**
-		 * Remove element from front
-		 */
-		shift(): number;
-
-		/**
-		 * Add elements to front
-		 */
-		unshift(...args: number[]): void;
-		
-		/**
-		 * Number of elements
-		 */
-		length: number;
-		
-		/**
-		 * Clear all data
-		 */
-		reset(): void;
-		
-		/**
-		 * Fresh copy
-		 */
-		copy(): Stats;
-		
-		
-		/**
-		 * Arithmetic Mean
-		 * The arithmetic mean is calculated as the sum of all data points divided by the number of data points. This is useful for data sets that are fairly uniform, following a linear or binomial distribution. Use the amean() method or the `�()? method to get at it:
-		 */
-		amean(): number;
-				
-		/**
-		 * Geometric Mean
-		 * The geometric mean is the nth root of the product of all data points where n is the number of data points. This is useful for data sets that follow an exponential or log-normal distribution. Use the gmean() method to get at it:
-		 */
-		gmean(): number;
-		 
-		/**
-		 * Median
-		 * The median is the middle point of the dataset when sorted in ascending order. This is useful if your dataset has a lot of outliers and noise that would not normally be found in a complete population. Use the median() method to get at it:
-		 * If your data set contains an odd number of points, the median will be the middle point. If it contains an even number of points, then the median will be the arithmetic mean of the two middle points.
-		 * If your Stats object is configured to use buckets and has store_data set to false, then the median will be an approximation of the actual median.
-		 */
-		median(): number;
-		
-		/**
-		 * Any Percentile
-		 * You can also get at any percentile value within the data. Use the percentile() method to get at this data. The percentile() method takes in a single argument. This is a number between 0 and 100 (both inclusive) that specifies which percentile point you want.
-		 * Passing in 50 as an argument will return the median, while 25 and 75 will return the first and third quartiles respectively. These three special values may be arithmetic means of two other values within the set. All other arguments will return a number from the data set.
-		 * If your Stats object is configured to use buckets and has store_data set to false, then the percentile value returned will be an approximation of the actual percentile based on the configured bucket_precision or buckets.
-		 */
-		percentile(n: number): number;
-		
-		/**
-		 * Range
-		 * The range() method tells you the minimum and maximum values of your data set. It returns an array of two values. The first is the lower bound and the second is the upper bound.
-		 */
-		range(): number[];
-		
-		/**
-		 * The distribution() method tells you how your data is distributed. You need to set the bucket_precision or buckets configuration options if you plan on using this method. It will then split your data into buckets based on the value of bucket_precision or buckets and tell you how many data points fall into each bucket. You can use this to plot a histogram of your data, or to compare it to commonly known distribution functions.
-		 * The return value is a sparse array of buckets with counts of datapoints per bucket. To save on memory, any empty buckets are undefined. You should treat an undefined bucket as if it had 0 datapoints.
-		 */
-		distribution(): Bucket[];
-		
-		/**
-		 * Arithmetic Standard Deviation
-		 * Also commonly just called the Standard Deviation, with the symbol s. This tells you the spread of your data if it follows a normal (or close to normal) distribution, ie, the bell curve. fast-stats is really fast at calculating the standard deviation of a dataset
-		 * The arithmetic standard deviation is used in conjunction with the arithmetic mean to tell you the spread of your dataset: [amean-stddev, amean+stddev]. Note that you could also use 2 or 3 standard deviations for different spreads.
-		 */
-		stddev(): number;
-		
-		/**
-		 * Geometric Standard Deviation
-		 * The geometric standard deviation tells you the spread of your data if it follows a log-normal or exponential distribution. Use the gstddev() method to get at it.
-		 */
-		gstddev(): number;
-		
-		/**
-		 * 95% Confidence Margin of Error
-		 * The Margin of Error value tells you the range within which the real arithmetic mean of the population is likely to be with 95% confidence. Use the moe() method to get at it.
-		 * This value suggests that we are 95% certain that the real mean of the population is within 2.60 of the calculated arithmetic mean of 4.67. We could use this to find out the percent error in our sample. In this case there is a 55.71% error.
-		 * The margin of error is inversely proportional to the square root of the number of data points, so increasing the size of your sample will reduce the margin of error. It is good to strive for a margin of error of less than 5%.
-		 */
-		moe(): number;
-		
-		/**
-		 * Band-pass filtering
-		 * The band_pass() filter method returns a new Stats object with all its data points within the specified range. This method takes in three arguments. The first is the lower bound of the range, the second is the upper bound of the range. Both these arguments are required.
-		 * The third argument specifies whether the range is open or closed. An open range does not include the upper and lower bounds while a closed range includes them. If not specified (or set to false), the range is closed. If set to true the range is open.
-		 * Band pass filtering should be used if the range for your data is rigid and never changes.
-		 */
-		band_pass(low: number, high: number, open?: boolean): Stats
-		
-		/**
-		 * IQR Filtering
-		 * IQR, or Inter Quartile Range filtering filters data based on the spread of the data. It is much more adaptive to changes in data ranges. Use the iqr() method to IQR filter a dataset. The iqr() method does not accept any arguments.
-		 * In some cases, IQR filtering may not filter out anything. This can happen if the acceptable range is wider than the bounds of your dataset.
-		 */
-		iqr(): Stats;
-	}
-}
diff --git a/fast-stats/index.d.ts b/fast-stats/index.d.ts
new file mode 100644
index 0000000000..d1c4ae9620
--- /dev/null
+++ b/fast-stats/index.d.ts
@@ -0,0 +1,185 @@
+// Type definitions for fast-stats 0.0.2
+// Project: https://github.com/bluesmoon/node-faststats
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+export interface StatsOpts {
+    /**
+     * Tells fast-stats to maintain a histogram of your dataset using this parameter as the least count, or precision.
+     * By default, fast-stats will not maintain buckets since it does not know the least count and range of your dataset in advance.
+     * This option is required if you need to use the distribution() method.
+     */
+    bucket_precision?: number;
+
+    /**
+     * Tells fast-stats to maintain a histogram of your dataset using these custom buckets.
+     * Each number in the array is the upper limit of a bucket. The lower limit of the first bucket is 0, the lower limit for all other buckets is the upper limit of the previous bucket.
+     * If you use both bucket_precision and buckets, buckets takes precedence.
+     */
+    buckets?: number[];
+
+    /**
+     * Tells fast-stats how to extend the pre-defined buckets if data exceeding the range is added. This is useful to capture data above your range, in multiple buckets, but with low precision so you do not end up with a large number of empty buckets.
+     * By default this is not defined, so buckets will not be extended and all data beyond the end range will end up in the last bucket.
+     */
+    bucket_extension_interval?: number;
+
+    /**
+     * Tells fast-stats not to store actual data values. This is useful to reduce memory utilisation for large datasets, however it comes with a few caveats.
+     * - You can no longer get an exact median or other percentile value out of your dataset, however you could use bucketing (see bucket_precision above) to get an approximate percentile value.
+     * - You can no longer run an exact iqr filter or a band_pass filter on the data, however you could use bucketing to get an approximate filtered object.
+     * - You can no longer get at the entire dataset or remove data from the dataset.
+     * The mean, standard deviation and margin of error calculations are unaffected by this parameter. If you use bucketing, and only care about the mean, standard deviation and margin of error or an approximate median or percentile value, set this option to false.
+     * By default, store_data is true.
+     */
+    store_data?: boolean;
+
+    /**
+     * Tells fast-stats whether the data you pass in is a sample (true) or the entire (false default) population.
+     * The standard deviation algorithm differs for populations v/s samples.
+     */
+    sampling?: boolean;
+}
+
+/**
+ * Distribution bucket
+ */
+export interface Bucket {
+    /**
+     * Bucket midpoint
+     */
+    bucket: number;
+    /**
+     * [<bucket low>, <bucket high>],
+     */
+    range: number[];
+    /**
+     * Number of datapoints
+     */
+    count: number;
+}
+
+/**
+ * A NodeJS library to do statistical analysis of numeric datasets.
+ * When doing statistical analysis of data, the most common usage pattern is to run multiple statistical methods on the same set of data. Some of these methods use others. For example, to calculate the standard deviation of a dataset, we first need the mean.
+ * Additionally, some methods can be calculated quickly as data is inserted, thereby reducing the number of loops required to run through the data during processing.
+ * Fast stats maintains a running cache of several summary values as data is inserted making final calculation very fast. It trades off a small amount of additional memory usage for a large reduction in execution time.	 
+ */
+export declare class Stats {
+    constructor(opts?: StatsOpts);
+
+    /**
+     * Add elements to back
+     */
+    push(...args: number[]): void;
+    push(args: number[]): void;
+
+    /**
+     * Remove element from back
+     */
+    pop(): number;
+
+    /**
+     * Remove element from front
+     */
+    shift(): number;
+
+    /**
+     * Add elements to front
+     */
+    unshift(...args: number[]): void;
+
+    /**
+     * Number of elements
+     */
+    length: number;
+
+    /**
+     * Clear all data
+     */
+    reset(): void;
+
+    /**
+     * Fresh copy
+     */
+    copy(): Stats;
+
+
+    /**
+     * Arithmetic Mean
+     * The arithmetic mean is calculated as the sum of all data points divided by the number of data points. This is useful for data sets that are fairly uniform, following a linear or binomial distribution. Use the amean() method or the `�()? method to get at it:
+     */
+    amean(): number;
+
+    /**
+     * Geometric Mean
+     * The geometric mean is the nth root of the product of all data points where n is the number of data points. This is useful for data sets that follow an exponential or log-normal distribution. Use the gmean() method to get at it:
+     */
+    gmean(): number;
+
+    /**
+     * Median
+     * The median is the middle point of the dataset when sorted in ascending order. This is useful if your dataset has a lot of outliers and noise that would not normally be found in a complete population. Use the median() method to get at it:
+     * If your data set contains an odd number of points, the median will be the middle point. If it contains an even number of points, then the median will be the arithmetic mean of the two middle points.
+     * If your Stats object is configured to use buckets and has store_data set to false, then the median will be an approximation of the actual median.
+     */
+    median(): number;
+
+    /**
+     * Any Percentile
+     * You can also get at any percentile value within the data. Use the percentile() method to get at this data. The percentile() method takes in a single argument. This is a number between 0 and 100 (both inclusive) that specifies which percentile point you want.
+     * Passing in 50 as an argument will return the median, while 25 and 75 will return the first and third quartiles respectively. These three special values may be arithmetic means of two other values within the set. All other arguments will return a number from the data set.
+     * If your Stats object is configured to use buckets and has store_data set to false, then the percentile value returned will be an approximation of the actual percentile based on the configured bucket_precision or buckets.
+     */
+    percentile(n: number): number;
+
+    /**
+     * Range
+     * The range() method tells you the minimum and maximum values of your data set. It returns an array of two values. The first is the lower bound and the second is the upper bound.
+     */
+    range(): number[];
+
+    /**
+     * The distribution() method tells you how your data is distributed. You need to set the bucket_precision or buckets configuration options if you plan on using this method. It will then split your data into buckets based on the value of bucket_precision or buckets and tell you how many data points fall into each bucket. You can use this to plot a histogram of your data, or to compare it to commonly known distribution functions.
+     * The return value is a sparse array of buckets with counts of datapoints per bucket. To save on memory, any empty buckets are undefined. You should treat an undefined bucket as if it had 0 datapoints.
+     */
+    distribution(): Bucket[];
+
+    /**
+     * Arithmetic Standard Deviation
+     * Also commonly just called the Standard Deviation, with the symbol s. This tells you the spread of your data if it follows a normal (or close to normal) distribution, ie, the bell curve. fast-stats is really fast at calculating the standard deviation of a dataset
+     * The arithmetic standard deviation is used in conjunction with the arithmetic mean to tell you the spread of your dataset: [amean-stddev, amean+stddev]. Note that you could also use 2 or 3 standard deviations for different spreads.
+     */
+    stddev(): number;
+
+    /**
+     * Geometric Standard Deviation
+     * The geometric standard deviation tells you the spread of your data if it follows a log-normal or exponential distribution. Use the gstddev() method to get at it.
+     */
+    gstddev(): number;
+
+    /**
+     * 95% Confidence Margin of Error
+     * The Margin of Error value tells you the range within which the real arithmetic mean of the population is likely to be with 95% confidence. Use the moe() method to get at it.
+     * This value suggests that we are 95% certain that the real mean of the population is within 2.60 of the calculated arithmetic mean of 4.67. We could use this to find out the percent error in our sample. In this case there is a 55.71% error.
+     * The margin of error is inversely proportional to the square root of the number of data points, so increasing the size of your sample will reduce the margin of error. It is good to strive for a margin of error of less than 5%.
+     */
+    moe(): number;
+
+    /**
+     * Band-pass filtering
+     * The band_pass() filter method returns a new Stats object with all its data points within the specified range. This method takes in three arguments. The first is the lower bound of the range, the second is the upper bound of the range. Both these arguments are required.
+     * The third argument specifies whether the range is open or closed. An open range does not include the upper and lower bounds while a closed range includes them. If not specified (or set to false), the range is closed. If set to true the range is open.
+     * Band pass filtering should be used if the range for your data is rigid and never changes.
+     */
+    band_pass(low: number, high: number, open?: boolean): Stats
+
+    /**
+     * IQR Filtering
+     * IQR, or Inter Quartile Range filtering filters data based on the spread of the data. It is much more adaptive to changes in data ranges. Use the iqr() method to IQR filter a dataset. The iqr() method does not accept any arguments.
+     * In some cases, IQR filtering may not filter out anything. This can happen if the acceptable range is wider than the bounds of your dataset.
+     */
+    iqr(): Stats;
+}
diff --git a/fast-stats/tsconfig.json b/fast-stats/tsconfig.json
new file mode 100644
index 0000000000..fe7fa90a05
--- /dev/null
+++ b/fast-stats/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "fast-stats-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fastclick/fastclick-tests.ts b/fastclick/fastclick-tests.ts
index 0e31846ab8..e8208621df 100644
--- a/fastclick/fastclick-tests.ts
+++ b/fastclick/fastclick-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="fastclick.d.ts" />
+
 
 // on browser
 new FastClick(document.body);
diff --git a/fastclick/fastclick.d.ts b/fastclick/index.d.ts
similarity index 100%
rename from fastclick/fastclick.d.ts
rename to fastclick/index.d.ts
diff --git a/fastclick/tsconfig.json b/fastclick/tsconfig.json
new file mode 100644
index 0000000000..d5e3f01aff
--- /dev/null
+++ b/fastclick/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "fastclick-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/favico.js/favico.js-tests.ts b/favico.js/favico.js-tests.ts
index 74130d5877..e81be5e921 100644
--- a/favico.js/favico.js-tests.ts
+++ b/favico.js/favico.js-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="./favico.js.d.ts"/>
-
-
 // constructor options
 
 var plain = (): favicojs.Favico => new Favico({
diff --git a/favico.js/favico.js.d.ts b/favico.js/index.d.ts
similarity index 100%
rename from favico.js/favico.js.d.ts
rename to favico.js/index.d.ts
diff --git a/favico.js/tsconfig.json b/favico.js/tsconfig.json
new file mode 100644
index 0000000000..19b60d9d96
--- /dev/null
+++ b/favico.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "favico.js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fbsdk/fbsdk-tests.ts b/fb/fbsdk-tests.ts
similarity index 93%
rename from fbsdk/fbsdk-tests.ts
rename to fb/fbsdk-tests.ts
index 8ec38d8bc4..d60587b01c 100644
--- a/fbsdk/fbsdk-tests.ts
+++ b/fb/fbsdk-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="fbsdk.d.ts" />
 
 window.fbAsyncInit = function() {
     FB.init(
diff --git a/fb/index.d.ts b/fb/index.d.ts
new file mode 100644
index 0000000000..57fadc9fb4
--- /dev/null
+++ b/fb/index.d.ts
@@ -0,0 +1,193 @@
+// Type definitions for Facebook Javascript SDK
+// Project: https://developers.facebook.com/docs/javascript
+// Definitions by: Joshua Strobl <https://github.com/JoshStrobl>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface FBInitParams{
+    appId?: string;
+    authResponse?: string;
+    cookie?: boolean;
+    frictionlessRequests?: boolean;
+    hideFlashCallback?: Function;
+    logging?: boolean;
+    status?: boolean;
+    version?: string;
+    xfbml?: boolean;
+}
+
+interface ShareDialogParams {
+    method: string; // "share"
+    href: string;
+}
+
+interface PageTabDialogParams {
+    method: string; // "pagetab"
+    app_id: string;
+    redirect_uri?: string;
+    display?: any;
+}
+
+interface RequestsDialogParams {
+    method: string; // "apprequests"
+    app_id: string;
+    redirect_uri?: string;
+    to?: string;
+    message: string;
+    action_type?: string; // "send" | "askfor" | "turn"
+    object_id?: string;
+    filters: string /* "app_users" | "app_non_users" */ | {
+        name: string;
+        user_ids: string[];
+    };
+    suggestions?: string[];
+    exclude_ids?: string[];
+    max_recipients?: number;
+    data?: string;
+    title?: string;
+}
+
+interface SendDialogParams {
+    method: string; // "send"
+    app_id: string;
+    redirect_uri?: string;
+    display?: any;
+    to?: string;
+    link: string;
+}
+
+interface PayDialogParams {
+    method: string; // "pay"
+    action: string; // "purchaseitem"
+    product: string;
+    quantity?: number;
+    quantity_min?: number;
+    quantity_max?: number;
+    request_id?: string;
+    pricepoint_id?: string;
+    test_currency?: string;
+}
+
+declare type FBUIParams = ShareDialogParams
+                        | PageTabDialogParams
+                        | RequestsDialogParams
+                        | SendDialogParams
+                        | PayDialogParams;
+
+interface FBLoginOptions{
+    auth_type?: string;
+    scope?: string;
+    return_scopes?: boolean;
+    enable_profile_selector?: boolean;
+    profile_selector_ids?: string;
+}
+
+interface FBSDKEvents{
+    /* This method allows you to subscribe to a range of events, and define callback functions for when they fire. */
+    subscribe(event : string, callback : (fbResponseObject : Object) => any) : void;
+
+    /* This method allows you to un-subscribe a callback from any events previously subscribed to using .Event.subscribe(). */
+    unsubscribe(event : string, callback : (fbResponseObject : Object) => any) : void;
+}
+
+interface FBSDKXFBML{
+    /* This function parses and renders XFBML markup in a document on the fly. */
+    parse(ParseElement?: Element) : void;
+    parse(ParseElement?: HTMLElement) : void;
+}
+
+interface FBSDKCanvasPrefetcher{
+    /* Tells Facebook that the current page uses a specified resource. */
+    addStaticResource(res : string) : void;
+
+    /* Controls how statistics are collected on resources used by your application. */
+    setCollectionMode(option : string) : void;
+}
+
+interface FBSDKCanvasSize{
+    height?: Number;
+    width?: Number;
+}
+
+interface FBSDKCanvasDoneLoading{
+    time_delta_ms : Number;
+}
+
+interface FBSDKCanvas{
+    Prefetcher : FBSDKCanvasPrefetcher;
+
+    /* Hides the HTML element passed in via the elem param from view. */
+    hideFlashElement(element : Element) : void;
+    hideFlashElement(element : HTMLElement) : void;
+
+    /* Displays the HTML element passed in via the elem param, after it has been hidden via FB.Canvas.hideFlashElement. */
+    showFlashElement(element : Element) : void;
+    showFlashElement(element : HTMLElement) : void;
+
+    /* Tells Facebook to scroll to a specific location of your canvas page. */
+    scrollTo(x : Number, y : Number) : void;
+
+    /* Starts or stops a timer which will grow your iframe to fit the content every few milliseconds. */
+    setAutoGrow(stopTimer : boolean) : void;
+    setAutoGrow(diffInterval : Number) : void;
+    setAutoGrow(stopTimer : boolean, diffInterval : Number) : void
+
+    /* Tells Facebook to resize your iframe. */
+    setSize(canvasSizeOptions : FBSDKCanvasSize) : void;
+
+    /* Registers the callback for inline processing (i.e. without page reload) of user actions when they click on any link to the current app from Canvas */
+    setUrlHandler(handler?: Function) : string;
+
+    /* Calls you back with an integer, in milliseconds, of the timing of the page load, beginning from the time when the first bytes arrive on
+        the client, and ending from the point at which you call this function.
+    */
+    setDoneLoading(handler?: Function) : FBSDKCanvasDoneLoading;
+
+    /* Call startTimer to resume the timer after a period of time for the page load that you didn't wish to measure, which you began by calling stopTimer. */
+    startTimer() : void;
+
+    /* Call stopTimer when you wish to stop timing the page load for a period of time */
+    stopTimer(handler?: (fbResponseObject : Object) => any) : void;
+}
+
+interface FBResponseObject {
+    error: any;
+}
+
+interface FBSDK{
+    /* This method is used to initialize and setup the SDK. */
+    init(fbInitObject : FBInitParams) : void;
+
+    /* This method lets you make calls to the Graph API. */
+    api(path : string, method : string, callback : (fbResponseObject : Object) => any) :  Object;
+    api(path : string, params : Object, callback : (fbResponseObject : FBResponseObject) => any) :  Object;
+    api(path : string, method : string, params : Object, callback : (fbResponseObject : Object) => any) : Object;
+
+    /* This method is used to trigger different forms of Facebook created UI dialogs. */
+    ui(params : FBUIParams, handler : (fbResponseObject : Object) => any) : void;
+
+    /* Allows you to determine if a user is logged in to Facebook and has authenticated your app */
+    getLoginStatus(handler : Function, force?: Boolean) : void;
+
+    /* Calling FB.login prompts the user to authenticate your application using the Login Dialog. */
+    login(handler : (fbResponseObject : Object) => any, params?: FBLoginOptions): void;
+
+    /* Log the user out of your site and Facebook */
+    logout(handler : (fbResponseObject : Object) => any) : void;
+
+    /* Synchronous accessor for the current authResponse. */
+    getAuthResponse() : Object;
+
+    Event : FBSDKEvents;
+    XFBML : FBSDKXFBML;
+    Canvas : FBSDKCanvas;
+}
+
+interface Window{
+    fbAsyncInit() : any;
+}
+
+declare module "fb" {
+    export = FB;
+}
+
+declare var FB : FBSDK;
diff --git a/fb/tsconfig.json b/fb/tsconfig.json
new file mode 100644
index 0000000000..26b487ba69
--- /dev/null
+++ b/fb/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "fbsdk-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fbemitter/fbemitter-tests.ts b/fbemitter/fbemitter-tests.ts
index 614d579634..11e1ce74a5 100644
--- a/fbemitter/fbemitter-tests.ts
+++ b/fbemitter/fbemitter-tests.ts
@@ -1,7 +1,7 @@
-///<reference path="fbemitter.d.ts" />
-///<reference path="../node/node.d.ts" />
-///<reference path="../mocha/mocha.d.ts" />
-///<reference path="../assert/assert.d.ts" />
+
+///<reference types="node" />
+///<reference types="mocha" />
+///<reference types="assert" />
 'use strict';
 
 /**
diff --git a/fbemitter/fbemitter.d.ts b/fbemitter/fbemitter.d.ts
deleted file mode 100644
index b26b1a3162..0000000000
--- a/fbemitter/fbemitter.d.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-// Type definitions for Facebook's EventEmitter 2.0.0
-// Project: https://github.com/facebook/emitter
-// Definitions by: kmxz <https://github.com/kmxz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'fbemitter' {
-    
-    export class EventSubscription {
-        
-        listener: Function;
-        context: any;
-        
-        /**
-         * Removes this subscription from the subscriber that controls it.
-         */
-        remove(): void;
-        
-    }
-
-    export class EventEmitter {
-        
-         constructor();
-         
-         /**
-          * Adds a listener to be invoked when events of the specified type are
-          * emitted. An optional calling context may be provided. The data arguments
-          * emitted will be passed to the listener function.
-          */
-         addListener(eventType: string, listener: Function, context?: any): EventSubscription;
-     
-         /**
-          * Similar to addListener, except that the listener is removed after it is
-          * invoked once.
-          */
-         once(eventType: string, listener: Function, context?: any): EventSubscription;
-         
-         /**
-          * Removes all of the registered listeners, including those registered as
-          * listener maps.
-          */
-         removeAllListeners(eventType?: string): void;
-         
-         /**
-          * Provides an API that can be called during an eventing cycle to remove the
-          * last listener that was invoked. This allows a developer to provide an event
-          * object that can remove the listener (or listener map) during the
-          * invocation.
-          *
-          * If it is called when not inside of an emitting cycle it will throw.
-          */
-         removeCurrentListener(): void;
-               
-         /**
-          * Returns an array of listeners that are currently registered for the given
-          * event.
-          */
-         listeners(eventType: string): Function[];
-         
-         /**
-          * Emits an event of the given type with the given data. All handlers of that
-          * particular type will be notified.
-          */
-         emit(eventType: string, ...data: any[]): void;
-         
-    }
-    
-}
\ No newline at end of file
diff --git a/fbemitter/index.d.ts b/fbemitter/index.d.ts
new file mode 100644
index 0000000000..37094797c7
--- /dev/null
+++ b/fbemitter/index.d.ts
@@ -0,0 +1,65 @@
+// Type definitions for Facebook's EventEmitter 2.0.0
+// Project: https://github.com/facebook/emitter
+// Definitions by: kmxz <https://github.com/kmxz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+export declare class EventSubscription {
+
+    listener: Function;
+    context: any;
+
+    /**
+     * Removes this subscription from the subscriber that controls it.
+     */
+    remove(): void;
+
+}
+
+export declare class EventEmitter {
+
+    constructor();
+
+    /**
+     * Adds a listener to be invoked when events of the specified type are
+     * emitted. An optional calling context may be provided. The data arguments
+     * emitted will be passed to the listener function.
+     */
+    addListener(eventType: string, listener: Function, context?: any): EventSubscription;
+
+    /**
+     * Similar to addListener, except that the listener is removed after it is
+     * invoked once.
+     */
+    once(eventType: string, listener: Function, context?: any): EventSubscription;
+
+    /**
+     * Removes all of the registered listeners, including those registered as
+     * listener maps.
+     */
+    removeAllListeners(eventType?: string): void;
+
+    /**
+     * Provides an API that can be called during an eventing cycle to remove the
+     * last listener that was invoked. This allows a developer to provide an event
+     * object that can remove the listener (or listener map) during the
+     * invocation.
+     *
+     * If it is called when not inside of an emitting cycle it will throw.
+     */
+    removeCurrentListener(): void;
+
+    /**
+     * Returns an array of listeners that are currently registered for the given
+     * event.
+     */
+    listeners(eventType: string): Function[];
+
+    /**
+     * Emits an event of the given type with the given data. All handlers of that
+     * particular type will be notified.
+     */
+    emit(eventType: string, ...data: any[]): void;
+
+}
diff --git a/fbemitter/tsconfig.json b/fbemitter/tsconfig.json
new file mode 100644
index 0000000000..06ede5915c
--- /dev/null
+++ b/fbemitter/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "fbemitter-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fbsdk/fbsdk.d.ts b/fbsdk/fbsdk.d.ts
deleted file mode 100644
index 6153de6579..0000000000
--- a/fbsdk/fbsdk.d.ts
+++ /dev/null
@@ -1,193 +0,0 @@
-// Type definitions for Facebook Javascript SDK
-// Project: https://developers.facebook.com/docs/javascript
-// Definitions by: Joshua Strobl <https://github.com/JoshStrobl>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface FBInitParams{
-    appId?: string;
-    authResponse?: string;
-    cookie?: boolean;
-    frictionlessRequests?: boolean;
-    hideFlashCallback?: Function;
-    logging?: boolean;
-    status?: boolean;
-    version?: string;
-    xfbml?: boolean;
-}
-
-interface ShareDialogParams {
-    method: string; // "share"
-    href: string;
-}
-
-interface PageTabDialogParams {
-    method: string; // "pagetab"
-    app_id: string;
-    redirect_uri?: string;
-    display?: any;
-}
-
-interface RequestsDialogParams {
-    method: string; // "apprequests"
-    app_id: string;
-    redirect_uri?: string;
-    to?: string;
-    message: string;
-    action_type?: string; // "send" | "askfor" | "turn"
-    object_id?: string;
-    filters: string /* "app_users" | "app_non_users" */ | {
-        name: string;
-        user_ids: string[];
-    };
-    suggestions?: string[];
-    exclude_ids?: string[];
-    max_recipients?: number;
-    data?: string;
-    title?: string;
-}
-
-interface SendDialogParams {
-    method: string; // "send"
-    app_id: string;
-    redirect_uri?: string;
-    display?: any;
-    to?: string;
-    link: string;
-}
-
-interface PayDialogParams {
-    method: string; // "pay"
-    action: string; // "purchaseitem"
-    product: string;
-    quantity?: number;
-    quantity_min?: number;
-    quantity_max?: number;
-    request_id?: string;
-    pricepoint_id?: string;
-    test_currency?: string;
-}
-
-declare type FBUIParams = ShareDialogParams
-                        | PageTabDialogParams
-                        | RequestsDialogParams
-                        | SendDialogParams
-                        | PayDialogParams;
-
-interface FBLoginOptions{
-    auth_type?: string;
-    scope?: string;
-    return_scopes?: boolean;
-    enable_profile_selector?: boolean;
-    profile_selector_ids?: string;
-}
-
-interface FBSDKEvents{
-    /* This method allows you to subscribe to a range of events, and define callback functions for when they fire. */
-    subscribe(event : string, callback : (fbResponseObject : Object) => any) : void;
-
-    /* This method allows you to un-subscribe a callback from any events previously subscribed to using .Event.subscribe(). */
-    unsubscribe(event : string, callback : (fbResponseObject : Object) => any) : void;
-}
-
-interface FBSDKXFBML{
-    /* This function parses and renders XFBML markup in a document on the fly. */
-    parse(ParseElement?: Element) : void;
-    parse(ParseElement?: HTMLElement) : void;
-}
-
-interface FBSDKCanvasPrefetcher{
-    /* Tells Facebook that the current page uses a specified resource. */
-    addStaticResource(res : string) : void;
-
-    /* Controls how statistics are collected on resources used by your application. */
-    setCollectionMode(option : string) : void;
-}
-
-interface FBSDKCanvasSize{
-    height?: Number;
-    width?: Number;
-}
-
-interface FBSDKCanvasDoneLoading{
-    time_delta_ms : Number;
-}
-
-interface FBSDKCanvas{
-    Prefetcher : FBSDKCanvasPrefetcher;
-
-    /* Hides the HTML element passed in via the elem param from view. */
-    hideFlashElement(element : Element) : void;
-    hideFlashElement(element : HTMLElement) : void;
-
-    /* Displays the HTML element passed in via the elem param, after it has been hidden via FB.Canvas.hideFlashElement. */
-    showFlashElement(element : Element) : void;
-    showFlashElement(element : HTMLElement) : void;
-
-    /* Tells Facebook to scroll to a specific location of your canvas page. */
-    scrollTo(x : Number, y : Number) : void;
-
-    /* Starts or stops a timer which will grow your iframe to fit the content every few milliseconds. */
-    setAutoGrow(stopTimer : boolean) : void;
-    setAutoGrow(diffInterval : Number) : void;
-    setAutoGrow(stopTimer : boolean, diffInterval : Number) : void
-
-    /* Tells Facebook to resize your iframe. */
-    setSize(canvasSizeOptions : FBSDKCanvasSize) : void;
-
-    /* Registers the callback for inline processing (i.e. without page reload) of user actions when they click on any link to the current app from Canvas */
-    setUrlHandler(handler?: Function) : string;
-
-    /* Calls you back with an integer, in milliseconds, of the timing of the page load, beginning from the time when the first bytes arrive on
-        the client, and ending from the point at which you call this function.
-    */
-    setDoneLoading(handler?: Function) : FBSDKCanvasDoneLoading;
-
-    /* Call startTimer to resume the timer after a period of time for the page load that you didn't wish to measure, which you began by calling stopTimer. */
-    startTimer() : void;
-
-    /* Call stopTimer when you wish to stop timing the page load for a period of time */
-    stopTimer(handler?: (fbResponseObject : Object) => any) : void;
-}
-
-interface FBResponseObject {
-    error: any;
-}
-
-interface FBSDK{
-    /* This method is used to initialize and setup the SDK. */
-    init(fbInitObject : FBInitParams) : void;
-
-    /* This method lets you make calls to the Graph API. */
-    api(path : string, method : string, callback : (fbResponseObject : Object) => any) :  Object;
-    api(path : string, params : Object, callback : (fbResponseObject : FBResponseObject) => any) :  Object;
-    api(path : string, method : string, params : Object, callback : (fbResponseObject : Object) => any) : Object;
-
-    /* This method is used to trigger different forms of Facebook created UI dialogs. */
-    ui(params : FBUIParams, handler : (fbResponseObject : Object) => any) : void;
-
-    /* Allows you to determine if a user is logged in to Facebook and has authenticated your app */
-    getLoginStatus(handler : Function, force?: Boolean) : void;
-
-    /* Calling FB.login prompts the user to authenticate your application using the Login Dialog. */
-    login(handler : (fbResponseObject : Object) => any, params?: FBLoginOptions): void;
-
-    /* Log the user out of your site and Facebook */
-    logout(handler : (fbResponseObject : Object) => any) : void;
-
-    /* Synchronous accessor for the current authResponse. */
-    getAuthResponse() : Object;
-
-    Event : FBSDKEvents;
-    XFBML : FBSDKXFBML;
-    Canvas : FBSDKCanvas;
-}
-
-interface Window{
-    fbAsyncInit() : any;
-}
-
-declare module "FB" {
-    export = FB;
-}
-
-declare var FB : FBSDK;
diff --git a/featherlight/featherlight-tests.ts b/featherlight/featherlight-tests.ts
index ed74a201ee..4d609d3475 100644
--- a/featherlight/featherlight-tests.ts
+++ b/featherlight/featherlight-tests.ts
@@ -1,7 +1,6 @@
 // Tests by: Kaur Kuut <https://github.com/xStrom>
 
-///<reference path="../jquery/jquery.d.ts" />
-///<reference path="featherlight.d.ts" />
+///<reference types="jquery" />
 
 // Every option as default
 var defaultOptions = {
diff --git a/featherlight/featherlight.d.ts b/featherlight/featherlight.d.ts
deleted file mode 100644
index 9a9670a650..0000000000
--- a/featherlight/featherlight.d.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-// Type definitions for Featherlight v1.3.4
-// Project: https://noelboss.github.io/featherlight/
-// Definitions by: Kaur Kuut <https://github.com/xStrom>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../jquery/jquery.d.ts" />
-
-declare namespace Featherlight {
-	interface Config {
-		namespace?: string;
-		targetAttr?: string;
-		variant?: string;
-		resetCss?: boolean;
-		background?: string;
-		openTrigger?: string;
-		closeTrigger?: string;
-		filter?: string;
-		root?: string;
-		openSpeed?: number | string;
-		closeSpeed?: number | string;
-		closeOnClick?: boolean | string;
-		closeOnEsc?: boolean;
-		closeIcon?: string;
-		loading?: string;
-		persist?: boolean | string;
-		otherClose?: string;
-		beforeOpen?: (event: JQueryEventObject) => any;
-		beforeContent?: (event: JQueryEventObject) => any;
-		beforeClose?: (event: JQueryEventObject) => any;
-		afterOpen?: (event: JQueryEventObject) => any;
-		afterContent?: (event: JQueryEventObject) => any;
-		afterClose?: (event: JQueryEventObject) => any;
-		onKeyUp?: (event: JQueryEventObject) => any;
-		onResize?: (event: JQueryEventObject) => any;
-		type?: string;
-		contentFilters?: any;
-		jquery?: JQuery;
-		image?: string;
-		html?: string;
-		ajax?: string;
-		text?: string;
-	}
-
-	interface ContentFilter {
-		regex?: RegExp;
-		test?(data: JQuery | string): boolean;
-		process?(data: JQuery | string): JQuery | JQueryPromise<JQuery>;
-	}
-
-	interface ContentFilters {
-		[name: string]: ContentFilter;
-	}
-
-	interface Featherlight extends Config {
-		target: JQuery | string;
-		$instance: JQuery;
-		$content: JQuery;
-
-		setup(target: JQuery, config?: Config): Featherlight;
-		setup(target: string, config?: Config): Featherlight;
-		setup(config: Config): Featherlight;
-		setup(): Featherlight;
-
-		getContent(): JQuery | JQueryPromise<JQuery>;
-		setContent($content: JQuery): Featherlight;
-		setContent($content: JQueryPromise<JQuery>): Featherlight;
-		open(event?: JQueryEventObject): JQueryPromise<JQuery>;
-		close(event?: JQueryEventObject): JQueryPromise<JQuery>;
-	}
-
-	interface FeatherlightStatic {
-		($content: JQuery, config?: Config): Featherlight;
-		($content: string, config?: Config): Featherlight;
-		(config: Config): Featherlight;
-		(): Featherlight;
-
-		new($content: JQuery, config?: Config): Featherlight;
-		new($content: string, config?: Config): Featherlight;
-		new(config: Config): Featherlight;
-		new(): Featherlight;
-
-		attach($source: JQuery, $content: JQuery, config?: Config): JQuery;
-		attach($source: JQuery, $content: string, config?: Config): JQuery;
-		attach($source: JQuery, config: Config): JQuery;
-		attach($source: JQuery): JQuery;
-
-		id: number;
-		autoBind: boolean | string;
-		defaults: Config;
-		contentFilters: ContentFilters;
-		functionAttributes: string[];
-
-		readElementConfig(element: HTMLElement, namespace: string): any;
-		extend(child: any, defaults: any): any;
-		current(): Featherlight;
-		opened(): Featherlight[];
-		close(): JQueryPromise<JQuery>;
-	}
-
-	interface JQueryExtension {
-		($content: JQuery, config?: Config): JQuery;
-		($content: string, config?: Config): JQuery;
-		(config: Config): JQuery;
-		(): JQuery;
-	}
-}
-
-interface JQueryStatic {
-	featherlight: Featherlight.FeatherlightStatic;
-}
-
-interface JQuery {
-	featherlight: Featherlight.JQueryExtension;
-}
diff --git a/featherlight/index.d.ts b/featherlight/index.d.ts
new file mode 100644
index 0000000000..80763aa429
--- /dev/null
+++ b/featherlight/index.d.ts
@@ -0,0 +1,114 @@
+// Type definitions for Featherlight v1.3.4
+// Project: https://noelboss.github.io/featherlight/
+// Definitions by: Kaur Kuut <https://github.com/xStrom>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="jquery" />
+
+declare namespace Featherlight {
+	interface Config {
+		namespace?: string;
+		targetAttr?: string;
+		variant?: string;
+		resetCss?: boolean;
+		background?: string;
+		openTrigger?: string;
+		closeTrigger?: string;
+		filter?: string;
+		root?: string;
+		openSpeed?: number | string;
+		closeSpeed?: number | string;
+		closeOnClick?: boolean | string;
+		closeOnEsc?: boolean;
+		closeIcon?: string;
+		loading?: string;
+		persist?: boolean | string;
+		otherClose?: string;
+		beforeOpen?: (event: JQueryEventObject) => any;
+		beforeContent?: (event: JQueryEventObject) => any;
+		beforeClose?: (event: JQueryEventObject) => any;
+		afterOpen?: (event: JQueryEventObject) => any;
+		afterContent?: (event: JQueryEventObject) => any;
+		afterClose?: (event: JQueryEventObject) => any;
+		onKeyUp?: (event: JQueryEventObject) => any;
+		onResize?: (event: JQueryEventObject) => any;
+		type?: string;
+		contentFilters?: any;
+		jquery?: JQuery;
+		image?: string;
+		html?: string;
+		ajax?: string;
+		text?: string;
+	}
+
+	interface ContentFilter {
+		regex?: RegExp;
+		test?(data: JQuery | string): boolean;
+		process?(data: JQuery | string): JQuery | JQueryPromise<JQuery>;
+	}
+
+	interface ContentFilters {
+		[name: string]: ContentFilter;
+	}
+
+	interface Featherlight extends Config {
+		target: JQuery | string;
+		$instance: JQuery;
+		$content: JQuery;
+
+		setup(target: JQuery, config?: Config): Featherlight;
+		setup(target: string, config?: Config): Featherlight;
+		setup(config: Config): Featherlight;
+		setup(): Featherlight;
+
+		getContent(): JQuery | JQueryPromise<JQuery>;
+		setContent($content: JQuery): Featherlight;
+		setContent($content: JQueryPromise<JQuery>): Featherlight;
+		open(event?: JQueryEventObject): JQueryPromise<JQuery>;
+		close(event?: JQueryEventObject): JQueryPromise<JQuery>;
+	}
+
+	interface FeatherlightStatic {
+		($content: JQuery, config?: Config): Featherlight;
+		($content: string, config?: Config): Featherlight;
+		(config: Config): Featherlight;
+		(): Featherlight;
+
+		new($content: JQuery, config?: Config): Featherlight;
+		new($content: string, config?: Config): Featherlight;
+		new(config: Config): Featherlight;
+		new(): Featherlight;
+
+		attach($source: JQuery, $content: JQuery, config?: Config): JQuery;
+		attach($source: JQuery, $content: string, config?: Config): JQuery;
+		attach($source: JQuery, config: Config): JQuery;
+		attach($source: JQuery): JQuery;
+
+		id: number;
+		autoBind: boolean | string;
+		defaults: Config;
+		contentFilters: ContentFilters;
+		functionAttributes: string[];
+
+		readElementConfig(element: HTMLElement, namespace: string): any;
+		extend(child: any, defaults: any): any;
+		current(): Featherlight;
+		opened(): Featherlight[];
+		close(): JQueryPromise<JQuery>;
+	}
+
+	interface JQueryExtension {
+		($content: JQuery, config?: Config): JQuery;
+		($content: string, config?: Config): JQuery;
+		(config: Config): JQuery;
+		(): JQuery;
+	}
+}
+
+interface JQueryStatic {
+	featherlight: Featherlight.FeatherlightStatic;
+}
+
+interface JQuery {
+	featherlight: Featherlight.JQueryExtension;
+}
diff --git a/featherlight/tsconfig.json b/featherlight/tsconfig.json
new file mode 100644
index 0000000000..cd0c51046e
--- /dev/null
+++ b/featherlight/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "featherlight-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ffi/index.d.ts b/ffi/index.d.ts
new file mode 100644
index 0000000000..19107f373e
--- /dev/null
+++ b/ffi/index.d.ts
@@ -0,0 +1,192 @@
+// Type definitions for node-ffi
+// Project: https://github.com/rbranson/node-ffi
+// Definitions by: Paul Loyd <https://github.com/loyd>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import ref = require('ref');
+import StructType = require('ref-struct');
+
+/** Provides a friendly API on-top of `DynamicLibrary` and `ForeignFunction`. */
+export var Library: {
+    /** The extension to use on libraries. */
+    EXT: string;
+
+    /**
+     * @param libFile name of library
+     * @param funcs hash of [retType, [...argType], opts?: {abi?, async?, varargs?}]
+     * @param lib hash that will be extended
+     */
+    new (libFile: string, funcs?: {[key: string]: any[]}, lib?: Object): any;
+
+    /**
+     * @param libFile name of library
+     * @param funcs hash of [retType, [...argType], opts?: {abi?, async?, varargs?}]
+     * @param lib hash that will be extended
+     */
+    (libFile: string, funcs?: {[key: string]: any[]}, lib?: Object): any;
+};
+
+/** Get value of errno. */
+export function errno(): number;
+
+export interface Function extends ref.Type {
+    /** The type of return value. */
+    retType: ref.Type;
+    /** The type of arguments. */
+    argTypes: ref.Type[];
+    /** Is set for node-ffi functions. */
+    ffi_type: Buffer;
+    abi: number;
+
+    /** Get a `Callback` pointer of this function type. */
+    toPointer(fn: (...args: any[]) => any): Buffer;
+    /** Get a `ForeignFunction` of this function type. */
+    toFunction(buf: Buffer): ForeignFunction;
+}
+
+/** Creates and returns a type for a C function pointer. */
+export var Function: {
+    new (retType: ref.Type, argTypes: any[], abi?: number): Function;
+    new (retType: string, argTypes: any[], abi?: number): Function;
+    (retType: ref.Type, argTypes: any[], abi?: number): Function;
+    (retType: string, argTypes: any[], abi?: number): Function;
+};
+
+export interface ForeignFunction {
+    (...args: any[]): any;
+    async(...args: any[]): void;
+}
+
+/**
+ * Represents a foreign function in another library. Manages all of the aspects
+ * of function execution, including marshalling the data parameters for the
+ * function into native types and also unmarshalling the return from function
+ * execution.
+ */
+export var ForeignFunction: {
+    new (ptr: Buffer, retType: ref.Type, argTypes: any[], abi?: number): ForeignFunction;
+    new (ptr: Buffer, retType: string, argTypes: any[], abi?: number): ForeignFunction;
+    (ptr: Buffer, retType: ref.Type, argTypes: any[], abi?: number): ForeignFunction;
+    (ptr: Buffer, retType: string, argTypes: any[], abi?: number): ForeignFunction;
+}
+
+export interface VariadicForeignFunction {
+    /**
+     * What gets returned is another function that needs to be invoked with the rest
+     * of the variadic types that are being invoked from the function.
+     */
+    (...args: any[]): ForeignFunction;
+
+    /**
+     * Return type as a property of the function generator to
+     * allow for monkey patching the return value in the very rare case where the
+     * return type is variadic as well
+     */
+    returnType: any;
+}
+
+/**
+ * For when you want to call to a C function with variable amount of arguments.
+ * i.e. `printf`.
+ *
+ * This function takes care of caching and reusing `ForeignFunction` instances that
+ * contain the same ffi_type argument signature.
+ */
+export var VariadicForeignFunction: {
+    new (ptr: Buffer, ret: ref.Type, fixedArgs: any[], abi?: number): VariadicForeignFunction;
+    new (ptr: Buffer, ret: string, fixedArgs: any[], abi?: number): VariadicForeignFunction;
+    (ptr: Buffer, ret: ref.Type, fixedArgs: any[], abi?: number): VariadicForeignFunction;
+    (ptr: Buffer, ret: string, fixedArgs: any[], abi?: number): VariadicForeignFunction;
+};
+
+export interface DynamicLibrary {
+    /** Close library, returns the result of the `dlclose` system function. */
+    close(): number;
+    /** Get a symbol from this library. */
+    get(symbol: string): Buffer;
+    /** Get the result of the `dlerror` system function. */
+    error(): string;
+}
+
+/**
+ * This class loads and fetches function pointers for dynamic libraries
+ * (.so, .dylib, etc). After the libray's function pointer is acquired, then you
+ * call `get(symbol)` to retreive a pointer to an exported symbol. You need to
+ * call `get___` on the pointer to dereference it into its actual value, or
+ * turn the pointer into a callable function with `ForeignFunction`.
+ */
+export var DynamicLibrary: {
+    FLAGS: {
+        RTLD_LAZY: number;
+        RTLD_NOW: number;
+        RTLD_LOCAL: number;
+        RTLD_GLOBAL: number;
+        RTLD_NOLOAD: number;
+        RTLD_NODELETE: number;
+        RTLD_NEXT: Buffer;
+        RTLD_DEFAUL: Buffer;
+    }
+
+    new (path?: string, mode?: number): DynamicLibrary;
+    (path?: string, mode?: number): DynamicLibrary;
+};
+
+/**
+ * Turns a JavaScript function into a C function pointer.
+ * The function pointer may be used in other C functions that
+ * accept C callback functions.
+ */
+export var Callback: {
+    new (retType: any, argTypes: any[], abi: number, fn: any): Buffer;
+    new (retType: any, argTypes: any[], fn: any): Buffer;
+    (retType: any, argTypes: any[], abi: number, fn: any): Buffer;
+    (retType: any, argTypes: any[], fn: any): Buffer;
+}
+
+export var ffiType: {
+    /** Get a `ffi_type *` Buffer appropriate for the given type. */
+    (type: ref.Type): Buffer
+    /** Get a `ffi_type *` Buffer appropriate for the given type. */
+    (type: string): Buffer
+    FFI_TYPE: StructType;
+}
+
+export var CIF: (retType: any, types: any[], abi?: any) => Buffer
+export var CIF_var: (retType: any, types: any[], numFixedArgs: number, abi?: any) => Buffer;
+export var HAS_OBJC: boolean;
+export var FFI_TYPES: {[key: string]: Buffer};
+export var FFI_OK: number;
+export var FFI_BAD_TYPEDEF: number;
+export var FFI_BAD_ABI: number;
+export var FFI_DEFAULT_ABI: number;
+export var FFI_FIRST_ABI: number;
+export var FFI_LAST_ABI: number;
+export var FFI_SYSV: number;
+export var FFI_UNIX64: number;
+export var RTLD_LAZY: number;
+export var RTLD_NOW: number;
+export var RTLD_LOCAL: number;
+export var RTLD_GLOBAL: number;
+export var RTLD_NOLOAD: number;
+export var RTLD_NODELETE: number;
+export var RTLD_NEXT: Buffer;
+export var RTLD_DEFAULT: Buffer;
+export var LIB_EXT: string;
+export var FFI_TYPE: StructType;
+
+/** Default types. */
+export var types: {
+    void: ref.Type;                 int64: ref.Type;                 ushort: ref.Type;
+    int: ref.Type;                  uint64: ref.Type;                float: ref.Type;
+    uint: ref.Type;                 long: ref.Type;                  double: ref.Type;
+    int8: ref.Type;                 ulong: ref.Type;                 Object: ref.Type;
+    uint8: ref.Type;                longlong: ref.Type;              CString: ref.Type;
+    int16: ref.Type;                ulonglong: ref.Type;             bool: ref.Type;
+    uint16: ref.Type;               char: ref.Type;                  byte: ref.Type;
+    int32: ref.Type;                uchar: ref.Type;                 size_t: ref.Type;
+    uint32: ref.Type;               short: ref.Type;
+};
+
diff --git a/node-ffi/node-ffi-buffer.d.ts b/ffi/node-ffi-buffer.d.ts
similarity index 100%
rename from node-ffi/node-ffi-buffer.d.ts
rename to ffi/node-ffi-buffer.d.ts
diff --git a/node-ffi/node-ffi-tests.ts b/ffi/node-ffi-tests.ts
similarity index 91%
rename from node-ffi/node-ffi-tests.ts
rename to ffi/node-ffi-tests.ts
index ff9698bfd0..c83e57089c 100644
--- a/node-ffi/node-ffi-tests.ts
+++ b/ffi/node-ffi-tests.ts
@@ -1,10 +1,3 @@
-/// <reference path="node-ffi.d.ts" />
-
-/// <reference path="../ref/ref.d.ts" />
-/// <reference path="../ref-struct/ref-struct.d.ts" />
-/// <reference path="../ref-union/ref-union.d.ts" />
-/// <reference path="../ref-array/ref-array.d.ts" />
-
 import ffi = require('ffi');
 import ref = require('ref');
 import Struct = require('ref-struct');
@@ -26,7 +19,6 @@ import TArray = require('ref-array');
 
     var dbPtrPtr = ref.alloc(sqlite3PtrPtr);
     libsqlite3.sqlite3_open("test.sqlite3", dbPtrPtr);
-    var dbHandle = dbPtrPtr.deref();
 }
 {
     var func = ffi.ForeignFunction(new Buffer(10), 'int', [ 'int' ]);
diff --git a/ffi/tsconfig.json b/ffi/tsconfig.json
new file mode 100644
index 0000000000..dc546a8160
--- /dev/null
+++ b/ffi/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-ffi-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fhir/fhir-tests.ts b/fhir/fhir-tests.ts
index 4c6a027cdb..3490144ae1 100644
--- a/fhir/fhir-tests.ts
+++ b/fhir/fhir-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./fhir.d.ts" />
+
 
 var example1: fhir.Account = {
     "id": "example",
diff --git a/fhir/fhir.d.ts b/fhir/index.d.ts
similarity index 100%
rename from fhir/fhir.d.ts
rename to fhir/index.d.ts
diff --git a/fhir/tsconfig.json b/fhir/tsconfig.json
new file mode 100644
index 0000000000..9b3372cd83
--- /dev/null
+++ b/fhir/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "fhir-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fibers/fibers-tests.ts b/fibers/fibers-tests.ts
index 62645defb1..5cccdc885d 100644
--- a/fibers/fibers-tests.ts
+++ b/fibers/fibers-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="fibers.d.ts" />
 
 import fibers = require('fibers');
 
diff --git a/fibers/fibers.d.ts b/fibers/fibers.d.ts
deleted file mode 100644
index 4bef5a760b..0000000000
--- a/fibers/fibers.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Type definitions for fibers
-// Project: https://github.com/laverdet/node-fibers
-// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/fibers.d.ts
-
-declare module "fibers" {
-
-	function fibers(callback: () => void): fibers.Fiber;
-
-	namespace fibers {
-		export var poolSize: number;
-		export var fibersCreated: number;
-		export var current: fibers.Fiber;
-		export function yield(value: any): any;
-
-		export interface Fiber {
-			run(step?: number): any;
-		}
-	}
-
-	export = fibers;
-}
diff --git a/fibers/index.d.ts b/fibers/index.d.ts
new file mode 100644
index 0000000000..fec81954f8
--- /dev/null
+++ b/fibers/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for fibers
+// Project: https://github.com/laverdet/node-fibers
+// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/fibers.d.ts
+
+
+
+declare function fibers(callback: () => void): fibers.Fiber;
+
+declare namespace fibers {
+    export var poolSize: number;
+    export var fibersCreated: number;
+    export var current: fibers.Fiber;
+    export function yield(value: any): any;
+
+    export interface Fiber {
+        run(step?: number): any;
+    }
+}
+
+export = fibers;
diff --git a/fibers/tsconfig.json b/fibers/tsconfig.json
new file mode 100644
index 0000000000..b2a0ed0541
--- /dev/null
+++ b/fibers/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "fibers-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/field/field-test.ts b/field/field-test.ts
index 4a3daf8dd7..91545ba0c0 100644
--- a/field/field-test.ts
+++ b/field/field-test.ts
@@ -1,6 +1,6 @@
 // From https://github.com/jprichardson/field/blob/e968fd979ba1a06e35571695ddfdad513e516eae/README.md
 
-/// <reference path="field.d.ts" />
+
 import * as field from 'field';
 
 // get
diff --git a/field/field.d.ts b/field/field.d.ts
deleted file mode 100644
index 75b1c8d396..0000000000
--- a/field/field.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for field 1.0.1
-// Project: https://www.npmjs.com/package/field
-// Definitions by: Leo Liang <https://github.com/aleung/DefinitelyTyped>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'field' {
-    export function get(topObj: any, fields: string): any;
-    export function set(topObj: any, fields: string, value: any): any;
-}
diff --git a/field/index.d.ts b/field/index.d.ts
new file mode 100644
index 0000000000..d49da260b0
--- /dev/null
+++ b/field/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for field 1.0.1
+// Project: https://www.npmjs.com/package/field
+// Definitions by: Leo Liang <https://github.com/aleung/DefinitelyTyped>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export declare function get(topObj: any, fields: string): any;
+export declare function set(topObj: any, fields: string, value: any): any;
diff --git a/field/tsconfig.json b/field/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/field/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/file-url/file-url-tests.ts b/file-url/file-url-tests.ts
index 801d5e703b..e47cd737cb 100644
--- a/file-url/file-url-tests.ts
+++ b/file-url/file-url-tests.ts
@@ -1,6 +1,7 @@
+import fileUrl = require("file-url");
 // Copied from https://github.com/sindresorhus/file-url/blob/14c7a69ae3798f50b3a4a21823c86e10b38160fe/readme.md
 
-/// <reference path="file-url.d.ts" />
+
 
 fileUrl('unicorn.jpg');
 //=> 'file:///Users/sindresorhus/dev/file-url/unicorn.jpg'
diff --git a/file-url/file-url.d.ts b/file-url/file-url.d.ts
deleted file mode 100644
index d0c0dd02c9..0000000000
--- a/file-url/file-url.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Type definitions for file-url v1.0.1
-// Project: https://github.com/sindresorhus/file-url
-// Definitions by: MEDIA CHECK s.r.o. <http://www.mediacheck.cz/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/**
- * Convert a path to a file URL.
- */
-declare function fileUrl(path:string):string;
-
-/**
- * Convert a path to a file URL.
- */
-declare module "file-url" {
-    export = fileUrl;
-}
diff --git a/file-url/index.d.ts b/file-url/index.d.ts
new file mode 100644
index 0000000000..1df68f6dbc
--- /dev/null
+++ b/file-url/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for file-url v1.0.1
+// Project: https://github.com/sindresorhus/file-url
+// Definitions by: MEDIA CHECK s.r.o. <http://www.mediacheck.cz/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Convert a path to a file URL.
+ */
+declare function fileUrl(path:string):string;
+
+/**
+ * Convert a path to a file URL.
+ */
+export = fileUrl;
diff --git a/file-url/tsconfig.json b/file-url/tsconfig.json
new file mode 100644
index 0000000000..3e5adada37
--- /dev/null
+++ b/file-url/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "file-url-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/filesize/filesize-tests.ts b/filesize/filesize-tests.ts
new file mode 100644
index 0000000000..135a0f9baa
--- /dev/null
+++ b/filesize/filesize-tests.ts
@@ -0,0 +1,15 @@
+
+
+import filesize = require("filesize");
+
+filesize(500);                        // "500 B" 
+filesize(500, { bits: true });          // "4 Kb" 
+filesize(265318, { base: 10 });         // "265.32 kB" 
+filesize(265318);                     // "259.1 KB" 
+filesize(265318, { round: 0 });         // "259 KB" 
+filesize(265318, { output: "array" });  // [259.1, "KB"] 
+filesize(265318, { output: "object" }); // {value: 259.1, suffix: "KB", symbol: "KB"} 
+filesize(1, { symbols: { B: "Б" } });    // "1 Б" 
+filesize(1024);                       // "1 KB" 
+filesize(1024, { exponent: 0 });        // "1024 B" 
+filesize(1024, { output: "exponent" }); // 1 
diff --git a/filesize/index.d.ts b/filesize/index.d.ts
new file mode 100644
index 0000000000..374db62ec8
--- /dev/null
+++ b/filesize/index.d.ts
@@ -0,0 +1,82 @@
+// Type definitions for filesize 3.2.1
+// Project: https://github.com/avoidwork/filesize.js
+// Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var fileSize: Filesize.IFilesize;
+export = fileSize;
+export as namespace filesize;
+
+declare namespace Filesize {
+
+    export interface SiJedecBits {
+        b?: string;
+        Kb?: string;
+        Mb?: string;
+        Gb?: string;
+        Tb?: string;
+        Pb?: string;
+        Eb?: string;
+        Zb?: string;
+        Yb?: string;
+    }
+
+    export interface SiJedecBytes {
+        B?: string;
+        KB?: string;
+        MB?: string;
+        GB?: string;
+        TB?: string;
+        PB?: string;
+        EB?: string;
+        ZB?: string;
+        YB?: string;
+    }
+
+    type SiJedec = SiJedecBits & SiJedecBytes & { [name: string]: string };
+
+    export interface Options {
+        /**
+        * Enables bit sizes, default is false
+        */
+        bits?: boolean;
+        /**
+        * Number base, default is 2
+        */
+        base?: number;
+        /**
+        * Decimal place, default is 2
+        */
+        round?: number;
+        /**
+        * Output of function (array, exponent, object, or string), default is string
+        */
+        output?: string;
+        /**
+        * Dictionary of SI/JEDEC symbols to replace for localization, defaults to english if no match is found
+        * @deprecated: use 'symbols'
+        */
+        suffixes?: SiJedec;
+        /**
+        * Dictionary of SI/JEDEC symbols to replace for localization, defaults to english if no match is found
+        */
+        symbols?: SiJedec;
+        /**
+        * Specifies the SI suffix via exponent, e.g. 2 is MB for bytes, default is -1
+        */
+        exponent?: number;
+        /**
+        *  Enables unix style human readable output, e.g ls -lh, default is false
+        */
+        unix?: boolean;
+        /**
+        * Character between the result and suffix, default is " "
+        */
+        spacer?: string;
+    }
+
+    export interface IFilesize {
+        (bytes: number): string;
+        (bytes: number, options: Options): string;
+    }
+}
diff --git a/filesize/tsconfig.json b/filesize/tsconfig.json
new file mode 100644
index 0000000000..bf1f096601
--- /dev/null
+++ b/filesize/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "filesize-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/filesystem/filesystem-tests.ts b/filesystem/filesystem-tests.ts
index 9eb6fbaaeb..aca03affe0 100644
--- a/filesystem/filesystem-tests.ts
+++ b/filesystem/filesystem-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="filesystem.d.ts" />
+
 // http://www.w3.org/TR/file-system-api/
 
 // 2. Introduction
diff --git a/filesystem/filesystem.d.ts b/filesystem/filesystem.d.ts
deleted file mode 100644
index 5e538b14cd..0000000000
--- a/filesystem/filesystem.d.ts
+++ /dev/null
@@ -1,548 +0,0 @@
-// Type definitions for File System API
-// Project: http://www.w3.org/TR/file-system-api/
-// Definitions by: Kon <http://phyzkit.net/> 
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped 
-
-/// <reference path="../filewriter/filewriter.d.ts" />
-
-interface LocalFileSystem {
-    
-    /**
-     * Used for storage with no guarantee of persistence.
-     */
-    TEMPORARY:number;
-
-    /**
-     * Used for storage that should not be removed by the user agent without application or user permission.
-     */
-    PERSISTENT:number;
-
-    /**
-     * Requests a filesystem in which to store application data.
-     * @param type Whether the filesystem requested should be persistent, as defined above. Use one of TEMPORARY or PERSISTENT.
-     * @param size This is an indicator of how much storage space, in bytes, the application expects to need.
-     * @param successCallback The callback that is called when the user agent provides a filesystem.
-     * @param errorCallback A callback that is called when errors happen, or when the request to obtain the filesystem is denied.
-     */
-    requestFileSystem(type:number, size:number, successCallback:FileSystemCallback, errorCallback?:ErrorCallback):void;
-    
-    /**
-     * Allows the user to look up the Entry for a file or directory referred to by a local URL.
-     * @param url A URL referring to a local file in a filesystem accessable via this API.
-     * @param successCallback A callback that is called to report the Entry to which the supplied URL refers.
-     * @param errorCallback A callback that is called when errors happen, or when the request to obtain the Entry is denied.
-     */ 
-    resolveLocalFileSystemURL(url:string, successCallback:EntryCallback, errorCallback?:ErrorCallback):void;
-
-    /**
-     * see requestFileSystem.
-     */
-    webkitRequestFileSystem(type:number, size:number, successCallback:FileSystemCallback, errorCallback?:ErrorCallback):void;
-}
-
-interface LocalFileSystemSync {
-    /**
-     * Used for storage with no guarantee of persistence.
-     */
-    TEMPORARY:number;
-
-    /**
-     * Used for storage that should not be removed by the user agent without application or user permission.
-     */
-    PERSISTENT:number;
-
-    /**
-     * Requests a filesystem in which to store application data.
-     * @param type Whether the filesystem requested should be persistent, as defined above. Use one of TEMPORARY or PERSISTENT.
-     * @param size This is an indicator of how much storage space, in bytes, the application expects to need.
-     */
-    requestFileSystemSync(type:number, size:number):FileSystemSync;
-
-    /**
-     * Allows the user to look up the Entry for a file or directory referred to by a local URL.
-     * @param url A URL referring to a local file in a filesystem accessable via this API.
-     */
-    resolveLocalFileSystemSyncURL(url:string):EntrySync;
-
-    /**
-     * see requestFileSystemSync
-     */
-    webkitRequestFileSystemSync(type:number, size:number):FileSystemSync;
-}
-
-interface Metadata {
-    /**
-     * This is the time at which the file or directory was last modified.
-     * @readonly
-     */
-    modificationTime:Date;
-
-    /**
-     * The size of the file, in bytes. This must return 0 for directories.
-     * @readonly
-     */
-    size:number;
-}
-
-interface Flags {
-    /**
-     * Used to indicate that the user wants to create a file or directory if it was not previously there.
-     */
-    create?:boolean;
-
-    /**
-     * By itself, exclusive must have no effect. Used with create, it must cause getFile and getDirectory to fail if the target path already exists.
-     */
-    exclusive?:boolean;
-}
-
-/** 
- * This interface represents a file system.
- */
-interface FileSystem{
-    /**
-     * This is the name of the file system. The specifics of naming filesystems is unspecified, but a name must be unique across the list of exposed file systems.
-     * @readonly
-     */
-    name: string;
-
-    /**
-     * The root directory of the file system.
-     * @readonly
-     */
-    root: DirectoryEntry;
-}
-
-interface Entry {
-
-    /**
-     * Entry is a file.
-     */
-    isFile:boolean;
-
-    /**
-     * Entry is a directory.
-     */
-    isDirectory:boolean;
-
-    /**
-     * Look up metadata about this entry.
-     * @param successCallback A callback that is called with the time of the last modification.
-     * @param errorCallback ErrorCallback A callback that is called when errors happen.
-     */
-    getMetadata(successCallback:MetadataCallback, errorCallback?:ErrorCallback):void;
-    
-    /**
-     * The name of the entry, excluding the path leading to it.
-     */
-    name:string;
-
-    /**
-     * The full absolute path from the root to the entry.
-     */
-    fullPath:string;
-
-    /**
-     * The file system on which the entry resides.
-     */
-    filesystem:FileSystem;
-
-    /**
-     * Move an entry to a different location on the file system. It is an error to try to:
-     * 
-     * <ui>
-     * <li>move a directory inside itself or to any child at any depth;</li>
-     * <li>move an entry into its parent if a name different from its current one isn't provided;</li>
-     * <li>move a file to a path occupied by a directory;</li>
-     * <li>move a directory to a path occupied by a file;</li>
-     * <li>move any element to a path occupied by a directory which is not empty.</li>
-     * <ul>
-     *
-     * A move of a file on top of an existing file must attempt to delete and replace that file.
-     * A move of a directory on top of an existing empty directory must attempt to delete and replace that directory.
-     */
-    moveTo(parent:DirectoryEntry, newName?:string, successCallback?:EntryCallback, errorCallback?:ErrorCallback):void;
-    
-    /**
-     * Copy an entry to a different location on the file system. It is an error to try to:
-     * 
-     * <ul> 
-     * <li> copy a directory inside itself or to any child at any depth;</li>
-     * <li> copy an entry into its parent if a name different from its current one isn't provided;</li>
-     * <li> copy a file to a path occupied by a directory;</li>
-     * <li> copy a directory to a path occupied by a file;</li>
-     * <li> copy any element to a path occupied by a directory which is not empty.</li>
-     * <li> A copy of a file on top of an existing file must attempt to delete and replace that file.</li>
-     * <li> A copy of a directory on top of an existing empty directory must attempt to delete and replace that directory.</li>
-     * </ul>
-     *
-     * Directory copies are always recursive--that is, they copy all contents of the directory.
-     */
-    copyTo(parent:DirectoryEntry, newName?:string, successCallback?:EntryCallback, errorCallback?:ErrorCallback):void;
-    
-    /**
-     * Returns a URL that can be used to identify this entry. Unlike the URN defined in [FILE-API-ED], it has no specific expiration; as it describes a location on disk, it should be valid at least as long as that location exists.
-     */
-    toURL():string;
-
-    /**
-     * Deletes a file or directory. It is an error to attempt to delete a directory that is not empty. It is an error to attempt to delete the root directory of a filesystem.
-     * @param successCallback A callback that is called on success.
-     * @param errorCallback A callback that is called when errors happen.
-     */
-    remove(successCallback:VoidCallback, errorCallback?:ErrorCallback):void;
-    
-    /**
-     * Look up the parent DirectoryEntry containing this Entry. If this Entry is the root of its filesystem, its parent is itself.
-     * @param successCallback A callback that is called to return the parent Entry.
-     * @param errorCallback A callback that is called when errors happen.
-     */
-    getParent(successCallback:DirectoryEntryCallback, errorCallback?:ErrorCallback):void;
-}
-
-/**
- * This interface represents a directory on a file system.
- */
-interface DirectoryEntry extends Entry {
-    /**
-     * Creates a new DirectoryReader to read Entries from this Directory.
-     */
-    createReader():DirectoryReader;
-
-    /**
-     * Creates or looks up a file.
-     * @param path Either an absolute path or a relative path from this DirectoryEntry to the file to be looked up or created. It is an error to attempt to create a file whose immediate parent does not yet exist.
-     * @param options
-     *     <ul> 
-     *     <li>If create and exclusive are both true, and the path already exists, getFile must fail.</li>
-     *     <li>If create is true, the path doesn't exist, and no other error occurs, getFile must create it as a zero-length file and return a corresponding FileEntry.</li>
-     *     <li>If create is not true and the path doesn't exist, getFile must fail.</li>
-     *     <li>If create is not true and the path exists, but is a directory, getFile must fail.</li>
-     *     <li>Otherwise, if no other error occurs, getFile must return a FileEntry corresponding to path.</li>
-     *     </ul>
-     * @param successCallback A callback that is called to return the File selected or created.
-     * @param errorCallback A callback that is called when errors happen.
-     */
-    getFile(path:string, options?:Flags, successCallback?:FileEntryCallback, errorCallback?:ErrorCallback):void;
-    
-    /**
-     * Creates or looks up a directory.
-     * @param path Either an absolute path or a relative path from this DirectoryEntry to the directory to be looked up or created. It is an error to attempt to create a directory whose immediate parent does not yet exist.
-     * @param options 
-     *     <ul>
-     *     <li>If create and exclusive are both true and the path already exists, getDirectory must fail.</li>
-     *     <li>If create is true, the path doesn't exist, and no other error occurs, getDirectory must create and return a corresponding DirectoryEntry.</li>
-     *     <li>If create is not true and the path doesn't exist, getDirectory must fail.</li>
-     *     <li>If create is not true and the path exists, but is a file, getDirectory must fail.</li>
-     *     <li>Otherwise, if no other error occurs, getDirectory must return a DirectoryEntry corresponding to path.</li>
-     *     </ul>
-     * @param successCallback   A callback that is called to return the DirectoryEntry selected or created.
-     * @param errorCallback A callback that is called when errors happen.
-     * 
-     */
-    getDirectory(path:string, options?:Flags, successCallback?:DirectoryEntryCallback, errorCallback?:ErrorCallback):void;
-    
-    /**
-     * Deletes a directory and all of its contents, if any. In the event of an error [e.g. trying to delete a directory that contains a file that cannot be removed], some of the contents of the directory may be deleted. It is an error to attempt to delete the root directory of a filesystem.
-     * @param successCallback A callback that is called on success.
-     * @param errorCallback A callback that is called when errors happen.
-     */
-    removeRecursively(successCallback:VoidCallback, errorCallback?:ErrorCallback):void;
-}
-
-/**
- * This interface lets a user list files and directories in a directory. If there are no additions to or deletions from a directory between the first and last call to readEntries, and no errors occur, then:
- * <ul>
- * <li> A series of calls to readEntries must return each entry in the directory exactly once.</li>
- * <li> Once all entries have been returned, the next call to readEntries must produce an empty array.</li>
- * <li> If not all entries have been returned, the array produced by readEntries must not be empty.</li>
- * <li> The entries produced by readEntries must not include the directory itself ["."] or its parent [".."].</li>
- * </ul>
- */
-interface DirectoryReader {
-    /**
-     * Read the next block of entries from this directory.
-     * @param successCallback Called once per successful call to readEntries to deliver the next previously-unreported set of Entries in the associated Directory. If all Entries have already been returned from previous invocations of readEntries, successCallback must be called with a zero-length array as an argument.
-     * @param errorCallback A callback indicating that there was an error reading from the Directory.
-     */
-    readEntries(successCallback:EntriesCallback, errorCallback?:ErrorCallback):void;
-}
-
-/**
- * This interface represents a file on a file system.
- */
-interface FileEntry extends Entry {
-    /**
-     * Creates a new FileWriter associated with the file that this FileEntry represents.
-     * @param successCallback A callback that is called with the new FileWriter.
-     * @param errorCallback A callback that is called when errors happen.
-     */
-    createWriter(successCallback:FileWriterCallback, errorCallback?:ErrorCallback):void;
-
-    /**
-     * Returns a File that represents the current state of the file that this FileEntry represents.
-     * @param successCallback A callback that is called with the File.
-     * @param errorCallback A callback that is called when errors happen.
-     */
-    file(successCallback:FileCallback, errorCallback?:ErrorCallback):void;
-}
-
-/**
- * When requestFileSystem() succeeds, the following callback is made.
- */
-interface FileSystemCallback {
-    /**
-     * @param filesystem The file systems to which the app is granted access.
-     */
-    (filesystem:FileSystem):void;
-}
-
-/**
- * This interface is the callback used to look up Entry objects.
- */
-interface EntryCallback {
-    /**
-     * @param entry
-     */
-    (entry:Entry):void;
-}
-
-/**
- * This interface is the callback used to look up FileEntry objects.
- */
-interface FileEntryCallback {
-    /**
-     * @param entry
-     */
-    (entry:FileEntry):void;
-}
-
-/**
- * This interface is the callback used to look up DirectoryEntry objects.
- */
-interface DirectoryEntryCallback {
-    /**
-     * @param entry
-     */
-    (entry:DirectoryEntry):void;
-}
-
-/**
- * When readEntries() succeeds, the following callback is made.
- */
-interface EntriesCallback {
-    (entries:Entry[]):void;
-}
-
-/**
- * This interface is the callback used to look up file and directory metadata.
- */
-interface MetadataCallback {
-    (metadata:Metadata):void;
-}
-
-/**
- * This interface is the callback used to create a FileWriter.
- */ 
-interface FileWriterCallback {
-    (fileWriter:FileWriter):void;
-}
-
-/**
- * This interface is the callback used to obtain a File.
- */
-interface FileCallback {
-    (file:File):void;
-}
-
-/** 
- * This interface is the generic callback used to indicate success of an asynchronous method.
- */ 
-interface VoidCallback {
-    ():void;
-}
-
-/**
- * When an error occurs, the following callback is made.
- */
-interface ErrorCallback {
-    (err:DOMError):void;
-}
-
-
-/** 
- * This interface represents a file system.
- */
-interface FileSystemSync {
-    /**
-     * This is the name of the file system. The specifics of naming filesystems is unspecified, but a name must be unique across the list of exposed file systems.
-     */
-    name:string;
-
-    /**
-     * root The root directory of the file system.
-     */
-    root:DirectoryEntrySync;
-}
-
-/**
- * An abstract interface representing entries in a file system, each of which may be a FileEntrySync or DirectoryEntrySync.
- */
-interface EntrySync{
-    /**
-     * EntrySync is a file.
-     * @readonly
-     */
-    isFile:boolean;
-
-    /**
-     * EntrySync is a directory.
-     * @readonly
-     */
-    isDirectory:boolean;
-
-    /**
-     * Look up metadata about this entry.
-     */
-    getMetadata():Metadata;
-    
-    /**
-     * The name of the entry, excluding the path leading to it.
-     */
-    name:string;
-
-    /**
-     * The full absolute path from the root to the entry.
-     */
-    fullPath:string;
-
-    /**
-     * The file system on which the entry resides.
-     */
-    filesystem:FileSystemSync;
-
-    /**
-     * Move an entry to a different location on the file system. It is an error to try to:
-     * <ul>
-     * <li> move a directory inside itself or to any child at any depth;</li>
-     * <li> move an entry into its parent if a name different from its current one isn't provided;</li>
-     * <li> move a file to a path occupied by a directory;</li>
-     * <li> move a directory to a path occupied by a file;</li>
-     * <li> move any element to a path occupied by a directory which is not empty.</li>
-     * </ui> 
-     * A move of a file on top of an existing file must attempt to delete and replace that file. A move of a directory on top of an existing empty directory must attempt to delete and replace that directory.
-     * @param parent The directory to which to move the entry.
-     * @param newName The new name of the entry. Defaults to the EntrySync's current name if unspecified.
-     */
-    moveTo(parent:DirectoryEntrySync, newName?:string):EntrySync;
-
-    /**
-     * Copy an entry to a different location on the file system. It is an error to try to:
-     * <ul>
-     * <li> copy a directory inside itself or to any child at any depth;</li>
-     * <li> copy an entry into its parent if a name different from its current one isn't provided;</li>
-     * <li> copy a file to a path occupied by a directory;</li>
-     * <li> copy a directory to a path occupied by a file;</li>
-     * <li> copy any element to a path occupied by a directory which is not empty.</li>
-     * </ui> 
-     * A copy of a file on top of an existing file must attempt to delete and replace that file.
-     * A copy of a directory on top of an existing empty directory must attempt to delete and replace that directory.
-     * Directory copies are always recursive--that is, they copy all contents of the directory.
-     */
-    copyTo(parent:DirectoryEntrySync, newName?:string):EntrySync;
-
-    /**
-     * Returns a URL that can be used to identify this entry. Unlike the URN defined in [FILE-API-ED], it has no specific expiration; as it describes a location on disk, it should be valid at least as long as that location exists.
-     */
-    toURL():string;
-
-    /**
-     * Deletes a file or directory. It is an error to attempt to delete a directory that is not empty. It is an error to attempt to delete the root directory of a filesystem.
-     */
-    remove ():void;
-
-    /**
-     * Look up the parent DirectoryEntrySync containing this Entry. If this EntrySync is the root of its filesystem, its parent is itself.
-     */
-    getParent():DirectoryEntrySync;
-}
-
-/**
- * This interface represents a directory on a file system.
- */
-interface DirectoryEntrySync extends EntrySync {
-    /**
-     * Creates a new DirectoryReaderSync to read EntrySyncs from this DirectorySync.
-     */
-    createReader():DirectoryReaderSync;
-
-    /** 
-     * Creates or looks up a directory.
-     * @param path Either an absolute path or a relative path from this DirectoryEntrySync to the file to be looked up or created. It is an error to attempt to create a file whose immediate parent does not yet exist.
-     * @param options 
-     *     <ul>
-     *     <li> If create and exclusive are both true and the path already exists, getFile must fail.</li>
-     *     <li> If create is true, the path doesn't exist, and no other error occurs, getFile must create it as a zero-length file and return a corresponding FileEntry.</li>
-     *     <li> If create is not true and the path doesn't exist, getFile must fail.</li>
-     *     <li> If create is not true and the path exists, but is a directory, getFile must fail.</li>
-     *     <li> Otherwise, if no other error occurs, getFile must return a FileEntrySync corresponding to path.</li>
-     *     </ul>
-     */
-    getFile(path:string, options?:Flags):FileEntrySync;
-
-    /** 
-     * Creates or looks up a directory.
-     * @param path Either an absolute path or a relative path from this DirectoryEntrySync to the directory to be looked up or created. It is an error to attempt to create a directory whose immediate parent does not yet exist.
-     * @param options 
-     *     <ul>
-     *     <li> If create and exclusive are both true and the path already exists, getDirectory must fail.</li>
-     *     <li> If create is true, the path doesn't exist, and no other error occurs, getDirectory must create and return a corresponding DirectoryEntry.</li>
-     *     <li> If create is not true and the path doesn't exist, getDirectory must fail.</li>
-     *     <li> If create is not true and the path exists, but is a file, getDirectory must fail.</li>
-     *     <li> Otherwise, if no other error occurs, getDirectory must return a DirectoryEntrySync corresponding to path.</li>
-     *     </ul>
-     */
-    getDirectory(path:string, options?:Flags):DirectoryEntrySync;
-
-    /**
-     * Deletes a directory and all of its contents, if any. In the event of an error [e.g. trying to delete a directory that contains a file that cannot be removed], some of the contents of the directory may be deleted. It is an error to attempt to delete the root directory of a filesystem.
-     */
-    removeRecursively():void;
-}
-
-/**
- * This interface lets a user list files and directories in a directory. If there are no additions to or deletions from a directory between the first and last call to readEntries, and no errors occur, then:
- * <ul>
- * <li> A series of calls to readEntries must return each entry in the directory exactly once.</li>
- * <li> Once all entries have been returned, the next call to readEntries must produce an empty array.</li>
- * <li> If not all entries have been returned, the array produced by readEntries must not be empty.</li>
- * <li> The entries produced by readEntries must not include the directory itself ["."] or its parent [".."].</li>
- * </ul>
- */
-interface DirectoryReaderSync {
-    /**
-     * Read the next block of entries from this directory.
-     */
-    readEntries():EntrySync[];
-}
-
-/**
- * This interface represents a file on a file system.
- */
-interface FileEntrySync extends EntrySync {
-    /**
-     * Creates a new FileWriterSync associated with the file that this FileEntrySync represents.
-     */
-    createWriter():FileWriterSync;
-
-    /**
-     * Returns a File that represents the current state of the file that this FileEntrySync represents.
-     */
-    file():File;
-}
-
-interface Window extends LocalFileSystem, LocalFileSystemSync{
-}
-
-interface WorkerGlobalScope extends LocalFileSystem, LocalFileSystemSync{
-}
diff --git a/filesystem/index.d.ts b/filesystem/index.d.ts
new file mode 100644
index 0000000000..93dbb35d61
--- /dev/null
+++ b/filesystem/index.d.ts
@@ -0,0 +1,548 @@
+// Type definitions for File System API
+// Project: http://www.w3.org/TR/file-system-api/
+// Definitions by: Kon <http://phyzkit.net/> 
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped 
+
+/// <reference types="filewriter" />
+
+interface LocalFileSystem {
+    
+    /**
+     * Used for storage with no guarantee of persistence.
+     */
+    TEMPORARY:number;
+
+    /**
+     * Used for storage that should not be removed by the user agent without application or user permission.
+     */
+    PERSISTENT:number;
+
+    /**
+     * Requests a filesystem in which to store application data.
+     * @param type Whether the filesystem requested should be persistent, as defined above. Use one of TEMPORARY or PERSISTENT.
+     * @param size This is an indicator of how much storage space, in bytes, the application expects to need.
+     * @param successCallback The callback that is called when the user agent provides a filesystem.
+     * @param errorCallback A callback that is called when errors happen, or when the request to obtain the filesystem is denied.
+     */
+    requestFileSystem(type:number, size:number, successCallback:FileSystemCallback, errorCallback?:ErrorCallback):void;
+    
+    /**
+     * Allows the user to look up the Entry for a file or directory referred to by a local URL.
+     * @param url A URL referring to a local file in a filesystem accessable via this API.
+     * @param successCallback A callback that is called to report the Entry to which the supplied URL refers.
+     * @param errorCallback A callback that is called when errors happen, or when the request to obtain the Entry is denied.
+     */ 
+    resolveLocalFileSystemURL(url:string, successCallback:EntryCallback, errorCallback?:ErrorCallback):void;
+
+    /**
+     * see requestFileSystem.
+     */
+    webkitRequestFileSystem(type:number, size:number, successCallback:FileSystemCallback, errorCallback?:ErrorCallback):void;
+}
+
+interface LocalFileSystemSync {
+    /**
+     * Used for storage with no guarantee of persistence.
+     */
+    TEMPORARY:number;
+
+    /**
+     * Used for storage that should not be removed by the user agent without application or user permission.
+     */
+    PERSISTENT:number;
+
+    /**
+     * Requests a filesystem in which to store application data.
+     * @param type Whether the filesystem requested should be persistent, as defined above. Use one of TEMPORARY or PERSISTENT.
+     * @param size This is an indicator of how much storage space, in bytes, the application expects to need.
+     */
+    requestFileSystemSync(type:number, size:number):FileSystemSync;
+
+    /**
+     * Allows the user to look up the Entry for a file or directory referred to by a local URL.
+     * @param url A URL referring to a local file in a filesystem accessable via this API.
+     */
+    resolveLocalFileSystemSyncURL(url:string):EntrySync;
+
+    /**
+     * see requestFileSystemSync
+     */
+    webkitRequestFileSystemSync(type:number, size:number):FileSystemSync;
+}
+
+interface Metadata {
+    /**
+     * This is the time at which the file or directory was last modified.
+     * @readonly
+     */
+    modificationTime:Date;
+
+    /**
+     * The size of the file, in bytes. This must return 0 for directories.
+     * @readonly
+     */
+    size:number;
+}
+
+interface Flags {
+    /**
+     * Used to indicate that the user wants to create a file or directory if it was not previously there.
+     */
+    create?:boolean;
+
+    /**
+     * By itself, exclusive must have no effect. Used with create, it must cause getFile and getDirectory to fail if the target path already exists.
+     */
+    exclusive?:boolean;
+}
+
+/** 
+ * This interface represents a file system.
+ */
+interface FileSystem{
+    /**
+     * This is the name of the file system. The specifics of naming filesystems is unspecified, but a name must be unique across the list of exposed file systems.
+     * @readonly
+     */
+    name: string;
+
+    /**
+     * The root directory of the file system.
+     * @readonly
+     */
+    root: DirectoryEntry;
+}
+
+interface Entry {
+
+    /**
+     * Entry is a file.
+     */
+    isFile:boolean;
+
+    /**
+     * Entry is a directory.
+     */
+    isDirectory:boolean;
+
+    /**
+     * Look up metadata about this entry.
+     * @param successCallback A callback that is called with the time of the last modification.
+     * @param errorCallback ErrorCallback A callback that is called when errors happen.
+     */
+    getMetadata(successCallback:MetadataCallback, errorCallback?:ErrorCallback):void;
+    
+    /**
+     * The name of the entry, excluding the path leading to it.
+     */
+    name:string;
+
+    /**
+     * The full absolute path from the root to the entry.
+     */
+    fullPath:string;
+
+    /**
+     * The file system on which the entry resides.
+     */
+    filesystem:FileSystem;
+
+    /**
+     * Move an entry to a different location on the file system. It is an error to try to:
+     * 
+     * <ui>
+     * <li>move a directory inside itself or to any child at any depth;</li>
+     * <li>move an entry into its parent if a name different from its current one isn't provided;</li>
+     * <li>move a file to a path occupied by a directory;</li>
+     * <li>move a directory to a path occupied by a file;</li>
+     * <li>move any element to a path occupied by a directory which is not empty.</li>
+     * <ul>
+     *
+     * A move of a file on top of an existing file must attempt to delete and replace that file.
+     * A move of a directory on top of an existing empty directory must attempt to delete and replace that directory.
+     */
+    moveTo(parent:DirectoryEntry, newName?:string, successCallback?:EntryCallback, errorCallback?:ErrorCallback):void;
+    
+    /**
+     * Copy an entry to a different location on the file system. It is an error to try to:
+     * 
+     * <ul> 
+     * <li> copy a directory inside itself or to any child at any depth;</li>
+     * <li> copy an entry into its parent if a name different from its current one isn't provided;</li>
+     * <li> copy a file to a path occupied by a directory;</li>
+     * <li> copy a directory to a path occupied by a file;</li>
+     * <li> copy any element to a path occupied by a directory which is not empty.</li>
+     * <li> A copy of a file on top of an existing file must attempt to delete and replace that file.</li>
+     * <li> A copy of a directory on top of an existing empty directory must attempt to delete and replace that directory.</li>
+     * </ul>
+     *
+     * Directory copies are always recursive--that is, they copy all contents of the directory.
+     */
+    copyTo(parent:DirectoryEntry, newName?:string, successCallback?:EntryCallback, errorCallback?:ErrorCallback):void;
+    
+    /**
+     * Returns a URL that can be used to identify this entry. Unlike the URN defined in [FILE-API-ED], it has no specific expiration; as it describes a location on disk, it should be valid at least as long as that location exists.
+     */
+    toURL():string;
+
+    /**
+     * Deletes a file or directory. It is an error to attempt to delete a directory that is not empty. It is an error to attempt to delete the root directory of a filesystem.
+     * @param successCallback A callback that is called on success.
+     * @param errorCallback A callback that is called when errors happen.
+     */
+    remove(successCallback:VoidCallback, errorCallback?:ErrorCallback):void;
+    
+    /**
+     * Look up the parent DirectoryEntry containing this Entry. If this Entry is the root of its filesystem, its parent is itself.
+     * @param successCallback A callback that is called to return the parent Entry.
+     * @param errorCallback A callback that is called when errors happen.
+     */
+    getParent(successCallback:DirectoryEntryCallback, errorCallback?:ErrorCallback):void;
+}
+
+/**
+ * This interface represents a directory on a file system.
+ */
+interface DirectoryEntry extends Entry {
+    /**
+     * Creates a new DirectoryReader to read Entries from this Directory.
+     */
+    createReader():DirectoryReader;
+
+    /**
+     * Creates or looks up a file.
+     * @param path Either an absolute path or a relative path from this DirectoryEntry to the file to be looked up or created. It is an error to attempt to create a file whose immediate parent does not yet exist.
+     * @param options
+     *     <ul> 
+     *     <li>If create and exclusive are both true, and the path already exists, getFile must fail.</li>
+     *     <li>If create is true, the path doesn't exist, and no other error occurs, getFile must create it as a zero-length file and return a corresponding FileEntry.</li>
+     *     <li>If create is not true and the path doesn't exist, getFile must fail.</li>
+     *     <li>If create is not true and the path exists, but is a directory, getFile must fail.</li>
+     *     <li>Otherwise, if no other error occurs, getFile must return a FileEntry corresponding to path.</li>
+     *     </ul>
+     * @param successCallback A callback that is called to return the File selected or created.
+     * @param errorCallback A callback that is called when errors happen.
+     */
+    getFile(path:string, options?:Flags, successCallback?:FileEntryCallback, errorCallback?:ErrorCallback):void;
+    
+    /**
+     * Creates or looks up a directory.
+     * @param path Either an absolute path or a relative path from this DirectoryEntry to the directory to be looked up or created. It is an error to attempt to create a directory whose immediate parent does not yet exist.
+     * @param options 
+     *     <ul>
+     *     <li>If create and exclusive are both true and the path already exists, getDirectory must fail.</li>
+     *     <li>If create is true, the path doesn't exist, and no other error occurs, getDirectory must create and return a corresponding DirectoryEntry.</li>
+     *     <li>If create is not true and the path doesn't exist, getDirectory must fail.</li>
+     *     <li>If create is not true and the path exists, but is a file, getDirectory must fail.</li>
+     *     <li>Otherwise, if no other error occurs, getDirectory must return a DirectoryEntry corresponding to path.</li>
+     *     </ul>
+     * @param successCallback   A callback that is called to return the DirectoryEntry selected or created.
+     * @param errorCallback A callback that is called when errors happen.
+     * 
+     */
+    getDirectory(path:string, options?:Flags, successCallback?:DirectoryEntryCallback, errorCallback?:ErrorCallback):void;
+    
+    /**
+     * Deletes a directory and all of its contents, if any. In the event of an error [e.g. trying to delete a directory that contains a file that cannot be removed], some of the contents of the directory may be deleted. It is an error to attempt to delete the root directory of a filesystem.
+     * @param successCallback A callback that is called on success.
+     * @param errorCallback A callback that is called when errors happen.
+     */
+    removeRecursively(successCallback:VoidCallback, errorCallback?:ErrorCallback):void;
+}
+
+/**
+ * This interface lets a user list files and directories in a directory. If there are no additions to or deletions from a directory between the first and last call to readEntries, and no errors occur, then:
+ * <ul>
+ * <li> A series of calls to readEntries must return each entry in the directory exactly once.</li>
+ * <li> Once all entries have been returned, the next call to readEntries must produce an empty array.</li>
+ * <li> If not all entries have been returned, the array produced by readEntries must not be empty.</li>
+ * <li> The entries produced by readEntries must not include the directory itself ["."] or its parent [".."].</li>
+ * </ul>
+ */
+interface DirectoryReader {
+    /**
+     * Read the next block of entries from this directory.
+     * @param successCallback Called once per successful call to readEntries to deliver the next previously-unreported set of Entries in the associated Directory. If all Entries have already been returned from previous invocations of readEntries, successCallback must be called with a zero-length array as an argument.
+     * @param errorCallback A callback indicating that there was an error reading from the Directory.
+     */
+    readEntries(successCallback:EntriesCallback, errorCallback?:ErrorCallback):void;
+}
+
+/**
+ * This interface represents a file on a file system.
+ */
+interface FileEntry extends Entry {
+    /**
+     * Creates a new FileWriter associated with the file that this FileEntry represents.
+     * @param successCallback A callback that is called with the new FileWriter.
+     * @param errorCallback A callback that is called when errors happen.
+     */
+    createWriter(successCallback:FileWriterCallback, errorCallback?:ErrorCallback):void;
+
+    /**
+     * Returns a File that represents the current state of the file that this FileEntry represents.
+     * @param successCallback A callback that is called with the File.
+     * @param errorCallback A callback that is called when errors happen.
+     */
+    file(successCallback:FileCallback, errorCallback?:ErrorCallback):void;
+}
+
+/**
+ * When requestFileSystem() succeeds, the following callback is made.
+ */
+interface FileSystemCallback {
+    /**
+     * @param filesystem The file systems to which the app is granted access.
+     */
+    (filesystem:FileSystem):void;
+}
+
+/**
+ * This interface is the callback used to look up Entry objects.
+ */
+interface EntryCallback {
+    /**
+     * @param entry
+     */
+    (entry:Entry):void;
+}
+
+/**
+ * This interface is the callback used to look up FileEntry objects.
+ */
+interface FileEntryCallback {
+    /**
+     * @param entry
+     */
+    (entry:FileEntry):void;
+}
+
+/**
+ * This interface is the callback used to look up DirectoryEntry objects.
+ */
+interface DirectoryEntryCallback {
+    /**
+     * @param entry
+     */
+    (entry:DirectoryEntry):void;
+}
+
+/**
+ * When readEntries() succeeds, the following callback is made.
+ */
+interface EntriesCallback {
+    (entries:Entry[]):void;
+}
+
+/**
+ * This interface is the callback used to look up file and directory metadata.
+ */
+interface MetadataCallback {
+    (metadata:Metadata):void;
+}
+
+/**
+ * This interface is the callback used to create a FileWriter.
+ */ 
+interface FileWriterCallback {
+    (fileWriter:FileWriter):void;
+}
+
+/**
+ * This interface is the callback used to obtain a File.
+ */
+interface FileCallback {
+    (file:File):void;
+}
+
+/** 
+ * This interface is the generic callback used to indicate success of an asynchronous method.
+ */ 
+interface VoidCallback {
+    ():void;
+}
+
+/**
+ * When an error occurs, the following callback is made.
+ */
+interface ErrorCallback {
+    (err:DOMError):void;
+}
+
+
+/** 
+ * This interface represents a file system.
+ */
+interface FileSystemSync {
+    /**
+     * This is the name of the file system. The specifics of naming filesystems is unspecified, but a name must be unique across the list of exposed file systems.
+     */
+    name:string;
+
+    /**
+     * root The root directory of the file system.
+     */
+    root:DirectoryEntrySync;
+}
+
+/**
+ * An abstract interface representing entries in a file system, each of which may be a FileEntrySync or DirectoryEntrySync.
+ */
+interface EntrySync{
+    /**
+     * EntrySync is a file.
+     * @readonly
+     */
+    isFile:boolean;
+
+    /**
+     * EntrySync is a directory.
+     * @readonly
+     */
+    isDirectory:boolean;
+
+    /**
+     * Look up metadata about this entry.
+     */
+    getMetadata():Metadata;
+    
+    /**
+     * The name of the entry, excluding the path leading to it.
+     */
+    name:string;
+
+    /**
+     * The full absolute path from the root to the entry.
+     */
+    fullPath:string;
+
+    /**
+     * The file system on which the entry resides.
+     */
+    filesystem:FileSystemSync;
+
+    /**
+     * Move an entry to a different location on the file system. It is an error to try to:
+     * <ul>
+     * <li> move a directory inside itself or to any child at any depth;</li>
+     * <li> move an entry into its parent if a name different from its current one isn't provided;</li>
+     * <li> move a file to a path occupied by a directory;</li>
+     * <li> move a directory to a path occupied by a file;</li>
+     * <li> move any element to a path occupied by a directory which is not empty.</li>
+     * </ui> 
+     * A move of a file on top of an existing file must attempt to delete and replace that file. A move of a directory on top of an existing empty directory must attempt to delete and replace that directory.
+     * @param parent The directory to which to move the entry.
+     * @param newName The new name of the entry. Defaults to the EntrySync's current name if unspecified.
+     */
+    moveTo(parent:DirectoryEntrySync, newName?:string):EntrySync;
+
+    /**
+     * Copy an entry to a different location on the file system. It is an error to try to:
+     * <ul>
+     * <li> copy a directory inside itself or to any child at any depth;</li>
+     * <li> copy an entry into its parent if a name different from its current one isn't provided;</li>
+     * <li> copy a file to a path occupied by a directory;</li>
+     * <li> copy a directory to a path occupied by a file;</li>
+     * <li> copy any element to a path occupied by a directory which is not empty.</li>
+     * </ui> 
+     * A copy of a file on top of an existing file must attempt to delete and replace that file.
+     * A copy of a directory on top of an existing empty directory must attempt to delete and replace that directory.
+     * Directory copies are always recursive--that is, they copy all contents of the directory.
+     */
+    copyTo(parent:DirectoryEntrySync, newName?:string):EntrySync;
+
+    /**
+     * Returns a URL that can be used to identify this entry. Unlike the URN defined in [FILE-API-ED], it has no specific expiration; as it describes a location on disk, it should be valid at least as long as that location exists.
+     */
+    toURL():string;
+
+    /**
+     * Deletes a file or directory. It is an error to attempt to delete a directory that is not empty. It is an error to attempt to delete the root directory of a filesystem.
+     */
+    remove ():void;
+
+    /**
+     * Look up the parent DirectoryEntrySync containing this Entry. If this EntrySync is the root of its filesystem, its parent is itself.
+     */
+    getParent():DirectoryEntrySync;
+}
+
+/**
+ * This interface represents a directory on a file system.
+ */
+interface DirectoryEntrySync extends EntrySync {
+    /**
+     * Creates a new DirectoryReaderSync to read EntrySyncs from this DirectorySync.
+     */
+    createReader():DirectoryReaderSync;
+
+    /** 
+     * Creates or looks up a directory.
+     * @param path Either an absolute path or a relative path from this DirectoryEntrySync to the file to be looked up or created. It is an error to attempt to create a file whose immediate parent does not yet exist.
+     * @param options 
+     *     <ul>
+     *     <li> If create and exclusive are both true and the path already exists, getFile must fail.</li>
+     *     <li> If create is true, the path doesn't exist, and no other error occurs, getFile must create it as a zero-length file and return a corresponding FileEntry.</li>
+     *     <li> If create is not true and the path doesn't exist, getFile must fail.</li>
+     *     <li> If create is not true and the path exists, but is a directory, getFile must fail.</li>
+     *     <li> Otherwise, if no other error occurs, getFile must return a FileEntrySync corresponding to path.</li>
+     *     </ul>
+     */
+    getFile(path:string, options?:Flags):FileEntrySync;
+
+    /** 
+     * Creates or looks up a directory.
+     * @param path Either an absolute path or a relative path from this DirectoryEntrySync to the directory to be looked up or created. It is an error to attempt to create a directory whose immediate parent does not yet exist.
+     * @param options 
+     *     <ul>
+     *     <li> If create and exclusive are both true and the path already exists, getDirectory must fail.</li>
+     *     <li> If create is true, the path doesn't exist, and no other error occurs, getDirectory must create and return a corresponding DirectoryEntry.</li>
+     *     <li> If create is not true and the path doesn't exist, getDirectory must fail.</li>
+     *     <li> If create is not true and the path exists, but is a file, getDirectory must fail.</li>
+     *     <li> Otherwise, if no other error occurs, getDirectory must return a DirectoryEntrySync corresponding to path.</li>
+     *     </ul>
+     */
+    getDirectory(path:string, options?:Flags):DirectoryEntrySync;
+
+    /**
+     * Deletes a directory and all of its contents, if any. In the event of an error [e.g. trying to delete a directory that contains a file that cannot be removed], some of the contents of the directory may be deleted. It is an error to attempt to delete the root directory of a filesystem.
+     */
+    removeRecursively():void;
+}
+
+/**
+ * This interface lets a user list files and directories in a directory. If there are no additions to or deletions from a directory between the first and last call to readEntries, and no errors occur, then:
+ * <ul>
+ * <li> A series of calls to readEntries must return each entry in the directory exactly once.</li>
+ * <li> Once all entries have been returned, the next call to readEntries must produce an empty array.</li>
+ * <li> If not all entries have been returned, the array produced by readEntries must not be empty.</li>
+ * <li> The entries produced by readEntries must not include the directory itself ["."] or its parent [".."].</li>
+ * </ul>
+ */
+interface DirectoryReaderSync {
+    /**
+     * Read the next block of entries from this directory.
+     */
+    readEntries():EntrySync[];
+}
+
+/**
+ * This interface represents a file on a file system.
+ */
+interface FileEntrySync extends EntrySync {
+    /**
+     * Creates a new FileWriterSync associated with the file that this FileEntrySync represents.
+     */
+    createWriter():FileWriterSync;
+
+    /**
+     * Returns a File that represents the current state of the file that this FileEntrySync represents.
+     */
+    file():File;
+}
+
+interface Window extends LocalFileSystem, LocalFileSystemSync{
+}
+
+interface WorkerGlobalScope extends LocalFileSystem, LocalFileSystemSync{
+}
diff --git a/filesystem/tsconfig.json b/filesystem/tsconfig.json
new file mode 100644
index 0000000000..cc5cab2366
--- /dev/null
+++ b/filesystem/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "filesystem-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/filewriter/filewriter-tests.ts b/filewriter/filewriter-tests.ts
index f70e76087d..9fc047526f 100644
--- a/filewriter/filewriter-tests.ts
+++ b/filewriter/filewriter-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="filewriter.d.ts" />
+
 
 // http://www.w3.org/TR/file-writer-api/
 function writeFile(writer:FileWriter): void{
diff --git a/filewriter/filewriter.d.ts b/filewriter/index.d.ts
similarity index 100%
rename from filewriter/filewriter.d.ts
rename to filewriter/index.d.ts
diff --git a/filewriter/tsconfig.json b/filewriter/tsconfig.json
new file mode 100644
index 0000000000..8c436b8c0e
--- /dev/null
+++ b/filewriter/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "filewriter-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/finalhandler/finalhandler-tests.ts b/finalhandler/finalhandler-tests.ts
index cb8dc053d1..0b419544fe 100644
--- a/finalhandler/finalhandler-tests.ts
+++ b/finalhandler/finalhandler-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./finalhandler.d.ts" />
 
 import {ServerRequest, ServerResponse} from "http";
 import finalHandler from "finalhandler";
diff --git a/finalhandler/finalhandler.d.ts b/finalhandler/finalhandler.d.ts
deleted file mode 100644
index 092952f858..0000000000
--- a/finalhandler/finalhandler.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Type definitions for finalhandler
-// Project: https://github.com/pillarjs/finalhandler
-// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "finalhandler" {
-	import {ServerRequest, ServerResponse} from "http";
-
-	export interface Options {
-		message?: boolean|((err: any, status: number) => string);
-		onerror?: (err: any, req: ServerRequest, res: ServerResponse) => void;
-		stacktrace?: boolean;
-	}
-
-	function finalHandler(req: ServerRequest, res: ServerResponse, options?: Options): (err: any) => void;
-
-	export default finalHandler;
-}
diff --git a/finalhandler/index.d.ts b/finalhandler/index.d.ts
new file mode 100644
index 0000000000..99245e91f1
--- /dev/null
+++ b/finalhandler/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for finalhandler
+// Project: https://github.com/pillarjs/finalhandler
+// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import {ServerRequest, ServerResponse} from "http";
+
+export interface Options {
+    message?: boolean | ((err: any, status: number) => string);
+    onerror?: (err: any, req: ServerRequest, res: ServerResponse) => void;
+    stacktrace?: boolean;
+}
+
+declare function finalHandler(req: ServerRequest, res: ServerResponse, options?: Options): (err: any) => void;
+
+export default finalHandler;
diff --git a/finalhandler/tsconfig.json b/finalhandler/tsconfig.json
new file mode 100644
index 0000000000..71e1b18a1e
--- /dev/null
+++ b/finalhandler/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "finalhandler-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/findup-sync/findup-sync-tests.ts b/findup-sync/findup-sync-tests.ts
index 55eab36177..86e34040ef 100644
--- a/findup-sync/findup-sync-tests.ts
+++ b/findup-sync/findup-sync-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="./findup-sync.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import findup = require('findup-sync');
 
diff --git a/findup-sync/findup-sync.d.ts b/findup-sync/findup-sync.d.ts
deleted file mode 100644
index 71ff2672cd..0000000000
--- a/findup-sync/findup-sync.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Type definitions for findup-sync v0.3.0
-// Project: https://github.com/cowboy/node-findup-sync
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Nathan Brown <https://github.com/ngbrown>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../minimatch/minimatch.d.ts" />
-
-declare module 'findup-sync' {
-	import minimatch = require('minimatch');
-
-	interface IOptions extends minimatch.IOptions {
-		cwd?: string;
-	}
-
-	function mod(pattern: string[] | string, opts?: IOptions): string;
-
-	export = mod;
-}
diff --git a/findup-sync/index.d.ts b/findup-sync/index.d.ts
new file mode 100644
index 0000000000..bd06c12d46
--- /dev/null
+++ b/findup-sync/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for findup-sync v0.3.0
+// Project: https://github.com/cowboy/node-findup-sync
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Nathan Brown <https://github.com/ngbrown>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import minimatch = require('minimatch');
+
+interface IOptions extends minimatch.IOptions {
+    cwd?: string;
+}
+
+declare function mod(pattern: string[] | string, opts?: IOptions): string;
+
+export = mod;
diff --git a/findup-sync/tsconfig.json b/findup-sync/tsconfig.json
new file mode 100644
index 0000000000..de430e0369
--- /dev/null
+++ b/findup-sync/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "findup-sync-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fingerprintjs/fingerprint-tests.ts b/fingerprintjs/fingerprint-tests.ts
index 8b07898709..a71983cdee 100644
--- a/fingerprintjs/fingerprint-tests.ts
+++ b/fingerprintjs/fingerprint-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="fingerprint.d.ts"/>
-
 function test_no_option() {
   var fingerprint = new Fingerprint().get();
 }
diff --git a/fingerprintjs/fingerprint.d.ts b/fingerprintjs/index.d.ts
similarity index 100%
rename from fingerprintjs/fingerprint.d.ts
rename to fingerprintjs/index.d.ts
diff --git a/fingerprintjs/tsconfig.json b/fingerprintjs/tsconfig.json
new file mode 100644
index 0000000000..68b135110b
--- /dev/null
+++ b/fingerprintjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "fingerprint-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/firebase-client/firebase-client-tests.ts b/firebase-client/firebase-client-tests.ts
index bc4ef06a8e..0b79ec75d6 100644
--- a/firebase-client/firebase-client-tests.ts
+++ b/firebase-client/firebase-client-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="firebase-client.d.ts" />
+
 
 //Class definitions for type safety
 class Name{
diff --git a/firebase-client/firebase-client.d.ts b/firebase-client/firebase-client.d.ts
deleted file mode 100644
index 3e30e1667d..0000000000
--- a/firebase-client/firebase-client.d.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-// Type definitions for Firebase Client 0.1.0
-// Project: https://www.github.com/jpstevens/firebase-client
-// Definitions by: Andrew Breen <https://github.com/fpsscarecrow/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/// <reference path="../q/Q.d.ts" />
-
-interface PushResponse {
-	/**
-	 * Name ref (key) of the child resource
-	 */
-	name : string;
-}
-
-interface FirebaseConfig {
-	/**
-	 * path for the Firebase instance
-	 */
-	url : string;
-	
-	/**
-	 * Token for authorisation
-	 */
-	auth: string;
-}
-
-interface FirebaseClient {
-	/**
-	 * Creates a new FirebaseClient given the provided configuration
-	 */
-	new (config : FirebaseConfig) : FirebaseClient;
-	
-	/**
-	 * Retrieves all objects at the base path
-	 */
-	get<T>() : Q.Promise<T>;
-	
-	/**
-	 * Retrieves an object
-	 * @param path Relative path from the base for the resource
-	 */
-	get<T>(path : string) : Q.Promise<T>;
-	
-	/**
-	 * Returns a promise of the HTTP response from setting the value at the given path
-	 * @param path Relative path from the base for the resource
-	 * @param data Data to be set as the value for the given path
-	 */
-	set<T>(path : string, data : T) : Q.Promise<T>;
-	
-	/**
-	 * Update a node at a given path
-	 * @param path Relative path from the base for the resource
-	 * @param value Value of the response
-	 */
-	update<T>(path : string, value : T) : Q.Promise<T>;
-	
-	/**
-	 * Deletes the resource at a given path
-	 * @param path Relative path from the base for the resource
-	 */
-	delete(path : string) :  Q.Promise<void>;
-	
-	/**
-	 * @param path Relative path from the base for the resource
-	 * @param value Object to push to the path
-	 */
-	push<T>(path : string, value : T) : Q.Promise<PushResponse>;
-}
-
-declare var FirebaseClient: FirebaseClient;
-
-declare module 'firebase-client' {
-	export = FirebaseClient;
-}
-
diff --git a/firebase-client/index.d.ts b/firebase-client/index.d.ts
new file mode 100644
index 0000000000..0ffc672a4d
--- /dev/null
+++ b/firebase-client/index.d.ts
@@ -0,0 +1,75 @@
+// Type definitions for Firebase Client 0.1.0
+// Project: https://www.github.com/jpstevens/firebase-client
+// Definitions by: Andrew Breen <https://github.com/fpsscarecrow/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/// <reference types="Q" />
+
+interface PushResponse {
+	/**
+	 * Name ref (key) of the child resource
+	 */
+	name : string;
+}
+
+interface FirebaseConfig {
+	/**
+	 * path for the Firebase instance
+	 */
+	url : string;
+	
+	/**
+	 * Token for authorisation
+	 */
+	auth: string;
+}
+
+interface FirebaseClient {
+	/**
+	 * Creates a new FirebaseClient given the provided configuration
+	 */
+	new (config : FirebaseConfig) : FirebaseClient;
+	
+	/**
+	 * Retrieves all objects at the base path
+	 */
+	get<T>() : Q.Promise<T>;
+	
+	/**
+	 * Retrieves an object
+	 * @param path Relative path from the base for the resource
+	 */
+	get<T>(path : string) : Q.Promise<T>;
+	
+	/**
+	 * Returns a promise of the HTTP response from setting the value at the given path
+	 * @param path Relative path from the base for the resource
+	 * @param data Data to be set as the value for the given path
+	 */
+	set<T>(path : string, data : T) : Q.Promise<T>;
+	
+	/**
+	 * Update a node at a given path
+	 * @param path Relative path from the base for the resource
+	 * @param value Value of the response
+	 */
+	update<T>(path : string, value : T) : Q.Promise<T>;
+	
+	/**
+	 * Deletes the resource at a given path
+	 * @param path Relative path from the base for the resource
+	 */
+	delete(path : string) :  Q.Promise<void>;
+	
+	/**
+	 * @param path Relative path from the base for the resource
+	 * @param value Object to push to the path
+	 */
+	push<T>(path : string, value : T) : Q.Promise<PushResponse>;
+}
+
+declare var FirebaseClient: FirebaseClient;
+
+declare module 'firebase-client' {
+	export = FirebaseClient;
+}
+
diff --git a/firebase-client/tsconfig.json b/firebase-client/tsconfig.json
new file mode 100644
index 0000000000..5ef70a225e
--- /dev/null
+++ b/firebase-client/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "firebase-client-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/firebase-token-generator/firebase-token-generator-test.ts.tscparams.ts b/firebase-token-generator/firebase-token-generator-test.ts.tscparams.ts
deleted file mode 100644
index 155c6fe9e3..0000000000
--- a/firebase-token-generator/firebase-token-generator-test.ts.tscparams.ts
+++ /dev/null
@@ -1 +0,0 @@
---module commonjs
\ No newline at end of file
diff --git a/firebase-token-generator/firebase-token-generator-tests.ts b/firebase-token-generator/firebase-token-generator-tests.ts
index 7dc25b6a0b..c7020ee9fe 100644
--- a/firebase-token-generator/firebase-token-generator-tests.ts
+++ b/firebase-token-generator/firebase-token-generator-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="firebase-token-generator.d.ts"/>
 import FirebaseTokenGenerator = require('firebase-token-generator');
 
 const tokenGenerator: FirebaseTokenGenerator = new FirebaseTokenGenerator("MY_SECRET");
diff --git a/firebase-token-generator/firebase-token-generator.d.ts b/firebase-token-generator/index.d.ts
similarity index 100%
rename from firebase-token-generator/firebase-token-generator.d.ts
rename to firebase-token-generator/index.d.ts
diff --git a/firebase-token-generator/tsconfig.json b/firebase-token-generator/tsconfig.json
new file mode 100644
index 0000000000..1b39b7305b
--- /dev/null
+++ b/firebase-token-generator/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "firebase-token-generator-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/firebase/firebase-simplelogin-tests.ts b/firebase/firebase-simplelogin-tests.ts
index e0be13e488..a68f98aba3 100644
--- a/firebase/firebase-simplelogin-tests.ts
+++ b/firebase/firebase-simplelogin-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./firebase-simplelogin.d.ts" />
+
 
 var chatRef: Firebase = new Firebase('https://<YOUR-FIREBASE>.firebaseio.com');
 var auth: FirebaseSimpleLogin = new FirebaseSimpleLogin(chatRef, function(error, user) {
diff --git a/firebase/firebase-simplelogin.d.ts b/firebase/firebase-simplelogin.d.ts
index 3eb22d87f8..b64638bd34 100644
--- a/firebase/firebase-simplelogin.d.ts
+++ b/firebase/firebase-simplelogin.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Wilker Lucio <http://github.com/wilkerlucio>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./firebase.d.ts" />
+
 
 interface IFirebaseSimpleLoginError {
     code: string;
diff --git a/firebase/firebase-tests.ts b/firebase/firebase-tests.ts
index 2596e058c8..dc144552ea 100644
--- a/firebase/firebase-tests.ts
+++ b/firebase/firebase-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="firebase.d.ts" />
+
 var AUTH_TOKEN: string = "12345";
 var dataRef:Firebase = new Firebase("https://SampleChat.firebaseio-demo.com/");
 //Log me in
diff --git a/firebase/firebase.d.ts b/firebase/firebase.d.ts
deleted file mode 100644
index cceaaf506f..0000000000
--- a/firebase/firebase.d.ts
+++ /dev/null
@@ -1,378 +0,0 @@
-// Type definitions for Firebase API 2.4.1
-// Project: https://www.firebase.com/docs/javascript/firebase
-// Definitions by: Vincent Botone <https://github.com/vbortone/>, Shin1 Kashimura <https://github.com/in-async/>, Sebastien Dubois <https://github.com/dsebastien/>, Szymon Stasik <https://github.com/ciekawy/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface FirebaseAuthResult {
-	auth: any;
-	expires: number;
-}
-
-interface FirebaseDataSnapshot {
-	/**
-	 * Returns true if this DataSnapshot contains any data.
-	 * It is slightly more efficient than using snapshot.val() !== null.
-	 */
-	exists(): boolean;
-	/**
-	 * Gets the JavaScript object representation of the DataSnapshot.
-	 */
-	val(): any;
-	/**
-	 * Gets a DataSnapshot for the location at the specified relative path.
-	 */
-	child(childPath: string): FirebaseDataSnapshot;
-	/**
-	 * Enumerates through the DataSnapshot’s children (in the default order).
-	 */
-	forEach(childAction: (childSnapshot: FirebaseDataSnapshot) => void): boolean;
-	forEach(childAction: (childSnapshot: FirebaseDataSnapshot) => boolean): boolean;
-	/**
-	 * Returns true if the specified child exists.
-	 */
-	hasChild(childPath: string): boolean;
-	/**
-	 * Returns true if the DataSnapshot has any children.
-	 */
-	hasChildren(): boolean;
-	/**
-	 * Gets the key name of the location that generated this DataSnapshot.
-	 */
-	key(): string;
-	/**
-	 * @deprecated Use key() instead.
-	 * Gets the key name of the location that generated this DataSnapshot.
-	 */
-	name(): string;
-	/**
-	 * Gets the number of children for this DataSnapshot.
-	 */
-	numChildren(): number;
-	/**
-	 * Gets the Firebase reference for the location that generated this DataSnapshot.
-	 */
-	ref(): Firebase;
-	/**
-	 * Gets the priority of the data in this DataSnapshot.
-	 * @returns {string, number, null} The priority, or null if no priority was set.
-	 */
-	getPriority(): any; // string or number
-	/**
-	 * Exports the entire contents of the DataSnapshot as a JavaScript object.
-	 */
-	exportVal(): Object;
-}
-
-interface FirebaseOnDisconnect {
-	/**
-	 * Ensures the data at this location is set to the specified value when the client is disconnected
-	 * (due to closing the browser, navigating to a new page, or network issues).
-	 */
-	set(value: any, onComplete: (error: any) => void): void;
-	set(value: any): Promise<void>;
-	/**
-	 * Ensures the data at this location is set to the specified value and priority when the client is disconnected
-	 * (due to closing the browser, navigating to a new page, or network issues).
-	 */
-	setWithPriority(value: any, priority: string|number, onComplete: (error: any) => void): void;
-	setWithPriority(value: any, priority: string|number): Promise<void>;
-	/**
-	 * Writes the enumerated children at this Firebase location when the client is disconnected
-	 * (due to closing the browser, navigating to a new page, or network issues).
-	 */
-	update(value: Object, onComplete: (error: any) => void): void;
-	update(value: Object): Promise<void>;
-	/**
-	 * Ensures the data at this location is deleted when the client is disconnected
-	 * (due to closing the browser, navigating to a new page, or network issues).
-	 */
-	remove(onComplete: (error: any) => void): void;
-	remove(): Promise<void>;
-	/**
-	 * Cancels all previously queued onDisconnect() set or update events for this location and all children.
-	 */
-	cancel(onComplete: (error: any) => void): void;
-	cancel(): Promise<void>;
-}
-
-interface FirebaseQuery {
-	/**
-	 * Listens for data changes at a particular location.
-	 */
-	on(eventType: string, callback: (dataSnapshot: FirebaseDataSnapshot, prevChildName?: string) => void, cancelCallback?: (error: any) => void, context?: Object): (dataSnapshot: FirebaseDataSnapshot, prevChildName?: string) => void;
-	/**
-	 * Detaches a callback previously attached with on().
-	 */
-	off(eventType?: string, callback?: (dataSnapshot: FirebaseDataSnapshot, prevChildName?: string) => void, context?: Object): void;
-	/**
-	 * Listens for exactly one event of the specified event type, and then stops listening.
-	 */
-	once(eventType: string, successCallback: (dataSnapshot: FirebaseDataSnapshot) => void, context?: Object): void;
-	once(eventType: string, successCallback: (dataSnapshot: FirebaseDataSnapshot) => void, failureCallback?: (error: any) => void, context?: Object): void;
-	once(eventType: string): Promise<FirebaseDataSnapshot>
-	/**
-	 * Generates a new Query object ordered by the specified child key.
-	 */
-	orderByChild(key: string): FirebaseQuery;
-	/**
-	 * Generates a new Query object ordered by key name.
-	 */
-	orderByKey(): FirebaseQuery;
-	/**
-	 * Generates a new Query object ordered by child values.
-	 */
-	orderByValue(): FirebaseQuery;
-	/**
-	 * Generates a new Query object ordered by priority.
-	 */
-	orderByPriority(): FirebaseQuery;
-	/**
-	 * @deprecated Use limitToFirst() and limitToLast() instead.
-	 * Generates a new Query object limited to the specified number of children.
-	 */
-	limit(limit: number): FirebaseQuery;
-	/**
-	 * Creates a Query with the specified starting point.
-	 * The generated Query includes children which match the specified starting point.
-	 */
-	startAt(value: string, key?: string): FirebaseQuery;
-	startAt(value: number, key?: string): FirebaseQuery;
-	/**
-	 * Creates a Query with the specified ending point.
-	 * The generated Query includes children which match the specified ending point.
-	 */
-	endAt(value: string, key?: string): FirebaseQuery;
-	endAt(value: number, key?: string): FirebaseQuery;
-	/**
-	 * Creates a Query which includes children which match the specified value.
-	 */
-	equalTo(value: string|number|boolean, key?: string): FirebaseQuery;
-	/**
-	 * Generates a new Query object limited to the first certain number of children.
-	 */
-	limitToFirst(limit: number): FirebaseQuery;
-	/**
-	 * Generates a new Query object limited to the last certain number of children.
-	 */
-	limitToLast(limit: number): FirebaseQuery;
-	/**
-	 * Gets a Firebase reference to the Query's location.
-	 */
-	ref(): Firebase;
-}
-
-interface Firebase extends FirebaseQuery {
-	/**
-	 * @deprecated Use authWithCustomToken() instead.
-	 * Authenticates a Firebase client using the provided authentication token or Firebase Secret.
-	 */
-	auth(authToken: string, onComplete: (error: any, result: FirebaseAuthResult) => void, onCancel?:(error: any) => void): void;
-	auth(authToken: string): Promise<FirebaseAuthResult>;
-	/**
-	 * Authenticates a Firebase client using an authentication token or Firebase Secret.
-	 */
-	authWithCustomToken(autoToken: string, onComplete: (error: any, authData: FirebaseAuthData) => void, options?:Object): void;
-	authWithCustomToken(autoToken: string, options?:Object): Promise<FirebaseAuthData>;
-	/**
-	 * Authenticates a Firebase client using a new, temporary guest account.
-	 */
-	authAnonymously(onComplete: (error: any, authData: FirebaseAuthData) => void, options?: Object): void;
-	authAnonymously(options?: Object): Promise<FirebaseAuthData>;
-	/**
-	 * Authenticates a Firebase client using an email / password combination.
-	 */
-	authWithPassword(credentials: FirebaseCredentials, onComplete: (error: any, authData: FirebaseAuthData) => void, options?: Object): void;
-	authWithPassword(credentials: FirebaseCredentials, options?: Object): Promise<FirebaseAuthData>;
-	/**
-	 * Authenticates a Firebase client using a popup-based OAuth flow.
-	 */
-	authWithOAuthPopup(provider: string, onComplete:(error: any, authData: FirebaseAuthData) => void, options?: Object): void;
-	authWithOAuthPopup(provider: string, options?: Object): Promise<FirebaseAuthData>;
-	/**
-	 * Authenticates a Firebase client using a redirect-based OAuth flow.
-	 */
-	authWithOAuthRedirect(provider: string, onComplete: (error: any) => void, options?: Object): void;
-	authWithOAuthRedirect(provider: string, options?: Object): Promise<void>;
-	/**
-	 * Authenticates a Firebase client using OAuth access tokens or credentials.
-	 */
-	authWithOAuthToken(provider: string, credentials: string|Object, onComplete: (error: any, authData: FirebaseAuthData) => void, options?: Object): void;
-	authWithOAuthToken(provider: string, credentials: string|Object, options?: Object): Promise<FirebaseAuthData>;
-	/**
-	 * Synchronously access the current authentication state of the client.
-	 */
-	getAuth(): FirebaseAuthData;
-	/**
-	 * Listen for changes to the client's authentication state.
-	 */
-	onAuth(onComplete: (authData: FirebaseAuthData) => void, context?: Object): void;
-	/**
-	 * Detaches a callback previously attached with onAuth().
-	 */
-	offAuth(onComplete: (authData: FirebaseAuthData) => void, context?: Object): void;
-	/**
-	 * Unauthenticates a Firebase client.
-	 */
-	unauth(): void;
-	/**
-	 * Gets a Firebase reference for the location at the specified relative path.
-	 */
-	child(childPath: string): Firebase;
-	/**
-	 * Gets a Firebase reference to the parent location.
-	 */
-	parent(): Firebase;
-	/**
-	 * Gets a Firebase reference to the root of the Firebase.
-	 */
-	root(): Firebase;
-	/**
-	 * Returns the last token in a Firebase location.
-	 */
-	key(): string;
-	/**
-	 * @deprecated Use key() instead.
-	 * Returns the last token in a Firebase location.
-	 */
-	name(): string;
-	/**
-	 * Gets the absolute URL corresponding to this Firebase reference's location.
-	 */
-	toString(): string;
-	/**
-	 * Writes data to this Firebase location.
-	 */
-	set(value: any, onComplete: (error: any) => void): void;
-	set(value: any): Promise<void>;
-	/**
-	 * Writes the enumerated children to this Firebase location.
-	 */
-	update(value: Object, onComplete: (error: any) => void): void;
-	update(value: Object): Promise<void>;
-	/**
-	 * Removes the data at this Firebase location.
-	 */
-	remove(onComplete: (error: any) => void): void;
-	remove(): Promise<void>;
-	/**
-	 * Generates a new child location using a unique name and returns a Firebase reference to it.
-	 * @returns {Firebase} A Firebase reference for the generated location.
-	 */
-	push(value?: any, onComplete?: (error: any) => void): FirebaseWithPromise<void>;
-	/**
-	 * Writes data to this Firebase location. Like set() but also specifies the priority for that data.
-	 */
-	setWithPriority(value: any, priority: string|number, onComplete: (error: any) => void): void;
-	setWithPriority(value: any, priority: string|number): Promise<void>;
-	/**
-	 * Sets a priority for the data at this Firebase location.
-	 */
-	setPriority(priority: string|number, onComplete: (error: any) => void): void;
-	setPriority(priority: string|number): Promise<void>;
-	/**
-	 * Atomically modifies the data at this location.
-	 */
-	transaction(updateFunction: (currentData: any)=> any, onComplete?: (error: any, committed: boolean, snapshot: FirebaseDataSnapshot) => void, applyLocally?: boolean): void;
-	/**
-	 * Creates a new user account using an email / password combination.
-	 */
-	createUser(credentials: FirebaseCredentials, onComplete: (error: any, userData: any) => void): void;
-	/**
-	 * Updates the email associated with an email / password user account.
-	 */
-	changeEmail(credentials: FirebaseChangeEmailCredentials, onComplete: (error: any) => void): void;
-	/**
-	 * Change the password of an existing user using an email / password combination.
-	 */
-	changePassword(credentials: FirebaseChangePasswordCredentials, onComplete: (error: any) => void): void;
-	/**
-	 * Removes an existing user account using an email / password combination.
-	 */
-	removeUser(credentials: FirebaseCredentials, onComplete: (error: any) => void): void;
-	/**
-	 * Sends a password-reset email to the owner of the account, containing a token that may be used to authenticate and change the user password.
-	 */
-	resetPassword(credentials: FirebaseResetPasswordCredentials, onComplete: (error: any) => void): void;
-	onDisconnect(): FirebaseOnDisconnect;
-}
-
-interface FirebaseWithPromise<T> extends Firebase, Promise<T> {}
-
-interface FirebaseStatic {
-	/**
-	 * Constructs a new Firebase reference from a full Firebase URL.
-	 */
-	new (firebaseURL: string): Firebase;
-	/**
-	 * Manually disconnects the Firebase client from the server and disables automatic reconnection.
-	 */
-	goOffline(): void;
-	/**
-	 * Manually reestablishes a connection to the Firebase server and enables automatic reconnection.
-	 */
-	goOnline(): void;
-
-	ServerValue: {
-		/**
-		 * A placeholder value for auto-populating the current timestamp
-		 * (time since the Unix epoch, in milliseconds) by the Firebase servers.
-		 */
-		TIMESTAMP: any;
-	};
-}
-declare var Firebase: FirebaseStatic;
-
-declare module 'firebase' {
-	export = Firebase;
-}
-
-// Reference: https://www.firebase.com/docs/web/api/firebase/getauth.html
-interface FirebaseAuthData {
-	uid: string;
-	provider: string;
-	token: string;
-	expires: number;
-	auth: Object;
-	google?: FirebaseAuthDataGoogle;
-}
-
-interface FirebaseAuthDataGoogle {
-	accessToken: string;
-	cachedUserProfile: FirebaseAuthDataGoogleCachedUserProfile;
-	displayName: string;
-	email?: string;
-	id: string;
-	profileImageURL: string;
-}
-
-interface FirebaseAuthDataGoogleCachedUserProfile {
-	"family name"?: string;
-	gender?: string;
-	"given name"?: string;
-	id?: string;
-	link?: string;
-	locale?: string;
-	name?: string;
-	picture?: string;
-}
-
-interface FirebaseCredentials {
-	email: string;
-	password: string;
-}
-
-interface FirebaseChangePasswordCredentials {
-	email: string;
-	oldPassword: string;
-	newPassword: string;
-}
-
-interface FirebaseChangeEmailCredentials {
-	oldEmail: string;
-	newEmail: string;
-	password: string;
-}
-
-interface FirebaseResetPasswordCredentials {
-	email: string;
-}
diff --git a/firebase/index.d.ts b/firebase/index.d.ts
new file mode 100644
index 0000000000..132973e916
--- /dev/null
+++ b/firebase/index.d.ts
@@ -0,0 +1,418 @@
+// Type definitions for Firebase API 2.4.1
+// Project: https://www.firebase.com/docs/javascript/firebase
+// Definitions by: Vincent Botone <https://github.com/vbortone/>, Shin1 Kashimura <https://github.com/in-async/>, Sebastien Dubois <https://github.com/dsebastien/>, Szymon Stasik <https://github.com/ciekawy/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface FirebaseAuthResult {
+	auth: any;
+	expires: number;
+}
+
+interface FirebaseDataSnapshot {
+	/**
+	 * Returns true if this DataSnapshot contains any data.
+	 * It is slightly more efficient than using snapshot.val() !== null.
+	 */
+	exists(): boolean;
+	/**
+	 * Gets the JavaScript object representation of the DataSnapshot.
+	 */
+	val(): any;
+	/**
+	 * Gets a DataSnapshot for the location at the specified relative path.
+	 */
+	child(childPath: string): FirebaseDataSnapshot;
+	/**
+	 * Enumerates through the DataSnapshot’s children (in the default order).
+	 */
+	forEach(childAction: (childSnapshot: FirebaseDataSnapshot) => void): boolean;
+	forEach(childAction: (childSnapshot: FirebaseDataSnapshot) => boolean): boolean;
+	/**
+	 * Returns true if the specified child exists.
+	 */
+	hasChild(childPath: string): boolean;
+	/**
+	 * Returns true if the DataSnapshot has any children.
+	 */
+	hasChildren(): boolean;
+	/**
+	 * Gets the key name of the location that generated this DataSnapshot.
+	 */
+	key(): string;
+	/**
+	 * @deprecated Use key() instead.
+	 * Gets the key name of the location that generated this DataSnapshot.
+	 */
+	name(): string;
+	/**
+	 * Gets the number of children for this DataSnapshot.
+	 */
+	numChildren(): number;
+	/**
+	 * Gets the Firebase reference for the location that generated this DataSnapshot.
+	 */
+	ref(): Firebase;
+	/**
+	 * Gets the priority of the data in this DataSnapshot.
+	 * @returns {string, number, null} The priority, or null if no priority was set.
+	 */
+	getPriority(): any; // string or number
+	/**
+	 * Exports the entire contents of the DataSnapshot as a JavaScript object.
+	 */
+	exportVal(): Object;
+}
+
+interface FirebaseOnDisconnect {
+	/**
+	 * Ensures the data at this location is set to the specified value when the client is disconnected
+	 * (due to closing the browser, navigating to a new page, or network issues).
+	 */
+	set(value: any, onComplete: (error: any) => void): void;
+	set(value: any): Promise<void>;
+	/**
+	 * Ensures the data at this location is set to the specified value and priority when the client is disconnected
+	 * (due to closing the browser, navigating to a new page, or network issues).
+	 */
+	setWithPriority(value: any, priority: string|number, onComplete: (error: any) => void): void;
+	setWithPriority(value: any, priority: string|number): Promise<void>;
+	/**
+	 * Writes the enumerated children at this Firebase location when the client is disconnected
+	 * (due to closing the browser, navigating to a new page, or network issues).
+	 */
+	update(value: Object, onComplete: (error: any) => void): void;
+	update(value: Object): Promise<void>;
+	/**
+	 * Ensures the data at this location is deleted when the client is disconnected
+	 * (due to closing the browser, navigating to a new page, or network issues).
+	 */
+	remove(onComplete: (error: any) => void): void;
+	remove(): Promise<void>;
+	/**
+	 * Cancels all previously queued onDisconnect() set or update events for this location and all children.
+	 */
+	cancel(onComplete: (error: any) => void): void;
+	cancel(): Promise<void>;
+}
+
+interface FirebaseQuery {
+	/**
+	 * Listens for data changes at a particular location.
+	 */
+	on(eventType: string, callback: (dataSnapshot: FirebaseDataSnapshot, prevChildName?: string) => void, cancelCallback?: (error: any) => void, context?: Object): (dataSnapshot: FirebaseDataSnapshot, prevChildName?: string) => void;
+	/**
+	 * Detaches a callback previously attached with on().
+	 */
+	off(eventType?: string, callback?: (dataSnapshot: FirebaseDataSnapshot, prevChildName?: string) => void, context?: Object): void;
+	/**
+	 * Listens for exactly one event of the specified event type, and then stops listening.
+	 */
+	once(eventType: string, successCallback: (dataSnapshot: FirebaseDataSnapshot) => void, context?: Object): void;
+	once(eventType: string, successCallback: (dataSnapshot: FirebaseDataSnapshot) => void, failureCallback?: (error: any) => void, context?: Object): void;
+	once(eventType: string): Promise<FirebaseDataSnapshot>
+	/**
+	 * Generates a new Query object ordered by the specified child key.
+	 */
+	orderByChild(key: string): FirebaseQuery;
+	/**
+	 * Generates a new Query object ordered by key name.
+	 */
+	orderByKey(): FirebaseQuery;
+	/**
+	 * Generates a new Query object ordered by child values.
+	 */
+	orderByValue(): FirebaseQuery;
+	/**
+	 * Generates a new Query object ordered by priority.
+	 */
+	orderByPriority(): FirebaseQuery;
+	/**
+	 * @deprecated Use limitToFirst() and limitToLast() instead.
+	 * Generates a new Query object limited to the specified number of children.
+	 */
+	limit(limit: number): FirebaseQuery;
+	/**
+	 * Creates a Query with the specified starting point.
+	 * The generated Query includes children which match the specified starting point.
+	 */
+	startAt(value: string, key?: string): FirebaseQuery;
+	startAt(value: number, key?: string): FirebaseQuery;
+	/**
+	 * Creates a Query with the specified ending point.
+	 * The generated Query includes children which match the specified ending point.
+	 */
+	endAt(value: string, key?: string): FirebaseQuery;
+	endAt(value: number, key?: string): FirebaseQuery;
+	/**
+	 * Creates a Query which includes children which match the specified value.
+	 */
+	equalTo(value: string|number|boolean, key?: string): FirebaseQuery;
+	/**
+	 * Generates a new Query object limited to the first certain number of children.
+	 */
+	limitToFirst(limit: number): FirebaseQuery;
+	/**
+	 * Generates a new Query object limited to the last certain number of children.
+	 */
+	limitToLast(limit: number): FirebaseQuery;
+	/**
+	 * Gets a Firebase reference to the Query's location.
+	 */
+	ref(): Firebase;
+}
+
+interface Firebase extends FirebaseQuery {
+	/**
+	 * @deprecated Use authWithCustomToken() instead.
+	 * Authenticates a Firebase client using the provided authentication token or Firebase Secret.
+	 */
+	auth(authToken: string, onComplete: (error: any, result: FirebaseAuthResult) => void, onCancel?:(error: any) => void): void;
+	auth(authToken: string): Promise<FirebaseAuthResult>;
+	/**
+	 * Authenticates a Firebase client using an authentication token or Firebase Secret.
+	 */
+	authWithCustomToken(autoToken: string, onComplete: (error: any, authData: FirebaseAuthData) => void, options?:Object): void;
+	authWithCustomToken(autoToken: string, options?:Object): Promise<FirebaseAuthData>;
+	/**
+	 * Authenticates a Firebase client using a new, temporary guest account.
+	 */
+	authAnonymously(onComplete: (error: any, authData: FirebaseAuthData) => void, options?: Object): void;
+	authAnonymously(options?: Object): Promise<FirebaseAuthData>;
+	/**
+	 * Authenticates a Firebase client using an email / password combination.
+	 */
+	authWithPassword(credentials: FirebaseCredentials, onComplete: (error: any, authData: FirebaseAuthData) => void, options?: Object): void;
+	authWithPassword(credentials: FirebaseCredentials, options?: Object): Promise<FirebaseAuthData>;
+	/**
+	 * Authenticates a Firebase client using a popup-based OAuth flow.
+	 */
+	authWithOAuthPopup(provider: string, onComplete:(error: any, authData: FirebaseAuthData) => void, options?: Object): void;
+	authWithOAuthPopup(provider: string, options?: Object): Promise<FirebaseAuthData>;
+	/**
+	 * Authenticates a Firebase client using a redirect-based OAuth flow.
+	 */
+	authWithOAuthRedirect(provider: string, onComplete: (error: any) => void, options?: Object): void;
+	authWithOAuthRedirect(provider: string, options?: Object): Promise<void>;
+	/**
+	 * Authenticates a Firebase client using OAuth access tokens or credentials.
+	 */
+	authWithOAuthToken(provider: string, credentials: string|Object, onComplete: (error: any, authData: FirebaseAuthData) => void, options?: Object): void;
+	authWithOAuthToken(provider: string, credentials: string|Object, options?: Object): Promise<FirebaseAuthData>;
+	/**
+	 * Synchronously access the current authentication state of the client.
+	 */
+	getAuth(): FirebaseAuthData;
+	/**
+	 * Listen for changes to the client's authentication state.
+	 */
+	onAuth(onComplete: (authData: FirebaseAuthData) => void, context?: Object): void;
+	/**
+	 * Detaches a callback previously attached with onAuth().
+	 */
+	offAuth(onComplete: (authData: FirebaseAuthData) => void, context?: Object): void;
+	/**
+	 * Unauthenticates a Firebase client.
+	 */
+	unauth(): void;
+	/**
+	 * Gets a Firebase reference for the location at the specified relative path.
+	 */
+	child(childPath: string): Firebase;
+	/**
+	 * Gets a Firebase reference to the parent location.
+	 */
+	parent(): Firebase;
+	/**
+	 * Gets a Firebase reference to the root of the Firebase.
+	 */
+	root(): Firebase;
+	/**
+	 * Returns the last token in a Firebase location.
+	 */
+	key(): string;
+	/**
+	 * @deprecated Use key() instead.
+	 * Returns the last token in a Firebase location.
+	 */
+	name(): string;
+	/**
+	 * Gets the absolute URL corresponding to this Firebase reference's location.
+	 */
+	toString(): string;
+	/**
+	 * Writes data to this Firebase location.
+	 */
+	set(value: any, onComplete: (error: any) => void): void;
+	set(value: any): Promise<void>;
+	/**
+	 * Writes the enumerated children to this Firebase location.
+	 */
+	update(value: Object, onComplete: (error: any) => void): void;
+	update(value: Object): Promise<void>;
+	/**
+	 * Removes the data at this Firebase location.
+	 */
+	remove(onComplete: (error: any) => void): void;
+	remove(): Promise<void>;
+	/**
+	 * Generates a new child location using a unique name and returns a Firebase reference to it.
+	 * @returns {Firebase} A Firebase reference for the generated location.
+	 */
+	push(value?: any, onComplete?: (error: any) => void): FirebaseWithPromise<void>;
+	/**
+	 * Writes data to this Firebase location. Like set() but also specifies the priority for that data.
+	 */
+	setWithPriority(value: any, priority: string|number, onComplete: (error: any) => void): void;
+	setWithPriority(value: any, priority: string|number): Promise<void>;
+	/**
+	 * Sets a priority for the data at this Firebase location.
+	 */
+	setPriority(priority: string|number, onComplete: (error: any) => void): void;
+	setPriority(priority: string|number): Promise<void>;
+	/**
+	 * Atomically modifies the data at this location.
+	 */
+	transaction(updateFunction: (currentData: any)=> any, onComplete?: (error: any, committed: boolean, snapshot: FirebaseDataSnapshot) => void, applyLocally?: boolean): void;
+	/**
+	 * Creates a new user account using an email / password combination.
+	 */
+	createUser(credentials: FirebaseCredentials, onComplete: (error: any, userData: any) => void): void;
+	/**
+	 * Updates the email associated with an email / password user account.
+	 */
+	changeEmail(credentials: FirebaseChangeEmailCredentials, onComplete: (error: any) => void): void;
+	/**
+	 * Change the password of an existing user using an email / password combination.
+	 */
+	changePassword(credentials: FirebaseChangePasswordCredentials, onComplete: (error: any) => void): void;
+	/**
+	 * Removes an existing user account using an email / password combination.
+	 */
+	removeUser(credentials: FirebaseCredentials, onComplete: (error: any) => void): void;
+	/**
+	 * Sends a password-reset email to the owner of the account, containing a token that may be used to authenticate and change the user password.
+	 */
+	resetPassword(credentials: FirebaseResetPasswordCredentials, onComplete: (error: any) => void): void;
+	onDisconnect(): FirebaseOnDisconnect;
+}
+
+interface FirebaseWithPromise<T> extends Firebase, Promise<T> {}
+
+interface FirebaseStatic {
+	/**
+	 * Constructs a new Firebase reference from a full Firebase URL.
+	 */
+	new (firebaseURL: string): Firebase;
+	/**
+	 * Manually disconnects the Firebase client from the server and disables automatic reconnection.
+	 */
+	goOffline(): void;
+	/**
+	 * Manually reestablishes a connection to the Firebase server and enables automatic reconnection.
+	 */
+	goOnline(): void;
+
+	ServerValue: {
+		/**
+		 * A placeholder value for auto-populating the current timestamp
+		 * (time since the Unix epoch, in milliseconds) by the Firebase servers.
+		 */
+		TIMESTAMP: any;
+	};
+}
+declare var Firebase: FirebaseStatic;
+
+declare module 'firebase' {
+	export = Firebase;
+}
+
+// Reference: https://www.firebase.com/docs/web/api/firebase/getauth.html
+interface FirebaseAuthData {
+	uid: string;
+	provider: string;
+	token: string;
+	expires: number;
+	auth: Object;
+	google?: FirebaseAuthDataGoogle;
+	twitter?: FirebaseAuthDataTwitter;
+	github?: FirebaseAuthDataGithub;
+	facebook?: FirebaseAuthDataFacebook;
+	password?: FirebaseAuthDataPassword;
+	anonymous?: any;
+}
+
+interface FirebaseAuthDataPassword{
+	email: string;
+	isTemporaryPassword: boolean;
+	profileImageURL: string;
+}
+
+interface FirebaseAuthDataTwitter{
+	id: string;
+	accessToken: string;
+	accessTokenSecret: string;
+	displayName: string;
+	username: string;
+	profileImageURL: string;
+	cachedUserProfile: any;
+}
+
+interface FirebaseAuthDataGithub{
+	id: string;
+	accessToken: string;
+	displayName: string;
+	email?: string;
+	username: string;
+	profileImageURL: string;
+	cachedUserProfile: any;
+}
+
+interface FirebaseAuthDataFacebook{
+	id: string;
+	accessToken: string;
+	displayName: string;
+	email?: string;
+	profileImageURL: string;
+	cachedUserProfile: any;
+}
+
+interface FirebaseAuthDataGoogle {
+	accessToken: string;
+	cachedUserProfile: FirebaseAuthDataGoogleCachedUserProfile;
+	displayName: string;
+	email?: string;
+	id: string;
+	profileImageURL: string;
+}
+
+interface FirebaseAuthDataGoogleCachedUserProfile {
+	"family name"?: string;
+	gender?: string;
+	"given name"?: string;
+	id?: string;
+	link?: string;
+	locale?: string;
+	name?: string;
+	picture?: string;
+}
+
+interface FirebaseCredentials {
+	email: string;
+	password: string;
+}
+
+interface FirebaseChangePasswordCredentials {
+	email: string;
+	oldPassword: string;
+	newPassword: string;
+}
+
+interface FirebaseChangeEmailCredentials {
+	oldEmail: string;
+	newEmail: string;
+	password: string;
+}
+
+interface FirebaseResetPasswordCredentials {
+	email: string;
+}
diff --git a/firebase/tsconfig.json b/firebase/tsconfig.json
new file mode 100644
index 0000000000..0cf46d8948
--- /dev/null
+++ b/firebase/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "firebase-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/firefox/firefox-tests.ts b/firefox/firefox-tests.ts
index 203539f54e..850b51b198 100644
--- a/firefox/firefox-tests.ts
+++ b/firefox/firefox-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="firefox.d.ts" />
+
 
 var manifestUrl = window.location.protocol + "//" + window.location.host + "/manifest.webapp";
 
diff --git a/firefox/firefox.d.ts b/firefox/index.d.ts
similarity index 100%
rename from firefox/firefox.d.ts
rename to firefox/index.d.ts
diff --git a/firefox/tsconfig.json b/firefox/tsconfig.json
new file mode 100644
index 0000000000..6d36adc76a
--- /dev/null
+++ b/firefox/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "firefox-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/first-mate/first-mate-tests.ts b/first-mate/first-mate-tests.ts
index 43e5848249..1f7fe0fc76 100644
--- a/first-mate/first-mate-tests.ts
+++ b/first-mate/first-mate-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./first-mate.d.ts" />
+
 
 import { GrammarRegistry, Grammar, IToken } from "first-mate";
 
diff --git a/first-mate/first-mate.d.ts b/first-mate/first-mate.d.ts
deleted file mode 100644
index ab2f77d84f..0000000000
--- a/first-mate/first-mate.d.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-// Type definitions for first-mate v4.1.7
-// Project: https://github.com/atom/first-mate/
-// Definitions by: Vadim Macagon <https://github.com/enlight/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../event-kit/event-kit.d.ts" />
-
-declare namespace AtomFirstMate {
-	type Disposable = AtomEventKit.Disposable;
-
-	interface IToken {
-		value: string;
-		scopes: string[];
-	}
-
-	/** Result returned by `Grammar.tokenizeLine`. */
-	interface TokenizeLineResult {
-		/** Text that was tokenized. */
-		line: string;
-		tags: any[];
-		/**
-		 * This is a dynamic property that will only be available if `Grammar.tokenizeLine` was called
-		 * with `compatibilityMode` set to `true` (the default).
-		 */
-		tokens?: IToken[];
-		/**
-		 * The tokenized state at the end of the line. This should be passed back into `tokenizeLine`
-		 * when tokenizing the next line in the file/buffer.
-		 */
-		ruleStack: Rule[]
-	}
-
-	/** Instance side of Rule class. */
-	interface Rule {
-	}
-
-	/** Static side of Grammar class. */
-	interface GrammarStatic {
-		prototype: Grammar;
-		new (registry: GrammarRegistry, options?: any): Grammar;
-	}
-
-	/** Instance side of Grammar class. */
-	interface Grammar {
-		constructor: GrammarStatic;
-		onDidUpdate(callback: Function): Disposable;
-		/**
-		 * Tokenizes all lines in a string.
-		 *
-		 * @param text A string containing one or more lines.
-		 * @return An array of token arrays, one token array per line.
-		 */
-		tokenizeLines(text: string): Array<Array<IToken>>;
-		/**
-		 * Tokenizes a line of text.
-		 *
-		 * @param line Text to be tokenized.
-		 * @param firstLine Indicates whether `line` is the first line in the file/buffer,
-		 *                  defaults to `false`.
-		 * @param compatibilityMode `true` by default.
-		 * @return An object containing tokens for the given line.
-		 */
-		tokenizeLine(
-			line: string, ruleStack?: Rule[], firstLine?: boolean, compatibilityMode?: boolean
-		): TokenizeLineResult;
-	}
-
-	/** Grammar that tokenizes lines of text. */
-	var Grammar: GrammarStatic;
-
-	/** Static side of GrammarRegistry class. */
-	interface GrammarRegistryStatic {
-		prototype: GrammarRegistry;
-		new (options?: { maxTokensPerLine: number }): GrammarRegistry;
-	}
-
-	/** Instance side of GrammarRegistry class. */
-	interface GrammarRegistry {
-		constructor: GrammarRegistryStatic;
-
-		// Event Subscription
-
-		onDidAddGrammar(callback: (grammar: Grammar) => void): Disposable;
-		onDidUpdateGrammar(callback: (grammar: Grammar) => void): Disposable;
-
-		// Managing Grammars
-
-		getGrammars(): Grammar[];
-		grammarForScopeName(scopeName: string): Grammar;
-		addGrammar(grammar: Grammar): Disposable;
-		removeGrammarForScopeName(scopeName: string): Grammar;
-		readGrammarSync(grammarPath: string): Grammar;
-		readGrammar(grammarPath: string, callback: (error: Error, grammar: Grammar) => void): void;
-		loadGrammarSync(grammarPath: string): Grammar;
-		loadGrammar(grammarPath: string, callback: (error: Error, grammar: Grammar) => void): void;
-		grammarOverrideForPath(filePath: string): Grammar;
-		setGrammarOverrideForPath(filePath: string, scopeName: string): Grammar;
-		clearGrammarOverrides(): void;
-		selectGrammar(filePath: string, fileContents: string): Grammar;
-	}
-
-	/** Registry containing one or more grammars. */
-	var GrammarRegistry: GrammarRegistryStatic;
-}
-
-declare module 'first-mate' {
-	export = AtomFirstMate;
-}
diff --git a/first-mate/index.d.ts b/first-mate/index.d.ts
new file mode 100644
index 0000000000..e46811aa85
--- /dev/null
+++ b/first-mate/index.d.ts
@@ -0,0 +1,107 @@
+// Type definitions for first-mate v4.1.7
+// Project: https://github.com/atom/first-mate/
+// Definitions by: Vadim Macagon <https://github.com/enlight/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="event-kit" />
+
+import * as AtomEventKit from "event-kit";
+export = AtomFirstMate;
+
+declare namespace AtomFirstMate {
+	type Disposable = AtomEventKit.Disposable;
+
+	interface IToken {
+		value: string;
+		scopes: string[];
+	}
+
+	/** Result returned by `Grammar.tokenizeLine`. */
+	interface TokenizeLineResult {
+		/** Text that was tokenized. */
+		line: string;
+		tags: any[];
+		/**
+		 * This is a dynamic property that will only be available if `Grammar.tokenizeLine` was called
+		 * with `compatibilityMode` set to `true` (the default).
+		 */
+		tokens?: IToken[];
+		/**
+		 * The tokenized state at the end of the line. This should be passed back into `tokenizeLine`
+		 * when tokenizing the next line in the file/buffer.
+		 */
+		ruleStack: Rule[]
+	}
+
+	/** Instance side of Rule class. */
+	interface Rule {
+	}
+
+	/** Static side of Grammar class. */
+	interface GrammarStatic {
+		prototype: Grammar;
+		new (registry: GrammarRegistry, options?: any): Grammar;
+	}
+
+	/** Instance side of Grammar class. */
+	interface Grammar {
+		constructor: GrammarStatic;
+		onDidUpdate(callback: Function): Disposable;
+		/**
+		 * Tokenizes all lines in a string.
+		 *
+		 * @param text A string containing one or more lines.
+		 * @return An array of token arrays, one token array per line.
+		 */
+		tokenizeLines(text: string): Array<Array<IToken>>;
+		/**
+		 * Tokenizes a line of text.
+		 *
+		 * @param line Text to be tokenized.
+		 * @param firstLine Indicates whether `line` is the first line in the file/buffer,
+		 *                  defaults to `false`.
+		 * @param compatibilityMode `true` by default.
+		 * @return An object containing tokens for the given line.
+		 */
+		tokenizeLine(
+			line: string, ruleStack?: Rule[], firstLine?: boolean, compatibilityMode?: boolean
+		): TokenizeLineResult;
+	}
+
+	/** Grammar that tokenizes lines of text. */
+	var Grammar: GrammarStatic;
+
+	/** Static side of GrammarRegistry class. */
+	interface GrammarRegistryStatic {
+		prototype: GrammarRegistry;
+		new (options?: { maxTokensPerLine: number }): GrammarRegistry;
+	}
+
+	/** Instance side of GrammarRegistry class. */
+	interface GrammarRegistry {
+		constructor: GrammarRegistryStatic;
+
+		// Event Subscription
+
+		onDidAddGrammar(callback: (grammar: Grammar) => void): Disposable;
+		onDidUpdateGrammar(callback: (grammar: Grammar) => void): Disposable;
+
+		// Managing Grammars
+
+		getGrammars(): Grammar[];
+		grammarForScopeName(scopeName: string): Grammar;
+		addGrammar(grammar: Grammar): Disposable;
+		removeGrammarForScopeName(scopeName: string): Grammar;
+		readGrammarSync(grammarPath: string): Grammar;
+		readGrammar(grammarPath: string, callback: (error: Error, grammar: Grammar) => void): void;
+		loadGrammarSync(grammarPath: string): Grammar;
+		loadGrammar(grammarPath: string, callback: (error: Error, grammar: Grammar) => void): void;
+		grammarOverrideForPath(filePath: string): Grammar;
+		setGrammarOverrideForPath(filePath: string, scopeName: string): Grammar;
+		clearGrammarOverrides(): void;
+		selectGrammar(filePath: string, fileContents: string): Grammar;
+	}
+
+	/** Registry containing one or more grammars. */
+	var GrammarRegistry: GrammarRegistryStatic;
+}
\ No newline at end of file
diff --git a/first-mate/tsconfig.json b/first-mate/tsconfig.json
new file mode 100644
index 0000000000..97fb3ce26b
--- /dev/null
+++ b/first-mate/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "first-mate-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fixed-data-table/fixed-data-table-0.4.7-tests.tsx b/fixed-data-table/fixed-data-table-0.4.7-tests.tsx
index 641487ff68..9e87f8ae5d 100644
--- a/fixed-data-table/fixed-data-table-0.4.7-tests.tsx
+++ b/fixed-data-table/fixed-data-table-0.4.7-tests.tsx
@@ -1,6 +1,6 @@
-/// <reference path="./fixed-data-table-0.4.7.d.ts"" />
-/// <reference path="../react/react.d.ts"/>
-/// <reference path="../react/react-dom.d.ts"/>
+
+/// <reference types="react"/>
+/// <reference types="react-dom"/>
 
 import * as React from "react";
 import * as ReactDOM from "react-dom";
diff --git a/fixed-data-table/fixed-data-table-0.4.7.d.ts b/fixed-data-table/fixed-data-table-0.4.7.d.ts
index c536165798..04fd6d32c1 100644
--- a/fixed-data-table/fixed-data-table-0.4.7.d.ts
+++ b/fixed-data-table/fixed-data-table-0.4.7.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Petar Paar <https://github.com/pepaar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../react/react.d.ts"/>
+/// <reference types="react"/>
 
 declare namespace FixedDataTable {
     export var version: string;
diff --git a/fixed-data-table/fixed-data-table-tests.tsx b/fixed-data-table/fixed-data-table-tests.tsx
index a5f1ab9f06..918ef29350 100644
--- a/fixed-data-table/fixed-data-table-tests.tsx
+++ b/fixed-data-table/fixed-data-table-tests.tsx
@@ -1,5 +1,5 @@
-/// <reference path="./fixed-data-table.d.ts"" />
-/// <reference path="../react/react.d.ts"/>
+
+/// <reference types="react"/>
 
 import * as React from "react";
 import {Table, Cell, Column, CellProps} from "fixed-data-table";
diff --git a/fixed-data-table/fixed-data-table.d.ts b/fixed-data-table/fixed-data-table.d.ts
deleted file mode 100644
index e4bc79ff51..0000000000
--- a/fixed-data-table/fixed-data-table.d.ts
+++ /dev/null
@@ -1,497 +0,0 @@
-// Type definitions for fixed-data-table 0.6.0
-// Project: https://github.com/facebook/fixed-data-table
-// Definitions by: Petar Paar <https://github.com/pepaar>, Stephen Jelfs <https://github.com/stephenjelfs>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts"/>
-
-declare namespace FixedDataTable {
-    export var version: string;
-
-    /**
-      * Data grid component with fixed or scrollable header and columns.
-      *
-      * The layout of the data table is as follows:
-      *
-      *
-      * +---------------------------------------------------+
-      * | Fixed Column Group    | Scrollable Column Group   |
-      * | Header                | Header                    |
-      * |                       |                           |
-      * +---------------------------------------------------+
-      * |                       |                           |
-      * | Fixed Header Columns  | Scrollable Header Columns |
-      * |                       |                           |
-      * +-----------------------+---------------------------+
-      * |                       |                           |
-      * | Fixed Body Columns    | Scrollable Body Columns   |
-      * |                       |                           |
-      * +-----------------------+---------------------------+
-      * |                       |                           |
-      * | Fixed Footer Columns  | Scrollable Footer Columns |
-      * |                       |                           |
-      * +-----------------------+---------------------------+
-      *
-      * Fixed Column Group Header:
-      *
-      * These are the headers for a group of columns if included in
-      * the table that do not scroll vertically or horizontally.
-      *
-      * Scrollable Column Group Header:
-      *
-      * The header for a group of columns that do not move while
-      * scrolling vertically, but move horizontally with the
-      * horizontal scrolling.
-      *
-      * Fixed Header Columns:
-      *
-      * The header columns that do not move while scrolling
-      * vertically or horizontally.
-      *
-      * Scrollable Header Columns:
-      *
-      * The header columns that do not move while scrolling
-      * vertically, but move horizontally with the horizontal scrolling.
-      *
-      * Fixed Body Columns:
-      *
-      * The body columns that do not move while scrolling
-      * horizontally, but move vertically with the vertical scrolling.
-      *
-      * Scrollable Body Columns:
-      *
-      * The body columns that move while scrolling vertically or
-      * horizontally.
-      *
-      */
-    export interface TableProps extends __React.Props<Table> {
-        /**
-          * Pixel width of table. If all columns do not fit, a
-          * horizontal scrollbar will appear.
-          */
-        width: number;
-
-        /**
-          * Pixel height of table. If all rows do not fit, a
-          * vertical scrollbar will appear.
-          *
-          * Either height or maxHeight must be specified.
-          */
-        height?: number;
-
-        /**
-          * Maximum pixel height of table. If all rows do not fit,
-          * a vertical scrollbar will appear.
-          *
-          * Either height or maxHeight must be specified.
-          */
-        maxHeight?: number;
-
-        /**
-          * Pixel height of table's owner, this is used in a managed
-          * scrolling situation when you want to slide the table up
-          * from below the fold without having to constantly update
-          * the height on every scroll tick. Instead, vary this
-          * property on scroll. By using ownerHeight, we over-render
-          * the table while making sure the footer and horizontal
-          * scrollbar of the table are visible when the current space
-          * for the table in view is smaller than the final,
-          * over-flowing height of table. It allows us to avoid
-          * resizing and reflowing table when it is moving in the
-          * view.
-          *
-          * This is used if ownerHeight < height (or maxHeight).
-          */
-        ownerHeight?: number;
-
-        /**
-          * 'hidden'|'auto'
-          */
-        overflowX?: string;
-
-        /**
-          * 'hidden'|'auto'
-          */
-        overflowY?: string;
-
-        /**
-          * Number of rows in the table.
-          */
-        rowsCount: number;
-
-        /**
-          * Pixel height of rows unless rowHeightGetter is specified
-          * and returns different value.
-          */
-        rowHeight: number;
-
-        /**
-          * If specified, rowHeightGetter(index) is called for each
-          * row and the returned value overrides rowHeight for
-          * particular row.
-          */
-        rowHeightGetter?: (index: number) => number;
-
-        /**
-          * To get any additional CSS classes that should be added to
-          *  a row, rowClassNameGetter(index) is called.
-          */
-        rowClassNameGetter?: (index: number) => string;
-
-        /**
-          * Pixel height of the column group header.
-          *
-          * defaultValue: 0
-          */
-        groupHeaderHeight?: number;
-
-        /**
-          * Pixel height of the header.
-          *
-          * defaultValue: 0
-          */
-        headerHeight?: number;
-
-        /**
-          * Pixel height of the footer.
-          *
-          * defaultValue: 0
-          */
-        footerHeight?: number;
-
-        /**
-          * Value of horizontal scroll.
-          *
-          * defaultValue: 0
-          */
-        scrollLeft?: number;
-
-        /**
-          * Index of column to scroll to.
-          */
-        scrollToColumn?: number;
-
-        /**
-          * Value of vertical scroll.
-          *
-          * defaultValue: 0
-          */
-        scrollTop?: number;
-
-        /**
-          * Index of row to scroll to.
-          */
-        scrollToRow?: number;
-
-        /**
-          * Callback that is called when scrolling starts with
-          * current horizontal and vertical scroll values.
-          */
-        onScrollStart?: (x: number, y: number) => void;
-
-        /**
-          * Callback that is called when scrolling ends or stops with
-          * new horizontal and vertical scroll values.
-          */
-        onScrollEnd?: (x: number, y: number) => void;
-
-        /**
-          * Callback that is called when rowHeightGetter returns a
-          * different height for a row than the rowHeight prop. This
-          *  is necessary because initially table estimates heights
-          * of some parts of the content.
-          */
-        onContentHeightChange?: (newHeight: number) => void;
-
-        /**
-          * Callback that is called when a row is clicked.
-          */
-        onRowClick?: (event: __React.SyntheticEvent, rowIndex: number) => void;
-
-        /**
-          * Callback that is called when a row is double clicked.
-          */
-        onRowDoubleClick?: (event: __React.SyntheticEvent, rowIndex: number) => void;
-
-        /**
-          * Callback that is called when a mouse-down event happens
-          * on a row.
-          */
-        onRowMouseDown?: (event: __React.SyntheticEvent, rowIndex: number) => void;
-
-        /**
-          * Callback that is called when a mouse-enter event happens
-          * on a row.
-          */
-        onRowMouseEnter?: (event: __React.SyntheticEvent, rowIndex: number) => void;
-
-        /**
-          * Callback that is called when a mouse-leave event happens
-          * on a row.
-          */
-        onRowMouseLeave?: (event: __React.SyntheticEvent, rowIndex: number) => void;
-
-        /**
-          * Callback that is called when resizer has been released
-          * and column needs to be updated.
-          *
-          * Required if the isResizable property is true on any
-          * column.
-          */
-        onColumnResizeEndCallback?: (newColumnWidth: number, columnKey: string) => void;
-
-        /**
-          * Whether a column is currently being resized.
-          */
-        isColumnResizing?: boolean;
-    }
-
-    /**
-     * Component that defines the attributes of table column.
-     */
-    interface ColumnProps extends __React.Props<Column> {
-        /**
-          * The horizontal alignment of the table cell content.
-          *
-          * 'left'|'center'|'right'
-          */
-        align?: string;
-
-        /**
-          * Controls if the column is fixed when scrolling in the X
-          * axis.
-          *
-          * defaultValue: false
-          */
-        fixed?: boolean;
-
-        /**
-          * The header cell for this column. This can either be a
-          * string. a React element, or a function that generates a
-          * React Element. Passing in a string will render a default
-          * header cell with that string. By default, the React
-          * element passed in can expect to receive the following
-          * props:
-          *
-          * props: {
-          *   columnKey: string // (of the column, if given)
-          *   height: number // (supplied from the Table or rowHeightGetter)
-          *   width: number // (supplied from the Column)
-          * }
-          *
-          * Because you are passing in your own React element, you
-          * can feel free to pass in whatever props you may want or need.
-          *
-          * If you pass in a function, you will receive the same props object as the first argument.
-          */
-        header?: string | __React.ReactElement<any> | ((props: CellProps) => (string | __React.ReactElement<any>));
-
-        /**
-          * This is the body cell that will be cloned for this
-          * column. This can either be a string a React element,
-          * or a function that generates a React Element. Passing
-          * in a string will render a default cell with that
-          * string. By default, the React element passed in can
-          * expect to receive the following props:
-          *
-          * props: {
-          *   rowIndex; number // (the row index of the cell)
-          *   columnKey: string // (of the column, if given)
-          *   height: number // (supplied from the Table or rowHeightGetter)
-          *   width: number // (supplied from the Column)
-          * }
-          *
-          * Because you are passing in your own React element, you
-          * can feel free to pass in whatever props you may want or
-          * need.
-          *
-          * If you pass in a function, you will receive the same
-          * props object as the first argument.
-          */
-        cell?: string | __React.ReactElement<any> | ((props: CellProps) => (string | __React.ReactElement<any>));
-
-         /**
-          * The footer cell for this column. This can either be a
-          * string. a React element, or a function that generates a
-          * React Element. Passing in a string will render a default
-          * header cell with that string. By default, the React
-          * element passed in can expect to receive the following
-          * props:
-          *
-          * props: {
-          *   columnKey: string // (of the column, if given)
-          *   height: number // (supplied from the Table or rowHeightGetter)
-          *   width: number // (supplied from the Column)
-          * }
-          *
-          * Because you are passing in your own React element, you
-          * can feel free to pass in whatever props you may want or
-          * need.
-          *
-          * If you pass in a function, you will receive the same
-          * props object as the first argument.
-          */
-        footer?: string | __React.ReactElement<any> | ((props: CellProps) => (string | __React.ReactElement<any>));
-
-        /**
-          * This is used to uniquely identify the column, and is not
-          * required unless you a resizing columns. This will be the
-          * key given in the onColumnResizeEndCallback on the Table.
-          */
-        columnKey?: string | number;
-
-        /**
-          * The pixel width of the column.
-          */
-        width: number;
-
-        /**
-          * If this is a resizable column this is its minimum pixel
-          * width.
-          */
-        minWidth?: number;
-
-        /**
-          * If this is a resizable column this is its maximum pixel
-          * width.
-          */
-        maxWidth?: number;
-
-        /**
-          * The grow factor relative to other columns. Same as the
-          * flex-grow API from http://www.w3.org/TR/css3-flexbox/.
-          * Basically, take any available extra width and distribute
-          * it proportionally according to all columns' flexGrow
-          * values. Defaults to zero (no-flexing).
-          */
-        flexGrow?: number;
-
-        /**
-         * Whether the column can be resized with the
-         * FixedDataTableColumnResizeHandle. Please note that if a
-         * column has a flex grow, once you resize the column this
-         * will be set to 0.
-         *
-         * This property only provides the UI for the column
-         * resizing. If this is set to true, you will need to set the
-         * onColumnResizeEndCallback table property and render your
-         * columns appropriately.
-         */
-        isResizable?: boolean;
-
-        /**
-          * Whether cells in this column can be removed from document
-          * when outside of viewport as a result of horizontal
-          * scrolling. Setting this property to true allows the table
-          * to not render cells in particular column that are outside
-          * of viewport for visible rows. This allows to create table
-          * with many columns and not have vertical scrolling
-          * performance drop. Setting the property to false will keep
-          * previous behaviour and keep cell rendered if the row it
-          * belongs to is visible.
-          *
-          * defaultValue: false
-          */
-        allowCellsRecycling?: boolean;
-    }
-
-    /**
-     * Component that defines the attributes of a table column group.
-     */
-    export interface ColumnGroupProps {
-        /**
-	     * The horizontal alignment of the table cell content.
-         * 'left', 'center', 'right'
-	     */
-	    align?: string;
-
-	    /**
-	     * Controls if the column group is fixed when scrolling in the X
-	     * axis.
-	     *
-	     * defaultValue: false
-	     */
-	    fixed?: boolean;
-
-        /**
-          * The header cell for this column group. This can either be
-          * a string. a React element, or a function that generates a
-          * React Element. Passing in a string will render a default
-          * header cell with that string. By default, the React
-          * element passed in can expect to receive the following
-          * props:
-          *
-          * props: {
-          *   height: number // (supplied from the groupHeaderHeight)
-          *   width: number // (supplied from the Column)
-          * }
-          *
-          * Because you are passing in your own React element, you
-          * can feel free to pass in whatever props you may want or
-          * need.
-          *
-          * If you pass in a function, you will receive the same props
-          * object as the first argument.
-          */
-	    header: string | __React.ReactElement<any> | ((props: CellProps) => (string | __React.ReactElement<any>));
-    }
-
-    /**
-     * Component that handles default cell layout and styling.
-     *
-     * All props unless specified below will be set onto the top
-	 * level div rendered by the cell.
-     *
-     * Example usage via from a Column:
-     *
-     * const MyColumn = (
-     *   <Column
-     *     cell={({rowIndex, width, height}) => (
-     *       <Cell
-     *         width={width}
-     *         height={height}
-     *         className="my-class">
-     *         Cell number: <span>{rowIndex}</span>
-     *        </Cell>
-     *     )}
-     *     width={100}
-     *   />
-     * );
-     */
-    export interface CellProps extends __React.HTMLAttributes {
-        /**
-         * The row index of the cell.
-         */
-        rowIndex?: number;
-
-        /**
-         * Outer height of the cell.
-         */
-        height?: number;
-
-        /**
-         * Outer width of the cell.
-         */
-        width?: number;
-
-        /**
-         * Optional prop that if specified on the Column will be
-         * passed to the cell. It can be used to uniquely identify
-         * which column is the cell is in.
-         */
-        columnKey?: string | number;
-    }
-
-    export class Table extends __React.Component<TableProps, {}> {
-    }
-    export class Column extends __React.Component<ColumnProps, {}> {
-    }
-    export class ColumnGroup extends __React.Component<ColumnGroupProps, {}> {
-    }
-    export class Cell extends __React.Component<CellProps, {}> {
-    }
-}
-
-declare module "fixed-data-table" {
-    export = FixedDataTable;
-}
diff --git a/fixed-data-table/index.d.ts b/fixed-data-table/index.d.ts
new file mode 100644
index 0000000000..4df367d669
--- /dev/null
+++ b/fixed-data-table/index.d.ts
@@ -0,0 +1,496 @@
+// Type definitions for fixed-data-table 0.6.0
+// Project: https://github.com/facebook/fixed-data-table
+// Definitions by: Petar Paar <https://github.com/pepaar>, Stephen Jelfs <https://github.com/stephenjelfs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react"/>
+
+export = FixedDataTable;
+export as namespace FixedDataTable;
+
+declare namespace FixedDataTable {
+    export var version: string;
+
+    /**
+      * Data grid component with fixed or scrollable header and columns.
+      *
+      * The layout of the data table is as follows:
+      *
+      *
+      * +---------------------------------------------------+
+      * | Fixed Column Group    | Scrollable Column Group   |
+      * | Header                | Header                    |
+      * |                       |                           |
+      * +---------------------------------------------------+
+      * |                       |                           |
+      * | Fixed Header Columns  | Scrollable Header Columns |
+      * |                       |                           |
+      * +-----------------------+---------------------------+
+      * |                       |                           |
+      * | Fixed Body Columns    | Scrollable Body Columns   |
+      * |                       |                           |
+      * +-----------------------+---------------------------+
+      * |                       |                           |
+      * | Fixed Footer Columns  | Scrollable Footer Columns |
+      * |                       |                           |
+      * +-----------------------+---------------------------+
+      *
+      * Fixed Column Group Header:
+      *
+      * These are the headers for a group of columns if included in
+      * the table that do not scroll vertically or horizontally.
+      *
+      * Scrollable Column Group Header:
+      *
+      * The header for a group of columns that do not move while
+      * scrolling vertically, but move horizontally with the
+      * horizontal scrolling.
+      *
+      * Fixed Header Columns:
+      *
+      * The header columns that do not move while scrolling
+      * vertically or horizontally.
+      *
+      * Scrollable Header Columns:
+      *
+      * The header columns that do not move while scrolling
+      * vertically, but move horizontally with the horizontal scrolling.
+      *
+      * Fixed Body Columns:
+      *
+      * The body columns that do not move while scrolling
+      * horizontally, but move vertically with the vertical scrolling.
+      *
+      * Scrollable Body Columns:
+      *
+      * The body columns that move while scrolling vertically or
+      * horizontally.
+      *
+      */
+    export interface TableProps extends React.Props<Table> {
+        /**
+          * Pixel width of table. If all columns do not fit, a
+          * horizontal scrollbar will appear.
+          */
+        width: number;
+
+        /**
+          * Pixel height of table. If all rows do not fit, a
+          * vertical scrollbar will appear.
+          *
+          * Either height or maxHeight must be specified.
+          */
+        height?: number;
+
+        /**
+          * Maximum pixel height of table. If all rows do not fit,
+          * a vertical scrollbar will appear.
+          *
+          * Either height or maxHeight must be specified.
+          */
+        maxHeight?: number;
+
+        /**
+          * Pixel height of table's owner, this is used in a managed
+          * scrolling situation when you want to slide the table up
+          * from below the fold without having to constantly update
+          * the height on every scroll tick. Instead, vary this
+          * property on scroll. By using ownerHeight, we over-render
+          * the table while making sure the footer and horizontal
+          * scrollbar of the table are visible when the current space
+          * for the table in view is smaller than the final,
+          * over-flowing height of table. It allows us to avoid
+          * resizing and reflowing table when it is moving in the
+          * view.
+          *
+          * This is used if ownerHeight < height (or maxHeight).
+          */
+        ownerHeight?: number;
+
+        /**
+          * 'hidden'|'auto'
+          */
+        overflowX?: string;
+
+        /**
+          * 'hidden'|'auto'
+          */
+        overflowY?: string;
+
+        /**
+          * Number of rows in the table.
+          */
+        rowsCount: number;
+
+        /**
+          * Pixel height of rows unless rowHeightGetter is specified
+          * and returns different value.
+          */
+        rowHeight: number;
+
+        /**
+          * If specified, rowHeightGetter(index) is called for each
+          * row and the returned value overrides rowHeight for
+          * particular row.
+          */
+        rowHeightGetter?: (index: number) => number;
+
+        /**
+          * To get any additional CSS classes that should be added to
+          *  a row, rowClassNameGetter(index) is called.
+          */
+        rowClassNameGetter?: (index: number) => string;
+
+        /**
+          * Pixel height of the column group header.
+          *
+          * defaultValue: 0
+          */
+        groupHeaderHeight?: number;
+
+        /**
+          * Pixel height of the header.
+          *
+          * defaultValue: 0
+          */
+        headerHeight?: number;
+
+        /**
+          * Pixel height of the footer.
+          *
+          * defaultValue: 0
+          */
+        footerHeight?: number;
+
+        /**
+          * Value of horizontal scroll.
+          *
+          * defaultValue: 0
+          */
+        scrollLeft?: number;
+
+        /**
+          * Index of column to scroll to.
+          */
+        scrollToColumn?: number;
+
+        /**
+          * Value of vertical scroll.
+          *
+          * defaultValue: 0
+          */
+        scrollTop?: number;
+
+        /**
+          * Index of row to scroll to.
+          */
+        scrollToRow?: number;
+
+        /**
+          * Callback that is called when scrolling starts with
+          * current horizontal and vertical scroll values.
+          */
+        onScrollStart?: (x: number, y: number) => void;
+
+        /**
+          * Callback that is called when scrolling ends or stops with
+          * new horizontal and vertical scroll values.
+          */
+        onScrollEnd?: (x: number, y: number) => void;
+
+        /**
+          * Callback that is called when rowHeightGetter returns a
+          * different height for a row than the rowHeight prop. This
+          *  is necessary because initially table estimates heights
+          * of some parts of the content.
+          */
+        onContentHeightChange?: (newHeight: number) => void;
+
+        /**
+          * Callback that is called when a row is clicked.
+          */
+        onRowClick?: (event: React.SyntheticEvent, rowIndex: number) => void;
+
+        /**
+          * Callback that is called when a row is double clicked.
+          */
+        onRowDoubleClick?: (event: React.SyntheticEvent, rowIndex: number) => void;
+
+        /**
+          * Callback that is called when a mouse-down event happens
+          * on a row.
+          */
+        onRowMouseDown?: (event: React.SyntheticEvent, rowIndex: number) => void;
+
+        /**
+          * Callback that is called when a mouse-enter event happens
+          * on a row.
+          */
+        onRowMouseEnter?: (event: React.SyntheticEvent, rowIndex: number) => void;
+
+        /**
+          * Callback that is called when a mouse-leave event happens
+          * on a row.
+          */
+        onRowMouseLeave?: (event: React.SyntheticEvent, rowIndex: number) => void;
+
+        /**
+          * Callback that is called when resizer has been released
+          * and column needs to be updated.
+          *
+          * Required if the isResizable property is true on any
+          * column.
+          */
+        onColumnResizeEndCallback?: (newColumnWidth: number, columnKey: string) => void;
+
+        /**
+          * Whether a column is currently being resized.
+          */
+        isColumnResizing?: boolean;
+    }
+
+    /**
+     * Component that defines the attributes of table column.
+     */
+    interface ColumnProps extends React.Props<Column> {
+        /**
+          * The horizontal alignment of the table cell content.
+          *
+          * 'left'|'center'|'right'
+          */
+        align?: string;
+
+        /**
+          * Controls if the column is fixed when scrolling in the X
+          * axis.
+          *
+          * defaultValue: false
+          */
+        fixed?: boolean;
+
+        /**
+          * The header cell for this column. This can either be a
+          * string. a React element, or a function that generates a
+          * React Element. Passing in a string will render a default
+          * header cell with that string. By default, the React
+          * element passed in can expect to receive the following
+          * props:
+          *
+          * props: {
+          *   columnKey: string // (of the column, if given)
+          *   height: number // (supplied from the Table or rowHeightGetter)
+          *   width: number // (supplied from the Column)
+          * }
+          *
+          * Because you are passing in your own React element, you
+          * can feel free to pass in whatever props you may want or need.
+          *
+          * If you pass in a function, you will receive the same props object as the first argument.
+          */
+        header?: string | React.ReactElement<any> | ((props: CellProps) => (string | React.ReactElement<any>));
+
+        /**
+          * This is the body cell that will be cloned for this
+          * column. This can either be a string a React element,
+          * or a function that generates a React Element. Passing
+          * in a string will render a default cell with that
+          * string. By default, the React element passed in can
+          * expect to receive the following props:
+          *
+          * props: {
+          *   rowIndex; number // (the row index of the cell)
+          *   columnKey: string // (of the column, if given)
+          *   height: number // (supplied from the Table or rowHeightGetter)
+          *   width: number // (supplied from the Column)
+          * }
+          *
+          * Because you are passing in your own React element, you
+          * can feel free to pass in whatever props you may want or
+          * need.
+          *
+          * If you pass in a function, you will receive the same
+          * props object as the first argument.
+          */
+        cell?: string | React.ReactElement<any> | ((props: CellProps) => (string | React.ReactElement<any>));
+
+         /**
+          * The footer cell for this column. This can either be a
+          * string. a React element, or a function that generates a
+          * React Element. Passing in a string will render a default
+          * header cell with that string. By default, the React
+          * element passed in can expect to receive the following
+          * props:
+          *
+          * props: {
+          *   columnKey: string // (of the column, if given)
+          *   height: number // (supplied from the Table or rowHeightGetter)
+          *   width: number // (supplied from the Column)
+          * }
+          *
+          * Because you are passing in your own React element, you
+          * can feel free to pass in whatever props you may want or
+          * need.
+          *
+          * If you pass in a function, you will receive the same
+          * props object as the first argument.
+          */
+        footer?: string | React.ReactElement<any> | ((props: CellProps) => (string | React.ReactElement<any>));
+
+        /**
+          * This is used to uniquely identify the column, and is not
+          * required unless you a resizing columns. This will be the
+          * key given in the onColumnResizeEndCallback on the Table.
+          */
+        columnKey?: string | number;
+
+        /**
+          * The pixel width of the column.
+          */
+        width: number;
+
+        /**
+          * If this is a resizable column this is its minimum pixel
+          * width.
+          */
+        minWidth?: number;
+
+        /**
+          * If this is a resizable column this is its maximum pixel
+          * width.
+          */
+        maxWidth?: number;
+
+        /**
+          * The grow factor relative to other columns. Same as the
+          * flex-grow API from http://www.w3.org/TR/css3-flexbox/.
+          * Basically, take any available extra width and distribute
+          * it proportionally according to all columns' flexGrow
+          * values. Defaults to zero (no-flexing).
+          */
+        flexGrow?: number;
+
+        /**
+         * Whether the column can be resized with the
+         * FixedDataTableColumnResizeHandle. Please note that if a
+         * column has a flex grow, once you resize the column this
+         * will be set to 0.
+         *
+         * This property only provides the UI for the column
+         * resizing. If this is set to true, you will need to set the
+         * onColumnResizeEndCallback table property and render your
+         * columns appropriately.
+         */
+        isResizable?: boolean;
+
+        /**
+          * Whether cells in this column can be removed from document
+          * when outside of viewport as a result of horizontal
+          * scrolling. Setting this property to true allows the table
+          * to not render cells in particular column that are outside
+          * of viewport for visible rows. This allows to create table
+          * with many columns and not have vertical scrolling
+          * performance drop. Setting the property to false will keep
+          * previous behaviour and keep cell rendered if the row it
+          * belongs to is visible.
+          *
+          * defaultValue: false
+          */
+        allowCellsRecycling?: boolean;
+    }
+
+    /**
+     * Component that defines the attributes of a table column group.
+     */
+    export interface ColumnGroupProps extends React.Props<ColumnGroup> {
+        /**
+	     * The horizontal alignment of the table cell content.
+         * 'left', 'center', 'right'
+	     */
+	    align?: string;
+
+	    /**
+	     * Controls if the column group is fixed when scrolling in the X
+	     * axis.
+	     *
+	     * defaultValue: false
+	     */
+	    fixed?: boolean;
+
+        /**
+          * The header cell for this column group. This can either be
+          * a string. a React element, or a function that generates a
+          * React Element. Passing in a string will render a default
+          * header cell with that string. By default, the React
+          * element passed in can expect to receive the following
+          * props:
+          *
+          * props: {
+          *   height: number // (supplied from the groupHeaderHeight)
+          *   width: number // (supplied from the Column)
+          * }
+          *
+          * Because you are passing in your own React element, you
+          * can feel free to pass in whatever props you may want or
+          * need.
+          *
+          * If you pass in a function, you will receive the same props
+          * object as the first argument.
+          */
+	    header: string | React.ReactElement<any> | ((props: CellProps) => (string | React.ReactElement<any>));
+    }
+
+    /**
+     * Component that handles default cell layout and styling.
+     *
+     * All props unless specified below will be set onto the top
+	 * level div rendered by the cell.
+     *
+     * Example usage via from a Column:
+     *
+     * const MyColumn = (
+     *   <Column
+     *     cell={({rowIndex, width, height}) => (
+     *       <Cell
+     *         width={width}
+     *         height={height}
+     *         className="my-class">
+     *         Cell number: <span>{rowIndex}</span>
+     *        </Cell>
+     *     )}
+     *     width={100}
+     *   />
+     * );
+     */
+    export interface CellProps extends React.HTMLAttributes {
+        /**
+         * The row index of the cell.
+         */
+        rowIndex?: number;
+
+        /**
+         * Outer height of the cell.
+         */
+        height?: number;
+
+        /**
+         * Outer width of the cell.
+         */
+        width?: number;
+
+        /**
+         * Optional prop that if specified on the Column will be
+         * passed to the cell. It can be used to uniquely identify
+         * which column is the cell is in.
+         */
+        columnKey?: string | number;
+    }
+
+    export class Table extends React.Component<TableProps, {}> {
+    }
+    export class Column extends React.Component<ColumnProps, {}> {
+    }
+    export class ColumnGroup extends React.Component<ColumnGroupProps, {}> {
+    }
+    export class Cell extends React.Component<CellProps, {}> {
+    }
+}
diff --git a/fixed-data-table/tsconfig.json b/fixed-data-table/tsconfig.json
new file mode 100644
index 0000000000..43a73d7e1e
--- /dev/null
+++ b/fixed-data-table/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "files": [
+        "index.d.ts",
+        "fixed-data-table-tests.tsx"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/flake-idgen/flake-idgen-tests.ts b/flake-idgen/flake-idgen-tests.ts
index 5828bc9137..5e45e92db4 100644
--- a/flake-idgen/flake-idgen-tests.ts
+++ b/flake-idgen/flake-idgen-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="flake-idgen.d.ts"/>
-
 // require flake-idgen
 import FlakeId = require('flake-idgen');
 let flakeIdGen1 = new FlakeId({datacenter: 9, worker: 7});
diff --git a/flake-idgen/flake-idgen.d.ts b/flake-idgen/flake-idgen.d.ts
deleted file mode 100644
index 05f023e04e..0000000000
--- a/flake-idgen/flake-idgen.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// Type definitions for flakge-idgen 0.1.4
-// Project: https://github.com/T-PWK/flake-idgen
-// Definitions by: Yuce Tekol <http://yuce.me/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'flake-idgen' {
-	interface ConstructorOptions {
-		datacenter?: number;
-		worker?: number;
-		id?: number;
-		epoch?: number;
-		seqMask?: number;
-	}
-
-	class FlakeId {
-		constructor(options?: ConstructorOptions);
-		next(callback?: (err: Error, id: Buffer) => void): Buffer;
-	}
-	export = FlakeId;
-}
diff --git a/flake-idgen/index.d.ts b/flake-idgen/index.d.ts
new file mode 100644
index 0000000000..39be5999b9
--- /dev/null
+++ b/flake-idgen/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for flakge-idgen 0.1.4
+// Project: https://github.com/T-PWK/flake-idgen
+// Definitions by: Yuce Tekol <http://yuce.me/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+interface ConstructorOptions {
+    datacenter?: number;
+    worker?: number;
+    id?: number;
+    epoch?: number;
+    seqMask?: number;
+}
+
+declare class FlakeId {
+    constructor(options?: ConstructorOptions);
+    next(callback?: (err: Error, id: Buffer) => void): Buffer;
+}
+export = FlakeId;
diff --git a/flake-idgen/tsconfig.json b/flake-idgen/tsconfig.json
new file mode 100644
index 0000000000..41473289f8
--- /dev/null
+++ b/flake-idgen/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "flake-idgen-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/flat/flat-tests.ts b/flat/flat-tests.ts
index 03d60cc350..68699326c3 100644
--- a/flat/flat-tests.ts
+++ b/flat/flat-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./flat.d.ts" />
+
 
 import {flatten, unflatten} from "flat";
 
diff --git a/flat/flat.d.ts b/flat/flat.d.ts
deleted file mode 100644
index 454b3f0cde..0000000000
--- a/flat/flat.d.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-// Type definitions for flat
-// Project: https://github.com/hughsk/flat
-// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace FlatTypes {
-	interface FlattenOptions {
-		delimiter?: string;
-		safe?: boolean;
-		maxDepth?: number;
-	}
-
-	interface Flatten {
-		<TTarget, TResult>(
-			target: TTarget,
-			options?: FlattenOptions
-		): TResult;
-
-		flatten: Flatten;
-		unflatten: Unflatten;
-	}
-
-	interface UnflattenOptions {
-		delimiter?: string;
-		object?: boolean;
-		overwrite?: boolean;
-	}
-
-	interface Unflatten {
-		<TTarget, TResult>(
-			target: TTarget,
-			options?: UnflattenOptions
-		): TResult;
-	}
-}
-
-declare module "flat" {
-	var flatten: FlatTypes.Flatten;
-
-	export = flatten;
-}
diff --git a/flat/index.d.ts b/flat/index.d.ts
new file mode 100644
index 0000000000..1b0d8e9ef2
--- /dev/null
+++ b/flat/index.d.ts
@@ -0,0 +1,39 @@
+// Type definitions for flat
+// Project: https://github.com/hughsk/flat
+// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var flatten: FlatTypes.Flatten;
+
+export = flatten;
+
+declare namespace FlatTypes {
+	interface FlattenOptions {
+		delimiter?: string;
+		safe?: boolean;
+		maxDepth?: number;
+	}
+
+	interface Flatten {
+		<TTarget, TResult>(
+			target: TTarget,
+			options?: FlattenOptions
+		): TResult;
+
+		flatten: Flatten;
+		unflatten: Unflatten;
+	}
+
+	interface UnflattenOptions {
+		delimiter?: string;
+		object?: boolean;
+		overwrite?: boolean;
+	}
+
+	interface Unflatten {
+		<TTarget, TResult>(
+			target: TTarget,
+			options?: UnflattenOptions
+		): TResult;
+	}
+}
diff --git a/flat/tsconfig.json b/flat/tsconfig.json
new file mode 100644
index 0000000000..77fb265a44
--- /dev/null
+++ b/flat/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "flat-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/flexSlider/flexSlider-tests.ts b/flexSlider/flexSlider-tests.ts
index 8651102422..2369ce9b31 100644
--- a/flexSlider/flexSlider-tests.ts
+++ b/flexSlider/flexSlider-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="flexSlider.d.ts"/>
-
 // Can also be used with $(document).ready()
 $(window).load(function() {
 	$('.flexslider').flexslider({
diff --git a/flexSlider/flexSlider-tests.ts.tscparams b/flexSlider/flexSlider-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/flexSlider/flexSlider-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/flexSlider/flexSlider.d.ts b/flexSlider/flexSlider.d.ts
deleted file mode 100644
index c8fa3f949c..0000000000
--- a/flexSlider/flexSlider.d.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-// Type definitions for FlexSlider 2 jquery plugin
-// Project: https://github.com/woothemes/FlexSlider
-// Definitions by: Diullei Gomes <https://github.com/diullei>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface SliderObject { //Object: The slider element itself
-	container: Object;              //Object: The ul.slides within the slider
-	slides: Object;                 //Object: The slides of the slider
-	count: number;                  //Int: The total number of slides in the slider
-	currentSlide: number;           //Int: The slide currently being shown
-	animatingTo: number;            //Int: Useful in .before(), the slide currently animating to
-	animating: boolean;              //Boolean: is slider animating?
-	atEnd: boolean;                  //Boolean: is the slider at either end?
-	manualPause: boolean;            //Boolean: force slider to stay paused during pauseOnHover event
-	controlNav: Object;             //Object: The slider controlNav
-	directionNav: Object;            //Object: The slider directionNav
-	controlsContainer: Object;      //Object: The controlsContainer element of the slider
-	manualControls: Object;         //Object: The manualControls element of the slider
-	flexAnimate(target, pause?);    //Function: Move slider - (target, pause) parameters
-	pause();                //Function: Pause slider slideshow interval
-	resume();               //Function: Resume slider slideshow interval
-	canAdvance(target);     //Function: returns boolean if slider can advance - (target) parameter
-	getTarget(dir);         //Function: get target given a direction - "next" or "prev" parameter
-}
-
-interface FlexSliderOptions {
-	namespace?: string;             //{NEW} String: Prefix string attached to the class of every element generated by the plugin
-	selector?: string;       //{NEW} Selector: Must match a simple pattern. '{container} > {slide}' -- Ignore pattern at your own peril
-	animation?: string;              //String: Select your animation type, "fade" or "slide"
-	easing?: string;               //{NEW} String: Determines the easing method used in jQuery transitions. jQuery easing plugin is supported!
-	direction?: string;        //String: Select the sliding direction, "horizontal" or "vertical"
-	reverse?: boolean;                 //{NEW} Boolean: Reverse the animation direction
-	animationLoop?: boolean;             //Boolean: Should the animation loop? If boolean; directionNav will received "disable" classes at either end
-	smoothHeight?: boolean;            //{NEW} Boolean: Allow height of the slider to animate smoothly in horizontal mode
-	startAt?: number;                     //Integer: The slide that the slider should start on. Array notation (0 = first slide)
-	slideshow?: boolean;                //Boolean: Animate slider automatically
-	slideshowSpeed?: number;           //Integer: Set the speed of the slideshow cycling, in milliseconds
-	animationSpeed?: number;            //Integer: Set the speed of animations, in milliseconds
-	initDelay?: number;                   //{NEW} Integer: Set an initialization delay, in milliseconds
-	randomize?: boolean;               //Boolean: Randomize slide order
-	 
-	// Usability features
-	pauseOnAction?: boolean;            //Boolean: Pause the slideshow when interacting with control elements, highly recommended.
-	pauseOnHover?: boolean;            //Boolean: Pause the slideshow when hovering over slider, then resume when no longer hovering
-	useCSS?: boolean;                   //{NEW} Boolean: Slider will use CSS3 transitions if available
-	touch?: boolean;                    //{NEW} Boolean: Allow touch swipe navigation of the slider on touch-enabled devices
-	video?: boolean;                   //{NEW} Boolean: If using video in the slider, will prevent CSS3 3D Transforms to avoid graphical glitches
-	 
-	// Primary Controls
-	controlNav?: any;               //Boolean: Create navigation for paging control of each clide? Note: Leave true for manualControls usage
-	directionNav?: boolean;             //Boolean: Create navigation for previous/next navigation? (true/false)
-	prevText?: string;           //String: Set the text for the "previous" directionNav item
-	nextText?: string;               //String: Set the text for the "next" directionNav item
-	 
-	// Secondary Navigation
-	keyboard?: boolean;                 //Boolean: Allow slider navigating via keyboard left/right keys
-	multipleKeyboard?: boolean;        //{NEW} Boolean: Allow keyboard navigation to affect multiple sliders. Default behavior cuts out keyboard navigation with more than one slider present.
-	mousewheel?: boolean;              //{UPDATED} Boolean: Requires jquery.mousewheel.js (https://github.com/brandonaaron/jquery-mousewheel) - Allows slider navigating via mousewheel
-	pausePlay?: boolean;               //Boolean: Create pause/play dynamic element
-	pauseText?: string;             //String: Set the text for the "pause" pausePlay item
-	playText?: string;               //String: Set the text for the "play" pausePlay item
-	 
-	// Special properties
-	controlsContainer?: string;          //{UPDATED} Selector: USE CLASS SELECTOR. Declare which container the navigation elements should be appended too. Default container is the FlexSlider element. Example use would be ".flexslider-container". Property is ignored if given element is not found.
-	manualControls?: string;             //Selector: Declare custom control navigation. Examples would be ".flex-control-nav li" or "#tabs-nav li img", etc. The number of elements in your controlNav should match the number of slides/tabs.
-	sync?: string;                       //{NEW} Selector: Mirror the actions performed on this slider with another slider. Use with care.
-	asNavFor?: string;                   //{NEW} Selector: Internal property exposed for turning the slider into a thumbnail navigation for another slider
-	 
-	// Carousel Options
-	itemWidth?: number;                   //{NEW} Integer: Box-model width of individual carousel items, including horizontal borders and padding.
-	itemMargin?: number;                  //{NEW} Integer: Margin between carousel items.
-	minItems?: number;                    //{NEW} Integer: Minimum number of carousel items that should be visible. Items will resize fluidly when below this.
-	maxItems?: number;                    //{NEW} Integer: Maxmimum number of carousel items that should be visible. Items will resize fluidly when above this limit.
-	move?: number;                        //{NEW} Integer: Number of carousel items that should move on animation. If number; slider will move all visible items.
-	 
-	// Callback API
-	start?: (slider: SliderObject) => any;            //Callback: function(slider) - Fires when the slider loads the first slide
-	before?: (slider: SliderObject) => any;           //Callback: function(slider) - Fires asynchronously with each slider animation
-	after?: () => any;            //Callback: function(slider) - Fires after each slider animation completes
-	end?: () => any;              //Callback: function(slider) - Fires when the slider reaches the last slide (asynchronous)
-	added?: () => any;            //{NEW} Callback: function(slider) - Fires after a slide is added
-	removed?: () => any;
-}
-
-
-interface JQuery {
-    flexslider(options?: FlexSliderOptions);
-}
diff --git a/flexSlider/flexSlider.d.ts.tscparams b/flexSlider/flexSlider.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/flexSlider/flexSlider.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/flexSlider/index.d.ts b/flexSlider/index.d.ts
new file mode 100644
index 0000000000..4cdabf0b08
--- /dev/null
+++ b/flexSlider/index.d.ts
@@ -0,0 +1,90 @@
+// Type definitions for FlexSlider 2 jquery plugin
+// Project: https://github.com/woothemes/FlexSlider
+// Definitions by: Diullei Gomes <https://github.com/diullei>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface SliderObject { //Object: The slider element itself
+	container: Object;              //Object: The ul.slides within the slider
+	slides: Object;                 //Object: The slides of the slider
+	count: number;                  //Int: The total number of slides in the slider
+	currentSlide: number;           //Int: The slide currently being shown
+	animatingTo: number;            //Int: Useful in .before(), the slide currently animating to
+	animating: boolean;              //Boolean: is slider animating?
+	atEnd: boolean;                  //Boolean: is the slider at either end?
+	manualPause: boolean;            //Boolean: force slider to stay paused during pauseOnHover event
+	controlNav: Object;             //Object: The slider controlNav
+	directionNav: Object;            //Object: The slider directionNav
+	controlsContainer: Object;      //Object: The controlsContainer element of the slider
+	manualControls: Object;         //Object: The manualControls element of the slider
+	flexAnimate(target, pause?);    //Function: Move slider - (target, pause) parameters
+	pause();                //Function: Pause slider slideshow interval
+	resume();               //Function: Resume slider slideshow interval
+	canAdvance(target);     //Function: returns boolean if slider can advance - (target) parameter
+	getTarget(dir);         //Function: get target given a direction - "next" or "prev" parameter
+}
+
+interface FlexSliderOptions {
+	namespace?: string;             //{NEW} String: Prefix string attached to the class of every element generated by the plugin
+	selector?: string;       //{NEW} Selector: Must match a simple pattern. '{container} > {slide}' -- Ignore pattern at your own peril
+	animation?: string;              //String: Select your animation type, "fade" or "slide"
+	easing?: string;               //{NEW} String: Determines the easing method used in jQuery transitions. jQuery easing plugin is supported!
+	direction?: string;        //String: Select the sliding direction, "horizontal" or "vertical"
+	reverse?: boolean;                 //{NEW} Boolean: Reverse the animation direction
+	animationLoop?: boolean;             //Boolean: Should the animation loop? If boolean; directionNav will received "disable" classes at either end
+	smoothHeight?: boolean;            //{NEW} Boolean: Allow height of the slider to animate smoothly in horizontal mode
+	startAt?: number;                     //Integer: The slide that the slider should start on. Array notation (0 = first slide)
+	slideshow?: boolean;                //Boolean: Animate slider automatically
+	slideshowSpeed?: number;           //Integer: Set the speed of the slideshow cycling, in milliseconds
+	animationSpeed?: number;            //Integer: Set the speed of animations, in milliseconds
+	initDelay?: number;                   //{NEW} Integer: Set an initialization delay, in milliseconds
+	randomize?: boolean;               //Boolean: Randomize slide order
+	 
+	// Usability features
+	pauseOnAction?: boolean;            //Boolean: Pause the slideshow when interacting with control elements, highly recommended.
+	pauseOnHover?: boolean;            //Boolean: Pause the slideshow when hovering over slider, then resume when no longer hovering
+	useCSS?: boolean;                   //{NEW} Boolean: Slider will use CSS3 transitions if available
+	touch?: boolean;                    //{NEW} Boolean: Allow touch swipe navigation of the slider on touch-enabled devices
+	video?: boolean;                   //{NEW} Boolean: If using video in the slider, will prevent CSS3 3D Transforms to avoid graphical glitches
+	 
+	// Primary Controls
+	controlNav?: any;               //Boolean: Create navigation for paging control of each clide? Note: Leave true for manualControls usage
+	directionNav?: boolean;             //Boolean: Create navigation for previous/next navigation? (true/false)
+	prevText?: string;           //String: Set the text for the "previous" directionNav item
+	nextText?: string;               //String: Set the text for the "next" directionNav item
+	 
+	// Secondary Navigation
+	keyboard?: boolean;                 //Boolean: Allow slider navigating via keyboard left/right keys
+	multipleKeyboard?: boolean;        //{NEW} Boolean: Allow keyboard navigation to affect multiple sliders. Default behavior cuts out keyboard navigation with more than one slider present.
+	mousewheel?: boolean;              //{UPDATED} Boolean: Requires jquery.mousewheel.js (https://github.com/brandonaaron/jquery-mousewheel) - Allows slider navigating via mousewheel
+	pausePlay?: boolean;               //Boolean: Create pause/play dynamic element
+	pauseText?: string;             //String: Set the text for the "pause" pausePlay item
+	playText?: string;               //String: Set the text for the "play" pausePlay item
+	 
+	// Special properties
+	controlsContainer?: string;          //{UPDATED} Selector: USE CLASS SELECTOR. Declare which container the navigation elements should be appended too. Default container is the FlexSlider element. Example use would be ".flexslider-container". Property is ignored if given element is not found.
+	manualControls?: string;             //Selector: Declare custom control navigation. Examples would be ".flex-control-nav li" or "#tabs-nav li img", etc. The number of elements in your controlNav should match the number of slides/tabs.
+	sync?: string;                       //{NEW} Selector: Mirror the actions performed on this slider with another slider. Use with care.
+	asNavFor?: string;                   //{NEW} Selector: Internal property exposed for turning the slider into a thumbnail navigation for another slider
+	 
+	// Carousel Options
+	itemWidth?: number;                   //{NEW} Integer: Box-model width of individual carousel items, including horizontal borders and padding.
+	itemMargin?: number;                  //{NEW} Integer: Margin between carousel items.
+	minItems?: number;                    //{NEW} Integer: Minimum number of carousel items that should be visible. Items will resize fluidly when below this.
+	maxItems?: number;                    //{NEW} Integer: Maxmimum number of carousel items that should be visible. Items will resize fluidly when above this limit.
+	move?: number;                        //{NEW} Integer: Number of carousel items that should move on animation. If number; slider will move all visible items.
+	 
+	// Callback API
+	start?: (slider: SliderObject) => any;            //Callback: function(slider) - Fires when the slider loads the first slide
+	before?: (slider: SliderObject) => any;           //Callback: function(slider) - Fires asynchronously with each slider animation
+	after?: () => any;            //Callback: function(slider) - Fires after each slider animation completes
+	end?: () => any;              //Callback: function(slider) - Fires when the slider reaches the last slide (asynchronous)
+	added?: () => any;            //{NEW} Callback: function(slider) - Fires after a slide is added
+	removed?: () => any;
+}
+
+
+interface JQuery {
+    flexslider(options?: FlexSliderOptions);
+}
diff --git a/flexSlider/tsconfig.json b/flexSlider/tsconfig.json
new file mode 100644
index 0000000000..5e6dd3cc71
--- /dev/null
+++ b/flexSlider/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "flexSlider-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/flickity/flickity-tests.ts b/flickity/flickity-tests.ts
index 8d06e4ee7f..5bccb9ada4 100644
--- a/flickity/flickity-tests.ts
+++ b/flickity/flickity-tests.ts
@@ -2,15 +2,14 @@
 // Project: http://flickity.metafizzy.co/
 // Definitions by: Chris McGrath <https://www.github.com/clmcgrath>
 // Definitions: https://github.com/clmcgrath/
-///<reference path="../jquery/jquery.d.ts"/>
-///<reference path="FlickityEvents.ts"/>
-///<reference path="flickity.d.ts"/>
 
+///<reference types="jquery"/>
+///<reference path="FlickityEvents.ts"/>
 
 //jQuery tests
 
 
-    var $flickity : JQuery = $("#flickity-selector").flickity(
+var $flickity: JQuery = $("#flickity-selector").flickity(
     {
         initialIndex: 0,
         accessibility: true,
@@ -37,14 +36,14 @@
         rightToLeft: false
     });
 
-    $flickity.flickity("next")
-        .flickity('select', 4);
+$flickity.flickity("next")
+    .flickity('select', 4);
 
-    //Vanilla jQuery tests
-    var flikty : Flickity = new Flickity("#flickity-gallery");
+//Vanilla jQuery tests
+var flikty: Flickity = new Flickity("#flickity-gallery");
 
-    var flikty2: Flickity =
-        new Flickity("#flickity-gallery",
+var flikty2: Flickity =
+    new Flickity("#flickity-gallery",
         {
             initialIndex: 0,
             accessibility: true,
@@ -71,67 +70,67 @@
             rightToLeft: false
         });
 
-        //ES6 element selector for tests
-        var element = document.querySelector("#gallery");
-        var nodeList = document.querySelectorAll("#gallery");
-        var cellElements: Array<Element> = flikty2.getCellElements();
+//ES6 element selector for tests
+var element = document.querySelector("#gallery");
+var nodeList = document.querySelectorAll("#gallery");
+var cellElements: Array<Element> = flikty2.getCellElements();
 
-        flikty2.select(1, true);
-        flikty2.select(1);
+flikty2.select(1, true);
+flikty2.select(1);
 
-        flikty2.previous();
-        flikty2.previous(true);
+flikty2.previous();
+flikty2.previous(true);
 
-        flikty2.next();
-        flikty2.next(true);
+flikty2.next();
+flikty2.next(true);
 
-        flikty2.resize();
-        flikty2.reposition();
+flikty2.resize();
+flikty2.reposition();
 
-        flikty2.prepend(element);
+flikty2.prepend(element);
 
-        flikty2.append(element);
-        flikty2.append(nodeList);
+flikty2.append(element);
+flikty2.append(nodeList);
 
-        flikty2.insert(element, 0);
-        flikty2.insert(nodeList, 0);
-        flikty2.insert(new Array<Element>(), 0);
+flikty2.insert(element, 0);
+flikty2.insert(nodeList, 0);
+flikty2.insert(new Array<Element>(), 0);
 
-        flikty2.remove(element);
-        flikty2.remove(nodeList);
-        flikty2.remove(new Array<Element>());
+flikty2.remove(element);
+flikty2.remove(nodeList);
+flikty2.remove(new Array<Element>());
 
-        flikty2.destroy();
+flikty2.destroy();
 
-        flikty2.reloadCells();
+flikty2.reloadCells();
 
-        //event handlers
-        flikty2.on(FlickityEvents.cellSelect, (evt, ele) => {
-            //do something
-        });
+//event handlers
+flikty2.on(FlickityEvents.cellSelect, (evt, ele) => {
+    //do something
+});
 
-        flikty2.off(FlickityEvents.cellSelect, (evt, ele, pntr , vctr) => {
-            //do something
-        });
+flikty2.off(FlickityEvents.cellSelect, (evt, ele, pntr, vctr) => {
+    //do something
+});
 
-        flikty2.once(FlickityEvents.cellSelect, (evt, ele, pntr) => {
-            //do something
-        });
+flikty2.once(FlickityEvents.cellSelect, (evt, ele, pntr) => {
+    //do something
+});
 
-        flikty2.listener("myCustomEvent", (evt : Event) => {
-            //do something
-        });
+flikty2.listener("myCustomEvent", (evt: Event) => {
+    //do something
+});
 
-        //static get data methods
+//static get data methods
 
-        var jQdata = jQuery.fn.data('flickity')();
-            jQdata = $.fn.data('flickity')();
+var jQdata = jQuery.fn.data('flickity')();
+jQdata = $.fn.data('flickity')();
 
-        var jsData = Flickity.data("#gallery");
-            jsData = Flickity.data("#gallery");
+var jsData = Flickity.data("#gallery");
+jsData = Flickity.data("#gallery");
 
-        //property tests
-        var selectedIndex : number = flikty2.selectedIndex;
+//property tests
+var selectedIndex: number = flikty2.selectedIndex;
 
-        var selectedElement: Element = flikty2.selectedElement;
-        var cells : Array<Element> = flikty2.cells;
+var selectedElement: Element = flikty2.selectedElement;
+var cells: Array<Element> = flikty2.cells;
diff --git a/flickity/flickity.d.ts b/flickity/index.d.ts
similarity index 100%
rename from flickity/flickity.d.ts
rename to flickity/index.d.ts
diff --git a/flickity/tsconfig.json b/flickity/tsconfig.json
new file mode 100644
index 0000000000..91acb2685e
--- /dev/null
+++ b/flickity/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "flickity-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/flight/flight-tests.ts b/flight/flight-tests.ts
index 9c66fa8b49..d96b19221c 100644
--- a/flight/flight-tests.ts
+++ b/flight/flight-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="flight.d.ts" />
+
 declare var el: Element;
 declare var els: Element[];
 declare var mixinFn: Function;
diff --git a/flight/flight.d.ts b/flight/flight.d.ts
deleted file mode 100644
index 62663173a4..0000000000
--- a/flight/flight.d.ts
+++ /dev/null
@@ -1,252 +0,0 @@
-// Type definitions for Flight 1.1.4
-// Project: http://flightjs.github.com/flight/
-// Definitions by: Jonathan Hedrén <https://github.com/jonathanhedren/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace Flight {
-
-    export interface Base {
-
-        /**
-         * Most Components and Mixins need to define attributes. In Flight,
-         * default values are assigned by passing an object to the attributes
-         * function.
-         *
-         * NOTE: this.attributes replaces the now deprecated this.defaultAttrs.
-         * However, for backwards compatibility, if you are using this.defaultAttrs
-         * then all the old attribute behavior remains in place.
-         */
-        attributes(obj: Object): void;
-
-        /**
-         * Most Components and Mixins need to define attributes. In Flight,
-         * default values are assigned by passing an object to the defaultAttrs
-         * function.
-         *
-         * NOTE: this.attributes replaces the now deprecated this.defaultAttrs.
-         * However, for backwards compatibility, if you are using this.defaultAttrs
-         * then all the old attribute behavior remains in place.
-         */
-        defaultAttrs(obj: Object): void;
-
-        /**
-         * The select method takes an attr key as its argument. The value of the
-         * attr must be a CSS Selector. The method will return all matching
-         * elements within the component's node.
-         *
-         * This is a handy alternative to jQuery's this.$node.find() and prevents
-         * accidental access to elements outside of the component's node.
-         *
-         * @param attr
-         */
-        select(attr: string): JQuery;
-
-        /**
-         * This method is attached to the prototype of every Component; it accepts
-         * the component's node and an options object as arguments. The core
-         * implementation, which is called every time an instance is created, will
-         * assign the node to the instance and override the default attrs with the
-         * options object.
-         *
-         * Components and Mixins will typically augment the core implementation by
-         * supplying a function as an argument to the after method (see the advice
-         * API for more information). This is a good place to set up event
-         * listeners that bind to callbacks.
-         */
-        initialize(node: any, options: Object): void;
-
-        /**
-         * This allows a component instance to listen to an event and register a
-         * callback to be invoked. Flight will automatically bind the context
-         * (this) of the callback to the component instance.
-         *
-         * @param selector Optional. Specify the DOM node(s) that should listen
-         *        for the event. Defaults to the component instance's node value.
-         *
-         * @param eventType The event type to listen for.
-         *
-         * @param handler Either a function (callback) to be invoked, or a map of
-         *        targets and callbacks.
-         */
-        on(eventType: string, handler: Function): void;
-        on(eventType: string, handler: Object): void;
-        on(selector: string, eventType: string, handler: Function): void;
-        on(selector: Document, eventType: string, handler: Function): void;
-        on(selector: Element, eventType: string, handler: Function): void;
-        on(selector: Element[], eventType: string, handler: Function): void;
-        on(selector: string, eventType: string, handler: Object): void;
-        on(selector: Document, eventType: string, handler: Object): void;
-        on(selector: Element, eventType: string, handler: Object): void;
-        on(selector: Element[], eventType: string, handler: Object): void;
-
-        /**
-         * If we no longer want a component instance to listen to an event we can
-         * use the off method to unsubscribe.
-         *
-         * @param selector Optional. The DOM node(s) listening for the event.
-         *        Defaults to the component instance's node value.
-         *
-         * @param eventType The event type being listened to.
-         *
-         * @param handler Optional. The function (callback) to detach from the
-         *        component instance. Defaults to the detaching all callbacks for the event.
-         */
-        off(eventType: string, handler?: Function): void;
-        off(selector: string, eventType: string, handler?: Function): void;
-        off(selector: Document, eventType: string, handler?: Function): void;
-        off(selector: Element, eventType: string, handler?: Function): void;
-        off(selector: Element[], eventType: string, handler?: Function): void;
-        off(selector: string, eventType: Object, handler?: Function): void;
-        off(selector: Document, eventType: Object, handler?: Function): void;
-        off(selector: Element, eventType: Object, handler?: Function): void;
-        off(selector: Element[], eventType: Object, handler?: Function): void;
-        off(selector: string, eventType: string, handler?: Object): void;
-        off(selector: Document, eventType: string, handler?: Object): void;
-        off(selector: Element, eventType: string, handler?: Object): void;
-        off(selector: Element[], eventType: string, handler?: Object): void;
-        off(selector: string, eventType: Object, handler?: Object): void;
-        off(selector: Document, eventType: Object, handler?: Object): void;
-        off(selector: Element, eventType: Object, handler?: Object): void;
-        off(selector: Element[], eventType: Object, handler?: Object): void;
-
-        /**
-         * Trigger an event.
-         *
-         * @param selector Optional. The DOM node(s) that the event will be
-         *        dispatched to. Defaults to the component instance's node value.
-         *
-         * @param eventType String. The event type to be triggered.
-         *
-         * You can also specify a default function that will be called by the
-         * component, providing that nothing in the event's bubble chain invokes
-         * preventDefault. Default functions in custom events are analagous to the
-         * default actions of native events.
-         *
-         * To define a default function, make the eventType argument an object
-         * that specifies the event's type and a defaultBehavior property. A
-         * common use case is defining default behavior for keyboard events.
-         *
-         * @param eventPayload This is the payload of data that accompanies the event.
-         */
-        trigger(eventType: string): void;
-        trigger(selector: string, eventType: string, eventPayload?: Object): void;
-        trigger(selector: Document, eventType: string, eventPayload?: Object): void;
-        trigger(selector: Element, eventType: string, eventPayload?: Object): void;
-        trigger(selector: Element[], eventType: string, eventPayload?: Object): void;
-        trigger(eventType: Object): void;
-        trigger(selector: string, eventType: Object, eventPayload?: Object): void;
-        trigger(selector: Document, eventType: Object, eventPayload?: Object): void;
-        trigger(selector: Element, eventType: Object, eventPayload?: Object): void;
-        trigger(selector: Element[], eventType: Object, eventPayload?: Object): void;
-
-        /**
-         * Remove a component instance and its event bindings.
-         *
-         * It's a good idea to teardown components after each unit test - and
-         * teardown is also good for unbinding event listeners when, for example,
-         * the user navigates away from a page.
-         *
-         */
-        teardown(): void;
-    }
-
-    export interface Advice extends Base {
-        /**
-         * Run the customFunc function after the existingFunc function.
-         *
-         * @param existingFuncName The name of the existing function (existingFunc)
-         *        you want to augment.
-         *
-         * customFunc The function to be invoked after existingFunc.
-         */
-        after(method: string, fn: Function): void;
-
-        /**
-         * Run the existingFunc function in the middle of the customFunc function.
-         * It's similar to underscore's _wrap function).
-         *
-         * @param existingFuncName The name of the existing function (existingFunc)
-         *        you want to augment.
-         *
-         * customFunc The function to wrap around existingFunc. The existingFunc
-         * function will be passed to customFunc as an argument.
-         *
-         * The existing function is passed to the custom function as an argument so
-         * that it can be referenced. If the custom function does not call the
-         * existing function then it will replace that function instead of
-         * surrounding it.
-         */
-        around(method: string, fn: Function): void;
-
-        /**
-         * Run the customFunc function before the existingFunc function.
-         *
-         * @param existingFuncName The name of the existing function (existingFunc)
-         *        you want to augment.
-         *
-         * @param customFunc The function to be invoked before existingFunc.
-         */
-        before(method: string, fn: Function): void;
-    }
-
-    export interface Component extends Base, Advice {
-        node: Element;
-        $node: JQuery;
-    }
-
-    export interface AdviceStatic {
-        withAdvice(): Function;
-    }
-
-    export interface ComponentStatic {
-        (...fns: Function[]): ComponentStatic;
-        attachTo(selector: string, options?: Object): void;
-        attachTo(selector: Element, options?: Object): void;
-        attachTo(selector: JQuery, options?: Object): void;
-        teardownAll(): void;
-    }
-
-    export interface ComposeStatic {
-        mixin(base: Object, mixins: Function[]): void;
-    }
-
-    export interface DebugStatic {
-        events: {
-            logAll(): void;
-            logByAction(action: string): void;
-            logByName(name: string): void;
-            logNone(): void;
-        }
-    }
-
-    export interface UtilsStatic {
-        compose(fn1: Function, fn2: Function, ...fns: Function[]): Function;
-        countThen(num: number, base: Function): Function;
-        debounce(func: Function, wait: number, immediate: boolean): Function;
-        delegate(rules: Object): void;
-        isDomObj(obj: Object): boolean;
-        isEnumerable(obj: Object, property: string): boolean;
-        merge(obj1: Object, obj2: Object, deepClone?: boolean): Object;
-        merge(obj1: Object, obj2: Object, ...args: any[]): Object;
-        push(base: Object, extra: Object, protect?: boolean): void;
-        throttle(func: Function, wait: number): Function;
-        toArray(obj: Object, from?: number): any[];
-        uniqueArray(array: any[]): any[];
-    }
-
-    export interface EventData {
-        el: HTMLElement;
-    }
-
-    export interface FlightStatic {
-        advice: AdviceStatic;
-        component: ComponentStatic;
-        compose: ComposeStatic;
-        utils: UtilsStatic;
-    }
-}
-
-declare var DEBUG: Flight.DebugStatic;
-declare var flight: Flight.FlightStatic;
diff --git a/flight/index.d.ts b/flight/index.d.ts
new file mode 100644
index 0000000000..c46ddd0bfa
--- /dev/null
+++ b/flight/index.d.ts
@@ -0,0 +1,252 @@
+// Type definitions for Flight 1.1.4
+// Project: http://flightjs.github.com/flight/
+// Definitions by: Jonathan Hedrén <https://github.com/jonathanhedren/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace Flight {
+
+    export interface Base {
+
+        /**
+         * Most Components and Mixins need to define attributes. In Flight,
+         * default values are assigned by passing an object to the attributes
+         * function.
+         *
+         * NOTE: this.attributes replaces the now deprecated this.defaultAttrs.
+         * However, for backwards compatibility, if you are using this.defaultAttrs
+         * then all the old attribute behavior remains in place.
+         */
+        attributes(obj: Object): void;
+
+        /**
+         * Most Components and Mixins need to define attributes. In Flight,
+         * default values are assigned by passing an object to the defaultAttrs
+         * function.
+         *
+         * NOTE: this.attributes replaces the now deprecated this.defaultAttrs.
+         * However, for backwards compatibility, if you are using this.defaultAttrs
+         * then all the old attribute behavior remains in place.
+         */
+        defaultAttrs(obj: Object): void;
+
+        /**
+         * The select method takes an attr key as its argument. The value of the
+         * attr must be a CSS Selector. The method will return all matching
+         * elements within the component's node.
+         *
+         * This is a handy alternative to jQuery's this.$node.find() and prevents
+         * accidental access to elements outside of the component's node.
+         *
+         * @param attr
+         */
+        select(attr: string): JQuery;
+
+        /**
+         * This method is attached to the prototype of every Component; it accepts
+         * the component's node and an options object as arguments. The core
+         * implementation, which is called every time an instance is created, will
+         * assign the node to the instance and override the default attrs with the
+         * options object.
+         *
+         * Components and Mixins will typically augment the core implementation by
+         * supplying a function as an argument to the after method (see the advice
+         * API for more information). This is a good place to set up event
+         * listeners that bind to callbacks.
+         */
+        initialize(node: any, options: Object): void;
+
+        /**
+         * This allows a component instance to listen to an event and register a
+         * callback to be invoked. Flight will automatically bind the context
+         * (this) of the callback to the component instance.
+         *
+         * @param selector Optional. Specify the DOM node(s) that should listen
+         *        for the event. Defaults to the component instance's node value.
+         *
+         * @param eventType The event type to listen for.
+         *
+         * @param handler Either a function (callback) to be invoked, or a map of
+         *        targets and callbacks.
+         */
+        on(eventType: string, handler: Function): void;
+        on(eventType: string, handler: Object): void;
+        on(selector: string, eventType: string, handler: Function): void;
+        on(selector: Document, eventType: string, handler: Function): void;
+        on(selector: Element, eventType: string, handler: Function): void;
+        on(selector: Element[], eventType: string, handler: Function): void;
+        on(selector: string, eventType: string, handler: Object): void;
+        on(selector: Document, eventType: string, handler: Object): void;
+        on(selector: Element, eventType: string, handler: Object): void;
+        on(selector: Element[], eventType: string, handler: Object): void;
+
+        /**
+         * If we no longer want a component instance to listen to an event we can
+         * use the off method to unsubscribe.
+         *
+         * @param selector Optional. The DOM node(s) listening for the event.
+         *        Defaults to the component instance's node value.
+         *
+         * @param eventType The event type being listened to.
+         *
+         * @param handler Optional. The function (callback) to detach from the
+         *        component instance. Defaults to the detaching all callbacks for the event.
+         */
+        off(eventType: string, handler?: Function): void;
+        off(selector: string, eventType: string, handler?: Function): void;
+        off(selector: Document, eventType: string, handler?: Function): void;
+        off(selector: Element, eventType: string, handler?: Function): void;
+        off(selector: Element[], eventType: string, handler?: Function): void;
+        off(selector: string, eventType: Object, handler?: Function): void;
+        off(selector: Document, eventType: Object, handler?: Function): void;
+        off(selector: Element, eventType: Object, handler?: Function): void;
+        off(selector: Element[], eventType: Object, handler?: Function): void;
+        off(selector: string, eventType: string, handler?: Object): void;
+        off(selector: Document, eventType: string, handler?: Object): void;
+        off(selector: Element, eventType: string, handler?: Object): void;
+        off(selector: Element[], eventType: string, handler?: Object): void;
+        off(selector: string, eventType: Object, handler?: Object): void;
+        off(selector: Document, eventType: Object, handler?: Object): void;
+        off(selector: Element, eventType: Object, handler?: Object): void;
+        off(selector: Element[], eventType: Object, handler?: Object): void;
+
+        /**
+         * Trigger an event.
+         *
+         * @param selector Optional. The DOM node(s) that the event will be
+         *        dispatched to. Defaults to the component instance's node value.
+         *
+         * @param eventType String. The event type to be triggered.
+         *
+         * You can also specify a default function that will be called by the
+         * component, providing that nothing in the event's bubble chain invokes
+         * preventDefault. Default functions in custom events are analagous to the
+         * default actions of native events.
+         *
+         * To define a default function, make the eventType argument an object
+         * that specifies the event's type and a defaultBehavior property. A
+         * common use case is defining default behavior for keyboard events.
+         *
+         * @param eventPayload This is the payload of data that accompanies the event.
+         */
+        trigger(eventType: string): void;
+        trigger(selector: string, eventType: string, eventPayload?: Object): void;
+        trigger(selector: Document, eventType: string, eventPayload?: Object): void;
+        trigger(selector: Element, eventType: string, eventPayload?: Object): void;
+        trigger(selector: Element[], eventType: string, eventPayload?: Object): void;
+        trigger(eventType: Object): void;
+        trigger(selector: string, eventType: Object, eventPayload?: Object): void;
+        trigger(selector: Document, eventType: Object, eventPayload?: Object): void;
+        trigger(selector: Element, eventType: Object, eventPayload?: Object): void;
+        trigger(selector: Element[], eventType: Object, eventPayload?: Object): void;
+
+        /**
+         * Remove a component instance and its event bindings.
+         *
+         * It's a good idea to teardown components after each unit test - and
+         * teardown is also good for unbinding event listeners when, for example,
+         * the user navigates away from a page.
+         *
+         */
+        teardown(): void;
+    }
+
+    export interface Advice extends Base {
+        /**
+         * Run the customFunc function after the existingFunc function.
+         *
+         * @param existingFuncName The name of the existing function (existingFunc)
+         *        you want to augment.
+         *
+         * customFunc The function to be invoked after existingFunc.
+         */
+        after(method: string, fn: Function): void;
+
+        /**
+         * Run the existingFunc function in the middle of the customFunc function.
+         * It's similar to underscore's _wrap function).
+         *
+         * @param existingFuncName The name of the existing function (existingFunc)
+         *        you want to augment.
+         *
+         * customFunc The function to wrap around existingFunc. The existingFunc
+         * function will be passed to customFunc as an argument.
+         *
+         * The existing function is passed to the custom function as an argument so
+         * that it can be referenced. If the custom function does not call the
+         * existing function then it will replace that function instead of
+         * surrounding it.
+         */
+        around(method: string, fn: Function): void;
+
+        /**
+         * Run the customFunc function before the existingFunc function.
+         *
+         * @param existingFuncName The name of the existing function (existingFunc)
+         *        you want to augment.
+         *
+         * @param customFunc The function to be invoked before existingFunc.
+         */
+        before(method: string, fn: Function): void;
+    }
+
+    export interface Component extends Base, Advice {
+        node: Element;
+        $node: JQuery;
+    }
+
+    export interface AdviceStatic {
+        withAdvice(): Function;
+    }
+
+    export interface ComponentStatic {
+        (...fns: Function[]): ComponentStatic;
+        attachTo(selector: string, options?: Object): void;
+        attachTo(selector: Element, options?: Object): void;
+        attachTo(selector: JQuery, options?: Object): void;
+        teardownAll(): void;
+    }
+
+    export interface ComposeStatic {
+        mixin(base: Object, mixins: Function[]): void;
+    }
+
+    export interface DebugStatic {
+        events: {
+            logAll(): void;
+            logByAction(action: string): void;
+            logByName(name: string): void;
+            logNone(): void;
+        }
+    }
+
+    export interface UtilsStatic {
+        compose(fn1: Function, fn2: Function, ...fns: Function[]): Function;
+        countThen(num: number, base: Function): Function;
+        debounce(func: Function, wait: number, immediate: boolean): Function;
+        delegate(rules: Object): void;
+        isDomObj(obj: Object): boolean;
+        isEnumerable(obj: Object, property: string): boolean;
+        merge(obj1: Object, obj2: Object, deepClone?: boolean): Object;
+        merge(obj1: Object, obj2: Object, ...args: any[]): Object;
+        push(base: Object, extra: Object, protect?: boolean): void;
+        throttle(func: Function, wait: number): Function;
+        toArray(obj: Object, from?: number): any[];
+        uniqueArray(array: any[]): any[];
+    }
+
+    export interface EventData {
+        el: HTMLElement;
+    }
+
+    export interface FlightStatic {
+        advice: AdviceStatic;
+        component: ComponentStatic;
+        compose: ComposeStatic;
+        utils: UtilsStatic;
+    }
+}
+
+declare var DEBUG: Flight.DebugStatic;
+declare var flight: Flight.FlightStatic;
diff --git a/flight/tsconfig.json b/flight/tsconfig.json
new file mode 100644
index 0000000000..c69a12c594
--- /dev/null
+++ b/flight/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "flight-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/flightplan/flightplan-tests.ts b/flightplan/flightplan-tests.ts
index d744be95ae..de446fe803 100644
--- a/flightplan/flightplan-tests.ts
+++ b/flightplan/flightplan-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="flightplan.d.ts" />
+
 
 import flightplan = require('flightplan');
 
diff --git a/flightplan/flightplan.d.ts b/flightplan/index.d.ts
similarity index 100%
rename from flightplan/flightplan.d.ts
rename to flightplan/index.d.ts
diff --git a/flightplan/tsconfig.json b/flightplan/tsconfig.json
new file mode 100644
index 0000000000..4d238608db
--- /dev/null
+++ b/flightplan/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "flightplan-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/flipsnap/flipsnap-tests.ts b/flipsnap/flipsnap-tests.ts
index a6b2f4fe8b..57de7ae874 100644
--- a/flipsnap/flipsnap-tests.ts
+++ b/flipsnap/flipsnap-tests.ts
@@ -1,7 +1,6 @@
 /**
  * Created by kubosho_ on 6/16/2014.
  */
-///<reference path='flipsnap.d.ts'/>
 
 Flipsnap('', {
     maxPoint: 3,
diff --git a/flipsnap/flipsnap.d.ts b/flipsnap/index.d.ts
similarity index 100%
rename from flipsnap/flipsnap.d.ts
rename to flipsnap/index.d.ts
diff --git a/flipsnap/tsconfig.json b/flipsnap/tsconfig.json
new file mode 100644
index 0000000000..6c575f16c7
--- /dev/null
+++ b/flipsnap/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "flipsnap-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/flot/index.d.ts b/flot/index.d.ts
new file mode 100644
index 0000000000..20fadd0a47
--- /dev/null
+++ b/flot/index.d.ts
@@ -0,0 +1,243 @@
+// Type definitions for Flot
+// Project: http://www.flotcharts.org/
+// Definitions by: Matt Burland <https://github.com/burlandm>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="jquery" />
+
+declare namespace jquery.flot {
+    interface plotOptions {
+        colors?: any[];
+        series?: seriesOptions;
+        legend?: legendOptions;
+        xaxis?: axisOptions;
+        yaxis?: axisOptions;
+        xaxes?: axisOptions[];
+        yaxes?: axisOptions[];
+        grid?: gridOptions;
+        interaction?: interaction;
+        hooks?: hooks;
+    }
+
+    interface hooks {
+        processOptions: { (plot: plot, options: plotOptions): void; } [];
+        processRawData: { (plot: plot, series: dataSeries, data: any[], datapoints: datapoints): void; }[];
+        processDatapoints: { (plot: plot, series: dataSeries, datapoints: datapoints): void; }[];
+        processOffset: { (plot: plot, offset: canvasPoint): void; }[];
+        drawBackground: { (plot: plot, context: CanvasRenderingContext2D): void; }[];
+        drawSeries: { (plot: plot, context: CanvasRenderingContext2D, series: dataSeries): void; }[];
+        draw: { (plot: plot, context: CanvasRenderingContext2D): void; }[];
+        bindEvents: { (plot: plot, eventHolder: JQuery): void; }[];
+        drawOverlay: { (plot: plot, context: CanvasRenderingContext2D): void; }[];
+        shutdown: { (plot: plot, eventHolder: JQuery): void; }[];
+    }
+
+    interface interaction {
+        redrawOverlayInterval?: number;
+    }
+
+    interface gridOptions {
+        show?: boolean;
+        aboveData?: boolean;
+        color?: any;                // color
+        backgroundColor?: any;      //color/gradient or null
+        margin?: any;                // number or margin object
+        labelMargin?: number;
+        axisMargin?: number;
+        markings?: any;             //array of markings or (fn: axes -> array of markings)
+        borderWidth?: any;          // number or width object
+        borderColor?: any;          // color or null
+        minBorderMargin?: number;       // or null
+        clickable?: boolean;
+        hoverable?: boolean;
+        autoHighlight?: boolean;
+        mouseActiveRadius?: number;
+        tickColor?: any;
+        markingsColor?: any;
+        markingsLineWidth?: number;
+    }
+
+    interface legendOptions {
+        show?: boolean;
+        labelFormatter?: (label: string, series: any) => string; //  null or (fn: string, series object -> string)
+        labelBoxBorderColor?: any;   //color
+        noColumns?: number;
+        position?: string;           //"ne" or "nw" or "se" or "sw"
+        margin?: any;                //number of pixels or [x margin, y margin]
+        backgroundColor?: any;       //null or color
+        backgroundOpacity?: number;  // between 0 and 1
+        container?: JQuery;         // null or jQuery object/DOM element/jQuery expression
+        sorted?: any;                //null/false, true, "ascending", "descending" or a comparator
+    }
+
+    interface seriesOptions {
+        color?: any;            // color or number
+        label?: string;
+        lines?: linesOptions;
+        bars?: barsOptions;
+        points?: pointsOptions;
+        xaxis?: number;
+        yaxis?: number;
+        clickable?: boolean;
+        hoverable?: boolean;
+        shadowSize?: number;
+        highlightColor?: any;
+    }
+
+    interface dataSeries extends seriesOptions {
+        data: any[];
+    }
+
+    interface axisOptions {
+        show?: boolean;            // null or true/false
+        position?: string;      // "bottom" or "top" or "left" or "right"
+        mode?: string;          // "time"
+        monthNames?: string[];  // array of month names
+
+        color?: any;            // null or color spec
+        tickColor?: any;        // null or color spec
+        font?: any;             // null or font spec object
+
+        min?: number;
+        max?: number;
+        autoscaleMargin?: number;
+
+        transform?: (v: number) => number;              // null or fn: number -> number
+        inverseTransform?: (v: number) => number;       // null or fn: number -> number
+
+        ticks?: any;                                    // null or number or ticks array or (fn: axis -> ticks array)
+        tickSize?: any;                                 // number or array
+        minTickSize?: any;                              // number or array
+        tickFormatter?: (t: number, a?: axis) => string;                            // (fn: number, object -> string) or string
+        tickDecimals?: number;
+
+        labelWidth?: number;
+        labelHeight?: number;
+        reserveSpace?: boolean;
+
+        tickLength?: number;
+
+        alignTicksWithAxis?: number;
+    }
+
+    interface seriesTypeBase {
+        show?: boolean;
+        lineWidth?: number;
+        fill?: any;              //boolean or number
+        fillColor?: any;         //null or color/gradient
+    }
+
+    interface linesOptions extends seriesTypeBase {
+        steps?: boolean;
+    }
+
+    interface barsOptions extends seriesTypeBase {
+        barWidth?: number;
+        align?: string;
+        horizontal?: boolean;
+    }
+
+    interface pointsOptions extends seriesTypeBase {
+        radius?: number;
+        symbol?: any;
+    }
+
+    interface gradient {
+        colors: any[];
+    }
+
+    interface item {
+        datapoint: number[];        // the point, e.g. [0, 2]
+        dataIndex: number;          // the index of the point in the data array
+        series: dataSeries;             //the series object
+        seriesIndex: number;        //the index of the series
+        pageX: number;
+        pageY: number;              //the global screen coordinates of the point
+    }
+
+    interface datapoints {
+        points: number[];
+        pointsize: number;
+        format: datapointFormat[];
+    }
+
+    interface datapointFormat {
+        x?: boolean;
+        y?: boolean;
+        number: boolean;
+        required: boolean;
+        defaultValue?: number;
+    }
+
+    interface point {
+        x: number;
+        y: number;
+    }
+
+    interface offset {
+        left: number;
+        top: number;
+    }
+
+    interface canvasPoint {
+        top: number;
+        left: number;
+        bottom?: number;
+        right?: number;
+    }
+
+    interface axes {
+        xaxis: axis;
+        yaxis: axis;
+        x2axis?: axis;
+        y2axis?: axis;
+    }
+
+    interface axis extends axisOptions {
+        options: axisOptions;
+        p2c(point: point):canvasPoint;
+        c2p(canvasPoint: canvasPoint):point;
+    }
+
+    interface plugin {
+        init(options: plotOptions): any;
+        options?: any;
+        name?: string;
+        version?: string;
+    }
+
+    interface plot {
+        highlight(series: dataSeries, datapoint: item): void;
+        unhighlight(): void;
+        unhighlight(series: dataSeries, datapoint: item): void;
+        setData(data: any): void;
+        setupGrid(): void;
+        draw(): void;
+        triggerRedrawOverlay(): void;
+        width(): number;
+        height(): number;
+        offset(): JQueryCoordinates;
+        pointOffset(point: point): offset;
+        resize(): void;
+        shutdown(): void;
+        getData(): dataSeries[];
+        getAxes(): axes;
+        getXAxes(): axis[];
+        getYAxes(): axis[];
+        getPlaceholder(): JQuery;
+        getCanvas(): HTMLCanvasElement;
+        getPlotOffset(): canvasPoint;
+        getOptions(): plotOptions;
+    }
+
+    interface plotStatic {
+        (placeholder: JQuery, data: dataSeries[], options?: plotOptions): plot;
+        (placeholder: JQuery, data: any[], options?: plotOptions): plot;
+        plugins: plugin[];
+    }
+}
+
+interface JQueryStatic {
+    plot: jquery.flot.plotStatic;
+}
diff --git a/flot/jquery.flot.d.ts b/flot/jquery.flot.d.ts
deleted file mode 100644
index abc682088a..0000000000
--- a/flot/jquery.flot.d.ts
+++ /dev/null
@@ -1,243 +0,0 @@
-// Type definitions for Flot
-// Project: http://www.flotcharts.org/
-// Definitions by: Matt Burland <https://github.com/burlandm>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace jquery.flot {
-    interface plotOptions {
-        colors?: any[];
-        series?: seriesOptions;
-        legend?: legendOptions;
-        xaxis?: axisOptions;
-        yaxis?: axisOptions;
-        xaxes?: axisOptions[];
-        yaxes?: axisOptions[];
-        grid?: gridOptions;
-        interaction?: interaction;
-        hooks?: hooks;
-    }
-
-    interface hooks {
-        processOptions: { (plot: plot, options: plotOptions): void; } [];
-        processRawData: { (plot: plot, series: dataSeries, data: any[], datapoints: datapoints): void; }[];
-        processDatapoints: { (plot: plot, series: dataSeries, datapoints: datapoints): void; }[];
-        processOffset: { (plot: plot, offset: canvasPoint): void; }[];
-        drawBackground: { (plot: plot, context: CanvasRenderingContext2D): void; }[];
-        drawSeries: { (plot: plot, context: CanvasRenderingContext2D, series: dataSeries): void; }[];
-        draw: { (plot: plot, context: CanvasRenderingContext2D): void; }[];
-        bindEvents: { (plot: plot, eventHolder: JQuery): void; }[];
-        drawOverlay: { (plot: plot, context: CanvasRenderingContext2D): void; }[];
-        shutdown: { (plot: plot, eventHolder: JQuery): void; }[];
-    }
-
-    interface interaction {
-        redrawOverlayInterval?: number;
-    }
-
-    interface gridOptions {
-        show?: boolean;
-        aboveData?: boolean;
-        color?: any;                // color
-        backgroundColor?: any;      //color/gradient or null
-        margin?: any;                // number or margin object
-        labelMargin?: number;
-        axisMargin?: number;
-        markings?: any;             //array of markings or (fn: axes -> array of markings)
-        borderWidth?: any;          // number or width object
-        borderColor?: any;          // color or null
-        minBorderMargin?: number;       // or null
-        clickable?: boolean;
-        hoverable?: boolean;
-        autoHighlight?: boolean;
-        mouseActiveRadius?: number;
-        tickColor?: any;
-        markingsColor?: any;
-        markingsLineWidth?: number;
-    }
-
-    interface legendOptions {
-        show?: boolean;
-        labelFormatter?: (label: string, series: any) => string; //  null or (fn: string, series object -> string)
-        labelBoxBorderColor?: any;   //color
-        noColumns?: number;
-        position?: string;           //"ne" or "nw" or "se" or "sw"
-        margin?: any;                //number of pixels or [x margin, y margin]
-        backgroundColor?: any;       //null or color
-        backgroundOpacity?: number;  // between 0 and 1
-        container?: JQuery;         // null or jQuery object/DOM element/jQuery expression
-        sorted?: any;                //null/false, true, "ascending", "descending" or a comparator
-    }
-
-    interface seriesOptions {
-        color?: any;            // color or number
-        label?: string;
-        lines?: linesOptions;
-        bars?: barsOptions;
-        points?: pointsOptions;
-        xaxis?: number;
-        yaxis?: number;
-        clickable?: boolean;
-        hoverable?: boolean;
-        shadowSize?: number;
-        highlightColor?: any;
-    }
-
-    interface dataSeries extends seriesOptions {
-        data: any[];
-    }
-
-    interface axisOptions {
-        show?: boolean;            // null or true/false
-        position?: string;      // "bottom" or "top" or "left" or "right"
-        mode?: string;          // "time"
-        monthNames?: string[];  // array of month names
-
-        color?: any;            // null or color spec
-        tickColor?: any;        // null or color spec
-        font?: any;             // null or font spec object
-
-        min?: number;
-        max?: number;
-        autoscaleMargin?: number;
-
-        transform?: (v: number) => number;              // null or fn: number -> number
-        inverseTransform?: (v: number) => number;       // null or fn: number -> number
-
-        ticks?: any;                                    // null or number or ticks array or (fn: axis -> ticks array)
-        tickSize?: any;                                 // number or array
-        minTickSize?: any;                              // number or array
-        tickFormatter?: (t: number, a?: axis) => string;                            // (fn: number, object -> string) or string
-        tickDecimals?: number;
-
-        labelWidth?: number;
-        labelHeight?: number;
-        reserveSpace?: boolean;
-
-        tickLength?: number;
-
-        alignTicksWithAxis?: number;
-    }
-
-    interface seriesTypeBase {
-        show?: boolean;
-        lineWidth?: number;
-        fill?: any;              //boolean or number
-        fillColor?: any;         //null or color/gradient
-    }
-
-    interface linesOptions extends seriesTypeBase {
-        steps?: boolean;
-    }
-
-    interface barsOptions extends seriesTypeBase {
-        barWidth?: number;
-        align?: string;
-        horizontal?: boolean;
-    }
-
-    interface pointsOptions extends seriesTypeBase {
-        radius?: number;
-        symbol?: any;
-    }
-
-    interface gradient {
-        colors: any[];
-    }
-
-    interface item {
-        datapoint: number[];        // the point, e.g. [0, 2]
-        dataIndex: number;          // the index of the point in the data array
-        series: dataSeries;             //the series object
-        seriesIndex: number;        //the index of the series
-        pageX: number;
-        pageY: number;              //the global screen coordinates of the point
-    }
-
-    interface datapoints {
-        points: number[];
-        pointsize: number;
-        format: datapointFormat[];
-    }
-
-    interface datapointFormat {
-        x?: boolean;
-        y?: boolean;
-        number: boolean;
-        required: boolean;
-        defaultValue?: number;
-    }
-
-    interface point {
-        x: number;
-        y: number;
-    }
-
-    interface offset {
-        left: number;
-        top: number;
-    }
-
-    interface canvasPoint {
-        top: number;
-        left: number;
-        bottom?: number;
-        right?: number;
-    }
-
-    interface axes {
-        xaxis: axis;
-        yaxis: axis;
-        x2axis?: axis;
-        y2axis?: axis;
-    }
-
-    interface axis extends axisOptions {
-        options: axisOptions;
-        p2c(point: point):canvasPoint;
-        c2p(canvasPoint: canvasPoint):point;
-    }
-
-    interface plugin {
-        init(options: plotOptions): any;
-        options?: any;
-        name?: string;
-        version?: string;
-    }
-
-    interface plot {
-        highlight(series: dataSeries, datapoint: item): void;
-        unhighlight(): void;
-        unhighlight(series: dataSeries, datapoint: item): void;
-        setData(data: any): void;
-        setupGrid(): void;
-        draw(): void;
-        triggerRedrawOverlay(): void;
-        width(): number;
-        height(): number;
-        offset(): JQueryCoordinates;
-        pointOffset(point: point): offset;
-        resize(): void;
-        shutdown(): void;
-        getData(): dataSeries[];
-        getAxes(): axes;
-        getXAxes(): axis[];
-        getYAxes(): axis[];
-        getPlaceholder(): JQuery;
-        getCanvas(): HTMLCanvasElement;
-        getPlotOffset(): canvasPoint;
-        getOptions(): plotOptions;
-    }
-
-    interface plotStatic {
-        (placeholder: JQuery, data: dataSeries[], options?: plotOptions): plot;
-        (placeholder: JQuery, data: any[], options?: plotOptions): plot;
-        plugins: plugin[];
-    }
-}
-
-interface JQueryStatic {
-    plot: jquery.flot.plotStatic;
-}
diff --git a/flot/tsconfig.json b/flot/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/flot/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/flowjs/flowjs-tests.ts b/flowjs/flowjs-tests.ts
index b89625b48f..efb2c30f5b 100644
--- a/flowjs/flowjs-tests.ts
+++ b/flowjs/flowjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="flowjs.d.ts" />
+
 
 // flow object
 var flowObject: flowjs.IFlow;
@@ -71,8 +71,8 @@ flowFile.cancel();
 flowFile.retry();
 flowFile.bootstrap();
 bool = flowFile.isUploading();
-bool = flowFile.isComplete;
-num = flowFile.sizeUploaded;
-num = flowFile.timeRemaining;
-str = flowFile.getExtension;
-str = flowFile.getType;
+bool = flowFile.isComplete();
+num = flowFile.sizeUploaded();
+num = flowFile.timeRemaining();
+str = flowFile.getExtension();
+str = flowFile.getType();
diff --git a/flowjs/flowjs.d.ts b/flowjs/flowjs.d.ts
deleted file mode 100644
index d9d14851e8..0000000000
--- a/flowjs/flowjs.d.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-// Type definitions for flowjs
-// Project: https://github.com/flowjs/flow.js
-// Definitions by: Ryan McNamara <https://github.com/ryan10132>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace flowjs {
-    interface IFlow {
-        support: boolean;
-        supportDirectory: boolean;
-        opts: Object;
-        files: IFlowFile[];
-
-        assignBrowse(domNodes: HTMLElement[], isDirectory: boolean, singleFile: boolean, attributes: Object): void;
-        assignDrop(domNodes: HTMLElement[]): void;
-        unAssignDrop(domNodes: HTMLElement[]): void;
-        on(event: string, callback: Function): void;
-        off(event?: string, callback?: Function): void;
-        upload(): void;
-        pause(): void;
-        resume(): void;
-        cancel(): void;
-        progress(): number;
-        isUploading(): boolean;
-        addFile(file: File): void;
-        removeFile(file: IFlowFile): void;
-        getFromUniqueIdentifier(uniqueIdentifier: string): IFlowFile;
-        getSize(): number;
-        sizeUploaded(): number;
-        timeRemaining(): number;
-    }
-
-    interface IFlowOptions {
-        target?: string;
-        singleFile?: boolean;
-        chunkSize?: number;
-        forceChunkSize?: boolean;
-        simultaneousUploads?: number;
-        fileParameterName?: string;
-        query?: Object;
-        headers?: Object;
-        withCredentials?: boolean;
-        method?: string;
-        testMethod?: string;
-        uploadMethod?: string;
-        allowDuplicateUploads?: boolean;
-        prioritizeFirstAndLastChunk?: boolean;
-        testChunks?: boolean;
-        preprocess?: Function;
-        initFileFn?: Function;
-        generateUniqueIdentifier?: Function;
-        maxChunkRetries?: number;
-        chunkRetryInterval?: number;
-        progressCallbacksInterval?: number;
-        speedSmoothingFactor?: number;
-        successStatuses?: string[];
-        permanentErrors?: string[];
-    }
-
-    interface IFlowFile {
-        flowObj: IFlow;
-        file: File;
-        name: string;
-        relativePath: string;
-        size: number;
-        uniqueIdentifier: string;
-        averageSpeed: number;
-        currentSpeed: number;
-        chunks: any[];
-        paused: boolean;
-        error: boolean;
-
-        progress(relative: boolean): number;
-        pause(): void;
-        resume(): void;
-        cancel(): void;
-        retry(): void;
-        bootstrap(): void;
-        isUploading(): boolean;
-        isComplete: boolean;
-        sizeUploaded: number;
-        timeRemaining: number;
-        getExtension: string;
-        getType: string;
-    }
-}
diff --git a/flowjs/index.d.ts b/flowjs/index.d.ts
new file mode 100644
index 0000000000..ff5c6b8b25
--- /dev/null
+++ b/flowjs/index.d.ts
@@ -0,0 +1,85 @@
+// Type definitions for flowjs
+// Project: https://github.com/flowjs/flow.js
+// Definitions by: Ryan McNamara <https://github.com/ryan10132>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace flowjs {
+    interface IFlow {
+        support: boolean;
+        supportDirectory: boolean;
+        opts: Object;
+        files: IFlowFile[];
+
+        assignBrowse(domNodes: HTMLElement[], isDirectory: boolean, singleFile: boolean, attributes: Object): void;
+        assignDrop(domNodes: HTMLElement[]): void;
+        unAssignDrop(domNodes: HTMLElement[]): void;
+        on(event: string, callback: Function): void;
+        off(event?: string, callback?: Function): void;
+        upload(): void;
+        pause(): void;
+        resume(): void;
+        cancel(): void;
+        progress(): number;
+        isUploading(): boolean;
+        addFile(file: File): void;
+        removeFile(file: IFlowFile): void;
+        getFromUniqueIdentifier(uniqueIdentifier: string): IFlowFile;
+        getSize(): number;
+        sizeUploaded(): number;
+        timeRemaining(): number;
+    }
+
+    interface IFlowOptions {
+        target?: string;
+        singleFile?: boolean;
+        chunkSize?: number;
+        forceChunkSize?: boolean;
+        simultaneousUploads?: number;
+        fileParameterName?: string;
+        query?: Object;
+        headers?: Object;
+        withCredentials?: boolean;
+        method?: string;
+        testMethod?: string;
+        uploadMethod?: string;
+        allowDuplicateUploads?: boolean;
+        prioritizeFirstAndLastChunk?: boolean;
+        testChunks?: boolean;
+        preprocess?: Function;
+        initFileFn?: Function;
+        generateUniqueIdentifier?: Function;
+        maxChunkRetries?: number;
+        chunkRetryInterval?: number;
+        progressCallbacksInterval?: number;
+        speedSmoothingFactor?: number;
+        successStatuses?: string[];
+        permanentErrors?: string[];
+    }
+
+    interface IFlowFile {
+        flowObj: IFlow;
+        file: File;
+        name: string;
+        relativePath: string;
+        size: number;
+        uniqueIdentifier: string;
+        averageSpeed: number;
+        currentSpeed: number;
+        chunks: any[];
+        paused: boolean;
+        error: boolean;
+
+        progress(relative: boolean): number;
+        pause(): void;
+        resume(): void;
+        cancel(): void;
+        retry(): void;
+        bootstrap(): void;
+        isUploading(): boolean;
+        isComplete(): boolean;
+        sizeUploaded(): number;
+        timeRemaining(): number;
+        getExtension(): string;
+        getType(): string;
+    }
+}
diff --git a/flowjs/tsconfig.json b/flowjs/tsconfig.json
new file mode 100644
index 0000000000..47c748fce9
--- /dev/null
+++ b/flowjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "flowjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/flux-standard-action/flux-standard-action-tests.ts b/flux-standard-action/flux-standard-action-tests.ts
index 9c54d810d6..5934e56fb8 100644
--- a/flux-standard-action/flux-standard-action-tests.ts
+++ b/flux-standard-action/flux-standard-action-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="flux-standard-action.d.ts" />
 
 //import action = require('flux-standard-action');
 import { isError, isFSA, Action, ErrorAction } from 'flux-standard-action';
diff --git a/flux-standard-action/flux-standard-action.d.ts b/flux-standard-action/flux-standard-action.d.ts
deleted file mode 100644
index 0f46f24972..0000000000
--- a/flux-standard-action/flux-standard-action.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-// Type definitions for flux-standard-action 0.5.0
-// Project: https://github.com/acdlite/flux-standard-action
-// Definitions by: Qubo <https://github.com/tkqubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "flux-standard-action" {
-    export interface ErrorAction extends Action<Error> {
-        error: boolean;
-    }
-
-    export interface Action<T> {
-        type: string;
-        payload?: T;
-        error?: boolean;
-    }
-
-    // Usage: var action: Action<sring> & AnyMeta;
-    export interface AnyMeta {
-        meta: any
-    }
-
-    // Usage: var action: Action<sring> & TypedMeta<string>;
-    export interface TypedMeta<T> {
-        meta: T
-    }
-
-    export function isFSA(action: any): boolean;
-
-    export function isError(action: any): boolean;
-}
-
diff --git a/flux-standard-action/index.d.ts b/flux-standard-action/index.d.ts
new file mode 100644
index 0000000000..d5393e0ace
--- /dev/null
+++ b/flux-standard-action/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for flux-standard-action 0.5.0
+// Project: https://github.com/acdlite/flux-standard-action
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export interface ErrorAction extends Action<Error> {
+    error: boolean;
+}
+
+export interface Action<T> {
+    type: string;
+    payload?: T;
+    error?: boolean;
+}
+
+// Usage: var action: Action<sring> & AnyMeta;
+export interface AnyMeta {
+    meta: any
+}
+
+// Usage: var action: Action<sring> & TypedMeta<string>;
+export interface TypedMeta<T> {
+    meta: T
+}
+
+export declare function isFSA(action: any): boolean;
+
+export declare function isError(action: any): boolean;
diff --git a/flux-standard-action/tsconfig.json b/flux-standard-action/tsconfig.json
new file mode 100644
index 0000000000..5894f12705
--- /dev/null
+++ b/flux-standard-action/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "flux-standard-action-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/flux/flux-tests.ts b/flux/flux-tests.ts
index 24369ef2dd..044ec98b3f 100644
--- a/flux/flux-tests.ts
+++ b/flux/flux-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="flux.d.ts" />
-/// <reference path="../react/react.d.ts" />
+
+/// <reference types="react" />
 
 import flux = require('flux')
 import FluxUtils = require('flux/utils')
diff --git a/flux/flux.d.ts b/flux/flux.d.ts
deleted file mode 100644
index c3e9e3c10a..0000000000
--- a/flux/flux.d.ts
+++ /dev/null
@@ -1,194 +0,0 @@
-// Type definitions for Flux
-// Project: http://facebook.github.io/flux/
-// Definitions by: Steve Baker <https://github.com/stkb/>, Giedrius Grabauskas <https://github.com/QuatroDevOfficial/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts" />
-
-declare namespace Flux {
-
-    /**
-    * Dispatcher class
-    * Create an instance to use throughout the application.
-    * Or extend it to create a derived dispatcher class.
-    *
-    * Specify a type in the 'TPayload' generic argument to use strongly-typed payloads,
-    * otherwise specify 'any'
-    *
-    * Examples:
-    *     var dispatcher = new flux.Dispatcher<any>()
-    *     var typedDispatcher = new flux.Dispatcher<MyCustomActionType>()
-    *     class DerivedDispatcher extends flux.Dispatcher<MyCustomActionType> { }
-    */
-    export class Dispatcher<TPayload> {
-
-        /**
-        * Create an instance of the Dispatcher class to use throughout the application.
-        *
-        * Specify a type in the 'TPayload' generic argument to use strongly-typed payloads,
-        * otherwise specify 'any'
-        *
-        * Examples:
-        *     var dispatcher = new flux.Dispatcher<any>()
-        *     var typedDispatcher = new flux.Dispatcher<MyCustomActionType>()
-        */
-        constructor();
-
-        /**
-        * Registers a callback that will be invoked with every payload sent to the dispatcher.
-        * Returns a string token to identify the callback to be used with waitFor() or unregister.
-        */
-        register(callback: (payload: TPayload) => void): string;
-
-        /**
-        * Unregisters a callback with the given ID token
-        */
-        unregister(id: string): void;
-
-        /**
-        * Waits for the callbacks with the specified IDs to be invoked before continuing execution
-        * of the current callback. This method should only be used by a callback in response
-        * to a dispatched payload.
-        */
-        waitFor(IDs: string[]): void;
-
-        /**
-        * Dispatches a payload to all registered callbacks
-        */
-        dispatch(payload: TPayload): void;
-
-        /**
-        * Gets whether the dispatcher is currently dispatching
-        */
-        isDispatching(): boolean;
-    }
-}
-
-declare module "flux" {
-    export = Flux;
-}
-
-declare namespace FluxUtils {
-
-    import React = __React;
-    export class Container {
-        constructor();
-        /**
-        * Create is used to transform a react class into a container
-        * that updates its state when relevant stores change.
-        * The provided base class must have static methods getStores() and calculateState().
-        */
-        static create(base: React.ComponentClass<any>, options?: any): React.ComponentClass<any>;
-    }
-
-    /**
-    * This class extends ReduceStore and defines the state as an immutable map.
-    */
-    // TODO: Change <any>  to <Immutable.Map<K, V>>
-    export class MapStore<K extends string | number, V> extends ReduceStore<any> {
-        /**
-        * Access the value at the given key.
-        * Throws an error if the key does not exist in the cache.
-        */
-        at(key: K): V;
-
-        /**
-        *  Check if the cache has a particular key
-        */
-        has(key: K): boolean;
-
-        /**
-        * Get the value of a particular key.
-        * Returns undefined if the key does not exist in the cache.
-        */
-        get(key: K): V;
-
-        /**
-        * Gets an array of keys and puts the values in a map if they exist,
-        * it allows providing a previous result to update instead of generating a new map.
-        * Providing a previous result allows the possibility of keeping the same reference if the keys did not change.
-        */
-        // TODO: Update with Immutable interface.
-        // getAll(keys: Immutable.IndexedIterable<K>, prev?: Immutable.Map<K, V>): Immutable.Map<K, V>;
-        getAll(keys: any, prev?: any): any;
-    }
-
-    export class ReduceStore<T> extends Store {
-        /**
-        * Getter that exposes the entire state of this store.
-        * If your state is not immutable you should override this and not expose state directly.
-        */
-        getState(): T;
-
-        /**
-        * Constructs the initial state for this store.
-        * This is called once during construction of the store.
-        */
-        getInitialState(): T;
-
-        /**
-        * Reduces the current state, and an action to the new state of this store.
-        * All subclasses must implement this method.
-        * This method should be pure and have no side-effects.
-        */
-        reduce(state: T, action: any): T;
-
-        /**
-        * Checks if two versions of state are the same.
-        * You do not need to override this if your state is immutable.
-        */
-        areEqual(one: T, two: T): boolean;
-
-    }
-
-    export class Store {
-
-        /**
-        * Constructs and registers an instance of this store with the given dispatcher.
-        */
-        constructor(dispatcher: Flux.Dispatcher<any>);
-
-        /**
-        * Adds a listener to the store, when the store changes the given callback will be called.
-        * A token is returned that can be used to remove the listener.
-        * Calling the remove() function on the returned token will remove the listener.
-        */
-        addListener(callback: Function): { remove: Function };
-
-        /**
-        * Returns the dispatcher this store is registered with.
-        */
-        getDispatcher(): Flux.Dispatcher<any>;
-
-        /**
-        * Returns the dispatch token that the dispatcher recognizes this store by.
-        * Can be used to waitFor() this store.
-        */
-        getDispatchToken(): string;
-
-        /**
-        * Ask if a store has changed during the current dispatch.
-        * Can only be invoked while dispatching.
-        * This can be used for constructing derived stores that depend on data from other stores.
-        */
-        hasChanged(): boolean;
-
-        /**
-        *Emit an event notifying all listeners that this store has changed.
-        * This can only be invoked when dispatching.
-        * Changes are de-duplicated and resolved at the end of this store's __onDispatch function.
-        */
-        __emitChange(): void;
-
-        /**
-        * Subclasses must override this method.
-        * This is how the store receives actions from the dispatcher.
-        * All state mutation logic must be done during this method.
-        */
-        __onDispatch(payload: any): void;
-    }
-}
-
-declare module 'flux/utils' {
-    export = FluxUtils;
-}
diff --git a/flux/index.d.ts b/flux/index.d.ts
new file mode 100644
index 0000000000..ead7cbbdb7
--- /dev/null
+++ b/flux/index.d.ts
@@ -0,0 +1,192 @@
+// Type definitions for Flux
+// Project: http://facebook.github.io/flux/
+// Definitions by: Steve Baker <https://github.com/stkb/>, Giedrius Grabauskas <https://github.com/QuatroDevOfficial/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react" />
+
+declare namespace Flux {
+
+    /**
+    * Dispatcher class
+    * Create an instance to use throughout the application.
+    * Or extend it to create a derived dispatcher class.
+    *
+    * Specify a type in the 'TPayload' generic argument to use strongly-typed payloads,
+    * otherwise specify 'any'
+    *
+    * Examples:
+    *     var dispatcher = new flux.Dispatcher<any>()
+    *     var typedDispatcher = new flux.Dispatcher<MyCustomActionType>()
+    *     class DerivedDispatcher extends flux.Dispatcher<MyCustomActionType> { }
+    */
+    export class Dispatcher<TPayload> {
+
+        /**
+        * Create an instance of the Dispatcher class to use throughout the application.
+        *
+        * Specify a type in the 'TPayload' generic argument to use strongly-typed payloads,
+        * otherwise specify 'any'
+        *
+        * Examples:
+        *     var dispatcher = new flux.Dispatcher<any>()
+        *     var typedDispatcher = new flux.Dispatcher<MyCustomActionType>()
+        */
+        constructor();
+
+        /**
+        * Registers a callback that will be invoked with every payload sent to the dispatcher.
+        * Returns a string token to identify the callback to be used with waitFor() or unregister.
+        */
+        register(callback: (payload: TPayload) => void): string;
+
+        /**
+        * Unregisters a callback with the given ID token
+        */
+        unregister(id: string): void;
+
+        /**
+        * Waits for the callbacks with the specified IDs to be invoked before continuing execution
+        * of the current callback. This method should only be used by a callback in response
+        * to a dispatched payload.
+        */
+        waitFor(IDs: string[]): void;
+
+        /**
+        * Dispatches a payload to all registered callbacks
+        */
+        dispatch(payload: TPayload): void;
+
+        /**
+        * Gets whether the dispatcher is currently dispatching
+        */
+        isDispatching(): boolean;
+    }
+}
+
+declare module "flux" {
+    export = Flux;
+}
+
+declare namespace FluxUtils {
+    export class Container {
+        constructor();
+        /**
+        * Create is used to transform a react class into a container
+        * that updates its state when relevant stores change.
+        * The provided base class must have static methods getStores() and calculateState().
+        */
+        static create(base: React.ComponentClass<any>, options?: any): React.ComponentClass<any>;
+    }
+
+    /**
+    * This class extends ReduceStore and defines the state as an immutable map.
+    */
+    // TODO: Change <any>  to <Immutable.Map<K, V>>
+    export class MapStore<K extends string | number, V> extends ReduceStore<any> {
+        /**
+        * Access the value at the given key.
+        * Throws an error if the key does not exist in the cache.
+        */
+        at(key: K): V;
+
+        /**
+        *  Check if the cache has a particular key
+        */
+        has(key: K): boolean;
+
+        /**
+        * Get the value of a particular key.
+        * Returns undefined if the key does not exist in the cache.
+        */
+        get(key: K): V;
+
+        /**
+        * Gets an array of keys and puts the values in a map if they exist,
+        * it allows providing a previous result to update instead of generating a new map.
+        * Providing a previous result allows the possibility of keeping the same reference if the keys did not change.
+        */
+        // TODO: Update with Immutable interface.
+        // getAll(keys: Immutable.IndexedIterable<K>, prev?: Immutable.Map<K, V>): Immutable.Map<K, V>;
+        getAll(keys: any, prev?: any): any;
+    }
+
+    export class ReduceStore<T> extends Store {
+        /**
+        * Getter that exposes the entire state of this store.
+        * If your state is not immutable you should override this and not expose state directly.
+        */
+        getState(): T;
+
+        /**
+        * Constructs the initial state for this store.
+        * This is called once during construction of the store.
+        */
+        getInitialState(): T;
+
+        /**
+        * Reduces the current state, and an action to the new state of this store.
+        * All subclasses must implement this method.
+        * This method should be pure and have no side-effects.
+        */
+        reduce(state: T, action: any): T;
+
+        /**
+        * Checks if two versions of state are the same.
+        * You do not need to override this if your state is immutable.
+        */
+        areEqual(one: T, two: T): boolean;
+
+    }
+
+    export class Store {
+
+        /**
+        * Constructs and registers an instance of this store with the given dispatcher.
+        */
+        constructor(dispatcher: Flux.Dispatcher<any>);
+
+        /**
+        * Adds a listener to the store, when the store changes the given callback will be called.
+        * A token is returned that can be used to remove the listener.
+        * Calling the remove() function on the returned token will remove the listener.
+        */
+        addListener(callback: Function): { remove: Function };
+
+        /**
+        * Returns the dispatcher this store is registered with.
+        */
+        getDispatcher(): Flux.Dispatcher<any>;
+
+        /**
+        * Returns the dispatch token that the dispatcher recognizes this store by.
+        * Can be used to waitFor() this store.
+        */
+        getDispatchToken(): string;
+
+        /**
+        * Ask if a store has changed during the current dispatch.
+        * Can only be invoked while dispatching.
+        * This can be used for constructing derived stores that depend on data from other stores.
+        */
+        hasChanged(): boolean;
+
+        /**
+        *Emit an event notifying all listeners that this store has changed.
+        * This can only be invoked when dispatching.
+        * Changes are de-duplicated and resolved at the end of this store's __onDispatch function.
+        */
+        __emitChange(): void;
+
+        /**
+        * Subclasses must override this method.
+        * This is how the store receives actions from the dispatcher.
+        * All state mutation logic must be done during this method.
+        */
+        __onDispatch(payload: any): void;
+    }
+}
+
+declare module 'flux/utils' {
+    export = FluxUtils;
+}
diff --git a/flux/tsconfig.json b/flux/tsconfig.json
new file mode 100644
index 0000000000..f286bf39fa
--- /dev/null
+++ b/flux/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "flux-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fluxxor/fluxxor-tests.ts b/fluxxor/fluxxor-tests.ts
index 7d8c5c948d..ef6a8c707a 100644
--- a/fluxxor/fluxxor-tests.ts
+++ b/fluxxor/fluxxor-tests.ts
@@ -1,5 +1,3 @@
-///<reference path='fluxxor.d.ts' />
-
 import React = require('react');
 import Fluxxor = require('fluxxor');
 
diff --git a/fluxxor/fluxxor.d.ts b/fluxxor/fluxxor.d.ts
deleted file mode 100644
index b877438830..0000000000
--- a/fluxxor/fluxxor.d.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-// Type definitions for Fluxxor 1.5.2
-// Project: https://github.com/BinaryMuse/fluxxor
-// Definitions by: Yuichi Murata <https://github.com/mrk21>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path='../react/react.d.ts' />
-///<reference path='../eventemitter3/eventemitter3.d.ts' />
-
-declare namespace Fluxxor {
-    class Dispatcher {
-        constructor(stores: any);
-        addStore(name: string, store: Store): void;
-        dispatch(action: Function): void;
-        doDispatchLoop(action: Function): void;
-        waitForStores(store: Store, stores: string[], fn: Function): void;
-    }
-
-    class Flux extends EventEmitter3.EventEmitter {
-        constructor(stores: any, actions: any);
-        addActions(actions: any): void;
-        addAction(...args: Array<string|Function>): void;
-        addAction(names: string[], action: Function): void;
-        store(name: string): any;
-        addStore(name: string, store: Store): void;
-        addStores(stores: any): void;
-        stores: any;
-        actions: any;
-    }
-
-    interface Store extends EventEmitter3.EventEmitter {
-        bindActions(...args: Array<string|Function>): void;
-        bindActions(args: Array<string|Function>): void;
-        waitFor(stores: string[], fn: Function): void;
-    }
-
-    interface StoreSpec {
-        initialize?(instance?: any, options?: {}): void;
-        actions?: any;
-    }
-
-    interface StoreClass {
-        new (options?: {}): any;
-    }
-
-    interface Context {
-        flux: Flux;
-    }
-
-    interface FluxMixin {
-        getFlux(): Flux;
-    }
-
-    interface FluxChildMixin {
-        getFlux(): Flux;
-    }
-
-    interface StoreWatchMixin<StoreState> {
-        getStateFromFlux(): StoreState;
-    }
-
-    function FluxMixin(React: typeof __React): FluxMixin;
-    function FluxChildMixin(React: typeof __React): FluxChildMixin;
-    function StoreWatchMixin<StoreState>(...storeNames: string[]): StoreWatchMixin<StoreState>;
-    function createStore(spec: StoreSpec): StoreClass;
-    var version: string;
-}
-
-declare module 'fluxxor' {
-    export = Fluxxor;
-}
diff --git a/fluxxor/index.d.ts b/fluxxor/index.d.ts
new file mode 100644
index 0000000000..658e4878b9
--- /dev/null
+++ b/fluxxor/index.d.ts
@@ -0,0 +1,70 @@
+// Type definitions for Fluxxor 1.5.2
+// Project: https://github.com/BinaryMuse/fluxxor
+// Definitions by: Yuichi Murata <https://github.com/mrk21>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react" />
+/// <reference types="eventemitter3" />
+
+declare namespace Fluxxor {
+    class Dispatcher {
+        constructor(stores: any);
+        addStore(name: string, store: Store): void;
+        dispatch(action: Function): void;
+        doDispatchLoop(action: Function): void;
+        waitForStores(store: Store, stores: string[], fn: Function): void;
+    }
+
+    class Flux extends EventEmitter3.EventEmitter {
+        constructor(stores: any, actions: any);
+        addActions(actions: any): void;
+        addAction(...args: Array<string|Function>): void;
+        addAction(names: string[], action: Function): void;
+        store(name: string): any;
+        addStore(name: string, store: Store): void;
+        addStores(stores: any): void;
+        stores: any;
+        actions: any;
+    }
+
+    interface Store extends EventEmitter3.EventEmitter {
+        bindActions(...args: Array<string|Function>): void;
+        bindActions(args: Array<string|Function>): void;
+        waitFor(stores: string[], fn: Function): void;
+    }
+
+    interface StoreSpec {
+        initialize?(instance?: any, options?: {}): void;
+        actions?: any;
+    }
+
+    interface StoreClass {
+        new (options?: {}): any;
+    }
+
+    interface Context {
+        flux: Flux;
+    }
+
+    interface FluxMixin {
+        getFlux(): Flux;
+    }
+
+    interface FluxChildMixin {
+        getFlux(): Flux;
+    }
+
+    interface StoreWatchMixin<StoreState> {
+        getStateFromFlux(): StoreState;
+    }
+
+    function FluxMixin(react: typeof React): FluxMixin;
+    function FluxChildMixin(react: typeof React): FluxChildMixin;
+    function StoreWatchMixin<StoreState>(...storeNames: string[]): StoreWatchMixin<StoreState>;
+    function createStore(spec: StoreSpec): StoreClass;
+    var version: string;
+}
+
+declare module 'fluxxor' {
+    export = Fluxxor;
+}
diff --git a/fluxxor/tsconfig.json b/fluxxor/tsconfig.json
new file mode 100644
index 0000000000..58d73011f3
--- /dev/null
+++ b/fluxxor/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "fluxxor-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fontoxml/fontoxml-tests.ts b/fontoxml/fontoxml-tests.ts
index 11d47db895..512677cefb 100644
--- a/fontoxml/fontoxml-tests.ts
+++ b/fontoxml/fontoxml-tests.ts
@@ -1,5 +1,3 @@
-///<reference path='fontoxml.d.ts' />
-
 var workflow:com.fontoxml.IWorkflowInfo = {
 	id:"1",
 	displayName:"workflow"
diff --git a/fontoxml/fontoxml.d.ts b/fontoxml/index.d.ts
similarity index 100%
rename from fontoxml/fontoxml.d.ts
rename to fontoxml/index.d.ts
diff --git a/fontoxml/tsconfig.json b/fontoxml/tsconfig.json
new file mode 100644
index 0000000000..3550d8777d
--- /dev/null
+++ b/fontoxml/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "fontoxml-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/forge-di/forge-di-tests.ts b/forge-di/forge-di-tests.ts
index 33bff47161..1880c62dc3 100644
--- a/forge-di/forge-di-tests.ts
+++ b/forge-di/forge-di-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./forge-di.d.ts" />
 
 import Forge = require('forge-di');
 
diff --git a/forge-di/forge-di.d.ts b/forge-di/forge-di.d.ts
deleted file mode 100644
index 99d0b197dc..0000000000
--- a/forge-di/forge-di.d.ts
+++ /dev/null
@@ -1,206 +0,0 @@
-// Type definitions for forge-di v0.9.5
-// Project: https://github.com/nkohari/forge
-// Definitions by: Adam Carr <https://github.com/adamcarr/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "forge-di" {
-	/**
-	 * Implementation of the forge dependency injection manager.
-	 */
-	class Forge {
-		/**
-		 * Creates a new instance
-		 * @returns {Forge} a new instance.
-		 */
-		new(): Forge;
-
-		/**
-		 * The bindings mapped to this forge instance.
-		 */
-		bindings: Forge.IBindingMap;
-
-		/**
-		 * Creates a new binding.
-		 * @param {string} name The binding name.
-		 */
-		bind(name: string): Forge.IBinding;
-		/**
-		 * Unbinds then recreates a binding for this name.
-		 * @param {string} name The binding name.
-		 */
-		rebind(name: string): Forge.IBinding;
-		/**
-		 * Unbinds all bindings for this name. Returns the number of bindings removed.
-		 * @param {string} name The binding name.
-		 */
-		unbind(name: string): number;
-		/**
-		 * Get instance or instances of type registered under the provided name and optional hint.
-		 * @param {string} name The binding name.
-		 * @param {string} hint The binding hint.
-		 * @param {...args} args Additional args.
-		 */
-		get<T>(name: string, hint?: string, ...args: any[]): T;
-		/**
-		 * Get a single instance of type registered under the provided name and optional hint.
-		 * @param {string} name The binding name.
-		 * @param {string} hint The binding hint.
-		 * @param {...args} args Additional args.
-		 */
-		getOne<T>(name: string, hint?: string, ...args: any[]): T;
-		/**
-		 * Gets all instances of the type registered under the provided name.
-		 * @param {string} name The binding name.
-		 * @param {...args} args Additional args.
-		 */
-		getAll<T>(name: string, ...args: any[]): T | T[];
-		/**
-		 * Creates an instance of the target type attempting to resolve any dependencies.
-		 * @param {T} target The target type.
-		 * @param {...args} args Additional args.
-		 */
-		create<T>(target: T, ...args: any[]): T;
-		/**
-		 * Get all bindings registered under a binding name and optional hint.
-		 * @param {string} name The binding name.
-		 * @param {string} hint The binding hint.
-		 */
-		getMatchingBindings(name: string, hint?: string): Forge.IBinding[];
-		/**
-		 * Returns a string that represents all bindings within this forge instance.
-		 */
-		inspect(): string;
-
-		resolve<T>(name: string, context?: Forge.IContext, hint?: string, all?: boolean, ...args: any[]): T | T[];
-		resolveBindings(context: Forge.IContext, bindings: Forge.IBinding[], hint: string, args: any[], unwrap: boolean): Forge.IBinding[];
-	}
-
-	namespace Forge {
-		interface IContext {
-			new (): IContext;
-			bindings: IBinding[];
-			has(binding: IBinding): boolean;
-			push(binding: IBinding): void;
-			pop(): IBinding;
-			toString(indent: number): string;
-		}
-
-		interface IType {
-			new (...args: any[]): any;
-		}
-
-		/**
-		 * Represents arguments to help with resolving a binding.
-		 */
-		interface IBindingArguments {
-			[name: string]: any;
-		}
-
-		/**
-		 * Represents a binding between a name, type/instance/function and optional hint.
-		 */
-		interface IBinding {
-			/** The forge that contains this binding. */
-			forge: Forge;
-			/** The binding name. */
-			name: string;
-			/** Alias mapping to this binding. */
-			to: IBinding;
-			/** Alias mapping to this binding. */
-			as: IBinding;
-			/** Whether or not this binding is currently resolving. */
-			isResolving: boolean;
-			/** The resolver for this binding. */
-			resolver: IResolver;
-			/** The lifecycle associated with this binding. Defaults to singleton. */
-			lifecycle: ILifecycle;
-			/** The predicate associated with this binding. Used to support hints. */
-			predicate: IPredicate;
-			/** The additional binding arguments to help resolve dependencies. */
-			arguments: IBindingArguments;
-
-			/**
-			 * Checks whether or not this binding matches the hint by executing the predicate.
-			 * @param {string} hint The hint to check against.
-			 */
-			matches(hint: string): boolean;
-			/**
-			 * Registers a type to a binding. This type must have a constructor.
-			 * @param {T} target The target type.
-			 */
-			type<T extends IType>(target: T): IBinding;
-			/**
-			 * Registers a type to a binding. This must be a callable function.
-			 * @param {T} target The target function.
-			 */
-			function<T extends{(...args: any[]):any}>(target: T): IBinding;
-			/**
-			 * Registeres an instance to a binding. This instance will always be returned.
-			 * @param {T} target The target instance.
-			 */
-			instance<T extends Object>(target: T): IBinding;
-			/**
-			 * Configures this binding lifecycle as a singleton. This is the default lifecycle.
-			 */
-			singleton(): IBinding;
-			/**
-			 * Configures this binding lifecycle as transient.
-			 * New instances will be created, if this is a type based binding, on each get.
-			 */
-			transient(): IBinding;
-			/**
-			 * Registers a predicate for this binding.
-			 * @param {IPredicate} predicate The predicate.
-			 */
-			when(predicate:IPredicate): IBinding;
-			/**
-			 * Registers a hint for this binding.
-			 * @param {string} hint The hint.
-			 */
-			when(hint: string): IBinding;
-			/**
-			 * Registers additional binding arguments to help with resolving.
-			 * @param {IBindingArguments} args The additional binding arguments.
-			 */
-			with(args: IBindingArguments): IBinding;
-			/**
-			 * Returns a string representing this binding.
-			 */
-			toString(): string;
-		}
-
-		/** Represents a binding map. */
-		interface IBindingMap {
-			/** Gets a binding by name. */
-			[name: string]: IBinding[];
-		}
-
-		/** Represents a predicate. */
-		interface IPredicate {
-			/**
-			 * Returns whether or not the hit satisfies this predicate.
-			 * @param {string} hint The hint to check against.
-			 */
-			(hint: string): boolean;
-		}
-
-		/** Represents a resolver. */
-		interface IResolver {
-			/**
-			 * Resolves a specific type.
-			 */
-			resolve<T>(): T;
-		}
-
-		/** Represents a binding lifecycle. */
-		interface ILifecycle {
-			/**
-			 * Returns the instance from a resolver based on the configured lifecycle.
-			 * @param {IResolver} resolver The type resolver.
-			 */
-			getInstance<T>(resolver: IResolver): T;
-		}
-	}
-
-	export = Forge;
-}
diff --git a/forge-di/index.d.ts b/forge-di/index.d.ts
new file mode 100644
index 0000000000..90d50bfdfb
--- /dev/null
+++ b/forge-di/index.d.ts
@@ -0,0 +1,205 @@
+// Type definitions for forge-di v0.9.5
+// Project: https://github.com/nkohari/forge
+// Definitions by: Adam Carr <https://github.com/adamcarr/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/**
+ * Implementation of the forge dependency injection manager.
+ */
+declare class Forge {
+    /**
+     * Creates a new instance
+     * @returns {Forge} a new instance.
+     */
+    new(): Forge;
+
+    /**
+     * The bindings mapped to this forge instance.
+     */
+    bindings: Forge.IBindingMap;
+
+    /**
+     * Creates a new binding.
+     * @param {string} name The binding name.
+     */
+    bind(name: string): Forge.IBinding;
+    /**
+     * Unbinds then recreates a binding for this name.
+     * @param {string} name The binding name.
+     */
+    rebind(name: string): Forge.IBinding;
+    /**
+     * Unbinds all bindings for this name. Returns the number of bindings removed.
+     * @param {string} name The binding name.
+     */
+    unbind(name: string): number;
+    /**
+     * Get instance or instances of type registered under the provided name and optional hint.
+     * @param {string} name The binding name.
+     * @param {string} hint The binding hint.
+     * @param {...args} args Additional args.
+     */
+    get<T>(name: string, hint?: string, ...args: any[]): T;
+    /**
+     * Get a single instance of type registered under the provided name and optional hint.
+     * @param {string} name The binding name.
+     * @param {string} hint The binding hint.
+     * @param {...args} args Additional args.
+     */
+    getOne<T>(name: string, hint?: string, ...args: any[]): T;
+    /**
+     * Gets all instances of the type registered under the provided name.
+     * @param {string} name The binding name.
+     * @param {...args} args Additional args.
+     */
+    getAll<T>(name: string, ...args: any[]): T | T[];
+    /**
+     * Creates an instance of the target type attempting to resolve any dependencies.
+     * @param {T} target The target type.
+     * @param {...args} args Additional args.
+     */
+    create<T>(target: T, ...args: any[]): T;
+    /**
+     * Get all bindings registered under a binding name and optional hint.
+     * @param {string} name The binding name.
+     * @param {string} hint The binding hint.
+     */
+    getMatchingBindings(name: string, hint?: string): Forge.IBinding[];
+    /**
+     * Returns a string that represents all bindings within this forge instance.
+     */
+    inspect(): string;
+
+    resolve<T>(name: string, context?: Forge.IContext, hint?: string, all?: boolean, ...args: any[]): T | T[];
+    resolveBindings(context: Forge.IContext, bindings: Forge.IBinding[], hint: string, args: any[], unwrap: boolean): Forge.IBinding[];
+}
+
+declare namespace Forge {
+    interface IContext {
+        new (): IContext;
+        bindings: IBinding[];
+        has(binding: IBinding): boolean;
+        push(binding: IBinding): void;
+        pop(): IBinding;
+        toString(indent: number): string;
+    }
+
+    interface IType {
+        new (...args: any[]): any;
+    }
+
+    /**
+     * Represents arguments to help with resolving a binding.
+     */
+    interface IBindingArguments {
+        [name: string]: any;
+    }
+
+    /**
+     * Represents a binding between a name, type/instance/function and optional hint.
+     */
+    interface IBinding {
+        /** The forge that contains this binding. */
+        forge: Forge;
+        /** The binding name. */
+        name: string;
+        /** Alias mapping to this binding. */
+        to: IBinding;
+        /** Alias mapping to this binding. */
+        as: IBinding;
+        /** Whether or not this binding is currently resolving. */
+        isResolving: boolean;
+        /** The resolver for this binding. */
+        resolver: IResolver;
+        /** The lifecycle associated with this binding. Defaults to singleton. */
+        lifecycle: ILifecycle;
+        /** The predicate associated with this binding. Used to support hints. */
+        predicate: IPredicate;
+        /** The additional binding arguments to help resolve dependencies. */
+        arguments: IBindingArguments;
+
+        /**
+         * Checks whether or not this binding matches the hint by executing the predicate.
+         * @param {string} hint The hint to check against.
+         */
+        matches(hint: string): boolean;
+        /**
+         * Registers a type to a binding. This type must have a constructor.
+         * @param {T} target The target type.
+         */
+        type<T extends IType>(target: T): IBinding;
+        /**
+         * Registers a type to a binding. This must be a callable function.
+         * @param {T} target The target function.
+         */
+        function<T extends { (...args: any[]): any }>(target: T): IBinding;
+        /**
+         * Registeres an instance to a binding. This instance will always be returned.
+         * @param {T} target The target instance.
+         */
+        instance<T extends Object>(target: T): IBinding;
+        /**
+         * Configures this binding lifecycle as a singleton. This is the default lifecycle.
+         */
+        singleton(): IBinding;
+        /**
+         * Configures this binding lifecycle as transient.
+         * New instances will be created, if this is a type based binding, on each get.
+         */
+        transient(): IBinding;
+        /**
+         * Registers a predicate for this binding.
+         * @param {IPredicate} predicate The predicate.
+         */
+        when(predicate: IPredicate): IBinding;
+        /**
+         * Registers a hint for this binding.
+         * @param {string} hint The hint.
+         */
+        when(hint: string): IBinding;
+        /**
+         * Registers additional binding arguments to help with resolving.
+         * @param {IBindingArguments} args The additional binding arguments.
+         */
+        with(args: IBindingArguments): IBinding;
+        /**
+         * Returns a string representing this binding.
+         */
+        toString(): string;
+    }
+
+    /** Represents a binding map. */
+    interface IBindingMap {
+        /** Gets a binding by name. */
+        [name: string]: IBinding[];
+    }
+
+    /** Represents a predicate. */
+    interface IPredicate {
+        /**
+         * Returns whether or not the hit satisfies this predicate.
+         * @param {string} hint The hint to check against.
+         */
+        (hint: string): boolean;
+    }
+
+    /** Represents a resolver. */
+    interface IResolver {
+        /**
+         * Resolves a specific type.
+         */
+        resolve<T>(): T;
+    }
+
+    /** Represents a binding lifecycle. */
+    interface ILifecycle {
+        /**
+         * Returns the instance from a resolver based on the configured lifecycle.
+         * @param {IResolver} resolver The type resolver.
+         */
+        getInstance<T>(resolver: IResolver): T;
+    }
+}
+
+export = Forge;
diff --git a/forge-di/tsconfig.json b/forge-di/tsconfig.json
new file mode 100644
index 0000000000..d2f9df576b
--- /dev/null
+++ b/forge-di/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "forge-di-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/form-data/form-data-tests.ts b/form-data/form-data-tests.ts
index 641a368749..141a1ace86 100644
--- a/form-data/form-data-tests.ts
+++ b/form-data/form-data-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="form-data.d.ts" />
 
 import formData = require('form-data');
 
diff --git a/form-data/form-data.d.ts b/form-data/form-data.d.ts
deleted file mode 100644
index f3a19b16f7..0000000000
--- a/form-data/form-data.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Type definitions for form-data
-// Project: https://github.com/felixge/node-form-data
-// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/form-data.d.ts
-
-declare module "form-data" {
-	export class FormData {
-		append(key: string, value: any, options?: any): FormData;
-		getHeaders(): Object;
-		// TODO expand pipe
-		pipe(to: any): any;
-		submit(params: string|Object, callback: (error: any, response: any) => void): any;
-	}
-}
diff --git a/form-data/index.d.ts b/form-data/index.d.ts
new file mode 100644
index 0000000000..0aa5ff33ad
--- /dev/null
+++ b/form-data/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for form-data
+// Project: https://github.com/felixge/node-form-data
+// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/form-data.d.ts
+
+
+export declare class FormData {
+    append(key: string, value: any, options?: any): FormData;
+    getHeaders(): Object;
+    // TODO expand pipe
+    pipe(to: any): any;
+    submit(params: string | Object, callback: (error: any, response: any) => void): any;
+}
diff --git a/form-data/tsconfig.json b/form-data/tsconfig.json
new file mode 100644
index 0000000000..4377857150
--- /dev/null
+++ b/form-data/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "form-data-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/form-serializer/form-serializer-tests.ts b/form-serializer/form-serializer-tests.ts
index e262d07429..5c750f0350 100644
--- a/form-serializer/form-serializer-tests.ts
+++ b/form-serializer/form-serializer-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="form-serializer.d.ts" />
+
 
 $("#form").serializeObject();
 $("#form").serializeJSON();
diff --git a/form-serializer/form-serializer.d.ts b/form-serializer/form-serializer.d.ts
deleted file mode 100644
index ecdb08f2ed..0000000000
--- a/form-serializer/form-serializer.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// Type definitions for jquery.serialize-object 2.5.0
-// Project: https://github.com/macek/jquery-serialize-object
-// Definitions by: Florian Wagner <https://github.com/flqw>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-declare namespace FormSerializer {
-
-  interface FormSerializerPatterns {
-    validate: RegExp;
-    key: RegExp;
-    push: RegExp;
-    fixed: RegExp;
-    named: RegExp;
-  }
-
-  export var patterns: FormSerializerPatterns;
-
-}
-
-declare module "jquery-serialize-object" {
-  export = FormSerializer;
-}
-
-declare module "form-serializer" {
-  export = FormSerializer;
-}
-
-interface JQuery {
-
-  /**
-   * Serializes the selected form into a JavaScript object.
-   */
-  serializeObject(): Object;
-
-  /**
-   * Serializes the selected form into JSON.
-   */
-  serializeJSON(): string;
-
-}
diff --git a/form-serializer/index.d.ts b/form-serializer/index.d.ts
new file mode 100644
index 0000000000..20ebb2223f
--- /dev/null
+++ b/form-serializer/index.d.ts
@@ -0,0 +1,42 @@
+// Type definitions for jquery.serialize-object 2.5.0
+// Project: https://github.com/macek/jquery-serialize-object
+// Definitions by: Florian Wagner <https://github.com/flqw>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+declare namespace FormSerializer {
+
+  interface FormSerializerPatterns {
+    validate: RegExp;
+    key: RegExp;
+    push: RegExp;
+    fixed: RegExp;
+    named: RegExp;
+  }
+
+  export var patterns: FormSerializerPatterns;
+
+}
+
+declare module "jquery-serialize-object" {
+  export = FormSerializer;
+}
+
+declare module "form-serializer" {
+  export = FormSerializer;
+}
+
+interface JQuery {
+
+  /**
+   * Serializes the selected form into a JavaScript object.
+   */
+  serializeObject(): Object;
+
+  /**
+   * Serializes the selected form into JSON.
+   */
+  serializeJSON(): string;
+
+}
diff --git a/form-serializer/tsconfig.json b/form-serializer/tsconfig.json
new file mode 100644
index 0000000000..63295c2856
--- /dev/null
+++ b/form-serializer/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "form-serializer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/format-unicorn/format-unicorn-tests.ts b/format-unicorn/format-unicorn-tests.ts
index e256b65ae7..101c0cc143 100644
--- a/format-unicorn/format-unicorn-tests.ts
+++ b/format-unicorn/format-unicorn-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="format-unicorn.d.ts"/>
-
 import 'format-unicorn';
 
 // Unsafe version
diff --git a/format-unicorn/format-unicorn.d.ts b/format-unicorn/index.d.ts
similarity index 100%
rename from format-unicorn/format-unicorn.d.ts
rename to format-unicorn/index.d.ts
diff --git a/format-unicorn/tsconfig.json b/format-unicorn/tsconfig.json
new file mode 100644
index 0000000000..a72b1c3f5a
--- /dev/null
+++ b/format-unicorn/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "format-unicorn-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/formidable/formidable-tests.ts b/formidable/formidable-tests.ts
index a0f70a713c..5b169fbd4e 100644
--- a/formidable/formidable-tests.ts
+++ b/formidable/formidable-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./formidable.d.ts" />
 
 import formidable = require('formidable');
 import http = require('http');
diff --git a/formidable/formidable.d.ts b/formidable/formidable.d.ts
deleted file mode 100644
index 2468f6a628..0000000000
--- a/formidable/formidable.d.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-// Type definitions for Formidable 1.0.16
-// Project: https://github.com/felixge/node-formidable/
-// Definitions by: Wim Looman <https://github.com/Nemo157>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "formidable" {
-	import http = require("http");
-	import stream = require("stream");
-	import events = require("events");
-
-	export class IncomingForm extends events.EventEmitter {
-		encoding: string;
-		uploadDir: string;
-		keepExtensions: boolean;
-		maxFieldsSize: number;
-		maxFields: number;
-		hash: string | boolean;
-		multiples: boolean;
-		type: string;
-		bytesReceived: number;
-		bytesExpected: number;
-
-		onPart: (part: Part) => void;
-
-		handlePart(part: Part): void;
-		parse(req: http.IncomingMessage, callback?: (err: any, fields: Fields, files: Files) => any): void;
-	}
-
-	export interface Fields {
-		[key: string]: string;
-	}
-
-	export interface Files {
-		[key: string]: File; // | File[];
-	}
-
-	export interface Part extends stream.Stream {
-		headers: { [key: string]: string };
-		name: string;
-		filename?: string;
-		mime?: string;
-	}
-
-	export interface File {
-		size: number;
-		path: string;
-		name: string;
-		type: string;
-		lastModifiedDate?: Date;
-		hash?: string;
-
-		toJSON(): Object;
-	}
-}
diff --git a/formidable/index.d.ts b/formidable/index.d.ts
new file mode 100644
index 0000000000..d22fa259a2
--- /dev/null
+++ b/formidable/index.d.ts
@@ -0,0 +1,55 @@
+// Type definitions for Formidable 1.0.16
+// Project: https://github.com/felixge/node-formidable/
+// Definitions by: Wim Looman <https://github.com/Nemo157>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import http = require("http");
+import stream = require("stream");
+import events = require("events");
+
+export declare class IncomingForm extends events.EventEmitter {
+    encoding: string;
+    uploadDir: string;
+    keepExtensions: boolean;
+    maxFieldsSize: number;
+    maxFields: number;
+    hash: string | boolean;
+    multiples: boolean;
+    type: string;
+    bytesReceived: number;
+    bytesExpected: number;
+
+    onPart: (part: Part) => void;
+
+    handlePart(part: Part): void;
+    parse(req: http.IncomingMessage, callback?: (err: any, fields: Fields, files: Files) => any): void;
+}
+
+export interface Fields {
+    [key: string]: string;
+}
+
+export interface Files {
+    [key: string]: File; // | File[];
+}
+
+export interface Part extends stream.Stream {
+    headers: { [key: string]: string };
+    name: string;
+    filename?: string;
+    mime?: string;
+}
+
+export interface File {
+    size: number;
+    path: string;
+    name: string;
+    type: string;
+    lastModifiedDate?: Date;
+    hash?: string;
+
+    toJSON(): Object;
+}
diff --git a/formidable/tsconfig.json b/formidable/tsconfig.json
new file mode 100644
index 0000000000..a1da22ad89
--- /dev/null
+++ b/formidable/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "formidable-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/foundation-sites/foundation-sites-tests.ts b/foundation-sites/foundation-sites-tests.ts
index d0a1bfda0d..4932f01624 100644
--- a/foundation-sites/foundation-sites-tests.ts
+++ b/foundation-sites/foundation-sites-tests.ts
@@ -3,8 +3,8 @@
 // Definitions by: Sam Vloeberghs <https://github.com/samvloeberghs/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="foundation-sites.d.ts" />
+/// <reference types="jquery" />
+
 
 $(document).foundation();
 $(document).foundation('method5');
diff --git a/foundation-sites/foundation-sites.d.ts b/foundation-sites/foundation-sites.d.ts
deleted file mode 100644
index c75b44d4ab..0000000000
--- a/foundation-sites/foundation-sites.d.ts
+++ /dev/null
@@ -1,456 +0,0 @@
-// Type definitions for Foundation Sites v6.1.1
-// Project: http://foundation.zurb.com/
-// Definitions by: Sam Vloeberghs <https://github.com/samvloeberghs/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// please also see the typings project and prefer to use it!
-// typings project: https://github.com/typings/typings
-// typings: https://github.com/samvloeberghs/foundation-sites-typings
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-declare namespace FoundationSites {
-
-    // http://foundation.zurb.com/sites/docs/abide.html#javascript-reference
-    interface Abide {
-        requiredChecked(element:Object): boolean;
-        findFormError($el:Object): Object;
-        findLabel(element:Object): boolean;
-        addErrorClasses(element:Object): void;
-        removeErrorClasses(element:Object): void;
-        validateInput(element:Object, form:Object): void;
-        validateForm(element:Object): void;
-        validateText(element:Object): boolean;
-        validateRadio(group:string): boolean;
-        matchValidation($el:Object, validators:string, required:boolean): boolean;
-        resetForm($form:Object): void;
-        destroy(): void;
-    }
-
-    interface IAbidePatterns {
-        alpha?: RegExp;
-        alpha_numeric?: RegExp;
-        integer?: RegExp;
-        number?: RegExp;
-        card?: RegExp;
-        cvv?: RegExp;
-        email ?: RegExp;
-        url?: RegExp;
-        domain?: RegExp;
-        datetime?: RegExp;
-        date?: RegExp;
-        time?: RegExp;
-        dateISO?: RegExp;
-        month_day_year?: RegExp;
-        day_month_year?: RegExp;
-        color?: RegExp;
-    }
-
-    interface IAbideOptions {
-        validateOn?: string;
-        labelErrorClass?: string;
-        inputErrorClass?: string;
-        formErrorSelector?: string;
-        formErrorClass?: string;
-        liveValidate?: boolean;
-        validators?:any;
-    }
-
-    // http://foundation.zurb.com/sites/docs/accordion.html#javascript-reference
-    interface Accordion {
-        toggle($target:JQuery): void;
-        down($target:JQuery, firstTime:boolean): void;
-        up($target:JQuery): void;
-        destroy(): void;
-    }
-
-    interface IAccordionOptions {
-        slideSpeed?: number
-        multiOpen?: boolean;
-        allowAllClosed?: boolean;
-    }
-
-    // http://foundation.zurb.com/sites/docs/accordion-menu.html#javascript-reference
-    interface AccordionMenu {
-        hideAll(): void;
-        toggle($target:JQuery): void;
-        down($target:JQuery, firstTime:boolean): void;
-        up($target:JQuery): void;
-        destroy(): void;
-    }
-
-    interface IAccordionMenuOptions {
-        slideSpeed?: number;
-        multiOpen?: boolean;
-    }
-
-    // http://foundation.zurb.com/sites/docs/drilldown-menu.html#javascript-reference
-    interface Drilldown {
-        _hideAll(): void;
-        _back($elem:JQuery): void;
-        _show($elem:JQuery): void;
-        _hide($elem:JQuery): void;
-        destroy(): void;
-    }
-
-    interface IDrilldownOptions {
-        backButton?: string;
-        wrapper?: string
-        closeOnClick?: boolean
-    }
-
-    // http://foundation.zurb.com/sites/docs/dropdown.html#javascript-reference
-    interface Dropdown {
-        getPositionClass(): string;
-        open(): void;
-        close(): void;
-        toggle(): void;
-        destroy(): void;
-    }
-
-    interface IDropdownOptions {
-        hoverDelay?: number;
-        hover?: boolean;
-        hoverPane?: boolean;
-        vOffset?: number;
-        hOffset?: number;
-        positionClass?: string;
-        trapFocus?: boolean;
-        autoFocus?: boolean;
-        closeOnClick?: boolean;
-    }
-
-    // http://foundation.zurb.com/sites/docs/dropdown-menu.html#javascript-reference
-    interface DropdownMenu {
-        destroy(): void;
-    }
-
-    interface IDropdownMenuOptions {
-        disableHover?: boolean;
-        autoclose?: boolean;
-        hoverDelay?: number;
-        clickOpen?: boolean;
-        closingTime?: number;
-        alignment?: string;
-        closeOnClick?:boolean;
-        verticalClass?: string;
-        rightClass?: string;
-        forceFollow?: boolean;
-    }
-
-    // http://foundation.zurb.com/sites/docs/equalizer.html#javascript-reference
-    interface Equalizer {
-        getHeights(element:Object): Array<any>;
-        getHeightsByRow(cb:Function): void;
-        applyHeight(heights:Array<any>): void;
-        applyHeightByRow(groups:Array<any>):void;
-        destroy(): void;
-    }
-
-    interface IEqualizerOptions {
-        equalizeOnStack?: boolean;
-        equalizeByRow?: boolean;
-        equalizeOn?:string;
-    }
-
-    // http://foundation.zurb.com/sites/docs/interchange.html#javascript-reference
-    interface Interchange {
-        replace(path:string): void;
-        destroy(): void;
-    }
-
-    interface IInterchangeOptions {
-        rules?: Array<any>
-    }
-
-    // http://foundation.zurb.com/sites/docs/magellan.html#javascript-reference
-    interface Magellan {
-        calcPoints(): void;
-        reflow(): void;
-        destroy(): void;
-    }
-
-    interface IMagellanOptions {
-        animationDuration?: number;
-        animationEasing?: string;
-        threshold?: number;
-        activeClass?: string;
-        deepLinking?: boolean;
-        barOffset?: number;
-    }
-
-    // http://foundation.zurb.com/sites/docs/offcanvas.html#javascript-reference
-    interface OffCanvas {
-        reveal(isRevealed:boolean): void;
-        open(event:Object, trigger:JQuery): void;
-        close(): void;
-        toggle(event:Object, trigger:JQuery): void;
-        destroy(): void;
-    }
-
-    interface IOffCanvasOptions {
-        closeOnClick?: boolean;
-        transitionTime?: number;
-        position?: string;
-        forceTop?: boolean;
-        isRevealed?: boolean;
-        revealOn?: string;
-        autoFocus?: boolean;
-        revealClass?: string;
-    }
-
-    // http://foundation.zurb.com/sites/docs/orbit.html#javascript-reference
-    interface Orbit {
-        geoSync(): void;
-        changeSlide(isLTR:boolean, chosenSlide?:Object, idx?:number): void;
-        destroy(): void;
-    }
-
-    interface IOrbitOptions {
-        bullets?: boolean;
-        navButtons?: boolean;
-        animInFromRight?: string;
-        animOutToRight?: string;
-        animInFromLeft?: string;
-        animOutToLeft?: string;
-        autoPlay?: boolean;
-        timerDelay?: number;
-        infiniteWrap?: boolean;
-        swipe?: boolean;
-        pauseOnHover?: boolean;
-        accessible?: boolean;
-        containerClass?: string;
-        slideClass?: string;
-        boxOfBullets?: string;
-        nextClass?: string;
-        prevClass?: string;
-        useMUI?: boolean;
-    }
-
-    // http://foundation.zurb.com/sites/docs/reveal.html#javascript-reference
-    interface Reveal {
-        open(): void;
-        toggle(): void;
-        close(): void;
-        destroy(): void;
-    }
-
-    interface IRevealOptions {
-        animationIn?: string;
-        animationOut?: string;
-        showDelay?: number;
-        hideDelay?: number;
-        closeOnClick?: boolean;
-        closeOnEsc?: boolean;
-        multipleOpened?: boolean;
-        vOffset?: number;
-        hOffset?: number;
-        fullScreen?: boolean;
-        btmOffsetPct?: number;
-        overlay?: boolean;
-        resetOnClose?: boolean;
-    }
-
-    // http://foundation.zurb.com/sites/docs/slider.html#javascript-reference
-    interface Slider {
-        destroy(): void;
-    }
-
-    interface ISliderOptions {
-        start?: number;
-        end?: number;
-        step?: number;
-        initialStart ?: number;
-        initialEnd?: number;
-        binding?: boolean;
-        clickSelect?: boolean;
-        vertical?: boolean;
-        draggable?: boolean;
-        disabled?: boolean;
-        doubleSided?: boolean;
-        decimal?: number;
-        moveTime?: number;
-        disabledClass?: string;
-    }
-
-    // http://foundation.zurb.com/sites/docs/sticky.html#javascript-reference
-    interface Sticky {
-        _pauseListeners(scrollListener:string): void;
-        _calc(checkSizes:boolean, scroll:number): void;
-        destroy(): void;
-        emCalc(Number:number): void;
-    }
-
-    interface IStickyOptions {
-        container?: string;
-        stickTo?: string;
-        anchor?: string;
-        topAnchor?: string;
-        btmAnchor?: string;
-        marginTop?: number;
-        marginBottom?: number;
-        stickyOn?: string;
-        stickyClass?: string;
-        containerClass?: string;
-        checkEvery?: number;
-    }
-
-    // http://foundation.zurb.com/sites/docs/tabs.html#javascript-reference
-    interface Tabs {
-        _handleTabChange($target:JQuery): void;
-        selectTab($target:JQuery): void;
-        destroy(): void;
-    }
-
-    interface ITabsOptions {
-        autoFocus?: boolean;
-        wrapOnKeys?: boolean;
-        matchHeight?: boolean;
-        linkClass?: string;
-        panelClass?: string;
-    }
-
-    // http://foundation.zurb.com/sites/docs/toggler.html#javascript-reference
-    interface Toggler {
-        toggle(): void;
-        destroy(): void;
-    }
-
-    interface ITogglerOptions {
-        animate?: boolean;
-    }
-
-    // http://foundation.zurb.com/sites/docs/tooltip.html#javascript-reference
-    interface Tooltip {
-        show(): void;
-        hide(): void;
-        toggle(): void;
-        destroy(): void;
-    }
-
-    interface ITooltipOptions {
-        hoverDelay?: number;
-        fadeInDuration?: number;
-        fadeOutDuration?: number;
-        disableHover?: boolean;
-        templateClasses?: string;
-        tooltipClass?: string;
-        triggerClass?: string;
-        showOn?: string;
-        template?: string;
-        tipText?: string;
-        clickOpen?: boolean;
-        positionClass?: string;
-        vOffset?: number;
-        hOffset?:number;
-    }
-
-    // Utilities
-    // ---------
-
-    interface Box {
-        ImNotTouchingYou(element:Object, parent?:Object, lrOnly?:boolean, tbOnly?:boolean): boolean;
-        GetDimensions(element:Object): Object;
-        GetOffsets(element:Object, anchor:Object, position:string, vOffset:number, hOffset:number, isOverflow:boolean): Object;
-    }
-
-    interface KeyBoard {
-        parseKey(event:any): string;
-        handleKey(event:any, component:any, functions:any):void;
-        findFocusable($element:Object): Object;
-    }
-
-    interface MediaQuery {
-        get(size:string): string;
-        atLeast(size:string): boolean;
-        queries:Array<string>;
-        current:string;
-    }
-
-    interface Motion {
-        animateIn(element:Object, animation:any, cb:Function): void;
-        animateOut(element:Object, animation:any, cb:Function): void;
-    }
-
-    interface Move {
-        // TODO
-    }
-
-    interface Nest {
-        Feather(menu:any, type:any):void;
-        Burn(menu:any, type:any):void;
-    }
-
-    interface Timer {
-        start(): void;
-        restart(): void;
-        pause(): void;
-    }
-
-    interface Touch {
-        // TODO :extension on jQuery
-    }
-
-    interface Triggers {
-        // TODO :extension on jQuery
-    }
-
-    interface FoundationSitesStatic {
-        version : string;
-
-        rtl(): boolean;
-        plugin(plugin:Object, name:string): void;
-        registerPlugin(plugin:Object): void;
-        unregisterPlugin(plugin:Object): void;
-        reInit(plugins:Array<any>):void;
-        GetYoDigits(length:number, namespace?:string): string;
-        reflow(elem:Object, plugins?:Array<string>|string): void;
-        getFnName(fn:string): string;
-        transitionend(): string;
-
-        util : {
-            throttle(func:(...args:any[]) => any, delay:number): (...args:any[]) => any;
-        };
-
-        Abide(element:Object, options?:IAbideOptions): Abide;
-        Accordion(element:Object, options?:IAccordionOptions): Accordion;
-        AccordionMenu(element:Object, options?:IAccordionMenuOptions): AccordionMenu;
-        DrillDown(element:Object, options?:IDrilldownOptions): Drilldown;
-        Dropdown(element:Object, options?:IDropdownOptions): Dropdown;
-        DropdownMenu(element:Object, options?:IDropdownMenuOptions): DropdownMenu;
-        Equalizer(element:Object, options?:IEqualizerOptions): Equalizer;
-        Interchange(element:Object, options?:IInterchangeOptions): Interchange;
-        Magellan(element:Object, options?:IMagellanOptions): Magellan;
-        OffCanvas(element:Object, options?:IOffCanvasOptions): OffCanvas;
-        Orbit(element:Object, options?:IOrbitOptions): Orbit;
-        Reveal(element:Object, options?:IRevealOptions): Reveal;
-        Slider(element:Object, options?:ISliderOptions): Slider;
-        Sticky(element:Object, options?:IStickyOptions): Sticky;
-        Tabs(element:Object, options?:ITabsOptions): Tabs;
-        Toggler(element:Object, options?:ITogglerOptions): Toggler;
-        Tooltip(element:Object, options?:ITooltipOptions): Tooltip;
-
-        // utils
-        Box: Box;
-        KeyBoard: KeyBoard;
-        MediaQuery: MediaQuery;
-        Motion: Motion;
-        Move: Move;
-        Nest: Nest;
-        Timer: Timer;
-        Touch: Touch;
-        Triggers: Triggers;
-
-    }
-
-}
-
-interface JQuery {
-    foundation(method?:string|Array<any>) : JQuery;
-}
-
-declare var Foundation:FoundationSites.FoundationSitesStatic;
-
-declare module "Foundation" {
-    export = Foundation;
-}
diff --git a/foundation-sites/index.d.ts b/foundation-sites/index.d.ts
new file mode 100644
index 0000000000..2357b612b1
--- /dev/null
+++ b/foundation-sites/index.d.ts
@@ -0,0 +1,456 @@
+// Type definitions for Foundation Sites v6.1.1
+// Project: http://foundation.zurb.com/
+// Definitions by: Sam Vloeberghs <https://github.com/samvloeberghs/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// please also see the typings project and prefer to use it!
+// typings project: https://github.com/typings/typings
+// typings: https://github.com/samvloeberghs/foundation-sites-typings
+
+/// <reference types="jquery"/>
+
+declare namespace FoundationSites {
+
+    // http://foundation.zurb.com/sites/docs/abide.html#javascript-reference
+    interface Abide {
+        requiredChecked(element:Object): boolean;
+        findFormError($el:Object): Object;
+        findLabel(element:Object): boolean;
+        addErrorClasses(element:Object): void;
+        removeErrorClasses(element:Object): void;
+        validateInput(element:Object, form:Object): void;
+        validateForm(element:Object): void;
+        validateText(element:Object): boolean;
+        validateRadio(group:string): boolean;
+        matchValidation($el:Object, validators:string, required:boolean): boolean;
+        resetForm($form:Object): void;
+        destroy(): void;
+    }
+
+    interface IAbidePatterns {
+        alpha?: RegExp;
+        alpha_numeric?: RegExp;
+        integer?: RegExp;
+        number?: RegExp;
+        card?: RegExp;
+        cvv?: RegExp;
+        email ?: RegExp;
+        url?: RegExp;
+        domain?: RegExp;
+        datetime?: RegExp;
+        date?: RegExp;
+        time?: RegExp;
+        dateISO?: RegExp;
+        month_day_year?: RegExp;
+        day_month_year?: RegExp;
+        color?: RegExp;
+    }
+
+    interface IAbideOptions {
+        validateOn?: string;
+        labelErrorClass?: string;
+        inputErrorClass?: string;
+        formErrorSelector?: string;
+        formErrorClass?: string;
+        liveValidate?: boolean;
+        validators?:any;
+    }
+
+    // http://foundation.zurb.com/sites/docs/accordion.html#javascript-reference
+    interface Accordion {
+        toggle($target:JQuery): void;
+        down($target:JQuery, firstTime:boolean): void;
+        up($target:JQuery): void;
+        destroy(): void;
+    }
+
+    interface IAccordionOptions {
+        slideSpeed?: number
+        multiOpen?: boolean;
+        allowAllClosed?: boolean;
+    }
+
+    // http://foundation.zurb.com/sites/docs/accordion-menu.html#javascript-reference
+    interface AccordionMenu {
+        hideAll(): void;
+        toggle($target:JQuery): void;
+        down($target:JQuery, firstTime:boolean): void;
+        up($target:JQuery): void;
+        destroy(): void;
+    }
+
+    interface IAccordionMenuOptions {
+        slideSpeed?: number;
+        multiOpen?: boolean;
+    }
+
+    // http://foundation.zurb.com/sites/docs/drilldown-menu.html#javascript-reference
+    interface Drilldown {
+        _hideAll(): void;
+        _back($elem:JQuery): void;
+        _show($elem:JQuery): void;
+        _hide($elem:JQuery): void;
+        destroy(): void;
+    }
+
+    interface IDrilldownOptions {
+        backButton?: string;
+        wrapper?: string
+        closeOnClick?: boolean
+    }
+
+    // http://foundation.zurb.com/sites/docs/dropdown.html#javascript-reference
+    interface Dropdown {
+        getPositionClass(): string;
+        open(): void;
+        close(): void;
+        toggle(): void;
+        destroy(): void;
+    }
+
+    interface IDropdownOptions {
+        hoverDelay?: number;
+        hover?: boolean;
+        hoverPane?: boolean;
+        vOffset?: number;
+        hOffset?: number;
+        positionClass?: string;
+        trapFocus?: boolean;
+        autoFocus?: boolean;
+        closeOnClick?: boolean;
+    }
+
+    // http://foundation.zurb.com/sites/docs/dropdown-menu.html#javascript-reference
+    interface DropdownMenu {
+        destroy(): void;
+    }
+
+    interface IDropdownMenuOptions {
+        disableHover?: boolean;
+        autoclose?: boolean;
+        hoverDelay?: number;
+        clickOpen?: boolean;
+        closingTime?: number;
+        alignment?: string;
+        closeOnClick?:boolean;
+        verticalClass?: string;
+        rightClass?: string;
+        forceFollow?: boolean;
+    }
+
+    // http://foundation.zurb.com/sites/docs/equalizer.html#javascript-reference
+    interface Equalizer {
+        getHeights(element:Object): Array<any>;
+        getHeightsByRow(cb:Function): void;
+        applyHeight(heights:Array<any>): void;
+        applyHeightByRow(groups:Array<any>):void;
+        destroy(): void;
+    }
+
+    interface IEqualizerOptions {
+        equalizeOnStack?: boolean;
+        equalizeByRow?: boolean;
+        equalizeOn?:string;
+    }
+
+    // http://foundation.zurb.com/sites/docs/interchange.html#javascript-reference
+    interface Interchange {
+        replace(path:string): void;
+        destroy(): void;
+    }
+
+    interface IInterchangeOptions {
+        rules?: Array<any>
+    }
+
+    // http://foundation.zurb.com/sites/docs/magellan.html#javascript-reference
+    interface Magellan {
+        calcPoints(): void;
+        reflow(): void;
+        destroy(): void;
+    }
+
+    interface IMagellanOptions {
+        animationDuration?: number;
+        animationEasing?: string;
+        threshold?: number;
+        activeClass?: string;
+        deepLinking?: boolean;
+        barOffset?: number;
+    }
+
+    // http://foundation.zurb.com/sites/docs/offcanvas.html#javascript-reference
+    interface OffCanvas {
+        reveal(isRevealed:boolean): void;
+        open(event:Object, trigger:JQuery): void;
+        close(): void;
+        toggle(event:Object, trigger:JQuery): void;
+        destroy(): void;
+    }
+
+    interface IOffCanvasOptions {
+        closeOnClick?: boolean;
+        transitionTime?: number;
+        position?: string;
+        forceTop?: boolean;
+        isRevealed?: boolean;
+        revealOn?: string;
+        autoFocus?: boolean;
+        revealClass?: string;
+    }
+
+    // http://foundation.zurb.com/sites/docs/orbit.html#javascript-reference
+    interface Orbit {
+        geoSync(): void;
+        changeSlide(isLTR:boolean, chosenSlide?:Object, idx?:number): void;
+        destroy(): void;
+    }
+
+    interface IOrbitOptions {
+        bullets?: boolean;
+        navButtons?: boolean;
+        animInFromRight?: string;
+        animOutToRight?: string;
+        animInFromLeft?: string;
+        animOutToLeft?: string;
+        autoPlay?: boolean;
+        timerDelay?: number;
+        infiniteWrap?: boolean;
+        swipe?: boolean;
+        pauseOnHover?: boolean;
+        accessible?: boolean;
+        containerClass?: string;
+        slideClass?: string;
+        boxOfBullets?: string;
+        nextClass?: string;
+        prevClass?: string;
+        useMUI?: boolean;
+    }
+
+    // http://foundation.zurb.com/sites/docs/reveal.html#javascript-reference
+    interface Reveal {
+        open(): void;
+        toggle(): void;
+        close(): void;
+        destroy(): void;
+    }
+
+    interface IRevealOptions {
+        animationIn?: string;
+        animationOut?: string;
+        showDelay?: number;
+        hideDelay?: number;
+        closeOnClick?: boolean;
+        closeOnEsc?: boolean;
+        multipleOpened?: boolean;
+        vOffset?: number;
+        hOffset?: number;
+        fullScreen?: boolean;
+        btmOffsetPct?: number;
+        overlay?: boolean;
+        resetOnClose?: boolean;
+    }
+
+    // http://foundation.zurb.com/sites/docs/slider.html#javascript-reference
+    interface Slider {
+        destroy(): void;
+    }
+
+    interface ISliderOptions {
+        start?: number;
+        end?: number;
+        step?: number;
+        initialStart ?: number;
+        initialEnd?: number;
+        binding?: boolean;
+        clickSelect?: boolean;
+        vertical?: boolean;
+        draggable?: boolean;
+        disabled?: boolean;
+        doubleSided?: boolean;
+        decimal?: number;
+        moveTime?: number;
+        disabledClass?: string;
+    }
+
+    // http://foundation.zurb.com/sites/docs/sticky.html#javascript-reference
+    interface Sticky {
+        _pauseListeners(scrollListener:string): void;
+        _calc(checkSizes:boolean, scroll:number): void;
+        destroy(): void;
+        emCalc(Number:number): void;
+    }
+
+    interface IStickyOptions {
+        container?: string;
+        stickTo?: string;
+        anchor?: string;
+        topAnchor?: string;
+        btmAnchor?: string;
+        marginTop?: number;
+        marginBottom?: number;
+        stickyOn?: string;
+        stickyClass?: string;
+        containerClass?: string;
+        checkEvery?: number;
+    }
+
+    // http://foundation.zurb.com/sites/docs/tabs.html#javascript-reference
+    interface Tabs {
+        _handleTabChange($target:JQuery): void;
+        selectTab($target:JQuery): void;
+        destroy(): void;
+    }
+
+    interface ITabsOptions {
+        autoFocus?: boolean;
+        wrapOnKeys?: boolean;
+        matchHeight?: boolean;
+        linkClass?: string;
+        panelClass?: string;
+    }
+
+    // http://foundation.zurb.com/sites/docs/toggler.html#javascript-reference
+    interface Toggler {
+        toggle(): void;
+        destroy(): void;
+    }
+
+    interface ITogglerOptions {
+        animate?: boolean;
+    }
+
+    // http://foundation.zurb.com/sites/docs/tooltip.html#javascript-reference
+    interface Tooltip {
+        show(): void;
+        hide(): void;
+        toggle(): void;
+        destroy(): void;
+    }
+
+    interface ITooltipOptions {
+        hoverDelay?: number;
+        fadeInDuration?: number;
+        fadeOutDuration?: number;
+        disableHover?: boolean;
+        templateClasses?: string;
+        tooltipClass?: string;
+        triggerClass?: string;
+        showOn?: string;
+        template?: string;
+        tipText?: string;
+        clickOpen?: boolean;
+        positionClass?: string;
+        vOffset?: number;
+        hOffset?:number;
+    }
+
+    // Utilities
+    // ---------
+
+    interface Box {
+        ImNotTouchingYou(element:Object, parent?:Object, lrOnly?:boolean, tbOnly?:boolean): boolean;
+        GetDimensions(element:Object): Object;
+        GetOffsets(element:Object, anchor:Object, position:string, vOffset:number, hOffset:number, isOverflow:boolean): Object;
+    }
+
+    interface KeyBoard {
+        parseKey(event:any): string;
+        handleKey(event:any, component:any, functions:any):void;
+        findFocusable($element:Object): Object;
+    }
+
+    interface MediaQuery {
+        get(size:string): string;
+        atLeast(size:string): boolean;
+        queries:Array<string>;
+        current:string;
+    }
+
+    interface Motion {
+        animateIn(element:Object, animation:any, cb:Function): void;
+        animateOut(element:Object, animation:any, cb:Function): void;
+    }
+
+    interface Move {
+        // TODO
+    }
+
+    interface Nest {
+        Feather(menu:any, type:any):void;
+        Burn(menu:any, type:any):void;
+    }
+
+    interface Timer {
+        start(): void;
+        restart(): void;
+        pause(): void;
+    }
+
+    interface Touch {
+        // TODO :extension on jQuery
+    }
+
+    interface Triggers {
+        // TODO :extension on jQuery
+    }
+
+    interface FoundationSitesStatic {
+        version : string;
+
+        rtl(): boolean;
+        plugin(plugin:Object, name:string): void;
+        registerPlugin(plugin:Object): void;
+        unregisterPlugin(plugin:Object): void;
+        reInit(plugins:Array<any>):void;
+        GetYoDigits(length:number, namespace?:string): string;
+        reflow(elem:Object, plugins?:Array<string>|string): void;
+        getFnName(fn:string): string;
+        transitionend(): string;
+
+        util : {
+            throttle(func:(...args:any[]) => any, delay:number): (...args:any[]) => any;
+        };
+
+        Abide(element:Object, options?:IAbideOptions): Abide;
+        Accordion(element:Object, options?:IAccordionOptions): Accordion;
+        AccordionMenu(element:Object, options?:IAccordionMenuOptions): AccordionMenu;
+        DrillDown(element:Object, options?:IDrilldownOptions): Drilldown;
+        Dropdown(element:Object, options?:IDropdownOptions): Dropdown;
+        DropdownMenu(element:Object, options?:IDropdownMenuOptions): DropdownMenu;
+        Equalizer(element:Object, options?:IEqualizerOptions): Equalizer;
+        Interchange(element:Object, options?:IInterchangeOptions): Interchange;
+        Magellan(element:Object, options?:IMagellanOptions): Magellan;
+        OffCanvas(element:Object, options?:IOffCanvasOptions): OffCanvas;
+        Orbit(element:Object, options?:IOrbitOptions): Orbit;
+        Reveal(element:Object, options?:IRevealOptions): Reveal;
+        Slider(element:Object, options?:ISliderOptions): Slider;
+        Sticky(element:Object, options?:IStickyOptions): Sticky;
+        Tabs(element:Object, options?:ITabsOptions): Tabs;
+        Toggler(element:Object, options?:ITogglerOptions): Toggler;
+        Tooltip(element:Object, options?:ITooltipOptions): Tooltip;
+
+        // utils
+        Box: Box;
+        KeyBoard: KeyBoard;
+        MediaQuery: MediaQuery;
+        Motion: Motion;
+        Move: Move;
+        Nest: Nest;
+        Timer: Timer;
+        Touch: Touch;
+        Triggers: Triggers;
+
+    }
+
+}
+
+interface JQuery {
+    foundation(method?:string|Array<any>) : JQuery;
+}
+
+declare var Foundation:FoundationSites.FoundationSitesStatic;
+
+declare module "foundation-sites" {
+    export = Foundation;
+}
diff --git a/foundation-sites/tsconfig.json b/foundation-sites/tsconfig.json
new file mode 100644
index 0000000000..49e2447540
--- /dev/null
+++ b/foundation-sites/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "foundation-sites-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/foundation/foundation-tests.ts b/foundation/foundation-tests.ts
index 9706fbf97c..913bd0ee1b 100644
--- a/foundation/foundation-tests.ts
+++ b/foundation/foundation-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="foundation.d.ts" />
+/// <reference types="jquery" />
+
 
 function empty_callback() : void {}
 
diff --git a/foundation/foundation.d.ts b/foundation/foundation.d.ts
deleted file mode 100644
index c41f19b1a0..0000000000
--- a/foundation/foundation.d.ts
+++ /dev/null
@@ -1,328 +0,0 @@
-// Type definitions for Foundation v5.5.1
-// Project: http://foundation.zurb.com/
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-declare namespace Foundation {
-    // http://foundation.zurb.com/docs/components/abide.html#optional-javascript-configuration
-    interface AbidePatterns {
-        alpha? : RegExp;
-        alpha_numeric? : RegExp;
-        integer? : RegExp;
-        number? : RegExp;
-        card? : RegExp;
-        cvv? : RegExp;
-        email? : RegExp;
-        url? : RegExp;
-        domain? : RegExp;
-        datetime? : RegExp;
-        date? : RegExp;
-        time? : RegExp;
-        dateISO? : RegExp;
-        month_day_year? : RegExp;
-        color? : RegExp;
-    }
-
-    interface AbideOptions {
-        live_validate? : boolean;
-        validate_on_blur? : boolean;
-        focus_on_invalid? : boolean;
-        error_labels? : boolean;
-        timeout? : number;
-        patterns? : AbidePatterns;
-        validators? : Object;
-    }
-
-    // http://foundation.zurb.com/docs/components/accordion.html#optional-javascript-configuration
-    interface AccordionOptions {
-        content_class? : string;
-        active_class? : string;
-        multi_expand? : boolean;
-        toggleable? : boolean;
-        callback? : () => any;
-    }
-
-    // http://foundation.zurb.com/docs/components/alert_boxes.html
-    interface AlertOptions {
-        callback? : () => any;
-    }
-
-    // http://foundation.zurb.com/docs/components/clearing.html#optional-javascript-configuration
-    interface ClearingOptions {
-        templates? : Object;
-        close_selectors? : string;
-        open_selectors? : string;
-        skip_selector? : string;
-        touch_label? : string;
-        init? : boolean;
-        locked? : boolean;
-    }
-
-    // http://foundation.zurb.com/docs/components/dropdown.html#optional-javascript-configuration
-    interface DropdownOptions {
-        active_class? : string;
-        disabled_class? : string;
-        mega_class? : string;
-        align? : string;
-        is_hover? : boolean;
-        hover_timeout? : number;
-        opened? : () => any;
-        closed? : () => any;
-    }
-
-    // http://foundation.zurb.com/docs/components/equalizer.html#optional-javascript-configuration
-    interface EqualizerOptions {
-        use_tallest? : boolean;
-        equalize_on_stack? : boolean;
-    }
-
-    // http://foundation.zurb.com/docs/components/interchange.html#custom-named-queries
-    interface InterchangeOptions {
-        load_attr? : string;
-        named_queries? : Object;
-        directives? : Object;
-    }
-
-    // http://foundation.zurb.com/docs/components/joyride.html#optional-javascript-configuration
-    interface JoyrideOptions {
-        expose? : boolean;
-        modal? : boolean;
-        keyboard? : boolean;
-        tip_location? : string;
-        nub_position? : string;
-        scroll_speed? : number;
-        scroll_animation? : string;
-        timer? : number;
-        start_timer_on_click? : boolean;
-        start_offset? : number;
-        next_button? : boolean;
-        prev_button? : boolean;
-        tip_animation? : string;
-        pause_after? : number[];
-        exposed? : string[];
-        tip_animation_fade_speed? : number;
-        cookie_monster? : boolean;
-        cookie_name? : string;
-        cookie_domain? : boolean;
-        cookie_expires? : number;
-        tip_container? : string;
-        tip_location_patterns? : {
-            top? : string[];
-            bottom? : string[];
-            left? : string[];
-            right? : string[];
-        };
-        post_ride_callback? : () => void;
-        post_step_callback? : () => void;
-        pre_step_callback? : () => void;
-        pre_ride_callback? : () => void;
-        post_expose_callback? : () => void;
-        template? : {
-            link? : string;
-            timer? : string;
-            tip? : string;
-            wrapper? : string;
-            button?: string;
-            prev_button?: string;
-            modal? : string;
-            expose? : string;
-            expose_cover? : string;
-        };
-        expose_add_class? : string;
-    }
-
-    // http://foundation.zurb.com/docs/components/magellan.html#js
-    interface MagellanOptions {
-        active_class? : string;
-        threshold? : number;
-        destination_threshold? : number;
-        throttle_delay? : number;
-        fixed_top? : number;
-        offset_by_height? : boolean;
-        duration? : number;
-        easing? : string;
-    }
-
-    // http://foundation.zurb.com/docs/components/offcanvas.html#optional-javascript-configuration
-    interface OffCanvasOptions {
-        open_method? : string;
-        close_on_click? : boolean;
-    }
-
-    // http://foundation.zurb.com/docs/components/orbit.html#advanced
-    interface OrbitOptions {
-        animation? : string;
-        timer_speed? : number;
-        pause_on_hover? : boolean;
-        resume_on_mouseout? : boolean;
-        next_on_click? : boolean;
-        animation_speed? : number;
-        stack_on_small? : boolean;
-        navigation_arrows? : boolean;
-        slide_number? : boolean;
-        slide_number_text? : string;
-        container_class? : string;
-        stack_on_small_class? : string;
-        next_class? : string;
-        prev_class? : string;
-        timer_container_class? : string;
-        timer_paused_class? : string;
-        timer_progress_class? : string;
-        slides_container_class? : string;
-        preloader_class? : string;
-        slide_selector? : string;
-        bullets_container_class? : string;
-        bullets_active_class? : string;
-        slide_number_class? : string;
-        caption_class? : string;
-        active_slide_class? : string;
-        orbit_transition_class? : string;
-        bullets? : boolean;
-        circular? : boolean;
-        timer? : boolean;
-        variable_height? : boolean;
-        swipe? : boolean;
-        before_slide_change? : () => any;
-        after_slide_change? : () => any;
-    }
-
-    // http://foundation.zurb.com/docs/components/reveal.html
-    interface RevealCSSOptions {
-        opacity? : number;
-        visibility? : string;
-        display? : string;
-    }
-
-    interface RevealOptions {
-        animation? : string;
-        animation_speed? : number;
-        close_on_background_click? : boolean;
-        dismiss_modal_class? : string;
-        multiple_opened? : boolean;
-        bg_class? : string;
-        root_element? : string;
-        on_ajax_error? : () => any;
-        open? : () => any;
-        opened? : () => any;
-        close? : () => any;
-        closed? : () => any;
-        bg? : JQuery;
-        css? : {
-            open? : RevealCSSOptions;
-            close? : RevealCSSOptions;
-        };
-    }
-
-    // http://foundation.zurb.com/docs/components/range_slider.html
-    interface SliderOptions {
-        start? : number;
-        end? : number;
-        step? : number;
-        precision? : number;
-        initial? : number;
-        vertical? : boolean;
-        trigger_input_change? : boolean;
-        on_change? : () => any;
-    }
-
-    // http://foundation.zurb.com/docs/components/tabs.html
-    interface TabOptions {
-        active_class? : string;
-        callback? : () => any;
-        deep_linking? : boolean;
-        scroll_to_content? : boolean;
-        is_hover? : boolean;
-    }
-
-    interface TooltipOptions {
-        additional_inheritable_classes? : string[];
-        tooltip_class? : string;
-        append_to? : string;
-        touch_close_text? : string;
-        disable_for_touch? : boolean;
-        hover_delay? : number;
-        show_on? : string;
-        tip_template? : (selector : string, content : string) => string;
-    }
-
-    interface TopbarOptions {
-        index? : number;
-        sticky_class? : string;
-        custom_back_text? : boolean;
-        back_text? : string;
-        is_hover? : boolean;
-        mobile_show_parent_link? : boolean;
-        scrolltop? : boolean;
-        sticky_on? : string;
-    }
-
-    interface Options {
-        abide? : AbideOptions;
-        accordion? : AccordionOptions;
-        alert? : AlertOptions;
-        clearing? : ClearingOptions;
-        dropdown? : DropdownOptions;
-        equalizer? : EqualizerOptions;
-        interchange? : InterchangeOptions;
-        joyride? : JoyrideOptions;
-        magellan? : MagellanOptions;
-        offcanvas? : OffCanvasOptions;
-        orbit? : OrbitOptions;
-        reveal? : RevealOptions;
-        slider? : SliderOptions;
-        tab? : TabOptions;
-        tooltip? : TooltipOptions;
-        topbar? : TopbarOptions;
-    }
-
-    interface FoundationStatic {
-        name : string;
-        version : string;
-        media_queries : Object;
-        stylesheet : CSSStyleSheet;
-        global : {
-            namespace : string;
-        };
-        init(scope : JQuery) : JQuery;
-        init(scope : JQuery, libraries : Options) : JQuery;
-        init(scope : JQuery, libraries : string, method : Options) : JQuery;
-        init(scope : JQuery, libraries : string, method : string, options : Object) : JQuery;
-        init_lib(lib : any, args : any) : (...args : any[]) => any;
-        patch(lib : any) : void;
-        inherit(scope : JQuery, methods : string) : void;
-        set_namespace() : void;
-        libs : any;
-        utils : {
-            S(selector : any, context : any) : JQuery;
-            throttle(func : (...args : any[]) => any, delay : number) : (...args : any[]) => any;
-            debounce(func : (...args : any[]) => any, delay : number, immediate : boolean) : (...args : any[]) => any;
-            data_options(el : JQuery) : Object;
-            register_media(media : string, media_class : string) : void;
-            add_custom_rule(rule : string, media : string) : void;
-            image_loaded(images : JQuery, callback : (...args : any[]) => any) : void;
-            random_str(length? : number) : string;
-            is_small_only(): boolean;
-            is_small_up(): boolean;
-            is_medium_only(): boolean;
-            is_medium_up(): boolean;
-            is_large_only(): boolean;
-            is_large_up(): boolean;
-            is_xlarge_only(): boolean;
-            is_xlarge_up(): boolean;
-            is_xxlarge_only(): boolean;
-            is_xxlarge_up(): boolean;
-        };
-    }
-}
-
-interface JQuery {
-    foundation() : JQuery;
-    foundation(libraries : Foundation.Options | string) : JQuery;
-    foundation(libraries : string, method : Foundation.Options | string) : JQuery;
-    foundation(libraries : string, method : string, options : Object) : JQuery;
-}
-
-declare var Foundation : Foundation.FoundationStatic;
diff --git a/foundation/index.d.ts b/foundation/index.d.ts
new file mode 100644
index 0000000000..49e9876130
--- /dev/null
+++ b/foundation/index.d.ts
@@ -0,0 +1,328 @@
+// Type definitions for Foundation v5.5.1
+// Project: http://foundation.zurb.com/
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="jquery"/>
+
+declare namespace Foundation {
+    // http://foundation.zurb.com/docs/components/abide.html#optional-javascript-configuration
+    interface AbidePatterns {
+        alpha? : RegExp;
+        alpha_numeric? : RegExp;
+        integer? : RegExp;
+        number? : RegExp;
+        card? : RegExp;
+        cvv? : RegExp;
+        email? : RegExp;
+        url? : RegExp;
+        domain? : RegExp;
+        datetime? : RegExp;
+        date? : RegExp;
+        time? : RegExp;
+        dateISO? : RegExp;
+        month_day_year? : RegExp;
+        color? : RegExp;
+    }
+
+    interface AbideOptions {
+        live_validate? : boolean;
+        validate_on_blur? : boolean;
+        focus_on_invalid? : boolean;
+        error_labels? : boolean;
+        timeout? : number;
+        patterns? : AbidePatterns;
+        validators? : Object;
+    }
+
+    // http://foundation.zurb.com/docs/components/accordion.html#optional-javascript-configuration
+    interface AccordionOptions {
+        content_class? : string;
+        active_class? : string;
+        multi_expand? : boolean;
+        toggleable? : boolean;
+        callback? : () => any;
+    }
+
+    // http://foundation.zurb.com/docs/components/alert_boxes.html
+    interface AlertOptions {
+        callback? : () => any;
+    }
+
+    // http://foundation.zurb.com/docs/components/clearing.html#optional-javascript-configuration
+    interface ClearingOptions {
+        templates? : Object;
+        close_selectors? : string;
+        open_selectors? : string;
+        skip_selector? : string;
+        touch_label? : string;
+        init? : boolean;
+        locked? : boolean;
+    }
+
+    // http://foundation.zurb.com/docs/components/dropdown.html#optional-javascript-configuration
+    interface DropdownOptions {
+        active_class? : string;
+        disabled_class? : string;
+        mega_class? : string;
+        align? : string;
+        is_hover? : boolean;
+        hover_timeout? : number;
+        opened? : () => any;
+        closed? : () => any;
+    }
+
+    // http://foundation.zurb.com/docs/components/equalizer.html#optional-javascript-configuration
+    interface EqualizerOptions {
+        use_tallest? : boolean;
+        equalize_on_stack? : boolean;
+    }
+
+    // http://foundation.zurb.com/docs/components/interchange.html#custom-named-queries
+    interface InterchangeOptions {
+        load_attr? : string;
+        named_queries? : Object;
+        directives? : Object;
+    }
+
+    // http://foundation.zurb.com/docs/components/joyride.html#optional-javascript-configuration
+    interface JoyrideOptions {
+        expose? : boolean;
+        modal? : boolean;
+        keyboard? : boolean;
+        tip_location? : string;
+        nub_position? : string;
+        scroll_speed? : number;
+        scroll_animation? : string;
+        timer? : number;
+        start_timer_on_click? : boolean;
+        start_offset? : number;
+        next_button? : boolean;
+        prev_button? : boolean;
+        tip_animation? : string;
+        pause_after? : number[];
+        exposed? : string[];
+        tip_animation_fade_speed? : number;
+        cookie_monster? : boolean;
+        cookie_name? : string;
+        cookie_domain? : boolean;
+        cookie_expires? : number;
+        tip_container? : string;
+        tip_location_patterns? : {
+            top? : string[];
+            bottom? : string[];
+            left? : string[];
+            right? : string[];
+        };
+        post_ride_callback? : () => void;
+        post_step_callback? : () => void;
+        pre_step_callback? : () => void;
+        pre_ride_callback? : () => void;
+        post_expose_callback? : () => void;
+        template? : {
+            link? : string;
+            timer? : string;
+            tip? : string;
+            wrapper? : string;
+            button?: string;
+            prev_button?: string;
+            modal? : string;
+            expose? : string;
+            expose_cover? : string;
+        };
+        expose_add_class? : string;
+    }
+
+    // http://foundation.zurb.com/docs/components/magellan.html#js
+    interface MagellanOptions {
+        active_class? : string;
+        threshold? : number;
+        destination_threshold? : number;
+        throttle_delay? : number;
+        fixed_top? : number;
+        offset_by_height? : boolean;
+        duration? : number;
+        easing? : string;
+    }
+
+    // http://foundation.zurb.com/docs/components/offcanvas.html#optional-javascript-configuration
+    interface OffCanvasOptions {
+        open_method? : string;
+        close_on_click? : boolean;
+    }
+
+    // http://foundation.zurb.com/docs/components/orbit.html#advanced
+    interface OrbitOptions {
+        animation? : string;
+        timer_speed? : number;
+        pause_on_hover? : boolean;
+        resume_on_mouseout? : boolean;
+        next_on_click? : boolean;
+        animation_speed? : number;
+        stack_on_small? : boolean;
+        navigation_arrows? : boolean;
+        slide_number? : boolean;
+        slide_number_text? : string;
+        container_class? : string;
+        stack_on_small_class? : string;
+        next_class? : string;
+        prev_class? : string;
+        timer_container_class? : string;
+        timer_paused_class? : string;
+        timer_progress_class? : string;
+        slides_container_class? : string;
+        preloader_class? : string;
+        slide_selector? : string;
+        bullets_container_class? : string;
+        bullets_active_class? : string;
+        slide_number_class? : string;
+        caption_class? : string;
+        active_slide_class? : string;
+        orbit_transition_class? : string;
+        bullets? : boolean;
+        circular? : boolean;
+        timer? : boolean;
+        variable_height? : boolean;
+        swipe? : boolean;
+        before_slide_change? : () => any;
+        after_slide_change? : () => any;
+    }
+
+    // http://foundation.zurb.com/docs/components/reveal.html
+    interface RevealCSSOptions {
+        opacity? : number;
+        visibility? : string;
+        display? : string;
+    }
+
+    interface RevealOptions {
+        animation? : string;
+        animation_speed? : number;
+        close_on_background_click? : boolean;
+        dismiss_modal_class? : string;
+        multiple_opened? : boolean;
+        bg_class? : string;
+        root_element? : string;
+        on_ajax_error? : () => any;
+        open? : () => any;
+        opened? : () => any;
+        close? : () => any;
+        closed? : () => any;
+        bg? : JQuery;
+        css? : {
+            open? : RevealCSSOptions;
+            close? : RevealCSSOptions;
+        };
+    }
+
+    // http://foundation.zurb.com/docs/components/range_slider.html
+    interface SliderOptions {
+        start? : number;
+        end? : number;
+        step? : number;
+        precision? : number;
+        initial? : number;
+        vertical? : boolean;
+        trigger_input_change? : boolean;
+        on_change? : () => any;
+    }
+
+    // http://foundation.zurb.com/docs/components/tabs.html
+    interface TabOptions {
+        active_class? : string;
+        callback? : () => any;
+        deep_linking? : boolean;
+        scroll_to_content? : boolean;
+        is_hover? : boolean;
+    }
+
+    interface TooltipOptions {
+        additional_inheritable_classes? : string[];
+        tooltip_class? : string;
+        append_to? : string;
+        touch_close_text? : string;
+        disable_for_touch? : boolean;
+        hover_delay? : number;
+        show_on? : string;
+        tip_template? : (selector : string, content : string) => string;
+    }
+
+    interface TopbarOptions {
+        index? : number;
+        sticky_class? : string;
+        custom_back_text? : boolean;
+        back_text? : string;
+        is_hover? : boolean;
+        mobile_show_parent_link? : boolean;
+        scrolltop? : boolean;
+        sticky_on? : string;
+    }
+
+    interface Options {
+        abide? : AbideOptions;
+        accordion? : AccordionOptions;
+        alert? : AlertOptions;
+        clearing? : ClearingOptions;
+        dropdown? : DropdownOptions;
+        equalizer? : EqualizerOptions;
+        interchange? : InterchangeOptions;
+        joyride? : JoyrideOptions;
+        magellan? : MagellanOptions;
+        offcanvas? : OffCanvasOptions;
+        orbit? : OrbitOptions;
+        reveal? : RevealOptions;
+        slider? : SliderOptions;
+        tab? : TabOptions;
+        tooltip? : TooltipOptions;
+        topbar? : TopbarOptions;
+    }
+
+    interface FoundationStatic {
+        name : string;
+        version : string;
+        media_queries : Object;
+        stylesheet : CSSStyleSheet;
+        global : {
+            namespace : string;
+        };
+        init(scope : JQuery) : JQuery;
+        init(scope : JQuery, libraries : Options) : JQuery;
+        init(scope : JQuery, libraries : string, method : Options) : JQuery;
+        init(scope : JQuery, libraries : string, method : string, options : Object) : JQuery;
+        init_lib(lib : any, args : any) : (...args : any[]) => any;
+        patch(lib : any) : void;
+        inherit(scope : JQuery, methods : string) : void;
+        set_namespace() : void;
+        libs : any;
+        utils : {
+            S(selector : any, context : any) : JQuery;
+            throttle(func : (...args : any[]) => any, delay : number) : (...args : any[]) => any;
+            debounce(func : (...args : any[]) => any, delay : number, immediate : boolean) : (...args : any[]) => any;
+            data_options(el : JQuery) : Object;
+            register_media(media : string, media_class : string) : void;
+            add_custom_rule(rule : string, media : string) : void;
+            image_loaded(images : JQuery, callback : (...args : any[]) => any) : void;
+            random_str(length? : number) : string;
+            is_small_only(): boolean;
+            is_small_up(): boolean;
+            is_medium_only(): boolean;
+            is_medium_up(): boolean;
+            is_large_only(): boolean;
+            is_large_up(): boolean;
+            is_xlarge_only(): boolean;
+            is_xlarge_up(): boolean;
+            is_xxlarge_only(): boolean;
+            is_xxlarge_up(): boolean;
+        };
+    }
+}
+
+interface JQuery {
+    foundation() : JQuery;
+    foundation(libraries : Foundation.Options | string) : JQuery;
+    foundation(libraries : string, method : Foundation.Options | string) : JQuery;
+    foundation(libraries : string, method : string, options : Object) : JQuery;
+}
+
+declare var Foundation : Foundation.FoundationStatic;
diff --git a/foundation/tsconfig.json b/foundation/tsconfig.json
new file mode 100644
index 0000000000..965628cc22
--- /dev/null
+++ b/foundation/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "foundation-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fpsmeter/FPSMeter.d.ts b/fpsmeter/index.d.ts
similarity index 100%
rename from fpsmeter/FPSMeter.d.ts
rename to fpsmeter/index.d.ts
diff --git a/fpsmeter/tsconfig.json b/fpsmeter/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/fpsmeter/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/freedom/freedom-core-env.d.ts b/freedom/freedom-core-env.d.ts
index c50f28fed0..5c0ce06153 100644
--- a/freedom/freedom-core-env.d.ts
+++ b/freedom/freedom-core-env.d.ts
@@ -3,6 +3,6 @@
 // Definitions by: Jonathan Pevarnek <https://github.com/jpevarnek/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./freedom.d.ts" />
+
 
 declare var freedom :freedom.FreedomInCoreEnv;
diff --git a/freedom/freedom-module-env.d.ts b/freedom/freedom-module-env.d.ts
index 0edc756e8d..a3e2f405f0 100644
--- a/freedom/freedom-module-env.d.ts
+++ b/freedom/freedom-module-env.d.ts
@@ -3,6 +3,6 @@
 // Definitions by: Jonathan Pevarnek <https://github.com/jpevarnek/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./freedom.d.ts" />
+
 
 declare var freedom :freedom.FreedomInModuleEnv;
diff --git a/freedom/freedom-tests.ts b/freedom/freedom-tests.ts
index 4047d7615c..83a9d9a88c 100644
--- a/freedom/freedom-tests.ts
+++ b/freedom/freedom-tests.ts
@@ -1,23 +1,23 @@
-/// <reference path="freedom.d.ts" />
 
-var freedomModule :freedom.FreedomInModuleEnv;
-var freedomCore :freedom.FreedomInCoreEnv;
 
-var parentModule :freedom.ParentModuleThing = freedomModule();
-parentModule.on('message', (x :string) => {
+var freedomModule: freedom.FreedomInModuleEnv;
+var freedomCore: freedom.FreedomInCoreEnv;
+
+var parentModule: freedom.ParentModuleThing = freedomModule();
+parentModule.on('message', (x: string) => {
 });
 
-var coreInModule :freedom.Core = freedomModule['core']();
-coreInModule.getLogger('tag').then((logger :freedom.Logger) => {
-  logger.log('message');
+var coreInModule: freedom.Core = freedomModule['core']();
+coreInModule.getLogger('tag').then((logger: freedom.Logger) => {
+	logger.log('message');
 });
 
-var freedomConsole :freedom.Console.Console = freedomModule['core.console']();
-var doneLogging :Promise<void> = freedomConsole.log('source', 'message');
+var freedomConsole: freedom.Console.Console = freedomModule['core.console']();
+var doneLogging = freedomConsole.log('source', 'message');
 
 freedomCore('freedom-module.json', {
-  'logger': 'loggingprovider.json',
-  'debug': 'log'
+	'logger': 'loggingprovider.json',
+	'debug': 'log'
 }).then((moduleFactory) => {
-  moduleFactory.close();
+	moduleFactory.close();
 });
diff --git a/freedom/freedom.d.ts b/freedom/index.d.ts
similarity index 100%
rename from freedom/freedom.d.ts
rename to freedom/index.d.ts
diff --git a/freedom/tsconfig.json b/freedom/tsconfig.json
new file mode 100644
index 0000000000..290438aaae
--- /dev/null
+++ b/freedom/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "freedom-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/freeport/freeport-tests.ts b/freeport/freeport-tests.ts
index fc53835a98..6f8ac0fd6b 100644
--- a/freeport/freeport-tests.ts
+++ b/freeport/freeport-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="freeport.d.ts" />
 
 import freeport = require('freeport');
 
diff --git a/freeport/freeport.d.ts b/freeport/freeport.d.ts
deleted file mode 100644
index ced31149c1..0000000000
--- a/freeport/freeport.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Type definitions for freeport 1.0.5
-// Project: https://github.com/daaku/nodejs-freeport
-// Definitions by: Arne Schubert <https://github.com/atd-schubert>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'freeport' {
-	function freeport(cb: (err: Error, port: number) => void): void;
-	
-	export = freeport;
-}
diff --git a/freeport/index.d.ts b/freeport/index.d.ts
new file mode 100644
index 0000000000..c6e8891f52
--- /dev/null
+++ b/freeport/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for freeport 1.0.5
+// Project: https://github.com/daaku/nodejs-freeport
+// Definitions by: Arne Schubert <https://github.com/atd-schubert>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function freeport(cb: (err: Error, port: number) => void): void;
+
+export = freeport;
diff --git a/freeport/tsconfig.json b/freeport/tsconfig.json
new file mode 100644
index 0000000000..37797a6be5
--- /dev/null
+++ b/freeport/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "freeport-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/from/from-tests.ts b/from/from-tests.ts
index ce3a11d869..b46bdf66f1 100644
--- a/from/from-tests.ts
+++ b/from/from-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="./from.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import from = require('from');
 
diff --git a/from/from.d.ts b/from/from.d.ts
deleted file mode 100644
index 9152930813..0000000000
--- a/from/from.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Type definitions for from v0.1.3
-// Project: https://github.com/dominictarr/from
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'from' {
-
-	var mod: mod.From;
-
-	namespace mod {
-		interface From {
-			(getChunk: (count: number, next: () => any) => any): NodeJS.ReadableStream;
-			(chunks: any[]): NodeJS.ReadableStream;
-			emit(type: string, data: any): void;
-		}
-	}
-
-	export  = mod;
-}
diff --git a/from/index.d.ts b/from/index.d.ts
new file mode 100644
index 0000000000..1b93a95825
--- /dev/null
+++ b/from/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for from v0.1.3
+// Project: https://github.com/dominictarr/from
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+declare var mod: mod.From;
+
+declare namespace mod {
+    interface From {
+        (getChunk: (count: number, next: () => any) => any): NodeJS.ReadableStream;
+        (chunks: any[]): NodeJS.ReadableStream;
+        emit(type: string, data: any): void;
+    }
+}
+
+export = mod;
diff --git a/from/tsconfig.json b/from/tsconfig.json
new file mode 100644
index 0000000000..35dab22fbc
--- /dev/null
+++ b/from/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "from-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fromjs/fromjs-tests.ts b/fromjs/fromjs-tests.ts
index dcc3dd6b99..b0e4ada0bf 100644
--- a/fromjs/fromjs-tests.ts
+++ b/fromjs/fromjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="fromjs.d.ts" />
+
 var array = [1, 2, 3, 4];
 from(array).each(function (value, key) {
     console.log('Value ' + value + ' at index ' + key);
diff --git a/fromjs/fromjs.d.ts b/fromjs/index.d.ts
similarity index 100%
rename from fromjs/fromjs.d.ts
rename to fromjs/index.d.ts
diff --git a/fromjs/tsconfig.json b/fromjs/tsconfig.json
new file mode 100644
index 0000000000..58316de850
--- /dev/null
+++ b/fromjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "fromjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fromnow/fromnow-tests.ts b/fromnow/fromnow-tests.ts
index 4ed78816aa..162491dc9a 100644
--- a/fromnow/fromnow-tests.ts
+++ b/fromnow/fromnow-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="fromnow.d.ts" />
+
 
 import fromnow = require( 'fromnow' );
 
diff --git a/fromnow/fromnow.d.ts b/fromnow/fromnow.d.ts
deleted file mode 100644
index d2b90891ec..0000000000
--- a/fromnow/fromnow.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Type definitions for fromnow v2.0.0
-// Project: https://github.com/lukeed/fromNow
-// Definitions by: Martin Bukovics <https://github.com/marinewater>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace FromNow {
-    interface FromNowOpts {
-        maxChunks?: number,
-        useAgo?: boolean,
-        useAnd?: boolean
-    }
-    export interface FromNowStatic {
-        /**
-         * Get readable time differences from now vs past or future dates.
-         * @param {string|Date} date
-         * @param {object} [opts]
-         * @param {number} [opts.maxChucks=10]
-         * @param {boolean} [opts.useAgo=false]
-         * @param {boolean} [opts.useAnd=false]
-         */
-        (date: string|Date, opts?: FromNowOpts): string
-    }
-}
-
-declare module 'fromnow' {
-    var FromNow: FromNow.FromNowStatic;
-    export = FromNow;
-}
diff --git a/fromnow/index.d.ts b/fromnow/index.d.ts
new file mode 100644
index 0000000000..86c1610f9b
--- /dev/null
+++ b/fromnow/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for fromnow v2.0.0
+// Project: https://github.com/lukeed/fromNow
+// Definitions by: Martin Bukovics <https://github.com/marinewater>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var FromNow: FromNow.FromNowStatic;
+export = FromNow;
+export as namespace fromNow;
+
+declare namespace FromNow {
+    interface FromNowOpts {
+        maxChunks?: number,
+        useAgo?: boolean,
+        useAnd?: boolean
+    }
+    export interface FromNowStatic {
+        /**
+         * Get readable time differences from now vs past or future dates.
+         * @param {string|Date} date
+         * @param {object} [opts]
+         * @param {number} [opts.maxChucks=10]
+         * @param {boolean} [opts.useAgo=false]
+         * @param {boolean} [opts.useAnd=false]
+         */
+        (date: string|Date, opts?: FromNowOpts): string
+    }
+}
diff --git a/fromnow/tsconfig.json b/fromnow/tsconfig.json
new file mode 100644
index 0000000000..641b1351bf
--- /dev/null
+++ b/fromnow/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "fromnow-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fs-ext/fs-ext-tests.ts b/fs-ext/fs-ext-tests.ts
index aba507c6da..baba88f092 100644
--- a/fs-ext/fs-ext-tests.ts
+++ b/fs-ext/fs-ext-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="fs-ext.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import fs = require('fs-ext');
 
diff --git a/fs-ext/fs-ext.d.ts b/fs-ext/fs-ext.d.ts
deleted file mode 100644
index 351d260466..0000000000
--- a/fs-ext/fs-ext.d.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-// Type definitions for fs-ext
-// Project: https://github.com/baudehlo/node-fs-ext
-// Definitions by: Oguzhan Ergin <https://github.com/OguzhanE>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../node/node.d.ts"/>
-
-declare module "fs-ext" {
-	export * from "fs";
- 
-	/**
-	* Asynchronous flock(2). No arguments other than a possible error are passed to the callback. 
-	* @param fd File Descriptor
-	* @param flags Flags can be 'sh', 'ex', 'shnb', 'exnb', 'un' and correspond to the various LOCK_SH, LOCK_EX, LOCK_SH|LOCK_NB, etc.
-	**/
-	export function flock(fd: number, flags: string, callback: (err: Error) => void): void;
-
-	/**
-	* Synchronous flock(2). Throws an exception on error.
-	* @param fd File Descriptor
-	* @param flags Flags can be 'sh', 'ex', 'shnb', 'exnb', 'un' and correspond to the various LOCK_SH, LOCK_EX, LOCK_SH|LOCK_NB, etc.
- 	**/
-	export function flockSync(fd: number, flags: string):void;
-	
-	/**
-	* Asynchronous fcntl(2).
-	* @param fd File Descriptor
-	* @param cmd The supported commands are: 'getfd' ( F_GETFD ) , 'setfd' ( F_SETFD )
-	* Requiring this module adds FD_CLOEXEC to the constants module, for use with F_SETFD.
-	* @param arg arg
-	**/
-	export function fcntl(fd: number, cmd: string, arg: number, callback: (err: Error, result: number) => void):void;
-
-	/**
-	* Asynchronous fcntl(2).
-	* @param fd File Descriptor
-	* @param cmd The supported commands are: 'getfd' ( F_GETFD ) , 'setfd' ( F_SETFD )
-	* Requiring this module adds FD_CLOEXEC to the constants module, for use with F_SETFD.
-	**/
-	export function fcntl(fd: number, cmd: string, callback: (err: Error, result: number) => void):void;
-
-	/**
-	* Synchronous fcntl(2). Throws an exception on error.
-	* @param fd File Descriptor
-	* @param cmd The supported commands are: 'getfd' ( F_GETFD ) , 'setfd' ( F_SETFD )
-	* Requiring this module adds FD_CLOEXEC to the constants module, for use with F_SETFD.
-	* @param arg arg
-	* @return Returns flags
-	**/
-	export function fcntlSync(fd: number, cmd: string, arg?: number): number;
-
-	/**
-	* Asynchronous lseek(2).
-	* @param fd File Descriptor
-	* @param offset Offset
-	* @param whence 
-	* Whence can be 0 (SEEK_SET) to set the new position in bytes to offset, 1 (SEEK_CUR) to set the new 
-	* position to the current position plus offset bytes (can be negative), or 2 (SEEK_END) to set to the end 
-	* of the file plus offset bytes (usually negative or zero to seek to the end of the file).
-	**/
-	export function seek(fd: number, offset: number, whence: number, callback: (err: Error, currFilePos: number) => void): void;
-  
-	/**
-	* Synchronous lseek(2). Throws an exception on error. Returns current file position.
-	* @param fd File Descriptor
-	* @param offset Offset
-	* @param whence 
-	* Whence can be 0 (SEEK_SET) to set the new position in bytes to offset, 1 (SEEK_CUR) to set the new 
-	* position to the current position plus offset bytes (can be negative), or 2 (SEEK_END) to set to the end 
-	* of the file plus offset bytes (usually negative or zero to seek to the end of the file).
-	* @returns Returns current file position.
-	**/
-	export function seekSync(fd: number, offset: number, whence: number): number;
-
-	/**
-	* Asynchronous utime(2).
-	* @param path File path
-	* @param atime
-	* Arguments atime and mtime are in seconds as for the system call.Note that the number value of Date() is in milliseconds,
-	* so to use the 'now' value with fs.utime() you would have to divide by 1000 first, e.g. Date.now()/1000
-	* Just like for utime(2), the absence of the atime and mtime means 'now'.
-	* @param mtime
-	* Arguments atime and mtime are in seconds as for the system call.Note that the number value of Date() is in milliseconds,
-	* so to use the 'now' value with fs.utime() you would have to divide by 1000 first, e.g. Date.now()/1000
-	* Just like for utime(2), the absence of the atime and mtime means 'now'.
-	**/
-	export function utime(path: string, atime: number, mtime: number, callback: (err: Error) => void):void;
-
-	/**
-	* Synchronous version of utime(). Throws an exception on error.
-	* @param path File path
-	* @param atime
-	* Arguments atime and mtime are in seconds as for the system call.Note that the number value of Date() is in milliseconds,
-	* so to use the 'now' value with fs.utime() you would have to divide by 1000 first, e.g. Date.now()/1000
-	* Just like for utime(2), the absence of the atime and mtime means 'now'.
-	* @param mtime
-	* Arguments atime and mtime are in seconds as for the system call.Note that the number value of Date() is in milliseconds,
-	* so to use the 'now' value with fs.utime() you would have to divide by 1000 first, e.g. Date.now()/1000
-	* Just like for utime(2), the absence of the atime and mtime means 'now'.
-	**/
-	export function utimeSync(path: string, atime: number, mtime: number):void;
-}
diff --git a/fs-ext/index.d.ts b/fs-ext/index.d.ts
new file mode 100644
index 0000000000..d60a06ef2b
--- /dev/null
+++ b/fs-ext/index.d.ts
@@ -0,0 +1,101 @@
+// Type definitions for fs-ext
+// Project: https://github.com/baudehlo/node-fs-ext
+// Definitions by: Oguzhan Ergin <https://github.com/OguzhanE>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="node"/>
+
+
+export * from "fs";
+
+/**
+* Asynchronous flock(2). No arguments other than a possible error are passed to the callback. 
+* @param fd File Descriptor
+* @param flags Flags can be 'sh', 'ex', 'shnb', 'exnb', 'un' and correspond to the various LOCK_SH, LOCK_EX, LOCK_SH|LOCK_NB, etc.
+**/
+export declare function flock(fd: number, flags: string, callback: (err: Error) => void): void;
+
+/**
+* Synchronous flock(2). Throws an exception on error.
+* @param fd File Descriptor
+* @param flags Flags can be 'sh', 'ex', 'shnb', 'exnb', 'un' and correspond to the various LOCK_SH, LOCK_EX, LOCK_SH|LOCK_NB, etc.
+  **/
+export declare function flockSync(fd: number, flags: string): void;
+
+/**
+* Asynchronous fcntl(2).
+* @param fd File Descriptor
+* @param cmd The supported commands are: 'getfd' ( F_GETFD ) , 'setfd' ( F_SETFD )
+* Requiring this module adds FD_CLOEXEC to the constants module, for use with F_SETFD.
+* @param arg arg
+**/
+export declare function fcntl(fd: number, cmd: string, arg: number, callback: (err: Error, result: number) => void): void;
+
+/**
+* Asynchronous fcntl(2).
+* @param fd File Descriptor
+* @param cmd The supported commands are: 'getfd' ( F_GETFD ) , 'setfd' ( F_SETFD )
+* Requiring this module adds FD_CLOEXEC to the constants module, for use with F_SETFD.
+**/
+export declare function fcntl(fd: number, cmd: string, callback: (err: Error, result: number) => void): void;
+
+/**
+* Synchronous fcntl(2). Throws an exception on error.
+* @param fd File Descriptor
+* @param cmd The supported commands are: 'getfd' ( F_GETFD ) , 'setfd' ( F_SETFD )
+* Requiring this module adds FD_CLOEXEC to the constants module, for use with F_SETFD.
+* @param arg arg
+* @return Returns flags
+**/
+export declare function fcntlSync(fd: number, cmd: string, arg?: number): number;
+
+/**
+* Asynchronous lseek(2).
+* @param fd File Descriptor
+* @param offset Offset
+* @param whence 
+* Whence can be 0 (SEEK_SET) to set the new position in bytes to offset, 1 (SEEK_CUR) to set the new 
+* position to the current position plus offset bytes (can be negative), or 2 (SEEK_END) to set to the end 
+* of the file plus offset bytes (usually negative or zero to seek to the end of the file).
+**/
+export declare function seek(fd: number, offset: number, whence: number, callback: (err: Error, currFilePos: number) => void): void;
+
+/**
+* Synchronous lseek(2). Throws an exception on error. Returns current file position.
+* @param fd File Descriptor
+* @param offset Offset
+* @param whence 
+* Whence can be 0 (SEEK_SET) to set the new position in bytes to offset, 1 (SEEK_CUR) to set the new 
+* position to the current position plus offset bytes (can be negative), or 2 (SEEK_END) to set to the end 
+* of the file plus offset bytes (usually negative or zero to seek to the end of the file).
+* @returns Returns current file position.
+**/
+export declare function seekSync(fd: number, offset: number, whence: number): number;
+
+/**
+* Asynchronous utime(2).
+* @param path File path
+* @param atime
+* Arguments atime and mtime are in seconds as for the system call.Note that the number value of Date() is in milliseconds,
+* so to use the 'now' value with fs.utime() you would have to divide by 1000 first, e.g. Date.now()/1000
+* Just like for utime(2), the absence of the atime and mtime means 'now'.
+* @param mtime
+* Arguments atime and mtime are in seconds as for the system call.Note that the number value of Date() is in milliseconds,
+* so to use the 'now' value with fs.utime() you would have to divide by 1000 first, e.g. Date.now()/1000
+* Just like for utime(2), the absence of the atime and mtime means 'now'.
+**/
+export declare function utime(path: string, atime: number, mtime: number, callback: (err: Error) => void): void;
+
+/**
+* Synchronous version of utime(). Throws an exception on error.
+* @param path File path
+* @param atime
+* Arguments atime and mtime are in seconds as for the system call.Note that the number value of Date() is in milliseconds,
+* so to use the 'now' value with fs.utime() you would have to divide by 1000 first, e.g. Date.now()/1000
+* Just like for utime(2), the absence of the atime and mtime means 'now'.
+* @param mtime
+* Arguments atime and mtime are in seconds as for the system call.Note that the number value of Date() is in milliseconds,
+* so to use the 'now' value with fs.utime() you would have to divide by 1000 first, e.g. Date.now()/1000
+* Just like for utime(2), the absence of the atime and mtime means 'now'.
+**/
+export declare function utimeSync(path: string, atime: number, mtime: number): void;
diff --git a/fs-ext/tsconfig.json b/fs-ext/tsconfig.json
new file mode 100644
index 0000000000..60b566e6ce
--- /dev/null
+++ b/fs-ext/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "fs-ext-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fs-extra-promise/fs-extra-promise-tests.ts b/fs-extra-promise/fs-extra-promise-tests.ts
index 893585d312..4ce1de3073 100644
--- a/fs-extra-promise/fs-extra-promise-tests.ts
+++ b/fs-extra-promise/fs-extra-promise-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="fs-extra-promise.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import fs = require('fs-extra-promise');
 import stream = require('stream');
diff --git a/fs-extra-promise/fs-extra-promise.d.ts b/fs-extra-promise/fs-extra-promise.d.ts
deleted file mode 100644
index 2243a4d1c5..0000000000
--- a/fs-extra-promise/fs-extra-promise.d.ts
+++ /dev/null
@@ -1,264 +0,0 @@
-// Type definitions for fs-extra-promise
-// Project: https://github.com/overlookmotel/fs-extra-promise
-// Definitions by: midknight41 <https://github.com/midknight41>, Jason Swearingen <https://github.com/jasonswearingen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/fs-extra.d.ts via TSD fs-extra definition
-
-///<reference path="../node/node.d.ts"/>
-///<reference path="../bluebird/bluebird.d.ts"/>
-
-declare module "fs-extra-promise" {
-	import stream = require("stream");
-	import Promise = require("bluebird");
-
-	export interface Stats {
-		isFile(): boolean;
-		isDirectory(): boolean;
-		isBlockDevice(): boolean;
-		isCharacterDevice(): boolean;
-		isSymbolicLink(): boolean;
-		isFIFO(): boolean;
-		isSocket(): boolean;
-		dev: number;
-		ino: number;
-		mode: number;
-		nlink: number;
-		uid: number;
-		gid: number;
-		rdev: number;
-		size: number;
-		blksize: number;
-		blocks: number;
-		atime: Date;
-		mtime: Date;
-		ctime: Date;
-	}
-
-	export interface FSWatcher {
-		close(): void;
-	}
-
-	export class ReadStream extends stream.Readable { }
-	export class WriteStream extends stream.Writable { }
-
-	//extended methods
-	export function copy(src: string, dest: string, callback?: (err: Error) => void): void;
-	export function copy(src: string, dest: string, filter: (src: string) => boolean, callback?: (err: Error) => void): void;
-
-	export function copySync(src: string, dest: string): void;
-	export function copySync(src: string, dest: string, filter: (src: string) => boolean): void;
-
-	export function createFile(file: string, callback?: (err: Error) => void): void;
-	export function createFileSync(file: string): void;
-
-	export function mkdirs(dir: string, callback?: (err: Error) => void): void;
-	export function mkdirp(dir: string, callback?: (err: Error) => void): void;
-	export function mkdirsSync(dir: string): void;
-	export function mkdirpSync(dir: string): void;
-
-	export function outputFile(file: string, data: any, callback?: (err: Error) => void): void;
-	export function outputFileSync(file: string, data: any): void;
-
-	export function outputJson(file: string, data: any, callback?: (err: Error) => void): void;
-	export function outputJSON(file: string, data: any, callback?: (err: Error) => void): void;
-	export function outputJsonSync(file: string, data: any): void;
-	export function outputJSONSync(file: string, data: any): void;
-
-	export function readJson(file: string, callback?: (err: Error) => void): void;
-	export function readJson(file: string, options?: OpenOptions, callback?: (err: Error) => void): void;
-	export function readJSON(file: string, callback?: (err: Error) => void): void;
-	export function readJSON(file: string, options?: OpenOptions, callback?: (err: Error) => void): void;
-
-	export function readJsonSync(file: string, options?: OpenOptions): void;
-	export function readJSONSync(file: string, options?: OpenOptions): void;
-
-	export function remove(dir: string, callback?: (err: Error) => void): void;
-	export function removeSync(dir: string): void;
-	// export function delete(dir: string, callback?: (err: Error) => void): void;
-	// export function deleteSync(dir: string): void;
-
-	export function writeJson(file: string, object: any, callback?: (err: Error) => void): void;
-	export function writeJson(file: string, object: any, options?: OpenOptions, callback?: (err: Error) => void): void;
-	export function writeJSON(file: string, object: any, callback?: (err: Error) => void): void;
-	export function writeJSON(file: string, object: any, options?: OpenOptions, callback?: (err: Error) => void): void;
-
-	export function writeJsonSync(file: string, object: any, options?: OpenOptions): void;
-	export function writeJSONSync(file: string, object: any, options?: OpenOptions): void;
-
-	export function rename(oldPath: string, newPath: string, callback?: (err: Error) => void): void;
-	export function renameSync(oldPath: string, newPath: string): void;
-	export function truncate(fd: number, len: number, callback?: (err: Error) => void): void;
-	export function truncateSync(fd: number, len: number): void;
-	export function chown(path: string, uid: number, gid: number, callback?: (err: Error) => void): void;
-	export function chownSync(path: string, uid: number, gid: number): void;
-	export function fchown(fd: number, uid: number, gid: number, callback?: (err: Error) => void): void;
-	export function fchownSync(fd: number, uid: number, gid: number): void;
-	export function lchown(path: string, uid: number, gid: number, callback?: (err: Error) => void): void;
-	export function lchownSync(path: string, uid: number, gid: number): void;
-	export function chmod(path: string, mode: number, callback?: (err: Error) => void): void;
-	export function chmod(path: string, mode: string, callback?: (err: Error) => void): void;
-	export function chmodSync(path: string, mode: number): void;
-	export function chmodSync(path: string, mode: string): void;
-	export function fchmod(fd: number, mode: number, callback?: (err: Error) => void): void;
-	export function fchmod(fd: number, mode: string, callback?: (err: Error) => void): void;
-	export function fchmodSync(fd: number, mode: number): void;
-	export function fchmodSync(fd: number, mode: string): void;
-	export function lchmod(path: string, mode: string, callback?: (err: Error) => void): void;
-	export function lchmod(path: string, mode: number, callback?: (err: Error) => void): void;
-	export function lchmodSync(path: string, mode: number): void;
-	export function lchmodSync(path: string, mode: string): void;
-	export function stat(path: string, callback?: (err: Error, stats: Stats) => void): void;
-	export function lstat(path: string, callback?: (err: Error, stats: Stats) => void): void;
-	export function fstat(fd: number, callback?: (err: Error, stats: Stats) => void): void;
-	export function statSync(path: string): Stats;
-	export function lstatSync(path: string): Stats;
-	export function fstatSync(fd: number): Stats;
-	export function link(srcpath: string, dstpath: string, callback?: (err: Error) => void): void;
-	export function linkSync(srcpath: string, dstpath: string): void;
-	export function symlink(srcpath: string, dstpath: string, type?: string, callback?: (err: Error) => void): void;
-	export function symlinkSync(srcpath: string, dstpath: string, type?: string): void;
-	export function readlink(path: string, callback?: (err: Error, linkString: string) => void): void;
-	export function realpath(path: string, callback?: (err: Error, resolvedPath: string) => void): void;
-	export function realpath(path: string, cache: string, callback: (err: Error, resolvedPath: string) => void): void;
-	export function realpathSync(path: string, cache?: boolean): string;
-	export function unlink(path: string, callback?: (err: Error) => void): void;
-	export function unlinkSync(path: string): void;
-	export function rmdir(path: string, callback?: (err: Error) => void): void;
-	export function rmdirSync(path: string): void;
-	export function mkdir(path: string, mode?: number, callback?: (err: Error) => void): void;
-	export function mkdir(path: string, mode?: string, callback?: (err: Error) => void): void;
-	export function mkdirSync(path: string, mode?: number): void;
-	export function mkdirSync(path: string, mode?: string): void;
-	export function readdir(path: string, callback?: (err: Error, files: string[]) => void): void;
-	export function readdirSync(path: string): string[];
-	export function close(fd: number, callback?: (err: Error) => void): void;
-	export function closeSync(fd: number): void;
-	export function open(path: string, flags: string, mode?: string, callback?: (err: Error, fs: number) => void): void;
-	export function openSync(path: string, flags: string, mode?: string): number;
-	export function utimes(path: string, atime: number, mtime: number, callback?: (err: Error) => void): void;
-	export function utimesSync(path: string, atime: number, mtime: number): void;
-	export function futimes(fd: number, atime: number, mtime: number, callback?: (err: Error) => void): void;
-	export function futimesSync(fd: number, atime: number, mtime: number): void;
-	export function fsync(fd: number, callback?: (err: Error) => void): void;
-	export function fsyncSync(fd: number): void;
-	export function write(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: Error, written: number, buffer: NodeBuffer) => void): void;
-	export function writeSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number;
-	export function read(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: Error, bytesRead: number, buffer: NodeBuffer) => void): void;
-	export function readSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number;
-	export function readFile(filename: string, encoding: string, callback: (err: Error, data: string) => void): void;
-	export function readFile(filename: string, options: OpenOptions, callback: (err: Error, data: string) => void): void;
-	export function readFile(filename: string, callback: (err: Error, data: NodeBuffer) => void): void;
-	export function readFileSync(filename: string): NodeBuffer;
-	export function readFileSync(filename: string, encoding: string): string;
-	export function readFileSync(filename: string, options: OpenOptions): string;
-	export function writeFile(filename: string, data: any, encoding?: string, callback?: (err: Error) => void): void;
-	export function writeFile(filename: string, data: any, options?: OpenOptions, callback?: (err: Error) => void): void;
-	export function writeFileSync(filename: string, data: any, encoding?: string): void;
-	export function writeFileSync(filename: string, data: any, option?: OpenOptions): void;
-	export function appendFile(filename: string, data: any, encoding?: string, callback?: (err: Error) => void): void;
-	export function appendFile(filename: string, data: any, option?: OpenOptions, callback?: (err: Error) => void): void;
-	export function appendFileSync(filename: string, data: any, encoding?: string): void;
-	export function appendFileSync(filename: string, data: any, option?: OpenOptions): void;
-	export function watchFile(filename: string, listener: { curr: Stats; prev: Stats; }): void;
-	export function watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: { curr: Stats; prev: Stats; }): void;
-	export function unwatchFile(filename: string, listener?: Stats): void;
-	export function watch(filename: string, options?: { persistent?: boolean; }, listener?: (event: string, filename: string) => any): FSWatcher;
-	export function exists(path: string, callback?: (exists: boolean) => void): void;
-	export function existsSync(path: string): boolean;
-    	export function ensureDir(path: string, cb: (err: Error) => void): void;
-    	export function ensureDirSync(path: string): void;
-
-	export interface OpenOptions {
-		encoding?: string;
-		flag?: string;
-	}
-
-	export interface ReadStreamOptions {
-		flags?: string;
-		encoding?: string;
-		fd?: number;
-		mode?: number;
-		bufferSize?: number;
-	}
-	export interface WriteStreamOptions {
-		flags?: string;
-		encoding?: string;
-		string?: string;
-	}
-	export function createReadStream(path: string, options?: ReadStreamOptions): ReadStream;
-	export function createWriteStream(path: string, options?: WriteStreamOptions): WriteStream;
-
-
-
-	//promisified versions
-	export function copyAsync(src: string, dest: string): Promise<void>;
-	export function copyAsync(src: string, dest: string, filter: (src: string) => boolean): Promise<void>;
-
-	export function createFileAsync(file: string): Promise<void>;
-
-	export function mkdirsAsync(dir: string): Promise<void>;
-	export function mkdirpAsync(dir: string): Promise<void>;
-
-	export function outputFileAsync(file: string, data: any): Promise<void>;
-
-	export function outputJsonAsync(file: string, data: any): Promise<void>;
-	export function outputJSONAsync(file: string, data: any): Promise<void>;
-
-	export function readJsonAsync(file: string): Promise<void>;
-	export function readJsonAsync(file: string, options?: OpenOptions): Promise<void>;
-	export function readJSONAsync(file: string): Promise<void>;
-	export function readJSONAsync(file: string, options?: OpenOptions): Promise<void>;
-
-
-	export function removeAsync(dir: string): Promise<void>;
-	// export function deleteAsync(dir: string):Promise<void>;
-
-	export function writeJsonAsync(file: string, object: any): Promise<void>;
-	export function writeJsonAsync(file: string, object: any, options?: OpenOptions): Promise<void>;
-	export function writeJSONAsync(file: string, object: any): Promise<void>;
-	export function writeJSONAsync(file: string, object: any, options?: OpenOptions): Promise<void>;
-
-	export function renameAsync(oldPath: string, newPath: string): Promise<void>;
-	export function truncateAsync(fd: number, len: number): Promise<void>;
-	export function chownAsync(path: string, uid: number, gid: number): Promise<void>;
-	export function fchownAsync(fd: number, uid: number, gid: number): Promise<void>;
-	export function lchownAsync(path: string, uid: number, gid: number): Promise<void>;
-	export function chmodAsync(path: string, mode: number): Promise<void>;
-	export function chmodAsync(path: string, mode: string): Promise<void>;
-	export function fchmodAsync(fd: number, mode: number): Promise<void>;
-	export function fchmodAsync(fd: number, mode: string): Promise<void>;
-	export function lchmodAsync(path: string, mode: string): Promise<void>;
-	export function lchmodAsync(path: string, mode: number): Promise<void>;
-	export function statAsync(path: string): Promise<Stats>;
-	export function lstatAsync(path: string): Promise<Stats>;
-	export function fstatAsync(fd: number): Promise<Stats>;
-	export function linkAsync(srcpath: string, dstpath: string): Promise<void>;
-	export function symlinkAsync(srcpath: string, dstpath: string, type?: string): Promise<void>;
-	export function readlinkAsync(path: string): Promise<string>;
-	export function realpathAsync(path: string): Promise<string>;
-	export function realpathAsync(path: string, cache: string): Promise<string>;
-	export function unlinkAsync(path: string): Promise<void>;
-	export function rmdirAsync(path: string): Promise<void>;
-	export function mkdirAsync(path: string, mode?: number): Promise<void>;
-	export function mkdirAsync(path: string, mode?: string): Promise<void>;
-	export function readdirAsync(path: string): Promise<string[]>;
-	export function closeAsync(fd: number): Promise<void>;
-	export function openAsync(path: string, flags: string, mode?: string): Promise<number>;
-	export function utimesAsync(path: string, atime: number, mtime: number): Promise<void>;
-	export function futimesAsync(fd: number, atime: number, mtime: number): Promise<void>;
-	export function fsyncAsync(fd: number): Promise<void>;
-	export function writeAsync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): Promise<[number, NodeBuffer]>;
-	export function readAsync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): Promise<[number, NodeBuffer]>;
-	export function readFileAsync(filename: string, encoding: string): Promise<string>;
-	export function readFileAsync(filename: string, options: OpenOptions): Promise<string>;
-	export function readFileAsync(filename: string): Promise<NodeBuffer>;
-	export function writeFileAsync(filename: string, data: any, encoding?: string): Promise<void>;
-	export function writeFileAsync(filename: string, data: any, options?: OpenOptions): Promise<void>;
-	export function appendFileAsync(filename: string, data: any, encoding?: string): Promise<void>;
-	export function appendFileAsync(filename: string, data: any, option?: OpenOptions): Promise<void>;
-
-	export function existsAsync(path: string): Promise<boolean>;
-    export function ensureDirAsync(path: string): Promise<void>;
-}
-
diff --git a/fs-extra-promise/index.d.ts b/fs-extra-promise/index.d.ts
new file mode 100644
index 0000000000..b91d15a225
--- /dev/null
+++ b/fs-extra-promise/index.d.ts
@@ -0,0 +1,262 @@
+// Type definitions for fs-extra-promise
+// Project: https://github.com/overlookmotel/fs-extra-promise
+// Definitions by: midknight41 <https://github.com/midknight41>, Jason Swearingen <https://github.com/jasonswearingen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/fs-extra.d.ts via TSD fs-extra definition
+
+///<reference types="node"/>
+///<reference types="bluebird"/>
+
+
+import stream = require("stream");
+import Promise = require("bluebird");
+
+export interface Stats {
+    isFile(): boolean;
+    isDirectory(): boolean;
+    isBlockDevice(): boolean;
+    isCharacterDevice(): boolean;
+    isSymbolicLink(): boolean;
+    isFIFO(): boolean;
+    isSocket(): boolean;
+    dev: number;
+    ino: number;
+    mode: number;
+    nlink: number;
+    uid: number;
+    gid: number;
+    rdev: number;
+    size: number;
+    blksize: number;
+    blocks: number;
+    atime: Date;
+    mtime: Date;
+    ctime: Date;
+}
+
+export interface FSWatcher {
+    close(): void;
+}
+
+export declare class ReadStream extends stream.Readable { }
+export declare class WriteStream extends stream.Writable { }
+
+//extended methods
+export declare function copy(src: string, dest: string, callback?: (err: Error) => void): void;
+export declare function copy(src: string, dest: string, filter: (src: string) => boolean, callback?: (err: Error) => void): void;
+
+export declare function copySync(src: string, dest: string): void;
+export declare function copySync(src: string, dest: string, filter: (src: string) => boolean): void;
+
+export declare function createFile(file: string, callback?: (err: Error) => void): void;
+export declare function createFileSync(file: string): void;
+
+export declare function mkdirs(dir: string, callback?: (err: Error) => void): void;
+export declare function mkdirp(dir: string, callback?: (err: Error) => void): void;
+export declare function mkdirsSync(dir: string): void;
+export declare function mkdirpSync(dir: string): void;
+
+export declare function outputFile(file: string, data: any, callback?: (err: Error) => void): void;
+export declare function outputFileSync(file: string, data: any): void;
+
+export declare function outputJson(file: string, data: any, callback?: (err: Error) => void): void;
+export declare function outputJSON(file: string, data: any, callback?: (err: Error) => void): void;
+export declare function outputJsonSync(file: string, data: any): void;
+export declare function outputJSONSync(file: string, data: any): void;
+
+export declare function readJson(file: string, callback?: (err: Error) => void): void;
+export declare function readJson(file: string, options?: OpenOptions, callback?: (err: Error) => void): void;
+export declare function readJSON(file: string, callback?: (err: Error) => void): void;
+export declare function readJSON(file: string, options?: OpenOptions, callback?: (err: Error) => void): void;
+
+export declare function readJsonSync(file: string, options?: OpenOptions): void;
+export declare function readJSONSync(file: string, options?: OpenOptions): void;
+
+export declare function remove(dir: string, callback?: (err: Error) => void): void;
+export declare function removeSync(dir: string): void;
+// export function delete(dir: string, callback?: (err: Error) => void): void;
+// export function deleteSync(dir: string): void;
+
+export declare function writeJson(file: string, object: any, callback?: (err: Error) => void): void;
+export declare function writeJson(file: string, object: any, options?: OpenOptions, callback?: (err: Error) => void): void;
+export declare function writeJSON(file: string, object: any, callback?: (err: Error) => void): void;
+export declare function writeJSON(file: string, object: any, options?: OpenOptions, callback?: (err: Error) => void): void;
+
+export declare function writeJsonSync(file: string, object: any, options?: OpenOptions): void;
+export declare function writeJSONSync(file: string, object: any, options?: OpenOptions): void;
+
+export declare function rename(oldPath: string, newPath: string, callback?: (err: Error) => void): void;
+export declare function renameSync(oldPath: string, newPath: string): void;
+export declare function truncate(fd: number, len: number, callback?: (err: Error) => void): void;
+export declare function truncateSync(fd: number, len: number): void;
+export declare function chown(path: string, uid: number, gid: number, callback?: (err: Error) => void): void;
+export declare function chownSync(path: string, uid: number, gid: number): void;
+export declare function fchown(fd: number, uid: number, gid: number, callback?: (err: Error) => void): void;
+export declare function fchownSync(fd: number, uid: number, gid: number): void;
+export declare function lchown(path: string, uid: number, gid: number, callback?: (err: Error) => void): void;
+export declare function lchownSync(path: string, uid: number, gid: number): void;
+export declare function chmod(path: string, mode: number, callback?: (err: Error) => void): void;
+export declare function chmod(path: string, mode: string, callback?: (err: Error) => void): void;
+export declare function chmodSync(path: string, mode: number): void;
+export declare function chmodSync(path: string, mode: string): void;
+export declare function fchmod(fd: number, mode: number, callback?: (err: Error) => void): void;
+export declare function fchmod(fd: number, mode: string, callback?: (err: Error) => void): void;
+export declare function fchmodSync(fd: number, mode: number): void;
+export declare function fchmodSync(fd: number, mode: string): void;
+export declare function lchmod(path: string, mode: string, callback?: (err: Error) => void): void;
+export declare function lchmod(path: string, mode: number, callback?: (err: Error) => void): void;
+export declare function lchmodSync(path: string, mode: number): void;
+export declare function lchmodSync(path: string, mode: string): void;
+export declare function stat(path: string, callback?: (err: Error, stats: Stats) => void): void;
+export declare function lstat(path: string, callback?: (err: Error, stats: Stats) => void): void;
+export declare function fstat(fd: number, callback?: (err: Error, stats: Stats) => void): void;
+export declare function statSync(path: string): Stats;
+export declare function lstatSync(path: string): Stats;
+export declare function fstatSync(fd: number): Stats;
+export declare function link(srcpath: string, dstpath: string, callback?: (err: Error) => void): void;
+export declare function linkSync(srcpath: string, dstpath: string): void;
+export declare function symlink(srcpath: string, dstpath: string, type?: string, callback?: (err: Error) => void): void;
+export declare function symlinkSync(srcpath: string, dstpath: string, type?: string): void;
+export declare function readlink(path: string, callback?: (err: Error, linkString: string) => void): void;
+export declare function realpath(path: string, callback?: (err: Error, resolvedPath: string) => void): void;
+export declare function realpath(path: string, cache: string, callback: (err: Error, resolvedPath: string) => void): void;
+export declare function realpathSync(path: string, cache?: boolean): string;
+export declare function unlink(path: string, callback?: (err: Error) => void): void;
+export declare function unlinkSync(path: string): void;
+export declare function rmdir(path: string, callback?: (err: Error) => void): void;
+export declare function rmdirSync(path: string): void;
+export declare function mkdir(path: string, mode?: number, callback?: (err: Error) => void): void;
+export declare function mkdir(path: string, mode?: string, callback?: (err: Error) => void): void;
+export declare function mkdirSync(path: string, mode?: number): void;
+export declare function mkdirSync(path: string, mode?: string): void;
+export declare function readdir(path: string, callback?: (err: Error, files: string[]) => void): void;
+export declare function readdirSync(path: string): string[];
+export declare function close(fd: number, callback?: (err: Error) => void): void;
+export declare function closeSync(fd: number): void;
+export declare function open(path: string, flags: string, mode?: string, callback?: (err: Error, fs: number) => void): void;
+export declare function openSync(path: string, flags: string, mode?: string): number;
+export declare function utimes(path: string, atime: number, mtime: number, callback?: (err: Error) => void): void;
+export declare function utimesSync(path: string, atime: number, mtime: number): void;
+export declare function futimes(fd: number, atime: number, mtime: number, callback?: (err: Error) => void): void;
+export declare function futimesSync(fd: number, atime: number, mtime: number): void;
+export declare function fsync(fd: number, callback?: (err: Error) => void): void;
+export declare function fsyncSync(fd: number): void;
+export declare function write(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: Error, written: number, buffer: NodeBuffer) => void): void;
+export declare function writeSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number;
+export declare function read(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: Error, bytesRead: number, buffer: NodeBuffer) => void): void;
+export declare function readSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number;
+export declare function readFile(filename: string, encoding: string, callback: (err: Error, data: string) => void): void;
+export declare function readFile(filename: string, options: OpenOptions, callback: (err: Error, data: string) => void): void;
+export declare function readFile(filename: string, callback: (err: Error, data: NodeBuffer) => void): void;
+export declare function readFileSync(filename: string): NodeBuffer;
+export declare function readFileSync(filename: string, encoding: string): string;
+export declare function readFileSync(filename: string, options: OpenOptions): string;
+export declare function writeFile(filename: string, data: any, encoding?: string, callback?: (err: Error) => void): void;
+export declare function writeFile(filename: string, data: any, options?: OpenOptions, callback?: (err: Error) => void): void;
+export declare function writeFileSync(filename: string, data: any, encoding?: string): void;
+export declare function writeFileSync(filename: string, data: any, option?: OpenOptions): void;
+export declare function appendFile(filename: string, data: any, encoding?: string, callback?: (err: Error) => void): void;
+export declare function appendFile(filename: string, data: any, option?: OpenOptions, callback?: (err: Error) => void): void;
+export declare function appendFileSync(filename: string, data: any, encoding?: string): void;
+export declare function appendFileSync(filename: string, data: any, option?: OpenOptions): void;
+export declare function watchFile(filename: string, listener: { curr: Stats; prev: Stats; }): void;
+export declare function watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: { curr: Stats; prev: Stats; }): void;
+export declare function unwatchFile(filename: string, listener?: Stats): void;
+export declare function watch(filename: string, options?: { persistent?: boolean; }, listener?: (event: string, filename: string) => any): FSWatcher;
+export declare function exists(path: string, callback?: (exists: boolean) => void): void;
+export declare function existsSync(path: string): boolean;
+export declare function ensureDir(path: string, cb: (err: Error) => void): void;
+export declare function ensureDirSync(path: string): void;
+
+export interface OpenOptions {
+    encoding?: string;
+    flag?: string;
+}
+
+export interface ReadStreamOptions {
+    flags?: string;
+    encoding?: string;
+    fd?: number;
+    mode?: number;
+    bufferSize?: number;
+}
+export interface WriteStreamOptions {
+    flags?: string;
+    encoding?: string;
+    string?: string;
+}
+export declare function createReadStream(path: string, options?: ReadStreamOptions): ReadStream;
+export declare function createWriteStream(path: string, options?: WriteStreamOptions): WriteStream;
+
+
+
+//promisified versions
+export declare function copyAsync(src: string, dest: string): Promise<void>;
+export declare function copyAsync(src: string, dest: string, filter: (src: string) => boolean): Promise<void>;
+
+export declare function createFileAsync(file: string): Promise<void>;
+
+export declare function mkdirsAsync(dir: string): Promise<void>;
+export declare function mkdirpAsync(dir: string): Promise<void>;
+
+export declare function outputFileAsync(file: string, data: any): Promise<void>;
+
+export declare function outputJsonAsync(file: string, data: any): Promise<void>;
+export declare function outputJSONAsync(file: string, data: any): Promise<void>;
+
+export declare function readJsonAsync(file: string): Promise<void>;
+export declare function readJsonAsync(file: string, options?: OpenOptions): Promise<void>;
+export declare function readJSONAsync(file: string): Promise<void>;
+export declare function readJSONAsync(file: string, options?: OpenOptions): Promise<void>;
+
+
+export declare function removeAsync(dir: string): Promise<void>;
+// export function deleteAsync(dir: string):Promise<void>;
+
+export declare function writeJsonAsync(file: string, object: any): Promise<void>;
+export declare function writeJsonAsync(file: string, object: any, options?: OpenOptions): Promise<void>;
+export declare function writeJSONAsync(file: string, object: any): Promise<void>;
+export declare function writeJSONAsync(file: string, object: any, options?: OpenOptions): Promise<void>;
+
+export declare function renameAsync(oldPath: string, newPath: string): Promise<void>;
+export declare function truncateAsync(fd: number, len: number): Promise<void>;
+export declare function chownAsync(path: string, uid: number, gid: number): Promise<void>;
+export declare function fchownAsync(fd: number, uid: number, gid: number): Promise<void>;
+export declare function lchownAsync(path: string, uid: number, gid: number): Promise<void>;
+export declare function chmodAsync(path: string, mode: number): Promise<void>;
+export declare function chmodAsync(path: string, mode: string): Promise<void>;
+export declare function fchmodAsync(fd: number, mode: number): Promise<void>;
+export declare function fchmodAsync(fd: number, mode: string): Promise<void>;
+export declare function lchmodAsync(path: string, mode: string): Promise<void>;
+export declare function lchmodAsync(path: string, mode: number): Promise<void>;
+export declare function statAsync(path: string): Promise<Stats>;
+export declare function lstatAsync(path: string): Promise<Stats>;
+export declare function fstatAsync(fd: number): Promise<Stats>;
+export declare function linkAsync(srcpath: string, dstpath: string): Promise<void>;
+export declare function symlinkAsync(srcpath: string, dstpath: string, type?: string): Promise<void>;
+export declare function readlinkAsync(path: string): Promise<string>;
+export declare function realpathAsync(path: string): Promise<string>;
+export declare function realpathAsync(path: string, cache: string): Promise<string>;
+export declare function unlinkAsync(path: string): Promise<void>;
+export declare function rmdirAsync(path: string): Promise<void>;
+export declare function mkdirAsync(path: string, mode?: number): Promise<void>;
+export declare function mkdirAsync(path: string, mode?: string): Promise<void>;
+export declare function readdirAsync(path: string): Promise<string[]>;
+export declare function closeAsync(fd: number): Promise<void>;
+export declare function openAsync(path: string, flags: string, mode?: string): Promise<number>;
+export declare function utimesAsync(path: string, atime: number, mtime: number): Promise<void>;
+export declare function futimesAsync(fd: number, atime: number, mtime: number): Promise<void>;
+export declare function fsyncAsync(fd: number): Promise<void>;
+export declare function writeAsync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): Promise<[number, NodeBuffer]>;
+export declare function readAsync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): Promise<[number, NodeBuffer]>;
+export declare function readFileAsync(filename: string, encoding: string): Promise<string>;
+export declare function readFileAsync(filename: string, options: OpenOptions): Promise<string>;
+export declare function readFileAsync(filename: string): Promise<NodeBuffer>;
+export declare function writeFileAsync(filename: string, data: any, encoding?: string): Promise<void>;
+export declare function writeFileAsync(filename: string, data: any, options?: OpenOptions): Promise<void>;
+export declare function appendFileAsync(filename: string, data: any, encoding?: string): Promise<void>;
+export declare function appendFileAsync(filename: string, data: any, option?: OpenOptions): Promise<void>;
+
+export declare function existsAsync(path: string): Promise<boolean>;
+export declare function ensureDirAsync(path: string): Promise<void>;
diff --git a/fs-extra-promise/tsconfig.json b/fs-extra-promise/tsconfig.json
new file mode 100644
index 0000000000..32a0caa267
--- /dev/null
+++ b/fs-extra-promise/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "fs-extra-promise-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fs-extra/fs-extra-tests.ts b/fs-extra/fs-extra-tests.ts
index c1785f851d..c3d8d6edb9 100644
--- a/fs-extra/fs-extra-tests.ts
+++ b/fs-extra/fs-extra-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="fs-extra.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import fs = require('fs-extra');
 import stream = require('stream');
diff --git a/fs-extra/fs-extra.d.ts b/fs-extra/fs-extra.d.ts
deleted file mode 100644
index b133047dec..0000000000
--- a/fs-extra/fs-extra.d.ts
+++ /dev/null
@@ -1,219 +0,0 @@
-// Type definitions for fs-extra
-// Project: https://github.com/jprichardson/node-fs-extra
-// Definitions by: midknight41 <https://github.com/midknight41>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/fs-extra.d.ts
-
-///<reference path="../node/node.d.ts"/>
-
-declare module "fs-extra" {
-	import stream = require("stream");
-
-	export interface Stats {
-		isFile(): boolean;
-		isDirectory(): boolean;
-		isBlockDevice(): boolean;
-		isCharacterDevice(): boolean;
-		isSymbolicLink(): boolean;
-		isFIFO(): boolean;
-		isSocket(): boolean;
-		dev: number;
-		ino: number;
-		mode: number;
-		nlink: number;
-		uid: number;
-		gid: number;
-		rdev: number;
-		size: number;
-		blksize: number;
-		blocks: number;
-		atime: Date;
-		mtime: Date;
-		ctime: Date;
-	}
-
-	export interface FSWatcher {
-		close(): void;
-	}
-
-	export class ReadStream extends stream.Readable { }
-	export class WriteStream extends stream.Writable { }
-
-	//extended methods
-	export function copy(src: string, dest: string, callback?: (err: Error) => void): void;
-	export function copy(src: string, dest: string, filter: CopyFilter, callback?: (err: Error) => void): void;
-	export function copy(src: string, dest: string, options: CopyOptions, callback?: (err: Error) => void): void;
-
-	export function copySync(src: string, dest: string): void;
-	export function copySync(src: string, dest: string, filter: CopyFilter): void;
-	export function copySync(src: string, dest: string, options: CopyOptions): void;
-
-	export function createFile(file: string, callback?: (err: Error) => void): void;
-	export function createFileSync(file: string): void;
-
-	export function mkdirs(dir: string, callback?: (err: Error) => void): void;
-	export function mkdirp(dir: string, callback?: (err: Error) => void): void;
-	export function mkdirs(dir: string, options?: MkdirOptions, callback?: (err: Error) => void): void;
-	export function mkdirp(dir: string, options?: MkdirOptions, callback?: (err: Error) => void): void;
-	export function mkdirsSync(dir: string, options?: MkdirOptions): void;
-	export function mkdirpSync(dir: string, options?: MkdirOptions): void;
-
-	export function outputFile(file: string, data: any, callback?: (err: Error) => void): void;
-	export function outputFileSync(file: string, data: any): void;
-
-	export function outputJson(file: string, data: any, callback?: (err: Error) => void): void;
-	export function outputJSON(file: string, data: any, callback?: (err: Error) => void): void;
-	export function outputJsonSync(file: string, data: any): void;
-	export function outputJSONSync(file: string, data: any): void;
-
-	export function readJson(file: string, callback: (err: Error, jsonObject: any) => void): void;
-	export function readJson(file: string, options: OpenOptions, callback: (err: Error, jsonObject: any) => void): void;
-	export function readJSON(file: string, callback: (err: Error, jsonObject: any) => void): void;
-	export function readJSON(file: string, options: OpenOptions, callback: (err: Error, jsonObject: any) => void): void;
-
-	export function readJsonSync(file: string, options?: OpenOptions): any;
-	export function readJSONSync(file: string, options?: OpenOptions): any;
-
-	export function remove(dir: string, callback?: (err: Error) => void): void;
-	export function removeSync(dir: string): void;
-	// export function delete(dir: string, callback?: (err: Error) => void): void;
-	// export function deleteSync(dir: string): void;
-
-	export function writeJson(file: string, object: any, callback?: (err: Error) => void): void;
-	export function writeJson(file: string, object: any, options?: OpenOptions, callback?: (err: Error) => void): void;
-	export function writeJSON(file: string, object: any, callback?: (err: Error) => void): void;
-	export function writeJSON(file: string, object: any, options?: OpenOptions, callback?: (err: Error) => void): void;
-
-	export function writeJsonSync(file: string, object: any, options?: OpenOptions): void;
-	export function writeJSONSync(file: string, object: any, options?: OpenOptions): void;
-
-	export function rename(oldPath: string, newPath: string, callback?: (err: Error) => void): void;
-	export function renameSync(oldPath: string, newPath: string): void;
-	export function truncate(fd: number, len: number, callback?: (err: Error) => void): void;
-	export function truncateSync(fd: number, len: number): void;
-	export function chown(path: string, uid: number, gid: number, callback?: (err: Error) => void): void;
-	export function chownSync(path: string, uid: number, gid: number): void;
-	export function fchown(fd: number, uid: number, gid: number, callback?: (err: Error) => void): void;
-	export function fchownSync(fd: number, uid: number, gid: number): void;
-	export function lchown(path: string, uid: number, gid: number, callback?: (err: Error) => void): void;
-	export function lchownSync(path: string, uid: number, gid: number): void;
-	export function chmod(path: string, mode: number, callback?: (err: Error) => void): void;
-	export function chmod(path: string, mode: string, callback?: (err: Error) => void): void;
-	export function chmodSync(path: string, mode: number): void;
-	export function chmodSync(path: string, mode: string): void;
-	export function fchmod(fd: number, mode: number, callback?: (err: Error) => void): void;
-	export function fchmod(fd: number, mode: string, callback?: (err: Error) => void): void;
-	export function fchmodSync(fd: number, mode: number): void;
-	export function fchmodSync(fd: number, mode: string): void;
-	export function lchmod(path: string, mode: string, callback?: (err: Error) => void): void;
-	export function lchmod(path: string, mode: number, callback?: (err: Error) => void): void;
-	export function lchmodSync(path: string, mode: number): void;
-	export function lchmodSync(path: string, mode: string): void;
-	export function stat(path: string, callback?: (err: Error, stats: Stats) => void): void;
-	export function lstat(path: string, callback?: (err: Error, stats: Stats) => void): void;
-	export function fstat(fd: number, callback?: (err: Error, stats: Stats) => void): void;
-	export function statSync(path: string): Stats;
-	export function lstatSync(path: string): Stats;
-	export function fstatSync(fd: number): Stats;
-	export function link(srcpath: string, dstpath: string, callback?: (err: Error) => void): void;
-	export function linkSync(srcpath: string, dstpath: string): void;
-	export function symlink(srcpath: string, dstpath: string, type?: string, callback?: (err: Error) => void): void;
-	export function symlinkSync(srcpath: string, dstpath: string, type?: string): void;
-	export function readlink(path: string, callback?: (err: Error, linkString: string) => void): void;
-	export function realpath(path: string, callback?: (err: Error, resolvedPath: string) => void): void;
-	export function realpath(path: string, cache: string, callback: (err: Error, resolvedPath: string) => void): void;
-	export function realpathSync(path: string, cache?: boolean): string;
-	export function unlink(path: string, callback?: (err: Error) => void): void;
-	export function unlinkSync(path: string): void;
-	export function rmdir(path: string, callback?: (err: Error) => void): void;
-	export function rmdirSync(path: string): void;
-	export function mkdir(path: string, mode?: number, callback?: (err: Error) => void): void;
-	export function mkdir(path: string, mode?: string, callback?: (err: Error) => void): void;
-	export function mkdirSync(path: string, mode?: number): void;
-	export function mkdirSync(path: string, mode?: string): void;
-	export function readdir(path: string, callback?: (err: Error, files: string[]) => void ): void;
-	export function readdirSync(path: string): string[];
-	export function close(fd: number, callback?: (err: Error) => void): void;
-	export function closeSync(fd: number): void;
-	export function open(path: string, flags: string, mode?: string, callback?: (err: Error, fs: number) => void): void;
-	export function openSync(path: string, flags: string, mode?: string): number;
-	export function utimes(path: string, atime: number, mtime: number, callback?: (err: Error) => void): void;
-	export function utimesSync(path: string, atime: number, mtime: number): void;
-	export function futimes(fd: number, atime: number, mtime: number, callback?: (err: Error) => void): void;
-	export function futimesSync(fd: number, atime: number, mtime: number): void;
-	export function fsync(fd: number, callback?: (err: Error) => void): void;
-	export function fsyncSync(fd: number): void;
-	export function write(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: Error, written: number, buffer: NodeBuffer) => void): void;
-	export function writeSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number;
-	export function read(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: Error, bytesRead: number, buffer: NodeBuffer) => void ): void;
-	export function readSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number;
-	export function readFile(filename: string, encoding: string, callback: (err: Error, data: string) => void ): void;
-	export function readFile(filename: string, options: OpenOptions, callback: (err: Error, data: string) => void ): void;
-	export function readFile(filename: string, callback: (err: Error, data: NodeBuffer) => void ): void;
-	export function readFileSync(filename: string): NodeBuffer;
-	export function readFileSync(filename: string, encoding: string): string;
-	export function readFileSync(filename: string, options: OpenOptions): string;
-	export function writeFile(filename: string, data: any, encoding?: string, callback?: (err: Error) => void): void;
-	export function writeFile(filename: string, data: any, options?: OpenOptions, callback?: (err: Error) => void): void;
-	export function writeFileSync(filename: string, data: any, encoding?: string): void;
-	export function writeFileSync(filename: string, data: any, option?: OpenOptions): void;
-	export function appendFile(filename: string, data: any, encoding?: string, callback?: (err: Error) => void): void;
-	export function appendFile(filename: string, data: any,option?: OpenOptions, callback?: (err: Error) => void): void;
-	export function appendFileSync(filename: string, data: any, encoding?: string): void;
-	export function appendFileSync(filename: string, data: any, option?: OpenOptions): void;
-	export function watchFile(filename: string, listener: { curr: Stats; prev: Stats; }): void;
-	export function watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: { curr: Stats; prev: Stats; }): void;
-	export function unwatchFile(filename: string, listener?: Stats): void;
-	export function watch(filename: string, options?: { persistent?: boolean; }, listener?: (event: string, filename: string) => any): FSWatcher;
-	export function exists(path: string, callback?: (exists: boolean) => void ): void;
-	export function existsSync(path: string): boolean;
-    export function ensureDir(path: string, cb: (err: Error) => void): void;
-    export function ensureDirSync(path: string): void;
-	export function ensureFile(path: string, cb: (err: Error) => void): void;
-	export function ensureFileSync(path: string): void;
-	export function ensureLink(path: string, cb: (err: Error) => void): void;
-	export function ensureLinkSync(path: string): void;
-	export function ensureSymlink(path: string, cb: (err: Error) => void): void;
-	export function ensureSymlinkSync(path: string): void;
-    export function emptyDir(path: string, callback?: (err: Error) => void): void;
-    export function emptyDirSync(path: string): boolean;
-
-	export interface CopyFilterFunction {
-		(src: string): boolean
-	}
-
-	export type CopyFilter = CopyFilterFunction | RegExp;
-
-	export interface CopyOptions {
-		clobber?: boolean
-		preserveTimestamps?: boolean
-		filter?: CopyFilter
-	}
-
-	export interface OpenOptions {
-		encoding?: string;
-		flag?: string;
-	}
-
-	export interface MkdirOptions {
-		fs?: any;
-		mode?: number;
-	}
-
-	export interface ReadStreamOptions {
-		flags?: string;
-		encoding?: string;
-		fd?: number;
-		mode?: number;
-		bufferSize?: number;
-	}
-	export interface WriteStreamOptions {
-		flags?: string;
-		encoding?: string;
-		string?: string;
-	}
-	export function createReadStream(path: string, options?: ReadStreamOptions): ReadStream;
-	export function createWriteStream(path: string, options?: WriteStreamOptions): WriteStream;
-	export function createOutputStream(path: string, options?: WriteStreamOptions): WriteStream;
-}
diff --git a/fs-extra/index.d.ts b/fs-extra/index.d.ts
new file mode 100644
index 0000000000..32b7114083
--- /dev/null
+++ b/fs-extra/index.d.ts
@@ -0,0 +1,218 @@
+// Type definitions for fs-extra
+// Project: https://github.com/jprichardson/node-fs-extra
+// Definitions by: midknight41 <https://github.com/midknight41>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/fs-extra.d.ts
+
+///<reference types="node"/>
+
+
+import stream = require("stream");
+
+export interface Stats {
+    isFile(): boolean;
+    isDirectory(): boolean;
+    isBlockDevice(): boolean;
+    isCharacterDevice(): boolean;
+    isSymbolicLink(): boolean;
+    isFIFO(): boolean;
+    isSocket(): boolean;
+    dev: number;
+    ino: number;
+    mode: number;
+    nlink: number;
+    uid: number;
+    gid: number;
+    rdev: number;
+    size: number;
+    blksize: number;
+    blocks: number;
+    atime: Date;
+    mtime: Date;
+    ctime: Date;
+}
+
+export interface FSWatcher {
+    close(): void;
+}
+
+export declare class ReadStream extends stream.Readable { }
+export declare class WriteStream extends stream.Writable { }
+
+//extended methods
+export declare function copy(src: string, dest: string, callback?: (err: Error) => void): void;
+export declare function copy(src: string, dest: string, filter: CopyFilter, callback?: (err: Error) => void): void;
+export declare function copy(src: string, dest: string, options: CopyOptions, callback?: (err: Error) => void): void;
+
+export declare function copySync(src: string, dest: string): void;
+export declare function copySync(src: string, dest: string, filter: CopyFilter): void;
+export declare function copySync(src: string, dest: string, options: CopyOptions): void;
+
+export declare function createFile(file: string, callback?: (err: Error) => void): void;
+export declare function createFileSync(file: string): void;
+
+export declare function mkdirs(dir: string, callback?: (err: Error) => void): void;
+export declare function mkdirp(dir: string, callback?: (err: Error) => void): void;
+export declare function mkdirs(dir: string, options?: MkdirOptions, callback?: (err: Error) => void): void;
+export declare function mkdirp(dir: string, options?: MkdirOptions, callback?: (err: Error) => void): void;
+export declare function mkdirsSync(dir: string, options?: MkdirOptions): void;
+export declare function mkdirpSync(dir: string, options?: MkdirOptions): void;
+
+export declare function outputFile(file: string, data: any, callback?: (err: Error) => void): void;
+export declare function outputFileSync(file: string, data: any): void;
+
+export declare function outputJson(file: string, data: any, callback?: (err: Error) => void): void;
+export declare function outputJSON(file: string, data: any, callback?: (err: Error) => void): void;
+export declare function outputJsonSync(file: string, data: any): void;
+export declare function outputJSONSync(file: string, data: any): void;
+
+export declare function readJson(file: string, callback: (err: Error, jsonObject: any) => void): void;
+export declare function readJson(file: string, options: OpenOptions, callback: (err: Error, jsonObject: any) => void): void;
+export declare function readJSON(file: string, callback: (err: Error, jsonObject: any) => void): void;
+export declare function readJSON(file: string, options: OpenOptions, callback: (err: Error, jsonObject: any) => void): void;
+
+export declare function readJsonSync(file: string, options?: OpenOptions): any;
+export declare function readJSONSync(file: string, options?: OpenOptions): any;
+
+export declare function remove(dir: string, callback?: (err: Error) => void): void;
+export declare function removeSync(dir: string): void;
+// export function delete(dir: string, callback?: (err: Error) => void): void;
+// export function deleteSync(dir: string): void;
+
+export declare function writeJson(file: string, object: any, callback?: (err: Error) => void): void;
+export declare function writeJson(file: string, object: any, options?: OpenOptions, callback?: (err: Error) => void): void;
+export declare function writeJSON(file: string, object: any, callback?: (err: Error) => void): void;
+export declare function writeJSON(file: string, object: any, options?: OpenOptions, callback?: (err: Error) => void): void;
+
+export declare function writeJsonSync(file: string, object: any, options?: OpenOptions): void;
+export declare function writeJSONSync(file: string, object: any, options?: OpenOptions): void;
+
+export declare function rename(oldPath: string, newPath: string, callback?: (err: Error) => void): void;
+export declare function renameSync(oldPath: string, newPath: string): void;
+export declare function truncate(fd: number, len: number, callback?: (err: Error) => void): void;
+export declare function truncateSync(fd: number, len: number): void;
+export declare function chown(path: string, uid: number, gid: number, callback?: (err: Error) => void): void;
+export declare function chownSync(path: string, uid: number, gid: number): void;
+export declare function fchown(fd: number, uid: number, gid: number, callback?: (err: Error) => void): void;
+export declare function fchownSync(fd: number, uid: number, gid: number): void;
+export declare function lchown(path: string, uid: number, gid: number, callback?: (err: Error) => void): void;
+export declare function lchownSync(path: string, uid: number, gid: number): void;
+export declare function chmod(path: string, mode: number, callback?: (err: Error) => void): void;
+export declare function chmod(path: string, mode: string, callback?: (err: Error) => void): void;
+export declare function chmodSync(path: string, mode: number): void;
+export declare function chmodSync(path: string, mode: string): void;
+export declare function fchmod(fd: number, mode: number, callback?: (err: Error) => void): void;
+export declare function fchmod(fd: number, mode: string, callback?: (err: Error) => void): void;
+export declare function fchmodSync(fd: number, mode: number): void;
+export declare function fchmodSync(fd: number, mode: string): void;
+export declare function lchmod(path: string, mode: string, callback?: (err: Error) => void): void;
+export declare function lchmod(path: string, mode: number, callback?: (err: Error) => void): void;
+export declare function lchmodSync(path: string, mode: number): void;
+export declare function lchmodSync(path: string, mode: string): void;
+export declare function stat(path: string, callback?: (err: Error, stats: Stats) => void): void;
+export declare function lstat(path: string, callback?: (err: Error, stats: Stats) => void): void;
+export declare function fstat(fd: number, callback?: (err: Error, stats: Stats) => void): void;
+export declare function statSync(path: string): Stats;
+export declare function lstatSync(path: string): Stats;
+export declare function fstatSync(fd: number): Stats;
+export declare function link(srcpath: string, dstpath: string, callback?: (err: Error) => void): void;
+export declare function linkSync(srcpath: string, dstpath: string): void;
+export declare function symlink(srcpath: string, dstpath: string, type?: string, callback?: (err: Error) => void): void;
+export declare function symlinkSync(srcpath: string, dstpath: string, type?: string): void;
+export declare function readlink(path: string, callback?: (err: Error, linkString: string) => void): void;
+export declare function realpath(path: string, callback?: (err: Error, resolvedPath: string) => void): void;
+export declare function realpath(path: string, cache: string, callback: (err: Error, resolvedPath: string) => void): void;
+export declare function realpathSync(path: string, cache?: boolean): string;
+export declare function unlink(path: string, callback?: (err: Error) => void): void;
+export declare function unlinkSync(path: string): void;
+export declare function rmdir(path: string, callback?: (err: Error) => void): void;
+export declare function rmdirSync(path: string): void;
+export declare function mkdir(path: string, mode?: number, callback?: (err: Error) => void): void;
+export declare function mkdir(path: string, mode?: string, callback?: (err: Error) => void): void;
+export declare function mkdirSync(path: string, mode?: number): void;
+export declare function mkdirSync(path: string, mode?: string): void;
+export declare function readdir(path: string, callback?: (err: Error, files: string[]) => void): void;
+export declare function readdirSync(path: string): string[];
+export declare function close(fd: number, callback?: (err: Error) => void): void;
+export declare function closeSync(fd: number): void;
+export declare function open(path: string, flags: string, mode?: string, callback?: (err: Error, fs: number) => void): void;
+export declare function openSync(path: string, flags: string, mode?: string): number;
+export declare function utimes(path: string, atime: number, mtime: number, callback?: (err: Error) => void): void;
+export declare function utimesSync(path: string, atime: number, mtime: number): void;
+export declare function futimes(fd: number, atime: number, mtime: number, callback?: (err: Error) => void): void;
+export declare function futimesSync(fd: number, atime: number, mtime: number): void;
+export declare function fsync(fd: number, callback?: (err: Error) => void): void;
+export declare function fsyncSync(fd: number): void;
+export declare function write(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: Error, written: number, buffer: NodeBuffer) => void): void;
+export declare function writeSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number;
+export declare function read(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: Error, bytesRead: number, buffer: NodeBuffer) => void): void;
+export declare function readSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number;
+export declare function readFile(filename: string, encoding: string, callback: (err: Error, data: string) => void): void;
+export declare function readFile(filename: string, options: OpenOptions, callback: (err: Error, data: string) => void): void;
+export declare function readFile(filename: string, callback: (err: Error, data: NodeBuffer) => void): void;
+export declare function readFileSync(filename: string): NodeBuffer;
+export declare function readFileSync(filename: string, encoding: string): string;
+export declare function readFileSync(filename: string, options: OpenOptions): string;
+export declare function writeFile(filename: string, data: any, encoding?: string, callback?: (err: Error) => void): void;
+export declare function writeFile(filename: string, data: any, options?: OpenOptions, callback?: (err: Error) => void): void;
+export declare function writeFileSync(filename: string, data: any, encoding?: string): void;
+export declare function writeFileSync(filename: string, data: any, option?: OpenOptions): void;
+export declare function appendFile(filename: string, data: any, encoding?: string, callback?: (err: Error) => void): void;
+export declare function appendFile(filename: string, data: any, option?: OpenOptions, callback?: (err: Error) => void): void;
+export declare function appendFileSync(filename: string, data: any, encoding?: string): void;
+export declare function appendFileSync(filename: string, data: any, option?: OpenOptions): void;
+export declare function watchFile(filename: string, listener: { curr: Stats; prev: Stats; }): void;
+export declare function watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: { curr: Stats; prev: Stats; }): void;
+export declare function unwatchFile(filename: string, listener?: Stats): void;
+export declare function watch(filename: string, options?: { persistent?: boolean; }, listener?: (event: string, filename: string) => any): FSWatcher;
+export declare function exists(path: string, callback?: (exists: boolean) => void): void;
+export declare function existsSync(path: string): boolean;
+export declare function ensureDir(path: string, cb: (err: Error) => void): void;
+export declare function ensureDirSync(path: string): void;
+export declare function ensureFile(path: string, cb: (err: Error) => void): void;
+export declare function ensureFileSync(path: string): void;
+export declare function ensureLink(path: string, cb: (err: Error) => void): void;
+export declare function ensureLinkSync(path: string): void;
+export declare function ensureSymlink(path: string, cb: (err: Error) => void): void;
+export declare function ensureSymlinkSync(path: string): void;
+export declare function emptyDir(path: string, callback?: (err: Error) => void): void;
+export declare function emptyDirSync(path: string): boolean;
+
+export interface CopyFilterFunction {
+    (src: string): boolean
+}
+
+export type CopyFilter = CopyFilterFunction | RegExp;
+
+export interface CopyOptions {
+    clobber?: boolean
+    preserveTimestamps?: boolean
+    filter?: CopyFilter
+}
+
+export interface OpenOptions {
+    encoding?: string;
+    flag?: string;
+}
+
+export interface MkdirOptions {
+    fs?: any;
+    mode?: number;
+}
+
+export interface ReadStreamOptions {
+    flags?: string;
+    encoding?: string;
+    fd?: number;
+    mode?: number;
+    bufferSize?: number;
+}
+export interface WriteStreamOptions {
+    flags?: string;
+    encoding?: string;
+    string?: string;
+}
+export declare function createReadStream(path: string, options?: ReadStreamOptions): ReadStream;
+export declare function createWriteStream(path: string, options?: WriteStreamOptions): WriteStream;
+export declare function createOutputStream(path: string, options?: WriteStreamOptions): WriteStream;
diff --git a/fs-extra/tsconfig.json b/fs-extra/tsconfig.json
new file mode 100644
index 0000000000..75f75c3f62
--- /dev/null
+++ b/fs-extra/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "fs-extra-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fs-finder/fs-finder-tests.ts b/fs-finder/fs-finder-tests.ts
index 3f6a82d6c4..8a0afe4243 100644
--- a/fs-finder/fs-finder-tests.ts
+++ b/fs-finder/fs-finder-tests.ts
@@ -1,26 +1,26 @@
-/// <reference path="fs-finder.d.ts" />
+
 
 import finder = require('fs-finder');
 
 
 // static
-var a: FsFinder.Finder = finder.in('./*');
+var a = finder.in('./*');
 
-var b: FsFinder.Finder = finder.from('./*');
+var b = finder.from('./*');
 
-var c: FsFinder.Finder = finder.find('./*');
+var c = finder.find('./*');
 finder.find('./*', (paths: string[]) => {});
 
-var d: FsFinder.Finder = finder.findFiles('./*');
+var d = finder.findFiles('./*');
 finder.findFiles('./*', (paths: string[]) => {});
 
-var e: FsFinder.Finder = finder.findDirectories('./*');
+var e = finder.findDirectories('./*');
 finder.findDirectories('./*', (paths: string[]) => {});
 
-var f: FsFinder.Finder = finder.findFile('./*');
+var f = finder.findFile('./*');
 finder.findFile('./*', (paths: string[]) => {});
 
-var g: FsFinder.Finder = finder.findDirectory('./*');
+var g = finder.findDirectory('./*');
 finder.findDirectory('./*', (paths: string[]) => {});
 
 
diff --git a/fs-finder/fs-finder.d.ts b/fs-finder/fs-finder.d.ts
deleted file mode 100644
index 368179146c..0000000000
--- a/fs-finder/fs-finder.d.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-// Type definitions for fs-finder v1.8.0
-// Project: https://github.com/sakren/node-fs-finder
-// Definitions by: Michael Zabka <https://github.com/misak113/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace FsFinder {
-
-	type AsyncFunction = (paths: string|string[]) => void;
-	type Type = string; // 'all'|'directories'|'files'
-	type Mask = string;
-	type Directory = string;
-
-	export class Finder extends Base {
-		static TIME_FORMAT: string;
-		static in(path: string): Finder;
-		static from(path: string): Finder;
-		static find(path: string, fn?: AsyncFunction, type?: Type): Finder;
-		static findFiles(path?: string, fn?: AsyncFunction): Finder;
-		static findDirectories(path?: string, fn?: AsyncFunction): Finder;
-		static findFile(path?: string, fn?: AsyncFunction): Finder;
-		static findDirectory(path?: string, fn?: AsyncFunction): Finder;
-		find(mask?: Mask, fn?: AsyncFunction, type?: Type): string[];
-		findFiles(mask?: Mask, fn?: AsyncFunction): string[];
-		findDirectories(mask?: Mask, fn?: AsyncFunction): string[];
-		findFile(mask?: Mask, fn?: AsyncFunction): string[];
-		findDirectory(mask?: Mask, fn?: AsyncFunction): string[];
-		size(operation?: any, value?: any): Finder;
-		date(operation?: any, value?: any): Finder;
-	}
-
-	export class Base {
-		recursively(recursive?: boolean): Finder;
-		exclude(excludes: string|string[], exactly?: boolean): Finder;
-		showSystemFiles(systemFiles?: boolean): Finder;
-		lookUp(up?: boolean): Finder;
-		findFirst(findFirst?: boolean): Finder;
-		filter(fn: Function): Finder;
-
-		getPathsSync(type?: Type, mask?: Mask, dir?: Directory): string[];
-		getPathsAsync(fn: AsyncFunction, type?: Type, mask?: Mask, dir?: Directory): void;
-
-		checkExcludes(path: string): boolean;
-		checkSystemFiles(path: string): boolean;
-		checkFilters(path: string, stats: any): boolean;
-		checkFile(path: string, stats: any, mask: Mask, type: Type): number;
-
-		getPathsFromParentsSync(mask?: Mask, type?: Type): string[];
-		getPathsFromParentsAsync(fn: AsyncFunction, mask?: Mask, type?: Type): void;
-	}
-}
-
-declare module "fs-finder" {
-	import Finder = FsFinder.Finder;
-	export = Finder;
-}
diff --git a/fs-finder/index.d.ts b/fs-finder/index.d.ts
new file mode 100644
index 0000000000..28073d06ba
--- /dev/null
+++ b/fs-finder/index.d.ts
@@ -0,0 +1,53 @@
+// Type definitions for fs-finder v1.8.0
+// Project: https://github.com/sakren/node-fs-finder
+// Definitions by: Michael Zabka <https://github.com/misak113/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace FsFinder {
+
+	type AsyncFunction = (paths: string|string[]) => void;
+	type Type = string; // 'all'|'directories'|'files'
+	type Mask = string;
+	type Directory = string;
+
+	export class Finder extends Base {
+		static TIME_FORMAT: string;
+		static in(path: string): Finder;
+		static from(path: string): Finder;
+		static find(path: string, fn?: AsyncFunction, type?: Type): Finder;
+		static findFiles(path?: string, fn?: AsyncFunction): Finder;
+		static findDirectories(path?: string, fn?: AsyncFunction): Finder;
+		static findFile(path?: string, fn?: AsyncFunction): Finder;
+		static findDirectory(path?: string, fn?: AsyncFunction): Finder;
+		find(mask?: Mask, fn?: AsyncFunction, type?: Type): string[];
+		findFiles(mask?: Mask, fn?: AsyncFunction): string[];
+		findDirectories(mask?: Mask, fn?: AsyncFunction): string[];
+		findFile(mask?: Mask, fn?: AsyncFunction): string[];
+		findDirectory(mask?: Mask, fn?: AsyncFunction): string[];
+		size(operation?: any, value?: any): Finder;
+		date(operation?: any, value?: any): Finder;
+	}
+
+	export class Base {
+		recursively(recursive?: boolean): Finder;
+		exclude(excludes: string|string[], exactly?: boolean): Finder;
+		showSystemFiles(systemFiles?: boolean): Finder;
+		lookUp(up?: boolean): Finder;
+		findFirst(findFirst?: boolean): Finder;
+		filter(fn: Function): Finder;
+
+		getPathsSync(type?: Type, mask?: Mask, dir?: Directory): string[];
+		getPathsAsync(fn: AsyncFunction, type?: Type, mask?: Mask, dir?: Directory): void;
+
+		checkExcludes(path: string): boolean;
+		checkSystemFiles(path: string): boolean;
+		checkFilters(path: string, stats: any): boolean;
+		checkFile(path: string, stats: any, mask: Mask, type: Type): number;
+
+		getPathsFromParentsSync(mask?: Mask, type?: Type): string[];
+		getPathsFromParentsAsync(fn: AsyncFunction, mask?: Mask, type?: Type): void;
+	}
+}
+
+import Finder = FsFinder.Finder;
+export = Finder;
diff --git a/fs-finder/tsconfig.json b/fs-finder/tsconfig.json
new file mode 100644
index 0000000000..b923b37757
--- /dev/null
+++ b/fs-finder/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "fs-finder-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fs-mock/fs-mock-tests.ts b/fs-mock/fs-mock-tests.ts
index 0637a44921..6ef5639ba5 100644
--- a/fs-mock/fs-mock-tests.ts
+++ b/fs-mock/fs-mock-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="fs-mock.d.ts" />
 
 import FS = require("fs-mock");
 
diff --git a/fs-mock/fs-mock.d.ts b/fs-mock/fs-mock.d.ts
deleted file mode 100644
index fa92c99e20..0000000000
--- a/fs-mock/fs-mock.d.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-// Type definitions for fs-mock 1.1.3
-// Project: https://github.com/sakren/node-fs-mock
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "fs-mock" {
-	import stream = require("stream");
-	import events = require("events");
-	import fs = require("fs");
-
-	namespace FS {
-		export interface Opts {
-			windows?: boolean;
-			drives?: string[];
-			root?: string;
-		}
-	}
-
-	class FS {
-		constructor(content: any, opts?: FS.Opts)
-
-		rename(oldPath: string, newPath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		renameSync(oldPath: string, newPath: string): void;
-		truncate(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		truncate(path: string, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		truncateSync(path: string, len?: number): void;
-		ftruncate(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		ftruncate(fd: number, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		ftruncateSync(fd: number, len?: number): void;
-		chown(path: string, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		chownSync(path: string, uid: number, gid: number): void;
-		fchown(fd: number, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		fchownSync(fd: number, uid: number, gid: number): void;
-		lchown(path: string, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		lchownSync(path: string, uid: number, gid: number): void;
-		chmod(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		chmod(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		chmodSync(path: string, mode: number): void;
-		chmodSync(path: string, mode: string): void;
-		fchmod(fd: number, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		fchmod(fd: number, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		fchmodSync(fd: number, mode: number): void;
-		fchmodSync(fd: number, mode: string): void;
-		lchmod(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		lchmod(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		lchmodSync(path: string, mode: number): void;
-		lchmodSync(path: string, mode: string): void;
-		stat(path: string, callback?: (err: NodeJS.ErrnoException, stats: fs.Stats) => any): void;
-		lstat(path: string, callback?: (err: NodeJS.ErrnoException, stats: fs.Stats) => any): void;
-		fstat(fd: number, callback?: (err: NodeJS.ErrnoException, stats: fs.Stats) => any): void;
-		statSync(path: string): fs.Stats;
-		lstatSync(path: string): fs.Stats;
-		fstatSync(fd: number): fs.Stats;
-		link(srcpath: string, dstpath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		linkSync(srcpath: string, dstpath: string): void;
-		symlink(srcpath: string, dstpath: string, type?: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		symlinkSync(srcpath: string, dstpath: string, type?: string): void;
-		readlink(path: string, callback?: (err: NodeJS.ErrnoException, linkString: string) => any): void;
-		readlinkSync(path: string): string;
-		realpath(path: string, callback?: (err: NodeJS.ErrnoException, resolvedPath: string) => any): void;
-		realpath(path: string, cache: {[path: string]: string}, callback: (err: NodeJS.ErrnoException, resolvedPath: string) =>any): void;
-		realpathSync(path: string, cache?: {[path: string]: string}): string;
-		unlink(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		unlinkSync(path: string): void;
-		rmdir(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		rmdirSync(path: string): void;
-		mkdir(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		mkdir(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		mkdir(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		mkdirSync(path: string, mode?: number): void;
-		mkdirSync(path: string, mode?: string): void;
-		readdir(path: string, callback?: (err: NodeJS.ErrnoException, files: string[]) => void): void;
-		readdirSync(path: string): string[];
-		close(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		closeSync(fd: number): void;
-		open(path: string, flags: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
-		open(path: string, flags: string, mode: number, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
-		open(path: string, flags: string, mode: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
-		openSync(path: string, flags: string, mode?: number): number;
-		openSync(path: string, flags: string, mode?: string): number;
-		utimes(path: string, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		utimes(path: string, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		utimesSync(path: string, atime: number, mtime: number): void;
-		utimesSync(path: string, atime: Date, mtime: Date): void;
-		futimes(fd: number, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		futimes(fd: number, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		futimesSync(fd: number, atime: number, mtime: number): void;
-		futimesSync(fd: number, atime: Date, mtime: Date): void;
-		fsync(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		fsyncSync(fd: number): void;
-		write(fd: number, buffer: Buffer, offset: number, length: number, position: number, callback?: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
-		writeSync(fd: number, buffer: Buffer, offset: number, length: number, position: number): number;
-		read(fd: number, buffer: Buffer, offset: number, length: number, position: number, callback?: (err: NodeJS.ErrnoException, bytesRead: number, buffer: Buffer) => void): void;
-		readSync(fd: number, buffer: Buffer, offset: number, length: number, position: number): number;
-		readFile(filename: string, encoding: string, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
-		readFile(filename: string, options: { encoding: string; flag?: string; }, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
-		readFile(filename: string, options: { flag?: string; }, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
-		readFile(filename: string, callback: (err: NodeJS.ErrnoException, data: Buffer) => void ): void;
-		readFileSync(filename: string, encoding: string): string;
-		readFileSync(filename: string, options: { encoding: string; flag?: string; }): string;
-		readFileSync(filename: string, options?: { flag?: string; }): Buffer;
-		writeFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
-		writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-		writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-		writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
-		writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
-		appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-		appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-		appendFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
-		appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
-		appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
-		watchFile(filename: string, listener: (curr: fs.Stats, prev: fs.Stats) => void): void;
-		watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: (curr: fs.Stats, prev: fs.Stats) => void): void;
-		unwatchFile(filename: string, listener?: (curr: fs.Stats, prev: fs.Stats) => void): void;
-		watch(filename: string, listener?: (event: string, filename: string) => any): fs.FSWatcher;
-		watch(filename: string, options: { persistent?: boolean; }, listener?: (event: string, filename: string) => any): fs.FSWatcher;
-		exists(path: string, callback?: (exists: boolean) => void): void;
-		existsSync(path: string): boolean;
-		createReadStream(path: string, options?: {
-			flags?: string;
-			encoding?: string;
-			fd?: string;
-			mode?: number;
-			bufferSize?: number;
-		}): fs.ReadStream;
-		createReadStream(path: string, options?: {
-			flags?: string;
-			encoding?: string;
-			fd?: string;
-			mode?: string;
-			bufferSize?: number;
-		}): fs.ReadStream;
-		createWriteStream(path: string, options?: {
-			flags?: string;
-			encoding?: string;
-			string?: string;
-		}): fs.WriteStream;
-	}
-
-	export = FS;
-
-}
diff --git a/fs-mock/index.d.ts b/fs-mock/index.d.ts
new file mode 100644
index 0000000000..ffab4b94eb
--- /dev/null
+++ b/fs-mock/index.d.ts
@@ -0,0 +1,142 @@
+// Type definitions for fs-mock 1.1.3
+// Project: https://github.com/sakren/node-fs-mock
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import stream = require("stream");
+import events = require("events");
+import fs = require("fs");
+
+declare namespace FS {
+    export interface Opts {
+        windows?: boolean;
+        drives?: string[];
+        root?: string;
+    }
+}
+
+declare class FS {
+    constructor(content: any, opts?: FS.Opts)
+
+    rename(oldPath: string, newPath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    renameSync(oldPath: string, newPath: string): void;
+    truncate(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    truncate(path: string, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    truncateSync(path: string, len?: number): void;
+    ftruncate(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    ftruncate(fd: number, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    ftruncateSync(fd: number, len?: number): void;
+    chown(path: string, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    chownSync(path: string, uid: number, gid: number): void;
+    fchown(fd: number, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    fchownSync(fd: number, uid: number, gid: number): void;
+    lchown(path: string, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    lchownSync(path: string, uid: number, gid: number): void;
+    chmod(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    chmod(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    chmodSync(path: string, mode: number): void;
+    chmodSync(path: string, mode: string): void;
+    fchmod(fd: number, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    fchmod(fd: number, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    fchmodSync(fd: number, mode: number): void;
+    fchmodSync(fd: number, mode: string): void;
+    lchmod(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    lchmod(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    lchmodSync(path: string, mode: number): void;
+    lchmodSync(path: string, mode: string): void;
+    stat(path: string, callback?: (err: NodeJS.ErrnoException, stats: fs.Stats) => any): void;
+    lstat(path: string, callback?: (err: NodeJS.ErrnoException, stats: fs.Stats) => any): void;
+    fstat(fd: number, callback?: (err: NodeJS.ErrnoException, stats: fs.Stats) => any): void;
+    statSync(path: string): fs.Stats;
+    lstatSync(path: string): fs.Stats;
+    fstatSync(fd: number): fs.Stats;
+    link(srcpath: string, dstpath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    linkSync(srcpath: string, dstpath: string): void;
+    symlink(srcpath: string, dstpath: string, type?: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    symlinkSync(srcpath: string, dstpath: string, type?: string): void;
+    readlink(path: string, callback?: (err: NodeJS.ErrnoException, linkString: string) => any): void;
+    readlinkSync(path: string): string;
+    realpath(path: string, callback?: (err: NodeJS.ErrnoException, resolvedPath: string) => any): void;
+    realpath(path: string, cache: { [path: string]: string }, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => any): void;
+    realpathSync(path: string, cache?: { [path: string]: string }): string;
+    unlink(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    unlinkSync(path: string): void;
+    rmdir(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    rmdirSync(path: string): void;
+    mkdir(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    mkdir(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    mkdir(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    mkdirSync(path: string, mode?: number): void;
+    mkdirSync(path: string, mode?: string): void;
+    readdir(path: string, callback?: (err: NodeJS.ErrnoException, files: string[]) => void): void;
+    readdirSync(path: string): string[];
+    close(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    closeSync(fd: number): void;
+    open(path: string, flags: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
+    open(path: string, flags: string, mode: number, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
+    open(path: string, flags: string, mode: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
+    openSync(path: string, flags: string, mode?: number): number;
+    openSync(path: string, flags: string, mode?: string): number;
+    utimes(path: string, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    utimes(path: string, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    utimesSync(path: string, atime: number, mtime: number): void;
+    utimesSync(path: string, atime: Date, mtime: Date): void;
+    futimes(fd: number, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    futimes(fd: number, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    futimesSync(fd: number, atime: number, mtime: number): void;
+    futimesSync(fd: number, atime: Date, mtime: Date): void;
+    fsync(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    fsyncSync(fd: number): void;
+    write(fd: number, buffer: Buffer, offset: number, length: number, position: number, callback?: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
+    writeSync(fd: number, buffer: Buffer, offset: number, length: number, position: number): number;
+    read(fd: number, buffer: Buffer, offset: number, length: number, position: number, callback?: (err: NodeJS.ErrnoException, bytesRead: number, buffer: Buffer) => void): void;
+    readSync(fd: number, buffer: Buffer, offset: number, length: number, position: number): number;
+    readFile(filename: string, encoding: string, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
+    readFile(filename: string, options: { encoding: string; flag?: string; }, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
+    readFile(filename: string, options: { flag?: string; }, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+    readFile(filename: string, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+    readFileSync(filename: string, encoding: string): string;
+    readFileSync(filename: string, options: { encoding: string; flag?: string; }): string;
+    readFileSync(filename: string, options?: { flag?: string; }): Buffer;
+    writeFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
+    writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
+    writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
+    appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    appendFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
+    appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
+    appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
+    watchFile(filename: string, listener: (curr: fs.Stats, prev: fs.Stats) => void): void;
+    watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: (curr: fs.Stats, prev: fs.Stats) => void): void;
+    unwatchFile(filename: string, listener?: (curr: fs.Stats, prev: fs.Stats) => void): void;
+    watch(filename: string, listener?: (event: string, filename: string) => any): fs.FSWatcher;
+    watch(filename: string, options: { persistent?: boolean; }, listener?: (event: string, filename: string) => any): fs.FSWatcher;
+    exists(path: string, callback?: (exists: boolean) => void): void;
+    existsSync(path: string): boolean;
+    createReadStream(path: string, options?: {
+        flags?: string;
+        encoding?: string;
+        fd?: string;
+        mode?: number;
+        bufferSize?: number;
+    }): fs.ReadStream;
+    createReadStream(path: string, options?: {
+        flags?: string;
+        encoding?: string;
+        fd?: string;
+        mode?: string;
+        bufferSize?: number;
+    }): fs.ReadStream;
+    createWriteStream(path: string, options?: {
+        flags?: string;
+        encoding?: string;
+        string?: string;
+    }): fs.WriteStream;
+}
+
+export = FS;
diff --git a/fs-mock/tsconfig.json b/fs-mock/tsconfig.json
new file mode 100644
index 0000000000..93dfa28480
--- /dev/null
+++ b/fs-mock/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "fs-mock-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ftdomdelegate/ftdomdelegate-tests.ts b/ftdomdelegate/ftdomdelegate-tests.ts
index f20a2e8048..122c26a08b 100644
--- a/ftdomdelegate/ftdomdelegate-tests.ts
+++ b/ftdomdelegate/ftdomdelegate-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="ftdomdelegate.d.ts" />
+
 
 window.addEventListener('load', function() {
   var delegate = new Delegate(document.body);
diff --git a/ftdomdelegate/ftdomdelegate.d.ts b/ftdomdelegate/index.d.ts
similarity index 100%
rename from ftdomdelegate/ftdomdelegate.d.ts
rename to ftdomdelegate/index.d.ts
diff --git a/ftdomdelegate/tsconfig.json b/ftdomdelegate/tsconfig.json
new file mode 100644
index 0000000000..6d8846eb1f
--- /dev/null
+++ b/ftdomdelegate/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ftdomdelegate-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ftp/ftp-tests.ts b/ftp/ftp-tests.ts
index a3da26aabc..6e5e7d37a9 100644
--- a/ftp/ftp-tests.ts
+++ b/ftp/ftp-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="ftp.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import Client = require("ftp");
 import fs = require("fs");
diff --git a/ftp/ftp.d.ts b/ftp/ftp.d.ts
deleted file mode 100644
index 2b393a46ea..0000000000
--- a/ftp/ftp.d.ts
+++ /dev/null
@@ -1,294 +0,0 @@
-// Type definitions for ftp 0.3.8
-// Project: https://github.com/mscdex/node-ftp
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "ftp" {
-
-	import events = require("events");
-	import tls = require("tls");
-
-	namespace Client {
-
-		/**
-		 * Options for Client#connect()
-		 */
-		export interface Options {
-			/**
-			 * The hostname or IP address of the FTP server. Default: 'localhost'
-			 */
-			host?: string;
-			/**
-			 * The port of the FTP server. Default: 21
-			 */
-			port?: number;
-			/**
-			 * Set to true for both control and data connection encryption, 'control' for control connection encryption only, or 'implicit' for
-			 * implicitly encrypted control connection (this mode is deprecated in modern times, but usually uses port 990) Default: false
-			 */
-			secure?: string|boolean;
-			/**
-			 * Additional options to be passed to tls.connect(). Default: (none)
-			 */
-			secureOptions?: tls.ConnectionOptions;
-			/**
-			 * Username for authentication. Default: 'anonymous'
-			 */
-			user?: string;
-			/**
-			 * Password for authentication. Default: 'anonymous@'
-			 */
-			password?: string;
-			/**
-			 * How long (in milliseconds) to wait for the control connection to be established. Default: 10000
-			 */
-			connTimeout?: number;
-			/**
-			 * How long (in milliseconds) to wait for a PASV data connection to be established. Default: 10000
-			 */
-			pasvTimeout?: number;
-			/**
-			 * How often (in milliseconds) to send a 'dummy' (NOOP) command to keep the connection alive. Default: 10000
-			 */
-			keepalive?: number;
-		}
-
-		/**
-		 * Element returned by Client#list()
-		 */
-		export interface ListingElement {
-			/**
-			 * A single character denoting the entry type: 'd' for directory, '-' for file (or 'l' for symlink on **\*NIX only**).
-			 */
-			"type": string;
-			/**
-			 * The name of the entry
-			 */
-			name: string;
-			/**
-			 * The size of the entry in bytes
-			 */
-			size: string;
-			/**
-			 * The last modified date of the entry
-			 */
-			date: Date;
-			/**
-			 * The various permissions for this entry **(*NIX only)**
-			 */
-			rights?: {
-			/**
-			 * An empty string or any combination of 'r', 'w', 'x'.
-			 */
-				user: string;
-			/**
-			 * An empty string or any combination of 'r', 'w', 'x'.
-			 */
-				group: string;
-			/**
-			 * An empty string or any combination of 'r', 'w', 'x'.
-			 */
-				other: string;
-			};
-			/**
-			 * The user name or ID that this entry belongs to **(*NIX only)**.
-			 */
-			owner?: string;
-			/**
-			 * The group name or ID that this entry belongs to **(*NIX only)**.
-			 */
-			group?: string;
-			/**
-			 * For symlink entries, this is the symlink's target **(*NIX only)**.
-			 */
-			target?: string;
-			/**
-			 * True if the sticky bit is set for this entry **(*NIX only)**.
-			 */
-			sticky?: boolean;
-		}
-	}
-
-
-	/**
-	 * FTP client.
-	 *
-	 * Events:
-	 * @event greeting(< string >msg) - Emitted after connection. msg is the text the server sent upon connection.
-	 * @event ready() - Emitted when connection and authentication were sucessful.
-	 * @event close(< boolean >hadErr) - Emitted when the connection has fully closed.
-	 * @event end() - Emitted when the connection has ended.
-	 * @event error(< Error >err) - Emitted when an error occurs. In case of protocol-level errors, err contains
-	 *                              a 'code' property that references the related 3-digit FTP response code.
-	 */
-	class Client extends events.EventEmitter {
-
-		/**
-		 * Creates and returns a new FTP client instance.
-		 */
-		constructor();
-
-		/**
-		 * Connects to an FTP server.
-		 */
-		connect(config?: Client.Options): void;
-
-		/**
-		 * Closes the connection to the server after any/all enqueued commands have been executed.
-		 */
-		end(): void;
-
-		/**
-		 * Closes the connection to the server immediately.
-		 */
-		destroy(): void;
-
-		/**
-		 * Retrieves the directory listing of path.
-		 * @param path defaults to the current working directory.
-		 * @param useCompression defaults to false.
-		 */
-		list(path: string, useCompression: boolean, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
-		list(path: string, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
-		list(useCompression: boolean, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
-		list(callback: (error: Error, listing: Client.ListingElement[]) => void): void;
-
-		/**
-		 * Retrieves a file at path from the server. useCompression defaults to false
-		 */
-		get(path: string, callback: (error: Error, stream: NodeJS.ReadableStream) => void): void;
-		get(path: string, useCompression: boolean, callback: (error: Error, stream: NodeJS.ReadableStream) => void): void;
-
-		/**
-		 * Sends data to the server to be stored as destPath.
-		 * @param input can be a ReadableStream, a Buffer, or a path to a local file.
-		 * @param destPath
-		 * @param useCompression defaults to false.
-		 */
-		put(input: NodeJS.ReadableStream|Buffer|string, destPath: string, useCompression: boolean, callback: (error: Error) => void): void;
-		put(input: NodeJS.ReadableStream|Buffer|string, destPath: string, callback: (error: Error) => void): void;
-
-		/**
-		 * Same as put(), except if destPath already exists, it will be appended to instead of overwritten.
-		 * @param input can be a ReadableStream, a Buffer, or a path to a local file.
-		 * @param destPath
-		 * @param useCompression defaults to false.
-		 */
-		append(input: NodeJS.ReadableStream|Buffer|string, destPath: string, useCompression: boolean, callback: (error: Error) => void): void;
-		append(input: NodeJS.ReadableStream|Buffer|string, destPath: string, callback: (error: Error) => void): void;
-
-		/**
-		 * Renames oldPath to newPath on the server
-		 */
-		rename(oldPath: string, newPath: string, callback: (error: Error) => void): void;
-
-		/**
-		 * Logout the user from the server.
-		 */
-		logout(callback: (error: Error) => void): void;
-
-		/**
-		 * Delete a file on the server
-		 */
-		delete(path: string, callback: (error: Error) => void): void;
-
-		/**
-		 * Changes the current working directory to path. callback has 2 parameters: < Error >err, < string >currentDir.
-		 * Note: currentDir is only given if the server replies with the path in the response text.
-		 */
-		cwd(path: string, callback: (error: Error, currentDir?: string) => void): void;
-
-		/**
-		 * Aborts the current data transfer (e.g. from get(), put(), or list())
-		 */
-		abort(callback: (error: Error) => void): void;
-
-		/**
-		 * Sends command (e.g. 'CHMOD 755 foo', 'QUOTA') using SITE. callback has 3 parameters:
-		 * < Error >err, < _string >responseText, < integer >responseCode.
-		 */
-		site(command: string, callback: (error: Error, responseText: string, responseCode: number) => void): void;
-
-		/**
-		 * Retrieves human-readable information about the server's status.
-		 */
-		status(callback: (error: Error, status: string) => void): void;
-
-		/**
-		 * Sets the transfer data type to ASCII.
-		 */
-		ascii(callback: (error: Error) => void): void;
-
-		/**
-		 * Sets the transfer data type to binary (default at time of connection).
-		 */
-		binary(callback: (error: Error) => void): void;
-
-		/**
-		 * Optional "standard" commands (RFC 959)
-		 * Creates a new directory, path, on the server. recursive is for enabling a 'mkdir -p' algorithm and defaults to false
-		 */
-		mkdir(path: string, recursive: boolean, callback: (error: Error) => void): void;
-		mkdir(path: string, callback: (error: Error) => void): void;
-
-
-		/**
-		 * Optional "standard" commands (RFC 959)
-		 * Removes a directory, path, on the server. If recursive, this call will delete the contents of the directory if it is not empty
-		 */
-		rmdir(path: string, recursive: boolean, callback: (error: Error) => void): void;
-		rmdir(path: string, callback: (error: Error) => void): void;
-
-		/**
-		 * Optional "standard" commands (RFC 959)
-		 * Changes the working directory to the parent of the current directory
-		 */
-		cdup(callback: (error: Error) => void): void;
-
-		/**
-		 * Optional "standard" commands (RFC 959)
-		 * Retrieves the current working directory
-		 */
-		pwd(callback: (error: Error, path: string) => void): void;
-
-		/**
-		 * Optional "standard" commands (RFC 959)
-		 * Retrieves the server's operating system.
-		 */
-		system(callback: (error: Error, OS: string) => void): void;
-
-		/**
-		 * Optional "standard" commands (RFC 959)
-		 * Similar to list(), except the directory is temporarily changed to path to retrieve the directory listing.
-		 * This is useful for servers that do not handle characters like spaces and quotes in directory names well for the LIST command.
-		 * This function is "optional" because it relies on pwd() being available.
-		 */
-		listSafe(path: string, useCompression: boolean, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
-		listSafe(path: string, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
-		listSafe(useCompression: boolean, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
-		listSafe(callback: (error: Error, listing: Client.ListingElement[]) => void): void;
-
-		/**
-		 * Extended commands (RFC 3659)
-		 * Retrieves the size of path
-		 */
-		size(path: string, callback: (error: Error, size: number) => void): void;
-
-		/**
-		 * Extended commands (RFC 3659)
-		 * Retrieves the last modified date and time for path
-		 */
-		lastMod(path: string, callback: (error: Error, lastMod: Date) => void): void;
-
-		/**
-		 * Extended commands (RFC 3659)
-		 * Sets the file byte offset for the next file transfer action (get/put) to byteOffset
-		 */
-		restart(byteOffset: number, callback: (error: Error) => void): void;
-
-	}
-
-	export = Client;
-}
diff --git a/ftp/index.d.ts b/ftp/index.d.ts
new file mode 100644
index 0000000000..9411367229
--- /dev/null
+++ b/ftp/index.d.ts
@@ -0,0 +1,293 @@
+// Type definitions for ftp 0.3.8
+// Project: https://github.com/mscdex/node-ftp
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+import events = require("events");
+import tls = require("tls");
+
+declare namespace Client {
+
+    /**
+     * Options for Client#connect()
+     */
+    export interface Options {
+        /**
+         * The hostname or IP address of the FTP server. Default: 'localhost'
+         */
+        host?: string;
+        /**
+         * The port of the FTP server. Default: 21
+         */
+        port?: number;
+        /**
+         * Set to true for both control and data connection encryption, 'control' for control connection encryption only, or 'implicit' for
+         * implicitly encrypted control connection (this mode is deprecated in modern times, but usually uses port 990) Default: false
+         */
+        secure?: string | boolean;
+        /**
+         * Additional options to be passed to tls.connect(). Default: (none)
+         */
+        secureOptions?: tls.ConnectionOptions;
+        /**
+         * Username for authentication. Default: 'anonymous'
+         */
+        user?: string;
+        /**
+         * Password for authentication. Default: 'anonymous@'
+         */
+        password?: string;
+        /**
+         * How long (in milliseconds) to wait for the control connection to be established. Default: 10000
+         */
+        connTimeout?: number;
+        /**
+         * How long (in milliseconds) to wait for a PASV data connection to be established. Default: 10000
+         */
+        pasvTimeout?: number;
+        /**
+         * How often (in milliseconds) to send a 'dummy' (NOOP) command to keep the connection alive. Default: 10000
+         */
+        keepalive?: number;
+    }
+
+    /**
+     * Element returned by Client#list()
+     */
+    export interface ListingElement {
+        /**
+         * A single character denoting the entry type: 'd' for directory, '-' for file (or 'l' for symlink on **\*NIX only**).
+         */
+        "type": string;
+        /**
+         * The name of the entry
+         */
+        name: string;
+        /**
+         * The size of the entry in bytes
+         */
+        size: string;
+        /**
+         * The last modified date of the entry
+         */
+        date: Date;
+        /**
+         * The various permissions for this entry **(*NIX only)**
+         */
+        rights?: {
+			/**
+			 * An empty string or any combination of 'r', 'w', 'x'.
+			 */
+            user: string;
+			/**
+			 * An empty string or any combination of 'r', 'w', 'x'.
+			 */
+            group: string;
+			/**
+			 * An empty string or any combination of 'r', 'w', 'x'.
+			 */
+            other: string;
+        };
+        /**
+         * The user name or ID that this entry belongs to **(*NIX only)**.
+         */
+        owner?: string;
+        /**
+         * The group name or ID that this entry belongs to **(*NIX only)**.
+         */
+        group?: string;
+        /**
+         * For symlink entries, this is the symlink's target **(*NIX only)**.
+         */
+        target?: string;
+        /**
+         * True if the sticky bit is set for this entry **(*NIX only)**.
+         */
+        sticky?: boolean;
+    }
+}
+
+
+/**
+ * FTP client.
+ *
+ * Events:
+ * @event greeting(< string >msg) - Emitted after connection. msg is the text the server sent upon connection.
+ * @event ready() - Emitted when connection and authentication were sucessful.
+ * @event close(< boolean >hadErr) - Emitted when the connection has fully closed.
+ * @event end() - Emitted when the connection has ended.
+ * @event error(< Error >err) - Emitted when an error occurs. In case of protocol-level errors, err contains
+ *                              a 'code' property that references the related 3-digit FTP response code.
+ */
+declare class Client extends events.EventEmitter {
+
+    /**
+     * Creates and returns a new FTP client instance.
+     */
+    constructor();
+
+    /**
+     * Connects to an FTP server.
+     */
+    connect(config?: Client.Options): void;
+
+    /**
+     * Closes the connection to the server after any/all enqueued commands have been executed.
+     */
+    end(): void;
+
+    /**
+     * Closes the connection to the server immediately.
+     */
+    destroy(): void;
+
+    /**
+     * Retrieves the directory listing of path.
+     * @param path defaults to the current working directory.
+     * @param useCompression defaults to false.
+     */
+    list(path: string, useCompression: boolean, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
+    list(path: string, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
+    list(useCompression: boolean, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
+    list(callback: (error: Error, listing: Client.ListingElement[]) => void): void;
+
+    /**
+     * Retrieves a file at path from the server. useCompression defaults to false
+     */
+    get(path: string, callback: (error: Error, stream: NodeJS.ReadableStream) => void): void;
+    get(path: string, useCompression: boolean, callback: (error: Error, stream: NodeJS.ReadableStream) => void): void;
+
+    /**
+     * Sends data to the server to be stored as destPath.
+     * @param input can be a ReadableStream, a Buffer, or a path to a local file.
+     * @param destPath
+     * @param useCompression defaults to false.
+     */
+    put(input: NodeJS.ReadableStream | Buffer | string, destPath: string, useCompression: boolean, callback: (error: Error) => void): void;
+    put(input: NodeJS.ReadableStream | Buffer | string, destPath: string, callback: (error: Error) => void): void;
+
+    /**
+     * Same as put(), except if destPath already exists, it will be appended to instead of overwritten.
+     * @param input can be a ReadableStream, a Buffer, or a path to a local file.
+     * @param destPath
+     * @param useCompression defaults to false.
+     */
+    append(input: NodeJS.ReadableStream | Buffer | string, destPath: string, useCompression: boolean, callback: (error: Error) => void): void;
+    append(input: NodeJS.ReadableStream | Buffer | string, destPath: string, callback: (error: Error) => void): void;
+
+    /**
+     * Renames oldPath to newPath on the server
+     */
+    rename(oldPath: string, newPath: string, callback: (error: Error) => void): void;
+
+    /**
+     * Logout the user from the server.
+     */
+    logout(callback: (error: Error) => void): void;
+
+    /**
+     * Delete a file on the server
+     */
+    delete(path: string, callback: (error: Error) => void): void;
+
+    /**
+     * Changes the current working directory to path. callback has 2 parameters: < Error >err, < string >currentDir.
+     * Note: currentDir is only given if the server replies with the path in the response text.
+     */
+    cwd(path: string, callback: (error: Error, currentDir?: string) => void): void;
+
+    /**
+     * Aborts the current data transfer (e.g. from get(), put(), or list())
+     */
+    abort(callback: (error: Error) => void): void;
+
+    /**
+     * Sends command (e.g. 'CHMOD 755 foo', 'QUOTA') using SITE. callback has 3 parameters:
+     * < Error >err, < _string >responseText, < integer >responseCode.
+     */
+    site(command: string, callback: (error: Error, responseText: string, responseCode: number) => void): void;
+
+    /**
+     * Retrieves human-readable information about the server's status.
+     */
+    status(callback: (error: Error, status: string) => void): void;
+
+    /**
+     * Sets the transfer data type to ASCII.
+     */
+    ascii(callback: (error: Error) => void): void;
+
+    /**
+     * Sets the transfer data type to binary (default at time of connection).
+     */
+    binary(callback: (error: Error) => void): void;
+
+    /**
+     * Optional "standard" commands (RFC 959)
+     * Creates a new directory, path, on the server. recursive is for enabling a 'mkdir -p' algorithm and defaults to false
+     */
+    mkdir(path: string, recursive: boolean, callback: (error: Error) => void): void;
+    mkdir(path: string, callback: (error: Error) => void): void;
+
+
+    /**
+     * Optional "standard" commands (RFC 959)
+     * Removes a directory, path, on the server. If recursive, this call will delete the contents of the directory if it is not empty
+     */
+    rmdir(path: string, recursive: boolean, callback: (error: Error) => void): void;
+    rmdir(path: string, callback: (error: Error) => void): void;
+
+    /**
+     * Optional "standard" commands (RFC 959)
+     * Changes the working directory to the parent of the current directory
+     */
+    cdup(callback: (error: Error) => void): void;
+
+    /**
+     * Optional "standard" commands (RFC 959)
+     * Retrieves the current working directory
+     */
+    pwd(callback: (error: Error, path: string) => void): void;
+
+    /**
+     * Optional "standard" commands (RFC 959)
+     * Retrieves the server's operating system.
+     */
+    system(callback: (error: Error, OS: string) => void): void;
+
+    /**
+     * Optional "standard" commands (RFC 959)
+     * Similar to list(), except the directory is temporarily changed to path to retrieve the directory listing.
+     * This is useful for servers that do not handle characters like spaces and quotes in directory names well for the LIST command.
+     * This function is "optional" because it relies on pwd() being available.
+     */
+    listSafe(path: string, useCompression: boolean, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
+    listSafe(path: string, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
+    listSafe(useCompression: boolean, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
+    listSafe(callback: (error: Error, listing: Client.ListingElement[]) => void): void;
+
+    /**
+     * Extended commands (RFC 3659)
+     * Retrieves the size of path
+     */
+    size(path: string, callback: (error: Error, size: number) => void): void;
+
+    /**
+     * Extended commands (RFC 3659)
+     * Retrieves the last modified date and time for path
+     */
+    lastMod(path: string, callback: (error: Error, lastMod: Date) => void): void;
+
+    /**
+     * Extended commands (RFC 3659)
+     * Sets the file byte offset for the next file transfer action (get/put) to byteOffset
+     */
+    restart(byteOffset: number, callback: (error: Error) => void): void;
+
+}
+
+export = Client;
diff --git a/ftp/tsconfig.json b/ftp/tsconfig.json
new file mode 100644
index 0000000000..3445564a6d
--- /dev/null
+++ b/ftp/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ftp-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ftpd/ftpd-tests.ts b/ftpd/ftpd-tests.ts
index 6840a71526..8942dedcb7 100644
--- a/ftpd/ftpd-tests.ts
+++ b/ftpd/ftpd-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="ftpd.d.ts" />
 
 import ftpd = require("ftpd");
 
diff --git a/ftpd/ftpd.d.ts b/ftpd/ftpd.d.ts
deleted file mode 100644
index 6812e54673..0000000000
--- a/ftpd/ftpd.d.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-// Type definitions for ftpd 0.2.11
-// Project: https://github.com/sstur/nodeftpd
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "ftpd" {
-
-	import events = require("events");
-	import fs = require("fs");
-	import net = require("net");
-	import tls = require("tls");
-
-	/**
-	 * Options for FtpServer constructor
-	 */
-	export interface FtpServerOptions {
-		/**
-		 * Gets the initial working directory for the user. Called after user is authenticated
-		 * Typical cases where you would want/need the callback involve retrieving configurations from external datasources and suchlike.
-		 */
-		getInitialCwd: (connection: FtpConnection, callback?: (error: Error, path: string) => void) => void|string;
-		/**
-		 * Gets the root directory for the user relative to the CWD. Called after getInitialCwd. The user is not able to escape this directory.
-		 * Typical cases where you would want/need the callback involve retrieving configurations from external datasources and suchlike.
-		 */
-		getRoot: (connection: FtpConnection, callback?: (error: Error, path: string) => void) => void|string;
-		/**
-		 * If set to true, then files which the client uploads are buffered in memory and then written to disk using writeFile.
-		 * If false, files are written using writeStream.
-		 */
-		useWriteFile?: boolean;
-		/**
-		 * If set to true, then files which the client uploads are slurped using 'readFile'.
-		 * If false, files are read using readStream.
-		 */
-		useReadFile?: boolean;
-		/**
-		 * Determines the maximum file size (in bytes) for which uploads are buffered in memory before being written to disk.
-		 * Has an effect only if useWriteFile is set to true.
-		 * If uploadMaxSlurpSize is not set, then there is no limit on buffer size.
-		 */
-		uploadMaxSlurpSize?: number;
-		/**
-		 * The maximum number of concurrent calls to fs.stat which will be made when processing a LIST request. Default 5.
-		 */
-		maxStatsAtOnce?: number;
-		/**
-		 * A function which can be used as the argument of an array's sort method. Used to sort filenames for directory listings.
-		 * See [https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Array/sort] for more info.
-		 */
-		filenameSortFunc?: (a: string, b: string) => number;
-		/**
-		 * A function which is applied to each filename before sorting.
-		 * If set to false, filenames are unaltered.
-		 */
-		filenameSortMap?: ((a: string) => string) | boolean;
-		/**
-		 * If this is set, then filenames are not sorted in responses to the LIST and NLST commands.
-		 */
-		dontSortFilenames?: boolean;
-		/**
-		 * If set to true, then LIST and NLST treat the characters ? and * as literals instead of as wildcards.
-		 */
-		noWildcards?: boolean;
-		/**
-		 * If this is set, the server will allow explicit TLS authentication. Value should be a dictionary which is suitable as the options argument of tls.createServer.
-		 */
-		tlsOptions?: tls.TlsOptions;
-		/**
-		 * If this is set to true, and tlsOptions is also set, then the server will not allow logins over non-secure connections.
-		 * Default false
-		 */
-		tlsOnly?: boolean;
-		/**
-		 * I obviously set this to true when tlsOnly is on -someone needs to update this.
-		 */
-		allowUnauthorizedTls?: boolean;
-		/**
-		 * Integer, specifies the lower-bound port (min port) for creating PASV connections
-		 */
-		pasvPortRangeStart?: number;
-		/**
-		 * Integer, specifies the upper-bound port (max port) for creating PASV connections
-		 */
-		pasvPortRangeEnd?: number;
-	}
-
-	/**
-	 * Represents one Ftp connection. Incomplete type definition.
-	 *
-	 * @event command:user (username: string, success: () => void, failure: () => void)
-	 * @event command:pass (password: string, success: (username: string, fs?: FtpFileSystem) => void, failure: () => void)
-	 *                     The server raises a command:pass event which is given pass, success and failure arguments.
-	 *                     On successful login, success should be called with a username argument. It may also optionally
-	 *                     be given a second argument, which should be an object providing an implementation of the API for Node's fs module.
-	 */
-	export class FtpConnection extends events.EventEmitter {
-		server: FtpServer;
-		socket: net.Socket;
-		pasv: net.Server;
-		dataSocket: net.Socket; // the actual data socket
-		mode: string;
-		username: string;
-		cwd: string;
-		root: string;
-		hasQuit: boolean;
-		// State for handling TLS upgrades.
-		secure: boolean;
-		pbszReceived: boolean;
-	}
-
-
-	/**
-	 * Optional mock fs implementation to set in the command:pass event of FtpConnection
-	 */
-	export interface FtpFileSystem {
-		unlink: (path: string, callback?: (err?: NodeJS.ErrnoException) => void) => void;
-		readdir: (path: string, callback?: (err: NodeJS.ErrnoException, files: string[]) => void) => void;
-		mkdir: ((path: string, callback?: (err?: NodeJS.ErrnoException) => void) => void)
-			| ((path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void) => void)
-			| ((path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void) => void);
-		open: ((path: string, flags: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any) => void)
-			| ((path: string, flags: string, mode: number, callback?: (err: NodeJS.ErrnoException, fd: number) => any) => void)
-			| ((path: string, flags: string, mode: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any) => void);
-		close: (fd: number, callback?: (err?: NodeJS.ErrnoException) => void) => void;
-		rmdir: (path: string, callback?: (err?: NodeJS.ErrnoException) => void) => void;
-		rename: (oldPath: string, newPath: string, callback?: (err?: NodeJS.ErrnoException) => void) => void;
-		/**
-		 * specific object properties: { mode, isDirectory(), size, mtime }
-		 */
-		stat: (path: string, callback?: (err: NodeJS.ErrnoException, stats: fs.Stats) => any) => void;
-		/**
-		 * if useReadFile option is not set or is false
-		 */
-		createReadStream?: (path: string, options?: {
-			flags?: string;
-			encoding?: string;
-			fd?: string;
-			mode?: string;
-			bufferSize?: number;
-		}) => fs.ReadStream;
-		/**
-		 * if useWriteFile option is not set or is false
-		 */
-		createWriteStream?: (path: string, options?: {
-			flags?: string;
-			encoding?: string;
-			string?: string;
-		}) => fs.WriteStream;
-		/**
-		 * if useReadFile option is set to 'true'
-		 */
-		readFile?:
-			  ((filename: string, encoding: string, callback: (err: NodeJS.ErrnoException, data: string) => void) => void)
-			| ((filename: string, options: { encoding: string; flag?: string; }, callback: (err: NodeJS.ErrnoException, data: string) => void) => void)
-			| ((filename: string, options: { flag?: string; }, callback: (err: NodeJS.ErrnoException, data: Buffer) => void) => void)
-			| ((filename: string, callback: (err: NodeJS.ErrnoException, data: Buffer) => void ) => void);
-		/**
-		 * if useWriteFile option is set to 'true'
-		 */
-		writeFile?:
-			  ((filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void) => void)
-			| ((filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void) => void)
-			| ((filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void) => void);
-
-	}
-
-	/**
-	 * FTP server
-	 *
-	 * Events:
-	 * @event close	net.Server close event
-	 * @event error net.Server error event
-	 * @event client:connected  (connection: FtpConnection)
-	 */
-	export class FtpServer extends events.EventEmitter {
-
-		/**
-		 * @param host host is a string representation of the IP address clients use to connect to the FTP server.
-		 *             It's imperative that this actually reflects the remote IP the clients use to access the server,
-		 *             as this IP will be used in the establishment of PASV data connections. If this IP is not the one clients use to connect,
-		 *             you will see some strange behavior from the client side (hangs).
-		 * @param options See test.js for a simple example.
-		 */
-		constructor(host: string, options: FtpServerOptions);
-
-		/**
-		 * Start listening, see net.Server.listen()
-		 */
-		public listen(port: number, host?: string, backlog?: number, listeningListener?: () => void): void;
-
-		/**
-		 * Stop listening
-		 */
-		public close(callback?: () => void): void;
-	}
-
-
-
-}
diff --git a/ftpd/index.d.ts b/ftpd/index.d.ts
new file mode 100644
index 0000000000..7aee0bb578
--- /dev/null
+++ b/ftpd/index.d.ts
@@ -0,0 +1,198 @@
+// Type definitions for ftpd 0.2.11
+// Project: https://github.com/sstur/nodeftpd
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+import events = require("events");
+import fs = require("fs");
+import net = require("net");
+import tls = require("tls");
+
+/**
+ * Options for FtpServer constructor
+ */
+export interface FtpServerOptions {
+    /**
+     * Gets the initial working directory for the user. Called after user is authenticated
+     * Typical cases where you would want/need the callback involve retrieving configurations from external datasources and suchlike.
+     */
+    getInitialCwd: (connection: FtpConnection, callback?: (error: Error, path: string) => void) => void | string;
+    /**
+     * Gets the root directory for the user relative to the CWD. Called after getInitialCwd. The user is not able to escape this directory.
+     * Typical cases where you would want/need the callback involve retrieving configurations from external datasources and suchlike.
+     */
+    getRoot: (connection: FtpConnection, callback?: (error: Error, path: string) => void) => void | string;
+    /**
+     * If set to true, then files which the client uploads are buffered in memory and then written to disk using writeFile.
+     * If false, files are written using writeStream.
+     */
+    useWriteFile?: boolean;
+    /**
+     * If set to true, then files which the client uploads are slurped using 'readFile'.
+     * If false, files are read using readStream.
+     */
+    useReadFile?: boolean;
+    /**
+     * Determines the maximum file size (in bytes) for which uploads are buffered in memory before being written to disk.
+     * Has an effect only if useWriteFile is set to true.
+     * If uploadMaxSlurpSize is not set, then there is no limit on buffer size.
+     */
+    uploadMaxSlurpSize?: number;
+    /**
+     * The maximum number of concurrent calls to fs.stat which will be made when processing a LIST request. Default 5.
+     */
+    maxStatsAtOnce?: number;
+    /**
+     * A function which can be used as the argument of an array's sort method. Used to sort filenames for directory listings.
+     * See [https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Array/sort] for more info.
+     */
+    filenameSortFunc?: (a: string, b: string) => number;
+    /**
+     * A function which is applied to each filename before sorting.
+     * If set to false, filenames are unaltered.
+     */
+    filenameSortMap?: ((a: string) => string) | boolean;
+    /**
+     * If this is set, then filenames are not sorted in responses to the LIST and NLST commands.
+     */
+    dontSortFilenames?: boolean;
+    /**
+     * If set to true, then LIST and NLST treat the characters ? and * as literals instead of as wildcards.
+     */
+    noWildcards?: boolean;
+    /**
+     * If this is set, the server will allow explicit TLS authentication. Value should be a dictionary which is suitable as the options argument of tls.createServer.
+     */
+    tlsOptions?: tls.TlsOptions;
+    /**
+     * If this is set to true, and tlsOptions is also set, then the server will not allow logins over non-secure connections.
+     * Default false
+     */
+    tlsOnly?: boolean;
+    /**
+     * I obviously set this to true when tlsOnly is on -someone needs to update this.
+     */
+    allowUnauthorizedTls?: boolean;
+    /**
+     * Integer, specifies the lower-bound port (min port) for creating PASV connections
+     */
+    pasvPortRangeStart?: number;
+    /**
+     * Integer, specifies the upper-bound port (max port) for creating PASV connections
+     */
+    pasvPortRangeEnd?: number;
+}
+
+/**
+ * Represents one Ftp connection. Incomplete type definition.
+ *
+ * @event command:user (username: string, success: () => void, failure: () => void)
+ * @event command:pass (password: string, success: (username: string, fs?: FtpFileSystem) => void, failure: () => void)
+ *                     The server raises a command:pass event which is given pass, success and failure arguments.
+ *                     On successful login, success should be called with a username argument. It may also optionally
+ *                     be given a second argument, which should be an object providing an implementation of the API for Node's fs module.
+ */
+export declare class FtpConnection extends events.EventEmitter {
+    server: FtpServer;
+    socket: net.Socket;
+    pasv: net.Server;
+    dataSocket: net.Socket; // the actual data socket
+    mode: string;
+    username: string;
+    cwd: string;
+    root: string;
+    hasQuit: boolean;
+    // State for handling TLS upgrades.
+    secure: boolean;
+    pbszReceived: boolean;
+}
+
+
+/**
+ * Optional mock fs implementation to set in the command:pass event of FtpConnection
+ */
+export interface FtpFileSystem {
+    unlink: (path: string, callback?: (err?: NodeJS.ErrnoException) => void) => void;
+    readdir: (path: string, callback?: (err: NodeJS.ErrnoException, files: string[]) => void) => void;
+    mkdir: ((path: string, callback?: (err?: NodeJS.ErrnoException) => void) => void)
+    | ((path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void) => void)
+    | ((path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void) => void);
+    open: ((path: string, flags: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any) => void)
+    | ((path: string, flags: string, mode: number, callback?: (err: NodeJS.ErrnoException, fd: number) => any) => void)
+    | ((path: string, flags: string, mode: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any) => void);
+    close: (fd: number, callback?: (err?: NodeJS.ErrnoException) => void) => void;
+    rmdir: (path: string, callback?: (err?: NodeJS.ErrnoException) => void) => void;
+    rename: (oldPath: string, newPath: string, callback?: (err?: NodeJS.ErrnoException) => void) => void;
+    /**
+     * specific object properties: { mode, isDirectory(), size, mtime }
+     */
+    stat: (path: string, callback?: (err: NodeJS.ErrnoException, stats: fs.Stats) => any) => void;
+    /**
+     * if useReadFile option is not set or is false
+     */
+    createReadStream?: (path: string, options?: {
+        flags?: string;
+        encoding?: string;
+        fd?: string;
+        mode?: string;
+        bufferSize?: number;
+    }) => fs.ReadStream;
+    /**
+     * if useWriteFile option is not set or is false
+     */
+    createWriteStream?: (path: string, options?: {
+        flags?: string;
+        encoding?: string;
+        string?: string;
+    }) => fs.WriteStream;
+    /**
+     * if useReadFile option is set to 'true'
+     */
+    readFile?:
+    ((filename: string, encoding: string, callback: (err: NodeJS.ErrnoException, data: string) => void) => void)
+    | ((filename: string, options: { encoding: string; flag?: string; }, callback: (err: NodeJS.ErrnoException, data: string) => void) => void)
+    | ((filename: string, options: { flag?: string; }, callback: (err: NodeJS.ErrnoException, data: Buffer) => void) => void)
+    | ((filename: string, callback: (err: NodeJS.ErrnoException, data: Buffer) => void) => void);
+    /**
+     * if useWriteFile option is set to 'true'
+     */
+    writeFile?:
+    ((filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void) => void)
+    | ((filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void) => void)
+    | ((filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void) => void);
+
+}
+
+/**
+ * FTP server
+ *
+ * Events:
+ * @event close	net.Server close event
+ * @event error net.Server error event
+ * @event client:connected  (connection: FtpConnection)
+ */
+export declare class FtpServer extends events.EventEmitter {
+
+    /**
+     * @param host host is a string representation of the IP address clients use to connect to the FTP server.
+     *             It's imperative that this actually reflects the remote IP the clients use to access the server,
+     *             as this IP will be used in the establishment of PASV data connections. If this IP is not the one clients use to connect,
+     *             you will see some strange behavior from the client side (hangs).
+     * @param options See test.js for a simple example.
+     */
+    constructor(host: string, options: FtpServerOptions);
+
+    /**
+     * Start listening, see net.Server.listen()
+     */
+    public listen(port: number, host?: string, backlog?: number, listeningListener?: () => void): void;
+
+    /**
+     * Stop listening
+     */
+    public close(callback?: () => void): void;
+}
diff --git a/ftpd/tsconfig.json b/ftpd/tsconfig.json
new file mode 100644
index 0000000000..83533a903a
--- /dev/null
+++ b/ftpd/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ftpd-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fullCalendar/fullCalendar-tests.ts b/fullCalendar/fullCalendar-tests.ts
index a961512074..7e9e73b355 100644
--- a/fullCalendar/fullCalendar-tests.ts
+++ b/fullCalendar/fullCalendar-tests.ts
@@ -1,6 +1,8 @@
-/// <reference path="fullCalendar.d.ts" />
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="../jqueryui/jqueryui.d.ts"/>
+
+/// <reference types="jquery"/>
+/// <reference types="jqueryui"/>
+
+import * as FullCalendar from 'fullCalendar';
 
 // All examples from http://arshaw.com/fullcalendar/docs/
 
diff --git a/fullCalendar/fullCalendar-tests.ts.tscparams b/fullCalendar/fullCalendar-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/fullCalendar/fullCalendar-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/fullCalendar/fullCalendar.d.ts b/fullCalendar/fullCalendar.d.ts
deleted file mode 100644
index eb578e0a69..0000000000
--- a/fullCalendar/fullCalendar.d.ts
+++ /dev/null
@@ -1,431 +0,0 @@
-// Type definitions for FullCalendar 1.6.1
-// Project: http://arshaw.com/fullcalendar/
-// Definitions by: Neil Stalker <https://github.com/nestalk>, Marcelo Camargo <https://github.com/hasellcamargo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="../moment/moment.d.ts"/>
-
-declare namespace FullCalendar {
-    export interface Calendar {
-
-        /**
-         * Formats a Date object into a string.
-         */
-        formatDate(date: Date, format: string, options?: Options): string;
-
-        /**
-         * Formats a date range (two Date objects) into a string.
-         */
-        formatDates(date1: Date, date2: Date, format: string, options?: Options): string;
-
-        /**
-         * Parses a string into a Date object.
-         */
-        parseDate(dateString: string, ignoreTimezone?: boolean): Date;
-
-        /**
-         * Parses an ISO8601 string into a Date object.
-         */
-        parseISO8601(dateString: string, ignoreTimezone?: boolean): Date;
-
-        /**
-         * Gets the version of Fullcalendar
-         */
-        version: string;
-    }
-
-    export interface BusinessHours {
-        start: moment.Duration;
-        end: moment.Duration;
-        dow: Array<number>;
-    }
-
-    export interface Timespan {
-        start: moment.Moment;
-        end: moment.Moment;
-    }
-
-    export interface Options extends AgendaOptions, EventDraggingResizingOptions, DroppingExternalElementsOptions, SelectionOptions {
-
-        // General display - http://arshaw.com/fullcalendar/docs/display/
-
-        header?: {
-            left: string;
-            center: string;
-            right: string;
-        }
-        theme?: boolean
-        buttonIcons?: {
-            prev: string;
-            next: string;
-        }
-        firstDay?: number;
-        isRTL?: boolean;
-        weekends?: boolean;
-        hiddenDays?: number[];
-        weekMode?: string;
-        weekNumbers?: boolean;
-        weekNumberCalculation?: any; // String/Function
-        businessHours?: boolean | BusinessHours;
-        height?: number;
-        contentHeight?: number;
-        aspectRatio?: number;
-        handleWindowResize?: boolean;
-        viewRender?: (view: ViewObject, element: JQuery) => void;
-        viewDestroy?: (view: ViewObject, element: JQuery) => void;
-        dayRender?: (date: Date, cell: HTMLTableDataCellElement) => void;
-        windowResize?: (view: ViewObject) => void;
-
-        // Timezone
-        timezone?: string | boolean;
-        now?: moment.Moment | Date | string | (() => moment.Moment)
-
-        // Views - http://arshaw.com/fullcalendar/docs/views/
-
-        defaultView?: string;
-
-        // Current Date - http://arshaw.com/fullcalendar/docs/current_date/
-
-        defaultDate?: moment.Moment | Date | string;
-        year?: number;
-        month?: number;
-        date?: number;
-
-        // Text/Time Customization - http://arshaw.com/fullcalendar/docs/text/
-
-        timeFormat?: any; // String/ViewOptionHash
-        columnFormat?: any; // String/ViewOptionHash
-        titleFormat?: any; // String/ViewOptionHash
-
-        buttonText?: ButtonTextObject;
-        monthNames?: Array<string>;
-        monthNamesShort?: Array<string>;
-        dayNames?: Array<string>;
-        dayNamesShort?: Array<string>;
-        weekNumberTitle?: string;
-
-        // Clicking & Hovering - http://arshaw.com/fullcalendar/docs/mouse/
-
-        dayClick?: (date: Date, allDay: boolean, jsEvent: MouseEvent, view: ViewObject) => void;
-        eventClick?: (event: EventObject, jsEvent: MouseEvent, view: ViewObject) => any; // return type boolean or void
-        eventMouseover?: (event: EventObject, jsEvent: MouseEvent, view: ViewObject) => void;
-        eventMouseout?: (event: EventObject, jsEvent: MouseEvent, view: ViewObject) => void;
-
-        // Event Data - http://arshaw.com/fullcalendar/docs/event_data/
-
-        /**
-         * This has one of the following types:
-         *
-         * - EventObject[]
-         * - string (JSON feed)
-         * - (start: Date | string, end: Date | string, callback: {(events: EventObject[]) => void;}) => void;
-         */
-        events?: any;
-
-        /**
-         * An array, each element being one of the following types:
-         *
-         * - EventSource
-         * - EventObject[]
-         * - string (JSON feed)
-         * - (start: Date | string, end: Date | string, callback: {(events: EventObject[]) => void;}) => void;
-         */
-        eventSources?: any[];
-
-        allDayDefault?: boolean;
-        ignoreTimezone?: boolean;
-        startParam?: string;
-        endParam?: string
-        lazyFetching?: boolean;
-        eventDataTransform?: (eventData: any) => EventObject;
-        loading?: (isLoading: boolean, view: ViewObject) => void;
-
-        // Event Rendering - http://arshaw.com/fullcalendar/docs/event_rendering/
-
-        eventColor?: string;
-        eventBackgroundColor?: string;
-        eventBorderColor?: string;
-        eventTextColor?: string;
-        eventRender?: (event: EventObject, element: HTMLDivElement, view: ViewObject) => void;
-        eventAfterRender?: (event: EventObject, element: HTMLDivElement, view: ViewObject) => void;
-        eventAfterAllRender?: (view: ViewObject) => void;
-        eventDestroy?: (event: EventObject, element: JQuery, view: ViewObject) => void;
-
-
-    }
-
-    export interface ViewOptionHash {
-        month?: any;
-        week?: any;
-        day?: any;
-        agenda?: any;
-        agendaDay?: any;
-        agendaWeek?: any;
-        basic?: any;
-        basicDay?: any;
-        basicWeek?: any;
-        ''?: any;
-    }
-
-    /**
-     * Agenda Options - http://arshaw.com/fullcalendar/docs/agenda/
-     */
-    export interface AgendaOptions {
-        allDaySlot?: boolean;
-        allDayText?: string;
-        slotDuration?: moment.Duration;
-        slotLabelFormat?: string;
-        slotLabelInterval?: moment.Duration;
-        snapDuration?: moment.Duration;
-        scrollTime?: moment.Duration;
-        minTime?: moment.Duration; // Integer/String
-        maxTime?: moment.Duration; // Integer/String
-        slotEventOverlap?: boolean;
-    }
-
-    /*
-    * Event Dragging & Resizing
-    */
-    export interface EventDraggingResizingOptions {
-        editable?: boolean;
-        eventStartEditable?: boolean;
-        eventDurationEditable?: boolean;
-        dragRevertDuration?: number; // integer, milliseconds
-        dragOpacity?: number; // float
-        dragScroll?: boolean;
-        eventOverlap?: boolean | ((stillEvent: EventObject, movingEvent: EventObject) => boolean);
-        eventConstraint?: BusinessHours | Timespan;
-        eventDragStart?: (event: EventObject, jsEvent: MouseEvent, ui: any, view: ViewObject) => void;
-        eventDragStop?: (event: EventObject, jsEvent: MouseEvent, ui: any, view: ViewObject) => void;
-        eventDrop?: (event: EventObject, delta: moment.Duration, revertFunc: Function, jsEvent: Event, ui: any, view: ViewObject) => void;
-        eventResizeStart?: (event: EventObject, jsEvent: MouseEvent, ui: any, view: ViewObject) => void;
-        eventResizeStop?: (event: EventObject, jsEvent: MouseEvent, ui: any, view: ViewObject) => void;
-        eventResize?: (event: EventObject, delta: moment.Duration, revertFunc: Function, jsEvent: Event, ui: any, view: ViewObject) => void;
-    }
-    /*
-    * Selection - http://arshaw.com/fullcalendar/docs/selection/
-    */
-    export interface SelectionOptions {
-        selectable?: boolean;
-        selectHelper?: boolean | ((start: moment.Moment, end: moment.Moment) => HTMLElement);
-        unselectAuto?: boolean;
-        unselectCancel?: string;
-        selectOverlap?: boolean | ((event: EventObject) => boolean);
-        selectConstraint?: Timespan | BusinessHours;
-        select?: (start: moment.Moment, end: moment.Moment, jsEvent: MouseEvent, view: ViewObject, resource?: any) => void;
-        unselect?: (view: ViewObject, jsEvent: Event) => void;
-    }
-
-    export interface DroppingExternalElementsOptions {
-        droppable?: boolean;
-        dropAccept?: string | ((draggable: any) => boolean);
-        drop?: (date: moment.Moment, jsEvent: MouseEvent, ui: any) => void;
-        eventReceive?: (event: EventObject) => void
-    }
-
-    export interface ButtonTextObject {
-        prev?: string;
-        next?: string;
-        prevYear?: string;
-        nextYear?: string;
-        today?: string;
-        month?: string;
-        week?: string;
-        day?: string;
-    }
-
-    export interface EventObject extends Timespan {
-        id?: any // String/number
-        title: string;
-        allDay?: boolean;
-        url?: string;
-        className?: any; // string/Array<string>
-        editable?: boolean;
-        source?: EventSource;
-        color?: string;
-        backgroundColor?: string;
-        borderColor?: string;
-        textColor?: string;
-        rendering?: string;
-    }
-
-    export interface ViewObject extends Timespan {
-        name: string;
-        title: string;
-        intervalStart: moment.Moment;
-        intervalEnd: moment.Moment;
-    }
-
-    export interface EventSource extends JQueryAjaxSettings {
-
-        /**
-         * This has one of the following types:
-         *
-         * - EventObject[]
-         * - string (JSON feed)
-         * - (start: Date | string, end: Date | string, callback: {(events: EventObject[]) => void;}) => void;
-         */
-        events?: any;
-
-        color?: string;
-        backgroundColor?: string;
-        borderColor?: string;
-        textColor?: string;
-        className?: any; // string/Array<string>
-        editable?: boolean;
-        allDayDefault?: boolean;
-        ignoreTimezone?: boolean;
-        eventTransform?: any;
-        startParam?: string;
-        endParam?: string
-    }
-
-}
-
-interface JQuery {
-
-    /**
-     * Get/Set option value
-     */
-    fullCalendar(method: 'option', option: string, value?: any): void;
-
-    /**
-     * Immediately forces the calendar to render and/or readjusts its size.
-     */
-    fullCalendar(method: 'render'): void;
-
-    /**
-     * Restores the element to the state before FullCalendar was initialized.
-     */
-    fullCalendar(method: 'destroy'): void;
-
-    /**
-     * Returns the View Object for the current view.
-     */
-    fullCalendar(method: 'getView'): FullCalendar.ViewObject;
-
-    /**
-     * Immediately switches to a different view.
-     */
-    fullCalendar(method: 'changeView', viewName: string): void;
-
-    /**
-     * Moves the calendar one step back (either by a month, week, or day).
-     */
-    fullCalendar(method: 'prev'): void;
-
-    /**
-     * Moves the calendar one step forward (either by a month, week, or day).
-     */
-    fullCalendar(method: 'next'): void;
-
-    /**
-     * Moves the calendar back one year.
-     */
-    fullCalendar(method: 'prevYear'): void;
-
-    /**
-     * Moves the calendar forward one year.
-     */
-    fullCalendar(method: 'nextYear'): void;
-
-    /**
-     * Moves the calendar to the current date.
-     */
-    fullCalendar(method: 'today'): void;
-
-    /**
-     * Moves the calendar to an arbitrary year/month/date.
-     */
-    fullCalendar(method: 'gotoDate', year: number, month?: number, date?: number): void;
-
-    /**
-     * Moves the calendar to an arbitrary date.
-     */
-    fullCalendar(method: 'gotoDate', date: Date | string): void;
-
-    /**
-     * Moves the calendar forward/backward an arbitrary amount of time.
-     */
-    fullCalendar(method: 'incrementDate', year: number, month?: number, date?: number): void;
-
-    /**
-     * Returns a Date object for the current date of the calendar.
-     */
-    fullCalendar(method: 'getDate'): Date;
-
-    /**
-     * A method for programmatically selecting a period of time.
-     */
-    fullCalendar(method: 'select', startDate: Date, endDate: Date, allDay: boolean): void;
-
-    /**
-     * A method for programmatically clearing the current selection.
-     */
-    fullCalendar(method: 'unselect'): void;
-
-    /**
-     * Reports changes to an event and renders them on the calendar.
-     */
-    fullCalendar(method: 'updateEvent', event: FullCalendar.EventObject): void;
-
-    /**
-     * Retrieves events that FullCalendar has in memory.
-     */
-    fullCalendar(method: 'clientEvents', idOrfilter?: any): Array<FullCalendar.EventObject>;
-
-    /**
-     * Retrieves events that FullCalendar has in memory.
-     */
-    fullCalendar(method: 'clientEvents', idOrfilter?: (e: FullCalendar.EventObject) => boolean): Array<FullCalendar.EventObject>;
-
-    /**
-     * Removes events from the calendar.
-     */
-    fullCalendar(method: 'removeEvents', idOrfilter?: any): void;
-
-    /**
-     * Removes events from the calendar.
-     */
-    fullCalendar(method: 'removeEvents', idOrfilter?: (e: FullCalendar.EventObject) => boolean): void;
-
-    /**
-     * Refetches events from all sources and rerenders them on the screen.
-     */
-    fullCalendar(method: 'refetchEvents'): void;
-
-    /**
-     * Dynamically adds an event source.
-     */
-    fullCalendar(method: 'addEventSource', source: any): void;
-
-    /**
-     * Dynamically removes an event source.
-     */
-    fullCalendar(method: 'removeEventSource', source: any): void;
-
-    /**
-     * Renders a new event on the calendar.
-     */
-    fullCalendar(method: 'renderEvent', event: FullCalendar.EventObject, stick?: boolean): void;
-
-    /**
-     * Rerenders all events on the calendar.
-     */
-    fullCalendar(method: 'rerenderEvents'): void;
-
-    /**
-     * Create calendar object
-     */
-    fullCalendar(options: FullCalendar.Options): JQuery;
-
-    /**
-     * Generic method function
-     */
-    fullCalendar(method: string, arg1: any, arg2: any, arg3: any): void;
-}
-
-interface JQueryStatic {
-    fullCalendar: FullCalendar.Calendar;
-}
diff --git a/fullCalendar/index.d.ts b/fullCalendar/index.d.ts
new file mode 100644
index 0000000000..59d4af5a96
--- /dev/null
+++ b/fullCalendar/index.d.ts
@@ -0,0 +1,433 @@
+// Type definitions for FullCalendar 1.6.1
+// Project: http://arshaw.com/fullcalendar/
+// Definitions by: Neil Stalker <https://github.com/nestalk>, Marcelo Camargo <https://github.com/hasellcamargo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+import * as moment from '../moment';
+
+export as namespace FC;
+
+export interface Calendar {
+
+    /**
+     * Formats a Date object into a string.
+     */
+    formatDate(date: Date, format: string, options?: Options): string;
+
+    /**
+     * Formats a date range (two Date objects) into a string.
+     */
+    formatDates(date1: Date, date2: Date, format: string, options?: Options): string;
+
+    /**
+     * Parses a string into a Date object.
+     */
+    parseDate(dateString: string, ignoreTimezone?: boolean): Date;
+
+    /**
+     * Parses an ISO8601 string into a Date object.
+     */
+    parseISO8601(dateString: string, ignoreTimezone?: boolean): Date;
+
+    /**
+     * Gets the version of Fullcalendar
+     */
+    version: string;
+}
+
+export interface BusinessHours {
+    start: moment.Duration;
+    end: moment.Duration;
+    dow: Array<number>;
+}
+
+export interface Timespan {
+    start: moment.Moment;
+    end: moment.Moment;
+}
+
+export interface Options extends AgendaOptions, EventDraggingResizingOptions, DroppingExternalElementsOptions, SelectionOptions {
+
+    // General display - http://arshaw.com/fullcalendar/docs/display/
+
+    header?: {
+        left: string;
+        center: string;
+        right: string;
+    }
+    theme?: boolean
+    buttonIcons?: {
+        prev: string;
+        next: string;
+    }
+    firstDay?: number;
+    isRTL?: boolean;
+    weekends?: boolean;
+    hiddenDays?: number[];
+    weekMode?: string;
+    weekNumbers?: boolean;
+    weekNumberCalculation?: any; // String/Function
+    businessHours?: boolean | BusinessHours;
+    height?: number;
+    contentHeight?: number;
+    aspectRatio?: number;
+    handleWindowResize?: boolean;
+    viewRender?: (view: ViewObject, element: JQuery) => void;
+    viewDestroy?: (view: ViewObject, element: JQuery) => void;
+    dayRender?: (date: Date, cell: HTMLTableDataCellElement) => void;
+    windowResize?: (view: ViewObject) => void;
+
+    // Timezone
+    timezone?: string | boolean;
+    now?: moment.Moment | Date | string | (() => moment.Moment)
+
+    // Views - http://arshaw.com/fullcalendar/docs/views/
+
+    defaultView?: string;
+
+    // Current Date - http://arshaw.com/fullcalendar/docs/current_date/
+
+    defaultDate?: moment.Moment | Date | string;
+    year?: number;
+    month?: number;
+    date?: number;
+
+    // Text/Time Customization - http://arshaw.com/fullcalendar/docs/text/
+
+    timeFormat?: any; // String/ViewOptionHash
+    columnFormat?: any; // String/ViewOptionHash
+    titleFormat?: any; // String/ViewOptionHash
+
+    buttonText?: ButtonTextObject;
+    monthNames?: Array<string>;
+    monthNamesShort?: Array<string>;
+    dayNames?: Array<string>;
+    dayNamesShort?: Array<string>;
+    weekNumberTitle?: string;
+
+    // Clicking & Hovering - http://arshaw.com/fullcalendar/docs/mouse/
+
+    dayClick?: (date: Date, allDay: boolean, jsEvent: MouseEvent, view: ViewObject) => void;
+    eventClick?: (event: EventObject, jsEvent: MouseEvent, view: ViewObject) => any; // return type boolean or void
+    eventMouseover?: (event: EventObject, jsEvent: MouseEvent, view: ViewObject) => void;
+    eventMouseout?: (event: EventObject, jsEvent: MouseEvent, view: ViewObject) => void;
+
+    // Event Data - http://arshaw.com/fullcalendar/docs/event_data/
+
+    /**
+     * This has one of the following types:
+     *
+     * - EventObject[]
+     * - string (JSON feed)
+     * - (start: Date | string, end: Date | string, callback: {(events: EventObject[]) => void;}) => void;
+     */
+    events?: any;
+
+    /**
+     * An array, each element being one of the following types:
+     *
+     * - EventSource
+     * - EventObject[]
+     * - string (JSON feed)
+     * - (start: Date | string, end: Date | string, callback: {(events: EventObject[]) => void;}) => void;
+     */
+    eventSources?: any[];
+
+    allDayDefault?: boolean;
+    ignoreTimezone?: boolean;
+    startParam?: string;
+    endParam?: string
+    lazyFetching?: boolean;
+    eventDataTransform?: (eventData: any) => EventObject;
+    loading?: (isLoading: boolean, view: ViewObject) => void;
+
+    // Event Rendering - http://arshaw.com/fullcalendar/docs/event_rendering/
+
+    eventColor?: string;
+    eventBackgroundColor?: string;
+    eventBorderColor?: string;
+    eventTextColor?: string;
+    eventRender?: (event: EventObject, element: HTMLDivElement, view: ViewObject) => void;
+    eventAfterRender?: (event: EventObject, element: HTMLDivElement, view: ViewObject) => void;
+    eventAfterAllRender?: (view: ViewObject) => void;
+    eventDestroy?: (event: EventObject, element: JQuery, view: ViewObject) => void;
+
+
+}
+
+export interface ViewOptionHash {
+    month?: any;
+    week?: any;
+    day?: any;
+    agenda?: any;
+    agendaDay?: any;
+    agendaWeek?: any;
+    basic?: any;
+    basicDay?: any;
+    basicWeek?: any;
+    ''?: any;
+}
+
+/**
+ * Agenda Options - http://arshaw.com/fullcalendar/docs/agenda/
+ */
+export interface AgendaOptions {
+    allDaySlot?: boolean;
+    allDayText?: string;
+    slotDuration?: moment.Duration;
+    slotLabelFormat?: string;
+    slotLabelInterval?: moment.Duration;
+    snapDuration?: moment.Duration;
+    scrollTime?: moment.Duration;
+    minTime?: moment.Duration; // Integer/String
+    maxTime?: moment.Duration; // Integer/String
+    slotEventOverlap?: boolean;
+}
+
+/*
+* Event Dragging & Resizing
+*/
+export interface EventDraggingResizingOptions {
+    editable?: boolean;
+    eventStartEditable?: boolean;
+    eventDurationEditable?: boolean;
+    dragRevertDuration?: number; // integer, milliseconds
+    dragOpacity?: number; // float
+    dragScroll?: boolean;
+    eventOverlap?: boolean | ((stillEvent: EventObject, movingEvent: EventObject) => boolean);
+    eventConstraint?: BusinessHours | Timespan;
+    eventDragStart?: (event: EventObject, jsEvent: MouseEvent, ui: any, view: ViewObject) => void;
+    eventDragStop?: (event: EventObject, jsEvent: MouseEvent, ui: any, view: ViewObject) => void;
+    eventDrop?: (event: EventObject, delta: moment.Duration, revertFunc: Function, jsEvent: Event, ui: any, view: ViewObject) => void;
+    eventResizeStart?: (event: EventObject, jsEvent: MouseEvent, ui: any, view: ViewObject) => void;
+    eventResizeStop?: (event: EventObject, jsEvent: MouseEvent, ui: any, view: ViewObject) => void;
+    eventResize?: (event: EventObject, delta: moment.Duration, revertFunc: Function, jsEvent: Event, ui: any, view: ViewObject) => void;
+}
+/*
+* Selection - http://arshaw.com/fullcalendar/docs/selection/
+*/
+export interface SelectionOptions {
+    selectable?: boolean;
+    selectHelper?: boolean | ((start: moment.Moment, end: moment.Moment) => HTMLElement);
+    unselectAuto?: boolean;
+    unselectCancel?: string;
+    selectOverlap?: boolean | ((event: EventObject) => boolean);
+    selectConstraint?: Timespan | BusinessHours;
+    select?: (start: moment.Moment, end: moment.Moment, jsEvent: MouseEvent, view: ViewObject, resource?: any) => void;
+    unselect?: (view: ViewObject, jsEvent: Event) => void;
+}
+
+export interface DroppingExternalElementsOptions {
+    droppable?: boolean;
+    dropAccept?: string | ((draggable: any) => boolean);
+    drop?: (date: moment.Moment, jsEvent: MouseEvent, ui: any) => void;
+    eventReceive?: (event: EventObject) => void
+}
+
+export interface ButtonTextObject {
+    prev?: string;
+    next?: string;
+    prevYear?: string;
+    nextYear?: string;
+    today?: string;
+    month?: string;
+    week?: string;
+    day?: string;
+}
+
+export interface EventObject extends Timespan {
+    id?: any // String/number
+    title: string;
+    allDay?: boolean;
+    url?: string;
+    className?: any; // string/Array<string>
+    editable?: boolean;
+    source?: EventSource;
+    color?: string;
+    backgroundColor?: string;
+    borderColor?: string;
+    textColor?: string;
+    rendering?: string;
+}
+
+export interface ViewObject extends Timespan {
+    name: string;
+    title: string;
+    intervalStart: moment.Moment;
+    intervalEnd: moment.Moment;
+}
+
+export interface EventSource extends JQueryAjaxSettings {
+
+    /**
+     * This has one of the following types:
+     *
+     * - EventObject[]
+     * - string (JSON feed)
+     * - (start: Date | string, end: Date | string, callback: {(events: EventObject[]) => void;}) => void;
+     */
+    events?: any;
+
+    color?: string;
+    backgroundColor?: string;
+    borderColor?: string;
+    textColor?: string;
+    className?: any; // string/Array<string>
+    editable?: boolean;
+    allDayDefault?: boolean;
+    ignoreTimezone?: boolean;
+    eventTransform?: any;
+    startParam?: string;
+    endParam?: string
+}
+
+declare global {
+    interface JQuery {
+
+        /**
+         * Get/Set option value
+         */
+        fullCalendar(method: 'option', option: string, value?: any): void;
+
+        /**
+         * Immediately forces the calendar to render and/or readjusts its size.
+         */
+        fullCalendar(method: 'render'): void;
+
+        /**
+         * Restores the element to the state before FullCalendar was initialized.
+         */
+        fullCalendar(method: 'destroy'): void;
+
+        /**
+         * Returns the View Object for the current view.
+         */
+        fullCalendar(method: 'getView'): ViewObject;
+
+        /**
+         * Immediately switches to a different view.
+         */
+        fullCalendar(method: 'changeView', viewName: string): void;
+
+        /**
+         * Moves the calendar one step back (either by a month, week, or day).
+         */
+        fullCalendar(method: 'prev'): void;
+
+        /**
+         * Moves the calendar one step forward (either by a month, week, or day).
+         */
+        fullCalendar(method: 'next'): void;
+
+        /**
+         * Moves the calendar back one year.
+         */
+        fullCalendar(method: 'prevYear'): void;
+
+        /**
+         * Moves the calendar forward one year.
+         */
+        fullCalendar(method: 'nextYear'): void;
+
+        /**
+         * Moves the calendar to the current date.
+         */
+        fullCalendar(method: 'today'): void;
+
+        /**
+         * Moves the calendar to an arbitrary year/month/date.
+         */
+        fullCalendar(method: 'gotoDate', year: number, month?: number, date?: number): void;
+
+        /**
+         * Moves the calendar to an arbitrary date.
+         */
+        fullCalendar(method: 'gotoDate', date: Date | string): void;
+
+        /**
+         * Moves the calendar forward/backward an arbitrary amount of time.
+         */
+        fullCalendar(method: 'incrementDate', year: number, month?: number, date?: number): void;
+
+        /**
+         * Returns a Date object for the current date of the calendar.
+         */
+        fullCalendar(method: 'getDate'): Date;
+
+        /**
+         * A method for programmatically selecting a period of time.
+         */
+        fullCalendar(method: 'select', startDate: Date, endDate: Date, allDay: boolean): void;
+
+        /**
+         * A method for programmatically clearing the current selection.
+         */
+        fullCalendar(method: 'unselect'): void;
+
+        /**
+         * Reports changes to an event and renders them on the calendar.
+         */
+        fullCalendar(method: 'updateEvent', event: EventObject): void;
+
+        /**
+         * Retrieves events that FullCalendar has in memory.
+         */
+        fullCalendar(method: 'clientEvents', idOrfilter?: any): Array<EventObject>;
+
+        /**
+         * Retrieves events that FullCalendar has in memory.
+         */
+        fullCalendar(method: 'clientEvents', idOrfilter?: (e: EventObject) => boolean): Array<EventObject>;
+
+        /**
+         * Removes events from the calendar.
+         */
+        fullCalendar(method: 'removeEvents', idOrfilter?: any): void;
+
+        /**
+         * Removes events from the calendar.
+         */
+        fullCalendar(method: 'removeEvents', idOrfilter?: (e: EventObject) => boolean): void;
+
+        /**
+         * Refetches events from all sources and rerenders them on the screen.
+         */
+        fullCalendar(method: 'refetchEvents'): void;
+
+        /**
+         * Dynamically adds an event source.
+         */
+        fullCalendar(method: 'addEventSource', source: any): void;
+
+        /**
+         * Dynamically removes an event source.
+         */
+        fullCalendar(method: 'removeEventSource', source: any): void;
+
+        /**
+         * Renders a new event on the calendar.
+         */
+        fullCalendar(method: 'renderEvent', event: EventObject, stick?: boolean): void;
+
+        /**
+         * Rerenders all events on the calendar.
+         */
+        fullCalendar(method: 'rerenderEvents'): void;
+
+        /**
+         * Create calendar object
+         */
+        fullCalendar(options: Options): JQuery;
+
+        /**
+         * Generic method function
+         */
+        fullCalendar(method: string, arg1: any, arg2: any, arg3: any): void;
+    }
+
+    interface JQueryStatic {
+        fullCalendar: Calendar;
+    }
+}
diff --git a/fullCalendar/tsconfig.json b/fullCalendar/tsconfig.json
new file mode 100644
index 0000000000..65b45ed8c1
--- /dev/null
+++ b/fullCalendar/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "fullCalendar-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fullname/fullname-tests.ts b/fullname/fullname-tests.ts
index a037f2634e..a072a4bbc4 100644
--- a/fullname/fullname-tests.ts
+++ b/fullname/fullname-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./fullname.d.ts" />
 
 import fullname = require("fullname");
 
diff --git a/fullname/fullname.d.ts b/fullname/fullname.d.ts
deleted file mode 100644
index affa09f3ab..0000000000
--- a/fullname/fullname.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for fullname v2.1.0
-// Project: https://www.npmjs.com/package/fullname
-// Definitions by: Klaus Reimer <https://github.com/kayahr/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "fullname" {
-    function fullname(): Promise<string>;
-    export = fullname;
-}
diff --git a/fullname/index.d.ts b/fullname/index.d.ts
new file mode 100644
index 0000000000..0d3fba6c4b
--- /dev/null
+++ b/fullname/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for fullname v2.1.0
+// Project: https://www.npmjs.com/package/fullname
+// Definitions by: Klaus Reimer <https://github.com/kayahr/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function fullname(): Promise<string>;
+export = fullname;
diff --git a/fullname/tsconfig.json b/fullname/tsconfig.json
new file mode 100644
index 0000000000..27a687e612
--- /dev/null
+++ b/fullname/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "fullname-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/fuse/fuse-tests.ts b/fuse/fuse-tests.ts
index 3aa5576fe7..bb6d845785 100644
--- a/fuse/fuse-tests.ts
+++ b/fuse/fuse-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="fuse.d.ts" />
+
 
 function test_fuse_find_identifiers() {
 	var books = [{
diff --git a/fuse/fuse.d.ts b/fuse/index.d.ts
similarity index 100%
rename from fuse/fuse.d.ts
rename to fuse/index.d.ts
diff --git a/fuse/tsconfig.json b/fuse/tsconfig.json
new file mode 100644
index 0000000000..7d1b758f59
--- /dev/null
+++ b/fuse/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "fuse-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gae.channel.api/gae.channel.api-tests.ts b/gae.channel.api/gae.channel.api-tests.ts
index f7931a99f2..25f53668ef 100644
--- a/gae.channel.api/gae.channel.api-tests.ts
+++ b/gae.channel.api/gae.channel.api-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gae.channel.api.d.ts" />
+
 
 function test_channel() {
 	var channel = new goog.appengine.Channel("test");
diff --git a/gae.channel.api/gae.channel.api.d.ts b/gae.channel.api/index.d.ts
similarity index 100%
rename from gae.channel.api/gae.channel.api.d.ts
rename to gae.channel.api/index.d.ts
diff --git a/gae.channel.api/tsconfig.json b/gae.channel.api/tsconfig.json
new file mode 100644
index 0000000000..f1e6eb1baf
--- /dev/null
+++ b/gae.channel.api/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gae.channel.api-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gamepad/gamepad-tests.ts b/gamepad/gamepad-tests.ts
index 6bf80458da..af3095adb0 100644
--- a/gamepad/gamepad-tests.ts
+++ b/gamepad/gamepad-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gamepad.d.ts" />
+
 
 
 ()=>{
diff --git a/gamepad/gamepad.d.ts b/gamepad/index.d.ts
similarity index 100%
rename from gamepad/gamepad.d.ts
rename to gamepad/index.d.ts
diff --git a/gamepad/tsconfig.json b/gamepad/tsconfig.json
new file mode 100644
index 0000000000..9395ad8bea
--- /dev/null
+++ b/gamepad/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gamepad-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gamequery/gamequery-tests.ts b/gamequery/gamequery-tests.ts
index 857a05a484..cfb4336ec5 100644
--- a/gamequery/gamequery-tests.ts
+++ b/gamequery/gamequery-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gamequery.d.ts" />
+
 
 //Original examples: https://github.com/onaluf/gameQuery/tree/master/tests/human
 
diff --git a/gamequery/gamequery-tests.ts.tscparams b/gamequery/gamequery-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/gamequery/gamequery-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/gamequery/gamequery.d.ts b/gamequery/gamequery.d.ts
deleted file mode 100644
index ecd4eaeeba..0000000000
--- a/gamequery/gamequery.d.ts
+++ /dev/null
@@ -1,171 +0,0 @@
-// Type definitions for gameQuery 0.7.0
-// Project: http://gamequeryjs.com/
-// Definitions by: David Laubreiter <https://github.com/Laubi/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface PlaygroundOptions{
-    height?: number;
-    width?: number;
-    refreshRate?: number;
-    keyTracker?: boolean;
-    mouseTracker?: boolean;
-    position?: string;
-    disableCollision?: boolean;
-}
-
-interface Coordinate3D{
-    x: number;
-    y: number;
-    z: number;
-}
-
-interface Size{
-    w: number;
-    h: number;
-}
-
-interface SpriteOptions{
-    animation?: any;
-    height?: number;
-    width?: number;
-    posx?: number;
-    posy?: number;
-    callback?: () => any;
-}
-
-interface GroupOptions{
-    overflow?: string;
-    height?: number;
-    width?: number;
-    posx?: number;
-    posy?: number;
-}
-
-interface TileMapOptions{
-    sizex?: number;
-    sizey?: number;
-    height?: number;
-    width?: number;
-    posx?: number;
-    posy?: number;
-    buffer?: number;
-}
-
-interface AnimationOptions{
-    imageURL: string;
-    numberOfFrame?: number;
-    delta?: number;
-    rate?: number;
-    type?: number;
-    distance?: number;
-    offsetx?: number;
-    offsety?: number;
-}
-
-interface Animation{
-    imageURL: string;
-    numberOfFrame: number;
-    delta: number;
-    rate: number;
-    type: number;
-    distance: number;
-    offsetx: number;
-    offsety: number;
-
-    new (options: AnimationOptions): Animation;
-}
-
-interface GameQuery {
-    ANIMATION_VERTICAL: number;
-    ANIMATION_HORIZONTAL: number;
-    ANIMATION_ONCE: number;
-    ANIMATION_CALLBACK: number;
-    ANIMATION_MULTI: number;
-    ANIMATION_PINGPONG: number;
-
-    Animation: Animation;
-
-    keyTracker: boolean[];
-
-    spriteCssClass: string;
-    groupCssClass: string;
-    tilemapCssClass: string;
-    tileCssClass: string;
-    tileTypePrefix: string;
-    tileIdPrefix: string;
-}
-
-interface JQuery{
-    playground(options?: PlaygroundOptions): JQuery;
-
-    collision(query?: any): JQuery;
-
-    startGame(callback?: () => void): JQuery;
-    pauseGame(): JQuery;
-    resumeGame(callback?: () => void ): JQuery;
-    
-    registerCallback(callback: () => void , rate: number): JQuery;
-    registerCallback(callback: () => number , rate: number): JQuery;
-    registerCallback(callback: () => boolean , rate: number): JQuery;
-    
-    clearScenegraph(): JQuery;
-    clearAll(clearCallbacks?: boolean): JQuery;
-
-    loadCallback(callback: (percent: number) => void ): JQuery;
-
-    rotate(angle: number, relative?: boolean): JQuery;
-    scale(ratio: number, relative?: boolean): JQuery;
-    flipv(flip?: boolean): JQuery;
-    fliph(flip?: boolean): JQuery;
-
-    xyz(x: number, y: number, z: number, relative?: boolean): JQuery;
-    xyz(): Coordinate3D;
-
-    xy(x: number, y: number, relative?: boolean): JQuery;
-    xy(): Coordinate3D;
-
-    x(value: number, relative?: boolean): JQuery;
-    x(): number;
-
-    y(value: number, relative?: boolean): JQuery;
-    y(): number;
-
-    z(value: number, relative?: boolean): JQuery;
-    z(): number;
-
-    wh(width: number, height: number, relative?: boolean): JQuery;
-    wh(): Size;
-
-    w(value: number, relative?: boolean): JQuery;
-    w(): number;
-
-    h(value: number, relative?: boolean): JQuery;
-    h(): number;
-
-    addSprite(name: string, options: SpriteOptions): JQuery;
-    addGroup(name: string, options: GroupOptions): JQuery;
-    
-    addTilemap(name: string, tileDescription: number[][], animationList : Animation[], options: TileMapOptions) : JQuery;
-    addTilemap(name: string, tileDescription: number[][], animation : Animation, options: TileMapOptions) : JQuery;
-    addTilemap(name: string, tileDescription: (i: number, j: number) => number, animationList : Animation[], options: TileMapOptions) : JQuery;
-    addTilemap(name: string, tileDescription: (i: number, j: number) => number, animation : Animation, options: TileMapOptions) : JQuery;
-
-
-    gQ: GameQuery;
-    
-    setAnimation(animation: Animation, callback?: () => any): JQuery;
-    setAnimation(animation: number, callback?: () => any): JQuery;
-    setAnimation(): JQuery;
-
-    pauseAnimation(): JQuery;
-    resumeAnimation(): JQuery;
-}
-
-interface JQueryStatic{
-    playground(): JQuery;
-    
-    gQ: GameQuery;
-    gameQuery: GameQuery;
-}
diff --git a/gamequery/index.d.ts b/gamequery/index.d.ts
new file mode 100644
index 0000000000..4d78bf23df
--- /dev/null
+++ b/gamequery/index.d.ts
@@ -0,0 +1,171 @@
+// Type definitions for gameQuery 0.7.0
+// Project: http://gamequeryjs.com/
+// Definitions by: David Laubreiter <https://github.com/Laubi/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface PlaygroundOptions{
+    height?: number;
+    width?: number;
+    refreshRate?: number;
+    keyTracker?: boolean;
+    mouseTracker?: boolean;
+    position?: string;
+    disableCollision?: boolean;
+}
+
+interface Coordinate3D{
+    x: number;
+    y: number;
+    z: number;
+}
+
+interface Size{
+    w: number;
+    h: number;
+}
+
+interface SpriteOptions{
+    animation?: any;
+    height?: number;
+    width?: number;
+    posx?: number;
+    posy?: number;
+    callback?: () => any;
+}
+
+interface GroupOptions{
+    overflow?: string;
+    height?: number;
+    width?: number;
+    posx?: number;
+    posy?: number;
+}
+
+interface TileMapOptions{
+    sizex?: number;
+    sizey?: number;
+    height?: number;
+    width?: number;
+    posx?: number;
+    posy?: number;
+    buffer?: number;
+}
+
+interface AnimationOptions{
+    imageURL: string;
+    numberOfFrame?: number;
+    delta?: number;
+    rate?: number;
+    type?: number;
+    distance?: number;
+    offsetx?: number;
+    offsety?: number;
+}
+
+interface Animation{
+    imageURL: string;
+    numberOfFrame: number;
+    delta: number;
+    rate: number;
+    type: number;
+    distance: number;
+    offsetx: number;
+    offsety: number;
+
+    new (options: AnimationOptions): Animation;
+}
+
+interface GameQuery {
+    ANIMATION_VERTICAL: number;
+    ANIMATION_HORIZONTAL: number;
+    ANIMATION_ONCE: number;
+    ANIMATION_CALLBACK: number;
+    ANIMATION_MULTI: number;
+    ANIMATION_PINGPONG: number;
+
+    Animation: Animation;
+
+    keyTracker: boolean[];
+
+    spriteCssClass: string;
+    groupCssClass: string;
+    tilemapCssClass: string;
+    tileCssClass: string;
+    tileTypePrefix: string;
+    tileIdPrefix: string;
+}
+
+interface JQuery{
+    playground(options?: PlaygroundOptions): JQuery;
+
+    collision(query?: any): JQuery;
+
+    startGame(callback?: () => void): JQuery;
+    pauseGame(): JQuery;
+    resumeGame(callback?: () => void ): JQuery;
+    
+    registerCallback(callback: () => void , rate: number): JQuery;
+    registerCallback(callback: () => number , rate: number): JQuery;
+    registerCallback(callback: () => boolean , rate: number): JQuery;
+    
+    clearScenegraph(): JQuery;
+    clearAll(clearCallbacks?: boolean): JQuery;
+
+    loadCallback(callback: (percent: number) => void ): JQuery;
+
+    rotate(angle: number, relative?: boolean): JQuery;
+    scale(ratio: number, relative?: boolean): JQuery;
+    flipv(flip?: boolean): JQuery;
+    fliph(flip?: boolean): JQuery;
+
+    xyz(x: number, y: number, z: number, relative?: boolean): JQuery;
+    xyz(): Coordinate3D;
+
+    xy(x: number, y: number, relative?: boolean): JQuery;
+    xy(): Coordinate3D;
+
+    x(value: number, relative?: boolean): JQuery;
+    x(): number;
+
+    y(value: number, relative?: boolean): JQuery;
+    y(): number;
+
+    z(value: number, relative?: boolean): JQuery;
+    z(): number;
+
+    wh(width: number, height: number, relative?: boolean): JQuery;
+    wh(): Size;
+
+    w(value: number, relative?: boolean): JQuery;
+    w(): number;
+
+    h(value: number, relative?: boolean): JQuery;
+    h(): number;
+
+    addSprite(name: string, options: SpriteOptions): JQuery;
+    addGroup(name: string, options: GroupOptions): JQuery;
+    
+    addTilemap(name: string, tileDescription: number[][], animationList : Animation[], options: TileMapOptions) : JQuery;
+    addTilemap(name: string, tileDescription: number[][], animation : Animation, options: TileMapOptions) : JQuery;
+    addTilemap(name: string, tileDescription: (i: number, j: number) => number, animationList : Animation[], options: TileMapOptions) : JQuery;
+    addTilemap(name: string, tileDescription: (i: number, j: number) => number, animation : Animation, options: TileMapOptions) : JQuery;
+
+
+    gQ: GameQuery;
+    
+    setAnimation(animation: Animation, callback?: () => any): JQuery;
+    setAnimation(animation: number, callback?: () => any): JQuery;
+    setAnimation(): JQuery;
+
+    pauseAnimation(): JQuery;
+    resumeAnimation(): JQuery;
+}
+
+interface JQueryStatic{
+    playground(): JQuery;
+    
+    gQ: GameQuery;
+    gameQuery: GameQuery;
+}
diff --git a/gamequery/tsconfig.json b/gamequery/tsconfig.json
new file mode 100644
index 0000000000..05d85736c5
--- /dev/null
+++ b/gamequery/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gamequery-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gandi-livedns/gandi-livedns-tests.ts b/gandi-livedns/gandi-livedns-tests.ts
index 882f60a64b..e5a2c532f1 100644
--- a/gandi-livedns/gandi-livedns-tests.ts
+++ b/gandi-livedns/gandi-livedns-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gandi-livedns.d.ts" />
+
 
 let zone: ZoneRecord  = {
     rrset_name: "MyZone",
diff --git a/gandi-livedns/gandi-livedns.d.ts b/gandi-livedns/index.d.ts
similarity index 100%
rename from gandi-livedns/gandi-livedns.d.ts
rename to gandi-livedns/index.d.ts
diff --git a/gandi-livedns/tsconfig.json b/gandi-livedns/tsconfig.json
new file mode 100644
index 0000000000..0312289af2
--- /dev/null
+++ b/gandi-livedns/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gandi-livedns-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gapi.auth2/gapi.auth2-tests.ts b/gapi.auth2/gapi.auth2-tests.ts
index 5db036652c..a3ba839a36 100644
--- a/gapi.auth2/gapi.auth2-tests.ts
+++ b/gapi.auth2/gapi.auth2-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gapi.auth2.d.ts" />
+
 
 function test_init(){
   var auth = gapi.auth2.init({
diff --git a/gapi.auth2/gapi.auth2.d.ts b/gapi.auth2/gapi.auth2.d.ts
deleted file mode 100644
index 9b23a34874..0000000000
--- a/gapi.auth2/gapi.auth2.d.ts
+++ /dev/null
@@ -1,284 +0,0 @@
-// Type definitions for Google Sign-In API
-// Project: https://developers.google.com/identity/sign-in/web/
-// Definitions by: Derek Lawless <https://github.com/flawless2011>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../gapi/gapi.d.ts" />
-
-declare namespace gapi.auth2 {
-
-  /**
-   * GoogleAuth is a singleton class that provides methods to allow the user to sign in with a Google account,
-   * get the user's current sign-in status, get specific data from the user's Google profile,
-   * request additional scopes, and sign out from the current account.
-   */
-  export class GoogleAuth {
-    isSignedIn: IsSignedIn;
-
-    currentUser: CurrentUser;
-
-    /**
-     * Calls the onInit function when the GoogleAuth object is fully initialized, or calls the onFailure function if
-     * initialization fails.
-     */
-    then(onInit: () => any, onFailure: (reason: string) => any): any;
-
-    /**
-     * Signs in the user with the options specified to gapi.auth2.init().
-     */
-    signIn(): any;
-
-    /**
-     * Signs in the user using the specified options.
-     */
-    signIn(options?: {
-      app_package_name?: string;
-      fetch_basic_profile?: boolean;
-      prompt?: boolean;
-      scope?: string;
-    }, optionBuilder?: SigninOptionsBuilder): any;
-
-    /**
-     * Signs out all accounts from the application.
-     */
-    signOut(): any;
-
-    /**
-     * Revokes all of the scopes that the user granted.
-     */
-    disconnect(): any;
-
-    /**
-     * Get permission from the user to access the specified scopes offline.
-     */
-    grantOfflineAccess(options: {
-      scope?: string;
-      redirect_uri?: string;
-    }): any;
-
-    /**
-     * Attaches the sign-in flow to the specified container's click handler.
-     */
-    attachClickHandler(container: any, options: {
-      app_package_name?: string;
-      fetch_basic_profile?: boolean;
-      prompt?: boolean;
-      scope?: string;
-    }, onsuccess: () => any, onfailure: (reason: string) => any): any;
-  }
-
-  export interface IsSignedIn{
-    /**
-     * Returns whether the current user is currently signed in.
-     */
-    get(): boolean;
-
-    /**
-     * Listen for changes in the current user's sign-in state.
-     */
-    listen(listener: (signedIn: boolean) => any): void;
-  }
-
-  export interface CurrentUser {
-    /**
-     * Returns a GoogleUser object that represents the current user. Note that in a newly-initialized
-     * GoogleAuth instance, the current user has not been set. Use the currentUser.listen() method or the
-     * GoogleAuth.then() to get an initialized GoogleAuth instance.
-     */
-    get(): GoogleUser;
-
-    /**
-     * Listen for changes in currentUser.
-     */
-    listen(listener: (user: GoogleUser) => any): void;
-  }
-
-  export class SigninOptionsBuilder {
-    setAppPackageName(name: string): any;
-    setFetchBasicProfile(fetch: boolean): any;
-    setPrompt(prompt: string): any;
-    setScope(scope: string): any;
-  }
-
-  export interface BasicProfile {
-    getId(): string;
-    getName(): string;
-    getImageUrl(): string;
-    getEmail(): string;
-  }
-
-  export interface AuthResponse {
-    access_token: string;
-    id_token: string;
-    login_hint: string;
-    scope: string;
-    expires_in: string;
-    first_issued_at: string;
-    expires_at: string;
-  }
-
-  /**
-   * A GoogleUser object represents one user account.
-   */
-  export interface GoogleUser {
-    /**
-     * Get the user's unique ID string.
-     */
-    getId(): string;
-
-    /**
-     * Returns true if the user is signed in.
-     */
-    isSignedIn(): boolean;
-
-    /**
-     * Get the user's Google Apps domain if the user signed in with a Google Apps account.
-     */
-    getHostedDomain(): string;
-
-    /**
-     * Get the scopes that the user granted as a space-delimited string.
-     */
-    getGrantedScopes(): string;
-
-    /**
-     * Get the user's basic profile information.
-     */
-    getBasicProfile(): BasicProfile;
-
-    /**
-     * Get the response object from the user's auth session.
-     */
-    getAuthResponse(): AuthResponse;
-
-    /**
-     * Returns true if the user granted the specified scopes.
-     */
-    hasGrantedScopes(scopes: string): boolean;
-
-    /**
-     * Signs in the user. Use this method to request additional scopes for incremental
-     * authorization or to sign in a user after the user has signed out.
-     * When you use GoogleUser.signIn(), the sign-in flow skips the account chooser step.
-     * See GoogleAuth.signIn().
-     */
-    signIn(options?: {
-      app_package_name?: string;
-      fetch_basic_profile?: boolean;
-      prompt?: boolean;
-      scope?: string;
-    }, optionBuilder?: SigninOptionsBuilder): any;
-
-    /**
-     *
-     */
-    grant(options?: {
-      app_package_name?: string;
-      fetch_basic_profile?: boolean;
-      prompt?: boolean;
-      scope?: string;
-    }, optionBuilder?: SigninOptionsBuilder): any;
-
-    /**
-     * Get permission from the user to access the specified scopes offline.
-     * When you use GoogleUser.grantOfflineAccess(), the sign-in flow skips the account chooser step.
-     * See GoogleUser.grantOfflineAccess().
-     */
-    grantOfflineAccess(scopes: string): void;
-
-    /**
-     * Revokes all of the scopes that the user granted.
-     */
-    disconnect(): void;
-  }
-
-
-  export function init(params: {
-      /**
-       * The app's client ID, found and created in the Google Developers Console.
-       */
-      client_id?: string;
-
-      /**
-       * The domains for which to create sign-in cookies. Either a URI, single_host_origin, or none.
-       * Defaults to single_host_origin if unspecified.
-       */
-      cookie_policy?: string;
-
-      /**
-       * The scopes to request, as a space-delimited string. Optional if fetch_basic_profile is not set to false.
-       */
-      scope?: string;
-
-      /**
-       * Fetch users' basic profile information when they sign in. Adds 'profile' and 'email' to the requested scopes. True if unspecified.
-       */
-      fetch_basic_profile?: boolean;
-
-      /**
-       * The Google Apps domain to which users must belong to sign in. This is susceptible to modification by clients,
-       * so be sure to verify the hosted domain property of the returned user. Use GoogleUser.getHostedDomain() on the client,
-       * and the hd claim in the ID Token on the server to verify the domain is what you expected.
-       */
-      hosted_domain?: string;
-
-      /**
-       * Used only for OpenID 2.0 client migration. Set to the value of the realm that you are currently using for OpenID 2.0,
-       * as described in <a href="https://developers.google.com/accounts/docs/OpenID#openid-connect">OpenID 2.0 (Migration)</a>.
-       */
-      openid_realm?: string;
-  }): GoogleAuth;
-
-  /**
-   * Returns the GoogleAuth object. You must initialize the GoogleAuth object with gapi.auth2.init() before calling this method.
-   */
-  export function getAuthInstance(): GoogleAuth;
-}
-
-declare namespace gapi.signin2 {
-
-  export function render(id: any, options: {
-    /**
-     * The auth scope or scopes to authorize. Auth scopes for individual APIs can be found in their documentation.
-     */
-    scope?: string;
-
-    /**
-     * The width of the button in pixels (default: 120).
-     */
-    width?: number;
-
-    /**
-     * The height of the button in pixels (default: 36).
-     */
-    height?: number;
-
-    /**
-     * Display long labels such as "Sign in with Google" rather than "Sign in" (default: false).
-     */
-    longtitle?: boolean;
-
-    /**
-     * The color theme of the button: either light or dark (default: light).
-     */
-    theme?: string;
-
-    /**
-     * The callback function to call when a user successfully signs in.
-     * This function must take one argument: an instance of gapi.auth2.GoogleUser (default: none).
-     */
-    onsuccess?: any;
-
-    /**
-     * The callback function to call when sign-in fails. This function takes no arguments (default: none).
-     */
-    onfailure?: any;
-
-    /**
-     * The package name of the Android app to install over the air. See
-     * <a href="https://developers.google.com/identity/sign-in/web/android-app-installs">Android app installs from your web site</a>.
-     * Optional. (default: none)
-     */
-    app_package_name?: string;
-  }): void;
-}
diff --git a/gapi.auth2/index.d.ts b/gapi.auth2/index.d.ts
new file mode 100644
index 0000000000..0c4206c5e0
--- /dev/null
+++ b/gapi.auth2/index.d.ts
@@ -0,0 +1,284 @@
+// Type definitions for Google Sign-In API
+// Project: https://developers.google.com/identity/sign-in/web/
+// Definitions by: Derek Lawless <https://github.com/flawless2011>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="gapi" />
+
+declare namespace gapi.auth2 {
+
+  /**
+   * GoogleAuth is a singleton class that provides methods to allow the user to sign in with a Google account,
+   * get the user's current sign-in status, get specific data from the user's Google profile,
+   * request additional scopes, and sign out from the current account.
+   */
+  export class GoogleAuth {
+    isSignedIn: IsSignedIn;
+
+    currentUser: CurrentUser;
+
+    /**
+     * Calls the onInit function when the GoogleAuth object is fully initialized, or calls the onFailure function if
+     * initialization fails.
+     */
+    then(onInit: () => any, onFailure: (reason: string) => any): any;
+
+    /**
+     * Signs in the user with the options specified to gapi.auth2.init().
+     */
+    signIn(): any;
+
+    /**
+     * Signs in the user using the specified options.
+     */
+    signIn(options?: {
+      app_package_name?: string;
+      fetch_basic_profile?: boolean;
+      prompt?: boolean;
+      scope?: string;
+    }, optionBuilder?: SigninOptionsBuilder): any;
+
+    /**
+     * Signs out all accounts from the application.
+     */
+    signOut(): any;
+
+    /**
+     * Revokes all of the scopes that the user granted.
+     */
+    disconnect(): any;
+
+    /**
+     * Get permission from the user to access the specified scopes offline.
+     */
+    grantOfflineAccess(options: {
+      scope?: string;
+      redirect_uri?: string;
+    }): any;
+
+    /**
+     * Attaches the sign-in flow to the specified container's click handler.
+     */
+    attachClickHandler(container: any, options: {
+      app_package_name?: string;
+      fetch_basic_profile?: boolean;
+      prompt?: boolean;
+      scope?: string;
+    }, onsuccess: () => any, onfailure: (reason: string) => any): any;
+  }
+
+  export interface IsSignedIn{
+    /**
+     * Returns whether the current user is currently signed in.
+     */
+    get(): boolean;
+
+    /**
+     * Listen for changes in the current user's sign-in state.
+     */
+    listen(listener: (signedIn: boolean) => any): void;
+  }
+
+  export interface CurrentUser {
+    /**
+     * Returns a GoogleUser object that represents the current user. Note that in a newly-initialized
+     * GoogleAuth instance, the current user has not been set. Use the currentUser.listen() method or the
+     * GoogleAuth.then() to get an initialized GoogleAuth instance.
+     */
+    get(): GoogleUser;
+
+    /**
+     * Listen for changes in currentUser.
+     */
+    listen(listener: (user: GoogleUser) => any): void;
+  }
+
+  export class SigninOptionsBuilder {
+    setAppPackageName(name: string): any;
+    setFetchBasicProfile(fetch: boolean): any;
+    setPrompt(prompt: string): any;
+    setScope(scope: string): any;
+  }
+
+  export interface BasicProfile {
+    getId(): string;
+    getName(): string;
+    getImageUrl(): string;
+    getEmail(): string;
+  }
+
+  export interface AuthResponse {
+    access_token: string;
+    id_token: string;
+    login_hint: string;
+    scope: string;
+    expires_in: string;
+    first_issued_at: string;
+    expires_at: string;
+  }
+
+  /**
+   * A GoogleUser object represents one user account.
+   */
+  export interface GoogleUser {
+    /**
+     * Get the user's unique ID string.
+     */
+    getId(): string;
+
+    /**
+     * Returns true if the user is signed in.
+     */
+    isSignedIn(): boolean;
+
+    /**
+     * Get the user's Google Apps domain if the user signed in with a Google Apps account.
+     */
+    getHostedDomain(): string;
+
+    /**
+     * Get the scopes that the user granted as a space-delimited string.
+     */
+    getGrantedScopes(): string;
+
+    /**
+     * Get the user's basic profile information.
+     */
+    getBasicProfile(): BasicProfile;
+
+    /**
+     * Get the response object from the user's auth session.
+     */
+    getAuthResponse(): AuthResponse;
+
+    /**
+     * Returns true if the user granted the specified scopes.
+     */
+    hasGrantedScopes(scopes: string): boolean;
+
+    /**
+     * Signs in the user. Use this method to request additional scopes for incremental
+     * authorization or to sign in a user after the user has signed out.
+     * When you use GoogleUser.signIn(), the sign-in flow skips the account chooser step.
+     * See GoogleAuth.signIn().
+     */
+    signIn(options?: {
+      app_package_name?: string;
+      fetch_basic_profile?: boolean;
+      prompt?: boolean;
+      scope?: string;
+    }, optionBuilder?: SigninOptionsBuilder): any;
+
+    /**
+     *
+     */
+    grant(options?: {
+      app_package_name?: string;
+      fetch_basic_profile?: boolean;
+      prompt?: boolean;
+      scope?: string;
+    }, optionBuilder?: SigninOptionsBuilder): any;
+
+    /**
+     * Get permission from the user to access the specified scopes offline.
+     * When you use GoogleUser.grantOfflineAccess(), the sign-in flow skips the account chooser step.
+     * See GoogleUser.grantOfflineAccess().
+     */
+    grantOfflineAccess(scopes: string): void;
+
+    /**
+     * Revokes all of the scopes that the user granted.
+     */
+    disconnect(): void;
+  }
+
+
+  export function init(params: {
+      /**
+       * The app's client ID, found and created in the Google Developers Console.
+       */
+      client_id?: string;
+
+      /**
+       * The domains for which to create sign-in cookies. Either a URI, single_host_origin, or none.
+       * Defaults to single_host_origin if unspecified.
+       */
+      cookie_policy?: string;
+
+      /**
+       * The scopes to request, as a space-delimited string. Optional if fetch_basic_profile is not set to false.
+       */
+      scope?: string;
+
+      /**
+       * Fetch users' basic profile information when they sign in. Adds 'profile' and 'email' to the requested scopes. True if unspecified.
+       */
+      fetch_basic_profile?: boolean;
+
+      /**
+       * The Google Apps domain to which users must belong to sign in. This is susceptible to modification by clients,
+       * so be sure to verify the hosted domain property of the returned user. Use GoogleUser.getHostedDomain() on the client,
+       * and the hd claim in the ID Token on the server to verify the domain is what you expected.
+       */
+      hosted_domain?: string;
+
+      /**
+       * Used only for OpenID 2.0 client migration. Set to the value of the realm that you are currently using for OpenID 2.0,
+       * as described in <a href="https://developers.google.com/accounts/docs/OpenID#openid-connect">OpenID 2.0 (Migration)</a>.
+       */
+      openid_realm?: string;
+  }): GoogleAuth;
+
+  /**
+   * Returns the GoogleAuth object. You must initialize the GoogleAuth object with gapi.auth2.init() before calling this method.
+   */
+  export function getAuthInstance(): GoogleAuth;
+}
+
+declare namespace gapi.signin2 {
+
+  export function render(id: any, options: {
+    /**
+     * The auth scope or scopes to authorize. Auth scopes for individual APIs can be found in their documentation.
+     */
+    scope?: string;
+
+    /**
+     * The width of the button in pixels (default: 120).
+     */
+    width?: number;
+
+    /**
+     * The height of the button in pixels (default: 36).
+     */
+    height?: number;
+
+    /**
+     * Display long labels such as "Sign in with Google" rather than "Sign in" (default: false).
+     */
+    longtitle?: boolean;
+
+    /**
+     * The color theme of the button: either light or dark (default: light).
+     */
+    theme?: string;
+
+    /**
+     * The callback function to call when a user successfully signs in.
+     * This function must take one argument: an instance of gapi.auth2.GoogleUser (default: none).
+     */
+    onsuccess?: any;
+
+    /**
+     * The callback function to call when sign-in fails. This function takes no arguments (default: none).
+     */
+    onfailure?: any;
+
+    /**
+     * The package name of the Android app to install over the air. See
+     * <a href="https://developers.google.com/identity/sign-in/web/android-app-installs">Android app installs from your web site</a>.
+     * Optional. (default: none)
+     */
+    app_package_name?: string;
+  }): void;
+}
diff --git a/gapi.auth2/tsconfig.json b/gapi.auth2/tsconfig.json
new file mode 100644
index 0000000000..f1fede065e
--- /dev/null
+++ b/gapi.auth2/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gapi.auth2-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gapi.pagespeedonline/gapi.pagespeedonline.d.ts b/gapi.pagespeedonline/gapi.pagespeedonline.d.ts
deleted file mode 100644
index e75b0eb3bd..0000000000
--- a/gapi.pagespeedonline/gapi.pagespeedonline.d.ts
+++ /dev/null
@@ -1,279 +0,0 @@
-// Type definitions for Google Page Speed Online Api
-// Project: https://developers.google.com/speed/pagespeed/
-// Definitions by: Frank M <https://github.com/sgtfrankieboy>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../gapi/gapi.d.ts" />
-
-declare namespace gapi.client.pagespeedonline {
-
-    export interface pagespeedapi {
-
-        /**
-         * Runs Page Speed analysis on the page at the specified URL, and returns a Page Speed score, a list of suggestions to make that page faster, and other information.
-         */
-        runpagespeed(object: {
-            /**
-             * The URL of the page for which the PageSpeed Insights API should generate results.
-             */
-            url: string;
-            /**
-             * The locale that results should be generated in.
-             */
-            locale?: string;
-            /**
-             * The PageSpeed rules to run. Can be specified multiple times
-             */
-            rule?: string[];
-            /**
-             * Indicates if binary data containing a screenshot should be included
-             */
-            screenshot?: boolean;
-            /**
-             * The strategy to use when analyzing the page. Valid values are desktop and mobile.
-             */
-            stategy?: string;
-            /**
-             * Selector specifying which fields to include in a partial response.
-             */
-            fields?: string;
-        }): HttpRequest<GoogleApiPageSpeedOnlineResource>;
-    }
-
-}
-
-interface GoogleApiPageSpeedOnlineResource {
-    /**
-     * Kind of result.
-     */
-    kind: string;
-    /**
-     * Canonicalized and final URL for the document, after following page redirects (if any).
-     */
-    id: string;
-    /**
-     * Response code for the document. 200 indicates a normal page load. 4xx/5xx indicates an error.
-     */
-    responseCode: number;
-    /**
-     * Title of the page, as displayed in the browser's title bar.
-     */
-    title: string;
-    /**
-     * The PageSpeed Score (0-100), which indicates how much faster a page could be. A high score indicates little room for improvement, while a lower score indicates more room for improvement.
-     */
-    score: number;
-    /**
-     * Summary statistics for the page, such as number of JavaScript bytes, number of HTML bytes, etc.
-     */
-    pageStats:
-    {
-        /**
-         * Number of HTTP resources loaded by the page.
-         */
-        numberResources: number;
-        /**
-         * Number of unique hosts referenced by the page.
-         */
-        numberHosts: number;
-        /**
-         * Total size of all request bytes sent by the page.
-         */
-        totalRequestBytes: string;
-        /**
-         * Number of static (that is, cacheable) resources on the page.
-         */
-        numberStaticResources: number;
-        /**
-         * Number of uncompressed response bytes for the main HTML document and all iframes on the page.
-         */
-        htmlResponseBytes: string;
-        /**
-         * Number of uncompressed response bytes for text resources on the page that aren't covered by other statistics; that is, non-HTML, non-script, non-CSS resources.
-         */
-        textResponseBytes: string;
-        /**
-         * Number of uncompressed response bytes for CSS resources on the page.
-         */
-        cssResponsebytes: string;
-        /**
-         * Number of response bytes for image resources on the page.
-         */
-        imageResponseBytes: string;
-        /**
-         * Number of uncompressed response bytes for JS resources on the page.
-         */
-        javascriptResponsebytes: string;
-        /**
-         * Number of response bytes for Flash resources on the page.
-         */
-        flashResponseBytes: string;
-        /**
-         * Number of response bytes for other resources on the page.
-         */
-        otherResponsebytes: string;
-        /**
-         * Number of JavaScript resources referenced by the page.
-         */
-        numberJsResources: number;
-        /**
-         * Number of CSS resources referenced by the page.
-         */
-        numberCssResources: number;
-    }
-    /**
-     * Localized PageSpeed results. Contains a ruleResults entry for each PageSpeed rule instantiated and run by the server.
-     */
-    formattedResults: {
-        /**
-         * The locale of the formattedResults, such as en_US.
-         */
-        locale: string;
-        /**
-         * Dictionary of formatted rule results, with one entry for each PageSpeed rule instantiated and run by the server.
-         */
-        ruleResults: {
-            AvoidBadRequests: GoogleApiPageSpeedOnlineRuleResource;
-            AvoidCharsetInMetaTag: GoogleApiPageSpeedOnlineRuleResource;
-            AvoidCssImport: GoogleApiPageSpeedOnlineRuleResource;
-            AvoidLandingPageRedirects: GoogleApiPageSpeedOnlineRuleResource;
-            AvoidLongRunningScripts: GoogleApiPageSpeedOnlineRuleResource;
-            DeferParsingJavaScript: GoogleApiPageSpeedOnlineRuleResource;
-            EnableGzipCompression: GoogleApiPageSpeedOnlineRuleResource;
-            InlineSmallCss: GoogleApiPageSpeedOnlineRuleResource;
-            InlineSmallJavaScript: GoogleApiPageSpeedOnlineRuleResource;
-            LeverageBrowserCaching: GoogleApiPageSpeedOnlineRuleResource;
-            MinifyCss: GoogleApiPageSpeedOnlineRuleResource;
-            MinifyHTML: GoogleApiPageSpeedOnlineRuleResource;
-            MinifyJavaScript: GoogleApiPageSpeedOnlineRuleResource;
-            MinimizeRedirects: GoogleApiPageSpeedOnlineRuleResource;
-            MinimizeRequestSize: GoogleApiPageSpeedOnlineRuleResource;
-            OptimizeImages: GoogleApiPageSpeedOnlineRuleResource;
-            OptimizeTheOrderOfStylesAndScripts: GoogleApiPageSpeedOnlineRuleResource;
-            PreferAsyncResources: GoogleApiPageSpeedOnlineRuleResource;
-            PutCssInTheDocumentHead: GoogleApiPageSpeedOnlineRuleResource;
-            RemoveQueryStringsFromStaticResources: GoogleApiPageSpeedOnlineRuleResource;
-            ServerResourcesFromAConsistentUrl: GoogleApiPageSpeedOnlineRuleResource;
-            ServerScaledImages: GoogleApiPageSpeedOnlineRuleResource;
-            ServeResponseTime: GoogleApiPageSpeedOnlineRuleResource;
-            SpecifyACacheValidator: GoogleApiPageSpeedOnlineRuleResource;
-            SpecifyAVaryAcceptEncodingHeader: GoogleApiPageSpeedOnlineRuleResource;
-            SpecifyCharsetEarly: GoogleApiPageSpeedOnlineRuleResource;
-            SpecifyImageDimensions: GoogleApiPageSpeedOnlineRuleResource;
-            SpriteImages: GoogleApiPageSpeedOnlineRuleResource;
-        }
-    }
-    /**
-     * The version of the PageSpeed SDK used to generate these results.
-     */
-    version: {
-        /**
-         * The major version number of the PageSpeed SDK used to generate these results.
-         */
-        major: number;
-        /**
-         * The minor version number of the PageSpeed SDK used to generate these results.
-         */
-        minor: number;
-    }
-    /**
-     * List of rules that were specified in the request, but which the server did not know how to instantiate.
-     */
-    invalidRules: string[];
-}
-
-interface GoogleApiPageSpeedOnlineRuleResource {
-    /**
-     * Localized name of the rule, intended for presentation to a user.
-     */
-    localizedRuleName: string;
-    /**
-     * The score (0-100) for this rule. The rule score indicates how well a page implements the recommendations for the given rule.
-     */
-    ruleScore: number;
-    /**
-     * The impact (unbounded floating point value) that implementing the suggestions for this rule would have on making the page faster.
-     */
-    ruleImpact: number;
-    /**
-     * List of blocks of URLs. Each block may contain a heading and a list of URLs. Each URL may optionally include additional details.
-     */
-    urlBlocks: {
-        /**
-         * Heading to be displayed with the list of URLs.
-         */
-        header: {
-            /**
-             * A localized format string with $N placeholders, where N is the 1-indexed argument number.
-             */
-            format: string;
-            /**
-             * List of arguments for the format string.
-             */
-            args: {
-                /**
-                 * Type of argument. One of URL, STRING_LITERAL, INT_LITERAL, BYTES, or DURATION.
-                 */
-                type: string;
-                /**
-                 * Argument value, as a localized string.
-                 */
-                value: string;
-            }[];
-        }
-        /**
-         * List of entries that provide information about URLs in the URL block. Optional.
-         */
-        urls: {
-            /**
-             * A format string that gives information about the URL, and a list of arguments for that format string.
-             */
-            result: {
-                /**
-                 * A localized format string with $N placeholders, where N is the 1-indexed argument number. For example: 'Minifying the resource at URL $1 can save $2 bytes'.
-                 */
-                format: string;
-                /**
-                 * List of arguments for the format string.
-                 */
-                args: {
-                    /**
-                     * Type of argument. One of URL, STRING_LITERAL, INT_LITERAL, BYTES, or DURATION.
-                     */
-                    type: string;
-                    /**
-                     * Argument value, as a localized string.
-                     */
-                    value: string;
-                }[];
-            }
-            /**
-             * List of entries that provide additional details about a single URL. Optional.
-             */
-            details: {
-                /**
-                 * A localized format string with $N placeholders, where N is the 1-indexed argument number.
-                 */
-                format: string;
-                /**
-                 * List of arguments for the format string.
-                 */
-                args: {
-                    /**
-                     * Type of argument. One of URL, STRING_LITERAL, INT_LITERAL, BYTES, or DURATION.
-                     */
-                    type: string;
-                    /**
-                     * Argument value, as a localized string.
-                     */
-                    value: string;
-                }[];
-            }[];
-        }[];
-    }[];
-}
-
-
-                    /**
-                     *
-                     */
diff --git a/gapi.pagespeedonline/index.d.ts b/gapi.pagespeedonline/index.d.ts
new file mode 100644
index 0000000000..2da0bdca15
--- /dev/null
+++ b/gapi.pagespeedonline/index.d.ts
@@ -0,0 +1,279 @@
+// Type definitions for Google Page Speed Online Api
+// Project: https://developers.google.com/speed/pagespeed/
+// Definitions by: Frank M <https://github.com/sgtfrankieboy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="gapi" />
+
+declare namespace gapi.client.pagespeedonline {
+
+    export interface pagespeedapi {
+
+        /**
+         * Runs Page Speed analysis on the page at the specified URL, and returns a Page Speed score, a list of suggestions to make that page faster, and other information.
+         */
+        runpagespeed(object: {
+            /**
+             * The URL of the page for which the PageSpeed Insights API should generate results.
+             */
+            url: string;
+            /**
+             * The locale that results should be generated in.
+             */
+            locale?: string;
+            /**
+             * The PageSpeed rules to run. Can be specified multiple times
+             */
+            rule?: string[];
+            /**
+             * Indicates if binary data containing a screenshot should be included
+             */
+            screenshot?: boolean;
+            /**
+             * The strategy to use when analyzing the page. Valid values are desktop and mobile.
+             */
+            stategy?: string;
+            /**
+             * Selector specifying which fields to include in a partial response.
+             */
+            fields?: string;
+        }): HttpRequest<GoogleApiPageSpeedOnlineResource>;
+    }
+
+}
+
+interface GoogleApiPageSpeedOnlineResource {
+    /**
+     * Kind of result.
+     */
+    kind: string;
+    /**
+     * Canonicalized and final URL for the document, after following page redirects (if any).
+     */
+    id: string;
+    /**
+     * Response code for the document. 200 indicates a normal page load. 4xx/5xx indicates an error.
+     */
+    responseCode: number;
+    /**
+     * Title of the page, as displayed in the browser's title bar.
+     */
+    title: string;
+    /**
+     * The PageSpeed Score (0-100), which indicates how much faster a page could be. A high score indicates little room for improvement, while a lower score indicates more room for improvement.
+     */
+    score: number;
+    /**
+     * Summary statistics for the page, such as number of JavaScript bytes, number of HTML bytes, etc.
+     */
+    pageStats:
+    {
+        /**
+         * Number of HTTP resources loaded by the page.
+         */
+        numberResources: number;
+        /**
+         * Number of unique hosts referenced by the page.
+         */
+        numberHosts: number;
+        /**
+         * Total size of all request bytes sent by the page.
+         */
+        totalRequestBytes: string;
+        /**
+         * Number of static (that is, cacheable) resources on the page.
+         */
+        numberStaticResources: number;
+        /**
+         * Number of uncompressed response bytes for the main HTML document and all iframes on the page.
+         */
+        htmlResponseBytes: string;
+        /**
+         * Number of uncompressed response bytes for text resources on the page that aren't covered by other statistics; that is, non-HTML, non-script, non-CSS resources.
+         */
+        textResponseBytes: string;
+        /**
+         * Number of uncompressed response bytes for CSS resources on the page.
+         */
+        cssResponsebytes: string;
+        /**
+         * Number of response bytes for image resources on the page.
+         */
+        imageResponseBytes: string;
+        /**
+         * Number of uncompressed response bytes for JS resources on the page.
+         */
+        javascriptResponsebytes: string;
+        /**
+         * Number of response bytes for Flash resources on the page.
+         */
+        flashResponseBytes: string;
+        /**
+         * Number of response bytes for other resources on the page.
+         */
+        otherResponsebytes: string;
+        /**
+         * Number of JavaScript resources referenced by the page.
+         */
+        numberJsResources: number;
+        /**
+         * Number of CSS resources referenced by the page.
+         */
+        numberCssResources: number;
+    }
+    /**
+     * Localized PageSpeed results. Contains a ruleResults entry for each PageSpeed rule instantiated and run by the server.
+     */
+    formattedResults: {
+        /**
+         * The locale of the formattedResults, such as en_US.
+         */
+        locale: string;
+        /**
+         * Dictionary of formatted rule results, with one entry for each PageSpeed rule instantiated and run by the server.
+         */
+        ruleResults: {
+            AvoidBadRequests: GoogleApiPageSpeedOnlineRuleResource;
+            AvoidCharsetInMetaTag: GoogleApiPageSpeedOnlineRuleResource;
+            AvoidCssImport: GoogleApiPageSpeedOnlineRuleResource;
+            AvoidLandingPageRedirects: GoogleApiPageSpeedOnlineRuleResource;
+            AvoidLongRunningScripts: GoogleApiPageSpeedOnlineRuleResource;
+            DeferParsingJavaScript: GoogleApiPageSpeedOnlineRuleResource;
+            EnableGzipCompression: GoogleApiPageSpeedOnlineRuleResource;
+            InlineSmallCss: GoogleApiPageSpeedOnlineRuleResource;
+            InlineSmallJavaScript: GoogleApiPageSpeedOnlineRuleResource;
+            LeverageBrowserCaching: GoogleApiPageSpeedOnlineRuleResource;
+            MinifyCss: GoogleApiPageSpeedOnlineRuleResource;
+            MinifyHTML: GoogleApiPageSpeedOnlineRuleResource;
+            MinifyJavaScript: GoogleApiPageSpeedOnlineRuleResource;
+            MinimizeRedirects: GoogleApiPageSpeedOnlineRuleResource;
+            MinimizeRequestSize: GoogleApiPageSpeedOnlineRuleResource;
+            OptimizeImages: GoogleApiPageSpeedOnlineRuleResource;
+            OptimizeTheOrderOfStylesAndScripts: GoogleApiPageSpeedOnlineRuleResource;
+            PreferAsyncResources: GoogleApiPageSpeedOnlineRuleResource;
+            PutCssInTheDocumentHead: GoogleApiPageSpeedOnlineRuleResource;
+            RemoveQueryStringsFromStaticResources: GoogleApiPageSpeedOnlineRuleResource;
+            ServerResourcesFromAConsistentUrl: GoogleApiPageSpeedOnlineRuleResource;
+            ServerScaledImages: GoogleApiPageSpeedOnlineRuleResource;
+            ServeResponseTime: GoogleApiPageSpeedOnlineRuleResource;
+            SpecifyACacheValidator: GoogleApiPageSpeedOnlineRuleResource;
+            SpecifyAVaryAcceptEncodingHeader: GoogleApiPageSpeedOnlineRuleResource;
+            SpecifyCharsetEarly: GoogleApiPageSpeedOnlineRuleResource;
+            SpecifyImageDimensions: GoogleApiPageSpeedOnlineRuleResource;
+            SpriteImages: GoogleApiPageSpeedOnlineRuleResource;
+        }
+    }
+    /**
+     * The version of the PageSpeed SDK used to generate these results.
+     */
+    version: {
+        /**
+         * The major version number of the PageSpeed SDK used to generate these results.
+         */
+        major: number;
+        /**
+         * The minor version number of the PageSpeed SDK used to generate these results.
+         */
+        minor: number;
+    }
+    /**
+     * List of rules that were specified in the request, but which the server did not know how to instantiate.
+     */
+    invalidRules: string[];
+}
+
+interface GoogleApiPageSpeedOnlineRuleResource {
+    /**
+     * Localized name of the rule, intended for presentation to a user.
+     */
+    localizedRuleName: string;
+    /**
+     * The score (0-100) for this rule. The rule score indicates how well a page implements the recommendations for the given rule.
+     */
+    ruleScore: number;
+    /**
+     * The impact (unbounded floating point value) that implementing the suggestions for this rule would have on making the page faster.
+     */
+    ruleImpact: number;
+    /**
+     * List of blocks of URLs. Each block may contain a heading and a list of URLs. Each URL may optionally include additional details.
+     */
+    urlBlocks: {
+        /**
+         * Heading to be displayed with the list of URLs.
+         */
+        header: {
+            /**
+             * A localized format string with $N placeholders, where N is the 1-indexed argument number.
+             */
+            format: string;
+            /**
+             * List of arguments for the format string.
+             */
+            args: {
+                /**
+                 * Type of argument. One of URL, STRING_LITERAL, INT_LITERAL, BYTES, or DURATION.
+                 */
+                type: string;
+                /**
+                 * Argument value, as a localized string.
+                 */
+                value: string;
+            }[];
+        }
+        /**
+         * List of entries that provide information about URLs in the URL block. Optional.
+         */
+        urls: {
+            /**
+             * A format string that gives information about the URL, and a list of arguments for that format string.
+             */
+            result: {
+                /**
+                 * A localized format string with $N placeholders, where N is the 1-indexed argument number. For example: 'Minifying the resource at URL $1 can save $2 bytes'.
+                 */
+                format: string;
+                /**
+                 * List of arguments for the format string.
+                 */
+                args: {
+                    /**
+                     * Type of argument. One of URL, STRING_LITERAL, INT_LITERAL, BYTES, or DURATION.
+                     */
+                    type: string;
+                    /**
+                     * Argument value, as a localized string.
+                     */
+                    value: string;
+                }[];
+            }
+            /**
+             * List of entries that provide additional details about a single URL. Optional.
+             */
+            details: {
+                /**
+                 * A localized format string with $N placeholders, where N is the 1-indexed argument number.
+                 */
+                format: string;
+                /**
+                 * List of arguments for the format string.
+                 */
+                args: {
+                    /**
+                     * Type of argument. One of URL, STRING_LITERAL, INT_LITERAL, BYTES, or DURATION.
+                     */
+                    type: string;
+                    /**
+                     * Argument value, as a localized string.
+                     */
+                    value: string;
+                }[];
+            }[];
+        }[];
+    }[];
+}
+
+
+                    /**
+                     *
+                     */
diff --git a/gapi.pagespeedonline/tsconfig.json b/gapi.pagespeedonline/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/gapi.pagespeedonline/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gapi.translate/gapi.translate.d.ts b/gapi.translate/gapi.translate.d.ts
deleted file mode 100644
index bc04df1e16..0000000000
--- a/gapi.translate/gapi.translate.d.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-// Type definitions for Google Translate API
-// Project: https://developers.google.com/translate/
-// Definitions by: Frank M <https://github.com/sgtfrankieboy>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../gapi/gapi.d.ts" />
-
-declare namespace gapi.client.language {
-
-	export interface detections {
-
-		/**
-		 * Detect the language of text.
-		 */
-		list(object: {
-			/**
-			 * The text to detect
-			 */
-			q: string[];
-			/**
-			 * Selector specifying which fields to include in a partial response.
-			 */
-			fields?: string;
-		}): HttpRequest<GoogleApiTranslateDetectionListResponse>;
-	}
-
-	export interface languages {
-
-
-		/**
-		 * List the source/target languages supported by the API
-		 */
-		list(object: {
-			/**
-			 * the language and collation in which the localized results should be returned
-			 */
-			target?: string;
-			/**
-			 * Selector specifying which fields to include in a partial response.
-			 */
-			fields?: string;
-		}): HttpRequest<GoogleApiTranslateLanguageListResponse>
-
-	}
-
-	export interface translations {
-
-		/**
-		 * Returns text translations from one language to another.
-		 */
-		list(object: {
-			/**
-			 *  The text to translate
-			 */
-			q: string[];
-			/**
-			 * The target language into which the text should be translated
-			 */
-			target: string;
-			/**
-			 * The customization id for translate
-			 */
-			cid?: string[];
-			/**
-			 * This optional parameter allows you to indicate that the text to be translated is either plain-text or HTML. A value of html indicates HTML and a value of text indicates plain-text
-			 */
-			format?: string;
-			/**
-			 * The source language of the text
-			 */
-			source?: string;
-			/**
-			 * Selector specifying which fields to include in a partial response.
-			 */
-			fields?: string;
-			/**
-			 * If prettyprint=true, the results returned by the server will be human readable (pretty printed).
-			 */
-			prettyprint?: string;
-		}): HttpRequest<GoogleApiTranslateTranslationListResponse>;
-
-	}
-}
-
-
-interface GoogleApiTranslateTranslationListResponse {
-
-	data: {
-		translations: {
-			translatedText: string;
-			detectedSourceLanguage: string;
-		}[];
-	}
-
-}
-
-interface GoogleApiTranslateLanguageListResponse {
-
-	data: {
-		languages: {
-			language: string;
-			name: string;
-		}[];
-	}
-
-}
-
-interface GoogleApiTranslateDetectionListResponse {
-
-	data: {
-		detections: {
-			language: string;
-			confidence: number;
-		}[][];
-	}
-
-}
diff --git a/gapi.translate/index.d.ts b/gapi.translate/index.d.ts
new file mode 100644
index 0000000000..0fa655b0f3
--- /dev/null
+++ b/gapi.translate/index.d.ts
@@ -0,0 +1,117 @@
+// Type definitions for Google Translate API
+// Project: https://developers.google.com/translate/
+// Definitions by: Frank M <https://github.com/sgtfrankieboy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="gapi" />
+
+declare namespace gapi.client.language {
+
+	export interface detections {
+
+		/**
+		 * Detect the language of text.
+		 */
+		list(object: {
+			/**
+			 * The text to detect
+			 */
+			q: string[];
+			/**
+			 * Selector specifying which fields to include in a partial response.
+			 */
+			fields?: string;
+		}): HttpRequest<GoogleApiTranslateDetectionListResponse>;
+	}
+
+	export interface languages {
+
+
+		/**
+		 * List the source/target languages supported by the API
+		 */
+		list(object: {
+			/**
+			 * the language and collation in which the localized results should be returned
+			 */
+			target?: string;
+			/**
+			 * Selector specifying which fields to include in a partial response.
+			 */
+			fields?: string;
+		}): HttpRequest<GoogleApiTranslateLanguageListResponse>
+
+	}
+
+	export interface translations {
+
+		/**
+		 * Returns text translations from one language to another.
+		 */
+		list(object: {
+			/**
+			 *  The text to translate
+			 */
+			q: string[];
+			/**
+			 * The target language into which the text should be translated
+			 */
+			target: string;
+			/**
+			 * The customization id for translate
+			 */
+			cid?: string[];
+			/**
+			 * This optional parameter allows you to indicate that the text to be translated is either plain-text or HTML. A value of html indicates HTML and a value of text indicates plain-text
+			 */
+			format?: string;
+			/**
+			 * The source language of the text
+			 */
+			source?: string;
+			/**
+			 * Selector specifying which fields to include in a partial response.
+			 */
+			fields?: string;
+			/**
+			 * If prettyprint=true, the results returned by the server will be human readable (pretty printed).
+			 */
+			prettyprint?: string;
+		}): HttpRequest<GoogleApiTranslateTranslationListResponse>;
+
+	}
+}
+
+
+interface GoogleApiTranslateTranslationListResponse {
+
+	data: {
+		translations: {
+			translatedText: string;
+			detectedSourceLanguage: string;
+		}[];
+	}
+
+}
+
+interface GoogleApiTranslateLanguageListResponse {
+
+	data: {
+		languages: {
+			language: string;
+			name: string;
+		}[];
+	}
+
+}
+
+interface GoogleApiTranslateDetectionListResponse {
+
+	data: {
+		detections: {
+			language: string;
+			confidence: number;
+		}[][];
+	}
+
+}
diff --git a/gapi.translate/tsconfig.json b/gapi.translate/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/gapi.translate/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gapi.urlshortener/gapi.urlshortener.d.ts b/gapi.urlshortener/gapi.urlshortener.d.ts
deleted file mode 100644
index e29bedb042..0000000000
--- a/gapi.urlshortener/gapi.urlshortener.d.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-// Type definitions for Google Url Shortener API
-// Project: https://developers.google.com/url-shortener/
-// Definitions by: Frank M <https://github.com/sgtfrankieboy>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../gapi/gapi.d.ts" />
-
-declare namespace gapi.client.urlshortener {
-
-    export interface url {
-
-        /**
-         * Expands a short URL or gets creation time and analytics.
-         */
-        get(object: {
-            /**
-             * The short URL, including the protocol.
-             */
-            'shortUrl': string;
-            /**
-             * Additional information to return. ANALYTICS_CLICKS, ANALYTICS_TOP_STRINGS, FULL
-             */
-            'projection'?: string;
-            /**
-             * Selector specifying which fields to include in a partial response.
-             */
-            'fields'?: string
-        }): HttpRequest<GoogleApiUrlShortenerUrlResource>;
-        /**
-         * Creates a new short URL.
-         */
-        insert(object: {
-            /**
-             * Selector specifying which fields to include in a partial response.
-             */
-            'fields'?: string;
-            /**
-             * HTTP Request Body
-             */
-            'RequestBody'?: string
-        }): HttpRequest<GoogleApiUrlShortenerUrlResource>;
-        /**
-         * Retrieves a list of URLs shortened by a user.
-         */
-        list(object: {
-            /**
-             * Additional information to return. ANALYTICS_CLICKS, FULL
-             */
-            'projection'?: string;
-            /**
-             * Token for requesting successive pages of results.
-             */
-            'start-token'?: string;
-            /**
-             * Selector specifying which fields to include in a partial response.
-             */
-            'fields'?: string
-        }): HttpRequest<GoogleApiUrlShortenerUrlResource>;
-    }
-}
-
-interface GoogleApiUrlShortenerUrlResource {
-    /**
-     * The fixed string "urlshortener#url".
-     */
-    kind: string;
-    /**
-     * Short URL
-     */
-    id: string;
-    /**
-     * Long URL
-     */
-    longUrl: string;
-    /**
-     * Status of the target URL. Possible values: "OK", "MALWARE", "PHISHING", or "REMOVED".
-     */
-    status: string;
-    /**
-     * Time the short URL was created; ISO 8601 representation using the yyyy-MM-dd'T'HH:mm:ss.SSSZZ format.
-     */
-    created: string;
-    /**
-     * A summary of the click analytics for the short and long URL. Might not be present if not requested or currently unavailable.
-     */
-    analytics: {
-        /**
-         * Click analytics over all time.
-         */
-        allTime: GoogleApiUrlShortenerUrlResourceAnalyticsObject;
-        /**
-         * Click analytics over the last month.
-         */
-        month: GoogleApiUrlShortenerUrlResourceAnalyticsObject;
-        /**
-         * Click analytics over the last week.
-         */
-        week: GoogleApiUrlShortenerUrlResourceAnalyticsObject;
-        /**
-         * Click analytics over the last day.
-         */
-        day: GoogleApiUrlShortenerUrlResourceAnalyticsObject;
-        /**
-         * Click analytics over the last two hours.
-         */
-        twoHours: GoogleApiUrlShortenerUrlResourceAnalyticsObject;
-    }
-}
-
-interface GoogleApiUrlShortenerUrlResourceAnalyticsObject {
-    /**
-     * Number of clicks on this short URL.
-     */
-    shortUrlClicks: string;
-    /**
-     * Number of clicks on all goo.gl short URLs pointing to this long URL.
-     */
-    longUrlClicks: string;
-    /**
-     * Top referring hosts, e.g. "www.google.com"; sorted by (descending) click counts. Only present if this data is available.
-     */
-    referrers: GoogleApiUrlShortenerUrlResourceAnalyticsArrayObject[];
-    /**
-     * Top countries (expressed as country codes), e.g. "US" or "DE"; sorted by (descending) click counts. Only present if this data is available.
-     */
-    countries: GoogleApiUrlShortenerUrlResourceAnalyticsArrayObject[];
-    /**
-     * Top browsers, e.g. "Chrome"; sorted by (descending) click counts. Only present if this data is available.
-     */
-    browsers: GoogleApiUrlShortenerUrlResourceAnalyticsArrayObject[];
-    /**
-     * Top platforms or OSes, e.g. "Windows"; sorted by (descending) click counts. Only present if this data is available.
-     */
-    platforms: GoogleApiUrlShortenerUrlResourceAnalyticsArrayObject[];
-}
-
-interface GoogleApiUrlShortenerUrlResourceAnalyticsArrayObject {
-    /**
-     * Number of clicks for this top entry, e.g. for this particular country or browser.
-     */
-    count: string;
-    /**
-     * Label assigned to this top entry, e.g. "US" or "Chrome".
-     */
-    id: string;
-}
diff --git a/gapi.urlshortener/index.d.ts b/gapi.urlshortener/index.d.ts
new file mode 100644
index 0000000000..e9fc5e4305
--- /dev/null
+++ b/gapi.urlshortener/index.d.ts
@@ -0,0 +1,146 @@
+// Type definitions for Google Url Shortener API
+// Project: https://developers.google.com/url-shortener/
+// Definitions by: Frank M <https://github.com/sgtfrankieboy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="gapi" />
+
+declare namespace gapi.client.urlshortener {
+
+    export interface url {
+
+        /**
+         * Expands a short URL or gets creation time and analytics.
+         */
+        get(object: {
+            /**
+             * The short URL, including the protocol.
+             */
+            'shortUrl': string;
+            /**
+             * Additional information to return. ANALYTICS_CLICKS, ANALYTICS_TOP_STRINGS, FULL
+             */
+            'projection'?: string;
+            /**
+             * Selector specifying which fields to include in a partial response.
+             */
+            'fields'?: string
+        }): HttpRequest<GoogleApiUrlShortenerUrlResource>;
+        /**
+         * Creates a new short URL.
+         */
+        insert(object: {
+            /**
+             * Selector specifying which fields to include in a partial response.
+             */
+            'fields'?: string;
+            /**
+             * HTTP Request Body
+             */
+            'RequestBody'?: string
+        }): HttpRequest<GoogleApiUrlShortenerUrlResource>;
+        /**
+         * Retrieves a list of URLs shortened by a user.
+         */
+        list(object: {
+            /**
+             * Additional information to return. ANALYTICS_CLICKS, FULL
+             */
+            'projection'?: string;
+            /**
+             * Token for requesting successive pages of results.
+             */
+            'start-token'?: string;
+            /**
+             * Selector specifying which fields to include in a partial response.
+             */
+            'fields'?: string
+        }): HttpRequest<GoogleApiUrlShortenerUrlResource>;
+    }
+}
+
+interface GoogleApiUrlShortenerUrlResource {
+    /**
+     * The fixed string "urlshortener#url".
+     */
+    kind: string;
+    /**
+     * Short URL
+     */
+    id: string;
+    /**
+     * Long URL
+     */
+    longUrl: string;
+    /**
+     * Status of the target URL. Possible values: "OK", "MALWARE", "PHISHING", or "REMOVED".
+     */
+    status: string;
+    /**
+     * Time the short URL was created; ISO 8601 representation using the yyyy-MM-dd'T'HH:mm:ss.SSSZZ format.
+     */
+    created: string;
+    /**
+     * A summary of the click analytics for the short and long URL. Might not be present if not requested or currently unavailable.
+     */
+    analytics: {
+        /**
+         * Click analytics over all time.
+         */
+        allTime: GoogleApiUrlShortenerUrlResourceAnalyticsObject;
+        /**
+         * Click analytics over the last month.
+         */
+        month: GoogleApiUrlShortenerUrlResourceAnalyticsObject;
+        /**
+         * Click analytics over the last week.
+         */
+        week: GoogleApiUrlShortenerUrlResourceAnalyticsObject;
+        /**
+         * Click analytics over the last day.
+         */
+        day: GoogleApiUrlShortenerUrlResourceAnalyticsObject;
+        /**
+         * Click analytics over the last two hours.
+         */
+        twoHours: GoogleApiUrlShortenerUrlResourceAnalyticsObject;
+    }
+}
+
+interface GoogleApiUrlShortenerUrlResourceAnalyticsObject {
+    /**
+     * Number of clicks on this short URL.
+     */
+    shortUrlClicks: string;
+    /**
+     * Number of clicks on all goo.gl short URLs pointing to this long URL.
+     */
+    longUrlClicks: string;
+    /**
+     * Top referring hosts, e.g. "www.google.com"; sorted by (descending) click counts. Only present if this data is available.
+     */
+    referrers: GoogleApiUrlShortenerUrlResourceAnalyticsArrayObject[];
+    /**
+     * Top countries (expressed as country codes), e.g. "US" or "DE"; sorted by (descending) click counts. Only present if this data is available.
+     */
+    countries: GoogleApiUrlShortenerUrlResourceAnalyticsArrayObject[];
+    /**
+     * Top browsers, e.g. "Chrome"; sorted by (descending) click counts. Only present if this data is available.
+     */
+    browsers: GoogleApiUrlShortenerUrlResourceAnalyticsArrayObject[];
+    /**
+     * Top platforms or OSes, e.g. "Windows"; sorted by (descending) click counts. Only present if this data is available.
+     */
+    platforms: GoogleApiUrlShortenerUrlResourceAnalyticsArrayObject[];
+}
+
+interface GoogleApiUrlShortenerUrlResourceAnalyticsArrayObject {
+    /**
+     * Number of clicks for this top entry, e.g. for this particular country or browser.
+     */
+    count: string;
+    /**
+     * Label assigned to this top entry, e.g. "US" or "Chrome".
+     */
+    id: string;
+}
diff --git a/gapi.urlshortener/tsconfig.json b/gapi.urlshortener/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/gapi.urlshortener/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gapi.youtube/gapi.youtube.d.ts b/gapi.youtube/gapi.youtube.d.ts
deleted file mode 100644
index a17c52ae4d..0000000000
--- a/gapi.youtube/gapi.youtube.d.ts
+++ /dev/null
@@ -1,2337 +0,0 @@
-// Type definitions for YouTube Data API v3
-// Project: https://developers.google.com/youtube/v3/
-// Definitions by: Frank M <https://github.com/sgtfrankieboy>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../gapi/gapi.d.ts" />
-
-declare namespace gapi.client.youtube {
-
-    export interface activities {
-
-        /**
-         * Posts a bulletin for a specific channel.
-         */
-        insert(object: {
-            /**
-             * The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include. The part names that you can include in the parameter value are snippet and contentDetails.
-             */
-            part: string;
-            /**
-             * HTTP Request Body
-             */
-            RequestBody?: string;
-        }): HttpRequest<GoogleApiYouTubeActivityResource>;
-
-        /**
-         * Returns a list of channel activity events that match the request criteria.
-         */
-        list(object: {
-            /**
-             * The part parameter specifies a comma-separated list of one or more activity resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, and contentDetails. If the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a activity resource, the snippet property contains other properties that identify the type of activity, a display title for the activity, and so forth. If you set part=snippet, the API response will also contain all of those nested properties.
-             */
-            part: string;
-            /**
-             * The channelId parameter specifies a unique YouTube channel ID. The API will then return a list of that channel's activities.
-             */
-            channelId?: string;
-            /**
-             * Set this parameter's value to true to retrieve the activity feed that displays on the YouTube home page for the currently authenticated user.
-             */
-            home?: boolean;
-            /**
-             * The maxResults parameter specifies the maximum number of items that should be returned in the result set.
-             */
-            maxResults?: number;
-            /**
-             * Set this parameter's value to true to retrieve a feed of the authenticated user's activities.
-             */
-            mine?: boolean;
-            /**
-             * The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.
-             */
-            pageToken?: string;
-            /**
-             * The publishedAfter parameter specifies the earliest date and time that an activity could have occurred for that activity to be included in the API response. If the parameter value specifies a day, but not a time, then any activities that occurred that day will be included in the result set. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.
-             */
-            publishedAfter?: string;
-            /**
-             * The publishedBefore parameter specifies the date and time before which an activity must have occurred for that activity to be included in the API response. If the parameter value specifies a day, but not a time, then any activities that occurred that day will be excluded from the result set. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.
-             */
-            publishedBefore?: string;
-            /**
-             * The regionCode parameter instructs the API to return results for the specified country. The parameter value is an ISO 3166-1 alpha-2 country code.
-             */
-            regionCode?: string;
-        }): HttpRequest<GoogleApiYouTubePaginationInfo<GoogleApiYouTubeActivityResource>>;
-
-    }
-
-    export interface channelBanners {
-
-        /**
-         * Uploads a channel banner to YouTube.
-         */
-        insert(object: {
-            /**
-             * The onBehalfOfContentOwner parameter indicates that the authenticated user is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with needs to be linked to the specified YouTube content owner.
-             */
-            onBehalfOfContentOwner: string;
-            /**
-             * HTTP Request Body
-             */
-            RequestBody: string;
-        }): HttpRequest<GoogleApiYouTubeChannelBannerResource>;
-    }
-
-    export interface channels {
-
-        /**
-         * Returns a collection of zero or more channel resources that match the request criteria.
-         */
-        list(object: {
-            /**
-             * The part parameter specifies a comma-separated list of one or more channel resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, contentDetails, statistics, topicDetails, and invideoPromotion. If the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a channel resource, the contentDetails property contains other properties, such as the uploads properties. As such, if you set part=contentDetails, the API response will also contain all of those nested properties.
-             */
-            part: string;
-            /**
-             * The categoryId parameter specifies a YouTube guide category, thereby requesting YouTube channels associated with that category.
-             */
-            categoryId?: string;
-            /**
-             * The forUsername parameter specifies a YouTube username, thereby requesting the channel associated with that username.
-             */
-            forUsername?: string;
-            /**
-             * The id parameter specifies a comma-separated list of the YouTube channel ID(s) for the resource(s) that are being retrieved. In a channel resource, the id property specifies the channel's YouTube channel ID.
-             */
-            id?: string;
-            /**
-             * Set this parameter's value to true to instruct the API to only return channels managed by the content owner that the onBehalfOfContentOwner parameter specifies. The user must be authenticated as a CMS account linked to the specified content owner and onBehalfOfContentOwner must be provided.
-             */
-            managedByMe?: boolean;
-            /**
-             * The maxResults parameter specifies the maximum number of items that should be returned in the result set.
-             */
-            maxResults?: number;
-            /**
-             * Set this parameter's value to true to instruct the API to only return channels owned by the authenticated user.
-             */
-            mine?: boolean;
-            /**
-             * Set this parameter's value to true to retrieve a list of channels that subscribed to the authenticated user's channel.
-             */
-            mySubscribers?: boolean;
-            /**
-             * The onBehalfOfContentOwner parameter indicates that the authenticated user is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with needs to be linked to the specified YouTube content owner.
-             */
-            onBehalfOfContentOwner?: string;
-            /**
-             * The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.
-             */
-            pageToken?: string;
-        }): HttpRequest<GoogleApiYouTubePaginationInfo<GoogleApiYouTubeChannelResource>>;
-
-        /**
-         * Updates a channel's metadata.
-         */
-        update(object: {
-            /**
-             * The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include. The part names that you can include in the parameter value are id and invideoPromotion. Note that this method will override the existing values for all of the mutable properties that are contained in any parts that the parameter value specifies.
-             */
-            part: string;
-            /**
-             * The onBehalfOfContentOwner parameter indicates that the authenticated user is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with needs to be linked to the specified YouTube content owner.
-             */
-            onBehalfOfContentOwner?: string;
-            /**
-             * HTTP Request Body
-             */
-            RequestBody?: string;
-        }): HttpRequest<GoogleApiYouTubeChannelResource>;
-
-    }
-
-    export interface guideCategories {
-
-        /**
-         * Returns a list of categories that can be associated with YouTube channels.
-         */
-        list(object: {
-            /**
-             * The part parameter specifies a comma-separated list of one or more guideCategory resource properties that the API response will include. The part names that you can include in the parameter value are id and snippet. If the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a guideCategory resource, the snippet property contains other properties, such as the category's title. If you set part=snippet, the API response will also contain all of those nested properties.
-             */
-            part: string;
-            /**
-             * The hl parameter specifies the language that will be used for text values in the API response.
-             */
-            hl?: string;
-            /**
-             * The id parameter specifies a comma-separated list of the YouTube channel category ID(s) for the resource(s) that are being retrieved. In a guideCategory resource, the id property specifies the YouTube channel category ID.
-             */
-            id?: string;
-            /**
-             * The regionCode parameter instructs the API to return the list of guide categories available in the specified country. The parameter value is an ISO 3166-1 alpha-2 country code.
-             */
-            regionCode?: string;
-        }): HttpRequest<GoogleApiYouTubePageInfo<GoogleApiYouTubeGuideCategoryResource>>;
-
-    }
-
-    export interface playlistItems {
-
-        /**
-         * Deletes a playlist item.
-         */
-        delete(object: {
-            /**
-             * The id parameter specifies the YouTube playlist item ID for the playlist item that is being deleted. In a playlistItem resource, the id property specifies the playlist item's ID.
-             */
-            id: string;
-        }): HttpRequest<GoogleApiYouTubePlaylistItemResource>;
-
-        /**
-         * Adds a resource to a playlist.
-         */
-        insert(object: {
-            /**
-             * The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include. The part names that you can include in the parameter value are snippet and contentDetails.
-             */
-            part: string;
-            /**
-             * HTTP Request Body
-             */
-            RequestBody?: string;
-        }): HttpRequest<GoogleApiYouTubePlaylistItemResource>;
-
-        /**
-         * Returns a collection of playlist items that match the API request parameters. You can retrieve all of the playlist items in a specified playlist or retrieve one or more playlist items by their unique IDs.
-         */
-        list(object: {
-            /**
-             * The part parameter specifies a comma-separated list of one or more playlistItem resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, and contentDetails. If the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a playlistItem resource, the snippet property contains numerous fields, including the title, description, position, and resourceId properties. As such, if you set part=snippet, the API response will contain all of those properties.
-             */
-            part: string;
-            /**
-             * The id parameter specifies a comma-separated list of one or more unique playlist item IDs.
-             */
-            id?: string;
-            /**
-             * The maxResults parameter specifies the maximum number of items that should be returned in the result set.
-             */
-            maxResults?: number;
-            /**
-             * The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.
-             */
-            pageToken?: string;
-            /**
-             * The playlistId parameter specifies the unique ID of the playlist for which you want to retrieve playlist items. Note that even though this is an optional parameter, every request to retrieve playlist items must specify a value for either the id parameter or the playlistId parameter.
-             */
-            playlistId?: string;
-            /**
-             * The videoId parameter specifies that the request should return only the playlist items that contain the specified video.
-             */
-            videoId?: string;
-        }): HttpRequest<GoogleApiYouTubePaginationInfo<GoogleApiYouTubePlaylistItemResource>>;
-
-        /**
-         * Modifies a playlist item. For example, you could update the item's position in the playlist.
-         */
-        update(object: {
-            /**
-             * The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include. The part names that you can include in the parameter value are snippet and status. Note that this method will override the existing values for all of the mutable properties that are contained in any parts that the parameter value specifies. For example, a playlist's privacy setting is contained in the status part. As such, if your request is updating a private playlist, and the request's part parameter value includes the status part, the playlist's privacy setting will be updated to whatever value the request body specifies. If the request body does not specify a value, the existing privacy setting will be removed and the playlist will revert to the default privacy setting.
-             */
-            part: string;
-            /**
-             * HTTP Request Body
-             */
-            RequestBody?: string;
-        }): HttpRequest<GoogleApiYouTubePlaylistItemResource>;
-    }
-
-    export interface playlists {
-
-        /**
-         * Deletes a playlist.
-         */
-        delete(object: {
-            /**
-             * The id parameter specifies the YouTube playlist ID for the playlist that is being deleted. In a playlist resource, the id property specifies the playlist's ID.
-
-             */
-            id: string;
-        }): HttpRequest<GoogleApiYouTubePlaylistResource>;
-
-        /**
-         * Creates a playlist.
-         */
-        insert(object: {
-            /**
-             * The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include. The part names that you can include in the parameter value are snippet and status.
-             */
-            part: string;
-            /**
-             * HTTP Request Body
-             */
-            RequestBody?: string;
-        }): HttpRequest<GoogleApiYouTubePlaylistResource>;
-
-        /**
-         * Returns a collection of playlists that match the API request parameters. For example, you can retrieve all playlists that the authenticated user owns, or you can retrieve one or more playlists by their unique IDs.
-         */
-        list(object: {
-            /**
-             * The part parameter specifies a comma-separated list of one or more playlist resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, and status. If the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a playlist resource, the snippet property contains properties like author, title, description, tags, and timeCreated. As such, if you set part=snippet, the API response will contain all of those properties.
-             */
-            part: string;
-            /**
-             * This value indicates that the API should only return the specified channel's playlists.
-             */
-            channelId?: string;
-            /**
-             * The id parameter specifies a comma-separated list of the YouTube playlist ID(s) for the resource(s) that are being retrieved. In a playlist resource, the id property specifies the playlist's YouTube playlist ID.
-             */
-            id?: string;
-            /**
-             * The maxResults parameter specifies the maximum number of items that should be returned in the result set.
-             */
-            maxResults?: number;
-            /**
-             * Set this parameter's value to true to instruct the API to only return playlists owned by the authenticated user.
-             */
-            mine?: boolean;
-            /**
-             * The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.
-             */
-            pagetoken: string;
-        }): HttpRequest<GoogleApiYouTubePaginationInfo<GoogleApiYouTubePlaylistResource>>;
-
-        /**
-         * Modifies a playlist. For example, you could change a playlist's title, description, or privacy status.
-         */
-        update(object: {
-            /**
-             * The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include. The part names that you can include in the parameter value are snippet and status. Note that this method will override the existing values for all of the mutable properties that are contained in any parts that the parameter value specifies. For example, a playlist's privacy setting is contained in the status part. As such, if your request is updating a private playlist, and the request's part parameter value includes the status part, the playlist's privacy setting will be updated to whatever value the request body specifies. If the request body does not specify a value, the existing privacy setting will be removed and the playlist will revert to the default privacy setting.
-             */
-            part: string;
-            /**
-             * HTTP Request Body
-             */
-            RequestBody?: string;
-        }): HttpRequest<GoogleApiYouTubePlaylistResource>;
-
-    }
-
-    export interface search {
-
-        /**
-         * Returns a collection of search results that match the query parameters specified in the API request. By default, a search result set identifies matching video, channel, and playlist resources, but you can also configure queries to only retrieve a specific type of resource.
-         */
-        list(object: {
-            /**
-             * The part parameter specifies a comma-separated list of one or more search resource properties that the API response will include. The part names that you can include in the parameter value are id and snippet. If the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a search result, the snippet property contains other properties that identify the result's title, description, and so forth. If you set part=snippet, the API response will also contain all of those nested properties.
-             */
-            part: string;
-            /**
-             * The channelId parameter indicates that the API response should only contain resources created by the channel
-             */
-            channelId?: string;
-            /**
-             * The channelType parameter lets you restrict a search to a particular type of channel.
-             */
-            channelType?: string;
-            /**
-             * The forContentOwner parameter restricts the search to only retrieve resources owned by the content owner specified by the onBehalfOfContentOwner parameter. The user must be authenticated as a CMS account linked to the specified content owner and onBehalfOfContentOwner must be provided.
-             */
-            forContentOwner?: boolean;
-            /**
-             * The forMine parameter restricts the search to only retrieve videos owned by the authenticated user.
-             */
-            forMine?: boolean;
-            /**
-             * The maxResults parameter specifies the maximum number of items that should be returned in the result set.
-             */
-            maxResults?: number;
-            /**
-             * The onBehalfOfContentOwner parameter indicates that the authenticated user is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with needs to be linked to the specified YouTube content owner.
-             */
-            onBehalfOfContentOwner?: string;
-            /**
-             * The order parameter specifies the method that will be used to order resources in the API response.
-             */
-            order?: string;
-            /**
-             * The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.
-             */
-            pageToken?: string;
-            /**
-             * The publishedAfter parameter indicates that the API response should only contain resources created after the specified time. The value is an RFC 3339 formatted date-time value (1970-01-01T00:00:00Z).
-             */
-            publishedAfter?: string;
-            /**
-             * The publishedBefore parameter indicates that the API response should only contain resources created before the specified time. The value is an RFC 3339 formatted date-time value (1970-01-01T00:00:00Z).
-             */
-            publishedBefore?: string;
-            /**
-             * The q parameter specifies the query term to search for.
-             */
-            q?: string;
-            /**
-             * The regionCode parameter instructs the API to return search results for the specified country. The parameter value is an ISO 3166-1 alpha-2 country code.
-             */
-            regionCode?: string;
-            /**
-             * The relatedToVideoId parameter retrieves a list of videos that are related to the video that the parameter value identifies. The parameter value must be set to a YouTube video ID and, if you are using this parameter, the type parameter must be set to video.
-             */
-            relatedToVideoId?: string;
-            /**
-             * The safeSearch parameter indicates whether the search results should include restricted content as well as standard content.
-             */
-            safeSearch?: string;
-            /**
-             * The topicId parameter indicates that the API response should only contain resources associated with the specified topic. The value identifies a Freebase topic ID.
-             */
-            topicId?: string;
-            /**
-             * The type parameter restricts a search query to only retrieve a particular type of resource.
-             */
-            type?: string;
-            /**
-             * The videoCaption parameter indicates whether the API should filter video search results based on whether they have captions.
-             */
-            videoCaption?: string;
-            /**
-             * The videoCategoryId parameter filters video search results based on their category.
-             */
-            videoCategoryId?: string;
-            /**
-             * The videoDefinition parameter lets you restrict a search to only include either high definition (HD) or standard definition (SD) videos. HD videos are available for playback in at least 720p, though higher resolutions, like 1080p, might also be available.
-             */
-            videoDefinition?: string;
-            /**
-             * The videoDimension parameter lets you restrict a search to only retrieve 2D or 3D videos.
-             */
-            videoDimension?: string;
-            /**
-             * The videoDuration parameter filters video search results based on their duration.
-             */
-            videoDuration?: string;
-            /**
-             * The videoEmbeddable parameter lets you to restrict a search to only videos that can be embedded into a webpage.
-             */
-            videoEmbeddable?: string;
-            /**
-             * The videoLicense parameter filters search results to only include videos with a particular license. YouTube lets video uploaders choose to attach either the Creative Commons license or the standard YouTube license to each of their videos.
-             */
-            videoLicense?: string;
-            /**
-             * The videoSyndicated parameter lets you to restrict a search to only videos that can be played outside youtube.com.
-             */
-            videoSyndicated?: string;
-            /**
-             * The videoType parameter lets you restrict a search to a particular type of videos.
-             */
-            videoType?: string;
-        }): HttpRequest<GoogleApiYouTubePaginationInfo<GoogleApiYouTubeSearchResource>>;
-
-    }
-
-    export interface subscriptions {
-
-        /**
-         * Deletes a subscription.
-         */
-        delete(object: {
-            /**
-             * The id parameter specifies the YouTube subscription ID for the resource that is being deleted. In a subscription resource, the id property specifies the YouTube subscription ID.
-             */
-            id: string;
-        }): HttpRequest<GoogleApiYouTubeSubscriptionResource>;
-
-        /**
-         * Adds a subscription for the authenticated user's channel.
-         */
-        insert(object: {
-            /**
-             * The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include. The part names that you can include in the parameter value are snippet and contentDetails.
-             */
-            part: string;
-            /**
-             * HTTP Request Body
-             */
-            RequestBody: string;
-        }): HttpRequest<GoogleApiYouTubeSubscriptionResource>;
-
-        /**
-         * Returns subscription resources that match the API request criteria.
-         */
-        list(object: {
-            /**
-             * The part parameter specifies a comma-separated list of one or more subscription resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, and contentDetails. If the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a subscription resource, the snippet property contains other properties, such as a display title for the subscription. If you set part=snippet, the API response will also contain all of those nested properties.
-             */
-            part: string;
-            /**
-             * The channelId parameter specifies a YouTube channel ID. The API will only return that channel's subscriptions.
-             */
-            channelId?: string;
-            /**
-             * The forChannelId parameter specifies a comma-separated list of channel IDs. The API response will then only contain subscriptions matching those channels.
-             */
-            forChannelId?: string;
-            /**
-             * The id parameter specifies a comma-separated list of the YouTube subscription ID(s) for the resource(s) that are being retrieved. In a subscription resource, the id property specifies the YouTube subscription ID.
-             */
-            id?: string;
-            /**
-             * The maxResults parameter specifies the maximum number of items that should be returned in the result set.
-             */
-            maxResults?: number;
-            /**
-             * Set this parameter's value to true to retrieve a feed of the authenticated user's subscriptions.
-             */
-            mine?: boolean;
-            /**
-             * Set this parameter's value to true to retrieve a feed of the subscribers of the authenticated user.
-             */
-            mySubscripbers?: boolean;
-            /**
-             * The order parameter specifies the method that will be used to sort resources in the API response.
-             */
-            order?: string;
-            /**
-             * The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.
-             */
-            pageToken?: string;
-        }): HttpRequest<GoogleApiYouTubePaginationInfo<GoogleApiYouTubeSubscriptionResource>>;
-    }
-
-    export interface thumbnails {
-
-        /**
-         * Uploads a custom video thumbnail to YouTube and sets it for a video.
-         */
-        set(object: {
-            /**
-             * The videoId parameter specifies a YouTube video ID for which the custom video thumbnail is being provided.
-             */
-            videoId: string;
-        }): HttpRequest<GoogleApiYouTubePageInfo<GoogleApiYouTubeThumbnailResource>>;
-
-    }
-
-    export interface videoCategories {
-
-        /**
-         * Returns a list of categories that can be associated with YouTube videos.
-         */
-        list(object: {
-            /**
-             * The part parameter specifies the videoCategory resource parts that the API response will include. Supported values are id and snippet.
-             */
-            part: string;
-            /**
-             * The hl parameter specifies the language that should be used for text values in the API response.
-             */
-            hl?: string;
-            /**
-             * The id parameter specifies a comma-separated list of video category IDs for the resources that you are retrieving.
-             */
-            id?: string;
-            /**
-             * The regionCode parameter instructs the API to return the list of video categories available in the specified country. The parameter value is an ISO 3166-1 alpha-2 country code.
-             */
-            regionCode?: string;
-        }): HttpRequest<GoogleApiYouTubePageInfo<GoogleApiYouTubeVideoCategoryResource>>;
-
-    }
-
-    export interface videos {
-
-        /**
-         * Deletes a YouTube video.
-         */
-        delete(object: {
-            /**
-             * The id parameter specifies the YouTube video ID for the resource that is being deleted. In a video resource, the id property specifies the video's ID.
-
-             */
-            id: string;
-            /**
-             * The onBehalfOfContentOwner parameter indicates that the authenticated user is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with needs to be linked to the specified YouTube content owner.
-             */
-            onBehalfOfContentOwner?: string;
-        }): HttpRequest<GoogleApiYouTubeVideoResource>;
-
-        /**
-         * Get user ratings for videos.
-         */
-        getRating(object: {
-            /**
-             * The id parameter specifies a comma-separated list of the YouTube video ID(s) for the resource(s) that are being retrieved. In a video resource, the id property specifies the video's ID.
-             */
-            id: string;
-            /**
-             * The onBehalfOfContentOwner parameter indicates that the authenticated user is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with needs to be linked to the specified YouTube content owner.
-             */
-            onBehalfOfContentOwner?: string;
-        }): HttpRequest<GoogleApiYouTubeVideoGetRatingResponse>;
-
-        /**
-         * Uploads a video to YouTube and optionally sets the video's metadata.
-         */
-        insert(object: {
-            /**
-             * The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include. The part names that you can include in the parameter value are snippet, contentDetails, player, statistics, status, and topicDetails. However, not all of those parts contain properties that can be set when setting or updating a video's metadata. For example, the statistics object encapsulates statistics that YouTube calculates for a video and does not contain values that you can set or modify. If the parameter value specifies a part that does not contain mutable values, that part will still be included in the API response.
-             */
-            part: string;
-            /**
-             * The autoLevels parameter specifies whether the video should be auto-leveled by YouTube.
-             */
-            autoLevels?: boolean;
-            /**
-             * The onBehalfOfContentOwner parameter indicates that the authenticated user is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with needs to be linked to the specified YouTube content owner.
-             */
-            onBehalfOfContentOwner?: string;
-            /**
-             * This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners. The onBehalfOfContentOwnerChannel parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the channel specified in the parameter value. This parameter must be used in conjunction with the onBehalfOfContentOwner parameter, and the user must be authenticated using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. In addition, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.
-             */
-            onBehalfOfContentOwnerChannel?: string;
-            /**
-             * The stabilize parameter specifies whether the video should be stabilized by YouTube.
-             */
-            stabilize?: boolean;
-            /**
-             * HTTP Request Body
-             */
-            RequestBody?: string;
-        }): HttpRequest<GoogleApiYouTubeVideoResource>;
-
-        /**
-         * Returns a list of videos that match the API request parameters.
-         */
-        list(object: {
-            /**
-             * The part parameter specifies a comma-separated list of one or more video resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, contentDetails, player, statistics, status, and topicDetails. If the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a video resource, the snippet property contains the channelId, title, description, tags, and categoryId properties. As such, if you set part=snippet, the API response will contain all of those properties.
-             */
-            part: string;
-            /**
-             * Set this parameter's value to mostPopular to instruct the API to return videos belonging to the chart of most popular videos.
-             */
-            chart: string;
-            /**
-             * The id parameter specifies a comma-separated list of the YouTube video ID(s) for the resource(s) that are being retrieved. In a video resource, the id property specifies the video's ID.
-             */
-            id: string;
-            /**
-             * The locale parameter selects a video chart available in the specified locale. If using this parameter, chart must also be set. The parameter value is an BCP 47 locale. Supported locales include ar_AE, ar_DZ, ar_EG, ar_JO, ar_MA, ar_SA, ar_TN, ar_YE, cs_CZ, de_DE, el_GR, en_AU, en_BE, en_CA, en_GB, en_GH, en_IE, en_IL, en_IN, en_KE, en_NG, en_NZ, en_SG, en_UG, en_US, en_ZA, es_AR, es_CL, es_CO, es_ES, es_MX, es_PE, fil_PH, fr_FR, hu_HU, id_ID, it_IT, ja_JP, ko_KR, ms_MY, nl_NL, pl_PL, pt_BR, ru_RU, sv_SE, tr_TR, zh_HK, zh_TW
-             */
-            locale: string;
-            /**
-             * The maxResults parameter specifies the maximum number of items that should be returned in the result set.
-             */
-            maxResults: number;
-            /**
-             * Set this parameter's value to like or dislike to instruct the API to only return videos liked or disliked by the authenticated user.
-             */
-            myRating: string;
-            /**
-             * The onBehalfOfContentOwner parameter indicates that the authenticated user is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with needs to be linked to the specified YouTube content owner.
-             */
-            onBehalfOfContentOwner: string;
-            /**
-             * The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.
-             */
-            pageToken: string;
-            /**
-             * The videoCategoryId parameter selects a video chart based on the category. If using this parameter, chart must also be set.
-             */
-            videoCategoryId: string;
-        }): HttpRequest<GoogleApiYouTubePaginationInfo<GoogleApiYouTubeVideoResource>>;
-
-        /**
-         * Like, dislike, or remove rating from a video.
-         */
-        rate(object: {
-            /**
-             * The id parameter specifies the YouTube video ID.
-             */
-            id: string;
-            /**
-             * Specifies the rating to record.
-             */
-            rating: string;
-            /**
-             * The onBehalfOfContentOwner parameter indicates that the authenticated user is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with needs to be linked to the specified YouTube content owner.
-             */
-            onBehalfOfContentOwner?: string;
-        }): HttpRequest<any>;
-
-        /**
-         * Updates a video's metadata.
-         */
-        update(object: {
-            /**
-             * The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include. The part names that you can include in the parameter value are snippet, contentDetails, player, statistics, status, and topicDetails. Note that this method will override the existing values for all of the mutable properties that are contained in any parts that the parameter value specifies. For example, a video's privacy setting is contained in the status part. As such, if your request is updating a private video, and the request's part parameter value includes the status part, the video's privacy setting will be updated to whatever value the request body specifies. If the request body does not specify a value, the existing privacy setting will be removed and the video will revert to the default privacy setting. In addition, not all of those parts contain properties that can be set when setting or updating a video's metadata. For example, the statistics object encapsulates statistics that YouTube calculates for a video and does not contain values that you can set or modify. If the parameter value specifies a part that does not contain mutable values, that part will still be included in the API response.
-             */
-            part: string;
-            /**
-             * The onBehalfOfContentOwner parameter indicates that the authenticated user is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with needs to be linked to the specified YouTube content owner.
-             */
-            onBehalfOfContentOwner?: string;
-            /**
-             * HTTP Request Body
-             */
-            RequestBody?: string;
-        }): HttpRequest<GoogleApiYouTubeVideoResource>;
-
-    }
-
-}
-
-interface GoogleApiYouTubePageInfo<T> {
-    /**
-     * The type of the API response. For this operation, the value will be youtube#activityListResponse.
-     */
-    kind: string;
-    /**
-     * The ETag of the response.
-     */
-    etag: string;
-    /**
-     * A list of activities, or events, that match the request criteria.
-     */
-    items: T[];
-}
-
-interface GoogleApiYouTubePaginationInfo<T> {
-
-    /**
-     * The type of the API response. For this operation, the value will be youtube#activityListResponse.
-     */
-    kind: string;
-    /**
-     * The ETag of the response.
-     */
-    etag: string;
-    /**
-     * The pageInfo object encapsulates paging information for the result set.
-     */
-    pageInfo: {
-        /**
-         * The total number of results in the result set.
-         */
-        totalResults: number;
-        /**
-         * The number of results included in the API response.
-         */
-        resultsPerPage: number;
-    };
-    /**
-     * The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set.
-     */
-    nextPageToken: string;
-    /**
-     * The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set.
-     */
-    prevPageToken: string;
-    /**
-     * A list of activities, or events, that match the request criteria.
-     */
-    items: T[];
-
-}
-
-interface GoogleApiYouTubeActivityResource {
-    /**
-     * The type of the API resource. For activity resources, the value will be youtube#activity.
-     */
-    kind: string;
-    /**
-     * The ETag of the activity resource.
-     */
-    etag: string;
-    /**
-     * The ID that YouTube uses to uniquely identify the activity.
-     */
-    id: string;
-    /**
-     * The snippet object contains basic details about the activity, including the activitys type and group ID.
-     */
-    snippet: {
-        /**
-         * The date and time that the activity occurred. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.
-         */
-        publishedAt: string;
-        /**
-         * The ID that YouTube uses to uniquely identify the channel associated with the activity.
-         */
-        channelId: string;
-        /**
-         * The title of the resource primarily associated with the activity.
-         */
-        title: string;
-        /**
-         * The description of the resource primarily associated with the activity.
-         */
-        description: string;
-        /**
-         * A map of thumbnail images associated with the resource that is primarily associated with the activity.
-         */
-        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
-        /**
-         * Channel title for the channel responsible for this activity
-         */
-        channelTitle: string;
-        /**
-         * The type of activity that the resource describes.
-         */
-        type: string;
-        /**
-         * The group ID associated with the activity.
-         */
-        groupId: string;
-    }
-    /**
-     * The contentDetails object contains information about the content associated with the activity.
-     */
-    contentDetails: {
-        /**
-         * The upload object contains information about the uploaded video. This property is only present if the snippet.type is upload.
-         */
-        upload: {
-            /**
-             * The ID that YouTube uses to uniquely identify the uploaded video.
-             */
-            videoId: string;
-        }
-        /**
-         * The like object contains information about a resource that received a positive (like) rating. This property is only present if the snippet.type is like.
-         */
-        like: {
-            /**
-             * The resourceId object contains information that identifies the rated resource.
-             */
-            resourceId: {
-                /**
-                 * The type of the API resource.
-                 */
-                kind: string;
-                /**
-                 * The ID that YouTube uses to uniquely identify the video, if the rated resource is a video. This property is only present if the resourceId.kind is youtube#video
-                 */
-                videoId: string;
-            }
-        }
-        /**
-         * The favorite object contains information about a video that was marked as a favorite video. This property is only present if the snippet.type is favorite.
-         */
-        favorite: {
-            /**
-             * The resourceId object contains information that identifies the resource that was marked as a favorite.
-             */
-            resourceId: {
-                /**
-                 * The type of the API resource.
-                 */
-                kind: string;
-                /**
-                 * The ID that YouTube uses to uniquely identify the favorite video. This property is only present if the resourceId.kind is youtube#video.
-                 */
-                videoId: string;
-            }
-        }
-        /**
-         * The comment object contains information about a resource that received a comment. This property is only present if the snippet.type is comment.
-         */
-        comment: {
-            /**
-             * The resourceId object contains information that identifies the resource associated with the comment.
-             */
-            resourceId: {
-                /**
-                 * The type of the API resource.
-                 */
-                kind: string;
-                /**
-                 * The ID that YouTube uses to uniquely identify the video associated with a comment. This property is only present if the resourceId.kind is youtube#video.
-                 */
-                videoId: string;
-                /**
-                 * The ID that YouTube uses to uniquely identify the channel associated with a comment. This property is only present if the resourceId.kind is youtube#channel.
-                 */
-                channelId: string;
-            }
-        }
-        /**
-         * The subscription object contains information about a channel that a user subscribed to. This property is only present if the snippet.type is subscription.
-         */
-        subscription: {
-            /**
-             * The resourceId object contains information that identifies the resource that the user subscribed to.
-             */
-            resourceId: {
-                /**
-                 * The type of the API resource.
-                 */
-                kind: string;
-                /**
-                 * The ID that YouTube uses to uniquely identify the channel that the user subscribed to. This property is only present if the resourceId.kind is youtube#channel.
-                 */
-                channelId: string;
-            }
-        }
-        /**
-         * The playlistItem object contains information about an item that was added to a playlist. This property is only present if the snippet.type is playlistItem.
-         */
-        playlistItem: {
-            /**
-             *  The resourceId object contains information that identifies the resource that was added to the playlist.
-             */
-            resourceId: {
-                /**
-                 * The type of the API resource.
-                 */
-                kind: string;
-                /**
-                 * The ID that YouTube uses to uniquely identify the video that was added to the playlist. This property is only present if the resourceId.kind is youtube#video.
-                 */
-                videoId: string;
-            }
-            /**
-             * The value that YouTube uses to uniquely identify the playlist.
-             */
-            playlistId: string;
-            /**
-             * The value that YouTube uses to uniquely identify the item in the playlist.
-             */
-            playlistItemId: string;
-        }
-        /**
-         * The recommendation object contains information about a recommended resource. This property is only present if the snippet.type is recommendation.
-         */
-        recommendation: {
-            /**
-             * The resourceId object contains information that identifies the recommended resource.
-             */
-            resourceId: {
-                /**
-                 * The type of the API resource.
-                 */
-                kind: string;
-                /**
-                 * The ID that YouTube uses to uniquely identify the video, if the recommended resource is a video. This property is only present if the resourceId.kind is youtube#video.
-                 */
-                videoId: string;
-                /**
-                 * The ID that YouTube uses to uniquely identify the channel, if the recommended resource is a channel. This property is only present if the resourceId.kind is youtube#channel.
-                 */
-                channelId: string;
-            }
-            /**
-             * The reason that the resource is recommended to the user.
-             */
-            reason: string;
-            /**
-             * The seedResourceId object contains information about the resource that caused the recommendation.
-             */
-            seedResourceId: {
-                /**
-                 * The type of the API resource.
-                 */
-                kind: string;
-                /**
-                 * The ID that YouTube uses to uniquely identify the video, if the recommendation was caused by a particular video. This property is only present if the seedResourceId.kind is youtube#video.
-                 */
-                videoId: string;
-                /**
-                 * The ID that YouTube uses to uniquely identify the channel, if the recommendation was caused by a particular channel. This property is only present if the seedResourceId.kind is youtube#channel.
-                 */
-                channelId: string;
-                /**
-                 * The ID that YouTube uses to uniquely identify the playlist, if the recommendation was caused by a particular playlist. This property is only present if the seedResourceId.kind is youtube#playlist.
-                 */
-                playlistId: string;
-            }
-        }
-        /**
-         * The bulletin object contains details about a channel bulletin post. This object is only present if the snippet.type is bulletin.
-         */
-        bulletin: {
-            /**
-             * The resourceId object contains information that identifies the resource associated with a bulletin post.
-             */
-            resourceId: {
-                /**
-                 * The type of the API resource.
-                 */
-                kind: string;
-                /**
-                 * The ID that YouTube uses to uniquely identify the video featured in a bulletin post, if the post refers to a video. This property will only be present if the value of the bulletin.resourceId.kind property is youtube#video.
-                 */
-                videoId: string;
-                /**
-                 * The ID that YouTube uses to uniquely identify the channel featured in a bulletin post, if the post refers to a channel. This property will only be present if the value of the bulletin.resourceId.kind property is youtube#channel.
-                 */
-                channelId: string;
-                /**
-                 * The ID that YouTube uses to uniquely identify the playlist featured in a bulletin post, if the post refers to a playlist. This property will only be present if the value of the bulletin.resourceId.kind property is youtube#playlist.
-                 */
-                playlistId: string;
-            }
-        }
-        /**
-         * The social object contains details about a social network post. This property is only present if the snippet.type is social.
-         */
-        social: {
-            /**
-             * The name of the social network.
-             */
-            type: string;
-            /**
-             * The resourceId object encapsulates information that identifies the resource associated with a social network post.
-             */
-            resourceId: {
-                /**
-                 * The type of the API resource.
-                 */
-                kind: string;
-                /**
-                 * The ID that YouTube uses to uniquely identify the video featured in a social network post, if the post refers to a video. This property will only be present if the value of the social.resourceId.kind property is youtube#video.
-                 */
-                videoId: string;
-                /**
-                 * The ID that YouTube uses to uniquely identify the channel featured in a social network post, if the post refers to a channel. This property will only be present if the value of the social.resourceId.kind property is youtube#channel.
-                 */
-                channelId: string;
-                /**
-                 * The ID that YouTube uses to uniquely identify the playlist featured in a social network post, if the post refers to a playlist. This property will only be present if the value of the social.resourceId.kind property is youtube#playlist.
-                 */
-                playlistId: string;
-            }
-            /**
-             * The author of the social network post.
-             */
-            author: string;
-            /**
-             * The URL of the social network post.
-             */
-            referenceUrl: string;
-            /**
-             * An image of the posts author.
-             */
-            imageUrl: string;
-        }
-        /**
-         * The channelItem object contains details about a resource that was added to a channel. This property is only present if the snippet.type is channelItem.
-         */
-        channelItem: {
-            /**
-             * The resourceId object contains information that identifies the resource that was added to the channel.
-             */
-            resourceId: {
-            }
-        }
-    }
-}
-
-interface GoogleApiYouTubeChannelBannerResource {
-    /**
-     * The type of the API response. For this operation, the value will be youtube#channelBannerInsertResponse.
-     */
-    kind: string;
-    /**
-     * The ETag of the response.
-     */
-    etag: string;
-    /**
-     * The banner images URL. After calling the channelBanners.insert method, extract this value from the API response. Then call the channels.update method, and set the URL as the value of the brandingSettings.image.bannerExternalUrl property to set the banner image for a channel.
-     */
-    url: string;
-}
-
-interface GoogleApiYouTubeChannelResource {
-    /**
-     * The ID that YouTube uses to uniquely identify the channel.
-     */
-    id: string;
-    /**
-     * The type of the API resource. For channel resources, the value will be youtube#channel.
-     */
-    kind: string;
-    /**
-     * The ETag for the channel resource.
-     */
-    etag: string;
-    /**
-     * The snippet object contains basic details about the channel, such as its title, description, and thumbnail images.
-     */
-    snippet: {
-        /**
-         * The channels title.
-         */
-        title: string;
-        /**
-         * The channels description.
-         */
-        description: string;
-        /**
-         * The date and time that the channel was created. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.
-         */
-        publishedAt: string;
-        /**
-         * A map of thumbnail images associated with the channel. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail.
-         */
-        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
-    }
-    /**
-     * The contentDetails object encapsulates information about the channels content.
-     */
-    contentDetails: {
-        /**
-         * The relatedPlaylists object is a map that identifies playlists associated with the channel, such as the channels uploaded videos or favorite videos. You can retrieve any of these playlists using the playlists.list method.
-         */
-        relatedPlaylists: {
-            /**
-             * The ID of the playlist that contains the channels liked videos.
-             */
-            likes: string;
-            /**
-             * The ID of the playlist that contains the channels favorite videos.
-             */
-            favorites: string;
-            /**
-             * The ID of the playlist that contains the channels uploaded videos.
-             */
-            uploads: string;
-            /**
-             * The ID of the playlist that contains the channels watch history.
-             */
-            watchHistory: string;
-            /**
-             * The ID of the channels watch later playlist.
-             */
-            watchLater: string;
-        }
-        /**
-         * The googlePlusUserId object identifies the Google+ profile ID associated with this channel.
-         */
-        googlePlusUserId: string;
-    }
-    /**
-     * The statistics object encapsulates statistics for the channel.
-     */
-    statistics: {
-        /**
-         * The number of times the channel has been viewed.
-         */
-        viewCount: number;
-        /**
-         * The number of comments for the channel.
-         */
-        commentCount: number;
-        /**
-         * The number of subscribers that the channel has.
-         */
-        subscriberCount: number;
-        /**
-         * The number of videos uploaded to the channel.
-         */
-        videoCount: number;
-    }
-    /**
-     * The topicDetails object encapsulates information about Freebase topics associated with the channel.
-     */
-    topicDetails: {
-        /**
-         * A list of Freebase topic IDs associated with the channel. You can retrieve information about each topic using the Freebase Topic API.
-         */
-        topicIds: string[];
-    }
-    /**
-     * The status object encapsulates information about the privacy status of the channel.
-     */
-    status: {
-        /**
-         * Privacy status of the channel.
-         */
-        privacyStatus: string;
-        /**
-         * Indicates whether the channel data identifies a user that is already linked to either a YouTube username or a Google+ account. A user that has one of these links already has a public YouTube identity, which is a prerequisite for several actions, such as uploading videos.
-         */
-        isLinked: boolean;
-    }
-    /**
-     * The brandingSettings object encapsulates information about the branding of the channel.
-     */
-    brandingSettings: {
-        /**
-         * The channel object encapsulates branding properties of the channel page.
-         */
-        channel: {
-            /**
-             * The channels title. The title has a maximum length of 30 characters.
-             */
-            title: string;
-            /**
-             * The channel description, which appears in the channel information box on your channel page.
-             */
-            description: string;
-            /**
-             * Keywords associated with your channel. The value is a comma-separated list of strings.
-             */
-            keywords: string;
-            /**
-             * The content tab that users should display by default when viewers arrive at your channel page.
-             */
-            defaultTab: string;
-            /**
-             * The ID for a Google Analytics account that you want to use to track and measure traffic to your channel.
-             */
-            trackingAnalyticsAccountId: string;
-            /**
-             * This setting determines whether user-submitted comments left on the channel page need to be approved by the channel owner to be publicly visible. The default value is false.
-             */
-            moderateComments: boolean;
-            /**
-             * This setting indicates whether YouTube should show an algorithmically generated list of related channels on your channel page.
-             */
-            showRelatedChannels: boolean;
-            /**
-             * This setting indicates whether the channel page should display content in a browse or feed view.
-             */
-            showBrowseView: boolean;
-            /**
-             * The title that displays above the featured channels module.
-             */
-            featuredChannelsTitle: string;
-            /**
-             * A list of up to 16 channels that you would like to link to from the featured channels module. The property value is a list of YouTube channel ID values, each of which uniquely identifies a channel.
-             */
-            featuredChannelsUrls: string[];
-            /**
-             * The video that should play in the featured video module in the channel pages browse view for unsubscribed viewers. Subscribed viewers may see a different view that highlights more recent channel activity.
-             */
-            unsubscribedTrailer: string;
-        }
-        /**
-         * The watch object encapsulates branding properties of the watch pages for the channels videos.
-         */
-        watch: {
-            /**
-             * The background color for the video watch pages branded area.
-             */
-            textColor: string;
-            /**
-             * The text color for the video watch pages branded area.
-             */
-            backgroundColor: string;
-            /**
-             * An ID that uniquely identifies a playlist that displays next to the video player on the video watch page.
-             */
-            featuredPlaylistId: string;
-        }
-        /**
-         * The image object encapsulates information about images that display on the channels channel page or video watch pages.
-         */
-        image: {
-            /**
-             * The URL for the banner image shown on the channel page on the YouTube website. The image is 1060px by 175px.
-             */
-            bannerImageUrl: string;
-            /**
-             * The URL for the banner image shown on the channel page in mobile applications. The image is 640px by 175px.
-             */
-            bannerMobileImageUrl: string;
-            /**
-             * The backgroundImageUrl object encapsulates settings for the background image shown on the video watch page. The image is 1200px by 615px, with a maximum file size of 128k.
-             */
-            backgroundImageUrl: {
-                /**
-                 * The default value for the property.
-                 */
-                default: string;
-                /**
-                 * A list of objects that specify language-specific values for the property.
-                 */
-                localized: {
-                    /**
-                     * The property value for a specified language.
-                     */
-                    value: string;
-                    /**
-                     * The language associated with the value.
-                     */
-                    language: string;
-                }[];
-            }
-            /**
-             * The largeBrandedBannerImageImapScript object encapsulates information about the image map script for the banner image shown on the channel page.
-             */
-            largeBrandedBannerImageImapScript: {
-                /**
-                 * The default value for the property.
-                 */
-                default: string;
-                /**
-                 * A list of objects that specify language-specific values for the property.
-                 */
-                localized: {
-                    /**
-                     * The property value for a specified language.
-                     */
-                    value: string;
-                    /**
-                     * The language associated with the value.
-                     */
-                    language: string;
-                }[];
-            }
-            /**
-             * The URL for the 854px by 70px image that appears below the video player in the expanded video view of the video watch page.
-             */
-            largeBrandedBannerImageUrl: {
-                /**
-                 * The default value for the property.
-                 */
-                default: string;
-                /**
-                 * A list of objects that specify language-specific values for the property.
-                 */
-                localized: {
-                    /**
-                     * The property value for a specified language.
-                     */
-                    value: string;
-                    /**
-                     * The language associated with the value.
-                     */
-                    language: string;
-                }[];
-            }
-            /**
-             * The image map script for the small banner image. The largeBrandedBannerImageImapScript object encapsulates information about the image map script for the banner image shown on the channel page in mobile applications.
-             */
-            smallBrandedBannerImageImapScript: {
-                /**
-                 * The default value for the property.
-                 */
-                default: string;
-                /**
-                 * A list of objects that specify language-specific values for the property.
-                 */
-                localized: {
-                    /**
-                     * The property value for a specified language.
-                     */
-                    value: string;
-                    /**
-                     * The language associated with the value.
-                     */
-                    language: string;
-                }[];
-            }
-            /**
-             * The URL for the 640px by 70px banner image that appears below the video player in the default view of the video watch page.
-             */
-            smallBrandedBannerImageUrl: {
-                /**
-                 * The default value for the property.
-                 */
-                default: string;
-                /**
-                 * A list of objects that specify language-specific values for the property.
-                 */
-                localized: {
-                    /**
-                     * The property value for a specified language.
-                     */
-                    value: string;
-                    /**
-                     * The language associated with the value.
-                     */
-                    language: string;
-                }[];
-            }
-            /**
-             * The URL for the image that appears above the video player. This is a 25-pixel-high image with a flexible width that cannot exceed 170 pixels. If you do not provide this image, your channel name will appear instead of an image.
-             */
-            watchIconImageUrl: string;
-            /**
-             * The URL for a 1px by 1px tracking pixel that can be used to collect statistics for views of the channel or video pages.
-             */
-            trackingImageUrl: string;
-            /**
-             * The URL for a low-resolution banner image that displays on the channel page in tablet applications. The image is 1138px by 188px.
-             */
-            bannerTabletLowImageUrl: string;
-            /**
-             * The URL for a banner image that displays on the channel page in tablet applications. The image is 1707px by 283px.
-             */
-            bannerTabletImageUrl: string;
-            /**
-             * The URL for a high-resolution banner image that displays on the channel page in tablet applications. The image is 2276px by 377px.
-             */
-            bannerTabletHdImageUrl: string;
-            /**
-             * The URL for an insanely high-resolution banner image that displays on the channel page in tablet applications. The image is 2560px by 424px.
-             */
-            bannerTabletExtraHdImageUrl: string;
-            /**
-             * The URL for a low-resolution banner image that displays on the channel page in mobile applications. The image is 320px by 88px.
-             */
-            bannerMobileLowImageUrl: string;
-            /**
-             * The URL for a medium-resolution banner image that displays on the channel page in mobile applications. The image is 960px by 263px.
-             */
-            bannerMobileMediumImageUrl: string;
-            /**
-             * The URL for a high-resolution banner image that displays on the channel page in mobile applications. The image is 1280px by 360px.
-             */
-            bannerMobileHdImageUrl: string;
-            /**
-             * The URL for a very high-resolution banner image that displays on the channel page in mobile applications. The image is 1440px by 395px.
-             */
-            bannerMobileExtraHdImageUrl: string;
-            /**
-             * The URL for a banner image that displays on the channel page in television applications. The image is 2120px by 1192px.
-             */
-            bannerTvImageUrl: string;
-            /**
-             * This property specifies the location of the banner image that YouTube will use to generate the various banner image sizes for a channel. To obtain the URL banner images external URL, you must first upload the channel banner image that you want to use by calling the channelBanners.insert method.
-             */
-            bannerExternalUrl: string;
-        }
-        /**
-         * The hints object encapsulates additional branding properties
-         */
-        hints: {
-            /**
-             * A property.
-             */
-            property: string;
-            /**
-             * The propertys value.
-             */
-            value: string;
-        }[];
-    }
-    /**
-     * The invideoPromotion object encapsulates information about a promotional campaign associated with the channel. A channel can use an in-video promotional campaign to display the thumbnail image of a promoted video in the video player during playback of the channels videos
-     */
-    invideoPromotion: {
-        /**
-         * The timing object encapsulates information about the temporal position within the video when the promoted item will be displayed.
-         */
-        timing: {
-            /**
-             * The timing method that determines when the promoted item is inserted during the video playback. If the value is offsetFromStart, then the offsetMs field represents an offset from the start of the video. If the value is offsetFromEnd, then the offsetMs field represents an offset from the end of the video.
-             */
-            type: string;
-            /**
-             * The time offset, specified in milliseconds, that determines when the promoted item appears during video playbacks. The type propertys value determines whether the offset is measured from the start or end of the video.
-             */
-            offsetMs: number;
-        }
-        /**
-         * The position object encapsulates information about the spatial position within the video where the promoted item will be displayed.
-         */
-        position: {
-            /**
-             * The manner in which the promoted item is positioned in the video player.
-             */
-            type: string;
-            /**
-             * The corner of the player where the promoted item will appear.
-             */
-            cornerPosition: string;
-        }
-        /**
-         * The list of promoted items in the order that they will display across different playbacks to the same viewer.
-         */
-        items: {
-            /**
-             * The promoted items type.
-             */
-            type: string;
-            /**
-             * If the promoted item represents a video, then this value is present and identifies the YouTube ID that YouTube assigned to identify that video. This field is only present if the type propertys value is video.
-             */
-            videoId: string;
-        }[];
-    }
-}
-
-interface GoogleApiYouTubeGuideCategoryResource {
-    /**
-     * The ID that YouTube uses to uniquely identify the guide category.
-     */
-    id: string;
-    /**
-     * The type of the API resource. For guideCategory resources, the value will be youtube#guideCategory.
-     */
-    kind: string;
-    /**
-     * The ETag of the guideCategory resource.
-     */
-    etag: string;
-    /**
-     * The snippet object contains basic details about the category, such as its title.
-     */
-    snippet: {
-        /**
-         * The ID that YouTube uses to uniquely identify the channel publishing the guide category.
-         */
-        channelId: string;
-        /**
-         * The categorys title.
-         */
-        title: string;
-    }
-}
-
-interface GoogleApiYouTubePlaylistItemResource {
-    /**
-     * The ID that YouTube uses to uniquely identify the playlist item.
-     */
-    id: string;
-    /**
-     * The type of the API resource. For playlist item resources, the value will be youtube#playlistItem.
-     */
-    kind: string;
-    /**
-     * The ETag for the playlist item resource.
-     */
-    etag: string;
-    /**
-     * The snippet object contains basic details about the playlist item, such as its title and position in the playlist.
-     */
-    snippet: {
-        /**
-         * The date and time that the item was added to the playlist. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.
-         */
-        publishedAt: string;
-        /**
-         * The ID that YouTube uses to uniquely identify the user that added the item to the playlist.
-         */
-        channelId: string;
-        /**
-         * The items title.
-         */
-        title: string;
-        /**
-         * The items description.
-         */
-        description: string;
-        /**
-         * A map of thumbnail images associated with the playlist item. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail.
-         */
-        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
-        /**
-         * The channel title of the channel that the playlist item belongs to.
-         */
-        channelTitle: string;
-        /**
-         * The ID that YouTube uses to uniquely identify the playlist that the playlist item is in.
-         */
-        playlistId: string;
-        /**
-         * The order in which the item appears in the playlist. The value uses a zero-based index, so the first item has a position of 0, the second item has a position of 1, and so forth.
-         */
-        position: number;
-        /**
-         * The id object contains information that can be used to uniquely identify the resource that is included in the playlist as the playlist item.
-         */
-        resourceId: {
-            /**
-             * The kind, or type, of the referred resource.
-             */
-            kind: string;
-            /**
-             * If the snippet.resourceId.kind propertys value is youtube#video, then this property will be present and its value will contain the ID that YouTube uses to uniquely identify the video in the playlist.
-             */
-            videoId: string;
-        }
-    }
-    /**
-     * The contentDetails object is included in the resource if the included item is a YouTube video. The object contains additional information about the video.
-     */
-    contentDetails: {
-        /**
-         * The ID that YouTube uses to uniquely identify a video. To retrieve the video resource, set the id query parameter to this value in your API request.
-         */
-        videoId: string;
-        /**
-         * The time, measured in seconds from the start of the video, when the video should start playing. (The playlist owner can specify the times when the video should start and stop playing when the video is played in the context of the playlist.) The default value is 0.
-         */
-        startAt: string;
-        /**
-         * The time, measured in seconds from the start of the video, when the video should stop playing. (The playlist owner can specify the times when the video should start and stop playing when the video is played in the context of the playlist.) By default, assume that the video.endTime is the end of the video.
-         */
-        endAt: string;
-        /**
-         * A user-generated note for this item.
-         */
-        note: string;
-    }
-    /**
-     * The status object contains information about the playlist items privacy status.
-     */
-    status: {
-        /**
-         * The playlist items privacy status. The channel that uploaded the video that the playlist item represents can set this value using either the videos.insert or videos.update method.
-         */
-        privacyStatus: string;
-    }
-}
-
-interface GoogleApiYouTubePlaylistResource {
-    /**
-     * The ID that YouTube uses to uniquely identify the playlist.
-     */
-    id: string;
-    /**
-     * The type of the API resource. For video resources, the value will be youtube#playlist.
-     */
-    kind: string;
-    /**
-     * The ETag for the playlist resource.
-     */
-    etag: string;
-    /**
-     * The snippet object contains basic details about the playlist, such as its title and description.
-     */
-    snippet: {
-        /**
-         * The date and time that the playlist was created. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.
-         */
-        publishedAt: string;
-        /**
-         * The ID that YouTube uses to uniquely identify the channel that published the playlist.
-         */
-        channelId: string;
-        /**
-         * The playlists title.
-         */
-        title: string;
-        /**
-         * The playlists description.
-         */
-        description: string;
-        /**
-         * A map of thumbnail images associated with the playlist. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail.
-         */
-        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
-        /**
-         * The channel title of the channel that the video belongs to.
-         */
-        channelTitle: string;
-        /**
-         * Keyword tags associated with the playlist.
-         */
-        tags: string[];
-    }
-    /**
-     * The status object contains status information for the playlist.
-     */
-    status: {
-        /**
-         * The playlists privacy status.
-         */
-        privacyStatus: string;
-    }
-    /**
-     * The contentDetails object contains information about the playlist content, including the number of videos in the playlist.
-     */
-    contentDetails: {
-        /**
-         * The number of videos in the playlist.
-         */
-        itemCount: number;
-    }
-    /**
-     * The player object contains information that you would use to play the playlist in an embedded player.
-     */
-    player: {
-        /**
-         * An <iframe> tag that embeds a player that will play the playlist.
-         */
-        embedHtml: string;
-    }
-}
-
-interface GoogleApiYouTubeSearchResource {
-    /**
-     * The kind, fixed to "youtube#searchResult".
-     */
-    kind: string;
-    /**
-     * Etag of this resource.
-     */
-    etag: string;
-    /**
-     * The id object contains information that can be used to uniquely identify the resource that matches the search request.
-     */
-    id: {
-        /**
-         * The type of the API resource.
-         */
-        kind: string;
-        /**
-         * If the id.type propertys value is youtube#video, then this property will be present and its value will contain the ID that YouTube uses to uniquely identify a video that matches the search query.
-         */
-        videoId: string;
-        /**
-         * If the id.type propertys value is youtube#channel, then this property will be present and its value will contain the ID that YouTube uses to uniquely identify a channel that matches the search query.
-         */
-        channelId: string;
-        /**
-         * If the id.type propertys value is youtube#playlist, then this property will be present and its value will contain the ID that YouTube uses to uniquely identify a playlist that matches the search query.
-         */
-        playlistId: string;
-    }
-    /**
-     * The snippet object contains basic details about a search result, such as its title or description.
-     */
-    snippet: {
-        /**
-         * The creation date and time of the resource that the search result identifies. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.
-         */
-        publishedAt: string;
-        /**
-         * The value that YouTube uses to uniquely identify the channel that published the resource that the search result identifies.
-         */
-        channelId: string;
-        /**
-         * The title of the search result.
-         */
-        title: string;
-        /**
-         * A description of the search result.
-         */
-        description: string;
-        /**
-         * A map of thumbnail images associated with the search result. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail.
-         */
-        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
-        /**
-         * The title of the channel that published the resource that the search result identifies.
-         */
-        channelTitle: string;
-    }
-}
-
-interface GoogleApiYouTubeSubscriptionResource {
-    /**
-     * The ID that YouTube uses to uniquely identify the subscription.
-     */
-    id: string;
-    /**
-     * The ETag of the subscription resource.
-     */
-    etag: string;
-    /**
-     * The type of the API resource. For subscription resources, the value will be youtube#subscription.
-     */
-    kind: string;
-    /**
-     * The snippet object contains basic details about the subscription, including its title and the channel that the user subscribed to.
-     */
-    snippet: {
-        /**
-         * The date and time that the subscription was created. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.
-         */
-        publishedAt: string;
-        /**
-         * The title of the channel that the subscription belongs to.
-         */
-        channelTitle: string;
-        /**
-         * The subscriptions title.
-         */
-        title: string;
-        /**
-         * The subscriptions details.
-         */
-        description: string;
-        /**
-         * The id object contains information about the channel that the user subscribed to.
-         */
-        resourceId: {
-            /**
-             * The type of the API resource.
-             */
-            kind: string;
-            /**
-             * The value that YouTube uses to uniquely identify the channel that the user subscribed to.
-             */
-            channelId: string;
-        }
-        /**
-         * The ID that YouTube uses to uniquely identify the subscribers channel. The resource_id object identifies the channel that the user subscribed to.
-         */
-        channelId: string;
-        /**
-         * A map of thumbnail images associated with the subscription. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail.
-         */
-        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
-    }
-    /**
-     *
-     */
-    contentDetails: {
-        /**
-         *
-         */
-        totalItemCount: number;
-        /**
-         *
-         */
-        newItemCount: number;
-    }
-    /**
-     *
-     */
-    subscriberSnippet: {
-        title: string;
-        description: string;
-        channelId: string;
-        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
-    }
-}
-
-interface GoogleApiYouTubeThumbnailResource {
-    /**
-     * The default thumbnail image. The default thumbnail for a video – or a resource that refers to a video, such as a playlist item or search result – is 120px wide and 90px tall. The default thumbnail for a channel is 88px wide and 88px tall.
-     */
-    default: GoogleApiYouTubeThumbnailItemResource;
-    /**
-     * A higher resolution version of the thumbnail image. For a video (or a resource that refers to a video), this image is 320px wide and 180px tall. For a channel, this image is 240px wide and 240px tall.
-     */
-    medium: GoogleApiYouTubeThumbnailItemResource;
-    /**
-     * A high resolution version of the thumbnail image. For a video (or a resource that refers to a video), this image is 480px wide and 360px tall. For a channel, this image is 800px wide and 800px tall.
-     */
-    high: GoogleApiYouTubeThumbnailItemResource;
-}
-
-interface GoogleApiYouTubeThumbnailItemResource {
-    /**
-     * The images URL.
-     */
-    url: string;
-    /**
-     * The images width.
-     */
-    width: number;
-    /**
-     * The images height.
-     */
-    height: number;
-}
-
-interface GoogleApiYouTubeVideoCategoryResource {
-    /**
-     * The ID that YouTube uses to uniquely identify the video category.
-     */
-    id: string;
-    /**
-     * The type of the API resource. For video category resources, the value will be youtube#videoCategory.
-     */
-    kind: string;
-    /**
-     * The ETag of the videoCategory resource.
-     */
-    etag: string;
-    /**
-     * The snippet object contains basic details about the video category, including its title.
-     */
-    snippet: {
-        /**
-         * The YouTube channel that created the video category.
-         */
-        channelId: string;
-        /**
-         * The video categorys title.
-         */
-        title: string;
-    }
-}
-
-interface GoogleApiYouTubeVideoResource {
-    /**
-     * The ID that YouTube uses to uniquely identify the video.
-     */
-    id: string;
-    /**
-     * The type of the API resource. For video resources, the value will be youtube#video.
-     */
-    kind: string;
-    /**
-     * The ETag of the video resource.
-     */
-    etag: string;
-    /**
-     * The snippet object contains basic details about the video, such as its title, description, and category.
-     */
-    snippet: {
-        /**
-         * The date and time that the video was uploaded. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.
-         */
-        publishedAt: string;
-        /**
-         * The ID that YouTube uses to uniquely identify the channel that the video was uploaded to.
-         */
-        channelId: string;
-        /**
-         * The videos title.
-         */
-        title: string;
-        /**
-         * The videos description.
-         */
-        description: string;
-        /**
-         * A map of thumbnail images associated with the video. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail.
-         */
-        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
-        /**
-         * Channel title for the channel that the video belongs to.
-         */
-        channelTitle: string;
-        /**
-         * A list of keyword tags associated with the video. Tags may contain spaces. This field is only visible to the videos uploader.
-         */
-        tags: string[];
-        /**
-         * The YouTube video category associated with the video.
-         */
-        categoryId: string;
-    }
-    /**
-     * The contentDetails object contains information about the video content, including the length of the video and its aspect ratio.
-     */
-    contentDetails: {
-        /**
-         * The length of the video. The tag value is an ISO 8601 duration in the format PT#M#S, in which the letters PT indicate that the value specifies a period of time, and the letters M and S refer to length in minutes and seconds, respectively. The # characters preceding the M and S letters are both integers that specify the number of minutes (or seconds) of the video.
-         */
-        duration: string;
-        /**
-         * Indicates whether the video is available in 3D or in 2D.
-         */
-        dimension: string;
-        /**
-         * Indicates whether the video is available in high definition (HD) or only in standard definition.
-         */
-        definition: string;
-        /**
-         * Indicates whether captions are available for the video.
-         */
-        caption: string;
-        /**
-         * Indicates whether the video represents licensed content, which means that the content has been claimed by a YouTube content partner.
-         */
-        licensedContent: boolean;
-        /**
-         * The regionRestriction object contains information about the countries where a video is (or is not) viewable. The object will contain either the contentDetails.regionRestriction.allowed property or the contentDetails.regionRestriction.blocked property.
-         */
-        regionRestriction: {
-            /**
-             * A list of region codes that identify countries where the video is viewable. If this property is present and a country is not listed in its value, then the video is blocked from appearing in that country. If this property is present and contains an empty list, the video is blocked in all countries.
-             */
-            allowed: string[];
-            /**
-             * A list of region codes that identify countries where the video is blocked. If this property is present and a country is not listed in its value, then the video is viewable in that country. If this property is present and contains an empty list, the video is viewable in all countries.
-
-             */
-            blocked: string[];
-        }
-        /**
-         * Specifies the ratings that the video received under various rating schemes.
-         */
-        contentRating: {
-            /**
-             * The videos Motion Picture Association of America (MPAA) rating.
-             */
-            mpaaRating: string;
-            /**
-             * The videos TV Parental Guidelines (TVPG) rating.
-             */
-            tvpgRating: string;
-            /**
-             * The videos British Board of Film Classification (BBFC) rating.
-             */
-            bbfcRating: string;
-            /**
-             * The videos Canadian Home Video Rating System (CHVRS) rating.
-             */
-            chvrsRating: string;
-            /**
-             * The videos Eirin rating. Eirin is the Japanese rating system.
-             */
-            eirinRating: string;
-            /**
-             * The videos Central Board of Film Certification (CBFC - India) rating.
-             */
-            cbfcRating: string;
-            /**
-             * The videos Centre national du cinéma et de limage animé (French Ministry of Culture) rating.
-             */
-            fmocRating: string;
-            /**
-             * The videos Instituto de la Cinematografía y de las Artes Audiovisuales (ICAA - Spain) rating.
-             */
-            icaaRating: string;
-            /**
-             * The videos Australian Classification Board (ACB) rating.
-             */
-            acbRating: string;
-            /**
-             * The videos Office of Film and Literature Classification (OFLC - New Zealand) rating.
-             */
-            oflcRating: string;
-            /**
-             * The videos Freiwillige Selbstkontrolle der Filmwirtschaft (FSK - Germany) rating.
-             */
-            fskRating: string;
-            /**
-             * The videos Korea Media Rating Board rating. The KMRB rates videos in South Korea.
-             */
-            kmrbRating: string;
-            /**
-             * The videos Departamento de Justiça, Classificação, Qualificação e Títulos (DJCQT - Brazil) rating.
-             */
-            djctqRating: string;
-            /**
-             * The videos National Film Registry of the Russian Federation (MKRF - Russia) rating.
-             */
-            russiaRating: string;
-            /**
-             * The videos General Directorate of Radio, Television and Cinematography (Mexico) rating.
-             */
-            rtcRating: string;
-        }
-    }
-    /**
-     * The player object contains information that you would use to play the video in an embedded player.
-     */
-    player: {
-        /**
-         * An <iframe> tag that embeds a player that will play the video.
-         */
-        embedHtml: string;
-    }
-    /**
-     * The statistics object contains statistics about the video.
-     */
-    statistics: {
-        /**
-         * The number of times the video has been viewed.
-         */
-        viewCount: number;
-        /**
-         * The number of users who have indicated that they liked the video by giving it a positive rating.
-         */
-        likeCount: number;
-        /**
-         * The number of users who have indicated that they disliked the video by giving it a negative rating.
-         */
-        dislikeCount: number;
-        /**
-         * The number of users who currently have the video marked as a favorite video.
-         */
-        favoriteCount: number;
-        /**
-         * The number of comments for the video.
-         */
-        commentCount: number;
-    }
-    /**
-     * The status object contains information about the videos uploading, processing, and privacy statuses.
-     */
-    status: {
-        /**
-         * The status of the uploaded video.
-         */
-        uploadStatus: string;
-        /**
-         * This value explains why a video failed to upload. This property is only present if the uploadStatus property indicates that the upload failed.
-         */
-        failureReason: string;
-        /**
-         * This value explains why YouTube rejected an uploaded video. This property is only present if the uploadStatus property indicates that the upload was rejected.
-         */
-        rejectionReason: string;
-        /**
-         * The videos privacy status.
-         */
-        privacyStatus: string;
-        /**
-         * The videos license.
-         */
-        license: string;
-        /**
-         * This value indicates whether the video can be embedded on another website.
-
-         */
-        embeddable: boolean;
-        /**
-         * This value indicates whether the extended video statistics on the videos watch page are publicly viewable. By default, those statistics are viewable, and statistics like a videos viewcount and ratings will still be publicly visible even if this propertys value is set to false.
-         */
-        publicStatsViewable: boolean;
-    }
-    /**
-     * The topicDetails object encapsulates information about Freebase topics associated with the video.
-     */
-    topicDetails: {
-        /**
-         * A list of Freebase topic IDs associated with the video. You can retrieve information about each topic using the Freebase Topic API.
-         */
-        topicIds: string[];
-    }
-    /**
-     * The recordingDetails object encapsulates information about the location, date and address where the video was recorded. This object will only be returned for a video if the videos geolocation data or recording time has been set.
-     */
-    recordingDetails: {
-        /**
-         * The geolocation information associated with the video.
-         */
-        location: {
-            /**
-             * Latitude in degrees.
-             */
-            latitude: number;
-            /**
-             * Longitude in degrees.
-             */
-            longitude: number;
-            /**
-             * Altitude above the WGS 84 reference ellipsoid, in meters.
-             */
-            elevation: number;
-        }
-        /**
-         * The text description of the location where the video was recorded.
-         */
-        locationDescription: string;
-        /**
-         * The date and time when the video was recorded. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.
-         */
-        recordingDate: string;
-    }
-    /**
-     * The fileDetails object encapsulates information about the video file that was uploaded to YouTube, including the files resolution, duration, audio and video codecs, stream bitrates, and more. This data can only be retrieved by the video owner.
-     */
-    fileDetails: {
-        /**
-         * The uploaded files name. This field is present whether a video file or another type of file was uploaded.
-         */
-        fileName: string;
-        /**
-         * The uploaded files size in bytes. This field is present whether a video file or another type of file was uploaded.
-         */
-        fileSize: number;
-        /**
-         * The uploaded files type as detected by YouTubes video processing engine. Currently, YouTube only processes video files, but this field is present whether a video file or another type of file was uploaded.
-         */
-        fileType: string;
-        /**
-         * The uploaded video files container format.
-         */
-        container: string;
-        /**
-         * A list of video streams contained in the uploaded video file. Each item in the list contains detailed metadata about a video stream.
-         */
-        videoStreams: {
-            /**
-             * The encoded video contents width in pixels.
-             */
-            widthPixels: number;
-            /**
-             * The encoded video contents height in pixels.
-             */
-            heightPixels: number;
-            /**
-             * The video streams frame rate, in frames per second.
-             */
-            frameRateFps: number;
-            /**
-             * The video contents display aspect ratio, which specifies the aspect ratio in which the video should be displayed.
-             */
-            aspectRatio: number;
-            /**
-             * The video codec that the stream uses.
-             */
-            codec: string;
-            /**
-             * The video streams bitrate, in bits per second.
-             */
-            bitrateBps: number;
-            /**
-             * The amount that YouTube needs to rotate the original source content to properly display the video.
-             */
-            rotation: string;
-            /**
-             * A value that uniquely identifies a video vendor. Typically, the value is a four-letter vendor code.
-             */
-            vender: string;
-        }[];
-        /**
-         * A list of audio streams contained in the uploaded video file. Each item in the list contains detailed metadata about an audio stream.
-         */
-        audioStreams: {
-            /**
-             * The number of audio channels that the stream contains.
-             */
-            channelCount: number;
-            /**
-             * The audio codec that the stream uses.
-             */
-            codec: string;
-            /**
-             * The audio streams bitrate, in bits per second.
-             */
-            bitrateBps: number;
-            /**
-             * A value that uniquely identifies a video vendor. Typically, the value is a four-letter vendor code.
-             */
-            vendor: string;
-        }[];
-        /**
-         * The length of the uploaded video in milliseconds.
-         */
-        durationMs: number;
-        /**
-         * The uploaded video files combined (video and audio) bitrate in bits per second.
-         */
-        bitrateBps: number;
-        /**
-         * Geographic coordinates that identify the place where the uploaded video was recorded. Coordinates are defined using WGS 84.
-         */
-        recordingLocation: {
-            /**
-             * Latitude in degrees.
-             */
-            latitude: number;
-            /**
-             * Longitude in degrees.
-             */
-            longitude: number;
-            /**
-             * Altitude above the WGS 84 reference ellipsoid, in meters.
-             */
-            elevation: number;
-        }
-        /**
-         * The date and time when the uploaded video file was created. The value is specified in ISO 8601 format. Currently, the following ISO 8601 formats are supported:
-         */
-        creationTime: string;
-    }
-    /**
-     * The processingProgress object encapsulates information about YouTubes progress in processing the uploaded video file. The properties in the object identify the current processing status and an estimate of the time remaining until YouTube finishes processing the video. This part also indicates whether different types of data or content, such as file details or thumbnail images, are available for the video.
-     * The processingProgress object is designed to be polled so that the video uploaded can track the progress that YouTube has made in processing the uploaded video file. This data can only be retrieved by the video owner.
-     */
-    processingDetails: {
-        /**
-         * The videos processing status. This value indicates whether YouTube was able to process the video or if the video is still being processed.
-         */
-        processingStatus: string;
-        /**
-         * The processingProgress object contains information about the progress YouTube has made in processing the video. The values are really only relevant if the videos processing status is processing.
-         */
-        processingProgress: {
-            /**
-             * An estimate of the total number of parts that need to be processed for the video. The number may be updated with more precise estimates while YouTube processes the video.
-             */
-            partsTotal: number;
-            /**
-             * The number of parts of the video that YouTube has already processed.
-             */
-            partsProcessed: number;
-            /**
-             * An estimate of the amount of time, in millseconds, that YouTube needs to finish processing the video.
-             */
-            timeLeftMs: number;
-        }
-        processingFailureReason: string;
-        /**
-         * The reason that YouTube failed to process the video. This property will only have a value if the processingStatus propertys value is failed.
-         */
-        fileDetailsAvailability: string;
-        /**
-         * This value indicates whether file details are available for the uploaded video. You can retrieve a videos file details by requesting the fileDetails part in your videos.list() request.
-         */
-        processingIssuesAvailability: string;
-        /**
-         * This value indicates whether keyword (tag) suggestions are available for the video. Tags can be added to a videos metadata to make it easier for other users to find the video. You can retrieve these suggestions by requesting the suggestions part in your videos.list() request.
-         */
-        tagSuggestionsAvailability: string;
-        /**
-         * This value indicates whether video editing suggestions, which might improve video quality or the playback experience, are available for the video. You can retrieve these suggestions by requesting the suggestions part in your videos.list() request.
-         */
-        editorSuggestionsAvailability: string;
-        /**
-         * This value indicates whether thumbnail images have been generated for the video.
-         */
-        thumbnailsAvailability: string;
-    }
-    /**
-     * The suggestions object encapsulates suggestions that identify opportunities to improve the video quality or the metadata for the uploaded video. This data can only be retrieved by the video owner.
-     */
-    suggestions: {
-        /**
-         * A list of errors that will prevent YouTube from successfully processing the uploaded video. These errors indicate that, regardless of the videos current processing status, eventually, that status will almost certainly be failed.
-         */
-        processingErrors: string[];
-        /**
-         * A list of reasons why YouTube may have difficulty transcoding the uploaded video or that might result in an erroneous transcoding. These warnings are generated before YouTube actually processes the uploaded video file. In addition, they identify issues that do not necessarily indicate that video processing will fail but that still might cause problems such as sync issues, video artifacts, or a missing audio track.
-         */
-        processingWarnings: string[];
-        /**
-         * A list of suggestions that may improve YouTubes ability to process the video.
-         */
-        processingHints: string[];
-        /**
-         * A list of keyword tags that could be added to the videos metadata to increase the likelihood that users will locate your video when searching or browsing on YouTube.
-         */
-        tagSuggestions: {
-            /**
-             * The keyword tag suggested for the video.
-             */
-            tag: string;
-            /**
-             * A set of video categories for which the tag is relevant. You can use this information to display appropriate tag suggestions based on the video category that the video uploader associates with the video. By default, tag suggestions are relevant for all categories if there are no restricts defined for the keyword.
-             */
-            categoryRestricts: string[];
-        }[];
-        /**
-         * A list of video editing operations that might improve the video quality or playback experience of the uploaded video.
-         */
-        editorSuggestions: string[];
-    }
-
-}
-
-interface GoogleApiYouTubeVideoGetRatingResponse {
-    /**
-     * The type of the API response. For this operation, the value will be youtube#videoGetRatingResponse.
-     */
-    kind: string;
-    /**
-     * The ETag of the response.
-     */
-    etag: string;
-    /**
-     * A list of ratings that match the request criteria.
-     */
-    items: {
-        /**
-         * The ID that YouTube uses to uniquely identify the video.
-         */
-        videoId: string;
-        /**
-         * The rating that the authorized user gave to the video.
-         */
-        rating: string;
-    }[];
-}
diff --git a/gapi.youtube/index.d.ts b/gapi.youtube/index.d.ts
new file mode 100644
index 0000000000..9055b3a396
--- /dev/null
+++ b/gapi.youtube/index.d.ts
@@ -0,0 +1,2337 @@
+// Type definitions for YouTube Data API v3
+// Project: https://developers.google.com/youtube/v3/
+// Definitions by: Frank M <https://github.com/sgtfrankieboy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="gapi" />
+
+declare namespace gapi.client.youtube {
+
+    export interface activities {
+
+        /**
+         * Posts a bulletin for a specific channel.
+         */
+        insert(object: {
+            /**
+             * The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include. The part names that you can include in the parameter value are snippet and contentDetails.
+             */
+            part: string;
+            /**
+             * HTTP Request Body
+             */
+            RequestBody?: string;
+        }): HttpRequest<GoogleApiYouTubeActivityResource>;
+
+        /**
+         * Returns a list of channel activity events that match the request criteria.
+         */
+        list(object: {
+            /**
+             * The part parameter specifies a comma-separated list of one or more activity resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, and contentDetails. If the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a activity resource, the snippet property contains other properties that identify the type of activity, a display title for the activity, and so forth. If you set part=snippet, the API response will also contain all of those nested properties.
+             */
+            part: string;
+            /**
+             * The channelId parameter specifies a unique YouTube channel ID. The API will then return a list of that channel's activities.
+             */
+            channelId?: string;
+            /**
+             * Set this parameter's value to true to retrieve the activity feed that displays on the YouTube home page for the currently authenticated user.
+             */
+            home?: boolean;
+            /**
+             * The maxResults parameter specifies the maximum number of items that should be returned in the result set.
+             */
+            maxResults?: number;
+            /**
+             * Set this parameter's value to true to retrieve a feed of the authenticated user's activities.
+             */
+            mine?: boolean;
+            /**
+             * The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.
+             */
+            pageToken?: string;
+            /**
+             * The publishedAfter parameter specifies the earliest date and time that an activity could have occurred for that activity to be included in the API response. If the parameter value specifies a day, but not a time, then any activities that occurred that day will be included in the result set. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.
+             */
+            publishedAfter?: string;
+            /**
+             * The publishedBefore parameter specifies the date and time before which an activity must have occurred for that activity to be included in the API response. If the parameter value specifies a day, but not a time, then any activities that occurred that day will be excluded from the result set. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.
+             */
+            publishedBefore?: string;
+            /**
+             * The regionCode parameter instructs the API to return results for the specified country. The parameter value is an ISO 3166-1 alpha-2 country code.
+             */
+            regionCode?: string;
+        }): HttpRequest<GoogleApiYouTubePaginationInfo<GoogleApiYouTubeActivityResource>>;
+
+    }
+
+    export interface channelBanners {
+
+        /**
+         * Uploads a channel banner to YouTube.
+         */
+        insert(object: {
+            /**
+             * The onBehalfOfContentOwner parameter indicates that the authenticated user is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with needs to be linked to the specified YouTube content owner.
+             */
+            onBehalfOfContentOwner: string;
+            /**
+             * HTTP Request Body
+             */
+            RequestBody: string;
+        }): HttpRequest<GoogleApiYouTubeChannelBannerResource>;
+    }
+
+    export interface channels {
+
+        /**
+         * Returns a collection of zero or more channel resources that match the request criteria.
+         */
+        list(object: {
+            /**
+             * The part parameter specifies a comma-separated list of one or more channel resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, contentDetails, statistics, topicDetails, and invideoPromotion. If the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a channel resource, the contentDetails property contains other properties, such as the uploads properties. As such, if you set part=contentDetails, the API response will also contain all of those nested properties.
+             */
+            part: string;
+            /**
+             * The categoryId parameter specifies a YouTube guide category, thereby requesting YouTube channels associated with that category.
+             */
+            categoryId?: string;
+            /**
+             * The forUsername parameter specifies a YouTube username, thereby requesting the channel associated with that username.
+             */
+            forUsername?: string;
+            /**
+             * The id parameter specifies a comma-separated list of the YouTube channel ID(s) for the resource(s) that are being retrieved. In a channel resource, the id property specifies the channel's YouTube channel ID.
+             */
+            id?: string;
+            /**
+             * Set this parameter's value to true to instruct the API to only return channels managed by the content owner that the onBehalfOfContentOwner parameter specifies. The user must be authenticated as a CMS account linked to the specified content owner and onBehalfOfContentOwner must be provided.
+             */
+            managedByMe?: boolean;
+            /**
+             * The maxResults parameter specifies the maximum number of items that should be returned in the result set.
+             */
+            maxResults?: number;
+            /**
+             * Set this parameter's value to true to instruct the API to only return channels owned by the authenticated user.
+             */
+            mine?: boolean;
+            /**
+             * Set this parameter's value to true to retrieve a list of channels that subscribed to the authenticated user's channel.
+             */
+            mySubscribers?: boolean;
+            /**
+             * The onBehalfOfContentOwner parameter indicates that the authenticated user is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with needs to be linked to the specified YouTube content owner.
+             */
+            onBehalfOfContentOwner?: string;
+            /**
+             * The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.
+             */
+            pageToken?: string;
+        }): HttpRequest<GoogleApiYouTubePaginationInfo<GoogleApiYouTubeChannelResource>>;
+
+        /**
+         * Updates a channel's metadata.
+         */
+        update(object: {
+            /**
+             * The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include. The part names that you can include in the parameter value are id and invideoPromotion. Note that this method will override the existing values for all of the mutable properties that are contained in any parts that the parameter value specifies.
+             */
+            part: string;
+            /**
+             * The onBehalfOfContentOwner parameter indicates that the authenticated user is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with needs to be linked to the specified YouTube content owner.
+             */
+            onBehalfOfContentOwner?: string;
+            /**
+             * HTTP Request Body
+             */
+            RequestBody?: string;
+        }): HttpRequest<GoogleApiYouTubeChannelResource>;
+
+    }
+
+    export interface guideCategories {
+
+        /**
+         * Returns a list of categories that can be associated with YouTube channels.
+         */
+        list(object: {
+            /**
+             * The part parameter specifies a comma-separated list of one or more guideCategory resource properties that the API response will include. The part names that you can include in the parameter value are id and snippet. If the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a guideCategory resource, the snippet property contains other properties, such as the category's title. If you set part=snippet, the API response will also contain all of those nested properties.
+             */
+            part: string;
+            /**
+             * The hl parameter specifies the language that will be used for text values in the API response.
+             */
+            hl?: string;
+            /**
+             * The id parameter specifies a comma-separated list of the YouTube channel category ID(s) for the resource(s) that are being retrieved. In a guideCategory resource, the id property specifies the YouTube channel category ID.
+             */
+            id?: string;
+            /**
+             * The regionCode parameter instructs the API to return the list of guide categories available in the specified country. The parameter value is an ISO 3166-1 alpha-2 country code.
+             */
+            regionCode?: string;
+        }): HttpRequest<GoogleApiYouTubePageInfo<GoogleApiYouTubeGuideCategoryResource>>;
+
+    }
+
+    export interface playlistItems {
+
+        /**
+         * Deletes a playlist item.
+         */
+        delete(object: {
+            /**
+             * The id parameter specifies the YouTube playlist item ID for the playlist item that is being deleted. In a playlistItem resource, the id property specifies the playlist item's ID.
+             */
+            id: string;
+        }): HttpRequest<GoogleApiYouTubePlaylistItemResource>;
+
+        /**
+         * Adds a resource to a playlist.
+         */
+        insert(object: {
+            /**
+             * The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include. The part names that you can include in the parameter value are snippet and contentDetails.
+             */
+            part: string;
+            /**
+             * HTTP Request Body
+             */
+            RequestBody?: string;
+        }): HttpRequest<GoogleApiYouTubePlaylistItemResource>;
+
+        /**
+         * Returns a collection of playlist items that match the API request parameters. You can retrieve all of the playlist items in a specified playlist or retrieve one or more playlist items by their unique IDs.
+         */
+        list(object: {
+            /**
+             * The part parameter specifies a comma-separated list of one or more playlistItem resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, and contentDetails. If the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a playlistItem resource, the snippet property contains numerous fields, including the title, description, position, and resourceId properties. As such, if you set part=snippet, the API response will contain all of those properties.
+             */
+            part: string;
+            /**
+             * The id parameter specifies a comma-separated list of one or more unique playlist item IDs.
+             */
+            id?: string;
+            /**
+             * The maxResults parameter specifies the maximum number of items that should be returned in the result set.
+             */
+            maxResults?: number;
+            /**
+             * The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.
+             */
+            pageToken?: string;
+            /**
+             * The playlistId parameter specifies the unique ID of the playlist for which you want to retrieve playlist items. Note that even though this is an optional parameter, every request to retrieve playlist items must specify a value for either the id parameter or the playlistId parameter.
+             */
+            playlistId?: string;
+            /**
+             * The videoId parameter specifies that the request should return only the playlist items that contain the specified video.
+             */
+            videoId?: string;
+        }): HttpRequest<GoogleApiYouTubePaginationInfo<GoogleApiYouTubePlaylistItemResource>>;
+
+        /**
+         * Modifies a playlist item. For example, you could update the item's position in the playlist.
+         */
+        update(object: {
+            /**
+             * The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include. The part names that you can include in the parameter value are snippet and status. Note that this method will override the existing values for all of the mutable properties that are contained in any parts that the parameter value specifies. For example, a playlist's privacy setting is contained in the status part. As such, if your request is updating a private playlist, and the request's part parameter value includes the status part, the playlist's privacy setting will be updated to whatever value the request body specifies. If the request body does not specify a value, the existing privacy setting will be removed and the playlist will revert to the default privacy setting.
+             */
+            part: string;
+            /**
+             * HTTP Request Body
+             */
+            RequestBody?: string;
+        }): HttpRequest<GoogleApiYouTubePlaylistItemResource>;
+    }
+
+    export interface playlists {
+
+        /**
+         * Deletes a playlist.
+         */
+        delete(object: {
+            /**
+             * The id parameter specifies the YouTube playlist ID for the playlist that is being deleted. In a playlist resource, the id property specifies the playlist's ID.
+
+             */
+            id: string;
+        }): HttpRequest<GoogleApiYouTubePlaylistResource>;
+
+        /**
+         * Creates a playlist.
+         */
+        insert(object: {
+            /**
+             * The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include. The part names that you can include in the parameter value are snippet and status.
+             */
+            part: string;
+            /**
+             * HTTP Request Body
+             */
+            RequestBody?: string;
+        }): HttpRequest<GoogleApiYouTubePlaylistResource>;
+
+        /**
+         * Returns a collection of playlists that match the API request parameters. For example, you can retrieve all playlists that the authenticated user owns, or you can retrieve one or more playlists by their unique IDs.
+         */
+        list(object: {
+            /**
+             * The part parameter specifies a comma-separated list of one or more playlist resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, and status. If the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a playlist resource, the snippet property contains properties like author, title, description, tags, and timeCreated. As such, if you set part=snippet, the API response will contain all of those properties.
+             */
+            part: string;
+            /**
+             * This value indicates that the API should only return the specified channel's playlists.
+             */
+            channelId?: string;
+            /**
+             * The id parameter specifies a comma-separated list of the YouTube playlist ID(s) for the resource(s) that are being retrieved. In a playlist resource, the id property specifies the playlist's YouTube playlist ID.
+             */
+            id?: string;
+            /**
+             * The maxResults parameter specifies the maximum number of items that should be returned in the result set.
+             */
+            maxResults?: number;
+            /**
+             * Set this parameter's value to true to instruct the API to only return playlists owned by the authenticated user.
+             */
+            mine?: boolean;
+            /**
+             * The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.
+             */
+            pagetoken: string;
+        }): HttpRequest<GoogleApiYouTubePaginationInfo<GoogleApiYouTubePlaylistResource>>;
+
+        /**
+         * Modifies a playlist. For example, you could change a playlist's title, description, or privacy status.
+         */
+        update(object: {
+            /**
+             * The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include. The part names that you can include in the parameter value are snippet and status. Note that this method will override the existing values for all of the mutable properties that are contained in any parts that the parameter value specifies. For example, a playlist's privacy setting is contained in the status part. As such, if your request is updating a private playlist, and the request's part parameter value includes the status part, the playlist's privacy setting will be updated to whatever value the request body specifies. If the request body does not specify a value, the existing privacy setting will be removed and the playlist will revert to the default privacy setting.
+             */
+            part: string;
+            /**
+             * HTTP Request Body
+             */
+            RequestBody?: string;
+        }): HttpRequest<GoogleApiYouTubePlaylistResource>;
+
+    }
+
+    export interface search {
+
+        /**
+         * Returns a collection of search results that match the query parameters specified in the API request. By default, a search result set identifies matching video, channel, and playlist resources, but you can also configure queries to only retrieve a specific type of resource.
+         */
+        list(object: {
+            /**
+             * The part parameter specifies a comma-separated list of one or more search resource properties that the API response will include. The part names that you can include in the parameter value are id and snippet. If the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a search result, the snippet property contains other properties that identify the result's title, description, and so forth. If you set part=snippet, the API response will also contain all of those nested properties.
+             */
+            part: string;
+            /**
+             * The channelId parameter indicates that the API response should only contain resources created by the channel
+             */
+            channelId?: string;
+            /**
+             * The channelType parameter lets you restrict a search to a particular type of channel.
+             */
+            channelType?: string;
+            /**
+             * The forContentOwner parameter restricts the search to only retrieve resources owned by the content owner specified by the onBehalfOfContentOwner parameter. The user must be authenticated as a CMS account linked to the specified content owner and onBehalfOfContentOwner must be provided.
+             */
+            forContentOwner?: boolean;
+            /**
+             * The forMine parameter restricts the search to only retrieve videos owned by the authenticated user.
+             */
+            forMine?: boolean;
+            /**
+             * The maxResults parameter specifies the maximum number of items that should be returned in the result set.
+             */
+            maxResults?: number;
+            /**
+             * The onBehalfOfContentOwner parameter indicates that the authenticated user is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with needs to be linked to the specified YouTube content owner.
+             */
+            onBehalfOfContentOwner?: string;
+            /**
+             * The order parameter specifies the method that will be used to order resources in the API response.
+             */
+            order?: string;
+            /**
+             * The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.
+             */
+            pageToken?: string;
+            /**
+             * The publishedAfter parameter indicates that the API response should only contain resources created after the specified time. The value is an RFC 3339 formatted date-time value (1970-01-01T00:00:00Z).
+             */
+            publishedAfter?: string;
+            /**
+             * The publishedBefore parameter indicates that the API response should only contain resources created before the specified time. The value is an RFC 3339 formatted date-time value (1970-01-01T00:00:00Z).
+             */
+            publishedBefore?: string;
+            /**
+             * The q parameter specifies the query term to search for.
+             */
+            q?: string;
+            /**
+             * The regionCode parameter instructs the API to return search results for the specified country. The parameter value is an ISO 3166-1 alpha-2 country code.
+             */
+            regionCode?: string;
+            /**
+             * The relatedToVideoId parameter retrieves a list of videos that are related to the video that the parameter value identifies. The parameter value must be set to a YouTube video ID and, if you are using this parameter, the type parameter must be set to video.
+             */
+            relatedToVideoId?: string;
+            /**
+             * The safeSearch parameter indicates whether the search results should include restricted content as well as standard content.
+             */
+            safeSearch?: string;
+            /**
+             * The topicId parameter indicates that the API response should only contain resources associated with the specified topic. The value identifies a Freebase topic ID.
+             */
+            topicId?: string;
+            /**
+             * The type parameter restricts a search query to only retrieve a particular type of resource.
+             */
+            type?: string;
+            /**
+             * The videoCaption parameter indicates whether the API should filter video search results based on whether they have captions.
+             */
+            videoCaption?: string;
+            /**
+             * The videoCategoryId parameter filters video search results based on their category.
+             */
+            videoCategoryId?: string;
+            /**
+             * The videoDefinition parameter lets you restrict a search to only include either high definition (HD) or standard definition (SD) videos. HD videos are available for playback in at least 720p, though higher resolutions, like 1080p, might also be available.
+             */
+            videoDefinition?: string;
+            /**
+             * The videoDimension parameter lets you restrict a search to only retrieve 2D or 3D videos.
+             */
+            videoDimension?: string;
+            /**
+             * The videoDuration parameter filters video search results based on their duration.
+             */
+            videoDuration?: string;
+            /**
+             * The videoEmbeddable parameter lets you to restrict a search to only videos that can be embedded into a webpage.
+             */
+            videoEmbeddable?: string;
+            /**
+             * The videoLicense parameter filters search results to only include videos with a particular license. YouTube lets video uploaders choose to attach either the Creative Commons license or the standard YouTube license to each of their videos.
+             */
+            videoLicense?: string;
+            /**
+             * The videoSyndicated parameter lets you to restrict a search to only videos that can be played outside youtube.com.
+             */
+            videoSyndicated?: string;
+            /**
+             * The videoType parameter lets you restrict a search to a particular type of videos.
+             */
+            videoType?: string;
+        }): HttpRequest<GoogleApiYouTubePaginationInfo<GoogleApiYouTubeSearchResource>>;
+
+    }
+
+    export interface subscriptions {
+
+        /**
+         * Deletes a subscription.
+         */
+        delete(object: {
+            /**
+             * The id parameter specifies the YouTube subscription ID for the resource that is being deleted. In a subscription resource, the id property specifies the YouTube subscription ID.
+             */
+            id: string;
+        }): HttpRequest<GoogleApiYouTubeSubscriptionResource>;
+
+        /**
+         * Adds a subscription for the authenticated user's channel.
+         */
+        insert(object: {
+            /**
+             * The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include. The part names that you can include in the parameter value are snippet and contentDetails.
+             */
+            part: string;
+            /**
+             * HTTP Request Body
+             */
+            RequestBody: string;
+        }): HttpRequest<GoogleApiYouTubeSubscriptionResource>;
+
+        /**
+         * Returns subscription resources that match the API request criteria.
+         */
+        list(object: {
+            /**
+             * The part parameter specifies a comma-separated list of one or more subscription resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, and contentDetails. If the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a subscription resource, the snippet property contains other properties, such as a display title for the subscription. If you set part=snippet, the API response will also contain all of those nested properties.
+             */
+            part: string;
+            /**
+             * The channelId parameter specifies a YouTube channel ID. The API will only return that channel's subscriptions.
+             */
+            channelId?: string;
+            /**
+             * The forChannelId parameter specifies a comma-separated list of channel IDs. The API response will then only contain subscriptions matching those channels.
+             */
+            forChannelId?: string;
+            /**
+             * The id parameter specifies a comma-separated list of the YouTube subscription ID(s) for the resource(s) that are being retrieved. In a subscription resource, the id property specifies the YouTube subscription ID.
+             */
+            id?: string;
+            /**
+             * The maxResults parameter specifies the maximum number of items that should be returned in the result set.
+             */
+            maxResults?: number;
+            /**
+             * Set this parameter's value to true to retrieve a feed of the authenticated user's subscriptions.
+             */
+            mine?: boolean;
+            /**
+             * Set this parameter's value to true to retrieve a feed of the subscribers of the authenticated user.
+             */
+            mySubscripbers?: boolean;
+            /**
+             * The order parameter specifies the method that will be used to sort resources in the API response.
+             */
+            order?: string;
+            /**
+             * The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.
+             */
+            pageToken?: string;
+        }): HttpRequest<GoogleApiYouTubePaginationInfo<GoogleApiYouTubeSubscriptionResource>>;
+    }
+
+    export interface thumbnails {
+
+        /**
+         * Uploads a custom video thumbnail to YouTube and sets it for a video.
+         */
+        set(object: {
+            /**
+             * The videoId parameter specifies a YouTube video ID for which the custom video thumbnail is being provided.
+             */
+            videoId: string;
+        }): HttpRequest<GoogleApiYouTubePageInfo<GoogleApiYouTubeThumbnailResource>>;
+
+    }
+
+    export interface videoCategories {
+
+        /**
+         * Returns a list of categories that can be associated with YouTube videos.
+         */
+        list(object: {
+            /**
+             * The part parameter specifies the videoCategory resource parts that the API response will include. Supported values are id and snippet.
+             */
+            part: string;
+            /**
+             * The hl parameter specifies the language that should be used for text values in the API response.
+             */
+            hl?: string;
+            /**
+             * The id parameter specifies a comma-separated list of video category IDs for the resources that you are retrieving.
+             */
+            id?: string;
+            /**
+             * The regionCode parameter instructs the API to return the list of video categories available in the specified country. The parameter value is an ISO 3166-1 alpha-2 country code.
+             */
+            regionCode?: string;
+        }): HttpRequest<GoogleApiYouTubePageInfo<GoogleApiYouTubeVideoCategoryResource>>;
+
+    }
+
+    export interface videos {
+
+        /**
+         * Deletes a YouTube video.
+         */
+        delete(object: {
+            /**
+             * The id parameter specifies the YouTube video ID for the resource that is being deleted. In a video resource, the id property specifies the video's ID.
+
+             */
+            id: string;
+            /**
+             * The onBehalfOfContentOwner parameter indicates that the authenticated user is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with needs to be linked to the specified YouTube content owner.
+             */
+            onBehalfOfContentOwner?: string;
+        }): HttpRequest<GoogleApiYouTubeVideoResource>;
+
+        /**
+         * Get user ratings for videos.
+         */
+        getRating(object: {
+            /**
+             * The id parameter specifies a comma-separated list of the YouTube video ID(s) for the resource(s) that are being retrieved. In a video resource, the id property specifies the video's ID.
+             */
+            id: string;
+            /**
+             * The onBehalfOfContentOwner parameter indicates that the authenticated user is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with needs to be linked to the specified YouTube content owner.
+             */
+            onBehalfOfContentOwner?: string;
+        }): HttpRequest<GoogleApiYouTubeVideoGetRatingResponse>;
+
+        /**
+         * Uploads a video to YouTube and optionally sets the video's metadata.
+         */
+        insert(object: {
+            /**
+             * The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include. The part names that you can include in the parameter value are snippet, contentDetails, player, statistics, status, and topicDetails. However, not all of those parts contain properties that can be set when setting or updating a video's metadata. For example, the statistics object encapsulates statistics that YouTube calculates for a video and does not contain values that you can set or modify. If the parameter value specifies a part that does not contain mutable values, that part will still be included in the API response.
+             */
+            part: string;
+            /**
+             * The autoLevels parameter specifies whether the video should be auto-leveled by YouTube.
+             */
+            autoLevels?: boolean;
+            /**
+             * The onBehalfOfContentOwner parameter indicates that the authenticated user is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with needs to be linked to the specified YouTube content owner.
+             */
+            onBehalfOfContentOwner?: string;
+            /**
+             * This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners. The onBehalfOfContentOwnerChannel parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the channel specified in the parameter value. This parameter must be used in conjunction with the onBehalfOfContentOwner parameter, and the user must be authenticated using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. In addition, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.
+             */
+            onBehalfOfContentOwnerChannel?: string;
+            /**
+             * The stabilize parameter specifies whether the video should be stabilized by YouTube.
+             */
+            stabilize?: boolean;
+            /**
+             * HTTP Request Body
+             */
+            RequestBody?: string;
+        }): HttpRequest<GoogleApiYouTubeVideoResource>;
+
+        /**
+         * Returns a list of videos that match the API request parameters.
+         */
+        list(object: {
+            /**
+             * The part parameter specifies a comma-separated list of one or more video resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, contentDetails, player, statistics, status, and topicDetails. If the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a video resource, the snippet property contains the channelId, title, description, tags, and categoryId properties. As such, if you set part=snippet, the API response will contain all of those properties.
+             */
+            part: string;
+            /**
+             * Set this parameter's value to mostPopular to instruct the API to return videos belonging to the chart of most popular videos.
+             */
+            chart: string;
+            /**
+             * The id parameter specifies a comma-separated list of the YouTube video ID(s) for the resource(s) that are being retrieved. In a video resource, the id property specifies the video's ID.
+             */
+            id: string;
+            /**
+             * The locale parameter selects a video chart available in the specified locale. If using this parameter, chart must also be set. The parameter value is an BCP 47 locale. Supported locales include ar_AE, ar_DZ, ar_EG, ar_JO, ar_MA, ar_SA, ar_TN, ar_YE, cs_CZ, de_DE, el_GR, en_AU, en_BE, en_CA, en_GB, en_GH, en_IE, en_IL, en_IN, en_KE, en_NG, en_NZ, en_SG, en_UG, en_US, en_ZA, es_AR, es_CL, es_CO, es_ES, es_MX, es_PE, fil_PH, fr_FR, hu_HU, id_ID, it_IT, ja_JP, ko_KR, ms_MY, nl_NL, pl_PL, pt_BR, ru_RU, sv_SE, tr_TR, zh_HK, zh_TW
+             */
+            locale: string;
+            /**
+             * The maxResults parameter specifies the maximum number of items that should be returned in the result set.
+             */
+            maxResults: number;
+            /**
+             * Set this parameter's value to like or dislike to instruct the API to only return videos liked or disliked by the authenticated user.
+             */
+            myRating: string;
+            /**
+             * The onBehalfOfContentOwner parameter indicates that the authenticated user is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with needs to be linked to the specified YouTube content owner.
+             */
+            onBehalfOfContentOwner: string;
+            /**
+             * The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.
+             */
+            pageToken: string;
+            /**
+             * The videoCategoryId parameter selects a video chart based on the category. If using this parameter, chart must also be set.
+             */
+            videoCategoryId: string;
+        }): HttpRequest<GoogleApiYouTubePaginationInfo<GoogleApiYouTubeVideoResource>>;
+
+        /**
+         * Like, dislike, or remove rating from a video.
+         */
+        rate(object: {
+            /**
+             * The id parameter specifies the YouTube video ID.
+             */
+            id: string;
+            /**
+             * Specifies the rating to record.
+             */
+            rating: string;
+            /**
+             * The onBehalfOfContentOwner parameter indicates that the authenticated user is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with needs to be linked to the specified YouTube content owner.
+             */
+            onBehalfOfContentOwner?: string;
+        }): HttpRequest<any>;
+
+        /**
+         * Updates a video's metadata.
+         */
+        update(object: {
+            /**
+             * The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include. The part names that you can include in the parameter value are snippet, contentDetails, player, statistics, status, and topicDetails. Note that this method will override the existing values for all of the mutable properties that are contained in any parts that the parameter value specifies. For example, a video's privacy setting is contained in the status part. As such, if your request is updating a private video, and the request's part parameter value includes the status part, the video's privacy setting will be updated to whatever value the request body specifies. If the request body does not specify a value, the existing privacy setting will be removed and the video will revert to the default privacy setting. In addition, not all of those parts contain properties that can be set when setting or updating a video's metadata. For example, the statistics object encapsulates statistics that YouTube calculates for a video and does not contain values that you can set or modify. If the parameter value specifies a part that does not contain mutable values, that part will still be included in the API response.
+             */
+            part: string;
+            /**
+             * The onBehalfOfContentOwner parameter indicates that the authenticated user is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with needs to be linked to the specified YouTube content owner.
+             */
+            onBehalfOfContentOwner?: string;
+            /**
+             * HTTP Request Body
+             */
+            RequestBody?: string;
+        }): HttpRequest<GoogleApiYouTubeVideoResource>;
+
+    }
+
+}
+
+interface GoogleApiYouTubePageInfo<T> {
+    /**
+     * The type of the API response. For this operation, the value will be youtube#activityListResponse.
+     */
+    kind: string;
+    /**
+     * The ETag of the response.
+     */
+    etag: string;
+    /**
+     * A list of activities, or events, that match the request criteria.
+     */
+    items: T[];
+}
+
+interface GoogleApiYouTubePaginationInfo<T> {
+
+    /**
+     * The type of the API response. For this operation, the value will be youtube#activityListResponse.
+     */
+    kind: string;
+    /**
+     * The ETag of the response.
+     */
+    etag: string;
+    /**
+     * The pageInfo object encapsulates paging information for the result set.
+     */
+    pageInfo: {
+        /**
+         * The total number of results in the result set.
+         */
+        totalResults: number;
+        /**
+         * The number of results included in the API response.
+         */
+        resultsPerPage: number;
+    };
+    /**
+     * The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set.
+     */
+    nextPageToken: string;
+    /**
+     * The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set.
+     */
+    prevPageToken: string;
+    /**
+     * A list of activities, or events, that match the request criteria.
+     */
+    items: T[];
+
+}
+
+interface GoogleApiYouTubeActivityResource {
+    /**
+     * The type of the API resource. For activity resources, the value will be youtube#activity.
+     */
+    kind: string;
+    /**
+     * The ETag of the activity resource.
+     */
+    etag: string;
+    /**
+     * The ID that YouTube uses to uniquely identify the activity.
+     */
+    id: string;
+    /**
+     * The snippet object contains basic details about the activity, including the activitys type and group ID.
+     */
+    snippet: {
+        /**
+         * The date and time that the activity occurred. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.
+         */
+        publishedAt: string;
+        /**
+         * The ID that YouTube uses to uniquely identify the channel associated with the activity.
+         */
+        channelId: string;
+        /**
+         * The title of the resource primarily associated with the activity.
+         */
+        title: string;
+        /**
+         * The description of the resource primarily associated with the activity.
+         */
+        description: string;
+        /**
+         * A map of thumbnail images associated with the resource that is primarily associated with the activity.
+         */
+        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
+        /**
+         * Channel title for the channel responsible for this activity
+         */
+        channelTitle: string;
+        /**
+         * The type of activity that the resource describes.
+         */
+        type: string;
+        /**
+         * The group ID associated with the activity.
+         */
+        groupId: string;
+    }
+    /**
+     * The contentDetails object contains information about the content associated with the activity.
+     */
+    contentDetails: {
+        /**
+         * The upload object contains information about the uploaded video. This property is only present if the snippet.type is upload.
+         */
+        upload: {
+            /**
+             * The ID that YouTube uses to uniquely identify the uploaded video.
+             */
+            videoId: string;
+        }
+        /**
+         * The like object contains information about a resource that received a positive (like) rating. This property is only present if the snippet.type is like.
+         */
+        like: {
+            /**
+             * The resourceId object contains information that identifies the rated resource.
+             */
+            resourceId: {
+                /**
+                 * The type of the API resource.
+                 */
+                kind: string;
+                /**
+                 * The ID that YouTube uses to uniquely identify the video, if the rated resource is a video. This property is only present if the resourceId.kind is youtube#video
+                 */
+                videoId: string;
+            }
+        }
+        /**
+         * The favorite object contains information about a video that was marked as a favorite video. This property is only present if the snippet.type is favorite.
+         */
+        favorite: {
+            /**
+             * The resourceId object contains information that identifies the resource that was marked as a favorite.
+             */
+            resourceId: {
+                /**
+                 * The type of the API resource.
+                 */
+                kind: string;
+                /**
+                 * The ID that YouTube uses to uniquely identify the favorite video. This property is only present if the resourceId.kind is youtube#video.
+                 */
+                videoId: string;
+            }
+        }
+        /**
+         * The comment object contains information about a resource that received a comment. This property is only present if the snippet.type is comment.
+         */
+        comment: {
+            /**
+             * The resourceId object contains information that identifies the resource associated with the comment.
+             */
+            resourceId: {
+                /**
+                 * The type of the API resource.
+                 */
+                kind: string;
+                /**
+                 * The ID that YouTube uses to uniquely identify the video associated with a comment. This property is only present if the resourceId.kind is youtube#video.
+                 */
+                videoId: string;
+                /**
+                 * The ID that YouTube uses to uniquely identify the channel associated with a comment. This property is only present if the resourceId.kind is youtube#channel.
+                 */
+                channelId: string;
+            }
+        }
+        /**
+         * The subscription object contains information about a channel that a user subscribed to. This property is only present if the snippet.type is subscription.
+         */
+        subscription: {
+            /**
+             * The resourceId object contains information that identifies the resource that the user subscribed to.
+             */
+            resourceId: {
+                /**
+                 * The type of the API resource.
+                 */
+                kind: string;
+                /**
+                 * The ID that YouTube uses to uniquely identify the channel that the user subscribed to. This property is only present if the resourceId.kind is youtube#channel.
+                 */
+                channelId: string;
+            }
+        }
+        /**
+         * The playlistItem object contains information about an item that was added to a playlist. This property is only present if the snippet.type is playlistItem.
+         */
+        playlistItem: {
+            /**
+             *  The resourceId object contains information that identifies the resource that was added to the playlist.
+             */
+            resourceId: {
+                /**
+                 * The type of the API resource.
+                 */
+                kind: string;
+                /**
+                 * The ID that YouTube uses to uniquely identify the video that was added to the playlist. This property is only present if the resourceId.kind is youtube#video.
+                 */
+                videoId: string;
+            }
+            /**
+             * The value that YouTube uses to uniquely identify the playlist.
+             */
+            playlistId: string;
+            /**
+             * The value that YouTube uses to uniquely identify the item in the playlist.
+             */
+            playlistItemId: string;
+        }
+        /**
+         * The recommendation object contains information about a recommended resource. This property is only present if the snippet.type is recommendation.
+         */
+        recommendation: {
+            /**
+             * The resourceId object contains information that identifies the recommended resource.
+             */
+            resourceId: {
+                /**
+                 * The type of the API resource.
+                 */
+                kind: string;
+                /**
+                 * The ID that YouTube uses to uniquely identify the video, if the recommended resource is a video. This property is only present if the resourceId.kind is youtube#video.
+                 */
+                videoId: string;
+                /**
+                 * The ID that YouTube uses to uniquely identify the channel, if the recommended resource is a channel. This property is only present if the resourceId.kind is youtube#channel.
+                 */
+                channelId: string;
+            }
+            /**
+             * The reason that the resource is recommended to the user.
+             */
+            reason: string;
+            /**
+             * The seedResourceId object contains information about the resource that caused the recommendation.
+             */
+            seedResourceId: {
+                /**
+                 * The type of the API resource.
+                 */
+                kind: string;
+                /**
+                 * The ID that YouTube uses to uniquely identify the video, if the recommendation was caused by a particular video. This property is only present if the seedResourceId.kind is youtube#video.
+                 */
+                videoId: string;
+                /**
+                 * The ID that YouTube uses to uniquely identify the channel, if the recommendation was caused by a particular channel. This property is only present if the seedResourceId.kind is youtube#channel.
+                 */
+                channelId: string;
+                /**
+                 * The ID that YouTube uses to uniquely identify the playlist, if the recommendation was caused by a particular playlist. This property is only present if the seedResourceId.kind is youtube#playlist.
+                 */
+                playlistId: string;
+            }
+        }
+        /**
+         * The bulletin object contains details about a channel bulletin post. This object is only present if the snippet.type is bulletin.
+         */
+        bulletin: {
+            /**
+             * The resourceId object contains information that identifies the resource associated with a bulletin post.
+             */
+            resourceId: {
+                /**
+                 * The type of the API resource.
+                 */
+                kind: string;
+                /**
+                 * The ID that YouTube uses to uniquely identify the video featured in a bulletin post, if the post refers to a video. This property will only be present if the value of the bulletin.resourceId.kind property is youtube#video.
+                 */
+                videoId: string;
+                /**
+                 * The ID that YouTube uses to uniquely identify the channel featured in a bulletin post, if the post refers to a channel. This property will only be present if the value of the bulletin.resourceId.kind property is youtube#channel.
+                 */
+                channelId: string;
+                /**
+                 * The ID that YouTube uses to uniquely identify the playlist featured in a bulletin post, if the post refers to a playlist. This property will only be present if the value of the bulletin.resourceId.kind property is youtube#playlist.
+                 */
+                playlistId: string;
+            }
+        }
+        /**
+         * The social object contains details about a social network post. This property is only present if the snippet.type is social.
+         */
+        social: {
+            /**
+             * The name of the social network.
+             */
+            type: string;
+            /**
+             * The resourceId object encapsulates information that identifies the resource associated with a social network post.
+             */
+            resourceId: {
+                /**
+                 * The type of the API resource.
+                 */
+                kind: string;
+                /**
+                 * The ID that YouTube uses to uniquely identify the video featured in a social network post, if the post refers to a video. This property will only be present if the value of the social.resourceId.kind property is youtube#video.
+                 */
+                videoId: string;
+                /**
+                 * The ID that YouTube uses to uniquely identify the channel featured in a social network post, if the post refers to a channel. This property will only be present if the value of the social.resourceId.kind property is youtube#channel.
+                 */
+                channelId: string;
+                /**
+                 * The ID that YouTube uses to uniquely identify the playlist featured in a social network post, if the post refers to a playlist. This property will only be present if the value of the social.resourceId.kind property is youtube#playlist.
+                 */
+                playlistId: string;
+            }
+            /**
+             * The author of the social network post.
+             */
+            author: string;
+            /**
+             * The URL of the social network post.
+             */
+            referenceUrl: string;
+            /**
+             * An image of the posts author.
+             */
+            imageUrl: string;
+        }
+        /**
+         * The channelItem object contains details about a resource that was added to a channel. This property is only present if the snippet.type is channelItem.
+         */
+        channelItem: {
+            /**
+             * The resourceId object contains information that identifies the resource that was added to the channel.
+             */
+            resourceId: {
+            }
+        }
+    }
+}
+
+interface GoogleApiYouTubeChannelBannerResource {
+    /**
+     * The type of the API response. For this operation, the value will be youtube#channelBannerInsertResponse.
+     */
+    kind: string;
+    /**
+     * The ETag of the response.
+     */
+    etag: string;
+    /**
+     * The banner images URL. After calling the channelBanners.insert method, extract this value from the API response. Then call the channels.update method, and set the URL as the value of the brandingSettings.image.bannerExternalUrl property to set the banner image for a channel.
+     */
+    url: string;
+}
+
+interface GoogleApiYouTubeChannelResource {
+    /**
+     * The ID that YouTube uses to uniquely identify the channel.
+     */
+    id: string;
+    /**
+     * The type of the API resource. For channel resources, the value will be youtube#channel.
+     */
+    kind: string;
+    /**
+     * The ETag for the channel resource.
+     */
+    etag: string;
+    /**
+     * The snippet object contains basic details about the channel, such as its title, description, and thumbnail images.
+     */
+    snippet: {
+        /**
+         * The channels title.
+         */
+        title: string;
+        /**
+         * The channels description.
+         */
+        description: string;
+        /**
+         * The date and time that the channel was created. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.
+         */
+        publishedAt: string;
+        /**
+         * A map of thumbnail images associated with the channel. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail.
+         */
+        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
+    }
+    /**
+     * The contentDetails object encapsulates information about the channels content.
+     */
+    contentDetails: {
+        /**
+         * The relatedPlaylists object is a map that identifies playlists associated with the channel, such as the channels uploaded videos or favorite videos. You can retrieve any of these playlists using the playlists.list method.
+         */
+        relatedPlaylists: {
+            /**
+             * The ID of the playlist that contains the channels liked videos.
+             */
+            likes: string;
+            /**
+             * The ID of the playlist that contains the channels favorite videos.
+             */
+            favorites: string;
+            /**
+             * The ID of the playlist that contains the channels uploaded videos.
+             */
+            uploads: string;
+            /**
+             * The ID of the playlist that contains the channels watch history.
+             */
+            watchHistory: string;
+            /**
+             * The ID of the channels watch later playlist.
+             */
+            watchLater: string;
+        }
+        /**
+         * The googlePlusUserId object identifies the Google+ profile ID associated with this channel.
+         */
+        googlePlusUserId: string;
+    }
+    /**
+     * The statistics object encapsulates statistics for the channel.
+     */
+    statistics: {
+        /**
+         * The number of times the channel has been viewed.
+         */
+        viewCount: number;
+        /**
+         * The number of comments for the channel.
+         */
+        commentCount: number;
+        /**
+         * The number of subscribers that the channel has.
+         */
+        subscriberCount: number;
+        /**
+         * The number of videos uploaded to the channel.
+         */
+        videoCount: number;
+    }
+    /**
+     * The topicDetails object encapsulates information about Freebase topics associated with the channel.
+     */
+    topicDetails: {
+        /**
+         * A list of Freebase topic IDs associated with the channel. You can retrieve information about each topic using the Freebase Topic API.
+         */
+        topicIds: string[];
+    }
+    /**
+     * The status object encapsulates information about the privacy status of the channel.
+     */
+    status: {
+        /**
+         * Privacy status of the channel.
+         */
+        privacyStatus: string;
+        /**
+         * Indicates whether the channel data identifies a user that is already linked to either a YouTube username or a Google+ account. A user that has one of these links already has a public YouTube identity, which is a prerequisite for several actions, such as uploading videos.
+         */
+        isLinked: boolean;
+    }
+    /**
+     * The brandingSettings object encapsulates information about the branding of the channel.
+     */
+    brandingSettings: {
+        /**
+         * The channel object encapsulates branding properties of the channel page.
+         */
+        channel: {
+            /**
+             * The channels title. The title has a maximum length of 30 characters.
+             */
+            title: string;
+            /**
+             * The channel description, which appears in the channel information box on your channel page.
+             */
+            description: string;
+            /**
+             * Keywords associated with your channel. The value is a comma-separated list of strings.
+             */
+            keywords: string;
+            /**
+             * The content tab that users should display by default when viewers arrive at your channel page.
+             */
+            defaultTab: string;
+            /**
+             * The ID for a Google Analytics account that you want to use to track and measure traffic to your channel.
+             */
+            trackingAnalyticsAccountId: string;
+            /**
+             * This setting determines whether user-submitted comments left on the channel page need to be approved by the channel owner to be publicly visible. The default value is false.
+             */
+            moderateComments: boolean;
+            /**
+             * This setting indicates whether YouTube should show an algorithmically generated list of related channels on your channel page.
+             */
+            showRelatedChannels: boolean;
+            /**
+             * This setting indicates whether the channel page should display content in a browse or feed view.
+             */
+            showBrowseView: boolean;
+            /**
+             * The title that displays above the featured channels module.
+             */
+            featuredChannelsTitle: string;
+            /**
+             * A list of up to 16 channels that you would like to link to from the featured channels module. The property value is a list of YouTube channel ID values, each of which uniquely identifies a channel.
+             */
+            featuredChannelsUrls: string[];
+            /**
+             * The video that should play in the featured video module in the channel pages browse view for unsubscribed viewers. Subscribed viewers may see a different view that highlights more recent channel activity.
+             */
+            unsubscribedTrailer: string;
+        }
+        /**
+         * The watch object encapsulates branding properties of the watch pages for the channels videos.
+         */
+        watch: {
+            /**
+             * The background color for the video watch pages branded area.
+             */
+            textColor: string;
+            /**
+             * The text color for the video watch pages branded area.
+             */
+            backgroundColor: string;
+            /**
+             * An ID that uniquely identifies a playlist that displays next to the video player on the video watch page.
+             */
+            featuredPlaylistId: string;
+        }
+        /**
+         * The image object encapsulates information about images that display on the channels channel page or video watch pages.
+         */
+        image: {
+            /**
+             * The URL for the banner image shown on the channel page on the YouTube website. The image is 1060px by 175px.
+             */
+            bannerImageUrl: string;
+            /**
+             * The URL for the banner image shown on the channel page in mobile applications. The image is 640px by 175px.
+             */
+            bannerMobileImageUrl: string;
+            /**
+             * The backgroundImageUrl object encapsulates settings for the background image shown on the video watch page. The image is 1200px by 615px, with a maximum file size of 128k.
+             */
+            backgroundImageUrl: {
+                /**
+                 * The default value for the property.
+                 */
+                default: string;
+                /**
+                 * A list of objects that specify language-specific values for the property.
+                 */
+                localized: {
+                    /**
+                     * The property value for a specified language.
+                     */
+                    value: string;
+                    /**
+                     * The language associated with the value.
+                     */
+                    language: string;
+                }[];
+            }
+            /**
+             * The largeBrandedBannerImageImapScript object encapsulates information about the image map script for the banner image shown on the channel page.
+             */
+            largeBrandedBannerImageImapScript: {
+                /**
+                 * The default value for the property.
+                 */
+                default: string;
+                /**
+                 * A list of objects that specify language-specific values for the property.
+                 */
+                localized: {
+                    /**
+                     * The property value for a specified language.
+                     */
+                    value: string;
+                    /**
+                     * The language associated with the value.
+                     */
+                    language: string;
+                }[];
+            }
+            /**
+             * The URL for the 854px by 70px image that appears below the video player in the expanded video view of the video watch page.
+             */
+            largeBrandedBannerImageUrl: {
+                /**
+                 * The default value for the property.
+                 */
+                default: string;
+                /**
+                 * A list of objects that specify language-specific values for the property.
+                 */
+                localized: {
+                    /**
+                     * The property value for a specified language.
+                     */
+                    value: string;
+                    /**
+                     * The language associated with the value.
+                     */
+                    language: string;
+                }[];
+            }
+            /**
+             * The image map script for the small banner image. The largeBrandedBannerImageImapScript object encapsulates information about the image map script for the banner image shown on the channel page in mobile applications.
+             */
+            smallBrandedBannerImageImapScript: {
+                /**
+                 * The default value for the property.
+                 */
+                default: string;
+                /**
+                 * A list of objects that specify language-specific values for the property.
+                 */
+                localized: {
+                    /**
+                     * The property value for a specified language.
+                     */
+                    value: string;
+                    /**
+                     * The language associated with the value.
+                     */
+                    language: string;
+                }[];
+            }
+            /**
+             * The URL for the 640px by 70px banner image that appears below the video player in the default view of the video watch page.
+             */
+            smallBrandedBannerImageUrl: {
+                /**
+                 * The default value for the property.
+                 */
+                default: string;
+                /**
+                 * A list of objects that specify language-specific values for the property.
+                 */
+                localized: {
+                    /**
+                     * The property value for a specified language.
+                     */
+                    value: string;
+                    /**
+                     * The language associated with the value.
+                     */
+                    language: string;
+                }[];
+            }
+            /**
+             * The URL for the image that appears above the video player. This is a 25-pixel-high image with a flexible width that cannot exceed 170 pixels. If you do not provide this image, your channel name will appear instead of an image.
+             */
+            watchIconImageUrl: string;
+            /**
+             * The URL for a 1px by 1px tracking pixel that can be used to collect statistics for views of the channel or video pages.
+             */
+            trackingImageUrl: string;
+            /**
+             * The URL for a low-resolution banner image that displays on the channel page in tablet applications. The image is 1138px by 188px.
+             */
+            bannerTabletLowImageUrl: string;
+            /**
+             * The URL for a banner image that displays on the channel page in tablet applications. The image is 1707px by 283px.
+             */
+            bannerTabletImageUrl: string;
+            /**
+             * The URL for a high-resolution banner image that displays on the channel page in tablet applications. The image is 2276px by 377px.
+             */
+            bannerTabletHdImageUrl: string;
+            /**
+             * The URL for an insanely high-resolution banner image that displays on the channel page in tablet applications. The image is 2560px by 424px.
+             */
+            bannerTabletExtraHdImageUrl: string;
+            /**
+             * The URL for a low-resolution banner image that displays on the channel page in mobile applications. The image is 320px by 88px.
+             */
+            bannerMobileLowImageUrl: string;
+            /**
+             * The URL for a medium-resolution banner image that displays on the channel page in mobile applications. The image is 960px by 263px.
+             */
+            bannerMobileMediumImageUrl: string;
+            /**
+             * The URL for a high-resolution banner image that displays on the channel page in mobile applications. The image is 1280px by 360px.
+             */
+            bannerMobileHdImageUrl: string;
+            /**
+             * The URL for a very high-resolution banner image that displays on the channel page in mobile applications. The image is 1440px by 395px.
+             */
+            bannerMobileExtraHdImageUrl: string;
+            /**
+             * The URL for a banner image that displays on the channel page in television applications. The image is 2120px by 1192px.
+             */
+            bannerTvImageUrl: string;
+            /**
+             * This property specifies the location of the banner image that YouTube will use to generate the various banner image sizes for a channel. To obtain the URL banner images external URL, you must first upload the channel banner image that you want to use by calling the channelBanners.insert method.
+             */
+            bannerExternalUrl: string;
+        }
+        /**
+         * The hints object encapsulates additional branding properties
+         */
+        hints: {
+            /**
+             * A property.
+             */
+            property: string;
+            /**
+             * The propertys value.
+             */
+            value: string;
+        }[];
+    }
+    /**
+     * The invideoPromotion object encapsulates information about a promotional campaign associated with the channel. A channel can use an in-video promotional campaign to display the thumbnail image of a promoted video in the video player during playback of the channels videos
+     */
+    invideoPromotion: {
+        /**
+         * The timing object encapsulates information about the temporal position within the video when the promoted item will be displayed.
+         */
+        timing: {
+            /**
+             * The timing method that determines when the promoted item is inserted during the video playback. If the value is offsetFromStart, then the offsetMs field represents an offset from the start of the video. If the value is offsetFromEnd, then the offsetMs field represents an offset from the end of the video.
+             */
+            type: string;
+            /**
+             * The time offset, specified in milliseconds, that determines when the promoted item appears during video playbacks. The type propertys value determines whether the offset is measured from the start or end of the video.
+             */
+            offsetMs: number;
+        }
+        /**
+         * The position object encapsulates information about the spatial position within the video where the promoted item will be displayed.
+         */
+        position: {
+            /**
+             * The manner in which the promoted item is positioned in the video player.
+             */
+            type: string;
+            /**
+             * The corner of the player where the promoted item will appear.
+             */
+            cornerPosition: string;
+        }
+        /**
+         * The list of promoted items in the order that they will display across different playbacks to the same viewer.
+         */
+        items: {
+            /**
+             * The promoted items type.
+             */
+            type: string;
+            /**
+             * If the promoted item represents a video, then this value is present and identifies the YouTube ID that YouTube assigned to identify that video. This field is only present if the type propertys value is video.
+             */
+            videoId: string;
+        }[];
+    }
+}
+
+interface GoogleApiYouTubeGuideCategoryResource {
+    /**
+     * The ID that YouTube uses to uniquely identify the guide category.
+     */
+    id: string;
+    /**
+     * The type of the API resource. For guideCategory resources, the value will be youtube#guideCategory.
+     */
+    kind: string;
+    /**
+     * The ETag of the guideCategory resource.
+     */
+    etag: string;
+    /**
+     * The snippet object contains basic details about the category, such as its title.
+     */
+    snippet: {
+        /**
+         * The ID that YouTube uses to uniquely identify the channel publishing the guide category.
+         */
+        channelId: string;
+        /**
+         * The categorys title.
+         */
+        title: string;
+    }
+}
+
+interface GoogleApiYouTubePlaylistItemResource {
+    /**
+     * The ID that YouTube uses to uniquely identify the playlist item.
+     */
+    id: string;
+    /**
+     * The type of the API resource. For playlist item resources, the value will be youtube#playlistItem.
+     */
+    kind: string;
+    /**
+     * The ETag for the playlist item resource.
+     */
+    etag: string;
+    /**
+     * The snippet object contains basic details about the playlist item, such as its title and position in the playlist.
+     */
+    snippet: {
+        /**
+         * The date and time that the item was added to the playlist. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.
+         */
+        publishedAt: string;
+        /**
+         * The ID that YouTube uses to uniquely identify the user that added the item to the playlist.
+         */
+        channelId: string;
+        /**
+         * The items title.
+         */
+        title: string;
+        /**
+         * The items description.
+         */
+        description: string;
+        /**
+         * A map of thumbnail images associated with the playlist item. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail.
+         */
+        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
+        /**
+         * The channel title of the channel that the playlist item belongs to.
+         */
+        channelTitle: string;
+        /**
+         * The ID that YouTube uses to uniquely identify the playlist that the playlist item is in.
+         */
+        playlistId: string;
+        /**
+         * The order in which the item appears in the playlist. The value uses a zero-based index, so the first item has a position of 0, the second item has a position of 1, and so forth.
+         */
+        position: number;
+        /**
+         * The id object contains information that can be used to uniquely identify the resource that is included in the playlist as the playlist item.
+         */
+        resourceId: {
+            /**
+             * The kind, or type, of the referred resource.
+             */
+            kind: string;
+            /**
+             * If the snippet.resourceId.kind propertys value is youtube#video, then this property will be present and its value will contain the ID that YouTube uses to uniquely identify the video in the playlist.
+             */
+            videoId: string;
+        }
+    }
+    /**
+     * The contentDetails object is included in the resource if the included item is a YouTube video. The object contains additional information about the video.
+     */
+    contentDetails: {
+        /**
+         * The ID that YouTube uses to uniquely identify a video. To retrieve the video resource, set the id query parameter to this value in your API request.
+         */
+        videoId: string;
+        /**
+         * The time, measured in seconds from the start of the video, when the video should start playing. (The playlist owner can specify the times when the video should start and stop playing when the video is played in the context of the playlist.) The default value is 0.
+         */
+        startAt: string;
+        /**
+         * The time, measured in seconds from the start of the video, when the video should stop playing. (The playlist owner can specify the times when the video should start and stop playing when the video is played in the context of the playlist.) By default, assume that the video.endTime is the end of the video.
+         */
+        endAt: string;
+        /**
+         * A user-generated note for this item.
+         */
+        note: string;
+    }
+    /**
+     * The status object contains information about the playlist items privacy status.
+     */
+    status: {
+        /**
+         * The playlist items privacy status. The channel that uploaded the video that the playlist item represents can set this value using either the videos.insert or videos.update method.
+         */
+        privacyStatus: string;
+    }
+}
+
+interface GoogleApiYouTubePlaylistResource {
+    /**
+     * The ID that YouTube uses to uniquely identify the playlist.
+     */
+    id: string;
+    /**
+     * The type of the API resource. For video resources, the value will be youtube#playlist.
+     */
+    kind: string;
+    /**
+     * The ETag for the playlist resource.
+     */
+    etag: string;
+    /**
+     * The snippet object contains basic details about the playlist, such as its title and description.
+     */
+    snippet: {
+        /**
+         * The date and time that the playlist was created. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.
+         */
+        publishedAt: string;
+        /**
+         * The ID that YouTube uses to uniquely identify the channel that published the playlist.
+         */
+        channelId: string;
+        /**
+         * The playlists title.
+         */
+        title: string;
+        /**
+         * The playlists description.
+         */
+        description: string;
+        /**
+         * A map of thumbnail images associated with the playlist. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail.
+         */
+        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
+        /**
+         * The channel title of the channel that the video belongs to.
+         */
+        channelTitle: string;
+        /**
+         * Keyword tags associated with the playlist.
+         */
+        tags: string[];
+    }
+    /**
+     * The status object contains status information for the playlist.
+     */
+    status: {
+        /**
+         * The playlists privacy status.
+         */
+        privacyStatus: string;
+    }
+    /**
+     * The contentDetails object contains information about the playlist content, including the number of videos in the playlist.
+     */
+    contentDetails: {
+        /**
+         * The number of videos in the playlist.
+         */
+        itemCount: number;
+    }
+    /**
+     * The player object contains information that you would use to play the playlist in an embedded player.
+     */
+    player: {
+        /**
+         * An <iframe> tag that embeds a player that will play the playlist.
+         */
+        embedHtml: string;
+    }
+}
+
+interface GoogleApiYouTubeSearchResource {
+    /**
+     * The kind, fixed to "youtube#searchResult".
+     */
+    kind: string;
+    /**
+     * Etag of this resource.
+     */
+    etag: string;
+    /**
+     * The id object contains information that can be used to uniquely identify the resource that matches the search request.
+     */
+    id: {
+        /**
+         * The type of the API resource.
+         */
+        kind: string;
+        /**
+         * If the id.type propertys value is youtube#video, then this property will be present and its value will contain the ID that YouTube uses to uniquely identify a video that matches the search query.
+         */
+        videoId: string;
+        /**
+         * If the id.type propertys value is youtube#channel, then this property will be present and its value will contain the ID that YouTube uses to uniquely identify a channel that matches the search query.
+         */
+        channelId: string;
+        /**
+         * If the id.type propertys value is youtube#playlist, then this property will be present and its value will contain the ID that YouTube uses to uniquely identify a playlist that matches the search query.
+         */
+        playlistId: string;
+    }
+    /**
+     * The snippet object contains basic details about a search result, such as its title or description.
+     */
+    snippet: {
+        /**
+         * The creation date and time of the resource that the search result identifies. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.
+         */
+        publishedAt: string;
+        /**
+         * The value that YouTube uses to uniquely identify the channel that published the resource that the search result identifies.
+         */
+        channelId: string;
+        /**
+         * The title of the search result.
+         */
+        title: string;
+        /**
+         * A description of the search result.
+         */
+        description: string;
+        /**
+         * A map of thumbnail images associated with the search result. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail.
+         */
+        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
+        /**
+         * The title of the channel that published the resource that the search result identifies.
+         */
+        channelTitle: string;
+    }
+}
+
+interface GoogleApiYouTubeSubscriptionResource {
+    /**
+     * The ID that YouTube uses to uniquely identify the subscription.
+     */
+    id: string;
+    /**
+     * The ETag of the subscription resource.
+     */
+    etag: string;
+    /**
+     * The type of the API resource. For subscription resources, the value will be youtube#subscription.
+     */
+    kind: string;
+    /**
+     * The snippet object contains basic details about the subscription, including its title and the channel that the user subscribed to.
+     */
+    snippet: {
+        /**
+         * The date and time that the subscription was created. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.
+         */
+        publishedAt: string;
+        /**
+         * The title of the channel that the subscription belongs to.
+         */
+        channelTitle: string;
+        /**
+         * The subscriptions title.
+         */
+        title: string;
+        /**
+         * The subscriptions details.
+         */
+        description: string;
+        /**
+         * The id object contains information about the channel that the user subscribed to.
+         */
+        resourceId: {
+            /**
+             * The type of the API resource.
+             */
+            kind: string;
+            /**
+             * The value that YouTube uses to uniquely identify the channel that the user subscribed to.
+             */
+            channelId: string;
+        }
+        /**
+         * The ID that YouTube uses to uniquely identify the subscribers channel. The resource_id object identifies the channel that the user subscribed to.
+         */
+        channelId: string;
+        /**
+         * A map of thumbnail images associated with the subscription. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail.
+         */
+        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
+    }
+    /**
+     *
+     */
+    contentDetails: {
+        /**
+         *
+         */
+        totalItemCount: number;
+        /**
+         *
+         */
+        newItemCount: number;
+    }
+    /**
+     *
+     */
+    subscriberSnippet: {
+        title: string;
+        description: string;
+        channelId: string;
+        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
+    }
+}
+
+interface GoogleApiYouTubeThumbnailResource {
+    /**
+     * The default thumbnail image. The default thumbnail for a video – or a resource that refers to a video, such as a playlist item or search result – is 120px wide and 90px tall. The default thumbnail for a channel is 88px wide and 88px tall.
+     */
+    default: GoogleApiYouTubeThumbnailItemResource;
+    /**
+     * A higher resolution version of the thumbnail image. For a video (or a resource that refers to a video), this image is 320px wide and 180px tall. For a channel, this image is 240px wide and 240px tall.
+     */
+    medium: GoogleApiYouTubeThumbnailItemResource;
+    /**
+     * A high resolution version of the thumbnail image. For a video (or a resource that refers to a video), this image is 480px wide and 360px tall. For a channel, this image is 800px wide and 800px tall.
+     */
+    high: GoogleApiYouTubeThumbnailItemResource;
+}
+
+interface GoogleApiYouTubeThumbnailItemResource {
+    /**
+     * The images URL.
+     */
+    url: string;
+    /**
+     * The images width.
+     */
+    width: number;
+    /**
+     * The images height.
+     */
+    height: number;
+}
+
+interface GoogleApiYouTubeVideoCategoryResource {
+    /**
+     * The ID that YouTube uses to uniquely identify the video category.
+     */
+    id: string;
+    /**
+     * The type of the API resource. For video category resources, the value will be youtube#videoCategory.
+     */
+    kind: string;
+    /**
+     * The ETag of the videoCategory resource.
+     */
+    etag: string;
+    /**
+     * The snippet object contains basic details about the video category, including its title.
+     */
+    snippet: {
+        /**
+         * The YouTube channel that created the video category.
+         */
+        channelId: string;
+        /**
+         * The video categorys title.
+         */
+        title: string;
+    }
+}
+
+interface GoogleApiYouTubeVideoResource {
+    /**
+     * The ID that YouTube uses to uniquely identify the video.
+     */
+    id: string;
+    /**
+     * The type of the API resource. For video resources, the value will be youtube#video.
+     */
+    kind: string;
+    /**
+     * The ETag of the video resource.
+     */
+    etag: string;
+    /**
+     * The snippet object contains basic details about the video, such as its title, description, and category.
+     */
+    snippet: {
+        /**
+         * The date and time that the video was uploaded. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.
+         */
+        publishedAt: string;
+        /**
+         * The ID that YouTube uses to uniquely identify the channel that the video was uploaded to.
+         */
+        channelId: string;
+        /**
+         * The videos title.
+         */
+        title: string;
+        /**
+         * The videos description.
+         */
+        description: string;
+        /**
+         * A map of thumbnail images associated with the video. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail.
+         */
+        thumbnails: GoogleApiYouTubeThumbnailItemResource[];
+        /**
+         * Channel title for the channel that the video belongs to.
+         */
+        channelTitle: string;
+        /**
+         * A list of keyword tags associated with the video. Tags may contain spaces. This field is only visible to the videos uploader.
+         */
+        tags: string[];
+        /**
+         * The YouTube video category associated with the video.
+         */
+        categoryId: string;
+    }
+    /**
+     * The contentDetails object contains information about the video content, including the length of the video and its aspect ratio.
+     */
+    contentDetails: {
+        /**
+         * The length of the video. The tag value is an ISO 8601 duration in the format PT#M#S, in which the letters PT indicate that the value specifies a period of time, and the letters M and S refer to length in minutes and seconds, respectively. The # characters preceding the M and S letters are both integers that specify the number of minutes (or seconds) of the video.
+         */
+        duration: string;
+        /**
+         * Indicates whether the video is available in 3D or in 2D.
+         */
+        dimension: string;
+        /**
+         * Indicates whether the video is available in high definition (HD) or only in standard definition.
+         */
+        definition: string;
+        /**
+         * Indicates whether captions are available for the video.
+         */
+        caption: string;
+        /**
+         * Indicates whether the video represents licensed content, which means that the content has been claimed by a YouTube content partner.
+         */
+        licensedContent: boolean;
+        /**
+         * The regionRestriction object contains information about the countries where a video is (or is not) viewable. The object will contain either the contentDetails.regionRestriction.allowed property or the contentDetails.regionRestriction.blocked property.
+         */
+        regionRestriction: {
+            /**
+             * A list of region codes that identify countries where the video is viewable. If this property is present and a country is not listed in its value, then the video is blocked from appearing in that country. If this property is present and contains an empty list, the video is blocked in all countries.
+             */
+            allowed: string[];
+            /**
+             * A list of region codes that identify countries where the video is blocked. If this property is present and a country is not listed in its value, then the video is viewable in that country. If this property is present and contains an empty list, the video is viewable in all countries.
+
+             */
+            blocked: string[];
+        }
+        /**
+         * Specifies the ratings that the video received under various rating schemes.
+         */
+        contentRating: {
+            /**
+             * The videos Motion Picture Association of America (MPAA) rating.
+             */
+            mpaaRating: string;
+            /**
+             * The videos TV Parental Guidelines (TVPG) rating.
+             */
+            tvpgRating: string;
+            /**
+             * The videos British Board of Film Classification (BBFC) rating.
+             */
+            bbfcRating: string;
+            /**
+             * The videos Canadian Home Video Rating System (CHVRS) rating.
+             */
+            chvrsRating: string;
+            /**
+             * The videos Eirin rating. Eirin is the Japanese rating system.
+             */
+            eirinRating: string;
+            /**
+             * The videos Central Board of Film Certification (CBFC - India) rating.
+             */
+            cbfcRating: string;
+            /**
+             * The videos Centre national du cinéma et de limage animé (French Ministry of Culture) rating.
+             */
+            fmocRating: string;
+            /**
+             * The videos Instituto de la Cinematografía y de las Artes Audiovisuales (ICAA - Spain) rating.
+             */
+            icaaRating: string;
+            /**
+             * The videos Australian Classification Board (ACB) rating.
+             */
+            acbRating: string;
+            /**
+             * The videos Office of Film and Literature Classification (OFLC - New Zealand) rating.
+             */
+            oflcRating: string;
+            /**
+             * The videos Freiwillige Selbstkontrolle der Filmwirtschaft (FSK - Germany) rating.
+             */
+            fskRating: string;
+            /**
+             * The videos Korea Media Rating Board rating. The KMRB rates videos in South Korea.
+             */
+            kmrbRating: string;
+            /**
+             * The videos Departamento de Justiça, Classificação, Qualificação e Títulos (DJCQT - Brazil) rating.
+             */
+            djctqRating: string;
+            /**
+             * The videos National Film Registry of the Russian Federation (MKRF - Russia) rating.
+             */
+            russiaRating: string;
+            /**
+             * The videos General Directorate of Radio, Television and Cinematography (Mexico) rating.
+             */
+            rtcRating: string;
+        }
+    }
+    /**
+     * The player object contains information that you would use to play the video in an embedded player.
+     */
+    player: {
+        /**
+         * An <iframe> tag that embeds a player that will play the video.
+         */
+        embedHtml: string;
+    }
+    /**
+     * The statistics object contains statistics about the video.
+     */
+    statistics: {
+        /**
+         * The number of times the video has been viewed.
+         */
+        viewCount: number;
+        /**
+         * The number of users who have indicated that they liked the video by giving it a positive rating.
+         */
+        likeCount: number;
+        /**
+         * The number of users who have indicated that they disliked the video by giving it a negative rating.
+         */
+        dislikeCount: number;
+        /**
+         * The number of users who currently have the video marked as a favorite video.
+         */
+        favoriteCount: number;
+        /**
+         * The number of comments for the video.
+         */
+        commentCount: number;
+    }
+    /**
+     * The status object contains information about the videos uploading, processing, and privacy statuses.
+     */
+    status: {
+        /**
+         * The status of the uploaded video.
+         */
+        uploadStatus: string;
+        /**
+         * This value explains why a video failed to upload. This property is only present if the uploadStatus property indicates that the upload failed.
+         */
+        failureReason: string;
+        /**
+         * This value explains why YouTube rejected an uploaded video. This property is only present if the uploadStatus property indicates that the upload was rejected.
+         */
+        rejectionReason: string;
+        /**
+         * The videos privacy status.
+         */
+        privacyStatus: string;
+        /**
+         * The videos license.
+         */
+        license: string;
+        /**
+         * This value indicates whether the video can be embedded on another website.
+
+         */
+        embeddable: boolean;
+        /**
+         * This value indicates whether the extended video statistics on the videos watch page are publicly viewable. By default, those statistics are viewable, and statistics like a videos viewcount and ratings will still be publicly visible even if this propertys value is set to false.
+         */
+        publicStatsViewable: boolean;
+    }
+    /**
+     * The topicDetails object encapsulates information about Freebase topics associated with the video.
+     */
+    topicDetails: {
+        /**
+         * A list of Freebase topic IDs associated with the video. You can retrieve information about each topic using the Freebase Topic API.
+         */
+        topicIds: string[];
+    }
+    /**
+     * The recordingDetails object encapsulates information about the location, date and address where the video was recorded. This object will only be returned for a video if the videos geolocation data or recording time has been set.
+     */
+    recordingDetails: {
+        /**
+         * The geolocation information associated with the video.
+         */
+        location: {
+            /**
+             * Latitude in degrees.
+             */
+            latitude: number;
+            /**
+             * Longitude in degrees.
+             */
+            longitude: number;
+            /**
+             * Altitude above the WGS 84 reference ellipsoid, in meters.
+             */
+            elevation: number;
+        }
+        /**
+         * The text description of the location where the video was recorded.
+         */
+        locationDescription: string;
+        /**
+         * The date and time when the video was recorded. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.
+         */
+        recordingDate: string;
+    }
+    /**
+     * The fileDetails object encapsulates information about the video file that was uploaded to YouTube, including the files resolution, duration, audio and video codecs, stream bitrates, and more. This data can only be retrieved by the video owner.
+     */
+    fileDetails: {
+        /**
+         * The uploaded files name. This field is present whether a video file or another type of file was uploaded.
+         */
+        fileName: string;
+        /**
+         * The uploaded files size in bytes. This field is present whether a video file or another type of file was uploaded.
+         */
+        fileSize: number;
+        /**
+         * The uploaded files type as detected by YouTubes video processing engine. Currently, YouTube only processes video files, but this field is present whether a video file or another type of file was uploaded.
+         */
+        fileType: string;
+        /**
+         * The uploaded video files container format.
+         */
+        container: string;
+        /**
+         * A list of video streams contained in the uploaded video file. Each item in the list contains detailed metadata about a video stream.
+         */
+        videoStreams: {
+            /**
+             * The encoded video contents width in pixels.
+             */
+            widthPixels: number;
+            /**
+             * The encoded video contents height in pixels.
+             */
+            heightPixels: number;
+            /**
+             * The video streams frame rate, in frames per second.
+             */
+            frameRateFps: number;
+            /**
+             * The video contents display aspect ratio, which specifies the aspect ratio in which the video should be displayed.
+             */
+            aspectRatio: number;
+            /**
+             * The video codec that the stream uses.
+             */
+            codec: string;
+            /**
+             * The video streams bitrate, in bits per second.
+             */
+            bitrateBps: number;
+            /**
+             * The amount that YouTube needs to rotate the original source content to properly display the video.
+             */
+            rotation: string;
+            /**
+             * A value that uniquely identifies a video vendor. Typically, the value is a four-letter vendor code.
+             */
+            vender: string;
+        }[];
+        /**
+         * A list of audio streams contained in the uploaded video file. Each item in the list contains detailed metadata about an audio stream.
+         */
+        audioStreams: {
+            /**
+             * The number of audio channels that the stream contains.
+             */
+            channelCount: number;
+            /**
+             * The audio codec that the stream uses.
+             */
+            codec: string;
+            /**
+             * The audio streams bitrate, in bits per second.
+             */
+            bitrateBps: number;
+            /**
+             * A value that uniquely identifies a video vendor. Typically, the value is a four-letter vendor code.
+             */
+            vendor: string;
+        }[];
+        /**
+         * The length of the uploaded video in milliseconds.
+         */
+        durationMs: number;
+        /**
+         * The uploaded video files combined (video and audio) bitrate in bits per second.
+         */
+        bitrateBps: number;
+        /**
+         * Geographic coordinates that identify the place where the uploaded video was recorded. Coordinates are defined using WGS 84.
+         */
+        recordingLocation: {
+            /**
+             * Latitude in degrees.
+             */
+            latitude: number;
+            /**
+             * Longitude in degrees.
+             */
+            longitude: number;
+            /**
+             * Altitude above the WGS 84 reference ellipsoid, in meters.
+             */
+            elevation: number;
+        }
+        /**
+         * The date and time when the uploaded video file was created. The value is specified in ISO 8601 format. Currently, the following ISO 8601 formats are supported:
+         */
+        creationTime: string;
+    }
+    /**
+     * The processingProgress object encapsulates information about YouTubes progress in processing the uploaded video file. The properties in the object identify the current processing status and an estimate of the time remaining until YouTube finishes processing the video. This part also indicates whether different types of data or content, such as file details or thumbnail images, are available for the video.
+     * The processingProgress object is designed to be polled so that the video uploaded can track the progress that YouTube has made in processing the uploaded video file. This data can only be retrieved by the video owner.
+     */
+    processingDetails: {
+        /**
+         * The videos processing status. This value indicates whether YouTube was able to process the video or if the video is still being processed.
+         */
+        processingStatus: string;
+        /**
+         * The processingProgress object contains information about the progress YouTube has made in processing the video. The values are really only relevant if the videos processing status is processing.
+         */
+        processingProgress: {
+            /**
+             * An estimate of the total number of parts that need to be processed for the video. The number may be updated with more precise estimates while YouTube processes the video.
+             */
+            partsTotal: number;
+            /**
+             * The number of parts of the video that YouTube has already processed.
+             */
+            partsProcessed: number;
+            /**
+             * An estimate of the amount of time, in millseconds, that YouTube needs to finish processing the video.
+             */
+            timeLeftMs: number;
+        }
+        processingFailureReason: string;
+        /**
+         * The reason that YouTube failed to process the video. This property will only have a value if the processingStatus propertys value is failed.
+         */
+        fileDetailsAvailability: string;
+        /**
+         * This value indicates whether file details are available for the uploaded video. You can retrieve a videos file details by requesting the fileDetails part in your videos.list() request.
+         */
+        processingIssuesAvailability: string;
+        /**
+         * This value indicates whether keyword (tag) suggestions are available for the video. Tags can be added to a videos metadata to make it easier for other users to find the video. You can retrieve these suggestions by requesting the suggestions part in your videos.list() request.
+         */
+        tagSuggestionsAvailability: string;
+        /**
+         * This value indicates whether video editing suggestions, which might improve video quality or the playback experience, are available for the video. You can retrieve these suggestions by requesting the suggestions part in your videos.list() request.
+         */
+        editorSuggestionsAvailability: string;
+        /**
+         * This value indicates whether thumbnail images have been generated for the video.
+         */
+        thumbnailsAvailability: string;
+    }
+    /**
+     * The suggestions object encapsulates suggestions that identify opportunities to improve the video quality or the metadata for the uploaded video. This data can only be retrieved by the video owner.
+     */
+    suggestions: {
+        /**
+         * A list of errors that will prevent YouTube from successfully processing the uploaded video. These errors indicate that, regardless of the videos current processing status, eventually, that status will almost certainly be failed.
+         */
+        processingErrors: string[];
+        /**
+         * A list of reasons why YouTube may have difficulty transcoding the uploaded video or that might result in an erroneous transcoding. These warnings are generated before YouTube actually processes the uploaded video file. In addition, they identify issues that do not necessarily indicate that video processing will fail but that still might cause problems such as sync issues, video artifacts, or a missing audio track.
+         */
+        processingWarnings: string[];
+        /**
+         * A list of suggestions that may improve YouTubes ability to process the video.
+         */
+        processingHints: string[];
+        /**
+         * A list of keyword tags that could be added to the videos metadata to increase the likelihood that users will locate your video when searching or browsing on YouTube.
+         */
+        tagSuggestions: {
+            /**
+             * The keyword tag suggested for the video.
+             */
+            tag: string;
+            /**
+             * A set of video categories for which the tag is relevant. You can use this information to display appropriate tag suggestions based on the video category that the video uploader associates with the video. By default, tag suggestions are relevant for all categories if there are no restricts defined for the keyword.
+             */
+            categoryRestricts: string[];
+        }[];
+        /**
+         * A list of video editing operations that might improve the video quality or playback experience of the uploaded video.
+         */
+        editorSuggestions: string[];
+    }
+
+}
+
+interface GoogleApiYouTubeVideoGetRatingResponse {
+    /**
+     * The type of the API response. For this operation, the value will be youtube#videoGetRatingResponse.
+     */
+    kind: string;
+    /**
+     * The ETag of the response.
+     */
+    etag: string;
+    /**
+     * A list of ratings that match the request criteria.
+     */
+    items: {
+        /**
+         * The ID that YouTube uses to uniquely identify the video.
+         */
+        videoId: string;
+        /**
+         * The rating that the authorized user gave to the video.
+         */
+        rating: string;
+    }[];
+}
diff --git a/gapi.youtube/tsconfig.json b/gapi.youtube/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/gapi.youtube/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gapi.youtubeAnalytics/gapi.youtubeAnalytics.d.ts b/gapi.youtubeAnalytics/gapi.youtubeAnalytics.d.ts
deleted file mode 100644
index e3967bb6fa..0000000000
--- a/gapi.youtubeAnalytics/gapi.youtubeAnalytics.d.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-// Type definitions for YouTube Analytics API
-// Project: https://developers.google.com/youtube/analytics/
-// Definitions by: Frank M <https://github.com/sgtfrankieboy>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../gapi/gapi.d.ts" />
-
-declare namespace gapi.client.youtubeAnalytics {
-
-    export interface reports {
-
-        /**
-         * Retrieve your YouTube Analytics reports.
-         */
-        query(object: {
-            /**
-             * Identifies the YouTube channel or content owner for which you are retrieving YouTube Analytics data. - To request data for a YouTube user, set the ids parameter value to channel==CHANNEL_ID, where CHANNEL_ID specifies the unique YouTube channel ID. - To request data for a YouTube CMS content owner, set the ids parameter value to contentOwner==OWNER_NAME, where OWNER_NAME is the CMS name of the content owner.
-             */
-            ids: string;
-            /**
-             * The start date for fetching YouTube Analytics data. The value should be in YYYY-MM-DD format.
-             */
-            'start-date': string;
-            /**
-             * The end date for fetching YouTube Analytics data. The value should be in YYYY-MM-DD format.
-             */
-            'end-date': string;
-            /**
-             * A comma-separated list of YouTube Analytics metrics, such as views or likes,dislikes.
-             */
-            metrics: string;
-            /**
-             * A comma-separated list of YouTube Analytics dimensions, such as views or ageGroup,gender.
-             */
-            dimensions?: string;
-            /**
-             * A list of filters that should be applied when retrieving YouTube Analytics data. The Available Reports document identifies the dimensions that can be used to filter each report, and the Dimensions document defines those dimensions. If a request uses multiple filters, join them together with a semicolon (;), and the returned result table will satisfy both filters.
-             */
-            filters?: string;
-            /**
-             * The maximum number of rows to include in the response.
-             */
-            'max-results'?: number;
-            /**
-             * A comma-separated list of dimensions or metrics that determine the sort order for YouTube Analytics data. By default the sort order is ascending. The '-' prefix causes descending sort order.
-             */
-            sort?: string;
-            /**
-             * An index of the first entity to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter (one-based, inclusive).
-             */
-            'start-index'?: number;
-            /**
-             * Selector specifying which fields to include in a partial response.
-             */
-            fields?: string;
-        }): HttpRequest<any>
-
-    }
-
-}
diff --git a/gapi.youtubeAnalytics/index.d.ts b/gapi.youtubeAnalytics/index.d.ts
new file mode 100644
index 0000000000..0466da2cc2
--- /dev/null
+++ b/gapi.youtubeAnalytics/index.d.ts
@@ -0,0 +1,60 @@
+// Type definitions for YouTube Analytics API
+// Project: https://developers.google.com/youtube/analytics/
+// Definitions by: Frank M <https://github.com/sgtfrankieboy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="gapi" />
+
+declare namespace gapi.client.youtubeAnalytics {
+
+    export interface reports {
+
+        /**
+         * Retrieve your YouTube Analytics reports.
+         */
+        query(object: {
+            /**
+             * Identifies the YouTube channel or content owner for which you are retrieving YouTube Analytics data. - To request data for a YouTube user, set the ids parameter value to channel==CHANNEL_ID, where CHANNEL_ID specifies the unique YouTube channel ID. - To request data for a YouTube CMS content owner, set the ids parameter value to contentOwner==OWNER_NAME, where OWNER_NAME is the CMS name of the content owner.
+             */
+            ids: string;
+            /**
+             * The start date for fetching YouTube Analytics data. The value should be in YYYY-MM-DD format.
+             */
+            'start-date': string;
+            /**
+             * The end date for fetching YouTube Analytics data. The value should be in YYYY-MM-DD format.
+             */
+            'end-date': string;
+            /**
+             * A comma-separated list of YouTube Analytics metrics, such as views or likes,dislikes.
+             */
+            metrics: string;
+            /**
+             * A comma-separated list of YouTube Analytics dimensions, such as views or ageGroup,gender.
+             */
+            dimensions?: string;
+            /**
+             * A list of filters that should be applied when retrieving YouTube Analytics data. The Available Reports document identifies the dimensions that can be used to filter each report, and the Dimensions document defines those dimensions. If a request uses multiple filters, join them together with a semicolon (;), and the returned result table will satisfy both filters.
+             */
+            filters?: string;
+            /**
+             * The maximum number of rows to include in the response.
+             */
+            'max-results'?: number;
+            /**
+             * A comma-separated list of dimensions or metrics that determine the sort order for YouTube Analytics data. By default the sort order is ascending. The '-' prefix causes descending sort order.
+             */
+            sort?: string;
+            /**
+             * An index of the first entity to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter (one-based, inclusive).
+             */
+            'start-index'?: number;
+            /**
+             * Selector specifying which fields to include in a partial response.
+             */
+            fields?: string;
+        }): HttpRequest<any>
+
+    }
+
+}
diff --git a/gapi.youtubeAnalytics/tsconfig.json b/gapi.youtubeAnalytics/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/gapi.youtubeAnalytics/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gapi/gapi.d.ts b/gapi/gapi.d.ts
deleted file mode 100644
index 9e4e603bb2..0000000000
--- a/gapi/gapi.d.ts
+++ /dev/null
@@ -1,291 +0,0 @@
-// Type definitions for Google API Client
-// Project: https://code.google.com/p/google-api-javascript-client/
-// Definitions by: Frank M <https://github.com/sgtfrankieboy>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/**
- * The OAuth 2.0 token object represents the OAuth 2.0 token and any associated data.
- */
-interface GoogleApiOAuth2TokenObject {
-    /**
-     * The OAuth 2.0 token. Only present in successful responses
-     */
-    access_token: string;
-    /**
-     * Details about the error. Only present in error responses
-     */
-    error: string;
-    /**
-     * The duration, in seconds, the token is valid for. Only present in successful responses
-     */
-    expires_in: string;
-    /**
-     * The Google API scopes related to this token
-     */
-    state: string;
-}
-
-/**
- * Fix for #8215
- * https://github.com/DefinitelyTyped/DefinitelyTyped/issues/8215
- *
- * Usage example:
- * https://developers.google.com/identity/sign-in/web/session-state
- */
-declare namespace gapi {
-
-    /**
-     * Pragmatically initialize gapi class member.
-     */
-    export function load(object: string, fn: any) : any;
-
-}
-
-declare namespace gapi.auth {
-    /**
-     * Initiates the OAuth 2.0 authorization process. The browser displays a popup window prompting the user authenticate and authorize. After the user authorizes, the popup closes and the callback function fires.
-     * @param params A key/value map of parameters for the request. If the key is not one of the expected OAuth 2.0 parameters, it is added to the URI as a query parameter.
-     * @param callback The function to call once the login process is complete. The function takes an OAuth 2.0 token object as its only parameter.
-     */
-    export function authorize(params: {
-        /**
-         * The application's client ID.
-         */
-        client_id?: string;
-        /**
-         * If true, then login uses "immediate mode", which means that the token is refreshed behind the scenes, and no UI is shown to the user.
-         */
-        immediate?: boolean;
-        /**
-         * The OAuth 2.0 response type property. Default: token
-         */
-        response_type?: string;
-        /**
-         * The auth scope or scopes to authorize. Auth scopes for individual APIs can be found in their documentation.
-         */
-        scope?: any;
-        /**
-         * The user to sign in as. -1 to toggle a multi-account chooser, 0 to default to the user's current account, and 1 to automatically sign in if the user is signed into Google Plus.
-         */
-        authuser?: number;
-    }, callback: (token: GoogleApiOAuth2TokenObject) => any): void;
-    /**
-     * Initializes the authorization feature. Call this when the client loads to prevent popup blockers from blocking the auth window on gapi.auth.authorize calls.
-     * @param callback A callback to execute when the auth feature is ready to make authorization calls.
-     */
-    export function init(callback: () => any): void;
-    /**
-     * Retrieves the OAuth 2.0 token for the application.
-     * @return The OAuth 2.0 token.
-     */
-    export function getToken(): GoogleApiOAuth2TokenObject;
-    /**
-     * Sets the OAuth 2.0 token for the application.
-     * @param token The token to set.
-     */
-    export function setToken(token: GoogleApiOAuth2TokenObject): void;
-    /**
-     * Initiates the client-side Google+ Sign-In OAuth 2.0 flow.
-     * When the method is called, the OAuth 2.0 authorization dialog is displayed to the user and when they accept, the callback function is called.
-     * @param params
-     */
-    export function signIn(params: {
-        /**
-         * Your OAuth 2.0 client ID that you obtained from the Google Developers Console.
-         */
-        clientid?: string;
-        /**
-         * Directs the sign-in button to store user and session information in a session cookie and HTML5 session storage on the user's client for the purpose of minimizing HTTP traffic and distinguishing between multiple Google accounts a user might be signed into.
-         */
-        cookiepolicy?: string;
-        /**
-         * A function in the global namespace, which is called when the sign-in button is rendered and also called after a sign-in flow completes.
-         */
-        callback?: Function;
-        /**
-         * If true, all previously granted scopes remain granted in each incremental request, for incremental authorization. The default value true is correct for most use cases; use false only if employing delegated auth, where you pass the bearer token to a less-trusted component with lower programmatic authority.
-         */
-        includegrantedscopes?: boolean;
-        /**
-         * If your app will write moments, list the full URI of the types of moments that you intend to write.
-         */
-        requestvisibleactions?: any;
-        /**
-         * The OAuth 2.0 scopes for the APIs that you would like to use as a space-delimited list.
-         */
-        scope?: any;
-        /**
-         * If you have an Android app, you can drive automatic Android downloads from your web sign-in flow.
-         */
-        apppackagename?: string;
-    }): void;
-    /**
-     * Signs a user out of your app without logging the user out of Google. This method will only work when the user is signed in with Google+ Sign-In.
-     */
-    export function signOut(): void;
-}
-
-declare namespace gapi.client {
-    /**
-    * Loads the client library interface to a particular API. If a callback is not provided, a promise is returned.
-    * @param name The name of the API to load.
-    * @param version The version of the API to load.
-    * @return promise The promise that get's resolved after the request is finished.
-    */
-    export function load(name: string, version: string): Promise<void>
-
-    /**
-    * Loads the client library interface to a particular API. The new API interface will be in the form gapi.client.api.collection.method.
-    * @param name The name of the API to load.
-    * @param version The version of the API to load
-    * @param callback the function that is called once the API interface is loaded
-    */
-    export function load(name: string, version: string, callback: () => any): void;
-    /**
-    * Creates a HTTP request for making RESTful requests.
-    * An object encapsulating the various arguments for this method.
-    */
-    export function request(args: {
-        /**
-         * The URL to handle the request
-         */
-        path: string;
-        /**
-         * The HTTP request method to use. Default is GET
-         */
-        method?: string;
-        /**
-         * URL params in key-value pair form
-         */
-        params?: any;
-        /**
-         * Additional HTTP request headers
-         */
-        headers?: any;
-        /**
-         * The HTTP request body (applies to PUT or POST).
-         */
-        body?: any;
-        /**
-         * If supplied, the request is executed immediately and no gapi.client.HttpRequest object is returned
-         */
-        callback?: () => any;
-    }): HttpRequest<any>;
-    /**
-    * Creates an RPC Request directly. The method name and version identify the method to be executed and the RPC params are provided upon RPC creation.
-    * @param method The method to be executed.
-    * @param version The version of the API which defines the method to be executed. Defaults to v1
-    * @param rpcParams A key-value pair of the params to supply to this RPC
-    */
-    export function rpcRequest(method: string, version?: string, rpcParams?: any): RpcRequest;
-    /**
-    * Sets the API key for the application.
-    * @param apiKey The API key to set
-    */
-    export function setApiKey(apiKey: string): void;
-
-    /**
-     * An object encapsulating an HTTP request. This object is not instantiated directly, rather it is returned by gapi.client.request.
-     */
-    export class HttpRequest<T> {
-        /**
-         * Executes the request and runs the supplied callback on response.
-         * @param callback The callback function which executes when the request succeeds or fails.
-         */
-        execute(callback: (
-            /**
-             * contains the response parsed as JSON. If the response is not JSON, this field will be false.
-             */
-            jsonResp: T,
-            /**
-             * is the HTTP response. It is JSON, and can be parsed to an object
-             */
-            rawResp: {
-                body: string;
-                headers: any[];
-                status: number;
-                statusText: string;
-            }
-            ) => any):void;
-            /**
-         * HttpRequest supports promises.
-         */
-        then(success:(response:{
-                result:T;
-                body:string;
-                headers?: any[];
-                status?: number;
-                statusText?: string
-            })=>void,
-            failure:(response:{
-                result:T;
-                body:string;
-                headers?: any[];
-                status?: number;
-                statusText?: string
-            })=>void): void;
-    }
-    /**
-     * Represents an HTTP Batch operation. Individual HTTP requests are added with the add method and the batch is executed using execute.
-     */
-    export class HttpBatch {
-        /**
-         * Adds a gapi.client.HttpRequest to the batch.
-         * @param httpRequest The HTTP request to add to this batch.
-         * @param opt_params extra parameters for this batch entry.
-         */
-        add(httpRequest: HttpRequest<any>, opt_params?: {
-            /**
-             * Identifies the response for this request in the map of batch responses. If one is not provided, the system generates a random ID.
-             */
-            id: string;
-            callback: (
-            /**
-             * is the response for this request only. Its format is defined by the API method being called.
-             */
-            individualResponse: any,
-            /**
-             * is the raw batch ID-response map as a string. It contains all responses to all requests in the batch.
-             */
-            rawBatchResponse: any
-            ) => any
-        }):void;
-        /**
-         * Executes all requests in the batch. The supplied callback is executed on success or failure.
-         * @param callback The callback to execute when the batch returns.
-         */
-        execute(callback: (
-            /**
-             * is an ID-response map of each requests response.
-             */
-            responseMap: any,
-            /**
-             * is the same response, but as an unparsed JSON-string.
-             */
-            rawBatchResponse: string
-            ) => any):void;
-    }
-
-    /**
-     * Similar to gapi.client.HttpRequest except this object encapsulates requests generated by registered methods.
-     */
-    export class RpcRequest {
-
-        /**
-         * Executes the request and runs the supplied callback with the response.
-         * @param callback The callback function which executes when the request succeeds or fails.
-         */
-        callback(callback: (
-            /**
-             * contains the response parsed as JSON. If the response is not JSON, this field will be false.
-             */
-            jsonResp: any,
-            /**
-             * is the same as jsonResp, except it is a raw string that has not been parsed. It is typically used when the response is not JSON.
-             */
-            rawResp: string
-            ) => void ):void;
-    }
-
-}
diff --git a/gapi/index.d.ts b/gapi/index.d.ts
new file mode 100644
index 0000000000..6d7e18a12e
--- /dev/null
+++ b/gapi/index.d.ts
@@ -0,0 +1,292 @@
+// Type definitions for Google API Client
+// Project: https://code.google.com/p/google-api-javascript-client/
+// Definitions by: Frank M <https://github.com/sgtfrankieboy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/**
+ * The OAuth 2.0 token object represents the OAuth 2.0 token and any associated data.
+ */
+interface GoogleApiOAuth2TokenObject {
+    /**
+     * The OAuth 2.0 token. Only present in successful responses
+     */
+    access_token: string;
+    /**
+     * Details about the error. Only present in error responses
+     */
+    error: string;
+    /**
+     * The duration, in seconds, the token is valid for. Only present in successful responses
+     */
+    expires_in: string;
+    /**
+     * The Google API scopes related to this token
+     */
+    state: string;
+}
+
+/**
+ * Fix for #8215
+ * https://github.com/DefinitelyTyped/DefinitelyTyped/issues/8215
+ *
+ * Usage example:
+ * https://developers.google.com/identity/sign-in/web/session-state
+ */
+declare namespace gapi {
+
+    /**
+     * Pragmatically initialize gapi class member.
+     */
+    export function load(object: string, fn: any) : any;
+
+}
+
+declare namespace gapi.auth {
+    /**
+     * Initiates the OAuth 2.0 authorization process. The browser displays a popup window prompting the user authenticate and authorize. After the user authorizes, the popup closes and the callback function fires.
+     * @param params A key/value map of parameters for the request. If the key is not one of the expected OAuth 2.0 parameters, it is added to the URI as a query parameter.
+     * @param callback The function to call once the login process is complete. The function takes an OAuth 2.0 token object as its only parameter.
+     */
+    export function authorize(params: {
+        /**
+         * The application's client ID.
+         */
+        client_id?: string;
+        /**
+         * If true, then login uses "immediate mode", which means that the token is refreshed behind the scenes, and no UI is shown to the user.
+         */
+        immediate?: boolean;
+        /**
+         * The OAuth 2.0 response type property. Default: token
+         */
+        response_type?: string;
+        /**
+         * The auth scope or scopes to authorize. Auth scopes for individual APIs can be found in their documentation.
+         */
+        scope?: any;
+        /**
+         * The user to sign in as. -1 to toggle a multi-account chooser, 0 to default to the user's current account, and 1 to automatically sign in if the user is signed into Google Plus.
+         */
+        authuser?: number;
+    }, callback: (token: GoogleApiOAuth2TokenObject) => any): void;
+    /**
+     * Initializes the authorization feature. Call this when the client loads to prevent popup blockers from blocking the auth window on gapi.auth.authorize calls.
+     * @param callback A callback to execute when the auth feature is ready to make authorization calls.
+     */
+    export function init(callback: () => any): void;
+    /**
+     * Retrieves the OAuth 2.0 token for the application.
+     * @return The OAuth 2.0 token.
+     */
+    export function getToken(): GoogleApiOAuth2TokenObject;
+    /**
+     * Sets the OAuth 2.0 token for the application.
+     * @param token The token to set.
+     */
+    export function setToken(token: GoogleApiOAuth2TokenObject): void;
+    /**
+     * Initiates the client-side Google+ Sign-In OAuth 2.0 flow.
+     * When the method is called, the OAuth 2.0 authorization dialog is displayed to the user and when they accept, the callback function is called.
+     * @param params
+     */
+    export function signIn(params: {
+        /**
+         * Your OAuth 2.0 client ID that you obtained from the Google Developers Console.
+         */
+        clientid?: string;
+        /**
+         * Directs the sign-in button to store user and session information in a session cookie and HTML5 session storage on the user's client for the purpose of minimizing HTTP traffic and distinguishing between multiple Google accounts a user might be signed into.
+         */
+        cookiepolicy?: string;
+        /**
+         * A function in the global namespace, which is called when the sign-in button is rendered and also called after a sign-in flow completes.
+         */
+        callback?: Function;
+        /**
+         * If true, all previously granted scopes remain granted in each incremental request, for incremental authorization. The default value true is correct for most use cases; use false only if employing delegated auth, where you pass the bearer token to a less-trusted component with lower programmatic authority.
+         */
+        includegrantedscopes?: boolean;
+        /**
+         * If your app will write moments, list the full URI of the types of moments that you intend to write.
+         */
+        requestvisibleactions?: any;
+        /**
+         * The OAuth 2.0 scopes for the APIs that you would like to use as a space-delimited list.
+         */
+        scope?: any;
+        /**
+         * If you have an Android app, you can drive automatic Android downloads from your web sign-in flow.
+         */
+        apppackagename?: string;
+    }): void;
+    /**
+     * Signs a user out of your app without logging the user out of Google. This method will only work when the user is signed in with Google+ Sign-In.
+     */
+    export function signOut(): void;
+}
+
+declare namespace gapi.client {
+    /**
+    * Loads the client library interface to a particular API. If a callback is not provided, a promise is returned.
+    * @param name The name of the API to load.
+    * @param version The version of the API to load.
+    * @return promise The promise that get's resolved after the request is finished.
+    */
+    export function load(name: string, version: string): Promise<void>
+
+    /**
+    * Loads the client library interface to a particular API. The new API interface will be in the form gapi.client.api.collection.method.
+    * @param name The name of the API to load.
+    * @param version The version of the API to load
+    * @param callback the function that is called once the API interface is loaded
+    * @param url optional, the url of your app - if using Google's APIs, don't set it
+    */
+    export function load(name: string, version: string, callback: () => any, url?: string): void;
+    /**
+    * Creates a HTTP request for making RESTful requests.
+    * An object encapsulating the various arguments for this method.
+    */
+    export function request(args: {
+        /**
+         * The URL to handle the request
+         */
+        path: string;
+        /**
+         * The HTTP request method to use. Default is GET
+         */
+        method?: string;
+        /**
+         * URL params in key-value pair form
+         */
+        params?: any;
+        /**
+         * Additional HTTP request headers
+         */
+        headers?: any;
+        /**
+         * The HTTP request body (applies to PUT or POST).
+         */
+        body?: any;
+        /**
+         * If supplied, the request is executed immediately and no gapi.client.HttpRequest object is returned
+         */
+        callback?: () => any;
+    }): HttpRequest<any>;
+    /**
+    * Creates an RPC Request directly. The method name and version identify the method to be executed and the RPC params are provided upon RPC creation.
+    * @param method The method to be executed.
+    * @param version The version of the API which defines the method to be executed. Defaults to v1
+    * @param rpcParams A key-value pair of the params to supply to this RPC
+    */
+    export function rpcRequest(method: string, version?: string, rpcParams?: any): RpcRequest;
+    /**
+    * Sets the API key for the application.
+    * @param apiKey The API key to set
+    */
+    export function setApiKey(apiKey: string): void;
+
+    /**
+     * An object encapsulating an HTTP request. This object is not instantiated directly, rather it is returned by gapi.client.request.
+     */
+    export class HttpRequest<T> {
+        /**
+         * Executes the request and runs the supplied callback on response.
+         * @param callback The callback function which executes when the request succeeds or fails.
+         */
+        execute(callback: (
+            /**
+             * contains the response parsed as JSON. If the response is not JSON, this field will be false.
+             */
+            jsonResp: T,
+            /**
+             * is the HTTP response. It is JSON, and can be parsed to an object
+             */
+            rawResp: {
+                body: string;
+                headers: any[];
+                status: number;
+                statusText: string;
+            }
+            ) => any):void;
+            /**
+         * HttpRequest supports promises.
+         */
+        then(success:(response:{
+                result:T;
+                body:string;
+                headers?: any[];
+                status?: number;
+                statusText?: string
+            })=>void,
+            failure:(response:{
+                result:T;
+                body:string;
+                headers?: any[];
+                status?: number;
+                statusText?: string
+            })=>void): void;
+    }
+    /**
+     * Represents an HTTP Batch operation. Individual HTTP requests are added with the add method and the batch is executed using execute.
+     */
+    export class HttpBatch {
+        /**
+         * Adds a gapi.client.HttpRequest to the batch.
+         * @param httpRequest The HTTP request to add to this batch.
+         * @param opt_params extra parameters for this batch entry.
+         */
+        add(httpRequest: HttpRequest<any>, opt_params?: {
+            /**
+             * Identifies the response for this request in the map of batch responses. If one is not provided, the system generates a random ID.
+             */
+            id: string;
+            callback: (
+            /**
+             * is the response for this request only. Its format is defined by the API method being called.
+             */
+            individualResponse: any,
+            /**
+             * is the raw batch ID-response map as a string. It contains all responses to all requests in the batch.
+             */
+            rawBatchResponse: any
+            ) => any
+        }):void;
+        /**
+         * Executes all requests in the batch. The supplied callback is executed on success or failure.
+         * @param callback The callback to execute when the batch returns.
+         */
+        execute(callback: (
+            /**
+             * is an ID-response map of each requests response.
+             */
+            responseMap: any,
+            /**
+             * is the same response, but as an unparsed JSON-string.
+             */
+            rawBatchResponse: string
+            ) => any):void;
+    }
+
+    /**
+     * Similar to gapi.client.HttpRequest except this object encapsulates requests generated by registered methods.
+     */
+    export class RpcRequest {
+
+        /**
+         * Executes the request and runs the supplied callback with the response.
+         * @param callback The callback function which executes when the request succeeds or fails.
+         */
+        callback(callback: (
+            /**
+             * contains the response parsed as JSON. If the response is not JSON, this field will be false.
+             */
+            jsonResp: any,
+            /**
+             * is the same as jsonResp, except it is a raw string that has not been parsed. It is typically used when the response is not JSON.
+             */
+            rawResp: string
+            ) => void ):void;
+    }
+
+}
diff --git a/gapi/tsconfig.json b/gapi/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/gapi/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gently/gently-tests.ts b/gently/gently-tests.ts
index a1ce563520..477e6f1f17 100644
--- a/gently/gently-tests.ts
+++ b/gently/gently-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="gently.d.ts" />
 
 import Gently = require('gently');
 
diff --git a/gently/gently.d.ts b/gently/gently.d.ts
deleted file mode 100644
index b8b23e4c2c..0000000000
--- a/gently/gently.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// Type definitions for gently
-// Project: https://www.npmjs.org/package/gently
-// Definitions by: bonnici <https://github.com/bonnici>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/gently.d.ts
-
-declare module "gently" {
-	export = Gently;
-
-	class Gently {
-		constructor();
-		hijacked: any[];
-
-		expect(obj: any, method: string, stubFn?: (...args: any[]) => any): (...args: any[]) => any;
-		expect(obj: any, method: string, count: number, stubFn: (...args: any[]) => any): (...args: any[]) => any;
-
-		restore(obj: any, method: string): void;
-
-		hijack(realRequire: (id: string) => any): (id: string) => any;
-
-		stub(location: string, exportsName?: string): any;
-
-		verify(msg?: string): void;
-	}
-}
diff --git a/gently/index.d.ts b/gently/index.d.ts
new file mode 100644
index 0000000000..c9409bb09a
--- /dev/null
+++ b/gently/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for gently
+// Project: https://www.npmjs.org/package/gently
+// Definitions by: bonnici <https://github.com/bonnici>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/gently.d.ts
+
+
+export = Gently;
+
+declare class Gently {
+    constructor();
+    hijacked: any[];
+
+    expect(obj: any, method: string, stubFn?: (...args: any[]) => any): (...args: any[]) => any;
+    expect(obj: any, method: string, count: number, stubFn: (...args: any[]) => any): (...args: any[]) => any;
+
+    restore(obj: any, method: string): void;
+
+    hijack(realRequire: (id: string) => any): (id: string) => any;
+
+    stub(location: string, exportsName?: string): any;
+
+    verify(msg?: string): void;
+}
diff --git a/gently/tsconfig.json b/gently/tsconfig.json
new file mode 100644
index 0000000000..9e1e957393
--- /dev/null
+++ b/gently/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gently-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/geoip-lite/geoip-lite-tests.ts b/geoip-lite/geoip-lite-tests.ts
index fb809369b7..c541535d99 100644
--- a/geoip-lite/geoip-lite-tests.ts
+++ b/geoip-lite/geoip-lite-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="geoip-lite.d.ts"/>
-
 // require geoip-lite
 import geoip = require('geoip-lite');
 
diff --git a/geoip-lite/geoip-lite.d.ts b/geoip-lite/geoip-lite.d.ts
deleted file mode 100644
index 9f0c83b8f2..0000000000
--- a/geoip-lite/geoip-lite.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// Type definitions for GeoIP-lite 1.1.6
-// Project: https://github.com/bluesmoon/node-geoip
-// Definitions by: Yuce Tekol <http://yuce.me/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'geoip-lite' {
-	namespace mod {
-		export interface Lookup {
-			range: Array<number>; // range start, end
-			country: string;
-			region: string;
-			city: string;
-			ll: Array<number>; // latitude, longitude
-		}
-
-		export function lookup(ip: string): Lookup;
-		export function pretty(ip: number): string;
-		export function startWatchingDataUpdate(): void;
-		export function stopWatchingDataUpdate(): void;
-	}
-	export = mod;
-}
diff --git a/geoip-lite/index.d.ts b/geoip-lite/index.d.ts
new file mode 100644
index 0000000000..6eea0aea61
--- /dev/null
+++ b/geoip-lite/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for GeoIP-lite 1.1.6
+// Project: https://github.com/bluesmoon/node-geoip
+// Definitions by: Yuce Tekol <http://yuce.me/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare namespace mod {
+    export interface Lookup {
+        range: Array<number>; // range start, end
+        country: string;
+        region: string;
+        city: string;
+        ll: Array<number>; // latitude, longitude
+    }
+
+    export function lookup(ip: string): Lookup;
+    export function pretty(ip: number): string;
+    export function startWatchingDataUpdate(): void;
+    export function stopWatchingDataUpdate(): void;
+}
+export = mod;
diff --git a/geoip-lite/tsconfig.json b/geoip-lite/tsconfig.json
new file mode 100644
index 0000000000..4040cbc213
--- /dev/null
+++ b/geoip-lite/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "geoip-lite-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/geojson/geojson-tests.ts b/geojson/geojson-tests.ts
index ce38b654b2..2a884bfe39 100644
--- a/geojson/geojson-tests.ts
+++ b/geojson/geojson-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./geojson.d.ts" />
+
 
 var featureCollection: GeoJSON.FeatureCollection<any> =  {
     type: "FeatureCollection",
diff --git a/geojson/geojson.d.ts b/geojson/index.d.ts
similarity index 100%
rename from geojson/geojson.d.ts
rename to geojson/index.d.ts
diff --git a/geojson/tsconfig.json b/geojson/tsconfig.json
new file mode 100644
index 0000000000..72767b13f3
--- /dev/null
+++ b/geojson/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "geojson-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/geometry-dom/geometry-dom-tests.ts b/geometry-dom/geometry-dom-tests.ts
index e293665112..8c186fbf35 100644
--- a/geometry-dom/geometry-dom-tests.ts
+++ b/geometry-dom/geometry-dom-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./geometry-dom.d.ts" />
+
 
 var point = new DOMPoint(5, 4);
 var matrix = new DOMMatrix(2, 0, 0, 2, 10, 10);
diff --git a/geometry-dom/geometry-dom.d.ts b/geometry-dom/index.d.ts
similarity index 100%
rename from geometry-dom/geometry-dom.d.ts
rename to geometry-dom/index.d.ts
diff --git a/geometry-dom/tsconfig.json b/geometry-dom/tsconfig.json
new file mode 100644
index 0000000000..0fe0082478
--- /dev/null
+++ b/geometry-dom/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "geometry-dom-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/giraffe/giraffe-tests.ts b/giraffe/giraffe-tests.ts
index ec6cb0c628..e152d5c7af 100644
--- a/giraffe/giraffe-tests.ts
+++ b/giraffe/giraffe-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="giraffe.d.ts" />
+
 
 class User extends Giraffe.Model {
 }
diff --git a/giraffe/giraffe-tests.ts.tscparams b/giraffe/giraffe-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/giraffe/giraffe-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/giraffe/giraffe.d.ts b/giraffe/giraffe.d.ts
deleted file mode 100644
index 71b45cd653..0000000000
--- a/giraffe/giraffe.d.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-// Type definitions for Giraffe
-// Project: https://github.com/barc/backbone.giraffe
-// Definitions by: Matt McCray <https://github.com/darthapo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../backbone/backbone.d.ts" />
-
-declare namespace Giraffe {
-
-  interface GiraffeObject {
-    app: App;
-    appEvents?: StringMap;
-    dataEvents?: StringMap;
-    defaultOptions?: DefaultOptions;
-
-    initialize?();
-    beforeInitialize?();
-    afterInitialize?();
-
-    dispose?();
-    beforeDispose?();
-    afterDispose?();
-  }
-
-  interface AttachmentOptions {
-    method?: string;
-    forceRender?: boolean;
-    suppressRender?: boolean;
-  }
-
-  interface DefaultOptions {
-    disposeOnDetach?: boolean;
-    alwaysRender?: boolean;
-    saveScrollPosition?: boolean;
-    documentTitle?: string;
-  }
-
-  interface AppMap {
-    [ cid:string ]: App;
-  }
-  interface ViewMap<TModel extends Model> {
-    [ cid:string ]: View<TModel>;
-  }
-  interface StringMap {
-    [ def:string ]: string;
-  }
-
-  var app: App;
-  var apps: AppMap;
-  var defaultOptions: DefaultOptions;
-  var version: string;
-  var views: ViewMap<Model>;
-
-  function bindAppEvents( instance:GiraffeObject ): GiraffeObject;
-  function bindDataEvents( instance:GiraffeObject ): GiraffeObject;
-  function bindEvent( context:Backbone.Events, target:Backbone.Events, event:any, callback:Function );
-  function unbindEvent( context:Backbone.Events, target:Backbone.Events, event:any, callback:Function );
-  function bindEventMap( context:Backbone.Events, target:Backbone.Events, eventMap:any );
-  function unbindEventMap( context:Backbone.Events, target:Backbone.Events, eventMap:any );
-
-  function configure( instance:any, options?:any );
-  function dispose( instance:GiraffeObject, ...args:any[] ): GiraffeObject;
-  function disposeThis( ...args:any[] ): GiraffeObject;
-
-  function wrapFn( obj:any, name:string, before:Function, after:Function);
-
-  class Collection<TModel extends Model> extends Backbone.Collection<TModel> implements GiraffeObject {
-    app: App;
-    //model: typeof TModel;
-    model: { new (): TModel; }; // workaround
-  }
-
-  class Model extends Backbone.Model implements GiraffeObject {
-    app: App;
-  }
-
-  class Router extends Backbone.Router implements GiraffeObject {
-    app: App;
-    namespace: string;
-    triggers: StringMap;
-
-    cause( appEvent:string, ...args:any[] );
-    isCaused( appEvent:string, ...args:any[] ): boolean;
-    getRoute( appEvent:string, ...args:any[] ): string;
-
-    reload( url:string );
-  }
-
-  class View<TModel extends Model> extends Backbone.View<TModel> implements GiraffeObject {
-    app: App;
-    appEvents: StringMap;
-    children: View<TModel>[];
-    dataEvents: StringMap;
-    defaultOptions: DefaultOptions;
-    documentTitle: string;
-    parent: View<TModel>;
-    template: any;
-    ui: StringMap;
-
-    attachTo( el:any, options?:AttachmentOptions ): View<TModel>;
-    attach( view:View<TModel>, options?:AttachmentOptions ): View<TModel>;
-    isAttached( el:any ): boolean;
-
-    render( options?:any ): View<TModel>;
-    beforeRender();
-    afterRender();
-    templateStrategy(): string;
-    serialize(): any;
-
-    setParent( parent:View<TModel> ): View<TModel>;
-
-    addChild( child:View<TModel> ): View<TModel>;
-    addChildren( children:View<TModel>[] ): View<TModel>;
-    removeChild( child:View<TModel>, preserve?:boolean ): View<TModel>;
-    removeChildren( preserve?:boolean ): View<TModel>;
-
-    detach( preserve?:boolean ): View<TModel>;
-    detachChildren( preserve?:boolean ): View<TModel>;
-
-    invoke( method:string, ...args:any[] );
-
-    dispose(): View<TModel>;
-    beforeDispose(): View<TModel>;
-    afterDispose(): View<TModel>;
-
-    static detachByElement( el:any, preserve?:boolean ): View<Model>;
-    static getClosestView<TModel>( el:any ): View<Model>;
-    static getByCid( cid:string ): View<Model>;
-    static to$El( el:any, parent?:any, allowParentMatch?:boolean ): JQuery;
-    static setDocumentEvents( events:string[], prefix?:string ): string[];
-    static removeDocumentEvents( prefix?:string );
-    static setDocumentEventPrefix( prefix?:string );
-    static setTemplateStrategy( strategy:any, instance?:any );
-  }
-
-  class App extends View<Model> {
-    routes: StringMap;
-
-    addInitializer( initializer:( options?:any, callback?:()=>void )=>void ): App;
-
-    start( options?:any ): App;
-  }
-
-  namespace Contrib {
-
-    class Controller extends Backbone.Events implements GiraffeObject {
-      app: App;
-    }
-
-    class CollectionView<TModel extends Model> extends View<TModel> {
-
-      collection: Collection<TModel>;
-      modelView: View<TModel>;
-      modelViewArgs: any[];
-      modelViewEl: any;
-      renderOnChange: boolean;
-
-      findByModel( model:Model ): View<TModel>;
-      addOne( model:Model ): View<TModel>;
-      removeOne( model:Model ): View<TModel>;
-
-      static getDefaults( ctx:any ): any;
-    }
-
-    class FastCollectionView<TModel extends Model> extends View<TModel> {
-      collection: Collection<TModel>;
-      modelTemplate: any;
-      modelTemplateStrategy: string;
-      modelEl: any;
-      renderOnChange: boolean;
-
-      modelSerialize(): any;
-
-      addAll(): View<TModel>;
-      addOne( model:Model ): View<TModel>;
-      removeOne( model:Model ): View<TModel>;
-
-      removeByIndex( index:number ): View<TModel>;
-      findElByModel( model:Model ): JQuery;
-      findElByIndex( index:number ): JQuery;
-      findModelByEl( el:any ): Model;
-
-      static getDefaults( ctx:any ): any;
-    }
-
-  }
-}
diff --git a/giraffe/giraffe.d.ts.tscparams b/giraffe/giraffe.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/giraffe/giraffe.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/giraffe/index.d.ts b/giraffe/index.d.ts
new file mode 100644
index 0000000000..f9198a7d8b
--- /dev/null
+++ b/giraffe/index.d.ts
@@ -0,0 +1,188 @@
+// Type definitions for Giraffe
+// Project: https://github.com/barc/backbone.giraffe
+// Definitions by: Matt McCray <https://github.com/darthapo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="backbone" />
+/// <reference types="jquery" />
+
+declare namespace Giraffe {
+
+  interface GiraffeObject {
+    app: App;
+    appEvents?: StringMap;
+    dataEvents?: StringMap;
+    defaultOptions?: DefaultOptions;
+
+    initialize?();
+    beforeInitialize?();
+    afterInitialize?();
+
+    dispose?();
+    beforeDispose?();
+    afterDispose?();
+  }
+
+  interface AttachmentOptions {
+    method?: string;
+    forceRender?: boolean;
+    suppressRender?: boolean;
+  }
+
+  interface DefaultOptions {
+    disposeOnDetach?: boolean;
+    alwaysRender?: boolean;
+    saveScrollPosition?: boolean;
+    documentTitle?: string;
+  }
+
+  interface AppMap {
+    [ cid:string ]: App;
+  }
+  interface ViewMap<TModel extends Model> {
+    [ cid:string ]: View<TModel>;
+  }
+  interface StringMap {
+    [ def:string ]: string;
+  }
+
+  var app: App;
+  var apps: AppMap;
+  var defaultOptions: DefaultOptions;
+  var version: string;
+  var views: ViewMap<Model>;
+
+  function bindAppEvents( instance:GiraffeObject ): GiraffeObject;
+  function bindDataEvents( instance:GiraffeObject ): GiraffeObject;
+  function bindEvent( context:Backbone.Events, target:Backbone.Events, event:any, callback:Function );
+  function unbindEvent( context:Backbone.Events, target:Backbone.Events, event:any, callback:Function );
+  function bindEventMap( context:Backbone.Events, target:Backbone.Events, eventMap:any );
+  function unbindEventMap( context:Backbone.Events, target:Backbone.Events, eventMap:any );
+
+  function configure( instance:any, options?:any );
+  function dispose( instance:GiraffeObject, ...args:any[] ): GiraffeObject;
+  function disposeThis( ...args:any[] ): GiraffeObject;
+
+  function wrapFn( obj:any, name:string, before:Function, after:Function);
+
+  class Collection<TModel extends Model> extends Backbone.Collection<TModel> implements GiraffeObject {
+    app: App;
+    //model: typeof TModel;
+    model: { new (): TModel; }; // workaround
+  }
+
+  class Model extends Backbone.Model implements GiraffeObject {
+    app: App;
+  }
+
+  class Router extends Backbone.Router implements GiraffeObject {
+    app: App;
+    namespace: string;
+    triggers: StringMap;
+
+    cause( appEvent:string, ...args:any[] );
+    isCaused( appEvent:string, ...args:any[] ): boolean;
+    getRoute( appEvent:string, ...args:any[] ): string;
+
+    reload( url:string );
+  }
+
+  class View<TModel extends Model> extends Backbone.View<TModel> implements GiraffeObject {
+    app: App;
+    appEvents: StringMap;
+    children: View<TModel>[];
+    dataEvents: StringMap;
+    defaultOptions: DefaultOptions;
+    documentTitle: string;
+    parent: View<TModel>;
+    template: any;
+    ui: StringMap;
+
+    attachTo( el:any, options?:AttachmentOptions ): View<TModel>;
+    attach( view:View<TModel>, options?:AttachmentOptions ): View<TModel>;
+    isAttached( el:any ): boolean;
+
+    render( options?:any ): View<TModel>;
+    beforeRender();
+    afterRender();
+    templateStrategy(): string;
+    serialize(): any;
+
+    setParent( parent:View<TModel> ): View<TModel>;
+
+    addChild( child:View<TModel> ): View<TModel>;
+    addChildren( children:View<TModel>[] ): View<TModel>;
+    removeChild( child:View<TModel>, preserve?:boolean ): View<TModel>;
+    removeChildren( preserve?:boolean ): View<TModel>;
+
+    detach( preserve?:boolean ): View<TModel>;
+    detachChildren( preserve?:boolean ): View<TModel>;
+
+    invoke( method:string, ...args:any[] );
+
+    dispose(): View<TModel>;
+    beforeDispose(): View<TModel>;
+    afterDispose(): View<TModel>;
+
+    static detachByElement( el:any, preserve?:boolean ): View<Model>;
+    static getClosestView<TModel>( el:any ): View<Model>;
+    static getByCid( cid:string ): View<Model>;
+    static to$El( el:any, parent?:any, allowParentMatch?:boolean ): JQuery;
+    static setDocumentEvents( events:string[], prefix?:string ): string[];
+    static removeDocumentEvents( prefix?:string );
+    static setDocumentEventPrefix( prefix?:string );
+    static setTemplateStrategy( strategy:any, instance?:any );
+  }
+
+  class App extends View<Model> {
+    routes: StringMap;
+
+    addInitializer( initializer:( options?:any, callback?:()=>void )=>void ): App;
+
+    start( options?:any ): App;
+  }
+
+  namespace Contrib {
+
+    class Controller extends Backbone.Events implements GiraffeObject {
+      app: App;
+    }
+
+    class CollectionView<TModel extends Model> extends View<TModel> {
+
+      collection: Collection<TModel>;
+      modelView: View<TModel>;
+      modelViewArgs: any[];
+      modelViewEl: any;
+      renderOnChange: boolean;
+
+      findByModel( model:Model ): View<TModel>;
+      addOne( model:Model ): View<TModel>;
+      removeOne( model:Model ): View<TModel>;
+
+      static getDefaults( ctx:any ): any;
+    }
+
+    class FastCollectionView<TModel extends Model> extends View<TModel> {
+      collection: Collection<TModel>;
+      modelTemplate: any;
+      modelTemplateStrategy: string;
+      modelEl: any;
+      renderOnChange: boolean;
+
+      modelSerialize(): any;
+
+      addAll(): View<TModel>;
+      addOne( model:Model ): View<TModel>;
+      removeOne( model:Model ): View<TModel>;
+
+      removeByIndex( index:number ): View<TModel>;
+      findElByModel( model:Model ): JQuery;
+      findElByIndex( index:number ): JQuery;
+      findModelByEl( el:any ): Model;
+
+      static getDefaults( ctx:any ): any;
+    }
+
+  }
+}
diff --git a/giraffe/tsconfig.json b/giraffe/tsconfig.json
new file mode 100644
index 0000000000..65587d49dd
--- /dev/null
+++ b/giraffe/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "giraffe-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/git-config/git-config-tests.ts b/git-config/git-config-tests.ts
index a41316b938..2df4ab5308 100644
--- a/git-config/git-config-tests.ts
+++ b/git-config/git-config-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="git-config.d.ts" />
 
 import gitConfig = require('git-config');
 
diff --git a/git-config/git-config.d.ts b/git-config/git-config.d.ts
deleted file mode 100644
index f82910186f..0000000000
--- a/git-config/git-config.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Type definitions for git-config
-// Project: https://github.com/eugeneware/git-config
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "git-config" {
-    export function sync(gitFile?: string): Object; // Synchronous version.
-}
diff --git a/git-config/index.d.ts b/git-config/index.d.ts
new file mode 100644
index 0000000000..6f9a324ca8
--- /dev/null
+++ b/git-config/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for git-config
+// Project: https://github.com/eugeneware/git-config
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export declare function sync(gitFile?: string): Object;
diff --git a/git-config/tsconfig.json b/git-config/tsconfig.json
new file mode 100644
index 0000000000..06c6cfe00a
--- /dev/null
+++ b/git-config/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "git-config-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/git/index.d.ts b/git/index.d.ts
new file mode 100644
index 0000000000..987042abf3
--- /dev/null
+++ b/git/index.d.ts
@@ -0,0 +1,679 @@
+// Type definitions for node-git
+// Project: https://github.com/christkv/node-git
+// Definitions by: vvakame <https://github.com/vvakame>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+// lib/git/git.js
+export declare class Git {
+
+    constructor(gitDirectory: any);
+
+    refs(options: any, prefix: string, callback: (err: any, data: string) => void): void;
+
+    fs_read(gitDirectory: string, file: string, callback: (err: any, data: any) => void): void;
+
+    transform_options(options: any): string[];
+
+    git(functionName: any, options: any, ...args: any[]): void; // last element is callback
+
+    call_git(prefix: string, command: any, postfix: string, options: any, args: any, callback: (error: any, result: string) => void): void;
+
+    rev_list(callback: Function): void;
+
+    rev_list(options: any, callback: Function): void;
+
+    rev_list(options: any, reference: string, callback: Function): void;
+
+    rev_parse(options: any, str: string, callback: Function): void;
+
+    rev_parse(options: any, str: string, level: number, callback: Function): void;
+
+    ls_tree(treeish: any, callback: Function): void;
+
+    ls_tree(treeish: any, paths: any[], callback: Function): void;
+
+    ls_tree(treeish: any, paths: any[], options: any, callback: Function): void;
+
+    cat_file(type: any, ref: any, callback: Function): void;
+
+    file_size(ref: any, callback: Function): void;
+
+    fs_mkdir(dir: any, callback: Function): void;
+
+    init(options: any, callback: Function): void;
+
+    // not implemented!
+    clone(options: any, originalPath: any, targetPath: any, callback: Function): void;
+
+    diff(commit1: any, commit2: any, callback: (error: any, patch: string) => void): void;
+
+    diff(commit1: any, commit2: any, options: any, callback: (error: any, patch: string) => void): void;
+
+    fs_exist(path: any, callback: Function): void;
+
+    fs_write(file: any, content: any, callback: Function): void;
+
+    log(commit: any, path: any, options: any, callback: Function): void;
+
+    select_existing_objects(objectIds: any[], callback: Function): void;
+
+    format_patch(options: any, reference: any, callback: Function): void;
+
+    blame(callback: Function): void;
+
+    blame(options: any, callback: Function): void;
+
+    blame_tree(commit: any, callback: Function): void;
+
+    blame_tree(commit: any, path: any, callback: Function): void;
+
+    looking_for(commit: any, callback: Function): void;
+
+    looking_for(commit: any, path: any, callback: Function): void;
+
+    commit(...args: any[]): void; // last element is callback
+
+    commit(options: any, ...args: any[]): void; // last element is callback
+
+    config(...args: any[]): void; // last element is callback
+
+    config(options: any, ...args: any[]): void; // last element is callback
+
+    add(...args: any[]): void; // last element is callback
+
+    add(options: any, ...args: any[]): void; // last element is callback
+
+    remove(...args: any[]): void; // last element is callback
+
+    remove(options: any, ...args: any[]): void; // last element is callback
+
+    ls_files(...args: any[]): void; // last element is callback
+
+    ls_files(options: any, ...args: any[]): void; // last element is callback
+
+    diff_files(...args: any[]): void; // last element is callback
+
+    diff_files(options: any, ...args: any[]): void; // last element is callback
+
+    diff_index(...args: any[]): void; // last element is callback
+
+    diff_index(options: any, ...args: any[]): void; // last element is callback
+
+    file_type(...args: any[]): void; // last element is callback
+
+    file_type(options: any, ...args: any[]): void; // last element is callback
+
+    put_raw_object(...args: any[]): void; // last element is callback
+
+    put_raw_object(options: any, ...args: any[]): void; // last element is callback
+
+    commit_from_sha(id: string): any;
+}
+
+// lib/git/actor.js
+export declare class Actor {
+    name: string;
+    email: string;
+
+    constructor(name: string, email: string);
+
+    static from_string(str: string): Actor;
+}
+
+// lib/git/blame.js
+export declare class Blame {
+    repo: Repo;
+    file: string;
+    commit: string;
+    lines: BlameLine[];
+
+    constructor(repo: Repo, file: string, callback: (err: any, blame: Blame) => void);
+
+    constructor(repo: Repo, file: string, commit: string, callback: (err: any, blame: Blame) => void);
+}
+
+// lib/git/blame_line.js
+export declare class BlameLine {
+    lineno: number;
+    oldlineno: number;
+    commit: any;
+    line: string;
+
+    constructor(lineno: number, oldlineno: number, commit: any, line: string);
+}
+
+// lib/git/blob.js
+export declare class Blob {
+    repo: Repo;
+    id: any;
+    mode: any;
+    name: any;
+    data: any;
+    size: any;
+    mine_type: any;
+    basename: any;
+
+    constructor(repo: any, id: any, mode: any, name: any);
+
+    static blame(repo: any, commit: any, file: any, callback: Function): void;
+}
+
+// lib/git/commit.js
+export declare class Commit {
+    repo: Repo;
+    id: string;
+    parents: any[];
+    tree: any;
+    author: Actor;
+    sha: string; // synonym to id
+    authored_date: string;
+    committer: Actor;
+    committed_date: string;
+    message: string;
+    filechanges: any;
+    short_message: string;
+    _id_abbrev: any;
+
+    constructor(repo: Repo, id: string, parents: any[], tree: any, author: Actor, authoredDate: string, committer: Actor, committedDate: string, message: string, filechanges: any);
+
+    load(callback: Function): void;
+
+    id_abbrev(callback: Function): void;
+
+    static list_from_string(repo: any, text: any): Commit[];
+
+    static find_all(repo: any, callback: Function): void;
+
+    static find_all(repo: any, reference: any, callback: Function): void;
+
+    static find_all(repo: any, reference: any, options: any, callback: Function): void;
+
+    static count(repo: any, ref: any, callback: Function): void;
+
+    static diff(repo: any, a: any, callback: Function): void;
+
+    static diff(repo: any, a: any, b: any, callback: Function): void;
+
+    static diff(repo: any, a: any, b: any, paths: any, callback: Function): void;
+
+    show(callback: Function): void;
+
+    diffs(callback: Function): void;
+
+    toPatch(callback: Function): void;
+}
+
+// lib/git/commit_stats.js
+export declare class CommitStats {
+    repo: any;
+    id: any;
+    files: any[];
+    additions: any;
+    deletions: any;
+    total: any;
+
+    constructor(repo: any, id: any, files: any[]);
+
+    static find_all(repo: any, reference: any, callback: Function): void;
+
+    static find_all(repo: any, reference: any, options: any, callback: Function): void;
+
+    static list_from_string(repo: any, text: string): CommitStats[];
+}
+
+// lib/git/config.js
+export declare class Config {
+    repo: any;
+    data: any;
+
+    constructor(repo: any);
+
+    fetch(key: any, defaultValue: any): any
+
+    set(key: any, value: any, callback: Function): void;
+}
+
+// lib/git/diff.js
+export declare class Diff {
+    repo: any;
+    a_path: any;
+    b_path: any;
+    a_blob: any;
+    b_blob: any;
+    a_mode: any;
+    b_mode: any;
+    new_file: any;
+    deleted_file: any;
+    diff: any;
+
+    constructor(repo: any, aPath: any, bPath: any, aBlob: any, bBlob: any, aMode: any, bMode: any, newFile: any, deletedFile: any, diff: any);
+
+    static list_from_string(repo: any, text: any, callback: Function): void;
+}
+
+// lib/git/file_index/js
+export declare class FileIndex {
+    repo_path: any;
+    index_file: any;
+    sha_count: any;
+    commit_index: any;
+    commit_order: any;
+    all_files: any;
+
+    constructor(repoPath: any, callback: Function);
+
+    commits_from(commitSha: any, callback: Function): void;
+
+    sort_commits(shaArray: any[]): any[];
+
+    files(commitSha: any, callback: Function): void;
+
+    count_all(callback: Function): void;
+
+    count(commitSha: any, callback: Function): void;
+
+    commits_for(file: any, callback: Function): void;
+
+    last_commits(commitSha: any, filesMatcher: any, callback: Function): void;
+}
+
+// lib/git/file_window.js
+export declare class FileWindow {
+    idxfile: any;
+    version: any;
+    global_offset: any;
+    offset: any;
+    seek_offset: any;
+
+    constructor(idxfile: any, version: any);
+
+    unmap(): void;
+
+    index(idx: number): void;
+
+    index(idx: any[]): void;
+
+    close(): void;
+}
+
+// lib/git/git_file_operations.js
+export declare class GitFileOperations {
+    static glob_streaming(path: any): any;
+
+    static glob(path: any, callback: Function): void;
+
+    static glob(path: any, files: any, callback: Function): void;
+
+    static fs_read(path: any, file: any, callback: Function): void;
+
+    static fs_mkdir(dir: any, callback: Function): void;
+
+    static fs_exist(dir: any, path: any, callback: Function): void;
+
+    static fs_rmdir_r(dir: any, callback: Function): void;
+
+    static fs_write(dir: any, file: any, content: any, callback: Function): void;
+}
+
+// lib/git/git_index.js
+export declare class GitIndex {
+    repo: any;
+    tree: any;
+    current_tree: any;
+
+    constructor(repo: any);
+
+    read_tree(tree: any, callback: Function): void;
+
+    add(filePath: any, data: any): void;
+
+    commit(message: any, callback: Function): void;
+
+    commit(message: any, parents: any, callback: Function): void;
+
+    commit(message: any, parents: any, actor: any, callback: Function): void;
+
+    commit(message: any, parents: any, actor: any, lastTree: any, callback: Function): void;
+
+    write_tree(tree: any, callback: Function): any;
+
+    write_tree(tree: any, nowTree: any, callback: Function): any;
+
+    write_blob(data: any): any;
+}
+
+// lib/git/git_object.js
+export declare class GitObject {
+    static from_raw(rawObject: any, repository: any): any;
+}
+
+// lib/git/head.js
+export declare class Head {
+    name: string;
+    commit: any; // string or Commit or ...?
+
+    constructor(name: string, commit: any);
+
+    static current(repo: any, callback: Function): void;
+
+    static current(repo: any, options: any, callback: Function): void;
+
+    static find_all(repo: any, callback: Function): void;
+
+    static find_all(repo: any, options: any, callback: Function): void;
+}
+
+// lib/git/loose_storage.js
+export declare class LooseStorage {
+    directory: any;
+
+    constructor(directory: any);
+
+    find(sha1: any): RawObject;
+
+    get_raw_object(buf: any): RawObject;
+
+    unpack_object_header_gently(buf: any): any[];
+
+    is_legacy_loose_object(buf: any): boolean;
+
+    put_raw_object(content: any, type: any, callback: Function): void;
+
+    static verify_header(type: any, size: any): void;
+}
+
+// lib/git/merge.js
+export declare class Merge {
+    static STATUS_BOTH: string;
+    static STATUS_OURS: string;
+    static STATUS_THEIRS: string;
+
+    conflicts: any;
+    text: any;
+    sections: any;
+
+    constructor(str: string);
+}
+
+// lib/git/pack_storage.js
+export declare class PackStorage {
+    name: any;
+    cache: any;
+    version: any;
+    offsets: any;
+    size: any;
+
+    constructor(file: any);
+
+    find(sha1: any): RawObject;
+
+    close(): void;
+
+    parse_object(pack: any, offset: any): RawObject;
+
+    unpack_object(pack: any, packfile: any, offset: any, options: any): any[];
+
+    unpack_deltified(packfile: any, type: any, offset: any, objOffset: any, size: any, options: any): any;
+}
+
+// lib/git/raw.js
+export declare class RawObject {
+    type: any;
+    content: any;
+
+    constructor(type: any, content: any);
+
+    sha1(encoding?: string): any;
+
+    sha1_hex(): any;
+}
+
+// lib/git/ref.js
+export declare class Ref {
+}
+
+// lib/git/remote.js
+export declare class Remote {
+    constructor(name: any, commit: any);
+
+    find_all(repo: any, callback: Function): void;
+
+    find_all(repo: any, options: any, callback: Function): void;
+}
+
+// lib/git/repo.js
+export declare class Repo {
+    path: string;
+    options: any;
+    git: any;
+    config_object: any;
+    bare: any;
+    working_directory: any;
+
+    constructor(path: string, callback: (err: any, repo: Repo) => void);
+
+    constructor(path: string, options: any, callback: (err: any, repo: Repo) => void);
+
+    head(callback: (err: any, head: Head) => void): void;
+
+    heads(callback: (err: any, heads: Head[]) => void): void;
+
+    tags(callback: Function): void;
+
+    commits(callback: Function): void;
+
+    commits(start: string, callback: Function): void;
+
+    commits(start: string, maxCount: number, callback: Function): void;
+
+    commits(start: string, maxCount: number, skip: any, callback: Function): void;
+
+    commit(id: string, callback: Function): void;
+
+    commit_count(start: any, callback: Function): void;
+
+    tree(callback: Function): void;
+
+    tree(treeish: string, callback: Function): void;
+
+    tree(treeish: string, paths: any, callback: Function): void;
+
+    blob(id: string, callback: Function): void;
+
+    init_bare(path: any, gitOptions: any, repoOptions: any, callback: Function): void;
+
+    fork_bare(path: any, callback: Function): void;
+
+    fork_bare(path: any, options: any, callback: Function): void;
+
+    // buggy?
+    diff(a: string, callback: (error: any, patch: string) => void): void;
+
+    diff(a: string, b: string, callback: (error: any, patch: string) => void): void;
+
+    diff(a: string, b: string, paths: any, callback: (error: any, patch: string) => void): void;
+
+    commit_diff(commit: string, callback: Function): void;
+
+    alternates(callback: Function): void;
+
+    set_alternates(alts: any, callback: Function): void;
+
+    log(callback: (err: any, commits: Commit[]) => void): void;
+
+    log(commit: string, callback: (err: any, commits: Commit[]) => void): void;
+
+    log(commit: string, path: any, callback: (err: any, commits: Commit[]) => void): void;
+
+    log(commit: string, path: any, options: any, callback: (err: any, commits: Commit[]) => void): void;
+
+    commit_deltas_from(otherRepo: any, callback: Function): void;
+
+    commit_deltas_from(otherRepo: any, reference: any, callback: Function): void;
+
+    commit_deltas_from(otherRepo: any, reference: any, otherReference: any, callback: Function): void;
+
+    refs(callback: Function): void;
+
+    description(callback: Function): void;
+
+    update_ref(head: any, commitSha: any, callback: Function): void;
+
+    get_head(headName: any, callback: Function): void;
+
+    blame(file: string, commit: string, callback: (err: any, blame: Blame) => void): void;
+
+    commit_stats(callback: Function): void;
+
+    commit_stats(start: any, callback: Function): void;
+
+    commit_stats(start: any, maxCount: any, callback: Function): void;
+
+    commit_stats(start: any, maxCount: any, skip: any, callback: Function): void;
+
+    commit_index(message: any, callback: Function): void;
+
+    commit_all(message: any, callback: Function): void;
+
+    config(callback: Function): void;
+
+    add(files: any, callback: Function): void;
+
+    remove(files: any, callback: Function): void;
+
+    status(callback: Function): void;
+
+    is_head(headName: any, callback: Function): void;
+
+    index(callback: Function): void;
+}
+
+// lib/git/repository.js
+export declare class Repository {
+    git_directory: any;
+    options: any;
+    already_searched: any;
+    packs: any;
+    loose: any;
+
+    constructor(gitDirectory: any, options?: any);
+
+    get_object_by_sha1(sha1: string): any;
+
+    files_changed(treeSha1: any, treeSha2: any, pathLimiter: any): boolean;
+
+    cat_file(sha: any): any;
+
+    cat_file_size(sha: any): number;
+
+    cat_file_type(sha: any): any;
+
+    ls_tree(sha: any, paths: any, recursive: any): any;
+
+    get_raw_tree(sha: any, recursive: any): any;
+
+    get_raw_trees(sha: any, path: any): string;
+
+    ls_tree_path(sha: any, path: any, append: any): any
+
+    quick_diff(tree1: any, tree2: any, path: any, recurse: any): any[];
+
+    list_tree(sha: any): any;
+
+    rev_list(sha: any, options: any, callback: Function): void;
+
+    object_exists(sha1: any, callback: Function): void;
+
+    in_packs(shaHex: any, callback: Function): void;
+
+    in_loose(shaHex: any, callback: Function): void;
+
+    get_subtree(commitSha: any, path: any, callback: Function): void;
+
+    static init(dir: any, bare: any, callback: Function): void;
+
+    put_raw_object(content: any, type: any, callback: Function): any;
+}
+
+// lib/git/status.js
+export declare class Status {
+    repo: any;
+    files: any[];
+
+    constructor(repo: any, callback: Function);
+
+    index(file: any): any;
+}
+
+// lib/git/status_file.js
+export declare class StatusFile {
+    repo: any;
+    path: any;
+    type: any;
+    stage: any;
+    mode_index: any;
+    mode_repo: any;
+    sha_index: any;
+    sha_repo: any;
+    untracked: any;
+
+    constructor(repo: any, hash: any);
+}
+
+// lib/git/sub_module.js
+export declare class Submodule {
+    repo: any;
+    id: any;
+    mode: any;
+    name: any;
+    basename: any;
+
+    constructor(repo: any, id: any, mode: any, name: any);
+
+    static create(repo: any, attributes: any, callback: Function): void;
+
+    static config(repo: any, ref: any, callback: Function): void;
+}
+
+// lib/git/tag.js
+export declare class Tag {
+    name: any;
+    commit: any;
+
+    constructor(name: any, commit: any);
+
+    static find_all(repo: any, callback: Function): void;
+
+    static find_all(repo: any, options: any, callback: Function): void;
+}
+
+// lib/git/tree.js
+export declare class Tree {
+    repo: any;
+    id: any;
+    mode: any;
+    name: any;
+    contents: any;
+    basename: any;
+
+    constructor(repo: any, id: any, mode: any, name: any, contents: any);
+
+    static content_from_string(repo: any, text: any, callback: Function): void;
+
+    find(file: string): any;
+
+    static create(repo: any, callback: Function): void;
+
+    static create(repo: any, attributes: any, callback: Function): void;
+}
+
+// lib/git/user_info.js
+export declare class UserInfo {
+    name: any;
+    email: any;
+    date: any;
+    offset: any;
+
+    constructor(str: string);
+}
diff --git a/node-git/node-git-tests.ts b/git/node-git-tests.ts
similarity index 92%
rename from node-git/node-git-tests.ts
rename to git/node-git-tests.ts
index e08a14189f..1199a8c53c 100644
--- a/node-git/node-git-tests.ts
+++ b/git/node-git-tests.ts
@@ -1,5 +1,3 @@
-///<reference path='./node-git.d.ts'/>
-
 import base = require("git");
 
 var git = new base.Git("../.git");
diff --git a/git/tsconfig.json b/git/tsconfig.json
new file mode 100644
index 0000000000..2287c5553d
--- /dev/null
+++ b/git/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-git-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/github-electron/electron-prebuilt-tests.ts b/github-electron/electron-prebuilt-tests.ts
deleted file mode 100644
index 771fd06016..0000000000
--- a/github-electron/electron-prebuilt-tests.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/// <reference path="electron-prebuilt.d.ts" />
-/// <reference path="../node/node.d.ts" />
-
-import electron = require('electron-prebuilt');
-import child_process = require('child_process');
-
-child_process.spawn(electron);
diff --git a/github-electron/github-electron.d.ts b/github-electron/github-electron.d.ts
deleted file mode 100644
index 9ae82d6988..0000000000
--- a/github-electron/github-electron.d.ts
+++ /dev/null
@@ -1,4233 +0,0 @@
-// Type definitions for Electron v0.37.4
-// Project: http://electron.atom.io/
-// Definitions by: jedmao <https://github.com/jedmao/>, rhysd <https://rhysd.github.io>, Milan Burda <https://github.com/miniak/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare namespace Electron {
-
-	class EventEmitter implements NodeJS.EventEmitter {
-		addListener(event: string, listener: Function): this;
-		on(event: string, listener: Function): this;
-		once(event: string, listener: Function): this;
-		removeListener(event: string, listener: Function): this;
-		removeAllListeners(event?: string): this;
-		setMaxListeners(n: number): this;
-		getMaxListeners(): number;
-		listeners(event: string): Function[];
-		emit(event: string, ...args: any[]): boolean;
-		listenerCount(type: string): number;
-	}
-
-	interface Event {
-		preventDefault: Function;
-		sender: EventEmitter;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/app.md
-
-	/**
-	 * The app module is responsible for controlling the application's lifecycle.
-	 */
-	interface App extends NodeJS.EventEmitter {
-		/**
-		 * Emitted when the application has finished basic startup.
-		 * On Windows and Linux, the will-finish-launching event
-		 * is the same as the ready event; on OS X, this event represents
-		 * the applicationWillFinishLaunching notification of NSApplication.
-		 * You would usually set up listeners for the open-file and open-url events here,
-		 * and start the crash reporter and auto updater.
-		 *
-		 * In most cases, you should just do everything in the ready event handler.
-		 */
-		on(event: 'will-finish-launching', listener: Function): this;
-		/**
-		 * Emitted when Electron has finished initialization.
-		 */
-		on(event: 'ready', listener: Function): this;
-		/**
-		 * Emitted when all windows have been closed.
-		 *
-		 * This event is only emitted when the application is not going to quit.
-		 * If the user pressed Cmd + Q, or the developer called app.quit(),
-		 * Electron will first try to close all the windows and then emit the will-quit event,
-		 * and in this case the window-all-closed event would not be emitted.
-		 */
-		on(event: 'window-all-closed', listener: Function): this;
-		/**
-		 * Emitted before the application starts closing its windows.
-		 * Calling event.preventDefault() will prevent the default behaviour, which is terminating the application.
-		 */
-		on(event: 'before-quit', listener: (event: Event) => void): this;
-		/**
-		 * Emitted when all windows have been closed and the application will quit.
-		 * Calling event.preventDefault() will prevent the default behaviour, which is terminating the application.
-		 */
-		on(event: 'will-quit', listener: (event: Event) => void): this;
-		/**
-		 * Emitted when the application is quitting.
-		 */
-		on(event: 'quit', listener: (event: Event, exitCode: number) => void): this;
-		/**
-		 * Emitted when the user wants to open a file with the application.
-		 * The open-file event is usually emitted when the application is already open
-		 * and the OS wants to reuse the application to open the file.
-		 * open-file is also emitted when a file is dropped onto the dock and the application
-		 * is not yet running. Make sure to listen for the open-file event very early
-		 * in your application startup to handle this case (even before the ready event is emitted).
-		 *
-		 * You should call event.preventDefault() if you want to handle this event.
-		 *
-		 * Note: This is only implemented on OS X.
-		 */
-		on(event: 'open-file', listener: (event: Event, url: string) => void): this;
-		/**
-		 * Emitted when the user wants to open a URL with the application.
-		 * The URL scheme must be registered to be opened by your application.
-		 *
-		 * You should call event.preventDefault() if you want to handle this event.
-		 *
-		 * Note: This is only implemented on OS X.
-		 */
-		on(event: 'open-url', listener: (event: Event, url: string) => void): this;
-		/**
-		 * Emitted when the application is activated, which usually happens when clicks on the applications’s dock icon.
-		 * Note: This is only implemented on OS X.
-		 */
-		on(event: 'activate', listener: Function): this;
-		/**
-		 * Emitted when a browserWindow gets blurred.
-		 */
-		on(event: 'browser-window-blur', listener: (event: Event, browserWindow: BrowserWindow) => void): this;
-		/**
-		 * Emitted when a browserWindow gets focused.
-		 */
-		on(event: 'browser-window-focus', listener: (event: Event, browserWindow: BrowserWindow) => void): this;
-		/**
-		 * Emitted when a new browserWindow is created.
-		 */
-		on(event: 'browser-window-created', listener: (event: Event, browserWindow: BrowserWindow) => void): this;
-		/**
-		 * Emitted when failed to verify the certificate for url, to trust the certificate
-		 * you should prevent the default behavior with event.preventDefault() and call callback(true).
-		 */
-		on(event: 'certificate-error', listener: (event: Event,
-			webContents: WebContents,
-			url: string,
-			error: string,
-			certificate: Certificate,
-			callback: (trust: boolean) => void
-		) => void): this;
-		/**
-		 * Emitted when a client certificate is requested.
-		 *
-		 * The url corresponds to the navigation entry requesting the client certificate
-		 * and callback needs to be called with an entry filtered from the list.
-		 * Using event.preventDefault() prevents the application from using the first certificate from the store.
-		 */
-		on(event: 'select-client-certificate', listener: (event: Event,
-			webContents: WebContents,
-			url: string,
-			certificateList: Certificate[],
-			callback: (certificate: Certificate) => void
-		) => void): this;
-		/**
-		 * Emitted when webContents wants to do basic auth.
-		 *
-		 * The default behavior is to cancel all authentications, to override this
-		 * you should prevent the default behavior with event.preventDefault()
-		 * and call callback(username, password) with the credentials.
-		 */
-		on(event: 'login', listener: (event: Event,
-			webContents: WebContents,
-			request: LoginRequest,
-			authInfo: LoginAuthInfo,
-			callback: (username: string, password: string) => void
-		) => void): this;
-		/**
-		 * Emitted when the gpu process crashes.
-		 */
-		on(event: 'gpu-process-crashed', listener: Function): this;
-		/**
-		 * Emitted when the system’s Dark Mode theme is toggled.
-		 * Note: This is only implemented on OS X.
-		 */
-		on(event: 'platform-theme-changed', listener: Function): this;
-		on(event: string, listener: Function): this;
-		/**
-		 * Try to close all windows. The before-quit event will first be emitted.
-		 * If all windows are successfully closed, the will-quit event will be emitted
-		 * and by default the application would be terminated.
-		 *
-		 * This method guarantees all beforeunload and unload handlers are correctly
-		 * executed. It is possible that a window cancels the quitting by returning
-		 * false in beforeunload handler.
-		 */
-		quit(): void;
-		/**
-		 * Exits immediately with exitCode.
-		 * All windows will be closed immediately without asking user
-		 * and the before-quit and will-quit events will not be emitted.
-		 */
-		exit(exitCode: number): void;
-		/**
-		 * On Linux, focuses on the first visible window.
-		 * On OS X, makes the application the active app.
-		 * On Windows, focuses on the application’s first window.
-		 */
-		focus(): void;
-		/**
-		 * Hides all application windows without minimizing them.
-		 * Note: This is only implemented on OS X.
-		 */
-		hide(): void;
-		/**
-		 * Shows application windows after they were hidden. Does not automatically focus them.
-		 * Note: This is only implemented on OS X.
-		 */
-		show(): void;
-		/**
-		 * Returns the current application directory.
-		 */
-		getAppPath(): string;
-		/**
-		 * @returns The path to a special directory or file associated with name.
-		 * On failure an Error would throw.
-		 */
-		getPath(name: AppPathName): string;
-		/**
-		 * Overrides the path to a special directory or file associated with name.
-		 * If the path specifies a directory that does not exist, the directory will
-		 * be created by this method. On failure an Error would throw.
-		 *
-		 * You can only override paths of names defined in app.getPath.
-		 *
-		 * By default web pages' cookies and caches will be stored under userData
-		 * directory, if you want to change this location, you have to override the
-		 * userData path before the ready event of app module gets emitted.
-		 */
-		setPath(name: AppPathName, path: string): void;
-		/**
-		 * @returns The version of loaded application, if no version is found in
-		 * application's package.json, the version of current bundle or executable.
-		 */
-		getVersion(): string;
-		/**
-		 * @returns The current application's name, the name in package.json would be used.
-		 * Usually the name field of package.json is a short lowercased name, according to
-		 * the spec of npm modules. So usually you should also specify a productName field,
-		 * which is your application's full capitalized name, and it will be preferred over
-		 * name by Electron.
-		 */
-		getName(): string;
-		/**
-		 * Overrides the current application's name.
-		 */
-		setName(name: string): void;
-		/**
-		  * @returns The current application locale.
-		  */
-		getLocale(): string;
-		/**
-		 * Adds path to recent documents list.
-		 *
-		 * This list is managed by the system, on Windows you can visit the list from
-		 * task bar, and on Mac you can visit it from dock menu.
-		 *
-		 * Note: This is only implemented on OS X and Windows.
-		 */
-		addRecentDocument(path: string): void;
-		/**
-		 * Clears the recent documents list.
-		 *
-		 * Note: This is only implemented on OS X and Windows.
-		 */
-		clearRecentDocuments(): void;
-		/**
-		 * Sets the current executable as the default handler for a protocol (aka URI scheme).
-		 * Once registered, all links with your-protocol:// will be openend with the current executable.
-		 * The whole link, including protocol, will be passed to your application as a parameter.
-		 *
-		 * Note: This is only implemented on OS X and Windows.
-		 *       On OS X, you can only register protocols that have been added to your app's info.plist.
-		 */
-		setAsDefaultProtocolClient(protocol: string): void;
-		/**
-		 * Removes the current executable as the default handler for a protocol (aka URI scheme).
-		 *
-		 * Note: This API is only available on Windows.
-		 *       On OS X, removing the app will automatically remove the app as the default protocol handler.
-		 */
-		removeAsDefaultProtocolClient(protocol: string): void;
-		/**
-		 * Adds tasks to the Tasks category of JumpList on Windows.
-		 *
-		 * Note: This API is only available on Windows.
-		 */
-		setUserTasks(tasks: Task[]): void;
-		/**
-		 * Dynamically sets whether to always send credentials for HTTP NTLM or Negotiate authentication.
-		 * Normally, Electron will only send NTLM/Kerberos credentials for URLs that fall under
-		 * "Local Intranet" sites (i.e. are in the same domain as you).
-		 * However, this detection often fails when corporate networks are badly configured,
-		 * so this lets you co-opt this behavior and enable it for all URLs.
-		 */
-		allowNTLMCredentialsForAllDomains(allow: boolean): void;
-		/**
-		 * This method makes your application a Single Instance Application instead of allowing
-		 * multiple instances of your app to run, this will ensure that only a single instance
-		 * of your app is running, and other instances signal this instance and exit.
-		 */
-		makeSingleInstance(callback: (args: string[], workingDirectory: string) => boolean): boolean;
-		/**
-		 * Changes the Application User Model ID to id.
-		 */
-		setAppUserModelId(id: string): void;
-		/**
-		 * This method returns true if DWM composition (Aero Glass) is enabled,
-		 * and false otherwise. You can use it to determine if you should create
-		 * a transparent window or not (transparent windows won’t work correctly when DWM composition is disabled).
-		 *
-		 * Note: This is only implemented on Windows.
-		 */
-		isAeroGlassEnabled(): boolean;
-		/**
-		 * @returns If the system is in Dark Mode.
-		 * Note: This is only implemented on OS X.
-		 */
-		isDarkMode(): boolean;
-		commandLine: CommandLine;
-		/**
-		 * Note: This API is only available on Mac.
-		 */
-		dock: Dock;
-	}
-
-	type AppPathName = 'home'|'appData'|'userData'|'temp'|'exe'|'module'|'desktop'|'documents'|'downloads'|'music'|'pictures'|'videos';
-
-	interface CommandLine {
-		/**
-		 * Append a switch [with optional value] to Chromium's command line.
-		 *
-		 * Note: This will not affect process.argv, and is mainly used by developers
-		 * to control some low-level Chromium behaviors.
-		 */
-		appendSwitch(_switch: string, value?: string|number): void;
-		/**
-		 * Append an argument to Chromium's command line. The argument will quoted properly.
-		 *
-		 * Note: This will not affect process.argv.
-		 */
-		appendArgument(value: any): void;
-	}
-
-	interface Dock {
-		/**
-		 * When critical is passed, the dock icon will bounce until either the
-		 * application becomes active or the request is canceled.
-		 *
-		 * When informational is passed, the dock icon will bounce for one second.
-		 * However, the request remains active until either the application becomes
-		 * active or the request is canceled.
-		 *
-		 * @param type The default is informational.
-		 * @returns An ID representing the request.
-		 */
-		bounce(type?: 'critical' | 'informational'): number;
-		/**
-		 * Cancel the bounce of id.
-		 *
-		 * Note: This API is only available on Mac.
-		 */
-		cancelBounce(id: number): void;
-		/**
-		 * Sets the string to be displayed in the dock’s badging area.
-		 *
-		 * Note: This API is only available on Mac.
-		 */
-		setBadge(text: string): void;
-		/**
-		 * Returns the badge string of the dock.
-		 *
-		 * Note: This API is only available on Mac.
-		 */
-		getBadge(): string;
-		/**
-		 * Hides the dock icon.
-		 *
-		 * Note: This API is only available on Mac.
-		 */
-		hide(): void;
-		/**
-		 * Shows the dock icon.
-		 *
-		 * Note: This API is only available on Mac.
-		 */
-		show(): void;
-		/**
-		 * Sets the application dock menu.
-		 *
-		 * Note: This API is only available on Mac.
-		 */
-		setMenu(menu: Menu): void;
-		/**
-		 * Sets the image associated with this dock icon.
-		 *
-		 * Note: This API is only available on Mac.
-		 */
-		setIcon(icon: NativeImage | string): void;
-	}
-
-	interface Task {
-		/**
-		 * Path of the program to execute, usually you should specify process.execPath
-		 * which opens current program.
-		 */
-		program: string;
-		/**
-		 * The arguments of command line when program is executed.
-		 */
-		arguments: string;
-		/**
-		 * The string to be displayed in a JumpList.
-		 */
-		title: string;
-		/**
-		 * Description of this task.
-		 */
-		description?: string;
-		/**
-		 * The absolute path to an icon to be displayed in a JumpList, it can be
-		 * arbitrary resource file that contains an icon, usually you can specify
-		 * process.execPath to show the icon of the program.
-		 */
-		iconPath: string;
-		/**
-		 * The icon index in the icon file. If an icon file consists of two or more
-		 * icons, set this value to identify the icon. If an icon file consists of
-		 * one icon, this value is 0.
-		 */
-		iconIndex?: number;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/auto-updater.md
-
-	/**
-	 * This module provides an interface for the Squirrel auto-updater framework.
-	 */
-	interface AutoUpdater extends NodeJS.EventEmitter {
-		/**
-		 * Emitted when there is an error while updating.
-		 */
-		on(event: 'error', listener: (error: Error) => void): this;
-		/**
-		 * Emitted when checking if an update has started.
-		 */
-		on(event: 'checking-for-update', listener: Function): this;
-		/**
-		 * Emitted when there is an available update. The update is downloaded automatically.
-		 */
-		on(event: 'update-available', listener: Function): this;
-		/**
-		 * Emitted when there is no available update.
-		 */
-		on(event: 'update-not-available', listener: Function): this;
-		/**
-		 * Emitted when an update has been downloaded.
-		 * Note: On Windows only releaseName is available.
-		 */
-		on(event: 'update-downloaded', listener: (event: Event, releaseNotes: string, releaseName: string, releaseDate: Date, updateURL: string) => void): this;
-		on(event: string, listener: Function): this;
-		/**
-		 * Set the url and initialize the auto updater.
-		 * The url cannot be changed once it is set.
-		 */
-		setFeedURL(url: string): void;
-		/**
-		 * Ask the server whether there is an update, you have to call setFeedURL
-		 * before using this API
-		 */
-		checkForUpdates(): any;
-		/**
-		 * Restarts the app and installs the update after it has been downloaded.
-		 * It should only be called after update-downloaded has been emitted.
-		 */
-		quitAndInstall(): void;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/browser-window.md
-
-	/**
-	 * The BrowserWindow class gives you ability to create a browser window.
-	 * You can also create a window without chrome by using Frameless Window API.
-	 */
-	class BrowserWindow extends EventEmitter {
-		/**
-		 * Emitted when the document changed its title,
-		 * calling event.preventDefault() would prevent the native window’s title to change.
-		 */
-		on(event: 'page-title-updated', listener: (event: Event) => void): this;
-		/**
-		 * Emitted when the window is going to be closed. It’s emitted before the beforeunload
-		 * and unload event of the DOM. Calling event.preventDefault() will cancel the close.
-		 */
-		on(event: 'close', listener: (event: Event) => void): this;
-		/**
-		 * Emitted when the window is closed. After you have received this event
-		 * you should remove the reference to the window and avoid using it anymore.
-		 */
-		on(event: 'closed', listener: Function): this;
-		/**
-		 * Emitted when the web page becomes unresponsive.
-		 */
-		on(event: 'unresponsive', listener: Function): this;
-		/**
-		 * Emitted when the unresponsive web page becomes responsive again.
-		 */
-		on(event: 'responsive', listener: Function): this;
-		/**
-		 * Emitted when the window loses focus.
-		 */
-		on(event: 'blur', listener: Function): this;
-		/**
-		 * Emitted when the window gains focus.
-		 */
-		on(event: 'focus', listener: Function): this;
-		/**
-		 * Emitted when the window is shown.
-		 */
-		on(event: 'show', listener: Function): this;
-		/**
-		 * Emitted when the window is hidden.
-		 */
-		on(event: 'hide', listener: Function): this;
-		/**
-		 * Emitted when window is maximized.
-		 */
-		on(event: 'maximize', listener: Function): this;
-		/**
-		 * Emitted when the window exits from maximized state.
-		 */
-		on(event: 'unmaximize', listener: Function): this;
-		/**
-		 * Emitted when the window is minimized.
-		 */
-		on(event: 'minimize', listener: Function): this;
-		/**
-		 * Emitted when the window is restored from minimized state.
-		 */
-		on(event: 'restore', listener: Function): this;
-		/**
-		 * Emitted when the window is getting resized.
-		 */
-		on(event: 'resize', listener: Function): this;
-		/**
-		 * Emitted when the window is getting moved to a new position.
-		 */
-		on(event: 'move', listener: Function): this;
-		/**
-		 * Emitted when the window enters full screen state.
-		 */
-		on(event: 'enter-full-screen', listener: Function): this;
-		/**
-		 * Emitted when the window leaves full screen state.
-		 */
-		on(event: 'leave-full-screen', listener: Function): this;
-		/**
-		 * Emitted when the window enters full screen state triggered by HTML API.
-		 */
-		on(event: 'enter-html-full-screen', listener: Function): this;
-		/**
-		 * Emitted when the window leaves full screen state triggered by HTML API.
-		 */
-		on(event: 'leave-html-full-screen', listener: Function): this;
-		/**
-		 * Emitted when an App Command is invoked. These are typically related
-		 * to keyboard media keys or browser commands, as well as the "Back" /
-		 * "Forward" buttons built into some mice on Windows.
-		 * Note: This is only implemented on Windows.
-		 */
-		on(event: 'app-command', listener: (event: Event, command: string) => void): this;
-		/**
-		 * Emitted when scroll wheel event phase has begun.
-		 * Note: This is only implemented on OS X.
-		 */
-		on(event: 'scroll-touch-begin', listener: Function): this;
-		/**
-		 * Emitted when scroll wheel event phase has ended.
-		 * Note: This is only implemented on OS X.
-		 */
-		on(event: 'scroll-touch-end', listener: Function): this;
-		/**
-		 * Emitted on 3-finger swipe.
-		 * Note: This is only implemented on OS X.
-		 */
-		on(event: 'swipe', listener: (event: Event, direction: SwipeDirection) => void): this;
-		on(event: string, listener: Function): this;
-		constructor(options?: BrowserWindowOptions);
-		/**
-		 * @returns All opened browser windows.
-		 */
-		static getAllWindows(): BrowserWindow[];
-		/**
-		 * @returns The window that is focused in this application.
-		 */
-		static getFocusedWindow(): BrowserWindow;
-		/**
-		 * Find a window according to the webContents it owns.
-		 */
-		static fromWebContents(webContents: WebContents): BrowserWindow;
-		/**
-		 * Find a window according to its ID.
-		 */
-		static fromId(id: number): BrowserWindow;
-		/**
-		 * Adds devtools extension located at path. The extension will be remembered
-		 * so you only need to call this API once, this API is not for programming use.
-		 * @returns The extension's name.
-		 */
-		static addDevToolsExtension(path: string): string;
-		/**
-		 * Remove a devtools extension.
-		 * @param name The name of the devtools extension to remove.
-		 */
-		static removeDevToolsExtension(name: string): void;
-		/**
-		 * The WebContents object this window owns, all web page related events and
-		 * operations would be done via it.
-		 * Note: Users should never store this object because it may become null when
-		 * the renderer process (web page) has crashed.
-		 */
-		webContents: WebContents;
-		/**
-		 * Get the unique ID of this window.
-		 */
-		id: number;
-		/**
-		 * Force closing the window, the unload and beforeunload event won't be emitted
-		 * for the web page, and close event would also not be emitted for this window,
-		 * but it would guarantee the closed event to be emitted.
-		 * You should only use this method when the renderer process (web page) has crashed.
-		 */
-		destroy(): void;
-		/**
-		 * Try to close the window, this has the same effect with user manually clicking
-		 * the close button of the window. The web page may cancel the close though,
-		 * see the close event.
-		 */
-		close(): void;
-		/**
-		 * Focus on the window.
-		 */
-		focus(): void;
-		/**
-		 * Remove focus on the window.
-		 */
-		blur(): void;
-		/**
-		 * @returns Whether the window is focused.
-		 */
-		isFocused(): boolean;
-		/**
-		 * Shows and gives focus to the window.
-		 */
-		show(): void;
-		/**
-		 * Shows the window but doesn't focus on it.
-		 */
-		showInactive(): void;
-		/**
-		 * Hides the window.
-		 */
-		hide(): void;
-		/**
-		 * @returns Whether the window is visible to the user.
-		 */
-		isVisible(): boolean;
-		/**
-		 * Maximizes the window.
-		 */
-		maximize(): void;
-		/**
-		 * Unmaximizes the window.
-		 */
-		unmaximize(): void;
-		/**
-		 * @returns Whether the window is maximized.
-		 */
-		isMaximized(): boolean;
-		/**
-		 * Minimizes the window. On some platforms the minimized window will be
-		 * shown in the Dock.
-		 */
-		minimize(): void;
-		/**
-		 * Restores the window from minimized state to its previous state.
-		 */
-		restore(): void;
-		/**
-		 * @returns Whether the window is minimized.
-		 */
-		isMinimized(): boolean;
-		/**
-		 * Sets whether the window should be in fullscreen mode.
-		 */
-		setFullScreen(flag: boolean): void;
-		/**
-		 * @returns Whether the window is in fullscreen mode.
-		 */
-		isFullScreen(): boolean;
-		/**
-		 * This will have a window maintain an aspect ratio.
-		 * The extra size allows a developer to have space, specified in pixels,
-		 * not included within the aspect ratio calculations.
-		 * This API already takes into account the difference between a window’s size and its content size.
-		 *
-		 * Note: This API is available only on OS X.
-		 */
-		setAspectRatio(aspectRatio: number, extraSize?: Dimension): void;
-		/**
-		 * Resizes and moves the window to width, height, x, y.
-		 */
-		setBounds(options: Rectangle, animate?: boolean): void;
-		/**
-		 * @returns The window's width, height, x and y values.
-		 */
-		getBounds(): Rectangle;
-		/**
-		 * Resizes the window to width and height.
-		 */
-		setSize(width: number, height: number, animate?: boolean): void;
-		/**
-		 * @returns The window's width and height.
-		 */
-		getSize(): number[];
-		/**
-		 * Resizes the window's client area (e.g. the web page) to width and height.
-		 */
-		setContentSize(width: number, height: number, animate?: boolean): void;
-		/**
-		 * @returns The window's client area's width and height.
-		 */
-		getContentSize(): number[];
-		/**
-		 * Sets the minimum size of window to width and height.
-		 */
-		setMinimumSize(width: number, height: number): void;
-		/**
-		 * @returns The window's minimum width and height.
-		 */
-		getMinimumSize(): number[];
-		/**
-		 * Sets the maximum size of window to width and height.
-		 */
-		setMaximumSize(width: number, height: number): void;
-		/**
-		 * @returns The window's maximum width and height.
-		 */
-		getMaximumSize(): number[];
-		/**
-		 * Sets whether the window can be manually resized by user.
-		 */
-		setResizable(resizable: boolean): void;
-		/**
-		 * @returns Whether the window can be manually resized by user.
-		 */
-		isResizable(): boolean;
-		/**
-		 * Sets whether the window can be moved by user. On Linux does nothing.
-		 * Note: This API is available only on OS X and Windows.
-		 */
-		setMovable(movable: boolean): void;
-		/**
-		 * Note: This API is available only on OS X and Windows.
-		 * @returns Whether the window can be moved by user. On Linux always returns true.
-		 */
-		isMovable(): boolean;
-		/**
-		 * Sets whether the window can be manually minimized by user. On Linux does nothing.
-		 * Note: This API is available only on OS X and Windows.
-		 */
-		setMinimizable(minimizable: boolean): void;
-		/**
-		 * Note: This API is available only on OS X and Windows.
-		 * @returns Whether the window can be manually minimized by user. On Linux always returns true.
-		 */
-		isMinimizable(): boolean;
-		/**
-		 * Sets whether the window can be manually maximized by user. On Linux does nothing.
-		 * Note: This API is available only on OS X and Windows.
-		 */
-		setMaximizable(maximizable: boolean): void;
-		/**
-		 * Note: This API is available only on OS X and Windows.
-		 * @returns Whether the window can be manually maximized by user. On Linux always returns true.
-		 */
-		isMaximizable(): boolean;
-		/**
-		 * Sets whether the maximize/zoom window button toggles fullscreen mode or maximizes the window.
-		 */
-		setFullScreenable(fullscreenable: boolean): void;
-		/**
-		 * @returns Whether the maximize/zoom window button toggles fullscreen mode or maximizes the window.
-		 */
-		isFullScreenable(): boolean;
-		/**
-		 * Sets whether the window can be manually closed by user. On Linux does nothing.
-		 * Note: This API is available only on OS X and Windows.
-		 */
-		setClosable(closable: boolean): void;
-		/**
-		 * Note: This API is available only on OS X and Windows.
-		 * @returns Whether the window can be manually closed by user. On Linux always returns true.
-		 */
-		isClosable(): boolean;
-		/**
-		 * Sets whether the window should show always on top of other windows. After
-		 * setting this, the window is still a normal window, not a toolbox window
-		 * which can not be focused on.
-		 */
-		setAlwaysOnTop(flag: boolean): void;
-		/**
-		 * @returns Whether the window is always on top of other windows.
-		 */
-		isAlwaysOnTop(): boolean;
-		/**
-		 * Moves window to the center of the screen.
-		 */
-		center(): void;
-		/**
-		 * Moves window to x and y.
-		 */
-		setPosition(x: number, y: number, animate?: boolean): void;
-		/**
-		 * @returns The window's current position.
-		 */
-		getPosition(): number[];
-		/**
-		 * Changes the title of native window to title.
-		 */
-		setTitle(title: string): void;
-		/**
-		 * Note: The title of web page can be different from the title of the native window.
-		 * @returns The title of the native window.
-		 */
-		getTitle(): string;
-		/**
-		 * Starts or stops flashing the window to attract user's attention.
-		 */
-		flashFrame(flag: boolean): void;
-		/**
-		 * Makes the window do not show in Taskbar.
-		 */
-		setSkipTaskbar(skip: boolean): void;
-		/**
-		 * Enters or leaves the kiosk mode.
-		 */
-		setKiosk(flag: boolean): void;
-		/**
-		 * @returns Whether the window is in kiosk mode.
-		 */
-		isKiosk(): boolean;
-		/**
-		 * The native type of the handle is HWND on Windows, NSView* on OS X,
-		 * and Window (unsigned long) on Linux.
-		 * @returns The platform-specific handle of the window as Buffer.
-		 */
-		getNativeWindowHandle(): Buffer;
-		/**
-		 * Hooks a windows message. The callback is called when the message is received in the WndProc.
-		 * Note: This API is available only on Windows.
-		 */
-		hookWindowMessage(message: number, callback: Function): void;
-		/**
-		 * @returns Whether the message is hooked.
-		 */
-		isWindowMessageHooked(message: number): boolean;
-		/**
-		 * Unhook the window message.
-		 */
-		unhookWindowMessage(message: number): void;
-		/**
-		 * Unhooks all of the window messages.
-		 */
-		unhookAllWindowMessages(): void;
-		/**
-		 * Sets the pathname of the file the window represents, and the icon of the
-		 * file will show in window's title bar.
-		 * Note: This API is available only on OS X.
-		 */
-		setRepresentedFilename(filename: string): void;
-		/**
-		 * Note: This API is available only on OS X.
-		 * @returns The pathname of the file the window represents.
-		 */
-		getRepresentedFilename(): string;
-		/**
-		 * Specifies whether the window’s document has been edited, and the icon in
-		 * title bar will become grey when set to true.
-		 * Note: This API is available only on OS X.
-		 */
-		setDocumentEdited(edited: boolean): void;
-		/**
-		 * Note: This API is available only on OS X.
-		 * @returns Whether the window's document has been edited.
-		 */
-		isDocumentEdited(): boolean;
-		focusOnWebView(): void;
-		blurWebView(): void;
-		/**
-		 * Captures the snapshot of page within rect, upon completion the callback
-		 * will be called. Omitting the rect would capture the whole visible page.
-		 * Note: Be sure to read documents on remote buffer in remote if you are going
-		 * to use this API in renderer process.
-		 * @param callback Supplies the image that stores data of the snapshot.
-		 */
-		capturePage(rect: Rectangle, callback: (image: NativeImage) => void): void;
-		capturePage(callback: (image: NativeImage) => void): void;
-		/**
-		 * Same with webContents.print([options])
-		 */
-		print(options?: PrintOptions): void;
-		/**
-		 * Same with webContents.printToPDF([options])
-		 */
-		printToPDF(options: PrintToPDFOptions, callback: (error: Error, data: Buffer) => void): void;
-		/**
-		 * Same with webContents.loadURL(url).
-		 */
-		loadURL(url: string, options?: LoadURLOptions): void;
-		/**
-		 * Same with webContents.reload.
-		 */
-		reload(): void;
-		/**
-		 * Sets the menu as the window top menu.
-		 * Note: This API is not available on OS X.
-		 */
-		setMenu(menu: Menu): void;
-		/**
-		 * Sets the progress value in the progress bar.
-		 * On Linux platform, only supports Unity desktop environment, you need to
-		 * specify the *.desktop file name to desktopName field in package.json.
-		 * By default, it will assume app.getName().desktop.
-		 * @param progress Valid range is [0, 1.0]. If < 0, the progress bar is removed.
-		 * If greater than 0, it becomes indeterminate.
-		 */
-		setProgressBar(progress: number): void;
-		/**
-		 * Sets a 16px overlay onto the current Taskbar icon, usually used to convey
-		 * some sort of application status or to passively notify the user.
-		 * Note: This API is only available on Windows 7 or above.
-		 * @param overlay The icon to display on the bottom right corner of the Taskbar
-		 * icon. If this parameter is null, the overlay is cleared
-		 * @param description Provided to Accessibility screen readers.
-		 */
-		setOverlayIcon(overlay: NativeImage, description: string): void;
-		/**
-		 * Sets whether the window should have a shadow. On Windows and Linux does nothing.
-		 * Note: This API is available only on OS X.
-		 */
-		setHasShadow(hasShadow: boolean): void;
-		/**
-		 * Note: This API is available only on OS X.
-		 * @returns whether the window has a shadow. On Windows and Linux always returns true.
-		 */
-		hasShadow(): boolean;
-		/**
-		 * Add a thumbnail toolbar with a specified set of buttons to the thumbnail image
-		 * of a window in a taskbar button layout.
-		 * @returns Whether the thumbnail has been added successfully.
-		 */
-		setThumbarButtons(buttons: ThumbarButton[]): boolean;
-		/**
-		 * Shows pop-up dictionary that searches the selected word on the page.
-		 * Note: This API is available only on OS X.
-		 */
-		showDefinitionForSelection(): void;
-		/**
-		 * Sets whether the window menu bar should hide itself automatically. Once set
-		 * the menu bar will only show when users press the single Alt key.
-		 * If the menu bar is already visible, calling setAutoHideMenuBar(true) won't
-		 * hide it immediately.
-		 */
-		setAutoHideMenuBar(hide: boolean): void;
-		/**
-		 * @returns Whether menu bar automatically hides itself.
-		 */
-		isMenuBarAutoHide(): boolean;
-		/**
-		 * Sets whether the menu bar should be visible. If the menu bar is auto-hide,
-		 * users can still bring up the menu bar by pressing the single Alt key.
-		 */
-		setMenuBarVisibility(visibile: boolean): void;
-		/**
-		 * @returns Whether the menu bar is visible.
-		 */
-		isMenuBarVisible(): boolean;
-		/**
-		 * Sets whether the window should be visible on all workspaces.
-		 * Note: This API does nothing on Windows.
-		 */
-		setVisibleOnAllWorkspaces(visible: boolean): void;
-		/**
-		 * Note: This API always returns false on Windows.
-		 * @returns Whether the window is visible on all workspaces.
-		 */
-		isVisibleOnAllWorkspaces(): boolean;
-		/**
-		 * Ignore all moused events that happened in the window.
-		 * Note: This API is available only on OS X.
-		 */
-		setIgnoreMouseEvents(ignore: boolean): void;
-	}
-
-	type SwipeDirection = 'up' | 'right' | 'down' | 'left';
-
-	type ThumbarButtonFlags = 'enabled' | 'disabled' | 'dismissonclick' | 'nobackground' | 'hidden' | 'noninteractive';
-
-	interface ThumbarButton {
-		icon: NativeImage | string;
-		click: Function;
-		tooltip?: string;
-		flags?: ThumbarButtonFlags[];
-	}
-
-	interface WebPreferences {
-		/**
-		 * Whether node integration is enabled.
-		 * Default: true.
-		 */
-		nodeIntegration?: boolean;
-		/**
-		 * Specifies a script that will be loaded before other scripts run in the page.
-		 * This script will always have access to node APIs no matter whether node integration is turned on or off.
-		 * The value should be the absolute file path to the script.
-		 * When node integration is turned off, the preload script can reintroduce
-		 * Node global symbols back to the global scope.
-		 */
-		preload?: string;
-		/**
-		 * Sets the session used by the page. Instead of passing the Session object directly,
-		 * you can also choose to use the partition option instead, which accepts a partition string.
-		 * When both session and partition are provided, session would be preferred.
-		 * Default: the default session.
-		 */
-		session?: Session;
-		/**
-		 * Sets the session used by the page according to the session’s partition string.
-		 * If partition starts with persist:, the page will use a persistent session available
-		 * to all pages in the app with the same partition. if there is no persist: prefix,
-		 * the page will use an in-memory session. By assigning the same partition,
-		 * multiple pages can share the same session.
-		 * Default: the default session.
-		 */
-		partition?: string;
-		/**
-		 * The default zoom factor of the page, 3.0 represents 300%.
-		 * Default: 1.0.
-		 */
-		zoomFactor?: number;
-		/**
-		 * Enables JavaScript support.
-		 * Default: true.
-		 */
-		javascript?: boolean;
-		/**
-		 * When setting false, it will disable the same-origin policy (Usually using testing
-		 * websites by people), and set allowDisplayingInsecureContent and allowRunningInsecureContent
-		 * to true if these two options are not set by user.
-		 * Default: true.
-		 */
-		webSecurity?: boolean;
-		/**
-		 * Allow an https page to display content like images from http URLs.
-		 * Default: false.
-		 */
-		allowDisplayingInsecureContent?: boolean;
-		/**
-		 * Allow a https page to run JavaScript, CSS or plugins from http URLs.
-		 * Default: false.
-		 */
-		allowRunningInsecureContent?: boolean;
-		/**
-		 * Enables image support.
-		 * Default: true.
-		 */
-		images?: boolean;
-		/**
-		 * Make TextArea elements resizable.
-		 * Default: true.
-		 */
-		textAreasAreResizable?: boolean;
-		/**
-		 * Enables WebGL support.
-		 * Default: true.
-		 */
-		webgl?: boolean;
-		/**
-		 * Enables WebAudio support.
-		 * Default: true.
-		 */
-		webaudio?: boolean;
-		/**
-		 * Whether plugins should be enabled.
-		 * Default: false.
-		 */
-		plugins?: boolean;
-		/**
-		 * Enables Chromium’s experimental features.
-		 * Default: false.
-		 */
-		experimentalFeatures?: boolean;
-		/**
-		 * Enables Chromium’s experimental canvas features.
-		 * Default: false.
-		 */
-		experimentalCanvasFeatures?: boolean;
-		/**
-		 * Enables DirectWrite font rendering system on Windows.
-		 * Default: true.
-		 */
-		directWrite?: boolean;
-		/**
-		 * A list of feature strings separated by ",".
-		 */
-		blinkFeatures?: string;
-		/**
-		 * Sets the default font for the font-family.
-		 */
-		defaultFontFamily?: {
-			/**
-			 * Default: Times New Roman.
-			 */
-			standard?: string;
-			/**
-			 * Default: Times New Roman.
-			 */
-			serif?: string;
-			/**
-			 * Default: Arial.
-			 */
-			sansSerif?: string;
-			/**
-			 * Default: Courier New.
-			 */
-			monospace?: string;
-		};
-		/**
-		 * Default: 16.
-		 */
-		defaultFontSize?: number;
-		/**
-		 * Default: 13.
-		 */
-		defaultMonospaceFontSize?: number;
-		/**
-		 * Default: 0.
-		 */
-		minimumFontSize?: number;
-		/**
-		 * Default: ISO-8859-1.
-		 */
-		defaultEncoding?: string;
-	}
-
-	interface BrowserWindowOptions extends Rectangle {
-		/**
-		 * Window’s width in pixels.
-		 * Default: 800.
-		 */
-		width?: number;
-		/**
-		 * Window’s height in pixels.
-		 * Default: 600.
-		 */
-		height?: number;
-		/**
-		 * Window’s left offset from screen.
-		 * Default: center the window.
-		 */
-		x?: number;
-		/**
-		 * Window’s top offset from screen.
-		 * Default: center the window.
-		 */
-		y?: number;
-		/**
-		 * The width and height would be used as web page’s size, which means
-		 * the actual window’s size will include window frame’s size and be slightly larger.
-		 * Default: false.
-		 */
-		useContentSize?: boolean;
-		/**
-		 * Show window in the center of the screen.
-		 * Default: true
-		 */
-		center?: boolean;
-		/**
-		 * Window’s minimum width.
-		 * Default: 0.
-		 */
-		minWidth?: number;
-		/**
-		 * Window’s minimum height.
-		 * Default: 0.
-		 */
-		minHeight?: number;
-		/**
-		 * Window’s maximum width.
-		 * Default: no limit.
-		 */
-		maxWidth?: number;
-		/**
-		 * Window’s maximum height.
-		 * Default: no limit.
-		 */
-		maxHeight?: number;
-		/**
-		 * Whether window is resizable.
-		 * Default: true.
-		 */
-		resizable?: boolean;
-		/**
-		 * Whether window is movable.
-		 * Note: This is not implemented on Linux.
-		 * Default: true.
-		 */
-		movable?: boolean;
-		/**
-		 * Whether window is minimizable.
-		 * Note: This is not implemented on Linux.
-		 * Default: true.
-		 */
-		minimizable?: boolean;
-		/**
-		 * Whether window is maximizable.
-		 * Note: This is not implemented on Linux.
-		 * Default: true.
-		 */
-		maximizable?: boolean;
-		/**
-		 * Whether window is closable.
-		 * Note: This is not implemented on Linux.
-		 * Default: true.
-		 */
-		closable?: boolean;
-		/**
-		 * Whether the window should always stay on top of other windows.
-		 * Default: false.
-		 */
-		alwaysOnTop?: boolean;
-		/**
-		 * Whether the window should show in fullscreen.
-		 * When explicity set to false the fullscreen button will be hidden or disabled on OS X.
-		 * Default: false.
-		 */
-		fullscreen?: boolean;
-		/**
-		 * Whether the maximize/zoom button on OS X should toggle full screen mode or maximize window.
-		 * Default: true.
-		 */
-		fullscreenable?: boolean;
-		/**
-		 * Whether to show the window in taskbar.
-		 * Default: false.
-		 */
-		skipTaskbar?: boolean;
-		/**
-		 * The kiosk mode.
-		 * Default: false.
-		 */
-		kiosk?: boolean;
-		/**
-		 * Default window title.
-		 * Default: "Electron".
-		 */
-		title?: string;
-		/**
-		 * The window icon, when omitted on Windows the executable’s icon would be used as window icon.
-		 */
-		icon?: NativeImage|string;
-		/**
-		 * Whether window should be shown when created.
-		 * Default: true.
-		 */
-		show?: boolean;
-		/**
-		 * Specify false to create a Frameless Window.
-		 * Default: true.
-		 */
-		frame?: boolean;
-		/**
-		 * Whether the web view accepts a single mouse-down event that simultaneously activates the window.
-		 * Default: false.
-		 */
-		acceptFirstMouse?: boolean;
-		/**
-		 * Whether to hide cursor when typing.
-		 * Default: false.
-		 */
-		disableAutoHideCursor?: boolean;
-		/**
-		 * Auto hide the menu bar unless the Alt key is pressed.
-		 * Default: true.
-		 */
-		autoHideMenuBar?: boolean;
-		/**
-		 * Enable the window to be resized larger than screen.
-		 * Default: false.
-		 */
-		enableLargerThanScreen?: boolean;
-		/**
-		 * Window’s background color as Hexadecimal value, like #66CD00 or #FFF or #80FFFFFF (alpha is supported).
-		 * Default: #000 (black) for Linux and Windows, #FFF for Mac (or clear if transparent).
-		 */
-		backgroundColor?: string;
-		/**
-		 * Whether window should have a shadow.
-		 * Note: This is only implemented on OS X.
-		 * Default: true.
-		 */
-		hasShadow?: boolean;
-		/**
-		 * Forces using dark theme for the window.
-		 * Note: Only works on some GTK+3 desktop environments.
-		 * Default: false.
-		 */
-		darkTheme?: boolean;
-		/**
-		 * Makes the window transparent.
-		 * Default: false.
-		 */
-		transparent?: boolean;
-		/**
-		 * The type of window, default is normal window.
-		 */
-		type?: BrowserWindowType;
-		/**
-		 * The style of window title bar.
-		 */
-		titleBarStyle?: 'default' | 'hidden' | 'hidden-inset';
-		/**
-		 * Settings of web page’s features.
-		 */
-		webPreferences?: WebPreferences;
-	}
-
-	type BrowserWindowType = BrowserWindowTypeLinux | BrowserWindowTypeMac;
-	type BrowserWindowTypeLinux = 'desktop' | 'dock' | 'toolbar' | 'splash' | 'notification';
-	type BrowserWindowTypeMac = 'desktop' | 'textured';
-
-	interface Rectangle {
-		x?: number;
-		y?: number;
-		width?: number;
-		height?: number;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/clipboard.md
-
-	/**
-	 * The clipboard module provides methods to perform copy and paste operations.
-	 */
-	interface Clipboard {
-		/**
-		 * @returns The contents of the clipboard as plain text.
-		 */
-		readText(type?: ClipboardType): string;
-		/**
-		 * Writes the text into the clipboard as plain text.
-		 */
-		writeText(text: string, type?: ClipboardType): void;
-		/**
-		 * @returns The contents of the clipboard as markup.
-		 */
-		readHtml(type?: ClipboardType): string;
-		/**
-		 * Writes markup to the clipboard.
-		 */
-		writeHtml(markup: string, type?: ClipboardType): void;
-		/**
-		 * @returns The contents of the clipboard as a NativeImage.
-		 */
-		readImage(type?: ClipboardType): NativeImage;
-		/**
-		 * Writes the image into the clipboard.
-		 */
-		writeImage(image: NativeImage, type?: ClipboardType): void;
-		/**
-		 * @returns The contents of the clipboard as RTF.
-		 */
-		readRtf(type?: ClipboardType): string;
-		/**
-		 * Writes the text into the clipboard in RTF.
-		 */
-		writeRtf(text: string, type?: ClipboardType): void;
-		/**
-		 * Clears everything in clipboard.
-		 */
-		clear(type?: ClipboardType): void;
-		/**
-		 * @returns Array available formats for the clipboard type.
-		 */
-		availableFormats(type?: ClipboardType): string[];
-		/**
-		 * Returns whether the clipboard supports the format of specified data.
-		 * Note: This API is experimental and could be removed in future.
-		 * @returns Whether the clipboard has data in the specified format.
-		 */
-		has(format: string, type?: ClipboardType): boolean;
-		/**
-		 * Reads the data in the clipboard of the specified format.
-		 * Note: This API is experimental and could be removed in future.
-		 */
-		read(format: string, type?: ClipboardType): any;
-		/**
-		 * Writes data to the clipboard.
-		 */
-		write(data: {
-			text?: string;
-			rtf?: string;
-			html?: string;
-			image?: NativeImage;
-		}, type?: ClipboardType): void;
-	}
-
-	type ClipboardType = '' | 'selection';
-
-	// https://github.com/atom/electron/blob/master/docs/api/content-tracing.md
-
-	/**
-	 * The content-tracing module is used to collect tracing data generated by the underlying Chromium content module.
-	 * This module does not include a web interface so you need to open chrome://tracing/
-	 * in a Chrome browser and load the generated file to view the result.
-	 */
-	interface ContentTracing {
-		/**
-		 * Get a set of category groups. The category groups can change as new code paths are reached.
-		 * @param callback Called once all child processes have acked to the getCategories request.
-		 */
-		getCategories(callback: (categoryGroups: any[]) => void): void;
-		/**
-		 * Start recording on all processes. Recording begins immediately locally, and asynchronously
-		 * on child processes as soon as they receive the EnableRecording request.
-		 * @param categoryFilter A filter to control what category groups should be traced.
-		 * A filter can have an optional "-" prefix to exclude category groups that contain
-		 * a matching category. Having both included and excluded category patterns in the
-		 * same list would not be supported.
-		 * @param options controls what kind of tracing is enabled, it could be a OR-ed
-		 * combination of tracing.DEFAULT_OPTIONS, tracing.ENABLE_SYSTRACE, tracing.ENABLE_SAMPLING
-		 * and tracing.RECORD_CONTINUOUSLY.
-		 * @param callback Called once all child processes have acked to the startRecording request.
-		 */
-		startRecording(categoryFilter: string, options: number, callback: Function): void;
-		/**
-		 * Stop recording on all processes. Child processes typically are caching trace data and
-		 * only rarely flush and send trace data back to the main process. That is because it may
-		 * be an expensive operation to send the trace data over IPC, and we would like to avoid
-		 * much runtime overhead of tracing. So, to end tracing, we must asynchronously ask all
-		 * child processes to flush any pending trace data.
-		 * @param resultFilePath Trace data will be written into this file if it is not empty,
-		 * or into a temporary file.
-		 * @param callback Called once all child processes have acked to the stopRecording request.
-		 */
-		stopRecording(resultFilePath: string, callback:
-			/**
-			 * @param filePath A file that contains the traced data.
-			 */
-			(filePath: string) => void
-			): void;
-		/**
-		 * Start monitoring on all processes. Monitoring begins immediately locally, and asynchronously
-		 * on child processes as soon as they receive the startMonitoring request.
-		 * @param callback Called once all child processes have acked to the startMonitoring request.
-		 */
-		startMonitoring(categoryFilter: string, options: number, callback: Function): void;
-		/**
-		 * Stop monitoring on all processes.
-		 * @param callback Called once all child processes have acked to the stopMonitoring request.
-		 */
-		stopMonitoring(callback: Function): void;
-		/**
-		 * Get the current monitoring traced data. Child processes typically are caching trace data
-		 * and only rarely flush and send trace data back to the main process. That is because it may
-		 * be an expensive operation to send the trace data over IPC, and we would like to avoid much
-		 * runtime overhead of tracing. So, to end tracing, we must asynchronously ask all child
-		 * processes to flush any pending trace data.
-		 * @param callback Called once all child processes have acked to the captureMonitoringSnapshot request.
-		 */
-		captureMonitoringSnapshot(resultFilePath: string, callback:
-			/**
-			 * @param filePath A file that contains the traced data
-			 * @returns {}
-			 */
-			(filePath: string) => void
-			): void;
-		/**
-		 * Get the maximum across processes of trace buffer percent full state.
-		 * @param callback Called when the TraceBufferUsage value is determined.
-		 */
-		getTraceBufferUsage(callback: Function): void;
-		/**
-		 * @param callback Called every time the given event occurs on any process.
-		 */
-		setWatchEvent(categoryName: string, eventName: string, callback: Function): void;
-		/**
-		 * Cancel the watch event. If tracing is enabled, this may race with the watch event callback.
-		 */
-		cancelWatchEvent(): void;
-		DEFAULT_OPTIONS: number;
-		ENABLE_SYSTRACE: number;
-		ENABLE_SAMPLING: number;
-		RECORD_CONTINUOUSLY: number;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/crash-reporter.md
-
-	/**
-	 * The crash-reporter module enables sending your app's crash reports.
-	 */
-	interface CrashReporter {
-		/**
-		 * You are required to call this method before using other crashReporter APIs.
-		 */
-		start(options: CrashReporterStartOptions): void;
-		/**
-		 * @returns The date and ID of the last crash report. When there was no crash report
-		 * sent or the crash reporter is not started, null will be returned.
-		 */
-		getLastCrashReport(): CrashReporterPayload;
-		/**
-		 * @returns All uploaded crash reports. Each report contains the date and uploaded ID.
-		 */
-		getUploadedReports(): CrashReporterPayload[];
-	}
-
-	interface CrashReporterStartOptions {
-		/**
-		* Default: Electron
-		*/
-		productName?: string;
-		companyName: string;
-		/**
-		* URL that crash reports would be sent to as POST.
-		*/
-		submitURL: string;
-		/**
-		* Send the crash report without user interaction.
-		* Default: true.
-		*/
-		autoSubmit?: boolean;
-		/**
-		* Default: false.
-		*/
-		ignoreSystemCrashHandler?: boolean;
-		/**
-		* An object you can define which content will be send along with the report.
-		* Only string properties are send correctly.
-		* Nested objects are not supported.
-		*/
-		extra?: {[prop: string]: string};
-	}
-
-	interface CrashReporterPayload extends Object {
-		/**
-		* E.g., "electron-crash-service".
-		*/
-		rept: string;
-		/**
-		* The version of Electron.
-		*/
-		ver: string;
-		/**
-		* E.g., "win32".
-		*/
-		platform: string;
-		/**
-		* E.g., "renderer".
-		*/
-		process_type: string;
-		ptime: number;
-		/**
-		* The version in package.json.
-		*/
-		_version: string;
-		/**
-		* The product name in the crashReporter options object.
-		*/
-		_productName: string;
-		/**
-		* Name of the underlying product. In this case, Electron.
-		*/
-		prod: string;
-		/**
-		* The company name in the crashReporter options object.
-		*/
-		_companyName: string;
-		/**
-		* The crashreporter as a file.
-		*/
-		upload_file_minidump: File;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/desktop-capturer.md
-
-	/**
-	 * The desktopCapturer module can be used to get available sources
-	 * that can be used to be captured with getUserMedia.
-	 */
-	interface DesktopCapturer {
-		/**
-		 * Starts a request to get all desktop sources.
-		 *
-		 * Note: There is no guarantee that the size of source.thumbnail is always
-		 * the same as the thumnbailSize in options. It also depends on the scale of the screen or window.
-		 */
-		getSources(options: any, callback: (error: Error, sources: DesktopCapturerSource[]) => any): void;
-	}
-
-	interface DesktopCapturerOptions {
-		/**
-		 * The types of desktop sources to be captured.
-		 */
-		types?: ('screen' | 'window')[];
-		/**
-		 * The suggested size that thumbnail should be scaled.
-		 * Default: {width: 150, height: 150}
-		 */
-		thumbnailSize?: Dimension;
-	}
-
-	interface DesktopCapturerSource {
-		/**
-		 * The id of the captured window or screen used in navigator.webkitGetUserMedia.
-		 * The format looks like window:XX or screen:XX where XX is a random generated number.
-		 */
-		id: string;
-		/**
-		 * The described name of the capturing screen or window.
-		 * If the source is a screen, the name will be Entire Screen or Screen <index>;
-		 * if it is a window, the name will be the window’s title.
-		 */
-		name: string;
-		/**
-		 * A thumbnail image.
-		 */
-		thumbnail: NativeImage;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/dialog.md
-
-	/**
-	 * The dialog module provides APIs to show native system dialogs, such as opening files or alerting,
-	 * so web applications can deliver the same user experience as native applications.
-	 */
-	interface Dialog {
-		/**
-		 * Note: On Windows and Linux an open dialog can not be both a file selector and a directory selector,
-		 * so if you set properties to ['openFile', 'openDirectory'] on these platforms, a directory selector will be shown.
-		 *
-		 * @param callback If supplied, the API call will be asynchronous.
-		 * @returns On success, returns an array of file paths chosen by the user,
-		 * otherwise returns undefined.
-		 */
-		showOpenDialog(browserWindow: BrowserWindow, options: OpenDialogOptions, callback?: (fileNames: string[]) => void): string[];
-		/**
-		 * Note: On Windows and Linux an open dialog can not be both a file selector and a directory selector,
-		 * so if you set properties to ['openFile', 'openDirectory'] on these platforms, a directory selector will be shown.
-		 *
-		 * @param callback If supplied, the API call will be asynchronous.
-		 * @returns On success, returns an array of file paths chosen by the user,
-		 * otherwise returns undefined.
-		 */
-		showOpenDialog(options: OpenDialogOptions, callback?: (fileNames: string[]) => void): string[];
-		/**
-		 * @param callback If supplied, the API call will be asynchronous.
-		 * @returns On success, returns the path of file chosen by the user, otherwise
-		 * returns undefined.
-		 */
-		showSaveDialog(browserWindow: BrowserWindow, options: SaveDialogOptions, callback?: (fileName: string) => void): string;
-		/**
-		 * @param callback If supplied, the API call will be asynchronous.
-		 * @returns On success, returns the path of file chosen by the user, otherwise
-		 * returns undefined.
-		 */
-		showSaveDialog(options: SaveDialogOptions, callback?: (fileName: string) => void): string;
-		/**
-		 * Shows a message box. It will block until the message box is closed.
-		 * @param callback If supplied, the API call will be asynchronous.
-		 * @returns The index of the clicked button.
-		 */
-		showMessageBox(browserWindow: BrowserWindow, options: ShowMessageBoxOptions, callback?: (response: any) => void): number;
-		/**
-		 * Shows a message box. It will block until the message box is closed.
-		 * @param callback If supplied, the API call will be asynchronous.
-		 * @returns The index of the clicked button.
-		 */
-		showMessageBox(options: ShowMessageBoxOptions, callback?: (response: any) => void): number;
-		/**
-		 * Displays a modal dialog that shows an error message.
-		 *
-		 * This API can be called safely before the ready event the app module emits,
-		 * it is usually used to report errors in early stage of startup.
-		 * If called before the app readyevent on Linux, the message will be emitted to stderr,
-		 * and no GUI dialog will appear.
-		 */
-		showErrorBox(title: string, content: string): void;
-	}
-
-	interface OpenDialogOptions {
-		title?: string;
-		defaultPath?: string;
-		/**
-		 * File types that can be displayed or selected.
-		 */
-		filters?: {
-			name: string;
-			/**
-			 * Extensions without wildcards or dots (e.g. 'png' is good but '.png' and '*.png' are bad).
-			 * To show all files, use the '*' wildcard (no other wildcard is supported).
-			 */
-			extensions: string[];
-		}[];
-		/**
-		 * Contains which features the dialog should use.
-		 */
-		properties?: ('openFile' | 'openDirectory' | 'multiSelections' | 'createDirectory')[];
-	}
-
-	interface SaveDialogOptions {
-		title?: string;
-		defaultPath?: string;
-		/**
-		 * File types that can be displayed, see dialog.showOpenDialog for an example.
-		 */
-		filters?: {
-			name: string;
-			extensions: string[];
-		}[];
-	}
-
-	interface ShowMessageBoxOptions {
-		/**
-		 * On Windows, "question" displays the same icon as "info", unless you set an icon using the "icon" option.
-		 */
-		type?: 'none' | 'info' | 'error' | 'question' | 'warning';
-		/**
-		 * Texts for buttons.
-		 */
-		buttons?: string[];
-		/**
-		 * Index of the button in the buttons array which will be selected by default when the message box opens.
-		 */
-		defaultId?: number;
-		/**
-		 * Title of the message box (some platforms will not show it).
-		 */
-		title?: string;
-		/**
-		 * Contents of the message box.
-		 */
-		message?: string;
-		/**
-		 * Extra information of the message.
-		 */
-		detail?: string;
-		icon?: NativeImage;
-		/**
-		 * The value will be returned when user cancels the dialog instead of clicking the buttons of the dialog.
-		 * By default it is the index of the buttons that have "cancel" or "no" as label,
-		 * or 0 if there is no such buttons. On OS X and Windows the index of "Cancel" button
-		 * will always be used as cancelId, not matter whether it is already specified.
-		 */
-		cancelId?: number;
-		/**
-		 * On Windows Electron will try to figure out which one of the buttons are common buttons
-		 * (like "Cancel" or "Yes"), and show the others as command links in the dialog.
-		 * This can make the dialog appear in the style of modern Windows apps.
-		 * If you don’t like this behavior, you can set noLink to true.
-		 */
-		noLink?: boolean;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/download-item.md
-
-	/**
-	 * DownloadItem represents a download item in Electron.
-	 */
-	interface DownloadItem extends NodeJS.EventEmitter {
-		/**
-		 * Emits when the downloadItem gets updated.
-		 */
-		on(event: 'updated', listener: Function): this;
-		/**
-		 * Emits when the download is in a terminal state. This includes a completed download,
-		 * a cancelled download (via downloadItem.cancel()), and interrupted download that can’t be resumed.
-		 */
-		on(event: 'done', listener: (event: Event, state: 'completed' | 'cancelled' | 'interrupted') => void): this;
-		on(event: string, listener: Function): this;
-		/**
-		 * Set the save file path of the download item.
-		 * Note: The API is only available in session’s will-download callback function.
-		 * If user doesn’t set the save path via the API, Electron will use the original
-		 * routine to determine the save path (Usually prompts a save dialog).
-		 */
-		setSavePath(path: string): void;
-		/**
-		 * Pauses the download.
-		 */
-		pause(): void;
-		/**
-		 * Resumes the download that has been paused.
-		 */
-		resume(): void;
-		/**
-		 * Cancels the download operation.
-		 */
-		cancel(): void;
-		/**
-		 * @returns The origin url where the item is downloaded from.
-		 */
-		getURL(): string;
-		/**
-		 * @returns The mime type.
-		 */
-		getMimeType(): string;
-		/**
-		 * @returns Whether the download has user gesture.
-		 */
-		hasUserGesture(): boolean;
-		/**
-		 * @returns The file name of the download item.
-		 * Note: The file name is not always the same as the actual one saved in local disk.
-		 * If user changes the file name in a prompted download saving dialog,
-		 * the actual name of saved file will be different.
-		 */
-		getFilename(): string;
-		/**
-		 * @returns The total size in bytes of the download item. If the size is unknown, it returns 0.
-		 */
-		getTotalBytes(): number;
-		/**
-		 * @returns The received bytes of the download item.
-		 */
-		getReceivedBytes(): number;
-		/**
-		 * @returns The Content-Disposition field from the response header.
-		 */
-		getContentDisposition(): string;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/global-shortcut.md
-
-	/**
-	 * The globalShortcut module can register/unregister a global keyboard shortcut
-	 * with the operating system so that you can customize the operations for various shortcuts.
-	 * Note: The shortcut is global; it will work even if the app does not have the keyboard focus.
-	 * You should not use this module until the ready event of the app module is emitted.
-	 */
-	interface GlobalShortcut {
-		/**
-		 * Registers a global shortcut of accelerator.
-		 * @param accelerator Represents a keyboard shortcut. It can contain modifiers
-		 * and key codes, combined by the "+" character.
-		 * @param callback Called when the registered shortcut is pressed by the user.
-		 */
-		register(accelerator: string, callback: Function): void;
-		/**
-		 * @param accelerator Represents a keyboard shortcut. It can contain modifiers
-		 * and key codes, combined by the "+" character.
-		 * @returns Whether the accelerator is registered.
-		 */
-		isRegistered(accelerator: string): boolean;
-		/**
-		 * Unregisters the global shortcut of keycode.
-		 * @param accelerator Represents a keyboard shortcut. It can contain modifiers
-		 * and key codes, combined by the "+" character.
-		 */
-		unregister(accelerator: string): void;
-		/**
-		 * Unregisters all the global shortcuts.
-		 */
-		unregisterAll(): void;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/ipc-main.md
-
-	/**
-	 * The ipcMain module handles asynchronous and synchronous messages
-	 * sent from a renderer process (web page).
-	 * Messages sent from a renderer will be emitted to this module.
-	 */
-	interface IpcMain extends NodeJS.EventEmitter {
-		addListener(channel: string, listener: IpcMainEventListener): this;
-		on(channel: string, listener: IpcMainEventListener): this;
-		once(channel: string, listener: IpcMainEventListener): this;
-		removeListener(channel: string, listener: IpcMainEventListener): this;
-		removeAllListeners(channel?: string): this;
-	}
-
-	type IpcMainEventListener = (event: IpcMainEvent, ...args: any[]) => void;
-
-	interface IpcMainEvent {
-		/**
-		 * Set this to the value to be returned in a synchronous message.
-		 */
-		returnValue?: any;
-		/**
-		 * Returns the webContents that sent the message, you can call sender.send
-		 * to reply to the asynchronous message.
-		 */
-		sender: WebContents;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/ipc-renderer.md
-
-	/**
-	 * The ipcRenderer module provides a few methods so you can send synchronous
-	 * and asynchronous messages from the render process (web page) to the main process.
-	 * You can also receive replies from the main process.
-	 */
-	interface IpcRenderer extends NodeJS.EventEmitter {
-		addListener(channel: string, listener: IpcRendererEventListener): this;
-		on(channel: string, listener: IpcRendererEventListener): this;
-		once(channel: string, listener: IpcRendererEventListener): this;
-		removeListener(channel: string, listener: IpcRendererEventListener): this;
-		removeAllListeners(channel?: string): this;
-		/**
-		 * Send ...args to the renderer via channel in asynchronous message, the main
-		 * process can handle it by listening to the channel event of ipc module.
-		 */
-		send(channel: string, ...args: any[]): void;
-		/**
-		 * Send ...args to the renderer via channel in synchronous message, and returns
-		 * the result sent from main process. The main process can handle it by listening
-		 * to the channel event of ipc module, and returns by setting event.returnValue.
-		 * Note: Usually developers should never use this API, since sending synchronous
-		 * message would block the whole renderer process.
-		 * @returns The result sent from the main process.
-		 */
-		sendSync(channel: string, ...args: any[]): any;
-		/**
-		 * Like ipc.send but the message will be sent to the host page instead of the main process.
-		 * This is mainly used by the page in <webview> to communicate with host page.
-		 */
-		sendToHost(channel: string, ...args: any[]): void;
-	}
-
-	type IpcRendererEventListener = (event: IpcRendererEvent, ...args: any[]) => void;
-
-	interface IpcRendererEvent {
-		/**
-		 * You can call sender.send to reply to the asynchronous message.
-		 */
-		sender: IpcRenderer;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/menu-item.md
-
-	/**
-	 * The MenuItem allows you to add items to an application or context menu.
-	 */
-	class MenuItem {
-		/**
-		 * Create a new menu item.
-		 */
-		constructor(options: MenuItemOptions);
-
-		click: (menuItem: MenuItem, browserWindow: BrowserWindow) => void;
-		/**
-		 * Read-only property.
-		 */
-		type: MenuItemType;
-		/**
-		 * Read-only property.
-		 */
-		role: MenuItemRole | MenuItemRoleMac;
-		/**
-		 * Read-only property.
-		 */
-		accelerator: string;
-		/**
-		 * Read-only property.
-		 */
-		icon: NativeImage | string;
-		/**
-		 * Read-only property.
-		 */
-		submenu: Menu | MenuItemOptions[];
-
-		label: string;
-		sublabel: string;
-		enabled: boolean;
-		visible: boolean;
-		checked: boolean;
-	}
-
-	type MenuItemType = 'normal' | 'separator' | 'submenu' | 'checkbox' | 'radio';
-	type MenuItemRole = 'undo' | 'redo' | 'cut' | 'copy' | 'paste' | 'selectall' | 'minimize' | 'close';
-	type MenuItemRoleMac = 'about' | 'hide' | 'hideothers' | 'unhide' | 'front' | 'window' | 'help' | 'services';
-
-	interface MenuItemOptions {
-		/**
-		 * Callback when the menu item is clicked.
-		 */
-		click?: (menuItem: MenuItem, browserWindow: BrowserWindow) => void;
-		/**
-		 * Can be normal, separator, submenu, checkbox or radio.
-		 */
-		type?: MenuItemType;
-		label?: string;
-		sublabel?: string;
-		/**
-		 * An accelerator is string that represents a keyboard shortcut, it can contain
-		 * multiple modifiers and key codes, combined by the + character.
-		 *
-		 * Examples:
-		 *   Command+A
-		 *   Ctrl+Shift+Z
-		 *
-		 * Platform notice:
-		 *   On Linux and Windows, the Command key would not have any effect,
-		 *   you can use CommandOrControl which represents Command on OS X and Control on
-		 *   Linux and Windows to define some accelerators.
-		 *
-		 *   The Super key is mapped to the Windows key on Windows and Linux and Cmd on OS X.
-		 *
-		 * Available modifiers:
-		 *   Command (or Cmd for short)
-		 *   Control (or Ctrl for short)
-		 *   CommandOrControl (or CmdOrCtrl for short)
-		 *   Alt
-		 *   Option
-		 *   AltGr
-		 *   Shift
-		 *   Super
-		 *
-		 * Available key codes:
-		 *   0 to 9
-		 *   A to Z
-		 *   F1 to F24
-		 *   Punctuations like ~, !, @, #, $, etc.
-		 *   Plus
-		 *   Space
-		 *   Backspace
-		 *   Delete
-		 *   Insert
-		 *   Return (or Enter as alias)
-		 *   Up, Down, Left and Right
-		 *   Home and End
-		 *   PageUp and PageDown
-		 *   Escape (or Esc for short)
-		 *   VolumeUp, VolumeDown and VolumeMute
-		 *   MediaNextTrack, MediaPreviousTrack, MediaStop and MediaPlayPause
-		 *   PrintScreen
-		 */
-		accelerator?: string;
-		/**
-		 * In Electron for the APIs that take images, you can pass either file paths
-		 * or NativeImage instances. When passing null, an empty image will be used.
-		 */
-		icon?: NativeImage|string;
-		enabled?: boolean;
-		visible?: boolean;
-		checked?: boolean;
-		/**
-		 * Should be specified for submenu type menu item, when it's specified the
-		 * type: 'submenu' can be omitted for the menu item
-		 */
-		submenu?: Menu|MenuItemOptions[];
-		/**
-		 * Unique within a single menu. If defined then it can be used as a reference
-		 * to this item by the position attribute.
-		 */
-		id?: string;
-		/**
-		 * This field allows fine-grained definition of the specific location within
-		 * a given menu.
-		 */
-		position?: string;
-		/**
-		 * Define the action of the menu item, when specified the click property will be ignored
-		 */
-		role?: MenuItemRole | MenuItemRoleMac;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/menu.md
-
-	/**
-	 * The Menu class is used to create native menus that can be used as application
-	 * menus and context menus. This module is a main process module which can be used
-	 * in a render process via the remote module.
-	 *
-	 * Each menu consists of multiple menu items, and each menu item can have a submenu.
-	 */
-	class Menu extends EventEmitter {
-		/**
-		 * Creates a new menu.
-		 */
-		constructor();
-		/**
-		 * Sets menu as the application menu on OS X. On Windows and Linux, the menu
-		 * will be set as each window's top menu.
-		 */
-		static setApplicationMenu(menu: Menu): void;
-		/**
-		 * Sends the action to the first responder of application.
-		 * This is used for emulating default Cocoa menu behaviors,
-		 * usually you would just use the role property of MenuItem.
-		 *
-		 * Note: This method is OS X only.
-		 */
-		static sendActionToFirstResponder(action: string): void;
-		/**
-		 * @param template Generally, just an array of options for constructing MenuItem.
-		 * You can also attach other fields to element of the template, and they will
-		 * become properties of the constructed menu items.
-		 */
-		static buildFromTemplate(template: MenuItemOptions[]): Menu;
-		/**
-		 * Popups this menu as a context menu in the browserWindow. You can optionally
-		 * provide a (x,y) coordinate to place the menu at, otherwise it will be placed
-		 * at the current mouse cursor position.
-		 * @param x Horizontal coordinate where the menu will be placed.
-		 * @param y Vertical coordinate where the menu will be placed.
-		 */
-		popup(browserWindow?: BrowserWindow, x?: number, y?: number): void;
-		/**
-		 * Appends the menuItem to the menu.
-		 */
-		append(menuItem: MenuItem): void;
-		/**
-		 * Inserts the menuItem to the pos position of the menu.
-		 */
-		insert(position: number, menuItem: MenuItem): void;
-		/**
-		 * @returns an array containing the menu’s items.
-		 */
-		items: MenuItem[];
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/native-image.md
-
-	/**
-	 * This class is used to represent an image.
-	 */
-	class NativeImage {
-		/**
-		 * Creates an empty NativeImage instance.
-		 */
-		static createEmpty(): NativeImage;
-		/**
-		 * Creates a new NativeImage instance from file located at path.
-		 */
-		static createFromPath(path: string): NativeImage;
-		/**
-		 * Creates a new NativeImage instance from buffer.
-		 * @param scaleFactor 1.0 by default.
-		 */
-		static createFromBuffer(buffer: Buffer, scaleFactor?: number): NativeImage;
-		/**
-		 * Creates a new NativeImage instance from dataURL
-		 */
-		static createFromDataURL(dataURL: string): NativeImage;
-		/**
-		 * @returns Buffer Contains the image's PNG encoded data.
-		 */
-		toPng(): Buffer;
-		/**
-		 * @returns Buffer Contains the image's JPEG encoded data.
-		 */
-		toJpeg(quality: number): Buffer;
-		/**
-		 * @returns string The data URL of the image.
-		 */
-		toDataURL(): string;
-		/**
-		 * The native type of the handle is NSImage* on OS X.
-		 * Note: This is only implemented on OS X.
-		 * @returns The platform-specific handle of the image as Buffer.
-		 */
-		getNativeHandle(): Buffer;
-		/**
-		 * @returns boolean Whether the image is empty.
-		 */
-		isEmpty(): boolean;
-		/**
-		 * @returns {} The size of the image.
-		 */
-		getSize(): any;
-		/**
-		 * Marks the image as template image.
-		 */
-		setTemplateImage(option: boolean): void;
-		/**
-		 * Returns a boolean whether the image is a template image.
-		 */
-		isTemplateImage(): boolean;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/power-monitor.md
-
-	/**
-	 * The power-monitor module is used to monitor power state changes.
-	 * You should not use this module until the ready event of the app module is emitted.
-	 */
-	interface PowerMonitor extends NodeJS.EventEmitter {
-		/**
-		 * Emitted when the system is suspending.
-		 */
-		on(event: 'suspend', listener: Function): this;
-		/**
-		 * Emitted when system is resuming.
-		 */
-		on(event: 'resume', listener: Function): this;
-		/**
-		 * Emitted when the system changes to AC power.
-		 */
-		on(event: 'on-ac', listener: Function): this;
-		/**
-		 * Emitted when system changes to battery power.
-		 */
-		on(event: 'on-battery', listener: Function): this;
-		on(event: string, listener: Function): this;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/power-save-blocker.md
-
-	/**
-	 * The powerSaveBlocker module is used to block the system from entering
-	 * low-power (sleep) mode and thus allowing the app to keep the system and screen active.
-	 */
-	interface PowerSaveBlocker {
-		/**
-		 * Starts preventing the system from entering lower-power mode.
-		 * @returns an integer identifying the power save blocker.
-		 * Note: prevent-display-sleep has higher has precedence over prevent-app-suspension.
-		 */
-		start(type: 'prevent-app-suspension' | 'prevent-display-sleep'): number;
-		/**
-		 * @param id The power save blocker id returned by powerSaveBlocker.start.
-		 * Stops the specified power save blocker.
-		 */
-		stop(id: number): void;
-		/**
-		 * @param id The power save blocker id returned by powerSaveBlocker.start.
-		 * @returns a boolean whether the corresponding powerSaveBlocker has started.
-		 */
-		isStarted(id: number): boolean;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/protocol.md
-
-	/**
-	 * The protocol module can register a custom protocol or intercept an existing protocol.
-	 */
-	interface Protocol {
-		/**
-		 * Registers custom schemes as standard schemes.
-		 */
-		registerStandardSchemes(schemes: string[]): void;
-		/**
-		 * Registers custom schemes to handle service workers.
-		 */
-		registerServiceWorkerSchemes(schemes: string[]): void;
-		/**
-		 * Registers a protocol of scheme that will send the file as a response.
-		 */
-		registerFileProtocol(scheme: string, handler: (request: ProtocolRequest, callback: FileProtocolCallback) => void, completion?: (error: Error) => void): void;
-		/**
-		 * Registers a protocol of scheme that will send a Buffer as a response.
-		 */
-		registerBufferProtocol(scheme: string, handler: (request: ProtocolRequest, callback: BufferProtocolCallback) => void, completion?: (error: Error) => void): void;
-		/**
-		 * Registers a protocol of scheme that will send a String as a response.
-		 */
-		registerStringProtocol(scheme: string, handler: (request: ProtocolRequest, callback: StringProtocolCallback) => void, completion?: (error: Error) => void): void;
-		/**
-		 * Registers a protocol of scheme that will send an HTTP request as a response.
-		 */
-		registerHttpProtocol(scheme: string, handler: (request: ProtocolRequest, callback: HttpProtocolCallback) => void, completion?: (error: Error) => void): void;
-		/**
-		 * Unregisters the custom protocol of scheme.
-		 */
-		unregisterProtocol(scheme: string, completion?: (error: Error) => void): void;
-		/**
-		 * The callback will be called with a boolean that indicates whether there is already a handler for scheme.
-		 */
-		isProtocolHandled(scheme: string, callback: (handled: boolean) => void): void;
-		/**
-		 * Intercepts scheme protocol and uses handler as the protocol’s new handler which sends a file as a response.
-		 */
-		interceptFileProtocol(scheme: string, handler: (request: ProtocolRequest, callback: FileProtocolCallback) => void, completion?: (error: Error) => void): void;
-		/**
-		 * Intercepts scheme protocol and uses handler as the protocol’s new handler which sends a String as a response.
-		 */
-		interceptStringProtocol(scheme: string, handler: (request: ProtocolRequest, callback: BufferProtocolCallback) => void, completion?: (error: Error) => void): void;
-		/**
-		 * Intercepts scheme protocol and uses handler as the protocol’s new handler which sends a Buffer as a response.
-		 */
-		interceptBufferProtocol(scheme: string, handler: (request: ProtocolRequest, callback: StringProtocolCallback) => void, completion?: (error: Error) => void): void;
-		/**
-		 * Intercepts scheme protocol and uses handler as the protocol’s new handler which sends a new HTTP request as a response.
-		 */
-		interceptHttpProtocol(scheme: string, handler: (request: ProtocolRequest, callback: HttpProtocolCallback) => void, completion?: (error: Error) => void): void;
-		/**
-		 * Remove the interceptor installed for scheme and restore its original handler.
-		 */
-		uninterceptProtocol(scheme: string, completion?: (error: Error) => void): void;
-	}
-
-	interface ProtocolRequest {
-		url: string;
-		referrer: string;
-		method: string;
-		uploadData?: {
-			bytes: Buffer,
-			file: string
-		}[];
-	}
-
-	interface ProtocolCallback {
-		(error: number): void;
-		(obj: {
-			error: number
-		}): void;
-		(): void;
-	}
-
-	interface FileProtocolCallback extends ProtocolCallback {
-		(filePath: string): void;
-		(obj: {
-			path: string
-		}): void;
-	}
-
-	interface BufferProtocolCallback extends ProtocolCallback {
-		(buffer: Buffer): void;
-		(obj: {
-			data: Buffer,
-			mimeType: string,
-			charset?: string
-		}): void;
-	}
-
-	interface StringProtocolCallback extends ProtocolCallback {
-		(str: string): void;
-		(obj: {
-			data: Buffer,
-			mimeType: string,
-			charset?: string
-		}): void;
-	}
-
-	interface HttpProtocolCallback extends ProtocolCallback {
-		(redirectRequest: {
-			url: string;
-			method: string;
-			session?: Object;
-			uploadData?: {
-				contentType: string;
-				data: string;
-			};
-		}): void;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/remote.md
-
-	/**
-	 * The remote module provides a simple way to do inter-process communication (IPC)
-	 * between the renderer process (web page) and the main process.
-	 */
-	interface Remote extends CommonElectron {
-		/**
-		 * @returns The object returned by require(module) in the main process.
-		 */
-		require(module: string): any;
-		/**
-		 * @returns The BrowserWindow object which this web page belongs to.
-		 */
-		getCurrentWindow(): BrowserWindow;
-		/**
-		 * @returns The WebContents object of this web page.
-		 */
-		getCurrentWebContents(): WebContents;
-		/**
-		 * @returns The global variable of name (e.g. global[name]) in the main process.
-		 */
-		getGlobal(name: string): any;
-		/**
-		 * Returns the process object in the main process. This is the same as
-		 * remote.getGlobal('process'), but gets cached.
-		 */
-		process: NodeJS.Process;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/screen.md
-
-	/**
-	 * The Display object represents a physical display connected to the system.
-	 * A fake Display may exist on a headless system, or a Display may correspond to a remote, virtual display.
-	 */
-	interface Display {
-		/**
-		 * Unique identifier associated with the display.
-		 */
-		id: number;
-		bounds: Bounds;
-		workArea: Bounds;
-		size: Dimension;
-		workAreaSize: Dimension;
-		/**
-		 * Output device’s pixel scale factor.
-		 */
-		scaleFactor: number;
-		/**
-		 * Can be 0, 1, 2, 3, each represents screen rotation in clock-wise degrees of 0, 90, 180, 270.
-		 */
-		rotation: number;
-		touchSupport: 'available' | 'unavailable' | 'unknown';
-	}
-
-	type Bounds = {
-		x: number;
-		y: number;
-		width: number;
-		height: number;
-	}
-
-	type Dimension = {
-		width: number;
-		height: number;
-	}
-
-	type Point = {
-		x: number;
-		y: number;
-	}
-
-	type DisplayMetrics = 'bounds' | 'workArea' | 'scaleFactor' | 'rotation';
-
-	/**
-	 * The screen module retrieves information about screen size, displays, cursor position, etc.
-	 * You should not use this module until the ready event of the app module is emitted.
-	 */
-	interface Screen extends NodeJS.EventEmitter {
-		/**
-		 * Emitted when newDisplay has been added.
-		 */
-		on(event: 'display-added', listener: (event: Event, newDisplay: Display) => void): this;
-		/**
-		 * Emitted when oldDisplay has been removed.
-		 */
-		on(event: 'display-removed', listener: (event: Event, oldDisplay: Display) => void): this;
-		/**
-		 * Emitted when one or more metrics change in a display.
-		 */
-		on(event: 'display-metrics-changed', listener: (event: Event, display: Display, changedMetrics: DisplayMetrics[]) => void): this;
-		on(event: string, listener: Function): this;
-		/**
-		 * @returns The current absolute position of the mouse pointer.
-		 */
-		getCursorScreenPoint(): Point;
-		/**
-		 * @returns The primary display.
-		 */
-		getPrimaryDisplay(): Display;
-		/**
-		 * @returns An array of displays that are currently available.
-		 */
-		getAllDisplays(): Display[];
-		/**
-		 * @returns The display nearest the specified point.
-		 */
-		getDisplayNearestPoint(point: Point): Display;
-		/**
-		 * @returns The display that most closely intersects the provided bounds.
-		 */
-		getDisplayMatching(rect: Bounds): Display;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/session.md
-
-	/**
-	 * The session module can be used to create new Session objects.
-	 * You can also access the session of existing pages by using
-	 * the session property of webContents which is a property of BrowserWindow.
-	 */
-	class Session extends EventEmitter {
-		/**
-		 * @returns a new Session instance from partition string.
-		 */
-		static fromPartition(partition: string): Session;
-		/**
-		 * @returns the default session object of the app.
-		 */
-		static defaultSession: Session;
-		/**
-		 * Emitted when Electron is about to download item in webContents.
-		 * Calling event.preventDefault() will cancel the download
-		 * and item will not be available from next tick of the process.
-		 */
-		on(event: 'will-download', listener: (event: Event, item: DownloadItem, webContents: WebContents) => void): this;
-		on(event: string, listener: Function): this;
-		/**
-		 * The cookies gives you ability to query and modify cookies.
-		 */
-		cookies: SessionCookies;
-		/**
-		 * @returns the session’s current cache size.
-		 */
-		getCacheSize(callback: (size: number) => void): void;
-		/**
-		 * Clears the session’s HTTP cache.
-		 */
-		clearCache(callback: Function): void;
-		/**
-		 * Clears the data of web storages.
-		 */
-		clearStorageData(callback: Function): void;
-		/**
-		 * Clears the data of web storages.
-		 */
-		clearStorageData(options: ClearStorageDataOptions, callback: Function): void;
-		/**
-		 * Writes any unwritten DOMStorage data to disk.
-		 */
-		flushStorageData(): void;
-		/**
-		 * Sets the proxy settings.
-		 */
-		setProxy(config: string, callback: Function): void;
-		/**
-		 * Resolves the proxy information for url.
-		 */
-		resolveProxy(url: URL, callback: (proxy: any) => any): void;
-		/**
-		 * Sets download saving directory.
-		 * By default, the download directory will be the Downloads under the respective app folder.
-		 */
-		setDownloadPath(path: string): void;
-		/**
-		 * Emulates network with the given configuration for the session.
-		 */
-		enableNetworkEmulation(options: NetworkEmulationOptions): void;
-		/**
-		 * Disables any network emulation already active for the session.
-		 * Resets to the original network configuration.
-		 */
-		disableNetworkEmulation(): void;
-		/**
-		 * Sets the certificate verify proc for session.
-		 */
-		setCertificateVerifyProc(proc: CertificateVerifyProc): void;
-		/**
-		 * Clears the host resolver cache.
-		 */
-		clearHostResolverCache(callback: Function): void;
-		/**
-		 * The webRequest API set allows to intercept and modify contents of a request at various stages of its lifetime.
-		 */
-		webRequest: any;
-	}
-
-	interface ClearStorageDataOptions {
-		/**
-		 * Should follow window.location.origin’s representation scheme://host:port.
-		 */
-		origin?: string;
-		/**
-		 *  The types of storages to clear.
-		 */
-		storages?: ('appcache' | 'cookies' | 'filesystem' | 'indexdb' | 'localstorage' | 'shadercache' | 'websql' | 'serviceworkers')[];
-		/**
-		 * The types of quotas to clear.
-		 */
-		quotas?: ('temporary' | 'persistent' | 'syncable')[];
-	}
-
-	interface NetworkEmulationOptions {
-		/**
-		 * Whether to emulate network outage.
-		 */
-		offline?: boolean;
-		/**
-		 * RTT in ms.
-		 */
-		latency?: number;
-		/**
-		 * Download rate in Bps.
-		 */
-		downloadThroughput?: number;
-		/**
-		 * Upload rate in Bps.
-		 */
-		uploadThroughput?: number;
-	}
-
-	interface CertificateVerifyProc {
-		(hostname: string, cert: any, callback: (accepted: boolean) => any): any;
-	}
-
-	interface CookieFilter {
-		/**
-		 * Retrieves cookies which are associated with url. Empty implies retrieving cookies of all urls.
-		 */
-		url?: string;
-		/**
-		 * Filters cookies by name.
-		 */
-		name?: string;
-		/**
-		 * Retrieves cookies whose domains match or are subdomains of domains.
-		 */
-		domain?: string;
-		/**
-		 * Retrieves cookies whose path matches path.
-		 */
-		path?: string;
-		/**
-		 * Filters cookies by their Secure property.
-		 */
-		secure?: boolean;
-		/**
-		 * Filters out session or persistent cookies.
-		 */
-		session?: boolean;
-	}
-
-	interface Cookie {
-		/**
-		 * The name of the cookie.
-		 */
-		name: string;
-		/**
-		 * The value of the cookie.
-		 */
-		value: string;
-		/**
-		 * The domain of the cookie.
-		 */
-		domain: string;
-		/**
-		 * Whether the cookie is a host-only cookie.
-		 */
-		hostOnly: string;
-		/**
-		 * The path of the cookie.
-		 */
-		path: string;
-		/**
-		 * Whether the cookie is marked as secure.
-		 */
-		secure: boolean;
-		/**
-		 * Whether the cookie is marked as HTTP only.
-		 */
-		httpOnly: boolean;
-		/**
-		 * Whether the cookie is a session cookie or a persistent cookie with an expiration date.
-		 */
-		session: boolean;
-		/**
-		 * The expiration date of the cookie as the number of seconds since the UNIX epoch.
-		 * Not provided for session cookies.
-		 */
-		expirationDate?: number;
-	}
-
-	interface CookieDetails {
-		/**
-		 * The URL associated with the cookie.
-		 */
-		url: string;
-		/**
-		 * The name of the cookie.
-		 * Default: empty.
-		 */
-		name?: string;
-		/**
-		 * The value of the cookie.
-		 * Default: empty.
-		 */
-		value?: string;
-		/**
-		 * The domain of the cookie.
-		 * Default: empty.
-		 */
-		domain?: string;
-		/**
-		 * The path of the cookie.
-		 * Default: empty.
-		 */
-		path?: string;
-		/**
-		 * Whether the cookie should be marked as secure.
-		 * Default: false.
-		 */
-		secure?: boolean;
-		/**
-		 * Whether the cookie should be marked as HTTP only.
-		 * Default: false.
-		 */
-		httpOnly?: boolean;
-		/**
-		 * The expiration date of the cookie as the number of seconds since the UNIX epoch.
-		 * If omitted, the cookie becomes a session cookie.
-		 */
-		expirationDate?: number;
-	}
-
-	interface SessionCookies {
-		/**
-		 * Sends a request to get all cookies matching filter.
-		 */
-		get(filter: CookieFilter, callback: (error: Error, cookies: Cookie[]) => void): void;
-		/**
-		 * Sets the cookie with details.
-		 */
-		set(details: CookieDetails, callback: (error: Error) => void): void;
-		/**
-		 * Removes the cookies matching url and name.
-		 */
-		remove(url: string, name: string, callback: (error: Error) => void): void;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/shell.md
-
-	/**
-	 * The shell module provides functions related to desktop integration.
-	 */
-	interface Shell {
-		/**
-		 * Show the given file in a file manager. If possible, select the file.
-		 */
-		showItemInFolder(fullPath: string): void;
-		/**
-		 * Open the given file in the desktop's default manner.
-		 */
-		openItem(fullPath: string): void;
-		/**
-		 * Open the given external protocol URL in the desktop's default manner
-		 * (e.g., mailto: URLs in the default mail user agent).
-		 * @returns true if an application was available to open the URL, false otherwise.
-		 */
-		openExternal(url: string, options?: {
-			/**
-			 * Bring the opened application to the foreground.
-			 * Default: true.
-			 */
-			activate: boolean;
-		}): boolean;
-		/**
-		 * Move the given file to trash.
-		 * @returns boolean status for the operation.
-		 */
-		moveItemToTrash(fullPath: string): boolean;
-		/**
-		 * Play the beep sound.
-		 */
-		beep(): void;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/tray.md
-
-	/**
-	 * A Tray represents an icon in an operating system's notification area.
-	 */
-	interface Tray extends NodeJS.EventEmitter {
-		/**
-		 * Emitted when the tray icon is clicked.
-		 * Note: The bounds payload is only implemented on OS X and Windows.
-		 */
-		on(event: 'click', listener: (modifiers: Modifiers, bounds: Bounds) => void): this;
-		/**
-		 * Emitted when the tray icon is right clicked.
-		 * Note: This is only implemented on OS X and Windows.
-		 */
-		on(event: 'right-click', listener: (modifiers: Modifiers, bounds: Bounds) => void): this;
-		/**
-		 * Emitted when the tray icon is double clicked.
-		 * Note: This is only implemented on OS X and Windows.
-		 */
-		on(event: 'double-click', listener: (modifiers: Modifiers, bounds: Bounds) => void): this;
-		/**
-		 * Emitted when the tray balloon shows.
-		 * Note: This is only implemented on Windows.
-		 */
-		on(event: 'balloon-show', listener: Function): this;
-		/**
-		 * Emitted when the tray balloon is clicked.
-		 * Note: This is only implemented on Windows.
-		 */
-		on(event: 'balloon-click', listener: Function): this;
-		/**
-		 * Emitted when the tray balloon is closed because of timeout or user manually closes it.
-		 * Note: This is only implemented on Windows.
-		 */
-		on(event: 'balloon-closed', listener: Function): this;
-		/**
-		 * Emitted when any dragged items are dropped on the tray icon.
-		 * Note: This is only implemented on OS X.
-		 */
-		on(event: 'drop', listener: Function): this;
-		/**
-		 * Emitted when dragged files are dropped in the tray icon.
-		 * Note: This is only implemented on OS X
-		 */
-		on(event: 'drop-files', listener: (event: Event, files: string[]) => void): this;
-		/**
-		 * Emitted when a drag operation enters the tray icon.
-		 * Note: This is only implemented on OS X
-		 */
-		on(event: 'drag-enter', listener: Function): this;
-		/**
-		 * Emitted when a drag operation exits the tray icon.
-		 * Note: This is only implemented on OS X
-		 */
-		on(event: 'drag-leave', listener: Function): this;
-		/**
-		 * Emitted when a drag operation ends on the tray or ends at another location.
-		 * Note: This is only implemented on OS X
-		 */
-		on(event: 'drag-end', listener: Function): this;
-		on(event: string, listener: Function): this;
-		/**
-		 * Creates a new tray icon associated with the image.
-		 */
-		new(image: NativeImage|string): Tray;
-		/**
-		 * Destroys the tray icon immediately.
-		 */
-		destroy(): void;
-		/**
-		 * Sets the image associated with this tray icon.
-		 */
-		setImage(image: NativeImage|string): void;
-		/**
-		 * Sets the image associated with this tray icon when pressed.
-		 */
-		setPressedImage(image: NativeImage): void;
-		/**
-		 * Sets the hover text for this tray icon.
-		 */
-		setToolTip(toolTip: string): void;
-		/**
-		 * Sets the title displayed aside of the tray icon in the status bar.
-		 * Note: This is only implemented on OS X.
-		 */
-		setTitle(title: string): void;
-		/**
-		 * Sets whether the tray icon is highlighted when it is clicked.
-		 * Note: This is only implemented on OS X.
-		 */
-		setHighlightMode(highlight: boolean): void;
-		/**
-		 * Displays a tray balloon.
-		 * Note: This is only implemented on Windows.
-		 */
-		displayBalloon(options?: {
-			icon?: NativeImage;
-			title?: string;
-			content?: string;
-		}): void;
-		/**
-		 * Popups the context menu of tray icon. When menu is passed,
-		 * the menu will showed instead of the tray's context menu.
-		 * The position is only available on Windows, and it is (0, 0) by default.
-		 * Note: This is only implemented on OS X and Windows.
-		 */
-		popUpContextMenu(menu?: Menu, position?: Point): void;
-		/**
-		 * Sets the context menu for this icon.
-		 */
-		setContextMenu(menu: Menu): void;
-	}
-
-	interface Modifiers {
-		altKey: boolean;
-		shiftKey: boolean;
-		ctrlKey: boolean;
-		metaKey: boolean;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/web-contents.md
-
-	/**
-	 * A WebContents is responsible for rendering and controlling a web page.
-	 */
-	interface WebContents extends NodeJS.EventEmitter {
-		/**
-		 * Emitted when the navigation is done, i.e. the spinner of the tab has stopped spinning,
-		 * and the onload event was dispatched.
-		 */
-		on(event: 'did-finish-load', listener: Function): this;
-		/**
-		 * This event is like did-finish-load but emitted when the load failed or was cancelled,
-		 * e.g. window.stop() is invoked.
-		 */
-		on(event: 'did-fail-load', listener: (event: Event, errorCode: number, errorDescription: string, validatedURL: string) => void): this;
-		/**
-		 * Emitted when a frame has done navigation.
-		 */
-		on(event: 'did-frame-finish-load', listener: (event: Event, isMainFrame: boolean) => void): this;
-		/**
-		 * Corresponds to the points in time when the spinner of the tab started spinning.
-		 */
-		on(event: 'did-start-loading', listener: Function): this;
-		/**
-		 * Corresponds to the points in time when the spinner of the tab stopped spinning.
-		 */
-		on(event: 'did-stop-loading', listener: Function): this;
-		/**
-		 * Emitted when details regarding a requested resource are available.
-		 * status indicates the socket connection to download the resource.
-		 */
-		on(event: 'did-get-response-details', listener: (event: Event,
-			status: boolean,
-			newURL: string,
-			originalURL: string,
-			httpResponseCode: number,
-			requestMethod: string,
-			referrer: string,
-			headers: any
-		) => void): this;
-		/**
-		 * Emitted when a redirect is received while requesting a resource.
-		 */
-		on(event: 'did-get-redirect-request', listener: (event: Event,
-			oldURL: string,
-			newURL: string,
-			isMainFrame: boolean,
-			httpResponseCode: number,
-			requestMethod: string,
-			referrer: string,
-			headers: any
-		) => void): this;
-		/**
-		 * Emitted when the document in the given frame is loaded.
-		 */
-		on(event: 'dom-ready', listener: (event: Event) => void): this;
-		/**
-		 * Emitted when page receives favicon URLs.
-		 */
-		on(event: 'page-favicon-updated', listener: (event: Event, favicons: string[]) => void): this;
-		/**
-		 * Emitted when the page requests to open a new window for a url.
-		 * It could be requested by window.open or an external link like <a target='_blank'>.
-		 *
-		 * By default a new BrowserWindow will be created for the url.
-		 *
-		 * Calling event.preventDefault() will prevent creating new windows.
-		 */
-		on(event: 'new-window', listener: (event: Event,
-			url: string,
-			frameName: string,
-			disposition: NewWindowDisposition,
-			options: BrowserWindowOptions
-		) => void): this;
-		/**
-		 * Emitted when a user or the page wants to start navigation.
-		 * It can happen when the window.location object is changed or a user clicks a link in the page.
-		 *
-		 * This event will not emit when the navigation is started programmatically with APIs like
-		 * webContents.loadURL and webContents.back.
-		 *
-		 * It is also not emitted for in-page navigations, such as clicking anchor links
-		 * or updating the window.location.hash. Use did-navigate-in-page event for this purpose.
-		 *
-		 * Calling event.preventDefault() will prevent the navigation.
-		 */
-		on(event: 'will-navigate', listener: (event: Event, url: string) => void): this;
-		/**
-		 * Emitted when a navigation is done.
-		 *
-		 * This event is not emitted for in-page navigations, such as clicking anchor links
-		 * or updating the window.location.hash. Use did-navigate-in-page event for this purpose.
-		 */
-		on(event: 'did-navigate', listener: (event: Event, url: string) => void): this;
-		/**
-		 * Emitted when an in-page navigation happened.
-		 *
-		 * When in-page navigation happens, the page URL changes but does not cause
-		 * navigation outside of the page. Examples of this occurring are when anchor links
-		 * are clicked or when the DOM hashchange event is triggered.
-		 */
-		on(event: 'did-navigate-in-page', listener: (event: Event, url: string) => void): this;
-		/**
-		 * Emitted when the renderer process has crashed.
-		 */
-		on(event: 'crashed', listener: Function): this;
-		/**
-		 * Emitted when a plugin process has crashed.
-		 */
-		on(event: 'plugin-crashed', listener: (event: Event, name: string, version: string) => void): this;
-		/**
-		 * Emitted when webContents is destroyed.
-		 */
-		on(event: 'destroyed', listener: Function): this;
-		/**
-		 * Emitted when DevTools is opened.
-		 */
-		on(event: 'devtools-opened', listener: Function): this;
-		/**
-		 * Emitted when DevTools is closed.
-		 */
-		on(event: 'devtools-closed', listener: Function): this;
-		/**
-		 * Emitted when DevTools is focused / opened.
-		 */
-		on(event: 'devtools-focused', listener: Function): this;
-		/**
-		 * Emitted when failed to verify the certificate for url.
-		 * The usage is the same with the "certificate-error" event of app.
-		 */
-		on(event: 'certificate-error', listener: (event: Event,
-			url: string,
-			error: string,
-			certificate: Certificate,
-			callback: (trust: boolean) => void
-		) => void): this;
-		/**
-		 * Emitted when a client certificate is requested.
-		 * The usage is the same with the "select-client-certificate" event of app.
-		 */
-		on(event: 'select-client-certificate', listener: (event: Event,
-			url: string,
-			certificateList: Certificate[],
-			callback: (certificate: Certificate) => void
-		) => void): this;
-		/**
-		 * Emitted when webContents wants to do basic auth.
-		 * The usage is the same with the "login" event of app.
-		 */
-		on(event: 'login', listener: (event: Event,
-			request: LoginRequest,
-			authInfo: LoginAuthInfo,
-			callback: (username: string, password: string) => void
-		) => void): this;
-		/**
-		 * Emitted when a result is available for webContents.findInPage request.
-		 */
-		on(event: 'found-in-page', listener: (event: Event, result: FoundInPageResult) => void): this;
-		/**
-		 * Emitted when media starts playing.
-		 */
-		on(event: 'media-started-playing', listener: Function): this;
-		/**
-		 * Emitted when media is paused or done playing.
-		 */
-		on(event: 'media-paused', listener: Function): this;
-		/**
-		 * Emitted when a page’s theme color changes. This is usually due to encountering a meta tag:
-		 * <meta name='theme-color' content='#ff0000'>
-		 */
-		on(event: 'did-change-theme-color', listener: Function): this;
-		/**
-		 * Emitted when the cursor’s type changes.
-		 * If the type parameter is custom, the image parameter will hold the custom cursor image
-		 * in a NativeImage, and the scale will hold scaling information for the image.
-		 */
-		on(event: 'cursor-changed', listener: (event: Event, type: CursorType, image?: NativeImage, scale?: number) => void): this;
-		on(event: string, listener: Function): this;
-		/**
-		 * Loads the url in the window.
-		 * @param url Must contain the protocol prefix (e.g., the http:// or file://).
-		 */
-		loadURL(url: string, options?: LoadURLOptions): void;
-		/**
-		 * Initiates a download of the resource at url without navigating.
-		 * The will-download event of session will be triggered.
-		 */
-		downloadURL(url: string): void;
-		/**
-		 * @returns The URL of current web page.
-		 */
-		getURL(): string;
-		/**
-		 * @returns The title of web page.
-		 */
-		getTitle(): string;
-		/**
-		 * @returns The favicon of the web page.
-		 */
-		getFavicon(): NativeImage;
-		/**
-		 * @returns Whether web page is still loading resources.
-		 */
-		isLoading(): boolean;
-		/**
-		 * @returns Whether web page is waiting for a first-response for the main
-		 * resource of the page.
-		 */
-		isWaitingForResponse(): boolean;
-		/**
-		 * Stops any pending navigation.
-		 */
-		stop(): void;
-		/**
-		 * Reloads current page.
-		 */
-		reload(): void;
-		/**
-		 * Reloads current page and ignores cache.
-		 */
-		reloadIgnoringCache(): void;
-		/**
-		 * @returns Whether the web page can go back.
-		 */
-		canGoBack(): boolean;
-		/**
-		 * @returns Whether the web page can go forward.
-		 */
-		canGoForward(): boolean;
-		/**
-		 * @returns Whether the web page can go to offset.
-		 */
-		canGoToOffset(offset: number): boolean;
-		/**
-		 * Clears the navigation history.
-		 */
-		clearHistory(): void;
-		/**
-		 * Makes the web page go back.
-		 */
-		goBack(): void;
-		/**
-		 * Makes the web page go forward.
-		 */
-		goForward(): void;
-		/**
-		 * Navigates to the specified absolute index.
-		 */
-		goToIndex(index: number): void;
-		/**
-		 * Navigates to the specified offset from the "current entry".
-		 */
-		goToOffset(offset: number): void;
-		/**
-		 * @returns Whether the renderer process has crashed.
-		 */
-		isCrashed(): boolean;
-		/**
-		 * Overrides the user agent for this page.
-		 */
-		setUserAgent(userAgent: string): void;
-		/**
-		 * @returns The user agent for this web page.
-		 */
-		getUserAgent(): string;
-		/**
-		 * Injects CSS into this page.
-		 */
-		insertCSS(css: string): void;
-		/**
-		 * Evaluates code in page.
-		 * @param code Code to evaluate.
-		 */
-		executeJavaScript(code: string, userGesture?: boolean, callback?: (result: any) => void): void;
-		/**
-		 * Mute the audio on the current web page.
-		 */
-		setAudioMuted(muted: boolean): void;
-		/**
-		 * @returns Whether this page has been muted.
-		 */
-		isAudioMuted(): boolean;
-		/**
-		 * Executes Edit -> Undo command in page.
-		 */
-		undo(): void;
-		/**
-		 * Executes Edit -> Redo command in page.
-		 */
-		redo(): void;
-		/**
-		 * Executes Edit -> Cut command in page.
-		 */
-		cut(): void;
-		/**
-		 * Executes Edit -> Copy command in page.
-		 */
-		copy(): void;
-		/**
-		 * Executes Edit -> Paste command in page.
-		 */
-		paste(): void;
-		/**
-		 * Executes Edit -> Paste and Match Style in page.
-		 */
-		pasteAndMatchStyle(): void;
-		/**
-		 * Executes Edit -> Delete command in page.
-		 */
-		delete(): void;
-		/**
-		 * Executes Edit -> Select All command in page.
-		 */
-		selectAll(): void;
-		/**
-		 * Executes Edit -> Unselect command in page.
-		 */
-		unselect(): void;
-		/**
-		 * Executes Edit -> Replace command in page.
-		 */
-		replace(text: string): void;
-		/**
-		 * Executes Edit -> Replace Misspelling command in page.
-		 */
-		replaceMisspelling(text: string): void;
-		/**
-		 * Inserts text to the focused element.
-		 */
-		insertText(text: string): void;
-		/**
-		 * Starts a request to find all matches for the text in the web page.
-		 * The result of the request can be obtained by subscribing to found-in-page event.
-		 * @returns The request id used for the request.
-		 */
-		findInPage(text: string, options?: FindInPageOptions): number;
-		/**
-		 * Stops any findInPage request for the webContents with the provided action.
-		 */
-		stopFindInPage(action: StopFindInPageAtion): void;
-		/**
-		 * Checks if any serviceworker is registered.
-		 */
-		hasServiceWorker(callback: (hasServiceWorker: boolean) => void): void;
-		/**
-		 * Unregisters any serviceworker if present.
-		 */
-		unregisterServiceWorker(callback: (isFulfilled: boolean) => void): void;
-		/**
-		 * Prints window's web page. When silent is set to false, Electron will pick up system's default printer and default settings for printing.
-		 * Calling window.print() in web page is equivalent to call WebContents.print({silent: false, printBackground: false}).
-		 * Note: On Windows, the print API relies on pdf.dll. If your application doesn't need print feature, you can safely remove pdf.dll in saving binary size.
-		 */
-		print(options?: PrintOptions): void;
-		/**
-		 * Prints windows' web page as PDF with Chromium's preview printing custom settings.
-		 */
-		printToPDF(options: PrintToPDFOptions, callback: (error: Error, data: Buffer) => void): void;
-		/**
-		 * Adds the specified path to DevTools workspace.
-		 */
-		addWorkSpace(path: string): void;
-		/**
-		 * Removes the specified path from DevTools workspace.
-		 */
-		removeWorkSpace(path: string): void;
-		/**
-		 * Opens the developer tools.
-		 */
-		openDevTools(options?: {
-			/**
-			 * Opens devtools in a new window.
-			 */
-			detach?: boolean;
-		}): void;
-		/**
-		 * Closes the developer tools.
-		 */
-		closeDevTools(): void;
-		/**
-		 * Returns whether the developer tools are opened.
-		 */
-		isDevToolsOpened(): boolean;
-		/**
-		 * Returns whether the developer tools are focussed.
-		 */
-		isDevToolsFocused(): boolean;
-		/**
-		 * Toggle the developer tools.
-		 */
-		toggleDevTools(): void;
-		/**
-		 * Starts inspecting element at position (x, y).
-		 */
-		inspectElement(x: number, y: number): void;
-		/**
-		 * Opens the developer tools for the service worker context.
-		 */
-		inspectServiceWorker(): void;
-		/**
-		 * Send args.. to the web page via channel in asynchronous message, the web page
-		 * can handle it by listening to the channel event of ipc module.
-		 * Note:
-		 *   1. The IPC message handler in web pages do not have a event parameter,
-		 *      which is different from the handlers on the main process.
-		 *   2. There is no way to send synchronous messages from the main process
-		 *      to a renderer process, because it would be very easy to cause dead locks.
-		 */
-		send(channel: string, ...args: any[]): void;
-		/**
-		 * Enable device emulation with the given parameters.
-		 */
-		enableDeviceEmulation(parameters: DeviceEmulationParameters): void;
-		/**
-		 * Disable device emulation.
-		 */
-		disableDeviceEmulation(): void;
-		/**
-		 * Sends an input event to the page.
-		 */
-		sendInputEvent(event: SendInputEvent): void;
-		/**
-		 * Begin subscribing for presentation events and captured frames,
-		 * The callback will be called when there is a presentation event.
-		 */
-		beginFrameSubscription(callback: (
-			/**
-			 * The frameBuffer is a Buffer that contains raw pixel data.
-			 * On most machines, the pixel data is effectively stored in 32bit BGRA format,
-			 * but the actual representation depends on the endianness of the processor
-			 * (most modern processors are little-endian, on machines with big-endian
-			 * processors the data is in 32bit ARGB format).
-			 */
-			frameBuffer: Buffer
-		) => void): void;
-		/**
-		 * End subscribing for frame presentation events.
-		 */
-		endFrameSubscription(): void;
-		/**
-		 * @returns If the process of saving page has been initiated successfully.
-		 */
-		savePage(fullPath: string, saveType: 'HTMLOnly' | 'HTMLComplete' | 'MHTML', callback?: (eror: Error) => void): boolean;
-		/**
-		 * @returns The session object used by this webContents.
-		 */
-		session: Session;
-		/**
-		 * @returns The WebContents that might own this WebContents.
-		 */
-		hostWebContents: WebContents;
-		/**
-		 * @returns The WebContents of DevTools for this WebContents.
-		 * Note: Users should never store this object because it may become null
-		 * when the DevTools has been closed.
-		 */
-		devToolsWebContents: WebContents;
-		/**
-		 * @returns Debugger API
-		 */
-		debugger: Debugger;
-	}
-
-	type NewWindowDisposition = 'default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'other';
-
-	/**
-	 * Specifies the action to take place when ending webContents.findInPage request.
-	 * 'clearSelection' - Translate the selection into a normal selection.
-	 * 'keepSelection' - Clear the selection.
-	 * 'activateSelection' - Focus and click the selection node.
-	 */
-	type StopFindInPageAtion = 'clearSelection' | 'keepSelection' | 'activateSelection';
-
-	type CursorType = 'default' | 'crosshair' | 'pointer' | 'text' | 'wait' | 'help' | 'e-resize' | 'n-resize' | 'ne-resize' | 'nw-resize' | 's-resize' | 'se-resize' | 'sw-resize' | 'w-resize' | 'ns-resize' | 'ew-resize' | 'nesw-resize' | 'nwse-resize' | 'col-resize' | 'row-resize' | 'm-panning' | 'e-panning' | 'n-panning' | 'ne-panning' | 'nw-panning' | 's-panning' | 'se-panning' |'sw-panning' | 'w-panning' | 'move' | 'vertical-text' | 'cell' | 'context-menu' | 'alias' | 'progress' | 'nodrop' | 'copy' | 'none' | 'not-allowed' | 'zoom-in' | 'zoom-out' | 'grab' | 'grabbing' | 'custom';
-
-	interface LoadURLOptions {
-		/**
-		 * HTTP Referrer URL.
-		 */
-		httpReferrer?: string;
-		/**
-		 * User agent originating the request.
-		 */
-		userAgent?: string;
-		/**
-		 * Extra headers separated by "\n"
-		 */
-		extraHeaders?: string;
-	}
-
-	interface PrintOptions {
-		/**
-		 * Don't ask user for print settings.
-		 * Defaults: false.
-		 */
-		silent?: boolean;
-		/**
-		 * Also prints the background color and image of the web page.
-		 * Defaults: false.
-		 */
-		printBackground?: boolean;
-	}
-
-	interface PrintToPDFOptions {
-		/**
-		 * Specify the type of margins to use.
-		 *   0 - default
-		 *   1 - none
-		 *   2 - minimum
-		 * Default: 0
-		 */
-		marginsType?: number;
-		/**
-		 * Specify page size of the generated PDF.
-		 * Default: A4.
-		 */
-		pageSize?: 'A3' | 'A4' | 'A5' | 'Legal' | 'Letter' | 'Tabloid';
-		/**
-		 * Whether to print CSS backgrounds.
-		 * Default: false.
-		 */
-		printBackground?: boolean;
-		/**
-		 * Whether to print selection only.
-		 * Default: false.
-		 */
-		printSelectionOnly?: boolean;
-		/**
-		 * true for landscape, false for portrait.
-		 * Default: false.
-		 */
-		landscape?: boolean;
-	}
-
-	interface Certificate {
-		/**
-		 * PEM encoded data
-		 */
-		data: Buffer;
-		issuerName: string;
-	}
-
-	interface LoginRequest {
-		method: string;
-		url: string;
-		referrer: string;
-	}
-
-	interface LoginAuthInfo {
-		isProxy: boolean;
-		scheme: string;
-		host: string;
-		port: number;
-		realm: string;
-	}
-
-	interface FindInPageOptions {
-		/**
-		 * Whether to search forward or backward, defaults to true
-		 */
-		forward?: boolean;
-		/**
-		 * Whether the operation is first request or a follow up, defaults to false.
-		 */
-		findNext?: boolean;
-		/**
-		 * Whether search should be case-sensitive, defaults to false.
-		 */
-		matchCase?: boolean;
-		/**
-		 * Whether to look only at the start of words. defaults to false.
-		 */
-		wordStart?: boolean;
-		/**
-		 * When combined with wordStart, accepts a match in the middle of a word
-		 * if the match begins with an uppercase letter followed by a lowercase
-		 * or non-letter. Accepts several other intra-word matches, defaults to false.
-		 */
-		medialCapitalAsWordStart?: boolean;
-	}
-
-	interface FoundInPageResult {
-		requestId: number;
-		/**
-		 * Indicates if more responses are to follow.
-		 */
-		finalUpdate: boolean;
-		/**
-		 * Position of the active match.
-		 */
-		activeMatchOrdinal?: number;
-		/**
-		 * Number of Matches.
-		 */
-		matches?: number;
-		/**
-		 * Coordinates of first match region.
-		 */
-		selectionArea?: any;
-	}
-
-	interface DeviceEmulationParameters {
-		/**
-		 * Specify the screen type to emulated
-		 * Default: desktop
-		 */
-		screenPosition?: 'desktop' | 'mobile';
-		/**
-		 * Set the emulated screen size (screenPosition == mobile)
-		 */
-		screenSize?: Dimension;
-		/**
-		 * Position the view on the screen (screenPosition == mobile)
-		 * Default: {x: 0, y: 0}
-		 */
-		viewPosition?: Point;
-		/**
-		 * Set the device scale factor (if zero defaults to original device scale factor)
-		 * Default: 0
-		 */
-		deviceScaleFactor: number;
-		/**
-		 * Set the emulated view size (empty means no override).
-		 */
-		viewSize?: Dimension;
-		/**
-		 * Whether emulated view should be scaled down if necessary to fit into available space
-		 * Default: false
-		 */
-		fitToView?: boolean;
-		/**
-		 * Offset of the emulated view inside available space (not in fit to view mode)
-		 * Default: {x: 0, y: 0}
-		 */
-		offset?: Point;
-		/**
-		 * Scale of emulated view inside available space (not in fit to view mode)
-		 * Default: 1
-		 */
-		scale: number;
-	}
-
-	interface SendInputEvent {
-		type: 'mouseDown' | 'mouseUp' | 'mouseEnter' | 'mouseLeave' | 'contextMenu' | 'mouseWheel' | 'mouseMove' | 'keyDown' | 'keyUp' | 'char';
-		modifiers: ('shift' | 'control' | 'alt' | 'meta' | 'isKeypad' | 'isAutoRepeat' | 'leftButtonDown' | 'middleButtonDown' | 'rightButtonDown' | 'capsLock' | 'numLock' | 'left' | 'right')[];
-	}
-
-	interface SendInputKeyboardEvent extends SendInputEvent {
-		keyCode: string;
-	}
-
-	interface SendInputMouseEvent extends SendInputEvent {
-		x: number;
-		y: number;
-		button?: 'left' | 'middle' | 'right';
-		globalX?: number;
-		globalY?: number;
-		movementX?: number;
-		movementY?: number;
-		clickCount?: number;
-	}
-
-	interface SendInputMouseWheelEvent extends SendInputEvent {
-		deltaX?: number;
-		deltaY?: number;
-		wheelTicksX?: number;
-		wheelTicksY?: number;
-		accelerationRatioX?: number;
-		accelerationRatioY?: number;
-		hasPreciseScrollingDeltas?: number;
-		canScroll?: boolean;
-	}
-
-	/**
-	 * Debugger API serves as an alternate transport for remote debugging protocol.
-	 */
-	interface Debugger extends NodeJS.EventEmitter {
-		/**
-		 * Attaches the debugger to the webContents.
-		 * @param protocolVersion Requested debugging protocol version.
-		 */
-		attach(protocolVersion?: string): void;
-		/**
-		 * @returns Whether a debugger is attached to the webContents.
-		 */
-		isAttached(): boolean;
-		/**
-		 * Detaches the debugger from the webContents.
-		 */
-		detach(): void;
-		/**
-		 * Send given command to the debugging target.
-		 * @param method Method name, should be one of the methods defined by the remote debugging protocol.
-		 * @param commandParams JSON object with request parameters.
-		 * @param callback Response defined by the ‘returns’ attribute of the command description in the remote debugging protocol.
-		 */
-		sendCommand(method: string, commandParams?: any, callback?: (error: Error, result: any) => void): void;
-		/**
-		 * Emitted when debugging session is terminated. This happens either when
-		 * webContents is closed or devtools is invoked for the attached webContents.
-		 */
-		on(event: 'detach', listener: (event: Event, reason: string) => void): this;
-		/**
-		 * Emitted whenever debugging target issues instrumentation event.
-		 * Event parameters defined by the ‘parameters’ attribute in the remote debugging protocol.
-		 */
-		on(event: 'message', listener: (event: Event, method: string, params: any) => void): this;
-		on(event: string, listener: Function): this;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/web-frame.md
-
-	/**
-	 * The web-frame module allows you to customize the rendering of the current web page.
-	 */
-	interface WebFrame {
-		/**
-		 * Changes the zoom factor to the specified factor, zoom factor is
-		 * zoom percent / 100, so 300% = 3.0.
-		 */
-		setZoomFactor(factor: number): void;
-		/**
-		 * @returns The current zoom factor.
-		 */
-		getZoomFactor(): number;
-		/**
-		 * Changes the zoom level to the specified level, 0 is "original size", and each
-		 * increment above or below represents zooming 20% larger or smaller to default
-		 * limits of 300% and 50% of original size, respectively.
-		 */
-		setZoomLevel(level: number): void;
-		/**
-		 * @returns The current zoom level.
-		 */
-		getZoomLevel(): number;
-		/**
-		 * Sets the maximum and minimum zoom level.
-		 */
-		setZoomLevelLimits(minimumLevel: number, maximumLevel: number): void;
-		/**
-		 * Sets a provider for spell checking in input fields and text areas.
-		 */
-		setSpellCheckProvider(language: string, autoCorrectWord: boolean, provider: {
-			/**
-			 * @returns Whether the word passed is correctly spelled.
-			 */
-			spellCheck: (text: string) => boolean;
-		}): void;
-		/**
-		 * Sets the scheme as secure scheme. Secure schemes do not trigger mixed content
-		 * warnings. For example, https and data are secure schemes because they cannot be
-		 * corrupted by active network attackers.
-		 */
-		registerURLSchemeAsSecure(scheme: string): void;
-		/**
-		 * Resources will be loaded from this scheme regardless of the current page’s Content Security Policy.
-		 */
-		registerURLSchemeAsBypassingCSP(scheme: string): void;
-		/**
-		 * Registers the scheme as secure, bypasses content security policy for resources,
-		 * allows registering ServiceWorker and supports fetch API.
-		 */
-		registerURLSchemeAsPrivileged(scheme: string): void;
-		/**
-		 * Inserts text to the focused element.
-		 */
-		insertText(text: string): void;
-		/**
-		 * Evaluates `code` in page.
-		 * In the browser window some HTML APIs like `requestFullScreen` can only be
-		 * invoked by a gesture from the user. Setting `userGesture` to `true` will remove
-		 * this limitation.
-		 */
-		executeJavaScript(code: string, userGesture?: boolean, callback?: (result: any) => void): void;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/web-view-tag.md
-
-	/**
-	 * Use the webview tag to embed 'guest' content (such as web pages) in your Electron app.
-	 * The guest content is contained within the webview container.
-	 * An embedded page within your app controls how the guest content is laid out and rendered.
-	 *
-	 * Unlike an iframe, the webview runs in a separate process than your app.
-	 * It doesn't have the same permissions as your web page and all interactions between your app
-	 * and embedded content will be asynchronous. This keeps your app safe from the embedded content.
-	 */
-	interface WebViewElement extends HTMLElement {
-		/**
-		 * Returns the visible URL. Writing to this attribute initiates top-level navigation.
-		 * Assigning src its own value will reload the current page.
-		 * The src attribute can also accept data URLs, such as data:text/plain,Hello, world!.
-		 */
-		src: string;
-		/**
-		 * If "on", the webview container will automatically resize within the bounds specified
-		 * by the attributes minwidth, minheight, maxwidth, and maxheight.
-		 * These constraints do not impact the webview unless autosize is enabled.
-		 * When autosize is enabled, the webview container size cannot be less than
-		 * the minimum values or greater than the maximum.
-		 */
-		autosize: string;
-		/**
-		 * If "on", the guest page in webview will have node integration and can use node APIs
-		 * like require and process to access low level system resources.
-		 */
-		nodeintegration: string;
-		/**
-		 * If "on", the guest page in webview will be able to use browser plugins.
-		 */
-		plugins: string;
-		/**
-		 * Specifies a script that will be loaded before other scripts run in the guest page.
-		 * The protocol of script's URL must be either file: or asar:,
-		 * because it will be loaded by require in guest page under the hood.
-		 *
-		 * When the guest page doesn't have node integration this script will still have access to all Node APIs,
-		 * but global objects injected by Node will be deleted after this script has finished executing.
-		 */
-		preload: string;
-		/**
-		 * Sets the referrer URL for the guest page.
-		 */
-		httpreferrer: string;
-		/**
-		 * Sets the user agent for the guest page before the page is navigated to.
-		 * Once the page is loaded, use the setUserAgent method to change the user agent.
-		 */
-		useragent: string;
-		/**
-		 * If "on", the guest page will have web security disabled.
-		 */
-		disablewebsecurity: string;
-		/**
-		 * Sets the session used by the page. If partition starts with persist:,
-		 * the page will use a persistent session available to all pages in the app with the same partition.
-		 * If there is no persist: prefix, the page will use an in-memory session.
-		 * By assigning the same partition, multiple pages can share the same session.
-		 * If the partition is unset then default session of the app will be used.
-		 *
-		 * This value can only be modified before the first navigation,
-		 * since the session of an active renderer process cannot change.
-		 * Subsequent attempts to modify the value will fail with a DOM exception.
-		 */
-		partition: string;
-		/**
-		 * If "on", the guest page will be allowed to open new windows.
-		 */
-		allowpopups: string;
-		/**
-		 * A list of strings which specifies the blink features to be enabled separated by ,.
-		 */
-		blinkfeatures: string;
-		/**
-		 * Loads the url in the webview, the url must contain the protocol prefix, e.g. the http:// or file://.
-		 */
-		loadURL(url: string, options?: LoadURLOptions): void;
-		/**
-		 * @returns URL of guest page.
-		 */
-		getURL(): string;
-		/**
-		 * @returns The title of guest page.
-		 */
-		getTitle(): string;
-		/**
-		 * @returns Whether guest page is still loading resources.
-		 */
-		isLoading(): boolean;
-		/**
-		 * Returns a boolean whether the guest page is waiting for a first-response for the main resource of the page.
-		 */
-		isWaitingForResponse(): boolean;
-		/**
-		 * Stops any pending navigation.
-		 */
-		stop(): void;
-		/**
-		 * Reloads the guest page.
-		 */
-		reload(): void;
-		/**
-		 * Reloads the guest page and ignores cache.
-		 */
-		reloadIgnoringCache(): void;
-		/**
-		 * @returns Whether the guest page can go back.
-		 */
-		canGoBack(): boolean;
-		/**
-		 * @returns Whether the guest page can go forward.
-		 */
-		canGoForward(): boolean;
-		/**
-		 * @returns Whether the guest page can go to offset.
-		 */
-		canGoToOffset(offset: number): boolean;
-		/**
-		 * Clears the navigation history.
-		 */
-		clearHistory(): void;
-		/**
-		 * Makes the guest page go back.
-		 */
-		goBack(): void;
-		/**
-		 * Makes the guest page go forward.
-		 */
-		goForward(): void;
-		/**
-		 * Navigates to the specified absolute index.
-		 */
-		goToIndex(index: number): void;
-		/**
-		 * Navigates to the specified offset from the "current entry".
-		 */
-		goToOffset(offset: boolean): void;
-		/**
-		 * @returns Whether the renderer process has crashed.
-		 */
-		isCrashed(): boolean;
-		/**
-		 * Overrides the user agent for the guest page.
-		 */
-		setUserAgent(userAgent: string): void;
-		/**
-		 * @returns The user agent for guest page.
-		 */
-		getUserAgent(): string;
-		/**
-		 * Injects CSS into the guest page.
-		 */
-		insertCSS(css: string): void;
-		/**
-		 * Evaluates code in page. If userGesture is set, it will create the user gesture context in the page.
-		 * HTML APIs like requestFullScreen, which require user action, can take advantage of this option for automation.
-		 */
-		executeJavaScript(code: string, userGesture?: boolean, callback?: (result: any) => void): void;
-		/**
-		 * Opens a DevTools window for guest page.
-		 */
-		openDevTools(): void;
-		/**
-		 * Closes the DevTools window of guest page.
-		 */
-		closeDevTools(): void;
-		/**
-		 * @returns Whether guest page has a DevTools window attached.
-		 */
-		isDevToolsOpened(): boolean;
-		/**
-		 * @returns Whether DevTools window of guest page is focused.
-		 */
-		isDevToolsFocused(): boolean;
-		/**
-		 * Starts inspecting element at position (x, y) of guest page.
-		 */
-		inspectElement(x: number, y: number): void;
-		/**
-		 * Opens the DevTools for the service worker context present in the guest page.
-		 */
-		inspectServiceWorker(): void;
-		/**
-		 * Set guest page muted.
-		 */
-		setAudioMuted(muted: boolean): void;
-		/**
-		 * @returns Whether guest page has been muted.
-		 */
-		isAudioMuted(): boolean;
-		/**
-		 * Executes editing command undo in page.
-		 */
-		undo(): void;
-		/**
-		 * Executes editing command redo in page.
-		 */
-		redo(): void;
-		/**
-		 * Executes editing command cut in page.
-		 */
-		cut(): void;
-		/**
-		 * Executes editing command copy in page.
-		 */
-		copy(): void;
-		/**
-		 * Executes editing command paste in page.
-		 */
-		paste(): void;
-		/**
-		 * Executes editing command pasteAndMatchStyle in page.
-		 */
-		pasteAndMatchStyle(): void;
-		/**
-		 * Executes editing command delete in page.
-		 */
-		delete(): void;
-		/**
-		 * Executes editing command selectAll in page.
-		 */
-		selectAll(): void;
-		/**
-		 * Executes editing command unselect in page.
-		 */
-		unselect(): void;
-		/**
-		 * Executes editing command replace in page.
-		 */
-		replace(text: string): void;
-		/**
-		 * Executes editing command replaceMisspelling in page.
-		 */
-		replaceMisspelling(text: string): void;
-		/**
-		 * Inserts text to the focused element.
-		 */
-		insertText(text: string): void;
-		/**
-		 * Starts a request to find all matches for the text in the web page.
-		 * The result of the request can be obtained by subscribing to found-in-page event.
-		 * @returns The request id used for the request.
-		 */
-		findInPage(text: string, options?: FindInPageOptions): number;
-		/**
-		 * Stops any findInPage request for the webview with the provided action.
-		 */
-		stopFindInPage(action: StopFindInPageAtion): void;
-		/**
-		 * Prints webview's web page. Same with webContents.print([options]).
-		 */
-		print(options?: PrintOptions): void;
-		/**
-		 * Prints webview's web page as PDF, Same with webContents.printToPDF(options, callback)
-		 */
-		printToPDF(options: PrintToPDFOptions, callback: (error: Error, data: Buffer) => void): void;
-		/**
-		 * Send an asynchronous message to renderer process via channel, you can also send arbitrary arguments.
-		 * The renderer process can handle the message by listening to the channel event with the ipcRenderer module.
-		 * See webContents.send for examples.
-		 */
-		send(channel: string, ...args: any[]): void;
-		/**
-		 * Sends an input event to the page.
-		 * See webContents.sendInputEvent for detailed description of event object.
-		 */
-		sendInputEvent(event: SendInputEvent): void
-		/**
-		 * @returns The WebContents associated with this webview.
-		 */
-		getWebContents(): WebContents;
-		/**
-		 * Fired when a load has committed. This includes navigation within the current document
-		 * as well as subframe document-level loads, but does not include asynchronous resource loads.
-		 */
-		addEventListener(type: 'load-commit', listener: (event: WebViewElement.LoadCommitEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when the navigation is done, i.e. the spinner of the tab will stop spinning, and the onload event is dispatched.
-		 */
-		addEventListener(type: 'did-finish-load', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * This event is like did-finish-load, but fired when the load failed or was cancelled, e.g. window.stop() is invoked.
-		 */
-		addEventListener(type: 'did-fail-load', listener: (event: WebViewElement.DidFailLoadEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when a frame has done navigation.
-		 */
-		addEventListener(type: 'did-frame-finish-load', listener: (event: WebViewElement.DidFrameFinishLoadEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Corresponds to the points in time when the spinner of the tab starts spinning.
-		 */
-		addEventListener(type: 'did-start-loading', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Corresponds to the points in time when the spinner of the tab stops spinning.
-		 */
-		addEventListener(type: 'did-stop-loading', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when details regarding a requested resource is available.
-		 * status indicates socket connection to download the resource.
-		 */
-		addEventListener(type: 'did-get-response-details', listener: (event: WebViewElement.DidGetResponseRetails) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when a redirect was received while requesting a resource.
-		 */
-		addEventListener(type: 'did-get-redirect-request', listener: (event: WebViewElement.DidGetRedirectRequestEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when document in the given frame is loaded.
-		 */
-		addEventListener(type: 'dom-ready', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when page title is set during navigation. explicitSet is false when title is synthesized from file URL.
-		 */
-		addEventListener(type: 'page-title-updated', listener: (event: WebViewElement.PageTitleUpdatedEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when page receives favicon URLs.
-		 */
-		addEventListener(type: 'page-favicon-updated', listener: (event: WebViewElement.PageFaviconUpdatedEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when page enters fullscreen triggered by HTML API.
-		 */
-		addEventListener(type: 'enter-html-full-screen', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when page leaves fullscreen triggered by HTML API.
-		 */
-		addEventListener(type: 'leave-html-full-screen', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when the guest window logs a console message.
-		 */
-		addEventListener(type: 'console-message', listener: (event: WebViewElement.ConsoleMessageEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when a result is available for webview.findInPage request.
-		 */
-		addEventListener(type: 'found-in-page', listener: (event: WebViewElement.FoundInPageEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when the guest page attempts to open a new browser window.
-		 */
-		addEventListener(type: 'new-window', listener: (event: WebViewElement.NewWindowEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Emitted when a user or the page wants to start navigation.
-		 * It can happen when the window.location object is changed or a user clicks a link in the page.
-		 *
-		 * This event will not emit when the navigation is started programmatically with APIs
-		 * like <webview>.loadURL and <webview>.back.
-		 *
-		 * It is also not emitted during in-page navigation, such as clicking anchor links
-		 * or updating the window.location.hash. Use did-navigate-in-page event for this purpose.
-		 *
-		 * Calling event.preventDefault() does NOT have any effect.
-		 */
-		addEventListener(type: 'will-navigate', listener: (event: WebViewElement.NavigateEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Emitted when a navigation is done.
-		 *
-		 * This event is not emitted for in-page navigations, such as clicking anchor links
-		 * or updating the window.location.hash. Use did-navigate-in-page event for this purpose.
-		 */
-		addEventListener(type: 'did-navigate', listener: (event: WebViewElement.NavigateEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Emitted when an in-page navigation happened.
-		 *
-		 * When in-page navigation happens, the page URL changes but does not cause
-		 * navigation outside of the page. Examples of this occurring are when anchor links
-		 * are clicked or when the DOM hashchange event is triggered.
-		 */
-		addEventListener(type: 'did-navigate-in-page', listener: (event: WebViewElement.NavigateEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when the guest page attempts to close itself.
-		 */
-		addEventListener(type: 'close', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when the guest page has sent an asynchronous message to embedder page.
-		 */
-		addEventListener(type: 'ipc-message', listener: (event: WebViewElement.IpcMessageEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when the renderer process is crashed.
-		 */
-		addEventListener(type: 'crashed', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when the gpu process is crashed.
-		 */
-		addEventListener(type: 'gpu-crashed', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when a plugin process is crashed.
-		 */
-		addEventListener(type: 'plugin-crashed', listener: (event: WebViewElement.PluginCrashedEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when the WebContents is destroyed.
-		 */
-		addEventListener(type: 'destroyed', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Emitted when media starts playing.
-		 */
-		addEventListener(type: 'media-started-playing', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Emitted when media is paused or done playing.
-		 */
-		addEventListener(type: 'media-paused', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Emitted when a page's theme color changes. This is usually due to encountering a meta tag:
-		 * <meta name='theme-color' content='#ff0000'>
-		 */
-		addEventListener(type: 'did-change-theme-color', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Emitted when DevTools is opened.
-		 */
-		addEventListener(type: 'devtools-opened', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Emitted when DevTools is closed.
-		 */
-		addEventListener(type: 'devtools-closed', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Emitted when DevTools is focused / opened.
-		 */
-		addEventListener(type: 'devtools-focused', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		addEventListener(type: string, listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-	}
-
-	namespace WebViewElement {
-		type Event = ElectronPrivate.GlobalEvent;
-
-		interface LoadCommitEvent extends Event  {
-			url: string;
-			isMainFrame: string;
-		}
-
-		interface DidFailLoadEvent extends Event  {
-			errorCode: number;
-			errorDescription: string;
-			validatedURL: string;
-		}
-
-		interface DidFrameFinishLoadEvent extends Event  {
-			isMainFrame: boolean;
-		}
-
-		interface DidGetResponseRetails extends Event  {
-			status: boolean;
-			newURL: string;
-			originalURL: string;
-			httpResponseCode: number;
-			requestMethod: string;
-			referrer: string;
-			headers: any;
-		}
-
-		interface DidGetRedirectRequestEvent extends Event {
-			oldURL: string;
-			newURL: string;
-			isMainFrame: boolean;
-			httpResponseCode: number;
-			requestMethod: string;
-			referrer: string;
-			headers: any;
-		}
-
-		interface PageTitleUpdatedEvent extends Event {
-			title: string;
-			explicitSet: string;
-		}
-
-		interface PageFaviconUpdatedEvent extends Event {
-			favicons: string[];
-		}
-
-		interface ConsoleMessageEvent extends Event {
-			level: number;
-			message: string;
-			line: number;
-			sourceId: string;
-		}
-
-		interface FoundInPageEvent extends Event {
-			result: FoundInPageResult;
-		}
-
-		interface NewWindowEvent extends Event {
-			url: string;
-			frameName: string;
-			disposition: NewWindowDisposition;
-			options: BrowserWindowOptions;
-		}
-
-		interface NavigateEvent extends Event {
-			url: string;
-		}
-
-		interface IpcMessageEvent extends Event {
-			channel: string;
-			args: any[];
-		}
-
-		interface PluginCrashedEvent extends Event {
-			name: string;
-			version: string;
-		}
-	}
-
-	/**
-	 * The BrowserWindowProxy object is returned from window.open and provides limited functionality with the child window.
-	 */
-	interface BrowserWindowProxy {
-		/**
-		 * Removes focus from the child window.
-		 */
-		blur(): void;
-		/**
-		 * Forcefully closes the child window without calling its unload event.
-		 */
-		close(): void;
-		/**
-		 * Set to true after the child window gets closed.
-		 */
-		closed: boolean;
-		/**
-		 * Evaluates the code in the child window.
-		 */
-		eval(code: string): void;
-		/**
-		 * Focuses the child window (brings the window to front).
-		 */
-		focus(): void;
-		/**
-		 * Sends a message to the child window with the specified origin or * for no origin preference.
-		 * In addition to these methods, the child window implements window.opener object with no
-		 * properties and a single method.
-		 */
-		postMessage(message: string, targetOrigin: string): void;
-	}
-
-	// https://github.com/atom/electron/blob/master/docs/api/synopsis.md
-
-	interface CommonElectron {
-		clipboard: Electron.Clipboard;
-		crashReporter: Electron.CrashReporter;
-		nativeImage: typeof Electron.NativeImage;
-		shell: Electron.Shell;
-
-		app: Electron.App;
-		autoUpdater: Electron.AutoUpdater;
-		BrowserWindow: typeof Electron.BrowserWindow;
-		contentTracing: Electron.ContentTracing;
-		dialog: Electron.Dialog;
-		ipcMain: Electron.IpcMain;
-		globalShortcut: Electron.GlobalShortcut;
-		Menu: typeof Electron.Menu;
-		MenuItem: typeof Electron.MenuItem;
-		powerMonitor: Electron.PowerMonitor;
-		powerSaveBlocker: Electron.PowerSaveBlocker;
-		protocol: Electron.Protocol;
-		screen: Electron.Screen;
-		session: typeof Electron.Session;
-		Tray: Electron.Tray;
-		hideInternalModules(): void;
-	}
-
-	interface ElectronMainAndRenderer extends CommonElectron {
-		desktopCapturer: Electron.DesktopCapturer;
-		ipcRenderer: Electron.IpcRenderer;
-		remote: Electron.Remote;
-		webFrame: Electron.WebFrame;
-	}
-}
-
-declare namespace ElectronPrivate {
-	type GlobalEvent = Event;
-}
-
-interface Document {
-	createElement(tagName: 'webview'): Electron.WebViewElement;
-}
-
-// https://github.com/atom/electron/blob/master/docs/api/window-open.md
-
-interface Window {
-	/**
-	 * Creates a new window.
-	 */
-	open(url: string, frameName?: string, features?: string): Electron.BrowserWindowProxy;
-}
-
-// https://github.com/atom/electron/blob/master/docs/api/file-object.md
-
-interface File {
-	/**
-	 * Exposes the real path of the filesystem.
-	 */
-	path: string;
-}
-
-declare module 'electron' {
-	var electron: Electron.ElectronMainAndRenderer;
-	export = electron;
-}
-
-interface NodeRequireFunction {
-	(moduleName: 'electron'): Electron.ElectronMainAndRenderer;
-}
diff --git a/gl-matrix/gl-matrix-tests.ts b/gl-matrix/gl-matrix-tests.ts
index ce5251edad..70d2556ded 100644
--- a/gl-matrix/gl-matrix-tests.ts
+++ b/gl-matrix/gl-matrix-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gl-matrix.d.ts" />
+
 
 // common
 var result: number = glMatrix.toRadian(180);
diff --git a/gl-matrix/gl-matrix.d.ts b/gl-matrix/index.d.ts
similarity index 100%
rename from gl-matrix/gl-matrix.d.ts
rename to gl-matrix/index.d.ts
diff --git a/gl-matrix/tsconfig.json b/gl-matrix/tsconfig.json
new file mode 100644
index 0000000000..80baf96a4c
--- /dev/null
+++ b/gl-matrix/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gl-matrix-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gldatepicker/gldatepicker-tests.ts b/gldatepicker/gldatepicker-tests.ts
index e967eac350..d133a5f823 100644
--- a/gldatepicker/gldatepicker-tests.ts
+++ b/gldatepicker/gldatepicker-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="gldatepicker.d.ts"/>
+/// <reference types="jquery"/>
 
 $('input').glDatePicker();
 $('#example2').glDatePicker(
diff --git a/gldatepicker/gldatepicker.d.ts b/gldatepicker/gldatepicker.d.ts
deleted file mode 100644
index 0e37b5ec75..0000000000
--- a/gldatepicker/gldatepicker.d.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-// Type definitions for glDatePicker 2.0
-// Project: http://glad.github.com/glDatePicker/
-// Definitions by: Dániel Tar <https://github.com/qcz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface GlDatePickerOffset {
-    x: number;
-    y: number;
-}
-
-interface GlDatePickerDate {
-    date: Date;
-    repeatMonth?: boolean;
-    repeatYear?: boolean;
-}
-
-interface GlDatePickerDateRange {
-    from: Date;
-    to?: Date;
-    repeatYear?: boolean;
-}
-
-interface GlDatePickerSpecialDate extends GlDatePickerDate {
-    data?: any;
-    cssClass?: string;
-}
-
-interface GlDatePickerOptions {
-    cssName?: string;
-    zIndex?: number;
-    borderSize?: number;
-    calendarOffset?: GlDatePickerOffset;
-    showAlways?: boolean;
-    hideOnClick?: boolean;
-    allowMonthSelect?: boolean;
-    allowYearSelect?: boolean;
-    todayDate?: Date;
-    selectedDate?: Date;
-    prevArrow?: string;
-    nextArrow?: string;
-    selectableDates?: GlDatePickerDate[];
-    selectableDateRange?: GlDatePickerDateRange[];
-    specialDates?: GlDatePickerSpecialDate[];
-    selectableMonths?: number[];
-    selectableYears?: number[];
-    selectableDOW?: number[];
-    monthNames?: string[];
-    dowNames?: string[];
-    dowOffset?: number;
-    onClick?: (inputElement: JQuery, cell: JQuery, date: Date, data: any) => void;
-    onHover?: (inputElement: JQuery, cell: JQuery, date: Date, data: any) => void;
-    onShow?: (calendar: JQuery) => void;
-    onHide?: (calendar: JQuery) => void;
-}
-
-interface GlDatePicker {
-    options: GlDatePickerOptions;
-
-    show(): void;
-    hide(): void;
-    render(renderCallback?: () => void): void;
-}
-
-interface JQuery {
-	glDatePicker(ret: boolean): GlDatePicker;
-	glDatePicker(options?: GlDatePickerOptions): JQuery;
-}
diff --git a/gldatepicker/index.d.ts b/gldatepicker/index.d.ts
new file mode 100644
index 0000000000..1f96e15395
--- /dev/null
+++ b/gldatepicker/index.d.ts
@@ -0,0 +1,69 @@
+// Type definitions for glDatePicker 2.0
+// Project: http://glad.github.com/glDatePicker/
+// Definitions by: Dániel Tar <https://github.com/qcz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface GlDatePickerOffset {
+    x: number;
+    y: number;
+}
+
+interface GlDatePickerDate {
+    date: Date;
+    repeatMonth?: boolean;
+    repeatYear?: boolean;
+}
+
+interface GlDatePickerDateRange {
+    from: Date;
+    to?: Date;
+    repeatYear?: boolean;
+}
+
+interface GlDatePickerSpecialDate extends GlDatePickerDate {
+    data?: any;
+    cssClass?: string;
+}
+
+interface GlDatePickerOptions {
+    cssName?: string;
+    zIndex?: number;
+    borderSize?: number;
+    calendarOffset?: GlDatePickerOffset;
+    showAlways?: boolean;
+    hideOnClick?: boolean;
+    allowMonthSelect?: boolean;
+    allowYearSelect?: boolean;
+    todayDate?: Date;
+    selectedDate?: Date;
+    prevArrow?: string;
+    nextArrow?: string;
+    selectableDates?: GlDatePickerDate[];
+    selectableDateRange?: GlDatePickerDateRange[];
+    specialDates?: GlDatePickerSpecialDate[];
+    selectableMonths?: number[];
+    selectableYears?: number[];
+    selectableDOW?: number[];
+    monthNames?: string[];
+    dowNames?: string[];
+    dowOffset?: number;
+    onClick?: (inputElement: JQuery, cell: JQuery, date: Date, data: any) => void;
+    onHover?: (inputElement: JQuery, cell: JQuery, date: Date, data: any) => void;
+    onShow?: (calendar: JQuery) => void;
+    onHide?: (calendar: JQuery) => void;
+}
+
+interface GlDatePicker {
+    options: GlDatePickerOptions;
+
+    show(): void;
+    hide(): void;
+    render(renderCallback?: () => void): void;
+}
+
+interface JQuery {
+	glDatePicker(ret: boolean): GlDatePicker;
+	glDatePicker(options?: GlDatePickerOptions): JQuery;
+}
diff --git a/gldatepicker/tsconfig.json b/gldatepicker/tsconfig.json
new file mode 100644
index 0000000000..0fdf9d9777
--- /dev/null
+++ b/gldatepicker/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gldatepicker-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/glidejs/glidejs-tests.ts b/glidejs/glidejs-tests.ts
index 67cd2bdbcf..323a0a5f07 100644
--- a/glidejs/glidejs-tests.ts
+++ b/glidejs/glidejs-tests.ts
@@ -1,5 +1,4 @@
-///<reference path="glidejs.d.ts" />
-///<reference path="../jquery/jquery.d.ts" />
+///<reference types="jquery" />
 
 // Copied from documentation
 $('.slider').glide();
diff --git a/glidejs/glidejs.d.ts b/glidejs/index.d.ts
similarity index 100%
rename from glidejs/glidejs.d.ts
rename to glidejs/index.d.ts
diff --git a/glidejs/tsconfig.json b/glidejs/tsconfig.json
new file mode 100644
index 0000000000..89e8647978
--- /dev/null
+++ b/glidejs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "glidejs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/glob-expand/glob-expand-tests.ts b/glob-expand/glob-expand-tests.ts
index fc17e5fea9..70275ea0cf 100644
--- a/glob-expand/glob-expand-tests.ts
+++ b/glob-expand/glob-expand-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./glob-expand.d.ts" />
 
 import * as expand from "glob-expand";
 
diff --git a/glob-expand/glob-expand.d.ts b/glob-expand/glob-expand.d.ts
deleted file mode 100644
index 3efec2b5cd..0000000000
--- a/glob-expand/glob-expand.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// Type definitions for glob-expand
-// Project: https://github.com/anodynos/node-glob-expand
-// Definitions by: vvakame <https://github.com/vvakame/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../glob/glob.d.ts" />
-
-declare module "glob-expand" {
-    import * as _glob from "glob";
-
-    interface Option {
-        filter?: string | ((filePath: string) => boolean);
-        cwd?: string;
-		  }
-
-    namespace expand {
-        var glob: typeof _glob;
-        var VERSION: string;
-    }
-
-    function expand(opts: Option, patterns: (string | RegExp)[]): string[];
-    function expand(opts: Option, ...patterns: (string | RegExp)[]): string[];
-    function expand(patterns: (string | RegExp)[]): string[];
-    function expand(...patterns: (string | RegExp)[]): string[];
-
-    export = expand;
-}
diff --git a/glob-expand/index.d.ts b/glob-expand/index.d.ts
new file mode 100644
index 0000000000..c69bd141ac
--- /dev/null
+++ b/glob-expand/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for glob-expand
+// Project: https://github.com/anodynos/node-glob-expand
+// Definitions by: vvakame <https://github.com/vvakame/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as glob from "../glob";
+
+interface Option {
+    filter?: string | ((filePath: string) => boolean);
+    cwd?: string;
+}
+
+type _glob = typeof glob;
+declare namespace expand {
+    var glob: _glob;
+    var VERSION: string;
+}
+
+declare function expand(opts: Option, patterns: (string | RegExp)[]): string[];
+declare function expand(opts: Option, ...patterns: (string | RegExp)[]): string[];
+declare function expand(patterns: (string | RegExp)[]): string[];
+declare function expand(...patterns: (string | RegExp)[]): string[];
+
+export = expand;
diff --git a/glob-expand/tsconfig.json b/glob-expand/tsconfig.json
new file mode 100644
index 0000000000..ac29f5303e
--- /dev/null
+++ b/glob-expand/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "glob-expand-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/glob-stream/glob-stream-tests.ts b/glob-stream/glob-stream-tests.ts
index 1f0cbd3581..84e34dfe3e 100644
--- a/glob-stream/glob-stream-tests.ts
+++ b/glob-stream/glob-stream-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="glob-stream.d.ts" />
-
-import gs = require('glob-stream');
+import gs = require('./');
 
 var read: NodeJS.ReadableStream;
 
diff --git a/glob-stream/glob-stream.d.ts b/glob-stream/glob-stream.d.ts
deleted file mode 100644
index 9c417146b6..0000000000
--- a/glob-stream/glob-stream.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// Type definitions for glob-stream v3.1.12
-// Project: http://github.com/wearefractal/glob-stream
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../glob/glob.d.ts" />
-
-declare module 'glob-stream' {
-	import glob = require('glob');
-
-	export interface Options extends glob.IOptions {
-		cwd?: string;
-		base?: string;
-		cwdbase?: boolean;
-	}
-
-	export interface Element {
-		cwd: string;
-		base: string;
-		path: string;
-	}
-
-	export function create(glob:string, opts?: Options): NodeJS.ReadableStream;
-	export function create(globs:string[], opts?: Options): NodeJS.ReadableStream;
-}
diff --git a/glob-stream/index.d.ts b/glob-stream/index.d.ts
new file mode 100644
index 0000000000..6feef15aed
--- /dev/null
+++ b/glob-stream/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for glob-stream v3.1.12
+// Project: http://github.com/wearefractal/glob-stream
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import glob = require('../glob');
+
+export interface Options extends glob.IOptions {
+    cwd?: string;
+    base?: string;
+    cwdbase?: boolean;
+}
+
+export interface Element {
+    cwd: string;
+    base: string;
+    path: string;
+}
+
+export declare function create(glob: string, opts?: Options): NodeJS.ReadableStream;
+export declare function create(globs: string[], opts?: Options): NodeJS.ReadableStream;
diff --git a/glob-stream/tsconfig.json b/glob-stream/tsconfig.json
new file mode 100644
index 0000000000..7b3d2f8a14
--- /dev/null
+++ b/glob-stream/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "glob-stream-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/glob/glob-tests.ts b/glob/glob-tests.ts
index af5ecf6d05..c2c17bbbb5 100644
--- a/glob/glob-tests.ts
+++ b/glob/glob-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="./glob.d.ts" />
-
-import glob = require("glob");
+import glob = require("./");
 var Glob = glob.Glob;
 
 (()=> {
diff --git a/glob/glob.d.ts b/glob/glob.d.ts
deleted file mode 100644
index 2957204f2c..0000000000
--- a/glob/glob.d.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-// Type definitions for Glob 5.0.10
-// Project: https://github.com/isaacs/node-glob
-// Definitions by: vvakame <https://github.com/vvakame/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../minimatch/minimatch.d.ts" />
-
-declare module "glob" {
-
-	import events = require("events");
-	import fs = require('fs');
-	import minimatch = require("minimatch");
-
-	function G(pattern: string, cb: (err: Error, matches: string[]) => void): void;
-	function G(pattern: string, options: G.IOptions, cb: (err: Error, matches: string[]) => void): void;
-
-	namespace G {
-		function sync(pattern: string, options?: IOptions): string[];
-
-		function hasMagic(pattern: string, options?: IOptions): boolean;
-
-		var Glob: IGlobStatic;
-		var GlobSync: IGlobSyncStatic;
-
-		interface IOptions extends minimatch.IOptions {
-			cwd?: string;
-			root?: string;
-			dot?: boolean;
-			nomount?: boolean;
-			mark?: boolean;
-			nosort?: boolean;
-			stat?: boolean;
-			silent?: boolean;
-			strict?: boolean;
-			cache?: { [path: string]: any /* boolean | string | string[] */ };
-			statCache?: { [path: string]: fs.Stats };
-			symlinks?: any;
-			sync?: boolean;
-			nounique?: boolean;
-			nonull?: boolean;
-			debug?: boolean;
-			nobrace?: boolean;
-			noglobstar?: boolean;
-			noext?: boolean;
-			nocase?: boolean;
-			matchBase?: any;
-			nodir?: boolean;
-			ignore?: any; /* string | string[] */
-			follow?: boolean;
-			realpath?: boolean;
-			nonegate?: boolean;
-			nocomment?: boolean;
-
-			/** Deprecated. */
-			globDebug?: boolean;
-		}
-
-		interface IGlobStatic extends events.EventEmitter {
-			new (pattern: string, cb?: (err: Error, matches: string[]) => void): IGlob;
-			new (pattern: string, options: IOptions, cb?: (err: Error, matches: string[]) => void): IGlob;
-			prototype: IGlob;
-		}
-
-		interface IGlobSyncStatic {
-			new (pattern: string, options?: IOptions): IGlobBase
-			prototype: IGlobBase;
-		}
-
-		interface IGlobBase {
-			minimatch: minimatch.IMinimatch;
-			options: IOptions;
-			aborted: boolean;
-			cache: { [path: string]: any /* boolean | string | string[] */ };
-			statCache: { [path: string]: fs.Stats };
-			symlinks: { [path: string]: boolean };
-			realpathCache: { [path: string]: string };
-			found: string[];
-		}
-
-		interface IGlob extends IGlobBase, events.EventEmitter {
-			pause(): void;
-			resume(): void;
-			abort(): void;
-
-			/** Deprecated. */
-			EOF: any;
-			/** Deprecated. */
-			paused: boolean;
-			/** Deprecated. */
-			maxDepth: number;
-			/** Deprecated. */
-			maxLength: number;
-			/** Deprecated. */
-			changedCwd: boolean;
-			/** Deprecated. */
-			cwd: string;
-			/** Deprecated. */
-			root: string;
-			/** Deprecated. */
-			error: any;
-			/** Deprecated. */
-			matches: string[];
-			/** Deprecated. */
-			log(...args: any[]): void;
-			/** Deprecated. */
-			emitMatch(m: any): void;
-		}
-	}
-
-	export = G;
-}
diff --git a/glob/index.d.ts b/glob/index.d.ts
new file mode 100644
index 0000000000..683c86a7fd
--- /dev/null
+++ b/glob/index.d.ts
@@ -0,0 +1,108 @@
+// Type definitions for Glob 5.0.10
+// Project: https://github.com/isaacs/node-glob
+// Definitions by: vvakame <https://github.com/vvakame/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import events = require("events");
+import fs = require('fs');
+import minimatch = require("../minimatch");
+
+declare function G(pattern: string, cb: (err: Error, matches: string[]) => void): void;
+declare function G(pattern: string, options: G.IOptions, cb: (err: Error, matches: string[]) => void): void;
+
+declare namespace G {
+    function sync(pattern: string, options?: IOptions): string[];
+
+    function hasMagic(pattern: string, options?: IOptions): boolean;
+
+    var Glob: IGlobStatic;
+    var GlobSync: IGlobSyncStatic;
+
+    interface IOptions extends minimatch.IOptions {
+        cwd?: string;
+        root?: string;
+        dot?: boolean;
+        nomount?: boolean;
+        mark?: boolean;
+        nosort?: boolean;
+        stat?: boolean;
+        silent?: boolean;
+        strict?: boolean;
+        cache?: { [path: string]: any /* boolean | string | string[] */ };
+        statCache?: { [path: string]: fs.Stats };
+        symlinks?: any;
+        sync?: boolean;
+        nounique?: boolean;
+        nonull?: boolean;
+        debug?: boolean;
+        nobrace?: boolean;
+        noglobstar?: boolean;
+        noext?: boolean;
+        nocase?: boolean;
+        matchBase?: any;
+        nodir?: boolean;
+        ignore?: any; /* string | string[] */
+        follow?: boolean;
+        realpath?: boolean;
+        nonegate?: boolean;
+        nocomment?: boolean;
+
+        /** Deprecated. */
+        globDebug?: boolean;
+    }
+
+    interface IGlobStatic extends events.EventEmitter {
+        new (pattern: string, cb?: (err: Error, matches: string[]) => void): IGlob;
+        new (pattern: string, options: IOptions, cb?: (err: Error, matches: string[]) => void): IGlob;
+        prototype: IGlob;
+    }
+
+    interface IGlobSyncStatic {
+        new (pattern: string, options?: IOptions): IGlobBase
+        prototype: IGlobBase;
+    }
+
+    interface IGlobBase {
+        minimatch: minimatch.IMinimatch;
+        options: IOptions;
+        aborted: boolean;
+        cache: { [path: string]: any /* boolean | string | string[] */ };
+        statCache: { [path: string]: fs.Stats };
+        symlinks: { [path: string]: boolean };
+        realpathCache: { [path: string]: string };
+        found: string[];
+    }
+
+    interface IGlob extends IGlobBase, events.EventEmitter {
+        pause(): void;
+        resume(): void;
+        abort(): void;
+
+        /** Deprecated. */
+        EOF: any;
+        /** Deprecated. */
+        paused: boolean;
+        /** Deprecated. */
+        maxDepth: number;
+        /** Deprecated. */
+        maxLength: number;
+        /** Deprecated. */
+        changedCwd: boolean;
+        /** Deprecated. */
+        cwd: string;
+        /** Deprecated. */
+        root: string;
+        /** Deprecated. */
+        error: any;
+        /** Deprecated. */
+        matches: string[];
+        /** Deprecated. */
+        log(...args: any[]): void;
+        /** Deprecated. */
+        emitMatch(m: any): void;
+    }
+}
+
+export = G;
diff --git a/glob/tsconfig.json b/glob/tsconfig.json
new file mode 100644
index 0000000000..424fefa0db
--- /dev/null
+++ b/glob/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "glob-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/globalize/globalize-tests.ts b/globalize/globalize-tests.ts
index 8caa924db1..1c4abbec41 100644
--- a/globalize/globalize-tests.ts
+++ b/globalize/globalize-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="globalize.d.ts" />
+
 
 /*Globalize.culture("fr");
 console.log(Globalize.culture().name);
diff --git a/globalize/globalize.d.ts b/globalize/index.d.ts
similarity index 100%
rename from globalize/globalize.d.ts
rename to globalize/index.d.ts
diff --git a/globalize/tsconfig.json b/globalize/tsconfig.json
new file mode 100644
index 0000000000..9b44f65189
--- /dev/null
+++ b/globalize/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "globalize-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gm/gm-tests.ts b/gm/gm-tests.ts
index e3172dfc6a..debd18ecff 100644
--- a/gm/gm-tests.ts
+++ b/gm/gm-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="gm.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import gm = require('gm');
 import stream = require('stream');
diff --git a/gm/gm.d.ts b/gm/gm.d.ts
deleted file mode 100644
index 964decdee5..0000000000
--- a/gm/gm.d.ts
+++ /dev/null
@@ -1,627 +0,0 @@
-// Type definitions for gm 1.17.0
-// Project: https://github.com/aheckmann/gm
-// Definitions by: Joel Spadin <https://github.com/ChaosinaCan>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare module "gm" {
-	import stream = require('stream');
-
-	function m(image: string): m.State;
-	function m(stream:NodeJS.ReadableStream, image?: string): m.State;
-	function m(buffer:Buffer, image?: string): m.State;
-	function m(width:number, height:number, color?:string): m.State;
-
-	namespace m {
-		export interface ClassOptions {
-			imageMagick?: boolean;
-			nativeAutoOrient?: boolean;
-		}
-
-		export interface CompareCallback {
-			(err: Error, isEqual: boolean, equality: number, raw: number): any;
-		}
-
-		export interface GetterCallback<T> {
-			(err: Error, value: T): any;
-		}
-
-		export interface WriteCallback {
-			(err: Error, stdout: string, stderr: string, cmd: string): any;
-		}
-
-		export interface ChannelInfo<T> {
-			Red: T;
-			Green: T;
-			Blue: T;
-		}
-
-		export interface CompareOptions {
-			file?: string;
-			highlightColor?: string;
-			highlightStyle?: string;
-			tolerance?: number;
-		}
-
-		export interface ColorStatistics {
-			Minimum: string;
-			Maximum: string;
-			Mean: string;
-			'Standard Deviation': string;
-		}
-
-		export interface Dimensions {
-			width: number;
-			height: number;
-		}
-
-		export interface ImageInfo {
-			'Background Color': string;
-			'Border Color': string;
-			'Channel Depths': ChannelInfo<string>;
-			'Channel Statistics': ChannelInfo<ColorStatistics>;
-			Class: string;
-			color: number;
-			Compose: string;
-			Compression: string;
-			depth: number;
-			Depth: string;
-			Dispose: string;
-			Filesize: string;
-			format: string;
-			Format: string;
-			Geometry: string;
-			Interlace: string;
-			Iterations: string;
-			'JPEG-Quality'?: string;
-			'JPEG-Colorspace'?: string;
-			'JPEG-Colorspace-Name'?: string;
-			'JPEG-Sampling-factors'?: string;
-			'Matte Color': string;
-			Orientation: string;
-			'Page geometry': string;
-			path: string;
-
-			'Profile-color'?: string;
-			'Profile-iptc'?: {
-				[key: string]: string;
-			};
-			'Profile-EXIF'?: {
-				[key: string]: string;
-			};
-			'Profile-XMP'?: string;
-			Resolution?: string;
-			size: Dimensions;
-			Signature: string;
-			Software: string;
-			Tainted: string;
-			Type: string;
-		}
-
-		export interface State {
-			// Image Operations
-			adjoin(): State;
-			affine(matrix: string): State;
-			antialias(enable: boolean): State;
-			append(image: string, ltr?: boolean): State;
-			authenticate(password: string): State;
-			autoOrient(): State;
-			backdrop(): State;
-			bitdepth(bits: number): State;
-			blackThreshold(intensity: number): State;
-			blackThreshold(red: number, green: number, blue: number, opacity?: number): State;
-			bluePrimary(x: number, y: number): State;
-			blur(radius: number, sigma?: number): State;
-			border(width: number, height: number): State;
-			borderColor(color: string): State;
-			box(color: string): State;
-			channel(type: 'Red'): State;
-			channel(type: 'Green'): State;
-			channel(type: 'Blue'): State;
-			channel(type: 'Opacity'): State;
-			channel(type: 'Matte'): State;
-			channel(type: 'Cyan'): State;
-			channel(type: 'Magenta'): State;
-			channel(type: 'Yellow'): State;
-			channel(type: 'Black'): State;
-			channel(type: 'Gray'): State;
-			channel(type: string): State;
-			charcoal(factor: number): State;
-			chop(width: number, height: number, x?: number, y?: number): State;
-			clip(): State;
-			coalesce(): State;
-			colorize(red: number, green: number, blue: number): State;
-			colorMap(type: 'shared'): State;
-			colorMap(type: 'private'): State;
-			colorMap(type: string): State;
-			colors(colors: number): State;
-			colorspace(space: 'CineonLog'): State;
-			colorspace(space: 'CMYK'): State;
-			colorspace(space: 'GRAY'): State;
-			colorspace(space: 'HSL'): State;
-			colorspace(space: 'HSB'): State;
-			colorspace(space: 'OHTA'): State;
-			colorspace(space: 'RGB'): State;
-			colorspace(space: 'Rec601Luma'): State;
-			colorspace(space: 'Rec709Luma'): State;
-			colorspace(space: 'Rec601YCbCr'): State;
-			colorspace(space: 'Rec709YCbCr'): State;
-			colorspace(space: 'Transparent'): State;
-			colorspace(space: 'XYZ'): State;
-			colorspace(space: 'YCbCr'): State;
-			colorspace(space: 'YIQ'): State;
-			colorspace(space: 'YPbPr'): State;
-			colorspace(space: 'YUV'): State;
-			colorspace(space: string): State;
-			compose(operator: 'Over'): State;
-			compose(operator: 'In'): State;
-			compose(operator: 'Out'): State;
-			compose(operator: 'Atop'): State;
-			compose(operator: 'Xor'): State;
-			compose(operator: 'Plus'): State;
-			compose(operator: 'Minus'): State;
-			compose(operator: 'Add'): State;
-			compose(operator: 'Subtract'): State;
-			compose(operator: 'Difference'): State;
-			compose(operator: 'Divide'): State;
-			compose(operator: 'Multiply'): State;
-			compose(operator: 'Bumpmap'): State;
-			compose(operator: 'Copy'): State;
-			compose(operator: 'CopyRed'): State;
-			compose(operator: 'CopyGreen'): State;
-			compose(operator: 'CopyBlue'): State;
-			compose(operator: 'CopyOpacity'): State;
-			compose(operator: 'CopyCyan'): State;
-			compose(operator: 'CopyMagenta'): State;
-			compose(operator: 'CopyYellow'): State;
-			compose(operator: 'CopyBlack'): State;
-			compose(operator: string): State;
-			compress(type: 'None'): State;
-			compress(type: 'BZip'): State;
-			compress(type: 'Fax'): State;
-			compress(type: 'Group4'): State;
-			compress(type: 'JPEG'): State;
-			compress(type: 'Lossless'): State;
-			compress(type: 'LZW'): State;
-			compress(type: 'RLE'): State;
-			compress(type: 'Zip'): State;
-			compress(type: 'LZMA'): State;
-			compress(type: string): State;
-			contrast(multiplier: number): State;
-			convolve(kernel: string): State;
-			createDirectories(): State;
-			crop(width: number, height: number, x?: number, y?: number, percent?: boolean): State;
-			cycle(amount: number): State;
-			deconstruct(): State;
-			define(): State;
-			delay(milliseconds: number): State;
-			density(width: number, height: number): State;
-			despeckle(): State;
-			displace(horizontal: number, vertical: number): State;
-			display(xServer: string): State;
-			dispose(method: 'Undefined'): State;
-			dispose(method: 'None'): State;
-			dispose(method: 'Background'): State;
-			dispose(method: 'Previous'): State;
-			dispose(method: string): State;
-			dissolve(percent: number): State;
-			dither(enable?: boolean): State;
-			edge(radius?: number): State;
-			emboss(radius?: number): State;
-			encoding(encoding: 'AdobeCustom'): State;
-			encoding(encoding: 'AdobeExpert'): State;
-			encoding(encoding: 'AdobeStandard'): State;
-			encoding(encoding: 'AppleRoman'): State;
-			encoding(encoding: 'BIG5'): State;
-			encoding(encoding: 'GB2312'): State;
-			encoding(encoding: 'Latin 2'): State;
-			encoding(encoding: 'None'): State;
-			encoding(encoding: 'SJIScode'): State;
-			encoding(encoding: 'Symbol'): State;
-			encoding(encoding: 'Unicode'): State;
-			encoding(encoding: 'Wansung'): State;
-			encoding(encoding: string): State;
-			endian(type: 'MSB'): State;
-			endian(type: 'LSB'): State;
-			endian(type: 'Native'): State;
-			endian(type: string): State;
-			enhance(): State;
-			equalize(): State;
-			extent(width: number, height: number, options?: string): State;
-			file(filename: string): State;
-			filter(type: 'Point'): State;
-			filter(type: 'Box'): State;
-			filter(type: 'Triangle'): State;
-			filter(type: 'Hermite'): State;
-			filter(type: 'Hanning'): State;
-			filter(type: 'Hamming'): State;
-			filter(type: 'Blackman'): State;
-			filter(type: 'Gaussian'): State;
-			filter(type: 'Quadratic'): State;
-			filter(type: 'Cubic'): State;
-			filter(type: 'Catrom'): State;
-			filter(type: 'Mitchell'): State;
-			filter(type: 'Lanczos'): State;
-			filter(type: 'Bessel'): State;
-			filter(type: 'Sinc'): State;
-			filter(type: string): State;
-			flatten(): State;
-			flip(): State;
-			flop(): State;
-			foreground(color: string): State;
-			frame(width: number, height: number, outerBevelWidth: number, outBevelHeight: number): State;
-			fuzz(distance: number, percent?: boolean): State;
-			gamma(r: number, g: number, b: number): State;
-			gaussian(radius: number, sigma?: number): State;
-			/** Width and height are specified in percents */
-			geometry(width: number, height: number, option: '%'): State;
-			/** Specify maximum area in pixels */
-			geometry(width: number, height: number, option: '@'): State;
-			/** Ignore aspect ratio */
-			geometry(width: number, height: number, option: '!'): State;
-			/** Width and height are minimum values */
-			geometry(width: number, height: number, option: '^'): State;
-			/** Change dimensions only if image is smaller than width or height */
-			geometry(width: number, height: number, option: '<'): State;
-			/** Change dimensions only if image is larger than width or height */
-			geometry(width: number, height: number, option: '>'): State;
-			geometry(width: number, height?: number, option?: string): State;
-			geometry(geometry: string): State;
-			greenPrimary(x: number, y: number): State;
-			gravity(direction: 'NorthWest'): State;
-			gravity(direction: 'North'): State;
-			gravity(direction: 'NorthEast'): State;
-			gravity(direction: 'West'): State;
-			gravity(direction: 'Center'): State;
-			gravity(direction: 'East'): State;
-			gravity(direction: 'SouthWest'): State;
-			gravity(direction: 'South'): State;
-			gravity(direction: 'SouthEast'): State;
-			gravity(direction: string): State;
-			highlightColor(color: string): State;
-			highlightStyle(style: 'Assign'): State;
-			highlightStyle(style: 'Threshold'): State;
-			highlightStyle(style: 'Tint'): State;
-			highlightStyle(style: 'XOR'): State;
-			highlightStyle(style: string): State;
-			iconGeometry(geometry: string): State;
-			implode(factor?: number): State;
-			intent(type: 'Absolute'): State;
-			intent(type: 'Perceptual'): State;
-			intent(type: 'Relative'): State;
-			intent(type: 'Saturation'): State;
-			intent(type: string): State;
-			interlace(type: 'None'): State;
-			interlace(type: 'Line'): State;
-			interlace(type: 'Plane'): State;
-			interlace(type: 'Partition'): State;
-			interlace(type: string): State;
-			label(name: string): State;
-			lat(width: number, height: number, offset: number, percent?: boolean): State;
-			level(blackPoint: number, gamma: number, whitePoint: number, percent?: boolean): State;
-			limit(type: 'disk', val: string): State;
-			limit(type: 'file', val: string): State;
-			limit(type: 'map', val: string): State;
-			limit(type: 'memory', val: string): State;
-			limit(type: 'pixels', val: string): State;
-			limit(type: 'threads', val: string): State;
-			limit(type: string, val: string): State;
-			list(type: string): State;
-			list(type: 'Color'): State;
-			list(type: 'Delegate'): State;
-			list(type: 'Format'): State;
-			list(type: 'Magic'): State;
-			list(type: 'Module'): State;
-			list(type: 'Resource'): State;
-			list(type: 'Type'): State;
-			log(format: string): State;
-			loop(iterations: number): State;
-			lower(width: number, height: number): State;
-			magnify(factor: number): State;
-			map(filename: string): State;
-			mask(filename: string): State;
-			matte(): State;
-			matteColor(color: string): State;
-			maximumError(limit: number): State;
-			median(radius?: number): State;
-			minify(factor: number): State;
-			mode(mode: 'frame'): State;
-			mode(mode: 'unframe'): State;
-			mode(mode: 'concatenate'): State;
-			mode(mode: string): State;
-			modulate(b: number, s: number, h: number): State;
-			monitor(): State;
-			monochrome(): State;
-			morph(otherImg: string, outName: string, callback?: WriteCallback): State;
-			morph(otherImg: string[], outName: string, callback?: WriteCallback): State;
-			mosaic(): State;
-			motionBlur(radius: number, sigma?: number, angle?: number): State;
-			name(): State;
-			negative(): State;
-			noise(type: 'uniform'): State;
-			noise(type: 'gaussian'): State;
-			noise(type: 'multiplicative'): State;
-			noise(type: 'impulse'): State;
-			noise(type: 'laplacian'): State;
-			noise(type: 'poisson'): State;
-			noise(type: string): State;
-			noise(radius: number): State;
-			noop(): State;
-			normalize(): State;
-			opaque(color: string): State;
-			operator(channel: string, operator: 'Add', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'And', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Assign', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Depth', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Divide', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Gamma', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Negate', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'LShift', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Log', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Max', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Min', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Multiply', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Or', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Pow', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'RShift', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Subtract', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Threshold', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Threshold-White', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Threshold-White-Negate', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Threshold-Black', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Threshold-Black-Negate', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Xor', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Noise-Gaussian', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Noise-Impulse', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Noise-Laplacian', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Noise-Multiplicative', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Noise-Poisson', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Noise-Random', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Noise-Uniform', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: string, rvalue: number, percent?: boolean): State;
-			orderedDither(channelType: 'All', NxN: string): State;
-			orderedDither(channelType: 'Intensity', NxN: string): State;
-			orderedDither(channelType: 'Red', NxN: string): State;
-			orderedDither(channelType: 'Green', NxN: string): State;
-			orderedDither(channelType: 'Blue', NxN: string): State;
-			orderedDither(channelType: 'Cyan', NxN: string): State;
-			orderedDither(channelType: 'Magenta', NxN: string): State;
-			orderedDither(channelType: 'Yellow', NxN: string): State;
-			orderedDither(channelType: 'Black', NxN: string): State;
-			orderedDither(channelType: 'Opacity', NxN: string): State;
-			orderedDither(channelType: string, NxN: string): State;
-			outputDirectory(directory: string): State;
-			page(width: number, height: number, arg?: '%'): State;
-			page(width: number, height: number, arg?: '!'): State;
-			page(width: number, height: number, arg?: '<'): State;
-			page(width: number, height: number, arg?: '>'): State;
-			page(width: number, height: number, arg?: string): State;
-			pause(seconds: number): State;
-			pen(color: string): State;
-			ping(): State;
-			pointSize(size: number): State;
-			noProfile(): State;
-			preview(type: 'Rotate'): State;
-			preview(type: 'Shear'): State;
-			preview(type: 'Roll'): State;
-			preview(type: 'Hue'): State;
-			preview(type: 'Saturation'): State;
-			preview(type: 'Brightness'): State;
-			preview(type: 'Gamma'): State;
-			preview(type: 'Spiff'): State;
-			preview(type: 'Dull'): State;
-			preview(type: 'Grayscale'): State;
-			preview(type: 'Quantize'): State;
-			preview(type: 'Despeckle'): State;
-			preview(type: 'ReduceNoise'): State;
-			preview(type: 'AddNoise'): State;
-			preview(type: 'Sharpen'): State;
-			preview(type: 'Blur'): State;
-			preview(type: 'Threshold'): State;
-			preview(type: 'EdgeDetect'): State;
-			preview(type: 'Spread'): State;
-			preview(type: 'Shade'): State;
-			preview(type: 'Raise'): State;
-			preview(type: 'Segment'): State;
-			preview(type: 'Solarize'): State;
-			preview(type: 'Swirl'): State;
-			preview(type: 'Implode'): State;
-			preview(type: 'Wave'): State;
-			preview(type: 'OilPaint'): State;
-			preview(type: 'CharcoalDrawing'): State;
-			preview(type: 'JPEG'): State;
-			preview(type: string): State;
-			paint(radius: number): State;
-			process(command: string): State;
-			profile(filename: string): State;
-			progress(): State;
-			randomThreshold(channelType: 'All', LOWxHIGH: string): State;
-			randomThreshold(channelType: 'Intensity', LOWxHIGH: string): State;
-			randomThreshold(channelType: 'Red', LOWxHIGH: string): State;
-			randomThreshold(channelType: 'Green', LOWxHIGH: string): State;
-			randomThreshold(channelType: 'Blue', LOWxHIGH: string): State;
-			randomThreshold(channelType: 'Cyan', LOWxHIGH: string): State;
-			randomThreshold(channelType: 'Magenta', LOWxHIGH: string): State;
-			randomThreshold(channelType: 'Yellow', LOWxHIGH: string): State;
-			randomThreshold(channelType: 'Black', LOWxHIGH: string): State;
-			randomThreshold(channelType: 'Opacity', LOWxHIGH: string): State;
-			randomThreshold(channelType: string, LOWxHIGH: string): State;
-			quality(level: number): State;
-			raise(width: number, height: number): State;
-			recolor(matrix: string): State;
-			redPrimary(x: number, y: number): State;
-			region(width: number, height: number, x?: number, y?: number): State;
-			remote(): State;
-			render(): State;
-			repage(reset: '+'): State;
-			repage(reset: string): State;
-			repage(width: number, height: number, xoff: number, yoff: number, arg?: string): State;
-			sample(geometry: string): State;
-			samplingFactor(horizontalFactor: number, verticalFactor: number): State;
-			rawSize(width: number, height: number, offset?: number): State;
-			resample(horizontal: number, vertical: number): State;
-			/** Width and height are specified in percents */
-			resize(width: number, height: number, option: '%'): State;
-			/** Specify maximum area in pixels */
-			resize(width: number, height: number, option: '@'): State;
-			/** Ignore aspect ratio */
-			resize(width: number, height: number, option: '!'): State;
-			/** Width and height are minimum values */
-			resize(width: number, height: number, option: '^'): State;
-			/** Change dimensions only if image is smaller than width or height */
-			resize(width: number, height: number, option: '<'): State;
-			/** Change dimensions only if image is larger than width or height */
-			resize(width: number, height: number, option: '>'): State;
-			resize(width: number, height?: number, option?: string): State;
-			roll(horizontal: number, vertical: number): State;
-			rotate(backgroundColor: string, degrees: number): State;
-			scene(index: number): State;
-			scenes(start: number, end: number): State;
-			scale(width: number, height: number): State;
-			screen(): State;
-			segment(clustherThreshold: number, smoothingThreshold: number): State;
-			sepia(): State;
-			set(attribute: string, value: string): State;
-			setFormat(format: string): State;
-			shade(azimuth: number, elevation: number): State;
-			shadow(radius: number, sigma?: number): State;
-			sharedMemory(): State;
-			shave(width: number, height: number, percent?: boolean): State;
-			sharpen(radius: number, sigma?: number): State;
-			shear(xDegrees: number, yDegress: number): State;
-			silent(): State;
-			snaps(count: number): State;
-			solarize(threshold: number): State;
-			spread(amount: number): State;
-			stegano(offset: number): State;
-			stereo(): State;
-			strip(): State;
-			swirl(degrees: number): State;
-			textFont(font: string): State;
-			threshold(value: number, percent?: boolean): State;
-			thumb(width: number, height: number, outName: string, callback: WriteCallback): State;
-			thumb(width: number, height: number, outName: string, quality: number, callback: WriteCallback): State;
-			thumb(width: number, height: number, outName: string, quality: number, align: 'topleft', callback: WriteCallback): State;
-			thumb(width: number, height: number, outName: string, quality: number, align: 'center', callback: WriteCallback): State;
-			thumb(width: number, height: number, outName: string, quality: number, align: string, callback: WriteCallback): State;
-			tile(filename: string): State;
-			title(title: string): State;
-			transform(color: string): State;
-			transparent(color: string): State;
-			treeDepth(depth: number): State;
-			trim(): State;
-			type(type: 'Bilevel'): State;
-			type(type: 'Grayscale'): State;
-			type(type: 'Palette'): State;
-			type(type: 'PaletteMatte'): State;
-			type(type: 'TrueColor'): State;
-			type(type: 'TrueColorMatte'): State;
-			type(type: 'ColorSeparation'): State;
-			type(type: 'ColorSeparationMatte'): State;
-			type(type: 'Optimize'): State;
-			type(type: string): State;
-			update(seconds: number): State;
-			units(type: 'Undefined'): State;
-			units(type: 'PixelsPerInch'): State;
-			units(type: 'PixelsPerCentimeter'): State;
-			units(type: string): State;
-			unsharp(radius: number, sigma?: number, amount?: number, threshold?: number): State;
-			usePixmap(): State;
-			view(): State;
-			virtualPixel(method: 'Constant'): State;
-			virtualPixel(method: 'Edge'): State;
-			virtualPixel(method: 'Mirror'): State;
-			virtualPixel(method: 'Tile'): State;
-			virtualPixel(method: string): State;
-			visual(type: 'StaticGray'): State;
-			visual(type: 'GrayScale'): State;
-			visual(type: 'StaticColor'): State;
-			visual(type: 'PseudoColor'): State;
-			visual(type: 'TrueColor'): State;
-			visual(type: 'DirectColor'): State;
-			visual(type: 'default'): State;
-			visual(type: string): State;
-			watermark(brightness: number, saturation: number): State;
-			wave(amplitude: number, wavelength: number): State;
-			whitePoint(x: number, y: number): State;
-			whiteThreshold(intensity: number): State;
-			whiteThreshold(red: number, green: number, blue: number, opacity?: number): State;
-			window(id: string): State;
-			windowGroup(): State;
-
-			// Getters
-			color(callback: GetterCallback<number>): State;
-			depth(callback: GetterCallback<number>): State;
-			filesize(callback: GetterCallback<string>): State;
-			format(callback: GetterCallback<string>): State;
-			identify(callback: GetterCallback<ImageInfo>): State;
-			res(callback: GetterCallback<string>): State;
-			size(callback: GetterCallback<Dimensions>): State;
-			orientation(callback: GetterCallback<string>): State;
-
-			// Drawing Operations
-			draw(args: string): State;
-			drawArc(x0: number, y0: number, x1: number, y1: number, r0: number, r1: number): State;
-			drawBezier(x0: number, y0: number, x1: number, y1: number): State;
-			drawBezier(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number): State;
-			drawBezier(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number, ...coords: number[]): State;
-			drawCircle(x0: number, y0: number, x1: number, y1: number): State;
-			drawEllipse(x0: number, y0: number, rx: number, ry: number, a0: number, a1: number): State;
-			drawLine(x0: number, y0: number, x1: number, y1: number): State;
-			drawPoint(x: number, y: number): State;
-			drawPolygon(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number): State;
-			drawPolygon(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number, ...coords: number[]): State;
-			drawPolyline(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number): State;
-			drawPolyline(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number, ...coords: number[]): State;
-			drawRectangle(x0: number, y0: number, x1: number, y1: number): State;
-			drawRectangle(x0: number, y0: number, x1: number, y1: number, rc: number): State;
-			drawRectangle(x0: number, y0: number, x1: number, y1: number, wc: number, hc: number): State;
-			drawText(x: number, y: number, text: string, gravity: 'NorthWest'): State;
-			drawText(x: number, y: number, text: string, gravity: 'North'): State;
-			drawText(x: number, y: number, text: string, gravity: 'NorthEast'): State;
-			drawText(x: number, y: number, text: string, gravity: 'West'): State;
-			drawText(x: number, y: number, text: string, gravity: 'Center'): State;
-			drawText(x: number, y: number, text: string, gravity: 'East'): State;
-			drawText(x: number, y: number, text: string, gravity: 'SouthWest'): State;
-			drawText(x: number, y: number, text: string, gravity: 'South'): State;
-			drawText(x: number, y: number, text: string, gravity: 'SouthEast'): State;
-			drawText(x: number, y: number, text: string, gravity?: string): State;
-			fill(color: string): State;
-			font(name: string, size?: number): State;
-			fontSize(size: number): State;
-			stroke(color: string, width?: number): State;
-			strokeWidth(width: number): State;
-			setDraw(property: 'color', x: number, y: number, method: 'point'): State;
-			setDraw(property: 'color', x: number, y: number, method: 'replace'): State;
-			setDraw(property: 'color', x: number, y: number, method: 'floodfill'): State;
-			setDraw(property: 'color', x: number, y: number, method: 'filltoborder'): State;
-			setDraw(property: 'color', x: number, y: number, method: 'reset'): State;
-			setDraw(property: 'matte', x: number, y: number, method: 'point'): State;
-			setDraw(property: 'matte', x: number, y: number, method: 'replace'): State;
-			setDraw(property: 'matte', x: number, y: number, method: 'floodfill'): State;
-			setDraw(property: 'matte', x: number, y: number, method: 'filltoborder'): State;
-			setDraw(property: 'matte', x: number, y: number, method: 'reset'): State;
-			setDraw(property: string, x: number, y: number, method: string): State;
-
-			// Commands
-			stream(callback?: WriteCallback): stream.PassThrough;
-			stream(format: string, callback?: WriteCallback): stream.PassThrough;
-			toBuffer(callback: (err: Error, buffer: Buffer) => any): stream.PassThrough;
-			toBuffer(format: string, callback: (err: Error, buffer: Buffer) => any): stream.PassThrough;
-			write(filename: string, callback: WriteCallback): void;
-		}
-
-		export interface SubClass {
-			(image: string): State;
-		}
-
-		export function compare(filename1: string, filename2: string, callback: CompareCallback): void;
-		export function compare(filename1: string, filename2: string, tolerance: number, callback: CompareCallback): void;
-		export function compare(filename1: string, filename2: string, options: CompareOptions, callback: CompareCallback): void;
-
-		export function subClass(options: ClassOptions): SubClass;
-	}
-
-	export = m;
-}
diff --git a/gm/index.d.ts b/gm/index.d.ts
new file mode 100644
index 0000000000..93174e9b24
--- /dev/null
+++ b/gm/index.d.ts
@@ -0,0 +1,626 @@
+// Type definitions for gm 1.17.0
+// Project: https://github.com/aheckmann/gm
+// Definitions by: Joel Spadin <https://github.com/ChaosinaCan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+import stream = require('stream');
+
+declare function m(image: string): m.State;
+declare function m(stream: NodeJS.ReadableStream, image?: string): m.State;
+declare function m(buffer: Buffer, image?: string): m.State;
+declare function m(width: number, height: number, color?: string): m.State;
+
+declare namespace m {
+    export interface ClassOptions {
+        imageMagick?: boolean;
+        nativeAutoOrient?: boolean;
+    }
+
+    export interface CompareCallback {
+        (err: Error, isEqual: boolean, equality: number, raw: number): any;
+    }
+
+    export interface GetterCallback<T> {
+        (err: Error, value: T): any;
+    }
+
+    export interface WriteCallback {
+        (err: Error, stdout: string, stderr: string, cmd: string): any;
+    }
+
+    export interface ChannelInfo<T> {
+        Red: T;
+        Green: T;
+        Blue: T;
+    }
+
+    export interface CompareOptions {
+        file?: string;
+        highlightColor?: string;
+        highlightStyle?: string;
+        tolerance?: number;
+    }
+
+    export interface ColorStatistics {
+        Minimum: string;
+        Maximum: string;
+        Mean: string;
+        'Standard Deviation': string;
+    }
+
+    export interface Dimensions {
+        width: number;
+        height: number;
+    }
+
+    export interface ImageInfo {
+        'Background Color': string;
+        'Border Color': string;
+        'Channel Depths': ChannelInfo<string>;
+        'Channel Statistics': ChannelInfo<ColorStatistics>;
+        Class: string;
+        color: number;
+        Compose: string;
+        Compression: string;
+        depth: number;
+        Depth: string;
+        Dispose: string;
+        Filesize: string;
+        format: string;
+        Format: string;
+        Geometry: string;
+        Interlace: string;
+        Iterations: string;
+        'JPEG-Quality'?: string;
+        'JPEG-Colorspace'?: string;
+        'JPEG-Colorspace-Name'?: string;
+        'JPEG-Sampling-factors'?: string;
+        'Matte Color': string;
+        Orientation: string;
+        'Page geometry': string;
+        path: string;
+
+        'Profile-color'?: string;
+        'Profile-iptc'?: {
+            [key: string]: string;
+        };
+        'Profile-EXIF'?: {
+            [key: string]: string;
+        };
+        'Profile-XMP'?: string;
+        Resolution?: string;
+        size: Dimensions;
+        Signature: string;
+        Software: string;
+        Tainted: string;
+        Type: string;
+    }
+
+    export interface State {
+        // Image Operations
+        adjoin(): State;
+        affine(matrix: string): State;
+        antialias(enable: boolean): State;
+        append(image: string, ltr?: boolean): State;
+        authenticate(password: string): State;
+        autoOrient(): State;
+        backdrop(): State;
+        bitdepth(bits: number): State;
+        blackThreshold(intensity: number): State;
+        blackThreshold(red: number, green: number, blue: number, opacity?: number): State;
+        bluePrimary(x: number, y: number): State;
+        blur(radius: number, sigma?: number): State;
+        border(width: number, height: number): State;
+        borderColor(color: string): State;
+        box(color: string): State;
+        channel(type: 'Red'): State;
+        channel(type: 'Green'): State;
+        channel(type: 'Blue'): State;
+        channel(type: 'Opacity'): State;
+        channel(type: 'Matte'): State;
+        channel(type: 'Cyan'): State;
+        channel(type: 'Magenta'): State;
+        channel(type: 'Yellow'): State;
+        channel(type: 'Black'): State;
+        channel(type: 'Gray'): State;
+        channel(type: string): State;
+        charcoal(factor: number): State;
+        chop(width: number, height: number, x?: number, y?: number): State;
+        clip(): State;
+        coalesce(): State;
+        colorize(red: number, green: number, blue: number): State;
+        colorMap(type: 'shared'): State;
+        colorMap(type: 'private'): State;
+        colorMap(type: string): State;
+        colors(colors: number): State;
+        colorspace(space: 'CineonLog'): State;
+        colorspace(space: 'CMYK'): State;
+        colorspace(space: 'GRAY'): State;
+        colorspace(space: 'HSL'): State;
+        colorspace(space: 'HSB'): State;
+        colorspace(space: 'OHTA'): State;
+        colorspace(space: 'RGB'): State;
+        colorspace(space: 'Rec601Luma'): State;
+        colorspace(space: 'Rec709Luma'): State;
+        colorspace(space: 'Rec601YCbCr'): State;
+        colorspace(space: 'Rec709YCbCr'): State;
+        colorspace(space: 'Transparent'): State;
+        colorspace(space: 'XYZ'): State;
+        colorspace(space: 'YCbCr'): State;
+        colorspace(space: 'YIQ'): State;
+        colorspace(space: 'YPbPr'): State;
+        colorspace(space: 'YUV'): State;
+        colorspace(space: string): State;
+        compose(operator: 'Over'): State;
+        compose(operator: 'In'): State;
+        compose(operator: 'Out'): State;
+        compose(operator: 'Atop'): State;
+        compose(operator: 'Xor'): State;
+        compose(operator: 'Plus'): State;
+        compose(operator: 'Minus'): State;
+        compose(operator: 'Add'): State;
+        compose(operator: 'Subtract'): State;
+        compose(operator: 'Difference'): State;
+        compose(operator: 'Divide'): State;
+        compose(operator: 'Multiply'): State;
+        compose(operator: 'Bumpmap'): State;
+        compose(operator: 'Copy'): State;
+        compose(operator: 'CopyRed'): State;
+        compose(operator: 'CopyGreen'): State;
+        compose(operator: 'CopyBlue'): State;
+        compose(operator: 'CopyOpacity'): State;
+        compose(operator: 'CopyCyan'): State;
+        compose(operator: 'CopyMagenta'): State;
+        compose(operator: 'CopyYellow'): State;
+        compose(operator: 'CopyBlack'): State;
+        compose(operator: string): State;
+        compress(type: 'None'): State;
+        compress(type: 'BZip'): State;
+        compress(type: 'Fax'): State;
+        compress(type: 'Group4'): State;
+        compress(type: 'JPEG'): State;
+        compress(type: 'Lossless'): State;
+        compress(type: 'LZW'): State;
+        compress(type: 'RLE'): State;
+        compress(type: 'Zip'): State;
+        compress(type: 'LZMA'): State;
+        compress(type: string): State;
+        contrast(multiplier: number): State;
+        convolve(kernel: string): State;
+        createDirectories(): State;
+        crop(width: number, height: number, x?: number, y?: number, percent?: boolean): State;
+        cycle(amount: number): State;
+        deconstruct(): State;
+        define(): State;
+        delay(milliseconds: number): State;
+        density(width: number, height: number): State;
+        despeckle(): State;
+        displace(horizontal: number, vertical: number): State;
+        display(xServer: string): State;
+        dispose(method: 'Undefined'): State;
+        dispose(method: 'None'): State;
+        dispose(method: 'Background'): State;
+        dispose(method: 'Previous'): State;
+        dispose(method: string): State;
+        dissolve(percent: number): State;
+        dither(enable?: boolean): State;
+        edge(radius?: number): State;
+        emboss(radius?: number): State;
+        encoding(encoding: 'AdobeCustom'): State;
+        encoding(encoding: 'AdobeExpert'): State;
+        encoding(encoding: 'AdobeStandard'): State;
+        encoding(encoding: 'AppleRoman'): State;
+        encoding(encoding: 'BIG5'): State;
+        encoding(encoding: 'GB2312'): State;
+        encoding(encoding: 'Latin 2'): State;
+        encoding(encoding: 'None'): State;
+        encoding(encoding: 'SJIScode'): State;
+        encoding(encoding: 'Symbol'): State;
+        encoding(encoding: 'Unicode'): State;
+        encoding(encoding: 'Wansung'): State;
+        encoding(encoding: string): State;
+        endian(type: 'MSB'): State;
+        endian(type: 'LSB'): State;
+        endian(type: 'Native'): State;
+        endian(type: string): State;
+        enhance(): State;
+        equalize(): State;
+        extent(width: number, height: number, options?: string): State;
+        file(filename: string): State;
+        filter(type: 'Point'): State;
+        filter(type: 'Box'): State;
+        filter(type: 'Triangle'): State;
+        filter(type: 'Hermite'): State;
+        filter(type: 'Hanning'): State;
+        filter(type: 'Hamming'): State;
+        filter(type: 'Blackman'): State;
+        filter(type: 'Gaussian'): State;
+        filter(type: 'Quadratic'): State;
+        filter(type: 'Cubic'): State;
+        filter(type: 'Catrom'): State;
+        filter(type: 'Mitchell'): State;
+        filter(type: 'Lanczos'): State;
+        filter(type: 'Bessel'): State;
+        filter(type: 'Sinc'): State;
+        filter(type: string): State;
+        flatten(): State;
+        flip(): State;
+        flop(): State;
+        foreground(color: string): State;
+        frame(width: number, height: number, outerBevelWidth: number, outBevelHeight: number): State;
+        fuzz(distance: number, percent?: boolean): State;
+        gamma(r: number, g: number, b: number): State;
+        gaussian(radius: number, sigma?: number): State;
+        /** Width and height are specified in percents */
+        geometry(width: number, height: number, option: '%'): State;
+        /** Specify maximum area in pixels */
+        geometry(width: number, height: number, option: '@'): State;
+        /** Ignore aspect ratio */
+        geometry(width: number, height: number, option: '!'): State;
+        /** Width and height are minimum values */
+        geometry(width: number, height: number, option: '^'): State;
+        /** Change dimensions only if image is smaller than width or height */
+        geometry(width: number, height: number, option: '<'): State;
+        /** Change dimensions only if image is larger than width or height */
+        geometry(width: number, height: number, option: '>'): State;
+        geometry(width: number, height?: number, option?: string): State;
+        geometry(geometry: string): State;
+        greenPrimary(x: number, y: number): State;
+        gravity(direction: 'NorthWest'): State;
+        gravity(direction: 'North'): State;
+        gravity(direction: 'NorthEast'): State;
+        gravity(direction: 'West'): State;
+        gravity(direction: 'Center'): State;
+        gravity(direction: 'East'): State;
+        gravity(direction: 'SouthWest'): State;
+        gravity(direction: 'South'): State;
+        gravity(direction: 'SouthEast'): State;
+        gravity(direction: string): State;
+        highlightColor(color: string): State;
+        highlightStyle(style: 'Assign'): State;
+        highlightStyle(style: 'Threshold'): State;
+        highlightStyle(style: 'Tint'): State;
+        highlightStyle(style: 'XOR'): State;
+        highlightStyle(style: string): State;
+        iconGeometry(geometry: string): State;
+        implode(factor?: number): State;
+        intent(type: 'Absolute'): State;
+        intent(type: 'Perceptual'): State;
+        intent(type: 'Relative'): State;
+        intent(type: 'Saturation'): State;
+        intent(type: string): State;
+        interlace(type: 'None'): State;
+        interlace(type: 'Line'): State;
+        interlace(type: 'Plane'): State;
+        interlace(type: 'Partition'): State;
+        interlace(type: string): State;
+        label(name: string): State;
+        lat(width: number, height: number, offset: number, percent?: boolean): State;
+        level(blackPoint: number, gamma: number, whitePoint: number, percent?: boolean): State;
+        limit(type: 'disk', val: string): State;
+        limit(type: 'file', val: string): State;
+        limit(type: 'map', val: string): State;
+        limit(type: 'memory', val: string): State;
+        limit(type: 'pixels', val: string): State;
+        limit(type: 'threads', val: string): State;
+        limit(type: string, val: string): State;
+        list(type: string): State;
+        list(type: 'Color'): State;
+        list(type: 'Delegate'): State;
+        list(type: 'Format'): State;
+        list(type: 'Magic'): State;
+        list(type: 'Module'): State;
+        list(type: 'Resource'): State;
+        list(type: 'Type'): State;
+        log(format: string): State;
+        loop(iterations: number): State;
+        lower(width: number, height: number): State;
+        magnify(factor: number): State;
+        map(filename: string): State;
+        mask(filename: string): State;
+        matte(): State;
+        matteColor(color: string): State;
+        maximumError(limit: number): State;
+        median(radius?: number): State;
+        minify(factor: number): State;
+        mode(mode: 'frame'): State;
+        mode(mode: 'unframe'): State;
+        mode(mode: 'concatenate'): State;
+        mode(mode: string): State;
+        modulate(b: number, s: number, h: number): State;
+        monitor(): State;
+        monochrome(): State;
+        morph(otherImg: string, outName: string, callback?: WriteCallback): State;
+        morph(otherImg: string[], outName: string, callback?: WriteCallback): State;
+        mosaic(): State;
+        motionBlur(radius: number, sigma?: number, angle?: number): State;
+        name(): State;
+        negative(): State;
+        noise(type: 'uniform'): State;
+        noise(type: 'gaussian'): State;
+        noise(type: 'multiplicative'): State;
+        noise(type: 'impulse'): State;
+        noise(type: 'laplacian'): State;
+        noise(type: 'poisson'): State;
+        noise(type: string): State;
+        noise(radius: number): State;
+        noop(): State;
+        normalize(): State;
+        opaque(color: string): State;
+        operator(channel: string, operator: 'Add', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'And', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Assign', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Depth', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Divide', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Gamma', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Negate', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'LShift', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Log', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Max', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Min', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Multiply', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Or', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Pow', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'RShift', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Subtract', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Threshold', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Threshold-White', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Threshold-White-Negate', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Threshold-Black', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Threshold-Black-Negate', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Xor', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Noise-Gaussian', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Noise-Impulse', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Noise-Laplacian', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Noise-Multiplicative', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Noise-Poisson', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Noise-Random', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Noise-Uniform', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: string, rvalue: number, percent?: boolean): State;
+        orderedDither(channelType: 'All', NxN: string): State;
+        orderedDither(channelType: 'Intensity', NxN: string): State;
+        orderedDither(channelType: 'Red', NxN: string): State;
+        orderedDither(channelType: 'Green', NxN: string): State;
+        orderedDither(channelType: 'Blue', NxN: string): State;
+        orderedDither(channelType: 'Cyan', NxN: string): State;
+        orderedDither(channelType: 'Magenta', NxN: string): State;
+        orderedDither(channelType: 'Yellow', NxN: string): State;
+        orderedDither(channelType: 'Black', NxN: string): State;
+        orderedDither(channelType: 'Opacity', NxN: string): State;
+        orderedDither(channelType: string, NxN: string): State;
+        outputDirectory(directory: string): State;
+        page(width: number, height: number, arg?: '%'): State;
+        page(width: number, height: number, arg?: '!'): State;
+        page(width: number, height: number, arg?: '<'): State;
+        page(width: number, height: number, arg?: '>'): State;
+        page(width: number, height: number, arg?: string): State;
+        pause(seconds: number): State;
+        pen(color: string): State;
+        ping(): State;
+        pointSize(size: number): State;
+        noProfile(): State;
+        preview(type: 'Rotate'): State;
+        preview(type: 'Shear'): State;
+        preview(type: 'Roll'): State;
+        preview(type: 'Hue'): State;
+        preview(type: 'Saturation'): State;
+        preview(type: 'Brightness'): State;
+        preview(type: 'Gamma'): State;
+        preview(type: 'Spiff'): State;
+        preview(type: 'Dull'): State;
+        preview(type: 'Grayscale'): State;
+        preview(type: 'Quantize'): State;
+        preview(type: 'Despeckle'): State;
+        preview(type: 'ReduceNoise'): State;
+        preview(type: 'AddNoise'): State;
+        preview(type: 'Sharpen'): State;
+        preview(type: 'Blur'): State;
+        preview(type: 'Threshold'): State;
+        preview(type: 'EdgeDetect'): State;
+        preview(type: 'Spread'): State;
+        preview(type: 'Shade'): State;
+        preview(type: 'Raise'): State;
+        preview(type: 'Segment'): State;
+        preview(type: 'Solarize'): State;
+        preview(type: 'Swirl'): State;
+        preview(type: 'Implode'): State;
+        preview(type: 'Wave'): State;
+        preview(type: 'OilPaint'): State;
+        preview(type: 'CharcoalDrawing'): State;
+        preview(type: 'JPEG'): State;
+        preview(type: string): State;
+        paint(radius: number): State;
+        process(command: string): State;
+        profile(filename: string): State;
+        progress(): State;
+        randomThreshold(channelType: 'All', LOWxHIGH: string): State;
+        randomThreshold(channelType: 'Intensity', LOWxHIGH: string): State;
+        randomThreshold(channelType: 'Red', LOWxHIGH: string): State;
+        randomThreshold(channelType: 'Green', LOWxHIGH: string): State;
+        randomThreshold(channelType: 'Blue', LOWxHIGH: string): State;
+        randomThreshold(channelType: 'Cyan', LOWxHIGH: string): State;
+        randomThreshold(channelType: 'Magenta', LOWxHIGH: string): State;
+        randomThreshold(channelType: 'Yellow', LOWxHIGH: string): State;
+        randomThreshold(channelType: 'Black', LOWxHIGH: string): State;
+        randomThreshold(channelType: 'Opacity', LOWxHIGH: string): State;
+        randomThreshold(channelType: string, LOWxHIGH: string): State;
+        quality(level: number): State;
+        raise(width: number, height: number): State;
+        recolor(matrix: string): State;
+        redPrimary(x: number, y: number): State;
+        region(width: number, height: number, x?: number, y?: number): State;
+        remote(): State;
+        render(): State;
+        repage(reset: '+'): State;
+        repage(reset: string): State;
+        repage(width: number, height: number, xoff: number, yoff: number, arg?: string): State;
+        sample(geometry: string): State;
+        samplingFactor(horizontalFactor: number, verticalFactor: number): State;
+        rawSize(width: number, height: number, offset?: number): State;
+        resample(horizontal: number, vertical: number): State;
+        /** Width and height are specified in percents */
+        resize(width: number, height: number, option: '%'): State;
+        /** Specify maximum area in pixels */
+        resize(width: number, height: number, option: '@'): State;
+        /** Ignore aspect ratio */
+        resize(width: number, height: number, option: '!'): State;
+        /** Width and height are minimum values */
+        resize(width: number, height: number, option: '^'): State;
+        /** Change dimensions only if image is smaller than width or height */
+        resize(width: number, height: number, option: '<'): State;
+        /** Change dimensions only if image is larger than width or height */
+        resize(width: number, height: number, option: '>'): State;
+        resize(width: number, height?: number, option?: string): State;
+        roll(horizontal: number, vertical: number): State;
+        rotate(backgroundColor: string, degrees: number): State;
+        scene(index: number): State;
+        scenes(start: number, end: number): State;
+        scale(width: number, height: number): State;
+        screen(): State;
+        segment(clustherThreshold: number, smoothingThreshold: number): State;
+        sepia(): State;
+        set(attribute: string, value: string): State;
+        setFormat(format: string): State;
+        shade(azimuth: number, elevation: number): State;
+        shadow(radius: number, sigma?: number): State;
+        sharedMemory(): State;
+        shave(width: number, height: number, percent?: boolean): State;
+        sharpen(radius: number, sigma?: number): State;
+        shear(xDegrees: number, yDegress: number): State;
+        silent(): State;
+        snaps(count: number): State;
+        solarize(threshold: number): State;
+        spread(amount: number): State;
+        stegano(offset: number): State;
+        stereo(): State;
+        strip(): State;
+        swirl(degrees: number): State;
+        textFont(font: string): State;
+        threshold(value: number, percent?: boolean): State;
+        thumb(width: number, height: number, outName: string, callback: WriteCallback): State;
+        thumb(width: number, height: number, outName: string, quality: number, callback: WriteCallback): State;
+        thumb(width: number, height: number, outName: string, quality: number, align: 'topleft', callback: WriteCallback): State;
+        thumb(width: number, height: number, outName: string, quality: number, align: 'center', callback: WriteCallback): State;
+        thumb(width: number, height: number, outName: string, quality: number, align: string, callback: WriteCallback): State;
+        tile(filename: string): State;
+        title(title: string): State;
+        transform(color: string): State;
+        transparent(color: string): State;
+        treeDepth(depth: number): State;
+        trim(): State;
+        type(type: 'Bilevel'): State;
+        type(type: 'Grayscale'): State;
+        type(type: 'Palette'): State;
+        type(type: 'PaletteMatte'): State;
+        type(type: 'TrueColor'): State;
+        type(type: 'TrueColorMatte'): State;
+        type(type: 'ColorSeparation'): State;
+        type(type: 'ColorSeparationMatte'): State;
+        type(type: 'Optimize'): State;
+        type(type: string): State;
+        update(seconds: number): State;
+        units(type: 'Undefined'): State;
+        units(type: 'PixelsPerInch'): State;
+        units(type: 'PixelsPerCentimeter'): State;
+        units(type: string): State;
+        unsharp(radius: number, sigma?: number, amount?: number, threshold?: number): State;
+        usePixmap(): State;
+        view(): State;
+        virtualPixel(method: 'Constant'): State;
+        virtualPixel(method: 'Edge'): State;
+        virtualPixel(method: 'Mirror'): State;
+        virtualPixel(method: 'Tile'): State;
+        virtualPixel(method: string): State;
+        visual(type: 'StaticGray'): State;
+        visual(type: 'GrayScale'): State;
+        visual(type: 'StaticColor'): State;
+        visual(type: 'PseudoColor'): State;
+        visual(type: 'TrueColor'): State;
+        visual(type: 'DirectColor'): State;
+        visual(type: 'default'): State;
+        visual(type: string): State;
+        watermark(brightness: number, saturation: number): State;
+        wave(amplitude: number, wavelength: number): State;
+        whitePoint(x: number, y: number): State;
+        whiteThreshold(intensity: number): State;
+        whiteThreshold(red: number, green: number, blue: number, opacity?: number): State;
+        window(id: string): State;
+        windowGroup(): State;
+
+        // Getters
+        color(callback: GetterCallback<number>): State;
+        depth(callback: GetterCallback<number>): State;
+        filesize(callback: GetterCallback<string>): State;
+        format(callback: GetterCallback<string>): State;
+        identify(callback: GetterCallback<ImageInfo>): State;
+        res(callback: GetterCallback<string>): State;
+        size(callback: GetterCallback<Dimensions>): State;
+        orientation(callback: GetterCallback<string>): State;
+
+        // Drawing Operations
+        draw(args: string): State;
+        drawArc(x0: number, y0: number, x1: number, y1: number, r0: number, r1: number): State;
+        drawBezier(x0: number, y0: number, x1: number, y1: number): State;
+        drawBezier(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number): State;
+        drawBezier(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number, ...coords: number[]): State;
+        drawCircle(x0: number, y0: number, x1: number, y1: number): State;
+        drawEllipse(x0: number, y0: number, rx: number, ry: number, a0: number, a1: number): State;
+        drawLine(x0: number, y0: number, x1: number, y1: number): State;
+        drawPoint(x: number, y: number): State;
+        drawPolygon(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number): State;
+        drawPolygon(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number, ...coords: number[]): State;
+        drawPolyline(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number): State;
+        drawPolyline(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number, ...coords: number[]): State;
+        drawRectangle(x0: number, y0: number, x1: number, y1: number): State;
+        drawRectangle(x0: number, y0: number, x1: number, y1: number, rc: number): State;
+        drawRectangle(x0: number, y0: number, x1: number, y1: number, wc: number, hc: number): State;
+        drawText(x: number, y: number, text: string, gravity: 'NorthWest'): State;
+        drawText(x: number, y: number, text: string, gravity: 'North'): State;
+        drawText(x: number, y: number, text: string, gravity: 'NorthEast'): State;
+        drawText(x: number, y: number, text: string, gravity: 'West'): State;
+        drawText(x: number, y: number, text: string, gravity: 'Center'): State;
+        drawText(x: number, y: number, text: string, gravity: 'East'): State;
+        drawText(x: number, y: number, text: string, gravity: 'SouthWest'): State;
+        drawText(x: number, y: number, text: string, gravity: 'South'): State;
+        drawText(x: number, y: number, text: string, gravity: 'SouthEast'): State;
+        drawText(x: number, y: number, text: string, gravity?: string): State;
+        fill(color: string): State;
+        font(name: string, size?: number): State;
+        fontSize(size: number): State;
+        stroke(color: string, width?: number): State;
+        strokeWidth(width: number): State;
+        setDraw(property: 'color', x: number, y: number, method: 'point'): State;
+        setDraw(property: 'color', x: number, y: number, method: 'replace'): State;
+        setDraw(property: 'color', x: number, y: number, method: 'floodfill'): State;
+        setDraw(property: 'color', x: number, y: number, method: 'filltoborder'): State;
+        setDraw(property: 'color', x: number, y: number, method: 'reset'): State;
+        setDraw(property: 'matte', x: number, y: number, method: 'point'): State;
+        setDraw(property: 'matte', x: number, y: number, method: 'replace'): State;
+        setDraw(property: 'matte', x: number, y: number, method: 'floodfill'): State;
+        setDraw(property: 'matte', x: number, y: number, method: 'filltoborder'): State;
+        setDraw(property: 'matte', x: number, y: number, method: 'reset'): State;
+        setDraw(property: string, x: number, y: number, method: string): State;
+
+        // Commands
+        stream(callback?: WriteCallback): stream.PassThrough;
+        stream(format: string, callback?: WriteCallback): stream.PassThrough;
+        toBuffer(callback: (err: Error, buffer: Buffer) => any): stream.PassThrough;
+        toBuffer(format: string, callback: (err: Error, buffer: Buffer) => any): stream.PassThrough;
+        write(filename: string, callback: WriteCallback): void;
+    }
+
+    export interface SubClass {
+        (image: string): State;
+    }
+
+    export function compare(filename1: string, filename2: string, callback: CompareCallback): void;
+    export function compare(filename1: string, filename2: string, tolerance: number, callback: CompareCallback): void;
+    export function compare(filename1: string, filename2: string, options: CompareOptions, callback: CompareCallback): void;
+
+    export function subClass(options: ClassOptions): SubClass;
+}
+
+export = m;
diff --git a/gm/tsconfig.json b/gm/tsconfig.json
new file mode 100644
index 0000000000..f789d7a3e0
--- /dev/null
+++ b/gm/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gm-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/goJS/goJS-tests.ts b/go/goJS-tests.ts
similarity index 98%
rename from goJS/goJS-tests.ts
rename to go/goJS-tests.ts
index 4a84eb83cc..8992e506f2 100644
--- a/goJS/goJS-tests.ts
+++ b/go/goJS-tests.ts
@@ -3,7 +3,7 @@
 
 /* Copyright (C) 1998-2016 by Northwoods Software Corporation. */
 
-/// <reference path="goJS.d.ts" />
+import go = require("go");
 
 class CustomLink extends go.Link {
     constructor() {
@@ -155,7 +155,7 @@ function init() {
                        o => o.diagram.commandHandler.canUngroupSelection())
             );
 
-    function nodeInfo(d) {  // Tooltip info for a node data object
+    function nodeInfo(d: any) {  // Tooltip info for a node data object
         var str = "Node " + d.key + ": " + d.text + "\n";
         if (d.group)
             str += "member of " + d.group;
@@ -203,7 +203,7 @@ function init() {
 
     // Define the appearance and behavior for Links:
 
-    function linkInfo(d) {  // Tooltip info for a link data object
+    function linkInfo(d: any) {  // Tooltip info for a link data object
         return "Link:\nfrom " + d.from + " to " + d.to;
     }
 
diff --git a/go/index.d.ts b/go/index.d.ts
new file mode 100644
index 0000000000..cb9918ff1f
--- /dev/null
+++ b/go/index.d.ts
@@ -0,0 +1,9462 @@
+// Type definitions for GoJS v1.6.0
+// Project: http://gojs.net
+// Definitions by: Northwoods Software <https://github.com/NorthwoodsSoftware>
+// Definitions: https://github.com/NorthwoodsSoftware/GoJS
+
+/* Copyright (C) 1998-2016 by Northwoods Software Corporation. */
+
+declare namespace go {
+    /** A number in place of a Margin object is treated as a uniform Margin with that thickness */
+    type MarginLike = Margin | number;
+
+    /** A string in place of a Brush object is treated as a Solid Brush of that color. */
+    type BrushLike = Brush | string;
+
+    /** A Key is the type of the unique identifier managed by Models for each node data object. */
+    type Key = string | number;
+
+    /** Either name a property or get the value of a property from an object. */
+    type PropertyAccessor = string | ((data: any, newval: any) => any);
+
+    /** A constructor */
+    type Constructor = new (...args: Array<any>) => Object;
+
+    /**
+    * An adornment is a special kind of Part that is associated with another Part,
+    * the Adornment.adornedPart.
+    * Adornments are normally associated with a particular GraphObject in the adorned part --
+    * that is the value of .adornedObject.
+    * However, the .adornedObject may be null, in which case the .adornedPart will also be null.
+    */
+    class Adornment extends Part {
+        /**
+        * @param {EnumValue=} type if not supplied, the default Panel type is Panel.Position.
+        */
+        constructor(type?: EnumValue);
+
+        /**Gets or sets the GraphObject that is adorned.*/
+        adornedObject: GraphObject;
+
+        /**This read-only property returns the Part that contains the adorned object.*/
+        adornedPart: Part;
+
+        /**This read-only property returns a Placeholder that this Adornment may contain in its visual tree.*/
+        placeholder: Placeholder;
+    }
+
+    /**
+    * This class handles animations in a Diagram.  Each Diagram has one, the Diagram.animationManager.
+    */
+    class AnimationManager {
+        /**You do not normally need to create an instance of this class because one already exists as the Diagram.animationManager, which you can modify.*/
+        constructor();
+
+        /**Gets or sets the duration for animations, in milliseconds. The default value is 600 milliseconds.*/
+        duration: number;
+
+        /**This read-only property is true when the AnimationManager is currently animating.*/
+        isAnimating: boolean;
+
+        /**Gets or sets whether this AnimationManager operates. The default value is true.*/
+        isEnabled: boolean;
+
+        /** Gets or sets whether an animation is performed on an initial layout. The default value is true.*/
+        isInitial: boolean;
+
+        /**This read-only property is true when the animation manager is in the middle of an animation tick.*/
+        isTicking: boolean;
+
+        /**
+        * Stops any running animation and updates the Diagram to its final state.
+        */
+        stopAnimation(): void;
+    }
+
+    /**
+    * The Diagram.commandHandler implements various
+    * commands such as CommandHandler.deleteSelection or CommandHandler.redo.
+    * The CommandHandler includes keyboard event handling to interpret
+    * key presses as commands.
+    */
+    class CommandHandler {
+        /**
+        * The constructor produces a CommandHandler with the default key bindings.
+        */
+        constructor();
+
+        /**Gets or sets a data object that is copied by .groupSelection when creating a new Group. The default value is null. The value must be an Object or null.*/
+        archetypeGroupData: any;
+
+        /**Gets or sets whether copySelection should also copy Links that connect with selected Nodes.*/
+        copiesConnectedLinks: boolean;
+
+        /**Gets or sets whether copySelection and copyToClipboard copy the node data property whose value is the containing group data's key. The default value is false.*/
+        copiesGroupKey: boolean;
+
+        /**Gets or sets whether copySelection and copyToClipboard copy the node data property whose value is the tree-parent node data's key. The default value is false.*/
+        copiesParentKey: boolean;
+
+        /**Gets or sets whether .copySelection should also copy subtrees. The default value is false.*/
+        copiesTree: boolean;
+
+        /**Gets or sets the Diagram.scale set by resetZoom. The default value is 1.0.*/
+        defaultScale: number;
+
+        /**Gets or sets whether .deleteSelection should also delete subtrees. The default value is false.*/
+        deletesTree: boolean;
+
+        /**Gets or sets whether .deleteSelection should also delete links that are connected with deleted nodes. The default value is true.*/
+        deletesConnectedLinks: boolean;
+
+        /**This read-only property returns the Diagram that is using this CommandHandler.*/
+        diagram: Diagram;
+
+        /**Gets or sets the predicate that determines whether or not a node may become a member of a group. The default predicate is null, which is equivalent to simply returning true.*/
+        memberValidation: (g: Group, p: Part) => boolean;
+
+        /**Gets or sets the amount by which .decreaseZoom and .increaseZoom change the Diagram.scale. The default value is 1.05 (5%).*/
+        zoomFactor: number;
+
+        /**
+        * Make sure all of the unnested Parts in the given collection are removed from any containing Groups.
+        * @param {Iterable<Part>} coll a collection of Parts.
+        * @param {boolean=} check whether to call .isValidMember to confirm that changing the Part to be a top-level Part is valid.
+        */
+        addTopLevelParts(coll: Iterable<Part>, check?: boolean): boolean;
+
+        /**
+        * This predicate controls whether the user can collapse expanded Groups.
+        * @param {Group=} group if supplied, ignore the selection and consider collapsing this particular Group.
+        */
+        canCollapseSubGraph(group?: Group): boolean;
+
+        /**
+        * This predicate controls whether the user can collapse expanded subtrees of Nodes.
+        * @param {Node=} node if supplied, ignore the selection and consider collapsing this particular Node.
+        */
+        canCollapseTree(node?: Node): boolean;
+
+        /**
+        * This predicate controls whether or not the user can invoke the .copySelection command.
+        */
+        canCopySelection(): boolean;
+
+        /**
+        * This predicate controls whether or not the user can invoke the .cutSelection command.
+        */
+        canCutSelection(): boolean;
+
+        /**
+        * This predicate controls whether or not the user can invoke the .decreaseZoom command.
+        * @param {number=} factor This defaults to 1/.zoomFactor.  The value should be less than one.
+        */
+        canDecreaseZoom(factor?: number): boolean;
+
+        /**
+        * This predicate controls whether or not the user can invoke the .deleteSelection command.
+        */
+        canDeleteSelection(): boolean;
+
+        /**
+        * This predicate controls whether or not the user can invoke the .editTextBlock command.
+        * @param {TextBlock=} textblock the TextBlock to consider editing.
+        */
+        canEditTextBlock(textblock?: TextBlock): boolean;
+
+        /**
+        * This predicate controls whether the user can expand collapsed Groups.
+        * @param {Group=} group if supplied, ignore the selection and consider expanding this particular Group.
+        */
+        canExpandSubGraph(group?: Group): boolean;
+
+        /**
+        * This predicate controls whether the user can expand collapsed subtrees of Nodes.
+        * @param {Node=} node if supplied, ignore the selection and consider expanding this particular Node.
+        */
+        canExpandTree(node?: Node): boolean;
+
+        /**
+        * This predicate controls whether or not the user can invoke the .groupSelection command.
+        */
+        canGroupSelection(): boolean;
+
+        /**
+        * This predicate controls whether or not the user can invoke the .increaseZoom command.
+        * @param {number=} factor This defaults to .zoomFactor.  The value should be greater than one.
+        */
+        canIncreaseZoom(factor?: number): boolean;
+
+        /**
+        * This predicate controls whether or not the user can invoke the .pasteSelection command.
+        */
+        canPasteSelection(): boolean;
+
+        /**
+        * This predicate controls whether or not the user can invoke the .redo command.
+        */
+        canRedo(): boolean;
+
+        /**
+        * This predicate controls whether or not the user can invoke the .resetZoom command.
+        * @param {number=} newscale This defaults to 1.  The value should be greater than zero.
+        */
+        canResetZoom(newscale?: number): boolean;
+
+        /**
+        * This predicate controls whether or not the user can invoke the scrollToPart command.
+        * This returns false if there is no argument Part and there are no selected Parts.
+        * @this {CommandHandler}
+        * @param {Part=} part This defaults to the first selected Part of Diagram.selection
+        * @return {boolean}
+        * This returns true if Diagram.allowHorizontalScroll and Diagram.allowVerticalScroll are true.
+        */
+        canScrollToPart(part?: Part): boolean;
+
+        /**
+        * This predicate controls whether or not the user can invoke the .selectAll command.
+        */
+        canSelectAll(): boolean;
+
+        /**
+        * This predicate controls whether or not the user can invoke the .showContextMenu command.
+        * @param {GraphObject|Diagram=} obj a GraphObject or Diagram with a contextMenu defined.
+        * If none is given, this method will use the first selected object, or else the Diagram.
+        */
+        canShowContextMenu(obj?: GraphObject | Diagram): boolean;
+
+        /**
+        * This predicate controls whether the user may stop the current tool.
+        */
+        canStopCommand(): boolean;
+
+        /**
+        * This predicate controls whether or not the user can invoke the .undo command.
+        */
+        canUndo(): boolean;
+
+        /**
+        * This predicate controls whether or not the user can invoke the .ungroupSelection command.
+        * @param {Group=} group if supplied, ignore the selection and consider ungrouping this particular Group.
+        */
+        canUngroupSelection(group?: Group): boolean;
+
+        /**
+        * This predicate controls whether or not the user can invoke the .zoomToFit command.
+        */
+        canZoomToFit(): boolean;
+
+        /**
+        * Collapse all expanded selected Groups.
+        * @param {Group=} group if supplied, ignore the selection and collapse this particular Group.
+        */
+        collapseSubGraph(group?: Group): void;
+
+        /**
+        * Collapse all expanded selected Nodes.
+        * @param {Node=} node if supplied, ignore the selection and collapse this particular Node subtree.
+        */
+        collapseTree(node?: Node): void;
+
+        /**
+        * Copy the currently selected parts, Diagram.selection, from the Diagram into the clipboard.
+        */
+        copySelection(): void;
+
+        /**
+        * This makes a copy of the given collection of Parts and stores it in a static variable acting as the clipboard.
+        * @param {Iterable<Part>} coll A collection of Parts.
+        */
+        copyToClipboard(coll: Iterable<Part>): void;
+
+        /**
+        * Execute a .copySelection followed by a .deleteSelection.
+        */
+        cutSelection(): void;
+
+        /**
+        * Decrease the Diagram.scale by a given factor.
+        * @param {number=} factor This defaults to 1/.zoomFactor.  The value should be less than one.
+        */
+        decreaseZoom(factor?: number): void;
+
+        /**
+        * Delete the currently selected parts from the diagram.
+        */
+        deleteSelection(): void;
+
+        /**
+        * This is called by tools to handle keyboard commands.
+        */
+        doKeyDown(): void;
+
+        /**
+        * This is called by tools to handle keyboard commands.
+        */
+        doKeyUp(): void;
+
+        /**
+        * Start in-place editing of a TextBlock in the selected Part.
+        * @param {TextBlock=} textblock the TextBlock to start editing.
+        */
+        editTextBlock(textblock?: TextBlock): void;
+
+        /**
+        * Expand all collapsed selected Groups.
+        * @param {Group=} group if supplied, ignore the selection and expand this particular Group.
+        */
+        expandSubGraph(group?: Group): void;
+
+        /**
+        * Expand all collapsed selected Nodes.
+        * @param {Node=} node if supplied, ignore the selection and collapse this particular Node subtree.
+        */
+        expandTree(node?: Node): void;
+
+        /**
+        * Add a copy of .archetypeGroupData and add it to the diagram's model to create a new Group and then add the selected Parts to that new group.
+        */
+        groupSelection(): void;
+
+        /**
+        * Increase the Diagram.scale by a given factor.
+        * @param {number=} factor This defaults to .zoomFactor.  The value should be greater than one.
+        */
+        increaseZoom(factor?: Number): void;
+
+        /**
+        * This predicate is called to determine whether a Node may be added as a member of a Group.
+        * @param {Group} group this may be null if the node is being added as a top-level node.
+        * @param {Part} part a Part, usually a Node, possibly another Group, but not a Link or an Adornment.
+        */
+        isValidMember(group: Group, part: Part): boolean;
+
+        /**
+        * If the clipboard holds a collection of Parts, and if the Model.dataFormat matches that stored in the clipboard, this makes a copy of the clipboard's parts and adds the copies to this Diagram.
+        */
+        pasteFromClipboard(): Set<Part>;
+
+        /**
+        * Copy the contents of the clipboard into this diagram, and make those new parts the new selection.
+        * @param {Point=} pos Point at which to center the newly pasted parts; if not present the parts are not moved.
+        */
+        pasteSelection(pos?: Point): void;
+
+        /**
+        * Call UndoManager.redo.
+        */
+        redo(): void;
+
+        /**
+        * Set the Diagram.scale to a new scale value, by default 1.
+        * @param {number=} newscale This defaults to 1.  The value should be greater than zero.
+        */
+        resetZoom(newscale?: number): void;
+
+        /**
+        * This command scrolls the diagram to make a highlighted or selected Part visible in the viewport.
+        * Call this command repeatedly to cycle through the Diagram.highlighteds collection,
+        * if there are any Parts in that collection, or else in the Diagram.selection collection,
+        * scrolling to each one in turn.
+        * <p>
+        * This is normally invoked by the <code>Space</code> keyboard shortcut.
+        * If there is no argument and there is no highlighted or selected Part, this command does nothing.
+        * @expose
+        * @this {CommandHandler}
+        * @param {Part=} part This defaults to the first highlighted Part of Diagram.highlighteds,
+        *                     or, if there are no highlighted Parts, the first selected Part.
+        */
+        scrollToPart(part?: Part): void;
+
+        /**
+        * Select all of the selectable Parts in the diagram.
+        */
+        selectAll(): void;
+
+        /**
+        * Open the context menu of a given GraphObject.
+        * The given GraphObject must have a GraphObject.contextMenu
+        * defined in order to show anything.
+        * @param {GraphObject|Diagram=} obj a GraphObject or Diagram with a contextMenu defined.
+        * If none is given, this method will use the first selected object, or else the Diagram.
+        */
+        showContextMenu(obj?: GraphObject | Diagram): void;
+
+        /**
+        * Cancel the operation of the current tool.
+        */
+        stopCommand(): void;
+
+        /**
+        * Call UndoManager.undo.
+        */
+        undo(): void;
+
+        /**
+        * Remove the group from the diagram without removing its members from the diagram.
+        * @param {Group=} group if supplied, ignore the selection and consider ungrouping this particular Group.
+        */
+        ungroupSelection(group?: Group): void;
+
+        /**
+        * Change the Diagram.scale so that the Diagram.documentBounds fits within the viewport.
+        */
+        zoomToFit(): void;
+    }
+
+    /**
+    * A Diagram is associated with an HTML DIV element. Constructing a Diagram creates
+    * an HTML Canvas element which it places inside of the given DIV element, in addition to several helper divs.
+    * GoJS will manage the contents of this DIV, and the contents should not be modified otherwise,
+    * though the given DIV may be styled (background, border, etc) and positioned as needed.
+    */
+    class Diagram {
+        /**
+        * Construct an empty Diagram for a particular DIV HTML element.
+        * @param {HTMLDivElement} div A reference to a DIV HTML element in the DOM.
+        * If no DIV is supplied one will be created in memory. The Diagram's Diagram.div property
+        * can then be set later on.
+        */
+        constructor(div: HTMLDivElement);
+
+        /**
+        * Construct an empty Diagram for a particular DIV HTML element.
+        * @param {string=} div The ID of a DIV element in the DOM.
+        * If no DIV identifier is supplied one will be created in memory. The Diagram's Diagram.div property
+        * can then be set later on.
+        */
+        constructor(div?: string);
+
+        /**Gets or sets whether the user may copy to or paste parts from the internal clipboard.*/
+        allowClipboard: boolean;
+
+        /**Gets or sets whether the user may copy objects.*/
+        allowCopy: boolean;
+
+        /**Gets or sets whether the user may delete objects from the Diagram.*/
+        allowDelete: boolean;
+
+        /**Gets or sets whether the user may start a drag-and-drop in this Diagram, possibly dropping in a different element.*/
+        allowDragOut: boolean;
+
+        /**Gets or sets whether the user may end a drag-and-drop operation in this Diagram.*/
+        allowDrop: boolean;
+
+        /**Gets or sets whether the user may group parts together.*/
+        allowGroup: boolean;
+
+        /**Gets or sets whether the user is allowed to use the horizontal scrollbar.*/
+        allowHorizontalScroll: boolean;
+
+        /**Gets or sets whether the user may add parts to the Diagram.*/
+        allowInsert: boolean;
+
+        /**Gets or sets whether the user may draw new links.*/
+        allowLink: boolean;
+
+        /**Gets or sets whether the user may move objects.*/
+        allowMove: boolean;
+
+        /**Gets or sets whether the user may reconnect existing links.*/
+        allowRelink: boolean;
+
+        /**Gets or sets whether the user may reshape parts.*/
+        allowReshape: boolean;
+
+        /**Gets or sets whether the user may resize parts.*/
+        allowResize: boolean;
+
+        /**Gets or sets whether the user may rotate parts.*/
+        allowRotate: boolean;
+
+        /**Gets or sets whether the user may select objects.*/
+        allowSelect: boolean;
+
+        /**Gets or sets whether the user may do in-place text editing.*/
+        allowTextEdit: boolean;
+
+        /**Gets or sets whether the user may undo or redo any changes.*/
+        allowUndo: boolean;
+
+        /**Gets or sets whether the user may ungroup existing groups.*/
+        allowUngroup: boolean;
+
+        /**Gets or sets whether the user is allowed to use the vertical scrollbar.*/
+        allowVerticalScroll: boolean;
+
+        /**Gets or sets whether the user may zoom into or out of the Diagram.*/
+        allowZoom: boolean;
+
+        /**This read-only property returns the AnimationManager for this Diagram.*/
+        animationManager: AnimationManager;
+
+        /**Gets or sets the autoScale of the Diagram, controlling whether or not the Diagram's bounds automatically scale to fit the view.*/
+        autoScale: EnumValue;
+
+        /**Gets or sets the Margin (or number for a uniform Margin) that describes the Diagram's autoScrollRegion.*/
+        autoScrollRegion: MarginLike;
+
+        /**Gets or sets the function to execute when the user single-primary-clicks on the background of the Diagram.*/
+        click: (e: InputEvent) => void;
+
+        /**Gets or sets the CommandHandler for this Diagram.*/
+        commandHandler: CommandHandler;
+
+        /**Gets or sets the content alignment Spot of this Diagram, to be used in determining how parts are positioned when the .viewportBounds width or height is smaller than the .documentBounds.*/
+        contentAlignment: Spot;
+
+        /**Gets or sets the function to execute when the user single-secondary-clicks on the background of the Diagram.*/
+        contextClick: (e: InputEvent) => void;
+
+        /**This Adornment is shown when the use context clicks in the background.*/
+        contextMenu: Adornment;
+
+        /**Gets or sets the current cursor for the Diagram, overriding the .defaultCursor.*/
+        currentCursor: string;
+
+        /**Gets or sets the current tool for this Diagram that handles all input events.*/
+        currentTool: Tool;
+
+        /**Gets or sets the cursor to be used for the Diagram when no GraphObject specifies a different cursor.*/
+        defaultCursor: string;
+
+        /**Gets or sets the default tool for this Diagram that becomes the current tool when the current tool stops.*/
+        defaultTool: Tool;
+
+        /**Gets or sets the Diagram's HTMLDivElement, via an HTML Element ID.*/
+        div: HTMLDivElement;
+
+        /**This read-only property returns the model-coordinate bounds of the Diagram.*/
+        documentBounds: Rect;
+
+        /**Gets or sets the function to execute when the user double-primary-clicks on the background of the Diagram.*/
+        doubleClick: (e: InputEvent) => void;
+
+        /**Gets or sets the most recent mouse-down InputEvent that occurred.*/
+        firstInput: InputEvent;
+
+        /**Gets or sets a fixed bounding rectangle to be returned by .documentBounds and .computeBounds.*/
+        fixedBounds: Rect;
+
+        /**Gets or sets the scrollMode of the Diagram.*/
+        scrollMode: EnumValue;
+
+        /**Gets or sets the Margin (or number for a uniform Margin) that describes a scrollable area that surrounds the document bounds, allowing the user to scroll into empty space.*/
+        scrollMargin: MarginLike;
+
+        /**Gets or sets the function used to determine the position that this Diagram can be scrolled or moved to.*/
+        positionComputation: (d: Diagram, p: Point) => Point;
+
+        /**Gets or sets the function used to determine the scale that this Diagram can be set to.*/
+        scaleComputation: (d: Diagram, s: number) => number;
+
+        /**Gets or sets a Panel of type Panel.Grid acting as the background grid extending across the whole viewport of this diagram.*/
+        grid: Panel;
+
+        /**Gets or sets the default selection Adornment template, used to adorn selected Groups.*/
+        groupSelectionAdornmentTemplate: Adornment;
+
+        /**Gets or sets the default Group template used as the archetype for group data that is added to the .model.*/
+        groupTemplate: Group;
+
+        /**Gets or sets a Map mapping template names to Groups.*/
+        groupTemplateMap: Map<string,Group>;
+
+        /**Gets or sets whether the Diagram has a horizontal Scrollbar.*/
+        hasHorizontalScrollbar: boolean;
+
+        /**Gets or sets whether the Diagram has a vertical Scrollbar.*/
+        hasVerticalScrollbar: boolean;
+
+        /**This read-only property returns the read-only collection of highlighted Parts.*/
+        highlighteds: Set<Part>;
+
+        /**Gets or sets the initialAutoScale of the Diagram.*/
+        initialAutoScale: EnumValue;
+
+        /**Gets or sets the initial content alignment Spot of this Diagram, to be used in determining how parts are positioned initially relative to the viewport.*/
+        initialContentAlignment: Spot;
+
+        /**Gets or sets the spot in the document's area that should be coincident with the .initialViewportSpot of the viewport when the document is first initialized.*/
+        initialDocumentSpot: Spot;
+
+        /**Gets or sets the initial coordinates of this Diagram in the viewport, eventually setting the .position.*/
+        initialPosition: Point;
+
+        /**Gets or sets the initial scale of this Diagram in the viewport, eventually setting the .scale.*/
+        initialScale: number;
+
+        /**Gets or sets the spot in the viewport that should be coincident with the .initialDocumentSpot of the document when the document is first initialized.*/
+        initialViewportSpot: Spot;
+
+        /**Gets or sets whether the user may interact with the Diagram.*/
+        isEnabled: boolean;
+
+        /**Gets or sets whether the Diagram's Diagram.model is Model.isReadOnly.*/
+        isModelReadOnly: boolean;
+
+        /**Gets or sets whether this Diagram's state has been modified.*/
+        isModified: boolean;
+
+        /**Gets or sets whether mouse events initiated within the Diagram will be captured.*/
+        isMouseCaptured: boolean;
+
+        /**Gets or sets whether the Diagram may be modified by the user, while still allowing the user to scroll, zoom, and select.*/
+        isReadOnly: boolean;
+
+        /**Gets or sets whether the Diagram tree structure is defined by links going from the parent node to their children, or vice-versa.*/
+        isTreePathToChildren: boolean;
+
+        /**Gets or sets the last InputEvent that occurred.*/
+        lastInput: InputEvent;
+
+        /**Gets an iterator for this Diagram's Layers.*/
+        layers: Iterator<Layer>;
+
+        /**Gets or sets the Layout used to position all of the top-level nodes and links in this Diagram.*/
+        layout: Layout;
+
+        /**Returns an iterator of all Links in the Diagram.*/
+        links: Iterator<Link>;
+
+        /**Gets or sets the default selection Adornment template, used to adorn selected Links.*/
+        linkSelectionAdornmentTemplate: Adornment;
+
+        /**Gets or sets the default Link template used as the archetype for link data that is added to the .model.*/
+        linkTemplate: Link;
+
+        /**Gets or sets a Map mapping template names to Links.*/
+        linkTemplateMap: Map<string,Link>;
+
+        /**Gets or sets the largest value that .scale may take.*/
+        maxScale: number;
+
+        /**Gets or sets the maximum number of selected objects.*/
+        maxSelectionCount: number;
+
+        /**Gets or sets the smallest value greater than zero that .scale may take.*/
+        minScale: number;
+
+        /**Gets or sets the Model holding data corresponding to the data-bound nodes and links of this Diagram.*/
+        model: Model;
+
+        /**Gets or sets the function to execute when the user is dragging the selection in the background of the Diagram during a DraggingTool drag-and-drop, not over any GraphObjects.*/
+        mouseDragOver: (e: InputEvent) => void;
+
+        /**Gets or sets the function to execute when the user drops the selection in the background of the Diagram at the end of a DraggingTool drag-and-drop, not onto any GraphObjects.*/
+        mouseDrop: (e: InputEvent) => void;
+
+        /**Gets or sets the function to execute when the user holds the mouse stationary in the background of the Diagram while holding down a button, not over any GraphObjects.*/
+        mouseHold: (e: InputEvent) => void;
+
+        /**Gets or sets the function to execute when the user holds the mouse stationary in the background of the Diagram without holding down any buttons, not over any GraphObjects.*/
+        mouseHover: (e: InputEvent) => void;
+
+        /**Gets or sets the function to execute when the user moves the mouse in the background of the Diagram without holding down any buttons, not over any GraphObjects.*/
+        mouseOver: (e: InputEvent) => void;
+
+        /**Returns an iterator of all Nodes and Groups in the Diagram.*/
+        nodes: Iterator<Node>;
+
+        /**Gets or sets the default selection Adornment template, used to adorn selected Parts other than Groups or Links.*/
+        nodeSelectionAdornmentTemplate: Adornment;
+
+        /**Gets or sets the default Node template used as the archetype for node data that is added to the .model.*/
+        nodeTemplate: Part;
+
+        /**Gets or sets a Map mapping template names to Parts.*/
+        nodeTemplateMap: Map<string,Part>;
+
+        /**Gets or sets the Margin (or number for a uniform Margin) that describes the Diagram's padding, which controls how much extra space there is around the area occupied by the document.*/
+        padding: MarginLike;
+
+        /**Returns an iterator of all Parts in the Diagram that are not Nodes or Links or Adornments.*/
+        parts: Iterator<Part>;
+
+        /**Gets or sets the coordinates of this Diagram in the viewport.*/
+        position: Point;
+
+        /**Gets or sets the scale transform of this Diagram.*/
+        scale: number;
+
+        /**Gets or sets the distance in screen pixels that the horizontal scrollbar will scroll when scrolling by a line.*/
+        scrollHorizontalLineChange: number;
+
+        /**Gets or sets the distance in screen pixels that the vertical scrollbar will scroll when scrolling by a line.*/
+        scrollVerticalLineChange: number;
+
+        /**This read-only property returns the read-only collection of selected Parts.*/
+        selection: Set<Part>;
+
+        /**Gets or sets whether ChangedEvents are not recorded by the UndoManager.*/
+        skipsUndoManager: boolean;
+
+        /**This read-only property returns the ToolManager for this Diagram.*/
+        toolManager: ToolManager;
+
+        /**This Adornment is shown when the mouse stays motionless in the background.*/
+        toolTip: Adornment;
+
+        /**This read-only property returns the UndoManager for this Diagram, which actually belongs to the .model.*/
+        undoManager: UndoManager;
+
+        /**Gets or sets what kinds of graphs this diagram allows the user to draw.*/
+        validCycle: EnumValue;
+
+        /**This read-only property returns the bounds of the portion of the Diagram that is viewable from its HTML Canvas.*/
+        viewportBounds: Rect;
+
+        /**Gets or sets the point, in viewport coordinates, where changes to the .scale will keep the focus in the document.*/
+        zoomPoint: Point;
+
+        /**
+        * Adds a Part to the Layer that matches the Part's Part.layerName, or else to the default layer, which is named with the empty string.
+        * @param {Part} part
+        */
+        add(part: Part): void;
+
+        /**
+        * Register an event handler that is called when there is a ChangedEvent.
+        * @param {function(ChangedEvent)} listener a function that takes a ChangedEvent as its argument.
+        */
+        addChangedListener(listener: (e: ChangedEvent) => void ): void;
+
+        /**
+        * Register an event handler that is called when there is a DiagramEvent of a given name.
+        * @param {string} name the name is normally capitalized, but this method uses case-insensitive comparison.
+        * @param {function(DiagramEvent)} listener a function that takes a DiagramEvent as its argument.
+        */
+        addDiagramListener(name: string, listener: (e: DiagramEvent) => void ): void;
+
+        /**
+        * Register an event handler that is called when there is a ChangedEvent for the Diagram's Model.
+        * @param {function(ChangedEvent)} listener a function that takes a ChangedEvent as its argument.
+        */
+        addModelChangedListener(listener: (e: ChangedEvent) => void ): void;
+
+        /**
+        * Adds a Layer to the list of layers.
+        * @param {Layer} layer The Layer to add.
+        */
+        addLayer(layer: Layer): void;
+
+        /**
+        * Adds a layer to the list of layers after a specified layer.
+        * @param {Layer} layer The Layer to add.
+        * @param {Layer} existingLayer The layer to insert after.
+        */
+        addLayerAfter(layer: Layer, existingLayer: Layer): void;
+
+        /**
+        * Adds a layer to the list of layers before a specified layer.
+        * @param {Layer} layer The Layer to add.
+        * @param {Layer} existingLayer The layer to insert before.
+        */
+        addLayerBefore(layer: Layer, existingLayer: Layer): void;
+
+        /**
+        * Aligns the Diagram's .position based on a desired document Spot and viewport Spot.
+        * @param {Spot} documentspot
+        * @param {Spot} viewportspot
+        */
+        alignDocument(documentspot: Spot, viewportspot: Spot): void;
+
+        /**
+        * Modifies the .position to show a given Rect of the Diagram by centering the viewport on that Rect.
+        * @param {Rect} r
+        */
+        centerRect(r: Rect): void;
+
+        /**
+        * Removes all Parts from the Diagram, including unbound Parts and the background grid, and also clears out the Model and UndoManager.
+        */
+        clear(): void;
+
+        /**
+        * Remove highlights from all Parts.
+        */
+        clearHighlighteds(): void;
+
+        /**
+        * Deselect all selected Parts.
+        */
+        clearSelection(): void;
+
+        /**
+        * Commit the changes of the current transaction.
+        * This just calls UndoManager.commitTransaction.
+        * @param {string=} tname a descriptive name for the transaction.
+        */
+        commitTransaction(tname?: string): boolean;
+
+        /**
+        * This is called during a Diagram update to determine a new value for .documentBounds.
+        */
+        computeBounds(): Rect;
+
+        /**
+        * Find the union of the GraphObject.actualBounds of all of the Parts in the given collection.
+        * @param {Iterable<Part>} coll a collection of Parts.
+        */
+        computePartsBounds(coll: Iterable<Part>): Rect;
+
+        /**
+        * Make a copy of a collection of Parts and return them in a Map mapping each original Part to its copy.
+        * @param {Iterable<Part>} coll  A List or a Set or Iterator of Parts.
+        * @param {Diagram} diagram  The destination diagram; if null, the copied parts are not added to this diagram.
+        * @param {boolean} check  Whether to check Part.canCopy on each part.
+        */
+        copyParts(coll: Iterable<Part>, diagram: Diagram, check: boolean): void;
+
+        /**
+        * Updates the diagram immediately, then resets initialization flags so that actions taken in the argument function will be considered part of Diagram initialization, and will participate in initial layouts, .initialAutoScale, .initialContentAlignment, etc.
+        * @param {function()|null=} func an optional function of actions to perform as part of another diagram initialization.
+        */
+        delayInitialization(func?: () => void ): void;
+
+        /**
+        * Finds a layer with a given name.
+        * @param {string} name
+        */
+        findLayer(name: string): Layer;
+
+        /**
+        * Look for a Link corresponding to a GraphLinksModel's link data object.
+        * @param {Object} linkdata
+        */
+        findLinkForData(linkdata: Object): Link;
+
+        /**
+        * Return a collection of Links that are bound to data whose properties have values
+        * that match those specified by the given example data.
+        * @param {...Object} examples
+        */
+        findLinksByExample(...examples: Array<Object>): Iterator<Link>;
+
+        /**
+        * Look for a Node or Group corresponding to a model's node data object.
+        * @param {Object} nodedata
+        */
+        findNodeForData(nodedata: Object): Node;
+
+        /**
+        * Look for a Node or Group corresponding to a model's node data object's unique key.
+        * @param {*} key a string or number.
+        */
+        findNodeForKey(key: Key): Node;
+
+        /**
+        * Return a collection of Nodes and Groups that are bound to data whose properties have values
+        * that match those specified by the given example data.
+        * @param {...Object} examples
+        */
+        findNodesByExample(...examples: Array<Object>): Iterator<Node>;
+
+        /**
+        * Find the front-most GraphObject at the given point in document coordinates.
+        * @param {Point} p A Point in document coordinates.
+        * @param {function(GraphObject):GraphObject | null=} navig A function taking a GraphObject and
+        * returning a GraphObject, defaulting to the identity.
+        * @param {function(GraphObject):boolean | null=} pred A function taking the GraphObject
+        * returned by navig and returning true if that object should be returned,
+        * defaulting to a predicate that always returns true.
+        */
+        findObjectAt(p: Point, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean): GraphObject;
+
+        /**
+        * Return a collection of the GraphObjects at the given point in document coordinates.
+        * @param {Point} p A Point in document coordinates.
+        * @param {function(GraphObject):GraphObject | null=} navig A function taking a GraphObject and
+        * returning a GraphObject, defaulting to the identity.
+        * If this function returns null, the given GraphObject will not be included in the results.
+        * @param {function(GraphObject):boolean | null=} pred A function taking the GraphObject
+        * returned by navig and returning true if that object should be returned,
+        * defaulting to a predicate that always returns true.
+        * @param {List|Set=} coll An optional collection (List or Set) to add the results to.
+        */
+        findObjectsAt(p: Point, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, coll?: List<GraphObject>): List<GraphObject>;
+        findObjectsAt(p: Point, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, coll?: Set<GraphObject>): Set<GraphObject>;
+
+        /**
+        * Returns a collection of all GraphObjects that are inside or that intersect a given Rect in document coordinates.
+        * @param {Rect} r A Rect in document coordinates.
+        * @param {function(GraphObject):GraphObject | null=} navig A function taking a GraphObject and
+        * returning a GraphObject, defaulting to the identity.
+        * If this function returns null, the given GraphObject will not be included in the results.
+        * @param {function(GraphObject):boolean | null=} pred A function taking the GraphObject
+        * returned by navig and returning true if that object should be returned,
+        * defaulting to a predicate that always returns true.
+        * @param {boolean=} partialInclusion Whether an object can match if it merely intersects the rectangular area (true) or
+        * if it must be entirely inside the rectangular area (false).  The default value is false.
+        * @param {List|Set=} coll An optional collection (List or Set) to add the results to.
+        */
+        findObjectsIn(r: Rect, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: List<GraphObject>): List<GraphObject>;
+        findObjectsIn(r: Rect, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: Set<GraphObject>): Set<GraphObject>;
+
+        /**
+        * Returns a collection of all GraphObjects that are within a certain distance of a given point in document coordinates.
+        * @param {Point} p A Point in document coordinates.
+        * @param {number} dist The distance from the point.
+        * @param {function(GraphObject):GraphObject | null=} navig A function taking a GraphObject and
+        * returning a GraphObject, defaulting to the identity.
+        * If this function returns null, the given GraphObject will not be included in the results.
+        * @param {function(GraphObject):boolean | null=} pred A function taking the GraphObject
+        * returned by navig and returning true if that object should be returned,
+        * defaulting to a predicate that always returns true.
+        * @param {boolean=} partialInclusion Whether an object can match if it merely intersects the circular area (true) or
+        * if it must be entirely inside the circular area (false).  The default value is true.
+        * The default is true.
+        * @param {List|Set=} coll An optional collection (List or Set) to add the results to.
+        */
+        findObjectsNear(p: Point, dist: number, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: List<GraphObject>): List<GraphObject>;
+        findObjectsNear(p: Point, dist: number, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: Set<GraphObject>): Set<GraphObject>;
+
+        /**
+        * This convenience function finds the front-most Part that is at a given point and that might be selectable.
+        * @param {Point} p a Point in document coordinates.
+        * @param {boolean} selectable Whether to only consider parts that are Part.selectable.
+        */
+        findPartAt(p: Point, selectable: boolean): Part;
+
+        /**
+        * Look for a Part, Node, Group, or Link corresponding to a Model's data object.
+        * @param {Object} data
+        */
+        findPartForData(data: Object): Part;
+
+        /**
+        * Look for a Part or Node or Group corresponding to a model's data object's unique key.
+        * @param {*} key a string or number.
+        */
+        findPartForKey(key: Key): Part;
+
+        /**
+        * Returns an iterator of all Groups that are at top-level, in other words that are not themselves inside other Groups.
+        */
+        findTopLevelGroups(): Iterator<Group>;
+
+        /**
+        * Returns an iterator of all top-level Nodes that have no tree parents.
+        */
+        findTreeRoots(): Iterator<Node>;
+
+        /**
+        * Explicitly bring focus to the Diagram's canvas.
+        */
+        focus(): void;
+
+        /**
+        * This static function gets the Diagram that is attached to an HTML DIV element.
+        * @param {HTMLDivElement} div
+        */
+        static fromDiv(div: HTMLDivElement): Diagram;
+
+        /**
+        * Make the given part the only highlighted part.
+        * @param {Part} part
+        */
+        highlight(part: Part): void;
+
+        /**
+        * Highlight all of the Parts supplied in the given collection, and clear all other highlighted Parts.
+        * @param {Iterable<Part>|Array<Part>} coll an Iterable of Parts
+        */
+        highlightCollection(coll: Iterable<Part> | Array<Part>): void;
+
+        /**
+        * This static function declares that a class (constructor function) derives from another class -- but please note that most classes do not support inheritance.
+        * @param {Function} derivedclass
+        * @param {Function} baseclass
+        */
+        static inherit(derivedclass: Constructor, baseclass: Constructor): void;
+
+        /**
+        * Perform all invalid layouts.
+        * @param {boolean=} invalidateAll If true, this will explicitly set Layout.isValidLayout to false on each Layout in the diagram.
+        */
+        layoutDiagram(invalidateAll?: boolean): void;
+
+        /**
+        * Create an HTMLImageElement that contains a bitmap of the current Diagram.
+        * @param {Object=} properties For details see the argument description of .makeImageData.
+        */
+        makeImage(properties?: {
+            size?: Size,
+            scale?: number,
+            maxSize?: Size,
+            position?: Point,
+            parts?: Iterable<Part>,
+            padding?: MarginLike,
+            background?: BrushLike,
+            showTemporary?: boolean,
+            showGrid?: boolean,
+            document?: Document,
+            type?: string,
+            details?: any
+          }): HTMLImageElement;
+
+        /**
+        * Create a bitmap of the current Diagram encoded as a base64 string.
+        * @param {Object=} properties a JavaScript object detailing optional arguments for image creation, to be passed to makeImageData.
+        */
+        makeImageData(properties?: {
+            size?: Size,
+            scale?: number,
+            maxSize?: Size,
+            position?: Point,
+            parts?: Iterable<Part>,
+            padding?: MarginLike,
+            background?: BrushLike,
+            showTemporary?: boolean,
+            showGrid?: boolean,
+            document?: Document,
+            type?: string,
+            details?: any
+          }): string;
+
+        /**
+        * Create an SVGElement that contains a SVG rendering of the current Diagram.
+        * By default this method returns a snapshot of the visible diagram, but optional arguments give more options.
+        * @param {Object=} properties a JavaScript object detailing optional arguments for SVG creation.
+        * @return {SVGElement}
+        */
+        makeSvg(properties?: {
+            size?: Size,
+            scale?: number,
+            maxSize?: Size,
+            position?: Point,
+            parts?: Iterable<Part>,
+            padding?: MarginLike,
+            background?: BrushLike,
+            showTemporary?: boolean,
+            showGrid?: boolean,
+            document?: Document,
+            elementFinished?: (obj: GraphObject, elt: SVGElement) => void
+          }): SVGElement;
+
+        /**
+        * Move a collection of Parts in this Diagram by a given offset.
+        * @param {Iterable<Part>} coll  A List or a Set or Iterator of Parts.
+        * @param {Point} offset  the X and Y change to be made to each Part, in document coordinates.
+        * @param {boolean} check  Whether to check Part.canMove on each part.
+        */
+        moveParts(coll: Iterable<Part>, offset: Point, check: boolean): void;
+
+        /**
+        * Remove all of the Parts created from model data and then create them again.
+        */
+        rebuildParts(): void;
+
+        /**
+        * Removes a Part from its Layer, provided the Layer is in this Diagram.
+        * @param {Part} part
+        */
+        remove(part: Part): void;
+
+        /**
+        * Unregister an event handler listener.
+        * @param {function(ChangedEvent)} listener a function that takes a ChangedEvent as its argument.
+        */
+        removeChangedListener(listener: (e: ChangedEvent) => void ): void;
+
+        /**
+        * Unregister a DiagramEvent handler.
+        * @param {string} name the name is normally capitalized, but this method uses case-insensitive comparison.
+        * @param {function(DiagramEvent)} listener a function that takes a DiagramEvent as its argument.
+        */
+        removeDiagramListener(name: string, listener: (e: DiagramEvent) => void ): void;
+
+        /**
+        * Unregister an event handler listener for the Diagram's Model.
+        * @param {function(ChangedEvent)} listener a function that takes a ChangedEvent as its argument.
+        */
+        removeModelChangedListener(listener: (e: ChangedEvent) => void ): void;
+
+        /**
+        * Removes the given layer from the list of layers.
+        * @param {Layer} layer
+        */
+        removeLayer(layer: Layer): void;
+
+        /**
+        * This method removes from this Diagram all of the Parts in a collection.
+        * @param {Iterable<Part>|Array<Part>} coll A List or Set or Iterator of Parts.
+        * @param {boolean} check Whether to check Part.canDelete on each part.
+        */
+        removeParts(coll: Iterable<Part> | Array<Part>, check: boolean): void;
+
+        /**
+        * Requests that in the near-future the diagram makes sure all GraphObjects are arranged,
+        * recomputes the document bounds, updates the scrollbars, and redraws the viewport.
+        * Usage of this method is uncommon and may affect performance --
+        * for efficiency do not call this method unless you have a well-defined need.
+        * Normally, GoJS updates the diagram automatically, and completeing a transaction ensures an immediate update.
+        * <p>
+        * @param {boolean=} alwaysQueueUpdate If true the Diagram will queue another update,
+        * even if an update is already occurring. The default value is false.
+        * Side effects in an "InitialLayoutCompleted" DiagramEvent listener might necessitate setting this parameter.
+        */
+        requestUpdate(alwaysQueueUpdate?: boolean): void;
+
+        /**
+        * Rollback the current transaction, undoing any recorded changes.
+        * This just calls UndoManager.rollbackTransaction.
+        */
+        rollbackTransaction(): boolean;
+
+        /**
+        * Scrolling function used by primarily by .commandHandler's CommandHandler.doKeyDown.
+        * @param {string} unit A string representing the unit of the scroll operation. Can be 'pixel', 'line', or 'page'.
+        * @param {string} dir The direction of the scroll operation. Can be 'up', 'down', 'left', or 'right'.
+        * @param {number=} dist An optional distance multiplier, for multiple pixels, lines, or pages. Default is 1.
+        */
+        scroll(unit: string, dir: string, dist?: number): void;
+
+        /**
+        * Modifies the .position to show a given Rect of the Diagram by centering the viewport on that Rect.
+        * @param {Rect} r
+        */
+        scrollToRect(r: Rect): void;
+
+        /**
+        * Make the given object the only selected object.
+        * @param {GraphObject} part a GraphObject that is already in a layer of this Diagram.
+        * If the value is null, this does nothing.
+        */
+        select(part: Part): void;
+
+        /**
+        * Select all of the Parts supplied in the given collection.
+        * @param {Iterable<Part>|Array<Part>} coll a List or Set of Parts to be selected.
+        */
+        selectCollection(coll: Iterable<Part> | Array<Part>): void;
+
+        /**
+        * This method sets a collection of properties according to the property/value pairs that have been set on the given Object,
+        * in the same manner as GraphObject.make does when constructing a Diagram with an argument that is a simple JavaScript Object.
+        */
+        setProperties(props: Object): void;
+
+        /**
+        * Begin a transaction, where the changes are held by a Transaction object in the UndoManager.
+        * This just calls UndoManager.startTransaction.
+        * @param {string=} tname a descriptive name for the transaction.
+        */
+        startTransaction(tname?: string): boolean;
+
+        /**
+        * Given a Point in document coordinates, return a new Point in viewport coordinates.
+        * @param {Point} p
+        */
+        transformDocToView(p: Point): Point;
+
+        /**
+        * Given a point in viewport coordinates, return a new point in document coordinates.
+        * @param {Point} p
+        */
+        transformViewToDoc(p: Point): Point;
+
+        /**
+        * Update all of the data-bound properties of Nodes and Links in this diagram.
+        */
+        updateAllTargetBindings(): void;
+
+        /**
+        * Update all of the references to nodes in case they had been modified in the model without
+        * properly notifying the model by calling GraphLinksModel.setGroupKeyForNodeData or
+        * GraphLinksModel.setToKeyForLinkData or other similar methods.
+        */
+        updateAllRelationshipsFromData(): void;
+
+        /**
+        * Scales the Diagram to uniformly fit into the viewport.
+        */
+        zoomToFit(): void;
+
+        /**
+        * Modifies the .scale and .position of the Diagram so that the viewport displays a given document-coordinates rectangle.
+        * @param {Rect} r rectangular bounds in document coordinates.
+        * @param {EnumValue=} scaling an optional value of either .Uniform (the default) or .UniformToFill.
+        */
+        zoomToRect(r: Rect, scaling?: EnumValue): void;
+
+        /**This value for Diagram.validCycle states that there are no restrictions on making cycles of links.*/
+        static CycleAll: EnumValue;
+
+        /**This value for Diagram.validCycle states that any number of destination links may go out of a node, but at most one source link may come into a node, and there are no directed cycles.*/
+        static CycleDestinationTree: EnumValue;
+
+        /**This value for Diagram.validCycle states that a valid link from a node will not produce a directed cycle in the graph.*/
+        static CycleNotDirected: EnumValue;
+
+        /**This value for Diagram.validCycle states that a valid link from a node will not produce an undirected cycle in the graph.*/
+        static CycleNotUndirected: EnumValue;
+
+        /**This value for Diagram.validCycle states that any number of source links may come into a node, but at most one destination link may go out of a node, and there are no directed cycles.*/
+        static CycleSourceTree: EnumValue;
+
+        /**The default autoScale type, used as the value of Diagram.autoScale: The Diagram does not attempt to scale its bounds to fit the view.*/
+        static None: EnumValue;
+
+        /**Diagrams with this autoScale type, used as the value of Diagram.autoScale, are scaled uniformly until the documentBounds fits in the view.*/
+        static Uniform: EnumValue;
+
+        /**Diagrams with this autoScale type, used as the value of Diagram.autoScale, are scaled uniformly until the documentBounds fits in the view.*/
+        static UniformToFill: EnumValue;
+
+        /**This value for Diagram.scrollMode states that the viewport constrains scrolling to the Diagram document bounds.*/
+        static DocumentScroll: EnumValue;
+
+        /**This value for Diagram.scrollMode states that the viewport does not constrain scrolling to the Diagram document bounds.*/
+        static InfiniteScroll: EnumValue;
+
+        /** This value for Diagram.treeCollapsePolicy states that only the Node.findTreeParentNode's Node.isTreeExpanded property determines whether a "child" node is visible.*/
+        static TreeParentCollapsed: EnumValue;  // undocumented
+
+        /** This value for Diagram.treeCollapsePolicy states that all of the Node.findNodesInto or Node.findNodesOutOf, depending on Diagram.isTreePathToChildren being true or false, need to be not Node.isTreeExpanded in order for a "child" node to be not visible.*/
+        static AllParentsCollapsed: EnumValue;  // undocumented
+
+        treeCollapsePolicy: EnumValue;  // undocumented
+        getRenderingHint(name: string): any;  // undocumented
+        setRenderingHint(name: string, val: any): void;  // undocumented
+        getInputOption(name: string): any;  // undocumented
+        setInputOption(name: string, val: any): void;  // undocumented
+        maybeUpdate(): void;  // undocumented
+        reset(): void;  // undocumented
+        simulatedMouseMove(e: Event, modelpt: Point, overdiag?: Diagram): boolean;  // undocumented
+        simulatedMouseUp(e: Event, other: Diagram, modelpt: Point, curdiag?: Diagram): boolean;  // undocumented
+    }
+
+    /**
+    * A DiagramEvent represents a more abstract event than an InputEvent.
+    * They are raised on the Diagram class.
+    * One can receive such events by registering a DiagramEvent listener on a Diagram
+    * by calling Diagram.addDiagramListener.
+    * Some DiagramEvents such as "ObjectSingleClicked" are normally
+    * associated with InputEvents.
+    * Some DiagramEvents such as "SelectionMoved" or "PartRotated" are associated with the
+    * results of Tool-handled gestures or CommandHandler actions.
+    * Some DiagramEvents are not necessarily associated with any input events at all,
+    * such as "ViewportBoundsChanged", which can happen due to programmatic
+    * changes to the Diagram.position and Diagram.scale properties.
+    */
+    class DiagramEvent {
+        /**
+        * The DiagramEvent class constructor produces an empty DiagramEvent.
+        */
+        constructor();
+
+        /**Gets or sets whether any default actions associated with this diagram event should be avoided or cancelled.*/
+        cancel: boolean;
+
+        /**This read-only property returns the diagram associated with the event.*/
+        diagram: Diagram;
+
+        /**Gets or sets the name of the kind of diagram event that this represents.*/
+        name: string;
+
+        /**Gets or sets an optional object that describes the change to the subject of the diagram event.*/
+        parameter: any;
+
+        /**Gets or sets an optional object that is the subject of the diagram event.*/
+        subject: any;
+    }
+
+    /**
+    * This is the abstract base class for all graphical objects.
+    */
+    abstract class GraphObject {
+        /**
+        * This is an abstract class, so you should not use this constructor.
+        */
+        constructor();
+
+        /**Gets or sets the function to execute when the ActionTool is cancelled and this GraphObject's .isActionable is set to true.*/
+        actionCancel: (e: InputEvent, obj: GraphObject) => void;
+
+        /**Gets or sets the function to execute on a mouse-down event when this GraphObject's .isActionable is set to true.*/
+        actionDown: (e: InputEvent, obj: GraphObject) => void;
+
+        /**Gets or sets the function to execute on a mouse-move event when this GraphObject's .isActionable is set to true.*/
+        actionMove: (e: InputEvent, obj: GraphObject) => void;
+
+        /**Gets or sets the function to execute on a mouse-up event when this GraphObject's .isActionable is set to true.*/
+        actionUp: (e: InputEvent, obj: GraphObject) => void;
+
+        /**This read-only property returns the bounds of this GraphObject in container coordinates.*/
+        actualBounds: Rect;
+
+        /**Gets or sets the alignment Spot of this GraphObject used in Panel layouts, to determine where in the area allocated by the panel this object should be placed.*/
+        alignment: Spot;
+
+        /**Gets or sets the spot on this GraphObject to be used as the alignment point in Spot and Fixed Panels.*/
+        alignmentFocus: Spot;
+
+        /**Gets or sets the angle transform, in degrees, of this GraphObject.*/
+        angle: number;
+
+        /**Gets or sets the areaBackground Brush (or CSS color string) of this GraphObject.*/
+        areaBackground: BrushLike;
+
+        /**Gets or sets the background Brush (or CSS color string) of this GraphObject, filling the rectangle of this object's local coordinate space.*/
+        background: BrushLike;
+
+        /**Gets or sets the function to execute when the user single-primary-clicks on this object.*/
+        click: (e: InputEvent, obj: GraphObject) => void;
+
+        /**Gets or sets the column of this GraphObject if it is in a Table Panel.*/
+        column: number;
+
+        /**Gets or sets the number of columns spanned by this GraphObject if it is in a Table Panel.*/
+        columnSpan: number;
+
+        /**Gets or sets the function to execute when the user single-secondary-clicks on this object.*/
+        contextClick: (e: InputEvent, obj: GraphObject) => void;
+
+        /**This Adornment is shown upon a context click on this object.*/
+        contextMenu: Adornment;
+
+        /**Gets or sets the mouse cursor to use when the mouse is over this object with no mouse buttons pressed.*/
+        cursor: string;
+
+        /**Gets or sets the desired size of this GraphObject in local coordinates.*/
+        desiredSize: Size;
+
+        /**This read-only property returns the Diagram that this GraphObject is in, if it is.*/
+        diagram: Diagram;
+
+        /**Gets or sets the function to execute when the user double-primary-clicks on this object.*/
+        doubleClick: (e: InputEvent, obj: GraphObject) => void;
+
+        /**Gets or sets how the direction of the last segment of a link coming from this port is computed when the node is rotated.*/
+        fromEndSegmentDirection: EnumValue;
+
+        /**Gets or sets the length of the last segment of a link coming from this port.*/
+        fromEndSegmentLength: number;
+
+        /**Gets or sets whether the user may draw Links from this port. The value must be either a boolean or null.*/
+        fromLinkable: boolean;
+
+        /**Gets or sets whether the user may draw duplicate Links from this port.*/
+        fromLinkableDuplicates: boolean;
+
+        /**Gets or sets whether the user may draw Links that connect from this port's Node.*/
+        fromLinkableSelfNode: boolean;
+
+        /**Gets or sets the maximum number of links that may come out of this port.*/
+        fromMaxLinks: number;
+
+        /**Gets or sets how far the end segment of a link coming from this port stops short of the actual port.*/
+        fromShortLength: number;
+
+        /**Gets or sets where a link should connect from this port.*/
+        fromSpot: Spot;
+
+        /**Gets or sets the desired height of this GraphObject in local coordinates.*/
+        height: number;
+
+        /**This property determines whether or not this GraphObject's events occur before all other events, including selection.*/
+        isActionable: boolean;
+
+        /**Gets or sets whether a GraphObject is the "main" object for some types of Panel.*/
+        isPanelMain: boolean;
+
+        /**This read-only property returns the GraphObject's containing Layer, if there is any.*/
+        layer: Layer;
+
+        /**Gets or sets the size of empty area around this GraphObject, as a Margin (or number for a uniform Margin), in the containing Panel coordinates.*/
+        margin: MarginLike;
+
+        /**Gets or sets the maximum size of this GraphObject in container coordinates (either a Panel or the document).*/
+        maxSize: Size;
+
+        /**This read-only property returns the measuredBounds of the GraphObject in container coordinates (either a Panel or the document).*/
+        measuredBounds: Rect;
+
+        /**Gets or sets the minimum size of this GraphObject in container coordinates (either a Panel or the document).*/
+        minSize: Size;
+
+        /**Gets or sets the function to execute when the user moves the mouse into this stationary object during a DraggingTool drag.*/
+        mouseDragEnter: (e: InputEvent, obj: GraphObject, prev: GraphObject) => void;
+
+        /**Gets or sets the function to execute when the user moves the mouse out of this stationary object during a DraggingTool drag.*/
+        mouseDragLeave: (e: InputEvent, obj: GraphObject, prev: GraphObject) => void;
+
+        /**Gets or sets the function to execute when a user drops the selection on this object at the end of a DraggingTool drag.*/
+        mouseDrop: (e: InputEvent, obj: GraphObject) => void;
+
+        /**Gets or sets the function to execute when the user moves the mouse into this object without holding down any buttons.*/
+        mouseEnter: (e: InputEvent, obj: GraphObject, prev: GraphObject) => void;
+
+        /**Gets or sets the function to execute when the user holds the mouse stationary in the background of the diagram while holding down a button over this object.*/
+        mouseHold: (e: InputEvent, obj: GraphObject) => void;
+
+        /**Gets or sets the function to execute when the user holds the mouse stationary in the background of the diagram without holding down any buttons over this object.*/
+        mouseHover: (e: InputEvent, obj: GraphObject) => void;
+
+        /**Gets or sets the function to execute when the user moves the mouse into this object without holding down any buttons.*/
+        mouseLeave: (e: InputEvent, obj: GraphObject, prev: GraphObject) => void;
+
+        /**Gets or sets the function to execute when the user moves the mouse over this object without holding down any buttons.*/
+        mouseOver: (e: InputEvent, obj: GraphObject) => void;
+
+        /**Gets or sets the name for this object.*/
+        name: string;
+
+        /**This read-only property returns the natural bounding rectangle of this GraphObject in local coordinates, before any transformation by .scale or .angle, and before any resizing due to .minSize or .maxSize or .stretch.*/
+        naturalBounds: Rect;
+
+        /**Gets or sets the multiplicative opacity for this GraphObject and (if a Panel) all nested elements.*/
+        opacity: number;
+
+        /**This read-only property returns the GraphObject's containing Panel, or null if this object is not in a Panel.*/
+        panel: Panel;
+
+        /**This read-only property returns the Part containing this object, if any.*/
+        part: Part;
+
+        /**Gets or sets whether or not this GraphObject can be chosen by visual "find" methods such as Diagram.findObjectAt.*/
+        pickable: boolean;
+
+        /**Gets or sets an identifier for an object acting as a port on a Node.*/
+        portId: string;
+
+        /**Gets or sets the position of this GraphObject in container coordinates (either a Panel or the document).*/
+        position: Point;
+
+        /**Gets or sets the row of this GraphObject if it is in a Table Panel.*/
+        row: number;
+
+        /**Gets or sets the number of rows spanned by this GraphObject if it is in a Table Panel.*/
+        rowSpan: number;
+
+        /**Gets or sets the scale transform of this GraphObject.*/
+        scale: number;
+
+        /**Gets or sets the fractional distance along a segment of a GraphObject that is in a Link.*/
+        segmentFraction: number;
+
+        /**Gets or sets the segment index of a GraphObject that is in a Link.*/
+        segmentIndex: number;
+
+        /**Gets or sets the offset of a GraphObject that is in a Link from a point on a segment.*/
+        segmentOffset: Point;
+
+        /**Gets or sets the orientation of a GraphObject that is in a Link.*/
+        segmentOrientation: EnumValue;
+
+        /**Gets or sets the stretch of the GraphObject.*/
+        stretch: EnumValue;
+
+        /**Gets or sets how the direction of the last segment of a link going to this port is computed when the node is rotated.*/
+        toEndSegmentDirection: EnumValue;
+
+        /**Gets or sets the length of the last segment of a link going to this port.*/
+        toEndSegmentLength: number;
+
+        /**Gets or sets whether the user may draw Links to this port. The value must be either a boolean or null.*/
+        toLinkable: boolean;
+
+        /**Gets or sets whether the user may draw duplicate Links to this port.*/
+        toLinkableDuplicates: boolean;
+
+        /**Gets or sets whether the user may draw Links that connect to this port's Node.*/
+        toLinkableSelfNode: boolean;
+
+        /**Gets or sets the maximum number of links that may go into this port.*/
+        toMaxLinks: number;
+
+        /**This Adornment is shown when the mouse hovers over this object.*/
+        toolTip: Adornment;
+
+        /**Gets or sets how far the end segment of a link going to this port stops short of the actual port.*/
+        toShortLength: number;
+
+        /**Gets or sets where a link should connect to this port.*/
+        toSpot: Spot;
+
+        /**Gets or sets whether a GraphObject is visible.*/
+        visible: boolean;
+
+        /**Gets or sets the desired width of this GraphObject in local coordinates.*/
+        width: number;
+
+        /**
+        * Add a data-binding of a property on this GraphObject to a property on a data object.
+        * @param {Binding} binding
+        */
+        bind(binding: Binding): void;
+
+        /**
+        * Creates a deep copy of this GraphObject and returns it.
+        */
+        copy(): GraphObject;
+
+        /**
+        * This static function defines a named function that GraphObject.make can use to build objects.
+        * @param {string} name a capitalized name; must not be "" or "None"
+        * @param {function(Array<*>):Object} func
+        */
+        static defineBuilder(name: string, func: (args: Array<any>) => Object): void;
+
+        /**
+        * This static function returns the first argument from the arguments array passed
+        * to a GraphObject.defineBuilder function by GraphObject.make.
+        * By default this requires the first argument to be a string,
+        * but you can provide a predicate to determine whether the argument is suitable.
+        * @param {Array} args
+        * @param {*=} defval the default value to return if the argument is optional and not present as the first argument
+        * @param {function(*):boolean|null=} pred a predicate to determine the acceptability of the argument;
+        *        the default predicate checks whether the argument is a string
+        * @return {*}
+        */
+        static takeBuilderArgument(args: Array<any>, defval?: any, pred?: (arg: any) => boolean): any;
+
+        /**
+        * Returns the effective angle that the object is drawn at, in document coordinates.
+        */
+        getDocumentAngle(): number;
+
+        /**
+        * Returns the Point in document coordinates for a given Spot in this object's bounds.
+        * @param {Spot} s a real Spot describing a location relative to the GraphObject.
+        * @param {Point=} result an optional Point that is modified and returned.
+        */
+        getDocumentPoint(s: Spot, result?: Point): Point;
+
+        /**
+        * Returns the total scale that the object is drawn at, in document coordinates.
+        */
+        getDocumentScale(): number;
+
+        /**
+        * Given a Point in document coordinates, returns a new Point in local coordinates.
+        * @param {Point} p a Point in document coordinates.
+        * @param {Point=} result an optional Point that is modified and returned.
+        */
+        getLocalPoint(p: Point, result?: Point): Point;
+
+        /**
+        * This predicate is true if this object is an element, perhaps indirectly, of the given panel.
+        * @param {GraphObject} panel
+        * or if it is contained by another panel that is contained by the given panel,
+        * to any depth; false if the argument is null or is not a Panel.
+        */
+        isContainedBy(panel: GraphObject): boolean;
+
+        /**
+        * This predicate is true if this object is .visible and each of its visual containing panels are also visible.
+        */
+        isVisibleObject(): boolean;
+
+        /**
+        * This method sets a collection of properties according to the property/value pairs that have been set on the given Object,
+        * in the same manner as GraphObject.make does when constructing a GraphObject with an argument that is a simple JavaScript Object.
+        */
+        setProperties(props: Object): void;
+
+        /**
+        * This static function builds an object given its class and additional arguments providing initial properties or GraphObjects that become Panel elements.
+        * @param {function()|string} type a class function or the name of a class in the "go" namespace,
+        * or one of several predefined kinds of Panels: "Button", "TreeExpanderButton",
+        * "SubGraphExpanderButton", or "ContextMenuButton".
+        * @param {...*} initializers zero or more values that initialize the new object,
+        * typically an Object with properties whose values that get set on the new object,
+        * or a GraphObject that is added to a Panel,
+        * or a Binding for one of the new object's properties,
+        * or an EnumValue as the initial value of a single property of the new object that
+        * is recognized to take that value,
+        * or a string that is used as the value of a commonly set property.
+        */
+        static make(type: Constructor | string, ...initializers: Array<any>): any;
+
+        /**GraphObjects with this as the value of GraphObject.stretch are stretched depending on the context they are used.*/
+        static Default: EnumValue;
+
+        /**GraphObjects with this as the value of GraphObject.stretch are scaled in both directions so as to fit exactly in the given bounds; there is no clipping but the aspect ratio may change, causing the object to appear stretched.*/
+        static Fill: EnumValue;
+
+        /**GraphObjects with this as the value of GraphObject.stretch are scaled as much as possible in the x-axis*/
+        static Horizontal: EnumValue;
+
+        /**GraphObjects with this as the value of GraphObject.stretch are not automatically scaled to fit in the given bounds; there may be clipping in one or both directions.*/
+        static None: EnumValue;
+
+        /**Pictures with this as the value of Picture.imageStretch are drawn with equal scale in both directions to fit the arranged (actual) bounds.*/
+        static Uniform: EnumValue;
+
+        /**Pictures with this as the value of Picture.imageStretch are drawn with equal scale in both directions to fit the larger side of the image bounds.*/
+        static UniformToFill: EnumValue;
+
+        /**GraphObjects with this as the value of GraphObject.stretch are scaled as much as possible in the y-axis*/
+        static Vertical: EnumValue;
+
+        spanAllocation: (obj: GraphObject, r: RowColumnDefinition, n: number) => number;  // undocumented
+        protected cloneProtected(copy: GraphObject): void;  // undocumented
+        static getBuilders(): Map<string,(args: Array<any>) => Object>;  // undocumented
+    }
+
+    /**
+    * This simple layout places all of the Parts in a grid-like arrangement, ordered, spaced apart,
+    * and wrapping as needed.  It ignores any Links connecting the Nodes being laid out.
+    */
+    class Group extends Node {
+        /**
+        * Constructs an empty Group with no visual elements and no member parts; normally a Group will have some visual elements surrounding a Placeholder.
+        * @param {EnumValue=} type if not supplied, the default Panel type is Panel.Position.
+        */
+        constructor(type?: EnumValue);
+
+        /**Gets or sets whether the size of the area of the Group's .placeholder should remain the same during a DraggingTool move until a drop occurs. The default value is false.*/
+        computesBoundsAfterDrag: boolean;
+
+        /**Gets or sets whether the bounds of a Group's Placeholder includes the bounds of member Links. The default value is true.*/
+        computesBoundsIncludingLinks: boolean;
+
+        /**Gets or sets whether the bounds of a Group's Placeholder includes the previous Group.location. The default value is false.*/
+        computesBoundsIncludingLocation: boolean;
+
+        /**Gets or sets whether drag-and-drop events may be bubbled up to this Group if not handled by member Parts.*/
+        handlesDragDropForMembers: boolean;
+
+        /**Gets or sets whether the subgraph contained by this group is expanded. The default value is true.*/
+        isSubGraphExpanded: boolean;
+
+        /**Gets or sets the Layout used to position all of the immediate member nodes and links in this group.*/
+        layout: Layout;
+
+        /**Gets or sets the function that is called after a member Part has been added to this Group.*/
+        memberAdded: (a: Group, b: Part) => void;
+
+        /**This read-only property returns an iterator over the member Parts of this Group.*/
+        memberParts: Iterator<Part>;
+
+        /**Gets or sets the function that is called after a member Part has been removed from this Group.*/
+        memberRemoved: (a: Group, b: Part) => void;
+
+        /**Gets or sets the predicate that determines whether or not a Part may become a member of this group.*/
+        memberValidation: (a: Group, b: Part) => boolean;
+
+        /**This read-only property returns a Placeholder that this group may contain in its visual tree.*/
+        placeholder: Placeholder;
+
+        /**Gets or sets the function that is called when .isSubGraphExpanded has changed value.*/
+        subGraphExpandedChanged: (a: Group) => void;
+
+        /**Gets or sets whether the user may ungroup this group.*/
+        ungroupable: boolean;
+
+        /**Gets or sets whether the subgraph starting at this group had been collapsed by a call to .expandSubGraph on the containing Group.*/
+        wasSubGraphExpanded: boolean;
+
+        /**
+        * Add the Parts in the given collection as members of this Group for those Parts for which CommandHandler.isValidMember returns true.
+        * @param {Iterable<Part>} coll
+        * @param {boolean=} check whether to call CommandHandler.isValidMember to confirm that it is valid to add the Part to be a member of this Group.
+        */
+        addMembers(coll: Iterable<Part>, check?: boolean): boolean;
+
+        /**
+        * See if the given collection of Parts contains non-Links all for which CommandHandler.isValidMember returns true.
+        * @param {Iterable<Part>} coll
+        */
+        canAddMembers(coll: Iterable<Part>): boolean;
+
+        /**
+        * This predicate returns true if .ungroupable is true, if the layer's Layer.allowUngroup is true, and if the diagram's Diagram.allowUngroup is true.
+        */
+        canUngroup(): boolean;
+
+        /**
+        * Hide each of the member nodes and links of this group, and recursively collapse any member groups.
+        */
+        collapseSubGraph(): void;
+
+        /**
+        * Show each member node and link, and perhaps recursively expand nested subgraphs.
+        */
+        expandSubGraph(): void;
+
+        /**
+        * Returns an iterator over all of the Links that connect with this group or any node contained by this group,
+        * in either direction, but that are not internal to this group.
+        */
+        findExternalLinksConnected(): Iterator<Link>;
+
+        /**
+        * Returns an iterator over all of the Nodes that are connected with this group or any node contained by this group,
+        * by a link in either direction, but that are not internal to this group.
+        */
+        findExternalNodesConnected(): Iterator<Node>;
+
+        /**
+        * Return a collection of Parts that are all of the nodes and links that are members of this group, including inside nested groups, but excluding this group itself.
+        */
+        findSubGraphParts(): Set<Part>;
+
+        /**
+        * Move this Group and all of its member parts, recursively.
+        * @param {Point} newpos a new Point in document coordinates.
+        */
+        move(newpos: Point): void;
+    }
+
+    /**
+    * An InputEvent represents a mouse or keyboard event.
+    * The principal properties hold information about a particular input event.
+    * These properties include the .documentPoint at which a mouse event
+    * occurred in document coordinates,
+    * the corresponding point in view/element coordinates, .viewPoint,
+    * the .key for keyboard events,
+    * and the .modifiers and .button at the time.
+    * Additional descriptive properties include .clickCount, .delta,
+    * .timestamp, and the source event .event (if available).
+    */
+    class InputEvent {
+        /**
+        * The InputEvent class constructor produces an empty InputEvent.
+        */
+        constructor();
+
+        /**Gets or sets whether the alt key is being held down.*/
+        alt: boolean;
+
+        /**Gets or sets whether the underlying .event is prevented from bubbling up the hierarchy of HTML elements outside of the Diagram and whether any default action is canceled.*/
+        bubbles: boolean;
+
+        /**Gets or sets the mouse button that caused this event.*/
+        button: number;
+
+        /**Gets or sets the buttons flag, descibing the set of mouse buttons current being held down.*/
+        buttons: number;
+
+        /**Gets or sets whether this event represents a click or a double-click.*/
+        clickCount: number;
+
+        /**Gets or sets whether the control key is being held down.*/
+        control: boolean;
+
+        /**Gets or sets the amount of change associated with a mouse-wheel rotation.*/
+        delta: number;
+
+        /**This read-only property returns the source diagram associated with the event.*/
+        diagram: Diagram;
+
+        /**Gets or sets the point at which this input event occurred, in document coordinates.*/
+        documentPoint: Point;
+
+        /**Gets or sets whether the InputEvent represents a mouse-down or a key-down event.*/
+        down: boolean;
+
+        /**Gets or sets the platform's user-agent-supplied event for this event.*/
+        event: Event;
+
+        /**Gets or sets whether an InputEvent that applies to a GraphObject and bubbles up the chain of containing Panels is stopped from continuing up the chain.*/
+        handled: boolean;
+
+        /**This property is true when the InputEvent is caused by a touch event that registered more than one touch.*/
+        isMultiTouch: boolean;
+
+        /**This read-only property is true when the InputEvent is caused by a touch event.*/
+        isTouchEvent: boolean;
+
+        /**Gets or sets the key pressed or released as this event.*/
+        key: string;
+
+        /**Gets or sets whether the logical left mouse button is being held down.*/
+        left: boolean;
+
+        /**Gets or sets whether the meta key is being held down.*/
+        meta: boolean;
+
+        /**Gets or sets whether the logical middle mouse button is being held down.*/
+        middle: boolean;
+
+        /**Gets or sets the modifier keys that were used with the mouse or keyboard event.*/
+        modifiers: number;
+
+        /**Gets or sets whether the logical right mouse button is being held down.*/
+        right: boolean;
+
+        /**Gets or sets whether the shift key is being held down.*/
+        shift: boolean;
+
+        /**Gets or sets the diagram associated with the canvas that the event is currently targeting.*/
+        targetDiagram: Diagram;
+
+        /**Gets or sets the GraphObject that is at the current mouse point, if any.*/
+        targetObject: GraphObject;
+
+        /**Gets or sets the time at which the event occurred, in milliseconds.*/
+        timestamp: number;
+
+        /**Gets or sets whether the InputEvent represents a mouse-up or a key-up event.*/
+        up: boolean;
+
+        /**Gets or sets the point at which this input event occurred.*/
+        viewPoint: Point;
+
+        /**
+        * Make a copy of this InputEvent.
+        */
+        copy(): InputEvent;
+
+        isMac: boolean;  // undocumented
+    }
+
+    /**
+    * Layers are how named collections of Parts are drawn in front or behind other collections of Parts in a Diagram.
+    * Layers can only contain Parts -- they cannot hold GraphObjects directly.
+    */
+    class Layer {
+        /**
+        * This constructs an empty Layer; you should set the .name before adding the Layer to a Diagram.
+        */
+        constructor();
+
+        /**Gets or sets whether the user may copy objects in this layer.*/
+        allowCopy: boolean;
+
+        /**Gets or sets whether the user may delete objects in this layer.*/
+        allowDelete: boolean;
+
+        /**Gets or sets whether the user may group parts together in this layer.*/
+        allowGroup: boolean;
+
+        /**Gets or sets whether the user may draw new links in this layer.*/
+        allowLink: boolean;
+
+        /**Gets or sets whether the user may move objects in this layer.*/
+        allowMove: boolean;
+
+        /**Gets or sets whether the user may reconnect existing links in this layer.*/
+        allowRelink: boolean;
+
+        /**Gets or sets whether the user may reshape parts in this layer.*/
+        allowReshape: boolean;
+
+        /**Gets or sets whether the user may resize parts in this layer.*/
+        allowResize: boolean;
+
+        /**Gets or sets whether the user may rotate parts in this layer.*/
+        allowRotate: boolean;
+
+        /**Gets or sets whether the user may select objects in this layer.*/
+        allowSelect: boolean;
+
+        /**Gets or sets whether the user may do in-place text editing in this layer.*/
+        allowTextEdit: boolean;
+
+        /**Gets or sets whether the user may ungroup existing groups in this layer.*/
+        allowUngroup: boolean;
+
+        /**This read-only property returns the Diagram that is using this Layer.*/
+        diagram: Diagram;
+
+        /**Gets or sets whether the objects in this layer are considered temporary.*/
+        isTemporary: boolean;
+
+        /**Gets or sets the name for this layer.*/
+        name: string;
+
+        /**Gets or sets the opacity for all parts in this layer.*/
+        opacity: number;
+
+        /**This read-only property returns an iterator for this Layer's Parts.*/
+        parts: Iterator<Part>;
+
+        /**This read-only property returns a backwards iterator for this Layer's Parts, for iterating over the parts in reverse order.*/
+        partsBackwards: Iterator<Part>;
+
+        /**Gets or sets whether methods such as .findObjectAt find any of the objects in this layer.*/
+        pickable: boolean;
+
+        /**Gets or sets whether the user may view any of the objects in this layer.*/
+        visible: boolean;
+
+        /**
+        * Find the front-most GraphObject in this layer at the given point in document coordinates.
+        * @param {Point} p A Point in document coordinates.
+        * @param {function(GraphObject):GraphObject | null=} navig A function taking a GraphObject and
+        * returning a GraphObject, defaulting to the identity.
+        * @param {function(GraphObject):boolean | null=} pred A function taking the GraphObject
+        * returned by navig and returning true if that object should be returned,
+        * defaulting to a predicate that always returns true.
+        */
+        findObjectAt(p: Point, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean): GraphObject;
+
+        /**
+        * Return a collection of the GraphObjects of this layer at the given point in document coordinates.
+        * @param {Point} p A Point in document coordinates.
+        * @param {function(GraphObject):GraphObject | null=} navig A function taking a GraphObject and
+        * returning a GraphObject, defaulting to the identity.
+        * If this function returns null, the given GraphObject will not be included in the results.
+        * @param {function(GraphObject):boolean | null=} pred A function taking the GraphObject
+        * returned by navig and returning true if that object should be returned,
+        * defaulting to a predicate that always returns true.
+        * @param {List|Set=} coll An optional collection (List or Set) to add the results to.
+        */
+        findObjectsAt(p: Point, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, coll?: List<GraphObject>): List<GraphObject>;
+        findObjectsAt(p: Point, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, coll?: Set<GraphObject>): Set<GraphObject>;
+
+        /**
+        * Returns a collection of all GraphObjects that are inside or that intersect a given Rect in document coordinates.
+        * @param {Rect} r A Rect in document coordinates.
+        * @param {function(GraphObject):GraphObject | null=} navig A function taking a GraphObject and
+        * returning a GraphObject, defaulting to the identity.
+        * If this function returns null, the given GraphObject will not be included in the results.
+        * @param {function(GraphObject):boolean | null=} pred A function taking the GraphObject
+        * returned by navig and returning true if that object should be returned,
+        * defaulting to a predicate that always returns true.
+        * @param {boolean=} partialInclusion Whether an object can match if it merely intersects the rectangular area (true) or
+        * if it must be entirely inside the rectangular area (false).  The default value is false.
+        * @param {List|Set=} coll An optional collection (List or Set) to add the results to.
+        */
+        findObjectsIn(r: Rect, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: List<GraphObject>): List<GraphObject>;
+        findObjectsIn(r: Rect, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: Set<GraphObject>): Set<GraphObject>;
+
+        /**
+        * Returns a collection of all GraphObjects that are within a certain distance of a given point in document coordinates.
+        * @param {Point} p A Point in document coordinates.
+        * @param {number} dist The distance from the point.
+        * @param {function(GraphObject):GraphObject | null=} navig A function taking a GraphObject and
+        * returning a GraphObject, defaulting to the identity.
+        * If this function returns null, the given GraphObject will not be included in the results.
+        * @param {function(GraphObject):boolean | null=} pred A function taking the GraphObject
+        * returned by navig and returning true if that object should be returned,
+        * defaulting to a predicate that always returns true.
+        * @param {boolean=} partialInclusion Whether an object can match if it merely intersects the circular area (true) or
+        * if it must be entirely inside the circular area (false).  The default value is true.
+        * @param {List|Set=} coll An optional collection (List or Set) to add the results to.
+        */
+        findObjectsNear(p: Point, dist: number, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: List<GraphObject>): List<GraphObject>;
+        findObjectsNear(p: Point, dist: number, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: Set<GraphObject>): Set<GraphObject>;
+    }
+
+    /**
+    * A Link is a Part that connects Nodes.
+    * The link relationship is directional, going from Link.fromNode to Link.toNode.
+    * A link can connect to a specific port element in a node, as named by the Link.fromPortId
+    * and Link.toPortId properties.
+    */
+    class Link extends Part {
+        /**
+        * Constructs an empty link that does not connect any nodes.
+        */
+        constructor();
+
+        /**Gets or sets how the route is computed, including whether it uses the points of its old route to determine the new route.*/
+        adjusting: EnumValue;
+
+        /**Gets or sets how rounded the corners are for adjacent line segments when the .curve is .None .JumpGap, or .JumpOver and the two line segments are orthogonal to each other.*/
+        corner: number;
+
+        /**Gets or sets the way the path is generated from the route's points.*/
+        curve: EnumValue;
+
+        /**Gets or sets how far the control points are offset when the .curve is .Bezier or when there are multiple links between the same two ports.*/
+        curviness: number;
+
+        /**Gets or sets how the direction of the last segment is computed when the node is rotated.*/
+        fromEndSegmentDirection: EnumValue;
+
+        /**Gets or sets the length of the last segment.*/
+        fromEndSegmentLength: number;
+
+        /**Gets or sets the Node that this link comes from.*/
+        fromNode: Node;
+
+        /**This read-only property returns a GraphObject that is the "from" port that this link is connected from.*/
+        fromPort: GraphObject;
+
+        /**Gets or sets the function that is called after this Link changes which Node or port it connects from.*/
+        fromPortChanged: (a: Link, b: GraphObject, c: GraphObject) => void;
+
+        /**Gets or sets the identifier of the port that this link comes from.*/
+        fromPortId: string;
+
+        /**Gets or sets how far the end segment stops short of the actual port.*/
+        fromShortLength: number;
+
+        /**Gets or sets where this link should connect at the .fromPort.*/
+        fromSpot: Spot;
+
+        /**This read-only property returns the Geometry that is used by the .path, the link Shape based on the route points.*/
+        geometry: Geometry;
+
+        /**This read-only property is true when this Link has any label Nodes, Nodes that are owned by this Link and are arranged along its path.*/
+        isLabeledLink: boolean;
+
+        /**This read-only property true if .routing is a value that implies that the points of the route should be orthogonal, such that each point shares a common X or a common Y value with the immediately previous and next points.*/
+        isOrthogonal: boolean;
+
+        /**Gets or sets whether this Link is part of the tree for tree operations such as Node.findTreeChildrenNodes or Node.collapseTree.*/
+        isTreeLink: boolean;
+
+        /**This read-only property returns an iterator over the Nodes that act as labels on this Link.*/
+        labelNodes: Iterator<Node>;
+
+        /**This read-only property returns the angle of the path at the .midPoint.*/
+        midAngle: number;
+
+        /**This read-only property returns the point at the middle of the path.*/
+        midPoint: Point;
+
+        /**This read-only property returns the Shape representing the path of this Link.*/
+        path: Shape;
+
+        /**Gets or sets the List of Points in the route. Can also be set as an Array of numbers.*/
+        points: List<Point>;
+
+        /**This read-only property returns the number of points in the route.*/
+        pointsCount: number;
+
+        /**Gets or sets whether the user may reconnect an existing link at the "from" end.*/
+        relinkableFrom: boolean;
+
+        /**Gets or sets whether the user may reconnect an existing link at the "to" end.*/
+        relinkableTo: boolean;
+
+        /**Gets or sets whether the user may change the number of segments in this Link, if the link has straight segments.*/
+        resegmentable: boolean;
+
+        /**Gets or sets whether the link's path tries to avoid other nodes.*/
+        routing: EnumValue;
+
+        /**Gets or sets how far the control points are from the points of the route when .routing is .Orthogonal and .curve is .Bezier.*/
+        smoothness: number;
+
+        /**Gets or sets how far the control points are from the points of the route when .routing is .Orthogonal and .curve is .Bezier.*/
+        toEndSegmentDirection: EnumValue;
+
+        /**Gets or sets the length of the last segment.*/
+        toEndSegmentLength: number;
+
+        /**Gets or sets the Node that this link goes to.*/
+        toNode: Node;
+
+        /**This read-only property returns a GraphObject that is the "to" port that this link is connected to.*/
+        toPort: GraphObject;
+
+        /**Gets or sets the function that is called after this Link changes which Node or port it connects to.*/
+        toPortChanged: (a: Link, b: GraphObject, c: GraphObject) => void;
+
+        /**Gets or sets the identifier of the port that this link goes to.*/
+        toPortId: string;
+
+        /**Gets or sets how far the end segment stops short of the actual port.*/
+        toShortLength: number;
+
+        /**Gets or sets where this link should connect at the .toPort.*/
+        toSpot: Spot;
+
+        /**
+        * This predicate returns true if .relinkableFrom is true, if the layer's Layer.allowRelink is true, and if the diagram's Diagram.allowRelink is true.
+        */
+        canRelinkFrom(): boolean;
+
+        /**
+        * This predicate returns true if .relinkableTo is true, if the layer's Layer.allowRelink is true, and if the diagram's Diagram.allowRelink is true.
+        */
+        canRelinkTo(): boolean;
+
+        /**
+        * Remove all of the points from this link's route; this may only be called within an override of computePoints.
+        */
+        protected clearPoints(): void;
+
+        /**
+        * Add a point at the end of the route; this may only be called within an override of computePoints.
+        * @param {Point} p  The new point, which should not have infinite or NaN coordinate values, and which must not be modified afterwards.
+        */
+        protected addPoint(p: Point): void;
+
+        /**
+        * Insert a point at a particular position in the route, without replacing an existing point; this may only be called within an override of computePoints.
+        * @param {number} i int  The zero-based index of the new point.
+        * @param {Point} p  The new point, which should not have infinite or NaN coordinate values, and which must not be modified afterwards.
+        */
+        protected insertPoint(i: number, p: Point): void;
+
+        /**
+        * Remove a particular point from the route; this may only be called within an override of computePoints.
+        * @param {number} i int  The zero-based index of the point to extract.
+        */
+        protected removePoint(i: number): void;
+
+        /**
+        * Sets a particular point of the route; this may only be called within an override of computePoints.
+        * @param {number} i int  The zero-based index of the desired point.
+        * @param {Point} p  The new point, which should not have infinite or NaN coordinate values, and which must not be modified afterwards.
+        */
+        protected setPoint(i: number, p: Point): void;
+
+        /**
+        * Returns the curve}, unless this link is supposed to pretend to be curved, as with reflexive links.
+        */
+        protected computeCurve(): EnumValue;
+
+        /**
+        * Returns the curviness, if it's a number,
+        * or else a computed value based on how many links connect this pair of nodes/ports.
+        */
+        protected computeCurviness(): number;
+
+        /**
+        * Get the length of the end segment, typically a short distance, in document units.
+        * For spot values that are Spot.isSide, this returns a computed value.
+        * Depending on the <code>from</code> argument, this will return fromEndSegmentLength or toEndSegmentLength.
+        * If the value is <code>NaN</code>, this will return the fromPort's GraphObject.fromEndSegmentLength
+        * or the toPort's GraphObject.toEndSegmentLength.
+        */
+        protected computeEndSegmentLength(node: Node, port: GraphObject, spot: Spot, from: boolean): number;
+
+        /**
+        * Find the approximate point of the other end of the link.
+        * This is useful when computing the connection point when there is no specific spot, to have an idea of which general direction the link should be going.
+        * By default this will return the center of the other port.
+        */
+        protected computeOtherPoint(othernode: Node, otherport: GraphObject): Point;
+
+        /**
+        * The code that constructs a new route by modifying the points.
+        * It is only called by updateRoute, when needed.
+        */
+        protected computePoints(): boolean;
+        /**
+        * Returns the expected spacing between this link and others that connect this link's fromPort and toPort.
+        * This calls computeThickness and also takes any "mid label"'s breadth into account.
+        */
+        protected computeSpacing(): number;
+        /**
+        * Get the Spot that describes how the end of the link should connect with the port.
+        * Depending on the <code>from</code> argument, this will return fromSpot or toSpot.
+        * If the value is Spot.isDefault, this will return the fromPort's GraphObject.fromSpot
+        * or the toPort's GraphObject.toSpot.
+        */
+        protected computeSpot(from: boolean): Spot;
+
+        /**
+        * Returns the thickness of this link.
+        * By default it uses the strokeWidth of the main element, assuming it's a Shape.
+        */
+        protected computeThickness(): number;
+
+        /**
+        * Find the index of the segment that is closest to a given point.
+        * @param {Point} p the Point, in document coordinates.
+        */
+        findClosestSegment(p: Point): number;
+
+        /**
+        * Compute the direction in which a link should go from a given connection point.
+        * @param {Node} node
+        * @param {GraphObject} port the GraphObject representing a port on the node.
+        * @param {Point} linkpoint the connection point, in document coordinates.
+        * @param {Spot} spot a Spot value describing where the link should connect.
+        * @param {boolean} from true if the link is coming out of the port; false if going to the port.
+        * @param {boolean} ortho whether the link should have orthogonal segments.
+        * @param {Node} othernode the node at the other end of the link.
+        * @param {GraphObject} otherport the GraphObject port at the other end of the link.
+        */
+        getLinkDirection(node: Node, port: GraphObject, linkpoint: Point, spot: Spot, from: boolean, ortho: boolean, othernode: Node, otherport: GraphObject): number;
+
+        /**
+        * Compute the point on a node/port at which the route of a link should end.
+        * @param {Node} node
+        * @param {GraphObject} port the GraphObject representing a port on the node.
+        * @param {Spot} spot a Spot value describing where the link should connect.
+        * @param {boolean} from true if the link is coming out of the port; false if going to the port.
+        * @param {boolean} ortho whether the link should have orthogonal segments.
+        * @param {Node} othernode the node at the other end of the link.
+        * @param {GraphObject} otherport the GraphObject port at the other end of the link.
+        * @param {Point=} result an optional Point that is modified and returned; otherwise it allocates and returns a new Point
+        */
+        getLinkPoint(node: Node, port: GraphObject, spot: Spot, from: boolean, ortho: boolean, othernode: Node, otherport: GraphObject, result?: Point): Point;
+
+        /**
+        * Compute the intersection point for the edge of a particular port GraphObject, given a point, when no particular spot or side has been specified.
+        * @param {Node} node
+        * @param {GraphObject} port the GraphObject representing a port on the node.
+        * @param {Point} focus the point in document coordinates to/from which the link should point,
+        *   normally the center of the port.
+        * @param {Point} p often this point is far away from the node, to give a general direction,
+        *   particularly an orthogonal one.
+        * @param {boolean} from true if the link is coming out of the port; false if going to the port.
+        * @param {Point=} result an optional Point that is modified and returned; otherwise it allocates and returns a new Point
+        */
+        getLinkPointFromPoint(node: Node, port: GraphObject, focus: Point, p: Point, from: boolean, result?: Point): Point;
+
+        /**
+        * Given a Node, return the node at the other end of this link.
+        * @param {Node} node
+        */
+        getOtherNode(node: Node): Node;
+
+        /**
+        * Given a GraphObject that is a "port", return the port at the other end of this link.
+        * @param {GraphObject} port
+        */
+        getOtherPort(port: GraphObject): GraphObject;
+
+        /**
+        * Gets a particular point of the route.
+        * @param {number} i  The zero-based index of the desired point.
+        */
+        getPoint(i: number): Point;
+
+        /**
+        * Returns true if an extra or a different point is needed based on curviness.
+        */
+        protected hasCurviness(): boolean;
+
+        /**
+        * Declare that the route (the points) of this Link need to be recomputed soon.
+        * This causes updateRoute to be called, which will call computePoints
+        * to perform the actual determination of the route.
+        */
+        invalidateRoute(): void;
+
+        /**
+        * Produce a Geometry given the points of this route,
+        * depending on the value of curve and corner and perhaps other properties.
+        */
+        protected makeGeometry(): Geometry;
+
+        /**
+        * Move this link to a new position.
+        * @param {Point} newpos
+        */
+        move(newpos: Point): void;
+
+        /**
+        * This method recomputes the route if the route is invalid, to make sure the points are up-to-date.
+        * This method calls computePoints in order to calculate a new route.
+        */
+        updateRoute(): void;
+
+        /**Used as a value for Link.routing: each segment is horizontal or vertical, but the route tries to avoid crossing over nodes.*/
+        static AvoidsNodes: EnumValue;
+
+        /**Used as a value for Link.curve, to indicate that the link path uses Bezier curve segments.*/
+        static Bezier: EnumValue;
+
+        /**Used as a value for Link.adjusting, to indicate that the link route computation should keep the intermediate points of the previous route, just modifying the first and/or last points; if the routing is orthogonal, it will only modify the first two and/or last two points.*/
+        static End: EnumValue;
+
+        /**Used as a value for Link.curve, to indicate that orthogonal link segments will be discontinuous where they cross over other orthogonal link segments that have a Link.curve or JumpOver or JumpGap.*/
+        static JumpGap: EnumValue;
+
+        /**Used as a value for Link.curve, to indicate that orthogonal link segments will veer around where they cross over other orthogonal link segments that have a Link.curve or JumpOver or JumpGap.*/
+        static JumpOver: EnumValue;
+
+        /**This is the default value for Link.curve and Link.adjusting, to indicate that the path geometry consists of straight line segments and to indicate that the link route computation does not depend on any previous route points; this can also be used as a value for GraphObject.segmentOrientation to indicate that the object is never rotated along the link route -- its angle is unchanged.*/
+        static None: EnumValue;
+
+        /**Used as the default value for Link.routing: the route goes fairly straight between ports.*/
+        static Normal: EnumValue;
+
+        /**This value for GraphObject.segmentOrientation results in the GraphObject turned to have the same angle as the route: the GraphObject's angle is always the same as the angle of the link's route at the segment where the GraphObject is attached; use this orientation for arrow heads.*/
+        static OrientAlong: EnumValue;
+
+        /**This value for GraphObject.segmentOrientation results in the GraphObject being turned counter-clockwise to be perpendicular to the route: the GraphObject's angle is always 90 degrees less than the angle of the link's route at the segment where the GraphObject is attached.*/
+        static OrientMinus90: EnumValue;
+
+        /**This value for GraphObject.segmentOrientation results in the GraphObject turned counter-clockwise to be perpendicular to the route, just like Link.OrientMinus90, but is never upside down: the GraphObject's angle always being 90 degrees less than the angle of the link's route at the segment where the GraphObject is attached; this is typically only used for TextBlocks or Panels that contain text.*/
+        static OrientMinus90Upright: EnumValue;
+
+        /**This value for GraphObject.segmentOrientation results in the GraphObject's angle always being 180 degrees opposite from the angle of the link's route at the segment where the GraphObject is attached.*/
+        static OrientOpposite: EnumValue;
+
+        /**This value for GraphObject.segmentOrientation results in the GraphObject is turned clockwise to be perpendicular to the route: the GraphObject's angle is always 90 degrees more than the angle of the link's route at the segment where the GraphObject is attached.*/
+        static OrientPlus90: EnumValue;
+
+        /**This value for GraphObject.segmentOrientation results in the GraphObject turned clockwise to be perpendicular to the route, just like Link.OrientPlus90, but is never upside down: the GraphObject's angle always being 90 degrees more than the angle of the link's route at the segment where the GraphObject is attached; this is typically only used for TextBlocks or Panels that contain text.*/
+        static OrientPlus90Upright: EnumValue;
+
+        /**This value for GraphObject.segmentOrientation results in the GraphObject turned to have the same angle as the route, just like Link.OrientAlong, but is never upside down: the GraphObject's angle always following the angle of the link's route at the segment where the GraphObject is attached; this is typically only used for TextBlocks or Panels that contain text.*/
+        static OrientUpright: EnumValue;
+
+        /**This value for GraphObject.segmentOrientation results in the GraphObject's angle always following the angle of the link's route at the segment where the GraphObject is attached, but never upside down and never angled more than +/- 45 degrees: when the route's angle is within 45 degrees of vertical (90 or 270 degrees), the GraphObject's angle is set to zero; this is typically only used for TextBlocks or Panels that contain text.*/
+        static OrientUpright45: EnumValue;
+
+        /**Used as a value for Link.routing: each segment is horizontal or vertical.*/
+        static Orthogonal: EnumValue;
+
+        /**Used as a value for Link.adjusting, to indicate that the link route computation should scale and rotate the intermediate points so that the link's shape looks approximately the same; if the routing is orthogonal, this value is treated as if it were Link.End.*/
+        static Scale: EnumValue;
+
+        /**Used as a value for Link.adjusting, to indicate that the link route computation should linearly interpolate the intermediate points so that the link's shape looks stretched; if the routing is orthogonal, this value is treated as if it were Link.End.*/
+        static Stretch: EnumValue;
+
+        routeBounds: Rect;  // undocumented
+        protected computeCorner(): number;  // undocumented
+        protected computeShortLength(from: boolean): number;  // undocumented
+        findMidLabel(): GraphObject;  // undocumented
+        protected arrangeBundledLinks(links: Array<Link>, reroute: boolean): void;  // undocumented
+        protected setPointAt(i: number, x: number, y: number): void;  // undocumented
+        protected insertPointAt(i: number, x: number, y: number): void;  // undocumented
+        protected addPointAt(x: number, y: number): void;  // undocumented
+        invalidateGeometry(): void;  // undocumented
+    }
+
+    /**
+    * A Node is a Part that may connect to other nodes with Links,
+    * or that may be a member of a Group.
+    * Group inherits from Node,
+    * enabling nodes to logically contain other nodes and links.
+    */
+    class Node extends Part {
+        /**
+        * Constructs an empty Node.
+        * @param {EnumValue=} type if not supplied, the default Panel type is Panel.Position.
+        */
+        constructor(type?: EnumValue);
+
+        /**Gets or sets whether this Node is to be avoided by Links whose Link.routing is Link.AvoidsNodes.*/
+        avoidable: boolean;
+
+        /**Gets or sets the Margin (or number for a uniform Margin) around this Node in which avoidable links will not be routed.*/
+        avoidableMargin: MarginLike;
+
+        /**This read-only property is true when this Node is a label node for a Link.*/
+        isLinkLabel: boolean;
+
+        /**Gets or sets whether the subtree graph starting at this node is expanded.*/
+        isTreeExpanded: boolean;
+
+        /**Gets whether this node has no tree children.*/
+        isTreeLeaf: boolean;
+
+        /**Gets or sets the Link for which this Node is acting as a smart label.*/
+        labeledLink: Link;
+
+        /**Gets or sets the function that is called after a Link has been connected with this Node.*/
+        linkConnected: (a: Node, b: Link, c: GraphObject) => void;
+
+        /**Gets or sets the function that is called after a Link has been disconnected from this Node.*/
+        linkDisconnected: (a: Node, b: Link, c: GraphObject) => void;
+
+        /**Gets or sets a predicate that determines whether or not a Link may be connected with this node; any of the arguments may be null.*/
+        linkValidation: (from: Node, fromPort: GraphObject, to: Node, toPort: GraphObject, link: Link) => boolean;
+
+        /**This read-only property returns an iterator over all of the Links that are connected with this node.*/
+        linksConnected: Iterator<Link>;
+
+        /**This read-only property returns the primary GraphObject representing a port in this node.*/
+        port: GraphObject;
+
+        /**This read-only property returns an iterator over all of the GraphObjects in this node that act as ports.*/
+        ports: Iterator<GraphObject>;
+
+        /**Gets or sets how link points are computed when the port spot is a "side" spot.*/
+        portSpreading: EnumValue;
+
+        /**Gets or sets the function that is called when .isTreeExpanded has changed value.*/
+        treeExpandedChanged: (node: Node) => void;
+
+        /**Gets or sets whether the subtree graph starting at this node had been collapsed by a call to .expandTree on the parent node.*/
+        wasTreeExpanded: boolean;
+
+        /**
+        * Hide each child node and the connecting link, and recursively collapse each child node.
+        * @param {number=} level How many levels of the tree, starting at this node, to keep expanded if already expanded;
+        *    the default is 1, hiding all tree children of this node.  Values less than 1 are treated as 1.
+        */
+        collapseTree(level?: number): void;
+
+        /**
+        * Show each child node and the connecting link, and perhaps recursively expand their child nodes.
+        * @param {number=} level How many levels of the tree should be expanded;
+        *    the default is 2, showing all tree children of this node and potentially more.
+        *    Values less than 2 are treated as 2.
+        */
+        expandTree(level?: number): void;
+
+        /**
+        * Returns an iterator over all of the Links that go from this node to another node or vice-versa, perhaps limited to a given port id on this node and a port id on the other node.
+        * @param {Node} othernode
+        * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
+        * @param {string|null=} otherpid A port identifier string; if null the link's portId is ignored and all links are included in the search.
+        */
+        findLinksBetween(othernode: Node, pid?: string, otherpid?: string): Iterator<Link>;
+
+        /**
+        * Returns an iterator over all of the Links that connect with this node in either direction, perhaps limited to the given port id on this node.
+        * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
+        */
+        findLinksConnected(pid?: string): Iterator<Link>;
+
+        /**
+        * Returns an iterator over all of the Links that go into this node, perhaps limited to the given port id on this node.
+        * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
+        */
+        findLinksInto(pid?: string): Iterator<Link>;
+
+        /**
+        * Returns an iterator over all of the Links that come out of this node, perhaps limited to the given port id on this node.
+        * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
+        */
+        findLinksOutOf(pid?: string): Iterator<Link>;
+
+        /**
+        * Returns an iterator over all of the Links that go from this node to another node, perhaps limited to a given port id on this node and a port id on the other node.
+        * @param {Node} othernode
+        * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
+        * @param {string|null=} otherpid A port identifier string; if null the link's portId is ignored and all links are included in the search.
+        */
+        findLinksTo(othernode: Node, pid?: string, otherpid?: string): Iterator<Link>;
+
+        /**
+        * Returns an iterator over the Nodes that are connected with this node in either direction, perhaps limited to the given port id on this node.
+        * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
+        */
+        findNodesConnected(pid?: string): Iterator<Node>;
+
+        /**
+        * Returns an iterator over the Nodes that are connected with this node by links going into this node, perhaps limited to the given port id on this node.
+        * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
+        */
+        findNodesInto(pid?: string): Iterator<Node>;
+
+        /**
+        * Returns an iterator over the Nodes that are connected with this node by links coming out of this node, perhaps limited to the given port id on this node.
+        * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
+        */
+        findNodesOutOf(pid?: string): Iterator<Node>;
+
+        /**
+        * Find a GraphObject with a given GraphObject.portId.
+        * @param {string} pid
+        */
+        findPort(pid: string): GraphObject;
+
+        /**
+        * Returns an Iterator for the collection of Links that connect with the immediate tree children of this node.
+        */
+        findTreeChildrenLinks(): Iterator<Link>;
+
+        /**
+        * Returns an Iterator for the collection of Nodes that are the immediate tree children of this node.
+        */
+        findTreeChildrenNodes(): Iterator<Node>;
+
+        /**
+        * Return how deep this node is in a tree structure.
+        * For tree root nodes, this returns zero.
+        */
+        findTreeLevel(): number;
+
+        /**
+        * Returns the Link that connects with the tree parent Node of this node if the graph is tree-structured, if there is such a link and Link.isTreeLink is true.
+        */
+        findTreeParentLink(): Link;
+
+        /**
+        * Returns the Node that is the tree parent of this node if the graph is tree-structured, if there is a parent.
+        */
+        findTreeParentNode(): Node;
+
+        /**
+        * Return a collection of Parts including this Node, all of the Links going to child Nodes, and all of their tree child nodes and links.
+        * @param {number=} level How many levels of the tree, starting at this node, to include;
+        *    the default is Infinity, including all tree children of this node.  Values less than 1 are treated as 1.
+        */
+        findTreeParts(level?: number): Set<Part>;
+
+        /**
+        * Return the Node that is at the root of the tree that this node is in, perhaps this node itself.
+        */
+        findTreeRoot(): Node;
+
+        /**
+        * This predicate is true if this node is a child of the given Node, perhaps indirectly as a descendant.
+        * @param {Node} node the Node that might be a parent or ancestor of this node.
+        */
+        isInTreeOf(node: Node): boolean;
+
+        /**This value for GraphObject.fromEndSegmentDirection and GraphObject.toEndSegmentDirection indicates that the link's end segment angle stays the same even if the node is rotated.*/
+        static DirectionAbsolute: EnumValue;
+
+        /**This value for Link.fromEndSegmentDirection and Link.toEndSegmentDirection indicates that the real value is inherited from the corresponding connected port.*/
+        static DirectionDefault: EnumValue;
+
+        /**This value for GraphObject.fromEndSegmentDirection and GraphObject.toEndSegmentDirection indicates that the link's end segment angle is rotated to match the node's angle.*/
+        static DirectionRotatedNode: EnumValue;
+
+        /**This value for GraphObject.fromEndSegmentDirection and GraphObject.toEndSegmentDirection indicates that the link's end segment angle is rotated to match the node's angle, but only in increments of 90 degrees.*/
+        static DirectionRotatedNodeOrthogonal: EnumValue;
+
+        /**This value for Node.portSpreading indicates that links connecting with a port should be distributed evenly along the side(s) indicated by a Spot that is a "side" Spot.*/
+        static SpreadingEvenly: EnumValue;
+
+        /**This value for Node.portSpreading indicates that links connecting with a port should connect at a single point on the side(s) indicated by a Spot that is a "side" Spot.*/
+        static SpreadingNone: EnumValue;
+
+        /**This value for Node.portSpreading indicates that links connecting with a port should be packed together based on the link's shape's width on the side(s) indicated by a Spot that is a "side" Spot.*/
+        static SpreadingPacked: EnumValue;
+
+        canAvoid(): boolean;  // undocumented
+        findVisibleNode(): Node;  // undocumented
+        getAvoidableRect(result: Rect): Rect;  // undocumented
+        invalidateLinkBundle(other: Node, thisportid?: string, otherportid?: string): void;  // undocumented
+        invalidateConnectedLinks(): void;  // undocumented
+    }
+
+    /**
+    * An Overview is a Diagram that displays all of a different diagram,
+    * with a rectangular box showing the viewport displayed by that other diagram.
+    * All you need to do is set Overview.observed.
+    */
+    class Overview extends Diagram {
+        /**
+        * @param {HTMLDivElement} div A reference to a DIV element in the DOM.
+        */
+        constructor(div: HTMLDivElement);
+        /**
+        * @param {string} id A reference to a DIV by its ID as a string.
+        */
+        constructor(id?: string);
+
+        /**Gets or sets the rectangular Part that represents the viewport of the .observed Diagram.*/
+        box: Part;
+
+        /**Gets or sets whether this overview draws the temporary layers of the observed Diagram.*/
+        drawsTemporaryLayers: boolean;
+
+        /**Gets or sets the Diagram for which this Overview is displaying a model and showing its viewport into that model.*/
+        observed: Diagram;
+    }
+
+    /**
+    * Palette extends the Diagram class to allow objects to be dragged and placed onto other Diagrams.
+    * Its Diagram.layout is a GridLayout.
+    * The Palette is Diagram.isReadOnly but to support drag-and-drop its Diagram.allowDragOut is true.
+    */
+    class Palette extends Diagram {
+        /**
+        * @param {HTMLDivElement} div A reference to a DIV in the DOM.
+        */
+        constructor(div: HTMLDivElement);
+        /**
+        * @param {string} id A reference to a DIV by its ID as a string.
+        */
+        constructor(id?: string);
+    }
+
+    /**
+    * A Panel is a GraphObject that holds other GraphObjects as its elements.
+    * A Panel is responsible for sizing and positioning its elements.
+    * Every Panel has a .type and establishes its own coordinate system. The .type of a Panel
+    * determines how it will size and arrange its elements.
+    */
+    class Panel extends GraphObject {
+        /**
+        * Constructs an empty Panel of the given .type.
+        * @param {EnumValue=} type If not supplied, the default Panel type is Panel.Position.
+        */
+        constructor(type?: EnumValue);
+
+        /**This read-only property returns the number of columns in this Panel if it is of .type Panel.Table.*/
+        columnCount: number;
+
+        /**Gets or sets how this Panel's columns deal with extra space if the Panel is of .type Panel.Table.*/
+        columnSizing: EnumValue;
+
+        /**Gets or sets the optional model data to which this panel is data-bound.*/
+        data: any;
+
+        /**Gets or sets the default alignment spot of this Panel, used as the alignment for an element when its GraphObject.alignment value is Spot.Default.*/
+        defaultAlignment: Spot;
+
+        /**Gets or sets the default dash array for a particular column's separator.*/
+        defaultColumnSeparatorDashArray: Array<number>;
+
+        /**Gets or sets the default Brush stroke (or CSS color string) for columns in a Table Panel provided a given column has a nonzero RowColumnDefinition.separatorStrokeWidth.*/
+        defaultColumnSeparatorStroke: BrushLike;
+
+        /**Gets or sets the default stroke width for a particular column's separator.*/
+        defaultColumnSeparatorStrokeWidth: number;
+
+        /**Gets or sets the default dash array for a particular row's separator.*/
+        defaultRowSeparatorDashArray: Array<number>;
+
+        /**Gets or sets the default Brush stroke (or CSS color string) for rows in a Table Panel provided a given row has a nonzero RowColumnDefinition.separatorStrokeWidth.*/
+        defaultRowSeparatorStroke: BrushLike;
+
+        /**Gets or sets the default stroke width for a particular row's separator.*/
+        defaultRowSeparatorStrokeWidth: number;
+
+        /**Gets or sets the additional padding for a particular row or column, a Margin (or number for a uniform Margin).*/
+        defaultSeparatorPadding: MarginLike;
+
+        /**Gets or sets the default stretch of this Panel, used as the stretch for an element when its GraphObject.stretch value is GraphObject.Default.*/
+        defaultStretch: EnumValue;
+
+        /**This read-only property returns an iterator over the collection of the GraphObjects that this panel manages.*/
+        elements: Iterator<GraphObject>;
+
+        /**Gets or sets the distance between lines in a .Grid panel.*/
+        gridCellSize: Size;
+
+        /**Gets or sets an origin point for the grid cells in a .Grid panel.*/
+        gridOrigin: Point;
+
+        /**Gets or sets a JavaScript Array of values or objects, each of which will be represented by a Panel as elements in this Panel.*/
+        itemArray: Array<any>;
+
+        /**Gets or sets the name of the item data property that returns a string describing that data's category, or a function that takes an item data object and returns that string; the default value is the name 'category'.*/
+        itemCategoryProperty: PropertyAccessor;
+
+        /**This read-only property returns the index of the item in the containing Panel's Panel.itemArray that this Panel represents.*/
+        itemIndex: number;
+
+        /**Gets or sets the default Panel template used as the archetype for item data that are in .itemArray.*/
+        itemTemplate: Panel;
+
+        /**Gets or sets a Map mapping template names to Panels.*/
+        itemTemplateMap: Map<string,Panel>;
+
+        /**Gets or sets the first column that this Panel of .type Panel.Table displays.*/
+        leftIndex: number;
+
+        /**Gets or sets the space between this Panel's border and its content, as a Margin (or number for a uniform Margin), depending on the type of panel.*/
+        padding: MarginLike;
+
+        /**This read-only property returns the number of row in this Panel if it is of .type Panel.Table.*/
+        rowCount: number;
+
+        /**Gets or sets how this Panel's rows deal with extra space if the Panel is of .type Panel.Table.*/
+        rowSizing: EnumValue;
+
+        /**Gets or sets the first row that this this Panel of .type Panel.Table displays.*/
+        topIndex: number;
+
+        /**Gets or sets the type of the Panel.*/
+        type: EnumValue;
+
+        /**Gets or sets how a .Viewbox panel will resize its content.*/
+        viewboxStretch: EnumValue;
+
+        /**
+        * Adds a GraphObject to the end of this Panel's list of elements, visually in front of all of the other elements.
+        * @param {GraphObject} element A GraphObject.
+        */
+        add(element: GraphObject): void;
+
+        /**
+        * Creates a deep copy of this Panel and returns it.
+        */
+        copy(): Panel;
+
+        /**
+        * Returns the GraphObject in this Panel's list of elements at the specified index.
+        * @param {number} idx a zero-based index
+        */
+        elt(idx: number): GraphObject;
+
+        /**
+        * Returns the cell at a given x-coordinate in local coordinates.
+        * @param {number} x
+        */
+        findColumnForLocalX(x: number): number;
+
+        /**
+        * Returns the first immediate child element with GraphObject.isPanelMain set to true,
+        * or if there is no such child element, just the first element.
+        */
+        findMainElement(): GraphObject;
+
+        /**
+        * Search the visual tree starting at this Panel for a GraphObject whose GraphObject.name is the given name.
+        * @param {string} name The name to search for, using a case-sensitive string comparison.
+        */
+        findObject(name: string): GraphObject;
+
+        /**
+        * Return the Panel that was made for a particular data object in this panel's itemArray.
+        * If this returns a Panel, its data property will be the argument data object.
+        */
+        findItemPanelForData(data: Object): Panel;
+
+        /**
+        * Returns the row at a given y-coordinate in local coordinates.
+        * @param {number} y
+        */
+        findRowForLocalY(y: number): number;
+
+        /**
+        * Gets the RowColumnDefinition for a particular column in this Table Panel.
+        * @param {number} idx the non-negative zero-based integer column index.
+        */
+        getColumnDefinition(idx: number): RowColumnDefinition;
+
+        /**
+        * Gets the RowColumnDefinition for a particular row in this Table Panel.
+        * @param {number} idx the non-negative zero-based integer row index.
+        */
+        getRowDefinition(idx: number): RowColumnDefinition;
+
+        /**
+        * Adds a GraphObject to the Panel's list of elements at the specified index.
+        * @param {number} index
+        * @param {GraphObject} element A GraphObject.
+        */
+        insertAt(index: number, element: GraphObject): void;
+
+        /**
+        * Create and add new GraphObjects corresponding to and bound to the data in the .itemArray, after removing all existing elements from this Panel.
+        */
+        rebuildItemElements(): void;
+
+        /**
+        * Removes a GraphObject from this Panel's list of elements.
+        * @param {GraphObject} element A GraphObject.
+        */
+        remove(element: GraphObject): void;
+
+        /**
+        * Removes an GraphObject from this Panel's list of elements at the specified index.
+        * @param {number} idx
+        */
+        removeAt(idx: number): void;
+
+        /**
+        * Removes the RowColumnDefinition for a particular row in this Table Panel.
+        * @param {number} idx the non-negative zero-based integer row index.
+        */
+        removeColumnDefinition(idx: number): void;
+
+        /**
+        * Removes the RowColumnDefinition for a particular row in this Table Panel.
+        * @param {number} idx the non-negative zero-based integer row index.
+        */
+        removeRowDefinition(idx: number): void;
+
+        /**
+        * Re-evaluate all data bindings on this panel, in order to assign new property values to the GraphObjects in this visual tree based on this this object's .data property values.
+        * @param {string=} srcprop An optional source data property name:
+        *   when provided, only evaluates those Bindings that use that particular property;
+        *   when not provided or when it is the empty string, all bindings are evaluated.
+        */
+        updateTargetBindings(srcprop?: string): void;
+
+        /**This value for .type resizes the main element to fit around the other elements; the main element is the first GraphObject with GraphObject.isPanelMain set to true, or else the first GraphObject if none have that property set to true.*/
+        static Auto: EnumValue;
+
+        /**This value for .type is used to draw regular patterns of lines.*/
+        static Grid: EnumValue;
+
+        /**This value for .type lays out the elements horizontally with their GraphObject.alignment property dictating their alignment on the Y-axis.*/
+        static Horizontal: EnumValue;
+
+        /**This value for .type is used for Links and adornments that act as Links.*/
+        static Link: EnumValue;
+
+        /**The default .type arranges each element according to their GraphObject.position.*/
+        static Position: EnumValue;
+
+        /**This value for .type arranges GraphObjects about a main element using the GraphObject.alignment and GraphObject.alignmentFocus properties; the main element is the first GraphObject with GraphObject.isPanelMain set to true, or else the first GraphObject if none have that property set to true.*/
+        static Spot: EnumValue;
+
+        /**This value for .type arranges GraphObjects into rows and columns; set the GraphObject.row and GraphObject.column properties on each element.*/
+        static Table: EnumValue;
+
+        /**Organizational Panel type that is only valid inside of a Table panel.*/
+        static TableColumn: EnumValue;
+
+        /**Organizational Panel type that is only valid inside of a Table panel.*/
+        static TableRow: EnumValue;
+
+        /**This value for .type lays out the elements vertically with their GraphObject.alignment property dictating their alignment on the X-axis.*/
+        static Vertical: EnumValue;
+
+        /**This value for .type rescales a single GraphObject to fit inside the panel depending on the element's GraphObject.stretch property.*/
+        static Viewbox: EnumValue;
+    }
+
+    /**
+    * This is the base class for all user-manipulated top-level objects.
+    * Because it inherits from Panel, it is automatically a visual container
+    * of other GraphObjects.
+    * Because it thus also inherits from GraphObject, it also has properties such as
+    * GraphObject.actualBounds, GraphObject.contextMenu, and GraphObject.visible.
+    */
+    class Part extends Panel {
+        /**
+        * The constructor builds an empty Part.
+        * @param {EnumValue=} type if not supplied, the default Panel type is Panel.Position.
+        */
+        constructor(type?: EnumValue);
+
+        /**This read-only property returns an iterator over all of the Adornments associated with this part.*/
+        adornments: Iterator<Adornment>;
+
+        /**Gets or sets the category of this part, typically used to distinguish different kinds of nodes or links.*/
+        category: string;
+
+        /**Gets or sets the Group of which this Part or Node is a member.*/
+        containingGroup: Group;
+
+        /**Gets or sets the function that is called after this Part has changed which Group it belongs to, if any.*/
+        containingGroupChanged: (member: Part, oldgrp: Group, newgrp: Group) => void;
+
+        /**Gets or sets whether the user may copy this part.*/
+        copyable: boolean;
+
+        /**Gets or sets whether the user may delete this part.*/
+        deletable: boolean;
+
+        /**This read-only property returns the Diagram that this Part is in.*/
+        diagram: Diagram;
+
+        /**Gets or sets the function used to determine the location that this Part can be dragged to.*/
+        dragComputation: (part: Part, oldloc: Point, newloc: Point) => Point;
+
+        /**Gets or sets whether the user may group this part to be a member of a new Group.*/
+        groupable: boolean;
+
+        /**Gets or sets whether this Part may be animated.*/
+        isAnimated: boolean;
+
+        /**Gets or sets whether this Part is highlighted.*/
+        isHighlighted: boolean;
+
+        /**Gets or sets whether this Part is part of the document bounds.*/
+        isInDocumentBounds: boolean;
+
+        /**Gets or sets whether a Layout positions this Node or routes this Link.*/
+        isLayoutPositioned: boolean;
+
+        /**Gets or sets whether this Part is selected.*/
+        isSelected: boolean;
+
+        /**Gets or sets whether this part will draw shadows.*/
+        isShadowed: boolean;
+
+        /**Gets whether this part is not member of any Group node nor is it a label node for a Link.*/
+        isTopLevel: boolean;
+
+        /**This read-only property returns the Layer that this Part is in.*/
+        layer: Layer;
+
+        /**Gets or sets the function to execute when this part changes layers.*/
+        layerChanged: (part: Part, oldlayer: Layer, newlayer: Layer) => void;
+
+        /**Gets or sets the layer name for this part.*/
+        layerName: string;
+
+        /**Gets or sets "Layout..." flags that control when the Layout that is responsible for this Part is invalidated.*/
+        layoutConditions: number;
+
+        /**Gets or sets the position of this part in document coordinates, based on the .locationSpot in this part's .locationObject.*/
+        location: Point;
+
+        /**This read-only property returns the GraphObject that determines the location of this Part.*/
+        locationObject: GraphObject;
+
+        /**Gets or sets the name of the GraphObject that provides the location of this Part.*/
+        locationObjectName: string;
+
+        /**Gets or sets the location Spot of this Node, the spot on the .locationObject that is used in positioning this part in the diagram.*/
+        locationSpot: Spot;
+
+        /**Gets or sets the maximum location of this Part to which the user may drag using the DraggingTool.*/
+        maxLocation: Point;
+
+        /**Gets or sets the minimum location of this Part to which the user may drag using the DraggingTool.*/
+        minLocation: Point;
+
+        /**Gets or sets whether the user may move this part.*/
+        movable: boolean;
+
+        /**Gets or sets whether the user may reshape this part.*/
+        reshapable: boolean;
+
+        /**Gets or sets whether the user may resize this part.*/
+        resizable: boolean;
+
+        /**Gets or sets the adornment template used to create a resize handle Adornment for this part.*/
+        resizeAdornmentTemplate: Adornment;
+
+        /**Gets or sets the width and height multiples used when resizing.*/
+        resizeCellSize: Size;
+
+        /**This read-only property returns the GraphObject that should get resize handles when this part is selected.*/
+        resizeObject: GraphObject;
+
+        /**Gets or sets the name of the GraphObject that should get a resize handle when this part is selected.*/
+        resizeObjectName: string;
+
+        /**Gets or sets whether the user may rotate this part.*/
+        rotatable: boolean;
+
+        /**Gets or sets the adornment template used to create a rotation handle Adornment for this part.*/
+        rotateAdornmentTemplate: Adornment;
+
+        /**This read-only property returns the GraphObject that should get rotate handles when this part is selected.*/
+        rotateObject: GraphObject;
+
+        /**Gets or sets the name of the GraphObject that should get a rotate handle when this part is selected.*/
+        rotateObjectName: string;
+
+        /**Gets or sets whether the user may select this part.*/
+        selectable: boolean;
+
+        /**Gets or sets whether a selection adornment is shown for this part when it is selected.*/
+        selectionAdorned: boolean;
+
+        /**Gets or sets the Adornment template used to create a selection handle for this Part.*/
+        selectionAdornmentTemplate: Adornment;
+
+        /**Gets or sets the function to execute when this part is selected or deselected.*/
+        selectionChanged: (p: Part) => void;
+
+        /**This read-only property returns the GraphObject that should get a selection handle when this part is selected.*/
+        selectionObject: GraphObject;
+
+        /**Gets or sets the name of the GraphObject that should get a selection handle when this part is selected.*/
+        selectionObjectName: string;
+
+        /**Gets or sets the numerical value that describes the shadow's blur.*/
+        shadowBlur: number;
+
+        /**Gets or sets the CSS string that describes a shadow color.*/
+        shadowColor: string;
+
+        /**Gets or sets the X and Y offset of this part's shadow.*/
+        shadowOffset: Point;
+
+        /**Gets or sets whether this GraphObject will be shadowed inside a Part that has Part.isShadowed set to true; default is null, meaning obey default shadow rules for Part.isShadowed.*/
+        shadowVisible: boolean;
+
+        /**Gets or sets a text string that is associated with this part.*/
+        text: string;
+
+        /**Gets or sets whether the user may do in-place text editing on TextBlocks in this part that have TextBlock.editable set to true.*/
+        textEditable: boolean;
+
+        /**Gets or sets the Z-ordering position of this Part within its Layer; default value is NaN which means "don't care".*/
+        zOrder: number;
+
+        /**
+        * Associate an Adornment with this Part, perhaps replacing any existing adornment.
+        * @param {string} category a string identifying the kind or role of the given adornment for this Part.
+        * @param {Adornment} ad
+        */
+        addAdornment(category: string, ad: Adornment): void;
+
+        /**
+        * This predicate returns true if .copyable is true, if the layer's Layer.allowCopy is true, and if the diagram's Diagram.allowCopy is true.
+        */
+        canCopy(): boolean;
+
+        /**
+        * This predicate returns true if .deletable is true, if the layer's Layer.allowDelete is true, and if the diagram's Diagram.allowDelete is true.
+        */
+        canDelete(): boolean;
+
+        /**
+        * This predicate returns true if .textEditable is true, if the layer's Layer.allowTextEdit is true, and if the diagram's Diagram.allowTextEdit is true.
+        */
+        canEdit(): boolean;
+
+        /**
+        * This predicate returns true if .groupable is true, if the layer's Layer.allowGroup is true, and if the diagram's Diagram.allowGroup is true.
+        */
+        canGroup(): boolean;
+
+        /**
+        * This predicate is called by Layout implementations to decide whether this Part should be positioned and might affect the positioning of other Parts.
+        */
+        canLayout(): boolean;
+
+        /**
+        * This predicate returns true if .movable is true, if the layer's Layer.allowMove is true, and if the diagram's Diagram.allowMove is true.
+        */
+        canMove(): boolean;
+
+        /**
+        * This predicate returns true if .reshapable is true, if the layer's Layer.allowReshape is true, and if the diagram's Diagram.allowReshape is true.
+        */
+        canReshape(): boolean;
+
+        /**
+        * This predicate returns true if .resizable is true, if the layer's Layer.allowResize is true, and if the diagram's Diagram.allowResize is true.
+        */
+        canResize(): boolean;
+
+        /**
+        * This predicate returns true if .rotatable is true, if the layer's Layer.allowRotate is true, and if the diagram's Diagram.allowRotate is true.
+        */
+        canRotate(): boolean;
+
+        /**
+        * This predicate returns true if .selectable is true, if the layer's Layer.allowSelect is true, and if the diagram's Diagram.allowSelect is true.
+        */
+        canSelect(): boolean;
+
+        /**
+        * Remove all adornments associated with this part.
+        */
+        clearAdornments(): void;
+
+        /**
+        * Measures if needed to make sure the GraphObject.measuredBounds and GraphObject.naturalBounds are all real numbers,
+        * primarily to get the actual width and height.
+        * GraphObject.actualBounds will get a real width and height, but the x and y values may continue to be <code>NaN</code>
+        * if they were that way beforehand.
+        */
+        ensureBounds(): void;
+
+        /**
+        * Find an Adornment of a given category associated with this Part.
+        * @param {string} category
+        */
+        findAdornment(category: string): Adornment;
+
+        /**
+        * Find the Group that contains both this part and another one.
+        * @param {Part} other
+        */
+        findCommonContainingGroup(other: Part): Group;
+
+        /**
+        * Return how deep this part is in the hierarchy of nested Groups.
+        * For top level parts, i.e. isTopLevel, this returns zero.
+        */
+        findSubGraphLevel(): number;
+
+        /**
+        * Gets the top-level Part for this part, which is itself when .isTopLevel is true.
+        */
+        findTopLevelPart(): Part;
+
+        /**
+        * Invalidate the Layout that is responsible for positioning this Part.
+        * @param {number=} condition the reason that the layout should be invalidated --
+        * some combination of "Layout..." flag values;
+        * if this argument is not supplied, any value of .layoutConditions other than Part.LayoutNone
+        * will allow the layout to be invalidated.
+        */
+        invalidateLayout(condition?: number): void;
+
+        /**
+        * This predicate is true if this part is a member of the given Part, perhaps indirectly.
+        * @param {Part} part
+        */
+        isMemberOf(part: Part): boolean;
+
+        /**
+        * This predicate is true if this Part can be seen.
+        */
+        isVisible(): boolean;
+
+        /**
+        * Move this part and any parts that are owned by this part to a new position.
+        * @param {Point} newpos a new Point in document coordinates.
+        */
+        move(newpos: Point): void;
+
+        /**
+        * Move this part and any parts that are owned by this part to a new position.
+        * @param {number} x the new X position in document coordinates.
+        * @param {number} y the new Y position in document coordinates.
+        */
+        moveTo(x: number, y: number): void;
+
+        /**
+        * Remove any Adornment of the given category that may be associated with this Part.
+        * @param {string} category a string identifying the kind or role of the given adornment for this Part.
+        */
+        removeAdornment(category: string): void;
+
+        /**
+        * This is responsible for creating any selection Adornment (if this Part .isSelected) and any tool adornments for this part.*/
+        updateAdornments(): void;
+
+        /**
+        * Re-evaluate all data bindings on this Part, in order to assign new property values to the GraphObjects in this visual tree based on this this object's .data property values.
+        * @param {string=} srcprop An optional source data property name:
+        *   when provided, only evaluates those Bindings that use that particular property;
+        *   when not provided or when it is the empty string, all bindings are evaluated.
+        */
+        updateTargetBindings(srcprop?: string): void;
+
+        /**
+        * Update all of the references to nodes in case they had been modified in the model without
+        * properly notifying the model by calling GraphLinksModel.setGroupKeyForNodeData or
+        * GraphLinksModel.setToKeyForLinkData or other similar methods.
+        */
+        updateRelationshipsFromData(): void;
+
+        /**This flag may be combined with other "Layout" flags as the value of the Part.layoutConditions property to indicate that when a Part is added to a Diagram or Group, it invalidates the Layout responsible for the Part.*/
+        static LayoutAdded: number;
+
+        /**This flag may be combined with other "Layout" flags as the value of the Part.layoutConditions property to indicate that when a Group has been laid out, it invalidates the Layout responsible for that Group; this flag is ignored for Parts that are not Groups.*/
+        static LayoutGroupLayout: number;
+
+        /**This flag may be combined with other "Layout" flags as the value of the Part.layoutConditions property to indicate that when a Part's GraphObject.visible becomes false, it invalidates the Layout responsible for the Part.*/
+        static LayoutHidden: number;
+
+        /**This flag may be combined with other "Layout" flags as the value of the Part.layoutConditions property to indicate that when a Node or simple Part's .category changes, it invalidates the Layout responsible for the Part; this flag is ignored for Parts that are Links.*/
+        static LayoutNodeReplaced: number;
+
+        /**This flag may be combined with other "Layout" flags as the value of the Part.layoutConditions property to indicate that when a Part's GraphObject.actualBounds changes size, it invalidates the Layout responsible for the Part; this flag is ignored for Parts that are Links.*/
+        static LayoutNodeSized: number;
+
+        /**This value may be used as the value of the Part.layoutConditions property to indicate that no operation on this Part causes invalidation of the Layout responsible for this Part.*/
+        static LayoutNone: number;
+
+        /**This flag may be combined with other "Layout" flags as the value of the Part.layoutConditions property to indicate that when a Part is removed from a Diagram or Group, it invalidates the Layout responsible for the Part.*/
+        static LayoutRemoved: number;
+
+        /**This flag may be combined with other "Layout" flags as the value of the Part.layoutConditions property to indicate that when a Part's GraphObject.visible becomes true, it invalidates the Layout responsible for the Part.*/
+        static LayoutShown: number;
+
+        /**This is the default value for the Part.layoutConditions property: the Layout responsible for the Part is invalidated when the Part is added or removed from the Diagram or Group or when it changes visibility or size or when a Group's layout has been performed.*/
+        static LayoutStandard: number;
+    }
+
+    /**
+    * A Picture is a GraphObject that shows an image, video-frame, or Canvas element.
+    * You can specify what to show by either setting the .source URL property
+    * to a URL string or the .element property to an HTMLImageElement,
+    * HTMLCanvasElement, or HTMLVideoElement.
+    */
+    class Picture extends GraphObject {
+        /**
+        * The constructor creates a picture that shows nothing until the .source or .element is specified.
+        */
+        constructor();
+
+        /**Gets or sets the Picture's HTML element, an Image or Video or Canvas element.*/
+        element: HTMLElement;
+
+        /**Gets or sets the function to call if an image fails to load.*/
+        errorFunction: (pic: Picture, e: Event) => void;
+
+        /**Gets or sets how the Picture's image is stretched within its bounding box.*/
+        imageStretch: EnumValue;
+
+        /**This read-only property returns the natural size of this picture as determined by its source's width and height.*/
+        naturalBounds: Rect;
+
+        /**Gets or sets the Picture's source URL, which can be any valid image (png, jpg, gif, etc) URL.*/
+        source: string;
+
+        /**Gets or sets a function that returns a value for image.crossOrigin, which is null by default.*/
+        sourceCrossOrigin: (pic: Picture) => string;
+
+        /**Gets or sets the rectangular area of the source image that this picture should display.*/
+        sourceRect: Rect;
+
+        static clearCache(url?: string): void;  // undocumented
+    }
+
+    /**
+    * If a Placeholder is in the visual tree of a Group, it represents the area of all of the member Parts of that Group.
+    * If a Placeholder is in the visual tree of an Adornment, it represents the area of the Adornment.adornedObject.
+    * It can only be used in the visual tree of a Group node or an Adornment.
+    * There can be at most one Placeholder in a Group or an Adornment.
+    */
+    class Placeholder extends GraphObject {
+        /**
+        * The only common initialize of a Placeholder is to set its .padding.
+        */
+        constructor();
+
+        /**Gets or sets the padding as a Margin (or number for a uniform Margin) around the members of the Group or around the Adornment.adornedObject GraphObject.*/
+        padding: MarginLike;
+    }
+
+    /**
+    * The RowColumnDefinition class describes constraints on a row or a column
+    * in a Panel of type Panel.Table.
+    * It also provides information about the actual layout after the
+    * Table Panel has been arranged.
+    */
+    class RowColumnDefinition {
+        /**
+        * You do not need to use this constructor, because calls to Panel.getRowDefinition or Panel.getColumnDefinition will automatically create and remember a RowColumnDefinition for you.
+        */
+        constructor();
+
+        /**This read-only property returns the usable row height or column width, after arrangement, that objects in this row or column can be placed within.*/
+        actual: number;
+
+        /**Gets or sets a default alignment for elements that are in this row or column.*/
+        alignment: Spot;
+
+        /**Gets or sets the background Brush (or CSS color string) for a particular row or column, which fills the entire span of the column, including any separatorPadding.*/
+        background: BrushLike;
+
+        /**Determines whether or not the background, if there is one, is in front of or behind the separators.*/
+        coversSeparators: boolean;
+
+        /**Gets or sets the row height.*/
+        height: number;
+
+        /**This read-only property returns which row or column this RowColumnDefinition describes in the .panel.*/
+        index: number;
+
+        /**This read-only property returns whether this describes a row or a column in the .panel.*/
+        isRow: boolean;
+
+        /**Gets or sets the maximum row height or column width.*/
+        maximum: number;
+
+        /**Gets or sets the minimum row height or column width.*/
+        minimum: number;
+
+        /**This read-only property returns the Panel that this row or column definition is in.*/
+        panel: Panel;
+
+        /**This read-only property returns the actual arranged row or column starting position, after arrangement.*/
+        position: number;
+
+        /**Gets or sets the dash array for dashing the spacing provided this row or column has a nonzero RowColumnDefinition.separatorStrokeWidth and non-null RowColumnDefinition.separatorStroke.*/
+        separatorDashArray: Array<number>;
+
+        /**Gets or sets the additional padding for a particular row or column, a Margin (or number for a uniform Margin).*/
+        separatorPadding: MarginLike;
+
+        /**Gets or sets the Brush (or CSS color string) for a particular row or column, provided that row or column has a nonzero RowColumnDefinition.separatorStrokeWidth.*/
+        separatorStroke: BrushLike;
+
+        /**Gets or sets the stroke width for a particular row or column's separator,*/
+        separatorStrokeWidth: number;
+
+        /**Gets or sets how this row or column deals with a Table Panel's extra space.*/
+        sizing: EnumValue;
+
+        /**Gets or sets the default stretch for elements that are in this row or column.*/
+        stretch: EnumValue;
+
+        /**This read-only property returns the total arranged row height or column width, after arrangement.*/
+        total: number;
+
+        /**Gets or sets the column width.*/
+        width: number;
+
+        /**
+        * Add a data-binding of a property on this object to a property on a data object.
+        * @param {Binding} binding
+        */
+        bind(binding: Binding): void;
+
+        /**The default .sizing, which resolves to RowColumnDefinition.None or else the Table Panel's rowSizing and columnSizing if present.*/
+        static Default: EnumValue;
+
+        /**The default .sizing if none is specified on the Table Panel's rowSizing and columnSizing.*/
+        static None: EnumValue;
+
+        /**If a Table Panel is larger than all the rows then this .sizing grants this row and any others with the same value the extra space, apportioned proportionally between them*/
+        static ProportionalExtra: EnumValue;
+
+        computeEffectiveSpacing(): number;  // undocumented
+        computeEffectiveSpacingTop(): number;  // undocumented
+    }
+
+    /**
+    * A Shape is a GraphObject that shows a geometric figure.
+    * The Geometry determines what is drawn;
+    * the properties .fill and .stroke
+    * (and other stroke properties) determine how it is drawn.
+    */
+    class Shape extends GraphObject {
+        /**
+        * A newly constructed Shape has a default .figure of "None", which constructs a rectangular geometry, and is filled and stroked with a black brush.
+        */
+        constructor();
+
+        /**Gets or sets the figure name, used to construct a Geometry.*/
+        figure: string;
+
+        /**Gets or sets the Brush (or CSS color string) that describes the fill of the Shape.*/
+        fill: BrushLike;
+
+        /**Gets or sets the name of the kind of arrowhead that this shape should take when this shape is an element of a Link.*/
+        fromArrow: string;
+
+        /**Gets or sets the Shape's Geometry that defines the Shape's figure.*/
+        geometry: Geometry;
+
+        /**Gets or sets how the shape's geometry is proportionally created given its computed size.*/
+        geometryStretch: EnumValue;
+
+        /**When set, creates a Geometry and normalizes it from a given path string, then sets the Geometry on this Shape and offsets the GraphObject.position by an appropriate amount.*/
+        geometryString: string;
+
+        /**Gets or sets how frequently this shape should be drawn within a Grid Panel, in multiples of the Panel.gridCellSize.*/
+        interval: number;
+
+        /**Gets or sets the whether the .position denotes the panel coordinates of the geometry or of the stroked area.*/
+        isGeometryPositioned: boolean;
+
+        /**This read-only property returns the natural bounds of this Shape as determined by its .geometry's bounds.*/
+        naturalBounds: Rect;
+
+        /**Gets or sets a property for parameterizing the construction of a Geometry from a figure.*/
+        parameter1: number;
+
+        /**Gets or sets a property for parameterizing the construction of a Geometry from a figure.*/
+        parameter2: number;
+
+        /**Gets or sets the top-left Spot used by some Panels for determining where in the shape other objects may be placed.*/
+        spot1: Spot;
+
+        /**Gets or sets the bottom-right Spot used by some Panels for determining where in the shape other objects may be placed.*/
+        spot2: Spot;
+
+        /**Gets or sets the Brush (or CSS color string) that describes the stroke of the Shape.*/
+        stroke: BrushLike;
+
+        /**Gets or sets the style for the stroke's line cap.*/
+        strokeCap: string;
+
+        /**Gets or sets the dash array for creating dashed lines.*/
+        strokeDashArray: Array<number>;
+
+        /**Gets or sets the offset for dashed lines, used in the phase pattern.*/
+        strokeDashOffset: number;
+
+        /**Gets or sets the type of corner that will be drawn when two lines meet.*/
+        strokeJoin: string;
+
+        /**Gets or sets the style for the stroke's mitre limit ratio.*/
+        strokeMiterLimit: number;
+
+        /**Gets or sets a stroke's width.*/
+        strokeWidth: number;
+
+        /**Gets or sets the name of the kind of arrowhead that this shape should take when this shape is an element of a Link.*/
+        toArrow: string;
+
+        /**
+        * This static function returns a read-only Map of named geometry generators.
+        * @return {Map} the keys are figure names; the values are either synonymed names or generator functions
+        */
+        static getFigureGenerators(): Map<string,(shape: Shape, width: number, height: number) => Geometry>;
+
+        /**
+        * This static function defines a named figure geometry generator for Shapes.
+        * @param {string} name new figure name must start with an uppercase letter, and must not be "None"
+        * @param {function(Shape, number, number):Geometry} func returns a Geometry for the given Shape, width, and height
+        */
+        static defineFigureGenerator(name: string, func: (shape: Shape, width: number, height: number) => Geometry): void;
+        /**
+        * This static function defines a synonym for a named figure geometry generator.
+        * @param {string} name the new figure name must start with an uppercase letter, and must not be "None"
+        * @param {string} synonym an existing figure name
+        */
+        static defineFigureGenerator(name: string, synonym: string): void;
+
+        /**
+        * This static function returns a read-only Map of named arrowhead geometries.
+        * @return {Map} the keys are arrowhead names; the values are Geometry objects
+        */
+        static getArrowheadGeometries(): Map<string,Geometry>;
+
+        /**
+        * This static function defines a named arrowhead geometry.
+        * @param {string} name the new arrowhead name must start with an uppercase letter, and must not be "None"
+        * @param {Geometry} geo the Geometry for the arrowhead
+        */
+        static defineArrowheadGeometry(name: string, geo: Geometry): void;
+        /**
+        * This static function defines a named arrowhead geometry.
+        * @param {string} name the new arrowhead name must start with an uppercase letter, and must not be "None"
+        * @param {string} pathstr a geometry path string that will be passed to Geometry.parse
+        */
+        static defineArrowheadGeometry(name: string, pathstr: string): void;
+    }
+
+    /**
+    * A TextBlock is a GraphObject that displays a .text string in a given .font.
+    */
+    class TextBlock extends GraphObject {
+        /**
+        * A newly constructed TextBlock has no string to show; if it did, it would draw the text, wrapping if needed, in the default font using a black stroke.
+        */
+        constructor();
+
+        /**Gets or sets whether or not this TextBlock allows in-place editing of the .text string by the user with the help of the TextEditingTool.*/
+        editable: boolean;
+
+        /**Gets or sets the function to call if a text edit made with the TextEditingTool is invalid.*/
+        errorFunction: (tool: TextEditingTool, oldstr: string, newstr: string) => void;
+
+        /**Gets or sets the current font settings.*/
+        font: string;
+
+        /**Gets or sets whether or not the text allows or displays multiple lines or embedded newlines.*/
+        isMultiline: boolean;
+
+        /**Gets or sets whether or not the text has a strikethrough line (line-through).*/
+        isStrikethrough: boolean;
+
+        /**Gets or sets whether or not the text is underlined.*/
+        isUnderline: boolean;
+
+        /**This read-only property returns the total number of lines in this TextBlock, including lines created from returns and wrapping.*/
+        lineCount: number;
+
+        /**Gets or sets the maximum number of lines that this TextBlock may display.*/
+        maxLines: number;
+
+        /**This read-only property returns the natural bounds of this TextBlock in local coordinates, as determined by its .font and .text string.*/
+        naturalBounds: Rect;
+
+        /**Gets or sets how text that is too long to display should be handled.*/
+        overflow: EnumValue;
+
+        /**Gets or sets the Brush (or CSS color string) that describes the stroke (color) of the .font.*/
+        stroke: BrushLike;
+
+        /**Gets or sets the current text string.*/
+        text: string;
+
+        /**Gets or sets the current text alignment property.*/
+        textAlign: string;
+
+        /**Gets or sets the HTMLElement that this TextBlock uses as its text editor in the TextEditingTool.*/
+        textEditor: HTMLElement;
+
+        /**Gets or sets the predicate that determines whether or not a string of text is valid.*/
+        textValidation: (tb: TextBlock, oldstr: string, newstr: string) => boolean;
+
+        /**Gets or sets whether the text should be wrapped if it is too long to fit on one line.*/
+        wrap: EnumValue;
+
+        /**The TextBlock will not wrap its text.*/
+        static None: EnumValue;
+
+        /** Used as the default value for TextBlock.overflow: if the width is too small to display all text, the TextBlock will clip.*/
+        static OverflowClip: EnumValue;
+
+        /** Used as a value for TextBlock.overflow: if the width is too small to display all text, the TextBlock will display an ellipsis.*/
+        static OverflowEllipsis: EnumValue;
+
+        /**The TextBlock will wrap text and the width of the TextBlock will be the desiredSize's width, if any.*/
+        static WrapDesiredSize: EnumValue;
+
+        /**The TextBlock will wrap text, making the width of the TextBlock equal to the width of the longest line.*/
+        static WrapFit: EnumValue;
+
+        spacingAbove: number;  // undocumented
+        spacingBelow: number;  // undocumented
+        static isValidFont(font: string): boolean;  // undocumented
+        static getEllipsis(): string;  // undocumented
+        static setEllipsis(val: string): void;  // undocumented
+    }
+
+
+    /**
+    * A Brush holds color information and describes how to draw the inside
+    * of a Shape or the stroke of a shape or a TextBlock or the
+    * background of any GraphObject.
+    * A Brush must not be modified once it has been assigned to a GraphObject,
+    * such as the Shape.fill or TextBlock.stroke
+    * or GraphObject.background.
+    * However, a Brush may be shared by multiple GraphObjects.
+    */
+    class Brush {
+        /**
+        * Construct a Brush class of a given type.
+        * @param {EnumValue} type one of the values  Brush.Solid, Brush.Linear, Brush.Radial, Brush.Pattern.
+        */
+        constructor(type: EnumValue);
+        /**
+        * Construct a solid color Brush that holds the given color information.
+        * @param {string=} color a well-formed CSS string describing a solid color brush; if not supplied uses 'black'.
+        */
+        constructor(color?: string);
+
+        /**Gets or sets the color of a solid Brush.*/
+        color: string;
+
+        /**Gets or sets a Map holding all of the color stops used in this gradient, where the key is a number, the fractional distance between zero and one (inclusive), and where the corresponding value is a color string.*/
+        colorStops: Map<number,string>;
+
+        /**Gets or sets the ending location for a linear or radial gradient.*/
+        end: Spot;
+
+        /**Gets or sets the radius of a radial brush at the end location.*/
+        endRadius: number;
+
+        /**Gets or sets the pattern of a brush of type Brush.Pattern, an HTMLImageElement or HTMLCanvasElement or HTMLVideoElement.*/
+        pattern: any;
+
+        /**Gets or sets the starting location for a linear or radial gradient.*/
+        start: Spot;
+
+        /**Gets or sets the radius of a radial brush at the start location.*/
+        startRadius: number;
+
+        /**Gets or sets the type of brush.*/
+        type: EnumValue;
+
+        /**
+        * Specify a particular color at a particular fraction of the distance.
+        * If the  .type is Brush.Solid, change the type to Brush.Linear.
+        * You should have a color stop at zero and a color stop at one.
+        * You should not have duplicate color stop values at the same fractional distance.
+        * @param {number} loc between zero and one, inclusive.
+        * @param {string} color a CSS color string
+        */
+        addColorStop(loc: number, color: string): void;
+
+        /**
+        * Create a copy of this Brush, with the same values.
+        */
+        copy(): Brush;
+
+        /**
+        * This static function can be used to generate a random color string.
+        * @param {number=} min a number between zero and 255, defaults to 128.
+        * @param {number=} max a number between zero and 255, defaults to 255.
+        */
+        static randomColor(min?: number, max?: number): string;
+
+        /**For linear gradient brushes, used as the value for Brush.type.*/
+        static Linear: EnumValue;
+
+        /**For pattern brushes, used as the value for Brush.type.*/
+        static Pattern: EnumValue;
+
+        /**For radial gradient brushes, used as the value for Brush.type.*/
+        static Radial: EnumValue;
+
+        /**For simple, solid color brushes, used as the value for Brush.type.*/
+        static Solid: EnumValue;
+
+        static isValidColor(color: string): boolean;  // undocumented
+    }
+
+    /**
+    * The Geometry class is used to define the "shape" of a Shape.
+    * A Geometry can be simple straight lines, rectangles, or ellipses.
+    * A Geometry can also be an arbitrarily complex path, consisting of a list of PathFigures.
+    * A Geometry must not be modified once it has been used by a Shape.
+    * However, a Geometry may be shared by multiple Shapes.
+    */
+    class Geometry {
+        /**
+        * Construct an empty Geometry.
+        * The geometry type must be one of the following values:
+        * Geometry.Line, Geometry.Ellipse, Geometry.Rectangle, Geometry.Path.
+        * @param {EnumValue=} type If not supplied, the default Geometry type is Geometry.Path.
+        */
+        constructor(type?: EnumValue);
+
+        /**This read-only property returns a rectangle that contains all points within the Geometry.*/
+        bounds: Rect;
+
+        /**Gets or sets the Shape.geometryStretch value the Shape should use by default.*/
+        defaultStretch: EnumValue;
+
+        /**Gets or sets the ending X coordinate of the Geometry if it is of type .Line, .Rectangle, or .Ellipse.*/
+        endX: number;
+
+        /**Gets or sets the ending Y coordinate of the Geometry if it is of type .Line, .Rectangle, or .Ellipse.*/
+        endY: number;
+
+        /**Gets or sets the List of PathFigures that describes the content of the path for Geometries of type .Path.*/
+        figures: List<PathFigure>;
+
+        /**Gets or sets the spot to use when the Shape.spot1 value is Spot.Default.*/
+        spot1: Spot;
+
+        /**Gets or sets the spot to use when the Shape.spot2 value is Spot.Default.*/
+        spot2: Spot;
+
+        /**Gets or sets the starting X coordinate of the Geometry if it is of type .Line, .Rectangle, or .Ellipse.*/
+        startX: number;
+
+        /**Gets or sets the starting Y coordinate of the Geometry if it is of type .Line, .Rectangle, or .Ellipse.*/
+        startY: number;
+
+        /**Gets or sets the type of the Geometry.*/
+        type: EnumValue;
+
+        /**
+        * Add a PathFigure to the figures list.
+        * @param {PathFigure} figure a newly allocated unshared PathFigure that will become owned by this Geometry
+        * @return {Geometry} this
+        */
+        add(figure: PathFigure): Geometry;
+
+        /**
+        * Computes the Geometry's bounds without adding an origin point, and returns those bounds as a rect.
+        */
+        computeBoundsWithoutOrigin(): Rect;
+
+        /**
+        * Create a copy of this Geometry, with the same values and figures.
+        */
+        copy(): Geometry;
+
+        /**
+        * Given a SVG or GoJS path string, returns a congruent path string with each PathFigure filled.
+        * For instance, "M0 0 L22 22 L33 0" would become "F M0 0 L22 22 L33 0".
+        * @param {string} str
+        */
+        static fillPath(str: string): string;
+
+        /**
+        * Normalizes the Geometry points in place by ensuring the top-left bounds of the geometry lines up with (0, 0), returning the Point (x, y) amount it was shifted.
+        */
+        normalize(): Point;
+
+        /**
+        * Offsets the Geometry in place by a given (x, y) amount
+        * @param {number} x The x-axis offset factor.
+        * @param {number} y The y-axis offset factor.
+        * @return {Geometry} this
+        */
+        offset(x: number, y: number): Geometry;
+
+        /**
+        * Produce a Geometry from a string that uses an SVG-like compact path geometry syntax.
+        * @param {string} str
+        * @param {boolean=} filled whether figures should be filled.
+        * If true, all PathFigures in the string will be filled regardless of the presence
+        * of an "F" command or not.
+        * If false, all PathFigures will determine their own filled state by the presence of an "F" command or not.
+        * Default is false.
+        */
+        static parse(str: string, filled?: boolean): Geometry;
+
+        /**
+        * Rotates the Geometry in place by a given angle, with optional x and y values to rotate the geometry about.
+        * If no x and y value are giving, (0, 0) is used as the rotation point.
+        * @param {number} angle The angle to rotate by.
+        * @param {number=} x The optional X point to rotate the geometry about. If no point is given, this value is 0.
+        * @param {number=} y The optional Y point to rotate the geometry about. If no point is given, this value is 0.
+        * @return {Geometry} this
+        */
+        rotate(angle: number, x?: number, y?: number): Geometry;
+
+        /**
+        * Scales the Geometry in place by a given (x, y) scale factor
+        * @param {number} x The x-axis scale factor.
+        * @param {number} y The y-axis scale factor.
+        * @return {Geometry} this
+        */
+        scale(x: number, y: number): Geometry;
+
+        /**
+        * This static function can be used to write out a Geometry as a string
+        * that can be read by Geometry.parse.
+        * The string produced by this method is a superset of the SVG path
+        * string rules that contains some additional GoJS-specific tokens.
+        * See the <a href="../../intro/pictures.html">Introduction page on Geometry Parsing</a> for more details.
+        * @param {Geometry} val
+        */
+        static stringify(val: Geometry): string;
+
+        /**For drawing an ellipse fitting within a rectangle; a value for Geometry.type.*/
+        static Ellipse: EnumValue;
+
+        /**For drawing a simple straight line; a value for Geometry.type.*/
+        static Line: EnumValue;
+
+        /**For drawing a complex path made of a list of PathFigures; a value for Geometry.type.*/
+        static Path: EnumValue;
+
+        /**For drawing a rectangle; a value for Geometry.type.*/
+        static Rectangle: EnumValue;
+
+        equalsApprox(g: Geometry): boolean;  // undocumented
+    }
+
+    /**
+    * A Margin represents a band of space outside or inside a rectangular area,
+    * with possibly different values on each of the four sides.
+    */
+    class Margin {
+        /**
+        * If zero arguments are supplied, zero is used for all four sides.
+        */
+        constructor();
+        /**
+        * If one argument is supplied, that number is used for all four sides.
+        * @param {number} m the margin for all four sides.
+        */
+        constructor(m: number);
+        /**
+        * If two arguments are supplied, the top and bottom sides get the first value,
+        * and the left and right sides get the second value.
+        * @param {number} tb the margin for the top and bottom sides
+        * @param {number} rl the margin for the right and left sides
+        */
+        constructor(tb: number, rl: number);
+        /**
+        * If there are four arguments, the numbers represent: top, right, bottom, left.
+        * @param {number} t the margin for the top side;
+        *                    if not supplied, all sides are zero.
+        * @param {number} r the margin for the right side;
+        *                    if not supplied, all sides have the value of the first argument.
+        * @param {number} b the margin for all bottom side;
+        *                    if not supplied, the top and bottom get the value of the first argument,
+        *                    and the right and left sides get the value of the second argument.
+        * @param {number} l the margin for the left side;
+        *                    must be supplied if the third argument was supplied.
+        */
+        constructor(t: number, r: number, b: number, l: number);
+
+        /**Gets or sets the bottom value of this margin.*/
+        bottom: number;
+
+        /**Gets or sets the left value of this margin.*/
+        left: number;
+
+        /**Gets or sets the right value of this margin.*/
+        right: number;
+
+        /**Gets or sets the top value of this margin.*/
+        top: number;
+
+        /**
+        * Create a copy of this Margin, with the same values.
+        */
+        copy(): Margin;
+
+        /**
+        * Indicates whether the given Margin is equal to this Margin.
+        * @param {Margin} m The Margin to compare to this Margin.
+        */
+        equals(m: Margin): boolean;
+
+        /**
+        * Indicates whether the given margin is equal to this Margin.
+        * @param {number} t top.
+        * @param {number} r right.
+        * @param {number} b bottom.
+        * @param {number} l left.
+        */
+        equalTo(t: number, r: number, b: number, l: number): boolean;
+
+        /**
+        * True if this Margin has values that are real numbers and not infinity.
+        */
+        isReal(): boolean;
+
+        /**
+        * This static function can be used to read in a Margin from a string that was produced by Margin.stringify.
+        * @param {string} str
+        */
+        static parse(str: string): Margin;
+
+        /**
+        * Modify this Margin so that its Top, Right, Bottom, and Left values are the same as the given Margin.
+        * @param {Margin} m the Margin whose values are to be copied
+        */
+        set(m: Margin): Margin;
+
+        /**
+        * Modify this Size with new Width and Height values.
+        * @param {number} w the width.
+        * @param {number} h the height.
+        */
+        setTo(t: number, r: number, b: number, l: number): Margin;
+
+        /**
+        * This static function can be used to write out a Margin as a string that can be read by Margin.parse.
+        * @param {Margin} val
+        */
+        static stringify(val: Margin): string;
+
+        equalsApprox(m: Margin): boolean;  // undocumented
+    }
+
+    /**
+    * A PathFigure represents a section of a Geometry.
+    * It is a single connected series of
+    * two-dimensional geometric PathSegments.
+    */
+    class PathFigure {
+        /**
+        * Constructs an empty figure.
+        * The optional arguments specify the starting point of the figure.
+        * You'll want to add a new instance of a PathFigure to the
+        * Geometry.figures list of a Geometry.
+        * @param {number=} sx optional: the X coordinate of the start point (default is zero).
+        * @param {number=} sy optional: the Y coordinate of the start point (default is zero).
+        * @param {boolean=} filled optional: whether the figure is filled (default is true).
+        * @param {boolean=} shadowed optional: whether the figure may be drawn with a shadow (default is true).
+        */
+        constructor(sx?: number, sy?: number, filled?: boolean, shadowed?: boolean);
+
+        /**Gets or sets whether this PathFigure is drawn filled.*/
+        isFilled: boolean;
+
+        /**Gets or sets whether this PathFigure will render a shadow if one is defined.*/
+        isShadowed: boolean;
+
+        /**Gets or sets the List of PathSegments that define this PathFigure.*/
+        segments: List<PathSegment>;
+
+        /**Gets or sets the starting point X coordinate of the PathFigure.*/
+        startX: number;
+
+        /**Gets or sets the starting point Y coordinate of the PathFigure.*/
+        startY: number;
+
+        /**
+        * Add a PathSegment to the segments list.
+        * @param {PathSegment} segment a newly allocated unshared PathSegment that will become owned by this PathFigure
+        * @return {PathFigure} this
+        */
+        add(segment: PathSegment): PathFigure;
+
+        /**
+        * Create a copy of this PathFigure, with the same values and segments.
+        */
+        copy(): PathFigure;
+
+        equalsApprox(f: PathFigure): boolean;  // undocumented
+    }
+
+    /**
+    * A PathSegment represents a straight line or curved segment of a path between
+    * two or more points that are part of a PathFigure.
+    * A PathSegment must not be modified once its containing PathFigure's
+    * Geometry has been assigned to a Shape.
+    */
+    class PathSegment {
+        /**
+        * Constructs a segment that goes nowhere unless you specify some Points.
+        * @param {EnumValue} type
+        * @param {number=} ex optional: the X coordinate of the end point.
+        * @param {number=} ey optional: the Y coordinate of the end point.
+        * @param {number=} x1 optional: the X coordinate of the first bezier control point.
+        * @param {number=} y1 optional: the Y coordinate of the first bezier control point.
+        * @param {number=} x2 optional: the X coordinate of the second cubic bezier control point.
+        * @param {number=} y2 optional: the Y coordinate of the second cubic bezier control point,
+        * or the large-arc-flag of an SvgArc.
+        * @param {boolean=} clockwise optional: whether an SvgArc goes clockwise or counterclockwise.
+        */
+        constructor(type: EnumValue, ex?: number, ey?: number, x1?: number, y1?: number, x2?: number, y2?: number, clockwise?: boolean);
+
+        /**Gets or sets the center X value of the Arc for a PathSegment of type .Arc.*/
+        centerX: number;
+
+        /**Gets or sets the center Y value of the Arc for a PathSegment of type .Arc.*/
+        centerY: number;
+
+        /**Gets or sets the X coordinate of the end point for all kinds of PathSegment.*/
+        endX: number;
+
+        /**Gets or sets the Y coordinate of the end point for all kinds of PathSegment.*/
+        endY: number;
+
+        /**Gets or sets the sweep-flag for a PathSegment of type .SvgArc.*/
+        isClockwiseArc: boolean;
+
+        /**Gets or sets whether the path is closed after this PathSegment.*/
+        isClosed: boolean;
+
+        /**Gets or sets the large-arc-flag for a PathSegment of type .SvgArc.*/
+        isLargeArc: boolean;
+
+        /**Gets or sets the X value of the first control point for a PathSegment of type .Bezier or .QuadraticBezier.*/
+        point1X: number;
+
+        /**Gets or sets the Y value of the first control point for a PathSegment of type .Bezier or .QuadraticBezier.*/
+        point1Y: number;
+
+        /**Gets or sets the X value of the second control point for a PathSegment of type cubic .Bezier.*/
+        point2X: number;
+
+        /**Gets or sets the Y value of the second control point for a PathSegment of type cubic .Bezier.*/
+        point2Y: number;
+
+        /**Gets or sets the X value of the radius for a PathSegment of type .Arc.*/
+        radiusX: number;
+
+        /**Gets or sets the Y value of the radius for a PathSegment of type .Arc.*/
+        radiusY: number;
+
+        /**Gets or sets the starting angle for a PathSegment of type .Arc.*/
+        startAngle: number;
+
+        /**Gets or sets the length of angle in degrees, or amount of arc to "sweep" for a PathSegment of type .Arc.*/
+        sweepAngle: number;
+
+        /**Gets or sets the type of the PathSegment.*/
+        type: EnumValue;
+
+        /**Gets or sets the X-axis rotation for a PathSegment of type .SvgArc.*/
+        xAxisRotation: number;
+
+        /**
+        * Closes the path after this PathSegment.
+        */
+        close(): PathSegment;
+
+        /**
+        * Makes a copy of this PathSegment.
+        */
+        copy(): PathSegment;
+
+        /**For drawing an arc segment, a value for PathSegment.type.*/
+        static Arc: EnumValue;
+
+        /**For drawing a cubic bezier segment, a value for PathSegment.type.*/
+        static Bezier: EnumValue;
+
+        /**For drawing a straight line segment, a value for PathSegment.type.*/
+        static Line: EnumValue;
+
+        /**For beginning a new subpath, a value for PathSegment.type.*/
+        static Move: EnumValue;
+
+        /**For drawing a quadratic bezier segment, a value for PathSegment.type.*/
+        static QuadraticBezier: EnumValue;
+
+        /**For drawing an SVG arc segment, a value for PathSegment.type.*/
+        static SvgArc: EnumValue;
+
+        equalsApprox(s: PathSegment): boolean;  // undocumented
+    }
+
+    /**
+    * A Point represents an x- and y-coordinate pair in two-dimensional space.
+    */
+    class Point {
+        /**
+        * The default constructor produces the Point(0,0).
+        */
+        constructor();
+
+        /**
+        * The two-argument constructor produces the Point(x, y).
+        * @param {number} x
+        * @param {number} y
+        */
+        constructor(x: number, y: number);
+
+        /**Gets or sets the x value of the Point.*/
+        x: number;
+
+        /**Gets or sets the y value of the Point.*/
+        y: number;
+
+        /**
+        * Modify this point so that is the sum of the current Point and the
+        * x and y co-ordinates of the given Point.
+        * @param {Point} p The Point to add to this Point.
+        */
+        add(p: Point): Point;
+
+        /**
+        * Create a copy of this Point, with the same values.
+        */
+        copy(): Point;
+
+        /**
+        * This static function returns the angle in degrees of the line from point P to point Q.
+        * @param {number} px
+        * @param {number} py
+        * @param {number} qx
+        * @param {number} qy
+        */
+        static direction(px: number, py: number, qx: number, qy: number): number;
+
+        /**
+        * Compute the angle from this Point to a given (px,py) point.
+        * However, if the point is the same as this Point, the direction is zero.
+        * @param {number} px
+        * @param {number} py
+        */
+        direction(px: number, py: number): number;
+
+        /**
+        * Compute the angle from this Point to a given Point.
+        * However, if the given Point is the same as this Point, the direction is zero.
+        * @param {Point} p the other Point to which to measure the relative angle.
+        */
+        directionPoint(p: Point): number;
+
+        /**
+        * This static function returns the square of the distance from the point P
+        * to the finite line segment from point A to point B.
+        * @param {number} px
+        * @param {number} py
+        * @param {number} ax
+        * @param {number} ay
+        * @param {number} bx
+        * @param {number} by
+        */
+        static distanceLineSegmentSquared(px: number, py: number, ax: number, ay: number, bx: number, by: number): number;
+
+        /**
+        * Returns the square of the distance from this point to a given point (px, py).
+        * @param {number} px
+        * @param {number} py
+        */
+        distanceSquared(px: number, py: number): number;
+
+        /**
+        * This static function returns the square of the distance from the point P to the point Q.
+        * @param {number} px
+        * @param {number} py
+        * @param {number} qx
+        * @param {number} qy
+        */
+        static distanceSquared(px: number, py: number, qx: number, qy: number): number;
+
+        /**
+        * Returns the square of the distance from this Point to a given Point.
+        * @param {Point} p the other Point to measure to.
+        */
+        distanceSquaredPoint(p: Point): number;
+
+        /**
+        * Indicates whether the given Point is equal to this Point.
+        * @param {Point} p The Point to compare to the current Point.
+        * false otherwise.
+        */
+        equals(p: Point): boolean;
+
+        /**
+        * Indicates whether the given point (x, y) is equal to this Point.
+        * @param {number} x
+        * @param {number} y
+        * false otherwise.
+        */
+        equalTo(x: number, y: number): boolean;
+
+        /**
+        * True if this Point has X and Y values that are real numbers and not infinity.
+        */
+        isReal(): boolean;
+
+        /**
+        * Modify this Point so that its X and Y values have been normalized to a unit length.
+        * However, if this Point is the origin (zero, zero), its length remains zero.
+        */
+        normalize(): Point;
+
+        /**
+        * Modify this point by shifting its values with the given DX and DY offsets.
+        * @param {number} dx
+        * @param {number} dy
+        */
+        offset(dx: number, dy: number): Point;
+
+        /**
+        * This static function can be used to read in a Point from a string that was produced by Point.stringify.
+        * @param {string} str
+        */
+        static parse(str: string): Point;
+
+        /**
+        * Modify this point to be the closest point to this point that is on a finite line segment given by (px,py) and (qx,qy).
+        * @param {number} px
+        * @param {number} py
+        * @param {number} qx
+        * @param {number} qy
+        */
+        projectOntoLineSegment(px: number, py: number, qx: number, qy: number): Point;
+
+        /**
+        * Modify this point to be the closest point to this point that is on a finite line segment given by P and Q.
+        * @param {Point} p
+        * @param {Point} q
+        */
+        projectOntoLineSegmentPoint(p: Point, q: Point): Point;
+
+        /**
+        * Modify this Point so that has been rotated about the origin by the given angle.
+        * @param {number} angle an angle in degrees.
+        */
+        rotate(angle: number): Point;
+
+        /**
+        * Modify this Point so that its X and Y values have been scaled by given factors along the X and Y axes.
+        * @param {number} sx
+        * @param {number} sy
+        */
+        scale(sx: number, sy: number): Point;
+
+        /**
+        * Modify this Point so that its X and Y values are the same as the given Point.
+        * @param {Point} p the given Point.
+        */
+        set(p: Point): Point;
+
+        /**
+        * Modify this Point so that its X and Y values correspond to a particular Spot
+        * in a given Rect.
+        * The result is meaningless if Spot.isNoSpot is true for the given Spot.
+        * @param {Rect} r the Rect for which we are finding the point.
+        * @param {Spot} spot the Spot; Spot.isSpot must be true for this Spot.
+        */
+        setRectSpot(r: Rect, spot: Spot): Point;
+
+        /**
+        * Modify this Point so that its X and Y values correspond to a particular Spot
+        * in a given rectangle.
+        * The result is meaningless if Spot.isNoSpot is true for the given Spot.
+        * @param {number} x The X coordinate of the Rect for which we are finding the point.
+        * @param {number} y The Y coordinate of the Rect for which we are finding the point.
+        * @param {number} w The Width of the Rect for which we are finding the point.
+        * @param {number} h The Height of the Rect for which we are finding the point.
+        * @param {Spot} spot the Spot; Spot.isSpot must be true for this Spot.
+        */
+        setSpot(x: number, y: number, w: number, h: number, spot: Spot): Point;
+
+        /**
+        * Modify this Point with new X and Y values.
+        * @param {number} x
+        * @param {number} y
+        */
+        setTo(x: number, y: number): Point;
+
+        /**
+        * Modify this point to be at the nearest point on an infinite grid,
+        * given the grid's origin and size of each grid cell.
+        * @param {number} originx
+        * @param {number} originy
+        * @param {number} cellwidth
+        * @param {number} cellheight
+        */
+        snapToGrid(originx: number, originy: number, cellwidth: number, cellheight: number): Point;
+
+        /**
+        * Modify this point to be at the nearest point on an infinite grid,
+        * given the grid's origin and size of each grid cell.
+        * @param {Point} origin
+        * @param {Size} cellsize
+        */
+        snapToGridPoint(origin: Point, cellsize: Size): Point;
+
+        /**
+        * This static function can be used to write out a Point as a string that can be read by Point.parse.
+        * @param {Point} val
+        */
+        static stringify(val: Point): string;
+
+        /**
+        * Modify this point so that is the difference of this Point and the
+        * x and y co-ordinates of the given Point.
+        * @param {Point} p The Point to subtract from the current Point.
+        */
+        subtract(p: Point): Point;
+
+        equalsApprox(p: Point): boolean;  // undocumented
+    }
+
+    /**
+    * A Rect describes a rectangular two-dimensional area as a top-left point (x and y values)
+    * and a size (width and height values).
+    */
+    class Rect {
+        /**
+         * The default constructor (no argument) results in a Rect(0,0,0,0).
+         */
+        constructor();
+
+        /**
+         * The constructor taking two Points produces a Rect that spans both points.
+         * @param {Point} tl Top-left Point
+         * @param {Point} br Bottom-right Point
+         */
+        constructor(tl: Point, br: Point);
+
+        /**
+         * The constructor taking a Point and a Size produces a Rect at that point with that size.
+         * @param {Point} tl Top-left Point
+         * @param {Point} sz Size
+         */
+        constructor(tl: Point, sz: Size);
+
+        /**
+         * The four-argument constructor takes four numbers for the x, y, width, height.
+         * @param {number} x Top-left x value.
+         * @param {number} y Top-left y value.
+         * @param {number} w Width to be used; must be non-negative.
+         * @param {number} h Height to be used; must be non-negative.
+         */
+        constructor(x: number, y: number, w: number, h: number);
+
+        /**Gets or sets the y-axis value of the bottom of the Rect.*/
+        bottom: number;
+
+        /**Gets or sets the Point at the center of this Rect.*/
+        center: Point;
+
+        /**Gets or sets the horizontal center X coordinate of the Rect.*/
+        centerX: number;
+
+        /**Gets or sets the vertical center Y coordinate of the Rect.*/
+        centerY: number;
+
+        /**Gets or sets the height of the Rect.*/
+        height: number;
+
+        /**Gets or sets the leftmost value of the Rect.*/
+        left: number;
+
+        /**Gets or sets the x- and y-axis position of the Rect as a Point.*/
+        position: Point;
+
+        /**Gets or sets the x-axis value of the right of the Rect.*/
+        right: number;
+
+        /**Gets or sets the width and height of the Rect as a Size.*/
+        size: Size;
+
+        /**Gets or sets the topmost value of the Rect.*/
+        top: number;
+
+        /**Gets or sets the width of the Rect.*/
+        width: number;
+
+        /**Gets or sets the top-left x coordinate of the Rect.*/
+        x: number;
+
+        /**Gets or sets the top-left y coordinate of the Rect.*/
+        y: number;
+
+        /**
+        * Modify this Rect by adding the given Margin to each side of the Rect.
+        * @param {Margin} m The Margin to add to the Rect.
+        */
+        addMargin(m: Margin): Rect;
+
+        /**
+        * Indicates whether this Rect contains the given Point/Rect.
+        * @param {number} x The X coordinate of the Point or Rect to include in the new bounds.
+        * @param {number} y The Y coordinate of the Point or Rect to include in the new bounds.
+        * @param {number=} w The Width of the Rect to include in the new bounds, defaults to zero.
+        * @param {number=} h The Height of the Rect to include in the new bounds, defaults to zero.
+        * false otherwise.
+        */
+        contains(x: number, y: number, w?: number, h?: number): boolean;
+
+        /**
+        * This static function indicates whether a Rect contains the given Point/Rect.
+        * @param {number} rx The X coordinate of a Rect.
+        * @param {number} ry The Y coordinate of a Rect.
+        * @param {number} rw The Width of a Rect.
+        * @param {number} rh The Height of a Rect.
+        * @param {number} x The X coordinate of the Point or Rect that might be in the bounds (RX, RY, RW, RH).
+        * @param {number} y The Y coordinate of the Point or Rect that might be in the bounds (RX, RY, RW, RH).
+        * @param {number=} w The Width of the Rect to include in the new bounds, defaults to zero.
+        * @param {number=} h The Height of the Rect to include in the new bounds, defaults to zero.
+        * false otherwise.
+        */
+        static contains(rx: number, ry: number, rw: number, rh: number, x: number, y: number, w?: number, h?: number): boolean;
+
+        /**
+        * Indicates whether this Rect contains the given Point.
+        * @param {Point} p The Point to check.
+        * false otherwise.
+        */
+        containsPoint(p: Point): boolean;
+
+        /**
+        * Indicates whether this Rect contains the given Rect.
+        * @param {Rect} r The Rect to check.
+        * false otherwise.
+        */
+        containsRect(r: Rect): boolean;
+
+        /**
+        * Create a copy of this Rect, with the same values.
+        */
+        copy(): Rect;
+
+        /**
+        * Indicates whether the given Rect is equal to the current Rect.
+        * @param {Rect} r The rectangle to compare to the current rectangle.
+        * and height.
+        */
+        equals(r: Rect): boolean;
+
+        /**
+        * Indicates whether the given Rect is equal to the current Rect.
+        * @param {number} x
+        * @param {number} y
+        * @param {number} w the width.
+        * @param {number} h the height.
+        */
+        equalTo(x: number, y: number, w: number, h: number): boolean;
+
+        /**
+        * Modifies this Rect by adding some distance to each side of the Rect.
+        * @param {number} t the amount to move the top side upwards; may be negative.
+        * @param {number} r the amount to move the right side rightwards; may be negative.
+        * @param {number} b the amount to move the bottom side downwards; may be negative.
+        * @param {number} l the amount to move the left side leftwards; may be negative.
+        */
+        grow(t: number, r: number, b: number, l: number): Rect;
+
+        /**
+        * Modify this Rect so that its width and height are changed on all four sides,
+        * equally on the left and right sides, and equally on the top and bottom sides.
+        * When the arguments are negative, this operation deflates this Rect, but not beyond zero.
+        * @param {number} w The additional width on each side, left and right; may be negative.
+        * @param {number} h The additional height on each side, top and bottom; may be negative.
+        */
+        inflate(w: number, h: number): Rect;
+
+        /**
+        * Modify this Rect so that it is the intersection of this Rect and the rectangle
+        * defined by x, y, w, h.
+        * @param {number} x
+        * @param {number} y
+        * @param {number} w
+        * @param {number} h
+        */
+        intersect(x: number, y: number, w: number, h: number): Rect;
+
+        /**
+        * Modify this Rect so that it is the intersection of this Rect and the given Rect.
+        * @param {Rect} r Rect to intersect with.
+        */
+        intersectRect(r: Rect): Rect;
+
+        /**
+        * This static function indicates whether a Rect partly or wholly overlaps the given Rect.
+        * @param {number} rx The X coordinate of a Rect.
+        * @param {number} ry The Y coordinate of a Rect.
+        * @param {number} rw The Width of a Rect.
+        * @param {number} rh The Height of a Rect.
+        * @param {number} x The X coordinate of the Point or Rect that might overlap the bounds (RX, RY, RW, RH).
+        * @param {number} y The Y coordinate of the Point or Rect that might overlap the bounds (RX, RY, RW, RH).
+        * @param {number} w
+        * @param {number} h
+        */
+        static intersects(rx: number, ry: number, rw: number, rh: number, x: number, y: number, w: number, h: number): boolean;
+
+        /**
+        * Determine if this Rect partly or wholly overlaps the rectangle
+        * defined by x, y, w, h.
+        * @param {number} x
+        * @param {number} y
+        * @param {number} w
+        * @param {number} h
+        */
+        intersects(x: number, y: number, w: number, h: number): boolean;
+
+        /**
+        * Determine if a given Rect is partly or wholly inside of this Rect.
+        * @param {Rect} r Rect to test intersection with.
+        */
+        intersectsRect(r: Rect): boolean;
+
+        /**
+        * True if this Rect has a Width and Height of zero.
+        */
+        isEmpty(): boolean;
+
+        /**
+        * True if this Rect has X, Y, Width, and Height values that are real numbers and not infinity.
+        */
+        isReal(): boolean;
+
+        /**
+        * Modify this Rect by shifting its values with the given DX and DY offsets.
+        * @param {number} dx
+        * @param {number} dy
+        */
+        offset(dx: number, dy: number): Rect;
+
+        /**
+        * This static function can be used to read in a Rect from a string that was produced by Rect.stringify.
+        * @param {string} str
+        */
+        static parse(str: string): Rect;
+
+        /**
+        * Modify this Rect so that its X, Y, Width, and Height values are the same as the given Rect.
+        * @param {Rect} r the given Rect.
+        */
+        set(r: Rect): Rect;
+
+        /**
+        * Modify this Rect so that its X and Y values are the same as the given Point.
+        * @param {Point} p the given Point.
+        */
+        setPoint(p: Point): Rect;
+
+        /**
+        * Modify this Rect so that its Width and Height values are the same as the given Size.
+        * @param {Size} s the given Size.
+        */
+        setSize(s: Size): Rect;
+
+        /**
+        * Modify this Rect so that a given Spot is at a given (x,y) point using this Rect's size.
+        * Return this rectangle for which the spot is at that point, without modifying the size.
+        * The result is meaningless if Spot.isNoSpot is true.
+        * @param {number} x the point where the spot should be.
+        * @param {number} y the point where the spot should be.
+        * @param {Spot} spot a Spot; Spot.isSpot must be true.
+        */
+        setSpot(x: number, y: number, spot: Spot): Rect;
+
+        /**
+        * Modify this Rect with new X, Y, Width, and Height values.
+        * @param {number} x
+        * @param {number} y
+        * @param {number} w the width.
+        * @param {number} h the height.
+        */
+        setTo(x: number, y: number, w: number, h: number): Rect;
+
+        /**
+        * This static function can be used to write out a Rect as a string that can be read by Rect.parse.
+        * @param {Rect} val
+        */
+        static stringify(val: Rect): string;
+
+        /**
+        * Modify this Rect by subtracting the given Margin from each side of the Rect.
+        * @param {Margin} m The Margin to subtract from the Rect.
+        */
+        subtractMargin(m: Margin): Rect;
+
+        /**
+        * Modify this Rect to be exactly big enough to contain both the original Rect and the given rectangular area.
+        * @param {number} x The X coordinate of the Point or Rect to include in the new bounds.
+        * @param {number} y The Y coordinate of the Point or Rect to include in the new bounds.
+        * @param {number=} w The Width of the Rect to include in the new bounds, defaults to zero.
+        * @param {number=} h The Height of the Rect to include in the new bounds, defaults to zero.
+        */
+        union(x: number, y: number, w?: number, h?: number): Rect;
+
+        /**
+        * Modify this Rect to be exactly big enough to contain both the original Rect and the given Point.
+        * @param {Point} p The Point to include in the new bounds.
+        */
+        unionPoint(p: Point): Rect;
+
+        /**
+        * Modify this Rect to be exactly big enough to contain this Rect and the given Rect.
+        *
+        * @param {Rect} r The Rect to include in the new bounds.
+        */
+        unionRect(r: Rect): Rect;
+
+        equalsApprox(r: Rect): boolean;  // undocumented
+    }
+
+    /**
+    * A Size describes a width and a height in two-dimensional coordinates.
+    * The width and height must both be non-negative.
+    */
+    class Size {
+        /**
+        * The default constructor produces the Size(0,0).
+        */
+        constructor();
+
+        /**
+        * The two-argument constructor produces the Size(w,h).
+        * @param {number} w this number must not be negative.
+        * @param {number} h this number must not be negative.
+        */
+        constructor(w: number, h: number);
+
+        /**Gets or sets the height value of the Size.*/
+        height: number;
+
+        /**Gets or sets the width value of the Size.*/
+        width: number;
+
+        /**
+        * Create a copy of this Size, with the same values.
+        */
+        copy(): Size;
+
+        /**
+        * Indicates whether the given Size is equal to the current Size.
+        * @param {Size} s The Size to compare to the current Size.
+        * false otherwise.
+        */
+        equals(s: Size): boolean;
+
+        /**
+        * Indicates whether the given size is equal to this Size.
+        * @param {number} w the width.
+        * @param {number} h the height.
+        * false otherwise.
+        */
+        equalTo(w: number, h: number): boolean;
+
+        /**
+        * True if this Size has Width and Height values that are real numbers and not infinity.
+        */
+        isReal(): boolean;
+
+        /**
+        * This static function can be used to read in a Size from a string that was produced by Size.stringify.
+        * @param {string} str
+        */
+        static parse(str: string): Size;
+
+        /**
+        * Modify this Size so that its Width and Height values are the same as the given Size.
+        * @param {Size} s the given Size.
+        */
+        set(s: Size): Size;
+
+        /**
+        * Modify this Size with new Width and Height values.
+        * @param {number} w the width.
+        * @param {number} h the height.
+        */
+        setTo(w: number, h: number): Size;
+
+        /**
+        * This static function can be used to write out a Size as a string that can be read by Size.parse.
+        * @param {Size} val
+        */
+        static stringify(val: Size): string;
+
+        equalsApprox(s: Size): boolean;  // undocumented
+    }
+
+    /**
+    * A Spot represents a relative point from(0, 0) to(1, 1) within the bounds of
+    * a rectangular area plus an absolute offset.
+    */
+    class Spot {
+        /**
+        * The default constructor produces the Spot(0, 0, 0, 0), at the top-left corner.
+        */
+        constructor();
+
+        /**
+        * The two-argument constructor produces the Spot(x, y), where X and Y are fractional distances, between zero and one.
+        * @param {number} x must be between zero and one, inclusive.
+        * @param {number} y must be between zero and one, inclusive.
+        */
+        constructor(x: number, y: number);
+
+        /**
+        * The four-argument constructor produces the Spot(x, y, offx, offy), where X and Y are fractional distances, between zero and one, and OFFX and OFFY are additional absolute offsets.
+        * @param {number} x must be between zero and one, inclusive.
+        * @param {number} y must be between zero and one, inclusive.
+        * @param {number} offx an offset along the X coordinates, may be negative.
+        * @param {number} offy an offset along the Y coordinates, may be negative.
+        */
+        constructor(x: number, y: number, offx: number, offy: number);
+
+        /**Gets or sets the offsetX value of the Spot.*/
+        offsetX: number;
+
+        /**Gets or sets the offsetY value of the Spot.*/
+        offsetY: number;
+
+        /**Gets or sets the x value of the Spot, a fractional value between zero and one.*/
+        x: number;
+
+        /**Gets or sets the y value of the Spot, a fractional value between zero and one.*/
+        y: number;
+
+        /**
+        * Create a copy of this Spot, with the same values.
+        */
+        copy(): Spot;
+
+        /**
+        * Two spots are equal if all four property values are the same.
+        * @param {Spot} spot The Spot to compare to the current Spot.
+        */
+        equals(spot: Spot): boolean;
+
+        /**
+        * This predicate is true if this Spot is a side that
+        * includes the side(s) given by the argument Spot.
+        * @param {Spot} side
+        */
+        includesSide(side: Spot): boolean;
+
+        /**
+        * True if this is a special spot referring to the default spot.
+        */
+        isDefault(): boolean;
+
+        /**
+        * True if this is an unspecific special spot, such as Spot.None or one of the sides.
+        */
+        isNoSpot(): boolean;
+
+        /**
+        * True if this is a special spot referring to one (or more) of the sides.
+        */
+        isSide(): boolean;
+
+        /**
+        * True if this is a specific spot, not a side nor Spot.None.
+        */
+        isSpot(): boolean;
+
+        /**
+        * Return a new spot that is opposite this spot.
+        */
+        opposite(): Spot;
+
+        /**
+        * This static function can be used to read in a Spot from a string that was produced by Spot.stringify.
+        * @param {string} str
+        */
+        static parse(str: string): Spot;
+
+        /**
+        * Modify this Spot so that its X, Y, OffsetX, and OffsetY values are the same as the given Spot.
+        * @param {Spot} s the given Spot.
+        */
+        set(s: Spot): Spot;
+
+        /**
+        * Modify this Spot with new X, Y, OffsetX, and OffsetY values.
+        * @param {number} x
+        * @param {number} y
+        * @param {number} offx
+        * @param {number} offy
+        */
+        setTo(x: number, y: number, offx: number, offy: number): Spot;
+
+        /**
+        * This static function can be used to write out a Spot as a string that can be read by Spot.parse.
+        * @param {Spot} val
+        */
+        static stringify(val: Spot): string;
+
+        /**The set of points on all sides of the bounding rectangle.*/
+        static AllSides: Spot;
+
+        /**A synonym for Spot.BottomCenter.*/
+        static Bottom: Spot;
+
+        /**The specific point at the middle of the bottom side of bounding rectangle.*/
+        static BottomCenter: Spot;
+
+        /**The specific point at the bottom-left corner of the bounding rectangle.*/
+        static BottomLeft: Spot;
+
+        /**The set of points at the left or bottom sides of the bounding rectangle.*/
+        static BottomLeftSides: Spot;
+
+        /**The specific point at the bottom-right corner of the bounding rectangle.*/
+        static BottomRight: Spot;
+
+        /**The set of points at the right or bottom sides of the bounding rectangle.*/
+        static BottomRightSides: Spot;
+
+        /**The set of points at the bottom side of the bounding rectangle.*/
+        static BottomSide: Spot;
+
+        /**The specific point at the very center of the bounding rectangle.*/
+        static Center: Spot;
+
+        /**Use this value to indicate that the real spot value is inherited from elsewhere.*/
+        static Default: Spot;
+
+        /**A synonym for Spot.LeftCenter.*/
+        static Left: Spot;
+
+        /**The specific point at the middle of the left side of bounding rectangle.*/
+        static LeftCenter: Spot;
+
+        /**The set of points at the left or right sides of the bounding rectangle.*/
+        static LeftRightSides: Spot;
+
+        /**The set of points at the left side of the bounding rectangle.*/
+        static LeftSide: Spot;
+
+        /**A synonym for Spot.BottomCenter.*/
+        static MiddleBottom: Spot;
+
+        /**A synonym for Spot.LeftCenter.*/
+        static MiddleLeft: Spot;
+
+        /**A synonym for Spot.RightCenter.*/
+        static MiddleRight: Spot;
+
+        /**A synonym for Spot.TopCenter.*/
+        static MiddleTop: Spot;
+
+        /**Use this Spot value to indicate no particular spot -- code looking for a particular point on an element will need to do their own calculations to determine the desired point depending on the circumstances.*/
+        static None: Spot;
+
+        /**The set of points on all sides of bounding rectangle except bottom side.*/
+        static NotBottomSide: Spot;
+
+        /**The set of points on all sides of the bounding rectangle except left side.*/
+        static NotLeftSide: Spot;
+
+        /**The set of points on all sides of the bounding rectangle except right side.*/
+        static NotRightSide: Spot;
+
+        /**The set of points on all sides of the bounding rectangle except top side.*/
+        static NotTopSide: Spot;
+
+        /**A synonym for Spot.RightCenter.*/
+        static Right: Spot;
+
+        /**The specific point at the middle of the right side of bounding rectangle.*/
+        static RightCenter: Spot;
+
+        /**The set of points at the right side of the bounding rectangle.*/
+        static RightSide: Spot;
+
+        /**A synonym for Spot.TopCenter.*/
+        static Top: Spot;
+
+        /**The set of points at the top or bottom sides of the bounding rectangle.*/
+        static TopBottomSides: Spot;
+
+        /**The specific point at the center of the top side of the bounding rectangle.*/
+        static TopCenter: Spot;
+
+        /**The specific point at the top-left corner of the bounding rectangle.*/
+        static TopLeft: Spot;
+
+        /**The set of points at the top or left sides of the bounding rectangle.*/
+        static TopLeftSides: Spot;
+
+        /**The specific point at the top-right corner of the bounding rectangle.*/
+        static TopRight: Spot;
+
+        /**The set of points at the top or right sides of the bounding rectangle.*/
+        static TopRightSides: Spot;
+
+        /**The set of points at the top side of the bounding rectangle.*/
+        static TopSide: Spot;
+    }
+
+
+    /**
+    * A Binding describes how to automatically set a property on a GraphObject
+    * to a value of a property of data in the model.
+    * The target property name and the data source property name are strings.
+    * All name matching is case-sensitive.
+    */
+    class Binding {
+        /**
+        * The constructor creates an empty one-way binding.
+        * @param {string=} targetprop A string naming the target property on the target object.
+        *   If this is the empty string or not supplied, the whole GraphObject is used in the call to the conversion function,
+        *   which should modify the GraphObject directly.
+        * @param {string=} sourceprop A string naming the source property on the bound data object.
+        *   If this is the empty string, the whole Panel.data object is used.
+        *   If this argument is not supplied, the source property is assumed to be the same as the target property.
+        * @param {function(*,*=) | null=} conv A function converting the data property value to the value to set the target property.
+        *   If the function is null or not supplied, no conversion takes place.
+        */
+        constructor(targetprop?: string, sourceprop?: string, conv?: (a: any, b: any) => any);
+
+        /**
+        * Gets or sets a converter function to apply to the GraphObject property value
+        * in order to produce the value to set to a data property.
+        * This conversion function is only used in a TwoWay binding,
+        * when transferring a value from the target to the source.
+        * The default value is null -- no conversion takes place.
+        * Otherwise the value should be a function that takes one or two arguments
+        * and returns the desired value.
+        * However, the return value is ignored when the .sourceProperty
+        * is the empty string.
+        * The function is passed the value from the target
+        * (the first argument) and the source Panel.data object (the second argument).
+        * If the .sourceProperty is a property name, that property is set to
+        * the function's return value.
+        * If the .sourceProperty is the empty string, the function should
+        * modify the second argument, which will be the source data object.
+        */
+        backConverter: (a: any, b: any) => any;
+
+        /**
+        * Gets or sets a converter function to apply to the data property value
+        * in order to produce the value to set to the target property.
+        * This conversion function is used in both OneWay and TwoWay bindings,
+        * when transferring a value from the source to the target.
+        * The default value is null -- no conversion takes place.
+        * Otherwise the value should be a function that takes one or two arguments
+        * and returns the desired value.
+        * However, the return value is ignored when the .targetProperty
+        * is the empty string.
+        * The function is passed the value from the source
+        * (the first argument) and the target GraphObject (the second argument).
+        * If the .targetProperty is a property name, that property is set to
+        * the function's return value.
+        * If the .targetProperty is the empty string, the function should
+        * modify the second argument, which will be the target object.
+        */
+        converter: (a: any, b: any) => any;
+
+        /**
+        * Gets or sets the directions and frequency in which the binding may be evaluated.
+        * The default value is Binding.OneWay.
+        * Binding.TwoWay is the other choice.
+        * Use OneWay bindings to initialize GraphObject properties based on model data,
+        * or to modify GraphObject properties when the model data changes will a call to Model.setDataProperty.
+        * Use TwoWay bindings to keep model data in sync with changes to GraphObject properties.
+        * For efficiency, avoid TwoWay bindings on GraphObject properties that do not change value in your app.
+        * You should not have a TwoWay binding on a node data object's key property.
+        */
+        mode: EnumValue;
+
+        /**
+        * Gets or sets the name of the GraphObject that should act as a source object
+        * whose property should be gotten by this data binding.
+        * The default value is null, which uses the bound Panel.data as the source.
+        * If the value is a string, it should be the name of a GraphObject in the
+        * visual tree of the Panel that is bound to the data.
+        * Use the empty string to refer to the root panel.
+        */
+        sourceName: string;
+
+        /**
+        * Gets or sets the name of the property to get from the bound data object,
+        * the value of Panel.data.
+        * The default value is the empty string, which results in setting the target
+        * property to the whole data object, rather than to a property value of the data object.
+        */
+        sourceProperty: string;
+
+        /**
+        * Gets or sets the name of the property to be set on the target GraphObject.
+        * The default value is the empty string; you normally set this to be the name of a property.
+        */
+        targetProperty: string;
+
+        /**
+        * Modify this Binding to set its .mode to be Binding.TwoWay, and
+        * provide an optional conversion function to convert GraphObject property
+        * values back to data values.
+        * Use TwoWay bindings to keep model data in sync with changes to GraphObject properties.
+        * For efficiency, avoid TwoWay bindings on GraphObject properties that do not change value in your app.
+        * You should not have a TwoWay binding on a node data object's key property.
+        * @param {function(*,*=) | null=} backconv
+        */
+        makeTwoWay(backconv?: (a: any, b: any) => any): Binding;
+
+        /**
+        * Modify this Binding to set its .sourceName property so as to identify
+        * a GraphObject in the visual tree of the bound Panel.
+        * @param {string=} srcname the GraphObject.name of an element in the visual tree of the bound Panel;
+        * use an empty string to refer to the root panel of that visual tree.
+        */
+        ofObject(srcname?: string): Binding;
+
+        /**
+        * This static function can be used to create a function that parses
+        * a string into an enumerated value, given the class that the enumeration values
+        * are defined on and a default value if the string cannot be parsed successfully.
+        * The normal usage is to pass the result of this function as the conversion function of a Binding.
+        * This binding will try to parse the string that is the value of the bound data's "dataPropName" property.
+        * If it is a legitimate enumerated value defined on the Link class, the conversion
+        * function will return that value.
+        * If the bound data's "dataPropName" property is not present or has an unrecognized value,
+        * the Link.routing property gets the default value, Link.Normal.
+        * @param {function()} ctor the class constructor that defines the enumerated values that are being parsed.
+        * @param {EnumValue} defval the default enumerated value to return if it fails to parse the given string.
+        */
+        static parseEnum(ctor: Constructor, defval: EnumValue): (a: string) => EnumValue;
+
+        /**
+        * This static function can be used to convert an object to a string,
+        * looking for commonly defined data properties, such as "text", "name", "key", or "id".
+        * If none are found, this just calls toString() on it.
+        * @param {*} val
+        */
+        static toString(val: any): string;
+
+        /**This value for Binding.mode uses data source values and sets GraphObject properties.*/
+        static OneWay: EnumValue;
+
+        /**This value for Binding.mode uses data source values and GraphObject properties and keeps them in sync.*/
+        static TwoWay: EnumValue;
+
+        ofModel(): Binding;  // undocumented
+    }
+
+    /**
+    * A ChangedEvent represents a change to an object, typically a GraphObject,
+    * but also for model data, a Model, or a Diagram.
+    * The most common case is for remembering the name of a property
+    * and the before-and-after values for that property.
+    * You can listen for changed events on the model using Model.addChangedListener
+    * and on the Diagram using Diagram.addChangedListener.
+    */
+    class ChangedEvent {
+        /**
+        * The ChangedEvent class constructor produces an empty ChangedEvent object.
+        */
+        constructor();
+
+        /**Gets or sets the nature of change that occurred.*/
+        change: EnumValue;
+
+        /**Gets or sets the Diagram that was modified.*/
+        diagram: Diagram;
+
+        /**This read-only property is true when this ChangeEvent is of type ChangedEvent.Transaction and represents the end of a transactional change.*/
+        isTransactionFinished: boolean;
+
+        /**Gets or sets the Model or TreeModel or GraphLinksModel that was modified.*/
+        model: Model;
+
+        /**This read-only property returns the name of the model change, reflecting a change to model data in addition to a change to the model itself.*/
+        modelChange: string;
+
+        /**Gets or sets an optional value associated with the new value.*/
+        newParam: any;
+
+        /**Gets or sets the next or current value that the property has.*/
+        newValue: any;
+
+        /**Gets or sets the Object that was modified.*/
+        object: any;
+
+        /**Gets or sets an optional value associated with the old value.*/
+        oldParam: any;
+
+        /**Gets or sets the previous or old value that the property had.*/
+        oldValue: any;
+
+        /**Gets or sets the name of the property change.*/
+        propertyName: PropertyAccessor;
+
+        /**
+        * This predicate returns true if you can call redo().
+        */
+        canRedo(): boolean;
+
+        /**
+        * This predicate returns true if you can call undo().
+        */
+        canUndo(): boolean;
+
+        /**
+        * Forget any object references that this ChangedEvent may have.
+        */
+        clear(): void;
+
+        /**
+        * Make a copy of this ChangedEvent.
+        */
+        copy(): ChangedEvent;
+
+        /**
+        * This is a convenient method to get the right parameter value, depending on the value of undo,
+        * when implementing a state change as part of an undo or a redo.
+        * @param {boolean} undo If true, returns the oldParam, otherwise returns the newParam.
+        */
+        getParam(undo: boolean): any;
+
+        /**
+        * This is a convenient method to get the right value, depending on the value of undo,
+        * when implementing a state change as part of an undo or a redo.
+        * @param {boolean} undo If true, returns the oldValue, otherwise returns the newValue.
+        */
+        getValue(undo: boolean): any;
+
+        /**
+        * Re-perform this object change after an undo().
+        */
+        redo(): void;
+
+        /**
+        * Reverse the effects of this object change.
+        */
+        undo(): void;
+
+        /**For inserting into collections, and used as the value for ChangedEvent.change.*/
+        static Insert: EnumValue;
+
+        /**For simple property changes, and used as the value for ChangedEvent.change.*/
+        static Property: EnumValue;
+
+        /**For removing from collections, and used as the value for ChangedEvent.change.*/
+        static Remove: EnumValue;
+
+        /**For informational events, such as transactions and undo/redo operations, and used as the value for ChangedEvent.change.*/
+        static Transaction: EnumValue;
+    }
+
+    /**
+    * GraphLinksModels support links between nodes and grouping nodes and links into subgraphs.
+    * GraphLinksModels hold node data and link data in separate arrays.
+    * Node data is normally represented in a Diagram by instances of Node,
+    * but they could be represented by simple Parts or by Groups.
+    * Link data should be represented by instances of Link.
+    */
+    class GraphLinksModel extends Model {
+        /**
+        * This constructs an empty GraphLinksModel unless one provides arguments as the initial data array values for the Model.nodeDataArray and GraphLinksModel.linkDataArray properties.
+        * @param {Array<Object>=} nodedataarray an optional Array containing JavaScript objects to be represented by Nodes.
+        * @param {Array<Object>=} linkdataarray an optional Array containing JavaScript objects to be represented by Links.
+        */
+        constructor(nodedataarray?: Array<Object>, linkdataarray?: Array<Object>);
+
+        /**
+        * Gets or sets a data object that will be copied and added to the model as a new node data each time there
+        * is a link reference (either the "to" or the "from" of a link data) to a node key that does not yet exist in the model.
+        * The default value is null -- node data is not automatically copied and added to the model
+        * when there is an unresolved reference in a link data.
+        * The value must be an Object or null.
+        * When adding or modifying a link data if there is a "from" or "to" key value for which Model.findNodeDataForKey returns null,
+        * it will call Model.copyNodeData on this property value and Model.addNodeData on the result.
+        */
+        archetypeNodeData: any;
+
+        /**
+        * Gets or sets a function that makes a copy of a link data object.
+        * You may need to set this property in order to ensure that a copied Link is bound
+        * to data that does not share certain data structures between the original link data and the copied link data.
+        * The value may be null in order to cause .copyLinkData to make a shallow copy of a JavaScript Object.
+        * The default value is null.
+        */
+        copyLinkDataFunction: (obj: Object, model: GraphLinksModel) => Object;
+
+        /**
+        * Gets or sets the name of the data property that returns a string naming that data's category,
+        * or a function that takes a link data object and returns that category string;
+        * the default value is the name 'category'.
+        * This is used by the diagram to distinguish between different kinds of links.
+        * The name must not be null.
+        */
+        linkCategoryProperty: PropertyAccessor;
+
+        /**Gets or sets the array of link data objects that correspond to Links in the Diagram; the initial value is an empty Array.*/
+        linkDataArray: Array<Object>;
+
+        /**
+        * Gets or sets the name of the data property that returns
+        * the key of the node data that the link data is coming from,
+        * or a function that takes a link data object and returns that key;
+        * the default value is the name 'from'.
+        * The name must not be null.
+        * If the value is an empty string,
+        * .getFromKeyForLinkData will return undefined for all link data objects.
+        */
+        linkFromKeyProperty: PropertyAccessor;
+
+        /**
+        * Gets or sets the name of the data property that returns the optional parameter naming a "port" element on the node that the link data is connected from,
+        * or a function that takes a link data object and returns that string.
+        * The default value is the empty string indicating that one cannot distinguish
+        * different logical connection points for any links.
+        * The name must not be null.
+        */
+        linkFromPortIdProperty: PropertyAccessor;
+
+        /**Gets or sets the name of the data property that returns a unique id number or string for each link data object, or a function taking a link data object and returning the key value; the default value is '', which causes the model NOT to assign unique identifiers automatically.*/
+        linkKeyProperty: PropertyAccessor;
+
+        /**
+        * Gets or sets the name of the data property that returns
+        * an array of keys of node data that are labels on that link data,
+        * or a function that takes a link data object and returns such an array;
+        * the default value is the empty string: ''.
+        * The name must not be null.
+        * If the value is an empty string,
+        * .getLabelKeysForLinkData will return an empty array for all link data objects.
+        * You will need to set this property in order to support nodes as link labels.
+        */
+        linkLabelKeysProperty: PropertyAccessor;
+
+        /**
+        * Gets or sets the name of the data property that returns
+        * the key of the node data that the link data is going to,
+        * or a function that takes a link data object and returns that key;
+        * the default value is the name 'to'.
+        * The name must not be null.
+        */
+        linkToKeyProperty: PropertyAccessor;
+
+        /**
+        * Gets or sets the name of the data property that returns
+        * the optional parameter naming a "port" element on the node that the link data is connected to,
+        * or a function that takes a link data object and returns that string.
+        * The default value is the empty string indicating that one cannot distinguish
+        * different logical connection points for any links.
+        * The name must not be null.
+        */
+        linkToPortIdProperty: PropertyAccessor;
+
+        /**Gets or sets a function that returns a unique id number or string for a link data object; the default value is null.*/
+        makeUniqueLinkKeyFunction: (model: Model, obj: Object) => Key;
+
+        /**
+        * Gets or sets the name of the property on node data that specifies
+        * the string or number key of the group data that "owns" that node data,
+        * or a function that takes a node data object and returns that group key.
+        * the default value is the name 'group'.
+        * The value must not be null.
+        */
+        nodeGroupKeyProperty: PropertyAccessor;
+
+        /**
+        * Gets or sets the name of the boolean property on node data that indicates
+        * whether the data should be represented as a group of nodes and links or
+        * as a simple node,
+        * or a function that takes a node data object and returns true or false;
+        * the default value is the name 'isGroup'.
+        * The value must not be null.
+        */
+        nodeIsGroupProperty: PropertyAccessor;
+
+        /**
+        * Adds a node key value that identifies a node data acting as a new label node on the given link data.
+        * This method only works if .linkLabelKeysProperty has been set to something other than an empty string.
+        * @param {Object} linkdata a JavaScript object representing a link.
+        * @param {string|number} key a number or string that is the key of the new label node.
+        */
+        addLabelKeyForLinkData(linkdata: Object, key: Key): void;
+
+        /**
+        * When you want to add a link to the diagram, call this method with a new data object.
+        * This will add that data to the .linkDataArray and
+        * notify all listeners that a new link data object has been inserted into the collection.
+        * Presumably the link data object will already have its "from" and "to" node key references set,
+        * but it is also possible to set them after the link data is in the model
+        * by calling .setFromKeyForLinkData and .setToKeyForLinkData.
+        * This operation does nothing if the link data is already part of this model's .linkDataArray.
+        * @param {Object} linkdata a JavaScript object representing a link.
+        */
+        addLinkData(linkdata: Object): void;
+
+        /**
+        * Add to this model all of the link data held in an Array or in an Iterable of link data objects.
+        * @param {Iterable<Object>|Array<Object>} coll a collection of link data objects to add to the .linkDataArray
+        */
+        addLinkDataCollection(coll: Iterable<Object> | Array<Object>): void;
+
+        /**
+        * Decide if a given link data is in this model.
+        * @param {Object} linkdata a JavaScript object representing a link.
+        */
+        containsLinkData(linkdata: Object): boolean;
+
+        /**
+        * Make a copy of a link data object.
+        * This uses the value of .copyLinkDataFunction to actually perform the copy,
+        * unless it is null, in which case this method just makes a shallow copy of the JavaScript Object.
+        * This does not modify the model -- the returned data object is not added to this model.
+        * This assumes that the data's constructor can be called with no arguments.
+        * This also makes sure there is no reference to either the "from" or the "to" node of the original data.
+        * @param {Object} linkdata a JavaScript object representing a link.
+        */
+        copyLinkData(linkdata: Object): Object;
+
+        /**
+        * Given a number or string, find the link data object in this model
+        * that uses the given value as its unique key.
+        * Unless .linkKeyProperty is set to a non-empty string, this model
+        * will not automatically assign unique key values for link data objects,
+        * and thus this method will always return null.
+        * The return value will be an Object or null.
+        * @param {*} key a string or a number.
+        */
+        findLinkDataForKey(key: Key): any;
+
+        /**
+        * Find the category of a given link data, a string naming the link template
+        * that the Diagram should use to represent the link data.
+        * @param {Object} linkdata a JavaScript object representing a link.
+        */
+        getCategoryForLinkData(linkdata: Object): string;
+
+        /**
+        * From a link data retrieve a value uniquely identifying the node data
+        * from which this link is connected.
+        * @param {Object} linkdata a JavaScript object representing a link.
+        */
+        getFromKeyForLinkData(linkdata: Object): Key;
+
+        /**
+        * From a link data retrieve a value identifying the port object of the node
+        * from which this link is connected.
+        * @param {Object} linkdata a JavaScript object representing a link.
+        */
+        getFromPortIdForLinkData(linkdata: Object): string;
+
+        /**
+        * If there is a container group for the given node data, return the group's key.
+        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
+        */
+        getGroupKeyForNodeData(nodedata: Object): Key;
+
+        /**
+        * Given a link data object return its unique key: a number or a string.
+        * This returns undefined if there is no key value.
+        * Unless .linkKeyProperty is set to a non-empty string, this model
+        * will not automatically assign unique key values for link data objects.
+        * It is possible to change the key for a link data object by calling .setKeyForLinkData.
+        * @param {Object} linkdata a JavaScript object representing a link.
+        */
+        getKeyForLinkData(linkdata: Object): Key;
+
+        /**
+        * Gets an Array of node key values that identify node data acting as labels on the given link data.
+        * This method only works if .linkLabelKeysProperty has been set to something other than an empty string.
+        * @param {Object} linkdata a JavaScript object representing a link.
+        */
+        getLabelKeysForLinkData(linkdata: Object): Array<Key>;
+
+        /**
+        * From a link data retrieve a value uniquely identifying the node data
+        * to which this link is connected.
+        * @param {Object} linkdata a JavaScript object representing a link.
+        */
+        getToKeyForLinkData(linkdata: Object): Key;
+
+        /**
+        * From a link data retrieve a value identifying the port object of the node
+        * to which this link is connected.
+        * @param {Object} linkdata a JavaScript object representing a link.
+        */
+        getToPortIdForLinkData(linkdata: Object): string;
+
+        /**
+        * See if the given node data should be represented as a group or as a simple node.
+        * This value must not change as long as the node data is part of the model.
+        * At the current time there is no <code>setIsGroupForNodeData</code> method.
+        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
+        */
+        isGroupForNodeData(nodedata: Object): boolean;
+
+        /**
+        * This method is called when a link data object is added to the model to make sure that
+        * .getKeyForLinkData returns a unique key value.
+        * The key value should be unique within the set of data managed by this model:
+        * .linkDataArray.
+        * If the key is already in use, this will assign an unused number to the
+        * .linkKeyProperty property on the data.
+        * If you want to customize the way in which link data gets a unique key,
+        * you can set the .makeUniqueKeyFunction functional property.
+        * If the link data object is already in the model and you want to change its key value,
+        * call .setKeyForLinkData and give it a new unique key value.
+        * @param {Object} linkdata a JavaScript object representing a link.
+        */
+        makeLinkDataKeyUnique(linkdata: Object): void;
+
+        /**
+        * Removes a node key value that identifies a node data acting as a former label node on the given link data.
+        * Removing a reference to a node data from the collection of link label keys
+        * does not automatically remove any node data from the model.
+        * This method only works if .linkLabelKeysProperty has been set to something other than an empty string.
+        * @param {Object} linkdata a JavaScript object representing a link.
+        * @param {string|number} key a number or string that is the key of the label node being removed from the link.
+        */
+        removeLabelKeyForLinkData(linkdata: Object, key: Key): void;
+
+        /**
+        * When you want to remove a link from the diagram, call this method with an existing link data object.
+        * This will remove that data from the .linkDataArray and
+        * notify all listeners that a link data object has been removed from the collection.
+        * Removing a link data from a model does not automatically remove
+        * any associated label node data from the model.
+        * This operation does nothing if the link data is not present in the .linkDataArray.
+        * @param {Object} linkdata a JavaScript object representing a link.
+        */
+        removeLinkData(linkdata: Object): void;
+
+        /**
+        * Remove from this model all of the link data held in an Array or in an Iterable of link data objects.
+        * @param {Iterable<Object>|Array<Object>} coll a collection of link data objects to remove from the .linkDataArray
+        */
+        removeLinkDataCollection(coll: Iterable<Object> | Array<Object>): void;
+
+        /**
+        * Change the category of a given link data, a string naming the link template
+        * that the Diagram should use to represent the link data.
+        * Changing the link template for a link data will cause the existing Link
+        * to be removed from the Diagram and be replaced with a new Link
+        * created by copying the new link template and applying any data-bindings.
+        * @param {Object} linkdata a JavaScript object representing a link.
+        * @param {string} cat Must not be null.
+        */
+        setCategoryForLinkData(linkdata: Object, cat: string): void;
+
+        /**
+        * Change the node key that the given link data references as the
+        * source of the link.
+        * @param {Object} linkdata a JavaScript object representing a link.
+        * @param {string|number|undefined} key This may be undefined if
+        * the link should no longer come from any node.
+        */
+        setFromKeyForLinkData(linkdata: Object, key: Key): void;
+
+        /**
+        * Change the information that the given link data uses to identify the
+        * particular "port" that the link is coming from.
+        * @param {Object} linkdata a JavaScript object representing a link.
+        * @param {string} portname This may be the empty string if
+        * the link should no longer be associated with any particular "port".
+        */
+        setFromPortIdForLinkData(linkdata: Object, portname: string): void;
+
+        /**
+        * Change the container group for the given node data, given a key for the new group.
+        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
+        * @param {string|number|undefined} key This may be undefined if there should be no containing group data.
+        */
+        setGroupKeyForNodeData(nodedata: Object, key: Key): void;
+
+        /**
+        * Change the unique key of a given link data that is already in this model.
+        * The new key value must be unique -- i.e. not in use by another link data object.
+        * You can call .findLinkDataForKey to check if a proposed new key is already in use.
+        * If this is called when .linkKeyProperty is the empty string (i.e. its default value),
+        * this method has no effect.
+        * If this is called on a link data object that is not (yet) in this model,
+        * this unconditionally modifies the property to the new key value.
+        * @param {Object} linkdata a JavaScript object representing a link.
+        * @param {string|number|undefined} key
+        */
+        setKeyForLinkData(linkdata: Object, key: Key): void;
+
+        /**
+        * Replaces an Array of node key values that identify node data acting as labels on the given link data.
+        * This method only works if .linkLabelKeysProperty has been set to something other than an empty string.
+        * @param {Object} linkdata a JavaScript object representing a link.
+        * @param arr an Array of node keys; an empty Array if the property was not present.
+        */
+        setLabelKeysForLinkData(linkdata: Object, arr: Array<Key>): void;
+
+        /**
+        * Change the node key that the given link data references as the
+        * destination of the link.
+        * @param {Object} linkdata a JavaScript object representing a link.
+        * @param {string|number|undefined} key This may be undefined if
+        * the link should no longer go to any node.
+        */
+        setToKeyForLinkData(linkdata: Object, key: Key): void;
+
+        /**
+        * Change the information that the given link data uses to identify the
+        * particular "port" that the link is going to.
+        * @param {Object} linkdata a JavaScript object representing a link.
+        * @param {string} portname This may be the empty string if
+        * the link should no longer be associated with any particular "port".
+        */
+        setToPortIdForLinkData(linkdata: Object, portname: string): void;
+    }
+
+    /*
+    * Models hold the essential data of a diagram, describing the basic entities and their properties and relationships
+    * without specifying the appearance and behavior of the Nodes and Links and Groups that represent them visually.
+    * Models tend to hold only relatively simple data, making them easy to persist by serialization as JSON or XML formatted text.
+    */
+    class Model {
+        /**
+        * You probably don't want to call this constructor, because this class does not support links (relationships between nodes) or groups (nodes and links and subgraphs as nodes): instead, create instances of a subclass such as GraphLinksModel or TreeModel.
+        * @param {Array<Object>=} nodedataarray an optional Array containing JavaScript objects to be represented by Parts.
+        */
+        constructor(nodedataarray?: Array<Object>);
+
+        /**Gets or sets whether the default behavior for copyNodeData makes copies of property values that are Arrays.*/
+        copiesArrays: boolean;
+
+        /**Gets or sets whether the default behavior for copyNodeData when copying Arrays also copies array items that are Objects.*/
+        copiesArrayObjects: boolean;
+
+        /**Gets or sets a function that makes a copy of a node data object; the default value is null, resulting in the standard behavior which is to make a shallow copy of the object.*/
+        copyNodeDataFunction: (obj: Object, model: Model) => Object;
+
+        /**Gets or sets the name of the format of the diagram data; the default value is the empty string.*/
+        dataFormat: string;
+
+        /**Gets or sets whether this model may be modified, such as adding nodes; by default this value is false.*/
+        isReadOnly: boolean;
+
+        /**Gets or sets a function that returns a unique id number or string for a node data object; the default value is null.*/
+        makeUniqueKeyFunction: (model: Model, obj: Object) => Key;
+
+        /**Gets a JavaScript Object that can hold programmer-defined property values for the model as a whole, rather than just for one node or one link; by default this is an object with no properties. The value must be an Object.*/
+        modelData: any;
+
+        /**Gets or sets the name of this model; the initial name is an empty string.*/
+        name: string;
+
+        /**Gets or sets the name of the node data property that returns a string naming that data's category, or a function that takes a node data object and returns the category name; the default value is the name 'category'.*/
+        nodeCategoryProperty: PropertyAccessor;
+
+        /**Gets or sets the array of node data objects that correspond to Nodes, Groups, or non-Link Parts in the Diagram; the initial value is an empty Array.*/
+        nodeDataArray: Array<Object>;
+
+        /**Gets or sets the name of the data property that returns a unique id number or string for each node data object, or a function taking a node data object and returning the key value; the default value is the name 'key'.*/
+        nodeKeyProperty: PropertyAccessor;
+
+        /**Gets or sets whether ChangedEvents are not recorded by the UndoManager; the initial and normal value is false.*/
+        skipsUndoManager: boolean;
+
+        /**Gets or sets the UndoManager for this Model; the default UndoManager has its UndoManager.isEnabled property set to false.*/
+        undoManager: UndoManager;
+
+        /**
+        * Add an item at the end of a data array that may be data bound by a Panel as its Panel.itemArray,
+        * in a manner that can be undone/redone and that automatically updates any bindings.
+        * This also calls .raiseChangedEvent to notify all listeners about the ChangedEvent.Insert.
+        * If you want to add a new node or part to the diagram, call .addNodeData.
+        * @param {Array<*>} arr an Array that is the value of some Panel's Panel.itemArray.
+        * @param {*} val the new value to be pushed onto the array.
+        */
+        addArrayItem(arr: Array<any>, val: any): void;
+
+        /**
+        * Register an event handler that is called when there is a ChangedEvent for a modification of the Diagram, a Layer, or a GraphObject.
+        * This registration does not raise a ChangedEvent.
+        * @param {function(ChangedEvent)} listener a function that takes a ChangedEvent as its argument.
+        */
+        addChangedListener(listener: (e: ChangedEvent) => void ): void;
+
+        /**
+        * When you want to add a node or group to the diagram,
+        * call this method with a new data object.
+        * This will add that data to the .nodeDataArray and
+        * notify all listeners that a new node data object has been inserted into the collection.
+        * To remove a node from the diagram, you can remove its data object by calling .removeNodeData.
+        * To add or remove an object or value from an item array, call .insertArrayItem or .removeArrayItem.
+        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
+        */
+        addNodeData(nodedata: Object): void;
+
+        /**
+        * Add to this model all of the node data held in an Array or in an Iterable of node data objects.
+        * @param {Iterable<Object>|Array<Object>} coll a collection of node data objects to add to the .nodeDataArray
+        */
+        addNodeDataCollection(coll: Iterable<Object> | Array<Object>): void;
+
+        /**
+        * Modify this model by applying the changes given in an "incremental" model change in JSON format
+        * generated by toIncrementalJson.
+        * Incremental changes must be applied in the same order that the changes occurred in the original model.
+        * <p>
+        * This requires the "incremental" property to be present and to be a number, as specified by toIncrementalJson.
+        * All of the top-level properties in the JSON, such as nodeKeyProperty, must be the same as for this model.
+        * @param {string|Object} s a String in JSON format containing modifications to be performed to the model,
+        *    or a JavaScript Object parsed from such a string
+        */
+        applyIncrementalJson(s: string | Object): void;
+
+        /**
+        * Clear out all references to any model data.
+        * This also clears out the UndoManager, so this operation is not undoable.
+        * This method is called by Diagram.clear; it does not notify any Diagrams or other listeners.
+        * Instead of calling this method, you may prefer to set .nodeDataArray to an empty JavaScript Array.
+        * If this model is a GraphLinksModel, you would also want to set GraphLinksModel.linkDataArray to a separate empty JavaScript Array.
+        */
+        clear(): void;
+
+        /**
+         * Copies properties from this model to the given model, which must be of the same class as this model.
+         * @param {Model} copy 
+         */
+        protected cloneProtected(copy: Model): void;
+
+        /**
+        * Commit the changes of the current transaction.
+        * This just calls UndoManager.commitTransaction.
+        * @param {string=} tname a descriptive name for the transaction.
+        */
+        commitTransaction(tname?: string): boolean;
+
+        /**
+        * Decide if a given node data is in this model.
+        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
+        */
+        containsNodeData(nodedata: Object): boolean;
+
+        /**
+        * Creates an empty copy of this Model and returns it.
+        * The data is not copied: nodeDataArray, modelData,
+        * GraphLinksModel.linkDataArray, GraphLinksModel.archetypeNodeData.
+        * Nor are any Changed listeners or the UndoManager.
+        */
+        copy(): Model;
+
+        /**
+        * Make a copy of a node data object.
+        * This uses the value of .copyNodeDataFunction to actually perform the copy,
+        * unless it is null, in which case this method just makes a shallow copy of the JavaScript Object.
+        * This does not modify the model -- the returned data object is not added to this model.
+        * This assumes that the data's constructor can be called with no arguments.
+        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
+        */
+        copyNodeData(nodedata: Object): Object;
+
+        /**
+        * Given a number or string, find the node data in this model
+        * that uses the given value as its unique key.
+        * The return value will be an Object or null.
+        * @param {*} key a string or a number.
+        */
+        findNodeDataForKey(key: Key): any;
+
+        /**
+        * This static function parses a string in JSON format and constructs, initializes, and returns a model.
+        * Note that properties with values that are functions are not written out by .toJson,
+        * so reading in such a model will require constructing such a model, initializing its functional property values,
+        * and explicitly passing it in as the second argument.
+        * @param {string} s a String in JSON format containing all of the persistent properties of the model, or an Object already read from JSON text.
+        * @param {model=} model an optional model to be modified; if not supplied, it constructs and returns a new model whose name is specified by the "class" property.
+        */
+        static fromJson(s: string | Object, model?: Model): Model;
+
+        /**
+        * Find the category of a given node data, a string naming the node template
+        * or group template or part template
+        * that the Diagram should use to represent the node data.
+        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
+        */
+        getCategoryForNodeData(nodedata: Object): string;
+
+        /**
+        * Given a node data object return its unique key: a number or a string.
+        * This returns undefined if there is no key value.
+        * It is possible to change the key for a node data object by calling .setKeyForNodeData.
+        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
+        */
+        getKeyForNodeData(nodedata: Object): Key;
+
+        /**
+        * Add an item to a data array that may be data bound by a Panel as its Panel.itemArray,
+        * given a new data value and the index at which to insert the new value, in a manner that can be undone/redone and that automatically updates any bindings.
+        * This also calls .raiseChangedEvent to notify all listeners about the ChangedEvent.Insert.
+        * If you want to add a new node or part to the diagram, call .addNodeData.
+        * @param Array<*> arr an Array that is the value of some Panel's Panel.itemArray.
+        * @param {number} idx the zero-based array index where the new value will be inserted; use -1 to push the new value on the end of the array.
+        * @param {*} val the new value to be inserted into the array.
+        */
+        insertArrayItem(arr: Array<any>, idx: number, val: any): void;
+
+        /**
+        * This method is called when a node data object is added to the model to make sure that
+        * .getKeyForNodeData returns a unique key value.
+        * The key value should be unique within the set of data managed by this model:
+        * .nodeDataArray.
+        * If the key is already in use, this will assign an unused number to the
+        * .nodeKeyProperty property on the data.
+        * If you want to customize the way in which node data gets a unique key,
+        * you can set the .makeUniqueKeyFunction functional property.
+        * If the node data object is already in the model and you want to change its key value,
+        * call .setKeyForNodeData and give it a new unique key value.
+        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
+        */
+        makeNodeDataKeyUnique(nodedata: Object): void;
+
+        /**
+        * Call this method to notify that the model or its objects have changed.
+        * This constructs a ChangedEvent and calls all Changed listeners.
+        * @param {EnumValue} change specifies the general nature of the change; typically the value is ChangedEvent.Property.
+        * @param {string|function(Object):*} propertyname names the property that was modified, or a function that takes an Object and returns the property value.
+        * @param {Object} obj the object that was modified, typically a GraphObject, Diagram, or a Model.
+        * @param {*} oldval the previous or older value.
+        * @param {*} newval the next or newer value.
+        * @param {*=} oldparam an optional value that helps describe the older value.
+        * @param {*=} newparam an optional value that helps describe the newer value.
+        */
+        raiseChangedEvent(change: EnumValue, propertyname: PropertyAccessor, obj: Object, oldval: any, newval: any, oldparam?: any, newparam?: any): void;
+
+        /**
+        * Call this method to notify about a data property having changed value.
+        * This constructs a ChangedEvent and calls all Changed listeners.
+        * You should call this method only if the property value actually changed.
+        * This method is called by .setDataProperty.
+        * @param {Object} data the data object whose property changed value.
+        * @param {string|function(Object):*} propertyname the name of the property, or a function that takes an Object and returns the property value.
+        * @param {*} oldval the previous or old value for the property.
+        * @param {*} newval the next or new value for the property.
+        * @param {*=} oldparam an optional value additionally describing the old value.
+        * @param {*=} newparam an optional value additionally describing the new value.
+        */
+        raiseDataChanged(data: Object, propertyname: PropertyAccessor, oldval: any, newval: any, oldparam?: any, newparam?: any): void;
+
+        /**
+        * Remove an item from a data array that may be data bound by a Panel as its Panel.itemArray,
+        * given the index at which to remove a data value, in a manner that can be undone/redone and that automatically updates any bindings.
+        * This also calls .raiseChangedEvent to notify all listeners about the ChangedEvent.Remove.
+        * If you want to remove a node from the diagram, call .removeNodeData.
+        * Note that there is no version of this method that takes an item value instead of an index into the array.
+        * Because item arrays may hold any JavaScript value, including numbers and strings, there may be duplicate entries with that value in the array.
+        * To avoid ambiguity, removing an item from an array requires an index.
+        * @param Array<*> arr an Array that is the value of some Panel's Panel.itemArray.
+        * @param {number=} idx the zero-based array index of the data item to be removed from the array;
+        *   if not supplied it will remove the last item of the array.
+        */
+        removeArrayItem(arr: Array<any>, idx?: number): void;
+
+        /**
+        * Unregister an event handler listener.
+        * This deregistration does not raise a ChangedEvent.
+        * @param {function(ChangedEvent)} listener a function that takes a ChangedEvent as its argument.
+        */
+        removeChangedListener(listener: (e: ChangedEvent) => void ): void;
+
+        /**
+        * When you want to remove a node or group from the diagram,
+        * call this method with an existing data object.
+        * This will remove that data from the .nodeDataArray and
+        * notify all listeners that a node data object has been removed from the collection.
+        * Removing a node data from a model does not automatically remove
+        * any connected link data from the model.
+        * Removing a node data that represents a group does not automatically remove
+        * any member node data or link data from the model.
+        * To add a node to the diagram, you can add its data object by calling .addNodeData.
+        * To add or remove an object or value from an item array, call .insertArrayItem or .removeArrayItem.
+        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
+        */
+        removeNodeData(nodedata: Object): void;
+
+        /**
+        * Remove from this model all of the node data held in an Array or in an Iterable of node data objects.
+        * @param {Iterable<Object>|Array<Object>} coll a collection of node data objects to remove from the .nodeDataArray
+        */
+        removeNodeDataCollection(coll: Iterable<Object> | Array<Object>): void;
+
+        /**
+        * Rollback the current transaction, undoing any recorded changes.
+        * This just calls UndoManager.rollbackTransaction.
+        */
+        rollbackTransaction(): boolean;
+
+        /**
+        * Change the category of a given node data, a string naming the node template
+        * or group template or part template
+        * that the Diagram should use to represent the node data.
+        * Changing the node template for a node data will cause the existing Node, Group, or Part
+        * to be replaced with a new Node, Group, or Part
+        * created by copying the new node template and applying any data-bindings.
+        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
+        * @param {string} cat Must not be null.
+        */
+        setCategoryForNodeData(nodedata: Object, cat: string): void;
+
+        /**
+        * Change the value of some property of a node data, a link data, or an item data, given a string naming the property
+        * and the new value, in a manner that can be undone/redone and that automatically updates any bindings.
+        * This gets the old value of the property; if the value is the same as the new value, no side-effects occur.
+        * @param {Object} data a JavaScript object representing a Node, Link, Group, simple Part, or item in a Panel.itemArray.
+        * @param {string} propname a string that is not null or the empty string.
+        * @param {*} val the new value for the property.
+        */
+        setDataProperty(data: Object, propname: string, val: any): void;
+
+        /**
+        * Change the unique key of a given node data that is already in this model.
+        * The new key value must be unique -- i.e. not in use by another node data object.
+        * You can call .findNodeDataForKey to check if a proposed new key is already in use.
+        * This operation will check all data objects in the model and replace all references
+        * using the old key value with the new one.
+        * If this is called on a node data object that is not (yet) in this model,
+        * this unconditionally modifies the property to the new key value.
+        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
+        * @param {string|number|undefined} key
+        */
+        setKeyForNodeData(nodedata: Object, key: Key): void;
+
+        /**
+        * Begin a transaction, where the changes are held by a Transaction object in the UndoManager.
+        * This just calls UndoManager.startTransaction.
+        * @param {string=} tname a descriptive name for the transaction.
+        */
+        startTransaction(tname?: string): boolean;
+
+        /**
+        * Produce a JSON-format string representing the changes in the most recent Transaction.
+        * This writes out JSON for a model, but recording only changes in the given Transaction,
+        * with the addition of the "incremental" property to mark it as different from a complete model.
+        * Instead of the "nodeDataArray" property (and "linkDataArray" property for GraphLinksModels),
+        * this will have "inserted...", "modified...", and "removed..." properties that are Arrays.
+        * <p>
+        * The "modifiedNodeData" Array holds JavaScript objects.
+        * The "insertedNodeKeys" and "removedNodeKeys" Arrays hold keys (numbers or strings) of data,
+        * not whole objects, that have been added and/or deleted.
+        * <p>
+        * The purpose of this method is to make it easier to send incremental changes to the server/database,
+        * instead of sending the whole model.
+        * <p>
+        * For GraphLinksModels, this method requires that GraphLinksModel#linkKeyProperty is not an empty string.
+        * The incremental JSON for GraphLinksModels will include "modifiedLinkData", "insertedLinkKeys", and "removedLinkKeys"
+        * properties that are Arrays.
+        * @param {ChangedEvent} e a Transaction ChangedEvent for which ChangedEvent.isTransactionFinished is true
+        * @param {string=} classname for the written model, defaults to the name of the class of the model
+        * @return {string}
+        */
+        toIncrementalJson(e: ChangedEvent, classname?: string): string;
+
+        /**
+        * Generate a string representation of the persistent data in this model, in JSON format.
+        * Object properties that are not enumerable or whose names start with "_" are not written out.
+        * Functions are not able to be written in JSON format, so any properties that have function values
+        * will not be saved in the JSON string.
+        * There must not be any circular references within the model data.
+        * Any sharing of object references will be lost in the written JSON.
+        * Most object classes cannot be serialized into JSON without special knowledge and processing at both ends.
+        * The .toJson and Model.fromJson methods automatically do such processing for numbers that are NaN
+        * and for objects that are of class Point, Size, Rect, Margin, Spot,
+        * Brush (but not for brush patterns), and for Geometry.
+        * However, we recommend that you use Binding converters (static functions named "parse" and "stringify")
+        * to represent Points, Sizes, Rects, Margins, Spots, and Geometries as string values in your data, rather than as Objects.
+        * This makes the JSON text smaller and simpler and easier to read.
+        * @param {string=} classname The optional name of the model class to use in the output;
+        *     for the standard models, this is their class name prefixed with "go.".
+        */
+        toJson(classname?: string): string;
+
+        /**
+        * Find a Part corresponding to the given data and
+        * call its Panel.updateTargetBindings method, in each Diagram
+        * that uses this Model.
+        * @param {Object} data The data object in this model that was modified.
+        * @param {string=} srcpropname If not present or the empty string,
+        *   update all bindings on the target Part or item Panel;
+        *   otherwise update only those bindings using this source property name.
+        */
+        updateTargetBindings(data: Object, srcpropname?: string): void;
+    }
+
+    /**
+    * A Transaction holds a list of ChangedEvents collected during a transaction,
+    * as the value of the read-only .changes property.
+    */
+    class Transaction {
+        /**
+        * Construct an object holding an empty list of ChangedEvents and no .name.
+        */
+        constructor();
+
+        /**This read-only property returns the list of ChangedEvents.*/
+        changes: List<ChangedEvent>;
+
+        /**Gets or sets whether we can add more ChangedEvents to this list of changes.*/
+        isComplete: boolean;
+
+        /**Gets or sets the transaction name for this collection of changes.*/
+        name: string;
+
+        /**
+        * This predicate returns true if you can call .redo, namely when .isComplete is true.
+        */
+        canRedo(): boolean;
+
+        /**
+        * This predicate returns true if you can call .undo, namely when .isComplete is true.
+        */
+        canUndo(): boolean;
+
+        /**
+        * Clear all of the saved changes.
+        */
+        clear(): void;
+
+        /**
+        * Re-perform these changes after an .undo.
+        */
+        redo(): void;
+
+        /**
+        * Undo all of the changes, in reverse order.
+        */
+        undo(): void;
+    }
+
+    /**
+    * TreeModels support tree-structured graphs of nodes and links.
+    * Each node can have at most one "tree parent"; cycles are not permitted.
+    * The reference to the parent node's key is a property of the child node data.
+    */
+    class TreeModel extends Model {
+        /**
+        * This constructs an empty TreeModel unless one provides arguments as the initial data array values for the Model.nodeDataArray property.
+        * @param {Array<Object>=} nodedataarray an optional Array containing JavaScript objects to be represented by Nodes.
+        */
+        constructor(nodedataarray?: Array<Object>);
+
+        /**
+        * Gets or sets the name of the property on node data that specifies
+        * the string or number key of the node data that acts as the "parent" for this "child" node data,
+        * or a function that takes a node data object and returns that parent key;
+        * the default value is the name 'parent'.
+        * The value must not be null nor an empty string.
+        */
+        nodeParentKeyProperty: PropertyAccessor;
+
+        /**
+        * Gets or sets the name of the data property that returns a string describing that node data's parent link's category,
+        * or a function that takes a node data object and returns its parent link's category string;
+        * the default value is the name 'parentLinkCategory'.
+        * This is used by the diagram to distinguish between different kinds of links.
+        * The name must not be null.
+        */
+        parentLinkCategoryProperty: PropertyAccessor;
+
+        /**
+        * If there is a parent node for the given node data, return the parent's key.
+        * @param {Object} nodedata a JavaScript object representing a node.
+        */
+        getParentKeyForNodeData(nodedata: Object): Key;
+
+        /**
+        * Find the category for the parent link of a given child node data, a string naming the link template
+        * that the Diagram should use to represent the link.
+        * @param {Object} childdata a JavaScript object representing a node data.
+        */
+        getParentLinkCategoryForNodeData(childdata: Object): string;
+
+        /**
+        * Change the parent node for the given node data, given a key for the new parent, or undefined if there should be no parent.
+        * @param {Object} nodedata a JavaScript object representing a node.
+        * @param {string|number|undefined} key This may be undefined if there should be no parent node data.
+        */
+        setParentKeyForNodeData(nodedata: Object, key: Key): void;
+
+        /**
+        * Change the category for the parent link of a given child node data, a string naming the link template
+        * that the Diagram should use to represent the link.
+        * Changing the link template will cause any existing Link
+        * to be removed from the Diagram and replaced with a new Link
+        * created by copying the new link template and applying any data-bindings.
+        * @param {Object} childdata a JavaScript object representing a node data.
+        * @param {string} cat Must not be null.
+        */
+        setParentLinkCategoryForNodeData(childdata: Object, cat: string): void;
+    }
+
+    /**
+    * A Transaction holds a list of ChangedEvents collected during a transaction,
+    * as the value of the read-only .changes property.
+    */
+    class UndoManager {
+        /**
+        * The constructor produces an empty UndoManager with no transaction history.
+        */
+        constructor();
+
+        /**This read-only property returns the current Transaction for recording additional model change events.*/
+        currentTransaction: Transaction;
+
+        /**This read-only property returns the whole history, a list of all of the Transactions, each representing a transaction with some number of ChangedEvents.*/
+        history: List<Transaction>;
+
+        /**This read-only property returns the index into .history for the current undoable Transaction.*/
+        hisotryIndex: number;
+
+        /**Gets or sets whether this UndoManager records any changes.*/
+        isEnabled: boolean;
+
+        /**This property is true after the first call to .startTransaction and before a corresponding call to .commitTransaction or .rollbackTransaction.*/
+        isInTransaction: boolean;
+
+        /**This property is true during a call to .undo or .redo.*/
+        isUndoingRedoing: boolean;
+
+        /**Gets or sets the maximum number of transactions that this undo manager will remember.*/
+        maxHistoryLength: number;
+
+        /**This read-only property returns an iterator for all of the Models that this UndoManager is handling.*/
+        models: Iterator<Model>;
+
+        /**This read-only property returns a stack of ongoing transaction names.*/
+        nestedTransactionNames: List<string>;
+
+        /**This read-only property returns the current transaction level.*/
+        transactionLevel: number;
+
+        /**This read-only property returns the Transaction in the .history to be redone next.*/
+        transactionToRedo: Transaction;
+
+        /**This read-only property returns the Transaction in the .history to be undone next.*/
+        transactionToUndo: Transaction;
+
+        /**
+        * Make sure this UndoManager knows about a Model for which it may receive ChangedEvents when the given Model is changed.
+        * @param {Model} model
+        */
+        addModel(model: Model): void;
+
+        /**
+        * This predicate returns true if you can call .redo.
+        */
+        canRedo(): boolean;
+
+        /**
+        * This predicate returns true if you can call .undo.
+        */
+        canUndo(): boolean;
+
+        /**
+        * Clear all of the Transactions and clear all other state, including any ongoing transaction without rolling back.
+        */
+        clear(): void;
+
+        /**
+        * Commit the current transaction started by a call to .startTransaction.
+        * For convenience, this method is called by Model.commitTransaction and Diagram.commitTransaction.
+        * If this call stops a top-level transaction,
+        * we mark the .currentTransaction as complete (Transaction.isComplete),
+        * we add the Transaction to the .history list,
+        * and we return true.
+        * Committing a transaction when there have been some undos without corresponding
+        * redos will throw away the Transactions holding changes that happened
+        * after the current state, before adding the new Transaction to the
+        * .history list.
+        * @param {string=} tname a short string describing the transaction, defaulting to the name given at the call to startTransaction
+        */
+        commitTransaction(tname?: string): boolean;
+
+        /**
+        * Maybe record a ChangedEvent in the .currentTransaction.
+        * This calls .skipsEvent to see if this should ignore the change.
+        * If .skipsEvent returns false, this creates a copy of the ChangedEvent
+        * and adds it to the .currentTransaction.
+        * If there is no .currentTransaction, this first creates and remembers it.
+        * This method always ignores all changes while performing
+        * an .undo or .redo.
+        * This method is also a no-op if .isEnabled is false.
+        * @param {ChangedEvent} e a ChangedEvent.
+        */
+        handleChanged(e: ChangedEvent): void;
+
+        /**
+        * Re-perform this object change after an .undo.
+        */
+        redo(): void;
+
+        /**
+        * Inform this UndoManager that it will no longer be receiving ChangedEvents
+        * when the given Model is changed.
+        * The model will no longer receive notifications about transactions and undo or redo operations.
+        * You should not call this method during a transaction.
+        * If you call this method between transactions when there is a transaction history,
+        * you should be careful that there are no ChangedEvents referring to that model in any Transactions.
+        * @param {Model} model A Model that this UndoManager should no longer manage.
+        */
+        removeModel(model: Model): void;
+
+        /**
+        * Rollback the current transaction started by a call to .startTransaction, undoing any changes.
+        */
+        rollbackTransaction(): boolean;
+
+        /**
+        * This predicate is called by .handleChanged to decide if a ChangedEvent
+        * is not interesting enough to be remembered.
+        * Transactional events (of change type ChangedEvent.Transaction) are always skipped.
+        * Changed events for GraphObjects that are in Layer.isTemporary layers are also skipped.
+        * Sometimes changed events do not even get to .handleChanged because
+        * Model.skipsUndoManager or Diagram.skipsUndoManager is true.
+        * @param {ChangedEvent} e the ChangedEvent received by .handleChanged.
+        */
+        skipsEvent(e: ChangedEvent): boolean;
+
+        /**
+        * Begin a transaction, where the changes are held by a Transaction object
+        * as the value of .currentTransaction.
+        * You must call either .commitTransaction or .rollbackTransaction afterwards.
+        * For convenience, this method is called by Model.startTransaction and Diagram.startTransaction.
+        * Transactions can be nested.
+        * Starting or ending a nested transaction will return false.
+        * Nested transactions will share the same Transaction list of ChangedEvents.
+        * Starting a transaction will not necessarily cause .currentTransaction to be non-null.
+        * A Transaction object is usually only created by .handleChanged when a ChangedEvent first occurs.
+        * @param {string=} tname a short string describing the transaction.
+        */
+        startTransaction(tname?: string): boolean;
+
+        /**
+        * Reverse the effects of this object change.
+        */
+        undo(): void;
+    }
+
+
+    /**
+     * This layout positions nodes in a circular arrangement.
+     * This layout makes use of a LayoutNetwork of
+     * CircularVertexes and CircularEdges that normally
+     * correspond to the Nodes and Links of the Diagram.
+     */
+    class CircularLayout extends Layout {
+        /**
+        * Constructs a CircularLayout with no Layout.network and with no owning Layout.diagram.
+        */
+        constructor();
+
+        /**Returns the coordinates of the center of the laid-out ellipse.*/
+        actualCenter: Point;
+
+        /**This read-only property returns the effective spacing that may have been calculated by the layout.*/
+        actualSpacing: number;
+
+        /**This read-only property returns the effective X radius that may have been calculated by the layout.*/
+        actualXRadius: number;
+
+        /**This read-only property returns the effective Y radius that may have been calculated by the layout.*/
+        actualYRadius: number;
+
+        /**Gets or sets how the nodes are spaced.*/
+        arrangement: EnumValue;
+
+        /**Gets or sets the ratio of the arrangement's height to its width (1 for a circle, >1 for a vertically elongated ellipse).*/
+        aspectRatio: number;
+
+        /**Gets or sets the comparer which sorts the data when .sorting is set to CircularLayout.Ascending or CircularLayout.Descending.*/
+        comparer: (a: CircularVertex, b: CircularVertex) => number;
+
+        /**Gets or sets whether the nodes are arranged clockwise or counterclockwise.*/
+        direction: EnumValue;
+
+        /**Specifies how the diameter of nodes will be calculated.*/
+        nodeDiameterFormula: EnumValue;
+
+        /**Gets or sets the horizontal radius of the elliptical arrangement.*/
+        radius: number;
+
+        /**Gets or sets if and how the nodes are sorted.*/
+        sorting: EnumValue;
+
+        /**Gets or sets the distance between nodes (if .radius is NaN) or the minimum distance between nodes (if .radius is a number).*/
+        spacing: number;
+
+        /**Gets or sets the angle (in degrees, clockwise from the positive side of the X axis) of the first element.*/
+        startAngle: number;
+
+        /**Gets or sets the absolute angle (in degrees) between the first and last node.*/
+        sweepAngle: number;
+
+        /**
+        * Position each Node according to the Vertex position, and then position the Links.
+        */
+        commitLayout(): void;
+
+        /**
+        * Commit the position and routing of all edge links.
+        */
+        commitLinks(): void;
+
+        /**
+        * Commit the position of all vertex nodes.
+        */
+        commitNodes(): void;
+
+        /**
+        * Create a new LayoutNetwork of CircularVertexes and CircularEdges.
+        */
+        createNetwork(): CircularNetwork;
+
+        /**
+        * Assign the positions of the vertexes in the network.
+        * @param {Diagram | Group | Iterable<Part>} coll A Diagram or a Group or a collection of Parts.
+        */
+        doLayout(coll: (Diagram | Group | Iterable<Part>)): void;
+
+        /**Nodes are sorted using the .comparer, in ascending order; This value is used for CircularLayout.sorting.*/
+        static Ascending: EnumValue;
+
+        /**The ring is filled by alternating sides; the second node is counterclockwise from the first node; This value is used for CircularLayout.direction.*/
+        static BidirectionalLeft: EnumValue;
+
+        /**The ring is filled by alternating sides; the second node is clockwise from the first node; This value is used for CircularLayout.direction.*/
+        static BidirectionalRight: EnumValue;
+
+        /**The effective diameter is either the width or height of the node, whichever is larger; This will cause circular nodes to touch when CircularLayout.spacing is 0; This is ideal when the nodes are circular.*/
+        static Circular: EnumValue;
+
+        /**Rings are filled clockwise; This value is used for CircularLayout.direction.*/
+        static Clockwise: EnumValue;
+
+        /**The angular distance between the nodes is constant; This value is used for CircularLayout.arrangement.*/
+        static ConstantAngle: EnumValue;
+
+        /**The distance between the centers of the nodes is constant; This value is used for CircularLayout.arrangement.*/
+        static ConstantDistance: EnumValue;
+
+        /**The spacing between the idealized boundaries of the nodes is constant; This value is used for CircularLayout.arrangement.*/
+        static ConstantSpacing: EnumValue;
+
+        /**Rings are filled counterclockwise; This value is used for CircularLayout.direction.*/
+        static Counterclockwise: EnumValue;
+
+        /**Nodes are sorted using the .comparer, in reverse ascending (descending) order; This value is used for CircularLayout.sorting.*/
+        static Descending: EnumValue;
+
+        /**Nodes are arranged in the order given; This value is used for CircularLayout.sorting.*/
+        static Forwards: EnumValue;
+
+        /**Nodes are ordered to reduce link crossings; This value is used for CircularLayout.sorting.*/
+        static Optimized: EnumValue;
+
+        /**The vertices are arranged as close together as possible considering the CircularLayout.spacing, assuming the nodes are rectangular; This value is used for CircularLayout.arrangement.*/
+        static Packed: EnumValue;
+
+        /**The effective diameter is sqrt(width^2+height^2); The corners of square nodes will touch at 45 degrees when CircularLayout.spacing is 0; This value is used for CircularLayout.nodeDiameterFormula.*/
+        static Pythagorean: EnumValue;
+
+        /**Nodes are arranged in the reverse of the order given; This value is used for CircularLayout.sorting.*/
+        static Reverse: EnumValue;
+    }
+
+    class CircularNetwork extends LayoutNetwork {  // undocumented
+    }
+
+    /** This holds CircularLayout-specific information about Links.*/
+    class CircularEdge extends LayoutEdge {
+    }
+
+    /** This holds CircularLayout-specific information about Nodes.*/
+    class CircularVertex extends LayoutVertex {
+        /**Gets or sets the value used as the vertex's angle.*/
+        actualAngle: number;
+
+        /**Gets or sets the value used as the vertex's diameter.*/
+        diameter: number;
+    }
+
+    /**
+    * Force-directed layout treats the graph as if it were a system of physical
+    * bodies with forces acting on them and between them.
+    * The algorithm seeks a configuration of the bodies with locally minimal energy,
+    * i.e. vertex positions such that the sum of the forces on each vertex is zero.
+    */
+    class ForceDirectedLayout extends Layout {
+        /**
+        * Constructs a ForceDirectedLayout with no Layout.network and with no owning Layout.diagram.
+        */
+        constructor();
+
+        /**Gets or sets the space between which the layout will position the connected graphs that together compose the network.*/
+        arrangementSpacing: Size;
+
+        /**Gets or sets whether .commitNodes should move all of the nodes so that the nodes all fit with the top-left corner at the Layout.arrangementOrigin.*/
+        arrangesToOrigin: boolean;
+
+        /**Gets or sets whether to call .addComments.*/
+        comments: boolean;
+
+        /**This read-only property returns the current iteration count, valid during a call to .doLayout.*/
+        currentIteration: number;
+
+        /**Gets or sets the default value computed by .electricalCharge.*/
+        defaultCommentElectricalCharge: number;
+
+        /**Gets or sets the default value computed by .springLength.*/
+        defaultCommentSpringLength: number;
+
+        /**Gets or sets the default value computed by .electricalCharge.*/
+        defaultElectricalCharge: number;
+
+        /**Gets or sets the default value computed by .gravitationalMass.*/
+        defaultGravitationalMass: number;
+
+        /**Gets or sets the default value computed by .springLength.*/
+        defaultSpringLength: number;
+
+        /**Gets or sets the default value computed by .springStiffness.*/
+        defaultSpringStiffness: number;
+
+        /**Gets or sets approximately how far a node must move in order for the iterations to continue.*/
+        epsilonDistance: number;
+
+        /**Gets or sets a threshold for the distance beyond which the electrical charge forces may be ignored.*/
+        infinityDistance: number;
+
+        /**Gets or sets the maximum number of iterations to perform when doing the force-directed auto layout.*/
+        maxIterations: number;
+
+        /**Gets or sets a random number generator with a random() method; set to null in order to use and reset an internal repeatable pseudo-random number generator.*/
+        randomNumberGenerator: { random: () => number };
+
+        /**Gets or sets whether the fromSpot and the toSpot of every Link should be set to Spot.Default.*/
+        setsPortSpots: boolean;
+
+        /**
+        * Find associated objects to be positioned along with the vertex.
+        * @param {LayoutVertex} v
+        */
+        addComments(v: ForceDirectedVertex): void;
+
+        /**
+        * Position the Nodes according to the Vertex positions.
+        */
+        commitLayout(): void;
+
+        /**
+        * Commit the position and routing of all edge links.
+        */
+        commitLinks(): void;
+
+        /**
+        * Commit the position of all vertex nodes.
+        */
+        commitNodes(): void;
+
+        /**
+        * Create a new LayoutNetwork of ForceDirectedVertexes and ForceDirectedEdges.
+        */
+        createNetwork(): ForceDirectedNetwork;
+
+        /**
+        * Assign the positions of the vertexes in the network.
+        * @param {(Diagram | Group | Iterable<Part>)} coll A Diagram or a Group or a collection of Parts.
+        */
+        doLayout(coll: (Diagram | Group | Iterable<Part>)): void;
+
+        /**
+        * Returns the charge of the vertex,
+        * the value of ForceDirectedVertex.charge if it's a number,
+        * or else the value of .defaultElectricalCharge.
+        * @param {ForceDirectedVertex} v
+        */
+        electricalCharge(v: ForceDirectedVertex): number;
+
+        /**
+        * Returns the electrical field in the X direction acting on a vertex at the given point.
+        *
+        * Used to define an external electrical field at a point
+        * independent of the vertex charges.
+        * A vertex L is acted upon by a force in the X direction of magnitude
+        * @param {number} x
+        * @param {number} y
+        */
+        electricalFieldX(x: number, y: number): number;
+
+        /**
+        * Returns the electrical field in the Y direction acting on a vertex at the given point.
+        *
+        * Used to define an external electrical field at a point
+        * independent of the vertex charges.
+        * A vertex L is acted upon by a force in the Y direction of magnitude
+        * @param {number} x
+        * @param {number} y
+        */
+        electricalFieldY(x: number, y: number): number;
+
+        /**
+        * This returns the gravitational field in the X direction acting on a vertex at the given point.
+        *
+        * Used to define an external gravitational field at a point
+        * independent of the vertex masses.
+        * A vertex L is acted upon by a force in the X direction of magnitude
+        * @param {number} x
+        * @param {number} y
+        */
+        gravitationalFieldX(x: number, y: number): number;
+
+        /**
+        * This returns the gravitational field in the Y direction acting on a vertex at the given point.
+        *
+        * Used to define an external gravitational field at a point
+        * independent of the vertex masses.
+        * A vertex L is acted upon by a force in the Y direction of magnitude
+        * @param {number} x
+        * @param {number} y
+        */
+        gravitationalFieldY(x: number, y: number): number;
+
+        /**
+        * Returns the mass of the vertex,
+        * the value of ForceDirectedVertex.mass if it's a number,
+        * or else the value of .defaultGravitationalMass.
+        * @param {ForceDirectedVertex} v
+        */
+        gravitationalMass(v: ForceDirectedVertex): number;
+
+        /**
+        * This predicate returns true if the vertex should not be moved
+        * by the layout algorithm but still have an effect on nearby and connected vertexes.
+        * The default implementation returns ForceDirectedVertex.isFixed.
+        * @param {ForceDirectedVertex} v
+        */
+        isFixed(v: ForceDirectedVertex): boolean;
+
+        /**
+        * Maybe move a vertex that isFixed.
+        * This is called each iteration on each such vertex.
+        * By default this does nothing.
+        */
+        moveFixedVertex(v: ForceDirectedVertex): void;
+
+        /**
+        * Returns the length of the spring representing an edge.
+        * The two vertexes connected by the edge E are acted upon by a force of magnitude
+        * @param {ForceDirectedEdge} e
+        */
+        springLength(e: ForceDirectedEdge): number;
+
+        /**
+        * Returns the stiffness of the spring representing an edge.
+        * The two vertexes connected by the edge E are acted upon by a force of magnitude
+        * @param {ForceDirectedEdge} e
+        */
+        springStiffness(e: ForceDirectedEdge): number;
+    }
+
+    class ForceDirectedNetwork extends LayoutNetwork {  // undocumented
+    }
+
+    /** This holds ForceDirectedLayout-specific information about Links.*/
+    class ForceDirectedEdge extends LayoutEdge {
+        /**Gets or sets the length of this edge.*/
+        length: number;
+
+        /**Gets or sets this edge's stiffness or resistence to compression or stretching.*/
+        stiffness: number;
+    }
+
+    /** This holds ForceDirectedLayout-specific information about Nodes.*/
+    class ForceDirectedVertex extends LayoutVertex {
+        /**Gets or sets the electrical charge for this vertex.*/
+        charge: number;
+
+        /**Gets or sets the cumulative force on the vertex in the X direction.*/
+        forceX: number;
+
+        /**Gets or sets the cumulative force on the vertex in the Y direction.*/
+        forceY: number;
+
+        /**Gets or sets whether the vertex may be moved by any forces.*/
+        isFixed: boolean;
+
+        /**Gets or sets the gravitational mass for this vertex.*/
+        mass: number;
+    }
+
+    /**
+    * This simple layout places all of the Parts in a grid-like arrangement, ordered, spaced apart,
+    * and wrapping as needed.  It ignores any Links connecting the Nodes being laid out.
+    */
+    class GridLayout extends Layout {
+        /**
+        * This simple layout places all of the Parts in a grid-like arrangement, ordered, spaced apart,
+        * and wrapping as needed.  It ignores any Links connecting the Nodes being laid out.
+        */
+        constructor();
+
+        /**Gets or sets whether the Part.location or the position should be used to arrange each part.*/
+        alignment: EnumValue;
+
+        /**Gets or sets how to arrange the parts.*/
+        arrangement: EnumValue;
+
+        /**Gets or sets the minimum part size by which each part is positioned in the grid.*/
+        cellSize: Size;
+
+        /**Gets or sets the comparison function used to sort the parts.*/
+        comparer: (a: Part, b: Part) => number;
+
+        /**Gets or sets what order to place the parts.*/
+        sorting: EnumValue;
+
+        /**Gets or sets the minimum horizontal and vertical space between parts.*/
+        spacing: Size;
+
+        /**Gets or sets the maximum number of columns.*/
+        wrappingColumn: number;
+
+        /**Gets or sets the wrapping width.*/
+        wrappingWidth: number;
+
+        /**
+        * Assign the positions of the parts, ignoring any links.
+        * @param {(Diagram | Group | Iterable<Part>)} coll A Diagram or a Group or a collection of Parts.
+        */
+        doLayout(coll: (Diagram | Group | Iterable<Part>)): void;
+
+        /**Lay out each child according to the sort order given by GridLayout.comparer; This value is used for GridLayout.sorting.*/
+        static Ascending: EnumValue;
+
+        /**Lay out each child in reverse sort order given by GridLayout.comparer; This value is used for GridLayout.sorting.*/
+        static Descending: EnumValue;
+
+        /**Lay out each child in the order in which they were found; This value is used for GridLayout.sorting.*/
+        static Forward: EnumValue;
+
+        /**Fill each row from left to right; This value is used for GridLayout.arrangement.*/
+        static LeftToRight: EnumValue;
+
+        /**Position the part's Part.location at a grid point; This value is used for GridLayout.alignment.*/
+        static Location: EnumValue;
+
+        /**Position the top-left corner of each part at a grid point; This value is used for GridLayout.alignment.*/
+        static Position: EnumValue;
+
+        /**Lay out each child in reverse order from which they were found; This value is used for GridLayout.sorting.*/
+        static Reverse: EnumValue;
+
+        /**Fill each row from right to left; This value is used for GridLayout.arrangement.*/
+        static RightToLeft: EnumValue;
+    }
+
+    /**
+    * This arranges nodes into layers.
+    * The method uses a hierarchical approach
+    * for creating drawings of digraphs with nodes arranged in layers.
+    * The layout algorithm consists of four-major steps: Cycle Removal,
+    * Layer Assignment, Crossing Reduction, and Straightening and Packing.
+    */
+    class LayeredDigraphLayout extends Layout {
+        /**
+        * Constructs a LayeredDigraphLayout with no Layout.network and with no owning Layout.diagram.
+        */
+        constructor();
+
+        /**Gets or sets which aggressive option is being used to look for link crossings.*/
+        aggressiveOption: EnumValue;
+
+        /**Gets or sets the size of each column.*/
+        columnSpacing: number;
+
+        /**Gets or set which cycle removal option is used.*/
+        cycleRemoveOption: EnumValue;
+
+        /**Gets or sets the direction the graph grows towards.*/
+        direction: number;
+
+        /**Gets or sets which indices initialization option is being used.*/
+        initializeOption: EnumValue;
+
+        /**Gets or sets the number of iterations to be done.*/
+        iterations: number;
+
+        /**Gets or sets which layering option is being used.*/
+        layeringOption: EnumValue;
+
+        /**Gets or sets the size of each layer.*/
+        layerSpacing: number;
+
+        /**This read-only property returns the largest column value.*/
+        maxColumn: number;
+
+        /**This read-only property returns the largest index value.*/
+        maxIndex: number;
+
+        /**This read-only property returns the larges index layer.*/
+        maxIndexLayer: number;
+
+        /**This read-only property returns the largest layer value.*/
+        maxLayer: number;
+
+        /**This read-only property returns the smallest index layer.*/
+        minIndexLayer: number;
+
+        /**Gets or sets the options used by the straighten and pack function, The default value is LayeredDigraphLayout.PackAll.*/
+        packOption: number;
+
+        /**Gets or sets whether the FromSpot and ToSpot of each link should be set to values appropriate for the given value of LayeredDigraphLayout.direction.*/
+        setsPortSpots: boolean;
+
+        /**
+        * Assigns every vertex in the input network to a layer.
+        */
+        assignLayers(): void;
+
+        /**
+        * This overridable method is called by commitLayout
+        * to support custom arrangement of bands or labels across each layout layer.
+        * @param Array<*> layerRects an Array of Rects with the bounds of each of the "layers"
+        * @param {Point} offset the position of the top-left corner of the banded area relative to the coordinates given by the layerRects
+        */
+        commitLayers(layerRects: Array<Rect>, offset: Point): void;
+
+        /**
+        * Updates the physical location of "real" nodes and links to reflect the layout.
+        */
+        commitLayout(): void;
+
+        /**
+        * Routes the links.
+        */
+        commitLinks(): void;
+
+        /**
+        * Lays out the nodes.
+        */
+        commitNodes(): void;
+
+        /**
+        * Create a new LayoutNetwork of LayeredDigraphVertexes and LayeredDigraphEdges.
+        */
+        createNetwork(): LayeredDigraphNetwork;
+
+        /**
+        * Assign the positions of the vertexes in the network.
+        * @param {(Diagram | Group | Iterable<Part>)} coll A Diagram or a Group or a collection of Parts.
+        */
+        doLayout(coll: (Diagram | Group | Iterable<Part>)): void;
+
+        /**The faster, less aggressive, crossing reduction algorithm; a valid value for LayeredDigraphLayout.aggressiveOption.*/
+        static AggressiveLess: EnumValue;
+
+        /**The slower, more aggressive, crossing reduction algorithm, a valid value for LayeredDigraphLayout.aggressiveOption.*/
+        static AggressiveMore: EnumValue;
+
+        /**The fastest, but poorest, crossing reduction algorithm; a valid value for LayeredDigraphLayout.aggressiveOption.*/
+        static AggressiveNone: EnumValue;
+
+        /**Remove cycles using depth first cycle removal; a valid value of LayeredDigraphLayout.cycleRemoveOption.*/
+        static CycleDepthFirst: EnumValue;
+
+        /**Remove cycles using greedy cycle removal; a valid value of LayeredDigraphLayout.cycleRemoveOption.*/
+        static CycleGreedy: EnumValue;
+
+        /**Initialize using depth first in initialization; a valid value for LayeredDigraphLayout.initializeOption.*/
+        static InitDepthFirstIn: EnumValue;
+
+        /**Initialize using depth first out initialization; a valid value for LayeredDigraphLayout.initializeOption.*/
+        static InitDepthFirstOut: EnumValue;
+
+        /**Initialize using naive initialization; a valid value for LayeredDigraphLayout.initializeOption.*/
+        static InitNaive: EnumValue;
+
+        /**Assign layers using longest path sink layering; a valid value for LayeredDigraphLayout.layeringOption.*/
+        static LayerLongestPathSink: EnumValue;
+
+        /**Assign layers using longest path source layering; a valid value for LayeredDigraphLayout.layeringOption.*/
+        static LayerLongestPathSource: EnumValue;
+
+        /**Assign layers using optimal link length layering; A valid value for LayeredDigraphLayout.layeringOption.*/
+        static LayerOptimalLinkLength: EnumValue;
+
+        /**Enable all options for the LayeredDigraphLayout.packOption property; See also LayeredDigraphLayout.PackExpand, LayeredDigraphLayout.PackStraighten, and LayeredDigraphLayout.PackMedian.*/
+        static PackAll: number;
+
+        /**This option gives more chances for the packing algorithm to improve the network, but is very expensive in time for large networks; a valid value for LayeredDigraphLayout.packOption.*/
+        static PackExpand: number;
+
+        /**This option tries to have the packing algorithm center groups of nodes based on their relationships with nodes in other layers, a valid value for LayeredDigraphLayout.packOption.*/
+        static PackMedian: number;
+
+        /**Does minimal work in packing the nodes; a valid value for LayeredDigraphLayout.packOption.*/
+        static PackNone: number;
+
+        /**This option tries to have the packing algorithm straighten many of the links that cross layers, a valid value for LayeredDigraphLayout.packOption.*/
+        static PackStraighten: number;
+
+        linkSpacing: number;  // undocumented
+        protected nodeMinLayerSpace(v: LayeredDigraphVertex, tl: boolean): number;  // undocumented
+        protected nodeMinColumnSpace(v: LayeredDigraphVertex, tl: boolean): number;  // undocumented
+    }
+
+    class LayeredDigraphNetwork extends LayoutNetwork {  // undocumented
+    }
+
+    /** This holds LayeredDigraphLayout-specific information about Link s.*/
+    class LayeredDigraphEdge extends LayoutEdge {
+        /**True if the link is part of the depth first forest.*/
+        forest: boolean;
+
+        /**Approximate column offset of the from port of the link from the from node column used in straightening.*/
+        portFromColOffset: number;
+
+        /**Location of the port at the from node of the link.*/
+        portFromPos: number;
+
+        /**Approximate column offset of the to port of the link from the to node column used in straightening.*/
+        portToColOffset: number;
+
+        /**Location of the port at the to node of the link.*/
+        portToPos: number;
+
+        /**True if the link was reversed during cycle removal.*/
+        rev: boolean;
+
+        /**True if the link is part of the proper digraph.*/
+        valid: boolean;
+    }
+
+    /** This holds LayeredDigraphLayout-specific information about Nodes.*/
+    class LayeredDigraphVertex extends LayoutVertex {
+        /**The column to which the node is assigned.*/
+        column: number;
+
+        /**The connected component to which the node is assigned.*/
+        component: number;
+
+        /**The index to which the node is assigned.*/
+        index: number;
+
+        /**The layer to which the node is assigned.*/
+        layer: number;
+
+        /**Another LayeredDigraphVertex in the same layer that this node should be near.*/
+        near: LayeredDigraphVertex;
+    }
+
+
+    /**
+    * This is the base class for all of the predefined diagram layout implementations.
+    * They only arrange Parts (primarily Nodes and Links) in a Diagram,
+    * not to GraphObjects in Panels (i.e. panel layout).
+    */
+    class Layout {
+        /**
+        * Create a minimal layout that only positions Nodes that do not have a location.
+        */
+        constructor();
+
+        /**Gets or sets the top-left point for where the graph should be positioned when laid out.*/
+        arrangementOrigin: Point;
+
+        /**This read-only property returns the Diagram that owns this layout, if it is the value of Diagram.layout.*/
+        diagram: Diagram;
+
+        /**This read-only property returns the Group that uses this layout, if it is the value of a group's Group.layout.*/
+        group: Group;
+
+        /**Gets or sets whether this layout is performed on an initial layout.*/
+        isInitial: boolean;
+
+        /**Gets or sets whether this layout can be invalidated by .invalidateLayout.*/
+        isOngoing: boolean;
+
+        /**Gets or sets whether this layout be performed in real-time, before the end of a transaction.*/
+        isRealtime: boolean;
+
+        /**Gets or sets whether this layout routes Links.*/
+        isRouting: boolean;
+
+        /**Gets or sets whether this layout needs to be performed again.*/
+        isValidLayout: boolean;
+
+        /**Gets or sets whether this layout depends on the Diagram.viewportBounds's size.*/
+        isViewportSized: boolean;
+
+        /**Gets or sets the LayoutNetwork used by this Layout, if any.*/
+        network: LayoutNetwork;
+
+        /**
+         * Copies properties from this layout to the given layout, which must be of the same class as this layout.
+         * @param {Layout} copy 
+         */
+        protected cloneProtected(copy: Layout): void;
+
+        /**
+        * When using a LayoutNetwork, commit changes to the diagram by setting Node positions and by routing the Links.
+        */
+        commitLayout(): void;
+
+        /**
+        * Creates a copy of this Layout and returns it.
+        */
+        copy(): Layout;
+
+        /**
+        * Create a new LayoutNetwork of LayoutVertexes and LayoutEdges.
+        */
+        createNetwork(): LayoutNetwork;
+
+        /**
+        * Position all of the nodes that do not have an assigned Part.location in the manner of a simple rectangular array.
+        * @param {(Diagram | Group | Iterable<Part>)} coll A Diagram or a Group or a collection of Parts.
+        */
+        doLayout(coll: (Diagram | Group | Iterable<Part>)): void;
+
+        /**
+        * If .isOngoing is true and if an initial layout has not yet been performed, set the .isValidLayout property to false, and ask to perform another layout in the near future.
+        */
+        invalidateLayout(): void;
+
+        /**
+        * Create and initialize a LayoutNetwork with the given nodes and links.
+        * @param {(Diagram | Group | Iterable<Part>)} coll A Diagram or a Group or a collection of Parts.
+        */
+        makeNetwork(coll: (Diagram | Group | Iterable<Part>)): LayoutNetwork;
+
+        /**
+        * When using a LayoutNetwork, update the "physical" node positionings and link routings.
+        */
+        updateParts(): void;
+
+        collectParts(coll: Iterable<Part>): void;  // undocumented
+    }
+
+    /**
+     * This provides an abstract view of a diagram as a
+     * network (graph) of vertexes and directed edges.
+     * The network contains vertexes and edges corresponding to Nodes and Links.
+     */
+    class LayoutNetwork {
+        /**
+        * This constructs an empty network.
+        */
+        constructor();
+
+        /**Gets a collection of all of the LayoutEdges in this network.*/
+        edges: Set<LayoutEdge>;
+
+        /**This read-only property returns the Layout that uses this network of LayoutVertexes and LayoutEdges.*/
+        layout: Layout;
+
+        /**Gets a collection of all of the LayoutVertexes in this network.*/
+        vertexes: Set<LayoutVertex>;
+
+        /**
+        * Adds a LayoutEdge to the network.
+        * @param {LayoutEdge} edge
+        */
+        addEdge(edge: LayoutEdge): void;
+
+        /**
+        * This convenience method makes sure there is a LayoutEdge in this network corresponding to a Link.
+        * @param {Link} link
+        * @param {Link} link
+        */
+        addLink(link: Link): LayoutEdge;
+
+        /**
+        * This convenience method makes sure there is a LayoutVertex in this network corresponding to a Node.
+        * @param {Node} node
+        */
+        addNode(node: Node): LayoutVertex;
+
+        /**
+        * Creates a network of LayoutVertexes and LayoutEdges corresponding to the given Nodes and Links.
+        * @param {Iterable<Part>} parts A collection of Nodes or Links.
+        * @param {boolean=} toplevelonly whether to skip Parts in the given collection that are contained by Groups; default is false.
+        * @param {function(Part):boolean|null=} pred optional predicate to apply to each Part --
+        *        if it returns false do not include Vertex or Edge in the network for that Part;
+        *        default ignores link label nodes or links connecting with them
+        */
+        addParts(parts: Iterable<Part>, toplevelonly?: boolean, pred?: (part: Part) => boolean): void;
+
+        /**
+        * Adds a LayoutVertex to the network.
+        * @param {LayoutVertex} vertex
+        */
+        addVertex(vertex: LayoutVertex): void;
+
+        /**
+        * Allocate a new instance of LayoutEdge.
+        */
+        createEdge(): LayoutEdge;
+
+        /**
+        * Allocate a new instance of LayoutVertex.
+        */
+        createVertex(): LayoutVertex;
+
+        /**
+        * Deletes all vertexes and edges that have no Part associated with them.
+        */
+        deleteArtificialVertexes(): void;
+
+        /**
+        * Removes a LayoutEdge from the network.
+        * @param {LayoutEdge} edge
+        */
+        deleteEdge(edge: LayoutEdge): void;
+
+        /**
+        * This convenience method deletes from this network any LayoutEdge corresponding to a Link.
+        * @param {Link} link
+        */
+        deleteLink(link: Link): void;
+
+        /**
+        * This convenience method deletes any LayoutVertex corresponding to a Node.
+        * @param {Node} node
+        */
+        deleteNode(node: Node): void;
+
+        /**
+        * Deletes all LayoutEdges whose "to vertex" and "from vertex" are the same vertex.
+        */
+        deleteSelfEdges(): void;
+
+        /**
+        * Removes a LayoutVertex from the network.
+        * @param {LayoutVertex} vertex
+        */
+        deleteVertex(vertex: LayoutVertex): void;
+
+        /**
+        * Retrieve all of the Nodes and Links from the LayoutVertexes and LayoutEdges that are in this network.
+        */
+        findAllParts(): Set<Part>;
+
+        /**
+        * Returns the LayoutEdge that was constructed for the Link.
+        * @param {Link} link
+        */
+        findEdge(link: Link): LayoutEdge;
+
+        /**
+        * Returns the LayoutVertex that was constructed for the Node.
+        * @param {Node} node
+        */
+        findVertex(node: Node): LayoutVertex;
+
+        /**
+        * Links two vertexes already in the network and returns the created LayoutEdge.
+        * @param {LayoutVertex} fromVertex
+        * @param {LayoutVertex} toVertex
+        * @param {Link} link
+        */
+        linkVertexes(fromVertex: LayoutVertex, toVertex: LayoutVertex, link: Link): LayoutEdge;
+
+        /**
+        * Reverses the direction of a LayoutEdge in the network.
+        * @param {LayoutEdge} edge
+        */
+        reverseEdge(edge: LayoutEdge): void;
+
+        /**
+        * Modify this network by splitting it up into separate subnetworks, each of which has all of its vertexes connected to each other, but not to any vertexes in any other subnetworks.
+        */
+        splitIntoSubNetworks(): List<LayoutNetwork>;
+    }
+
+    /** An edge represents a link in a LayoutNetwork. It holds layout-specific data for the link. */
+    class LayoutEdge {
+        /**
+        * This constructs an edge that does not know about any Link.
+        */
+        constructor();
+
+        /**Gets or sets the model data, used only when virtualizing*/
+        data: any;
+
+        /**Gets or sets the LayoutVertex that this edge comes from.*/
+        fromVertex: LayoutVertex;
+
+        /**Gets or sets the Link associated with this edge, if any.*/
+        link: Link;
+
+        /**Gets or sets the LayoutNetwork that owns this edge.*/
+        network: LayoutNetwork;
+
+        /**Gets or sets the LayoutVertex that this edge goes to.*/
+        toVertex: LayoutVertex;
+
+        /**
+        * Commits the route of this edge to the corresponding Link, if any.
+        */
+        commit(): void;
+
+        /**
+        * Returns the edge's vertex at the other of this edge from the given vertex.
+        * @param {LayoutVertex} v
+        */
+        getOtherVertex(v: LayoutVertex): void;
+    }
+
+    /** A vertex represents a node in a LayoutNetwork. It holds layout-specific data for the node. */
+    class LayoutVertex {
+        /**
+        * This constructs a vertex that does not know about any Node.
+        */
+        constructor();
+
+        /**Gets or sets the Bounds of this vertex, in document coordinates.*/
+        bounds: Rect;
+
+        /**Gets or sets the center Point.x of this vertex, in document coordinates.*/
+        centerX: number;
+
+        /**Gets or sets the center Point.y of this vertex, in document coordinates.*/
+        centerY: number;
+
+        /**Gets or sets the model data, used only when virtualizing*/
+        data: any;
+
+        /**Gets an iterator for all of the edges that go out of this vertex.*/
+        destinationEdges: Iterator<LayoutEdge>;
+
+        /**Gets an iterator for all of the vertexes that are connected with edges going out of this vertex.*/
+        destinationVertexes: Iterator<LayoutVertex>;
+
+        /**Gets an iterator for all of the edges that are connected with this vertex in either direction.*/
+        edges: Iterator<LayoutEdge>;
+
+        /**This read-only property returns the total number of edges that are connected with this vertex in either direction.*/
+        edgesCount: number;
+
+        /**Gets or sets the offset of the .centerX and .centerY from the .bounds position.*/
+        focus: Point;
+
+        /**Gets or sets the relative X position of the "center" point, the focus.*/
+        focusX: number;
+
+        /**Gets or sets the relative Y position of the "center" point, the focus.*/
+        focusY: number;
+
+        /**Gets or sets the height of this vertex.*/
+        height: number;
+
+        /**Gets or sets the LayoutNetwork that owns this vertex.*/
+        network: LayoutNetwork;
+
+        /**Gets or sets the Node associated with this vertex, if any.*/
+        node: Node;
+
+        /**Gets an iterator for all of the edges that come into this vertex.*/
+        sourceEdges: Iterator<LayoutEdge>;
+
+        /**Gets an iterator for all of the vertexes that are connected with edges coming into this vertex.*/
+        sourceVertexes: Iterator<LayoutVertex>;
+
+        /**Gets an iterator for all of the vertexes that are connected in either direction with this vertex.*/
+        vertexes: Iterator<LayoutVertex>;
+
+        /**Gets or sets the width of this vertex.*/
+        width: number;
+
+        /**Gets or sets the left point of this vertex.*/
+        x: number;
+
+        /**Gets or sets the top point of this vertex.*/
+        y: number;
+
+        /**
+        * Adds a LayoutEdge to the list of successors (the edge will be going out from this vertex).
+        * @param {LayoutEdge} edge
+        */
+        addDestinationEdge(edge: LayoutEdge): void;
+
+        /**
+        * Adds a LayoutEdge to the list of predecessors (the edge will be coming into this vertex).
+        * @param {LayoutEdge} edge
+        */
+        addSourceEdge(edge: LayoutEdge): void;
+
+        /**
+        * Moves the Node corresponding to this vertex so that its position is at the current .bounds point.
+        */
+        commit(): void;
+
+        /**
+        * Deletes a LayoutEdge from the list of successors (the edge was going out from this vertex).
+        * @param {LayoutEdge} edge
+        */
+        deleteDestinationEdge(edge: LayoutEdge): void;
+
+        /**
+        * Deletes a LayoutEdge from the list of predecessors (the edge was coming into this vertex).
+        * @param {LayoutEdge} edge
+        */
+        deleteSourceEdge(edge: LayoutEdge): void;
+
+        /**
+        * This static function is used to compare the Part.text values of the .nodes of the argument LayoutVertexes.
+        * @param {LayoutVertex} m
+        * @param {LayoutVertex} n
+        */
+        static smartComparer(m: LayoutVertex, n: LayoutVertex): number;
+
+        /**
+        * This static function is used to compare the Part.text values of the .nodes of the argument LayoutVertexes.
+        * @param {LayoutVertex} m
+        * @param {LayoutVertex} n
+        */
+        static standardComparer(m: LayoutVertex, n: LayoutVertex): number;
+    }
+
+
+    /**
+    * This layout positions nodes in a tree-like arrangement.
+    */
+    class TreeLayout extends Layout {
+        /**
+        * Constructs a TreeLayout with no Layout.network and with no owning Layout.diagram.
+        */
+        constructor();
+
+        /**Gets or sets the default alignment of parents relative to their children.*/
+        alignment: EnumValue;
+
+        /**Gets or sets the default alignment of parents relative to their children.*/
+        alternateAlignment: EnumValue;
+
+        /**Gets or sets the default direction for tree growth.*/
+        alternateAngle: number;
+
+        /**Gets or sets a limit on how broad a tree should be.*/
+        alternateBreadthLimit: number;
+
+        /**Gets or sets the spot that children nodes' ports get as their ToSpot The default value is Spot.Default.*/
+        alternateChildPortSpot: Spot;
+
+        /**Gets or sets the distance between a node and its comments.*/
+        alternateCommentMargin: number;
+
+        /**Gets or sets the distance between comments.*/
+        alternateCommentSpacing: number;
+
+        /**Gets or sets how closely to pack the child nodes of a subtree.*/
+        alternateCompaction: EnumValue;
+
+        /**Gets or sets the default comparison function used for sorting.*/
+        alternateComparer: (a: TreeVertex, b: TreeVertex) => number;
+
+        /**Gets or sets the object holding the default values for alternate layer TreeVertexes, used when the .treeStyle is .StyleAlternating or .StyleLastParents.*/
+        alternateDefaults: TreeVertex;
+
+        /**Gets or sets the distance between a parent node and its children.*/
+        alternateLayerSpacing: number;
+
+        /**Gets or sets the fraction of the node's depth for which the children's layer starts overlapped with the parent's layer.*/
+        alternateLayerSpacingParentOverlap: number;
+
+        /**Gets or sets the default indentation of the first child.*/
+        alternateNodeIndent: number;
+
+        /**Gets or sets the fraction of this node's breadth is added to .nodeIndent to determine any spacing at the start of the children.*/
+        alternateNodeIndentPastParent: number;
+
+        /**Gets or sets the distance between child nodes.*/
+        alternateNodeSpacing: number;
+
+        /**Gets or sets the spot that this node's port gets as its FromSpot.*/
+        alternatePortSpot: Spot;
+
+        /**Gets or sets the default indentation of the first child of each row, if the .alignment is not a "Center" alignment.*/
+        alternateRowIndent: number;
+
+        /**Gets or sets the distance between rows of children.*/
+        alternateRowSpacing: number;
+
+        /**Gets or sets whether the TreeLayout should set the ToSpot for each child node port.*/
+        alternateSetsChildPortSpot: boolean;
+
+        /**Gets or sets whether the TreeLayout should set the FromSpot for this parent node port.*/
+        alternateSetsPortSpot: boolean;
+
+        /**Gets or sets the default Sorting policy.*/
+        alternateSorting: EnumValue;
+
+        /**Gets or sets the default direction for tree growth.*/
+        angle: number;
+
+        /**Gets or sets how .arrangeTrees should lay out the separate trees.*/
+        arrangement: EnumValue;
+
+        /**Gets or sets the space between which .arrangeTrees will position the trees.*/
+        arrangementSpacing: Size;
+
+        /**Gets or sets a limit on how broad a tree should be.*/
+        breadthLimit: number;
+
+        /**Gets or sets the spot that children nodes' ports get as their ToSpot.*/
+        childPortSpot: Spot;
+
+        /**Gets or sets the distance between a node and its comments.*/
+        commentMargin: number;
+
+        /**Gets or sets the distance between comments.*/
+        commentSpacing: number;
+
+        /**Gets or sets how closely to pack the child nodes of a subtree.*/
+        compaction: EnumValue;
+
+        /**Gets or sets whether to call .addComments.*/
+        comments: boolean;
+
+        /**Gets or sets the default comparison function used for sorting.*/
+        comparer: (a: TreeVertex, b: TreeVertex) => number;
+
+        /**Gets or sets the distance between a parent node and its children.*/
+        layerSpacing: number;
+
+        /**Gets or sets the fraction of the node's depth for which the children's layer starts overlapped with the parent's layer.*/
+        layerSpacingParentOverlap: number;
+
+        /**Gets or sets the manner in which the nodes are aligned in layers.*/
+        layerStyle: EnumValue;
+
+        /**Gets or sets the default indentation of the first child.*/
+        nodeIndent: number;
+
+        /**Gets or sets the fraction of this node's breadth is added to .nodeIndent to determine any spacing at the start of the children.*/
+        nodeIndentPastParent: number;
+
+        /**Gets or sets the distance between child nodes.*/
+        nodeSpacing: number;
+
+        /**Gets or sets how the tree should be constructed from the TreeEdges connecting TreeVertexes.*/
+        path: EnumValue;
+
+        /**Gets or sets the spot that this node's port gets as its FromSpot.*/
+        portSpot: Spot;
+
+        /**Gets or sets the object holding the default values for root TreeVertexes.*/
+        rootDefaults: TreeVertex;
+
+        /**Gets or sets the collection of root vertexes.*/
+        roots: Set<TreeVertex|Node>;
+
+        /**Gets or sets the default indentation of the first child of each row, if the .alignment is not a "Center" alignment.*/
+        rowIndent: number;
+
+        /**Gets or sets the distance between rows of children.*/
+        rowSpacing: number;
+
+        /**Gets or sets whether the TreeLayout should set the ToSpot for each child node port.*/
+        setsChildPortSpot: boolean;
+
+        /**Gets or sets whether the TreeLayout should set the FromSpot for this parent node port.*/
+        setsPortSpot: boolean;
+
+        /**Gets or sets the default Sorting policy.*/
+        sorting: EnumValue;
+
+        /**Gets or sets the Style for the resulting trees.*/
+        treeStyle: EnumValue;
+
+        /**
+        * Find associated objects to be positioned along with the TreeVertex.
+        * @param {LayoutVertex} v
+        */
+        addComments(v: TreeVertex): void;
+
+        /**
+        * Position each separate tree.
+        */
+        arrangeTrees(): void;
+
+        /**
+        * Assign final property values for a TreeVertex.
+        * @param {LayoutVertex} v
+        */
+        assignTreeVertexValues(v: TreeVertex): void;
+
+        /**
+        * This overridable method is called by commitLayout if layerStyle is LayerUniform
+        * to support custom arrangement of bands or labels across each layout layer.
+        * @param Array<*> layerRects an Array of Rects with the bounds of each of the "layers"
+        * @param {Point} offset the position of the top-left corner of the banded area relative to the coordinates given by the layerRects
+        */
+        commitLayers(layerRects: Array<Rect>, offset: Point): void;
+
+        /**
+        * Set the fromSpot and toSpot for each Vertex, position each Node according to the Vertex position, and then position the Links.
+        */
+        commitLayout(): void;
+
+        /**
+        * Commit the position and routing of all edge links.
+        */
+        commitLinks(): void;
+
+        /**
+        * Commit the position of all vertex nodes.
+        */
+        commitNodes(): void;
+
+        /**
+        * Create a new LayoutNetwork of TreeVertexes and TreeEdges.
+        */
+        createNetwork(): TreeNetwork;
+
+        /**
+        * Assign the positions of the vertexes in the network.
+        * @param {(Diagram | Group | Iterable<Part>)} coll A Diagram or a Group or a collection of Parts.
+        */
+        doLayout(coll: (Diagram | Group | Iterable<Part>)): void;
+
+        /**
+        * Assign initial property values for a TreeVertex.
+        * @param {LayoutVertex} v
+        */
+        initializeTreeVertexValues(v: TreeVertex): void;
+
+        /**
+        * Position and TreeVertex.comments around the vertex.
+        * @param {LayoutVertex} v
+        */
+        layoutComments(v: TreeVertex): void;
+
+        /**The children are positioned in a bus, only on the bottom or right side of the parent; This value is used for TreeLayout.alignment or TreeLayout.alternateAlignment.*/
+        static AlignmentBottomRightBus: EnumValue;
+
+        /**The children are positioned in a bus on both sides of an "aisle" where the links to them go, with the last odd child (if any) placed at the end of the aisle in the middle.*/
+        static AlignmentBus: EnumValue;
+
+        /**Like TreeLayout.AlignmentBus with the children arranged on both sides of an "aisle" with any last odd child placed at the end of the aisle, but the children get an TreeVertex.angle that depends on which side of the aisle they were placed.*/
+        static AlignmentBusBranching: EnumValue;
+
+        /**The parent is centered at the middle of the range of its immediate child nodes; This value is used for TreeLayout.alignment or TreeLayout.alternateAlignment.*/
+        static AlignmentCenterChildren: EnumValue;
+
+        /**The parent is centered at the middle of the range of its child subtrees; This value is used for TreeLayout.alignment or TreeLayout.alternateAlignment.*/
+        static AlignmentCenterSubtrees: EnumValue;
+
+        /**The parent is positioned near the last of its children; This value is used for TreeLayout.alignment or TreeLayout.alternateAlignment.*/
+        static AlignmentEnd: EnumValue;
+
+        /**The parent is positioned near the first of its children; This value is used for TreeLayout.alignment or TreeLayout.alternateAlignment.*/
+        static AlignmentStart: EnumValue;
+
+        /**The children are positioned in a bus, only on the top or left side of the parent; This value is used for TreeLayout.alignment or TreeLayout.alternateAlignment.*/
+        static AlignmentTopLeftBus: EnumValue;
+
+        /**Do not move each root node, but position all of their descendants relative to their root; This value is used for TreeLayout.arrangement.*/
+        static ArrangementFixedRoots: EnumValue;
+
+        /**Position each tree in a non-overlapping fashion by increasing X coordinates, starting at the Layout.arrangementOrigin; This value is used for TreeLayout.arrangement.*/
+        static ArrangementHorizontal: EnumValue;
+
+        /**Position each tree in a non-overlapping fashion by increasing Y coordinates, starting at the Layout.arrangementOrigin; This value is used for TreeLayout.arrangement.*/
+        static ArrangementVertical: EnumValue;
+
+        /**A simple fitting of subtrees; This value is used for TreeLayout.compaction or TreeLayout.alternateCompaction.*/
+        static CompactionBlock: EnumValue;
+
+        /**Only simple placement of children next to each other, as determined by their subtree breadth; This value is used for TreeLayout.compaction or TreeLayout.alternateCompaction.*/
+        static CompactionNone: EnumValue;
+
+        /**This default value for TreeLayout.layerStyle causes each node takes up only the depth that it needs.*/
+        static LayerIndividual: EnumValue;
+
+        /**This value for TreeLayout.layerStyle causes all of the children of a parent node take up the same amount of depth -- this typically causes all cousins to be aligned.*/
+        static LayerSiblings: EnumValue;
+
+        /**This value for TreeLayout.layerStyle causes all nodes with the same TreeVertex.level throughout the tree take up the same amount of depth.*/
+        static LayerUniform: EnumValue;
+
+        /**This value for TreeLayout.path causes the value of Diagram.isTreePathToChildren to effectively choose either TreeLayout.PathDestination (if true) or TreeLayout.PathSource (if false).*/
+        static PathDefault: EnumValue;
+
+        /**The children of a TreeVertex are its LayoutVertex.destinationVertexes, the collection of connected LayoutEdge.toVertexes; This value is used for TreeLayout.path.*/
+        static PathDestination: EnumValue;
+
+        /**The children of a TreeVertex are its LayoutVertex.sourceVertexes, the collection of connected LayoutEdge.fromVertexes; This value is used for TreeLayout.path.*/
+        static PathSource: EnumValue;
+
+        /**Lay out each child according to the sort order given by TreeVertex.comparer; This value is used for TreeLayout.sorting or TreeLayout.alternateSorting.*/
+        static SortingAscending: EnumValue;
+
+        /**Lay out each child in reverse sort order given by TreeVertex.comparer; This value is used for TreeLayout.sorting or TreeLayout.alternateSorting.*/
+        static SortingDescending: EnumValue;
+
+        /**Lay out each child in the order in which they were found; This value is used for TreeLayout.sorting or TreeLayout.alternateSorting.*/
+        static SortingForwards: EnumValue;
+
+        /**Lay out each child in reverse order from which they were found; This value is used for TreeLayout.sorting or TreeLayout.alternateSorting.*/
+        static SortingReverse: EnumValue;
+
+        /**Alternate layers of the tree have different properties, typically including the angle; This value is used for TreeLayout.treeStyle.*/
+        static StyleAlternating: EnumValue;
+
+        /**Just like the standard layered tree style, except that the nodes with children but no grandchildren have alternate properties; This value is used for TreeLayout.treeStyle.*/
+        static StyleLastParents: EnumValue;
+
+        /**The normal tree style, where all of the children of each TreeVertex are lined up horizontally or vertically; This value is used for TreeLayout.treeStyle.*/
+        static StyleLayered: EnumValue;
+
+        /**All of the nodes get the alternate properties, except the root node gets the default properties; This value is used for TreeLayout.treeStyle.*/
+        static StyleRootOnly: EnumValue;
+    }
+
+    class TreeNetwork extends LayoutNetwork {  // undocumented
+    }
+
+    /** This holds TreeLayout-specific information about Links.*/
+    class TreeEdge extends LayoutEdge {
+        /**Gets or sets a Point, relative to the parent node, that may be useful in routing this link.*/
+        relativePoint: Point;
+
+        /**
+        * Commits the position of the Link and routes it.
+        */
+        commit(): void;
+    }
+
+    /** This holds TreeLayout-specific information about Nodes.*/
+    class TreeVertex extends LayoutVertex {
+        /**Gets or sets how this parent node should be aligned relative to its children.*/
+        alignment: EnumValue;
+
+        /**Gets or sets the actual absolute angle at which this node should grow.*/
+        angle: number;
+
+        /**Gets or sets how broad a node and its descendants should be.*/
+        breadthLimit: number;
+
+        /**Gets or sets the spot that children nodes' ports get as their ToSpot, if .setsChildPortSpot is true and the node has only a single port.*/
+        childPortSpot: Spot;
+
+        /**Gets or sets the logical children for this node.*/
+        children: Array<TreeVertex>;
+
+        /**This read-only property returns the number of immediate children this node has.*/
+        childrenCount: number;
+
+        /**Gets or sets the space to leave between the node and the comments.*/
+        commentMargin: number;
+
+        /**Gets or sets an array of Nodes that will be positioned near this node.*/
+        comments: Array<Node>;
+
+        /**Gets or sets the space to leave between consecutive comments.*/
+        commentSpacing: number;
+
+        /**Gets or sets how the children of this node should be packed together.*/
+        compaction: EnumValue;
+
+        /**Gets or sets how the children should be sorted.*/
+        comparer: (a: TreeVertex, b: TreeVertex) => number;
+
+        /**Gets or sets the number of descendants this node has.*/
+        descendantCount: number;
+
+        /**Gets or sets whether this node has been initialized as part of TreeLayout.doLayout when building the tree structures.*/
+        initialized: boolean;
+
+        /**Gets or sets the distance between this node and its children.*/
+        layerSpacing: number;
+
+        /**Gets or sets the fraction of this node's depth that may overlap with the children's layer.*/
+        layerSpacingParentOverlap: number;
+
+        /**Gets or sets the number of single-parent ancestors this node has.*/
+        level: number;
+
+        /**Gets or sets the maximum number of children of any descendant of this node.*/
+        maxChildrenCount: number;
+
+        /**Gets or sets the maximum depth of the subtrees below this node.*/
+        maxGenerationCount: number;
+
+        /**Gets or sets the distance the first child should be indented.*/
+        nodeIndent: number;
+
+        /**Gets or sets whether the first child should be indented past the parent node's breadth.*/
+        nodeIndentPastParent: number;
+
+        /**Gets or sets the distance between child nodes.*/
+        nodeSpacing: number;
+
+        /**Gets or sets the logical parent for this node.*/
+        parent: TreeVertex;
+
+        /**Gets or sets the spot that this node's port gets as its FromSpot, if .setsPortSpot is true and the node has only a single port.*/
+        portSpot: Spot;
+
+        /**Gets or sets the position of this node relative to its parent node.*/
+        relativePosition: Point;
+
+        /**Gets or sets the distance the first child of each row should be indented.*/
+        rowIndent: number;
+
+        /**Gets or sets the distance between rows within one layer, all sharing the same parent.*/
+        rowSpacing: number;
+
+        /**Gets or sets whether the TreeLayout should set the ToSpot for each child node port.*/
+        setsChildPortSpot: boolean;
+
+        /**Gets or sets whether the TreeLayout should set the FromSpot for this parent node port.*/
+        setsPortSpot: boolean;
+
+        /**Gets or sets whether and in what order the children should be sorted.*/
+        sorting: EnumValue;
+
+        /**Gets or sets the offset of this parent node relative to its whole subtree.*/
+        subtreeOffset: Point;
+
+        /**Gets or sets the size of the subtree (including all descendants) parented by this node.*/
+        subtreeSize: Size;
+
+        /**
+        * Copy inherited properties from another TreeVertex to this one.
+        * @param {TreeVertex} copy
+        */
+        copyInheritedPropertiesFrom(copy: TreeVertex): void;
+    }
+
+
+    /**
+    * The ActionTool is responsible for handling and dispatching mouse events on GraphObjects
+    * that have GraphObject.isActionable set to true.
+    * This is how one implements "controls", such as buttons or sliders or knobs, as GraphObjects
+    * that can be inside Parts without interfering with the standard tool behaviors.
+    */
+    class ActionTool extends Tool {
+        /**
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.actionTool.
+        */
+        constructor();
+
+        /**
+        * This tool can run when there is a mouse-down on an object with GraphObject.isActionable true or if the object is within a Panel that "isActionable".
+        */
+        canStart(): boolean;
+
+        /**
+        * Call the GraphObject.actionCancel event if defined on the current object.
+        */
+        doCancel(): void;
+
+        /**
+        * If there is a GraphObject found with GraphObject.isActionable set to true, call that object's GraphObject.actionDown event, if it exists.
+        */
+        doMouseDown(): void;
+
+        /**
+        * If this tool is active call GraphObject.actionMove, if it exists, on the active object.
+        */
+        doMouseMove(): void;
+
+        /**
+        * Calls the GraphObject.actionUp event if defined, then effectively calls Tool.standardMouseClick to perform the normal click behaviors, and then stops this tool.
+        */
+        doMouseUp(): void;
+    }
+
+    /**
+    * The ClickCreatingTool lets the user create a node by clicking where they want the new node to be.
+    * By default a double-click is required to start this tool;
+    * set .isDoubleClick to false if you want a single-click to create a node.
+    */
+    class ClickCreatingTool extends Tool {
+        /**
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.clickCreatingTool, which you can modify.
+        */
+        constructor();
+
+        /**Gets or sets a data object that will be copied and added to the diagram's model each time this tool executes. The value must be an Object or null.*/
+        archetypeNodeData: any;
+
+        /**Gets or sets whether a double click rather than a single-click is required to insert a new Part at the mouse-up point.*/
+        isDoubleClick: boolean;
+
+        /**
+        * This tool can run when the diagram is not read-only and supports creating new nodes, and when there has been a click (or double-click if .isDoubleClick is true) in the background of the diagram (not on a Part), and .archetypeNodeData is an object that can be copied and added to the model.
+        */
+        canStart(): boolean;
+
+        /**
+        * Upon a click, call .insertPart and stop this tool.
+        */
+        doMouseUp(): void;
+
+        /**
+        * Create a node by adding a copy of the .archetypeNodeData object to the diagram's model, assign its Part.location to be the given point, and select the new part.
+        * @param {Point} loc a Point in document coordinates.
+        */
+        insertPart(loc: Point): Part;
+    }
+
+    /**
+    * The ClickSelectingTool selects and deselects Parts when there is a click.
+    * It does this by calling Tool.standardMouseSelect.
+    * It is also responsible for handling and dispatching click events on GraphObjects
+    * by calling Tool.standardMouseClick.
+    */
+    class ClickSelectingTool extends Tool {
+        /**
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.clickSelectingTool.
+        */
+        constructor();
+
+        /**
+        * This tool can run when there was a click.
+        */
+        canStart(): boolean;
+
+        /**
+        * Upon a click, this calls Tool.standardMouseSelect to change the Diagram.selection collection, then calls Tool.standardMouseClick to perform the normal click behaviors, and then stops this tool.
+        */
+        doMouseUp(): void;
+    }
+
+    /**
+    * The ContextMenuTool is used to create and show a context menu.
+    * It automatically disables any browser context menu.
+    */
+    class ContextMenuTool extends Tool {
+        /**
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.contextMenuTool, which you can modify.
+        */
+        constructor();
+
+        /**Gets or sets the currently showing context menu, or null if there is none.*/
+        currentContextMenu: Adornment;
+
+        /**Gets or sets the GraphObject found at the mouse point that has a context menu.*/
+        currentObject: GraphObject;
+
+        /**This read-only property returns the original mouse-down point in document coordinates.*/
+        mouseDownPoint: Point;
+
+        /**
+        * Return true if it's a mouse right click that hasn't moved Tool.isBeyondDragSize and that is on a GraphObject with a GraphObject.contextMenu.
+        */
+        canStart(): boolean;
+
+        /**
+        * Do nothing, activation is special and relies on doMouseUp
+        */
+        doActivate(): void;
+
+        /**
+        * Handle mouse-enter, mouse-over, and mouse-leave events.
+        */
+        doMouseMove(): void;
+
+        /**
+        * If there is something found by .findObjectWithContextMenu, call .showContextMenu with that object's GraphObject.contextMenu or Diagram.contextMenu.
+        */
+        doMouseUp(): void;
+
+        /**
+        * Find a GraphObject at the current mouse point with a GraphObject.contextMenu, or return the Diagram if there is a Diagram.contextMenu.
+        */
+        findObjectWithContextMenu(): GraphObject | Diagram;
+
+        /**
+        * Hide any context menu.
+        */
+        hideContextMenu(): void;
+
+        /**
+        * Hide the default context menu.
+        */
+        hideDefaultContextMenu(): void;
+
+        /**
+        * This is called by .showContextMenu to position the context menu within the viewport.
+        * @param {Adornment} contextmenu
+        * @param {GraphObject} obj
+        */
+        positionContextMenu(contextmenu: Adornment, obj: GraphObject): void;
+
+        /**
+        * Show an Adornment as a context menu.
+        * @param {Adornment} contextmenu
+        * @param {GraphObject} obj
+        */
+        showContextMenu(contextmenu: Adornment, obj: GraphObject): void;
+
+        /**
+        * Show a series of HTML elements acting as a context menu.
+        */
+        showDefaultContextMenu(): void;
+    }
+
+    /**
+    * This helper structure for DraggingTool holds the original location Point.
+    */
+    interface DraggingInfo {  // undocumented
+        point: Point;
+    }
+
+    /**
+    * The DraggingTool is used to move or copy selected parts with the mouse.
+    * Dragging the selection moves parts for which Part.canMove is true.
+    * If the user holds down the Control key, this tool will make a copy of the parts being dragged,
+    * for those parts for which Part.canCopy is true.
+    */
+    class DraggingTool extends Tool {
+        /**
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.draggingTool, which you can modify.
+        */
+        constructor();
+
+        /**This read-only property returns the collection of Parts that this tool has copied.*/
+        copiedParts: Map<Part,DraggingInfo>;
+
+        /**Gets or sets whether for a copying operation the extended selection is copied or only the selected parts.*/
+        copiesEffectiveCollection: boolean;
+
+        /**This read-only property returns the Part found at the mouse point.*/
+        currentPart: Part;
+
+        /**On touch gestures only, this property gets or sets the time in milliseconds for which the mouse must be stationary before this tool can be started.*/
+        delay: number;
+
+        /**This read-only property returns the collection of Parts being dragged.*/
+        draggedParts: Map<Part,DraggingInfo>;
+
+        /**Gets or sets whether the user can drag a single Link, disconnecting it from its connected nodes and possibly connecting it to valid ports when the link is dropped.*/
+        dragsLink: boolean;
+
+        /**Gets or sets whether moving or copying a node also includes all of the node's tree children and their descendants, along with the links to those additional nodes.*/
+        dragsTree: boolean;
+
+        /**Gets or sets the size of the grid cell used when snapping during a drag if the value of .isGridSnapEnabled is true.*/
+        gridSnapCellSize: Size;
+
+        /**Gets or sets the Spot that specifies what point in the grid cell dragged parts snap to, if the value of .isGridSnapEnabled is true.*/
+        gridSnapCellSpot: Spot;
+
+        /**Gets or sets the snapping grid's origin point, in document coordinates, if the value of .isGridSnapEnabled is true.*/
+        gridSnapOrigin: Point;
+
+        /**Gets or sets whether for any internal copying operation is permitted by control-drag-and-drop.*/
+        isCopyEnabled: boolean;
+
+        /**Gets or sets whether the DraggingTool snaps objects to grid points.*/
+        isGridSnapEnabled: boolean;
+
+        /**Gets or sets whether the DraggingTool snaps objects to grid points during the drag.*/
+        isGridSnapRealtime: boolean;
+
+        /**Gets or sets the mouse point from which parts start to move.*/
+        startPoint: Point;
+
+        /**
+        * This tool can run if the diagram allows selection and moves/copies/dragging-out, if the mouse has moved far enough away to be a drag and not a click, and if .findDraggablePart has found a selectable part at the mouse-down point.
+        */
+        canStart(): boolean;
+
+        /**
+        * Find the actual collection of nodes and links to be moved or copied, given an initial collection.
+        * @param {Iterable<Part>} parts A Set or List of Parts.
+        */
+        computeEffectiveCollection(parts: Iterable<Part>): Map<Part,DraggingInfo>;
+
+        /**
+        * This method computes the new location for a Node or simple Part, given a new desired location and an optional Map of dragged parts, taking any grid-snapping into consideration, any Part.dragComputation function, and any Part.minLocation and Part.maxLocation.
+        * @param {Part} n
+        * @param {Point} newloc
+        * @param {Map=} draggedparts  an optional Map mapping Parts to JavaScript Objects that have a "point" property remembering the original location of that Part.
+        * @param {Point=} result  an optional Point that is modified and returned
+        */
+        computeMove(n: Part, newloc: Point, draggedparts?: Map<Part,DraggingInfo>, result?: Point): Point;
+
+        /**
+        * Start the dragging operation.
+        */
+        doActivate(): void;
+
+        /**
+        * Abort any dragging operation.
+        */
+        doCancel(): void;
+
+        /**
+        * Stop the dragging operation by stopping the transaction and cleaning up any temporary state.
+        */
+        doDeactivate(): void;
+
+        /**
+        * Perform any additional side-effects during a drag, whether an internal move or copy or an external drag, that may affect the existing non-moved object(s).
+        * @param {Point} pt a Point in document coordinates.
+        * @param {GraphObject} obj the GraphObject at the point,
+        * excluding what is being dragged or temporary objects;
+        * the argument may be null if the drag is occurring in the background of the diagram.
+        * Use GraphObject.part to get the Node or Part at the root of
+        * the visual tree of the stationary object.
+        */
+        doDragOver(pt: Point, obj: GraphObject): void;
+
+        /**
+        * Perform any additional side-effects after a drop, whether an internal move or copy or an external drop, that may affect the existing non-moved object(s).
+        * @param {Point} pt a Point in document coordinates.
+        * @param {GraphObject} obj the GraphObject where the drop occurred,
+        * excluding what was dropped or temporary objects;
+        * the argument may be null if the drop occurred in the background of the diagram.
+        * Use GraphObject.part to get the Node or Part at the root of
+        * the visual tree of the stationary object.
+        */
+        doDropOnto(pt: Point, obj: GraphObject): void;
+
+        /**
+        * Handle switching between copying and moving modes as the Control key is pressed or released.
+        */
+        doKeyDown(): void;
+
+        /**
+        * Handle switching between copying and moving modes as the Control key is pressed or released.
+        */
+        doKeyUp(): void;
+
+        /**
+        * Move the .draggedParts (or if copying, the .copiedParts) to follow the current mouse point.
+        */
+        doMouseMove(): void;
+
+        /**
+        * On a mouse-up finish moving or copying the effective selection.
+        */
+        doMouseUp(): void;
+
+        /**
+        * Return the selectable and movable/copyable Part at the mouse-down point.
+        */
+        findDraggablePart(): Part;
+
+        /**
+        * This predicate is true when the diagram allows objects to be copied and inserted, and some object in the selection is copyable, and the user is holding down the Control key.
+        */
+        mayCopy(): boolean;
+
+        /**
+        * This predicate is true when the diagram allows objects to be moved, and some object in the selection is movable.
+        */
+        mayMove(): boolean;
+
+        /**
+        Move a collection of Parts by a given offset.
+        * @param {Map} parts  a Map mapping Parts to JavaScript Objects that have a "point" property remembering the original location of that Part.
+        * @param {Point} offset
+        * @param {boolean} check  Whether to check Part.canMove on each part.
+        */
+        moveParts(parts: Map<Part,DraggingInfo>, offset: Point, check: boolean): void;
+
+        /**
+        * This override prevents the Control modifier unselecting an already selected part.
+        */
+        standardMouseSelect(): void;
+    }
+
+    /**
+    * The DragSelectingTool lets the user select multiple parts with a rectangular area.
+    * There is a temporary part, the .box,
+    * that shows the current area encompassed between the mouse-down
+    * point and the current mouse point.
+    * The default drag selection box is a blue rectangle.
+    * You can change the .box to customize its appearance -- see its documentation for an example.
+    */
+    class DragSelectingTool extends Tool {
+        /**
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.dragSelectingTool, which you can modify.
+        */
+        constructor();
+
+        /**Gets or sets the Part used as the "rubber-band selection box" that is stretched to follow the mouse, as feedback for what area will be passed to .selectInRect upon a mouse-up.*/
+        box: Part;
+
+        /**Gets or sets the time in milliseconds for which the mouse must be stationary before this tool can be started.*/
+        delay: number;
+
+        /**Gets or sets whether a selectable Part may be only partly or must be completely enclosed by the rectangle given to .selectInRect.*/
+        isPartialInclusion: boolean;
+
+        /**
+        * This tool can run when the diagram allows selection, there has been delay of at least .delay milliseconds after the mouse-down before a mouse-move, there has been a mouse-drag far enough away not to be a click, and there is no selectable part at the mouse-down point.
+        */
+        canStart(): boolean;
+
+        /**
+        * This just returns a Rect stretching from the mouse-down point to the current mouse point.
+        */
+        computeBoxBounds(): Rect;
+
+        /**
+        * Capture the mouse and show the .box.
+        */
+        doActivate(): void;
+
+        /**
+        * Release the mouse and remove any .box.
+        */
+        doDeactivate(): void;
+
+        /**
+        * Update the .box's position and size according to the value of .computeBoxBounds.
+        */
+        doMouseMove(): void;
+
+        /**
+        * Call .selectInRect with the value of a call to .computeBoxBounds.
+        */
+        doMouseUp(): void;
+
+        /**
+        * This method is called to select some parts within the area of a given rectangle.
+        *@param {Rect} r
+        */
+        selectInRect(r: Rect): void;
+    }
+
+    /**
+    * This abstract class is the base class for the LinkingTool and RelinkingTool classes.
+    * This class includes properties for defining and accessing any temporary nodes and temporary link
+    * that are used during any linking operation, as well as access to the existing diagram's nodes and link
+    * (if any) that are involved with the linking operation.
+    */
+    abstract class LinkingBaseTool extends Tool {
+        /**
+        * Don't construct this directly -- this is an abstract class.
+        */
+        constructor();
+
+        /**Gets whether the linking operation is in the forwards direction, connecting from the "From" port to the "To" port.*/
+        isForwards: boolean;
+
+        /**Gets or sets whether it is valid to have partly or completely unconnected links.*/
+        isUnconnectedLinkValid: boolean;
+
+        /**Gets or sets a predicate that determines whether or not a new link between two ports would be valid.*/
+        linkValidation: (fromNode: Node, fromPort: GraphObject, toNode: Node, toPort: GraphObject, link: Link) => boolean;
+
+        /**Gets or sets the original Node from which the new link is being drawn or from which the .originalLink was connected when being relinked.*/
+        originalFromNode: Node;
+
+        /**Gets or sets the GraphObject that is the port in the .originalFromNode.*/
+        originalFromPort: GraphObject;
+
+        /**Gets or sets the original Link being reconnected by the RelinkingTool.*/
+        originalLink: Link;
+
+        /**Gets or sets the original Node to which the new link is being drawn or to which the .originalLink was connected when being relinked.*/
+        originalToNode: Node;
+
+        /**Gets or sets the GraphObject that is the port in the .originalToNode.*/
+        originalToPort: GraphObject;
+
+        /**Gets or sets the distance at which link snapping occurs.*/
+        portGravity: number;
+
+        /**Gets or sets a function that is called as the tool targets the nearest valid port.*/
+        portTargeted: (realNode: Node, realPort: GraphObject, tempNode: Node, tempPort: GraphObject, toend: boolean) => void;
+
+        /**Gets or sets a proposed GraphObject port for connecting a link.*/
+        targetPort: GraphObject;
+
+        /**Gets or sets the temporary Node at the "from" end of the .temporaryLink while the user is drawing or reconnecting a link.*/
+        temporaryFromNode: Node;
+
+        /**Gets or sets the GraphObject that is the port at the "from" end of the .temporaryLink while the user is drawing or reconnecting a link.*/
+        temporaryFromPort: GraphObject;
+
+        /**Gets or sets the temporary Link that is shown while the user is drawing or reconnecting a link.*/
+        temporaryLink: Link;
+
+        /**Gets or sets the temporary Node at the "to" end of the .temporaryLink while the user is drawing or reconnecting a link.*/
+        temporaryToNode: Node;
+
+        /**Gets or sets the GraphObject that is the port at the "to" end of the .temporaryLink while the user is drawing or reconnecting a link.*/
+        temporaryToPort: GraphObject;
+
+        /**
+        * Make a temporary port look and act like a real one.
+        * @param {Node} realnode
+        * @param {GraphObject} realport
+        * @param {Node} tempnode
+        * @param {GraphObject} tempport
+        * @param {boolean} toend
+        */
+        copyPortProperties(realnode: Node, realport: GraphObject, tempnode: Node, tempport: GraphObject, toend: boolean): void;
+
+        /**
+        * Mouse movement results in a temporary node moving to where a valid target port is located, or to where the mouse is if there is no valid target port nearby.
+        */
+        doMouseMove(): void;
+
+        /**
+        * Find a port with which the user could complete a valid link.
+        * @param {boolean} toend true if looking for a "to" port.
+        */
+        findTargetPort(toend: boolean): GraphObject;
+
+        /**
+        * This predicate is true if both argument ports are in the same Node.
+        * @param {GraphObject} fromport
+        * @param {GraphObject} toport
+        */
+        isInSameNode(fromport: GraphObject, toport: GraphObject): boolean;
+
+        /**
+        * This predicate is true if there is a link in the diagram going from the given port to the given port
+        * @param {GraphObject} fromport
+        * @param {GraphObject} toport.
+        */
+        isLinked(fromport: GraphObject, toport: GraphObject): boolean;
+
+        /**
+        * Checks whether a proposed link would be valid according to Diagram.validCycle.
+        * This does not distinguish between different ports on a node, so this method does not need to take port arguments.
+        * This is called by isValidLink.
+        * @param {Node} from
+        * @param {Node} to
+        * @param {Link} ignore may be null; this is useful during relinking to ignore the originalLink
+        * @return {boolean}
+        */
+        isValidCycle(from: Node, to: Node, ignore: Link): boolean;
+
+        /**
+        * This predicate is true if it is permissible to connect a link from a given node/port.
+        * @param {Node} fromnode
+        * @param {GraphObject} fromport
+        * False if the node is in a Layer that does not Layer.allowLink.
+        * False if the port's GraphObject.fromLinkable is either false or null.
+        * False if the number of links connected to the port would exceed the port's GraphObject.fromMaxLinks.
+        * Otherwise true.
+        */
+        isValidFrom(fromnode: Node, fromport: GraphObject): boolean;
+
+        /**
+        * This predicate should be true when it is logically valid to connect a new link from one node/port to another node/port.
+        * @param {Node} fromnode the "from" Node.
+        * @param {GraphObject} fromport the "from" GraphObject port.
+        * @param {Node} tonode the "to" Node.
+        * @param {GraphObject} toport the "to" GraphObject port.
+        * False if .isValidFrom is false for the "from" node/port.
+        * False if .isValidTo is false for the "to" node/port.
+        * False if .isInSameNode is true unless GraphObject.fromLinkableSelfNode
+        * and GraphObject.toLinkableSelfNode are true for the two ports.
+        * False if .isLinked is true unless GraphObject.fromLinkableDuplicates
+        * and GraphObject.toLinkableDuplicates are true for the two ports.
+        * False if trying to link to the link's own label node(s).
+        * If .linkValidation is a predicate and if it returns false, this predicate returns false.
+        * Otherwise this predicate is true.
+        */
+        isValidLink(fromnode: Node, fromport: GraphObject, tonode: Node, toport: GraphObject): boolean;
+
+        /**
+        * This predicate is true if it is permissible to connect a link to a given node/port.
+        * @param {Node} tonode
+        * @param {GraphObject} toport
+        * False if the node is in a Layer that does not Layer.allowLink.
+        * False if the port's GraphObject.toLinkable is either false or null.
+        * False if the number of links connected from the port would exceed the port's GraphObject.toMaxLinks.
+        * Otherwise true.
+        */
+        isValidTo(tonode: Node, toport: GraphObject): boolean;
+
+        /**
+        * Reset a temporary port's properties to neutral values when there is no target port.
+        * @param {Node} tempnode
+        * @param {GraphObject} tempport
+        * @param {boolean} toend
+        */
+        setNoTargetPortProperties(tempnode: Node, tempport: GraphObject, toend: boolean): void;
+    }
+
+    /**
+    */
+    class LinkingTool extends LinkingBaseTool {
+        /**
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.linkingTool, which you can modify.
+        */
+        constructor();
+
+        /**Gets or sets an optional node data object representing a link label, that is copied by .insertLink and added to the GraphLinksModel when creating a new Link. The value must be an Object or null.*/
+        archetypeLabelNodeData: any;
+
+        /**Gets or sets a data object that is copied by .insertLink and added to the GraphLinksModel when creating a new Link. The value must be an Object or null.*/
+        archetypeLinkData: any;
+
+        /**Gets or sets the direction in which new links may be drawn.*/
+        direction: EnumValue;
+
+        /**Gets or sets the GraphObject at which .findLinkablePort should start its search.*/
+        startObject: GraphObject;
+
+        /**
+        * This tool can run when the diagram allows linking, the model is modifiable, the left-button mouse drag has moved far enough away to not be a click, and when .findLinkablePort has returned a valid port.
+        */
+        canStart(): boolean;
+
+        /**
+        * Start the linking operation.
+        */
+        doActivate(): void;
+
+        /**
+        * Finishing the linking operation stops the transaction, releases the mouse, and resets the cursor.
+        */
+        doDeactivate(): void;
+
+        /**
+        * A mouse-up ends the linking operation; if there is a valid .targetPort nearby, this adds a new Link by calling .insertLink.
+        */
+        doMouseUp(): void;
+
+        /**
+        * Return the GraphObject at the mouse-down point, if it is part of a node and if it is valid to link with it.
+        */
+        findLinkablePort(): GraphObject;
+
+        /**
+        * Make a copy of the .archetypeLinkData, set its node and port properties, and add it to the model.
+        * @param {Node} fromnode
+        * @param {GraphObject} fromport
+        * @param {Node} tonode
+        * @param {GraphObject} toport
+        */
+        insertLink(fromnode: Node, fromport: GraphObject, tonode: Node, toport: GraphObject): Link;
+
+        /**This value for LinkingTool.direction indicates that users may draw new links backwards only.*/
+        static BackwardsOnly: EnumValue;
+
+        /**This value for LinkingTool.direction indicates that users may draw new links in either direction.*/
+        static Either: EnumValue;
+
+        /**This value for LinkingTool.direction indicates that users may draw new links forwards only.*/
+        static ForwardsOnly: EnumValue;
+    }
+
+    /**
+    * The LinkReshapingTool is used to interactively change the route of a Link.
+    * This tool makes use of an Adornment, shown when the adorned Link is selected,
+    * that includes some number of reshape handles.
+    * This tool conducts a transaction while the tool is active.
+    * A successful reshaping will result in a "LinkReshaped" DiagramEvent and a "LinkReshaping" transaction.
+    */
+    class LinkReshapingTool extends Tool {
+        /**
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.linkReshapingTool, which you can modify.
+        */
+        constructor();
+
+        /**This read-only property returns the Link that is being routed manually.*/
+        adornedLink: Link;
+
+        /**This read-only property returns the GraphObject that is the tool handle being dragged by the user.*/
+        handle: GraphObject;
+
+        /**Gets or sets a small GraphObject that is copied as a reshape handle at each movable point in the selected link's route.*/
+        handleArchetype: GraphObject;
+
+        /**Gets or sets a small GraphObject that is copied as a resegment handle at each mid point in the selected Link's route.*/
+        midHandleArchetype: GraphObject;
+
+        /**This read-only property returns the Point that was the original location of the handle that is being dragged to reshape the Link.*/
+        originalPoint: Point;
+
+        /**This read-only property returns the List of Points that was the original route of the Link that is being reshaped.*/
+        originalPoints: List<Point>;
+
+        /**
+        * This tool may run when there is a mouse-down event on a reshape handle.
+        */
+        canStart(): boolean;
+
+        /**
+        * This is called by .doMouseMove and .doMouseUp to limit the input point before calling .reshape.
+        * @param {Point} p
+        */
+        computeReshape(p: Point): Point;
+
+        /**
+        * Start reshaping, if .findToolHandleAt finds a reshape handle at the mouse down point.
+        */
+        doActivate(): void;
+
+        /**
+        * Restore the link route to be the original points and stop this tool.
+        */
+        doCancel(): void;
+
+        /**
+        * This stops the current reshaping operation with the link route shaped the way it is.
+        */
+        doDeactivate(): void;
+
+        /**
+        * Call .reshape with a new point determined by the mouse to change the route of the .adornedLink.
+        */
+        doMouseMove(): void;
+
+        /**
+        * Reshape the route with a point based on the most recent mouse point by calling .reshape, and then raise a "LinkReshaped" DiagramEvent before stopping this tool.
+        */
+        doMouseUp(): void;
+
+        /**
+        * Get the permitted reshaping behavior for a particular reshape handle.
+        * @param {GraphObject} obj a reshape handle in the "LinkReshaping" Adornment.
+        */
+        getReshapingBehavior(obj: GraphObject): EnumValue;
+
+        /**
+        * Set the permitted reshaping behavior for a particular reshape handle.
+        * @param {GraphObject} obj a reshape handle in the "LinkReshaping" Adornment.
+        * @param {EnumValue} behavior one of LinkReshapingTool.All, .Vertical, .Horizontal, or .None
+        */
+        setReshapingBehavior(obj: GraphObject, behavior: EnumValue): void;
+
+        /**
+        * Change the route of the .adornedLink by moving the point corresponding to the current .handle to be at the given Point.
+        * @param {Point} newPoint
+        */
+        reshape(newPoint: Point): void;
+
+        /**
+        * Show an Adornment with reshape handles at each of the interesting points of the link's route, if the link is selected and visible and if Part.canReshape is true.
+        * @param {Part} part
+        */
+        updateAdornments(part: Part): void;
+
+        /**Allow dragging in any direction.*/
+        static All: EnumValue;
+
+        /**Allow only horizontal (left-and-right) dragging.*/
+        static Horizontal: EnumValue;
+
+        /**Disallow dragging.*/
+        static None: EnumValue;
+
+        /**Allow only vertical (up-and-down) dragging.*/
+        static Vertical: EnumValue;
+    }
+
+    /**
+    * The PanningTool supports manual panning, where the user can shift the
+    * Diagram.position by dragging the mouse.
+    */
+    class PanningTool extends Tool {
+        /**
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.panningTool.
+        */
+        constructor();
+
+        /**Gets or sets whether panning actions will allow events to bubble instead of panning in the diagram.*/
+        bubbles: boolean;
+
+        /**This read-only property returns the Point that was the original value of Diagram.position when the panning operation started.*/
+        originalPosition: Point;
+
+        /**
+        * This tool can run when the diagram allows scrolling and the mouse has been dragged with the left button far enough away from the mouse-down point to avoid being a click.
+        */
+        canStart(): boolean;
+
+        /**
+        * Capture the mouse, change the diagram cursor, and remember the Diagram.position.
+        */
+        doActivate(): void;
+
+        /**
+        * Restore the Diagram.position to what it was when this tool activated.
+        */
+        doCancel(): void;
+
+        /**
+        * Release the mouse and restore the default diagram cursor.
+        */
+        doDeactivate(): void;
+
+        /**
+        * Modify the Diagram.position according to how much the mouse has moved.
+        */
+        doMouseMove(): void;
+
+        /**
+        * Modify the Diagram.position according to how much the mouse has moved.
+        */
+        doMouseUp(): void;
+    }
+
+    /**
+    * The RelinkingTool allows the user to reconnect an existing Link
+    * if the Link.relinkableTo and/or Link.relinkableFrom properties are true.
+    */
+    class RelinkingTool extends LinkingBaseTool {
+        /**
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.relinkingTool, which you can modify.
+        */
+        constructor();
+
+        /**Gets or sets a small GraphObject that is copied as a relinking handle for the selected link path at the "from" end of the link.*/
+        fromHandleArchetype: GraphObject;
+
+        /**This read-only property returns the GraphObject that is the tool handle being dragged by the user.*/
+        handle: GraphObject;
+
+        /**Gets or sets a small GraphObject that is copied as a relinking handle for the selected link path at the "to" end of the link.*/
+        toHandleArchetype: GraphObject;
+
+        /**
+        * This tool can run when the diagram allows relinking, the model is modifiable, and there is a relink handle at the mouse-down point.
+        */
+        canStart(): boolean;
+
+        /**
+        * Make a temporary link look and act like the real Link being relinked.
+        * @param {Link} reallink
+        * @param {Link} templink
+        */
+        copyLinkProperties(reallink: Link, templink: Link): void;
+
+        /**
+        * Start the relinking operation.
+        */
+        doActivate(): void;
+
+        /**
+        * Finishing the linking operation stops the transaction, releases the mouse, and resets the cursor.
+        */
+        doDeactivate(): void;
+
+        /**
+        * A mouse-up ends the relinking operation; if there is a valid .targetPort nearby, this modifies the old link to connect with the target port.
+        */
+        doMouseUp(): void;
+
+        /**
+        * Modify an existing Link to connect to a new node and port.
+        * @param {Link} existinglink
+        * @param {Node} newnode the Node to connect to or from.
+        * @param {GraphObject} newport the GraphObject port to connect to or from.
+        * @param {boolean} toend If true, this modifies the link's "to" node and port; otherwise it modifies the "from" node and port.
+        */
+        reconnectLink(existinglink: Link, newnode: Node, newport: GraphObject, toend: boolean): boolean;
+
+        /**
+        * Show an Adornment for each end of the Link that the user may reconnect.
+        * @param {Part} part
+        */
+        updateAdornments(part: Part): void;
+    }
+
+    /**
+    * The ResizingTool is used to interactively change the size of a GraphObject
+    * in the selected Part or Node.
+    * This tool does not operate on Links.
+    */
+    class ResizingTool extends Tool {
+        /**
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.resizingTool, which you can modify.
+        */
+        constructor();
+
+        /**This read-only property returns the GraphObject that is being resized.*/
+        adornedObject: GraphObject;
+
+        /**Gets or sets the width and height multiples with which the user must resize.*/
+        cellSize: Size;
+
+        /**This read-only property returns the GraphObject that is the tool handle being dragged by the user.*/
+        handle: GraphObject;
+
+        /**Gets or sets a small GraphObject that is copied as a resizing handle for the selected part.*/
+        handleArchetype: GraphObject;
+
+        /**Gets or sets whether the ResizingTool snaps object sizes to the diagram's background grid during the resize.*/
+        isGridSnapEnabled: boolean;
+
+        /**Gets or sets the maximum size to which the user can resize.*/
+        maxSize: Size;
+
+        /**Gets or sets the minimum size to which the user can resize.*/
+        minSize: Size;
+
+        /**This read-only property returns the Size that was the original value of the GraphObject.desiredSize of the element that is being resized.*/
+        originalDesiredSize: Size;
+
+        /**This read-only property returns the Point that was the original value of the Part.location of the Part that is being resized.*/
+        originalLocation: Point;
+
+        /**
+        * This tool may run when there is a mouse-down event on a resize handle, the diagram is not read-only and it allows resizing, the left mouse button is being used, and this tool's adornment's resize handle is at the current mouse point.
+        */
+        canStart(): boolean;
+
+        /**
+        * The size should be a multiple of the value returned by this method.
+        */
+        computeCellSize(): Size;
+
+        /**
+        * The effective maximum resizing size is the minimum of the .maxSize and the .adornedObject's GraphObject.maxSize.
+        */
+        computeMaxSize(): Size;
+
+        /**
+        * The effective minimum resizing size is the maximum of .minSize and the .adornedObject's GraphObject.minSize.
+        */
+        computeMinSize(): Size;
+
+        /**
+        * Given a Spot in the original bounds of the object being resized and a new Point, compute the new Rect.
+        * @param {Point} newPoint a Point in local coordinates.
+        * @param {Spot} spot the alignment spot of the handle being dragged.
+        * @param {Size} min the result of the call to .computeMinSize.
+        * @param {Size} max the result of the call to .computeMaxSize.
+        * @param {Size} cell the result of the call to .computeCellSize.
+        * @param {boolean} reshape true if the new size may change the aspect ratio from that of the natural bounds of the .adornedObject.
+        */
+        computeResize(newPoint: Point, spot: Spot, min: Size, max: Size, cell: Size, reshape: boolean): Rect;
+
+        /**
+        * Capture the mouse, remember the object's original bounds, and start a transaction.\
+        */
+        doActivate(): void;
+
+        /**
+        * Restore the original GraphObject's size.
+        */
+        doCancel(): void;
+
+        /**
+        * Stop the current transaction and release the mouse.
+        */
+        doDeactivate(): void;
+
+        /**
+        * Call .resize with a new size determined by the current mouse point.
+        */
+        doMouseMove(): void;
+
+        /**
+        * Call .resize with the final bounds based on the most recent mouse point, commit the transaction, and raise the "PartResized" DiagramEvent.
+        */
+        doMouseUp(): void;
+
+        /**
+        * Change the size of the selected part's Part.resizeObject to have the given bounds.
+        * @param {Rect} newr
+        */
+        resize(newr: Rect): void;
+
+        /**
+        * Show an Adornment with the resize handles at points along the edge of the bounds of the selected Part's Part.resizeObject.
+        * @param {Part} part
+        */
+        updateAdornments(part: Part): void;
+    }
+
+    /**
+    * The RotatingTool is used to interactively change the GraphObject.angle of a GraphObject.
+    * This tool allows the user to rotate the Part.rotateObject of the selected Part.
+    * Normally this works with Parts or Nodes; it does not make sense for Links.
+    * The Part must be Part.rotatable, which is false by default.
+    */
+    class RotatingTool extends Tool {
+        /**
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.rotatingTool, which you can modify.
+        */
+        constructor();
+
+        /**This read-only property returns the GraphObject that is being rotated.*/
+        adornedObject: GraphObject;
+
+        /**Gets or sets a small GraphObject that is copied as a rotation handle for the selected part.*/
+        handle: GraphObject;
+
+        /**Gets or sets a small GraphObject that is copied as a rotation handle for the selected part.*/
+        handleArchetype: GraphObject;
+
+        /**This read-only property returns the angle that was the original value of the GraphObject.angle of the GraphObject that is being rotated.*/
+        originalAngle: number;
+
+        /**Gets or sets the the closeness to a desired angle at which the angle is "snapped to".*/
+        snapAngleEpsilon: number;
+
+        /**Gets or sets the preferred angles for the selected object.*/
+        snapAngleMultiple: number;
+
+        /**
+        * This tool may run when there is a mouse-down event on a rotate handle, the diagram is not read-only and it allows rotation, the left mouse button is being used, and this tool's adornment's rotate handle is at the current mouse point.
+        */
+        canStart(): boolean;
+
+        /**
+        * Compute the new angle given a point.
+        * @param{Point} newPoint
+        */
+        computeRotate(newPoint: Point): number;
+
+        /**
+        * Capture the mouse, remember the original GraphObject.angle, and start a transaction.
+        */
+        doActivate(): void;
+
+        /**
+        * Restore the original GraphObject.angle of the adorned object.
+        */
+        doCancel(): void;
+
+        /**
+        * Stop the current transaction and release the mouse.
+        */
+        doDeactivate(): void;
+
+        /**
+        * Call .rotate with a new angle determined by the current mouse point.
+        */
+        doMouseMove(): void;
+
+        /**
+        * Call .rotate with an angle based on the most recent mouse point, commit the transaction, and raise the "PartRotated" DiagramEvent.
+        */
+        doMouseUp(): void;
+
+        /**
+        * Change the angle of the selected part's Part.rotateObject.
+        * @param {number} newangle
+        */
+        rotate(newangle: number): void;
+
+        /**
+        * Show an Adornment with a rotate handle at a point to the side of the adorned object if the part is selected and visible and if Part.canRotate() is true.
+        * @param {Part} part
+        */
+        updateAdornments(part: Part): void;
+    }
+
+    /**
+    * The TextEditingTool is used to let the user interactively edit text in place.
+    * You do not normally need to create an instance of this tool
+    * because one already exists as the ToolManager.clickSelectingTool.
+    */
+    class TextEditingTool extends Tool {
+        /**
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.textEditingTool, which you can modify.
+        */
+        constructor();
+
+        /**Gets or sets the HTML element that edits the text.*/
+        currentTextEditor: Element;
+
+        /**Gets or sets the HTML element that edits the text.*/
+        defaultTextEditor: Element;
+
+        /**Gets or sets how user gestures can start in-place editing of text.*/
+        starting: EnumValue;
+
+        /**Gets or sets the TextBlock that is being edited.*/
+        textBlock: TextBlock;
+
+        /**Gets or sets the predicate that determines whether or not a string of text is valid.*/
+        textValidation: (tb: TextBlock, oldstr: string, newstr: string) => boolean;
+
+        /**
+        * Finish editing by trying to accept the new text.
+        * @param {EnumValue} reason The reason must be either TextEditingTool.LostFocus,
+        * TextEditingTool.MouseDown, TextEditingTool.Tab, or TextEditingTool.Enter.
+        */
+        acceptText(reason: EnumValue): void;
+
+        /**
+        * This may run when there is a mouse-click on a TextBlock for which the TextBlock.editable property is true in a Part that Part.isSelected.
+        */
+        canStart(): boolean;
+
+        /**
+        * Start editing the text for a TextBlock.
+        */
+        doActivate(): void;
+
+        /**
+        * Abort any text editing operation.
+        */
+        doCancel(): void;
+
+        /**
+        * Release the mouse.
+        */
+        doDeactivate(): void;
+
+        /**
+        * A click (mouse up) calls TextEditingTool.doActivate if this tool is not already active and if TextEditingTool.canStart returns true.
+        */
+        doMouseDown(): void;
+
+        /**
+        * A click (mouse up) calls TextEditingTool.doActivate if this tool is not already active and if TextEditingTool.canStart returns true.
+        */
+        doMouseUp(): void;
+
+        /**
+        * This calls TextEditingTool.doActivate if there is a TextBlock supplied.
+        */
+        doStart(): void;
+
+        /**
+        * This predicate checks any TextBlock.textValidation predicate and this tool's .textValidation predicate to make sure the TextBlock.text property may be set to the new string.
+        * @param {TextBlock} textblock the TextBlock that is being edited.
+        * @param {string} oldstr the previous string value.
+        * @param {string} newstr the proposed new string value.
+        */
+        isValidText(textblock: TextBlock, oldstr: string, newstr: string): boolean;
+
+        /**The user has typed ENTER.*/
+        static Enter: EnumValue;
+
+        /**The text editing control has lost focus.*/
+        static LostFocus: EnumValue;
+
+        /**The user has clicked somewhere else in the diagram.*/
+        static MouseDown: EnumValue;
+
+        /**A single click on a TextBlock with TextBlock.editable property set to true will start in-place editing.*/
+        static SingleClick: EnumValue;
+
+        /**A single click on a TextBlock with TextBlock.editable property set to true will start in-place editing, but only if the Part that the TextBlock is in is already selected.*/
+        static SingleClickSelected: EnumValue;
+
+        /**The user has typed TAB.*/
+        static Tab: EnumValue;
+    }
+
+    /**
+    * Tools handle mouse events and keyboard events.
+    * The currently running tool, Diagram.currentTool, receives all input events from the Diagram.
+    */
+    abstract class Tool {
+        /**
+        * Don't construct this directly -- this is an abstract class.
+        */
+        constructor();
+
+        /**This read-only property returns the Diagram that owns this tool and for which this tool is handling input events.*/
+        diagram: Diagram;
+
+        /**Gets or sets whether this tool is started and is actively doing something.*/
+        isActive: boolean;
+
+        /**Gets or sets whether this tool can be started by a mouse event.*/
+        isEnabled: boolean;
+
+        /**Gets or sets the name of this tool.*/
+        name: string;
+
+        /**Gets or sets the name of the transaction to be committed by .stopTransaction; if null, the transaction will be rolled back.*/
+        transactionResult: string;
+
+        /**
+        * This is called to cancel any running "WaitAfter" timer.
+        */
+        cancelWaitAfter(): void;
+
+        /**
+        * This predicate is used by the ToolManager to decide if this tool can be started mode-lessly by mouse and touch events.
+        */
+        canStart(): boolean;
+
+        /**
+        * This predicate determines whether or not to allow pinch zooming from a multi-touch event.
+        */
+        canStartMultiTouch(): boolean;
+
+        /**
+        * This method is called by the diagram after setting Diagram.currentTool, to make the new tool active.
+        */
+        doActivate(): void;
+
+        /**
+        * The diagram will call this method when the user wishes to cancel the current tool's operation.
+        */
+        doCancel(): void;
+
+        /**
+        * This method is called by the diagram on the old tool when Diagram.currentTool is set to a new tool.
+        */
+        doDeactivate(): void;
+
+        /**
+        * The diagram will call this method upon a key down event.
+        */
+        doKeyDown(): void;
+
+        /**
+        * The diagram will call this method upon a key up event.
+        */
+        doKeyUp(): void;
+
+        /**
+        * The diagram will call this method upon a mouse down event.
+        */
+        doMouseDown(): void;
+
+        /**
+        * The diagram will call this method upon a mouse move event.
+        */
+        doMouseMove(): void;
+
+        /**
+        * The diagram will call this method upon a mouse up event.
+        */
+        doMouseUp(): void;
+
+        /**
+        * The diagram will call this method as the mouse wheel is rotated.
+        */
+        doMouseWheel(): void;
+
+        /**
+        * This method is called by the diagram when this tool becomes the current tool; you should not call this method.
+        */
+        doStart(): void;
+
+        /**
+        * This method is called by the diagram when this tool stops being the current tool; you should not call this method.
+        */
+        doStop(): void;
+
+        /**
+        * This is called a certain delay after a call to .standardWaitAfter if there has not been any call to .cancelWaitAfter.
+        */
+        doWaitAfter(): void;
+
+        /**
+        * This convenience function finds the front-most GraphObject that is at a given point and that is part of an Adornment that is of a given category.
+        * @param {Point} p a Point in document coordinates.
+        * @param {string} category the required Part.category of the Adornment.
+        */
+        findToolHandleAt(p: Point, category: string): GraphObject;
+
+        /**
+        * Return true when the last mouse point is far enough away from the first mouse down point to constitute a drag operation instead of just a potential click.
+        * @param {Point=} first Point in view coordinates, defaults to Diagram.firstInput's InputEvent.viewPoint.
+        * @param {Point=} last Point in view coordinates, defaults to Diagram.lastInput's InputEvent.viewPoint.
+        */
+        isBeyondDragSize(first?: Point, last?: Point): boolean;
+
+        /**
+        * Implement the standard behavior for mouse clicks, searching for and calling click handler functions on GraphObjects or on Diagram, and raising the corresponding DiagramEvent.
+        * @param {function(GraphObject):GraphObject | null=} navig An optional custom navigation
+        * function to find target objects.
+        * @param {function(GraphObject):boolean | null=} pred An optional custom predicate
+        */
+        standardMouseClick(navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean): void;
+
+        /**
+        * Implement the standard behavior for mouse enter, over, and leave events, where the mouse is moving but no button is pressed.
+        */
+        standardMouseOver(): void;
+
+        /**
+        * Implement the standard behavior for selecting parts with the mouse, depending on the control and shift modifier keys.
+        */
+        standardMouseSelect(): void;
+
+        /**
+        * Implement the standard behavior for mouse wheel events.
+        */
+        standardMouseWheel(): void;
+
+        /**
+        * Initiates pinch-zooming on multi-touch devices.
+        */
+        standardPinchZoomStart(): void;
+
+        /**
+        * Continues pinch-zooming (started by standardPinchZoomStart) on multi-touch devices.
+        */
+        standardPinchZoomMove(): void;
+
+        /**
+        * This is called to start a new timer to call .doWaitAfter after a given delay.
+        * @param {number} delay in milliseconds
+        */
+        standardWaitAfter(delay: number): void;
+
+        /**
+        * Call Diagram.startTransaction with the given transaction name.
+        * @param {string=} tname a description of the transaction
+        */
+        startTransaction(tname?: string): boolean;
+
+        /**
+        * If the Diagram.currentTool is this tool, stop this tool and start the Diagram.defaultTool by making it be the new current tool.
+        */
+        stopTool(): void;
+
+        /**
+        * If .transactionResult is null, call Diagram.rollbackTransaction, otherwise call Diagram.commitTransaction.
+        */
+        stopTransaction(): boolean;
+
+        /**
+        * The diagram asks each tool to update any adornments the tool might use for a given part.
+        * @param {Part} part
+        */
+        updateAdornments(part: Part): void;
+    }
+
+    /**
+    * This special Tool is responsible for managing all of the Diagram's
+    * mode-less tools.
+    */
+    class ToolManager extends Tool {
+        /**
+        * You do not normally need to create an instance of this tool because one already exists as the Diagram.toolManager, which you can modify.
+        */
+        constructor();
+
+        /**Gets or sets the mode-less ActionTool, normally one of the .mouseDownTools.*/
+        actionTool: ActionTool;
+
+        /**Gets or sets the mode-less ClickCreatingTool, normally one of the .mouseUpTools.*/
+        clickCreatingTool: ClickCreatingTool;
+
+        /**Gets or sets the mode-less ClickSelectingTool, normally one of the .mouseUpTools.*/
+        clickSelectingTool: ClickSelectingTool;
+
+        /**Gets or sets the mode-less ContextMenuTool, normally one of the .mouseUpTools.*/
+        contextMenuTool: ContextMenuTool;
+
+        /**This read-only property returns the currently showing tooltip, or null if there is none.*/
+        currentToolTip: Adornment;
+
+        /**Gets or sets the mode-less DraggingTool, normally one of the .mouseMoveTools.*/
+        draggingTool: DraggingTool;
+
+        /**Gets or sets the mode-less DragSelectingTool, normally one of the .mouseMoveTools.*/
+        dragSelectingTool: DragSelectingTool;
+
+        /**Gets or sets the distance in view coordinates within which a mouse down-and-up is considered a click and beyond which a mouse movement is considered a drag.*/
+        dragSize: Size;
+
+        /**Gets or sets the time between when the mouse stops moving and a hold event, in milliseconds.*/
+        holdDelay: number;
+
+        /**Gets or sets the time between when the mouse stops moving and a hover event, in milliseconds.*/
+        hoverDelay: number;
+
+        /**Gets or sets the mode-less LinkingTool, normally one of the .mouseMoveTools.*/
+        linkingTool: LinkingTool;
+
+        /**Gets or sets the mode-less LinkReshapingTool, normally one of the .mouseDownTools.*/
+        linkReshapingTool: LinkReshapingTool;
+
+        /**This read-only property returns the list of Tools that might be started upon a mouse-down event.*/
+        mouseDownTools: List<Tool>;
+
+        /**This read-only property returns the list of Tools that might be started upon a mouse-move event.*/
+        mouseMoveTools: List<Tool>;
+
+        /**This read-only property returns the list of Tools that might be started upon a mouse-up event.*/
+        mouseUpTools: List<Tool>;
+
+        /**Gets or sets the ToolManager's mouse wheel behavior.*/
+        mouseWheelBehavior: EnumValue;
+
+        /**Gets or sets the mode-less PanningTool, normally one of the .mouseMoveTools.*/
+        panningTool: PanningTool;
+
+        /**Gets or sets the mode-less RelinkingTool, normally one of the .mouseDownTools.*/
+        relinkingTool: RelinkingTool;
+
+        /**Gets or sets the mode-less ResizingTool, normally one of the .mouseDownTools.*/
+        resizingTool: ResizingTool;
+
+        /**Gets or sets the mode-less RotatingTool, normally one of the .mouseDownTools.*/
+        rotatingTool: RotatingTool;
+
+        /**Gets or sets the mode-less TextEditingTool, normally one of the .mouseUpTools.*/
+        textEditingTool: TextEditingTool;
+
+        /**
+        * This just calls CommandHandler.doKeyDown on the diagram's Diagram.commandHandler.
+        */
+        doKeyDown(): void;
+
+        /**
+        * This just calls CommandHandler.doKeyUp on the diagram's Diagram.commandHandler.
+        */
+        doKeyUp(): void;
+
+        /**
+        * Iterate over the .mouseDownTools list and start the first tool for which its Tool.canStart predicate returns true.
+        */
+        doMouseDown(): void;
+
+        /**
+        * Implement the standard behavior for mouse hover and mouse hold events, called by .doWaitAfter when the mouse has not moved for a period of time.
+        */
+        doMouseHover(): void;
+
+        /**
+        * Iterate over the .mouseMoveTools list and start the first tool for which its Tool.canStart predicate returns true.
+        */
+        doMouseMove(): void;
+
+        /**
+        * Iterate over the .mouseUpTools list and start the first tool for which its Tool.canStart predicate returns true.
+        */
+        doMouseUp(): void;
+
+        /**
+        * The diagram will call this method as the mouse wheel is rotated.
+        */
+        doMouseWheel(): void;
+
+        /**
+        * Implement the standard behavior for tooltips, called by .doWaitAfter when the mouse has not moved for a period of time.
+        */
+        doToolTip(): void;
+
+        /**
+        * Implement the standard behavior for when the mouse has not moved for a period of time.
+        */
+        doWaitAfter(): void;
+
+        /**
+        * Find a mouse tool of a given name.
+        * @param {string} name
+        */
+        findTool(name: string): Tool;
+
+        /**
+        * Hide any tooltip.
+        */
+        hideToolTip(): void;
+
+        /**
+        * Initialize the three mouse tool lists with instances of the standard tools.
+        */
+        initializeStandardTools(): void;
+
+        /**
+        * This is called by .showToolTip to position the part within the viewport.
+        * @param {Adornment} tooltip
+        * @param {GraphObject} obj The GraphObject getting the tooltip.
+        */
+        positionToolTip(tooltip: Adornment, obj: GraphObject): void;
+
+        /**
+        * Replace a mouse tool of a given name with a new tool.
+        * @param {string} name the type of tool, such as "Dragging" or "ClickSelecting".
+        * @param {Tool} newtool If null, any tool that the search finds will just be removed
+        * from the list in which it was found.
+        */
+        replaceTool(name: string, newtool: Tool): Tool;
+
+        /**
+        * Show a tooltip Adornment.
+        * @param {Adornment} tooltip
+        * @param {GraphObject} obj The GraphObject getting the tooltip; this is null if the tooltip is being shown for the diagram background.
+        */
+        showToolTip(tooltip: Adornment, obj: GraphObject): void;
+
+        /**This value for gestureBehavior indicates that the pointer/touch pinch gestures on the canvas intend to have no effect on the Diagram, but also no effect on the page.*/
+        static GestureCancel: EnumValue;
+
+        /**This value for gestureBehavior indicates that the pointer/touch pinch gestures on the canvas intend to have no effect on the Diagram, but will not be prevented, and may bubble up the page to have other effects (such as zooming the page).*/
+        static GestureNone: EnumValue;
+
+        /**This value for gestureBehavior indicates that the pointer/touch pinch gestures on the canvas intend to zoom the Diagram.*/
+        static GestureZoom: EnumValue;
+
+        /**This value for .mouseWheelBehavior indicates that the mouse wheel events are ignored, although scrolling or zooming by other means may still be allowed.*/
+        static WheelNone: EnumValue;
+
+        /**This default value for .mouseWheelBehavior indicates that mouse wheel events scroll the diagram.*/
+        static WheelScroll: EnumValue;
+
+        /**This value for .mouseWheelBehavior indicates that the mouse wheel events change the scale of the diagram.*/
+        static WheelZoom: EnumValue;
+    }
+
+
+    /**
+    * This interface is implemented by the List, Set, and Map
+    * classes; it provides the .iterator read-only property that returns an Iterator.
+    */
+    class Iterable<T> {
+        /*This is an interface and thus does not have a constructor.*/
+
+        /**Gets an Iterator that can iterate over the items in the collection.*/
+        iterator: Iterator<T>;
+    }
+
+    /**
+    * This interface defines properties and methods for iterating over a collection;
+    * it provides the .next predicate and the .value read-only property.
+    * Some Iterators also provide key property values along with each value.
+    */
+    class Iterator<T> extends Iterable<T> {
+        /*This is an interface and thus does not have a constructor.*/
+
+        /**This read-only property returns the total number of items in the iterated collection.*/
+        count: number;
+
+        /**Returns itself, which is convenient for code that expects an Iterable instead of an Iterator.*/
+        iterator: Iterator<T>;
+
+        /**This read-only property returns the current index to the item in the collection, assuming .next has just returned true.*/
+        key: any;
+
+        /**This read-only property returns the current item in the collection, assuming .next has just returned true.*/
+        value: T;
+
+        /**
+        * This is true if all invocations of the given predicate on items in the collection are true.
+        * @param {(x: T) => boolean} pred
+        */
+        all(pred: (x: T) => boolean): boolean;
+
+        /**
+        * This is true if any invocation of the given predicate on items in the collection is true.
+        * @param {(x: T) => boolean} pred
+        */
+        any(pred: (x: T) => boolean): boolean;
+
+        /**
+        * Produce an Iterator that first iterates over the items of this Iterator and then iterates over the items of the given Iterator.
+        * @param {Iterable.<T>} it An Iterable
+        */
+        concat<S>(it: Iterable<S>): Iterator<S | T>;
+
+        /**
+        * Call the given function on each item in the collection.
+        * @param {(x: T) => void} func
+        */
+        each(func: (x: T) => void): void;
+
+        /**
+        * Call the given predicate on each item in the collection and for each item that it returns true, present the item in an iterator.
+        * @param {function(T):boolean} pred This function must not have any side-effects.
+        */
+        filter(pred: (x: T) => boolean): Iterator<T>;
+
+        /**
+        * Return the first item in the collection, or null if there is none.
+        */
+        first(): T;
+
+        /**
+        * Call the given function on each item in the collection and present the results in an iterator.
+        * @param {function(T)} func This function must not modify the collection.
+        */
+        map<S>(func: (x: T) => S): Iterator<S>;
+
+        /**
+        * Call this method to advance the iterator to the next item in the collection.
+        */
+        next(): boolean;
+
+        /**
+        * Start this iterator all over again.
+        */
+        reset(): void;
+    }
+
+    /**
+    * An ordered iterable collection.
+    * It optionally enforces the type of elements that may be added to the List.
+    */
+    class List<T> extends Iterable<T> {
+        /**
+        * This creates a List that checks the type of the values to be instances of a particular kind of Object.
+        * @param {function(...)} type this must be a class function/constructor.
+        */
+        constructor(type: Constructor);
+        /**
+        * This creates a List that may check the types of the values.
+        * @param {string=} type if supplied, this must be one of: 'number', 'string', 'boolean', or 'function' for the value type.
+        */
+        constructor(type?: string);
+
+        /**This read-only property returns the length of the List.*/
+        count: number;
+
+        /**This read-only property returns the length of the List. ES6-like synonym for count.*/
+        size: number;
+
+        /**Gets an object that you can use for iterating over the List.*/
+        iterator: Iterator<T>;
+
+        /**Gets an object that you can use for iterating over the List in backwards order.*/
+        iteratorBackwards: Iterator<T>;
+
+        /**This read-only property returns the length of the List, a synonym for the .count property.*/
+        length: number;
+
+        /**
+        * Adds a given value to the end of the List.
+        * @param {*} val
+        */
+        add(val: T): void;
+
+        /**
+        * Adds all of the values of a collection (either an Iterable or an Array) to the end of this List.
+        * @param {Iterable<T>|Array<T>} coll
+        */
+        addAll(coll: Iterable<T> | Array<T>): List<T>;
+
+        /**
+        * This is true if all invocations of the given predicate on items in the collection are true.
+        * @param {(x: T) => boolean} pred
+        */
+        all(pred: (x: T) => boolean): boolean;
+
+        /**
+        * This is true if any invocation of the given predicate on items in the collection is true.
+        * @param {(x: T) => boolean} pred
+        */
+        any(pred: (x: T) => boolean): boolean;
+
+        /**
+        * Clears the List.
+        */
+        clear(): void;
+
+        /**
+        * Produce a new List holding, in order, all of the items of this List and then all of the items presented by the given Iterable.
+        * Unlike Iterator.concat, this returns a List, not an Iterator.
+        * @param {Iterable.<T>} it An Iterable
+        */
+        concat<S>(it: Iterable<S>): List<S | T>;
+
+        /**
+        * Returns whether the given value is in this List.
+        * @param {*} val
+        */
+        contains(val: T): boolean;
+
+        /**
+        * Makes a shallow copy of this List.
+        */
+        copy(): List<T>;
+
+        /**
+        * Removes a given value (if found) from the List. ES6-like synonym for remove.
+        * @param {*} val
+        */
+        delete(val: T): boolean;
+
+        /**
+        * Call the given function on each item in the collection.
+        * @param {(x: T) => void} func
+        */
+        each(func: (x: T) => void ): void;
+
+        /**
+        * Returns the element at the given index.
+        * @param {number} i
+        */
+        elt(i: number): T;
+
+        /**
+        * Call the given predicate on each item in the collection and for each item that it returns true, collect the item in a new List.
+        * Unlike Iterator.filter, this returns a List, not an Iterator.
+        * @param {function(T):boolean} pred This function must not have any side-effects.
+        */
+        filter(pred: (x: T) => boolean): List<T>;
+
+        /**
+        * Returns the first item in the list, or null if there is none.
+        */
+        first(): T;
+
+        /**
+        * Returns the element at the given index. ES6-like synonym for elt.
+        * @param {number} i
+        */
+        get(i: number): T;
+
+        /**
+        * Returns whether the given value is in this List. ES6-like synonym for contains.
+        * @param {*} val
+        */
+        has(val: T): boolean;
+
+        /**
+        * Returns the index of the given value if it is in this List.
+        * @param {*} val
+        */
+        indexOf(val: T): number;
+
+        /**
+        * Insert a value before the index i.
+        * @param {number} i
+        * @param {*} val
+        */
+        insertAt(i: number, val: T): void;
+
+        /**
+        * Returns the last item in the list, or null if there is none.
+        */
+        last(): T;
+
+        /**
+        * Call the given function on each item in the collection and collect the results in a new List.
+        * Unlike Iterator.map, this returns a List, not an Iterator.
+        * @param {function(T)} func This function must not modify the collection.
+        */
+        map<S>(func: (x: T) => S): List<S>;
+
+        /**
+        * Returns the last item in the list and removes it from the list, or just return null if there is none.
+        */
+        pop(): T;
+
+        /**
+        * Add an item at the end of the list -- a synonym for add.
+        */
+        push(val: T): void;
+
+        /**
+        * Removes a given value (if found) from the List.
+        * @param {*} val
+        */
+        remove(val: T): boolean;
+
+        /**
+        * Removes a value at a given index from the List.
+        * @param {number} i
+        */
+        removeAt(i: number): void;
+
+        /**
+        * Removes a range of values from the List.
+        * @param {number} to
+        * @param {number} from
+        */
+        removeRange(to: number, from: number): void;
+
+        /**
+        * Reverse the order of items in this List.
+        */
+        reverse(): List<T>;
+
+        /**
+        * Set the element at the given index to a given value. ES6-like synonym for setElt.
+        * @param {number} i
+        * @param {*} val
+        */
+        set(i: number, val: T): void;
+
+        /**
+        * Set the element at the given index to a given value.
+        * @param {number} i
+        * @param {*} val
+        */
+        setElt(i: number, val: T): void;
+
+        /**
+        * Sort the List according to a comparison function.
+        * @param {function(*,*):number} sortfunc the same kind of function as passed to Array.sort
+        */
+        sort(sortfunc: (a: T, b: T) => number): List<T>;
+
+        /**
+        * Produces a JavaScript Array from the contents of this List.
+        */
+        toArray(): Array<T>;
+
+        /**
+        * Converts the List to a Set.
+        */
+        toSet(): Set<T>;
+    }
+
+    /**
+    * This is a structure used by Map to hold key-value pairs.
+    */
+    interface KeyValuePair<K,V> {  // undocumented
+        key: K;
+        value: V;
+    }
+
+    /**
+    * An unordered iterable collection of key/value pairs that cannot contain two instances of the
+    * same key.
+    * It optionally enforces the type of the key and the type of the associated value.
+    */
+    class Map<K,V> extends Iterator<KeyValuePair<K,V>> {
+        /**
+        * This creates a Map that may check the types of the keys and/or values.
+        * @param {function(...)} keytype if supplied, this must be a class function/constructor.
+        * @param {function(...)} valtype if supplied, this must be a class function/constructor.
+        */
+        constructor(keytype: Constructor, valtype: Constructor);
+        /**
+        * This creates a Map that may check the types of the keys and/or values.
+        * @param {string=} keytype if supplied, this must be one of: 'number' or 'string' for the key type.
+        * @param {function(...)} valtype if supplied, this must be a class function/constructor.
+        */
+        constructor(keytype: string, valtype: Constructor);
+        /**
+        * This creates a Map that may check the types of the keys and/or values.
+        * @param {function(...)} keytype if supplied, this must be a class function/constructor.
+        * @param {string} valtype if supplied, this must be one of: 'number', 'string', 'boolean', or 'function' for the value type.
+        */
+        constructor(keytype: Constructor, valtype: string);
+        /**
+        * This creates a Map that may check the types of the keys and/or values.
+        * @param {string=} keytype if supplied, this must be one of: 'number' or 'string' for the key type.
+        * @param {string=} valtype if supplied, this must be one of: 'number', 'string', 'boolean', or 'function' for the value type.
+        */
+        constructor(keytype?: string, valtype?: string);
+
+        /**This read-only property returns the number of associations in the Map.*/
+        count: number;
+
+        /**Gets an object that you can use for iterating over the key-value pairs of the Map.*/
+        iterator: Iterator<KeyValuePair<K,V>>;
+
+        /**Gets an object that you can use for iterating over the keys in the Map.*/
+        iteratorKeys: Iterator<K>;
+
+        /**Gets an object that you can use for iterating over the values of the Map.*/
+        iteratorValues: Iterator<V>;
+
+        /**This read-only property returns the number of associations in the Map. ES6-like synonym for count.*/
+        size: number;
+
+        /**
+        * Adds a key-value association to the Map, or replaces the value associated with the key if the key was already present in the map.
+        * @param {*} key
+        * @param {*} val
+        */
+        add(key: K, val: V): boolean;
+
+        /**
+        * Adds all of the key-value pairs of another Map to this Map.
+        * @param {Iterable.<KeyValuePair.<K,V>>|Array} coll
+        */
+        addAll(coll: Iterable<KeyValuePair<K, V>> | Array<KeyValuePair<K, V>>): Map<K,V>;
+
+        /**
+        * This is true if all invocations of the given predicate on key-value pairs in the collection are true.
+        * @param {(x: Object) => boolean} pred
+        */
+        all(pred: (x: KeyValuePair<K, V>) => boolean): boolean;
+
+        /**
+        * This is true if any invocation of the given predicate on key-value pairs in the collection is true.
+        * @param {(x: Object) => boolean} pred
+        */
+        any(pred: (x: KeyValuePair<K, V>) => boolean): boolean;
+
+        /**
+        * Clears the Map, removing all key-value associations.
+        */
+        clear(): void;
+
+        /**
+        * Produce a new Map that includes the key-value pairs of this Map and then adds the pairs of the given Iterator.
+        * Unlike Iterator.concat, this returns a Map, not an Iterator.
+        * @param {Iterable.<KeyValuePair<K,V>>} it An Iterable
+        */
+        concat<W>(it: Iterable<KeyValuePair<K, W>>): Map<K, V | W>;
+
+        /**
+        * Returns whether the given key is in this Map.
+        * @param {*} key
+        */
+        contains(key: K): boolean;
+
+        /**
+        * Makes a shallow copy of this Map.
+        */
+        copy(): Map<K,V>;
+
+        /**
+        * Removes a key (if found) from the Map. ES6-like synonym for remove.
+        * @param {*} key
+        */
+        delete(key: K): boolean;
+
+        /**
+        * Call the given function on each key-value pair in the collection.
+        * @param {(x: Object) => void} func
+        */
+        each(func: (x: KeyValuePair<K,V>) => void ): void;
+
+        /**
+        * Call the given predicate on each key-value pair in the collection and for each pair that it returns true, add the key-value association in a new Map.
+        * Unlike Iterator.filter, this returns a Map, not an Iterator.
+        * @param {function(KeyValuePair<K,V>):boolean} pred This function must not have any side-effects.
+        */
+        filter(pred: (x: KeyValuePair<K, V>) => boolean): Map<K, V>;
+
+        /**
+        * Returns the first key-value pair in the collection, or null if there is none.
+        */
+        first(): KeyValuePair<K,V>;
+
+        /**
+        * Returns the value associated with a key. ES6-like synonym for getValue.
+        * @param {*} key
+        */
+        get(key: K): V;
+
+        /**
+        * Returns the value associated with a key.
+        * @param {*} key
+        */
+        getValue(key: K): V;
+
+        /**
+        * Returns whether the given key is in this Map. ES6-like synonym for contains.
+        * @param {*} key
+        */
+        has(key: K): boolean;
+
+        /**
+        * Call the given function on each key-value pair in the collection and associate the key with the result of the function in a new Map.
+        * Unlike Iterator.map, this returns a Map, not an Iterator.
+        * @param {function(KeyValuePair<K,V>)} func This function must not modify the collection.
+        */
+        map<S>(func: (x: KeyValuePair<K, V>) => S): Map<K, S>;
+
+        /**
+        * Removes a key (if found) from the Map.
+        * @param {*} key
+        */
+        remove(key: K): boolean;
+
+        /**
+        * Adds a key-value association to the Map, or replaces the value associated with the key if the key was already present in the map. ES6-like synonym for add.
+        * @param {*} key
+        * @param {*} val
+        */
+        set(key: K, val: V): boolean;
+
+        /**
+        * Produces a JavaScript Array of key/value pair objects from the contents of this Map.
+        */
+        toArray(): Array<KeyValuePair<K,V>>;
+
+        /**
+        * Produces a Set that provides a read-only view onto the keys of this Map.
+        */
+        toKeySet(): Set<K>;
+    }
+
+    /**
+    * An unordered iterable collection that cannot contain two instances of the same kind of value.
+    * It optionally enforces the type of elements that may be added to the Set.
+    */
+    class Set<T> extends Iterable<T> {
+        /**
+        * This creates a Set that checks the type of the values.
+        * @param {function(...)} type this must be a class function/constructor.
+        */
+        constructor(type: Constructor);
+        /**
+        * This creates a Set that may check the types of the values.
+        * @param {string=} type if supplied, this must be one of: 'number' or 'string' for the key type.
+        */
+        constructor(type?: string);
+
+        /**This read-only property returns the number of elements in the Set.*/
+        count: number;
+
+        /**Gets an object that you can use for iterating over the Set.*/
+        iterator: Iterator<T>;
+
+        /**This read-only property returns the number of elements in the Set. ES6-like synonym for count.*/
+        size: number;
+
+        /**
+        * Adds a given value to the Set, if not already present.
+        * @param {*} val
+        */
+        add(val: T): boolean;
+
+        /**
+        * Adds all of the values of a collection (either an Iterable or an Array) to this Set.
+        * @param {Iterable<T>|Array<T>} coll
+        */
+        addAll(coll: Iterable<T> | Array<T>): Set<T>;
+
+        /**
+        * This is true if all invocations of the given predicate on items in the collection are true.
+        * @param {(x: T) => boolean} pred
+        */
+        all(pred: (x: T) => boolean): boolean;
+
+        /**
+        * This is true if any invocation of the given predicate on items in the collection is true.
+        * @param {(x: T) => boolean} pred
+        */
+        any(pred: (x: T) => boolean): boolean;
+
+        /**
+        * Clears the Set.
+        */
+        clear(): void;
+
+        /**
+        * Produce a new Set that contains items of this Set and then iterates over the items of the given Iterator.
+        * Unlike Iterator.concat, this returns a Set, not an Iterator.
+        * @param {Iterable.<T>} it An Iterable
+        */
+        concat<S>(it: Iterable<S>): Set<S | T>;
+
+        /**
+        * Returns whether the given value is in this Set.
+        * @param {*} val
+        */
+        contains(val: T): boolean;
+
+        /**
+        * Returns true if all of the values of a given collection are in this Set.
+        * @param {Iterable<T>} coll
+        */
+        containsAll(coll: Iterable<T>): boolean;
+
+        /**
+        * Returns true if any of the values of a given collection are in this Set.
+        * @param {Iterable<T>} coll
+        */
+        containsAny(coll: Iterable<T>): boolean;
+
+        /**
+        * Makes a shallow copy of this Set.
+        */
+        copy(): Set<T>;
+
+        /**
+        * Removes a value (if found) from the Set. ES6-like synonym for remove.
+        * @param {*} val
+        */
+        delete(val: T): boolean;
+
+        /**
+        * Call the given function on each item in the collection.
+        * @param {(x: T) => void} func
+        */
+        each(func: (x: T) => void): void;
+
+        /**
+        * Call the given predicate on each item in the collection and for each item that it returns true, collect the item in a new Set.
+        * Unlike Iterator.filter, this returns a Set, not an Iterator.
+        * @param {function(T):boolean} pred This function must not have any side-effects.
+        */
+        filter(pred: (x: T) => boolean): Set<T>;
+
+        /**
+        * Returns the first item in the collection, or null if there is none.
+        */
+        first(): T;
+
+        /**
+        * Returns whether the given value is in this Set. ES6-like synonym for contains.
+        * @param {*} val
+        */
+        has(val: T): boolean;
+
+        /**
+        * Call the given function on each item in the collection and collect the results in a new Set.
+        * Unlike Iterator.map, this returns a Set, not an Iterator.
+        * @param {function(T)} func This function must not modify the collection.
+        */
+        map<S>(func: (x: T) => S): Set<S>;
+
+        /**
+        * Removes a value (if found) from the Set.
+        * @param {*} val
+        */
+        remove(val: T): boolean;
+
+        /**
+        * Removes all of the values of a collection from this Set.
+        * @param {Iterable<T>} coll
+        */
+        removeAll(coll: Iterable<T>): Set<T>;
+
+        /**
+        * Removes all of the values of a collection from this Set.
+        * @param {Array<T>} coll
+        */
+        removeAll(coll: Array<T>): Set<T>;
+
+        /**
+        * Removes from this Set all items that are not in the given collection.
+        * @param {Iterable<T>} coll
+        */
+        retainAll(coll: Iterable<T>): Set<T>;
+
+        /**
+        * Produces a JavaScript Array from the contents of this Set.
+        */
+        toArray(): Array<T>;
+
+        /**
+        * Converts the Set to a List.
+        */
+        toList(): List<T>;
+    }
+
+    class EnumValue {  // undocumented
+        //Rawr!
+    }
+} //END go
+
+export = go;
+export as namespace go;
diff --git a/go/tsconfig.json b/go/tsconfig.json
new file mode 100644
index 0000000000..6a11909954
--- /dev/null
+++ b/go/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "goJS-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/goJS/goJS-tests.ts.tscparams b/goJS/goJS-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/goJS/goJS-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/goJS/goJS.d.ts b/goJS/goJS.d.ts
deleted file mode 100644
index f37c6bf466..0000000000
--- a/goJS/goJS.d.ts
+++ /dev/null
@@ -1,9463 +0,0 @@
-// Type definitions for GoJS v1.6.0
-// Project: http://gojs.net
-// Definitions by: Northwoods Software <https://github.com/NorthwoodsSoftware>
-// Definitions: https://github.com/NorthwoodsSoftware/GoJS
-
-/* Copyright (C) 1998-2016 by Northwoods Software Corporation. */
-
-declare namespace go {
-    /** A number in place of a Margin object is treated as a uniform Margin with that thickness */
-    type MarginLike = Margin | number;
-
-    /** A string in place of a Brush object is treated as a Solid Brush of that color. */
-    type BrushLike = Brush | string;
-
-    /** A Key is the type of the unique identifier managed by Models for each node data object. */
-    type Key = string | number;
-
-    /** Either name a property or get the value of a property from an object. */
-    type PropertyAccessor = string | ((data: any, newval: any) => any);
-
-    /** A constructor */
-    type Constructor = new (...args: Array<any>) => Object;
-
-    /**
-    * An adornment is a special kind of Part that is associated with another Part,
-    * the Adornment.adornedPart.
-    * Adornments are normally associated with a particular GraphObject in the adorned part --
-    * that is the value of .adornedObject.
-    * However, the .adornedObject may be null, in which case the .adornedPart will also be null.
-    */
-    class Adornment extends Part {
-        /**
-        * @param {EnumValue=} type if not supplied, the default Panel type is Panel.Position.
-        */
-        constructor(type?: EnumValue);
-
-        /**Gets or sets the GraphObject that is adorned.*/
-        adornedObject: GraphObject;
-
-        /**This read-only property returns the Part that contains the adorned object.*/
-        adornedPart: Part;
-
-        /**This read-only property returns a Placeholder that this Adornment may contain in its visual tree.*/
-        placeholder: Placeholder;
-    }
-
-    /**
-    * This class handles animations in a Diagram.  Each Diagram has one, the Diagram.animationManager.
-    */
-    class AnimationManager {
-        /**You do not normally need to create an instance of this class because one already exists as the Diagram.animationManager, which you can modify.*/
-        constructor();
-
-        /**Gets or sets the duration for animations, in milliseconds. The default value is 600 milliseconds.*/
-        duration: number;
-
-        /**This read-only property is true when the AnimationManager is currently animating.*/
-        isAnimating: boolean;
-
-        /**Gets or sets whether this AnimationManager operates. The default value is true.*/
-        isEnabled: boolean;
-
-        /** Gets or sets whether an animation is performed on an initial layout. The default value is true.*/
-        isInitial: boolean;
-
-        /**This read-only property is true when the animation manager is in the middle of an animation tick.*/
-        isTicking: boolean;
-
-        /**
-        * Stops any running animation and updates the Diagram to its final state.
-        */
-        stopAnimation(): void;
-    }
-
-    /**
-    * The Diagram.commandHandler implements various
-    * commands such as CommandHandler.deleteSelection or CommandHandler.redo.
-    * The CommandHandler includes keyboard event handling to interpret
-    * key presses as commands.
-    */
-    class CommandHandler {
-        /**
-        * The constructor produces a CommandHandler with the default key bindings.
-        */
-        constructor();
-
-        /**Gets or sets a data object that is copied by .groupSelection when creating a new Group. The default value is null. The value must be an Object or null.*/
-        archetypeGroupData: any;
-
-        /**Gets or sets whether copySelection should also copy Links that connect with selected Nodes.*/
-        copiesConnectedLinks: boolean;
-
-        /**Gets or sets whether copySelection and copyToClipboard copy the node data property whose value is the containing group data's key. The default value is false.*/
-        copiesGroupKey: boolean;
-
-        /**Gets or sets whether copySelection and copyToClipboard copy the node data property whose value is the tree-parent node data's key. The default value is false.*/
-        copiesParentKey: boolean;
-
-        /**Gets or sets whether .copySelection should also copy subtrees. The default value is false.*/
-        copiesTree: boolean;
-
-        /**Gets or sets the Diagram.scale set by resetZoom. The default value is 1.0.*/
-        defaultScale: number;
-
-        /**Gets or sets whether .deleteSelection should also delete subtrees. The default value is false.*/
-        deletesTree: boolean;
-
-        /**Gets or sets whether .deleteSelection should also delete links that are connected with deleted nodes. The default value is true.*/
-        deletesConnectedLinks: boolean;
-
-        /**This read-only property returns the Diagram that is using this CommandHandler.*/
-        diagram: Diagram;
-
-        /**Gets or sets the predicate that determines whether or not a node may become a member of a group. The default predicate is null, which is equivalent to simply returning true.*/
-        memberValidation: (g: Group, p: Part) => boolean;
-
-        /**Gets or sets the amount by which .decreaseZoom and .increaseZoom change the Diagram.scale. The default value is 1.05 (5%).*/
-        zoomFactor: number;
-
-        /**
-        * Make sure all of the unnested Parts in the given collection are removed from any containing Groups.
-        * @param {Iterable<Part>} coll a collection of Parts.
-        * @param {boolean=} check whether to call .isValidMember to confirm that changing the Part to be a top-level Part is valid.
-        */
-        addTopLevelParts(coll: Iterable<Part>, check?: boolean): boolean;
-
-        /**
-        * This predicate controls whether the user can collapse expanded Groups.
-        * @param {Group=} group if supplied, ignore the selection and consider collapsing this particular Group.
-        */
-        canCollapseSubGraph(group?: Group): boolean;
-
-        /**
-        * This predicate controls whether the user can collapse expanded subtrees of Nodes.
-        * @param {Node=} node if supplied, ignore the selection and consider collapsing this particular Node.
-        */
-        canCollapseTree(node?: Node): boolean;
-
-        /**
-        * This predicate controls whether or not the user can invoke the .copySelection command.
-        */
-        canCopySelection(): boolean;
-
-        /**
-        * This predicate controls whether or not the user can invoke the .cutSelection command.
-        */
-        canCutSelection(): boolean;
-
-        /**
-        * This predicate controls whether or not the user can invoke the .decreaseZoom command.
-        * @param {number=} factor This defaults to 1/.zoomFactor.  The value should be less than one.
-        */
-        canDecreaseZoom(factor?: number): boolean;
-
-        /**
-        * This predicate controls whether or not the user can invoke the .deleteSelection command.
-        */
-        canDeleteSelection(): boolean;
-
-        /**
-        * This predicate controls whether or not the user can invoke the .editTextBlock command.
-        * @param {TextBlock=} textblock the TextBlock to consider editing.
-        */
-        canEditTextBlock(textblock?: TextBlock): boolean;
-
-        /**
-        * This predicate controls whether the user can expand collapsed Groups.
-        * @param {Group=} group if supplied, ignore the selection and consider expanding this particular Group.
-        */
-        canExpandSubGraph(group?: Group): boolean;
-
-        /**
-        * This predicate controls whether the user can expand collapsed subtrees of Nodes.
-        * @param {Node=} node if supplied, ignore the selection and consider expanding this particular Node.
-        */
-        canExpandTree(node?: Node): boolean;
-
-        /**
-        * This predicate controls whether or not the user can invoke the .groupSelection command.
-        */
-        canGroupSelection(): boolean;
-
-        /**
-        * This predicate controls whether or not the user can invoke the .increaseZoom command.
-        * @param {number=} factor This defaults to .zoomFactor.  The value should be greater than one.
-        */
-        canIncreaseZoom(factor?: number): boolean;
-
-        /**
-        * This predicate controls whether or not the user can invoke the .pasteSelection command.
-        */
-        canPasteSelection(): boolean;
-
-        /**
-        * This predicate controls whether or not the user can invoke the .redo command.
-        */
-        canRedo(): boolean;
-
-        /**
-        * This predicate controls whether or not the user can invoke the .resetZoom command.
-        * @param {number=} newscale This defaults to 1.  The value should be greater than zero.
-        */
-        canResetZoom(newscale?: number): boolean;
-
-        /**
-        * This predicate controls whether or not the user can invoke the scrollToPart command.
-        * This returns false if there is no argument Part and there are no selected Parts.
-        * @this {CommandHandler}
-        * @param {Part=} part This defaults to the first selected Part of Diagram.selection
-        * @return {boolean}
-        * This returns true if Diagram.allowHorizontalScroll and Diagram.allowVerticalScroll are true.
-        */
-        canScrollToPart(part?: Part): boolean;
-
-        /**
-        * This predicate controls whether or not the user can invoke the .selectAll command.
-        */
-        canSelectAll(): boolean;
-
-        /**
-        * This predicate controls whether or not the user can invoke the .showContextMenu command.
-        * @param {GraphObject|Diagram=} obj a GraphObject or Diagram with a contextMenu defined.
-        * If none is given, this method will use the first selected object, or else the Diagram.
-        */
-        canShowContextMenu(obj?: GraphObject | Diagram): boolean;
-
-        /**
-        * This predicate controls whether the user may stop the current tool.
-        */
-        canStopCommand(): boolean;
-
-        /**
-        * This predicate controls whether or not the user can invoke the .undo command.
-        */
-        canUndo(): boolean;
-
-        /**
-        * This predicate controls whether or not the user can invoke the .ungroupSelection command.
-        * @param {Group=} group if supplied, ignore the selection and consider ungrouping this particular Group.
-        */
-        canUngroupSelection(group?: Group): boolean;
-
-        /**
-        * This predicate controls whether or not the user can invoke the .zoomToFit command.
-        */
-        canZoomToFit(): boolean;
-
-        /**
-        * Collapse all expanded selected Groups.
-        * @param {Group=} group if supplied, ignore the selection and collapse this particular Group.
-        */
-        collapseSubGraph(group?: Group): void;
-
-        /**
-        * Collapse all expanded selected Nodes.
-        * @param {Node=} node if supplied, ignore the selection and collapse this particular Node subtree.
-        */
-        collapseTree(node?: Node): void;
-
-        /**
-        * Copy the currently selected parts, Diagram.selection, from the Diagram into the clipboard.
-        */
-        copySelection(): void;
-
-        /**
-        * This makes a copy of the given collection of Parts and stores it in a static variable acting as the clipboard.
-        * @param {Iterable<Part>} coll A collection of Parts.
-        */
-        copyToClipboard(coll: Iterable<Part>): void;
-
-        /**
-        * Execute a .copySelection followed by a .deleteSelection.
-        */
-        cutSelection(): void;
-
-        /**
-        * Decrease the Diagram.scale by a given factor.
-        * @param {number=} factor This defaults to 1/.zoomFactor.  The value should be less than one.
-        */
-        decreaseZoom(factor?: number): void;
-
-        /**
-        * Delete the currently selected parts from the diagram.
-        */
-        deleteSelection(): void;
-
-        /**
-        * This is called by tools to handle keyboard commands.
-        */
-        doKeyDown(): void;
-
-        /**
-        * This is called by tools to handle keyboard commands.
-        */
-        doKeyUp(): void;
-
-        /**
-        * Start in-place editing of a TextBlock in the selected Part.
-        * @param {TextBlock=} textblock the TextBlock to start editing.
-        */
-        editTextBlock(textblock?: TextBlock): void;
-
-        /**
-        * Expand all collapsed selected Groups.
-        * @param {Group=} group if supplied, ignore the selection and expand this particular Group.
-        */
-        expandSubGraph(group?: Group): void;
-
-        /**
-        * Expand all collapsed selected Nodes.
-        * @param {Node=} node if supplied, ignore the selection and collapse this particular Node subtree.
-        */
-        expandTree(node?: Node): void;
-
-        /**
-        * Add a copy of .archetypeGroupData and add it to the diagram's model to create a new Group and then add the selected Parts to that new group.
-        */
-        groupSelection(): void;
-
-        /**
-        * Increase the Diagram.scale by a given factor.
-        * @param {number=} factor This defaults to .zoomFactor.  The value should be greater than one.
-        */
-        increaseZoom(factor?: Number): void;
-
-        /**
-        * This predicate is called to determine whether a Node may be added as a member of a Group.
-        * @param {Group} group this may be null if the node is being added as a top-level node.
-        * @param {Part} part a Part, usually a Node, possibly another Group, but not a Link or an Adornment.
-        */
-        isValidMember(group: Group, part: Part): boolean;
-
-        /**
-        * If the clipboard holds a collection of Parts, and if the Model.dataFormat matches that stored in the clipboard, this makes a copy of the clipboard's parts and adds the copies to this Diagram.
-        */
-        pasteFromClipboard(): Set<Part>;
-
-        /**
-        * Copy the contents of the clipboard into this diagram, and make those new parts the new selection.
-        * @param {Point=} pos Point at which to center the newly pasted parts; if not present the parts are not moved.
-        */
-        pasteSelection(pos?: Point): void;
-
-        /**
-        * Call UndoManager.redo.
-        */
-        redo(): void;
-
-        /**
-        * Set the Diagram.scale to a new scale value, by default 1.
-        * @param {number=} newscale This defaults to 1.  The value should be greater than zero.
-        */
-        resetZoom(newscale?: number): void;
-
-        /**
-        * This command scrolls the diagram to make a highlighted or selected Part visible in the viewport.
-        * Call this command repeatedly to cycle through the Diagram.highlighteds collection,
-        * if there are any Parts in that collection, or else in the Diagram.selection collection,
-        * scrolling to each one in turn.
-        * <p>
-        * This is normally invoked by the <code>Space</code> keyboard shortcut.
-        * If there is no argument and there is no highlighted or selected Part, this command does nothing.
-        * @expose
-        * @this {CommandHandler}
-        * @param {Part=} part This defaults to the first highlighted Part of Diagram.highlighteds,
-        *                     or, if there are no highlighted Parts, the first selected Part.
-        */
-        scrollToPart(part?: Part): void;
-
-        /**
-        * Select all of the selectable Parts in the diagram.
-        */
-        selectAll(): void;
-
-        /**
-        * Open the context menu of a given GraphObject.
-        * The given GraphObject must have a GraphObject.contextMenu
-        * defined in order to show anything.
-        * @param {GraphObject|Diagram=} obj a GraphObject or Diagram with a contextMenu defined.
-        * If none is given, this method will use the first selected object, or else the Diagram.
-        */
-        showContextMenu(obj?: GraphObject | Diagram): void;
-
-        /**
-        * Cancel the operation of the current tool.
-        */
-        stopCommand(): void;
-
-        /**
-        * Call UndoManager.undo.
-        */
-        undo(): void;
-
-        /**
-        * Remove the group from the diagram without removing its members from the diagram.
-        * @param {Group=} group if supplied, ignore the selection and consider ungrouping this particular Group.
-        */
-        ungroupSelection(group?: Group): void;
-
-        /**
-        * Change the Diagram.scale so that the Diagram.documentBounds fits within the viewport.
-        */
-        zoomToFit(): void;
-    }
-
-    /**
-    * A Diagram is associated with an HTML DIV element. Constructing a Diagram creates
-    * an HTML Canvas element which it places inside of the given DIV element, in addition to several helper divs.
-    * GoJS will manage the contents of this DIV, and the contents should not be modified otherwise,
-    * though the given DIV may be styled (background, border, etc) and positioned as needed.
-    */
-    class Diagram {
-        /**
-        * Construct an empty Diagram for a particular DIV HTML element.
-        * @param {HTMLDivElement} div A reference to a DIV HTML element in the DOM.
-        * If no DIV is supplied one will be created in memory. The Diagram's Diagram.div property
-        * can then be set later on.
-        */
-        constructor(div: HTMLDivElement);
-
-        /**
-        * Construct an empty Diagram for a particular DIV HTML element.
-        * @param {string=} div The ID of a DIV element in the DOM.
-        * If no DIV identifier is supplied one will be created in memory. The Diagram's Diagram.div property
-        * can then be set later on.
-        */
-        constructor(div?: string);
-
-        /**Gets or sets whether the user may copy to or paste parts from the internal clipboard.*/
-        allowClipboard: boolean;
-
-        /**Gets or sets whether the user may copy objects.*/
-        allowCopy: boolean;
-
-        /**Gets or sets whether the user may delete objects from the Diagram.*/
-        allowDelete: boolean;
-
-        /**Gets or sets whether the user may start a drag-and-drop in this Diagram, possibly dropping in a different element.*/
-        allowDragOut: boolean;
-
-        /**Gets or sets whether the user may end a drag-and-drop operation in this Diagram.*/
-        allowDrop: boolean;
-
-        /**Gets or sets whether the user may group parts together.*/
-        allowGroup: boolean;
-
-        /**Gets or sets whether the user is allowed to use the horizontal scrollbar.*/
-        allowHorizontalScroll: boolean;
-
-        /**Gets or sets whether the user may add parts to the Diagram.*/
-        allowInsert: boolean;
-
-        /**Gets or sets whether the user may draw new links.*/
-        allowLink: boolean;
-
-        /**Gets or sets whether the user may move objects.*/
-        allowMove: boolean;
-
-        /**Gets or sets whether the user may reconnect existing links.*/
-        allowRelink: boolean;
-
-        /**Gets or sets whether the user may reshape parts.*/
-        allowReshape: boolean;
-
-        /**Gets or sets whether the user may resize parts.*/
-        allowResize: boolean;
-
-        /**Gets or sets whether the user may rotate parts.*/
-        allowRotate: boolean;
-
-        /**Gets or sets whether the user may select objects.*/
-        allowSelect: boolean;
-
-        /**Gets or sets whether the user may do in-place text editing.*/
-        allowTextEdit: boolean;
-
-        /**Gets or sets whether the user may undo or redo any changes.*/
-        allowUndo: boolean;
-
-        /**Gets or sets whether the user may ungroup existing groups.*/
-        allowUngroup: boolean;
-
-        /**Gets or sets whether the user is allowed to use the vertical scrollbar.*/
-        allowVerticalScroll: boolean;
-
-        /**Gets or sets whether the user may zoom into or out of the Diagram.*/
-        allowZoom: boolean;
-
-        /**This read-only property returns the AnimationManager for this Diagram.*/
-        animationManager: AnimationManager;
-
-        /**Gets or sets the autoScale of the Diagram, controlling whether or not the Diagram's bounds automatically scale to fit the view.*/
-        autoScale: EnumValue;
-
-        /**Gets or sets the Margin (or number for a uniform Margin) that describes the Diagram's autoScrollRegion.*/
-        autoScrollRegion: MarginLike;
-
-        /**Gets or sets the function to execute when the user single-primary-clicks on the background of the Diagram.*/
-        click: (e: InputEvent) => void;
-
-        /**Gets or sets the CommandHandler for this Diagram.*/
-        commandHandler: CommandHandler;
-
-        /**Gets or sets the content alignment Spot of this Diagram, to be used in determining how parts are positioned when the .viewportBounds width or height is smaller than the .documentBounds.*/
-        contentAlignment: Spot;
-
-        /**Gets or sets the function to execute when the user single-secondary-clicks on the background of the Diagram.*/
-        contextClick: (e: InputEvent) => void;
-
-        /**This Adornment is shown when the use context clicks in the background.*/
-        contextMenu: Adornment;
-
-        /**Gets or sets the current cursor for the Diagram, overriding the .defaultCursor.*/
-        currentCursor: string;
-
-        /**Gets or sets the current tool for this Diagram that handles all input events.*/
-        currentTool: Tool;
-
-        /**Gets or sets the cursor to be used for the Diagram when no GraphObject specifies a different cursor.*/
-        defaultCursor: string;
-
-        /**Gets or sets the default tool for this Diagram that becomes the current tool when the current tool stops.*/
-        defaultTool: Tool;
-
-        /**Gets or sets the Diagram's HTMLDivElement, via an HTML Element ID.*/
-        div: HTMLDivElement;
-
-        /**This read-only property returns the model-coordinate bounds of the Diagram.*/
-        documentBounds: Rect;
-
-        /**Gets or sets the function to execute when the user double-primary-clicks on the background of the Diagram.*/
-        doubleClick: (e: InputEvent) => void;
-
-        /**Gets or sets the most recent mouse-down InputEvent that occurred.*/
-        firstInput: InputEvent;
-
-        /**Gets or sets a fixed bounding rectangle to be returned by .documentBounds and .computeBounds.*/
-        fixedBounds: Rect;
-
-        /**Gets or sets the scrollMode of the Diagram.*/
-        scrollMode: EnumValue;
-
-        /**Gets or sets the Margin (or number for a uniform Margin) that describes a scrollable area that surrounds the document bounds, allowing the user to scroll into empty space.*/
-        scrollMargin: MarginLike;
-
-        /**Gets or sets the function used to determine the position that this Diagram can be scrolled or moved to.*/
-        positionComputation: (d: Diagram, p: Point) => Point;
-
-        /**Gets or sets the function used to determine the scale that this Diagram can be set to.*/
-        scaleComputation: (d: Diagram, s: number) => number;
-
-        /**Gets or sets a Panel of type Panel.Grid acting as the background grid extending across the whole viewport of this diagram.*/
-        grid: Panel;
-
-        /**Gets or sets the default selection Adornment template, used to adorn selected Groups.*/
-        groupSelectionAdornmentTemplate: Adornment;
-
-        /**Gets or sets the default Group template used as the archetype for group data that is added to the .model.*/
-        groupTemplate: Group;
-
-        /**Gets or sets a Map mapping template names to Groups.*/
-        groupTemplateMap: Map<string,Group>;
-
-        /**Gets or sets whether the Diagram has a horizontal Scrollbar.*/
-        hasHorizontalScrollbar: boolean;
-
-        /**Gets or sets whether the Diagram has a vertical Scrollbar.*/
-        hasVerticalScrollbar: boolean;
-
-        /**This read-only property returns the read-only collection of highlighted Parts.*/
-        highlighteds: Set<Part>;
-
-        /**Gets or sets the initialAutoScale of the Diagram.*/
-        initialAutoScale: EnumValue;
-
-        /**Gets or sets the initial content alignment Spot of this Diagram, to be used in determining how parts are positioned initially relative to the viewport.*/
-        initialContentAlignment: Spot;
-
-        /**Gets or sets the spot in the document's area that should be coincident with the .initialViewportSpot of the viewport when the document is first initialized.*/
-        initialDocumentSpot: Spot;
-
-        /**Gets or sets the initial coordinates of this Diagram in the viewport, eventually setting the .position.*/
-        initialPosition: Point;
-
-        /**Gets or sets the initial scale of this Diagram in the viewport, eventually setting the .scale.*/
-        initialScale: number;
-
-        /**Gets or sets the spot in the viewport that should be coincident with the .initialDocumentSpot of the document when the document is first initialized.*/
-        initialViewportSpot: Spot;
-
-        /**Gets or sets whether the user may interact with the Diagram.*/
-        isEnabled: boolean;
-
-        /**Gets or sets whether the Diagram's Diagram.model is Model.isReadOnly.*/
-        isModelReadOnly: boolean;
-
-        /**Gets or sets whether this Diagram's state has been modified.*/
-        isModified: boolean;
-
-        /**Gets or sets whether mouse events initiated within the Diagram will be captured.*/
-        isMouseCaptured: boolean;
-
-        /**Gets or sets whether the Diagram may be modified by the user, while still allowing the user to scroll, zoom, and select.*/
-        isReadOnly: boolean;
-
-        /**Gets or sets whether the Diagram tree structure is defined by links going from the parent node to their children, or vice-versa.*/
-        isTreePathToChildren: boolean;
-
-        /**Gets or sets the last InputEvent that occurred.*/
-        lastInput: InputEvent;
-
-        /**Gets an iterator for this Diagram's Layers.*/
-        layers: Iterator<Layer>;
-
-        /**Gets or sets the Layout used to position all of the top-level nodes and links in this Diagram.*/
-        layout: Layout;
-
-        /**Returns an iterator of all Links in the Diagram.*/
-        links: Iterator<Link>;
-
-        /**Gets or sets the default selection Adornment template, used to adorn selected Links.*/
-        linkSelectionAdornmentTemplate: Adornment;
-
-        /**Gets or sets the default Link template used as the archetype for link data that is added to the .model.*/
-        linkTemplate: Link;
-
-        /**Gets or sets a Map mapping template names to Links.*/
-        linkTemplateMap: Map<string,Link>;
-
-        /**Gets or sets the largest value that .scale may take.*/
-        maxScale: number;
-
-        /**Gets or sets the maximum number of selected objects.*/
-        maxSelectionCount: number;
-
-        /**Gets or sets the smallest value greater than zero that .scale may take.*/
-        minScale: number;
-
-        /**Gets or sets the Model holding data corresponding to the data-bound nodes and links of this Diagram.*/
-        model: Model;
-
-        /**Gets or sets the function to execute when the user is dragging the selection in the background of the Diagram during a DraggingTool drag-and-drop, not over any GraphObjects.*/
-        mouseDragOver: (e: InputEvent) => void;
-
-        /**Gets or sets the function to execute when the user drops the selection in the background of the Diagram at the end of a DraggingTool drag-and-drop, not onto any GraphObjects.*/
-        mouseDrop: (e: InputEvent) => void;
-
-        /**Gets or sets the function to execute when the user holds the mouse stationary in the background of the Diagram while holding down a button, not over any GraphObjects.*/
-        mouseHold: (e: InputEvent) => void;
-
-        /**Gets or sets the function to execute when the user holds the mouse stationary in the background of the Diagram without holding down any buttons, not over any GraphObjects.*/
-        mouseHover: (e: InputEvent) => void;
-
-        /**Gets or sets the function to execute when the user moves the mouse in the background of the Diagram without holding down any buttons, not over any GraphObjects.*/
-        mouseOver: (e: InputEvent) => void;
-
-        /**Returns an iterator of all Nodes and Groups in the Diagram.*/
-        nodes: Iterator<Node>;
-
-        /**Gets or sets the default selection Adornment template, used to adorn selected Parts other than Groups or Links.*/
-        nodeSelectionAdornmentTemplate: Adornment;
-
-        /**Gets or sets the default Node template used as the archetype for node data that is added to the .model.*/
-        nodeTemplate: Part;
-
-        /**Gets or sets a Map mapping template names to Parts.*/
-        nodeTemplateMap: Map<string,Part>;
-
-        /**Gets or sets the Margin (or number for a uniform Margin) that describes the Diagram's padding, which controls how much extra space there is around the area occupied by the document.*/
-        padding: MarginLike;
-
-        /**Returns an iterator of all Parts in the Diagram that are not Nodes or Links or Adornments.*/
-        parts: Iterator<Part>;
-
-        /**Gets or sets the coordinates of this Diagram in the viewport.*/
-        position: Point;
-
-        /**Gets or sets the scale transform of this Diagram.*/
-        scale: number;
-
-        /**Gets or sets the distance in screen pixels that the horizontal scrollbar will scroll when scrolling by a line.*/
-        scrollHorizontalLineChange: number;
-
-        /**Gets or sets the distance in screen pixels that the vertical scrollbar will scroll when scrolling by a line.*/
-        scrollVerticalLineChange: number;
-
-        /**This read-only property returns the read-only collection of selected Parts.*/
-        selection: Set<Part>;
-
-        /**Gets or sets whether ChangedEvents are not recorded by the UndoManager.*/
-        skipsUndoManager: boolean;
-
-        /**This read-only property returns the ToolManager for this Diagram.*/
-        toolManager: ToolManager;
-
-        /**This Adornment is shown when the mouse stays motionless in the background.*/
-        toolTip: Adornment;
-
-        /**This read-only property returns the UndoManager for this Diagram, which actually belongs to the .model.*/
-        undoManager: UndoManager;
-
-        /**Gets or sets what kinds of graphs this diagram allows the user to draw.*/
-        validCycle: EnumValue;
-
-        /**This read-only property returns the bounds of the portion of the Diagram that is viewable from its HTML Canvas.*/
-        viewportBounds: Rect;
-
-        /**Gets or sets the point, in viewport coordinates, where changes to the .scale will keep the focus in the document.*/
-        zoomPoint: Point;
-
-        /**
-        * Adds a Part to the Layer that matches the Part's Part.layerName, or else to the default layer, which is named with the empty string.
-        * @param {Part} part
-        */
-        add(part: Part): void;
-
-        /**
-        * Register an event handler that is called when there is a ChangedEvent.
-        * @param {function(ChangedEvent)} listener a function that takes a ChangedEvent as its argument.
-        */
-        addChangedListener(listener: (e: ChangedEvent) => void ): void;
-
-        /**
-        * Register an event handler that is called when there is a DiagramEvent of a given name.
-        * @param {string} name the name is normally capitalized, but this method uses case-insensitive comparison.
-        * @param {function(DiagramEvent)} listener a function that takes a DiagramEvent as its argument.
-        */
-        addDiagramListener(name: string, listener: (e: DiagramEvent) => void ): void;
-
-        /**
-        * Register an event handler that is called when there is a ChangedEvent for the Diagram's Model.
-        * @param {function(ChangedEvent)} listener a function that takes a ChangedEvent as its argument.
-        */
-        addModelChangedListener(listener: (e: ChangedEvent) => void ): void;
-
-        /**
-        * Adds a Layer to the list of layers.
-        * @param {Layer} layer The Layer to add.
-        */
-        addLayer(layer: Layer): void;
-
-        /**
-        * Adds a layer to the list of layers after a specified layer.
-        * @param {Layer} layer The Layer to add.
-        * @param {Layer} existingLayer The layer to insert after.
-        */
-        addLayerAfter(layer: Layer, existingLayer: Layer): void;
-
-        /**
-        * Adds a layer to the list of layers before a specified layer.
-        * @param {Layer} layer The Layer to add.
-        * @param {Layer} existingLayer The layer to insert before.
-        */
-        addLayerBefore(layer: Layer, existingLayer: Layer): void;
-
-        /**
-        * Aligns the Diagram's .position based on a desired document Spot and viewport Spot.
-        * @param {Spot} documentspot
-        * @param {Spot} viewportspot
-        */
-        alignDocument(documentspot: Spot, viewportspot: Spot): void;
-
-        /**
-        * Modifies the .position to show a given Rect of the Diagram by centering the viewport on that Rect.
-        * @param {Rect} r
-        */
-        centerRect(r: Rect): void;
-
-        /**
-        * Removes all Parts from the Diagram, including unbound Parts and the background grid, and also clears out the Model and UndoManager.
-        */
-        clear(): void;
-
-        /**
-        * Remove highlights from all Parts.
-        */
-        clearHighlighteds(): void;
-
-        /**
-        * Deselect all selected Parts.
-        */
-        clearSelection(): void;
-
-        /**
-        * Commit the changes of the current transaction.
-        * This just calls UndoManager.commitTransaction.
-        * @param {string=} tname a descriptive name for the transaction.
-        */
-        commitTransaction(tname?: string): boolean;
-
-        /**
-        * This is called during a Diagram update to determine a new value for .documentBounds.
-        */
-        computeBounds(): Rect;
-
-        /**
-        * Find the union of the GraphObject.actualBounds of all of the Parts in the given collection.
-        * @param {Iterable<Part>} coll a collection of Parts.
-        */
-        computePartsBounds(coll: Iterable<Part>): Rect;
-
-        /**
-        * Make a copy of a collection of Parts and return them in a Map mapping each original Part to its copy.
-        * @param {Iterable<Part>} coll  A List or a Set or Iterator of Parts.
-        * @param {Diagram} diagram  The destination diagram; if null, the copied parts are not added to this diagram.
-        * @param {boolean} check  Whether to check Part.canCopy on each part.
-        */
-        copyParts(coll: Iterable<Part>, diagram: Diagram, check: boolean): void;
-
-        /**
-        * Updates the diagram immediately, then resets initialization flags so that actions taken in the argument function will be considered part of Diagram initialization, and will participate in initial layouts, .initialAutoScale, .initialContentAlignment, etc.
-        * @param {function()|null=} func an optional function of actions to perform as part of another diagram initialization.
-        */
-        delayInitialization(func?: () => void ): void;
-
-        /**
-        * Finds a layer with a given name.
-        * @param {string} name
-        */
-        findLayer(name: string): Layer;
-
-        /**
-        * Look for a Link corresponding to a GraphLinksModel's link data object.
-        * @param {Object} linkdata
-        */
-        findLinkForData(linkdata: Object): Link;
-
-        /**
-        * Return a collection of Links that are bound to data whose properties have values
-        * that match those specified by the given example data.
-        * @param {...Object} examples
-        */
-        findLinksByExample(...examples: Array<Object>): Iterator<Link>;
-
-        /**
-        * Look for a Node or Group corresponding to a model's node data object.
-        * @param {Object} nodedata
-        */
-        findNodeForData(nodedata: Object): Node;
-
-        /**
-        * Look for a Node or Group corresponding to a model's node data object's unique key.
-        * @param {*} key a string or number.
-        */
-        findNodeForKey(key: Key): Node;
-
-        /**
-        * Return a collection of Nodes and Groups that are bound to data whose properties have values
-        * that match those specified by the given example data.
-        * @param {...Object} examples
-        */
-        findNodesByExample(...examples: Array<Object>): Iterator<Node>;
-
-        /**
-        * Find the front-most GraphObject at the given point in document coordinates.
-        * @param {Point} p A Point in document coordinates.
-        * @param {function(GraphObject):GraphObject | null=} navig A function taking a GraphObject and
-        * returning a GraphObject, defaulting to the identity.
-        * @param {function(GraphObject):boolean | null=} pred A function taking the GraphObject
-        * returned by navig and returning true if that object should be returned,
-        * defaulting to a predicate that always returns true.
-        */
-        findObjectAt(p: Point, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean): GraphObject;
-
-        /**
-        * Return a collection of the GraphObjects at the given point in document coordinates.
-        * @param {Point} p A Point in document coordinates.
-        * @param {function(GraphObject):GraphObject | null=} navig A function taking a GraphObject and
-        * returning a GraphObject, defaulting to the identity.
-        * If this function returns null, the given GraphObject will not be included in the results.
-        * @param {function(GraphObject):boolean | null=} pred A function taking the GraphObject
-        * returned by navig and returning true if that object should be returned,
-        * defaulting to a predicate that always returns true.
-        * @param {List|Set=} coll An optional collection (List or Set) to add the results to.
-        */
-        findObjectsAt(p: Point, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, coll?: List<GraphObject>): List<GraphObject>;
-        findObjectsAt(p: Point, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, coll?: Set<GraphObject>): Set<GraphObject>;
-
-        /**
-        * Returns a collection of all GraphObjects that are inside or that intersect a given Rect in document coordinates.
-        * @param {Rect} r A Rect in document coordinates.
-        * @param {function(GraphObject):GraphObject | null=} navig A function taking a GraphObject and
-        * returning a GraphObject, defaulting to the identity.
-        * If this function returns null, the given GraphObject will not be included in the results.
-        * @param {function(GraphObject):boolean | null=} pred A function taking the GraphObject
-        * returned by navig and returning true if that object should be returned,
-        * defaulting to a predicate that always returns true.
-        * @param {boolean=} partialInclusion Whether an object can match if it merely intersects the rectangular area (true) or
-        * if it must be entirely inside the rectangular area (false).  The default value is false.
-        * @param {List|Set=} coll An optional collection (List or Set) to add the results to.
-        */
-        findObjectsIn(r: Rect, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: List<GraphObject>): List<GraphObject>;
-        findObjectsIn(r: Rect, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: Set<GraphObject>): Set<GraphObject>;
-
-        /**
-        * Returns a collection of all GraphObjects that are within a certain distance of a given point in document coordinates.
-        * @param {Point} p A Point in document coordinates.
-        * @param {number} dist The distance from the point.
-        * @param {function(GraphObject):GraphObject | null=} navig A function taking a GraphObject and
-        * returning a GraphObject, defaulting to the identity.
-        * If this function returns null, the given GraphObject will not be included in the results.
-        * @param {function(GraphObject):boolean | null=} pred A function taking the GraphObject
-        * returned by navig and returning true if that object should be returned,
-        * defaulting to a predicate that always returns true.
-        * @param {boolean=} partialInclusion Whether an object can match if it merely intersects the circular area (true) or
-        * if it must be entirely inside the circular area (false).  The default value is true.
-        * The default is true.
-        * @param {List|Set=} coll An optional collection (List or Set) to add the results to.
-        */
-        findObjectsNear(p: Point, dist: number, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: List<GraphObject>): List<GraphObject>;
-        findObjectsNear(p: Point, dist: number, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: Set<GraphObject>): Set<GraphObject>;
-
-        /**
-        * This convenience function finds the front-most Part that is at a given point and that might be selectable.
-        * @param {Point} p a Point in document coordinates.
-        * @param {boolean} selectable Whether to only consider parts that are Part.selectable.
-        */
-        findPartAt(p: Point, selectable: boolean): Part;
-
-        /**
-        * Look for a Part, Node, Group, or Link corresponding to a Model's data object.
-        * @param {Object} data
-        */
-        findPartForData(data: Object): Part;
-
-        /**
-        * Look for a Part or Node or Group corresponding to a model's data object's unique key.
-        * @param {*} key a string or number.
-        */
-        findPartForKey(key: Key): Part;
-
-        /**
-        * Returns an iterator of all Groups that are at top-level, in other words that are not themselves inside other Groups.
-        */
-        findTopLevelGroups(): Iterator<Group>;
-
-        /**
-        * Returns an iterator of all top-level Nodes that have no tree parents.
-        */
-        findTreeRoots(): Iterator<Node>;
-
-        /**
-        * Explicitly bring focus to the Diagram's canvas.
-        */
-        focus(): void;
-
-        /**
-        * This static function gets the Diagram that is attached to an HTML DIV element.
-        * @param {HTMLDivElement} div
-        */
-        static fromDiv(div: HTMLDivElement): Diagram;
-
-        /**
-        * Make the given part the only highlighted part.
-        * @param {Part} part
-        */
-        highlight(part: Part): void;
-
-        /**
-        * Highlight all of the Parts supplied in the given collection, and clear all other highlighted Parts.
-        * @param {Iterable<Part>|Array<Part>} coll an Iterable of Parts
-        */
-        highlightCollection(coll: Iterable<Part> | Array<Part>): void;
-
-        /**
-        * This static function declares that a class (constructor function) derives from another class -- but please note that most classes do not support inheritance.
-        * @param {Function} derivedclass
-        * @param {Function} baseclass
-        */
-        static inherit(derivedclass: Constructor, baseclass: Constructor): void;
-
-        /**
-        * Perform all invalid layouts.
-        * @param {boolean=} invalidateAll If true, this will explicitly set Layout.isValidLayout to false on each Layout in the diagram.
-        */
-        layoutDiagram(invalidateAll?: boolean): void;
-
-        /**
-        * Create an HTMLImageElement that contains a bitmap of the current Diagram.
-        * @param {Object=} properties For details see the argument description of .makeImageData.
-        */
-        makeImage(properties?: {
-            size?: Size,
-            scale?: number,
-            maxSize?: Size,
-            position?: Point,
-            parts?: Iterable<Part>,
-            padding?: MarginLike,
-            background?: BrushLike,
-            showTemporary?: boolean,
-            showGrid?: boolean,
-            document?: Document,
-            type?: string,
-            details?: any
-          }): HTMLImageElement;
-
-        /**
-        * Create a bitmap of the current Diagram encoded as a base64 string.
-        * @param {Object=} properties a JavaScript object detailing optional arguments for image creation, to be passed to makeImageData.
-        */
-        makeImageData(properties?: {
-            size?: Size,
-            scale?: number,
-            maxSize?: Size,
-            position?: Point,
-            parts?: Iterable<Part>,
-            padding?: MarginLike,
-            background?: BrushLike,
-            showTemporary?: boolean,
-            showGrid?: boolean,
-            document?: Document,
-            type?: string,
-            details?: any
-          }): string;
-
-        /**
-        * Create an SVGElement that contains a SVG rendering of the current Diagram.
-        * By default this method returns a snapshot of the visible diagram, but optional arguments give more options.
-        * @param {Object=} properties a JavaScript object detailing optional arguments for SVG creation.
-        * @return {SVGElement}
-        */
-        makeSvg(properties?: {
-            size?: Size,
-            scale?: number,
-            maxSize?: Size,
-            position?: Point,
-            parts?: Iterable<Part>,
-            padding?: MarginLike,
-            background?: BrushLike,
-            showTemporary?: boolean,
-            showGrid?: boolean,
-            document?: Document,
-            elementFinished?: (obj: GraphObject, elt: SVGElement) => void
-          }): SVGElement;
-
-        /**
-        * Move a collection of Parts in this Diagram by a given offset.
-        * @param {Iterable<Part>} coll  A List or a Set or Iterator of Parts.
-        * @param {Point} offset  the X and Y change to be made to each Part, in document coordinates.
-        * @param {boolean} check  Whether to check Part.canMove on each part.
-        */
-        moveParts(coll: Iterable<Part>, offset: Point, check: boolean): void;
-
-        /**
-        * Remove all of the Parts created from model data and then create them again.
-        */
-        rebuildParts(): void;
-
-        /**
-        * Removes a Part from its Layer, provided the Layer is in this Diagram.
-        * @param {Part} part
-        */
-        remove(part: Part): void;
-
-        /**
-        * Unregister an event handler listener.
-        * @param {function(ChangedEvent)} listener a function that takes a ChangedEvent as its argument.
-        */
-        removeChangedListener(listener: (e: ChangedEvent) => void ): void;
-
-        /**
-        * Unregister a DiagramEvent handler.
-        * @param {string} name the name is normally capitalized, but this method uses case-insensitive comparison.
-        * @param {function(DiagramEvent)} listener a function that takes a DiagramEvent as its argument.
-        */
-        removeDiagramListener(name: string, listener: (e: DiagramEvent) => void ): void;
-
-        /**
-        * Unregister an event handler listener for the Diagram's Model.
-        * @param {function(ChangedEvent)} listener a function that takes a ChangedEvent as its argument.
-        */
-        removeModelChangedListener(listener: (e: ChangedEvent) => void ): void;
-
-        /**
-        * Removes the given layer from the list of layers.
-        * @param {Layer} layer
-        */
-        removeLayer(layer: Layer): void;
-
-        /**
-        * This method removes from this Diagram all of the Parts in a collection.
-        * @param {Iterable<Part>|Array<Part>} coll A List or Set or Iterator of Parts.
-        * @param {boolean} check Whether to check Part.canDelete on each part.
-        */
-        removeParts(coll: Iterable<Part> | Array<Part>, check: boolean): void;
-
-        /**
-        * Requests that in the near-future the diagram makes sure all GraphObjects are arranged,
-        * recomputes the document bounds, updates the scrollbars, and redraws the viewport.
-        * Usage of this method is uncommon and may affect performance --
-        * for efficiency do not call this method unless you have a well-defined need.
-        * Normally, GoJS updates the diagram automatically, and completeing a transaction ensures an immediate update.
-        * <p>
-        * @param {boolean=} alwaysQueueUpdate If true the Diagram will queue another update,
-        * even if an update is already occurring. The default value is false.
-        * Side effects in an "InitialLayoutCompleted" DiagramEvent listener might necessitate setting this parameter.
-        */
-        requestUpdate(alwaysQueueUpdate?: boolean): void;
-
-        /**
-        * Rollback the current transaction, undoing any recorded changes.
-        * This just calls UndoManager.rollbackTransaction.
-        */
-        rollbackTransaction(): boolean;
-
-        /**
-        * Scrolling function used by primarily by .commandHandler's CommandHandler.doKeyDown.
-        * @param {string} unit A string representing the unit of the scroll operation. Can be 'pixel', 'line', or 'page'.
-        * @param {string} dir The direction of the scroll operation. Can be 'up', 'down', 'left', or 'right'.
-        * @param {number=} dist An optional distance multiplier, for multiple pixels, lines, or pages. Default is 1.
-        */
-        scroll(unit: string, dir: string, dist?: number): void;
-
-        /**
-        * Modifies the .position to show a given Rect of the Diagram by centering the viewport on that Rect.
-        * @param {Rect} r
-        */
-        scrollToRect(r: Rect): void;
-
-        /**
-        * Make the given object the only selected object.
-        * @param {GraphObject} part a GraphObject that is already in a layer of this Diagram.
-        * If the value is null, this does nothing.
-        */
-        select(part: Part): void;
-
-        /**
-        * Select all of the Parts supplied in the given collection.
-        * @param {Iterable<Part>|Array<Part>} coll a List or Set of Parts to be selected.
-        */
-        selectCollection(coll: Iterable<Part> | Array<Part>): void;
-
-        /**
-        * This method sets a collection of properties according to the property/value pairs that have been set on the given Object,
-        * in the same manner as GraphObject.make does when constructing a Diagram with an argument that is a simple JavaScript Object.
-        */
-        setProperties(props: Object): void;
-
-        /**
-        * Begin a transaction, where the changes are held by a Transaction object in the UndoManager.
-        * This just calls UndoManager.startTransaction.
-        * @param {string=} tname a descriptive name for the transaction.
-        */
-        startTransaction(tname?: string): boolean;
-
-        /**
-        * Given a Point in document coordinates, return a new Point in viewport coordinates.
-        * @param {Point} p
-        */
-        transformDocToView(p: Point): Point;
-
-        /**
-        * Given a point in viewport coordinates, return a new point in document coordinates.
-        * @param {Point} p
-        */
-        transformViewToDoc(p: Point): Point;
-
-        /**
-        * Update all of the data-bound properties of Nodes and Links in this diagram.
-        */
-        updateAllTargetBindings(): void;
-
-        /**
-        * Update all of the references to nodes in case they had been modified in the model without
-        * properly notifying the model by calling GraphLinksModel.setGroupKeyForNodeData or
-        * GraphLinksModel.setToKeyForLinkData or other similar methods.
-        */
-        updateAllRelationshipsFromData(): void;
-
-        /**
-        * Scales the Diagram to uniformly fit into the viewport.
-        */
-        zoomToFit(): void;
-
-        /**
-        * Modifies the .scale and .position of the Diagram so that the viewport displays a given document-coordinates rectangle.
-        * @param {Rect} r rectangular bounds in document coordinates.
-        * @param {EnumValue=} scaling an optional value of either .Uniform (the default) or .UniformToFill.
-        */
-        zoomToRect(r: Rect, scaling?: EnumValue): void;
-
-        /**This value for Diagram.validCycle states that there are no restrictions on making cycles of links.*/
-        static CycleAll: EnumValue;
-
-        /**This value for Diagram.validCycle states that any number of destination links may go out of a node, but at most one source link may come into a node, and there are no directed cycles.*/
-        static CycleDestinationTree: EnumValue;
-
-        /**This value for Diagram.validCycle states that a valid link from a node will not produce a directed cycle in the graph.*/
-        static CycleNotDirected: EnumValue;
-
-        /**This value for Diagram.validCycle states that a valid link from a node will not produce an undirected cycle in the graph.*/
-        static CycleNotUndirected: EnumValue;
-
-        /**This value for Diagram.validCycle states that any number of source links may come into a node, but at most one destination link may go out of a node, and there are no directed cycles.*/
-        static CycleSourceTree: EnumValue;
-
-        /**The default autoScale type, used as the value of Diagram.autoScale: The Diagram does not attempt to scale its bounds to fit the view.*/
-        static None: EnumValue;
-
-        /**Diagrams with this autoScale type, used as the value of Diagram.autoScale, are scaled uniformly until the documentBounds fits in the view.*/
-        static Uniform: EnumValue;
-
-        /**Diagrams with this autoScale type, used as the value of Diagram.autoScale, are scaled uniformly until the documentBounds fits in the view.*/
-        static UniformToFill: EnumValue;
-
-        /**This value for Diagram.scrollMode states that the viewport constrains scrolling to the Diagram document bounds.*/
-        static DocumentScroll: EnumValue;
-
-        /**This value for Diagram.scrollMode states that the viewport does not constrain scrolling to the Diagram document bounds.*/
-        static InfiniteScroll: EnumValue;
-
-        /** This value for Diagram.treeCollapsePolicy states that only the Node.findTreeParentNode's Node.isTreeExpanded property determines whether a "child" node is visible.*/
-        static TreeParentCollapsed: EnumValue;  // undocumented
-
-        /** This value for Diagram.treeCollapsePolicy states that all of the Node.findNodesInto or Node.findNodesOutOf, depending on Diagram.isTreePathToChildren being true or false, need to be not Node.isTreeExpanded in order for a "child" node to be not visible.*/
-        static AllParentsCollapsed: EnumValue;  // undocumented
-
-        treeCollapsePolicy: EnumValue;  // undocumented
-        getRenderingHint(name: string): any;  // undocumented
-        setRenderingHint(name: string, val: any): void;  // undocumented
-        getInputOption(name: string): any;  // undocumented
-        setInputOption(name: string, val: any): void;  // undocumented
-        maybeUpdate(): void;  // undocumented
-        reset(): void;  // undocumented
-        simulatedMouseMove(e: Event, modelpt: Point, overdiag?: Diagram): boolean;  // undocumented
-        simulatedMouseUp(e: Event, other: Diagram, modelpt: Point, curdiag?: Diagram): boolean;  // undocumented
-    }
-
-    /**
-    * A DiagramEvent represents a more abstract event than an InputEvent.
-    * They are raised on the Diagram class.
-    * One can receive such events by registering a DiagramEvent listener on a Diagram
-    * by calling Diagram.addDiagramListener.
-    * Some DiagramEvents such as "ObjectSingleClicked" are normally
-    * associated with InputEvents.
-    * Some DiagramEvents such as "SelectionMoved" or "PartRotated" are associated with the
-    * results of Tool-handled gestures or CommandHandler actions.
-    * Some DiagramEvents are not necessarily associated with any input events at all,
-    * such as "ViewportBoundsChanged", which can happen due to programmatic
-    * changes to the Diagram.position and Diagram.scale properties.
-    */
-    class DiagramEvent {
-        /**
-        * The DiagramEvent class constructor produces an empty DiagramEvent.
-        */
-        constructor();
-
-        /**Gets or sets whether any default actions associated with this diagram event should be avoided or cancelled.*/
-        cancel: boolean;
-
-        /**This read-only property returns the diagram associated with the event.*/
-        diagram: Diagram;
-
-        /**Gets or sets the name of the kind of diagram event that this represents.*/
-        name: string;
-
-        /**Gets or sets an optional object that describes the change to the subject of the diagram event.*/
-        parameter: any;
-
-        /**Gets or sets an optional object that is the subject of the diagram event.*/
-        subject: any;
-    }
-
-    /**
-    * This is the abstract base class for all graphical objects.
-    */
-    abstract class GraphObject {
-        /**
-        * This is an abstract class, so you should not use this constructor.
-        */
-        constructor();
-
-        /**Gets or sets the function to execute when the ActionTool is cancelled and this GraphObject's .isActionable is set to true.*/
-        actionCancel: (e: InputEvent, obj: GraphObject) => void;
-
-        /**Gets or sets the function to execute on a mouse-down event when this GraphObject's .isActionable is set to true.*/
-        actionDown: (e: InputEvent, obj: GraphObject) => void;
-
-        /**Gets or sets the function to execute on a mouse-move event when this GraphObject's .isActionable is set to true.*/
-        actionMove: (e: InputEvent, obj: GraphObject) => void;
-
-        /**Gets or sets the function to execute on a mouse-up event when this GraphObject's .isActionable is set to true.*/
-        actionUp: (e: InputEvent, obj: GraphObject) => void;
-
-        /**This read-only property returns the bounds of this GraphObject in container coordinates.*/
-        actualBounds: Rect;
-
-        /**Gets or sets the alignment Spot of this GraphObject used in Panel layouts, to determine where in the area allocated by the panel this object should be placed.*/
-        alignment: Spot;
-
-        /**Gets or sets the spot on this GraphObject to be used as the alignment point in Spot and Fixed Panels.*/
-        alignmentFocus: Spot;
-
-        /**Gets or sets the angle transform, in degrees, of this GraphObject.*/
-        angle: number;
-
-        /**Gets or sets the areaBackground Brush (or CSS color string) of this GraphObject.*/
-        areaBackground: BrushLike;
-
-        /**Gets or sets the background Brush (or CSS color string) of this GraphObject, filling the rectangle of this object's local coordinate space.*/
-        background: BrushLike;
-
-        /**Gets or sets the function to execute when the user single-primary-clicks on this object.*/
-        click: (e: InputEvent, obj: GraphObject) => void;
-
-        /**Gets or sets the column of this GraphObject if it is in a Table Panel.*/
-        column: number;
-
-        /**Gets or sets the number of columns spanned by this GraphObject if it is in a Table Panel.*/
-        columnSpan: number;
-
-        /**Gets or sets the function to execute when the user single-secondary-clicks on this object.*/
-        contextClick: (e: InputEvent, obj: GraphObject) => void;
-
-        /**This Adornment is shown upon a context click on this object.*/
-        contextMenu: Adornment;
-
-        /**Gets or sets the mouse cursor to use when the mouse is over this object with no mouse buttons pressed.*/
-        cursor: string;
-
-        /**Gets or sets the desired size of this GraphObject in local coordinates.*/
-        desiredSize: Size;
-
-        /**This read-only property returns the Diagram that this GraphObject is in, if it is.*/
-        diagram: Diagram;
-
-        /**Gets or sets the function to execute when the user double-primary-clicks on this object.*/
-        doubleClick: (e: InputEvent, obj: GraphObject) => void;
-
-        /**Gets or sets how the direction of the last segment of a link coming from this port is computed when the node is rotated.*/
-        fromEndSegmentDirection: EnumValue;
-
-        /**Gets or sets the length of the last segment of a link coming from this port.*/
-        fromEndSegmentLength: number;
-
-        /**Gets or sets whether the user may draw Links from this port. The value must be either a boolean or null.*/
-        fromLinkable: boolean;
-
-        /**Gets or sets whether the user may draw duplicate Links from this port.*/
-        fromLinkableDuplicates: boolean;
-
-        /**Gets or sets whether the user may draw Links that connect from this port's Node.*/
-        fromLinkableSelfNode: boolean;
-
-        /**Gets or sets the maximum number of links that may come out of this port.*/
-        fromMaxLinks: number;
-
-        /**Gets or sets how far the end segment of a link coming from this port stops short of the actual port.*/
-        fromShortLength: number;
-
-        /**Gets or sets where a link should connect from this port.*/
-        fromSpot: Spot;
-
-        /**Gets or sets the desired height of this GraphObject in local coordinates.*/
-        height: number;
-
-        /**This property determines whether or not this GraphObject's events occur before all other events, including selection.*/
-        isActionable: boolean;
-
-        /**Gets or sets whether a GraphObject is the "main" object for some types of Panel.*/
-        isPanelMain: boolean;
-
-        /**This read-only property returns the GraphObject's containing Layer, if there is any.*/
-        layer: Layer;
-
-        /**Gets or sets the size of empty area around this GraphObject, as a Margin (or number for a uniform Margin), in the containing Panel coordinates.*/
-        margin: MarginLike;
-
-        /**Gets or sets the maximum size of this GraphObject in container coordinates (either a Panel or the document).*/
-        maxSize: Size;
-
-        /**This read-only property returns the measuredBounds of the GraphObject in container coordinates (either a Panel or the document).*/
-        measuredBounds: Rect;
-
-        /**Gets or sets the minimum size of this GraphObject in container coordinates (either a Panel or the document).*/
-        minSize: Size;
-
-        /**Gets or sets the function to execute when the user moves the mouse into this stationary object during a DraggingTool drag.*/
-        mouseDragEnter: (e: InputEvent, obj: GraphObject, prev: GraphObject) => void;
-
-        /**Gets or sets the function to execute when the user moves the mouse out of this stationary object during a DraggingTool drag.*/
-        mouseDragLeave: (e: InputEvent, obj: GraphObject, prev: GraphObject) => void;
-
-        /**Gets or sets the function to execute when a user drops the selection on this object at the end of a DraggingTool drag.*/
-        mouseDrop: (e: InputEvent, obj: GraphObject) => void;
-
-        /**Gets or sets the function to execute when the user moves the mouse into this object without holding down any buttons.*/
-        mouseEnter: (e: InputEvent, obj: GraphObject, prev: GraphObject) => void;
-
-        /**Gets or sets the function to execute when the user holds the mouse stationary in the background of the diagram while holding down a button over this object.*/
-        mouseHold: (e: InputEvent, obj: GraphObject) => void;
-
-        /**Gets or sets the function to execute when the user holds the mouse stationary in the background of the diagram without holding down any buttons over this object.*/
-        mouseHover: (e: InputEvent, obj: GraphObject) => void;
-
-        /**Gets or sets the function to execute when the user moves the mouse into this object without holding down any buttons.*/
-        mouseLeave: (e: InputEvent, obj: GraphObject, prev: GraphObject) => void;
-
-        /**Gets or sets the function to execute when the user moves the mouse over this object without holding down any buttons.*/
-        mouseOver: (e: InputEvent, obj: GraphObject) => void;
-
-        /**Gets or sets the name for this object.*/
-        name: string;
-
-        /**This read-only property returns the natural bounding rectangle of this GraphObject in local coordinates, before any transformation by .scale or .angle, and before any resizing due to .minSize or .maxSize or .stretch.*/
-        naturalBounds: Rect;
-
-        /**Gets or sets the multiplicative opacity for this GraphObject and (if a Panel) all nested elements.*/
-        opacity: number;
-
-        /**This read-only property returns the GraphObject's containing Panel, or null if this object is not in a Panel.*/
-        panel: Panel;
-
-        /**This read-only property returns the Part containing this object, if any.*/
-        part: Part;
-
-        /**Gets or sets whether or not this GraphObject can be chosen by visual "find" methods such as Diagram.findObjectAt.*/
-        pickable: boolean;
-
-        /**Gets or sets an identifier for an object acting as a port on a Node.*/
-        portId: string;
-
-        /**Gets or sets the position of this GraphObject in container coordinates (either a Panel or the document).*/
-        position: Point;
-
-        /**Gets or sets the row of this GraphObject if it is in a Table Panel.*/
-        row: number;
-
-        /**Gets or sets the number of rows spanned by this GraphObject if it is in a Table Panel.*/
-        rowSpan: number;
-
-        /**Gets or sets the scale transform of this GraphObject.*/
-        scale: number;
-
-        /**Gets or sets the fractional distance along a segment of a GraphObject that is in a Link.*/
-        segmentFraction: number;
-
-        /**Gets or sets the segment index of a GraphObject that is in a Link.*/
-        segmentIndex: number;
-
-        /**Gets or sets the offset of a GraphObject that is in a Link from a point on a segment.*/
-        segmentOffset: Point;
-
-        /**Gets or sets the orientation of a GraphObject that is in a Link.*/
-        segmentOrientation: EnumValue;
-
-        /**Gets or sets the stretch of the GraphObject.*/
-        stretch: EnumValue;
-
-        /**Gets or sets how the direction of the last segment of a link going to this port is computed when the node is rotated.*/
-        toEndSegmentDirection: EnumValue;
-
-        /**Gets or sets the length of the last segment of a link going to this port.*/
-        toEndSegmentLength: number;
-
-        /**Gets or sets whether the user may draw Links to this port. The value must be either a boolean or null.*/
-        toLinkable: boolean;
-
-        /**Gets or sets whether the user may draw duplicate Links to this port.*/
-        toLinkableDuplicates: boolean;
-
-        /**Gets or sets whether the user may draw Links that connect to this port's Node.*/
-        toLinkableSelfNode: boolean;
-
-        /**Gets or sets the maximum number of links that may go into this port.*/
-        toMaxLinks: number;
-
-        /**This Adornment is shown when the mouse hovers over this object.*/
-        toolTip: Adornment;
-
-        /**Gets or sets how far the end segment of a link going to this port stops short of the actual port.*/
-        toShortLength: number;
-
-        /**Gets or sets where a link should connect to this port.*/
-        toSpot: Spot;
-
-        /**Gets or sets whether a GraphObject is visible.*/
-        visible: boolean;
-
-        /**Gets or sets the desired width of this GraphObject in local coordinates.*/
-        width: number;
-
-        /**
-        * Add a data-binding of a property on this GraphObject to a property on a data object.
-        * @param {Binding} binding
-        */
-        bind(binding: Binding): void;
-
-        /**
-        * Creates a deep copy of this GraphObject and returns it.
-        */
-        copy(): GraphObject;
-
-        /**
-        * This static function defines a named function that GraphObject.make can use to build objects.
-        * @param {string} name a capitalized name; must not be "" or "None"
-        * @param {function(Array<*>):Object} func
-        */
-        static defineBuilder(name: string, func: (args: Array<any>) => Object): void;
-
-        /**
-        * This static function returns the first argument from the arguments array passed
-        * to a GraphObject.defineBuilder function by GraphObject.make.
-        * By default this requires the first argument to be a string,
-        * but you can provide a predicate to determine whether the argument is suitable.
-        * @param {Array} args
-        * @param {*=} defval the default value to return if the argument is optional and not present as the first argument
-        * @param {function(*):boolean|null=} pred a predicate to determine the acceptability of the argument;
-        *        the default predicate checks whether the argument is a string
-        * @return {*}
-        */
-        static takeBuilderArgument(args: Array<any>, defval?: any, pred?: (arg: any) => boolean): any;
-
-        /**
-        * Returns the effective angle that the object is drawn at, in document coordinates.
-        */
-        getDocumentAngle(): number;
-
-        /**
-        * Returns the Point in document coordinates for a given Spot in this object's bounds.
-        * @param {Spot} s a real Spot describing a location relative to the GraphObject.
-        * @param {Point=} result an optional Point that is modified and returned.
-        */
-        getDocumentPoint(s: Spot, result?: Point): Point;
-
-        /**
-        * Returns the total scale that the object is drawn at, in document coordinates.
-        */
-        getDocumentScale(): number;
-
-        /**
-        * Given a Point in document coordinates, returns a new Point in local coordinates.
-        * @param {Point} p a Point in document coordinates.
-        * @param {Point=} result an optional Point that is modified and returned.
-        */
-        getLocalPoint(p: Point, result?: Point): Point;
-
-        /**
-        * This predicate is true if this object is an element, perhaps indirectly, of the given panel.
-        * @param {GraphObject} panel
-        * or if it is contained by another panel that is contained by the given panel,
-        * to any depth; false if the argument is null or is not a Panel.
-        */
-        isContainedBy(panel: GraphObject): boolean;
-
-        /**
-        * This predicate is true if this object is .visible and each of its visual containing panels are also visible.
-        */
-        isVisibleObject(): boolean;
-
-        /**
-        * This method sets a collection of properties according to the property/value pairs that have been set on the given Object,
-        * in the same manner as GraphObject.make does when constructing a GraphObject with an argument that is a simple JavaScript Object.
-        */
-        setProperties(props: Object): void;
-
-        /**
-        * This static function builds an object given its class and additional arguments providing initial properties or GraphObjects that become Panel elements.
-        * @param {function()|string} type a class function or the name of a class in the "go" namespace,
-        * or one of several predefined kinds of Panels: "Button", "TreeExpanderButton",
-        * "SubGraphExpanderButton", or "ContextMenuButton".
-        * @param {...*} initializers zero or more values that initialize the new object,
-        * typically an Object with properties whose values that get set on the new object,
-        * or a GraphObject that is added to a Panel,
-        * or a Binding for one of the new object's properties,
-        * or an EnumValue as the initial value of a single property of the new object that
-        * is recognized to take that value,
-        * or a string that is used as the value of a commonly set property.
-        */
-        static make(type: Constructor | string, ...initializers: Array<any>): any;
-
-        /**GraphObjects with this as the value of GraphObject.stretch are stretched depending on the context they are used.*/
-        static Default: EnumValue;
-
-        /**GraphObjects with this as the value of GraphObject.stretch are scaled in both directions so as to fit exactly in the given bounds; there is no clipping but the aspect ratio may change, causing the object to appear stretched.*/
-        static Fill: EnumValue;
-
-        /**GraphObjects with this as the value of GraphObject.stretch are scaled as much as possible in the x-axis*/
-        static Horizontal: EnumValue;
-
-        /**GraphObjects with this as the value of GraphObject.stretch are not automatically scaled to fit in the given bounds; there may be clipping in one or both directions.*/
-        static None: EnumValue;
-
-        /**Pictures with this as the value of Picture.imageStretch are drawn with equal scale in both directions to fit the arranged (actual) bounds.*/
-        static Uniform: EnumValue;
-
-        /**Pictures with this as the value of Picture.imageStretch are drawn with equal scale in both directions to fit the larger side of the image bounds.*/
-        static UniformToFill: EnumValue;
-
-        /**GraphObjects with this as the value of GraphObject.stretch are scaled as much as possible in the y-axis*/
-        static Vertical: EnumValue;
-
-        spanAllocation: (obj: GraphObject, r: RowColumnDefinition, n: number) => number;  // undocumented
-        protected cloneProtected(copy: GraphObject): void;  // undocumented
-        static getBuilders(): Map<string,(args: Array<any>) => Object>;  // undocumented
-    }
-
-    /**
-    * This simple layout places all of the Parts in a grid-like arrangement, ordered, spaced apart,
-    * and wrapping as needed.  It ignores any Links connecting the Nodes being laid out.
-    */
-    class Group extends Node {
-        /**
-        * Constructs an empty Group with no visual elements and no member parts; normally a Group will have some visual elements surrounding a Placeholder.
-        * @param {EnumValue=} type if not supplied, the default Panel type is Panel.Position.
-        */
-        constructor(type?: EnumValue);
-
-        /**Gets or sets whether the size of the area of the Group's .placeholder should remain the same during a DraggingTool move until a drop occurs. The default value is false.*/
-        computesBoundsAfterDrag: boolean;
-
-        /**Gets or sets whether the bounds of a Group's Placeholder includes the bounds of member Links. The default value is true.*/
-        computesBoundsIncludingLinks: boolean;
-
-        /**Gets or sets whether the bounds of a Group's Placeholder includes the previous Group.location. The default value is false.*/
-        computesBoundsIncludingLocation: boolean;
-
-        /**Gets or sets whether drag-and-drop events may be bubbled up to this Group if not handled by member Parts.*/
-        handlesDragDropForMembers: boolean;
-
-        /**Gets or sets whether the subgraph contained by this group is expanded. The default value is true.*/
-        isSubGraphExpanded: boolean;
-
-        /**Gets or sets the Layout used to position all of the immediate member nodes and links in this group.*/
-        layout: Layout;
-
-        /**Gets or sets the function that is called after a member Part has been added to this Group.*/
-        memberAdded: (a: Group, b: Part) => void;
-
-        /**This read-only property returns an iterator over the member Parts of this Group.*/
-        memberParts: Iterator<Part>;
-
-        /**Gets or sets the function that is called after a member Part has been removed from this Group.*/
-        memberRemoved: (a: Group, b: Part) => void;
-
-        /**Gets or sets the predicate that determines whether or not a Part may become a member of this group.*/
-        memberValidation: (a: Group, b: Part) => boolean;
-
-        /**This read-only property returns a Placeholder that this group may contain in its visual tree.*/
-        placeholder: Placeholder;
-
-        /**Gets or sets the function that is called when .isSubGraphExpanded has changed value.*/
-        subGraphExpandedChanged: (a: Group) => void;
-
-        /**Gets or sets whether the user may ungroup this group.*/
-        ungroupable: boolean;
-
-        /**Gets or sets whether the subgraph starting at this group had been collapsed by a call to .expandSubGraph on the containing Group.*/
-        wasSubGraphExpanded: boolean;
-
-        /**
-        * Add the Parts in the given collection as members of this Group for those Parts for which CommandHandler.isValidMember returns true.
-        * @param {Iterable<Part>} coll
-        * @param {boolean=} check whether to call CommandHandler.isValidMember to confirm that it is valid to add the Part to be a member of this Group.
-        */
-        addMembers(coll: Iterable<Part>, check?: boolean): boolean;
-
-        /**
-        * See if the given collection of Parts contains non-Links all for which CommandHandler.isValidMember returns true.
-        * @param {Iterable<Part>} coll
-        */
-        canAddMembers(coll: Iterable<Part>): boolean;
-
-        /**
-        * This predicate returns true if .ungroupable is true, if the layer's Layer.allowUngroup is true, and if the diagram's Diagram.allowUngroup is true.
-        */
-        canUngroup(): boolean;
-
-        /**
-        * Hide each of the member nodes and links of this group, and recursively collapse any member groups.
-        */
-        collapseSubGraph(): void;
-
-        /**
-        * Show each member node and link, and perhaps recursively expand nested subgraphs.
-        */
-        expandSubGraph(): void;
-
-        /**
-        * Returns an iterator over all of the Links that connect with this group or any node contained by this group,
-        * in either direction, but that are not internal to this group.
-        */
-        findExternalLinksConnected(): Iterator<Link>;
-
-        /**
-        * Returns an iterator over all of the Nodes that are connected with this group or any node contained by this group,
-        * by a link in either direction, but that are not internal to this group.
-        */
-        findExternalNodesConnected(): Iterator<Node>;
-
-        /**
-        * Return a collection of Parts that are all of the nodes and links that are members of this group, including inside nested groups, but excluding this group itself.
-        */
-        findSubGraphParts(): Set<Part>;
-
-        /**
-        * Move this Group and all of its member parts, recursively.
-        * @param {Point} newpos a new Point in document coordinates.
-        */
-        move(newpos: Point): void;
-    }
-
-    /**
-    * An InputEvent represents a mouse or keyboard event.
-    * The principal properties hold information about a particular input event.
-    * These properties include the .documentPoint at which a mouse event
-    * occurred in document coordinates,
-    * the corresponding point in view/element coordinates, .viewPoint,
-    * the .key for keyboard events,
-    * and the .modifiers and .button at the time.
-    * Additional descriptive properties include .clickCount, .delta,
-    * .timestamp, and the source event .event (if available).
-    */
-    class InputEvent {
-        /**
-        * The InputEvent class constructor produces an empty InputEvent.
-        */
-        constructor();
-
-        /**Gets or sets whether the alt key is being held down.*/
-        alt: boolean;
-
-        /**Gets or sets whether the underlying .event is prevented from bubbling up the hierarchy of HTML elements outside of the Diagram and whether any default action is canceled.*/
-        bubbles: boolean;
-
-        /**Gets or sets the mouse button that caused this event.*/
-        button: number;
-
-        /**Gets or sets the buttons flag, descibing the set of mouse buttons current being held down.*/
-        buttons: number;
-
-        /**Gets or sets whether this event represents a click or a double-click.*/
-        clickCount: number;
-
-        /**Gets or sets whether the control key is being held down.*/
-        control: boolean;
-
-        /**Gets or sets the amount of change associated with a mouse-wheel rotation.*/
-        delta: number;
-
-        /**This read-only property returns the source diagram associated with the event.*/
-        diagram: Diagram;
-
-        /**Gets or sets the point at which this input event occurred, in document coordinates.*/
-        documentPoint: Point;
-
-        /**Gets or sets whether the InputEvent represents a mouse-down or a key-down event.*/
-        down: boolean;
-
-        /**Gets or sets the platform's user-agent-supplied event for this event.*/
-        event: Event;
-
-        /**Gets or sets whether an InputEvent that applies to a GraphObject and bubbles up the chain of containing Panels is stopped from continuing up the chain.*/
-        handled: boolean;
-
-        /**This property is true when the InputEvent is caused by a touch event that registered more than one touch.*/
-        isMultiTouch: boolean;
-
-        /**This read-only property is true when the InputEvent is caused by a touch event.*/
-        isTouchEvent: boolean;
-
-        /**Gets or sets the key pressed or released as this event.*/
-        key: string;
-
-        /**Gets or sets whether the logical left mouse button is being held down.*/
-        left: boolean;
-
-        /**Gets or sets whether the meta key is being held down.*/
-        meta: boolean;
-
-        /**Gets or sets whether the logical middle mouse button is being held down.*/
-        middle: boolean;
-
-        /**Gets or sets the modifier keys that were used with the mouse or keyboard event.*/
-        modifiers: number;
-
-        /**Gets or sets whether the logical right mouse button is being held down.*/
-        right: boolean;
-
-        /**Gets or sets whether the shift key is being held down.*/
-        shift: boolean;
-
-        /**Gets or sets the diagram associated with the canvas that the event is currently targeting.*/
-        targetDiagram: Diagram;
-
-        /**Gets or sets the GraphObject that is at the current mouse point, if any.*/
-        targetObject: GraphObject;
-
-        /**Gets or sets the time at which the event occurred, in milliseconds.*/
-        timestamp: number;
-
-        /**Gets or sets whether the InputEvent represents a mouse-up or a key-up event.*/
-        up: boolean;
-
-        /**Gets or sets the point at which this input event occurred.*/
-        viewPoint: Point;
-
-        /**
-        * Make a copy of this InputEvent.
-        */
-        copy(): InputEvent;
-
-        isMac: boolean;  // undocumented
-    }
-
-    /**
-    * Layers are how named collections of Parts are drawn in front or behind other collections of Parts in a Diagram.
-    * Layers can only contain Parts -- they cannot hold GraphObjects directly.
-    */
-    class Layer {
-        /**
-        * This constructs an empty Layer; you should set the .name before adding the Layer to a Diagram.
-        */
-        constructor();
-
-        /**Gets or sets whether the user may copy objects in this layer.*/
-        allowCopy: boolean;
-
-        /**Gets or sets whether the user may delete objects in this layer.*/
-        allowDelete: boolean;
-
-        /**Gets or sets whether the user may group parts together in this layer.*/
-        allowGroup: boolean;
-
-        /**Gets or sets whether the user may draw new links in this layer.*/
-        allowLink: boolean;
-
-        /**Gets or sets whether the user may move objects in this layer.*/
-        allowMove: boolean;
-
-        /**Gets or sets whether the user may reconnect existing links in this layer.*/
-        allowRelink: boolean;
-
-        /**Gets or sets whether the user may reshape parts in this layer.*/
-        allowReshape: boolean;
-
-        /**Gets or sets whether the user may resize parts in this layer.*/
-        allowResize: boolean;
-
-        /**Gets or sets whether the user may rotate parts in this layer.*/
-        allowRotate: boolean;
-
-        /**Gets or sets whether the user may select objects in this layer.*/
-        allowSelect: boolean;
-
-        /**Gets or sets whether the user may do in-place text editing in this layer.*/
-        allowTextEdit: boolean;
-
-        /**Gets or sets whether the user may ungroup existing groups in this layer.*/
-        allowUngroup: boolean;
-
-        /**This read-only property returns the Diagram that is using this Layer.*/
-        diagram: Diagram;
-
-        /**Gets or sets whether the objects in this layer are considered temporary.*/
-        isTemporary: boolean;
-
-        /**Gets or sets the name for this layer.*/
-        name: string;
-
-        /**Gets or sets the opacity for all parts in this layer.*/
-        opacity: number;
-
-        /**This read-only property returns an iterator for this Layer's Parts.*/
-        parts: Iterator<Part>;
-
-        /**This read-only property returns a backwards iterator for this Layer's Parts, for iterating over the parts in reverse order.*/
-        partsBackwards: Iterator<Part>;
-
-        /**Gets or sets whether methods such as .findObjectAt find any of the objects in this layer.*/
-        pickable: boolean;
-
-        /**Gets or sets whether the user may view any of the objects in this layer.*/
-        visible: boolean;
-
-        /**
-        * Find the front-most GraphObject in this layer at the given point in document coordinates.
-        * @param {Point} p A Point in document coordinates.
-        * @param {function(GraphObject):GraphObject | null=} navig A function taking a GraphObject and
-        * returning a GraphObject, defaulting to the identity.
-        * @param {function(GraphObject):boolean | null=} pred A function taking the GraphObject
-        * returned by navig and returning true if that object should be returned,
-        * defaulting to a predicate that always returns true.
-        */
-        findObjectAt(p: Point, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean): GraphObject;
-
-        /**
-        * Return a collection of the GraphObjects of this layer at the given point in document coordinates.
-        * @param {Point} p A Point in document coordinates.
-        * @param {function(GraphObject):GraphObject | null=} navig A function taking a GraphObject and
-        * returning a GraphObject, defaulting to the identity.
-        * If this function returns null, the given GraphObject will not be included in the results.
-        * @param {function(GraphObject):boolean | null=} pred A function taking the GraphObject
-        * returned by navig and returning true if that object should be returned,
-        * defaulting to a predicate that always returns true.
-        * @param {List|Set=} coll An optional collection (List or Set) to add the results to.
-        */
-        findObjectsAt(p: Point, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, coll?: List<GraphObject>): List<GraphObject>;
-        findObjectsAt(p: Point, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, coll?: Set<GraphObject>): Set<GraphObject>;
-
-        /**
-        * Returns a collection of all GraphObjects that are inside or that intersect a given Rect in document coordinates.
-        * @param {Rect} r A Rect in document coordinates.
-        * @param {function(GraphObject):GraphObject | null=} navig A function taking a GraphObject and
-        * returning a GraphObject, defaulting to the identity.
-        * If this function returns null, the given GraphObject will not be included in the results.
-        * @param {function(GraphObject):boolean | null=} pred A function taking the GraphObject
-        * returned by navig and returning true if that object should be returned,
-        * defaulting to a predicate that always returns true.
-        * @param {boolean=} partialInclusion Whether an object can match if it merely intersects the rectangular area (true) or
-        * if it must be entirely inside the rectangular area (false).  The default value is false.
-        * @param {List|Set=} coll An optional collection (List or Set) to add the results to.
-        */
-        findObjectsIn(r: Rect, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: List<GraphObject>): List<GraphObject>;
-        findObjectsIn(r: Rect, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: Set<GraphObject>): Set<GraphObject>;
-
-        /**
-        * Returns a collection of all GraphObjects that are within a certain distance of a given point in document coordinates.
-        * @param {Point} p A Point in document coordinates.
-        * @param {number} dist The distance from the point.
-        * @param {function(GraphObject):GraphObject | null=} navig A function taking a GraphObject and
-        * returning a GraphObject, defaulting to the identity.
-        * If this function returns null, the given GraphObject will not be included in the results.
-        * @param {function(GraphObject):boolean | null=} pred A function taking the GraphObject
-        * returned by navig and returning true if that object should be returned,
-        * defaulting to a predicate that always returns true.
-        * @param {boolean=} partialInclusion Whether an object can match if it merely intersects the circular area (true) or
-        * if it must be entirely inside the circular area (false).  The default value is true.
-        * @param {List|Set=} coll An optional collection (List or Set) to add the results to.
-        */
-        findObjectsNear(p: Point, dist: number, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: List<GraphObject>): List<GraphObject>;
-        findObjectsNear(p: Point, dist: number, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: Set<GraphObject>): Set<GraphObject>;
-    }
-
-    /**
-    * A Link is a Part that connects Nodes.
-    * The link relationship is directional, going from Link.fromNode to Link.toNode.
-    * A link can connect to a specific port element in a node, as named by the Link.fromPortId
-    * and Link.toPortId properties.
-    */
-    class Link extends Part {
-        /**
-        * Constructs an empty link that does not connect any nodes.
-        */
-        constructor();
-
-        /**Gets or sets how the route is computed, including whether it uses the points of its old route to determine the new route.*/
-        adjusting: EnumValue;
-
-        /**Gets or sets how rounded the corners are for adjacent line segments when the .curve is .None .JumpGap, or .JumpOver and the two line segments are orthogonal to each other.*/
-        corner: number;
-
-        /**Gets or sets the way the path is generated from the route's points.*/
-        curve: EnumValue;
-
-        /**Gets or sets how far the control points are offset when the .curve is .Bezier or when there are multiple links between the same two ports.*/
-        curviness: number;
-
-        /**Gets or sets how the direction of the last segment is computed when the node is rotated.*/
-        fromEndSegmentDirection: EnumValue;
-
-        /**Gets or sets the length of the last segment.*/
-        fromEndSegmentLength: number;
-
-        /**Gets or sets the Node that this link comes from.*/
-        fromNode: Node;
-
-        /**This read-only property returns a GraphObject that is the "from" port that this link is connected from.*/
-        fromPort: GraphObject;
-
-        /**Gets or sets the function that is called after this Link changes which Node or port it connects from.*/
-        fromPortChanged: (a: Link, b: GraphObject, c: GraphObject) => void;
-
-        /**Gets or sets the identifier of the port that this link comes from.*/
-        fromPortId: string;
-
-        /**Gets or sets how far the end segment stops short of the actual port.*/
-        fromShortLength: number;
-
-        /**Gets or sets where this link should connect at the .fromPort.*/
-        fromSpot: Spot;
-
-        /**This read-only property returns the Geometry that is used by the .path, the link Shape based on the route points.*/
-        geometry: Geometry;
-
-        /**This read-only property is true when this Link has any label Nodes, Nodes that are owned by this Link and are arranged along its path.*/
-        isLabeledLink: boolean;
-
-        /**This read-only property true if .routing is a value that implies that the points of the route should be orthogonal, such that each point shares a common X or a common Y value with the immediately previous and next points.*/
-        isOrthogonal: boolean;
-
-        /**Gets or sets whether this Link is part of the tree for tree operations such as Node.findTreeChildrenNodes or Node.collapseTree.*/
-        isTreeLink: boolean;
-
-        /**This read-only property returns an iterator over the Nodes that act as labels on this Link.*/
-        labelNodes: Iterator<Node>;
-
-        /**This read-only property returns the angle of the path at the .midPoint.*/
-        midAngle: number;
-
-        /**This read-only property returns the point at the middle of the path.*/
-        midPoint: Point;
-
-        /**This read-only property returns the Shape representing the path of this Link.*/
-        path: Shape;
-
-        /**Gets or sets the List of Points in the route. Can also be set as an Array of numbers.*/
-        points: List<Point>;
-
-        /**This read-only property returns the number of points in the route.*/
-        pointsCount: number;
-
-        /**Gets or sets whether the user may reconnect an existing link at the "from" end.*/
-        relinkableFrom: boolean;
-
-        /**Gets or sets whether the user may reconnect an existing link at the "to" end.*/
-        relinkableTo: boolean;
-
-        /**Gets or sets whether the user may change the number of segments in this Link, if the link has straight segments.*/
-        resegmentable: boolean;
-
-        /**Gets or sets whether the link's path tries to avoid other nodes.*/
-        routing: EnumValue;
-
-        /**Gets or sets how far the control points are from the points of the route when .routing is .Orthogonal and .curve is .Bezier.*/
-        smoothness: number;
-
-        /**Gets or sets how far the control points are from the points of the route when .routing is .Orthogonal and .curve is .Bezier.*/
-        toEndSegmentDirection: EnumValue;
-
-        /**Gets or sets the length of the last segment.*/
-        toEndSegmentLength: number;
-
-        /**Gets or sets the Node that this link goes to.*/
-        toNode: Node;
-
-        /**This read-only property returns a GraphObject that is the "to" port that this link is connected to.*/
-        toPort: GraphObject;
-
-        /**Gets or sets the function that is called after this Link changes which Node or port it connects to.*/
-        toPortChanged: (a: Link, b: GraphObject, c: GraphObject) => void;
-
-        /**Gets or sets the identifier of the port that this link goes to.*/
-        toPortId: string;
-
-        /**Gets or sets how far the end segment stops short of the actual port.*/
-        toShortLength: number;
-
-        /**Gets or sets where this link should connect at the .toPort.*/
-        toSpot: Spot;
-
-        /**
-        * This predicate returns true if .relinkableFrom is true, if the layer's Layer.allowRelink is true, and if the diagram's Diagram.allowRelink is true.
-        */
-        canRelinkFrom(): boolean;
-
-        /**
-        * This predicate returns true if .relinkableTo is true, if the layer's Layer.allowRelink is true, and if the diagram's Diagram.allowRelink is true.
-        */
-        canRelinkTo(): boolean;
-
-        /**
-        * Remove all of the points from this link's route; this may only be called within an override of computePoints.
-        */
-        protected clearPoints(): void;
-
-        /**
-        * Add a point at the end of the route; this may only be called within an override of computePoints.
-        * @param {Point} p  The new point, which should not have infinite or NaN coordinate values, and which must not be modified afterwards.
-        */
-        protected addPoint(p: Point): void;
-
-        /**
-        * Insert a point at a particular position in the route, without replacing an existing point; this may only be called within an override of computePoints.
-        * @param {number} i int  The zero-based index of the new point.
-        * @param {Point} p  The new point, which should not have infinite or NaN coordinate values, and which must not be modified afterwards.
-        */
-        protected insertPoint(i: number, p: Point): void;
-
-        /**
-        * Remove a particular point from the route; this may only be called within an override of computePoints.
-        * @param {number} i int  The zero-based index of the point to extract.
-        */
-        protected removePoint(i: number): void;
-
-        /**
-        * Sets a particular point of the route; this may only be called within an override of computePoints.
-        * @param {number} i int  The zero-based index of the desired point.
-        * @param {Point} p  The new point, which should not have infinite or NaN coordinate values, and which must not be modified afterwards.
-        */
-        protected setPoint(i: number, p: Point): void;
-
-        /**
-        * Returns the curve}, unless this link is supposed to pretend to be curved, as with reflexive links.
-        */
-        protected computeCurve(): EnumValue;
-
-        /**
-        * Returns the curviness, if it's a number,
-        * or else a computed value based on how many links connect this pair of nodes/ports.
-        */
-        protected computeCurviness(): number;
-
-        /**
-        * Get the length of the end segment, typically a short distance, in document units.
-        * For spot values that are Spot.isSide, this returns a computed value.
-        * Depending on the <code>from</code> argument, this will return fromEndSegmentLength or toEndSegmentLength.
-        * If the value is <code>NaN</code>, this will return the fromPort's GraphObject.fromEndSegmentLength
-        * or the toPort's GraphObject.toEndSegmentLength.
-        */
-        protected computeEndSegmentLength(node: Node, port: GraphObject, spot: Spot, from: boolean): number;
-
-        /**
-        * Find the approximate point of the other end of the link.
-        * This is useful when computing the connection point when there is no specific spot, to have an idea of which general direction the link should be going.
-        * By default this will return the center of the other port.
-        */
-        protected computeOtherPoint(othernode: Node, otherport: GraphObject): Point;
-
-        /**
-        * The code that constructs a new route by modifying the points.
-        * It is only called by updateRoute, when needed.
-        */
-        protected computePoints(): boolean;
-        /**
-        * Returns the expected spacing between this link and others that connect this link's fromPort and toPort.
-        * This calls computeThickness and also takes any "mid label"'s breadth into account.
-        */
-        protected computeSpacing(): number;
-        /**
-        * Get the Spot that describes how the end of the link should connect with the port.
-        * Depending on the <code>from</code> argument, this will return fromSpot or toSpot.
-        * If the value is Spot.isDefault, this will return the fromPort's GraphObject.fromSpot
-        * or the toPort's GraphObject.toSpot.
-        */
-        protected computeSpot(from: boolean): Spot;
-
-        /**
-        * Returns the thickness of this link.
-        * By default it uses the strokeWidth of the main element, assuming it's a Shape.
-        */
-        protected computeThickness(): number;
-
-        /**
-        * Find the index of the segment that is closest to a given point.
-        * @param {Point} p the Point, in document coordinates.
-        */
-        findClosestSegment(p: Point): number;
-
-        /**
-        * Compute the direction in which a link should go from a given connection point.
-        * @param {Node} node
-        * @param {GraphObject} port the GraphObject representing a port on the node.
-        * @param {Point} linkpoint the connection point, in document coordinates.
-        * @param {Spot} spot a Spot value describing where the link should connect.
-        * @param {boolean} from true if the link is coming out of the port; false if going to the port.
-        * @param {boolean} ortho whether the link should have orthogonal segments.
-        * @param {Node} othernode the node at the other end of the link.
-        * @param {GraphObject} otherport the GraphObject port at the other end of the link.
-        */
-        getLinkDirection(node: Node, port: GraphObject, linkpoint: Point, spot: Spot, from: boolean, ortho: boolean, othernode: Node, otherport: GraphObject): number;
-
-        /**
-        * Compute the point on a node/port at which the route of a link should end.
-        * @param {Node} node
-        * @param {GraphObject} port the GraphObject representing a port on the node.
-        * @param {Spot} spot a Spot value describing where the link should connect.
-        * @param {boolean} from true if the link is coming out of the port; false if going to the port.
-        * @param {boolean} ortho whether the link should have orthogonal segments.
-        * @param {Node} othernode the node at the other end of the link.
-        * @param {GraphObject} otherport the GraphObject port at the other end of the link.
-        * @param {Point=} result an optional Point that is modified and returned; otherwise it allocates and returns a new Point
-        */
-        getLinkPoint(node: Node, port: GraphObject, spot: Spot, from: boolean, ortho: boolean, othernode: Node, otherport: GraphObject, result?: Point): Point;
-
-        /**
-        * Compute the intersection point for the edge of a particular port GraphObject, given a point, when no particular spot or side has been specified.
-        * @param {Node} node
-        * @param {GraphObject} port the GraphObject representing a port on the node.
-        * @param {Point} focus the point in document coordinates to/from which the link should point,
-        *   normally the center of the port.
-        * @param {Point} p often this point is far away from the node, to give a general direction,
-        *   particularly an orthogonal one.
-        * @param {boolean} from true if the link is coming out of the port; false if going to the port.
-        * @param {Point=} result an optional Point that is modified and returned; otherwise it allocates and returns a new Point
-        */
-        getLinkPointFromPoint(node: Node, port: GraphObject, focus: Point, p: Point, from: boolean, result?: Point): Point;
-
-        /**
-        * Given a Node, return the node at the other end of this link.
-        * @param {Node} node
-        */
-        getOtherNode(node: Node): Node;
-
-        /**
-        * Given a GraphObject that is a "port", return the port at the other end of this link.
-        * @param {GraphObject} port
-        */
-        getOtherPort(port: GraphObject): GraphObject;
-
-        /**
-        * Gets a particular point of the route.
-        * @param {number} i  The zero-based index of the desired point.
-        */
-        getPoint(i: number): Point;
-
-        /**
-        * Returns true if an extra or a different point is needed based on curviness.
-        */
-        protected hasCurviness(): boolean;
-
-        /**
-        * Declare that the route (the points) of this Link need to be recomputed soon.
-        * This causes updateRoute to be called, which will call computePoints
-        * to perform the actual determination of the route.
-        */
-        invalidateRoute(): void;
-
-        /**
-        * Produce a Geometry given the points of this route,
-        * depending on the value of curve and corner and perhaps other properties.
-        */
-        protected makeGeometry(): Geometry;
-
-        /**
-        * Move this link to a new position.
-        * @param {Point} newpos
-        */
-        move(newpos: Point): void;
-
-        /**
-        * This method recomputes the route if the route is invalid, to make sure the points are up-to-date.
-        * This method calls computePoints in order to calculate a new route.
-        */
-        updateRoute(): void;
-
-        /**Used as a value for Link.routing: each segment is horizontal or vertical, but the route tries to avoid crossing over nodes.*/
-        static AvoidsNodes: EnumValue;
-
-        /**Used as a value for Link.curve, to indicate that the link path uses Bezier curve segments.*/
-        static Bezier: EnumValue;
-
-        /**Used as a value for Link.adjusting, to indicate that the link route computation should keep the intermediate points of the previous route, just modifying the first and/or last points; if the routing is orthogonal, it will only modify the first two and/or last two points.*/
-        static End: EnumValue;
-
-        /**Used as a value for Link.curve, to indicate that orthogonal link segments will be discontinuous where they cross over other orthogonal link segments that have a Link.curve or JumpOver or JumpGap.*/
-        static JumpGap: EnumValue;
-
-        /**Used as a value for Link.curve, to indicate that orthogonal link segments will veer around where they cross over other orthogonal link segments that have a Link.curve or JumpOver or JumpGap.*/
-        static JumpOver: EnumValue;
-
-        /**This is the default value for Link.curve and Link.adjusting, to indicate that the path geometry consists of straight line segments and to indicate that the link route computation does not depend on any previous route points; this can also be used as a value for GraphObject.segmentOrientation to indicate that the object is never rotated along the link route -- its angle is unchanged.*/
-        static None: EnumValue;
-
-        /**Used as the default value for Link.routing: the route goes fairly straight between ports.*/
-        static Normal: EnumValue;
-
-        /**This value for GraphObject.segmentOrientation results in the GraphObject turned to have the same angle as the route: the GraphObject's angle is always the same as the angle of the link's route at the segment where the GraphObject is attached; use this orientation for arrow heads.*/
-        static OrientAlong: EnumValue;
-
-        /**This value for GraphObject.segmentOrientation results in the GraphObject being turned counter-clockwise to be perpendicular to the route: the GraphObject's angle is always 90 degrees less than the angle of the link's route at the segment where the GraphObject is attached.*/
-        static OrientMinus90: EnumValue;
-
-        /**This value for GraphObject.segmentOrientation results in the GraphObject turned counter-clockwise to be perpendicular to the route, just like Link.OrientMinus90, but is never upside down: the GraphObject's angle always being 90 degrees less than the angle of the link's route at the segment where the GraphObject is attached; this is typically only used for TextBlocks or Panels that contain text.*/
-        static OrientMinus90Upright: EnumValue;
-
-        /**This value for GraphObject.segmentOrientation results in the GraphObject's angle always being 180 degrees opposite from the angle of the link's route at the segment where the GraphObject is attached.*/
-        static OrientOpposite: EnumValue;
-
-        /**This value for GraphObject.segmentOrientation results in the GraphObject is turned clockwise to be perpendicular to the route: the GraphObject's angle is always 90 degrees more than the angle of the link's route at the segment where the GraphObject is attached.*/
-        static OrientPlus90: EnumValue;
-
-        /**This value for GraphObject.segmentOrientation results in the GraphObject turned clockwise to be perpendicular to the route, just like Link.OrientPlus90, but is never upside down: the GraphObject's angle always being 90 degrees more than the angle of the link's route at the segment where the GraphObject is attached; this is typically only used for TextBlocks or Panels that contain text.*/
-        static OrientPlus90Upright: EnumValue;
-
-        /**This value for GraphObject.segmentOrientation results in the GraphObject turned to have the same angle as the route, just like Link.OrientAlong, but is never upside down: the GraphObject's angle always following the angle of the link's route at the segment where the GraphObject is attached; this is typically only used for TextBlocks or Panels that contain text.*/
-        static OrientUpright: EnumValue;
-
-        /**This value for GraphObject.segmentOrientation results in the GraphObject's angle always following the angle of the link's route at the segment where the GraphObject is attached, but never upside down and never angled more than +/- 45 degrees: when the route's angle is within 45 degrees of vertical (90 or 270 degrees), the GraphObject's angle is set to zero; this is typically only used for TextBlocks or Panels that contain text.*/
-        static OrientUpright45: EnumValue;
-
-        /**Used as a value for Link.routing: each segment is horizontal or vertical.*/
-        static Orthogonal: EnumValue;
-
-        /**Used as a value for Link.adjusting, to indicate that the link route computation should scale and rotate the intermediate points so that the link's shape looks approximately the same; if the routing is orthogonal, this value is treated as if it were Link.End.*/
-        static Scale: EnumValue;
-
-        /**Used as a value for Link.adjusting, to indicate that the link route computation should linearly interpolate the intermediate points so that the link's shape looks stretched; if the routing is orthogonal, this value is treated as if it were Link.End.*/
-        static Stretch: EnumValue;
-
-        routeBounds: Rect;  // undocumented
-        protected computeCorner(): number;  // undocumented
-        protected computeShortLength(from: boolean): number;  // undocumented
-        findMidLabel(): GraphObject;  // undocumented
-        protected arrangeBundledLinks(links: Array<Link>, reroute: boolean): void;  // undocumented
-        protected setPointAt(i: number, x: number, y: number): void;  // undocumented
-        protected insertPointAt(i: number, x: number, y: number): void;  // undocumented
-        protected addPointAt(x: number, y: number): void;  // undocumented
-        invalidateGeometry(): void;  // undocumented
-    }
-
-    /**
-    * A Node is a Part that may connect to other nodes with Links,
-    * or that may be a member of a Group.
-    * Group inherits from Node,
-    * enabling nodes to logically contain other nodes and links.
-    */
-    class Node extends Part {
-        /**
-        * Constructs an empty Node.
-        * @param {EnumValue=} type if not supplied, the default Panel type is Panel.Position.
-        */
-        constructor(type?: EnumValue);
-
-        /**Gets or sets whether this Node is to be avoided by Links whose Link.routing is Link.AvoidsNodes.*/
-        avoidable: boolean;
-
-        /**Gets or sets the Margin (or number for a uniform Margin) around this Node in which avoidable links will not be routed.*/
-        avoidableMargin: MarginLike;
-
-        /**This read-only property is true when this Node is a label node for a Link.*/
-        isLinkLabel: boolean;
-
-        /**Gets or sets whether the subtree graph starting at this node is expanded.*/
-        isTreeExpanded: boolean;
-
-        /**Gets whether this node has no tree children.*/
-        isTreeLeaf: boolean;
-
-        /**Gets or sets the Link for which this Node is acting as a smart label.*/
-        labeledLink: Link;
-
-        /**Gets or sets the function that is called after a Link has been connected with this Node.*/
-        linkConnected: (a: Node, b: Link, c: GraphObject) => void;
-
-        /**Gets or sets the function that is called after a Link has been disconnected from this Node.*/
-        linkDisconnected: (a: Node, b: Link, c: GraphObject) => void;
-
-        /**Gets or sets a predicate that determines whether or not a Link may be connected with this node; any of the arguments may be null.*/
-        linkValidation: (from: Node, fromPort: GraphObject, to: Node, toPort: GraphObject, link: Link) => boolean;
-
-        /**This read-only property returns an iterator over all of the Links that are connected with this node.*/
-        linksConnected: Iterator<Link>;
-
-        /**This read-only property returns the primary GraphObject representing a port in this node.*/
-        port: GraphObject;
-
-        /**This read-only property returns an iterator over all of the GraphObjects in this node that act as ports.*/
-        ports: Iterator<GraphObject>;
-
-        /**Gets or sets how link points are computed when the port spot is a "side" spot.*/
-        portSpreading: EnumValue;
-
-        /**Gets or sets the function that is called when .isTreeExpanded has changed value.*/
-        treeExpandedChanged: (node: Node) => void;
-
-        /**Gets or sets whether the subtree graph starting at this node had been collapsed by a call to .expandTree on the parent node.*/
-        wasTreeExpanded: boolean;
-
-        /**
-        * Hide each child node and the connecting link, and recursively collapse each child node.
-        * @param {number=} level How many levels of the tree, starting at this node, to keep expanded if already expanded;
-        *    the default is 1, hiding all tree children of this node.  Values less than 1 are treated as 1.
-        */
-        collapseTree(level?: number): void;
-
-        /**
-        * Show each child node and the connecting link, and perhaps recursively expand their child nodes.
-        * @param {number=} level How many levels of the tree should be expanded;
-        *    the default is 2, showing all tree children of this node and potentially more.
-        *    Values less than 2 are treated as 2.
-        */
-        expandTree(level?: number): void;
-
-        /**
-        * Returns an iterator over all of the Links that go from this node to another node or vice-versa, perhaps limited to a given port id on this node and a port id on the other node.
-        * @param {Node} othernode
-        * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
-        * @param {string|null=} otherpid A port identifier string; if null the link's portId is ignored and all links are included in the search.
-        */
-        findLinksBetween(othernode: Node, pid?: string, otherpid?: string): Iterator<Link>;
-
-        /**
-        * Returns an iterator over all of the Links that connect with this node in either direction, perhaps limited to the given port id on this node.
-        * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
-        */
-        findLinksConnected(pid?: string): Iterator<Link>;
-
-        /**
-        * Returns an iterator over all of the Links that go into this node, perhaps limited to the given port id on this node.
-        * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
-        */
-        findLinksInto(pid?: string): Iterator<Link>;
-
-        /**
-        * Returns an iterator over all of the Links that come out of this node, perhaps limited to the given port id on this node.
-        * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
-        */
-        findLinksOutOf(pid?: string): Iterator<Link>;
-
-        /**
-        * Returns an iterator over all of the Links that go from this node to another node, perhaps limited to a given port id on this node and a port id on the other node.
-        * @param {Node} othernode
-        * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
-        * @param {string|null=} otherpid A port identifier string; if null the link's portId is ignored and all links are included in the search.
-        */
-        findLinksTo(othernode: Node, pid?: string, otherpid?: string): Iterator<Link>;
-
-        /**
-        * Returns an iterator over the Nodes that are connected with this node in either direction, perhaps limited to the given port id on this node.
-        * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
-        */
-        findNodesConnected(pid?: string): Iterator<Node>;
-
-        /**
-        * Returns an iterator over the Nodes that are connected with this node by links going into this node, perhaps limited to the given port id on this node.
-        * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
-        */
-        findNodesInto(pid?: string): Iterator<Node>;
-
-        /**
-        * Returns an iterator over the Nodes that are connected with this node by links coming out of this node, perhaps limited to the given port id on this node.
-        * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
-        */
-        findNodesOutOf(pid?: string): Iterator<Node>;
-
-        /**
-        * Find a GraphObject with a given GraphObject.portId.
-        * @param {string} pid
-        */
-        findPort(pid: string): GraphObject;
-
-        /**
-        * Returns an Iterator for the collection of Links that connect with the immediate tree children of this node.
-        */
-        findTreeChildrenLinks(): Iterator<Link>;
-
-        /**
-        * Returns an Iterator for the collection of Nodes that are the immediate tree children of this node.
-        */
-        findTreeChildrenNodes(): Iterator<Node>;
-
-        /**
-        * Return how deep this node is in a tree structure.
-        * For tree root nodes, this returns zero.
-        */
-        findTreeLevel(): number;
-
-        /**
-        * Returns the Link that connects with the tree parent Node of this node if the graph is tree-structured, if there is such a link and Link.isTreeLink is true.
-        */
-        findTreeParentLink(): Link;
-
-        /**
-        * Returns the Node that is the tree parent of this node if the graph is tree-structured, if there is a parent.
-        */
-        findTreeParentNode(): Node;
-
-        /**
-        * Return a collection of Parts including this Node, all of the Links going to child Nodes, and all of their tree child nodes and links.
-        * @param {number=} level How many levels of the tree, starting at this node, to include;
-        *    the default is Infinity, including all tree children of this node.  Values less than 1 are treated as 1.
-        */
-        findTreeParts(level?: number): Set<Part>;
-
-        /**
-        * Return the Node that is at the root of the tree that this node is in, perhaps this node itself.
-        */
-        findTreeRoot(): Node;
-
-        /**
-        * This predicate is true if this node is a child of the given Node, perhaps indirectly as a descendant.
-        * @param {Node} node the Node that might be a parent or ancestor of this node.
-        */
-        isInTreeOf(node: Node): boolean;
-
-        /**This value for GraphObject.fromEndSegmentDirection and GraphObject.toEndSegmentDirection indicates that the link's end segment angle stays the same even if the node is rotated.*/
-        static DirectionAbsolute: EnumValue;
-
-        /**This value for Link.fromEndSegmentDirection and Link.toEndSegmentDirection indicates that the real value is inherited from the corresponding connected port.*/
-        static DirectionDefault: EnumValue;
-
-        /**This value for GraphObject.fromEndSegmentDirection and GraphObject.toEndSegmentDirection indicates that the link's end segment angle is rotated to match the node's angle.*/
-        static DirectionRotatedNode: EnumValue;
-
-        /**This value for GraphObject.fromEndSegmentDirection and GraphObject.toEndSegmentDirection indicates that the link's end segment angle is rotated to match the node's angle, but only in increments of 90 degrees.*/
-        static DirectionRotatedNodeOrthogonal: EnumValue;
-
-        /**This value for Node.portSpreading indicates that links connecting with a port should be distributed evenly along the side(s) indicated by a Spot that is a "side" Spot.*/
-        static SpreadingEvenly: EnumValue;
-
-        /**This value for Node.portSpreading indicates that links connecting with a port should connect at a single point on the side(s) indicated by a Spot that is a "side" Spot.*/
-        static SpreadingNone: EnumValue;
-
-        /**This value for Node.portSpreading indicates that links connecting with a port should be packed together based on the link's shape's width on the side(s) indicated by a Spot that is a "side" Spot.*/
-        static SpreadingPacked: EnumValue;
-
-        canAvoid(): boolean;  // undocumented
-        findVisibleNode(): Node;  // undocumented
-        getAvoidableRect(result: Rect): Rect;  // undocumented
-        invalidateLinkBundle(other: Node, thisportid?: string, otherportid?: string): void;  // undocumented
-        invalidateConnectedLinks(): void;  // undocumented
-    }
-
-    /**
-    * An Overview is a Diagram that displays all of a different diagram,
-    * with a rectangular box showing the viewport displayed by that other diagram.
-    * All you need to do is set Overview.observed.
-    */
-    class Overview extends Diagram {
-        /**
-        * @param {HTMLDivElement} div A reference to a DIV element in the DOM.
-        */
-        constructor(div: HTMLDivElement);
-        /**
-        * @param {string} id A reference to a DIV by its ID as a string.
-        */
-        constructor(id?: string);
-
-        /**Gets or sets the rectangular Part that represents the viewport of the .observed Diagram.*/
-        box: Part;
-
-        /**Gets or sets whether this overview draws the temporary layers of the observed Diagram.*/
-        drawsTemporaryLayers: boolean;
-
-        /**Gets or sets the Diagram for which this Overview is displaying a model and showing its viewport into that model.*/
-        observed: Diagram;
-    }
-
-    /**
-    * Palette extends the Diagram class to allow objects to be dragged and placed onto other Diagrams.
-    * Its Diagram.layout is a GridLayout.
-    * The Palette is Diagram.isReadOnly but to support drag-and-drop its Diagram.allowDragOut is true.
-    */
-    class Palette extends Diagram {
-        /**
-        * @param {HTMLDivElement} div A reference to a DIV in the DOM.
-        */
-        constructor(div: HTMLDivElement);
-        /**
-        * @param {string} id A reference to a DIV by its ID as a string.
-        */
-        constructor(id?: string);
-    }
-
-    /**
-    * A Panel is a GraphObject that holds other GraphObjects as its elements.
-    * A Panel is responsible for sizing and positioning its elements.
-    * Every Panel has a .type and establishes its own coordinate system. The .type of a Panel
-    * determines how it will size and arrange its elements.
-    */
-    class Panel extends GraphObject {
-        /**
-        * Constructs an empty Panel of the given .type.
-        * @param {EnumValue=} type If not supplied, the default Panel type is Panel.Position.
-        */
-        constructor(type?: EnumValue);
-
-        /**This read-only property returns the number of columns in this Panel if it is of .type Panel.Table.*/
-        columnCount: number;
-
-        /**Gets or sets how this Panel's columns deal with extra space if the Panel is of .type Panel.Table.*/
-        columnSizing: EnumValue;
-
-        /**Gets or sets the optional model data to which this panel is data-bound.*/
-        data: any;
-
-        /**Gets or sets the default alignment spot of this Panel, used as the alignment for an element when its GraphObject.alignment value is Spot.Default.*/
-        defaultAlignment: Spot;
-
-        /**Gets or sets the default dash array for a particular column's separator.*/
-        defaultColumnSeparatorDashArray: Array<number>;
-
-        /**Gets or sets the default Brush stroke (or CSS color string) for columns in a Table Panel provided a given column has a nonzero RowColumnDefinition.separatorStrokeWidth.*/
-        defaultColumnSeparatorStroke: BrushLike;
-
-        /**Gets or sets the default stroke width for a particular column's separator.*/
-        defaultColumnSeparatorStrokeWidth: number;
-
-        /**Gets or sets the default dash array for a particular row's separator.*/
-        defaultRowSeparatorDashArray: Array<number>;
-
-        /**Gets or sets the default Brush stroke (or CSS color string) for rows in a Table Panel provided a given row has a nonzero RowColumnDefinition.separatorStrokeWidth.*/
-        defaultRowSeparatorStroke: BrushLike;
-
-        /**Gets or sets the default stroke width for a particular row's separator.*/
-        defaultRowSeparatorStrokeWidth: number;
-
-        /**Gets or sets the additional padding for a particular row or column, a Margin (or number for a uniform Margin).*/
-        defaultSeparatorPadding: MarginLike;
-
-        /**Gets or sets the default stretch of this Panel, used as the stretch for an element when its GraphObject.stretch value is GraphObject.Default.*/
-        defaultStretch: EnumValue;
-
-        /**This read-only property returns an iterator over the collection of the GraphObjects that this panel manages.*/
-        elements: Iterator<GraphObject>;
-
-        /**Gets or sets the distance between lines in a .Grid panel.*/
-        gridCellSize: Size;
-
-        /**Gets or sets an origin point for the grid cells in a .Grid panel.*/
-        gridOrigin: Point;
-
-        /**Gets or sets a JavaScript Array of values or objects, each of which will be represented by a Panel as elements in this Panel.*/
-        itemArray: Array<any>;
-
-        /**Gets or sets the name of the item data property that returns a string describing that data's category, or a function that takes an item data object and returns that string; the default value is the name 'category'.*/
-        itemCategoryProperty: PropertyAccessor;
-
-        /**This read-only property returns the index of the item in the containing Panel's Panel.itemArray that this Panel represents.*/
-        itemIndex: number;
-
-        /**Gets or sets the default Panel template used as the archetype for item data that are in .itemArray.*/
-        itemTemplate: Panel;
-
-        /**Gets or sets a Map mapping template names to Panels.*/
-        itemTemplateMap: Map<string,Panel>;
-
-        /**Gets or sets the first column that this Panel of .type Panel.Table displays.*/
-        leftIndex: number;
-
-        /**Gets or sets the space between this Panel's border and its content, as a Margin (or number for a uniform Margin), depending on the type of panel.*/
-        padding: MarginLike;
-
-        /**This read-only property returns the number of row in this Panel if it is of .type Panel.Table.*/
-        rowCount: number;
-
-        /**Gets or sets how this Panel's rows deal with extra space if the Panel is of .type Panel.Table.*/
-        rowSizing: EnumValue;
-
-        /**Gets or sets the first row that this this Panel of .type Panel.Table displays.*/
-        topIndex: number;
-
-        /**Gets or sets the type of the Panel.*/
-        type: EnumValue;
-
-        /**Gets or sets how a .Viewbox panel will resize its content.*/
-        viewboxStretch: EnumValue;
-
-        /**
-        * Adds a GraphObject to the end of this Panel's list of elements, visually in front of all of the other elements.
-        * @param {GraphObject} element A GraphObject.
-        */
-        add(element: GraphObject): void;
-
-        /**
-        * Creates a deep copy of this Panel and returns it.
-        */
-        copy(): Panel;
-
-        /**
-        * Returns the GraphObject in this Panel's list of elements at the specified index.
-        * @param {number} idx a zero-based index
-        */
-        elt(idx: number): GraphObject;
-
-        /**
-        * Returns the cell at a given x-coordinate in local coordinates.
-        * @param {number} x
-        */
-        findColumnForLocalX(x: number): number;
-
-        /**
-        * Returns the first immediate child element with GraphObject.isPanelMain set to true,
-        * or if there is no such child element, just the first element.
-        */
-        findMainElement(): GraphObject;
-
-        /**
-        * Search the visual tree starting at this Panel for a GraphObject whose GraphObject.name is the given name.
-        * @param {string} name The name to search for, using a case-sensitive string comparison.
-        */
-        findObject(name: string): GraphObject;
-
-        /**
-        * Return the Panel that was made for a particular data object in this panel's itemArray.
-        * If this returns a Panel, its data property will be the argument data object.
-        */
-        findItemPanelForData(data: Object): Panel;
-
-        /**
-        * Returns the row at a given y-coordinate in local coordinates.
-        * @param {number} y
-        */
-        findRowForLocalY(y: number): number;
-
-        /**
-        * Gets the RowColumnDefinition for a particular column in this Table Panel.
-        * @param {number} idx the non-negative zero-based integer column index.
-        */
-        getColumnDefinition(idx: number): RowColumnDefinition;
-
-        /**
-        * Gets the RowColumnDefinition for a particular row in this Table Panel.
-        * @param {number} idx the non-negative zero-based integer row index.
-        */
-        getRowDefinition(idx: number): RowColumnDefinition;
-
-        /**
-        * Adds a GraphObject to the Panel's list of elements at the specified index.
-        * @param {number} index
-        * @param {GraphObject} element A GraphObject.
-        */
-        insertAt(index: number, element: GraphObject): void;
-
-        /**
-        * Create and add new GraphObjects corresponding to and bound to the data in the .itemArray, after removing all existing elements from this Panel.
-        */
-        rebuildItemElements(): void;
-
-        /**
-        * Removes a GraphObject from this Panel's list of elements.
-        * @param {GraphObject} element A GraphObject.
-        */
-        remove(element: GraphObject): void;
-
-        /**
-        * Removes an GraphObject from this Panel's list of elements at the specified index.
-        * @param {number} idx
-        */
-        removeAt(idx: number): void;
-
-        /**
-        * Removes the RowColumnDefinition for a particular row in this Table Panel.
-        * @param {number} idx the non-negative zero-based integer row index.
-        */
-        removeColumnDefinition(idx: number): void;
-
-        /**
-        * Removes the RowColumnDefinition for a particular row in this Table Panel.
-        * @param {number} idx the non-negative zero-based integer row index.
-        */
-        removeRowDefinition(idx: number): void;
-
-        /**
-        * Re-evaluate all data bindings on this panel, in order to assign new property values to the GraphObjects in this visual tree based on this this object's .data property values.
-        * @param {string=} srcprop An optional source data property name:
-        *   when provided, only evaluates those Bindings that use that particular property;
-        *   when not provided or when it is the empty string, all bindings are evaluated.
-        */
-        updateTargetBindings(srcprop?: string): void;
-
-        /**This value for .type resizes the main element to fit around the other elements; the main element is the first GraphObject with GraphObject.isPanelMain set to true, or else the first GraphObject if none have that property set to true.*/
-        static Auto: EnumValue;
-
-        /**This value for .type is used to draw regular patterns of lines.*/
-        static Grid: EnumValue;
-
-        /**This value for .type lays out the elements horizontally with their GraphObject.alignment property dictating their alignment on the Y-axis.*/
-        static Horizontal: EnumValue;
-
-        /**This value for .type is used for Links and adornments that act as Links.*/
-        static Link: EnumValue;
-
-        /**The default .type arranges each element according to their GraphObject.position.*/
-        static Position: EnumValue;
-
-        /**This value for .type arranges GraphObjects about a main element using the GraphObject.alignment and GraphObject.alignmentFocus properties; the main element is the first GraphObject with GraphObject.isPanelMain set to true, or else the first GraphObject if none have that property set to true.*/
-        static Spot: EnumValue;
-
-        /**This value for .type arranges GraphObjects into rows and columns; set the GraphObject.row and GraphObject.column properties on each element.*/
-        static Table: EnumValue;
-
-        /**Organizational Panel type that is only valid inside of a Table panel.*/
-        static TableColumn: EnumValue;
-
-        /**Organizational Panel type that is only valid inside of a Table panel.*/
-        static TableRow: EnumValue;
-
-        /**This value for .type lays out the elements vertically with their GraphObject.alignment property dictating their alignment on the X-axis.*/
-        static Vertical: EnumValue;
-
-        /**This value for .type rescales a single GraphObject to fit inside the panel depending on the element's GraphObject.stretch property.*/
-        static Viewbox: EnumValue;
-    }
-
-    /**
-    * This is the base class for all user-manipulated top-level objects.
-    * Because it inherits from Panel, it is automatically a visual container
-    * of other GraphObjects.
-    * Because it thus also inherits from GraphObject, it also has properties such as
-    * GraphObject.actualBounds, GraphObject.contextMenu, and GraphObject.visible.
-    */
-    class Part extends Panel {
-        /**
-        * The constructor builds an empty Part.
-        * @param {EnumValue=} type if not supplied, the default Panel type is Panel.Position.
-        */
-        constructor(type?: EnumValue);
-
-        /**This read-only property returns an iterator over all of the Adornments associated with this part.*/
-        adornments: Iterator<Adornment>;
-
-        /**Gets or sets the category of this part, typically used to distinguish different kinds of nodes or links.*/
-        category: string;
-
-        /**Gets or sets the Group of which this Part or Node is a member.*/
-        containingGroup: Group;
-
-        /**Gets or sets the function that is called after this Part has changed which Group it belongs to, if any.*/
-        containingGroupChanged: (member: Part, oldgrp: Group, newgrp: Group) => void;
-
-        /**Gets or sets whether the user may copy this part.*/
-        copyable: boolean;
-
-        /**Gets or sets whether the user may delete this part.*/
-        deletable: boolean;
-
-        /**This read-only property returns the Diagram that this Part is in.*/
-        diagram: Diagram;
-
-        /**Gets or sets the function used to determine the location that this Part can be dragged to.*/
-        dragComputation: (part: Part, oldloc: Point, newloc: Point) => Point;
-
-        /**Gets or sets whether the user may group this part to be a member of a new Group.*/
-        groupable: boolean;
-
-        /**Gets or sets whether this Part may be animated.*/
-        isAnimated: boolean;
-
-        /**Gets or sets whether this Part is highlighted.*/
-        isHighlighted: boolean;
-
-        /**Gets or sets whether this Part is part of the document bounds.*/
-        isInDocumentBounds: boolean;
-
-        /**Gets or sets whether a Layout positions this Node or routes this Link.*/
-        isLayoutPositioned: boolean;
-
-        /**Gets or sets whether this Part is selected.*/
-        isSelected: boolean;
-
-        /**Gets or sets whether this part will draw shadows.*/
-        isShadowed: boolean;
-
-        /**Gets whether this part is not member of any Group node nor is it a label node for a Link.*/
-        isTopLevel: boolean;
-
-        /**This read-only property returns the Layer that this Part is in.*/
-        layer: Layer;
-
-        /**Gets or sets the function to execute when this part changes layers.*/
-        layerChanged: (part: Part, oldlayer: Layer, newlayer: Layer) => void;
-
-        /**Gets or sets the layer name for this part.*/
-        layerName: string;
-
-        /**Gets or sets "Layout..." flags that control when the Layout that is responsible for this Part is invalidated.*/
-        layoutConditions: number;
-
-        /**Gets or sets the position of this part in document coordinates, based on the .locationSpot in this part's .locationObject.*/
-        location: Point;
-
-        /**This read-only property returns the GraphObject that determines the location of this Part.*/
-        locationObject: GraphObject;
-
-        /**Gets or sets the name of the GraphObject that provides the location of this Part.*/
-        locationObjectName: string;
-
-        /**Gets or sets the location Spot of this Node, the spot on the .locationObject that is used in positioning this part in the diagram.*/
-        locationSpot: Spot;
-
-        /**Gets or sets the maximum location of this Part to which the user may drag using the DraggingTool.*/
-        maxLocation: Point;
-
-        /**Gets or sets the minimum location of this Part to which the user may drag using the DraggingTool.*/
-        minLocation: Point;
-
-        /**Gets or sets whether the user may move this part.*/
-        movable: boolean;
-
-        /**Gets or sets whether the user may reshape this part.*/
-        reshapable: boolean;
-
-        /**Gets or sets whether the user may resize this part.*/
-        resizable: boolean;
-
-        /**Gets or sets the adornment template used to create a resize handle Adornment for this part.*/
-        resizeAdornmentTemplate: Adornment;
-
-        /**Gets or sets the width and height multiples used when resizing.*/
-        resizeCellSize: Size;
-
-        /**This read-only property returns the GraphObject that should get resize handles when this part is selected.*/
-        resizeObject: GraphObject;
-
-        /**Gets or sets the name of the GraphObject that should get a resize handle when this part is selected.*/
-        resizeObjectName: string;
-
-        /**Gets or sets whether the user may rotate this part.*/
-        rotatable: boolean;
-
-        /**Gets or sets the adornment template used to create a rotation handle Adornment for this part.*/
-        rotateAdornmentTemplate: Adornment;
-
-        /**This read-only property returns the GraphObject that should get rotate handles when this part is selected.*/
-        rotateObject: GraphObject;
-
-        /**Gets or sets the name of the GraphObject that should get a rotate handle when this part is selected.*/
-        rotateObjectName: string;
-
-        /**Gets or sets whether the user may select this part.*/
-        selectable: boolean;
-
-        /**Gets or sets whether a selection adornment is shown for this part when it is selected.*/
-        selectionAdorned: boolean;
-
-        /**Gets or sets the Adornment template used to create a selection handle for this Part.*/
-        selectionAdornmentTemplate: Adornment;
-
-        /**Gets or sets the function to execute when this part is selected or deselected.*/
-        selectionChanged: (p: Part) => void;
-
-        /**This read-only property returns the GraphObject that should get a selection handle when this part is selected.*/
-        selectionObject: GraphObject;
-
-        /**Gets or sets the name of the GraphObject that should get a selection handle when this part is selected.*/
-        selectionObjectName: string;
-
-        /**Gets or sets the numerical value that describes the shadow's blur.*/
-        shadowBlur: number;
-
-        /**Gets or sets the CSS string that describes a shadow color.*/
-        shadowColor: string;
-
-        /**Gets or sets the X and Y offset of this part's shadow.*/
-        shadowOffset: Point;
-
-        /**Gets or sets whether this GraphObject will be shadowed inside a Part that has Part.isShadowed set to true; default is null, meaning obey default shadow rules for Part.isShadowed.*/
-        shadowVisible: boolean;
-
-        /**Gets or sets a text string that is associated with this part.*/
-        text: string;
-
-        /**Gets or sets whether the user may do in-place text editing on TextBlocks in this part that have TextBlock.editable set to true.*/
-        textEditable: boolean;
-
-        /**Gets or sets the Z-ordering position of this Part within its Layer; default value is NaN which means "don't care".*/
-        zOrder: number;
-
-        /**
-        * Associate an Adornment with this Part, perhaps replacing any existing adornment.
-        * @param {string} category a string identifying the kind or role of the given adornment for this Part.
-        * @param {Adornment} ad
-        */
-        addAdornment(category: string, ad: Adornment): void;
-
-        /**
-        * This predicate returns true if .copyable is true, if the layer's Layer.allowCopy is true, and if the diagram's Diagram.allowCopy is true.
-        */
-        canCopy(): boolean;
-
-        /**
-        * This predicate returns true if .deletable is true, if the layer's Layer.allowDelete is true, and if the diagram's Diagram.allowDelete is true.
-        */
-        canDelete(): boolean;
-
-        /**
-        * This predicate returns true if .textEditable is true, if the layer's Layer.allowTextEdit is true, and if the diagram's Diagram.allowTextEdit is true.
-        */
-        canEdit(): boolean;
-
-        /**
-        * This predicate returns true if .groupable is true, if the layer's Layer.allowGroup is true, and if the diagram's Diagram.allowGroup is true.
-        */
-        canGroup(): boolean;
-
-        /**
-        * This predicate is called by Layout implementations to decide whether this Part should be positioned and might affect the positioning of other Parts.
-        */
-        canLayout(): boolean;
-
-        /**
-        * This predicate returns true if .movable is true, if the layer's Layer.allowMove is true, and if the diagram's Diagram.allowMove is true.
-        */
-        canMove(): boolean;
-
-        /**
-        * This predicate returns true if .reshapable is true, if the layer's Layer.allowReshape is true, and if the diagram's Diagram.allowReshape is true.
-        */
-        canReshape(): boolean;
-
-        /**
-        * This predicate returns true if .resizable is true, if the layer's Layer.allowResize is true, and if the diagram's Diagram.allowResize is true.
-        */
-        canResize(): boolean;
-
-        /**
-        * This predicate returns true if .rotatable is true, if the layer's Layer.allowRotate is true, and if the diagram's Diagram.allowRotate is true.
-        */
-        canRotate(): boolean;
-
-        /**
-        * This predicate returns true if .selectable is true, if the layer's Layer.allowSelect is true, and if the diagram's Diagram.allowSelect is true.
-        */
-        canSelect(): boolean;
-
-        /**
-        * Remove all adornments associated with this part.
-        */
-        clearAdornments(): void;
-
-        /**
-        * Measures if needed to make sure the GraphObject.measuredBounds and GraphObject.naturalBounds are all real numbers,
-        * primarily to get the actual width and height.
-        * GraphObject.actualBounds will get a real width and height, but the x and y values may continue to be <code>NaN</code>
-        * if they were that way beforehand.
-        */
-        ensureBounds(): void;
-
-        /**
-        * Find an Adornment of a given category associated with this Part.
-        * @param {string} category
-        */
-        findAdornment(category: string): Adornment;
-
-        /**
-        * Find the Group that contains both this part and another one.
-        * @param {Part} other
-        */
-        findCommonContainingGroup(other: Part): Group;
-
-        /**
-        * Return how deep this part is in the hierarchy of nested Groups.
-        * For top level parts, i.e. isTopLevel, this returns zero.
-        */
-        findSubGraphLevel(): number;
-
-        /**
-        * Gets the top-level Part for this part, which is itself when .isTopLevel is true.
-        */
-        findTopLevelPart(): Part;
-
-        /**
-        * Invalidate the Layout that is responsible for positioning this Part.
-        * @param {number=} condition the reason that the layout should be invalidated --
-        * some combination of "Layout..." flag values;
-        * if this argument is not supplied, any value of .layoutConditions other than Part.LayoutNone
-        * will allow the layout to be invalidated.
-        */
-        invalidateLayout(condition?: number): void;
-
-        /**
-        * This predicate is true if this part is a member of the given Part, perhaps indirectly.
-        * @param {Part} part
-        */
-        isMemberOf(part: Part): boolean;
-
-        /**
-        * This predicate is true if this Part can be seen.
-        */
-        isVisible(): boolean;
-
-        /**
-        * Move this part and any parts that are owned by this part to a new position.
-        * @param {Point} newpos a new Point in document coordinates.
-        */
-        move(newpos: Point): void;
-
-        /**
-        * Move this part and any parts that are owned by this part to a new position.
-        * @param {number} x the new X position in document coordinates.
-        * @param {number} y the new Y position in document coordinates.
-        */
-        moveTo(x: number, y: number): void;
-
-        /**
-        * Remove any Adornment of the given category that may be associated with this Part.
-        * @param {string} category a string identifying the kind or role of the given adornment for this Part.
-        */
-        removeAdornment(category: string): void;
-
-        /**
-        * This is responsible for creating any selection Adornment (if this Part .isSelected) and any tool adornments for this part.*/
-        updateAdornments(): void;
-
-        /**
-        * Re-evaluate all data bindings on this Part, in order to assign new property values to the GraphObjects in this visual tree based on this this object's .data property values.
-        * @param {string=} srcprop An optional source data property name:
-        *   when provided, only evaluates those Bindings that use that particular property;
-        *   when not provided or when it is the empty string, all bindings are evaluated.
-        */
-        updateTargetBindings(srcprop?: string): void;
-
-        /**
-        * Update all of the references to nodes in case they had been modified in the model without
-        * properly notifying the model by calling GraphLinksModel.setGroupKeyForNodeData or
-        * GraphLinksModel.setToKeyForLinkData or other similar methods.
-        */
-        updateRelationshipsFromData(): void;
-
-        /**This flag may be combined with other "Layout" flags as the value of the Part.layoutConditions property to indicate that when a Part is added to a Diagram or Group, it invalidates the Layout responsible for the Part.*/
-        static LayoutAdded: number;
-
-        /**This flag may be combined with other "Layout" flags as the value of the Part.layoutConditions property to indicate that when a Group has been laid out, it invalidates the Layout responsible for that Group; this flag is ignored for Parts that are not Groups.*/
-        static LayoutGroupLayout: number;
-
-        /**This flag may be combined with other "Layout" flags as the value of the Part.layoutConditions property to indicate that when a Part's GraphObject.visible becomes false, it invalidates the Layout responsible for the Part.*/
-        static LayoutHidden: number;
-
-        /**This flag may be combined with other "Layout" flags as the value of the Part.layoutConditions property to indicate that when a Node or simple Part's .category changes, it invalidates the Layout responsible for the Part; this flag is ignored for Parts that are Links.*/
-        static LayoutNodeReplaced: number;
-
-        /**This flag may be combined with other "Layout" flags as the value of the Part.layoutConditions property to indicate that when a Part's GraphObject.actualBounds changes size, it invalidates the Layout responsible for the Part; this flag is ignored for Parts that are Links.*/
-        static LayoutNodeSized: number;
-
-        /**This value may be used as the value of the Part.layoutConditions property to indicate that no operation on this Part causes invalidation of the Layout responsible for this Part.*/
-        static LayoutNone: number;
-
-        /**This flag may be combined with other "Layout" flags as the value of the Part.layoutConditions property to indicate that when a Part is removed from a Diagram or Group, it invalidates the Layout responsible for the Part.*/
-        static LayoutRemoved: number;
-
-        /**This flag may be combined with other "Layout" flags as the value of the Part.layoutConditions property to indicate that when a Part's GraphObject.visible becomes true, it invalidates the Layout responsible for the Part.*/
-        static LayoutShown: number;
-
-        /**This is the default value for the Part.layoutConditions property: the Layout responsible for the Part is invalidated when the Part is added or removed from the Diagram or Group or when it changes visibility or size or when a Group's layout has been performed.*/
-        static LayoutStandard: number;
-    }
-
-    /**
-    * A Picture is a GraphObject that shows an image, video-frame, or Canvas element.
-    * You can specify what to show by either setting the .source URL property
-    * to a URL string or the .element property to an HTMLImageElement,
-    * HTMLCanvasElement, or HTMLVideoElement.
-    */
-    class Picture extends GraphObject {
-        /**
-        * The constructor creates a picture that shows nothing until the .source or .element is specified.
-        */
-        constructor();
-
-        /**Gets or sets the Picture's HTML element, an Image or Video or Canvas element.*/
-        element: HTMLElement;
-
-        /**Gets or sets the function to call if an image fails to load.*/
-        errorFunction: (pic: Picture, e: Event) => void;
-
-        /**Gets or sets how the Picture's image is stretched within its bounding box.*/
-        imageStretch: EnumValue;
-
-        /**This read-only property returns the natural size of this picture as determined by its source's width and height.*/
-        naturalBounds: Rect;
-
-        /**Gets or sets the Picture's source URL, which can be any valid image (png, jpg, gif, etc) URL.*/
-        source: string;
-
-        /**Gets or sets a function that returns a value for image.crossOrigin, which is null by default.*/
-        sourceCrossOrigin: (pic: Picture) => string;
-
-        /**Gets or sets the rectangular area of the source image that this picture should display.*/
-        sourceRect: Rect;
-
-        static clearCache(url?: string): void;  // undocumented
-    }
-
-    /**
-    * If a Placeholder is in the visual tree of a Group, it represents the area of all of the member Parts of that Group.
-    * If a Placeholder is in the visual tree of an Adornment, it represents the area of the Adornment.adornedObject.
-    * It can only be used in the visual tree of a Group node or an Adornment.
-    * There can be at most one Placeholder in a Group or an Adornment.
-    */
-    class Placeholder extends GraphObject {
-        /**
-        * The only common initialize of a Placeholder is to set its .padding.
-        */
-        constructor();
-
-        /**Gets or sets the padding as a Margin (or number for a uniform Margin) around the members of the Group or around the Adornment.adornedObject GraphObject.*/
-        padding: MarginLike;
-    }
-
-    /**
-    * The RowColumnDefinition class describes constraints on a row or a column
-    * in a Panel of type Panel.Table.
-    * It also provides information about the actual layout after the
-    * Table Panel has been arranged.
-    */
-    class RowColumnDefinition {
-        /**
-        * You do not need to use this constructor, because calls to Panel.getRowDefinition or Panel.getColumnDefinition will automatically create and remember a RowColumnDefinition for you.
-        */
-        constructor();
-
-        /**This read-only property returns the usable row height or column width, after arrangement, that objects in this row or column can be placed within.*/
-        actual: number;
-
-        /**Gets or sets a default alignment for elements that are in this row or column.*/
-        alignment: Spot;
-
-        /**Gets or sets the background Brush (or CSS color string) for a particular row or column, which fills the entire span of the column, including any separatorPadding.*/
-        background: BrushLike;
-
-        /**Determines whether or not the background, if there is one, is in front of or behind the separators.*/
-        coversSeparators: boolean;
-
-        /**Gets or sets the row height.*/
-        height: number;
-
-        /**This read-only property returns which row or column this RowColumnDefinition describes in the .panel.*/
-        index: number;
-
-        /**This read-only property returns whether this describes a row or a column in the .panel.*/
-        isRow: boolean;
-
-        /**Gets or sets the maximum row height or column width.*/
-        maximum: number;
-
-        /**Gets or sets the minimum row height or column width.*/
-        minimum: number;
-
-        /**This read-only property returns the Panel that this row or column definition is in.*/
-        panel: Panel;
-
-        /**This read-only property returns the actual arranged row or column starting position, after arrangement.*/
-        position: number;
-
-        /**Gets or sets the dash array for dashing the spacing provided this row or column has a nonzero RowColumnDefinition.separatorStrokeWidth and non-null RowColumnDefinition.separatorStroke.*/
-        separatorDashArray: Array<number>;
-
-        /**Gets or sets the additional padding for a particular row or column, a Margin (or number for a uniform Margin).*/
-        separatorPadding: MarginLike;
-
-        /**Gets or sets the Brush (or CSS color string) for a particular row or column, provided that row or column has a nonzero RowColumnDefinition.separatorStrokeWidth.*/
-        separatorStroke: BrushLike;
-
-        /**Gets or sets the stroke width for a particular row or column's separator,*/
-        separatorStrokeWidth: number;
-
-        /**Gets or sets how this row or column deals with a Table Panel's extra space.*/
-        sizing: EnumValue;
-
-        /**Gets or sets the default stretch for elements that are in this row or column.*/
-        stretch: EnumValue;
-
-        /**This read-only property returns the total arranged row height or column width, after arrangement.*/
-        total: number;
-
-        /**Gets or sets the column width.*/
-        width: number;
-
-        /**
-        * Add a data-binding of a property on this object to a property on a data object.
-        * @param {Binding} binding
-        */
-        bind(binding: Binding): void;
-
-        /**The default .sizing, which resolves to RowColumnDefinition.None or else the Table Panel's rowSizing and columnSizing if present.*/
-        static Default: EnumValue;
-
-        /**The default .sizing if none is specified on the Table Panel's rowSizing and columnSizing.*/
-        static None: EnumValue;
-
-        /**If a Table Panel is larger than all the rows then this .sizing grants this row and any others with the same value the extra space, apportioned proportionally between them*/
-        static ProportionalExtra: EnumValue;
-
-        computeEffectiveSpacing(): number;  // undocumented
-        computeEffectiveSpacingTop(): number;  // undocumented
-    }
-
-    /**
-    * A Shape is a GraphObject that shows a geometric figure.
-    * The Geometry determines what is drawn;
-    * the properties .fill and .stroke
-    * (and other stroke properties) determine how it is drawn.
-    */
-    class Shape extends GraphObject {
-        /**
-        * A newly constructed Shape has a default .figure of "None", which constructs a rectangular geometry, and is filled and stroked with a black brush.
-        */
-        constructor();
-
-        /**Gets or sets the figure name, used to construct a Geometry.*/
-        figure: string;
-
-        /**Gets or sets the Brush (or CSS color string) that describes the fill of the Shape.*/
-        fill: BrushLike;
-
-        /**Gets or sets the name of the kind of arrowhead that this shape should take when this shape is an element of a Link.*/
-        fromArrow: string;
-
-        /**Gets or sets the Shape's Geometry that defines the Shape's figure.*/
-        geometry: Geometry;
-
-        /**Gets or sets how the shape's geometry is proportionally created given its computed size.*/
-        geometryStretch: EnumValue;
-
-        /**When set, creates a Geometry and normalizes it from a given path string, then sets the Geometry on this Shape and offsets the GraphObject.position by an appropriate amount.*/
-        geometryString: string;
-
-        /**Gets or sets how frequently this shape should be drawn within a Grid Panel, in multiples of the Panel.gridCellSize.*/
-        interval: number;
-
-        /**Gets or sets the whether the .position denotes the panel coordinates of the geometry or of the stroked area.*/
-        isGeometryPositioned: boolean;
-
-        /**This read-only property returns the natural bounds of this Shape as determined by its .geometry's bounds.*/
-        naturalBounds: Rect;
-
-        /**Gets or sets a property for parameterizing the construction of a Geometry from a figure.*/
-        parameter1: number;
-
-        /**Gets or sets a property for parameterizing the construction of a Geometry from a figure.*/
-        parameter2: number;
-
-        /**Gets or sets the top-left Spot used by some Panels for determining where in the shape other objects may be placed.*/
-        spot1: Spot;
-
-        /**Gets or sets the bottom-right Spot used by some Panels for determining where in the shape other objects may be placed.*/
-        spot2: Spot;
-
-        /**Gets or sets the Brush (or CSS color string) that describes the stroke of the Shape.*/
-        stroke: BrushLike;
-
-        /**Gets or sets the style for the stroke's line cap.*/
-        strokeCap: string;
-
-        /**Gets or sets the dash array for creating dashed lines.*/
-        strokeDashArray: Array<number>;
-
-        /**Gets or sets the offset for dashed lines, used in the phase pattern.*/
-        strokeDashOffset: number;
-
-        /**Gets or sets the type of corner that will be drawn when two lines meet.*/
-        strokeJoin: string;
-
-        /**Gets or sets the style for the stroke's mitre limit ratio.*/
-        strokeMiterLimit: number;
-
-        /**Gets or sets a stroke's width.*/
-        strokeWidth: number;
-
-        /**Gets or sets the name of the kind of arrowhead that this shape should take when this shape is an element of a Link.*/
-        toArrow: string;
-
-        /**
-        * This static function returns a read-only Map of named geometry generators.
-        * @return {Map} the keys are figure names; the values are either synonymed names or generator functions
-        */
-        static getFigureGenerators(): Map<string,(shape: Shape, width: number, height: number) => Geometry>;
-
-        /**
-        * This static function defines a named figure geometry generator for Shapes.
-        * @param {string} name new figure name must start with an uppercase letter, and must not be "None"
-        * @param {function(Shape, number, number):Geometry} func returns a Geometry for the given Shape, width, and height
-        */
-        static defineFigureGenerator(name: string, func: (shape: Shape, width: number, height: number) => Geometry): void;
-        /**
-        * This static function defines a synonym for a named figure geometry generator.
-        * @param {string} name the new figure name must start with an uppercase letter, and must not be "None"
-        * @param {string} synonym an existing figure name
-        */
-        static defineFigureGenerator(name: string, synonym: string): void;
-
-        /**
-        * This static function returns a read-only Map of named arrowhead geometries.
-        * @return {Map} the keys are arrowhead names; the values are Geometry objects
-        */
-        static getArrowheadGeometries(): Map<string,Geometry>;
-
-        /**
-        * This static function defines a named arrowhead geometry.
-        * @param {string} name the new arrowhead name must start with an uppercase letter, and must not be "None"
-        * @param {Geometry} geo the Geometry for the arrowhead
-        */
-        static defineArrowheadGeometry(name: string, geo: Geometry): void;
-        /**
-        * This static function defines a named arrowhead geometry.
-        * @param {string} name the new arrowhead name must start with an uppercase letter, and must not be "None"
-        * @param {string} pathstr a geometry path string that will be passed to Geometry.parse
-        */
-        static defineArrowheadGeometry(name: string, pathstr: string): void;
-    }
-
-    /**
-    * A TextBlock is a GraphObject that displays a .text string in a given .font.
-    */
-    class TextBlock extends GraphObject {
-        /**
-        * A newly constructed TextBlock has no string to show; if it did, it would draw the text, wrapping if needed, in the default font using a black stroke.
-        */
-        constructor();
-
-        /**Gets or sets whether or not this TextBlock allows in-place editing of the .text string by the user with the help of the TextEditingTool.*/
-        editable: boolean;
-
-        /**Gets or sets the function to call if a text edit made with the TextEditingTool is invalid.*/
-        errorFunction: (tool: TextEditingTool, oldstr: string, newstr: string) => void;
-
-        /**Gets or sets the current font settings.*/
-        font: string;
-
-        /**Gets or sets whether or not the text allows or displays multiple lines or embedded newlines.*/
-        isMultiline: boolean;
-
-        /**Gets or sets whether or not the text has a strikethrough line (line-through).*/
-        isStrikethrough: boolean;
-
-        /**Gets or sets whether or not the text is underlined.*/
-        isUnderline: boolean;
-
-        /**This read-only property returns the total number of lines in this TextBlock, including lines created from returns and wrapping.*/
-        lineCount: number;
-
-        /**Gets or sets the maximum number of lines that this TextBlock may display.*/
-        maxLines: number;
-
-        /**This read-only property returns the natural bounds of this TextBlock in local coordinates, as determined by its .font and .text string.*/
-        naturalBounds: Rect;
-
-        /**Gets or sets how text that is too long to display should be handled.*/
-        overflow: EnumValue;
-
-        /**Gets or sets the Brush (or CSS color string) that describes the stroke (color) of the .font.*/
-        stroke: BrushLike;
-
-        /**Gets or sets the current text string.*/
-        text: string;
-
-        /**Gets or sets the current text alignment property.*/
-        textAlign: string;
-
-        /**Gets or sets the HTMLElement that this TextBlock uses as its text editor in the TextEditingTool.*/
-        textEditor: HTMLElement;
-
-        /**Gets or sets the predicate that determines whether or not a string of text is valid.*/
-        textValidation: (tb: TextBlock, oldstr: string, newstr: string) => boolean;
-
-        /**Gets or sets whether the text should be wrapped if it is too long to fit on one line.*/
-        wrap: EnumValue;
-
-        /**The TextBlock will not wrap its text.*/
-        static None: EnumValue;
-
-        /** Used as the default value for TextBlock.overflow: if the width is too small to display all text, the TextBlock will clip.*/
-        static OverflowClip: EnumValue;
-
-        /** Used as a value for TextBlock.overflow: if the width is too small to display all text, the TextBlock will display an ellipsis.*/
-        static OverflowEllipsis: EnumValue;
-
-        /**The TextBlock will wrap text and the width of the TextBlock will be the desiredSize's width, if any.*/
-        static WrapDesiredSize: EnumValue;
-
-        /**The TextBlock will wrap text, making the width of the TextBlock equal to the width of the longest line.*/
-        static WrapFit: EnumValue;
-
-        spacingAbove: number;  // undocumented
-        spacingBelow: number;  // undocumented
-        static isValidFont(font: string): boolean;  // undocumented
-        static getEllipsis(): string;  // undocumented
-        static setEllipsis(val: string): void;  // undocumented
-    }
-
-
-    /**
-    * A Brush holds color information and describes how to draw the inside
-    * of a Shape or the stroke of a shape or a TextBlock or the
-    * background of any GraphObject.
-    * A Brush must not be modified once it has been assigned to a GraphObject,
-    * such as the Shape.fill or TextBlock.stroke
-    * or GraphObject.background.
-    * However, a Brush may be shared by multiple GraphObjects.
-    */
-    class Brush {
-        /**
-        * Construct a Brush class of a given type.
-        * @param {EnumValue} type one of the values  Brush.Solid, Brush.Linear, Brush.Radial, Brush.Pattern.
-        */
-        constructor(type: EnumValue);
-        /**
-        * Construct a solid color Brush that holds the given color information.
-        * @param {string=} color a well-formed CSS string describing a solid color brush; if not supplied uses 'black'.
-        */
-        constructor(color?: string);
-
-        /**Gets or sets the color of a solid Brush.*/
-        color: string;
-
-        /**Gets or sets a Map holding all of the color stops used in this gradient, where the key is a number, the fractional distance between zero and one (inclusive), and where the corresponding value is a color string.*/
-        colorStops: Map<number,string>;
-
-        /**Gets or sets the ending location for a linear or radial gradient.*/
-        end: Spot;
-
-        /**Gets or sets the radius of a radial brush at the end location.*/
-        endRadius: number;
-
-        /**Gets or sets the pattern of a brush of type Brush.Pattern, an HTMLImageElement or HTMLCanvasElement or HTMLVideoElement.*/
-        pattern: any;
-
-        /**Gets or sets the starting location for a linear or radial gradient.*/
-        start: Spot;
-
-        /**Gets or sets the radius of a radial brush at the start location.*/
-        startRadius: number;
-
-        /**Gets or sets the type of brush.*/
-        type: EnumValue;
-
-        /**
-        * Specify a particular color at a particular fraction of the distance.
-        * If the  .type is Brush.Solid, change the type to Brush.Linear.
-        * You should have a color stop at zero and a color stop at one.
-        * You should not have duplicate color stop values at the same fractional distance.
-        * @param {number} loc between zero and one, inclusive.
-        * @param {string} color a CSS color string
-        */
-        addColorStop(loc: number, color: string): void;
-
-        /**
-        * Create a copy of this Brush, with the same values.
-        */
-        copy(): Brush;
-
-        /**
-        * This static function can be used to generate a random color string.
-        * @param {number=} min a number between zero and 255, defaults to 128.
-        * @param {number=} max a number between zero and 255, defaults to 255.
-        */
-        static randomColor(min?: number, max?: number): string;
-
-        /**For linear gradient brushes, used as the value for Brush.type.*/
-        static Linear: EnumValue;
-
-        /**For pattern brushes, used as the value for Brush.type.*/
-        static Pattern: EnumValue;
-
-        /**For radial gradient brushes, used as the value for Brush.type.*/
-        static Radial: EnumValue;
-
-        /**For simple, solid color brushes, used as the value for Brush.type.*/
-        static Solid: EnumValue;
-
-        static isValidColor(color: string): boolean;  // undocumented
-    }
-
-    /**
-    * The Geometry class is used to define the "shape" of a Shape.
-    * A Geometry can be simple straight lines, rectangles, or ellipses.
-    * A Geometry can also be an arbitrarily complex path, consisting of a list of PathFigures.
-    * A Geometry must not be modified once it has been used by a Shape.
-    * However, a Geometry may be shared by multiple Shapes.
-    */
-    class Geometry {
-        /**
-        * Construct an empty Geometry.
-        * The geometry type must be one of the following values:
-        * Geometry.Line, Geometry.Ellipse, Geometry.Rectangle, Geometry.Path.
-        * @param {EnumValue=} type If not supplied, the default Geometry type is Geometry.Path.
-        */
-        constructor(type?: EnumValue);
-
-        /**This read-only property returns a rectangle that contains all points within the Geometry.*/
-        bounds: Rect;
-
-        /**Gets or sets the Shape.geometryStretch value the Shape should use by default.*/
-        defaultStretch: EnumValue;
-
-        /**Gets or sets the ending X coordinate of the Geometry if it is of type .Line, .Rectangle, or .Ellipse.*/
-        endX: number;
-
-        /**Gets or sets the ending Y coordinate of the Geometry if it is of type .Line, .Rectangle, or .Ellipse.*/
-        endY: number;
-
-        /**Gets or sets the List of PathFigures that describes the content of the path for Geometries of type .Path.*/
-        figures: List<PathFigure>;
-
-        /**Gets or sets the spot to use when the Shape.spot1 value is Spot.Default.*/
-        spot1: Spot;
-
-        /**Gets or sets the spot to use when the Shape.spot2 value is Spot.Default.*/
-        spot2: Spot;
-
-        /**Gets or sets the starting X coordinate of the Geometry if it is of type .Line, .Rectangle, or .Ellipse.*/
-        startX: number;
-
-        /**Gets or sets the starting Y coordinate of the Geometry if it is of type .Line, .Rectangle, or .Ellipse.*/
-        startY: number;
-
-        /**Gets or sets the type of the Geometry.*/
-        type: EnumValue;
-
-        /**
-        * Add a PathFigure to the figures list.
-        * @param {PathFigure} figure a newly allocated unshared PathFigure that will become owned by this Geometry
-        * @return {Geometry} this
-        */
-        add(figure: PathFigure): Geometry;
-
-        /**
-        * Computes the Geometry's bounds without adding an origin point, and returns those bounds as a rect.
-        */
-        computeBoundsWithoutOrigin(): Rect;
-
-        /**
-        * Create a copy of this Geometry, with the same values and figures.
-        */
-        copy(): Geometry;
-
-        /**
-        * Given a SVG or GoJS path string, returns a congruent path string with each PathFigure filled.
-        * For instance, "M0 0 L22 22 L33 0" would become "F M0 0 L22 22 L33 0".
-        * @param {string} str
-        */
-        static fillPath(str: string): string;
-
-        /**
-        * Normalizes the Geometry points in place by ensuring the top-left bounds of the geometry lines up with (0, 0), returning the Point (x, y) amount it was shifted.
-        */
-        normalize(): Point;
-
-        /**
-        * Offsets the Geometry in place by a given (x, y) amount
-        * @param {number} x The x-axis offset factor.
-        * @param {number} y The y-axis offset factor.
-        * @return {Geometry} this
-        */
-        offset(x: number, y: number): Geometry;
-
-        /**
-        * Produce a Geometry from a string that uses an SVG-like compact path geometry syntax.
-        * @param {string} str
-        * @param {boolean=} filled whether figures should be filled.
-        * If true, all PathFigures in the string will be filled regardless of the presence
-        * of an "F" command or not.
-        * If false, all PathFigures will determine their own filled state by the presence of an "F" command or not.
-        * Default is false.
-        */
-        static parse(str: string, filled?: boolean): Geometry;
-
-        /**
-        * Rotates the Geometry in place by a given angle, with optional x and y values to rotate the geometry about.
-        * If no x and y value are giving, (0, 0) is used as the rotation point.
-        * @param {number} angle The angle to rotate by.
-        * @param {number=} x The optional X point to rotate the geometry about. If no point is given, this value is 0.
-        * @param {number=} y The optional Y point to rotate the geometry about. If no point is given, this value is 0.
-        * @return {Geometry} this
-        */
-        rotate(angle: number, x?: number, y?: number): Geometry;
-
-        /**
-        * Scales the Geometry in place by a given (x, y) scale factor
-        * @param {number} x The x-axis scale factor.
-        * @param {number} y The y-axis scale factor.
-        * @return {Geometry} this
-        */
-        scale(x: number, y: number): Geometry;
-
-        /**
-        * This static function can be used to write out a Geometry as a string
-        * that can be read by Geometry.parse.
-        * The string produced by this method is a superset of the SVG path
-        * string rules that contains some additional GoJS-specific tokens.
-        * See the <a href="../../intro/pictures.html">Introduction page on Geometry Parsing</a> for more details.
-        * @param {Geometry} val
-        */
-        static stringify(val: Geometry): string;
-
-        /**For drawing an ellipse fitting within a rectangle; a value for Geometry.type.*/
-        static Ellipse: EnumValue;
-
-        /**For drawing a simple straight line; a value for Geometry.type.*/
-        static Line: EnumValue;
-
-        /**For drawing a complex path made of a list of PathFigures; a value for Geometry.type.*/
-        static Path: EnumValue;
-
-        /**For drawing a rectangle; a value for Geometry.type.*/
-        static Rectangle: EnumValue;
-
-        equalsApprox(g: Geometry): boolean;  // undocumented
-    }
-
-    /**
-    * A Margin represents a band of space outside or inside a rectangular area,
-    * with possibly different values on each of the four sides.
-    */
-    class Margin {
-        /**
-        * If zero arguments are supplied, zero is used for all four sides.
-        */
-        constructor();
-        /**
-        * If one argument is supplied, that number is used for all four sides.
-        * @param {number} m the margin for all four sides.
-        */
-        constructor(m: number);
-        /**
-        * If two arguments are supplied, the top and bottom sides get the first value,
-        * and the left and right sides get the second value.
-        * @param {number} tb the margin for the top and bottom sides
-        * @param {number} rl the margin for the right and left sides
-        */
-        constructor(tb: number, rl: number);
-        /**
-        * If there are four arguments, the numbers represent: top, right, bottom, left.
-        * @param {number} t the margin for the top side;
-        *                    if not supplied, all sides are zero.
-        * @param {number} r the margin for the right side;
-        *                    if not supplied, all sides have the value of the first argument.
-        * @param {number} b the margin for all bottom side;
-        *                    if not supplied, the top and bottom get the value of the first argument,
-        *                    and the right and left sides get the value of the second argument.
-        * @param {number} l the margin for the left side;
-        *                    must be supplied if the third argument was supplied.
-        */
-        constructor(t: number, r: number, b: number, l: number);
-
-        /**Gets or sets the bottom value of this margin.*/
-        bottom: number;
-
-        /**Gets or sets the left value of this margin.*/
-        left: number;
-
-        /**Gets or sets the right value of this margin.*/
-        right: number;
-
-        /**Gets or sets the top value of this margin.*/
-        top: number;
-
-        /**
-        * Create a copy of this Margin, with the same values.
-        */
-        copy(): Margin;
-
-        /**
-        * Indicates whether the given Margin is equal to this Margin.
-        * @param {Margin} m The Margin to compare to this Margin.
-        */
-        equals(m: Margin): boolean;
-
-        /**
-        * Indicates whether the given margin is equal to this Margin.
-        * @param {number} t top.
-        * @param {number} r right.
-        * @param {number} b bottom.
-        * @param {number} l left.
-        */
-        equalTo(t: number, r: number, b: number, l: number): boolean;
-
-        /**
-        * True if this Margin has values that are real numbers and not infinity.
-        */
-        isReal(): boolean;
-
-        /**
-        * This static function can be used to read in a Margin from a string that was produced by Margin.stringify.
-        * @param {string} str
-        */
-        static parse(str: string): Margin;
-
-        /**
-        * Modify this Margin so that its Top, Right, Bottom, and Left values are the same as the given Margin.
-        * @param {Margin} m the Margin whose values are to be copied
-        */
-        set(m: Margin): Margin;
-
-        /**
-        * Modify this Size with new Width and Height values.
-        * @param {number} w the width.
-        * @param {number} h the height.
-        */
-        setTo(t: number, r: number, b: number, l: number): Margin;
-
-        /**
-        * This static function can be used to write out a Margin as a string that can be read by Margin.parse.
-        * @param {Margin} val
-        */
-        static stringify(val: Margin): string;
-
-        equalsApprox(m: Margin): boolean;  // undocumented
-    }
-
-    /**
-    * A PathFigure represents a section of a Geometry.
-    * It is a single connected series of
-    * two-dimensional geometric PathSegments.
-    */
-    class PathFigure {
-        /**
-        * Constructs an empty figure.
-        * The optional arguments specify the starting point of the figure.
-        * You'll want to add a new instance of a PathFigure to the
-        * Geometry.figures list of a Geometry.
-        * @param {number=} sx optional: the X coordinate of the start point (default is zero).
-        * @param {number=} sy optional: the Y coordinate of the start point (default is zero).
-        * @param {boolean=} filled optional: whether the figure is filled (default is true).
-        * @param {boolean=} shadowed optional: whether the figure may be drawn with a shadow (default is true).
-        */
-        constructor(sx?: number, sy?: number, filled?: boolean, shadowed?: boolean);
-
-        /**Gets or sets whether this PathFigure is drawn filled.*/
-        isFilled: boolean;
-
-        /**Gets or sets whether this PathFigure will render a shadow if one is defined.*/
-        isShadowed: boolean;
-
-        /**Gets or sets the List of PathSegments that define this PathFigure.*/
-        segments: List<PathSegment>;
-
-        /**Gets or sets the starting point X coordinate of the PathFigure.*/
-        startX: number;
-
-        /**Gets or sets the starting point Y coordinate of the PathFigure.*/
-        startY: number;
-
-        /**
-        * Add a PathSegment to the segments list.
-        * @param {PathSegment} segment a newly allocated unshared PathSegment that will become owned by this PathFigure
-        * @return {PathFigure} this
-        */
-        add(segment: PathSegment): PathFigure;
-
-        /**
-        * Create a copy of this PathFigure, with the same values and segments.
-        */
-        copy(): PathFigure;
-
-        equalsApprox(f: PathFigure): boolean;  // undocumented
-    }
-
-    /**
-    * A PathSegment represents a straight line or curved segment of a path between
-    * two or more points that are part of a PathFigure.
-    * A PathSegment must not be modified once its containing PathFigure's
-    * Geometry has been assigned to a Shape.
-    */
-    class PathSegment {
-        /**
-        * Constructs a segment that goes nowhere unless you specify some Points.
-        * @param {EnumValue} type
-        * @param {number=} ex optional: the X coordinate of the end point.
-        * @param {number=} ey optional: the Y coordinate of the end point.
-        * @param {number=} x1 optional: the X coordinate of the first bezier control point.
-        * @param {number=} y1 optional: the Y coordinate of the first bezier control point.
-        * @param {number=} x2 optional: the X coordinate of the second cubic bezier control point.
-        * @param {number=} y2 optional: the Y coordinate of the second cubic bezier control point,
-        * or the large-arc-flag of an SvgArc.
-        * @param {boolean=} clockwise optional: whether an SvgArc goes clockwise or counterclockwise.
-        */
-        constructor(type: EnumValue, ex?: number, ey?: number, x1?: number, y1?: number, x2?: number, y2?: number, clockwise?: boolean);
-
-        /**Gets or sets the center X value of the Arc for a PathSegment of type .Arc.*/
-        centerX: number;
-
-        /**Gets or sets the center Y value of the Arc for a PathSegment of type .Arc.*/
-        centerY: number;
-
-        /**Gets or sets the X coordinate of the end point for all kinds of PathSegment.*/
-        endX: number;
-
-        /**Gets or sets the Y coordinate of the end point for all kinds of PathSegment.*/
-        endY: number;
-
-        /**Gets or sets the sweep-flag for a PathSegment of type .SvgArc.*/
-        isClockwiseArc: boolean;
-
-        /**Gets or sets whether the path is closed after this PathSegment.*/
-        isClosed: boolean;
-
-        /**Gets or sets the large-arc-flag for a PathSegment of type .SvgArc.*/
-        isLargeArc: boolean;
-
-        /**Gets or sets the X value of the first control point for a PathSegment of type .Bezier or .QuadraticBezier.*/
-        point1X: number;
-
-        /**Gets or sets the Y value of the first control point for a PathSegment of type .Bezier or .QuadraticBezier.*/
-        point1Y: number;
-
-        /**Gets or sets the X value of the second control point for a PathSegment of type cubic .Bezier.*/
-        point2X: number;
-
-        /**Gets or sets the Y value of the second control point for a PathSegment of type cubic .Bezier.*/
-        point2Y: number;
-
-        /**Gets or sets the X value of the radius for a PathSegment of type .Arc.*/
-        radiusX: number;
-
-        /**Gets or sets the Y value of the radius for a PathSegment of type .Arc.*/
-        radiusY: number;
-
-        /**Gets or sets the starting angle for a PathSegment of type .Arc.*/
-        startAngle: number;
-
-        /**Gets or sets the length of angle in degrees, or amount of arc to "sweep" for a PathSegment of type .Arc.*/
-        sweepAngle: number;
-
-        /**Gets or sets the type of the PathSegment.*/
-        type: EnumValue;
-
-        /**Gets or sets the X-axis rotation for a PathSegment of type .SvgArc.*/
-        xAxisRotation: number;
-
-        /**
-        * Closes the path after this PathSegment.
-        */
-        close(): PathSegment;
-
-        /**
-        * Makes a copy of this PathSegment.
-        */
-        copy(): PathSegment;
-
-        /**For drawing an arc segment, a value for PathSegment.type.*/
-        static Arc: EnumValue;
-
-        /**For drawing a cubic bezier segment, a value for PathSegment.type.*/
-        static Bezier: EnumValue;
-
-        /**For drawing a straight line segment, a value for PathSegment.type.*/
-        static Line: EnumValue;
-
-        /**For beginning a new subpath, a value for PathSegment.type.*/
-        static Move: EnumValue;
-
-        /**For drawing a quadratic bezier segment, a value for PathSegment.type.*/
-        static QuadraticBezier: EnumValue;
-
-        /**For drawing an SVG arc segment, a value for PathSegment.type.*/
-        static SvgArc: EnumValue;
-
-        equalsApprox(s: PathSegment): boolean;  // undocumented
-    }
-
-    /**
-    * A Point represents an x- and y-coordinate pair in two-dimensional space.
-    */
-    class Point {
-        /**
-        * The default constructor produces the Point(0,0).
-        */
-        constructor();
-
-        /**
-        * The two-argument constructor produces the Point(x, y).
-        * @param {number} x
-        * @param {number} y
-        */
-        constructor(x: number, y: number);
-
-        /**Gets or sets the x value of the Point.*/
-        x: number;
-
-        /**Gets or sets the y value of the Point.*/
-        y: number;
-
-        /**
-        * Modify this point so that is the sum of the current Point and the
-        * x and y co-ordinates of the given Point.
-        * @param {Point} p The Point to add to this Point.
-        */
-        add(p: Point): Point;
-
-        /**
-        * Create a copy of this Point, with the same values.
-        */
-        copy(): Point;
-
-        /**
-        * This static function returns the angle in degrees of the line from point P to point Q.
-        * @param {number} px
-        * @param {number} py
-        * @param {number} qx
-        * @param {number} qy
-        */
-        static direction(px: number, py: number, qx: number, qy: number): number;
-
-        /**
-        * Compute the angle from this Point to a given (px,py) point.
-        * However, if the point is the same as this Point, the direction is zero.
-        * @param {number} px
-        * @param {number} py
-        */
-        direction(px: number, py: number): number;
-
-        /**
-        * Compute the angle from this Point to a given Point.
-        * However, if the given Point is the same as this Point, the direction is zero.
-        * @param {Point} p the other Point to which to measure the relative angle.
-        */
-        directionPoint(p: Point): number;
-
-        /**
-        * This static function returns the square of the distance from the point P
-        * to the finite line segment from point A to point B.
-        * @param {number} px
-        * @param {number} py
-        * @param {number} ax
-        * @param {number} ay
-        * @param {number} bx
-        * @param {number} by
-        */
-        static distanceLineSegmentSquared(px: number, py: number, ax: number, ay: number, bx: number, by: number): number;
-
-        /**
-        * Returns the square of the distance from this point to a given point (px, py).
-        * @param {number} px
-        * @param {number} py
-        */
-        distanceSquared(px: number, py: number): number;
-
-        /**
-        * This static function returns the square of the distance from the point P to the point Q.
-        * @param {number} px
-        * @param {number} py
-        * @param {number} qx
-        * @param {number} qy
-        */
-        static distanceSquared(px: number, py: number, qx: number, qy: number): number;
-
-        /**
-        * Returns the square of the distance from this Point to a given Point.
-        * @param {Point} p the other Point to measure to.
-        */
-        distanceSquaredPoint(p: Point): number;
-
-        /**
-        * Indicates whether the given Point is equal to this Point.
-        * @param {Point} p The Point to compare to the current Point.
-        * false otherwise.
-        */
-        equals(p: Point): boolean;
-
-        /**
-        * Indicates whether the given point (x, y) is equal to this Point.
-        * @param {number} x
-        * @param {number} y
-        * false otherwise.
-        */
-        equalTo(x: number, y: number): boolean;
-
-        /**
-        * True if this Point has X and Y values that are real numbers and not infinity.
-        */
-        isReal(): boolean;
-
-        /**
-        * Modify this Point so that its X and Y values have been normalized to a unit length.
-        * However, if this Point is the origin (zero, zero), its length remains zero.
-        */
-        normalize(): Point;
-
-        /**
-        * Modify this point by shifting its values with the given DX and DY offsets.
-        * @param {number} dx
-        * @param {number} dy
-        */
-        offset(dx: number, dy: number): Point;
-
-        /**
-        * This static function can be used to read in a Point from a string that was produced by Point.stringify.
-        * @param {string} str
-        */
-        static parse(str: string): Point;
-
-        /**
-        * Modify this point to be the closest point to this point that is on a finite line segment given by (px,py) and (qx,qy).
-        * @param {number} px
-        * @param {number} py
-        * @param {number} qx
-        * @param {number} qy
-        */
-        projectOntoLineSegment(px: number, py: number, qx: number, qy: number): Point;
-
-        /**
-        * Modify this point to be the closest point to this point that is on a finite line segment given by P and Q.
-        * @param {Point} p
-        * @param {Point} q
-        */
-        projectOntoLineSegmentPoint(p: Point, q: Point): Point;
-
-        /**
-        * Modify this Point so that has been rotated about the origin by the given angle.
-        * @param {number} angle an angle in degrees.
-        */
-        rotate(angle: number): Point;
-
-        /**
-        * Modify this Point so that its X and Y values have been scaled by given factors along the X and Y axes.
-        * @param {number} sx
-        * @param {number} sy
-        */
-        scale(sx: number, sy: number): Point;
-
-        /**
-        * Modify this Point so that its X and Y values are the same as the given Point.
-        * @param {Point} p the given Point.
-        */
-        set(p: Point): Point;
-
-        /**
-        * Modify this Point so that its X and Y values correspond to a particular Spot
-        * in a given Rect.
-        * The result is meaningless if Spot.isNoSpot is true for the given Spot.
-        * @param {Rect} r the Rect for which we are finding the point.
-        * @param {Spot} spot the Spot; Spot.isSpot must be true for this Spot.
-        */
-        setRectSpot(r: Rect, spot: Spot): Point;
-
-        /**
-        * Modify this Point so that its X and Y values correspond to a particular Spot
-        * in a given rectangle.
-        * The result is meaningless if Spot.isNoSpot is true for the given Spot.
-        * @param {number} x The X coordinate of the Rect for which we are finding the point.
-        * @param {number} y The Y coordinate of the Rect for which we are finding the point.
-        * @param {number} w The Width of the Rect for which we are finding the point.
-        * @param {number} h The Height of the Rect for which we are finding the point.
-        * @param {Spot} spot the Spot; Spot.isSpot must be true for this Spot.
-        */
-        setSpot(x: number, y: number, w: number, h: number, spot: Spot): Point;
-
-        /**
-        * Modify this Point with new X and Y values.
-        * @param {number} x
-        * @param {number} y
-        */
-        setTo(x: number, y: number): Point;
-
-        /**
-        * Modify this point to be at the nearest point on an infinite grid,
-        * given the grid's origin and size of each grid cell.
-        * @param {number} originx
-        * @param {number} originy
-        * @param {number} cellwidth
-        * @param {number} cellheight
-        */
-        snapToGrid(originx: number, originy: number, cellwidth: number, cellheight: number): Point;
-
-        /**
-        * Modify this point to be at the nearest point on an infinite grid,
-        * given the grid's origin and size of each grid cell.
-        * @param {Point} origin
-        * @param {Size} cellsize
-        */
-        snapToGridPoint(origin: Point, cellsize: Size): Point;
-
-        /**
-        * This static function can be used to write out a Point as a string that can be read by Point.parse.
-        * @param {Point} val
-        */
-        static stringify(val: Point): string;
-
-        /**
-        * Modify this point so that is the difference of this Point and the
-        * x and y co-ordinates of the given Point.
-        * @param {Point} p The Point to subtract from the current Point.
-        */
-        subtract(p: Point): Point;
-
-        equalsApprox(p: Point): boolean;  // undocumented
-    }
-
-    /**
-    * A Rect describes a rectangular two-dimensional area as a top-left point (x and y values)
-    * and a size (width and height values).
-    */
-    class Rect {
-        /**
-         * The default constructor (no argument) results in a Rect(0,0,0,0).
-         */
-        constructor();
-
-        /**
-         * The constructor taking two Points produces a Rect that spans both points.
-         * @param {Point} tl Top-left Point
-         * @param {Point} br Bottom-right Point
-         */
-        constructor(tl: Point, br: Point);
-
-        /**
-         * The constructor taking a Point and a Size produces a Rect at that point with that size.
-         * @param {Point} tl Top-left Point
-         * @param {Point} sz Size
-         */
-        constructor(tl: Point, sz: Size);
-
-        /**
-         * The four-argument constructor takes four numbers for the x, y, width, height.
-         * @param {number} x Top-left x value.
-         * @param {number} y Top-left y value.
-         * @param {number} w Width to be used; must be non-negative.
-         * @param {number} h Height to be used; must be non-negative.
-         */
-        constructor(x: number, y: number, w: number, h: number);
-
-        /**Gets or sets the y-axis value of the bottom of the Rect.*/
-        bottom: number;
-
-        /**Gets or sets the Point at the center of this Rect.*/
-        center: Point;
-
-        /**Gets or sets the horizontal center X coordinate of the Rect.*/
-        centerX: number;
-
-        /**Gets or sets the vertical center Y coordinate of the Rect.*/
-        centerY: number;
-
-        /**Gets or sets the height of the Rect.*/
-        height: number;
-
-        /**Gets or sets the leftmost value of the Rect.*/
-        left: number;
-
-        /**Gets or sets the x- and y-axis position of the Rect as a Point.*/
-        position: Point;
-
-        /**Gets or sets the x-axis value of the right of the Rect.*/
-        right: number;
-
-        /**Gets or sets the width and height of the Rect as a Size.*/
-        size: Size;
-
-        /**Gets or sets the topmost value of the Rect.*/
-        top: number;
-
-        /**Gets or sets the width of the Rect.*/
-        width: number;
-
-        /**Gets or sets the top-left x coordinate of the Rect.*/
-        x: number;
-
-        /**Gets or sets the top-left y coordinate of the Rect.*/
-        y: number;
-
-        /**
-        * Modify this Rect by adding the given Margin to each side of the Rect.
-        * @param {Margin} m The Margin to add to the Rect.
-        */
-        addMargin(m: Margin): Rect;
-
-        /**
-        * Indicates whether this Rect contains the given Point/Rect.
-        * @param {number} x The X coordinate of the Point or Rect to include in the new bounds.
-        * @param {number} y The Y coordinate of the Point or Rect to include in the new bounds.
-        * @param {number=} w The Width of the Rect to include in the new bounds, defaults to zero.
-        * @param {number=} h The Height of the Rect to include in the new bounds, defaults to zero.
-        * false otherwise.
-        */
-        contains(x: number, y: number, w?: number, h?: number): boolean;
-
-        /**
-        * This static function indicates whether a Rect contains the given Point/Rect.
-        * @param {number} rx The X coordinate of a Rect.
-        * @param {number} ry The Y coordinate of a Rect.
-        * @param {number} rw The Width of a Rect.
-        * @param {number} rh The Height of a Rect.
-        * @param {number} x The X coordinate of the Point or Rect that might be in the bounds (RX, RY, RW, RH).
-        * @param {number} y The Y coordinate of the Point or Rect that might be in the bounds (RX, RY, RW, RH).
-        * @param {number=} w The Width of the Rect to include in the new bounds, defaults to zero.
-        * @param {number=} h The Height of the Rect to include in the new bounds, defaults to zero.
-        * false otherwise.
-        */
-        static contains(rx: number, ry: number, rw: number, rh: number, x: number, y: number, w?: number, h?: number): boolean;
-
-        /**
-        * Indicates whether this Rect contains the given Point.
-        * @param {Point} p The Point to check.
-        * false otherwise.
-        */
-        containsPoint(p: Point): boolean;
-
-        /**
-        * Indicates whether this Rect contains the given Rect.
-        * @param {Rect} r The Rect to check.
-        * false otherwise.
-        */
-        containsRect(r: Rect): boolean;
-
-        /**
-        * Create a copy of this Rect, with the same values.
-        */
-        copy(): Rect;
-
-        /**
-        * Indicates whether the given Rect is equal to the current Rect.
-        * @param {Rect} r The rectangle to compare to the current rectangle.
-        * and height.
-        */
-        equals(r: Rect): boolean;
-
-        /**
-        * Indicates whether the given Rect is equal to the current Rect.
-        * @param {number} x
-        * @param {number} y
-        * @param {number} w the width.
-        * @param {number} h the height.
-        */
-        equalTo(x: number, y: number, w: number, h: number): boolean;
-
-        /**
-        * Modifies this Rect by adding some distance to each side of the Rect.
-        * @param {number} t the amount to move the top side upwards; may be negative.
-        * @param {number} r the amount to move the right side rightwards; may be negative.
-        * @param {number} b the amount to move the bottom side downwards; may be negative.
-        * @param {number} l the amount to move the left side leftwards; may be negative.
-        */
-        grow(t: number, r: number, b: number, l: number): Rect;
-
-        /**
-        * Modify this Rect so that its width and height are changed on all four sides,
-        * equally on the left and right sides, and equally on the top and bottom sides.
-        * When the arguments are negative, this operation deflates this Rect, but not beyond zero.
-        * @param {number} w The additional width on each side, left and right; may be negative.
-        * @param {number} h The additional height on each side, top and bottom; may be negative.
-        */
-        inflate(w: number, h: number): Rect;
-
-        /**
-        * Modify this Rect so that it is the intersection of this Rect and the rectangle
-        * defined by x, y, w, h.
-        * @param {number} x
-        * @param {number} y
-        * @param {number} w
-        * @param {number} h
-        */
-        intersect(x: number, y: number, w: number, h: number): Rect;
-
-        /**
-        * Modify this Rect so that it is the intersection of this Rect and the given Rect.
-        * @param {Rect} r Rect to intersect with.
-        */
-        intersectRect(r: Rect): Rect;
-
-        /**
-        * This static function indicates whether a Rect partly or wholly overlaps the given Rect.
-        * @param {number} rx The X coordinate of a Rect.
-        * @param {number} ry The Y coordinate of a Rect.
-        * @param {number} rw The Width of a Rect.
-        * @param {number} rh The Height of a Rect.
-        * @param {number} x The X coordinate of the Point or Rect that might overlap the bounds (RX, RY, RW, RH).
-        * @param {number} y The Y coordinate of the Point or Rect that might overlap the bounds (RX, RY, RW, RH).
-        * @param {number} w
-        * @param {number} h
-        */
-        static intersects(rx: number, ry: number, rw: number, rh: number, x: number, y: number, w: number, h: number): boolean;
-
-        /**
-        * Determine if this Rect partly or wholly overlaps the rectangle
-        * defined by x, y, w, h.
-        * @param {number} x
-        * @param {number} y
-        * @param {number} w
-        * @param {number} h
-        */
-        intersects(x: number, y: number, w: number, h: number): boolean;
-
-        /**
-        * Determine if a given Rect is partly or wholly inside of this Rect.
-        * @param {Rect} r Rect to test intersection with.
-        */
-        intersectsRect(r: Rect): boolean;
-
-        /**
-        * True if this Rect has a Width and Height of zero.
-        */
-        isEmpty(): boolean;
-
-        /**
-        * True if this Rect has X, Y, Width, and Height values that are real numbers and not infinity.
-        */
-        isReal(): boolean;
-
-        /**
-        * Modify this Rect by shifting its values with the given DX and DY offsets.
-        * @param {number} dx
-        * @param {number} dy
-        */
-        offset(dx: number, dy: number): Rect;
-
-        /**
-        * This static function can be used to read in a Rect from a string that was produced by Rect.stringify.
-        * @param {string} str
-        */
-        static parse(str: string): Rect;
-
-        /**
-        * Modify this Rect so that its X, Y, Width, and Height values are the same as the given Rect.
-        * @param {Rect} r the given Rect.
-        */
-        set(r: Rect): Rect;
-
-        /**
-        * Modify this Rect so that its X and Y values are the same as the given Point.
-        * @param {Point} p the given Point.
-        */
-        setPoint(p: Point): Rect;
-
-        /**
-        * Modify this Rect so that its Width and Height values are the same as the given Size.
-        * @param {Size} s the given Size.
-        */
-        setSize(s: Size): Rect;
-
-        /**
-        * Modify this Rect so that a given Spot is at a given (x,y) point using this Rect's size.
-        * Return this rectangle for which the spot is at that point, without modifying the size.
-        * The result is meaningless if Spot.isNoSpot is true.
-        * @param {number} x the point where the spot should be.
-        * @param {number} y the point where the spot should be.
-        * @param {Spot} spot a Spot; Spot.isSpot must be true.
-        */
-        setSpot(x: number, y: number, spot: Spot): Rect;
-
-        /**
-        * Modify this Rect with new X, Y, Width, and Height values.
-        * @param {number} x
-        * @param {number} y
-        * @param {number} w the width.
-        * @param {number} h the height.
-        */
-        setTo(x: number, y: number, w: number, h: number): Rect;
-
-        /**
-        * This static function can be used to write out a Rect as a string that can be read by Rect.parse.
-        * @param {Rect} val
-        */
-        static stringify(val: Rect): string;
-
-        /**
-        * Modify this Rect by subtracting the given Margin from each side of the Rect.
-        * @param {Margin} m The Margin to subtract from the Rect.
-        */
-        subtractMargin(m: Margin): Rect;
-
-        /**
-        * Modify this Rect to be exactly big enough to contain both the original Rect and the given rectangular area.
-        * @param {number} x The X coordinate of the Point or Rect to include in the new bounds.
-        * @param {number} y The Y coordinate of the Point or Rect to include in the new bounds.
-        * @param {number=} w The Width of the Rect to include in the new bounds, defaults to zero.
-        * @param {number=} h The Height of the Rect to include in the new bounds, defaults to zero.
-        */
-        union(x: number, y: number, w?: number, h?: number): Rect;
-
-        /**
-        * Modify this Rect to be exactly big enough to contain both the original Rect and the given Point.
-        * @param {Point} p The Point to include in the new bounds.
-        */
-        unionPoint(p: Point): Rect;
-
-        /**
-        * Modify this Rect to be exactly big enough to contain this Rect and the given Rect.
-        *
-        * @param {Rect} r The Rect to include in the new bounds.
-        */
-        unionRect(r: Rect): Rect;
-
-        equalsApprox(r: Rect): boolean;  // undocumented
-    }
-
-    /**
-    * A Size describes a width and a height in two-dimensional coordinates.
-    * The width and height must both be non-negative.
-    */
-    class Size {
-        /**
-        * The default constructor produces the Size(0,0).
-        */
-        constructor();
-
-        /**
-        * The two-argument constructor produces the Size(w,h).
-        * @param {number} w this number must not be negative.
-        * @param {number} h this number must not be negative.
-        */
-        constructor(w: number, h: number);
-
-        /**Gets or sets the height value of the Size.*/
-        height: number;
-
-        /**Gets or sets the width value of the Size.*/
-        width: number;
-
-        /**
-        * Create a copy of this Size, with the same values.
-        */
-        copy(): Size;
-
-        /**
-        * Indicates whether the given Size is equal to the current Size.
-        * @param {Size} s The Size to compare to the current Size.
-        * false otherwise.
-        */
-        equals(s: Size): boolean;
-
-        /**
-        * Indicates whether the given size is equal to this Size.
-        * @param {number} w the width.
-        * @param {number} h the height.
-        * false otherwise.
-        */
-        equalTo(w: number, h: number): boolean;
-
-        /**
-        * True if this Size has Width and Height values that are real numbers and not infinity.
-        */
-        isReal(): boolean;
-
-        /**
-        * This static function can be used to read in a Size from a string that was produced by Size.stringify.
-        * @param {string} str
-        */
-        static parse(str: string): Size;
-
-        /**
-        * Modify this Size so that its Width and Height values are the same as the given Size.
-        * @param {Size} s the given Size.
-        */
-        set(s: Size): Size;
-
-        /**
-        * Modify this Size with new Width and Height values.
-        * @param {number} w the width.
-        * @param {number} h the height.
-        */
-        setTo(w: number, h: number): Size;
-
-        /**
-        * This static function can be used to write out a Size as a string that can be read by Size.parse.
-        * @param {Size} val
-        */
-        static stringify(val: Size): string;
-
-        equalsApprox(s: Size): boolean;  // undocumented
-    }
-
-    /**
-    * A Spot represents a relative point from(0, 0) to(1, 1) within the bounds of
-    * a rectangular area plus an absolute offset.
-    */
-    class Spot {
-        /**
-        * The default constructor produces the Spot(0, 0, 0, 0), at the top-left corner.
-        */
-        constructor();
-
-        /**
-        * The two-argument constructor produces the Spot(x, y), where X and Y are fractional distances, between zero and one.
-        * @param {number} x must be between zero and one, inclusive.
-        * @param {number} y must be between zero and one, inclusive.
-        */
-        constructor(x: number, y: number);
-
-        /**
-        * The four-argument constructor produces the Spot(x, y, offx, offy), where X and Y are fractional distances, between zero and one, and OFFX and OFFY are additional absolute offsets.
-        * @param {number} x must be between zero and one, inclusive.
-        * @param {number} y must be between zero and one, inclusive.
-        * @param {number} offx an offset along the X coordinates, may be negative.
-        * @param {number} offy an offset along the Y coordinates, may be negative.
-        */
-        constructor(x: number, y: number, offx: number, offy: number);
-
-        /**Gets or sets the offsetX value of the Spot.*/
-        offsetX: number;
-
-        /**Gets or sets the offsetY value of the Spot.*/
-        offsetY: number;
-
-        /**Gets or sets the x value of the Spot, a fractional value between zero and one.*/
-        x: number;
-
-        /**Gets or sets the y value of the Spot, a fractional value between zero and one.*/
-        y: number;
-
-        /**
-        * Create a copy of this Spot, with the same values.
-        */
-        copy(): Spot;
-
-        /**
-        * Two spots are equal if all four property values are the same.
-        * @param {Spot} spot The Spot to compare to the current Spot.
-        */
-        equals(spot: Spot): boolean;
-
-        /**
-        * This predicate is true if this Spot is a side that
-        * includes the side(s) given by the argument Spot.
-        * @param {Spot} side
-        */
-        includesSide(side: Spot): boolean;
-
-        /**
-        * True if this is a special spot referring to the default spot.
-        */
-        isDefault(): boolean;
-
-        /**
-        * True if this is an unspecific special spot, such as Spot.None or one of the sides.
-        */
-        isNoSpot(): boolean;
-
-        /**
-        * True if this is a special spot referring to one (or more) of the sides.
-        */
-        isSide(): boolean;
-
-        /**
-        * True if this is a specific spot, not a side nor Spot.None.
-        */
-        isSpot(): boolean;
-
-        /**
-        * Return a new spot that is opposite this spot.
-        */
-        opposite(): Spot;
-
-        /**
-        * This static function can be used to read in a Spot from a string that was produced by Spot.stringify.
-        * @param {string} str
-        */
-        static parse(str: string): Spot;
-
-        /**
-        * Modify this Spot so that its X, Y, OffsetX, and OffsetY values are the same as the given Spot.
-        * @param {Spot} s the given Spot.
-        */
-        set(s: Spot): Spot;
-
-        /**
-        * Modify this Spot with new X, Y, OffsetX, and OffsetY values.
-        * @param {number} x
-        * @param {number} y
-        * @param {number} offx
-        * @param {number} offy
-        */
-        setTo(x: number, y: number, offx: number, offy: number): Spot;
-
-        /**
-        * This static function can be used to write out a Spot as a string that can be read by Spot.parse.
-        * @param {Spot} val
-        */
-        static stringify(val: Spot): string;
-
-        /**The set of points on all sides of the bounding rectangle.*/
-        static AllSides: Spot;
-
-        /**A synonym for Spot.BottomCenter.*/
-        static Bottom: Spot;
-
-        /**The specific point at the middle of the bottom side of bounding rectangle.*/
-        static BottomCenter: Spot;
-
-        /**The specific point at the bottom-left corner of the bounding rectangle.*/
-        static BottomLeft: Spot;
-
-        /**The set of points at the left or bottom sides of the bounding rectangle.*/
-        static BottomLeftSides: Spot;
-
-        /**The specific point at the bottom-right corner of the bounding rectangle.*/
-        static BottomRight: Spot;
-
-        /**The set of points at the right or bottom sides of the bounding rectangle.*/
-        static BottomRightSides: Spot;
-
-        /**The set of points at the bottom side of the bounding rectangle.*/
-        static BottomSide: Spot;
-
-        /**The specific point at the very center of the bounding rectangle.*/
-        static Center: Spot;
-
-        /**Use this value to indicate that the real spot value is inherited from elsewhere.*/
-        static Default: Spot;
-
-        /**A synonym for Spot.LeftCenter.*/
-        static Left: Spot;
-
-        /**The specific point at the middle of the left side of bounding rectangle.*/
-        static LeftCenter: Spot;
-
-        /**The set of points at the left or right sides of the bounding rectangle.*/
-        static LeftRightSides: Spot;
-
-        /**The set of points at the left side of the bounding rectangle.*/
-        static LeftSide: Spot;
-
-        /**A synonym for Spot.BottomCenter.*/
-        static MiddleBottom: Spot;
-
-        /**A synonym for Spot.LeftCenter.*/
-        static MiddleLeft: Spot;
-
-        /**A synonym for Spot.RightCenter.*/
-        static MiddleRight: Spot;
-
-        /**A synonym for Spot.TopCenter.*/
-        static MiddleTop: Spot;
-
-        /**Use this Spot value to indicate no particular spot -- code looking for a particular point on an element will need to do their own calculations to determine the desired point depending on the circumstances.*/
-        static None: Spot;
-
-        /**The set of points on all sides of bounding rectangle except bottom side.*/
-        static NotBottomSide: Spot;
-
-        /**The set of points on all sides of the bounding rectangle except left side.*/
-        static NotLeftSide: Spot;
-
-        /**The set of points on all sides of the bounding rectangle except right side.*/
-        static NotRightSide: Spot;
-
-        /**The set of points on all sides of the bounding rectangle except top side.*/
-        static NotTopSide: Spot;
-
-        /**A synonym for Spot.RightCenter.*/
-        static Right: Spot;
-
-        /**The specific point at the middle of the right side of bounding rectangle.*/
-        static RightCenter: Spot;
-
-        /**The set of points at the right side of the bounding rectangle.*/
-        static RightSide: Spot;
-
-        /**A synonym for Spot.TopCenter.*/
-        static Top: Spot;
-
-        /**The set of points at the top or bottom sides of the bounding rectangle.*/
-        static TopBottomSides: Spot;
-
-        /**The specific point at the center of the top side of the bounding rectangle.*/
-        static TopCenter: Spot;
-
-        /**The specific point at the top-left corner of the bounding rectangle.*/
-        static TopLeft: Spot;
-
-        /**The set of points at the top or left sides of the bounding rectangle.*/
-        static TopLeftSides: Spot;
-
-        /**The specific point at the top-right corner of the bounding rectangle.*/
-        static TopRight: Spot;
-
-        /**The set of points at the top or right sides of the bounding rectangle.*/
-        static TopRightSides: Spot;
-
-        /**The set of points at the top side of the bounding rectangle.*/
-        static TopSide: Spot;
-    }
-
-
-    /**
-    * A Binding describes how to automatically set a property on a GraphObject
-    * to a value of a property of data in the model.
-    * The target property name and the data source property name are strings.
-    * All name matching is case-sensitive.
-    */
-    class Binding {
-        /**
-        * The constructor creates an empty one-way binding.
-        * @param {string=} targetprop A string naming the target property on the target object.
-        *   If this is the empty string or not supplied, the whole GraphObject is used in the call to the conversion function,
-        *   which should modify the GraphObject directly.
-        * @param {string=} sourceprop A string naming the source property on the bound data object.
-        *   If this is the empty string, the whole Panel.data object is used.
-        *   If this argument is not supplied, the source property is assumed to be the same as the target property.
-        * @param {function(*,*=) | null=} conv A function converting the data property value to the value to set the target property.
-        *   If the function is null or not supplied, no conversion takes place.
-        */
-        constructor(targetprop?: string, sourceprop?: string, conv?: (a: any, b: any) => any);
-
-        /**
-        * Gets or sets a converter function to apply to the GraphObject property value
-        * in order to produce the value to set to a data property.
-        * This conversion function is only used in a TwoWay binding,
-        * when transferring a value from the target to the source.
-        * The default value is null -- no conversion takes place.
-        * Otherwise the value should be a function that takes one or two arguments
-        * and returns the desired value.
-        * However, the return value is ignored when the .sourceProperty
-        * is the empty string.
-        * The function is passed the value from the target
-        * (the first argument) and the source Panel.data object (the second argument).
-        * If the .sourceProperty is a property name, that property is set to
-        * the function's return value.
-        * If the .sourceProperty is the empty string, the function should
-        * modify the second argument, which will be the source data object.
-        */
-        backConverter: (a: any, b: any) => any;
-
-        /**
-        * Gets or sets a converter function to apply to the data property value
-        * in order to produce the value to set to the target property.
-        * This conversion function is used in both OneWay and TwoWay bindings,
-        * when transferring a value from the source to the target.
-        * The default value is null -- no conversion takes place.
-        * Otherwise the value should be a function that takes one or two arguments
-        * and returns the desired value.
-        * However, the return value is ignored when the .targetProperty
-        * is the empty string.
-        * The function is passed the value from the source
-        * (the first argument) and the target GraphObject (the second argument).
-        * If the .targetProperty is a property name, that property is set to
-        * the function's return value.
-        * If the .targetProperty is the empty string, the function should
-        * modify the second argument, which will be the target object.
-        */
-        converter: (a: any, b: any) => any;
-
-        /**
-        * Gets or sets the directions and frequency in which the binding may be evaluated.
-        * The default value is Binding.OneWay.
-        * Binding.TwoWay is the other choice.
-        * Use OneWay bindings to initialize GraphObject properties based on model data,
-        * or to modify GraphObject properties when the model data changes will a call to Model.setDataProperty.
-        * Use TwoWay bindings to keep model data in sync with changes to GraphObject properties.
-        * For efficiency, avoid TwoWay bindings on GraphObject properties that do not change value in your app.
-        * You should not have a TwoWay binding on a node data object's key property.
-        */
-        mode: EnumValue;
-
-        /**
-        * Gets or sets the name of the GraphObject that should act as a source object
-        * whose property should be gotten by this data binding.
-        * The default value is null, which uses the bound Panel.data as the source.
-        * If the value is a string, it should be the name of a GraphObject in the
-        * visual tree of the Panel that is bound to the data.
-        * Use the empty string to refer to the root panel.
-        */
-        sourceName: string;
-
-        /**
-        * Gets or sets the name of the property to get from the bound data object,
-        * the value of Panel.data.
-        * The default value is the empty string, which results in setting the target
-        * property to the whole data object, rather than to a property value of the data object.
-        */
-        sourceProperty: string;
-
-        /**
-        * Gets or sets the name of the property to be set on the target GraphObject.
-        * The default value is the empty string; you normally set this to be the name of a property.
-        */
-        targetProperty: string;
-
-        /**
-        * Modify this Binding to set its .mode to be Binding.TwoWay, and
-        * provide an optional conversion function to convert GraphObject property
-        * values back to data values.
-        * Use TwoWay bindings to keep model data in sync with changes to GraphObject properties.
-        * For efficiency, avoid TwoWay bindings on GraphObject properties that do not change value in your app.
-        * You should not have a TwoWay binding on a node data object's key property.
-        * @param {function(*,*=) | null=} backconv
-        */
-        makeTwoWay(backconv?: (a: any, b: any) => any): Binding;
-
-        /**
-        * Modify this Binding to set its .sourceName property so as to identify
-        * a GraphObject in the visual tree of the bound Panel.
-        * @param {string=} srcname the GraphObject.name of an element in the visual tree of the bound Panel;
-        * use an empty string to refer to the root panel of that visual tree.
-        */
-        ofObject(srcname?: string): Binding;
-
-        /**
-        * This static function can be used to create a function that parses
-        * a string into an enumerated value, given the class that the enumeration values
-        * are defined on and a default value if the string cannot be parsed successfully.
-        * The normal usage is to pass the result of this function as the conversion function of a Binding.
-        * This binding will try to parse the string that is the value of the bound data's "dataPropName" property.
-        * If it is a legitimate enumerated value defined on the Link class, the conversion
-        * function will return that value.
-        * If the bound data's "dataPropName" property is not present or has an unrecognized value,
-        * the Link.routing property gets the default value, Link.Normal.
-        * @param {function()} ctor the class constructor that defines the enumerated values that are being parsed.
-        * @param {EnumValue} defval the default enumerated value to return if it fails to parse the given string.
-        */
-        static parseEnum(ctor: Constructor, defval: EnumValue): (a: string) => EnumValue;
-
-        /**
-        * This static function can be used to convert an object to a string,
-        * looking for commonly defined data properties, such as "text", "name", "key", or "id".
-        * If none are found, this just calls toString() on it.
-        * @param {*} val
-        */
-        static toString(val: any): string;
-
-        /**This value for Binding.mode uses data source values and sets GraphObject properties.*/
-        static OneWay: EnumValue;
-
-        /**This value for Binding.mode uses data source values and GraphObject properties and keeps them in sync.*/
-        static TwoWay: EnumValue;
-
-        ofModel(): Binding;  // undocumented
-    }
-
-    /**
-    * A ChangedEvent represents a change to an object, typically a GraphObject,
-    * but also for model data, a Model, or a Diagram.
-    * The most common case is for remembering the name of a property
-    * and the before-and-after values for that property.
-    * You can listen for changed events on the model using Model.addChangedListener
-    * and on the Diagram using Diagram.addChangedListener.
-    */
-    class ChangedEvent {
-        /**
-        * The ChangedEvent class constructor produces an empty ChangedEvent object.
-        */
-        constructor();
-
-        /**Gets or sets the nature of change that occurred.*/
-        change: EnumValue;
-
-        /**Gets or sets the Diagram that was modified.*/
-        diagram: Diagram;
-
-        /**This read-only property is true when this ChangeEvent is of type ChangedEvent.Transaction and represents the end of a transactional change.*/
-        isTransactionFinished: boolean;
-
-        /**Gets or sets the Model or TreeModel or GraphLinksModel that was modified.*/
-        model: Model;
-
-        /**This read-only property returns the name of the model change, reflecting a change to model data in addition to a change to the model itself.*/
-        modelChange: string;
-
-        /**Gets or sets an optional value associated with the new value.*/
-        newParam: any;
-
-        /**Gets or sets the next or current value that the property has.*/
-        newValue: any;
-
-        /**Gets or sets the Object that was modified.*/
-        object: any;
-
-        /**Gets or sets an optional value associated with the old value.*/
-        oldParam: any;
-
-        /**Gets or sets the previous or old value that the property had.*/
-        oldValue: any;
-
-        /**Gets or sets the name of the property change.*/
-        propertyName: PropertyAccessor;
-
-        /**
-        * This predicate returns true if you can call redo().
-        */
-        canRedo(): boolean;
-
-        /**
-        * This predicate returns true if you can call undo().
-        */
-        canUndo(): boolean;
-
-        /**
-        * Forget any object references that this ChangedEvent may have.
-        */
-        clear(): void;
-
-        /**
-        * Make a copy of this ChangedEvent.
-        */
-        copy(): ChangedEvent;
-
-        /**
-        * This is a convenient method to get the right parameter value, depending on the value of undo,
-        * when implementing a state change as part of an undo or a redo.
-        * @param {boolean} undo If true, returns the oldParam, otherwise returns the newParam.
-        */
-        getParam(undo: boolean): any;
-
-        /**
-        * This is a convenient method to get the right value, depending on the value of undo,
-        * when implementing a state change as part of an undo or a redo.
-        * @param {boolean} undo If true, returns the oldValue, otherwise returns the newValue.
-        */
-        getValue(undo: boolean): any;
-
-        /**
-        * Re-perform this object change after an undo().
-        */
-        redo(): void;
-
-        /**
-        * Reverse the effects of this object change.
-        */
-        undo(): void;
-
-        /**For inserting into collections, and used as the value for ChangedEvent.change.*/
-        static Insert: EnumValue;
-
-        /**For simple property changes, and used as the value for ChangedEvent.change.*/
-        static Property: EnumValue;
-
-        /**For removing from collections, and used as the value for ChangedEvent.change.*/
-        static Remove: EnumValue;
-
-        /**For informational events, such as transactions and undo/redo operations, and used as the value for ChangedEvent.change.*/
-        static Transaction: EnumValue;
-    }
-
-    /**
-    * GraphLinksModels support links between nodes and grouping nodes and links into subgraphs.
-    * GraphLinksModels hold node data and link data in separate arrays.
-    * Node data is normally represented in a Diagram by instances of Node,
-    * but they could be represented by simple Parts or by Groups.
-    * Link data should be represented by instances of Link.
-    */
-    class GraphLinksModel extends Model {
-        /**
-        * This constructs an empty GraphLinksModel unless one provides arguments as the initial data array values for the Model.nodeDataArray and GraphLinksModel.linkDataArray properties.
-        * @param {Array<Object>=} nodedataarray an optional Array containing JavaScript objects to be represented by Nodes.
-        * @param {Array<Object>=} linkdataarray an optional Array containing JavaScript objects to be represented by Links.
-        */
-        constructor(nodedataarray?: Array<Object>, linkdataarray?: Array<Object>);
-
-        /**
-        * Gets or sets a data object that will be copied and added to the model as a new node data each time there
-        * is a link reference (either the "to" or the "from" of a link data) to a node key that does not yet exist in the model.
-        * The default value is null -- node data is not automatically copied and added to the model
-        * when there is an unresolved reference in a link data.
-        * The value must be an Object or null.
-        * When adding or modifying a link data if there is a "from" or "to" key value for which Model.findNodeDataForKey returns null,
-        * it will call Model.copyNodeData on this property value and Model.addNodeData on the result.
-        */
-        archetypeNodeData: any;
-
-        /**
-        * Gets or sets a function that makes a copy of a link data object.
-        * You may need to set this property in order to ensure that a copied Link is bound
-        * to data that does not share certain data structures between the original link data and the copied link data.
-        * The value may be null in order to cause .copyLinkData to make a shallow copy of a JavaScript Object.
-        * The default value is null.
-        */
-        copyLinkDataFunction: (obj: Object, model: GraphLinksModel) => Object;
-
-        /**
-        * Gets or sets the name of the data property that returns a string naming that data's category,
-        * or a function that takes a link data object and returns that category string;
-        * the default value is the name 'category'.
-        * This is used by the diagram to distinguish between different kinds of links.
-        * The name must not be null.
-        */
-        linkCategoryProperty: PropertyAccessor;
-
-        /**Gets or sets the array of link data objects that correspond to Links in the Diagram; the initial value is an empty Array.*/
-        linkDataArray: Array<Object>;
-
-        /**
-        * Gets or sets the name of the data property that returns
-        * the key of the node data that the link data is coming from,
-        * or a function that takes a link data object and returns that key;
-        * the default value is the name 'from'.
-        * The name must not be null.
-        * If the value is an empty string,
-        * .getFromKeyForLinkData will return undefined for all link data objects.
-        */
-        linkFromKeyProperty: PropertyAccessor;
-
-        /**
-        * Gets or sets the name of the data property that returns the optional parameter naming a "port" element on the node that the link data is connected from,
-        * or a function that takes a link data object and returns that string.
-        * The default value is the empty string indicating that one cannot distinguish
-        * different logical connection points for any links.
-        * The name must not be null.
-        */
-        linkFromPortIdProperty: PropertyAccessor;
-
-        /**Gets or sets the name of the data property that returns a unique id number or string for each link data object, or a function taking a link data object and returning the key value; the default value is '', which causes the model NOT to assign unique identifiers automatically.*/
-        linkKeyProperty: PropertyAccessor;
-
-        /**
-        * Gets or sets the name of the data property that returns
-        * an array of keys of node data that are labels on that link data,
-        * or a function that takes a link data object and returns such an array;
-        * the default value is the empty string: ''.
-        * The name must not be null.
-        * If the value is an empty string,
-        * .getLabelKeysForLinkData will return an empty array for all link data objects.
-        * You will need to set this property in order to support nodes as link labels.
-        */
-        linkLabelKeysProperty: PropertyAccessor;
-
-        /**
-        * Gets or sets the name of the data property that returns
-        * the key of the node data that the link data is going to,
-        * or a function that takes a link data object and returns that key;
-        * the default value is the name 'to'.
-        * The name must not be null.
-        */
-        linkToKeyProperty: PropertyAccessor;
-
-        /**
-        * Gets or sets the name of the data property that returns
-        * the optional parameter naming a "port" element on the node that the link data is connected to,
-        * or a function that takes a link data object and returns that string.
-        * The default value is the empty string indicating that one cannot distinguish
-        * different logical connection points for any links.
-        * The name must not be null.
-        */
-        linkToPortIdProperty: PropertyAccessor;
-
-        /**Gets or sets a function that returns a unique id number or string for a link data object; the default value is null.*/
-        makeUniqueLinkKeyFunction: (model: Model, obj: Object) => Key;
-
-        /**
-        * Gets or sets the name of the property on node data that specifies
-        * the string or number key of the group data that "owns" that node data,
-        * or a function that takes a node data object and returns that group key.
-        * the default value is the name 'group'.
-        * The value must not be null.
-        */
-        nodeGroupKeyProperty: PropertyAccessor;
-
-        /**
-        * Gets or sets the name of the boolean property on node data that indicates
-        * whether the data should be represented as a group of nodes and links or
-        * as a simple node,
-        * or a function that takes a node data object and returns true or false;
-        * the default value is the name 'isGroup'.
-        * The value must not be null.
-        */
-        nodeIsGroupProperty: PropertyAccessor;
-
-        /**
-        * Adds a node key value that identifies a node data acting as a new label node on the given link data.
-        * This method only works if .linkLabelKeysProperty has been set to something other than an empty string.
-        * @param {Object} linkdata a JavaScript object representing a link.
-        * @param {string|number} key a number or string that is the key of the new label node.
-        */
-        addLabelKeyForLinkData(linkdata: Object, key: Key): void;
-
-        /**
-        * When you want to add a link to the diagram, call this method with a new data object.
-        * This will add that data to the .linkDataArray and
-        * notify all listeners that a new link data object has been inserted into the collection.
-        * Presumably the link data object will already have its "from" and "to" node key references set,
-        * but it is also possible to set them after the link data is in the model
-        * by calling .setFromKeyForLinkData and .setToKeyForLinkData.
-        * This operation does nothing if the link data is already part of this model's .linkDataArray.
-        * @param {Object} linkdata a JavaScript object representing a link.
-        */
-        addLinkData(linkdata: Object): void;
-
-        /**
-        * Add to this model all of the link data held in an Array or in an Iterable of link data objects.
-        * @param {Iterable<Object>|Array<Object>} coll a collection of link data objects to add to the .linkDataArray
-        */
-        addLinkDataCollection(coll: Iterable<Object> | Array<Object>): void;
-
-        /**
-        * Decide if a given link data is in this model.
-        * @param {Object} linkdata a JavaScript object representing a link.
-        */
-        containsLinkData(linkdata: Object): boolean;
-
-        /**
-        * Make a copy of a link data object.
-        * This uses the value of .copyLinkDataFunction to actually perform the copy,
-        * unless it is null, in which case this method just makes a shallow copy of the JavaScript Object.
-        * This does not modify the model -- the returned data object is not added to this model.
-        * This assumes that the data's constructor can be called with no arguments.
-        * This also makes sure there is no reference to either the "from" or the "to" node of the original data.
-        * @param {Object} linkdata a JavaScript object representing a link.
-        */
-        copyLinkData(linkdata: Object): Object;
-
-        /**
-        * Given a number or string, find the link data object in this model
-        * that uses the given value as its unique key.
-        * Unless .linkKeyProperty is set to a non-empty string, this model
-        * will not automatically assign unique key values for link data objects,
-        * and thus this method will always return null.
-        * The return value will be an Object or null.
-        * @param {*} key a string or a number.
-        */
-        findLinkDataForKey(key: Key): any;
-
-        /**
-        * Find the category of a given link data, a string naming the link template
-        * that the Diagram should use to represent the link data.
-        * @param {Object} linkdata a JavaScript object representing a link.
-        */
-        getCategoryForLinkData(linkdata: Object): string;
-
-        /**
-        * From a link data retrieve a value uniquely identifying the node data
-        * from which this link is connected.
-        * @param {Object} linkdata a JavaScript object representing a link.
-        */
-        getFromKeyForLinkData(linkdata: Object): Key;
-
-        /**
-        * From a link data retrieve a value identifying the port object of the node
-        * from which this link is connected.
-        * @param {Object} linkdata a JavaScript object representing a link.
-        */
-        getFromPortIdForLinkData(linkdata: Object): string;
-
-        /**
-        * If there is a container group for the given node data, return the group's key.
-        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
-        */
-        getGroupKeyForNodeData(nodedata: Object): Key;
-
-        /**
-        * Given a link data object return its unique key: a number or a string.
-        * This returns undefined if there is no key value.
-        * Unless .linkKeyProperty is set to a non-empty string, this model
-        * will not automatically assign unique key values for link data objects.
-        * It is possible to change the key for a link data object by calling .setKeyForLinkData.
-        * @param {Object} linkdata a JavaScript object representing a link.
-        */
-        getKeyForLinkData(linkdata: Object): Key;
-
-        /**
-        * Gets an Array of node key values that identify node data acting as labels on the given link data.
-        * This method only works if .linkLabelKeysProperty has been set to something other than an empty string.
-        * @param {Object} linkdata a JavaScript object representing a link.
-        */
-        getLabelKeysForLinkData(linkdata: Object): Array<Key>;
-
-        /**
-        * From a link data retrieve a value uniquely identifying the node data
-        * to which this link is connected.
-        * @param {Object} linkdata a JavaScript object representing a link.
-        */
-        getToKeyForLinkData(linkdata: Object): Key;
-
-        /**
-        * From a link data retrieve a value identifying the port object of the node
-        * to which this link is connected.
-        * @param {Object} linkdata a JavaScript object representing a link.
-        */
-        getToPortIdForLinkData(linkdata: Object): string;
-
-        /**
-        * See if the given node data should be represented as a group or as a simple node.
-        * This value must not change as long as the node data is part of the model.
-        * At the current time there is no <code>setIsGroupForNodeData</code> method.
-        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
-        */
-        isGroupForNodeData(nodedata: Object): boolean;
-
-        /**
-        * This method is called when a link data object is added to the model to make sure that
-        * .getKeyForLinkData returns a unique key value.
-        * The key value should be unique within the set of data managed by this model:
-        * .linkDataArray.
-        * If the key is already in use, this will assign an unused number to the
-        * .linkKeyProperty property on the data.
-        * If you want to customize the way in which link data gets a unique key,
-        * you can set the .makeUniqueKeyFunction functional property.
-        * If the link data object is already in the model and you want to change its key value,
-        * call .setKeyForLinkData and give it a new unique key value.
-        * @param {Object} linkdata a JavaScript object representing a link.
-        */
-        makeLinkDataKeyUnique(linkdata: Object): void;
-
-        /**
-        * Removes a node key value that identifies a node data acting as a former label node on the given link data.
-        * Removing a reference to a node data from the collection of link label keys
-        * does not automatically remove any node data from the model.
-        * This method only works if .linkLabelKeysProperty has been set to something other than an empty string.
-        * @param {Object} linkdata a JavaScript object representing a link.
-        * @param {string|number} key a number or string that is the key of the label node being removed from the link.
-        */
-        removeLabelKeyForLinkData(linkdata: Object, key: Key): void;
-
-        /**
-        * When you want to remove a link from the diagram, call this method with an existing link data object.
-        * This will remove that data from the .linkDataArray and
-        * notify all listeners that a link data object has been removed from the collection.
-        * Removing a link data from a model does not automatically remove
-        * any associated label node data from the model.
-        * This operation does nothing if the link data is not present in the .linkDataArray.
-        * @param {Object} linkdata a JavaScript object representing a link.
-        */
-        removeLinkData(linkdata: Object): void;
-
-        /**
-        * Remove from this model all of the link data held in an Array or in an Iterable of link data objects.
-        * @param {Iterable<Object>|Array<Object>} coll a collection of link data objects to remove from the .linkDataArray
-        */
-        removeLinkDataCollection(coll: Iterable<Object> | Array<Object>): void;
-
-        /**
-        * Change the category of a given link data, a string naming the link template
-        * that the Diagram should use to represent the link data.
-        * Changing the link template for a link data will cause the existing Link
-        * to be removed from the Diagram and be replaced with a new Link
-        * created by copying the new link template and applying any data-bindings.
-        * @param {Object} linkdata a JavaScript object representing a link.
-        * @param {string} cat Must not be null.
-        */
-        setCategoryForLinkData(linkdata: Object, cat: string): void;
-
-        /**
-        * Change the node key that the given link data references as the
-        * source of the link.
-        * @param {Object} linkdata a JavaScript object representing a link.
-        * @param {string|number|undefined} key This may be undefined if
-        * the link should no longer come from any node.
-        */
-        setFromKeyForLinkData(linkdata: Object, key: Key): void;
-
-        /**
-        * Change the information that the given link data uses to identify the
-        * particular "port" that the link is coming from.
-        * @param {Object} linkdata a JavaScript object representing a link.
-        * @param {string} portname This may be the empty string if
-        * the link should no longer be associated with any particular "port".
-        */
-        setFromPortIdForLinkData(linkdata: Object, portname: string): void;
-
-        /**
-        * Change the container group for the given node data, given a key for the new group.
-        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
-        * @param {string|number|undefined} key This may be undefined if there should be no containing group data.
-        */
-        setGroupKeyForNodeData(nodedata: Object, key: Key): void;
-
-        /**
-        * Change the unique key of a given link data that is already in this model.
-        * The new key value must be unique -- i.e. not in use by another link data object.
-        * You can call .findLinkDataForKey to check if a proposed new key is already in use.
-        * If this is called when .linkKeyProperty is the empty string (i.e. its default value),
-        * this method has no effect.
-        * If this is called on a link data object that is not (yet) in this model,
-        * this unconditionally modifies the property to the new key value.
-        * @param {Object} linkdata a JavaScript object representing a link.
-        * @param {string|number|undefined} key
-        */
-        setKeyForLinkData(linkdata: Object, key: Key): void;
-
-        /**
-        * Replaces an Array of node key values that identify node data acting as labels on the given link data.
-        * This method only works if .linkLabelKeysProperty has been set to something other than an empty string.
-        * @param {Object} linkdata a JavaScript object representing a link.
-        * @param arr an Array of node keys; an empty Array if the property was not present.
-        */
-        setLabelKeysForLinkData(linkdata: Object, arr: Array<Key>): void;
-
-        /**
-        * Change the node key that the given link data references as the
-        * destination of the link.
-        * @param {Object} linkdata a JavaScript object representing a link.
-        * @param {string|number|undefined} key This may be undefined if
-        * the link should no longer go to any node.
-        */
-        setToKeyForLinkData(linkdata: Object, key: Key): void;
-
-        /**
-        * Change the information that the given link data uses to identify the
-        * particular "port" that the link is going to.
-        * @param {Object} linkdata a JavaScript object representing a link.
-        * @param {string} portname This may be the empty string if
-        * the link should no longer be associated with any particular "port".
-        */
-        setToPortIdForLinkData(linkdata: Object, portname: string): void;
-    }
-
-    /*
-    * Models hold the essential data of a diagram, describing the basic entities and their properties and relationships
-    * without specifying the appearance and behavior of the Nodes and Links and Groups that represent them visually.
-    * Models tend to hold only relatively simple data, making them easy to persist by serialization as JSON or XML formatted text.
-    */
-    class Model {
-        /**
-        * You probably don't want to call this constructor, because this class does not support links (relationships between nodes) or groups (nodes and links and subgraphs as nodes): instead, create instances of a subclass such as GraphLinksModel or TreeModel.
-        * @param {Array<Object>=} nodedataarray an optional Array containing JavaScript objects to be represented by Parts.
-        */
-        constructor(nodedataarray?: Array<Object>);
-
-        /**Gets or sets whether the default behavior for copyNodeData makes copies of property values that are Arrays.*/
-        copiesArrays: boolean;
-
-        /**Gets or sets whether the default behavior for copyNodeData when copying Arrays also copies array items that are Objects.*/
-        copiesArrayObjects: boolean;
-
-        /**Gets or sets a function that makes a copy of a node data object; the default value is null, resulting in the standard behavior which is to make a shallow copy of the object.*/
-        copyNodeDataFunction: (obj: Object, model: Model) => Object;
-
-        /**Gets or sets the name of the format of the diagram data; the default value is the empty string.*/
-        dataFormat: string;
-
-        /**Gets or sets whether this model may be modified, such as adding nodes; by default this value is false.*/
-        isReadOnly: boolean;
-
-        /**Gets or sets a function that returns a unique id number or string for a node data object; the default value is null.*/
-        makeUniqueKeyFunction: (model: Model, obj: Object) => Key;
-
-        /**Gets a JavaScript Object that can hold programmer-defined property values for the model as a whole, rather than just for one node or one link; by default this is an object with no properties. The value must be an Object.*/
-        modelData: any;
-
-        /**Gets or sets the name of this model; the initial name is an empty string.*/
-        name: string;
-
-        /**Gets or sets the name of the node data property that returns a string naming that data's category, or a function that takes a node data object and returns the category name; the default value is the name 'category'.*/
-        nodeCategoryProperty: PropertyAccessor;
-
-        /**Gets or sets the array of node data objects that correspond to Nodes, Groups, or non-Link Parts in the Diagram; the initial value is an empty Array.*/
-        nodeDataArray: Array<Object>;
-
-        /**Gets or sets the name of the data property that returns a unique id number or string for each node data object, or a function taking a node data object and returning the key value; the default value is the name 'key'.*/
-        nodeKeyProperty: PropertyAccessor;
-
-        /**Gets or sets whether ChangedEvents are not recorded by the UndoManager; the initial and normal value is false.*/
-        skipsUndoManager: boolean;
-
-        /**Gets or sets the UndoManager for this Model; the default UndoManager has its UndoManager.isEnabled property set to false.*/
-        undoManager: UndoManager;
-
-        /**
-        * Add an item at the end of a data array that may be data bound by a Panel as its Panel.itemArray,
-        * in a manner that can be undone/redone and that automatically updates any bindings.
-        * This also calls .raiseChangedEvent to notify all listeners about the ChangedEvent.Insert.
-        * If you want to add a new node or part to the diagram, call .addNodeData.
-        * @param {Array<*>} arr an Array that is the value of some Panel's Panel.itemArray.
-        * @param {*} val the new value to be pushed onto the array.
-        */
-        addArrayItem(arr: Array<any>, val: any): void;
-
-        /**
-        * Register an event handler that is called when there is a ChangedEvent for a modification of the Diagram, a Layer, or a GraphObject.
-        * This registration does not raise a ChangedEvent.
-        * @param {function(ChangedEvent)} listener a function that takes a ChangedEvent as its argument.
-        */
-        addChangedListener(listener: (e: ChangedEvent) => void ): void;
-
-        /**
-        * When you want to add a node or group to the diagram,
-        * call this method with a new data object.
-        * This will add that data to the .nodeDataArray and
-        * notify all listeners that a new node data object has been inserted into the collection.
-        * To remove a node from the diagram, you can remove its data object by calling .removeNodeData.
-        * To add or remove an object or value from an item array, call .insertArrayItem or .removeArrayItem.
-        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
-        */
-        addNodeData(nodedata: Object): void;
-
-        /**
-        * Add to this model all of the node data held in an Array or in an Iterable of node data objects.
-        * @param {Iterable<Object>|Array<Object>} coll a collection of node data objects to add to the .nodeDataArray
-        */
-        addNodeDataCollection(coll: Iterable<Object> | Array<Object>): void;
-
-        /**
-        * Modify this model by applying the changes given in an "incremental" model change in JSON format
-        * generated by toIncrementalJson.
-        * Incremental changes must be applied in the same order that the changes occurred in the original model.
-        * <p>
-        * This requires the "incremental" property to be present and to be a number, as specified by toIncrementalJson.
-        * All of the top-level properties in the JSON, such as nodeKeyProperty, must be the same as for this model.
-        * @param {string|Object} s a String in JSON format containing modifications to be performed to the model,
-        *    or a JavaScript Object parsed from such a string
-        */
-        applyIncrementalJson(s: string | Object): void;
-
-        /**
-        * Clear out all references to any model data.
-        * This also clears out the UndoManager, so this operation is not undoable.
-        * This method is called by Diagram.clear; it does not notify any Diagrams or other listeners.
-        * Instead of calling this method, you may prefer to set .nodeDataArray to an empty JavaScript Array.
-        * If this model is a GraphLinksModel, you would also want to set GraphLinksModel.linkDataArray to a separate empty JavaScript Array.
-        */
-        clear(): void;
-
-        /**
-         * Copies properties from this model to the given model, which must be of the same class as this model.
-         * @param {Model} copy 
-         */
-        protected cloneProtected(copy: Model): void;
-
-        /**
-        * Commit the changes of the current transaction.
-        * This just calls UndoManager.commitTransaction.
-        * @param {string=} tname a descriptive name for the transaction.
-        */
-        commitTransaction(tname?: string): boolean;
-
-        /**
-        * Decide if a given node data is in this model.
-        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
-        */
-        containsNodeData(nodedata: Object): boolean;
-
-        /**
-        * Creates an empty copy of this Model and returns it.
-        * The data is not copied: nodeDataArray, modelData,
-        * GraphLinksModel.linkDataArray, GraphLinksModel.archetypeNodeData.
-        * Nor are any Changed listeners or the UndoManager.
-        */
-        copy(): Model;
-
-        /**
-        * Make a copy of a node data object.
-        * This uses the value of .copyNodeDataFunction to actually perform the copy,
-        * unless it is null, in which case this method just makes a shallow copy of the JavaScript Object.
-        * This does not modify the model -- the returned data object is not added to this model.
-        * This assumes that the data's constructor can be called with no arguments.
-        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
-        */
-        copyNodeData(nodedata: Object): Object;
-
-        /**
-        * Given a number or string, find the node data in this model
-        * that uses the given value as its unique key.
-        * The return value will be an Object or null.
-        * @param {*} key a string or a number.
-        */
-        findNodeDataForKey(key: Key): any;
-
-        /**
-        * This static function parses a string in JSON format and constructs, initializes, and returns a model.
-        * Note that properties with values that are functions are not written out by .toJson,
-        * so reading in such a model will require constructing such a model, initializing its functional property values,
-        * and explicitly passing it in as the second argument.
-        * @param {string} s a String in JSON format containing all of the persistent properties of the model, or an Object already read from JSON text.
-        * @param {model=} model an optional model to be modified; if not supplied, it constructs and returns a new model whose name is specified by the "class" property.
-        */
-        static fromJson(s: string | Object, model?: Model): Model;
-
-        /**
-        * Find the category of a given node data, a string naming the node template
-        * or group template or part template
-        * that the Diagram should use to represent the node data.
-        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
-        */
-        getCategoryForNodeData(nodedata: Object): string;
-
-        /**
-        * Given a node data object return its unique key: a number or a string.
-        * This returns undefined if there is no key value.
-        * It is possible to change the key for a node data object by calling .setKeyForNodeData.
-        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
-        */
-        getKeyForNodeData(nodedata: Object): Key;
-
-        /**
-        * Add an item to a data array that may be data bound by a Panel as its Panel.itemArray,
-        * given a new data value and the index at which to insert the new value, in a manner that can be undone/redone and that automatically updates any bindings.
-        * This also calls .raiseChangedEvent to notify all listeners about the ChangedEvent.Insert.
-        * If you want to add a new node or part to the diagram, call .addNodeData.
-        * @param Array<*> arr an Array that is the value of some Panel's Panel.itemArray.
-        * @param {number} idx the zero-based array index where the new value will be inserted; use -1 to push the new value on the end of the array.
-        * @param {*} val the new value to be inserted into the array.
-        */
-        insertArrayItem(arr: Array<any>, idx: number, val: any): void;
-
-        /**
-        * This method is called when a node data object is added to the model to make sure that
-        * .getKeyForNodeData returns a unique key value.
-        * The key value should be unique within the set of data managed by this model:
-        * .nodeDataArray.
-        * If the key is already in use, this will assign an unused number to the
-        * .nodeKeyProperty property on the data.
-        * If you want to customize the way in which node data gets a unique key,
-        * you can set the .makeUniqueKeyFunction functional property.
-        * If the node data object is already in the model and you want to change its key value,
-        * call .setKeyForNodeData and give it a new unique key value.
-        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
-        */
-        makeNodeDataKeyUnique(nodedata: Object): void;
-
-        /**
-        * Call this method to notify that the model or its objects have changed.
-        * This constructs a ChangedEvent and calls all Changed listeners.
-        * @param {EnumValue} change specifies the general nature of the change; typically the value is ChangedEvent.Property.
-        * @param {string|function(Object):*} propertyname names the property that was modified, or a function that takes an Object and returns the property value.
-        * @param {Object} obj the object that was modified, typically a GraphObject, Diagram, or a Model.
-        * @param {*} oldval the previous or older value.
-        * @param {*} newval the next or newer value.
-        * @param {*=} oldparam an optional value that helps describe the older value.
-        * @param {*=} newparam an optional value that helps describe the newer value.
-        */
-        raiseChangedEvent(change: EnumValue, propertyname: PropertyAccessor, obj: Object, oldval: any, newval: any, oldparam?: any, newparam?: any): void;
-
-        /**
-        * Call this method to notify about a data property having changed value.
-        * This constructs a ChangedEvent and calls all Changed listeners.
-        * You should call this method only if the property value actually changed.
-        * This method is called by .setDataProperty.
-        * @param {Object} data the data object whose property changed value.
-        * @param {string|function(Object):*} propertyname the name of the property, or a function that takes an Object and returns the property value.
-        * @param {*} oldval the previous or old value for the property.
-        * @param {*} newval the next or new value for the property.
-        * @param {*=} oldparam an optional value additionally describing the old value.
-        * @param {*=} newparam an optional value additionally describing the new value.
-        */
-        raiseDataChanged(data: Object, propertyname: PropertyAccessor, oldval: any, newval: any, oldparam?: any, newparam?: any): void;
-
-        /**
-        * Remove an item from a data array that may be data bound by a Panel as its Panel.itemArray,
-        * given the index at which to remove a data value, in a manner that can be undone/redone and that automatically updates any bindings.
-        * This also calls .raiseChangedEvent to notify all listeners about the ChangedEvent.Remove.
-        * If you want to remove a node from the diagram, call .removeNodeData.
-        * Note that there is no version of this method that takes an item value instead of an index into the array.
-        * Because item arrays may hold any JavaScript value, including numbers and strings, there may be duplicate entries with that value in the array.
-        * To avoid ambiguity, removing an item from an array requires an index.
-        * @param Array<*> arr an Array that is the value of some Panel's Panel.itemArray.
-        * @param {number=} idx the zero-based array index of the data item to be removed from the array;
-        *   if not supplied it will remove the last item of the array.
-        */
-        removeArrayItem(arr: Array<any>, idx?: number): void;
-
-        /**
-        * Unregister an event handler listener.
-        * This deregistration does not raise a ChangedEvent.
-        * @param {function(ChangedEvent)} listener a function that takes a ChangedEvent as its argument.
-        */
-        removeChangedListener(listener: (e: ChangedEvent) => void ): void;
-
-        /**
-        * When you want to remove a node or group from the diagram,
-        * call this method with an existing data object.
-        * This will remove that data from the .nodeDataArray and
-        * notify all listeners that a node data object has been removed from the collection.
-        * Removing a node data from a model does not automatically remove
-        * any connected link data from the model.
-        * Removing a node data that represents a group does not automatically remove
-        * any member node data or link data from the model.
-        * To add a node to the diagram, you can add its data object by calling .addNodeData.
-        * To add or remove an object or value from an item array, call .insertArrayItem or .removeArrayItem.
-        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
-        */
-        removeNodeData(nodedata: Object): void;
-
-        /**
-        * Remove from this model all of the node data held in an Array or in an Iterable of node data objects.
-        * @param {Iterable<Object>|Array<Object>} coll a collection of node data objects to remove from the .nodeDataArray
-        */
-        removeNodeDataCollection(coll: Iterable<Object> | Array<Object>): void;
-
-        /**
-        * Rollback the current transaction, undoing any recorded changes.
-        * This just calls UndoManager.rollbackTransaction.
-        */
-        rollbackTransaction(): boolean;
-
-        /**
-        * Change the category of a given node data, a string naming the node template
-        * or group template or part template
-        * that the Diagram should use to represent the node data.
-        * Changing the node template for a node data will cause the existing Node, Group, or Part
-        * to be replaced with a new Node, Group, or Part
-        * created by copying the new node template and applying any data-bindings.
-        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
-        * @param {string} cat Must not be null.
-        */
-        setCategoryForNodeData(nodedata: Object, cat: string): void;
-
-        /**
-        * Change the value of some property of a node data, a link data, or an item data, given a string naming the property
-        * and the new value, in a manner that can be undone/redone and that automatically updates any bindings.
-        * This gets the old value of the property; if the value is the same as the new value, no side-effects occur.
-        * @param {Object} data a JavaScript object representing a Node, Link, Group, simple Part, or item in a Panel.itemArray.
-        * @param {string} propname a string that is not null or the empty string.
-        * @param {*} val the new value for the property.
-        */
-        setDataProperty(data: Object, propname: string, val: any): void;
-
-        /**
-        * Change the unique key of a given node data that is already in this model.
-        * The new key value must be unique -- i.e. not in use by another node data object.
-        * You can call .findNodeDataForKey to check if a proposed new key is already in use.
-        * This operation will check all data objects in the model and replace all references
-        * using the old key value with the new one.
-        * If this is called on a node data object that is not (yet) in this model,
-        * this unconditionally modifies the property to the new key value.
-        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
-        * @param {string|number|undefined} key
-        */
-        setKeyForNodeData(nodedata: Object, key: Key): void;
-
-        /**
-        * Begin a transaction, where the changes are held by a Transaction object in the UndoManager.
-        * This just calls UndoManager.startTransaction.
-        * @param {string=} tname a descriptive name for the transaction.
-        */
-        startTransaction(tname?: string): boolean;
-
-        /**
-        * Produce a JSON-format string representing the changes in the most recent Transaction.
-        * This writes out JSON for a model, but recording only changes in the given Transaction,
-        * with the addition of the "incremental" property to mark it as different from a complete model.
-        * Instead of the "nodeDataArray" property (and "linkDataArray" property for GraphLinksModels),
-        * this will have "inserted...", "modified...", and "removed..." properties that are Arrays.
-        * <p>
-        * The "modifiedNodeData" Array holds JavaScript objects.
-        * The "insertedNodeKeys" and "removedNodeKeys" Arrays hold keys (numbers or strings) of data,
-        * not whole objects, that have been added and/or deleted.
-        * <p>
-        * The purpose of this method is to make it easier to send incremental changes to the server/database,
-        * instead of sending the whole model.
-        * <p>
-        * For GraphLinksModels, this method requires that GraphLinksModel#linkKeyProperty is not an empty string.
-        * The incremental JSON for GraphLinksModels will include "modifiedLinkData", "insertedLinkKeys", and "removedLinkKeys"
-        * properties that are Arrays.
-        * @param {ChangedEvent} e a Transaction ChangedEvent for which ChangedEvent.isTransactionFinished is true
-        * @param {string=} classname for the written model, defaults to the name of the class of the model
-        * @return {string}
-        */
-        toIncrementalJson(e: ChangedEvent, classname?: string): string;
-
-        /**
-        * Generate a string representation of the persistent data in this model, in JSON format.
-        * Object properties that are not enumerable or whose names start with "_" are not written out.
-        * Functions are not able to be written in JSON format, so any properties that have function values
-        * will not be saved in the JSON string.
-        * There must not be any circular references within the model data.
-        * Any sharing of object references will be lost in the written JSON.
-        * Most object classes cannot be serialized into JSON without special knowledge and processing at both ends.
-        * The .toJson and Model.fromJson methods automatically do such processing for numbers that are NaN
-        * and for objects that are of class Point, Size, Rect, Margin, Spot,
-        * Brush (but not for brush patterns), and for Geometry.
-        * However, we recommend that you use Binding converters (static functions named "parse" and "stringify")
-        * to represent Points, Sizes, Rects, Margins, Spots, and Geometries as string values in your data, rather than as Objects.
-        * This makes the JSON text smaller and simpler and easier to read.
-        * @param {string=} classname The optional name of the model class to use in the output;
-        *     for the standard models, this is their class name prefixed with "go.".
-        */
-        toJson(classname?: string): string;
-
-        /**
-        * Find a Part corresponding to the given data and
-        * call its Panel.updateTargetBindings method, in each Diagram
-        * that uses this Model.
-        * @param {Object} data The data object in this model that was modified.
-        * @param {string=} srcpropname If not present or the empty string,
-        *   update all bindings on the target Part or item Panel;
-        *   otherwise update only those bindings using this source property name.
-        */
-        updateTargetBindings(data: Object, srcpropname?: string): void;
-    }
-
-    /**
-    * A Transaction holds a list of ChangedEvents collected during a transaction,
-    * as the value of the read-only .changes property.
-    */
-    class Transaction {
-        /**
-        * Construct an object holding an empty list of ChangedEvents and no .name.
-        */
-        constructor();
-
-        /**This read-only property returns the list of ChangedEvents.*/
-        changes: List<ChangedEvent>;
-
-        /**Gets or sets whether we can add more ChangedEvents to this list of changes.*/
-        isComplete: boolean;
-
-        /**Gets or sets the transaction name for this collection of changes.*/
-        name: string;
-
-        /**
-        * This predicate returns true if you can call .redo, namely when .isComplete is true.
-        */
-        canRedo(): boolean;
-
-        /**
-        * This predicate returns true if you can call .undo, namely when .isComplete is true.
-        */
-        canUndo(): boolean;
-
-        /**
-        * Clear all of the saved changes.
-        */
-        clear(): void;
-
-        /**
-        * Re-perform these changes after an .undo.
-        */
-        redo(): void;
-
-        /**
-        * Undo all of the changes, in reverse order.
-        */
-        undo(): void;
-    }
-
-    /**
-    * TreeModels support tree-structured graphs of nodes and links.
-    * Each node can have at most one "tree parent"; cycles are not permitted.
-    * The reference to the parent node's key is a property of the child node data.
-    */
-    class TreeModel extends Model {
-        /**
-        * This constructs an empty TreeModel unless one provides arguments as the initial data array values for the Model.nodeDataArray property.
-        * @param {Array<Object>=} nodedataarray an optional Array containing JavaScript objects to be represented by Nodes.
-        */
-        constructor(nodedataarray?: Array<Object>);
-
-        /**
-        * Gets or sets the name of the property on node data that specifies
-        * the string or number key of the node data that acts as the "parent" for this "child" node data,
-        * or a function that takes a node data object and returns that parent key;
-        * the default value is the name 'parent'.
-        * The value must not be null nor an empty string.
-        */
-        nodeParentKeyProperty: PropertyAccessor;
-
-        /**
-        * Gets or sets the name of the data property that returns a string describing that node data's parent link's category,
-        * or a function that takes a node data object and returns its parent link's category string;
-        * the default value is the name 'parentLinkCategory'.
-        * This is used by the diagram to distinguish between different kinds of links.
-        * The name must not be null.
-        */
-        parentLinkCategoryProperty: PropertyAccessor;
-
-        /**
-        * If there is a parent node for the given node data, return the parent's key.
-        * @param {Object} nodedata a JavaScript object representing a node.
-        */
-        getParentKeyForNodeData(nodedata: Object): Key;
-
-        /**
-        * Find the category for the parent link of a given child node data, a string naming the link template
-        * that the Diagram should use to represent the link.
-        * @param {Object} childdata a JavaScript object representing a node data.
-        */
-        getParentLinkCategoryForNodeData(childdata: Object): string;
-
-        /**
-        * Change the parent node for the given node data, given a key for the new parent, or undefined if there should be no parent.
-        * @param {Object} nodedata a JavaScript object representing a node.
-        * @param {string|number|undefined} key This may be undefined if there should be no parent node data.
-        */
-        setParentKeyForNodeData(nodedata: Object, key: Key): void;
-
-        /**
-        * Change the category for the parent link of a given child node data, a string naming the link template
-        * that the Diagram should use to represent the link.
-        * Changing the link template will cause any existing Link
-        * to be removed from the Diagram and replaced with a new Link
-        * created by copying the new link template and applying any data-bindings.
-        * @param {Object} childdata a JavaScript object representing a node data.
-        * @param {string} cat Must not be null.
-        */
-        setParentLinkCategoryForNodeData(childdata: Object, cat: string): void;
-    }
-
-    /**
-    * A Transaction holds a list of ChangedEvents collected during a transaction,
-    * as the value of the read-only .changes property.
-    */
-    class UndoManager {
-        /**
-        * The constructor produces an empty UndoManager with no transaction history.
-        */
-        constructor();
-
-        /**This read-only property returns the current Transaction for recording additional model change events.*/
-        currentTransaction: Transaction;
-
-        /**This read-only property returns the whole history, a list of all of the Transactions, each representing a transaction with some number of ChangedEvents.*/
-        history: List<Transaction>;
-
-        /**This read-only property returns the index into .history for the current undoable Transaction.*/
-        hisotryIndex: number;
-
-        /**Gets or sets whether this UndoManager records any changes.*/
-        isEnabled: boolean;
-
-        /**This property is true after the first call to .startTransaction and before a corresponding call to .commitTransaction or .rollbackTransaction.*/
-        isInTransaction: boolean;
-
-        /**This property is true during a call to .undo or .redo.*/
-        isUndoingRedoing: boolean;
-
-        /**Gets or sets the maximum number of transactions that this undo manager will remember.*/
-        maxHistoryLength: number;
-
-        /**This read-only property returns an iterator for all of the Models that this UndoManager is handling.*/
-        models: Iterator<Model>;
-
-        /**This read-only property returns a stack of ongoing transaction names.*/
-        nestedTransactionNames: List<string>;
-
-        /**This read-only property returns the current transaction level.*/
-        transactionLevel: number;
-
-        /**This read-only property returns the Transaction in the .history to be redone next.*/
-        transactionToRedo: Transaction;
-
-        /**This read-only property returns the Transaction in the .history to be undone next.*/
-        transactionToUndo: Transaction;
-
-        /**
-        * Make sure this UndoManager knows about a Model for which it may receive ChangedEvents when the given Model is changed.
-        * @param {Model} model
-        */
-        addModel(model: Model): void;
-
-        /**
-        * This predicate returns true if you can call .redo.
-        */
-        canRedo(): boolean;
-
-        /**
-        * This predicate returns true if you can call .undo.
-        */
-        canUndo(): boolean;
-
-        /**
-        * Clear all of the Transactions and clear all other state, including any ongoing transaction without rolling back.
-        */
-        clear(): void;
-
-        /**
-        * Commit the current transaction started by a call to .startTransaction.
-        * For convenience, this method is called by Model.commitTransaction and Diagram.commitTransaction.
-        * If this call stops a top-level transaction,
-        * we mark the .currentTransaction as complete (Transaction.isComplete),
-        * we add the Transaction to the .history list,
-        * and we return true.
-        * Committing a transaction when there have been some undos without corresponding
-        * redos will throw away the Transactions holding changes that happened
-        * after the current state, before adding the new Transaction to the
-        * .history list.
-        * @param {string=} tname a short string describing the transaction, defaulting to the name given at the call to startTransaction
-        */
-        commitTransaction(tname?: string): boolean;
-
-        /**
-        * Maybe record a ChangedEvent in the .currentTransaction.
-        * This calls .skipsEvent to see if this should ignore the change.
-        * If .skipsEvent returns false, this creates a copy of the ChangedEvent
-        * and adds it to the .currentTransaction.
-        * If there is no .currentTransaction, this first creates and remembers it.
-        * This method always ignores all changes while performing
-        * an .undo or .redo.
-        * This method is also a no-op if .isEnabled is false.
-        * @param {ChangedEvent} e a ChangedEvent.
-        */
-        handleChanged(e: ChangedEvent): void;
-
-        /**
-        * Re-perform this object change after an .undo.
-        */
-        redo(): void;
-
-        /**
-        * Inform this UndoManager that it will no longer be receiving ChangedEvents
-        * when the given Model is changed.
-        * The model will no longer receive notifications about transactions and undo or redo operations.
-        * You should not call this method during a transaction.
-        * If you call this method between transactions when there is a transaction history,
-        * you should be careful that there are no ChangedEvents referring to that model in any Transactions.
-        * @param {Model} model A Model that this UndoManager should no longer manage.
-        */
-        removeModel(model: Model): void;
-
-        /**
-        * Rollback the current transaction started by a call to .startTransaction, undoing any changes.
-        */
-        rollbackTransaction(): boolean;
-
-        /**
-        * This predicate is called by .handleChanged to decide if a ChangedEvent
-        * is not interesting enough to be remembered.
-        * Transactional events (of change type ChangedEvent.Transaction) are always skipped.
-        * Changed events for GraphObjects that are in Layer.isTemporary layers are also skipped.
-        * Sometimes changed events do not even get to .handleChanged because
-        * Model.skipsUndoManager or Diagram.skipsUndoManager is true.
-        * @param {ChangedEvent} e the ChangedEvent received by .handleChanged.
-        */
-        skipsEvent(e: ChangedEvent): boolean;
-
-        /**
-        * Begin a transaction, where the changes are held by a Transaction object
-        * as the value of .currentTransaction.
-        * You must call either .commitTransaction or .rollbackTransaction afterwards.
-        * For convenience, this method is called by Model.startTransaction and Diagram.startTransaction.
-        * Transactions can be nested.
-        * Starting or ending a nested transaction will return false.
-        * Nested transactions will share the same Transaction list of ChangedEvents.
-        * Starting a transaction will not necessarily cause .currentTransaction to be non-null.
-        * A Transaction object is usually only created by .handleChanged when a ChangedEvent first occurs.
-        * @param {string=} tname a short string describing the transaction.
-        */
-        startTransaction(tname?: string): boolean;
-
-        /**
-        * Reverse the effects of this object change.
-        */
-        undo(): void;
-    }
-
-
-    /**
-     * This layout positions nodes in a circular arrangement.
-     * This layout makes use of a LayoutNetwork of
-     * CircularVertexes and CircularEdges that normally
-     * correspond to the Nodes and Links of the Diagram.
-     */
-    class CircularLayout extends Layout {
-        /**
-        * Constructs a CircularLayout with no Layout.network and with no owning Layout.diagram.
-        */
-        constructor();
-
-        /**Returns the coordinates of the center of the laid-out ellipse.*/
-        actualCenter: Point;
-
-        /**This read-only property returns the effective spacing that may have been calculated by the layout.*/
-        actualSpacing: number;
-
-        /**This read-only property returns the effective X radius that may have been calculated by the layout.*/
-        actualXRadius: number;
-
-        /**This read-only property returns the effective Y radius that may have been calculated by the layout.*/
-        actualYRadius: number;
-
-        /**Gets or sets how the nodes are spaced.*/
-        arrangement: EnumValue;
-
-        /**Gets or sets the ratio of the arrangement's height to its width (1 for a circle, >1 for a vertically elongated ellipse).*/
-        aspectRatio: number;
-
-        /**Gets or sets the comparer which sorts the data when .sorting is set to CircularLayout.Ascending or CircularLayout.Descending.*/
-        comparer: (a: CircularVertex, b: CircularVertex) => number;
-
-        /**Gets or sets whether the nodes are arranged clockwise or counterclockwise.*/
-        direction: EnumValue;
-
-        /**Specifies how the diameter of nodes will be calculated.*/
-        nodeDiameterFormula: EnumValue;
-
-        /**Gets or sets the horizontal radius of the elliptical arrangement.*/
-        radius: number;
-
-        /**Gets or sets if and how the nodes are sorted.*/
-        sorting: EnumValue;
-
-        /**Gets or sets the distance between nodes (if .radius is NaN) or the minimum distance between nodes (if .radius is a number).*/
-        spacing: number;
-
-        /**Gets or sets the angle (in degrees, clockwise from the positive side of the X axis) of the first element.*/
-        startAngle: number;
-
-        /**Gets or sets the absolute angle (in degrees) between the first and last node.*/
-        sweepAngle: number;
-
-        /**
-        * Position each Node according to the Vertex position, and then position the Links.
-        */
-        commitLayout(): void;
-
-        /**
-        * Commit the position and routing of all edge links.
-        */
-        commitLinks(): void;
-
-        /**
-        * Commit the position of all vertex nodes.
-        */
-        commitNodes(): void;
-
-        /**
-        * Create a new LayoutNetwork of CircularVertexes and CircularEdges.
-        */
-        createNetwork(): CircularNetwork;
-
-        /**
-        * Assign the positions of the vertexes in the network.
-        * @param {Diagram | Group | Iterable<Part>} coll A Diagram or a Group or a collection of Parts.
-        */
-        doLayout(coll: (Diagram | Group | Iterable<Part>)): void;
-
-        /**Nodes are sorted using the .comparer, in ascending order; This value is used for CircularLayout.sorting.*/
-        static Ascending: EnumValue;
-
-        /**The ring is filled by alternating sides; the second node is counterclockwise from the first node; This value is used for CircularLayout.direction.*/
-        static BidirectionalLeft: EnumValue;
-
-        /**The ring is filled by alternating sides; the second node is clockwise from the first node; This value is used for CircularLayout.direction.*/
-        static BidirectionalRight: EnumValue;
-
-        /**The effective diameter is either the width or height of the node, whichever is larger; This will cause circular nodes to touch when CircularLayout.spacing is 0; This is ideal when the nodes are circular.*/
-        static Circular: EnumValue;
-
-        /**Rings are filled clockwise; This value is used for CircularLayout.direction.*/
-        static Clockwise: EnumValue;
-
-        /**The angular distance between the nodes is constant; This value is used for CircularLayout.arrangement.*/
-        static ConstantAngle: EnumValue;
-
-        /**The distance between the centers of the nodes is constant; This value is used for CircularLayout.arrangement.*/
-        static ConstantDistance: EnumValue;
-
-        /**The spacing between the idealized boundaries of the nodes is constant; This value is used for CircularLayout.arrangement.*/
-        static ConstantSpacing: EnumValue;
-
-        /**Rings are filled counterclockwise; This value is used for CircularLayout.direction.*/
-        static Counterclockwise: EnumValue;
-
-        /**Nodes are sorted using the .comparer, in reverse ascending (descending) order; This value is used for CircularLayout.sorting.*/
-        static Descending: EnumValue;
-
-        /**Nodes are arranged in the order given; This value is used for CircularLayout.sorting.*/
-        static Forwards: EnumValue;
-
-        /**Nodes are ordered to reduce link crossings; This value is used for CircularLayout.sorting.*/
-        static Optimized: EnumValue;
-
-        /**The vertices are arranged as close together as possible considering the CircularLayout.spacing, assuming the nodes are rectangular; This value is used for CircularLayout.arrangement.*/
-        static Packed: EnumValue;
-
-        /**The effective diameter is sqrt(width^2+height^2); The corners of square nodes will touch at 45 degrees when CircularLayout.spacing is 0; This value is used for CircularLayout.nodeDiameterFormula.*/
-        static Pythagorean: EnumValue;
-
-        /**Nodes are arranged in the reverse of the order given; This value is used for CircularLayout.sorting.*/
-        static Reverse: EnumValue;
-    }
-
-    class CircularNetwork extends LayoutNetwork {  // undocumented
-    }
-
-    /** This holds CircularLayout-specific information about Links.*/
-    class CircularEdge extends LayoutEdge {
-    }
-
-    /** This holds CircularLayout-specific information about Nodes.*/
-    class CircularVertex extends LayoutVertex {
-        /**Gets or sets the value used as the vertex's angle.*/
-        actualAngle: number;
-
-        /**Gets or sets the value used as the vertex's diameter.*/
-        diameter: number;
-    }
-
-    /**
-    * Force-directed layout treats the graph as if it were a system of physical
-    * bodies with forces acting on them and between them.
-    * The algorithm seeks a configuration of the bodies with locally minimal energy,
-    * i.e. vertex positions such that the sum of the forces on each vertex is zero.
-    */
-    class ForceDirectedLayout extends Layout {
-        /**
-        * Constructs a ForceDirectedLayout with no Layout.network and with no owning Layout.diagram.
-        */
-        constructor();
-
-        /**Gets or sets the space between which the layout will position the connected graphs that together compose the network.*/
-        arrangementSpacing: Size;
-
-        /**Gets or sets whether .commitNodes should move all of the nodes so that the nodes all fit with the top-left corner at the Layout.arrangementOrigin.*/
-        arrangesToOrigin: boolean;
-
-        /**Gets or sets whether to call .addComments.*/
-        comments: boolean;
-
-        /**This read-only property returns the current iteration count, valid during a call to .doLayout.*/
-        currentIteration: number;
-
-        /**Gets or sets the default value computed by .electricalCharge.*/
-        defaultCommentElectricalCharge: number;
-
-        /**Gets or sets the default value computed by .springLength.*/
-        defaultCommentSpringLength: number;
-
-        /**Gets or sets the default value computed by .electricalCharge.*/
-        defaultElectricalCharge: number;
-
-        /**Gets or sets the default value computed by .gravitationalMass.*/
-        defaultGravitationalMass: number;
-
-        /**Gets or sets the default value computed by .springLength.*/
-        defaultSpringLength: number;
-
-        /**Gets or sets the default value computed by .springStiffness.*/
-        defaultSpringStiffness: number;
-
-        /**Gets or sets approximately how far a node must move in order for the iterations to continue.*/
-        epsilonDistance: number;
-
-        /**Gets or sets a threshold for the distance beyond which the electrical charge forces may be ignored.*/
-        infinityDistance: number;
-
-        /**Gets or sets the maximum number of iterations to perform when doing the force-directed auto layout.*/
-        maxIterations: number;
-
-        /**Gets or sets a random number generator with a random() method; set to null in order to use and reset an internal repeatable pseudo-random number generator.*/
-        randomNumberGenerator: { random: () => number };
-
-        /**Gets or sets whether the fromSpot and the toSpot of every Link should be set to Spot.Default.*/
-        setsPortSpots: boolean;
-
-        /**
-        * Find associated objects to be positioned along with the vertex.
-        * @param {LayoutVertex} v
-        */
-        addComments(v: ForceDirectedVertex): void;
-
-        /**
-        * Position the Nodes according to the Vertex positions.
-        */
-        commitLayout(): void;
-
-        /**
-        * Commit the position and routing of all edge links.
-        */
-        commitLinks(): void;
-
-        /**
-        * Commit the position of all vertex nodes.
-        */
-        commitNodes(): void;
-
-        /**
-        * Create a new LayoutNetwork of ForceDirectedVertexes and ForceDirectedEdges.
-        */
-        createNetwork(): ForceDirectedNetwork;
-
-        /**
-        * Assign the positions of the vertexes in the network.
-        * @param {(Diagram | Group | Iterable<Part>)} coll A Diagram or a Group or a collection of Parts.
-        */
-        doLayout(coll: (Diagram | Group | Iterable<Part>)): void;
-
-        /**
-        * Returns the charge of the vertex,
-        * the value of ForceDirectedVertex.charge if it's a number,
-        * or else the value of .defaultElectricalCharge.
-        * @param {ForceDirectedVertex} v
-        */
-        electricalCharge(v: ForceDirectedVertex): number;
-
-        /**
-        * Returns the electrical field in the X direction acting on a vertex at the given point.
-        *
-        * Used to define an external electrical field at a point
-        * independent of the vertex charges.
-        * A vertex L is acted upon by a force in the X direction of magnitude
-        * @param {number} x
-        * @param {number} y
-        */
-        electricalFieldX(x: number, y: number): number;
-
-        /**
-        * Returns the electrical field in the Y direction acting on a vertex at the given point.
-        *
-        * Used to define an external electrical field at a point
-        * independent of the vertex charges.
-        * A vertex L is acted upon by a force in the Y direction of magnitude
-        * @param {number} x
-        * @param {number} y
-        */
-        electricalFieldY(x: number, y: number): number;
-
-        /**
-        * This returns the gravitational field in the X direction acting on a vertex at the given point.
-        *
-        * Used to define an external gravitational field at a point
-        * independent of the vertex masses.
-        * A vertex L is acted upon by a force in the X direction of magnitude
-        * @param {number} x
-        * @param {number} y
-        */
-        gravitationalFieldX(x: number, y: number): number;
-
-        /**
-        * This returns the gravitational field in the Y direction acting on a vertex at the given point.
-        *
-        * Used to define an external gravitational field at a point
-        * independent of the vertex masses.
-        * A vertex L is acted upon by a force in the Y direction of magnitude
-        * @param {number} x
-        * @param {number} y
-        */
-        gravitationalFieldY(x: number, y: number): number;
-
-        /**
-        * Returns the mass of the vertex,
-        * the value of ForceDirectedVertex.mass if it's a number,
-        * or else the value of .defaultGravitationalMass.
-        * @param {ForceDirectedVertex} v
-        */
-        gravitationalMass(v: ForceDirectedVertex): number;
-
-        /**
-        * This predicate returns true if the vertex should not be moved
-        * by the layout algorithm but still have an effect on nearby and connected vertexes.
-        * The default implementation returns ForceDirectedVertex.isFixed.
-        * @param {ForceDirectedVertex} v
-        */
-        isFixed(v: ForceDirectedVertex): boolean;
-
-        /**
-        * Maybe move a vertex that isFixed.
-        * This is called each iteration on each such vertex.
-        * By default this does nothing.
-        */
-        moveFixedVertex(v: ForceDirectedVertex): void;
-
-        /**
-        * Returns the length of the spring representing an edge.
-        * The two vertexes connected by the edge E are acted upon by a force of magnitude
-        * @param {ForceDirectedEdge} e
-        */
-        springLength(e: ForceDirectedEdge): number;
-
-        /**
-        * Returns the stiffness of the spring representing an edge.
-        * The two vertexes connected by the edge E are acted upon by a force of magnitude
-        * @param {ForceDirectedEdge} e
-        */
-        springStiffness(e: ForceDirectedEdge): number;
-    }
-
-    class ForceDirectedNetwork extends LayoutNetwork {  // undocumented
-    }
-
-    /** This holds ForceDirectedLayout-specific information about Links.*/
-    class ForceDirectedEdge extends LayoutEdge {
-        /**Gets or sets the length of this edge.*/
-        length: number;
-
-        /**Gets or sets this edge's stiffness or resistence to compression or stretching.*/
-        stiffness: number;
-    }
-
-    /** This holds ForceDirectedLayout-specific information about Nodes.*/
-    class ForceDirectedVertex extends LayoutVertex {
-        /**Gets or sets the electrical charge for this vertex.*/
-        charge: number;
-
-        /**Gets or sets the cumulative force on the vertex in the X direction.*/
-        forceX: number;
-
-        /**Gets or sets the cumulative force on the vertex in the Y direction.*/
-        forceY: number;
-
-        /**Gets or sets whether the vertex may be moved by any forces.*/
-        isFixed: boolean;
-
-        /**Gets or sets the gravitational mass for this vertex.*/
-        mass: number;
-    }
-
-    /**
-    * This simple layout places all of the Parts in a grid-like arrangement, ordered, spaced apart,
-    * and wrapping as needed.  It ignores any Links connecting the Nodes being laid out.
-    */
-    class GridLayout extends Layout {
-        /**
-        * This simple layout places all of the Parts in a grid-like arrangement, ordered, spaced apart,
-        * and wrapping as needed.  It ignores any Links connecting the Nodes being laid out.
-        */
-        constructor();
-
-        /**Gets or sets whether the Part.location or the position should be used to arrange each part.*/
-        alignment: EnumValue;
-
-        /**Gets or sets how to arrange the parts.*/
-        arrangement: EnumValue;
-
-        /**Gets or sets the minimum part size by which each part is positioned in the grid.*/
-        cellSize: Size;
-
-        /**Gets or sets the comparison function used to sort the parts.*/
-        comparer: (a: Part, b: Part) => number;
-
-        /**Gets or sets what order to place the parts.*/
-        sorting: EnumValue;
-
-        /**Gets or sets the minimum horizontal and vertical space between parts.*/
-        spacing: Size;
-
-        /**Gets or sets the maximum number of columns.*/
-        wrappingColumn: number;
-
-        /**Gets or sets the wrapping width.*/
-        wrappingWidth: number;
-
-        /**
-        * Assign the positions of the parts, ignoring any links.
-        * @param {(Diagram | Group | Iterable<Part>)} coll A Diagram or a Group or a collection of Parts.
-        */
-        doLayout(coll: (Diagram | Group | Iterable<Part>)): void;
-
-        /**Lay out each child according to the sort order given by GridLayout.comparer; This value is used for GridLayout.sorting.*/
-        static Ascending: EnumValue;
-
-        /**Lay out each child in reverse sort order given by GridLayout.comparer; This value is used for GridLayout.sorting.*/
-        static Descending: EnumValue;
-
-        /**Lay out each child in the order in which they were found; This value is used for GridLayout.sorting.*/
-        static Forward: EnumValue;
-
-        /**Fill each row from left to right; This value is used for GridLayout.arrangement.*/
-        static LeftToRight: EnumValue;
-
-        /**Position the part's Part.location at a grid point; This value is used for GridLayout.alignment.*/
-        static Location: EnumValue;
-
-        /**Position the top-left corner of each part at a grid point; This value is used for GridLayout.alignment.*/
-        static Position: EnumValue;
-
-        /**Lay out each child in reverse order from which they were found; This value is used for GridLayout.sorting.*/
-        static Reverse: EnumValue;
-
-        /**Fill each row from right to left; This value is used for GridLayout.arrangement.*/
-        static RightToLeft: EnumValue;
-    }
-
-    /**
-    * This arranges nodes into layers.
-    * The method uses a hierarchical approach
-    * for creating drawings of digraphs with nodes arranged in layers.
-    * The layout algorithm consists of four-major steps: Cycle Removal,
-    * Layer Assignment, Crossing Reduction, and Straightening and Packing.
-    */
-    class LayeredDigraphLayout extends Layout {
-        /**
-        * Constructs a LayeredDigraphLayout with no Layout.network and with no owning Layout.diagram.
-        */
-        constructor();
-
-        /**Gets or sets which aggressive option is being used to look for link crossings.*/
-        aggressiveOption: EnumValue;
-
-        /**Gets or sets the size of each column.*/
-        columnSpacing: number;
-
-        /**Gets or set which cycle removal option is used.*/
-        cycleRemoveOption: EnumValue;
-
-        /**Gets or sets the direction the graph grows towards.*/
-        direction: number;
-
-        /**Gets or sets which indices initialization option is being used.*/
-        initializeOption: EnumValue;
-
-        /**Gets or sets the number of iterations to be done.*/
-        iterations: number;
-
-        /**Gets or sets which layering option is being used.*/
-        layeringOption: EnumValue;
-
-        /**Gets or sets the size of each layer.*/
-        layerSpacing: number;
-
-        /**This read-only property returns the largest column value.*/
-        maxColumn: number;
-
-        /**This read-only property returns the largest index value.*/
-        maxIndex: number;
-
-        /**This read-only property returns the larges index layer.*/
-        maxIndexLayer: number;
-
-        /**This read-only property returns the largest layer value.*/
-        maxLayer: number;
-
-        /**This read-only property returns the smallest index layer.*/
-        minIndexLayer: number;
-
-        /**Gets or sets the options used by the straighten and pack function, The default value is LayeredDigraphLayout.PackAll.*/
-        packOption: number;
-
-        /**Gets or sets whether the FromSpot and ToSpot of each link should be set to values appropriate for the given value of LayeredDigraphLayout.direction.*/
-        setsPortSpots: boolean;
-
-        /**
-        * Assigns every vertex in the input network to a layer.
-        */
-        assignLayers(): void;
-
-        /**
-        * This overridable method is called by commitLayout
-        * to support custom arrangement of bands or labels across each layout layer.
-        * @param Array<*> layerRects an Array of Rects with the bounds of each of the "layers"
-        * @param {Point} offset the position of the top-left corner of the banded area relative to the coordinates given by the layerRects
-        */
-        commitLayers(layerRects: Array<Rect>, offset: Point): void;
-
-        /**
-        * Updates the physical location of "real" nodes and links to reflect the layout.
-        */
-        commitLayout(): void;
-
-        /**
-        * Routes the links.
-        */
-        commitLinks(): void;
-
-        /**
-        * Lays out the nodes.
-        */
-        commitNodes(): void;
-
-        /**
-        * Create a new LayoutNetwork of LayeredDigraphVertexes and LayeredDigraphEdges.
-        */
-        createNetwork(): LayeredDigraphNetwork;
-
-        /**
-        * Assign the positions of the vertexes in the network.
-        * @param {(Diagram | Group | Iterable<Part>)} coll A Diagram or a Group or a collection of Parts.
-        */
-        doLayout(coll: (Diagram | Group | Iterable<Part>)): void;
-
-        /**The faster, less aggressive, crossing reduction algorithm; a valid value for LayeredDigraphLayout.aggressiveOption.*/
-        static AggressiveLess: EnumValue;
-
-        /**The slower, more aggressive, crossing reduction algorithm, a valid value for LayeredDigraphLayout.aggressiveOption.*/
-        static AggressiveMore: EnumValue;
-
-        /**The fastest, but poorest, crossing reduction algorithm; a valid value for LayeredDigraphLayout.aggressiveOption.*/
-        static AggressiveNone: EnumValue;
-
-        /**Remove cycles using depth first cycle removal; a valid value of LayeredDigraphLayout.cycleRemoveOption.*/
-        static CycleDepthFirst: EnumValue;
-
-        /**Remove cycles using greedy cycle removal; a valid value of LayeredDigraphLayout.cycleRemoveOption.*/
-        static CycleGreedy: EnumValue;
-
-        /**Initialize using depth first in initialization; a valid value for LayeredDigraphLayout.initializeOption.*/
-        static InitDepthFirstIn: EnumValue;
-
-        /**Initialize using depth first out initialization; a valid value for LayeredDigraphLayout.initializeOption.*/
-        static InitDepthFirstOut: EnumValue;
-
-        /**Initialize using naive initialization; a valid value for LayeredDigraphLayout.initializeOption.*/
-        static InitNaive: EnumValue;
-
-        /**Assign layers using longest path sink layering; a valid value for LayeredDigraphLayout.layeringOption.*/
-        static LayerLongestPathSink: EnumValue;
-
-        /**Assign layers using longest path source layering; a valid value for LayeredDigraphLayout.layeringOption.*/
-        static LayerLongestPathSource: EnumValue;
-
-        /**Assign layers using optimal link length layering; A valid value for LayeredDigraphLayout.layeringOption.*/
-        static LayerOptimalLinkLength: EnumValue;
-
-        /**Enable all options for the LayeredDigraphLayout.packOption property; See also LayeredDigraphLayout.PackExpand, LayeredDigraphLayout.PackStraighten, and LayeredDigraphLayout.PackMedian.*/
-        static PackAll: number;
-
-        /**This option gives more chances for the packing algorithm to improve the network, but is very expensive in time for large networks; a valid value for LayeredDigraphLayout.packOption.*/
-        static PackExpand: number;
-
-        /**This option tries to have the packing algorithm center groups of nodes based on their relationships with nodes in other layers, a valid value for LayeredDigraphLayout.packOption.*/
-        static PackMedian: number;
-
-        /**Does minimal work in packing the nodes; a valid value for LayeredDigraphLayout.packOption.*/
-        static PackNone: number;
-
-        /**This option tries to have the packing algorithm straighten many of the links that cross layers, a valid value for LayeredDigraphLayout.packOption.*/
-        static PackStraighten: number;
-
-        linkSpacing: number;  // undocumented
-        protected nodeMinLayerSpace(v: LayeredDigraphVertex, tl: boolean): number;  // undocumented
-        protected nodeMinColumnSpace(v: LayeredDigraphVertex, tl: boolean): number;  // undocumented
-    }
-
-    class LayeredDigraphNetwork extends LayoutNetwork {  // undocumented
-    }
-
-    /** This holds LayeredDigraphLayout-specific information about Link s.*/
-    class LayeredDigraphEdge extends LayoutEdge {
-        /**True if the link is part of the depth first forest.*/
-        forest: boolean;
-
-        /**Approximate column offset of the from port of the link from the from node column used in straightening.*/
-        portFromColOffset: number;
-
-        /**Location of the port at the from node of the link.*/
-        portFromPos: number;
-
-        /**Approximate column offset of the to port of the link from the to node column used in straightening.*/
-        portToColOffset: number;
-
-        /**Location of the port at the to node of the link.*/
-        portToPos: number;
-
-        /**True if the link was reversed during cycle removal.*/
-        rev: boolean;
-
-        /**True if the link is part of the proper digraph.*/
-        valid: boolean;
-    }
-
-    /** This holds LayeredDigraphLayout-specific information about Nodes.*/
-    class LayeredDigraphVertex extends LayoutVertex {
-        /**The column to which the node is assigned.*/
-        column: number;
-
-        /**The connected component to which the node is assigned.*/
-        component: number;
-
-        /**The index to which the node is assigned.*/
-        index: number;
-
-        /**The layer to which the node is assigned.*/
-        layer: number;
-
-        /**Another LayeredDigraphVertex in the same layer that this node should be near.*/
-        near: LayeredDigraphVertex;
-    }
-
-
-    /**
-    * This is the base class for all of the predefined diagram layout implementations.
-    * They only arrange Parts (primarily Nodes and Links) in a Diagram,
-    * not to GraphObjects in Panels (i.e. panel layout).
-    */
-    class Layout {
-        /**
-        * Create a minimal layout that only positions Nodes that do not have a location.
-        */
-        constructor();
-
-        /**Gets or sets the top-left point for where the graph should be positioned when laid out.*/
-        arrangementOrigin: Point;
-
-        /**This read-only property returns the Diagram that owns this layout, if it is the value of Diagram.layout.*/
-        diagram: Diagram;
-
-        /**This read-only property returns the Group that uses this layout, if it is the value of a group's Group.layout.*/
-        group: Group;
-
-        /**Gets or sets whether this layout is performed on an initial layout.*/
-        isInitial: boolean;
-
-        /**Gets or sets whether this layout can be invalidated by .invalidateLayout.*/
-        isOngoing: boolean;
-
-        /**Gets or sets whether this layout be performed in real-time, before the end of a transaction.*/
-        isRealtime: boolean;
-
-        /**Gets or sets whether this layout routes Links.*/
-        isRouting: boolean;
-
-        /**Gets or sets whether this layout needs to be performed again.*/
-        isValidLayout: boolean;
-
-        /**Gets or sets whether this layout depends on the Diagram.viewportBounds's size.*/
-        isViewportSized: boolean;
-
-        /**Gets or sets the LayoutNetwork used by this Layout, if any.*/
-        network: LayoutNetwork;
-
-        /**
-         * Copies properties from this layout to the given layout, which must be of the same class as this layout.
-         * @param {Layout} copy 
-         */
-        protected cloneProtected(copy: Layout): void;
-
-        /**
-        * When using a LayoutNetwork, commit changes to the diagram by setting Node positions and by routing the Links.
-        */
-        commitLayout(): void;
-
-        /**
-        * Creates a copy of this Layout and returns it.
-        */
-        copy(): Layout;
-
-        /**
-        * Create a new LayoutNetwork of LayoutVertexes and LayoutEdges.
-        */
-        createNetwork(): LayoutNetwork;
-
-        /**
-        * Position all of the nodes that do not have an assigned Part.location in the manner of a simple rectangular array.
-        * @param {(Diagram | Group | Iterable<Part>)} coll A Diagram or a Group or a collection of Parts.
-        */
-        doLayout(coll: (Diagram | Group | Iterable<Part>)): void;
-
-        /**
-        * If .isOngoing is true and if an initial layout has not yet been performed, set the .isValidLayout property to false, and ask to perform another layout in the near future.
-        */
-        invalidateLayout(): void;
-
-        /**
-        * Create and initialize a LayoutNetwork with the given nodes and links.
-        * @param {(Diagram | Group | Iterable<Part>)} coll A Diagram or a Group or a collection of Parts.
-        */
-        makeNetwork(coll: (Diagram | Group | Iterable<Part>)): LayoutNetwork;
-
-        /**
-        * When using a LayoutNetwork, update the "physical" node positionings and link routings.
-        */
-        updateParts(): void;
-
-        collectParts(coll: Iterable<Part>): void;  // undocumented
-    }
-
-    /**
-     * This provides an abstract view of a diagram as a
-     * network (graph) of vertexes and directed edges.
-     * The network contains vertexes and edges corresponding to Nodes and Links.
-     */
-    class LayoutNetwork {
-        /**
-        * This constructs an empty network.
-        */
-        constructor();
-
-        /**Gets a collection of all of the LayoutEdges in this network.*/
-        edges: Set<LayoutEdge>;
-
-        /**This read-only property returns the Layout that uses this network of LayoutVertexes and LayoutEdges.*/
-        layout: Layout;
-
-        /**Gets a collection of all of the LayoutVertexes in this network.*/
-        vertexes: Set<LayoutVertex>;
-
-        /**
-        * Adds a LayoutEdge to the network.
-        * @param {LayoutEdge} edge
-        */
-        addEdge(edge: LayoutEdge): void;
-
-        /**
-        * This convenience method makes sure there is a LayoutEdge in this network corresponding to a Link.
-        * @param {Link} link
-        * @param {Link} link
-        */
-        addLink(link: Link): LayoutEdge;
-
-        /**
-        * This convenience method makes sure there is a LayoutVertex in this network corresponding to a Node.
-        * @param {Node} node
-        */
-        addNode(node: Node): LayoutVertex;
-
-        /**
-        * Creates a network of LayoutVertexes and LayoutEdges corresponding to the given Nodes and Links.
-        * @param {Iterable<Part>} parts A collection of Nodes or Links.
-        * @param {boolean=} toplevelonly whether to skip Parts in the given collection that are contained by Groups; default is false.
-        * @param {function(Part):boolean|null=} pred optional predicate to apply to each Part --
-        *        if it returns false do not include Vertex or Edge in the network for that Part;
-        *        default ignores link label nodes or links connecting with them
-        */
-        addParts(parts: Iterable<Part>, toplevelonly?: boolean, pred?: (part: Part) => boolean): void;
-
-        /**
-        * Adds a LayoutVertex to the network.
-        * @param {LayoutVertex} vertex
-        */
-        addVertex(vertex: LayoutVertex): void;
-
-        /**
-        * Allocate a new instance of LayoutEdge.
-        */
-        createEdge(): LayoutEdge;
-
-        /**
-        * Allocate a new instance of LayoutVertex.
-        */
-        createVertex(): LayoutVertex;
-
-        /**
-        * Deletes all vertexes and edges that have no Part associated with them.
-        */
-        deleteArtificialVertexes(): void;
-
-        /**
-        * Removes a LayoutEdge from the network.
-        * @param {LayoutEdge} edge
-        */
-        deleteEdge(edge: LayoutEdge): void;
-
-        /**
-        * This convenience method deletes from this network any LayoutEdge corresponding to a Link.
-        * @param {Link} link
-        */
-        deleteLink(link: Link): void;
-
-        /**
-        * This convenience method deletes any LayoutVertex corresponding to a Node.
-        * @param {Node} node
-        */
-        deleteNode(node: Node): void;
-
-        /**
-        * Deletes all LayoutEdges whose "to vertex" and "from vertex" are the same vertex.
-        */
-        deleteSelfEdges(): void;
-
-        /**
-        * Removes a LayoutVertex from the network.
-        * @param {LayoutVertex} vertex
-        */
-        deleteVertex(vertex: LayoutVertex): void;
-
-        /**
-        * Retrieve all of the Nodes and Links from the LayoutVertexes and LayoutEdges that are in this network.
-        */
-        findAllParts(): Set<Part>;
-
-        /**
-        * Returns the LayoutEdge that was constructed for the Link.
-        * @param {Link} link
-        */
-        findEdge(link: Link): LayoutEdge;
-
-        /**
-        * Returns the LayoutVertex that was constructed for the Node.
-        * @param {Node} node
-        */
-        findVertex(node: Node): LayoutVertex;
-
-        /**
-        * Links two vertexes already in the network and returns the created LayoutEdge.
-        * @param {LayoutVertex} fromVertex
-        * @param {LayoutVertex} toVertex
-        * @param {Link} link
-        */
-        linkVertexes(fromVertex: LayoutVertex, toVertex: LayoutVertex, link: Link): LayoutEdge;
-
-        /**
-        * Reverses the direction of a LayoutEdge in the network.
-        * @param {LayoutEdge} edge
-        */
-        reverseEdge(edge: LayoutEdge): void;
-
-        /**
-        * Modify this network by splitting it up into separate subnetworks, each of which has all of its vertexes connected to each other, but not to any vertexes in any other subnetworks.
-        */
-        splitIntoSubNetworks(): List<LayoutNetwork>;
-    }
-
-    /** An edge represents a link in a LayoutNetwork. It holds layout-specific data for the link. */
-    class LayoutEdge {
-        /**
-        * This constructs an edge that does not know about any Link.
-        */
-        constructor();
-
-        /**Gets or sets the model data, used only when virtualizing*/
-        data: any;
-
-        /**Gets or sets the LayoutVertex that this edge comes from.*/
-        fromVertex: LayoutVertex;
-
-        /**Gets or sets the Link associated with this edge, if any.*/
-        link: Link;
-
-        /**Gets or sets the LayoutNetwork that owns this edge.*/
-        network: LayoutNetwork;
-
-        /**Gets or sets the LayoutVertex that this edge goes to.*/
-        toVertex: LayoutVertex;
-
-        /**
-        * Commits the route of this edge to the corresponding Link, if any.
-        */
-        commit(): void;
-
-        /**
-        * Returns the edge's vertex at the other of this edge from the given vertex.
-        * @param {LayoutVertex} v
-        */
-        getOtherVertex(v: LayoutVertex): void;
-    }
-
-    /** A vertex represents a node in a LayoutNetwork. It holds layout-specific data for the node. */
-    class LayoutVertex {
-        /**
-        * This constructs a vertex that does not know about any Node.
-        */
-        constructor();
-
-        /**Gets or sets the Bounds of this vertex, in document coordinates.*/
-        bounds: Rect;
-
-        /**Gets or sets the center Point.x of this vertex, in document coordinates.*/
-        centerX: number;
-
-        /**Gets or sets the center Point.y of this vertex, in document coordinates.*/
-        centerY: number;
-
-        /**Gets or sets the model data, used only when virtualizing*/
-        data: any;
-
-        /**Gets an iterator for all of the edges that go out of this vertex.*/
-        destinationEdges: Iterator<LayoutEdge>;
-
-        /**Gets an iterator for all of the vertexes that are connected with edges going out of this vertex.*/
-        destinationVertexes: Iterator<LayoutVertex>;
-
-        /**Gets an iterator for all of the edges that are connected with this vertex in either direction.*/
-        edges: Iterator<LayoutEdge>;
-
-        /**This read-only property returns the total number of edges that are connected with this vertex in either direction.*/
-        edgesCount: number;
-
-        /**Gets or sets the offset of the .centerX and .centerY from the .bounds position.*/
-        focus: Point;
-
-        /**Gets or sets the relative X position of the "center" point, the focus.*/
-        focusX: number;
-
-        /**Gets or sets the relative Y position of the "center" point, the focus.*/
-        focusY: number;
-
-        /**Gets or sets the height of this vertex.*/
-        height: number;
-
-        /**Gets or sets the LayoutNetwork that owns this vertex.*/
-        network: LayoutNetwork;
-
-        /**Gets or sets the Node associated with this vertex, if any.*/
-        node: Node;
-
-        /**Gets an iterator for all of the edges that come into this vertex.*/
-        sourceEdges: Iterator<LayoutEdge>;
-
-        /**Gets an iterator for all of the vertexes that are connected with edges coming into this vertex.*/
-        sourceVertexes: Iterator<LayoutVertex>;
-
-        /**Gets an iterator for all of the vertexes that are connected in either direction with this vertex.*/
-        vertexes: Iterator<LayoutVertex>;
-
-        /**Gets or sets the width of this vertex.*/
-        width: number;
-
-        /**Gets or sets the left point of this vertex.*/
-        x: number;
-
-        /**Gets or sets the top point of this vertex.*/
-        y: number;
-
-        /**
-        * Adds a LayoutEdge to the list of successors (the edge will be going out from this vertex).
-        * @param {LayoutEdge} edge
-        */
-        addDestinationEdge(edge: LayoutEdge): void;
-
-        /**
-        * Adds a LayoutEdge to the list of predecessors (the edge will be coming into this vertex).
-        * @param {LayoutEdge} edge
-        */
-        addSourceEdge(edge: LayoutEdge): void;
-
-        /**
-        * Moves the Node corresponding to this vertex so that its position is at the current .bounds point.
-        */
-        commit(): void;
-
-        /**
-        * Deletes a LayoutEdge from the list of successors (the edge was going out from this vertex).
-        * @param {LayoutEdge} edge
-        */
-        deleteDestinationEdge(edge: LayoutEdge): void;
-
-        /**
-        * Deletes a LayoutEdge from the list of predecessors (the edge was coming into this vertex).
-        * @param {LayoutEdge} edge
-        */
-        deleteSourceEdge(edge: LayoutEdge): void;
-
-        /**
-        * This static function is used to compare the Part.text values of the .nodes of the argument LayoutVertexes.
-        * @param {LayoutVertex} m
-        * @param {LayoutVertex} n
-        */
-        static smartComparer(m: LayoutVertex, n: LayoutVertex): number;
-
-        /**
-        * This static function is used to compare the Part.text values of the .nodes of the argument LayoutVertexes.
-        * @param {LayoutVertex} m
-        * @param {LayoutVertex} n
-        */
-        static standardComparer(m: LayoutVertex, n: LayoutVertex): number;
-    }
-
-
-    /**
-    * This layout positions nodes in a tree-like arrangement.
-    */
-    class TreeLayout extends Layout {
-        /**
-        * Constructs a TreeLayout with no Layout.network and with no owning Layout.diagram.
-        */
-        constructor();
-
-        /**Gets or sets the default alignment of parents relative to their children.*/
-        alignment: EnumValue;
-
-        /**Gets or sets the default alignment of parents relative to their children.*/
-        alternateAlignment: EnumValue;
-
-        /**Gets or sets the default direction for tree growth.*/
-        alternateAngle: number;
-
-        /**Gets or sets a limit on how broad a tree should be.*/
-        alternateBreadthLimit: number;
-
-        /**Gets or sets the spot that children nodes' ports get as their ToSpot The default value is Spot.Default.*/
-        alternateChildPortSpot: Spot;
-
-        /**Gets or sets the distance between a node and its comments.*/
-        alternateCommentMargin: number;
-
-        /**Gets or sets the distance between comments.*/
-        alternateCommentSpacing: number;
-
-        /**Gets or sets how closely to pack the child nodes of a subtree.*/
-        alternateCompaction: EnumValue;
-
-        /**Gets or sets the default comparison function used for sorting.*/
-        alternateComparer: (a: TreeVertex, b: TreeVertex) => number;
-
-        /**Gets or sets the object holding the default values for alternate layer TreeVertexes, used when the .treeStyle is .StyleAlternating or .StyleLastParents.*/
-        alternateDefaults: TreeVertex;
-
-        /**Gets or sets the distance between a parent node and its children.*/
-        alternateLayerSpacing: number;
-
-        /**Gets or sets the fraction of the node's depth for which the children's layer starts overlapped with the parent's layer.*/
-        alternateLayerSpacingParentOverlap: number;
-
-        /**Gets or sets the default indentation of the first child.*/
-        alternateNodeIndent: number;
-
-        /**Gets or sets the fraction of this node's breadth is added to .nodeIndent to determine any spacing at the start of the children.*/
-        alternateNodeIndentPastParent: number;
-
-        /**Gets or sets the distance between child nodes.*/
-        alternateNodeSpacing: number;
-
-        /**Gets or sets the spot that this node's port gets as its FromSpot.*/
-        alternatePortSpot: Spot;
-
-        /**Gets or sets the default indentation of the first child of each row, if the .alignment is not a "Center" alignment.*/
-        alternateRowIndent: number;
-
-        /**Gets or sets the distance between rows of children.*/
-        alternateRowSpacing: number;
-
-        /**Gets or sets whether the TreeLayout should set the ToSpot for each child node port.*/
-        alternateSetsChildPortSpot: boolean;
-
-        /**Gets or sets whether the TreeLayout should set the FromSpot for this parent node port.*/
-        alternateSetsPortSpot: boolean;
-
-        /**Gets or sets the default Sorting policy.*/
-        alternateSorting: EnumValue;
-
-        /**Gets or sets the default direction for tree growth.*/
-        angle: number;
-
-        /**Gets or sets how .arrangeTrees should lay out the separate trees.*/
-        arrangement: EnumValue;
-
-        /**Gets or sets the space between which .arrangeTrees will position the trees.*/
-        arrangementSpacing: Size;
-
-        /**Gets or sets a limit on how broad a tree should be.*/
-        breadthLimit: number;
-
-        /**Gets or sets the spot that children nodes' ports get as their ToSpot.*/
-        childPortSpot: Spot;
-
-        /**Gets or sets the distance between a node and its comments.*/
-        commentMargin: number;
-
-        /**Gets or sets the distance between comments.*/
-        commentSpacing: number;
-
-        /**Gets or sets how closely to pack the child nodes of a subtree.*/
-        compaction: EnumValue;
-
-        /**Gets or sets whether to call .addComments.*/
-        comments: boolean;
-
-        /**Gets or sets the default comparison function used for sorting.*/
-        comparer: (a: TreeVertex, b: TreeVertex) => number;
-
-        /**Gets or sets the distance between a parent node and its children.*/
-        layerSpacing: number;
-
-        /**Gets or sets the fraction of the node's depth for which the children's layer starts overlapped with the parent's layer.*/
-        layerSpacingParentOverlap: number;
-
-        /**Gets or sets the manner in which the nodes are aligned in layers.*/
-        layerStyle: EnumValue;
-
-        /**Gets or sets the default indentation of the first child.*/
-        nodeIndent: number;
-
-        /**Gets or sets the fraction of this node's breadth is added to .nodeIndent to determine any spacing at the start of the children.*/
-        nodeIndentPastParent: number;
-
-        /**Gets or sets the distance between child nodes.*/
-        nodeSpacing: number;
-
-        /**Gets or sets how the tree should be constructed from the TreeEdges connecting TreeVertexes.*/
-        path: EnumValue;
-
-        /**Gets or sets the spot that this node's port gets as its FromSpot.*/
-        portSpot: Spot;
-
-        /**Gets or sets the object holding the default values for root TreeVertexes.*/
-        rootDefaults: TreeVertex;
-
-        /**Gets or sets the collection of root vertexes.*/
-        roots: Set<TreeVertex|Node>;
-
-        /**Gets or sets the default indentation of the first child of each row, if the .alignment is not a "Center" alignment.*/
-        rowIndent: number;
-
-        /**Gets or sets the distance between rows of children.*/
-        rowSpacing: number;
-
-        /**Gets or sets whether the TreeLayout should set the ToSpot for each child node port.*/
-        setsChildPortSpot: boolean;
-
-        /**Gets or sets whether the TreeLayout should set the FromSpot for this parent node port.*/
-        setsPortSpot: boolean;
-
-        /**Gets or sets the default Sorting policy.*/
-        sorting: EnumValue;
-
-        /**Gets or sets the Style for the resulting trees.*/
-        treeStyle: EnumValue;
-
-        /**
-        * Find associated objects to be positioned along with the TreeVertex.
-        * @param {LayoutVertex} v
-        */
-        addComments(v: TreeVertex): void;
-
-        /**
-        * Position each separate tree.
-        */
-        arrangeTrees(): void;
-
-        /**
-        * Assign final property values for a TreeVertex.
-        * @param {LayoutVertex} v
-        */
-        assignTreeVertexValues(v: TreeVertex): void;
-
-        /**
-        * This overridable method is called by commitLayout if layerStyle is LayerUniform
-        * to support custom arrangement of bands or labels across each layout layer.
-        * @param Array<*> layerRects an Array of Rects with the bounds of each of the "layers"
-        * @param {Point} offset the position of the top-left corner of the banded area relative to the coordinates given by the layerRects
-        */
-        commitLayers(layerRects: Array<Rect>, offset: Point): void;
-
-        /**
-        * Set the fromSpot and toSpot for each Vertex, position each Node according to the Vertex position, and then position the Links.
-        */
-        commitLayout(): void;
-
-        /**
-        * Commit the position and routing of all edge links.
-        */
-        commitLinks(): void;
-
-        /**
-        * Commit the position of all vertex nodes.
-        */
-        commitNodes(): void;
-
-        /**
-        * Create a new LayoutNetwork of TreeVertexes and TreeEdges.
-        */
-        createNetwork(): TreeNetwork;
-
-        /**
-        * Assign the positions of the vertexes in the network.
-        * @param {(Diagram | Group | Iterable<Part>)} coll A Diagram or a Group or a collection of Parts.
-        */
-        doLayout(coll: (Diagram | Group | Iterable<Part>)): void;
-
-        /**
-        * Assign initial property values for a TreeVertex.
-        * @param {LayoutVertex} v
-        */
-        initializeTreeVertexValues(v: TreeVertex): void;
-
-        /**
-        * Position and TreeVertex.comments around the vertex.
-        * @param {LayoutVertex} v
-        */
-        layoutComments(v: TreeVertex): void;
-
-        /**The children are positioned in a bus, only on the bottom or right side of the parent; This value is used for TreeLayout.alignment or TreeLayout.alternateAlignment.*/
-        static AlignmentBottomRightBus: EnumValue;
-
-        /**The children are positioned in a bus on both sides of an "aisle" where the links to them go, with the last odd child (if any) placed at the end of the aisle in the middle.*/
-        static AlignmentBus: EnumValue;
-
-        /**Like TreeLayout.AlignmentBus with the children arranged on both sides of an "aisle" with any last odd child placed at the end of the aisle, but the children get an TreeVertex.angle that depends on which side of the aisle they were placed.*/
-        static AlignmentBusBranching: EnumValue;
-
-        /**The parent is centered at the middle of the range of its immediate child nodes; This value is used for TreeLayout.alignment or TreeLayout.alternateAlignment.*/
-        static AlignmentCenterChildren: EnumValue;
-
-        /**The parent is centered at the middle of the range of its child subtrees; This value is used for TreeLayout.alignment or TreeLayout.alternateAlignment.*/
-        static AlignmentCenterSubtrees: EnumValue;
-
-        /**The parent is positioned near the last of its children; This value is used for TreeLayout.alignment or TreeLayout.alternateAlignment.*/
-        static AlignmentEnd: EnumValue;
-
-        /**The parent is positioned near the first of its children; This value is used for TreeLayout.alignment or TreeLayout.alternateAlignment.*/
-        static AlignmentStart: EnumValue;
-
-        /**The children are positioned in a bus, only on the top or left side of the parent; This value is used for TreeLayout.alignment or TreeLayout.alternateAlignment.*/
-        static AlignmentTopLeftBus: EnumValue;
-
-        /**Do not move each root node, but position all of their descendants relative to their root; This value is used for TreeLayout.arrangement.*/
-        static ArrangementFixedRoots: EnumValue;
-
-        /**Position each tree in a non-overlapping fashion by increasing X coordinates, starting at the Layout.arrangementOrigin; This value is used for TreeLayout.arrangement.*/
-        static ArrangementHorizontal: EnumValue;
-
-        /**Position each tree in a non-overlapping fashion by increasing Y coordinates, starting at the Layout.arrangementOrigin; This value is used for TreeLayout.arrangement.*/
-        static ArrangementVertical: EnumValue;
-
-        /**A simple fitting of subtrees; This value is used for TreeLayout.compaction or TreeLayout.alternateCompaction.*/
-        static CompactionBlock: EnumValue;
-
-        /**Only simple placement of children next to each other, as determined by their subtree breadth; This value is used for TreeLayout.compaction or TreeLayout.alternateCompaction.*/
-        static CompactionNone: EnumValue;
-
-        /**This default value for TreeLayout.layerStyle causes each node takes up only the depth that it needs.*/
-        static LayerIndividual: EnumValue;
-
-        /**This value for TreeLayout.layerStyle causes all of the children of a parent node take up the same amount of depth -- this typically causes all cousins to be aligned.*/
-        static LayerSiblings: EnumValue;
-
-        /**This value for TreeLayout.layerStyle causes all nodes with the same TreeVertex.level throughout the tree take up the same amount of depth.*/
-        static LayerUniform: EnumValue;
-
-        /**This value for TreeLayout.path causes the value of Diagram.isTreePathToChildren to effectively choose either TreeLayout.PathDestination (if true) or TreeLayout.PathSource (if false).*/
-        static PathDefault: EnumValue;
-
-        /**The children of a TreeVertex are its LayoutVertex.destinationVertexes, the collection of connected LayoutEdge.toVertexes; This value is used for TreeLayout.path.*/
-        static PathDestination: EnumValue;
-
-        /**The children of a TreeVertex are its LayoutVertex.sourceVertexes, the collection of connected LayoutEdge.fromVertexes; This value is used for TreeLayout.path.*/
-        static PathSource: EnumValue;
-
-        /**Lay out each child according to the sort order given by TreeVertex.comparer; This value is used for TreeLayout.sorting or TreeLayout.alternateSorting.*/
-        static SortingAscending: EnumValue;
-
-        /**Lay out each child in reverse sort order given by TreeVertex.comparer; This value is used for TreeLayout.sorting or TreeLayout.alternateSorting.*/
-        static SortingDescending: EnumValue;
-
-        /**Lay out each child in the order in which they were found; This value is used for TreeLayout.sorting or TreeLayout.alternateSorting.*/
-        static SortingForwards: EnumValue;
-
-        /**Lay out each child in reverse order from which they were found; This value is used for TreeLayout.sorting or TreeLayout.alternateSorting.*/
-        static SortingReverse: EnumValue;
-
-        /**Alternate layers of the tree have different properties, typically including the angle; This value is used for TreeLayout.treeStyle.*/
-        static StyleAlternating: EnumValue;
-
-        /**Just like the standard layered tree style, except that the nodes with children but no grandchildren have alternate properties; This value is used for TreeLayout.treeStyle.*/
-        static StyleLastParents: EnumValue;
-
-        /**The normal tree style, where all of the children of each TreeVertex are lined up horizontally or vertically; This value is used for TreeLayout.treeStyle.*/
-        static StyleLayered: EnumValue;
-
-        /**All of the nodes get the alternate properties, except the root node gets the default properties; This value is used for TreeLayout.treeStyle.*/
-        static StyleRootOnly: EnumValue;
-    }
-
-    class TreeNetwork extends LayoutNetwork {  // undocumented
-    }
-
-    /** This holds TreeLayout-specific information about Links.*/
-    class TreeEdge extends LayoutEdge {
-        /**Gets or sets a Point, relative to the parent node, that may be useful in routing this link.*/
-        relativePoint: Point;
-
-        /**
-        * Commits the position of the Link and routes it.
-        */
-        commit(): void;
-    }
-
-    /** This holds TreeLayout-specific information about Nodes.*/
-    class TreeVertex extends LayoutVertex {
-        /**Gets or sets how this parent node should be aligned relative to its children.*/
-        alignment: EnumValue;
-
-        /**Gets or sets the actual absolute angle at which this node should grow.*/
-        angle: number;
-
-        /**Gets or sets how broad a node and its descendants should be.*/
-        breadthLimit: number;
-
-        /**Gets or sets the spot that children nodes' ports get as their ToSpot, if .setsChildPortSpot is true and the node has only a single port.*/
-        childPortSpot: Spot;
-
-        /**Gets or sets the logical children for this node.*/
-        children: Array<TreeVertex>;
-
-        /**This read-only property returns the number of immediate children this node has.*/
-        childrenCount: number;
-
-        /**Gets or sets the space to leave between the node and the comments.*/
-        commentMargin: number;
-
-        /**Gets or sets an array of Nodes that will be positioned near this node.*/
-        comments: Array<Node>;
-
-        /**Gets or sets the space to leave between consecutive comments.*/
-        commentSpacing: number;
-
-        /**Gets or sets how the children of this node should be packed together.*/
-        compaction: EnumValue;
-
-        /**Gets or sets how the children should be sorted.*/
-        comparer: (a: TreeVertex, b: TreeVertex) => number;
-
-        /**Gets or sets the number of descendants this node has.*/
-        descendantCount: number;
-
-        /**Gets or sets whether this node has been initialized as part of TreeLayout.doLayout when building the tree structures.*/
-        initialized: boolean;
-
-        /**Gets or sets the distance between this node and its children.*/
-        layerSpacing: number;
-
-        /**Gets or sets the fraction of this node's depth that may overlap with the children's layer.*/
-        layerSpacingParentOverlap: number;
-
-        /**Gets or sets the number of single-parent ancestors this node has.*/
-        level: number;
-
-        /**Gets or sets the maximum number of children of any descendant of this node.*/
-        maxChildrenCount: number;
-
-        /**Gets or sets the maximum depth of the subtrees below this node.*/
-        maxGenerationCount: number;
-
-        /**Gets or sets the distance the first child should be indented.*/
-        nodeIndent: number;
-
-        /**Gets or sets whether the first child should be indented past the parent node's breadth.*/
-        nodeIndentPastParent: number;
-
-        /**Gets or sets the distance between child nodes.*/
-        nodeSpacing: number;
-
-        /**Gets or sets the logical parent for this node.*/
-        parent: TreeVertex;
-
-        /**Gets or sets the spot that this node's port gets as its FromSpot, if .setsPortSpot is true and the node has only a single port.*/
-        portSpot: Spot;
-
-        /**Gets or sets the position of this node relative to its parent node.*/
-        relativePosition: Point;
-
-        /**Gets or sets the distance the first child of each row should be indented.*/
-        rowIndent: number;
-
-        /**Gets or sets the distance between rows within one layer, all sharing the same parent.*/
-        rowSpacing: number;
-
-        /**Gets or sets whether the TreeLayout should set the ToSpot for each child node port.*/
-        setsChildPortSpot: boolean;
-
-        /**Gets or sets whether the TreeLayout should set the FromSpot for this parent node port.*/
-        setsPortSpot: boolean;
-
-        /**Gets or sets whether and in what order the children should be sorted.*/
-        sorting: EnumValue;
-
-        /**Gets or sets the offset of this parent node relative to its whole subtree.*/
-        subtreeOffset: Point;
-
-        /**Gets or sets the size of the subtree (including all descendants) parented by this node.*/
-        subtreeSize: Size;
-
-        /**
-        * Copy inherited properties from another TreeVertex to this one.
-        * @param {TreeVertex} copy
-        */
-        copyInheritedPropertiesFrom(copy: TreeVertex): void;
-    }
-
-
-    /**
-    * The ActionTool is responsible for handling and dispatching mouse events on GraphObjects
-    * that have GraphObject.isActionable set to true.
-    * This is how one implements "controls", such as buttons or sliders or knobs, as GraphObjects
-    * that can be inside Parts without interfering with the standard tool behaviors.
-    */
-    class ActionTool extends Tool {
-        /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.actionTool.
-        */
-        constructor();
-
-        /**
-        * This tool can run when there is a mouse-down on an object with GraphObject.isActionable true or if the object is within a Panel that "isActionable".
-        */
-        canStart(): boolean;
-
-        /**
-        * Call the GraphObject.actionCancel event if defined on the current object.
-        */
-        doCancel(): void;
-
-        /**
-        * If there is a GraphObject found with GraphObject.isActionable set to true, call that object's GraphObject.actionDown event, if it exists.
-        */
-        doMouseDown(): void;
-
-        /**
-        * If this tool is active call GraphObject.actionMove, if it exists, on the active object.
-        */
-        doMouseMove(): void;
-
-        /**
-        * Calls the GraphObject.actionUp event if defined, then effectively calls Tool.standardMouseClick to perform the normal click behaviors, and then stops this tool.
-        */
-        doMouseUp(): void;
-    }
-
-    /**
-    * The ClickCreatingTool lets the user create a node by clicking where they want the new node to be.
-    * By default a double-click is required to start this tool;
-    * set .isDoubleClick to false if you want a single-click to create a node.
-    */
-    class ClickCreatingTool extends Tool {
-        /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.clickCreatingTool, which you can modify.
-        */
-        constructor();
-
-        /**Gets or sets a data object that will be copied and added to the diagram's model each time this tool executes. The value must be an Object or null.*/
-        archetypeNodeData: any;
-
-        /**Gets or sets whether a double click rather than a single-click is required to insert a new Part at the mouse-up point.*/
-        isDoubleClick: boolean;
-
-        /**
-        * This tool can run when the diagram is not read-only and supports creating new nodes, and when there has been a click (or double-click if .isDoubleClick is true) in the background of the diagram (not on a Part), and .archetypeNodeData is an object that can be copied and added to the model.
-        */
-        canStart(): boolean;
-
-        /**
-        * Upon a click, call .insertPart and stop this tool.
-        */
-        doMouseUp(): void;
-
-        /**
-        * Create a node by adding a copy of the .archetypeNodeData object to the diagram's model, assign its Part.location to be the given point, and select the new part.
-        * @param {Point} loc a Point in document coordinates.
-        */
-        insertPart(loc: Point): Part;
-    }
-
-    /**
-    * The ClickSelectingTool selects and deselects Parts when there is a click.
-    * It does this by calling Tool.standardMouseSelect.
-    * It is also responsible for handling and dispatching click events on GraphObjects
-    * by calling Tool.standardMouseClick.
-    */
-    class ClickSelectingTool extends Tool {
-        /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.clickSelectingTool.
-        */
-        constructor();
-
-        /**
-        * This tool can run when there was a click.
-        */
-        canStart(): boolean;
-
-        /**
-        * Upon a click, this calls Tool.standardMouseSelect to change the Diagram.selection collection, then calls Tool.standardMouseClick to perform the normal click behaviors, and then stops this tool.
-        */
-        doMouseUp(): void;
-    }
-
-    /**
-    * The ContextMenuTool is used to create and show a context menu.
-    * It automatically disables any browser context menu.
-    */
-    class ContextMenuTool extends Tool {
-        /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.contextMenuTool, which you can modify.
-        */
-        constructor();
-
-        /**Gets or sets the currently showing context menu, or null if there is none.*/
-        currentContextMenu: Adornment;
-
-        /**Gets or sets the GraphObject found at the mouse point that has a context menu.*/
-        currentObject: GraphObject;
-
-        /**This read-only property returns the original mouse-down point in document coordinates.*/
-        mouseDownPoint: Point;
-
-        /**
-        * Return true if it's a mouse right click that hasn't moved Tool.isBeyondDragSize and that is on a GraphObject with a GraphObject.contextMenu.
-        */
-        canStart(): boolean;
-
-        /**
-        * Do nothing, activation is special and relies on doMouseUp
-        */
-        doActivate(): void;
-
-        /**
-        * Handle mouse-enter, mouse-over, and mouse-leave events.
-        */
-        doMouseMove(): void;
-
-        /**
-        * If there is something found by .findObjectWithContextMenu, call .showContextMenu with that object's GraphObject.contextMenu or Diagram.contextMenu.
-        */
-        doMouseUp(): void;
-
-        /**
-        * Find a GraphObject at the current mouse point with a GraphObject.contextMenu, or return the Diagram if there is a Diagram.contextMenu.
-        */
-        findObjectWithContextMenu(): GraphObject | Diagram;
-
-        /**
-        * Hide any context menu.
-        */
-        hideContextMenu(): void;
-
-        /**
-        * Hide the default context menu.
-        */
-        hideDefaultContextMenu(): void;
-
-        /**
-        * This is called by .showContextMenu to position the context menu within the viewport.
-        * @param {Adornment} contextmenu
-        * @param {GraphObject} obj
-        */
-        positionContextMenu(contextmenu: Adornment, obj: GraphObject): void;
-
-        /**
-        * Show an Adornment as a context menu.
-        * @param {Adornment} contextmenu
-        * @param {GraphObject} obj
-        */
-        showContextMenu(contextmenu: Adornment, obj: GraphObject): void;
-
-        /**
-        * Show a series of HTML elements acting as a context menu.
-        */
-        showDefaultContextMenu(): void;
-    }
-
-    /**
-    * This helper structure for DraggingTool holds the original location Point.
-    */
-    interface DraggingInfo {  // undocumented
-        point: Point;
-    }
-
-    /**
-    * The DraggingTool is used to move or copy selected parts with the mouse.
-    * Dragging the selection moves parts for which Part.canMove is true.
-    * If the user holds down the Control key, this tool will make a copy of the parts being dragged,
-    * for those parts for which Part.canCopy is true.
-    */
-    class DraggingTool extends Tool {
-        /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.draggingTool, which you can modify.
-        */
-        constructor();
-
-        /**This read-only property returns the collection of Parts that this tool has copied.*/
-        copiedParts: Map<Part,DraggingInfo>;
-
-        /**Gets or sets whether for a copying operation the extended selection is copied or only the selected parts.*/
-        copiesEffectiveCollection: boolean;
-
-        /**This read-only property returns the Part found at the mouse point.*/
-        currentPart: Part;
-
-        /**On touch gestures only, this property gets or sets the time in milliseconds for which the mouse must be stationary before this tool can be started.*/
-        delay: number;
-
-        /**This read-only property returns the collection of Parts being dragged.*/
-        draggedParts: Map<Part,DraggingInfo>;
-
-        /**Gets or sets whether the user can drag a single Link, disconnecting it from its connected nodes and possibly connecting it to valid ports when the link is dropped.*/
-        dragsLink: boolean;
-
-        /**Gets or sets whether moving or copying a node also includes all of the node's tree children and their descendants, along with the links to those additional nodes.*/
-        dragsTree: boolean;
-
-        /**Gets or sets the size of the grid cell used when snapping during a drag if the value of .isGridSnapEnabled is true.*/
-        gridSnapCellSize: Size;
-
-        /**Gets or sets the Spot that specifies what point in the grid cell dragged parts snap to, if the value of .isGridSnapEnabled is true.*/
-        gridSnapCellSpot: Spot;
-
-        /**Gets or sets the snapping grid's origin point, in document coordinates, if the value of .isGridSnapEnabled is true.*/
-        gridSnapOrigin: Point;
-
-        /**Gets or sets whether for any internal copying operation is permitted by control-drag-and-drop.*/
-        isCopyEnabled: boolean;
-
-        /**Gets or sets whether the DraggingTool snaps objects to grid points.*/
-        isGridSnapEnabled: boolean;
-
-        /**Gets or sets whether the DraggingTool snaps objects to grid points during the drag.*/
-        isGridSnapRealtime: boolean;
-
-        /**Gets or sets the mouse point from which parts start to move.*/
-        startPoint: Point;
-
-        /**
-        * This tool can run if the diagram allows selection and moves/copies/dragging-out, if the mouse has moved far enough away to be a drag and not a click, and if .findDraggablePart has found a selectable part at the mouse-down point.
-        */
-        canStart(): boolean;
-
-        /**
-        * Find the actual collection of nodes and links to be moved or copied, given an initial collection.
-        * @param {Iterable<Part>} parts A Set or List of Parts.
-        */
-        computeEffectiveCollection(parts: Iterable<Part>): Map<Part,DraggingInfo>;
-
-        /**
-        * This method computes the new location for a Node or simple Part, given a new desired location and an optional Map of dragged parts, taking any grid-snapping into consideration, any Part.dragComputation function, and any Part.minLocation and Part.maxLocation.
-        * @param {Part} n
-        * @param {Point} newloc
-        * @param {Map=} draggedparts  an optional Map mapping Parts to JavaScript Objects that have a "point" property remembering the original location of that Part.
-        * @param {Point=} result  an optional Point that is modified and returned
-        */
-        computeMove(n: Part, newloc: Point, draggedparts?: Map<Part,DraggingInfo>, result?: Point): Point;
-
-        /**
-        * Start the dragging operation.
-        */
-        doActivate(): void;
-
-        /**
-        * Abort any dragging operation.
-        */
-        doCancel(): void;
-
-        /**
-        * Stop the dragging operation by stopping the transaction and cleaning up any temporary state.
-        */
-        doDeactivate(): void;
-
-        /**
-        * Perform any additional side-effects during a drag, whether an internal move or copy or an external drag, that may affect the existing non-moved object(s).
-        * @param {Point} pt a Point in document coordinates.
-        * @param {GraphObject} obj the GraphObject at the point,
-        * excluding what is being dragged or temporary objects;
-        * the argument may be null if the drag is occurring in the background of the diagram.
-        * Use GraphObject.part to get the Node or Part at the root of
-        * the visual tree of the stationary object.
-        */
-        doDragOver(pt: Point, obj: GraphObject): void;
-
-        /**
-        * Perform any additional side-effects after a drop, whether an internal move or copy or an external drop, that may affect the existing non-moved object(s).
-        * @param {Point} pt a Point in document coordinates.
-        * @param {GraphObject} obj the GraphObject where the drop occurred,
-        * excluding what was dropped or temporary objects;
-        * the argument may be null if the drop occurred in the background of the diagram.
-        * Use GraphObject.part to get the Node or Part at the root of
-        * the visual tree of the stationary object.
-        */
-        doDropOnto(pt: Point, obj: GraphObject): void;
-
-        /**
-        * Handle switching between copying and moving modes as the Control key is pressed or released.
-        */
-        doKeyDown(): void;
-
-        /**
-        * Handle switching between copying and moving modes as the Control key is pressed or released.
-        */
-        doKeyUp(): void;
-
-        /**
-        * Move the .draggedParts (or if copying, the .copiedParts) to follow the current mouse point.
-        */
-        doMouseMove(): void;
-
-        /**
-        * On a mouse-up finish moving or copying the effective selection.
-        */
-        doMouseUp(): void;
-
-        /**
-        * Return the selectable and movable/copyable Part at the mouse-down point.
-        */
-        findDraggablePart(): Part;
-
-        /**
-        * This predicate is true when the diagram allows objects to be copied and inserted, and some object in the selection is copyable, and the user is holding down the Control key.
-        */
-        mayCopy(): boolean;
-
-        /**
-        * This predicate is true when the diagram allows objects to be moved, and some object in the selection is movable.
-        */
-        mayMove(): boolean;
-
-        /**
-        Move a collection of Parts by a given offset.
-        * @param {Map} parts  a Map mapping Parts to JavaScript Objects that have a "point" property remembering the original location of that Part.
-        * @param {Point} offset
-        * @param {boolean} check  Whether to check Part.canMove on each part.
-        */
-        moveParts(parts: Map<Part,DraggingInfo>, offset: Point, check: boolean): void;
-
-        /**
-        * This override prevents the Control modifier unselecting an already selected part.
-        */
-        standardMouseSelect(): void;
-    }
-
-    /**
-    * The DragSelectingTool lets the user select multiple parts with a rectangular area.
-    * There is a temporary part, the .box,
-    * that shows the current area encompassed between the mouse-down
-    * point and the current mouse point.
-    * The default drag selection box is a blue rectangle.
-    * You can change the .box to customize its appearance -- see its documentation for an example.
-    */
-    class DragSelectingTool extends Tool {
-        /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.dragSelectingTool, which you can modify.
-        */
-        constructor();
-
-        /**Gets or sets the Part used as the "rubber-band selection box" that is stretched to follow the mouse, as feedback for what area will be passed to .selectInRect upon a mouse-up.*/
-        box: Part;
-
-        /**Gets or sets the time in milliseconds for which the mouse must be stationary before this tool can be started.*/
-        delay: number;
-
-        /**Gets or sets whether a selectable Part may be only partly or must be completely enclosed by the rectangle given to .selectInRect.*/
-        isPartialInclusion: boolean;
-
-        /**
-        * This tool can run when the diagram allows selection, there has been delay of at least .delay milliseconds after the mouse-down before a mouse-move, there has been a mouse-drag far enough away not to be a click, and there is no selectable part at the mouse-down point.
-        */
-        canStart(): boolean;
-
-        /**
-        * This just returns a Rect stretching from the mouse-down point to the current mouse point.
-        */
-        computeBoxBounds(): Rect;
-
-        /**
-        * Capture the mouse and show the .box.
-        */
-        doActivate(): void;
-
-        /**
-        * Release the mouse and remove any .box.
-        */
-        doDeactivate(): void;
-
-        /**
-        * Update the .box's position and size according to the value of .computeBoxBounds.
-        */
-        doMouseMove(): void;
-
-        /**
-        * Call .selectInRect with the value of a call to .computeBoxBounds.
-        */
-        doMouseUp(): void;
-
-        /**
-        * This method is called to select some parts within the area of a given rectangle.
-        *@param {Rect} r
-        */
-        selectInRect(r: Rect): void;
-    }
-
-    /**
-    * This abstract class is the base class for the LinkingTool and RelinkingTool classes.
-    * This class includes properties for defining and accessing any temporary nodes and temporary link
-    * that are used during any linking operation, as well as access to the existing diagram's nodes and link
-    * (if any) that are involved with the linking operation.
-    */
-    abstract class LinkingBaseTool extends Tool {
-        /**
-        * Don't construct this directly -- this is an abstract class.
-        */
-        constructor();
-
-        /**Gets whether the linking operation is in the forwards direction, connecting from the "From" port to the "To" port.*/
-        isForwards: boolean;
-
-        /**Gets or sets whether it is valid to have partly or completely unconnected links.*/
-        isUnconnectedLinkValid: boolean;
-
-        /**Gets or sets a predicate that determines whether or not a new link between two ports would be valid.*/
-        linkValidation: (fromNode: Node, fromPort: GraphObject, toNode: Node, toPort: GraphObject, link: Link) => boolean;
-
-        /**Gets or sets the original Node from which the new link is being drawn or from which the .originalLink was connected when being relinked.*/
-        originalFromNode: Node;
-
-        /**Gets or sets the GraphObject that is the port in the .originalFromNode.*/
-        originalFromPort: GraphObject;
-
-        /**Gets or sets the original Link being reconnected by the RelinkingTool.*/
-        originalLink: Link;
-
-        /**Gets or sets the original Node to which the new link is being drawn or to which the .originalLink was connected when being relinked.*/
-        originalToNode: Node;
-
-        /**Gets or sets the GraphObject that is the port in the .originalToNode.*/
-        originalToPort: GraphObject;
-
-        /**Gets or sets the distance at which link snapping occurs.*/
-        portGravity: number;
-
-        /**Gets or sets a function that is called as the tool targets the nearest valid port.*/
-        portTargeted: (realNode: Node, realPort: GraphObject, tempNode: Node, tempPort: GraphObject, toend: boolean) => void;
-
-        /**Gets or sets a proposed GraphObject port for connecting a link.*/
-        targetPort: GraphObject;
-
-        /**Gets or sets the temporary Node at the "from" end of the .temporaryLink while the user is drawing or reconnecting a link.*/
-        temporaryFromNode: Node;
-
-        /**Gets or sets the GraphObject that is the port at the "from" end of the .temporaryLink while the user is drawing or reconnecting a link.*/
-        temporaryFromPort: GraphObject;
-
-        /**Gets or sets the temporary Link that is shown while the user is drawing or reconnecting a link.*/
-        temporaryLink: Link;
-
-        /**Gets or sets the temporary Node at the "to" end of the .temporaryLink while the user is drawing or reconnecting a link.*/
-        temporaryToNode: Node;
-
-        /**Gets or sets the GraphObject that is the port at the "to" end of the .temporaryLink while the user is drawing or reconnecting a link.*/
-        temporaryToPort: GraphObject;
-
-        /**
-        * Make a temporary port look and act like a real one.
-        * @param {Node} realnode
-        * @param {GraphObject} realport
-        * @param {Node} tempnode
-        * @param {GraphObject} tempport
-        * @param {boolean} toend
-        */
-        copyPortProperties(realnode: Node, realport: GraphObject, tempnode: Node, tempport: GraphObject, toend: boolean): void;
-
-        /**
-        * Mouse movement results in a temporary node moving to where a valid target port is located, or to where the mouse is if there is no valid target port nearby.
-        */
-        doMouseMove(): void;
-
-        /**
-        * Find a port with which the user could complete a valid link.
-        * @param {boolean} toend true if looking for a "to" port.
-        */
-        findTargetPort(toend: boolean): GraphObject;
-
-        /**
-        * This predicate is true if both argument ports are in the same Node.
-        * @param {GraphObject} fromport
-        * @param {GraphObject} toport
-        */
-        isInSameNode(fromport: GraphObject, toport: GraphObject): boolean;
-
-        /**
-        * This predicate is true if there is a link in the diagram going from the given port to the given port
-        * @param {GraphObject} fromport
-        * @param {GraphObject} toport.
-        */
-        isLinked(fromport: GraphObject, toport: GraphObject): boolean;
-
-        /**
-        * Checks whether a proposed link would be valid according to Diagram.validCycle.
-        * This does not distinguish between different ports on a node, so this method does not need to take port arguments.
-        * This is called by isValidLink.
-        * @param {Node} from
-        * @param {Node} to
-        * @param {Link} ignore may be null; this is useful during relinking to ignore the originalLink
-        * @return {boolean}
-        */
-        isValidCycle(from: Node, to: Node, ignore: Link): boolean;
-
-        /**
-        * This predicate is true if it is permissible to connect a link from a given node/port.
-        * @param {Node} fromnode
-        * @param {GraphObject} fromport
-        * False if the node is in a Layer that does not Layer.allowLink.
-        * False if the port's GraphObject.fromLinkable is either false or null.
-        * False if the number of links connected to the port would exceed the port's GraphObject.fromMaxLinks.
-        * Otherwise true.
-        */
-        isValidFrom(fromnode: Node, fromport: GraphObject): boolean;
-
-        /**
-        * This predicate should be true when it is logically valid to connect a new link from one node/port to another node/port.
-        * @param {Node} fromnode the "from" Node.
-        * @param {GraphObject} fromport the "from" GraphObject port.
-        * @param {Node} tonode the "to" Node.
-        * @param {GraphObject} toport the "to" GraphObject port.
-        * False if .isValidFrom is false for the "from" node/port.
-        * False if .isValidTo is false for the "to" node/port.
-        * False if .isInSameNode is true unless GraphObject.fromLinkableSelfNode
-        * and GraphObject.toLinkableSelfNode are true for the two ports.
-        * False if .isLinked is true unless GraphObject.fromLinkableDuplicates
-        * and GraphObject.toLinkableDuplicates are true for the two ports.
-        * False if trying to link to the link's own label node(s).
-        * If .linkValidation is a predicate and if it returns false, this predicate returns false.
-        * Otherwise this predicate is true.
-        */
-        isValidLink(fromnode: Node, fromport: GraphObject, tonode: Node, toport: GraphObject): boolean;
-
-        /**
-        * This predicate is true if it is permissible to connect a link to a given node/port.
-        * @param {Node} tonode
-        * @param {GraphObject} toport
-        * False if the node is in a Layer that does not Layer.allowLink.
-        * False if the port's GraphObject.toLinkable is either false or null.
-        * False if the number of links connected from the port would exceed the port's GraphObject.toMaxLinks.
-        * Otherwise true.
-        */
-        isValidTo(tonode: Node, toport: GraphObject): boolean;
-
-        /**
-        * Reset a temporary port's properties to neutral values when there is no target port.
-        * @param {Node} tempnode
-        * @param {GraphObject} tempport
-        * @param {boolean} toend
-        */
-        setNoTargetPortProperties(tempnode: Node, tempport: GraphObject, toend: boolean): void;
-    }
-
-    /**
-    */
-    class LinkingTool extends LinkingBaseTool {
-        /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.linkingTool, which you can modify.
-        */
-        constructor();
-
-        /**Gets or sets an optional node data object representing a link label, that is copied by .insertLink and added to the GraphLinksModel when creating a new Link. The value must be an Object or null.*/
-        archetypeLabelNodeData: any;
-
-        /**Gets or sets a data object that is copied by .insertLink and added to the GraphLinksModel when creating a new Link. The value must be an Object or null.*/
-        archetypeLinkData: any;
-
-        /**Gets or sets the direction in which new links may be drawn.*/
-        direction: EnumValue;
-
-        /**Gets or sets the GraphObject at which .findLinkablePort should start its search.*/
-        startObject: GraphObject;
-
-        /**
-        * This tool can run when the diagram allows linking, the model is modifiable, the left-button mouse drag has moved far enough away to not be a click, and when .findLinkablePort has returned a valid port.
-        */
-        canStart(): boolean;
-
-        /**
-        * Start the linking operation.
-        */
-        doActivate(): void;
-
-        /**
-        * Finishing the linking operation stops the transaction, releases the mouse, and resets the cursor.
-        */
-        doDeactivate(): void;
-
-        /**
-        * A mouse-up ends the linking operation; if there is a valid .targetPort nearby, this adds a new Link by calling .insertLink.
-        */
-        doMouseUp(): void;
-
-        /**
-        * Return the GraphObject at the mouse-down point, if it is part of a node and if it is valid to link with it.
-        */
-        findLinkablePort(): GraphObject;
-
-        /**
-        * Make a copy of the .archetypeLinkData, set its node and port properties, and add it to the model.
-        * @param {Node} fromnode
-        * @param {GraphObject} fromport
-        * @param {Node} tonode
-        * @param {GraphObject} toport
-        */
-        insertLink(fromnode: Node, fromport: GraphObject, tonode: Node, toport: GraphObject): Link;
-
-        /**This value for LinkingTool.direction indicates that users may draw new links backwards only.*/
-        static BackwardsOnly: EnumValue;
-
-        /**This value for LinkingTool.direction indicates that users may draw new links in either direction.*/
-        static Either: EnumValue;
-
-        /**This value for LinkingTool.direction indicates that users may draw new links forwards only.*/
-        static ForwardsOnly: EnumValue;
-    }
-
-    /**
-    * The LinkReshapingTool is used to interactively change the route of a Link.
-    * This tool makes use of an Adornment, shown when the adorned Link is selected,
-    * that includes some number of reshape handles.
-    * This tool conducts a transaction while the tool is active.
-    * A successful reshaping will result in a "LinkReshaped" DiagramEvent and a "LinkReshaping" transaction.
-    */
-    class LinkReshapingTool extends Tool {
-        /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.linkReshapingTool, which you can modify.
-        */
-        constructor();
-
-        /**This read-only property returns the Link that is being routed manually.*/
-        adornedLink: Link;
-
-        /**This read-only property returns the GraphObject that is the tool handle being dragged by the user.*/
-        handle: GraphObject;
-
-        /**Gets or sets a small GraphObject that is copied as a reshape handle at each movable point in the selected link's route.*/
-        handleArchetype: GraphObject;
-
-        /**Gets or sets a small GraphObject that is copied as a resegment handle at each mid point in the selected Link's route.*/
-        midHandleArchetype: GraphObject;
-
-        /**This read-only property returns the Point that was the original location of the handle that is being dragged to reshape the Link.*/
-        originalPoint: Point;
-
-        /**This read-only property returns the List of Points that was the original route of the Link that is being reshaped.*/
-        originalPoints: List<Point>;
-
-        /**
-        * This tool may run when there is a mouse-down event on a reshape handle.
-        */
-        canStart(): boolean;
-
-        /**
-        * This is called by .doMouseMove and .doMouseUp to limit the input point before calling .reshape.
-        * @param {Point} p
-        */
-        computeReshape(p: Point): Point;
-
-        /**
-        * Start reshaping, if .findToolHandleAt finds a reshape handle at the mouse down point.
-        */
-        doActivate(): void;
-
-        /**
-        * Restore the link route to be the original points and stop this tool.
-        */
-        doCancel(): void;
-
-        /**
-        * This stops the current reshaping operation with the link route shaped the way it is.
-        */
-        doDeactivate(): void;
-
-        /**
-        * Call .reshape with a new point determined by the mouse to change the route of the .adornedLink.
-        */
-        doMouseMove(): void;
-
-        /**
-        * Reshape the route with a point based on the most recent mouse point by calling .reshape, and then raise a "LinkReshaped" DiagramEvent before stopping this tool.
-        */
-        doMouseUp(): void;
-
-        /**
-        * Get the permitted reshaping behavior for a particular reshape handle.
-        * @param {GraphObject} obj a reshape handle in the "LinkReshaping" Adornment.
-        */
-        getReshapingBehavior(obj: GraphObject): EnumValue;
-
-        /**
-        * Set the permitted reshaping behavior for a particular reshape handle.
-        * @param {GraphObject} obj a reshape handle in the "LinkReshaping" Adornment.
-        * @param {EnumValue} behavior one of LinkReshapingTool.All, .Vertical, .Horizontal, or .None
-        */
-        setReshapingBehavior(obj: GraphObject, behavior: EnumValue): void;
-
-        /**
-        * Change the route of the .adornedLink by moving the point corresponding to the current .handle to be at the given Point.
-        * @param {Point} newPoint
-        */
-        reshape(newPoint: Point): void;
-
-        /**
-        * Show an Adornment with reshape handles at each of the interesting points of the link's route, if the link is selected and visible and if Part.canReshape is true.
-        * @param {Part} part
-        */
-        updateAdornments(part: Part): void;
-
-        /**Allow dragging in any direction.*/
-        static All: EnumValue;
-
-        /**Allow only horizontal (left-and-right) dragging.*/
-        static Horizontal: EnumValue;
-
-        /**Disallow dragging.*/
-        static None: EnumValue;
-
-        /**Allow only vertical (up-and-down) dragging.*/
-        static Vertical: EnumValue;
-    }
-
-    /**
-    * The PanningTool supports manual panning, where the user can shift the
-    * Diagram.position by dragging the mouse.
-    */
-    class PanningTool extends Tool {
-        /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.panningTool.
-        */
-        constructor();
-
-        /**Gets or sets whether panning actions will allow events to bubble instead of panning in the diagram.*/
-        bubbles: boolean;
-
-        /**This read-only property returns the Point that was the original value of Diagram.position when the panning operation started.*/
-        originalPosition: Point;
-
-        /**
-        * This tool can run when the diagram allows scrolling and the mouse has been dragged with the left button far enough away from the mouse-down point to avoid being a click.
-        */
-        canStart(): boolean;
-
-        /**
-        * Capture the mouse, change the diagram cursor, and remember the Diagram.position.
-        */
-        doActivate(): void;
-
-        /**
-        * Restore the Diagram.position to what it was when this tool activated.
-        */
-        doCancel(): void;
-
-        /**
-        * Release the mouse and restore the default diagram cursor.
-        */
-        doDeactivate(): void;
-
-        /**
-        * Modify the Diagram.position according to how much the mouse has moved.
-        */
-        doMouseMove(): void;
-
-        /**
-        * Modify the Diagram.position according to how much the mouse has moved.
-        */
-        doMouseUp(): void;
-    }
-
-    /**
-    * The RelinkingTool allows the user to reconnect an existing Link
-    * if the Link.relinkableTo and/or Link.relinkableFrom properties are true.
-    */
-    class RelinkingTool extends LinkingBaseTool {
-        /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.relinkingTool, which you can modify.
-        */
-        constructor();
-
-        /**Gets or sets a small GraphObject that is copied as a relinking handle for the selected link path at the "from" end of the link.*/
-        fromHandleArchetype: GraphObject;
-
-        /**This read-only property returns the GraphObject that is the tool handle being dragged by the user.*/
-        handle: GraphObject;
-
-        /**Gets or sets a small GraphObject that is copied as a relinking handle for the selected link path at the "to" end of the link.*/
-        toHandleArchetype: GraphObject;
-
-        /**
-        * This tool can run when the diagram allows relinking, the model is modifiable, and there is a relink handle at the mouse-down point.
-        */
-        canStart(): boolean;
-
-        /**
-        * Make a temporary link look and act like the real Link being relinked.
-        * @param {Link} reallink
-        * @param {Link} templink
-        */
-        copyLinkProperties(reallink: Link, templink: Link): void;
-
-        /**
-        * Start the relinking operation.
-        */
-        doActivate(): void;
-
-        /**
-        * Finishing the linking operation stops the transaction, releases the mouse, and resets the cursor.
-        */
-        doDeactivate(): void;
-
-        /**
-        * A mouse-up ends the relinking operation; if there is a valid .targetPort nearby, this modifies the old link to connect with the target port.
-        */
-        doMouseUp(): void;
-
-        /**
-        * Modify an existing Link to connect to a new node and port.
-        * @param {Link} existinglink
-        * @param {Node} newnode the Node to connect to or from.
-        * @param {GraphObject} newport the GraphObject port to connect to or from.
-        * @param {boolean} toend If true, this modifies the link's "to" node and port; otherwise it modifies the "from" node and port.
-        */
-        reconnectLink(existinglink: Link, newnode: Node, newport: GraphObject, toend: boolean): boolean;
-
-        /**
-        * Show an Adornment for each end of the Link that the user may reconnect.
-        * @param {Part} part
-        */
-        updateAdornments(part: Part): void;
-    }
-
-    /**
-    * The ResizingTool is used to interactively change the size of a GraphObject
-    * in the selected Part or Node.
-    * This tool does not operate on Links.
-    */
-    class ResizingTool extends Tool {
-        /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.resizingTool, which you can modify.
-        */
-        constructor();
-
-        /**This read-only property returns the GraphObject that is being resized.*/
-        adornedObject: GraphObject;
-
-        /**Gets or sets the width and height multiples with which the user must resize.*/
-        cellSize: Size;
-
-        /**This read-only property returns the GraphObject that is the tool handle being dragged by the user.*/
-        handle: GraphObject;
-
-        /**Gets or sets a small GraphObject that is copied as a resizing handle for the selected part.*/
-        handleArchetype: GraphObject;
-
-        /**Gets or sets whether the ResizingTool snaps object sizes to the diagram's background grid during the resize.*/
-        isGridSnapEnabled: boolean;
-
-        /**Gets or sets the maximum size to which the user can resize.*/
-        maxSize: Size;
-
-        /**Gets or sets the minimum size to which the user can resize.*/
-        minSize: Size;
-
-        /**This read-only property returns the Size that was the original value of the GraphObject.desiredSize of the element that is being resized.*/
-        originalDesiredSize: Size;
-
-        /**This read-only property returns the Point that was the original value of the Part.location of the Part that is being resized.*/
-        originalLocation: Point;
-
-        /**
-        * This tool may run when there is a mouse-down event on a resize handle, the diagram is not read-only and it allows resizing, the left mouse button is being used, and this tool's adornment's resize handle is at the current mouse point.
-        */
-        canStart(): boolean;
-
-        /**
-        * The size should be a multiple of the value returned by this method.
-        */
-        computeCellSize(): Size;
-
-        /**
-        * The effective maximum resizing size is the minimum of the .maxSize and the .adornedObject's GraphObject.maxSize.
-        */
-        computeMaxSize(): Size;
-
-        /**
-        * The effective minimum resizing size is the maximum of .minSize and the .adornedObject's GraphObject.minSize.
-        */
-        computeMinSize(): Size;
-
-        /**
-        * Given a Spot in the original bounds of the object being resized and a new Point, compute the new Rect.
-        * @param {Point} newPoint a Point in local coordinates.
-        * @param {Spot} spot the alignment spot of the handle being dragged.
-        * @param {Size} min the result of the call to .computeMinSize.
-        * @param {Size} max the result of the call to .computeMaxSize.
-        * @param {Size} cell the result of the call to .computeCellSize.
-        * @param {boolean} reshape true if the new size may change the aspect ratio from that of the natural bounds of the .adornedObject.
-        */
-        computeResize(newPoint: Point, spot: Spot, min: Size, max: Size, cell: Size, reshape: boolean): Rect;
-
-        /**
-        * Capture the mouse, remember the object's original bounds, and start a transaction.\
-        */
-        doActivate(): void;
-
-        /**
-        * Restore the original GraphObject's size.
-        */
-        doCancel(): void;
-
-        /**
-        * Stop the current transaction and release the mouse.
-        */
-        doDeactivate(): void;
-
-        /**
-        * Call .resize with a new size determined by the current mouse point.
-        */
-        doMouseMove(): void;
-
-        /**
-        * Call .resize with the final bounds based on the most recent mouse point, commit the transaction, and raise the "PartResized" DiagramEvent.
-        */
-        doMouseUp(): void;
-
-        /**
-        * Change the size of the selected part's Part.resizeObject to have the given bounds.
-        * @param {Rect} newr
-        */
-        resize(newr: Rect): void;
-
-        /**
-        * Show an Adornment with the resize handles at points along the edge of the bounds of the selected Part's Part.resizeObject.
-        * @param {Part} part
-        */
-        updateAdornments(part: Part): void;
-    }
-
-    /**
-    * The RotatingTool is used to interactively change the GraphObject.angle of a GraphObject.
-    * This tool allows the user to rotate the Part.rotateObject of the selected Part.
-    * Normally this works with Parts or Nodes; it does not make sense for Links.
-    * The Part must be Part.rotatable, which is false by default.
-    */
-    class RotatingTool extends Tool {
-        /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.rotatingTool, which you can modify.
-        */
-        constructor();
-
-        /**This read-only property returns the GraphObject that is being rotated.*/
-        adornedObject: GraphObject;
-
-        /**Gets or sets a small GraphObject that is copied as a rotation handle for the selected part.*/
-        handle: GraphObject;
-
-        /**Gets or sets a small GraphObject that is copied as a rotation handle for the selected part.*/
-        handleArchetype: GraphObject;
-
-        /**This read-only property returns the angle that was the original value of the GraphObject.angle of the GraphObject that is being rotated.*/
-        originalAngle: number;
-
-        /**Gets or sets the the closeness to a desired angle at which the angle is "snapped to".*/
-        snapAngleEpsilon: number;
-
-        /**Gets or sets the preferred angles for the selected object.*/
-        snapAngleMultiple: number;
-
-        /**
-        * This tool may run when there is a mouse-down event on a rotate handle, the diagram is not read-only and it allows rotation, the left mouse button is being used, and this tool's adornment's rotate handle is at the current mouse point.
-        */
-        canStart(): boolean;
-
-        /**
-        * Compute the new angle given a point.
-        * @param{Point} newPoint
-        */
-        computeRotate(newPoint: Point): number;
-
-        /**
-        * Capture the mouse, remember the original GraphObject.angle, and start a transaction.
-        */
-        doActivate(): void;
-
-        /**
-        * Restore the original GraphObject.angle of the adorned object.
-        */
-        doCancel(): void;
-
-        /**
-        * Stop the current transaction and release the mouse.
-        */
-        doDeactivate(): void;
-
-        /**
-        * Call .rotate with a new angle determined by the current mouse point.
-        */
-        doMouseMove(): void;
-
-        /**
-        * Call .rotate with an angle based on the most recent mouse point, commit the transaction, and raise the "PartRotated" DiagramEvent.
-        */
-        doMouseUp(): void;
-
-        /**
-        * Change the angle of the selected part's Part.rotateObject.
-        * @param {number} newangle
-        */
-        rotate(newangle: number): void;
-
-        /**
-        * Show an Adornment with a rotate handle at a point to the side of the adorned object if the part is selected and visible and if Part.canRotate() is true.
-        * @param {Part} part
-        */
-        updateAdornments(part: Part): void;
-    }
-
-    /**
-    * The TextEditingTool is used to let the user interactively edit text in place.
-    * You do not normally need to create an instance of this tool
-    * because one already exists as the ToolManager.clickSelectingTool.
-    */
-    class TextEditingTool extends Tool {
-        /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.textEditingTool, which you can modify.
-        */
-        constructor();
-
-        /**Gets or sets the HTML element that edits the text.*/
-        currentTextEditor: Element;
-
-        /**Gets or sets the HTML element that edits the text.*/
-        defaultTextEditor: Element;
-
-        /**Gets or sets how user gestures can start in-place editing of text.*/
-        starting: EnumValue;
-
-        /**Gets or sets the TextBlock that is being edited.*/
-        textBlock: TextBlock;
-
-        /**Gets or sets the predicate that determines whether or not a string of text is valid.*/
-        textValidation: (tb: TextBlock, oldstr: string, newstr: string) => boolean;
-
-        /**
-        * Finish editing by trying to accept the new text.
-        * @param {EnumValue} reason The reason must be either TextEditingTool.LostFocus,
-        * TextEditingTool.MouseDown, TextEditingTool.Tab, or TextEditingTool.Enter.
-        */
-        acceptText(reason: EnumValue): void;
-
-        /**
-        * This may run when there is a mouse-click on a TextBlock for which the TextBlock.editable property is true in a Part that Part.isSelected.
-        */
-        canStart(): boolean;
-
-        /**
-        * Start editing the text for a TextBlock.
-        */
-        doActivate(): void;
-
-        /**
-        * Abort any text editing operation.
-        */
-        doCancel(): void;
-
-        /**
-        * Release the mouse.
-        */
-        doDeactivate(): void;
-
-        /**
-        * A click (mouse up) calls TextEditingTool.doActivate if this tool is not already active and if TextEditingTool.canStart returns true.
-        */
-        doMouseDown(): void;
-
-        /**
-        * A click (mouse up) calls TextEditingTool.doActivate if this tool is not already active and if TextEditingTool.canStart returns true.
-        */
-        doMouseUp(): void;
-
-        /**
-        * This calls TextEditingTool.doActivate if there is a TextBlock supplied.
-        */
-        doStart(): void;
-
-        /**
-        * This predicate checks any TextBlock.textValidation predicate and this tool's .textValidation predicate to make sure the TextBlock.text property may be set to the new string.
-        * @param {TextBlock} textblock the TextBlock that is being edited.
-        * @param {string} oldstr the previous string value.
-        * @param {string} newstr the proposed new string value.
-        */
-        isValidText(textblock: TextBlock, oldstr: string, newstr: string): boolean;
-
-        /**The user has typed ENTER.*/
-        static Enter: EnumValue;
-
-        /**The text editing control has lost focus.*/
-        static LostFocus: EnumValue;
-
-        /**The user has clicked somewhere else in the diagram.*/
-        static MouseDown: EnumValue;
-
-        /**A single click on a TextBlock with TextBlock.editable property set to true will start in-place editing.*/
-        static SingleClick: EnumValue;
-
-        /**A single click on a TextBlock with TextBlock.editable property set to true will start in-place editing, but only if the Part that the TextBlock is in is already selected.*/
-        static SingleClickSelected: EnumValue;
-
-        /**The user has typed TAB.*/
-        static Tab: EnumValue;
-    }
-
-    /**
-    * Tools handle mouse events and keyboard events.
-    * The currently running tool, Diagram.currentTool, receives all input events from the Diagram.
-    */
-    abstract class Tool {
-        /**
-        * Don't construct this directly -- this is an abstract class.
-        */
-        constructor();
-
-        /**This read-only property returns the Diagram that owns this tool and for which this tool is handling input events.*/
-        diagram: Diagram;
-
-        /**Gets or sets whether this tool is started and is actively doing something.*/
-        isActive: boolean;
-
-        /**Gets or sets whether this tool can be started by a mouse event.*/
-        isEnabled: boolean;
-
-        /**Gets or sets the name of this tool.*/
-        name: string;
-
-        /**Gets or sets the name of the transaction to be committed by .stopTransaction; if null, the transaction will be rolled back.*/
-        transactionResult: string;
-
-        /**
-        * This is called to cancel any running "WaitAfter" timer.
-        */
-        cancelWaitAfter(): void;
-
-        /**
-        * This predicate is used by the ToolManager to decide if this tool can be started mode-lessly by mouse and touch events.
-        */
-        canStart(): boolean;
-
-        /**
-        * This predicate determines whether or not to allow pinch zooming from a multi-touch event.
-        */
-        canStartMultiTouch(): boolean;
-
-        /**
-        * This method is called by the diagram after setting Diagram.currentTool, to make the new tool active.
-        */
-        doActivate(): void;
-
-        /**
-        * The diagram will call this method when the user wishes to cancel the current tool's operation.
-        */
-        doCancel(): void;
-
-        /**
-        * This method is called by the diagram on the old tool when Diagram.currentTool is set to a new tool.
-        */
-        doDeactivate(): void;
-
-        /**
-        * The diagram will call this method upon a key down event.
-        */
-        doKeyDown(): void;
-
-        /**
-        * The diagram will call this method upon a key up event.
-        */
-        doKeyUp(): void;
-
-        /**
-        * The diagram will call this method upon a mouse down event.
-        */
-        doMouseDown(): void;
-
-        /**
-        * The diagram will call this method upon a mouse move event.
-        */
-        doMouseMove(): void;
-
-        /**
-        * The diagram will call this method upon a mouse up event.
-        */
-        doMouseUp(): void;
-
-        /**
-        * The diagram will call this method as the mouse wheel is rotated.
-        */
-        doMouseWheel(): void;
-
-        /**
-        * This method is called by the diagram when this tool becomes the current tool; you should not call this method.
-        */
-        doStart(): void;
-
-        /**
-        * This method is called by the diagram when this tool stops being the current tool; you should not call this method.
-        */
-        doStop(): void;
-
-        /**
-        * This is called a certain delay after a call to .standardWaitAfter if there has not been any call to .cancelWaitAfter.
-        */
-        doWaitAfter(): void;
-
-        /**
-        * This convenience function finds the front-most GraphObject that is at a given point and that is part of an Adornment that is of a given category.
-        * @param {Point} p a Point in document coordinates.
-        * @param {string} category the required Part.category of the Adornment.
-        */
-        findToolHandleAt(p: Point, category: string): GraphObject;
-
-        /**
-        * Return true when the last mouse point is far enough away from the first mouse down point to constitute a drag operation instead of just a potential click.
-        * @param {Point=} first Point in view coordinates, defaults to Diagram.firstInput's InputEvent.viewPoint.
-        * @param {Point=} last Point in view coordinates, defaults to Diagram.lastInput's InputEvent.viewPoint.
-        */
-        isBeyondDragSize(first?: Point, last?: Point): boolean;
-
-        /**
-        * Implement the standard behavior for mouse clicks, searching for and calling click handler functions on GraphObjects or on Diagram, and raising the corresponding DiagramEvent.
-        * @param {function(GraphObject):GraphObject | null=} navig An optional custom navigation
-        * function to find target objects.
-        * @param {function(GraphObject):boolean | null=} pred An optional custom predicate
-        */
-        standardMouseClick(navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean): void;
-
-        /**
-        * Implement the standard behavior for mouse enter, over, and leave events, where the mouse is moving but no button is pressed.
-        */
-        standardMouseOver(): void;
-
-        /**
-        * Implement the standard behavior for selecting parts with the mouse, depending on the control and shift modifier keys.
-        */
-        standardMouseSelect(): void;
-
-        /**
-        * Implement the standard behavior for mouse wheel events.
-        */
-        standardMouseWheel(): void;
-
-        /**
-        * Initiates pinch-zooming on multi-touch devices.
-        */
-        standardPinchZoomStart(): void;
-
-        /**
-        * Continues pinch-zooming (started by standardPinchZoomStart) on multi-touch devices.
-        */
-        standardPinchZoomMove(): void;
-
-        /**
-        * This is called to start a new timer to call .doWaitAfter after a given delay.
-        * @param {number} delay in milliseconds
-        */
-        standardWaitAfter(delay: number): void;
-
-        /**
-        * Call Diagram.startTransaction with the given transaction name.
-        * @param {string=} tname a description of the transaction
-        */
-        startTransaction(tname?: string): boolean;
-
-        /**
-        * If the Diagram.currentTool is this tool, stop this tool and start the Diagram.defaultTool by making it be the new current tool.
-        */
-        stopTool(): void;
-
-        /**
-        * If .transactionResult is null, call Diagram.rollbackTransaction, otherwise call Diagram.commitTransaction.
-        */
-        stopTransaction(): boolean;
-
-        /**
-        * The diagram asks each tool to update any adornments the tool might use for a given part.
-        * @param {Part} part
-        */
-        updateAdornments(part: Part): void;
-    }
-
-    /**
-    * This special Tool is responsible for managing all of the Diagram's
-    * mode-less tools.
-    */
-    class ToolManager extends Tool {
-        /**
-        * You do not normally need to create an instance of this tool because one already exists as the Diagram.toolManager, which you can modify.
-        */
-        constructor();
-
-        /**Gets or sets the mode-less ActionTool, normally one of the .mouseDownTools.*/
-        actionTool: ActionTool;
-
-        /**Gets or sets the mode-less ClickCreatingTool, normally one of the .mouseUpTools.*/
-        clickCreatingTool: ClickCreatingTool;
-
-        /**Gets or sets the mode-less ClickSelectingTool, normally one of the .mouseUpTools.*/
-        clickSelectingTool: ClickSelectingTool;
-
-        /**Gets or sets the mode-less ContextMenuTool, normally one of the .mouseUpTools.*/
-        contextMenuTool: ContextMenuTool;
-
-        /**This read-only property returns the currently showing tooltip, or null if there is none.*/
-        currentToolTip: Adornment;
-
-        /**Gets or sets the mode-less DraggingTool, normally one of the .mouseMoveTools.*/
-        draggingTool: DraggingTool;
-
-        /**Gets or sets the mode-less DragSelectingTool, normally one of the .mouseMoveTools.*/
-        dragSelectingTool: DragSelectingTool;
-
-        /**Gets or sets the distance in view coordinates within which a mouse down-and-up is considered a click and beyond which a mouse movement is considered a drag.*/
-        dragSize: Size;
-
-        /**Gets or sets the time between when the mouse stops moving and a hold event, in milliseconds.*/
-        holdDelay: number;
-
-        /**Gets or sets the time between when the mouse stops moving and a hover event, in milliseconds.*/
-        hoverDelay: number;
-
-        /**Gets or sets the mode-less LinkingTool, normally one of the .mouseMoveTools.*/
-        linkingTool: LinkingTool;
-
-        /**Gets or sets the mode-less LinkReshapingTool, normally one of the .mouseDownTools.*/
-        linkReshapingTool: LinkReshapingTool;
-
-        /**This read-only property returns the list of Tools that might be started upon a mouse-down event.*/
-        mouseDownTools: List<Tool>;
-
-        /**This read-only property returns the list of Tools that might be started upon a mouse-move event.*/
-        mouseMoveTools: List<Tool>;
-
-        /**This read-only property returns the list of Tools that might be started upon a mouse-up event.*/
-        mouseUpTools: List<Tool>;
-
-        /**Gets or sets the ToolManager's mouse wheel behavior.*/
-        mouseWheelBehavior: EnumValue;
-
-        /**Gets or sets the mode-less PanningTool, normally one of the .mouseMoveTools.*/
-        panningTool: PanningTool;
-
-        /**Gets or sets the mode-less RelinkingTool, normally one of the .mouseDownTools.*/
-        relinkingTool: RelinkingTool;
-
-        /**Gets or sets the mode-less ResizingTool, normally one of the .mouseDownTools.*/
-        resizingTool: ResizingTool;
-
-        /**Gets or sets the mode-less RotatingTool, normally one of the .mouseDownTools.*/
-        rotatingTool: RotatingTool;
-
-        /**Gets or sets the mode-less TextEditingTool, normally one of the .mouseUpTools.*/
-        textEditingTool: TextEditingTool;
-
-        /**
-        * This just calls CommandHandler.doKeyDown on the diagram's Diagram.commandHandler.
-        */
-        doKeyDown(): void;
-
-        /**
-        * This just calls CommandHandler.doKeyUp on the diagram's Diagram.commandHandler.
-        */
-        doKeyUp(): void;
-
-        /**
-        * Iterate over the .mouseDownTools list and start the first tool for which its Tool.canStart predicate returns true.
-        */
-        doMouseDown(): void;
-
-        /**
-        * Implement the standard behavior for mouse hover and mouse hold events, called by .doWaitAfter when the mouse has not moved for a period of time.
-        */
-        doMouseHover(): void;
-
-        /**
-        * Iterate over the .mouseMoveTools list and start the first tool for which its Tool.canStart predicate returns true.
-        */
-        doMouseMove(): void;
-
-        /**
-        * Iterate over the .mouseUpTools list and start the first tool for which its Tool.canStart predicate returns true.
-        */
-        doMouseUp(): void;
-
-        /**
-        * The diagram will call this method as the mouse wheel is rotated.
-        */
-        doMouseWheel(): void;
-
-        /**
-        * Implement the standard behavior for tooltips, called by .doWaitAfter when the mouse has not moved for a period of time.
-        */
-        doToolTip(): void;
-
-        /**
-        * Implement the standard behavior for when the mouse has not moved for a period of time.
-        */
-        doWaitAfter(): void;
-
-        /**
-        * Find a mouse tool of a given name.
-        * @param {string} name
-        */
-        findTool(name: string): Tool;
-
-        /**
-        * Hide any tooltip.
-        */
-        hideToolTip(): void;
-
-        /**
-        * Initialize the three mouse tool lists with instances of the standard tools.
-        */
-        initializeStandardTools(): void;
-
-        /**
-        * This is called by .showToolTip to position the part within the viewport.
-        * @param {Adornment} tooltip
-        * @param {GraphObject} obj The GraphObject getting the tooltip.
-        */
-        positionToolTip(tooltip: Adornment, obj: GraphObject): void;
-
-        /**
-        * Replace a mouse tool of a given name with a new tool.
-        * @param {string} name the type of tool, such as "Dragging" or "ClickSelecting".
-        * @param {Tool} newtool If null, any tool that the search finds will just be removed
-        * from the list in which it was found.
-        */
-        replaceTool(name: string, newtool: Tool): Tool;
-
-        /**
-        * Show a tooltip Adornment.
-        * @param {Adornment} tooltip
-        * @param {GraphObject} obj The GraphObject getting the tooltip; this is null if the tooltip is being shown for the diagram background.
-        */
-        showToolTip(tooltip: Adornment, obj: GraphObject): void;
-
-        /**This value for gestureBehavior indicates that the pointer/touch pinch gestures on the canvas intend to have no effect on the Diagram, but also no effect on the page.*/
-        static GestureCancel: EnumValue;
-
-        /**This value for gestureBehavior indicates that the pointer/touch pinch gestures on the canvas intend to have no effect on the Diagram, but will not be prevented, and may bubble up the page to have other effects (such as zooming the page).*/
-        static GestureNone: EnumValue;
-
-        /**This value for gestureBehavior indicates that the pointer/touch pinch gestures on the canvas intend to zoom the Diagram.*/
-        static GestureZoom: EnumValue;
-
-        /**This value for .mouseWheelBehavior indicates that the mouse wheel events are ignored, although scrolling or zooming by other means may still be allowed.*/
-        static WheelNone: EnumValue;
-
-        /**This default value for .mouseWheelBehavior indicates that mouse wheel events scroll the diagram.*/
-        static WheelScroll: EnumValue;
-
-        /**This value for .mouseWheelBehavior indicates that the mouse wheel events change the scale of the diagram.*/
-        static WheelZoom: EnumValue;
-    }
-
-
-    /**
-    * This interface is implemented by the List, Set, and Map
-    * classes; it provides the .iterator read-only property that returns an Iterator.
-    */
-    class Iterable<T> {
-        /*This is an interface and thus does not have a constructor.*/
-
-        /**Gets an Iterator that can iterate over the items in the collection.*/
-        iterator: Iterator<T>;
-    }
-
-    /**
-    * This interface defines properties and methods for iterating over a collection;
-    * it provides the .next predicate and the .value read-only property.
-    * Some Iterators also provide key property values along with each value.
-    */
-    class Iterator<T> extends Iterable<T> {
-        /*This is an interface and thus does not have a constructor.*/
-
-        /**This read-only property returns the total number of items in the iterated collection.*/
-        count: number;
-
-        /**Returns itself, which is convenient for code that expects an Iterable instead of an Iterator.*/
-        iterator: Iterator<T>;
-
-        /**This read-only property returns the current index to the item in the collection, assuming .next has just returned true.*/
-        key: any;
-
-        /**This read-only property returns the current item in the collection, assuming .next has just returned true.*/
-        value: T;
-
-        /**
-        * This is true if all invocations of the given predicate on items in the collection are true.
-        * @param {(x: T) => boolean} pred
-        */
-        all(pred: (x: T) => boolean): boolean;
-
-        /**
-        * This is true if any invocation of the given predicate on items in the collection is true.
-        * @param {(x: T) => boolean} pred
-        */
-        any(pred: (x: T) => boolean): boolean;
-
-        /**
-        * Produce an Iterator that first iterates over the items of this Iterator and then iterates over the items of the given Iterator.
-        * @param {Iterable.<T>} it An Iterable
-        */
-        concat<S>(it: Iterable<S>): Iterator<S | T>;
-
-        /**
-        * Call the given function on each item in the collection.
-        * @param {(x: T) => void} func
-        */
-        each(func: (x: T) => void): void;
-
-        /**
-        * Call the given predicate on each item in the collection and for each item that it returns true, present the item in an iterator.
-        * @param {function(T):boolean} pred This function must not have any side-effects.
-        */
-        filter(pred: (x: T) => boolean): Iterator<T>;
-
-        /**
-        * Return the first item in the collection, or null if there is none.
-        */
-        first(): T;
-
-        /**
-        * Call the given function on each item in the collection and present the results in an iterator.
-        * @param {function(T)} func This function must not modify the collection.
-        */
-        map<S>(func: (x: T) => S): Iterator<S>;
-
-        /**
-        * Call this method to advance the iterator to the next item in the collection.
-        */
-        next(): boolean;
-
-        /**
-        * Start this iterator all over again.
-        */
-        reset(): void;
-    }
-
-    /**
-    * An ordered iterable collection.
-    * It optionally enforces the type of elements that may be added to the List.
-    */
-    class List<T> extends Iterable<T> {
-        /**
-        * This creates a List that checks the type of the values to be instances of a particular kind of Object.
-        * @param {function(...)} type this must be a class function/constructor.
-        */
-        constructor(type: Constructor);
-        /**
-        * This creates a List that may check the types of the values.
-        * @param {string=} type if supplied, this must be one of: 'number', 'string', 'boolean', or 'function' for the value type.
-        */
-        constructor(type?: string);
-
-        /**This read-only property returns the length of the List.*/
-        count: number;
-
-        /**This read-only property returns the length of the List. ES6-like synonym for count.*/
-        size: number;
-
-        /**Gets an object that you can use for iterating over the List.*/
-        iterator: Iterator<T>;
-
-        /**Gets an object that you can use for iterating over the List in backwards order.*/
-        iteratorBackwards: Iterator<T>;
-
-        /**This read-only property returns the length of the List, a synonym for the .count property.*/
-        length: number;
-
-        /**
-        * Adds a given value to the end of the List.
-        * @param {*} val
-        */
-        add(val: T): void;
-
-        /**
-        * Adds all of the values of a collection (either an Iterable or an Array) to the end of this List.
-        * @param {Iterable<T>|Array<T>} coll
-        */
-        addAll(coll: Iterable<T> | Array<T>): List<T>;
-
-        /**
-        * This is true if all invocations of the given predicate on items in the collection are true.
-        * @param {(x: T) => boolean} pred
-        */
-        all(pred: (x: T) => boolean): boolean;
-
-        /**
-        * This is true if any invocation of the given predicate on items in the collection is true.
-        * @param {(x: T) => boolean} pred
-        */
-        any(pred: (x: T) => boolean): boolean;
-
-        /**
-        * Clears the List.
-        */
-        clear(): void;
-
-        /**
-        * Produce a new List holding, in order, all of the items of this List and then all of the items presented by the given Iterable.
-        * Unlike Iterator.concat, this returns a List, not an Iterator.
-        * @param {Iterable.<T>} it An Iterable
-        */
-        concat<S>(it: Iterable<S>): List<S | T>;
-
-        /**
-        * Returns whether the given value is in this List.
-        * @param {*} val
-        */
-        contains(val: T): boolean;
-
-        /**
-        * Makes a shallow copy of this List.
-        */
-        copy(): List<T>;
-
-        /**
-        * Removes a given value (if found) from the List. ES6-like synonym for remove.
-        * @param {*} val
-        */
-        delete(val: T): boolean;
-
-        /**
-        * Call the given function on each item in the collection.
-        * @param {(x: T) => void} func
-        */
-        each(func: (x: T) => void ): void;
-
-        /**
-        * Returns the element at the given index.
-        * @param {number} i
-        */
-        elt(i: number): T;
-
-        /**
-        * Call the given predicate on each item in the collection and for each item that it returns true, collect the item in a new List.
-        * Unlike Iterator.filter, this returns a List, not an Iterator.
-        * @param {function(T):boolean} pred This function must not have any side-effects.
-        */
-        filter(pred: (x: T) => boolean): List<T>;
-
-        /**
-        * Returns the first item in the list, or null if there is none.
-        */
-        first(): T;
-
-        /**
-        * Returns the element at the given index. ES6-like synonym for elt.
-        * @param {number} i
-        */
-        get(i: number): T;
-
-        /**
-        * Returns whether the given value is in this List. ES6-like synonym for contains.
-        * @param {*} val
-        */
-        has(val: T): boolean;
-
-        /**
-        * Returns the index of the given value if it is in this List.
-        * @param {*} val
-        */
-        indexOf(val: T): number;
-
-        /**
-        * Insert a value before the index i.
-        * @param {number} i
-        * @param {*} val
-        */
-        insertAt(i: number, val: T): void;
-
-        /**
-        * Returns the last item in the list, or null if there is none.
-        */
-        last(): T;
-
-        /**
-        * Call the given function on each item in the collection and collect the results in a new List.
-        * Unlike Iterator.map, this returns a List, not an Iterator.
-        * @param {function(T)} func This function must not modify the collection.
-        */
-        map<S>(func: (x: T) => S): List<S>;
-
-        /**
-        * Returns the last item in the list and removes it from the list, or just return null if there is none.
-        */
-        pop(): T;
-
-        /**
-        * Add an item at the end of the list -- a synonym for add.
-        */
-        push(val: T): void;
-
-        /**
-        * Removes a given value (if found) from the List.
-        * @param {*} val
-        */
-        remove(val: T): boolean;
-
-        /**
-        * Removes a value at a given index from the List.
-        * @param {number} i
-        */
-        removeAt(i: number): void;
-
-        /**
-        * Removes a range of values from the List.
-        * @param {number} to
-        * @param {number} from
-        */
-        removeRange(to: number, from: number): void;
-
-        /**
-        * Reverse the order of items in this List.
-        */
-        reverse(): List<T>;
-
-        /**
-        * Set the element at the given index to a given value. ES6-like synonym for setElt.
-        * @param {number} i
-        * @param {*} val
-        */
-        set(i: number, val: T): void;
-
-        /**
-        * Set the element at the given index to a given value.
-        * @param {number} i
-        * @param {*} val
-        */
-        setElt(i: number, val: T): void;
-
-        /**
-        * Sort the List according to a comparison function.
-        * @param {function(*,*):number} sortfunc the same kind of function as passed to Array.sort
-        */
-        sort(sortfunc: (a: T, b: T) => number): List<T>;
-
-        /**
-        * Produces a JavaScript Array from the contents of this List.
-        */
-        toArray(): Array<T>;
-
-        /**
-        * Converts the List to a Set.
-        */
-        toSet(): Set<T>;
-    }
-
-    /**
-    * This is a structure used by Map to hold key-value pairs.
-    */
-    interface KeyValuePair<K,V> {  // undocumented
-        key: K;
-        value: V;
-    }
-
-    /**
-    * An unordered iterable collection of key/value pairs that cannot contain two instances of the
-    * same key.
-    * It optionally enforces the type of the key and the type of the associated value.
-    */
-    class Map<K,V> extends Iterator<KeyValuePair<K,V>> {
-        /**
-        * This creates a Map that may check the types of the keys and/or values.
-        * @param {function(...)} keytype if supplied, this must be a class function/constructor.
-        * @param {function(...)} valtype if supplied, this must be a class function/constructor.
-        */
-        constructor(keytype: Constructor, valtype: Constructor);
-        /**
-        * This creates a Map that may check the types of the keys and/or values.
-        * @param {string=} keytype if supplied, this must be one of: 'number' or 'string' for the key type.
-        * @param {function(...)} valtype if supplied, this must be a class function/constructor.
-        */
-        constructor(keytype: string, valtype: Constructor);
-        /**
-        * This creates a Map that may check the types of the keys and/or values.
-        * @param {function(...)} keytype if supplied, this must be a class function/constructor.
-        * @param {string} valtype if supplied, this must be one of: 'number', 'string', 'boolean', or 'function' for the value type.
-        */
-        constructor(keytype: Constructor, valtype: string);
-        /**
-        * This creates a Map that may check the types of the keys and/or values.
-        * @param {string=} keytype if supplied, this must be one of: 'number' or 'string' for the key type.
-        * @param {string=} valtype if supplied, this must be one of: 'number', 'string', 'boolean', or 'function' for the value type.
-        */
-        constructor(keytype?: string, valtype?: string);
-
-        /**This read-only property returns the number of associations in the Map.*/
-        count: number;
-
-        /**Gets an object that you can use for iterating over the key-value pairs of the Map.*/
-        iterator: Iterator<KeyValuePair<K,V>>;
-
-        /**Gets an object that you can use for iterating over the keys in the Map.*/
-        iteratorKeys: Iterator<K>;
-
-        /**Gets an object that you can use for iterating over the values of the Map.*/
-        iteratorValues: Iterator<V>;
-
-        /**This read-only property returns the number of associations in the Map. ES6-like synonym for count.*/
-        size: number;
-
-        /**
-        * Adds a key-value association to the Map, or replaces the value associated with the key if the key was already present in the map.
-        * @param {*} key
-        * @param {*} val
-        */
-        add(key: K, val: V): boolean;
-
-        /**
-        * Adds all of the key-value pairs of another Map to this Map.
-        * @param {Iterable.<KeyValuePair.<K,V>>|Array} coll
-        */
-        addAll(coll: Iterable<KeyValuePair<K, V>> | Array<KeyValuePair<K, V>>): Map<K,V>;
-
-        /**
-        * This is true if all invocations of the given predicate on key-value pairs in the collection are true.
-        * @param {(x: Object) => boolean} pred
-        */
-        all(pred: (x: KeyValuePair<K, V>) => boolean): boolean;
-
-        /**
-        * This is true if any invocation of the given predicate on key-value pairs in the collection is true.
-        * @param {(x: Object) => boolean} pred
-        */
-        any(pred: (x: KeyValuePair<K, V>) => boolean): boolean;
-
-        /**
-        * Clears the Map, removing all key-value associations.
-        */
-        clear(): void;
-
-        /**
-        * Produce a new Map that includes the key-value pairs of this Map and then adds the pairs of the given Iterator.
-        * Unlike Iterator.concat, this returns a Map, not an Iterator.
-        * @param {Iterable.<KeyValuePair<K,V>>} it An Iterable
-        */
-        concat<W>(it: Iterable<KeyValuePair<K, W>>): Map<K, V | W>;
-
-        /**
-        * Returns whether the given key is in this Map.
-        * @param {*} key
-        */
-        contains(key: K): boolean;
-
-        /**
-        * Makes a shallow copy of this Map.
-        */
-        copy(): Map<K,V>;
-
-        /**
-        * Removes a key (if found) from the Map. ES6-like synonym for remove.
-        * @param {*} key
-        */
-        delete(key: K): boolean;
-
-        /**
-        * Call the given function on each key-value pair in the collection.
-        * @param {(x: Object) => void} func
-        */
-        each(func: (x: KeyValuePair<K,V>) => void ): void;
-
-        /**
-        * Call the given predicate on each key-value pair in the collection and for each pair that it returns true, add the key-value association in a new Map.
-        * Unlike Iterator.filter, this returns a Map, not an Iterator.
-        * @param {function(KeyValuePair<K,V>):boolean} pred This function must not have any side-effects.
-        */
-        filter(pred: (x: KeyValuePair<K, V>) => boolean): Map<K, V>;
-
-        /**
-        * Returns the first key-value pair in the collection, or null if there is none.
-        */
-        first(): KeyValuePair<K,V>;
-
-        /**
-        * Returns the value associated with a key. ES6-like synonym for getValue.
-        * @param {*} key
-        */
-        get(key: K): V;
-
-        /**
-        * Returns the value associated with a key.
-        * @param {*} key
-        */
-        getValue(key: K): V;
-
-        /**
-        * Returns whether the given key is in this Map. ES6-like synonym for contains.
-        * @param {*} key
-        */
-        has(key: K): boolean;
-
-        /**
-        * Call the given function on each key-value pair in the collection and associate the key with the result of the function in a new Map.
-        * Unlike Iterator.map, this returns a Map, not an Iterator.
-        * @param {function(KeyValuePair<K,V>)} func This function must not modify the collection.
-        */
-        map<S>(func: (x: KeyValuePair<K, V>) => S): Map<K, S>;
-
-        /**
-        * Removes a key (if found) from the Map.
-        * @param {*} key
-        */
-        remove(key: K): boolean;
-
-        /**
-        * Adds a key-value association to the Map, or replaces the value associated with the key if the key was already present in the map. ES6-like synonym for add.
-        * @param {*} key
-        * @param {*} val
-        */
-        set(key: K, val: V): boolean;
-
-        /**
-        * Produces a JavaScript Array of key/value pair objects from the contents of this Map.
-        */
-        toArray(): Array<KeyValuePair<K,V>>;
-
-        /**
-        * Produces a Set that provides a read-only view onto the keys of this Map.
-        */
-        toKeySet(): Set<K>;
-    }
-
-    /**
-    * An unordered iterable collection that cannot contain two instances of the same kind of value.
-    * It optionally enforces the type of elements that may be added to the Set.
-    */
-    class Set<T> extends Iterable<T> {
-        /**
-        * This creates a Set that checks the type of the values.
-        * @param {function(...)} type this must be a class function/constructor.
-        */
-        constructor(type: Constructor);
-        /**
-        * This creates a Set that may check the types of the values.
-        * @param {string=} type if supplied, this must be one of: 'number' or 'string' for the key type.
-        */
-        constructor(type?: string);
-
-        /**This read-only property returns the number of elements in the Set.*/
-        count: number;
-
-        /**Gets an object that you can use for iterating over the Set.*/
-        iterator: Iterator<T>;
-
-        /**This read-only property returns the number of elements in the Set. ES6-like synonym for count.*/
-        size: number;
-
-        /**
-        * Adds a given value to the Set, if not already present.
-        * @param {*} val
-        */
-        add(val: T): boolean;
-
-        /**
-        * Adds all of the values of a collection (either an Iterable or an Array) to this Set.
-        * @param {Iterable<T>|Array<T>} coll
-        */
-        addAll(coll: Iterable<T> | Array<T>): Set<T>;
-
-        /**
-        * This is true if all invocations of the given predicate on items in the collection are true.
-        * @param {(x: T) => boolean} pred
-        */
-        all(pred: (x: T) => boolean): boolean;
-
-        /**
-        * This is true if any invocation of the given predicate on items in the collection is true.
-        * @param {(x: T) => boolean} pred
-        */
-        any(pred: (x: T) => boolean): boolean;
-
-        /**
-        * Clears the Set.
-        */
-        clear(): void;
-
-        /**
-        * Produce a new Set that contains items of this Set and then iterates over the items of the given Iterator.
-        * Unlike Iterator.concat, this returns a Set, not an Iterator.
-        * @param {Iterable.<T>} it An Iterable
-        */
-        concat<S>(it: Iterable<S>): Set<S | T>;
-
-        /**
-        * Returns whether the given value is in this Set.
-        * @param {*} val
-        */
-        contains(val: T): boolean;
-
-        /**
-        * Returns true if all of the values of a given collection are in this Set.
-        * @param {Iterable<T>} coll
-        */
-        containsAll(coll: Iterable<T>): boolean;
-
-        /**
-        * Returns true if any of the values of a given collection are in this Set.
-        * @param {Iterable<T>} coll
-        */
-        containsAny(coll: Iterable<T>): boolean;
-
-        /**
-        * Makes a shallow copy of this Set.
-        */
-        copy(): Set<T>;
-
-        /**
-        * Removes a value (if found) from the Set. ES6-like synonym for remove.
-        * @param {*} val
-        */
-        delete(val: T): boolean;
-
-        /**
-        * Call the given function on each item in the collection.
-        * @param {(x: T) => void} func
-        */
-        each(func: (x: T) => void): void;
-
-        /**
-        * Call the given predicate on each item in the collection and for each item that it returns true, collect the item in a new Set.
-        * Unlike Iterator.filter, this returns a Set, not an Iterator.
-        * @param {function(T):boolean} pred This function must not have any side-effects.
-        */
-        filter(pred: (x: T) => boolean): Set<T>;
-
-        /**
-        * Returns the first item in the collection, or null if there is none.
-        */
-        first(): T;
-
-        /**
-        * Returns whether the given value is in this Set. ES6-like synonym for contains.
-        * @param {*} val
-        */
-        has(val: T): boolean;
-
-        /**
-        * Call the given function on each item in the collection and collect the results in a new Set.
-        * Unlike Iterator.map, this returns a Set, not an Iterator.
-        * @param {function(T)} func This function must not modify the collection.
-        */
-        map<S>(func: (x: T) => S): Set<S>;
-
-        /**
-        * Removes a value (if found) from the Set.
-        * @param {*} val
-        */
-        remove(val: T): boolean;
-
-        /**
-        * Removes all of the values of a collection from this Set.
-        * @param {Iterable<T>} coll
-        */
-        removeAll(coll: Iterable<T>): Set<T>;
-
-        /**
-        * Removes all of the values of a collection from this Set.
-        * @param {Array<T>} coll
-        */
-        removeAll(coll: Array<T>): Set<T>;
-
-        /**
-        * Removes from this Set all items that are not in the given collection.
-        * @param {Iterable<T>} coll
-        */
-        retainAll(coll: Iterable<T>): Set<T>;
-
-        /**
-        * Produces a JavaScript Array from the contents of this Set.
-        */
-        toArray(): Array<T>;
-
-        /**
-        * Converts the Set to a List.
-        */
-        toList(): List<T>;
-    }
-
-    class EnumValue {  // undocumented
-        //Rawr!
-    }
-} //END go
-
-declare module "go" {
-    export = go;
-}
diff --git a/google-apps-script/google-apps-script-tests.ts b/google-apps-script/google-apps-script-tests.ts
index fecb7adc9d..5160a5fdae 100644
--- a/google-apps-script/google-apps-script-tests.ts
+++ b/google-apps-script/google-apps-script-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="google-apps-script.document.d.ts" />
-/// <reference path="google-apps-script.gmail.d.ts" />
+
+
 
 // from https://developers.google.com/apps-script/overview
 
diff --git a/google-apps-script/google-apps-script.base.d.ts b/google-apps-script/google-apps-script.base.d.ts
index 73d18a30a7..538883cb19 100644
--- a/google-apps-script/google-apps-script.base.d.ts
+++ b/google-apps-script/google-apps-script.base.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
+
 
 declare namespace GoogleAppsScript {
   export module Base {
diff --git a/google-apps-script/google-apps-script.cache.d.ts b/google-apps-script/google-apps-script.cache.d.ts
index 68fbfe85c4..bdeee152ba 100644
--- a/google-apps-script/google-apps-script.cache.d.ts
+++ b/google-apps-script/google-apps-script.cache.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
+
 
 declare namespace GoogleAppsScript {
   export module Cache {
diff --git a/google-apps-script/google-apps-script.calendar.d.ts b/google-apps-script/google-apps-script.calendar.d.ts
index 0b33e82c93..c217e67a07 100644
--- a/google-apps-script/google-apps-script.calendar.d.ts
+++ b/google-apps-script/google-apps-script.calendar.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
-/// <reference path="google-apps-script.base.d.ts" />
+
+
 
 declare namespace GoogleAppsScript {
   export module Calendar {
diff --git a/google-apps-script/google-apps-script.charts.d.ts b/google-apps-script/google-apps-script.charts.d.ts
index 0798ac380c..2e1b65290a 100644
--- a/google-apps-script/google-apps-script.charts.d.ts
+++ b/google-apps-script/google-apps-script.charts.d.ts
@@ -3,9 +3,9 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
-/// <reference path="google-apps-script.base.d.ts" />
-/// <reference path="google-apps-script.ui.d.ts" />
+
+
+
 
 declare namespace GoogleAppsScript {
   export module Charts {
diff --git a/google-apps-script/google-apps-script.contacts.d.ts b/google-apps-script/google-apps-script.contacts.d.ts
index 5f203a8ce4..389951d563 100644
--- a/google-apps-script/google-apps-script.contacts.d.ts
+++ b/google-apps-script/google-apps-script.contacts.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
-/// <reference path="google-apps-script.base.d.ts" />
+
+
 
 declare namespace GoogleAppsScript {
   export module Contacts {
diff --git a/google-apps-script/google-apps-script.content.d.ts b/google-apps-script/google-apps-script.content.d.ts
index 9c02943033..afd34deca1 100644
--- a/google-apps-script/google-apps-script.content.d.ts
+++ b/google-apps-script/google-apps-script.content.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
+
 
 declare namespace GoogleAppsScript {
   export module Content {
diff --git a/google-apps-script/google-apps-script.document.d.ts b/google-apps-script/google-apps-script.document.d.ts
index be06bba252..7477261602 100644
--- a/google-apps-script/google-apps-script.document.d.ts
+++ b/google-apps-script/google-apps-script.document.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
-/// <reference path="google-apps-script.base.d.ts" />
+
+
 
 declare namespace GoogleAppsScript {
   export module Document {
diff --git a/google-apps-script/google-apps-script.drive.d.ts b/google-apps-script/google-apps-script.drive.d.ts
index b0154a31ac..d0fba208f8 100644
--- a/google-apps-script/google-apps-script.drive.d.ts
+++ b/google-apps-script/google-apps-script.drive.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
-/// <reference path="google-apps-script.base.d.ts" />
+
+
 
 declare namespace GoogleAppsScript {
   export module Drive {
diff --git a/google-apps-script/google-apps-script.forms.d.ts b/google-apps-script/google-apps-script.forms.d.ts
index da6a8f428f..3ce3e41672 100644
--- a/google-apps-script/google-apps-script.forms.d.ts
+++ b/google-apps-script/google-apps-script.forms.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
-/// <reference path="google-apps-script.base.d.ts" />
+
+
 
 declare namespace GoogleAppsScript {
   export module Forms {
diff --git a/google-apps-script/google-apps-script.gmail.d.ts b/google-apps-script/google-apps-script.gmail.d.ts
index 2fded11846..d76f0f1895 100644
--- a/google-apps-script/google-apps-script.gmail.d.ts
+++ b/google-apps-script/google-apps-script.gmail.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
-/// <reference path="google-apps-script.base.d.ts" />
+
+
 
 declare namespace GoogleAppsScript {
   export module Gmail {
diff --git a/google-apps-script/google-apps-script.groups.d.ts b/google-apps-script/google-apps-script.groups.d.ts
index fabe7b3401..dfcf7d79a5 100644
--- a/google-apps-script/google-apps-script.groups.d.ts
+++ b/google-apps-script/google-apps-script.groups.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
-/// <reference path="google-apps-script.base.d.ts" />
+
+
 
 declare namespace GoogleAppsScript {
   export module Groups {
diff --git a/google-apps-script/google-apps-script.html.d.ts b/google-apps-script/google-apps-script.html.d.ts
index 3c03ab19fe..3b62ffcb08 100644
--- a/google-apps-script/google-apps-script.html.d.ts
+++ b/google-apps-script/google-apps-script.html.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
-/// <reference path="google-apps-script.base.d.ts" />
+
+
 
 declare namespace GoogleAppsScript {
   export module HTML {
diff --git a/google-apps-script/google-apps-script.jdbc.d.ts b/google-apps-script/google-apps-script.jdbc.d.ts
index bbb2ed78d9..16950cff32 100644
--- a/google-apps-script/google-apps-script.jdbc.d.ts
+++ b/google-apps-script/google-apps-script.jdbc.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
-/// <reference path="google-apps-script.base.d.ts" />
+
+
 
 declare namespace GoogleAppsScript {
   export module JDBC {
diff --git a/google-apps-script/google-apps-script.language.d.ts b/google-apps-script/google-apps-script.language.d.ts
index 2df943e335..c820f7620e 100644
--- a/google-apps-script/google-apps-script.language.d.ts
+++ b/google-apps-script/google-apps-script.language.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
+
 
 declare namespace GoogleAppsScript {
   export module Language {
diff --git a/google-apps-script/google-apps-script.lock.d.ts b/google-apps-script/google-apps-script.lock.d.ts
index 088c6e2bde..65891f2844 100644
--- a/google-apps-script/google-apps-script.lock.d.ts
+++ b/google-apps-script/google-apps-script.lock.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
+
 
 declare namespace GoogleAppsScript {
   export module Lock {
diff --git a/google-apps-script/google-apps-script.mail.d.ts b/google-apps-script/google-apps-script.mail.d.ts
index 5dc9e50921..11c97f80fa 100644
--- a/google-apps-script/google-apps-script.mail.d.ts
+++ b/google-apps-script/google-apps-script.mail.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
+
 
 declare namespace GoogleAppsScript {
   export module Mail {
diff --git a/google-apps-script/google-apps-script.maps.d.ts b/google-apps-script/google-apps-script.maps.d.ts
index 05a9b1e77b..02e4ac0195 100644
--- a/google-apps-script/google-apps-script.maps.d.ts
+++ b/google-apps-script/google-apps-script.maps.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
-/// <reference path="google-apps-script.base.d.ts" />
+
+
 
 declare namespace GoogleAppsScript {
   export module Maps {
diff --git a/google-apps-script/google-apps-script.optimization.d.ts b/google-apps-script/google-apps-script.optimization.d.ts
index 8bf151453c..0217618a25 100644
--- a/google-apps-script/google-apps-script.optimization.d.ts
+++ b/google-apps-script/google-apps-script.optimization.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
+
 
 declare namespace GoogleAppsScript {
   export module Optimization {
diff --git a/google-apps-script/google-apps-script.properties.d.ts b/google-apps-script/google-apps-script.properties.d.ts
index 6f078964d6..9ceb24608e 100644
--- a/google-apps-script/google-apps-script.properties.d.ts
+++ b/google-apps-script/google-apps-script.properties.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
+
 
 declare namespace GoogleAppsScript {
   export module Properties {
diff --git a/google-apps-script/google-apps-script.script.d.ts b/google-apps-script/google-apps-script.script.d.ts
index 4aca524a02..bd1a5340d9 100644
--- a/google-apps-script/google-apps-script.script.d.ts
+++ b/google-apps-script/google-apps-script.script.d.ts
@@ -3,11 +3,11 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
-/// <reference path="google-apps-script.base.d.ts" />
-/// <reference path="google-apps-script.document.d.ts" />
-/// <reference path="google-apps-script.forms.d.ts" />
-/// <reference path="google-apps-script.spreadsheet.d.ts" />
+
+
+
+
+
 
 declare namespace GoogleAppsScript {
   export module Script {
diff --git a/google-apps-script/google-apps-script.sites.d.ts b/google-apps-script/google-apps-script.sites.d.ts
index 0dc118e0af..acf1f8d6dc 100644
--- a/google-apps-script/google-apps-script.sites.d.ts
+++ b/google-apps-script/google-apps-script.sites.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
-/// <reference path="google-apps-script.base.d.ts" />
+
+
 
 declare namespace GoogleAppsScript {
   export module Sites {
diff --git a/google-apps-script/google-apps-script.spreadsheet.d.ts b/google-apps-script/google-apps-script.spreadsheet.d.ts
index 5ffc752775..a8f554e4bc 100644
--- a/google-apps-script/google-apps-script.spreadsheet.d.ts
+++ b/google-apps-script/google-apps-script.spreadsheet.d.ts
@@ -3,10 +3,10 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
-/// <reference path="google-apps-script.charts.d.ts" />
-/// <reference path="google-apps-script.base.d.ts" />
-/// <reference path="google-apps-script.drive.d.ts" />
+
+
+
+
 
 declare namespace GoogleAppsScript {
   export module Spreadsheet {
diff --git a/google-apps-script/google-apps-script.ui.d.ts b/google-apps-script/google-apps-script.ui.d.ts
index afbdff5dd5..6d08082dc8 100644
--- a/google-apps-script/google-apps-script.ui.d.ts
+++ b/google-apps-script/google-apps-script.ui.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
+
 
 declare namespace GoogleAppsScript {
   export module UI {
diff --git a/google-apps-script/google-apps-script.url-fetch.d.ts b/google-apps-script/google-apps-script.url-fetch.d.ts
index ff03b376d1..94db3c3a7c 100644
--- a/google-apps-script/google-apps-script.url-fetch.d.ts
+++ b/google-apps-script/google-apps-script.url-fetch.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
-/// <reference path="google-apps-script.base.d.ts" />
+
+
 
 declare namespace GoogleAppsScript {
   export module URL_Fetch {
diff --git a/google-apps-script/google-apps-script.utilities.d.ts b/google-apps-script/google-apps-script.utilities.d.ts
index e5230da546..3deb1734f4 100644
--- a/google-apps-script/google-apps-script.utilities.d.ts
+++ b/google-apps-script/google-apps-script.utilities.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
-/// <reference path="google-apps-script.base.d.ts" />
+
+
 
 declare namespace GoogleAppsScript {
   export module Utilities {
diff --git a/google-apps-script/google-apps-script.xml-service.d.ts b/google-apps-script/google-apps-script.xml-service.d.ts
index 7f4e902e93..d45d4d16a8 100644
--- a/google-apps-script/google-apps-script.xml-service.d.ts
+++ b/google-apps-script/google-apps-script.xml-service.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="google-apps-script.types.d.ts" />
+
 
 declare namespace GoogleAppsScript {
   export module XML_Service {
diff --git a/google-apps-script/index.d.ts b/google-apps-script/index.d.ts
new file mode 100644
index 0000000000..9f60a23b2a
--- /dev/null
+++ b/google-apps-script/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for google-apps-script
+
+/// <reference path="google-apps-script.base.d.ts"/>
+/// <reference path="google-apps-script.cache.d.ts"/>
+/// <reference path="google-apps-script.calendar.d.ts"/>
+/// <reference path="google-apps-script.charts.d.ts"/>
+/// <reference path="google-apps-script.contacts.d.ts"/>
+/// <reference path="google-apps-script.content.d.ts"/>
+/// <reference path="google-apps-script.document.d.ts"/>
+/// <reference path="google-apps-script.drive.d.ts"/>
+/// <reference path="google-apps-script.forms.d.ts"/>
+/// <reference path="google-apps-script.gmail.d.ts"/>
+/// <reference path="google-apps-script.groups.d.ts"/>
+/// <reference path="google-apps-script.html.d.ts"/>
+/// <reference path="google-apps-script.jdbc.d.ts"/>
+/// <reference path="google-apps-script.language.d.ts"/>
+/// <reference path="google-apps-script.lock.d.ts"/>
+/// <reference path="google-apps-script.mail.d.ts"/>
+/// reference path="google-apps-script.maps.d.ts"/>
+/// <reference path="google-apps-script.optimization.d.ts"/>
+/// <reference path="google-apps-script.properties.d.ts"/>
+/// <reference path="google-apps-script.script.d.ts"/>
+/// <reference path="google-apps-script.sites.d.ts"/>
+/// <reference path="google-apps-script.spreadsheet.d.ts"/>
+/// <reference path="google-apps-script.types.d.ts"/>
+/// <reference path="google-apps-script.ui.d.ts"/>
+/// <reference path="google-apps-script.url-fetch.d.ts"/>
+/// <reference path="google-apps-script.utilities.d.ts"/>
+/// <reference path="google-apps-script.xml-service.d.ts"/>
+
diff --git a/google-closure-compiler/google-closure-compiler-tests.ts b/google-closure-compiler/google-closure-compiler-tests.ts
new file mode 100644
index 0000000000..f7fdda760f
--- /dev/null
+++ b/google-closure-compiler/google-closure-compiler-tests.ts
@@ -0,0 +1,27 @@
+
+import * as GoogleClosureCompiler from 'google-closure-compiler';
+
+// See
+//   https://github.com/chadkillingsworth/closure-compiler-npm#plugin-authors-and-native-node-usage
+// for the API example.  This code tries to do the exact same thing.
+
+let ClosureCompiler = GoogleClosureCompiler.compiler;
+
+console.log(ClosureCompiler.COMPILER_PATH)
+console.log(ClosureCompiler.CONTRIB_PATH)
+
+let options: GoogleClosureCompiler.CompileOptions = {
+    js: 'file-one.js',
+    compilation_level: 'ADVANCED',
+};
+let closureCompiler = new ClosureCompiler(options);
+let compilerProcess = closureCompiler.run((exitCode, stdout, stderr) => {
+    // ...
+});
+
+let jsonStream: GoogleClosureCompiler.JSONStreamFile[] = [
+    {
+        path: 'foo.js',
+        src: 'var x = "hello, world";',
+    },
+];
diff --git a/google-closure-compiler/index.d.ts b/google-closure-compiler/index.d.ts
new file mode 100644
index 0000000000..06807b2231
--- /dev/null
+++ b/google-closure-compiler/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for google-closure-compiler
+// Project: https://github.com/chadkillingsworth/closure-compiler-npm
+// Definitions by: Evan Martin <http://neugierig.org>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import * as child_process from 'child_process';
+
+// The "json_streams" compiler flag lets the compiler accept/produce
+// arrays of JSON objects in this shape for input/output.
+interface JSONStreamFile {
+    path: string;
+    src: string;
+    srcmap?: string;  // TODO(evan): pass through source maps.
+}
+
+interface Compiler {
+    javaPath: string;
+    logger: (...args: any[]) => void;
+    spawnOptions: { [key: string]: string };
+
+    run(callback?: (exitCode: number, stdout: string, stderr: string) => void):
+        child_process.ChildProcess;
+
+    getFullCommand(): string;
+}
+type CompileOptions = { [key: string]: string };
+declare var compiler: {
+    new (opts: (CompileOptions | string[]),
+        extraCommandArgs?: string[]): Compiler;
+
+    JAR_PATH: string;
+    COMPILER_PATH: string;
+    CONTRIB_PATH: string;
+};
diff --git a/google-closure-compiler/tsconfig.json b/google-closure-compiler/tsconfig.json
new file mode 100644
index 0000000000..ec55958214
--- /dev/null
+++ b/google-closure-compiler/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "google-closure-compiler-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/google-drive-realtime-api/google-drive-realtime-api-tests.ts b/google-drive-realtime-api/google-drive-realtime-api-tests.ts
index 9b2fab488c..af2313f147 100644
--- a/google-drive-realtime-api/google-drive-realtime-api-tests.ts
+++ b/google-drive-realtime-api/google-drive-realtime-api-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="google-drive-realtime-api.d.ts" />
+
 
 // Don't use this as a reference. Use the examples at
 //   https://developers.google.com/google-apps/realtime/
diff --git a/google-drive-realtime-api/google-drive-realtime-api.d.ts b/google-drive-realtime-api/index.d.ts
similarity index 100%
rename from google-drive-realtime-api/google-drive-realtime-api.d.ts
rename to google-drive-realtime-api/index.d.ts
diff --git a/google-drive-realtime-api/tsconfig.json b/google-drive-realtime-api/tsconfig.json
new file mode 100644
index 0000000000..df0c484b77
--- /dev/null
+++ b/google-drive-realtime-api/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "google-drive-realtime-api-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/google-maps/google-maps-tests.ts b/google-maps/google-maps-tests.ts
index 50f8489360..c723a9ded3 100644
--- a/google-maps/google-maps-tests.ts
+++ b/google-maps/google-maps-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="google-maps.d.ts" />
+
 
 import GoogleMapsLoader = require('google-maps');
  
diff --git a/google-maps/google-maps.d.ts b/google-maps/google-maps.d.ts
deleted file mode 100644
index edc37822c8..0000000000
--- a/google-maps/google-maps.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// Type definitions for google-maps 3.1.0
-// Project: https://www.npmjs.com/package/google-maps
-// Definitions by: Deividas Bakanas <https://github.com/DeividasBakanas>, Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../googlemaps/google.maps.d.ts" />
-
-declare namespace GoogleMapsLoader {
-    interface CallBack {
-        (google: { maps: { Map: google.maps.Map } }): void;
-    }
-    export var KEY: string;
-    export var CLIENT: string;
-    export var VERSION: string;
-    export var SENSOR: boolean;
-    export var LIBRARIES: Array<string>;
-    export var LANGUAGE: string;
-    export function release(callBack: Function): void;
-    export function onLoad(callBack?: CallBack): void;
-    export function load(callBack?: CallBack): void;
-    export function isLoaded(): boolean;
-
-}
-declare module 'google-maps' {
-    export = GoogleMapsLoader;
-}
diff --git a/google-maps/index.d.ts b/google-maps/index.d.ts
new file mode 100644
index 0000000000..f5c28f1581
--- /dev/null
+++ b/google-maps/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for google-maps 3.1.0
+// Project: https://www.npmjs.com/package/google-maps
+// Definitions by: Deividas Bakanas <https://github.com/DeividasBakanas>, Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="googlemaps" />
+
+declare namespace GoogleMapsLoader {
+    interface CallBack {
+        (google: { maps: { Map: google.maps.Map } }): void;
+    }
+    export var KEY: string;
+    export var CLIENT: string;
+    export var VERSION: string;
+    export var SENSOR: boolean;
+    export var LIBRARIES: Array<string>;
+    export var LANGUAGE: string;
+    export function release(callBack: Function): void;
+    export function onLoad(callBack?: CallBack): void;
+    export function load(callBack?: CallBack): void;
+    export function isLoaded(): boolean;
+
+}
+export = GoogleMapsLoader;
+export as namespace GoogleMapsLoader;
diff --git a/google-maps/tsconfig.json b/google-maps/tsconfig.json
new file mode 100644
index 0000000000..06a2202ca8
--- /dev/null
+++ b/google-maps/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "google-maps-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/google.analytics/ga-tests.ts b/google.analytics/ga-tests.ts
index acff9eb555..82533e4bdf 100644
--- a/google.analytics/ga-tests.ts
+++ b/google.analytics/ga-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="ga.d.ts" />
-/// <reference path="../jasmine/jasmine.d.ts" />
+
+/// <reference types="jasmine" />
 
 describe("tester Google Analytics Tracker _gat object", () => {
     it("can set ga script element", () => {
diff --git a/google.analytics/ga.d.ts b/google.analytics/index.d.ts
similarity index 100%
rename from google.analytics/ga.d.ts
rename to google.analytics/index.d.ts
diff --git a/google.analytics/tsconfig.json b/google.analytics/tsconfig.json
new file mode 100644
index 0000000000..1e53e101a9
--- /dev/null
+++ b/google.analytics/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ga-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/google.feeds/google.feed.api.d.ts b/google.feeds/index.d.ts
similarity index 100%
rename from google.feeds/google.feed.api.d.ts
rename to google.feeds/index.d.ts
diff --git a/google.feeds/tsconfig.json b/google.feeds/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/google.feeds/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/google.geolocation/google.geolocation-tests.ts b/google.geolocation/google.geolocation-tests.ts
index 0b8f023cbe..b07dcc3abb 100644
--- a/google.geolocation/google.geolocation-tests.ts
+++ b/google.geolocation/google.geolocation-tests.ts
@@ -1,5 +1,5 @@
 // Test files for Geolocation Definition file
-/// <reference path="google.geolocation.d.ts" />
+
 
 //determine if the handset has client side geo location capabilities
 var isInit: boolean = geo_position_js.init();
diff --git a/google.geolocation/google.geolocation.d.ts b/google.geolocation/index.d.ts
similarity index 100%
rename from google.geolocation/google.geolocation.d.ts
rename to google.geolocation/index.d.ts
diff --git a/google.geolocation/tsconfig.json b/google.geolocation/tsconfig.json
new file mode 100644
index 0000000000..d2a2bba047
--- /dev/null
+++ b/google.geolocation/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "google.geolocation-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/google.picker/google.picker-tests.ts b/google.picker/google.picker-tests.ts
index 280765354c..9a04938f08 100644
--- a/google.picker/google.picker-tests.ts
+++ b/google.picker/google.picker-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="google.picker.d.ts" />
+
 
 var createPicker = () => {
     var picker = new google.picker.PickerBuilder()
diff --git a/google.picker/google.picker.d.ts b/google.picker/index.d.ts
similarity index 100%
rename from google.picker/google.picker.d.ts
rename to google.picker/index.d.ts
diff --git a/google.picker/tsconfig.json b/google.picker/tsconfig.json
new file mode 100644
index 0000000000..bea12c6237
--- /dev/null
+++ b/google.picker/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "google.picker-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/google.visualization/google.visualization-tests.ts b/google.visualization/google.visualization-tests.ts
index a5b1352dee..f14bbdeaa9 100644
--- a/google.visualization/google.visualization-tests.ts
+++ b/google.visualization/google.visualization-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="google.visualization.d.ts" />
+
 
 function test_arrayToDataTable() {
     var array = [
diff --git a/google.visualization/google.visualization.d.ts b/google.visualization/index.d.ts
similarity index 100%
rename from google.visualization/google.visualization.d.ts
rename to google.visualization/index.d.ts
diff --git a/google.visualization/tsconfig.json b/google.visualization/tsconfig.json
new file mode 100644
index 0000000000..f34a34256b
--- /dev/null
+++ b/google.visualization/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "google.visualization-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/googlemaps.infobubble/google.maps.infobubble-tests.ts b/googlemaps.infobubble/google.maps.infobubble-tests.ts
index 7dcfa739b2..005457d1e8 100644
--- a/googlemaps.infobubble/google.maps.infobubble-tests.ts
+++ b/googlemaps.infobubble/google.maps.infobubble-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="../googlemaps/google.maps.d.ts" />
-/// <reference path="google.maps.infobubble.d.ts" />
-
 function test_options() {
     var options: google.maps.infobubble.InfoBubbleOptions;
     options = {};
diff --git a/googlemaps.infobubble/google.maps.infobubble.d.ts b/googlemaps.infobubble/google.maps.infobubble.d.ts
deleted file mode 100644
index fabde91192..0000000000
--- a/googlemaps.infobubble/google.maps.infobubble.d.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-// Type definitions for CSS3 InfoBubble with tabs for Google Maps API V3
-// Project: http://google-maps-utility-library-v3.googlecode.com/svn/trunk/infobubble/src/
-// Definitions by: Johan Nilsson <https://github.com/Dashue>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../googlemaps/google.maps.d.ts" />
-
-/**
- * @name CSS3 InfoBubble with tabs for Google Maps API V3
- * @version 0.8
- * @author Luke Mahe
- * @fileoverview
- * This library is a CSS Infobubble with tabs. It uses css3 rounded corners and
- * drop shadows and animations. It also allows tabs
- */
-
-/*
-The MIT License
-
-Copyright (c) 2014 https://github.com/Dashue
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-declare namespace google.maps.infobubble {
-
-    export interface InfoBubble {
-        /**
-          * Closes the infobubble
-          */
-        close(): void;
-
-        /**
-          * Checks if the infobubble is currently open
-          */
-        isOpen(): boolean;
-
-        /**
-          * Opens the infobubble
-          * @map The google map object
-          * @marker The marker used for anchoring the infobubble to
-          */
-        open(map: google.maps.Map, marker: google.maps.Marker) : void;
-
-		/**
-          * Returns the position of the InfoBubble
-          */
-        getPosition(): google.maps.LatLng;
-    }
-
-    export interface InfoBubbleOptions {
-
-        /**
-          * Percentage from the bottom left corner of the infobubble
-          */
-        arrowPosition?: number;
-
-        arrowSize?: number;
-
-        /**
-          * 0: Middle, 1: Left, 2: Right
-          */
-        arrowStyle?: number;
-
-        backgroundColor?: string;
-
-        borderColor?: string;
-
-        borderRadius?: number;
-
-        borderWidth?: number;
-
-        disableAnimation?: boolean;
-
-        disableAutoPan?: boolean;
-
-        maxHeight?: number;
-
-        maxWidth?: number;
-
-        minHeight?: number;
-
-        minWidth?: number;
-
-        padding?: number;
-
-        /**
-          * 0: None, 1: Right, 2: Under
-          */
-        shadowStyle?: number;
-    }
-}
diff --git a/googlemaps.infobubble/index.d.ts b/googlemaps.infobubble/index.d.ts
new file mode 100644
index 0000000000..e7381109e9
--- /dev/null
+++ b/googlemaps.infobubble/index.d.ts
@@ -0,0 +1,108 @@
+// Type definitions for CSS3 InfoBubble with tabs for Google Maps API V3
+// Project: http://google-maps-utility-library-v3.googlecode.com/svn/trunk/infobubble/src/
+// Definitions by: Johan Nilsson <https://github.com/Dashue>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="google-maps" />
+
+/**
+ * @name CSS3 InfoBubble with tabs for Google Maps API V3
+ * @version 0.8
+ * @author Luke Mahe
+ * @fileoverview
+ * This library is a CSS Infobubble with tabs. It uses css3 rounded corners and
+ * drop shadows and animations. It also allows tabs
+ */
+
+/*
+The MIT License
+
+Copyright (c) 2014 https://github.com/Dashue
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+declare namespace google.maps.infobubble {
+
+    export interface InfoBubble {
+        /**
+          * Closes the infobubble
+          */
+        close(): void;
+
+        /**
+          * Checks if the infobubble is currently open
+          */
+        isOpen(): boolean;
+
+        /**
+          * Opens the infobubble
+          * @map The google map object
+          * @marker The marker used for anchoring the infobubble to
+          */
+        open(map: google.maps.Map, marker: google.maps.Marker) : void;
+
+		/**
+          * Returns the position of the InfoBubble
+          */
+        getPosition(): google.maps.LatLng;
+    }
+
+    export interface InfoBubbleOptions {
+
+        /**
+          * Percentage from the bottom left corner of the infobubble
+          */
+        arrowPosition?: number;
+
+        arrowSize?: number;
+
+        /**
+          * 0: Middle, 1: Left, 2: Right
+          */
+        arrowStyle?: number;
+
+        backgroundColor?: string;
+
+        borderColor?: string;
+
+        borderRadius?: number;
+
+        borderWidth?: number;
+
+        disableAnimation?: boolean;
+
+        disableAutoPan?: boolean;
+
+        maxHeight?: number;
+
+        maxWidth?: number;
+
+        minHeight?: number;
+
+        minWidth?: number;
+
+        padding?: number;
+
+        /**
+          * 0: None, 1: Right, 2: Under
+          */
+        shadowStyle?: number;
+    }
+}
diff --git a/googlemaps.infobubble/tsconfig.json b/googlemaps.infobubble/tsconfig.json
new file mode 100644
index 0000000000..9485ec6f3b
--- /dev/null
+++ b/googlemaps.infobubble/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "google.maps.infobubble-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/googlemaps/google.maps-tests.ts b/googlemaps/google.maps-tests.ts
index 9b10c40ad3..e119cf25bc 100644
--- a/googlemaps/google.maps-tests.ts
+++ b/googlemaps/google.maps-tests.ts
@@ -1,5 +1,5 @@
 // Test file for Google Maps JavaScript API Definition file
-/// <reference path="google.maps.d.ts" />
+
 
 var map = new google.maps.Map(document.querySelector("☺"));
 
diff --git a/googlemaps/google.maps.d.ts b/googlemaps/google.maps.d.ts
deleted file mode 100644
index b77e665c28..0000000000
--- a/googlemaps/google.maps.d.ts
+++ /dev/null
@@ -1,2248 +0,0 @@
-// Type definitions for Google Maps JavaScript API 3.20
-// Project: https://developers.google.com/maps/
-// Definitions by: Folia A/S <http://www.folia.dk>, Chris Wrench <https://github.com/cgwrench>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/*
-The MIT License
-
-Copyright (c) 2012 Folia A/S. http://www.folia.dk
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-declare namespace google.maps {
-    /***** Map *****/
-    export class Map extends MVCObject {
-        constructor(mapDiv: Element, opts?: MapOptions);
-        fitBounds(bounds: LatLngBounds): void;
-        getBounds(): LatLngBounds;
-        getCenter(): LatLng;
-        getDiv(): Element;
-        getHeading(): number;
-        getMapTypeId(): MapTypeId|string;
-        getProjection(): Projection;
-        getStreetView(): StreetViewPanorama;
-        getTilt(): number;
-        getZoom(): number;
-        panBy(x: number, y: number): void;
-        panTo(latLng: LatLng|LatLngLiteral): void;
-        panToBounds(latLngBounds: LatLngBounds): void;
-        setCenter(latlng: LatLng|LatLngLiteral): void;
-        setHeading(heading: number): void;
-        setMapTypeId(mapTypeId: MapTypeId|string): void;
-        setOptions(options: MapOptions): void;
-        setStreetView(panorama: StreetViewPanorama): void;
-        setTilt(tilt: number): void;
-        setZoom(zoom: number): void;
-        controls: MVCArray[]; //Array<MVCArray<Node>>
-        data: Data;
-        mapTypes: MapTypeRegistry;
-        overlayMapTypes: MVCArray; // MVCArray<MapType>
-    }
-
-    export interface MapOptions {
-        backgroundColor?: string;
-        center?: LatLng|LatLngLiteral;
-        disableDefaultUI?: boolean;
-        disableDoubleClickZoom?: boolean;
-        draggable?: boolean;
-        draggableCursor?: string;
-        draggingCursor?: string;
-        heading?: number;
-        keyboardShortcuts?: boolean;
-        mapMaker?: boolean;
-        mapTypeControl?: boolean;
-        mapTypeControlOptions?: MapTypeControlOptions;
-        mapTypeId?: MapTypeId;
-        maxZoom?: number;
-        minZoom?: number;
-        noClear?: boolean;
-        overviewMapControl?: boolean;
-        overviewMapControlOptions?: OverviewMapControlOptions;
-        panControl?: boolean;
-        panControlOptions?: PanControlOptions;
-        rotateControl?: boolean;
-        rotateControlOptions?: RotateControlOptions;
-        scaleControl?: boolean;
-        scaleControlOptions?: ScaleControlOptions;
-        scrollwheel?: boolean;
-        streetView?: StreetViewPanorama;
-        streetViewControl?: boolean;
-        streetViewControlOptions?: StreetViewControlOptions;
-        styles?: MapTypeStyle[];
-        tilt?: number;
-        zoom?: number;
-        zoomControl?: boolean;
-        zoomControlOptions?: ZoomControlOptions;
-    }
-
-    export enum MapTypeId {
-        HYBRID,
-        ROADMAP,
-        SATELLITE,
-        TERRAIN
-    }
-
-    /***** Controls *****/
-    export interface MapTypeControlOptions {
-        mapTypeIds?: (MapTypeId|string)[];
-        position?: ControlPosition;
-        style?: MapTypeControlStyle;
-    }
-
-    export enum MapTypeControlStyle {
-        DEFAULT,
-        DROPDOWN_MENU,
-        HORIZONTAL_BAR
-    }
-
-    export interface OverviewMapControlOptions {
-        opened?: boolean;
-    }
-
-    export interface PanControlOptions {
-        position?: ControlPosition;
-    }
-
-    export interface RotateControlOptions {
-        position?: ControlPosition;
-    }
-
-    export interface ScaleControlOptions {
-        style?: ScaleControlStyle;
-    }
-
-    export enum ScaleControlStyle {
-        DEFAULT
-    }
-
-    export interface StreetViewControlOptions {
-        position?: ControlPosition;
-    }
-
-    export interface ZoomControlOptions {
-        position?: ControlPosition;
-        style?: ZoomControlStyle;
-    }
-
-    export enum ZoomControlStyle {
-        DEFAULT,
-        LARGE,
-        SMALL
-    }
-
-    export enum ControlPosition {
-        BOTTOM_CENTER,
-        BOTTOM_LEFT,
-        BOTTOM_RIGHT,
-        LEFT_BOTTOM,
-        LEFT_CENTER,
-        LEFT_TOP,
-        RIGHT_BOTTOM,
-        RIGHT_CENTER,
-        RIGHT_TOP,
-        TOP_CENTER,
-        TOP_LEFT,
-        TOP_RIGHT
-    }
-
-    /***** Data *****/
-    export class Data extends MVCObject {
-        constructor(options?: Data.DataOptions);
-        add(feature: Data.Feature|Data.FeatureOptions): Data.Feature;
-        addGeoJson(geoJson: Object, options?: Data.GeoJsonOptions): Data.Feature[];
-        contains(feature: Data.Feature): boolean;
-        forEach(callback: (feature: Data.Feature) => void): void;
-        getControlPosition(): ControlPosition;
-        getControls(): string[];
-        getDrawingMode(): string;
-        getFeatureById(id: number|string): Data.Feature;
-        getMap(): Map;
-        getStyle(): Data.StylingFunction|Data.StyleOptions;
-        loadGeoJson(url: string, options?: Data.GeoJsonOptions, callback?: (features: Data.Feature[]) => void): void;
-        overrideStyle(feature: Data.Feature, style: Data.StyleOptions): void;
-        remove(feature: Data.Feature): void;
-        revertStyle(feature?: Data.Feature): void;
-        setControlPosition(controlPosition: ControlPosition): void;
-        setControls(controls: string[]): void;
-        setDrawingMode(drawingMode: string): void;
-        setMap(map: Map): void;
-        setStyle(style: Data.StylingFunction|Data.StyleOptions): void;
-        toGeoJson(callback: (feature: Object) => void): void;
-    }
-
-    export module Data {
-        export interface DataOptions {
-            controlPosition?: ControlPosition;
-            controls?: string[];
-            drawingMode?: string;
-            featureFactory?: (geometry: Data.Geometry) => Data.Feature;
-            map?: Map;
-            style?: Data.StylingFunction|Data.StyleOptions;
-        }
-
-        export interface GeoJsonOptions {
-            idPropertyName?: string;
-        }
-
-        export interface StyleOptions {
-            clickable?: boolean;
-            cursor?: string;
-            draggable?: boolean;
-            editable?: boolean;
-            fillColor?: string;
-            fillOpacity?: number;
-            icon?: string|Icon|Symbol;
-            shape?: MarkerShape;
-            strokeColor?: string;
-            strokeOpacity?: number;
-            strokeWeight?: number;
-            title?: string;
-            visible?: boolean;
-            zIndex?: number;
-        }
-
-        export type StylingFunction = (feature: Data.Feature) => Data.StyleOptions;
-
-        export class Feature {
-            constructor(options?: Data.FeatureOptions);
-            forEachProperty(callback: (value: any, name: string) => void): void;
-            getGeometry(): Data.Geometry;
-            getId(): number|string;
-            getProperty(name: string): any;
-            removeProperty(name: string): void;
-            setGeometry(newGeometry: Data.Geometry|LatLng|LatLngLiteral): void;
-            setProperty(name: string, newValue: any): void;
-            toGeoJson(callback: (feature: Object) => void): void;
-        }
-
-        export interface FeatureOptions {
-            geometry?: Data.Geometry|LatLng|LatLngLiteral;
-            id?: number|string;
-            properties?: Object;
-        }
-
-        export class Geometry {
-            getType(): string;
-        }
-
-        export class Point extends Data.Geometry {
-            constructor(latLng: LatLng|LatLngLiteral);
-            get(): LatLng;
-        }
-
-        export class MultiPoint extends Data.Geometry {
-            constructor(elements: (LatLng|LatLngLiteral)[]);
-            getArray(): LatLng[];
-            getAt(n: number): LatLng;
-            getLength(): number;
-        }
-
-        export class LineString extends Data.Geometry {
-            constructor(elements: (LatLng|LatLngLiteral)[]);
-            getArray(): LatLng[];
-            getAt(n: number): LatLng;
-            getLength(): number;
-        }
-
-        export class MultiLineString extends Data.Geometry {
-            constructor(elements: (Data.LineString|(LatLng|LatLngLiteral)[])[]);
-            getArray(): Data.LineString[];
-            getAt(n: number): Data.LineString;
-            getLength(): number;
-        }
-
-        export class LinearRing extends Data.Geometry {
-            constructor(elements: (LatLng|LatLngLiteral)[]);
-            getArray(): LatLng[];
-            getAt(n: number): LatLng;
-            getLength(): number;
-        }
-
-        export class Polygon extends Data.Geometry {
-            constructor(elements: (Data.LinearRing|(LatLng|LatLngLiteral)[])[]);
-            getArray(): Data.LinearRing[];
-            getAt(n: number): Data.LinearRing;
-            getLength(): number;
-        }
-
-        export class MultiPolygon extends Data.Geometry {
-            constructor(elements: (Data.Polygon|(LinearRing|(LatLng|LatLngLiteral)[])[])[]);
-            getArray(): Data.Polygon[];
-            getAt(n: number): Data.Polygon;
-            getLength(): number;
-        }
-
-        export class GeometryCollection extends Data.Geometry {
-            constructor(elements: (Data.Geometry[]|LatLng[]|LatLngLiteral)[]);
-            getArray(): Data.Geometry[];
-            getAt(n: number): Data.Geometry;
-            getLength(): number;
-        }
-
-        export interface MouseEvent extends google.maps.MouseEvent {
-            feature: Data.Feature;
-        }
-
-        export interface AddFeatureEvent {
-            feature: Data.Feature;
-        }
-
-        export interface RemoveFeatureEvent {
-            feature: Data.Feature;
-        }
-
-        export interface SetGeometryEvent  {
-            feature: Data.Feature;
-            newGeometry: Data.Geometry;
-            oldGeometry: Data.Geometry;
-        }
-
-        export interface SetPropertyEvent  {
-            feature: Data.Feature;
-            name: string;
-            newValue: any;
-            oldValue: any;
-        }
-
-        export interface RemovePropertyEvent  {
-            feature: Data.Feature;
-            name: string;
-            oldValue: any;
-        }
-    }
-
-    /***** Overlays *****/
-    export class Marker extends MVCObject {
-        static MAX_ZINDEX: number;
-        constructor(opts?: MarkerOptions);
-        getAnimation(): Animation;
-        getAttribution(): Attribution;
-        getClickable(): boolean;
-        getCursor(): string;
-        getDraggable(): boolean;
-        getIcon(): string|Icon|Symbol;
-        getMap(): Map|StreetViewPanorama;
-        getOpacity(): number;
-        getPlace(): Place;
-        getPosition(): LatLng;
-        getShape(): MarkerShape;
-        getTitle(): string;
-        getVisible(): boolean;
-        getZIndex(): number;
-        setAnimation(animation: Animation): void;
-        setAttribution(attribution: Attribution): void;
-        setClickable(flag: boolean): void;
-        setCursor(cursor: string): void;
-        setDraggable(flag: boolean): void;
-        setIcon(icon: string|Icon|Symbol): void;
-        setMap(map: Map|StreetViewPanorama): void;
-        setOpacity(opacity: number): void;
-        setOptions(options: MarkerOptions): void;
-        setPlace(place: Place): void;
-        setPosition(latlng: LatLng|LatLngLiteral): void;
-        setShape(shape: MarkerShape): void;
-        setTitle(title: string): void;
-        setVisible(visible: boolean): void;
-        setZIndex(zIndex: number): void;
-    }
-
-    export interface MarkerOptions {
-        /**
-         * The offset from the marker's position to the tip of an InfoWindow
-         * that has been opened with the marker as anchor.
-         */
-        anchorPoint?: Point;
-        /** Which animation to play when marker is added to a map. */
-        animation?: Animation;
-        /**
-         * If true, the marker receives mouse and touch events.
-         * @default true
-         */
-        clickable?: boolean;
-        /** Mouse cursor to show on hover. */
-        cursor?: string;
-        /**
-         * If true, the marker can be dragged.
-         * @default false
-         */
-        draggable?: boolean;
-       /**
-         * Icon for the foreground.
-         * If a string is provided, it is treated as though it were an Icon with the string as url.
-         * @type {(string|Icon|Symbol)}
-         */
-        icon?: string|Icon|Symbol;
-        /**
-         * Map on which to display Marker.
-         * @type {(Map|StreetViewPanorama)}
-         *
-         */
-        map?: Map|StreetViewPanorama;
-        /** The marker's opacity between 0.0 and 1.0. */
-        opacity?: number;
-        /**
-         * Optimization renders many markers as a single static element.
-         * Optimized rendering is enabled by default.
-         * Disable optimized rendering for animated GIFs or PNGs, or when each
-         * marker must be rendered as a separate DOM element (advanced usage
-         * only).
-         */
-        optimized?: boolean;
-        /**
-         * Place information, used to identify and describe the place
-         * associated with this Marker. In this context, 'place' means a
-         * business, point of interest or geographic location. To allow a user
-         * to save this place, open an info window anchored on this marker.
-         * The info window will contain information about the place and an
-         * option for the user to save it. Only one of position or place can
-         * be specified.
-         */
-        place?: Place;
-        /**
-         * Marker position. Required.
-         */
-        position: LatLng;
-        /** Image map region definition used for drag/click. */
-        shape?: MarkerShape;
-        /** Rollover text. */
-        title?: string;
-        /** If true, the marker is visible. */
-        visible?: boolean;
-        /**
-         * All markers are displayed on the map in order of their zIndex,
-         * with higher values displaying in front of markers with lower values.
-         * By default, markers are displayed according to their vertical position on screen,
-         * with lower markers appearing in front of markers further up the screen.
-         */
-        zIndex?: number;
-    }
-
-    export interface Icon {
-        /**
-         * The position at which to anchor an image in correspondence to the
-         * location of the marker on the map. By default, the anchor is
-         * located along the center point of the bottom of the image.
-         */
-        anchor?: Point;
-        /**
-         * The origin of the label relative to the top-left corner of the icon
-         * image, if a label is supplied by the marker. By default, the origin
-         * is located in the center point of the image.
-         */
-        labelOrigin?: Point;
-        /**
-         * The position of the image within a sprite, if any. By default, the
-         * origin is located at the top left corner of the image (0, 0).
-         */
-        origin?: Point;
-        /**
-         * The size of the entire image after scaling, if any. Use this
-         * property to stretch/ shrink an image or a sprite.
-         */
-        scaledSize?: Size;
-        /**
-         * The display size of the sprite or image. When using sprites, you
-         * must specify the sprite size. If the size is not provided, it will
-         * be set when the image loads.
-         */
-        size?: Size;
-        /** The URL of the image or sprite sheet. */
-        url?: string;
-    }
-
-    export interface MarkerShape {
-        coords?: number[];
-        type?: string;
-    }
-
-    export interface Symbol {
-        /**
-         * The position of the symbol relative to the marker or polyline.
-         * The coordinates of the symbol's path are translated left and up by the anchor's x and y coordinates respectively.
-         * By default, a symbol is anchored at (0, 0).
-         * The position is expressed in the same coordinate system as the symbol's path.
-         */
-        anchor?: Point;
-        /**
-         * The symbol's fill color.
-         * All CSS3 colors are supported except for extended named colors. For symbol markers, this defaults to 'black'.
-         * For symbols on polylines, this defaults to the stroke color of the corresponding polyline.
-         */
-        fillColor?: string;
-        /**
-         * The symbol's fill opacity.
-         * @default 0
-         */
-        fillOpacity?: number;
-        /**
-         * The symbol's path, which is a built-in symbol path, or a custom path expressed using SVG path notation. Required.
-         * @type {(SymbolPath|string)}
-         */
-        path?: SymbolPath|string;
-        /**
-         * The angle by which to rotate the symbol, expressed clockwise in degrees.
-         * Defaults to 0.
-         * A symbol in an IconSequence where fixedRotation is false is rotated relative to the angle of the edge on which it lies.
-         */
-        rotation?: number;
-        /**
-         * The amount by which the symbol is scaled in size.
-         * For symbol markers, this defaults to 1; after scaling, the symbol may be of any size.
-         * For symbols on a polyline, this defaults to the stroke weight of the polyline;
-         * after scaling, the symbol must lie inside a square 22 pixels in size centered at the symbol's anchor.
-         */
-        scale?: number;
-        /**
-         * The symbol's stroke color. All CSS3 colors are supported except for extended named colors.
-         * For symbol markers, this defaults to 'black'.
-         * For symbols on a polyline, this defaults to the stroke color of the polyline.
-         */
-        strokeColor?: string;
-        /**
-         * The symbol's stroke opacity. For symbol markers, this defaults to 1.
-         * For symbols on a polyline, this defaults to the stroke opacity of the polyline.
-         */
-        strokeOpacity?: number;
-        /** The symbol's stroke weight. Defaults to the scale of the symbol.v*/
-        strokeWeight?: number;
-    }
-
-    /** Built-in symbol paths. */
-    export enum SymbolPath {
-        /** A backward-pointing closed arrow. */
-        BACKWARD_CLOSED_ARROW,
-        /** A backward-pointing open arrow. */
-        BACKWARD_OPEN_ARROW,
-        /** A circle. */
-        CIRCLE,
-        /** A forward-pointing closed arrow. */
-        FORWARD_CLOSED_ARROW,
-        /** A forward-pointing open arrow. */
-        FORWARD_OPEN_ARROW
-    }
-
-    export enum Animation {
-        BOUNCE,
-        DROP
-    }
-
-    /**
-     * An overlay that looks like a bubble and is often connected to a marker.
-     * This class extends MVCObject.
-     */
-    export class InfoWindow extends MVCObject {
-        /**
-         * Creates an info window with the given options. An InfoWindow can be
-         * placed on a map at a particular position or above a marker,
-         * depending on what is specified in the options. Unless auto-pan is
-         * disabled, an InfoWindow will pan the map to make itself visible
-         * when it is opened. After constructing an InfoWindow, you must call
-         * open to display it on the map. The user can click the close button
-         * on the InfoWindow to remove it from the map, or the developer can
-         * call close() for the same effect.
-         */
-        constructor(opts?: InfoWindowOptions);
-        /** Closes this InfoWindow by removing it from the DOM structure. */
-        close(): void;
-        getContent(): string|Element;
-        getPosition(): LatLng;
-        getZIndex(): number;
-        /**
-         * Opens this InfoWindow on the given map. Optionally, an InfoWindow can be associated with an anchor.
-         * In the core API, the only anchor is the Marker class.
-         * However, an anchor can be any MVCObject that exposes a LatLng position property and optionally
-         * a Point anchorPoint property for calculating the pixelOffset (see InfoWindowOptions).
-         * The anchorPoint is the offset from the anchor's position to the tip of the InfoWindow.
-         */
-        open(map?: Map|StreetViewPanorama, anchor?: MVCObject): void;
-        setContent(content: string|Node): void;
-        setOptions(options: InfoWindowOptions): void;
-        setPosition(position: LatLng): void;
-        setZIndex(zIndex: number): void;
-    }
-
-    export interface InfoWindowOptions {
-        /**
-         * Content to display in the InfoWindow. This can be an HTML element, a plain-text string, or a string containing HTML.
-         * The InfoWindow will be sized according to the content.
-         * To set an explicit size for the content, set content to be a HTML element with that size.
-         * @type {(string|Node)}
-         */
-        content?: string|Node;
-        /**
-         * Disable auto-pan on open. By default, the info window will pan the map so that it is fully visible when it opens.
-         */
-        disableAutoPan?: boolean;
-        /**
-         * Maximum width of the infowindow, regardless of content's width.
-         * This value is only considered if it is set before a call to open.
-         * To change the maximum width when changing content, call close, setOptions, and then open.
-         */
-        maxWidth?: number;
-        /**
-         * The offset, in pixels, of the tip of the info window from the point on the map
-         * at whose geographical coordinates the info window is anchored.
-         * If an InfoWindow is opened with an anchor, the pixelOffset will be calculated from the anchor's anchorPoint property.
-         */
-        pixelOffset?: Size;
-        /**
-         * The LatLng at which to display this InfoWindow. If the InfoWindow is opened with an anchor, the anchor's position will be used instead.
-         */
-        position?: LatLng|LatLngLiteral;
-        /**
-         * All InfoWindows are displayed on the map in order of their zIndex,
-         * with higher values displaying in front of InfoWindows with lower values.
-         * By default, InfoWindows are displayed according to their latitude,
-         * with InfoWindows of lower latitudes appearing in front of InfoWindows at higher latitudes.
-         * InfoWindows are always displayed in front of markers.
-         */
-        zIndex?: number;
-    }
-
-    export class Polyline extends MVCObject {
-        constructor(opts?: PolylineOptions);
-        getDraggable(): boolean;
-        getEditable(): boolean;
-        getMap(): Map;
-        getPath(): MVCArray; // MVCArray<LatLng>
-        getVisible(): boolean;
-        setDraggable(draggable: boolean): void;
-        setEditable(editable: boolean): void;
-        setMap(map: Map): void;
-        setOptions(options: PolylineOptions): void;
-        setPath(path: MVCArray|LatLng[]|LatLngLiteral[]): void; // MVCArray<LatLng>|Array<LatLng|LatLngLiteral>
-        setVisible(visible: boolean): void;
-    }
-
-    export interface PolylineOptions {
-        clickable?: boolean;
-        draggable?: boolean;
-        editable?: boolean;
-        geodesic?: boolean;
-        icons?: IconSequence[];
-        map?: Map;
-        path?: MVCArray|LatLng[]|LatLngLiteral[]; // MVCArray<LatLng>|Array<LatLng|LatLngLiteral>
-        strokeColor?: string;
-        strokeOpacity?: number;
-        strokeWeight?: number;
-        visible?: boolean;
-        zIndex?: number;
-    }
-
-    export interface IconSequence {
-        fixedRotation?: boolean;
-        icon?: Symbol;
-        offset?: string;
-        repeat?: string;
-    }
-
-    export class Polygon extends MVCObject {
-        constructor(opts?: PolygonOptions);
-        getDraggable(): boolean;
-        getEditable(): boolean;
-        getMap(): Map;
-        getPath(): MVCArray; // MVCArray<LatLng>
-        getPaths(): MVCArray; // MVCArray<MVCArray<LatLng>>
-        getVisible(): boolean;
-        setDraggable(draggable: boolean): void;
-        setEditable(editable: boolean): void;
-        setMap(map: Map): void;
-        setOptions(options: PolygonOptions): void;
-        setPath(path: MVCArray|LatLng[]|LatLngLiteral[]): void;
-        setPaths(paths: MVCArray): void;
-        setPaths(paths: MVCArray[]): void;
-        setPaths(path: LatLng[]): void;
-        setPaths(path: LatLng[][]): void;
-        setPaths(path: LatLngLiteral[]): void;
-        setPaths(path: LatLngLiteral[][]): void;
-        setVisible(visible: boolean): void;
-    }
-
-    export interface PolygonOptions {
-        /** Indicates whether this Polygon handles mouse events. Defaults to true. */
-        clickable?: boolean;
-        /**
-         * If set to true, the user can drag this shape over the map.
-         * The geodesic property defines the mode of dragging. Defaults to false.
-         */
-        draggable?: boolean;
-        /**
-         * If set to true, the user can edit this shape by dragging the control points
-         * shown at the vertices and on each segment. Defaults to false.
-         */
-        editable?: boolean;
-        /** The fill color. All CSS3 colors are supported except for extended named colors. */
-        fillColor?: string;
-        /** The fill opacity between 0.0 and 1.0 */
-        fillOpacity?: number;
-        /**
-         * When true, edges of the polygon are interpreted as geodesic and will follow
-         * the curvature of the Earth. When false, edges of the polygon are rendered as
-         * straight lines in screen space. Note that the shape of a geodesic polygon may
-         * appear to change when dragged, as the dimensions are maintained relative to
-         * the surface of the earth. Defaults to false.
-         */
-        geodesic?: boolean;
-        /** Map on which to display Polygon. */
-        map?: Map;
-        /**
-         * The ordered sequence of coordinates that designates a closed loop. Unlike
-         * polylines, a polygon may consist of one or more paths. As a result, the paths
-         * property may specify one or more arrays of LatLng coordinates. Paths are
-         * closed automatically; do not repeat the first vertex of the path as the last
-         * vertex. Simple polygons may be defined using a single array of LatLngs. More
-         * complex polygons may specify an array of arrays. Any simple arrays are
-         * converted into MVCArrays. Inserting or removing LatLngs from the MVCArray
-         * will automatically update the polygon on the map.
-         */
-        paths?: any[]; // MVCArray<MVCArray<LatLng>>|MVCArray<LatLng>|Array<Array<LatLng|LatLngLiteral>>|Array<LatLng|LatLngLiteral>
-        /**
-         * The stroke color.
-         * All CSS3 colors are supported except for extended named colors.
-         */
-        strokeColor?: string;
-        /** The stroke opacity between 0.0 and 1.0 */
-        strokeOpacity?: number;
-        /**
-         * The stroke position. Defaults to CENTER.
-         * This property is not supported on Internet Explorer 8 and earlier.
-         */
-        strokePosition?: StrokePosition;
-        /** The stroke width in pixels. */
-        strokeWeight?: number;
-        /** Whether this polygon is visible on the map. Defaults to true. */
-        visible?: boolean;
-        /** The zIndex compared to other polys. */
-        zIndex?: number;
-    }
-
-    export interface PolyMouseEvent {
-        edge?: number;
-        path?: number;
-        vertex?: number;
-    }
-
-    export class Rectangle extends MVCObject {
-        constructor(opts?: RectangleOptions);
-        getBounds(): LatLngBounds;
-        getDraggable(): boolean;
-        getEditable(): boolean;
-        getMap(): Map;
-        getVisible(): boolean;
-        setBounds(bounds: LatLngBounds): void;
-        setDraggable(draggable: boolean): void;
-        setEditable(editable: boolean): void;
-        setMap(map: Map): void;
-        setOptions(options: RectangleOptions): void;
-        setVisible(visible: boolean): void;
-    }
-
-    export interface RectangleOptions {
-        bounds?: LatLngBounds;
-        clickable?: boolean;
-        draggable?: boolean;
-        editable?: boolean;
-        fillColor?: string;
-        fillOpacity?: number;
-        map?: Map;
-        strokeColor?: string;
-        strokeOpacity?: number;
-        strokePosition?: StrokePosition;
-        strokeWeight?: number;
-        visible?: boolean;
-        zIndex?: number;
-    }
-
-    export class Circle extends MVCObject {
-        constructor(opts?: CircleOptions);
-        getBounds(): LatLngBounds;
-        getCenter(): LatLng;
-        getDraggable(): boolean;
-        getEditable(): boolean;
-        getMap(): Map;
-        getRadius(): number;
-        getVisible(): boolean;
-        setCenter(center: LatLng|LatLngLiteral): void;
-        setDraggable(draggable: boolean): void;
-        setEditable(editable: boolean): void;
-        setMap(map: Map): void;
-        setOptions(options: CircleOptions): void;
-        setRadius(radius: number): void;
-        setVisible(visible: boolean): void;
-    }
-
-    export interface CircleOptions {
-        center?: LatLng;
-        clickable?: boolean;
-        draggable?: boolean;
-        editable?: boolean;
-        fillColor?: string;
-        fillOpacity?: number;
-        map?: Map;
-        radius?: number;
-        strokeColor?: string;
-        strokeOpacity?: number;
-        strokePosition?: StrokePosition;
-        strokeWeight?: number;
-        visible?: boolean;
-        zIndex?: number;
-    }
-
-    /**
-     * The possible positions of the stroke on a polygon.
-     */
-    export enum StrokePosition {
-        /**
-         * The stroke is centered on the polygon's path, with half the stroke inside
-         * the polygon and half the stroke outside the polygon.
-         */
-        CENTER,
-        /** The stroke lies inside the polygon. */
-        INSIDE,
-        /** The stroke lies outside the polygon. */
-        OUTSIDE
-    }
-
-    export class GroundOverlay extends MVCObject {
-        constructor(url: string, bounds: LatLngBounds, opts?: GroundOverlayOptions);
-        getBounds(): LatLngBounds;
-        getMap(): Map;
-        getOpacity(): number;
-        getUrl(): string;
-        setMap(map: Map): void;
-        setOpacity(opacity: number): void;
-    }
-
-    export interface GroundOverlayOptions {
-        clickable?: boolean;
-        map?: Map;
-        opacity?: number;
-    }
-
-    export class OverlayView extends MVCObject {
-        draw(): void;
-        getMap(): Map|StreetViewPanorama;
-        getPanes(): MapPanes;
-        getProjection(): MapCanvasProjection;
-        onAdd(): void;
-        onRemove(): void;
-        setMap(map: Map|StreetViewPanorama): void;
-    }
-
-    export interface MapPanes {
-        floatPane: Element;
-        mapPane: Element;
-        markerLayer: Element;
-        overlayLayer: Element;
-        overlayMouseTarget: Element;
-    }
-
-    export class MapCanvasProjection extends MVCObject {
-        fromContainerPixelToLatLng(pixel: Point, nowrap?: boolean): LatLng;
-        fromDivPixelToLatLng(pixel: Point, nowrap?: boolean): LatLng;
-        fromLatLngToContainerPixel(latLng: LatLng): Point;
-        fromLatLngToDivPixel(latLng: LatLng): Point;
-        getWorldWidth(): number;
-    }
-
-    /***** Services *****/
-    export class Geocoder {
-        geocode(request: GeocoderRequest, callback: (results: GeocoderResult[], status: GeocoderStatus) => void ): void;
-    }
-
-    export interface GeocoderRequest {
-        address?: string;
-        bounds?: LatLngBounds;
-        componentRestrictions?: GeocoderComponentRestrictions;
-        location?: LatLng|LatLngLiteral;
-        placeId?: string;
-        region?: string;
-    }
-
-    export interface GeocoderComponentRestrictions {
-        administrativeArea?: string;
-        country?: string;
-        locality?: string;
-        postalCode?: string;
-        route?: string;
-    }
-
-    export enum GeocoderStatus {
-        ERROR,
-        INVALID_REQUEST,
-        OK,
-        OVER_QUERY_LIMIT,
-        REQUEST_DENIED,
-        UNKNOWN_ERROR,
-        ZERO_RESULTS
-    }
-
-    export interface GeocoderResult {
-        address_components: GeocoderAddressComponent[];
-        formatted_address: string;
-        geometry: GeocoderGeometry;
-        partial_match: boolean;
-        postcode_localities: string[];
-        types: string[];
-    }
-
-    export interface GeocoderAddressComponent {
-        long_name: string;
-        short_name: string;
-        types: string[];
-    }
-
-    export interface GeocoderGeometry {
-        bounds: LatLngBounds;
-        location: LatLng;
-        location_type: GeocoderLocationType;
-        viewport: LatLngBounds;
-    }
-
-    export enum GeocoderLocationType {
-        APPROXIMATE,
-        GEOMETRIC_CENTER,
-        RANGE_INTERPOLATED,
-        ROOFTOP
-    }
-
-    export class DirectionsRenderer extends MVCObject {
-        constructor(opts?: DirectionsRendererOptions);
-        getDirections(): DirectionsResult;
-        getMap(): Map;
-        getPanel(): Element;
-        getRouteIndex(): number;
-        setDirections(directions: DirectionsResult): void;
-        setMap(map: Map): void;
-        setOptions(options: DirectionsRendererOptions): void;
-        setPanel(panel: Element): void;
-        setRouteIndex(routeIndex: number): void;
-    }
-
-    export interface DirectionsRendererOptions {
-        directions?: DirectionsResult;
-        draggable?: boolean;
-        hideRouteList?: boolean;
-        infoWindow?: InfoWindow;
-        map?: Map;
-        markerOptions?: MarkerOptions;
-        panel?: Element;
-        polylineOptions?: PolylineOptions;
-        preserveViewport?: boolean;
-        routeIndex?: number;
-        suppressBicyclingLayer?: boolean;
-        suppressInfoWindows?: boolean;
-        suppressMarkers?: boolean;
-        suppressPolylines?: boolean;
-    }
-
-    export class DirectionsService {
-        route(request: DirectionsRequest, callback: (result: DirectionsResult, status: DirectionsStatus) => void ): void;
-    }
-
-    export interface DirectionsRequest {
-        avoidFerries?: boolean;
-        avoidHighways?: boolean;
-        avoidTolls?: boolean;
-        destination?: LatLng|LatLngLiteral|string;
-        durationInTraffic?: boolean;
-        optimizeWaypoints?: boolean;
-        origin?: LatLng|LatLngLiteral|string;
-        provideRouteAlternatives?: boolean;
-        region?: string;
-        transitOptions?: TransitOptions;
-        travelMode?: TravelMode;
-        unitSystem?: UnitSystem;
-        waypoints?: DirectionsWaypoint[];
-    }
-
-    export enum TravelMode {
-        BICYCLING,
-        DRIVING,
-        TRANSIT,
-        WALKING
-    }
-
-    export enum UnitSystem {
-        IMPERIAL,
-        METRIC
-    }
-
-    export interface TransitOptions {
-        arrivalTime?: Date;
-        departureTime?: Date;
-        modes: TransitMode[];
-        routingPreference: TransitRoutePreference;
-    }
-
-    export enum TransitMode {
-        BUS,
-        RAIL,
-        SUBWAY,
-        TRAIN,
-        TRAM
-    }
-
-    export enum TransitRoutePreference
-    {
-        FEWER_TRANSFERS,
-        LESS_WALKING
-    }
-
-    export interface TransitFare { }
-
-    export interface DirectionsWaypoint {
-        location: LatLng|LatLngLiteral|string;
-        stopover: boolean;
-    }
-
-    export enum DirectionsStatus {
-        INVALID_REQUEST,
-        MAX_WAYPOINTS_EXCEEDED,
-        NOT_FOUND,
-        OK,
-        OVER_QUERY_LIMIT,
-        REQUEST_DENIED,
-        UNKNOWN_ERROR,
-        ZERO_RESULTS
-    }
-
-    export interface DirectionsResult {
-        routes: DirectionsRoute[];
-    }
-
-    export interface DirectionsRoute {
-        bounds: LatLngBounds;
-        copyrights: string;
-        fare: TransitFare;
-        legs: DirectionsLeg[];
-        overview_path: LatLng[];
-        overview_polyline: string;
-        warnings: string[];
-        waypoint_order: number[];
-    }
-
-    export interface DirectionsLeg {
-        arrival_time: Time;
-        departure_time: Time;
-        distance: Distance;
-        duration: Duration;
-        duration_in_traffic: Duration;
-        end_address: string;
-        end_location: LatLng;
-        start_address: string;
-        start_location: LatLng;
-        steps: DirectionsStep[];
-        via_waypoints: LatLng[];
-    }
-
-    export interface DirectionsStep {
-        distance: Distance;
-        duration: Duration;
-        end_location: LatLng;
-        instructions: string;
-        path: LatLng[];
-        start_location: LatLng;
-        steps: DirectionsStep;
-        transit: TransitDetails;
-        travel_mode: TravelMode;
-    }
-
-    export interface Distance {
-        text: string;
-        value: number;
-    }
-
-    export interface Duration {
-        text: string;
-        value: number;
-    }
-
-    export interface Time {
-        text: string;
-        time_zone: string;
-        value: Date;
-    }
-
-    export interface TransitDetails {
-        arrival_stop: TransitStop;
-        arrival_time: Time;
-        departure_stop: TransitStop;
-        departure_time: Time;
-        headsign: string;
-        headway: number;
-        line: TransitLine;
-        num_stops: number;
-    }
-
-    export interface TransitStop {
-        location: LatLng;
-        name: string;
-    }
-
-    export interface TransitLine {
-        agencies: TransitAgency[];
-        color: string;
-        icon: string;
-        name: string;
-        short_name: string;
-        text_color: string;
-        url: string;
-        vehicle: TransitVehicle;
-    }
-
-    export interface TransitAgency {
-        name: string;
-        phone: string;
-        url: string;
-    }
-
-    export interface TransitVehicle {
-        icon: string;
-        local_icon: string;
-        name: string;
-        type: VehicleType;
-    }
-
-    export enum VehicleType
-    {
-        BUS,
-        CABLE_CAR,
-        COMMUTER_TRAIN,
-        FERRY,
-        FUNICULAR,
-        GONDOLA_LIFT,
-        HEAVY_RAIL,
-        HIGH_SPEED_TRAIN,
-        INTERCITY_BUS,
-        METRO_RAIL,
-        MONORAIL,
-        OTHER,
-        RAIL,
-        SHARE_TAXI,
-        SUBWAY,
-        TRAM,
-        TROLLEYBUS
-    }
-
-    export class ElevationService {
-        getElevationAlongPath(request: PathElevationRequest, callback: (results: ElevationResult[], status: ElevationStatus) => void ): void;
-        getElevationForLocations(request: LocationElevationRequest, callback: (results: ElevationResult[], status: ElevationStatus) => void ): void;
-    }
-
-    export interface LocationElevationRequest {
-        locations: LatLng[];
-    }
-
-    export interface PathElevationRequest {
-        path?: LatLng[];
-        samples?: number;
-    }
-
-    export interface ElevationResult {
-        elevation: number;
-        location: LatLng;
-        resolution: number;
-    }
-
-    export enum ElevationStatus {
-        INVALID_REQUEST,
-        OK,
-        OVER_QUERY_LIMIT,
-        REQUEST_DENIED,
-        UNKNOWN_ERROR
-    }
-
-    export class MaxZoomService {
-        getMaxZoomAtLatLng(latlng: LatLng|LatLngLiteral, callback: (result: MaxZoomResult) => void ): void;
-    }
-
-    export interface MaxZoomResult {
-        status: MaxZoomStatus;
-        zoom: number;
-    }
-
-    export enum MaxZoomStatus {
-        ERROR,
-        OK
-    }
-
-    export class DistanceMatrixService {
-        getDistanceMatrix(request: DistanceMatrixRequest, callback: (response: DistanceMatrixResponse, status: DistanceMatrixStatus) => void ): void;
-    }
-
-    export interface DistanceMatrixRequest {
-        avoidFerries?: boolean;
-        avoidHighways?: boolean;
-        avoidTolls?: boolean;
-        destinations?: LatLng[]|string[];
-        durationInTraffic?: boolean;
-        origins?: LatLng[]|string[];
-        region?: string;
-        transitOptions?: TransitOptions;
-        travelMode?: TravelMode;
-        unitSystem?: UnitSystem;
-    }
-
-    export interface DistanceMatrixResponse {
-        destinationAddresses: string[];
-        originAddresses: string[];
-        rows: DistanceMatrixResponseRow[];
-    }
-
-    export interface DistanceMatrixResponseRow {
-        elements: DistanceMatrixResponseElement[];
-    }
-
-    export interface DistanceMatrixResponseElement {
-        distance: Distance;
-        duration: Duration;
-        fare: TransitFare;
-        status: DistanceMatrixElementStatus;
-    }
-
-    export enum DistanceMatrixStatus {
-        INVALID_REQUEST,
-        MAX_DIMENSIONS_EXCEEDED,
-        MAX_ELEMENTS_EXCEEDED,
-        OK,
-        OVER_QUERY_LIMIT,
-        REQUEST_DENIED,
-        UNKNOWN_ERROR
-    }
-
-    export enum DistanceMatrixElementStatus {
-        NOT_FOUND,
-        OK,
-        ZERO_RESULTS
-    }
-
-    /***** Save to Google Maps *****/
-    export interface Attribution {
-        iosDeepLinkId?: string;
-        source?: string;
-        webUrl?: string;
-    }
-
-    export interface Place {
-        location?: LatLng|LatLngLiteral;
-        placeId?: string;
-        query?: string;
-    }
-
-    export class SaveWidget {
-        constructor(container: Node, opts?: SaveWidgetOptions);
-        getAttribution(): Attribution;
-        getPlace(): Place;
-        setAttribution(attribution: Attribution): void;
-        setOptions(opts: SaveWidgetOptions): void;
-        setPlace(place: Place): void;
-    }
-
-    export interface SaveWidgetOptions{
-        attribution?: Attribution;
-        place?: Place;
-    }
-
-    /***** Map Types *****/
-    export interface MapType {
-        getTile(tileCoord: Point, zoom: number, ownerDocument: Document): Element;
-        releaseTile(tile: Element): void;
-        alt?: string;
-        maxZoom?: number;
-        minZoom?: number;
-        name?: string;
-        projection?: Projection;
-        radius?: number;
-        tileSize?: Size;
-    }
-
-    export class MapTypeRegistry extends MVCObject {
-        constructor();
-        set(id: string, mapType: MapType): void;
-    }
-
-    export interface Projection {
-        fromLatLngToPoint(latLng: LatLng, point?: Point): Point;
-        fromPointToLatLng(pixel: Point, noWrap?: boolean): LatLng;
-    }
-
-    export class ImageMapType extends MVCObject implements MapType {
-        constructor(opts: ImageMapTypeOptions);
-        getOpacity(): number;
-        getTile(tileCoord: Point, zoom: number, ownerDocument: Document): Element;
-        releaseTile(tile: Element): void;
-        setOpacity(opacity: number): void;
-    }
-
-    export interface ImageMapTypeOptions {
-        alt?: string;
-        getTileUrl(tileCoord: Point, zoom: number): string;
-        maxZoom?: number;
-        minZoom?: number;
-        name?: string;
-        opacity?: number;
-        tileSize?: Size;
-    }
-
-    export class StyledMapType extends MVCObject implements MapType {
-        constructor(styles: MapTypeStyle[], options?: StyledMapTypeOptions);
-        getTile(tileCoord: Point, zoom: number, ownerDocument: Document): Element;
-        releaseTile(tile: Element): void;
-    }
-
-    export interface StyledMapTypeOptions {
-        alt?: string;
-        maxZoom?: number;
-        minZoom?: number;
-        name?: string;
-    }
-
-    export interface MapTypeStyle {
-        elementType?: MapTypeStyleElementType;
-        featureType?: MapTypeStyleFeatureType;
-        stylers?: MapTypeStyler[];
-    }
-
-    export interface MapTypeStyleFeatureType {
-        administrative?: {
-            country?: string;
-            land_parcel?: string;
-            locality?: string;
-            neighborhood?: string;
-            province?: string;
-        };
-        all?: string;
-        landscape?: {
-            man_made?: string;
-            natural?: {
-              landcover?: string;
-              terrain?: string;
-            };
-        };
-        poi?: {
-            attraction?: string;
-            business?: string;
-            government?: string;
-            medical?: string;
-            park?: string;
-            place_of_worship?: string;
-            school?: string;
-            sports_complex?: string;
-        };
-        road?: {
-            arterial?: string;
-            highway?: {
-                controlled_access?: string;
-            };
-            local?: string;
-        };
-        transit?: {
-            line?: string;
-            station?: {
-                airport?: string;
-                bus?: string;
-                rail?: string;
-            };
-        };
-        water?: string;
-    }
-
-    export interface MapTypeStyleElementType {
-        all?: string;
-        geometry?: {
-            fill?: string;
-            stroke?: string;
-        };
-        labels?: {
-            icon?: string;
-            text?: {
-                fill?: string;
-                stroke?: string;
-            }
-        };
-    }
-
-    export interface MapTypeStyler {
-        color?: string;
-        gamma?: number;
-        hue?: string;
-        invert_lightness?: boolean;
-        lightness?: number;
-        saturation?: number;
-        visibility?: string;
-        weight?: number;
-    }
-
-    /***** Layers *****/
-    export class BicyclingLayer extends MVCObject {
-        constructor();
-        getMap(): Map;
-        setMap(map: Map): void;
-    }
-
-    export class FusionTablesLayer extends MVCObject {
-        constructor(options: FusionTablesLayerOptions);
-        getMap(): Map;
-        setMap(map: Map): void;
-        setOptions(options: FusionTablesLayerOptions): void;
-    }
-
-    export interface FusionTablesLayerOptions {
-        clickable?: boolean;
-        heatmap?: FusionTablesHeatmap;
-        map?: Map;
-        query?: FusionTablesQuery;
-        styles?: FusionTablesStyle[];
-        suppressInfoWindows?: boolean;
-    }
-
-    export interface FusionTablesQuery {
-        from?: string;
-        limit?: number;
-        offset?: number;
-        orderBy?: string;
-        select?: string;
-        where?: string;
-    }
-
-    export  interface FusionTablesStyle {
-        markerOptions?: FusionTablesMarkerOptions;
-        polygonOptions?: FusionTablesPolygonOptions;
-        polylineOptions?: FusionTablesPolylineOptions;
-        where?: string;
-    }
-
-    export interface FusionTablesHeatmap {
-        enabled: boolean;
-    }
-
-    export interface FusionTablesMarkerOptions {
-        iconName: string;
-    }
-
-    export interface FusionTablesPolygonOptions {
-        fillColor?: string;
-        fillOpacity?: number;
-        strokeColor?: string;
-        strokeOpacity?: number;
-        strokeWeight?: number;
-    }
-
-    export interface FusionTablesPolylineOptions {
-        strokeColor?: string;
-        strokeOpacity?: number;
-        strokeWeight?: number;
-    }
-
-    export interface FusionTablesMouseEvent {
-        infoWindowHtml?: string;
-        latLng?: LatLng;
-        pixelOffset?: Size;
-        row?: Object; // Object<FusionTablesCell>
-    }
-
-    export interface FusionTablesCell {
-        columnName?: string;
-        value?: string;
-    }
-
-    export class KmlLayer extends MVCObject {
-        constructor(opts?: KmlLayerOptions);
-        getDefaultViewport(): LatLngBounds;
-        getMap(): Map;
-        getMetadata(): KmlLayerMetadata;
-        getStatus(): KmlLayerStatus;
-        getUrl(): string;
-        getZIndex(): number;
-        setMap(map: Map): void;
-        setUrl(url: string): void;
-        setZIndez(zIndex: number): void;
-    }
-
-    export interface KmlLayerOptions {
-        clickable?: boolean;
-        map?: Map;
-        preserveViewport?: boolean;
-        screenOverlays?: boolean;
-        suppressInfoWindows?: boolean;
-        url?: string;
-        zIndex?: number;
-    }
-
-    export interface KmlLayerMetadata {
-        author: KmlAuthor;
-        description: string;
-        hasScreenOverlays: boolean;
-        name: string;
-        snippet: string;
-    }
-
-    export enum KmlLayerStatus {
-        DOCUMENT_NOT_FOUND,
-        DOCUMENT_TOO_LARGE,
-        FETCH_ERROR,
-        INVALID_DOCUMENT,
-        INVALID_REQUEST,
-        LIMITS_EXCEEDED,
-        OK,
-        TIMED_OUT,
-        UNKNOWN
-    }
-
-    export interface KmlMouseEvent {
-        featureData: KmlFeatureData;
-        latLng: LatLng;
-        pixelOffset: Size;
-    }
-
-    export interface KmlFeatureData {
-        author: KmlAuthor;
-        description: string;
-        id: string;
-        infoWindowHtml: string;
-        name: string;
-        snippet: string;
-    }
-
-    export interface KmlAuthor {
-        email: string;
-        name: string;
-        uri: string;
-    }
-
-    export class TrafficLayer extends MVCObject {
-        constructor();
-        getMap(): void;
-        setMap(map: Map): void;
-    }
-
-    export class TransitLayer extends MVCObject {
-        constructor();
-        getMap(): void;
-        setMap(map: Map): void;
-    }
-
-    /***** Street View *****/
-    export class StreetViewPanorama {
-        constructor(container: Element, opts?: StreetViewPanoramaOptions);
-        controls: MVCArray[]; // Array<MVCArray<Node>>
-        getLinks(): StreetViewLink[];
-        getLocation():  StreetViewLocation;
-        getPano(): string;
-        getPhotographerPov(): StreetViewPov;
-        getPosition(): LatLng;
-        getPov(): StreetViewPov;
-        getStatus(): StreetViewStatus;
-        getVisible(): boolean;
-        getZoom(): number;
-        registerPanoProvider(provider: (input: string) => StreetViewPanoramaData): void;
-        setLinks(links: Array<StreetViewLink>): void;
-        setOptions(options: StreetViewPanoramaOptions): void;
-        setPano(pano: string): void;
-        setPosition(latLng: LatLng|LatLngLiteral): void;
-        setPov(pov: StreetViewPov): void;
-        setVisible(flag: boolean): void;
-        setZoom(zoom: number): void;
-    }
-
-    export interface StreetViewPanoramaOptions {
-        addressControl?: boolean;
-        addressControlOptions?: StreetViewAddressControlOptions;
-        clickToGo?: boolean;
-        disableDefaultUi?: boolean;
-        disableDoubleClickZoom?: boolean;
-        enableCloseButton?: boolean;
-        imageDateControl?: boolean;
-        linksControl?: boolean;
-        panControl?: boolean;
-        panControlOptions?: PanControlOptions;
-        pano?: string;
-        panoProvider?: (input: string) => StreetViewPanoramaData;
-        position?: LatLng|LatLngLiteral;
-        pov?: StreetViewPov;
-        scrollwheel?: boolean;
-        visible?: boolean;
-        zoomControl?: boolean;
-        zoomControlOptions?: ZoomControlOptions;
-    }
-
-    export interface StreetViewAddressControlOptions {
-        position?: ControlPosition;
-    }
-
-    export interface StreetViewLink {
-        description?: string;
-        heading?: number;
-        pano?: string;
-    }
-
-    export interface StreetViewPov {
-        heading?: number;
-        pitch?: number;
-    }
-
-    export interface StreetViewPanoramaData {
-        copyright?: string;
-        imageDate?: string;
-        links?: StreetViewLink[];
-        location?: StreetViewLocation;
-        tiles?: StreetViewTileData;
-    }
-
-    export interface StreetViewLocation {
-        description?: string;
-        latLng?: LatLng;
-        pano?: string;
-        shortDescription?: string;
-    }
-
-    export interface StreetViewTileData {
-        getTileUrl(pano: string, tileZoom: number, tileX: number, tileY: number): string;
-        centerHeading?: number;
-        tileSize?: Size;
-        worldSize?: Size;
-    }
-
-    export class StreetViewService {
-        getPanoramaById(pano: string, callback: (streetViewPanoramaData: StreetViewPanoramaData, streetViewStatus: StreetViewStatus) => void): void;
-        getPanoramaByLocation(latlng: LatLng|LatLngLiteral, radius: number, callback: (streetViewPanoramaData: StreetViewPanoramaData, streetViewStatus: StreetViewStatus) => void ): void;
-    }
-
-    export enum StreetViewStatus {
-        OK,
-        UNKNOWN_ERROR,
-        ZERO_RESULTS
-    }
-
-    export class StreetViewCoverageLayer extends MVCObject  {
-        getMap(): Map;
-        setMap(map: Map): void;
-    }
-
-    /***** Events *****/
-    export interface MapsEventListener {
-        /** Removes the listener.  Equivalent to calling google.maps.event.removeListener(listener). */
-        remove(): void;
-    }
-
-    export class event {
-        /**
-         * Cross browser event handler registration. This listener is removed by calling
-         * removeListener(handle) for the handle that is returned by this function.
-         */
-        static addDomListener(instance: Object, eventName: string, handler: Function, capture?: boolean): MapsEventListener;
-        /**
-         * Wrapper around addDomListener that removes the listener after the first event.
-         */
-        static addDomListenerOnce(instance: Object, eventName: string, handler: Function, capture?: boolean): MapsEventListener;
-        /**
-         * Adds the given listener function to the given event name for the given object
-         * instance. Returns an identifier for this listener that can be used with
-         * removeListener().
-         */
-        static addListener(instance: Object, eventName: string, handler: Function): MapsEventListener;
-        /**
-         * Like addListener, but the handler removes itself after handling the first event.
-         */
-        static addListenerOnce(instance: Object, eventName: string, handler: Function): MapsEventListener;
-        /**
-         * Removes all listeners for all events for the given instance.
-         */
-        static clearInstanceListeners(instance: Object): void;
-        /**
-         * Removes all listeners for the given event for the given instance.
-         */
-        static clearListeners(instance: Object, eventName: string): void;
-        /**
-         * Removes the given listener, which should have been returned by addListener above.
-         * Equivalent to calling listener.remove().
-         */
-        static removeListener(listener: MapsEventListener): void;
-        /**
-         * Triggers the given event. All arguments after eventName are passed as arguments to
-         * the listeners.
-         */
-        static trigger(instance: any, eventName: string, ...args: any[]): void;
-    }
-
-    export interface MouseEvent {
-        stop(): void;
-        latLng: LatLng;
-    }
-
-    /* **** Base **** */
-
-    /**
-     * A LatLng is a point in geographical coordinates: latitude and longitude.
-     *
-     * * Latitude ranges between -90 and 90 degrees, inclusive. Values above or
-     *   below this range will be clamped to the range [-90, 90]. This means
-     *   that if the value specified is less than -90, it will be set to -90.
-     *   And if the value is greater than 90, it will be set to 90.
-     * * Longitude ranges between -180 and 180 degrees, inclusive. Values above
-     *   or below this range will be wrapped so that they fall within the
-     *   range. For example, a value of -190 will be converted to 170. A value
-     *   of 190 will be converted to -170. This reflects the fact that
-     *   longitudes wrap around the globe.
-     *
-     * Although the default map projection associates longitude with the
-     * x-coordinate of the map, and latitude with the y-coordinate, the
-     * latitude coordinate is always written first, followed by the longitude.
-     * Notice that you cannot modify the coordinates of a LatLng. If you want
-     * to compute another point, you have to create a new one.
-     */
-    export class LatLng {
-        /**
-         * Creates a LatLng object representing a geographic point.
-         * Note the ordering of latitude and longitude.
-         * @param lat Latitude is specified in degrees within the range [-90, 90].
-         * @param lng Longitude is specified in degrees within the range [-180, 180].
-         * @param noWrap Set noWrap to true to enable values outside of this range.
-         */
-        constructor(lat: number, lng: number, noWrap?: boolean);
-        /** Comparison function. */
-        equals(other: LatLng): boolean;
-        /** Returns the latitude in degrees. */
-        lat(): number;
-        /** Returns the longitude in degrees. */
-        lng(): number;
-        /** Converts to string representation. */
-        toString(): string;
-        /** Returns a string of the form "lat,lng". We round the lat/lng values to 6 decimal places by default. */
-        toUrlValue(precision?: number): string;
-    }
-
-    export type LatLngLiteral = { lat: number; lng: number }
-
-    export class LatLngBounds {
-        constructor(sw?: LatLng, ne?: LatLng);
-        contains(latLng: LatLng): boolean;
-        equals(other: LatLngBounds): boolean;
-        extend(point: LatLng): LatLngBounds;
-        getCenter(): LatLng;
-        getNorthEast(): LatLng;
-        getSouthWest(): LatLng;
-        intersects(other: LatLngBounds): boolean;
-        isEmpty(): boolean;
-        toSpan(): LatLng;
-        toString(): string;
-        toUrlValue(precision?: number): string;
-        union(other: LatLngBounds): LatLngBounds;
-    }
-
-    export class Point {
-        /** A point on a two-dimensional plane. */
-        constructor(x: number, y: number);
-        /** The X coordinate */
-        x: number;
-        /** The Y coordinate */
-        y: number;
-        /** Compares two Points */
-        equals(other: Point): boolean;
-        /** Returns a string representation of this Point. */
-        toString(): string;
-    }
-
-    export class Size {
-        constructor(width: number, height: number, widthUnit?: string, heightUnit?: string);
-        height: number;
-        width: number;
-        equals(other: Size): boolean;
-        toString(): string;
-    }
-
-    /***** MVC *****/
-    export class MVCObject {
-        constructor();
-        addListener(eventName: string, handler: (...args: any[]) => void): MapsEventListener;
-        bindTo(key: string, target: MVCObject, targetKey?: string, noNotify?: boolean): void;
-        changed(key: string): void;
-        get(key: string): any;
-        notify(key: string): void;
-        set(key: string, value: any): void;
-        setValues(values: any): void;
-        unbind(key: string): void;
-        unbindAll(): void;
-    }
-
-    export class MVCArray extends MVCObject {
-        constructor(array?: any[]);
-        clear(): void;
-        forEach(callback: (elem: any, i: number) => void): void;
-        getArray(): any[];
-        getAt(i: number): any;
-        getLength(): number;
-        insertAt(i: number, elem: any): void;
-        pop(): any;
-        push(elem: any): number;
-        removeAt(i: number): any;
-        setAt(i: number, elem: any): void;
-    }
-
-    /***** Geometry Library *****/
-    export module geometry {
-        export class encoding {
-            static decodePath(encodedPath: string): LatLng[];
-            static encodePath(path: any[]): string; // LatLng[]|MVCArray<LatLng>
-        }
-
-        /**
-         * Utility functions for computing geodesic angles, distances and areas.
-         * The default radius is Earth's radius of 6378137 meters.
-         */
-        export class spherical {
-            /**
-             * Returns the area of a closed path.
-             * The computed area uses the same units as the radius.
-             * The radius defaults to the Earth's radius in meters,
-             * in which case the area is in square meters.
-             */
-            static computeArea(path: any[], radius?: number): number; // LatLng[]|MVCArray<LatLng>
-            /**
-             * Returns the distance, in meters, between two LatLngs.
-             * You can optionally specify a custom radius.
-             * The radius defaults to the radius of the Earth.
-             */
-            static computeDistanceBetween(from: LatLng, to: LatLng, radius?: number): number;
-            /**
-             * Returns the heading from one LatLng to another LatLng.
-             * Headings are expressed in degrees clockwise from North within the range [-180,180).
-             */
-            static computeHeading(from: LatLng, to: LatLng): number;
-            /**
-             * Returns the length of the given path.
-             */
-            static computeLength(path: any[], radius?: number): number; // LatLng[]|MVCArray<LatLng>
-            /**
-             * Returns the LatLng resulting from moving a distance from an origin in the
-             * specified heading (expressed in degrees clockwise from north).
-             */
-            static computeOffset(from: LatLng, distance: number, heading: number, radius?: number): LatLng;
-            /**
-             * Returns the location of origin when provided with a LatLng destination, meters
-             * travelled and original heading. Headings are expressed in degrees clockwise from
-             * North. This function returns null when no solution is available.
-             */
-            static computeOffsetOrigin(to: LatLng, distance: number, heading: number, radius?: number): LatLng;
-            /**
-             * Returns the signed area of a closed path. The signed area may be used to determine
-             * the orientation of the path. The computed area uses the same units as the radius.
-             * The radius defaults to the Earth's radius in meters, in which case the area is in
-             * square meters.
-             */
-            static computeSignedArea(loop: any[], radius?: number): number; // LatLng[]|MVCArray<LatLng>
-            /**
-             * Returns the LatLng which lies the given fraction of the way between the origin
-             * LatLng and the destination LatLng.
-             */
-            static interpolate(from: LatLng, to: LatLng, fraction: number): LatLng;
-        }
-
-        export class poly {
-            static containsLocation(point: LatLng, polygon: Polygon): boolean;
-            static isLocationOnEdge(point: LatLng, poly: Polygon|Polyline, tolerance?: number): boolean;
-        }
-    }
-
-    /***** AdSense Library *****/
-    export module adsense {
-        export class AdUnit extends MVCObject {
-            constructor(container: Element, opts: AdUnitOptions);
-            getBackgroundColor(): string;
-            getBorderColor(): string;
-            getChannelNumber(): string;
-            getContainer(): Element;
-            getFormat(): AdFormat;
-            getMap(): Map;
-            getPosition(): ControlPosition;
-            getPublisherId(): string;
-            getTextColor(): string;
-            getTitleColor(): string;
-            getUrlColor(): string;
-            setBackgroundColor(backgroundColor: string): void;
-            setBorderColor(borderColor: string): void;
-            setChannelNumber(channelNumber: string): void;
-            setFormat(format: AdFormat): void;
-            setMap(map: Map): void;
-            setPosition(position: ControlPosition): void;
-            setTextColor(textColor: string): void;
-            setTitleColor(titleColor: string): void;
-            setUrlColor(urlColor: string): void;
-        }
-
-        export interface AdUnitOptions {
-            backgroundColor?: string;
-            borderColor?: string;
-            channelNumber?: string;
-            format?: AdFormat;
-            map?: Map;
-            position?: ControlPosition;
-            publisherId?: string;
-            textColor?: string;
-            titleColor?: string;
-            urlColor?: string;
-        }
-
-        export enum AdFormat {
-            BANNER,
-            BUTTON,
-            HALF_BANNER,
-            LARGE_HORIZONTAL_LINK_UNIT,
-            LARGE_RECTANGLE,
-            LARGE_VERTICAL_LINK_UNIT,
-            LEADERBOARD,
-            MEDIUM_RECTANGLE,
-            MEDIUM_VERTICAL_LINK_UNIT,
-            SKYSCRAPER,
-            SMALL_HORIZONTAL_LINK_UNIT,
-            SMALL_RECTANGLE,
-            SMALL_SQUARE,
-            SMALL_VERTICAL_LINK_UNIT,
-            SQUARE,
-            VERTICAL_BANNER,
-            WIDE_SKYSCRAPER,
-            X_LARGE_VERTICAL_LINK_UNIT
-        }
-    }
-
-    /***** Places Library *****/
-    export module places {
-        export class Autocomplete extends MVCObject {
-            constructor(inputField: HTMLInputElement, opts?: AutocompleteOptions);
-            getBounds(): LatLngBounds;
-            getPlace(): PlaceResult;
-            setBounds(bounds: LatLngBounds): void;
-            setComponentRestrictions(restrictions: ComponentRestrictions): void;
-            setTypes(types: string[]): void;
-        }
-
-        export interface AutocompleteOptions  {
-            bounds?: LatLngBounds;
-            componentRestrictions?: ComponentRestrictions;
-            types?: string[];
-        }
-
-        export interface AutocompletePrediction {
-            description: string;
-            matched_substrings: PredictionSubstring[];
-            place_id: string;
-            terms: PredictionTerm[];
-            types: string[];
-        }
-
-        export interface PredictionTerm {
-            offset: number;
-            value: string;
-        }
-
-        export interface PredictionSubstring {
-            length: number;
-            offset: number;
-        }
-
-        export class AutocompleteService {
-            constructor();
-            getPlacePredictions(request: AutocompletionRequest, callback: (result: AutocompletePrediction[], status: PlacesServiceStatus) => void): void;
-            getQueryPredictions(request: QueryAutocompletionRequest, callback: (result: QueryAutocompletePrediction[], status: PlacesServiceStatus) => void): void;
-        }
-
-        export interface AutocompletionRequest {
-            bounds?: LatLngBounds;
-            componentRestrictions?: ComponentRestrictions;
-            input: string;
-            location?: LatLng;
-            offset?: number;
-            radius?: number;
-            types?: string[];
-        }
-
-        export interface ComponentRestrictions {
-            country: string;
-        }
-
-        export interface PlaceAspectRating {
-            rating: number;
-            type: string;
-        }
-
-        export interface PlaceDetailsRequest  {
-            placeId: string;
-        }
-
-        export interface PlaceGeometry {
-            location: LatLng;
-            viewport: LatLngBounds;
-        }
-
-        export interface PlacePhoto {
-            height: number;
-            html_attributions: string[];
-            width: number;
-            getUrl(opts: PhotoOptions): string;
-        }
-
-        export interface PhotoOptions {
-            maxHeight?: number;
-            maxWidth?: number;
-        }
-
-        export interface PlaceResult {
-            address_components: GeocoderAddressComponent[];
-            aspects: PlaceAspectRating[];
-            formatted_address: string;
-            formatted_phone_number: string;
-            geometry: PlaceGeometry;
-            html_attributions: string[];
-            icon: string;
-            international_phone_number: string;
-            name: string;
-            permanently_closed: boolean;
-            photos: PlacePhoto[];
-            place_id: string;
-            price_level: number;
-            rating: number;
-            reviews: PlaceReview[];
-            types: string[];
-            url: string;
-            vicinity: string;
-            website: string;
-        }
-
-        export interface PlaceReview {
-            aspects: PlaceAspectRating[];
-            author_name: string;
-            author_url: string;
-            language: string;
-            text: string;
-        }
-
-        export interface PlaceSearchPagination {
-            nextPage(): void;
-            hasNextPage: boolean;
-        }
-
-        export interface PlaceSearchRequest {
-            bounds?: LatLngBounds;
-            keyword?: string;
-            location?: LatLng|LatLngLiteral;
-            maxPriceLevel?: number;
-            minPriceLevel?: number;
-            name?: string;
-            openNow?: boolean;
-            radius?: number;
-            rankBy?: RankBy;
-            types?: string[];
-        }
-
-        export class PlacesService {
-            constructor(attrContainer: HTMLDivElement|Map);
-            getDetails(request: PlaceDetailsRequest, callback: (result: PlaceResult, status: PlacesServiceStatus) => void): void;
-            nearbySearch(request: PlaceSearchRequest, callback: (results: PlaceResult[], status: PlacesServiceStatus, pagination: PlaceSearchPagination) => void): void;
-            radarSearch(request: RadarSearchRequest, callback: (results: PlaceResult[], status: PlacesServiceStatus) => void): void;
-            textSearch(request: TextSearchRequest, callback: (results: PlaceResult[], status: PlacesServiceStatus) => void): void;
-        }
-
-        export enum PlacesServiceStatus {
-            INVALID_REQUEST,
-            OK,
-            OVER_QUERY_LIMIT,
-            REQUEST_DENIED,
-            UNKNOWN_ERROR,
-            ZERO_RESULTS
-        }
-
-        export interface QueryAutocompletePrediction {
-            description: string;
-            matched_substrings: PredictionSubstring[];
-            place_id: string;
-            terms: PredictionTerm[];
-        }
-
-        export interface QueryAutocompletionRequest {
-            bounds?: LatLngBounds;
-            input?: string;
-            location?: LatLng;
-            offset?: number;
-            radius?: number;
-        }
-
-        export interface RadarSearchRequest {
-            bounds?: LatLngBounds;
-            keyword?: string;
-            location?: LatLng|LatLngLiteral;
-            name?: string;
-            radius?: number;
-            types?: string[];
-        }
-
-        export enum RankBy {
-            DISTANCE,
-            PROMINENCE
-        }
-
-        export class SearchBox extends MVCObject {
-            constructor(inputField: HTMLInputElement, opts?: SearchBoxOptions);
-            getBounds(): LatLngBounds;
-            getPlaces(): PlaceResult[];
-            setBounds(bounds: LatLngBounds): void;
-        }
-
-        export interface SearchBoxOptions {
-            bounds: LatLngBounds;
-        }
-
-        export interface TextSearchRequest {
-            bounds?: LatLngBounds;
-            location?: LatLng|LatLngLiteral;
-            query: string;
-            radius?: number;
-            types?: string[];
-        }
-    }
-
-    /***** Drawing Library *****/
-    export module drawing {
-        export class DrawingManager extends MVCObject {
-            constructor(options?: DrawingManagerOptions);
-            getDrawingMode(): OverlayType;
-            getMap(): Map;
-            setDrawingMode(drawingMode: OverlayType): void;
-            setMap(map: Map): void;
-            setOptions(options: DrawingManagerOptions): void;
-        }
-
-        export interface  DrawingManagerOptions {
-            circleOptions?: CircleOptions;
-            drawingControl?: boolean;
-            drawingControlOptions?: DrawingControlOptions;
-            drawingMode?: OverlayType;
-            map?: Map;
-            markerOptions?: MarkerOptions;
-            polygonOptions?: PolygonOptions;
-            polylineOptions?: PolylineOptions;
-            rectangleOptions?: RectangleOptions;
-        }
-
-        export interface DrawingControlOptions {
-            drawingModes?: OverlayType[];
-            position?: ControlPosition;
-        }
-
-        export interface OverlayCompleteEvent {
-            overlay: Marker|Polygon|Polyline|Rectangle|Circle;
-            type: OverlayType;
-        }
-
-        export enum OverlayType {
-            CIRCLE,
-            MARKER,
-            POLYGON,
-            POLYLINE,
-            RECTANGLE
-        }
-    }
-
-    /***** Visualization Library *****/
-    export module visualization {
-        export class MapsEngineLayer extends MVCObject {
-            constructor(options: MapsEngineLayerOptions);
-            getLayerId(): string;
-            getLayerKey(): string;
-            getMap(): Map;
-            getMapId(): string;
-            getOpacity(): number;
-            getProperties(): MapsEngineLayerProperties;
-            getStatus(): MapsEngineStatus;
-            getZIndex(): number;
-            setLayerId(layerId: string): void;
-            setLayerKey(layerKey: string): void;
-            setMap(map: Map): void;
-            setMapId(mapId: string): void;
-            setOpacity(opacity: number): void;
-            setOptions(options: MapsEngineLayerOptions): void;
-            setZIndex(zIndex: number): void;
-        }
-
-        export interface MapsEngineLayerOptions {
-            accessToken?: string;
-            clickable?: boolean;
-            fitBounds?: boolean;
-            layerId?: string;
-            layerKey?: string;
-            map?: Map;
-            mapId?: string;
-            opacity?: number;
-            suppressInfoWindows?: boolean;
-            zIndex?: number;
-        }
-
-        export interface MapsEngineLayerProperties {
-            name: string;
-        }
-
-        export interface MapsEngineMouseEvent {
-            featureId?: string;
-            infoWindowHtml?: string;
-            latLng?: LatLng;
-            pixelOffset?: Size;
-        }
-
-        export enum MapsEngineStatus {
-            INVALID_LAYER,
-            OK,
-            UNKNOWN_ERROR
-        }
-
-        export class HeatmapLayer extends MVCObject {
-            constructor(opts?: HeatmapLayerOptions);
-            getData(): MVCArray;
-            getMap(): Map;
-            setData(data: MVCArray): void;
-            setData(data: LatLng[]): void;
-            setData(data: WeightedLocation[]): void;
-            setMap(map: Map): void;
-        }
-
-        export interface HeatmapLayerOptions {
-            data: any;
-            dissipating?: boolean;
-            gradient?: string[];
-            map?: Map;
-            maxIntensity?: number;
-            opacity?: number;
-            radius?: number;
-        }
-
-        export interface WeightedLocation {
-            location: LatLng;
-            weight: number;
-        }
-
-        export class MouseEvent {
-            stop(): void;
-        }
-
-        export class MapsEventListener {
-
-        }
-    }
-}
diff --git a/googlemaps/index.d.ts b/googlemaps/index.d.ts
new file mode 100644
index 0000000000..4d225779ce
--- /dev/null
+++ b/googlemaps/index.d.ts
@@ -0,0 +1,2269 @@
+// Type definitions for Google Maps JavaScript API 3.20
+// Project: https://developers.google.com/maps/
+// Definitions by: Folia A/S <http://www.folia.dk>, Chris Wrench <https://github.com/cgwrench>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*
+The MIT License
+
+Copyright (c) 2012 Folia A/S. http://www.folia.dk
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+declare namespace google.maps {
+    /***** Map *****/
+    export class Map extends MVCObject {
+        constructor(mapDiv: Element, opts?: MapOptions);
+        fitBounds(bounds: LatLngBounds): void;
+        getBounds(): LatLngBounds;
+        getCenter(): LatLng;
+        getDiv(): Element;
+        getHeading(): number;
+        getMapTypeId(): MapTypeId|string;
+        getProjection(): Projection;
+        getStreetView(): StreetViewPanorama;
+        getTilt(): number;
+        getZoom(): number;
+        panBy(x: number, y: number): void;
+        panTo(latLng: LatLng|LatLngLiteral): void;
+        panToBounds(latLngBounds: LatLngBounds): void;
+        setCenter(latlng: LatLng|LatLngLiteral): void;
+        setHeading(heading: number): void;
+        setMapTypeId(mapTypeId: MapTypeId|string): void;
+        setOptions(options: MapOptions): void;
+        setStreetView(panorama: StreetViewPanorama): void;
+        setTilt(tilt: number): void;
+        setZoom(zoom: number): void;
+        controls: MVCArray[]; //Array<MVCArray<Node>>
+        data: Data;
+        mapTypes: MapTypeRegistry;
+        overlayMapTypes: MVCArray; // MVCArray<MapType>
+    }
+
+    export interface MapOptions {
+        backgroundColor?: string;
+        center?: LatLng|LatLngLiteral;
+        disableDefaultUI?: boolean;
+        disableDoubleClickZoom?: boolean;
+        draggable?: boolean;
+        draggableCursor?: string;
+        draggingCursor?: string;
+        heading?: number;
+        keyboardShortcuts?: boolean;
+        mapMaker?: boolean;
+        mapTypeControl?: boolean;
+        mapTypeControlOptions?: MapTypeControlOptions;
+        mapTypeId?: MapTypeId;
+        maxZoom?: number;
+        minZoom?: number;
+        noClear?: boolean;
+        overviewMapControl?: boolean;
+        overviewMapControlOptions?: OverviewMapControlOptions;
+        panControl?: boolean;
+        panControlOptions?: PanControlOptions;
+        rotateControl?: boolean;
+        rotateControlOptions?: RotateControlOptions;
+        scaleControl?: boolean;
+        scaleControlOptions?: ScaleControlOptions;
+        scrollwheel?: boolean;
+        streetView?: StreetViewPanorama;
+        streetViewControl?: boolean;
+        streetViewControlOptions?: StreetViewControlOptions;
+        styles?: MapTypeStyle[];
+        tilt?: number;
+        zoom?: number;
+        zoomControl?: boolean;
+        zoomControlOptions?: ZoomControlOptions;
+    }
+
+    export enum MapTypeId {
+        HYBRID,
+        ROADMAP,
+        SATELLITE,
+        TERRAIN
+    }
+
+    /***** Controls *****/
+    export interface MapTypeControlOptions {
+        mapTypeIds?: (MapTypeId|string)[];
+        position?: ControlPosition;
+        style?: MapTypeControlStyle;
+    }
+
+    export enum MapTypeControlStyle {
+        DEFAULT,
+        DROPDOWN_MENU,
+        HORIZONTAL_BAR
+    }
+
+    export interface OverviewMapControlOptions {
+        opened?: boolean;
+    }
+
+    export interface PanControlOptions {
+        position?: ControlPosition;
+    }
+
+    export interface RotateControlOptions {
+        position?: ControlPosition;
+    }
+
+    export interface ScaleControlOptions {
+        style?: ScaleControlStyle;
+    }
+
+    export enum ScaleControlStyle {
+        DEFAULT
+    }
+
+    export interface StreetViewControlOptions {
+        position?: ControlPosition;
+    }
+
+    export interface ZoomControlOptions {
+        position?: ControlPosition;
+        style?: ZoomControlStyle;
+    }
+
+    export enum ZoomControlStyle {
+        DEFAULT,
+        LARGE,
+        SMALL
+    }
+
+    export enum ControlPosition {
+        BOTTOM_CENTER,
+        BOTTOM_LEFT,
+        BOTTOM_RIGHT,
+        LEFT_BOTTOM,
+        LEFT_CENTER,
+        LEFT_TOP,
+        RIGHT_BOTTOM,
+        RIGHT_CENTER,
+        RIGHT_TOP,
+        TOP_CENTER,
+        TOP_LEFT,
+        TOP_RIGHT
+    }
+
+    /***** Data *****/
+    export class Data extends MVCObject {
+        constructor(options?: Data.DataOptions);
+        add(feature: Data.Feature|Data.FeatureOptions): Data.Feature;
+        addGeoJson(geoJson: Object, options?: Data.GeoJsonOptions): Data.Feature[];
+        contains(feature: Data.Feature): boolean;
+        forEach(callback: (feature: Data.Feature) => void): void;
+        getControlPosition(): ControlPosition;
+        getControls(): string[];
+        getDrawingMode(): string;
+        getFeatureById(id: number|string): Data.Feature;
+        getMap(): Map;
+        getStyle(): Data.StylingFunction|Data.StyleOptions;
+        loadGeoJson(url: string, options?: Data.GeoJsonOptions, callback?: (features: Data.Feature[]) => void): void;
+        overrideStyle(feature: Data.Feature, style: Data.StyleOptions): void;
+        remove(feature: Data.Feature): void;
+        revertStyle(feature?: Data.Feature): void;
+        setControlPosition(controlPosition: ControlPosition): void;
+        setControls(controls: string[]): void;
+        setDrawingMode(drawingMode: string): void;
+        setMap(map: Map): void;
+        setStyle(style: Data.StylingFunction|Data.StyleOptions): void;
+        toGeoJson(callback: (feature: Object) => void): void;
+    }
+
+    export module Data {
+        export interface DataOptions {
+            controlPosition?: ControlPosition;
+            controls?: string[];
+            drawingMode?: string;
+            featureFactory?: (geometry: Data.Geometry) => Data.Feature;
+            map?: Map;
+            style?: Data.StylingFunction|Data.StyleOptions;
+        }
+
+        export interface GeoJsonOptions {
+            idPropertyName?: string;
+        }
+
+        export interface StyleOptions {
+            clickable?: boolean;
+            cursor?: string;
+            draggable?: boolean;
+            editable?: boolean;
+            fillColor?: string;
+            fillOpacity?: number;
+            icon?: string|Icon|Symbol;
+            shape?: MarkerShape;
+            strokeColor?: string;
+            strokeOpacity?: number;
+            strokeWeight?: number;
+            title?: string;
+            visible?: boolean;
+            zIndex?: number;
+        }
+
+        export type StylingFunction = (feature: Data.Feature) => Data.StyleOptions;
+
+        export class Feature {
+            constructor(options?: Data.FeatureOptions);
+            forEachProperty(callback: (value: any, name: string) => void): void;
+            getGeometry(): Data.Geometry;
+            getId(): number|string;
+            getProperty(name: string): any;
+            removeProperty(name: string): void;
+            setGeometry(newGeometry: Data.Geometry|LatLng|LatLngLiteral): void;
+            setProperty(name: string, newValue: any): void;
+            toGeoJson(callback: (feature: Object) => void): void;
+        }
+
+        export interface FeatureOptions {
+            geometry?: Data.Geometry|LatLng|LatLngLiteral;
+            id?: number|string;
+            properties?: Object;
+        }
+
+        export class Geometry {
+            getType(): string;
+        }
+
+        export class Point extends Data.Geometry {
+            constructor(latLng: LatLng|LatLngLiteral);
+            get(): LatLng;
+        }
+
+        export class MultiPoint extends Data.Geometry {
+            constructor(elements: (LatLng|LatLngLiteral)[]);
+            getArray(): LatLng[];
+            getAt(n: number): LatLng;
+            getLength(): number;
+        }
+
+        export class LineString extends Data.Geometry {
+            constructor(elements: (LatLng|LatLngLiteral)[]);
+            getArray(): LatLng[];
+            getAt(n: number): LatLng;
+            getLength(): number;
+        }
+
+        export class MultiLineString extends Data.Geometry {
+            constructor(elements: (Data.LineString|(LatLng|LatLngLiteral)[])[]);
+            getArray(): Data.LineString[];
+            getAt(n: number): Data.LineString;
+            getLength(): number;
+        }
+
+        export class LinearRing extends Data.Geometry {
+            constructor(elements: (LatLng|LatLngLiteral)[]);
+            getArray(): LatLng[];
+            getAt(n: number): LatLng;
+            getLength(): number;
+        }
+
+        export class Polygon extends Data.Geometry {
+            constructor(elements: (Data.LinearRing|(LatLng|LatLngLiteral)[])[]);
+            getArray(): Data.LinearRing[];
+            getAt(n: number): Data.LinearRing;
+            getLength(): number;
+        }
+
+        export class MultiPolygon extends Data.Geometry {
+            constructor(elements: (Data.Polygon|(LinearRing|(LatLng|LatLngLiteral)[])[])[]);
+            getArray(): Data.Polygon[];
+            getAt(n: number): Data.Polygon;
+            getLength(): number;
+        }
+
+        export class GeometryCollection extends Data.Geometry {
+            constructor(elements: (Data.Geometry[]|LatLng[]|LatLngLiteral)[]);
+            getArray(): Data.Geometry[];
+            getAt(n: number): Data.Geometry;
+            getLength(): number;
+        }
+
+        export interface MouseEvent extends google.maps.MouseEvent {
+            feature: Data.Feature;
+        }
+
+        export interface AddFeatureEvent {
+            feature: Data.Feature;
+        }
+
+        export interface RemoveFeatureEvent {
+            feature: Data.Feature;
+        }
+
+        export interface SetGeometryEvent  {
+            feature: Data.Feature;
+            newGeometry: Data.Geometry;
+            oldGeometry: Data.Geometry;
+        }
+
+        export interface SetPropertyEvent  {
+            feature: Data.Feature;
+            name: string;
+            newValue: any;
+            oldValue: any;
+        }
+
+        export interface RemovePropertyEvent  {
+            feature: Data.Feature;
+            name: string;
+            oldValue: any;
+        }
+    }
+
+    /***** Overlays *****/
+    export class Marker extends MVCObject {
+        static MAX_ZINDEX: number;
+        constructor(opts?: MarkerOptions);
+        getAnimation(): Animation;
+        getAttribution(): Attribution;
+        getClickable(): boolean;
+        getCursor(): string;
+        getDraggable(): boolean;
+        getIcon(): string|Icon|Symbol;
+        getLabel(): MarkerLabel;
+        getMap(): Map|StreetViewPanorama;
+        getOpacity(): number;
+        getPlace(): Place;
+        getPosition(): LatLng;
+        getShape(): MarkerShape;
+        getTitle(): string;
+        getVisible(): boolean;
+        getZIndex(): number;
+        setAnimation(animation: Animation): void;
+        setAttribution(attribution: Attribution): void;
+        setClickable(flag: boolean): void;
+        setCursor(cursor: string): void;
+        setDraggable(flag: boolean): void;
+        setIcon(icon: string|Icon|Symbol): void;
+        setLabel(label: string|MarkerLabel): void;
+        setMap(map: Map|StreetViewPanorama): void;
+        setOpacity(opacity: number): void;
+        setOptions(options: MarkerOptions): void;
+        setPlace(place: Place): void;
+        setPosition(latlng: LatLng|LatLngLiteral): void;
+        setShape(shape: MarkerShape): void;
+        setTitle(title: string): void;
+        setVisible(visible: boolean): void;
+        setZIndex(zIndex: number): void;
+    }
+
+    export interface MarkerOptions {
+        /**
+         * The offset from the marker's position to the tip of an InfoWindow
+         * that has been opened with the marker as anchor.
+         */
+        anchorPoint?: Point;
+        /** Which animation to play when marker is added to a map. */
+        animation?: Animation;
+        /**
+         * If true, the marker receives mouse and touch events.
+         * @default true
+         */
+        clickable?: boolean;
+        /** Mouse cursor to show on hover. */
+        cursor?: string;
+        /**
+         * If true, the marker can be dragged.
+         * @default false
+         */
+        draggable?: boolean;
+       /**
+         * Icon for the foreground.
+         * If a string is provided, it is treated as though it were an Icon with the string as url.
+         * @type {(string|Icon|Symbol)}
+         */
+        icon?: string|Icon|Symbol;
+        /**
+         * Adds a label to the marker. The label can either be a string, or a MarkerLabel object. 
+         * Only the first character of the string will be displayed.
+         * @type {(string|MarkerLabel)}
+         */
+        label?: string|MarkerLabel;
+        /**
+         * Map on which to display Marker.
+         * @type {(Map|StreetViewPanorama)}
+         *
+         */
+        map?: Map|StreetViewPanorama;
+        /** The marker's opacity between 0.0 and 1.0. */
+        opacity?: number;
+        /**
+         * Optimization renders many markers as a single static element.
+         * Optimized rendering is enabled by default.
+         * Disable optimized rendering for animated GIFs or PNGs, or when each
+         * marker must be rendered as a separate DOM element (advanced usage
+         * only).
+         */
+        optimized?: boolean;
+        /**
+         * Place information, used to identify and describe the place
+         * associated with this Marker. In this context, 'place' means a
+         * business, point of interest or geographic location. To allow a user
+         * to save this place, open an info window anchored on this marker.
+         * The info window will contain information about the place and an
+         * option for the user to save it. Only one of position or place can
+         * be specified.
+         */
+        place?: Place;
+        /**
+         * Marker position. Required.
+         */
+        position: LatLng;
+        /** Image map region definition used for drag/click. */
+        shape?: MarkerShape;
+        /** Rollover text. */
+        title?: string;
+        /** If true, the marker is visible. */
+        visible?: boolean;
+        /**
+         * All markers are displayed on the map in order of their zIndex,
+         * with higher values displaying in front of markers with lower values.
+         * By default, markers are displayed according to their vertical position on screen,
+         * with lower markers appearing in front of markers further up the screen.
+         */
+        zIndex?: number;
+    }
+
+    export interface Icon {
+        /**
+         * The position at which to anchor an image in correspondence to the
+         * location of the marker on the map. By default, the anchor is
+         * located along the center point of the bottom of the image.
+         */
+        anchor?: Point;
+        /**
+         * The origin of the label relative to the top-left corner of the icon
+         * image, if a label is supplied by the marker. By default, the origin
+         * is located in the center point of the image.
+         */
+        labelOrigin?: Point;
+        /**
+         * The position of the image within a sprite, if any. By default, the
+         * origin is located at the top left corner of the image (0, 0).
+         */
+        origin?: Point;
+        /**
+         * The size of the entire image after scaling, if any. Use this
+         * property to stretch/ shrink an image or a sprite.
+         */
+        scaledSize?: Size;
+        /**
+         * The display size of the sprite or image. When using sprites, you
+         * must specify the sprite size. If the size is not provided, it will
+         * be set when the image loads.
+         */
+        size?: Size;
+        /** The URL of the image or sprite sheet. */
+        url?: string;
+    }
+
+    export interface MarkerLabel {
+        /** The color of the label text. Default color is black. */
+        color?: string;
+        /** The font family of the label text (equivalent to the CSS font-family property). */
+        fontFamily?: string;
+        /** The font size of the label text (equivalent to the CSS font-size property). Default size is 14px. */
+        fontSize?: string;
+        /** The font weight of the label text (equivalent to the CSS font-weight property). */
+        fontWeight?: string;
+        /** The text to be displayed in the label. Only the first character of this string will be shown. */
+        text?: string;
+    }
+    
+    export interface MarkerShape {
+        coords?: number[];
+        type?: string;
+    }
+
+    export interface Symbol {
+        /**
+         * The position of the symbol relative to the marker or polyline.
+         * The coordinates of the symbol's path are translated left and up by the anchor's x and y coordinates respectively.
+         * By default, a symbol is anchored at (0, 0).
+         * The position is expressed in the same coordinate system as the symbol's path.
+         */
+        anchor?: Point;
+        /**
+         * The symbol's fill color.
+         * All CSS3 colors are supported except for extended named colors. For symbol markers, this defaults to 'black'.
+         * For symbols on polylines, this defaults to the stroke color of the corresponding polyline.
+         */
+        fillColor?: string;
+        /**
+         * The symbol's fill opacity.
+         * @default 0
+         */
+        fillOpacity?: number;
+        /**
+         * The symbol's path, which is a built-in symbol path, or a custom path expressed using SVG path notation. Required.
+         * @type {(SymbolPath|string)}
+         */
+        path?: SymbolPath|string;
+        /**
+         * The angle by which to rotate the symbol, expressed clockwise in degrees.
+         * Defaults to 0.
+         * A symbol in an IconSequence where fixedRotation is false is rotated relative to the angle of the edge on which it lies.
+         */
+        rotation?: number;
+        /**
+         * The amount by which the symbol is scaled in size.
+         * For symbol markers, this defaults to 1; after scaling, the symbol may be of any size.
+         * For symbols on a polyline, this defaults to the stroke weight of the polyline;
+         * after scaling, the symbol must lie inside a square 22 pixels in size centered at the symbol's anchor.
+         */
+        scale?: number;
+        /**
+         * The symbol's stroke color. All CSS3 colors are supported except for extended named colors.
+         * For symbol markers, this defaults to 'black'.
+         * For symbols on a polyline, this defaults to the stroke color of the polyline.
+         */
+        strokeColor?: string;
+        /**
+         * The symbol's stroke opacity. For symbol markers, this defaults to 1.
+         * For symbols on a polyline, this defaults to the stroke opacity of the polyline.
+         */
+        strokeOpacity?: number;
+        /** The symbol's stroke weight. Defaults to the scale of the symbol.v*/
+        strokeWeight?: number;
+    }
+
+    /** Built-in symbol paths. */
+    export enum SymbolPath {
+        /** A backward-pointing closed arrow. */
+        BACKWARD_CLOSED_ARROW,
+        /** A backward-pointing open arrow. */
+        BACKWARD_OPEN_ARROW,
+        /** A circle. */
+        CIRCLE,
+        /** A forward-pointing closed arrow. */
+        FORWARD_CLOSED_ARROW,
+        /** A forward-pointing open arrow. */
+        FORWARD_OPEN_ARROW
+    }
+
+    export enum Animation {
+        BOUNCE,
+        DROP
+    }
+
+    /**
+     * An overlay that looks like a bubble and is often connected to a marker.
+     * This class extends MVCObject.
+     */
+    export class InfoWindow extends MVCObject {
+        /**
+         * Creates an info window with the given options. An InfoWindow can be
+         * placed on a map at a particular position or above a marker,
+         * depending on what is specified in the options. Unless auto-pan is
+         * disabled, an InfoWindow will pan the map to make itself visible
+         * when it is opened. After constructing an InfoWindow, you must call
+         * open to display it on the map. The user can click the close button
+         * on the InfoWindow to remove it from the map, or the developer can
+         * call close() for the same effect.
+         */
+        constructor(opts?: InfoWindowOptions);
+        /** Closes this InfoWindow by removing it from the DOM structure. */
+        close(): void;
+        getContent(): string|Element;
+        getPosition(): LatLng;
+        getZIndex(): number;
+        /**
+         * Opens this InfoWindow on the given map. Optionally, an InfoWindow can be associated with an anchor.
+         * In the core API, the only anchor is the Marker class.
+         * However, an anchor can be any MVCObject that exposes a LatLng position property and optionally
+         * a Point anchorPoint property for calculating the pixelOffset (see InfoWindowOptions).
+         * The anchorPoint is the offset from the anchor's position to the tip of the InfoWindow.
+         */
+        open(map?: Map|StreetViewPanorama, anchor?: MVCObject): void;
+        setContent(content: string|Node): void;
+        setOptions(options: InfoWindowOptions): void;
+        setPosition(position: LatLng): void;
+        setZIndex(zIndex: number): void;
+    }
+
+    export interface InfoWindowOptions {
+        /**
+         * Content to display in the InfoWindow. This can be an HTML element, a plain-text string, or a string containing HTML.
+         * The InfoWindow will be sized according to the content.
+         * To set an explicit size for the content, set content to be a HTML element with that size.
+         * @type {(string|Node)}
+         */
+        content?: string|Node;
+        /**
+         * Disable auto-pan on open. By default, the info window will pan the map so that it is fully visible when it opens.
+         */
+        disableAutoPan?: boolean;
+        /**
+         * Maximum width of the infowindow, regardless of content's width.
+         * This value is only considered if it is set before a call to open.
+         * To change the maximum width when changing content, call close, setOptions, and then open.
+         */
+        maxWidth?: number;
+        /**
+         * The offset, in pixels, of the tip of the info window from the point on the map
+         * at whose geographical coordinates the info window is anchored.
+         * If an InfoWindow is opened with an anchor, the pixelOffset will be calculated from the anchor's anchorPoint property.
+         */
+        pixelOffset?: Size;
+        /**
+         * The LatLng at which to display this InfoWindow. If the InfoWindow is opened with an anchor, the anchor's position will be used instead.
+         */
+        position?: LatLng|LatLngLiteral;
+        /**
+         * All InfoWindows are displayed on the map in order of their zIndex,
+         * with higher values displaying in front of InfoWindows with lower values.
+         * By default, InfoWindows are displayed according to their latitude,
+         * with InfoWindows of lower latitudes appearing in front of InfoWindows at higher latitudes.
+         * InfoWindows are always displayed in front of markers.
+         */
+        zIndex?: number;
+    }
+
+    export class Polyline extends MVCObject {
+        constructor(opts?: PolylineOptions);
+        getDraggable(): boolean;
+        getEditable(): boolean;
+        getMap(): Map;
+        getPath(): MVCArray; // MVCArray<LatLng>
+        getVisible(): boolean;
+        setDraggable(draggable: boolean): void;
+        setEditable(editable: boolean): void;
+        setMap(map: Map): void;
+        setOptions(options: PolylineOptions): void;
+        setPath(path: MVCArray|LatLng[]|LatLngLiteral[]): void; // MVCArray<LatLng>|Array<LatLng|LatLngLiteral>
+        setVisible(visible: boolean): void;
+    }
+
+    export interface PolylineOptions {
+        clickable?: boolean;
+        draggable?: boolean;
+        editable?: boolean;
+        geodesic?: boolean;
+        icons?: IconSequence[];
+        map?: Map;
+        path?: MVCArray|LatLng[]|LatLngLiteral[]; // MVCArray<LatLng>|Array<LatLng|LatLngLiteral>
+        strokeColor?: string;
+        strokeOpacity?: number;
+        strokeWeight?: number;
+        visible?: boolean;
+        zIndex?: number;
+    }
+
+    export interface IconSequence {
+        fixedRotation?: boolean;
+        icon?: Symbol;
+        offset?: string;
+        repeat?: string;
+    }
+
+    export class Polygon extends MVCObject {
+        constructor(opts?: PolygonOptions);
+        getDraggable(): boolean;
+        getEditable(): boolean;
+        getMap(): Map;
+        getPath(): MVCArray; // MVCArray<LatLng>
+        getPaths(): MVCArray; // MVCArray<MVCArray<LatLng>>
+        getVisible(): boolean;
+        setDraggable(draggable: boolean): void;
+        setEditable(editable: boolean): void;
+        setMap(map: Map): void;
+        setOptions(options: PolygonOptions): void;
+        setPath(path: MVCArray|LatLng[]|LatLngLiteral[]): void;
+        setPaths(paths: MVCArray): void;
+        setPaths(paths: MVCArray[]): void;
+        setPaths(path: LatLng[]): void;
+        setPaths(path: LatLng[][]): void;
+        setPaths(path: LatLngLiteral[]): void;
+        setPaths(path: LatLngLiteral[][]): void;
+        setVisible(visible: boolean): void;
+    }
+
+    export interface PolygonOptions {
+        /** Indicates whether this Polygon handles mouse events. Defaults to true. */
+        clickable?: boolean;
+        /**
+         * If set to true, the user can drag this shape over the map.
+         * The geodesic property defines the mode of dragging. Defaults to false.
+         */
+        draggable?: boolean;
+        /**
+         * If set to true, the user can edit this shape by dragging the control points
+         * shown at the vertices and on each segment. Defaults to false.
+         */
+        editable?: boolean;
+        /** The fill color. All CSS3 colors are supported except for extended named colors. */
+        fillColor?: string;
+        /** The fill opacity between 0.0 and 1.0 */
+        fillOpacity?: number;
+        /**
+         * When true, edges of the polygon are interpreted as geodesic and will follow
+         * the curvature of the Earth. When false, edges of the polygon are rendered as
+         * straight lines in screen space. Note that the shape of a geodesic polygon may
+         * appear to change when dragged, as the dimensions are maintained relative to
+         * the surface of the earth. Defaults to false.
+         */
+        geodesic?: boolean;
+        /** Map on which to display Polygon. */
+        map?: Map;
+        /**
+         * The ordered sequence of coordinates that designates a closed loop. Unlike
+         * polylines, a polygon may consist of one or more paths. As a result, the paths
+         * property may specify one or more arrays of LatLng coordinates. Paths are
+         * closed automatically; do not repeat the first vertex of the path as the last
+         * vertex. Simple polygons may be defined using a single array of LatLngs. More
+         * complex polygons may specify an array of arrays. Any simple arrays are
+         * converted into MVCArrays. Inserting or removing LatLngs from the MVCArray
+         * will automatically update the polygon on the map.
+         */
+        paths?: any[]; // MVCArray<MVCArray<LatLng>>|MVCArray<LatLng>|Array<Array<LatLng|LatLngLiteral>>|Array<LatLng|LatLngLiteral>
+        /**
+         * The stroke color.
+         * All CSS3 colors are supported except for extended named colors.
+         */
+        strokeColor?: string;
+        /** The stroke opacity between 0.0 and 1.0 */
+        strokeOpacity?: number;
+        /**
+         * The stroke position. Defaults to CENTER.
+         * This property is not supported on Internet Explorer 8 and earlier.
+         */
+        strokePosition?: StrokePosition;
+        /** The stroke width in pixels. */
+        strokeWeight?: number;
+        /** Whether this polygon is visible on the map. Defaults to true. */
+        visible?: boolean;
+        /** The zIndex compared to other polys. */
+        zIndex?: number;
+    }
+
+    export interface PolyMouseEvent {
+        edge?: number;
+        path?: number;
+        vertex?: number;
+    }
+
+    export class Rectangle extends MVCObject {
+        constructor(opts?: RectangleOptions);
+        getBounds(): LatLngBounds;
+        getDraggable(): boolean;
+        getEditable(): boolean;
+        getMap(): Map;
+        getVisible(): boolean;
+        setBounds(bounds: LatLngBounds): void;
+        setDraggable(draggable: boolean): void;
+        setEditable(editable: boolean): void;
+        setMap(map: Map): void;
+        setOptions(options: RectangleOptions): void;
+        setVisible(visible: boolean): void;
+    }
+
+    export interface RectangleOptions {
+        bounds?: LatLngBounds;
+        clickable?: boolean;
+        draggable?: boolean;
+        editable?: boolean;
+        fillColor?: string;
+        fillOpacity?: number;
+        map?: Map;
+        strokeColor?: string;
+        strokeOpacity?: number;
+        strokePosition?: StrokePosition;
+        strokeWeight?: number;
+        visible?: boolean;
+        zIndex?: number;
+    }
+
+    export class Circle extends MVCObject {
+        constructor(opts?: CircleOptions);
+        getBounds(): LatLngBounds;
+        getCenter(): LatLng;
+        getDraggable(): boolean;
+        getEditable(): boolean;
+        getMap(): Map;
+        getRadius(): number;
+        getVisible(): boolean;
+        setCenter(center: LatLng|LatLngLiteral): void;
+        setDraggable(draggable: boolean): void;
+        setEditable(editable: boolean): void;
+        setMap(map: Map): void;
+        setOptions(options: CircleOptions): void;
+        setRadius(radius: number): void;
+        setVisible(visible: boolean): void;
+    }
+
+    export interface CircleOptions {
+        center?: LatLng;
+        clickable?: boolean;
+        draggable?: boolean;
+        editable?: boolean;
+        fillColor?: string;
+        fillOpacity?: number;
+        map?: Map;
+        radius?: number;
+        strokeColor?: string;
+        strokeOpacity?: number;
+        strokePosition?: StrokePosition;
+        strokeWeight?: number;
+        visible?: boolean;
+        zIndex?: number;
+    }
+
+    /**
+     * The possible positions of the stroke on a polygon.
+     */
+    export enum StrokePosition {
+        /**
+         * The stroke is centered on the polygon's path, with half the stroke inside
+         * the polygon and half the stroke outside the polygon.
+         */
+        CENTER,
+        /** The stroke lies inside the polygon. */
+        INSIDE,
+        /** The stroke lies outside the polygon. */
+        OUTSIDE
+    }
+
+    export class GroundOverlay extends MVCObject {
+        constructor(url: string, bounds: LatLngBounds, opts?: GroundOverlayOptions);
+        getBounds(): LatLngBounds;
+        getMap(): Map;
+        getOpacity(): number;
+        getUrl(): string;
+        setMap(map: Map): void;
+        setOpacity(opacity: number): void;
+    }
+
+    export interface GroundOverlayOptions {
+        clickable?: boolean;
+        map?: Map;
+        opacity?: number;
+    }
+
+    export class OverlayView extends MVCObject {
+        draw(): void;
+        getMap(): Map|StreetViewPanorama;
+        getPanes(): MapPanes;
+        getProjection(): MapCanvasProjection;
+        onAdd(): void;
+        onRemove(): void;
+        setMap(map: Map|StreetViewPanorama): void;
+    }
+
+    export interface MapPanes {
+        floatPane: Element;
+        mapPane: Element;
+        markerLayer: Element;
+        overlayLayer: Element;
+        overlayMouseTarget: Element;
+    }
+
+    export class MapCanvasProjection extends MVCObject {
+        fromContainerPixelToLatLng(pixel: Point, nowrap?: boolean): LatLng;
+        fromDivPixelToLatLng(pixel: Point, nowrap?: boolean): LatLng;
+        fromLatLngToContainerPixel(latLng: LatLng): Point;
+        fromLatLngToDivPixel(latLng: LatLng): Point;
+        getWorldWidth(): number;
+    }
+
+    /***** Services *****/
+    export class Geocoder {
+        geocode(request: GeocoderRequest, callback: (results: GeocoderResult[], status: GeocoderStatus) => void ): void;
+    }
+
+    export interface GeocoderRequest {
+        address?: string;
+        bounds?: LatLngBounds;
+        componentRestrictions?: GeocoderComponentRestrictions;
+        location?: LatLng|LatLngLiteral;
+        placeId?: string;
+        region?: string;
+    }
+
+    export interface GeocoderComponentRestrictions {
+        administrativeArea?: string;
+        country?: string;
+        locality?: string;
+        postalCode?: string;
+        route?: string;
+    }
+
+    export enum GeocoderStatus {
+        ERROR,
+        INVALID_REQUEST,
+        OK,
+        OVER_QUERY_LIMIT,
+        REQUEST_DENIED,
+        UNKNOWN_ERROR,
+        ZERO_RESULTS
+    }
+
+    export interface GeocoderResult {
+        address_components: GeocoderAddressComponent[];
+        formatted_address: string;
+        geometry: GeocoderGeometry;
+        partial_match: boolean;
+        postcode_localities: string[];
+        types: string[];
+    }
+
+    export interface GeocoderAddressComponent {
+        long_name: string;
+        short_name: string;
+        types: string[];
+    }
+
+    export interface GeocoderGeometry {
+        bounds: LatLngBounds;
+        location: LatLng;
+        location_type: GeocoderLocationType;
+        viewport: LatLngBounds;
+    }
+
+    export enum GeocoderLocationType {
+        APPROXIMATE,
+        GEOMETRIC_CENTER,
+        RANGE_INTERPOLATED,
+        ROOFTOP
+    }
+
+    export class DirectionsRenderer extends MVCObject {
+        constructor(opts?: DirectionsRendererOptions);
+        getDirections(): DirectionsResult;
+        getMap(): Map;
+        getPanel(): Element;
+        getRouteIndex(): number;
+        setDirections(directions: DirectionsResult): void;
+        setMap(map: Map): void;
+        setOptions(options: DirectionsRendererOptions): void;
+        setPanel(panel: Element): void;
+        setRouteIndex(routeIndex: number): void;
+    }
+
+    export interface DirectionsRendererOptions {
+        directions?: DirectionsResult;
+        draggable?: boolean;
+        hideRouteList?: boolean;
+        infoWindow?: InfoWindow;
+        map?: Map;
+        markerOptions?: MarkerOptions;
+        panel?: Element;
+        polylineOptions?: PolylineOptions;
+        preserveViewport?: boolean;
+        routeIndex?: number;
+        suppressBicyclingLayer?: boolean;
+        suppressInfoWindows?: boolean;
+        suppressMarkers?: boolean;
+        suppressPolylines?: boolean;
+    }
+
+    export class DirectionsService {
+        route(request: DirectionsRequest, callback: (result: DirectionsResult, status: DirectionsStatus) => void ): void;
+    }
+
+    export interface DirectionsRequest {
+        avoidFerries?: boolean;
+        avoidHighways?: boolean;
+        avoidTolls?: boolean;
+        destination?: LatLng|LatLngLiteral|string;
+        durationInTraffic?: boolean;
+        optimizeWaypoints?: boolean;
+        origin?: LatLng|LatLngLiteral|string;
+        provideRouteAlternatives?: boolean;
+        region?: string;
+        transitOptions?: TransitOptions;
+        travelMode?: TravelMode;
+        unitSystem?: UnitSystem;
+        waypoints?: DirectionsWaypoint[];
+    }
+
+    export enum TravelMode {
+        BICYCLING,
+        DRIVING,
+        TRANSIT,
+        WALKING
+    }
+
+    export enum UnitSystem {
+        IMPERIAL,
+        METRIC
+    }
+
+    export interface TransitOptions {
+        arrivalTime?: Date;
+        departureTime?: Date;
+        modes: TransitMode[];
+        routingPreference: TransitRoutePreference;
+    }
+
+    export enum TransitMode {
+        BUS,
+        RAIL,
+        SUBWAY,
+        TRAIN,
+        TRAM
+    }
+
+    export enum TransitRoutePreference
+    {
+        FEWER_TRANSFERS,
+        LESS_WALKING
+    }
+
+    export interface TransitFare { }
+
+    export interface DirectionsWaypoint {
+        location: LatLng|LatLngLiteral|string;
+        stopover: boolean;
+    }
+
+    export enum DirectionsStatus {
+        INVALID_REQUEST,
+        MAX_WAYPOINTS_EXCEEDED,
+        NOT_FOUND,
+        OK,
+        OVER_QUERY_LIMIT,
+        REQUEST_DENIED,
+        UNKNOWN_ERROR,
+        ZERO_RESULTS
+    }
+
+    export interface DirectionsResult {
+        routes: DirectionsRoute[];
+    }
+
+    export interface DirectionsRoute {
+        bounds: LatLngBounds;
+        copyrights: string;
+        fare: TransitFare;
+        legs: DirectionsLeg[];
+        overview_path: LatLng[];
+        overview_polyline: string;
+        warnings: string[];
+        waypoint_order: number[];
+    }
+
+    export interface DirectionsLeg {
+        arrival_time: Time;
+        departure_time: Time;
+        distance: Distance;
+        duration: Duration;
+        duration_in_traffic: Duration;
+        end_address: string;
+        end_location: LatLng;
+        start_address: string;
+        start_location: LatLng;
+        steps: DirectionsStep[];
+        via_waypoints: LatLng[];
+    }
+
+    export interface DirectionsStep {
+        distance: Distance;
+        duration: Duration;
+        end_location: LatLng;
+        instructions: string;
+        path: LatLng[];
+        start_location: LatLng;
+        steps: DirectionsStep;
+        transit: TransitDetails;
+        travel_mode: TravelMode;
+    }
+
+    export interface Distance {
+        text: string;
+        value: number;
+    }
+
+    export interface Duration {
+        text: string;
+        value: number;
+    }
+
+    export interface Time {
+        text: string;
+        time_zone: string;
+        value: Date;
+    }
+
+    export interface TransitDetails {
+        arrival_stop: TransitStop;
+        arrival_time: Time;
+        departure_stop: TransitStop;
+        departure_time: Time;
+        headsign: string;
+        headway: number;
+        line: TransitLine;
+        num_stops: number;
+    }
+
+    export interface TransitStop {
+        location: LatLng;
+        name: string;
+    }
+
+    export interface TransitLine {
+        agencies: TransitAgency[];
+        color: string;
+        icon: string;
+        name: string;
+        short_name: string;
+        text_color: string;
+        url: string;
+        vehicle: TransitVehicle;
+    }
+
+    export interface TransitAgency {
+        name: string;
+        phone: string;
+        url: string;
+    }
+
+    export interface TransitVehicle {
+        icon: string;
+        local_icon: string;
+        name: string;
+        type: VehicleType;
+    }
+
+    export enum VehicleType
+    {
+        BUS,
+        CABLE_CAR,
+        COMMUTER_TRAIN,
+        FERRY,
+        FUNICULAR,
+        GONDOLA_LIFT,
+        HEAVY_RAIL,
+        HIGH_SPEED_TRAIN,
+        INTERCITY_BUS,
+        METRO_RAIL,
+        MONORAIL,
+        OTHER,
+        RAIL,
+        SHARE_TAXI,
+        SUBWAY,
+        TRAM,
+        TROLLEYBUS
+    }
+
+    export class ElevationService {
+        getElevationAlongPath(request: PathElevationRequest, callback: (results: ElevationResult[], status: ElevationStatus) => void ): void;
+        getElevationForLocations(request: LocationElevationRequest, callback: (results: ElevationResult[], status: ElevationStatus) => void ): void;
+    }
+
+    export interface LocationElevationRequest {
+        locations: LatLng[];
+    }
+
+    export interface PathElevationRequest {
+        path?: LatLng[];
+        samples?: number;
+    }
+
+    export interface ElevationResult {
+        elevation: number;
+        location: LatLng;
+        resolution: number;
+    }
+
+    export enum ElevationStatus {
+        INVALID_REQUEST,
+        OK,
+        OVER_QUERY_LIMIT,
+        REQUEST_DENIED,
+        UNKNOWN_ERROR
+    }
+
+    export class MaxZoomService {
+        getMaxZoomAtLatLng(latlng: LatLng|LatLngLiteral, callback: (result: MaxZoomResult) => void ): void;
+    }
+
+    export interface MaxZoomResult {
+        status: MaxZoomStatus;
+        zoom: number;
+    }
+
+    export enum MaxZoomStatus {
+        ERROR,
+        OK
+    }
+
+    export class DistanceMatrixService {
+        getDistanceMatrix(request: DistanceMatrixRequest, callback: (response: DistanceMatrixResponse, status: DistanceMatrixStatus) => void ): void;
+    }
+
+    export interface DistanceMatrixRequest {
+        avoidFerries?: boolean;
+        avoidHighways?: boolean;
+        avoidTolls?: boolean;
+        destinations?: LatLng[]|string[];
+        durationInTraffic?: boolean;
+        origins?: LatLng[]|string[];
+        region?: string;
+        transitOptions?: TransitOptions;
+        travelMode?: TravelMode;
+        unitSystem?: UnitSystem;
+    }
+
+    export interface DistanceMatrixResponse {
+        destinationAddresses: string[];
+        originAddresses: string[];
+        rows: DistanceMatrixResponseRow[];
+    }
+
+    export interface DistanceMatrixResponseRow {
+        elements: DistanceMatrixResponseElement[];
+    }
+
+    export interface DistanceMatrixResponseElement {
+        distance: Distance;
+        duration: Duration;
+        fare: TransitFare;
+        status: DistanceMatrixElementStatus;
+    }
+
+    export enum DistanceMatrixStatus {
+        INVALID_REQUEST,
+        MAX_DIMENSIONS_EXCEEDED,
+        MAX_ELEMENTS_EXCEEDED,
+        OK,
+        OVER_QUERY_LIMIT,
+        REQUEST_DENIED,
+        UNKNOWN_ERROR
+    }
+
+    export enum DistanceMatrixElementStatus {
+        NOT_FOUND,
+        OK,
+        ZERO_RESULTS
+    }
+
+    /***** Save to Google Maps *****/
+    export interface Attribution {
+        iosDeepLinkId?: string;
+        source?: string;
+        webUrl?: string;
+    }
+
+    export interface Place {
+        location?: LatLng|LatLngLiteral;
+        placeId?: string;
+        query?: string;
+    }
+
+    export class SaveWidget {
+        constructor(container: Node, opts?: SaveWidgetOptions);
+        getAttribution(): Attribution;
+        getPlace(): Place;
+        setAttribution(attribution: Attribution): void;
+        setOptions(opts: SaveWidgetOptions): void;
+        setPlace(place: Place): void;
+    }
+
+    export interface SaveWidgetOptions{
+        attribution?: Attribution;
+        place?: Place;
+    }
+
+    /***** Map Types *****/
+    export interface MapType {
+        getTile(tileCoord: Point, zoom: number, ownerDocument: Document): Element;
+        releaseTile(tile: Element): void;
+        alt?: string;
+        maxZoom?: number;
+        minZoom?: number;
+        name?: string;
+        projection?: Projection;
+        radius?: number;
+        tileSize?: Size;
+    }
+
+    export class MapTypeRegistry extends MVCObject {
+        constructor();
+        set(id: string, mapType: MapType): void;
+    }
+
+    export interface Projection {
+        fromLatLngToPoint(latLng: LatLng, point?: Point): Point;
+        fromPointToLatLng(pixel: Point, noWrap?: boolean): LatLng;
+    }
+
+    export class ImageMapType extends MVCObject implements MapType {
+        constructor(opts: ImageMapTypeOptions);
+        getOpacity(): number;
+        getTile(tileCoord: Point, zoom: number, ownerDocument: Document): Element;
+        releaseTile(tile: Element): void;
+        setOpacity(opacity: number): void;
+    }
+
+    export interface ImageMapTypeOptions {
+        alt?: string;
+        getTileUrl(tileCoord: Point, zoom: number): string;
+        maxZoom?: number;
+        minZoom?: number;
+        name?: string;
+        opacity?: number;
+        tileSize?: Size;
+    }
+
+    export class StyledMapType extends MVCObject implements MapType {
+        constructor(styles: MapTypeStyle[], options?: StyledMapTypeOptions);
+        getTile(tileCoord: Point, zoom: number, ownerDocument: Document): Element;
+        releaseTile(tile: Element): void;
+    }
+
+    export interface StyledMapTypeOptions {
+        alt?: string;
+        maxZoom?: number;
+        minZoom?: number;
+        name?: string;
+    }
+
+    export interface MapTypeStyle {
+        elementType?: MapTypeStyleElementType;
+        featureType?: MapTypeStyleFeatureType;
+        stylers?: MapTypeStyler[];
+    }
+
+    export interface MapTypeStyleFeatureType {
+        administrative?: {
+            country?: string;
+            land_parcel?: string;
+            locality?: string;
+            neighborhood?: string;
+            province?: string;
+        };
+        all?: string;
+        landscape?: {
+            man_made?: string;
+            natural?: {
+              landcover?: string;
+              terrain?: string;
+            };
+        };
+        poi?: {
+            attraction?: string;
+            business?: string;
+            government?: string;
+            medical?: string;
+            park?: string;
+            place_of_worship?: string;
+            school?: string;
+            sports_complex?: string;
+        };
+        road?: {
+            arterial?: string;
+            highway?: {
+                controlled_access?: string;
+            };
+            local?: string;
+        };
+        transit?: {
+            line?: string;
+            station?: {
+                airport?: string;
+                bus?: string;
+                rail?: string;
+            };
+        };
+        water?: string;
+    }
+
+    export interface MapTypeStyleElementType {
+        all?: string;
+        geometry?: {
+            fill?: string;
+            stroke?: string;
+        };
+        labels?: {
+            icon?: string;
+            text?: {
+                fill?: string;
+                stroke?: string;
+            }
+        };
+    }
+
+    export interface MapTypeStyler {
+        color?: string;
+        gamma?: number;
+        hue?: string;
+        invert_lightness?: boolean;
+        lightness?: number;
+        saturation?: number;
+        visibility?: string;
+        weight?: number;
+    }
+
+    /***** Layers *****/
+    export class BicyclingLayer extends MVCObject {
+        constructor();
+        getMap(): Map;
+        setMap(map: Map): void;
+    }
+
+    export class FusionTablesLayer extends MVCObject {
+        constructor(options: FusionTablesLayerOptions);
+        getMap(): Map;
+        setMap(map: Map): void;
+        setOptions(options: FusionTablesLayerOptions): void;
+    }
+
+    export interface FusionTablesLayerOptions {
+        clickable?: boolean;
+        heatmap?: FusionTablesHeatmap;
+        map?: Map;
+        query?: FusionTablesQuery;
+        styles?: FusionTablesStyle[];
+        suppressInfoWindows?: boolean;
+    }
+
+    export interface FusionTablesQuery {
+        from?: string;
+        limit?: number;
+        offset?: number;
+        orderBy?: string;
+        select?: string;
+        where?: string;
+    }
+
+    export  interface FusionTablesStyle {
+        markerOptions?: FusionTablesMarkerOptions;
+        polygonOptions?: FusionTablesPolygonOptions;
+        polylineOptions?: FusionTablesPolylineOptions;
+        where?: string;
+    }
+
+    export interface FusionTablesHeatmap {
+        enabled: boolean;
+    }
+
+    export interface FusionTablesMarkerOptions {
+        iconName: string;
+    }
+
+    export interface FusionTablesPolygonOptions {
+        fillColor?: string;
+        fillOpacity?: number;
+        strokeColor?: string;
+        strokeOpacity?: number;
+        strokeWeight?: number;
+    }
+
+    export interface FusionTablesPolylineOptions {
+        strokeColor?: string;
+        strokeOpacity?: number;
+        strokeWeight?: number;
+    }
+
+    export interface FusionTablesMouseEvent {
+        infoWindowHtml?: string;
+        latLng?: LatLng;
+        pixelOffset?: Size;
+        row?: Object; // Object<FusionTablesCell>
+    }
+
+    export interface FusionTablesCell {
+        columnName?: string;
+        value?: string;
+    }
+
+    export class KmlLayer extends MVCObject {
+        constructor(opts?: KmlLayerOptions);
+        getDefaultViewport(): LatLngBounds;
+        getMap(): Map;
+        getMetadata(): KmlLayerMetadata;
+        getStatus(): KmlLayerStatus;
+        getUrl(): string;
+        getZIndex(): number;
+        setMap(map: Map): void;
+        setUrl(url: string): void;
+        setZIndez(zIndex: number): void;
+    }
+
+    export interface KmlLayerOptions {
+        clickable?: boolean;
+        map?: Map;
+        preserveViewport?: boolean;
+        screenOverlays?: boolean;
+        suppressInfoWindows?: boolean;
+        url?: string;
+        zIndex?: number;
+    }
+
+    export interface KmlLayerMetadata {
+        author: KmlAuthor;
+        description: string;
+        hasScreenOverlays: boolean;
+        name: string;
+        snippet: string;
+    }
+
+    export enum KmlLayerStatus {
+        DOCUMENT_NOT_FOUND,
+        DOCUMENT_TOO_LARGE,
+        FETCH_ERROR,
+        INVALID_DOCUMENT,
+        INVALID_REQUEST,
+        LIMITS_EXCEEDED,
+        OK,
+        TIMED_OUT,
+        UNKNOWN
+    }
+
+    export interface KmlMouseEvent {
+        featureData: KmlFeatureData;
+        latLng: LatLng;
+        pixelOffset: Size;
+    }
+
+    export interface KmlFeatureData {
+        author: KmlAuthor;
+        description: string;
+        id: string;
+        infoWindowHtml: string;
+        name: string;
+        snippet: string;
+    }
+
+    export interface KmlAuthor {
+        email: string;
+        name: string;
+        uri: string;
+    }
+
+    export class TrafficLayer extends MVCObject {
+        constructor();
+        getMap(): void;
+        setMap(map: Map): void;
+    }
+
+    export class TransitLayer extends MVCObject {
+        constructor();
+        getMap(): void;
+        setMap(map: Map): void;
+    }
+
+    /***** Street View *****/
+    export class StreetViewPanorama {
+        constructor(container: Element, opts?: StreetViewPanoramaOptions);
+        controls: MVCArray[]; // Array<MVCArray<Node>>
+        getLinks(): StreetViewLink[];
+        getLocation():  StreetViewLocation;
+        getPano(): string;
+        getPhotographerPov(): StreetViewPov;
+        getPosition(): LatLng;
+        getPov(): StreetViewPov;
+        getStatus(): StreetViewStatus;
+        getVisible(): boolean;
+        getZoom(): number;
+        registerPanoProvider(provider: (input: string) => StreetViewPanoramaData): void;
+        setLinks(links: Array<StreetViewLink>): void;
+        setOptions(options: StreetViewPanoramaOptions): void;
+        setPano(pano: string): void;
+        setPosition(latLng: LatLng|LatLngLiteral): void;
+        setPov(pov: StreetViewPov): void;
+        setVisible(flag: boolean): void;
+        setZoom(zoom: number): void;
+    }
+
+    export interface StreetViewPanoramaOptions {
+        addressControl?: boolean;
+        addressControlOptions?: StreetViewAddressControlOptions;
+        clickToGo?: boolean;
+        disableDefaultUi?: boolean;
+        disableDoubleClickZoom?: boolean;
+        enableCloseButton?: boolean;
+        imageDateControl?: boolean;
+        linksControl?: boolean;
+        panControl?: boolean;
+        panControlOptions?: PanControlOptions;
+        pano?: string;
+        panoProvider?: (input: string) => StreetViewPanoramaData;
+        position?: LatLng|LatLngLiteral;
+        pov?: StreetViewPov;
+        scrollwheel?: boolean;
+        visible?: boolean;
+        zoomControl?: boolean;
+        zoomControlOptions?: ZoomControlOptions;
+    }
+
+    export interface StreetViewAddressControlOptions {
+        position?: ControlPosition;
+    }
+
+    export interface StreetViewLink {
+        description?: string;
+        heading?: number;
+        pano?: string;
+    }
+
+    export interface StreetViewPov {
+        heading?: number;
+        pitch?: number;
+    }
+
+    export interface StreetViewPanoramaData {
+        copyright?: string;
+        imageDate?: string;
+        links?: StreetViewLink[];
+        location?: StreetViewLocation;
+        tiles?: StreetViewTileData;
+    }
+
+    export interface StreetViewLocation {
+        description?: string;
+        latLng?: LatLng;
+        pano?: string;
+        shortDescription?: string;
+    }
+
+    export interface StreetViewTileData {
+        getTileUrl(pano: string, tileZoom: number, tileX: number, tileY: number): string;
+        centerHeading?: number;
+        tileSize?: Size;
+        worldSize?: Size;
+    }
+
+    export class StreetViewService {
+        getPanoramaById(pano: string, callback: (streetViewPanoramaData: StreetViewPanoramaData, streetViewStatus: StreetViewStatus) => void): void;
+        getPanoramaByLocation(latlng: LatLng|LatLngLiteral, radius: number, callback: (streetViewPanoramaData: StreetViewPanoramaData, streetViewStatus: StreetViewStatus) => void ): void;
+    }
+
+    export enum StreetViewStatus {
+        OK,
+        UNKNOWN_ERROR,
+        ZERO_RESULTS
+    }
+
+    export class StreetViewCoverageLayer extends MVCObject  {
+        getMap(): Map;
+        setMap(map: Map): void;
+    }
+
+    /***** Events *****/
+    export interface MapsEventListener {
+        /** Removes the listener.  Equivalent to calling google.maps.event.removeListener(listener). */
+        remove(): void;
+    }
+
+    export class event {
+        /**
+         * Cross browser event handler registration. This listener is removed by calling
+         * removeListener(handle) for the handle that is returned by this function.
+         */
+        static addDomListener(instance: Object, eventName: string, handler: Function, capture?: boolean): MapsEventListener;
+        /**
+         * Wrapper around addDomListener that removes the listener after the first event.
+         */
+        static addDomListenerOnce(instance: Object, eventName: string, handler: Function, capture?: boolean): MapsEventListener;
+        /**
+         * Adds the given listener function to the given event name for the given object
+         * instance. Returns an identifier for this listener that can be used with
+         * removeListener().
+         */
+        static addListener(instance: Object, eventName: string, handler: Function): MapsEventListener;
+        /**
+         * Like addListener, but the handler removes itself after handling the first event.
+         */
+        static addListenerOnce(instance: Object, eventName: string, handler: Function): MapsEventListener;
+        /**
+         * Removes all listeners for all events for the given instance.
+         */
+        static clearInstanceListeners(instance: Object): void;
+        /**
+         * Removes all listeners for the given event for the given instance.
+         */
+        static clearListeners(instance: Object, eventName: string): void;
+        /**
+         * Removes the given listener, which should have been returned by addListener above.
+         * Equivalent to calling listener.remove().
+         */
+        static removeListener(listener: MapsEventListener): void;
+        /**
+         * Triggers the given event. All arguments after eventName are passed as arguments to
+         * the listeners.
+         */
+        static trigger(instance: any, eventName: string, ...args: any[]): void;
+    }
+
+    export interface MouseEvent {
+        stop(): void;
+        latLng: LatLng;
+    }
+
+    /* **** Base **** */
+
+    /**
+     * A LatLng is a point in geographical coordinates: latitude and longitude.
+     *
+     * * Latitude ranges between -90 and 90 degrees, inclusive. Values above or
+     *   below this range will be clamped to the range [-90, 90]. This means
+     *   that if the value specified is less than -90, it will be set to -90.
+     *   And if the value is greater than 90, it will be set to 90.
+     * * Longitude ranges between -180 and 180 degrees, inclusive. Values above
+     *   or below this range will be wrapped so that they fall within the
+     *   range. For example, a value of -190 will be converted to 170. A value
+     *   of 190 will be converted to -170. This reflects the fact that
+     *   longitudes wrap around the globe.
+     *
+     * Although the default map projection associates longitude with the
+     * x-coordinate of the map, and latitude with the y-coordinate, the
+     * latitude coordinate is always written first, followed by the longitude.
+     * Notice that you cannot modify the coordinates of a LatLng. If you want
+     * to compute another point, you have to create a new one.
+     */
+    export class LatLng {
+        /**
+         * Creates a LatLng object representing a geographic point.
+         * Note the ordering of latitude and longitude.
+         * @param lat Latitude is specified in degrees within the range [-90, 90].
+         * @param lng Longitude is specified in degrees within the range [-180, 180].
+         * @param noWrap Set noWrap to true to enable values outside of this range.
+         */
+        constructor(lat: number, lng: number, noWrap?: boolean);
+        /** Comparison function. */
+        equals(other: LatLng): boolean;
+        /** Returns the latitude in degrees. */
+        lat(): number;
+        /** Returns the longitude in degrees. */
+        lng(): number;
+        /** Converts to string representation. */
+        toString(): string;
+        /** Returns a string of the form "lat,lng". We round the lat/lng values to 6 decimal places by default. */
+        toUrlValue(precision?: number): string;
+    }
+
+    export type LatLngLiteral = { lat: number; lng: number }
+
+    export class LatLngBounds {
+        constructor(sw?: LatLng, ne?: LatLng);
+        contains(latLng: LatLng): boolean;
+        equals(other: LatLngBounds): boolean;
+        extend(point: LatLng): LatLngBounds;
+        getCenter(): LatLng;
+        getNorthEast(): LatLng;
+        getSouthWest(): LatLng;
+        intersects(other: LatLngBounds): boolean;
+        isEmpty(): boolean;
+        toSpan(): LatLng;
+        toString(): string;
+        toUrlValue(precision?: number): string;
+        union(other: LatLngBounds): LatLngBounds;
+    }
+
+    export class Point {
+        /** A point on a two-dimensional plane. */
+        constructor(x: number, y: number);
+        /** The X coordinate */
+        x: number;
+        /** The Y coordinate */
+        y: number;
+        /** Compares two Points */
+        equals(other: Point): boolean;
+        /** Returns a string representation of this Point. */
+        toString(): string;
+    }
+
+    export class Size {
+        constructor(width: number, height: number, widthUnit?: string, heightUnit?: string);
+        height: number;
+        width: number;
+        equals(other: Size): boolean;
+        toString(): string;
+    }
+
+    /***** MVC *****/
+    export class MVCObject {
+        constructor();
+        addListener(eventName: string, handler: (...args: any[]) => void): MapsEventListener;
+        bindTo(key: string, target: MVCObject, targetKey?: string, noNotify?: boolean): void;
+        changed(key: string): void;
+        get(key: string): any;
+        notify(key: string): void;
+        set(key: string, value: any): void;
+        setValues(values: any): void;
+        unbind(key: string): void;
+        unbindAll(): void;
+    }
+
+    export class MVCArray extends MVCObject {
+        constructor(array?: any[]);
+        clear(): void;
+        forEach(callback: (elem: any, i: number) => void): void;
+        getArray(): any[];
+        getAt(i: number): any;
+        getLength(): number;
+        insertAt(i: number, elem: any): void;
+        pop(): any;
+        push(elem: any): number;
+        removeAt(i: number): any;
+        setAt(i: number, elem: any): void;
+    }
+
+    /***** Geometry Library *****/
+    export module geometry {
+        export class encoding {
+            static decodePath(encodedPath: string): LatLng[];
+            static encodePath(path: any[]): string; // LatLng[]|MVCArray<LatLng>
+        }
+
+        /**
+         * Utility functions for computing geodesic angles, distances and areas.
+         * The default radius is Earth's radius of 6378137 meters.
+         */
+        export class spherical {
+            /**
+             * Returns the area of a closed path.
+             * The computed area uses the same units as the radius.
+             * The radius defaults to the Earth's radius in meters,
+             * in which case the area is in square meters.
+             */
+            static computeArea(path: any[], radius?: number): number; // LatLng[]|MVCArray<LatLng>
+            /**
+             * Returns the distance, in meters, between two LatLngs.
+             * You can optionally specify a custom radius.
+             * The radius defaults to the radius of the Earth.
+             */
+            static computeDistanceBetween(from: LatLng, to: LatLng, radius?: number): number;
+            /**
+             * Returns the heading from one LatLng to another LatLng.
+             * Headings are expressed in degrees clockwise from North within the range [-180,180).
+             */
+            static computeHeading(from: LatLng, to: LatLng): number;
+            /**
+             * Returns the length of the given path.
+             */
+            static computeLength(path: any[], radius?: number): number; // LatLng[]|MVCArray<LatLng>
+            /**
+             * Returns the LatLng resulting from moving a distance from an origin in the
+             * specified heading (expressed in degrees clockwise from north).
+             */
+            static computeOffset(from: LatLng, distance: number, heading: number, radius?: number): LatLng;
+            /**
+             * Returns the location of origin when provided with a LatLng destination, meters
+             * travelled and original heading. Headings are expressed in degrees clockwise from
+             * North. This function returns null when no solution is available.
+             */
+            static computeOffsetOrigin(to: LatLng, distance: number, heading: number, radius?: number): LatLng;
+            /**
+             * Returns the signed area of a closed path. The signed area may be used to determine
+             * the orientation of the path. The computed area uses the same units as the radius.
+             * The radius defaults to the Earth's radius in meters, in which case the area is in
+             * square meters.
+             */
+            static computeSignedArea(loop: any[], radius?: number): number; // LatLng[]|MVCArray<LatLng>
+            /**
+             * Returns the LatLng which lies the given fraction of the way between the origin
+             * LatLng and the destination LatLng.
+             */
+            static interpolate(from: LatLng, to: LatLng, fraction: number): LatLng;
+        }
+
+        export class poly {
+            static containsLocation(point: LatLng, polygon: Polygon): boolean;
+            static isLocationOnEdge(point: LatLng, poly: Polygon|Polyline, tolerance?: number): boolean;
+        }
+    }
+
+    /***** AdSense Library *****/
+    export module adsense {
+        export class AdUnit extends MVCObject {
+            constructor(container: Element, opts: AdUnitOptions);
+            getBackgroundColor(): string;
+            getBorderColor(): string;
+            getChannelNumber(): string;
+            getContainer(): Element;
+            getFormat(): AdFormat;
+            getMap(): Map;
+            getPosition(): ControlPosition;
+            getPublisherId(): string;
+            getTextColor(): string;
+            getTitleColor(): string;
+            getUrlColor(): string;
+            setBackgroundColor(backgroundColor: string): void;
+            setBorderColor(borderColor: string): void;
+            setChannelNumber(channelNumber: string): void;
+            setFormat(format: AdFormat): void;
+            setMap(map: Map): void;
+            setPosition(position: ControlPosition): void;
+            setTextColor(textColor: string): void;
+            setTitleColor(titleColor: string): void;
+            setUrlColor(urlColor: string): void;
+        }
+
+        export interface AdUnitOptions {
+            backgroundColor?: string;
+            borderColor?: string;
+            channelNumber?: string;
+            format?: AdFormat;
+            map?: Map;
+            position?: ControlPosition;
+            publisherId?: string;
+            textColor?: string;
+            titleColor?: string;
+            urlColor?: string;
+        }
+
+        export enum AdFormat {
+            BANNER,
+            BUTTON,
+            HALF_BANNER,
+            LARGE_HORIZONTAL_LINK_UNIT,
+            LARGE_RECTANGLE,
+            LARGE_VERTICAL_LINK_UNIT,
+            LEADERBOARD,
+            MEDIUM_RECTANGLE,
+            MEDIUM_VERTICAL_LINK_UNIT,
+            SKYSCRAPER,
+            SMALL_HORIZONTAL_LINK_UNIT,
+            SMALL_RECTANGLE,
+            SMALL_SQUARE,
+            SMALL_VERTICAL_LINK_UNIT,
+            SQUARE,
+            VERTICAL_BANNER,
+            WIDE_SKYSCRAPER,
+            X_LARGE_VERTICAL_LINK_UNIT
+        }
+    }
+
+    /***** Places Library *****/
+    export module places {
+        export class Autocomplete extends MVCObject {
+            constructor(inputField: HTMLInputElement, opts?: AutocompleteOptions);
+            getBounds(): LatLngBounds;
+            getPlace(): PlaceResult;
+            setBounds(bounds: LatLngBounds): void;
+            setComponentRestrictions(restrictions: ComponentRestrictions): void;
+            setTypes(types: string[]): void;
+        }
+
+        export interface AutocompleteOptions  {
+            bounds?: LatLngBounds;
+            componentRestrictions?: ComponentRestrictions;
+            types?: string[];
+        }
+
+        export interface AutocompletePrediction {
+            description: string;
+            matched_substrings: PredictionSubstring[];
+            place_id: string;
+            terms: PredictionTerm[];
+            types: string[];
+        }
+
+        export interface PredictionTerm {
+            offset: number;
+            value: string;
+        }
+
+        export interface PredictionSubstring {
+            length: number;
+            offset: number;
+        }
+
+        export class AutocompleteService {
+            constructor();
+            getPlacePredictions(request: AutocompletionRequest, callback: (result: AutocompletePrediction[], status: PlacesServiceStatus) => void): void;
+            getQueryPredictions(request: QueryAutocompletionRequest, callback: (result: QueryAutocompletePrediction[], status: PlacesServiceStatus) => void): void;
+        }
+
+        export interface AutocompletionRequest {
+            bounds?: LatLngBounds;
+            componentRestrictions?: ComponentRestrictions;
+            input: string;
+            location?: LatLng;
+            offset?: number;
+            radius?: number;
+            types?: string[];
+        }
+
+        export interface ComponentRestrictions {
+            country: string;
+        }
+
+        export interface PlaceAspectRating {
+            rating: number;
+            type: string;
+        }
+
+        export interface PlaceDetailsRequest  {
+            placeId: string;
+        }
+
+        export interface PlaceGeometry {
+            location: LatLng;
+            viewport: LatLngBounds;
+        }
+
+        export interface PlacePhoto {
+            height: number;
+            html_attributions: string[];
+            width: number;
+            getUrl(opts: PhotoOptions): string;
+        }
+
+        export interface PhotoOptions {
+            maxHeight?: number;
+            maxWidth?: number;
+        }
+
+        export interface PlaceResult {
+            address_components: GeocoderAddressComponent[];
+            aspects: PlaceAspectRating[];
+            formatted_address: string;
+            formatted_phone_number: string;
+            geometry: PlaceGeometry;
+            html_attributions: string[];
+            icon: string;
+            international_phone_number: string;
+            name: string;
+            permanently_closed: boolean;
+            photos: PlacePhoto[];
+            place_id: string;
+            price_level: number;
+            rating: number;
+            reviews: PlaceReview[];
+            types: string[];
+            url: string;
+            vicinity: string;
+            website: string;
+        }
+
+        export interface PlaceReview {
+            aspects: PlaceAspectRating[];
+            author_name: string;
+            author_url: string;
+            language: string;
+            text: string;
+        }
+
+        export interface PlaceSearchPagination {
+            nextPage(): void;
+            hasNextPage: boolean;
+        }
+
+        export interface PlaceSearchRequest {
+            bounds?: LatLngBounds;
+            keyword?: string;
+            location?: LatLng|LatLngLiteral;
+            maxPriceLevel?: number;
+            minPriceLevel?: number;
+            name?: string;
+            openNow?: boolean;
+            radius?: number;
+            rankBy?: RankBy;
+            types?: string[];
+        }
+
+        export class PlacesService {
+            constructor(attrContainer: HTMLDivElement|Map);
+            getDetails(request: PlaceDetailsRequest, callback: (result: PlaceResult, status: PlacesServiceStatus) => void): void;
+            nearbySearch(request: PlaceSearchRequest, callback: (results: PlaceResult[], status: PlacesServiceStatus, pagination: PlaceSearchPagination) => void): void;
+            radarSearch(request: RadarSearchRequest, callback: (results: PlaceResult[], status: PlacesServiceStatus) => void): void;
+            textSearch(request: TextSearchRequest, callback: (results: PlaceResult[], status: PlacesServiceStatus) => void): void;
+        }
+
+        export enum PlacesServiceStatus {
+            INVALID_REQUEST,
+            OK,
+            OVER_QUERY_LIMIT,
+            REQUEST_DENIED,
+            UNKNOWN_ERROR,
+            ZERO_RESULTS
+        }
+
+        export interface QueryAutocompletePrediction {
+            description: string;
+            matched_substrings: PredictionSubstring[];
+            place_id: string;
+            terms: PredictionTerm[];
+        }
+
+        export interface QueryAutocompletionRequest {
+            bounds?: LatLngBounds;
+            input?: string;
+            location?: LatLng;
+            offset?: number;
+            radius?: number;
+        }
+
+        export interface RadarSearchRequest {
+            bounds?: LatLngBounds;
+            keyword?: string;
+            location?: LatLng|LatLngLiteral;
+            name?: string;
+            radius?: number;
+            types?: string[];
+        }
+
+        export enum RankBy {
+            DISTANCE,
+            PROMINENCE
+        }
+
+        export class SearchBox extends MVCObject {
+            constructor(inputField: HTMLInputElement, opts?: SearchBoxOptions);
+            getBounds(): LatLngBounds;
+            getPlaces(): PlaceResult[];
+            setBounds(bounds: LatLngBounds): void;
+        }
+
+        export interface SearchBoxOptions {
+            bounds: LatLngBounds;
+        }
+
+        export interface TextSearchRequest {
+            bounds?: LatLngBounds;
+            location?: LatLng|LatLngLiteral;
+            query: string;
+            radius?: number;
+            types?: string[];
+        }
+    }
+
+    /***** Drawing Library *****/
+    export module drawing {
+        export class DrawingManager extends MVCObject {
+            constructor(options?: DrawingManagerOptions);
+            getDrawingMode(): OverlayType;
+            getMap(): Map;
+            setDrawingMode(drawingMode: OverlayType): void;
+            setMap(map: Map): void;
+            setOptions(options: DrawingManagerOptions): void;
+        }
+
+        export interface  DrawingManagerOptions {
+            circleOptions?: CircleOptions;
+            drawingControl?: boolean;
+            drawingControlOptions?: DrawingControlOptions;
+            drawingMode?: OverlayType;
+            map?: Map;
+            markerOptions?: MarkerOptions;
+            polygonOptions?: PolygonOptions;
+            polylineOptions?: PolylineOptions;
+            rectangleOptions?: RectangleOptions;
+        }
+
+        export interface DrawingControlOptions {
+            drawingModes?: OverlayType[];
+            position?: ControlPosition;
+        }
+
+        export interface OverlayCompleteEvent {
+            overlay: Marker|Polygon|Polyline|Rectangle|Circle;
+            type: OverlayType;
+        }
+
+        export enum OverlayType {
+            CIRCLE,
+            MARKER,
+            POLYGON,
+            POLYLINE,
+            RECTANGLE
+        }
+    }
+
+    /***** Visualization Library *****/
+    export module visualization {
+        export class MapsEngineLayer extends MVCObject {
+            constructor(options: MapsEngineLayerOptions);
+            getLayerId(): string;
+            getLayerKey(): string;
+            getMap(): Map;
+            getMapId(): string;
+            getOpacity(): number;
+            getProperties(): MapsEngineLayerProperties;
+            getStatus(): MapsEngineStatus;
+            getZIndex(): number;
+            setLayerId(layerId: string): void;
+            setLayerKey(layerKey: string): void;
+            setMap(map: Map): void;
+            setMapId(mapId: string): void;
+            setOpacity(opacity: number): void;
+            setOptions(options: MapsEngineLayerOptions): void;
+            setZIndex(zIndex: number): void;
+        }
+
+        export interface MapsEngineLayerOptions {
+            accessToken?: string;
+            clickable?: boolean;
+            fitBounds?: boolean;
+            layerId?: string;
+            layerKey?: string;
+            map?: Map;
+            mapId?: string;
+            opacity?: number;
+            suppressInfoWindows?: boolean;
+            zIndex?: number;
+        }
+
+        export interface MapsEngineLayerProperties {
+            name: string;
+        }
+
+        export interface MapsEngineMouseEvent {
+            featureId?: string;
+            infoWindowHtml?: string;
+            latLng?: LatLng;
+            pixelOffset?: Size;
+        }
+
+        export enum MapsEngineStatus {
+            INVALID_LAYER,
+            OK,
+            UNKNOWN_ERROR
+        }
+
+        export class HeatmapLayer extends MVCObject {
+            constructor(opts?: HeatmapLayerOptions);
+            getData(): MVCArray;
+            getMap(): Map;
+            setData(data: MVCArray): void;
+            setData(data: LatLng[]): void;
+            setData(data: WeightedLocation[]): void;
+            setMap(map: Map): void;
+        }
+
+        export interface HeatmapLayerOptions {
+            data: any;
+            dissipating?: boolean;
+            gradient?: string[];
+            map?: Map;
+            maxIntensity?: number;
+            opacity?: number;
+            radius?: number;
+        }
+
+        export interface WeightedLocation {
+            location: LatLng;
+            weight: number;
+        }
+
+        export class MouseEvent {
+            stop(): void;
+        }
+
+        export class MapsEventListener {
+
+        }
+    }
+}
diff --git a/googlemaps/tsconfig.json b/googlemaps/tsconfig.json
new file mode 100644
index 0000000000..01389fb82a
--- /dev/null
+++ b/googlemaps/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "google.maps-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/graceful-fs/graceful-fs-tests.ts b/graceful-fs/graceful-fs-tests.ts
index 5c9bb19aec..4fcd0aec49 100644
--- a/graceful-fs/graceful-fs-tests.ts
+++ b/graceful-fs/graceful-fs-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="graceful-fs.d.ts" />
 
 import fs = require('graceful-fs');
 
diff --git a/graceful-fs/graceful-fs.d.ts b/graceful-fs/graceful-fs.d.ts
deleted file mode 100644
index 7278caf487..0000000000
--- a/graceful-fs/graceful-fs.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Type definitions for graceful-fs 2.0.0
-// Project: https://github.com/cowboy/graceful-fs
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'graceful-fs' {
-	import fs = require('fs');
-	export = fs;
-}
diff --git a/graceful-fs/index.d.ts b/graceful-fs/index.d.ts
new file mode 100644
index 0000000000..4525e7aaca
--- /dev/null
+++ b/graceful-fs/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for graceful-fs 2.0.0
+// Project: https://github.com/cowboy/graceful-fs
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import fs = require('fs');
+export = fs;
diff --git a/graceful-fs/tsconfig.json b/graceful-fs/tsconfig.json
new file mode 100644
index 0000000000..e2caf15b94
--- /dev/null
+++ b/graceful-fs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "graceful-fs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/graham_scan/graham_scan-tests.ts b/graham_scan/graham_scan-tests.ts
index 4317db851e..15c114aefe 100644
--- a/graham_scan/graham_scan-tests.ts
+++ b/graham_scan/graham_scan-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="graham_scan.d.ts" />
+import ConvexHullGrahamScan = require("graham_scan");
 
 // Based on the README.MD
 
diff --git a/graham_scan/graham_scan.d.ts b/graham_scan/graham_scan.d.ts
deleted file mode 100644
index dbc30517b2..0000000000
--- a/graham_scan/graham_scan.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for graham_scan v1.0.2
-// Project: https://github.com/brian3kb/graham_scan_js
-// Definitions by: Harm Berntsen <https://github.com/hberntsen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-declare class ConvexHullGrahamScan {
-    addPoint(x: number, y: number): void;
-    getHull(): {x: number, y: number}[];
-}
-
-declare module 'graham_scan' {
-    export = ConvexHullGrahamScan;
-}
diff --git a/graham_scan/index.d.ts b/graham_scan/index.d.ts
new file mode 100644
index 0000000000..ac3bdfc9ad
--- /dev/null
+++ b/graham_scan/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for graham_scan v1.0.2
+// Project: https://github.com/brian3kb/graham_scan_js
+// Definitions by: Harm Berntsen <https://github.com/hberntsen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+declare class ConvexHullGrahamScan {
+    addPoint(x: number, y: number): void;
+    getHull(): {x: number, y: number}[];
+}
+
+export = ConvexHullGrahamScan;
+export as namespace ConvexHullGrahamScan;
diff --git a/graham_scan/tsconfig.json b/graham_scan/tsconfig.json
new file mode 100644
index 0000000000..ab29975c64
--- /dev/null
+++ b/graham_scan/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "graham_scan-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/graphene-pk11/graphene-pk11-tests.ts b/graphene-pk11/graphene-pk11-tests.ts
index 624e0c2f1e..738f308329 100644
--- a/graphene-pk11/graphene-pk11-tests.ts
+++ b/graphene-pk11/graphene-pk11-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./graphene-pk11.d.ts" />
 
 import * as graphene from "graphene-pk11";
 
diff --git a/graphene-pk11/graphene-pk11.d.ts b/graphene-pk11/graphene-pk11.d.ts
deleted file mode 100644
index 5c0c5c5142..0000000000
--- a/graphene-pk11/graphene-pk11.d.ts
+++ /dev/null
@@ -1,2719 +0,0 @@
-// Type definitions for graphene-pk11 v2.0.0
-// Project: https://github.com/PeculiarVentures/graphene
-// Definitions by: Stepan Miroshin <https://github.com/microshine>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-/**
- * A simple layer for interacting with PKCS #11 / PKCS11 / CryptoKI for Node
- * v2.0.0
- */
-
-declare module "graphene-pk11" {
-
-    type Callback = (err: Error, rv: number) => void;
-    type CK_PTR = Buffer;
-
-    class Pkcs11 {
-        lib: any;
-        /**
-         * load a library with PKCS11 interface
-         * @param {string} libFile path to PKCS11 library
-         */
-        constructor(libFile: string);
-        protected callFunction(funcName: string, args: any[]): number;
-        /**
-         * C_Initialize initializes the Cryptoki library.
-         * @param pInitArgs   if this is not NULL_PTR, it gets
-         *                    cast to CK_C_INITIALIZE_ARGS_PTR
-         *                    and dereferenced
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_Initialize(pInitArgs?: CK_PTR): number;
-        C_Initialize(pInitArgs: CK_PTR, cllback: Callback): void;
-        /**
-         * C_Finalize indicates that an application is done with the Cryptoki library.
-         * @param pReserved   reserved. Should be NULL_PTR
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_Finalize(pReserved?: CK_PTR): number;
-        C_Finalize(pReserved: CK_PTR, callback: Callback): void;
-        /**
-         * C_GetInfo returns general information about Cryptoki.
-         * @param pInfo       location that receives information
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GetInfo(pInfo: CK_PTR): number;
-        C_GetInfo(pInfo: CK_PTR, callback: Callback): void;
-        /**
-         * C_GetSlotList obtains a list of slots in the system.
-         * @param {boolean} tokenPresent only slots with tokens?
-         * @param pSlotList receives array of slot IDs
-         * @param pulCount receives number of slots
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GetSlotList(tokenPresent: boolean, pSlotList: CK_PTR, pulCount: CK_PTR): number;
-        C_GetSlotList(tokenPresent: boolean, pSlotList: CK_PTR, pulCount: CK_PTR, callback: Callback): void;
-        /**
-         * C_GetSlotInfo obtains information about a particular slot in
-         * the system.
-         * @param {number} slotID the ID of the slot
-         * @param {Buffer} pInfo receives the slot information
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GetSlotInfo(slotID: number, pInfo: CK_PTR): number;
-        C_GetSlotInfo(slotID: number, pInfo: CK_PTR, callback: Callback): void;
-        /**
-         * C_GetTokenInfo obtains information about a particular token
-         * in the system.
-         * @param {number} slotID ID of the token's slot
-         * @param {Buffer} pInfo receives the token information
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GetTokenInfo(slotID: number, pInfo: Buffer): number;
-        C_GetTokenInfo(slotID: number, pInfo: Buffer, callback: Callback): void;
-        /**
-         * C_GetMechanismList obtains a list of mechanism types
-         * supported by a token.
-         * @param {number} slotID ID of the token's slot
-         * @param {number} pMechanismList gets mech. array
-         * @param {number} pulCount gets # of mechs
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GetMechanismList(slotID: number, pMechanismList: Buffer, pulCount: Buffer): number;
-        C_GetMechanismList(slotID: number, pMechanismList: Buffer, pulCount: Buffer, callback: Callback): void;
-        /** C_GetMechanismInfo obtains information about a particular
-         * mechanism possibly supported by a token.
-         * @param {number} slotID ID of the token's slot
-         * @param {number} type type of mechanism
-         * @param {Buffer} pInfo receives mechanism info
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GetMechanismInfo(slotID: number, type: number, pInfo: Buffer): number;
-        C_GetMechanismInfo(slotID: number, type: number, pInfo: Buffer, callback: Callback): void;
-        /**
-         * C_InitToken initializes a token.
-         * @param {number} slotID ID of the token's slot
-         * @param {Buffer} pPin the SO's initial PIN
-         * @param {number} ulPinLen length in bytes of the PIN
-         * @param {number} pLabel 32-byte token label (blank padded)
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_InitToken(slotID: number, pPin: Buffer, ulPinLen: number, pLabel: Buffer): number;
-        C_InitToken(slotID: number, pPin: Buffer, ulPinLen: number, pLabel: Buffer, callback: Callback): void;
-        /**
-         * C_InitPIN initializes the normal user's PIN.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pPin the normal user's PIN
-         * @param {number} ulPinLen length in bytes of the PIN
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_InitPIN(hSession: number, pPin: Buffer, ulPinLen: number): number;
-        C_InitPIN(hSession: number, pPin: Buffer, ulPinLen: number, callback: Callback): void;
-        /**
-         * C_SetPIN modifies the PIN of the user who is logged in.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pOldPin the old PIN
-         * @param {number} ulOldLen length of the old PIN
-         * @param {Buffer} pNewPin the new PIN
-         * @param {number} ulNewLen length of the new PIN
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_SetPIN(hSession: any, pOldPin: Buffer, ulOldLen: number, pNewPin: Buffer, ulNewLen: number): number;
-        C_SetPIN(hSession: any, pOldPin: Buffer, ulOldLen: number, pNewPin: Buffer, ulNewLen: number, callback: Callback): void;
-        /**
-         * C_OpenSession opens a session between an application and a
-         * token.
-         * @param {number} slotID ID of the token's slot
-         * @param {number} flags from CK_SESSION_INFO
-         * @param {Buffer} pApplication passed to callback
-         * @param {Buffer} Notify callback function
-         * @param {Buffer} phSession gets session handle
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_OpenSession(slotID: number, flags: number, pApplication?: Buffer, notify?: Buffer, phSession?: Buffer): number;
-        C_OpenSession(slotID: number, flags: number, pApplication: Buffer, notify: Buffer, phSession: Buffer, callback: Callback): void;
-        /**
-         * C_CloseSession closes a session between an application and a token.
-         * @param {number} hSession the session's handle
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_CloseSession(hSession: number): number;
-        C_CloseSession(hSession: number, callback: Callback): void;
-        /**
-         * C_CloseAllSessions closes all sessions with a token.
-         * @param {number} slotID ID of the token's slot
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_CloseAllSessions(slotID: number): number;
-        C_CloseAllSessions(slotID: number, callback: Callback): void;
-        /**
-         * C_GetSessionInfo obtains information about the session.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pInfo receives session info
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GetSessionInfo(hSession: number, pInfo: Buffer): number;
-        C_GetSessionInfo(hSession: number, pInfo: Buffer, callback: Callback): void;
-        /**
-         * C_GetOperationState obtains the state of the cryptographic operation in a session.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pOperationState gets state
-         * @param {Buffer} pulOperationStateLen gets state length
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GetOperationState(hSession: number, pOperationState: Buffer, pulOperationStateLen: Buffer): number;
-        C_GetOperationState(hSession: number, pOperationState: Buffer, pulOperationStateLen: Buffer, callback: Callback): void;
-        /**
-         * C_SetOperationState restores the state of the cryptographic operation in a session.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pOperationState holds state
-         * @param {number} ulOperationStateLen holds holds state length
-         * @param {number} hEncryptionKey en/decryption key
-         * @param {number} hAuthenticationKey sign/verify key
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_SetOperationState(hSession: number, pOperationState: Buffer, ulOperationStateLen: number, hEncryptionKey: number, hAuthenticationKey: number): number;
-        C_SetOperationState(hSession: number, pOperationState: Buffer, ulOperationStateLen: number, hEncryptionKey: number, hAuthenticationKey: number, callback: Callback): void;
-        /**
-         * C_Login logs a user into a token.
-         * @param {number} hSession the session's handle
-         * @param {number} userType the user type
-         * @param {Buffer} pPin the user's PIN
-         * @param {number} ulPinLen the length of the PIN
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_Login(hSession: number, userType: number, pPin: Buffer, ulPinLen: number): number;
-        C_Login(hSession: number, userType: number, pPin: Buffer, ulPinLen: number, callback: Callback): void;
-        /**
-         * C_Logout logs a user out from a token.
-         * @param {number} hSession the session's handle
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_Logout(hSession: number): number;
-        C_Logout(hSession: number, callback: Callback): void;
-        /**
-         * C_CreateObject creates a new object.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pTemplate the object's template
-         * @param {number} ulCount attributes in template
-         * @param {Buffer} phObject gets new object's handle
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_CreateObject(hSession: number, pTemplate: Buffer, ulCount: number, phObject: Buffer): number;
-        C_CreateObject(hSession: number, pTemplate: Buffer, ulCount: number, phObject: Buffer, callback: Callback): void;
-        /**
-         * C_CopyObject copies an object, creating a new object for the copy.
-         * @param {number} hSession the session's handle
-         * @param {number} hObject the object's handle
-         * @param {Buffer} pTemplate template for new object
-         * @param {number} ulCount attributes in template
-         * @param {Buffer} phNewObject receives handle of copy
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_CopyObject(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number, phNewObject: Buffer): number;
-        C_CopyObject(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number, phNewObject: Buffer, callback: Callback): void;
-        /**
-         * C_DestroyObject destroys an object.
-         * @param {number} hSession the session's handle
-         * @param {number} hObject the object's handle
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DestroyObject(hSession: number, hObject: number): number;
-        C_DestroyObject(hSession: number, hObject: number, callback: Callback): void;
-        /**
-         * C_GetObjectSize gets the size of an object in bytes.
-         * @param {number} hSession the session's handle
-         * @param {number} hObject the object's handle
-         * @param {Buffer} pulSize receives size of object
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GetObjectSize(hSession: number, hObject: number, pulSize: Buffer): number;
-        C_GetObjectSize(hSession: number, hObject: number, pulSize: Buffer, callback: Callback): void;
-        /**
-         * C_GetAttributeValue obtains the value of one or more object attributes.
-         * @param {number} hSession the session's handle
-         * @param {number} hObject the object's handle
-         * @param {Buffer} pTemplate specifies attrs; gets vals
-         * @param {number} ulCount attributes in template
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GetAttributeValue(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number): number;
-        C_GetAttributeValue(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number, callback: Callback): void;
-        /**
-         * C_SetAttributeValue modifies the value of one or more object attributes
-         * @param {number} hSession the session's handle
-         * @param {number} hObject the object's handle
-         * @param {Buffer} pTemplate specifies attrs and values
-         * @param {number} ulCount attributes in template
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_SetAttributeValue(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number): number;
-        C_SetAttributeValue(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number, callback: Callback): void;
-        /**
-         * C_FindObjectsInit initializes a search for token and session
-         * objects that match a template.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pTemplate attribute values to match
-         * @param {number} ulCount attrs in search template
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_FindObjectsInit(hSession: number, pTemplate: Buffer, ulCount: number): number;
-        C_FindObjectsInit(hSession: number, pTemplate: Buffer, ulCount: number, callback: Callback): void;
-        /**
-         * C_FindObjects continues a search for token and session
-         * objects that match a template, obtaining additional object
-         * handles.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} phObject gets obj. handles
-         * @param {number} ulMaxObjectCount max handles to get
-         * @param {Buffer} pulObjectCount actual # returned
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_FindObjects(hSession: number, phObject: Buffer, ulMaxObjectCount: number, pulObjectCount: Buffer): number;
-        C_FindObjects(hSession: number, phObject: Buffer, ulMaxObjectCount: number, pulObjectCount: Buffer, callback: Callback): void;
-        /**
-         * C_FindObjectsFinal finishes a search for token and session objects.
-         * @param {number} hSession the session's handle
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_FindObjectsFinal(hSession: number): number;
-        C_FindObjectsFinal(hSession: number, callback: Callback): void;
-        /**
-         * C_EncryptInit initializes an encryption operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism the encryption mechanism
-         * @param {number} hKey handle of encryption key
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_EncryptInit(hSession: number, pMechanism: Buffer, hKey: number): number;
-        C_EncryptInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
-        /**
-         * C_Encrypt encrypts single-part data.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pData the plaintext data
-         * @param {number} ulDataLen bytes of plaintext
-         * @param {Buffer} pEncryptedData gets ciphertext
-         * @param {Buffer} pulEncryptedDataLen gets c-text size
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_Encrypt(hSession: number, pData: Buffer, ulDataLen: number, pEncryptedData: Buffer, pulEncryptedDataLen: Buffer): number;
-        C_Encrypt(hSession: number, pData: Buffer, ulDataLen: number, pEncryptedData: Buffer, pulEncryptedDataLen: Buffer, callback: Callback): void;
-        /**
-         * C_EncryptUpdate continues a multiple-part encryption operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pPart the plaintext data
-         * @param {number} ulPartLen plaintext data len
-         * @param {Buffer} pEncryptedPart gets ciphertext
-         * @param {Buffer} pulEncryptedPartLen gets c-text size
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_EncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer): number;
-        C_EncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer, callback: Callback): void;
-        /**
-         * C_EncryptFinal finishes a multiple-part encryption operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pLastEncryptedPart last c-text
-         * @param {Buffer} pulLastEncryptedPartLen gets last size
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_EncryptFinal(hSession: number, pLastEncryptedPart: Buffer, pulLastEncryptedPartLen: Buffer): number;
-        C_EncryptFinal(hSession: number, pLastEncryptedPart: Buffer, pulLastEncryptedPartLen: Buffer, callback: Callback): void;
-        /**
-         * C_DecryptInit initializes a decryption operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism the decryption mechanism
-         * @param {number} hKey handle of decryption key
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DecryptInit(hSession: number, pMechanism: Buffer, hKey: number): any;
-        C_DecryptInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
-        /**
-         * C_Decrypt decrypts encrypted data in a single part.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pEncryptedData ciphertext
-         * @param {number} ulEncryptedDataLen ciphertext length
-         * @param {Buffer} pData gets plaintext
-         * @param {number} pulDataLen gets p-text size
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_Decrypt(hSession: number, pEncryptedData: Buffer, ulEncryptedDataLen: number, pData: Buffer, pulDataLen: Buffer): number;
-        C_Decrypt(hSession: number, pEncryptedData: Buffer, ulEncryptedDataLen: number, pData: Buffer, pulDataLen: Buffer, callback: Callback): void;
-        /**
-         * C_DecryptUpdate continues a multiple-part decryption operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pEncryptedPart encrypted data
-         * @param {number} ulEncryptedPartLen input length
-         * @param {Buffer} pPart gets plaintext
-         * @param {Buffer} pulPartLen p-text size
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DecryptUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer): number;
-        C_DecryptUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer, callback: Callback): void;
-        /**
-         * C_DecryptFinal finishes a multiple-part decryption operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pLastPart gets plaintext
-         * @param {Buffer} pulLastPartLen p-text size
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DecryptFinal(hSession: number, pLastPart: Buffer, pulLastPartLen: Buffer): number;
-        C_DecryptFinal(hSession: number, pLastPart: Buffer, pulLastPartLen: Buffer, callback: Callback): void;
-        /**
-         * C_DigestInit initializes a message-digesting operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism the digesting mechanism
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DigestInit(hSession: number, pMechanism: Buffer): number;
-        C_DigestInit(hSession: number, pMechanism: Buffer, callback: Callback): void;
-        /**
-         * C_Digest digests data in a single part.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pData data to be digested
-         * @param {number} ulDataLen bytes of data to digest
-         * @param {Buffer} pDigest gets the message digest
-         * @param {Buffer} pulDigestLen gets digest length
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_Digest(hSession: number, pData: Buffer, ulDataLen: number, pDigest: Buffer, pulDigestLen: Buffer): number;
-        C_Digest(hSession: number, pData: Buffer, ulDataLen: number, pDigest: Buffer, pulDigestLen: Buffer, callback: Callback): void;
-        /**
-         * C_DigestUpdate continues a multiple-part message-digesting operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pPart data to be digested
-         * @param {number} ulPartLen bytes of data to be digested
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DigestUpdate(hSession: number, pPart: Buffer, ulPartLen: number): number;
-        C_DigestUpdate(hSession: number, pPart: Buffer, ulPartLen: number, callback: Callback): void;
-        /**
-         * C_DigestKey continues a multi-part message-digesting operation,
-         * by digesting the value of a secret key as part of
-         * the data already digested.
-         * @param {number} hSession the session's handle
-         * @param {number} hKey secret key to digest
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DigestKey(hSession: number, hKey: number): number;
-        C_DigestKey(hSession: number, hKey: number, callback: Callback): void;
-        /**
-         * C_DigestFinal finishes a multiple-part message-digesting
-         * operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pDigest gets the message digest
-         * @param {Buffer} pulDigestLen gets byte count of digest
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DigestFinal(hSession: number, pDigest: Buffer, pulDigestLen: Buffer): number;
-        C_DigestFinal(hSession: number, pDigest: Buffer, pulDigestLen: Buffer, callback: Callback): void;
-        /**
-         * C_SignInit initializes a signature (private key encryption)
-         * operation, where the signature is (will be) an appendix to
-         * the data, and plaintext cannot be recovered from the signature.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism the signature mechanism
-         * @param {number} hKey handle of signature key
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_SignInit(hSession: number, pMechanism: Buffer, hKey: number): number;
-        C_SignInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
-        /**
-         * C_Sign signs (encrypts with private key) data in a single
-         * part, where the signature is (will be) an appendix to the
-         * data, and plaintext cannot be recovered from the signature.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pData the data to sign
-         * @param {number} ulDataLen count of bytes to sign
-         * @param {Buffer} pSignature gets the signature
-         * @param {Buffer} pulSignatureLen gets signature length
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_Sign(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, pulSignatureLen: Buffer): number;
-        C_Sign(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, pulSignatureLen: Buffer, callback: Callback): void;
-        /**
-         * C_SignUpdate continues a multiple-part signature operation,
-         * where the signature is (will be) an appendix to the data,
-         * and plaintext cannot be recovered from the signature.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pPart the data to sign
-         * @param {number} ulPartLen count of bytes to sign
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_SignUpdate(hSession: number, pPart: Buffer, ulPartLen: Buffer): number;
-        C_SignUpdate(hSession: number, pPart: Buffer, ulPartLen: Buffer, callback: Callback): void;
-        /**
-         * C_SignFinal finishes a multiple-part signature operation,
-         * returning the signature.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pSignature gets the signature
-         * @param {Buffer} pulSignatureLen gets signature length
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_SignFinal(hSession: number, pSignature: Buffer, pulSignatureLen: Buffer): number;
-        C_SignFinal(hSession: number, pSignature: Buffer, pulSignatureLen: Buffer, callback: Callback): void;
-        /**
-         * C_SignRecoverInit initializes a signature operation, where
-         * the data can be recovered from the signature.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism the signature mechanism
-         * @param {number} hKey handle of the signature key
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_SignRecoverInit(hSession: number, pMechanism: Buffer, hKey: number): number;
-        C_SignRecoverInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
-        /**
-         * C_SignRecover signs data in a single operation, where the
-         * data can be recovered from the signature.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pData the data to sign
-         * @param {number} ulDataLen count of bytes to sign
-         * @param {Buffer} pSignature gets the signature
-         * @param {Buffer} pulSignatureLen gets signature length
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_SignRecover(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, pulSignatureLen: Buffer): number;
-        C_SignRecover(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, pulSignatureLen: Buffer, callback: Callback): void;
-        /**
-         * C_VerifyInit initializes a verification operation, where the
-         * signature is an appendix to the data, and plaintext cannot
-         * cannot be recovered from the signature (e.g. DSA).
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism the verification mechanism
-         * @param {number} hKey verification key
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_VerifyInit(hSession: number, pMechanism: Buffer, hKey: number): number;
-        C_VerifyInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
-        /**
-         * C_Verify verifies a signature in a single-part operation,
-         * where the signature is an appendix to the data, and plaintext
-         * cannot be recovered from the signature.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pData signed data
-         * @param {number} ulDataLen length of signed data
-         * @param {Buffer} pSignature signature
-         * @param {number} ulSignatureLen signature length
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_Verify(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, ulSignatureLen: Buffer): number;
-        C_Verify(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, ulSignatureLen: Buffer, callback: Callback): void;
-        /**
-         * C_VerifyUpdate continues a multiple-part verification
-         * operation, where the signature is an appendix to the data,
-         * and plaintext cannot be recovered from the signature.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pPart signed data
-         * @param {number} ulPartLen length of signed data
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_VerifyUpdate(hSession: number, pPart: Buffer, ulPartLen: number): number;
-        C_VerifyUpdate(hSession: number, pPart: Buffer, ulPartLen: number, callback: Callback): void;
-        /**
-         * C_VerifyFinal finishes a multiple-part verification
-         * operation, checking the signature.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pSignature signature to verify
-         * @param {number} ulSignatureLen signature length
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_VerifyFinal(hSession: number, pSignature: Buffer, ulSignatureLen: number): number;
-        C_VerifyFinal(hSession: number, pSignature: Buffer, ulSignatureLen: number, callback: Callback): void;
-        /**
-         * C_VerifyRecoverInit initializes a signature verification
-         * operation, where the data is recovered from the signature.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism the verification mechanism
-         * @param {number} hKey verification key
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_VerifyRecoverInit(hSession: number, pMechanism: Buffer, hKey: number): number;
-        C_VerifyRecoverInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
-        /**
-         * C_VerifyRecover verifies a signature in a single-part
-         * operation, where the data is recovered from the signature.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pSignature signature to verify
-         * @param {number} ulSignatureLen signature length
-         * @param {Buffer} pData gets signed data
-         * @param {Buffer} pulDataLen gets signed data len
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_VerifyRecover(hSession: number, pSignature: Buffer, ulSignatureLen: number, pData: Buffer, pulDataLen: Buffer): number;
-        C_VerifyRecover(hSession: number, pSignature: Buffer, ulSignatureLen: number, pData: Buffer, pulDataLen: Buffer, callback: Callback): void;
-        /**
-         * C_DigestEncryptUpdate continues a multiple-part digesting
-         * and encryption operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pPart the plaintext data
-         * @param {number} ulPartLen plaintext length
-         * @param {Buffer} pEncryptedPart gets ciphertext
-         * @param {Buffer} pulEncryptedPartLen gets c-text length
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DigestEncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer): number;
-        C_DigestEncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer, callback: Callback): void;
-        /**
-         * C_DecryptDigestUpdate continues a multiple-part decryption and
-         * digesting operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pEncryptedPart ciphertext
-         * @param {number} ulEncryptedPartLen ciphertext length
-         * @param {Buffer} pPart gets plaintext
-         * @param {Buffer} pulPartLen gets plaintext len
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DecryptDigestUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer): number;
-        C_DecryptDigestUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer, callback: Callback): void;
-        /**
-         * C_SignEncryptUpdate continues a multiple-part signing and
-         * encryption operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pPart the plaintext data
-         * @param {number} ulPartLen plaintext length
-         * @param {Buffer} pEncryptedPart gets ciphertext
-         * @param {Buffer} pulEncryptedPartLen gets c-text length
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_SignEncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer): number;
-        C_SignEncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer, callback: Callback): void;
-        /**
-         * C_DecryptVerifyUpdate continues a multiple-part decryption and
-         * verify operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pEncryptedPart ciphertext
-         * @param {number} ulEncryptedPartLen ciphertext length
-         * @param {Buffer} pPart gets plaintext
-         * @param {Buffer} pulPartLen gets p-text length
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DecryptVerifyUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer): number;
-        C_DecryptVerifyUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer, callback: Callback): void;
-        /**
-         * C_GenerateKey generates a secret key, creating a new key object.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism key generation mech.
-         * @param {Buffer} pTemplate template for new key
-         * @param {number} ulCount # of attrs in template
-         * @param {Buffer} phKey gets handle of new key
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GenerateKey(hSession: number, pMechanism: Buffer, pTemplate: Buffer, ulCount: number, phKey: Buffer): number;
-        C_GenerateKey(hSession: number, pMechanism: Buffer, pTemplate: Buffer, ulCount: number, phKey: Buffer, callback: Callback): any;
-        /**
-         * C_GenerateKeyPair generates a public-key/private-key pair,
-         * creating new key objects.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism key-gen mech.
-         * @param {Buffer} pPublicKeyTemplate template for public key
-         * @param {number} ulPublicKeyAttributeCount public attrs
-         * @param {Buffer} pPrivateKeyTemplate template for private key
-         * @param {number} ulPrivateKeyAttributeCount private attrs
-         * @param {Buffer} phPublicKey gets public key handle
-         * @param {Buffer} phPrivateKey gets private key handle
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GenerateKeyPair(hSession: number, pMechanism: Buffer, pPublicKeyTemplate: Buffer, ulPublicKeyAttributeCount: number, pPrivateKeyTemplate: Buffer, ulPrivateKeyAttributeCount: number, phPublicKey: Buffer, phPrivateKey: Buffer): number;
-        C_GenerateKeyPair(hSession: number, pMechanism: Buffer, pPublicKeyTemplate: Buffer, ulPublicKeyAttributeCount: number, pPrivateKeyTemplate: Buffer, ulPrivateKeyAttributeCount: number, phPublicKey: Buffer, phPrivateKey: Buffer, callback: Callback): void;
-        /**
-         * C_WrapKey wraps (i.e., encrypts) a key.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism the wrapping mechanism
-         * @param {number} hWrappingKey wrapping key
-         * @param {number} hKey key to be wrapped
-         * @param {Buffer} pWrappedKey gets wrapped key
-         * @param {Buffer} pulWrappedKeyLen gets wrapped key size
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_WrapKey(hSession: number, pMechanism: Buffer, hWrappingKey: number, hKey: number, pWrappedKey: Buffer, pulWrappedKeyLen: Buffer): number;
-        C_WrapKey(hSession: number, pMechanism: Buffer, hWrappingKey: number, hKey: number, pWrappedKey: Buffer, pulWrappedKeyLen: Buffer, callback: Callback): void;
-        /**
-         * C_UnwrapKey unwraps (decrypts) a wrapped key, creating a new
-         * key object.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism unwrapping mech.
-         * @param {Buffer} pWrappedKey the wrapped key
-         * @param {number} ulWrappedKeyLen wrapped key len
-         * @param {Buffer} pTemplate new key template
-         * @param {number} ulAttributeCount template length
-         * @param {Buffer} pTemplate new key template
-         * @param {number} ulAttributeCount template length
-         * @param {Buffer} phKey gets new handle
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_UnwrapKey(hSession: number, pMechanism: Buffer, hUnwrappingKey: number, pWrappedKey: Buffer, ulWrappedKeyLen: number, pTemplate: Buffer, ulAttributeCount: number, phKey: Buffer): number;
-        C_UnwrapKey(hSession: number, pMechanism: Buffer, hUnwrappingKey: number, pWrappedKey: Buffer, ulWrappedKeyLen: number, pTemplate: Buffer, ulAttributeCount: number, phKey: Buffer, callback: Callback): void;
-        /**
-         * C_DeriveKey derives a key from a base key, creating a new key object.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism key deriv. mech.
-         * @param {number} hBaseKey base key
-         * @param {Buffer} pTemplate new key template
-         * @param {number} ulAttributeCount template length
-         * @param {Buffer} phKey gets new handle
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DeriveKey(hSession: number, pMechanism: Buffer, hBaseKey: number, pTemplate: Buffer, ulAttributeCount: number, phKey: Buffer): number;
-        C_DeriveKey(hSession: number, pMechanism: Buffer, hBaseKey: number, pTemplate: Buffer, ulAttributeCount: number, phKey: Buffer, callback: Callback): void;
-        /**
-         * C_SeedRandom mixes additional seed material into the token's
-         * random number generator.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pSeed the seed material
-         * @param {number} ulSeedLen length of seed material
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_SeedRandom(hSession: number, pSeed: Buffer, ulSeedLen: number): number;
-        C_SeedRandom(hSession: number, pSeed: Buffer, ulSeedLen: number, callback: Callback): void;
-        /**
-         * C_GenerateRandom generates random data.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pRandomData receives the random data
-         * @param {number} ulRandomLen # of bytes to generate
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GenerateRandom(hSession: number, pRandomData: Buffer, ulRandomLen: number): number;
-        C_GenerateRandom(hSession: number, pRandomData: Buffer, ulRandomLen: number, callback: Callback): void;
-        /**
-         * C_GetFunctionStatus is a legacy function; it obtains an
-         * updated status of a function running in parallel with an
-         * application.
-         * @param {number} hSession the session's handle
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GetFunctionStatus(hSession: number): number;
-        C_GetFunctionStatus(hSession: number, callback: Callback): void;
-        /**
-         * C_CancelFunction is a legacy function; it cancels a function
-         * running in parallel.
-         * @param {number} hSession the session's handle
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_CancelFunction(hSession: number): number;
-        C_CancelFunction(hSession: number, callback: Callback): void;
-        /**
-         * C_WaitForSlotEvent waits for a slot event (token insertion,
-         * removal, etc.) to occur.
-         * @param {number} flags blocking/nonblocking flag
-         * @param {Buffer} pSlot location that receives the slot ID
-         * @param {Buffer} pRserved reserved.  Should be NULL_PTR
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_WaitForSlotEvent(flags: number, pSlot: Buffer, pRserved: Buffer): number;
-        C_WaitForSlotEvent(flags: number, pSlot: Buffer, pRserved: Buffer, callback: Callback): number;
-    }
-
-    enum KeyType {
-        RSA,
-        DSA,
-        DH,
-        ECDSA,
-        EC,
-        X9_42_DH,
-        KEA,
-        GENERIC_SECRET,
-        RC2,
-        RC4,
-        DES,
-        DES2,
-        DES3,
-        CAST,
-        CAST3,
-        CAST5,
-        CAST128,
-        RC5,
-        IDEA,
-        SKIPJACK,
-        BATON,
-        JUNIPER,
-        CDMF,
-        AES,
-        GOSTR3410,
-        GOSTR3411,
-        GOST28147,
-        BLOWFISH,
-        TWOFISH,
-        SECURID,
-        HOTP,
-        ACTI,
-        CAMELLIA,
-        ARIA,
-    }
-    enum KeyGenMechanism {
-        AES,
-        RSA,
-        RSA_X9_31,
-        DSA,
-        DH_PKCS,
-        DH_X9_42,
-        GOSTR3410,
-        GOST28147,
-        RC2,
-        RC4,
-        DES,
-        DES2,
-        SECURID,
-        ACTI,
-        CAST,
-        CAST3,
-        CAST5,
-        CAST128,
-        RC5,
-        IDEA,
-        GENERIC_SECRET,
-        SSL3_PRE_MASTER,
-        CAMELLIA,
-        ARIA,
-        SKIPJACK,
-        KEA,
-        BATON,
-        ECDSA,
-        EC,
-        JUNIPER,
-        TWOFISH,
-    }
-
-    enum MechanismEnum {
-        RSA_PKCS_KEY_PAIR_GEN,
-        RSA_PKCS,
-        RSA_9796,
-        RSA_X_509,
-        MD2_RSA_PKCS,
-        MD5_RSA_PKCS,
-        SHA1_RSA_PKCS,
-        RIPEMD128_RSA_PKCS,
-        RIPEMD160_RSA_PKCS,
-        RSA_PKCS_OAEP,
-        RSA_X9_31_KEY_PAIR_GEN,
-        RSA_X9_31,
-        SHA1_RSA_X9_31,
-        RSA_PKCS_PSS,
-        SHA1_RSA_PKCS_PSS,
-        DSA_KEY_PAIR_GEN,
-        DSA,
-        DSA_SHA1,
-        DH_PKCS_KEY_PAIR_GEN,
-        DH_PKCS_DERIVE,
-        X9_42_DH_KEY_PAIR_GEN,
-        X9_42_DH_DERIVE,
-        X9_42_DH_HYBRID_DERIVE,
-        X9_42_MQV_DERIVE,
-        SHA256_RSA_PKCS,
-        SHA384_RSA_PKCS,
-        SHA512_RSA_PKCS,
-        SHA256_RSA_PKCS_PSS,
-        SHA384_RSA_PKCS_PSS,
-        SHA512_RSA_PKCS_PSS,
-        SHA224_RSA_PKCS,
-        SHA224_RSA_PKCS_PSS,
-        RC2_KEY_GEN,
-        RC2_ECB,
-        RC2_CBC,
-        RC2_MAC,
-        RC2_MAC_GENERAL,
-        RC2_CBC_PAD,
-        RC4_KEY_GEN,
-        RC4,
-        DES_KEY_GEN,
-        DES_ECB,
-        DES_CBC,
-        DES_MAC,
-        DES_MAC_GENERAL,
-        DES_CBC_PAD,
-        DES2_KEY_GEN,
-        DES3_KEY_GEN,
-        DES3_ECB,
-        DES3_CBC,
-        DES3_MAC,
-        DES3_MAC_GENERAL,
-        DES3_CBC_PAD,
-        CDMF_KEY_GEN,
-        CDMF_ECB,
-        CDMF_CBC,
-        CDMF_MAC,
-        CDMF_MAC_GENERAL,
-        CDMF_CBC_PAD,
-        DES_OFB64,
-        DES_OFB8,
-        DES_CFB64,
-        DES_CFB8,
-        MD2,
-        MD2_HMAC,
-        MD2_HMAC_GENERAL,
-        MD5,
-        MD5_HMAC,
-        MD5_HMAC_GENERAL,
-        SHA1,
-        SHA,
-        SHA_1,
-        SHA_1_HMAC,
-        SHA_1_HMAC_GENERAL,
-        RIPEMD128,
-        RIPEMD128_HMAC,
-        RIPEMD128_HMAC_GENERAL,
-        RIPEMD160,
-        RIPEMD160_HMAC,
-        RIPEMD160_HMAC_GENERAL,
-        SHA256,
-        SHA256_HMAC,
-        SHA256_HMAC_GENERAL,
-        SHA224,
-        SHA224_HMAC,
-        SHA224_HMAC_GENERAL,
-        SHA384,
-        SHA384_HMAC,
-        SHA384_HMAC_GENERAL,
-        SHA512,
-        SHA512_HMAC,
-        SHA512_HMAC_GENERAL,
-        SECURID_KEY_GEN,
-        SECURID,
-        HOTP_KEY_GEN,
-        HOTP,
-        ACTI,
-        ACTI_KEY_GEN,
-        CAST_KEY_GEN,
-        CAST_ECB,
-        CAST_CBC,
-        CAST_MAC,
-        CAST_MAC_GENERAL,
-        CAST_CBC_PAD,
-        CAST3_KEY_GEN,
-        CAST3_ECB,
-        CAST3_CBC,
-        CAST3_MAC,
-        CAST3_MAC_GENERAL,
-        CAST3_CBC_PAD,
-        CAST5_KEY_GEN,
-        CAST128_KEY_GEN,
-        CAST5_ECB,
-        CAST128_ECB,
-        CAST5_CBC,
-        CAST128_CBC,
-        CAST5_MAC,
-        CAST128_MAC,
-        CAST5_MAC_GENERAL,
-        CAST128_MAC_GENERAL,
-        CAST5_CBC_PAD,
-        CAST128_CBC_PAD,
-        RC5_KEY_GEN,
-        RC5_ECB,
-        RC5_CBC,
-        RC5_MAC,
-        RC5_MAC_GENERAL,
-        RC5_CBC_PAD,
-        IDEA_KEY_GEN,
-        IDEA_ECB,
-        IDEA_CBC,
-        IDEA_MAC,
-        IDEA_MAC_GENERAL,
-        IDEA_CBC_PAD,
-        GENERIC_SECRET_KEY_GEN,
-        CONCATENATE_BASE_AND_KEY,
-        CONCATENATE_BASE_AND_DATA,
-        CONCATENATE_DATA_AND_BASE,
-        XOR_BASE_AND_DATA,
-        EXTRACT_KEY_FROM_KEY,
-        SSL3_PRE_MASTER_KEY_GEN,
-        SSL3_MASTER_KEY_DERIVE,
-        SSL3_KEY_AND_MAC_DERIVE,
-        SSL3_MASTER_KEY_DERIVE_DH,
-        TLS_PRE_MASTER_KEY_GEN,
-        TLS_MASTER_KEY_DERIVE,
-        TLS_KEY_AND_MAC_DERIVE,
-        TLS_MASTER_KEY_DERIVE_DH,
-        TLS_PRF,
-        SSL3_MD5_MAC,
-        SSL3_SHA1_MAC,
-        MD5_KEY_DERIVATION,
-        MD2_KEY_DERIVATION,
-        SHA1_KEY_DERIVATION,
-        SHA256_KEY_DERIVATION,
-        SHA384_KEY_DERIVATION,
-        SHA512_KEY_DERIVATION,
-        SHA224_KEY_DERIVATION,
-        PBE_MD2_DES_CBC,
-        PBE_MD5_DES_CBC,
-        PBE_MD5_CAST_CBC,
-        PBE_MD5_CAST3_CBC,
-        PBE_MD5_CAST5_CBC,
-        PBE_MD5_CAST128_CBC,
-        PBE_SHA1_CAST5_CBC,
-        PBE_SHA1_CAST128_CBC,
-        PBE_SHA1_RC4_128,
-        PBE_SHA1_RC4_40,
-        PBE_SHA1_DES3_EDE_CBC,
-        PBE_SHA1_DES2_EDE_CBC,
-        PBE_SHA1_RC2_128_CBC,
-        PBE_SHA1_RC2_40_CBC,
-        PKCS5_PBKD2,
-        PBA_SHA1_WITH_SHA1_HMAC,
-        WTLS_PRE_MASTER_KEY_GEN,
-        WTLS_MASTER_KEY_DERIVE,
-        WTLS_MASTER_KEY_DERIVE_DH_ECC,
-        WTLS_PRF,
-        WTLS_SERVER_KEY_AND_MAC_DERIVE,
-        WTLS_CLIENT_KEY_AND_MAC_DERIVE,
-        KEY_WRAP_LYNKS,
-        KEY_WRAP_SET_OAEP,
-        CMS_SIG,
-        KIP_DERIVE,
-        KIP_WRAP,
-        KIP_MAC,
-        CAMELLIA_KEY_GEN,
-        CAMELLIA_ECB,
-        CAMELLIA_CBC,
-        CAMELLIA_MAC,
-        CAMELLIA_MAC_GENERAL,
-        CAMELLIA_CBC_PAD,
-        CAMELLIA_ECB_ENCRYPT_DATA,
-        CAMELLIA_CBC_ENCRYPT_DATA,
-        CAMELLIA_CTR,
-        ARIA_KEY_GEN,
-        ARIA_ECB,
-        ARIA_CBC,
-        ARIA_MAC,
-        ARIA_MAC_GENERAL,
-        ARIA_CBC_PAD,
-        ARIA_ECB_ENCRYPT_DATA,
-        ARIA_CBC_ENCRYPT_DATA,
-        SKIPJACK_KEY_GEN,
-        SKIPJACK_ECB64,
-        SKIPJACK_CBC64,
-        SKIPJACK_OFB64,
-        SKIPJACK_CFB64,
-        SKIPJACK_CFB32,
-        SKIPJACK_CFB16,
-        SKIPJACK_CFB8,
-        SKIPJACK_WRAP,
-        SKIPJACK_PRIVATE_WRAP,
-        SKIPJACK_RELAYX,
-        KEA_KEY_PAIR_GEN,
-        KEA_KEY_DERIVE,
-        FORTEZZA_TIMESTAMP,
-        BATON_KEY_GEN,
-        BATON_ECB128,
-        BATON_ECB96,
-        BATON_CBC128,
-        BATON_COUNTER,
-        BATON_SHUFFLE,
-        BATON_WRAP,
-        ECDSA_KEY_PAIR_GEN,
-        EC_KEY_PAIR_GEN,
-        ECDSA,
-        ECDSA_SHA1,
-        ECDSA_SHA224,
-        ECDSA_SHA256,
-        ECDSA_SHA384,
-        ECDSA_SHA512,
-        ECDH1_DERIVE,
-        ECDH1_COFACTOR_DERIVE,
-        ECMQV_DERIVE,
-        JUNIPER_KEY_GEN,
-        JUNIPER_ECB128,
-        JUNIPER_CBC128,
-        JUNIPER_COUNTER,
-        JUNIPER_SHUFFLE,
-        JUNIPER_WRAP,
-        FASTHASH,
-        AES_KEY_GEN,
-        AES_ECB,
-        AES_CBC,
-        AES_MAC,
-        AES_MAC_GENERAL,
-        AES_CBC_PAD,
-        AES_CTR,
-        AES_CMAC,
-        AES_CMAC_GENERAL,
-        BLOWFISH_KEY_GEN,
-        BLOWFISH_CBC,
-        TWOFISH_KEY_GEN,
-        TWOFISH_CBC,
-        AES_GCM,
-        AES_CCM,
-        AES_KEY_WRAP,
-        AES_KEY_WRAP_PAD,
-        DES_ECB_ENCRYPT_DATA,
-        DES_CBC_ENCRYPT_DATA,
-        DES3_ECB_ENCRYPT_DATA,
-        DES3_CBC_ENCRYPT_DATA,
-        AES_ECB_ENCRYPT_DATA,
-        AES_CBC_ENCRYPT_DATA,
-        GOSTR3410_KEY_PAIR_GEN,
-        GOSTR3410,
-        GOSTR3410_WITH_GOSTR3411,
-        GOSTR3410_KEY_WRAP,
-        GOSTR3410_DERIVE,
-        GOSTR3411,
-        GOSTR3411_HMAC,
-        GOST28147_KEY_GEN,
-        GOST28147_ECB,
-        GOST28147,
-        GOST28147_MAC,
-        GOST28147_KEY_WRAP,
-        DSA_PARAMETER_GEN,
-        DH_PKCS_PARAMETER_GEN,
-        X9_42_DH_PARAMETER_GEN,
-        VENDOR_DEFINED,
-    }
-
-    interface IParams {
-        toCKI(): Buffer;
-    }
-
-    interface IAlgorithm {
-        name: string;
-        params: Buffer | IParams;
-    }
-
-    type MechanismType = MechanismEnum | KeyGenMechanism | IAlgorithm | string;
-
-    enum MechanismFlag {
-        /**
-         * `True` if the mechanism is performed by the device; `false` if the mechanism is performed in software
-         */
-        HW,
-        /**
-         * `True` if the mechanism can be used with encrypt function
-         */
-        ENCRYPT,
-        /**
-         * `True` if the mechanism can be used with decrypt function
-         */
-        DECRYPT,
-        /**
-         * `True` if the mechanism can be used with digest function
-         */
-        DIGEST,
-        /**
-         * `True` if the mechanism can be used with sign function
-         */
-        SIGN,
-        /**
-         * `True` if the mechanism can be used with sign recover function
-         */
-        SIGN_RECOVER,
-        /**
-         * `True` if the mechanism can be used with verify function
-         */
-        VERIFY,
-        /**
-         * `True` if the mechanism can be used with verify recover function
-         */
-        VERIFY_RECOVER,
-        /**
-         * `True` if the mechanism can be used with geberate function
-         */
-        GENERATE,
-        /**
-         * `True` if the mechanism can be used with generate key pair function
-         */
-        GENERATE_KEY_PAIR,
-        /**
-         * `True` if the mechanism can be used with wrap function
-         */
-        WRAP,
-        /**
-         * `True` if the mechanism can be used with unwrap function
-         */
-        UNWRAP,
-        /**
-         * `True` if the mechanism can be used with derive function
-         */
-        DERIVE,
-    }
-    class Mechanism extends HandleObject {
-        protected slotHandle: number;
-        /**
-         * the minimum size of the key for the mechanism
-         * _whether this is measured in bits or in bytes is mechanism-dependent_
-         */
-        minKeySize: number;
-        /**
-         * the maximum size of the key for the mechanism
-         * _whether this is measured in bits or in bytes is mechanism-dependent_
-         */
-        maxKeySize: number;
-        /**
-         * bit flag specifying mechanism capabilities
-         */
-        flags: number;
-        /**
-         * returns string name from MechanismEnum
-         */
-        name: string;
-        constructor(handle: number, slotHandle: number, lib: Pkcs11);
-        protected getInfo(): void;
-        static create(alg: MechanismType): Buffer;
-        static vendor(jsonFile: string): any;
-        static vendor(name: string, value: number): any;
-    }
-
-    class MechanismCollection extends Collection<Mechanism> {
-        protected slotHandle: number;
-        constructor(items: Array<number>, slotHandle: number, lib: Pkcs11, classType?: typeof Mechanism);
-        /**
-         * returns item from collection by index
-         * @param {number} index of element in collection `[0..n]`
-         */
-        items(index: number): Mechanism;
-    }
-
-    /**
-     * Definition for the base key object class
-     * - defines the object class `CKO_PUBLIC_KEY`, `CKO_PRIVATE_KEY` and `CKO_SECRET_KEY` for type `CK_OBJECT_CLASS`
-     * as used in the `CKA_CLASS` attribute of objects
-     */
-    class Key extends Storage {
-        /**
-         * Type of key
-         * - Must be specified when object is created with `C_CreateObject`
-         * - Must be specified when object is unwrapped with `C_UnwrapKey`
-         */
-        type: KeyType;
-        /**
-         * Key identifier for key (default empty)
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification
-         * of the attribute during the course of a `C_CopyObject` call.
-         */
-        id: Buffer;
-        /**
-         * Start date for the key (default empty)
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification
-         * of the attribute during the course of a `C_CopyObject` call.
-         */
-        startDate: Date;
-        /**
-         * End date for the key (default empty)
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification
-         * of the attribute during the course of a `C_CopyObject` call.
-         */
-        endDate: Date;
-        /**
-         * `CK_TRUE` if key supports key derivation
-         * (i.e., if other keys can be derived from this one (default `CK_FALSE`)
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification
-         * of the attribute during the course of a `C_CopyObject` call.
-         * @returns boolean
-         */
-        derive: boolean;
-        /**
-         * `CK_TRUE` only if key was either * generated locally (i.e., on the token)
-         * with a `C_GenerateKey` or `C_GenerateKeyPair` call * created with a `C_CopyObject` call
-         * as a copy of a key which had its `CKA_LOCAL` attribute set to `CK_TRUE`
-         * - Must not be specified when object is created with `C_CreateObject`.
-         * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
-         * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
-         */
-        local: boolean;
-        /**
-         * Identifier of the mechanism used to generate the key material.
-         * - Must not be specified when object is created with `C_CreateObject`.
-         * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
-         * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
-         */
-        mechanism: KeyGenMechanism;
-        allowedMechanisms: void;
-    }
-
-
-    class DomainParameters extends Storage {
-        /**
-         * Type of key the domain parameters can be used to generate.
-         */
-        keyType: KeyType;
-        /**
-         * `CK_TRUE` only if domain parameters were either * generated locally (i.e., on the token)
-         * with a `C_GenerateKey` * created with a `C_CopyObject` call as a copy of domain parameters
-         * which had its `CKA_LOCAL` attribute set to `CK_TRUE`
-         */
-        local: boolean;
-    }
-
-    /**
-     * Data objects (object class `CKO_DATA`) hold information defined by an application.
-     * Other than providing access to it, Cryptoki does not attach any special meaning to a data object
-     */
-    class Data extends Storage {
-        /**
-         * Description of the application that manages the object (default empty)
-         */
-        application: string;
-        /**
-         * DER-encoding of the object identifier indicating the data object type (default empty)
-         */
-        objectId: Buffer;
-        /**
-         * Value of the object (default empty)
-         */
-        value: Buffer;
-    }
-
-    interface ITemplate {
-        /**
-         * CKA_CLASS
-         */
-        class?: number;
-        /**
-         * CKA_TOKEN
-         */
-        token?: boolean;
-        /**
-         * CKA_PRIVATE
-         */
-        private?: boolean;
-        /**
-         * CKA_LABEL
-         */
-        label?: string;
-        /**
-         * CKA_APPLICATION
-         */
-        application?: string;
-        /**
-         * CKA_VALUE
-         */
-        value?: Buffer;
-        /**
-         * CKA_OBJECT_ID
-         */
-        objectId?: Buffer;
-        /**
-         * CKA_CERTIFICATE_TYPE
-         */
-        certType?: number;
-        /**
-         * CKA_ISSUER
-         */
-        issuer?: Buffer;
-        /**
-         * CKA_SERIAL_NUMBER
-         */
-        serial?: Buffer;
-        /**
-         * CKA_AC_ISSUER
-         */
-        issuerAC?: Buffer;
-        /**
-         * CKA_OWNER
-         */
-        owner?: Buffer;
-        /**
-         * CKA_ATTR_TYPES
-         */
-        attrTypes?: Buffer;
-        /**
-         * CKA_TRUSTED
-         */
-        trusted?: boolean;
-        /**
-         * CKA_CERTIFICATE_CATEGORY
-         */
-        certCategory?: number;
-        /**
-         * CKA_JAVA_MIDP_SECURITY_DOMAIN
-         */
-        javaDomain?: number;
-        /**
-         * CKA_URL
-         */
-        url?: string;
-        /**
-         * CKA_HASH_OF_SUBJECT_PUBLIC_KEY
-         */
-        ski?: Buffer;
-        /**
-         * CKA_HASH_OF_ISSUER_PUBLIC_KEY
-         */
-        aki?: Buffer;
-        /**
-         * CKA_NAME_HASH_ALGORITHM
-         */
-        digestName?: number;
-        /**
-         * CKA_CHECK_VALUE
-         */
-        checkValue?: Buffer;
-        /**
-         * CKA_KEY_TYPE
-         */
-        keyType?: number;
-        /**
-         * CKA_SUBJECT
-         */
-        subject?: Buffer;
-        /**
-         * CKA_ID
-         */
-        id?: Buffer;
-        /**
-         * CKA_SENSITIVE
-         */
-        sensitive?: boolean;
-        /**
-         * CKA_ENCRYPT
-         */
-        encrypt?: boolean;
-        /**
-         * CKA_DECRYPT
-         */
-        decrypt?: boolean;
-        /**
-         * CKA_WRAP
-         */
-        wrap?: boolean;
-        /**
-         * CKA_UNWRAP
-         */
-        unwrap?: boolean;
-        /**
-         * CKA_SIGN
-         */
-        sign?: boolean;
-        /**
-         * CKA_SIGN_RECOVER
-         */
-        signRecover?: boolean;
-        /**
-         * CKA_VERIFY
-         */
-        verify?: boolean;
-        /**
-         * CKA_VERIFY_RECOVER
-         */
-        verifyRecover?: boolean;
-        /**
-         * CKA_DERIVE
-         */
-        derive?: boolean;
-        /**
-         * CKA_START_DATE
-         */
-        startDate?: Date;
-        /**
-         * CKA_END_DATE
-         */
-        endDate?: Date;
-        /**
-         * CKA_MODULUS
-         */
-        modulus?: Buffer;
-        /**
-         * CKA_MODULUS_BITS
-         */
-        modulusBits?: number;
-        /**
-         * CKA_PUBLIC_EXPONENT
-         */
-        publicExponent?: Buffer;
-        /**
-         * CKA_PRIVATE_EXPONEN
-         */
-        privateExponent?: Buffer;
-        /**
-         * CKA_PRIME_1
-         */
-        prime1?: Buffer;
-        /**
-         * CKA_PRIME_2
-         */
-        prime2?: Buffer;
-        /**
-         * CKA_EXPONENT_1
-         */
-        exp1?: Buffer;
-        /**
-         * CKA_EXPONENT_2
-         */
-        exp2?: Buffer;
-        /**
-         * CKA_COEFFICIEN
-         */
-        coefficient?: Buffer;
-        /**
-         * CKA_PRIME
-         */
-        prime?: Buffer;
-        /**
-         * CKA_SUBPRIME
-         */
-        subprime?: Buffer;
-        /**
-         * CKA_BASE
-         */
-        base?: Buffer;
-        /**
-         * CKA_PRIME_BITS
-         */
-        primeBits?: number;
-        /**
-         * CKA_SUBPRIME_BITS
-         */
-        subprimeBits?: number;
-        /**
-         * CKA_VALUE_BITS
-         */
-        valueBits?: number;
-        /**
-         * CKA_VALUE_LEN
-         */
-        valueLen?: number;
-        /**
-         * CKA_EXTRACTABLE
-         */
-        extractable?: boolean;
-        /**
-         * CKA_LOCAL
-         */
-        local?: boolean;
-        /**
-         * CKA_NEVER_EXTRACTABLE
-         */
-        neverExtractable?: boolean;
-        /**
-         * CKA_ALWAYS_SENSITIVE
-         */
-        alwaysSensitive?: boolean;
-        /**
-         * CKA_KEY_GEN_MECHANISM
-         */
-        keyGenMechanism?: number;
-        /**
-         * CKA_MODIFIABLE
-         */
-        modifiable?: boolean;
-        /**
-         * CKA_COPYABLE
-         */
-        copyable?: boolean;
-        /**
-         * CKA_ECDSA_PARAMS
-         */
-        paramsECDSA?: Buffer;
-        paramsEC?: Buffer;
-        /**
-         * CKA_EC_POINT
-         */
-        pointEC?: Buffer;
-        /**
-         * CKA_SECONDARY_AUTH
-         */
-        secondaryAuth?: boolean;
-        /**
-         * CKA_AUTH_PIN_FLAGS
-         */
-        authPinFlags?: Buffer;
-        /**
-         * CKA_ALWAYS_AUTHENTICATE
-         */
-        alwaysAuth?: boolean;
-        /**
-         * CKA_WRAP_WITH_TRUSTED
-         */
-        wrapWithTrusted?: boolean;
-        /**
-         * CKA_WRAP_TEMPLATE
-         */
-        wrapTemplate?: any;
-        /**
-         * CKA_UNWRAP_TEMPLATE
-         */
-        unwrapTemplate?: any;
-        /**
-         * CKA_OTP_FORMAT
-         */
-        otpFormat?: any;
-        /**
-         * CKA_OTP_LENGTH
-         */
-        otpLength?: any;
-        /**
-         * CKA_OTP_TIME_INTERVAL
-         */
-        otpTimeInterval?: any;
-        /**
-         * CKA_OTP_USER_FRIENDLY_MODE
-         */
-        otpUserFriendlyMode?: any;
-        /**
-         * CKA_OTP_CHALLENGE_REQUIREMENT
-         */
-        otpChallengeReq?: any;
-        /**
-         * CKA_OTP_TIME_REQUIREMENT
-         */
-        otpTimeReq?: any;
-        /**
-         * CKA_OTP_COUNTER_REQUIREMENT
-         */
-        otpCounterReq?: any;
-        /**
-         * CKA_OTP_PIN_REQUIREMENT
-         */
-        otppinReq?: any;
-        /**
-         * CKA_OTP_COUNTER
-         */
-        otpCounter?: any;
-        /**
-         * CKA_OTP_TIME
-         */
-        otpTime?: any;
-        /**
-         * CKA_OTP_USER_IDENTIFIER
-         */
-        OtpUserId?: any;
-        /**
-         * CKA_OTP_SERVICE_IDENTIFIER
-         */
-        otpServiceId?: any;
-        /**
-         * CKA_OTP_SERVICE_LOGO
-         */
-        otpServiceLogo?: any;
-        /**
-         * CKA_OTP_SERVICE_LOGO_TYPE
-         */
-        otpServiceLogoType?: any;
-        /**
-         * CKA_HW_FEATURE_TYPE
-         */
-        hwFeatureType?: any;
-        /**
-         * CKA_RESET_ON_INIT
-         */
-        resetOnInit?: any;
-        /**
-         * CKA_HAS_RESET
-         */
-        hasReset?: any;
-        /**
-         * CKA_PIXEL_X
-         */
-        pixelX?: any;
-        /**
-         * CKA_PIXEL_Y
-         */
-        pixelY?: any;
-        /**
-         * CKA_RESOLUTION
-         */
-        resolution?: any;
-        /**
-         * CKA_CHAR_ROWS
-         */
-        charRows?: any;
-        /**
-         * CKA_CHAR_COLUMNS
-         */
-        charCols?: any;
-        /**
-         * CKA_COLOR
-         */
-        color?: any;
-        /**
-         * CKA_BITS_PER_PIXEL
-         */
-        bitsPerPixel?: any;
-        /**
-         * CKA_CHAR_SETS
-         */
-        charSets?: any;
-        /**
-         * CKA_ENCODING_METHODS
-         */
-        encMethod?: any;
-        /**
-         * CKA_MIME_TYPES
-         */
-        mimeTypes?: any;
-        /**
-         * CKA_MECHANISM_TYPE
-         */
-        mechanismType?: any;
-        /**
-         * CKA_REQUIRED_CMS_ATTRIBUTES
-         */
-        requiredCmsAttrs?: any;
-        /**
-         * CKA_DEFAULT_CMS_ATTRIBUTES
-         */
-        defaultCmsAttrs?: any;
-        /**
-         * CKA_SUPPORTED_CMS_ATTRIBUTES
-         */
-        suportedCmsAttrs?: any;
-        /**
-         * CKA_ALLOWED_MECHANISMS
-         */
-        allowedMechanisms?: any;
-    }
-    class Attribute {
-        protected $value: Buffer;
-        type: number;
-        name: string;
-        convertType: string;
-        length: number;
-        value: any;
-        constructor(type: number, value?: any);
-        constructor(type: string, value?: any);
-        get(): any;
-        set(template: any): void;
-    }
-    class Template {
-        protected attrs: Attribute[];
-        length: number;
-        constructor(template: string);
-        constructor(template: ITemplate);
-        set(v: any): Template;
-        ref(): Buffer;
-        serialize(): any;
-    }
-
-    class BaseObject {
-        protected lib: Pkcs11;
-        constructor(lib?: Pkcs11);
-    }
-    class HandleObject extends BaseObject {
-        /**
-         * handle to pkcs11 object
-         */
-        handle: number;
-        constructor(handle: number, lib: Pkcs11);
-        protected getInfo(): void;
-    }
-
-    enum ObjectClass {
-        DATA,
-        CERTIFICATE,
-        PUBLIC_KEY,
-        PRIVATE_KEY,
-        SECRET_KEY,
-        HW_FEATURE,
-        DOMAIN_PARAMETERS,
-        MECHANISM,
-        OTP_KEY,
-    }
-
-    class SessionObject extends HandleObject {
-        /**
-         * Session
-         */
-        session: Session;
-        /**
-         * gets the size of an object in bytes
-         */
-        size: number;
-        constructor(object: SessionObject);
-        constructor(handle: number, session: Session, lib: Pkcs11);
-        /**
-         * copies an object, creating a new object for the copy
-         * @param {ITemplate} template template for the new object
-         */
-        copy(template: ITemplate): SessionObject;
-        /**
-         * destroys an object
-         */
-        destroy(): void;
-        getAttribute(attr: string): ITemplate;
-        getAttribute(attrs: ITemplate): ITemplate;
-        setAttribute(attrs: string, value: any): any;
-        setAttribute(attrs: ITemplate): any;
-        protected get(name: string): any;
-        protected set(name: string, value: any): void;
-        class: ObjectClass;
-        toType<T extends SessionObject>(): T;
-    }
-
-    class SessionObjectCollection extends Collection<SessionObject> {
-        session: Session;
-        items(index: number): SessionObject;
-        constructor(items: Array<number>, session: Session, lib: Pkcs11, classType?: any);
-    }
-
-    /**
-     * Private key objects (object class `CKO_PRIVATE_KEY`) hold private keys
-     */
-    class PrivateKey extends Key {
-        /**
-         * DER-encoding of the key subject name (default empty)
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         */
-        subject: Buffer;
-        /**
-         * `CK_TRUE` if key is sensitive
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Attribute cannot be changed once set to CK_TRUE. It becomes a read only attribute.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        sensitive: boolean;
-        /**
-         * `CK_TRUE` if key supports decryption
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        decrypt: boolean;
-        /**
-         * `CK_TRUE` if key supports signatures where the signature is an appendix to the data
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        sign: boolean;
-        /**
-         * `CK_TRUE` if key supports signatures where the data can be recovered from the signature
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        signRecover: boolean;
-        /**
-         * `CK_TRUE` if key supports unwrapping (i.e., can be used to unwrap other keys)
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        unwrap: boolean;
-        /**
-         * `CK_TRUE` if key is extractable and can be wrapped
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Attribute cannot be changed once set to `CK_FALSE`. It becomes a read only attribute.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        extractable: boolean;
-        /**
-         * `CK_TRUE` if key has always had the `CKA_SENSITIVE` attribute set to `CK_TRUE`
-         * - Must not be specified when object is created with `C_CreateObject`.
-         * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
-         * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
-         */
-        alwaysSensitive: boolean;
-        /**
-         * `CK_TRUE` if key has never had the `CKA_EXTRACTABLE` attribute set to `CK_TRUE`
-         * - Must not be specified when object is created with `C_CreateObject`.
-         * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
-         * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
-         */
-        neverExtractable: boolean;
-        /**
-         * `CK_TRUE` if the key can only be wrapped with a wrapping key
-         * that has `CKA_TRUSTED` set to `CK_TRUE`. Default is `CK_FALSE`.
-         * - Attribute cannot be changed once set to `CK_TRUE`. It becomes a read only attribute.
-         */
-        wrapTrusted: boolean;
-        /**
-         * For wrapping keys. The attribute template to apply to any keys unwrapped
-         * using this wrapping key. Any user supplied template is applied after this template
-         * as if the object has already been created.
-         */
-        template: void;
-        alwaysAuthenticate: boolean;
-    }
-
-    /**
-     * Public key objects (object class CKO_PUBLIC_KEY) hold public keys
-     */
-    class PublicKey extends Key {
-        /**
-         * DER-encoding of the key subject name (default empty)
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         */
-        subject: Buffer;
-        /**
-         * `CK_TRUE` if key supports encryption
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        encrypt: boolean;
-        /**
-         * `CK_TRUE` if key supports verification where the signature is an appendix to the data
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        verify: boolean;
-        /**
-         * `CK_TRUE` if key supports verification where the data is recovered from the signature
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        verifyRecover: boolean;
-        /**
-         * `CK_TRUE` if key supports wrapping (i.e., can be used to wrap other keys)
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        wrap: boolean;
-        /**
-         * The key can be trusted for the application that it was created.
-         * - The wrapping key can be used to wrap keys with `CKA_WRAP_WITH_TRUSTED` set to `CK_TRUE`.
-         * - Can only be set to CK_TRUE by the SO user.
-         */
-        trusted: boolean;
-        /**
-         * For wrapping keys. The attribute template to match against any keys wrapped using this wrapping key.
-         * Keys that do not match cannot be wrapped.
-         */
-        template: void;
-    }
-
-    /**
-     * Secret key objects (object class `CKO_SECRET_KEY`) hold secret keys.
-     */
-    class SecretKey extends Key {
-        /**
-         * `CK_TRUE` if key is sensitive
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Attribute cannot be changed once set to `CK_TRUE`. It becomes a read only attribute.
-         */
-        sensitive: boolean;
-        /**
-         * `CK_TRUE` if key supports encryption
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        encrypt: boolean;
-        /**
-         * `CK_TRUE` if key supports decryption
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        decrypt: boolean;
-        /**
-         * `CK_TRUE` if key supports verification (i.e., of authentication codes) where the signature is an appendix to the data
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        verify: boolean;
-        /**
-         * 	`CK_TRUE` if key supports signatures (i.e., authentication codes) where the signature is an appendix to the data
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        sign: boolean;
-        /**
-         * `CK_TRUE` if key supports wrapping (i.e., can be used to wrap other keys)
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        wrap: boolean;
-        /**
-         * `CK_TRUE` if key supports unwrapping (i.e., can be used to unwrap other keys)
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        unwrap: boolean;
-        /**
-         * `CK_TRUE` if key is extractable and can be wrapped
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Attribute cannot be changed once set to `CK_FALSE`. It becomes a read only attribute.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        extractable: boolean;
-        /**
-         * `CK_TRUE` if key has always had the `CKA_SENSITIVE` attribute set to `CK_TRUE`
-         * - Must not be specified when object is created with `C_CreateObject`.
-         * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
-         * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
-         */
-        alwaysSensitive: boolean;
-        /**
-         * `CK_TRUE` if key has never had the `CKA_EXTRACTABLE` attribute set to `CK_TRUE`
-         * - Must not be specified when object is created with `C_CreateObject`.
-         * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
-         * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
-         */
-        neverExtractable: boolean;
-        /**
-         * Key checksum
-         */
-        checkValue: Buffer;
-        /**
-         * `CK_TRUE` if the key can only be wrapped with a wrapping key
-         * that has `CKA_TRUSTED` set to `CK_TRUE`. Default is `CK_FALSE`.
-         * - Attribute cannot be changed once set to `CK_TRUE`. It becomes a read only attribute.
-         */
-        wrapTrusted: boolean;
-        /**
-         * The wrapping key can be used to wrap keys with `CKA_WRAP_WITH_TRUSTED` set to `CK_TRUE`.
-         * - Can only be set to CK_TRUE by the SO user.
-         */
-        trusted: boolean;
-        /**
-         * For wrapping keys.
-         * The attribute template to match against any keys wrapped using this wrapping key.
-         * Keys that do not match cannot be wrapped.
-         */
-        wrapTemplate: void;
-        /**
-         * For wrapping keys.
-         * The attribute template to apply to any keys unwrapped using this wrapping key.
-         * Any user supplied template is applied after this template as if the object has already been created.
-         */
-        unwrapTemplate: void;
-    }
-
-
-    interface ISlotInfo {
-        slotDescription: string;
-        manufacturerID: string;
-        flags: number;
-        hardwareVersion: IVersion;
-        firmwareVersion: IVersion;
-    }
-
-    enum SlotFlag {
-        /**
-         * `True` if a token is present in the slot (e.g., a device is in the reader)
-         */
-        TOKEN_PRESENT,
-        /**
-         * `True` if the reader supports removable devices
-         */
-        REMOVABLE_DEVICE,
-        /**
-         * True if the slot is a hardware slot, as opposed to a software slot implementing a "soft token"
-         */
-        HW_SLOT,
-    }
-
-    interface IVersion {
-        major: number;
-        minor: number;
-    }
-    interface IModuleInfo {
-        cryptokiVersion: IVersion;
-        manufacturerID: string;
-        flags: number;
-        libraryDescription: string;
-        libraryVersion: IVersion;
-    }
-
-    class Collection<T extends HandleObject> {
-        protected items_: Array<number>;
-        protected classType: any;
-        protected lib: Pkcs11;
-        constructor(items: Array<number>, lib: Pkcs11, classType: any);
-        /**
-         * returns length of collection
-         */
-        length: number;
-        /**
-         * returns item from collection by index
-         * @param {number} index of element in collection `[0..n]`
-         */
-        items(index: number): T;
-    }
-
-    enum SessionOpenFlag {
-        /**
-         * session is r/w
-         */
-        RW_SESSION,
-        /**
-         * no parallel
-         */
-        SERIAL_SESSION,
-    }
-    enum SessionFlag {
-        /**
-         * `True` if the session is read/write; `false` if the session is read-only
-         */
-        RW_SESSION,
-        /**
-         * This flag is provided for backward compatibility, and should always be set to `true`
-         */
-        SERIAL_SESSION,
-    }
-    enum UserType {
-        /**
-         * Security Officer
-         */
-        SO,
-        /**
-         * User
-         */
-        USER,
-        /**
-         * Context specific
-         */
-        CONTEXT_SPECIFIC,
-    }
-    interface IKeyPair {
-        privateKey: PrivateKey;
-        publicKey: PublicKey;
-    }
-    /**
-     * provides information about a session
-     */
-    class Session extends HandleObject {
-        constructor(handle: number, slot: Slot, lib: Pkcs11);
-        slot: Slot;
-        /**
-         * the state of the session
-         */
-        state: number;
-        /**
-         * bit flags that define the type of session
-         */
-        flags: number;
-        /**
-         * an error code defined by the cryptographic device. Used for errors not covered by Cryptoki
-         */
-        deviceError: number;
-        protected getInfo(): void;
-        /**
-         * closes a session between an application and a token
-         */
-        close(): void;
-        /**
-         * initializes the normal user's PIN
-         * @param {string} pin the normal user's PIN
-         */
-        initPin(pin: string): void;
-        /**
-         * modifies the PIN of the user who is logged in
-         * @param {string} oldPin
-         * @param {string} newPin
-         */
-        setPin(oldPin: string, newPin: string): void;
-        /**
-         * obtains a copy of the cryptographic operations state of a session, encoded as a string of bytes
-         */
-        getOperationState(): Buffer;
-        /**
-         * restores the cryptographic operations state of a session
-         * from a string of bytes obtained with getOperationState
-         * @param {Buffer} state the saved state
-         * @param {number} encryptionKey holds key which will be used for an ongoing encryption
-         * or decryption operation in the restored session
-         * (or 0 if no encryption or decryption key is needed,
-         * either because no such operation is ongoing in the stored session
-         * or because all the necessary key information is present in the saved state)
-         * @param {number} authenticationKey holds a handle to the key which will be used for an ongoing signature,
-         * MACing, or verification operation in the restored session
-         * (or 0 if no such key is needed, either because no such operation is ongoing in the stored session
-         * or because all the necessary key information is present in the saved state)
-         */
-        setOperationState(state: Buffer, encryptionKey?: number, authenticationKey?: number): void;
-        /**
-         * logs a user into a token
-         * @param {string} pin the user's PIN.
-         * - This standard allows PIN values to contain any valid `UTF8` character,
-         * but the token may impose subset restrictions
-         * @param {} userType the user type. Default is `USER`
-         */
-        login(pin: string, userType?: UserType): void;
-        /**
-         * logs a user out from a token
-         */
-        logout(): void;
-        /**
-         * creates a new object
-         * - Only session objects can be created during a read-only session.
-         * - Only public objects can be created unless the normal user is logged in.
-         * @param {ITemplate} template the object's template
-         */
-        create(template: ITemplate): SessionObject;
-        /**
-         * removes all session objects matched to template
-         * - if template is null, removes all session objects
-         * - returns a number of destroied session objects
-         * @param {ITemplate} template template
-         */
-        destroy(template: ITemplate): number;
-        /**
-         * @param {SessionObject} object
-         */
-        destroy(object: SessionObject): number;
-        destroy(): number;
-        /**
-         * removes all session objects
-         * - returns a number of destroied session objects
-         */
-        clear(): number;
-        /**
-         * returns a collection of session objects mached to template
-         * @param template template
-         * @param callback optional callback function wich is called for each founded object
-         * - if callback function returns false, it breaks find function.
-         */
-        find(callback?: (obj: SessionObject) => void): SessionObjectCollection;
-        find(template: ITemplate, callback?: (obj: SessionObject) => void): SessionObjectCollection;
-        /**
-         * Returns object from session by handle
-         * @param  {number} handle handle of object
-         * @returns T
-         */
-        getObject<T extends SessionObject>(handle: number): T;
-        /**
-         * generates a secret key or set of domain parameters, creating a new object.
-         * @param mechanism generation mechanism
-         * @param template template for the new key or set of domain parameters
-         */
-        generateKey(mechanism: MechanismType, template?: ITemplate): SecretKey;
-        generateKey(mechanism: MechanismType, template: ITemplate, callback: (err: Error, key: SecretKey) => void): void;
-        generateKeyPair(mechanism: MechanismType, publicTemplate: ITemplate, privateTemplate: ITemplate): IKeyPair;
-        createSign(alg: MechanismType, key: Key): Sign;
-        createVerify(alg: MechanismType, key: Key): Verify;
-        createCipher(alg: MechanismType, key: Key): Cipher;
-        createDecipher(alg: MechanismType, key: Key): Decipher;
-        createDigest(alg: MechanismType): Digest;
-        wrapKey(alg: MechanismType, wrappingKey: Key, key: Key): Buffer;
-        unwrapKey(alg: MechanismType, unwrappingKey: Key, wrappedKey: Buffer, template: ITemplate): Key;
-        /**
-         * derives a key from a base key, creating a new key object
-         * @param {MechanismType} alg key deriv. mech
-         * @param {Key} baseKey base key
-         * @param {ITemplate} template new key template
-         */
-        deriveKey(alg: MechanismType, baseKey: Key, template: ITemplate): SecretKey;
-        /**
-         * generates random data
-         * @param {number} size \# of bytes to generate
-         */
-        generateRandom(size: number): Buffer;
-    }
-
-    enum TokenFlag {
-        RNG,
-        WRITE_PROTECTED,
-        LOGIN_REQUIRED,
-        USER_PIN_INITIALIZED,
-        RESTORE_KEY_NOT_NEEDED,
-        CLOCK_ON_TOKEN,
-        PROTECTED_AUTHENTICATION_PATH,
-        DUAL_CRYPTO_OPERATIONS,
-        TOKEN_INITIALIZED,
-        SECONDARY_AUTHENTICATION,
-        USER_PIN_COUNT_LOW,
-        USER_PIN_FINAL_TRY,
-        USER_PIN_LOCKED,
-        USER_PIN_TO_BE_CHANGED,
-        SO_PIN_COUNT_LOW,
-        SO_PIN_FINAL_TRY,
-        SO_PIN_LOCKED,
-        SO_PIN_TO_BE_CHANGED,
-    }
-    class Token extends HandleObject {
-        /**
-         * application-defined label, assigned during token initialization.
-         * - Must be padded with the blank character (' ').
-         * - Should __not__ be null-terminated.
-         */
-        label: string;
-        /**
-         * ID of the device manufacturer.
-         * - Must be padded with the blank character (' ').
-         * - Should __not__ be null-terminated.
-         */
-        manufacturerID: string;
-        /**
-         * model of the device.
-         * - Must be padded with the blank character (' ').
-         * - Should __not__ be null-terminated.
-         */
-        model: string;
-        /**
-         * character-string serial number of the device.
-         * - Must be padded with the blank character (' ').
-         * - Should __not__ be null-terminated.
-         */
-        serialNumber: string;
-        /**
-         * bit flags indicating capabilities and status of the device
-         */
-        flags: number;
-        /**
-         * maximum number of sessions that can be opened with the token at one time by a single application
-         */
-        maxSessionCount: number;
-        /**
-         * number of sessions that this application currently has open with the token
-         */
-        sessionCount: number;
-        /**
-         * maximum number of read/write sessions that can be opened
-         * with the token at one time by a single application
-         */
-        maxRwSessionCount: number;
-        /**
-         * number of read/write sessions that this application currently has open with the token
-         */
-        rwSessionCount: number;
-        /**
-         * maximum length in bytes of the PIN
-         */
-        maxPinLen: number;
-        /**
-         * minimum length in bytes of the PIN
-         */
-        minPinLen: number;
-        /**
-         * the total amount of memory on the token in bytes in which public objects may be stored
-         */
-        totalPublicMemory: number;
-        /**
-         * the amount of free (unused) memory on the token in bytes for public objects
-         */
-        freePublicMemory: number;
-        /**
-         * the total amount of memory on the token in bytes in which private objects may be stored
-         */
-        totalPrivateMemory: number;
-        /**
-         * the amount of free (unused) memory on the token in bytes for private objects
-         */
-        freePrivateMemory: number;
-        /**
-         * version number of hardware
-         */
-        hardwareVersion: IVersion;
-        /**
-         * version number of firmware
-         */
-        firmwareVersion: IVersion;
-        /**
-         * current time as a character-string of length 16,
-         * represented in the format YYYYMMDDhhmmssxx
-         */
-        utcTime: Date;
-        constructor(handle: number, lib: Pkcs11);
-        protected getInfo(): void;
-    }
-
-    class Slot extends HandleObject implements ISlotInfo {
-        slotDescription: string;
-        manufacturerID: string;
-        flags: number;
-        hardwareVersion: IVersion;
-        firmwareVersion: IVersion;
-        module: Module;
-        constructor(handle: number, module: Module, lib: Pkcs11);
-        protected getInfo(): void;
-        getToken(): Token;
-        /**
-         * returns list of `MechanismInfo`
-         */
-        getMechanisms(): MechanismCollection;
-        /**
-         * initializes a token
-         * @param {string} pin the SO's initial PIN
-         * @param {string} label label of the token
-         */
-        initToken(pin: string, label: string): void;
-        /**
-         * opens a session between an application and a token in a particular slot
-         * @parsm flags indicates the type of session
-         */
-        open(flags?: number): Session;
-        /**
-         * closes all sessions an application has with a token
-         */
-        closeAll(): void;
-    }
-
-    class SlotCollection extends Collection<Slot> {
-        module: Module;
-        items(index: number): Slot;
-        constructor(items: Array<number>, module: Module, lib: Pkcs11, classType?: any);
-    }
-
-    class Module extends BaseObject implements IModuleInfo {
-        libFile: string;
-        libName: string;
-        /**
-         * Cryptoki interface version
-         */
-        cryptokiVersion: IVersion;
-        /**
-         * blank padded manufacturer ID
-         */
-        manufacturerID: string;
-        /**
-         * must be zero
-         */
-        flags: number;
-        /**
-         * blank padded library description
-         */
-        libraryDescription: string;
-        /**
-         * version of library
-         */
-        libraryVersion: IVersion;
-        constructor(lib: Pkcs11);
-        protected getInfo(): void;
-        /**
-         * initializes the Cryptoki library
-         */
-        initialize(): void;
-        /**
-         * indicates that an application is done with the Cryptoki library
-         */
-        finalize(): void;
-        /**
-         * obtains a list of slots in the system
-         * @param {number} index index of an element in collection
-         * @param {number} tokenPresent only slots with tokens. Default `True`
-         */
-        getSlots(index: number, tokenPresent?: boolean): Slot;
-        /**
-         * @param {number} tokenPresent only slots with tokens. Default `True`
-         */
-        getSlots(tokenPresent?: boolean): SlotCollection;
-        /**
-         * loads pkcs11 lib
-         */
-        static load(libFile: string, libName?: string): Module;
-    }
-
-    class Cipher {
-        session: Session;
-        lib: Pkcs11;
-        constructor(session: Session, alg: MechanismType, key: Key, lib: Pkcs11);
-        protected init(alg: MechanismType, key: Key): void;
-        update(text: string): Buffer;
-        update(data: Buffer): Buffer;
-        final(): Buffer;
-    }
-
-    class Decipher {
-        session: Session;
-        lib: Pkcs11;
-        constructor(session: Session, alg: MechanismType, key: Key, lib: Pkcs11);
-        protected init(alg: MechanismType, key: Key): void;
-        update(text: string): Buffer;
-        update(data: Buffer): Buffer;
-        final(): Buffer;
-    }
-
-    class Digest {
-        session: Session;
-        lib: Pkcs11;
-        constructor(session: Session, alg: MechanismType, lib: Pkcs11);
-        protected init(alg: MechanismType): void;
-        update(text: string): void;
-        update(data: Buffer): void;
-        final(): Buffer;
-    }
-
-    class Sign {
-        session: Session;
-        lib: Pkcs11;
-        constructor(session: Session, alg: MechanismType, key: Key, lib: Pkcs11);
-        protected init(alg: MechanismType, key: Key): void;
-        update(text: string): void;
-        update(data: Buffer): void;
-        final(): Buffer;
-    }
-
-    class Verify {
-        session: Session;
-        lib: Pkcs11;
-        constructor(session: Session, alg: MechanismType, key: Key, lib: Pkcs11);
-        protected init(alg: MechanismType, key: Key): void;
-        update(text: string): void;
-        update(data: Buffer): void;
-        final(signature: Buffer): boolean;
-    }
-
-    /**
-     * 
-     * EC
-     * 
-     */
-
-    /**
-     * EcKdf is used to indicate the Key Derivation Function (KDF)
-     * applied to derive keying data from a shared secret.
-     * The key derivation function will be used by the EC key agreement schemes.
-     */
-    enum EcKdf {
-        NULL,
-        SHA1,
-        SHA224,
-        SHA256,
-        SHA384,
-        SHA512,
-    }
-
-    class EcdhParams implements IParams {
-        /**
-         * key derivation function used on the shared secret value
-         */
-        kdf: EcKdf;
-        /**
-         * some data shared between the two parties
-         */
-        sharedData: Buffer;
-        /**
-         * other party's EC public key value
-         */
-        publicData: Buffer;
-        /**
-         * @param  {EcKdf} kdf key derivation function used on the shared secret value
-         * @param  {Buffer=null} sharedData some data shared between the two parties
-         * @param  {Buffer=null} publicData other party's EC public key value
-         */
-        constructor(kdf: EcKdf, sharedData?: Buffer, publicData?: Buffer);
-        toCKI(): Buffer;
-    }
-
-    export interface INamedCurve {
-        name: string;
-        oid: string;
-        value: Buffer;
-        size: number;
-    }
-
-    class NamedCurve {
-        static getByName(name: string): INamedCurve;
-        static getByOid(oid: string): INamedCurve;
-    }
-
-    /**
-     * 
-     * AES
-     * 
-     */
-
-    class AesCbcParams implements IParams {
-        /**
-         * initialization vector
-         * - must have a fixed size of 16 bytes
-         */
-        iv: Buffer;
-        /**
-         * the data
-         */
-        data: Buffer;
-        constructor(iv: Buffer, data: Buffer);
-        toCKI(): Buffer;
-    }
-
-    class AesCcmParams implements IParams {
-        /**
-         * length of the data where 0 <= dataLength < 2^8L
-         */
-        dataLength: number;
-        /**
-         * the nonce
-         */
-        nonce: Buffer;
-        /**
-         * the additional authentication data
-         * - This data is authenticated but not encrypted
-         */
-        aad: Buffer;
-        /**
-         * length of authentication tag (output following cipher text) in bits.
-         * - Can be any value between 0 and 128
-         */
-        macLength: number;
-        constructor(dataLength: number, nonce: Buffer, aad?: Buffer, macLength?: number);
-        toCKI(): Buffer;
-    }
-
-    class AesGcmParams implements IParams {
-        /**
-         * initialization vector
-         * - The length of the initialization vector can be any number between 1 and 256.
-         * 96-bit (12 byte) IV values can be processed more efficiently,
-         * so that length is recommended for situations in which efficiency is critical.
-         */
-        iv: Buffer;
-        /**
-         * pointer to additional authentication data.
-         * This data is authenticated but not encrypted.
-         */
-        aad: Buffer;
-        /**
-         * length of authentication tag (output following cipher text) in bits.
-         * Can be any value between 0 and 128. Default 128
-         */
-        tagBits: number;
-        constructor(iv: Buffer, aad?: Buffer, tagBits?: number);
-        toCKI(): Buffer;
-    }
-
-    /**
-     * 
-     * RSA
-     * 
-     */
-
-    enum RsaMgf {
-        MGF1_SHA1,
-        MGF1_SHA224,
-        MGF1_SHA256,
-        MGF1_SHA384,
-        MGF1_SHA512,
-    }
-
-    class RsaOaepParams implements IParams {
-        hashAlgorithm: MechanismEnum;
-        mgf: RsaMgf;
-        source: number;
-        sourceData: Buffer;
-        constructor(hashAlg?: MechanismEnum, mgf?: RsaMgf, sourceData?: Buffer);
-        toCKI(): Buffer;
-    }
-
-    class RsaPssParams implements IParams {
-        /**
-         * hash algorithm used in the PSS encoding;
-         * - if the signature mechanism does not include message hashing,
-         * then this value must be the mechanism used by the application to generate
-         * the message hash;
-         * - if the signature mechanism includes hashing,
-         * then this value must match the hash algorithm indicated
-         * by the signature mechanism
-         */
-        hashAlgorithm: MechanismEnum;
-        /**
-         * mask generation function to use on the encoded block
-         */
-        mgf: RsaMgf;
-        /**
-         * length, in bytes, of the salt value used in the PSS encoding;
-         * - typical values are the length of the message hash and zero
-         */
-        saltLength: number;
-        constructor(hashAlg?: MechanismEnum, mgf?: RsaMgf, saltLen?: number);
-        toCKI(): Buffer;
-    }
-
-}
\ No newline at end of file
diff --git a/graphene-pk11/index.d.ts b/graphene-pk11/index.d.ts
new file mode 100644
index 0000000000..37f7999133
--- /dev/null
+++ b/graphene-pk11/index.d.ts
@@ -0,0 +1,2717 @@
+// Type definitions for graphene-pk11 v2.0.0
+// Project: https://github.com/PeculiarVentures/graphene
+// Definitions by: Stepan Miroshin <https://github.com/microshine>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+/**
+ * A simple layer for interacting with PKCS #11 / PKCS11 / CryptoKI for Node
+ * v2.0.0
+ */
+
+
+
+type Callback = (err: Error, rv: number) => void;
+type CK_PTR = Buffer;
+
+declare class Pkcs11 {
+    lib: any;
+    /**
+     * load a library with PKCS11 interface
+     * @param {string} libFile path to PKCS11 library
+     */
+    constructor(libFile: string);
+    protected callFunction(funcName: string, args: any[]): number;
+    /**
+     * C_Initialize initializes the Cryptoki library.
+     * @param pInitArgs   if this is not NULL_PTR, it gets
+     *                    cast to CK_C_INITIALIZE_ARGS_PTR
+     *                    and dereferenced
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_Initialize(pInitArgs?: CK_PTR): number;
+    C_Initialize(pInitArgs: CK_PTR, cllback: Callback): void;
+    /**
+     * C_Finalize indicates that an application is done with the Cryptoki library.
+     * @param pReserved   reserved. Should be NULL_PTR
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_Finalize(pReserved?: CK_PTR): number;
+    C_Finalize(pReserved: CK_PTR, callback: Callback): void;
+    /**
+     * C_GetInfo returns general information about Cryptoki.
+     * @param pInfo       location that receives information
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GetInfo(pInfo: CK_PTR): number;
+    C_GetInfo(pInfo: CK_PTR, callback: Callback): void;
+    /**
+     * C_GetSlotList obtains a list of slots in the system.
+     * @param {boolean} tokenPresent only slots with tokens?
+     * @param pSlotList receives array of slot IDs
+     * @param pulCount receives number of slots
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GetSlotList(tokenPresent: boolean, pSlotList: CK_PTR, pulCount: CK_PTR): number;
+    C_GetSlotList(tokenPresent: boolean, pSlotList: CK_PTR, pulCount: CK_PTR, callback: Callback): void;
+    /**
+     * C_GetSlotInfo obtains information about a particular slot in
+     * the system.
+     * @param {number} slotID the ID of the slot
+     * @param {Buffer} pInfo receives the slot information
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GetSlotInfo(slotID: number, pInfo: CK_PTR): number;
+    C_GetSlotInfo(slotID: number, pInfo: CK_PTR, callback: Callback): void;
+    /**
+     * C_GetTokenInfo obtains information about a particular token
+     * in the system.
+     * @param {number} slotID ID of the token's slot
+     * @param {Buffer} pInfo receives the token information
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GetTokenInfo(slotID: number, pInfo: Buffer): number;
+    C_GetTokenInfo(slotID: number, pInfo: Buffer, callback: Callback): void;
+    /**
+     * C_GetMechanismList obtains a list of mechanism types
+     * supported by a token.
+     * @param {number} slotID ID of the token's slot
+     * @param {number} pMechanismList gets mech. array
+     * @param {number} pulCount gets # of mechs
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GetMechanismList(slotID: number, pMechanismList: Buffer, pulCount: Buffer): number;
+    C_GetMechanismList(slotID: number, pMechanismList: Buffer, pulCount: Buffer, callback: Callback): void;
+    /** C_GetMechanismInfo obtains information about a particular
+     * mechanism possibly supported by a token.
+     * @param {number} slotID ID of the token's slot
+     * @param {number} type type of mechanism
+     * @param {Buffer} pInfo receives mechanism info
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GetMechanismInfo(slotID: number, type: number, pInfo: Buffer): number;
+    C_GetMechanismInfo(slotID: number, type: number, pInfo: Buffer, callback: Callback): void;
+    /**
+     * C_InitToken initializes a token.
+     * @param {number} slotID ID of the token's slot
+     * @param {Buffer} pPin the SO's initial PIN
+     * @param {number} ulPinLen length in bytes of the PIN
+     * @param {number} pLabel 32-byte token label (blank padded)
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_InitToken(slotID: number, pPin: Buffer, ulPinLen: number, pLabel: Buffer): number;
+    C_InitToken(slotID: number, pPin: Buffer, ulPinLen: number, pLabel: Buffer, callback: Callback): void;
+    /**
+     * C_InitPIN initializes the normal user's PIN.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pPin the normal user's PIN
+     * @param {number} ulPinLen length in bytes of the PIN
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_InitPIN(hSession: number, pPin: Buffer, ulPinLen: number): number;
+    C_InitPIN(hSession: number, pPin: Buffer, ulPinLen: number, callback: Callback): void;
+    /**
+     * C_SetPIN modifies the PIN of the user who is logged in.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pOldPin the old PIN
+     * @param {number} ulOldLen length of the old PIN
+     * @param {Buffer} pNewPin the new PIN
+     * @param {number} ulNewLen length of the new PIN
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_SetPIN(hSession: any, pOldPin: Buffer, ulOldLen: number, pNewPin: Buffer, ulNewLen: number): number;
+    C_SetPIN(hSession: any, pOldPin: Buffer, ulOldLen: number, pNewPin: Buffer, ulNewLen: number, callback: Callback): void;
+    /**
+     * C_OpenSession opens a session between an application and a
+     * token.
+     * @param {number} slotID ID of the token's slot
+     * @param {number} flags from CK_SESSION_INFO
+     * @param {Buffer} pApplication passed to callback
+     * @param {Buffer} Notify callback function
+     * @param {Buffer} phSession gets session handle
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_OpenSession(slotID: number, flags: number, pApplication?: Buffer, notify?: Buffer, phSession?: Buffer): number;
+    C_OpenSession(slotID: number, flags: number, pApplication: Buffer, notify: Buffer, phSession: Buffer, callback: Callback): void;
+    /**
+     * C_CloseSession closes a session between an application and a token.
+     * @param {number} hSession the session's handle
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_CloseSession(hSession: number): number;
+    C_CloseSession(hSession: number, callback: Callback): void;
+    /**
+     * C_CloseAllSessions closes all sessions with a token.
+     * @param {number} slotID ID of the token's slot
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_CloseAllSessions(slotID: number): number;
+    C_CloseAllSessions(slotID: number, callback: Callback): void;
+    /**
+     * C_GetSessionInfo obtains information about the session.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pInfo receives session info
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GetSessionInfo(hSession: number, pInfo: Buffer): number;
+    C_GetSessionInfo(hSession: number, pInfo: Buffer, callback: Callback): void;
+    /**
+     * C_GetOperationState obtains the state of the cryptographic operation in a session.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pOperationState gets state
+     * @param {Buffer} pulOperationStateLen gets state length
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GetOperationState(hSession: number, pOperationState: Buffer, pulOperationStateLen: Buffer): number;
+    C_GetOperationState(hSession: number, pOperationState: Buffer, pulOperationStateLen: Buffer, callback: Callback): void;
+    /**
+     * C_SetOperationState restores the state of the cryptographic operation in a session.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pOperationState holds state
+     * @param {number} ulOperationStateLen holds holds state length
+     * @param {number} hEncryptionKey en/decryption key
+     * @param {number} hAuthenticationKey sign/verify key
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_SetOperationState(hSession: number, pOperationState: Buffer, ulOperationStateLen: number, hEncryptionKey: number, hAuthenticationKey: number): number;
+    C_SetOperationState(hSession: number, pOperationState: Buffer, ulOperationStateLen: number, hEncryptionKey: number, hAuthenticationKey: number, callback: Callback): void;
+    /**
+     * C_Login logs a user into a token.
+     * @param {number} hSession the session's handle
+     * @param {number} userType the user type
+     * @param {Buffer} pPin the user's PIN
+     * @param {number} ulPinLen the length of the PIN
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_Login(hSession: number, userType: number, pPin: Buffer, ulPinLen: number): number;
+    C_Login(hSession: number, userType: number, pPin: Buffer, ulPinLen: number, callback: Callback): void;
+    /**
+     * C_Logout logs a user out from a token.
+     * @param {number} hSession the session's handle
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_Logout(hSession: number): number;
+    C_Logout(hSession: number, callback: Callback): void;
+    /**
+     * C_CreateObject creates a new object.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pTemplate the object's template
+     * @param {number} ulCount attributes in template
+     * @param {Buffer} phObject gets new object's handle
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_CreateObject(hSession: number, pTemplate: Buffer, ulCount: number, phObject: Buffer): number;
+    C_CreateObject(hSession: number, pTemplate: Buffer, ulCount: number, phObject: Buffer, callback: Callback): void;
+    /**
+     * C_CopyObject copies an object, creating a new object for the copy.
+     * @param {number} hSession the session's handle
+     * @param {number} hObject the object's handle
+     * @param {Buffer} pTemplate template for new object
+     * @param {number} ulCount attributes in template
+     * @param {Buffer} phNewObject receives handle of copy
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_CopyObject(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number, phNewObject: Buffer): number;
+    C_CopyObject(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number, phNewObject: Buffer, callback: Callback): void;
+    /**
+     * C_DestroyObject destroys an object.
+     * @param {number} hSession the session's handle
+     * @param {number} hObject the object's handle
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DestroyObject(hSession: number, hObject: number): number;
+    C_DestroyObject(hSession: number, hObject: number, callback: Callback): void;
+    /**
+     * C_GetObjectSize gets the size of an object in bytes.
+     * @param {number} hSession the session's handle
+     * @param {number} hObject the object's handle
+     * @param {Buffer} pulSize receives size of object
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GetObjectSize(hSession: number, hObject: number, pulSize: Buffer): number;
+    C_GetObjectSize(hSession: number, hObject: number, pulSize: Buffer, callback: Callback): void;
+    /**
+     * C_GetAttributeValue obtains the value of one or more object attributes.
+     * @param {number} hSession the session's handle
+     * @param {number} hObject the object's handle
+     * @param {Buffer} pTemplate specifies attrs; gets vals
+     * @param {number} ulCount attributes in template
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GetAttributeValue(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number): number;
+    C_GetAttributeValue(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number, callback: Callback): void;
+    /**
+     * C_SetAttributeValue modifies the value of one or more object attributes
+     * @param {number} hSession the session's handle
+     * @param {number} hObject the object's handle
+     * @param {Buffer} pTemplate specifies attrs and values
+     * @param {number} ulCount attributes in template
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_SetAttributeValue(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number): number;
+    C_SetAttributeValue(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number, callback: Callback): void;
+    /**
+     * C_FindObjectsInit initializes a search for token and session
+     * objects that match a template.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pTemplate attribute values to match
+     * @param {number} ulCount attrs in search template
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_FindObjectsInit(hSession: number, pTemplate: Buffer, ulCount: number): number;
+    C_FindObjectsInit(hSession: number, pTemplate: Buffer, ulCount: number, callback: Callback): void;
+    /**
+     * C_FindObjects continues a search for token and session
+     * objects that match a template, obtaining additional object
+     * handles.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} phObject gets obj. handles
+     * @param {number} ulMaxObjectCount max handles to get
+     * @param {Buffer} pulObjectCount actual # returned
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_FindObjects(hSession: number, phObject: Buffer, ulMaxObjectCount: number, pulObjectCount: Buffer): number;
+    C_FindObjects(hSession: number, phObject: Buffer, ulMaxObjectCount: number, pulObjectCount: Buffer, callback: Callback): void;
+    /**
+     * C_FindObjectsFinal finishes a search for token and session objects.
+     * @param {number} hSession the session's handle
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_FindObjectsFinal(hSession: number): number;
+    C_FindObjectsFinal(hSession: number, callback: Callback): void;
+    /**
+     * C_EncryptInit initializes an encryption operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism the encryption mechanism
+     * @param {number} hKey handle of encryption key
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_EncryptInit(hSession: number, pMechanism: Buffer, hKey: number): number;
+    C_EncryptInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
+    /**
+     * C_Encrypt encrypts single-part data.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pData the plaintext data
+     * @param {number} ulDataLen bytes of plaintext
+     * @param {Buffer} pEncryptedData gets ciphertext
+     * @param {Buffer} pulEncryptedDataLen gets c-text size
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_Encrypt(hSession: number, pData: Buffer, ulDataLen: number, pEncryptedData: Buffer, pulEncryptedDataLen: Buffer): number;
+    C_Encrypt(hSession: number, pData: Buffer, ulDataLen: number, pEncryptedData: Buffer, pulEncryptedDataLen: Buffer, callback: Callback): void;
+    /**
+     * C_EncryptUpdate continues a multiple-part encryption operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pPart the plaintext data
+     * @param {number} ulPartLen plaintext data len
+     * @param {Buffer} pEncryptedPart gets ciphertext
+     * @param {Buffer} pulEncryptedPartLen gets c-text size
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_EncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer): number;
+    C_EncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer, callback: Callback): void;
+    /**
+     * C_EncryptFinal finishes a multiple-part encryption operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pLastEncryptedPart last c-text
+     * @param {Buffer} pulLastEncryptedPartLen gets last size
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_EncryptFinal(hSession: number, pLastEncryptedPart: Buffer, pulLastEncryptedPartLen: Buffer): number;
+    C_EncryptFinal(hSession: number, pLastEncryptedPart: Buffer, pulLastEncryptedPartLen: Buffer, callback: Callback): void;
+    /**
+     * C_DecryptInit initializes a decryption operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism the decryption mechanism
+     * @param {number} hKey handle of decryption key
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DecryptInit(hSession: number, pMechanism: Buffer, hKey: number): any;
+    C_DecryptInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
+    /**
+     * C_Decrypt decrypts encrypted data in a single part.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pEncryptedData ciphertext
+     * @param {number} ulEncryptedDataLen ciphertext length
+     * @param {Buffer} pData gets plaintext
+     * @param {number} pulDataLen gets p-text size
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_Decrypt(hSession: number, pEncryptedData: Buffer, ulEncryptedDataLen: number, pData: Buffer, pulDataLen: Buffer): number;
+    C_Decrypt(hSession: number, pEncryptedData: Buffer, ulEncryptedDataLen: number, pData: Buffer, pulDataLen: Buffer, callback: Callback): void;
+    /**
+     * C_DecryptUpdate continues a multiple-part decryption operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pEncryptedPart encrypted data
+     * @param {number} ulEncryptedPartLen input length
+     * @param {Buffer} pPart gets plaintext
+     * @param {Buffer} pulPartLen p-text size
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DecryptUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer): number;
+    C_DecryptUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer, callback: Callback): void;
+    /**
+     * C_DecryptFinal finishes a multiple-part decryption operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pLastPart gets plaintext
+     * @param {Buffer} pulLastPartLen p-text size
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DecryptFinal(hSession: number, pLastPart: Buffer, pulLastPartLen: Buffer): number;
+    C_DecryptFinal(hSession: number, pLastPart: Buffer, pulLastPartLen: Buffer, callback: Callback): void;
+    /**
+     * C_DigestInit initializes a message-digesting operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism the digesting mechanism
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DigestInit(hSession: number, pMechanism: Buffer): number;
+    C_DigestInit(hSession: number, pMechanism: Buffer, callback: Callback): void;
+    /**
+     * C_Digest digests data in a single part.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pData data to be digested
+     * @param {number} ulDataLen bytes of data to digest
+     * @param {Buffer} pDigest gets the message digest
+     * @param {Buffer} pulDigestLen gets digest length
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_Digest(hSession: number, pData: Buffer, ulDataLen: number, pDigest: Buffer, pulDigestLen: Buffer): number;
+    C_Digest(hSession: number, pData: Buffer, ulDataLen: number, pDigest: Buffer, pulDigestLen: Buffer, callback: Callback): void;
+    /**
+     * C_DigestUpdate continues a multiple-part message-digesting operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pPart data to be digested
+     * @param {number} ulPartLen bytes of data to be digested
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DigestUpdate(hSession: number, pPart: Buffer, ulPartLen: number): number;
+    C_DigestUpdate(hSession: number, pPart: Buffer, ulPartLen: number, callback: Callback): void;
+    /**
+     * C_DigestKey continues a multi-part message-digesting operation,
+     * by digesting the value of a secret key as part of
+     * the data already digested.
+     * @param {number} hSession the session's handle
+     * @param {number} hKey secret key to digest
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DigestKey(hSession: number, hKey: number): number;
+    C_DigestKey(hSession: number, hKey: number, callback: Callback): void;
+    /**
+     * C_DigestFinal finishes a multiple-part message-digesting
+     * operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pDigest gets the message digest
+     * @param {Buffer} pulDigestLen gets byte count of digest
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DigestFinal(hSession: number, pDigest: Buffer, pulDigestLen: Buffer): number;
+    C_DigestFinal(hSession: number, pDigest: Buffer, pulDigestLen: Buffer, callback: Callback): void;
+    /**
+     * C_SignInit initializes a signature (private key encryption)
+     * operation, where the signature is (will be) an appendix to
+     * the data, and plaintext cannot be recovered from the signature.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism the signature mechanism
+     * @param {number} hKey handle of signature key
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_SignInit(hSession: number, pMechanism: Buffer, hKey: number): number;
+    C_SignInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
+    /**
+     * C_Sign signs (encrypts with private key) data in a single
+     * part, where the signature is (will be) an appendix to the
+     * data, and plaintext cannot be recovered from the signature.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pData the data to sign
+     * @param {number} ulDataLen count of bytes to sign
+     * @param {Buffer} pSignature gets the signature
+     * @param {Buffer} pulSignatureLen gets signature length
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_Sign(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, pulSignatureLen: Buffer): number;
+    C_Sign(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, pulSignatureLen: Buffer, callback: Callback): void;
+    /**
+     * C_SignUpdate continues a multiple-part signature operation,
+     * where the signature is (will be) an appendix to the data,
+     * and plaintext cannot be recovered from the signature.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pPart the data to sign
+     * @param {number} ulPartLen count of bytes to sign
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_SignUpdate(hSession: number, pPart: Buffer, ulPartLen: Buffer): number;
+    C_SignUpdate(hSession: number, pPart: Buffer, ulPartLen: Buffer, callback: Callback): void;
+    /**
+     * C_SignFinal finishes a multiple-part signature operation,
+     * returning the signature.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pSignature gets the signature
+     * @param {Buffer} pulSignatureLen gets signature length
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_SignFinal(hSession: number, pSignature: Buffer, pulSignatureLen: Buffer): number;
+    C_SignFinal(hSession: number, pSignature: Buffer, pulSignatureLen: Buffer, callback: Callback): void;
+    /**
+     * C_SignRecoverInit initializes a signature operation, where
+     * the data can be recovered from the signature.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism the signature mechanism
+     * @param {number} hKey handle of the signature key
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_SignRecoverInit(hSession: number, pMechanism: Buffer, hKey: number): number;
+    C_SignRecoverInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
+    /**
+     * C_SignRecover signs data in a single operation, where the
+     * data can be recovered from the signature.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pData the data to sign
+     * @param {number} ulDataLen count of bytes to sign
+     * @param {Buffer} pSignature gets the signature
+     * @param {Buffer} pulSignatureLen gets signature length
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_SignRecover(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, pulSignatureLen: Buffer): number;
+    C_SignRecover(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, pulSignatureLen: Buffer, callback: Callback): void;
+    /**
+     * C_VerifyInit initializes a verification operation, where the
+     * signature is an appendix to the data, and plaintext cannot
+     * cannot be recovered from the signature (e.g. DSA).
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism the verification mechanism
+     * @param {number} hKey verification key
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_VerifyInit(hSession: number, pMechanism: Buffer, hKey: number): number;
+    C_VerifyInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
+    /**
+     * C_Verify verifies a signature in a single-part operation,
+     * where the signature is an appendix to the data, and plaintext
+     * cannot be recovered from the signature.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pData signed data
+     * @param {number} ulDataLen length of signed data
+     * @param {Buffer} pSignature signature
+     * @param {number} ulSignatureLen signature length
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_Verify(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, ulSignatureLen: Buffer): number;
+    C_Verify(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, ulSignatureLen: Buffer, callback: Callback): void;
+    /**
+     * C_VerifyUpdate continues a multiple-part verification
+     * operation, where the signature is an appendix to the data,
+     * and plaintext cannot be recovered from the signature.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pPart signed data
+     * @param {number} ulPartLen length of signed data
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_VerifyUpdate(hSession: number, pPart: Buffer, ulPartLen: number): number;
+    C_VerifyUpdate(hSession: number, pPart: Buffer, ulPartLen: number, callback: Callback): void;
+    /**
+     * C_VerifyFinal finishes a multiple-part verification
+     * operation, checking the signature.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pSignature signature to verify
+     * @param {number} ulSignatureLen signature length
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_VerifyFinal(hSession: number, pSignature: Buffer, ulSignatureLen: number): number;
+    C_VerifyFinal(hSession: number, pSignature: Buffer, ulSignatureLen: number, callback: Callback): void;
+    /**
+     * C_VerifyRecoverInit initializes a signature verification
+     * operation, where the data is recovered from the signature.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism the verification mechanism
+     * @param {number} hKey verification key
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_VerifyRecoverInit(hSession: number, pMechanism: Buffer, hKey: number): number;
+    C_VerifyRecoverInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
+    /**
+     * C_VerifyRecover verifies a signature in a single-part
+     * operation, where the data is recovered from the signature.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pSignature signature to verify
+     * @param {number} ulSignatureLen signature length
+     * @param {Buffer} pData gets signed data
+     * @param {Buffer} pulDataLen gets signed data len
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_VerifyRecover(hSession: number, pSignature: Buffer, ulSignatureLen: number, pData: Buffer, pulDataLen: Buffer): number;
+    C_VerifyRecover(hSession: number, pSignature: Buffer, ulSignatureLen: number, pData: Buffer, pulDataLen: Buffer, callback: Callback): void;
+    /**
+     * C_DigestEncryptUpdate continues a multiple-part digesting
+     * and encryption operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pPart the plaintext data
+     * @param {number} ulPartLen plaintext length
+     * @param {Buffer} pEncryptedPart gets ciphertext
+     * @param {Buffer} pulEncryptedPartLen gets c-text length
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DigestEncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer): number;
+    C_DigestEncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer, callback: Callback): void;
+    /**
+     * C_DecryptDigestUpdate continues a multiple-part decryption and
+     * digesting operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pEncryptedPart ciphertext
+     * @param {number} ulEncryptedPartLen ciphertext length
+     * @param {Buffer} pPart gets plaintext
+     * @param {Buffer} pulPartLen gets plaintext len
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DecryptDigestUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer): number;
+    C_DecryptDigestUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer, callback: Callback): void;
+    /**
+     * C_SignEncryptUpdate continues a multiple-part signing and
+     * encryption operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pPart the plaintext data
+     * @param {number} ulPartLen plaintext length
+     * @param {Buffer} pEncryptedPart gets ciphertext
+     * @param {Buffer} pulEncryptedPartLen gets c-text length
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_SignEncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer): number;
+    C_SignEncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer, callback: Callback): void;
+    /**
+     * C_DecryptVerifyUpdate continues a multiple-part decryption and
+     * verify operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pEncryptedPart ciphertext
+     * @param {number} ulEncryptedPartLen ciphertext length
+     * @param {Buffer} pPart gets plaintext
+     * @param {Buffer} pulPartLen gets p-text length
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DecryptVerifyUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer): number;
+    C_DecryptVerifyUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer, callback: Callback): void;
+    /**
+     * C_GenerateKey generates a secret key, creating a new key object.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism key generation mech.
+     * @param {Buffer} pTemplate template for new key
+     * @param {number} ulCount # of attrs in template
+     * @param {Buffer} phKey gets handle of new key
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GenerateKey(hSession: number, pMechanism: Buffer, pTemplate: Buffer, ulCount: number, phKey: Buffer): number;
+    C_GenerateKey(hSession: number, pMechanism: Buffer, pTemplate: Buffer, ulCount: number, phKey: Buffer, callback: Callback): any;
+    /**
+     * C_GenerateKeyPair generates a public-key/private-key pair,
+     * creating new key objects.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism key-gen mech.
+     * @param {Buffer} pPublicKeyTemplate template for public key
+     * @param {number} ulPublicKeyAttributeCount public attrs
+     * @param {Buffer} pPrivateKeyTemplate template for private key
+     * @param {number} ulPrivateKeyAttributeCount private attrs
+     * @param {Buffer} phPublicKey gets public key handle
+     * @param {Buffer} phPrivateKey gets private key handle
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GenerateKeyPair(hSession: number, pMechanism: Buffer, pPublicKeyTemplate: Buffer, ulPublicKeyAttributeCount: number, pPrivateKeyTemplate: Buffer, ulPrivateKeyAttributeCount: number, phPublicKey: Buffer, phPrivateKey: Buffer): number;
+    C_GenerateKeyPair(hSession: number, pMechanism: Buffer, pPublicKeyTemplate: Buffer, ulPublicKeyAttributeCount: number, pPrivateKeyTemplate: Buffer, ulPrivateKeyAttributeCount: number, phPublicKey: Buffer, phPrivateKey: Buffer, callback: Callback): void;
+    /**
+     * C_WrapKey wraps (i.e., encrypts) a key.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism the wrapping mechanism
+     * @param {number} hWrappingKey wrapping key
+     * @param {number} hKey key to be wrapped
+     * @param {Buffer} pWrappedKey gets wrapped key
+     * @param {Buffer} pulWrappedKeyLen gets wrapped key size
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_WrapKey(hSession: number, pMechanism: Buffer, hWrappingKey: number, hKey: number, pWrappedKey: Buffer, pulWrappedKeyLen: Buffer): number;
+    C_WrapKey(hSession: number, pMechanism: Buffer, hWrappingKey: number, hKey: number, pWrappedKey: Buffer, pulWrappedKeyLen: Buffer, callback: Callback): void;
+    /**
+     * C_UnwrapKey unwraps (decrypts) a wrapped key, creating a new
+     * key object.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism unwrapping mech.
+     * @param {Buffer} pWrappedKey the wrapped key
+     * @param {number} ulWrappedKeyLen wrapped key len
+     * @param {Buffer} pTemplate new key template
+     * @param {number} ulAttributeCount template length
+     * @param {Buffer} pTemplate new key template
+     * @param {number} ulAttributeCount template length
+     * @param {Buffer} phKey gets new handle
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_UnwrapKey(hSession: number, pMechanism: Buffer, hUnwrappingKey: number, pWrappedKey: Buffer, ulWrappedKeyLen: number, pTemplate: Buffer, ulAttributeCount: number, phKey: Buffer): number;
+    C_UnwrapKey(hSession: number, pMechanism: Buffer, hUnwrappingKey: number, pWrappedKey: Buffer, ulWrappedKeyLen: number, pTemplate: Buffer, ulAttributeCount: number, phKey: Buffer, callback: Callback): void;
+    /**
+     * C_DeriveKey derives a key from a base key, creating a new key object.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism key deriv. mech.
+     * @param {number} hBaseKey base key
+     * @param {Buffer} pTemplate new key template
+     * @param {number} ulAttributeCount template length
+     * @param {Buffer} phKey gets new handle
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DeriveKey(hSession: number, pMechanism: Buffer, hBaseKey: number, pTemplate: Buffer, ulAttributeCount: number, phKey: Buffer): number;
+    C_DeriveKey(hSession: number, pMechanism: Buffer, hBaseKey: number, pTemplate: Buffer, ulAttributeCount: number, phKey: Buffer, callback: Callback): void;
+    /**
+     * C_SeedRandom mixes additional seed material into the token's
+     * random number generator.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pSeed the seed material
+     * @param {number} ulSeedLen length of seed material
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_SeedRandom(hSession: number, pSeed: Buffer, ulSeedLen: number): number;
+    C_SeedRandom(hSession: number, pSeed: Buffer, ulSeedLen: number, callback: Callback): void;
+    /**
+     * C_GenerateRandom generates random data.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pRandomData receives the random data
+     * @param {number} ulRandomLen # of bytes to generate
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GenerateRandom(hSession: number, pRandomData: Buffer, ulRandomLen: number): number;
+    C_GenerateRandom(hSession: number, pRandomData: Buffer, ulRandomLen: number, callback: Callback): void;
+    /**
+     * C_GetFunctionStatus is a legacy function; it obtains an
+     * updated status of a function running in parallel with an
+     * application.
+     * @param {number} hSession the session's handle
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GetFunctionStatus(hSession: number): number;
+    C_GetFunctionStatus(hSession: number, callback: Callback): void;
+    /**
+     * C_CancelFunction is a legacy function; it cancels a function
+     * running in parallel.
+     * @param {number} hSession the session's handle
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_CancelFunction(hSession: number): number;
+    C_CancelFunction(hSession: number, callback: Callback): void;
+    /**
+     * C_WaitForSlotEvent waits for a slot event (token insertion,
+     * removal, etc.) to occur.
+     * @param {number} flags blocking/nonblocking flag
+     * @param {Buffer} pSlot location that receives the slot ID
+     * @param {Buffer} pRserved reserved.  Should be NULL_PTR
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_WaitForSlotEvent(flags: number, pSlot: Buffer, pRserved: Buffer): number;
+    C_WaitForSlotEvent(flags: number, pSlot: Buffer, pRserved: Buffer, callback: Callback): number;
+}
+
+declare enum KeyType {
+    RSA,
+    DSA,
+    DH,
+    ECDSA,
+    EC,
+    X9_42_DH,
+    KEA,
+    GENERIC_SECRET,
+    RC2,
+    RC4,
+    DES,
+    DES2,
+    DES3,
+    CAST,
+    CAST3,
+    CAST5,
+    CAST128,
+    RC5,
+    IDEA,
+    SKIPJACK,
+    BATON,
+    JUNIPER,
+    CDMF,
+    AES,
+    GOSTR3410,
+    GOSTR3411,
+    GOST28147,
+    BLOWFISH,
+    TWOFISH,
+    SECURID,
+    HOTP,
+    ACTI,
+    CAMELLIA,
+    ARIA,
+}
+declare enum KeyGenMechanism {
+    AES,
+    RSA,
+    RSA_X9_31,
+    DSA,
+    DH_PKCS,
+    DH_X9_42,
+    GOSTR3410,
+    GOST28147,
+    RC2,
+    RC4,
+    DES,
+    DES2,
+    SECURID,
+    ACTI,
+    CAST,
+    CAST3,
+    CAST5,
+    CAST128,
+    RC5,
+    IDEA,
+    GENERIC_SECRET,
+    SSL3_PRE_MASTER,
+    CAMELLIA,
+    ARIA,
+    SKIPJACK,
+    KEA,
+    BATON,
+    ECDSA,
+    EC,
+    JUNIPER,
+    TWOFISH,
+}
+
+declare enum MechanismEnum {
+    RSA_PKCS_KEY_PAIR_GEN,
+    RSA_PKCS,
+    RSA_9796,
+    RSA_X_509,
+    MD2_RSA_PKCS,
+    MD5_RSA_PKCS,
+    SHA1_RSA_PKCS,
+    RIPEMD128_RSA_PKCS,
+    RIPEMD160_RSA_PKCS,
+    RSA_PKCS_OAEP,
+    RSA_X9_31_KEY_PAIR_GEN,
+    RSA_X9_31,
+    SHA1_RSA_X9_31,
+    RSA_PKCS_PSS,
+    SHA1_RSA_PKCS_PSS,
+    DSA_KEY_PAIR_GEN,
+    DSA,
+    DSA_SHA1,
+    DH_PKCS_KEY_PAIR_GEN,
+    DH_PKCS_DERIVE,
+    X9_42_DH_KEY_PAIR_GEN,
+    X9_42_DH_DERIVE,
+    X9_42_DH_HYBRID_DERIVE,
+    X9_42_MQV_DERIVE,
+    SHA256_RSA_PKCS,
+    SHA384_RSA_PKCS,
+    SHA512_RSA_PKCS,
+    SHA256_RSA_PKCS_PSS,
+    SHA384_RSA_PKCS_PSS,
+    SHA512_RSA_PKCS_PSS,
+    SHA224_RSA_PKCS,
+    SHA224_RSA_PKCS_PSS,
+    RC2_KEY_GEN,
+    RC2_ECB,
+    RC2_CBC,
+    RC2_MAC,
+    RC2_MAC_GENERAL,
+    RC2_CBC_PAD,
+    RC4_KEY_GEN,
+    RC4,
+    DES_KEY_GEN,
+    DES_ECB,
+    DES_CBC,
+    DES_MAC,
+    DES_MAC_GENERAL,
+    DES_CBC_PAD,
+    DES2_KEY_GEN,
+    DES3_KEY_GEN,
+    DES3_ECB,
+    DES3_CBC,
+    DES3_MAC,
+    DES3_MAC_GENERAL,
+    DES3_CBC_PAD,
+    CDMF_KEY_GEN,
+    CDMF_ECB,
+    CDMF_CBC,
+    CDMF_MAC,
+    CDMF_MAC_GENERAL,
+    CDMF_CBC_PAD,
+    DES_OFB64,
+    DES_OFB8,
+    DES_CFB64,
+    DES_CFB8,
+    MD2,
+    MD2_HMAC,
+    MD2_HMAC_GENERAL,
+    MD5,
+    MD5_HMAC,
+    MD5_HMAC_GENERAL,
+    SHA1,
+    SHA,
+    SHA_1,
+    SHA_1_HMAC,
+    SHA_1_HMAC_GENERAL,
+    RIPEMD128,
+    RIPEMD128_HMAC,
+    RIPEMD128_HMAC_GENERAL,
+    RIPEMD160,
+    RIPEMD160_HMAC,
+    RIPEMD160_HMAC_GENERAL,
+    SHA256,
+    SHA256_HMAC,
+    SHA256_HMAC_GENERAL,
+    SHA224,
+    SHA224_HMAC,
+    SHA224_HMAC_GENERAL,
+    SHA384,
+    SHA384_HMAC,
+    SHA384_HMAC_GENERAL,
+    SHA512,
+    SHA512_HMAC,
+    SHA512_HMAC_GENERAL,
+    SECURID_KEY_GEN,
+    SECURID,
+    HOTP_KEY_GEN,
+    HOTP,
+    ACTI,
+    ACTI_KEY_GEN,
+    CAST_KEY_GEN,
+    CAST_ECB,
+    CAST_CBC,
+    CAST_MAC,
+    CAST_MAC_GENERAL,
+    CAST_CBC_PAD,
+    CAST3_KEY_GEN,
+    CAST3_ECB,
+    CAST3_CBC,
+    CAST3_MAC,
+    CAST3_MAC_GENERAL,
+    CAST3_CBC_PAD,
+    CAST5_KEY_GEN,
+    CAST128_KEY_GEN,
+    CAST5_ECB,
+    CAST128_ECB,
+    CAST5_CBC,
+    CAST128_CBC,
+    CAST5_MAC,
+    CAST128_MAC,
+    CAST5_MAC_GENERAL,
+    CAST128_MAC_GENERAL,
+    CAST5_CBC_PAD,
+    CAST128_CBC_PAD,
+    RC5_KEY_GEN,
+    RC5_ECB,
+    RC5_CBC,
+    RC5_MAC,
+    RC5_MAC_GENERAL,
+    RC5_CBC_PAD,
+    IDEA_KEY_GEN,
+    IDEA_ECB,
+    IDEA_CBC,
+    IDEA_MAC,
+    IDEA_MAC_GENERAL,
+    IDEA_CBC_PAD,
+    GENERIC_SECRET_KEY_GEN,
+    CONCATENATE_BASE_AND_KEY,
+    CONCATENATE_BASE_AND_DATA,
+    CONCATENATE_DATA_AND_BASE,
+    XOR_BASE_AND_DATA,
+    EXTRACT_KEY_FROM_KEY,
+    SSL3_PRE_MASTER_KEY_GEN,
+    SSL3_MASTER_KEY_DERIVE,
+    SSL3_KEY_AND_MAC_DERIVE,
+    SSL3_MASTER_KEY_DERIVE_DH,
+    TLS_PRE_MASTER_KEY_GEN,
+    TLS_MASTER_KEY_DERIVE,
+    TLS_KEY_AND_MAC_DERIVE,
+    TLS_MASTER_KEY_DERIVE_DH,
+    TLS_PRF,
+    SSL3_MD5_MAC,
+    SSL3_SHA1_MAC,
+    MD5_KEY_DERIVATION,
+    MD2_KEY_DERIVATION,
+    SHA1_KEY_DERIVATION,
+    SHA256_KEY_DERIVATION,
+    SHA384_KEY_DERIVATION,
+    SHA512_KEY_DERIVATION,
+    SHA224_KEY_DERIVATION,
+    PBE_MD2_DES_CBC,
+    PBE_MD5_DES_CBC,
+    PBE_MD5_CAST_CBC,
+    PBE_MD5_CAST3_CBC,
+    PBE_MD5_CAST5_CBC,
+    PBE_MD5_CAST128_CBC,
+    PBE_SHA1_CAST5_CBC,
+    PBE_SHA1_CAST128_CBC,
+    PBE_SHA1_RC4_128,
+    PBE_SHA1_RC4_40,
+    PBE_SHA1_DES3_EDE_CBC,
+    PBE_SHA1_DES2_EDE_CBC,
+    PBE_SHA1_RC2_128_CBC,
+    PBE_SHA1_RC2_40_CBC,
+    PKCS5_PBKD2,
+    PBA_SHA1_WITH_SHA1_HMAC,
+    WTLS_PRE_MASTER_KEY_GEN,
+    WTLS_MASTER_KEY_DERIVE,
+    WTLS_MASTER_KEY_DERIVE_DH_ECC,
+    WTLS_PRF,
+    WTLS_SERVER_KEY_AND_MAC_DERIVE,
+    WTLS_CLIENT_KEY_AND_MAC_DERIVE,
+    KEY_WRAP_LYNKS,
+    KEY_WRAP_SET_OAEP,
+    CMS_SIG,
+    KIP_DERIVE,
+    KIP_WRAP,
+    KIP_MAC,
+    CAMELLIA_KEY_GEN,
+    CAMELLIA_ECB,
+    CAMELLIA_CBC,
+    CAMELLIA_MAC,
+    CAMELLIA_MAC_GENERAL,
+    CAMELLIA_CBC_PAD,
+    CAMELLIA_ECB_ENCRYPT_DATA,
+    CAMELLIA_CBC_ENCRYPT_DATA,
+    CAMELLIA_CTR,
+    ARIA_KEY_GEN,
+    ARIA_ECB,
+    ARIA_CBC,
+    ARIA_MAC,
+    ARIA_MAC_GENERAL,
+    ARIA_CBC_PAD,
+    ARIA_ECB_ENCRYPT_DATA,
+    ARIA_CBC_ENCRYPT_DATA,
+    SKIPJACK_KEY_GEN,
+    SKIPJACK_ECB64,
+    SKIPJACK_CBC64,
+    SKIPJACK_OFB64,
+    SKIPJACK_CFB64,
+    SKIPJACK_CFB32,
+    SKIPJACK_CFB16,
+    SKIPJACK_CFB8,
+    SKIPJACK_WRAP,
+    SKIPJACK_PRIVATE_WRAP,
+    SKIPJACK_RELAYX,
+    KEA_KEY_PAIR_GEN,
+    KEA_KEY_DERIVE,
+    FORTEZZA_TIMESTAMP,
+    BATON_KEY_GEN,
+    BATON_ECB128,
+    BATON_ECB96,
+    BATON_CBC128,
+    BATON_COUNTER,
+    BATON_SHUFFLE,
+    BATON_WRAP,
+    ECDSA_KEY_PAIR_GEN,
+    EC_KEY_PAIR_GEN,
+    ECDSA,
+    ECDSA_SHA1,
+    ECDSA_SHA224,
+    ECDSA_SHA256,
+    ECDSA_SHA384,
+    ECDSA_SHA512,
+    ECDH1_DERIVE,
+    ECDH1_COFACTOR_DERIVE,
+    ECMQV_DERIVE,
+    JUNIPER_KEY_GEN,
+    JUNIPER_ECB128,
+    JUNIPER_CBC128,
+    JUNIPER_COUNTER,
+    JUNIPER_SHUFFLE,
+    JUNIPER_WRAP,
+    FASTHASH,
+    AES_KEY_GEN,
+    AES_ECB,
+    AES_CBC,
+    AES_MAC,
+    AES_MAC_GENERAL,
+    AES_CBC_PAD,
+    AES_CTR,
+    AES_CMAC,
+    AES_CMAC_GENERAL,
+    BLOWFISH_KEY_GEN,
+    BLOWFISH_CBC,
+    TWOFISH_KEY_GEN,
+    TWOFISH_CBC,
+    AES_GCM,
+    AES_CCM,
+    AES_KEY_WRAP,
+    AES_KEY_WRAP_PAD,
+    DES_ECB_ENCRYPT_DATA,
+    DES_CBC_ENCRYPT_DATA,
+    DES3_ECB_ENCRYPT_DATA,
+    DES3_CBC_ENCRYPT_DATA,
+    AES_ECB_ENCRYPT_DATA,
+    AES_CBC_ENCRYPT_DATA,
+    GOSTR3410_KEY_PAIR_GEN,
+    GOSTR3410,
+    GOSTR3410_WITH_GOSTR3411,
+    GOSTR3410_KEY_WRAP,
+    GOSTR3410_DERIVE,
+    GOSTR3411,
+    GOSTR3411_HMAC,
+    GOST28147_KEY_GEN,
+    GOST28147_ECB,
+    GOST28147,
+    GOST28147_MAC,
+    GOST28147_KEY_WRAP,
+    DSA_PARAMETER_GEN,
+    DH_PKCS_PARAMETER_GEN,
+    X9_42_DH_PARAMETER_GEN,
+    VENDOR_DEFINED,
+}
+
+interface IParams {
+    toCKI(): Buffer;
+}
+
+interface IAlgorithm {
+    name: string;
+    params: Buffer | IParams;
+}
+
+type MechanismType = MechanismEnum | KeyGenMechanism | IAlgorithm | string;
+
+declare enum MechanismFlag {
+    /**
+     * `True` if the mechanism is performed by the device; `false` if the mechanism is performed in software
+     */
+    HW,
+    /**
+     * `True` if the mechanism can be used with encrypt function
+     */
+    ENCRYPT,
+    /**
+     * `True` if the mechanism can be used with decrypt function
+     */
+    DECRYPT,
+    /**
+     * `True` if the mechanism can be used with digest function
+     */
+    DIGEST,
+    /**
+     * `True` if the mechanism can be used with sign function
+     */
+    SIGN,
+    /**
+     * `True` if the mechanism can be used with sign recover function
+     */
+    SIGN_RECOVER,
+    /**
+     * `True` if the mechanism can be used with verify function
+     */
+    VERIFY,
+    /**
+     * `True` if the mechanism can be used with verify recover function
+     */
+    VERIFY_RECOVER,
+    /**
+     * `True` if the mechanism can be used with geberate function
+     */
+    GENERATE,
+    /**
+     * `True` if the mechanism can be used with generate key pair function
+     */
+    GENERATE_KEY_PAIR,
+    /**
+     * `True` if the mechanism can be used with wrap function
+     */
+    WRAP,
+    /**
+     * `True` if the mechanism can be used with unwrap function
+     */
+    UNWRAP,
+    /**
+     * `True` if the mechanism can be used with derive function
+     */
+    DERIVE,
+}
+declare class Mechanism extends HandleObject {
+    protected slotHandle: number;
+    /**
+     * the minimum size of the key for the mechanism
+     * _whether this is measured in bits or in bytes is mechanism-dependent_
+     */
+    minKeySize: number;
+    /**
+     * the maximum size of the key for the mechanism
+     * _whether this is measured in bits or in bytes is mechanism-dependent_
+     */
+    maxKeySize: number;
+    /**
+     * bit flag specifying mechanism capabilities
+     */
+    flags: number;
+    /**
+     * returns string name from MechanismEnum
+     */
+    name: string;
+    constructor(handle: number, slotHandle: number, lib: Pkcs11);
+    protected getInfo(): void;
+    static create(alg: MechanismType): Buffer;
+    static vendor(jsonFile: string): any;
+    static vendor(name: string, value: number): any;
+}
+
+declare class MechanismCollection extends Collection<Mechanism> {
+    protected slotHandle: number;
+    constructor(items: Array<number>, slotHandle: number, lib: Pkcs11, classType?: typeof Mechanism);
+    /**
+     * returns item from collection by index
+     * @param {number} index of element in collection `[0..n]`
+     */
+    items(index: number): Mechanism;
+}
+
+/**
+ * Definition for the base key object class
+ * - defines the object class `CKO_PUBLIC_KEY`, `CKO_PRIVATE_KEY` and `CKO_SECRET_KEY` for type `CK_OBJECT_CLASS`
+ * as used in the `CKA_CLASS` attribute of objects
+ */
+declare class Key extends Storage {
+    /**
+     * Type of key
+     * - Must be specified when object is created with `C_CreateObject`
+     * - Must be specified when object is unwrapped with `C_UnwrapKey`
+     */
+    type: KeyType;
+    /**
+     * Key identifier for key (default empty)
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification
+     * of the attribute during the course of a `C_CopyObject` call.
+     */
+    id: Buffer;
+    /**
+     * Start date for the key (default empty)
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification
+     * of the attribute during the course of a `C_CopyObject` call.
+     */
+    startDate: Date;
+    /**
+     * End date for the key (default empty)
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification
+     * of the attribute during the course of a `C_CopyObject` call.
+     */
+    endDate: Date;
+    /**
+     * `CK_TRUE` if key supports key derivation
+     * (i.e., if other keys can be derived from this one (default `CK_FALSE`)
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification
+     * of the attribute during the course of a `C_CopyObject` call.
+     * @returns boolean
+     */
+    derive: boolean;
+    /**
+     * `CK_TRUE` only if key was either * generated locally (i.e., on the token)
+     * with a `C_GenerateKey` or `C_GenerateKeyPair` call * created with a `C_CopyObject` call
+     * as a copy of a key which had its `CKA_LOCAL` attribute set to `CK_TRUE`
+     * - Must not be specified when object is created with `C_CreateObject`.
+     * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
+     * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
+     */
+    local: boolean;
+    /**
+     * Identifier of the mechanism used to generate the key material.
+     * - Must not be specified when object is created with `C_CreateObject`.
+     * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
+     * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
+     */
+    mechanism: KeyGenMechanism;
+    allowedMechanisms: void;
+}
+
+
+declare class DomainParameters extends Storage {
+    /**
+     * Type of key the domain parameters can be used to generate.
+     */
+    keyType: KeyType;
+    /**
+     * `CK_TRUE` only if domain parameters were either * generated locally (i.e., on the token)
+     * with a `C_GenerateKey` * created with a `C_CopyObject` call as a copy of domain parameters
+     * which had its `CKA_LOCAL` attribute set to `CK_TRUE`
+     */
+    local: boolean;
+}
+
+/**
+ * Data objects (object class `CKO_DATA`) hold information defined by an application.
+ * Other than providing access to it, Cryptoki does not attach any special meaning to a data object
+ */
+declare class Data extends Storage {
+    /**
+     * Description of the application that manages the object (default empty)
+     */
+    application: string;
+    /**
+     * DER-encoding of the object identifier indicating the data object type (default empty)
+     */
+    objectId: Buffer;
+    /**
+     * Value of the object (default empty)
+     */
+    value: Buffer;
+}
+
+interface ITemplate {
+    /**
+     * CKA_CLASS
+     */
+    class?: number;
+    /**
+     * CKA_TOKEN
+     */
+    token?: boolean;
+    /**
+     * CKA_PRIVATE
+     */
+    private?: boolean;
+    /**
+     * CKA_LABEL
+     */
+    label?: string;
+    /**
+     * CKA_APPLICATION
+     */
+    application?: string;
+    /**
+     * CKA_VALUE
+     */
+    value?: Buffer;
+    /**
+     * CKA_OBJECT_ID
+     */
+    objectId?: Buffer;
+    /**
+     * CKA_CERTIFICATE_TYPE
+     */
+    certType?: number;
+    /**
+     * CKA_ISSUER
+     */
+    issuer?: Buffer;
+    /**
+     * CKA_SERIAL_NUMBER
+     */
+    serial?: Buffer;
+    /**
+     * CKA_AC_ISSUER
+     */
+    issuerAC?: Buffer;
+    /**
+     * CKA_OWNER
+     */
+    owner?: Buffer;
+    /**
+     * CKA_ATTR_TYPES
+     */
+    attrTypes?: Buffer;
+    /**
+     * CKA_TRUSTED
+     */
+    trusted?: boolean;
+    /**
+     * CKA_CERTIFICATE_CATEGORY
+     */
+    certCategory?: number;
+    /**
+     * CKA_JAVA_MIDP_SECURITY_DOMAIN
+     */
+    javaDomain?: number;
+    /**
+     * CKA_URL
+     */
+    url?: string;
+    /**
+     * CKA_HASH_OF_SUBJECT_PUBLIC_KEY
+     */
+    ski?: Buffer;
+    /**
+     * CKA_HASH_OF_ISSUER_PUBLIC_KEY
+     */
+    aki?: Buffer;
+    /**
+     * CKA_NAME_HASH_ALGORITHM
+     */
+    digestName?: number;
+    /**
+     * CKA_CHECK_VALUE
+     */
+    checkValue?: Buffer;
+    /**
+     * CKA_KEY_TYPE
+     */
+    keyType?: number;
+    /**
+     * CKA_SUBJECT
+     */
+    subject?: Buffer;
+    /**
+     * CKA_ID
+     */
+    id?: Buffer;
+    /**
+     * CKA_SENSITIVE
+     */
+    sensitive?: boolean;
+    /**
+     * CKA_ENCRYPT
+     */
+    encrypt?: boolean;
+    /**
+     * CKA_DECRYPT
+     */
+    decrypt?: boolean;
+    /**
+     * CKA_WRAP
+     */
+    wrap?: boolean;
+    /**
+     * CKA_UNWRAP
+     */
+    unwrap?: boolean;
+    /**
+     * CKA_SIGN
+     */
+    sign?: boolean;
+    /**
+     * CKA_SIGN_RECOVER
+     */
+    signRecover?: boolean;
+    /**
+     * CKA_VERIFY
+     */
+    verify?: boolean;
+    /**
+     * CKA_VERIFY_RECOVER
+     */
+    verifyRecover?: boolean;
+    /**
+     * CKA_DERIVE
+     */
+    derive?: boolean;
+    /**
+     * CKA_START_DATE
+     */
+    startDate?: Date;
+    /**
+     * CKA_END_DATE
+     */
+    endDate?: Date;
+    /**
+     * CKA_MODULUS
+     */
+    modulus?: Buffer;
+    /**
+     * CKA_MODULUS_BITS
+     */
+    modulusBits?: number;
+    /**
+     * CKA_PUBLIC_EXPONENT
+     */
+    publicExponent?: Buffer;
+    /**
+     * CKA_PRIVATE_EXPONEN
+     */
+    privateExponent?: Buffer;
+    /**
+     * CKA_PRIME_1
+     */
+    prime1?: Buffer;
+    /**
+     * CKA_PRIME_2
+     */
+    prime2?: Buffer;
+    /**
+     * CKA_EXPONENT_1
+     */
+    exp1?: Buffer;
+    /**
+     * CKA_EXPONENT_2
+     */
+    exp2?: Buffer;
+    /**
+     * CKA_COEFFICIEN
+     */
+    coefficient?: Buffer;
+    /**
+     * CKA_PRIME
+     */
+    prime?: Buffer;
+    /**
+     * CKA_SUBPRIME
+     */
+    subprime?: Buffer;
+    /**
+     * CKA_BASE
+     */
+    base?: Buffer;
+    /**
+     * CKA_PRIME_BITS
+     */
+    primeBits?: number;
+    /**
+     * CKA_SUBPRIME_BITS
+     */
+    subprimeBits?: number;
+    /**
+     * CKA_VALUE_BITS
+     */
+    valueBits?: number;
+    /**
+     * CKA_VALUE_LEN
+     */
+    valueLen?: number;
+    /**
+     * CKA_EXTRACTABLE
+     */
+    extractable?: boolean;
+    /**
+     * CKA_LOCAL
+     */
+    local?: boolean;
+    /**
+     * CKA_NEVER_EXTRACTABLE
+     */
+    neverExtractable?: boolean;
+    /**
+     * CKA_ALWAYS_SENSITIVE
+     */
+    alwaysSensitive?: boolean;
+    /**
+     * CKA_KEY_GEN_MECHANISM
+     */
+    keyGenMechanism?: number;
+    /**
+     * CKA_MODIFIABLE
+     */
+    modifiable?: boolean;
+    /**
+     * CKA_COPYABLE
+     */
+    copyable?: boolean;
+    /**
+     * CKA_ECDSA_PARAMS
+     */
+    paramsECDSA?: Buffer;
+    paramsEC?: Buffer;
+    /**
+     * CKA_EC_POINT
+     */
+    pointEC?: Buffer;
+    /**
+     * CKA_SECONDARY_AUTH
+     */
+    secondaryAuth?: boolean;
+    /**
+     * CKA_AUTH_PIN_FLAGS
+     */
+    authPinFlags?: Buffer;
+    /**
+     * CKA_ALWAYS_AUTHENTICATE
+     */
+    alwaysAuth?: boolean;
+    /**
+     * CKA_WRAP_WITH_TRUSTED
+     */
+    wrapWithTrusted?: boolean;
+    /**
+     * CKA_WRAP_TEMPLATE
+     */
+    wrapTemplate?: any;
+    /**
+     * CKA_UNWRAP_TEMPLATE
+     */
+    unwrapTemplate?: any;
+    /**
+     * CKA_OTP_FORMAT
+     */
+    otpFormat?: any;
+    /**
+     * CKA_OTP_LENGTH
+     */
+    otpLength?: any;
+    /**
+     * CKA_OTP_TIME_INTERVAL
+     */
+    otpTimeInterval?: any;
+    /**
+     * CKA_OTP_USER_FRIENDLY_MODE
+     */
+    otpUserFriendlyMode?: any;
+    /**
+     * CKA_OTP_CHALLENGE_REQUIREMENT
+     */
+    otpChallengeReq?: any;
+    /**
+     * CKA_OTP_TIME_REQUIREMENT
+     */
+    otpTimeReq?: any;
+    /**
+     * CKA_OTP_COUNTER_REQUIREMENT
+     */
+    otpCounterReq?: any;
+    /**
+     * CKA_OTP_PIN_REQUIREMENT
+     */
+    otppinReq?: any;
+    /**
+     * CKA_OTP_COUNTER
+     */
+    otpCounter?: any;
+    /**
+     * CKA_OTP_TIME
+     */
+    otpTime?: any;
+    /**
+     * CKA_OTP_USER_IDENTIFIER
+     */
+    OtpUserId?: any;
+    /**
+     * CKA_OTP_SERVICE_IDENTIFIER
+     */
+    otpServiceId?: any;
+    /**
+     * CKA_OTP_SERVICE_LOGO
+     */
+    otpServiceLogo?: any;
+    /**
+     * CKA_OTP_SERVICE_LOGO_TYPE
+     */
+    otpServiceLogoType?: any;
+    /**
+     * CKA_HW_FEATURE_TYPE
+     */
+    hwFeatureType?: any;
+    /**
+     * CKA_RESET_ON_INIT
+     */
+    resetOnInit?: any;
+    /**
+     * CKA_HAS_RESET
+     */
+    hasReset?: any;
+    /**
+     * CKA_PIXEL_X
+     */
+    pixelX?: any;
+    /**
+     * CKA_PIXEL_Y
+     */
+    pixelY?: any;
+    /**
+     * CKA_RESOLUTION
+     */
+    resolution?: any;
+    /**
+     * CKA_CHAR_ROWS
+     */
+    charRows?: any;
+    /**
+     * CKA_CHAR_COLUMNS
+     */
+    charCols?: any;
+    /**
+     * CKA_COLOR
+     */
+    color?: any;
+    /**
+     * CKA_BITS_PER_PIXEL
+     */
+    bitsPerPixel?: any;
+    /**
+     * CKA_CHAR_SETS
+     */
+    charSets?: any;
+    /**
+     * CKA_ENCODING_METHODS
+     */
+    encMethod?: any;
+    /**
+     * CKA_MIME_TYPES
+     */
+    mimeTypes?: any;
+    /**
+     * CKA_MECHANISM_TYPE
+     */
+    mechanismType?: any;
+    /**
+     * CKA_REQUIRED_CMS_ATTRIBUTES
+     */
+    requiredCmsAttrs?: any;
+    /**
+     * CKA_DEFAULT_CMS_ATTRIBUTES
+     */
+    defaultCmsAttrs?: any;
+    /**
+     * CKA_SUPPORTED_CMS_ATTRIBUTES
+     */
+    suportedCmsAttrs?: any;
+    /**
+     * CKA_ALLOWED_MECHANISMS
+     */
+    allowedMechanisms?: any;
+}
+declare class Attribute {
+    protected $value: Buffer;
+    type: number;
+    name: string;
+    convertType: string;
+    length: number;
+    value: any;
+    constructor(type: number, value?: any);
+    constructor(type: string, value?: any);
+    get(): any;
+    set(template: any): void;
+}
+declare class Template {
+    protected attrs: Attribute[];
+    length: number;
+    constructor(template: string);
+    constructor(template: ITemplate);
+    set(v: any): Template;
+    ref(): Buffer;
+    serialize(): any;
+}
+
+declare class BaseObject {
+    protected lib: Pkcs11;
+    constructor(lib?: Pkcs11);
+}
+declare class HandleObject extends BaseObject {
+    /**
+     * handle to pkcs11 object
+     */
+    handle: number;
+    constructor(handle: number, lib: Pkcs11);
+    protected getInfo(): void;
+}
+
+declare enum ObjectClass {
+    DATA,
+    CERTIFICATE,
+    PUBLIC_KEY,
+    PRIVATE_KEY,
+    SECRET_KEY,
+    HW_FEATURE,
+    DOMAIN_PARAMETERS,
+    MECHANISM,
+    OTP_KEY,
+}
+
+declare class SessionObject extends HandleObject {
+    /**
+     * Session
+     */
+    session: Session;
+    /**
+     * gets the size of an object in bytes
+     */
+    size: number;
+    constructor(object: SessionObject);
+    constructor(handle: number, session: Session, lib: Pkcs11);
+    /**
+     * copies an object, creating a new object for the copy
+     * @param {ITemplate} template template for the new object
+     */
+    copy(template: ITemplate): SessionObject;
+    /**
+     * destroys an object
+     */
+    destroy(): void;
+    getAttribute(attr: string): ITemplate;
+    getAttribute(attrs: ITemplate): ITemplate;
+    setAttribute(attrs: string, value: any): any;
+    setAttribute(attrs: ITemplate): any;
+    protected get(name: string): any;
+    protected set(name: string, value: any): void;
+    class: ObjectClass;
+    toType<T extends SessionObject>(): T;
+}
+
+declare class SessionObjectCollection extends Collection<SessionObject> {
+    session: Session;
+    items(index: number): SessionObject;
+    constructor(items: Array<number>, session: Session, lib: Pkcs11, classType?: any);
+}
+
+/**
+ * Private key objects (object class `CKO_PRIVATE_KEY`) hold private keys
+ */
+declare class PrivateKey extends Key {
+    /**
+     * DER-encoding of the key subject name (default empty)
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     */
+    subject: Buffer;
+    /**
+     * `CK_TRUE` if key is sensitive
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Attribute cannot be changed once set to CK_TRUE. It becomes a read only attribute.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    sensitive: boolean;
+    /**
+     * `CK_TRUE` if key supports decryption
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    decrypt: boolean;
+    /**
+     * `CK_TRUE` if key supports signatures where the signature is an appendix to the data
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    sign: boolean;
+    /**
+     * `CK_TRUE` if key supports signatures where the data can be recovered from the signature
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    signRecover: boolean;
+    /**
+     * `CK_TRUE` if key supports unwrapping (i.e., can be used to unwrap other keys)
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    unwrap: boolean;
+    /**
+     * `CK_TRUE` if key is extractable and can be wrapped
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Attribute cannot be changed once set to `CK_FALSE`. It becomes a read only attribute.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    extractable: boolean;
+    /**
+     * `CK_TRUE` if key has always had the `CKA_SENSITIVE` attribute set to `CK_TRUE`
+     * - Must not be specified when object is created with `C_CreateObject`.
+     * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
+     * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
+     */
+    alwaysSensitive: boolean;
+    /**
+     * `CK_TRUE` if key has never had the `CKA_EXTRACTABLE` attribute set to `CK_TRUE`
+     * - Must not be specified when object is created with `C_CreateObject`.
+     * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
+     * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
+     */
+    neverExtractable: boolean;
+    /**
+     * `CK_TRUE` if the key can only be wrapped with a wrapping key
+     * that has `CKA_TRUSTED` set to `CK_TRUE`. Default is `CK_FALSE`.
+     * - Attribute cannot be changed once set to `CK_TRUE`. It becomes a read only attribute.
+     */
+    wrapTrusted: boolean;
+    /**
+     * For wrapping keys. The attribute template to apply to any keys unwrapped
+     * using this wrapping key. Any user supplied template is applied after this template
+     * as if the object has already been created.
+     */
+    template: void;
+    alwaysAuthenticate: boolean;
+}
+
+/**
+ * Public key objects (object class CKO_PUBLIC_KEY) hold public keys
+ */
+declare class PublicKey extends Key {
+    /**
+     * DER-encoding of the key subject name (default empty)
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     */
+    subject: Buffer;
+    /**
+     * `CK_TRUE` if key supports encryption
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    encrypt: boolean;
+    /**
+     * `CK_TRUE` if key supports verification where the signature is an appendix to the data
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    verify: boolean;
+    /**
+     * `CK_TRUE` if key supports verification where the data is recovered from the signature
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    verifyRecover: boolean;
+    /**
+     * `CK_TRUE` if key supports wrapping (i.e., can be used to wrap other keys)
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    wrap: boolean;
+    /**
+     * The key can be trusted for the application that it was created.
+     * - The wrapping key can be used to wrap keys with `CKA_WRAP_WITH_TRUSTED` set to `CK_TRUE`.
+     * - Can only be set to CK_TRUE by the SO user.
+     */
+    trusted: boolean;
+    /**
+     * For wrapping keys. The attribute template to match against any keys wrapped using this wrapping key.
+     * Keys that do not match cannot be wrapped.
+     */
+    template: void;
+}
+
+/**
+ * Secret key objects (object class `CKO_SECRET_KEY`) hold secret keys.
+ */
+declare class SecretKey extends Key {
+    /**
+     * `CK_TRUE` if key is sensitive
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Attribute cannot be changed once set to `CK_TRUE`. It becomes a read only attribute.
+     */
+    sensitive: boolean;
+    /**
+     * `CK_TRUE` if key supports encryption
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    encrypt: boolean;
+    /**
+     * `CK_TRUE` if key supports decryption
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    decrypt: boolean;
+    /**
+     * `CK_TRUE` if key supports verification (i.e., of authentication codes) where the signature is an appendix to the data
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    verify: boolean;
+    /**
+     * 	`CK_TRUE` if key supports signatures (i.e., authentication codes) where the signature is an appendix to the data
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    sign: boolean;
+    /**
+     * `CK_TRUE` if key supports wrapping (i.e., can be used to wrap other keys)
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    wrap: boolean;
+    /**
+     * `CK_TRUE` if key supports unwrapping (i.e., can be used to unwrap other keys)
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    unwrap: boolean;
+    /**
+     * `CK_TRUE` if key is extractable and can be wrapped
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Attribute cannot be changed once set to `CK_FALSE`. It becomes a read only attribute.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    extractable: boolean;
+    /**
+     * `CK_TRUE` if key has always had the `CKA_SENSITIVE` attribute set to `CK_TRUE`
+     * - Must not be specified when object is created with `C_CreateObject`.
+     * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
+     * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
+     */
+    alwaysSensitive: boolean;
+    /**
+     * `CK_TRUE` if key has never had the `CKA_EXTRACTABLE` attribute set to `CK_TRUE`
+     * - Must not be specified when object is created with `C_CreateObject`.
+     * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
+     * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
+     */
+    neverExtractable: boolean;
+    /**
+     * Key checksum
+     */
+    checkValue: Buffer;
+    /**
+     * `CK_TRUE` if the key can only be wrapped with a wrapping key
+     * that has `CKA_TRUSTED` set to `CK_TRUE`. Default is `CK_FALSE`.
+     * - Attribute cannot be changed once set to `CK_TRUE`. It becomes a read only attribute.
+     */
+    wrapTrusted: boolean;
+    /**
+     * The wrapping key can be used to wrap keys with `CKA_WRAP_WITH_TRUSTED` set to `CK_TRUE`.
+     * - Can only be set to CK_TRUE by the SO user.
+     */
+    trusted: boolean;
+    /**
+     * For wrapping keys.
+     * The attribute template to match against any keys wrapped using this wrapping key.
+     * Keys that do not match cannot be wrapped.
+     */
+    wrapTemplate: void;
+    /**
+     * For wrapping keys.
+     * The attribute template to apply to any keys unwrapped using this wrapping key.
+     * Any user supplied template is applied after this template as if the object has already been created.
+     */
+    unwrapTemplate: void;
+}
+
+
+interface ISlotInfo {
+    slotDescription: string;
+    manufacturerID: string;
+    flags: number;
+    hardwareVersion: IVersion;
+    firmwareVersion: IVersion;
+}
+
+declare enum SlotFlag {
+    /**
+     * `True` if a token is present in the slot (e.g., a device is in the reader)
+     */
+    TOKEN_PRESENT,
+    /**
+     * `True` if the reader supports removable devices
+     */
+    REMOVABLE_DEVICE,
+    /**
+     * True if the slot is a hardware slot, as opposed to a software slot implementing a "soft token"
+     */
+    HW_SLOT,
+}
+
+interface IVersion {
+    major: number;
+    minor: number;
+}
+interface IModuleInfo {
+    cryptokiVersion: IVersion;
+    manufacturerID: string;
+    flags: number;
+    libraryDescription: string;
+    libraryVersion: IVersion;
+}
+
+declare class Collection<T extends HandleObject> {
+    protected items_: Array<number>;
+    protected classType: any;
+    protected lib: Pkcs11;
+    constructor(items: Array<number>, lib: Pkcs11, classType: any);
+    /**
+     * returns length of collection
+     */
+    length: number;
+    /**
+     * returns item from collection by index
+     * @param {number} index of element in collection `[0..n]`
+     */
+    items(index: number): T;
+}
+
+declare enum SessionOpenFlag {
+    /**
+     * session is r/w
+     */
+    RW_SESSION,
+    /**
+     * no parallel
+     */
+    SERIAL_SESSION,
+}
+declare enum SessionFlag {
+    /**
+     * `True` if the session is read/write; `false` if the session is read-only
+     */
+    RW_SESSION,
+    /**
+     * This flag is provided for backward compatibility, and should always be set to `true`
+     */
+    SERIAL_SESSION,
+}
+declare enum UserType {
+    /**
+     * Security Officer
+     */
+    SO,
+    /**
+     * User
+     */
+    USER,
+    /**
+     * Context specific
+     */
+    CONTEXT_SPECIFIC,
+}
+interface IKeyPair {
+    privateKey: PrivateKey;
+    publicKey: PublicKey;
+}
+/**
+ * provides information about a session
+ */
+declare class Session extends HandleObject {
+    constructor(handle: number, slot: Slot, lib: Pkcs11);
+    slot: Slot;
+    /**
+     * the state of the session
+     */
+    state: number;
+    /**
+     * bit flags that define the type of session
+     */
+    flags: number;
+    /**
+     * an error code defined by the cryptographic device. Used for errors not covered by Cryptoki
+     */
+    deviceError: number;
+    protected getInfo(): void;
+    /**
+     * closes a session between an application and a token
+     */
+    close(): void;
+    /**
+     * initializes the normal user's PIN
+     * @param {string} pin the normal user's PIN
+     */
+    initPin(pin: string): void;
+    /**
+     * modifies the PIN of the user who is logged in
+     * @param {string} oldPin
+     * @param {string} newPin
+     */
+    setPin(oldPin: string, newPin: string): void;
+    /**
+     * obtains a copy of the cryptographic operations state of a session, encoded as a string of bytes
+     */
+    getOperationState(): Buffer;
+    /**
+     * restores the cryptographic operations state of a session
+     * from a string of bytes obtained with getOperationState
+     * @param {Buffer} state the saved state
+     * @param {number} encryptionKey holds key which will be used for an ongoing encryption
+     * or decryption operation in the restored session
+     * (or 0 if no encryption or decryption key is needed,
+     * either because no such operation is ongoing in the stored session
+     * or because all the necessary key information is present in the saved state)
+     * @param {number} authenticationKey holds a handle to the key which will be used for an ongoing signature,
+     * MACing, or verification operation in the restored session
+     * (or 0 if no such key is needed, either because no such operation is ongoing in the stored session
+     * or because all the necessary key information is present in the saved state)
+     */
+    setOperationState(state: Buffer, encryptionKey?: number, authenticationKey?: number): void;
+    /**
+     * logs a user into a token
+     * @param {string} pin the user's PIN.
+     * - This standard allows PIN values to contain any valid `UTF8` character,
+     * but the token may impose subset restrictions
+     * @param {} userType the user type. Default is `USER`
+     */
+    login(pin: string, userType?: UserType): void;
+    /**
+     * logs a user out from a token
+     */
+    logout(): void;
+    /**
+     * creates a new object
+     * - Only session objects can be created during a read-only session.
+     * - Only public objects can be created unless the normal user is logged in.
+     * @param {ITemplate} template the object's template
+     */
+    create(template: ITemplate): SessionObject;
+    /**
+     * removes all session objects matched to template
+     * - if template is null, removes all session objects
+     * - returns a number of destroied session objects
+     * @param {ITemplate} template template
+     */
+    destroy(template: ITemplate): number;
+    /**
+     * @param {SessionObject} object
+     */
+    destroy(object: SessionObject): number;
+    destroy(): number;
+    /**
+     * removes all session objects
+     * - returns a number of destroied session objects
+     */
+    clear(): number;
+    /**
+     * returns a collection of session objects mached to template
+     * @param template template
+     * @param callback optional callback function wich is called for each founded object
+     * - if callback function returns false, it breaks find function.
+     */
+    find(callback?: (obj: SessionObject) => void): SessionObjectCollection;
+    find(template: ITemplate, callback?: (obj: SessionObject) => void): SessionObjectCollection;
+    /**
+     * Returns object from session by handle
+     * @param  {number} handle handle of object
+     * @returns T
+     */
+    getObject<T extends SessionObject>(handle: number): T;
+    /**
+     * generates a secret key or set of domain parameters, creating a new object.
+     * @param mechanism generation mechanism
+     * @param template template for the new key or set of domain parameters
+     */
+    generateKey(mechanism: MechanismType, template?: ITemplate): SecretKey;
+    generateKey(mechanism: MechanismType, template: ITemplate, callback: (err: Error, key: SecretKey) => void): void;
+    generateKeyPair(mechanism: MechanismType, publicTemplate: ITemplate, privateTemplate: ITemplate): IKeyPair;
+    createSign(alg: MechanismType, key: Key): Sign;
+    createVerify(alg: MechanismType, key: Key): Verify;
+    createCipher(alg: MechanismType, key: Key): Cipher;
+    createDecipher(alg: MechanismType, key: Key): Decipher;
+    createDigest(alg: MechanismType): Digest;
+    wrapKey(alg: MechanismType, wrappingKey: Key, key: Key): Buffer;
+    unwrapKey(alg: MechanismType, unwrappingKey: Key, wrappedKey: Buffer, template: ITemplate): Key;
+    /**
+     * derives a key from a base key, creating a new key object
+     * @param {MechanismType} alg key deriv. mech
+     * @param {Key} baseKey base key
+     * @param {ITemplate} template new key template
+     */
+    deriveKey(alg: MechanismType, baseKey: Key, template: ITemplate): SecretKey;
+    /**
+     * generates random data
+     * @param {number} size \# of bytes to generate
+     */
+    generateRandom(size: number): Buffer;
+}
+
+declare enum TokenFlag {
+    RNG,
+    WRITE_PROTECTED,
+    LOGIN_REQUIRED,
+    USER_PIN_INITIALIZED,
+    RESTORE_KEY_NOT_NEEDED,
+    CLOCK_ON_TOKEN,
+    PROTECTED_AUTHENTICATION_PATH,
+    DUAL_CRYPTO_OPERATIONS,
+    TOKEN_INITIALIZED,
+    SECONDARY_AUTHENTICATION,
+    USER_PIN_COUNT_LOW,
+    USER_PIN_FINAL_TRY,
+    USER_PIN_LOCKED,
+    USER_PIN_TO_BE_CHANGED,
+    SO_PIN_COUNT_LOW,
+    SO_PIN_FINAL_TRY,
+    SO_PIN_LOCKED,
+    SO_PIN_TO_BE_CHANGED,
+}
+declare class Token extends HandleObject {
+    /**
+     * application-defined label, assigned during token initialization.
+     * - Must be padded with the blank character (' ').
+     * - Should __not__ be null-terminated.
+     */
+    label: string;
+    /**
+     * ID of the device manufacturer.
+     * - Must be padded with the blank character (' ').
+     * - Should __not__ be null-terminated.
+     */
+    manufacturerID: string;
+    /**
+     * model of the device.
+     * - Must be padded with the blank character (' ').
+     * - Should __not__ be null-terminated.
+     */
+    model: string;
+    /**
+     * character-string serial number of the device.
+     * - Must be padded with the blank character (' ').
+     * - Should __not__ be null-terminated.
+     */
+    serialNumber: string;
+    /**
+     * bit flags indicating capabilities and status of the device
+     */
+    flags: number;
+    /**
+     * maximum number of sessions that can be opened with the token at one time by a single application
+     */
+    maxSessionCount: number;
+    /**
+     * number of sessions that this application currently has open with the token
+     */
+    sessionCount: number;
+    /**
+     * maximum number of read/write sessions that can be opened
+     * with the token at one time by a single application
+     */
+    maxRwSessionCount: number;
+    /**
+     * number of read/write sessions that this application currently has open with the token
+     */
+    rwSessionCount: number;
+    /**
+     * maximum length in bytes of the PIN
+     */
+    maxPinLen: number;
+    /**
+     * minimum length in bytes of the PIN
+     */
+    minPinLen: number;
+    /**
+     * the total amount of memory on the token in bytes in which public objects may be stored
+     */
+    totalPublicMemory: number;
+    /**
+     * the amount of free (unused) memory on the token in bytes for public objects
+     */
+    freePublicMemory: number;
+    /**
+     * the total amount of memory on the token in bytes in which private objects may be stored
+     */
+    totalPrivateMemory: number;
+    /**
+     * the amount of free (unused) memory on the token in bytes for private objects
+     */
+    freePrivateMemory: number;
+    /**
+     * version number of hardware
+     */
+    hardwareVersion: IVersion;
+    /**
+     * version number of firmware
+     */
+    firmwareVersion: IVersion;
+    /**
+     * current time as a character-string of length 16,
+     * represented in the format YYYYMMDDhhmmssxx
+     */
+    utcTime: Date;
+    constructor(handle: number, lib: Pkcs11);
+    protected getInfo(): void;
+}
+
+declare class Slot extends HandleObject implements ISlotInfo {
+    slotDescription: string;
+    manufacturerID: string;
+    flags: number;
+    hardwareVersion: IVersion;
+    firmwareVersion: IVersion;
+    module: Module;
+    constructor(handle: number, module: Module, lib: Pkcs11);
+    protected getInfo(): void;
+    getToken(): Token;
+    /**
+     * returns list of `MechanismInfo`
+     */
+    getMechanisms(): MechanismCollection;
+    /**
+     * initializes a token
+     * @param {string} pin the SO's initial PIN
+     * @param {string} label label of the token
+     */
+    initToken(pin: string, label: string): void;
+    /**
+     * opens a session between an application and a token in a particular slot
+     * @parsm flags indicates the type of session
+     */
+    open(flags?: number): Session;
+    /**
+     * closes all sessions an application has with a token
+     */
+    closeAll(): void;
+}
+
+declare class SlotCollection extends Collection<Slot> {
+    module: Module;
+    items(index: number): Slot;
+    constructor(items: Array<number>, module: Module, lib: Pkcs11, classType?: any);
+}
+
+declare class Module extends BaseObject implements IModuleInfo {
+    libFile: string;
+    libName: string;
+    /**
+     * Cryptoki interface version
+     */
+    cryptokiVersion: IVersion;
+    /**
+     * blank padded manufacturer ID
+     */
+    manufacturerID: string;
+    /**
+     * must be zero
+     */
+    flags: number;
+    /**
+     * blank padded library description
+     */
+    libraryDescription: string;
+    /**
+     * version of library
+     */
+    libraryVersion: IVersion;
+    constructor(lib: Pkcs11);
+    protected getInfo(): void;
+    /**
+     * initializes the Cryptoki library
+     */
+    initialize(): void;
+    /**
+     * indicates that an application is done with the Cryptoki library
+     */
+    finalize(): void;
+    /**
+     * obtains a list of slots in the system
+     * @param {number} index index of an element in collection
+     * @param {number} tokenPresent only slots with tokens. Default `True`
+     */
+    getSlots(index: number, tokenPresent?: boolean): Slot;
+    /**
+     * @param {number} tokenPresent only slots with tokens. Default `True`
+     */
+    getSlots(tokenPresent?: boolean): SlotCollection;
+    /**
+     * loads pkcs11 lib
+     */
+    static load(libFile: string, libName?: string): Module;
+}
+
+declare class Cipher {
+    session: Session;
+    lib: Pkcs11;
+    constructor(session: Session, alg: MechanismType, key: Key, lib: Pkcs11);
+    protected init(alg: MechanismType, key: Key): void;
+    update(text: string): Buffer;
+    update(data: Buffer): Buffer;
+    final(): Buffer;
+}
+
+declare class Decipher {
+    session: Session;
+    lib: Pkcs11;
+    constructor(session: Session, alg: MechanismType, key: Key, lib: Pkcs11);
+    protected init(alg: MechanismType, key: Key): void;
+    update(text: string): Buffer;
+    update(data: Buffer): Buffer;
+    final(): Buffer;
+}
+
+declare class Digest {
+    session: Session;
+    lib: Pkcs11;
+    constructor(session: Session, alg: MechanismType, lib: Pkcs11);
+    protected init(alg: MechanismType): void;
+    update(text: string): void;
+    update(data: Buffer): void;
+    final(): Buffer;
+}
+
+declare class Sign {
+    session: Session;
+    lib: Pkcs11;
+    constructor(session: Session, alg: MechanismType, key: Key, lib: Pkcs11);
+    protected init(alg: MechanismType, key: Key): void;
+    update(text: string): void;
+    update(data: Buffer): void;
+    final(): Buffer;
+}
+
+declare class Verify {
+    session: Session;
+    lib: Pkcs11;
+    constructor(session: Session, alg: MechanismType, key: Key, lib: Pkcs11);
+    protected init(alg: MechanismType, key: Key): void;
+    update(text: string): void;
+    update(data: Buffer): void;
+    final(signature: Buffer): boolean;
+}
+
+/**
+ * 
+ * EC
+ * 
+ */
+
+/**
+ * EcKdf is used to indicate the Key Derivation Function (KDF)
+ * applied to derive keying data from a shared secret.
+ * The key derivation function will be used by the EC key agreement schemes.
+ */
+declare enum EcKdf {
+    NULL,
+    SHA1,
+    SHA224,
+    SHA256,
+    SHA384,
+    SHA512,
+}
+
+declare class EcdhParams implements IParams {
+    /**
+     * key derivation function used on the shared secret value
+     */
+    kdf: EcKdf;
+    /**
+     * some data shared between the two parties
+     */
+    sharedData: Buffer;
+    /**
+     * other party's EC public key value
+     */
+    publicData: Buffer;
+    /**
+     * @param  {EcKdf} kdf key derivation function used on the shared secret value
+     * @param  {Buffer=null} sharedData some data shared between the two parties
+     * @param  {Buffer=null} publicData other party's EC public key value
+     */
+    constructor(kdf: EcKdf, sharedData?: Buffer, publicData?: Buffer);
+    toCKI(): Buffer;
+}
+
+export interface INamedCurve {
+    name: string;
+    oid: string;
+    value: Buffer;
+    size: number;
+}
+
+declare class NamedCurve {
+    static getByName(name: string): INamedCurve;
+    static getByOid(oid: string): INamedCurve;
+}
+
+/**
+ * 
+ * AES
+ * 
+ */
+
+declare class AesCbcParams implements IParams {
+    /**
+     * initialization vector
+     * - must have a fixed size of 16 bytes
+     */
+    iv: Buffer;
+    /**
+     * the data
+     */
+    data: Buffer;
+    constructor(iv: Buffer, data: Buffer);
+    toCKI(): Buffer;
+}
+
+declare class AesCcmParams implements IParams {
+    /**
+     * length of the data where 0 <= dataLength < 2^8L
+     */
+    dataLength: number;
+    /**
+     * the nonce
+     */
+    nonce: Buffer;
+    /**
+     * the additional authentication data
+     * - This data is authenticated but not encrypted
+     */
+    aad: Buffer;
+    /**
+     * length of authentication tag (output following cipher text) in bits.
+     * - Can be any value between 0 and 128
+     */
+    macLength: number;
+    constructor(dataLength: number, nonce: Buffer, aad?: Buffer, macLength?: number);
+    toCKI(): Buffer;
+}
+
+declare class AesGcmParams implements IParams {
+    /**
+     * initialization vector
+     * - The length of the initialization vector can be any number between 1 and 256.
+     * 96-bit (12 byte) IV values can be processed more efficiently,
+     * so that length is recommended for situations in which efficiency is critical.
+     */
+    iv: Buffer;
+    /**
+     * pointer to additional authentication data.
+     * This data is authenticated but not encrypted.
+     */
+    aad: Buffer;
+    /**
+     * length of authentication tag (output following cipher text) in bits.
+     * Can be any value between 0 and 128. Default 128
+     */
+    tagBits: number;
+    constructor(iv: Buffer, aad?: Buffer, tagBits?: number);
+    toCKI(): Buffer;
+}
+
+/**
+ * 
+ * RSA
+ * 
+ */
+
+declare enum RsaMgf {
+    MGF1_SHA1,
+    MGF1_SHA224,
+    MGF1_SHA256,
+    MGF1_SHA384,
+    MGF1_SHA512,
+}
+
+declare class RsaOaepParams implements IParams {
+    hashAlgorithm: MechanismEnum;
+    mgf: RsaMgf;
+    source: number;
+    sourceData: Buffer;
+    constructor(hashAlg?: MechanismEnum, mgf?: RsaMgf, sourceData?: Buffer);
+    toCKI(): Buffer;
+}
+
+declare class RsaPssParams implements IParams {
+    /**
+     * hash algorithm used in the PSS encoding;
+     * - if the signature mechanism does not include message hashing,
+     * then this value must be the mechanism used by the application to generate
+     * the message hash;
+     * - if the signature mechanism includes hashing,
+     * then this value must match the hash algorithm indicated
+     * by the signature mechanism
+     */
+    hashAlgorithm: MechanismEnum;
+    /**
+     * mask generation function to use on the encoded block
+     */
+    mgf: RsaMgf;
+    /**
+     * length, in bytes, of the salt value used in the PSS encoding;
+     * - typical values are the length of the message hash and zero
+     */
+    saltLength: number;
+    constructor(hashAlg?: MechanismEnum, mgf?: RsaMgf, saltLen?: number);
+    toCKI(): Buffer;
+}
diff --git a/graphene-pk11/tsconfig.json b/graphene-pk11/tsconfig.json
new file mode 100644
index 0000000000..19a10848a1
--- /dev/null
+++ b/graphene-pk11/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "graphene-pk11-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/graphviz/graphviz-tests.ts b/graphviz/graphviz-tests.ts
index 01fa791502..41eb49c880 100644
--- a/graphviz/graphviz-tests.ts
+++ b/graphviz/graphviz-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="graphviz.d.ts"/>
-
 import graphviz = require('graphviz');
 
 // Create digraph G
diff --git a/graphviz/graphviz.d.ts b/graphviz/graphviz.d.ts
deleted file mode 100644
index cdc6ba0141..0000000000
--- a/graphviz/graphviz.d.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-// Type definitions for Graphviz 0.0.8
-// Project: https://github.com/glejeune/node-graphviz
-// Definitions by: Matt Frantz <https://github.com/mhfrantz/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// graphviz.d.ts
-
-declare module 'graphviz' {
-
-  export interface HasAttributes {
-    set(name: string, value: any): void;
-    get(name: string): any;
-  }
-
-  export interface Node extends HasAttributes {
-  }
-
-  export interface Edge extends HasAttributes {
-  }
-
-  export interface OutputCallback {
-    (data: string): void;
-  }
-
-  export interface ErrorCallback {
-    (code: number, stdout: string, stderr: string): void;
-  }
-
-  export interface RenderOptions {
-    type: string;  // output file type (png, jpeg, ps, ...)
-    use: string;  // Graphviz command to use (dot, neato, ...)
-    path: string;  // GraphViz path
-    G: any;  // graph options
-    N: any;  // node options
-    E: any;  // edge options
-  }
-
-  export interface Graph extends HasAttributes {
-
-    addNode(id: string, attrs?: any): Node;
-    nodeCount(): number;
-
-    // TODO: Use union types when we have TS 1.4
-    addEdge(nodeOne: string, nodeTwo: string, attrs?: any): Edge;
-    addEdge(nodeOne: string, nodeTwo: Node, attrs?: any): Edge;
-    addEdge(nodeOne: Node, nodeTwo: string, attrs?: any): Edge;
-    addEdge(nodeOne: Node, nodeTwo: Node, attrs?: any): Edge;
-
-    edgeCount(): number;
-
-    // Subgraph (cluster) API
-    addCluster(id: string): Graph;
-    getCluster(id: string): Graph;
-    clusterCount(): number;
-
-    setNodeAttribut(name: string, value: any): void;
-    getNodeAttribut(name: string): any;
-
-    setEdgeAttribut(name: string, value: any): void;
-    getEdgeAttribut(name: string): any;
-
-    to_dot(): string;
-
-    // Graphviz command to use (dot, neato, ...)
-    use: string;
-
-    // Path containing Graphviz binaries.
-    setGraphVizPath(directoryPath: string): void;
-
-    // TODO: Use union types when we can have TS 1.4
-    render(type: string, filename: string, errback?: ErrorCallback): void;
-    render(options: RenderOptions, filename: string, errback?: ErrorCallback): void;
-    render(type: string, callback: OutputCallback, errback?: ErrorCallback): void;
-    render(options: RenderOptions, callback: OutputCallback, errback?: ErrorCallback): void;
-
-    // alias for render
-    output(type: string, filename: string, errback?: ErrorCallback): void;
-    output(options: RenderOptions, filename: string, errback?: ErrorCallback): void;
-    output(type: string, callback: OutputCallback, errback?: ErrorCallback): void;
-    output(options: RenderOptions, callback: OutputCallback, errback?: ErrorCallback): void;
-  }
-
-  export function graph(id: string): Graph;
-
-  export function digraph(id: string): Graph;
-
-  interface ParseCallback {
-    (graph: Graph): void;
-  }
-
-  export function parse(path: string, callback: ParseCallback, errback?: ErrorCallback): void;
-
-}
diff --git a/graphviz/index.d.ts b/graphviz/index.d.ts
new file mode 100644
index 0000000000..f8f6107cee
--- /dev/null
+++ b/graphviz/index.d.ts
@@ -0,0 +1,91 @@
+// Type definitions for Graphviz 0.0.8
+// Project: https://github.com/glejeune/node-graphviz
+// Definitions by: Matt Frantz <https://github.com/mhfrantz/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// graphviz.d.ts
+
+
+
+export interface HasAttributes {
+    set(name: string, value: any): void;
+    get(name: string): any;
+}
+
+export interface Node extends HasAttributes {
+}
+
+export interface Edge extends HasAttributes {
+}
+
+export interface OutputCallback {
+    (data: string): void;
+}
+
+export interface ErrorCallback {
+    (code: number, stdout: string, stderr: string): void;
+}
+
+export interface RenderOptions {
+    type: string;  // output file type (png, jpeg, ps, ...)
+    use: string;  // Graphviz command to use (dot, neato, ...)
+    path: string;  // GraphViz path
+    G: any;  // graph options
+    N: any;  // node options
+    E: any;  // edge options
+}
+
+export interface Graph extends HasAttributes {
+
+    addNode(id: string, attrs?: any): Node;
+    nodeCount(): number;
+
+    // TODO: Use union types when we have TS 1.4
+    addEdge(nodeOne: string, nodeTwo: string, attrs?: any): Edge;
+    addEdge(nodeOne: string, nodeTwo: Node, attrs?: any): Edge;
+    addEdge(nodeOne: Node, nodeTwo: string, attrs?: any): Edge;
+    addEdge(nodeOne: Node, nodeTwo: Node, attrs?: any): Edge;
+
+    edgeCount(): number;
+
+    // Subgraph (cluster) API
+    addCluster(id: string): Graph;
+    getCluster(id: string): Graph;
+    clusterCount(): number;
+
+    setNodeAttribut(name: string, value: any): void;
+    getNodeAttribut(name: string): any;
+
+    setEdgeAttribut(name: string, value: any): void;
+    getEdgeAttribut(name: string): any;
+
+    to_dot(): string;
+
+    // Graphviz command to use (dot, neato, ...)
+    use: string;
+
+    // Path containing Graphviz binaries.
+    setGraphVizPath(directoryPath: string): void;
+
+    // TODO: Use union types when we can have TS 1.4
+    render(type: string, filename: string, errback?: ErrorCallback): void;
+    render(options: RenderOptions, filename: string, errback?: ErrorCallback): void;
+    render(type: string, callback: OutputCallback, errback?: ErrorCallback): void;
+    render(options: RenderOptions, callback: OutputCallback, errback?: ErrorCallback): void;
+
+    // alias for render
+    output(type: string, filename: string, errback?: ErrorCallback): void;
+    output(options: RenderOptions, filename: string, errback?: ErrorCallback): void;
+    output(type: string, callback: OutputCallback, errback?: ErrorCallback): void;
+    output(options: RenderOptions, callback: OutputCallback, errback?: ErrorCallback): void;
+}
+
+export declare function graph(id: string): Graph;
+
+export declare function digraph(id: string): Graph;
+
+interface ParseCallback {
+    (graph: Graph): void;
+}
+
+export declare function parse(path: string, callback: ParseCallback, errback?: ErrorCallback): void;
diff --git a/graphviz/tsconfig.json b/graphviz/tsconfig.json
new file mode 100644
index 0000000000..d480f233f9
--- /dev/null
+++ b/graphviz/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "graphviz-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gravatar/gravatar-tests.ts b/gravatar/gravatar-tests.ts
index d0edb4e645..f9a26bc561 100644
--- a/gravatar/gravatar-tests.ts
+++ b/gravatar/gravatar-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gravatar.d.ts" />
+
 
 import gravatar = require('gravatar');
 
diff --git a/gravatar/gravatar.d.ts b/gravatar/gravatar.d.ts
deleted file mode 100644
index d5685e3717..0000000000
--- a/gravatar/gravatar.d.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-// Type definitions for gravatar v1.4.0
-// Project: https://github.com/emerleite/node-gravatar
-// Definitions by: Denis Sokolov <https://github.com/denis-sokolov>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace GravatarModule {
-  type Options = {
-    d?: string
-    default?: string
-    f?: string
-    forcedefault?: string
-    r?: string
-    rating?: string
-    s?: string
-    size?: string
-  }
-
-  function url(email: string, options?: Options, forceProtocol?: boolean): string;
-}
-
-declare module "gravatar" {
-    export = GravatarModule;
-}
diff --git a/gravatar/index.d.ts b/gravatar/index.d.ts
new file mode 100644
index 0000000000..5c2c113ab8
--- /dev/null
+++ b/gravatar/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for gravatar v1.4.0
+// Project: https://github.com/emerleite/node-gravatar
+// Definitions by: Denis Sokolov <https://github.com/denis-sokolov>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace GravatarModule {
+  type Options = {
+    d?: string
+    default?: string
+    f?: string
+    forcedefault?: string
+    r?: string
+    rating?: string
+    s?: string
+    size?: string
+  }
+
+  function url(email: string, options?: Options, forceProtocol?: boolean): string;
+}
+
+export = GravatarModule;
diff --git a/gravatar/tsconfig.json b/gravatar/tsconfig.json
new file mode 100644
index 0000000000..3242e0096d
--- /dev/null
+++ b/gravatar/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gravatar-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/greasemonkey/greasemonkey-tests.ts b/greasemonkey/greasemonkey-tests.ts
index a0185c4a4a..52799d0126 100644
--- a/greasemonkey/greasemonkey-tests.ts
+++ b/greasemonkey/greasemonkey-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="greasemonkey.d.ts" />
+
 
 ////////////////
 // Global variable
diff --git a/greasemonkey/greasemonkey.d.ts b/greasemonkey/index.d.ts
similarity index 100%
rename from greasemonkey/greasemonkey.d.ts
rename to greasemonkey/index.d.ts
diff --git a/greasemonkey/tsconfig.json b/greasemonkey/tsconfig.json
new file mode 100644
index 0000000000..7637eae7ae
--- /dev/null
+++ b/greasemonkey/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "greasemonkey-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/grecaptcha/grecaptcha-tests.ts b/grecaptcha/grecaptcha-tests.ts
index cfc86e71b6..fad40b2930 100644
--- a/grecaptcha/grecaptcha-tests.ts
+++ b/grecaptcha/grecaptcha-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="grecaptcha.d.ts" />
+
 
 var params: ReCaptchaV2.Parameters = {
   "sitekey": "mySuperSecretKey",
diff --git a/grecaptcha/grecaptcha.d.ts b/grecaptcha/index.d.ts
similarity index 100%
rename from grecaptcha/grecaptcha.d.ts
rename to grecaptcha/index.d.ts
diff --git a/grecaptcha/tsconfig.json b/grecaptcha/tsconfig.json
new file mode 100644
index 0000000000..f58b000b93
--- /dev/null
+++ b/grecaptcha/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "grecaptcha-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/greensock/greensock.d.ts b/greensock/index.d.ts
similarity index 100%
rename from greensock/greensock.d.ts
rename to greensock/index.d.ts
diff --git a/greensock/tsconfig.json b/greensock/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/greensock/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gridfs-stream/gridfs-stream-tests.ts b/gridfs-stream/gridfs-stream-tests.ts
index c9ca457c2a..1ed4e97006 100644
--- a/gridfs-stream/gridfs-stream-tests.ts
+++ b/gridfs-stream/gridfs-stream-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="gridfs-stream.d.ts" />
-/// <reference path="../mongodb/mongodb.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+
+/// <reference types="node" />
 
 // Samples from:
 // https://github.com/aheckmann/gridfs-stream
diff --git a/gridfs-stream/gridfs-stream.d.ts b/gridfs-stream/gridfs-stream.d.ts
deleted file mode 100644
index d40ac62d7e..0000000000
--- a/gridfs-stream/gridfs-stream.d.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-// Type definitions for gridfs-stream 0.5.0
-// Project: https://github.com/aheckmann/gridfs-stream
-// Definitions by: Lior Mualem <https://github.com/liorm/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../mongodb/mongodb.d.ts" />
-
-declare namespace GridFSStream {
-    export interface Range {
-        startPos: number;
-        endPos: number;
-    }
-
-    export interface Options {
-        _id?: string;
-        filename?: string;
-        mode?: string;
-
-        range?: Range;
-
-        // any other options from the GridStore may be passed too, e.g.
-        chunkSize?: number;
-        content_type?: string;
-        root?: string;
-        metadata?: any;
-    }
-
-    export interface WriteStream extends NodeJS.WritableStream {
-        writable: boolean;
-        name: string;
-        id: string;
-        options: Options;
-        mode: string;
-    }
-
-    export interface ReadStream extends NodeJS.ReadableStream {
-        readable: boolean;
-        paused: boolean;
-    }
-}
-
-declare module "gridfs-stream" {
-    import mongo = require('mongodb');
-
-    // Merged declaration, g is both a callable function and a namespace
-    function g(db: any, mongo: any): g.Grid;
-
-    namespace g {
-
-        export class Grid {
-
-            files: mongo.Collection;
-            collection(name?: string): mongo.Collection;
-            curCol: string;
-
-            createWriteStream(options?: GridFSStream.Options): GridFSStream.WriteStream;
-            createReadStream(options?: GridFSStream.Options): GridFSStream.ReadStream;
-            createWriteStream(options?: string): GridFSStream.WriteStream;
-            createReadStream(options?: string): GridFSStream.ReadStream;
-
-            remove(options: GridFSStream.Options, callback: (err: Error) => void): void;
-            exist(options: GridFSStream.Options, callback: (err: Error, found: boolean) => void): void;
-            findOne(options: GridFSStream.Options, callback: (err: Error, record: any)=>void):void;
-        }
-    }
-
-    export = g;
-}
-
diff --git a/gridfs-stream/index.d.ts b/gridfs-stream/index.d.ts
new file mode 100644
index 0000000000..1c803348ad
--- /dev/null
+++ b/gridfs-stream/index.d.ts
@@ -0,0 +1,69 @@
+// Type definitions for gridfs-stream 0.5.0
+// Project: https://github.com/aheckmann/gridfs-stream
+// Definitions by: Lior Mualem <https://github.com/liorm/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare namespace GridFSStream {
+    export interface Range {
+        startPos: number;
+        endPos: number;
+    }
+
+    export interface Options {
+        _id?: string;
+        filename?: string;
+        mode?: string;
+
+        range?: Range;
+
+        // any other options from the GridStore may be passed too, e.g.
+        chunkSize?: number;
+        content_type?: string;
+        root?: string;
+        metadata?: any;
+    }
+
+    export interface WriteStream extends NodeJS.WritableStream {
+        writable: boolean;
+        name: string;
+        id: string;
+        options: Options;
+        mode: string;
+    }
+
+    export interface ReadStream extends NodeJS.ReadableStream {
+        readable: boolean;
+        paused: boolean;
+    }
+}
+
+
+import mongo = require('mongodb');
+
+// Merged declaration, g is both a callable function and a namespace
+declare function g(db: any, mongo: any): g.Grid;
+
+declare namespace g {
+
+    export class Grid {
+
+        files: mongo.Collection;
+        collection(name?: string): mongo.Collection;
+        curCol: string;
+
+        createWriteStream(options?: GridFSStream.Options): GridFSStream.WriteStream;
+        createReadStream(options?: GridFSStream.Options): GridFSStream.ReadStream;
+        createWriteStream(options?: string): GridFSStream.WriteStream;
+        createReadStream(options?: string): GridFSStream.ReadStream;
+
+        remove(options: GridFSStream.Options, callback: (err: Error) => void): void;
+        exist(options: GridFSStream.Options, callback: (err: Error, found: boolean) => void): void;
+        findOne(options: GridFSStream.Options, callback: (err: Error, record: any)=>void):void;
+    }
+}
+
+export = g;
+
+
diff --git a/gridfs-stream/tsconfig.json b/gridfs-stream/tsconfig.json
new file mode 100644
index 0000000000..dbaced02f7
--- /dev/null
+++ b/gridfs-stream/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gridfs-stream-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gridstack/gridstack-tests.ts b/gridstack/gridstack-tests.ts
index f084e4f46c..2c9736b728 100644
--- a/gridstack/gridstack-tests.ts
+++ b/gridstack/gridstack-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="gridstack.d.ts" />
+/// <reference types="jquery"/>
+
 
 
 // Type definitions for Gridstack
diff --git a/gridstack/gridstack.d.ts b/gridstack/index.d.ts
similarity index 100%
rename from gridstack/gridstack.d.ts
rename to gridstack/index.d.ts
diff --git a/gridstack/tsconfig.json b/gridstack/tsconfig.json
new file mode 100644
index 0000000000..ceeed2a2d9
--- /dev/null
+++ b/gridstack/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gridstack-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gruntjs/gruntjs-tests.ts b/grunt/gruntjs-tests.ts
similarity index 99%
rename from gruntjs/gruntjs-tests.ts
rename to grunt/gruntjs-tests.ts
index 55f106d535..980cbd6997 100644
--- a/gruntjs/gruntjs-tests.ts
+++ b/grunt/gruntjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gruntjs.d.ts" />
+
 
 // Official code sample from 
 // http://gruntjs.com/getting-started#an-example-gruntfile
diff --git a/grunt/index.d.ts b/grunt/index.d.ts
new file mode 100644
index 0000000000..c9b8f379c3
--- /dev/null
+++ b/grunt/index.d.ts
@@ -0,0 +1,1327 @@
+// Type definitions for Grunt 0.4.x
+// Project: http://gruntjs.com
+// Definitions by: Jeff May <https://github.com/jeffmay/>, Basarat Ali Syed <https://github.com/basarat/>
+// Definitions: https://github.com/jeffmay/DefinitelyTyped
+
+/// <reference types="node" />
+
+/**
+ * {@link http://github.com/marak/colors.js/}
+ */
+interface String {
+    yellow: string;
+    cyan: string;
+    white: string;
+    magenta: string;
+    green: string;
+    red: string;
+    grey: string;
+    blue: string;
+}
+
+declare namespace node {
+
+    /**
+     * {@link http://npmjs.org/doc/json.html}
+     */
+    interface NodePackage {
+        name: string
+        version: string
+        description?: string
+        keywords?: string[]
+        homepage?: string
+    }
+}
+
+/**
+ * {@link http://github.com/isaacs/minimatch}
+ */
+declare namespace minimatch {
+
+    /**
+     * A minimal matching utility options.
+     *
+     * This is the matching library used internally by npm.
+     * Eventually, it will replace the C binding in node-glob.
+     * It works by converting glob expressions into JavaScript RegExp objects.
+     */
+    interface IMinimatchOptions {
+        /*
+         All options are false by default.
+         */
+
+        /**
+         * Dump a ton of stuff to stderr.
+         */
+        debug?: boolean
+
+        /**
+         * Do not expand {a,b} and {1..3} brace sets.
+         */
+        nobrace?: boolean
+
+        /**
+         * Disable ** matching against multiple folder names.
+         */
+        noglobstar?: boolean
+
+        /**
+         * Allow patterns to match filenames starting with a period,
+         * even if the pattern does not explicitly have a period in that spot.
+         */
+        // Note that by default, a/**\/b will not match a/.d/b, unless dot is set.
+        dot?: boolean
+
+        /**
+         * Disable "extglob" style patterns like +(a|b).
+         */
+        noext?: boolean
+
+        /**
+         * Perform a case-insensitive match.
+         */
+        nocase?: boolean
+
+        /**
+         * When a match is not found by minimatch.match, return a list containing the pattern itself.
+         * When set, an empty list is returned if there are no matches.
+         */
+        nonull?: boolean
+
+        /**
+         * If set, then patterns without slashes will be matched against the basename of the path if it contains slashes.
+         * For example, a?b would match the path /xyz/123/acb, but not /xyz/acb/123.
+         */
+        matchBase?: boolean
+
+        /**
+         * Suppress the behavior of treating # at the start of a pattern as a comment.
+         */
+        nocomment?: boolean
+
+        /**
+         * Suppress the behavior of treating a leading ! character as negation.
+         */
+        nonegate?: boolean
+
+        /**
+         * Returns from negate expressions the same as if they were not negated. (Ie, true on a hit, false on a miss.)
+         */
+        flipNegate?: boolean
+    }
+}
+
+/* GRUNT CONFIGURATION
+ *********************/
+
+declare namespace grunt {
+
+    namespace config {
+
+        /**
+         * {@link http://gruntjs.com/sample-gruntfile}
+         */
+        interface IProjectConfig{
+            [plugin: string]: any;
+        }
+
+        /**
+         * {@link http://gruntjs.com/api/grunt.config}
+         */
+        interface ConfigModule {
+            /**
+             * Get or set a value from the project's Grunt configuration.
+             * This method serves as an alias to other methods;
+             * if two arguments are passed, grunt.config.set is called,
+             * otherwise grunt.config.get is called.
+             */
+            (prop: string, value: any): any
+            (prop: string): any
+
+            /**
+             * Initialize a configuration object for the current project.
+             * The specified configObject is used by tasks and can be accessed using the grunt.config method.
+             * Nearly every project's Gruntfile will call this method.
+             */
+            init(config: IProjectConfig): void
+
+            /**
+             * Get a value from the project's Grunt configuration.
+             * If prop is specified, that property's value is returned, or null if that property is not defined.
+             * If prop isn't specified, a copy of the entire config object is returned.
+             * Templates strings will be recursively processed using the grunt.config.process method.
+             *
+             * @note Although this accepts a generic type, you may still get the wrong typed value.
+             */
+            get<T>(prop: string): T
+            get(): ConfigModule
+
+            /**
+             * Process a value, recursively expanding <% %> templates (via the grunt.template.process method)
+             * in the context of the Grunt config, as they are encountered.
+             * this method is called automatically by grunt.config.get but not by grunt.config.getRaw.
+             *
+             * If any retrieved value is entirely a single '<%= foo %>' or '<%= foo.bar %>' template string,
+             * and the specified foo or foo.bar property is a non-string (and not null or undefined) value,
+             * it will be expanded to the actual value. That, combined with grunt's task system automatically
+             * flattening arrays, can be extremely useful.
+             */
+            process<T>(value: string): T
+
+            /**
+             * Get a raw value from the project's Grunt configuration, without processing <% %> template strings.
+             * If prop is specified, that property's value is returned, or null if that property is not defined.
+             * If prop isn't specified, a copy of the entire config object is returned.
+             */
+            getRaw<T>(prop: string): T
+
+            /**
+             * Set a value into the project's Grunt configuration.
+             * @note any specified <% %> template strings will only be processed when config data is retrieved.
+             */
+            set<T>(prop: string, value: T): T
+
+            /**
+             * Escape '.' dots in the given propString. This should be used for property names that contain dots.
+             */
+            escape(propString: string): string
+
+            /**
+             * Fail the current task if one or more required config properties is missing, null or undefined.
+             * One or more string or array config properties may be specified.
+             */
+            requires(prop: string, ...andProps: string[]): void
+            requires(prop: string[], ...andProps: string[][]): void
+
+            /**
+             * Recursively merges properties of the specified configObject into the current project configuration.
+             * You can use this method to append configuration options, targets, etc., to already defined tasks.
+             */
+            merge<T>(configObject: T): void;
+        }
+    }
+
+    namespace event {
+        /**
+         * {@link http://github.com/hij1nx/EventEmitter2}
+         */
+        interface EventModule {
+
+            /**
+             * Adds a listener to the end of the listeners array for the specified event.
+             */
+            addListener(event: string, listener: Function): EventModule
+            on(event: string, listener: Function): EventModule
+
+            /**
+             * Adds a listener that will be fired when any event is emitted.
+             */
+            onAny(listener: Function): EventModule
+
+            /**
+             * Removes the listener that will be fired when any event is emitted.
+             */
+            offAny(listener: Function): EventModule
+
+            /**
+             * Adds a one time listener for the event.
+             * The listener is invoked only the first time the event is fired, after which it is removed.
+             */
+            once(event: string, listener: Function): EventModule
+
+            /**
+             * Adds a listener that will execute n times for the event before being removed.
+             * The listener is invoked only the first time the event is fired, after which it is removed.
+             */
+            many(event: string, timesToListen: number, listener: Function): EventModule
+
+            /**
+             * Remove a listener from the listener array for the specified event.
+             * Caution: changes array indices in the listener array behind the listener.
+             */
+            removeListener(event: string, listener: Function): EventModule
+            off(event: string, listener: Function): EventModule
+
+            /**
+             * Removes all listeners, or those of the specified event.
+             */
+            removeAllListeners(event: string): EventModule
+
+            /**
+             * By default EventEmitters will print a warning if more than 10 listeners are added to it.
+             * This is a useful default which helps finding memory leaks. Obviously not all Emitters
+             * should be limited to 10. This function allows that to be increased.
+             *
+             * Set to zero for unlimited.
+             */
+            setMaxListener(n: number): void
+
+            /**
+             * Returns an array of listeners for the specified event.
+             * This array can be manipulated, e.g. to remove listeners.
+             */
+            listeners(event: string): Function[]
+
+            /**
+             * Returns an array of listeners that are listening for any event that is specified.
+             * This array can be manipulated, e.g. to remove listeners.
+             */
+            listenersAny(): Function[]
+
+            /**
+             * Execute each of the listeners that may be listening for the specified event name
+             * in order with the list of arguments.
+             */
+            emit(event: string, ...args: any[]): any
+        }
+    }
+
+    namespace fail {
+
+        enum ErrorCode {
+            NoError = 0,
+            Fatal = 1,
+            MissingGruntfile = 2,
+            Task = 3,
+            Template = 4,
+            Autocomplete = 5,
+            Warning = 6,
+        }
+
+        interface FailModule {
+
+            /**
+             * Display a warning and abort Grunt immediately.
+             * Grunt will continue processing tasks if the --force command-line option was specified.
+             */
+            warn(error: string, errorCode?: ErrorCode): void
+            warn(error: Error, errorCode?: ErrorCode): void
+
+            /**
+             * Display a warning and abort Grunt immediately.
+             */
+            fatal(error: string, errorCode?: ErrorCode): void
+            fatal(error: Error, errorCode?: ErrorCode): void
+        }
+    }
+
+    namespace file {
+
+        /**
+         * {@link http://gruntjs.com/api/grunt.file#grunt.file.defaultencoding}
+         */
+        interface IFileEncodedOption {
+            encoding: string
+        }
+
+        /**
+         * {@link http://gruntjs.com/api/grunt.file#grunt.file.copy}
+         *
+         * @see IFileWriteBufferOption
+         * @see IFileWriteStringOption
+         */
+        interface IFileWriteOptions {
+            /**
+             * These optional globbing patterns will be matched against the filepath
+             * (not the filename) using grunt.file.isMatch. If any specified globbing
+             * pattern matches, the file won't be processed via the `process` function.
+             * If `true` is specified, processing will be prevented.
+             */
+            // noProcess?: string[]
+            // noProcess?: boolean
+            noProcess?: any
+        }
+
+        /**
+         * @see IFileWriteOptions
+         */
+        interface IFileWriteBufferOption extends grunt.file.IFileWriteOptions {
+            /**
+             * The source file contents and file path are passed into this function,
+             * whose return value will be used as the destination file's contents. If
+             * this function returns `false`, the file copy will be aborted.
+             */
+            process?: (buffer: Buffer) => boolean
+        }
+
+        /**
+         * @see IFileWriteOptions
+         */
+        interface IFileWriteStringOption extends grunt.file.IFileWriteOptions {
+            /**
+             * The source file contents and file path are passed into this function,
+             * whose return value will be used as the destination file's contents. If
+             * this function returns `false`, the file copy will be aborted.
+             */
+            process?: (file: string) => boolean
+        }
+
+        /**
+         * {@link http://gruntjs.com/api/grunt.file}
+         */
+        interface FileModule {
+
+            /**
+             * Set this property to change the default encoding used by all grunt.file methods.
+             * Defaults to 'utf8'.
+             *
+             * If you do have to change this value, it's recommended that you change
+             * it as early as possible inside your Gruntfile.
+             */
+            defaultEncoding: string
+
+            /**
+             * Read and return a file's contents.
+             * Returns a string, unless options.encoding is null in which case it returns a Buffer.
+             */
+            read(filepath: string): string
+            read(filepath: string, options: IFileEncodedOption): Buffer
+
+            /**
+             * Read a file's contents, parsing the data as JSON and returning the result.
+             * @see FileModule.read for a list of supported options.
+             */
+            readJSON(filepath: string): any
+            readJSON(filepath: string, options: IFileEncodedOption): Buffer
+
+            /**
+             * Read a file's contents, parsing the data as YAML and returning the result.
+             * @see FileModule.read for a list of supported options.
+             */
+            readYAML(filepath: string): any
+            readYAML(filepath: string, options: IFileEncodedOption): Buffer
+
+            /**
+             * Write the specified contents to a file, creating intermediate directories if necessary.
+             * Strings will be encoded using the specified character encoding, Buffers will be written to disk as-specified.
+             *
+             * @param contents If `contents` is a Buffer, encoding is ignored.
+             * @param options If an encoding is not specified, default to grunt.file.defaultEncoding.
+             */
+            write(filepath: string, contents: string, options?: IFileEncodedOption): void
+            write(filepath: string, contents: Buffer): void
+
+            /**
+             * Copy a source file to a destination path, creating intermediate directories if necessary.
+             */
+            copy(srcpath: string, destpath: string): void
+            copy(srcpath: string, destpath: string, options: IFileWriteStringOption): void
+            copy(srcpath: string, destpath: string, options: IFileWriteBufferOption): void
+
+            /**
+             * Delete the specified filepath. Will delete files and folders recursively.
+             *
+             * @return true if the files could be deleted, otherwise false.
+             */
+            delete(filepath: string, options?: { force?: boolean }): boolean
+
+            /**
+             * Works like mkdir -p. Create a directory along with any intermediate directories.
+             * If mode isn't specified, it defaults to 0777 & (~process.umask()).
+             */
+            mkdir(dirpath: string, mode?: string): void
+
+            /**
+             * Recurse into a directory, executing callback for each file.
+             *
+             * Callback args:
+             * abspath  - The full path to the current file,
+             *            which is nothing more than the rootdir + subdir + filename arguments, joined.
+             * rootdir  - The root director, as originally specified.
+             * subdir   - The current file's directory, relative to rootdir.
+             * filename - The filename of the current file, without any directory parts.
+             */
+            recurse(
+                rootdir: string,
+                callback: (abspath: string, rootdir: string, subdir: string, filename: string) => void
+            ): void
+
+            /**
+             * Return a unique array of all file or directory paths that match the given globbing pattern(s).
+             * This method accepts either comma separated globbing patterns or an array of globbing patterns.
+             * Paths matching patterns that begin with ! will be excluded from the returned array.
+             * Patterns are processed in order, so inclusion and exclusion order is significant.
+             *
+             * File paths are relative to the Gruntfile unless the current working directory is changed with
+             * grunt.file.setBase or the --base command-line option.
+             */
+            expand(patterns: string[]): string[]
+            expand(options: IFilesConfig, patterns: string[]): string[]
+
+            /**
+             * Returns an array of src-dest file mapping objects.
+             * For each source file matched by a specified pattern, join that file path to the specified dest.
+             * This file path may be flattened or renamed, depending on the options specified.
+             *
+             * @see FileModule.expand method documentation for an explanation of how the patterns
+             *      and options arguments may be specified.
+             */
+            expandMapping(patterns: string[], dest: string, options: IExpandedFilesConfig): Array<IFileMap>
+
+            /**
+             * Match one or more globbing patterns against one or more file paths.
+             * Returns a uniqued array of all file paths that match any of the specified globbing patterns.
+             * Both the patterns and filepaths argument can be a single string or array of strings.
+             * Paths matching patterns that begin with ! will be excluded from the returned array.
+             * Patterns are processed in order, so inclusion and exclusion order is significant.
+             */
+            match(pattern: string, filepath: string): string[]
+            match(pattern: string, filepaths: string[]): string[]
+            match(patterns: string[], filepath: string): string[]
+            match(patterns: string[], filepaths: string[]): string[]
+            match(options: minimatch.IMinimatchOptions, pattern: string, filepath: string): string[]
+            match(options: minimatch.IMinimatchOptions, pattern: string, filepaths: string[]): string[]
+            match(options: minimatch.IMinimatchOptions, patterns: string[], filepath: string): string[]
+            match(options: minimatch.IMinimatchOptions, patterns: string[], filepaths: string[]): string[]
+
+            /**
+             * This method contains the same signature and logic as the grunt.file.match method,
+             * but simply returns true if any files were matched, otherwise false.
+             *
+             * @see FileModule.match
+             */
+            isMatch(pattern: string, filepath: string): boolean
+            isMatch(pattern: string, filepaths: string[]): boolean
+            isMatch(patterns: string[], filepath: string): boolean
+            isMatch(patterns: string[], filepaths: string[]): boolean
+            isMatch(options: minimatch.IMinimatchOptions, pattern: string, filepath: string): boolean
+            isMatch(options: minimatch.IMinimatchOptions, pattern: string, filepaths: string[]): boolean
+            isMatch(options: minimatch.IMinimatchOptions, patterns: string[], filepath: string): boolean
+            isMatch(options: minimatch.IMinimatchOptions, patterns: string[], filepaths: string[]): boolean
+
+
+            /*
+             * Like the Node.js path.join method, the methods below will
+             * join all arguments together and normalize the resulting path.
+             */
+
+            /**
+             * Does the given path exist?
+             */
+            exists(path: string, ...append: string[]): boolean
+
+            /**
+             * Is the given path a symbolic link?
+             */
+            isLink(path: string, ...append: string[]): boolean
+
+            /**
+             * Is the given path a symbolic link?
+             */
+            isDir(path: string, ...append: string[]): boolean
+
+            /**
+             * Is the given path a file?
+             */
+            isFile(path: string, ...append: string[]): boolean
+
+            /**
+             * Is a given file path absolute?
+             */
+            isPathAbsolute(path: string, ...append: string[]): boolean
+
+            /**
+             * Do all the specified paths refer to the same path?
+             */
+            arePathsEquivalent(path: string, ...append: string[]): boolean
+
+            /**
+             * Are all descendant path(s) contained within the specified ancestor path?
+             */
+            doesPathContain(ancestorPath: string, decendantPaths: string[]): boolean
+
+            /**
+             * Is a given file path the current working directory (CWD)?
+             */
+            isPathCwd(path: string, ...append: string[]): boolean
+
+            /**
+             * Change grunt's current working directory (CWD).
+             * By default, all file paths are relative to the Gruntfile.
+             * This works just like the --base command-line option.
+             */
+            setBase(path: string, ...append: string[]): void
+
+            // External libraries
+            // TODO: Create declarations
+            glob: any
+            minimatch: any
+            findup: any
+        }
+
+        /**
+         * A convenience type.
+         *
+         * {@link http://gruntjs.com/configuring-tasks#files}
+         */
+        interface IFilesArray extends Array<IFilesConfig> {}
+
+        /**
+         * {@link http://gruntjs.com/configuring-tasks#files}
+         */
+        interface IFilesConfig extends minimatch.IMinimatchOptions {
+
+            /**
+             * Pattern(s) to match, relative to the {@link IExpandedFilesConfig.cwd}.
+             */
+            src?: string[]
+
+            /**
+             * Destination path prefix.
+             */
+            dest?: string
+
+            /**
+             * Process a dynamic src-dest file mapping,
+             * @see {@link http://gruntjs.com/configuring-tasks#building-the-files-object-dynamically for more information.
+            */
+            expand?: boolean // = false
+
+            /**
+             * Either a valid fs.Stats method name:
+             * - isFile
+             * - isDirectory
+             * - isBlockDevice
+             * - isCharacterDevice
+             * - isSymbolicLink
+             * - isFIFO
+             * - isSocket
+             *
+             * or a function that is passed the matched src filepath and returns true or false.
+             *
+             * string
+             * (src: string) => boolean
+             */
+            // filter?: string
+            // filter?: (src: string) => boolean
+            filter?: any
+        }
+
+        /**
+         * These are valid for compact-format
+         */
+        interface IExpandedFilesConfig extends IFilesConfig {
+
+            /**
+             * Enables the following options
+             */
+            expand?: boolean // = true
+
+            /**
+             * All {@link IExpandedFilesConfig.src} matches are relative to (but don't include) this path.
+             */
+            cwd?: string
+
+            /**
+             * Replace any existing extension with this value in generated {@link IExpandedFilesConfig.dest} paths.
+             */
+            ext?: string
+
+            /**
+             * Remove all path parts from generated {@link IExpandedFilesConfig.dest} paths.
+             */
+            flatten?: boolean
+
+            /**
+             * This function is called for each matched src file, (after extension renaming and flattening).
+             * The {@link IExpandedFilesConfig.dest} and matched {@link IExpandedFilesConfig.src} path are passed in,
+             * and this function must return a new dest value.
+             * If the same dest is returned more than once, each src which used it will be added to an array of sources for it.
+             */
+            rename?: Function
+        }
+
+        /**
+         * @see {@link http://gruntjs.com/configuring-tasks#files-array-format}
+         */
+        interface IFileMap {
+            /**
+             * source filenames.
+             */
+            src: string[]
+            /**
+             * destination filename.
+             */
+            dest: string
+        }
+    }
+
+    namespace log {
+
+        /**
+         * Grunt output should look consistent, and maybe even pretty.
+         * As such, there is a plethora of logging methods, and a few useful patterns.
+         * All of the methods that actually log something are chainable.
+         */
+        interface CommonLogging<T> {
+
+            /**
+             * Log the specified msg string, with no trailing newline.
+             */
+            write(msg: string): T
+
+            /**
+             * Log the specified msg string, with trailing newline.
+             */
+            writeln(msg: string): T
+
+            /**
+             * If msg string is omitted, logs ERROR in red,
+             * otherwise logs >> msg, with trailing newline.
+             */
+            error(msg: string): T
+
+            /**
+             * Log an error with grunt.log.error, wrapping text to 80 columns using grunt.log.wraptext.
+             */
+            errorlns(msg: string): T
+
+            /**
+             * If msg string is omitted, logs OK in green, otherwise logs >> msg, with trailing newline.
+             */
+            ok(msg: string): T
+
+            /**
+             * Log an ok message with grunt.log.ok, wrapping text to 80 columns using grunt.log.wraptext.
+             */
+            oklns(msg: string): T
+
+            /**
+             * Log the specified msg string in bold, with trailing newline.
+             */
+            subhead(msg: string): T
+
+            /**
+             * Log a list of obj properties (good for debugging flags).
+             */
+            writeflags(obj: any): T
+
+            /**
+             * Log an warning with grunt.log.warn
+             */
+            warn(msg: string): T
+        }
+
+        /**
+         * @note all methods available under grunt.verbose work exactly like grunt.log methods,
+         *       but only log if the --verbose command-line option was specified.
+         */
+        interface VerboseLogModule extends CommonLogging<VerboseLogModule> {
+            or: NotVerboseLogModule
+        }
+
+        /**
+         * @note all methods available under grunt.verbose work exactly like grunt.log methods,
+         *       but only log if the --verbose command-line option was not specified.
+         */
+        interface NotVerboseLogModule extends CommonLogging<NotVerboseLogModule> {
+            or: VerboseLogModule
+        }
+
+        /**
+         * {@link http://gruntjs.com/api/grunt.log}
+         */
+        interface LogModule extends CommonLogging<LogModule> {
+            verbose: VerboseLogModule
+            notverbose: NotVerboseLogModule
+        }
+    }
+
+    namespace option {
+
+        /**
+         * {@link http://gruntjs.com/api/grunt.option}
+         */
+        interface OptionModule {
+
+            /**
+             * Gets or sets an option.
+             * Boolean options can be negated by prepending no- onto the key. For example:
+             *
+             * grunt.option('staging', false);
+             * var isDev = grunt.option('no-staging');
+             * assert(isDev === true)
+             */
+            <T>(key: string, value: T): void
+            <T>(key: string): T
+
+            /**
+             * Initialize grunt.option.
+             * If initObject is omitted option will be initialized to an empty object
+             * otherwise will be set to initObject.
+             */
+            init(initObject?: any): void
+
+            /**
+             * Returns the options as an array of command line parameters.
+             */
+            flags: grunt.IFlag[]
+        }
+
+    }
+
+    namespace task {
+
+        /**
+         * {@link http://gruntjs.com/api/grunt.task}
+         */
+        interface CommonTaskModule {
+
+            /**
+             * If a task list is specified, the new task will be an alias for one or more other tasks.
+             * Whenever this "alias task" is run, every specified task in taskList will be run, in the order specified.
+             * The taskList argument must be an array of tasks.
+             */
+            registerTask(taskName: string, taskList: string[]): void
+
+            /**
+             * If a description and taskFunction are passed, the specified function will be executed
+             * whenever the task is run.
+             *
+             * In addition, the specified description will be shown when grunt --help is run.
+             * Task-specific properties and methods are available inside the task function as properties
+             * of the this object. The task function can return false to indicate that the task has failed.
+             *
+             * @note taskFunction.apply(scope: grunt.task.ITask, args: any[])
+             */
+            registerTask(taskName: string, description: string, taskFunction: Function): void
+
+            /**
+             * Register a "multi task." A multi task is a task that implicitly iterates over all of its
+             * named sub-properties (AKA targets) if no target was specified.
+             * In addition to the default properties and methods, extra multi task-specific properties
+             * are available inside the task function as properties of the this object.
+             *
+             * @note taskFunction.apply(scope: grunt.task.IMultiTask<any>, args: any[])
+             */
+            registerMultiTask(taskName: string, taskFunction: Function): void
+            registerMultiTask(taskName: string, taskDescription: string, taskFunction: Function): void
+
+            /**
+             * Check with the name, if a task exists in the registered tasks.
+             * @param name The task name to check.
+             * @since 0.4.5
+             */
+            exists(name: string): boolean;
+
+            /**
+             * Rename a task. This might be useful if you want to override the default behavior of a task, while retaining the old name.
+             * Note that if a task has been renamed, the this.name and this.nameArgs properties will change accordingly.
+             * @see ITask
+             * @param oldname The previous name of the task.
+             * @param newname The new name for the task.
+             */
+            renameTask(oldname: string, newname: string): void
+        }
+
+        /**
+         * {@link http://gruntjs.com/api/grunt.task#queueing-tasks}
+         */
+        interface TaskModule extends CommonTaskModule {
+            /**
+             * Enqueue one or more tasks.
+             * Every specified task in taskList will be run immediately after the current task completes,
+             * in the order specified. The task list can be an array of tasks or individual task arguments.
+             */
+            run(tasks: string[]): void
+            run(task: string, ...thenTasks: string[]): void
+
+            /**
+             * Empty the task queue completely. Unless additional tasks are enqueued, no more tasks will be run.
+             */
+            clearQueue(): void
+
+            /**
+             * Normalizes a task target configuration object into an array of src-dest file mappings.
+             * This method is used internally by the multi task system this.files / grunt.task.current.files property.
+             */
+            normalizeMultiTaskFiles(data: grunt.config.IProjectConfig, targetname?: string): Array<grunt.file.IFileMap>
+
+            /**
+             * The currently running task or multitask.
+             * @see http://gruntjs.com/api/inside-tasks
+             */
+            current: grunt.task.IMultiTask<any>
+        }
+
+        interface AsyncResultCatcher {
+            /**
+             * Either false or an Error object may be passed to the done function
+             * to instruct Grunt that the task has failed.
+             */
+            (success: boolean): void;
+            (error: Error): void;
+            (result: any): void;
+            (): void;
+        }
+
+        /**
+         * @link http://gruntjs.com/inside-tasks
+         *
+         * Grunt version 0.4.x
+         */
+        interface ITask {
+
+            /**
+             * If a task is asynchronous, this method must be invoked to instruct Grunt to wait.
+             * It returns a handle to a "done" function that should be called when the task has completed.
+             *
+             *   // Tell Grunt this task is asynchronous.
+             *   var done = this.async();
+             *   // Your async code.
+             *   setTimeout(function() {
+             *     // Let's simulate an error, sometimes.
+             *     var success = Math.random() > 0.5;
+             *     // All done!
+             *     done(success);
+             *   }, 1000);
+             */
+            async(): AsyncResultCatcher
+
+            /**
+             * If one task depends on the successful completion of another task (or tasks),
+             * this method can be used to force Grunt to abort if the other task didn't run,
+             * or if the other task failed.
+             *
+             * @param tasks an array of task names or individual task names, as arguments.
+             * @note that this won't actually run the specified task(s),
+             * it will just fail the current task if they haven't already run successfully.
+             */
+            requires(tasks: string[]): void
+            requires(tasks: string, ...otherTasks: string[]): void
+            requires(tasks: string[], ...otherTasks: string[][]): void
+
+            /**
+             * Fail the current task if one or more required config properties is missing.
+             * One or more string or array config properties may be specified.
+             * this.requiresConfig(prop [, prop [, ...]])
+             */
+            requiresConfig(prop: string, ...andProps: string[]): void
+
+            /**
+             * The name of the task, as defined in grunt.registerTask.
+             * For example, if a "sample" task was run as grunt sample or grunt sample:foo,
+             * inside the task function, this.name would be "sample".
+             */
+            name: string
+
+            /**
+             * The name of the task, including any colon-separated arguments or flags specified on the command-line.
+             * For example, if a "sample" task was run as grunt sample:foo,
+             * inside the task function, this.nameArgs would be "sample:foo".
+             */
+            nameArgs: string
+
+            /**
+             * An array of arguments passed to the task.
+             * For example, if a "sample" task was run as grunt sample:foo:bar,
+             * inside the task function, this.args would be ["foo", "bar"].
+             */
+            args: string[]
+
+            /**
+             * An object generated from the arguments passed to the task.
+             * For example, if a "sample" task was run as grunt sample:foo:bar,
+             * inside the task function, this.flags would be {foo: true, bar: true}.
+             */
+            flags: grunt.IFlag[]
+
+            /**
+             * The number of grunt.log.error calls that occurred during this task.
+             * This can be used to fail a task if errors were logged during the task.
+             */
+            errorCount: number
+
+            /**
+             * Returns an options object.
+             * Properties of the optional defaultsObj argument will be overridden by any task-level options
+             * object properties, which will be further overridden in multi tasks by any target-level
+             * options object properties.
+             */
+            options(defaultsObj: any): ITaskOptions
+            options<T>(defaultsObj: T): T
+        }
+
+        /**
+         * {@link http://gruntjs.com/inside-tasks#inside-multi-tasks}
+         */
+        interface IMultiTask<T> extends ITask {
+            /**
+             * In a multi task, this property contains the name of the target currently being iterated over.
+             * For example, if a "sample" multi task was run as grunt sample:foo with the config data
+             * {sample: {foo: "bar"}}, inside the task function, this.target would be "foo".
+             */
+            target: string
+
+            /**
+             * In a multi task, all files specified using any Grunt-supported file formats and options,
+             * globbing patterns or dynamic mappings will automatically be normalized into a single format:
+             * the Files Array file format.
+             *
+             * What this means is that tasks don't need to contain a ton of boilerplate for explicitly
+             * handling custom file formats, globbing patterns, mapping source files to destination files
+             * or filtering out files or directories. A task user can just specify files per the Configuring
+             * tasks guide, and Grunt will handle all the details.
+             *
+             * Your task should iterate over the this.files array, utilizing the src and dest properties of
+             * each object in that array. The this.files property will always be an array.
+             * The src property will also always be an array, in case your task cares about multiple source
+             * files per destination file.
+             *
+             * @note it's possible that nonexistent files might be included in src values,
+             *       so you may want to explicitly test that source files exist before using them.
+             */
+            files: grunt.file.IFilesArray
+
+            /**
+             * In a multi task, all src files files specified via any file format are reduced to a single array.
+             * If your task is "read only" and doesn't care about destination filepaths,
+             * use this array instead of this.files.
+             */
+            filesSrc: string[]
+
+            /**
+             * In a multi task, this is the actual data stored in the Grunt config object for the given target.
+             * For example, if a "sample" multi task was run as grunt sample:foo with the config data
+             * {sample: {foo: "bar"}}, inside the task function, this.data would be "bar".
+             *
+             * @note It is recommended that this.options this.files and this.filesSrc are used instead of this.data,
+             *       as their values are normalized.
+             */
+            data: T
+        }
+
+        /**
+         * {@link http://gruntjs.com/configuring-tasks}
+         *
+         * A TaskConfig can be either be a full config or a compacted files config.
+         * @see ITaskCompactOptions
+         */
+        interface ITaskOptions {
+
+            options?: any
+
+            // files?: grunt.file.IFilesArray
+            // files?: grunt.file.IFilesMap
+            files?: any
+        }
+
+        /**
+         * @see ITaskOptions
+         */
+        interface ITaskCompactOptions extends grunt.task.ITaskOptions, grunt.file.IFilesConfig {}
+    }
+
+    namespace template {
+
+        interface TemplateModule {
+
+            /**
+             * Process a Lo-Dash template string.
+             *
+             * The template argument will be processed recursively until there are no more templates to process.
+             *
+             * The default data object is the entire config object, but if options.data is set, that object will
+             * be used instead. The default template delimiters are <% %> but if options.delimiters is set to a
+             * custom delimiter name, those template delimiters will be used instead.
+             *
+             * Inside templates, the grunt object is exposed so that you can do things like:
+             *     <%= grunt.template.today('yyyy') %>
+             *
+             * @note if the data object already has a grunt property, the grunt API will not be accessible in templates.
+             */
+            process(template: string): (options: any) => string
+            process(template: string, options: any): string
+
+            /**
+             * Set the Lo-Dash template delimiters to a predefined set in case you grunt.util._.template
+             * needs to be called manually.
+             *
+             * The config delimiters <% %> are included by default.
+             */
+            setDelimiters(name: string): void
+
+            /**
+             * Add a named set of Lo-Dash template delimiters.
+             *
+             * You probably won't need to use this method, because the built-in delimiters should be sufficient,
+             * but you could always add {% %} or [% %] style delimiters.
+             */
+            addDelimiters(name: string, opener: string, closer: string): void
+
+            /**
+             * Format a date using the dateformat library.
+             * {@link http://github.com/felixge/node-dateformat}
+             *
+             * @note if you don't include the mask argument, dateFormat.masks.default is used
+             */
+            date(date?: Date, format?: string): string
+            date(date?: number, format?: string): string
+            date(date?: string, format?: string): string
+
+            /**
+             * Format today's date using the dateformat library using the current date and time.
+             * {@link http://github.com/felixge/node-dateformat}
+             *
+             * @note if you don't include the mask argument, dateFormat.masks.default is used
+             */
+            today(format?: string): string
+        }
+    }
+
+    namespace util {
+
+        /**
+         * {@link http://gruntjs.com/api/grunt.util}
+         */
+        interface UtilModule {
+
+            /**
+             * Return the "kind" of a value. Like typeof but returns the internal [Class](Class/) value.
+             * Possible results are "number", "string", "boolean", "function", "regexp", "array", "date",
+             * "error", "null", "undefined" and the catch-all "object".
+             */
+            kindOf(value: any): string
+
+            /**
+             * Return a new Error instance (that can be thrown) with the appropriate message.
+             * If an Error object is specified instead of message that object will be returned.
+             * Also, if an Error object is specified for origError and Grunt was run with the --debug 9 option,
+             * the original Error stack will be dumped.
+             */
+            error(message: string, origError?: Error): Error
+            error(error: Error, origError?: Error): Error
+            error(error: any, origError?: Error): Error
+
+            /**
+             * The linefeed character, normalized for the current operating system.
+             * (\r\n on Windows, \n otherwise)
+             */
+            linefeed: string
+
+            /**
+             * Given a string, return a new string with all the linefeeds normalized for the current operating system.
+             * (\r\n on Windows, \n otherwise)
+             */
+            normalizelf(str: string): string
+
+            /**
+             * Recurse through nested objects and arrays, executing callbackFunction for each non-object value.
+             * If continueFunction returns false, a given object or value will be skipped.
+             */
+            recurse(object: any, callbackFunction: (value: any) => void, continueFunction: (objOrValue: any) => boolean): void
+
+            /**
+             * Return string str repeated n times.
+             */
+            repeat(n: number, str: string): string
+
+            /**
+             * Given str of "a/b", If n is 1, return "a" otherwise "b".
+             * You can specify a custom separator if '/' doesn't work for you.
+             */
+            pluralize(n: number, str: string, separator?: string): string
+
+            /**
+             * Spawn a child process, keeping track of its stdout, stderr and exit code.
+             * The method returns a reference to the spawned child.
+             * When the child exits, the done function is called.
+             *
+             * @param done a function with arguments:
+             *        error  - If the exit code was non-zero and a fallback wasn't specified,
+             *                 an Error object, otherwise null.
+             *        result - The result object is an
+             *        code   - The numeric exit code.
+             */
+            spawn(options: ISpawnOptions, done: (error: Error, result: ISpawnResult, code: number) => void): ISpawnedChild
+
+            /**
+             * Given an array or array-like object, return an array.
+             * Great for converting arguments objects into arrays.
+             */
+            toArray<T>(arrayLikeObject: any): T[]
+
+            /**
+             * Normalizes both "returns a value" and "passes result to a callback" functions to always
+             * pass a result to the specified callback. If the original function returns a value,
+             * that value will now be passed to the callback, which is specified as the last argument,
+             * after all other predefined arguments. If the original function passed a value to a callback,
+             * it will continue to do so.
+             */
+            callbackify<R>(syncOrAsyncFunction: () => R):
+                (callback: (result: R) => void) => void
+            callbackify<A, R>(syncOrAsyncFunction: (a: A) => R):
+                (a: A, callback: (result: R) => void) => void
+            callbackify<A, B, R>(syncOrAsyncFunction: (a: A, b: B) => R):
+                (a: A, b: B, callback: (result: R) => void) => void
+            callbackify<A, B, C, R>(syncOrAsyncFunction: (a: A, b: B, c: C) => R):
+                (a: A, b: B, c: C, callback: (result: R) => void) => void
+            callbackify<A, B, C, D, R>(syncOrAsyncFunction: (a: A, b: B, c: C, d: D) => R):
+                (a: A, b: B, c: C, d: D, callback: (result: R) => void) => void
+
+            // Internal libraries
+            namespace: any
+            task: any
+        }
+
+        /**
+         * {@link http://gruntjs.com/api/grunt.util#grunt.util.spawn}
+         */
+        interface ISpawnOptions {
+
+            /**
+             * The command to execute. It should be in the system path.
+             */
+            cmd?: string
+
+            /**
+             * If specified, the same grunt bin that is currently running will be
+             * spawned as the child command, instead of the "cmd" option.
+             * Defaults to false.
+             */
+            grunt?: boolean
+
+            /**
+             * An array of arguments to pass to the command.
+             */
+            args?: string[]
+
+            /**
+             * Additional options for the Node.js child_process spawn method.
+             */
+            opts?: {
+                cwd?: string
+                stdio?: any
+                custom?: any
+                env?: any
+                detached?: boolean
+            }
+
+            /**
+             * If this value is set and an error occurs, it will be used as the value
+             * and null will be passed as the error value.
+             */
+            fallback?: any
+        }
+
+        /**
+         * @note When result is coerced to a string, the value is stdout if the exit code
+         *       was zero, the fallback if the exit code was non-zero and a fallback was
+         *       specified, or stderr if the exit code was non-zero and a fallback was
+         *       not specified.
+         */
+        interface ISpawnResult {
+            stdout: string
+            stderr: string
+            code: number
+        }
+
+        /**
+         * {@link http://github.com/snbartell/node-spawn}
+         */
+        interface ISpawnedChild {
+            /**
+             * Start the cmd with the options provided.
+             */
+            start(): void
+
+            /**
+             * Convenience function. Overrides options. restarts to 0.
+             * Runs command exactly once no matter the options passed into the constructor.
+             */
+            once(): void
+
+            /**
+             * Convenience function. Overrides options.restarts to -1.
+             * Runs command indefinitely no matter the options passed into the constructor.
+             */
+            forever(): void
+
+            /**
+             * Shut down the child and don't let it restart.
+             */
+            kill(): void
+        }
+    }
+
+    /*
+     * Common interfaces
+     */
+
+    interface IFlag {
+        [flag: string]: boolean
+    }
+
+    /*
+     * Grunt module mixins.
+     */
+
+    interface IConfigComponents extends grunt.config.ConfigModule {
+        /**
+         * An alias
+         * @see grunt.config.ConfigModule.init
+         */
+        initConfig(config: grunt.config.IProjectConfig): void
+    }
+
+    interface ITaskComponents extends grunt.task.CommonTaskModule {
+        /**
+         * Load task-related files from the specified directory, relative to the Gruntfile.
+         * This method can be used to load task-related files from a local Grunt plugin by
+         * specifying the path to that plugin's "tasks" subdirectory.
+         */
+        loadTasks(tasksPath: string): void
+
+        /**
+         * Load tasks from the specified Grunt plugin.
+         * This plugin must be installed locally via npm, and must be relative to the Gruntfile.
+         * Grunt plugins can be created by using the grunt-init gruntplugin template: grunt init:gruntplugin.
+         */
+        loadNpmTasks(pluginName: string): void
+    }
+}
+
+/* GRUNT MODULE
+ **************/
+
+/**
+ * The main Grunt module.
+ *
+ * {@link http://gruntjs.com/api/grunt}
+ */
+interface IGrunt extends grunt.IConfigComponents, grunt.fail.FailModule, grunt.ITaskComponents {
+
+    config: grunt.config.ConfigModule
+
+    event: grunt.event.EventModule
+
+    fail: grunt.fail.FailModule
+
+    file: grunt.file.FileModule
+
+    log: grunt.log.LogModule
+
+    option: grunt.option.OptionModule
+
+    task: grunt.task.TaskModule
+
+    template: grunt.template.TemplateModule
+
+    util: grunt.util.UtilModule
+
+    /**
+     * The current Grunt package.json metadata, as an object.
+     */
+    package: node.NodePackage
+
+    /**
+     * The current Grunt version, as a string. This is just a shortcut to the grunt.package.version property.
+     */
+    version: string
+}
+
+// NodeJS Support
+declare module 'grunt' {
+    var grunt: IGrunt;
+    export = grunt;
+}
diff --git a/grunt/tsconfig.json b/grunt/tsconfig.json
new file mode 100644
index 0000000000..c6bdbdd86e
--- /dev/null
+++ b/grunt/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gruntjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gruntjs/gruntjs.d.ts b/gruntjs/gruntjs.d.ts
deleted file mode 100644
index 410ed10ab0..0000000000
--- a/gruntjs/gruntjs.d.ts
+++ /dev/null
@@ -1,1327 +0,0 @@
-// Type definitions for Grunt 0.4.x
-// Project: http://gruntjs.com
-// Definitions by: Jeff May <https://github.com/jeffmay/>, Basarat Ali Syed <https://github.com/basarat/>
-// Definitions: https://github.com/jeffmay/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-/**
- * {@link http://github.com/marak/colors.js/}
- */
-interface String {
-    yellow: string;
-    cyan: string;
-    white: string;
-    magenta: string;
-    green: string;
-    red: string;
-    grey: string;
-    blue: string;
-}
-
-declare namespace node {
-
-    /**
-     * {@link http://npmjs.org/doc/json.html}
-     */
-    interface NodePackage {
-        name: string
-        version: string
-        description?: string
-        keywords?: string[]
-        homepage?: string
-    }
-}
-
-/**
- * {@link http://github.com/isaacs/minimatch}
- */
-declare namespace minimatch {
-
-    /**
-     * A minimal matching utility options.
-     *
-     * This is the matching library used internally by npm.
-     * Eventually, it will replace the C binding in node-glob.
-     * It works by converting glob expressions into JavaScript RegExp objects.
-     */
-    interface IMinimatchOptions {
-        /*
-         All options are false by default.
-         */
-
-        /**
-         * Dump a ton of stuff to stderr.
-         */
-        debug?: boolean
-
-        /**
-         * Do not expand {a,b} and {1..3} brace sets.
-         */
-        nobrace?: boolean
-
-        /**
-         * Disable ** matching against multiple folder names.
-         */
-        noglobstar?: boolean
-
-        /**
-         * Allow patterns to match filenames starting with a period,
-         * even if the pattern does not explicitly have a period in that spot.
-         */
-        // Note that by default, a/**\/b will not match a/.d/b, unless dot is set.
-        dot?: boolean
-
-        /**
-         * Disable "extglob" style patterns like +(a|b).
-         */
-        noext?: boolean
-
-        /**
-         * Perform a case-insensitive match.
-         */
-        nocase?: boolean
-
-        /**
-         * When a match is not found by minimatch.match, return a list containing the pattern itself.
-         * When set, an empty list is returned if there are no matches.
-         */
-        nonull?: boolean
-
-        /**
-         * If set, then patterns without slashes will be matched against the basename of the path if it contains slashes.
-         * For example, a?b would match the path /xyz/123/acb, but not /xyz/acb/123.
-         */
-        matchBase?: boolean
-
-        /**
-         * Suppress the behavior of treating # at the start of a pattern as a comment.
-         */
-        nocomment?: boolean
-
-        /**
-         * Suppress the behavior of treating a leading ! character as negation.
-         */
-        nonegate?: boolean
-
-        /**
-         * Returns from negate expressions the same as if they were not negated. (Ie, true on a hit, false on a miss.)
-         */
-        flipNegate?: boolean
-    }
-}
-
-/* GRUNT CONFIGURATION
- *********************/
-
-declare namespace grunt {
-
-    namespace config {
-
-        /**
-         * {@link http://gruntjs.com/sample-gruntfile}
-         */
-        interface IProjectConfig{
-            [plugin: string]: any;
-        }
-
-        /**
-         * {@link http://gruntjs.com/api/grunt.config}
-         */
-        interface ConfigModule {
-            /**
-             * Get or set a value from the project's Grunt configuration.
-             * This method serves as an alias to other methods;
-             * if two arguments are passed, grunt.config.set is called,
-             * otherwise grunt.config.get is called.
-             */
-            (prop: string, value: any): any
-            (prop: string): any
-
-            /**
-             * Initialize a configuration object for the current project.
-             * The specified configObject is used by tasks and can be accessed using the grunt.config method.
-             * Nearly every project's Gruntfile will call this method.
-             */
-            init(config: IProjectConfig): void
-
-            /**
-             * Get a value from the project's Grunt configuration.
-             * If prop is specified, that property's value is returned, or null if that property is not defined.
-             * If prop isn't specified, a copy of the entire config object is returned.
-             * Templates strings will be recursively processed using the grunt.config.process method.
-             *
-             * @note Although this accepts a generic type, you may still get the wrong typed value.
-             */
-            get<T>(prop: string): T
-            get(): ConfigModule
-
-            /**
-             * Process a value, recursively expanding <% %> templates (via the grunt.template.process method)
-             * in the context of the Grunt config, as they are encountered.
-             * this method is called automatically by grunt.config.get but not by grunt.config.getRaw.
-             *
-             * If any retrieved value is entirely a single '<%= foo %>' or '<%= foo.bar %>' template string,
-             * and the specified foo or foo.bar property is a non-string (and not null or undefined) value,
-             * it will be expanded to the actual value. That, combined with grunt's task system automatically
-             * flattening arrays, can be extremely useful.
-             */
-            process<T>(value: string): T
-
-            /**
-             * Get a raw value from the project's Grunt configuration, without processing <% %> template strings.
-             * If prop is specified, that property's value is returned, or null if that property is not defined.
-             * If prop isn't specified, a copy of the entire config object is returned.
-             */
-            getRaw<T>(prop: string): T
-
-            /**
-             * Set a value into the project's Grunt configuration.
-             * @note any specified <% %> template strings will only be processed when config data is retrieved.
-             */
-            set<T>(prop: string, value: T): T
-
-            /**
-             * Escape '.' dots in the given propString. This should be used for property names that contain dots.
-             */
-            escape(propString: string): string
-
-            /**
-             * Fail the current task if one or more required config properties is missing, null or undefined.
-             * One or more string or array config properties may be specified.
-             */
-            requires(prop: string, ...andProps: string[]): void
-            requires(prop: string[], ...andProps: string[][]): void
-
-            /**
-             * Recursively merges properties of the specified configObject into the current project configuration.
-             * You can use this method to append configuration options, targets, etc., to already defined tasks.
-             */
-            merge<T>(configObject: T): void;
-        }
-    }
-
-    namespace event {
-        /**
-         * {@link http://github.com/hij1nx/EventEmitter2}
-         */
-        interface EventModule {
-
-            /**
-             * Adds a listener to the end of the listeners array for the specified event.
-             */
-            addListener(event: string, listener: Function): EventModule
-            on(event: string, listener: Function): EventModule
-
-            /**
-             * Adds a listener that will be fired when any event is emitted.
-             */
-            onAny(listener: Function): EventModule
-
-            /**
-             * Removes the listener that will be fired when any event is emitted.
-             */
-            offAny(listener: Function): EventModule
-
-            /**
-             * Adds a one time listener for the event.
-             * The listener is invoked only the first time the event is fired, after which it is removed.
-             */
-            once(event: string, listener: Function): EventModule
-
-            /**
-             * Adds a listener that will execute n times for the event before being removed.
-             * The listener is invoked only the first time the event is fired, after which it is removed.
-             */
-            many(event: string, timesToListen: number, listener: Function): EventModule
-
-            /**
-             * Remove a listener from the listener array for the specified event.
-             * Caution: changes array indices in the listener array behind the listener.
-             */
-            removeListener(event: string, listener: Function): EventModule
-            off(event: string, listener: Function): EventModule
-
-            /**
-             * Removes all listeners, or those of the specified event.
-             */
-            removeAllListeners(event: string): EventModule
-
-            /**
-             * By default EventEmitters will print a warning if more than 10 listeners are added to it.
-             * This is a useful default which helps finding memory leaks. Obviously not all Emitters
-             * should be limited to 10. This function allows that to be increased.
-             *
-             * Set to zero for unlimited.
-             */
-            setMaxListener(n: number): void
-
-            /**
-             * Returns an array of listeners for the specified event.
-             * This array can be manipulated, e.g. to remove listeners.
-             */
-            listeners(event: string): Function[]
-
-            /**
-             * Returns an array of listeners that are listening for any event that is specified.
-             * This array can be manipulated, e.g. to remove listeners.
-             */
-            listenersAny(): Function[]
-
-            /**
-             * Execute each of the listeners that may be listening for the specified event name
-             * in order with the list of arguments.
-             */
-            emit(event: string, ...args: any[]): any
-        }
-    }
-
-    namespace fail {
-
-        enum ErrorCode {
-            NoError = 0,
-            Fatal = 1,
-            MissingGruntfile = 2,
-            Task = 3,
-            Template = 4,
-            Autocomplete = 5,
-            Warning = 6,
-        }
-
-        interface FailModule {
-
-            /**
-             * Display a warning and abort Grunt immediately.
-             * Grunt will continue processing tasks if the --force command-line option was specified.
-             */
-            warn(error: string, errorCode?: ErrorCode): void
-            warn(error: Error, errorCode?: ErrorCode): void
-
-            /**
-             * Display a warning and abort Grunt immediately.
-             */
-            fatal(error: string, errorCode?: ErrorCode): void
-            fatal(error: Error, errorCode?: ErrorCode): void
-        }
-    }
-
-    namespace file {
-
-        /**
-         * {@link http://gruntjs.com/api/grunt.file#grunt.file.defaultencoding}
-         */
-        interface IFileEncodedOption {
-            encoding: string
-        }
-
-        /**
-         * {@link http://gruntjs.com/api/grunt.file#grunt.file.copy}
-         *
-         * @see IFileWriteBufferOption
-         * @see IFileWriteStringOption
-         */
-        interface IFileWriteOptions {
-            /**
-             * These optional globbing patterns will be matched against the filepath
-             * (not the filename) using grunt.file.isMatch. If any specified globbing
-             * pattern matches, the file won't be processed via the `process` function.
-             * If `true` is specified, processing will be prevented.
-             */
-            // noProcess?: string[]
-            // noProcess?: boolean
-            noProcess?: any
-        }
-
-        /**
-         * @see IFileWriteOptions
-         */
-        interface IFileWriteBufferOption extends grunt.file.IFileWriteOptions {
-            /**
-             * The source file contents and file path are passed into this function,
-             * whose return value will be used as the destination file's contents. If
-             * this function returns `false`, the file copy will be aborted.
-             */
-            process?: (buffer: Buffer) => boolean
-        }
-
-        /**
-         * @see IFileWriteOptions
-         */
-        interface IFileWriteStringOption extends grunt.file.IFileWriteOptions {
-            /**
-             * The source file contents and file path are passed into this function,
-             * whose return value will be used as the destination file's contents. If
-             * this function returns `false`, the file copy will be aborted.
-             */
-            process?: (file: string) => boolean
-        }
-
-        /**
-         * {@link http://gruntjs.com/api/grunt.file}
-         */
-        interface FileModule {
-
-            /**
-             * Set this property to change the default encoding used by all grunt.file methods.
-             * Defaults to 'utf8'.
-             *
-             * If you do have to change this value, it's recommended that you change
-             * it as early as possible inside your Gruntfile.
-             */
-            defaultEncoding: string
-
-            /**
-             * Read and return a file's contents.
-             * Returns a string, unless options.encoding is null in which case it returns a Buffer.
-             */
-            read(filepath: string): string
-            read(filepath: string, options: IFileEncodedOption): Buffer
-
-            /**
-             * Read a file's contents, parsing the data as JSON and returning the result.
-             * @see FileModule.read for a list of supported options.
-             */
-            readJSON(filepath: string): any
-            readJSON(filepath: string, options: IFileEncodedOption): Buffer
-
-            /**
-             * Read a file's contents, parsing the data as YAML and returning the result.
-             * @see FileModule.read for a list of supported options.
-             */
-            readYAML(filepath: string): any
-            readYAML(filepath: string, options: IFileEncodedOption): Buffer
-
-            /**
-             * Write the specified contents to a file, creating intermediate directories if necessary.
-             * Strings will be encoded using the specified character encoding, Buffers will be written to disk as-specified.
-             *
-             * @param contents If `contents` is a Buffer, encoding is ignored.
-             * @param options If an encoding is not specified, default to grunt.file.defaultEncoding.
-             */
-            write(filepath: string, contents: string, options?: IFileEncodedOption): void
-            write(filepath: string, contents: Buffer): void
-
-            /**
-             * Copy a source file to a destination path, creating intermediate directories if necessary.
-             */
-            copy(srcpath: string, destpath: string): void
-            copy(srcpath: string, destpath: string, options: IFileWriteStringOption): void
-            copy(srcpath: string, destpath: string, options: IFileWriteBufferOption): void
-
-            /**
-             * Delete the specified filepath. Will delete files and folders recursively.
-             *
-             * @return true if the files could be deleted, otherwise false.
-             */
-            delete(filepath: string, options?: { force?: boolean }): boolean
-
-            /**
-             * Works like mkdir -p. Create a directory along with any intermediate directories.
-             * If mode isn't specified, it defaults to 0777 & (~process.umask()).
-             */
-            mkdir(dirpath: string, mode?: string): void
-
-            /**
-             * Recurse into a directory, executing callback for each file.
-             *
-             * Callback args:
-             * abspath  - The full path to the current file,
-             *            which is nothing more than the rootdir + subdir + filename arguments, joined.
-             * rootdir  - The root director, as originally specified.
-             * subdir   - The current file's directory, relative to rootdir.
-             * filename - The filename of the current file, without any directory parts.
-             */
-            recurse(
-                rootdir: string,
-                callback: (abspath: string, rootdir: string, subdir: string, filename: string) => void
-            ): void
-
-            /**
-             * Return a unique array of all file or directory paths that match the given globbing pattern(s).
-             * This method accepts either comma separated globbing patterns or an array of globbing patterns.
-             * Paths matching patterns that begin with ! will be excluded from the returned array.
-             * Patterns are processed in order, so inclusion and exclusion order is significant.
-             *
-             * File paths are relative to the Gruntfile unless the current working directory is changed with
-             * grunt.file.setBase or the --base command-line option.
-             */
-            expand(patterns: string[]): string[]
-            expand(options: IFilesConfig, patterns: string[]): string[]
-
-            /**
-             * Returns an array of src-dest file mapping objects.
-             * For each source file matched by a specified pattern, join that file path to the specified dest.
-             * This file path may be flattened or renamed, depending on the options specified.
-             *
-             * @see FileModule.expand method documentation for an explanation of how the patterns
-             *      and options arguments may be specified.
-             */
-            expandMapping(patterns: string[], dest: string, options: IExpandedFilesConfig): Array<IFileMap>
-
-            /**
-             * Match one or more globbing patterns against one or more file paths.
-             * Returns a uniqued array of all file paths that match any of the specified globbing patterns.
-             * Both the patterns and filepaths argument can be a single string or array of strings.
-             * Paths matching patterns that begin with ! will be excluded from the returned array.
-             * Patterns are processed in order, so inclusion and exclusion order is significant.
-             */
-            match(pattern: string, filepath: string): string[]
-            match(pattern: string, filepaths: string[]): string[]
-            match(patterns: string[], filepath: string): string[]
-            match(patterns: string[], filepaths: string[]): string[]
-            match(options: minimatch.IMinimatchOptions, pattern: string, filepath: string): string[]
-            match(options: minimatch.IMinimatchOptions, pattern: string, filepaths: string[]): string[]
-            match(options: minimatch.IMinimatchOptions, patterns: string[], filepath: string): string[]
-            match(options: minimatch.IMinimatchOptions, patterns: string[], filepaths: string[]): string[]
-
-            /**
-             * This method contains the same signature and logic as the grunt.file.match method,
-             * but simply returns true if any files were matched, otherwise false.
-             *
-             * @see FileModule.match
-             */
-            isMatch(pattern: string, filepath: string): boolean
-            isMatch(pattern: string, filepaths: string[]): boolean
-            isMatch(patterns: string[], filepath: string): boolean
-            isMatch(patterns: string[], filepaths: string[]): boolean
-            isMatch(options: minimatch.IMinimatchOptions, pattern: string, filepath: string): boolean
-            isMatch(options: minimatch.IMinimatchOptions, pattern: string, filepaths: string[]): boolean
-            isMatch(options: minimatch.IMinimatchOptions, patterns: string[], filepath: string): boolean
-            isMatch(options: minimatch.IMinimatchOptions, patterns: string[], filepaths: string[]): boolean
-
-
-            /*
-             * Like the Node.js path.join method, the methods below will
-             * join all arguments together and normalize the resulting path.
-             */
-
-            /**
-             * Does the given path exist?
-             */
-            exists(path: string, ...append: string[]): boolean
-
-            /**
-             * Is the given path a symbolic link?
-             */
-            isLink(path: string, ...append: string[]): boolean
-
-            /**
-             * Is the given path a symbolic link?
-             */
-            isDir(path: string, ...append: string[]): boolean
-
-            /**
-             * Is the given path a file?
-             */
-            isFile(path: string, ...append: string[]): boolean
-
-            /**
-             * Is a given file path absolute?
-             */
-            isPathAbsolute(path: string, ...append: string[]): boolean
-
-            /**
-             * Do all the specified paths refer to the same path?
-             */
-            arePathsEquivalent(path: string, ...append: string[]): boolean
-
-            /**
-             * Are all descendant path(s) contained within the specified ancestor path?
-             */
-            doesPathContain(ancestorPath: string, decendantPaths: string[]): boolean
-
-            /**
-             * Is a given file path the current working directory (CWD)?
-             */
-            isPathCwd(path: string, ...append: string[]): boolean
-
-            /**
-             * Change grunt's current working directory (CWD).
-             * By default, all file paths are relative to the Gruntfile.
-             * This works just like the --base command-line option.
-             */
-            setBase(path: string, ...append: string[]): void
-
-            // External libraries
-            // TODO: Create declarations
-            glob: any
-            minimatch: any
-            findup: any
-        }
-
-        /**
-         * A convenience type.
-         *
-         * {@link http://gruntjs.com/configuring-tasks#files}
-         */
-        interface IFilesArray extends Array<IFilesConfig> {}
-
-        /**
-         * {@link http://gruntjs.com/configuring-tasks#files}
-         */
-        interface IFilesConfig extends minimatch.IMinimatchOptions {
-
-            /**
-             * Pattern(s) to match, relative to the {@link IExpandedFilesConfig.cwd}.
-             */
-            src?: string[]
-
-            /**
-             * Destination path prefix.
-             */
-            dest?: string
-
-            /**
-             * Process a dynamic src-dest file mapping,
-             * @see {@link http://gruntjs.com/configuring-tasks#building-the-files-object-dynamically for more information.
-            */
-            expand?: boolean // = false
-
-            /**
-             * Either a valid fs.Stats method name:
-             * - isFile
-             * - isDirectory
-             * - isBlockDevice
-             * - isCharacterDevice
-             * - isSymbolicLink
-             * - isFIFO
-             * - isSocket
-             *
-             * or a function that is passed the matched src filepath and returns true or false.
-             *
-             * string
-             * (src: string) => boolean
-             */
-            // filter?: string
-            // filter?: (src: string) => boolean
-            filter?: any
-        }
-
-        /**
-         * These are valid for compact-format
-         */
-        interface IExpandedFilesConfig extends IFilesConfig {
-
-            /**
-             * Enables the following options
-             */
-            expand?: boolean // = true
-
-            /**
-             * All {@link IExpandedFilesConfig.src} matches are relative to (but don't include) this path.
-             */
-            cwd?: string
-
-            /**
-             * Replace any existing extension with this value in generated {@link IExpandedFilesConfig.dest} paths.
-             */
-            ext?: string
-
-            /**
-             * Remove all path parts from generated {@link IExpandedFilesConfig.dest} paths.
-             */
-            flatten?: boolean
-
-            /**
-             * This function is called for each matched src file, (after extension renaming and flattening).
-             * The {@link IExpandedFilesConfig.dest} and matched {@link IExpandedFilesConfig.src} path are passed in,
-             * and this function must return a new dest value.
-             * If the same dest is returned more than once, each src which used it will be added to an array of sources for it.
-             */
-            rename?: Function
-        }
-
-        /**
-         * @see {@link http://gruntjs.com/configuring-tasks#files-array-format}
-         */
-        interface IFileMap {
-            /**
-             * source filenames.
-             */
-            src: string[]
-            /**
-             * destination filename.
-             */
-            dest: string
-        }
-    }
-
-    namespace log {
-
-        /**
-         * Grunt output should look consistent, and maybe even pretty.
-         * As such, there is a plethora of logging methods, and a few useful patterns.
-         * All of the methods that actually log something are chainable.
-         */
-        interface CommonLogging<T> {
-
-            /**
-             * Log the specified msg string, with no trailing newline.
-             */
-            write(msg: string): T
-
-            /**
-             * Log the specified msg string, with trailing newline.
-             */
-            writeln(msg: string): T
-
-            /**
-             * If msg string is omitted, logs ERROR in red,
-             * otherwise logs >> msg, with trailing newline.
-             */
-            error(msg: string): T
-
-            /**
-             * Log an error with grunt.log.error, wrapping text to 80 columns using grunt.log.wraptext.
-             */
-            errorlns(msg: string): T
-
-            /**
-             * If msg string is omitted, logs OK in green, otherwise logs >> msg, with trailing newline.
-             */
-            ok(msg: string): T
-
-            /**
-             * Log an ok message with grunt.log.ok, wrapping text to 80 columns using grunt.log.wraptext.
-             */
-            oklns(msg: string): T
-
-            /**
-             * Log the specified msg string in bold, with trailing newline.
-             */
-            subhead(msg: string): T
-
-            /**
-             * Log a list of obj properties (good for debugging flags).
-             */
-            writeflags(obj: any): T
-
-            /**
-             * Log an warning with grunt.log.warn
-             */
-            warn(msg: string): T
-        }
-
-        /**
-         * @note all methods available under grunt.verbose work exactly like grunt.log methods,
-         *       but only log if the --verbose command-line option was specified.
-         */
-        interface VerboseLogModule extends CommonLogging<VerboseLogModule> {
-            or: NotVerboseLogModule
-        }
-
-        /**
-         * @note all methods available under grunt.verbose work exactly like grunt.log methods,
-         *       but only log if the --verbose command-line option was not specified.
-         */
-        interface NotVerboseLogModule extends CommonLogging<NotVerboseLogModule> {
-            or: VerboseLogModule
-        }
-
-        /**
-         * {@link http://gruntjs.com/api/grunt.log}
-         */
-        interface LogModule extends CommonLogging<LogModule> {
-            verbose: VerboseLogModule
-            notverbose: NotVerboseLogModule
-        }
-    }
-
-    namespace option {
-
-        /**
-         * {@link http://gruntjs.com/api/grunt.option}
-         */
-        interface OptionModule {
-
-            /**
-             * Gets or sets an option.
-             * Boolean options can be negated by prepending no- onto the key. For example:
-             *
-             * grunt.option('staging', false);
-             * var isDev = grunt.option('no-staging');
-             * assert(isDev === true)
-             */
-            <T>(key: string, value: T): void
-            <T>(key: string): T
-
-            /**
-             * Initialize grunt.option.
-             * If initObject is omitted option will be initialized to an empty object
-             * otherwise will be set to initObject.
-             */
-            init(initObject?: any): void
-
-            /**
-             * Returns the options as an array of command line parameters.
-             */
-            flags: grunt.IFlag[]
-        }
-
-    }
-
-    namespace task {
-
-        /**
-         * {@link http://gruntjs.com/api/grunt.task}
-         */
-        interface CommonTaskModule {
-
-            /**
-             * If a task list is specified, the new task will be an alias for one or more other tasks.
-             * Whenever this "alias task" is run, every specified task in taskList will be run, in the order specified.
-             * The taskList argument must be an array of tasks.
-             */
-            registerTask(taskName: string, taskList: string[]): void
-
-            /**
-             * If a description and taskFunction are passed, the specified function will be executed
-             * whenever the task is run.
-             *
-             * In addition, the specified description will be shown when grunt --help is run.
-             * Task-specific properties and methods are available inside the task function as properties
-             * of the this object. The task function can return false to indicate that the task has failed.
-             *
-             * @note taskFunction.apply(scope: grunt.task.ITask, args: any[])
-             */
-            registerTask(taskName: string, description: string, taskFunction: Function): void
-
-            /**
-             * Register a "multi task." A multi task is a task that implicitly iterates over all of its
-             * named sub-properties (AKA targets) if no target was specified.
-             * In addition to the default properties and methods, extra multi task-specific properties
-             * are available inside the task function as properties of the this object.
-             *
-             * @note taskFunction.apply(scope: grunt.task.IMultiTask<any>, args: any[])
-             */
-            registerMultiTask(taskName: string, taskFunction: Function): void
-            registerMultiTask(taskName: string, taskDescription: string, taskFunction: Function): void
-
-            /**
-             * Check with the name, if a task exists in the registered tasks.
-             * @param name The task name to check.
-             * @since 0.4.5
-             */
-            exists(name: string): boolean;
-
-            /**
-             * Rename a task. This might be useful if you want to override the default behavior of a task, while retaining the old name.
-             * Note that if a task has been renamed, the this.name and this.nameArgs properties will change accordingly.
-             * @see ITask
-             * @param oldname The previous name of the task.
-             * @param newname The new name for the task.
-             */
-            renameTask(oldname: string, newname: string): void
-        }
-
-        /**
-         * {@link http://gruntjs.com/api/grunt.task#queueing-tasks}
-         */
-        interface TaskModule extends CommonTaskModule {
-            /**
-             * Enqueue one or more tasks.
-             * Every specified task in taskList will be run immediately after the current task completes,
-             * in the order specified. The task list can be an array of tasks or individual task arguments.
-             */
-            run(tasks: string[]): void
-            run(task: string, ...thenTasks: string[]): void
-
-            /**
-             * Empty the task queue completely. Unless additional tasks are enqueued, no more tasks will be run.
-             */
-            clearQueue(): void
-
-            /**
-             * Normalizes a task target configuration object into an array of src-dest file mappings.
-             * This method is used internally by the multi task system this.files / grunt.task.current.files property.
-             */
-            normalizeMultiTaskFiles(data: grunt.config.IProjectConfig, targetname?: string): Array<grunt.file.IFileMap>
-
-            /**
-             * The currently running task or multitask.
-             * @see http://gruntjs.com/api/inside-tasks
-             */
-            current: grunt.task.IMultiTask<any>
-        }
-
-        interface AsyncResultCatcher {
-            /**
-             * Either false or an Error object may be passed to the done function
-             * to instruct Grunt that the task has failed.
-             */
-            (success: boolean): void;
-            (error: Error): void;
-            (result: any): void;
-            (): void;
-        }
-
-        /**
-         * @link http://gruntjs.com/inside-tasks
-         *
-         * Grunt version 0.4.x
-         */
-        interface ITask {
-
-            /**
-             * If a task is asynchronous, this method must be invoked to instruct Grunt to wait.
-             * It returns a handle to a "done" function that should be called when the task has completed.
-             *
-             *   // Tell Grunt this task is asynchronous.
-             *   var done = this.async();
-             *   // Your async code.
-             *   setTimeout(function() {
-             *     // Let's simulate an error, sometimes.
-             *     var success = Math.random() > 0.5;
-             *     // All done!
-             *     done(success);
-             *   }, 1000);
-             */
-            async(): AsyncResultCatcher
-
-            /**
-             * If one task depends on the successful completion of another task (or tasks),
-             * this method can be used to force Grunt to abort if the other task didn't run,
-             * or if the other task failed.
-             *
-             * @param tasks an array of task names or individual task names, as arguments.
-             * @note that this won't actually run the specified task(s),
-             * it will just fail the current task if they haven't already run successfully.
-             */
-            requires(tasks: string[]): void
-            requires(tasks: string, ...otherTasks: string[]): void
-            requires(tasks: string[], ...otherTasks: string[][]): void
-
-            /**
-             * Fail the current task if one or more required config properties is missing.
-             * One or more string or array config properties may be specified.
-             * this.requiresConfig(prop [, prop [, ...]])
-             */
-            requiresConfig(prop: string, ...andProps: string[]): void
-
-            /**
-             * The name of the task, as defined in grunt.registerTask.
-             * For example, if a "sample" task was run as grunt sample or grunt sample:foo,
-             * inside the task function, this.name would be "sample".
-             */
-            name: string
-
-            /**
-             * The name of the task, including any colon-separated arguments or flags specified on the command-line.
-             * For example, if a "sample" task was run as grunt sample:foo,
-             * inside the task function, this.nameArgs would be "sample:foo".
-             */
-            nameArgs: string
-
-            /**
-             * An array of arguments passed to the task.
-             * For example, if a "sample" task was run as grunt sample:foo:bar,
-             * inside the task function, this.args would be ["foo", "bar"].
-             */
-            args: string[]
-
-            /**
-             * An object generated from the arguments passed to the task.
-             * For example, if a "sample" task was run as grunt sample:foo:bar,
-             * inside the task function, this.flags would be {foo: true, bar: true}.
-             */
-            flags: grunt.IFlag[]
-
-            /**
-             * The number of grunt.log.error calls that occurred during this task.
-             * This can be used to fail a task if errors were logged during the task.
-             */
-            errorCount: number
-
-            /**
-             * Returns an options object.
-             * Properties of the optional defaultsObj argument will be overridden by any task-level options
-             * object properties, which will be further overridden in multi tasks by any target-level
-             * options object properties.
-             */
-            options(defaultsObj: any): ITaskOptions
-            options<T>(defaultsObj: T): T
-        }
-
-        /**
-         * {@link http://gruntjs.com/inside-tasks#inside-multi-tasks}
-         */
-        interface IMultiTask<T> extends ITask {
-            /**
-             * In a multi task, this property contains the name of the target currently being iterated over.
-             * For example, if a "sample" multi task was run as grunt sample:foo with the config data
-             * {sample: {foo: "bar"}}, inside the task function, this.target would be "foo".
-             */
-            target: string
-
-            /**
-             * In a multi task, all files specified using any Grunt-supported file formats and options,
-             * globbing patterns or dynamic mappings will automatically be normalized into a single format:
-             * the Files Array file format.
-             *
-             * What this means is that tasks don't need to contain a ton of boilerplate for explicitly
-             * handling custom file formats, globbing patterns, mapping source files to destination files
-             * or filtering out files or directories. A task user can just specify files per the Configuring
-             * tasks guide, and Grunt will handle all the details.
-             *
-             * Your task should iterate over the this.files array, utilizing the src and dest properties of
-             * each object in that array. The this.files property will always be an array.
-             * The src property will also always be an array, in case your task cares about multiple source
-             * files per destination file.
-             *
-             * @note it's possible that nonexistent files might be included in src values,
-             *       so you may want to explicitly test that source files exist before using them.
-             */
-            files: grunt.file.IFilesArray
-
-            /**
-             * In a multi task, all src files files specified via any file format are reduced to a single array.
-             * If your task is "read only" and doesn't care about destination filepaths,
-             * use this array instead of this.files.
-             */
-            filesSrc: string[]
-
-            /**
-             * In a multi task, this is the actual data stored in the Grunt config object for the given target.
-             * For example, if a "sample" multi task was run as grunt sample:foo with the config data
-             * {sample: {foo: "bar"}}, inside the task function, this.data would be "bar".
-             *
-             * @note It is recommended that this.options this.files and this.filesSrc are used instead of this.data,
-             *       as their values are normalized.
-             */
-            data: T
-        }
-
-        /**
-         * {@link http://gruntjs.com/configuring-tasks}
-         *
-         * A TaskConfig can be either be a full config or a compacted files config.
-         * @see ITaskCompactOptions
-         */
-        interface ITaskOptions {
-
-            options?: any
-
-            // files?: grunt.file.IFilesArray
-            // files?: grunt.file.IFilesMap
-            files?: any
-        }
-
-        /**
-         * @see ITaskOptions
-         */
-        interface ITaskCompactOptions extends grunt.task.ITaskOptions, grunt.file.IFilesConfig {}
-    }
-
-    namespace template {
-
-        interface TemplateModule {
-
-            /**
-             * Process a Lo-Dash template string.
-             *
-             * The template argument will be processed recursively until there are no more templates to process.
-             *
-             * The default data object is the entire config object, but if options.data is set, that object will
-             * be used instead. The default template delimiters are <% %> but if options.delimiters is set to a
-             * custom delimiter name, those template delimiters will be used instead.
-             *
-             * Inside templates, the grunt object is exposed so that you can do things like:
-             *     <%= grunt.template.today('yyyy') %>
-             *
-             * @note if the data object already has a grunt property, the grunt API will not be accessible in templates.
-             */
-            process(template: string): (options: any) => string
-            process(template: string, options: any): string
-
-            /**
-             * Set the Lo-Dash template delimiters to a predefined set in case you grunt.util._.template
-             * needs to be called manually.
-             *
-             * The config delimiters <% %> are included by default.
-             */
-            setDelimiters(name: string): void
-
-            /**
-             * Add a named set of Lo-Dash template delimiters.
-             *
-             * You probably won't need to use this method, because the built-in delimiters should be sufficient,
-             * but you could always add {% %} or [% %] style delimiters.
-             */
-            addDelimiters(name: string, opener: string, closer: string): void
-
-            /**
-             * Format a date using the dateformat library.
-             * {@link http://github.com/felixge/node-dateformat}
-             *
-             * @note if you don't include the mask argument, dateFormat.masks.default is used
-             */
-            date(date?: Date, format?: string): string
-            date(date?: number, format?: string): string
-            date(date?: string, format?: string): string
-
-            /**
-             * Format today's date using the dateformat library using the current date and time.
-             * {@link http://github.com/felixge/node-dateformat}
-             *
-             * @note if you don't include the mask argument, dateFormat.masks.default is used
-             */
-            today(format?: string): string
-        }
-    }
-
-    namespace util {
-
-        /**
-         * {@link http://gruntjs.com/api/grunt.util}
-         */
-        interface UtilModule {
-
-            /**
-             * Return the "kind" of a value. Like typeof but returns the internal [Class](Class/) value.
-             * Possible results are "number", "string", "boolean", "function", "regexp", "array", "date",
-             * "error", "null", "undefined" and the catch-all "object".
-             */
-            kindOf(value: any): string
-
-            /**
-             * Return a new Error instance (that can be thrown) with the appropriate message.
-             * If an Error object is specified instead of message that object will be returned.
-             * Also, if an Error object is specified for origError and Grunt was run with the --debug 9 option,
-             * the original Error stack will be dumped.
-             */
-            error(message: string, origError?: Error): Error
-            error(error: Error, origError?: Error): Error
-            error(error: any, origError?: Error): Error
-
-            /**
-             * The linefeed character, normalized for the current operating system.
-             * (\r\n on Windows, \n otherwise)
-             */
-            linefeed: string
-
-            /**
-             * Given a string, return a new string with all the linefeeds normalized for the current operating system.
-             * (\r\n on Windows, \n otherwise)
-             */
-            normalizelf(str: string): string
-
-            /**
-             * Recurse through nested objects and arrays, executing callbackFunction for each non-object value.
-             * If continueFunction returns false, a given object or value will be skipped.
-             */
-            recurse(object: any, callbackFunction: (value: any) => void, continueFunction: (objOrValue: any) => boolean): void
-
-            /**
-             * Return string str repeated n times.
-             */
-            repeat(n: number, str: string): string
-
-            /**
-             * Given str of "a/b", If n is 1, return "a" otherwise "b".
-             * You can specify a custom separator if '/' doesn't work for you.
-             */
-            pluralize(n: number, str: string, separator?: string): string
-
-            /**
-             * Spawn a child process, keeping track of its stdout, stderr and exit code.
-             * The method returns a reference to the spawned child.
-             * When the child exits, the done function is called.
-             *
-             * @param done a function with arguments:
-             *        error  - If the exit code was non-zero and a fallback wasn't specified,
-             *                 an Error object, otherwise null.
-             *        result - The result object is an
-             *        code   - The numeric exit code.
-             */
-            spawn(options: ISpawnOptions, done: (error: Error, result: ISpawnResult, code: number) => void): ISpawnedChild
-
-            /**
-             * Given an array or array-like object, return an array.
-             * Great for converting arguments objects into arrays.
-             */
-            toArray<T>(arrayLikeObject: any): T[]
-
-            /**
-             * Normalizes both "returns a value" and "passes result to a callback" functions to always
-             * pass a result to the specified callback. If the original function returns a value,
-             * that value will now be passed to the callback, which is specified as the last argument,
-             * after all other predefined arguments. If the original function passed a value to a callback,
-             * it will continue to do so.
-             */
-            callbackify<R>(syncOrAsyncFunction: () => R):
-                (callback: (result: R) => void) => void
-            callbackify<A, R>(syncOrAsyncFunction: (a: A) => R):
-                (a: A, callback: (result: R) => void) => void
-            callbackify<A, B, R>(syncOrAsyncFunction: (a: A, b: B) => R):
-                (a: A, b: B, callback: (result: R) => void) => void
-            callbackify<A, B, C, R>(syncOrAsyncFunction: (a: A, b: B, c: C) => R):
-                (a: A, b: B, c: C, callback: (result: R) => void) => void
-            callbackify<A, B, C, D, R>(syncOrAsyncFunction: (a: A, b: B, c: C, d: D) => R):
-                (a: A, b: B, c: C, d: D, callback: (result: R) => void) => void
-
-            // Internal libraries
-            namespace: any
-            task: any
-        }
-
-        /**
-         * {@link http://gruntjs.com/api/grunt.util#grunt.util.spawn}
-         */
-        interface ISpawnOptions {
-
-            /**
-             * The command to execute. It should be in the system path.
-             */
-            cmd?: string
-
-            /**
-             * If specified, the same grunt bin that is currently running will be
-             * spawned as the child command, instead of the "cmd" option.
-             * Defaults to false.
-             */
-            grunt?: boolean
-
-            /**
-             * An array of arguments to pass to the command.
-             */
-            args?: string[]
-
-            /**
-             * Additional options for the Node.js child_process spawn method.
-             */
-            opts?: {
-                cwd?: string
-                stdio?: any
-                custom?: any
-                env?: any
-                detached?: boolean
-            }
-
-            /**
-             * If this value is set and an error occurs, it will be used as the value
-             * and null will be passed as the error value.
-             */
-            fallback?: any
-        }
-
-        /**
-         * @note When result is coerced to a string, the value is stdout if the exit code
-         *       was zero, the fallback if the exit code was non-zero and a fallback was
-         *       specified, or stderr if the exit code was non-zero and a fallback was
-         *       not specified.
-         */
-        interface ISpawnResult {
-            stdout: string
-            stderr: string
-            code: number
-        }
-
-        /**
-         * {@link http://github.com/snbartell/node-spawn}
-         */
-        interface ISpawnedChild {
-            /**
-             * Start the cmd with the options provided.
-             */
-            start(): void
-
-            /**
-             * Convenience function. Overrides options. restarts to 0.
-             * Runs command exactly once no matter the options passed into the constructor.
-             */
-            once(): void
-
-            /**
-             * Convenience function. Overrides options.restarts to -1.
-             * Runs command indefinitely no matter the options passed into the constructor.
-             */
-            forever(): void
-
-            /**
-             * Shut down the child and don't let it restart.
-             */
-            kill(): void
-        }
-    }
-
-    /*
-     * Common interfaces
-     */
-
-    interface IFlag {
-        [flag: string]: boolean
-    }
-
-    /*
-     * Grunt module mixins.
-     */
-
-    interface IConfigComponents extends grunt.config.ConfigModule {
-        /**
-         * An alias
-         * @see grunt.config.ConfigModule.init
-         */
-        initConfig(config: grunt.config.IProjectConfig): void
-    }
-
-    interface ITaskComponents extends grunt.task.CommonTaskModule {
-        /**
-         * Load task-related files from the specified directory, relative to the Gruntfile.
-         * This method can be used to load task-related files from a local Grunt plugin by
-         * specifying the path to that plugin's "tasks" subdirectory.
-         */
-        loadTasks(tasksPath: string): void
-
-        /**
-         * Load tasks from the specified Grunt plugin.
-         * This plugin must be installed locally via npm, and must be relative to the Gruntfile.
-         * Grunt plugins can be created by using the grunt-init gruntplugin template: grunt init:gruntplugin.
-         */
-        loadNpmTasks(pluginName: string): void
-    }
-}
-
-/* GRUNT MODULE
- **************/
-
-/**
- * The main Grunt module.
- *
- * {@link http://gruntjs.com/api/grunt}
- */
-interface IGrunt extends grunt.IConfigComponents, grunt.fail.FailModule, grunt.ITaskComponents {
-
-    config: grunt.config.ConfigModule
-
-    event: grunt.event.EventModule
-
-    fail: grunt.fail.FailModule
-
-    file: grunt.file.FileModule
-
-    log: grunt.log.LogModule
-
-    option: grunt.option.OptionModule
-
-    task: grunt.task.TaskModule
-
-    template: grunt.template.TemplateModule
-
-    util: grunt.util.UtilModule
-
-    /**
-     * The current Grunt package.json metadata, as an object.
-     */
-    package: node.NodePackage
-
-    /**
-     * The current Grunt version, as a string. This is just a shortcut to the grunt.package.version property.
-     */
-    version: string
-}
-
-// NodeJS Support
-declare module 'grunt' {
-    var grunt: IGrunt;
-    export = grunt;
-}
diff --git a/gsap/TweenLite.d.ts b/gsap/TweenLite.d.ts
index b153297658..440182f76b 100644
--- a/gsap/TweenLite.d.ts
+++ b/gsap/TweenLite.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: VILIC VANE <https://vilic.github.io/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="Core.d.ts" />
-/// <reference path="Ease.d.ts" />
+
+
 
 declare class TweenLite {
     constructor(target: any, duration: number, vars: any);
diff --git a/gsap/gsap-tests.ts b/gsap/gsap-tests.ts
index 824e149f7e..885e00c765 100644
--- a/gsap/gsap-tests.ts
+++ b/gsap/gsap-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="TweenLite.d.ts" />
+
 
 var tween = TweenLite
     .to(document.getElementById('some-div'), 1, {
diff --git a/gulp-autoprefixer/gulp-autoprefixer-tests.ts b/gulp-autoprefixer/gulp-autoprefixer-tests.ts
index 1b3ba0d535..386e1a882a 100644
--- a/gulp-autoprefixer/gulp-autoprefixer-tests.ts
+++ b/gulp-autoprefixer/gulp-autoprefixer-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./gulp-autoprefixer.d.ts"/>
-/// <reference path="../gulp/gulp.d.ts"/>
 import * as gulp from "gulp";
 import * as autoprefixer from "gulp-autoprefixer";
 
diff --git a/gulp-autoprefixer/gulp-autoprefixer.d.ts b/gulp-autoprefixer/gulp-autoprefixer.d.ts
deleted file mode 100644
index a3b96bdb4a..0000000000
--- a/gulp-autoprefixer/gulp-autoprefixer.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Type definitions for gulp-autoprefixer
-// Project: https://github.com/sindresorhus/gulp-autoprefixer
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare module "gulp-autoprefixer" {
-    namespace autoPrefixer {
-        interface Options {
-            browsers?: string[];
-            cascade?: boolean;
-            remove?: boolean;
-        }
-    }
-
-    function autoPrefixer(opts?: autoPrefixer.Options): NodeJS.ReadWriteStream;
-
-    export = autoPrefixer;
-}
diff --git a/gulp-autoprefixer/index.d.ts b/gulp-autoprefixer/index.d.ts
new file mode 100644
index 0000000000..69f930c89c
--- /dev/null
+++ b/gulp-autoprefixer/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for gulp-autoprefixer
+// Project: https://github.com/sindresorhus/gulp-autoprefixer
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+declare namespace autoPrefixer {
+    interface Options {
+        browsers?: string[];
+        cascade?: boolean;
+        remove?: boolean;
+    }
+}
+
+declare function autoPrefixer(opts?: autoPrefixer.Options): NodeJS.ReadWriteStream;
+
+export = autoPrefixer;
diff --git a/gulp-autoprefixer/tsconfig.json b/gulp-autoprefixer/tsconfig.json
new file mode 100644
index 0000000000..595c60a416
--- /dev/null
+++ b/gulp-autoprefixer/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-autoprefixer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-babel/gulp-babel-tests.ts b/gulp-babel/gulp-babel-tests.ts
index e5daf3617a..b705c68850 100644
--- a/gulp-babel/gulp-babel-tests.ts
+++ b/gulp-babel/gulp-babel-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../node/node.d.ts" />
-/// <reference path="./gulp-babel.d.ts" />
+/// <reference types="node" />
 
 import babel = require('gulp-babel');
 
diff --git a/gulp-babel/gulp-babel.d.ts b/gulp-babel/gulp-babel.d.ts
deleted file mode 100644
index 954ddae69d..0000000000
--- a/gulp-babel/gulp-babel.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// Type definitions for gulp-babel 6.1.0
-// Project: https://github.com/babel/gulp-babel
-// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'gulp-babel' {
-	function babel(options?: {
-		filename?: string,
-		filenameRelative?: string,
-		presets?: string[],
-		plugins?: string[],
-		highlightCode?: boolean,
-		only?: string | string[],
-		ignore?: string | string[],
-		auxiliaryCommentBefore?: any,
-		auxiliaryCommentAfter?: any,
-		sourceMaps?: any,
-		inputSourceMap?: any,
-		sourceMapTarget?: any,
-		sourceFileName?: any,
-		sourceRoot?: any,
-		moduleRoot?: any,
-		moduleIds?: any,
-		moduleId?: any,
-		getModuleId?: any,
-		resolveModuleSource?: any,
-		keepModuleIdExtesions?: boolean,
-		code?: boolean,
-		ast?: boolean,
-		compact?: any,
-		comments?: boolean,
-		shouldPrintComment?: any,
-		env?: any,
-		retainLines?: boolean
-	}): NodeJS.ReadWriteStream;
-
-	namespace babel { }
-
-	export = babel;
-}
diff --git a/gulp-babel/index.d.ts b/gulp-babel/index.d.ts
new file mode 100644
index 0000000000..e320d1c6f1
--- /dev/null
+++ b/gulp-babel/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for gulp-babel 6.1.0
+// Project: https://github.com/babel/gulp-babel
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+declare function babel(options?: {
+    filename?: string,
+    filenameRelative?: string,
+    presets?: string[],
+    plugins?: string[],
+    highlightCode?: boolean,
+    only?: string | string[],
+    ignore?: string | string[],
+    auxiliaryCommentBefore?: any,
+    auxiliaryCommentAfter?: any,
+    sourceMaps?: any,
+    inputSourceMap?: any,
+    sourceMapTarget?: any,
+    sourceFileName?: any,
+    sourceRoot?: any,
+    moduleRoot?: any,
+    moduleIds?: any,
+    moduleId?: any,
+    getModuleId?: any,
+    resolveModuleSource?: any,
+    keepModuleIdExtesions?: boolean,
+    code?: boolean,
+    ast?: boolean,
+    compact?: any,
+    comments?: boolean,
+    shouldPrintComment?: any,
+    env?: any,
+    retainLines?: boolean
+}): NodeJS.ReadWriteStream;
+
+declare namespace babel { }
+
+export = babel;
diff --git a/gulp-babel/tsconfig.json b/gulp-babel/tsconfig.json
new file mode 100644
index 0000000000..62316f3054
--- /dev/null
+++ b/gulp-babel/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-babel-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-cached/gulp-cached-tests.ts b/gulp-cached/gulp-cached-tests.ts
index 42a6697388..13b9f9c2d5 100644
--- a/gulp-cached/gulp-cached-tests.ts
+++ b/gulp-cached/gulp-cached-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="./gulp-cached.d.ts" />
-
 import * as gulp from "gulp";
 import cached = require("gulp-cached");
 
diff --git a/gulp-cached/gulp-cached.d.ts b/gulp-cached/gulp-cached.d.ts
deleted file mode 100644
index c82876ca78..0000000000
--- a/gulp-cached/gulp-cached.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-// Type definitions for gulp-cached
-// Project: https://github.com/wearefractal/gulp-cached
-// Definitions by: Thomas Corbière <https://github.com/tomc974>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare module "gulp-cached"
-{
-    interface ICacheStore
-    {
-        [name: string]: {};
-    }
-
-    interface IOptions
-    {
-        /**
-         * Uses md5 instead of storing the whole file contents.
-         * @default false
-         */
-        optimizeMemory?: boolean;
-    }
-
-    interface IGulpCached
-    {
-        /**
-         * Creates a new cache hash or uses an existing one.
-         */
-        (name: string, options?: IOptions): NodeJS.ReadWriteStream;
-
-        /**
-         * Cache store.
-         */
-        caches: ICacheStore;
-    }
-
-    const cached: IGulpCached;
-    export = cached;
-}
diff --git a/gulp-cached/index.d.ts b/gulp-cached/index.d.ts
new file mode 100644
index 0000000000..bda6f1978d
--- /dev/null
+++ b/gulp-cached/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for gulp-cached
+// Project: https://github.com/wearefractal/gulp-cached
+// Definitions by: Thomas Corbière <https://github.com/tomc974>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+interface ICacheStore {
+    [name: string]: {};
+}
+
+interface IOptions {
+    /**
+     * Uses md5 instead of storing the whole file contents.
+     * @default false
+     */
+    optimizeMemory?: boolean;
+}
+
+interface IGulpCached {
+    /**
+     * Creates a new cache hash or uses an existing one.
+     */
+    (name: string, options?: IOptions): NodeJS.ReadWriteStream;
+
+    /**
+     * Cache store.
+     */
+    caches: ICacheStore;
+}
+
+declare const cached: IGulpCached;
+export = cached;
diff --git a/gulp-cached/tsconfig.json b/gulp-cached/tsconfig.json
new file mode 100644
index 0000000000..a94388ff62
--- /dev/null
+++ b/gulp-cached/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-cached-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-changed/gulp-changed-tests.ts b/gulp-changed/gulp-changed-tests.ts
index dae92e0fd8..572e46ebb2 100644
--- a/gulp-changed/gulp-changed-tests.ts
+++ b/gulp-changed/gulp-changed-tests.ts
@@ -1,7 +1,3 @@
-/// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="./gulp-changed.d.ts" />
-/// <reference path="../gulp-minify-html/gulp-minify-html.d.ts" />
-
 import * as gulp from "gulp";
 import changed = require("gulp-changed");
 import minifyHtml = require("gulp-minify-html");
diff --git a/gulp-changed/gulp-changed.d.ts b/gulp-changed/gulp-changed.d.ts
deleted file mode 100644
index bbe1a26450..0000000000
--- a/gulp-changed/gulp-changed.d.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-// Type definitions for gulp-changed
-// Project: https://github.com/sindresorhus/gulp-changed
-// Definitions by: Thomas Corbière <https://github.com/tomc974>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-/// <reference path="../vinyl/vinyl.d.ts"/>
-
-declare module "gulp-changed"
-{
-    import { Transform } from "stream";
-    import File = require("vinyl");
-
-    interface IComparator
-    {
-        /**
-         * @param stream Should be used to queue sourceFile if it passes some comparison
-         * @param callback Should be called when done
-         * @param sourceFile File to operate on
-         * @param destPath Destination for sourceFile as an absolute path
-         */
-        (stream: Transform, callback: Function, sourceFile: File, destPath: string): void;
-    }
-
-    interface IDestination
-    {
-        (file: string|Buffer): string;
-    }
-
-    interface IOptions
-    {
-        /**
-         * The working directory the folder is relative to.
-         * @default process.cwd()
-         */
-        cwd?: string;
-
-        /**
-         * Extension of the destination files.
-         */
-        extension?: string;
-
-        /**
-         * Function that determines whether the source file is different from the destination file.
-         * @default changed.compareLastModifiedTime
-         */
-        hasChanged?: IComparator;
-    }
-
-    interface IGulpChanged
-    {
-        (destination: string|IDestination, options?: IOptions): NodeJS.ReadWriteStream;
-
-        compareLastModifiedTime: IComparator;
-        compareSha1Digest: IComparator;
-    }
-
-    const changed: IGulpChanged;
-    export = changed;
-}
diff --git a/gulp-changed/index.d.ts b/gulp-changed/index.d.ts
new file mode 100644
index 0000000000..9b4e4ea9f9
--- /dev/null
+++ b/gulp-changed/index.d.ts
@@ -0,0 +1,52 @@
+// Type definitions for gulp-changed
+// Project: https://github.com/sindresorhus/gulp-changed
+// Definitions by: Thomas Corbière <https://github.com/tomc974>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+import { Transform } from "stream";
+import File = require("../vinyl");
+
+interface IComparator {
+    /**
+     * @param stream Should be used to queue sourceFile if it passes some comparison
+     * @param callback Should be called when done
+     * @param sourceFile File to operate on
+     * @param destPath Destination for sourceFile as an absolute path
+     */
+    (stream: Transform, callback: Function, sourceFile: File, destPath: string): void;
+}
+
+interface IDestination {
+    (file: string | Buffer): string;
+}
+
+interface IOptions {
+    /**
+     * The working directory the folder is relative to.
+     * @default process.cwd()
+     */
+    cwd?: string;
+
+    /**
+     * Extension of the destination files.
+     */
+    extension?: string;
+
+    /**
+     * Function that determines whether the source file is different from the destination file.
+     * @default changed.compareLastModifiedTime
+     */
+    hasChanged?: IComparator;
+}
+
+interface IGulpChanged {
+    (destination: string | IDestination, options?: IOptions): NodeJS.ReadWriteStream;
+
+    compareLastModifiedTime: IComparator;
+    compareSha1Digest: IComparator;
+}
+
+declare const changed: IGulpChanged;
+export = changed;
diff --git a/gulp-changed/tsconfig.json b/gulp-changed/tsconfig.json
new file mode 100644
index 0000000000..dce5c40541
--- /dev/null
+++ b/gulp-changed/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-changed-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-cheerio/gulp-cheerio-tests.ts b/gulp-cheerio/gulp-cheerio-tests.ts
index 8a32c57d21..d31c0c51dc 100644
--- a/gulp-cheerio/gulp-cheerio-tests.ts
+++ b/gulp-cheerio/gulp-cheerio-tests.ts
@@ -1,11 +1,10 @@
-/// <reference path="gulp-cheerio.d.ts" />
-/// <reference path="../vinyl/vinyl.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="../cheerio/cheerio.d.ts" />
+
+
+/// <reference types="cheerio" />
 
 import cheerio = require('gulp-cheerio');
 import gulp = require('gulp');
-import Vinyl = require('vinyl');
+import Vinyl = require('../vinyl');
 
 //
 // There are two ways to use gulp-cheerio: synchronous and asynchronous. See the following usage examples:
diff --git a/gulp-cheerio/gulp-cheerio.d.ts b/gulp-cheerio/gulp-cheerio.d.ts
deleted file mode 100644
index 2aec1d07da..0000000000
--- a/gulp-cheerio/gulp-cheerio.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// Type definitions for gulp-cheerio
-// Project: https://github.com/KenPowers/gulp-cheerio
-// Definitions by: Qubo <https://github.com/tkQubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../cheerio/cheerio.d.ts" />
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../vinyl/vinyl.d.ts"/>
-
-declare module "gulp-cheerio" {
-    import Vinyl = require('vinyl');
-
-    namespace cheerio {
-        interface Cheerio {
-            (callback: Callback): NodeJS.ReadWriteStream;
-            (option: Option): NodeJS.ReadWriteStream;
-        }
-
-        interface Callback {
-            ($: CheerioStatic, file: Vinyl, done?: Function): any;
-        }
-
-        interface Option {
-            run?: Callback;
-            parserOptions?: CheerioOptionsInterface;
-            cheerio?: CheerioStatic;
-        }
-    }
-
-    var cheerio: cheerio.Cheerio;
-
-    export = cheerio;
-}
-
diff --git a/gulp-cheerio/index.d.ts b/gulp-cheerio/index.d.ts
new file mode 100644
index 0000000000..f522fcf5b6
--- /dev/null
+++ b/gulp-cheerio/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for gulp-cheerio
+// Project: https://github.com/KenPowers/gulp-cheerio
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="cheerio" />
+/// <reference types="node" />
+
+import Vinyl = require('../vinyl');
+
+declare namespace cheerio {
+    interface Cheerio {
+        (callback: Callback): NodeJS.ReadWriteStream;
+        (option: Option): NodeJS.ReadWriteStream;
+    }
+
+    interface Callback {
+        ($: CheerioStatic, file: Vinyl, done?: Function): any;
+    }
+
+    interface Option {
+        run?: Callback;
+        parserOptions?: CheerioOptionsInterface;
+        cheerio?: CheerioStatic;
+    }
+}
+
+declare var cheerio: cheerio.Cheerio;
+
+export = cheerio;
diff --git a/gulp-cheerio/tsconfig.json b/gulp-cheerio/tsconfig.json
new file mode 100644
index 0000000000..11ccb1bd19
--- /dev/null
+++ b/gulp-cheerio/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-cheerio-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-coffeeify/gulp-coffeeify-tests.ts b/gulp-coffeeify/gulp-coffeeify-tests.ts
index 6624285637..74f1beaa96 100644
--- a/gulp-coffeeify/gulp-coffeeify-tests.ts
+++ b/gulp-coffeeify/gulp-coffeeify-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="gulp-coffeeify.d.ts" />
-
 import gulp = require('gulp');
 import coffeeify = require('gulp-coffeeify');
 
diff --git a/gulp-coffeeify/gulp-coffeeify.d.ts b/gulp-coffeeify/gulp-coffeeify.d.ts
deleted file mode 100644
index 6f49453d62..0000000000
--- a/gulp-coffeeify/gulp-coffeeify.d.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-// Type definitions for gulp-coffeeify
-// Project: https://github.com/nariyu/gulp-coffeeify
-// Definitions by: Qubo <https://github.com/tkQubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "gulp-coffeeify" {
-	namespace coffeeify {
-		interface Coffeeify {
-			(option?: Option): NodeJS.ReadWriteStream;
-		}
-
-		interface Option {
-			options?: {
-				debug?: boolean;
-				paths?: string[];
-			},
-			/**
-			 * [DEPRECATED]: You should use a 'paths' options of browserify.
-			 */
-			aliases?: Aliases;
-			/**
-			 * [DEPRECATED]
-			 */
-			transforms?: Transforms;
-		}
-
-		interface Aliases {
-			cwd?: string;
-			base?: string;
-		}
-
-		interface Transforms {
-			ext?: string;
-			transform?(data: string): string;
-		}
-	}
-
-	var coffeeify: coffeeify.Coffeeify;
-
-	export = coffeeify;
-}
-
diff --git a/gulp-coffeeify/index.d.ts b/gulp-coffeeify/index.d.ts
new file mode 100644
index 0000000000..161eb9376d
--- /dev/null
+++ b/gulp-coffeeify/index.d.ts
@@ -0,0 +1,42 @@
+// Type definitions for gulp-coffeeify
+// Project: https://github.com/nariyu/gulp-coffeeify
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+declare namespace coffeeify {
+    interface Coffeeify {
+        (option?: Option): NodeJS.ReadWriteStream;
+    }
+
+    interface Option {
+        options?: {
+            debug?: boolean;
+            paths?: string[];
+        },
+        /**
+         * [DEPRECATED]: You should use a 'paths' options of browserify.
+         */
+        aliases?: Aliases;
+        /**
+         * [DEPRECATED]
+         */
+        transforms?: Transforms;
+    }
+
+    interface Aliases {
+        cwd?: string;
+        base?: string;
+    }
+
+    interface Transforms {
+        ext?: string;
+        transform?(data: string): string;
+    }
+}
+
+declare var coffeeify: coffeeify.Coffeeify;
+
+export = coffeeify;
diff --git a/gulp-coffeeify/tsconfig.json b/gulp-coffeeify/tsconfig.json
new file mode 100644
index 0000000000..435fbca423
--- /dev/null
+++ b/gulp-coffeeify/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-coffeeify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-coffeelint/gulp-coffeelint-tests.ts b/gulp-coffeelint/gulp-coffeelint-tests.ts
index 0022f9888f..5d18b98862 100644
--- a/gulp-coffeelint/gulp-coffeelint-tests.ts
+++ b/gulp-coffeelint/gulp-coffeelint-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="gulp-coffeelint.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import coffeelint = require('gulp-coffeelint');
 import gulp = require('gulp');
diff --git a/gulp-coffeelint/gulp-coffeelint.d.ts b/gulp-coffeelint/gulp-coffeelint.d.ts
deleted file mode 100644
index f4e8c1ef77..0000000000
--- a/gulp-coffeelint/gulp-coffeelint.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// Type definitions for gulp-coffeelint
-// Project: https://github.com/janraasch/gulp-coffeelint
-// Definitions by: Qubo <https://github.com/tkQubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "gulp-coffeelint" {
-    namespace coffeelint {
-        interface Coffeelint {
-            /**
-             * @param optFile Absolute path of a json file containing options for coffeelint.
-             * @param opt Options you wish to send to coffeelint. If optFile is given, this will be ignored.
-             * @param literate Are we dealing with Literate CoffeeScript?
-             * @param rules Add custom rules to coffeelint.
-             */
-            (optFile?: string, opt?: any, literate?: boolean, rules?: Function[]): NodeJS.ReadWriteStream;
-            reporter(reporter?: string|Function): NodeJS.ReadWriteStream;
-        }
-    }
-
-    var coffeelint: coffeelint.Coffeelint;
-
-    export = coffeelint;
-}
-
diff --git a/gulp-coffeelint/index.d.ts b/gulp-coffeelint/index.d.ts
new file mode 100644
index 0000000000..0d0dceb33c
--- /dev/null
+++ b/gulp-coffeelint/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for gulp-coffeelint
+// Project: https://github.com/janraasch/gulp-coffeelint
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+declare namespace coffeelint {
+    interface Coffeelint {
+        /**
+         * @param optFile Absolute path of a json file containing options for coffeelint.
+         * @param opt Options you wish to send to coffeelint. If optFile is given, this will be ignored.
+         * @param literate Are we dealing with Literate CoffeeScript?
+         * @param rules Add custom rules to coffeelint.
+         */
+        (optFile?: string, opt?: any, literate?: boolean, rules?: Function[]): NodeJS.ReadWriteStream;
+        reporter(reporter?: string | Function): NodeJS.ReadWriteStream;
+    }
+}
+
+declare var coffeelint: coffeelint.Coffeelint;
+
+export = coffeelint;
diff --git a/gulp-coffeelint/tsconfig.json b/gulp-coffeelint/tsconfig.json
new file mode 100644
index 0000000000..abfebbbdaf
--- /dev/null
+++ b/gulp-coffeelint/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-coffeelint-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-concat/gulp-concat-tests.ts b/gulp-concat/gulp-concat-tests.ts
index f8ef7373da..172aa61451 100644
--- a/gulp-concat/gulp-concat-tests.ts
+++ b/gulp-concat/gulp-concat-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="./gulp-concat.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import gulp = require("gulp");
 import * as concat from "gulp-concat";
diff --git a/gulp-concat/gulp-concat.d.ts b/gulp-concat/gulp-concat.d.ts
deleted file mode 100644
index 8965a80a73..0000000000
--- a/gulp-concat/gulp-concat.d.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-// Type definitions for gulp-concat
-// Project: http://github.com/wearefractal/gulp-concat
-// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "gulp-concat" {
-
-    interface IOptions {
-        newLine: string;
-    }
-
-    interface IFsStats {
-        dev?: number;
-        ino?: number;
-        mode?: number;
-        nlink?: number;
-        uid?: number;
-        gid?: number;
-        rdev?: number;
-        size?: number;
-        blksize?: number;
-        blocks?: number;
-        atime?: Date;
-        mtime?: Date;
-        ctime?: Date;
-    }
-
-    interface IVinylOptions {
-        cwd?: string;
-        base?: string;
-        path?: string;
-        stat?: IFsStats;
-        contents?: NodeJS.ReadableStream | Buffer;
-    }
-
-    interface IConcat {
-        (filename: string, options?: IOptions): NodeJS.ReadWriteStream;
-        (options: IVinylOptions): NodeJS.ReadWriteStream;
-    }
-
-    var _tmp: IConcat;
-    export = _tmp;
-}
diff --git a/gulp-concat/index.d.ts b/gulp-concat/index.d.ts
new file mode 100644
index 0000000000..74155f6b4c
--- /dev/null
+++ b/gulp-concat/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for gulp-concat
+// Project: http://github.com/wearefractal/gulp-concat
+// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+interface IOptions {
+    newLine: string;
+}
+
+interface IFsStats {
+    dev?: number;
+    ino?: number;
+    mode?: number;
+    nlink?: number;
+    uid?: number;
+    gid?: number;
+    rdev?: number;
+    size?: number;
+    blksize?: number;
+    blocks?: number;
+    atime?: Date;
+    mtime?: Date;
+    ctime?: Date;
+}
+
+interface IVinylOptions {
+    cwd?: string;
+    base?: string;
+    path?: string;
+    stat?: IFsStats;
+    contents?: NodeJS.ReadableStream | Buffer;
+}
+
+interface IConcat {
+    (filename: string, options?: IOptions): NodeJS.ReadWriteStream;
+    (options: IVinylOptions): NodeJS.ReadWriteStream;
+}
+
+declare var _tmp: IConcat;
+export = _tmp;
diff --git a/gulp-concat/tsconfig.json b/gulp-concat/tsconfig.json
new file mode 100644
index 0000000000..c36d1d127a
--- /dev/null
+++ b/gulp-concat/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-concat-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-csso/gulp-csso-tests.ts b/gulp-csso/gulp-csso-tests.ts
index 0ddf457c7d..8595a92ce8 100644
--- a/gulp-csso/gulp-csso-tests.ts
+++ b/gulp-csso/gulp-csso-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="gulp-csso.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import * as gulp from 'gulp';
 import * as csso from 'gulp-csso';
diff --git a/gulp-csso/gulp-csso.d.ts b/gulp-csso/gulp-csso.d.ts
deleted file mode 100644
index 299cf4f989..0000000000
--- a/gulp-csso/gulp-csso.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for gulp-csso v1.0.0
-// Project: https://github.com/ben-eb/gulp-csso
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'gulp-csso' {
-    function csso(structureMinimization?: boolean): NodeJS.ReadWriteStream;
-    namespace csso {}
-    export = csso;
-}
diff --git a/gulp-csso/index.d.ts b/gulp-csso/index.d.ts
new file mode 100644
index 0000000000..8b8f8cb9e0
--- /dev/null
+++ b/gulp-csso/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for gulp-csso v1.0.0
+// Project: https://github.com/ben-eb/gulp-csso
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+declare function csso(structureMinimization?: boolean): NodeJS.ReadWriteStream;
+declare namespace csso { }
+export = csso;
diff --git a/gulp-csso/tsconfig.json b/gulp-csso/tsconfig.json
new file mode 100644
index 0000000000..403272527a
--- /dev/null
+++ b/gulp-csso/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-csso-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-debug/gulp-debug-tests.ts b/gulp-debug/gulp-debug-tests.ts
index 9701074101..d5c8a6d52b 100644
--- a/gulp-debug/gulp-debug-tests.ts
+++ b/gulp-debug/gulp-debug-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="gulp-debug.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import * as gulp from 'gulp';
 import * as debug from 'gulp-debug';
diff --git a/gulp-debug/gulp-debug.d.ts b/gulp-debug/gulp-debug.d.ts
deleted file mode 100644
index 11641d7b62..0000000000
--- a/gulp-debug/gulp-debug.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Type definitions for gulp-debug v2.0.1
-// Project: https://github.com/sindresorhus/gulp-debug
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'gulp-debug' {
-    interface IOptions {
-        title?: string;
-        minimal?: boolean;
-    }
-
-    function debug(options?: IOptions): NodeJS.ReadWriteStream;
-
-    namespace debug {}
-
-    export = debug;
-}
diff --git a/gulp-debug/index.d.ts b/gulp-debug/index.d.ts
new file mode 100644
index 0000000000..904f8ad22e
--- /dev/null
+++ b/gulp-debug/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for gulp-debug v2.0.1
+// Project: https://github.com/sindresorhus/gulp-debug
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+interface IOptions {
+    title?: string;
+    minimal?: boolean;
+}
+
+declare function debug(options?: IOptions): NodeJS.ReadWriteStream;
+
+declare namespace debug { }
+
+export = debug;
diff --git a/gulp-debug/tsconfig.json b/gulp-debug/tsconfig.json
new file mode 100644
index 0000000000..1cc9f969b8
--- /dev/null
+++ b/gulp-debug/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-debug-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-dtsm/gulp-dtsm-tests.ts b/gulp-dtsm/gulp-dtsm-tests.ts
index 1eb5057380..54e12eff6a 100644
--- a/gulp-dtsm/gulp-dtsm-tests.ts
+++ b/gulp-dtsm/gulp-dtsm-tests.ts
@@ -1,6 +1,5 @@
-/// <reference path="./gulp-dtsm.d.ts" />
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+/// <reference types="node" />
 
 import * as dtsm from 'gulp-dtsm';
 import * as gulp from 'gulp';
diff --git a/gulp-dtsm/gulp-dtsm.d.ts b/gulp-dtsm/gulp-dtsm.d.ts
deleted file mode 100644
index 63da544062..0000000000
--- a/gulp-dtsm/gulp-dtsm.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// Type definitions for gulp-dtsm 0.0.0
-// Project: https://github.com/9joneg/gulp-dtsm
-// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "gulp-dtsm" {
-  function dtsm(): NodeJS.WritableStream;
-
-  namespace dtsm {}
-
-  export = dtsm;
-}
diff --git a/gulp-dtsm/index.d.ts b/gulp-dtsm/index.d.ts
new file mode 100644
index 0000000000..17817f9c09
--- /dev/null
+++ b/gulp-dtsm/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for gulp-dtsm 0.0.0
+// Project: https://github.com/9joneg/gulp-dtsm
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+declare function dtsm(): NodeJS.WritableStream;
+
+declare namespace dtsm { }
+
+export = dtsm;
diff --git a/gulp-dtsm/tsconfig.json b/gulp-dtsm/tsconfig.json
new file mode 100644
index 0000000000..3eac7df1de
--- /dev/null
+++ b/gulp-dtsm/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-dtsm-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-espower/gulp-espower-tests.ts b/gulp-espower/gulp-espower-tests.ts
index 9240ee82d9..9c04e1d3a0 100644
--- a/gulp-espower/gulp-espower-tests.ts
+++ b/gulp-espower/gulp-espower-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="gulp-espower.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 
 import espower = require('gulp-espower');
diff --git a/gulp-espower/gulp-espower.d.ts b/gulp-espower/gulp-espower.d.ts
deleted file mode 100644
index 7f2176ead1..0000000000
--- a/gulp-espower/gulp-espower.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// Type definitions for gulp-espower
-// Project: https://github.com/power-assert-js/gulp-espower
-// Definitions by: Qubo <https://github.com/tkQubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "gulp-espower" {
-
-    namespace espower {
-        interface Espower {
-            /**
-             * @param options Target patterns for power assert feature instrumentation.
-             */
-            (options?: Options): NodeJS.ReadWriteStream;
-        }
-
-        interface Options {
-            patterns: string[];
-        }
-    }
-
-    var espower: espower.Espower;
-
-    export = espower;
-}
-
diff --git a/gulp-espower/index.d.ts b/gulp-espower/index.d.ts
new file mode 100644
index 0000000000..9efc2c2555
--- /dev/null
+++ b/gulp-espower/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for gulp-espower
+// Project: https://github.com/power-assert-js/gulp-espower
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+declare namespace espower {
+    interface Espower {
+        /**
+         * @param options Target patterns for power assert feature instrumentation.
+         */
+        (options?: Options): NodeJS.ReadWriteStream;
+    }
+
+    interface Options {
+        patterns: string[];
+    }
+}
+
+declare var espower: espower.Espower;
+
+export = espower;
diff --git a/gulp-espower/tsconfig.json b/gulp-espower/tsconfig.json
new file mode 100644
index 0000000000..ee303e4674
--- /dev/null
+++ b/gulp-espower/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-espower-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-filter/gulp-filter-tests.ts b/gulp-filter/gulp-filter-tests.ts
index a542ef5485..903f4083f7 100644
--- a/gulp-filter/gulp-filter-tests.ts
+++ b/gulp-filter/gulp-filter-tests.ts
@@ -1,9 +1,3 @@
-/// <reference path="gulp-filter.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="../gulp-uglify/gulp-uglify.d.ts" />
-/// <reference path="../gulp-less/gulp-less.d.ts" />
-/// <reference path="../gulp-concat/gulp-concat.d.ts" />
-
 import * as gulp from 'gulp';
 import * as uglify from 'gulp-uglify';
 import * as less from 'gulp-less';
diff --git a/gulp-filter/gulp-filter.d.ts b/gulp-filter/gulp-filter.d.ts
deleted file mode 100644
index c841315563..0000000000
--- a/gulp-filter/gulp-filter.d.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// Type definitions for gulp-filter v3.0.1
-// Project: https://github.com/sindresorhus/gulp-filter
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../vinyl/vinyl.d.ts"/>
-/// <reference path="../minimatch/minimatch.d.ts"/>
-
-declare module 'gulp-filter' {
-  import File = require('vinyl');
-  import * as Minimatch from 'minimatch';
-
-  namespace filter {
-    interface FileFunction {
-      (file: File): boolean;
-    }
-
-    interface Options extends Minimatch.IOptions {
-      restore?: boolean;
-      passthrough?: boolean;
-    }
-
-    // A transform stream with a .restore object
-    interface Filter extends NodeJS.ReadWriteStream {
-      restore: NodeJS.ReadWriteStream
-    }
-  }
-
-  function filter(pattern: string | string[] | filter.FileFunction, options?: filter.Options): filter.Filter;
-
-  export = filter;
-}
diff --git a/gulp-filter/index.d.ts b/gulp-filter/index.d.ts
new file mode 100644
index 0000000000..ba95977024
--- /dev/null
+++ b/gulp-filter/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for gulp-filter v3.0.1
+// Project: https://github.com/sindresorhus/gulp-filter
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import File = require('vinyl');
+import * as Minimatch from 'minimatch';
+
+declare namespace filter {
+    interface FileFunction {
+        (file: File): boolean;
+    }
+
+    interface Options extends Minimatch.IOptions {
+        restore?: boolean;
+        passthrough?: boolean;
+    }
+
+    // A transform stream with a .restore object
+    interface Filter extends NodeJS.ReadWriteStream {
+        restore: NodeJS.ReadWriteStream
+    }
+}
+
+declare function filter(pattern: string | string[] | filter.FileFunction, options?: filter.Options): filter.Filter;
+
+export = filter;
diff --git a/gulp-filter/tsconfig.json b/gulp-filter/tsconfig.json
new file mode 100644
index 0000000000..668d317086
--- /dev/null
+++ b/gulp-filter/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-filter-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-flatten/gulp-flatten-tests.ts b/gulp-flatten/gulp-flatten-tests.ts
index 5a476195d0..8c89236d61 100644
--- a/gulp-flatten/gulp-flatten-tests.ts
+++ b/gulp-flatten/gulp-flatten-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="./gulp-flatten.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import * as gulp from "gulp";
 import * as flatten from "gulp-flatten";
diff --git a/gulp-flatten/gulp-flatten.d.ts b/gulp-flatten/gulp-flatten.d.ts
deleted file mode 100644
index 512a86a706..0000000000
--- a/gulp-flatten/gulp-flatten.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Type definitions for gulp-flatten
-// Project: https://github.com/armed/gulp-flatten
-// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "gulp-flatten" {
-
-    interface IOptions {
-        newPath: string;
-    }
-
-    function flatten(options?: IOptions): NodeJS.ReadWriteStream;
-
-    namespace flatten {}
-
-    export = flatten;
-}
diff --git a/gulp-flatten/index.d.ts b/gulp-flatten/index.d.ts
new file mode 100644
index 0000000000..c2abdcc533
--- /dev/null
+++ b/gulp-flatten/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for gulp-flatten
+// Project: https://github.com/armed/gulp-flatten
+// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+interface IOptions {
+    newPath: string;
+}
+
+declare function flatten(options?: IOptions): NodeJS.ReadWriteStream;
+
+declare namespace flatten { }
+
+export = flatten;
diff --git a/gulp-flatten/tsconfig.json b/gulp-flatten/tsconfig.json
new file mode 100644
index 0000000000..e91b476275
--- /dev/null
+++ b/gulp-flatten/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-flatten-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-gh-pages/gulp-gh-pages-tests.ts b/gulp-gh-pages/gulp-gh-pages-tests.ts
index 0d12c7329a..df527b0023 100644
--- a/gulp-gh-pages/gulp-gh-pages-tests.ts
+++ b/gulp-gh-pages/gulp-gh-pages-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./gulp-gh-pages.d.ts"/>
-/// <reference path="../gulp/gulp.d.ts"/>
 import * as gulp from "gulp";
 import * as ghPages from "gulp-gh-pages";
 
diff --git a/gulp-gh-pages/gulp-gh-pages.d.ts b/gulp-gh-pages/gulp-gh-pages.d.ts
deleted file mode 100644
index fd39388a46..0000000000
--- a/gulp-gh-pages/gulp-gh-pages.d.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-// Type definitions for gulp-gh-pages
-// Project: https://github.com/rowoot/gulp-gh-pages
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare module "gulp-gh-pages" {
-    interface Options {
-        remoteUrl?: string;
-        origin?: string;
-        branch?: string;
-        cacheDir?: string;
-        push?: boolean;
-        message?: string;
-    }
-
-    function ghPages(opts?: Options): NodeJS.ReadWriteStream;
-
-    namespace ghPages {}
-
-    export = ghPages;
-}
diff --git a/gulp-gh-pages/index.d.ts b/gulp-gh-pages/index.d.ts
new file mode 100644
index 0000000000..f01b9890f1
--- /dev/null
+++ b/gulp-gh-pages/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for gulp-gh-pages
+// Project: https://github.com/rowoot/gulp-gh-pages
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+interface Options {
+    remoteUrl?: string;
+    origin?: string;
+    branch?: string;
+    cacheDir?: string;
+    push?: boolean;
+    message?: string;
+}
+
+declare function ghPages(opts?: Options): NodeJS.ReadWriteStream;
+
+declare namespace ghPages { }
+
+export = ghPages;
diff --git a/gulp-gh-pages/tsconfig.json b/gulp-gh-pages/tsconfig.json
new file mode 100644
index 0000000000..92c2b9e88e
--- /dev/null
+++ b/gulp-gh-pages/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-gh-pages-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-gzip/gulp-gzip-tests.ts b/gulp-gzip/gulp-gzip-tests.ts
index 295e98b7fe..0a4d125d43 100644
--- a/gulp-gzip/gulp-gzip-tests.ts
+++ b/gulp-gzip/gulp-gzip-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="gulp-gzip.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import gulp = require('gulp');
 import gzip = require('gulp-gzip');
diff --git a/gulp-gzip/gulp-gzip.d.ts b/gulp-gzip/gulp-gzip.d.ts
deleted file mode 100644
index f7efe124d1..0000000000
--- a/gulp-gzip/gulp-gzip.d.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-// Type definitions for gulp-gzip
-// Project: https://github.com/jstuckey/gulp-gzip
-// Definitions by: Qubo <https://github.com/tkQubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "gulp-gzip" {
-    import zlib = require('zlib');
-
-    namespace gzip {
-        interface Gzip {
-            (options?: Options): NodeJS.ReadWriteStream;
-        }
-
-        interface Options {
-            /**
-             * Appends .gz file extension if true.
-             * @default true
-             */
-            append?: boolean;
-            /**
-             * Appends an arbitrary extension to the filename. Disables append and preExtension options.
-             */
-            extension?: string;
-            /**
-             * Appends an arbitrary pre-extension to the filename. Disables append and extension options.
-             */
-            preExtension?: string;
-            /**
-             * Minimum size required to compress a file.
-             * @default false
-             */
-            threshold?: number|string|boolean;
-            /**
-             * Options object to pass through to zlib.Gzip.
-             * See <a href='https://nodejs.org/api/zlib.html#zlib_options'>zlib</a> documentation for more information.
-             */
-            gzipOptions?: zlib.ZlibOptions;
-        }
-    }
-
-    var gzip: gzip.Gzip;
-
-    export = gzip;
-}
-
diff --git a/gulp-gzip/index.d.ts b/gulp-gzip/index.d.ts
new file mode 100644
index 0000000000..c93fa49359
--- /dev/null
+++ b/gulp-gzip/index.d.ts
@@ -0,0 +1,45 @@
+// Type definitions for gulp-gzip
+// Project: https://github.com/jstuckey/gulp-gzip
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import zlib = require('zlib');
+
+declare namespace gzip {
+    interface Gzip {
+        (options?: Options): NodeJS.ReadWriteStream;
+    }
+
+    interface Options {
+        /**
+         * Appends .gz file extension if true.
+         * @default true
+         */
+        append?: boolean;
+        /**
+         * Appends an arbitrary extension to the filename. Disables append and preExtension options.
+         */
+        extension?: string;
+        /**
+         * Appends an arbitrary pre-extension to the filename. Disables append and extension options.
+         */
+        preExtension?: string;
+        /**
+         * Minimum size required to compress a file.
+         * @default false
+         */
+        threshold?: number | string | boolean;
+        /**
+         * Options object to pass through to zlib.Gzip.
+         * See <a href='https://nodejs.org/api/zlib.html#zlib_options'>zlib</a> documentation for more information.
+         */
+        gzipOptions?: zlib.ZlibOptions;
+    }
+}
+
+declare var gzip: gzip.Gzip;
+
+export = gzip;
diff --git a/gulp-gzip/tsconfig.json b/gulp-gzip/tsconfig.json
new file mode 100644
index 0000000000..d65eb9d3e9
--- /dev/null
+++ b/gulp-gzip/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-gzip-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-help/gulp-help-tests.ts b/gulp-help/gulp-help-tests.ts
index 26abdf06ab..5d11bc23b7 100644
--- a/gulp-help/gulp-help-tests.ts
+++ b/gulp-help/gulp-help-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="gulp-help.d.ts" />
+/// <reference types="node" />
 
 'use strict';
 
diff --git a/gulp-help/gulp-help.d.ts b/gulp-help/gulp-help.d.ts
deleted file mode 100644
index 183d25312e..0000000000
--- a/gulp-help/gulp-help.d.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-// Type definitions for gulp-help
-// Project: https://github.com/chmontgomery/gulp-help
-// Definitions by: Qubo <https://github.com/tkQubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="../orchestrator/orchestrator.d.ts" />
-
-declare module "gulp-help" {
-    import Orchestrator = require('orchestrator');
-    import gulp = require('gulp');
-    type HelpOption = string|boolean;
-
-    namespace gulpHelp {
-        interface TaskMethod {
-            /**
-             * Define a task.
-             *
-             * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
-             * @param help Custom help message as a string. If you want to hide the task from the help menu, supply false
-             * @param deps an array of tasks to be executed and completed before your task will run.
-             * @param fn the function that performs the task's operations. Generally this takes the form of gulp.src().pipe(someplugin()).
-             * @param option task options
-             */
-            (name: string, help: HelpOption, deps: string[], fn?: gulp.TaskCallback, option?: TaskOptions): any;
-            /**
-             * Define a task.
-             *
-             * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
-             * @param help Custom help message as a string. If you want to hide the task from the help menu, supply false
-             * @param deps an array of tasks to be executed and completed before your task will run.
-             */
-            (name: string, help: HelpOption, deps: string[]): any;
-            /**
-             * Define a task.
-             *
-             * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
-             * @param help Custom help message as a string. If you want to hide the task from the help menu, supply false
-             * @param fn the function that performs the task's operations. Generally this takes the form of gulp.src().pipe(someplugin()).
-             * @param option task options
-             */
-            (name: string, help: HelpOption, fn?: gulp.TaskCallback, option?: TaskOptions): any;
-            /**
-             * Define a task.
-             *
-             * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
-             * @param help Custom help message as a string. If you want to hide the task from the help menu, supply false
-             */
-            (name: string, help: HelpOption): any;
-            /**
-             * Define a task.
-             *
-             * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
-             * @param deps an array of tasks to be executed and completed before your task will run.
-             * @param fn the function that performs the task's operations. Generally this takes the form of gulp.src().pipe(someplugin()).
-             * @param option task options
-             */
-            (name: string, deps: string[], fn?: gulp.TaskCallback, option?: TaskOptions): any;
-            /**
-             * Define a task.
-             *
-             * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
-             * @param fn the function that performs the task's operations. Generally this takes the form of gulp.src().pipe(someplugin()).
-             * @param option task options
-             */
-            (name: string, fn?: gulp.TaskCallback, option?: TaskOptions): any;
-        }
-
-        interface GulpHelp extends Orchestrator {
-            task: TaskMethod;
-            src: gulp.SrcMethod;
-            dest: gulp.DestMethod;
-            watch: gulp.WatchMethod;
-        }
-
-        interface TaskOptions {
-            /**
-             * List of aliases for this task
-             */
-            aliases?: string[];
-            /**
-             * Object documenting options which can be passed to your task
-             */
-            options?: { [key: string]: string };
-        }
-
-        interface GulpHelpOptions {
-            /**
-             * Modifies the default help message
-             */
-            description?: string;
-            /**
-             * Adds aliases to the default help task
-             */
-            aliases?: string[];
-            /**
-             * Hide all tasks with no help message defined. Useful when including 3rd party tasks
-             */
-            hideEmpty?: boolean;
-            /**
-             * Hide all task dependencies
-             */
-            hideDepsMessage?: boolean;
-            /**
-             * A function to run after the default help task runs
-             */
-            afterPrintCallback?: Function;
-        }
-
-    }
-
-    function gulpHelp(gulp: gulp.Gulp, options?: gulpHelp.GulpHelpOptions): gulpHelp.GulpHelp;
-
-    export = gulpHelp;
-}
diff --git a/gulp-help/index.d.ts b/gulp-help/index.d.ts
new file mode 100644
index 0000000000..4364786bb2
--- /dev/null
+++ b/gulp-help/index.d.ts
@@ -0,0 +1,115 @@
+// Type definitions for gulp-help
+// Project: https://github.com/chmontgomery/gulp-help
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+/// <reference types="orchestrator" />
+
+
+import Orchestrator = require('orchestrator');
+import gulp = require('gulp');
+type HelpOption = string | boolean;
+
+declare namespace gulpHelp {
+    interface TaskMethod {
+        /**
+         * Define a task.
+         *
+         * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
+         * @param help Custom help message as a string. If you want to hide the task from the help menu, supply false
+         * @param deps an array of tasks to be executed and completed before your task will run.
+         * @param fn the function that performs the task's operations. Generally this takes the form of gulp.src().pipe(someplugin()).
+         * @param option task options
+         */
+        (name: string, help: HelpOption, deps: string[], fn?: gulp.TaskCallback, option?: TaskOptions): any;
+        /**
+         * Define a task.
+         *
+         * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
+         * @param help Custom help message as a string. If you want to hide the task from the help menu, supply false
+         * @param deps an array of tasks to be executed and completed before your task will run.
+         */
+        (name: string, help: HelpOption, deps: string[]): any;
+        /**
+         * Define a task.
+         *
+         * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
+         * @param help Custom help message as a string. If you want to hide the task from the help menu, supply false
+         * @param fn the function that performs the task's operations. Generally this takes the form of gulp.src().pipe(someplugin()).
+         * @param option task options
+         */
+        (name: string, help: HelpOption, fn?: gulp.TaskCallback, option?: TaskOptions): any;
+        /**
+         * Define a task.
+         *
+         * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
+         * @param help Custom help message as a string. If you want to hide the task from the help menu, supply false
+         */
+        (name: string, help: HelpOption): any;
+        /**
+         * Define a task.
+         *
+         * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
+         * @param deps an array of tasks to be executed and completed before your task will run.
+         * @param fn the function that performs the task's operations. Generally this takes the form of gulp.src().pipe(someplugin()).
+         * @param option task options
+         */
+        (name: string, deps: string[], fn?: gulp.TaskCallback, option?: TaskOptions): any;
+        /**
+         * Define a task.
+         *
+         * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
+         * @param fn the function that performs the task's operations. Generally this takes the form of gulp.src().pipe(someplugin()).
+         * @param option task options
+         */
+        (name: string, fn?: gulp.TaskCallback, option?: TaskOptions): any;
+    }
+
+    interface GulpHelp extends Orchestrator {
+        task: TaskMethod;
+        src: gulp.SrcMethod;
+        dest: gulp.DestMethod;
+        watch: gulp.WatchMethod;
+    }
+
+    interface TaskOptions {
+        /**
+         * List of aliases for this task
+         */
+        aliases?: string[];
+        /**
+         * Object documenting options which can be passed to your task
+         */
+        options?: { [key: string]: string };
+    }
+
+    interface GulpHelpOptions {
+        /**
+         * Modifies the default help message
+         */
+        description?: string;
+        /**
+         * Adds aliases to the default help task
+         */
+        aliases?: string[];
+        /**
+         * Hide all tasks with no help message defined. Useful when including 3rd party tasks
+         */
+        hideEmpty?: boolean;
+        /**
+         * Hide all task dependencies
+         */
+        hideDepsMessage?: boolean;
+        /**
+         * A function to run after the default help task runs
+         */
+        afterPrintCallback?: Function;
+    }
+
+}
+
+declare function gulpHelp(gulp: gulp.Gulp, options?: gulpHelp.GulpHelpOptions): gulpHelp.GulpHelp;
+
+export = gulpHelp;
diff --git a/gulp-help/tsconfig.json b/gulp-help/tsconfig.json
new file mode 100644
index 0000000000..aeebecaccb
--- /dev/null
+++ b/gulp-help/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-help-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-html-replace/gulp-html-replace-tests.ts b/gulp-html-replace/gulp-html-replace-tests.ts
index 8739921e8d..568fb481fd 100644
--- a/gulp-html-replace/gulp-html-replace-tests.ts
+++ b/gulp-html-replace/gulp-html-replace-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="gulp-html-replace.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+
+/// <reference types="node" />
 
 import * as gulp from 'gulp';
 import * as htmlreplace from 'gulp-html-replace';
diff --git a/gulp-html-replace/gulp-html-replace.d.ts b/gulp-html-replace/gulp-html-replace.d.ts
deleted file mode 100644
index 19762294dd..0000000000
--- a/gulp-html-replace/gulp-html-replace.d.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// Type definitions for gulp-html-replace v1.5.5
-// Project: https://www.npmjs.com/package/gulp-html-replace
-// Definitions by: Peter Juras <https://github.com/peterjuras>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/// <reference path="../node/node.d.ts" />
-
-declare module "gulp-html-replace" {
-  interface AdvancedTask {
-    src: string | string[];
-    tpl: string;
-  }
-
-  interface Tasks {
-    [taskId: string] : string | string[] | AdvancedTask;
-  }
-
-  interface Options {
-    keepUnassigned?: boolean;
-    keepBlockTags?: boolean;
-    resolvePaths?: boolean;
-  }
-
-  interface HtmlReplace {
-    (tasks: Tasks, options?: Options) : NodeJS.ReadWriteStream;
-  }
-
-  const htmlReplace : HtmlReplace;
-  export = htmlReplace;
-}
diff --git a/gulp-html-replace/index.d.ts b/gulp-html-replace/index.d.ts
new file mode 100644
index 0000000000..e0610326c8
--- /dev/null
+++ b/gulp-html-replace/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for gulp-html-replace v1.5.5
+// Project: https://www.npmjs.com/package/gulp-html-replace
+// Definitions by: Peter Juras <https://github.com/peterjuras>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/// <reference types="node" />
+
+
+interface AdvancedTask {
+    src: string | string[];
+    tpl: string;
+}
+
+interface Tasks {
+    [taskId: string]: string | string[] | AdvancedTask;
+}
+
+interface Options {
+    keepUnassigned?: boolean;
+    keepBlockTags?: boolean;
+    resolvePaths?: boolean;
+}
+
+interface HtmlReplace {
+    (tasks: Tasks, options?: Options): NodeJS.ReadWriteStream;
+}
+
+declare const htmlReplace: HtmlReplace;
+export = htmlReplace;
diff --git a/gulp-html-replace/tsconfig.json b/gulp-html-replace/tsconfig.json
new file mode 100644
index 0000000000..c5aa5c4740
--- /dev/null
+++ b/gulp-html-replace/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-html-replace-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-htmlmin/gulp-htmlmin-tests.ts b/gulp-htmlmin/gulp-htmlmin-tests.ts
index 78149e787e..29c3bcd4fe 100644
--- a/gulp-htmlmin/gulp-htmlmin-tests.ts
+++ b/gulp-htmlmin/gulp-htmlmin-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="gulp-htmlmin.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import * as gulp from 'gulp';
 import * as htmlmin from 'gulp-htmlmin';
diff --git a/gulp-htmlmin/gulp-htmlmin.d.ts b/gulp-htmlmin/gulp-htmlmin.d.ts
deleted file mode 100644
index 0dc0c0d1ef..0000000000
--- a/gulp-htmlmin/gulp-htmlmin.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Type definitions for gulp-htmlmin v1.3.0
-// Project: https://github.com/jonschlinkert/gulp-htmlmin
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../html-minifier/html-minifier.d.ts" />
-
-declare module 'gulp-htmlmin' {
-    import * as HTMLMinifier from 'html-minifier';
-
-    namespace htmlmin {
-    }
-
-    function htmlmin(options?: HTMLMinifier.Options): NodeJS.ReadWriteStream;
-
-    export = htmlmin;
-}
diff --git a/gulp-htmlmin/index.d.ts b/gulp-htmlmin/index.d.ts
new file mode 100644
index 0000000000..ec97434de2
--- /dev/null
+++ b/gulp-htmlmin/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for gulp-htmlmin v1.3.0
+// Project: https://github.com/jonschlinkert/gulp-htmlmin
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as HTMLMinifier from 'html-minifier';
+
+declare namespace htmlmin {
+}
+
+declare function htmlmin(options?: HTMLMinifier.Options): NodeJS.ReadWriteStream;
+
+export = htmlmin;
diff --git a/gulp-htmlmin/tsconfig.json b/gulp-htmlmin/tsconfig.json
new file mode 100644
index 0000000000..8729debae5
--- /dev/null
+++ b/gulp-htmlmin/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-htmlmin-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-if/gulp-if-tests.ts b/gulp-if/gulp-if-tests.ts
index 6edb3bc135..fabc26dc54 100644
--- a/gulp-if/gulp-if-tests.ts
+++ b/gulp-if/gulp-if-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./gulp-if.d.ts"/>
-/// <reference path="../gulp/gulp.d.ts"/>
 import gulp = require('gulp');
 import _if = require('gulp-if');
 
diff --git a/gulp-if/gulp-if.d.ts b/gulp-if/gulp-if.d.ts
deleted file mode 100644
index f1f36ba63b..0000000000
--- a/gulp-if/gulp-if.d.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-// Type definitions for gulp-if
-// Project: https://github.com/robrich/gulp-if
-// Definitions by: Asana <https://asana.com>, Joe Skeen <http://github.com/joeskeen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-/// <reference path="../vinyl/vinyl.d.ts"/>
-
-declare module 'gulp-if' {
-    import fs = require('fs');
-    import vinyl = require('vinyl');
-    
-    interface GulpIf {
-        /** 
-         * gulp-if will pipe data to stream whenever condition is truthy.
-         * If condition is falsey and elseStream is passed, data will pipe to elseStream
-         * After data is piped to stream or elseStream or neither, data is piped down-stream.
-         * 
-         * @param condition whether input should be piped to stream
-         * @param stream the stream to pipe to if condition is true
-         * @param elseStream (optional) the stream to pipe to if condition is false 
-         */
-        (condition: boolean, stream: NodeJS.ReadWriteStream, elseStream?: NodeJS.ReadWriteStream): NodeJS.ReadWriteStream;
-        /** 
-         * gulp-if will pipe data to stream whenever condition is truthy.
-         * If condition is falsey and elseStream is passed, data will pipe to elseStream
-         * After data is piped to stream or elseStream or neither, data is piped down-stream.
-         * 
-         * @param condition a Node Stat filter condition to be executed on the vinyl file's Stats object
-         * @param stream the stream to pipe to if condition is true
-         * @param elseStream (optional) the stream to pipe to if condition is false 
-         */
-        (condition: StatFilterCondition, stream: NodeJS.ReadWriteStream, elseStream?: NodeJS.ReadWriteStream): NodeJS.ReadWriteStream;
-        /** 
-         * gulp-if will pipe data to stream whenever condition is truthy.
-         * If condition is falsey and elseStream is passed, data will pipe to elseStream
-         * After data is piped to stream or elseStream or neither, data is piped down-stream.
-         * 
-         * @param condition a function taking a vinyl file and returning a boolean
-         * @param stream the stream to pipe to if condition is true
-         * @param elseStream (optional) the stream to pipe to if condition is false 
-         */
-        (condition: (fs: vinyl) => boolean, stream: NodeJS.ReadWriteStream, elseStream?: NodeJS.ReadWriteStream): NodeJS.ReadWriteStream;
-        /** 
-         * gulp-if will pipe data to stream whenever condition is truthy.
-         * If condition is falsey and elseStream is passed, data will pipe to elseStream
-         * After data is piped to stream or elseStream or neither, data is piped down-stream.
-         * 
-         * @param condition a RegularExpression that works on the file.path
-         * @param stream the stream to pipe to if condition is true
-         * @param elseStream (optional) the stream to pipe to if condition is false 
-         */
-        (condition: RegExp, stream: NodeJS.ReadWriteStream, elseStream?: NodeJS.ReadWriteStream): NodeJS.ReadWriteStream;
-    }
-    
-    interface StatFilterCondition {
-        isDirectory?: boolean; 
-        isFile?: boolean;
-    }
-    
-    var gulpIf: GulpIf; 
-    
-    export = gulpIf;
-}
\ No newline at end of file
diff --git a/gulp-if/index.d.ts b/gulp-if/index.d.ts
new file mode 100644
index 0000000000..2b2f0cb56b
--- /dev/null
+++ b/gulp-if/index.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for gulp-if
+// Project: https://github.com/robrich/gulp-if
+// Definitions by: Asana <https://asana.com>, Joe Skeen <http://github.com/joeskeen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+import fs = require('fs');
+import vinyl = require('../vinyl');
+
+interface GulpIf {
+    /** 
+     * gulp-if will pipe data to stream whenever condition is truthy.
+     * If condition is falsey and elseStream is passed, data will pipe to elseStream
+     * After data is piped to stream or elseStream or neither, data is piped down-stream.
+     * 
+     * @param condition whether input should be piped to stream
+     * @param stream the stream to pipe to if condition is true
+     * @param elseStream (optional) the stream to pipe to if condition is false 
+     */
+    (condition: boolean, stream: NodeJS.ReadWriteStream, elseStream?: NodeJS.ReadWriteStream): NodeJS.ReadWriteStream;
+    /** 
+     * gulp-if will pipe data to stream whenever condition is truthy.
+     * If condition is falsey and elseStream is passed, data will pipe to elseStream
+     * After data is piped to stream or elseStream or neither, data is piped down-stream.
+     * 
+     * @param condition a Node Stat filter condition to be executed on the vinyl file's Stats object
+     * @param stream the stream to pipe to if condition is true
+     * @param elseStream (optional) the stream to pipe to if condition is false 
+     */
+    (condition: StatFilterCondition, stream: NodeJS.ReadWriteStream, elseStream?: NodeJS.ReadWriteStream): NodeJS.ReadWriteStream;
+    /** 
+     * gulp-if will pipe data to stream whenever condition is truthy.
+     * If condition is falsey and elseStream is passed, data will pipe to elseStream
+     * After data is piped to stream or elseStream or neither, data is piped down-stream.
+     * 
+     * @param condition a function taking a vinyl file and returning a boolean
+     * @param stream the stream to pipe to if condition is true
+     * @param elseStream (optional) the stream to pipe to if condition is false 
+     */
+    (condition: (fs: vinyl) => boolean, stream: NodeJS.ReadWriteStream, elseStream?: NodeJS.ReadWriteStream): NodeJS.ReadWriteStream;
+    /** 
+     * gulp-if will pipe data to stream whenever condition is truthy.
+     * If condition is falsey and elseStream is passed, data will pipe to elseStream
+     * After data is piped to stream or elseStream or neither, data is piped down-stream.
+     * 
+     * @param condition a RegularExpression that works on the file.path
+     * @param stream the stream to pipe to if condition is true
+     * @param elseStream (optional) the stream to pipe to if condition is false 
+     */
+    (condition: RegExp, stream: NodeJS.ReadWriteStream, elseStream?: NodeJS.ReadWriteStream): NodeJS.ReadWriteStream;
+}
+
+interface StatFilterCondition {
+    isDirectory?: boolean;
+    isFile?: boolean;
+}
+
+declare var gulpIf: GulpIf;
+
+export = gulpIf;
diff --git a/gulp-if/tsconfig.json b/gulp-if/tsconfig.json
new file mode 100644
index 0000000000..f301e004e6
--- /dev/null
+++ b/gulp-if/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-if-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-inject/gulp-inject-tests.ts b/gulp-inject/gulp-inject-tests.ts
index 4f535c8d64..4cba6ccc4a 100644
--- a/gulp-inject/gulp-inject-tests.ts
+++ b/gulp-inject/gulp-inject-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="./gulp-inject.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import * as gulp from "gulp";
 import * as inject from "gulp-inject";
diff --git a/gulp-inject/gulp-inject.d.ts b/gulp-inject/gulp-inject.d.ts
deleted file mode 100644
index 7749ce4d45..0000000000
--- a/gulp-inject/gulp-inject.d.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-// Type definitions for gulp-inject
-// Project: https://github.com/klei/gulp-inject
-// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../vinyl/vinyl.d.ts" />
-
-declare module "gulp-inject" {
-
-    import File = require("vinyl");
-
-    interface ITagFunction {
-        (targetExt: string, sourceExt: string): string;
-    }
-
-    interface ITransformFunction {
-        (filepath: string, file?: File, index?: number, length?: number, targetFile?: File): string;
-    }
-
-    interface IOptions {
-        ignorePath?: string | string[];
-        relative?: boolean;
-        addPrefix?: string;
-        addSuffix?: string;
-        addRootSlash?: boolean;
-        name?: string;
-        removeTags?: boolean;
-        empty?: boolean;
-        starttag?: string | ITagFunction;
-        endtag?: string | ITagFunction;
-        transform?: ITransformFunction;
-        selfClosingTag?: boolean;
-    }
-
-    function inject(sources: NodeJS.ReadableStream, options?: IOptions): NodeJS.ReadWriteStream;
-
-    namespace inject {}
-
-    export = inject;
-}
diff --git a/gulp-inject/index.d.ts b/gulp-inject/index.d.ts
new file mode 100644
index 0000000000..cf6fd3ae04
--- /dev/null
+++ b/gulp-inject/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for gulp-inject
+// Project: https://github.com/klei/gulp-inject
+// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import File = require("../vinyl");
+
+interface ITagFunction {
+    (targetExt: string, sourceExt: string): string;
+}
+
+interface ITransformFunction {
+    (filepath: string, file?: File, index?: number, length?: number, targetFile?: File): string;
+}
+
+interface IOptions {
+    ignorePath?: string | string[];
+    relative?: boolean;
+    addPrefix?: string;
+    addSuffix?: string;
+    addRootSlash?: boolean;
+    name?: string;
+    removeTags?: boolean;
+    empty?: boolean;
+    starttag?: string | ITagFunction;
+    endtag?: string | ITagFunction;
+    transform?: ITransformFunction;
+    selfClosingTag?: boolean;
+}
+
+declare function inject(sources: NodeJS.ReadableStream, options?: IOptions): NodeJS.ReadWriteStream;
+
+declare namespace inject { }
+
+export = inject;
diff --git a/gulp-inject/tsconfig.json b/gulp-inject/tsconfig.json
new file mode 100644
index 0000000000..423c12a876
--- /dev/null
+++ b/gulp-inject/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-inject-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-install/gulp-install-tests.ts b/gulp-install/gulp-install-tests.ts
index 0b9b5da0c2..b822b42706 100644
--- a/gulp-install/gulp-install-tests.ts
+++ b/gulp-install/gulp-install-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="gulp-install.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import * as gulp from 'gulp';
 import * as install from 'gulp-install';
diff --git a/gulp-install/gulp-install.d.ts b/gulp-install/gulp-install.d.ts
deleted file mode 100644
index 3d332548ca..0000000000
--- a/gulp-install/gulp-install.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// Type definitions for gulp-install v0.6.0
-// Project: https://www.npmjs.com/package/gulp-install
-// Definitions by: Peter Juras <https://github.com/peterjuras>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/// <reference path="../node/node.d.ts" />
-
-declare module "gulp-install" {
-  interface Options {
-    production?: boolean;
-    ignoreScripts?: boolean;
-    noOptional?: boolean;
-    allowRoot?: boolean;
-    args?: string | string[];
-  }
-
-  interface Install {
-    (options?: Options) : NodeJS.ReadWriteStream;
-  }
-
-  const install : Install;
-  export = install;
-}
diff --git a/gulp-install/index.d.ts b/gulp-install/index.d.ts
new file mode 100644
index 0000000000..1f96c20087
--- /dev/null
+++ b/gulp-install/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for gulp-install v0.6.0
+// Project: https://www.npmjs.com/package/gulp-install
+// Definitions by: Peter Juras <https://github.com/peterjuras>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/// <reference types="node" />
+
+
+interface Options {
+    production?: boolean;
+    ignoreScripts?: boolean;
+    noOptional?: boolean;
+    allowRoot?: boolean;
+    args?: string | string[];
+}
+
+interface Install {
+    (options?: Options): NodeJS.ReadWriteStream;
+}
+
+declare const install: Install;
+export = install;
diff --git a/gulp-install/tsconfig.json b/gulp-install/tsconfig.json
new file mode 100644
index 0000000000..2409bf6970
--- /dev/null
+++ b/gulp-install/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-install-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-istanbul/gulp-istanbul-0.8.1.d.ts b/gulp-istanbul/gulp-istanbul-0.8.1.d.ts
index 2f87073322..de6d54635c 100644
--- a/gulp-istanbul/gulp-istanbul-0.8.1.d.ts
+++ b/gulp-istanbul/gulp-istanbul-0.8.1.d.ts
@@ -3,49 +3,48 @@
 // Definitions by: Asana <https://asana.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../node/node.d.ts"/>
+/// <reference types="node"/>
 
-declare module "gulp-istanbul" {
-    function GulpIstanbul(opts?: GulpIstanbul.Options): NodeJS.ReadWriteStream;
 
-    namespace GulpIstanbul {
-        export function hookRequire(): NodeJS.ReadWriteStream;
-        export function summarizeCoverage(opts?: {coverageVariable?: string}): Coverage;
-        export function writeReports(opts?: ReportOptions): NodeJS.ReadWriteStream;
+declare function GulpIstanbul(opts?: GulpIstanbul.Options): NodeJS.ReadWriteStream;
 
-        interface Options {
-            coverageVariable?: string;
-            includeUntested?: boolean;
-            embedSource?: boolean;
-            preserveComments?: boolean;
-            noCompact?: boolean;
-            noAutoWrap?: boolean;
-            codeGenerationOptions?: Object;
-            debug?: boolean;
-            walkDebug?: boolean;
-        }
+declare namespace GulpIstanbul {
+    export function hookRequire(): NodeJS.ReadWriteStream;
+    export function summarizeCoverage(opts?: { coverageVariable?: string }): Coverage;
+    export function writeReports(opts?: ReportOptions): NodeJS.ReadWriteStream;
 
-        interface Coverage {
-            lines: CoverageStats;
-            statements: CoverageStats;
-            functions: CoverageStats;
-            branches: CoverageStats;
-        }
-
-        interface CoverageStats {
-            total: number;
-            covered: number;
-            skipped: number;
-            pct: number;
-        }
-
-        interface ReportOptions {
-            dir?: string;
-            reporters?: string[];
-            reportOpts?: {dir?: string};
-            coverageVariable?: string;
-        }
+    interface Options {
+        coverageVariable?: string;
+        includeUntested?: boolean;
+        embedSource?: boolean;
+        preserveComments?: boolean;
+        noCompact?: boolean;
+        noAutoWrap?: boolean;
+        codeGenerationOptions?: Object;
+        debug?: boolean;
+        walkDebug?: boolean;
     }
 
-    export = GulpIstanbul;
+    interface Coverage {
+        lines: CoverageStats;
+        statements: CoverageStats;
+        functions: CoverageStats;
+        branches: CoverageStats;
+    }
+
+    interface CoverageStats {
+        total: number;
+        covered: number;
+        skipped: number;
+        pct: number;
+    }
+
+    interface ReportOptions {
+        dir?: string;
+        reporters?: string[];
+        reportOpts?: { dir?: string };
+        coverageVariable?: string;
+    }
 }
+
+export = GulpIstanbul;
diff --git a/gulp-istanbul/gulp-istanbul-tests.ts b/gulp-istanbul/gulp-istanbul-tests.ts
index aada03de1f..a57932419d 100644
--- a/gulp-istanbul/gulp-istanbul-tests.ts
+++ b/gulp-istanbul/gulp-istanbul-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./gulp-istanbul.d.ts"/>
-/// <reference path="../gulp/gulp.d.ts"/>
 import gulp = require("gulp");
 import istanbul = require("gulp-istanbul");
 
diff --git a/gulp-istanbul/gulp-istanbul.d.ts b/gulp-istanbul/gulp-istanbul.d.ts
deleted file mode 100644
index 593860417b..0000000000
--- a/gulp-istanbul/gulp-istanbul.d.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-// Type definitions for gulp-istanbul v0.9.0
-// Project: https://github.com/SBoudrias/gulp-istanbul
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare module "gulp-istanbul" {
-    function GulpIstanbul(opts?: GulpIstanbul.Options): NodeJS.ReadWriteStream;
-
-    namespace GulpIstanbul {
-        export function hookRequire(): NodeJS.ReadWriteStream;
-        export function summarizeCoverage(opts?: {coverageVariable?: string}): Coverage;
-        export function writeReports(opts?: ReportOptions): NodeJS.ReadWriteStream;
-        export function enforceThresholds(opts?: ThresholdOptions): NodeJS.ReadWriteStream;
-
-        interface Options {
-            coverageVariable?: string;
-            includeUntested?: boolean;
-            embedSource?: boolean;
-            preserveComments?: boolean;
-            noCompact?: boolean;
-            noAutoWrap?: boolean;
-            codeGenerationOptions?: Object;
-            debug?: boolean;
-            walkDebug?: boolean;
-        }
-
-        interface Coverage {
-            lines: CoverageStats;
-            statements: CoverageStats;
-            functions: CoverageStats;
-            branches: CoverageStats;
-        }
-
-        interface CoverageStats {
-            total: number;
-            covered: number;
-            skipped: number;
-            pct: number;
-        }
-
-        interface ReportOptions {
-            dir?: string;
-            reporters?: string[];
-            reportOpts?: {dir?: string};
-            coverageVariable?: string;
-        }
-
-        interface ThresholdOptions {
-            coverageVariable?: string;
-            thresholds?: { global?: CoverageOptions|number; each?: CoverageOptions|number };
-        }
-
-        interface CoverageOptions {
-            lines?: number;
-            statements?: number;
-            functions?: number;
-            branches?: number;
-        }
-    }
-
-    export = GulpIstanbul;
-}
diff --git a/gulp-istanbul/index.d.ts b/gulp-istanbul/index.d.ts
new file mode 100644
index 0000000000..57423c74a2
--- /dev/null
+++ b/gulp-istanbul/index.d.ts
@@ -0,0 +1,63 @@
+// Type definitions for gulp-istanbul v0.9.0
+// Project: https://github.com/SBoudrias/gulp-istanbul
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+declare function GulpIstanbul(opts?: GulpIstanbul.Options): NodeJS.ReadWriteStream;
+
+declare namespace GulpIstanbul {
+    export function hookRequire(): NodeJS.ReadWriteStream;
+    export function summarizeCoverage(opts?: { coverageVariable?: string }): Coverage;
+    export function writeReports(opts?: ReportOptions): NodeJS.ReadWriteStream;
+    export function enforceThresholds(opts?: ThresholdOptions): NodeJS.ReadWriteStream;
+
+    interface Options {
+        coverageVariable?: string;
+        includeUntested?: boolean;
+        embedSource?: boolean;
+        preserveComments?: boolean;
+        noCompact?: boolean;
+        noAutoWrap?: boolean;
+        codeGenerationOptions?: Object;
+        debug?: boolean;
+        walkDebug?: boolean;
+    }
+
+    interface Coverage {
+        lines: CoverageStats;
+        statements: CoverageStats;
+        functions: CoverageStats;
+        branches: CoverageStats;
+    }
+
+    interface CoverageStats {
+        total: number;
+        covered: number;
+        skipped: number;
+        pct: number;
+    }
+
+    interface ReportOptions {
+        dir?: string;
+        reporters?: string[];
+        reportOpts?: { dir?: string };
+        coverageVariable?: string;
+    }
+
+    interface ThresholdOptions {
+        coverageVariable?: string;
+        thresholds?: { global?: CoverageOptions | number; each?: CoverageOptions | number };
+    }
+
+    interface CoverageOptions {
+        lines?: number;
+        statements?: number;
+        functions?: number;
+        branches?: number;
+    }
+}
+
+export = GulpIstanbul;
diff --git a/gulp-istanbul/tsconfig.json b/gulp-istanbul/tsconfig.json
new file mode 100644
index 0000000000..70a2c3fba4
--- /dev/null
+++ b/gulp-istanbul/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-istanbul-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-jade/gulp-jade-tests.ts b/gulp-jade/gulp-jade-tests.ts
index d6077eae5c..f184184573 100644
--- a/gulp-jade/gulp-jade-tests.ts
+++ b/gulp-jade/gulp-jade-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="./gulp-jade.d.ts"/>
-
 import * as gulp from 'gulp';
 import * as jade from 'gulp-jade';
 
diff --git a/gulp-jade/gulp-jade.d.ts b/gulp-jade/gulp-jade.d.ts
deleted file mode 100644
index 16f7a04016..0000000000
--- a/gulp-jade/gulp-jade.d.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-// Type definitions for gulp-jade
-// Project: https://github.com/phated/gulp-jade
-// Definitions by: berwyn <https://github.com/berwyn>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "gulp-jade" {
-
-  function GulpJade(params?: GulpJade.Params): any;
-
-  namespace GulpJade {
-    interface Params {
-        /*******
-        * JADE API OPTIONS
-        *******/
-
-        /**
-        * If the doctype is not specified as part of the
-        * template, you can specify it here. It is sometimes
-        * useful to get self-closing tags and remove mirroring
-        * of boolean attributes.
-        */
-        doctype?: string;
-
-        /**
-        * Adds whitespace to the resulting html to make it
-        * easier for a human to read using '  ' as indentation.
-        * If a string is specified, that will be used as
-        * indentation instead (e.g. '\t').
-        */
-        pretty?: boolean|string;
-
-        /**
-        * Use a self namespace to hold the locals (false by default)
-        */
-        self?: boolean;
-
-        /**
-        * If set to true, the tokens and function body is logged
-        * to stdout
-        */
-        debug?: boolean;
-
-        /**
-        * If set to true, the function source will be included in the
-        * compiled template for better error messages (sometimes useful
-        * in development). It is enabled by default unless used with
-        * express in production mode.
-        */
-        compileDebug?:boolean;
-
-        /**
-        * If set to true, compiled functions are cached. filename
-        * must be set as the cache key.
-        */
-        cache?:boolean;
-
-        /*******
-        * GULP-JADE OPTIONS
-        *******/
-
-        /**
-        * Used to set a version of jade other than this library's
-        * dependency, or to customise filters.
-        */
-        jade?: any;
-
-        /**
-        * Compile to JS instead of HTML.
-        */
-        client?: boolean;
-
-        /**
-        * Locals to be used while parsing jade files. Takes
-        * precedence over data.
-        */
-        locals?: any;
-
-        /**
-        * Data to be used while parsing jade files. Has lower
-        * precedence than locals.
-        */
-        data?: any;
-    }
-  }
-
-  export = GulpJade;
-}
diff --git a/gulp-jade/index.d.ts b/gulp-jade/index.d.ts
new file mode 100644
index 0000000000..8a5b5bc1de
--- /dev/null
+++ b/gulp-jade/index.d.ts
@@ -0,0 +1,86 @@
+// Type definitions for gulp-jade
+// Project: https://github.com/phated/gulp-jade
+// Definitions by: berwyn <https://github.com/berwyn>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare function GulpJade(params?: GulpJade.Params): any;
+
+declare namespace GulpJade {
+    interface Params {
+        /*******
+        * JADE API OPTIONS
+        *******/
+
+        /**
+        * If the doctype is not specified as part of the
+        * template, you can specify it here. It is sometimes
+        * useful to get self-closing tags and remove mirroring
+        * of boolean attributes.
+        */
+        doctype?: string;
+
+        /**
+        * Adds whitespace to the resulting html to make it
+        * easier for a human to read using '  ' as indentation.
+        * If a string is specified, that will be used as
+        * indentation instead (e.g. '\t').
+        */
+        pretty?: boolean | string;
+
+        /**
+        * Use a self namespace to hold the locals (false by default)
+        */
+        self?: boolean;
+
+        /**
+        * If set to true, the tokens and function body is logged
+        * to stdout
+        */
+        debug?: boolean;
+
+        /**
+        * If set to true, the function source will be included in the
+        * compiled template for better error messages (sometimes useful
+        * in development). It is enabled by default unless used with
+        * express in production mode.
+        */
+        compileDebug?: boolean;
+
+        /**
+        * If set to true, compiled functions are cached. filename
+        * must be set as the cache key.
+        */
+        cache?: boolean;
+
+        /*******
+        * GULP-JADE OPTIONS
+        *******/
+
+        /**
+        * Used to set a version of jade other than this library's
+        * dependency, or to customise filters.
+        */
+        jade?: any;
+
+        /**
+        * Compile to JS instead of HTML.
+        */
+        client?: boolean;
+
+        /**
+        * Locals to be used while parsing jade files. Takes
+        * precedence over data.
+        */
+        locals?: any;
+
+        /**
+        * Data to be used while parsing jade files. Has lower
+        * precedence than locals.
+        */
+        data?: any;
+    }
+}
+
+export = GulpJade;
diff --git a/gulp-jade/tsconfig.json b/gulp-jade/tsconfig.json
new file mode 100644
index 0000000000..0e7443d58e
--- /dev/null
+++ b/gulp-jade/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-jade-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-jasmine-browser/gulp-jasmine-browser-tests.ts b/gulp-jasmine-browser/gulp-jasmine-browser-tests.ts
index c28b312f42..db219148d3 100644
--- a/gulp-jasmine-browser/gulp-jasmine-browser-tests.ts
+++ b/gulp-jasmine-browser/gulp-jasmine-browser-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="gulp-jasmine-browser.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import gulp = require('gulp');
 import jasmineBrowser = require('gulp-jasmine-browser');
diff --git a/gulp-jasmine-browser/gulp-jasmine-browser.d.ts b/gulp-jasmine-browser/gulp-jasmine-browser.d.ts
deleted file mode 100644
index a335bc413f..0000000000
--- a/gulp-jasmine-browser/gulp-jasmine-browser.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for gulp-jasmine-browser v0.1.4
-// Project: https://github.com/jasmine/gulp-jasmine-browser
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'gulp-jasmine-browser' {
-    interface IJasmineBrowser {
-        specRunner(options?: any): NodeJS.ReadWriteStream;
-        server(options?: any): NodeJS.ReadWriteStream;
-        headless(options?: any): NodeJS.ReadWriteStream;
-    }
-
-    var jasmineBrowser: IJasmineBrowser;
-    export = jasmineBrowser;
-}
diff --git a/gulp-jasmine-browser/index.d.ts b/gulp-jasmine-browser/index.d.ts
new file mode 100644
index 0000000000..86b3b7867d
--- /dev/null
+++ b/gulp-jasmine-browser/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for gulp-jasmine-browser v0.1.4
+// Project: https://github.com/jasmine/gulp-jasmine-browser
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+interface IJasmineBrowser {
+    specRunner(options?: any): NodeJS.ReadWriteStream;
+    server(options?: any): NodeJS.ReadWriteStream;
+    headless(options?: any): NodeJS.ReadWriteStream;
+}
+
+declare var jasmineBrowser: IJasmineBrowser;
+export = jasmineBrowser;
diff --git a/gulp-jasmine-browser/tsconfig.json b/gulp-jasmine-browser/tsconfig.json
new file mode 100644
index 0000000000..05f8a6b38c
--- /dev/null
+++ b/gulp-jasmine-browser/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-jasmine-browser-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-json-editor/gulp-json-editor-tests.ts b/gulp-json-editor/gulp-json-editor-tests.ts
index a6acbb8369..67176063de 100644
--- a/gulp-json-editor/gulp-json-editor-tests.ts
+++ b/gulp-json-editor/gulp-json-editor-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="gulp-json-editor.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import * as gulp from 'gulp';
 import * as jeditor from 'gulp-json-editor';
diff --git a/gulp-json-editor/gulp-json-editor.d.ts b/gulp-json-editor/gulp-json-editor.d.ts
deleted file mode 100644
index 55a49f5b2a..0000000000
--- a/gulp-json-editor/gulp-json-editor.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for gulp-json-editor v2.2.1
-// Project: https://www.npmjs.com/package/gulp-json-editor
-// Definitions by: Peter Juras <https://github.com/peterjuras>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../js-beautify/js-beautify.d.ts" />
-
-declare module "gulp-json-editor" {
-
-  interface JEditor {
-    (mergeWith: any | ((json : any) => any ),
-    jsBeautifyOptions? : JsBeautifyOptions ) : NodeJS.ReadWriteStream;
-  }
-
-  const jeditor : JEditor;
-  export = jeditor;
-}
diff --git a/gulp-json-editor/index.d.ts b/gulp-json-editor/index.d.ts
new file mode 100644
index 0000000000..de1188a65b
--- /dev/null
+++ b/gulp-json-editor/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for gulp-json-editor v2.2.1
+// Project: https://www.npmjs.com/package/gulp-json-editor
+// Definitions by: Peter Juras <https://github.com/peterjuras>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/// <reference types="node" />
+/// <reference types="js-beautify" />
+
+
+
+interface JEditor {
+    (mergeWith: any | ((json: any) => any),
+        jsBeautifyOptions?: JsBeautifyOptions): NodeJS.ReadWriteStream;
+}
+
+declare const jeditor: JEditor;
+export = jeditor;
diff --git a/gulp-json-editor/tsconfig.json b/gulp-json-editor/tsconfig.json
new file mode 100644
index 0000000000..2f4a1f2453
--- /dev/null
+++ b/gulp-json-editor/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-json-editor-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-jspm/gulp-jspm-tests.ts b/gulp-jspm/gulp-jspm-tests.ts
index 3b5c0f3a24..5f3e0812f1 100644
--- a/gulp-jspm/gulp-jspm-tests.ts
+++ b/gulp-jspm/gulp-jspm-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="gulp-jspm.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import * as gulp from 'gulp';
 import * as gulpJspm from 'gulp-jspm';
diff --git a/gulp-jspm/gulp-jspm.d.ts b/gulp-jspm/gulp-jspm.d.ts
deleted file mode 100644
index 632e317418..0000000000
--- a/gulp-jspm/gulp-jspm.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// Type definitions for gulp-jspm v0.5.4
-// Project: https://www.npmjs.com/package/gulp-jspm
-// Definitions by: Peter Juras <https://github.com/peterjuras>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/// <reference path="../node/node.d.ts" />
-
-declare module "gulp-jspm" {
-  interface Options {
-    arithmetic?: string;
-    selfExecutingBundle?: boolean;
-    plugin?: boolean | string;
-    inject?: boolean;
-    minify?: boolean;
-  }
-
-  interface GulpJspm {
-    (options?: Options) : NodeJS.ReadWriteStream;
-  }
-
-  const gulpJspm : GulpJspm;
-  export = gulpJspm;
-}
diff --git a/gulp-jspm/index.d.ts b/gulp-jspm/index.d.ts
new file mode 100644
index 0000000000..3b23bb7639
--- /dev/null
+++ b/gulp-jspm/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for gulp-jspm v0.5.4
+// Project: https://www.npmjs.com/package/gulp-jspm
+// Definitions by: Peter Juras <https://github.com/peterjuras>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/// <reference types="node" />
+
+
+interface Options {
+    arithmetic?: string;
+    selfExecutingBundle?: boolean;
+    plugin?: boolean | string;
+    inject?: boolean;
+    minify?: boolean;
+}
+
+interface GulpJspm {
+    (options?: Options): NodeJS.ReadWriteStream;
+}
+
+declare const gulpJspm: GulpJspm;
+export = gulpJspm;
diff --git a/gulp-jspm/tsconfig.json b/gulp-jspm/tsconfig.json
new file mode 100644
index 0000000000..e3a9d95115
--- /dev/null
+++ b/gulp-jspm/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-jspm-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-less/gulp-less-tests.ts b/gulp-less/gulp-less-tests.ts
index ba9758649a..bd5335d80e 100644
--- a/gulp-less/gulp-less-tests.ts
+++ b/gulp-less/gulp-less-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="./gulp-less.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import * as gulp from "gulp";
 import * as less from "gulp-less";
diff --git a/gulp-less/gulp-less.d.ts b/gulp-less/gulp-less.d.ts
deleted file mode 100644
index 4e01553b2b..0000000000
--- a/gulp-less/gulp-less.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// Type definitions for gulp-less
-// Project: https://github.com/plus3network/gulp-less
-// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "gulp-less" {
-
-    interface IOptions {
-        modifyVars?: {};
-        paths?: string[];
-        plugins?: any[];
-        relativeUrls?: boolean;
-    }
-
-    function less(options?: IOptions): NodeJS.ReadWriteStream;
-
-    namespace less {}
-
-    export = less;
-}
diff --git a/gulp-less/index.d.ts b/gulp-less/index.d.ts
new file mode 100644
index 0000000000..72ab0d2851
--- /dev/null
+++ b/gulp-less/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for gulp-less
+// Project: https://github.com/plus3network/gulp-less
+// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+interface IOptions {
+    modifyVars?: {};
+    paths?: string[];
+    plugins?: any[];
+    relativeUrls?: boolean;
+}
+
+declare function less(options?: IOptions): NodeJS.ReadWriteStream;
+
+declare namespace less { }
+
+export = less;
diff --git a/gulp-less/tsconfig.json b/gulp-less/tsconfig.json
new file mode 100644
index 0000000000..92bb8ebeb6
--- /dev/null
+++ b/gulp-less/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-less-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-load-plugins/gulp-load-plugins-tests.ts b/gulp-load-plugins/gulp-load-plugins-tests.ts
index 50930358f0..a0cff649ec 100644
--- a/gulp-load-plugins/gulp-load-plugins-tests.ts
+++ b/gulp-load-plugins/gulp-load-plugins-tests.ts
@@ -1,8 +1,3 @@
-/// <reference path="../node/node" />
-/// <reference path="../gulp/gulp" />
-/// <reference path="../gulp-concat/gulp-concat" />
-/// <reference path="gulp-load-plugins" />
-
 import * as gulp from 'gulp';
 import * as gulpConcat from 'gulp-concat';
 import * as gulpLoadPlugins from 'gulp-load-plugins';
diff --git a/gulp-load-plugins/gulp-load-plugins.d.ts b/gulp-load-plugins/gulp-load-plugins.d.ts
deleted file mode 100644
index 75807d6a20..0000000000
--- a/gulp-load-plugins/gulp-load-plugins.d.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-// Type definitions for gulp-load-plugins
-// Project: https://github.com/jackfranklin/gulp-load-plugins
-// Definitions by: Joe Skeen <http://github.com/joeskeen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-/** Loads in any gulp plugins and attaches them to an object, freeing you up from having to manually require each gulp plugin. */
-declare module 'gulp-load-plugins' {
-
-	interface IOptions {
-		/** the glob(s) to search for, default ['gulp-*', 'gulp.*'] */
-		pattern?: string[];
-		/** where to find the plugins, searched up from process.cwd(), default 'package.json' */
-		config?: string;
-		/** which keys in the config to look within, default ['dependencies', 'devDependencies', 'peerDependencies'] */
-		scope?: string[];
-		/** what to remove from the name of the module when adding it to the context, default /^gulp(-|\.)/ */
-		replaceString?: RegExp;
-		/** if true, transforms hyphenated plugin names to camel case, default true */
-		camelize?: boolean;
-		/** whether the plugins should be lazy loaded on demand, default true */
-		lazy?: boolean;
-		/** a mapping of plugins to rename, the key being the NPM name of the package, and the value being an alias you define */
-		rename?: IPluginNameMappings;
-	}
-
-	interface IPluginNameMappings {
-		[npmPackageName: string]: string
-	}
-
-	/** Loads in any gulp plugins and attaches them to an object, freeing you up from having to manually require each gulp plugin. */
-	function gulpLoadPlugins<T extends IGulpPlugins>(options?: IOptions): T;
-
-	namespace gulpLoadPlugins {}
-
-	export = gulpLoadPlugins;
-}
-
-/**
- * Extend this interface to use Gulp plugins in your gulpfile.js
- */
-interface IGulpPlugins {
-}
diff --git a/gulp-load-plugins/index.d.ts b/gulp-load-plugins/index.d.ts
new file mode 100644
index 0000000000..4d58eae286
--- /dev/null
+++ b/gulp-load-plugins/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for gulp-load-plugins
+// Project: https://github.com/jackfranklin/gulp-load-plugins
+// Definitions by: Joe Skeen <http://github.com/joeskeen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+/** Loads in any gulp plugins and attaches them to an object, freeing you up from having to manually require each gulp plugin. */
+declare module 'gulp-load-plugins' {
+
+	interface IOptions {
+		/** the glob(s) to search for, default ['gulp-*', 'gulp.*'] */
+		pattern?: string[];
+		/** where to find the plugins, searched up from process.cwd(), default 'package.json' */
+		config?: string;
+		/** which keys in the config to look within, default ['dependencies', 'devDependencies', 'peerDependencies'] */
+		scope?: string[];
+		/** what to remove from the name of the module when adding it to the context, default /^gulp(-|\.)/ */
+		replaceString?: RegExp;
+		/** if true, transforms hyphenated plugin names to camel case, default true */
+		camelize?: boolean;
+		/** whether the plugins should be lazy loaded on demand, default true */
+		lazy?: boolean;
+		/** a mapping of plugins to rename, the key being the NPM name of the package, and the value being an alias you define */
+		rename?: IPluginNameMappings;
+	}
+
+	interface IPluginNameMappings {
+		[npmPackageName: string]: string
+	}
+
+	/** Loads in any gulp plugins and attaches them to an object, freeing you up from having to manually require each gulp plugin. */
+	function gulpLoadPlugins<T extends IGulpPlugins>(options?: IOptions): T;
+
+	namespace gulpLoadPlugins {}
+
+	export = gulpLoadPlugins;
+}
+
+/**
+ * Extend this interface to use Gulp plugins in your gulpfile.js
+ */
+interface IGulpPlugins {
+}
diff --git a/gulp-load-plugins/tsconfig.json b/gulp-load-plugins/tsconfig.json
new file mode 100644
index 0000000000..85c89c2438
--- /dev/null
+++ b/gulp-load-plugins/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-load-plugins-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-minify-css/gulp-minify-css-tests.ts b/gulp-minify-css/gulp-minify-css-tests.ts
index 9bfe9697a0..597111d30c 100644
--- a/gulp-minify-css/gulp-minify-css-tests.ts
+++ b/gulp-minify-css/gulp-minify-css-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="gulp-minify-css.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import * as gulp from "gulp";
 import * as minifyCSS from "gulp-minify-css";
diff --git a/gulp-minify-css/gulp-minify-css.d.ts b/gulp-minify-css/gulp-minify-css.d.ts
deleted file mode 100644
index 55e192e911..0000000000
--- a/gulp-minify-css/gulp-minify-css.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for gulp-minify-css
-// Project: https://github.com/jonathanepollack/gulp-minify-css
-// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../clean-css/clean-css.d.ts" />
-
-declare module "gulp-minify-css" {
-    import * as CleanCSS from 'clean-css';
-
-    function minifyCSS(options?: CleanCSS.Options): NodeJS.ReadWriteStream;
-
-    namespace minifyCSS {}
-
-    export = minifyCSS;
-}
diff --git a/gulp-minify-css/index.d.ts b/gulp-minify-css/index.d.ts
new file mode 100644
index 0000000000..d347cf0708
--- /dev/null
+++ b/gulp-minify-css/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for gulp-minify-css
+// Project: https://github.com/jonathanepollack/gulp-minify-css
+// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as CleanCSS from 'clean-css';
+
+declare function minifyCSS(options?: CleanCSS.Options): NodeJS.ReadWriteStream;
+
+declare namespace minifyCSS { }
+
+export = minifyCSS;
diff --git a/gulp-minify-css/tsconfig.json b/gulp-minify-css/tsconfig.json
new file mode 100644
index 0000000000..544e58ce71
--- /dev/null
+++ b/gulp-minify-css/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-minify-css-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-minify-html/gulp-minify-html-tests.ts b/gulp-minify-html/gulp-minify-html-tests.ts
index 1b3c7639da..fd27474de2 100644
--- a/gulp-minify-html/gulp-minify-html-tests.ts
+++ b/gulp-minify-html/gulp-minify-html-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="gulp-minify-html.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import * as gulp from 'gulp';
 import * as minifyHtml from 'gulp-minify-html';
diff --git a/gulp-minify-html/gulp-minify-html.d.ts b/gulp-minify-html/gulp-minify-html.d.ts
deleted file mode 100644
index 412a1f2cb8..0000000000
--- a/gulp-minify-html/gulp-minify-html.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// Type definitions for gulp-minify-html v1.0.2
-// Project: https://github.com/murphydanger/gulp-minify-html
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-// This package has been deprecated in favor of gulp-htmlmin, which should be faster and more comprehensive.
-
-declare module 'gulp-minify-html' {
-    namespace minifyHtml {
-        // Options from https://github.com/Swaagie/minimize#options
-        interface Options {
-            // Do not remove empty attributes
-            empty?: boolean;
-
-            // Do not strip CDATA from scripts
-            cdata?: boolean;
-
-            // Do not remove comments
-            comments?: boolean;
-
-            // Do not remove conditional internet explorer comments
-            conditionals?: boolean;
-
-            // Do not remove redundant attributes
-            spare?: boolean;
-
-            // Do not remove arbitrary quotes
-            quotes?: boolean;
-
-            // Preserve one whitespace
-            loose?: boolean;
-        }
-    }
-
-    function minifyHtml(options?: minifyHtml.Options): NodeJS.ReadWriteStream;
-
-    export = minifyHtml;
-}
diff --git a/gulp-minify-html/index.d.ts b/gulp-minify-html/index.d.ts
new file mode 100644
index 0000000000..ed04e598d7
--- /dev/null
+++ b/gulp-minify-html/index.d.ts
@@ -0,0 +1,39 @@
+// Type definitions for gulp-minify-html v1.0.2
+// Project: https://github.com/murphydanger/gulp-minify-html
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+// This package has been deprecated in favor of gulp-htmlmin, which should be faster and more comprehensive.
+
+
+declare namespace minifyHtml {
+    // Options from https://github.com/Swaagie/minimize#options
+    interface Options {
+        // Do not remove empty attributes
+        empty?: boolean;
+
+        // Do not strip CDATA from scripts
+        cdata?: boolean;
+
+        // Do not remove comments
+        comments?: boolean;
+
+        // Do not remove conditional internet explorer comments
+        conditionals?: boolean;
+
+        // Do not remove redundant attributes
+        spare?: boolean;
+
+        // Do not remove arbitrary quotes
+        quotes?: boolean;
+
+        // Preserve one whitespace
+        loose?: boolean;
+    }
+}
+
+declare function minifyHtml(options?: minifyHtml.Options): NodeJS.ReadWriteStream;
+
+export = minifyHtml;
diff --git a/gulp-minify-html/tsconfig.json b/gulp-minify-html/tsconfig.json
new file mode 100644
index 0000000000..5539e3e722
--- /dev/null
+++ b/gulp-minify-html/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-minify-html-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-mocha/gulp-mocha-tests.ts b/gulp-mocha/gulp-mocha-tests.ts
index 8d3eda4ea3..c84d710380 100644
--- a/gulp-mocha/gulp-mocha-tests.ts
+++ b/gulp-mocha/gulp-mocha-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./gulp-mocha.d.ts"/>
-/// <reference path="../gulp/gulp.d.ts"/>
 import * as gulp from "gulp";
 import * as mocha from "gulp-mocha";
 
diff --git a/gulp-mocha/gulp-mocha.d.ts b/gulp-mocha/gulp-mocha.d.ts
deleted file mode 100644
index 521ef91555..0000000000
--- a/gulp-mocha/gulp-mocha.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Type definitions for gulp-mocha
-// Project: https://github.com/sindresorhus/gulp-mocha
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../mocha/mocha.d.ts"/>
-/// <reference path="../node/node.d.ts"/>
-
-declare module "gulp-mocha" {
-    function mocha(setupOptions?: MochaSetupOptions): NodeJS.ReadWriteStream;
-    namespace mocha {}
-    export = mocha;
-}
diff --git a/gulp-mocha/index.d.ts b/gulp-mocha/index.d.ts
new file mode 100644
index 0000000000..ae56e9a9ac
--- /dev/null
+++ b/gulp-mocha/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for gulp-mocha
+// Project: https://github.com/sindresorhus/gulp-mocha
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="mocha"/>
+/// <reference types="node"/>
+
+
+declare function mocha(setupOptions?: MochaSetupOptions): NodeJS.ReadWriteStream;
+declare namespace mocha { }
+export = mocha;
diff --git a/gulp-mocha/tsconfig.json b/gulp-mocha/tsconfig.json
new file mode 100644
index 0000000000..fe691bfc76
--- /dev/null
+++ b/gulp-mocha/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-mocha-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-newer/gulp-newer-tests.ts b/gulp-newer/gulp-newer-tests.ts
index 43f0c55ccb..7d713bfabb 100644
--- a/gulp-newer/gulp-newer-tests.ts
+++ b/gulp-newer/gulp-newer-tests.ts
@@ -1,7 +1,3 @@
-/// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="../gulp-minify-html/gulp-minify-html.d.ts" />
-/// <reference path="./gulp-newer.d.ts" />
-
 import * as gulp from "gulp";
 import newer = require("gulp-newer");
 import minifyHtml = require("gulp-minify-html");
diff --git a/gulp-newer/gulp-newer.d.ts b/gulp-newer/gulp-newer.d.ts
deleted file mode 100644
index 9a3e6decde..0000000000
--- a/gulp-newer/gulp-newer.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// Type definitions for gulp-newer
-// Project: https://github.com/tschaub/gulp-newer
-// Definitions by: Thomas Corbière <https://github.com/tomc974>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare module "gulp-newer"
-{
-    interface IOptions
-    {
-        /**
-         * Path to destination directory or file.
-         */
-        dest: string;
-
-        /**
-         * Source files will be matched to destination files with the provided extension.
-         */
-        ext?: string;
-
-        /**
-         * Map relative source paths to relative destination paths.
-         */
-        map?: (relativePath: string) => string;
-    }
-
-    interface IGulpNewer
-    {
-        /**
-         * Create a transform stream that passes through files whose modification time
-         * is more recent than the corresponding destination file's modification time.
-         * @param dest Path to destination directory or file.
-         */
-        (dest: string): NodeJS.ReadWriteStream;
-
-        /**
-         * Create a transform stream that passes through files whose modification time
-         * is more recent than the corresponding destination file's modification time.
-         */
-        (options: IOptions): NodeJS.ReadWriteStream;
-    }
-
-    const newer: IGulpNewer;
-    export = newer;
-}
diff --git a/gulp-newer/index.d.ts b/gulp-newer/index.d.ts
new file mode 100644
index 0000000000..eff0e156bc
--- /dev/null
+++ b/gulp-newer/index.d.ts
@@ -0,0 +1,42 @@
+// Type definitions for gulp-newer
+// Project: https://github.com/tschaub/gulp-newer
+// Definitions by: Thomas Corbière <https://github.com/tomc974>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+interface IOptions {
+    /**
+     * Path to destination directory or file.
+     */
+    dest: string;
+
+    /**
+     * Source files will be matched to destination files with the provided extension.
+     */
+    ext?: string;
+
+    /**
+     * Map relative source paths to relative destination paths.
+     */
+    map?: (relativePath: string) => string;
+}
+
+interface IGulpNewer {
+    /**
+     * Create a transform stream that passes through files whose modification time
+     * is more recent than the corresponding destination file's modification time.
+     * @param dest Path to destination directory or file.
+     */
+    (dest: string): NodeJS.ReadWriteStream;
+
+    /**
+     * Create a transform stream that passes through files whose modification time
+     * is more recent than the corresponding destination file's modification time.
+     */
+    (options: IOptions): NodeJS.ReadWriteStream;
+}
+
+declare const newer: IGulpNewer;
+export = newer;
diff --git a/gulp-newer/tsconfig.json b/gulp-newer/tsconfig.json
new file mode 100644
index 0000000000..378121120b
--- /dev/null
+++ b/gulp-newer/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-newer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-ng-annotate/gulp-ng-annotate-tests.ts b/gulp-ng-annotate/gulp-ng-annotate-tests.ts
index ef6e696007..ea48672fb0 100644
--- a/gulp-ng-annotate/gulp-ng-annotate-tests.ts
+++ b/gulp-ng-annotate/gulp-ng-annotate-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="gulp-ng-annotate.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import ngAnnotate = require('gulp-ng-annotate');
 import gulp = require('gulp');
diff --git a/gulp-ng-annotate/gulp-ng-annotate.d.ts b/gulp-ng-annotate/gulp-ng-annotate.d.ts
deleted file mode 100644
index 12bfc9d539..0000000000
--- a/gulp-ng-annotate/gulp-ng-annotate.d.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-// Type definitions for gulp-ng-annotate
-// Project: https://github.com/Kagami/gulp-ng-annotate
-// Definitions by: Qubo <https://github.com/tkQubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "gulp-ng-annotate" {
-
-    namespace ngAnnotate {
-        interface NgAnnotate {
-            (option?: Option): NodeJS.ReadWriteStream;
-        }
-
-        //TODO: Should be on ng-annotate module
-        interface Option {
-            /**
-             * Add annotations where non-existing
-             */
-            add?: boolean;
-            /**
-             * Remove all existing annotations
-             */
-            remove?: boolean;
-            /**
-             * List optional matchers
-             */
-            list?: boolean;
-            /**
-             * Restrict matching further or to expand matching
-             */
-            regexp?: string;
-            /**
-             * Enable optional matcher
-             */
-            enable?: boolean;
-            /**
-             * Output '$scope' instead of "$scope".
-             */
-            single_quotes?: boolean;
-            /**
-             * Rename providers (services, factories, controllers, etc.) with a new name when declared and referenced through annotation
-             */
-            rename?: RenameOption[];
-            /**
-             * Load a user plugin with the provided path
-             */
-            plugin?: any[];
-        }
-
-        interface RenameOption {
-            from: string;
-            to: string;
-        }
-    }
-
-    var ngAnnotate: ngAnnotate.NgAnnotate;
-
-    export = ngAnnotate;
-}
-
diff --git a/gulp-ng-annotate/index.d.ts b/gulp-ng-annotate/index.d.ts
new file mode 100644
index 0000000000..405384a626
--- /dev/null
+++ b/gulp-ng-annotate/index.d.ts
@@ -0,0 +1,59 @@
+// Type definitions for gulp-ng-annotate
+// Project: https://github.com/Kagami/gulp-ng-annotate
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+declare namespace ngAnnotate {
+    interface NgAnnotate {
+        (option?: Option): NodeJS.ReadWriteStream;
+    }
+
+    //TODO: Should be on ng-annotate module
+    interface Option {
+        /**
+         * Add annotations where non-existing
+         */
+        add?: boolean;
+        /**
+         * Remove all existing annotations
+         */
+        remove?: boolean;
+        /**
+         * List optional matchers
+         */
+        list?: boolean;
+        /**
+         * Restrict matching further or to expand matching
+         */
+        regexp?: string;
+        /**
+         * Enable optional matcher
+         */
+        enable?: boolean;
+        /**
+         * Output '$scope' instead of "$scope".
+         */
+        single_quotes?: boolean;
+        /**
+         * Rename providers (services, factories, controllers, etc.) with a new name when declared and referenced through annotation
+         */
+        rename?: RenameOption[];
+        /**
+         * Load a user plugin with the provided path
+         */
+        plugin?: any[];
+    }
+
+    interface RenameOption {
+        from: string;
+        to: string;
+    }
+}
+
+declare var ngAnnotate: ngAnnotate.NgAnnotate;
+
+export = ngAnnotate;
diff --git a/gulp-ng-annotate/tsconfig.json b/gulp-ng-annotate/tsconfig.json
new file mode 100644
index 0000000000..702abef847
--- /dev/null
+++ b/gulp-ng-annotate/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-ng-annotate-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-nodemon/gulp-nodemon-tests.ts b/gulp-nodemon/gulp-nodemon-tests.ts
index 6a634558ab..364536f778 100644
--- a/gulp-nodemon/gulp-nodemon-tests.ts
+++ b/gulp-nodemon/gulp-nodemon-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="gulp-nodemon.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import gulp = require('gulp');
 import path = require('path');
diff --git a/gulp-nodemon/gulp-nodemon.d.ts b/gulp-nodemon/gulp-nodemon.d.ts
deleted file mode 100644
index 5ee7cb4a72..0000000000
--- a/gulp-nodemon/gulp-nodemon.d.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-// Type definitions for gulp-nodemon
-// Project: https://github.com/JacksonGariety/gulp-nodemon
-// Definitions by: Qubo <https://github.com/tkQubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "gulp-nodemon" {
-    namespace nodemon {
-
-        interface Nodemon {
-            (option?: Option): EventEmitter;
-        }
-
-        interface Option extends _Option {
-            tasks?: string[]|((changedFiles: string[]) => string[]);
-        }
-
-        // TODO: Properties may be insufficient
-        // TODO: In future this interface should be moved to nodemon.d.ts
-        interface _Option {
-            env?:  { [key: string]: string|boolean|number; };
-            script?: string;
-            /**
-             * Extensions to look for, ie. js,jade,hbs.
-             */
-            ext?: string;
-            /**
-             * Execute script with "app", ie. -x "python -v".
-             */
-            exec?: string;
-            /**
-             * Watch directory "dir" or files. use once for each directory or file to watch.
-             */
-            watch?: string[];
-            /**
-             * Ignore specific files or directories.
-             */
-            ignore?: string[];
-            /**
-             * Minimise nodemon messages to start/stop only.
-             */
-            quiet?: boolean;
-            /**
-             * Show detail on what is causing restarts.
-             */
-            verbose?: boolean;
-            /**
-             * Try to read from stdin.
-             */
-            stdin?: boolean;
-            stdout?: boolean;
-            /**
-             * Execute script on change only, not startup
-             */
-            runOnChangeOnly?: boolean;
-            /**
-             * Debounce restart in seconds.
-             */
-            delay?: number;
-            /**
-             * Forces node to use the most compatible version for watching file changes.
-             */
-            legacyWatch?: boolean;
-            /**
-             * Exit on crash, allows use of nodemon with daemon tools like forever.js.
-             */
-            exitcrash?: boolean;
-            execMap?: { [key: string]: string|boolean|number; };
-            events?:  { [key: string]: string; };
-            restartable?: string;
-        }
-
-        interface EventEmitter extends NodeJS.EventEmitter {
-            addListener(event: string, listener: Function): this;
-            addListener(event: string, tasks: string[]): this;
-            on(event: string, listener: Function): this;
-            on(event: string, tasks: string[]): this;
-            once(event: string, listener: Function): this;
-            once(event: string, tasks: string[]): this;
-        }
-    }
-
-    var nodemon: nodemon.Nodemon;
-
-    export = nodemon;
-}
diff --git a/gulp-nodemon/index.d.ts b/gulp-nodemon/index.d.ts
new file mode 100644
index 0000000000..7c5491f596
--- /dev/null
+++ b/gulp-nodemon/index.d.ts
@@ -0,0 +1,86 @@
+// Type definitions for gulp-nodemon
+// Project: https://github.com/JacksonGariety/gulp-nodemon
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+declare namespace nodemon {
+
+    interface Nodemon {
+        (option?: Option): EventEmitter;
+    }
+
+    interface Option extends _Option {
+        tasks?: string[] | ((changedFiles: string[]) => string[]);
+    }
+
+    // TODO: Properties may be insufficient
+    // TODO: In future this interface should be moved to nodemon.d.ts
+    interface _Option {
+        env?: { [key: string]: string | boolean | number; };
+        script?: string;
+        /**
+         * Extensions to look for, ie. js,jade,hbs.
+         */
+        ext?: string;
+        /**
+         * Execute script with "app", ie. -x "python -v".
+         */
+        exec?: string;
+        /**
+         * Watch directory "dir" or files. use once for each directory or file to watch.
+         */
+        watch?: string[];
+        /**
+         * Ignore specific files or directories.
+         */
+        ignore?: string[];
+        /**
+         * Minimise nodemon messages to start/stop only.
+         */
+        quiet?: boolean;
+        /**
+         * Show detail on what is causing restarts.
+         */
+        verbose?: boolean;
+        /**
+         * Try to read from stdin.
+         */
+        stdin?: boolean;
+        stdout?: boolean;
+        /**
+         * Execute script on change only, not startup
+         */
+        runOnChangeOnly?: boolean;
+        /**
+         * Debounce restart in seconds.
+         */
+        delay?: number;
+        /**
+         * Forces node to use the most compatible version for watching file changes.
+         */
+        legacyWatch?: boolean;
+        /**
+         * Exit on crash, allows use of nodemon with daemon tools like forever.js.
+         */
+        exitcrash?: boolean;
+        execMap?: { [key: string]: string | boolean | number; };
+        events?: { [key: string]: string; };
+        restartable?: string;
+    }
+
+    interface EventEmitter extends NodeJS.EventEmitter {
+        addListener(event: string, listener: Function): this;
+        addListener(event: string, tasks: string[]): this;
+        on(event: string, listener: Function): this;
+        on(event: string, tasks: string[]): this;
+        once(event: string, listener: Function): this;
+        once(event: string, tasks: string[]): this;
+    }
+}
+
+declare var nodemon: nodemon.Nodemon;
+
+export = nodemon;
diff --git a/gulp-nodemon/tsconfig.json b/gulp-nodemon/tsconfig.json
new file mode 100644
index 0000000000..46c815687a
--- /dev/null
+++ b/gulp-nodemon/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-nodemon-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-plumber/gulp-plumber-tests.ts b/gulp-plumber/gulp-plumber-tests.ts
index cf055dad52..49740293ed 100644
--- a/gulp-plumber/gulp-plumber-tests.ts
+++ b/gulp-plumber/gulp-plumber-tests.ts
@@ -1,7 +1,3 @@
-/// <reference path="../node/node" />
-/// <reference path="../gulp/gulp" />
-/// <reference path="gulp-plumber" />
-
 import gulp = require('gulp');
 import plumber = require('gulp-plumber');
 
diff --git a/gulp-plumber/gulp-plumber.d.ts b/gulp-plumber/gulp-plumber.d.ts
deleted file mode 100644
index 1d57e050a5..0000000000
--- a/gulp-plumber/gulp-plumber.d.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-// Type definitions for gulp-plumber
-// Project: https://github.com/floatdrop/gulp-plumber
-// Definitions by: Joe Skeen <http://github.com/joeskeen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-/** Prevent pipe breaking caused by errors from gulp plugins */
-declare module 'gulp-plumber' {
-	
-	/** Prevent pipe breaking caused by errors from gulp plugins */
-	interface GulpPlumber {
-		/**
-		 * Returns Stream, that fixes pipe methods on Streams that are next in pipeline.
-		 * 
-		 * @param options Sets options as described in the Options interface
-		 */
-		(options?: Options): NodeJS.ReadWriteStream;
-		/**
-		 * Returns Stream, that fixes pipe methods on Streams that are next in pipeline.
-		 * 
-		 * @param errorHandler the function to be attached to the stream on('error')
-		 */
-		(errorHandler: ErrorHandlerFunction): NodeJS.ReadWriteStream;
-		/** returns default behaviour for pipeline after it was piped */
-		stop(): NodeJS.ReadWriteStream;
-	}
-	
-	interface Options {
-		/** 
-		 * Handle errors in underlying streams and output them to console. Default true.
-		 * If function passed, it will be attached to stream on('error')
-		 * If false passed, error handler will not be attached
-		 * If undefined passed, default error handler will be attached
-		 */
-		errorHandler?: ErrorHandlerFunction | boolean;
-		/** Monkeypatch pipe functions in underlying streams in pipeline. Default true. */
-		inherit?: boolean;
-	}
-	
-	/** an error handler function to be attached to the stream on('error') */
-	interface ErrorHandlerFunction {
-		/** an error handler function to be attached to the stream on('error') */
-		(error: any): void;
-	}
-	
-	/** Prevent pipe breaking caused by errors from gulp plugins */
-	var gulpPlumber: GulpPlumber;
-	
-	export = gulpPlumber;
-}
diff --git a/gulp-plumber/index.d.ts b/gulp-plumber/index.d.ts
new file mode 100644
index 0000000000..7486668421
--- /dev/null
+++ b/gulp-plumber/index.d.ts
@@ -0,0 +1,50 @@
+// Type definitions for gulp-plumber
+// Project: https://github.com/floatdrop/gulp-plumber
+// Definitions by: Joe Skeen <http://github.com/joeskeen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+/** Prevent pipe breaking caused by errors from gulp plugins */
+
+
+/** Prevent pipe breaking caused by errors from gulp plugins */
+interface GulpPlumber {
+    /**
+     * Returns Stream, that fixes pipe methods on Streams that are next in pipeline.
+     * 
+     * @param options Sets options as described in the Options interface
+     */
+    (options?: Options): NodeJS.ReadWriteStream;
+    /**
+     * Returns Stream, that fixes pipe methods on Streams that are next in pipeline.
+     * 
+     * @param errorHandler the function to be attached to the stream on('error')
+     */
+    (errorHandler: ErrorHandlerFunction): NodeJS.ReadWriteStream;
+    /** returns default behaviour for pipeline after it was piped */
+    stop(): NodeJS.ReadWriteStream;
+}
+
+interface Options {
+    /** 
+     * Handle errors in underlying streams and output them to console. Default true.
+     * If function passed, it will be attached to stream on('error')
+     * If false passed, error handler will not be attached
+     * If undefined passed, default error handler will be attached
+     */
+    errorHandler?: ErrorHandlerFunction | boolean;
+    /** Monkeypatch pipe functions in underlying streams in pipeline. Default true. */
+    inherit?: boolean;
+}
+
+/** an error handler function to be attached to the stream on('error') */
+interface ErrorHandlerFunction {
+    /** an error handler function to be attached to the stream on('error') */
+    (error: any): void;
+}
+
+/** Prevent pipe breaking caused by errors from gulp plugins */
+declare var gulpPlumber: GulpPlumber;
+
+export = gulpPlumber;
diff --git a/gulp-plumber/tsconfig.json b/gulp-plumber/tsconfig.json
new file mode 100644
index 0000000000..82c911ee0e
--- /dev/null
+++ b/gulp-plumber/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-plumber-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-protractor/gulp-protractor-tests.ts b/gulp-protractor/gulp-protractor-tests.ts
index 4224084d8b..77d31e2bea 100644
--- a/gulp-protractor/gulp-protractor-tests.ts
+++ b/gulp-protractor/gulp-protractor-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="gulp-protractor.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import gulp = require('gulp');
 import protractor = require('gulp-protractor');
diff --git a/gulp-protractor/gulp-protractor.d.ts b/gulp-protractor/gulp-protractor.d.ts
deleted file mode 100644
index 73f39fb227..0000000000
--- a/gulp-protractor/gulp-protractor.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// Type definitions for gulp-protractor v1.0.0
-// Project: https://github.com/mllrsohn/gulp-protractor
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
-
-declare module 'gulp-protractor' {
-    import gulp = require('gulp');
-
-    interface IOptions {
-        configFile?: string;
-        args?: Array<string>;
-        debug?: boolean;
-    }
-
-    interface IGulpProtractor {
-        getProtractorDir(): string;
-        protractor(options?: IOptions): NodeJS.ReadWriteStream;
-        webdriver_standalone: gulp.TaskCallback;
-        webdriver_update: gulp.TaskCallback;
-    }
-
-    var protractor: IGulpProtractor;
-    export = protractor;
-}
diff --git a/gulp-protractor/index.d.ts b/gulp-protractor/index.d.ts
new file mode 100644
index 0000000000..fd76826f3d
--- /dev/null
+++ b/gulp-protractor/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for gulp-protractor v1.0.0
+// Project: https://github.com/mllrsohn/gulp-protractor
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import gulp = require('gulp');
+
+interface IOptions {
+    configFile?: string;
+    args?: Array<string>;
+    debug?: boolean;
+}
+
+interface IGulpProtractor {
+    getProtractorDir(): string;
+    protractor(options?: IOptions): NodeJS.ReadWriteStream;
+    webdriver_standalone: gulp.TaskCallback;
+    webdriver_update: gulp.TaskCallback;
+}
+
+declare var protractor: IGulpProtractor;
+export = protractor;
diff --git a/gulp-protractor/tsconfig.json b/gulp-protractor/tsconfig.json
new file mode 100644
index 0000000000..86c7db970a
--- /dev/null
+++ b/gulp-protractor/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-protractor-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-remember/gulp-remember-tests.ts b/gulp-remember/gulp-remember-tests.ts
index 804832c5de..1feb6b6bc1 100644
--- a/gulp-remember/gulp-remember-tests.ts
+++ b/gulp-remember/gulp-remember-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="./gulp-remember.d.ts" />
-
 import * as gulp from "gulp";
 import remember = require("gulp-remember");
 
diff --git a/gulp-remember/gulp-remember.d.ts b/gulp-remember/gulp-remember.d.ts
deleted file mode 100644
index 9a3b4052fd..0000000000
--- a/gulp-remember/gulp-remember.d.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-// Type definitions for gulp-remember
-// Project: https://github.com/ahaurw01/gulp-remember
-// Definitions by: Thomas Corbière <https://github.com/tomc974>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare module "gulp-remember"
-{
-    interface ICache
-    {
-        [path: string]: NodeJS.ReadWriteStream;
-    }
-
-    interface IGulpRemember
-    {
-        /**
-         * Return a through stream that will:
-         *   1. Remember all files that ever pass through it.
-         *   2. Add all remembered files back into the stream when not present.
-         * @param cacheName Name to give your cache
-         */
-        (cacheName?: string): NodeJS.ReadWriteStream;
-
-        /**
-         * Forget about a file.
-         * A warning is logged if either the named cache or file do not exist.
-         * @param path Path of the file to forget
-         */
-        forget(path: string): void;
-
-        /**
-         * Forget about a file.
-         * A warning is logged if either the named cache or file do not exist.
-         * @param cacheName Name of the cache from which to drop the file
-         * @param path Path of the file to forget
-         */
-        forget(cacheName: string, path: string): void;
-
-        /**
-         * Forget all files in one cache.
-         * A warning is logged if the cache does not exist.
-         *
-         * @param cacheName Name of the cache to wipe
-         */
-        forgetAll(cacheName?: string): void;
-
-        /**
-         * Return a raw cache by name.
-         * Useful for checking state. Manually adding or removing files is NOT recommended.
-         *
-         * @param cacheName Name of the cache to retrieve
-         */
-        cacheFor(cacheName?: string): ICache;
-    }
-
-    const remember: IGulpRemember;
-    export = remember;
-}
diff --git a/gulp-remember/index.d.ts b/gulp-remember/index.d.ts
new file mode 100644
index 0000000000..5cf9696595
--- /dev/null
+++ b/gulp-remember/index.d.ts
@@ -0,0 +1,55 @@
+// Type definitions for gulp-remember
+// Project: https://github.com/ahaurw01/gulp-remember
+// Definitions by: Thomas Corbière <https://github.com/tomc974>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+interface ICache {
+    [path: string]: NodeJS.ReadWriteStream;
+}
+
+interface IGulpRemember {
+    /**
+     * Return a through stream that will:
+     *   1. Remember all files that ever pass through it.
+     *   2. Add all remembered files back into the stream when not present.
+     * @param cacheName Name to give your cache
+     */
+    (cacheName?: string): NodeJS.ReadWriteStream;
+
+    /**
+     * Forget about a file.
+     * A warning is logged if either the named cache or file do not exist.
+     * @param path Path of the file to forget
+     */
+    forget(path: string): void;
+
+    /**
+     * Forget about a file.
+     * A warning is logged if either the named cache or file do not exist.
+     * @param cacheName Name of the cache from which to drop the file
+     * @param path Path of the file to forget
+     */
+    forget(cacheName: string, path: string): void;
+
+    /**
+     * Forget all files in one cache.
+     * A warning is logged if the cache does not exist.
+     *
+     * @param cacheName Name of the cache to wipe
+     */
+    forgetAll(cacheName?: string): void;
+
+    /**
+     * Return a raw cache by name.
+     * Useful for checking state. Manually adding or removing files is NOT recommended.
+     *
+     * @param cacheName Name of the cache to retrieve
+     */
+    cacheFor(cacheName?: string): ICache;
+}
+
+declare const remember: IGulpRemember;
+export = remember;
diff --git a/gulp-remember/tsconfig.json b/gulp-remember/tsconfig.json
new file mode 100644
index 0000000000..adcb4ba6f1
--- /dev/null
+++ b/gulp-remember/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-remember-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-rename/gulp-rename-tests.ts b/gulp-rename/gulp-rename-tests.ts
index 6b204a36d9..4d3e713234 100644
--- a/gulp-rename/gulp-rename-tests.ts
+++ b/gulp-rename/gulp-rename-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./gulp-rename.d.ts"/>
-/// <reference path="../gulp/gulp.d.ts"/>
 import gulp = require("gulp");
 import rename = require("gulp-rename");
 
diff --git a/gulp-rename/gulp-rename.d.ts b/gulp-rename/gulp-rename.d.ts
deleted file mode 100644
index 11368e9698..0000000000
--- a/gulp-rename/gulp-rename.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Type definitions for gulp-rename
-// Project: https://github.com/hparra/gulp-rename
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare module "gulp-rename" {
-    interface ParsedPath {
-        dirname?: string;
-        basename?: string;
-        extname?: string;
-    }
-
-    interface Options extends ParsedPath {
-        prefix?: string;
-        suffix?: string;
-    }
-
-    function rename(name: string): NodeJS.ReadWriteStream;
-    function rename(callback: (path: ParsedPath) => any): NodeJS.ReadWriteStream;
-    function rename(opts: Options): NodeJS.ReadWriteStream;
-    export = rename;
-}
\ No newline at end of file
diff --git a/gulp-rename/index.d.ts b/gulp-rename/index.d.ts
new file mode 100644
index 0000000000..15522d9870
--- /dev/null
+++ b/gulp-rename/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for gulp-rename
+// Project: https://github.com/hparra/gulp-rename
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+interface ParsedPath {
+    dirname?: string;
+    basename?: string;
+    extname?: string;
+}
+
+interface Options extends ParsedPath {
+    prefix?: string;
+    suffix?: string;
+}
+
+declare function rename(name: string): NodeJS.ReadWriteStream;
+declare function rename(callback: (path: ParsedPath) => any): NodeJS.ReadWriteStream;
+declare function rename(opts: Options): NodeJS.ReadWriteStream;
+export = rename;
diff --git a/gulp-rename/tsconfig.json b/gulp-rename/tsconfig.json
new file mode 100644
index 0000000000..2fbbce872f
--- /dev/null
+++ b/gulp-rename/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-rename-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-replace/gulp-replace-tests.ts b/gulp-replace/gulp-replace-tests.ts
index 8e043d7748..6a17057495 100644
--- a/gulp-replace/gulp-replace-tests.ts
+++ b/gulp-replace/gulp-replace-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./gulp-replace.d.ts"/>
-/// <reference path="../gulp/gulp.d.ts"/>
 import * as gulp from "gulp";
 import * as replace from "gulp-replace";
 
diff --git a/gulp-replace/gulp-replace.d.ts b/gulp-replace/gulp-replace.d.ts
deleted file mode 100644
index 90ecb13535..0000000000
--- a/gulp-replace/gulp-replace.d.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-// Type definitions for gulp-replace
-// Project: https://github.com/lazd/gulp-replace
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare module "gulp-replace" {
-    interface Options {
-        skipBinary?: boolean;
-    }
-
-    interface Replacer {
-      (match: string): string
-    }
-
-    function replace(pattern: string, replacement: string | Replacer, opts?: Options): NodeJS.ReadWriteStream;
-    function replace(pattern: RegExp, replacement: string | Replacer, opts?: Options): NodeJS.ReadWriteStream;
-
-    namespace replace {}
-
-    export = replace;
-}
diff --git a/gulp-replace/index.d.ts b/gulp-replace/index.d.ts
new file mode 100644
index 0000000000..ac6c2a4e5b
--- /dev/null
+++ b/gulp-replace/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for gulp-replace
+// Project: https://github.com/lazd/gulp-replace
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+interface Options {
+    skipBinary?: boolean;
+}
+
+interface Replacer {
+    (match: string): string
+}
+
+declare function replace(pattern: string, replacement: string | Replacer, opts?: Options): NodeJS.ReadWriteStream;
+declare function replace(pattern: RegExp, replacement: string | Replacer, opts?: Options): NodeJS.ReadWriteStream;
+
+declare namespace replace { }
+
+export = replace;
diff --git a/gulp-replace/tsconfig.json b/gulp-replace/tsconfig.json
new file mode 100644
index 0000000000..c2f4a1ca66
--- /dev/null
+++ b/gulp-replace/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-replace-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-rev-replace/gulp-rev-replace-tests.ts b/gulp-rev-replace/gulp-rev-replace-tests.ts
index 7610183d86..e20839ab99 100644
--- a/gulp-rev-replace/gulp-rev-replace-tests.ts
+++ b/gulp-rev-replace/gulp-rev-replace-tests.ts
@@ -1,8 +1,3 @@
-/// <reference path="gulp-rev-replace.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="../gulp-rev/gulp-rev.d.ts" />
-/// <reference path="../gulp-useref/gulp-useref.d.ts" />
-
 import * as gulp from 'gulp';
 import * as revReplace from 'gulp-rev-replace';
 import * as rev from 'gulp-rev';
diff --git a/gulp-rev-replace/gulp-rev-replace.d.ts b/gulp-rev-replace/gulp-rev-replace.d.ts
deleted file mode 100644
index 520db3c493..0000000000
--- a/gulp-rev-replace/gulp-rev-replace.d.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-// Type definitions for gulp-rev-replace v0.2.1
-// Project: https://github.com/jamesknelson/gulp-rev-replace
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'gulp-rev-replace' {
-  namespace revReplace {
-    interface Options {
-      canonicalUris?: boolean;
-      replaceInExtensions?: Array<string>;
-      prefix?: string;
-      manifest?: NodeJS.ReadWriteStream;
-      modifyUnreved?: Function;
-      modifyReved?: Function;
-    }
-  }
-
-  function revReplace(options?: revReplace.Options): NodeJS.ReadWriteStream;
-
-  export = revReplace;
-}
diff --git a/gulp-rev-replace/index.d.ts b/gulp-rev-replace/index.d.ts
new file mode 100644
index 0000000000..322604bf1d
--- /dev/null
+++ b/gulp-rev-replace/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for gulp-rev-replace v0.2.1
+// Project: https://github.com/jamesknelson/gulp-rev-replace
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+declare namespace revReplace {
+    interface Options {
+        canonicalUris?: boolean;
+        replaceInExtensions?: Array<string>;
+        prefix?: string;
+        manifest?: NodeJS.ReadWriteStream;
+        modifyUnreved?: Function;
+        modifyReved?: Function;
+    }
+}
+
+declare function revReplace(options?: revReplace.Options): NodeJS.ReadWriteStream;
+
+export = revReplace;
diff --git a/gulp-rev-replace/tsconfig.json b/gulp-rev-replace/tsconfig.json
new file mode 100644
index 0000000000..925b6464c0
--- /dev/null
+++ b/gulp-rev-replace/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-rev-replace-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-rev/gulp-rev-tests.ts b/gulp-rev/gulp-rev-tests.ts
index 37661424f1..c13b23fc71 100644
--- a/gulp-rev/gulp-rev-tests.ts
+++ b/gulp-rev/gulp-rev-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="gulp-rev.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import gulp = require('gulp');
 import rev = require('gulp-rev');
diff --git a/gulp-rev/gulp-rev.d.ts b/gulp-rev/gulp-rev.d.ts
deleted file mode 100644
index f02950d797..0000000000
--- a/gulp-rev/gulp-rev.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// Type definitions for gulp-rev v5.0.1
-// Project: https://github.com/sindresorhus/gulp-rev
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'gulp-rev' {
-    interface IOptions {
-        base?: string;
-        cwd?: string;
-        merge?: boolean;
-    }
-
-    interface IRev {
-        (): NodeJS.ReadWriteStream;
-
-        manifest(): NodeJS.ReadWriteStream;
-        manifest(path?: string): NodeJS.ReadWriteStream;
-        manifest(options?: IOptions): NodeJS.ReadWriteStream;
-        manifest(path?: string, options?: IOptions): NodeJS.ReadWriteStream;
-    }
-
-    var rev: IRev;
-    export = rev;
-}
diff --git a/gulp-rev/index.d.ts b/gulp-rev/index.d.ts
new file mode 100644
index 0000000000..e104228f18
--- /dev/null
+++ b/gulp-rev/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for gulp-rev v5.0.1
+// Project: https://github.com/sindresorhus/gulp-rev
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+interface IOptions {
+    base?: string;
+    cwd?: string;
+    merge?: boolean;
+}
+
+interface IRev {
+    (): NodeJS.ReadWriteStream;
+
+    manifest(): NodeJS.ReadWriteStream;
+    manifest(path?: string): NodeJS.ReadWriteStream;
+    manifest(options?: IOptions): NodeJS.ReadWriteStream;
+    manifest(path?: string, options?: IOptions): NodeJS.ReadWriteStream;
+}
+
+declare var rev: IRev;
+export = rev;
diff --git a/gulp-rev/tsconfig.json b/gulp-rev/tsconfig.json
new file mode 100644
index 0000000000..6297f40dc1
--- /dev/null
+++ b/gulp-rev/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-rev-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-ruby-sass/gulp-ruby-sass-tests.ts b/gulp-ruby-sass/gulp-ruby-sass-tests.ts
index 5237527a45..69346a16d8 100644
--- a/gulp-ruby-sass/gulp-ruby-sass-tests.ts
+++ b/gulp-ruby-sass/gulp-ruby-sass-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./gulp-ruby-sass.d.ts"/>
-/// <reference path="../gulp/gulp.d.ts"/>
 import * as gulp from "gulp";
 import * as sass from "gulp-ruby-sass";
 
diff --git a/gulp-ruby-sass/gulp-ruby-sass.d.ts b/gulp-ruby-sass/gulp-ruby-sass.d.ts
deleted file mode 100644
index 3cb8238664..0000000000
--- a/gulp-ruby-sass/gulp-ruby-sass.d.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-// Type definitions for gulp-ruby-sass v1.0.5
-// Project: https://github.com/sindresorhus/gulp-ruby-sass
-// Definitions by: Agnislav Onufrijchuk <https://github.com/agnislav>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare module "gulp-ruby-sass" {
-    /**
-     * The interface includes all options that available for sass executable.
-     * Options are converted from dashed to camelCase
-     * @interface SassOptions
-     */
-    interface SassOptions {
-        loadPath?: string | string[];
-        require?: string;
-        compass?: boolean;
-        style?: string;
-        force?: boolean;
-        stopOnError?: boolean;
-        scss?: boolean;
-        defaultEncoding?: string;
-        unixNewlines?: boolean;
-        debugInfo?: boolean;
-        lineNumbers?: boolean;
-        lineComments?: boolean;
-        check?: boolean;
-        precision?: number;
-        cacheLocation?: string;
-        noCache?: boolean;
-        trace?: boolean;
-        quiet?: boolean;
-
-        // Actually, there should be a string. However due to ts spec, overriding member should be the same type or a subtype.
-        // http://stackoverflow.com/questions/19605557/incompatible-static-properties-in-three-d-ts-with-latest-typescript
-        // We need Options.soucemap to be boolean, so here 'any' is used instead of string.
-        sourcemap?: any;
-
-        // All listed below options are acceptable by the sass executable and potentially may be used from js.
-        // However I doubt are there cases when it's meaningful
-        watch?: string;
-        update?: string;
-        stdin?: boolean;
-        interactive?: boolean;
-    }
-
-    /**
-     * The interface includes the node-ruby-sass only options.
-     * Attention: sourcemap option type differs from the same SassOption's type.
-     * @interface Options
-     * @extends SassOptions
-     */
-    interface Options extends SassOptions {
-        verbose?: boolean;
-        bundleExec?: boolean;
-        sourcemap?: boolean;
-        container?: string;
-    }
-
-    /**
-     * Object to be exported
-     * @param {string} source - Filename or directory
-     * @param {Options} options - Additional processing rules/options
-     */
-    function sass(source: string, options?: Options): NodeJS.ReadableStream;
-
-    namespace sass {}
-
-    export = sass;
-}
diff --git a/gulp-ruby-sass/index.d.ts b/gulp-ruby-sass/index.d.ts
new file mode 100644
index 0000000000..4b743c0fe7
--- /dev/null
+++ b/gulp-ruby-sass/index.d.ts
@@ -0,0 +1,69 @@
+// Type definitions for gulp-ruby-sass v1.0.5
+// Project: https://github.com/sindresorhus/gulp-ruby-sass
+// Definitions by: Agnislav Onufrijchuk <https://github.com/agnislav>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+/**
+ * The interface includes all options that available for sass executable.
+ * Options are converted from dashed to camelCase
+ * @interface SassOptions
+ */
+interface SassOptions {
+    loadPath?: string | string[];
+    require?: string;
+    compass?: boolean;
+    style?: string;
+    force?: boolean;
+    stopOnError?: boolean;
+    scss?: boolean;
+    defaultEncoding?: string;
+    unixNewlines?: boolean;
+    debugInfo?: boolean;
+    lineNumbers?: boolean;
+    lineComments?: boolean;
+    check?: boolean;
+    precision?: number;
+    cacheLocation?: string;
+    noCache?: boolean;
+    trace?: boolean;
+    quiet?: boolean;
+
+    // Actually, there should be a string. However due to ts spec, overriding member should be the same type or a subtype.
+    // http://stackoverflow.com/questions/19605557/incompatible-static-properties-in-three-d-ts-with-latest-typescript
+    // We need Options.soucemap to be boolean, so here 'any' is used instead of string.
+    sourcemap?: any;
+
+    // All listed below options are acceptable by the sass executable and potentially may be used from js.
+    // However I doubt are there cases when it's meaningful
+    watch?: string;
+    update?: string;
+    stdin?: boolean;
+    interactive?: boolean;
+}
+
+/**
+ * The interface includes the node-ruby-sass only options.
+ * Attention: sourcemap option type differs from the same SassOption's type.
+ * @interface Options
+ * @extends SassOptions
+ */
+interface Options extends SassOptions {
+    verbose?: boolean;
+    bundleExec?: boolean;
+    sourcemap?: boolean;
+    container?: string;
+}
+
+/**
+ * Object to be exported
+ * @param {string} source - Filename or directory
+ * @param {Options} options - Additional processing rules/options
+ */
+declare function sass(source: string, options?: Options): NodeJS.ReadableStream;
+
+declare namespace sass { }
+
+export = sass;
diff --git a/gulp-ruby-sass/tsconfig.json b/gulp-ruby-sass/tsconfig.json
new file mode 100644
index 0000000000..3ce7bba432
--- /dev/null
+++ b/gulp-ruby-sass/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-ruby-sass-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-sass/gulp-sass-tests.ts b/gulp-sass/gulp-sass-tests.ts
index b1aeef4b4f..72192512a7 100644
--- a/gulp-sass/gulp-sass-tests.ts
+++ b/gulp-sass/gulp-sass-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./gulp-sass.d.ts"/>
-/// <reference path="../gulp/gulp.d.ts"/>
 import gulp = require("gulp");
 import * as sass from "gulp-sass"; 
 
diff --git a/gulp-sass/gulp-sass.d.ts b/gulp-sass/gulp-sass.d.ts
deleted file mode 100644
index d54c53b3da..0000000000
--- a/gulp-sass/gulp-sass.d.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-// Type definitions for gulp-sass
-// Project: https://github.com/dlmanning/gulp-sass
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare module "gulp-sass" {
-    interface SassResults {
-        css: string;
-        map: string;
-        stats: {
-            entry: string;
-            start: Date;
-            end: Date;
-            duration: number;
-            includedFiles: string[];
-        }
-    }
-
-    interface SassOptions {
-        file?: string;
-        data?: string;
-        success?: (results: SassResults) => any;
-        error?: (err: Error) => any;
-        includePaths?: string[];
-        imagePaths?: string[];
-        indentedSyntax?: boolean;
-        omitSourceMapUrl?: boolean;
-        outFile?: string;
-        outputStyle?: string;
-        precision?: number;
-        sourceComments?: boolean;
-        sourceMap?: boolean | string;
-        sourceMapEmbed?: boolean;
-        sourceMapContents?: boolean;
-    }
-
-    interface Options extends SassOptions {
-        errLogToConsole?: boolean;
-        onSuccess?: (css: string) => any;
-        onError?: (err: Error) => any;
-        sync?: boolean;
-    }
-
-    interface Sass {
-        (opts?: Options): NodeJS.ReadWriteStream;
-        logError(error?: string): void;
-        sync(options?: Options): NodeJS.ReadWriteStream;
-    }
-
-    var _tmp: Sass;
-    export = _tmp;
-}
\ No newline at end of file
diff --git a/gulp-sass/index.d.ts b/gulp-sass/index.d.ts
new file mode 100644
index 0000000000..e095ead007
--- /dev/null
+++ b/gulp-sass/index.d.ts
@@ -0,0 +1,53 @@
+// Type definitions for gulp-sass
+// Project: https://github.com/dlmanning/gulp-sass
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+interface SassResults {
+    css: string;
+    map: string;
+    stats: {
+        entry: string;
+        start: Date;
+        end: Date;
+        duration: number;
+        includedFiles: string[];
+    }
+}
+
+interface SassOptions {
+    file?: string;
+    data?: string;
+    success?: (results: SassResults) => any;
+    error?: (err: Error) => any;
+    includePaths?: string[];
+    imagePaths?: string[];
+    indentedSyntax?: boolean;
+    omitSourceMapUrl?: boolean;
+    outFile?: string;
+    outputStyle?: string;
+    precision?: number;
+    sourceComments?: boolean;
+    sourceMap?: boolean | string;
+    sourceMapEmbed?: boolean;
+    sourceMapContents?: boolean;
+}
+
+interface Options extends SassOptions {
+    errLogToConsole?: boolean;
+    onSuccess?: (css: string) => any;
+    onError?: (err: Error) => any;
+    sync?: boolean;
+}
+
+interface Sass {
+    (opts?: Options): NodeJS.ReadWriteStream;
+    logError(error?: string): void;
+    sync(options?: Options): NodeJS.ReadWriteStream;
+}
+
+declare var _tmp: Sass;
+export = _tmp;
diff --git a/gulp-sass/tsconfig.json b/gulp-sass/tsconfig.json
new file mode 100644
index 0000000000..28bbde5764
--- /dev/null
+++ b/gulp-sass/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-sass-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-shell/gulp-shell-tests.ts b/gulp-shell/gulp-shell-tests.ts
index eb3d1a5a47..3bd6d906fc 100644
--- a/gulp-shell/gulp-shell-tests.ts
+++ b/gulp-shell/gulp-shell-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="gulp-shell.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import shell = require('gulp-shell');
 import gulp = require('gulp');
diff --git a/gulp-shell/gulp-shell.d.ts b/gulp-shell/gulp-shell.d.ts
deleted file mode 100644
index 5235b101f4..0000000000
--- a/gulp-shell/gulp-shell.d.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-// Type definitions for gulp-shell
-// Project: https://github.com/sun-zheng-an/gulp-shell
-// Definitions by: Qubo <https://github.com/tkqubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "gulp-shell" {
-
-    namespace shell {
-        interface Shell {
-            (commands: string|string[], options?: Option): NodeJS.ReadWriteStream;
-            task(commands: string|string[], options?: Option): (done: Function) => NodeJS.ReadWriteStream;
-        }
-
-        interface Option {
-            /**
-             * You can add a custom error message for when the command fails. This can be a template which can be
-             * interpolated with the current command, some file info (e.g. file.path) and some error info
-             * (e.g. error.code).
-             * @default 'Command `<%= command %>` failed with exit code <%= error.code %>'
-             */
-            errorMessage?: string;
-            /**
-             * By default, it will emit an error event when the command finishes unsuccessfully.
-             * @default false
-             */
-            ignoreErrors?: boolean;
-            /**
-             * By default, it will print the command output.
-             * @default false
-             */
-            quiet?: boolean;
-            /**
-             * Sets the current working directory for the command.
-             * @default process.cwd()
-             */
-            cwd?: string;
-            /**
-             * The data that can be accessed in template.
-             */
-            templateData?: any;
-            /**
-             * You won't need to set this option unless you encounter a "stdout maxBuffer exceeded" error.
-             * @default 16MB(16 * 1024 * 1024)
-             */
-            maxBuffer?: number;
-            /**
-             * The maximum amount of time in milliseconds the process is allowed to run.
-             * @default
-             */
-            timeout?: number;
-            /**
-             * By default, all the commands will be executed in an environment with all the variables in process.env
-             * and PATH prepended by ./node_modules/.bin (allowing you to run executables in your Node's dependencies).
-             * You can override any environment variables with this option.
-             * For example, setting it to {PATH: process.env.PATH} will reset the PATH
-             * if the default one brings your some troubles.
-             */
-            env?: any;
-        }
-    }
-
-    var shell: shell.Shell;
-
-    export = shell;
-}
-
diff --git a/gulp-shell/index.d.ts b/gulp-shell/index.d.ts
new file mode 100644
index 0000000000..edba611e9c
--- /dev/null
+++ b/gulp-shell/index.d.ts
@@ -0,0 +1,66 @@
+// Type definitions for gulp-shell
+// Project: https://github.com/sun-zheng-an/gulp-shell
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+declare namespace shell {
+    interface Shell {
+        (commands: string | string[], options?: Option): NodeJS.ReadWriteStream;
+        task(commands: string | string[], options?: Option): (done: Function) => NodeJS.ReadWriteStream;
+    }
+
+    interface Option {
+        /**
+         * You can add a custom error message for when the command fails. This can be a template which can be
+         * interpolated with the current command, some file info (e.g. file.path) and some error info
+         * (e.g. error.code).
+         * @default 'Command `<%= command %>` failed with exit code <%= error.code %>'
+         */
+        errorMessage?: string;
+        /**
+         * By default, it will emit an error event when the command finishes unsuccessfully.
+         * @default false
+         */
+        ignoreErrors?: boolean;
+        /**
+         * By default, it will print the command output.
+         * @default false
+         */
+        quiet?: boolean;
+        /**
+         * Sets the current working directory for the command.
+         * @default process.cwd()
+         */
+        cwd?: string;
+        /**
+         * The data that can be accessed in template.
+         */
+        templateData?: any;
+        /**
+         * You won't need to set this option unless you encounter a "stdout maxBuffer exceeded" error.
+         * @default 16MB(16 * 1024 * 1024)
+         */
+        maxBuffer?: number;
+        /**
+         * The maximum amount of time in milliseconds the process is allowed to run.
+         * @default
+         */
+        timeout?: number;
+        /**
+         * By default, all the commands will be executed in an environment with all the variables in process.env
+         * and PATH prepended by ./node_modules/.bin (allowing you to run executables in your Node's dependencies).
+         * You can override any environment variables with this option.
+         * For example, setting it to {PATH: process.env.PATH} will reset the PATH
+         * if the default one brings your some troubles.
+         */
+        env?: any;
+    }
+}
+
+declare var shell: shell.Shell;
+
+export = shell;
diff --git a/gulp-shell/tsconfig.json b/gulp-shell/tsconfig.json
new file mode 100644
index 0000000000..c0ff0bbf98
--- /dev/null
+++ b/gulp-shell/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-shell-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-size/gulp-size-tests.ts b/gulp-size/gulp-size-tests.ts
index 8981960f20..9aea965329 100644
--- a/gulp-size/gulp-size-tests.ts
+++ b/gulp-size/gulp-size-tests.ts
@@ -1,6 +1,5 @@
-/// <reference path="gulp-size.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="../gulp-debug/gulp-debug.d.ts" />
+
+
 
 import * as gulp from 'gulp';
 import * as size from 'gulp-size';
diff --git a/gulp-size/gulp-size.d.ts b/gulp-size/gulp-size.d.ts
deleted file mode 100644
index ec33f14890..0000000000
--- a/gulp-size/gulp-size.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-// Type definitions for gulp-size v1.2.3
-// Project: https://github.com/sindresorhus/gulp-size
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'gulp-size' {
-    namespace size {
-        interface Options {
-            showFiles?: boolean;
-            gzip?: boolean;
-            title?: string;
-        }
-
-        interface SizeStream extends NodeJS.ReadWriteStream {
-            size: number;
-            prettySize: string;
-        }
-    }
-
-    function size(options?: size.Options): size.SizeStream;
-
-    export = size;
-}
diff --git a/gulp-size/index.d.ts b/gulp-size/index.d.ts
new file mode 100644
index 0000000000..374c58565e
--- /dev/null
+++ b/gulp-size/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for gulp-size v1.2.3
+// Project: https://github.com/sindresorhus/gulp-size
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+declare namespace size {
+    interface Options {
+        showFiles?: boolean;
+        gzip?: boolean;
+        title?: string;
+    }
+
+    interface SizeStream extends NodeJS.ReadWriteStream {
+        size: number;
+        prettySize: string;
+    }
+}
+
+declare function size(options?: size.Options): size.SizeStream;
+
+export = size;
diff --git a/gulp-size/tsconfig.json b/gulp-size/tsconfig.json
new file mode 100644
index 0000000000..ff051ea86b
--- /dev/null
+++ b/gulp-size/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-size-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-sort/gulp-sort-tests.ts b/gulp-sort/gulp-sort-tests.ts
index d94f5cfdcb..62e17d27a2 100644
--- a/gulp-sort/gulp-sort-tests.ts
+++ b/gulp-sort/gulp-sort-tests.ts
@@ -1,7 +1,4 @@
 /** Tests taken from https://github.com/pgilad/gulp-sort#usage */
-/// <reference path="../node/node" />
-/// <reference path="../gulp/gulp" />
-/// <reference path="gulp-sort" />
 
 import * as gulp from 'gulp';
 import * as sort from 'gulp-sort';
diff --git a/gulp-sort/gulp-sort.d.ts b/gulp-sort/gulp-sort.d.ts
deleted file mode 100644
index 5290f1ed46..0000000000
--- a/gulp-sort/gulp-sort.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// Type definitions for gulp-sort
-// Project: https://github.com/pgilad/gulp-sort
-// Definitions by: Joe Skeen <http://github.com/joeskeen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../gulp-util/gulp-util.d.ts" />
-
-/** Sort files in stream by path or any custom sort comparator */
-declare module 'gulp-sort' {
-
-	import gulpUtil = require('gulp-util');
-
-	interface IOptions {
-		/**
-		 * A function to compare two files.
-		 * Returns:
-		 * -1 if file1 should be before file2,
-		 * 0 if file1 is equivalent to file2, and
-		 * 1 if file1 should be after file2
-		 */
-		comparator?: IComparatorFunction;
-		/** Whether to sort in ascending order, default is true */
-		asc?: boolean;
-	}
-
-	interface IComparatorFunction {
-		/**
-		 * A function to compare two files.
-		 * Returns:
-		 * -1 if file1 should be before file2,
-		 * 0 if file1 is equivalent to file2, and
-		 * 1 if file1 should be after file2
-		 */
-		(file1: gulpUtil.File, file2: gulpUtil.File): number;
-	}
-
-	/** Sort files in stream by path or any custom sort comparator */
-	function gulpSort(): NodeJS.ReadWriteStream;
-	function gulpSort(comparator: IComparatorFunction): NodeJS.ReadWriteStream;
-	function gulpSort(options: IOptions): NodeJS.ReadWriteStream;
-
-	namespace gulpSort {}
-
-	export = gulpSort;
-}
diff --git a/gulp-sort/index.d.ts b/gulp-sort/index.d.ts
new file mode 100644
index 0000000000..96d5362550
--- /dev/null
+++ b/gulp-sort/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for gulp-sort
+// Project: https://github.com/pgilad/gulp-sort
+// Definitions by: Joe Skeen <http://github.com/joeskeen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+/** Sort files in stream by path or any custom sort comparator */
+
+
+import gulpUtil = require('gulp-util');
+
+interface IOptions {
+    /**
+     * A function to compare two files.
+     * Returns:
+     * -1 if file1 should be before file2,
+     * 0 if file1 is equivalent to file2, and
+     * 1 if file1 should be after file2
+     */
+    comparator?: IComparatorFunction;
+    /** Whether to sort in ascending order, default is true */
+    asc?: boolean;
+}
+
+interface IComparatorFunction {
+    /**
+     * A function to compare two files.
+     * Returns:
+     * -1 if file1 should be before file2,
+     * 0 if file1 is equivalent to file2, and
+     * 1 if file1 should be after file2
+     */
+    (file1: gulpUtil.File, file2: gulpUtil.File): number;
+}
+
+/** Sort files in stream by path or any custom sort comparator */
+declare function gulpSort(): NodeJS.ReadWriteStream;
+declare function gulpSort(comparator: IComparatorFunction): NodeJS.ReadWriteStream;
+declare function gulpSort(options: IOptions): NodeJS.ReadWriteStream;
+
+declare namespace gulpSort { }
+
+export = gulpSort;
diff --git a/gulp-sort/tsconfig.json b/gulp-sort/tsconfig.json
new file mode 100644
index 0000000000..36c1600c9e
--- /dev/null
+++ b/gulp-sort/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-sort-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-sourcemaps/gulp-sourcemaps-tests.ts b/gulp-sourcemaps/gulp-sourcemaps-tests.ts
index bc06bbb8df..9ea2849f1e 100644
--- a/gulp-sourcemaps/gulp-sourcemaps-tests.ts
+++ b/gulp-sourcemaps/gulp-sourcemaps-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./gulp-sourcemaps.d.ts"/>
-/// <reference path="../gulp/gulp.d.ts"/>
 import gulp = require("gulp");
 import sourcemaps = require("gulp-sourcemaps");
 
diff --git a/gulp-sourcemaps/gulp-sourcemaps.d.ts b/gulp-sourcemaps/gulp-sourcemaps.d.ts
deleted file mode 100644
index 51f222ed3e..0000000000
--- a/gulp-sourcemaps/gulp-sourcemaps.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Type definitions for gulp-sourcemaps
-// Project: https://github.com/floridoo/gulp-sourcemaps
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare module "gulp-sourcemaps" {
-    interface InitOptions {
-        loadMaps?: boolean;
-        debug?: boolean;
-    }
-
-    interface WriteMapper {
-        (file: string): string;
-    }
-
-    interface WriteOptions {
-        addComment?: boolean;
-        includeContent?: boolean;
-        sourceRoot?: string | WriteMapper;
-        sourceMappingURLPrefix?: string | WriteMapper;
-    }
-
-    export function init(opts?: InitOptions): NodeJS.ReadWriteStream;
-    export function write(path?: string, opts?: WriteOptions): NodeJS.ReadWriteStream;
-    export function write(opts?: WriteOptions): NodeJS.ReadWriteStream;
-}
\ No newline at end of file
diff --git a/gulp-sourcemaps/index.d.ts b/gulp-sourcemaps/index.d.ts
new file mode 100644
index 0000000000..107c6560c1
--- /dev/null
+++ b/gulp-sourcemaps/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for gulp-sourcemaps
+// Project: https://github.com/floridoo/gulp-sourcemaps
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+interface InitOptions {
+    loadMaps?: boolean;
+    debug?: boolean;
+}
+
+interface WriteMapper {
+    (file: string): string;
+}
+
+interface WriteOptions {
+    addComment?: boolean;
+    includeContent?: boolean;
+    sourceRoot?: string | WriteMapper;
+    sourceMappingURLPrefix?: string | WriteMapper;
+}
+
+export declare function init(opts?: InitOptions): NodeJS.ReadWriteStream;
+export declare function write(path?: string, opts?: WriteOptions): NodeJS.ReadWriteStream;
+export declare function write(opts?: WriteOptions): NodeJS.ReadWriteStream;
diff --git a/gulp-sourcemaps/tsconfig.json b/gulp-sourcemaps/tsconfig.json
new file mode 100644
index 0000000000..83c223bf12
--- /dev/null
+++ b/gulp-sourcemaps/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-sourcemaps-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-strip-debug/gulp-strip-debug-tests.ts b/gulp-strip-debug/gulp-strip-debug-tests.ts
index e6571b32f5..9a0b04e48a 100644
--- a/gulp-strip-debug/gulp-strip-debug-tests.ts
+++ b/gulp-strip-debug/gulp-strip-debug-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="gulp-strip-debug.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import * as gulp from 'gulp';
 import * as stripDebug from 'gulp-strip-debug';
diff --git a/gulp-strip-debug/gulp-strip-debug.d.ts b/gulp-strip-debug/gulp-strip-debug.d.ts
deleted file mode 100644
index 782dea37be..0000000000
--- a/gulp-strip-debug/gulp-strip-debug.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Type definitions for gulp-strip-debug v1.1.0
-// Project: https://www.npmjs.com/package/gulp-strip-debug
-// Definitions by: Peter Juras <https://github.com/peterjuras>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/// <reference path="../node/node.d.ts" />
-
-declare module "gulp-strip-debug" {
-  const gulpStripDebug : () => NodeJS.ReadWriteStream;
-  export = gulpStripDebug;
-}
diff --git a/gulp-strip-debug/index.d.ts b/gulp-strip-debug/index.d.ts
new file mode 100644
index 0000000000..4c009b5091
--- /dev/null
+++ b/gulp-strip-debug/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for gulp-strip-debug v1.1.0
+// Project: https://www.npmjs.com/package/gulp-strip-debug
+// Definitions by: Peter Juras <https://github.com/peterjuras>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/// <reference types="node" />
+
+
+declare const gulpStripDebug: () => NodeJS.ReadWriteStream;
+export = gulpStripDebug;
diff --git a/gulp-strip-debug/tsconfig.json b/gulp-strip-debug/tsconfig.json
new file mode 100644
index 0000000000..860787d45d
--- /dev/null
+++ b/gulp-strip-debug/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-strip-debug-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-svg-sprite/gulp-svg-sprite-tests.ts b/gulp-svg-sprite/gulp-svg-sprite-tests.ts
index 6c1ba71df9..5029163b39 100644
--- a/gulp-svg-sprite/gulp-svg-sprite-tests.ts
+++ b/gulp-svg-sprite/gulp-svg-sprite-tests.ts
@@ -1,7 +1,3 @@
-/// <reference path="gulp-svg-sprite.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="../svg-sprite/svg-sprite.d.ts" />
-
 import svgSprite = require('gulp-svg-sprite');
 import spriter = require('svg-sprite');
 import gulp = require('gulp')
diff --git a/gulp-svg-sprite/gulp-svg-sprite.d.ts b/gulp-svg-sprite/gulp-svg-sprite.d.ts
deleted file mode 100644
index 036c9bb2ab..0000000000
--- a/gulp-svg-sprite/gulp-svg-sprite.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// Type definitions for gulp-svg-sprite 1.2.9
-// Project: https://github.com/jkphl/gulp-svg-sprite
-// Definitions by: Qubo <https://github.com/tkqubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../svg-sprite/svg-sprite.d.ts" />
-
-declare module "gulp-svg-sprite" {
-    import spriter = require('svg-sprite');
-
-    namespace svgSprite {
-        interface SvgSprite {
-            (options?: spriter.Config): NodeJS.ReadWriteStream;
-        }
-    }
-
-    var svgSprite: svgSprite.SvgSprite;
-
-    export = svgSprite;
-}
-
diff --git a/gulp-svg-sprite/index.d.ts b/gulp-svg-sprite/index.d.ts
new file mode 100644
index 0000000000..61c7b03f31
--- /dev/null
+++ b/gulp-svg-sprite/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for gulp-svg-sprite 1.2.9
+// Project: https://github.com/jkphl/gulp-svg-sprite
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import spriter = require('svg-sprite');
+
+declare namespace svgSprite {
+    interface SvgSprite {
+        (options?: spriter.Config): NodeJS.ReadWriteStream;
+    }
+}
+
+declare var svgSprite: svgSprite.SvgSprite;
+
+export = svgSprite;
diff --git a/gulp-svg-sprite/tsconfig.json b/gulp-svg-sprite/tsconfig.json
new file mode 100644
index 0000000000..cb5b65a7db
--- /dev/null
+++ b/gulp-svg-sprite/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-svg-sprite-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-task-listing/gulp-task-listing-tests.ts b/gulp-task-listing/gulp-task-listing-tests.ts
index 7d2c293d39..bb4ff09487 100644
--- a/gulp-task-listing/gulp-task-listing-tests.ts
+++ b/gulp-task-listing/gulp-task-listing-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="gulp-task-listing.d.ts" />
-
 import gulp = require('gulp');
 import gulpTaskListing = require('gulp-task-listing');
 
diff --git a/gulp-task-listing/gulp-task-listing.d.ts b/gulp-task-listing/gulp-task-listing.d.ts
deleted file mode 100644
index e78c598e3b..0000000000
--- a/gulp-task-listing/gulp-task-listing.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// Type definitions for gulp-task-listing
-// Project: https://github.com/OverZealous/gulp-task-listing
-// Definitions by: Joe Skeen <http://github.com/joeskeen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/** 
- * Provides an easy way to get a listing of your tasks from your gulpfile. By default, the 
- * output groups tasks based on whether or not they contain a hyphen (-), underscore (_), 
- * or colon (:) in their name.
- * 
- * You can optionally override the Regexp used to determine whether a task is a primary or 
- * subtask, as well as filter out tasks you don't want to see in the output.
- */
-declare module 'gulp-task-listing' {
-	
-	/** 
-	 * Provides an easy way to get a listing of your tasks from your gulpfile. By default, the 
-	 * output groups tasks based on whether or not they contain a hyphen (-), underscore (_), 
-	 * or colon (:) in their name.
-	 * 
-	 * You can optionally override the Regexp used to determine whether a task is a primary or 
-	 * subtask, as well as filter out tasks you don't want to see in the output.
-	 */
-	interface GulpTaskListing {
-		(cb: Function): void;
-		/**
-		 * Allows for custom filtering of Gulp tasks in the listing
-		 * 
-		 * @param subTaskFilter a RegExp or Function returning whether the given task is a subtask
-		 * @param excludeFilter a RegExp or Function returning whether the given task should be excluded from the listing
-		 */
-		withFilters(subTaskFilter: RegExp | FilterFunction, excludeFilter?: RegExp | FilterFunction): (cb: Function) => void;
-	}
-	
-	type FilterFunction = (task: string) => boolean;
-	
-	var gulpTaskListing: GulpTaskListing;
-	
-	export = gulpTaskListing;
-}
diff --git a/gulp-task-listing/index.d.ts b/gulp-task-listing/index.d.ts
new file mode 100644
index 0000000000..113c6acaf2
--- /dev/null
+++ b/gulp-task-listing/index.d.ts
@@ -0,0 +1,39 @@
+// Type definitions for gulp-task-listing
+// Project: https://github.com/OverZealous/gulp-task-listing
+// Definitions by: Joe Skeen <http://github.com/joeskeen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/** 
+ * Provides an easy way to get a listing of your tasks from your gulpfile. By default, the 
+ * output groups tasks based on whether or not they contain a hyphen (-), underscore (_), 
+ * or colon (:) in their name.
+ * 
+ * You can optionally override the Regexp used to determine whether a task is a primary or 
+ * subtask, as well as filter out tasks you don't want to see in the output.
+ */
+
+
+/** 
+ * Provides an easy way to get a listing of your tasks from your gulpfile. By default, the 
+ * output groups tasks based on whether or not they contain a hyphen (-), underscore (_), 
+ * or colon (:) in their name.
+ * 
+ * You can optionally override the Regexp used to determine whether a task is a primary or 
+ * subtask, as well as filter out tasks you don't want to see in the output.
+ */
+interface GulpTaskListing {
+    (cb: Function): void;
+    /**
+     * Allows for custom filtering of Gulp tasks in the listing
+     * 
+     * @param subTaskFilter a RegExp or Function returning whether the given task is a subtask
+     * @param excludeFilter a RegExp or Function returning whether the given task should be excluded from the listing
+     */
+    withFilters(subTaskFilter: RegExp | FilterFunction, excludeFilter?: RegExp | FilterFunction): (cb: Function) => void;
+}
+
+type FilterFunction = (task: string) => boolean;
+
+declare var gulpTaskListing: GulpTaskListing;
+
+export = gulpTaskListing;
diff --git a/gulp-task-listing/tsconfig.json b/gulp-task-listing/tsconfig.json
new file mode 100644
index 0000000000..2620a15d19
--- /dev/null
+++ b/gulp-task-listing/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-task-listing-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-tsd/gulp-tsd-tests.ts b/gulp-tsd/gulp-tsd-tests.ts
index 734db65e81..0b7a1dadea 100644
--- a/gulp-tsd/gulp-tsd-tests.ts
+++ b/gulp-tsd/gulp-tsd-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="./gulp-tsd.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import * as gulp from "gulp";
 import * as tsd from "gulp-tsd";
diff --git a/gulp-tsd/gulp-tsd.d.ts b/gulp-tsd/gulp-tsd.d.ts
deleted file mode 100644
index 9077228fec..0000000000
--- a/gulp-tsd/gulp-tsd.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Type definitions for gulp-tsd
-// Project: https://github.com/moznion/gulp-tsd
-// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
-
-declare module "gulp-tsd" {
-    import gulp = require('gulp');
-
-    interface IOptions {
-        command?: string;
-        latest?: boolean;
-        config?: string;
-        opts?: Object;
-    }
-
-    function tsd(opts?: IOptions, callback?: gulp.TaskCallback): NodeJS.ReadWriteStream;
-
-    namespace tsd {}
-
-    export = tsd;
-}
diff --git a/gulp-tsd/index.d.ts b/gulp-tsd/index.d.ts
new file mode 100644
index 0000000000..90bcd629ea
--- /dev/null
+++ b/gulp-tsd/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for gulp-tsd
+// Project: https://github.com/moznion/gulp-tsd
+// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import gulp = require('gulp');
+
+interface IOptions {
+    command?: string;
+    latest?: boolean;
+    config?: string;
+    opts?: Object;
+}
+
+declare function tsd(opts?: IOptions, callback?: gulp.TaskCallback): NodeJS.ReadWriteStream;
+
+declare namespace tsd { }
+
+export = tsd;
diff --git a/gulp-tsd/tsconfig.json b/gulp-tsd/tsconfig.json
new file mode 100644
index 0000000000..175447b12e
--- /dev/null
+++ b/gulp-tsd/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-tsd-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-tslint/gulp-tslint-tests.ts b/gulp-tslint/gulp-tslint-tests.ts
index 8658f103f0..75c79954a9 100644
--- a/gulp-tslint/gulp-tslint-tests.ts
+++ b/gulp-tslint/gulp-tslint-tests.ts
@@ -1,10 +1,6 @@
-/// <reference path="gulp-tslint.d.ts"/>
-/// <reference path="../gulp/gulp.d.ts"/>
-/// <reference path="../vinyl/vinyl.d.ts"/>
-
 import * as gulp from 'gulp';
 import * as tslint from 'gulp-tslint';
-import vinyl = require('vinyl');
+import vinyl = require('../vinyl');
 
 // Taken from gulp-tslint README https://github.com/panuhorsmalahti/gulp-tslint/blob/master/README.md
 
diff --git a/gulp-tslint/gulp-tslint.d.ts b/gulp-tslint/gulp-tslint.d.ts
deleted file mode 100644
index 6ce984d275..0000000000
--- a/gulp-tslint/gulp-tslint.d.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-// Type definitions for gulp-tslint 3.6.0
-// Project: https://github.com/panuhorsmalahti/gulp-tslint
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-/// <reference path="../vinyl/vinyl.d.ts"/>
-
-declare module "gulp-tslint" {
-    import vinyl = require("vinyl");
-
-    namespace gulpTsLint {
-        interface GulpTsLint {
-            (options?: Options): NodeJS.ReadWriteStream;
-            report(reporter?: Reporter, options?: ReportOptions): NodeJS.ReadWriteStream;
-            report(options?: ReportOptions): NodeJS.ReadWriteStream;
-        }
-
-        interface Options {
-            configuration?: {},
-            rulesDirectory?: string,
-            tslint?: GulpTsLint
-        }
-
-        interface ReportOptions {
-            emitError?: boolean,
-            reportLimit?: number,
-            summarizeFailureOutput?: boolean
-        }
-
-        interface Position {
-            position: number;
-            line: number;
-            character: number;
-        }
-
-        interface Output {
-            name: string;
-            failure: string;
-            startPosition: Position;
-            endPosition: Position;
-            ruleName: string;
-        }
-
-        type Reporter = string|((output: Output[], file: vinyl, options: ReportOptions) => any);
-    }
-
-    var gulpTsLint: gulpTsLint.GulpTsLint;
-    export = gulpTsLint;
-}
diff --git a/gulp-tslint/index.d.ts b/gulp-tslint/index.d.ts
new file mode 100644
index 0000000000..2e8f4e5a10
--- /dev/null
+++ b/gulp-tslint/index.d.ts
@@ -0,0 +1,47 @@
+// Type definitions for gulp-tslint 3.6.0
+// Project: https://github.com/panuhorsmalahti/gulp-tslint
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+import vinyl = require("../vinyl");
+
+declare namespace gulpTsLint {
+    interface GulpTsLint {
+        (options?: Options): NodeJS.ReadWriteStream;
+        report(reporter?: Reporter, options?: ReportOptions): NodeJS.ReadWriteStream;
+        report(options?: ReportOptions): NodeJS.ReadWriteStream;
+    }
+
+    interface Options {
+        configuration?: {},
+        rulesDirectory?: string,
+        tslint?: GulpTsLint
+    }
+
+    interface ReportOptions {
+        emitError?: boolean,
+        reportLimit?: number,
+        summarizeFailureOutput?: boolean
+    }
+
+    interface Position {
+        position: number;
+        line: number;
+        character: number;
+    }
+
+    interface Output {
+        name: string;
+        failure: string;
+        startPosition: Position;
+        endPosition: Position;
+        ruleName: string;
+    }
+
+    type Reporter = string | ((output: Output[], file: vinyl, options: ReportOptions) => any);
+}
+
+declare var gulpTsLint: gulpTsLint.GulpTsLint;
+export = gulpTsLint;
diff --git a/gulp-tslint/tsconfig.json b/gulp-tslint/tsconfig.json
new file mode 100644
index 0000000000..4d0ef18559
--- /dev/null
+++ b/gulp-tslint/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-tslint-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-typedoc/gulp-typedoc-tests.ts b/gulp-typedoc/gulp-typedoc-tests.ts
index 143fd776a3..753b7e15be 100644
--- a/gulp-typedoc/gulp-typedoc-tests.ts
+++ b/gulp-typedoc/gulp-typedoc-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./gulp-typedoc.d.ts"/>
-/// <reference path="../gulp/gulp.d.ts"/>
 import gulp = require("gulp");
 import typedoc = require("gulp-typedoc");
 
diff --git a/gulp-typedoc/gulp-typedoc.d.ts b/gulp-typedoc/gulp-typedoc.d.ts
deleted file mode 100644
index 865fac2b8d..0000000000
--- a/gulp-typedoc/gulp-typedoc.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Type definitions for gulp-typedoc
-// Project: https://github.com/rogierschouten/gulp-typedoc
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare module "gulp-typedoc" {
-    interface Options {
-        out: string;
-        mode?: string;
-        json?: string;
-        exclude?: string;
-        includeDeclarations?: boolean;
-        externalPattern?: string;
-        excludeExternals?: boolean;
-        module?: string;
-        target?: string;
-        theme?: string;
-        name?: string;
-        readme?: string;
-        hideGenerator?: boolean;
-        gaID?: string;
-        gaSite?: string;
-        verbose?: boolean;
-    }
-
-    function typedoc(opts: Options): NodeJS.ReadWriteStream;
-    export = typedoc;
-}
\ No newline at end of file
diff --git a/gulp-typedoc/index.d.ts b/gulp-typedoc/index.d.ts
new file mode 100644
index 0000000000..322f734fe7
--- /dev/null
+++ b/gulp-typedoc/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for gulp-typedoc
+// Project: https://github.com/rogierschouten/gulp-typedoc
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+interface Options {
+    out: string;
+    mode?: string;
+    json?: string;
+    exclude?: string;
+    includeDeclarations?: boolean;
+    externalPattern?: string;
+    excludeExternals?: boolean;
+    module?: string;
+    target?: string;
+    theme?: string;
+    name?: string;
+    readme?: string;
+    hideGenerator?: boolean;
+    gaID?: string;
+    gaSite?: string;
+    verbose?: boolean;
+}
+
+declare function typedoc(opts: Options): NodeJS.ReadWriteStream;
+export = typedoc;
diff --git a/gulp-typedoc/tsconfig.json b/gulp-typedoc/tsconfig.json
new file mode 100644
index 0000000000..e94c954b6a
--- /dev/null
+++ b/gulp-typedoc/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-typedoc-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-typescript/gulp-typescript-tests.ts b/gulp-typescript/gulp-typescript-tests.ts
index ab40e478d8..bf9bb03b4b 100644
--- a/gulp-typescript/gulp-typescript-tests.ts
+++ b/gulp-typescript/gulp-typescript-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./gulp-typescript.d.ts"/>
-/// <reference path="../gulp/gulp.d.ts"/>
 import gulp = require("gulp");
 import typescript = require("gulp-typescript");
 
diff --git a/gulp-typescript/gulp-typescript.d.ts b/gulp-typescript/gulp-typescript.d.ts
deleted file mode 100644
index a73c13773b..0000000000
--- a/gulp-typescript/gulp-typescript.d.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-// Type definitions for gulp-typescript
-// Project: https://github.com/ivogabe/gulp-typescript
-// Definitions by: Asana <https://asana.com>, Thomas Corbière <https://github.com/tomc974>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare module "gulp-typescript" {
-    function GulpTypescript(params?: GulpTypescript.Params, filters?: GulpTypescript.FilterSettings, reporter?: GulpTypescript.Reporter): GulpTypescript.CompilationStream;
-
-    namespace GulpTypescript {
-        export function createProject(params?: Params): Project;
-        export function createProject(file: string, params?: Params): Project;
-        export function filter(filters: FilterSettings): CompilationStream;
-        interface Params {
-            declarationFiles?: boolean;
-            module?: string;
-            noEmitOnError?: boolean;
-            noExternalResolve?: boolean;
-            noImplicitAny?: boolean;
-            noLib?: boolean;
-            removeComments?: boolean;
-            sourceRoot?: string; // use gulp-sourcemaps instead
-            sortOutput?: boolean;
-            target?: string;
-            typescript?: any;
-            outFile?: string;
-            outDir?: string;
-            suppressImplicitAnyIndexErrors?: boolean;
-            jsx?: string;
-            declaration?: boolean;
-            emitDecoratorMetadata?: boolean;
-            experimentalDecorators?: boolean;
-            experimentalAsyncFunctions?: boolean;
-            moduleResolution?: string;
-            noEmitHelpers?: boolean;
-            preserveConstEnums?: boolean;
-            isolatedModules?: boolean;
-        }
-
-        interface TsConfig {
-            files?: string[];
-            exclude?: string[];
-            compilerOptions?: any;
-        }
-
-        interface Project {
-            config: TsConfig;
-            src(): NodeJS.ReadWriteStream;
-        }
-
-        interface FilterSettings {
-            referencedFrom?: string[];
-        }
-
-        interface Reporter {
-            error(error: any): void;
-        }
-
-        interface CompilationStream extends NodeJS.ReadWriteStream {
-            dts: NodeJS.ReadWriteStream;
-            js: NodeJS.ReadWriteStream;
-        }
-
-        namespace reporter {
-            function nullReporter(): Reporter;
-            function defaultReporter(): Reporter;
-            function fullReporter(showFullFilename?: boolean): Reporter;
-        }
-    }
-
-    export = GulpTypescript;
-}
diff --git a/gulp-typescript/index.d.ts b/gulp-typescript/index.d.ts
new file mode 100644
index 0000000000..2ef2145bb5
--- /dev/null
+++ b/gulp-typescript/index.d.ts
@@ -0,0 +1,72 @@
+// Type definitions for gulp-typescript
+// Project: https://github.com/ivogabe/gulp-typescript
+// Definitions by: Asana <https://asana.com>, Thomas Corbière <https://github.com/tomc974>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+declare function GulpTypescript(params?: GulpTypescript.Params, filters?: GulpTypescript.FilterSettings, reporter?: GulpTypescript.Reporter): GulpTypescript.CompilationStream;
+
+declare namespace GulpTypescript {
+    export function createProject(params?: Params): Project;
+    export function createProject(file: string, params?: Params): Project;
+    export function filter(filters: FilterSettings): CompilationStream;
+    interface Params {
+        declarationFiles?: boolean;
+        module?: string;
+        noEmitOnError?: boolean;
+        noExternalResolve?: boolean;
+        noImplicitAny?: boolean;
+        noLib?: boolean;
+        removeComments?: boolean;
+        sourceRoot?: string; // use gulp-sourcemaps instead
+        sortOutput?: boolean;
+        target?: string;
+        typescript?: any;
+        outFile?: string;
+        outDir?: string;
+        suppressImplicitAnyIndexErrors?: boolean;
+        jsx?: string;
+        declaration?: boolean;
+        emitDecoratorMetadata?: boolean;
+        experimentalDecorators?: boolean;
+        experimentalAsyncFunctions?: boolean;
+        moduleResolution?: string;
+        noEmitHelpers?: boolean;
+        preserveConstEnums?: boolean;
+        isolatedModules?: boolean;
+    }
+
+    interface TsConfig {
+        files?: string[];
+        exclude?: string[];
+        compilerOptions?: any;
+    }
+
+    interface Project {
+        config: TsConfig;
+        src(): NodeJS.ReadWriteStream;
+    }
+
+    interface FilterSettings {
+        referencedFrom?: string[];
+    }
+
+    interface Reporter {
+        error(error: any): void;
+    }
+
+    interface CompilationStream extends NodeJS.ReadWriteStream {
+        dts: NodeJS.ReadWriteStream;
+        js: NodeJS.ReadWriteStream;
+    }
+
+    namespace reporter {
+        function nullReporter(): Reporter;
+        function defaultReporter(): Reporter;
+        function fullReporter(showFullFilename?: boolean): Reporter;
+    }
+}
+
+export = GulpTypescript;
diff --git a/gulp-typescript/tsconfig.json b/gulp-typescript/tsconfig.json
new file mode 100644
index 0000000000..4d0a3e7412
--- /dev/null
+++ b/gulp-typescript/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-typescript-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-uglify/gulp-uglify-tests.ts b/gulp-uglify/gulp-uglify-tests.ts
index 01cfb06f9e..2a664dfd09 100644
--- a/gulp-uglify/gulp-uglify-tests.ts
+++ b/gulp-uglify/gulp-uglify-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="gulp-uglify.d.ts"/>
-/// <reference path="../gulp/gulp.d.ts"/>
-
 import * as gulp from 'gulp';
 import * as uglify from 'gulp-uglify';
 
diff --git a/gulp-uglify/gulp-uglify.d.ts b/gulp-uglify/gulp-uglify.d.ts
deleted file mode 100644
index 13eda63706..0000000000
--- a/gulp-uglify/gulp-uglify.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// Type definitions for gulp-uglify
-// Project: https://github.com/terinjokes/gulp-uglify
-// Definitions by: Christopher Haws <https://github.com/ChristopherHaws/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-/// <reference path="../uglify-js/uglify-js.d.ts"/>
-
-declare module "gulp-uglify" {
-    import * as UglifyJS from 'uglify-js';
-
-    namespace GulpUglify {
-        interface Options {
-            /**
-             * Pass false to skip mangling names.
-             */
-            mangle?: boolean;
-
-            /**
-             * Pass if you wish to specify additional output options. The defaults are optimized for best compression.
-             */
-            output?: UglifyJS.BeautifierOptions;
-
-            /**
-             * Pass an object to specify custom compressor options. Pass false to skip compression completely.
-             */
-            compress?: UglifyJS.CompressorOptions | boolean;
-
-            /**
-             * A convenience option for options.output.comments. Defaults to preserving no comments.
-             * all - Preserve all comments in code blocks
-             * some - Preserve comments that start with a bang (!) or include a Closure Compiler directive (@preserve, @license, @cc_on)
-             * function - Specify your own comment preservation function. You will be passed the current node and the current comment and are expected to return either true or false.
-             */
-            preserverComments?: string|((node: any, comment: UglifyJS.Tokenizer) => boolean);
-        }
-    }
-
-    function GulpUglify(options?: GulpUglify.Options): NodeJS.ReadWriteStream;
-
-    export = GulpUglify;
-}
diff --git a/gulp-uglify/index.d.ts b/gulp-uglify/index.d.ts
new file mode 100644
index 0000000000..649315299a
--- /dev/null
+++ b/gulp-uglify/index.d.ts
@@ -0,0 +1,39 @@
+// Type definitions for gulp-uglify
+// Project: https://github.com/terinjokes/gulp-uglify
+// Definitions by: Christopher Haws <https://github.com/ChristopherHaws/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+import * as UglifyJS from 'uglify-js';
+
+declare namespace GulpUglify {
+    interface Options {
+        /**
+         * Pass false to skip mangling names.
+         */
+        mangle?: boolean;
+
+        /**
+         * Pass if you wish to specify additional output options. The defaults are optimized for best compression.
+         */
+        output?: UglifyJS.BeautifierOptions;
+
+        /**
+         * Pass an object to specify custom compressor options. Pass false to skip compression completely.
+         */
+        compress?: UglifyJS.CompressorOptions | boolean;
+
+        /**
+         * A convenience option for options.output.comments. Defaults to preserving no comments.
+         * all - Preserve all comments in code blocks
+         * some - Preserve comments that start with a bang (!) or include a Closure Compiler directive (@preserve, @license, @cc_on)
+         * function - Specify your own comment preservation function. You will be passed the current node and the current comment and are expected to return either true or false.
+         */
+        preserverComments?: string | ((node: any, comment: UglifyJS.Tokenizer) => boolean);
+    }
+}
+
+declare function GulpUglify(options?: GulpUglify.Options): NodeJS.ReadWriteStream;
+
+export = GulpUglify;
diff --git a/gulp-uglify/tsconfig.json b/gulp-uglify/tsconfig.json
new file mode 100644
index 0000000000..4c9ef05696
--- /dev/null
+++ b/gulp-uglify/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-uglify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-useref/gulp-useref-tests.ts b/gulp-useref/gulp-useref-tests.ts
index 6af7aaab89..1f1a152be0 100644
--- a/gulp-useref/gulp-useref-tests.ts
+++ b/gulp-useref/gulp-useref-tests.ts
@@ -1,12 +1,4 @@
-/// <reference path="gulp-useref.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="../gulp-if/gulp-if.d.ts" />
-/// <reference path="../gulp-uglify/gulp-uglify.d.ts" />
-/// <reference path="../gulp-minify-css/gulp-minify-css.d.ts" />
-/// <reference path="../gulp-sourcemaps/gulp-sourcemaps.d.ts" />
-/// <reference path="../lazypipe/lazypipe.d.ts" />
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../gulp-typescript/gulp-typescript.d.ts" />
+/// <reference types="node" />
 
 import * as gulp from 'gulp';
 import * as useref from 'gulp-useref';
diff --git a/gulp-useref/gulp-useref.d.ts b/gulp-useref/gulp-useref.d.ts
deleted file mode 100644
index 96c214532b..0000000000
--- a/gulp-useref/gulp-useref.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Type definitions for gulp-useref v3.0.0
-// Project: https://github.com/jonkemp/gulp-useref
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'gulp-useref' {
-    interface Options {
-        searchPath?: string | string[];
-        base?: string;
-        noAssets?: boolean;
-        noconcat?: boolean;
-        additionalStreams?: Array<NodeJS.ReadWriteStream>;
-        transformPath?: (filePath: string) => void;
-    }
-
-    interface Useref {
-        (options?: Options, ...transformStreams: NodeJS.ReadWriteStream[]): NodeJS.ReadWriteStream;
-    }
-
-    var useref: Useref;
-    export = useref;
-}
diff --git a/gulp-useref/index.d.ts b/gulp-useref/index.d.ts
new file mode 100644
index 0000000000..ba95c68308
--- /dev/null
+++ b/gulp-useref/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for gulp-useref v3.0.0
+// Project: https://github.com/jonkemp/gulp-useref
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+interface Options {
+    searchPath?: string | string[];
+    base?: string;
+    noAssets?: boolean;
+    noconcat?: boolean;
+    additionalStreams?: Array<NodeJS.ReadWriteStream>;
+    transformPath?: (filePath: string) => void;
+}
+
+interface Useref {
+    (options?: Options, ...transformStreams: NodeJS.ReadWriteStream[]): NodeJS.ReadWriteStream;
+}
+
+declare var useref: Useref;
+export = useref;
diff --git a/gulp-useref/tsconfig.json b/gulp-useref/tsconfig.json
new file mode 100644
index 0000000000..e506ac7582
--- /dev/null
+++ b/gulp-useref/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-useref-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-util/gulp-util-tests.ts b/gulp-util/gulp-util-tests.ts
index 6b5f756737..0616401310 100644
--- a/gulp-util/gulp-util-tests.ts
+++ b/gulp-util/gulp-util-tests.ts
@@ -1,8 +1,5 @@
-/// <reference path="../mocha/mocha.d.ts" />
-/// <reference path="../should/should.d.ts" />
-/// <reference path='../gulp/gulp.d.ts' />
-/// <reference path='../through2/through2.d.ts' />
-/// <reference path='gulp-util.d.ts' />
+/// <reference types="mocha" />
+/// <reference types="should" />
 
 import gulp = require('gulp');
 import util = require('gulp-util');
diff --git a/gulp-util/gulp-util.d.ts b/gulp-util/gulp-util.d.ts
deleted file mode 100644
index 9982835cf9..0000000000
--- a/gulp-util/gulp-util.d.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-// Type definitions for gulp-util v3.0.x
-// Project: https://github.com/gulpjs/gulp-util
-// Definitions by: jedmao <https://github.com/jedmao>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../vinyl/vinyl.d.ts" />
-/// <reference path="../chalk/chalk.d.ts" />
-/// <reference path="../through2/through2.d.ts" />
-
-declare module 'gulp-util' {
-
-	import vinyl = require('vinyl');
-	import chalk = require('chalk');
-	import through2 = require('through2');
-
-	export class File extends vinyl { }
-
-	/**
-	* Replaces a file extension in a path. Returns the new path.
-	*/
-	export function replaceExtension(npath: string, ext: string): string;
-
-	export var colors: typeof chalk;
-
-	export var date: {
-		(now?: Date, mask?: string, convertLocalTimeToUTC?: boolean): any;
-		(date?: string, mask?: string, convertLocalTimeToUTC?: boolean): any;
-		masks: any;
-	};
-
-	/**
-	* Logs stuff. Already prefixed with [gulp] and all that. Use the right colors
-	* for values. If you pass in multiple arguments it will join them by a space.
-	*/
-	export function log(message?: any, ...optionalParams: any[]): void;
-
-	/**
-	* This is a lodash.template function wrapper. You must pass in a valid gulp
-	* file object so it is available to the user or it will error. You can not
-	* configure any of the delimiters. Look at the lodash docs for more info.
-	*/
-	export function template(tmpl: string): (opt: { file: { path: string } }) => string;
-	export function template(tmpl: string, opt: { file: { path: string } }): string;
-
-	export var env: any;
-
-	export function beep(): void;
-
-	/**
-	* Returns a stream that does nothing but pass data straight through.
-	*/
-	export var noop: typeof through2;
-
-	export function isStream(obj: any): boolean;
-
-	export function isBuffer(obj: any): boolean;
-
-	export function isNull(obj: any): boolean;
-
-	export var linefeed: string;
-
-	export function combine(streams: NodeJS.ReadWriteStream[]): () => NodeJS.ReadWriteStream;
-	export function combine(...streams: NodeJS.ReadWriteStream[]): () => NodeJS.ReadWriteStream;
-
-	/**
-	* This is similar to es.wait but instead of buffering text into one string
-	* it buffers anything into an array (so very useful for file objects).
-	*/
-	export function buffer(cb?: (err: Error, data: any[]) => void): NodeJS.ReadWriteStream;
-
-	export class PluginError implements Error, PluginErrorOptions {
-		constructor(options?: PluginErrorOptions);
-		constructor(pluginName: string, options?: PluginErrorOptions);
-		constructor(pluginName: string, message: string, options?: PluginErrorOptions);
-		constructor(pluginName: string, message: Error, options?: PluginErrorOptions);
-		/**
-		* The module name of your plugin.
-		*/
-		name: string;
-		/**
-		* Can be a string or an existing error.
-		*/
-		message: any;
-		fileName: string;
-		lineNumber: number;
-		/**
-		* You need to include the message along with this stack. If you pass an
-		* error in as the message the stack will be pulled from that, otherwise one
-		* will be created.
-		*/
-		stack: string;
-		/**
-		* By default the stack will not be shown. Set this to true if you think the
-		* stack is important for your error.
-		*/
-		showStack: boolean;
-		/**
-		* Error properties will be included in err.toString(). Can be omitted by
-		* setting this to false.
-		*/
-		showProperties: boolean;
-		plugin: string;
-		error: Error;
-	}
-
-}
-
-interface PluginErrorOptions {
-	/**
-	* The module name of your plugin.
-	*/
-	name?: string;
-	/**
-	* Can be a string or an existing error.
-	*/
-	message?: any;
-	fileName?: string;
-	lineNumber?: number;
-	/**
-	* You need to include the message along with this stack. If you pass an
-	* error in as the message the stack will be pulled from that, otherwise one
-	* will be created.
-	*/
-	stack?: string;
-	/**
-	* By default the stack will not be shown. Set this to true if you think the
-	* stack is important for your error.
-	*/
-	showStack?: boolean;
-	/**
-	* Error properties will be included in err.toString(). Can be omitted by
-	* setting this to false.
-	*/
-	showProperties?: boolean;
-	plugin?: string;
-	error?: Error;
-}
diff --git a/gulp-util/index.d.ts b/gulp-util/index.d.ts
new file mode 100644
index 0000000000..3543a65cad
--- /dev/null
+++ b/gulp-util/index.d.ts
@@ -0,0 +1,132 @@
+// Type definitions for gulp-util v3.0.x
+// Project: https://github.com/gulpjs/gulp-util
+// Definitions by: jedmao <https://github.com/jedmao>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+/// <reference types="chalk" />
+
+import vinyl = require('../vinyl');
+import chalk = require('chalk');
+import through2 = require('through2');
+
+export class File extends vinyl { }
+
+/**
+* Replaces a file extension in a path. Returns the new path.
+*/
+export function replaceExtension(npath: string, ext: string): string;
+
+export var colors: typeof chalk;
+
+export var date: {
+	(now?: Date, mask?: string, convertLocalTimeToUTC?: boolean): any;
+	(date?: string, mask?: string, convertLocalTimeToUTC?: boolean): any;
+	masks: any;
+};
+
+/**
+* Logs stuff. Already prefixed with [gulp] and all that. Use the right colors
+* for values. If you pass in multiple arguments it will join them by a space.
+*/
+export function log(message?: any, ...optionalParams: any[]): void;
+
+/**
+* This is a lodash.template function wrapper. You must pass in a valid gulp
+* file object so it is available to the user or it will error. You can not
+* configure any of the delimiters. Look at the lodash docs for more info.
+*/
+export function template(tmpl: string): (opt: { file: { path: string } }) => string;
+export function template(tmpl: string, opt: { file: { path: string } }): string;
+
+export var env: any;
+
+export function beep(): void;
+
+/**
+* Returns a stream that does nothing but pass data straight through.
+*/
+export var noop: typeof through2;
+
+export function isStream(obj: any): boolean;
+
+export function isBuffer(obj: any): boolean;
+
+export function isNull(obj: any): boolean;
+
+export var linefeed: string;
+
+export function combine(streams: NodeJS.ReadWriteStream[]): () => NodeJS.ReadWriteStream;
+export function combine(...streams: NodeJS.ReadWriteStream[]): () => NodeJS.ReadWriteStream;
+
+/**
+* This is similar to es.wait but instead of buffering text into one string
+* it buffers anything into an array (so very useful for file objects).
+*/
+export function buffer(cb?: (err: Error, data: any[]) => void): NodeJS.ReadWriteStream;
+
+export class PluginError implements Error, PluginErrorOptions {
+	constructor(options?: PluginErrorOptions);
+	constructor(pluginName: string, options?: PluginErrorOptions);
+	constructor(pluginName: string, message: string, options?: PluginErrorOptions);
+	constructor(pluginName: string, message: Error, options?: PluginErrorOptions);
+	/**
+	* The module name of your plugin.
+	*/
+	name: string;
+	/**
+	* Can be a string or an existing error.
+	*/
+	message: any;
+	fileName: string;
+	lineNumber: number;
+	/**
+	* You need to include the message along with this stack. If you pass an
+	* error in as the message the stack will be pulled from that, otherwise one
+	* will be created.
+	*/
+	stack: string;
+	/**
+	* By default the stack will not be shown. Set this to true if you think the
+	* stack is important for your error.
+	*/
+	showStack: boolean;
+	/**
+	* Error properties will be included in err.toString(). Can be omitted by
+	* setting this to false.
+	*/
+	showProperties: boolean;
+	plugin: string;
+	error: Error;
+}
+
+export interface PluginErrorOptions {
+	/**
+	* The module name of your plugin.
+	*/
+	name?: string;
+	/**
+	* Can be a string or an existing error.
+	*/
+	message?: any;
+	fileName?: string;
+	lineNumber?: number;
+	/**
+	* You need to include the message along with this stack. If you pass an
+	* error in as the message the stack will be pulled from that, otherwise one
+	* will be created.
+	*/
+	stack?: string;
+	/**
+	* By default the stack will not be shown. Set this to true if you think the
+	* stack is important for your error.
+	*/
+	showStack?: boolean;
+	/**
+	* Error properties will be included in err.toString(). Can be omitted by
+	* setting this to false.
+	*/
+	showProperties?: boolean;
+	plugin?: string;
+	error?: Error;
+}
diff --git a/gulp-util/tsconfig.json b/gulp-util/tsconfig.json
new file mode 100644
index 0000000000..226b76842d
--- /dev/null
+++ b/gulp-util/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-util-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp-watch/gulp-watch-tests.ts b/gulp-watch/gulp-watch-tests.ts
index d912199fdd..56a676bc65 100644
--- a/gulp-watch/gulp-watch-tests.ts
+++ b/gulp-watch/gulp-watch-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="gulp-watch.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
-
 import * as gulp from 'gulp';
 import * as watch from 'gulp-watch';
 
diff --git a/gulp-watch/gulp-watch.d.ts b/gulp-watch/gulp-watch.d.ts
deleted file mode 100644
index 7b2f8a1a30..0000000000
--- a/gulp-watch/gulp-watch.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// Type definitions for gulp-watch v4.1.1
-// Project: https://github.com/floatdrop/gulp-watch
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'gulp-watch' {
-    interface IOptions {
-        ignoreInitial?: boolean;
-        events?: Array<string>;
-        base?: string;
-        name?: string;
-        verbose?: boolean;
-        readDelay?: number;
-    }
-
-    interface IWatchStream extends NodeJS.ReadWriteStream {
-        add(path: string | Array<string>): NodeJS.ReadWriteStream;
-        unwatch(path: string | Array<string>): NodeJS.ReadWriteStream;
-        close(): NodeJS.ReadWriteStream;
-    }
-
-    function watch(glob: string | Array<string>, options?: IOptions, callback?: Function): IWatchStream;
-    namespace watch {}
-    export = watch;
-}
diff --git a/gulp-watch/index.d.ts b/gulp-watch/index.d.ts
new file mode 100644
index 0000000000..de56633491
--- /dev/null
+++ b/gulp-watch/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for gulp-watch v4.1.1
+// Project: https://github.com/floatdrop/gulp-watch
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+interface IOptions {
+    ignoreInitial?: boolean;
+    events?: Array<string>;
+    base?: string;
+    name?: string;
+    verbose?: boolean;
+    readDelay?: number;
+}
+
+interface IWatchStream extends NodeJS.ReadWriteStream {
+    add(path: string | Array<string>): NodeJS.ReadWriteStream;
+    unwatch(path: string | Array<string>): NodeJS.ReadWriteStream;
+    close(): NodeJS.ReadWriteStream;
+}
+
+declare function watch(glob: string | Array<string>, options?: IOptions, callback?: Function): IWatchStream;
+declare namespace watch { }
+export = watch;
diff --git a/gulp-watch/tsconfig.json b/gulp-watch/tsconfig.json
new file mode 100644
index 0000000000..d8edbede79
--- /dev/null
+++ b/gulp-watch/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-watch-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/gulp/gulp-tests.ts b/gulp/gulp-tests.ts
index d006908817..9660b0658a 100644
--- a/gulp/gulp-tests.ts
+++ b/gulp/gulp-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="gulp.d.ts" />
-/// <reference path="../browser-sync/browser-sync.d.ts"/>
-
 import gulp = require("gulp");
 import browserSync = require("browser-sync");
 
diff --git a/gulp/gulp.d.ts b/gulp/gulp.d.ts
deleted file mode 100644
index 43bb5aa597..0000000000
--- a/gulp/gulp.d.ts
+++ /dev/null
@@ -1,290 +0,0 @@
-// Type definitions for Gulp v3.8.x
-// Project: http://gulpjs.com
-// Definitions by: Drew Noakes <https://drewnoakes.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../orchestrator/orchestrator.d.ts" />
-
-declare module "gulp" {
-    import Orchestrator = require("orchestrator");
-
-    namespace gulp {
-        interface Gulp extends Orchestrator {
-            /**
-             * Define a task
-             * @param name The name of the task.
-             * @param deps An array of task names to be executed and completed before your task will run.
-             * @param fn The function that performs the task's operations. For asynchronous tasks, you need to provide a hint when the task is complete:
-             * <ul>
-             *     <li>Take in a callback</li>
-             *     <li>Return a stream or a promise</li>
-             * </ul>
-             */
-            task: Orchestrator.AddMethod;
-            /**
-             * Emits files matching provided glob or an array of globs. Returns a stream of Vinyl files that can be piped to plugins.
-             * @param glob Glob or array of globs to read.
-             * @param opt Options to pass to node-glob through glob-stream.
-             */
-            src: SrcMethod;
-            /**
-             * Can be piped to and it will write files. Re-emits all data passed to it so you can pipe to multiple folders.
-             * Folders that don't exist will be created.
-             *
-             * @param outFolder The path (output folder) to write files to. Or a function that returns it, the function will be provided a vinyl File instance.
-             * @param opt
-             */
-            dest: DestMethod;
-            /**
-             * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
-             *
-             * @param glob a single glob or array of globs that indicate which files to watch for changes.
-             * @param opt options, that are passed to the gaze library.
-             * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
-             */
-            watch: WatchMethod;
-        }
-
-        interface GulpPlugin {
-            (...args: any[]): NodeJS.ReadWriteStream;
-        }
-
-        interface WatchMethod {
-            /**
-             * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
-             *
-             * @param glob a single glob or array of globs that indicate which files to watch for changes.
-             * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
-             */
-            (glob: string|string[], fn: (WatchCallback|string)): NodeJS.EventEmitter;
-            /**
-             * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
-             *
-             * @param glob a single glob or array of globs that indicate which files to watch for changes.
-             * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
-             */
-            (glob: string|string[], fn: (WatchCallback|string)[]): NodeJS.EventEmitter;
-            /**
-             * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
-             *
-             * @param glob a single glob or array of globs that indicate which files to watch for changes.
-             * @param opt options, that are passed to the gaze library.
-             * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
-             */
-            (glob: string|string[], opt: WatchOptions, fn: (WatchCallback|string)): NodeJS.EventEmitter;
-            /**
-             * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
-             *
-             * @param glob a single glob or array of globs that indicate which files to watch for changes.
-             * @param opt options, that are passed to the gaze library.
-             * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
-             */
-            (glob: string|string[], opt: WatchOptions, fn: (WatchCallback|string)[]): NodeJS.EventEmitter;
-
-        }
-
-        interface DestMethod {
-            /**
-             * Can be piped to and it will write files. Re-emits all data passed to it so you can pipe to multiple folders.
-             * Folders that don't exist will be created.
-             *
-             * @param outFolder The path (output folder) to write files to. Or a function that returns it, the function will be provided a vinyl File instance.
-             * @param opt
-             */
-            (outFolder: string|((file: string) => string), opt?: DestOptions): NodeJS.ReadWriteStream;
-        }
-
-        interface SrcMethod {
-            /**
-             * Emits files matching provided glob or an array of globs. Returns a stream of Vinyl files that can be piped to plugins.
-             * @param glob Glob or array of globs to read.
-             * @param opt Options to pass to node-glob through glob-stream.
-             */
-            (glob: string|string[], opt?: SrcOptions): NodeJS.ReadWriteStream;
-        }
-
-        /**
-         * Options to pass to node-glob through glob-stream.
-         * Specifies two options in addition to those used by node-glob:
-         * https://github.com/isaacs/node-glob#options
-         */
-        interface SrcOptions {
-            /**
-             * Setting this to <code>false</code> will return <code>file.contents</code> as <code>null</code>
-             * and not read the file at all.
-             * Default: <code>true</code>.
-             */
-            read?: boolean;
-
-            /**
-             * Setting this to false will return <code>file.contents</code> as a stream and not buffer files.
-             * This is useful when working with large files.
-             * Note: Plugins might not implement support for streams.
-             * Default: <code>true</code>.
-             */
-            buffer?: boolean;
-
-            /**
-             * The base path of a glob.
-             *
-             * Default is everything before a glob starts.
-             */
-            base?: string;
-
-            /**
-             * The current working directory in which to search.
-             * Defaults to process.cwd().
-             */
-            cwd?: string;
-
-            /**
-             * The place where patterns starting with / will be mounted onto.
-             * Defaults to path.resolve(options.cwd, "/") (/ on Unix systems, and C:\ or some such on Windows.)
-             */
-            root?: string;
-
-            /**
-             * Include .dot files in normal matches and globstar matches.
-             * Note that an explicit dot in a portion of the pattern will always match dot files.
-             */
-            dot?: boolean;
-
-            /**
-             * By default, a pattern starting with a forward-slash will be "mounted" onto the root setting, so that a valid
-             * filesystem path is returned. Set this flag to disable that behavior.
-             */
-            nomount?: boolean;
-
-            /**
-             * Add a / character to directory matches. Note that this requires additional stat calls.
-             */
-            mark?: boolean;
-
-            /**
-             * Don't sort the results.
-             */
-            nosort?: boolean;
-
-            /**
-             * Set to true to stat all results. This reduces performance somewhat, and is completely unnecessary, unless
-             * readdir is presumed to be an untrustworthy indicator of file existence. It will cause ELOOP to be triggered one
-             * level sooner in the case of cyclical symbolic links.
-             */
-            stat?: boolean;
-
-            /**
-             * When an unusual error is encountered when attempting to read a directory, a warning will be printed to stderr.
-             * Set the silent option to true to suppress these warnings.
-             */
-            silent?: boolean;
-
-            /**
-             * When an unusual error is encountered when attempting to read a directory, the process will just continue on in
-             * search of other matches. Set the strict option to raise an error in these cases.
-             */
-            strict?: boolean;
-
-            /**
-             * See cache property above. Pass in a previously generated cache object to save some fs calls.
-             */
-            cache?: boolean;
-
-            /**
-             * A cache of results of filesystem information, to prevent unnecessary stat calls.
-             * While it should not normally be necessary to set this, you may pass the statCache from one glob() call to the
-             * options object of another, if you know that the filesystem will not change between calls.
-             */
-            statCache?: boolean;
-
-            /**
-             * Perform a synchronous glob search.
-             */
-            sync?: boolean;
-
-            /**
-             * In some cases, brace-expanded patterns can result in the same file showing up multiple times in the result set.
-             * By default, this implementation prevents duplicates in the result set. Set this flag to disable that behavior.
-             */
-            nounique?: boolean;
-
-            /**
-             * Set to never return an empty set, instead returning a set containing the pattern itself.
-             * This is the default in glob(3).
-             */
-            nonull?: boolean;
-
-            /**
-             * Perform a case-insensitive match. Note that case-insensitive filesystems will sometimes result in glob returning
-             * results that are case-insensitively matched anyway, since readdir and stat will not raise an error.
-             */
-            nocase?: boolean;
-
-            /**
-             * Set to enable debug logging in minimatch and glob.
-             */
-            debug?: boolean;
-
-            /**
-             * Set to enable debug logging in glob, but not minimatch.
-             */
-            globDebug?: boolean;
-        }
-
-        interface DestOptions {
-            /**
-             * The output folder. Only has an effect if provided output folder is relative.
-             * Default: process.cwd()
-             */
-            cwd?: string;
-
-            /**
-             * Octal permission string specifying mode for any folders that need to be created for output folder.
-             * Default: 0777.
-             */
-            mode?: string;
-        }
-
-        /**
-         * Options that are passed to <code>gaze</code>.
-         * https://github.com/shama/gaze
-         */
-        interface WatchOptions {
-            /** Interval to pass to fs.watchFile. */
-            interval?: number;
-            /** Delay for events called in succession for the same file/event. */
-            debounceDelay?: number;
-            /** Force the watch mode. Either 'auto' (default), 'watch' (force native events), or 'poll' (force stat polling). */
-            mode?: string;
-            /** The current working directory to base file patterns from. Default is process.cwd().. */
-            cwd?: string;
-        }
-
-        interface WatchEvent {
-            /** The type of change that occurred, either added, changed or deleted. */
-            type: string;
-            /** The path to the file that triggered the event. */
-            path: string;
-        }
-
-        /**
-         * Callback to be called on each watched file change.
-         */
-        interface WatchCallback {
-            (event: WatchEvent): void;
-        }
-
-        interface TaskCallback {
-            /**
-             * Defines a task.
-             * Tasks may be made asynchronous if they are passing a callback or return a promise or a stream.
-             * @param cb callback used to signal asynchronous completion. Caller includes <code>err</code> in case of error.
-             */
-            (cb?: (err?: any) => void): any;
-        }
-    }
-
-    var gulp: gulp.Gulp;
-
-    export = gulp;
-}
diff --git a/gulp/index.d.ts b/gulp/index.d.ts
new file mode 100644
index 0000000000..df64efeddd
--- /dev/null
+++ b/gulp/index.d.ts
@@ -0,0 +1,289 @@
+// Type definitions for Gulp v3.8.x
+// Project: http://gulpjs.com
+// Definitions by: Drew Noakes <https://drewnoakes.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+/// <reference types="orchestrator" />
+
+
+import Orchestrator = require("orchestrator");
+
+declare namespace gulp {
+    interface Gulp extends Orchestrator {
+        /**
+         * Define a task
+         * @param name The name of the task.
+         * @param deps An array of task names to be executed and completed before your task will run.
+         * @param fn The function that performs the task's operations. For asynchronous tasks, you need to provide a hint when the task is complete:
+         * <ul>
+         *     <li>Take in a callback</li>
+         *     <li>Return a stream or a promise</li>
+         * </ul>
+         */
+        task: Orchestrator.AddMethod;
+        /**
+         * Emits files matching provided glob or an array of globs. Returns a stream of Vinyl files that can be piped to plugins.
+         * @param glob Glob or array of globs to read.
+         * @param opt Options to pass to node-glob through glob-stream.
+         */
+        src: SrcMethod;
+        /**
+         * Can be piped to and it will write files. Re-emits all data passed to it so you can pipe to multiple folders.
+         * Folders that don't exist will be created.
+         *
+         * @param outFolder The path (output folder) to write files to. Or a function that returns it, the function will be provided a vinyl File instance.
+         * @param opt
+         */
+        dest: DestMethod;
+        /**
+         * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
+         *
+         * @param glob a single glob or array of globs that indicate which files to watch for changes.
+         * @param opt options, that are passed to the gaze library.
+         * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
+         */
+        watch: WatchMethod;
+    }
+
+    interface GulpPlugin {
+        (...args: any[]): NodeJS.ReadWriteStream;
+    }
+
+    interface WatchMethod {
+        /**
+         * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
+         *
+         * @param glob a single glob or array of globs that indicate which files to watch for changes.
+         * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
+         */
+        (glob: string | string[], fn: (WatchCallback | string)): NodeJS.EventEmitter;
+        /**
+         * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
+         *
+         * @param glob a single glob or array of globs that indicate which files to watch for changes.
+         * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
+         */
+        (glob: string | string[], fn: (WatchCallback | string)[]): NodeJS.EventEmitter;
+        /**
+         * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
+         *
+         * @param glob a single glob or array of globs that indicate which files to watch for changes.
+         * @param opt options, that are passed to the gaze library.
+         * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
+         */
+        (glob: string | string[], opt: WatchOptions, fn: (WatchCallback | string)): NodeJS.EventEmitter;
+        /**
+         * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
+         *
+         * @param glob a single glob or array of globs that indicate which files to watch for changes.
+         * @param opt options, that are passed to the gaze library.
+         * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
+         */
+        (glob: string | string[], opt: WatchOptions, fn: (WatchCallback | string)[]): NodeJS.EventEmitter;
+
+    }
+
+    interface DestMethod {
+        /**
+         * Can be piped to and it will write files. Re-emits all data passed to it so you can pipe to multiple folders.
+         * Folders that don't exist will be created.
+         *
+         * @param outFolder The path (output folder) to write files to. Or a function that returns it, the function will be provided a vinyl File instance.
+         * @param opt
+         */
+        (outFolder: string | ((file: string) => string), opt?: DestOptions): NodeJS.ReadWriteStream;
+    }
+
+    interface SrcMethod {
+        /**
+         * Emits files matching provided glob or an array of globs. Returns a stream of Vinyl files that can be piped to plugins.
+         * @param glob Glob or array of globs to read.
+         * @param opt Options to pass to node-glob through glob-stream.
+         */
+        (glob: string | string[], opt?: SrcOptions): NodeJS.ReadWriteStream;
+    }
+
+    /**
+     * Options to pass to node-glob through glob-stream.
+     * Specifies two options in addition to those used by node-glob:
+     * https://github.com/isaacs/node-glob#options
+     */
+    interface SrcOptions {
+        /**
+         * Setting this to <code>false</code> will return <code>file.contents</code> as <code>null</code>
+         * and not read the file at all.
+         * Default: <code>true</code>.
+         */
+        read?: boolean;
+
+        /**
+         * Setting this to false will return <code>file.contents</code> as a stream and not buffer files.
+         * This is useful when working with large files.
+         * Note: Plugins might not implement support for streams.
+         * Default: <code>true</code>.
+         */
+        buffer?: boolean;
+
+        /**
+         * The base path of a glob.
+         *
+         * Default is everything before a glob starts.
+         */
+        base?: string;
+
+        /**
+         * The current working directory in which to search.
+         * Defaults to process.cwd().
+         */
+        cwd?: string;
+
+        /**
+         * The place where patterns starting with / will be mounted onto.
+         * Defaults to path.resolve(options.cwd, "/") (/ on Unix systems, and C:\ or some such on Windows.)
+         */
+        root?: string;
+
+        /**
+         * Include .dot files in normal matches and globstar matches.
+         * Note that an explicit dot in a portion of the pattern will always match dot files.
+         */
+        dot?: boolean;
+
+        /**
+         * By default, a pattern starting with a forward-slash will be "mounted" onto the root setting, so that a valid
+         * filesystem path is returned. Set this flag to disable that behavior.
+         */
+        nomount?: boolean;
+
+        /**
+         * Add a / character to directory matches. Note that this requires additional stat calls.
+         */
+        mark?: boolean;
+
+        /**
+         * Don't sort the results.
+         */
+        nosort?: boolean;
+
+        /**
+         * Set to true to stat all results. This reduces performance somewhat, and is completely unnecessary, unless
+         * readdir is presumed to be an untrustworthy indicator of file existence. It will cause ELOOP to be triggered one
+         * level sooner in the case of cyclical symbolic links.
+         */
+        stat?: boolean;
+
+        /**
+         * When an unusual error is encountered when attempting to read a directory, a warning will be printed to stderr.
+         * Set the silent option to true to suppress these warnings.
+         */
+        silent?: boolean;
+
+        /**
+         * When an unusual error is encountered when attempting to read a directory, the process will just continue on in
+         * search of other matches. Set the strict option to raise an error in these cases.
+         */
+        strict?: boolean;
+
+        /**
+         * See cache property above. Pass in a previously generated cache object to save some fs calls.
+         */
+        cache?: boolean;
+
+        /**
+         * A cache of results of filesystem information, to prevent unnecessary stat calls.
+         * While it should not normally be necessary to set this, you may pass the statCache from one glob() call to the
+         * options object of another, if you know that the filesystem will not change between calls.
+         */
+        statCache?: boolean;
+
+        /**
+         * Perform a synchronous glob search.
+         */
+        sync?: boolean;
+
+        /**
+         * In some cases, brace-expanded patterns can result in the same file showing up multiple times in the result set.
+         * By default, this implementation prevents duplicates in the result set. Set this flag to disable that behavior.
+         */
+        nounique?: boolean;
+
+        /**
+         * Set to never return an empty set, instead returning a set containing the pattern itself.
+         * This is the default in glob(3).
+         */
+        nonull?: boolean;
+
+        /**
+         * Perform a case-insensitive match. Note that case-insensitive filesystems will sometimes result in glob returning
+         * results that are case-insensitively matched anyway, since readdir and stat will not raise an error.
+         */
+        nocase?: boolean;
+
+        /**
+         * Set to enable debug logging in minimatch and glob.
+         */
+        debug?: boolean;
+
+        /**
+         * Set to enable debug logging in glob, but not minimatch.
+         */
+        globDebug?: boolean;
+    }
+
+    interface DestOptions {
+        /**
+         * The output folder. Only has an effect if provided output folder is relative.
+         * Default: process.cwd()
+         */
+        cwd?: string;
+
+        /**
+         * Octal permission string specifying mode for any folders that need to be created for output folder.
+         * Default: 0777.
+         */
+        mode?: string;
+    }
+
+    /**
+     * Options that are passed to <code>gaze</code>.
+     * https://github.com/shama/gaze
+     */
+    interface WatchOptions {
+        /** Interval to pass to fs.watchFile. */
+        interval?: number;
+        /** Delay for events called in succession for the same file/event. */
+        debounceDelay?: number;
+        /** Force the watch mode. Either 'auto' (default), 'watch' (force native events), or 'poll' (force stat polling). */
+        mode?: string;
+        /** The current working directory to base file patterns from. Default is process.cwd().. */
+        cwd?: string;
+    }
+
+    interface WatchEvent {
+        /** The type of change that occurred, either added, changed or deleted. */
+        type: string;
+        /** The path to the file that triggered the event. */
+        path: string;
+    }
+
+    /**
+     * Callback to be called on each watched file change.
+     */
+    interface WatchCallback {
+        (event: WatchEvent): void;
+    }
+
+    interface TaskCallback {
+        /**
+         * Defines a task.
+         * Tasks may be made asynchronous if they are passing a callback or return a promise or a stream.
+         * @param cb callback used to signal asynchronous completion. Caller includes <code>err</code> in case of error.
+         */
+        (cb?: (err?: any) => void): any;
+    }
+}
+
+declare var gulp: gulp.Gulp;
+
+export = gulp;
diff --git a/gulp/tsconfig.json b/gulp/tsconfig.json
new file mode 100644
index 0000000000..985fc6fa14
--- /dev/null
+++ b/gulp/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/hammerjs/hammerjs-1.1.3-tests.ts b/hammerjs/hammerjs-1.1.3-tests.ts
index 5515175af6..bb006241fe 100644
--- a/hammerjs/hammerjs-1.1.3-tests.ts
+++ b/hammerjs/hammerjs-1.1.3-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="hammerjs-1.1.3.d.ts" />
+/// <reference types="jquery"/>
+
 
 // plugin check
 if (!Hammer.HAS_TOUCHEVENTS && !Hammer.HAS_POINTEREVENTS) {
diff --git a/hammerjs/hammerjs-1.1.3.d.ts b/hammerjs/hammerjs-1.1.3.d.ts
index 9ff698a290..e01ea87384 100644
--- a/hammerjs/hammerjs-1.1.3.d.ts
+++ b/hammerjs/hammerjs-1.1.3.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="../jquery/jquery.d.ts"/>
+/// <reference types="jquery"/>
 
 declare var Hammer: HammerStatic;
 
diff --git a/hammerjs/hammerjs-commonjs-tests.ts b/hammerjs/hammerjs-commonjs-tests.ts
index e9f1d209fb..5788d67906 100644
--- a/hammerjs/hammerjs-commonjs-tests.ts
+++ b/hammerjs/hammerjs-commonjs-tests.ts
@@ -1,6 +1,6 @@
 // Tests based on examples at http://hammerjs.github.io/examples/
 
-/// <reference path="hammerjs.d.ts" />
+
 
 import Hammer = require("hammerjs");
 
diff --git a/hammerjs/hammerjs-tests.ts b/hammerjs/hammerjs-tests.ts
index a17c16287c..c698827246 100644
--- a/hammerjs/hammerjs-tests.ts
+++ b/hammerjs/hammerjs-tests.ts
@@ -1,6 +1,6 @@
 // Tests based on examples at http://hammerjs.github.io/examples/
 
-/// <reference path="hammerjs.d.ts" />
+
 
 (() =>
 {
diff --git a/hammerjs/hammerjs.d.ts b/hammerjs/hammerjs.d.ts
deleted file mode 100644
index a72a23791a..0000000000
--- a/hammerjs/hammerjs.d.ts
+++ /dev/null
@@ -1,331 +0,0 @@
-// Type definitions for Hammer.js 2.0.4
-// Project: http://hammerjs.github.io/
-// Definitions by: Philip Bulley <https://github.com/milkisevil/>, Han Lin Yap <https://github.com/codler>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare var Hammer:HammerStatic;
-
-declare module "hammerjs" {
-    export = Hammer;
-}
-
-interface HammerStatic
-{
-  new( element:HTMLElement, options?:any ): HammerManager;
-
-  defaults:HammerDefaults;
-
-  VERSION: number;
-
-  INPUT_START:  number;
-  INPUT_MOVE:   number;
-  INPUT_END:    number;
-  INPUT_CANCEL: number;
-
-  STATE_POSSIBLE:   number;
-  STATE_BEGAN:      number;
-  STATE_CHANGED:    number;
-  STATE_ENDED:      number;
-  STATE_RECOGNIZED: number;
-  STATE_CANCELLED:  number;
-  STATE_FAILED:     number;
-
-  DIRECTION_NONE:       number;
-  DIRECTION_LEFT:       number;
-  DIRECTION_RIGHT:      number;
-  DIRECTION_UP:         number;
-  DIRECTION_DOWN:       number;
-  DIRECTION_HORIZONTAL: number;
-  DIRECTION_VERTICAL:   number;
-  DIRECTION_ALL:        number;
-
-  Manager:     HammerManager;
-  Input:       HammerInput;
-  TouchAction: TouchAction;
-
-  TouchInput:        TouchInput;
-  MouseInput:        MouseInput;
-  PointerEventInput: PointerEventInput;
-  TouchMouseInput:   TouchMouseInput;
-  SingleTouchInput:  SingleTouchInput;
-
-  Recognizer:     RecognizerStatic;
-  AttrRecognizer: AttrRecognizerStatic;
-  Tap:            TapRecognizerStatic;
-  Pan:            PanRecognizerStatic;
-  Swipe:          SwipeRecognizerStatic;
-  Pinch:          PinchRecognizerStatic;
-  Rotate:         RotateRecognizerStatic;
-  Press:          PressRecognizerStatic;
-
-  on( target:EventTarget, types:string, handler:Function ):void;
-  off( target:EventTarget, types:string, handler:Function ):void;
-  each( obj:any, iterator:Function, context:any ):     void;
-  merge( dest:any, src:any ):    any;
-  extend( dest:any, src:any, merge:boolean ):   any;
-  inherit( child:Function, base:Function, properties:any ):any;
-  bindFn( fn:Function, context:any ):Function;
-  prefixed( obj:any, property:string ):string;
-}
-
-interface HammerDefaults
-{
-  domEvents:boolean;
-  enable:boolean;
-  preset:any[];
-  touchAction:string;
-  cssProps:CssProps;
-
-  inputClass():void;
-  inputTarget():void;
-}
-
-interface CssProps
-{
-  contentZooming:string;
-  tapHighlightColor:string;
-  touchCallout:string;
-  touchSelect:string;
-  userDrag:string;
-  userSelect:string;
-}
-
-interface HammerOptions extends HammerDefaults
-{
-
-}
-
-interface HammerManager
-{
-  new( element:HTMLElement, options?:any ):HammerManager;
-
-  add( recogniser:Recognizer ):Recognizer;
-  add( recogniser:Recognizer ):HammerManager;
-  add( recogniser:Recognizer[] ):Recognizer;
-  add( recogniser:Recognizer[] ):HammerManager;
-  destroy():void;
-  emit( event:string, data:any ):void;
-  get( recogniser:Recognizer ):Recognizer;
-  get( recogniser:string ):Recognizer;
-  off( events:string, handler?:( event:HammerInput ) => void ):void;
-  on( events:string, handler:( event:HammerInput ) => void ):void;
-  recognize( inputData:any ):void;
-  remove( recogniser:Recognizer ):HammerManager;
-  remove( recogniser:string ):HammerManager;
-  set( options:HammerOptions ):HammerManager;
-  stop( force:boolean ):void;
-}
-
-declare class HammerInput
-{
-  constructor( manager:HammerManager, callback:Function );
-
-  destroy():void;
-  handler():void;
-  init():void;
-
-  /** Name of the event. Like panstart. */
-  type:string;
-
-  /** Movement of the X axis. */
-  deltaX:number;
-
-  /** Movement of the Y axis. */
-  deltaY:number;
-
-  /** Total time in ms since the first input. */
-  deltaTime:number;
-
-  /** Distance moved. */
-  distance:number;
-
-  /** Angle moved. */
-  angle:number;
-
-  /** Velocity on the X axis, in px/ms. */
-  velocityX:number;
-
-  /** Velocity on the Y axis, in px/ms */
-  velocityY:number;
-
-  /** Highest velocityX/Y value. */
-  velocity:number;
-
-  /** Direction moved. Matches the DIRECTION constants. */
-  direction:number;
-
-  /** Direction moved from it's starting point. Matches the DIRECTION constants. */
-  offsetDirection:string;
-
-  /** Scaling that has been done when multi-touch. 1 on a single touch. */
-  scale:number;
-
-  /** Rotation that has been done when multi-touch. 0 on a single touch. */
-  rotation:number;
-
-  /** Center position for multi-touch, or just the single pointer. */
-  center:HammerPoint;
-
-  /** Source event object, type TouchEvent, MouseEvent or PointerEvent. */
-  srcEvent:TouchEvent | MouseEvent | PointerEvent;
-
-  /** Target that received the event. */
-  target:HTMLElement;
-
-  /** Primary pointer type, could be touch, mouse, pen or kinect. */
-  pointerType:string;
-
-  /** Event type, matches the INPUT constants. */
-  eventType:string;
-
-  /** true when the first input. */
-  isFirst:boolean;
-
-  /** true when the final (last) input. */
-  isFinal:boolean;
-
-  /** Array with all pointers, including the ended pointers (touchend, mouseup). */
-  pointers:any[];
-
-  /** Array with all new/moved/lost pointers. */
-  changedPointers:any[];
-
-  /** Reference to the srcEvent.preventDefault() method. Only for experts! */
-  preventDefault:Function;
-}
-
-declare class MouseInput extends HammerInput
-{
-  constructor( manager:HammerManager, callback:Function );
-}
-
-declare class PointerEventInput extends HammerInput
-{
-  constructor( manager:HammerManager, callback:Function );
-}
-
-declare class SingleTouchInput extends HammerInput
-{
-  constructor( manager:HammerManager, callback:Function );
-}
-
-declare class TouchInput extends HammerInput
-{
-  constructor( manager:HammerManager, callback:Function );
-}
-
-declare class TouchMouseInput extends HammerInput
-{
-  constructor( manager:HammerManager, callback:Function );
-}
-
-interface RecognizerStatic
-{
-  new( options?:any ):Recognizer;
-}
-
-interface Recognizer
-{
-  defaults:any;
-
-  canEmit():boolean;
-  canRecognizeWith( otherRecognizer:Recognizer ):boolean;
-  dropRecognizeWith( otherRecognizer:Recognizer ):Recognizer;
-  dropRecognizeWith( otherRecognizer:string ):Recognizer;
-  dropRequireFailure( otherRecognizer:Recognizer ):Recognizer;
-  dropRequireFailure( otherRecognizer:string ):Recognizer;
-  emit( input:HammerInput ):void;
-  getTouchAction():any[];
-  hasRequireFailures():boolean;
-  process( inputData:HammerInput ):string;
-  recognize( inputData:HammerInput ):void;
-  recognizeWith( otherRecognizer:Recognizer ):Recognizer;
-  recognizeWith( otherRecognizer:string ):Recognizer;
-  requireFailure( otherRecognizer:Recognizer ):Recognizer;
-  requireFailure( otherRecognizer:string ):Recognizer;
-  reset():void;
-  set( options?:any ):Recognizer;
-  tryEmit( input:HammerInput ):void;
-}
-
-interface AttrRecognizerStatic
-{
-  attrTest( input:HammerInput ):boolean;
-  process( input:HammerInput ):any;
-}
-
-interface AttrRecognizer extends Recognizer
-{
-  new( options?:any ):AttrRecognizer;
-}
-
-interface PanRecognizerStatic
-{
-  new( options?:any ):PanRecognizer;
-}
-
-interface PanRecognizer extends AttrRecognizer
-{
-}
-
-interface PinchRecognizerStatic
-{
-  new( options?:any ):PinchRecognizer;
-}
-
-interface PinchRecognizer extends AttrRecognizer
-{
-}
-
-interface PressRecognizerStatic
-{
-  new( options?:any ):PressRecognizer;
-}
-
-interface PressRecognizer extends AttrRecognizer
-{
-}
-
-interface RotateRecognizerStatic
-{
-  new( options?:any ):RotateRecognizer;
-}
-
-interface RotateRecognizer extends AttrRecognizer
-{
-}
-
-interface SwipeRecognizerStatic
-{
-  new( options?:any ):SwipeRecognizer;
-}
-
-interface SwipeRecognizer extends AttrRecognizer
-{
-}
-
-interface TapRecognizerStatic
-{
-  new( options?:any ):TapRecognizer;
-}
-
-interface TapRecognizer extends AttrRecognizer
-{
-}
-
-declare class TouchAction
-{
-  constructor( manager:HammerManager, value:string );
-
-  compute():string;
-  preventDefaults( input:HammerInput ):void;
-  preventSrc( srcEvent:any ):void;
-  set( value:string ):void;
-  update():void;
-}
-
-interface HammerPoint
-{
-  x: number;
-  y: number;
-}
diff --git a/hammerjs/index.d.ts b/hammerjs/index.d.ts
new file mode 100644
index 0000000000..80487c134c
--- /dev/null
+++ b/hammerjs/index.d.ts
@@ -0,0 +1,331 @@
+// Type definitions for Hammer.js 2.0.4
+// Project: http://hammerjs.github.io/
+// Definitions by: Philip Bulley <https://github.com/milkisevil/>, Han Lin Yap <https://github.com/codler>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var Hammer:HammerStatic;
+
+declare module "hammerjs" {
+    export = Hammer;
+}
+
+interface HammerStatic
+{
+  new( element:HTMLElement | SVGElement, options?:any ): HammerManager;
+
+  defaults:HammerDefaults;
+
+  VERSION: number;
+
+  INPUT_START:  number;
+  INPUT_MOVE:   number;
+  INPUT_END:    number;
+  INPUT_CANCEL: number;
+
+  STATE_POSSIBLE:   number;
+  STATE_BEGAN:      number;
+  STATE_CHANGED:    number;
+  STATE_ENDED:      number;
+  STATE_RECOGNIZED: number;
+  STATE_CANCELLED:  number;
+  STATE_FAILED:     number;
+
+  DIRECTION_NONE:       number;
+  DIRECTION_LEFT:       number;
+  DIRECTION_RIGHT:      number;
+  DIRECTION_UP:         number;
+  DIRECTION_DOWN:       number;
+  DIRECTION_HORIZONTAL: number;
+  DIRECTION_VERTICAL:   number;
+  DIRECTION_ALL:        number;
+
+  Manager:     HammerManager;
+  Input:       HammerInput;
+  TouchAction: TouchAction;
+
+  TouchInput:        TouchInput;
+  MouseInput:        MouseInput;
+  PointerEventInput: PointerEventInput;
+  TouchMouseInput:   TouchMouseInput;
+  SingleTouchInput:  SingleTouchInput;
+
+  Recognizer:     RecognizerStatic;
+  AttrRecognizer: AttrRecognizerStatic;
+  Tap:            TapRecognizerStatic;
+  Pan:            PanRecognizerStatic;
+  Swipe:          SwipeRecognizerStatic;
+  Pinch:          PinchRecognizerStatic;
+  Rotate:         RotateRecognizerStatic;
+  Press:          PressRecognizerStatic;
+
+  on( target:EventTarget, types:string, handler:Function ):void;
+  off( target:EventTarget, types:string, handler:Function ):void;
+  each( obj:any, iterator:Function, context:any ):     void;
+  merge( dest:any, src:any ):    any;
+  extend( dest:any, src:any, merge:boolean ):   any;
+  inherit( child:Function, base:Function, properties:any ):any;
+  bindFn( fn:Function, context:any ):Function;
+  prefixed( obj:any, property:string ):string;
+}
+
+interface HammerDefaults
+{
+  domEvents:boolean;
+  enable:boolean;
+  preset:any[];
+  touchAction:string;
+  cssProps:CssProps;
+
+  inputClass():void;
+  inputTarget():void;
+}
+
+interface CssProps
+{
+  contentZooming:string;
+  tapHighlightColor:string;
+  touchCallout:string;
+  touchSelect:string;
+  userDrag:string;
+  userSelect:string;
+}
+
+interface HammerOptions extends HammerDefaults
+{
+
+}
+
+interface HammerManager
+{
+  new( element:HTMLElement, options?:any ):HammerManager;
+
+  add( recogniser:Recognizer ):Recognizer;
+  add( recogniser:Recognizer ):HammerManager;
+  add( recogniser:Recognizer[] ):Recognizer;
+  add( recogniser:Recognizer[] ):HammerManager;
+  destroy():void;
+  emit( event:string, data:any ):void;
+  get( recogniser:Recognizer ):Recognizer;
+  get( recogniser:string ):Recognizer;
+  off( events:string, handler?:( event:HammerInput ) => void ):void;
+  on( events:string, handler:( event:HammerInput ) => void ):void;
+  recognize( inputData:any ):void;
+  remove( recogniser:Recognizer ):HammerManager;
+  remove( recogniser:string ):HammerManager;
+  set( options:HammerOptions ):HammerManager;
+  stop( force:boolean ):void;
+}
+
+declare class HammerInput
+{
+  constructor( manager:HammerManager, callback:Function );
+
+  destroy():void;
+  handler():void;
+  init():void;
+
+  /** Name of the event. Like panstart. */
+  type:string;
+
+  /** Movement of the X axis. */
+  deltaX:number;
+
+  /** Movement of the Y axis. */
+  deltaY:number;
+
+  /** Total time in ms since the first input. */
+  deltaTime:number;
+
+  /** Distance moved. */
+  distance:number;
+
+  /** Angle moved. */
+  angle:number;
+
+  /** Velocity on the X axis, in px/ms. */
+  velocityX:number;
+
+  /** Velocity on the Y axis, in px/ms */
+  velocityY:number;
+
+  /** Highest velocityX/Y value. */
+  velocity:number;
+
+  /** Direction moved. Matches the DIRECTION constants. */
+  direction:number;
+
+  /** Direction moved from it's starting point. Matches the DIRECTION constants. */
+  offsetDirection:string;
+
+  /** Scaling that has been done when multi-touch. 1 on a single touch. */
+  scale:number;
+
+  /** Rotation that has been done when multi-touch. 0 on a single touch. */
+  rotation:number;
+
+  /** Center position for multi-touch, or just the single pointer. */
+  center:HammerPoint;
+
+  /** Source event object, type TouchEvent, MouseEvent or PointerEvent. */
+  srcEvent:TouchEvent | MouseEvent | PointerEvent;
+
+  /** Target that received the event. */
+  target:HTMLElement;
+
+  /** Primary pointer type, could be touch, mouse, pen or kinect. */
+  pointerType:string;
+
+  /** Event type, matches the INPUT constants. */
+  eventType:string;
+
+  /** true when the first input. */
+  isFirst:boolean;
+
+  /** true when the final (last) input. */
+  isFinal:boolean;
+
+  /** Array with all pointers, including the ended pointers (touchend, mouseup). */
+  pointers:any[];
+
+  /** Array with all new/moved/lost pointers. */
+  changedPointers:any[];
+
+  /** Reference to the srcEvent.preventDefault() method. Only for experts! */
+  preventDefault:Function;
+}
+
+declare class MouseInput extends HammerInput
+{
+  constructor( manager:HammerManager, callback:Function );
+}
+
+declare class PointerEventInput extends HammerInput
+{
+  constructor( manager:HammerManager, callback:Function );
+}
+
+declare class SingleTouchInput extends HammerInput
+{
+  constructor( manager:HammerManager, callback:Function );
+}
+
+declare class TouchInput extends HammerInput
+{
+  constructor( manager:HammerManager, callback:Function );
+}
+
+declare class TouchMouseInput extends HammerInput
+{
+  constructor( manager:HammerManager, callback:Function );
+}
+
+interface RecognizerStatic
+{
+  new( options?:any ):Recognizer;
+}
+
+interface Recognizer
+{
+  defaults:any;
+
+  canEmit():boolean;
+  canRecognizeWith( otherRecognizer:Recognizer ):boolean;
+  dropRecognizeWith( otherRecognizer:Recognizer ):Recognizer;
+  dropRecognizeWith( otherRecognizer:string ):Recognizer;
+  dropRequireFailure( otherRecognizer:Recognizer ):Recognizer;
+  dropRequireFailure( otherRecognizer:string ):Recognizer;
+  emit( input:HammerInput ):void;
+  getTouchAction():any[];
+  hasRequireFailures():boolean;
+  process( inputData:HammerInput ):string;
+  recognize( inputData:HammerInput ):void;
+  recognizeWith( otherRecognizer:Recognizer ):Recognizer;
+  recognizeWith( otherRecognizer:string ):Recognizer;
+  requireFailure( otherRecognizer:Recognizer ):Recognizer;
+  requireFailure( otherRecognizer:string ):Recognizer;
+  reset():void;
+  set( options?:any ):Recognizer;
+  tryEmit( input:HammerInput ):void;
+}
+
+interface AttrRecognizerStatic
+{
+  attrTest( input:HammerInput ):boolean;
+  process( input:HammerInput ):any;
+}
+
+interface AttrRecognizer extends Recognizer
+{
+  new( options?:any ):AttrRecognizer;
+}
+
+interface PanRecognizerStatic
+{
+  new( options?:any ):PanRecognizer;
+}
+
+interface PanRecognizer extends AttrRecognizer
+{
+}
+
+interface PinchRecognizerStatic
+{
+  new( options?:any ):PinchRecognizer;
+}
+
+interface PinchRecognizer extends AttrRecognizer
+{
+}
+
+interface PressRecognizerStatic
+{
+  new( options?:any ):PressRecognizer;
+}
+
+interface PressRecognizer extends AttrRecognizer
+{
+}
+
+interface RotateRecognizerStatic
+{
+  new( options?:any ):RotateRecognizer;
+}
+
+interface RotateRecognizer extends AttrRecognizer
+{
+}
+
+interface SwipeRecognizerStatic
+{
+  new( options?:any ):SwipeRecognizer;
+}
+
+interface SwipeRecognizer extends AttrRecognizer
+{
+}
+
+interface TapRecognizerStatic
+{
+  new( options?:any ):TapRecognizer;
+}
+
+interface TapRecognizer extends AttrRecognizer
+{
+}
+
+declare class TouchAction
+{
+  constructor( manager:HammerManager, value:string );
+
+  compute():string;
+  preventDefaults( input:HammerInput ):void;
+  preventSrc( srcEvent:any ):void;
+  set( value:string ):void;
+  update():void;
+}
+
+interface HammerPoint
+{
+  x: number;
+  y: number;
+}
diff --git a/hammerjs/tsconfig.json b/hammerjs/tsconfig.json
new file mode 100644
index 0000000000..3d9bc270b1
--- /dev/null
+++ b/hammerjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "hammerjs-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/handlebars/handlebars-tests.ts b/handlebars/handlebars-tests.ts
index 71de4f0e51..71215b5294 100644
--- a/handlebars/handlebars-tests.ts
+++ b/handlebars/handlebars-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="handlebars.d.ts" />
+
 import Handlebars = require('handlebars');
 
 
diff --git a/handlebars/handlebars.d.ts b/handlebars/index.d.ts
similarity index 100%
rename from handlebars/handlebars.d.ts
rename to handlebars/index.d.ts
diff --git a/handlebars/tsconfig.json b/handlebars/tsconfig.json
new file mode 100644
index 0000000000..fd84c537af
--- /dev/null
+++ b/handlebars/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "handlebars-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/handsontable/handsontable-tests.ts b/handsontable/handsontable-tests.ts
new file mode 100644
index 0000000000..c87481222c
--- /dev/null
+++ b/handsontable/handsontable-tests.ts
@@ -0,0 +1,204 @@
+
+
+function test_HandsontableInit() {
+  var elem = document.createElement('div');
+  var hot = new Handsontable(elem, {
+    allowEmpty: true,
+    allowInsertColumn: true,
+    allowInsertRow: true,
+    allowInvalid: true,
+    allowRemoveColumn: true,
+    allowRemoveRow: true,
+    autoColumnSize: true,
+    autoComplete: [],
+    autoRowSize: true,
+    autoWrapCol: true,
+    autoWrapRow: true,
+    bindRowsWithHeaders: 'foo',
+    cell: [],
+    cells: function() {},
+    checkedTemplate: true,
+    className: [],
+    colHeaders: true,
+    collapsibleColumns: true,
+    columnHeaderHeight: 123,
+    columns: [],
+    columnSorting: {},
+    columnSummary: {},
+    colWidths: 123,
+    commentedCellClassName: 'foo',
+    comments: [],
+    contextMenu: true,
+    contextMenuCopyPaste: {},
+    copyable: true,
+    copyColsLimit: 123,
+    copyPaste: true,
+    copyRowsLimit: 123,
+    correctFormat: true,
+    currentColClassName: 'foo',
+    currentRowClassName: 'foo',
+    customBorders: true,
+    data: [],
+    dataSchema: {},
+    dateFormat: 'foo',
+    debug: true,
+    defaultDate: 'foo',
+    disableVisualSelection: true,
+    dropdownMenu: [],
+    editor: true,
+    enterBeginsEditing: true,
+    enterMoves: {},
+    fillHandle: true,
+    filter: true,
+    filteringCaseSensitive: true,
+    filters: false,
+    fixedColumnsLeft: 123,
+    fixedRowsBottom: 123,
+    fixedRowsTop: 123,
+    format: 'foo',
+    fragmentSelection: true,
+    ganttChart: {},
+    headerTooltips: true,
+    height: 123,
+    hiddenColumns: true,
+    hiddenRows: {},
+    invalidCellClassName: 'foo',
+    label: {},
+    language: 'foo',
+    manualColumnFreeze: true,
+    manualColumnMove: true,
+    manualColumnResize: true,
+    manualRowMove: true,
+    manualRowResize: true,
+    maxCols: 123,
+    maxRows: 123,
+    mergeCells: true,
+    minCols: 123,
+    minRows: 123,
+    minSpareCols: 123,
+    minSpareRows: 123,
+    multiSelect: true,
+    nestedHeaders: [],
+    noWordWrapClassName: 'foo',
+    observeChanges: true,
+    observeDOMVisibility: true,
+    outsideClickDeselects: true,
+    pasteMode: 'foo',
+    persistentState: true,
+    placeholder: 123,
+    placeholderCellClassName: 'foo',
+    preventOverflow: true,
+    readOnly: true,
+    readOnlyCellClassName: 'foo',
+    renderAllRows: true,
+    renderer: 'foo',
+    rowHeaders: true,
+    rowHeaderWidth: 123,
+    rowHeights: 123,
+    search: true,
+    selectOptions: [],
+    skipColumnOnPaste: true,
+    sortByRelevance: true,
+    sortFunction: function() {},
+    sortIndicator: true,
+    source: [],
+    startCols: 123,
+    startRows: 123,
+    stretchH: 'foo',
+    strict: true,
+    tableClassName: 'foo',
+    tabMoves: {},
+    title: 'foo',
+    trimDropdown: true,
+    trimWhitespace: true,
+    type: 'foo',
+    uncheckedTemplate: true,
+    undo: true,
+    validator: function() {},
+    viewportColumnRenderingOffset: 123,
+    viewportRowRenderingOffset: 123,
+    visibleRows: 123,
+    width: 1232,
+    wordWrap: true,
+  });
+}
+
+function test_HandsontableMethods() {
+  var elem = document.createElement('div');
+  var hot = new Handsontable(elem, {});
+  hot.addHook('foo', []);
+  hot.addHookOnce('foo', []);
+  hot.alter('foo', 123, 123, 'foo', true);
+  hot.clear();
+  hot.colOffset();
+  hot.colToProp(123);
+  hot.countCols();
+  hot.countEmptyCols(true);
+  hot.countEmptyRows(true);
+  hot.countRenderedCols();
+  hot.countRenderedRows();
+  hot.countRows();
+  hot.countSourceRows();
+  hot.countVisibleCols();
+  hot.countVisibleRows();
+  hot.deselectCell();
+  hot.destroy();
+  hot.destroyEditor(true);
+  hot.getActiveEditor();
+  hot.getCell(123, 123, true);
+  hot.getCellEditor(123, 123);
+  hot.getCellMeta(123, 123);
+  hot.getCellRenderer(123, 123);
+  hot.getCellValidator(123, 123);
+  hot.getColHeader(123);
+  hot.getColWidth(123);
+  hot.getCoords(elem.querySelector('td'));
+  hot.getCopyableData(123, 123);
+  hot.getCopyableText(123, 123, 123, 123);
+  hot.getData(123, 123, 123, 123);
+  hot.getDataAtCell(123, 123);
+  hot.getDataAtCol(123);
+  hot.getDataAtProp(123);
+  hot.getDataAtRow(123);
+  hot.getDataAtRowProp(123, 'foo');
+  hot.getDataType(123, 123, 123, 123);
+  hot.getInstance();
+  hot.getPlugin('foo');
+  hot.getRowHeader(123);
+  hot.getRowHeight(123);
+  hot.getSchema();
+  hot.getSelected();
+  hot.getSelectedRange();
+  hot.getSettings();
+  hot.getSourceData(123, 123, 123, 123);
+  hot.getSourceDataAtCell(123, 123);
+  hot.getSourceDataAtCol(123);
+  hot.getSourceDataAtRow(123);
+  hot.getValue();
+  hot.hasColHeaders();
+  hot.hasHook('foo');
+  hot.hasRowHeaders();
+  hot.isEmptyCol(123);
+  hot.isEmptyRow(123);
+  hot.isListening();
+  hot.listen();
+  hot.loadData([]);
+  hot.populateFromArray(123, 123, [], 123, 123, 'foo', 'foo', 'foo', []);
+  hot.propToCol('foo');
+  hot.removeCellMeta(123, 123, 'foo');
+  hot.removeHook('foo', function() {});
+  hot.render();
+  hot.rowOffset();
+  hot.runHooks('foo', 123, 'foo', true, {}, [], function() {});
+  hot.selectCell(123, 123, 123, 123, true, true);
+  hot.selectCellByProp(123, 'foo', 123, 'foo', true);
+  hot.setCellMeta(123, 123, 'foo', 'foo');
+  hot.setCellMetaObject(123, 123, {});
+  hot.setDataAtCell(123, 123, 'foo', 'foo');
+  hot.setDataAtRowProp(123, 'foo', 'foo', 'foo');
+  hot.spliceCol(123, 123, 123, 'foo');
+  hot.spliceRow(123, 123, 123, 'foo');
+  hot.unlisten();
+  hot.updateSettings({}, true);
+  hot.validateCells(function() {});
+}
diff --git a/handsontable/index.d.ts b/handsontable/index.d.ts
new file mode 100644
index 0000000000..9c7f87aaa3
--- /dev/null
+++ b/handsontable/index.d.ts
@@ -0,0 +1,208 @@
+// Type definitions for Handsontable 0.24.1
+// Project: https://handsontable.com/
+// Definitions by: Handsoncode sp. z o.o. <http://handsoncode.net/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped\
+
+declare namespace ht {
+  interface Options {
+    allowEmpty?: boolean;
+    allowInsertColumn?: boolean;
+    allowInsertRow?: boolean;
+    allowInvalid?: boolean;
+    allowRemoveColumn?: boolean;
+    allowRemoveRow?: boolean;
+    autoColumnSize?: Object|boolean;
+    autoComplete?: any[];
+    autoRowSize?: Object|boolean;
+    autoWrapCol?: boolean;
+    autoWrapRow?: boolean;
+    bindRowsWithHeaders?: boolean|string;
+    cell?: any[];
+    cells?: Function;
+    checkedTemplate?: boolean|string;
+    className?: string|any[];
+    colHeaders?: boolean|any[]|Function;
+    collapsibleColumns?: boolean|any[];
+    columnHeaderHeight?: number|any[];
+    columns?: any[];
+    columnSorting?: boolean|Object;
+    columnSummary?: Object;
+    colWidths?: any[]|Function|number|string;
+    commentedCellClassName?: string;
+    comments?: boolean|any[];
+    contextMenu?: boolean|any[]|Object;
+    contextMenuCopyPaste?: Object;
+    copyable?: boolean;
+    copyColsLimit?: number;
+    copyPaste?: boolean;
+    copyRowsLimit?: number;
+    correctFormat?: boolean;
+    currentColClassName?: string;
+    currentRowClassName?: string;
+    customBorders?: boolean|any[];
+    data?: any[]|Function;
+    dataSchema?: Object;
+    dateFormat?: string;
+    debug?: boolean;
+    defaultDate?: string;
+    disableVisualSelection?: boolean|string|any[];
+    dropdownMenu?: boolean|Object|any[];
+    editor?: string|Function|boolean;
+    enterBeginsEditing?: boolean;
+    enterMoves?: Object|Function;
+    fillHandle?: boolean|string|Object;
+    filter?: boolean;
+    filteringCaseSensitive?: boolean;
+    filters?: boolean;
+    fixedColumnsLeft?: number;
+    fixedRowsBottom?: number;
+    fixedRowsTop?: number;
+    format?: string;
+    fragmentSelection?: boolean|string;
+    ganttChart?: Object;
+    headerTooltips?: boolean|Object;
+    height?: number|Function;
+    hiddenColumns?: boolean|Object;
+    hiddenRows?: boolean|Object;
+    invalidCellClassName?: string;
+    label?: Object;
+    language?: string;
+    manualColumnFreeze?: boolean;
+    manualColumnMove?: boolean|any[];
+    manualColumnResize?: boolean|any[];
+    manualRowMove?: boolean|any[];
+    manualRowResize?: boolean|any[];
+    maxCols?: number;
+    maxRows?: number;
+    mergeCells?: boolean|any[];
+    minCols?: number;
+    minRows?: number;
+    minSpareCols?: number;
+    minSpareRows?: number;
+    multiSelect?: boolean;
+    nestedHeaders?: any[];
+    noWordWrapClassName?: string;
+    observeChanges?: boolean;
+    observeDOMVisibility?: boolean;
+    outsideClickDeselects?: boolean;
+    pasteMode?: string;
+    persistentState?: boolean;
+    placeholder?: any;
+    placeholderCellClassName?: string;
+    preventOverflow?: string|boolean;
+    readOnly?: boolean;
+    readOnlyCellClassName?: string;
+    renderAllRows?: boolean;
+    renderer?: string|Function;
+    rowHeaders?: boolean|any[]|Function;
+    rowHeaderWidth?: number|any[];
+    rowHeights?: any[]|Function|number|string;
+    search?: boolean;
+    selectOptions?: any[];
+    skipColumnOnPaste?: boolean;
+    sortByRelevance?: boolean;
+    sortFunction?: Function;
+    sortIndicator?: boolean;
+    source?: any[]|Function;
+    startCols?: number;
+    startRows?: number;
+    stretchH?: string;
+    strict?: boolean;
+    tableClassName?: string|any[];
+    tabMoves?: Object;
+    title?: string;
+    trimDropdown?: boolean;
+    trimWhitespace?: boolean;
+    type?: string;
+    uncheckedTemplate?: boolean|string;
+    undo?: boolean;
+    validator?: Function|RegExp;
+    viewportColumnRenderingOffset?: number|string;
+    viewportRowRenderingOffset?: number|string;
+    visibleRows?: number;
+    width?: number|Function;
+    wordWrap?: boolean;
+    isEmptyCol?: (col: number) => boolean;
+    isEmptyRow?: (row: number) => boolean;
+  }
+  interface Methods {
+    addHook(key: string, callback: Function|any[]): void;
+    addHookOnce(key: string, callback: Function|any[]): void;
+    alter(action: string, index: number, amount?: number, source?: string, keepEmptyRows?: boolean): void;
+    clear(): void;
+    colOffset(): number;
+    colToProp(col: number): string|number;
+    countCols(): number;
+    countEmptyCols(ending?: boolean): number;
+    countEmptyRows(ending?: boolean): number;
+    countRenderedCols(): number;
+    countRenderedRows(): number;
+    countRows(): number;
+    countSourceRows(): number;
+    countVisibleCols(): number;
+    countVisibleRows(): number;
+    deselectCell(): void;
+    destroy(): void;
+    destroyEditor(revertOriginal?: boolean): void;
+    getActiveEditor(): Object;
+    getCell(row: number, col: number, topmost?: boolean): Element;
+    getCellEditor(row: number, col: number): Object;
+    getCellMeta(row: number, col: number): Object;
+    getCellRenderer(row: number, col: number): Function;
+    getCellValidator(row: number, col: number): any;
+    getColHeader(col: number): any[]|string;
+    getColWidth(col: number): number;
+    getCoords(elem: Element): Object;
+    getCopyableData(row: number, column: number): string;
+    getCopyableText(startRow: number, startCol: number, endRow: number, endCol: number): string;
+    getData(r?: number, c?: number, r2?: number, c2?: number): any[];
+    getDataAtCell(row: number, col: number): any;
+    getDataAtCol(col: number): any[];
+    getDataAtProp(prop: string|number): any[];
+    getDataAtRow(row: number): any[];
+    getDataAtRowProp(row: number, prop: string): any;
+    getDataType(rowFrom: number, columnFrom: number, rowTo: number, columnTo: number): string;
+    getInstance(): any;
+    getPlugin(pluginName: string): any;
+    getRowHeader(row?: number): any[]|string;
+    getRowHeight(row: number): number;
+    getSchema(): Object;
+    getSelected(): any[];
+    getSelectedRange(): any;
+    getSettings(): Object;
+    getSourceData(r?: number, c?: number, r2?: number, c2?: number): any[];
+    getSourceDataAtCell(row: number, column: number): any;
+    getSourceDataAtCol(column: number): any[];
+    getSourceDataAtRow(row: number): any[]|Object;
+    getValue(): any;
+    hasColHeaders(): boolean;
+    hasHook(key: string): boolean;
+    hasRowHeaders(): boolean;
+    isEmptyCol(col: number): boolean;
+    isEmptyRow(row: number): boolean;
+    isListening(): boolean;
+    listen(): void;
+    loadData(data: any[]): void;
+    populateFromArray(row: number, col: number, input: any[], endRow?: number, endCol?: number, source?: string, method?: string, direction?: string, deltas?: any[]): any;
+    propToCol(prop: string): number;
+    removeCellMeta(row: number, col: number, key: string): void;
+    removeHook(key: string, callback: Function): void;
+    render(): void;
+    rowOffset(): number;
+    runHooks(key: string, p1?: any, p2?: any, p3?: any, p4?: any, p5?: any, p6?: any): any;
+    selectCell(row: number, col: number, endRow?: number, endCol?: number, scrollToCell?: boolean, changeListener?: boolean): boolean;
+    selectCellByProp(row: number, prop: string, endRow?: number, endProp?: string, scrollToCell?: boolean): boolean;
+    setCellMeta(row: number, col: number, key: string, val: string): void;
+    setCellMetaObject(row: number, col: number, prop: Object): void;
+    setDataAtCell(row: number|any[], col: number, value: string, source?: string): void;
+    setDataAtRowProp(row: number|any[], prop: string, value: string, source?: string): void;
+    spliceCol(col: number, index: number, amount: number, elements?: any): void;
+    spliceRow(row: number, index: number, amount: number, elements?: any): void;
+    unlisten(): void;
+    updateSettings(settings: Object, init: boolean): void;
+    validateCells(callback: Function): void;
+  }
+}
+declare var Handsontable: {
+  new (element: Element, options: ht.Options): ht.Methods;
+};
diff --git a/handsontable/tsconfig.json b/handsontable/tsconfig.json
new file mode 100644
index 0000000000..03df718e37
--- /dev/null
+++ b/handsontable/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "handsontable-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/hapi/hapi-8.2.0.d.ts b/hapi/hapi-8.2.0.d.ts
index f1db2660e4..f614d620a3 100644
--- a/hapi/hapi-8.2.0.d.ts
+++ b/hapi/hapi-8.2.0.d.ts
@@ -5,667 +5,667 @@
 
 //This is a total rewrite of Hakubo's original hapi.d.ts, as it was out of date/incomplete.
 
-/// <reference path="../node/node.d.ts" />
-
-declare module "hapi" {
-	import http = require("http");
-	import stream = require("stream");
-	import Events = require("events");
-
-	interface IDictionary<T> {
-		[key: string]: T;
-	}
-
-	/** Boom Module for errors. https://github.com/hapijs/boom
-	*  boom provides a set of utilities for returning HTTP errors. Each utility returns a Boom error response object (instance of Error) which includes the following properties:  */
-	export interface IBoom extends Error {
-		/**  if true, indicates this is a Boom object instance.  */
-		isBoom: boolean;
-		/** convenience bool indicating status code >= 500.  */
-		isServer: boolean;
-		/**  the error message.  */
-		message: string;
-		/**  the formatted response.Can be directly manipulated after object construction to return a custom error response.Allowed root keys:  */
-		output: {
-			/** the HTTP status code (typically 4xx or 5xx).  */
-			statusCode: number;
-			/** an object containing any HTTP headers where each key is a header name and value is the header content.  */
-			headers: IDictionary<string>;
-			/** the formatted object used as the response payload (stringified).Can be directly manipulated but any changes will be lost if reformat() is called.Any content allowed and by default includes the following content: */
-			payload: {
-				/** the HTTP status code, derived from error.output.statusCode.  */
-				statusCode: number;
-				/** the HTTP status message (e.g. 'Bad Request', 'Internal Server Error') derived from statusCode.  */
-				error: string;
-				/** the error message derived from error.message. */
-				message: string;
-			};
-		};
-		/**  reformat()rebuilds error.output using the other object properties.  */
-		reformat(): void;
-
-	}
-
-	/** cache functionality via the "CatBox" module. */
-	export interface ICatBoxCacheOptions {
-		/**  a prototype function or catbox engine object.  */
-		engine: any;
-		/**   an identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisions as well.  */
-		name?: string;
-		/**   if true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.  */
-		shared?: boolean;
-	}
-
-	/** Any connections configuration server defaults can be included to override and customize the individual connection. */
-	export interface ISeverConnectionOptions extends IConnectionConfigurationServerDefaults {
-		/**  - the public hostname or IP address. Used only to set server.info.host and server.info.uri. If not configured, defaults to the operating system hostname and if not available, to 'localhost'.*/
-		host?: string;
-		/** - sets the host name or IP address the connection will listen on.If not configured, defaults to host if present, otherwise to all available network interfaces (i.e. '0.0.0.0').Set to 127.0.0.1 or localhost to restrict connection to only those coming from the same machine.*/
-		address?: string;
-		/** - the TCP port the connection will listen to.Defaults to an ephemeral port (0) which uses an available port when the server is started (and assigned to server.info.port).If port is a string containing a '/' character, it is used as a UNIX domain socket path and if it starts with '\.\pipe' as a Windows named pipe.*/
-		port?: string|number;
-		/** - the full public URI without the path (e.g. 'http://example.com:8080').If present, used as the connection info.uri otherwise constructed from the connection settings.*/
-		uri?: string;
-		/**  - optional node.js HTTP (or HTTPS) http.Server object or any compatible object.If the listener needs to be manually started, set autoListen to false.If the listener uses TLS, set tls to true.*/
-		listener?: any;
-		/**  - indicates that the connection.listener will be started manually outside the framework.Cannot be specified with a port setting.Defaults to true.*/
-		autoListen?: boolean;
-		/**  caching headers configuration: */
-		cache?: {
-			/** - an array of HTTP response status codes (e.g. 200) which are allowed to include a valid caching directive.Defaults to [200]. */
-			statuses: number[];
-		};
-		/** - a string or string array of labels used to server.select() specific connections matching the specified labels.Defaults to an empty array [](no labels).*/
-		labels?: string|string[];
-		/**  - used to create an HTTPS connection.The tls object is passed unchanged as options to the node.js HTTPS server as described in the node.js HTTPS documentation.Set to true when passing a listener object that has been configured to use TLS directly. */
-		tls?: boolean;
-
-	}
-
-	export interface IConnectionConfigurationServerDefaults {
-		/**  application-specific connection configuration which can be accessed via connection.settings.app. Provides a safe place to store application configuration without potential conflicts with the framework internals. Should not be used to configure plugins which should use plugins[name]. Note the difference between connection.settings.app which is used to store configuration values and connection.app which is meant for storing run-time state.  */
-		app?: any;
-		/**  connection load limits configuration where:  */
-		load?: {
-			/**  maximum V8 heap size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
-			maxHeapUsedBytes: number;
-			/**  maximum process RSS size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
-			maxRssBytes: number;
-			/**  maximum event loop delay duration in milliseconds over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
-			maxEventLoopDelay: number;
-		};
-		/**  plugin-specific configuration which can later be accessed via connection.settings.plugins. Provides a place to store and pass connection-specific plugin configuration. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between connection.settings.plugins which is used to store configuration values and connection.plugins which is meant for storing run-time state. */
-		plugins?: any;
-		/**  controls how incoming request URIs are matched against the routing table: */
-		router?: {
-			/**  determines whether the paths '/example' and '/EXAMPLE' are considered different resources. Defaults to true.  */
-			isCaseSensitive: boolean;
-			/**  removes trailing slashes on incoming paths. Defaults to false.  */
-			stripTrailingSlash: boolean;
-		};
-		/** a route options object used to set the default configuration for every route. */
-		routes?: IRouteAdditionalConfigurationOptions;
-		state?: IServerState;
-	}
-
-	/** Note that the options object is deeply cloned and cannot contain any values that are unsafe to perform deep copy on.*/
-	export interface IServerOptions {
-		/**  application-specific configuration which can later be accessed via server.settings.app. Note the difference between server.settings.app which is used to store static configuration values and server.app which is meant for storing run-time state. Defaults to {}.  */
-		app?: any;
-		/**   sets up server-side caching. Every server includes a default cache for storing application state. By default, a simple memory-based cache is created which has limited capacity and capabilities. hapi uses catbox for its cache which includes support for common storage solutions (e.g. Redis, MongoDB, Memcached, and Riak). Caching is only utilized if methods and plugins explicitly store their state in the cache. The server cache configuration only defines the storage container itself. cache can be assigned:
-		a prototype function (usually obtained by calling require() on a catbox strategy such as require('catbox-redis')).
-		a configuration object with the following options:
-		enginea prototype function or catbox engine object.
-		namean identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisions as well.
-		sharedif true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.
-		other options passed to the catbox strategy used.
-		an array of the above object for configuring multiple cache instances, each with a unique name. When an array of objects is provided, multiple cache connections are established and each array item (except one) must include a name.  */
-		cache?: string|ICatBoxCacheOptions|Array<ICatBoxCacheOptions>|any;
-		/**  sets the default connections configuration which can be overridden by each connection where:  */
-		connections?: IConnectionConfigurationServerDefaults;
-		/** determines which logged events are sent to the console (this should only be used for development and does not affect which events are actually logged internally and recorded). Set to false to disable all console logging, or to an object*/
-		debug?: boolean|{
-			/** - a string array of server log tags to be displayed via console.error() when the events are logged via server.log() as well as internally generated server logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error. */
-			log: string[];
-			/**  - a string array of request log tags to be displayed via console.error() when the events are logged via request.log() as well as internally generated request logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error.*/
-			request: string[];
-		};
-		/** file system related settings*/
-		files?: {
-			/**  sets the maximum number of file etag hash values stored in the etags cache. Defaults to 10000.*/
-			etagsCacheMaxSize?: number;
-		};
-		/**  process load monitoring*/
-		load?: {
-			/**  the frequency of sampling in milliseconds. Defaults to 0 (no sampling).*/
-			sampleInterval?: number;
-		};
-
-		/** options passed to the mimos module (https://github.com/hapijs/mimos) when generating the mime database used by the server and accessed via server.mime.*/
-		mime?: any;
-		/**  if true, does not load the inert (file and directory support), h2o2 (proxy support), and vision (views support) plugins automatically. The plugins can be loaded manually after construction. Defaults to false (plugins loaded). */
-		minimal?: boolean;
-		/** plugin-specific configuration which can later be accessed via server.settings.plugins. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between server.settings.plugins which is used to store static configuration values and server.plugins which is meant for storing run-time state. Defaults to {}.*/
-		plugins?: IDictionary<any>;
-
-	}
-
-	export interface IServerViewCompile {
-		(template: string, options: any): void;
-		(template: string, options: any, callback: (err: any, compiled: (context: any, options: any, callback: (err: any, rendered: boolean) => void) => void) => void): void;
-	}
-
-	export interface IServerViewsAdditionalOptions {
-		/**	path - the root file path used to resolve and load the templates identified when calling reply.view().Defaults to current working directory.*/
-		path?: string;
-		/**partialsPath - the root file path where partials are located.Partials are small segments of template code that can be nested and reused throughout other templates.Defaults to no partials support (empty path).
-		*/
-		partialsPath?: string;
-		/**helpersPath - the directory path where helpers are located.Helpers are functions used within templates to perform transformations and other data manipulations using the template context or other inputs.Each '.js' file in the helpers directory is loaded and the file name is used as the helper name.The files must export a single method with the signature function(context) and return a string.Sub - folders are not supported and are ignored.Defaults to no helpers support (empty path).Note that jade does not support loading helpers this way.*/
-		helpersPath?: string;
-		/**relativeTo - a base path used as prefix for path and partialsPath.No default.*/
-		relativeTo?: string;
-
-		/**layout - if set to true or a layout filename, layout support is enabled.A layout is a single template file used as the parent template for other view templates in the same engine.If true, the layout template name must be 'layout.ext' where 'ext' is the engine's extension. Otherwise, the provided filename is suffixed with the engine's extension and loaded.Disable layout when using Jade as it will handle including any layout files independently.Defaults to false.*/
-		layout?: boolean;
-		/**layoutPath - the root file path where layout templates are located (using the relativeTo prefix if present). Defaults to path.*/
-		layoutPath?: string;
-		/**layoutKeyword - the key used by the template engine to denote where primary template content should go.Defaults to 'content'.*/
-		layoutKeywork?: string;
-		/**encoding - the text encoding used by the templates when reading the files and outputting the result.Defaults to 'utf8'.*/
-		encoding?: string;
-		/**isCached - if set to false, templates will not be cached (thus will be read from file on every use).Defaults to true.*/
-		isCached?: boolean;
-		/**allowAbsolutePaths - if set to true, allows absolute template paths passed to reply.view().Defaults to false.*/
-		allowAbsolutePaths?: boolean;
-		/**allowInsecureAccess - if set to true, allows template paths passed to reply.view() to contain '../'.Defaults to false.*/
-		allowInsecureAccess?: boolean;
-		/**compileOptions - options object passed to the engine's compile function. Defaults to empty options {}.*/
-		compileOptions?: any;
-		/**runtimeOptions - options object passed to the returned function from the compile operation.Defaults to empty options {}.*/
-		runtimeOptions?: any;
-		/**contentType - the content type of the engine results.Defaults to 'text/html'.*/
-		contentType?: string;
-		/**compileMode - specify whether the engine compile() method is 'sync' or 'async'.Defaults to 'sync'.*/
-		compileMode?: string;
-		/**context - a global context used with all templates.The global context option can be either an object or a function that takes no arguments and returns a context object.When rendering views, the global context will be merged with any context object specified on the handler or using reply.view().When multiple context objects are used, values from the global context always have lowest precedence.*/
-		context?: any;
-	}
-
-	export interface IServerViewsEnginesOptions extends IServerViewsAdditionalOptions {
-		/**- the npm module used for rendering the templates.The module object must contain: "module", the rendering function. The required function signature depends on the compileMode settings.
-		* If the compileMode is 'sync', the signature is compile(template, options), the return value is a function with signature function(context, options), and the method is allowed to throw errors.If the compileMode is 'async', the signature is compile(template, options, callback) where callback has the signature function(err, compiled) where compiled is a function with signature function(context, options, callback) and callback has the signature function(err, rendered).*/
-		module: {
-			compile? (template: any, options: any): (context: any, options: any) => void;
-			compile? (template: any, options: any, callback: (err: any, compiled: (context: any, options: any, callback: (err: any, rendered: any) => void) => void) => void): void;
-		};
-	}
-
-	/**Initializes the server views manager
-	var Hapi = require('hapi');
-	var server = new Hapi.Server();
-
-	server.views({
-	engines: {
-	html: require('handlebars'),
-	jade: require('jade')
-	},
-	path: '/static/templates'
-	});
-	When server.views() is called within a plugin, the views manager is only available to plugins methods.
-	*/
-	export interface IServerViewsConfiguration extends IServerViewsAdditionalOptions {
-		/** - required object where each key is a file extension (e.g. 'html', 'hbr'), mapped to the npm module used for rendering the templates.Alternatively, the extension can be mapped to an object with the following options:*/
-		engines: IDictionary<any>|IServerViewsEnginesOptions;
-		/**  defines the default filename extension to append to template names when multiple engines are configured and not explicit extension is provided for a given template. No default value.*/
-		defaultExtension?: string;
-	}
-
-	/**  Concludes the handler activity by setting a response and returning control over to the framework where:
-	erran optional error response.
-	resultan optional response payload.
-	Since an request can only have one response regardless if it is an error or success, the reply() method can only result in a single response value. This means that passing both an err and result will only use the err. There is no requirement for either err or result to be (or not) an Error object. The framework will simply use the first argument if present, otherwise the second. The method supports two arguments to be compatible with the common callback pattern of error first.
-	FLOW CONTROL:
-	When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods: hold(), send() */
-	export interface IReply {
-		<T>(err: Error,
-		result?: string|number|boolean|Buffer|stream.Stream | Promise<T> | T,
-		/**  Note that when used to return both an error and credentials in the authentication methods, reply() must be called with three arguments function(err, null, data) where data is the additional authentication information. */
-		credentialData?: any
-		): IBoom;
-		/**  Note that if result is a Stream with a statusCode property, that status code will be used as the default response code.  */
-		<T>(result: string|number|boolean|Buffer|stream.Stream | Promise<T> | T): Response;
-
-		/** Returns control back to the framework without setting a response. If called in the handler, the response defaults to an empty payload with status code 200.
-		* The data argument is only used for passing back authentication data and is ignored elsewhere. */
-		continue(credentialData?: any): void;
-
-		/** Transmits a file from the file system. The 'Content-Type' header defaults to the matching mime type based on filename extension.  The response flow control rules do not apply. */
-		file(
-			/**   the file path. */
-			path: string,
-			/**  optional settings:  */
-			options?: {
-				/** - an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path*/
-				filename?: string;
-				/** specifies whether to include the 'Content-Disposition' header with the response. Available values:
-				false - header is not included. This is the default value.
-				'attachment'
-				'inline'*/
-				mode?: boolean|string;
-				/**   if true, looks for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.  */
-				lookupCompressed: boolean;
-			}): void;
-		/**  Concludes the handler activity by returning control over to the router with a templatized view response.
-		the response flow control rules apply. */
-
-		view(
-			/**  the template filename and path, relative to the templates path configured via the server views manager. */
-			template: string,
-			/**  optional object used by the template to render context-specific result. Defaults to no context {}. */
-			context?: {},
-			/**  optional object used to override the server's views manager configuration for this response. Cannot override isCached, partialsPath, or helpersPath which are only loaded at initialization.  */
-			options?: any): Response;
-		/** Concludes the handler activity by returning control over to the router and informing the router that a response has already been sent back directly via request.raw.res and that no further response action is needed
-		The response flow control rules do not apply. */
-		close(options?: {
-			/**   if false, the router will not call request.raw.res.end()) to ensure the response was ended. Defaults to true.  */
-			end?: boolean;
-		}): void;
-		/** Proxies the request to an upstream endpoint.
-		the response flow control rules do not apply. */
-
-		proxy(/**  an object including the same keys and restrictions defined by the route proxy handler options. */
-			options: IProxyHandlerConfig): void;
-		/** Redirects the client to the specified uri. Same as calling reply().redirect(uri).
-		he response flow control rules apply. */
-		redirect(uri: string): Response;
-	}
-
-	export interface ISessionHandler {
-		(request: Request, reply: IReply): void;
-	}
-	export interface IRequestHandler<T> {
-		(request: Request): T;
-	}
+/// <reference types="node" />
 
 
-	export interface IFailAction {
-		(source: string, error: any, next: () => void): void
-	}
-	/**  generates a reverse proxy handler */
-	export interface IProxyHandlerConfig {
-		/** the upstream service host to proxy requests to. The same path on the client request will be used as the path on the host.*/
-		host?: string;
-		/** the upstream service port. */
-		port?: number;
-		/**  The protocol to use when making a request to the proxied host:
-		'http'
-		'https'*/
-		protocol?: string;
-		/**  an absolute URI used instead of the incoming host, port, protocol, path, and query. Cannot be used with host, port, protocol, or mapUri.*/
-		uri?: string;
-		/**  if true, forwards the headers sent from the client to the upstream service being proxied to, headers sent from the upstream service will also be forwarded to the client. Defaults to false.*/
-		passThrough?: boolean;
-		/** localStatePassThrough - if false, any locally defined state is removed from incoming requests before being passed upstream. This is a security feature to prevent local state (e.g. authentication cookies) from leaking upstream to other servers along with the cookies intended for those servers. This value can be overridden on a per state basis via the server.state() passThrough option. Defaults to false.*/
-		localStatePassThrough?: boolean;
-		/**acceptEncoding - if false, does not pass-through the 'Accept-Encoding' HTTP header which is useful when using an onResponse post-processing to avoid receiving an encoded response (e.g. gzipped). Can only be used together with passThrough. Defaults to true (passing header).*/
-		acceptEncoding?: boolean;
-		/** rejectUnauthorized - sets the rejectUnauthorized property on the https agent making the request. This value is only used when the proxied server uses TLS/SSL. When set it will override the node.js rejectUnauthorized property. If false then ssl errors will be ignored. When true the server certificate is verified and an 500 response will be sent when verification fails. This shouldn't be used alongside the agent setting as the agent will be used instead. Defaults to the https agent default value of true.*/
-		rejectUnauthorized?: boolean;
-		/**if true, sets the 'X-Forwarded-For', 'X-Forwarded-Port', 'X-Forwarded-Proto' headers when making a request to the proxied upstream endpoint. Defaults to false.*/
-		xforward?: boolean;
-		/** the maximum number of HTTP redirections allowed, to be followed automatically by the handler. Set to false or 0 to disable all redirections (the response will contain the redirection received from the upstream service). If redirections are enabled, no redirections (301, 302, 307, 308) will be passed along to the client, and reaching the maximum allowed redirections will return an error response. Defaults to false.*/
-		redirects?: boolean|number;
-		/**number of milliseconds before aborting the upstream request. Defaults to 180000 (3 minutes).*/
-		timeout?: number;
-		/** a function used to map the request URI to the proxied URI. Cannot be used together with host, port, protocol, or uri. The function signature is function(request, callback) where:
-		request - is the incoming request object.
-		callback - is function(err, uri, headers) where:
-		err - internal error condition.
-		uri - the absolute proxy URI.
-		headers - optional object where each key is an HTTP request header and the value is the header content.*/
-		mapUri?: (request: Request, callback: (err: any, uri: string, headers?: { [key: string]: string }) => void) => void;
-		/**  a custom function for processing the response from the upstream service before sending to the client. Useful for custom error handling of responses from the proxied endpoint or other payload manipulation. Function signature is function(err, res, request, reply, settings, ttl) where: - err - internal or upstream error returned from attempting to contact the upstream proxy. - res - the node response object received from the upstream service. res is a readable stream (use the wreck module read method to easily convert it to a Buffer or string). - request - is the incoming request object. - reply - the reply interface function. - settings - the proxy handler configuration. - ttl - the upstream TTL in milliseconds if proxy.ttl it set to 'upstream' and the upstream response included a valid 'Cache-Control' header with 'max-age'.*/
-		onResponse?: (
-		err: any,
-		res: http.ServerResponse,
-		req: Request,
-		reply: () => void,
-		settings: IProxyHandlerConfig,
-		ttl: number
-		) => void;
-		/** if set to 'upstream', applies the upstream response caching policy to the response using the response.ttl() method (or passed as an argument to the onResponse method if provided).*/
-		ttl?: number;
-		/** - a node http(s) agent to be used for connections to upstream server.  see https://nodejs.org/api/http.html#http_class_http_agent */
-		agent?: http.Agent;
-		/** sets the maximum number of sockets available per outgoing proxy host connection. false means use the wreck module default value (Infinity). Does not affect non-proxy outgoing client connections. Defaults to Infinity.*/
-		maxSockets?: boolean|number;
-	}
-	/**  TODO: fill in joi definition  */
-	export interface IJoi {
+import http = require("http");
+import stream = require("stream");
+import Events = require("events");
 
-	}
-	/**  a validation function using the signature function(value, options, next) */
-	export interface IValidationFunction {
+interface IDictionary<T> {
+    [key: string]: T;
+}
 
-		(/**   the object containing the path parameters. */
-		value: any,
-		/**  the server validation options. */
-		options: any,
-		/**   the callback function called when validation is completed.  */
-		next: (err: any, value: any) => void): void;
-	}
-	/**  a custom error handler function with the signature 'function(request, reply, source, error)` */
-	export interface IRouteFailFunction {
-		/**  a custom error handler function with the signature 'function(request, reply, source, error)` */
-		(
-		/** - the [request object]. */
-		request: Request,
-		/**   the continuation reply interface. */
-		reply: IReply,
-		/**  the source of the invalid field (e.g. 'path', 'query', 'payload'). */
-		source: string,
-		/**  the error object prepared for the client response (including the validation function error under error.data). */
-		error: any): void;
-	}
+/** Boom Module for errors. https://github.com/hapijs/boom
+*  boom provides a set of utilities for returning HTTP errors. Each utility returns a Boom error response object (instance of Error) which includes the following properties:  */
+export interface IBoom extends Error {
+    /**  if true, indicates this is a Boom object instance.  */
+    isBoom: boolean;
+    /** convenience bool indicating status code >= 500.  */
+    isServer: boolean;
+    /**  the error message.  */
+    message: string;
+    /**  the formatted response.Can be directly manipulated after object construction to return a custom error response.Allowed root keys:  */
+    output: {
+        /** the HTTP status code (typically 4xx or 5xx).  */
+        statusCode: number;
+        /** an object containing any HTTP headers where each key is a header name and value is the header content.  */
+        headers: IDictionary<string>;
+        /** the formatted object used as the response payload (stringified).Can be directly manipulated but any changes will be lost if reformat() is called.Any content allowed and by default includes the following content: */
+        payload: {
+            /** the HTTP status code, derived from error.output.statusCode.  */
+            statusCode: number;
+            /** the HTTP status message (e.g. 'Bad Request', 'Internal Server Error') derived from statusCode.  */
+            error: string;
+            /** the error message derived from error.message. */
+            message: string;
+        };
+    };
+    /**  reformat()rebuilds error.output using the other object properties.  */
+    reformat(): void;
 
-	/**  Each route can be customize to change the default behavior of the request lifecycle using the following options:  */
-	export interface IRouteAdditionalConfigurationOptions {
-		/**  application specific configuration.Should not be used by plugins which should use plugins[name] instead. */
-		app?: any;
-		/** authentication configuration.Value can be: false to disable authentication if a default strategy is set.
-		a string with the name of an authentication strategy registered with server.auth.strategy().
-		an object  */
-		auth?: boolean|string|
-		{
-			/**  the authentication mode.Defaults to 'required' if a server authentication strategy is configured, otherwise defaults to no authentication.Available values:
-			'required'authentication is required.
-			'optional'authentication is optional (must be valid if present).
-			'try'same as 'optional' but allows for invalid authentication. */
-			mode: string;
-			/**  a string array of strategy names in order they should be attempted.If only one strategy is used, strategy can be used instead with the single string value.Defaults to the default authentication strategy which is available only when a single strategy is configured.  */
-			strategies?: string | Array<string>;
-			strategy?: string;
-			/**  if set, the payload (in requests other than 'GET' and 'HEAD') is authenticated after it is processed.Requires a strategy with payload authentication support (e.g.Hawk).Cannot be set to a value other than 'required' when the scheme sets the options.payload to true.Available values:
-			falseno payload authentication.This is the default value.
-			'required'payload authentication required.This is the default value when the scheme sets options.payload to true.
-			'optional'payload authentication performed only when the client includes payload authentication information (e.g.hash attribute in Hawk). */
-			payload?: string;
-			/**  the application scope required to access the route.Value can be a scope string or an array of scope strings.The authenticated credentials object scope property must contain at least one of the scopes defined to access the route.Set to false to remove scope requirements.Defaults to no scope required.  */
-			scope?: string|Array<string>|boolean;
-			/** the required authenticated entity type.If set, must match the entity value of the authentication credentials.Available values:
-			anythe authentication can be on behalf of a user or application.This is the default value.
-			userthe authentication must be on behalf of a user.
-			appthe authentication must be on behalf of an application. */
-			entity?: string;
-		};
-		/** an object passed back to the provided handler (via this) when called. */
-		bind?: any;
-		/** if the route method is 'GET', the route can be configured to include caching directives in the response using the following options */
-		cache?: {
-			/**  mines the privacy flag included in clientside caching using the 'Cache-Control' header.Values are:
-			fault'no privacy flag.This is the default setting.
-			'public'mark the response as suitable for public caching.
-			'private'mark the response as suitable only for private caching.  */
-			privacy: string;
-			/**  relative expiration expressed in the number of milliseconds since the item was saved in the cache.Cannot be used together with expiresAt. */
-			expiresIn: number;
-			/**  time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire.Cannot be used together with expiresIn.  */
-			expiresAt: string;
-		};
-		/** the Cross- Origin Resource Sharing protocol allows browsers to make cross- origin API calls.CORS is required by web applications running inside a browser which are loaded from a different domain than the API server.CORS headers are disabled by default. To enable, set cors to true, or to an object with the following options: */
-		cors?: {
-			/** a strings array of allowed origin servers ('Access-Control-Allow-Origin').The array can contain any combination of fully qualified origins along with origin strings containing a wildcard '' character, or a single `''origin string. Defaults to any origin['*']`. */
-			origin?: Array<string>;
-			/** if true, matches the value of the incoming 'Origin' header to the list of origin values ('*' matches anything) and if a match is found, uses that as the value of the 'Access-Control-Allow-Origin' response header.When false, the origin config is returned as- is.Defaults to true.  */
-			matchOrigin?: boolean;
-			/** if false, prevents the connection from returning the full list of non- wildcard origin values if the incoming origin header does not match any of the values.Has no impact if matchOrigin is set to false.Defaults to true. */
-			isOriginExposed?: boolean;
-			/**  number of seconds the browser should cache the CORS response ('Access-Control-Max-Age').The greater the value, the longer it will take before the browser checks for changes in policy.Defaults to 86400 (one day). */
-			maxAge?: number;
-			/**  a strings array of allowed headers ('Access-Control-Allow-Headers').Defaults to ['Authorization', 'Content-Type', 'If-None-Match']. */
-			headers?: string[];
-			/**  a strings array of additional headers to headers.Use this to keep the default headers in place. */
-			additionalHeaders?: string[];
-			/**  a strings array of allowed HTTP methods ('Access-Control-Allow-Methods').Defaults to ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'OPTIONS']. */
-			methods?: string[];
-			/**  a strings array of additional methods to methods.Use this to keep the default methods in place. */
-			additionalMethods?: string[];
-			/**  a strings array of exposed headers ('Access-Control-Expose-Headers').Defaults to ['WWW-Authenticate', 'Server-Authorization']. */
-			exposedHeaders?: string[];
-			/**  a strings array of additional headers to exposedHeaders.Use this to keep the default headers in place. */
-			additionalExposedHeaders?: string[];
-			/**  if true, allows user credentials to be sent ('Access-Control-Allow-Credentials').Defaults to false. */
-			credentials?: boolean;
-			/** if false, preserves existing CORS headers set manually before the response is sent.Defaults to true. */
-			override?: boolean;
-		};
-		/**   defines the behavior for serving static resources using the built-in route handlers for files and directories: */
-		files?: {/** determines the folder relative paths are resolved against when using the file and directory handlers. */
-			relativeTo: string;
-		};
+}
 
-		/**  an alternative location for the route handler option. */
-		handler?: ISessionHandler | string | IRouteHandlerConfig;
-		/** an optional unique identifier used to look up the route using server.lookup(). */
-		id?: number;
-		/** optional arguments passed to JSON.stringify() when converting an object or error response to a string payload.Supports the following: */
-		json?: {
-			/** the replacer function or array.Defaults to no action. */
-			replacer?: Function | string[];
-			/**  number of spaces to indent nested object keys.Defaults to no indentation. */
-			space?: number|string;
-			/** string suffix added after conversion to JSON string.Defaults to no suffix. */
-			suffix?: string;
-		};
-		/** enables JSONP support by setting the value to the query parameter name containing the function name used to wrap the response payload.For example, if the value is 'callback', a request comes in with 'callback=me', and the JSON response is '{ "a":"b" }', the payload will be 'me({ "a":"b" });'.Does not work with stream responses. */
-		jsonp?: string;
-		/** determines how the request payload is processed: */
-		payload?: {
-			/**  the type of payload representation requested. The value must be one of:
-			'data'the incoming payload is read fully into memory.If parse is true, the payload is parsed (JSON, formdecoded, multipart) based on the 'Content- Type' header.If parse is false, the raw Buffer is returned.This is the default value except when a proxy handler is used.
-			'stream'the incoming payload is made available via a Stream.Readable interface.If the payload is 'multipart/form-data' and parse is true, fields values are presented as text while files are provided as streams.File streams from a 'multipart/form-data' upload will also have a property hapi containing filename and headers properties.
-			'file'the incoming payload in written to temporary file in the directory specified by the server's payload.uploads settings. If the payload is 'multipart/ formdata' and parse is true, fields values are presented as text while files are saved. Note that it is the sole responsibility of the application to clean up the files generated by the framework. This can be done by keeping track of which files are used (e.g. using the request.app object), and listening to the server 'response' event to perform any needed cleaup. */
-			output?: string;
-			/**  can be true, false, or gunzip; determines if the incoming payload is processed or presented raw. true and gunzip includes gunzipping when the appropriate 'Content-Encoding' is specified on the received request. If parsing is enabled and the 'Content-Type' is known (for the whole payload as well as parts), the payload is converted into an object when possible. If the format is unknown, a Bad Request (400) error response is sent. Defaults to true, except when a proxy handler is used. The supported mime types are:
-			'application/json'
-			'application/x-www-form-urlencoded'
-			'application/octet-stream'
-			'text/ *'
-			'multipart/form-data' */
-			parse?: string | boolean;
-			/** a string or an array of strings with the allowed mime types for the endpoint.Defaults to any of the supported mime types listed above.Note that allowing other mime types not listed will not enable them to be parsed, and that if parsing mode is 'parse', the request will result in an error response. */
-			allow?: string | string[];
-			/** a mime type string overriding the 'Content-Type' header value received.Defaults to no override. */
-			override?: string;
-			/**  limits the size of incoming payloads to the specified byte count.Allowing very large payloads may cause the server to run out of memory.Defaults to 1048576 (1MB).  */
-			maxBytes?: number;
-			/** payload reception timeout in milliseconds.Sets the maximum time allowed for the client to transmit the request payload (body) before giving up and responding with a Request Timeout (408) error response.Set to false to disable.Defaults to 10000 (10 seconds). */
-			timeout?: number;
-			/**  the directory used for writing file uploads.Defaults to os.tmpDir(). */
-			uploads?: string;
-			/**  determines how to handle payload parsing errors. Allowed values are:
-			'error'return a Bad Request (400) error response. This is the default value.
-			'log'report the error but continue processing the request.
-			'ignore'take no action and continue processing the request. */
-			failAction?: string;
-		};
-		/** pluginspecific configuration.plugins is an object where each key is a plugin name and the value is the plugin configuration.  */
-		plugins?: IDictionary<any>;
-		/** an array with [route prerequisites] methods which are executed in serial or in parallel before the handler is called.  */
-		pre?: any[];
-		/** validation rules for the outgoing response payload (response body).Can only validate object response: */
-		response?: {
-			/**   the default response object validation rules (for all non-error responses) expressed as one of:
-			trueany payload allowed (no validation performed). This is the default.
-			falseno payload allowed.
-			a Joi validation object.
-			a validation function using the signature function(value, options, next) where:
-			valuethe object containing the response object.
-			optionsthe server validation options.
-			next(err)the callback function called when validation is completed.  */
-			schema: boolean|any;
-			/** HTTP status- codespecific validation rules.The status key is set to an object where each key is a 3 digit HTTP status code and the value has the same definition as schema.If a response status code is not present in the status object, the schema definition is used, expect for errors which are not validated by default.  */
-			status: number;
-			/** the percent of responses validated (0100).Set to 0 to disable all validation.Defaults to 100 (all responses). */
-			sample: number;
-			/**  defines what to do when a response fails validation.Options are:
-			errorreturn an Internal Server Error (500) error response.This is the default value.
-			loglog the error but send the response.  */
-			failAction: string;
-			/** if true, applies the validation rule changes to the response.Defaults to false. */
-			modify: boolean;
-			/** options to pass to Joi.Useful to set global options such as stripUnknown or abortEarly (the complete list is available here: https://github.com/hapijs/joi#validatevalue-schema-options-callback ).Defaults to no options.  */
-			options: any;
-		};
-		/** sets common security headers (disabled by default).To enable set security to true or to an object with the following options */
-		security?: boolean| {
-			/** controls the 'Strict-Transport-Security' header.If set to true the header will be set to max- age=15768000, if specified as a number the maxAge parameter will be set to that number.Defaults to true.You may also specify an object with the following fields: */
-			hsts: boolean|number|{
-				/** the max- age portion of the header, as a number.Default is 15768000. */
-				maxAge?: number;
-				/**  a boolean specifying whether to add the includeSubdomains flag to the header. */
-				includeSubdomains?: boolean;
-			};
-			/** controls the 'X-Frame-Options' header.When set to true the header will be set to DENY, you may also specify a string value of 'deny' or 'sameorigin'.To use the 'allow-from' rule, you must set this to an object with the following fields: */
-			xframe: {
-				/** either 'deny', 'sameorigin', or 'allow-from' */
-				rule: string;
-				/** when rule is 'allow-from' this is used to form the rest of the header, otherwise this field is ignored.If rule is 'allow-from' but source is unset, the rule will be automatically changed to 'sameorigin'. */
-				source: string;
-			};
-			/** boolean that controls the 'X-XSS-PROTECTION' header for IE.Defaults to true which sets the header to equal '1; mode=block'.NOTE: This setting can create a security vulnerability in versions of IE below 8, as well as unpatched versions of IE8.See here and here for more information.If you actively support old versions of IE, it may be wise to explicitly set this flag to false. */
-			xss: boolean;
-			/**  boolean controlling the 'X-Download-Options' header for IE, preventing downloads from executing in your context.Defaults to true setting the header to 'noopen'. */
-			noOpen: boolean;
-			/** boolean controlling the 'X-Content-Type-Options' header.Defaults to true setting the header to its only and default option, 'nosniff'. */
-			noSniff: boolean;
-		};
-		/** HTTP state management (cookies) allows the server to store information on the client which is sent back to the server with every request (as defined in RFC 6265).state supports the following options: */
-		state?: {
-			/** determines if incoming 'Cookie' headers are parsed and stored in the request.state object.Defaults to true. */
-			parse: boolean;
-			/** determines how to handle cookie parsing errors.Allowed values are:
-			'error'return a Bad Request (400) error response.This is the default value.
-			'log'report the error but continue processing the request.
-			'ignore'take no action. */
-			failAction: string;
-		};
-		/**  request input validation rules for various request components.When using a Joi validation object, the values of the other inputs (i.e.headers, query, params, payload, and auth) are made available under the validation context (accessible in rules as Joi.ref('$query.key')).Note that validation is performed in order(i.e.headers, params, query, payload) and if type casting is used (converting a string to number), the value of inputs not yet validated will reflect the raw, unvalidated and unmodified values.The validate object supports: */
-		validate?: {
-			/** validation rules for incoming request headers.Values allowed:
-			* trueany headers allowed (no validation performed).This is the default.
-			falseno headers allowed (this will cause all valid HTTP requests to fail).
-			a Joi validation object.
-			a validation function using the signature function(value, options, next) where:
-			valuethe object containing the request headers.
-			optionsthe server validation options.
-			next(err, value)the callback function called when validation is completed.
-			*/
-			headers?: boolean | IJoi | IValidationFunction;
+/** cache functionality via the "CatBox" module. */
+export interface ICatBoxCacheOptions {
+    /**  a prototype function or catbox engine object.  */
+    engine: any;
+    /**   an identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisions as well.  */
+    name?: string;
+    /**   if true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.  */
+    shared?: boolean;
+}
+
+/** Any connections configuration server defaults can be included to override and customize the individual connection. */
+export interface ISeverConnectionOptions extends IConnectionConfigurationServerDefaults {
+    /**  - the public hostname or IP address. Used only to set server.info.host and server.info.uri. If not configured, defaults to the operating system hostname and if not available, to 'localhost'.*/
+    host?: string;
+    /** - sets the host name or IP address the connection will listen on.If not configured, defaults to host if present, otherwise to all available network interfaces (i.e. '0.0.0.0').Set to 127.0.0.1 or localhost to restrict connection to only those coming from the same machine.*/
+    address?: string;
+    /** - the TCP port the connection will listen to.Defaults to an ephemeral port (0) which uses an available port when the server is started (and assigned to server.info.port).If port is a string containing a '/' character, it is used as a UNIX domain socket path and if it starts with '\.\pipe' as a Windows named pipe.*/
+    port?: string | number;
+    /** - the full public URI without the path (e.g. 'http://example.com:8080').If present, used as the connection info.uri otherwise constructed from the connection settings.*/
+    uri?: string;
+    /**  - optional node.js HTTP (or HTTPS) http.Server object or any compatible object.If the listener needs to be manually started, set autoListen to false.If the listener uses TLS, set tls to true.*/
+    listener?: any;
+    /**  - indicates that the connection.listener will be started manually outside the framework.Cannot be specified with a port setting.Defaults to true.*/
+    autoListen?: boolean;
+    /**  caching headers configuration: */
+    cache?: {
+        /** - an array of HTTP response status codes (e.g. 200) which are allowed to include a valid caching directive.Defaults to [200]. */
+        statuses: number[];
+    };
+    /** - a string or string array of labels used to server.select() specific connections matching the specified labels.Defaults to an empty array [](no labels).*/
+    labels?: string | string[];
+    /**  - used to create an HTTPS connection.The tls object is passed unchanged as options to the node.js HTTPS server as described in the node.js HTTPS documentation.Set to true when passing a listener object that has been configured to use TLS directly. */
+    tls?: boolean;
+
+}
+
+export interface IConnectionConfigurationServerDefaults {
+    /**  application-specific connection configuration which can be accessed via connection.settings.app. Provides a safe place to store application configuration without potential conflicts with the framework internals. Should not be used to configure plugins which should use plugins[name]. Note the difference between connection.settings.app which is used to store configuration values and connection.app which is meant for storing run-time state.  */
+    app?: any;
+    /**  connection load limits configuration where:  */
+    load?: {
+        /**  maximum V8 heap size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
+        maxHeapUsedBytes: number;
+        /**  maximum process RSS size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
+        maxRssBytes: number;
+        /**  maximum event loop delay duration in milliseconds over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
+        maxEventLoopDelay: number;
+    };
+    /**  plugin-specific configuration which can later be accessed via connection.settings.plugins. Provides a place to store and pass connection-specific plugin configuration. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between connection.settings.plugins which is used to store configuration values and connection.plugins which is meant for storing run-time state. */
+    plugins?: any;
+    /**  controls how incoming request URIs are matched against the routing table: */
+    router?: {
+        /**  determines whether the paths '/example' and '/EXAMPLE' are considered different resources. Defaults to true.  */
+        isCaseSensitive: boolean;
+        /**  removes trailing slashes on incoming paths. Defaults to false.  */
+        stripTrailingSlash: boolean;
+    };
+    /** a route options object used to set the default configuration for every route. */
+    routes?: IRouteAdditionalConfigurationOptions;
+    state?: IServerState;
+}
+
+/** Note that the options object is deeply cloned and cannot contain any values that are unsafe to perform deep copy on.*/
+export interface IServerOptions {
+    /**  application-specific configuration which can later be accessed via server.settings.app. Note the difference between server.settings.app which is used to store static configuration values and server.app which is meant for storing run-time state. Defaults to {}.  */
+    app?: any;
+    /**   sets up server-side caching. Every server includes a default cache for storing application state. By default, a simple memory-based cache is created which has limited capacity and capabilities. hapi uses catbox for its cache which includes support for common storage solutions (e.g. Redis, MongoDB, Memcached, and Riak). Caching is only utilized if methods and plugins explicitly store their state in the cache. The server cache configuration only defines the storage container itself. cache can be assigned:
+    a prototype function (usually obtained by calling require() on a catbox strategy such as require('catbox-redis')).
+    a configuration object with the following options:
+    enginea prototype function or catbox engine object.
+    namean identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisions as well.
+    sharedif true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.
+    other options passed to the catbox strategy used.
+    an array of the above object for configuring multiple cache instances, each with a unique name. When an array of objects is provided, multiple cache connections are established and each array item (except one) must include a name.  */
+    cache?: string | ICatBoxCacheOptions | Array<ICatBoxCacheOptions> | any;
+    /**  sets the default connections configuration which can be overridden by each connection where:  */
+    connections?: IConnectionConfigurationServerDefaults;
+    /** determines which logged events are sent to the console (this should only be used for development and does not affect which events are actually logged internally and recorded). Set to false to disable all console logging, or to an object*/
+    debug?: boolean | {
+        /** - a string array of server log tags to be displayed via console.error() when the events are logged via server.log() as well as internally generated server logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error. */
+        log: string[];
+        /**  - a string array of request log tags to be displayed via console.error() when the events are logged via request.log() as well as internally generated request logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error.*/
+        request: string[];
+    };
+    /** file system related settings*/
+    files?: {
+        /**  sets the maximum number of file etag hash values stored in the etags cache. Defaults to 10000.*/
+        etagsCacheMaxSize?: number;
+    };
+    /**  process load monitoring*/
+    load?: {
+        /**  the frequency of sampling in milliseconds. Defaults to 0 (no sampling).*/
+        sampleInterval?: number;
+    };
+
+    /** options passed to the mimos module (https://github.com/hapijs/mimos) when generating the mime database used by the server and accessed via server.mime.*/
+    mime?: any;
+    /**  if true, does not load the inert (file and directory support), h2o2 (proxy support), and vision (views support) plugins automatically. The plugins can be loaded manually after construction. Defaults to false (plugins loaded). */
+    minimal?: boolean;
+    /** plugin-specific configuration which can later be accessed via server.settings.plugins. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between server.settings.plugins which is used to store static configuration values and server.plugins which is meant for storing run-time state. Defaults to {}.*/
+    plugins?: IDictionary<any>;
+
+}
+
+export interface IServerViewCompile {
+    (template: string, options: any): void;
+    (template: string, options: any, callback: (err: any, compiled: (context: any, options: any, callback: (err: any, rendered: boolean) => void) => void) => void): void;
+}
+
+export interface IServerViewsAdditionalOptions {
+    /**	path - the root file path used to resolve and load the templates identified when calling reply.view().Defaults to current working directory.*/
+    path?: string;
+    /**partialsPath - the root file path where partials are located.Partials are small segments of template code that can be nested and reused throughout other templates.Defaults to no partials support (empty path).
+    */
+    partialsPath?: string;
+    /**helpersPath - the directory path where helpers are located.Helpers are functions used within templates to perform transformations and other data manipulations using the template context or other inputs.Each '.js' file in the helpers directory is loaded and the file name is used as the helper name.The files must export a single method with the signature function(context) and return a string.Sub - folders are not supported and are ignored.Defaults to no helpers support (empty path).Note that jade does not support loading helpers this way.*/
+    helpersPath?: string;
+    /**relativeTo - a base path used as prefix for path and partialsPath.No default.*/
+    relativeTo?: string;
+
+    /**layout - if set to true or a layout filename, layout support is enabled.A layout is a single template file used as the parent template for other view templates in the same engine.If true, the layout template name must be 'layout.ext' where 'ext' is the engine's extension. Otherwise, the provided filename is suffixed with the engine's extension and loaded.Disable layout when using Jade as it will handle including any layout files independently.Defaults to false.*/
+    layout?: boolean;
+    /**layoutPath - the root file path where layout templates are located (using the relativeTo prefix if present). Defaults to path.*/
+    layoutPath?: string;
+    /**layoutKeyword - the key used by the template engine to denote where primary template content should go.Defaults to 'content'.*/
+    layoutKeywork?: string;
+    /**encoding - the text encoding used by the templates when reading the files and outputting the result.Defaults to 'utf8'.*/
+    encoding?: string;
+    /**isCached - if set to false, templates will not be cached (thus will be read from file on every use).Defaults to true.*/
+    isCached?: boolean;
+    /**allowAbsolutePaths - if set to true, allows absolute template paths passed to reply.view().Defaults to false.*/
+    allowAbsolutePaths?: boolean;
+    /**allowInsecureAccess - if set to true, allows template paths passed to reply.view() to contain '../'.Defaults to false.*/
+    allowInsecureAccess?: boolean;
+    /**compileOptions - options object passed to the engine's compile function. Defaults to empty options {}.*/
+    compileOptions?: any;
+    /**runtimeOptions - options object passed to the returned function from the compile operation.Defaults to empty options {}.*/
+    runtimeOptions?: any;
+    /**contentType - the content type of the engine results.Defaults to 'text/html'.*/
+    contentType?: string;
+    /**compileMode - specify whether the engine compile() method is 'sync' or 'async'.Defaults to 'sync'.*/
+    compileMode?: string;
+    /**context - a global context used with all templates.The global context option can be either an object or a function that takes no arguments and returns a context object.When rendering views, the global context will be merged with any context object specified on the handler or using reply.view().When multiple context objects are used, values from the global context always have lowest precedence.*/
+    context?: any;
+}
+
+export interface IServerViewsEnginesOptions extends IServerViewsAdditionalOptions {
+    /**- the npm module used for rendering the templates.The module object must contain: "module", the rendering function. The required function signature depends on the compileMode settings.
+    * If the compileMode is 'sync', the signature is compile(template, options), the return value is a function with signature function(context, options), and the method is allowed to throw errors.If the compileMode is 'async', the signature is compile(template, options, callback) where callback has the signature function(err, compiled) where compiled is a function with signature function(context, options, callback) and callback has the signature function(err, rendered).*/
+    module: {
+        compile?(template: any, options: any): (context: any, options: any) => void;
+        compile?(template: any, options: any, callback: (err: any, compiled: (context: any, options: any, callback: (err: any, rendered: any) => void) => void) => void): void;
+    };
+}
+
+/**Initializes the server views manager
+var Hapi = require('hapi');
+var server = new Hapi.Server();
+
+server.views({
+engines: {
+html: require('handlebars'),
+jade: require('jade')
+},
+path: '/static/templates'
+});
+When server.views() is called within a plugin, the views manager is only available to plugins methods.
+*/
+export interface IServerViewsConfiguration extends IServerViewsAdditionalOptions {
+    /** - required object where each key is a file extension (e.g. 'html', 'hbr'), mapped to the npm module used for rendering the templates.Alternatively, the extension can be mapped to an object with the following options:*/
+    engines: IDictionary<any> | IServerViewsEnginesOptions;
+    /**  defines the default filename extension to append to template names when multiple engines are configured and not explicit extension is provided for a given template. No default value.*/
+    defaultExtension?: string;
+}
+
+/**  Concludes the handler activity by setting a response and returning control over to the framework where:
+erran optional error response.
+resultan optional response payload.
+Since an request can only have one response regardless if it is an error or success, the reply() method can only result in a single response value. This means that passing both an err and result will only use the err. There is no requirement for either err or result to be (or not) an Error object. The framework will simply use the first argument if present, otherwise the second. The method supports two arguments to be compatible with the common callback pattern of error first.
+FLOW CONTROL:
+When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods: hold(), send() */
+export interface IReply {
+    <T>(err: Error,
+        result?: string | number | boolean | Buffer | stream.Stream | Promise<T> | T,
+        /**  Note that when used to return both an error and credentials in the authentication methods, reply() must be called with three arguments function(err, null, data) where data is the additional authentication information. */
+        credentialData?: any
+    ): IBoom;
+    /**  Note that if result is a Stream with a statusCode property, that status code will be used as the default response code.  */
+    <T>(result?: string | number | boolean | Buffer | stream.Stream | Promise<T> | T): Response;
+
+    /** Returns control back to the framework without setting a response. If called in the handler, the response defaults to an empty payload with status code 200.
+      * The data argument is only used for passing back authentication data and is ignored elsewhere. */
+    continue(credentialData?: any): void;
+
+    /** Transmits a file from the file system. The 'Content-Type' header defaults to the matching mime type based on filename extension.  The response flow control rules do not apply. */
+    file(
+        /**   the file path. */
+        path: string,
+        /**  optional settings:  */
+        options?: {
+            /** - an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path*/
+            filename?: string;
+            /** specifies whether to include the 'Content-Disposition' header with the response. Available values:
+            false - header is not included. This is the default value.
+            'attachment'
+            'inline'*/
+            mode?: boolean | string;
+            /**   if true, looks for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.  */
+            lookupCompressed: boolean;
+        }): void;
+    /**  Concludes the handler activity by returning control over to the router with a templatized view response.
+    the response flow control rules apply. */
+
+    view(
+        /**  the template filename and path, relative to the templates path configured via the server views manager. */
+        template: string,
+        /**  optional object used by the template to render context-specific result. Defaults to no context {}. */
+        context?: {},
+        /**  optional object used to override the server's views manager configuration for this response. Cannot override isCached, partialsPath, or helpersPath which are only loaded at initialization.  */
+        options?: any): Response;
+    /** Concludes the handler activity by returning control over to the router and informing the router that a response has already been sent back directly via request.raw.res and that no further response action is needed
+    The response flow control rules do not apply. */
+    close(options?: {
+        /**   if false, the router will not call request.raw.res.end()) to ensure the response was ended. Defaults to true.  */
+        end?: boolean;
+    }): void;
+    /** Proxies the request to an upstream endpoint.
+    the response flow control rules do not apply. */
+
+    proxy(/**  an object including the same keys and restrictions defined by the route proxy handler options. */
+        options: IProxyHandlerConfig): void;
+    /** Redirects the client to the specified uri. Same as calling reply().redirect(uri).
+    he response flow control rules apply. */
+    redirect(uri: string): Response;
+}
+
+export interface ISessionHandler {
+    (request: Request, reply: IReply): void;
+}
+export interface IRequestHandler<T> {
+    (request: Request): T;
+}
 
 
-			/** validation rules for incoming request path parameters, after matching the path against the route and extracting any parameters then stored in request.params.Values allowed:
-			trueany path parameters allowed (no validation performed).This is the default.
-			falseno path variables allowed.
-			a Joi validation object.
-			a validation function using the signature function(value, options, next) where:
-			valuethe object containing the path parameters.
-			optionsthe server validation options.
-			next(err, value)the callback function called when validation is completed. */
-			params?: boolean | IJoi | IValidationFunction;
-			/** validation rules for an incoming request URI query component (the key- value part of the URI between '?' and '#').The query is parsed into its individual key- value pairs (using the qs module) and stored in request.query prior to validation.Values allowed:
-			trueany query parameters allowed (no validation performed).This is the default.
-			falseno query parameters allowed.
-			a Joi validation object.
-			a validation function using the signature function(value, options, next) where:
-			valuethe object containing the query parameters.
-			optionsthe server validation options.
-			next(err, value)the callback function called when validation is completed. */
-			query?: boolean | IJoi | IValidationFunction;
-			/**  validation rules for an incoming request payload (request body).Values allowed:
-			trueany payload allowed (no validation performed).This is the default.
-			falseno payload allowed.
-			a Joi validation object.
-			a validation function using the signature function(value, options, next) where:
-			valuethe object containing the payload object.
-			optionsthe server validation options.
-			next(err, value)the callback function called when validation is completed.  */
-			payload?: boolean | IJoi | IValidationFunction;
-			/** an optional object with error fields copied into every validation error response. */
-			errorFields?: any;
-			/** determines how to handle invalid requests.Allowed values are:
-			'error'return a Bad Request (400) error response.This is the default value.
-			'log'log the error but continue processing the request.
-			'ignore'take no action.
-			OR a custom error handler function with the signature 'function(request, reply, source, error)` where:
-			requestthe request object.
-			replythe continuation reply interface.
-			sourcethe source of the invalid field (e.g. 'path', 'query', 'payload').
-			errorthe error object prepared for the client response (including the validation function error under error.data). */
-			failAction?: string | IRouteFailFunction;
-			/** options to pass to Joi.Useful to set global options such as stripUnknown or abortEarly (the complete list is available here: https://github.com/hapijs/joi#validatevalue-schema-options-callback ).Defaults to no options. */
-			options?: any;
-		};
-		/** define timeouts for processing durations: */
-		timeout?: {
-			/** response timeout in milliseconds.Sets the maximum time allowed for the server to respond to an incoming client request before giving up and responding with a Service Unavailable (503) error response.Disabled by default (false). */
-			server: boolean|number;
-			/** by default, node sockets automatically timeout after 2 minutes.Use this option to override this behavior.Defaults to undefined which leaves the node default unchanged.Set to false to disable socket timeouts. */
-			socket: boolean|number;
-		};
+export interface IFailAction {
+    (source: string, error: any, next: () => void): void
+}
+/**  generates a reverse proxy handler */
+export interface IProxyHandlerConfig {
+    /** the upstream service host to proxy requests to. The same path on the client request will be used as the path on the host.*/
+    host?: string;
+    /** the upstream service port. */
+    port?: number;
+    /**  The protocol to use when making a request to the proxied host:
+    'http'
+    'https'*/
+    protocol?: string;
+    /**  an absolute URI used instead of the incoming host, port, protocol, path, and query. Cannot be used with host, port, protocol, or mapUri.*/
+    uri?: string;
+    /**  if true, forwards the headers sent from the client to the upstream service being proxied to, headers sent from the upstream service will also be forwarded to the client. Defaults to false.*/
+    passThrough?: boolean;
+    /** localStatePassThrough - if false, any locally defined state is removed from incoming requests before being passed upstream. This is a security feature to prevent local state (e.g. authentication cookies) from leaking upstream to other servers along with the cookies intended for those servers. This value can be overridden on a per state basis via the server.state() passThrough option. Defaults to false.*/
+    localStatePassThrough?: boolean;
+    /**acceptEncoding - if false, does not pass-through the 'Accept-Encoding' HTTP header which is useful when using an onResponse post-processing to avoid receiving an encoded response (e.g. gzipped). Can only be used together with passThrough. Defaults to true (passing header).*/
+    acceptEncoding?: boolean;
+    /** rejectUnauthorized - sets the rejectUnauthorized property on the https agent making the request. This value is only used when the proxied server uses TLS/SSL. When set it will override the node.js rejectUnauthorized property. If false then ssl errors will be ignored. When true the server certificate is verified and an 500 response will be sent when verification fails. This shouldn't be used alongside the agent setting as the agent will be used instead. Defaults to the https agent default value of true.*/
+    rejectUnauthorized?: boolean;
+    /**if true, sets the 'X-Forwarded-For', 'X-Forwarded-Port', 'X-Forwarded-Proto' headers when making a request to the proxied upstream endpoint. Defaults to false.*/
+    xforward?: boolean;
+    /** the maximum number of HTTP redirections allowed, to be followed automatically by the handler. Set to false or 0 to disable all redirections (the response will contain the redirection received from the upstream service). If redirections are enabled, no redirections (301, 302, 307, 308) will be passed along to the client, and reaching the maximum allowed redirections will return an error response. Defaults to false.*/
+    redirects?: boolean | number;
+    /**number of milliseconds before aborting the upstream request. Defaults to 180000 (3 minutes).*/
+    timeout?: number;
+    /** a function used to map the request URI to the proxied URI. Cannot be used together with host, port, protocol, or uri. The function signature is function(request, callback) where:
+    request - is the incoming request object.
+    callback - is function(err, uri, headers) where:
+    err - internal error condition.
+    uri - the absolute proxy URI.
+    headers - optional object where each key is an HTTP request header and the value is the header content.*/
+    mapUri?: (request: Request, callback: (err: any, uri: string, headers?: { [key: string]: string }) => void) => void;
+    /**  a custom function for processing the response from the upstream service before sending to the client. Useful for custom error handling of responses from the proxied endpoint or other payload manipulation. Function signature is function(err, res, request, reply, settings, ttl) where: - err - internal or upstream error returned from attempting to contact the upstream proxy. - res - the node response object received from the upstream service. res is a readable stream (use the wreck module read method to easily convert it to a Buffer or string). - request - is the incoming request object. - reply - the reply interface function. - settings - the proxy handler configuration. - ttl - the upstream TTL in milliseconds if proxy.ttl it set to 'upstream' and the upstream response included a valid 'Cache-Control' header with 'max-age'.*/
+    onResponse?: (
+        err: any,
+        res: http.ServerResponse,
+        req: Request,
+        reply: () => void,
+        settings: IProxyHandlerConfig,
+        ttl: number
+    ) => void;
+    /** if set to 'upstream', applies the upstream response caching policy to the response using the response.ttl() method (or passed as an argument to the onResponse method if provided).*/
+    ttl?: number;
+    /** - a node http(s) agent to be used for connections to upstream server.  see https://nodejs.org/api/http.html#http_class_http_agent */
+    agent?: http.Agent;
+    /** sets the maximum number of sockets available per outgoing proxy host connection. false means use the wreck module default value (Infinity). Does not affect non-proxy outgoing client connections. Defaults to Infinity.*/
+    maxSockets?: boolean | number;
+}
+/**  TODO: fill in joi definition  */
+export interface IJoi {
 
-		/**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
-		*route description used for generating documentation (string).
-		*/
-		description?: string;
-		/**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
-		*route notes used for generating documentation (string or array of strings).
-		*/
-		notes?: string|string[];
-		/**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
-		*route tags used for generating documentation (array of strings).
-		*/
-		tags?: string[]
-	}
-	/** server.realm http://hapijs.com/api#serverrealm
-	The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(),
-	the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin).
-	Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
-	The server.realm object should be considered read-only and must not be changed directly except for the plugins property can be directly manipulated by the plugins (each setting its own under plugins[name]).
-	exports.register = function (server, options, next) {
-	console.log(server.realm.modifiers.route.prefix);
-	return next();
-	};
-	*/
-	export interface IServerRealm {
-		/** when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method */
-		modifiers: {
-			/** routes preferences: */
-			route: {
-				/** - the route path prefix used by any calls to server.route() from the server. */
-				prefix: string;
-				/**  the route virtual host settings used by any calls to server.route() from the server. */
-				vhost: string;
-			};
+}
+/**  a validation function using the signature function(value, options, next) */
+export interface IValidationFunction {
 
-		};
-		/** the active plugin name (empty string if at the server root). */
-		plugin: string;
-		/** plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state. */
-		plugins: IDictionary<any>;
-		/**  settings overrides */
-		settings: {
-			files: {
-				relativeTo: any;
-			};
-			bind: any;
-		}
-	}
-	/** server.state(name, [options]) http://hapijs.com/api#serverstatename-options
-	HTTP state management uses client cookies to persist a state across multiple requests. Registers a cookie definitions where:*/
-	export interface IServerState {
+    (/**   the object containing the path parameters. */
+        value: any,
+        /**  the server validation options. */
+        options: any,
+        /**   the callback function called when validation is completed.  */
+        next: (err: any, value: any) => void): void;
+}
+/**  a custom error handler function with the signature 'function(request, reply, source, error)` */
+export interface IRouteFailFunction {
+    /**  a custom error handler function with the signature 'function(request, reply, source, error)` */
+    (
+        /** - the [request object]. */
+        request: Request,
+        /**   the continuation reply interface. */
+        reply: IReply,
+        /**  the source of the invalid field (e.g. 'path', 'query', 'payload'). */
+        source: string,
+        /**  the error object prepared for the client response (including the validation function error under error.data). */
+        error: any): void;
+}
+
+/**  Each route can be customize to change the default behavior of the request lifecycle using the following options:  */
+export interface IRouteAdditionalConfigurationOptions {
+    /**  application specific configuration.Should not be used by plugins which should use plugins[name] instead. */
+    app?: any;
+    /** authentication configuration.Value can be: false to disable authentication if a default strategy is set.
+    a string with the name of an authentication strategy registered with server.auth.strategy().
+    an object  */
+    auth?: boolean | string |
+    {
+        /**  the authentication mode.Defaults to 'required' if a server authentication strategy is configured, otherwise defaults to no authentication.Available values:
+        'required'authentication is required.
+        'optional'authentication is optional (must be valid if present).
+        'try'same as 'optional' but allows for invalid authentication. */
+        mode: string;
+        /**  a string array of strategy names in order they should be attempted.If only one strategy is used, strategy can be used instead with the single string value.Defaults to the default authentication strategy which is available only when a single strategy is configured.  */
+        strategies?: string | Array<string>;
+        strategy?: string;
+        /**  if set, the payload (in requests other than 'GET' and 'HEAD') is authenticated after it is processed.Requires a strategy with payload authentication support (e.g.Hawk).Cannot be set to a value other than 'required' when the scheme sets the options.payload to true.Available values:
+        falseno payload authentication.This is the default value.
+        'required'payload authentication required.This is the default value when the scheme sets options.payload to true.
+        'optional'payload authentication performed only when the client includes payload authentication information (e.g.hash attribute in Hawk). */
+        payload?: string;
+        /**  the application scope required to access the route.Value can be a scope string or an array of scope strings.The authenticated credentials object scope property must contain at least one of the scopes defined to access the route.Set to false to remove scope requirements.Defaults to no scope required.  */
+        scope?: string | Array<string> | boolean;
+        /** the required authenticated entity type.If set, must match the entity value of the authentication credentials.Available values:
+        anythe authentication can be on behalf of a user or application.This is the default value.
+        userthe authentication must be on behalf of a user.
+        appthe authentication must be on behalf of an application. */
+        entity?: string;
+    };
+    /** an object passed back to the provided handler (via this) when called. */
+    bind?: any;
+    /** if the route method is 'GET', the route can be configured to include caching directives in the response using the following options */
+    cache?: {
+        /**  mines the privacy flag included in clientside caching using the 'Cache-Control' header.Values are:
+        fault'no privacy flag.This is the default setting.
+        'public'mark the response as suitable for public caching.
+        'private'mark the response as suitable only for private caching.  */
+        privacy: string;
+        /**  relative expiration expressed in the number of milliseconds since the item was saved in the cache.Cannot be used together with expiresAt. */
+        expiresIn: number;
+        /**  time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire.Cannot be used together with expiresIn.  */
+        expiresAt: string;
+    };
+    /** the Cross- Origin Resource Sharing protocol allows browsers to make cross- origin API calls.CORS is required by web applications running inside a browser which are loaded from a different domain than the API server.CORS headers are disabled by default. To enable, set cors to true, or to an object with the following options: */
+    cors?: {
+        /** a strings array of allowed origin servers ('Access-Control-Allow-Origin').The array can contain any combination of fully qualified origins along with origin strings containing a wildcard '' character, or a single `''origin string. Defaults to any origin['*']`. */
+        origin?: Array<string>;
+        /** if true, matches the value of the incoming 'Origin' header to the list of origin values ('*' matches anything) and if a match is found, uses that as the value of the 'Access-Control-Allow-Origin' response header.When false, the origin config is returned as- is.Defaults to true.  */
+        matchOrigin?: boolean;
+        /** if false, prevents the connection from returning the full list of non- wildcard origin values if the incoming origin header does not match any of the values.Has no impact if matchOrigin is set to false.Defaults to true. */
+        isOriginExposed?: boolean;
+        /**  number of seconds the browser should cache the CORS response ('Access-Control-Max-Age').The greater the value, the longer it will take before the browser checks for changes in policy.Defaults to 86400 (one day). */
+        maxAge?: number;
+        /**  a strings array of allowed headers ('Access-Control-Allow-Headers').Defaults to ['Authorization', 'Content-Type', 'If-None-Match']. */
+        headers?: string[];
+        /**  a strings array of additional headers to headers.Use this to keep the default headers in place. */
+        additionalHeaders?: string[];
+        /**  a strings array of allowed HTTP methods ('Access-Control-Allow-Methods').Defaults to ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'OPTIONS']. */
+        methods?: string[];
+        /**  a strings array of additional methods to methods.Use this to keep the default methods in place. */
+        additionalMethods?: string[];
+        /**  a strings array of exposed headers ('Access-Control-Expose-Headers').Defaults to ['WWW-Authenticate', 'Server-Authorization']. */
+        exposedHeaders?: string[];
+        /**  a strings array of additional headers to exposedHeaders.Use this to keep the default headers in place. */
+        additionalExposedHeaders?: string[];
+        /**  if true, allows user credentials to be sent ('Access-Control-Allow-Credentials').Defaults to false. */
+        credentials?: boolean;
+        /** if false, preserves existing CORS headers set manually before the response is sent.Defaults to true. */
+        override?: boolean;
+    };
+    /**   defines the behavior for serving static resources using the built-in route handlers for files and directories: */
+    files?: {/** determines the folder relative paths are resolved against when using the file and directory handlers. */
+        relativeTo: string;
+    };
+
+    /**  an alternative location for the route handler option. */
+    handler?: ISessionHandler | string | IRouteHandlerConfig;
+    /** an optional unique identifier used to look up the route using server.lookup(). */
+    id?: number;
+    /** optional arguments passed to JSON.stringify() when converting an object or error response to a string payload.Supports the following: */
+    json?: {
+        /** the replacer function or array.Defaults to no action. */
+        replacer?: Function | string[];
+        /**  number of spaces to indent nested object keys.Defaults to no indentation. */
+        space?: number | string;
+        /** string suffix added after conversion to JSON string.Defaults to no suffix. */
+        suffix?: string;
+    };
+    /** enables JSONP support by setting the value to the query parameter name containing the function name used to wrap the response payload.For example, if the value is 'callback', a request comes in with 'callback=me', and the JSON response is '{ "a":"b" }', the payload will be 'me({ "a":"b" });'.Does not work with stream responses. */
+    jsonp?: string;
+    /** determines how the request payload is processed: */
+    payload?: {
+        /**  the type of payload representation requested. The value must be one of:
+        'data'the incoming payload is read fully into memory.If parse is true, the payload is parsed (JSON, formdecoded, multipart) based on the 'Content- Type' header.If parse is false, the raw Buffer is returned.This is the default value except when a proxy handler is used.
+        'stream'the incoming payload is made available via a Stream.Readable interface.If the payload is 'multipart/form-data' and parse is true, fields values are presented as text while files are provided as streams.File streams from a 'multipart/form-data' upload will also have a property hapi containing filename and headers properties.
+        'file'the incoming payload in written to temporary file in the directory specified by the server's payload.uploads settings. If the payload is 'multipart/ formdata' and parse is true, fields values are presented as text while files are saved. Note that it is the sole responsibility of the application to clean up the files generated by the framework. This can be done by keeping track of which files are used (e.g. using the request.app object), and listening to the server 'response' event to perform any needed cleaup. */
+        output?: string;
+        /**  can be true, false, or gunzip; determines if the incoming payload is processed or presented raw. true and gunzip includes gunzipping when the appropriate 'Content-Encoding' is specified on the received request. If parsing is enabled and the 'Content-Type' is known (for the whole payload as well as parts), the payload is converted into an object when possible. If the format is unknown, a Bad Request (400) error response is sent. Defaults to true, except when a proxy handler is used. The supported mime types are:
+        'application/json'
+        'application/x-www-form-urlencoded'
+        'application/octet-stream'
+        'text/ *'
+        'multipart/form-data' */
+        parse?: string | boolean;
+        /** a string or an array of strings with the allowed mime types for the endpoint.Defaults to any of the supported mime types listed above.Note that allowing other mime types not listed will not enable them to be parsed, and that if parsing mode is 'parse', the request will result in an error response. */
+        allow?: string | string[];
+        /** a mime type string overriding the 'Content-Type' header value received.Defaults to no override. */
+        override?: string;
+        /**  limits the size of incoming payloads to the specified byte count.Allowing very large payloads may cause the server to run out of memory.Defaults to 1048576 (1MB).  */
+        maxBytes?: number;
+        /** payload reception timeout in milliseconds.Sets the maximum time allowed for the client to transmit the request payload (body) before giving up and responding with a Request Timeout (408) error response.Set to false to disable.Defaults to 10000 (10 seconds). */
+        timeout?: number;
+        /**  the directory used for writing file uploads.Defaults to os.tmpDir(). */
+        uploads?: string;
+        /**  determines how to handle payload parsing errors. Allowed values are:
+        'error'return a Bad Request (400) error response. This is the default value.
+        'log'report the error but continue processing the request.
+        'ignore'take no action and continue processing the request. */
+        failAction?: string;
+    };
+    /** pluginspecific configuration.plugins is an object where each key is a plugin name and the value is the plugin configuration.  */
+    plugins?: IDictionary<any>;
+    /** an array with [route prerequisites] methods which are executed in serial or in parallel before the handler is called.  */
+    pre?: any[];
+    /** validation rules for the outgoing response payload (response body).Can only validate object response: */
+    response?: {
+        /**   the default response object validation rules (for all non-error responses) expressed as one of:
+        trueany payload allowed (no validation performed). This is the default.
+        falseno payload allowed.
+        a Joi validation object.
+        a validation function using the signature function(value, options, next) where:
+        valuethe object containing the response object.
+        optionsthe server validation options.
+        next(err)the callback function called when validation is completed.  */
+        schema: boolean | any;
+        /** HTTP status- codespecific validation rules.The status key is set to an object where each key is a 3 digit HTTP status code and the value has the same definition as schema.If a response status code is not present in the status object, the schema definition is used, expect for errors which are not validated by default.  */
+        status: number;
+        /** the percent of responses validated (0100).Set to 0 to disable all validation.Defaults to 100 (all responses). */
+        sample: number;
+        /**  defines what to do when a response fails validation.Options are:
+        errorreturn an Internal Server Error (500) error response.This is the default value.
+        loglog the error but send the response.  */
+        failAction: string;
+        /** if true, applies the validation rule changes to the response.Defaults to false. */
+        modify: boolean;
+        /** options to pass to Joi.Useful to set global options such as stripUnknown or abortEarly (the complete list is available here: https://github.com/hapijs/joi#validatevalue-schema-options-callback ).Defaults to no options.  */
+        options: any;
+    };
+    /** sets common security headers (disabled by default).To enable set security to true or to an object with the following options */
+    security?: boolean | {
+        /** controls the 'Strict-Transport-Security' header.If set to true the header will be set to max- age=15768000, if specified as a number the maxAge parameter will be set to that number.Defaults to true.You may also specify an object with the following fields: */
+        hsts: boolean | number | {
+            /** the max- age portion of the header, as a number.Default is 15768000. */
+            maxAge?: number;
+            /**  a boolean specifying whether to add the includeSubdomains flag to the header. */
+            includeSubdomains?: boolean;
+        };
+        /** controls the 'X-Frame-Options' header.When set to true the header will be set to DENY, you may also specify a string value of 'deny' or 'sameorigin'.To use the 'allow-from' rule, you must set this to an object with the following fields: */
+        xframe: {
+            /** either 'deny', 'sameorigin', or 'allow-from' */
+            rule: string;
+            /** when rule is 'allow-from' this is used to form the rest of the header, otherwise this field is ignored.If rule is 'allow-from' but source is unset, the rule will be automatically changed to 'sameorigin'. */
+            source: string;
+        };
+        /** boolean that controls the 'X-XSS-PROTECTION' header for IE.Defaults to true which sets the header to equal '1; mode=block'.NOTE: This setting can create a security vulnerability in versions of IE below 8, as well as unpatched versions of IE8.See here and here for more information.If you actively support old versions of IE, it may be wise to explicitly set this flag to false. */
+        xss: boolean;
+        /**  boolean controlling the 'X-Download-Options' header for IE, preventing downloads from executing in your context.Defaults to true setting the header to 'noopen'. */
+        noOpen: boolean;
+        /** boolean controlling the 'X-Content-Type-Options' header.Defaults to true setting the header to its only and default option, 'nosniff'. */
+        noSniff: boolean;
+    };
+    /** HTTP state management (cookies) allows the server to store information on the client which is sent back to the server with every request (as defined in RFC 6265).state supports the following options: */
+    state?: {
+        /** determines if incoming 'Cookie' headers are parsed and stored in the request.state object.Defaults to true. */
+        parse: boolean;
+        /** determines how to handle cookie parsing errors.Allowed values are:
+        'error'return a Bad Request (400) error response.This is the default value.
+        'log'report the error but continue processing the request.
+        'ignore'take no action. */
+        failAction: string;
+    };
+    /**  request input validation rules for various request components.When using a Joi validation object, the values of the other inputs (i.e.headers, query, params, payload, and auth) are made available under the validation context (accessible in rules as Joi.ref('$query.key')).Note that validation is performed in order(i.e.headers, params, query, payload) and if type casting is used (converting a string to number), the value of inputs not yet validated will reflect the raw, unvalidated and unmodified values.The validate object supports: */
+    validate?: {
+        /** validation rules for incoming request headers.Values allowed:
+        * trueany headers allowed (no validation performed).This is the default.
+        falseno headers allowed (this will cause all valid HTTP requests to fail).
+        a Joi validation object.
+        a validation function using the signature function(value, options, next) where:
+        valuethe object containing the request headers.
+        optionsthe server validation options.
+        next(err, value)the callback function called when validation is completed.
+        */
+        headers?: boolean | IJoi | IValidationFunction;
+
+
+        /** validation rules for incoming request path parameters, after matching the path against the route and extracting any parameters then stored in request.params.Values allowed:
+        trueany path parameters allowed (no validation performed).This is the default.
+        falseno path variables allowed.
+        a Joi validation object.
+        a validation function using the signature function(value, options, next) where:
+        valuethe object containing the path parameters.
+        optionsthe server validation options.
+        next(err, value)the callback function called when validation is completed. */
+        params?: boolean | IJoi | IValidationFunction;
+        /** validation rules for an incoming request URI query component (the key- value part of the URI between '?' and '#').The query is parsed into its individual key- value pairs (using the qs module) and stored in request.query prior to validation.Values allowed:
+        trueany query parameters allowed (no validation performed).This is the default.
+        falseno query parameters allowed.
+        a Joi validation object.
+        a validation function using the signature function(value, options, next) where:
+        valuethe object containing the query parameters.
+        optionsthe server validation options.
+        next(err, value)the callback function called when validation is completed. */
+        query?: boolean | IJoi | IValidationFunction;
+        /**  validation rules for an incoming request payload (request body).Values allowed:
+        trueany payload allowed (no validation performed).This is the default.
+        falseno payload allowed.
+        a Joi validation object.
+        a validation function using the signature function(value, options, next) where:
+        valuethe object containing the payload object.
+        optionsthe server validation options.
+        next(err, value)the callback function called when validation is completed.  */
+        payload?: boolean | IJoi | IValidationFunction;
+        /** an optional object with error fields copied into every validation error response. */
+        errorFields?: any;
+        /** determines how to handle invalid requests.Allowed values are:
+        'error'return a Bad Request (400) error response.This is the default value.
+        'log'log the error but continue processing the request.
+        'ignore'take no action.
+        OR a custom error handler function with the signature 'function(request, reply, source, error)` where:
+        requestthe request object.
+        replythe continuation reply interface.
+        sourcethe source of the invalid field (e.g. 'path', 'query', 'payload').
+        errorthe error object prepared for the client response (including the validation function error under error.data). */
+        failAction?: string | IRouteFailFunction;
+        /** options to pass to Joi.Useful to set global options such as stripUnknown or abortEarly (the complete list is available here: https://github.com/hapijs/joi#validatevalue-schema-options-callback ).Defaults to no options. */
+        options?: any;
+    };
+    /** define timeouts for processing durations: */
+    timeout?: {
+        /** response timeout in milliseconds.Sets the maximum time allowed for the server to respond to an incoming client request before giving up and responding with a Service Unavailable (503) error response.Disabled by default (false). */
+        server: boolean | number;
+        /** by default, node sockets automatically timeout after 2 minutes.Use this option to override this behavior.Defaults to undefined which leaves the node default unchanged.Set to false to disable socket timeouts. */
+        socket: boolean | number;
+    };
+
+    /**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
+    *route description used for generating documentation (string).
+    */
+    description?: string;
+    /**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
+    *route notes used for generating documentation (string or array of strings).
+    */
+    notes?: string | string[];
+    /**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
+    *route tags used for generating documentation (array of strings).
+    */
+    tags?: string[]
+}
+/** server.realm http://hapijs.com/api#serverrealm
+The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(),
+the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin).
+Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
+The server.realm object should be considered read-only and must not be changed directly except for the plugins property can be directly manipulated by the plugins (each setting its own under plugins[name]).
+exports.register = function (server, options, next) {
+console.log(server.realm.modifiers.route.prefix);
+return next();
+};
+*/
+export interface IServerRealm {
+    /** when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method */
+    modifiers: {
+        /** routes preferences: */
+        route: {
+            /** - the route path prefix used by any calls to server.route() from the server. */
+            prefix: string;
+            /**  the route virtual host settings used by any calls to server.route() from the server. */
+            vhost: string;
+        };
+
+    };
+    /** the active plugin name (empty string if at the server root). */
+    plugin: string;
+    /** plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state. */
+    plugins: IDictionary<any>;
+    /**  settings overrides */
+    settings: {
+        files: {
+            relativeTo: any;
+        };
+        bind: any;
+    }
+}
+/** server.state(name, [options]) http://hapijs.com/api#serverstatename-options
+HTTP state management uses client cookies to persist a state across multiple requests. Registers a cookie definitions where:*/
+export interface IServerState {
 /**  - the cookie name string. */name: string;
 
 /** - are the optional cookie settings: */options: {
@@ -674,1539 +674,1538 @@ declare module "hapi" {
 /**  - sets the 'HttpOnly' flag.Defaults to false.*/isHttpOnly: boolean
 /**  - the path scope.Defaults to null (no path).*/path: any;
 /**  - the domain scope.Defaults to null (no domain). */domain: any;
-			/**  if present and the cookie was not received from the client or explicitly set by the route handler, the cookie is automatically added to the response with the provided value. The value can be a function with signature function(request, next) where:
-			request - the request object.
-			next - the continuation function using the function(err, value) signature.*/
-			autoValue: (request: Request, next: (err: any, value: any) => void) => void;
-			/**  - encoding performs on the provided value before serialization. Options are:
-			'none' - no encoding. When used, the cookie value must be a string. This is the default value.
-			'base64' - string value is encoded using Base64.
-			'base64json' - object value is JSON-stringified than encoded using Base64.
-			'form' - object value is encoded using the x-www-form-urlencoded method.
-			'iron' - Encrypts and sign the value using iron.*/
-			encoding: string;
+        /**  if present and the cookie was not received from the client or explicitly set by the route handler, the cookie is automatically added to the response with the provided value. The value can be a function with signature function(request, next) where:
+        request - the request object.
+        next - the continuation function using the function(err, value) signature.*/
+        autoValue: (request: Request, next: (err: any, value: any) => void) => void;
+        /**  - encoding performs on the provided value before serialization. Options are:
+        'none' - no encoding. When used, the cookie value must be a string. This is the default value.
+        'base64' - string value is encoded using Base64.
+        'base64json' - object value is JSON-stringified than encoded using Base64.
+        'form' - object value is encoded using the x-www-form-urlencoded method.
+        'iron' - Encrypts and sign the value using iron.*/
+        encoding: string;
 /**  - an object used to calculate an HMAC for cookie integrity validation.This does not provide privacy, only a mean to verify that the cookie value was generated by the server.Redundant when 'iron' encoding is used.Options are:*/sign: {
 /** - algorithm options.Defaults to require('iron').defaults.integrity.*/integrity: any;
 /** - password used for HMAC key generation.*/password: string;
-			};
+        };
 /**  - password used for 'iron' encoding.*/password: string;
 /** - options for 'iron' encoding.Defaults to require('iron').defaults.*/iron: any;
 /** - if false, errors are ignored and treated as missing cookies.*/ignoreErrors: boolean;
 /**  - if true, automatically instruct the client to remove invalid cookies.Defaults to false.*/clearInvalid: boolean;
 /**  - if false, allows any cookie value including values in violation of RFC 6265. Defaults to true.*/strictHeader: boolean;
 /**  - overrides the default proxy localStatePassThrough setting.*/passThrough: any;
-		};
-	}
-
-	export interface IFileHandlerConfig {
-		/**  a path string or function as described above.*/
-		path: string;
-		/** an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path*/
-		filename?: string;
-		/**- specifies whether to include the 'Content-Disposition' header with the response. Available values:
-		false - header is not included. This is the default value.
-		'attachment'
-		'inline'*/
-		mode?: boolean| string;
-		/** if true, looks for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.*/
-		lookupCompressed: boolean;
-	}
-
-	/**http://hapijs.com/api#route-handler
-	Built-in handlers
-
-	The framework comes with a few built-in handler types available by setting the route handler config to an object containing one of these keys.*/
-	export interface IRouteHandlerConfig {
-		/** generates a static file endpoint for serving a single file. file can be set to:
-					a relative or absolute file path string (relative paths are resolved based on the route files configuration).
-		a function with the signature function(request) which returns the relative or absolute file path.
-		an object with the following options */
-		file?: string | IRequestHandler<void> |IFileHandlerConfig;
-		/** directory - generates a directory endpoint for serving static content from a directory. Routes using the directory handler must include a path parameter at the end of the path string (e.g. /path/to/somewhere/{param} where the parameter name does not matter). The path parameter can use any of the parameter options (e.g. {param} for one level files only, {param?} for one level files or the directory root, {param*} for any level, or {param*3} for a specific level). If additional path parameters are present, they are ignored for the purpose of selecting the file system resource. The directory handler is an object with the following options:
-					path - (required) the directory root path (relative paths are resolved based on the route files configuration). Value can be:
-		a single path string used as the prefix for any resources requested by appending the request path parameter to the provided string.
-		an array of path strings. Each path will be attempted in order until a match is found (by following the same process as the single path string).
-		a function with the signature function(request) which returns the path string or an array of path strings. If the function returns an error, the error is passed back to the client in the response.
-		index - optional boolean|string|string[], determines if an index file will be served if found in the folder when requesting a directory. The given string or strings specify the name(s) of the index file to look for. If true, looks for 'index.html'. Any falsy value disables index file lookup. Defaults to true.
-		listing - optional boolean, determines if directory listing is generated when a directory is requested without an index document. Defaults to false.
-		showHidden - optional boolean, determines if hidden files will be shown and served. Defaults to false.
-		redirectToSlash - optional boolean, determines if requests for a directory without a trailing slash are redirected to the same path with the missing slash. Useful for ensuring relative links inside the response are resolved correctly. Disabled when the server config router.stripTrailingSlash is true.Defaults to false.
-		lookupCompressed - optional boolean, instructs the file processor to look for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.
-		defaultExtension - optional string, appended to file requests if the requested file is not found. Defaults to no extension.*/
-		directory?: {
-			path: string |Array<string> | IRequestHandler<string> | IRequestHandler<Array<string>>;
-			index?: boolean;
-			listing?: boolean;
-			showHidden?: boolean;
-			redirectToSlash?: boolean;
-			lookupCompressed?: boolean;
-			defaultExtension?: string;
-		};
-		proxy?: IProxyHandlerConfig;
-		view?: string | {
-			template: string;
-			context: {
-				payload: any;
-				params: any;
-				query: any;
-				pre: any;
-			}
-		};
-		config?: {
-			handler: any;
-			bind: any;
-			app: any;
-			plugins: {
-				[name: string]: any;
-			};
-			pre: Array<() => void>;
-			validate: {
-				headers: any;
-				params: any;
-				query: any;
-				payload: any;
-				errorFields?: any;
-				failAction?: string | IFailAction;
-			};
-			payload: {
-				output: {
-					data: any;
-					stream: any;
-					file: any;
-				};
-				parse?: any;
-				allow?: string|Array<string>;
-				override?: string;
-				maxBytes?: number;
-				uploads?: number;
-				failAction?: string;
-			};
-			response: {
-				schema: any;
-				sample: number;
-				failAction: string;
-			};
-			cache: {
-				privacy: string;
-				expiresIn: number;
-				expiresAt: number;
-			};
-			auth: string|boolean|{
-				mode: string;
-				strategies: Array<string>;
-				payload?: boolean|string;
-				tos?: boolean|string;
-				scope?: string|Array<string>;
-				entity: string;
-			};
-			cors?: boolean;
-			jsonp?: string;
-			description?: string;
-			notes?: string|Array<string>;
-			tags?: Array<string>;
-		};
-	}
-	/** Route configuration
-	The route configuration object*/
-	export interface IRouteConfiguration {
-		/**  - (required) the absolute path used to match incoming requests (must begin with '/'). Incoming requests are compared to the configured paths based on the connection router configuration option.The path can include named parameters enclosed in {} which will be matched against literal values in the request as described in Path parameters.*/
-		path: string;
-		/** - (required) the HTTP method.Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'.Any HTTP method is allowed, except for 'HEAD'.Use '*' to match against any HTTP method (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match).
-		* Can be assigned an array of methods which has the same result as adding the same route with different methods manually.*/
-		method: string|string[];
-		/**  - an optional domain string or an array of domain strings for limiting the route to only requests with a matching host header field.Matching is done against the hostname part of the header only (excluding the port).Defaults to all hosts.*/
-		vhost?: string;
-		/**  - (required) the function called to generate the response after successful authentication and validation.The handler function is described in Route handler.If set to a string, the value is parsed the same way a prerequisite server method string shortcut is processed.Alternatively, handler can be assigned an object with a single key using the name of a registered handler type and value with the options passed to the registered handler.*/
-		handler: ISessionHandler | string | IRouteHandlerConfig;
-		/** - additional route options.*/
-		config?: IRouteAdditionalConfigurationOptions;
-	}
-	/** Route public interface When route information is returned or made available as a property.  http://hapijs.com/api#route-public-interface */
-	export interface IRoute {
-
-
-		/** the route HTTP method. */
-		method: string;
-		/** the route path. */
-		path: string;
-		/** the route vhost option if configured. */
-		vhost?: string|Array<string>;
-		/** the [active realm] associated with the route.*/
-		realm: IServerRealm;
-		/** the [route options]  object with all defaults applied. */
-		settings: IRouteAdditionalConfigurationOptions;
-	}
-
-	export interface IServerAuthScheme {
-		/** authenticate(request, reply) - required function called on each incoming request configured with the authentication scheme where:
-		request - the request object.
-		reply - the reply interface the authentication method must call when done authenticating the request where:
-		reply(err, response, result) - is called if authentication failed where:
-		err - any authentication error.
-		response - any authentication response action such as redirection. Ignored if err is present, otherwise required.
-		result - an object containing:
-		credentials - the authenticated credentials.
-		artifacts - optional authentication artifacts.
-		reply.continue(result) - is called if authentication succeeded where:
-		result - same object as result above.
-		When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted if configured for the route.
-		.If the err returned by the reply() method includes a message, no additional strategies will be attempted.
-		If the err does not include a message but does include a scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in order of preference.
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		var scheme = function (server, options) {
-		return {
-		authenticate: function (request, reply) {
-		var req = request.raw.req;
-		var authorization = req.headers.authorization;
-		if (!authorization) {
-		return reply(Boom.unauthorized(null, 'Custom'));
-		}
-		return reply(null, { credentials: { user: 'john' } });
-		}
-		};
-		};
-		server.auth.scheme('custom', scheme);*/
-		authenticate(request: Request, reply: IReply): void;
-		/** payload(request, reply) - optional function called to authenticate the request payload where:
-		request - the request object.
-		reply(err, response) - is called if authentication failed where:
-		err - any authentication error.
-		response - any authentication response action such as redirection. Ignored if err is present, otherwise required.
-		reply.continue() - is called if payload authentication succeeded.
-		When the scheme payload() method returns an error with a message, it means payload validation failed due to bad payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')), authentication may still be successful if the route auth.payload configuration is set to 'optional'.*/
-		payload? (request: Request, reply: IReply): void;
-		/** response(request, reply) - optional function called to decorate the response with authentication headers before the response headers or payload is written where:
-		request - the request object.
-		reply(err, response) - is called if an error occurred where:
-		err - any authentication error.
-		response - any authentication response to send instead of the current response. Ignored if err is present, otherwise required.
-		reply.continue() - is called if the operation succeeded.*/
-		response? (request: Request, reply: IReply): void;
-		/** an optional object  */
-		options?: {
-			/**  if true, requires payload validation as part of the scheme and forbids routes from disabling payload auth validation. Defaults to false.*/
-			payload: boolean;
-		}
-	}
-
-
-
-	export interface IServerInject {
-		(options: {
-			/**  the request HTTP method (e.g. 'POST'). Defaults to 'GET'.*/
-			method: string;
-			/** the request URL. If the URI includes an authority (e.g. 'example.com:8080'), it is used to automatically set an HTTP 'Host' header, unless one was specified in headers.*/
-			url: string;
-			/** an object with optional request headers where each key is the header name and the value is the header content. Defaults to no additions to the default Shot headers.*/
-			headers: IDictionary<string>;
-			/**- an optional string or buffer containing the request payload (object must be manually converted to a string first). Defaults to no payload. Note that payload processing defaults to 'application/json' if no 'Content-Type' header provided.*/
-			payload: string|Buffer;
-			/**an optional credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Defaults to no credentials.*/
-			credentials: any;
-			/**object with options used to simulate client request stream conditions for testing:
-			error - if true, emits an 'error' event after payload transmission (if any). Defaults to false.
-			close - if true, emits a 'close' event after payload transmission (if any). Defaults to false.
-			end - if false, does not end the stream. Defaults to true.*/
-			simulate: {
-				error: boolean;
-				close: boolean;
-				end: boolean;
-			};
-		},
-		callback: (
-		/**the response object where:
-		statusCode - the HTTP status code.
-		headers - an object containing the headers set.
-		payload - the response payload string.
-		rawPayload - the raw response payload buffer.
-		raw - an object with the injection request and response objects:
-		req - the simulated node request object.
-		res - the simulated node response object.
-		result - the raw handler response (e.g. when not a stream or a view) before it is serialized for transmission. If not available, the value is set to payload. Useful for inspection and reuse of the internal objects returned (instead of parsing the response string).
-		request - the request object.*/
-		res: { statusCode: number; headers: IDictionary<string>; payload: string; rawPayload: Buffer; raw: { req: http.ClientRequest; res: http.ServerResponse }; result: string; request: Request }) => void
-		):void;
-
-	}
-
-
-	/** host - optional host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
-	The return value is an array where each item is an object containing:
-	info - the connection.info the connection the table was generated for.
-	labels - the connection labels.
-	table - an array of routes where each route contains:
-	settings - the route config with defaults applied.
-	method - the HTTP method in lower case.
-	path - the route path.*/
-	export interface IConnectionTable {
-		info: any;
-		labels: any;
-		table: IRoute[];
-	}
-
-	export interface ICookieSettings {
-		/** - time - to - live in milliseconds.Defaults to null (session time- life - cookies are deleted when the browser is closed).*/
-		ttl?: number;
-		/** - sets the 'Secure' flag.Defaults to false.*/
-		isSecure?: boolean;
-		/** - sets the 'HttpOnly' flag.Defaults to false.*/
-		isHttpOnly?: boolean;
-		/** - the path scope.Defaults to null (no path).*/
-		path?: string;
-		/** - the domain scope.Defaults to null (no domain).*/
-		domain?: any;
-		/** - if present and the cookie was not received from the client or explicitly set by the route handler, the cookie is automatically added to the response with the provided value.The value can be a function with signature function(request, next) where:
-		request - the request object.
-		next - the continuation function using the function(err, value) signature.*/
-		autoValue?: (request: Request, next: (err: any, value: any) => void) => void;
-		/** - encoding performs on the provided value before serialization.Options are:
-		'none' - no encoding.When used, the cookie value must be a string.This is the default value.
-		'base64' - string value is encoded using Base64.
-		'base64json' - object value is JSON- stringified than encoded using Base64.
-		'form' - object value is encoded using the x- www - form - urlencoded method. */
-		encoding?: string;
-		/**  - an object used to calculate an HMAC for cookie integrity validation.This does not provide privacy, only a mean to verify that the cookie value was generated by the server.Redundant when 'iron' encoding is used.Options are:
-		integrity - algorithm options.Defaults to require('iron').defaults.integrity.
-		password - password used for HMAC key generation. */
-		sign?: { integrity: any; password: string; }
-		password?: string;
-		iron?: any;
-		ignoreErrors?: boolean;
-		clearInvalid?: boolean;
-		strictHeader?: boolean;
-		passThrough?: any;
-	}
-
-	/** method - the method function with the signature is one of:
-	function(arg1, arg2, ..., argn, next) where:
-	arg1, arg2, etc. - the method function arguments.
-	next - the function called when the method is done with the signature function(err, result, ttl) where:
-	err - error response if the method failed.
-	result - the return value.
-	ttl - 0 if result is valid but cannot be cached. Defaults to cache policy.
-	function(arg1, arg2, ..., argn) where:
-	arg1, arg2, etc. - the method function arguments.
-	the callback option is set to false.
-	the method must returns a value (result, Error, or a promise) or throw an Error.*/
-	export interface IServerMethod {
-		//(): void;
-		//(next: (err: any, result: any, ttl: number) => void): void;
-		//(arg1: any): void;
-		//(arg1: any, arg2: any, next: (err: any, result: any, ttl: number) => void): void;
-		//(arg1: any, arg2: any): void;
-		(...args: any[]): void;
-
-	}
-	/** options - optional configuration:
-	bind - a context object passed back to the method function (via this) when called. Defaults to active context (set via server.bind() when the method is registered.
-	cache - the same cache configuration used in server.cache().
-	callback - if false, expects the method to be a synchronous function. Note that using a synchronous function with caching will convert the method interface to require a callback as an additional argument with the signature function(err, result, cached, report) since the cache interface cannot return values synchronously. Defaults to true.
-	generateKey - a function used to generate a unique key (for caching) from the arguments passed to the method function (the callback argument is not passed as input). The server will automatically generate a unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation function must be provided which takes the same arguments as the function and returns a unique string (or null if no key can be generated).*/
-	export interface IServerMethodOptions {
-		bind?: any;
-		cache?: ICatBoxCacheOptions;
-		callback?: boolean;
-		generateKey?(args: any[]): string;
-	}
-	/** Request object
-
-	The request object is created internally for each incoming request. It is different from the node.js request object received from the HTTP server callback (which is available in request.raw.req). The request object methods and properties change throughout the request lifecycle.
-	Request events
-
-	The request object supports the following events:
-
-	'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
-	'finish' - emitted when the request payload finished reading. The event method signature is function ().
-	'disconnect' - emitted when a request errors or aborts unexpectedly.
-	var Crypto = require('crypto');
-	var Hapi = require('hapi');
-	var server = new Hapi.Server();
-	server.connection({ port: 80 });
-
-	server.ext('onRequest', function (request, reply) {
-
-	var hash = Crypto.createHash('sha1');
-	request.on('peek', function (chunk) {
-
-	hash.update(chunk);
-	});
-
-	request.once('finish', function () {
-
-	console.log(hash.digest('hex'));
-	});
-
-	request.once('disconnect', function () {
-
-	console.error('request aborted');
-	});
-
-	return reply.continue();
-	});*/
-	export class Request extends Events.EventEmitter {
-		/** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].*/
-		app: any;
-		/**  authentication information*/
-		auth: {
-			/** true is the request has been successfully authenticated, otherwise false.*/
-			isAuthenticated: boolean;
-			/**  the credential object received during the authentication process. The presence of an object does not mean successful authentication.*/
-			credentials: any;
-			/**  an artifact object received from the authentication strategy and used in authentication-related actions.*/
-			artifacts: any;
-			/**  the route authentication mode.*/
-			mode: any;
-			/** the authentication error is failed and mode set to 'try'.*/
-			error: any;
-			/** an object used by the ['cookie' authentication scheme]  https://github.com/hapijs/hapi-auth-cookie */
-			session: any
-		};
-		/**  the node domain object used to protect against exceptions thrown in extensions, handlers and route prerequisites. Can be used to manually bind callback functions otherwise bound to other domains.*/
-		domain: any;
-		/** the raw request headers (references request.raw.headers).*/
-		headers: IDictionary<string>;
-		/** a unique request identifier (using the format '{now}:{connection.info.id}:{5 digits counter}').*/
-		id: number;
-		/**  request information */
-		info: {
-			/**  request reception timestamp. */
-			received: number;
-			/**  request response timestamp (0 is not responded yet). */
-			responded: number;
-			/** remote client IP address. */
-
-			remoteAddress: string;
-			/**  remote client port. */
-			remotePort: number;
-			/**  content of the HTTP 'Referrer' (or 'Referer') header. */
-			referrer: string;
-			/**  content of the HTTP 'Host' header (e.g. 'example.com:8080'). */
-			host: string;
-			/**  the hostname part of the 'Host' header (e.g. 'example.com').*/
-			hostname: string;
-		};
-		/**  the request method in lower case (e.g. 'get', 'post'). */
-		method: string;
-		/**  the parsed content-type header. Only available when payload parsing enabled and no payload error occurred. */
-		mime: string;
-		/**  an object containing the values of params, query, and payload before any validation modifications made. Only set when input validation is performed.*/
-		orig: {
-			params: any;
-			query: any;
-			payload: any;
-		};
-		/**  an object where each key is a path parameter name with matching value as described in Path parameters.*/
-		params: IDictionary<string>;
-		/** an array containing all the path params values in the order they appeared in the path.*/
-		paramsArray: string[];
-		/**  the request URI's path component. */
-		path: string;
-		/** the request payload based on the route payload.output and payload.parse settings.*/
-		payload: any;
-		/**  plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state.*/
-		plugins: any;
-		/** an object where each key is the name assigned by a route prerequisites function. The values are the raw values provided to the continuation function as argument. For the wrapped response object, use responses.*/
-		pre: IDictionary<any>;
-		/** the response object when set. The object can be modified but must not be assigned another object. To replace the response with another from within an extension point, use reply(response) to override with a different response. Contains null when no response has been set (e.g. when a request terminates prematurely when the client disconnects).*/
-		response: Response;
-		/**preResponses - same as pre but represented as the response object created by the pre method.*/
-		preResponses: any;
-		/**an object containing the query parameters.*/
-		query: any;
-		/**  an object containing the Node HTTP server objects. Direct interaction with these raw objects is not recommended.*/
-		raw: {
-			req: http.ClientRequest;
-			res: http.ServerResponse;
-		};
-		/** the route public interface.*/
-		route: IRoute;
-		/** the server object. */
-		server: Server;
-		/** Special key reserved for plugins implementing session support. Plugins utilizing this key must check for null value to ensure there is no conflict with another similar server. */
-		session: any;
-		/** an object containing parsed HTTP state information (cookies) where each key is the cookie name and value is the matching cookie content after processing using any registered cookie definition. */
-		state: any;
-		/** complex object contining details on the url */
-		url: {
-			/** null when i tested */
-			auth: any;
-			/** null when i tested */
-			hash: any;
-			/** null when i tested */
-			host: any;
-			/** null when i tested */
-			hostname: any;
-			href: string;
-			path: string;
-			/** path without search*/
-			pathname: string;
-			/** null when i tested */
-			port: any;
-			/** null when i tested */
-			protocol: any;
-			/** querystring parameters*/
-			query: IDictionary<string>;
-			/** querystring parameters as a string*/
-			search: string;
-			/** null when i tested */
-			slashes: any;
-		};
-		/** request.setUrl(url)
-
-		Available only in 'onRequest' extension methods.
-
-		Changes the request URI before the router begins processing the request where:
-
-		url - the new request path value.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-
-		server.ext('onRequest', function (request, reply) {
-
-		// Change all requests to '/test'
-		request.setUrl('/test');
-		return reply.continue();
-		});*/
-		setUrl(url: string): void;
-		/** request.setMethod(method)
-
-		Available only in 'onRequest' extension methods.
-
-		Changes the request method before the router begins processing the request where:
-
-		method - is the request HTTP method (e.g. 'GET').
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-
-		server.ext('onRequest', function (request, reply) {
-
-		// Change all requests to 'GET'
-		request.setMethod('GET');
-		return reply.continue();
-		});*/
-		setMethod(method: string): void;
-		/** request.log(tags, [data, [timestamp]])
-
-		Always available.
-
-		Logs request-specific events. When called, the server emits a 'request' event which can be used by other listeners or plugins. The arguments are:
-
-		data - an optional message string or object with the application data being logged.
-		timestamp - an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
-		Any logs generated by the server internally will be emitted only on the 'request-internal' channel and will include the event.internal flag set to true.
-
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-
-		server.on('request', function (request, event, tags) {
-
-		if (tags.error) {
-		console.log(event);
-		}
-		});
-
-		var handler = function (request, reply) {
-
-		request.log(['test', 'error'], 'Test event');
-		return reply();
-		};
-		*/
-		log(
-			/** a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events.*/
-			tags: string|string[],
-			/** an optional message string or object with the application data being logged.*/
-			data?: string,
-			/**  an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).*/
-			timestamp?: number): void;
-		/** request.getLog([tags], [internal])
-
-		Always available.
-
-		Returns an array containing the events matching any of the tags specified (logical OR)
-		request.getLog();
-		request.getLog('error');
-		request.getLog(['error', 'auth']);
-		request.getLog(['error'], true);
-		request.getLog(false);*/
-
-		getLog(
-			/** is a single tag string or array of tag strings. If no tags specified, returns all events.*/
-			tags?: string,
-			/**  filters the events to only those with a matching event.internal value. If true, only internal logs are included. If false, only user event are included. Defaults to all events (undefined).*/
-			internal?: boolean): string[];
-
-		/** request.tail([name])
-
-		Available until immediately after the 'response' event is emitted.
-
-		Adds a request tail which has to complete before the request lifecycle is complete where:
-
-		name - an optional tail name used for logging purposes.
-		Returns a tail function which must be called when the tail activity is completed.
-
-		Tails are actions performed throughout the request lifecycle, but which may end after a response is sent back to the client. For example, a request may trigger a database update which should not delay sending back a response. However, it is still desirable to associate the activity with the request when logging it (or an error associated with it).
-
-		When all tails completed, the server emits a 'tail' event.
-
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-
-		var get = function (request, reply) {
-
-		var dbTail = request.tail('write to database');
-
-		db.save('key', 'value', function () {
-
-		dbTail();
-		});
-
-		return reply('Success!');
-		};
-
-		server.route({ method: 'GET', path: '/', handler: get });
-
-		server.on('tail', function (request) {
-
-		console.log('Request completed including db activity');
-		});*/
-		tail(
-			/** an optional tail name used for logging purposes.*/
-			name?: string): Function;
-	}
-	/** Response events
-
-	The response object supports the following events:
-
-	'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
-	'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
-	var Crypto = require('crypto');
-	var Hapi = require('hapi');
-	var server = new Hapi.Server();
-	server.connection({ port: 80 });
-
-	server.ext('onPreResponse', function (request, reply) {
-
-	var response = request.response;
-	if (response.isBoom) {
-	return reply();
-	}
-
-	var hash = Crypto.createHash('sha1');
-	response.on('peek', function (chunk) {
-
-	hash.update(chunk);
-	});
-
-	response.once('finish', function () {
-
-	console.log(hash.digest('hex'));
-	});
-
-	return reply.continue();
-	});*/
-	export class Response extends Events.EventEmitter {
-		/**  the HTTP response status code. Defaults to 200 (except for errors).*/
-		statusCode: number;
-		/** an object containing the response headers where each key is a header field name. Note that this is an incomplete list of headers to be included with the response. Additional headers will be added once the response is prepare for transmission.*/
-		headers: IDictionary<string>;
-		/** the value provided using the reply interface.*/
-		source: any;
-		/** a string indicating the type of source with available values:
-		'plain' - a plain response such as string, number, null, or simple object (e.g. not a Stream, Buffer, or view).
-		'buffer' - a Buffer.
-		'view' - a view generated with reply.view().
-		'file' - a file generated with reply.file() of via the directory handler.
-		'stream' - a Stream.
-		'promise' - a Promise object. */
-		variety: string;
-		/** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].*/
-		app: any;
-		/** plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state. */
-		plugins: any;
-		/** settings - response handling flags:
-		charset - the 'Content-Type' HTTP header 'charset' property. Defaults to 'utf-8'.
-		encoding - the string encoding scheme used to serial data into the HTTP payload when source is a string or marshals into a string. Defaults to 'utf8'.
-		passThrough - if true and source is a Stream, copies the statusCode and headers of the stream to the outbound response. Defaults to true.
-		stringify - options used for source value requiring stringification. Defaults to no replacer and no space padding.
-		ttl - if set, overrides the route cache expiration milliseconds value set in the route config. Defaults to no override.
-		varyEtag - if true, a suffix will be automatically added to the 'ETag' header at transmission time (separated by a '-' character) when the HTTP 'Vary' header is present.*/
-		settings: {
-			charset: string;
-			encoding: string;
-			passThrough: boolean;
-			stringify: any;
-			ttl: number;
-			varyEtag: boolean;
-		}
-
-		/**  sets the HTTP 'Content-Length' header (to avoid chunked transfer encoding) where:
-		length - the header value. Must match the actual payload size.*/
-		bytes(length: number): void;
-		/**  sets the 'Content-Type' HTTP header 'charset' property where: charset - the charset property value.*/
-		charset(charset: string): void;
-
-		/**  sets the HTTP status code where:
-		statusCode - the HTTP status code.*/
-		code(statusCode: number): void;
-		/** sets the HTTP status code to Created (201) and the HTTP 'Location' header where: uri - an absolute or relative URI used as the 'Location' header value.*/
-		created(uri: string): void;
-
-
-		/** encoding(encoding) - sets the string encoding scheme used to serial data into the HTTP payload where: encoding - the encoding property value (see node Buffer encoding).*/
-		encoding(encoding: string): void;
-
-		/** etag(tag, options) - sets the representation entity tag where:
-		tag - the entity tag string without the double-quote.
-		options - optional settings where:
-		weak - if true, the tag will be prefixed with the 'W/' weak signifier. Weak tags will fail to match identical tags for the purpose of determining 304 response status. Defaults to false.
-		vary - if true and content encoding is set or applied to the response (e.g 'gzip' or 'deflate'), the encoding name will be automatically added to the tag at transmission time (separated by a '-' character). Ignored when weak is true. Defaults to true.*/
-		etag(tag: string, options: {
-			weak: boolean; vary: boolean;
-		}): void;
-
-		/**header(name, value, options) - sets an HTTP header where:
-		name - the header name.
-		value - the header value.
-		options - optional settings where:
-		append - if true, the value is appended to any existing header value using separator. Defaults to false.
-		separator - string used as separator when appending to an exiting value. Defaults to ','.
-		override - if false, the header value is not set if an existing value present. Defaults to true.*/
-		header(name: string, value: string, options?: {
-			append: boolean;
-			separator: string;
-			override: boolean;
-		}): void;
-
-		/** location(uri) - sets the HTTP 'Location' header where:
-		uri - an absolute or relative URI used as the 'Location' header value.*/
-		location(uri: string): void;
-
-		/** redirect(uri) - sets an HTTP redirection response (302) and decorates the response with additional methods listed below, where:
-		uri - an absolute or relative URI used to redirect the client to another resource. */
-		redirect(uri: string): void;
-
-		/** replacer(method) - sets the JSON.stringify() replacer argument where:
-		method - the replacer function or array. Defaults to none.*/
-		replacer(method: Function| Array<Function>): void;
-
-		/** spaces(count) - sets the JSON.stringify() space argument where:
-		count - the number of spaces to indent nested object keys. Defaults to no indentation. */
-		spaces(count: number): void;
-		/**state(name, value, [options]) - sets an HTTP cookie where:
-		name - the cookie name.
-		value - the cookie value. If no encoding is defined, must be a string.
-		options - optional configuration. If the state was previously registered with the server using server.state(), the specified keys in options override those same keys in the server definition (but not others).*/
-		state(name: string, value: string, options?: any): void;
-
-	}
-
-
-
-	/** Server http://hapijs.com/api#server
-	rver object is the main application container. The server manages all incoming connections along with all the facilities provided by the framework. A server can contain more than one connection (e.g. listen to port 80 and 8080).
-	Server events
-	The server object inherits from Events.EventEmitter and emits the following events:
-	'log' - events logged with server.log() and server events generated internally by the framework.
-	'start' - emitted when the server is started using server.start().
-	'stop' - emitted when the server is stopped using server.stop().
-	'request' - events generated by request.log(). Does not include any internally generated events.
-	'request-internal' - request events generated internally by the framework (multiple events per request).
-	'request-error' - emitted whenever an Internal Server Error (500) error response is sent. Single event per request.
-	'response' - emitted after the response is sent back to the client (or when the client connection closed and no response sent, in which case request.response is null). Single event per request.
-	'tail' - emitted when a request finished processing, including any registered tails. Single event per request.
-	Note that the server object should not be used to emit application events as its internal implementation is designed to fan events out to the various plugin selections and not for application events.
-	MORE EVENTS HERE: http://hapijs.com/api#server-events*/
-	export class Server extends Events.EventEmitter {
-
-		constructor(options?: IServerOptions);
-		/** Provides a safe place to store server-specific run-time application data without potential conflicts with the framework internals. The data can be accessed whenever the server is accessible. Initialized with an empty object.
-		var Hapi = require('hapi');
-		server = new Hapi.Server();
-		server.app.key = 'value';
-		var handler = function (request, reply) {
-		return reply(request.server.app.key);
-		}; */
-		app: any;
-		/** An array containing the server's connections. When the server object is returned from server.select(), the connections array only includes the connections matching the selection criteria.
-		var server = new Hapi.Server();
-		server.connection({ port: 80, labels: 'a' });
-		server.connection({ port: 8080, labels: 'b' });
-		// server.connections.length === 2
-		var a = server.select('a');
-		// a.connections.length === 1*/
-		connections: Array<ISeverConnectionOptions>;
-		/** When the server contains exactly one connection, info is an object containing information about the sole connection.
-		* When the server contains more than one connection, each server.connections array member provides its own connection.info.
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		// server.info.port === 80
-		server.connection({ port: 8080 });
-		// server.info === null
-		// server.connections[1].info.port === 8080
-		*/
-		info: {
-			/**  - a unique connection identifier (using the format '{hostname}:{pid}:{now base36}').*/
-			id: string;
-			/**  - the connection creation timestamp.*/
-			created: number;
-			/**  - the connection start timestamp (0 when stopped).*/
-			started: number;
-			/**  the connection port based on the following rules:
-			the configured port value before the server has been started.
-			the actual port assigned when no port is configured or set to 0 after the server has been started.*/
-			port: number;
-
-			/** - the host name the connection was configured to. Defaults to the operating system hostname when available, otherwise 'localhost'.*/
-			host: string;
-			/** - the active IP address the connection was bound to after starting.Set to undefined until the server has been started or when using a non TCP port (e.g. UNIX domain socket).*/
-			address: string;
-			/**  - the protocol used:
-			'http' - HTTP.
-			'https' - HTTPS.
-			'socket' - UNIX domain socket or Windows named pipe.*/
-			protocol: string;
-			/** a string representing the connection (e.g. 'http://example.com:8080' or 'socket:/unix/domain/socket/path'). Contains the uri setting if provided, otherwise constructed from the available settings. If no port is available or set to 0, the uri will not include a port component.*/
-			uri: string;
-		};
-		/** An object containing the process load metrics (when load.sampleInterval is enabled):
-		rss - RSS memory usage.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server({ load: { sampleInterval: 1000 } });
-		console.log(server.load.rss);*/
-		load: {
-			/** - event loop delay milliseconds.*/
-			eventLoopDelay: number;
-			/**  - V8 heap usage.*/
-			heapUsed: number;
-		};
-		/** When the server contains exactly one connection, listener is the node HTTP server object of the sole connection.
-		When the server contains more than one connection, each server.connections array member provides its own connection.listener.
-		var Hapi = require('hapi');
-		var SocketIO = require('socket.io');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		var io = SocketIO.listen(server.listener);
-		io.sockets.on('connection', function(socket) {
-		socket.emit({ msg: 'welcome' });
-		});*/
-		listener: http.Server;
-
-		/** server.methods
-		An object providing access to the server methods where each server method name is an object property.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.method('add', function (a, b, next) {
-		return next(null, a + b);
-		});
-		server.methods.add(1, 2, function (err, result) {
-		// result === 3
-		});*/
-		methods: IDictionary<Function>;
-
-		/** server.mime
-		Provides access to the server MIME database used for setting content-type information. The object must not be modified directly but only through the mime server setting.
-		var Hapi = require('hapi');
-		var options = {
-		mime: {
-		override: {
-		'node/module': {
-		source: 'steve',
-		compressible: false,
-		extensions: ['node', 'module', 'npm'],
-		type: 'node/module'
-		}
-		}
-		}
-		};
-		var server = new Hapi.Server(options);
-		// server.mime.path('code.js').type === 'application/javascript'
-		// server.mime.path('file.npm').type === 'node/module'*/
-		mime: any;
-		/**server.plugins
-		An object containing the values exposed by each plugin registered where each key is a plugin name and the values are the exposed properties by each plugin using server.expose(). Plugins may set the value of the server.plugins[name] object directly or via the server.expose() method.
-		exports.register = function (server, options, next) {
-		server.expose('key', 'value');
-		// server.plugins.example.key === 'value'
-		return next();
-		};
-		exports.register.attributes = {
-		name: 'example'
-		};*/
-		plugins: IDictionary<any>;
-		/** server.realm
-		The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(), the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin). Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
-		modifiers - when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method and includes:
-		route - routes preferences:
-		prefix - the route path prefix used by any calls to server.route() from the server.
-		vhost - the route virtual host settings used by any calls to server.route() from the server.
-		plugin - the active plugin name (empty string if at the server root).
-		plugins - plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state.
-		settings - settings overrides:
-		files.relativeTo
-		bind
-		The server.realm object should be considered read-only and must not be changed directly except for the plugins property can be directly manipulated by the plugins (each setting its own under plugins[name]).
-		exports.register = function (server, options, next) {
-		console.log(server.realm.modifiers.route.prefix);
-		return next();
-		};*/
-		realm: IServerRealm;
-
-		/** server.root
-		The root server object containing all the connections and the root server methods (e.g. start(), stop(), connection()).*/
-		root: Server;
-		/** server.settings
-		The server configuration object after defaults applied.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server({
-		app: {
-		key: 'value'
-		}
-		});
-		// server.settings.app === { key: 'value' }*/
-		settings: IServerOptions;
-
-		/** server.version
-		The hapi module version number.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		// server.version === '8.0.0'*/
-		version: string;
-
-		/** server.after(method, [dependencies])
-		Adds a method to be called after all the plugin dependencies have been registered and before the server starts (only called if the server is started) where:
-		after - the method with signature function(plugin, next) where:
-		server - server object the after() method was called on.
-		next - the callback function the method must call to return control over to the application and complete the registration process. The function signature is function(err) where:
-		err - internal error which is returned back via the server.start() callback.
-		dependencies - a string or array of string with the plugin names to call this method after their after() methods. There is no requirement for the other plugins to be registered. Setting dependencies only arranges the after methods in the specified order.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.after(function () {
-		// Perform some pre-start logic
-		});
-		server.start(function (err) {
-		// After method already executed
-		});
-		server.auth.default(options)*/
-		after(method: (plugin: any, next: (err: any) => void) => void, dependencies: string|string[]): void;
-
-		auth: {
-			/** server.auth.default(options)
-			Sets a default strategy which is applied to every route where:
-			options - a string with the default strategy name or an object with a specified strategy or strategies using the same format as the route auth handler options.
-			The default does not apply when the route config specifies auth as false, or has an authentication strategy configured. Otherwise, the route authentication config is applied to the defaults. Note that the default only applies at time of route configuration, not at runtime. Calling default() after adding a route will have no impact on routes added prior.
-			The default auth strategy configuration can be accessed via connection.auth.settings.default.
-			var server = new Hapi.Server();
-			server.connection({ port: 80 });
-			server.auth.scheme('custom', scheme);
-			server.auth.strategy('default', 'custom');
-			server.auth.default('default');
-			server.route({
-			method: 'GET',
-			path: '/',
-			handler: function (request, reply) {
-			return reply(request.auth.credentials.user);
-			}
-			});*/
-			default(options: string):void;
-			default(options: { strategy: string }): void;
-			default(options: { strategies: string[] }): void;
-			/** server.auth.scheme(name, scheme)
-			Registers an authentication scheme where:
-			name - the scheme name.
-			scheme - the method implementing the scheme with signature function(server, options) where:
-			server - a reference to the server object the scheme is added to.
-			options - optional scheme settings used to instantiate a strategy.*/
-			scheme(name: string,
-				/** When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted if configured for the route. If the err returned by the reply() method includes a message, no additional strategies will be attempted. If the err does not include a message but does include a scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in order of preference.
-				n the scheme payload() method returns an error with a message, it means payload validation failed due to bad payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')), authentication may still be successful if the route auth.payload configuration is set to 'optional'.
-				server = new Hapi.Server();
-				server.connection({ port: 80 });
-				scheme = function (server, options) {
-				urn {
-				authenticate: function (request, reply) {
-				req = request.raw.req;
-				var authorization = req.headers.authorization;
-				if (!authorization) {
-				return reply(Boom.unauthorized(null, 'Custom'));
-				}
-				urn reply(null, { credentials: { user: 'john' } });
-				}
-				};
-				};
-				*/
-				scheme: (server: Server, options: any) => IServerAuthScheme): void;
-
-			/** server.auth.strategy(name, scheme, [mode], [options])
-			Registers an authentication strategy where:
-			name - the strategy name.
-			scheme - the scheme name (must be previously registered using server.auth.scheme()).
-			mode - if true, the scheme is automatically assigned as a required strategy to any route without an auth config. Can only be assigned to a single server strategy. Value must be true (which is the same as 'required') or a valid authentication mode ('required', 'optional', 'try'). Defaults to false.
-			options - scheme options based on the scheme requirements.
-			var server = new Hapi.Server();
-			server.connection({ port: 80 });
-			server.auth.scheme('custom', scheme);
-			server.auth.strategy('default', 'custom');
-			server.route({
-			method: 'GET',
-			path: '/',
-			config: {
-			auth: 'default',
-			handler: function (request, reply) {
-			return reply(request.auth.credentials.user);
-			}
-			}
-			});*/
-			strategy(name: string, scheme: any, mode?: boolean, options?: any):void;
-
-			/** server.auth.test(strategy, request, next)
-			Tests a request against an authentication strategy where:
-			strategy - the strategy name registered with server.auth.strategy().
-			request - the request object.
-			next - the callback function with signature function(err, credentials) where:
-			err - the error if authentication failed.
-			credentials - the authentication credentials object if authentication was successful.
-			Note that the test() method does not take into account the route authentication configuration. It also does not perform payload authentication. It is limited to the basic strategy authentication execution. It does not include verifying scope, entity, or other route properties.
-			var server = new Hapi.Server();
-			server.connection({ port: 80 });
-			server.auth.scheme('custom', scheme);
-			server.auth.strategy('default', 'custom');
-			server.route({
-			method: 'GET',
-			path: '/',
-			handler: function (request, reply) {
-			request.server.auth.test('default', request, function (err, credentials) {
-			if (err) {
-			return reply({ status: false });
-			}
-			return reply({ status: true, user: credentials.name });
-			});
-			}
-			});*/
-			test(strategy: string, request: Request, next: (err: any, credentials: any) => void): void;
-		};
-		/** server.bind(context)
-		Sets a global context used as the default bind object when adding a route or an extension where:
-		context - the object used to bind this in handler and extension methods.
-		When setting context inside a plugin, the context is applied only to methods set up by the plugin. Note that the context applies only to routes and extensions added after it has been set.
-		var handler = function (request, reply) {
-		return reply(this.message);
-		};
-		exports.register = function (server, options, next) {
-		var bind = {
-		message: 'hello'
-		};
-		server.bind(bind);
-		server.route({ method: 'GET', path: '/', handler: handler });
-		return next();
-		};*/
-		bind(context: any): void;
-
-
-		/** server.cache(options)
-		Provisions a cache segment within the server cache facility where:
-		options - catbox policy configuration where:
-		expiresIn - relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt.
-		expiresAt - time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records expire. Uses local time. Cannot be used together with expiresIn.
-		generateFunc - a function used to generate a new cache item if one is not found in the cache when calling get(). The method's signature is function(id, next) where: - id - the id string or object provided to the get() method. - next - the method called when the new item is returned with the signature function(err, value, ttl) where: - err - an error condition. - value - the new value generated. - ttl - the cache ttl value in milliseconds. Set to 0 to skip storing in the cache. Defaults to the cache global policy.
-		staleIn - number of milliseconds to mark an item stored in cache as stale and attempt to regenerate it when generateFunc is provided. Must be less than expiresIn.
-		staleTimeout - number of milliseconds to wait before checking if an item is stale.
-		generateTimeout - number of milliseconds to wait before returning a timeout error when the generateFunc function takes too long to return a value. When the value is eventually returned, it is stored in the cache for future requests.
-		cache - the cache name configured in 'server.cache`. Defaults to the default cache.
-		segment - string segment name, used to isolate cached items within the cache partition. When called within a plugin, defaults to '!name' where 'name' is the plugin name. Required when called outside of a plugin.
-		shared - if true, allows multiple cache provisions to share the same segment. Default to false.
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		var cache = server.cache({ segment: 'countries', expiresIn: 60 * 60 * 1000 });
-		cache.set('norway', { capital: 'oslo' }, null, function (err) {
-		cache.get('norway', function (err, value, cached, log) {
-		// value === { capital: 'oslo' };
-		});
-		});*/
-		cache(options: ICatBoxCacheOptions): void;
-
-		/** server.connection([options])
-		Adds an incoming server connection
-		Returns a server object with the new connection selected.
-		Must be called before any other server method that modifies connections is called for it to apply to the new connection (e.g. server.state()).
-		Note that the options object is deeply cloned (with the exception of listener which is shallowly copied) and cannot contain any values that are unsafe to perform deep copy on.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		var web = server.connection({ port: 8000, host: 'example.com', labels: ['web'] });
-		var admin = server.connection({ port: 8001, host: 'example.com', labels: ['admin'] });
-		// server.connections.length === 2
-		// web.connections.length === 1
-		// admin.connections.length === 1 */
-		connection(options: ISeverConnectionOptions): Server;
-		/** server.decorate(type, property, method)
-		Extends various framework interfaces with custom methods where:
-		type - the interface being decorated. Supported types:
-		'reply' - adds methods to the reply interface.
-		'server' - adds methods to the Server object.
-		property - the object decoration key name.
-		method - the extension function.
-		Note that decorations apply to the entire server and all its connections regardless of current selection.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.decorate('reply', 'success', function () {
-		return this.response({ status: 'ok' });
-		});
-		server.route({
-		method: 'GET',
-		path: '/',
-		handler: function (request, reply) {
-		return reply.success();
-		}
-		});*/
-		decorate(type: string, property: string, method: Function):void;
-
-		/** server.dependency(dependencies, [after])
-		Used within a plugin to declares a required dependency on other plugins where:
-		dependencies - a single string or array of plugin name strings which must be registered in order for this plugin to operate. Plugins listed must be registered before the server is started. Does not provide version dependency which should be implemented using npm peer dependencies.
-		after - an optional function called after all the specified dependencies have been registered and before the server starts. The function is only called if the server is started. If a circular dependency is detected, an exception is thrown (e.g. two plugins each has an after function to be called after the other). The function signature is function(server, next) where:
-		server - the server the dependency() method was called on.
-		next - the callback function the method must call to return control over to the application and complete the registration process. The function signature is function(err) where:
-		err - internal error condition, which is returned back via the server.start() callback.
-		exports.register = function (server, options, next) {
-		server.dependency('yar', after);
-		return next();
-		};
-		var after = function (server, next) {
-		// Additional plugin registration logic
-		return next();
-		};*/
-		dependency(dependencies: string|string[], after?: (server: Server, next: (err: any) => void) => void): void;
-
-
-		/** server.expose(key, value)
-		Used within a plugin to expose a property via server.plugins[name] where:
-		key - the key assigned (server.plugins[name][key]).
-		value - the value assigned.
-		exports.register = function (server, options, next) {
-		server.expose('util', function () { console.log('something'); });
-		return next();
-		};*/
-		expose(key: string, value: any): void;
-
-		/** server.expose(obj)
-		Merges a deep copy of an object into to the existing content of server.plugins[name] where:
-		obj - the object merged into the exposed properties container.
-		exports.register = function (server, options, next) {
-		server.expose({ util: function () { console.log('something'); } });
-		return next();
-		};*/
-		expose(obj: any): void;
-
-		/** server.ext(event, method, [options])
-		Registers an extension function in one of the available extension points where:
-		event - the event name.
-		method - a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is function(request, reply) where:
-		request - the request object.
-		reply - the reply interface which is used to return control back to the framework. To continue normal execution of the request lifecycle, reply.continue() must be called. To abort processing and return a response to the client, call reply(value) where value is an error or any other valid response.
-		this - the object provided via options.bind or the current active context set with server.bind().
-		options - an optional object with the following:
-		before - a string or array of strings of plugin names this method must execute before (on the same event). Otherwise, extension methods are executed in the order added.
-		after - a string or array of strings of plugin names this method must execute after (on the same event). Otherwise, extension methods are executed in the order added.
-		bind - a context object passed back to the provided method (via this) when called.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.ext('onRequest', function (request, reply) {
-		// Change all requests to '/test'
-		request.setUrl('/test');
-		return reply.continue();
-		});
-		var handler = function (request, reply) {
-		return reply({ status: 'ok' });
-		};
-		server.route({ method: 'GET', path: '/test', handler: handler });
-		server.start();
-		// All requests will get routed to '/test'*/
-		ext(event: string, method: (request: Request, reply: IReply, bind?: any) => void, options?: { before: string|string[]; after: string|string[]; bind?: any }): void;
-
-		/** server.handler(name, method)
-		Registers a new handler type to be used in routes where:
-		name - string name for the handler being registered. Cannot override the built-in handler types (directory, file, proxy, and view) or any previously registered type.
-		method - the function used to generate the route handler using the signature function(route, options) where:
-		route - the route public interface object.
-		options - the configuration object provided in the handler config.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ host: 'localhost', port: 8000 });
-		// Defines new handler for routes on this server
-		server.handler('test', function (route, options) {
-		return function (request, reply) {
-		return reply('new handler: ' + options.msg);
-		}
-		});
-		server.route({
-		method: 'GET',
-		path: '/',
-		handler: { test: { msg: 'test' } }
-		});
-		server.start();
-		The method function can have a defaults object or function property. If the property is set to an object, that object is used as the default route config for routes using this handler. If the property is set to a function, the function uses the signature function(method) and returns the route default configuration.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ host: 'localhost', port: 8000 });
-		var handler = function (route, options) {
-		return function (request, reply) {
-		return reply('new handler: ' + options.msg);
-		}
-		};
-		// Change the default payload processing for this handler
-		handler.defaults = {
-		payload: {
-		output: 'stream',
-		parse: false
-		}
-		};
-		server.handler('test', handler);*/
-		handler<THandlerConfig>(name: string, method: (route: IRoute, options: THandlerConfig) => ISessionHandler): void;
-		/** When the server contains exactly one connection, injects a request into the sole connection simulating an incoming HTTP request without making an actual socket connection.
-		Injection is useful for testing purposes as well as for invoking routing logic internally without the overhead or limitations of the network stack.
-		Utilizes the [shot module | https://github.com/hapijs/shot ] for performing injections, with some additional options and response properties
-		* When the server contains more than one connection, each server.connections array member provides its own connection.inject().
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		var handler = function (request, reply) {
-		return reply('Success!');
-		};
-		server.route({ method: 'GET', path: '/', handler: handler });
-		server.inject('/', function (res) {
-		console.log(res.result);
-		});
-		*/
-		inject: IServerInject;
-
-		/** server.log(tags, [data, [timestamp]])
-		Logs server events that cannot be associated with a specific request. When called the server emits a 'log' event which can be used by other listeners or plugins to record the information or output to the console. The arguments are:
-		tags - a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events. Any logs generated by the server internally include the 'hapi' tag along with event-specific information.
-		data - an optional message string or object with the application data being logged.
-		timestamp - an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.on('log', function (event, tags) {
-		if (tags.error) {
-		console.log(event);
-		}
-		});
-		server.log(['test', 'error'], 'Test event');*/
-		log(tags: string|string[], data?: string|any, timestamp?: number): void;
-		/**server.lookup(id)
-		When the server contains exactly one connection, looks up a route configuration where:
-		id - the route identifier as set in the route options.
-		returns the route public interface object if found, otherwise null.
-		var server = new Hapi.Server();
-		server.connection();
-		server.route({
-		method: 'GET',
-		path: '/',
-		config: {
-		handler: function (request, reply) { return reply(); },
-		id: 'root'
-		}
-		});
-		var route = server.lookup('root');
-		When the server contains more than one connection, each server.connections array member provides its own connection.lookup() method.*/
-		lookup(id: string): IRoute;
-		/** server.match(method, path, [host])
-		When the server contains exactly one connection, looks up a route configuration where:
-		method - the HTTP method (e.g. 'GET', 'POST').
-		path - the requested path (must begin with '/').
-		host - optional hostname (to match against routes with vhost).
-		returns the route public interface object if found, otherwise null.
-		var server = new Hapi.Server();
-		server.connection();
-		server.route({
-		method: 'GET',
-		path: '/',
-		config: {
-		handler: function (request, reply) { return reply(); },
-		id: 'root'
-		}
-		});
-		var route = server.match('get', '/');
-		When the server contains more than one connection, each server.connections array member provides its own connection.match() method.*/
-		match(method: string, path: string, host?: string): IRoute;
-
-
-
-
-		/** server.method(name, method, [options])
-		Registers a server method. Server methods are functions registered with the server and used throughout the application as a common utility. Their advantage is in the ability to configure them to use the built-in cache and share across multiple request handlers without having to create a common module.
-		Methods are registered via server.method(name, method, [options])
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		// Simple arguments
-		var add = function (a, b, next) {
-		return next(null, a + b);
-		};
-		server.method('sum', add, { cache: { expiresIn: 2000 } });
-		server.methods.sum(4, 5, function (err, result) {
-		console.log(result);
-		});
-		// Object argument
-		var addArray = function (array, next) {
-		var sum = 0;
-		array.forEach(function (item) {
-		sum += item;
-		});
-		return next(null, sum);
-		};
-		server.method('sumObj', addArray, {
-		cache: { expiresIn: 2000 },
-		generateKey: function (array) {
-		return array.join(',');
-		}
-		});
-		server.methods.sumObj([5, 6], function (err, result) {
-		console.log(result);
-		});
-		// Synchronous method with cache
-		var addSync = function (a, b) {
-		return a + b;
-		};
-		server.method('sumSync', addSync, { cache: { expiresIn: 2000 }, callback: false });
-		server.methods.sumSync(4, 5, function (err, result) {
-		console.log(result);
-		}); */
-		method(
-			/**  a unique method name used to invoke the method via server.methods[name]. When configured with caching enabled, server.methods[name].cache.drop(arg1, arg2, ..., argn, callback) can be used to clear the cache for a given key. Supports using nested names such as utils.users.get which will automatically create the missing path under server.methods and can be accessed for the previous example via server.methods.utils.users.get.*/
-			name: string,
-			method: IServerMethod,
-			options?: IServerMethodOptions):void;
-
-
-		/**server.method(methods)
-		Registers a server method function as described in server.method() using a configuration object where:
-		methods - an object or an array of objects where each one contains:
-		name - the method name.
-		method - the method function.
-		options - optional settings.
-		var add = function (a, b, next) {
-		next(null, a + b);
-		};
-		server.method({
-		name: 'sum',
-		method: add,
-		options: {
-		cache: {
-		expiresIn: 2000
-		}
-		}
-		});*/
-		method(methods: {
-			name: string; method: IServerMethod; options?: IServerMethodOptions
-		}| Array<{
-				name: string; method: IServerMethod; options?: IServerMethodOptions
-			}>):void;
-		/**server.path(relativeTo)
-		Sets the path prefix used to locate static resources (files and view templates) when relative paths are used where:
-		relativeTo - the path prefix added to any relative file path starting with '.'.
-		Note that setting a path within a plugin only applies to resources accessed by plugin methods. If no path is set, the connection files.relativeTo configuration is used. The path only applies to routes added after it has been set.
-		exports.register = function (server, options, next) {
-		server.path(__dirname + '../static');
-		server.route({ path: '/file', method: 'GET', handler: { file: './test.html' } });
-		next();
-		};*/
-		path(relativeTo: string): void;
-		/**server.register(plugins, [options], callback)
-		Registers a plugin where:
-		plugins - an object or array of objects where each one is either:
-		a plugin registration function.
-		an object with the following:
-		register - the plugin registration function.
-		options - optional options passed to the registration function when called.
-		options - optional registration options (different from the options passed to the registration function):
-		select - a string or array of string labels used to pre-select connections for plugin registration.
-		routes - modifiers applied to each route added by the plugin:
-		prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
-		vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
-		callback - the callback function with signature function(err) where:
-		err - an error returned from the registration function. Note that exceptions thrown by the registration function are not handled by the framework.
-		server.register({
-		register: require('plugin_name'),
-		options: {
-		message: 'hello'
-		}
-		}, function (err) {
-		if (err) {
-		console.log('Failed loading plugin');
-		}
-		});*/
-		register(plugins: any|any[], options: {
-			select: string|string[];
-			routes: {
-				prefix: string; vhost?: string|string[]
-			};
-		}
-			, callback: (err: any) => void):void;
-
-		register(plugins: any|any[], callback: (err: any) => void):void;
-
-		/**server.render(template, context, [options], callback)
-		Utilizes the server views manager to render a template where:
-		template - the template filename and path, relative to the views manager templates path (path or relativeTo).
-		context - optional object used by the template to render context-specific result. Defaults to no context ({}).
-		options - optional object used to override the views manager configuration.
-		callback - the callback function with signature function (err, rendered, config) where:
-		err - the rendering error if any.
-		rendered - the result view string.
-		config - the configuration used to render the template.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.views({
-		engines: { html: require('handlebars') },
-		path: __dirname + '/templates'
-		});
-		var context = {
-		title: 'Views Example',
-		message: 'Hello, World'
-		};
-		server.render('hello', context, function (err, rendered, config) {
-		console.log(rendered);
-		});*/
-		render(template: string, context: any, options: any, callback: (err: any, rendered: any, config: any) => void):void;
-		/** server.route(options)
-		Adds a connection route where:
-		options - a route configuration object or an array of configuration objects.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.route({ method: 'GET', path: '/', handler: function (request, reply) { return reply('ok'); } });
-		server.route([
-		{ method: 'GET', path: '/1', handler: function (request, reply) { return reply('ok'); } },
-		{ method: 'GET', path: '/2', handler: function (request, reply) { return reply('ok'); } }
-		]);*/
-		route(options: IRouteConfiguration):void;
-		route(options: IRouteConfiguration[]):void;
-		/**server.select(labels)
-		Selects a subset of the server's connections where:
-		labels - a single string or array of strings of labels used as a logical OR statement to select all the connections with matching labels in their configuration.
-		Returns a server object with connections set to the requested subset. Selecting again on a selection operates as a logic AND statement between the individual selections.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80, labels: ['a'] });
-		server.connection({ port: 8080, labels: ['b'] });
-		server.connection({ port: 8081, labels: ['c'] });
-		server.connection({ port: 8082, labels: ['c','d'] });
-		var a = server.select('a');          // The server with port 80
-		var ab = server.select(['a','b']);   // A list of servers containing the server with port 80 and the server with port 8080
-		var c = server.select('c');          // A list of servers containing the server with port 8081 and the server with port 8082 */
-		select(labels: string|string[]): Server|Server[];
-		/** server.start([callback])
-		Starts the server connections by listening for incoming requests on the configured port of each listener (unless the connection was configured with autoListen set to false), where:
-		callback - optional callback when server startup is completed or failed with the signature function(err) where:
-		err - any startup error condition.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.start(function (err) {
-		console.log('Server started at: ' + server.info.uri);
-		});*/
-		start(callback?: (err: any) => void): void;
-		/** server.state(name, [options])
-		HTTP state management uses client cookies to persist a state across multiple requests. Registers a cookie definitions
-		State defaults can be modified via the server connections.routes.state configuration option.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		// Set cookie definition
-		server.state('session', {
-		ttl: 24 * 60 * 60 * 1000,     // One day
-		isSecure: true,
-		path: '/',
-		encoding: 'base64json'
-		});
-		// Set state in route handler
-		var handler = function (request, reply) {
-		var session = request.state.session;
-		if (!session) {
-		session = { user: 'joe' };
-		}
-		session.last = Date.now();
-		return reply('Success').state('session', session);
-		};
-		Registered cookies are automatically parsed when received. Parsing rules depends on the route state.parse configuration. If an incoming registered cookie fails parsing, it is not included in request.state, regardless of the state.failAction setting. When state.failAction is set to 'log' and an invalid cookie value is received, the server will emit a 'request-internal' event. To capture these errors subscribe to the 'request-internal' events and filter on 'error' and 'state' tags:
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.on('request-internal', function (request, event, tags) {
-		if (tags.error && tags.state) {
-		console.error(event);
-		}
-		});	*/
-		state(name: string, options?: ICookieSettings): void;
-
-		/** server.stop([options], [callback])
-		Stops the server's connections by refusing to accept any new connections or requests (existing connections will continue until closed or timeout), where:
-		options - optional object with:
-		timeout - overrides the timeout in millisecond before forcefully terminating a connection. Defaults to 5000 (5 seconds).
-		callback - optional callback method with signature function() which is called once all the connections have ended and it is safe to exit the process.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.stop({ timeout: 60 * 1000 }, function () {
-		console.log('Server stopped');
-		});*/
-		stop(options?: { timeout: number }, callback?: () => void): void;
-		/**server.table([host])
-		Returns a copy of the routing table where:
-		host - optional host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
-		The return value is an array where each item is an object containing:
-		info - the connection.info the connection the table was generated for.
-		labels - the connection labels.
-		table - an array of routes where each route contains:
-		settings - the route config with defaults applied.
-		method - the HTTP method in lower case.
-		path - the route path.
-		Note that if the server has not been started and multiple connections use port 0, the table items will override each other and will produce an incomplete result.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80, host: 'example.com' });
-		server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
-		var table = server.table();
-		When calling connection.table() directly on each connection, the return value is the same as the array table item value of an individual connection:
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80, host: 'example.com' });
-		server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
-		var table = server.connections[0].table();
-		//[
-		//    {
-		//        method: 'get',
-		//        path: '/example',
-		//        settings: { ... }
-		//    }
-		//]
-		*/
-		table(host?: any): IConnectionTable;
-
-		/**server.views(options)
-		Initializes the server views manager
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.views({
-		engines: {
-		html: require('handlebars'),
-		jade: require('jade')
-		},
-		path: '/static/templates'
-		});
-		When server.views() is called within a plugin, the views manager is only available to plugins methods.*/
-		views(options: IServerViewsConfiguration): void;
-
-	}
+    };
+}
+
+export interface IFileHandlerConfig {
+    /**  a path string or function as described above.*/
+    path: string;
+    /** an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path*/
+    filename?: string;
+    /**- specifies whether to include the 'Content-Disposition' header with the response. Available values:
+    false - header is not included. This is the default value.
+    'attachment'
+    'inline'*/
+    mode?: boolean | string;
+    /** if true, looks for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.*/
+    lookupCompressed: boolean;
+}
+
+/**http://hapijs.com/api#route-handler
+Built-in handlers
+
+The framework comes with a few built-in handler types available by setting the route handler config to an object containing one of these keys.*/
+export interface IRouteHandlerConfig {
+    /** generates a static file endpoint for serving a single file. file can be set to:
+                a relative or absolute file path string (relative paths are resolved based on the route files configuration).
+    a function with the signature function(request) which returns the relative or absolute file path.
+    an object with the following options */
+    file?: string | IRequestHandler<void> | IFileHandlerConfig;
+    /** directory - generates a directory endpoint for serving static content from a directory. Routes using the directory handler must include a path parameter at the end of the path string (e.g. /path/to/somewhere/{param} where the parameter name does not matter). The path parameter can use any of the parameter options (e.g. {param} for one level files only, {param?} for one level files or the directory root, {param*} for any level, or {param*3} for a specific level). If additional path parameters are present, they are ignored for the purpose of selecting the file system resource. The directory handler is an object with the following options:
+                path - (required) the directory root path (relative paths are resolved based on the route files configuration). Value can be:
+    a single path string used as the prefix for any resources requested by appending the request path parameter to the provided string.
+    an array of path strings. Each path will be attempted in order until a match is found (by following the same process as the single path string).
+    a function with the signature function(request) which returns the path string or an array of path strings. If the function returns an error, the error is passed back to the client in the response.
+    index - optional boolean|string|string[], determines if an index file will be served if found in the folder when requesting a directory. The given string or strings specify the name(s) of the index file to look for. If true, looks for 'index.html'. Any falsy value disables index file lookup. Defaults to true.
+    listing - optional boolean, determines if directory listing is generated when a directory is requested without an index document. Defaults to false.
+    showHidden - optional boolean, determines if hidden files will be shown and served. Defaults to false.
+    redirectToSlash - optional boolean, determines if requests for a directory without a trailing slash are redirected to the same path with the missing slash. Useful for ensuring relative links inside the response are resolved correctly. Disabled when the server config router.stripTrailingSlash is true.Defaults to false.
+    lookupCompressed - optional boolean, instructs the file processor to look for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.
+    defaultExtension - optional string, appended to file requests if the requested file is not found. Defaults to no extension.*/
+    directory?: {
+        path: string | Array<string> | IRequestHandler<string> | IRequestHandler<Array<string>>;
+        index?: boolean;
+        listing?: boolean;
+        showHidden?: boolean;
+        redirectToSlash?: boolean;
+        lookupCompressed?: boolean;
+        defaultExtension?: string;
+    };
+    proxy?: IProxyHandlerConfig;
+    view?: string | {
+        template: string;
+        context: {
+            payload: any;
+            params: any;
+            query: any;
+            pre: any;
+        }
+    };
+    config?: {
+        handler: any;
+        bind: any;
+        app: any;
+        plugins: {
+            [name: string]: any;
+        };
+        pre: Array<() => void>;
+        validate: {
+            headers: any;
+            params: any;
+            query: any;
+            payload: any;
+            errorFields?: any;
+            failAction?: string | IFailAction;
+        };
+        payload: {
+            output: {
+                data: any;
+                stream: any;
+                file: any;
+            };
+            parse?: any;
+            allow?: string | Array<string>;
+            override?: string;
+            maxBytes?: number;
+            uploads?: number;
+            failAction?: string;
+        };
+        response: {
+            schema: any;
+            sample: number;
+            failAction: string;
+        };
+        cache: {
+            privacy: string;
+            expiresIn: number;
+            expiresAt: number;
+        };
+        auth: string | boolean | {
+            mode: string;
+            strategies: Array<string>;
+            payload?: boolean | string;
+            tos?: boolean | string;
+            scope?: string | Array<string>;
+            entity: string;
+        };
+        cors?: boolean;
+        jsonp?: string;
+        description?: string;
+        notes?: string | Array<string>;
+        tags?: Array<string>;
+    };
+}
+/** Route configuration
+The route configuration object*/
+export interface IRouteConfiguration {
+    /**  - (required) the absolute path used to match incoming requests (must begin with '/'). Incoming requests are compared to the configured paths based on the connection router configuration option.The path can include named parameters enclosed in {} which will be matched against literal values in the request as described in Path parameters.*/
+    path: string;
+    /** - (required) the HTTP method.Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'.Any HTTP method is allowed, except for 'HEAD'.Use '*' to match against any HTTP method (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match).
+    * Can be assigned an array of methods which has the same result as adding the same route with different methods manually.*/
+    method: string | string[];
+    /**  - an optional domain string or an array of domain strings for limiting the route to only requests with a matching host header field.Matching is done against the hostname part of the header only (excluding the port).Defaults to all hosts.*/
+    vhost?: string;
+    /**  - (required) the function called to generate the response after successful authentication and validation.The handler function is described in Route handler.If set to a string, the value is parsed the same way a prerequisite server method string shortcut is processed.Alternatively, handler can be assigned an object with a single key using the name of a registered handler type and value with the options passed to the registered handler.*/
+    handler: ISessionHandler | string | IRouteHandlerConfig;
+    /** - additional route options.*/
+    config?: IRouteAdditionalConfigurationOptions;
+}
+/** Route public interface When route information is returned or made available as a property.  http://hapijs.com/api#route-public-interface */
+export interface IRoute {
+
+
+    /** the route HTTP method. */
+    method: string;
+    /** the route path. */
+    path: string;
+    /** the route vhost option if configured. */
+    vhost?: string | Array<string>;
+    /** the [active realm] associated with the route.*/
+    realm: IServerRealm;
+    /** the [route options]  object with all defaults applied. */
+    settings: IRouteAdditionalConfigurationOptions;
+}
+
+export interface IServerAuthScheme {
+    /** authenticate(request, reply) - required function called on each incoming request configured with the authentication scheme where:
+    request - the request object.
+    reply - the reply interface the authentication method must call when done authenticating the request where:
+    reply(err, response, result) - is called if authentication failed where:
+    err - any authentication error.
+    response - any authentication response action such as redirection. Ignored if err is present, otherwise required.
+    result - an object containing:
+    credentials - the authenticated credentials.
+    artifacts - optional authentication artifacts.
+    reply.continue(result) - is called if authentication succeeded where:
+    result - same object as result above.
+    When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted if configured for the route.
+    .If the err returned by the reply() method includes a message, no additional strategies will be attempted.
+    If the err does not include a message but does include a scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in order of preference.
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    var scheme = function (server, options) {
+    return {
+    authenticate: function (request, reply) {
+    var req = request.raw.req;
+    var authorization = req.headers.authorization;
+    if (!authorization) {
+    return reply(Boom.unauthorized(null, 'Custom'));
+    }
+    return reply(null, { credentials: { user: 'john' } });
+    }
+    };
+    };
+    server.auth.scheme('custom', scheme);*/
+    authenticate(request: Request, reply: IReply): void;
+    /** payload(request, reply) - optional function called to authenticate the request payload where:
+    request - the request object.
+    reply(err, response) - is called if authentication failed where:
+    err - any authentication error.
+    response - any authentication response action such as redirection. Ignored if err is present, otherwise required.
+    reply.continue() - is called if payload authentication succeeded.
+    When the scheme payload() method returns an error with a message, it means payload validation failed due to bad payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')), authentication may still be successful if the route auth.payload configuration is set to 'optional'.*/
+    payload?(request: Request, reply: IReply): void;
+    /** response(request, reply) - optional function called to decorate the response with authentication headers before the response headers or payload is written where:
+    request - the request object.
+    reply(err, response) - is called if an error occurred where:
+    err - any authentication error.
+    response - any authentication response to send instead of the current response. Ignored if err is present, otherwise required.
+    reply.continue() - is called if the operation succeeded.*/
+    response?(request: Request, reply: IReply): void;
+    /** an optional object  */
+    options?: {
+        /**  if true, requires payload validation as part of the scheme and forbids routes from disabling payload auth validation. Defaults to false.*/
+        payload: boolean;
+    }
+}
+
+
+
+export interface IServerInject {
+    (options: {
+        /**  the request HTTP method (e.g. 'POST'). Defaults to 'GET'.*/
+        method: string;
+        /** the request URL. If the URI includes an authority (e.g. 'example.com:8080'), it is used to automatically set an HTTP 'Host' header, unless one was specified in headers.*/
+        url: string;
+        /** an object with optional request headers where each key is the header name and the value is the header content. Defaults to no additions to the default Shot headers.*/
+        headers: IDictionary<string>;
+        /**- an optional string or buffer containing the request payload (object must be manually converted to a string first). Defaults to no payload. Note that payload processing defaults to 'application/json' if no 'Content-Type' header provided.*/
+        payload: string | Buffer;
+        /**an optional credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Defaults to no credentials.*/
+        credentials: any;
+        /**object with options used to simulate client request stream conditions for testing:
+        error - if true, emits an 'error' event after payload transmission (if any). Defaults to false.
+        close - if true, emits a 'close' event after payload transmission (if any). Defaults to false.
+        end - if false, does not end the stream. Defaults to true.*/
+        simulate: {
+            error: boolean;
+            close: boolean;
+            end: boolean;
+        };
+    },
+        callback: (
+            /**the response object where:
+            statusCode - the HTTP status code.
+            headers - an object containing the headers set.
+            payload - the response payload string.
+            rawPayload - the raw response payload buffer.
+            raw - an object with the injection request and response objects:
+            req - the simulated node request object.
+            res - the simulated node response object.
+            result - the raw handler response (e.g. when not a stream or a view) before it is serialized for transmission. If not available, the value is set to payload. Useful for inspection and reuse of the internal objects returned (instead of parsing the response string).
+            request - the request object.*/
+            res: { statusCode: number; headers: IDictionary<string>; payload: string; rawPayload: Buffer; raw: { req: http.ClientRequest; res: http.ServerResponse }; result: string; request: Request }) => void
+    ): void;
+
+}
+
+
+/** host - optional host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
+The return value is an array where each item is an object containing:
+info - the connection.info the connection the table was generated for.
+labels - the connection labels.
+table - an array of routes where each route contains:
+settings - the route config with defaults applied.
+method - the HTTP method in lower case.
+path - the route path.*/
+export interface IConnectionTable {
+    info: any;
+    labels: any;
+    table: IRoute[];
+}
+
+export interface ICookieSettings {
+    /** - time - to - live in milliseconds.Defaults to null (session time- life - cookies are deleted when the browser is closed).*/
+    ttl?: number;
+    /** - sets the 'Secure' flag.Defaults to false.*/
+    isSecure?: boolean;
+    /** - sets the 'HttpOnly' flag.Defaults to false.*/
+    isHttpOnly?: boolean;
+    /** - the path scope.Defaults to null (no path).*/
+    path?: string;
+    /** - the domain scope.Defaults to null (no domain).*/
+    domain?: any;
+    /** - if present and the cookie was not received from the client or explicitly set by the route handler, the cookie is automatically added to the response with the provided value.The value can be a function with signature function(request, next) where:
+    request - the request object.
+    next - the continuation function using the function(err, value) signature.*/
+    autoValue?: (request: Request, next: (err: any, value: any) => void) => void;
+    /** - encoding performs on the provided value before serialization.Options are:
+    'none' - no encoding.When used, the cookie value must be a string.This is the default value.
+    'base64' - string value is encoded using Base64.
+    'base64json' - object value is JSON- stringified than encoded using Base64.
+    'form' - object value is encoded using the x- www - form - urlencoded method. */
+    encoding?: string;
+    /**  - an object used to calculate an HMAC for cookie integrity validation.This does not provide privacy, only a mean to verify that the cookie value was generated by the server.Redundant when 'iron' encoding is used.Options are:
+    integrity - algorithm options.Defaults to require('iron').defaults.integrity.
+    password - password used for HMAC key generation. */
+    sign?: { integrity: any; password: string; }
+    password?: string;
+    iron?: any;
+    ignoreErrors?: boolean;
+    clearInvalid?: boolean;
+    strictHeader?: boolean;
+    passThrough?: any;
+}
+
+/** method - the method function with the signature is one of:
+function(arg1, arg2, ..., argn, next) where:
+arg1, arg2, etc. - the method function arguments.
+next - the function called when the method is done with the signature function(err, result, ttl) where:
+err - error response if the method failed.
+result - the return value.
+ttl - 0 if result is valid but cannot be cached. Defaults to cache policy.
+function(arg1, arg2, ..., argn) where:
+arg1, arg2, etc. - the method function arguments.
+the callback option is set to false.
+the method must returns a value (result, Error, or a promise) or throw an Error.*/
+export interface IServerMethod {
+    //(): void;
+    //(next: (err: any, result: any, ttl: number) => void): void;
+    //(arg1: any): void;
+    //(arg1: any, arg2: any, next: (err: any, result: any, ttl: number) => void): void;
+    //(arg1: any, arg2: any): void;
+    (...args: any[]): void;
+
+}
+/** options - optional configuration:
+bind - a context object passed back to the method function (via this) when called. Defaults to active context (set via server.bind() when the method is registered.
+cache - the same cache configuration used in server.cache().
+callback - if false, expects the method to be a synchronous function. Note that using a synchronous function with caching will convert the method interface to require a callback as an additional argument with the signature function(err, result, cached, report) since the cache interface cannot return values synchronously. Defaults to true.
+generateKey - a function used to generate a unique key (for caching) from the arguments passed to the method function (the callback argument is not passed as input). The server will automatically generate a unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation function must be provided which takes the same arguments as the function and returns a unique string (or null if no key can be generated).*/
+export interface IServerMethodOptions {
+    bind?: any;
+    cache?: ICatBoxCacheOptions;
+    callback?: boolean;
+    generateKey?(args: any[]): string;
+}
+/** Request object
+
+The request object is created internally for each incoming request. It is different from the node.js request object received from the HTTP server callback (which is available in request.raw.req). The request object methods and properties change throughout the request lifecycle.
+Request events
+
+The request object supports the following events:
+
+'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
+'finish' - emitted when the request payload finished reading. The event method signature is function ().
+'disconnect' - emitted when a request errors or aborts unexpectedly.
+var Crypto = require('crypto');
+var Hapi = require('hapi');
+var server = new Hapi.Server();
+server.connection({ port: 80 });
+
+server.ext('onRequest', function (request, reply) {
+
+var hash = Crypto.createHash('sha1');
+request.on('peek', function (chunk) {
+
+hash.update(chunk);
+});
+
+request.once('finish', function () {
+
+console.log(hash.digest('hex'));
+});
+
+request.once('disconnect', function () {
+
+console.error('request aborted');
+});
+
+return reply.continue();
+});*/
+export declare class Request extends Events.EventEmitter {
+    /** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].*/
+    app: any;
+    /**  authentication information*/
+    auth: {
+        /** true is the request has been successfully authenticated, otherwise false.*/
+        isAuthenticated: boolean;
+        /**  the credential object received during the authentication process. The presence of an object does not mean successful authentication.*/
+        credentials: any;
+        /**  an artifact object received from the authentication strategy and used in authentication-related actions.*/
+        artifacts: any;
+        /**  the route authentication mode.*/
+        mode: any;
+        /** the authentication error is failed and mode set to 'try'.*/
+        error: any;
+        /** an object used by the ['cookie' authentication scheme]  https://github.com/hapijs/hapi-auth-cookie */
+        session: any
+    };
+    /**  the node domain object used to protect against exceptions thrown in extensions, handlers and route prerequisites. Can be used to manually bind callback functions otherwise bound to other domains.*/
+    domain: any;
+    /** the raw request headers (references request.raw.headers).*/
+    headers: IDictionary<string>;
+    /** a unique request identifier (using the format '{now}:{connection.info.id}:{5 digits counter}').*/
+    id: number;
+    /**  request information */
+    info: {
+        /**  request reception timestamp. */
+        received: number;
+        /**  request response timestamp (0 is not responded yet). */
+        responded: number;
+        /** remote client IP address. */
+
+        remoteAddress: string;
+        /**  remote client port. */
+        remotePort: number;
+        /**  content of the HTTP 'Referrer' (or 'Referer') header. */
+        referrer: string;
+        /**  content of the HTTP 'Host' header (e.g. 'example.com:8080'). */
+        host: string;
+        /**  the hostname part of the 'Host' header (e.g. 'example.com').*/
+        hostname: string;
+    };
+    /**  the request method in lower case (e.g. 'get', 'post'). */
+    method: string;
+    /**  the parsed content-type header. Only available when payload parsing enabled and no payload error occurred. */
+    mime: string;
+    /**  an object containing the values of params, query, and payload before any validation modifications made. Only set when input validation is performed.*/
+    orig: {
+        params: any;
+        query: any;
+        payload: any;
+    };
+    /**  an object where each key is a path parameter name with matching value as described in Path parameters.*/
+    params: IDictionary<string>;
+    /** an array containing all the path params values in the order they appeared in the path.*/
+    paramsArray: string[];
+    /**  the request URI's path component. */
+    path: string;
+    /** the request payload based on the route payload.output and payload.parse settings.*/
+    payload: any;
+    /**  plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state.*/
+    plugins: any;
+    /** an object where each key is the name assigned by a route prerequisites function. The values are the raw values provided to the continuation function as argument. For the wrapped response object, use responses.*/
+    pre: IDictionary<any>;
+    /** the response object when set. The object can be modified but must not be assigned another object. To replace the response with another from within an extension point, use reply(response) to override with a different response. Contains null when no response has been set (e.g. when a request terminates prematurely when the client disconnects).*/
+    response: Response;
+    /**preResponses - same as pre but represented as the response object created by the pre method.*/
+    preResponses: any;
+    /**an object containing the query parameters.*/
+    query: any;
+    /**  an object containing the Node HTTP server objects. Direct interaction with these raw objects is not recommended.*/
+    raw: {
+        req: http.ClientRequest;
+        res: http.ServerResponse;
+    };
+    /** the route public interface.*/
+    route: IRoute;
+    /** the server object. */
+    server: Server;
+    /** Special key reserved for plugins implementing session support. Plugins utilizing this key must check for null value to ensure there is no conflict with another similar server. */
+    session: any;
+    /** an object containing parsed HTTP state information (cookies) where each key is the cookie name and value is the matching cookie content after processing using any registered cookie definition. */
+    state: any;
+    /** complex object contining details on the url */
+    url: {
+        /** null when i tested */
+        auth: any;
+        /** null when i tested */
+        hash: any;
+        /** null when i tested */
+        host: any;
+        /** null when i tested */
+        hostname: any;
+        href: string;
+        path: string;
+        /** path without search*/
+        pathname: string;
+        /** null when i tested */
+        port: any;
+        /** null when i tested */
+        protocol: any;
+        /** querystring parameters*/
+        query: IDictionary<string>;
+        /** querystring parameters as a string*/
+        search: string;
+        /** null when i tested */
+        slashes: any;
+    };
+    /** request.setUrl(url)
+
+    Available only in 'onRequest' extension methods.
+
+    Changes the request URI before the router begins processing the request where:
+
+    url - the new request path value.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+
+    server.ext('onRequest', function (request, reply) {
+
+    // Change all requests to '/test'
+    request.setUrl('/test');
+    return reply.continue();
+    });*/
+    setUrl(url: string): void;
+    /** request.setMethod(method)
+
+    Available only in 'onRequest' extension methods.
+
+    Changes the request method before the router begins processing the request where:
+
+    method - is the request HTTP method (e.g. 'GET').
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+
+    server.ext('onRequest', function (request, reply) {
+
+    // Change all requests to 'GET'
+    request.setMethod('GET');
+    return reply.continue();
+    });*/
+    setMethod(method: string): void;
+    /** request.log(tags, [data, [timestamp]])
+
+    Always available.
+
+    Logs request-specific events. When called, the server emits a 'request' event which can be used by other listeners or plugins. The arguments are:
+
+    data - an optional message string or object with the application data being logged.
+    timestamp - an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
+    Any logs generated by the server internally will be emitted only on the 'request-internal' channel and will include the event.internal flag set to true.
+
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+
+    server.on('request', function (request, event, tags) {
+
+    if (tags.error) {
+    console.log(event);
+    }
+    });
+
+    var handler = function (request, reply) {
+
+    request.log(['test', 'error'], 'Test event');
+    return reply();
+    };
+    */
+    log(
+        /** a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events.*/
+        tags: string | string[],
+        /** an optional message string or object with the application data being logged.*/
+        data?: string,
+        /**  an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).*/
+        timestamp?: number): void;
+    /** request.getLog([tags], [internal])
+
+    Always available.
+
+    Returns an array containing the events matching any of the tags specified (logical OR)
+    request.getLog();
+    request.getLog('error');
+    request.getLog(['error', 'auth']);
+    request.getLog(['error'], true);
+    request.getLog(false);*/
+
+    getLog(
+        /** is a single tag string or array of tag strings. If no tags specified, returns all events.*/
+        tags?: string,
+        /**  filters the events to only those with a matching event.internal value. If true, only internal logs are included. If false, only user event are included. Defaults to all events (undefined).*/
+        internal?: boolean): string[];
+
+    /** request.tail([name])
+
+    Available until immediately after the 'response' event is emitted.
+
+    Adds a request tail which has to complete before the request lifecycle is complete where:
+
+    name - an optional tail name used for logging purposes.
+    Returns a tail function which must be called when the tail activity is completed.
+
+    Tails are actions performed throughout the request lifecycle, but which may end after a response is sent back to the client. For example, a request may trigger a database update which should not delay sending back a response. However, it is still desirable to associate the activity with the request when logging it (or an error associated with it).
+
+    When all tails completed, the server emits a 'tail' event.
+
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+
+    var get = function (request, reply) {
+
+    var dbTail = request.tail('write to database');
+
+    db.save('key', 'value', function () {
+
+    dbTail();
+    });
+
+    return reply('Success!');
+    };
+
+    server.route({ method: 'GET', path: '/', handler: get });
+
+    server.on('tail', function (request) {
+
+    console.log('Request completed including db activity');
+    });*/
+    tail(
+        /** an optional tail name used for logging purposes.*/
+        name?: string): Function;
+}
+/** Response events
+
+The response object supports the following events:
+
+'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
+'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
+var Crypto = require('crypto');
+var Hapi = require('hapi');
+var server = new Hapi.Server();
+server.connection({ port: 80 });
+
+server.ext('onPreResponse', function (request, reply) {
+
+var response = request.response;
+if (response.isBoom) {
+return reply();
+}
+
+var hash = Crypto.createHash('sha1');
+response.on('peek', function (chunk) {
+
+hash.update(chunk);
+});
+
+response.once('finish', function () {
+
+console.log(hash.digest('hex'));
+});
+
+return reply.continue();
+});*/
+export declare class Response extends Events.EventEmitter {
+    /**  the HTTP response status code. Defaults to 200 (except for errors).*/
+    statusCode: number;
+    /** an object containing the response headers where each key is a header field name. Note that this is an incomplete list of headers to be included with the response. Additional headers will be added once the response is prepare for transmission.*/
+    headers: IDictionary<string>;
+    /** the value provided using the reply interface.*/
+    source: any;
+    /** a string indicating the type of source with available values:
+    'plain' - a plain response such as string, number, null, or simple object (e.g. not a Stream, Buffer, or view).
+    'buffer' - a Buffer.
+    'view' - a view generated with reply.view().
+    'file' - a file generated with reply.file() of via the directory handler.
+    'stream' - a Stream.
+    'promise' - a Promise object. */
+    variety: string;
+    /** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].*/
+    app: any;
+    /** plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state. */
+    plugins: any;
+    /** settings - response handling flags:
+    charset - the 'Content-Type' HTTP header 'charset' property. Defaults to 'utf-8'.
+    encoding - the string encoding scheme used to serial data into the HTTP payload when source is a string or marshals into a string. Defaults to 'utf8'.
+    passThrough - if true and source is a Stream, copies the statusCode and headers of the stream to the outbound response. Defaults to true.
+    stringify - options used for source value requiring stringification. Defaults to no replacer and no space padding.
+    ttl - if set, overrides the route cache expiration milliseconds value set in the route config. Defaults to no override.
+    varyEtag - if true, a suffix will be automatically added to the 'ETag' header at transmission time (separated by a '-' character) when the HTTP 'Vary' header is present.*/
+    settings: {
+        charset: string;
+        encoding: string;
+        passThrough: boolean;
+        stringify: any;
+        ttl: number;
+        varyEtag: boolean;
+    }
+
+    /**  sets the HTTP 'Content-Length' header (to avoid chunked transfer encoding) where:
+    length - the header value. Must match the actual payload size.*/
+    bytes(length: number): void;
+    /**  sets the 'Content-Type' HTTP header 'charset' property where: charset - the charset property value.*/
+    charset(charset: string): void;
+
+    /**  sets the HTTP status code where:
+    statusCode - the HTTP status code.*/
+    code(statusCode: number): void;
+    /** sets the HTTP status code to Created (201) and the HTTP 'Location' header where: uri - an absolute or relative URI used as the 'Location' header value.*/
+    created(uri: string): void;
+
+
+    /** encoding(encoding) - sets the string encoding scheme used to serial data into the HTTP payload where: encoding - the encoding property value (see node Buffer encoding).*/
+    encoding(encoding: string): void;
+
+    /** etag(tag, options) - sets the representation entity tag where:
+    tag - the entity tag string without the double-quote.
+    options - optional settings where:
+    weak - if true, the tag will be prefixed with the 'W/' weak signifier. Weak tags will fail to match identical tags for the purpose of determining 304 response status. Defaults to false.
+    vary - if true and content encoding is set or applied to the response (e.g 'gzip' or 'deflate'), the encoding name will be automatically added to the tag at transmission time (separated by a '-' character). Ignored when weak is true. Defaults to true.*/
+    etag(tag: string, options: {
+        weak: boolean; vary: boolean;
+    }): void;
+
+    /**header(name, value, options) - sets an HTTP header where:
+    name - the header name.
+    value - the header value.
+    options - optional settings where:
+    append - if true, the value is appended to any existing header value using separator. Defaults to false.
+    separator - string used as separator when appending to an exiting value. Defaults to ','.
+    override - if false, the header value is not set if an existing value present. Defaults to true.*/
+    header(name: string, value: string, options?: {
+        append: boolean;
+        separator: string;
+        override: boolean;
+    }): void;
+
+    /** location(uri) - sets the HTTP 'Location' header where:
+    uri - an absolute or relative URI used as the 'Location' header value.*/
+    location(uri: string): void;
+
+    /** redirect(uri) - sets an HTTP redirection response (302) and decorates the response with additional methods listed below, where:
+    uri - an absolute or relative URI used to redirect the client to another resource. */
+    redirect(uri: string): void;
+
+    /** replacer(method) - sets the JSON.stringify() replacer argument where:
+    method - the replacer function or array. Defaults to none.*/
+    replacer(method: Function | Array<Function>): void;
+
+    /** spaces(count) - sets the JSON.stringify() space argument where:
+    count - the number of spaces to indent nested object keys. Defaults to no indentation. */
+    spaces(count: number): void;
+    /**state(name, value, [options]) - sets an HTTP cookie where:
+    name - the cookie name.
+    value - the cookie value. If no encoding is defined, must be a string.
+    options - optional configuration. If the state was previously registered with the server using server.state(), the specified keys in options override those same keys in the server definition (but not others).*/
+    state(name: string, value: string, options?: any): void;
+
+}
+
+
+
+/** Server http://hapijs.com/api#server
+rver object is the main application container. The server manages all incoming connections along with all the facilities provided by the framework. A server can contain more than one connection (e.g. listen to port 80 and 8080).
+Server events
+The server object inherits from Events.EventEmitter and emits the following events:
+'log' - events logged with server.log() and server events generated internally by the framework.
+'start' - emitted when the server is started using server.start().
+'stop' - emitted when the server is stopped using server.stop().
+'request' - events generated by request.log(). Does not include any internally generated events.
+'request-internal' - request events generated internally by the framework (multiple events per request).
+'request-error' - emitted whenever an Internal Server Error (500) error response is sent. Single event per request.
+'response' - emitted after the response is sent back to the client (or when the client connection closed and no response sent, in which case request.response is null). Single event per request.
+'tail' - emitted when a request finished processing, including any registered tails. Single event per request.
+Note that the server object should not be used to emit application events as its internal implementation is designed to fan events out to the various plugin selections and not for application events.
+MORE EVENTS HERE: http://hapijs.com/api#server-events*/
+export declare class Server extends Events.EventEmitter {
+
+    constructor(options?: IServerOptions);
+    /** Provides a safe place to store server-specific run-time application data without potential conflicts with the framework internals. The data can be accessed whenever the server is accessible. Initialized with an empty object.
+    var Hapi = require('hapi');
+    server = new Hapi.Server();
+    server.app.key = 'value';
+    var handler = function (request, reply) {
+    return reply(request.server.app.key);
+    }; */
+    app: any;
+    /** An array containing the server's connections. When the server object is returned from server.select(), the connections array only includes the connections matching the selection criteria.
+    var server = new Hapi.Server();
+    server.connection({ port: 80, labels: 'a' });
+    server.connection({ port: 8080, labels: 'b' });
+    // server.connections.length === 2
+    var a = server.select('a');
+    // a.connections.length === 1*/
+    connections: Array<ISeverConnectionOptions>;
+    /** When the server contains exactly one connection, info is an object containing information about the sole connection.
+    * When the server contains more than one connection, each server.connections array member provides its own connection.info.
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    // server.info.port === 80
+    server.connection({ port: 8080 });
+    // server.info === null
+    // server.connections[1].info.port === 8080
+    */
+    info: {
+        /**  - a unique connection identifier (using the format '{hostname}:{pid}:{now base36}').*/
+        id: string;
+        /**  - the connection creation timestamp.*/
+        created: number;
+        /**  - the connection start timestamp (0 when stopped).*/
+        started: number;
+        /**  the connection port based on the following rules:
+        the configured port value before the server has been started.
+        the actual port assigned when no port is configured or set to 0 after the server has been started.*/
+        port: number;
+
+        /** - the host name the connection was configured to. Defaults to the operating system hostname when available, otherwise 'localhost'.*/
+        host: string;
+        /** - the active IP address the connection was bound to after starting.Set to undefined until the server has been started or when using a non TCP port (e.g. UNIX domain socket).*/
+        address: string;
+        /**  - the protocol used:
+        'http' - HTTP.
+        'https' - HTTPS.
+        'socket' - UNIX domain socket or Windows named pipe.*/
+        protocol: string;
+        /** a string representing the connection (e.g. 'http://example.com:8080' or 'socket:/unix/domain/socket/path'). Contains the uri setting if provided, otherwise constructed from the available settings. If no port is available or set to 0, the uri will not include a port component.*/
+        uri: string;
+    };
+    /** An object containing the process load metrics (when load.sampleInterval is enabled):
+    rss - RSS memory usage.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server({ load: { sampleInterval: 1000 } });
+    console.log(server.load.rss);*/
+    load: {
+        /** - event loop delay milliseconds.*/
+        eventLoopDelay: number;
+        /**  - V8 heap usage.*/
+        heapUsed: number;
+    };
+    /** When the server contains exactly one connection, listener is the node HTTP server object of the sole connection.
+    When the server contains more than one connection, each server.connections array member provides its own connection.listener.
+    var Hapi = require('hapi');
+    var SocketIO = require('socket.io');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    var io = SocketIO.listen(server.listener);
+    io.sockets.on('connection', function(socket) {
+    socket.emit({ msg: 'welcome' });
+    });*/
+    listener: http.Server;
+
+    /** server.methods
+    An object providing access to the server methods where each server method name is an object property.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.method('add', function (a, b, next) {
+    return next(null, a + b);
+    });
+    server.methods.add(1, 2, function (err, result) {
+    // result === 3
+    });*/
+    methods: IDictionary<Function>;
+
+    /** server.mime
+    Provides access to the server MIME database used for setting content-type information. The object must not be modified directly but only through the mime server setting.
+    var Hapi = require('hapi');
+    var options = {
+    mime: {
+    override: {
+    'node/module': {
+    source: 'steve',
+    compressible: false,
+    extensions: ['node', 'module', 'npm'],
+    type: 'node/module'
+    }
+    }
+    }
+    };
+    var server = new Hapi.Server(options);
+    // server.mime.path('code.js').type === 'application/javascript'
+    // server.mime.path('file.npm').type === 'node/module'*/
+    mime: any;
+    /**server.plugins
+    An object containing the values exposed by each plugin registered where each key is a plugin name and the values are the exposed properties by each plugin using server.expose(). Plugins may set the value of the server.plugins[name] object directly or via the server.expose() method.
+    exports.register = function (server, options, next) {
+    server.expose('key', 'value');
+    // server.plugins.example.key === 'value'
+    return next();
+    };
+    exports.register.attributes = {
+    name: 'example'
+    };*/
+    plugins: IDictionary<any>;
+    /** server.realm
+    The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(), the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin). Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
+    modifiers - when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method and includes:
+    route - routes preferences:
+    prefix - the route path prefix used by any calls to server.route() from the server.
+    vhost - the route virtual host settings used by any calls to server.route() from the server.
+    plugin - the active plugin name (empty string if at the server root).
+    plugins - plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state.
+    settings - settings overrides:
+    files.relativeTo
+    bind
+    The server.realm object should be considered read-only and must not be changed directly except for the plugins property can be directly manipulated by the plugins (each setting its own under plugins[name]).
+    exports.register = function (server, options, next) {
+    console.log(server.realm.modifiers.route.prefix);
+    return next();
+    };*/
+    realm: IServerRealm;
+
+    /** server.root
+    The root server object containing all the connections and the root server methods (e.g. start(), stop(), connection()).*/
+    root: Server;
+    /** server.settings
+    The server configuration object after defaults applied.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server({
+    app: {
+    key: 'value'
+    }
+    });
+    // server.settings.app === { key: 'value' }*/
+    settings: IServerOptions;
+
+    /** server.version
+    The hapi module version number.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    // server.version === '8.0.0'*/
+    version: string;
+
+    /** server.after(method, [dependencies])
+    Adds a method to be called after all the plugin dependencies have been registered and before the server starts (only called if the server is started) where:
+    after - the method with signature function(plugin, next) where:
+    server - server object the after() method was called on.
+    next - the callback function the method must call to return control over to the application and complete the registration process. The function signature is function(err) where:
+    err - internal error which is returned back via the server.start() callback.
+    dependencies - a string or array of string with the plugin names to call this method after their after() methods. There is no requirement for the other plugins to be registered. Setting dependencies only arranges the after methods in the specified order.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    server.after(function () {
+    // Perform some pre-start logic
+    });
+    server.start(function (err) {
+    // After method already executed
+    });
+    server.auth.default(options)*/
+    after(method: (plugin: any, next: (err: any) => void) => void, dependencies: string | string[]): void;
+
+    auth: {
+        /** server.auth.default(options)
+        Sets a default strategy which is applied to every route where:
+        options - a string with the default strategy name or an object with a specified strategy or strategies using the same format as the route auth handler options.
+        The default does not apply when the route config specifies auth as false, or has an authentication strategy configured. Otherwise, the route authentication config is applied to the defaults. Note that the default only applies at time of route configuration, not at runtime. Calling default() after adding a route will have no impact on routes added prior.
+        The default auth strategy configuration can be accessed via connection.auth.settings.default.
+        var server = new Hapi.Server();
+        server.connection({ port: 80 });
+        server.auth.scheme('custom', scheme);
+        server.auth.strategy('default', 'custom');
+        server.auth.default('default');
+        server.route({
+        method: 'GET',
+        path: '/',
+        handler: function (request, reply) {
+        return reply(request.auth.credentials.user);
+        }
+        });*/
+        default(options: string): void;
+        default(options: { strategy: string }): void;
+        default(options: { strategies: string[] }): void;
+        /** server.auth.scheme(name, scheme)
+        Registers an authentication scheme where:
+        name - the scheme name.
+        scheme - the method implementing the scheme with signature function(server, options) where:
+        server - a reference to the server object the scheme is added to.
+        options - optional scheme settings used to instantiate a strategy.*/
+        scheme(name: string,
+            /** When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted if configured for the route. If the err returned by the reply() method includes a message, no additional strategies will be attempted. If the err does not include a message but does include a scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in order of preference.
+            n the scheme payload() method returns an error with a message, it means payload validation failed due to bad payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')), authentication may still be successful if the route auth.payload configuration is set to 'optional'.
+            server = new Hapi.Server();
+            server.connection({ port: 80 });
+            scheme = function (server, options) {
+            urn {
+            authenticate: function (request, reply) {
+            req = request.raw.req;
+            var authorization = req.headers.authorization;
+            if (!authorization) {
+            return reply(Boom.unauthorized(null, 'Custom'));
+            }
+            urn reply(null, { credentials: { user: 'john' } });
+            }
+            };
+            };
+            */
+            scheme: (server: Server, options: any) => IServerAuthScheme): void;
+
+        /** server.auth.strategy(name, scheme, [mode], [options])
+        Registers an authentication strategy where:
+        name - the strategy name.
+        scheme - the scheme name (must be previously registered using server.auth.scheme()).
+        mode - if true, the scheme is automatically assigned as a required strategy to any route without an auth config. Can only be assigned to a single server strategy. Value must be true (which is the same as 'required') or a valid authentication mode ('required', 'optional', 'try'). Defaults to false.
+        options - scheme options based on the scheme requirements.
+        var server = new Hapi.Server();
+        server.connection({ port: 80 });
+        server.auth.scheme('custom', scheme);
+        server.auth.strategy('default', 'custom');
+        server.route({
+        method: 'GET',
+        path: '/',
+        config: {
+        auth: 'default',
+        handler: function (request, reply) {
+        return reply(request.auth.credentials.user);
+        }
+        }
+        });*/
+        strategy(name: string, scheme: any, mode?: boolean, options?: any): void;
+
+        /** server.auth.test(strategy, request, next)
+        Tests a request against an authentication strategy where:
+        strategy - the strategy name registered with server.auth.strategy().
+        request - the request object.
+        next - the callback function with signature function(err, credentials) where:
+        err - the error if authentication failed.
+        credentials - the authentication credentials object if authentication was successful.
+        Note that the test() method does not take into account the route authentication configuration. It also does not perform payload authentication. It is limited to the basic strategy authentication execution. It does not include verifying scope, entity, or other route properties.
+        var server = new Hapi.Server();
+        server.connection({ port: 80 });
+        server.auth.scheme('custom', scheme);
+        server.auth.strategy('default', 'custom');
+        server.route({
+        method: 'GET',
+        path: '/',
+        handler: function (request, reply) {
+        request.server.auth.test('default', request, function (err, credentials) {
+        if (err) {
+        return reply({ status: false });
+        }
+        return reply({ status: true, user: credentials.name });
+        });
+        }
+        });*/
+        test(strategy: string, request: Request, next: (err: any, credentials: any) => void): void;
+    };
+    /** server.bind(context)
+    Sets a global context used as the default bind object when adding a route or an extension where:
+    context - the object used to bind this in handler and extension methods.
+    When setting context inside a plugin, the context is applied only to methods set up by the plugin. Note that the context applies only to routes and extensions added after it has been set.
+    var handler = function (request, reply) {
+    return reply(this.message);
+    };
+    exports.register = function (server, options, next) {
+    var bind = {
+    message: 'hello'
+    };
+    server.bind(bind);
+    server.route({ method: 'GET', path: '/', handler: handler });
+    return next();
+    };*/
+    bind(context: any): void;
+
+
+    /** server.cache(options)
+    Provisions a cache segment within the server cache facility where:
+    options - catbox policy configuration where:
+    expiresIn - relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt.
+    expiresAt - time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records expire. Uses local time. Cannot be used together with expiresIn.
+    generateFunc - a function used to generate a new cache item if one is not found in the cache when calling get(). The method's signature is function(id, next) where: - id - the id string or object provided to the get() method. - next - the method called when the new item is returned with the signature function(err, value, ttl) where: - err - an error condition. - value - the new value generated. - ttl - the cache ttl value in milliseconds. Set to 0 to skip storing in the cache. Defaults to the cache global policy.
+    staleIn - number of milliseconds to mark an item stored in cache as stale and attempt to regenerate it when generateFunc is provided. Must be less than expiresIn.
+    staleTimeout - number of milliseconds to wait before checking if an item is stale.
+    generateTimeout - number of milliseconds to wait before returning a timeout error when the generateFunc function takes too long to return a value. When the value is eventually returned, it is stored in the cache for future requests.
+    cache - the cache name configured in 'server.cache`. Defaults to the default cache.
+    segment - string segment name, used to isolate cached items within the cache partition. When called within a plugin, defaults to '!name' where 'name' is the plugin name. Required when called outside of a plugin.
+    shared - if true, allows multiple cache provisions to share the same segment. Default to false.
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    var cache = server.cache({ segment: 'countries', expiresIn: 60 * 60 * 1000 });
+    cache.set('norway', { capital: 'oslo' }, null, function (err) {
+    cache.get('norway', function (err, value, cached, log) {
+    // value === { capital: 'oslo' };
+    });
+    });*/
+    cache(options: ICatBoxCacheOptions): void;
+
+    /** server.connection([options])
+    Adds an incoming server connection
+    Returns a server object with the new connection selected.
+    Must be called before any other server method that modifies connections is called for it to apply to the new connection (e.g. server.state()).
+    Note that the options object is deeply cloned (with the exception of listener which is shallowly copied) and cannot contain any values that are unsafe to perform deep copy on.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    var web = server.connection({ port: 8000, host: 'example.com', labels: ['web'] });
+    var admin = server.connection({ port: 8001, host: 'example.com', labels: ['admin'] });
+    // server.connections.length === 2
+    // web.connections.length === 1
+    // admin.connections.length === 1 */
+    connection(options: ISeverConnectionOptions): Server;
+    /** server.decorate(type, property, method)
+    Extends various framework interfaces with custom methods where:
+    type - the interface being decorated. Supported types:
+    'reply' - adds methods to the reply interface.
+    'server' - adds methods to the Server object.
+    property - the object decoration key name.
+    method - the extension function.
+    Note that decorations apply to the entire server and all its connections regardless of current selection.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    server.decorate('reply', 'success', function () {
+    return this.response({ status: 'ok' });
+    });
+    server.route({
+    method: 'GET',
+    path: '/',
+    handler: function (request, reply) {
+    return reply.success();
+    }
+    });*/
+    decorate(type: string, property: string, method: Function): void;
+
+    /** server.dependency(dependencies, [after])
+    Used within a plugin to declares a required dependency on other plugins where:
+    dependencies - a single string or array of plugin name strings which must be registered in order for this plugin to operate. Plugins listed must be registered before the server is started. Does not provide version dependency which should be implemented using npm peer dependencies.
+    after - an optional function called after all the specified dependencies have been registered and before the server starts. The function is only called if the server is started. If a circular dependency is detected, an exception is thrown (e.g. two plugins each has an after function to be called after the other). The function signature is function(server, next) where:
+    server - the server the dependency() method was called on.
+    next - the callback function the method must call to return control over to the application and complete the registration process. The function signature is function(err) where:
+    err - internal error condition, which is returned back via the server.start() callback.
+    exports.register = function (server, options, next) {
+    server.dependency('yar', after);
+    return next();
+    };
+    var after = function (server, next) {
+    // Additional plugin registration logic
+    return next();
+    };*/
+    dependency(dependencies: string | string[], after?: (server: Server, next: (err: any) => void) => void): void;
+
+
+    /** server.expose(key, value)
+    Used within a plugin to expose a property via server.plugins[name] where:
+    key - the key assigned (server.plugins[name][key]).
+    value - the value assigned.
+    exports.register = function (server, options, next) {
+    server.expose('util', function () { console.log('something'); });
+    return next();
+    };*/
+    expose(key: string, value: any): void;
+
+    /** server.expose(obj)
+    Merges a deep copy of an object into to the existing content of server.plugins[name] where:
+    obj - the object merged into the exposed properties container.
+    exports.register = function (server, options, next) {
+    server.expose({ util: function () { console.log('something'); } });
+    return next();
+    };*/
+    expose(obj: any): void;
+
+    /** server.ext(event, method, [options])
+    Registers an extension function in one of the available extension points where:
+    event - the event name.
+    method - a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is function(request, reply) where:
+    request - the request object.
+    reply - the reply interface which is used to return control back to the framework. To continue normal execution of the request lifecycle, reply.continue() must be called. To abort processing and return a response to the client, call reply(value) where value is an error or any other valid response.
+    this - the object provided via options.bind or the current active context set with server.bind().
+    options - an optional object with the following:
+    before - a string or array of strings of plugin names this method must execute before (on the same event). Otherwise, extension methods are executed in the order added.
+    after - a string or array of strings of plugin names this method must execute after (on the same event). Otherwise, extension methods are executed in the order added.
+    bind - a context object passed back to the provided method (via this) when called.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    server.ext('onRequest', function (request, reply) {
+    // Change all requests to '/test'
+    request.setUrl('/test');
+    return reply.continue();
+    });
+    var handler = function (request, reply) {
+    return reply({ status: 'ok' });
+    };
+    server.route({ method: 'GET', path: '/test', handler: handler });
+    server.start();
+    // All requests will get routed to '/test'*/
+    ext(event: string, method: (request: Request, reply: IReply, bind?: any) => void, options?: { before: string | string[]; after: string | string[]; bind?: any }): void;
+
+    /** server.handler(name, method)
+    Registers a new handler type to be used in routes where:
+    name - string name for the handler being registered. Cannot override the built-in handler types (directory, file, proxy, and view) or any previously registered type.
+    method - the function used to generate the route handler using the signature function(route, options) where:
+    route - the route public interface object.
+    options - the configuration object provided in the handler config.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ host: 'localhost', port: 8000 });
+    // Defines new handler for routes on this server
+    server.handler('test', function (route, options) {
+    return function (request, reply) {
+    return reply('new handler: ' + options.msg);
+    }
+    });
+    server.route({
+    method: 'GET',
+    path: '/',
+    handler: { test: { msg: 'test' } }
+    });
+    server.start();
+    The method function can have a defaults object or function property. If the property is set to an object, that object is used as the default route config for routes using this handler. If the property is set to a function, the function uses the signature function(method) and returns the route default configuration.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ host: 'localhost', port: 8000 });
+    var handler = function (route, options) {
+    return function (request, reply) {
+    return reply('new handler: ' + options.msg);
+    }
+    };
+    // Change the default payload processing for this handler
+    handler.defaults = {
+    payload: {
+    output: 'stream',
+    parse: false
+    }
+    };
+    server.handler('test', handler);*/
+    handler<THandlerConfig>(name: string, method: (route: IRoute, options: THandlerConfig) => ISessionHandler): void;
+    /** When the server contains exactly one connection, injects a request into the sole connection simulating an incoming HTTP request without making an actual socket connection.
+    Injection is useful for testing purposes as well as for invoking routing logic internally without the overhead or limitations of the network stack.
+    Utilizes the [shot module | https://github.com/hapijs/shot ] for performing injections, with some additional options and response properties
+    * When the server contains more than one connection, each server.connections array member provides its own connection.inject().
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    var handler = function (request, reply) {
+    return reply('Success!');
+    };
+    server.route({ method: 'GET', path: '/', handler: handler });
+    server.inject('/', function (res) {
+    console.log(res.result);
+    });
+    */
+    inject: IServerInject;
+
+    /** server.log(tags, [data, [timestamp]])
+    Logs server events that cannot be associated with a specific request. When called the server emits a 'log' event which can be used by other listeners or plugins to record the information or output to the console. The arguments are:
+    tags - a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events. Any logs generated by the server internally include the 'hapi' tag along with event-specific information.
+    data - an optional message string or object with the application data being logged.
+    timestamp - an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    server.on('log', function (event, tags) {
+    if (tags.error) {
+    console.log(event);
+    }
+    });
+    server.log(['test', 'error'], 'Test event');*/
+    log(tags: string | string[], data?: string | any, timestamp?: number): void;
+    /**server.lookup(id)
+    When the server contains exactly one connection, looks up a route configuration where:
+    id - the route identifier as set in the route options.
+    returns the route public interface object if found, otherwise null.
+    var server = new Hapi.Server();
+    server.connection();
+    server.route({
+    method: 'GET',
+    path: '/',
+    config: {
+    handler: function (request, reply) { return reply(); },
+    id: 'root'
+    }
+    });
+    var route = server.lookup('root');
+    When the server contains more than one connection, each server.connections array member provides its own connection.lookup() method.*/
+    lookup(id: string): IRoute;
+    /** server.match(method, path, [host])
+    When the server contains exactly one connection, looks up a route configuration where:
+    method - the HTTP method (e.g. 'GET', 'POST').
+    path - the requested path (must begin with '/').
+    host - optional hostname (to match against routes with vhost).
+    returns the route public interface object if found, otherwise null.
+    var server = new Hapi.Server();
+    server.connection();
+    server.route({
+    method: 'GET',
+    path: '/',
+    config: {
+    handler: function (request, reply) { return reply(); },
+    id: 'root'
+    }
+    });
+    var route = server.match('get', '/');
+    When the server contains more than one connection, each server.connections array member provides its own connection.match() method.*/
+    match(method: string, path: string, host?: string): IRoute;
+
+
+
+
+    /** server.method(name, method, [options])
+    Registers a server method. Server methods are functions registered with the server and used throughout the application as a common utility. Their advantage is in the ability to configure them to use the built-in cache and share across multiple request handlers without having to create a common module.
+    Methods are registered via server.method(name, method, [options])
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    // Simple arguments
+    var add = function (a, b, next) {
+    return next(null, a + b);
+    };
+    server.method('sum', add, { cache: { expiresIn: 2000 } });
+    server.methods.sum(4, 5, function (err, result) {
+    console.log(result);
+    });
+    // Object argument
+    var addArray = function (array, next) {
+    var sum = 0;
+    array.forEach(function (item) {
+    sum += item;
+    });
+    return next(null, sum);
+    };
+    server.method('sumObj', addArray, {
+    cache: { expiresIn: 2000 },
+    generateKey: function (array) {
+    return array.join(',');
+    }
+    });
+    server.methods.sumObj([5, 6], function (err, result) {
+    console.log(result);
+    });
+    // Synchronous method with cache
+    var addSync = function (a, b) {
+    return a + b;
+    };
+    server.method('sumSync', addSync, { cache: { expiresIn: 2000 }, callback: false });
+    server.methods.sumSync(4, 5, function (err, result) {
+    console.log(result);
+    }); */
+    method(
+        /**  a unique method name used to invoke the method via server.methods[name]. When configured with caching enabled, server.methods[name].cache.drop(arg1, arg2, ..., argn, callback) can be used to clear the cache for a given key. Supports using nested names such as utils.users.get which will automatically create the missing path under server.methods and can be accessed for the previous example via server.methods.utils.users.get.*/
+        name: string,
+        method: IServerMethod,
+        options?: IServerMethodOptions): void;
+
+
+    /**server.method(methods)
+    Registers a server method function as described in server.method() using a configuration object where:
+    methods - an object or an array of objects where each one contains:
+    name - the method name.
+    method - the method function.
+    options - optional settings.
+    var add = function (a, b, next) {
+    next(null, a + b);
+    };
+    server.method({
+    name: 'sum',
+    method: add,
+    options: {
+    cache: {
+    expiresIn: 2000
+    }
+    }
+    });*/
+    method(methods: {
+        name: string; method: IServerMethod; options?: IServerMethodOptions
+    } | Array<{
+        name: string; method: IServerMethod; options?: IServerMethodOptions
+    }>): void;
+    /**server.path(relativeTo)
+    Sets the path prefix used to locate static resources (files and view templates) when relative paths are used where:
+    relativeTo - the path prefix added to any relative file path starting with '.'.
+    Note that setting a path within a plugin only applies to resources accessed by plugin methods. If no path is set, the connection files.relativeTo configuration is used. The path only applies to routes added after it has been set.
+    exports.register = function (server, options, next) {
+    server.path(__dirname + '../static');
+    server.route({ path: '/file', method: 'GET', handler: { file: './test.html' } });
+    next();
+    };*/
+    path(relativeTo: string): void;
+    /**server.register(plugins, [options], callback)
+    Registers a plugin where:
+    plugins - an object or array of objects where each one is either:
+    a plugin registration function.
+    an object with the following:
+    register - the plugin registration function.
+    options - optional options passed to the registration function when called.
+    options - optional registration options (different from the options passed to the registration function):
+    select - a string or array of string labels used to pre-select connections for plugin registration.
+    routes - modifiers applied to each route added by the plugin:
+    prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
+    vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
+    callback - the callback function with signature function(err) where:
+    err - an error returned from the registration function. Note that exceptions thrown by the registration function are not handled by the framework.
+    server.register({
+    register: require('plugin_name'),
+    options: {
+    message: 'hello'
+    }
+    }, function (err) {
+    if (err) {
+    console.log('Failed loading plugin');
+    }
+    });*/
+    register(plugins: any | any[], options: {
+        select: string | string[];
+        routes: {
+            prefix: string; vhost?: string | string[]
+        };
+    }
+        , callback: (err: any) => void): void;
+
+    register(plugins: any | any[], callback: (err: any) => void): void;
+
+    /**server.render(template, context, [options], callback)
+    Utilizes the server views manager to render a template where:
+    template - the template filename and path, relative to the views manager templates path (path or relativeTo).
+    context - optional object used by the template to render context-specific result. Defaults to no context ({}).
+    options - optional object used to override the views manager configuration.
+    callback - the callback function with signature function (err, rendered, config) where:
+    err - the rendering error if any.
+    rendered - the result view string.
+    config - the configuration used to render the template.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    server.views({
+    engines: { html: require('handlebars') },
+    path: __dirname + '/templates'
+    });
+    var context = {
+    title: 'Views Example',
+    message: 'Hello, World'
+    };
+    server.render('hello', context, function (err, rendered, config) {
+    console.log(rendered);
+    });*/
+    render(template: string, context: any, options: any, callback: (err: any, rendered: any, config: any) => void): void;
+    /** server.route(options)
+    Adds a connection route where:
+    options - a route configuration object or an array of configuration objects.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    server.route({ method: 'GET', path: '/', handler: function (request, reply) { return reply('ok'); } });
+    server.route([
+    { method: 'GET', path: '/1', handler: function (request, reply) { return reply('ok'); } },
+    { method: 'GET', path: '/2', handler: function (request, reply) { return reply('ok'); } }
+    ]);*/
+    route(options: IRouteConfiguration): void;
+    route(options: IRouteConfiguration[]): void;
+    /**server.select(labels)
+    Selects a subset of the server's connections where:
+    labels - a single string or array of strings of labels used as a logical OR statement to select all the connections with matching labels in their configuration.
+    Returns a server object with connections set to the requested subset. Selecting again on a selection operates as a logic AND statement between the individual selections.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80, labels: ['a'] });
+    server.connection({ port: 8080, labels: ['b'] });
+    server.connection({ port: 8081, labels: ['c'] });
+    server.connection({ port: 8082, labels: ['c','d'] });
+    var a = server.select('a');          // The server with port 80
+    var ab = server.select(['a','b']);   // A list of servers containing the server with port 80 and the server with port 8080
+    var c = server.select('c');          // A list of servers containing the server with port 8081 and the server with port 8082 */
+    select(labels: string | string[]): Server | Server[];
+    /** server.start([callback])
+    Starts the server connections by listening for incoming requests on the configured port of each listener (unless the connection was configured with autoListen set to false), where:
+    callback - optional callback when server startup is completed or failed with the signature function(err) where:
+    err - any startup error condition.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    server.start(function (err) {
+    console.log('Server started at: ' + server.info.uri);
+    });*/
+    start(callback?: (err: any) => void): void;
+    /** server.state(name, [options])
+    HTTP state management uses client cookies to persist a state across multiple requests. Registers a cookie definitions
+    State defaults can be modified via the server connections.routes.state configuration option.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    // Set cookie definition
+    server.state('session', {
+    ttl: 24 * 60 * 60 * 1000,     // One day
+    isSecure: true,
+    path: '/',
+    encoding: 'base64json'
+    });
+    // Set state in route handler
+    var handler = function (request, reply) {
+    var session = request.state.session;
+    if (!session) {
+    session = { user: 'joe' };
+    }
+    session.last = Date.now();
+    return reply('Success').state('session', session);
+    };
+    Registered cookies are automatically parsed when received. Parsing rules depends on the route state.parse configuration. If an incoming registered cookie fails parsing, it is not included in request.state, regardless of the state.failAction setting. When state.failAction is set to 'log' and an invalid cookie value is received, the server will emit a 'request-internal' event. To capture these errors subscribe to the 'request-internal' events and filter on 'error' and 'state' tags:
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    server.on('request-internal', function (request, event, tags) {
+    if (tags.error && tags.state) {
+    console.error(event);
+    }
+    });	*/
+    state(name: string, options?: ICookieSettings): void;
+
+    /** server.stop([options], [callback])
+    Stops the server's connections by refusing to accept any new connections or requests (existing connections will continue until closed or timeout), where:
+    options - optional object with:
+    timeout - overrides the timeout in millisecond before forcefully terminating a connection. Defaults to 5000 (5 seconds).
+    callback - optional callback method with signature function() which is called once all the connections have ended and it is safe to exit the process.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    server.stop({ timeout: 60 * 1000 }, function () {
+    console.log('Server stopped');
+    });*/
+    stop(options?: { timeout: number }, callback?: () => void): void;
+    /**server.table([host])
+    Returns a copy of the routing table where:
+    host - optional host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
+    The return value is an array where each item is an object containing:
+    info - the connection.info the connection the table was generated for.
+    labels - the connection labels.
+    table - an array of routes where each route contains:
+    settings - the route config with defaults applied.
+    method - the HTTP method in lower case.
+    path - the route path.
+    Note that if the server has not been started and multiple connections use port 0, the table items will override each other and will produce an incomplete result.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80, host: 'example.com' });
+    server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
+    var table = server.table();
+    When calling connection.table() directly on each connection, the return value is the same as the array table item value of an individual connection:
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80, host: 'example.com' });
+    server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
+    var table = server.connections[0].table();
+    //[
+    //    {
+    //        method: 'get',
+    //        path: '/example',
+    //        settings: { ... }
+    //    }
+    //]
+    */
+    table(host?: any): IConnectionTable;
+
+    /**server.views(options)
+    Initializes the server views manager
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.views({
+    engines: {
+    html: require('handlebars'),
+    jade: require('jade')
+    },
+    path: '/static/templates'
+    });
+    When server.views() is called within a plugin, the views manager is only available to plugins methods.*/
+    views(options: IServerViewsConfiguration): void;
+
 }
diff --git a/hapi/hapi-tests-8.2.0.ts b/hapi/hapi-tests-8.2.0.ts
index 11ad81d2dd..88ca120e42 100644
--- a/hapi/hapi-tests-8.2.0.ts
+++ b/hapi/hapi-tests-8.2.0.ts
@@ -1,4 +1,4 @@
-/// <reference path="hapi.d.ts" />
+
 
 import Hapi = require("hapi");
 
@@ -22,10 +22,12 @@ plugin.register.attributes = {
 };
 
 // optional options parameter
-server.register({}, function (err) {});
+server.register({}, function (err) {
+});
 
-// optional options.routes.vhost parameter 
-server.register({}, { select: 'api', routes: { prefix: '/prefix' } }, function (err) {});
+// optional options.routes.vhost parameter
+server.register({}, {select: 'api', routes: {prefix: '/prefix'}}, function (err) {
+});
 
 //server.pack.register(plugin, (err: Object) => {
 //	if (err) { throw err; }
@@ -84,15 +86,22 @@ server.route([{
 
 // config.validate parameters should be optional
 server.route([{
-    method: 'GET',
-    path: '/hello2',
-    handler: function(request: Hapi.Request, reply: Function) {
-        reply('hello world2');
-    },
-    config: {
-        validate: {
-        }
-    }
+	method: 'GET',
+	path: '/hello2',
+	handler: function (request: Hapi.Request, reply: Function) {
+		reply('hello world2');
+	},
+	config: {
+		validate: {}
+	}
+}]);
+
+server.route([{
+	method: 'GET',
+	path: '/hello3',
+	handler: function (request: Hapi.Request, reply: Function) {
+		reply().code(201);
+	}
 }]);
 
 // Start the server
diff --git a/hapi/hapi-tests.ts b/hapi/hapi-tests.ts
index 5e02f6b5a5..456b150f72 100644
--- a/hapi/hapi-tests.ts
+++ b/hapi/hapi-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="hapi.d.ts" />
+
 
 import Hapi = require("hapi");
 
@@ -22,17 +22,19 @@ plugin.register.attributes = {
 };
 
 // optional options parameter
-server.register({}, function (err) {});
+server.register({}, function (err) {
+});
 // optional callback function with and without options
 server.register({}).then((res: any) => {
 	console.log(res);
 });
-server.register({}, { select: "api", routes: { prefix: "/prefix" } }).then((res: any) => {
+server.register({}, {select: "api", routes: {prefix: "/prefix"}}).then((res: any) => {
 	console.log(res);
 });
 
 // optional options.routes.vhost parameter
-server.register({}, { select: "api", routes: { prefix: "/prefix" } }, function (err) {});
+server.register({}, {select: "api", routes: {prefix: "/prefix"}}, function (err) {
+});
 
 //server.pack.register(plugin, (err: Object) => {
 //	if (err) { throw err; }
@@ -91,28 +93,29 @@ server.route([{
 
 // config.validate parameters should be optional
 server.route([{
-    method: 'GET',
-    path: '/hello2',
-    handler: function(request: Hapi.Request, reply: Function) {
-        reply('hello world2');
-    },
-    config: {
-        validate: {
-        }
-    }
+	method: 'GET',
+	path: '/hello2',
+	handler: function (request: Hapi.Request, reply: Function) {
+		reply('hello world2');
+	},
+	config: {
+		validate: {}
+	}
 }]);
 
 // Should be able to chain reply options
 server.route([{
-    method: 'GET',
-    path: '/chained-notation',
-    handler: function(request: Hapi.Request, reply: Hapi.IReply) {
-        reply('chained-notation')
-            .bytes(16)
-            .code(200)
-            .type('text/plain')
-            .header('X-Custom', 'some-value');
-    }
+	method: 'GET',
+	path: '/chained-notation',
+	handler: function (request: Hapi.Request, reply: Hapi.IReply) {
+		reply.state('cookie_key', 'cookie_value');
+		reply('chained-notation')
+			.bytes(16)
+			.code(200)
+			.type('text/plain')
+			.unstate('cookie_to_remove')
+			.header('X-Custom', 'some-value');
+	}
 }]);
 
 // Start the server
@@ -120,48 +123,50 @@ server.start();
 
 // server startup may now return a promise
 server.start()
-    .then(() => {
-        console.log('Started!');
-    });
+	.then(() => {
+		console.log('Started!');
+	});
 
 //inject a request into connection
 server.inject({
-    method: 'GET',
-    url: '/hello'
+	method: 'GET',
+	url: '/hello'
 }).then(response => {
-    console.log(response.statusCode);
+	console.log(response.statusCode);
 });
 
 //the same but this time using callback
 server.inject({
-    method: 'GET',
-    url: '/hello'
+	method: 'GET',
+	url: '/hello'
 }, response => {
-    console.log(response.statusCode);
+	console.log(response.statusCode);
 });
 
 //tests for server initialization
 server.initialize()
-    .then(() => {
-        console.log('Initialized!')
-    });
+	.then(() => {
+		console.log('Initialized!')
+	});
 
 //and the same but with callback
 server.initialize(err => {
-    if (err) {
-        console.log(err);
-    }
+	if (err) {
+		console.log(err);
+	}
 });
 
 //server stopping may now return a promise
 server.stop()
-    .then(() => {
-        console.log('Stopped!');
-    });
+	.then(() => {
+		console.log('Stopped!');
+	});
 
 //decorate can take an optional options argument
-server.decorate('hello', 'world', () => {}, {
-    apply: true
+server.decorate('hello', 'world', () => {
+}, {
+	apply: true
 });
 
-server.decorate('hello2', 'world2', () => {});
+server.decorate('hello2', 'world2', () => {
+});
diff --git a/hapi/hapi.d.ts b/hapi/hapi.d.ts
deleted file mode 100644
index bd226eb01e..0000000000
--- a/hapi/hapi.d.ts
+++ /dev/null
@@ -1,2401 +0,0 @@
-// Type definitions for hapi 13.0.0
-// Project: http://github.com/spumko/hapi
-// Definitions by: Jason Swearingen <http://github.com/jasonswearingen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-//Note/Disclaimer: This .d.ts was created against hapi v8.x but has been incrementally upgraded to 13.x.  Some newer features/changes may be missing.  YMMV.
-
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "hapi" {
-    import http = require("http");
-    import stream = require("stream");
-    import Events = require("events");
-
-    interface IDictionary<T> {
-        [key: string]: T;
-    }
-
-    interface IThenable<R> {
-        then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => U | IThenable<U>): IThenable<U>;
-        then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => void): IThenable<U>;
-    }
-
-    interface IPromise<R> extends IThenable<R> {
-        then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => U | IThenable<U>): IPromise<U>;
-        then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => void): IPromise<U>;
-        catch<U>(onRejected?: (error: any) => U | IThenable<U>): IPromise<U>;
-    }
-
-	/** Boom Module for errors. https://github.com/hapijs/boom
-	*  boom provides a set of utilities for returning HTTP errors. Each utility returns a Boom error response object (instance of Error) which includes the following properties:  */
-    export interface IBoom extends Error {
-        /**  if true, indicates this is a Boom object instance.  */
-        isBoom: boolean;
-        /** convenience bool indicating status code >= 500.  */
-        isServer: boolean;
-        /**  the error message.  */
-        message: string;
-        /**  the formatted response.Can be directly manipulated after object construction to return a custom error response.Allowed root keys:  */
-        output: {
-            /** the HTTP status code (typically 4xx or 5xx).  */
-            statusCode: number;
-            /** an object containing any HTTP headers where each key is a header name and value is the header content.  */
-            headers: IDictionary<string>;
-            /** the formatted object used as the response payload (stringified).Can be directly manipulated but any changes will be lost if reformat() is called.Any content allowed and by default includes the following content: */
-            payload: {
-                /** the HTTP status code, derived from error.output.statusCode.  */
-                statusCode: number;
-                /** the HTTP status message (e.g. 'Bad Request', 'Internal Server Error') derived from statusCode.  */
-                error: string;
-                /** the error message derived from error.message. */
-                message: string;
-            };
-        };
-        /**  reformat()rebuilds error.output using the other object properties.  */
-        reformat(): void;
-
-    }
-
-    /** cache functionality via the "CatBox" module. */
-    export interface ICatBoxCacheOptions {
-        /**  a prototype function or catbox engine object.  */
-        engine: any;
-        /**   an identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisions as well.  */
-        name?: string;
-        /**   if true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.  */
-        shared?: boolean;
-    }
-
-    /** Any connections configuration server defaults can be included to override and customize the individual connection. */
-    export interface IServerConnectionOptions extends IConnectionConfigurationServerDefaults {
-        /**  - the public hostname or IP address. Used only to set server.info.host and server.info.uri. If not configured, defaults to the operating system hostname and if not available, to 'localhost'.*/
-        host?: string;
-        /** - sets the host name or IP address the connection will listen on.If not configured, defaults to host if present, otherwise to all available network interfaces (i.e. '0.0.0.0').Set to 127.0.0.1 or localhost to restrict connection to only those coming from the same machine.*/
-        address?: string;
-        /** - the TCP port the connection will listen to.Defaults to an ephemeral port (0) which uses an available port when the server is started (and assigned to server.info.port).If port is a string containing a '/' character, it is used as a UNIX domain socket path and if it starts with '\.\pipe' as a Windows named pipe.*/
-        port?: string | number;
-        /** - the full public URI without the path (e.g. 'http://example.com:8080').If present, used as the connection info.uri otherwise constructed from the connection settings.*/
-        uri?: string;
-        /**  - optional node.js HTTP (or HTTPS) http.Server object or any compatible object.If the listener needs to be manually started, set autoListen to false.If the listener uses TLS, set tls to true.*/
-        listener?: any;
-        /**  - indicates that the connection.listener will be started manually outside the framework.Cannot be specified with a port setting.Defaults to true.*/
-        autoListen?: boolean;
-        /**  caching headers configuration: */
-        cache?: {
-            /** - an array of HTTP response status codes (e.g. 200) which are allowed to include a valid caching directive.Defaults to [200]. */
-            statuses: number[];
-        };
-        /** - a string or string array of labels used to server.select() specific connections matching the specified labels.Defaults to an empty array [](no labels).*/
-        labels?: string | string[];
-        /**  - used to create an HTTPS connection.The tls object is passed unchanged as options to the node.js HTTPS server as described in the node.js HTTPS documentation.Set to true when passing a listener object that has been configured to use TLS directly. */
-        tls?: boolean | { key?: string; cert?: string; pfx?: string; } | Object;
-
-    }
-
-    export interface IConnectionConfigurationServerDefaults {
-        /**  application-specific connection configuration which can be accessed via connection.settings.app. Provides a safe place to store application configuration without potential conflicts with the framework internals. Should not be used to configure plugins which should use plugins[name]. Note the difference between connection.settings.app which is used to store configuration values and connection.app which is meant for storing run-time state.  */
-        app?: any;
-        /**  connection load limits configuration where:  */
-        load?: {
-            /**  maximum V8 heap size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
-            maxHeapUsedBytes: number;
-            /**  maximum process RSS size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
-            maxRssBytes: number;
-            /**  maximum event loop delay duration in milliseconds over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
-            maxEventLoopDelay: number;
-        };
-        /**  plugin-specific configuration which can later be accessed via connection.settings.plugins. Provides a place to store and pass connection-specific plugin configuration. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between connection.settings.plugins which is used to store configuration values and connection.plugins which is meant for storing run-time state. */
-        plugins?: any;
-        /**  controls how incoming request URIs are matched against the routing table: */
-        router?: {
-            /**  determines whether the paths '/example' and '/EXAMPLE' are considered different resources. Defaults to true.  */
-            isCaseSensitive: boolean;
-            /**  removes trailing slashes on incoming paths. Defaults to false.  */
-            stripTrailingSlash: boolean;
-        };
-        /** a route options object used to set the default configuration for every route. */
-        routes?: IRouteAdditionalConfigurationOptions;
-        state?: IServerState;
-    }
-
-    /** Note that the options object is deeply cloned and cannot contain any values that are unsafe to perform deep copy on.*/
-    export interface IServerOptions {
-        /**  application-specific configuration which can later be accessed via server.settings.app. Note the difference between server.settings.app which is used to store static configuration values and server.app which is meant for storing run-time state. Defaults to {}.  */
-        app?: any;
-		/**   sets up server-side caching. Every server includes a default cache for storing application state. By default, a simple memory-based cache is created which has limited capacity and capabilities. hapi uses catbox for its cache which includes support for common storage solutions (e.g. Redis, MongoDB, Memcached, and Riak). Caching is only utilized if methods and plugins explicitly store their state in the cache. The server cache configuration only defines the storage container itself. cache can be assigned:
-		a prototype function (usually obtained by calling require() on a catbox strategy such as require('catbox-redis')).
-		a configuration object with the following options:
-		enginea prototype function or catbox engine object.
-		namean identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisions as well.
-		sharedif true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.
-		other options passed to the catbox strategy used.
-		an array of the above object for configuring multiple cache instances, each with a unique name. When an array of objects is provided, multiple cache connections are established and each array item (except one) must include a name.  */
-        cache?: string | ICatBoxCacheOptions | Array<ICatBoxCacheOptions> | any;
-        /**  sets the default connections configuration which can be overridden by each connection where:  */
-        connections?: IConnectionConfigurationServerDefaults;
-        /** determines which logged events are sent to the console (this should only be used for development and does not affect which events are actually logged internally and recorded). Set to false to disable all console logging, or to an object*/
-        debug?: boolean | {
-            /** - a string array of server log tags to be displayed via console.error() when the events are logged via server.log() as well as internally generated server logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error. */
-            log: string[];
-            /**  - a string array of request log tags to be displayed via console.error() when the events are logged via request.log() as well as internally generated request logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error.*/
-            request: string[];
-        };
-        /** file system related settings*/
-        files?: {
-            /**  sets the maximum number of file etag hash values stored in the etags cache. Defaults to 10000.*/
-            etagsCacheMaxSize?: number;
-        };
-        /**  process load monitoring*/
-        load?: {
-            /**  the frequency of sampling in milliseconds. Defaults to 0 (no sampling).*/
-            sampleInterval?: number;
-        };
-
-        /** options passed to the mimos module (https://github.com/hapijs/mimos) when generating the mime database used by the server and accessed via server.mime.*/
-        mime?: any;
-        /**  if true, does not load the inert (file and directory support), h2o2 (proxy support), and vision (views support) plugins automatically. The plugins can be loaded manually after construction. Defaults to false (plugins loaded). */
-        minimal?: boolean;
-        /** plugin-specific configuration which can later be accessed via server.settings.plugins. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between server.settings.plugins which is used to store static configuration values and server.plugins which is meant for storing run-time state. Defaults to {}.*/
-        plugins?: IDictionary<any>;
-
-    }
-
-    export interface IServerViewCompile {
-        (template: string, options: any): void;
-        (template: string, options: any, callback: (err: any, compiled: (context: any, options: any, callback: (err: any, rendered: boolean) => void) => void) => void): void;
-    }
-
-    export interface IServerViewsAdditionalOptions {
-        /**	path - the root file path used to resolve and load the templates identified when calling reply.view().Defaults to current working directory.*/
-        path?: string;
-		/**partialsPath - the root file path where partials are located.Partials are small segments of template code that can be nested and reused throughout other templates.Defaults to no partials support (empty path).
-		*/
-        partialsPath?: string;
-        /**helpersPath - the directory path where helpers are located.Helpers are functions used within templates to perform transformations and other data manipulations using the template context or other inputs.Each '.js' file in the helpers directory is loaded and the file name is used as the helper name.The files must export a single method with the signature function(context) and return a string.Sub - folders are not supported and are ignored.Defaults to no helpers support (empty path).Note that jade does not support loading helpers this way.*/
-        helpersPath?: string;
-        /**relativeTo - a base path used as prefix for path and partialsPath.No default.*/
-        relativeTo?: string;
-
-        /**layout - if set to true or a layout filename, layout support is enabled.A layout is a single template file used as the parent template for other view templates in the same engine.If true, the layout template name must be 'layout.ext' where 'ext' is the engine's extension. Otherwise, the provided filename is suffixed with the engine's extension and loaded.Disable layout when using Jade as it will handle including any layout files independently.Defaults to false.*/
-        layout?: boolean | string;
-        /**layoutPath - the root file path where layout templates are located (using the relativeTo prefix if present). Defaults to path.*/
-        layoutPath?: string;
-        /**layoutKeyword - the key used by the template engine to denote where primary template content should go.Defaults to 'content'.*/
-        layoutKeywork?: string;
-        /**encoding - the text encoding used by the templates when reading the files and outputting the result.Defaults to 'utf8'.*/
-        encoding?: string;
-        /**isCached - if set to false, templates will not be cached (thus will be read from file on every use).Defaults to true.*/
-        isCached?: boolean;
-        /**allowAbsolutePaths - if set to true, allows absolute template paths passed to reply.view().Defaults to false.*/
-        allowAbsolutePaths?: boolean;
-        /**allowInsecureAccess - if set to true, allows template paths passed to reply.view() to contain '../'.Defaults to false.*/
-        allowInsecureAccess?: boolean;
-        /**compileOptions - options object passed to the engine's compile function. Defaults to empty options {}.*/
-        compileOptions?: any;
-        /**runtimeOptions - options object passed to the returned function from the compile operation.Defaults to empty options {}.*/
-        runtimeOptions?: any;
-        /**contentType - the content type of the engine results.Defaults to 'text/html'.*/
-        contentType?: string;
-        /**compileMode - specify whether the engine compile() method is 'sync' or 'async'.Defaults to 'sync'.*/
-        compileMode?: string;
-        /**context - a global context used with all templates.The global context option can be either an object or a function that takes no arguments and returns a context object.When rendering views, the global context will be merged with any context object specified on the handler or using reply.view().When multiple context objects are used, values from the global context always have lowest precedence.*/
-        context?: any;
-    }
-
-    export interface IServerViewsEnginesOptions extends IServerViewsAdditionalOptions {
-		/**- the npm module used for rendering the templates.The module object must contain: "module", the rendering function. The required function signature depends on the compileMode settings.
-		* If the compileMode is 'sync', the signature is compile(template, options), the return value is a function with signature function(context, options), and the method is allowed to throw errors.If the compileMode is 'async', the signature is compile(template, options, callback) where callback has the signature function(err, compiled) where compiled is a function with signature function(context, options, callback) and callback has the signature function(err, rendered).*/
-        module: {
-            compile?(template: any, options: any): (context: any, options: any) => void;
-            compile?(template: any, options: any, callback: (err: any, compiled: (context: any, options: any, callback: (err: any, rendered: any) => void) => void) => void): void;
-        };
-    }
-
-	/**Initializes the server views manager
-	var Hapi = require('hapi');
-	var server = new Hapi.Server();
-
-	server.views({
-	engines: {
-	html: require('handlebars'),
-	jade: require('jade')
-	},
-	path: '/static/templates'
-	});
-	When server.views() is called within a plugin, the views manager is only available to plugins methods.
-	*/
-    export interface IServerViewsConfiguration extends IServerViewsAdditionalOptions {
-        /** - required object where each key is a file extension (e.g. 'html', 'hbr'), mapped to the npm module used for rendering the templates.Alternatively, the extension can be mapped to an object with the following options:*/
-        engines: IDictionary<any> | IServerViewsEnginesOptions;
-        /**  defines the default filename extension to append to template names when multiple engines are configured and not explicit extension is provided for a given template. No default value.*/
-        defaultExtension?: string;
-    }
-
-	/**  Concludes the handler activity by setting a response and returning control over to the framework where:
-	erran optional error response.
-	resultan optional response payload.
-	Since an request can only have one response regardless if it is an error or success, the reply() method can only result in a single response value. This means that passing both an err and result will only use the err. There is no requirement for either err or result to be (or not) an Error object. The framework will simply use the first argument if present, otherwise the second. The method supports two arguments to be compatible with the common callback pattern of error first.
-	FLOW CONTROL:
-	When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods: hold(), send() */
-    export interface IReply {
-        <T>(err: Error,
-            result?: string | number | boolean | Buffer | stream.Stream | IPromise<T> | T,
-            /**  Note that when used to return both an error and credentials in the authentication methods, reply() must be called with three arguments function(err, null, data) where data is the additional authentication information. */
-            credentialData?: any
-        ): IBoom;
-        /**  Note that if result is a Stream with a statusCode property, that status code will be used as the default response code.  */
-        <T>(result: string | number | boolean | Buffer | stream.Stream | IPromise<T> | T): Response;
-
-		/** Returns control back to the framework without setting a response. If called in the handler, the response defaults to an empty payload with status code 200.
-		  * The data argument is only used for passing back authentication data and is ignored elsewhere. */
-        continue(credentialData?: any): void;
-
-        /** Transmits a file from the file system. The 'Content-Type' header defaults to the matching mime type based on filename extension.  The response flow control rules do not apply. */
-        file(
-            /**   the file path. */
-            path: string,
-            /**  optional settings:  */
-            options?: {
-                /** - an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path*/
-                filename?: string;
-				/** specifies whether to include the 'Content-Disposition' header with the response. Available values:
-				false - header is not included. This is the default value.
-				'attachment'
-				'inline'*/
-                mode?: boolean | string;
-                /**   if true, looks for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.  */
-                lookupCompressed: boolean;
-            }): void;
-		/**  Concludes the handler activity by returning control over to the router with a templatized view response.
-		the response flow control rules apply. */
-
-        view(
-            /**  the template filename and path, relative to the templates path configured via the server views manager. */
-            template: string,
-            /**  optional object used by the template to render context-specific result. Defaults to no context {}. */
-            context?: {},
-            /**  optional object used to override the server's views manager configuration for this response. Cannot override isCached, partialsPath, or helpersPath which are only loaded at initialization.  */
-            options?: any): Response;
-		/** Concludes the handler activity by returning control over to the router and informing the router that a response has already been sent back directly via request.raw.res and that no further response action is needed
-		The response flow control rules do not apply. */
-        close(options?: {
-            /**   if false, the router will not call request.raw.res.end()) to ensure the response was ended. Defaults to true.  */
-            end?: boolean;
-        }): void;
-		/** Proxies the request to an upstream endpoint.
-		the response flow control rules do not apply. */
-
-        proxy(/**  an object including the same keys and restrictions defined by the route proxy handler options. */
-            options: IProxyHandlerConfig): void;
-		/** Redirects the client to the specified uri. Same as calling reply().redirect(uri).
-		he response flow control rules apply. */
-        redirect(uri: string): ResponseRedirect;
-    }
-
-    export interface ISessionHandler {
-        (request: Request, reply: IReply): void;
-    }
-    export interface IRequestHandler<T> {
-        (request: Request): T;
-    }
-
-
-    export interface IFailAction {
-        (source: string, error: any, next: () => void): void
-    }
-    /**  generates a reverse proxy handler */
-    export interface IProxyHandlerConfig {
-        /** the upstream service host to proxy requests to. The same path on the client request will be used as the path on the host.*/
-        host?: string;
-        /** the upstream service port. */
-        port?: number;
-		/**  The protocol to use when making a request to the proxied host:
-		'http'
-		'https'*/
-        protocol?: string;
-        /**  an absolute URI used instead of the incoming host, port, protocol, path, and query. Cannot be used with host, port, protocol, or mapUri.*/
-        uri?: string;
-        /**  if true, forwards the headers sent from the client to the upstream service being proxied to, headers sent from the upstream service will also be forwarded to the client. Defaults to false.*/
-        passThrough?: boolean;
-        /** localStatePassThrough - if false, any locally defined state is removed from incoming requests before being passed upstream. This is a security feature to prevent local state (e.g. authentication cookies) from leaking upstream to other servers along with the cookies intended for those servers. This value can be overridden on a per state basis via the server.state() passThrough option. Defaults to false.*/
-        localStatePassThrough?: boolean;
-        /**acceptEncoding - if false, does not pass-through the 'Accept-Encoding' HTTP header which is useful when using an onResponse post-processing to avoid receiving an encoded response (e.g. gzipped). Can only be used together with passThrough. Defaults to true (passing header).*/
-        acceptEncoding?: boolean;
-        /** rejectUnauthorized - sets the rejectUnauthorized property on the https agent making the request. This value is only used when the proxied server uses TLS/SSL. When set it will override the node.js rejectUnauthorized property. If false then ssl errors will be ignored. When true the server certificate is verified and an 500 response will be sent when verification fails. This shouldn't be used alongside the agent setting as the agent will be used instead. Defaults to the https agent default value of true.*/
-        rejectUnauthorized?: boolean;
-        /**if true, sets the 'X-Forwarded-For', 'X-Forwarded-Port', 'X-Forwarded-Proto' headers when making a request to the proxied upstream endpoint. Defaults to false.*/
-        xforward?: boolean;
-        /** the maximum number of HTTP redirections allowed, to be followed automatically by the handler. Set to false or 0 to disable all redirections (the response will contain the redirection received from the upstream service). If redirections are enabled, no redirections (301, 302, 307, 308) will be passed along to the client, and reaching the maximum allowed redirections will return an error response. Defaults to false.*/
-        redirects?: boolean | number;
-        /**number of milliseconds before aborting the upstream request. Defaults to 180000 (3 minutes).*/
-        timeout?: number;
-		/** a function used to map the request URI to the proxied URI. Cannot be used together with host, port, protocol, or uri. The function signature is function(request, callback) where:
-		request - is the incoming request object.
-		callback - is function(err, uri, headers) where:
-		err - internal error condition.
-		uri - the absolute proxy URI.
-		headers - optional object where each key is an HTTP request header and the value is the header content.*/
-        mapUri?: (request: Request, callback: (err: any, uri: string, headers?: { [key: string]: string }) => void) => void;
-        /**  a custom function for processing the response from the upstream service before sending to the client. Useful for custom error handling of responses from the proxied endpoint or other payload manipulation. Function signature is function(err, res, request, reply, settings, ttl) where: - err - internal or upstream error returned from attempting to contact the upstream proxy. - res - the node response object received from the upstream service. res is a readable stream (use the wreck module read method to easily convert it to a Buffer or string). - request - is the incoming request object. - reply - the reply interface function. - settings - the proxy handler configuration. - ttl - the upstream TTL in milliseconds if proxy.ttl it set to 'upstream' and the upstream response included a valid 'Cache-Control' header with 'max-age'.*/
-        onResponse?: (
-            err: any,
-            res: http.ServerResponse,
-            req: Request,
-            reply: IReply,
-            settings: IProxyHandlerConfig,
-            ttl: number
-        ) => void;
-        /** if set to 'upstream', applies the upstream response caching policy to the response using the response.ttl() method (or passed as an argument to the onResponse method if provided).*/
-        ttl?: number;
-        /** - a node http(s) agent to be used for connections to upstream server.  see https://nodejs.org/api/http.html#http_class_http_agent */
-        agent?: http.Agent;
-        /** sets the maximum number of sockets available per outgoing proxy host connection. false means use the wreck module default value (Infinity). Does not affect non-proxy outgoing client connections. Defaults to Infinity.*/
-        maxSockets?: boolean | number;
-    }
-    /**  TODO: fill in joi definition  */
-    export interface IJoi {
-
-    }
-    /**  a validation function using the signature function(value, options, next) */
-    export interface IValidationFunction {
-
-        (/**   the object containing the path parameters. */
-            value: any,
-            /**  the server validation options. */
-            options: any,
-            /**   the callback function called when validation is completed.  */
-            next: (err: any, value: any) => void): void;
-    }
-    /**  a custom error handler function with the signature 'function(request, reply, source, error)` */
-    export interface IRouteFailFunction {
-        /**  a custom error handler function with the signature 'function(request, reply, source, error)` */
-        (
-            /** - the [request object]. */
-            request: Request,
-            /**   the continuation reply interface. */
-            reply: IReply,
-            /**  the source of the invalid field (e.g. 'path', 'query', 'payload'). */
-            source: string,
-            /**  the error object prepared for the client response (including the validation function error under error.data). */
-            error: any): void;
-    }
-
-    /**  Each route can be customize to change the default behavior of the request lifecycle using the following options:  */
-    export interface IRouteAdditionalConfigurationOptions {
-        /**  application specific configuration.Should not be used by plugins which should use plugins[name] instead. */
-        app?: any;
-		/** authentication configuration.Value can be: false to disable authentication if a default strategy is set.
-		a string with the name of an authentication strategy registered with server.auth.strategy().
-		an object  */
-        auth?: boolean | string |
-        {
-			/**  the authentication mode.Defaults to 'required' if a server authentication strategy is configured, otherwise defaults to no authentication.Available values:
-			'required'authentication is required.
-			'optional'authentication is optional (must be valid if present).
-			'try'same as 'optional' but allows for invalid authentication. */
-            mode?: string;
-            /**  a string array of strategy names in order they should be attempted.If only one strategy is used, strategy can be used instead with the single string value.Defaults to the default authentication strategy which is available only when a single strategy is configured.  */
-            strategies?: string | Array<string>;
-			/**  if set, the payload (in requests other than 'GET' and 'HEAD') is authenticated after it is processed.Requires a strategy with payload authentication support (e.g.Hawk).Cannot be set to a value other than 'required' when the scheme sets the options.payload to true.Available values:
-			falseno payload authentication.This is the default value.
-			'required'payload authentication required.This is the default value when the scheme sets options.payload to true.
-			'optional'payload authentication performed only when the client includes payload authentication information (e.g.hash attribute in Hawk). */
-            payload?: string;
-            /**  the application scope required to access the route.Value can be a scope string or an array of scope strings.The authenticated credentials object scope property must contain at least one of the scopes defined to access the route.Set to false to remove scope requirements.Defaults to no scope required.  */
-            scope?: string | Array<string> | boolean;
-			/** the required authenticated entity type.If set, must match the entity value of the authentication credentials.Available values:
-			anythe authentication can be on behalf of a user or application.This is the default value.
-			userthe authentication must be on behalf of a user.
-			appthe authentication must be on behalf of an application. */
-            entity?: string;
-			/**
-			* an object or array of objects specifying the route access rules. Each rule is evaluated against an incoming
-			* request and access is granted if at least one rule matches. Each rule object must include at least one of:
-			*/
-            access?: IRouteAdditionalConfigurationAuthAccess | IRouteAdditionalConfigurationAuthAccess[];
-        };
-        /** an object passed back to the provided handler (via this) when called. */
-        bind?: any;
-        /** if the route method is 'GET', the route can be configured to include caching directives in the response using the following options */
-        cache?: {
-			/**  mines the privacy flag included in clientside caching using the 'Cache-Control' header.Values are:
-			fault'no privacy flag.This is the default setting.
-			'public'mark the response as suitable for public caching.
-			'private'mark the response as suitable only for private caching.  */
-            privacy: string;
-            /**  relative expiration expressed in the number of milliseconds since the item was saved in the cache.Cannot be used together with expiresAt. */
-            expiresIn: number;
-            /**  time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire.Cannot be used together with expiresIn.  */
-            expiresAt: string;
-        };
-        /** the Cross- Origin Resource Sharing protocol allows browsers to make cross- origin API calls.CORS is required by web applications running inside a browser which are loaded from a different domain than the API server.CORS headers are disabled by default. To enable, set cors to true, or to an object with the following options: */
-        cors?: {
-            /** a strings array of allowed origin servers ('Access-Control-Allow-Origin').The array can contain any combination of fully qualified origins along with origin strings containing a wildcard '' character, or a single `''origin string. Defaults to any origin['*']`. */
-            origin?: Array<string>;
-            /** if true, matches the value of the incoming 'Origin' header to the list of origin values ('*' matches anything) and if a match is found, uses that as the value of the 'Access-Control-Allow-Origin' response header.When false, the origin config is returned as- is.Defaults to true.  */
-            matchOrigin?: boolean;
-            /** if false, prevents the connection from returning the full list of non- wildcard origin values if the incoming origin header does not match any of the values.Has no impact if matchOrigin is set to false.Defaults to true. */
-            isOriginExposed?: boolean;
-            /**  number of seconds the browser should cache the CORS response ('Access-Control-Max-Age').The greater the value, the longer it will take before the browser checks for changes in policy.Defaults to 86400 (one day). */
-            maxAge?: number;
-            /**  a strings array of allowed headers ('Access-Control-Allow-Headers').Defaults to ['Authorization', 'Content-Type', 'If-None-Match']. */
-            headers?: string[];
-            /**  a strings array of additional headers to headers.Use this to keep the default headers in place. */
-            additionalHeaders?: string[];
-            /**  a strings array of allowed HTTP methods ('Access-Control-Allow-Methods').Defaults to ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'OPTIONS']. */
-            methods?: string[];
-            /**  a strings array of additional methods to methods.Use this to keep the default methods in place. */
-            additionalMethods?: string[];
-            /**  a strings array of exposed headers ('Access-Control-Expose-Headers').Defaults to ['WWW-Authenticate', 'Server-Authorization']. */
-            exposedHeaders?: string[];
-            /**  a strings array of additional headers to exposedHeaders.Use this to keep the default headers in place. */
-            additionalExposedHeaders?: string[];
-            /**  if true, allows user credentials to be sent ('Access-Control-Allow-Credentials').Defaults to false. */
-            credentials?: boolean;
-            /** if false, preserves existing CORS headers set manually before the response is sent.Defaults to true. */
-            override?: boolean;
-        };
-        /**   defines the behavior for serving static resources using the built-in route handlers for files and directories: */
-        files?: {/** determines the folder relative paths are resolved against when using the file and directory handlers. */
-            relativeTo: string;
-        };
-
-        /**  an alternative location for the route handler option. */
-        handler?: ISessionHandler | string | IRouteHandlerConfig;
-        /** an optional unique identifier used to look up the route using server.lookup(). */
-        id?: number;
-        /** optional arguments passed to JSON.stringify() when converting an object or error response to a string payload.Supports the following: */
-        json?: {
-            /** the replacer function or array.Defaults to no action. */
-            replacer?: Function | string[];
-            /**  number of spaces to indent nested object keys.Defaults to no indentation. */
-            space?: number | string;
-            /** string suffix added after conversion to JSON string.Defaults to no suffix. */
-            suffix?: string;
-        };
-        /** enables JSONP support by setting the value to the query parameter name containing the function name used to wrap the response payload.For example, if the value is 'callback', a request comes in with 'callback=me', and the JSON response is '{ "a":"b" }', the payload will be 'me({ "a":"b" });'.Does not work with stream responses. */
-        jsonp?: string;
-        /** determines how the request payload is processed: */
-        payload?: {
-			/**  the type of payload representation requested. The value must be one of:
-			'data'the incoming payload is read fully into memory.If parse is true, the payload is parsed (JSON, formdecoded, multipart) based on the 'Content- Type' header.If parse is false, the raw Buffer is returned.This is the default value except when a proxy handler is used.
-			'stream'the incoming payload is made available via a Stream.Readable interface.If the payload is 'multipart/form-data' and parse is true, fields values are presented as text while files are provided as streams.File streams from a 'multipart/form-data' upload will also have a property hapi containing filename and headers properties.
-			'file'the incoming payload in written to temporary file in the directory specified by the server's payload.uploads settings. If the payload is 'multipart/ formdata' and parse is true, fields values are presented as text while files are saved. Note that it is the sole responsibility of the application to clean up the files generated by the framework. This can be done by keeping track of which files are used (e.g. using the request.app object), and listening to the server 'response' event to perform any needed cleaup. */
-            output?: string;
-			/**  can be true, false, or gunzip; determines if the incoming payload is processed or presented raw. true and gunzip includes gunzipping when the appropriate 'Content-Encoding' is specified on the received request. If parsing is enabled and the 'Content-Type' is known (for the whole payload as well as parts), the payload is converted into an object when possible. If the format is unknown, a Bad Request (400) error response is sent. Defaults to true, except when a proxy handler is used. The supported mime types are:
-			'application/json'
-			'application/x-www-form-urlencoded'
-			'application/octet-stream'
-			'text/ *'
-			'multipart/form-data' */
-            parse?: string | boolean;
-            /** a string or an array of strings with the allowed mime types for the endpoint.Defaults to any of the supported mime types listed above.Note that allowing other mime types not listed will not enable them to be parsed, and that if parsing mode is 'parse', the request will result in an error response. */
-            allow?: string | string[];
-            /** a mime type string overriding the 'Content-Type' header value received.Defaults to no override. */
-            override?: string;
-            /**  limits the size of incoming payloads to the specified byte count.Allowing very large payloads may cause the server to run out of memory.Defaults to 1048576 (1MB).  */
-            maxBytes?: number;
-            /** payload reception timeout in milliseconds.Sets the maximum time allowed for the client to transmit the request payload (body) before giving up and responding with a Request Timeout (408) error response.Set to false to disable.Defaults to 10000 (10 seconds). */
-            timeout?: number;
-            /**  the directory used for writing file uploads.Defaults to os.tmpDir(). */
-            uploads?: string;
-			/**  determines how to handle payload parsing errors. Allowed values are:
-			'error'return a Bad Request (400) error response. This is the default value.
-			'log'report the error but continue processing the request.
-			'ignore'take no action and continue processing the request. */
-            failAction?: string;
-        };
-        /** pluginspecific configuration.plugins is an object where each key is a plugin name and the value is the plugin configuration.  */
-        plugins?: IDictionary<any>;
-        /** an array with [route prerequisites] methods which are executed in serial or in parallel before the handler is called.  */
-        pre?: any[];
-        /** validation rules for the outgoing response payload (response body).Can only validate object response: */
-        response?: {
-            /** the default HTTP status code when the payload is empty. Value can be 200 or 204.
-            Note that a 200 status code is converted to a 204 only at the time or response transmission
-            (the response status code will remain 200 throughout the request lifecycle unless manually set). Defaults to 200. */
-            emptyStatusCode?: number;
-			/**   the default response object validation rules (for all non-error responses) expressed as one of:
-			true - any payload allowed (no validation performed). This is the default.
-			false - no payload allowed.
-			a Joi validation object.
-			a validation function using the signature function(value, options, next) where:
-			value - the object containing the response object.
-			options - the server validation options.
-			next(err) - the callback function called when validation is completed.  */
-            schema?: boolean | any;
-            /** HTTP status- codespecific validation rules.The status key is set to an object where each key is a 3 digit HTTP status code and the value has the same definition as schema.If a response status code is not present in the status object, the schema definition is used, expect for errors which are not validated by default.  */
-            status?: { [statusCode: number] : boolean | any };
-            /** the percent of responses validated (0100).Set to 0 to disable all validation.Defaults to 100 (all responses). */
-            sample?: number;
-			/**  defines what to do when a response fails validation.Options are:
-			errorreturn an Internal Server Error (500) error response.This is the default value.
-			loglog the error but send the response.  */
-            failAction?: string;
-            /** if true, applies the validation rule changes to the response.Defaults to false. */
-            modify?: boolean;
-            /** options to pass to Joi.Useful to set global options such as stripUnknown or abortEarly (the complete list is available here: https://github.com/hapijs/joi#validatevalue-schema-options-callback ).Defaults to no options.  */
-            options?: any;
-        };
-        /** sets common security headers (disabled by default).To enable set security to true or to an object with the following options */
-        security?: boolean | {
-            /** controls the 'Strict-Transport-Security' header.If set to true the header will be set to max- age=15768000, if specified as a number the maxAge parameter will be set to that number.Defaults to true.You may also specify an object with the following fields: */
-            hsts?: boolean | number | {
-                /** the max- age portion of the header, as a number.Default is 15768000. */
-                maxAge?: number;
-                /**  a boolean specifying whether to add the includeSubdomains flag to the header. */
-                includeSubdomains?: boolean;
-                /** a boolean specifying whether to add the 'preload' flag (used to submit domains inclusion in Chrome's HTTP Strict Transport Security (HSTS) preload list) to the header. */
-                preload?: boolean;
-            };
-            /** controls the 'X-Frame-Options' header.When set to true the header will be set to DENY, you may also specify a string value of 'deny' or 'sameorigin'.To use the 'allow-from' rule, you must set this to an object with the following fields: */
-            xframe?: {
-                /** either 'deny', 'sameorigin', or 'allow-from' */
-                rule: string;
-                /** when rule is 'allow-from' this is used to form the rest of the header, otherwise this field is ignored.If rule is 'allow-from' but source is unset, the rule will be automatically changed to 'sameorigin'. */
-                source: string;
-            };
-            /** boolean that controls the 'X-XSS-PROTECTION' header for IE.Defaults to true which sets the header to equal '1; mode=block'.NOTE: This setting can create a security vulnerability in versions of IE below 8, as well as unpatched versions of IE8.See here and here for more information.If you actively support old versions of IE, it may be wise to explicitly set this flag to false. */
-            xss?: boolean;
-            /**  boolean controlling the 'X-Download-Options' header for IE, preventing downloads from executing in your context.Defaults to true setting the header to 'noopen'. */
-            noOpen?: boolean;
-            /** boolean controlling the 'X-Content-Type-Options' header.Defaults to true setting the header to its only and default option, 'nosniff'. */
-            noSniff?: boolean;
-        };
-        /** HTTP state management (cookies) allows the server to store information on the client which is sent back to the server with every request (as defined in RFC 6265).state supports the following options: */
-        state?: {
-            /** determines if incoming 'Cookie' headers are parsed and stored in the request.state object.Defaults to true. */
-            parse: boolean;
-			/** determines how to handle cookie parsing errors.Allowed values are:
-			'error'return a Bad Request (400) error response.This is the default value.
-			'log'report the error but continue processing the request.
-			'ignore'take no action. */
-            failAction: string;
-        };
-        /**  request input validation rules for various request components.When using a Joi validation object, the values of the other inputs (i.e.headers, query, params, payload, and auth) are made available under the validation context (accessible in rules as Joi.ref('$query.key')).Note that validation is performed in order(i.e.headers, params, query, payload) and if type casting is used (converting a string to number), the value of inputs not yet validated will reflect the raw, unvalidated and unmodified values.The validate object supports: */
-        validate?: {
-			/** validation rules for incoming request headers.Values allowed:
-			* trueany headers allowed (no validation performed).This is the default.
-			falseno headers allowed (this will cause all valid HTTP requests to fail).
-			a Joi validation object.
-			a validation function using the signature function(value, options, next) where:
-			valuethe object containing the request headers.
-			optionsthe server validation options.
-			next(err, value)the callback function called when validation is completed.
-			*/
-            headers?: boolean | IJoi | IValidationFunction;
-
-
-			/** validation rules for incoming request path parameters, after matching the path against the route and extracting any parameters then stored in request.params.Values allowed:
-			trueany path parameters allowed (no validation performed).This is the default.
-			falseno path variables allowed.
-			a Joi validation object.
-			a validation function using the signature function(value, options, next) where:
-			valuethe object containing the path parameters.
-			optionsthe server validation options.
-			next(err, value)the callback function called when validation is completed. */
-            params?: boolean | IJoi | IValidationFunction;
-			/** validation rules for an incoming request URI query component (the key- value part of the URI between '?' and '#').The query is parsed into its individual key- value pairs (using the qs module) and stored in request.query prior to validation.Values allowed:
-			trueany query parameters allowed (no validation performed).This is the default.
-			falseno query parameters allowed.
-			a Joi validation object.
-			a validation function using the signature function(value, options, next) where:
-			valuethe object containing the query parameters.
-			optionsthe server validation options.
-			next(err, value)the callback function called when validation is completed. */
-            query?: boolean | IJoi | IValidationFunction;
-			/**  validation rules for an incoming request payload (request body).Values allowed:
-			trueany payload allowed (no validation performed).This is the default.
-			falseno payload allowed.
-			a Joi validation object.
-			a validation function using the signature function(value, options, next) where:
-			valuethe object containing the payload object.
-			optionsthe server validation options.
-			next(err, value)the callback function called when validation is completed.  */
-            payload?: boolean | IJoi | IValidationFunction;
-            /** an optional object with error fields copied into every validation error response. */
-            errorFields?: any;
-			/** determines how to handle invalid requests.Allowed values are:
-			'error'return a Bad Request (400) error response.This is the default value.
-			'log'log the error but continue processing the request.
-			'ignore'take no action.
-			OR a custom error handler function with the signature 'function(request, reply, source, error)` where:
-			requestthe request object.
-			replythe continuation reply interface.
-			sourcethe source of the invalid field (e.g. 'path', 'query', 'payload').
-			errorthe error object prepared for the client response (including the validation function error under error.data). */
-            failAction?: string | IRouteFailFunction;
-            /** options to pass to Joi.Useful to set global options such as stripUnknown or abortEarly (the complete list is available here: https://github.com/hapijs/joi#validatevalue-schema-options-callback ).Defaults to no options. */
-            options?: any;
-        };
-        /** define timeouts for processing durations: */
-        timeout?: {
-            /** response timeout in milliseconds.Sets the maximum time allowed for the server to respond to an incoming client request before giving up and responding with a Service Unavailable (503) error response.Disabled by default (false). */
-            server: boolean | number;
-            /** by default, node sockets automatically timeout after 2 minutes.Use this option to override this behavior.Defaults to undefined which leaves the node default unchanged.Set to false to disable socket timeouts. */
-            socket: boolean | number;
-        };
-
-		/**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
-		*route description used for generating documentation (string).
-		*/
-        description?: string;
-		/**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
-		*route notes used for generating documentation (string or array of strings).
-		*/
-        notes?: string | string[];
-		/**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
-		*route tags used for generating documentation (array of strings).
-		*/
-        tags?: string[]
-    }
-
-	/**
-	* specifying the route access rules. Each rule is evaluated against an incoming request and access is granted if at least one rule matches
-	*/
-    export interface IRouteAdditionalConfigurationAuthAccess {
-		/**
-		* the application scope required to access the route. Value can be a scope string or an array of scope strings.
-		* The authenticated credentials object scope property must contain at least one of the scopes defined to access the route.
-		* If a scope string begins with a + character, that scope is required. If a scope string begins with a ! character,
-		* that scope is forbidden. For example, the scope ['!a', '+b', 'c', 'd'] means the incoming request credentials'
-		* scope must not include 'a', must include 'b', and must include on of 'c' or 'd'. You may also access properties
-		* on the request object (query and params} to populate a dynamic scope by using {} characters around the property name,
-		* such as 'user-{params.id}'. Defaults to false (no scope requirements).
-		*/
-        scope?: string | Array<string> | boolean;
-		/** the required authenticated entity type. If set, must match the entity value of the authentication credentials. Available values:
-		* any - the authentication can be on behalf of a user or application. This is the default value.
-		* user - the authentication must be on behalf of a user which is identified by the presence of a user attribute in the credentials object returned by the authentication strategy.
-		* app - the authentication must be on behalf of an application which is identified by the lack of presence of a user attribute in the credentials object returned by the authentication strategy.
-		*/
-        entity?: string;
-    }
-
-	/** server.realm http://hapijs.com/api#serverrealm
-	The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(),
-	the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin).
-	Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
-	The server.realm object should be considered read-only and must not be changed directly except for the plugins property can be directly manipulated by the plugins (each setting its own under plugins[name]).
-	exports.register = function (server, options, next) {
-	console.log(server.realm.modifiers.route.prefix);
-	return next();
-	};
-	*/
-    export interface IServerRealm {
-        /** when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method */
-        modifiers: {
-            /** routes preferences: */
-            route: {
-                /** - the route path prefix used by any calls to server.route() from the server. */
-                prefix: string;
-                /**  the route virtual host settings used by any calls to server.route() from the server. */
-                vhost: string;
-            };
-
-        };
-        /** the active plugin name (empty string if at the server root). */
-        plugin: string;
-        /** plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state. */
-        plugins: IDictionary<any>;
-        /**  settings overrides */
-        settings: {
-            files: {
-                relativeTo: any;
-            };
-            bind: any;
-        }
-    }
-	/** server.state(name, [options]) http://hapijs.com/api#serverstatename-options
-	HTTP state management uses client cookies to persist a state across multiple requests. Registers a cookie definitions where:*/
-    export interface IServerState {
-/**  - the cookie name string. */name: string;
-
-/** - are the optional cookie settings: */options: {
-/**  - time - to - live in milliseconds.Defaults to null (session time- life - cookies are deleted when the browser is closed).*/ttl: number;
-/**  - sets the 'Secure' flag.Defaults to false.*/isSecure: boolean;
-/**  - sets the 'HttpOnly' flag.Defaults to false.*/isHttpOnly: boolean
-/**  - the path scope.Defaults to null (no path).*/path: any;
-/**  - the domain scope.Defaults to null (no domain). */domain: any;
-			/**  if present and the cookie was not received from the client or explicitly set by the route handler, the cookie is automatically added to the response with the provided value. The value can be a function with signature function(request, next) where:
-			request - the request object.
-			next - the continuation function using the function(err, value) signature.*/
-            autoValue: (request: Request, next: (err: any, value: any) => void) => void;
-			/**  - encoding performs on the provided value before serialization. Options are:
-			'none' - no encoding. When used, the cookie value must be a string. This is the default value.
-			'base64' - string value is encoded using Base64.
-			'base64json' - object value is JSON-stringified than encoded using Base64.
-			'form' - object value is encoded using the x-www-form-urlencoded method.
-			'iron' - Encrypts and sign the value using iron.*/
-            encoding: string;
-/**  - an object used to calculate an HMAC for cookie integrity validation.This does not provide privacy, only a mean to verify that the cookie value was generated by the server.Redundant when 'iron' encoding is used.Options are:*/sign: {
-/** - algorithm options.Defaults to require('iron').defaults.integrity.*/integrity: any;
-/** - password used for HMAC key generation.*/password: string;
-            };
-/**  - password used for 'iron' encoding.*/password: string;
-/** - options for 'iron' encoding.Defaults to require('iron').defaults.*/iron: any;
-/** - if false, errors are ignored and treated as missing cookies.*/ignoreErrors: boolean;
-/**  - if true, automatically instruct the client to remove invalid cookies.Defaults to false.*/clearInvalid: boolean;
-/**  - if false, allows any cookie value including values in violation of RFC 6265. Defaults to true.*/strictHeader: boolean;
-/**  - overrides the default proxy localStatePassThrough setting.*/passThrough: any;
-        };
-    }
-
-    export interface IFileHandlerConfig {
-        /**  a path string or function as described above.*/
-        path: string;
-        /** an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path*/
-        filename?: string;
-		/**- specifies whether to include the 'Content-Disposition' header with the response. Available values:
-		false - header is not included. This is the default value.
-		'attachment'
-		'inline'*/
-        mode?: boolean | string;
-        /** if true, looks for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.*/
-        lookupCompressed: boolean;
-    }
-
-	/**http://hapijs.com/api#route-handler
-	Built-in handlers
-
-	The framework comes with a few built-in handler types available by setting the route handler config to an object containing one of these keys.*/
-    export interface IRouteHandlerConfig {
-		/** generates a static file endpoint for serving a single file. file can be set to:
-					a relative or absolute file path string (relative paths are resolved based on the route files configuration).
-		a function with the signature function(request) which returns the relative or absolute file path.
-		an object with the following options */
-        file?: string | IRequestHandler<void> | IFileHandlerConfig;
-		/** directory - generates a directory endpoint for serving static content from a directory. Routes using the directory handler must include a path parameter at the end of the path string (e.g. /path/to/somewhere/{param} where the parameter name does not matter). The path parameter can use any of the parameter options (e.g. {param} for one level files only, {param?} for one level files or the directory root, {param*} for any level, or {param*3} for a specific level). If additional path parameters are present, they are ignored for the purpose of selecting the file system resource. The directory handler is an object with the following options:
-					path - (required) the directory root path (relative paths are resolved based on the route files configuration). Value can be:
-		a single path string used as the prefix for any resources requested by appending the request path parameter to the provided string.
-		an array of path strings. Each path will be attempted in order until a match is found (by following the same process as the single path string).
-		a function with the signature function(request) which returns the path string or an array of path strings. If the function returns an error, the error is passed back to the client in the response.
-		index - optional boolean|string|string[], determines if an index file will be served if found in the folder when requesting a directory. The given string or strings specify the name(s) of the index file to look for. If true, looks for 'index.html'. Any falsy value disables index file lookup. Defaults to true.
-		listing - optional boolean, determines if directory listing is generated when a directory is requested without an index document. Defaults to false.
-		showHidden - optional boolean, determines if hidden files will be shown and served. Defaults to false.
-		redirectToSlash - optional boolean, determines if requests for a directory without a trailing slash are redirected to the same path with the missing slash. Useful for ensuring relative links inside the response are resolved correctly. Disabled when the server config router.stripTrailingSlash is true.Defaults to false.
-		lookupCompressed - optional boolean, instructs the file processor to look for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.
-		defaultExtension - optional string, appended to file requests if the requested file is not found. Defaults to no extension.*/
-        directory?: {
-            path: string | Array<string> | IRequestHandler<string> | IRequestHandler<Array<string>>;
-            index?: boolean | string | string[];
-            listing?: boolean;
-            showHidden?: boolean;
-            redirectToSlash?: boolean;
-            lookupCompressed?: boolean;
-            defaultExtension?: string;
-        };
-        proxy?: IProxyHandlerConfig;
-        view?: string | {
-            template: string;
-            context: {
-                payload: any;
-                params: any;
-                query: any;
-                pre: any;
-            }
-        };
-        config?: {
-            handler: any;
-            bind: any;
-            app: any;
-            plugins: {
-                [name: string]: any;
-            };
-            pre: Array<() => void>;
-            validate: {
-                headers: any;
-                params: any;
-                query: any;
-                payload: any;
-                errorFields?: any;
-                failAction?: string | IFailAction;
-            };
-            payload: {
-                output: {
-                    data: any;
-                    stream: any;
-                    file: any;
-                };
-                parse?: any;
-                allow?: string | Array<string>;
-                override?: string;
-                maxBytes?: number;
-                uploads?: number;
-                failAction?: string;
-            };
-            response: {
-                schema: any;
-                sample: number;
-                failAction: string;
-            };
-            cache: {
-                privacy: string;
-                expiresIn: number;
-                expiresAt: number;
-            };
-            auth: string | boolean | {
-                mode: string;
-                strategies: Array<string>;
-                payload?: boolean | string;
-                tos?: boolean | string;
-                scope?: string | Array<string>;
-                entity: string;
-            };
-            cors?: boolean;
-            jsonp?: string;
-            description?: string;
-            notes?: string | Array<string>;
-            tags?: Array<string>;
-        };
-    }
-	/** Route configuration
-	The route configuration object*/
-    export interface IRouteConfiguration {
-        /**  - (required) the absolute path used to match incoming requests (must begin with '/'). Incoming requests are compared to the configured paths based on the connection router configuration option.The path can include named parameters enclosed in {} which will be matched against literal values in the request as described in Path parameters.*/
-        path: string;
-		/** - (required) the HTTP method.Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'.Any HTTP method is allowed, except for 'HEAD'.Use '*' to match against any HTTP method (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match).
-		* Can be assigned an array of methods which has the same result as adding the same route with different methods manually.*/
-        method: string | string[];
-        /**  - an optional domain string or an array of domain strings for limiting the route to only requests with a matching host header field.Matching is done against the hostname part of the header only (excluding the port).Defaults to all hosts.*/
-        vhost?: string;
-        /**  - (required) the function called to generate the response after successful authentication and validation.The handler function is described in Route handler.If set to a string, the value is parsed the same way a prerequisite server method string shortcut is processed.Alternatively, handler can be assigned an object with a single key using the name of a registered handler type and value with the options passed to the registered handler.*/
-        handler: ISessionHandler | string | IRouteHandlerConfig;
-        /** - additional route options.*/
-        config?: IRouteAdditionalConfigurationOptions;
-    }
-    /** Route public interface When route information is returned or made available as a property.  http://hapijs.com/api#route-public-interface */
-    export interface IRoute {
-
-
-        /** the route HTTP method. */
-        method: string;
-        /** the route path. */
-        path: string;
-        /** the route vhost option if configured. */
-        vhost?: string | Array<string>;
-        /** the [active realm] associated with the route.*/
-        realm: IServerRealm;
-        /** the [route options]  object with all defaults applied. */
-        settings: IRouteAdditionalConfigurationOptions;
-    }
-
-    export interface IServerAuthScheme {
-		/** authenticate(request, reply) - required function called on each incoming request configured with the authentication scheme where:
-		request - the request object.
-		reply - the reply interface the authentication method must call when done authenticating the request where:
-		reply(err, response, result) - is called if authentication failed where:
-		err - any authentication error.
-		response - any authentication response action such as redirection. Ignored if err is present, otherwise required.
-		result - an object containing:
-		credentials - the authenticated credentials.
-		artifacts - optional authentication artifacts.
-		reply.continue(result) - is called if authentication succeeded where:
-		result - same object as result above.
-		When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted if configured for the route.
-		.If the err returned by the reply() method includes a message, no additional strategies will be attempted.
-		If the err does not include a message but does include a scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in order of preference.
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		var scheme = function (server, options) {
-		return {
-		authenticate: function (request, reply) {
-		var req = request.raw.req;
-		var authorization = req.headers.authorization;
-		if (!authorization) {
-		return reply(Boom.unauthorized(null, 'Custom'));
-		}
-		return reply(null, { credentials: { user: 'john' } });
-		}
-		};
-		};
-		server.auth.scheme('custom', scheme);*/
-        authenticate(request: Request, reply: IReply): void;
-		/** payload(request, reply) - optional function called to authenticate the request payload where:
-		request - the request object.
-		reply(err, response) - is called if authentication failed where:
-		err - any authentication error.
-		response - any authentication response action such as redirection. Ignored if err is present, otherwise required.
-		reply.continue() - is called if payload authentication succeeded.
-		When the scheme payload() method returns an error with a message, it means payload validation failed due to bad payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')), authentication may still be successful if the route auth.payload configuration is set to 'optional'.*/
-        payload?(request: Request, reply: IReply): void;
-		/** response(request, reply) - optional function called to decorate the response with authentication headers before the response headers or payload is written where:
-		request - the request object.
-		reply(err, response) - is called if an error occurred where:
-		err - any authentication error.
-		response - any authentication response to send instead of the current response. Ignored if err is present, otherwise required.
-		reply.continue() - is called if the operation succeeded.*/
-        response?(request: Request, reply: IReply): void;
-        /** an optional object  */
-        options?: {
-            /**  if true, requires payload validation as part of the scheme and forbids routes from disabling payload auth validation. Defaults to false.*/
-            payload: boolean;
-        }
-    }
-
-    /**the response object where:
-     statusCode - the HTTP status code.
-     headers - an object containing the headers set.
-     payload - the response payload string.
-     rawPayload - the raw response payload buffer.
-     raw - an object with the injection request and response objects:
-     req - the simulated node request object.
-     res - the simulated node response object.
-     result - the raw handler response (e.g. when not a stream or a view) before it is serialized for transmission. If not available, the value is set to payload. Useful for inspection and reuse of the internal objects returned (instead of parsing the response string).
-     request - the request object.*/
-    export interface IServerInjectResponse {
-        statusCode: number;
-        headers: IDictionary<string>;
-        payload: string;
-        rawPayload: Buffer;
-        raw: {
-            req: http.ClientRequest;
-            res: http.ServerResponse
-        };
-        result: string;
-        request: Request;
-    }
-
-    export interface IServerInject {
-        (options: string | IServerInjectOptions, callback: (res: IServerInjectResponse) => void): void;
-        (options: string | IServerInjectOptions): IPromise<IServerInjectResponse>;
-    }
-
-    export interface IServerInjectOptions {
-        /**  the request HTTP method (e.g. 'POST'). Defaults to 'GET'.*/
-        method: string;
-        /** the request URL. If the URI includes an authority (e.g. 'example.com:8080'), it is used to automatically set an HTTP 'Host' header, unless one was specified in headers.*/
-        url: string;
-        /** an object with optional request headers where each key is the header name and the value is the header content. Defaults to no additions to the default Shot headers.*/
-        headers?: IDictionary<string>;
-        /** n optional string, buffer or object containing the request payload. In case of an object it will be converted to a string for you. Defaults to no payload. Note that payload processing defaults to 'application/json' if no 'Content-Type' header provided.*/
-        payload?: string | {} | Buffer;
-        /** an optional credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Defaults to no credentials.*/
-        credentials?: any;
-        /** an optional artifacts object containing authentication artifact information. The artifacts are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Ignored if set without credentials. Defaults to no artifacts.*/
-        artifacts?: any;
-        /** sets the initial value of request.app*/
-        app?: any;
-        /** sets the initial value of request.plugins*/
-        plugins?: any;
-        /** allows access to routes with config.isInternal set to true. Defaults to false.*/
-        allowInternals?: boolean;
-        /** sets the remote address for the incoming connection.*/
-        remoteAddress?: boolean;
-        /**object with options used to simulate client request stream conditions for testing:
-        error - if true, emits an 'error' event after payload transmission (if any). Defaults to false.
-        close - if true, emits a 'close' event after payload transmission (if any). Defaults to false.
-        end - if false, does not end the stream. Defaults to true.*/
-        simulate?: {
-            error: boolean;
-            close: boolean;
-            end: boolean;
-        };
-    }
-
-
-	/** host - optional host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
-	The return value is an array where each item is an object containing:
-	info - the connection.info the connection the table was generated for.
-	labels - the connection labels.
-	table - an array of routes where each route contains:
-	settings - the route config with defaults applied.
-	method - the HTTP method in lower case.
-	path - the route path.*/
-    export interface IConnectionTable {
-        info: any;
-        labels: any;
-        table: IRoute[];
-    }
-
-    export interface ICookieSettings {
-        /** - time - to - live in milliseconds.Defaults to null (session time- life - cookies are deleted when the browser is closed).*/
-        ttl?: number;
-        /** - sets the 'Secure' flag.Defaults to false.*/
-        isSecure?: boolean;
-        /** - sets the 'HttpOnly' flag.Defaults to false.*/
-        isHttpOnly?: boolean;
-        /** - the path scope.Defaults to null (no path).*/
-        path?: string;
-        /** - the domain scope.Defaults to null (no domain).*/
-        domain?: any;
-		/** - if present and the cookie was not received from the client or explicitly set by the route handler, the cookie is automatically added to the response with the provided value.The value can be a function with signature function(request, next) where:
-		request - the request object.
-		next - the continuation function using the function(err, value) signature.*/
-        autoValue?: (request: Request, next: (err: any, value: any) => void) => void;
-		/** - encoding performs on the provided value before serialization.Options are:
-		'none' - no encoding.When used, the cookie value must be a string.This is the default value.
-		'base64' - string value is encoded using Base64.
-		'base64json' - object value is JSON- stringified than encoded using Base64.
-		'form' - object value is encoded using the x- www - form - urlencoded method. */
-        encoding?: string;
-		/**  - an object used to calculate an HMAC for cookie integrity validation.This does not provide privacy, only a mean to verify that the cookie value was generated by the server.Redundant when 'iron' encoding is used.Options are:
-		integrity - algorithm options.Defaults to require('iron').defaults.integrity.
-		password - password used for HMAC key generation. */
-        sign?: { integrity: any; password: string; }
-        password?: string;
-        iron?: any;
-        ignoreErrors?: boolean;
-        clearInvalid?: boolean;
-        strictHeader?: boolean;
-        passThrough?: any;
-    }
-
-	/** method - the method function with the signature is one of:
-	function(arg1, arg2, ..., argn, next) where:
-	arg1, arg2, etc. - the method function arguments.
-	next - the function called when the method is done with the signature function(err, result, ttl) where:
-	err - error response if the method failed.
-	result - the return value.
-	ttl - 0 if result is valid but cannot be cached. Defaults to cache policy.
-	function(arg1, arg2, ..., argn) where:
-	arg1, arg2, etc. - the method function arguments.
-	the callback option is set to false.
-	the method must returns a value (result, Error, or a promise) or throw an Error.*/
-    export interface IServerMethod {
-        //(): void;
-        //(next: (err: any, result: any, ttl: number) => void): void;
-        //(arg1: any): void;
-        //(arg1: any, arg2: any, next: (err: any, result: any, ttl: number) => void): void;
-        //(arg1: any, arg2: any): void;
-        (...args: any[]): void;
-
-    }
-	/** options - optional configuration:
-	bind - a context object passed back to the method function (via this) when called. Defaults to active context (set via server.bind() when the method is registered.
-	cache - the same cache configuration used in server.cache().
-	callback - if false, expects the method to be a synchronous function. Note that using a synchronous function with caching will convert the method interface to require a callback as an additional argument with the signature function(err, result, cached, report) since the cache interface cannot return values synchronously. Defaults to true.
-	generateKey - a function used to generate a unique key (for caching) from the arguments passed to the method function (the callback argument is not passed as input). The server will automatically generate a unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation function must be provided which takes the same arguments as the function and returns a unique string (or null if no key can be generated).*/
-    export interface IServerMethodOptions {
-        bind?: any;
-        cache?: ICatBoxCacheOptions;
-        callback?: boolean;
-        generateKey?(args: any[]): string;
-    }
-	/** Request object
-
-	The request object is created internally for each incoming request. It is different from the node.js request object received from the HTTP server callback (which is available in request.raw.req). The request object methods and properties change throughout the request lifecycle.
-	Request events
-
-	The request object supports the following events:
-
-	'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
-	'finish' - emitted when the request payload finished reading. The event method signature is function ().
-	'disconnect' - emitted when a request errors or aborts unexpectedly.
-	var Crypto = require('crypto');
-	var Hapi = require('hapi');
-	var server = new Hapi.Server();
-	server.connection({ port: 80 });
-
-	server.ext('onRequest', function (request, reply) {
-
-	var hash = Crypto.createHash('sha1');
-	request.on('peek', function (chunk) {
-
-	hash.update(chunk);
-	});
-
-	request.once('finish', function () {
-
-	console.log(hash.digest('hex'));
-	});
-
-	request.once('disconnect', function () {
-
-	console.error('request aborted');
-	});
-
-	return reply.continue();
-	});*/
-    export class Request extends Events.EventEmitter {
-        /** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].*/
-        app: any;
-        /**  authentication information*/
-        auth: {
-            /** true is the request has been successfully authenticated, otherwise false.*/
-            isAuthenticated: boolean;
-            /**  the credential object received during the authentication process. The presence of an object does not mean successful authentication.  can be set in the validate function's callback.*/
-            credentials: any;
-            /**  an artifact object received from the authentication strategy and used in authentication-related actions.*/
-            artifacts: any;
-            /**  the route authentication mode.*/
-            mode: any;
-            /** the authentication error is failed and mode set to 'try'.*/
-            error: any;
-        };
-        /** the connection used by this request*/
-        connection: ServerConnection;
-        /**  the node domain object used to protect against exceptions thrown in extensions, handlers and route prerequisites. Can be used to manually bind callback functions otherwise bound to other domains.*/
-        domain: any;
-        /** the raw request headers (references request.raw.headers).*/
-        headers: IDictionary<string>;
-        /** a unique request identifier (using the format '{now}:{connection.info.id}:{5 digits counter}').*/
-        id: number;
-        /**  request information */
-        info: {
-            /**  the request preferred encoding. */
-            acceptEncoding: string;
-            /**  if CORS is enabled for the route, contains the following: */
-            cors: {
-                isOriginMatch: boolean; /**  true if the request 'Origin' header matches the configured CORS restrictions. Set to false if no 'Origin' header is found or if it does not match. Note that this is only available after the 'onRequest' extension point as CORS is configured per-route and no routing decisions are made at that point in the request lifecycle. */
-            };
-            /**  content of the HTTP 'Host' header (e.g. 'example.com:8080'). */
-            host: string;
-            /**  the hostname part of the 'Host' header (e.g. 'example.com').*/
-            hostname: string;
-            /**  request reception timestamp. */
-            received: number;
-            /**  content of the HTTP 'Referrer' (or 'Referer') header. */
-            referrer: string;
-            /** remote client IP address. */
-            remoteAddress: string;
-            /**  remote client port. */
-            remotePort: number;
-            /**  request response timestamp (0 is not responded yet). */
-            responded: number;
-        };
-        /**  the request method in lower case (e.g. 'get', 'post'). */
-        method: string;
-        /**  the parsed content-type header. Only available when payload parsing enabled and no payload error occurred. */
-        mime: string;
-        /**  an object containing the values of params, query, and payload before any validation modifications made. Only set when input validation is performed.*/
-        orig: {
-            params: any;
-            query: any;
-            payload: any;
-        };
-        /**  an object where each key is a path parameter name with matching value as described in Path parameters.*/
-        params: IDictionary<string>;
-        /** an array containing all the path params values in the order they appeared in the path.*/
-        paramsArray: string[];
-        /**  the request URI's path component. */
-        path: string;
-        /** the request payload based on the route payload.output and payload.parse settings.*/
-        payload: stream.Readable | Buffer | any;
-        /**  plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state.*/
-        plugins: any;
-        /** an object where each key is the name assigned by a route prerequisites function. The values are the raw values provided to the continuation function as argument. For the wrapped response object, use responses.*/
-        pre: IDictionary<any>;
-        /** the response object when set. The object can be modified but must not be assigned another object. To replace the response with another from within an extension point, use reply(response) to override with a different response. Contains null when no response has been set (e.g. when a request terminates prematurely when the client disconnects).*/
-        response: Response;
-        /**preResponses - same as pre but represented as the response object created by the pre method.*/
-        preResponses: any;
-        /**an object containing the query parameters.*/
-        query: any;
-        /**  an object containing the Node HTTP server objects. Direct interaction with these raw objects is not recommended.*/
-        raw: {
-            req: http.ClientRequest;
-            res: http.ServerResponse;
-        };
-        /** the route public interface.*/
-        route: IRoute;
-        /** the server object. */
-        server: Server;
-        /** an object containing parsed HTTP state information (cookies) where each key is the cookie name and value is the matching cookie content after processing using any registered cookie definition. */
-        state: any;
-        /** complex object contining details on the url */
-        url: {
-            /** null when i tested */
-            auth: any;
-            /** null when i tested */
-            hash: any;
-            /** null when i tested */
-            host: any;
-            /** null when i tested */
-            hostname: any;
-            href: string;
-            path: string;
-            /** path without search*/
-            pathname: string;
-            /** null when i tested */
-            port: any;
-            /** null when i tested */
-            protocol: any;
-            /** querystring parameters*/
-            query: IDictionary<string>;
-            /** querystring parameters as a string*/
-            search: string;
-            /** null when i tested */
-            slashes: any;
-        };
-		/** request.setUrl(url)
-
-		Available only in 'onRequest' extension methods.
-
-		Changes the request URI before the router begins processing the request where:
-
-		url - the new request path value.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-
-		server.ext('onRequest', function (request, reply) {
-
-		// Change all requests to '/test'
-		request.setUrl('/test');
-		return reply.continue();
-		});*/
-        setUrl(url: string): void;
-		/** request.setMethod(method)
-
-		Available only in 'onRequest' extension methods.
-
-		Changes the request method before the router begins processing the request where:
-
-		method - is the request HTTP method (e.g. 'GET').
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-
-		server.ext('onRequest', function (request, reply) {
-
-		// Change all requests to 'GET'
-		request.setMethod('GET');
-		return reply.continue();
-		});*/
-        setMethod(method: string): void;
-		/** request.log(tags, [data, [timestamp]])
-
-		Always available.
-
-		Logs request-specific events. When called, the server emits a 'request' event which can be used by other listeners or plugins. The arguments are:
-
-		data - an optional message string or object with the application data being logged.
-		timestamp - an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
-		Any logs generated by the server internally will be emitted only on the 'request-internal' channel and will include the event.internal flag set to true.
-
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-
-		server.on('request', function (request, event, tags) {
-
-		if (tags.error) {
-		console.log(event);
-		}
-		});
-
-		var handler = function (request, reply) {
-
-		request.log(['test', 'error'], 'Test event');
-		return reply();
-		};
-		*/
-        log(
-            /** a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events.*/
-            tags: string | string[],
-            /** an optional message string or object with the application data being logged.*/
-            data?: string,
-            /**  an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).*/
-            timestamp?: number): void;
-		/** request.getLog([tags], [internal])
-
-		Always available.
-
-		Returns an array containing the events matching any of the tags specified (logical OR)
-		request.getLog();
-		request.getLog('error');
-		request.getLog(['error', 'auth']);
-		request.getLog(['error'], true);
-		request.getLog(false);*/
-
-        getLog(
-            /** is a single tag string or array of tag strings. If no tags specified, returns all events.*/
-            tags?: string,
-            /**  filters the events to only those with a matching event.internal value. If true, only internal logs are included. If false, only user event are included. Defaults to all events (undefined).*/
-            internal?: boolean): string[];
-
-		/** request.tail([name])
-
-		Available until immediately after the 'response' event is emitted.
-
-		Adds a request tail which has to complete before the request lifecycle is complete where:
-
-		name - an optional tail name used for logging purposes.
-		Returns a tail function which must be called when the tail activity is completed.
-
-		Tails are actions performed throughout the request lifecycle, but which may end after a response is sent back to the client. For example, a request may trigger a database update which should not delay sending back a response. However, it is still desirable to associate the activity with the request when logging it (or an error associated with it).
-
-		When all tails completed, the server emits a 'tail' event.
-
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-
-		var get = function (request, reply) {
-
-		var dbTail = request.tail('write to database');
-
-		db.save('key', 'value', function () {
-
-		dbTail();
-		});
-
-		return reply('Success!');
-		};
-
-		server.route({ method: 'GET', path: '/', handler: get });
-
-		server.on('tail', function (request) {
-
-		console.log('Request completed including db activity');
-		});*/
-        tail(
-            /** an optional tail name used for logging purposes.*/
-            name?: string): Function;
-    }
-	/** Response events
-
-	The response object supports the following events:
-
-	'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
-	'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
-	var Crypto = require('crypto');
-	var Hapi = require('hapi');
-	var server = new Hapi.Server();
-	server.connection({ port: 80 });
-
-	server.ext('onPreResponse', function (request, reply) {
-
-	var response = request.response;
-	if (response.isBoom) {
-	return reply();
-	}
-
-	var hash = Crypto.createHash('sha1');
-	response.on('peek', function (chunk) {
-
-	hash.update(chunk);
-	});
-
-	response.once('finish', function () {
-
-	console.log(hash.digest('hex'));
-	});
-
-	return reply.continue();
-	});*/
-    export class Response extends Events.EventEmitter {
-        isBoom: boolean;
-        /**  the HTTP response status code. Defaults to 200 (except for errors).*/
-        statusCode: number;
-        /** an object containing the response headers where each key is a header field name. Note that this is an incomplete list of headers to be included with the response. Additional headers will be added once the response is prepare for transmission.*/
-        headers: IDictionary<string>;
-        /** the value provided using the reply interface.*/
-        source: any;
-		/** a string indicating the type of source with available values:
-		'plain' - a plain response such as string, number, null, or simple object (e.g. not a Stream, Buffer, or view).
-		'buffer' - a Buffer.
-		'view' - a view generated with reply.view().
-		'file' - a file generated with reply.file() of via the directory handler.
-		'stream' - a Stream.
-		'promise' - a Promise object. */
-        variety: string;
-        /** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].*/
-        app: any;
-        /** plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state. */
-        plugins: any;
-		/** settings - response handling flags:
-		charset - the 'Content-Type' HTTP header 'charset' property. Defaults to 'utf-8'.
-		encoding - the string encoding scheme used to serial data into the HTTP payload when source is a string or marshals into a string. Defaults to 'utf8'.
-		passThrough - if true and source is a Stream, copies the statusCode and headers of the stream to the outbound response. Defaults to true.
-		stringify - options used for source value requiring stringification. Defaults to no replacer and no space padding.
-		ttl - if set, overrides the route cache expiration milliseconds value set in the route config. Defaults to no override.
-		varyEtag - if true, a suffix will be automatically added to the 'ETag' header at transmission time (separated by a '-' character) when the HTTP 'Vary' header is present.*/
-        settings: {
-            charset: string;
-            encoding: string;
-            passThrough: boolean;
-            stringify: any;
-            ttl: number;
-            varyEtag: boolean;
-        }
-
-		/**  sets the HTTP 'Content-Length' header (to avoid chunked transfer encoding) where:
-		length - the header value. Must match the actual payload size.*/
-        bytes(length: number): Response;
-        /**  sets the 'Content-Type' HTTP header 'charset' property where: charset - the charset property value.*/
-        charset(charset: string): Response;
-
-		/**  sets the HTTP status code where:
-		statusCode - the HTTP status code.*/
-        code(statusCode: number): Response;
-        /** sets the HTTP status code to Created (201) and the HTTP 'Location' header where: uri - an absolute or relative URI used as the 'Location' header value.*/
-        created(uri: string): Response;
-
-
-        /** encoding(encoding) - sets the string encoding scheme used to serial data into the HTTP payload where: encoding - the encoding property value (see node Buffer encoding).*/
-        encoding(encoding: string): Response;
-
-		/** etag(tag, options) - sets the representation entity tag where:
-		tag - the entity tag string without the double-quote.
-		options - optional settings where:
-		weak - if true, the tag will be prefixed with the 'W/' weak signifier. Weak tags will fail to match identical tags for the purpose of determining 304 response status. Defaults to false.
-		vary - if true and content encoding is set or applied to the response (e.g 'gzip' or 'deflate'), the encoding name will be automatically added to the tag at transmission time (separated by a '-' character). Ignored when weak is true. Defaults to true.*/
-        etag(tag: string, options: {
-            weak: boolean; vary: boolean;
-        }): Response;
-
-		/**header(name, value, options) - sets an HTTP header where:
-		name - the header name.
-		value - the header value.
-		options - optional settings where:
-		append - if true, the value is appended to any existing header value using separator. Defaults to false.
-		separator - string used as separator when appending to an exiting value. Defaults to ','.
-		override - if false, the header value is not set if an existing value present. Defaults to true.*/
-        header(name: string, value: string, options?: {
-            append: boolean;
-            separator: string;
-            override: boolean;
-        }): Response;
-
-       /** hold() - puts the response on hold until response.send() is called. Available only after reply() is called and until response.hold() is invoked once. */
-       hold():Response;
-
-		/** location(uri) - sets the HTTP 'Location' header where:
-		uri - an absolute or relative URI used as the 'Location' header value.*/
-        location(uri: string): Response;
-
-		/** redirect(uri) - sets an HTTP redirection response (302) and decorates the response with additional methods listed below, where:
-		uri - an absolute or relative URI used to redirect the client to another resource. */
-        redirect(uri: string): Response;
-
-		/** replacer(method) - sets the JSON.stringify() replacer argument where:
-		method - the replacer function or array. Defaults to none.*/
-        replacer(method: Function | Array<Function>): Response;
-
-		/** spaces(count) - sets the JSON.stringify() space argument where:
-		count - the number of spaces to indent nested object keys. Defaults to no indentation. */
-        spaces(count: number): Response;
-		/**state(name, value, [options]) - sets an HTTP cookie where:
-		name - the cookie name.
-		value - the cookie value. If no encoding is defined, must be a string.
-		options - optional configuration. If the state was previously registered with the server using server.state(), the specified keys in options override those same keys in the server definition (but not others).*/
-        state(name: string, value: string, options?: any): Response;
-
-        /** send() - resume the response which will be transmitted in the next tick. Available only after response.hold() is called and until response.send() is invoked once. */
-        send():void;
-
-        /** sets a string suffix when the response is process via JSON.stringify().*/
-        suffix(suffix: string): void;
-		/** overrides the default route cache expiration rule for this response instance where:
-msec - the time-to-live value in milliseconds.*/
-        ttl(msec: number): void;
-		/** type(mimeType) - sets the HTTP 'Content-Type' header where:
-		mimeType - is the mime type. Should only be used to override the built-in default for each response type. */
-        type(mimeType: string): Response;
-		/** clears the HTTP cookie by setting an expired value where:
-name - the cookie name.
-options - optional configuration for expiring cookie. If the state was previously registered with the server using server.state(), the specified keys in options override those same keys in the server definition (but not others).*/
-        unstate(name: string, options?: { [key: string]: string }): void;
-		/** adds the provided header to the list of inputs affected the response generation via the HTTP 'Vary' header where:
-header - the HTTP request header name.*/
-        vary(header: string): void;
-    }
-    /** When using the redirect() method, the response object provides these additional methods */
-    export class ResponseRedirect extends Response {
-		/** sets the status code to 302 or 307 (based on the rewritable() setting) where:
-isTemporary - if false, sets status to permanent. Defaults to true.*/
-        temporary(isTemporary: boolean): void;
-		/** sets the status code to 301 or 308 (based on the rewritable() setting) where:
-isPermanent - if true, sets status to temporary. Defaults to false. */
-        permanent(isPermanent: boolean): void;
-		/** sets the status code to 301/302 for rewritable (allows changing the request method from 'POST' to 'GET') or 307/308 for non-rewritable (does not allow changing the request method from 'POST' to 'GET'). Exact code based on the temporary() or permanent() setting. Arguments:
-isRewritable - if false, sets to non-rewritable. Defaults to true.
-Permanent	Temporary
-Rewritable	301	302(1)
-Non-rewritable	308(2)	307
-Notes: 1. Default value. 2. Proposed code, not supported by all clients. */
-        rewritable(isRewritable: boolean): void;
-    }
-    /** info about a server connection */
-    export interface IServerConnectionInfo {
-        /**  - a unique connection identifier (using the format '{hostname}:{pid}:{now base36}').*/
-        id: string;
-        /**  - the connection creation timestamp.*/
-        created: number;
-        /**  - the connection start timestamp (0 when stopped).*/
-        started: number;
-        /**  the connection port based on the following rules:
-        the configured port value before the server has been started.
-        the actual port assigned when no port is configured or set to 0 after the server has been started.*/
-        port: number;
-
-        /** - the host name the connection was configured to. Defaults to the operating system hostname when available, otherwise 'localhost'.*/
-        host: string;
-        /** - the active IP address the connection was bound to after starting.Set to undefined until the server has been started or when using a non TCP port (e.g. UNIX domain socket).*/
-        address: string;
-        /**  - the protocol used:
-        'http' - HTTP.
-        'https' - HTTPS.
-        'socket' - UNIX domain socket or Windows named pipe.*/
-        protocol: string;
-        /** a string representing the connection (e.g. 'http://example.com:8080' or 'socket:/unix/domain/socket/path'). Contains the uri setting if provided, otherwise constructed from the available settings. If no port is available or set to 0, the uri will not include a port component.*/
-        uri: string;
-    }
-    /**
-     *  undocumented.   The connection object constructed after calling server.connection();
-     * can be accessed via server.connections; or request.connection;
-     */
-    export class ServerConnection extends Events.EventEmitter {
-        domain: any;
-        _events: { route: Function, domain: Function, _events: Function, _eventsCount: Function, _maxListeners: Function };
-        _eventsCount: number;
-        settings: IServerConnectionOptions;
-        server: Server;
-        /** ex: "tcp" */
-        type: string;
-        _started: boolean;
-        /** dictionary of sockets */
-        _connections: { [ip_port: string]: any };
-        _onConnection: Function;
-        registrations: any;
-        _extensions: any;
-        _requestCounter: { value: number; min: number; max: number };
-        _load: any;
-        states: {
-            settings: any; cookies: any; names: any[]
-        };
-        auth: { connection: ServerConnection; _schemes: any; _strategies: any; settings: any; api: any; };
-        _router: any;
-        MSPluginsCollection: any;
-        applicationCache: any;
-        addEventListener: any;
-        info: IServerConnectionInfo;
-    }
-
-	/** Server http://hapijs.com/api#server
-	rver object is the main application container. The server manages all incoming connections along with all the facilities provided by the framework. A server can contain more than one connection (e.g. listen to port 80 and 8080).
-	Server events
-	The server object inherits from Events.EventEmitter and emits the following events:
-	'log' - events logged with server.log() and server events generated internally by the framework.
-	'start' - emitted when the server is started using server.start().
-	'stop' - emitted when the server is stopped using server.stop().
-	'request' - events generated by request.log(). Does not include any internally generated events.
-	'request-internal' - request events generated internally by the framework (multiple events per request).
-	'request-error' - emitted whenever an Internal Server Error (500) error response is sent. Single event per request.
-	'response' - emitted after the response is sent back to the client (or when the client connection closed and no response sent, in which case request.response is null). Single event per request.
-	'tail' - emitted when a request finished processing, including any registered tails. Single event per request.
-	Note that the server object should not be used to emit application events as its internal implementation is designed to fan events out to the various plugin selections and not for application events.
-	MORE EVENTS HERE: http://hapijs.com/api#server-events*/
-    export class Server extends Events.EventEmitter {
-
-        constructor(options?: IServerOptions);
-		/** Provides a safe place to store server-specific run-time application data without potential conflicts with the framework internals. The data can be accessed whenever the server is accessible. Initialized with an empty object.
-		var Hapi = require('hapi');
-		server = new Hapi.Server();
-		server.app.key = 'value';
-		var handler = function (request, reply) {
-		return reply(request.server.app.key);
-		}; */
-        app: any;
-		/** An array containing the server's connections. When the server object is returned from server.select(), the connections array only includes the connections matching the selection criteria.
-		var server = new Hapi.Server();
-		server.connection({ port: 80, labels: 'a' });
-		server.connection({ port: 8080, labels: 'b' });
-		// server.connections.length === 2
-		var a = server.select('a');
-		// a.connections.length === 1*/
-        connections: Array<ServerConnection>;
-		/** When the server contains exactly one connection, info is an object containing information about the sole connection.
-		* When the server contains more than one connection, each server.connections array member provides its own connection.info.
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		// server.info.port === 80
-		server.connection({ port: 8080 });
-		// server.info === null
-		// server.connections[1].info.port === 8080
-		*/
-        info: IServerConnectionInfo;
-		/** An object containing the process load metrics (when load.sampleInterval is enabled):
-		rss - RSS memory usage.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server({ load: { sampleInterval: 1000 } });
-		console.log(server.load.rss);*/
-        load: {
-            /** - event loop delay milliseconds.*/
-            eventLoopDelay: number;
-            /**  - V8 heap usage.*/
-            heapUsed: number;
-        };
-		/** When the server contains exactly one connection, listener is the node HTTP server object of the sole connection.
-		When the server contains more than one connection, each server.connections array member provides its own connection.listener.
-		var Hapi = require('hapi');
-		var SocketIO = require('socket.io');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		var io = SocketIO.listen(server.listener);
-		io.sockets.on('connection', function(socket) {
-		socket.emit({ msg: 'welcome' });
-		});*/
-        listener: http.Server;
-
-		/** server.methods
-		An object providing access to the server methods where each server method name is an object property.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.method('add', function (a, b, next) {
-		return next(null, a + b);
-		});
-		server.methods.add(1, 2, function (err, result) {
-		// result === 3
-		});*/
-        methods: IDictionary<Function>;
-
-		/** server.mime
-		Provides access to the server MIME database used for setting content-type information. The object must not be modified directly but only through the mime server setting.
-		var Hapi = require('hapi');
-		var options = {
-		mime: {
-		override: {
-		'node/module': {
-		source: 'steve',
-		compressible: false,
-		extensions: ['node', 'module', 'npm'],
-		type: 'node/module'
-		}
-		}
-		}
-		};
-		var server = new Hapi.Server(options);
-		// server.mime.path('code.js').type === 'application/javascript'
-		// server.mime.path('file.npm').type === 'node/module'*/
-        mime: any;
-		/**server.plugins
-		An object containing the values exposed by each plugin registered where each key is a plugin name and the values are the exposed properties by each plugin using server.expose(). Plugins may set the value of the server.plugins[name] object directly or via the server.expose() method.
-		exports.register = function (server, options, next) {
-		server.expose('key', 'value');
-		// server.plugins.example.key === 'value'
-		return next();
-		};
-		exports.register.attributes = {
-		name: 'example'
-		};*/
-        plugins: IDictionary<any>;
-		/** server.realm
-		The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(), the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin). Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
-		modifiers - when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method and includes:
-		route - routes preferences:
-		prefix - the route path prefix used by any calls to server.route() from the server.
-		vhost - the route virtual host settings used by any calls to server.route() from the server.
-		plugin - the active plugin name (empty string if at the server root).
-		plugins - plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state.
-		settings - settings overrides:
-		files.relativeTo
-		bind
-		The server.realm object should be considered read-only and must not be changed directly except for the plugins property can be directly manipulated by the plugins (each setting its own under plugins[name]).
-		exports.register = function (server, options, next) {
-		console.log(server.realm.modifiers.route.prefix);
-		return next();
-		};*/
-        realm: IServerRealm;
-
-		/** server.root
-		The root server object containing all the connections and the root server methods (e.g. start(), stop(), connection()).*/
-        root: Server;
-		/** server.settings
-		The server configuration object after defaults applied.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server({
-		app: {
-		key: 'value'
-		}
-		});
-		// server.settings.app === { key: 'value' }*/
-        settings: IServerOptions;
-
-		/** server.version
-		The hapi module version number.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		// server.version === '8.0.0'*/
-        version: string;
-
-		/** server.after(method, [dependencies])
-		Adds a method to be called after all the plugin dependencies have been registered and before the server starts (only called if the server is started) where:
-		after - the method with signature function(plugin, next) where:
-		server - server object the after() method was called on.
-		next - the callback function the method must call to return control over to the application and complete the registration process. The function signature is function(err) where:
-		err - internal error which is returned back via the server.start() callback.
-		dependencies - a string or array of string with the plugin names to call this method after their after() methods. There is no requirement for the other plugins to be registered. Setting dependencies only arranges the after methods in the specified order.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.after(function () {
-		// Perform some pre-start logic
-		});
-		server.start(function (err) {
-		// After method already executed
-		});
-		server.auth.default(options)*/
-        after(method: (plugin: any, next: (err: any) => void) => void, dependencies: string | string[]): void;
-
-        auth: {
-            /** server.auth.api
-            An object where each key is a strategy name and the value is the exposed strategy API. Available on when the authentication scheme exposes an API by returning an api key in the object returned from its implementation function.
-            When the server contains more than one connection, each server.connections array member provides its own connection.auth.api object.
-            const server = new Hapi.Server();
-            server.connection({ port: 80 });
-            const scheme = function (server, options) {
-            return {
-            api: {
-            settings: {
-            x: 5
-            }
-            },
-            authenticate: function (request, reply) {
-            const req = request.raw.req;
-            const authorization = req.headers.authorization;
-            if (!authorization) {
-            return reply(Boom.unauthorized(null, 'Custom'));
-            }
-            return reply.continue({ credentials: { user: 'john' } });
-            }
-            };
-            };
-            server.auth.scheme('custom', scheme);
-            server.auth.strategy('default', 'custom');
-            console.log(server.auth.api.default.settings.x);    // 5
-            */
-            api: {
-                [index: string]: any;
-            }
-			/** server.auth.default(options)
-			Sets a default strategy which is applied to every route where:
-			options - a string with the default strategy name or an object with a specified strategy or strategies using the same format as the route auth handler options.
-			The default does not apply when the route config specifies auth as false, or has an authentication strategy configured. Otherwise, the route authentication config is applied to the defaults. Note that the default only applies at time of route configuration, not at runtime. Calling default() after adding a route will have no impact on routes added prior.
-			The default auth strategy configuration can be accessed via connection.auth.settings.default.
-			var server = new Hapi.Server();
-			server.connection({ port: 80 });
-			server.auth.scheme('custom', scheme);
-			server.auth.strategy('default', 'custom');
-			server.auth.default('default');
-			server.route({
-			method: 'GET',
-			path: '/',
-			handler: function (request, reply) {
-			return reply(request.auth.credentials.user);
-			}
-			});*/
-            default(options: string): void;
-            default(options: { strategy: string }): void;
-            default(options: { strategies: string[] }): void;
-			/** server.auth.scheme(name, scheme)
-			Registers an authentication scheme where:
-			name - the scheme name.
-			scheme - the method implementing the scheme with signature function(server, options) where:
-			server - a reference to the server object the scheme is added to.
-			options - optional scheme settings used to instantiate a strategy.*/
-            scheme(name: string,
-				/** When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted if configured for the route. If the err returned by the reply() method includes a message, no additional strategies will be attempted. If the err does not include a message but does include a scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in order of preference.
-				n the scheme payload() method returns an error with a message, it means payload validation failed due to bad payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')), authentication may still be successful if the route auth.payload configuration is set to 'optional'.
-				server = new Hapi.Server();
-				server.connection({ port: 80 });
-				scheme = function (server, options) {
-				urn {
-				authenticate: function (request, reply) {
-				req = request.raw.req;
-				var authorization = req.headers.authorization;
-				if (!authorization) {
-				return reply(Boom.unauthorized(null, 'Custom'));
-				}
-				urn reply(null, { credentials: { user: 'john' } });
-				}
-				};
-				};
-				*/
-                scheme: (server: Server, options: any) => IServerAuthScheme): void;
-
-			/** server.auth.strategy(name, scheme, [mode], [options])
-			Registers an authentication strategy where:
-			name - the strategy name.
-			scheme - the scheme name (must be previously registered using server.auth.scheme()).
-			mode - if true, the scheme is automatically assigned as a required strategy to any route without an auth config. Can only be assigned to a single server strategy. Value must be true (which is the same as 'required') or a valid authentication mode ('required', 'optional', 'try'). Defaults to false.
-			options - scheme options based on the scheme requirements.
-			var server = new Hapi.Server();
-			server.connection({ port: 80 });
-			server.auth.scheme('custom', scheme);
-			server.auth.strategy('default', 'custom');
-			server.route({
-			method: 'GET',
-			path: '/',
-			config: {
-			auth: 'default',
-			handler: function (request, reply) {
-			return reply(request.auth.credentials.user);
-			}
-			}
-			});*/
-            strategy(name: string, scheme: any, mode?: boolean | string, options?: any): void;
-
-			/** server.auth.test(strategy, request, next)
-			Tests a request against an authentication strategy where:
-			strategy - the strategy name registered with server.auth.strategy().
-			request - the request object.
-			next - the callback function with signature function(err, credentials) where:
-			err - the error if authentication failed.
-			credentials - the authentication credentials object if authentication was successful.
-			Note that the test() method does not take into account the route authentication configuration. It also does not perform payload authentication. It is limited to the basic strategy authentication execution. It does not include verifying scope, entity, or other route properties.
-			var server = new Hapi.Server();
-			server.connection({ port: 80 });
-			server.auth.scheme('custom', scheme);
-			server.auth.strategy('default', 'custom');
-			server.route({
-			method: 'GET',
-			path: '/',
-			handler: function (request, reply) {
-			request.server.auth.test('default', request, function (err, credentials) {
-			if (err) {
-			return reply({ status: false });
-			}
-			return reply({ status: true, user: credentials.name });
-			});
-			}
-			});*/
-            test(strategy: string, request: Request, next: (err: any, credentials: any) => void): void;
-        };
-		/** server.bind(context)
-		Sets a global context used as the default bind object when adding a route or an extension where:
-		context - the object used to bind this in handler and extension methods.
-		When setting context inside a plugin, the context is applied only to methods set up by the plugin. Note that the context applies only to routes and extensions added after it has been set.
-		var handler = function (request, reply) {
-		return reply(this.message);
-		};
-		exports.register = function (server, options, next) {
-		var bind = {
-		message: 'hello'
-		};
-		server.bind(bind);
-		server.route({ method: 'GET', path: '/', handler: handler });
-		return next();
-		};*/
-        bind(context: any): void;
-
-
-		/** server.cache(options)
-		Provisions a cache segment within the server cache facility where:
-		options - catbox policy configuration where:
-		expiresIn - relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt.
-		expiresAt - time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records expire. Uses local time. Cannot be used together with expiresIn.
-		generateFunc - a function used to generate a new cache item if one is not found in the cache when calling get(). The method's signature is function(id, next) where: - id - the id string or object provided to the get() method. - next - the method called when the new item is returned with the signature function(err, value, ttl) where: - err - an error condition. - value - the new value generated. - ttl - the cache ttl value in milliseconds. Set to 0 to skip storing in the cache. Defaults to the cache global policy.
-		staleIn - number of milliseconds to mark an item stored in cache as stale and attempt to regenerate it when generateFunc is provided. Must be less than expiresIn.
-		staleTimeout - number of milliseconds to wait before checking if an item is stale.
-		generateTimeout - number of milliseconds to wait before returning a timeout error when the generateFunc function takes too long to return a value. When the value is eventually returned, it is stored in the cache for future requests.
-		cache - the cache name configured in 'server.cache`. Defaults to the default cache.
-		segment - string segment name, used to isolate cached items within the cache partition. When called within a plugin, defaults to '!name' where 'name' is the plugin name. Required when called outside of a plugin.
-		shared - if true, allows multiple cache provisions to share the same segment. Default to false.
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		var cache = server.cache({ segment: 'countries', expiresIn: 60 * 60 * 1000 });
-		cache.set('norway', { capital: 'oslo' }, null, function (err) {
-		cache.get('norway', function (err, value, cached, log) {
-		// value === { capital: 'oslo' };
-		});
-		});*/
-        cache(options: ICatBoxCacheOptions): void;
-
-		/** server.connection([options])
-		Adds an incoming server connection
-		Returns a server object with the new connection selected.
-		Must be called before any other server method that modifies connections is called for it to apply to the new connection (e.g. server.state()).
-		Note that the options object is deeply cloned (with the exception of listener which is shallowly copied) and cannot contain any values that are unsafe to perform deep copy on.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		var web = server.connection({ port: 8000, host: 'example.com', labels: ['web'] });
-		var admin = server.connection({ port: 8001, host: 'example.com', labels: ['admin'] });
-		// server.connections.length === 2
-		// web.connections.length === 1
-		// admin.connections.length === 1 */
-        connection(options: IServerConnectionOptions): Server;
-		/** server.decorate(type, property, method, [options])
-		Extends various framework interfaces with custom methods where:
-		type - the interface being decorated. Supported types:
-		'reply' - adds methods to the reply interface.
-		'server' - adds methods to the Server object.
-		property - the object decoration key name.
-		method - the extension function.
-        options - if the type is 'request', supports the following optional settings:
-        'apply' - if true, the method function is invoked using the signature function(request) where request is the current request object and the returned value is assigned as the decoration.
-		Note that decorations apply to the entire server and all its connections regardless of current selection.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.decorate('reply', 'success', function () {
-		return this.response({ status: 'ok' });
-		});
-		server.route({
-		method: 'GET',
-		path: '/',
-		handler: function (request, reply) {
-		return reply.success();
-		}
-		});*/
-        decorate(type: string, property: string, method: Function, options?: { apply: boolean }): void;
-
-		/** server.dependency(dependencies, [after])
-		Used within a plugin to declares a required dependency on other plugins where:
-		dependencies - a single string or array of plugin name strings which must be registered in order for this plugin to operate. Plugins listed must be registered before the server is started. Does not provide version dependency which should be implemented using npm peer dependencies.
-		after - an optional function called after all the specified dependencies have been registered and before the server starts. The function is only called if the server is started. If a circular dependency is detected, an exception is thrown (e.g. two plugins each has an after function to be called after the other). The function signature is function(server, next) where:
-		server - the server the dependency() method was called on.
-		next - the callback function the method must call to return control over to the application and complete the registration process. The function signature is function(err) where:
-		err - internal error condition, which is returned back via the server.start() callback.
-		exports.register = function (server, options, next) {
-		server.dependency('yar', after);
-		return next();
-		};
-		var after = function (server, next) {
-		// Additional plugin registration logic
-		return next();
-		};*/
-        dependency(dependencies: string | string[], after?: (server: Server, next: (err: any) => void) => void): void;
-
-
-		/** server.expose(key, value)
-		Used within a plugin to expose a property via server.plugins[name] where:
-		key - the key assigned (server.plugins[name][key]).
-		value - the value assigned.
-		exports.register = function (server, options, next) {
-		server.expose('util', function () { console.log('something'); });
-		return next();
-		};*/
-        expose(key: string, value: any): void;
-
-		/** server.expose(obj)
-		Merges a deep copy of an object into to the existing content of server.plugins[name] where:
-		obj - the object merged into the exposed properties container.
-		exports.register = function (server, options, next) {
-		server.expose({ util: function () { console.log('something'); } });
-		return next();
-		};*/
-        expose(obj: any): void;
-
-		/** server.ext(event, method, [options])
-		Registers an extension function in one of the available extension points where:
-		event - the event name.
-		method - a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is function(request, reply) where:
-		request - the request object. NOTE: Access the Response via request.response
-		reply - the reply interface which is used to return control back to the framework. To continue normal execution of the request lifecycle, reply.continue() must be called. To abort processing and return a response to the client, call reply(value) where value is an error or any other valid response.
-		this - the object provided via options.bind or the current active context set with server.bind().
-		options - an optional object with the following:
-		before - a string or array of strings of plugin names this method must execute before (on the same event). Otherwise, extension methods are executed in the order added.
-		after - a string or array of strings of plugin names this method must execute after (on the same event). Otherwise, extension methods are executed in the order added.
-		bind - a context object passed back to the provided method (via this) when called.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.ext('onRequest', function (request, reply) {
-		// Change all requests to '/test'
-		request.setUrl('/test');
-		return reply.continue();
-		});
-		var handler = function (request, reply) {
-		return reply({ status: 'ok' });
-		};
-		server.route({ method: 'GET', path: '/test', handler: handler });
-		server.start();
-		// All requests will get routed to '/test'*/
-        ext(event: string, method: (request: Request, reply: IReply, bind?: any) => void, options?: { before: string | string[]; after: string | string[]; bind?: any }): void;
-
-		/** server.handler(name, method)
-		Registers a new handler type to be used in routes where:
-		name - string name for the handler being registered. Cannot override the built-in handler types (directory, file, proxy, and view) or any previously registered type.
-		method - the function used to generate the route handler using the signature function(route, options) where:
-		route - the route public interface object.
-		options - the configuration object provided in the handler config.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ host: 'localhost', port: 8000 });
-		// Defines new handler for routes on this server
-		server.handler('test', function (route, options) {
-		return function (request, reply) {
-		return reply('new handler: ' + options.msg);
-		}
-		});
-		server.route({
-		method: 'GET',
-		path: '/',
-		handler: { test: { msg: 'test' } }
-		});
-		server.start();
-		The method function can have a defaults object or function property. If the property is set to an object, that object is used as the default route config for routes using this handler. If the property is set to a function, the function uses the signature function(method) and returns the route default configuration.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ host: 'localhost', port: 8000 });
-		var handler = function (route, options) {
-		return function (request, reply) {
-		return reply('new handler: ' + options.msg);
-		}
-		};
-		// Change the default payload processing for this handler
-		handler.defaults = {
-		payload: {
-		output: 'stream',
-		parse: false
-		}
-		};
-		server.handler('test', handler);*/
-        handler<THandlerConfig>(name: string, method: (route: IRoute, options: THandlerConfig) => ISessionHandler): void;
-
-        /** server.initialize([callback])
-        Initializes the server (starts the caches, finalizes plugin registration) but does not start listening
-        on the connection ports, where:
-        - `callback` - the callback method when server initialization is completed or failed with the signature
-        `function(err)` where:
-        - `err` - any initialization error condition.
-
-        If no `callback` is provided, a `Promise` object is returned.
-
-        Note that if the method fails and the callback includes an error, the server is considered to be in
-        an undefined state and should be shut down. In most cases it would be impossible to fully recover as
-        the various plugins, caches, and other event listeners will get confused by repeated attempts to
-        start the server or make assumptions about the healthy state of the environment. It is recommended
-        to assert that no error has been returned after calling `initialize()` to abort the process when the
-        server fails to start properly. If you must try to resume after an error, call `server.stop()`
-        first to reset the server state.
-        */
-        initialize(callback?: (error: any) => void): IPromise<void>;
-
-        /** When the server contains exactly one connection, injects a request into the sole connection simulating an incoming HTTP request without making an actual socket connection.
-		Injection is useful for testing purposes as well as for invoking routing logic internally without the overhead or limitations of the network stack.
-		Utilizes the [shot module | https://github.com/hapijs/shot ] for performing injections, with some additional options and response properties
-		* When the server contains more than one connection, each server.connections array member provides its own connection.inject().
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		var handler = function (request, reply) {
-		return reply('Success!');
-		};
-		server.route({ method: 'GET', path: '/', handler: handler });
-		server.inject('/', function (res) {
-		console.log(res.result);
-		});
-		*/
-        inject: IServerInject;
-
-		/** server.log(tags, [data, [timestamp]])
-		Logs server events that cannot be associated with a specific request. When called the server emits a 'log' event which can be used by other listeners or plugins to record the information or output to the console. The arguments are:
-		tags - a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events. Any logs generated by the server internally include the 'hapi' tag along with event-specific information.
-		data - an optional message string or object with the application data being logged.
-		timestamp - an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.on('log', function (event, tags) {
-		if (tags.error) {
-		console.log(event);
-		}
-		});
-		server.log(['test', 'error'], 'Test event');*/
-        log(tags: string | string[], data?: string | any, timestamp?: number): void;
-		/**server.lookup(id)
-		When the server contains exactly one connection, looks up a route configuration where:
-		id - the route identifier as set in the route options.
-		returns the route public interface object if found, otherwise null.
-		var server = new Hapi.Server();
-		server.connection();
-		server.route({
-		method: 'GET',
-		path: '/',
-		config: {
-		handler: function (request, reply) { return reply(); },
-		id: 'root'
-		}
-		});
-		var route = server.lookup('root');
-		When the server contains more than one connection, each server.connections array member provides its own connection.lookup() method.*/
-        lookup(id: string): IRoute;
-		/** server.match(method, path, [host])
-		When the server contains exactly one connection, looks up a route configuration where:
-		method - the HTTP method (e.g. 'GET', 'POST').
-		path - the requested path (must begin with '/').
-		host - optional hostname (to match against routes with vhost).
-		returns the route public interface object if found, otherwise null.
-		var server = new Hapi.Server();
-		server.connection();
-		server.route({
-		method: 'GET',
-		path: '/',
-		config: {
-		handler: function (request, reply) { return reply(); },
-		id: 'root'
-		}
-		});
-		var route = server.match('get', '/');
-		When the server contains more than one connection, each server.connections array member provides its own connection.match() method.*/
-        match(method: string, path: string, host?: string): IRoute;
-
-
-
-
-		/** server.method(name, method, [options])
-		Registers a server method. Server methods are functions registered with the server and used throughout the application as a common utility. Their advantage is in the ability to configure them to use the built-in cache and share across multiple request handlers without having to create a common module.
-		Methods are registered via server.method(name, method, [options])
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		// Simple arguments
-		var add = function (a, b, next) {
-		return next(null, a + b);
-		};
-		server.method('sum', add, { cache: { expiresIn: 2000 } });
-		server.methods.sum(4, 5, function (err, result) {
-		console.log(result);
-		});
-		// Object argument
-		var addArray = function (array, next) {
-		var sum = 0;
-		array.forEach(function (item) {
-		sum += item;
-		});
-		return next(null, sum);
-		};
-		server.method('sumObj', addArray, {
-		cache: { expiresIn: 2000 },
-		generateKey: function (array) {
-		return array.join(',');
-		}
-		});
-		server.methods.sumObj([5, 6], function (err, result) {
-		console.log(result);
-		});
-		// Synchronous method with cache
-		var addSync = function (a, b) {
-		return a + b;
-		};
-		server.method('sumSync', addSync, { cache: { expiresIn: 2000 }, callback: false });
-		server.methods.sumSync(4, 5, function (err, result) {
-		console.log(result);
-		}); */
-        method(
-            /**  a unique method name used to invoke the method via server.methods[name]. When configured with caching enabled, server.methods[name].cache.drop(arg1, arg2, ..., argn, callback) can be used to clear the cache for a given key. Supports using nested names such as utils.users.get which will automatically create the missing path under server.methods and can be accessed for the previous example via server.methods.utils.users.get.*/
-            name: string,
-            method: IServerMethod,
-            options?: IServerMethodOptions): void;
-
-
-		/**server.method(methods)
-		Registers a server method function as described in server.method() using a configuration object where:
-		methods - an object or an array of objects where each one contains:
-		name - the method name.
-		method - the method function.
-		options - optional settings.
-		var add = function (a, b, next) {
-		next(null, a + b);
-		};
-		server.method({
-		name: 'sum',
-		method: add,
-		options: {
-		cache: {
-		expiresIn: 2000
-		}
-		}
-		});*/
-        method(methods: {
-            name: string; method: IServerMethod; options?: IServerMethodOptions
-        } | Array<{
-            name: string; method: IServerMethod; options?: IServerMethodOptions
-        }>): void;
-		/**server.path(relativeTo)
-		Sets the path prefix used to locate static resources (files and view templates) when relative paths are used where:
-		relativeTo - the path prefix added to any relative file path starting with '.'.
-		Note that setting a path within a plugin only applies to resources accessed by plugin methods. If no path is set, the connection files.relativeTo configuration is used. The path only applies to routes added after it has been set.
-		exports.register = function (server, options, next) {
-		server.path(__dirname + '../static');
-		server.route({ path: '/file', method: 'GET', handler: { file: './test.html' } });
-		next();
-		};*/
-        path(relativeTo: string): void;
-
-
-		/**
-		* server.register(plugins, [options], callback)
-		* Registers a plugin where:
-		* plugins - an object or array of objects where each one is either:
-		* a plugin registration function.
-		* an object with the following:
-		* register - the plugin registration function.
-		* options - optional options passed to the registration function when called.
-		* options - optional registration options (different from the options passed to the registration function):
-		* select - a string or array of string labels used to pre-select connections for plugin registration.
-		* routes - modifiers applied to each route added by the plugin:
-		* prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
-		* vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
-		* callback - the callback function with signature function(err) where:
-		* err - an error returned from the registration function. Note that exceptions thrown by the registration function are not handled by the framework.
-		*
-		* If no callback is provided, a Promise object is returned.
-		*/
-        register(plugins: any | any[], options: {
-                select: string | string[];
-                routes: {
-                    prefix: string; vhost?: string | string[]
-                };
-            }, callback: (err: any) => void): void;
-        register(plugins: any | any[], options: {
-                select: string | string[];
-                routes: {
-                    prefix: string; vhost?: string | string[]
-                };
-            }): IPromise<any>;
-
-        register(plugins: any | any[], callback: (err: any) => void): void;
-        register(plugins: any | any[]): IPromise<any>;
-
-		/**server.render(template, context, [options], callback)
-		Utilizes the server views manager to render a template where:
-		template - the template filename and path, relative to the views manager templates path (path or relativeTo).
-		context - optional object used by the template to render context-specific result. Defaults to no context ({}).
-		options - optional object used to override the views manager configuration.
-		callback - the callback function with signature function (err, rendered, config) where:
-		err - the rendering error if any.
-		rendered - the result view string.
-		config - the configuration used to render the template.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.views({
-		engines: { html: require('handlebars') },
-		path: __dirname + '/templates'
-		});
-		var context = {
-		title: 'Views Example',
-		message: 'Hello, World'
-		};
-		server.render('hello', context, function (err, rendered, config) {
-		console.log(rendered);
-		});*/
-        render(template: string, context: any, options: any, callback: (err: any, rendered: any, config: any) => void): void;
-		/** server.route(options)
-		Adds a connection route where:
-		options - a route configuration object or an array of configuration objects.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.route({ method: 'GET', path: '/', handler: function (request, reply) { return reply('ok'); } });
-		server.route([
-		{ method: 'GET', path: '/1', handler: function (request, reply) { return reply('ok'); } },
-		{ method: 'GET', path: '/2', handler: function (request, reply) { return reply('ok'); } }
-		]);*/
-        route(options: IRouteConfiguration): void;
-        route(options: IRouteConfiguration[]): void;
-		/**server.select(labels)
-		Selects a subset of the server's connections where:
-		labels - a single string or array of strings of labels used as a logical OR statement to select all the connections with matching labels in their configuration.
-		Returns a server object with connections set to the requested subset. Selecting again on a selection operates as a logic AND statement between the individual selections.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80, labels: ['a'] });
-		server.connection({ port: 8080, labels: ['b'] });
-		server.connection({ port: 8081, labels: ['c'] });
-		server.connection({ port: 8082, labels: ['c','d'] });
-		var a = server.select('a');          // The server with port 80
-		var ab = server.select(['a','b']);   // A list of servers containing the server with port 80 and the server with port 8080
-		var c = server.select('c');          // A list of servers containing the server with port 8081 and the server with port 8082 */
-        select(labels: string | string[]): Server | Server[];
-		/** server.start([callback])
-		Starts the server connections by listening for incoming requests on the configured port of each listener (unless the connection was configured with autoListen set to false), where:
-		callback - optional callback when server startup is completed or failed with the signature function(err) where:
-		err - any startup error condition.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.start(function (err) {
-		console.log('Server started at: ' + server.info.uri);
-		});*/
-        start(callback?: (err: any) => void): IPromise<void>;
-		/** server.state(name, [options])
-		HTTP state management uses client cookies to persist a state across multiple requests. Registers a cookie definitions
-		State defaults can be modified via the server connections.routes.state configuration option.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		// Set cookie definition
-		server.state('session', {
-		ttl: 24 * 60 * 60 * 1000,     // One day
-		isSecure: true,
-		path: '/',
-		encoding: 'base64json'
-		});
-		// Set state in route handler
-		var handler = function (request, reply) {
-		var session = request.state.session;
-		if (!session) {
-		session = { user: 'joe' };
-		}
-		session.last = Date.now();
-		return reply('Success').state('session', session);
-		};
-		Registered cookies are automatically parsed when received. Parsing rules depends on the route state.parse configuration. If an incoming registered cookie fails parsing, it is not included in request.state, regardless of the state.failAction setting. When state.failAction is set to 'log' and an invalid cookie value is received, the server will emit a 'request-internal' event. To capture these errors subscribe to the 'request-internal' events and filter on 'error' and 'state' tags:
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.on('request-internal', function (request, event, tags) {
-		if (tags.error && tags.state) {
-		console.error(event);
-		}
-		});	*/
-        state(name: string, options?: ICookieSettings): void;
-
-		/** server.stop([options], [callback])
-		Stops the server's connections by refusing to accept any new connections or requests (existing connections will continue until closed or timeout), where:
-		options - optional object with:
-		timeout - overrides the timeout in millisecond before forcefully terminating a connection. Defaults to 5000 (5 seconds).
-		callback - optional callback method with signature function() which is called once all the connections have ended and it is safe to exit the process.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.stop({ timeout: 60 * 1000 }, function () {
-		console.log('Server stopped');
-		});*/
-        stop(options?: { timeout: number }, callback?: () => void): IPromise<void>;
-		/**server.table([host])
-		Returns a copy of the routing table where:
-		host - optional host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
-		The return value is an array where each item is an object containing:
-		info - the connection.info the connection the table was generated for.
-		labels - the connection labels.
-		table - an array of routes where each route contains:
-		settings - the route config with defaults applied.
-		method - the HTTP method in lower case.
-		path - the route path.
-		Note that if the server has not been started and multiple connections use port 0, the table items will override each other and will produce an incomplete result.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80, host: 'example.com' });
-		server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
-		var table = server.table();
-		When calling connection.table() directly on each connection, the return value is the same as the array table item value of an individual connection:
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80, host: 'example.com' });
-		server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
-		var table = server.connections[0].table();
-		//[
-		//    {
-		//        method: 'get',
-		//        path: '/example',
-		//        settings: { ... }
-		//    }
-		//]
-		*/
-        table(host?: any): IConnectionTable;
-
-		/**server.views(options)
-		Initializes the server views manager
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.views({
-		engines: {
-		html: require('handlebars'),
-		jade: require('jade')
-		},
-		path: '/static/templates'
-		});
-		When server.views() is called within a plugin, the views manager is only available to plugins methods.*/
-        views(options: IServerViewsConfiguration): void;
-
-    }
-}
diff --git a/hapi/index.d.ts b/hapi/index.d.ts
new file mode 100644
index 0000000000..c95db3380d
--- /dev/null
+++ b/hapi/index.d.ts
@@ -0,0 +1,2426 @@
+// Type definitions for hapi 13.0.0
+// Project: http://github.com/spumko/hapi
+// Definitions by: Jason Swearingen <http://github.com/jasonswearingen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+//Note/Disclaimer: This .d.ts was created against hapi v8.x but has been incrementally upgraded to 13.x.  Some newer features/changes may be missing.  YMMV.
+
+
+/// <reference types="node" />
+
+import http = require("http");
+import stream = require("stream");
+import Events = require("events");
+import url = require("url");
+
+interface IDictionary<T> {
+	[key: string]: T;
+}
+
+interface IThenable<R> {
+	then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => U | IThenable<U>): IThenable<U>;
+	then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => void): IThenable<U>;
+}
+
+interface IPromise<R> extends IThenable<R> {
+	then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => U | IThenable<U>): IPromise<U>;
+	then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => void): IPromise<U>;
+	catch<U>(onRejected?: (error: any) => U | IThenable<U>): IPromise<U>;
+}
+
+export interface IHeaderOptions {
+	append?: boolean;
+	separator?: string;
+	override?: boolean;
+	duplicate?: boolean;
+}
+
+/** Boom Module for errors. https://github.com/hapijs/boom
+ *  boom provides a set of utilities for returning HTTP errors. Each utility returns a Boom error response object (instance of Error) which includes the following properties:  */
+export interface IBoom extends Error {
+	/**  if true, indicates this is a Boom object instance.  */
+	isBoom: boolean;
+	/** convenience bool indicating status code >= 500.  */
+	isServer: boolean;
+	/**  the error message.  */
+	message: string;
+	/**  the formatted response.Can be directly manipulated after object construction to return a custom error response.Allowed root keys:  */
+	output: {
+		/** the HTTP status code (typically 4xx or 5xx).  */
+		statusCode: number;
+		/** an object containing any HTTP headers where each key is a header name and value is the header content.  */
+		headers: IDictionary<string>;
+		/** the formatted object used as the response payload (stringified).Can be directly manipulated but any changes will be lost if reformat() is called.Any content allowed and by default includes the following content: */
+		payload: {
+			/** the HTTP status code, derived from error.output.statusCode.  */
+			statusCode: number;
+			/** the HTTP status message (e.g. 'Bad Request', 'Internal Server Error') derived from statusCode.  */
+			error: string;
+			/** the error message derived from error.message. */
+			message: string;
+		};
+	};
+	/**  reformat()rebuilds error.output using the other object properties.  */
+	reformat(): void;
+
+}
+
+/** cache functionality via the "CatBox" module. */
+export interface ICatBoxCacheOptions {
+	/**  a prototype function or catbox engine object.  */
+	engine: any;
+	/**   an identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisions as well.  */
+	name?: string;
+	/**   if true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.  */
+	shared?: boolean;
+}
+
+/** Any connections configuration server defaults can be included to override and customize the individual connection. */
+export interface IServerConnectionOptions extends IConnectionConfigurationServerDefaults {
+	/**  - the public hostname or IP address. Used only to set server.info.host and server.info.uri. If not configured, defaults to the operating system hostname and if not available, to 'localhost'.*/
+	host?: string;
+	/** - sets the host name or IP address the connection will listen on.If not configured, defaults to host if present, otherwise to all available network interfaces (i.e. '0.0.0.0').Set to 127.0.0.1 or localhost to restrict connection to only those coming from the same machine.*/
+	address?: string;
+	/** - the TCP port the connection will listen to.Defaults to an ephemeral port (0) which uses an available port when the server is started (and assigned to server.info.port).If port is a string containing a '/' character, it is used as a UNIX domain socket path and if it starts with '\.\pipe' as a Windows named pipe.*/
+	port?: string | number;
+	/** - the full public URI without the path (e.g. 'http://example.com:8080').If present, used as the connection info.uri otherwise constructed from the connection settings.*/
+	uri?: string;
+	/**  - optional node.js HTTP (or HTTPS) http.Server object or any compatible object.If the listener needs to be manually started, set autoListen to false.If the listener uses TLS, set tls to true.*/
+	listener?: any;
+	/**  - indicates that the connection.listener will be started manually outside the framework.Cannot be specified with a port setting.Defaults to true.*/
+	autoListen?: boolean;
+	/**  caching headers configuration: */
+	cache?: {
+		/** - an array of HTTP response status codes (e.g. 200) which are allowed to include a valid caching directive.Defaults to [200]. */
+		statuses: number[];
+	};
+	/** - a string or string array of labels used to server.select() specific connections matching the specified labels.Defaults to an empty array [](no labels).*/
+	labels?: string | string[];
+	/**  - used to create an HTTPS connection.The tls object is passed unchanged as options to the node.js HTTPS server as described in the node.js HTTPS documentation.Set to true when passing a listener object that has been configured to use TLS directly. */
+	tls?: boolean | { key?: string; cert?: string; pfx?: string; } | Object;
+
+}
+
+export interface IConnectionConfigurationServerDefaults {
+	/**  application-specific connection configuration which can be accessed via connection.settings.app. Provides a safe place to store application configuration without potential conflicts with the framework internals. Should not be used to configure plugins which should use plugins[name]. Note the difference between connection.settings.app which is used to store configuration values and connection.app which is meant for storing run-time state.  */
+	app?: any;
+	/**  connection load limits configuration where:  */
+	load?: {
+		/**  maximum V8 heap size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
+		maxHeapUsedBytes: number;
+		/**  maximum process RSS size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
+		maxRssBytes: number;
+		/**  maximum event loop delay duration in milliseconds over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
+		maxEventLoopDelay: number;
+	};
+	/**  plugin-specific configuration which can later be accessed via connection.settings.plugins. Provides a place to store and pass connection-specific plugin configuration. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between connection.settings.plugins which is used to store configuration values and connection.plugins which is meant for storing run-time state. */
+	plugins?: any;
+	/**  controls how incoming request URIs are matched against the routing table: */
+	router?: {
+		/**  determines whether the paths '/example' and '/EXAMPLE' are considered different resources. Defaults to true.  */
+		isCaseSensitive: boolean;
+		/**  removes trailing slashes on incoming paths. Defaults to false.  */
+		stripTrailingSlash: boolean;
+	};
+	/** a route options object used to set the default configuration for every route. */
+	routes?: IRouteAdditionalConfigurationOptions;
+	state?: IServerState;
+}
+
+/** Note that the options object is deeply cloned and cannot contain any values that are unsafe to perform deep copy on.*/
+export interface IServerOptions {
+	/**  application-specific configuration which can later be accessed via server.settings.app. Note the difference between server.settings.app which is used to store static configuration values and server.app which is meant for storing run-time state. Defaults to {}.  */
+	app?: any;
+	/**   sets up server-side caching. Every server includes a default cache for storing application state. By default, a simple memory-based cache is created which has limited capacity and capabilities. hapi uses catbox for its cache which includes support for common storage solutions (e.g. Redis, MongoDB, Memcached, and Riak). Caching is only utilized if methods and plugins explicitly store their state in the cache. The server cache configuration only defines the storage container itself. cache can be assigned:
+	 a prototype function (usually obtained by calling require() on a catbox strategy such as require('catbox-redis')).
+	 a configuration object with the following options:
+	 enginea prototype function or catbox engine object.
+	 namean identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisions as well.
+	 sharedif true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.
+	 other options passed to the catbox strategy used.
+	 an array of the above object for configuring multiple cache instances, each with a unique name. When an array of objects is provided, multiple cache connections are established and each array item (except one) must include a name.  */
+	cache?: string | ICatBoxCacheOptions | Array<ICatBoxCacheOptions> | any;
+	/**  sets the default connections configuration which can be overridden by each connection where:  */
+	connections?: IConnectionConfigurationServerDefaults;
+	/** determines which logged events are sent to the console (this should only be used for development and does not affect which events are actually logged internally and recorded). Set to false to disable all console logging, or to an object*/
+	debug?: boolean | {
+		/** - a string array of server log tags to be displayed via console.error() when the events are logged via server.log() as well as internally generated server logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error. */
+		log: string[];
+		/**  - a string array of request log tags to be displayed via console.error() when the events are logged via request.log() as well as internally generated request logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error.*/
+		request: string[];
+	};
+	/** file system related settings*/
+	files?: {
+		/**  sets the maximum number of file etag hash values stored in the etags cache. Defaults to 10000.*/
+		etagsCacheMaxSize?: number;
+	};
+	/**  process load monitoring*/
+	load?: {
+		/**  the frequency of sampling in milliseconds. Defaults to 0 (no sampling).*/
+		sampleInterval?: number;
+	};
+
+	/** options passed to the mimos module (https://github.com/hapijs/mimos) when generating the mime database used by the server and accessed via server.mime.*/
+	mime?: any;
+	/**  if true, does not load the inert (file and directory support), h2o2 (proxy support), and vision (views support) plugins automatically. The plugins can be loaded manually after construction. Defaults to false (plugins loaded). */
+	minimal?: boolean;
+	/** plugin-specific configuration which can later be accessed via server.settings.plugins. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between server.settings.plugins which is used to store static configuration values and server.plugins which is meant for storing run-time state. Defaults to {}.*/
+	plugins?: IDictionary<any>;
+
+}
+
+export interface IServerViewCompile {
+	(template: string, options: any): void;
+	(template: string, options: any, callback: (err: any, compiled: (context: any, options: any, callback: (err: any, rendered: boolean) => void) => void) => void): void;
+}
+
+export interface IServerViewsAdditionalOptions {
+	/**    path - the root file path used to resolve and load the templates identified when calling reply.view().Defaults to current working directory.*/
+	path?: string;
+	/**partialsPath - the root file path where partials are located.Partials are small segments of template code that can be nested and reused throughout other templates.Defaults to no partials support (empty path).
+	 */
+	partialsPath?: string;
+	/**helpersPath - the directory path where helpers are located.Helpers are functions used within templates to perform transformations and other data manipulations using the template context or other inputs.Each '.js' file in the helpers directory is loaded and the file name is used as the helper name.The files must export a single method with the signature function(context) and return a string.Sub - folders are not supported and are ignored.Defaults to no helpers support (empty path).Note that jade does not support loading helpers this way.*/
+	helpersPath?: string;
+	/**relativeTo - a base path used as prefix for path and partialsPath.No default.*/
+	relativeTo?: string;
+
+	/**layout - if set to true or a layout filename, layout support is enabled.A layout is a single template file used as the parent template for other view templates in the same engine.If true, the layout template name must be 'layout.ext' where 'ext' is the engine's extension. Otherwise, the provided filename is suffixed with the engine's extension and loaded.Disable layout when using Jade as it will handle including any layout files independently.Defaults to false.*/
+	layout?: boolean | string;
+	/**layoutPath - the root file path where layout templates are located (using the relativeTo prefix if present). Defaults to path.*/
+	layoutPath?: string;
+	/**layoutKeyword - the key used by the template engine to denote where primary template content should go.Defaults to 'content'.*/
+	layoutKeywork?: string;
+	/**encoding - the text encoding used by the templates when reading the files and outputting the result.Defaults to 'utf8'.*/
+	encoding?: string;
+	/**isCached - if set to false, templates will not be cached (thus will be read from file on every use).Defaults to true.*/
+	isCached?: boolean;
+	/**allowAbsolutePaths - if set to true, allows absolute template paths passed to reply.view().Defaults to false.*/
+	allowAbsolutePaths?: boolean;
+	/**allowInsecureAccess - if set to true, allows template paths passed to reply.view() to contain '../'.Defaults to false.*/
+	allowInsecureAccess?: boolean;
+	/**compileOptions - options object passed to the engine's compile function. Defaults to empty options {}.*/
+	compileOptions?: any;
+	/**runtimeOptions - options object passed to the returned function from the compile operation.Defaults to empty options {}.*/
+	runtimeOptions?: any;
+	/**contentType - the content type of the engine results.Defaults to 'text/html'.*/
+	contentType?: string;
+	/**compileMode - specify whether the engine compile() method is 'sync' or 'async'.Defaults to 'sync'.*/
+	compileMode?: string;
+	/**context - a global context used with all templates.The global context option can be either an object or a function that takes no arguments and returns a context object.When rendering views, the global context will be merged with any context object specified on the handler or using reply.view().When multiple context objects are used, values from the global context always have lowest precedence.*/
+	context?: any;
+}
+
+export interface IServerViewsEnginesOptions extends IServerViewsAdditionalOptions {
+	/**- the npm module used for rendering the templates.The module object must contain: "module", the rendering function. The required function signature depends on the compileMode settings.
+	 * If the compileMode is 'sync', the signature is compile(template, options), the return value is a function with signature function(context, options), and the method is allowed to throw errors.If the compileMode is 'async', the signature is compile(template, options, callback) where callback has the signature function(err, compiled) where compiled is a function with signature function(context, options, callback) and callback has the signature function(err, rendered).*/
+		module: {
+		compile?(template: any, options: any): (context: any, options: any) => void;
+		compile?(template: any, options: any, callback: (err: any, compiled: (context: any, options: any, callback: (err: any, rendered: any) => void) => void) => void): void;
+	};
+}
+
+/**Initializes the server views manager
+ var Hapi = require('hapi');
+ var server = new Hapi.Server();
+
+ server.views({
+engines: {
+html: require('handlebars'),
+jade: require('jade')
+},
+path: '/static/templates'
+});
+ When server.views() is called within a plugin, the views manager is only available to plugins methods.
+ */
+export interface IServerViewsConfiguration extends IServerViewsAdditionalOptions {
+	/** - required object where each key is a file extension (e.g. 'html', 'hbr'), mapped to the npm module used for rendering the templates.Alternatively, the extension can be mapped to an object with the following options:*/
+	engines: IDictionary<any> | IServerViewsEnginesOptions;
+	/**  defines the default filename extension to append to template names when multiple engines are configured and not explicit extension is provided for a given template. No default value.*/
+	defaultExtension?: string;
+}
+
+/**  Concludes the handler activity by setting a response and returning control over to the framework where:
+ erran optional error response.
+ resultan optional response payload.
+ Since an request can only have one response regardless if it is an error or success, the reply() method can only result in a single response value. This means that passing both an err and result will only use the err. There is no requirement for either err or result to be (or not) an Error object. The framework will simply use the first argument if present, otherwise the second. The method supports two arguments to be compatible with the common callback pattern of error first.
+ FLOW CONTROL:
+ When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods: hold(), send() */
+export interface IReply {
+	<T>(err: Error,
+		result?: string | number | boolean | Buffer | stream.Stream | IPromise<T> | T,
+		/**  Note that when used to return both an error and credentials in the authentication methods, reply() must be called with three arguments function(err, null, data) where data is the additional authentication information. */
+		credentialData?: any): IBoom;
+	/**  Note that if result is a Stream with a statusCode property, that status code will be used as the default response code.  */
+	<T>(result: string | number | boolean | Buffer | stream.Stream | IPromise<T> | T): Response;
+
+	/** Returns control back to the framework without setting a response. If called in the handler, the response defaults to an empty payload with status code 200.
+	 * The data argument is only used for passing back authentication data and is ignored elsewhere. */
+	continue(credentialData?: any): void;
+
+	/** Transmits a file from the file system. The 'Content-Type' header defaults to the matching mime type based on filename extension.  The response flow control rules do not apply. */
+	file(/**   the file path. */
+		 path: string,
+		 /**  optional settings:  */
+		 options?: {
+			 /** - an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path*/
+			 filename?: string;
+			 /** specifies whether to include the 'Content-Disposition' header with the response. Available values:
+			  false - header is not included. This is the default value.
+			  'attachment'
+			  'inline'*/
+			 mode?: boolean | string;
+			 /**   if true, looks for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.  */
+			 lookupCompressed: boolean;
+		 }): void;
+	/**  Concludes the handler activity by returning control over to the router with a templatized view response.
+	 the response flow control rules apply. */
+	view(/**  the template filename and path, relative to the templates path configured via the server views manager. */
+		 template: string,
+		 /**  optional object used by the template to render context-specific result. Defaults to no context {}. */
+		 context?: {},
+		 /**  optional object used to override the server's views manager configuration for this response. Cannot override isCached, partialsPath, or helpersPath which are only loaded at initialization.  */
+		 options?: any): Response;
+	/** Sets a header on the response */
+	header(name: string, value: string, options?: IHeaderOptions): Response;
+
+	/** Concludes the handler activity by returning control over to the router and informing the router that a response has already been sent back directly via request.raw.res and that no further response action is needed
+	 The response flow control rules do not apply. */
+	close(options?: {
+		/**   if false, the router will not call request.raw.res.end()) to ensure the response was ended. Defaults to true.  */
+		end?: boolean;
+	}): void;
+	/** Proxies the request to an upstream endpoint.
+	 the response flow control rules do not apply. */
+
+	proxy(/**  an object including the same keys and restrictions defined by the route proxy handler options. */
+		  options: IProxyHandlerConfig): void;
+	/** Redirects the client to the specified uri. Same as calling reply().redirect(uri).
+	 he response flow control rules apply. */
+	redirect(uri: string): ResponseRedirect;
+
+	/** Replies with the specified response */
+	response(result: any): Response;
+
+	/** Sets a cookie on the response */
+	state(name: string, value: any, options?: any): void;
+
+	/** Clears a cookie on the response */
+	unstate(name: string, options?: any): void;
+}
+
+export interface ISessionHandler {
+	(request: Request, reply: IReply): void;
+}
+export interface IRequestHandler<T> {
+	(request: Request): T;
+}
+
+
+export interface IFailAction {
+	(source: string, error: any, next: () => void): void
+}
+/**  generates a reverse proxy handler */
+export interface IProxyHandlerConfig {
+	/** the upstream service host to proxy requests to. The same path on the client request will be used as the path on the host.*/
+	host?: string;
+	/** the upstream service port. */
+	port?: number;
+	/**  The protocol to use when making a request to the proxied host:
+	 'http'
+	 'https'*/
+	protocol?: string;
+	/**  an absolute URI used instead of the incoming host, port, protocol, path, and query. Cannot be used with host, port, protocol, or mapUri.*/
+	uri?: string;
+	/**  if true, forwards the headers sent from the client to the upstream service being proxied to, headers sent from the upstream service will also be forwarded to the client. Defaults to false.*/
+	passThrough?: boolean;
+	/** localStatePassThrough - if false, any locally defined state is removed from incoming requests before being passed upstream. This is a security feature to prevent local state (e.g. authentication cookies) from leaking upstream to other servers along with the cookies intended for those servers. This value can be overridden on a per state basis via the server.state() passThrough option. Defaults to false.*/
+	localStatePassThrough?: boolean;
+	/**acceptEncoding - if false, does not pass-through the 'Accept-Encoding' HTTP header which is useful when using an onResponse post-processing to avoid receiving an encoded response (e.g. gzipped). Can only be used together with passThrough. Defaults to true (passing header).*/
+	acceptEncoding?: boolean;
+	/** rejectUnauthorized - sets the rejectUnauthorized property on the https agent making the request. This value is only used when the proxied server uses TLS/SSL. When set it will override the node.js rejectUnauthorized property. If false then ssl errors will be ignored. When true the server certificate is verified and an 500 response will be sent when verification fails. This shouldn't be used alongside the agent setting as the agent will be used instead. Defaults to the https agent default value of true.*/
+	rejectUnauthorized?: boolean;
+	/**if true, sets the 'X-Forwarded-For', 'X-Forwarded-Port', 'X-Forwarded-Proto' headers when making a request to the proxied upstream endpoint. Defaults to false.*/
+	xforward?: boolean;
+	/** the maximum number of HTTP redirections allowed, to be followed automatically by the handler. Set to false or 0 to disable all redirections (the response will contain the redirection received from the upstream service). If redirections are enabled, no redirections (301, 302, 307, 308) will be passed along to the client, and reaching the maximum allowed redirections will return an error response. Defaults to false.*/
+	redirects?: boolean | number;
+	/**number of milliseconds before aborting the upstream request. Defaults to 180000 (3 minutes).*/
+	timeout?: number;
+	/** a function used to map the request URI to the proxied URI. Cannot be used together with host, port, protocol, or uri. The function signature is function(request, callback) where:
+	 request - is the incoming request object.
+	 callback - is function(err, uri, headers) where:
+	 err - internal error condition.
+	 uri - the absolute proxy URI.
+	 headers - optional object where each key is an HTTP request header and the value is the header content.*/
+	mapUri?: (request: Request, callback: (err: any, uri: string, headers?: { [key: string]: string }) => void) => void;
+	/**  a custom function for processing the response from the upstream service before sending to the client. Useful for custom error handling of responses from the proxied endpoint or other payload manipulation. Function signature is function(err, res, request, reply, settings, ttl) where: - err - internal or upstream error returned from attempting to contact the upstream proxy. - res - the node response object received from the upstream service. res is a readable stream (use the wreck module read method to easily convert it to a Buffer or string). - request - is the incoming request object. - reply - the reply interface function. - settings - the proxy handler configuration. - ttl - the upstream TTL in milliseconds if proxy.ttl it set to 'upstream' and the upstream response included a valid 'Cache-Control' header with 'max-age'.*/
+	onResponse?: (err: any,
+				  res: http.ServerResponse,
+				  req: Request,
+				  reply: IReply,
+				  settings: IProxyHandlerConfig,
+				  ttl: number) => void;
+	/** if set to 'upstream', applies the upstream response caching policy to the response using the response.ttl() method (or passed as an argument to the onResponse method if provided).*/
+	ttl?: number;
+	/** - a node http(s) agent to be used for connections to upstream server.  see https://nodejs.org/api/http.html#http_class_http_agent */
+	agent?: http.Agent;
+	/** sets the maximum number of sockets available per outgoing proxy host connection. false means use the wreck module default value (Infinity). Does not affect non-proxy outgoing client connections. Defaults to Infinity.*/
+	maxSockets?: boolean | number;
+}
+/**  TODO: fill in joi definition  */
+export interface IJoi {
+
+}
+/**  a validation function using the signature function(value, options, next) */
+export interface IValidationFunction {
+
+	(/**   the object containing the path parameters. */
+	 value: any,
+	 /**  the server validation options. */
+	 options: any,
+	 /**   the callback function called when validation is completed.  */
+	 next: (err: any, value: any) => void): void;
+}
+/**  a custom error handler function with the signature 'function(request, reply, source, error)` */
+export interface IRouteFailFunction {
+	/**  a custom error handler function with the signature 'function(request, reply, source, error)` */
+	(/** - the [request object]. */
+	 request: Request,
+	 /**   the continuation reply interface. */
+	 reply: IReply,
+	 /**  the source of the invalid field (e.g. 'path', 'query', 'payload'). */
+	 source: string,
+	 /**  the error object prepared for the client response (including the validation function error under error.data). */
+	 error: any): void;
+}
+
+/**  Each route can be customize to change the default behavior of the request lifecycle using the following options:  */
+export interface IRouteAdditionalConfigurationOptions {
+	/**  application specific configuration.Should not be used by plugins which should use plugins[name] instead. */
+	app?: any;
+	/** authentication configuration.Value can be: false to disable authentication if a default strategy is set.
+	 a string with the name of an authentication strategy registered with server.auth.strategy().
+	 an object  */
+	auth?: boolean | string |
+		{
+			/**  the authentication mode.Defaults to 'required' if a server authentication strategy is configured, otherwise defaults to no authentication.Available values:
+			 'required'authentication is required.
+			 'optional'authentication is optional (must be valid if present).
+			 'try'same as 'optional' but allows for invalid authentication. */
+			mode?: string;
+			/**  a string array of strategy names in order they should be attempted.If only one strategy is used, strategy can be used instead with the single string value.Defaults to the default authentication strategy which is available only when a single strategy is configured.  */
+			strategies?: string | Array<string>;
+			/**  if set, the payload (in requests other than 'GET' and 'HEAD') is authenticated after it is processed.Requires a strategy with payload authentication support (e.g.Hawk).Cannot be set to a value other than 'required' when the scheme sets the options.payload to true.Available values:
+			 falseno payload authentication.This is the default value.
+			 'required'payload authentication required.This is the default value when the scheme sets options.payload to true.
+			 'optional'payload authentication performed only when the client includes payload authentication information (e.g.hash attribute in Hawk). */
+			payload?: string;
+			/**  the application scope required to access the route.Value can be a scope string or an array of scope strings.The authenticated credentials object scope property must contain at least one of the scopes defined to access the route.Set to false to remove scope requirements.Defaults to no scope required.  */
+			scope?: string | Array<string> | boolean;
+			/** the required authenticated entity type.If set, must match the entity value of the authentication credentials.Available values:
+			 anythe authentication can be on behalf of a user or application.This is the default value.
+			 userthe authentication must be on behalf of a user.
+			 appthe authentication must be on behalf of an application. */
+			entity?: string;
+			/**
+			 * an object or array of objects specifying the route access rules. Each rule is evaluated against an incoming
+			 * request and access is granted if at least one rule matches. Each rule object must include at least one of:
+			 */
+			access?: IRouteAdditionalConfigurationAuthAccess | IRouteAdditionalConfigurationAuthAccess[];
+		};
+	/** an object passed back to the provided handler (via this) when called. */
+	bind?: any;
+	/** if the route method is 'GET', the route can be configured to include caching directives in the response using the following options */
+	cache?: {
+		/**  mines the privacy flag included in clientside caching using the 'Cache-Control' header.Values are:
+		 fault'no privacy flag.This is the default setting.
+		 'public'mark the response as suitable for public caching.
+		 'private'mark the response as suitable only for private caching.  */
+		privacy: string;
+		/**  relative expiration expressed in the number of milliseconds since the item was saved in the cache.Cannot be used together with expiresAt. */
+		expiresIn: number;
+		/**  time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire.Cannot be used together with expiresIn.  */
+		expiresAt: string;
+	};
+	/** the Cross- Origin Resource Sharing protocol allows browsers to make cross- origin API calls.CORS is required by web applications running inside a browser which are loaded from a different domain than the API server.CORS headers are disabled by default. To enable, set cors to true, or to an object with the following options: */
+	cors?: {
+		/** a strings array of allowed origin servers ('Access-Control-Allow-Origin').The array can contain any combination of fully qualified origins along with origin strings containing a wildcard '' character, or a single `''origin string. Defaults to any origin['*']`. */
+		origin?: Array<string>;
+		/** if true, matches the value of the incoming 'Origin' header to the list of origin values ('*' matches anything) and if a match is found, uses that as the value of the 'Access-Control-Allow-Origin' response header.When false, the origin config is returned as- is.Defaults to true.  */
+		matchOrigin?: boolean;
+		/** if false, prevents the connection from returning the full list of non- wildcard origin values if the incoming origin header does not match any of the values.Has no impact if matchOrigin is set to false.Defaults to true. */
+		isOriginExposed?: boolean;
+		/**  number of seconds the browser should cache the CORS response ('Access-Control-Max-Age').The greater the value, the longer it will take before the browser checks for changes in policy.Defaults to 86400 (one day). */
+		maxAge?: number;
+		/**  a strings array of allowed headers ('Access-Control-Allow-Headers').Defaults to ['Authorization', 'Content-Type', 'If-None-Match']. */
+		headers?: string[];
+		/**  a strings array of additional headers to headers.Use this to keep the default headers in place. */
+		additionalHeaders?: string[];
+		/**  a strings array of allowed HTTP methods ('Access-Control-Allow-Methods').Defaults to ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'OPTIONS']. */
+		methods?: string[];
+		/**  a strings array of additional methods to methods.Use this to keep the default methods in place. */
+		additionalMethods?: string[];
+		/**  a strings array of exposed headers ('Access-Control-Expose-Headers').Defaults to ['WWW-Authenticate', 'Server-Authorization']. */
+		exposedHeaders?: string[];
+		/**  a strings array of additional headers to exposedHeaders.Use this to keep the default headers in place. */
+		additionalExposedHeaders?: string[];
+		/**  if true, allows user credentials to be sent ('Access-Control-Allow-Credentials').Defaults to false. */
+		credentials?: boolean;
+		/** if false, preserves existing CORS headers set manually before the response is sent.Defaults to true. */
+		override?: boolean;
+	};
+	/**   defines the behavior for serving static resources using the built-in route handlers for files and directories: */
+	files?: {/** determines the folder relative paths are resolved against when using the file and directory handlers. */
+	relativeTo: string;
+	};
+
+	/**  an alternative location for the route handler option. */
+	handler?: ISessionHandler | string | IRouteHandlerConfig;
+	/** an optional unique identifier used to look up the route using server.lookup(). */
+	id?: number;
+	/** optional arguments passed to JSON.stringify() when converting an object or error response to a string payload.Supports the following: */
+	json?: {
+		/** the replacer function or array.Defaults to no action. */
+		replacer?: Function | string[];
+		/**  number of spaces to indent nested object keys.Defaults to no indentation. */
+		space?: number | string;
+		/** string suffix added after conversion to JSON string.Defaults to no suffix. */
+		suffix?: string;
+	};
+	/** enables JSONP support by setting the value to the query parameter name containing the function name used to wrap the response payload.For example, if the value is 'callback', a request comes in with 'callback=me', and the JSON response is '{ "a":"b" }', the payload will be 'me({ "a":"b" });'.Does not work with stream responses. */
+	jsonp?: string;
+	/** determines how the request payload is processed: */
+	payload?: {
+		/**  the type of payload representation requested. The value must be one of:
+		 'data'the incoming payload is read fully into memory.If parse is true, the payload is parsed (JSON, formdecoded, multipart) based on the 'Content- Type' header.If parse is false, the raw Buffer is returned.This is the default value except when a proxy handler is used.
+		 'stream'the incoming payload is made available via a Stream.Readable interface.If the payload is 'multipart/form-data' and parse is true, fields values are presented as text while files are provided as streams.File streams from a 'multipart/form-data' upload will also have a property hapi containing filename and headers properties.
+		 'file'the incoming payload in written to temporary file in the directory specified by the server's payload.uploads settings. If the payload is 'multipart/ formdata' and parse is true, fields values are presented as text while files are saved. Note that it is the sole responsibility of the application to clean up the files generated by the framework. This can be done by keeping track of which files are used (e.g. using the request.app object), and listening to the server 'response' event to perform any needed cleaup. */
+		output?: string;
+		/**  can be true, false, or gunzip; determines if the incoming payload is processed or presented raw. true and gunzip includes gunzipping when the appropriate 'Content-Encoding' is specified on the received request. If parsing is enabled and the 'Content-Type' is known (for the whole payload as well as parts), the payload is converted into an object when possible. If the format is unknown, a Bad Request (400) error response is sent. Defaults to true, except when a proxy handler is used. The supported mime types are:
+		 'application/json'
+		 'application/x-www-form-urlencoded'
+		 'application/octet-stream'
+		 'text/ *'
+		 'multipart/form-data' */
+		parse?: string | boolean;
+		/** a string or an array of strings with the allowed mime types for the endpoint.Defaults to any of the supported mime types listed above.Note that allowing other mime types not listed will not enable them to be parsed, and that if parsing mode is 'parse', the request will result in an error response. */
+		allow?: string | string[];
+		/** a mime type string overriding the 'Content-Type' header value received.Defaults to no override. */
+		override?: string;
+		/**  limits the size of incoming payloads to the specified byte count.Allowing very large payloads may cause the server to run out of memory.Defaults to 1048576 (1MB).  */
+		maxBytes?: number;
+		/** payload reception timeout in milliseconds.Sets the maximum time allowed for the client to transmit the request payload (body) before giving up and responding with a Request Timeout (408) error response.Set to false to disable.Defaults to 10000 (10 seconds). */
+		timeout?: number;
+		/**  the directory used for writing file uploads.Defaults to os.tmpDir(). */
+		uploads?: string;
+		/**  determines how to handle payload parsing errors. Allowed values are:
+		 'error'return a Bad Request (400) error response. This is the default value.
+		 'log'report the error but continue processing the request.
+		 'ignore'take no action and continue processing the request. */
+		failAction?: string;
+	};
+	/** pluginspecific configuration.plugins is an object where each key is a plugin name and the value is the plugin configuration.  */
+	plugins?: IDictionary<any>;
+	/** an array with [route prerequisites] methods which are executed in serial or in parallel before the handler is called.  */
+	pre?: any[];
+	/** validation rules for the outgoing response payload (response body).Can only validate object response: */
+	response?: {
+		/** the default HTTP status code when the payload is empty. Value can be 200 or 204.
+		 Note that a 200 status code is converted to a 204 only at the time or response transmission
+		 (the response status code will remain 200 throughout the request lifecycle unless manually set). Defaults to 200. */
+		emptyStatusCode?: number;
+		/**   the default response object validation rules (for all non-error responses) expressed as one of:
+		 true - any payload allowed (no validation performed). This is the default.
+		 false - no payload allowed.
+		 a Joi validation object.
+		 a validation function using the signature function(value, options, next) where:
+		 value - the object containing the response object.
+		 options - the server validation options.
+		 next(err) - the callback function called when validation is completed.  */
+		schema?: boolean | any;
+		/** HTTP status- codespecific validation rules.The status key is set to an object where each key is a 3 digit HTTP status code and the value has the same definition as schema.If a response status code is not present in the status object, the schema definition is used, expect for errors which are not validated by default.  */
+		status?: { [statusCode: number]: boolean | any };
+		/** the percent of responses validated (0100).Set to 0 to disable all validation.Defaults to 100 (all responses). */
+		sample?: number;
+		/**  defines what to do when a response fails validation.Options are:
+		 errorreturn an Internal Server Error (500) error response.This is the default value.
+		 loglog the error but send the response.  */
+		failAction?: string;
+		/** if true, applies the validation rule changes to the response.Defaults to false. */
+		modify?: boolean;
+		/** options to pass to Joi.Useful to set global options such as stripUnknown or abortEarly (the complete list is available here: https://github.com/hapijs/joi#validatevalue-schema-options-callback ).Defaults to no options.  */
+		options?: any;
+	};
+	/** sets common security headers (disabled by default).To enable set security to true or to an object with the following options */
+	security?: boolean | {
+		/** controls the 'Strict-Transport-Security' header.If set to true the header will be set to max- age=15768000, if specified as a number the maxAge parameter will be set to that number.Defaults to true.You may also specify an object with the following fields: */
+		hsts?: boolean | number | {
+			/** the max- age portion of the header, as a number.Default is 15768000. */
+			maxAge?: number;
+			/**  a boolean specifying whether to add the includeSubdomains flag to the header. */
+			includeSubdomains?: boolean;
+			/** a boolean specifying whether to add the 'preload' flag (used to submit domains inclusion in Chrome's HTTP Strict Transport Security (HSTS) preload list) to the header. */
+			preload?: boolean;
+		};
+		/** controls the 'X-Frame-Options' header.When set to true the header will be set to DENY, you may also specify a string value of 'deny' or 'sameorigin'.To use the 'allow-from' rule, you must set this to an object with the following fields: */
+		xframe?: {
+			/** either 'deny', 'sameorigin', or 'allow-from' */
+			rule: string;
+			/** when rule is 'allow-from' this is used to form the rest of the header, otherwise this field is ignored.If rule is 'allow-from' but source is unset, the rule will be automatically changed to 'sameorigin'. */
+			source: string;
+		};
+		/** boolean that controls the 'X-XSS-PROTECTION' header for IE.Defaults to true which sets the header to equal '1; mode=block'.NOTE: This setting can create a security vulnerability in versions of IE below 8, as well as unpatched versions of IE8.See here and here for more information.If you actively support old versions of IE, it may be wise to explicitly set this flag to false. */
+		xss?: boolean;
+		/**  boolean controlling the 'X-Download-Options' header for IE, preventing downloads from executing in your context.Defaults to true setting the header to 'noopen'. */
+		noOpen?: boolean;
+		/** boolean controlling the 'X-Content-Type-Options' header.Defaults to true setting the header to its only and default option, 'nosniff'. */
+		noSniff?: boolean;
+	};
+	/** HTTP state management (cookies) allows the server to store information on the client which is sent back to the server with every request (as defined in RFC 6265).state supports the following options: */
+	state?: {
+		/** determines if incoming 'Cookie' headers are parsed and stored in the request.state object.Defaults to true. */
+		parse: boolean;
+		/** determines how to handle cookie parsing errors.Allowed values are:
+		 'error'return a Bad Request (400) error response.This is the default value.
+		 'log'report the error but continue processing the request.
+		 'ignore'take no action. */
+		failAction: string;
+	};
+	/**  request input validation rules for various request components.When using a Joi validation object, the values of the other inputs (i.e.headers, query, params, payload, and auth) are made available under the validation context (accessible in rules as Joi.ref('$query.key')).Note that validation is performed in order(i.e.headers, params, query, payload) and if type casting is used (converting a string to number), the value of inputs not yet validated will reflect the raw, unvalidated and unmodified values.The validate object supports: */
+	validate?: {
+		/** validation rules for incoming request headers.Values allowed:
+		 * trueany headers allowed (no validation performed).This is the default.
+		 falseno headers allowed (this will cause all valid HTTP requests to fail).
+		 a Joi validation object.
+		 a validation function using the signature function(value, options, next) where:
+		 valuethe object containing the request headers.
+		 optionsthe server validation options.
+		 next(err, value)the callback function called when validation is completed.
+		 */
+		headers?: boolean | IJoi | IValidationFunction;
+
+
+		/** validation rules for incoming request path parameters, after matching the path against the route and extracting any parameters then stored in request.params.Values allowed:
+		 trueany path parameters allowed (no validation performed).This is the default.
+		 falseno path variables allowed.
+		 a Joi validation object.
+		 a validation function using the signature function(value, options, next) where:
+		 valuethe object containing the path parameters.
+		 optionsthe server validation options.
+		 next(err, value)the callback function called when validation is completed. */
+		params?: boolean | IJoi | IValidationFunction;
+		/** validation rules for an incoming request URI query component (the key- value part of the URI between '?' and '#').The query is parsed into its individual key- value pairs (using the qs module) and stored in request.query prior to validation.Values allowed:
+		 trueany query parameters allowed (no validation performed).This is the default.
+		 falseno query parameters allowed.
+		 a Joi validation object.
+		 a validation function using the signature function(value, options, next) where:
+		 valuethe object containing the query parameters.
+		 optionsthe server validation options.
+		 next(err, value)the callback function called when validation is completed. */
+		query?: boolean | IJoi | IValidationFunction;
+		/**  validation rules for an incoming request payload (request body).Values allowed:
+		 trueany payload allowed (no validation performed).This is the default.
+		 falseno payload allowed.
+		 a Joi validation object.
+		 a validation function using the signature function(value, options, next) where:
+		 valuethe object containing the payload object.
+		 optionsthe server validation options.
+		 next(err, value)the callback function called when validation is completed.  */
+		payload?: boolean | IJoi | IValidationFunction;
+		/** an optional object with error fields copied into every validation error response. */
+		errorFields?: any;
+		/** determines how to handle invalid requests.Allowed values are:
+		 'error'return a Bad Request (400) error response.This is the default value.
+		 'log'log the error but continue processing the request.
+		 'ignore'take no action.
+		 OR a custom error handler function with the signature 'function(request, reply, source, error)` where:
+		 requestthe request object.
+		 replythe continuation reply interface.
+		 sourcethe source of the invalid field (e.g. 'path', 'query', 'payload').
+		 errorthe error object prepared for the client response (including the validation function error under error.data). */
+		failAction?: string | IRouteFailFunction;
+		/** options to pass to Joi.Useful to set global options such as stripUnknown or abortEarly (the complete list is available here: https://github.com/hapijs/joi#validatevalue-schema-options-callback ).Defaults to no options. */
+		options?: any;
+	};
+	/** define timeouts for processing durations: */
+	timeout?: {
+		/** response timeout in milliseconds.Sets the maximum time allowed for the server to respond to an incoming client request before giving up and responding with a Service Unavailable (503) error response.Disabled by default (false). */
+		server: boolean | number;
+		/** by default, node sockets automatically timeout after 2 minutes.Use this option to override this behavior.Defaults to undefined which leaves the node default unchanged.Set to false to disable socket timeouts. */
+		socket: boolean | number;
+	};
+
+	/**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
+	 *route description used for generating documentation (string).
+	 */
+	description?: string;
+	/**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
+	 *route notes used for generating documentation (string or array of strings).
+	 */
+	notes?: string | string[];
+	/**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
+	 *route tags used for generating documentation (array of strings).
+	 */
+	tags?: string[]
+}
+
+/**
+ * specifying the route access rules. Each rule is evaluated against an incoming request and access is granted if at least one rule matches
+ */
+export interface IRouteAdditionalConfigurationAuthAccess {
+	/**
+	 * the application scope required to access the route. Value can be a scope string or an array of scope strings.
+	 * The authenticated credentials object scope property must contain at least one of the scopes defined to access the route.
+	 * If a scope string begins with a + character, that scope is required. If a scope string begins with a ! character,
+	 * that scope is forbidden. For example, the scope ['!a', '+b', 'c', 'd'] means the incoming request credentials'
+	 * scope must not include 'a', must include 'b', and must include on of 'c' or 'd'. You may also access properties
+	 * on the request object (query and params} to populate a dynamic scope by using {} characters around the property name,
+	 * such as 'user-{params.id}'. Defaults to false (no scope requirements).
+	 */
+	scope?: string | Array<string> | boolean;
+	/** the required authenticated entity type. If set, must match the entity value of the authentication credentials. Available values:
+	 * any - the authentication can be on behalf of a user or application. This is the default value.
+	 * user - the authentication must be on behalf of a user which is identified by the presence of a user attribute in the credentials object returned by the authentication strategy.
+	 * app - the authentication must be on behalf of an application which is identified by the lack of presence of a user attribute in the credentials object returned by the authentication strategy.
+	 */
+	entity?: string;
+}
+
+/** server.realm http://hapijs.com/api#serverrealm
+ The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(),
+ the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin).
+ Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
+ The server.realm object should be considered read-only and must not be changed directly except for the plugins property can be directly manipulated by the plugins (each setting its own under plugins[name]).
+ exports.register = function (server, options, next) {
+console.log(server.realm.modifiers.route.prefix);
+return next();
+};
+ */
+export interface IServerRealm {
+	/** when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method */
+	modifiers: {
+		/** routes preferences: */
+		route: {
+			/** - the route path prefix used by any calls to server.route() from the server. */
+			prefix: string;
+			/**  the route virtual host settings used by any calls to server.route() from the server. */
+			vhost: string;
+		};
+
+	};
+	/** the active plugin name (empty string if at the server root). */
+	plugin: string;
+	/** plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state. */
+	plugins: IDictionary<any>;
+	/**  settings overrides */
+	settings: {
+		files: {
+			relativeTo: any;
+		};
+		bind: any;
+	}
+}
+/** server.state(name, [options]) http://hapijs.com/api#serverstatename-options
+ HTTP state management uses client cookies to persist a state across multiple requests. Registers a cookie definitions where:*/
+export interface IServerState {
+	/**  - the cookie name string. */name: string;
+
+	/** - are the optional cookie settings: */options: {
+		/**  - time - to - live in milliseconds.Defaults to null (session time- life - cookies are deleted when the browser is closed).*/ttl: number;
+		/**  - sets the 'Secure' flag.Defaults to false.*/isSecure: boolean;
+		/**  - sets the 'HttpOnly' flag.Defaults to false.*/isHttpOnly: boolean
+		/**  - the path scope.Defaults to null (no path).*/path: any;
+		/**  - the domain scope.Defaults to null (no domain). */domain: any;
+		/**  if present and the cookie was not received from the client or explicitly set by the route handler, the cookie is automatically added to the response with the provided value. The value can be a function with signature function(request, next) where:
+		 request - the request object.
+		 next - the continuation function using the function(err, value) signature.*/
+		autoValue: (request: Request, next: (err: any, value: any) => void) => void;
+		/**  - encoding performs on the provided value before serialization. Options are:
+		 'none' - no encoding. When used, the cookie value must be a string. This is the default value.
+		 'base64' - string value is encoded using Base64.
+		 'base64json' - object value is JSON-stringified than encoded using Base64.
+		 'form' - object value is encoded using the x-www-form-urlencoded method.
+		 'iron' - Encrypts and sign the value using iron.*/
+		encoding: string;
+		/**  - an object used to calculate an HMAC for cookie integrity validation.This does not provide privacy, only a mean to verify that the cookie value was generated by the server.Redundant when 'iron' encoding is used.Options are:*/sign: {
+			/** - algorithm options.Defaults to require('iron').defaults.integrity.*/integrity: any;
+			/** - password used for HMAC key generation.*/password: string;
+		};
+		/**  - password used for 'iron' encoding.*/password: string;
+		/** - options for 'iron' encoding.Defaults to require('iron').defaults.*/iron: any;
+		/** - if false, errors are ignored and treated as missing cookies.*/ignoreErrors: boolean;
+		/**  - if true, automatically instruct the client to remove invalid cookies.Defaults to false.*/clearInvalid: boolean;
+		/**  - if false, allows any cookie value including values in violation of RFC 6265. Defaults to true.*/strictHeader: boolean;
+		/**  - overrides the default proxy localStatePassThrough setting.*/passThrough: any;
+	};
+}
+
+export interface IFileHandlerConfig {
+	/**  a path string or function as described above.*/
+	path: string;
+	/** an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path*/
+	filename?: string;
+	/**- specifies whether to include the 'Content-Disposition' header with the response. Available values:
+	 false - header is not included. This is the default value.
+	 'attachment'
+	 'inline'*/
+	mode?: boolean | string;
+	/** if true, looks for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.*/
+	lookupCompressed: boolean;
+}
+
+/**http://hapijs.com/api#route-handler
+ Built-in handlers
+
+ The framework comes with a few built-in handler types available by setting the route handler config to an object containing one of these keys.*/
+export interface IRouteHandlerConfig {
+	/** generates a static file endpoint for serving a single file. file can be set to:
+	 a relative or absolute file path string (relative paths are resolved based on the route files configuration).
+	 a function with the signature function(request) which returns the relative or absolute file path.
+	 an object with the following options */
+	file?: string | IRequestHandler<void> | IFileHandlerConfig;
+	/** directory - generates a directory endpoint for serving static content from a directory. Routes using the directory handler must include a path parameter at the end of the path string (e.g. /path/to/somewhere/{param} where the parameter name does not matter). The path parameter can use any of the parameter options (e.g. {param} for one level files only, {param?} for one level files or the directory root, {param*} for any level, or {param*3} for a specific level). If additional path parameters are present, they are ignored for the purpose of selecting the file system resource. The directory handler is an object with the following options:
+	 path - (required) the directory root path (relative paths are resolved based on the route files configuration). Value can be:
+	 a single path string used as the prefix for any resources requested by appending the request path parameter to the provided string.
+	 an array of path strings. Each path will be attempted in order until a match is found (by following the same process as the single path string).
+	 a function with the signature function(request) which returns the path string or an array of path strings. If the function returns an error, the error is passed back to the client in the response.
+	 index - optional boolean|string|string[], determines if an index file will be served if found in the folder when requesting a directory. The given string or strings specify the name(s) of the index file to look for. If true, looks for 'index.html'. Any falsy value disables index file lookup. Defaults to true.
+	 listing - optional boolean, determines if directory listing is generated when a directory is requested without an index document. Defaults to false.
+	 showHidden - optional boolean, determines if hidden files will be shown and served. Defaults to false.
+	 redirectToSlash - optional boolean, determines if requests for a directory without a trailing slash are redirected to the same path with the missing slash. Useful for ensuring relative links inside the response are resolved correctly. Disabled when the server config router.stripTrailingSlash is true.Defaults to false.
+	 lookupCompressed - optional boolean, instructs the file processor to look for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.
+	 defaultExtension - optional string, appended to file requests if the requested file is not found. Defaults to no extension.*/
+	directory?: {
+		path: string | Array<string> | IRequestHandler<string> | IRequestHandler<Array<string>>;
+		index?: boolean | string | string[];
+		listing?: boolean;
+		showHidden?: boolean;
+		redirectToSlash?: boolean;
+		lookupCompressed?: boolean;
+		defaultExtension?: string;
+	};
+	proxy?: IProxyHandlerConfig;
+	view?: string | {
+		template: string;
+		context: {
+			payload: any;
+			params: any;
+			query: any;
+			pre: any;
+		}
+	};
+	config?: {
+		handler: any;
+		bind: any;
+		app: any;
+		plugins: {
+			[name: string]: any;
+		};
+		pre: Array<() => void>;
+		validate: {
+			headers: any;
+			params: any;
+			query: any;
+			payload: any;
+			errorFields?: any;
+			failAction?: string | IFailAction;
+		};
+		payload: {
+			output: {
+				data: any;
+				stream: any;
+				file: any;
+			};
+			parse?: any;
+			allow?: string | Array<string>;
+			override?: string;
+			maxBytes?: number;
+			uploads?: number;
+			failAction?: string;
+		};
+		response: {
+			schema: any;
+			sample: number;
+			failAction: string;
+		};
+		cache: {
+			privacy: string;
+			expiresIn: number;
+			expiresAt: number;
+		};
+		auth: string | boolean | {
+			mode: string;
+			strategies: Array<string>;
+			payload?: boolean | string;
+			tos?: boolean | string;
+			scope?: string | Array<string>;
+			entity: string;
+		};
+		cors?: boolean;
+		jsonp?: string;
+		description?: string;
+		notes?: string | Array<string>;
+		tags?: Array<string>;
+	};
+}
+/** Route configuration
+ The route configuration object*/
+export interface IRouteConfiguration {
+	/**  - (required) the absolute path used to match incoming requests (must begin with '/'). Incoming requests are compared to the configured paths based on the connection router configuration option.The path can include named parameters enclosed in {} which will be matched against literal values in the request as described in Path parameters.*/
+	path: string;
+	/** - (required) the HTTP method.Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'.Any HTTP method is allowed, except for 'HEAD'.Use '*' to match against any HTTP method (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match).
+	 * Can be assigned an array of methods which has the same result as adding the same route with different methods manually.*/
+	method: string | string[];
+	/**  - an optional domain string or an array of domain strings for limiting the route to only requests with a matching host header field.Matching is done against the hostname part of the header only (excluding the port).Defaults to all hosts.*/
+	vhost?: string;
+	/**  - (required) the function called to generate the response after successful authentication and validation.The handler function is described in Route handler.If set to a string, the value is parsed the same way a prerequisite server method string shortcut is processed.Alternatively, handler can be assigned an object with a single key using the name of a registered handler type and value with the options passed to the registered handler.*/
+	handler: ISessionHandler | string | IRouteHandlerConfig;
+	/** - additional route options.*/
+	config?: IRouteAdditionalConfigurationOptions;
+}
+/** Route public interface When route information is returned or made available as a property.  http://hapijs.com/api#route-public-interface */
+export interface IRoute {
+
+
+	/** the route HTTP method. */
+	method: string;
+	/** the route path. */
+	path: string;
+	/** the route vhost option if configured. */
+	vhost?: string | Array<string>;
+	/** the [active realm] associated with the route.*/
+	realm: IServerRealm;
+	/** the [route options]  object with all defaults applied. */
+	settings: IRouteAdditionalConfigurationOptions;
+}
+
+export interface IServerAuthScheme {
+	/** authenticate(request, reply) - required function called on each incoming request configured with the authentication scheme where:
+	 request - the request object.
+	 reply - the reply interface the authentication method must call when done authenticating the request where:
+	 reply(err, response, result) - is called if authentication failed where:
+	 err - any authentication error.
+	 response - any authentication response action such as redirection. Ignored if err is present, otherwise required.
+	 result - an object containing:
+	 credentials - the authenticated credentials.
+	 artifacts - optional authentication artifacts.
+	 reply.continue(result) - is called if authentication succeeded where:
+	 result - same object as result above.
+	 When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted if configured for the route.
+	 .If the err returned by the reply() method includes a message, no additional strategies will be attempted.
+	 If the err does not include a message but does include a scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in order of preference.
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80 });
+	 var scheme = function (server, options) {
+	return {
+	authenticate: function (request, reply) {
+	var req = request.raw.req;
+	var authorization = req.headers.authorization;
+	if (!authorization) {
+	return reply(Boom.unauthorized(null, 'Custom'));
+	}
+	return reply(null, { credentials: { user: 'john' } });
+	}
+	};
+	};
+	 server.auth.scheme('custom', scheme);*/
+	authenticate(request: Request, reply: IReply): void;
+	/** payload(request, reply) - optional function called to authenticate the request payload where:
+	 request - the request object.
+	 reply(err, response) - is called if authentication failed where:
+	 err - any authentication error.
+	 response - any authentication response action such as redirection. Ignored if err is present, otherwise required.
+	 reply.continue() - is called if payload authentication succeeded.
+	 When the scheme payload() method returns an error with a message, it means payload validation failed due to bad payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')), authentication may still be successful if the route auth.payload configuration is set to 'optional'.*/
+	payload?(request: Request, reply: IReply): void;
+	/** response(request, reply) - optional function called to decorate the response with authentication headers before the response headers or payload is written where:
+	 request - the request object.
+	 reply(err, response) - is called if an error occurred where:
+	 err - any authentication error.
+	 response - any authentication response to send instead of the current response. Ignored if err is present, otherwise required.
+	 reply.continue() - is called if the operation succeeded.*/
+	response?(request: Request, reply: IReply): void;
+	/** an optional object  */
+	options?: {
+		/**  if true, requires payload validation as part of the scheme and forbids routes from disabling payload auth validation. Defaults to false.*/
+		payload: boolean;
+	}
+}
+
+/**the response object where:
+ statusCode - the HTTP status code.
+ headers - an object containing the headers set.
+ payload - the response payload string.
+ rawPayload - the raw response payload buffer.
+ raw - an object with the injection request and response objects:
+ req - the simulated node request object.
+ res - the simulated node response object.
+ result - the raw handler response (e.g. when not a stream or a view) before it is serialized for transmission. If not available, the value is set to payload. Useful for inspection and reuse of the internal objects returned (instead of parsing the response string).
+ request - the request object.*/
+export interface IServerInjectResponse {
+	statusCode: number;
+	headers: IDictionary<string>;
+	payload: string;
+	rawPayload: Buffer;
+	raw: {
+		req: http.ClientRequest;
+		res: http.ServerResponse
+	};
+	result: string;
+	request: Request;
+}
+
+export interface IServerInject {
+	(options: string | IServerInjectOptions, callback: (res: IServerInjectResponse) => void): void;
+	(options: string | IServerInjectOptions): IPromise<IServerInjectResponse>;
+}
+
+export interface IServerInjectOptions {
+	/**  the request HTTP method (e.g. 'POST'). Defaults to 'GET'.*/
+	method: string;
+	/** the request URL. If the URI includes an authority (e.g. 'example.com:8080'), it is used to automatically set an HTTP 'Host' header, unless one was specified in headers.*/
+	url: string;
+	/** an object with optional request headers where each key is the header name and the value is the header content. Defaults to no additions to the default Shot headers.*/
+	headers?: IDictionary<string>;
+	/** n optional string, buffer or object containing the request payload. In case of an object it will be converted to a string for you. Defaults to no payload. Note that payload processing defaults to 'application/json' if no 'Content-Type' header provided.*/
+	payload?: string | {} | Buffer;
+	/** an optional credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Defaults to no credentials.*/
+	credentials?: any;
+	/** an optional artifacts object containing authentication artifact information. The artifacts are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Ignored if set without credentials. Defaults to no artifacts.*/
+	artifacts?: any;
+	/** sets the initial value of request.app*/
+	app?: any;
+	/** sets the initial value of request.plugins*/
+	plugins?: any;
+	/** allows access to routes with config.isInternal set to true. Defaults to false.*/
+	allowInternals?: boolean;
+	/** sets the remote address for the incoming connection.*/
+	remoteAddress?: boolean;
+	/**object with options used to simulate client request stream conditions for testing:
+	 error - if true, emits an 'error' event after payload transmission (if any). Defaults to false.
+	 close - if true, emits a 'close' event after payload transmission (if any). Defaults to false.
+	 end - if false, does not end the stream. Defaults to true.*/
+	simulate?: {
+		error: boolean;
+		close: boolean;
+		end: boolean;
+	};
+}
+
+
+/** host - optional host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
+ The return value is an array where each item is an object containing:
+ info - the connection.info the connection the table was generated for.
+ labels - the connection labels.
+ table - an array of routes where each route contains:
+ settings - the route config with defaults applied.
+ method - the HTTP method in lower case.
+ path - the route path.*/
+export interface IConnectionTable {
+	info: any;
+	labels: any;
+	table: IRoute[];
+}
+
+export interface ICookieSettings {
+	/** - time - to - live in milliseconds.Defaults to null (session time- life - cookies are deleted when the browser is closed).*/
+	ttl?: number;
+	/** - sets the 'Secure' flag.Defaults to false.*/
+	isSecure?: boolean;
+	/** - sets the 'HttpOnly' flag.Defaults to false.*/
+	isHttpOnly?: boolean;
+	/** - the path scope.Defaults to null (no path).*/
+	path?: string;
+	/** - the domain scope.Defaults to null (no domain).*/
+	domain?: any;
+	/** - if present and the cookie was not received from the client or explicitly set by the route handler, the cookie is automatically added to the response with the provided value.The value can be a function with signature function(request, next) where:
+	 request - the request object.
+	 next - the continuation function using the function(err, value) signature.*/
+	autoValue?: (request: Request, next: (err: any, value: any) => void) => void;
+	/** - encoding performs on the provided value before serialization.Options are:
+	 'none' - no encoding.When used, the cookie value must be a string.This is the default value.
+	 'base64' - string value is encoded using Base64.
+	 'base64json' - object value is JSON- stringified than encoded using Base64.
+	 'form' - object value is encoded using the x- www - form - urlencoded method. */
+	encoding?: string;
+	/**  - an object used to calculate an HMAC for cookie integrity validation.This does not provide privacy, only a mean to verify that the cookie value was generated by the server.Redundant when 'iron' encoding is used.Options are:
+	 integrity - algorithm options.Defaults to require('iron').defaults.integrity.
+	 password - password used for HMAC key generation. */
+	sign?: { integrity: any; password: string; }
+	password?: string;
+	iron?: any;
+	ignoreErrors?: boolean;
+	clearInvalid?: boolean;
+	strictHeader?: boolean;
+	passThrough?: any;
+}
+
+/** method - the method function with the signature is one of:
+ function(arg1, arg2, ..., argn, next) where:
+ arg1, arg2, etc. - the method function arguments.
+ next - the function called when the method is done with the signature function(err, result, ttl) where:
+ err - error response if the method failed.
+ result - the return value.
+ ttl - 0 if result is valid but cannot be cached. Defaults to cache policy.
+ function(arg1, arg2, ..., argn) where:
+ arg1, arg2, etc. - the method function arguments.
+ the callback option is set to false.
+ the method must returns a value (result, Error, or a promise) or throw an Error.*/
+export interface IServerMethod {
+	//(): void;
+	//(next: (err: any, result: any, ttl: number) => void): void;
+	//(arg1: any): void;
+	//(arg1: any, arg2: any, next: (err: any, result: any, ttl: number) => void): void;
+	//(arg1: any, arg2: any): void;
+	(...args: any[]): void;
+
+}
+/** options - optional configuration:
+ bind - a context object passed back to the method function (via this) when called. Defaults to active context (set via server.bind() when the method is registered.
+ cache - the same cache configuration used in server.cache().
+ callback - if false, expects the method to be a synchronous function. Note that using a synchronous function with caching will convert the method interface to require a callback as an additional argument with the signature function(err, result, cached, report) since the cache interface cannot return values synchronously. Defaults to true.
+ generateKey - a function used to generate a unique key (for caching) from the arguments passed to the method function (the callback argument is not passed as input). The server will automatically generate a unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation function must be provided which takes the same arguments as the function and returns a unique string (or null if no key can be generated).*/
+export interface IServerMethodOptions {
+	bind?: any;
+	cache?: ICatBoxCacheOptions;
+	callback?: boolean;
+	generateKey?(args: any[]): string;
+}
+/** Request object
+
+ The request object is created internally for each incoming request. It is different from the node.js request object received from the HTTP server callback (which is available in request.raw.req). The request object methods and properties change throughout the request lifecycle.
+ Request events
+
+ The request object supports the following events:
+
+ 'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
+ 'finish' - emitted when the request payload finished reading. The event method signature is function ().
+ 'disconnect' - emitted when a request errors or aborts unexpectedly.
+ var Crypto = require('crypto');
+ var Hapi = require('hapi');
+ var server = new Hapi.Server();
+ server.connection({ port: 80 });
+
+ server.ext('onRequest', function (request, reply) {
+
+var hash = Crypto.createHash('sha1');
+request.on('peek', function (chunk) {
+
+hash.update(chunk);
+});
+
+request.once('finish', function () {
+
+console.log(hash.digest('hex'));
+});
+
+request.once('disconnect', function () {
+
+console.error('request aborted');
+});
+
+return reply.continue();
+});*/
+export class Request extends Events.EventEmitter {
+	/** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].*/
+	app: any;
+	/**  authentication information*/
+	auth: {
+		/** true is the request has been successfully authenticated, otherwise false.*/
+		isAuthenticated: boolean;
+		/**  the credential object received during the authentication process. The presence of an object does not mean successful authentication.  can be set in the validate function's callback.*/
+		credentials: any;
+		/**  an artifact object received from the authentication strategy and used in authentication-related actions.*/
+		artifacts: any;
+		/**  the route authentication mode.*/
+		mode: any;
+		/** the authentication error is failed and mode set to 'try'.*/
+		error: any;
+	};
+	/** the connection used by this request*/
+	connection: ServerConnection;
+	/**  the node domain object used to protect against exceptions thrown in extensions, handlers and route prerequisites. Can be used to manually bind callback functions otherwise bound to other domains.*/
+	domain: any;
+	/** the raw request headers (references request.raw.headers).*/
+	headers: IDictionary<string>;
+	/** a unique request identifier (using the format '{now}:{connection.info.id}:{5 digits counter}').*/
+	id: number;
+	/**  request information */
+	info: {
+		/**  the request preferred encoding. */
+		acceptEncoding: string;
+		/**  if CORS is enabled for the route, contains the following: */
+		cors: {
+			isOriginMatch: boolean; /**  true if the request 'Origin' header matches the configured CORS restrictions. Set to false if no 'Origin' header is found or if it does not match. Note that this is only available after the 'onRequest' extension point as CORS is configured per-route and no routing decisions are made at that point in the request lifecycle. */
+		};
+		/**  content of the HTTP 'Host' header (e.g. 'example.com:8080'). */
+		host: string;
+		/**  the hostname part of the 'Host' header (e.g. 'example.com').*/
+		hostname: string;
+		/**  request reception timestamp. */
+		received: number;
+		/**  content of the HTTP 'Referrer' (or 'Referer') header. */
+		referrer: string;
+		/** remote client IP address. */
+		remoteAddress: string;
+		/**  remote client port. */
+		remotePort: number;
+		/**  request response timestamp (0 is not responded yet). */
+		responded: number;
+	};
+	/**  the request method in lower case (e.g. 'get', 'post'). */
+	method: string;
+	/**  the parsed content-type header. Only available when payload parsing enabled and no payload error occurred. */
+	mime: string;
+	/**  an object containing the values of params, query, and payload before any validation modifications made. Only set when input validation is performed.*/
+	orig: {
+		params: any;
+		query: any;
+		payload: any;
+	};
+	/**  an object where each key is a path parameter name with matching value as described in Path parameters.*/
+	params: IDictionary<string>;
+	/** an array containing all the path params values in the order they appeared in the path.*/
+	paramsArray: string[];
+	/**  the request URI's path component. */
+	path: string;
+	/** the request payload based on the route payload.output and payload.parse settings.*/
+	payload: stream.Readable | Buffer | any;
+	/**  plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state.*/
+	plugins: any;
+	/** an object where each key is the name assigned by a route prerequisites function. The values are the raw values provided to the continuation function as argument. For the wrapped response object, use responses.*/
+	pre: IDictionary<any>;
+	/** the response object when set. The object can be modified but must not be assigned another object. To replace the response with another from within an extension point, use reply(response) to override with a different response. Contains null when no response has been set (e.g. when a request terminates prematurely when the client disconnects).*/
+	response: Response;
+	/**preResponses - same as pre but represented as the response object created by the pre method.*/
+	preResponses: any;
+	/**an object containing the query parameters.*/
+	query: any;
+	/**  an object containing the Node HTTP server objects. Direct interaction with these raw objects is not recommended.*/
+	raw: {
+		req: http.ClientRequest;
+		res: http.ServerResponse;
+	};
+	/** the route public interface.*/
+	route: IRoute;
+	/** the server object. */
+	server: Server;
+	/** an object containing parsed HTTP state information (cookies) where each key is the cookie name and value is the matching cookie content after processing using any registered cookie definition. */
+	state: any;
+	/** complex object contining details on the url */
+	url: {
+		/** null when i tested */
+		auth: any;
+		/** null when i tested */
+		hash: any;
+		/** null when i tested */
+		host: any;
+		/** null when i tested */
+		hostname: any;
+		href: string;
+		path: string;
+		/** path without search*/
+		pathname: string;
+		/** null when i tested */
+		port: any;
+		/** null when i tested */
+		protocol: any;
+		/** querystring parameters*/
+		query: IDictionary<string>;
+		/** querystring parameters as a string*/
+		search: string;
+		/** null when i tested */
+		slashes: any;
+	};
+
+	/** request.setUrl(url)
+
+	 Available only in 'onRequest' extension methods.
+
+	 Changes the request URI before the router begins processing the request where:
+
+	 url - the new request path value.
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80 });
+
+	 server.ext('onRequest', function (request, reply) {
+
+	// Change all requests to '/test'
+	request.setUrl('/test');
+	return reply.continue();
+	});*/
+	setUrl(url: string | url.Url): void;
+	/** request.setMethod(method)
+
+	 Available only in 'onRequest' extension methods.
+
+	 Changes the request method before the router begins processing the request where:
+
+	 method - is the request HTTP method (e.g. 'GET').
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80 });
+
+	 server.ext('onRequest', function (request, reply) {
+
+	// Change all requests to 'GET'
+	request.setMethod('GET');
+	return reply.continue();
+	});*/
+	setMethod(method: string): void;
+
+	/** request.log(tags, [data, [timestamp]])
+
+	 Always available.
+
+	 Logs request-specific events. When called, the server emits a 'request' event which can be used by other listeners or plugins. The arguments are:
+
+	 data - an optional message string or object with the application data being logged.
+	 timestamp - an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
+	 Any logs generated by the server internally will be emitted only on the 'request-internal' channel and will include the event.internal flag set to true.
+
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80 });
+
+	 server.on('request', function (request, event, tags) {
+
+	if (tags.error) {
+	console.log(event);
+	}
+	});
+
+	 var handler = function (request, reply) {
+
+	request.log(['test', 'error'], 'Test event');
+	return reply();
+	};
+	 */
+	log(/** a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events.*/
+		tags: string | string[],
+		/** an optional message string or object with the application data being logged.*/
+		data?: string,
+		/**  an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).*/
+		timestamp?: number): void;
+
+	/** request.getLog([tags], [internal])
+
+	 Always available.
+
+	 Returns an array containing the events matching any of the tags specified (logical OR)
+	 request.getLog();
+	 request.getLog('error');
+	 request.getLog(['error', 'auth']);
+	 request.getLog(['error'], true);
+	 request.getLog(false);*/
+
+	getLog(/** is a single tag string or array of tag strings. If no tags specified, returns all events.*/
+		   tags?: string,
+		   /**  filters the events to only those with a matching event.internal value. If true, only internal logs are included. If false, only user event are included. Defaults to all events (undefined).*/
+		   internal?: boolean): string[];
+
+	/** request.tail([name])
+
+	 Available until immediately after the 'response' event is emitted.
+
+	 Adds a request tail which has to complete before the request lifecycle is complete where:
+
+	 name - an optional tail name used for logging purposes.
+	 Returns a tail function which must be called when the tail activity is completed.
+
+	 Tails are actions performed throughout the request lifecycle, but which may end after a response is sent back to the client. For example, a request may trigger a database update which should not delay sending back a response. However, it is still desirable to associate the activity with the request when logging it (or an error associated with it).
+
+	 When all tails completed, the server emits a 'tail' event.
+
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80 });
+
+	 var get = function (request, reply) {
+
+	var dbTail = request.tail('write to database');
+
+	db.save('key', 'value', function () {
+
+	dbTail();
+	});
+
+	return reply('Success!');
+	};
+
+	 server.route({ method: 'GET', path: '/', handler: get });
+
+	 server.on('tail', function (request) {
+
+	console.log('Request completed including db activity');
+	});*/
+	tail(/** an optional tail name used for logging purposes.*/
+		 name?: string): Function;
+}
+/** Response events
+
+ The response object supports the following events:
+
+ 'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
+ 'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
+ var Crypto = require('crypto');
+ var Hapi = require('hapi');
+ var server = new Hapi.Server();
+ server.connection({ port: 80 });
+
+ server.ext('onPreResponse', function (request, reply) {
+
+var response = request.response;
+if (response.isBoom) {
+return reply();
+}
+
+var hash = Crypto.createHash('sha1');
+response.on('peek', function (chunk) {
+
+hash.update(chunk);
+});
+
+response.once('finish', function () {
+
+console.log(hash.digest('hex'));
+});
+
+return reply.continue();
+});*/
+export class Response extends Events.EventEmitter {
+	isBoom: boolean;
+	/**  the HTTP response status code. Defaults to 200 (except for errors).*/
+	statusCode: number;
+	/** an object containing the response headers where each key is a header field name. Note that this is an incomplete list of headers to be included with the response. Additional headers will be added once the response is prepare for transmission.*/
+	headers: IDictionary<string>;
+	/** the value provided using the reply interface.*/
+	source: any;
+	/** a string indicating the type of source with available values:
+	 'plain' - a plain response such as string, number, null, or simple object (e.g. not a Stream, Buffer, or view).
+	 'buffer' - a Buffer.
+	 'view' - a view generated with reply.view().
+	 'file' - a file generated with reply.file() of via the directory handler.
+	 'stream' - a Stream.
+	 'promise' - a Promise object. */
+	variety: string;
+	/** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].*/
+	app: any;
+	/** plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state. */
+	plugins: any;
+	/** settings - response handling flags:
+	 charset - the 'Content-Type' HTTP header 'charset' property. Defaults to 'utf-8'.
+	 encoding - the string encoding scheme used to serial data into the HTTP payload when source is a string or marshals into a string. Defaults to 'utf8'.
+	 passThrough - if true and source is a Stream, copies the statusCode and headers of the stream to the outbound response. Defaults to true.
+	 stringify - options used for source value requiring stringification. Defaults to no replacer and no space padding.
+	 ttl - if set, overrides the route cache expiration milliseconds value set in the route config. Defaults to no override.
+	 varyEtag - if true, a suffix will be automatically added to the 'ETag' header at transmission time (separated by a '-' character) when the HTTP 'Vary' header is present.*/
+	settings: {
+		charset: string;
+		encoding: string;
+		passThrough: boolean;
+		stringify: any;
+		ttl: number;
+		varyEtag: boolean;
+	}
+
+	/**  sets the HTTP 'Content-Length' header (to avoid chunked transfer encoding) where:
+	 length - the header value. Must match the actual payload size.*/
+	bytes(length: number): Response;
+
+	/**  sets the 'Content-Type' HTTP header 'charset' property where: charset - the charset property value.*/
+	charset(charset: string): Response;
+
+	/**  sets the HTTP status code where:
+	 statusCode - the HTTP status code.*/
+	code(statusCode: number): Response;
+
+	/** sets the HTTP status code to Created (201) and the HTTP 'Location' header where: uri - an absolute or relative URI used as the 'Location' header value.*/
+	created(uri: string): Response;
+
+
+	/** encoding(encoding) - sets the string encoding scheme used to serial data into the HTTP payload where: encoding - the encoding property value (see node Buffer encoding).*/
+	encoding(encoding: string): Response;
+
+	/** etag(tag, options) - sets the representation entity tag where:
+	 tag - the entity tag string without the double-quote.
+	 options - optional settings where:
+	 weak - if true, the tag will be prefixed with the 'W/' weak signifier. Weak tags will fail to match identical tags for the purpose of determining 304 response status. Defaults to false.
+	 vary - if true and content encoding is set or applied to the response (e.g 'gzip' or 'deflate'), the encoding name will be automatically added to the tag at transmission time (separated by a '-' character). Ignored when weak is true. Defaults to true.*/
+	etag(tag: string, options: {
+		weak: boolean; vary: boolean;
+	}): Response;
+
+	/**header(name, value, options) - sets an HTTP header where:
+	 name - the header name.
+	 value - the header value.
+	 options - optional settings where:
+	 append - if true, the value is appended to any existing header value using separator. Defaults to false.
+	 separator - string used as separator when appending to an exiting value. Defaults to ','.
+	 override - if false, the header value is not set if an existing value present. Defaults to true.*/
+	header(name: string, value: string, options?: IHeaderOptions): Response;
+
+	/** hold() - puts the response on hold until response.send() is called. Available only after reply() is called and until response.hold() is invoked once. */
+	hold(): Response;
+
+	/** location(uri) - sets the HTTP 'Location' header where:
+	 uri - an absolute or relative URI used as the 'Location' header value.*/
+	location(uri: string): Response;
+
+	/** redirect(uri) - sets an HTTP redirection response (302) and decorates the response with additional methods listed below, where:
+	 uri - an absolute or relative URI used to redirect the client to another resource. */
+	redirect(uri: string): Response;
+
+	/** replacer(method) - sets the JSON.stringify() replacer argument where:
+	 method - the replacer function or array. Defaults to none.*/
+	replacer(method: Function | Array<Function>): Response;
+
+	/** spaces(count) - sets the JSON.stringify() space argument where:
+	 count - the number of spaces to indent nested object keys. Defaults to no indentation. */
+	spaces(count: number): Response;
+
+	/**state(name, value, [options]) - sets an HTTP cookie where:
+	 name - the cookie name.
+	 value - the cookie value. If no encoding is defined, must be a string.
+	 options - optional configuration. If the state was previously registered with the server using server.state(), the specified keys in options override those same keys in the server definition (but not others).*/
+	state(name: string, value: string, options?: any): Response;
+
+	/** send() - resume the response which will be transmitted in the next tick. Available only after response.hold() is called and until response.send() is invoked once. */
+	send(): void;
+
+	/** sets a string suffix when the response is process via JSON.stringify().*/
+	suffix(suffix: string): void;
+
+	/** overrides the default route cache expiration rule for this response instance where:
+	 msec - the time-to-live value in milliseconds.*/
+	ttl(msec: number): void;
+
+	/** type(mimeType) - sets the HTTP 'Content-Type' header where:
+	 mimeType - is the mime type. Should only be used to override the built-in default for each response type. */
+	type(mimeType: string): Response;
+
+	/** clears the HTTP cookie by setting an expired value where:
+	 name - the cookie name.
+	 options - optional configuration for expiring cookie. If the state was previously registered with the server using server.state(), the specified keys in options override those same keys in the server definition (but not others).*/
+	unstate(name: string, options?: { [key: string]: string }): Response;
+
+	/** adds the provided header to the list of inputs affected the response generation via the HTTP 'Vary' header where:
+	 header - the HTTP request header name.*/
+	vary(header: string): void;
+}
+/** When using the redirect() method, the response object provides these additional methods */
+export class ResponseRedirect extends Response {
+	/** sets the status code to 302 or 307 (based on the rewritable() setting) where:
+	 isTemporary - if false, sets status to permanent. Defaults to true.*/
+	temporary(isTemporary: boolean): void;
+
+	/** sets the status code to 301 or 308 (based on the rewritable() setting) where:
+	 isPermanent - if true, sets status to temporary. Defaults to false. */
+	permanent(isPermanent: boolean): void;
+
+	/** sets the status code to 301/302 for rewritable (allows changing the request method from 'POST' to 'GET') or 307/308 for non-rewritable (does not allow changing the request method from 'POST' to 'GET'). Exact code based on the temporary() or permanent() setting. Arguments:
+	 isRewritable - if false, sets to non-rewritable. Defaults to true.
+	 Permanent    Temporary
+	 Rewritable    301    302(1)
+	 Non-rewritable    308(2)    307
+	 Notes: 1. Default value. 2. Proposed code, not supported by all clients. */
+	rewritable(isRewritable: boolean): void;
+}
+/** info about a server connection */
+export interface IServerConnectionInfo {
+	/**  - a unique connection identifier (using the format '{hostname}:{pid}:{now base36}').*/
+	id: string;
+	/**  - the connection creation timestamp.*/
+	created: number;
+	/**  - the connection start timestamp (0 when stopped).*/
+	started: number;
+	/**  the connection port based on the following rules:
+	 the configured port value before the server has been started.
+	 the actual port assigned when no port is configured or set to 0 after the server has been started.*/
+	port: number;
+
+	/** - the host name the connection was configured to. Defaults to the operating system hostname when available, otherwise 'localhost'.*/
+	host: string;
+	/** - the active IP address the connection was bound to after starting.Set to undefined until the server has been started or when using a non TCP port (e.g. UNIX domain socket).*/
+	address: string;
+	/**  - the protocol used:
+	 'http' - HTTP.
+	 'https' - HTTPS.
+	 'socket' - UNIX domain socket or Windows named pipe.*/
+	protocol: string;
+	/** a string representing the connection (e.g. 'http://example.com:8080' or 'socket:/unix/domain/socket/path'). Contains the uri setting if provided, otherwise constructed from the available settings. If no port is available or set to 0, the uri will not include a port component.*/
+	uri: string;
+}
+/**
+ *  undocumented.   The connection object constructed after calling server.connection();
+ * can be accessed via server.connections; or request.connection;
+ */
+export class ServerConnection extends Events.EventEmitter {
+	domain: any;
+	_events: { route: Function, domain: Function, _events: Function, _eventsCount: Function, _maxListeners: Function };
+	_eventsCount: number;
+	settings: IServerConnectionOptions;
+	server: Server;
+	/** ex: "tcp" */
+	type: string;
+	_started: boolean;
+	/** dictionary of sockets */
+	_connections: { [ip_port: string]: any };
+	_onConnection: Function;
+	registrations: any;
+	_extensions: any;
+	_requestCounter: { value: number; min: number; max: number };
+	_load: any;
+	states: {
+		settings: any; cookies: any; names: any[]
+	};
+	auth: { connection: ServerConnection; _schemes: any; _strategies: any; settings: any; api: any; };
+	_router: any;
+	MSPluginsCollection: any;
+	applicationCache: any;
+	addEventListener: any;
+	info: IServerConnectionInfo;
+}
+
+/** Server http://hapijs.com/api#server
+ rver object is the main application container. The server manages all incoming connections along with all the facilities provided by the framework. A server can contain more than one connection (e.g. listen to port 80 and 8080).
+ Server events
+ The server object inherits from Events.EventEmitter and emits the following events:
+ 'log' - events logged with server.log() and server events generated internally by the framework.
+ 'start' - emitted when the server is started using server.start().
+ 'stop' - emitted when the server is stopped using server.stop().
+ 'request' - events generated by request.log(). Does not include any internally generated events.
+ 'request-internal' - request events generated internally by the framework (multiple events per request).
+ 'request-error' - emitted whenever an Internal Server Error (500) error response is sent. Single event per request.
+ 'response' - emitted after the response is sent back to the client (or when the client connection closed and no response sent, in which case request.response is null). Single event per request.
+ 'tail' - emitted when a request finished processing, including any registered tails. Single event per request.
+ Note that the server object should not be used to emit application events as its internal implementation is designed to fan events out to the various plugin selections and not for application events.
+ MORE EVENTS HERE: http://hapijs.com/api#server-events*/
+export class Server extends Events.EventEmitter {
+
+	constructor(options?: IServerOptions);
+
+	/** Provides a safe place to store server-specific run-time application data without potential conflicts with the framework internals. The data can be accessed whenever the server is accessible. Initialized with an empty object.
+	 var Hapi = require('hapi');
+	 server = new Hapi.Server();
+	 server.app.key = 'value';
+	 var handler = function (request, reply) {
+	return reply(request.server.app.key);
+	}; */
+	app: any;
+	/** An array containing the server's connections. When the server object is returned from server.select(), the connections array only includes the connections matching the selection criteria.
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80, labels: 'a' });
+	 server.connection({ port: 8080, labels: 'b' });
+	 // server.connections.length === 2
+	 var a = server.select('a');
+	 // a.connections.length === 1*/
+	connections: Array<ServerConnection>;
+	/** When the server contains exactly one connection, info is an object containing information about the sole connection.
+	 * When the server contains more than one connection, each server.connections array member provides its own connection.info.
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80 });
+	 // server.info.port === 80
+	 server.connection({ port: 8080 });
+	 // server.info === null
+	 // server.connections[1].info.port === 8080
+	 */
+	info: IServerConnectionInfo;
+	/** An object containing the process load metrics (when load.sampleInterval is enabled):
+	 rss - RSS memory usage.
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server({ load: { sampleInterval: 1000 } });
+	 console.log(server.load.rss);*/
+	load: {
+		/** - event loop delay milliseconds.*/
+		eventLoopDelay: number;
+		/**  - V8 heap usage.*/
+		heapUsed: number;
+	};
+	/** When the server contains exactly one connection, listener is the node HTTP server object of the sole connection.
+	 When the server contains more than one connection, each server.connections array member provides its own connection.listener.
+	 var Hapi = require('hapi');
+	 var SocketIO = require('socket.io');
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80 });
+	 var io = SocketIO.listen(server.listener);
+	 io.sockets.on('connection', function(socket) {
+	socket.emit({ msg: 'welcome' });
+	});*/
+	listener: http.Server;
+
+	/** server.methods
+	 An object providing access to the server methods where each server method name is an object property.
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.method('add', function (a, b, next) {
+	return next(null, a + b);
+	});
+	 server.methods.add(1, 2, function (err, result) {
+	// result === 3
+	});*/
+	methods: IDictionary<Function>;
+
+	/** server.mime
+	 Provides access to the server MIME database used for setting content-type information. The object must not be modified directly but only through the mime server setting.
+	 var Hapi = require('hapi');
+	 var options = {
+	mime: {
+	override: {
+	'node/module': {
+	source: 'steve',
+	compressible: false,
+	extensions: ['node', 'module', 'npm'],
+	type: 'node/module'
+	}
+	}
+	}
+	};
+	 var server = new Hapi.Server(options);
+	 // server.mime.path('code.js').type === 'application/javascript'
+	 // server.mime.path('file.npm').type === 'node/module'*/
+	mime: any;
+	/**server.plugins
+	 An object containing the values exposed by each plugin registered where each key is a plugin name and the values are the exposed properties by each plugin using server.expose(). Plugins may set the value of the server.plugins[name] object directly or via the server.expose() method.
+	 exports.register = function (server, options, next) {
+	server.expose('key', 'value');
+	// server.plugins.example.key === 'value'
+	return next();
+	};
+	 exports.register.attributes = {
+	name: 'example'
+	};*/
+	plugins: IDictionary<any>;
+	/** server.realm
+	 The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(), the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin). Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
+	 modifiers - when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method and includes:
+	 route - routes preferences:
+	 prefix - the route path prefix used by any calls to server.route() from the server.
+	 vhost - the route virtual host settings used by any calls to server.route() from the server.
+	 plugin - the active plugin name (empty string if at the server root).
+	 plugins - plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state.
+	 settings - settings overrides:
+	 files.relativeTo
+	 bind
+	 The server.realm object should be considered read-only and must not be changed directly except for the plugins property can be directly manipulated by the plugins (each setting its own under plugins[name]).
+	 exports.register = function (server, options, next) {
+	console.log(server.realm.modifiers.route.prefix);
+	return next();
+	};*/
+	realm: IServerRealm;
+
+	/** server.root
+	 The root server object containing all the connections and the root server methods (e.g. start(), stop(), connection()).*/
+	root: Server;
+	/** server.settings
+	 The server configuration object after defaults applied.
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server({
+	app: {
+	key: 'value'
+	}
+	});
+	 // server.settings.app === { key: 'value' }*/
+	settings: IServerOptions;
+
+	/** server.version
+	 The hapi module version number.
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 // server.version === '8.0.0'*/
+	version: string;
+
+	/** server.after(method, [dependencies])
+	 Adds a method to be called after all the plugin dependencies have been registered and before the server starts (only called if the server is started) where:
+	 after - the method with signature function(plugin, next) where:
+	 server - server object the after() method was called on.
+	 next - the callback function the method must call to return control over to the application and complete the registration process. The function signature is function(err) where:
+	 err - internal error which is returned back via the server.start() callback.
+	 dependencies - a string or array of string with the plugin names to call this method after their after() methods. There is no requirement for the other plugins to be registered. Setting dependencies only arranges the after methods in the specified order.
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80 });
+	 server.after(function () {
+	// Perform some pre-start logic
+	});
+	 server.start(function (err) {
+	// After method already executed
+	});
+	 server.auth.default(options)*/
+	after(method: (plugin: any, next: (err: any) => void) => void, dependencies: string | string[]): void;
+
+	auth: {
+		/** server.auth.api
+		 An object where each key is a strategy name and the value is the exposed strategy API. Available on when the authentication scheme exposes an API by returning an api key in the object returned from its implementation function.
+		 When the server contains more than one connection, each server.connections array member provides its own connection.auth.api object.
+		 const server = new Hapi.Server();
+		 server.connection({ port: 80 });
+		 const scheme = function (server, options) {
+        return {
+        api: {
+        settings: {
+        x: 5
+        }
+        },
+        authenticate: function (request, reply) {
+        const req = request.raw.req;
+        const authorization = req.headers.authorization;
+        if (!authorization) {
+        return reply(Boom.unauthorized(null, 'Custom'));
+        }
+        return reply.continue({ credentials: { user: 'john' } });
+        }
+        };
+        };
+		 server.auth.scheme('custom', scheme);
+		 server.auth.strategy('default', 'custom');
+		 console.log(server.auth.api.default.settings.x);    // 5
+		 */
+		api: {
+			[index: string]: any;
+		}
+		/** server.auth.default(options)
+		 Sets a default strategy which is applied to every route where:
+		 options - a string with the default strategy name or an object with a specified strategy or strategies using the same format as the route auth handler options.
+		 The default does not apply when the route config specifies auth as false, or has an authentication strategy configured. Otherwise, the route authentication config is applied to the defaults. Note that the default only applies at time of route configuration, not at runtime. Calling default() after adding a route will have no impact on routes added prior.
+		 The default auth strategy configuration can be accessed via connection.auth.settings.default.
+		 var server = new Hapi.Server();
+		 server.connection({ port: 80 });
+		 server.auth.scheme('custom', scheme);
+		 server.auth.strategy('default', 'custom');
+		 server.auth.default('default');
+		 server.route({
+		method: 'GET',
+		path: '/',
+		handler: function (request, reply) {
+		return reply(request.auth.credentials.user);
+		}
+		});*/
+		default(options: string): void;
+		default(options: { strategy: string }): void;
+		default(options: { strategies: string[] }): void;
+		/** server.auth.scheme(name, scheme)
+		 Registers an authentication scheme where:
+		 name - the scheme name.
+		 scheme - the method implementing the scheme with signature function(server, options) where:
+		 server - a reference to the server object the scheme is added to.
+		 options - optional scheme settings used to instantiate a strategy.*/
+		scheme(name: string,
+			   /** When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted if configured for the route. If the err returned by the reply() method includes a message, no additional strategies will be attempted. If the err does not include a message but does include a scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in order of preference.
+				n the scheme payload() method returns an error with a message, it means payload validation failed due to bad payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')), authentication may still be successful if the route auth.payload configuration is set to 'optional'.
+				server = new Hapi.Server();
+				server.connection({ port: 80 });
+				scheme = function (server, options) {
+			urn {
+			authenticate: function (request, reply) {
+			req = request.raw.req;
+			var authorization = req.headers.authorization;
+			if (!authorization) {
+			return reply(Boom.unauthorized(null, 'Custom'));
+			}
+			urn reply(null, { credentials: { user: 'john' } });
+			}
+			};
+			};
+				*/
+			   scheme: (server: Server, options: any) => IServerAuthScheme): void;
+
+		/** server.auth.strategy(name, scheme, [mode], [options])
+		 Registers an authentication strategy where:
+		 name - the strategy name.
+		 scheme - the scheme name (must be previously registered using server.auth.scheme()).
+		 mode - if true, the scheme is automatically assigned as a required strategy to any route without an auth config. Can only be assigned to a single server strategy. Value must be true (which is the same as 'required') or a valid authentication mode ('required', 'optional', 'try'). Defaults to false.
+		 options - scheme options based on the scheme requirements.
+		 var server = new Hapi.Server();
+		 server.connection({ port: 80 });
+		 server.auth.scheme('custom', scheme);
+		 server.auth.strategy('default', 'custom');
+		 server.route({
+		method: 'GET',
+		path: '/',
+		config: {
+		auth: 'default',
+		handler: function (request, reply) {
+		return reply(request.auth.credentials.user);
+		}
+		}
+		});*/
+		strategy(name: string, scheme: any, mode?: boolean | string, options?: any): void;
+
+		/** server.auth.test(strategy, request, next)
+		 Tests a request against an authentication strategy where:
+		 strategy - the strategy name registered with server.auth.strategy().
+		 request - the request object.
+		 next - the callback function with signature function(err, credentials) where:
+		 err - the error if authentication failed.
+		 credentials - the authentication credentials object if authentication was successful.
+		 Note that the test() method does not take into account the route authentication configuration. It also does not perform payload authentication. It is limited to the basic strategy authentication execution. It does not include verifying scope, entity, or other route properties.
+		 var server = new Hapi.Server();
+		 server.connection({ port: 80 });
+		 server.auth.scheme('custom', scheme);
+		 server.auth.strategy('default', 'custom');
+		 server.route({
+		method: 'GET',
+		path: '/',
+		handler: function (request, reply) {
+		request.server.auth.test('default', request, function (err, credentials) {
+		if (err) {
+		return reply({ status: false });
+		}
+		return reply({ status: true, user: credentials.name });
+		});
+		}
+		});*/
+		test(strategy: string, request: Request, next: (err: any, credentials: any) => void): void;
+	};
+
+	/** server.bind(context)
+	 Sets a global context used as the default bind object when adding a route or an extension where:
+	 context - the object used to bind this in handler and extension methods.
+	 When setting context inside a plugin, the context is applied only to methods set up by the plugin. Note that the context applies only to routes and extensions added after it has been set.
+	 var handler = function (request, reply) {
+	return reply(this.message);
+	};
+	 exports.register = function (server, options, next) {
+	var bind = {
+	message: 'hello'
+	};
+	server.bind(bind);
+	server.route({ method: 'GET', path: '/', handler: handler });
+	return next();
+	};*/
+	bind(context: any): void;
+
+
+	/** server.cache(options)
+	 Provisions a cache segment within the server cache facility where:
+	 options - catbox policy configuration where:
+	 expiresIn - relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt.
+	 expiresAt - time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records expire. Uses local time. Cannot be used together with expiresIn.
+	 generateFunc - a function used to generate a new cache item if one is not found in the cache when calling get(). The method's signature is function(id, next) where: - id - the id string or object provided to the get() method. - next - the method called when the new item is returned with the signature function(err, value, ttl) where: - err - an error condition. - value - the new value generated. - ttl - the cache ttl value in milliseconds. Set to 0 to skip storing in the cache. Defaults to the cache global policy.
+	 staleIn - number of milliseconds to mark an item stored in cache as stale and attempt to regenerate it when generateFunc is provided. Must be less than expiresIn.
+	 staleTimeout - number of milliseconds to wait before checking if an item is stale.
+	 generateTimeout - number of milliseconds to wait before returning a timeout error when the generateFunc function takes too long to return a value. When the value is eventually returned, it is stored in the cache for future requests.
+	 cache - the cache name configured in 'server.cache`. Defaults to the default cache.
+	 segment - string segment name, used to isolate cached items within the cache partition. When called within a plugin, defaults to '!name' where 'name' is the plugin name. Required when called outside of a plugin.
+	 shared - if true, allows multiple cache provisions to share the same segment. Default to false.
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80 });
+	 var cache = server.cache({ segment: 'countries', expiresIn: 60 * 60 * 1000 });
+	 cache.set('norway', { capital: 'oslo' }, null, function (err) {
+	cache.get('norway', function (err, value, cached, log) {
+	// value === { capital: 'oslo' };
+	});
+	});*/
+	cache(options: ICatBoxCacheOptions): void;
+
+	/** server.connection([options])
+	 Adds an incoming server connection
+	 Returns a server object with the new connection selected.
+	 Must be called before any other server method that modifies connections is called for it to apply to the new connection (e.g. server.state()).
+	 Note that the options object is deeply cloned (with the exception of listener which is shallowly copied) and cannot contain any values that are unsafe to perform deep copy on.
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 var web = server.connection({ port: 8000, host: 'example.com', labels: ['web'] });
+	 var admin = server.connection({ port: 8001, host: 'example.com', labels: ['admin'] });
+	 // server.connections.length === 2
+	 // web.connections.length === 1
+	 // admin.connections.length === 1 */
+	connection(options: IServerConnectionOptions): Server;
+
+	/** server.decorate(type, property, method, [options])
+	 Extends various framework interfaces with custom methods where:
+	 type - the interface being decorated. Supported types:
+	 'reply' - adds methods to the reply interface.
+	 'server' - adds methods to the Server object.
+	 property - the object decoration key name.
+	 method - the extension function.
+	 options - if the type is 'request', supports the following optional settings:
+	 'apply' - if true, the method function is invoked using the signature function(request) where request is the current request object and the returned value is assigned as the decoration.
+	 Note that decorations apply to the entire server and all its connections regardless of current selection.
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80 });
+	 server.decorate('reply', 'success', function () {
+	return this.response({ status: 'ok' });
+	});
+	 server.route({
+	method: 'GET',
+	path: '/',
+	handler: function (request, reply) {
+	return reply.success();
+	}
+	});*/
+	decorate(type: string, property: string, method: Function, options?: { apply: boolean }): void;
+
+	/** server.dependency(dependencies, [after])
+	 Used within a plugin to declares a required dependency on other plugins where:
+	 dependencies - a single string or array of plugin name strings which must be registered in order for this plugin to operate. Plugins listed must be registered before the server is started. Does not provide version dependency which should be implemented using npm peer dependencies.
+	 after - an optional function called after all the specified dependencies have been registered and before the server starts. The function is only called if the server is started. If a circular dependency is detected, an exception is thrown (e.g. two plugins each has an after function to be called after the other). The function signature is function(server, next) where:
+	 server - the server the dependency() method was called on.
+	 next - the callback function the method must call to return control over to the application and complete the registration process. The function signature is function(err) where:
+	 err - internal error condition, which is returned back via the server.start() callback.
+	 exports.register = function (server, options, next) {
+	server.dependency('yar', after);
+	return next();
+	};
+	 var after = function (server, next) {
+	// Additional plugin registration logic
+	return next();
+	};*/
+	dependency(dependencies: string | string[], after?: (server: Server, next: (err: any) => void) => void): void;
+
+
+	/** server.expose(key, value)
+	 Used within a plugin to expose a property via server.plugins[name] where:
+	 key - the key assigned (server.plugins[name][key]).
+	 value - the value assigned.
+	 exports.register = function (server, options, next) {
+	server.expose('util', function () { console.log('something'); });
+	return next();
+	};*/
+	expose(key: string, value: any): void;
+
+	/** server.expose(obj)
+	 Merges a deep copy of an object into to the existing content of server.plugins[name] where:
+	 obj - the object merged into the exposed properties container.
+	 exports.register = function (server, options, next) {
+	server.expose({ util: function () { console.log('something'); } });
+	return next();
+	};*/
+	expose(obj: any): void;
+
+	/** server.ext(event, method, [options])
+	 Registers an extension function in one of the available extension points where:
+	 event - the event name.
+	 method - a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is function(request, reply) where:
+	 request - the request object. NOTE: Access the Response via request.response
+	 reply - the reply interface which is used to return control back to the framework. To continue normal execution of the request lifecycle, reply.continue() must be called. To abort processing and return a response to the client, call reply(value) where value is an error or any other valid response.
+	 this - the object provided via options.bind or the current active context set with server.bind().
+	 options - an optional object with the following:
+	 before - a string or array of strings of plugin names this method must execute before (on the same event). Otherwise, extension methods are executed in the order added.
+	 after - a string or array of strings of plugin names this method must execute after (on the same event). Otherwise, extension methods are executed in the order added.
+	 bind - a context object passed back to the provided method (via this) when called.
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80 });
+	 server.ext('onRequest', function (request, reply) {
+	// Change all requests to '/test'
+	request.setUrl('/test');
+	return reply.continue();
+	});
+	 var handler = function (request, reply) {
+	return reply({ status: 'ok' });
+	};
+	 server.route({ method: 'GET', path: '/test', handler: handler });
+	 server.start();
+	 // All requests will get routed to '/test'*/
+	ext(event: string, method: (request: Request, reply: IReply, bind?: any) => void, options?: { before: string | string[]; after: string | string[]; bind?: any }): void;
+
+	/** server.handler(name, method)
+	 Registers a new handler type to be used in routes where:
+	 name - string name for the handler being registered. Cannot override the built-in handler types (directory, file, proxy, and view) or any previously registered type.
+	 method - the function used to generate the route handler using the signature function(route, options) where:
+	 route - the route public interface object.
+	 options - the configuration object provided in the handler config.
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.connection({ host: 'localhost', port: 8000 });
+	 // Defines new handler for routes on this server
+	 server.handler('test', function (route, options) {
+	return function (request, reply) {
+	return reply('new handler: ' + options.msg);
+	}
+	});
+	 server.route({
+	method: 'GET',
+	path: '/',
+	handler: { test: { msg: 'test' } }
+	});
+	 server.start();
+	 The method function can have a defaults object or function property. If the property is set to an object, that object is used as the default route config for routes using this handler. If the property is set to a function, the function uses the signature function(method) and returns the route default configuration.
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.connection({ host: 'localhost', port: 8000 });
+	 var handler = function (route, options) {
+	return function (request, reply) {
+	return reply('new handler: ' + options.msg);
+	}
+	};
+	 // Change the default payload processing for this handler
+	 handler.defaults = {
+	payload: {
+	output: 'stream',
+	parse: false
+	}
+	};
+	 server.handler('test', handler);*/
+	handler<THandlerConfig>(name: string, method: (route: IRoute, options: THandlerConfig) => ISessionHandler): void;
+
+	/** server.initialize([callback])
+	 Initializes the server (starts the caches, finalizes plugin registration) but does not start listening
+	 on the connection ports, where:
+	 - `callback` - the callback method when server initialization is completed or failed with the signature
+	 `function(err)` where:
+	 - `err` - any initialization error condition.
+
+	 If no `callback` is provided, a `Promise` object is returned.
+
+	 Note that if the method fails and the callback includes an error, the server is considered to be in
+	 an undefined state and should be shut down. In most cases it would be impossible to fully recover as
+	 the various plugins, caches, and other event listeners will get confused by repeated attempts to
+	 start the server or make assumptions about the healthy state of the environment. It is recommended
+	 to assert that no error has been returned after calling `initialize()` to abort the process when the
+	 server fails to start properly. If you must try to resume after an error, call `server.stop()`
+	 first to reset the server state.
+	 */
+	initialize(callback?: (error: any) => void): IPromise<void>;
+
+	/** When the server contains exactly one connection, injects a request into the sole connection simulating an incoming HTTP request without making an actual socket connection.
+	 Injection is useful for testing purposes as well as for invoking routing logic internally without the overhead or limitations of the network stack.
+	 Utilizes the [shot module | https://github.com/hapijs/shot ] for performing injections, with some additional options and response properties
+	 * When the server contains more than one connection, each server.connections array member provides its own connection.inject().
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80 });
+	 var handler = function (request, reply) {
+	return reply('Success!');
+	};
+	 server.route({ method: 'GET', path: '/', handler: handler });
+	 server.inject('/', function (res) {
+	console.log(res.result);
+	});
+	 */
+	inject: IServerInject;
+
+	/** server.log(tags, [data, [timestamp]])
+	 Logs server events that cannot be associated with a specific request. When called the server emits a 'log' event which can be used by other listeners or plugins to record the information or output to the console. The arguments are:
+	 tags - a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events. Any logs generated by the server internally include the 'hapi' tag along with event-specific information.
+	 data - an optional message string or object with the application data being logged.
+	 timestamp - an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80 });
+	 server.on('log', function (event, tags) {
+	if (tags.error) {
+	console.log(event);
+	}
+	});
+	 server.log(['test', 'error'], 'Test event');*/
+	log(tags: string | string[], data?: string | any, timestamp?: number): void;
+
+	/**server.lookup(id)
+	 When the server contains exactly one connection, looks up a route configuration where:
+	 id - the route identifier as set in the route options.
+	 returns the route public interface object if found, otherwise null.
+	 var server = new Hapi.Server();
+	 server.connection();
+	 server.route({
+	method: 'GET',
+	path: '/',
+	config: {
+	handler: function (request, reply) { return reply(); },
+	id: 'root'
+	}
+	});
+	 var route = server.lookup('root');
+	 When the server contains more than one connection, each server.connections array member provides its own connection.lookup() method.*/
+	lookup(id: string): IRoute;
+
+	/** server.match(method, path, [host])
+	 When the server contains exactly one connection, looks up a route configuration where:
+	 method - the HTTP method (e.g. 'GET', 'POST').
+	 path - the requested path (must begin with '/').
+	 host - optional hostname (to match against routes with vhost).
+	 returns the route public interface object if found, otherwise null.
+	 var server = new Hapi.Server();
+	 server.connection();
+	 server.route({
+	method: 'GET',
+	path: '/',
+	config: {
+	handler: function (request, reply) { return reply(); },
+	id: 'root'
+	}
+	});
+	 var route = server.match('get', '/');
+	 When the server contains more than one connection, each server.connections array member provides its own connection.match() method.*/
+	match(method: string, path: string, host?: string): IRoute;
+
+
+	/** server.method(name, method, [options])
+	 Registers a server method. Server methods are functions registered with the server and used throughout the application as a common utility. Their advantage is in the ability to configure them to use the built-in cache and share across multiple request handlers without having to create a common module.
+	 Methods are registered via server.method(name, method, [options])
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80 });
+	 // Simple arguments
+	 var add = function (a, b, next) {
+	return next(null, a + b);
+	};
+	 server.method('sum', add, { cache: { expiresIn: 2000 } });
+	 server.methods.sum(4, 5, function (err, result) {
+	console.log(result);
+	});
+	 // Object argument
+	 var addArray = function (array, next) {
+	var sum = 0;
+	array.forEach(function (item) {
+	sum += item;
+	});
+	return next(null, sum);
+	};
+	 server.method('sumObj', addArray, {
+	cache: { expiresIn: 2000 },
+	generateKey: function (array) {
+	return array.join(',');
+	}
+	});
+	 server.methods.sumObj([5, 6], function (err, result) {
+	console.log(result);
+	});
+	 // Synchronous method with cache
+	 var addSync = function (a, b) {
+	return a + b;
+	};
+	 server.method('sumSync', addSync, { cache: { expiresIn: 2000 }, callback: false });
+	 server.methods.sumSync(4, 5, function (err, result) {
+	console.log(result);
+	}); */
+	method(/**  a unique method name used to invoke the method via server.methods[name]. When configured with caching enabled, server.methods[name].cache.drop(arg1, arg2, ..., argn, callback) can be used to clear the cache for a given key. Supports using nested names such as utils.users.get which will automatically create the missing path under server.methods and can be accessed for the previous example via server.methods.utils.users.get.*/
+		   name: string,
+		   method: IServerMethod,
+		   options?: IServerMethodOptions): void;
+
+
+	/**server.method(methods)
+	 Registers a server method function as described in server.method() using a configuration object where:
+	 methods - an object or an array of objects where each one contains:
+	 name - the method name.
+	 method - the method function.
+	 options - optional settings.
+	 var add = function (a, b, next) {
+	next(null, a + b);
+	};
+	 server.method({
+	name: 'sum',
+	method: add,
+	options: {
+	cache: {
+	expiresIn: 2000
+	}
+	}
+	});*/
+	method(methods: {
+		name: string; method: IServerMethod; options?: IServerMethodOptions
+	} | Array<{
+		name: string; method: IServerMethod; options?: IServerMethodOptions
+	}>): void;
+
+	/**server.path(relativeTo)
+	 Sets the path prefix used to locate static resources (files and view templates) when relative paths are used where:
+	 relativeTo - the path prefix added to any relative file path starting with '.'.
+	 Note that setting a path within a plugin only applies to resources accessed by plugin methods. If no path is set, the connection files.relativeTo configuration is used. The path only applies to routes added after it has been set.
+	 exports.register = function (server, options, next) {
+	server.path(__dirname + '../static');
+	server.route({ path: '/file', method: 'GET', handler: { file: './test.html' } });
+	next();
+	};*/
+	path(relativeTo: string): void;
+
+
+	/**
+	 * server.register(plugins, [options], callback)
+	 * Registers a plugin where:
+	 * plugins - an object or array of objects where each one is either:
+	 * a plugin registration function.
+	 * an object with the following:
+	 * register - the plugin registration function.
+	 * options - optional options passed to the registration function when called.
+	 * options - optional registration options (different from the options passed to the registration function):
+	 * select - a string or array of string labels used to pre-select connections for plugin registration.
+	 * routes - modifiers applied to each route added by the plugin:
+	 * prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
+	 * vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
+	 * callback - the callback function with signature function(err) where:
+	 * err - an error returned from the registration function. Note that exceptions thrown by the registration function are not handled by the framework.
+	 *
+	 * If no callback is provided, a Promise object is returned.
+	 */
+	register(plugins: any | any[], options: {
+		select: string | string[];
+		routes: {
+			prefix: string; vhost?: string | string[]
+		};
+	}, callback: (err: any) => void): void;
+	register(plugins: any | any[], options: {
+		select: string | string[];
+		routes: {
+			prefix: string; vhost?: string | string[]
+		};
+	}): IPromise<any>;
+
+	register(plugins: any | any[], callback: (err: any) => void): void;
+	register(plugins: any | any[]): IPromise<any>;
+
+	/**server.render(template, context, [options], callback)
+	 Utilizes the server views manager to render a template where:
+	 template - the template filename and path, relative to the views manager templates path (path or relativeTo).
+	 context - optional object used by the template to render context-specific result. Defaults to no context ({}).
+	 options - optional object used to override the views manager configuration.
+	 callback - the callback function with signature function (err, rendered, config) where:
+	 err - the rendering error if any.
+	 rendered - the result view string.
+	 config - the configuration used to render the template.
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80 });
+	 server.views({
+	engines: { html: require('handlebars') },
+	path: __dirname + '/templates'
+	});
+	 var context = {
+	title: 'Views Example',
+	message: 'Hello, World'
+	};
+	 server.render('hello', context, function (err, rendered, config) {
+	console.log(rendered);
+	});*/
+	render(template: string, context: any, options: any, callback: (err: any, rendered: any, config: any) => void): void;
+
+	/** server.route(options)
+	 Adds a connection route where:
+	 options - a route configuration object or an array of configuration objects.
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80 });
+	 server.route({ method: 'GET', path: '/', handler: function (request, reply) { return reply('ok'); } });
+	 server.route([
+	 { method: 'GET', path: '/1', handler: function (request, reply) { return reply('ok'); } },
+	 { method: 'GET', path: '/2', handler: function (request, reply) { return reply('ok'); } }
+	 ]);*/
+	route(options: IRouteConfiguration): void;
+	route(options: IRouteConfiguration[]): void;
+
+	/**server.select(labels)
+	 Selects a subset of the server's connections where:
+	 labels - a single string or array of strings of labels used as a logical OR statement to select all the connections with matching labels in their configuration.
+	 Returns a server object with connections set to the requested subset. Selecting again on a selection operates as a logic AND statement between the individual selections.
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80, labels: ['a'] });
+	 server.connection({ port: 8080, labels: ['b'] });
+	 server.connection({ port: 8081, labels: ['c'] });
+	 server.connection({ port: 8082, labels: ['c','d'] });
+	 var a = server.select('a');          // The server with port 80
+	 var ab = server.select(['a','b']);   // A list of servers containing the server with port 80 and the server with port 8080
+	 var c = server.select('c');          // A list of servers containing the server with port 8081 and the server with port 8082 */
+	select(labels: string | string[]): Server | Server[];
+
+	/** server.start([callback])
+	 Starts the server connections by listening for incoming requests on the configured port of each listener (unless the connection was configured with autoListen set to false), where:
+	 callback - optional callback when server startup is completed or failed with the signature function(err) where:
+	 err - any startup error condition.
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80 });
+	 server.start(function (err) {
+	console.log('Server started at: ' + server.info.uri);
+	});*/
+	start(callback?: (err: any) => void): IPromise<void>;
+
+	/** server.state(name, [options])
+	 HTTP state management uses client cookies to persist a state across multiple requests. Registers a cookie definitions
+	 State defaults can be modified via the server connections.routes.state configuration option.
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80 });
+	 // Set cookie definition
+	 server.state('session', {
+	ttl: 24 * 60 * 60 * 1000,     // One day
+	isSecure: true,
+	path: '/',
+	encoding: 'base64json'
+	});
+	 // Set state in route handler
+	 var handler = function (request, reply) {
+	var session = request.state.session;
+	if (!session) {
+	session = { user: 'joe' };
+	}
+	session.last = Date.now();
+	return reply('Success').state('session', session);
+	};
+	 Registered cookies are automatically parsed when received. Parsing rules depends on the route state.parse configuration. If an incoming registered cookie fails parsing, it is not included in request.state, regardless of the state.failAction setting. When state.failAction is set to 'log' and an invalid cookie value is received, the server will emit a 'request-internal' event. To capture these errors subscribe to the 'request-internal' events and filter on 'error' and 'state' tags:
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80 });
+	 server.on('request-internal', function (request, event, tags) {
+	if (tags.error && tags.state) {
+	console.error(event);
+	}
+	});    */
+	state(name: string, options?: ICookieSettings): void;
+
+	/** server.stop([options], [callback])
+	 Stops the server's connections by refusing to accept any new connections or requests (existing connections will continue until closed or timeout), where:
+	 options - optional object with:
+	 timeout - overrides the timeout in millisecond before forcefully terminating a connection. Defaults to 5000 (5 seconds).
+	 callback - optional callback method with signature function() which is called once all the connections have ended and it is safe to exit the process.
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80 });
+	 server.stop({ timeout: 60 * 1000 }, function () {
+	console.log('Server stopped');
+	});*/
+	stop(options?: { timeout: number }, callback?: () => void): IPromise<void>;
+
+	/**server.table([host])
+	 Returns a copy of the routing table where:
+	 host - optional host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
+	 The return value is an array where each item is an object containing:
+	 info - the connection.info the connection the table was generated for.
+	 labels - the connection labels.
+	 table - an array of routes where each route contains:
+	 settings - the route config with defaults applied.
+	 method - the HTTP method in lower case.
+	 path - the route path.
+	 Note that if the server has not been started and multiple connections use port 0, the table items will override each other and will produce an incomplete result.
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80, host: 'example.com' });
+	 server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
+	 var table = server.table();
+	 When calling connection.table() directly on each connection, the return value is the same as the array table item value of an individual connection:
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.connection({ port: 80, host: 'example.com' });
+	 server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
+	 var table = server.connections[0].table();
+	 //[
+	 //    {
+	//        method: 'get',
+	//        path: '/example',
+	//        settings: { ... }
+	//    }
+	 //]
+	 */
+	table(host?: any): IConnectionTable;
+
+	/**server.views(options)
+	 Initializes the server views manager
+	 var Hapi = require('hapi');
+	 var server = new Hapi.Server();
+	 server.views({
+	engines: {
+	html: require('handlebars'),
+	jade: require('jade')
+	},
+	path: '/static/templates'
+	});
+	 When server.views() is called within a plugin, the views manager is only available to plugins methods.*/
+	views(options: IServerViewsConfiguration): void;
+
+}
+
diff --git a/hapi/tsconfig.json b/hapi/tsconfig.json
new file mode 100644
index 0000000000..984afb5d2c
--- /dev/null
+++ b/hapi/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "hapi-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/harmony-proxy/harmony-proxy-tests.ts b/harmony-proxy/harmony-proxy-tests.ts
index 4c011d5fd1..3eb2aed095 100644
--- a/harmony-proxy/harmony-proxy-tests.ts
+++ b/harmony-proxy/harmony-proxy-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./harmony-proxy.d.ts" />
+
 
 import * as Proxy from "harmony-proxy";
 
diff --git a/harmony-proxy/harmony-proxy.d.ts b/harmony-proxy/harmony-proxy.d.ts
deleted file mode 100644
index 851d671869..0000000000
--- a/harmony-proxy/harmony-proxy.d.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// Type definitions for harmony-proxy 1.0.0
-// Project: https://www.npmjs.com/package/harmony-proxy
-// Definitions by: Remo Jansen <https://github.com/remojansen/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace harmonyProxy {
-    type PropertyKey = string | number | symbol;
-
-    interface ProxyHandler<T> {
-        getPrototypeOf? (target: T): any;
-        setPrototypeOf? (target: T, v: any): boolean;
-        isExtensible? (target: T): boolean;
-        preventExtensions? (target: T): boolean;
-        getOwnPropertyDescriptor? (target: T, p: PropertyKey): PropertyDescriptor;
-        has? (target: T, p: PropertyKey): boolean;
-        get? (target: T, p: PropertyKey, receiver: any): any;
-        set? (target: T, p: PropertyKey, value: any, receiver: any): boolean;
-        deleteProperty? (target: T, p: PropertyKey): boolean;
-        defineProperty? (target: T, p: PropertyKey, attributes: PropertyDescriptor): boolean;
-        enumerate? (target: T): PropertyKey[];
-        ownKeys? (target: T): PropertyKey[];
-        apply? (target: T, thisArg: any, argArray?: any): any;
-        construct? (target: T, thisArg: any, argArray?: any): any;
-    }
-
-    interface ProxyConstructor {
-        revocable<T>(target: T, handler: ProxyHandler<T>): { proxy: T; revoke: () => void; };
-        new <T>(target: T, handler: ProxyHandler<T>): T
-    }
-}
-
-declare module "harmony-proxy" {
-    let _Proxy: harmonyProxy.ProxyConstructor;
-    export = _Proxy;
-}
diff --git a/harmony-proxy/index.d.ts b/harmony-proxy/index.d.ts
new file mode 100644
index 0000000000..734c752084
--- /dev/null
+++ b/harmony-proxy/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for harmony-proxy 1.0.0
+// Project: https://www.npmjs.com/package/harmony-proxy
+// Definitions by: Remo Jansen <https://github.com/remojansen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace harmonyProxy {
+    type PropertyKey = string | number | symbol;
+
+    interface ProxyHandler<T> {
+        getPrototypeOf? (target: T): any;
+        setPrototypeOf? (target: T, v: any): boolean;
+        isExtensible? (target: T): boolean;
+        preventExtensions? (target: T): boolean;
+        getOwnPropertyDescriptor? (target: T, p: PropertyKey): PropertyDescriptor;
+        has? (target: T, p: PropertyKey): boolean;
+        get? (target: T, p: PropertyKey, receiver: any): any;
+        set? (target: T, p: PropertyKey, value: any, receiver: any): boolean;
+        deleteProperty? (target: T, p: PropertyKey): boolean;
+        defineProperty? (target: T, p: PropertyKey, attributes: PropertyDescriptor): boolean;
+        enumerate? (target: T): PropertyKey[];
+        ownKeys? (target: T): PropertyKey[];
+        apply? (target: T, thisArg: any, argArray?: any): any;
+        construct? (target: T, thisArg: any, argArray?: any): any;
+    }
+
+    interface ProxyConstructor {
+        revocable<T>(target: T, handler: ProxyHandler<T>): { proxy: T; revoke: () => void; };
+        new <T>(target: T, handler: ProxyHandler<T>): T
+    }
+}
+
+declare var _Proxy: harmonyProxy.ProxyConstructor;
+export = _Proxy;
diff --git a/harmony-proxy/tsconfig.json b/harmony-proxy/tsconfig.json
new file mode 100644
index 0000000000..42d322ac39
--- /dev/null
+++ b/harmony-proxy/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "harmony-proxy-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/hasher/hasher-tests.ts b/hasher/hasher-tests.ts
index 5c43af9b03..5e988c7601 100644
--- a/hasher/hasher-tests.ts
+++ b/hasher/hasher-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="hasher.d.ts" />
+
 
 //handle hash changes
 function handleChanges(newHash: any, oldHash: any) {
diff --git a/hasher/hasher.d.ts b/hasher/hasher.d.ts
deleted file mode 100644
index 05345543dc..0000000000
--- a/hasher/hasher.d.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-// Type definitions for Hasher.js
-// Project: https://github.com/millermedeiros/hasher/
-// Definitions by: flyfishMT <https://github.com/flyfishMT/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../js-signals/js-signals.d.ts" />
-
-declare namespace HasherJs {
-
-	export interface HasherStatic {
-
-		// {string} hasher.appendHash
-		// String that should always be added to the end of Hash value.
-		appendHash(): string;
-
-		// default value: '';
-		// will be automatically removed from `hasher.getHash()`
-		// avoid conflicts with elements that contain ID equal to hash value;
-		// <static> {signals.Signal} hasher.changed
-		// Signal dispatched when hash value changes. - pass current hash as 1st parameter to listeners and previous hash value as 2nd parameter.
-		changed: Signal;
-
-		// <static> {signals.Signal} hasher.initialized
-		// Signal dispatched when hasher is initialized. - pass current hash as first parameter to listeners.
-		initialized: Signal;
-
-		// <static> {string} hasher.prependHash
-        // String that should always be added to the beginning of Hash value.
-        prependHash: string;
-
-		// default value: '/';
-		// will be automatically removed from `hasher.getHash()`
-		// avoid conflicts with elements that contain ID equal to hash value;
-		// <static> {string} hasher.separator
-		// String used to split hash paths; used by hasher.getHashAsArray() to split paths.
-		separator: string;
-
-		// default value: '/';
-		// <static> {signals.Signal} hasher.stopped
-		// Signal dispatched when hasher is stopped. - pass current hash as first parameter to listeners
-		stopped: Signal;
-
-		// <static> <constant> {string} hasher.VERSION
-		// hasher Version Number
-		VERSION: string;
-
-		// Method Detail
-		// <static> hasher.dispose()
-        // Removes all event listeners, stops hasher and destroy hasher object. - IMPORTANT: hasher won't work after calling this method, hasher Object will be deleted.
-        dispose(): void;
-
-		// <static> {string} hasher.getBaseURL()
-		// Returns:
-		// {string} Retrieve URL without query string and hash.
-		getBaseURL(): string;
-
-		// <static> {string} hasher.getHash()
-		// Returns:
-		// {string} Hash value without '#', `hasher.appendHash` and `hasher.prependHash`.
-		getHash(): string;
-
-		// <static> {Array.} hasher.getHashAsArray()
-		// Returns:
-		// {Array.} Hash value split into an Array.
-		getHashAsArray(): string[];
-
-		// <static> {string} hasher.getURL()
-		// Returns:
-		// {string} Full URL.
-		getURL(): string;
-
-		// <static> hasher.init()
-		// Start listening/dispatching changes in the hash/history.
-		init(): void;
-
-		// hasher won't dispatch CHANGE events by manually typing a new value or pressing the back/forward buttons before calling this method.
-		// <static> {boolean} hasher.isActive()
-		// Returns:
-		// {boolean} If hasher is listening to changes on the browser history and/or hash value.
-		isActive(): boolean;
-
-		// <static> hasher.replaceHash(path)
-		// Set Hash value without keeping previous hash on the history record. Similar to calling window.location.replace("#/hash") but will also work on IE6-7.
-		// hasher.replaceHash('lorem', 'ipsum', 'dolor') -> '#/lorem/ipsum/dolor'
-		// Parameters:
-		// {...string} path
-		// Hash value without '#'. Hasher will join path segments using `hasher.separator` and prepend/append hash value with `hasher.appendHash` and `hasher.prependHash`
-		replaceHash(...path: string[]): void;
-
-		// <static> hasher.setHash(path)
-		// Set Hash value, generating a new history record.
-		// hasher.setHash('lorem', 'ipsum', 'dolor') -> '#/lorem/ipsum/dolor'
-		// Parameters:
-		// {...string} path
-		// Hash value without '#'. Hasher will join path segments using `hasher.separator` and prepend/append hash value with `hasher.appendHash` and `hasher.prependHash`
-		setHash(...path: string[]): void;
-
-		// <static> hasher.stop()
-		// Stop listening/dispatching changes in the hash/history.
-		// hasher won't dispatch CHANGE events by manually typing a new value or pressing the back/forward buttons after calling this method, unless you call hasher.init() again.
-        // hasher will still dispatch changes made programatically by calling hasher.setHash();
-        stop(): void;
-
-		// <static> {string} hasher.toString()
-		// Returns:
-		// {string} A string representation of the object.
-		toString(): string;
-	}
-}
-
-declare var hasher: HasherJs.HasherStatic;
-
-// AMD
-declare module 'hasher'{
-    export = hasher;
-}
diff --git a/hasher/index.d.ts b/hasher/index.d.ts
new file mode 100644
index 0000000000..e2eff2514b
--- /dev/null
+++ b/hasher/index.d.ts
@@ -0,0 +1,116 @@
+// Type definitions for Hasher.js
+// Project: https://github.com/millermedeiros/hasher/
+// Definitions by: flyfishMT <https://github.com/flyfishMT/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="signals" />
+
+declare namespace HasherJs {
+
+	export interface HasherStatic {
+
+		// {string} hasher.appendHash
+		// String that should always be added to the end of Hash value.
+		appendHash(): string;
+
+		// default value: '';
+		// will be automatically removed from `hasher.getHash()`
+		// avoid conflicts with elements that contain ID equal to hash value;
+		// <static> {signals.Signal} hasher.changed
+		// Signal dispatched when hash value changes. - pass current hash as 1st parameter to listeners and previous hash value as 2nd parameter.
+		changed: Signal;
+
+		// <static> {signals.Signal} hasher.initialized
+		// Signal dispatched when hasher is initialized. - pass current hash as first parameter to listeners.
+		initialized: Signal;
+
+		// <static> {string} hasher.prependHash
+        // String that should always be added to the beginning of Hash value.
+        prependHash: string;
+
+		// default value: '/';
+		// will be automatically removed from `hasher.getHash()`
+		// avoid conflicts with elements that contain ID equal to hash value;
+		// <static> {string} hasher.separator
+		// String used to split hash paths; used by hasher.getHashAsArray() to split paths.
+		separator: string;
+
+		// default value: '/';
+		// <static> {signals.Signal} hasher.stopped
+		// Signal dispatched when hasher is stopped. - pass current hash as first parameter to listeners
+		stopped: Signal;
+
+		// <static> <constant> {string} hasher.VERSION
+		// hasher Version Number
+		VERSION: string;
+
+		// Method Detail
+		// <static> hasher.dispose()
+        // Removes all event listeners, stops hasher and destroy hasher object. - IMPORTANT: hasher won't work after calling this method, hasher Object will be deleted.
+        dispose(): void;
+
+		// <static> {string} hasher.getBaseURL()
+		// Returns:
+		// {string} Retrieve URL without query string and hash.
+		getBaseURL(): string;
+
+		// <static> {string} hasher.getHash()
+		// Returns:
+		// {string} Hash value without '#', `hasher.appendHash` and `hasher.prependHash`.
+		getHash(): string;
+
+		// <static> {Array.} hasher.getHashAsArray()
+		// Returns:
+		// {Array.} Hash value split into an Array.
+		getHashAsArray(): string[];
+
+		// <static> {string} hasher.getURL()
+		// Returns:
+		// {string} Full URL.
+		getURL(): string;
+
+		// <static> hasher.init()
+		// Start listening/dispatching changes in the hash/history.
+		init(): void;
+
+		// hasher won't dispatch CHANGE events by manually typing a new value or pressing the back/forward buttons before calling this method.
+		// <static> {boolean} hasher.isActive()
+		// Returns:
+		// {boolean} If hasher is listening to changes on the browser history and/or hash value.
+		isActive(): boolean;
+
+		// <static> hasher.replaceHash(path)
+		// Set Hash value without keeping previous hash on the history record. Similar to calling window.location.replace("#/hash") but will also work on IE6-7.
+		// hasher.replaceHash('lorem', 'ipsum', 'dolor') -> '#/lorem/ipsum/dolor'
+		// Parameters:
+		// {...string} path
+		// Hash value without '#'. Hasher will join path segments using `hasher.separator` and prepend/append hash value with `hasher.appendHash` and `hasher.prependHash`
+		replaceHash(...path: string[]): void;
+
+		// <static> hasher.setHash(path)
+		// Set Hash value, generating a new history record.
+		// hasher.setHash('lorem', 'ipsum', 'dolor') -> '#/lorem/ipsum/dolor'
+		// Parameters:
+		// {...string} path
+		// Hash value without '#'. Hasher will join path segments using `hasher.separator` and prepend/append hash value with `hasher.appendHash` and `hasher.prependHash`
+		setHash(...path: string[]): void;
+
+		// <static> hasher.stop()
+		// Stop listening/dispatching changes in the hash/history.
+		// hasher won't dispatch CHANGE events by manually typing a new value or pressing the back/forward buttons after calling this method, unless you call hasher.init() again.
+        // hasher will still dispatch changes made programatically by calling hasher.setHash();
+        stop(): void;
+
+		// <static> {string} hasher.toString()
+		// Returns:
+		// {string} A string representation of the object.
+		toString(): string;
+	}
+}
+
+declare var hasher: HasherJs.HasherStatic;
+
+// AMD
+declare module 'hasher'{
+    export = hasher;
+}
diff --git a/hasher/tsconfig.json b/hasher/tsconfig.json
new file mode 100644
index 0000000000..3c9988efed
--- /dev/null
+++ b/hasher/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "hasher-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/hashids/hashids-tests.ts b/hashids/hashids-tests.ts
index 9e51c8b8ab..e1a6c094ec 100644
--- a/hashids/hashids-tests.ts
+++ b/hashids/hashids-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="hashids.d.ts" />
+
 
 /* require hashids */
 import Hashids = require("hashids");
diff --git a/hashids/hashids.d.ts b/hashids/hashids.d.ts
deleted file mode 100644
index fa62274b51..0000000000
--- a/hashids/hashids.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Type definitions for Hashids.js 1.x
-// Project: https://github.com/ivanakimov/hashids.node.js
-// Definitions by: Paulo Cesar <https://github.com/pocesar/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare namespace Hashids {
-
-    export interface IHashids {
-        new(salt: string, minHashLength?: number, alphabet?: string): IHashids;
-        version: string;
-        minAlphabetLength: number;
-        sepDiv: number;
-        guardDiv: number;
-        errorAlphabetLength: string;
-        errorAlphabetSpace: string;
-        alphabet: string[];
-        seps: string;
-        minHashLength: number;
-        salt: string;
-        decode(hash: string): number[];
-        encode(arg: number): string;
-        encode(arg: number[]): string;
-        encode(...args: number[]): string;
-        encodeHex(str: string): string;
-        decodeHex(hash: string): string;
-        hash(input: number, alphabet: string): string;
-        unhash(input: string[], alphabet: string): number;
-    }
-}
-
-declare module 'hashids' {
-    var hashids: Hashids.IHashids;
-    export = hashids;
-}
diff --git a/hashids/index.d.ts b/hashids/index.d.ts
new file mode 100644
index 0000000000..d7c5ec56b7
--- /dev/null
+++ b/hashids/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for Hashids.js 1.x
+// Project: https://github.com/ivanakimov/hashids.node.js
+// Definitions by: Paulo Cesar <https://github.com/pocesar/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare namespace Hashids {
+
+    export interface IHashids {
+        new(salt: string, minHashLength?: number, alphabet?: string): IHashids;
+        version: string;
+        minAlphabetLength: number;
+        sepDiv: number;
+        guardDiv: number;
+        errorAlphabetLength: string;
+        errorAlphabetSpace: string;
+        alphabet: string[];
+        seps: string;
+        minHashLength: number;
+        salt: string;
+        decode(hash: string): number[];
+        encode(arg: number): string;
+        encode(arg: number[]): string;
+        encode(...args: number[]): string;
+        encodeHex(str: string): string;
+        decodeHex(hash: string): string;
+        hash(input: number, alphabet: string): string;
+        unhash(input: string[], alphabet: string): number;
+    }
+}
+
+declare var hashids: Hashids.IHashids;
+export = hashids;
diff --git a/hashids/tsconfig.json b/hashids/tsconfig.json
new file mode 100644
index 0000000000..48ee470667
--- /dev/null
+++ b/hashids/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "hashids-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/hashmap/hashmap-tests.ts b/hashmap/hashmap-tests.ts
index ff9f69529b..04a2459b54 100644
--- a/hashmap/hashmap-tests.ts
+++ b/hashmap/hashmap-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="hashmap.d.ts"/>
-
+import HashMap = require("hashmap");
 var emptyMap:HashMap<string, number> = new HashMap<string, number>();
 var filledMap:HashMap<string, number> = new HashMap<string, number>("bar", 123, "bar2", 234);
 var copiedMap:HashMap<string, number> = new HashMap(filledMap);
diff --git a/hashmap/hashmap.d.ts b/hashmap/hashmap.d.ts
deleted file mode 100644
index 9f059d2df8..0000000000
--- a/hashmap/hashmap.d.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-// Type definitions for HashMap 2.0.3
-// Project: https://github.com/flesler/hashmap
-// Definitions by: Rafał Wrzeszcz <http://wrzasq.pl>, Vasya Aksyonov <https://github.com/outring>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare class HashMap<TKey, TValue> {
-
-    /**
-     * Creates an empty hashmap.
-     */
-    constructor();
-
-    /**
-     * Creates a hashmap with the key-value pairs of map.
-     *
-     * @param map
-     */
-    constructor(map:HashMap<TKey, TValue>);
-
-    /**
-     * Creates a hashmap with several key-value pairs.
-     *
-     * @param keysAndValues key1, value1, key2, value2...
-     */
-    constructor(...keysAndValues:(TKey|TValue)[]);
-
-    /**
-     * Return value from hashmap.
-     *
-     * @param key Key.
-     * @return Value stored under given key.
-     */
-    get(key:TKey):TValue;
-
-    /**
-     * Store value in hashmap.
-     *
-     * @param key Key.
-     * @param value Value.
-     * @return Self.
-     */
-    set(key:TKey, value:TValue):HashMap<TKey, TValue>;
-
-    /**
-     * Store several key-value pairs.
-     *
-     * @param keysAndValues key1, value1, key2, value2...
-     * @return Self.
-     */
-    multi(...keysAndValues:(TKey|TValue)[]):HashMap<TKey, TValue>;
-
-    /**
-     * Copy all key-value pairs from other to this instance.
-     *
-     * @param map Other map.
-     * @return Self.
-     */
-    copy(map:HashMap<TKey, TValue>):HashMap<TKey, TValue>;
-
-    /**
-     * Checks if given key exists in hashmap.
-     *
-     * @param key Key.
-     * @return Whether given key exists in hashmap.
-     */
-    has(key:TKey):boolean;
-
-    /**
-     * Returns key under which given value is stored.
-     *
-     * @param value Value.
-     * @return Key which is assigned to value stored.
-     */
-    search(value:TValue):TKey;
-
-    /**
-     * Removes given key from hashmap.
-     *
-     * @param key Key.
-     * @return Self.
-     */
-    remove(key:TKey):HashMap<TKey, TValue>;
-
-    /**
-     * Returns all contained keys.
-     *
-     * @return List of keys.
-     */
-    keys():TKey[];
-
-    /**
-     * Returns all container values.
-     *
-     * @return List of values.
-     */
-    values():TValue[];
-
-    /**
-     * Returns size of hashmap (number of entries).
-     *
-     * @return Number of entries in hashmap.
-     */
-    count():number;
-
-    /**
-     * Clears hashmap.
-     *
-     * @return Self.
-     */
-    clear():HashMap<TKey, TValue>;
-
-    /**
-     * Creates a new hashmap with all the key-value pairs of the original
-     *
-     * @return New hashmap.
-     */
-    clone():HashMap<TKey, TValue>;
-
-    /**
-     * Iterates over hashmap.
-     *
-     * @param callback Function to be invoked for every hashmap entry.
-     * @return Self.
-     */
-    forEach(callback:(value:TValue, key:TKey) => void):HashMap<TKey, TValue>;
-}
-
-declare module "hashmap" {
-    export = HashMap;
-}
diff --git a/hashmap/index.d.ts b/hashmap/index.d.ts
new file mode 100644
index 0000000000..79e5fd380d
--- /dev/null
+++ b/hashmap/index.d.ts
@@ -0,0 +1,129 @@
+// Type definitions for HashMap 2.0.3
+// Project: https://github.com/flesler/hashmap
+// Definitions by: Rafał Wrzeszcz <http://wrzasq.pl>, Vasya Aksyonov <https://github.com/outring>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class HashMap<TKey, TValue> {
+
+    /**
+     * Creates an empty hashmap.
+     */
+    constructor();
+
+    /**
+     * Creates a hashmap with the key-value pairs of map.
+     *
+     * @param map
+     */
+    constructor(map:HashMap<TKey, TValue>);
+
+    /**
+     * Creates a hashmap with several key-value pairs.
+     *
+     * @param keysAndValues key1, value1, key2, value2...
+     */
+    constructor(...keysAndValues:(TKey|TValue)[]);
+
+    /**
+     * Return value from hashmap.
+     *
+     * @param key Key.
+     * @return Value stored under given key.
+     */
+    get(key:TKey):TValue;
+
+    /**
+     * Store value in hashmap.
+     *
+     * @param key Key.
+     * @param value Value.
+     * @return Self.
+     */
+    set(key:TKey, value:TValue):HashMap<TKey, TValue>;
+
+    /**
+     * Store several key-value pairs.
+     *
+     * @param keysAndValues key1, value1, key2, value2...
+     * @return Self.
+     */
+    multi(...keysAndValues:(TKey|TValue)[]):HashMap<TKey, TValue>;
+
+    /**
+     * Copy all key-value pairs from other to this instance.
+     *
+     * @param map Other map.
+     * @return Self.
+     */
+    copy(map:HashMap<TKey, TValue>):HashMap<TKey, TValue>;
+
+    /**
+     * Checks if given key exists in hashmap.
+     *
+     * @param key Key.
+     * @return Whether given key exists in hashmap.
+     */
+    has(key:TKey):boolean;
+
+    /**
+     * Returns key under which given value is stored.
+     *
+     * @param value Value.
+     * @return Key which is assigned to value stored.
+     */
+    search(value:TValue):TKey;
+
+    /**
+     * Removes given key from hashmap.
+     *
+     * @param key Key.
+     * @return Self.
+     */
+    remove(key:TKey):HashMap<TKey, TValue>;
+
+    /**
+     * Returns all contained keys.
+     *
+     * @return List of keys.
+     */
+    keys():TKey[];
+
+    /**
+     * Returns all container values.
+     *
+     * @return List of values.
+     */
+    values():TValue[];
+
+    /**
+     * Returns size of hashmap (number of entries).
+     *
+     * @return Number of entries in hashmap.
+     */
+    count():number;
+
+    /**
+     * Clears hashmap.
+     *
+     * @return Self.
+     */
+    clear():HashMap<TKey, TValue>;
+
+    /**
+     * Creates a new hashmap with all the key-value pairs of the original
+     *
+     * @return New hashmap.
+     */
+    clone():HashMap<TKey, TValue>;
+
+    /**
+     * Iterates over hashmap.
+     *
+     * @param callback Function to be invoked for every hashmap entry.
+     * @return Self.
+     */
+    forEach(callback:(value:TValue, key:TKey) => void):HashMap<TKey, TValue>;
+}
+
+export = HashMap;
+export as namespace HashMap;
diff --git a/hashmap/tsconfig.json b/hashmap/tsconfig.json
new file mode 100644
index 0000000000..60109837f1
--- /dev/null
+++ b/hashmap/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "hashmap-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/hashset/hashset-tests.ts b/hashset/hashset-tests.ts
index fda2e4d1a2..71c2e1eafa 100644
--- a/hashset/hashset-tests.ts
+++ b/hashset/hashset-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="hashset.d.ts" />
+
 
 class Point {
     constructor(public x: number, public y: number) {
diff --git a/hashset/hashset.d.ts b/hashset/hashset.d.ts
deleted file mode 100644
index 99caca8d66..0000000000
--- a/hashset/hashset.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// Type definitions for jshashset 3.0
-// Project: http://www.timdown.co.uk/jshashtable/jshashset.html
-// Definitions by: Sergey Gerasimov <https://github.com/gerich-home/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../hashtable/hashtable.d.ts" />
-
-interface IHashSet<TValue>
-{
-    add(value: TValue): void;
-    addAll(arr: TValue[]): void;
-    contains(value: TValue): boolean;
-
-    clear(): void;
-    isEmpty(): boolean; values(): TValue[];
-
-    remove(value: TValue): void;
-    size(): number;
-
-    clone(): IHashSet<TValue>;
-
-    isSubsetOf(set: IHashSet<TValue>): boolean;
-    intersection(set: IHashSet<TValue>): IHashSet<TValue>;
-    union(set: IHashSet<TValue>): IHashSet<TValue>;
-    complement(set: IHashSet<TValue>): IHashSet<TValue>;
-}
-
-interface IHashSetStatic {
-    new <TValue>(): IHashSet<TValue>;
-    new <TValue>(options: IHashtableOptions<TValue>): IHashSet<TValue>;
-    new <TValue>(hashCode?: (value: TValue) => any, equals?: (value1: TValue, value2: TValue) => boolean): IHashSet<TValue>;
-}
-
-declare var HashSet: IHashSetStatic;
-
-declare module "hashset" {
-    export = HashSet;
-}
\ No newline at end of file
diff --git a/hashset/index.d.ts b/hashset/index.d.ts
new file mode 100644
index 0000000000..9a0136fb42
--- /dev/null
+++ b/hashset/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for jshashset 3.0
+// Project: http://www.timdown.co.uk/jshashtable/jshashset.html
+// Definitions by: Sergey Gerasimov <https://github.com/gerich-home/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="hashtable" />
+
+interface IHashSet<TValue>
+{
+    add(value: TValue): void;
+    addAll(arr: TValue[]): void;
+    contains(value: TValue): boolean;
+
+    clear(): void;
+    isEmpty(): boolean; values(): TValue[];
+
+    remove(value: TValue): void;
+    size(): number;
+
+    clone(): IHashSet<TValue>;
+
+    isSubsetOf(set: IHashSet<TValue>): boolean;
+    intersection(set: IHashSet<TValue>): IHashSet<TValue>;
+    union(set: IHashSet<TValue>): IHashSet<TValue>;
+    complement(set: IHashSet<TValue>): IHashSet<TValue>;
+}
+
+interface IHashSetStatic {
+    new <TValue>(): IHashSet<TValue>;
+    new <TValue>(options: IHashtableOptions<TValue>): IHashSet<TValue>;
+    new <TValue>(hashCode?: (value: TValue) => any, equals?: (value1: TValue, value2: TValue) => boolean): IHashSet<TValue>;
+}
+
+declare var HashSet: IHashSetStatic;
+
+declare module "hashset" {
+    export = HashSet;
+}
\ No newline at end of file
diff --git a/hashset/tsconfig.json b/hashset/tsconfig.json
new file mode 100644
index 0000000000..aec61c8e50
--- /dev/null
+++ b/hashset/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "hashset-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/hashtable/hashtable-tests.ts b/hashtable/hashtable-tests.ts
index 9c90b5729d..23ce9a9c00 100644
--- a/hashtable/hashtable-tests.ts
+++ b/hashtable/hashtable-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="hashtable.d.ts" />
+
 
 class Point {
     constructor(public x: number, public y: number) {
diff --git a/hashtable/hashtable.d.ts b/hashtable/index.d.ts
similarity index 100%
rename from hashtable/hashtable.d.ts
rename to hashtable/index.d.ts
diff --git a/hashtable/tsconfig.json b/hashtable/tsconfig.json
new file mode 100644
index 0000000000..96babb583b
--- /dev/null
+++ b/hashtable/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "hashtable-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/he/he-tests.ts b/he/he-tests.ts
index 395eb94ef0..6045574fa5 100644
--- a/he/he-tests.ts
+++ b/he/he-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="he.d.ts" />
-
 import he = require('he');
 
 function main() {
diff --git a/he/he.d.ts b/he/he.d.ts
deleted file mode 100644
index e0fb9847ac..0000000000
--- a/he/he.d.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-// Type definitions for he v0.5.0
-// Project: https://github.com/mathiasbynens/he
-// Definitions by: Simon Edwards <https://github.com/sedwards2009>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// he - "HTML Entities" - A high quality pair of HTML encode and decode functions.
-
-declare module "he" {
-  
-    var version: string;
-    
-    interface EncodeOptions {
-        /**
-        * The default value for the useNamedReferences option is false. This
-        * means that encode() will not use any named character references
-        * (e.g. &copy;) in the output — hexadecimal escapes (e.g. &#xA9;) will
-        * be used instead. Set it to true to enable the use of named references.
-        */
-        useNamedReferences?: boolean;
-        
-        /**
-        * The default value for the encodeEverything option is false. This means
-        * that encode() will not use any character references for printable ASCII
-        * symbols that don’t need escaping. Set it to true to encode every symbol
-        * in the input string. When set to true, this option takes precedence over
-        * allowUnsafeSymbols (i.e. setting the latter to true in such a case has
-          * no effect).
-        */
-       encodeEverything?: boolean;
-        
-       /**
-        * The default value for the strict option is false. This means that
-        * encode() will encode any HTML text content you feed it, even if it
-        * contains any symbols that cause parse errors. To throw an error when such
-        * invalid HTML is encountered, set the strict option to true. This option
-        * makes it possible to use he as part of HTML parsers and HTML validators.
-        */
-        strict?: boolean;
-        
-        /**
-        * The default value for the allowUnsafeSymbols option is false. This means
-        * that characters that are unsafe for use in HTML content (&, <, >, ", ',
-        * and `) will be encoded. When set to true, only non-ASCII characters will
-        * be encoded. If the encodeEverything option is set to true, this option
-        * will be ignored.
-        */
-        allowUnsafeSymbols?: boolean;
-    }
-    
-    interface Encode {
-        /**
-        * Encode a string of text
-        *
-        * This function takes a string of text and encodes (by default) any symbols
-        * that aren’t printable ASCII symbols and &, <, >, ", ', and `, replacing
-        * them with character references.
-        *
-        * As long as the input string contains allowed code points only, the return
-        * value of this function is always valid HTML. Any (invalid) code points
-        * that cannot be represented using a character reference in the input are
-        * not encoded.
-        */
-        (text: string, options?: EncodeOptions): string;
-        
-        options: EncodeOptions;
-    }
-    var encode: Encode;
-    
-    interface DecodeOptions {
-        /**
-         * The default value for the isAttributeValue option is false. This means
-         * that decode() will decode the string as if it were used in a text
-         * context in an HTML document. HTML has different rules for parsing
-         * character references in attribute values — set this option to true to
-         * treat the input string as if it were used as an attribute value.
-         */
-        isAttributeValue?: boolean;
-        
-        /**
-         * The default value for the strict option is false. This means that
-         * decode() will decode any HTML text content you feed it, even if it
-         * contains any entities that cause parse errors. To throw an error when
-         * such invalid HTML is encountered, set the strict option to true. This
-         * option makes it possible to use he as part of HTML parsers and HTML
-         * validators.
-         */
-        strict?: boolean;
-    }
-    
-    interface Decode {
-        /**
-         * Decode a string of HTML text
-         *
-         * This function takes a string of HTML and decodes any named and numerical
-         * character references in it using the algorithm described in section
-         * 12.2.4.69 of the HTML spec.
-         */
-        (html: string, options?: DecodeOptions): string;
-        
-        options: DecodeOptions;
-    }
-    var decode: Decode;
-    
-    /**
-     * Escape XML entities
-     *
-     * This function takes a string of text and escapes it for use in text
-     * contexts in XML or HTML documents. Only the following characters are
-     * escaped: &, <, >, ", ', and `.
-     */
-    function escape(text: string): string;
-    
-    var unescape: Decode;
-}
diff --git a/he/index.d.ts b/he/index.d.ts
new file mode 100644
index 0000000000..a890ad823c
--- /dev/null
+++ b/he/index.d.ts
@@ -0,0 +1,113 @@
+// Type definitions for he v0.5.0
+// Project: https://github.com/mathiasbynens/he
+// Definitions by: Simon Edwards <https://github.com/sedwards2009>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// he - "HTML Entities" - A high quality pair of HTML encode and decode functions.
+
+export as namespace he;
+
+export var version: string;
+
+export interface EncodeOptions {
+    /**
+    * The default value for the useNamedReferences option is false. This
+    * means that encode() will not use any named character references
+    * (e.g. &copy;) in the output — hexadecimal escapes (e.g. &#xA9;) will
+    * be used instead. Set it to true to enable the use of named references.
+    */
+    useNamedReferences?: boolean;
+
+    /**
+    * The default value for the encodeEverything option is false. This means
+    * that encode() will not use any character references for printable ASCII
+    * symbols that don’t need escaping. Set it to true to encode every symbol
+    * in the input string. When set to true, this option takes precedence over
+    * allowUnsafeSymbols (i.e. setting the latter to true in such a case has
+      * no effect).
+    */
+    encodeEverything?: boolean;
+
+    /**
+     * The default value for the strict option is false. This means that
+     * encode() will encode any HTML text content you feed it, even if it
+     * contains any symbols that cause parse errors. To throw an error when such
+     * invalid HTML is encountered, set the strict option to true. This option
+     * makes it possible to use he as part of HTML parsers and HTML validators.
+     */
+    strict?: boolean;
+
+    /**
+    * The default value for the allowUnsafeSymbols option is false. This means
+    * that characters that are unsafe for use in HTML content (&, <, >, ", ',
+    * and `) will be encoded. When set to true, only non-ASCII characters will
+    * be encoded. If the encodeEverything option is set to true, this option
+    * will be ignored.
+    */
+    allowUnsafeSymbols?: boolean;
+}
+
+export interface Encode {
+    /**
+    * Encode a string of text
+    *
+    * This function takes a string of text and encodes (by default) any symbols
+    * that aren’t printable ASCII symbols and &, <, >, ", ', and `, replacing
+    * them with character references.
+    *
+    * As long as the input string contains allowed code points only, the return
+    * value of this function is always valid HTML. Any (invalid) code points
+    * that cannot be represented using a character reference in the input are
+    * not encoded.
+    */
+    (text: string, options?: EncodeOptions): string;
+
+    options: EncodeOptions;
+}
+declare var encode: Encode;
+
+export interface DecodeOptions {
+    /**
+     * The default value for the isAttributeValue option is false. This means
+     * that decode() will decode the string as if it were used in a text
+     * context in an HTML document. HTML has different rules for parsing
+     * character references in attribute values — set this option to true to
+     * treat the input string as if it were used as an attribute value.
+     */
+    isAttributeValue?: boolean;
+
+    /**
+     * The default value for the strict option is false. This means that
+     * decode() will decode any HTML text content you feed it, even if it
+     * contains any entities that cause parse errors. To throw an error when
+     * such invalid HTML is encountered, set the strict option to true. This
+     * option makes it possible to use he as part of HTML parsers and HTML
+     * validators.
+     */
+    strict?: boolean;
+}
+
+export interface Decode {
+    /**
+     * Decode a string of HTML text
+     *
+     * This function takes a string of HTML and decodes any named and numerical
+     * character references in it using the algorithm described in section
+     * 12.2.4.69 of the HTML spec.
+     */
+    (html: string, options?: DecodeOptions): string;
+
+    options: DecodeOptions;
+}
+export var decode: Decode;
+
+/**
+ * Escape XML entities
+ *
+ * This function takes a string of text and escapes it for use in text
+ * contexts in XML or HTML documents. Only the following characters are
+ * escaped: &, <, >, ", ', and `.
+ */
+export function escape(text: string): string;
+
+export var unescape: Decode;
diff --git a/he/tsconfig.json b/he/tsconfig.json
new file mode 100644
index 0000000000..fe02ef4b1e
--- /dev/null
+++ b/he/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "he-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/heap/heap-tests.ts b/heap/heap-tests.ts
index 605425893c..b3982e13a2 100644
--- a/heap/heap-tests.ts
+++ b/heap/heap-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="heap.d.ts" />
+import Heap = require("heap");
 
 var numberComparator = (a: number, b: number) => { return a.toString().length - b.toString().length; };
 var stringComparator = (a: string, b: string) => { return a.length - b.length; };
diff --git a/heap/heap.d.ts b/heap/heap.d.ts
deleted file mode 100644
index 3bf17033ad..0000000000
--- a/heap/heap.d.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-// Type definitions for heap 0.2.6
-// Project: https://github.com/qiao/heap.js
-// Definitions by: Ryan McNamara <https://github.com/ryan10132>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare class Heap<T> {
-
-    // Constructor
-
-    constructor(cmp?: (a: T, b: T) => number);
-
-    // Instance Methods
-
-    // Push item onto heap.
-    push(item: T): void;
-    insert(item: T): void;
-
-    // Pop the smallest item off the heap and return it.
-    pop(): T;
-
-    // Return the smallest item of the heap.
-    peek(): T;
-    top(): T;
-    front(): T;
-
-    // Pop and return the current smallest value, and add the new item.
-    // This is more efficient than pop() followed by push(), and can be more appropriate when using a fixed size heap.
-    // Note that the value returned may be larger than item!
-    replace(item: T): T;
-
-    // Fast version of a push followed by a pop.
-    pushpop(item: T): T;
-
-    // Rebuild the heap. This method may come handy when the priority of the internal data is being modified.
-    heapify(): void;
-
-    // Update the position of the given item in the heap. This function should be called every time the item is being modified.
-    updateItem(item: T): void;
-
-    // Determine whether the heap is empty.
-    empty(): boolean;
-
-    // Get the number of elements stored in the heap.
-    size(): number;
-
-    // Return the array representation of the heap. (note: the array is a shallow copy of the heap's internal nodes)
-    toArray(): T[];
-
-    // Return a clone of the heap. (note: the internal data is a shallow copy of the original one)
-    clone(): Heap<T>
-    copy(): Heap<T>
-
-    // Static Methods
-
-    // Push item onto array, maintaining the heap invariant.
-    static push<T>(array: T[], item: T, cmp?: (a: T, b: T) => number): void;
-
-    // Pop the smallest item off the array, maintaining the heap invariant.
-    static pop<T>(array: T[], cmp?: (a: T, b: T) => number): T;
-
-    // Pop and return the current smallest value, and add the new item.
-    // This is more efficient than heappop() followed by heappush(), and can be more appropriate when using a fixed size heap. Note that the value returned may be larger than item!
-    static replace<T>(array: T[], item: T, cmp?: (a: T, b: T) => number): T;
-
-    // Fast version of a heappush followed by a heappop.
-    static pushpop<T>(array: T[], item: T, cmp?: (a: T, b: T) => number): T;
-
-    // Build the heap.
-    static heapify<T>(array: T[], cmp?: (a: T, b: T) => number): Heap<T>;
-
-    // Update the position of the given item in the heap. This function should be called every time the item is being modified.
-    static updateItem<T>(array: T[], item: T, cmp?: (a: T, b: T) => number): void;
-
-    // Find the n largest elements in a dataset.
-    static nlargest<T>(array: T[], n: number, cmp?: (a: T, b: T) => number): T[];
-
-    // Find the n smallest elements in a dataset.
-    static nsmallest<T>(array: T[], n: number, cmp?: (a: T, b: T) => number): T[];
-
-}
-
-declare module 'heap' {
-    export = Heap;
-}
diff --git a/heap/index.d.ts b/heap/index.d.ts
new file mode 100644
index 0000000000..1ad6936334
--- /dev/null
+++ b/heap/index.d.ts
@@ -0,0 +1,83 @@
+// Type definitions for heap 0.2.6
+// Project: https://github.com/qiao/heap.js
+// Definitions by: Ryan McNamara <https://github.com/ryan10132>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class Heap<T> {
+
+    // Constructor
+
+    constructor(cmp?: (a: T, b: T) => number);
+
+    // Instance Methods
+
+    // Push item onto heap.
+    push(item: T): void;
+    insert(item: T): void;
+
+    // Pop the smallest item off the heap and return it.
+    pop(): T;
+
+    // Return the smallest item of the heap.
+    peek(): T;
+    top(): T;
+    front(): T;
+
+    // Pop and return the current smallest value, and add the new item.
+    // This is more efficient than pop() followed by push(), and can be more appropriate when using a fixed size heap.
+    // Note that the value returned may be larger than item!
+    replace(item: T): T;
+
+    // Fast version of a push followed by a pop.
+    pushpop(item: T): T;
+
+    // Rebuild the heap. This method may come handy when the priority of the internal data is being modified.
+    heapify(): void;
+
+    // Update the position of the given item in the heap. This function should be called every time the item is being modified.
+    updateItem(item: T): void;
+
+    // Determine whether the heap is empty.
+    empty(): boolean;
+
+    // Get the number of elements stored in the heap.
+    size(): number;
+
+    // Return the array representation of the heap. (note: the array is a shallow copy of the heap's internal nodes)
+    toArray(): T[];
+
+    // Return a clone of the heap. (note: the internal data is a shallow copy of the original one)
+    clone(): Heap<T>
+    copy(): Heap<T>
+
+    // Static Methods
+
+    // Push item onto array, maintaining the heap invariant.
+    static push<T>(array: T[], item: T, cmp?: (a: T, b: T) => number): void;
+
+    // Pop the smallest item off the array, maintaining the heap invariant.
+    static pop<T>(array: T[], cmp?: (a: T, b: T) => number): T;
+
+    // Pop and return the current smallest value, and add the new item.
+    // This is more efficient than heappop() followed by heappush(), and can be more appropriate when using a fixed size heap. Note that the value returned may be larger than item!
+    static replace<T>(array: T[], item: T, cmp?: (a: T, b: T) => number): T;
+
+    // Fast version of a heappush followed by a heappop.
+    static pushpop<T>(array: T[], item: T, cmp?: (a: T, b: T) => number): T;
+
+    // Build the heap.
+    static heapify<T>(array: T[], cmp?: (a: T, b: T) => number): Heap<T>;
+
+    // Update the position of the given item in the heap. This function should be called every time the item is being modified.
+    static updateItem<T>(array: T[], item: T, cmp?: (a: T, b: T) => number): void;
+
+    // Find the n largest elements in a dataset.
+    static nlargest<T>(array: T[], n: number, cmp?: (a: T, b: T) => number): T[];
+
+    // Find the n smallest elements in a dataset.
+    static nsmallest<T>(array: T[], n: number, cmp?: (a: T, b: T) => number): T[];
+
+}
+
+export = Heap;
+export as namespace Heap;
diff --git a/heap/tsconfig.json b/heap/tsconfig.json
new file mode 100644
index 0000000000..19e384b5fc
--- /dev/null
+++ b/heap/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "heap-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/heatmap.js/heatmap-tests.ts b/heatmap.js/heatmap-tests.ts
index a90eb0aea4..c2f2d34c16 100644
--- a/heatmap.js/heatmap-tests.ts
+++ b/heatmap.js/heatmap-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="heatmap.d.ts" />
+
 
 var baseLayer = L.tileLayer(
     'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
diff --git a/heatmap.js/heatmap.d.ts b/heatmap.js/heatmap.d.ts
deleted file mode 100644
index 3a0bd2ba08..0000000000
--- a/heatmap.js/heatmap.d.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-// Type definitions for heatmap.js v2.0
-// Project: https://github.com/pa7/heatmap.js/
-// Definitions by: Yang Guan <https://github.com/lookuptable>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../leaflet/leaflet.d.ts" />
-
-/*
- * Configuration object of a heatmap
- */
-interface HeatmapConfiguration {
-
-    /*
-     * A background color string in form of hexcode, color name, or rgb(a)
-     */
-    backgroundColor?: string;
-
-    /*
-     * The blur factor that will be applied to all datapoints. The higher the
-     * blur factor is, the smoother the gradients will be
-     * Default value: 0.85
-     */
-    blur?: number;
-
-    /*
-     * An object that represents the gradient
-     */
-    gradient?: any;
-
-    /*
-     * The property name of your latitude coordinate in a datapoint
-     * Default value: 'x'
-     */
-    latField?: string;
-
-    /*
-     * The property name of your longitude coordinate in a datapoint
-     * Default value: 'y'
-     */
-    lngField?: string;
-
-    /*
-     * The maximal opacity the highest value in the heatmap will have. (will be
-     * overridden if opacity set)
-     * Default value: 0.6
-     */
-    maxOpacity?: number;
-
-    /*
-     * The minimum opacity the lowest value in the heatmap will have (will be
-     * overridden if opacity set)
-     */
-    minOpacity?: number;
-
-    /*
-     * A global opacity for the whole heatmap. This overrides maxOpacity and
-     * minOpacity if set
-     */
-    opacity?: number;
-
-    /*
-     * The radius each datapoint will have (if not specified on the datapoint
-     * itself)
-     */
-    radius?: number;
-
-    /**
-     * Scales the radius based on map zoom.
-     */
-    scaleRadius?: boolean;
-
-    /*
-     * Indicate whether the heatmap should use a global extrema or a local
-     * extrema (the maximum and minimum of the currently displayed viewport)
-     */
-    useLocalExtrema?: boolean;
-
-    /*
-     * The property name of the value/weight in a datapoint
-     */
-    valueField: string;
-}
-
-/*
- * A single data point on a heatmap. The keys are specified by
- * HeatmapConfig.latField, HeatmapConfig.lngField and HeatmapConfig.valueField
- */
-interface HeatmapDataPoint {
-    [index: string]: number;
-}
-
-/*
- * An object representing the set of data points on a heatmap
- */
-interface HeatmapData {
-
-    /*
-     * An array of HeatmapDataPoints
-     */
-    data: HeatmapDataPoint[];
-
-    /*
-     * Max value of the valueField
-     */
-    max?: number;
-
-    /*
-     * Min value of the valueField
-     */
-    min?: number;
-}
-
-/*
- * The overlay layer to be added onto leaflet map
- */
-declare class HeatmapOverlay {
-
-    /*
-     * Initialization function
-     */
-    constructor(configuration: HeatmapConfiguration)
-
-    /*
-     * Create DOM elements for an overlay, adding them to map panes and puts
-     * listeners on relevant map events
-     */
-    onAdd(map: L.Map): void;
-
-    /*
-     * Remove the overlay's elements from the DOM and remove listeners
-     * previously added by onAdd()
-     */
-    onRemove(map: L.Map): void;
-
-    /*
-     * Initialize a heatmap instance with the given dataset
-     */
-    setData(data: HeatmapData): void;
-}
diff --git a/heatmap.js/index.d.ts b/heatmap.js/index.d.ts
new file mode 100644
index 0000000000..9b71ae195a
--- /dev/null
+++ b/heatmap.js/index.d.ts
@@ -0,0 +1,139 @@
+// Type definitions for heatmap.js v2.0
+// Project: https://github.com/pa7/heatmap.js/
+// Definitions by: Yang Guan <https://github.com/lookuptable>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="leaflet" />
+
+/*
+ * Configuration object of a heatmap
+ */
+interface HeatmapConfiguration {
+
+    /*
+     * A background color string in form of hexcode, color name, or rgb(a)
+     */
+    backgroundColor?: string;
+
+    /*
+     * The blur factor that will be applied to all datapoints. The higher the
+     * blur factor is, the smoother the gradients will be
+     * Default value: 0.85
+     */
+    blur?: number;
+
+    /*
+     * An object that represents the gradient
+     */
+    gradient?: any;
+
+    /*
+     * The property name of your latitude coordinate in a datapoint
+     * Default value: 'x'
+     */
+    latField?: string;
+
+    /*
+     * The property name of your longitude coordinate in a datapoint
+     * Default value: 'y'
+     */
+    lngField?: string;
+
+    /*
+     * The maximal opacity the highest value in the heatmap will have. (will be
+     * overridden if opacity set)
+     * Default value: 0.6
+     */
+    maxOpacity?: number;
+
+    /*
+     * The minimum opacity the lowest value in the heatmap will have (will be
+     * overridden if opacity set)
+     */
+    minOpacity?: number;
+
+    /*
+     * A global opacity for the whole heatmap. This overrides maxOpacity and
+     * minOpacity if set
+     */
+    opacity?: number;
+
+    /*
+     * The radius each datapoint will have (if not specified on the datapoint
+     * itself)
+     */
+    radius?: number;
+
+    /**
+     * Scales the radius based on map zoom.
+     */
+    scaleRadius?: boolean;
+
+    /*
+     * Indicate whether the heatmap should use a global extrema or a local
+     * extrema (the maximum and minimum of the currently displayed viewport)
+     */
+    useLocalExtrema?: boolean;
+
+    /*
+     * The property name of the value/weight in a datapoint
+     */
+    valueField: string;
+}
+
+/*
+ * A single data point on a heatmap. The keys are specified by
+ * HeatmapConfig.latField, HeatmapConfig.lngField and HeatmapConfig.valueField
+ */
+interface HeatmapDataPoint {
+    [index: string]: number;
+}
+
+/*
+ * An object representing the set of data points on a heatmap
+ */
+interface HeatmapData {
+
+    /*
+     * An array of HeatmapDataPoints
+     */
+    data: HeatmapDataPoint[];
+
+    /*
+     * Max value of the valueField
+     */
+    max?: number;
+
+    /*
+     * Min value of the valueField
+     */
+    min?: number;
+}
+
+/*
+ * The overlay layer to be added onto leaflet map
+ */
+declare class HeatmapOverlay {
+
+    /*
+     * Initialization function
+     */
+    constructor(configuration: HeatmapConfiguration)
+
+    /*
+     * Create DOM elements for an overlay, adding them to map panes and puts
+     * listeners on relevant map events
+     */
+    onAdd(map: L.Map): void;
+
+    /*
+     * Remove the overlay's elements from the DOM and remove listeners
+     * previously added by onAdd()
+     */
+    onRemove(map: L.Map): void;
+
+    /*
+     * Initialize a heatmap instance with the given dataset
+     */
+    setData(data: HeatmapData): void;
+}
diff --git a/heatmap.js/tsconfig.json b/heatmap.js/tsconfig.json
new file mode 100644
index 0000000000..8015f72625
--- /dev/null
+++ b/heatmap.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "heatmap-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/hellojs/hellojs-tests.ts b/hellojs/hellojs-tests.ts
index cdecb287fd..9883c7a529 100644
--- a/hellojs/hellojs-tests.ts
+++ b/hellojs/hellojs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="hellojs.d.ts" />
+
 
 hello.init({
     'facebook': '<app key>',
diff --git a/hellojs/hellojs.d.ts b/hellojs/hellojs.d.ts
deleted file mode 100644
index 6da9f9ca0b..0000000000
--- a/hellojs/hellojs.d.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-// Type definitions for hello.js 0.2.3 
-// Project: http://adodson.com/hello.js/
-// Definitions by: Pavel Zika <https://github.com/PavelPZ>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface HelloJSLoginOptions {
-    redirect_uri?: string;
-    display?: string;
-    scope?: string;
-    response_type?: string;
-    force?: boolean;
-    oauth_proxy?: string;
-    timeout?: number;
-    default_service?: string;
-}
-
-interface HelloJSLogoutOptions {
-    force?: boolean;
-}
-
-interface HelloJSEvent {
-    on(event: string, callback: (auth: HelloJSEventArgument) => void): HelloJSStatic;
-    off(event: string, callback: (auth: HelloJSEventArgument) => void): HelloJSStatic;
-    findEvents(event: string, callback: (name: string, index: number) => void): void;
-    emit(event: string, data: any): HelloJSStatic;
-    emitAfter(): HelloJSStatic;
-    success(callback: (json?: any) => void): HelloJSStatic;
-    error(callback: (json?: any) => void): HelloJSStatic;
-    complete(callback: (json?: any) => void): HelloJSStatic;
-}
-
-
-interface HelloJSEventArgument {
-    network: string;
-    authResponse?: any;
-}
-
-interface HelloJSStatic extends HelloJSEvent {
-    init(serviceAppIds: { [id: string]: string; }, options?: HelloJSLoginOptions): void;
-    login(network: string, options?: HelloJSLoginOptions, callback?: () => void): void;
-    logout(network: string, options?: HelloJSLogoutOptions, callback?: () => void): void;
-    getAuthResponse(network: string): any;
-    service(network: string): HelloJSServiceDef;
-    settings: HelloJSLoginOptions;
-    (network: string): HelloJSStaticNamed;
-    init(servicesDef: { [id: string]: HelloJSServiceDef; }): void;
-}
-
-interface HelloJSStaticNamed {
-    login(option?: HelloJSLoginOptions, callback?: () => void): void;
-    logout(callback?: () => void): void;
-    getAuthResponse(): any;
-    api(path?: string, method?: string, data?: any, callback?: (json?: any) => void): HelloJSStatic;
-}
-
-interface HelloJSOAuthDef {
-    version: number;
-    auth: string;
-    request: string;
-    token: string;
-}
-
-interface HelloJSServiceDef {
-    name: string;
-    oauth: HelloJSOAuthDef;
-    scope?: { [id: string]: string; };
-    scope_delim?: string;
-    autorefresh?: boolean;
-    base?: string;
-    root?: string;
-    get?: { [id: string]: any; };
-    post?: { [id: string]: any; };
-    del?: { [id: string]: string; };
-    put?: { [id: string]: any; };
-    wrap?: { [id: string]: (par: any) => void; };
-    xhr?: (par: any) => void;
-    jsonp?: (par: any) => void;
-    form?: (par: any) => void;
-    api?: (...par: any[]) => void;
-}
-
-declare var hello: HelloJSStatic;
diff --git a/hellojs/index.d.ts b/hellojs/index.d.ts
new file mode 100644
index 0000000000..686d5c1adf
--- /dev/null
+++ b/hellojs/index.d.ts
@@ -0,0 +1,87 @@
+// Type definitions for hello.js 0.2.3 
+// Project: http://adodson.com/hello.js/
+// Definitions by: Pavel Zika <https://github.com/PavelPZ>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface HelloJSLoginOptions {
+    redirect_uri?: string;
+    display?: string;
+    scope?: string;
+    response_type?: string;
+    force?: boolean;
+    oauth_proxy?: string;
+    timeout?: number;
+    default_service?: string;
+}
+
+interface HelloJSLogoutOptions {
+    force?: boolean;
+}
+
+interface HelloJSEvent {
+    on(event: string, callback: (auth: HelloJSEventArgument) => void): HelloJSStatic;
+    off(event: string, callback: (auth: HelloJSEventArgument) => void): HelloJSStatic;
+    findEvents(event: string, callback: (name: string, index: number) => void): void;
+    emit(event: string, data: any): HelloJSStatic;
+    emitAfter(): HelloJSStatic;
+    success(callback: (json?: any) => void): HelloJSStatic;
+    error(callback: (json?: any) => void): HelloJSStatic;
+    complete(callback: (json?: any) => void): HelloJSStatic;
+}
+
+
+interface HelloJSEventArgument {
+    network: string;
+    authResponse?: any;
+}
+
+interface HelloJSStatic extends HelloJSEvent {
+    init(serviceAppIds: { [id: string]: string; }, options?: HelloJSLoginOptions): void;
+    login(network: string, options?: HelloJSLoginOptions, callback?: () => void): void;
+    logout(network: string, options?: HelloJSLogoutOptions, callback?: () => void): void;
+    getAuthResponse(network: string): any;
+    service(network: string): HelloJSServiceDef;
+    settings: HelloJSLoginOptions;
+    (network: string): HelloJSStaticNamed;
+    init(servicesDef: { [id: string]: HelloJSServiceDef; }): void;
+}
+
+interface HelloJSStaticNamed {
+    login(option?: HelloJSLoginOptions, callback?: () => void): void;
+    logout(callback?: () => void): void;
+    getAuthResponse(): any;
+    api(path?: string, method?: string, data?: any, callback?: (json?: any) => void): HelloJSStatic;
+}
+
+interface HelloJSOAuthDef {
+    version: number;
+    auth: string;
+    request: string;
+    token: string;
+}
+
+interface HelloJSServiceDef {
+    name: string;
+    oauth: HelloJSOAuthDef;
+    scope?: { [id: string]: string; };
+    scope_delim?: string;
+    autorefresh?: boolean;
+    base?: string;
+    root?: string;
+    get?: { [id: string]: any; };
+    post?: { [id: string]: any; };
+    del?: { [id: string]: string; };
+    put?: { [id: string]: any; };
+    wrap?: { [id: string]: (par: any) => void; };
+    xhr?: (par: any) => void;
+    jsonp?: (par: any) => void;
+    form?: (par: any) => void;
+    api?: (...par: any[]) => void;
+}
+
+declare var hello: HelloJSStatic;
+
+// Support AMD require
+declare module 'hellojs' {
+  export = hello;
+}
diff --git a/hellojs/tsconfig.json b/hellojs/tsconfig.json
new file mode 100644
index 0000000000..770da56386
--- /dev/null
+++ b/hellojs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "hellojs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/helmet/helmet-tests.ts b/helmet/helmet-tests.ts
index 98ebb77d00..2b5f94e66f 100644
--- a/helmet/helmet-tests.ts
+++ b/helmet/helmet-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="helmet.d.ts" />
 
-import express = require("express")
+
+import express = require("../express")
 import helmet = require("helmet");
 
 var app = express();
@@ -110,8 +110,46 @@ function noSniffTest() {
  */
 function publicKeyPinsTest() {
     app.use(helmet.publicKeyPins({
+        maxAge: 7776000000,
+        sha256s: ["AbCdEf123=", "ZyXwVu456="],
+    }));
+
+    app.use(helmet.publicKeyPins({
+        maxAge: 7776000000,
+        sha256s: ["AbCdEf123=", "ZyXwVu456="],
+        includeSubdomains: false
+    }));
+
+    app.use(helmet.publicKeyPins({
+        maxAge: 7776000000,
+        sha256s: ["AbCdEf123=", "ZyXwVu456="],
+        includeSubdomains: true
+    }));
+
+    app.use(helmet.publicKeyPins({
+        maxAge: 7776000000,
         sha256s: ["AbCdEf123=", "ZyXwVu456="],
-        includeSubdomains: true,
         reportUri: "http://example.com"
     }));
+
+    app.use(helmet.publicKeyPins({
+        maxAge: 7776000000,
+        sha256s: ["AbCdEf123=", "ZyXwVu456="],
+        reportOnly: true
+    }));
+
+    app.use(helmet.publicKeyPins({
+        maxAge: 7776000000,
+        sha256s: ["AbCdEf123=", "ZyXwVu456="],
+        setIf: function (req, res) { return true; }
+    }));
+}
+
+/**
+ * @summary Test for {@see helmet#dnsPrefetchControl} function.
+ */
+function dnsPrefetchControlTest() {
+    app.use(helmet.dnsPrefetchControl());
+    app.use(helmet.dnsPrefetchControl({ allow: false }));
+    app.use(helmet.dnsPrefetchControl({ allow: true }));
 }
diff --git a/helmet/helmet.d.ts b/helmet/helmet.d.ts
deleted file mode 100644
index 5c34378f04..0000000000
--- a/helmet/helmet.d.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-// Type definitions for helmet
-// Project: https://github.com/helmetjs/helmet
-// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "helmet" {
-    import express = require("express");
-    
-    interface IHelmetCspDirectiveFunction {
-      (req: express.Request, res: express.Response): string;
-    }
-    type HelmetCspDirectiveValue = string | IHelmetCspDirectiveFunction;
-
-    interface IHelmetCspDirectives {
-        baseUri? : HelmetCspDirectiveValue[],
-        childSrc? : HelmetCspDirectiveValue[],
-        connectSrc? : HelmetCspDirectiveValue[],
-        defaultSrc? : HelmetCspDirectiveValue[],
-        fontSrc? : HelmetCspDirectiveValue[],
-        formAction? : HelmetCspDirectiveValue[],
-        frameAncestors? : HelmetCspDirectiveValue[],
-        frameSrc? : HelmetCspDirectiveValue[],
-        imgSrc? : HelmetCspDirectiveValue[],
-        mediaSrc? : HelmetCspDirectiveValue[],
-        objectSrc? : HelmetCspDirectiveValue[],
-        pluginTypes? : HelmetCspDirectiveValue[],
-        reportUri?: string,
-        sandbox? : HelmetCspDirectiveValue[],
-        scriptSrc? : HelmetCspDirectiveValue[],
-        styleSrc? : HelmetCspDirectiveValue[]
-    }
-    
-    interface IHelmetCspConfiguration {
-        reportOnly? : boolean;
-        setAllHeaders? : boolean;
-        disableAndroid? : boolean;
-        browserSniff?: boolean;
-        directives? : IHelmetCspDirectives
-    }
-
-    interface IHelmetXssFilterConfiguration {
-        setOnOldIE? : boolean;
-    }
-
-    /**
-     * @summary Interface for helmet class.
-     * @interface
-     */
-    interface Helmet {
-        /**
-         * @summary Constructor.
-         * @return {RequestHandler} The Request handler.
-         */
-        ():express.RequestHandler;
-
-        /**
-         * @summary Prevent clickjacking.
-         * @param {string} header The header.
-         * @return {RequestHandler} The Request handler.
-         */
-        frameguard(header ?: string):express.RequestHandler;
-
-        /**
-         * @summary Hide "X-Powered-By" header.
-         * @param {Object} options The options.
-         * @return {RequestHandler} The Request handler.
-         */
-        hidePoweredBy(options ?: Object):express.RequestHandler;
-
-        /**
-         * @summary Adds the "Strict-Transport-Security" header.
-         * @param {Object} options The options.
-         * @return {RequestHandler} The Request handler.
-         */
-        hsts(options ?: Object):express.RequestHandler;
-
-        /**
-         * @summary Add the "X-Download-Options" header.
-         * @return {RequestHandler} The Request handler.
-         */
-        ieNoOpen():express.RequestHandler;
-
-        /**
-         * @summary Add the "Cache-Control" and "Pragma" headers to stop caching.
-         * @return {RequestHandler} The Request handler.
-         */
-        noCache(options ?: Object):express.RequestHandler;
-
-        /**
-         * @summary Adds the "X-Content-Type-Options" header.
-         * @return {RequestHandler} The Request handler.
-         */
-        noSniff():express.RequestHandler;
-
-        /**
-         * @summary Adds the "Public-Key-Pins" header.
-         * @return {RequestHandler} The Request handler.
-         */
-        publicKeyPins(options ?: Object):express.RequestHandler;
-
-        /**
-         * @summary Mitigate cross-site scripting attacks with the "X-XSS-Protection" header.
-         * @return {RequestHandler} The Request handler.
-         * @param {Object} options The options.
-         */
-        xssFilter(options ?: IHelmetXssFilterConfiguration):express.RequestHandler;
-
-        /**
-         * @summary Set policy around third-party content via headers
-         * @return {RequestHandler} The Request handler
-         * @param {Object} options The options
-         */
-        csp(options ?: IHelmetCspConfiguration): express.RequestHandler;
-
-        /**
-         * @see csp
-         */
-        contentSecurityPolicy(options ?: IHelmetCspConfiguration): express.RequestHandler;
-
-    }
-
-    var helmet: Helmet;
-    export = helmet;
-}
diff --git a/helmet/index.d.ts b/helmet/index.d.ts
new file mode 100644
index 0000000000..baa99a48bb
--- /dev/null
+++ b/helmet/index.d.ts
@@ -0,0 +1,146 @@
+// Type definitions for helmet
+// Project: https://github.com/helmetjs/helmet
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+import express = require("express");
+
+interface IHelmetCspDirectiveFunction {
+  (req: express.Request, res: express.Response): string;
+}
+type HelmetCspDirectiveValue = string | IHelmetCspDirectiveFunction;
+
+interface IHelmetCspDirectives {
+    baseUri? : HelmetCspDirectiveValue[],
+    childSrc? : HelmetCspDirectiveValue[],
+    connectSrc? : HelmetCspDirectiveValue[],
+    defaultSrc? : HelmetCspDirectiveValue[],
+    fontSrc? : HelmetCspDirectiveValue[],
+    formAction? : HelmetCspDirectiveValue[],
+    frameAncestors? : HelmetCspDirectiveValue[],
+    frameSrc? : HelmetCspDirectiveValue[],
+    imgSrc? : HelmetCspDirectiveValue[],
+    mediaSrc? : HelmetCspDirectiveValue[],
+    objectSrc? : HelmetCspDirectiveValue[],
+    pluginTypes? : HelmetCspDirectiveValue[],
+    reportUri?: string,
+    sandbox? : HelmetCspDirectiveValue[],
+    scriptSrc? : HelmetCspDirectiveValue[],
+    styleSrc? : HelmetCspDirectiveValue[]
+}
+
+interface IHelmetCspConfiguration {
+    reportOnly? : boolean;
+    setAllHeaders? : boolean;
+    disableAndroid? : boolean;
+    browserSniff?: boolean;
+    directives? : IHelmetCspDirectives
+}
+
+interface IHelmetPublicKeyPinsSetIfFunction {
+  (req: express.Request, res: express.Response): boolean;
+}
+
+interface IHelmetPublicKeyPinsConfiguration {
+    maxAge : number;
+    sha256s : string[];
+    includeSubdomains? : boolean;
+    reportUri? : string;
+    reportOnly? : boolean;
+    setIf?: IHelmetPublicKeyPinsSetIfFunction
+}
+
+interface IHelmetXssFilterConfiguration {
+    setOnOldIE? : boolean;
+}
+
+interface IHelmetDnsPrefetchControlConfiguration {
+    allow? : boolean;
+}
+
+/**
+ * @summary Interface for helmet class.
+ * @interface
+ */
+interface Helmet {
+    /**
+     * @summary Constructor.
+     * @return {RequestHandler} The Request handler.
+     */
+    ():express.RequestHandler;
+
+    /**
+     * @summary Stop browsers from doing DNS prefetching.
+     */
+    dnsPrefetchControl(options ?: IHelmetDnsPrefetchControlConfiguration):express.RequestHandler;
+
+    /**
+     * @summary Prevent clickjacking.
+     * @param {string} header The header.
+     * @return {RequestHandler} The Request handler.
+     */
+    frameguard(header ?: string):express.RequestHandler;
+
+    /**
+     * @summary Hide "X-Powered-By" header.
+     * @param {Object} options The options.
+     * @return {RequestHandler} The Request handler.
+     */
+    hidePoweredBy(options ?: Object):express.RequestHandler;
+
+    /**
+     * @summary Adds the "Strict-Transport-Security" header.
+     * @param {Object} options The options.
+     * @return {RequestHandler} The Request handler.
+     */
+    hsts(options ?: Object):express.RequestHandler;
+
+    /**
+     * @summary Add the "X-Download-Options" header.
+     * @return {RequestHandler} The Request handler.
+     */
+    ieNoOpen():express.RequestHandler;
+
+    /**
+     * @summary Add the "Cache-Control" and "Pragma" headers to stop caching.
+     * @return {RequestHandler} The Request handler.
+     */
+    noCache(options ?: Object):express.RequestHandler;
+
+    /**
+     * @summary Adds the "X-Content-Type-Options" header.
+     * @return {RequestHandler} The Request handler.
+     */
+    noSniff():express.RequestHandler;
+
+    /**
+     * @summary Adds the "Public-Key-Pins" header.
+     * @return {RequestHandler} The Request handler.
+     */
+    publicKeyPins(options ?: IHelmetPublicKeyPinsConfiguration):express.RequestHandler;
+
+    /**
+     * @summary Mitigate cross-site scripting attacks with the "X-XSS-Protection" header.
+     * @return {RequestHandler} The Request handler.
+     * @param {Object} options The options.
+     */
+    xssFilter(options ?: IHelmetXssFilterConfiguration):express.RequestHandler;
+
+    /**
+     * @summary Set policy around third-party content via headers
+     * @return {RequestHandler} The Request handler
+     * @param {Object} options The options
+     */
+    csp(options ?: IHelmetCspConfiguration): express.RequestHandler;
+
+    /**
+     * @see csp
+     */
+    contentSecurityPolicy(options ?: IHelmetCspConfiguration): express.RequestHandler;
+
+}
+
+declare var helmet: Helmet;
+export = helmet;
+
diff --git a/helmet/tsconfig.json b/helmet/tsconfig.json
new file mode 100644
index 0000000000..536c06971b
--- /dev/null
+++ b/helmet/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "helmet-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/highcharts-ng/highcharts-ng-tests.ts b/highcharts-ng/highcharts-ng-tests.ts
index b781a5fb10..925d398fb5 100644
--- a/highcharts-ng/highcharts-ng-tests.ts
+++ b/highcharts-ng/highcharts-ng-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="highcharts-ng.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
+
+/// <reference types="angularjs" />
 
 var app = angular.module('app', ['highcharts-ng']);
 
diff --git a/highcharts-ng/highcharts-ng.d.ts b/highcharts-ng/highcharts-ng.d.ts
deleted file mode 100644
index e4440ea305..0000000000
--- a/highcharts-ng/highcharts-ng.d.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-// Type definitions for highcharts-ng 0.0.8
-// Project: https://github.com/pablojim/highcharts-ng
-// Definitions by: Scott Hatcher <https://github.com/scatcher>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../highcharts/highcharts.d.ts" />
-
-interface HighChartsNGConfig {
-    options: HighchartsOptions;
-    //The below properties are watched separately for changes.
-
-    //Series object (optional) - a list of series using normal highcharts series options.
-    series?: HighchartsIndividualSeriesOptions[];
-    //Title configuration (optional)
-    title?: {
-        text?: string;
-    };
-    //Boolean to control showng loading status on chart (optional)
-    //Could be a string if you want to show specific loading text.
-    loading?: boolean | string;
-    //Configuration for the xAxis (optional). Currently only one x axis can be dynamically controlled.
-    //properties currentMin and currentMax provied 2-way binding to the chart's maximimum and minimum
-    xAxis?: {
-        currentMin?: number;
-        currentMax?: number;
-        title?: { text?: string }
-    };
-    //Whether to use HighStocks instead of HighCharts (optional). Defaults to false.
-    useHighStocks?: boolean;
-    //size (optional) if left out the chart will default to size of the div or something sensible.
-    size?: {
-        width?: number;
-        height?: number;
-    };
-    //function (optional) - setup some logic for the chart
-    func?: (chart: HighchartsChartObject) => void;
-}
-
-//Instantiated Chart
-interface HighChartsNGChart extends HighChartsNGConfig {
-    //This is a simple way to access all the Highcharts API that is not currently managed by this directive.
-    getHighcharts(): HighchartsChartObject;
-}
diff --git a/highcharts-ng/index.d.ts b/highcharts-ng/index.d.ts
new file mode 100644
index 0000000000..3dab53bcda
--- /dev/null
+++ b/highcharts-ng/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for highcharts-ng 0.0.8
+// Project: https://github.com/pablojim/highcharts-ng
+// Definitions by: Scott Hatcher <https://github.com/scatcher>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="highcharts" />
+
+interface HighChartsNGConfig {
+    options: HighchartsOptions;
+    //The below properties are watched separately for changes.
+
+    //Series object (optional) - a list of series using normal highcharts series options.
+    series?: HighchartsIndividualSeriesOptions[];
+    //Title configuration (optional)
+    title?: {
+        text?: string;
+    };
+    //Boolean to control showng loading status on chart (optional)
+    //Could be a string if you want to show specific loading text.
+    loading?: boolean | string;
+    //Configuration for the xAxis (optional). Currently only one x axis can be dynamically controlled.
+    //properties currentMin and currentMax provied 2-way binding to the chart's maximimum and minimum
+    xAxis?: {
+        currentMin?: number;
+        currentMax?: number;
+        title?: { text?: string }
+    };
+    //Whether to use HighStocks instead of HighCharts (optional). Defaults to false.
+    useHighStocks?: boolean;
+    //size (optional) if left out the chart will default to size of the div or something sensible.
+    size?: {
+        width?: number;
+        height?: number;
+    };
+    //function (optional) - setup some logic for the chart
+    func?: (chart: HighchartsChartObject) => void;
+}
+
+//Instantiated Chart
+interface HighChartsNGChart extends HighChartsNGConfig {
+    //This is a simple way to access all the Highcharts API that is not currently managed by this directive.
+    getHighcharts(): HighchartsChartObject;
+}
diff --git a/highcharts-ng/tsconfig.json b/highcharts-ng/tsconfig.json
new file mode 100644
index 0000000000..9a88c6decd
--- /dev/null
+++ b/highcharts-ng/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "highcharts-ng-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/highcharts/highcharts-tests.ts b/highcharts/highcharts-tests.ts
index ad57f8bc4c..a234f80967 100644
--- a/highcharts/highcharts-tests.ts
+++ b/highcharts/highcharts-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="highcharts.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+
+/// <reference types="jquery" />
 
 function originalTests() {
     Highcharts.setOptions({
diff --git a/highcharts/highstock-tests.ts b/highcharts/highstock-tests.ts
index 5e7013f961..07a98a6e42 100644
--- a/highcharts/highstock-tests.ts
+++ b/highcharts/highstock-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="highstock.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+
+/// <reference types="jquery" />
 
 var someData = [1, 2, 3, 4, 5, 6, 7, 8, 9];
 
diff --git a/highcharts/highstock.d.ts b/highcharts/highstock.d.ts
index c896035fa7..ac4064ddd1 100644
--- a/highcharts/highstock.d.ts
+++ b/highcharts/highstock.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: David Deutsch <http://github.com/DavidKDeutsch>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="highcharts.d.ts" />
+
 
 interface HighstockChartObject extends HighchartsChartObject {
     options: HighstockOptions;
diff --git a/highcharts/highcharts.d.ts b/highcharts/index.d.ts
similarity index 100%
rename from highcharts/highcharts.d.ts
rename to highcharts/index.d.ts
diff --git a/highcharts/tsconfig.json b/highcharts/tsconfig.json
new file mode 100644
index 0000000000..f2f1f493f5
--- /dev/null
+++ b/highcharts/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "highcharts-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/highland/highland-tests.ts b/highland/highland-tests.ts
index c7e213aa17..7c813e1c1e 100644
--- a/highland/highland-tests.ts
+++ b/highland/highland-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="highland.d.ts" />
+
 
 // Note: try to maintain the ordering and separators
 
@@ -137,7 +137,9 @@ fooStream = _<Foo>(readable);
 fooStream = _<Foo>(emitter);
 
 fooStream = _(fooStreamThen);
-fooStream = _(fooArrThen);
+fooStream = _(fooThen);
+
+fooArrStream = _(fooArrThen);
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
diff --git a/highland/highland.d.ts b/highland/highland.d.ts
deleted file mode 100644
index 8becaf2762..0000000000
--- a/highland/highland.d.ts
+++ /dev/null
@@ -1,1019 +0,0 @@
-// Type definitions for Highland 1.14.0
-// Project: http://highlandjs.org/
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-// TODO export the top-level functions
-
-// TODO figure out curry arguments
-// TODO create more overloads for nested data, like streams-of-streams or streams-of-array-of-streams etc
-// TODO use externalised Thenable
-// TODO use externalised Readable/Writable (not node's)
-
-/**
- * Highland: the high-level streams library
- *
- * Highland may be freely distributed under the Apache 2.0 license.
- * http://github.com/caolan/highland
- * Copyright (c) Caolan McMahon
- *
- */
-interface HighlandStatic {
-	/**
-	 * The Stream constructor, accepts an array of values or a generator function
-	 * as an optional argument. This is typically the entry point to the Highland
-	 * APIs, providing a convenient way of chaining calls together.
-	 *
-	 * **Arrays -** Streams created from Arrays will emit each value of the Array
-	 * and then emit a [nil](#nil) value to signal the end of the Stream.
-	 *
-	 * **Generators -** These are functions which provide values for the Stream.
-	 * They are lazy and can be infinite, they can also be asynchronous (for
-	 * example, making a HTTP request). You emit values on the Stream by calling
-	 * `push(err, val)`, much like a standard Node.js callback. You call `next()`
-	 * to signal you've finished processing the current data. If the Stream is
-	 * still being consumed the generator function will then be called again.
-	 *
-	 * You can also redirect a generator Stream by passing a new source Stream
-	 * to read from to next. For example: `next(other_stream)` - then any subsequent
-	 * calls will be made to the new source.
-	 *
-	 * **Node Readable Stream -** Pass in a Node Readable Stream object to wrap
-	 * it with the Highland API. Reading from the resulting Highland Stream will
-	 * begin piping the data from the Node Stream to the Highland Stream.
-	 *
-	 * **EventEmitter / jQuery Elements -** Pass in both an event name and an
-	 * event emitter as the two arguments to the constructor and the first
-	 * argument emitted to the event handler will be written to the new Stream.
-	 *
-	 * **Promise -** Accepts an ES6 / jQuery style promise and returns a
-	 * Highland Stream which will emit a single value (or an error).
-	 *
-	 * @id _(source)
-	 * @section Streams
-	 * @name _(source)
-	 * @param {Array | Function | Readable Stream | Promise} source - (optional) source to take values from from
-	 * @api public
-	 */
-	<R>(): Highland.Stream<R>;
-	<R>(xs: R[]): Highland.Stream<R>;
-	<R>(xs: (push: (err: Error, x?: R) => void, next: () => void) => void): Highland.Stream<R>;
-
-	<R>(xs: Highland.Stream<R>): Highland.Stream<R>;
-	<R>(xs: NodeJS.ReadableStream): Highland.Stream<R>;
-	<R>(xs: NodeJS.EventEmitter): Highland.Stream<R>;
-
-	// moar (promise for everything?)
-	<R>(xs: Highland.Thenable<Highland.Stream<R>>): Highland.Stream<R>;
-	<R>(xs: Highland.Thenable<R[]>): Highland.Stream<R>;
-
-	/**
-	 * The end of stream marker. This is sent along the data channel of a Stream
-	 * to tell consumers that the Stream has ended. See the following map code for
-	 * an example of detecting the end of a Stream:
-	 *
-	 * @id nil
-	 * @section Streams
-	 * @name _.nil
-	 * @api public
-	 */
-	nil: Highland.Nil;
-
-	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-	/**
-	 * Transforms a function with specific arity (all arguments must be
-	 * defined) in a way that it can be called as a chain of functions until
-	 * the arguments list is saturated.
-	 *
-	 * This function is not itself curryable.
-	 *
-	 * @id curry
-	 * @name curry(fn, [*arguments])
-	 * @section Functions
-	 * @param {Function} fn - the function to curry
-	 * @param args.. - any number of arguments to pre-apply to the function
-	 * @returns Function
-	 * @api public
-	 */
-	curry(fn: Function, ...args: any[]): Function;
-
-	/**
-	 * Same as `curry` but with a specific number of arguments. This can be
-	 * useful when functions do not explicitly define all its parameters.
-	 *
-	 * This function is not itself curryable.
-	 *
-	 * @id ncurry
-	 * @name ncurry(n, fn, [args...])
-	 * @section Functions
-	 * @param {Number} n - the number of arguments to wait for before apply fn
-	 * @param {Function} fn - the function to curry
-	 * @param args... - any number of arguments to pre-apply to the function
-	 * @returns Function
-	 * @api public
-	 */
-	ncurry(n: number, fn: Function, ...args: any[]): Function;
-
-	/**
-	 * Partially applies the function (regardless of whether it has had curry
-	 * called on it). This will always postpone execution until at least the next
-	 * call of the partially applied function.
-	 *
-	 * @id partial
-	 * @name partial(fn, args...)
-	 * @section Functions
-	 * @param {Function} fn - function to partial apply
-	 * @param args... - the arguments to apply to the function
-	 * @api public
-	 */
-	partial(f: Function, ...args: any[]): Function;
-
-	/**
-	 * Evaluates the function `fn` with the argument positions swapped. Only
-	 * works with functions that accept two arguments.
-	 *
-	 * @id flip
-	 * @name flip(fn, [x, y])
-	 * @section Functions
-	 * @param {Function} f - function to flip argument application for
-	 * @param x - parameter to apply to the right hand side of f
-	 * @param y - parameter to apply to the left hand side of f
-	 * @api public
-	 */
-	flip(fn: Function, ...args: any[]): Function;
-
-	/**
-	 * Creates a composite function, which is the application of function1 to
-	 * the results of function2. You can pass an arbitrary number of arguments
-	 * and have them composed. This means you can't partially apply the compose
-	 * function itself.
-	 *
-	 * @id compose
-	 * @name compose(fn1, fn2, ...)
-	 * @section Functions
-	 * @api public
-	 */
-	compose(...functions: Function[]): Function;
-
-	/**
-	 * The reversed version of compose. Where arguments are in the order of
-	 * application.
-	 *
-	 * @id seq
-	 * @name seq(fn1, fn2, ...)
-	 * @section Functions
-	 * @api public
-	 */
-	seq(...functions: Function[]): Function;
-
-	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-	/**
-	 * Returns true if `x` is a Highland Stream.
-	 *
-	 * @id isStream
-	 * @section Streams
-	 * @name _.isStream(x)
-	 * @param x - the object to test
-	 * @api public
-	 */
-	isStream(x: any): boolean;
-
-	isStreamError(x: any): boolean;
-
-	isStreamRedirect(x: any): boolean;
-
-	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-	/**
-	 * Returns values from an Object as a Stream. Reads properties
-	 * lazily, so if you don't read from all keys on an object, not
-	 * all properties will be read from (may have an effect where getters
-	 * are used).
-	 *
-	 * @id values
-	 * @section Objects
-	 * @name _.values(obj)
-	 * @param {Object} obj - the object to return values from
-	 * @api public
-	 */
-	values(obj: Object): Highland.Stream<any>;
-
-	/**
-	 * Returns keys from an Object as a Stream.
-	 *
-	 * @id keys
-	 * @section Objects
-	 * @name _.keys(obj)
-	 * @param {Object} obj - the object to return keys from
-	 * @api public
-	 */
-	keys(obj: Object): Highland.Stream<string>;
-
-	/**
-	 * Returns key/value pairs for an Object as a Stream. Reads properties
-	 * lazily, so if you don't read from all keys on an object, not
-	 * all properties will be read from (may have an effect where getters
-	 * are used).
-	 *
-	 * @id pairs
-	 * @section Objects
-	 * @name _.pairs(obj)
-	 * @param {Object} obj - the object to return key/value pairs from
-	 * @api public
-	 */
-	pairs(obj: Object): Highland.Stream<any[]>;
-
-	pairs(obj: any[]): Highland.Stream<any[]>;
-
-	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-	/**
-	 * Extends one object with the properties of another. **Note:** The
-	 * arguments are in the reverse order of other libraries such as
-	 * underscore. This is so it follows the convention of other functions in
-	 * this library and so you can more meaningfully partially apply it.
-	 *
-	 * @id extend
-	 * @section Objects
-	 * @name _.extend(a, b)
-	 * @param {Object} a - the properties to extend b with
-	 * @param {Object} b - the original object to extend
-	 * @api public
-	 */
-	extend(extensions: Object, target: Object): Object;
-
-	extend(target: Object): (extensions: Object) => Object;
-
-	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-	/**
-	 * Returns a property from an object.
-	 *
-	 * @id get
-	 * @section Objects
-	 * @name _.get(prop, obj)
-	 * @param {String} prop - the property to return
-	 * @param {Object} obj - the object to read properties from
-	 * @api public
-	 */
-	get(prop: string, obj: Object): string;
-
-	get(prop: string): (obj: Object) => Object;
-
-	/**
-	 * Updates a property on an object, returning the updated object.
-	 *
-	 * @id set
-	 * @section Objects
-	 * @name _.set(prop, value, obj)
-	 * @param {String} prop - the property to return
-	 * @param value - the value to set the property to
-	 * @param {Object} obj - the object to set properties on
-	 * @api public
-	 */
-	set(prop: string, val: any, obj: Object): Object;
-
-	set(prop: string, val: any): (obj: Object) => Object;
-
-	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-	/**
-	 * Logs values to the console, a simple wrapper around `console.log` that
-	 * it suitable for passing to other functions by reference without having to
-	 * call `bind`.
-	 *
-	 * @id log
-	 * @section Utils
-	 * @name _.log(args..)
-	 * @api public
-	 */
-	log(x: any, ...args: any[]): void;
-
-	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-	/**
-	 * Wraps a node-style async function which accepts a callback, transforming
-	 * it to a function which accepts the same arguments minus the callback and
-	 * returns a Highland Stream instead. Only the first argument to the
-	 * callback (or an error) will be pushed onto the Stream.
-	 *
-	 * @id wrapCallback
-	 * @section Utils
-	 * @name _.wrapCallback(f)
-	 * @param {Function} f - the node-style function to wrap
-	 * @api public
-	 */
-	wrapCallback(f: Function): Function;
-
-	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-	/**
-	 * Add two values. Can be partially applied.
-	 *
-	 * @id add
-	 * @section Operators
-	 * @name _.add(a, b)
-	 * @api public
-	 */
-	add(a: number, b: number): number;
-	add(a: number): (b: number) => number;
-
-	not<R>(a: any): boolean;
-}
-
-declare namespace Highland {
-
-	interface Thenable<R> {
-		then<U>(onFulfilled: (value: R) => Thenable<U>,  onRejected: (error: any) => Thenable<U>): Thenable<U>;
-		then<U>(onFulfilled: (value: R) => Thenable<U>, onRejected?: (error: any) => U): Thenable<U>;
-		then<U>(onFulfilled: (value: R) => U, onRejected: (error: any) => Thenable<U>): Thenable<U>;
-		then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): Thenable<U>;
-	}
-	// hacky unique
-	// TODO do we need this?
-	interface Nil {
-		Highland_NIL: Nil;
-	}
-
-	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-	/**
-	 * Used as an Error marker when writing to a Stream's incoming buffer
-	 */
-	// TODO is this public?
-	class StreamError {
-		constructor(err: Error);
-
-		error: Error;
-	}
-
-	/**
-	 * Used as a Redirect marker when writing to a Stream's incoming buffer
-	 */
-		// TODO is this public?
-	class StreamRedirect<R> {
-		constructor(to: Stream<R>)
-
-		to: Stream<R>;
-	}
-	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-	/**
-	 * Actual Stream constructor wrapped the the main exported function
-	 */
-	interface Stream<R> extends NodeJS.EventEmitter {
-
-		/**
-		 * Pauses the stream. All Highland Streams start in the paused state.
-		 *
-		 * @id pause
-		 * @section Streams
-		 * @name Stream.pause()
-		 * @api public
-		 */
-		pause(): void;
-
-		/**
-		 * Resumes a paused Stream. This will either read from the Stream's incoming
-		 * buffer or request more data from an upstream source.
-		 *
-		 * @id resume
-		 * @section Streams
-		 * @name Stream.resume()
-		 * @api public
-		 */
-		resume(): void;
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		/**
-		 * Ends a Stream. This is the same as sending a [nil](#nil) value as data.
-		 * You shouldn't need to call this directly, rather it will be called by
-		 * any [Node Readable Streams](http://nodejs.org/api/stream.html#stream_class_stream_readable)
-		 * you pipe in.
-		 *
-		 * @id end
-		 * @section Streams
-		 * @name Stream.end()
-		 * @api public
-		 */
-		end(): void;
-
-		/**
-		 * Pipes a Highland Stream to a [Node Writable Stream](http://nodejs.org/api/stream.html#stream_class_stream_writable)
-		 * (Highland Streams are also Node Writable Streams). This will pull all the
-		 * data from the source Highland Stream and write it to the destination,
-		 * automatically managing flow so that the destination is not overwhelmed
-		 * by a fast source.
-		 *
-		 * This function returns the destination so you can chain together pipe calls.
-		 *
-		 * @id pipe
-		 * @section Streams
-		 * @name Stream.pipe(dest)
-		 * @param {Writable Stream} dest - the destination to write all data to
-		 * @api public
-		 */
-		pipe<U>(dest: Stream<U>): Stream<U>;
-		pipe<U>(dest: NodeJS.ReadWriteStream): Stream<U>;
-		pipe(dest: NodeJS.WritableStream): void;
-
-		/**
-		 * Destroys a stream by unlinking it from any consumers and sources. This will
-		 * stop all consumers from receiving events from this stream and removes this
-		 * stream as a consumer of any source stream.
-		 *
-		 * This function calls end() on the stream and unlinks it from any piped-to streams.
-		 *
-		 * @id pipe
-		 * @section Streams
-		 * @name Stream.destroy()
-		 * @api public
-		 */
-		destroy(): void;
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		/**
-		 * Consumes values from a Stream (once resumed) and returns a new Stream for
-		 * you to optionally push values onto using the provided push / next functions.
-		 *
-		 * This function forms the basis of many higher-level Stream operations.
-		 * It will not cause a paused stream to immediately resume, but behaves more
-		 * like a 'through' stream, handling values as they are read.
-		 *
-		 * @id consume
-		 * @section Streams
-		 * @name Stream.consume(f)
-		 * @param {Function} f - the function to handle errors and values
-		 * @api public
-		 */
-		consume<U>(f: (err: Error, x: R, push: (err: Error, value?: U) => void, next: () => void) => void): Stream<U>;
-
-		/**
-		 * Consumes a single item from the Stream. Unlike consume, this function will
-		 * not provide a new stream for you to push values onto, and it will unsubscribe
-		 * as soon as it has a single error, value or nil from the source.
-		 *
-		 * You probably won't need to use this directly, but it is used internally by
-		 * some functions in the Highland library.
-		 *
-		 * @id pull
-		 * @section Streams
-		 * @name Stream.pull(f)
-		 * @param {Function} f - the function to handle data
-		 * @api public
-		 */
-		pull(f: (err: Error, x: R) => void): void;
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		/**
-		 * Writes a value to the Stream. If the Stream is paused it will go into the
-		 * Stream's incoming buffer, otherwise it will be immediately processed and
-		 * sent to the Stream's consumers (if any). Returns false if the Stream is
-		 * paused, true otherwise. This lets Node's pipe method handle back-pressure.
-		 *
-		 * You shouldn't need to call this yourself, but it may be called by Node
-		 * functions which treat Highland Streams as a [Node Writable Stream](http://nodejs.org/api/stream.html#stream_class_stream_writable).
-		 *
-		 * @id write
-		 * @section Streams
-		 * @name Stream.write(x)
-		 * @param x - the value to write to the Stream
-		 * @api public
-		 */
-		write(x: R): boolean;
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		/**
-		 * Forks a stream, allowing you to add additional consumers with shared
-		 * back-pressure. A stream forked to multiple consumers will only pull values
-		 * from it's source as fast as the slowest consumer can handle them.
-		 *
-		 * @id fork
-		 * @section Streams
-		 * @name Stream.fork()
-		 * @api public
-		 */
-		fork(): Stream<R>;
-
-		/**
-		 * Observes a stream, allowing you to handle values as they are emitted, without
-		 * adding back-pressure or causing data to be pulled from the source. This can
-		 * be useful when you are performing two related queries on a stream where one
-		 * would block the other. Just be aware that a slow observer could fill up it's
-		 * buffer and cause memory issues. Where possible, you should use [fork](#fork).
-		 *
-		 * @id observe
-		 * @section Streams
-		 * @name Stream.observe()
-		 * @api public
-		 */
-		observe(): Stream<R>;
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		/**
-		 * Extracts errors from a Stream and applies them to an error handler
-		 * function. Returns a new Stream with the errors removed (unless the error
-		 * handler chooses to rethrow them using `push`). Errors can also be
-		 * transformed and put back onto the Stream as values.
-		 *
-		 * @id errors
-		 * @section Streams
-		 * @name Stream.errors(f)
-		 * @param {Function} f - the function to pass all errors to
-		 * @api public
-		 */
-		errors(f: (err: Error, push: (err: Error, x?: R) => void) => void): Stream<R>;
-
-		/**
-		 * Like the [errors](#errors) method, but emits a Stream end marker after
-		 * an Error is encountered.
-		 *
-		 * @id stopOnError
-		 * @section Streams
-		 * @name Stream.stopOnError(f)
-		 * @param {Function} f - the function to handle an error
-		 * @api public
-		 */
-		stopOnError(f: (err: Error) => void): Stream<R>;
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		/**
-		 * Iterates over every value from the Stream, calling the iterator function
-		 * on each of them. This function causes a **thunk**.
-		 *
-		 * If an error from the Stream reaches the `each` call, it will emit an
-		 * error event (which will cause it to throw if unhandled).
-		 *
-		 * @id each
-		 * @section Streams
-		 * @name Stream.each(f)
-		 * @param {Function} f - the iterator function
-		 * @api public
-		 */
-		each(f: (x: R) => void): void;
-
-		/**
-		 * Applies results from a Stream as arguments to a function
-		 *
-		 * @id apply
-		 * @section Streams
-		 * @name Stream.apply(f)
-		 * @param {Function} f - the function to apply arguments to
-		 * @api public
-		 */
-		// TODO what to do here?
-		apply(f: Function): void;
-
-		/**
-		 * Collects all values from a Stream into an Array and calls a function with
-		 * once with the result. This function causes a **thunk**.
-		 *
-		 * If an error from the Stream reaches the `toArray` call, it will emit an
-		 * error event (which will cause it to throw if unhandled).
-		 *
-		 * @id toArray
-		 * @section Streams
-		 * @name Stream.toArray(f)
-		 * @param {Function} f - the callback to provide the completed Array to
-		 * @api public
-		 */
-		toArray(f: (arr: R[]) => void): void;
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		/**
-		 * Creates a new Stream of transformed values by applying a function to each
-		 * value from the source. The transformation function can be replaced with
-		 * a non-function value for convenience, and it will emit that value
-		 * for every data event on the source Stream.
-		 *
-		 * @id map
-		 * @section Streams
-		 * @name Stream.map(f)
-		 * @param f - the transformation function or value to map to
-		 * @api public
-		 */
-		map<U>(f: (x: R) => U): Stream<U>;
-
-		/**
-		 * Creates a new Stream of values by applying each item in a Stream to an
-		 * iterator function which may return a Stream. Each item on these result
-		 * Streams are then emitted on a single output Stream.
-		 *
-		 * The same as calling `stream.map(f).flatten()`.
-		 *
-		 * @id flatMap
-		 * @section Streams
-		 * @name Stream.flatMap(f)
-		 * @param {Function} f - the iterator function
-		 * @api public
-		 */
-		flatMap<U>(f: (x: R) => Stream<U>): Stream<U>;
-		flatMap<U>(f: (x: R) => U): Stream<U>;
-
-		/**
-		 * Retrieves values associated with a given property from all elements in
-		 * the collection.
-		 *
-		 * @id pluck
-		 * @section Streams
-		 * @name Stream.pluck(property)
-		 * @param {String} prop - the property to which values should be associated
-		 * @api public
-		 */
-		pluck<U>(prop: string): Stream<U>;
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		/**
-		 * Creates a new Stream including only the values which pass a truth test.
-		 *
-		 * @id filter
-		 * @section Streams
-		 * @name Stream.filter(f)
-		 * @param f - the truth test function
-		 * @api public
-		 */
-		filter(f: (x: R) => boolean): Stream<R>;
-
-		/**
-		 * Filters using a predicate which returns a Stream. If you need to check
-		 * against an asynchronous data source when filtering a Stream, this can
-		 * be convenient. The Stream returned from the filter function should have
-		 * a Boolean as it's first value (all other values on the Stream will be
-		 * disregarded).
-		 *
-		 * @id flatFilter
-		 * @section Streams
-		 * @name Stream.flatFilter(f)
-		 * @param {Function} f - the truth test function which returns a Stream
-		 * @api public
-		 */
-		flatFilter(f: (x: R) => Stream<boolean>): Stream<R>;
-
-		/**
-		 * The inverse of [filter](#filter).
-		 *
-		 * @id reject
-		 * @section Streams
-		 * @name Stream.reject(f)
-		 * @param {Function} f - the truth test function
-		 * @api public
-		 *
-		 * var odds = _([1, 2, 3, 4]).reject(function (x) {
-		 *     return x % 2 === 0;
-		 * });
-		 */
-		reject(f: (x: R) => boolean): Stream<R>;
-
-		/**
-		 * A convenient form of filter, which returns the first object from a
-		 * Stream that passes the provided truth test
-		 *
-		 * @id find
-		 * @section Streams
-		 * @name Stream.find(f)
-		 * @param {Function} f - the truth test function which returns a Stream
-		 * @api public
-		 */
-		find(f: (x: R) => boolean): Stream<R>;
-
-		/**
-		 * A convenient form of reduce, which groups items based on a function or property name
-		 *
-		 * @id group
-		 * @section Streams
-		 * @name Stream.group(f)
-		 * @param {Function|String} f - the function or property name on which to group,
-		 *                              toString() is called on the result of a function.
-		 * @api public
-		 */
-		// TODO verify this
-		group(f: (x: R) => string): Stream<{[prop:string]:R[]}>;
-		group(prop: string): Stream<{[prop:string]:R[]}>;
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		/**
-		 * Filters a Stream to drop all non-truthy values.
-		 *
-		 * @id compact
-		 * @section Streams
-		 * @name Stream.compact()
-		 * @api public
-		 */
-		compact(): Stream<R>;
-
-		/**
-		 * A convenient form of filter, which returns all objects from a Stream
-		 * match a set of property values.
-		 *
-		 * @id where
-		 * @section Streams
-		 * @name Stream.where(props)
-		 * @param {Object} props - the properties to match against
-		 * @api public
-		 */
-		where(props: Object): Stream<R>;
-
-		/**
-		 * Takes two Streams and returns a Stream of corresponding pairs.
-		 *
-		 * @id zip
-		 * @section Streams
-		 * @name Stream.zip(ys)
-		 * @param {Array | Stream} ys - the other stream to combine values with
-		 * @api public
-		 */
-		zip(ys: R[]): Stream<R>;
-		zip(ys: Stream<R>): Stream<R>;
-
-		/**
-		 * Creates a new Stream with the first `n` values from the source.
-		 *
-		 * @id take
-		 * @section Streams
-		 * @name Stream.take(n)
-		 * @param {Number} n - integer representing number of values to read from source
-		 * @api public
-		 */
-		take(n: number): Stream<R>;
-
-		/**
-		 * Creates a new Stream with only the first value from the source.
-		 *
-		 * @id head
-		 * @section Streams
-		 * @name Stream.head()
-		 * @api public
-		 *
-		 * _([1, 2, 3, 4]).head() // => 1
-		 */
-		head(): Stream<R>;
-
-		/**
-		 * Drops all values from the Stream apart from the last one (if any).
-		 *
-		 * @id last
-		 * @section Streams
-		 * @name Stream.last()
-		 * @api public
-		 */
-		last(): Stream<R>;
-
-		/**
-		 * Reads values from a Stream of Streams, emitting them on a Single output
-		 * Stream. This can be thought of as a flatten, just one level deep. Often
-		 * used for resolving asynchronous actions such as a HTTP request or reading
-		 * a file.
-		 *
-		 * @id sequence
-		 * @section Streams
-		 * @name Stream.sequence()
-		 * @api public
-		 */
-		//TODO figure out typing
-		sequence<U>(): Stream<U>;
-
-		/**
-		 * An alias for the [sequence](#sequence) method.
-		 *
-		 * @id series
-		 * @section Streams
-		 * @name Stream.series()
-		 * @api public
-		 */
-		// TODO figure out typing
-		series<U>(): Stream<U>;
-
-		/**
-		 * Recursively reads values from a Stream which may contain nested Streams
-		 * or Arrays. As values or errors are encountered, they are emitted on a
-		 * single output Stream.
-		 *
-		 * @id flatten
-		 * @section Streams
-		 * @name Stream.flatten()
-		 * @api public
-		 */
-		flatten<U>(): Stream<U>;
-		flatten(): Stream<R>;
-
-		/**
-		 * Takes a Stream of Streams and reads from them in parallel, buffering
-		 * the results until they can be returned to the consumer in their original
-		 * order.
-		 *
-		 * @id parallel
-		 * @section Streams
-		 * @name Stream.parallel(n)
-		 * @param {Number} n - the maximum number of concurrent reads/buffers
-		 * @api public
-		 */
-		parallel(n: number): Stream<R>;
-
-		/**
-		 * Switches source to an alternate Stream if the current Stream is empty.
-		 *
-		 * @id otherwise
-		 * @section Streams
-		 * @name Stream.otherwise(ys)
-		 * @param {Stream} ys - alternate stream to use if this stream is empty
-		 * @api public
-		 */
-		otherwise(ys: Stream<R>): Stream<R>;
-
-		/**
-		 * Adds a value to the end of a Stream.
-		 *
-		 * @id append
-		 * @section Streams
-		 * @name Stream.append(y)
-		 * @param y - the value to append to the Stream
-		 * @api public
-		 */
-		append(y: R): Stream<R>;
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		/**
-		 * Boils down a Stream to a single value. The memo is the initial state
-		 * of the reduction, and each successive step of it should be returned by
-		 * the iterator function. The iterator is passed two arguments:
-		 * the memo and the next value.
-		 *
-		 * @id reduce
-		 * @section Streams
-		 * @name Stream.reduce(memo, iterator)
-		 * @param memo - the initial state of the reduction
-		 * @param {Function} iterator - the function which reduces the values
-		 * @api public
-		 */
-		// TODO: convert this to this.scan(z, f).last()
-		reduce<U>(memo: U, f: (memo: U, x: R) => U): Stream<U>;
-
-		/**
-		 * Same as [reduce](#reduce), but uses the first element as the initial
-		 * state instead of passing in a `memo` value.
-		 *
-		 * @id reduce1
-		 * @section Streams
-		 * @name Stream.reduce1(iterator)
-		 * @param {Function} iterator - the function which reduces the values
-		 * @api public
-		 */
-		reduce1<U>(memo: U, f: (memo: U, x: R) => U): Stream<U>;
-
-		/**
-		 * Groups all values into an Array and passes down the stream as a single
-		 * data event. This is a bit like doing [toArray](#toArray), but instead
-		 * of accepting a callback and causing a *thunk*, it passes the value on.
-		 *
-		 * @id collect
-		 * @section Streams
-		 * @name Stream.collect()
-		 * @api public
-		 */
-		collect(): Stream<R[]>;
-
-		/**
-		 * Like [reduce](#reduce), but emits each intermediate value of the
-		 * reduction as it is calculated.
-		 *
-		 * @id scan
-		 * @section Streams
-		 * @name Stream.scan(memo, iterator)
-		 * @param memo - the initial state of the reduction
-		 * @param {Function} iterator - the function which reduces the values
-		 * @api public
-		 */
-		scan<U>(memo: U, x: (memo: U, x: R) => U): Stream<U>;
-
-		/**
-		 * Same as [scan](#scan), but uses the first element as the initial
-		 * state instead of passing in a `memo` value.
-		 *
-		 * @id scan1
-		 * @section Streams
-		 * @name Stream.scan1(iterator)
-		 * @param {Function} iterator - the function which reduces the values
-		 * @api public
-		 *
-		 * _([1, 2, 3, 4]).scan1(add) // => 1, 3, 6, 10
-		 */
-		scan1<U>(memo: U, x: (memo: U, x: R) => U): Stream<U>;
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		/**
-		 * Concatenates a Stream to the end of this Stream.
-		 *
-		 * Be aware that in the top-level export, the args may be in the reverse
-		 * order to what you'd expect `_([a], [b]) => [b, a]`, as this follows the
-		 * convention of other top-level exported functions which do `x` to `y`.
-		 *
-		 * @id concat
-		 * @section Streams
-		 * @name Stream.concat(ys)
-		 * @params {Stream | Array} ys - the values to concatenate onto this Stream
-		 * @api public
-		 */
-		concat(ys: Stream<R>): Stream<R>;
-		concat(ys: R[]): Stream<R>;
-
-		/**
-		 * Takes a Stream of Streams and merges their values and errors into a
-		 * single new Stream. The merged stream ends when all source streams have
-		 * ended.
-		 *
-		 * Note that no guarantee is made with respect to the order in which
-		 * values for each stream end up in the merged stream. Values in the
-		 * merged stream will, however, respect the order they were emitted from
-		 * their respective streams.
-		 *
-		 * @id merge
-		 * @section Streams
-		 * @name Stream.merge()
-		 * @api public
-		 *
-		 * var txt = _(['foo.txt', 'bar.txt']).map(readFile)
-		 * var md = _(['baz.md']).map(readFile)
-		 *
-		 * _([txt, md]).merge();
-		 * // => contents of foo.txt, bar.txt and baz.txt in the order they were read
-		 */
-		merge (ys: Stream<Stream<R>>): Stream<R>;
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		/**
-		 * Calls a named method on each object from the Stream - returning
-		 * a new stream with the result of those calls.
-		 *
-		 * @id invoke
-		 * @section Streams
-		 * @name Stream.invoke(method, args)
-		 * @param {String} method - the method name to call
-		 * @param {Array} args - the arguments to call the method with
-		 * @api public
-		 */
-		invoke<U>(method: string, args: any[]): Stream<U>;
-
-		/**
-		 * Ensures that only one data event is push downstream (or into the buffer)
-		 * every `ms` milliseconds, any other values are dropped.
-		 *
-		 * @id throttle
-		 * @section Streams
-		 * @name Stream.throttle(ms)
-		 * @param {Number} ms - the minimum milliseconds between each value
-		 * @api public
-		 */
-		throttle(ms: number): Stream<R>;
-
-		/**
-		 * Holds off pushing data events downstream until there has been no more
-		 * data for `ms` milliseconds. Sends the last value that occurred before
-		 * the delay, discarding all other values.
-		 *
-		 * @id debounce
-		 * @section Streams
-		 * @name Stream.debounce(ms)
-		 * @param {Number} ms - the milliseconds to wait before sending data
-		 * @api public
-		 */
-		debounce(ms: number): Stream<R>;
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		/**
-		 * Creates a new Stream, which when read from, only returns the last
-		 * seen value from the source. The source stream does not experience
-		 * back-pressure. Useful if you're using a Stream to model a changing
-		 * property which you need to query periodically.
-		 *
-		 * @id latest
-		 * @section Streams
-		 * @name Stream.latest()
-		 * @api public
-		 */
-		latest(): Stream<R>;
-	}
-}
-
-declare var highland:HighlandStatic;
-
-declare module 'highland' {
-	export = highland;
-}
-
diff --git a/highland/index.d.ts b/highland/index.d.ts
new file mode 100644
index 0000000000..b10f8e00bf
--- /dev/null
+++ b/highland/index.d.ts
@@ -0,0 +1,1019 @@
+// Type definitions for Highland 1.14.0
+// Project: http://highlandjs.org/
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+// TODO export the top-level functions
+
+// TODO figure out curry arguments
+// TODO create more overloads for nested data, like streams-of-streams or streams-of-array-of-streams etc
+// TODO use externalised Thenable
+// TODO use externalised Readable/Writable (not node's)
+
+/**
+ * Highland: the high-level streams library
+ *
+ * Highland may be freely distributed under the Apache 2.0 license.
+ * http://github.com/caolan/highland
+ * Copyright (c) Caolan McMahon
+ *
+ */
+interface HighlandStatic {
+	/**
+	 * The Stream constructor, accepts an array of values or a generator function
+	 * as an optional argument. This is typically the entry point to the Highland
+	 * APIs, providing a convenient way of chaining calls together.
+	 *
+	 * **Arrays -** Streams created from Arrays will emit each value of the Array
+	 * and then emit a [nil](#nil) value to signal the end of the Stream.
+	 *
+	 * **Generators -** These are functions which provide values for the Stream.
+	 * They are lazy and can be infinite, they can also be asynchronous (for
+	 * example, making a HTTP request). You emit values on the Stream by calling
+	 * `push(err, val)`, much like a standard Node.js callback. You call `next()`
+	 * to signal you've finished processing the current data. If the Stream is
+	 * still being consumed the generator function will then be called again.
+	 *
+	 * You can also redirect a generator Stream by passing a new source Stream
+	 * to read from to next. For example: `next(other_stream)` - then any subsequent
+	 * calls will be made to the new source.
+	 *
+	 * **Node Readable Stream -** Pass in a Node Readable Stream object to wrap
+	 * it with the Highland API. Reading from the resulting Highland Stream will
+	 * begin piping the data from the Node Stream to the Highland Stream.
+	 *
+	 * **EventEmitter / jQuery Elements -** Pass in both an event name and an
+	 * event emitter as the two arguments to the constructor and the first
+	 * argument emitted to the event handler will be written to the new Stream.
+	 *
+	 * **Promise -** Accepts an ES6 / jQuery style promise and returns a
+	 * Highland Stream which will emit a single value (or an error).
+	 *
+	 * @id _(source)
+	 * @section Streams
+	 * @name _(source)
+	 * @param {Array | Function | Readable Stream | Promise} source - (optional) source to take values from from
+	 * @api public
+	 */
+	<R>(): Highland.Stream<R>;
+	<R>(xs: R[]): Highland.Stream<R>;
+	<R>(xs: (push: (err: Error, x?: R) => void, next: () => void) => void): Highland.Stream<R>;
+
+	<R>(xs: Highland.Stream<R>): Highland.Stream<R>;
+	<R>(xs: NodeJS.ReadableStream): Highland.Stream<R>;
+	<R>(xs: NodeJS.EventEmitter): Highland.Stream<R>;
+
+	// moar (promise for everything?)
+	<R>(xs: Highland.Thenable<Highland.Stream<R>>): Highland.Stream<R>;
+	<R>(xs: Highland.Thenable<R>): Highland.Stream<R>;
+
+	/**
+	 * The end of stream marker. This is sent along the data channel of a Stream
+	 * to tell consumers that the Stream has ended. See the following map code for
+	 * an example of detecting the end of a Stream:
+	 *
+	 * @id nil
+	 * @section Streams
+	 * @name _.nil
+	 * @api public
+	 */
+	nil: Highland.Nil;
+
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+	/**
+	 * Transforms a function with specific arity (all arguments must be
+	 * defined) in a way that it can be called as a chain of functions until
+	 * the arguments list is saturated.
+	 *
+	 * This function is not itself curryable.
+	 *
+	 * @id curry
+	 * @name curry(fn, [*arguments])
+	 * @section Functions
+	 * @param {Function} fn - the function to curry
+	 * @param args.. - any number of arguments to pre-apply to the function
+	 * @returns Function
+	 * @api public
+	 */
+	curry(fn: Function, ...args: any[]): Function;
+
+	/**
+	 * Same as `curry` but with a specific number of arguments. This can be
+	 * useful when functions do not explicitly define all its parameters.
+	 *
+	 * This function is not itself curryable.
+	 *
+	 * @id ncurry
+	 * @name ncurry(n, fn, [args...])
+	 * @section Functions
+	 * @param {Number} n - the number of arguments to wait for before apply fn
+	 * @param {Function} fn - the function to curry
+	 * @param args... - any number of arguments to pre-apply to the function
+	 * @returns Function
+	 * @api public
+	 */
+	ncurry(n: number, fn: Function, ...args: any[]): Function;
+
+	/**
+	 * Partially applies the function (regardless of whether it has had curry
+	 * called on it). This will always postpone execution until at least the next
+	 * call of the partially applied function.
+	 *
+	 * @id partial
+	 * @name partial(fn, args...)
+	 * @section Functions
+	 * @param {Function} fn - function to partial apply
+	 * @param args... - the arguments to apply to the function
+	 * @api public
+	 */
+	partial(f: Function, ...args: any[]): Function;
+
+	/**
+	 * Evaluates the function `fn` with the argument positions swapped. Only
+	 * works with functions that accept two arguments.
+	 *
+	 * @id flip
+	 * @name flip(fn, [x, y])
+	 * @section Functions
+	 * @param {Function} f - function to flip argument application for
+	 * @param x - parameter to apply to the right hand side of f
+	 * @param y - parameter to apply to the left hand side of f
+	 * @api public
+	 */
+	flip(fn: Function, ...args: any[]): Function;
+
+	/**
+	 * Creates a composite function, which is the application of function1 to
+	 * the results of function2. You can pass an arbitrary number of arguments
+	 * and have them composed. This means you can't partially apply the compose
+	 * function itself.
+	 *
+	 * @id compose
+	 * @name compose(fn1, fn2, ...)
+	 * @section Functions
+	 * @api public
+	 */
+	compose(...functions: Function[]): Function;
+
+	/**
+	 * The reversed version of compose. Where arguments are in the order of
+	 * application.
+	 *
+	 * @id seq
+	 * @name seq(fn1, fn2, ...)
+	 * @section Functions
+	 * @api public
+	 */
+	seq(...functions: Function[]): Function;
+
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+	/**
+	 * Returns true if `x` is a Highland Stream.
+	 *
+	 * @id isStream
+	 * @section Streams
+	 * @name _.isStream(x)
+	 * @param x - the object to test
+	 * @api public
+	 */
+	isStream(x: any): boolean;
+
+	isStreamError(x: any): boolean;
+
+	isStreamRedirect(x: any): boolean;
+
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+	/**
+	 * Returns values from an Object as a Stream. Reads properties
+	 * lazily, so if you don't read from all keys on an object, not
+	 * all properties will be read from (may have an effect where getters
+	 * are used).
+	 *
+	 * @id values
+	 * @section Objects
+	 * @name _.values(obj)
+	 * @param {Object} obj - the object to return values from
+	 * @api public
+	 */
+	values(obj: Object): Highland.Stream<any>;
+
+	/**
+	 * Returns keys from an Object as a Stream.
+	 *
+	 * @id keys
+	 * @section Objects
+	 * @name _.keys(obj)
+	 * @param {Object} obj - the object to return keys from
+	 * @api public
+	 */
+	keys(obj: Object): Highland.Stream<string>;
+
+	/**
+	 * Returns key/value pairs for an Object as a Stream. Reads properties
+	 * lazily, so if you don't read from all keys on an object, not
+	 * all properties will be read from (may have an effect where getters
+	 * are used).
+	 *
+	 * @id pairs
+	 * @section Objects
+	 * @name _.pairs(obj)
+	 * @param {Object} obj - the object to return key/value pairs from
+	 * @api public
+	 */
+	pairs(obj: Object): Highland.Stream<any[]>;
+
+	pairs(obj: any[]): Highland.Stream<any[]>;
+
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+	/**
+	 * Extends one object with the properties of another. **Note:** The
+	 * arguments are in the reverse order of other libraries such as
+	 * underscore. This is so it follows the convention of other functions in
+	 * this library and so you can more meaningfully partially apply it.
+	 *
+	 * @id extend
+	 * @section Objects
+	 * @name _.extend(a, b)
+	 * @param {Object} a - the properties to extend b with
+	 * @param {Object} b - the original object to extend
+	 * @api public
+	 */
+	extend(extensions: Object, target: Object): Object;
+
+	extend(target: Object): (extensions: Object) => Object;
+
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+	/**
+	 * Returns a property from an object.
+	 *
+	 * @id get
+	 * @section Objects
+	 * @name _.get(prop, obj)
+	 * @param {String} prop - the property to return
+	 * @param {Object} obj - the object to read properties from
+	 * @api public
+	 */
+	get(prop: string, obj: Object): string;
+
+	get(prop: string): (obj: Object) => Object;
+
+	/**
+	 * Updates a property on an object, returning the updated object.
+	 *
+	 * @id set
+	 * @section Objects
+	 * @name _.set(prop, value, obj)
+	 * @param {String} prop - the property to return
+	 * @param value - the value to set the property to
+	 * @param {Object} obj - the object to set properties on
+	 * @api public
+	 */
+	set(prop: string, val: any, obj: Object): Object;
+
+	set(prop: string, val: any): (obj: Object) => Object;
+
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+	/**
+	 * Logs values to the console, a simple wrapper around `console.log` that
+	 * it suitable for passing to other functions by reference without having to
+	 * call `bind`.
+	 *
+	 * @id log
+	 * @section Utils
+	 * @name _.log(args..)
+	 * @api public
+	 */
+	log(x: any, ...args: any[]): void;
+
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+	/**
+	 * Wraps a node-style async function which accepts a callback, transforming
+	 * it to a function which accepts the same arguments minus the callback and
+	 * returns a Highland Stream instead. Only the first argument to the
+	 * callback (or an error) will be pushed onto the Stream.
+	 *
+	 * @id wrapCallback
+	 * @section Utils
+	 * @name _.wrapCallback(f)
+	 * @param {Function} f - the node-style function to wrap
+	 * @api public
+	 */
+	wrapCallback(f: Function): Function;
+
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+	/**
+	 * Add two values. Can be partially applied.
+	 *
+	 * @id add
+	 * @section Operators
+	 * @name _.add(a, b)
+	 * @api public
+	 */
+	add(a: number, b: number): number;
+	add(a: number): (b: number) => number;
+
+	not<R>(a: any): boolean;
+}
+
+declare namespace Highland {
+
+	interface Thenable<R> {
+		then<U>(onFulfilled: (value: R) => Thenable<U>,  onRejected: (error: any) => Thenable<U>): Thenable<U>;
+		then<U>(onFulfilled: (value: R) => Thenable<U>, onRejected?: (error: any) => U): Thenable<U>;
+		then<U>(onFulfilled: (value: R) => U, onRejected: (error: any) => Thenable<U>): Thenable<U>;
+		then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): Thenable<U>;
+	}
+	// hacky unique
+	// TODO do we need this?
+	interface Nil {
+		Highland_NIL: Nil;
+	}
+
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+	/**
+	 * Used as an Error marker when writing to a Stream's incoming buffer
+	 */
+	// TODO is this public?
+	class StreamError {
+		constructor(err: Error);
+
+		error: Error;
+	}
+
+	/**
+	 * Used as a Redirect marker when writing to a Stream's incoming buffer
+	 */
+		// TODO is this public?
+	class StreamRedirect<R> {
+		constructor(to: Stream<R>)
+
+		to: Stream<R>;
+	}
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+	/**
+	 * Actual Stream constructor wrapped the the main exported function
+	 */
+	interface Stream<R> extends NodeJS.EventEmitter {
+
+		/**
+		 * Pauses the stream. All Highland Streams start in the paused state.
+		 *
+		 * @id pause
+		 * @section Streams
+		 * @name Stream.pause()
+		 * @api public
+		 */
+		pause(): void;
+
+		/**
+		 * Resumes a paused Stream. This will either read from the Stream's incoming
+		 * buffer or request more data from an upstream source.
+		 *
+		 * @id resume
+		 * @section Streams
+		 * @name Stream.resume()
+		 * @api public
+		 */
+		resume(): void;
+
+		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+		/**
+		 * Ends a Stream. This is the same as sending a [nil](#nil) value as data.
+		 * You shouldn't need to call this directly, rather it will be called by
+		 * any [Node Readable Streams](http://nodejs.org/api/stream.html#stream_class_stream_readable)
+		 * you pipe in.
+		 *
+		 * @id end
+		 * @section Streams
+		 * @name Stream.end()
+		 * @api public
+		 */
+		end(): void;
+
+		/**
+		 * Pipes a Highland Stream to a [Node Writable Stream](http://nodejs.org/api/stream.html#stream_class_stream_writable)
+		 * (Highland Streams are also Node Writable Streams). This will pull all the
+		 * data from the source Highland Stream and write it to the destination,
+		 * automatically managing flow so that the destination is not overwhelmed
+		 * by a fast source.
+		 *
+		 * This function returns the destination so you can chain together pipe calls.
+		 *
+		 * @id pipe
+		 * @section Streams
+		 * @name Stream.pipe(dest)
+		 * @param {Writable Stream} dest - the destination to write all data to
+		 * @api public
+		 */
+		pipe<U>(dest: Stream<U>): Stream<U>;
+		pipe<U>(dest: NodeJS.ReadWriteStream): Stream<U>;
+		pipe(dest: NodeJS.WritableStream): void;
+
+		/**
+		 * Destroys a stream by unlinking it from any consumers and sources. This will
+		 * stop all consumers from receiving events from this stream and removes this
+		 * stream as a consumer of any source stream.
+		 *
+		 * This function calls end() on the stream and unlinks it from any piped-to streams.
+		 *
+		 * @id pipe
+		 * @section Streams
+		 * @name Stream.destroy()
+		 * @api public
+		 */
+		destroy(): void;
+
+		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+		/**
+		 * Consumes values from a Stream (once resumed) and returns a new Stream for
+		 * you to optionally push values onto using the provided push / next functions.
+		 *
+		 * This function forms the basis of many higher-level Stream operations.
+		 * It will not cause a paused stream to immediately resume, but behaves more
+		 * like a 'through' stream, handling values as they are read.
+		 *
+		 * @id consume
+		 * @section Streams
+		 * @name Stream.consume(f)
+		 * @param {Function} f - the function to handle errors and values
+		 * @api public
+		 */
+		consume<U>(f: (err: Error, x: R, push: (err: Error, value?: U) => void, next: () => void) => void): Stream<U>;
+
+		/**
+		 * Consumes a single item from the Stream. Unlike consume, this function will
+		 * not provide a new stream for you to push values onto, and it will unsubscribe
+		 * as soon as it has a single error, value or nil from the source.
+		 *
+		 * You probably won't need to use this directly, but it is used internally by
+		 * some functions in the Highland library.
+		 *
+		 * @id pull
+		 * @section Streams
+		 * @name Stream.pull(f)
+		 * @param {Function} f - the function to handle data
+		 * @api public
+		 */
+		pull(f: (err: Error, x: R) => void): void;
+
+		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+		/**
+		 * Writes a value to the Stream. If the Stream is paused it will go into the
+		 * Stream's incoming buffer, otherwise it will be immediately processed and
+		 * sent to the Stream's consumers (if any). Returns false if the Stream is
+		 * paused, true otherwise. This lets Node's pipe method handle back-pressure.
+		 *
+		 * You shouldn't need to call this yourself, but it may be called by Node
+		 * functions which treat Highland Streams as a [Node Writable Stream](http://nodejs.org/api/stream.html#stream_class_stream_writable).
+		 *
+		 * @id write
+		 * @section Streams
+		 * @name Stream.write(x)
+		 * @param x - the value to write to the Stream
+		 * @api public
+		 */
+		write(x: R): boolean;
+
+		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+		/**
+		 * Forks a stream, allowing you to add additional consumers with shared
+		 * back-pressure. A stream forked to multiple consumers will only pull values
+		 * from it's source as fast as the slowest consumer can handle them.
+		 *
+		 * @id fork
+		 * @section Streams
+		 * @name Stream.fork()
+		 * @api public
+		 */
+		fork(): Stream<R>;
+
+		/**
+		 * Observes a stream, allowing you to handle values as they are emitted, without
+		 * adding back-pressure or causing data to be pulled from the source. This can
+		 * be useful when you are performing two related queries on a stream where one
+		 * would block the other. Just be aware that a slow observer could fill up it's
+		 * buffer and cause memory issues. Where possible, you should use [fork](#fork).
+		 *
+		 * @id observe
+		 * @section Streams
+		 * @name Stream.observe()
+		 * @api public
+		 */
+		observe(): Stream<R>;
+
+		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+		/**
+		 * Extracts errors from a Stream and applies them to an error handler
+		 * function. Returns a new Stream with the errors removed (unless the error
+		 * handler chooses to rethrow them using `push`). Errors can also be
+		 * transformed and put back onto the Stream as values.
+		 *
+		 * @id errors
+		 * @section Streams
+		 * @name Stream.errors(f)
+		 * @param {Function} f - the function to pass all errors to
+		 * @api public
+		 */
+		errors(f: (err: Error, push: (err: Error, x?: R) => void) => void): Stream<R>;
+
+		/**
+		 * Like the [errors](#errors) method, but emits a Stream end marker after
+		 * an Error is encountered.
+		 *
+		 * @id stopOnError
+		 * @section Streams
+		 * @name Stream.stopOnError(f)
+		 * @param {Function} f - the function to handle an error
+		 * @api public
+		 */
+		stopOnError(f: (err: Error) => void): Stream<R>;
+
+		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+		/**
+		 * Iterates over every value from the Stream, calling the iterator function
+		 * on each of them. This function causes a **thunk**.
+		 *
+		 * If an error from the Stream reaches the `each` call, it will emit an
+		 * error event (which will cause it to throw if unhandled).
+		 *
+		 * @id each
+		 * @section Streams
+		 * @name Stream.each(f)
+		 * @param {Function} f - the iterator function
+		 * @api public
+		 */
+		each(f: (x: R) => void): void;
+
+		/**
+		 * Applies results from a Stream as arguments to a function
+		 *
+		 * @id apply
+		 * @section Streams
+		 * @name Stream.apply(f)
+		 * @param {Function} f - the function to apply arguments to
+		 * @api public
+		 */
+		// TODO what to do here?
+		apply(f: Function): void;
+
+		/**
+		 * Collects all values from a Stream into an Array and calls a function with
+		 * once with the result. This function causes a **thunk**.
+		 *
+		 * If an error from the Stream reaches the `toArray` call, it will emit an
+		 * error event (which will cause it to throw if unhandled).
+		 *
+		 * @id toArray
+		 * @section Streams
+		 * @name Stream.toArray(f)
+		 * @param {Function} f - the callback to provide the completed Array to
+		 * @api public
+		 */
+		toArray(f: (arr: R[]) => void): void;
+
+		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+		/**
+		 * Creates a new Stream of transformed values by applying a function to each
+		 * value from the source. The transformation function can be replaced with
+		 * a non-function value for convenience, and it will emit that value
+		 * for every data event on the source Stream.
+		 *
+		 * @id map
+		 * @section Streams
+		 * @name Stream.map(f)
+		 * @param f - the transformation function or value to map to
+		 * @api public
+		 */
+		map<U>(f: (x: R) => U): Stream<U>;
+
+		/**
+		 * Creates a new Stream of values by applying each item in a Stream to an
+		 * iterator function which may return a Stream. Each item on these result
+		 * Streams are then emitted on a single output Stream.
+		 *
+		 * The same as calling `stream.map(f).flatten()`.
+		 *
+		 * @id flatMap
+		 * @section Streams
+		 * @name Stream.flatMap(f)
+		 * @param {Function} f - the iterator function
+		 * @api public
+		 */
+		flatMap<U>(f: (x: R) => Stream<U>): Stream<U>;
+		flatMap<U>(f: (x: R) => U): Stream<U>;
+
+		/**
+		 * Retrieves values associated with a given property from all elements in
+		 * the collection.
+		 *
+		 * @id pluck
+		 * @section Streams
+		 * @name Stream.pluck(property)
+		 * @param {String} prop - the property to which values should be associated
+		 * @api public
+		 */
+		pluck<U>(prop: string): Stream<U>;
+
+		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+		/**
+		 * Creates a new Stream including only the values which pass a truth test.
+		 *
+		 * @id filter
+		 * @section Streams
+		 * @name Stream.filter(f)
+		 * @param f - the truth test function
+		 * @api public
+		 */
+		filter(f: (x: R) => boolean): Stream<R>;
+
+		/**
+		 * Filters using a predicate which returns a Stream. If you need to check
+		 * against an asynchronous data source when filtering a Stream, this can
+		 * be convenient. The Stream returned from the filter function should have
+		 * a Boolean as it's first value (all other values on the Stream will be
+		 * disregarded).
+		 *
+		 * @id flatFilter
+		 * @section Streams
+		 * @name Stream.flatFilter(f)
+		 * @param {Function} f - the truth test function which returns a Stream
+		 * @api public
+		 */
+		flatFilter(f: (x: R) => Stream<boolean>): Stream<R>;
+
+		/**
+		 * The inverse of [filter](#filter).
+		 *
+		 * @id reject
+		 * @section Streams
+		 * @name Stream.reject(f)
+		 * @param {Function} f - the truth test function
+		 * @api public
+		 *
+		 * var odds = _([1, 2, 3, 4]).reject(function (x) {
+		 *     return x % 2 === 0;
+		 * });
+		 */
+		reject(f: (x: R) => boolean): Stream<R>;
+
+		/**
+		 * A convenient form of filter, which returns the first object from a
+		 * Stream that passes the provided truth test
+		 *
+		 * @id find
+		 * @section Streams
+		 * @name Stream.find(f)
+		 * @param {Function} f - the truth test function which returns a Stream
+		 * @api public
+		 */
+		find(f: (x: R) => boolean): Stream<R>;
+
+		/**
+		 * A convenient form of reduce, which groups items based on a function or property name
+		 *
+		 * @id group
+		 * @section Streams
+		 * @name Stream.group(f)
+		 * @param {Function|String} f - the function or property name on which to group,
+		 *                              toString() is called on the result of a function.
+		 * @api public
+		 */
+		// TODO verify this
+		group(f: (x: R) => string): Stream<{[prop:string]:R[]}>;
+		group(prop: string): Stream<{[prop:string]:R[]}>;
+
+		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+		/**
+		 * Filters a Stream to drop all non-truthy values.
+		 *
+		 * @id compact
+		 * @section Streams
+		 * @name Stream.compact()
+		 * @api public
+		 */
+		compact(): Stream<R>;
+
+		/**
+		 * A convenient form of filter, which returns all objects from a Stream
+		 * match a set of property values.
+		 *
+		 * @id where
+		 * @section Streams
+		 * @name Stream.where(props)
+		 * @param {Object} props - the properties to match against
+		 * @api public
+		 */
+		where(props: Object): Stream<R>;
+
+		/**
+		 * Takes two Streams and returns a Stream of corresponding pairs.
+		 *
+		 * @id zip
+		 * @section Streams
+		 * @name Stream.zip(ys)
+		 * @param {Array | Stream} ys - the other stream to combine values with
+		 * @api public
+		 */
+		zip(ys: R[]): Stream<R>;
+		zip(ys: Stream<R>): Stream<R>;
+
+		/**
+		 * Creates a new Stream with the first `n` values from the source.
+		 *
+		 * @id take
+		 * @section Streams
+		 * @name Stream.take(n)
+		 * @param {Number} n - integer representing number of values to read from source
+		 * @api public
+		 */
+		take(n: number): Stream<R>;
+
+		/**
+		 * Creates a new Stream with only the first value from the source.
+		 *
+		 * @id head
+		 * @section Streams
+		 * @name Stream.head()
+		 * @api public
+		 *
+		 * _([1, 2, 3, 4]).head() // => 1
+		 */
+		head(): Stream<R>;
+
+		/**
+		 * Drops all values from the Stream apart from the last one (if any).
+		 *
+		 * @id last
+		 * @section Streams
+		 * @name Stream.last()
+		 * @api public
+		 */
+		last(): Stream<R>;
+
+		/**
+		 * Reads values from a Stream of Streams, emitting them on a Single output
+		 * Stream. This can be thought of as a flatten, just one level deep. Often
+		 * used for resolving asynchronous actions such as a HTTP request or reading
+		 * a file.
+		 *
+		 * @id sequence
+		 * @section Streams
+		 * @name Stream.sequence()
+		 * @api public
+		 */
+		//TODO figure out typing
+		sequence<U>(): Stream<U>;
+
+		/**
+		 * An alias for the [sequence](#sequence) method.
+		 *
+		 * @id series
+		 * @section Streams
+		 * @name Stream.series()
+		 * @api public
+		 */
+		// TODO figure out typing
+		series<U>(): Stream<U>;
+
+		/**
+		 * Recursively reads values from a Stream which may contain nested Streams
+		 * or Arrays. As values or errors are encountered, they are emitted on a
+		 * single output Stream.
+		 *
+		 * @id flatten
+		 * @section Streams
+		 * @name Stream.flatten()
+		 * @api public
+		 */
+		flatten<U>(): Stream<U>;
+		flatten(): Stream<R>;
+
+		/**
+		 * Takes a Stream of Streams and reads from them in parallel, buffering
+		 * the results until they can be returned to the consumer in their original
+		 * order.
+		 *
+		 * @id parallel
+		 * @section Streams
+		 * @name Stream.parallel(n)
+		 * @param {Number} n - the maximum number of concurrent reads/buffers
+		 * @api public
+		 */
+		parallel(n: number): Stream<R>;
+
+		/**
+		 * Switches source to an alternate Stream if the current Stream is empty.
+		 *
+		 * @id otherwise
+		 * @section Streams
+		 * @name Stream.otherwise(ys)
+		 * @param {Stream} ys - alternate stream to use if this stream is empty
+		 * @api public
+		 */
+		otherwise(ys: Stream<R>): Stream<R>;
+
+		/**
+		 * Adds a value to the end of a Stream.
+		 *
+		 * @id append
+		 * @section Streams
+		 * @name Stream.append(y)
+		 * @param y - the value to append to the Stream
+		 * @api public
+		 */
+		append(y: R): Stream<R>;
+
+		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+		/**
+		 * Boils down a Stream to a single value. The memo is the initial state
+		 * of the reduction, and each successive step of it should be returned by
+		 * the iterator function. The iterator is passed two arguments:
+		 * the memo and the next value.
+		 *
+		 * @id reduce
+		 * @section Streams
+		 * @name Stream.reduce(memo, iterator)
+		 * @param memo - the initial state of the reduction
+		 * @param {Function} iterator - the function which reduces the values
+		 * @api public
+		 */
+		// TODO: convert this to this.scan(z, f).last()
+		reduce<U>(memo: U, f: (memo: U, x: R) => U): Stream<U>;
+
+		/**
+		 * Same as [reduce](#reduce), but uses the first element as the initial
+		 * state instead of passing in a `memo` value.
+		 *
+		 * @id reduce1
+		 * @section Streams
+		 * @name Stream.reduce1(iterator)
+		 * @param {Function} iterator - the function which reduces the values
+		 * @api public
+		 */
+		reduce1<U>(memo: U, f: (memo: U, x: R) => U): Stream<U>;
+
+		/**
+		 * Groups all values into an Array and passes down the stream as a single
+		 * data event. This is a bit like doing [toArray](#toArray), but instead
+		 * of accepting a callback and causing a *thunk*, it passes the value on.
+		 *
+		 * @id collect
+		 * @section Streams
+		 * @name Stream.collect()
+		 * @api public
+		 */
+		collect(): Stream<R[]>;
+
+		/**
+		 * Like [reduce](#reduce), but emits each intermediate value of the
+		 * reduction as it is calculated.
+		 *
+		 * @id scan
+		 * @section Streams
+		 * @name Stream.scan(memo, iterator)
+		 * @param memo - the initial state of the reduction
+		 * @param {Function} iterator - the function which reduces the values
+		 * @api public
+		 */
+		scan<U>(memo: U, x: (memo: U, x: R) => U): Stream<U>;
+
+		/**
+		 * Same as [scan](#scan), but uses the first element as the initial
+		 * state instead of passing in a `memo` value.
+		 *
+		 * @id scan1
+		 * @section Streams
+		 * @name Stream.scan1(iterator)
+		 * @param {Function} iterator - the function which reduces the values
+		 * @api public
+		 *
+		 * _([1, 2, 3, 4]).scan1(add) // => 1, 3, 6, 10
+		 */
+		scan1<U>(memo: U, x: (memo: U, x: R) => U): Stream<U>;
+
+		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+		/**
+		 * Concatenates a Stream to the end of this Stream.
+		 *
+		 * Be aware that in the top-level export, the args may be in the reverse
+		 * order to what you'd expect `_([a], [b]) => [b, a]`, as this follows the
+		 * convention of other top-level exported functions which do `x` to `y`.
+		 *
+		 * @id concat
+		 * @section Streams
+		 * @name Stream.concat(ys)
+		 * @params {Stream | Array} ys - the values to concatenate onto this Stream
+		 * @api public
+		 */
+		concat(ys: Stream<R>): Stream<R>;
+		concat(ys: R[]): Stream<R>;
+
+		/**
+		 * Takes a Stream of Streams and merges their values and errors into a
+		 * single new Stream. The merged stream ends when all source streams have
+		 * ended.
+		 *
+		 * Note that no guarantee is made with respect to the order in which
+		 * values for each stream end up in the merged stream. Values in the
+		 * merged stream will, however, respect the order they were emitted from
+		 * their respective streams.
+		 *
+		 * @id merge
+		 * @section Streams
+		 * @name Stream.merge()
+		 * @api public
+		 *
+		 * var txt = _(['foo.txt', 'bar.txt']).map(readFile)
+		 * var md = _(['baz.md']).map(readFile)
+		 *
+		 * _([txt, md]).merge();
+		 * // => contents of foo.txt, bar.txt and baz.txt in the order they were read
+		 */
+		merge (ys: Stream<Stream<R>>): Stream<R>;
+
+		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+		/**
+		 * Calls a named method on each object from the Stream - returning
+		 * a new stream with the result of those calls.
+		 *
+		 * @id invoke
+		 * @section Streams
+		 * @name Stream.invoke(method, args)
+		 * @param {String} method - the method name to call
+		 * @param {Array} args - the arguments to call the method with
+		 * @api public
+		 */
+		invoke<U>(method: string, args: any[]): Stream<U>;
+
+		/**
+		 * Ensures that only one data event is push downstream (or into the buffer)
+		 * every `ms` milliseconds, any other values are dropped.
+		 *
+		 * @id throttle
+		 * @section Streams
+		 * @name Stream.throttle(ms)
+		 * @param {Number} ms - the minimum milliseconds between each value
+		 * @api public
+		 */
+		throttle(ms: number): Stream<R>;
+
+		/**
+		 * Holds off pushing data events downstream until there has been no more
+		 * data for `ms` milliseconds. Sends the last value that occurred before
+		 * the delay, discarding all other values.
+		 *
+		 * @id debounce
+		 * @section Streams
+		 * @name Stream.debounce(ms)
+		 * @param {Number} ms - the milliseconds to wait before sending data
+		 * @api public
+		 */
+		debounce(ms: number): Stream<R>;
+
+		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+		/**
+		 * Creates a new Stream, which when read from, only returns the last
+		 * seen value from the source. The source stream does not experience
+		 * back-pressure. Useful if you're using a Stream to model a changing
+		 * property which you need to query periodically.
+		 *
+		 * @id latest
+		 * @section Streams
+		 * @name Stream.latest()
+		 * @api public
+		 */
+		latest(): Stream<R>;
+	}
+}
+
+declare var highland:HighlandStatic;
+
+declare module 'highland' {
+	export = highland;
+}
+
diff --git a/highland/tsconfig.json b/highland/tsconfig.json
new file mode 100644
index 0000000000..f053531903
--- /dev/null
+++ b/highland/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "highland-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/highlightjs/highlightjs-7.5.0.d.ts b/highlight.js/highlightjs-7.5.0.d.ts
similarity index 100%
rename from highlightjs/highlightjs-7.5.0.d.ts
rename to highlight.js/highlightjs-7.5.0.d.ts
diff --git a/highlightjs/highlightjs-tests.ts b/highlight.js/highlightjs-tests.ts
similarity index 92%
rename from highlightjs/highlightjs-tests.ts
rename to highlight.js/highlightjs-tests.ts
index 233d1fa3e6..52ae9446cf 100644
--- a/highlightjs/highlightjs-tests.ts
+++ b/highlight.js/highlightjs-tests.ts
@@ -5,7 +5,7 @@
 	Project Page: http://softwaremaniacs.org/soft/highlight/en/
 */
 
-/// <reference path="highlightjs.d.ts" />
+
 
 import hljs = require("highlight.js");
 
diff --git a/highlight.js/index.d.ts b/highlight.js/index.d.ts
new file mode 100644
index 0000000000..dab36329fe
--- /dev/null
+++ b/highlight.js/index.d.ts
@@ -0,0 +1,158 @@
+// Type definitions for highlight.js v9.1.0
+// Project: https://github.com/isagalaev/highlight.js
+// Definitions by: Niklas Mollenhauer <https://github.com/nikeee/>, Jeremy Hull <https://github.com/sourrust>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = hljs;
+export as namespace hljs;
+
+declare  namespace hljs
+{
+	export function highlight(
+		name: string,
+		value: string,
+		ignore_illegals?: boolean,
+		continuation?: boolean) : IHighlightResult;
+	export function highlightAuto(
+		value: string,
+		languageSubset?: string[]) : IAutoHighlightResult;
+
+	export function fixMarkup(value: string) : string;
+
+	export function highlightBlock(block: Node) : void;
+
+	export function configure(options: IOptions): void;
+
+	export function initHighlighting(): void;
+	export function initHighlightingOnLoad(): void;
+
+	export function registerLanguage(
+		name: string,
+		language: (hljs?: HLJSStatic) => IModeBase): void;
+	export function listLanguages(): string[];
+	export function getLanguage(name: string): IMode;
+
+	export function inherit(parent: Object, obj: Object): Object;
+
+	export function COMMENT(
+		begin: (string|RegExp),
+		end: (string|RegExp),
+		inherits: IModeBase): IMode;
+
+	// Common regexps
+	export var IDENT_RE: string;
+	export var UNDERSCORE_IDENT_RE: string;
+	export var NUMBER_RE: string;
+	export var C_NUMBER_RE: string;
+	export var BINARY_NUMBER_RE: string;
+	export var RE_STARTERS_RE: string;
+
+	// Common modes
+	export var BACKSLASH_ESCAPE : IMode;
+	export var APOS_STRING_MODE : IMode;
+	export var QUOTE_STRING_MODE : IMode;
+	export var PHRASAL_WORDS_MODE : IMode;
+	export var C_LINE_COMMENT_MODE : IMode;
+	export var C_BLOCK_COMMENT_MODE : IMode;
+	export var HASH_COMMENT_MODE : IMode;
+	export var NUMBER_MODE : IMode;
+	export var C_NUMBER_MODE : IMode;
+	export var BINARY_NUMBER_MODE : IMode;
+	export var CSS_NUMBER_MODE : IMode;
+	export var REGEX_MODE : IMode;
+	export var TITLE_MODE : IMode;
+	export var UNDERSCORE_TITLE_MODE : IMode;
+
+	export interface IHighlightResultBase
+	{
+		relevance: number;
+		language: string;
+		value: string;
+	}
+
+	export interface IAutoHighlightResult extends IHighlightResultBase
+	{
+		second_best?: IAutoHighlightResult;
+	}
+
+	export interface IHighlightResult extends IHighlightResultBase
+	{
+		top: ICompiledMode;
+	}
+
+	export interface HLJSStatic
+	{
+		inherit(parent: Object, obj: Object): Object;
+
+		// Common regexps
+		IDENT_RE: string;
+		UNDERSCORE_IDENT_RE: string;
+		NUMBER_RE: string;
+		C_NUMBER_RE: string;
+		BINARY_NUMBER_RE: string;
+		RE_STARTERS_RE: string;
+
+		// Common modes
+		BACKSLASH_ESCAPE : IMode;
+		APOS_STRING_MODE : IMode;
+		QUOTE_STRING_MODE : IMode;
+		PHRASAL_WORDS_MODE : IMode;
+		C_LINE_COMMENT_MODE : IMode;
+		C_BLOCK_COMMENT_MODE : IMode;
+		HASH_COMMENT_MODE : IMode;
+		NUMBER_MODE : IMode;
+		C_NUMBER_MODE : IMode;
+		BINARY_NUMBER_MODE : IMode;
+		CSS_NUMBER_MODE : IMode;
+		REGEX_MODE : IMode;
+		TITLE_MODE : IMode;
+		UNDERSCORE_TITLE_MODE : IMode;
+	}
+
+	// Reference:
+	// https://github.com/isagalaev/highlight.js/blob/master/docs/reference.rst
+	export interface IModeBase
+	{
+		className?: string;
+		aliases?: string[];
+		begin?: (string|RegExp);
+		end?: (string|RegExp);
+		case_insensitive?: boolean;
+		beginKeyword?: string;
+		endsWithParent?: boolean;
+		lexems?: string;
+		illegal?: string;
+		excludeBegin?: boolean;
+		excludeEnd?: boolean;
+		returnBegin?: boolean;
+		returnEnd?: boolean;
+		starts?: string;
+		subLanguage?: string;
+		subLanguageMode?: string;
+		relevance?: number;
+		variants?: IMode[];
+	}
+
+	export interface IMode extends IModeBase
+	{
+		keywords?: any;
+		contains?: IMode[];
+	}
+
+	export interface ICompiledMode extends IModeBase
+	{
+		compiled: boolean;
+		contains?: ICompiledMode[];
+		keywords?: Object;
+		terminators: RegExp;
+		terminator_end?: string;
+	}
+
+	export interface IOptions
+	{
+		classPrefix?: string;
+		tabReplace?: string;
+		useBR?: boolean;
+		languages?: string[];
+	}
+}
diff --git a/highlightjs/highlightjs.d.ts b/highlightjs/highlightjs.d.ts
deleted file mode 100644
index 3de85acb2b..0000000000
--- a/highlightjs/highlightjs.d.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-// Type definitions for highlight.js v9.1.0
-// Project: https://github.com/isagalaev/highlight.js
-// Definitions by: Niklas Mollenhauer <https://github.com/nikeee/>, Jeremy Hull <https://github.com/sourrust>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'highlight.js' {
-    export = hljs;
-}
-
-declare  namespace hljs
-{
-	export function highlight(
-		name: string,
-		value: string,
-		ignore_illegals?: boolean,
-		continuation?: boolean) : IHighlightResult;
-	export function highlightAuto(
-		value: string,
-		languageSubset?: string[]) : IAutoHighlightResult;
-
-	export function fixMarkup(value: string) : string;
-
-	export function highlightBlock(block: Node) : void;
-
-	export function configure(options: IOptions): void;
-
-	export function initHighlighting(): void;
-	export function initHighlightingOnLoad(): void;
-
-	export function registerLanguage(
-		name: string,
-		language: (hljs?: HLJSStatic) => IModeBase): void;
-	export function listLanguages(): string[];
-	export function getLanguage(name: string): IMode;
-
-	export function inherit(parent: Object, obj: Object): Object;
-
-	export function COMMENT(
-		begin: (string|RegExp),
-		end: (string|RegExp),
-		inherits: IModeBase): IMode;
-
-	// Common regexps
-	export var IDENT_RE: string;
-	export var UNDERSCORE_IDENT_RE: string;
-	export var NUMBER_RE: string;
-	export var C_NUMBER_RE: string;
-	export var BINARY_NUMBER_RE: string;
-	export var RE_STARTERS_RE: string;
-
-	// Common modes
-	export var BACKSLASH_ESCAPE : IMode;
-	export var APOS_STRING_MODE : IMode;
-	export var QUOTE_STRING_MODE : IMode;
-	export var PHRASAL_WORDS_MODE : IMode;
-	export var C_LINE_COMMENT_MODE : IMode;
-	export var C_BLOCK_COMMENT_MODE : IMode;
-	export var HASH_COMMENT_MODE : IMode;
-	export var NUMBER_MODE : IMode;
-	export var C_NUMBER_MODE : IMode;
-	export var BINARY_NUMBER_MODE : IMode;
-	export var CSS_NUMBER_MODE : IMode;
-	export var REGEX_MODE : IMode;
-	export var TITLE_MODE : IMode;
-	export var UNDERSCORE_TITLE_MODE : IMode;
-
-	export interface IHighlightResultBase
-	{
-		relevance: number;
-		language: string;
-		value: string;
-	}
-
-	export interface IAutoHighlightResult extends IHighlightResultBase
-	{
-		second_best?: IAutoHighlightResult;
-	}
-
-	export interface IHighlightResult extends IHighlightResultBase
-	{
-		top: ICompiledMode;
-	}
-
-	export interface HLJSStatic
-	{
-		inherit(parent: Object, obj: Object): Object;
-
-		// Common regexps
-		IDENT_RE: string;
-		UNDERSCORE_IDENT_RE: string;
-		NUMBER_RE: string;
-		C_NUMBER_RE: string;
-		BINARY_NUMBER_RE: string;
-		RE_STARTERS_RE: string;
-
-		// Common modes
-		BACKSLASH_ESCAPE : IMode;
-		APOS_STRING_MODE : IMode;
-		QUOTE_STRING_MODE : IMode;
-		PHRASAL_WORDS_MODE : IMode;
-		C_LINE_COMMENT_MODE : IMode;
-		C_BLOCK_COMMENT_MODE : IMode;
-		HASH_COMMENT_MODE : IMode;
-		NUMBER_MODE : IMode;
-		C_NUMBER_MODE : IMode;
-		BINARY_NUMBER_MODE : IMode;
-		CSS_NUMBER_MODE : IMode;
-		REGEX_MODE : IMode;
-		TITLE_MODE : IMode;
-		UNDERSCORE_TITLE_MODE : IMode;
-	}
-
-	// Reference:
-	// https://github.com/isagalaev/highlight.js/blob/master/docs/reference.rst
-	export interface IModeBase
-	{
-		className?: string;
-		aliases?: string[];
-		begin?: (string|RegExp);
-		end?: (string|RegExp);
-		case_insensitive?: boolean;
-		beginKeyword?: string;
-		endsWithParent?: boolean;
-		lexems?: string;
-		illegal?: string;
-		excludeBegin?: boolean;
-		excludeEnd?: boolean;
-		returnBegin?: boolean;
-		returnEnd?: boolean;
-		starts?: string;
-		subLanguage?: string;
-		subLanguageMode?: string;
-		relevance?: number;
-		variants?: IMode[];
-	}
-
-	export interface IMode extends IModeBase
-	{
-		keywords?: any;
-		contains?: IMode[];
-	}
-
-	export interface ICompiledMode extends IModeBase
-	{
-		compiled: boolean;
-		contains?: ICompiledMode[];
-		keywords?: Object;
-		terminators: RegExp;
-		terminator_end?: string;
-	}
-
-	export interface IOptions
-	{
-		classPrefix?: string;
-		tabReplace?: string;
-		useBR?: boolean;
-		languages?: string[];
-	}
-}
diff --git a/history.js/history-tests.ts b/history.js/history-tests.ts
new file mode 100644
index 0000000000..46c848d1b7
--- /dev/null
+++ b/history.js/history-tests.ts
@@ -0,0 +1,25 @@
+
+
+// Since History is defined in lib.d.ts as well 
+// the name for our interfaces was chosen to be Historyjs
+// However at runtime you would need to do
+// https://github.com/DefinitelyTyped/DefinitelyTyped/issues/277 
+var Historyjs: Historyjs = <any>History;
+
+function tests() {
+    if (!Historyjs.enabled) {
+        return false;
+    }
+
+    Historyjs.Adapter.bind(window, 'statechange', () => {
+        var State = Historyjs.getState();
+        Historyjs.log(State.data, State.title, State.url);
+    });
+
+    Historyjs.pushState({ state: 1 }, "State 1", "?state=1");
+    Historyjs.pushState({ state: 2 }, "State 2", "?state=2");
+    Historyjs.replaceState({ state: 3 }, "State 3", "?state=3");
+    Historyjs.pushState(null, null, "?state=4");
+    Historyjs.back();
+    Historyjs.go(2);
+}
\ No newline at end of file
diff --git a/history/history.d.ts b/history.js/index.d.ts
similarity index 100%
rename from history/history.d.ts
rename to history.js/index.d.ts
diff --git a/history.js/tsconfig.json b/history.js/tsconfig.json
new file mode 100644
index 0000000000..fc317ff3fe
--- /dev/null
+++ b/history.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "history-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/history/history-tests.ts b/history/history-tests.ts
index 920d774334..fb4ae10cfd 100644
--- a/history/history-tests.ts
+++ b/history/history-tests.ts
@@ -1,25 +1,132 @@
-/// <reference path="history.d.ts" />
 
-// Since History is defined in lib.d.ts as well 
-// the name for our interfaces was chosen to be Historyjs
-// However at runtime you would need to do
-// https://github.com/DefinitelyTyped/DefinitelyTyped/issues/277 
-var Historyjs: Historyjs = <any>History;
 
-function tests() {
-    if (!Historyjs.enabled) {
-        return false;
-    }
+import { createHistory, createLocation, useBeforeUnload, useQueries, useBasename } from 'history'
+import { getUserConfirmation } from 'history/lib/DOMUtils'
 
-    Historyjs.Adapter.bind(window, 'statechange', () => {
-        var State = Historyjs.getState();
-        Historyjs.log(State.data, State.title, State.url);
+interface Promise<T> {
+    then<TResult>(onfulfilled?: (value: T) => TResult): Promise<TResult>;
+}
+
+let doSomethingAsync: () => Promise<Function>;
+let input = { value: "" };
+
+{
+    let history = createHistory()
+
+    // Listen for changes to the current location. The
+    // listener is called once immediately.
+    let unlisten = history.listen(function(location) {
+        console.log(location.pathname)
+    })
+
+    // When you're finished, stop the listener.
+    unlisten()
+
+    // Push a new entry onto the history stack.
+    history.push('/home')
+
+    // Replace the current entry on the history stack.
+    history.replace('/profile')
+
+    // Push a new entry with state onto the history stack.
+    history.push({
+        pathname: '/about',
+        search: '?the=search',
+        state: { some: 'state' }
     });
 
-    Historyjs.pushState({ state: 1 }, "State 1", "?state=1");
-    Historyjs.pushState({ state: 2 }, "State 2", "?state=2");
-    Historyjs.replaceState({ state: 3 }, "State 3", "?state=3");
-    Historyjs.pushState(null, null, "?state=4");
-    Historyjs.back();
-    Historyjs.go(2);
+    // Change just the search on an existing location.
+    //history.push({ ...location, search: '?the=other+search' })
+
+    // Go back to the previous history entry. The following
+    // two lines are synonymous.
+    history.go(-1)
+    history.goBack()
+
+    let href = history.createHref('/the/path')
+}
+
+{
+    let history = createHistory()
+
+    // Pushing a path string.
+    history.push('/the/path')
+
+    // Omitting location state when pushing a location descriptor.
+    history.push({ pathname: '/the/path', search: '?the=search' })
+
+    // Extending an existing location object.
+    //history.push({ ...location, search: '?other=search' })
+
+    let location = createLocation('/a/path?a=query', { the: 'state' })
+
+    location = history.createLocation('/a/path?a=query', { the: 'state' })
+}
+
+{
+    let history = createHistory()
+    history.listenBefore(function(location) {
+        if (input.value !== '')
+            return 'Are you sure you want to leave this page?'
+    })
+
+    history.listenBefore(function(location, callback) {
+        doSomethingAsync().then(callback)
+    })
+}
+
+{
+    let history = createHistory({
+        getUserConfirmation(message, callback) {
+            callback(window.confirm(message)) // The default behavior
+        }
+    })
+}
+
+{
+    let history = useBeforeUnload(createHistory)()
+
+    history.listenBeforeUnload(function() {
+        return 'Are you sure you want to leave this page?'
+    })
+}
+
+{
+    let history = useQueries(createHistory)()
+
+    history.listen(function(location) {
+        console.log(location.query)
+    })
+}
+
+{
+    let history = useQueries(createHistory)({
+        parseQueryString: function(queryString) {
+            // TODO: return a parsed version of queryString
+            return {};
+        },
+        stringifyQuery: function(query) {
+            // TODO: return a query string created from query
+            return "";
+        }
+    })
+
+    history.createPath({ pathname: '/the/path', query: { the: 'query' } })
+    history.push({ pathname: '/the/path', query: { the: 'query' } })
+}
+
+{
+    // Run our app under the /base URL.
+    let history = useBasename(createHistory)({
+        basename: '/base'
+    })
+
+    // At the /base/hello/world URL:
+    history.listen(function(location) {
+        console.log(location.pathname) // /hello/world
+        console.log(location.basename) // /base
+    })
+
+    history.createPath('/the/path') // /base/the/path
+    history.push('/the/path') // push /base/the/path
 }
\ No newline at end of file
diff --git a/history/index.d.ts b/history/index.d.ts
new file mode 100644
index 0000000000..f0b3a05dd9
--- /dev/null
+++ b/history/index.d.ts
@@ -0,0 +1,128 @@
+// Type definitions for history v2.0.0
+// Project: https://github.com/rackt/history
+// Definitions by: Sergey Buturlakin <https://github.com/sergey-buturlakin>, Nathan Brown <https://github.com/ngbrown>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// types based on https://github.com/rackt/history/blob/master/docs/Terms.md
+
+export as namespace History;
+
+export type Action = string;
+export type BeforeUnloadHook = () => string | boolean;
+export type CreateHistory<T> = (options?: HistoryOptions) => T;
+export type CreateHistoryEnhancer<T, E> = (createHistory: CreateHistory<T>) => CreateHistory<T & E>;
+
+export interface History {
+    listenBefore(hook: TransitionHook): () => void;
+    listen(listener: LocationListener): () => void;
+    transitionTo(location: Location): void;
+    push(path: LocationDescriptor): void;
+    replace(path: LocationDescriptor): void;
+    go(n: number): void;
+    goBack(): void;
+    goForward(): void;
+    createKey(): LocationKey;
+    createPath(path: LocationDescriptor): Path;
+    createHref(path: LocationDescriptor): Href;
+    createLocation(path?: LocationDescriptor, action?: Action, key?: LocationKey): Location;
+
+    /** @deprecated use a location descriptor instead */
+    createLocation(path?: Path, state?: LocationState, action?: Action, key?: LocationKey): Location;
+    /** @deprecated use location.key to save state instead */
+    pushState(state: LocationState, path: Path): void;
+    /** @deprecated use location.key to save state instead */
+    replaceState(state: LocationState, path: Path): void;
+    /** @deprecated use location.key to save state instead */
+    setState(state: LocationState): void;
+    /** @deprecated use listenBefore instead */
+    registerTransitionHook(hook: TransitionHook): void;
+    /** @deprecated use the callback returned from listenBefore instead */
+    unregisterTransitionHook(hook: TransitionHook): void;
+}
+
+export type HistoryOptions = {
+    getCurrentLocation?: () => Location;
+    finishTransition?: (nextLocation: Location) => boolean;
+    saveState?: (key: LocationKey, state: LocationState) => void;
+    go?: (n: number) => void;
+    getUserConfirmation?: (message: string, callback: (result: boolean) => void) => void;
+    keyLength?: number;
+    queryKey?: string | boolean;
+    stringifyQuery?: (obj: any) => string;
+    parseQueryString?: (str: string) => any;
+    basename?: string;
+    entries?: string | [any];
+    current?: number;
+}
+
+export type Href = string
+
+export type Location = {
+    pathname: Pathname;
+    search: Search;
+    query: Query;
+    state: LocationState;
+    action: Action;
+    key: LocationKey;
+    basename?: string;
+};
+
+export type LocationDescriptorObject = {
+    pathname?: Pathname;
+    search?: Search;
+    query?: Query;
+    state?: LocationState;
+};
+
+export type LocationDescriptor = LocationDescriptorObject | Path;
+export type LocationKey = string;
+export type LocationListener = (location: Location) => void;
+export type LocationState = Object;
+export type Path = string // Pathname + QueryString;
+export type Pathname = string;
+export type Query = Object;
+export type QueryString = string;
+export type Search = string;
+
+export type TransitionHook = (location: Location, callback: (result: any) => void) => any
+
+
+export interface HistoryBeforeUnload {
+    listenBeforeUnload(hook: BeforeUnloadHook): () => void;
+}
+
+export interface HistoryQueries {
+    pushState(state: LocationState, pathname: Pathname | Path, query?: Query): void;
+    replaceState(state: LocationState, pathname: Pathname | Path, query?: Query): void;
+    createPath(path: Path, query?: Query): Path;
+    createHref(path: Path, query?: Query): Href;
+}
+
+
+// Global usage, without modules, needs the small trick, because lib.d.ts
+// already has `history` and `History` global definitions:
+// var createHistory = ((window as any).History as HistoryModule.Module).createHistory;
+export interface Module {
+    createHistory: CreateHistory<History>;
+    createHashHistory: CreateHistory<History>;
+    createMemoryHistory: CreateHistory<History>;
+    createLocation(path?: Path, state?: LocationState, action?: Action, key?: LocationKey): Location;
+    useBasename<T>(createHistory: CreateHistory<T>): CreateHistory<T>;
+    useBeforeUnload<T>(createHistory: CreateHistory<T>): CreateHistory<T & HistoryBeforeUnload>;
+    useQueries<T>(createHistory: CreateHistory<T>): CreateHistory<T & HistoryQueries>;
+    actions: {
+        PUSH: string;
+        REPLACE: string;
+        POP: string;
+    };
+}
+
+export { default as createHistory } from "history/lib/createBrowserHistory";
+export { default as createHashHistory } from "history/lib/createHashHistory";
+export { default as createMemoryHistory } from "history/lib/createMemoryHistory";
+export { default as createLocation } from "history/lib/createLocation";
+export { default as useBasename } from "history/lib/useBasename";
+export { default as useBeforeUnload } from "history/lib/useBeforeUnload";
+export { default as useQueries } from "history/lib/useQueries";
+import * as Actions from "history/lib/actions";
+export { Actions };
diff --git a/history/lib/DOMUtils.d.ts b/history/lib/DOMUtils.d.ts
new file mode 100644
index 0000000000..f70a5993f9
--- /dev/null
+++ b/history/lib/DOMUtils.d.ts
@@ -0,0 +1,9 @@
+export function addEventListener(node: EventTarget, event: string, listener: EventListenerOrEventListenerObject): void;
+export function removeEventListener(node: EventTarget, event: string, listener: EventListenerOrEventListenerObject): void;
+export function getHashPath(): string;
+export function replaceHashPath(path: string): void;
+export function getWindowPath(): string;
+export function go(n: number): void;
+export function getUserConfirmation(message: string, callback: (result: boolean) => void): void;
+export function supportsHistory(): boolean;
+export function supportsGoWithoutReloadUsingHash(): boolean;
diff --git a/history/lib/actions.d.ts b/history/lib/actions.d.ts
new file mode 100644
index 0000000000..9eba9d4653
--- /dev/null
+++ b/history/lib/actions.d.ts
@@ -0,0 +1,9 @@
+export const PUSH: string;
+export const REPLACE: string;
+export const POP: string;
+
+export default {
+    PUSH,
+    REPLACE,
+    POP
+}
diff --git a/history/lib/createBrowserHistory.d.ts b/history/lib/createBrowserHistory.d.ts
new file mode 100644
index 0000000000..a82b17e788
--- /dev/null
+++ b/history/lib/createBrowserHistory.d.ts
@@ -0,0 +1,2 @@
+import { HistoryOptions, History } from 'history';
+export default function createBrowserHistory(options?: HistoryOptions): History;
\ No newline at end of file
diff --git a/history/lib/createHashHistory.d.ts b/history/lib/createHashHistory.d.ts
new file mode 100644
index 0000000000..57c0e8c1bb
--- /dev/null
+++ b/history/lib/createHashHistory.d.ts
@@ -0,0 +1,2 @@
+import { HistoryOptions, History } from 'history';
+export default function createHashHistory(options?: HistoryOptions): History;
\ No newline at end of file
diff --git a/history/lib/createLocation.d.ts b/history/lib/createLocation.d.ts
new file mode 100644
index 0000000000..c78f9fed80
--- /dev/null
+++ b/history/lib/createLocation.d.ts
@@ -0,0 +1,2 @@
+import { Path, LocationState, Action, LocationKey, Location } from 'history';
+export default function createLocation(path?: Path, state?: LocationState, action?: Action, key?: LocationKey): Location;
diff --git a/history/lib/createMemoryHistory.d.ts b/history/lib/createMemoryHistory.d.ts
new file mode 100644
index 0000000000..30d0180961
--- /dev/null
+++ b/history/lib/createMemoryHistory.d.ts
@@ -0,0 +1,2 @@
+import { HistoryOptions, History } from 'history';
+export default function createMemoryHistory(options?: HistoryOptions): History;
diff --git a/history/lib/useBasename.d.ts b/history/lib/useBasename.d.ts
new file mode 100644
index 0000000000..b9cfafff20
--- /dev/null
+++ b/history/lib/useBasename.d.ts
@@ -0,0 +1,2 @@
+import { CreateHistory } from 'history';
+export default function useBasename<T>(createHistory: CreateHistory<T>): CreateHistory<T>;
diff --git a/history/lib/useBeforeUnload.d.ts b/history/lib/useBeforeUnload.d.ts
new file mode 100644
index 0000000000..87d0370a2b
--- /dev/null
+++ b/history/lib/useBeforeUnload.d.ts
@@ -0,0 +1,2 @@
+import { CreateHistory, HistoryBeforeUnload } from 'history';
+export default function useBeforeUnload<T>(createHistory: CreateHistory<T>): CreateHistory<T & HistoryBeforeUnload>;
diff --git a/history/lib/useQueries.d.ts b/history/lib/useQueries.d.ts
new file mode 100644
index 0000000000..2bb2a6697a
--- /dev/null
+++ b/history/lib/useQueries.d.ts
@@ -0,0 +1,2 @@
+import { CreateHistory, HistoryQueries } from 'history';
+export default function useQueries<T>(createHistory: CreateHistory<T>): CreateHistory<T & HistoryQueries>;
\ No newline at end of file
diff --git a/history/tsconfig.json b/history/tsconfig.json
new file mode 100644
index 0000000000..fc317ff3fe
--- /dev/null
+++ b/history/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "history-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/hooker/hooker-tests.ts b/hooker/hooker-tests.ts
index 96cb6715e8..bd375affac 100644
--- a/hooker/hooker-tests.ts
+++ b/hooker/hooker-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="hooker.d.ts" />
+
 
 import hooker = require('hooker');
 
diff --git a/hooker/hooker.d.ts b/hooker/index.d.ts
similarity index 100%
rename from hooker/hooker.d.ts
rename to hooker/index.d.ts
diff --git a/hooker/tsconfig.json b/hooker/tsconfig.json
new file mode 100644
index 0000000000..b7fe5e6d8d
--- /dev/null
+++ b/hooker/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "hooker-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/hopscotch/hopscotch-tests.ts b/hopscotch/hopscotch-tests.ts
index fb1d1c68a5..0690e17e4b 100644
--- a/hopscotch/hopscotch-tests.ts
+++ b/hopscotch/hopscotch-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="hopscotch.d.ts" />
+
 
 var tourDefinition: TourDefinition = {
   id: 'intro-tour',
diff --git a/hopscotch/hopscotch.d.ts b/hopscotch/index.d.ts
similarity index 100%
rename from hopscotch/hopscotch.d.ts
rename to hopscotch/index.d.ts
diff --git a/hopscotch/tsconfig.json b/hopscotch/tsconfig.json
new file mode 100644
index 0000000000..5d6c64d60e
--- /dev/null
+++ b/hopscotch/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "hopscotch-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/howlerjs/howler-tests.ts b/howler/howler-tests.ts
similarity index 88%
rename from howlerjs/howler-tests.ts
rename to howler/howler-tests.ts
index c358f8e3be..bdd3a575bd 100644
--- a/howlerjs/howler-tests.ts
+++ b/howler/howler-tests.ts
@@ -2,13 +2,9 @@
  * howler-tests.ts
  * Created by xperiments on 02/09/14.
  */
-///<reference path="howler.d.ts"/>
 
 import * as howler from "howler";
 
-howler.Howler = Howler;
-howler.Howl = Howl;
-
 Howler.codecs('ogg');
 Howler.iOSAutoEnable = true;
 var sound = new Howl({
diff --git a/howlerjs/howler.d.ts b/howler/index.d.ts
similarity index 100%
rename from howlerjs/howler.d.ts
rename to howler/index.d.ts
diff --git a/howler/tsconfig.json b/howler/tsconfig.json
new file mode 100644
index 0000000000..27cde3e75f
--- /dev/null
+++ b/howler/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "howler-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/html-entities/html-entities-tests.ts b/html-entities/html-entities-tests.ts
new file mode 100644
index 0000000000..58e81b6e59
--- /dev/null
+++ b/html-entities/html-entities-tests.ts
@@ -0,0 +1,8 @@
+import * as htmlEntities from "html-entities";
+ 
+let entities = new htmlEntities.AllHtmlEntities();
+ 
+console.log(entities.encode('<>"\'&©®')); // &lt;&gt;&quot;&apos;&amp;©® 
+console.log(entities.encodeNonUTF('<>"\'&©®')); // &lt;&gt;&quot;&apos;&amp;&#169;&#174; 
+console.log(entities.encodeNonASCII('<>"\'&©®')); // <>"\'&©® 
+console.log(entities.decode('&lt;&gt;&quot;&apos;&amp;&copy;&reg;&#8710;')); // <>"'&&copy;&reg;∆
\ No newline at end of file
diff --git a/html-entities/index.d.ts b/html-entities/index.d.ts
new file mode 100644
index 0000000000..b93c8ece8c
--- /dev/null
+++ b/html-entities/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for html-entities v1.2.0
+// Project: https://www.npmjs.com/package/html-entities
+// Definitions by: Xavier Stouder <https://github.com/xstoudi/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare abstract class Entities {
+    encode(toEncode: string): string;
+    encodeNonUTF(toEncode: string): string;
+    encodeNonASCII(toEncode: string): string;
+    decode(toDecode: string): string;
+}
+export class XmlEntities extends Entities { }
+export class Html4Entities extends Entities { }
+export class Html5Entities extends Entities { }
+export class AllHtmlEntities extends Entities { }
diff --git a/html-entities/tsconfig.json b/html-entities/tsconfig.json
new file mode 100644
index 0000000000..2658e9f372
--- /dev/null
+++ b/html-entities/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "html-entities-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/html-minifier/html-minifier-tests.ts b/html-minifier/html-minifier-tests.ts
index b02ecea199..4196a870e6 100644
--- a/html-minifier/html-minifier-tests.ts
+++ b/html-minifier/html-minifier-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="html-minifier.d.ts" />
 
 import * as HTMLMinifier from 'html-minifier';
 const minify = HTMLMinifier.minify;
diff --git a/html-minifier/html-minifier.d.ts b/html-minifier/html-minifier.d.ts
deleted file mode 100644
index f55e73bd15..0000000000
--- a/html-minifier/html-minifier.d.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-// Type definitions for HTMLMinifier v1.1.1
-// Project: https://github.com/kangax/html-minifier
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../uglify-js/uglify-js.d.ts" />
-/// <reference path="../clean-css/clean-css.d.ts" />
-/// <reference path="../relateurl/relateurl.d.ts" />
-
-declare module 'html-minifier' {
-  import * as UglifyJS from 'uglify-js';
-  import * as CleanCSS from 'clean-css';
-  import * as RelateUrl from 'relateurl';
-
-  namespace HTMLMinifier {
-    function minify(text: string, options?: Options): string;
-
-    interface Options {
-      // Strip HTML comments
-      removeComments?: boolean;
-
-      // Strip HTML comments from scripts and styles
-      removeCommentsFromCDATA?: boolean;
-
-      // Remove CDATA sections from script and style elements
-      removeCDATASectionsFromCDATA?: boolean;
-
-      // Collapse white space that contributes to text nodes in a document tree
-      collapseWhitespace?: boolean;
-
-      // Always collapse to 1 space (never remove it entirely). Must be used in conjunction with collapseWhitespace=true
-      conservativeCollapse?: boolean;
-
-      // Don't leave any spaces between display:inline; elements when collapsing. Must be used in conjunction with collapseWhitespace=true
-      collapseInlineTagWhitespace?: boolean;
-
-      // Always collapse to 1 line break (never remove it entirely) when whitespace between tags include a line break. Must be used in conjunction with collapseWhitespace=true
-      preserveLineBreaks?: boolean;
-
-      // Omit attribute values from boolean attributes
-      collapseBooleanAttributes?: boolean;
-
-      // Remove quotes around attributes when possible
-      removeAttributeQuotes?: boolean;
-
-      // Remove attributes when value matches default
-      removeRedundantAttributes?: boolean;
-
-      // Prevents the escaping of the values of attributes.
-      preventAttributesEscaping?: boolean;
-
-      // Replaces the doctype with the short (HTML5) doctype
-      useShortDoctype?: boolean;
-
-      // Remove all attributes with whitespace-only values
-      removeEmptyAttributes?: boolean;
-
-      // Remove type="text/javascript" from script tags. Other type attribute values are left intact.
-      removeScriptTypeAttributes?: boolean;
-
-      // Remove type="text/css" from style and link tags. Other type attribute values are left intact.
-      removeStyleLinkTypeAttributes?: boolean;
-
-      // Remove unrequired tags
-      removeOptionalTags?: boolean;
-
-      // Remove all elements with empty contents
-      removeEmptyElements?: boolean;
-
-      // Toggle linting
-      lint?: boolean;
-
-      // Keep the trailing slash on singleton elements
-      keepClosingSlash?: boolean;
-
-      // Treat attributes in case sensitive manner (useful for custom HTML tags.)
-      caseSensitive?: boolean;
-
-      // Minify Javascript in script elements and on* attributes (uses UglifyJS)
-      minifyJS?: boolean | UglifyJS.MinifyOptions;
-
-      // Minify CSS in style elements and style attributes (uses clean-css)
-      minifyCSS?: boolean | CleanCSS.Options;
-
-      // Minify URLs in various attributes (uses relateurl)
-      minifyURLs?: boolean | RelateUrl.Options;
-
-      // Array of regex'es that allow to ignore certain comments, when matched
-      ignoreCustomComments?: Array<RegExp>;
-
-      // Array of regex'es that allow to ignore certain fragments, when matched (e.g. <?php ... ?>, {{ ... }}, etc.)
-      ignoreCustomFragments?: Array<RegExp>;
-
-      // Array of strings corresponding to types of script elements to process through minifier (e.g. text/ng-template, text/x-handlebars-template, etc.)
-      processScripts?: Array<string>;
-
-      // Specify a maximum line length. Compressed output will be split by newlines at valid HTML split-points
-      maxLineLength?: number;
-
-      // Arrays of regex'es that allow to support custom attribute assign expressions (e.g. '<div flex?="{{mode != cover}}"></div>')
-      customAttrAssign?: Array<RegExp>;
-
-      // Arrays of regex'es that allow to support custom attribute surround expressions (e.g. <input {{#if value}}checked="checked"{{/if}}>)
-      customAttrSurround?: Array<RegExp>;
-
-      // Regex that specifies custom attribute to strip newlines from (e.g. /ng\-class/)
-      customAttrCollapse?: RegExp;
-
-      // Type of quote to use for attribute values (' or ")
-      quoteCharacter?: string;
-    }
-  }
-
-  export = HTMLMinifier;
-}
diff --git a/html-minifier/index.d.ts b/html-minifier/index.d.ts
new file mode 100644
index 0000000000..81fc61f3af
--- /dev/null
+++ b/html-minifier/index.d.ts
@@ -0,0 +1,109 @@
+// Type definitions for HTMLMinifier v1.1.1
+// Project: https://github.com/kangax/html-minifier
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as UglifyJS from '../uglify-js';
+import * as CleanCSS from 'clean-css';
+import * as RelateUrl from 'relateurl';
+
+declare namespace HTMLMinifier {
+    function minify(text: string, options?: Options): string;
+
+    interface Options {
+        // Strip HTML comments
+        removeComments?: boolean;
+
+        // Strip HTML comments from scripts and styles
+        removeCommentsFromCDATA?: boolean;
+
+        // Remove CDATA sections from script and style elements
+        removeCDATASectionsFromCDATA?: boolean;
+
+        // Collapse white space that contributes to text nodes in a document tree
+        collapseWhitespace?: boolean;
+
+        // Always collapse to 1 space (never remove it entirely). Must be used in conjunction with collapseWhitespace=true
+        conservativeCollapse?: boolean;
+
+        // Don't leave any spaces between display:inline; elements when collapsing. Must be used in conjunction with collapseWhitespace=true
+        collapseInlineTagWhitespace?: boolean;
+
+        // Always collapse to 1 line break (never remove it entirely) when whitespace between tags include a line break. Must be used in conjunction with collapseWhitespace=true
+        preserveLineBreaks?: boolean;
+
+        // Omit attribute values from boolean attributes
+        collapseBooleanAttributes?: boolean;
+
+        // Remove quotes around attributes when possible
+        removeAttributeQuotes?: boolean;
+
+        // Remove attributes when value matches default
+        removeRedundantAttributes?: boolean;
+
+        // Prevents the escaping of the values of attributes.
+        preventAttributesEscaping?: boolean;
+
+        // Replaces the doctype with the short (HTML5) doctype
+        useShortDoctype?: boolean;
+
+        // Remove all attributes with whitespace-only values
+        removeEmptyAttributes?: boolean;
+
+        // Remove type="text/javascript" from script tags. Other type attribute values are left intact.
+        removeScriptTypeAttributes?: boolean;
+
+        // Remove type="text/css" from style and link tags. Other type attribute values are left intact.
+        removeStyleLinkTypeAttributes?: boolean;
+
+        // Remove unrequired tags
+        removeOptionalTags?: boolean;
+
+        // Remove all elements with empty contents
+        removeEmptyElements?: boolean;
+
+        // Toggle linting
+        lint?: boolean;
+
+        // Keep the trailing slash on singleton elements
+        keepClosingSlash?: boolean;
+
+        // Treat attributes in case sensitive manner (useful for custom HTML tags.)
+        caseSensitive?: boolean;
+
+        // Minify Javascript in script elements and on* attributes (uses UglifyJS)
+        minifyJS?: boolean | UglifyJS.MinifyOptions;
+
+        // Minify CSS in style elements and style attributes (uses clean-css)
+        minifyCSS?: boolean | CleanCSS.Options;
+
+        // Minify URLs in various attributes (uses relateurl)
+        minifyURLs?: boolean | RelateUrl.Options;
+
+        // Array of regex'es that allow to ignore certain comments, when matched
+        ignoreCustomComments?: Array<RegExp>;
+
+        // Array of regex'es that allow to ignore certain fragments, when matched (e.g. <?php ... ?>, {{ ... }}, etc.)
+        ignoreCustomFragments?: Array<RegExp>;
+
+        // Array of strings corresponding to types of script elements to process through minifier (e.g. text/ng-template, text/x-handlebars-template, etc.)
+        processScripts?: Array<string>;
+
+        // Specify a maximum line length. Compressed output will be split by newlines at valid HTML split-points
+        maxLineLength?: number;
+
+        // Arrays of regex'es that allow to support custom attribute assign expressions (e.g. '<div flex?="{{mode != cover}}"></div>')
+        customAttrAssign?: Array<RegExp>;
+
+        // Arrays of regex'es that allow to support custom attribute surround expressions (e.g. <input {{#if value}}checked="checked"{{/if}}>)
+        customAttrSurround?: Array<RegExp>;
+
+        // Regex that specifies custom attribute to strip newlines from (e.g. /ng\-class/)
+        customAttrCollapse?: RegExp;
+
+        // Type of quote to use for attribute values (' or ")
+        quoteCharacter?: string;
+    }
+}
+
+export = HTMLMinifier;
diff --git a/html-minifier/tsconfig.json b/html-minifier/tsconfig.json
new file mode 100644
index 0000000000..979a126ad7
--- /dev/null
+++ b/html-minifier/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "html-minifier-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/html-to-text/html-to-text-tests.ts b/html-to-text/html-to-text-tests.ts
index e49739aa10..50c3f43dab 100644
--- a/html-to-text/html-to-text-tests.ts
+++ b/html-to-text/html-to-text-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="html-to-text.d.ts" />
+
 
 import * as htmlToText from 'html-to-text';
 
diff --git a/html-to-text/html-to-text.d.ts b/html-to-text/index.d.ts
similarity index 100%
rename from html-to-text/html-to-text.d.ts
rename to html-to-text/index.d.ts
diff --git a/html-to-text/tsconfig.json b/html-to-text/tsconfig.json
new file mode 100644
index 0000000000..48cc9f0174
--- /dev/null
+++ b/html-to-text/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "html-to-text-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/html2canvas/html2canvas-tests.ts b/html2canvas/html2canvas-tests.ts
index 389e3f2860..ab9f5225ab 100644
--- a/html2canvas/html2canvas-tests.ts
+++ b/html2canvas/html2canvas-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="html2canvas.d.ts" />
+
 
 var element: HTMLElement;
 
diff --git a/html2canvas/html2canvas.d.ts b/html2canvas/html2canvas.d.ts
deleted file mode 100644
index 101815ec47..0000000000
--- a/html2canvas/html2canvas.d.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-// Type definitions for html2canvas.js v0.4.1
-// Project: https://github.com/niklasvh/html2canvas
-// Definitions by: Richard Hepburn <https://github.com/rwhepburn/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-declare namespace Html2Canvas {
-    interface Html2CanvasOptions {
-        /** Whether to allow cross-origin images to taint the canvas */
-        allowTaint?: boolean;
-
-        /** Canvas background color, if none is specified in DOM. Set undefined for transparent */
-        background?: string;
-
-        /** Define the heigt of the canvas in pixels. If null, renders with full height of the window. */
-        height?: number;
-
-        /** Whether to render each letter seperately. Necessary if letter-spacing is used. */
-        letterRendering?: boolean;
-
-        /** Whether to log events in the console. */
-        logging?: boolean;
-
-        /** Url to the proxy which is to be used for loading cross-origin images. If left empty, cross-origin images won't be loaded. */
-        proxy?: string;
-
-        /** Whether to test each image if it taints the canvas before drawing them */
-        taintTest?: boolean;
-
-        /** Timeout for loading images, in milliseconds. Setting it to 0 will result in no timeout. */
-        timeout?: number;
-
-        /** Define the width of the canvas in pixels. If null, renders with full width of the window. */
-        width?: number;
-
-        /** Whether to attempt to load cross-origin images as CORS served, before reverting back to proxy. */
-        useCORS?: boolean;
-
-        /** Callback providing the rendered canvas element after rendering */
-        onrendered?(canvas: HTMLCanvasElement): void;
-    }
-}
-
-interface Html2CanvasStatic {
-
-    /**
-      * Renders an HTML element to a canvas so that a screenshot can be generated.
-      *
-      * The screenshot is based on the DOM and as such may not be 100% accurate to the real representation as it does not make an actual screenshot,
-      * but builds the screenshot based on the information available on the page.
-      *
-      * @param {HTMLElement} element The HTML element which will be rendered to the canvas. Use the root element to render the entire window.
-      */
-    (element: HTMLElement): void;
-    /**
-      * Renders an HTML element to a canvas so that a screenshot can be generated.
-      *
-      * The screenshot is based on the DOM and as such may not be 100% accurate to the real representation as it does not make an actual screenshot,
-      * but builds the screenshot based on the information available on the page.
-      *
-      * @param {HTMLElement} element The HTML element which will be rendered to the canvas. Use the root element to render the entire window.
-      * @param {Html2CanvasOptions} options The options object that controls how the element will be rendered.
-      */
-    (element: HTMLElement, options: Html2Canvas.Html2CanvasOptions): void;
-}
-
-declare var html2canvas: Html2CanvasStatic;
diff --git a/html2canvas/index.d.ts b/html2canvas/index.d.ts
new file mode 100644
index 0000000000..8aa6759e06
--- /dev/null
+++ b/html2canvas/index.d.ts
@@ -0,0 +1,71 @@
+// Type definitions for html2canvas.js v0.4.1
+// Project: https://github.com/niklasvh/html2canvas
+// Definitions by: Richard Hepburn <https://github.com/rwhepburn/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+declare namespace Html2Canvas {
+    interface Html2CanvasOptions {
+        /** Whether to allow cross-origin images to taint the canvas */
+        allowTaint?: boolean;
+
+        /** Canvas background color, if none is specified in DOM. Set undefined for transparent */
+        background?: string;
+
+        /** Define the heigt of the canvas in pixels. If null, renders with full height of the window. */
+        height?: number;
+
+        /** Whether to render each letter seperately. Necessary if letter-spacing is used. */
+        letterRendering?: boolean;
+
+        /** Whether to log events in the console. */
+        logging?: boolean;
+
+        /** Url to the proxy which is to be used for loading cross-origin images. If left empty, cross-origin images won't be loaded. */
+        proxy?: string;
+
+        /** Whether to test each image if it taints the canvas before drawing them */
+        taintTest?: boolean;
+
+        /** Timeout for loading images, in milliseconds. Setting it to 0 will result in no timeout. */
+        timeout?: number;
+
+        /** Define the width of the canvas in pixels. If null, renders with full width of the window. */
+        width?: number;
+
+        /** Whether to attempt to load cross-origin images as CORS served, before reverting back to proxy. */
+        useCORS?: boolean;
+        
+        /** Use svg powered rendering where available (FF11+). */
+        svgRendering?: boolean;
+
+        /** Callback providing the rendered canvas element after rendering */
+        onrendered?(canvas: HTMLCanvasElement): void;
+    }
+}
+
+interface Html2CanvasStatic {
+
+    /**
+      * Renders an HTML element to a canvas so that a screenshot can be generated.
+      *
+      * The screenshot is based on the DOM and as such may not be 100% accurate to the real representation as it does not make an actual screenshot,
+      * but builds the screenshot based on the information available on the page.
+      *
+      * @param {HTMLElement} element The HTML element which will be rendered to the canvas. Use the root element to render the entire window.
+      */
+    (element: HTMLElement): void;
+    /**
+      * Renders an HTML element to a canvas so that a screenshot can be generated.
+      *
+      * The screenshot is based on the DOM and as such may not be 100% accurate to the real representation as it does not make an actual screenshot,
+      * but builds the screenshot based on the information available on the page.
+      *
+      * @param {HTMLElement} element The HTML element which will be rendered to the canvas. Use the root element to render the entire window.
+      * @param {Html2CanvasOptions} options The options object that controls how the element will be rendered.
+      */
+    (element: HTMLElement, options: Html2Canvas.Html2CanvasOptions): void;
+}
+
+declare var html2canvas: Html2CanvasStatic;
diff --git a/html2canvas/tsconfig.json b/html2canvas/tsconfig.json
new file mode 100644
index 0000000000..76e8f1d451
--- /dev/null
+++ b/html2canvas/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "html2canvas-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/htmlparser2/htmlparser2-tests.ts b/htmlparser2/htmlparser2-tests.ts
index 53f6ee2aad..21289b96f5 100644
--- a/htmlparser2/htmlparser2-tests.ts
+++ b/htmlparser2/htmlparser2-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="htmlparser2.d.ts"/>
 /**
  * Created by staticfunction on 8/4/14.
  */
diff --git a/htmlparser2/htmlparser2.d.ts b/htmlparser2/htmlparser2.d.ts
deleted file mode 100644
index e139eee696..0000000000
--- a/htmlparser2/htmlparser2.d.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-// Type definitions for htmlparser2 v3.7.x
-// Project: https://github.com/fb55/htmlparser2/
-// Definitions by: James Roland Cabresos <https://github.com/staticfunction/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-declare module "htmlparser2" {
-
-    export interface Handler {
-        onopentag?:(name:string, attribs:{[type:string]: string}) => void;
-        onopentagname?:(name:string) => void;
-        onattribute?:(name:string, value:string) => void;
-        ontext?:(text:string) => void;
-        onclosetag?: (text:string) => void;
-        onprocessinginstruction?:(name:string, data:string) => void;
-        oncomment?:(data:string) => void;
-        oncommentend?:() => void;
-        oncdatastart?:() => void;
-        oncdataend?:() => void;
-        onerror?:(error:Error) => void;
-        onreset?:() => void;
-        onend?:() => void;
-    }
-
-    export interface Options {
-
-        /***
-         * Indicates whether special tags (<script> and <style>) should get special treatment
-         * and if "empty" tags (eg. <br>) can have children.  If false, the content of special tags
-         * will be text only. For feeds and other XML content (documents that don't consist of HTML),
-         * set this to true. Default: false.
-         */
-        xmlMode?:boolean;
-
-        /***
-         * If set to true, entities within the document will be decoded. Defaults to false.
-         */
-        decodeEntities?:boolean;
-
-        /***
-         * If set to true, all tags will be lowercased. If xmlMode is disabled, this defaults to true.
-         */
-        lowerCaseTags?:boolean;
-
-        /***
-         * If set to true, all attribute names will be lowercased. This has noticeable impact on speed, so it defaults to false.
-         */
-        lowerCaseAttributeNames?:boolean;
-
-        /***
-         * If set to true, CDATA sections will be recognized as text even if the xmlMode option is not enabled.
-         * NOTE: If xmlMode is set to true then CDATA sections will always be recognized as text.
-         */
-        recognizeCDATA?:boolean;
-
-        /***
-         * If set to true, self-closing tags will trigger the onclosetag event even if xmlMode is not set to true.
-         * NOTE: If xmlMode is set to true then self-closing tags will always be recognized.
-         */
-        recognizeSelfClosing?:boolean;
-    }
-
-    export class Parser {
-        constructor(handler: Handler, options?: Options);
-
-        /***
-         * Parses a chunk of data and calls the corresponding callbacks.
-         * @param input
-         */
-        write(input:string):void;
-        /***
-         * alias for backwards compat
-         */
-        parseChunk(input:string):void;
-
-        /***
-         * Parses the end of the buffer and clears the stack, calls onend.
-         */
-        end():void;
-        /***
-         * alias for backwards compat
-         */
-        done():void;
-
-
-        /***
-         * Resets the parser, parses the data & calls end.
-         * @param input
-         */
-        parseComplete(input:string):void;
-
-        /***
-         * Resets buffer & stack, calls onreset.
-         */
-        reset():void;
-    }
-}
diff --git a/htmlparser2/index.d.ts b/htmlparser2/index.d.ts
new file mode 100644
index 0000000000..b53bbbb15e
--- /dev/null
+++ b/htmlparser2/index.d.ts
@@ -0,0 +1,96 @@
+// Type definitions for htmlparser2 v3.7.x
+// Project: https://github.com/fb55/htmlparser2/
+// Definitions by: James Roland Cabresos <https://github.com/staticfunction/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+
+export interface Handler {
+    onopentag?: (name: string, attribs: { [type: string]: string }) => void;
+    onopentagname?: (name: string) => void;
+    onattribute?: (name: string, value: string) => void;
+    ontext?: (text: string) => void;
+    onclosetag?: (text: string) => void;
+    onprocessinginstruction?: (name: string, data: string) => void;
+    oncomment?: (data: string) => void;
+    oncommentend?: () => void;
+    oncdatastart?: () => void;
+    oncdataend?: () => void;
+    onerror?: (error: Error) => void;
+    onreset?: () => void;
+    onend?: () => void;
+}
+
+export interface Options {
+
+    /***
+     * Indicates whether special tags (<script> and <style>) should get special treatment
+     * and if "empty" tags (eg. <br>) can have children.  If false, the content of special tags
+     * will be text only. For feeds and other XML content (documents that don't consist of HTML),
+     * set this to true. Default: false.
+     */
+    xmlMode?: boolean;
+
+    /***
+     * If set to true, entities within the document will be decoded. Defaults to false.
+     */
+    decodeEntities?: boolean;
+
+    /***
+     * If set to true, all tags will be lowercased. If xmlMode is disabled, this defaults to true.
+     */
+    lowerCaseTags?: boolean;
+
+    /***
+     * If set to true, all attribute names will be lowercased. This has noticeable impact on speed, so it defaults to false.
+     */
+    lowerCaseAttributeNames?: boolean;
+
+    /***
+     * If set to true, CDATA sections will be recognized as text even if the xmlMode option is not enabled.
+     * NOTE: If xmlMode is set to true then CDATA sections will always be recognized as text.
+     */
+    recognizeCDATA?: boolean;
+
+    /***
+     * If set to true, self-closing tags will trigger the onclosetag event even if xmlMode is not set to true.
+     * NOTE: If xmlMode is set to true then self-closing tags will always be recognized.
+     */
+    recognizeSelfClosing?: boolean;
+}
+
+export declare class Parser {
+    constructor(handler: Handler, options?: Options);
+
+    /***
+     * Parses a chunk of data and calls the corresponding callbacks.
+     * @param input
+     */
+    write(input: string): void;
+    /***
+     * alias for backwards compat
+     */
+    parseChunk(input: string): void;
+
+    /***
+     * Parses the end of the buffer and clears the stack, calls onend.
+     */
+    end(): void;
+    /***
+     * alias for backwards compat
+     */
+    done(): void;
+
+
+    /***
+     * Resets the parser, parses the data & calls end.
+     * @param input
+     */
+    parseComplete(input: string): void;
+
+    /***
+     * Resets buffer & stack, calls onreset.
+     */
+    reset(): void;
+}
diff --git a/htmlparser2/tsconfig.json b/htmlparser2/tsconfig.json
new file mode 100644
index 0000000000..f3404d8e80
--- /dev/null
+++ b/htmlparser2/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "htmlparser2-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/htmltojsx/htmltojsx-tests.ts b/htmltojsx/htmltojsx-tests.ts
index 052ae8baa4..5f13815f6d 100644
--- a/htmltojsx/htmltojsx-tests.ts
+++ b/htmltojsx/htmltojsx-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="htmltojsx.d.ts"/>
 import HTMLtoJSX = require("htmltojsx");
 var converter = new HTMLtoJSX({
   createClass: true,
diff --git a/htmltojsx/htmltojsx.d.ts b/htmltojsx/htmltojsx.d.ts
deleted file mode 100644
index 7fb29fd636..0000000000
--- a/htmltojsx/htmltojsx.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for htmltojsx
-// Project: https://www.npmjs.com/package/htmltojsx
-// Definitions by: Basarat Ali Syed <https://github.com/basarat>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'htmltojsx' {
-    class HTMLtoJSX {
-        constructor(options?: {
-            createClass?: boolean;
-            outputClassName?: string;
-            /** as a string e.g. '    ' or '\t' */
-            indent?: string;
-        });
-        convert(html: string): string;
-    }
-    export = HTMLtoJSX;
-}
diff --git a/htmltojsx/index.d.ts b/htmltojsx/index.d.ts
new file mode 100644
index 0000000000..6a1362ccfe
--- /dev/null
+++ b/htmltojsx/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for htmltojsx
+// Project: https://www.npmjs.com/package/htmltojsx
+// Definitions by: Basarat Ali Syed <https://github.com/basarat>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare class HTMLtoJSX {
+    constructor(options?: {
+        createClass?: boolean;
+        outputClassName?: string;
+        /** as a string e.g. '    ' or '\t' */
+        indent?: string;
+    });
+    convert(html: string): string;
+}
+export = HTMLtoJSX;
diff --git a/htmltojsx/tsconfig.json b/htmltojsx/tsconfig.json
new file mode 100644
index 0000000000..6b0ccfe3e0
--- /dev/null
+++ b/htmltojsx/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "htmltojsx-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/http-errors/http-errors-tests.ts b/http-errors/http-errors-tests.ts
index 4403259008..2ad5817d44 100644
--- a/http-errors/http-errors-tests.ts
+++ b/http-errors/http-errors-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="http-errors.d.ts" />
-/// <reference path="../express/express.d.ts" />
 
 import * as createError from 'http-errors';
 import * as express from 'express';
diff --git a/http-errors/http-errors.d.ts b/http-errors/http-errors.d.ts
deleted file mode 100644
index 48d7469ba4..0000000000
--- a/http-errors/http-errors.d.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-// Type definitions for http-errors v1.3.1
-// Project: https://github.com/jshttp/http-errors
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'http-errors' {
-    namespace createHttpError {
-
-      // See https://github.com/jshttp/http-errors/blob/1.3.1/index.js#L42
-      interface HttpError extends Error {
-          status: number;
-          statusCode: number;
-          expose: boolean;
-      }
-
-      interface CreateHttpError {
-          // See https://github.com/Microsoft/TypeScript/issues/227#issuecomment-50092674
-          [code: string]: new() => HttpError;
-
-          (...args: Array<Error | string | number | Object>): HttpError;
-
-          Continue: new() => HttpError;
-          SwitchingProtocols: new() => HttpError;
-          Processing: new() => HttpError;
-          OK: new() => HttpError;
-          Created: new() => HttpError;
-          Accepted: new() => HttpError;
-          NonAuthoritativeInformation: new() => HttpError;
-          NoContent: new() => HttpError;
-          ResetContent: new() => HttpError;
-          PartialContent: new() => HttpError;
-          MultiStatus: new() => HttpError;
-          AlreadyReported: new() => HttpError;
-          IMUsed: new() => HttpError;
-          MultipleChoices: new() => HttpError;
-          MovedPermanently: new() => HttpError;
-          Found: new() => HttpError;
-          SeeOther: new() => HttpError;
-          NotModified: new() => HttpError;
-          UseProxy: new() => HttpError;
-          Unused: new() => HttpError;
-          TemporaryRedirect: new() => HttpError;
-          PermanentRedirect: new() => HttpError;
-          BadRequest: new() => HttpError;
-          Unauthorized: new() => HttpError;
-          PaymentRequired: new() => HttpError;
-          Forbidden: new() => HttpError;
-          NotFound: new() => HttpError;
-          MethodNotAllowed: new() => HttpError;
-          NotAcceptable: new() => HttpError;
-          ProxyAuthenticationRequired: new() => HttpError;
-          RequestTimeout: new() => HttpError;
-          Conflict: new() => HttpError;
-          Gone: new() => HttpError;
-          LengthRequired: new() => HttpError;
-          PreconditionFailed: new() => HttpError;
-          PayloadTooLarge: new() => HttpError;
-          URITooLong: new() => HttpError;
-          UnsupportedMediaType: new() => HttpError;
-          RangeNotSatisfiable: new() => HttpError;
-          ExpectationFailed: new() => HttpError;
-          ImATeapot: new() => HttpError;
-          UnprocessableEntity: new() => HttpError;
-          Locked: new() => HttpError;
-          FailedDependency: new() => HttpError;
-          UnorderedCollection: new() => HttpError;
-          UpgradeRequired: new() => HttpError;
-          PreconditionRequired: new() => HttpError;
-          TooManyRequests: new() => HttpError;
-          RequestHeaderFieldsTooLarge: new() => HttpError;
-          UnavailableForLegalReasons: new() => HttpError;
-          InternalServerError: new() => HttpError;
-          NotImplemented: new() => HttpError;
-          BadGateway: new() => HttpError;
-          ServiceUnavailable: new() => HttpError;
-          GatewayTimeout: new() => HttpError;
-          HTTPVersionNotSupported: new() => HttpError;
-          VariantAlsoNegotiates: new() => HttpError;
-          InsufficientStorage: new() => HttpError;
-          LoopDetected: new() => HttpError;
-          BandwidthLimitExceeded: new() => HttpError;
-          NotExtended: new() => HttpError;
-          NetworkAuthenticationRequired: new() => HttpError;
-      }
-    }
-
-    var createHttpError: createHttpError.CreateHttpError;
-    export = createHttpError;
-}
diff --git a/http-errors/index.d.ts b/http-errors/index.d.ts
new file mode 100644
index 0000000000..199a521b06
--- /dev/null
+++ b/http-errors/index.d.ts
@@ -0,0 +1,88 @@
+// Type definitions for http-errors v1.3.1
+// Project: https://github.com/jshttp/http-errors
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare namespace createHttpError {
+
+    // See https://github.com/jshttp/http-errors/blob/1.3.1/index.js#L42
+    interface HttpError extends Error {
+        status: number;
+        statusCode: number;
+        expose: boolean;
+    }
+
+    interface CreateHttpError {
+        // See https://github.com/Microsoft/TypeScript/issues/227#issuecomment-50092674
+        [code: string]: new () => HttpError;
+
+        (...args: Array<Error | string | number | Object>): HttpError;
+
+        Continue: new () => HttpError;
+        SwitchingProtocols: new () => HttpError;
+        Processing: new () => HttpError;
+        OK: new () => HttpError;
+        Created: new () => HttpError;
+        Accepted: new () => HttpError;
+        NonAuthoritativeInformation: new () => HttpError;
+        NoContent: new () => HttpError;
+        ResetContent: new () => HttpError;
+        PartialContent: new () => HttpError;
+        MultiStatus: new () => HttpError;
+        AlreadyReported: new () => HttpError;
+        IMUsed: new () => HttpError;
+        MultipleChoices: new () => HttpError;
+        MovedPermanently: new () => HttpError;
+        Found: new () => HttpError;
+        SeeOther: new () => HttpError;
+        NotModified: new () => HttpError;
+        UseProxy: new () => HttpError;
+        Unused: new () => HttpError;
+        TemporaryRedirect: new () => HttpError;
+        PermanentRedirect: new () => HttpError;
+        BadRequest: new () => HttpError;
+        Unauthorized: new () => HttpError;
+        PaymentRequired: new () => HttpError;
+        Forbidden: new () => HttpError;
+        NotFound: new () => HttpError;
+        MethodNotAllowed: new () => HttpError;
+        NotAcceptable: new () => HttpError;
+        ProxyAuthenticationRequired: new () => HttpError;
+        RequestTimeout: new () => HttpError;
+        Conflict: new () => HttpError;
+        Gone: new () => HttpError;
+        LengthRequired: new () => HttpError;
+        PreconditionFailed: new () => HttpError;
+        PayloadTooLarge: new () => HttpError;
+        URITooLong: new () => HttpError;
+        UnsupportedMediaType: new () => HttpError;
+        RangeNotSatisfiable: new () => HttpError;
+        ExpectationFailed: new () => HttpError;
+        ImATeapot: new () => HttpError;
+        UnprocessableEntity: new () => HttpError;
+        Locked: new () => HttpError;
+        FailedDependency: new () => HttpError;
+        UnorderedCollection: new () => HttpError;
+        UpgradeRequired: new () => HttpError;
+        PreconditionRequired: new () => HttpError;
+        TooManyRequests: new () => HttpError;
+        RequestHeaderFieldsTooLarge: new () => HttpError;
+        UnavailableForLegalReasons: new () => HttpError;
+        InternalServerError: new () => HttpError;
+        NotImplemented: new () => HttpError;
+        BadGateway: new () => HttpError;
+        ServiceUnavailable: new () => HttpError;
+        GatewayTimeout: new () => HttpError;
+        HTTPVersionNotSupported: new () => HttpError;
+        VariantAlsoNegotiates: new () => HttpError;
+        InsufficientStorage: new () => HttpError;
+        LoopDetected: new () => HttpError;
+        BandwidthLimitExceeded: new () => HttpError;
+        NotExtended: new () => HttpError;
+        NetworkAuthenticationRequired: new () => HttpError;
+    }
+}
+
+declare var createHttpError: createHttpError.CreateHttpError;
+export = createHttpError;
diff --git a/http-errors/tsconfig.json b/http-errors/tsconfig.json
new file mode 100644
index 0000000000..65db477561
--- /dev/null
+++ b/http-errors/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "http-errors-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/http-status-codes/http-status-codes-tests.ts b/http-status-codes/http-status-codes-tests.ts
index 02c2a104b6..8f0e3aae2c 100644
--- a/http-status-codes/http-status-codes-tests.ts
+++ b/http-status-codes/http-status-codes-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="http-status-codes.d.ts"/>
-
 import HttpStatusCodes = require("http-status-codes");
 
 var ACCEPTED = HttpStatusCodes.ACCEPTED;
diff --git a/http-status-codes/http-status-codes.d.ts b/http-status-codes/http-status-codes.d.ts
deleted file mode 100644
index ebea4d75bc..0000000000
--- a/http-status-codes/http-status-codes.d.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-// Type definitions for Node.JS package http-status-codes v1.0.5
-// Project: https://github.com/prettymuchbryce/node-http-status
-// Definitions by: Josh McCullough <https://github.com/JoshMcCullough>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "http-status-codes" {
-    export var ACCEPTED: number;
-    export var BAD_GATEWAY: number;
-    export var BAD_REQUEST: number;
-    export var CONFLICT: number;
-    export var CONTINUE: number;
-    export var CREATED: number;
-    export var EXPECTATION_FAILED: number;
-    export var FAILED_DEPENDENCY: number;
-    export var FORBIDDEN: number;
-    export var GATEWAY_TIMEOUT: number;
-    export var GONE: number;
-    export var HTTP_VERSION_NOT_SUPPORTED: number;
-    export var INSUFFICIENT_SPACE_ON_RESOURCE: number;
-    export var INSUFFICIENT_STORAGE: number;
-    export var INTERNAL_SERVER_ERROR: number;
-    export var LENGTH_REQUIRED: number;
-    export var LOCKED: number;
-    export var METHOD_FAILURE: number;
-    export var METHOD_NOT_ALLOWED: number;
-    export var MOVED_PERMANENTLY: number;
-    export var MOVED_TEMPORARILY: number;
-    export var MULTI_STATUS: number;
-    export var MULTIPLE_CHOICES: number;
-    export var NETWORK_AUTHENTICATION_REQUIRED: number;
-    export var NO_CONTENT: number;
-    export var NON_AUTHORITATIVE_INFORMATION: number;
-    export var NOT_ACCEPTABLE: number;
-    export var NOT_FOUND: number;
-    export var NOT_IMPLEMENTED: number;
-    export var NOT_MODIFIED: number;
-    export var OK: number;
-    export var PARTIAL_CONTENT: number;
-    export var PAYMENT_REQUIRED: number;
-    export var PRECONDITION_FAILED: number;
-    export var PRECONDITION_REQUIRED: number;
-    export var PROCESSING: number;
-    export var PROXY_AUTHENTICATION_REQUIRED: number;
-    export var REQUEST_HEADER_FIELDS_TOO_LARGE: number;
-    export var REQUEST_TIMEOUT: number;
-    export var REQUEST_TOO_LONG: number;
-    export var REQUEST_URI_TOO_LONG: number;
-    export var REQUESTED_RANGE_NOT_SATISFIABLE: number;
-    export var RESET_CONTENT: number;
-    export var SEE_OTHER: number;
-    export var SERVICE_UNAVAILABLE: number;
-    export var SWITCHING_PROTOCOLS: number;
-    export var TEMPORARY_REDIRECT: number;
-    export var TOO_MANY_REQUESTS: number;
-    export var UNAUTHORIZED: number;
-    export var UNPROCESSABLE_ENTITY: number;
-    export var UNSUPPORTED_MEDIA_TYPE: number;
-    export var USE_PROXY: number;
-    
-    export function getStatusText(statusCode: number): string;
-}
\ No newline at end of file
diff --git a/http-status-codes/index.d.ts b/http-status-codes/index.d.ts
new file mode 100644
index 0000000000..082ce9b767
--- /dev/null
+++ b/http-status-codes/index.d.ts
@@ -0,0 +1,60 @@
+// Type definitions for Node.JS package http-status-codes v1.0.5
+// Project: https://github.com/prettymuchbryce/node-http-status
+// Definitions by: Josh McCullough <https://github.com/JoshMcCullough>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export declare var ACCEPTED: number;
+export declare var BAD_GATEWAY: number;
+export declare var BAD_REQUEST: number;
+export declare var CONFLICT: number;
+export declare var CONTINUE: number;
+export declare var CREATED: number;
+export declare var EXPECTATION_FAILED: number;
+export declare var FAILED_DEPENDENCY: number;
+export declare var FORBIDDEN: number;
+export declare var GATEWAY_TIMEOUT: number;
+export declare var GONE: number;
+export declare var HTTP_VERSION_NOT_SUPPORTED: number;
+export declare var INSUFFICIENT_SPACE_ON_RESOURCE: number;
+export declare var INSUFFICIENT_STORAGE: number;
+export declare var INTERNAL_SERVER_ERROR: number;
+export declare var LENGTH_REQUIRED: number;
+export declare var LOCKED: number;
+export declare var METHOD_FAILURE: number;
+export declare var METHOD_NOT_ALLOWED: number;
+export declare var MOVED_PERMANENTLY: number;
+export declare var MOVED_TEMPORARILY: number;
+export declare var MULTI_STATUS: number;
+export declare var MULTIPLE_CHOICES: number;
+export declare var NETWORK_AUTHENTICATION_REQUIRED: number;
+export declare var NO_CONTENT: number;
+export declare var NON_AUTHORITATIVE_INFORMATION: number;
+export declare var NOT_ACCEPTABLE: number;
+export declare var NOT_FOUND: number;
+export declare var NOT_IMPLEMENTED: number;
+export declare var NOT_MODIFIED: number;
+export declare var OK: number;
+export declare var PARTIAL_CONTENT: number;
+export declare var PAYMENT_REQUIRED: number;
+export declare var PRECONDITION_FAILED: number;
+export declare var PRECONDITION_REQUIRED: number;
+export declare var PROCESSING: number;
+export declare var PROXY_AUTHENTICATION_REQUIRED: number;
+export declare var REQUEST_HEADER_FIELDS_TOO_LARGE: number;
+export declare var REQUEST_TIMEOUT: number;
+export declare var REQUEST_TOO_LONG: number;
+export declare var REQUEST_URI_TOO_LONG: number;
+export declare var REQUESTED_RANGE_NOT_SATISFIABLE: number;
+export declare var RESET_CONTENT: number;
+export declare var SEE_OTHER: number;
+export declare var SERVICE_UNAVAILABLE: number;
+export declare var SWITCHING_PROTOCOLS: number;
+export declare var TEMPORARY_REDIRECT: number;
+export declare var TOO_MANY_REQUESTS: number;
+export declare var UNAUTHORIZED: number;
+export declare var UNPROCESSABLE_ENTITY: number;
+export declare var UNSUPPORTED_MEDIA_TYPE: number;
+export declare var USE_PROXY: number;
+
+export declare function getStatusText(statusCode: number): string;
diff --git a/http-status-codes/tsconfig.json b/http-status-codes/tsconfig.json
new file mode 100644
index 0000000000..330fa4486f
--- /dev/null
+++ b/http-status-codes/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "http-status-codes-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/http-status/http-status-tests.ts b/http-status/http-status-tests.ts
index 8717e99c3a..f52547bca2 100644
--- a/http-status/http-status-tests.ts
+++ b/http-status/http-status-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="http-status.d.ts" />
+
 
 import httpStatus = require('http-status');
 
@@ -39,7 +39,9 @@ str = httpStatus[414];
 str = httpStatus[415];
 str = httpStatus[416];
 str = httpStatus[417];
+str = httpStatus[422];
 str = httpStatus[429];
+str = httpStatus[451];
 str = httpStatus[500];
 str = httpStatus[501];
 str = httpStatus[502];
@@ -82,7 +84,9 @@ nmr = httpStatus.REQUEST_URI_TOO_LONG;
 nmr = httpStatus.UNSUPPORTED_MEDIA_TYPE;
 nmr = httpStatus.REQUESTED_RANGE_NOT_SATISFIABLE;
 nmr = httpStatus.EXPECTATION_FAILED;
+nmr = httpStatus.UNPROCESSABLE_ENTITY;
 nmr = httpStatus.TOO_MANY_REQUESTS;
+nmr = httpStatus.UNAVAILABLE_FOR_LEGAL_REASONS;
 nmr = httpStatus.INTERNAL_SERVER_ERROR;
 nmr = httpStatus.NOT_IMPLEMENTED;
 nmr = httpStatus.BAD_GATEWAY;
diff --git a/http-status/http-status.d.ts b/http-status/http-status.d.ts
deleted file mode 100644
index d3b12582e4..0000000000
--- a/http-status/http-status.d.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-// Type definitions for http-status v0.1.8
-// Project: https://github.com/wdavidw/node-http-status
-// Definitions by: Michael Zabka <https://github.com/misak113/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface HttpStatus {
-	100: string;
-	101: string;
-	200: string;
-	201: string;
-	202: string;
-	203: string;
-	204: string;
-	205: string;
-	206: string;
-	300: string;
-	301: string;
-	302: string;
-	303: string;
-	304: string;
-	305: string;
-	307: string;
-	400: string;
-	401: string;
-	402: string;
-	403: string;
-	404: string;
-	405: string;
-	406: string;
-	407: string;
-	408: string;
-	409: string;
-	410: string;
-	411: string;
-	412: string;
-	413: string;
-	414: string;
-	415: string;
-	416: string;
-	417: string;
-	429: string;
-	500: string;
-	501: string;
-	502: string;
-	503: string;
-	504: string;
-	505: string;
-	CONTINUE: number;
-	SWITCHING_PROTOCOLS: number;
-	OK: number;
-	CREATED: number;
-	ACCEPTED: number;
-	NON_AUTHORITATIVE_INFORMATION: number;
-	NO_CONTENT: number;
-	RESET_CONTENT: number;
-	PARTIAL_CONTENT: number;
-	MULTIPLE_CHOICES: number;
-	MOVED_PERMANENTLY: number;
-	FOUND: number;
-	SEE_OTHER: number;
-	NOT_MODIFIED: number;
-	USE_PROXY: number;
-	TEMPORARY_REDIRECT: number;
-	BAD_REQUEST: number;
-	UNAUTHORIZED: number;
-	PAYMENT_REQUIRED: number;
-	FORBIDDEN: number;
-	NOT_FOUND: number;
-	METHOD_NOT_ALLOWED: number;
-	NOT_ACCEPTABLE: number;
-	PROXY_AUTHENTICATION_REQUIRED: number;
-	REQUEST_TIMEOUT: number;
-	CONFLICT: number;
-	GONE: number;
-	LENGTH_REQUIRED: number;
-	PRECONDITION_FAILED: number;
-	REQUEST_ENTITY_TOO_LARGE: number;
-	REQUEST_URI_TOO_LONG: number;
-	UNSUPPORTED_MEDIA_TYPE: number;
-	REQUESTED_RANGE_NOT_SATISFIABLE: number;
-	EXPECTATION_FAILED: number;
-	TOO_MANY_REQUESTS: number;
-	INTERNAL_SERVER_ERROR: number;
-	NOT_IMPLEMENTED: number;
-	BAD_GATEWAY: number;
-	SERVICE_UNAVAILABLE: number;
-	GATEWAY_TIMEOUT: number;
-	HTTP_VERSION_NOT_SUPPORTED: number
-}
-
-declare var httpStatus: HttpStatus;
-
-declare module 'http-status' {
-	export = httpStatus;
-}
diff --git a/http-status/index.d.ts b/http-status/index.d.ts
new file mode 100644
index 0000000000..4beb5aed83
--- /dev/null
+++ b/http-status/index.d.ts
@@ -0,0 +1,99 @@
+// Type definitions for http-status v0.2.1
+// Project: https://github.com/wdavidw/node-http-status
+// Definitions by: Michael Zabka <https://github.com/misak113/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface HttpStatus {
+	100: string;
+	101: string;
+	200: string;
+	201: string;
+	202: string;
+	203: string;
+	204: string;
+	205: string;
+	206: string;
+	300: string;
+	301: string;
+	302: string;
+	303: string;
+	304: string;
+	305: string;
+	307: string;
+	400: string;
+	401: string;
+	402: string;
+	403: string;
+	404: string;
+	405: string;
+	406: string;
+	407: string;
+	408: string;
+	409: string;
+	410: string;
+	411: string;
+	412: string;
+	413: string;
+	414: string;
+	415: string;
+	416: string;
+	417: string;
+	422: string;
+	429: string;
+	451: string;
+	500: string;
+	501: string;
+	502: string;
+	503: string;
+	504: string;
+	505: string;
+	CONTINUE: number;
+	SWITCHING_PROTOCOLS: number;
+	OK: number;
+	CREATED: number;
+	ACCEPTED: number;
+	NON_AUTHORITATIVE_INFORMATION: number;
+	NO_CONTENT: number;
+	RESET_CONTENT: number;
+	PARTIAL_CONTENT: number;
+	MULTIPLE_CHOICES: number;
+	MOVED_PERMANENTLY: number;
+	FOUND: number;
+	SEE_OTHER: number;
+	NOT_MODIFIED: number;
+	USE_PROXY: number;
+	TEMPORARY_REDIRECT: number;
+	BAD_REQUEST: number;
+	UNAUTHORIZED: number;
+	PAYMENT_REQUIRED: number;
+	FORBIDDEN: number;
+	NOT_FOUND: number;
+	METHOD_NOT_ALLOWED: number;
+	NOT_ACCEPTABLE: number;
+	PROXY_AUTHENTICATION_REQUIRED: number;
+	REQUEST_TIMEOUT: number;
+	CONFLICT: number;
+	GONE: number;
+	LENGTH_REQUIRED: number;
+	PRECONDITION_FAILED: number;
+	REQUEST_ENTITY_TOO_LARGE: number;
+	REQUEST_URI_TOO_LONG: number;
+	UNSUPPORTED_MEDIA_TYPE: number;
+	REQUESTED_RANGE_NOT_SATISFIABLE: number;
+	EXPECTATION_FAILED: number;
+	UNPROCESSABLE_ENTITY: number;
+	TOO_MANY_REQUESTS: number;
+	UNAVAILABLE_FOR_LEGAL_REASONS: number;
+	INTERNAL_SERVER_ERROR: number;
+	NOT_IMPLEMENTED: number;
+	BAD_GATEWAY: number;
+	SERVICE_UNAVAILABLE: number;
+	GATEWAY_TIMEOUT: number;
+	HTTP_VERSION_NOT_SUPPORTED: number
+}
+
+declare var httpStatus: HttpStatus;
+
+declare module 'http-status' {
+	export = httpStatus;
+}
diff --git a/http-status/tsconfig.json b/http-status/tsconfig.json
new file mode 100644
index 0000000000..40c8aeb97f
--- /dev/null
+++ b/http-status/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "http-status-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/http-string-parser/http-string-parser-tests.ts b/http-string-parser/http-string-parser-tests.ts
index db3686e712..4d7526dc49 100644
--- a/http-string-parser/http-string-parser-tests.ts
+++ b/http-string-parser/http-string-parser-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="http-string-parser.d.ts" />
-
-import parser = require("http-string-parser");
+import parser = require("http-string-parser");
 
 function test_request(): void {
     var result = parser.parseRequest("HTTP/1.1 GET /\r\nHost: www.example.com\r\n\r\n");
diff --git a/http-string-parser/http-string-parser.d.ts b/http-string-parser/http-string-parser.d.ts
deleted file mode 100644
index 96e6b85f88..0000000000
--- a/http-string-parser/http-string-parser.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// Type definitions for http-string-parser
-// Project: https://github.com/apiaryio/http-string-parser
-// Definitions by: MIZUNE Pine <https://github.com/pine613>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "http-string-parser" {
-    interface ParseRequestResult {
-        method: string;
-        uri: string;
-        headers: { [key: string]: string };
-        body: string;
-    }
-
-    interface ParseResponseResult {
-        statusCode: string;
-        statusMessage: string;
-        headers: { [key: string]: string };
-        body: string;
-    }
-
-    interface ParseRequestLineResult {
-        method: string;
-        uri: string;
-        protocol: string;
-    }
-
-    interface ParseStatusLineResult {
-        protocol: string;
-        statusCode: string;
-        statusMessage: string;
-    }
-
-    export function parseRequest(requestString: string): ParseRequestResult;
-    export function parseResponse(responseString: string): ParseResponseResult;
-    export function parseRequestLine(requestLineString: string): ParseRequestLineResult;
-    export function parseStatusLine(statusLine: string): ParseStatusLineResult;
-    export function parseHeaders(headerLines: string[]): { [key: string]: string };
-}
diff --git a/http-string-parser/index.d.ts b/http-string-parser/index.d.ts
new file mode 100644
index 0000000000..cf844edbd2
--- /dev/null
+++ b/http-string-parser/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for http-string-parser
+// Project: https://github.com/apiaryio/http-string-parser
+// Definitions by: MIZUNE Pine <https://github.com/pine613>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface ParseRequestResult {
+    method: string;
+    uri: string;
+    headers: { [key: string]: string };
+    body: string;
+}
+
+interface ParseResponseResult {
+    statusCode: string;
+    statusMessage: string;
+    headers: { [key: string]: string };
+    body: string;
+}
+
+interface ParseRequestLineResult {
+    method: string;
+    uri: string;
+    protocol: string;
+}
+
+interface ParseStatusLineResult {
+    protocol: string;
+    statusCode: string;
+    statusMessage: string;
+}
+
+export declare function parseRequest(requestString: string): ParseRequestResult;
+export declare function parseResponse(responseString: string): ParseResponseResult;
+export declare function parseRequestLine(requestLineString: string): ParseRequestLineResult;
+export declare function parseStatusLine(statusLine: string): ParseStatusLineResult;
+export declare function parseHeaders(headerLines: string[]): { [key: string]: string };
diff --git a/http-string-parser/tsconfig.json b/http-string-parser/tsconfig.json
new file mode 100644
index 0000000000..b4de8ef188
--- /dev/null
+++ b/http-string-parser/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "http-string-parser-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/httperr/httperr-tests.ts b/httperr/httperr-tests.ts
index 131ec4dab8..e0b186549a 100644
--- a/httperr/httperr-tests.ts
+++ b/httperr/httperr-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="httperr.d.ts" />
-import httperr = require('httperr');
-
+import httperr = require('httperr');
 
 // ----------------------------------------
 // Basic usage example from: https://github.com/pluma/httperr/blob/1.0.0/README.md
@@ -15,7 +13,6 @@ console.log(err);
   message: 'The path "/example" could not be resolved'
 }
 */
-throw err;
 /*
 NotFound: The path "/example" could not be resolved
     at ...
diff --git a/httperr/httperr.d.ts b/httperr/httperr.d.ts
deleted file mode 100644
index e058e4a7a5..0000000000
--- a/httperr/httperr.d.ts
+++ /dev/null
@@ -1,292 +0,0 @@
-// Type definitions for httperr v1.0.0
-// Project: https://github.com/pluma/httperr
-// Definitions by: Troy Gerwien <https://github.com/yortus>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "httperr" {
-
-    /** Overall module shape, expressed as an interface. */
-    interface HttpErr {
-
-        /** The base type for all httperr error types. You probably don't want to use this directly. */
-        HttpError: HttpErrorStatic;
-
-        /**
-         * Creates a new error type for the given HTTP error status.
-         * @param {number} status - The HTTP response status code for the HTTP error.
-         * @param {string} title - A human-readable title for the HTTP error.
-         * @param {Function} init - (optional) A function which will be invoked as a method of the
-         *                          new error with the config argument immediately after the error
-         *                          is created by the factory. Can be used to process additional
-         *                          error-specific configuration parameters.
-         */
-        createHttpError(status: number, title: string, init?: (config: Config) => void): HttpErrorStatic;
-
-        // Error builders by camel-cased name.
-        badRequest: ErrorBuilder;
-        unauthorized: ErrorBuilder;
-        paymentRequired: ErrorBuilder;
-        forbidden: ErrorBuilder;
-        notFound: ErrorBuilder;
-        methodNotAllowed: ErrorBuilder;
-        notAcceptable: ErrorBuilder;
-        proxyAuthenticationRequired: ErrorBuilder;
-        requestTimeout: ErrorBuilder;
-        conflict: ErrorBuilder;
-        gone: ErrorBuilder;
-        lengthRequired: ErrorBuilder;
-        preconditionFailed: ErrorBuilder;
-        requestEntityTooLarge: ErrorBuilder;
-        requestUriTooLong: ErrorBuilder;
-        unsupportedMediaType: ErrorBuilder;
-        requestedRangeNotSatisfiable: ErrorBuilder;
-        expectationFailed: ErrorBuilder;
-        imATeapot: ErrorBuilder;
-        authenticationTimeout: ErrorBuilder;
-        enhanceYourCalm: ErrorBuilder;
-        unprocessableEntity: ErrorBuilder;
-        locked: ErrorBuilder;
-        methodFailure: ErrorBuilder;
-        failedDependency: ErrorBuilder;
-        unorderedCollection: ErrorBuilder;
-        upgradeRequired: ErrorBuilder;
-        preconditionRequired: ErrorBuilder;
-        tooManyRequests: ErrorBuilder;
-        requestHeaderFieldsTooLarge: ErrorBuilder;
-        loginTimeout: ErrorBuilder;
-        noResponse: ErrorBuilder;
-        retryWith: ErrorBuilder;
-        blockedByWindowsParentalControls: ErrorBuilder;
-        redirect: ErrorBuilder;
-        unavailableForLegalReasons: ErrorBuilder;
-        requestHeaderTooLarge: ErrorBuilder;
-        certError: ErrorBuilder;
-        noCert: ErrorBuilder;
-        httpToHttps: ErrorBuilder;
-        clientClosedRequest: ErrorBuilder;
-        internalServerError: ErrorBuilder;
-        notImplemented: ErrorBuilder;
-        badGateway: ErrorBuilder;
-        serviceUnavailable: ErrorBuilder;
-        gatewayTimeout: ErrorBuilder;
-        httpVersionNotSupported: ErrorBuilder;
-        variantAlsoNegotiates: ErrorBuilder;
-        insufficientStorage: ErrorBuilder;
-        loopDetected: ErrorBuilder;
-        bandwidthLimitExceeded: ErrorBuilder;
-        notExtended: ErrorBuilder;
-        networkAuthenticationRequired: ErrorBuilder;
-        originError: ErrorBuilder;
-        connectionTimedOut: ErrorBuilder;
-        proxyDeclinedRequest: ErrorBuilder;
-        aTimeoutOccured: ErrorBuilder;
-        networkReadTimeoutError: ErrorBuilder;
-        networkConnectTimeoutError: ErrorBuilder;
-
-        // Error builders by title-cased name.
-        BadRequest: ErrorBuilder;
-        Unauthorized: ErrorBuilder;
-        PaymentRequired: ErrorBuilder;
-        Forbidden: ErrorBuilder;
-        NotFound: ErrorBuilder;
-        MethodNotAllowed: ErrorBuilder;
-        NotAcceptable: ErrorBuilder;
-        ProxyAuthenticationRequired: ErrorBuilder;
-        RequestTimeout: ErrorBuilder;
-        Conflict: ErrorBuilder;
-        Gone: ErrorBuilder;
-        LengthRequired: ErrorBuilder;
-        PreconditionFailed: ErrorBuilder;
-        RequestEntityTooLarge: ErrorBuilder;
-        RequestUriTooLong: ErrorBuilder;
-        UnsupportedMediaType: ErrorBuilder;
-        RequestedRangeNotSatisfiable: ErrorBuilder;
-        ExpectationFailed: ErrorBuilder;
-        ImATeapot: ErrorBuilder;
-        AuthenticationTimeout: ErrorBuilder;
-        EnhanceYourCalm: ErrorBuilder;
-        UnprocessableEntity: ErrorBuilder;
-        Locked: ErrorBuilder;
-        MethodFailure: ErrorBuilder;
-        FailedDependency: ErrorBuilder;
-        UnorderedCollection: ErrorBuilder;
-        UpgradeRequired: ErrorBuilder;
-        PreconditionRequired: ErrorBuilder;
-        TooManyRequests: ErrorBuilder;
-        RequestHeaderFieldsTooLarge: ErrorBuilder;
-        LoginTimeout: ErrorBuilder;
-        NoResponse: ErrorBuilder;
-        RetryWith: ErrorBuilder;
-        BlockedByWindowsParentalControls: ErrorBuilder;
-        Redirect: ErrorBuilder;
-        UnavailableForLegalReasons: ErrorBuilder;
-        RequestHeaderTooLarge: ErrorBuilder;
-        CertError: ErrorBuilder;
-        NoCert: ErrorBuilder;
-        HttpToHttps: ErrorBuilder;
-        ClientClosedRequest: ErrorBuilder;
-        InternalServerError: ErrorBuilder;
-        NotImplemented: ErrorBuilder;
-        BadGateway: ErrorBuilder;
-        ServiceUnavailable: ErrorBuilder;
-        GatewayTimeout: ErrorBuilder;
-        HttpVersionNotSupported: ErrorBuilder;
-        VariantAlsoNegotiates: ErrorBuilder;
-        InsufficientStorage: ErrorBuilder;
-        LoopDetected: ErrorBuilder;
-        BandwidthLimitExceeded: ErrorBuilder;
-        NotExtended: ErrorBuilder;
-        NetworkAuthenticationRequired: ErrorBuilder;
-        OriginError: ErrorBuilder;
-        ConnectionTimedOut: ErrorBuilder;
-        ProxyDeclinedRequest: ErrorBuilder;
-        ATimeoutOccured: ErrorBuilder;
-        NetworkReadTimeoutError: ErrorBuilder;
-        NetworkConnectTimeoutError: ErrorBuilder;
-
-        // Error builders by statusCode.
-        400: ErrorBuilder;
-        401: ErrorBuilder;
-        402: ErrorBuilder;
-        403: ErrorBuilder;
-        404: ErrorBuilder;
-        405: ErrorBuilder;
-        406: ErrorBuilder;
-        407: ErrorBuilder;
-        408: ErrorBuilder;
-        409: ErrorBuilder;
-        410: ErrorBuilder;
-        411: ErrorBuilder;
-        412: ErrorBuilder;
-        413: ErrorBuilder;
-        414: ErrorBuilder;
-        415: ErrorBuilder;
-        416: ErrorBuilder;
-        417: ErrorBuilder;
-        418: ErrorBuilder;
-        419: ErrorBuilder;
-        420: ErrorBuilder;
-        422: ErrorBuilder;
-        423: ErrorBuilder;
-        424: ErrorBuilder;
-        425: ErrorBuilder;
-        426: ErrorBuilder;
-        428: ErrorBuilder;
-        429: ErrorBuilder;
-        431: ErrorBuilder;
-        440: ErrorBuilder;
-        444: ErrorBuilder;
-        449: ErrorBuilder;
-        450: ErrorBuilder;
-        451: ErrorBuilder;
-        494: ErrorBuilder;
-        495: ErrorBuilder;
-        496: ErrorBuilder;
-        497: ErrorBuilder;
-        499: ErrorBuilder;
-        500: ErrorBuilder;
-        501: ErrorBuilder;
-        502: ErrorBuilder;
-        503: ErrorBuilder;
-        504: ErrorBuilder;
-        505: ErrorBuilder;
-        506: ErrorBuilder;
-        507: ErrorBuilder;
-        508: ErrorBuilder;
-        509: ErrorBuilder;
-        510: ErrorBuilder;
-        511: ErrorBuilder;
-        520: ErrorBuilder;
-        522: ErrorBuilder;
-        523: ErrorBuilder;
-        524: ErrorBuilder;
-        598: ErrorBuilder;
-        599: ErrorBuilder;
-    }
-
-    /** Constructor function for the HttpError class. */
-    interface HttpErrorStatic {
-        new(config?: string | Error | Config, extra?: {}): HttpError;
-    }
-
-
-    /** An instance of the HttpError class. */
-    interface HttpError extends Error {
-
-        /** A human-readable title for the HTTP error. */
-        title: string;
-
-        code: string;
-
-        /** The HTTP response status code for the HTTP error. */
-        statusCode: number;
-
-        toObject(...skip: (string|RegExp)[]): any;
-    }
-
-
-    /** Configuration object for constructing HttpErrors. */
-    interface Config {
-
-        /** A descriptive human-readable title describing the error's cause. */
-        message?: string;
-
-        /** The underlying exception that caused the HTTP error. */
-        cause?: Error;
-
-        /** A detailed human-readable description of the error's cause and possible solutions. */
-        details?: string;
-
-        /**
-         *  The methods allowed for this URL.
-         *  This property is only available for 405 Method Not Allowed errors
-         *  and can be used to populate the Allow header.
-         */
-        allowed?: string[];
-
-        /**
-         *  The minimum delay before the request should be attempted again.
-         *  This property is only available for 429 Too Many Requests and 420 Enhance Your Calm
-         *  (Twitter API) errors and can be used to populate the Retry-After header.
-         */
-        retryAfter?: any;
-
-        /**
-         *  The parameters with which the request should be retried.
-         *  This property is only available for 449 Retry With (Microsoft) errors and can be
-         *  used to populate the response status message.
-         */
-        parameters?: any;
-
-        /**
-         *  The location for which the request should be repeated.
-         *  This property is only available for 451 Redirect (Microsoft) errors and can be
-         *  used to populate the proprietary X-MS-Location response header.
-         */
-        location?: any;
-    }
-
-
-    /** Factory function for creating an Error object. */
-    interface ErrorBuilder {
-
-        /**
-         *  Creates an Error object. The new keyword is optional.
-         * @param {string | Error | Config} config - If config is a string, it will be treated as config.message.
-         *                                           If config is an Error object, it will be treated as config.cause.
-         */
-        (config?: string | Error | Config): HttpError;
-
-        /**
-         *  Creates an Error object. The new keyword is optional.
-         * @param {string | Error | Config} config - If config is a string, it will be treated as config.message.
-         *                                           If config is an Error object, it will be treated as config.cause.
-         */
-        new (config?: string | Error | Config): HttpError;
-    }
-
-
-    // The module value satisfies the HttpErr interface.
-    var _: HttpErr;
-    export = _;
-}
diff --git a/httperr/index.d.ts b/httperr/index.d.ts
new file mode 100644
index 0000000000..aa7e237db1
--- /dev/null
+++ b/httperr/index.d.ts
@@ -0,0 +1,291 @@
+// Type definitions for httperr v1.0.0
+// Project: https://github.com/pluma/httperr
+// Definitions by: Troy Gerwien <https://github.com/yortus>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+/** Overall module shape, expressed as an interface. */
+interface HttpErr {
+
+    /** The base type for all httperr error types. You probably don't want to use this directly. */
+    HttpError: HttpErrorStatic;
+
+    /**
+     * Creates a new error type for the given HTTP error status.
+     * @param {number} status - The HTTP response status code for the HTTP error.
+     * @param {string} title - A human-readable title for the HTTP error.
+     * @param {Function} init - (optional) A function which will be invoked as a method of the
+     *                          new error with the config argument immediately after the error
+     *                          is created by the factory. Can be used to process additional
+     *                          error-specific configuration parameters.
+     */
+    createHttpError(status: number, title: string, init?: (config: Config) => void): HttpErrorStatic;
+
+    // Error builders by camel-cased name.
+    badRequest: ErrorBuilder;
+    unauthorized: ErrorBuilder;
+    paymentRequired: ErrorBuilder;
+    forbidden: ErrorBuilder;
+    notFound: ErrorBuilder;
+    methodNotAllowed: ErrorBuilder;
+    notAcceptable: ErrorBuilder;
+    proxyAuthenticationRequired: ErrorBuilder;
+    requestTimeout: ErrorBuilder;
+    conflict: ErrorBuilder;
+    gone: ErrorBuilder;
+    lengthRequired: ErrorBuilder;
+    preconditionFailed: ErrorBuilder;
+    requestEntityTooLarge: ErrorBuilder;
+    requestUriTooLong: ErrorBuilder;
+    unsupportedMediaType: ErrorBuilder;
+    requestedRangeNotSatisfiable: ErrorBuilder;
+    expectationFailed: ErrorBuilder;
+    imATeapot: ErrorBuilder;
+    authenticationTimeout: ErrorBuilder;
+    enhanceYourCalm: ErrorBuilder;
+    unprocessableEntity: ErrorBuilder;
+    locked: ErrorBuilder;
+    methodFailure: ErrorBuilder;
+    failedDependency: ErrorBuilder;
+    unorderedCollection: ErrorBuilder;
+    upgradeRequired: ErrorBuilder;
+    preconditionRequired: ErrorBuilder;
+    tooManyRequests: ErrorBuilder;
+    requestHeaderFieldsTooLarge: ErrorBuilder;
+    loginTimeout: ErrorBuilder;
+    noResponse: ErrorBuilder;
+    retryWith: ErrorBuilder;
+    blockedByWindowsParentalControls: ErrorBuilder;
+    redirect: ErrorBuilder;
+    unavailableForLegalReasons: ErrorBuilder;
+    requestHeaderTooLarge: ErrorBuilder;
+    certError: ErrorBuilder;
+    noCert: ErrorBuilder;
+    httpToHttps: ErrorBuilder;
+    clientClosedRequest: ErrorBuilder;
+    internalServerError: ErrorBuilder;
+    notImplemented: ErrorBuilder;
+    badGateway: ErrorBuilder;
+    serviceUnavailable: ErrorBuilder;
+    gatewayTimeout: ErrorBuilder;
+    httpVersionNotSupported: ErrorBuilder;
+    variantAlsoNegotiates: ErrorBuilder;
+    insufficientStorage: ErrorBuilder;
+    loopDetected: ErrorBuilder;
+    bandwidthLimitExceeded: ErrorBuilder;
+    notExtended: ErrorBuilder;
+    networkAuthenticationRequired: ErrorBuilder;
+    originError: ErrorBuilder;
+    connectionTimedOut: ErrorBuilder;
+    proxyDeclinedRequest: ErrorBuilder;
+    aTimeoutOccured: ErrorBuilder;
+    networkReadTimeoutError: ErrorBuilder;
+    networkConnectTimeoutError: ErrorBuilder;
+
+    // Error builders by title-cased name.
+    BadRequest: ErrorBuilder;
+    Unauthorized: ErrorBuilder;
+    PaymentRequired: ErrorBuilder;
+    Forbidden: ErrorBuilder;
+    NotFound: ErrorBuilder;
+    MethodNotAllowed: ErrorBuilder;
+    NotAcceptable: ErrorBuilder;
+    ProxyAuthenticationRequired: ErrorBuilder;
+    RequestTimeout: ErrorBuilder;
+    Conflict: ErrorBuilder;
+    Gone: ErrorBuilder;
+    LengthRequired: ErrorBuilder;
+    PreconditionFailed: ErrorBuilder;
+    RequestEntityTooLarge: ErrorBuilder;
+    RequestUriTooLong: ErrorBuilder;
+    UnsupportedMediaType: ErrorBuilder;
+    RequestedRangeNotSatisfiable: ErrorBuilder;
+    ExpectationFailed: ErrorBuilder;
+    ImATeapot: ErrorBuilder;
+    AuthenticationTimeout: ErrorBuilder;
+    EnhanceYourCalm: ErrorBuilder;
+    UnprocessableEntity: ErrorBuilder;
+    Locked: ErrorBuilder;
+    MethodFailure: ErrorBuilder;
+    FailedDependency: ErrorBuilder;
+    UnorderedCollection: ErrorBuilder;
+    UpgradeRequired: ErrorBuilder;
+    PreconditionRequired: ErrorBuilder;
+    TooManyRequests: ErrorBuilder;
+    RequestHeaderFieldsTooLarge: ErrorBuilder;
+    LoginTimeout: ErrorBuilder;
+    NoResponse: ErrorBuilder;
+    RetryWith: ErrorBuilder;
+    BlockedByWindowsParentalControls: ErrorBuilder;
+    Redirect: ErrorBuilder;
+    UnavailableForLegalReasons: ErrorBuilder;
+    RequestHeaderTooLarge: ErrorBuilder;
+    CertError: ErrorBuilder;
+    NoCert: ErrorBuilder;
+    HttpToHttps: ErrorBuilder;
+    ClientClosedRequest: ErrorBuilder;
+    InternalServerError: ErrorBuilder;
+    NotImplemented: ErrorBuilder;
+    BadGateway: ErrorBuilder;
+    ServiceUnavailable: ErrorBuilder;
+    GatewayTimeout: ErrorBuilder;
+    HttpVersionNotSupported: ErrorBuilder;
+    VariantAlsoNegotiates: ErrorBuilder;
+    InsufficientStorage: ErrorBuilder;
+    LoopDetected: ErrorBuilder;
+    BandwidthLimitExceeded: ErrorBuilder;
+    NotExtended: ErrorBuilder;
+    NetworkAuthenticationRequired: ErrorBuilder;
+    OriginError: ErrorBuilder;
+    ConnectionTimedOut: ErrorBuilder;
+    ProxyDeclinedRequest: ErrorBuilder;
+    ATimeoutOccured: ErrorBuilder;
+    NetworkReadTimeoutError: ErrorBuilder;
+    NetworkConnectTimeoutError: ErrorBuilder;
+
+    // Error builders by statusCode.
+    400: ErrorBuilder;
+    401: ErrorBuilder;
+    402: ErrorBuilder;
+    403: ErrorBuilder;
+    404: ErrorBuilder;
+    405: ErrorBuilder;
+    406: ErrorBuilder;
+    407: ErrorBuilder;
+    408: ErrorBuilder;
+    409: ErrorBuilder;
+    410: ErrorBuilder;
+    411: ErrorBuilder;
+    412: ErrorBuilder;
+    413: ErrorBuilder;
+    414: ErrorBuilder;
+    415: ErrorBuilder;
+    416: ErrorBuilder;
+    417: ErrorBuilder;
+    418: ErrorBuilder;
+    419: ErrorBuilder;
+    420: ErrorBuilder;
+    422: ErrorBuilder;
+    423: ErrorBuilder;
+    424: ErrorBuilder;
+    425: ErrorBuilder;
+    426: ErrorBuilder;
+    428: ErrorBuilder;
+    429: ErrorBuilder;
+    431: ErrorBuilder;
+    440: ErrorBuilder;
+    444: ErrorBuilder;
+    449: ErrorBuilder;
+    450: ErrorBuilder;
+    451: ErrorBuilder;
+    494: ErrorBuilder;
+    495: ErrorBuilder;
+    496: ErrorBuilder;
+    497: ErrorBuilder;
+    499: ErrorBuilder;
+    500: ErrorBuilder;
+    501: ErrorBuilder;
+    502: ErrorBuilder;
+    503: ErrorBuilder;
+    504: ErrorBuilder;
+    505: ErrorBuilder;
+    506: ErrorBuilder;
+    507: ErrorBuilder;
+    508: ErrorBuilder;
+    509: ErrorBuilder;
+    510: ErrorBuilder;
+    511: ErrorBuilder;
+    520: ErrorBuilder;
+    522: ErrorBuilder;
+    523: ErrorBuilder;
+    524: ErrorBuilder;
+    598: ErrorBuilder;
+    599: ErrorBuilder;
+}
+
+/** Constructor function for the HttpError class. */
+interface HttpErrorStatic {
+    new (config?: string | Error | Config, extra?: {}): HttpError;
+}
+
+
+/** An instance of the HttpError class. */
+interface HttpError extends Error {
+
+    /** A human-readable title for the HTTP error. */
+    title: string;
+
+    code: string;
+
+    /** The HTTP response status code for the HTTP error. */
+    statusCode: number;
+
+    toObject(...skip: (string | RegExp)[]): any;
+}
+
+
+/** Configuration object for constructing HttpErrors. */
+interface Config {
+
+    /** A descriptive human-readable title describing the error's cause. */
+    message?: string;
+
+    /** The underlying exception that caused the HTTP error. */
+    cause?: Error;
+
+    /** A detailed human-readable description of the error's cause and possible solutions. */
+    details?: string;
+
+    /**
+     *  The methods allowed for this URL.
+     *  This property is only available for 405 Method Not Allowed errors
+     *  and can be used to populate the Allow header.
+     */
+    allowed?: string[];
+
+    /**
+     *  The minimum delay before the request should be attempted again.
+     *  This property is only available for 429 Too Many Requests and 420 Enhance Your Calm
+     *  (Twitter API) errors and can be used to populate the Retry-After header.
+     */
+    retryAfter?: any;
+
+    /**
+     *  The parameters with which the request should be retried.
+     *  This property is only available for 449 Retry With (Microsoft) errors and can be
+     *  used to populate the response status message.
+     */
+    parameters?: any;
+
+    /**
+     *  The location for which the request should be repeated.
+     *  This property is only available for 451 Redirect (Microsoft) errors and can be
+     *  used to populate the proprietary X-MS-Location response header.
+     */
+    location?: any;
+}
+
+
+/** Factory function for creating an Error object. */
+interface ErrorBuilder {
+
+    /**
+     *  Creates an Error object. The new keyword is optional.
+     * @param {string | Error | Config} config - If config is a string, it will be treated as config.message.
+     *                                           If config is an Error object, it will be treated as config.cause.
+     */
+    (config?: string | Error | Config): HttpError;
+
+    /**
+     *  Creates an Error object. The new keyword is optional.
+     * @param {string | Error | Config} config - If config is a string, it will be treated as config.message.
+     *                                           If config is an Error object, it will be treated as config.cause.
+     */
+    new (config?: string | Error | Config): HttpError;
+}
+
+
+// The module value satisfies the HttpErr interface.
+declare var _: HttpErr;
+export = _;
diff --git a/httperr/tsconfig.json b/httperr/tsconfig.json
new file mode 100644
index 0000000000..1a36689268
--- /dev/null
+++ b/httperr/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "httperr-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/humane/humane-tests.ts b/humane/humane-tests.ts
index 9ae0ee3eb0..3998176158 100644
--- a/humane/humane-tests.ts
+++ b/humane/humane-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="humane.d.ts" />
+
 
 humane.log("Welcome Back");
 humane.log(["List","of","Items"]);
diff --git a/humane/humane-tests.ts.tscparams b/humane/humane-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/humane/humane-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/humane/humane.d.ts b/humane/humane.d.ts
deleted file mode 100644
index 922ddf2fc2..0000000000
--- a/humane/humane.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-// Type definitions for Humane 3.0
-// Project: http://wavded.github.com/humane-js/
-// Definitions by: jmvrbanac <https://github.com/jmvrbanac>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-interface HumaneOptions {
-    queue?: string[];
-    baseCls?: string;
-    addnCls?: string;
-    timeout?: number;
-    waitForMove?: boolean;
-    clickToClose?: boolean;
-    forceNew?: boolean;
-}
-
-interface Humane {
-    queue: string[];
-    baseCls: string;
-    addnCls: string;
-    timeout: number;
-    waitForMove: boolean;
-    clickToClose: boolean;
-    forceNew: boolean;
-
-    create(options?: HumaneOptions): Humane;
-    info: Function;
-    error: Function;
-    spawn(options: HumaneOptions): Function;
-    remove(any): void;
-    log(message: string): Humane;
-    log(message: string, callback: Function): Humane;
-    log(message: string, options: HumaneOptions): Humane;
-    log(message: string, callback: Function, options: HumaneOptions): Humane;
-
-    log(listOfMessages: any[]): Humane;
-}
-
-declare var humane: Humane;
diff --git a/humane/humane.d.ts.tscparams b/humane/humane.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/humane/humane.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/humane/index.d.ts b/humane/index.d.ts
new file mode 100644
index 0000000000..032dc0366c
--- /dev/null
+++ b/humane/index.d.ts
@@ -0,0 +1,39 @@
+// Type definitions for Humane 3.0
+// Project: http://wavded.github.com/humane-js/
+// Definitions by: jmvrbanac <https://github.com/jmvrbanac>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface HumaneOptions {
+    queue?: string[];
+    baseCls?: string;
+    addnCls?: string;
+    timeout?: number;
+    waitForMove?: boolean;
+    clickToClose?: boolean;
+    forceNew?: boolean;
+}
+
+interface Humane {
+    queue: string[];
+    baseCls: string;
+    addnCls: string;
+    timeout: number;
+    waitForMove: boolean;
+    clickToClose: boolean;
+    forceNew: boolean;
+
+    create(options?: HumaneOptions): Humane;
+    info: Function;
+    error: Function;
+    spawn(options: HumaneOptions): Function;
+    remove(x: any): void;
+    log(message: string): Humane;
+    log(message: string, callback: Function): Humane;
+    log(message: string, options: HumaneOptions): Humane;
+    log(message: string, callback: Function, options: HumaneOptions): Humane;
+
+    log(listOfMessages: any[]): Humane;
+}
+
+declare var humane: Humane;
diff --git a/humane/tsconfig.json b/humane/tsconfig.json
new file mode 100644
index 0000000000..5156c92e6c
--- /dev/null
+++ b/humane/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "humane-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/hypertext-application-language/hypertext-application-language-tests.ts b/hypertext-application-language/hypertext-application-language-tests.ts
index 0468d91f27..652b467d1a 100644
--- a/hypertext-application-language/hypertext-application-language-tests.ts
+++ b/hypertext-application-language/hypertext-application-language-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="hypertext-application-language.d.ts"/>
-
-// Link object
+// Link object
 
 // Fields format:
 var link:Hal.Link = {
diff --git a/hypertext-application-language/hypertext-application-language.d.ts b/hypertext-application-language/index.d.ts
similarity index 100%
rename from hypertext-application-language/hypertext-application-language.d.ts
rename to hypertext-application-language/index.d.ts
diff --git a/hypertext-application-language/tsconfig.json b/hypertext-application-language/tsconfig.json
new file mode 100644
index 0000000000..386215313c
--- /dev/null
+++ b/hypertext-application-language/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "hypertext-application-language-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/hystrixjs/hystrixjs-tests.ts b/hystrixjs/hystrixjs-tests.ts
index 80f840861e..0304c402b7 100644
--- a/hystrixjs/hystrixjs-tests.ts
+++ b/hystrixjs/hystrixjs-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="hystrixjs.d.ts" />
-/// <reference path="../q/Q.d.ts"/>
+
+/// <reference types="Q"/>
 
 import hystrixjs = require('hystrixjs');
 import q = require('q');
diff --git a/hystrixjs/hystrixjs.d.ts b/hystrixjs/hystrixjs.d.ts
deleted file mode 100644
index b0e03d9db6..0000000000
--- a/hystrixjs/hystrixjs.d.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-// Type definitions for dragula v2.1.2
-// Project: https://bitbucket.org/igor_sechyn/hystrixjs
-// Definitions by: Igor Sechyn <https://github.com/igorsechyn/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../q/Q.d.ts"/>
-///<reference path="../rx/rx.d.ts"/>
-
-declare namespace HystrixJS {
-
-     interface HystrixProperties {
-        "hystrix.force.circuit.open"?: boolean,
-        "hystrix.force.circuit.closed"?: boolean,
-        "hystrix.circuit.sleepWindowInMilliseconds"?:number,
-        "hystrix.circuit.errorThresholdPercentage"?: number,
-        "hystrix.circuit.volumeThreshold"?:number,
-        "hystrix.circuit.volumeThreshold.forceOverride"?: boolean,
-        "hystrix.circuit.volumeThreshold.override"?: number,
-        "hystrix.execution.timeoutInMilliseconds"?: number,
-        "hystrix.metrics.statistical.window.timeInMilliseconds"?: number,
-        "hystrix.metrics.statistical.window.bucketsNumber"?: number,
-        "hystrix.metrics.percentile.window.timeInMilliseconds"?: number,
-        "hystrix.metrics.percentile.window.bucketsNumber"?: number,
-        "hystrix.request.volume.rejectionThreshold"?: number
-    }
-
-     interface HystrixConfig {
-        metricsPercentileWindowBuckets(): number;
-        circuitBreakerForceClosed(): boolean;
-        circuitBreakerForceOpened(): boolean;
-        circuitBreakerSleepWindowInMilliseconds(): number;
-        circuitBreakerErrorThresholdPercentage(): number;
-        circuitBreakerRequestVolumeThreshold(): number;
-        circuitBreakerRequestVolumeThresholdForceOverride(): boolean;
-        circuitBreakerRequestVolumeThresholdOverride(): number;
-        executionTimeoutInMilliseconds(): number;
-        metricsStatisticalWindowBuckets(): number;
-        metricsStatisticalWindowInMilliseconds(): number;
-        metricsPercentileWindowInMilliseconds(): number;
-        metricsPercentileWindowBuckets(): number;
-        requestVolumeRejectionThreshold(): number;
-        resetProperties(): void;
-        init(properties: HystrixProperties): void;
-    }
-
-     interface Command {
-        execute(...args: any[]): Q.Promise<any>;
-    }
-
-     interface CommandBuilder {
-        circuitBreakerSleepWindowInMilliseconds(value: number): CommandBuilder;
-        errorHandler(value: (error: any) => boolean): CommandBuilder;
-        timeout(value: number): CommandBuilder;
-        circuitBreakerRequestVolumeThreshold(value: number): CommandBuilder;
-        requestVolumeRejectionThreshold(value: number): CommandBuilder;
-        circuitBreakerForceOpened(value: boolean): CommandBuilder;
-        circuitBreakerForceClosed(value: boolean): CommandBuilder;
-        statisticalWindowNumberOfBuckets(value: number): CommandBuilder;
-        statisticalWindowLength(value: number): CommandBuilder;
-        percentileWindowNumberOfBuckets(value: number): CommandBuilder;
-        percentileWindowLength(value: number): CommandBuilder;
-        circuitBreakerErrorThresholdPercentage(value: number): CommandBuilder;
-        run(value: (args: any) => Q.Promise<any>): CommandBuilder;
-        fallbackTo(value: (...args: any[]) => Q.Promise<any>): CommandBuilder;
-        context(value: any): CommandBuilder;
-        build(): Command;
-    }
-
-     interface CommandFactory {
-        getOrCreate(commandKey: string, commandGroup?: string): CommandBuilder;
-        resetCache(): void;
-    }
-
-    interface HealthCounts {
-        totalCount: number;
-        errorCount: number;
-        errorPercentage: number;
-    }
-
-    interface CommandMetrics {
-        markSuccess(): void;
-        markRejected(): void;
-        markFailure(): void;
-        markTimeout(): void;
-        markShortCircuited(): void;
-        incrementExecutionCount(): void;
-        decrementExecutionCount(): void;
-        getCurrentExecutionCount(): number;
-        addExecutionTime(value: number): void;
-        getRollingCount(type: any): number;
-        getExecutionTime(percentile: any): number;
-        getHealthCounts(): HealthCounts;
-        reset(): void;
-    }
-
-    interface MetricsProperties {
-        commandKey: string,
-        commandGroup: string,
-        statisticalWindowTimeInMilliSeconds?: number,
-        statisticalWindowNumberOfBuckets?: number,
-        percentileWindowTimeInMilliSeconds?: number,
-        percentileWindowNumberOfBuckets?: number
-    }
-
-    interface MetricsFactory {
-        getOrCreate(config: MetricsProperties): CommandMetrics;
-        resetCache(): void;
-        getAllMetrics(): Array<CommandMetrics>;
-    }
-
-    interface CirctuiBreakerConfig {
-        circuitBreakerSleepWindowInMilliseconds: number,
-        commandKey: string,
-        circuitBreakerErrorThresholdPercentage: number,
-        circuitBreakerRequestVolumeThreshold: number,
-        commandGroup: string,
-        circuitBreakerForceClosed: boolean,
-        circuitBreakerForceOpened: boolean
-    }
-
-    interface CircuitBreaker {
-        allowRequest(): boolean;
-        allowSingleTest(): boolean;
-        isOpen(): boolean;
-        markSuccess(): void;
-    }
-
-    interface CircuitFactory {
-        getOrCreate(config: CirctuiBreakerConfig): CircuitBreaker;
-        getCache(): Array<CircuitBreaker>;
-        resetCache(): void;
-    }
-
-    interface HystrixSSEStream {
-        toObservable(): Rx.Observable<any>
-    }
-}
-declare var hystrixjs: {
-    commandFactory: HystrixJS.CommandFactory,
-    metricsFactory: HystrixJS.MetricsFactory,
-    circuitFactory: HystrixJS.CircuitFactory,
-    hystrixSSEStream: HystrixJS.HystrixSSEStream,
-    hystrixConfig: HystrixJS.HystrixConfig
-};
-
-declare module "hystrixjs" {
-    export = hystrixjs;
-}
diff --git a/hystrixjs/index.d.ts b/hystrixjs/index.d.ts
new file mode 100644
index 0000000000..5d862c11d9
--- /dev/null
+++ b/hystrixjs/index.d.ts
@@ -0,0 +1,148 @@
+// Type definitions for dragula v2.1.2
+// Project: https://bitbucket.org/igor_sechyn/hystrixjs
+// Definitions by: Igor Sechyn <https://github.com/igorsechyn/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="Q"/>
+///<reference types="rx"/>
+
+declare namespace HystrixJS {
+
+     interface HystrixProperties {
+        "hystrix.force.circuit.open"?: boolean,
+        "hystrix.force.circuit.closed"?: boolean,
+        "hystrix.circuit.sleepWindowInMilliseconds"?:number,
+        "hystrix.circuit.errorThresholdPercentage"?: number,
+        "hystrix.circuit.volumeThreshold"?:number,
+        "hystrix.circuit.volumeThreshold.forceOverride"?: boolean,
+        "hystrix.circuit.volumeThreshold.override"?: number,
+        "hystrix.execution.timeoutInMilliseconds"?: number,
+        "hystrix.metrics.statistical.window.timeInMilliseconds"?: number,
+        "hystrix.metrics.statistical.window.bucketsNumber"?: number,
+        "hystrix.metrics.percentile.window.timeInMilliseconds"?: number,
+        "hystrix.metrics.percentile.window.bucketsNumber"?: number,
+        "hystrix.request.volume.rejectionThreshold"?: number
+    }
+
+     interface HystrixConfig {
+        metricsPercentileWindowBuckets(): number;
+        circuitBreakerForceClosed(): boolean;
+        circuitBreakerForceOpened(): boolean;
+        circuitBreakerSleepWindowInMilliseconds(): number;
+        circuitBreakerErrorThresholdPercentage(): number;
+        circuitBreakerRequestVolumeThreshold(): number;
+        circuitBreakerRequestVolumeThresholdForceOverride(): boolean;
+        circuitBreakerRequestVolumeThresholdOverride(): number;
+        executionTimeoutInMilliseconds(): number;
+        metricsStatisticalWindowBuckets(): number;
+        metricsStatisticalWindowInMilliseconds(): number;
+        metricsPercentileWindowInMilliseconds(): number;
+        metricsPercentileWindowBuckets(): number;
+        requestVolumeRejectionThreshold(): number;
+        resetProperties(): void;
+        init(properties: HystrixProperties): void;
+    }
+
+     interface Command {
+        execute(...args: any[]): Q.Promise<any>;
+    }
+
+     interface CommandBuilder {
+        circuitBreakerSleepWindowInMilliseconds(value: number): CommandBuilder;
+        errorHandler(value: (error: any) => boolean): CommandBuilder;
+        timeout(value: number): CommandBuilder;
+        circuitBreakerRequestVolumeThreshold(value: number): CommandBuilder;
+        requestVolumeRejectionThreshold(value: number): CommandBuilder;
+        circuitBreakerForceOpened(value: boolean): CommandBuilder;
+        circuitBreakerForceClosed(value: boolean): CommandBuilder;
+        statisticalWindowNumberOfBuckets(value: number): CommandBuilder;
+        statisticalWindowLength(value: number): CommandBuilder;
+        percentileWindowNumberOfBuckets(value: number): CommandBuilder;
+        percentileWindowLength(value: number): CommandBuilder;
+        circuitBreakerErrorThresholdPercentage(value: number): CommandBuilder;
+        run(value: (args: any) => Q.Promise<any>): CommandBuilder;
+        fallbackTo(value: (...args: any[]) => Q.Promise<any>): CommandBuilder;
+        context(value: any): CommandBuilder;
+        build(): Command;
+    }
+
+     interface CommandFactory {
+        getOrCreate(commandKey: string, commandGroup?: string): CommandBuilder;
+        resetCache(): void;
+    }
+
+    interface HealthCounts {
+        totalCount: number;
+        errorCount: number;
+        errorPercentage: number;
+    }
+
+    interface CommandMetrics {
+        markSuccess(): void;
+        markRejected(): void;
+        markFailure(): void;
+        markTimeout(): void;
+        markShortCircuited(): void;
+        incrementExecutionCount(): void;
+        decrementExecutionCount(): void;
+        getCurrentExecutionCount(): number;
+        addExecutionTime(value: number): void;
+        getRollingCount(type: any): number;
+        getExecutionTime(percentile: any): number;
+        getHealthCounts(): HealthCounts;
+        reset(): void;
+    }
+
+    interface MetricsProperties {
+        commandKey: string,
+        commandGroup: string,
+        statisticalWindowTimeInMilliSeconds?: number,
+        statisticalWindowNumberOfBuckets?: number,
+        percentileWindowTimeInMilliSeconds?: number,
+        percentileWindowNumberOfBuckets?: number
+    }
+
+    interface MetricsFactory {
+        getOrCreate(config: MetricsProperties): CommandMetrics;
+        resetCache(): void;
+        getAllMetrics(): Array<CommandMetrics>;
+    }
+
+    interface CirctuiBreakerConfig {
+        circuitBreakerSleepWindowInMilliseconds: number,
+        commandKey: string,
+        circuitBreakerErrorThresholdPercentage: number,
+        circuitBreakerRequestVolumeThreshold: number,
+        commandGroup: string,
+        circuitBreakerForceClosed: boolean,
+        circuitBreakerForceOpened: boolean
+    }
+
+    interface CircuitBreaker {
+        allowRequest(): boolean;
+        allowSingleTest(): boolean;
+        isOpen(): boolean;
+        markSuccess(): void;
+    }
+
+    interface CircuitFactory {
+        getOrCreate(config: CirctuiBreakerConfig): CircuitBreaker;
+        getCache(): Array<CircuitBreaker>;
+        resetCache(): void;
+    }
+
+    interface HystrixSSEStream {
+        toObservable(): Rx.Observable<any>
+    }
+}
+declare var hystrixjs: {
+    commandFactory: HystrixJS.CommandFactory,
+    metricsFactory: HystrixJS.MetricsFactory,
+    circuitFactory: HystrixJS.CircuitFactory,
+    hystrixSSEStream: HystrixJS.HystrixSSEStream,
+    hystrixConfig: HystrixJS.HystrixConfig
+};
+
+declare module "hystrixjs" {
+    export = hystrixjs;
+}
diff --git a/hystrixjs/tsconfig.json b/hystrixjs/tsconfig.json
new file mode 100644
index 0000000000..6a4b853132
--- /dev/null
+++ b/hystrixjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "hystrixjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/i18n-node/i18n-node.d.ts b/i18n-node/i18n-node.d.ts
deleted file mode 100644
index 568228df45..0000000000
--- a/i18n-node/i18n-node.d.ts
+++ /dev/null
@@ -1,344 +0,0 @@
-// Type definitions for i18n-node 0.5.0
-// Project: https://github.com/mashpie/i18n-node
-// Definitions by: Maxime LUCE <https://github.com/SomaticIT>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-declare namespace i18n {
-    export interface ConfigurationOptions {
-        /** Setup some locales - other locales default to en silently */
-        locales?: string[];
-        /** Alter a site wide default locale */
-        defaultLocale?: string;
-
-        /**
-         * Sets a custom cookie name to parse locale settings from
-         * @default null
-         */
-        cookie?: string;
-        /**
-         * Where to store json files, relative to modules directory
-         * @default "./locales"
-         */
-        directory?: string;
-
-        /**
-         * whether to write new locale information to disk
-         * @default true
-         */
-        updateFiles?: boolean;
-
-        /**
-         * What to use as the indentation unit
-         * @default "\t"
-         */
-        indent?: string;
-
-        /**
-         * Setting extension of json files (you might want to set this to '.js' according to webtranslateit)
-         * @default ".json"
-         */
-        extension?: string;
-
-        /**
-         * Enable object notation
-         * @default false
-         */
-        objectNotation?: boolean;
-
-        /**
-         * json files prefix
-         */
-        prefix?: string;
-    }
-    export interface TranslateOptions {
-        phrase: string;
-        locale?: string;
-    }
-    export interface PluralOptions {
-        singular: string;
-        plural: string;
-        count?: number;
-        locale?: string;
-    }
-    export interface Replacements {
-        [key: string]: string;
-    }
-
-    export interface LocaleCatalog {
-        [key: string]: string;
-    }
-    export interface GlobalCatalog {
-        [key: string]: LocaleCatalog;
-    }
-
-    /**
-     * Configure current i18n instance
-     * @param {ConfigurationOptions} options - configuration options for i18n
-     */
-    function configure(options: ConfigurationOptions): void;
-
-    /**
-     * Initialize i18n middleware for express
-     * @param {Express.Request} request - Current express request
-     * @param {Express.Response} response - Current express response
-     * @param {Function} next - Callback to continue process
-     */
-    function init(request: Express.Request, response: Express.Response, next?: Function): void;
-
-    //#region __()
-
-    /**
-     * Translate the given phrase using locale configuration
-     * @param {string} phrase - The phrase to translate
-     * @returns {string} The translated phrase
-     */
-    function __(phrase: string, ...replace: string[]): string;
-    /**
-     * Translate the given phrase using locale configuration
-     * @param {string} phrase - The phrase to translate
-     * @param {Object} replacements - An object containing replacements
-     * @returns {string} The translated phrase
-     */
-    function __(phrase: string, replacements: Replacements): string;
-    /**
-     * Translate the given phrase using locale configuration
-     * @param {TranslateOptions} options - Options for translation
-     * @returns {string} The translated phrase
-     */
-    function __(options: TranslateOptions): string;
-    /**
-     * Translate the given phrase using locale configuration
-     * @param {TranslateOptions} options - Options for translation
-     * @returns {string} The translated phrase
-     */
-    function __(options: TranslateOptions, ...replace: string[]): string;
-    /**
-     * Translate the given phrase using locale configuration
-     * @param {TranslateOptions} options - Options for translation
-     * @param {Object} replacements - An object containing replacements
-     * @returns {string} The translated phrase
-     */
-    function __(options: TranslateOptions, replacements: Replacements): string;
-
-    //#endregion
-
-    //#region __n()
-
-    /**
-     * Translate with plural condition the given phrase and count using locale configuration
-     * @param {PluralOptions} options - Options for plural translate
-     * @returns {string} The translated phrase
-     */
-    function __n(options: PluralOptions): string;
-
-    /**
-     * Translate with plural condition the given phrase and count using locale configuration
-     * @param {PluralOptions} options - Options for plural translate
-     * @param {number} count - The number which allow to select from plural to singular
-     * @returns {string} The translated phrase
-     */
-    function __n(options: PluralOptions, count: number): string;
-    /**
-     * Translate with plural condition the given phrase and count using locale configuration
-     * @param {string} singular - The singular pharse to translate if count is <= 1
-     * @param {string} plural - The plural pharse to translate if count is > 1
-     * @param {number} count - The number which allow to select from plural to singular
-     * @returns {string} The translated phrase
-     */
-    function __n(singular: string, plural: string, count: number): string;
-    /**
-     * Translate with plural condition the given phrase and count using locale configuration
-     * @param {string} singular - The singular pharse to translate if count is <= 1
-     * @param {string} plural - The plural pharse to translate if count is > 1
-     * @param {number} count - The number which allow to select from plural to singular
-     * @returns {string} The translated phrase
-     */
-    function __n(singular: string, plural: string, count: string): string;
-
-    //#endregion
-
-    //#region Locale
-
-    /**
-     * Change the current active locale
-     * @param {string} locale - The locale to set as default
-     */
-    function setLocale(locale: string): void;
-    /**
-     * Change the current active locale for specified request
-     * @param {Express.Request} request - The request to change locale on
-     * @param {string} locale - The locale to set as default
-     */
-    function setLocale(request: Express.Request, locale: string): void;
-
-    /**
-     * Get the current active locale
-     * @returns {string} The current locale in request
-     */
-    function getLocale(): string;
-    /**
-     * Get the current active locale for specified request
-     * @param {Express.Request} request - The request to get locale for
-     * @returns {string} The current locale in request
-     */
-    function getLocale(request: Express.Request): string;
-
-    //#endregion
-
-    //#region Catalog
-
-    /**
-     * Get the current global catalog
-     * @returns {GlobalCatalog} The current global catalog
-     */
-    function getCatalog(): GlobalCatalog;
-    /**
-     * Get the catalog for the given locale
-     * @param {string} locale - The locale to get catalog for
-     * @returns {LocaleCatalog} The specified locale catalog
-     */
-    function getCatalog(locale: string): LocaleCatalog;
-    /**
-     * Get the current active locale catalog for specified request
-     * @param {Express.Request} request - The request to get locale catalog for
-     * @returns {LocaleCatalog} The current locale catalog for the specified request
-     */
-    function getCatalog(request: Express.Request): LocaleCatalog;
-    /**
-     * Get the current locale catalog for specified request and specified locale
-     * @param {Express.Request} request - The request to get locale catalog for
-     * @param {string} locale - The locale to get catalog for
-     * @returns {LocaleCatalog} The specified locale catalog
-     */
-    function getCatalog(request: Express.Request, locale: string): LocaleCatalog;
-
-    //#endregion
-
-    /**
-     * Override the current request locale by using the query param (?locale=en)
-     * @param {Express.Request} [request] - The request to override locale for
-     */
-    function overrideLocaleFromQuery(request?: Express.Request): void;
-
-    /**
-     * Get current i18n-node version
-     * @member {string}
-     */
-    var version: string;
-}
-
-interface i18nAPI {
-    locale: string;
-
-    //#region __()
-
-    /**
-     * Translate the given phrase using locale configuration
-     * @param {string} phrase - The phrase to translate
-     * @returns {string} The translated phrase
-     */
-    __(phrase: string, ...replace: string[]): string;
-    /**
-     * Translate the given phrase using locale configuration
-     * @param {string} phrase - The phrase to translate
-     * @param {Object} replacements - An object containing replacements
-     * @returns {string} The translated phrase
-     */
-    __(phrase: string, replacements: i18n.Replacements): string;
-    /**
-     * Translate the given phrase using locale configuration
-     * @param {TranslateOptions} options - Options for translation
-     * @returns {string} The translated phrase
-     */
-    __(options: i18n.TranslateOptions): string;
-    /**
-     * Translate the given phrase using locale configuration
-     * @param {TranslateOptions} options - Options for translation
-     * @returns {string} The translated phrase
-     */
-    __(options: i18n.TranslateOptions, ...replace: string[]): string;
-    /**
-     * Translate the given phrase using locale configuration
-     * @param {TranslateOptions} options - Options for translation
-     * @param {Object} replacements - An object containing replacements
-     * @returns {string} The translated phrase
-     */
-    __(options: i18n.TranslateOptions, replacements: i18n.Replacements): string;
-
-    //#endregion
-
-    //#region __n()
-
-    /**
-     * Translate with plural condition the given phrase and count using locale configuration
-     * @param {PluralOptions} options - Options for plural translate
-     * @returns {string} The translated phrase
-     */
-    __n(options: i18n.PluralOptions): string;
-
-    /**
-     * Translate with plural condition the given phrase and count using locale configuration
-     * @param {PluralOptions} options - Options for plural translate
-     * @param {number} count - The number which allow to select from plural to singular
-     * @returns {string} The translated phrase
-     */
-    __n(options: i18n.PluralOptions, count: number): string;
-    /**
-     * Translate with plural condition the given phrase and count using locale configuration
-     * @param {string} singular - The singular pharse to translate if count is <= 1
-     * @param {string} plural - The plural pharse to translate if count is > 1
-     * @param {number} count - The number which allow to select from plural to singular
-     * @returns {string} The translated phrase
-     */
-    __n(singular: string, plural: string, count: number): string;
-    /**
-     * Translate with plural condition the given phrase and count using locale configuration
-     * @param {string} singular - The singular pharse to translate if count is <= 1
-     * @param {string} plural - The plural pharse to translate if count is > 1
-     * @param {number} count - The number which allow to select from plural to singular
-     * @returns {string} The translated phrase
-     */
-    __n(singular: string, plural: string, count: string): string;
-
-    //#endregion
-
-    /**
-     * Get the current active locale
-     * @returns {string} The current locale in request
-     */
-    getLocale(): string;
-    /**
-     * Change the current active locale
-     * @param {string} locale - The locale to set as default
-     */
-    setLocale(locale: string): void;
-
-    /**
-     * Get the current global catalog
-     * @returns {GlobalCatalog} The current global catalog
-     */
-    getCatalog(): i18n.GlobalCatalog;
-    /**
-     * Get the catalog for the given locale
-     * @param {string} locale - The locale to get catalog for
-     * @returns {LocaleCatalog} The specified locale catalog
-     */
-    getCatalog(locale: string): i18n.LocaleCatalog;
-}
-
-declare module "i18n" {
-    export = i18n;
-}
-
-declare namespace Express {
-    export interface Request extends i18nAPI {
-        languages: string[];
-        regions: string[];
-        language: string;
-        region: string;
-    }
-    export interface Response extends i18nAPI {
-        locals: i18nAPI
-    }
-}
diff --git a/i18n-node/i18n-node-tests.ts b/i18n/i18n-node-tests.ts
similarity index 95%
rename from i18n-node/i18n-node-tests.ts
rename to i18n/i18n-node-tests.ts
index f4403e5c10..d649938858 100644
--- a/i18n-node/i18n-node-tests.ts
+++ b/i18n/i18n-node-tests.ts
@@ -4,11 +4,11 @@
  * Created by using code samples from https://github.com/mashpie/i18n-node.
  */
 
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../express/express.d.ts" />
-/// <reference path="i18n-node.d.ts" />
+/// <reference types="node" />
 
-import express = require("express");
+
+
+import express = require("../express");
 import i18n = require("i18n");
 
 var app = express();
diff --git a/i18n/index.d.ts b/i18n/index.d.ts
new file mode 100644
index 0000000000..0c93b5f3b5
--- /dev/null
+++ b/i18n/index.d.ts
@@ -0,0 +1,344 @@
+// Type definitions for i18n-node 0.5.0
+// Project: https://github.com/mashpie/i18n-node
+// Definitions by: Maxime LUCE <https://github.com/SomaticIT>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare namespace i18n {
+    export interface ConfigurationOptions {
+        /** Setup some locales - other locales default to en silently */
+        locales?: string[];
+        /** Alter a site wide default locale */
+        defaultLocale?: string;
+
+        /**
+         * Sets a custom cookie name to parse locale settings from
+         * @default null
+         */
+        cookie?: string;
+        /**
+         * Where to store json files, relative to modules directory
+         * @default "./locales"
+         */
+        directory?: string;
+
+        /**
+         * whether to write new locale information to disk
+         * @default true
+         */
+        updateFiles?: boolean;
+
+        /**
+         * What to use as the indentation unit
+         * @default "\t"
+         */
+        indent?: string;
+
+        /**
+         * Setting extension of json files (you might want to set this to '.js' according to webtranslateit)
+         * @default ".json"
+         */
+        extension?: string;
+
+        /**
+         * Enable object notation
+         * @default false
+         */
+        objectNotation?: boolean;
+
+        /**
+         * json files prefix
+         */
+        prefix?: string;
+    }
+    export interface TranslateOptions {
+        phrase: string;
+        locale?: string;
+    }
+    export interface PluralOptions {
+        singular: string;
+        plural: string;
+        count?: number;
+        locale?: string;
+    }
+    export interface Replacements {
+        [key: string]: string;
+    }
+
+    export interface LocaleCatalog {
+        [key: string]: string;
+    }
+    export interface GlobalCatalog {
+        [key: string]: LocaleCatalog;
+    }
+
+    /**
+     * Configure current i18n instance
+     * @param {ConfigurationOptions} options - configuration options for i18n
+     */
+    function configure(options: ConfigurationOptions): void;
+
+    /**
+     * Initialize i18n middleware for express
+     * @param {Express.Request} request - Current express request
+     * @param {Express.Response} response - Current express response
+     * @param {Function} next - Callback to continue process
+     */
+    function init(request: Express.Request, response: Express.Response, next?: Function): void;
+
+    //#region __()
+
+    /**
+     * Translate the given phrase using locale configuration
+     * @param {string} phrase - The phrase to translate
+     * @returns {string} The translated phrase
+     */
+    function __(phrase: string, ...replace: string[]): string;
+    /**
+     * Translate the given phrase using locale configuration
+     * @param {string} phrase - The phrase to translate
+     * @param {Object} replacements - An object containing replacements
+     * @returns {string} The translated phrase
+     */
+    function __(phrase: string, replacements: Replacements): string;
+    /**
+     * Translate the given phrase using locale configuration
+     * @param {TranslateOptions} options - Options for translation
+     * @returns {string} The translated phrase
+     */
+    function __(options: TranslateOptions): string;
+    /**
+     * Translate the given phrase using locale configuration
+     * @param {TranslateOptions} options - Options for translation
+     * @returns {string} The translated phrase
+     */
+    function __(options: TranslateOptions, ...replace: string[]): string;
+    /**
+     * Translate the given phrase using locale configuration
+     * @param {TranslateOptions} options - Options for translation
+     * @param {Object} replacements - An object containing replacements
+     * @returns {string} The translated phrase
+     */
+    function __(options: TranslateOptions, replacements: Replacements): string;
+
+    //#endregion
+
+    //#region __n()
+
+    /**
+     * Translate with plural condition the given phrase and count using locale configuration
+     * @param {PluralOptions} options - Options for plural translate
+     * @returns {string} The translated phrase
+     */
+    function __n(options: PluralOptions): string;
+
+    /**
+     * Translate with plural condition the given phrase and count using locale configuration
+     * @param {PluralOptions} options - Options for plural translate
+     * @param {number} count - The number which allow to select from plural to singular
+     * @returns {string} The translated phrase
+     */
+    function __n(options: PluralOptions, count: number): string;
+    /**
+     * Translate with plural condition the given phrase and count using locale configuration
+     * @param {string} singular - The singular pharse to translate if count is <= 1
+     * @param {string} plural - The plural pharse to translate if count is > 1
+     * @param {number} count - The number which allow to select from plural to singular
+     * @returns {string} The translated phrase
+     */
+    function __n(singular: string, plural: string, count: number): string;
+    /**
+     * Translate with plural condition the given phrase and count using locale configuration
+     * @param {string} singular - The singular pharse to translate if count is <= 1
+     * @param {string} plural - The plural pharse to translate if count is > 1
+     * @param {number} count - The number which allow to select from plural to singular
+     * @returns {string} The translated phrase
+     */
+    function __n(singular: string, plural: string, count: string): string;
+
+    //#endregion
+
+    //#region Locale
+
+    /**
+     * Change the current active locale
+     * @param {string} locale - The locale to set as default
+     */
+    function setLocale(locale: string): void;
+    /**
+     * Change the current active locale for specified request
+     * @param {Express.Request} request - The request to change locale on
+     * @param {string} locale - The locale to set as default
+     */
+    function setLocale(request: Express.Request, locale: string): void;
+
+    /**
+     * Get the current active locale
+     * @returns {string} The current locale in request
+     */
+    function getLocale(): string;
+    /**
+     * Get the current active locale for specified request
+     * @param {Express.Request} request - The request to get locale for
+     * @returns {string} The current locale in request
+     */
+    function getLocale(request: Express.Request): string;
+
+    //#endregion
+
+    //#region Catalog
+
+    /**
+     * Get the current global catalog
+     * @returns {GlobalCatalog} The current global catalog
+     */
+    function getCatalog(): GlobalCatalog;
+    /**
+     * Get the catalog for the given locale
+     * @param {string} locale - The locale to get catalog for
+     * @returns {LocaleCatalog} The specified locale catalog
+     */
+    function getCatalog(locale: string): LocaleCatalog;
+    /**
+     * Get the current active locale catalog for specified request
+     * @param {Express.Request} request - The request to get locale catalog for
+     * @returns {LocaleCatalog} The current locale catalog for the specified request
+     */
+    function getCatalog(request: Express.Request): LocaleCatalog;
+    /**
+     * Get the current locale catalog for specified request and specified locale
+     * @param {Express.Request} request - The request to get locale catalog for
+     * @param {string} locale - The locale to get catalog for
+     * @returns {LocaleCatalog} The specified locale catalog
+     */
+    function getCatalog(request: Express.Request, locale: string): LocaleCatalog;
+
+    //#endregion
+
+    /**
+     * Override the current request locale by using the query param (?locale=en)
+     * @param {Express.Request} [request] - The request to override locale for
+     */
+    function overrideLocaleFromQuery(request?: Express.Request): void;
+
+    /**
+     * Get current i18n-node version
+     * @member {string}
+     */
+    var version: string;
+}
+
+interface i18nAPI {
+    locale: string;
+
+    //#region __()
+
+    /**
+     * Translate the given phrase using locale configuration
+     * @param {string} phrase - The phrase to translate
+     * @returns {string} The translated phrase
+     */
+    __(phrase: string, ...replace: string[]): string;
+    /**
+     * Translate the given phrase using locale configuration
+     * @param {string} phrase - The phrase to translate
+     * @param {Object} replacements - An object containing replacements
+     * @returns {string} The translated phrase
+     */
+    __(phrase: string, replacements: i18n.Replacements): string;
+    /**
+     * Translate the given phrase using locale configuration
+     * @param {TranslateOptions} options - Options for translation
+     * @returns {string} The translated phrase
+     */
+    __(options: i18n.TranslateOptions): string;
+    /**
+     * Translate the given phrase using locale configuration
+     * @param {TranslateOptions} options - Options for translation
+     * @returns {string} The translated phrase
+     */
+    __(options: i18n.TranslateOptions, ...replace: string[]): string;
+    /**
+     * Translate the given phrase using locale configuration
+     * @param {TranslateOptions} options - Options for translation
+     * @param {Object} replacements - An object containing replacements
+     * @returns {string} The translated phrase
+     */
+    __(options: i18n.TranslateOptions, replacements: i18n.Replacements): string;
+
+    //#endregion
+
+    //#region __n()
+
+    /**
+     * Translate with plural condition the given phrase and count using locale configuration
+     * @param {PluralOptions} options - Options for plural translate
+     * @returns {string} The translated phrase
+     */
+    __n(options: i18n.PluralOptions): string;
+
+    /**
+     * Translate with plural condition the given phrase and count using locale configuration
+     * @param {PluralOptions} options - Options for plural translate
+     * @param {number} count - The number which allow to select from plural to singular
+     * @returns {string} The translated phrase
+     */
+    __n(options: i18n.PluralOptions, count: number): string;
+    /**
+     * Translate with plural condition the given phrase and count using locale configuration
+     * @param {string} singular - The singular pharse to translate if count is <= 1
+     * @param {string} plural - The plural pharse to translate if count is > 1
+     * @param {number} count - The number which allow to select from plural to singular
+     * @returns {string} The translated phrase
+     */
+    __n(singular: string, plural: string, count: number): string;
+    /**
+     * Translate with plural condition the given phrase and count using locale configuration
+     * @param {string} singular - The singular pharse to translate if count is <= 1
+     * @param {string} plural - The plural pharse to translate if count is > 1
+     * @param {number} count - The number which allow to select from plural to singular
+     * @returns {string} The translated phrase
+     */
+    __n(singular: string, plural: string, count: string): string;
+
+    //#endregion
+
+    /**
+     * Get the current active locale
+     * @returns {string} The current locale in request
+     */
+    getLocale(): string;
+    /**
+     * Change the current active locale
+     * @param {string} locale - The locale to set as default
+     */
+    setLocale(locale: string): void;
+
+    /**
+     * Get the current global catalog
+     * @returns {GlobalCatalog} The current global catalog
+     */
+    getCatalog(): i18n.GlobalCatalog;
+    /**
+     * Get the catalog for the given locale
+     * @param {string} locale - The locale to get catalog for
+     * @returns {LocaleCatalog} The specified locale catalog
+     */
+    getCatalog(locale: string): i18n.LocaleCatalog;
+}
+
+declare module "i18n" {
+    export = i18n;
+}
+
+declare namespace Express {
+    export interface Request extends i18nAPI {
+        languages: string[];
+        regions: string[];
+        language: string;
+        region: string;
+    }
+    export interface Response extends i18nAPI {
+        locals: i18nAPI
+    }
+}
diff --git a/i18n/tsconfig.json b/i18n/tsconfig.json
new file mode 100644
index 0000000000..5f94592117
--- /dev/null
+++ b/i18n/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "i18n-node-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/i18next-browser-languagedetector/i18next-browser-languagedetector-tests.ts b/i18next-browser-languagedetector/i18next-browser-languagedetector-tests.ts
index fb346894ee..bca7aee3b7 100644
--- a/i18next-browser-languagedetector/i18next-browser-languagedetector-tests.ts
+++ b/i18next-browser-languagedetector/i18next-browser-languagedetector-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../i18next/i18next-2.0.17.d.ts"/>
-/// <reference path="i18next-browser-languagedetector.d.ts"/>
+/// <reference types="i18next" />
 
 import * as i18next from 'i18next';
 import LngDetector from 'i18next-browser-languagedetector';
diff --git a/i18next-browser-languagedetector/i18next-browser-languagedetector.d.ts b/i18next-browser-languagedetector/i18next-browser-languagedetector.d.ts
deleted file mode 100644
index cef510304e..0000000000
--- a/i18next-browser-languagedetector/i18next-browser-languagedetector.d.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-// Type definitions for i18next-browser-languagedetector 0.0.14
-// Project: http://i18next.com/
-// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../express/express.d.ts"/>
-///<reference path="../i18next/i18next-2.0.17.d.ts"/>
-
-declare namespace I18next {
-    interface I18nextStatic extends i18nextBrowserLanguageDetector.I18nextStatic { }
-    interface I18nextOptions extends i18nextBrowserLanguageDetector.I18nextOptions { }
-}
-
-declare namespace i18nextBrowserLanguageDetector {
-    /**
-     * @summary Interface for Language detector options.
-     * @interface
-     */
-    interface LanguageDetectorOptions {
-        caches?: Array<string>|boolean;
-        cookieDomain?: string;
-        cookieExpirationDate?: Date;
-        lookupCookie?: string;
-        lookupFromPathIndex?: number;
-        lookupQuerystring?: string;
-        lookupSession?: string;
-        order?: Array<string>;
-    }
-
-    /**
-     * @summary Interface for custom detector.
-     * @interface
-     */
-    interface CustomDetector {
-        name: string;
-
-        //todo: Checks paramters type.
-        cacheUserLanguage: (lng: string, options: Object) => void;
-        lookup: (options: Object) => string;
-    }
-
-    /**
-     * @summary i18next options.
-     * @interface
-     */
-    interface I18nextOptions {
-        detection?: LanguageDetectorOptions;
-    }
-
-    /**
-     * @summary i18next interface.
-     * @interface
-     */
-    interface I18nextStatic {
-        use(module: LngDetector): I18nextStatic;
-    }
-
-    /**
-     * @summary i18next language detection.
-     * @class
-     */
-    class LngDetector {
-        /**
-         * @summary Constructor.
-         * @constructor
-         */
-        constructor(services?: any, options?: LanguageDetectorOptions);
-
-        /**
-         * @summary Adds detector.
-         * @param {CustomDetector} detector The custom detector.
-         */
-        addDetector(detector: CustomDetector): LngDetector;
-
-        /**
-         * @summary Initializes detector.
-         * @param {LanguageDetectorOptions} options The options.
-         */
-        init(options?: LanguageDetectorOptions): void;
-    }
-}
-
-declare module "i18next-browser-languagedetector" {
-    import * as express from "express";
-    import * as i18next from "i18next";
-
-    export default i18nextBrowserLanguageDetector.LngDetector;
-}
diff --git a/i18next-browser-languagedetector/index.d.ts b/i18next-browser-languagedetector/index.d.ts
new file mode 100644
index 0000000000..24e514fbd2
--- /dev/null
+++ b/i18next-browser-languagedetector/index.d.ts
@@ -0,0 +1,87 @@
+// Type definitions for i18next-browser-languagedetector 0.0.14
+// Project: http://i18next.com/
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="i18next"/>
+
+declare namespace I18next {
+    interface I18nextStatic extends i18nextBrowserLanguageDetector.I18nextStatic { }
+    interface I18nextOptions extends i18nextBrowserLanguageDetector.I18nextOptions { }
+}
+
+declare namespace i18nextBrowserLanguageDetector {
+    /**
+     * @summary Interface for Language detector options.
+     * @interface
+     */
+    interface LanguageDetectorOptions {
+        caches?: Array<string>|boolean;
+        cookieDomain?: string;
+        cookieExpirationDate?: Date;
+        lookupCookie?: string;
+        lookupFromPathIndex?: number;
+        lookupQuerystring?: string;
+        lookupSession?: string;
+        order?: Array<string>;
+    }
+
+    /**
+     * @summary Interface for custom detector.
+     * @interface
+     */
+    interface CustomDetector {
+        name: string;
+
+        //todo: Checks paramters type.
+        cacheUserLanguage: (lng: string, options: Object) => void;
+        lookup: (options: Object) => string;
+    }
+
+    /**
+     * @summary i18next options.
+     * @interface
+     */
+    interface I18nextOptions {
+        detection?: LanguageDetectorOptions;
+    }
+
+    /**
+     * @summary i18next interface.
+     * @interface
+     */
+    interface I18nextStatic {
+        use(module: LngDetector): I18nextStatic;
+    }
+
+    /**
+     * @summary i18next language detection.
+     * @class
+     */
+    class LngDetector {
+        /**
+         * @summary Constructor.
+         * @constructor
+         */
+        constructor(services?: any, options?: LanguageDetectorOptions);
+
+        /**
+         * @summary Adds detector.
+         * @param {CustomDetector} detector The custom detector.
+         */
+        addDetector(detector: CustomDetector): LngDetector;
+
+        /**
+         * @summary Initializes detector.
+         * @param {LanguageDetectorOptions} options The options.
+         */
+        init(options?: LanguageDetectorOptions): void;
+    }
+}
+
+declare module "i18next-browser-languagedetector" {
+    import * as express from "express";
+    import * as i18next from "i18next";
+
+    export default i18nextBrowserLanguageDetector.LngDetector;
+}
diff --git a/i18next-browser-languagedetector/tsconfig.json b/i18next-browser-languagedetector/tsconfig.json
new file mode 100644
index 0000000000..7e4ec7534d
--- /dev/null
+++ b/i18next-browser-languagedetector/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "i18next-browser-languagedetector-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/i18next-express-middleware/i18next-express-middleware-tests.ts b/i18next-express-middleware/i18next-express-middleware-tests.ts
index 6fd69a3487..d56f7a9207 100644
--- a/i18next-express-middleware/i18next-express-middleware-tests.ts
+++ b/i18next-express-middleware/i18next-express-middleware-tests.ts
@@ -1,6 +1,3 @@
-///<reference path="../i18next/i18next-2.0.17.d.ts"/>
-///<reference path="i18next-express-middleware.d.ts"/>
-
 import * as express from "express";
 import * as i18next from "i18next";
 import middleware = require("i18next-express-middleware");
diff --git a/i18next-express-middleware/i18next-express-middleware.d.ts b/i18next-express-middleware/i18next-express-middleware.d.ts
deleted file mode 100644
index 960b39612d..0000000000
--- a/i18next-express-middleware/i18next-express-middleware.d.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-// Type definitions for i18next-express-middleware
-// Project: http://i18next.com/
-// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../express/express.d.ts"/>
-///<reference path="../i18next/i18next-2.0.17.d.ts"/>
-
-declare namespace I18next {
-    interface I18nextOptions extends i18nextExpressMiddleware.I18nextOptions { }
-}
-
-declare namespace i18nextExpressMiddleware {
-    /**
-     * @summary Interface for Language detector options.
-     * @interface
-     */
-    interface LanguageDetectorOptions {
-        caches?: Array<string>|boolean;
-        cookieDomain?: string;
-        cookieExpirationDate?: Date;
-        lookupCookie?: string;
-        lookupFromPathIndex?: number;
-        lookupQuerystring?: string;
-        lookupSession?: string;
-        order?: Array<string>;
-    }
-
-    /**
-     * @summary i18next options.
-     * @interface
-     */
-    interface I18nextOptions {
-        detection?: LanguageDetectorOptions;
-    }
-}
-
-declare module "i18next-express-middleware" {
-    import express = require("express");
-    import i18next = require("i18next");
-
-    /**
-     * @summary Interface for middleware to use i18next in express.js.
-     * @interface
-     */
-    export interface i18nextExpressMiddleware {
-        LanguageDetector(): express.Handler;
-        missingKeyHandler(): express.Handler;
-    }
-
-    /**
-     * @summary Interface for own detection functionality.
-     */
-    export interface i18nextCustomDetection {
-        name: string;
-        lookup: (req: express.Request, res: express.Response, options?: Object) => void;
-        cacheUserLanguage: (req: express.Request, res: express.Response, lng?: any, options?: Object) => void;
-    }
-
-    /**
-     * @summary Detects user language from current request.
-     * @class
-     */
-    export class LanguageDetector {
-        /**
-         * @summary Constructor.
-         * @constructor
-         * @param {any}     services    The services.
-         * @param {Object}  options     The options.
-         * @param {Object}  allOptions  The all options.
-         */
-        constructor(services?: any, options?: Object, allOptions?: Object);
-
-        /**
-         * @summary Adds detector.
-         * @param {i18nextCustomDetection} detector The detector to add.
-         */
-        addDetector(detector: i18nextCustomDetection): void;
-
-        // NOTE: add documentation
-        cacheUserLanguage(req: express.Request, res: express.Response, detectionOrder: any): void;
-
-        /**
-         * @summary Detects the language.
-         * @param {Request}         req             The HTTP request.
-         * @param {Response}        res             The HTTP response.
-         * @param {detectionOrder}  detectionOrder  The detection order.
-         */
-        detect(req: express.Request, res: express.Response, detectionOrder: any): void;
-
-        /**
-         * @summary Initializes class.
-         * @param {any}     services    The services.
-         * @param {Object}  options     The options.
-         * @param {Object}  allOptions  The all options.
-         */
-        init(services: any, options?: Object, allOptions?: Object): void;
-    }
-
-    export function getResourcesHandler(i18next: I18nextStatic, options: Object): express.Handler;
-    export function handle(i18next: I18nextStatic, options?: Object): express.Handler;
-
-    /**
-     * @summary Gets handler for missing key.
-     * @param {I18nextStatic}   i18next The i18next.
-     * @param {Object}          options The options.
-     * @return {express.Handler} The express handler.
-     */
-    export function missingKeyHandler(i18next: I18nextStatic, options: Object): express.Handler;
-}
diff --git a/i18next-express-middleware/index.d.ts b/i18next-express-middleware/index.d.ts
new file mode 100644
index 0000000000..e02fed221e
--- /dev/null
+++ b/i18next-express-middleware/index.d.ts
@@ -0,0 +1,109 @@
+// Type definitions for i18next-express-middleware
+// Project: http://i18next.com/
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="i18next" />
+
+declare namespace I18next {
+    interface I18nextOptions extends i18nextExpressMiddleware.I18nextOptions { }
+}
+
+declare namespace i18nextExpressMiddleware {
+    /**
+     * @summary Interface for Language detector options.
+     * @interface
+     */
+    interface LanguageDetectorOptions {
+        caches?: Array<string>|boolean;
+        cookieDomain?: string;
+        cookieExpirationDate?: Date;
+        lookupCookie?: string;
+        lookupFromPathIndex?: number;
+        lookupQuerystring?: string;
+        lookupSession?: string;
+        order?: Array<string>;
+    }
+
+    /**
+     * @summary i18next options.
+     * @interface
+     */
+    interface I18nextOptions {
+        detection?: LanguageDetectorOptions;
+    }
+}
+
+declare module "i18next-express-middleware" {
+    import express = require("express");
+    import i18next = require("i18next");
+
+    /**
+     * @summary Interface for middleware to use i18next in express.js.
+     * @interface
+     */
+    export interface i18nextExpressMiddleware {
+        LanguageDetector(): express.Handler;
+        missingKeyHandler(): express.Handler;
+    }
+
+    /**
+     * @summary Interface for own detection functionality.
+     */
+    export interface i18nextCustomDetection {
+        name: string;
+        lookup: (req: express.Request, res: express.Response, options?: Object) => void;
+        cacheUserLanguage: (req: express.Request, res: express.Response, lng?: any, options?: Object) => void;
+    }
+
+    /**
+     * @summary Detects user language from current request.
+     * @class
+     */
+    export class LanguageDetector {
+        /**
+         * @summary Constructor.
+         * @constructor
+         * @param {any}     services    The services.
+         * @param {Object}  options     The options.
+         * @param {Object}  allOptions  The all options.
+         */
+        constructor(services?: any, options?: Object, allOptions?: Object);
+
+        /**
+         * @summary Adds detector.
+         * @param {i18nextCustomDetection} detector The detector to add.
+         */
+        addDetector(detector: i18nextCustomDetection): void;
+
+        // NOTE: add documentation
+        cacheUserLanguage(req: express.Request, res: express.Response, detectionOrder: any): void;
+
+        /**
+         * @summary Detects the language.
+         * @param {Request}         req             The HTTP request.
+         * @param {Response}        res             The HTTP response.
+         * @param {detectionOrder}  detectionOrder  The detection order.
+         */
+        detect(req: express.Request, res: express.Response, detectionOrder: any): void;
+
+        /**
+         * @summary Initializes class.
+         * @param {any}     services    The services.
+         * @param {Object}  options     The options.
+         * @param {Object}  allOptions  The all options.
+         */
+        init(services: any, options?: Object, allOptions?: Object): void;
+    }
+
+    export function getResourcesHandler(i18next: I18next.I18n, options: Object): express.Handler;
+    export function handle(i18next: I18next.I18n, options?: Object): express.Handler;
+
+    /**
+     * @summary Gets handler for missing key.
+     * @param {I18nextStatic}   i18next The i18next.
+     * @param {Object}          options The options.
+     * @return {express.Handler} The express handler.
+     */
+    export function missingKeyHandler(i18next: I18next.I18n, options: Object): express.Handler;
+}
diff --git a/i18next-express-middleware/tsconfig.json b/i18next-express-middleware/tsconfig.json
new file mode 100644
index 0000000000..13120843ea
--- /dev/null
+++ b/i18next-express-middleware/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "i18next-express-middleware-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/i18next-node-fs-backend/i18next-node-fs-backend-tests.ts b/i18next-node-fs-backend/i18next-node-fs-backend-tests.ts
index 462dee9c00..924541f7a1 100644
--- a/i18next-node-fs-backend/i18next-node-fs-backend-tests.ts
+++ b/i18next-node-fs-backend/i18next-node-fs-backend-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="i18next-node-fs-backend.d.ts"/>
-
 import * as i18next from 'i18next';
 import * as Backend from 'i18next-node-fs-backend';
 
diff --git a/i18next-node-fs-backend/i18next-node-fs-backend.d.ts b/i18next-node-fs-backend/i18next-node-fs-backend.d.ts
deleted file mode 100644
index dd2ec3b793..0000000000
--- a/i18next-node-fs-backend/i18next-node-fs-backend.d.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-// Type definitions for i18next-node-fs-backend
-// Project: https://github.com/i18next/i18next-node-fs-backend
-// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../i18next/i18next-2.0.17.d.ts"/>
-
-declare namespace I18next {
-    interface I18nextOptions extends i18nextNodeFsBackEnd.I18nextOptions { }
-}
-
-declare namespace i18nextNodeFsBackEnd {
-    /**
-     * @summary Options for "i18next-node-fs-backend".
-     * @interface
-     */
-    interface i18nextNodeFsBackEndOptions {
-        // path where resources get loaded from
-        /**
-         * @summary Path where resources get loaded from.
-         * @type {string}
-         */
-        loadPath: string;
-
-        /**
-         * @summary Path to post missing resources
-         * @type {string}
-         */
-        addPath: string;
-
-        /**
-         * @summary jsonIndent to use when storing json files
-         * @type {number}
-         */
-        //
-        jsonIndent: number;
-    }
-
-    /**
-     * @summary Options for "i18next".
-     * @interface
-     */
-    interface I18nextOptions {
-        backend?: i18nextNodeFsBackEndOptions;
-    }
-}
-
-declare module "i18next-node-fs-backend" {
-    import * as i18next from "i18next";
-
-    class BackEnd {
-        constructor(services?: any, options?: Object);
-        init(options?: Object): void;
-    }
-
-    var out: typeof BackEnd;
-    export = out;
-}
diff --git a/i18next-node-fs-backend/index.d.ts b/i18next-node-fs-backend/index.d.ts
new file mode 100644
index 0000000000..48053b8ab5
--- /dev/null
+++ b/i18next-node-fs-backend/index.d.ts
@@ -0,0 +1,58 @@
+// Type definitions for i18next-node-fs-backend
+// Project: https://github.com/i18next/i18next-node-fs-backend
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="i18next" />
+
+declare namespace I18next {
+    interface I18nextOptions extends i18nextNodeFsBackEnd.I18nextOptions { }
+}
+
+declare namespace i18nextNodeFsBackEnd {
+    /**
+     * @summary Options for "i18next-node-fs-backend".
+     * @interface
+     */
+    interface i18nextNodeFsBackEndOptions {
+        // path where resources get loaded from
+        /**
+         * @summary Path where resources get loaded from.
+         * @type {string}
+         */
+        loadPath: string;
+
+        /**
+         * @summary Path to post missing resources
+         * @type {string}
+         */
+        addPath: string;
+
+        /**
+         * @summary jsonIndent to use when storing json files
+         * @type {number}
+         */
+        //
+        jsonIndent: number;
+    }
+
+    /**
+     * @summary Options for "i18next".
+     * @interface
+     */
+    interface I18nextOptions {
+        backend?: i18nextNodeFsBackEndOptions;
+    }
+}
+
+declare module "i18next-node-fs-backend" {
+    import * as i18next from "i18next";
+
+    class BackEnd {
+        constructor(services?: any, options?: Object);
+        init(options?: Object): void;
+    }
+
+    var out: typeof BackEnd;
+    export = out;
+}
diff --git a/i18next-node-fs-backend/tsconfig.json b/i18next-node-fs-backend/tsconfig.json
new file mode 100644
index 0000000000..15b14642c9
--- /dev/null
+++ b/i18next-node-fs-backend/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "i18next-node-fs-backend-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/i18next-sprintf-postprocessor/i18next-sprintf-postprocessor-tests.ts b/i18next-sprintf-postprocessor/i18next-sprintf-postprocessor-tests.ts
index 36a948d620..b0dd169eee 100644
--- a/i18next-sprintf-postprocessor/i18next-sprintf-postprocessor-tests.ts
+++ b/i18next-sprintf-postprocessor/i18next-sprintf-postprocessor-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="./i18next-sprintf-postprocessor.d.ts"/>
-
 import * as i18next from "i18next";
 import * as sprintfA from "i18next-sprintf-postprocessor";
 import sprintfB from "i18next-sprintf-postprocessor/dist/commonjs";
diff --git a/i18next-sprintf-postprocessor/i18next-sprintf-postprocessor.d.ts b/i18next-sprintf-postprocessor/i18next-sprintf-postprocessor.d.ts
deleted file mode 100644
index 1c0cf25ab1..0000000000
--- a/i18next-sprintf-postprocessor/i18next-sprintf-postprocessor.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// Type definitions for i18next-sprintf-postProcessor
-// Project: https://github.com/i18next/i18next-sprintf-postProcessor
-// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../i18next/i18next.d.ts"/>
-
-declare namespace I18next {
-  interface I18n {
-    t(key: string, ...args: any[]): string;
-  }
-}
-
-declare module "i18next-sprintf-postprocessor" {
-    import i18next = require("i18next");
-
-    interface I18nextSprintfPostProcessor {
-        name: string;
-        type: string;
-        process(value: any, key: string, options: any): any;
-        overloadTranslationOptionHandler(args: string[]): {
-          postProcess: "sprintf",
-          sprintf: string[]
-        };
-    }
-
-    var sprintf: I18nextSprintfPostProcessor;
-    export = sprintf;
-}
-
-declare module "i18next-sprintf-postprocessor/dist/commonjs" {
-    import sprintf = require("i18next-sprintf-postprocessor");
-    export default sprintf;
-}
diff --git a/i18next-sprintf-postprocessor/index.d.ts b/i18next-sprintf-postprocessor/index.d.ts
new file mode 100644
index 0000000000..566bb3e2d4
--- /dev/null
+++ b/i18next-sprintf-postprocessor/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for i18next-sprintf-postProcessor
+// Project: https://github.com/i18next/i18next-sprintf-postProcessor
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="i18next"/>
+
+declare namespace I18next {
+  interface I18n {
+    t(key: string, ...args: any[]): string;
+  }
+}
+
+declare module "i18next-sprintf-postprocessor" {
+    import i18next = require("i18next");
+
+    interface I18nextSprintfPostProcessor {
+        name: string;
+        type: string;
+        process(value: any, key: string, options: any): any;
+        overloadTranslationOptionHandler(args: string[]): {
+          postProcess: "sprintf",
+          sprintf: string[]
+        };
+    }
+
+    var sprintf: I18nextSprintfPostProcessor;
+    export = sprintf;
+}
+
+declare module "i18next-sprintf-postprocessor/dist/commonjs" {
+    import sprintf = require("i18next-sprintf-postprocessor");
+    export default sprintf;
+}
diff --git a/i18next-sprintf-postprocessor/tsconfig.json b/i18next-sprintf-postprocessor/tsconfig.json
new file mode 100644
index 0000000000..a4f4b9face
--- /dev/null
+++ b/i18next-sprintf-postprocessor/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "i18next-sprintf-postprocessor-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/i18next/i18next-2.0.17.d.ts b/i18next/i18next-2.0.17.d.ts
index 61cff428a3..a5a82f953b 100644
--- a/i18next/i18next-2.0.17.d.ts
+++ b/i18next/i18next-2.0.17.d.ts
@@ -5,7 +5,7 @@
 
 // Sources: https://github.com/jamuhl/i18next/
 
-/// <reference path="../jquery/jquery.d.ts" />
+/// <reference types="jquery" />
 
 declare namespace I18next {
     export interface I18nextStatic {}
diff --git a/i18next/i18next-tests-2.0.17.ts b/i18next/i18next-tests-2.0.17.ts
index 464811bb7f..1333bda1b5 100644
--- a/i18next/i18next-tests-2.0.17.ts
+++ b/i18next/i18next-tests-2.0.17.ts
@@ -1,9 +1,9 @@
-/// <reference path="../sinon/sinon.d.ts" />
-/// <reference path="../mocha/mocha.d.ts" />
-/// <reference path="../expect.js/expect.js.d.ts" />
-/// <reference path="../js-fixtures/fixtures.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="i18next-2.0.17.d.ts" />
+/// <reference types="sinon" />
+/// <reference types="mocha" />
+/// <reference types="expect.js" />
+/// <reference types="fixtures" />
+/// <reference types="jquery" />
+
 
 declare function done(): void;
 
diff --git a/i18next/i18next-tests.ts b/i18next/i18next-tests.ts
index e46a9ed5bf..7817c46717 100644
--- a/i18next/i18next-tests.ts
+++ b/i18next/i18next-tests.ts
@@ -1,11 +1,9 @@
-/// <reference path="../sinon/sinon.d.ts" />
-/// <reference path="../mocha/mocha.d.ts" />
-/// <reference path="../expect.js/expect.js.d.ts" />
-/// <reference path="../js-fixtures/fixtures.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="i18next.d.ts" />
+/// <reference types="sinon" />
+/// <reference types="mocha" />
+/// <reference types="expect.js" />
+/// <reference types="jquery" />
 
-import * as i18n from 'i18next';
+import i18n = require("i18next");
 
 i18n.init({
     debug: true,
@@ -50,15 +48,15 @@ i18n.init({
     },
     joinArrays: '\n',
     overloadTranslationOptionHandler: (args:any[]) => {
-        return <I18next.TranslationOptions>{}
+        return <i18n.TranslationOptions>{}
     },
-    interpolation: <I18next.InterpolationOptions>{},
+    interpolation: <i18n.InterpolationOptions>{},
     detection: null,
     backend: null,
     cache: null
 });
 
-i18n.t('helloWorld', <I18next.TranslationOptions> {
+i18n.t('helloWorld', <i18n.TranslationOptions> {
     defaultValue: 'default',
     count: 10
 });
diff --git a/i18next/i18next.d.ts b/i18next/i18next.d.ts
deleted file mode 100644
index d8627c4462..0000000000
--- a/i18next/i18next.d.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-// Type definitions for i18next v2.3.4
-// Project: http://i18next.com
-// Definitions by: Michael Ledin <https://github.com/mxl>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Sources: https://github.com/i18next/i18next/
-
-
-declare namespace I18next {
-    interface ResourceStore {
-        [language: string]: ResourceStoreLanguage;
-    }
-
-    interface ResourceStoreLanguage {
-        [namespace: string]: ResourceStoreKey;
-    }
-
-    interface ResourceStoreKey {
-        [key: string]: any;
-    }
-
-    interface InterpolationOptions {
-        escapeValue?: boolean;
-        prefix?: string;
-        suffix?: string;
-        prefixEscaped?: string;
-        suffixEscaped?: string;
-        unescapeSuffix?: string;
-        unescapePrefix?: string;
-        nestingPrefix?: string;
-        nestingSuffix?: string;
-        nestingPrefixEscaped?: string;
-        nestedSuffixEscaped?: string;
-        defaultVariables?: any;
-    }
-
-    interface TranslationOptions {
-        defaultValue?: string;
-        count?: number;
-        context?: any;
-        replace?: any;
-        lng?:string;
-        lngs?:string[];
-        fallbackLng?:string;
-        ns?:string|string[];
-        keySeparator?:string;
-        nsSeparator?:string;
-        returnObjects?:boolean;
-        joinArrays?:string;
-        postProcess?:string|any[];
-        interpolation?: InterpolationOptions;
-    }
-
-    interface Options {
-        debug?: boolean;
-        resources?: ResourceStore;
-        lng?: string;
-        fallbackLng?: string;
-        ns?: string|string[];
-        defaultNS?: string;
-        fallbackNS?: string|string[];
-        whitelist?:string[];
-        lowerCaseLng?: boolean;
-        load?: string
-        preload?: string[];
-        keySeparator?: string;
-        nsSeparator?: string;
-        pluralSeparator?: string;
-        contextSeparator?: string;
-        saveMissing?: boolean;
-        saveMissingTo?: string;
-        missingKeyHandler?: (lng:string, ns:string, key:string, fallbackValue:string) => void;
-        parseMissingKeyHandler?: (key:string) => void;
-        appendNamespaceToMissingKey?: boolean;
-        postProcess?: string|any[];
-        returnNull?: boolean;
-        returnEmptyString?: boolean;
-        returnObjects?: boolean;
-        returnedObjectHandler?: (key:string, value:string, options:any) => void;
-        joinArrays?: string;
-        overloadTranslationOptionHandler?: (args:any[]) => TranslationOptions;
-        interpolation?: InterpolationOptions;
-        detection?: any;
-        backend?: any;
-        cache?: any;
-    }
-
-    type TranslationFunction = (key:string, options?:TranslationOptions) => string;
-
-    class I18n {
-        constructor(options?:Options, callback?:(err:any, t:TranslationFunction) => void);
-
-        init(options?:Options, callback?:(err:any, t:TranslationFunction) => void):I18n;
-
-        loadResources(callback?:(err:any) => void):void;
-
-        use(module:any):I18n;
-
-        changeLanguage(lng:string, callback?:(err:any, t:TranslationFunction) => void):void;
-
-        getFixedT(lng?:string, ns?:string|string[]):TranslationFunction;
-
-        t(key:string, options?:TranslationOptions):string;
-
-        exists():boolean;
-
-        setDefaultNamespace(ns:string):void;
-
-        loadNamespaces(ns:string[], callback?:() => void):void;
-
-        loadLanguages(lngs:string[], callback?:()=>void):void;
-
-        dir(lng?:string):string;
-
-        createInstance(options?:Options, callback?:(err:any, t:TranslationFunction) => void):I18n;
-
-        cloneInstance(options?:Options, callback?:(err:any, t:TranslationFunction) => void):I18n;
-    }
-}
-
-declare module 'i18next' {
-    var i18n:I18next.I18n;
-
-    export = i18n;
-}
diff --git a/i18next/index.d.ts b/i18next/index.d.ts
new file mode 100644
index 0000000000..674911fc27
--- /dev/null
+++ b/i18next/index.d.ts
@@ -0,0 +1,123 @@
+// Type definitions for i18next v2.3.4
+// Project: http://i18next.com
+// Definitions by: Michael Ledin <https://github.com/mxl>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Sources: https://github.com/i18next/i18next/
+
+
+declare namespace I18n {
+    interface ResourceStore {
+        [language: string]: ResourceStoreLanguage;
+    }
+
+    interface ResourceStoreLanguage {
+        [namespace: string]: ResourceStoreKey;
+    }
+
+    interface ResourceStoreKey {
+        [key: string]: any;
+    }
+
+    interface InterpolationOptions {
+        escapeValue?: boolean;
+        prefix?: string;
+        suffix?: string;
+        prefixEscaped?: string;
+        suffixEscaped?: string;
+        unescapeSuffix?: string;
+        unescapePrefix?: string;
+        nestingPrefix?: string;
+        nestingSuffix?: string;
+        nestingPrefixEscaped?: string;
+        nestedSuffixEscaped?: string;
+        defaultVariables?: any;
+    }
+
+    interface TranslationOptions {
+        defaultValue?: string;
+        count?: number;
+        context?: any;
+        replace?: any;
+        lng?:string;
+        lngs?:string[];
+        fallbackLng?:string;
+        ns?:string|string[];
+        keySeparator?:string;
+        nsSeparator?:string;
+        returnObjects?:boolean;
+        joinArrays?:string;
+        postProcess?:string|any[];
+        interpolation?: InterpolationOptions;
+    }
+
+    interface Options {
+        debug?: boolean;
+        resources?: ResourceStore;
+        lng?: string;
+        fallbackLng?: string;
+        ns?: string|string[];
+        defaultNS?: string;
+        fallbackNS?: string|string[];
+        whitelist?:string[];
+        lowerCaseLng?: boolean;
+        load?: string
+        preload?: string[];
+        keySeparator?: string;
+        nsSeparator?: string;
+        pluralSeparator?: string;
+        contextSeparator?: string;
+        saveMissing?: boolean;
+        saveMissingTo?: string;
+        missingKeyHandler?: (lng:string, ns:string, key:string, fallbackValue:string) => void;
+        parseMissingKeyHandler?: (key:string) => void;
+        appendNamespaceToMissingKey?: boolean;
+        postProcess?: string|any[];
+        returnNull?: boolean;
+        returnEmptyString?: boolean;
+        returnObjects?: boolean;
+        returnedObjectHandler?: (key:string, value:string, options:any) => void;
+        joinArrays?: string;
+        overloadTranslationOptionHandler?: (args:any[]) => TranslationOptions;
+        interpolation?: InterpolationOptions;
+        detection?: any;
+        backend?: any;
+        cache?: any;
+    }
+
+    type TranslationFunction = (key:string, options?:TranslationOptions) => string;
+
+    class I18n {
+        constructor(options?:Options, callback?:(err:any, t:TranslationFunction) => void);
+
+        init(options?:Options, callback?:(err:any, t:TranslationFunction) => void):I18n;
+
+        loadResources(callback?:(err:any) => void):void;
+
+        use(module:any):I18n;
+
+        changeLanguage(lng:string, callback?:(err:any, t:TranslationFunction) => void):void;
+
+        getFixedT(lng?:string, ns?:string|string[]):TranslationFunction;
+
+        t(key:string, options?:TranslationOptions):string|any|Array<any>;
+
+        exists():boolean;
+
+        setDefaultNamespace(ns:string):void;
+
+        loadNamespaces(ns:string[], callback?:() => void):void;
+
+        loadLanguages(lngs:string[], callback?:()=>void):void;
+
+        dir(lng?:string):string;
+
+        createInstance(options?:Options, callback?:(err:any, t:TranslationFunction) => void):I18n;
+
+        cloneInstance(options?:Options, callback?:(err:any, t:TranslationFunction) => void):I18n;
+    }
+}
+
+declare var i18n:I18n.I18n;
+
+export = i18n;
diff --git a/i18next/tsconfig.json b/i18next/tsconfig.json
new file mode 100644
index 0000000000..cffcf00f77
--- /dev/null
+++ b/i18next/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "i18next-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/iban/iban-tests.ts b/iban/iban-tests.ts
index f33faeebd0..ac79e97a99 100644
--- a/iban/iban-tests.ts
+++ b/iban/iban-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="iban.d.ts" />
+
 
 /**
  * @summary Test for "electronicFormat" method.
diff --git a/iban/iban.ts.tscparams b/iban/iban.ts.tscparams
deleted file mode 100644
index 934bc29ef2..0000000000
--- a/iban/iban.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---noImplicitAny
\ No newline at end of file
diff --git a/iban/iban.d.ts b/iban/index.d.ts
similarity index 100%
rename from iban/iban.d.ts
rename to iban/index.d.ts
diff --git a/iban/tsconfig.json b/iban/tsconfig.json
new file mode 100644
index 0000000000..e1cd20f6c8
--- /dev/null
+++ b/iban/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "iban-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ibm-mobilefirst/ibm-mobilefirst-tests.ts b/ibm-mobilefirst/ibm-mobilefirst-tests.ts
index c45b630d7c..92dbee824d 100644
--- a/ibm-mobilefirst/ibm-mobilefirst-tests.ts
+++ b/ibm-mobilefirst/ibm-mobilefirst-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="ibm-mobilefirst.d.ts" />
+/// <reference types="jquery" />
+
 // Tests
 
 // Test WL.Client
diff --git a/ibm-mobilefirst/ibm-mobilefirst.d.ts b/ibm-mobilefirst/ibm-mobilefirst.d.ts
deleted file mode 100644
index 687e70cf7a..0000000000
--- a/ibm-mobilefirst/ibm-mobilefirst.d.ts
+++ /dev/null
@@ -1,908 +0,0 @@
-// Type definitions for IBM MobileFirst Platform Foundation
-// Project: http://www.ibm.com/software/products/en/mobilefirstfoundation
-// Definitions by: Guillermo Ignacio Enriquez Gutierrez <https://github.com/nacho4d>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace WL.Events {
-    var WORKLIGHT_IS_CONNECTED: string;
-    var WORKLIGHT_IS_DISCONNECTED: string;
-}
-declare namespace WL.AppProperty {
-    var AIR_ICON_16x16_PATH: string;
-    var AIR_ICON_128x128_PATH: string;
-    var DOWNLOAD_APP_LINK: string;
-    var APP_DISPLAY_NAME: string;
-    var APP_LOGIN_TYPE: string;
-    var APP_VERSION: string;
-    var LATEST_VERSION: string;
-    var MAIN_FILE_PATH: string;
-    var SHOW_IN_TASKBAR: string;
-    var THUMBNAIL_IMAGE_URL: string;
-}
-declare namespace WL.Environment {
-    var ADOBE_AIR: string;
-    var ANDROID: string;
-    var EMBEDDED: string;
-    var IPAD: string;
-    var IPHONE: string;
-    var MOBILE_WEB: string;
-    var PREVIEW: string;
-    var WINDOWS_PHONE_8: string;
-    var WINDOWS8: string;
-}
-declare namespace WL {
-    interface IResponse {
-        invocationContext?: any;
-    }
-    interface Headers {
-        [key: string]: string;
-    }
-    class ResponseBase {
-        invocationContext: any;
-        headerJSON: {[key: string]: any}; // JSON Object
-        readyState: number;
-        request: any;
-        responseJSON: {[key: string]: any}; // JSON Object
-        responseText: string;
-        responseXML: string;
-        status: number;
-        statusText: string;
-        errorCode: number;
-        errorMsg: string;
-    }
-    class FailureResponse extends ResponseBase {
-    }
-    class Response extends ResponseBase {
-        getHeaderNames(): string[];
-        getAllHeaders(): Headers;
-        getHeader(name: any): string;
-    }
-    interface Options {
-        onSuccess?: (response: IResponse) => void;
-        onFailure?: (response: IResponse) => void;
-        invocationContext?: any;
-    }
-    interface ResponseHandler<T> {
-        (response: T): void;
-    }
-}
-declare namespace WL.Analytics {
-    function disable(): void;
-    function enable(): void;
-    function log(message: string, name: string): void;
-    /**
-     * @deprecated since version 6.2. WL.Analytics.restart is now a NOP.
-     */
-    function restart(): void;
-    function send(): void;
-    function state(): void;
-}
-declare namespace WL.App {
-    interface ActionReceiverCallback {
-        (action: any): void;
-    }
-    interface Callback {
-        (): void;
-    }
-    interface OpenURLOptions {
-        status?: number;
-        toolbar?: number;
-        location?: number;
-        menubar?: number;
-        directories?: number;
-        resizable?: number;
-        scrollbars?: number;
-    }
-    interface Data {
-    }
-    interface KeepAliveInBackgroundOptions {
-        tickerText?: string;
-        contentTitle?: string;
-        contentTextText?: string;
-        icon?: string;
-        notificationId?: number;
-        className?: string;
-    }
-    function addActionReceiver(id: string, callback: ActionReceiverCallback): void;
-    /**
-     * @deprecate Deprecated.
-     */
-    function close(): void;
-    function copyToClipboard(stringToCopy: string, callback?: Callback): void;
-    function getDeviceLanguage(): string;
-    function getDeviceLocale(): string;
-    /**
-     * TODO: declare exception type. (Exceptions that are thrown by the IBM® Worklight® client runtime framework)
-     */
-    function getErrorMessage(exception: any): string;
-    function hideSplashScreen(): void;
-    function openURL(url: string, target?: string, options?: OpenURLOptions): void;
-    function overrideBackButton(callback: Callback): void;
-    function removeActionReceiver(id: string): void;
-    /**
-     * @deprecated since version 6.0.0
-     */
-    function resetBackButton(): void;
-    function sendActionToNative(action: string, data?: Data): void;
-    function setKeepAliveInBackground(enabled: boolean, options?: KeepAliveInBackgroundOptions): void;
-    function showSplashScreen(): void;
-}
-declare namespace WL.App.BackgroundHandler {
-    interface Handler {
-        (): void;
-    }
-    function setOnAppEnteringBackground(handler: Handler): void;
-    var hideView: Handler;
-    var defaultIOSBehavior: Handler;
-    /**
-     * @deprecated since version 6.0.0
-     */
-    var hideElements: Handler;
-}
-declare namespace WL.Badge {
-    function setNumber(badgeNumber: number): void;
-}
-declare namespace WL {
-    interface BusyIndicatorOptions {
-        tickerText?: string;
-        contentTitle?: string;
-        contentTextText?: string;
-        icon?: string;
-        notificationId?: number;
-        className?: string;
-    }
-    class BusyIndicator {
-        constructor(containerId?: string, options?: BusyIndicator);
-        hide(): void;
-        show(): void;
-    }
-}
-declare namespace WL.Client {
-    interface SharedTokenObject {
-        key: string;
-    }
-    interface ConnectOptions {
-        onSuccess: (response: ResponseBase) => void;
-        onFailure: (response: FailureResponse) => void;
-        timeout?: number;
-    }
-    interface ChallengehandlerInvocationData {
-        adapter: string;
-        procedure: string;
-        parameters: any[];
-    }
-    interface ChallengeHandlerAuthenticationOptions {
-    }
-    interface ChallengeHandlerSubmitLoginFormOptions {
-        timeout?: number;
-        headers?: Object;
-        parameters?: Object;
-    }
-    class AbstractChallengeHandler {
-        handleChallenge(challenge: any): boolean;
-        isCustomResponse(transport: any): boolean;
-        submitAdapterAuthentication(invocationData: ChallengehandlerInvocationData, options: ChallengeHandlerAuthenticationOptions): void;
-        submitFailure(error: string): void;
-        submitLoginForm(reqURL: string, options: ChallengeHandlerSubmitLoginFormOptions, submitLoginFormCallback: (transport: any) => void): void;
-        submitSuccess(): void;
-    }
-    interface InitOptions extends Options {
-        timeout?: number;
-        /**
-         * @deprecated since version 6.2. Use WL.Logger.config function with an object specifying the level instead.
-         */
-        enableLogger?: boolean;
-        messages?: string;
-        authenticator?: Object;
-        heartBeatIntervalInSecs?: number;
-        /**
-         * @deprecated. If you would like your application to connect to the Worklight Server, use WL.Client.connect().
-         */
-        connectOnStartup?: boolean;
-        onConnectionFailure?: (response: WL.FailureResponse) => void;
-        onUnsupportedVersion?: (response: WL.FailureResponse) => void;
-        onRequestTimeout?: (response: WL.FailureResponse) => void;
-        onUnsupportedBrowser?: (response: WL.FailureResponse) => void;
-        onDisabledCookies?: (response: WL.FailureResponse) => void;
-        onUserInstanceAccessViolation?: (response: WL.FailureResponse) => void;
-        onErrorRemoteDisableDenial?: (response: WL.FailureResponse) => void;
-        /**
-         * @deprecated since version 5.0.6. Instead, use onErrorRemoteDisableDenial.
-         */
-        onErrorAppVersionAccessDenial?: (response: WL.FailureResponse) => void;
-        validateArguments?: boolean;
-        autoHideSplash?: boolean;
-        onGetCustomDeviceProvisioningProperties: (resumeDeviceProvisioningProcess: (data: any) => void) => void;
-    }
-    interface ProcedureInvocationData {
-        adapter: string;
-        procedure: string;
-        parameters?: any[];
-        compressResponse?: boolean;
-    }
-    interface ProcedureInvocationResult {
-        isSuccessful: boolean;
-        errors?: string[];
-    }
-    interface ProcedureResponse extends ResponseBase {
-        invocationResult?: ProcedureInvocationResult;
-        parameters?: any[];
-    }
-    interface ProcedureInvocationOptions extends Options {
-        timeout: number;
-        onSuccess: (response: ProcedureResponse) => void;
-    }
-    function addGlobalHeader(headerName: string, headerValue: string): void;
-    function checkForDirectUpdate(options: Options): void;
-    function clearSharedToken(object: SharedTokenObject): JQueryDeferred<any>;
-    function close(): void;
-    function connect(options?: ConnectOptions): void;
-    function createChallengeHandler(realmName: string): AbstractChallengeHandler;
-    function createProvisioningChallengeHandler(realmName: string): AbstractChallengeHandler;
-    function createWLChallengeHandler(realName: string): AbstractChallengeHandler;
-    function deleteUserPref(key: string, options?: Options): void;
-    /**
-     * See WL.AppProperty for possible results
-     */
-    function getAppProperty(property: any): any;
-    /**
-     * See WL.Environment for possible results
-     */
-    function getEnvironment(): string;
-    function getLanguage(): string;
-    function getLastAccessToken(scope?: string): string;
-    function getLoginName(realmName: string): string;
-    /**
-     * @deprecated since version 7.0
-     */
-    function getRequiredAccessTokenScope(status: number, header: string): string;
-    function getSharedToken(object: SharedTokenObject): JQueryDeferred<any>;
-    function getUserInfo(realm: string, key: string): any;
-    function getUserName(realm: any): string;
-    function getUserPref(key: any): any;
-    function hasUserPref(key: any): boolean;
-    function init(options: InitOptions): void;
-    function invokeProcedure(invocationData: ProcedureInvocationData, options?: ProcedureInvocationOptions): JQueryDeferred<Response>;
-    /**
-     * @deprecated since version 4.1.3. Use WL.Device.getNetworkInfo instead.
-     */
-    function isConnected(): void;
-    function isUserAuthenticated(realm: string): boolean;
-    /**
-     * @deprecated since version 7.0. Use WL.Logger instead.
-     */
-    function logActivity(activityType: string): void;
-    function login(realm: string, options?: Options): void;
-    function logout(realm: string, options?: Options): void;
-    function minimize(): void;
-    /**
-     * @deprecated since version 7.0
-     */
-    function obtainAccessToken(scope: string, onSuccess: ResponseHandler<Response>, onFailure: ResponseHandler<FailureResponse>): void;
-    function purgeEventTransmissionBuffer(): void;
-    function reloadApp(): void;
-    function removeGlobalHeader(headerName: string): void;
-    interface EventTransmissionPolicy {
-        eventStorageEnabled?: boolean;
-        interval?: number;
-    }
-    function setEventTransmissionPolicy(policy: EventTransmissionPolicy): void;
-    function setHeartBeatInterval(interval: number): void;
-    function setSharedToken(token: SharedTokenObject): void;
-    function setUserPref(key: string, value: string, options?: Options): void;
-    interface UserPreferences {
-        [key: string]: string;
-    }
-    function setUserPrefs(userPrefsHash: UserPreferences, options?: Options): void;
-    function transmitEvent(event: any, immediate?: boolean): void;
-    function updateUserInfo(options: Options): void;
-}
-declare namespace WL.Device {
-    interface AddressPair {
-        wifiAddress: string;
-        "3GAddress": string;
-    }
-    interface NetworkInfo {
-        isNetworkConnected?: boolean;
-        isAirplaneMode?: boolean;
-        isRoaming?: boolean;
-        networkConnectionType?: string;
-        wifiName?: string;
-        telephonyNetworkType?: string;
-        carrierName?: string;
-        ipAddress?: string;
-        Ipv4Addresses?: AddressPair[];
-        Ipv6Addresses?: AddressPair[];
-    }
-    function getNetworkInfo(callback: (networkInfo: NetworkInfo) => void): void;
-}
-declare namespace WL.EncryptedCache {
-    var OK: number;
-    var ERROR_COULD_NOT_GENERATE_KEY: number;
-    var ERROR_CREDENTIALS_MISMATCH: number;
-    var ERROR_EOC_CLOSED: number;
-    var ERROR_EOC_DELETED: number;
-    var ERROR_EOC_TO_BE_DELETED: number;
-    var ERROR_INVALID_PARAMETER: number;
-    var ERROR_KEY_CREATION_IN_PROGRESS: number;
-    var ERROR_LOCAL_STORAGE_NOT_SUPPORTED: number;
-    var ERROR_MIGRATION: number;
-    var ERROR_NO_EOC: number;
-    var ERROR_NO_SUCH_KEY: number;
-    var ERROR_SECURE_RANDOM_GENERATOR_UNAVAILABLE: number;
-    var ERROR_UNKNOWN: number;
-    var ERROR_UNSAFE_CREDENTIALS: number;
-    /**
-     * See above statuses for possible values
-     */
-    interface StatusHandler {
-        (status: number): void;
-    }
-    function close(successHandler: StatusHandler, failureHandler: StatusHandler): void;
-    function destroy(successHandler: StatusHandler, failureHandler: StatusHandler): void;
-    function open(credentials: string, createIfNone: boolean, successHandler: StatusHandler, failureHandler: StatusHandler): void;
-    function read(key: string, successHandler: StatusHandler, failureHandler: StatusHandler): void;
-    function remove(key: string, successHandler: StatusHandler, failureHandler: StatusHandler): void;
-    function write(key: string, value: string, successHandler: StatusHandler, failureHandler: StatusHandler): void;
-}
-declare namespace WL.Geo {
-    interface Coordinate {
-        latitute: number;
-        longitude: number;
-    }
-    interface Circle extends Coordinate {
-        radius: number;
-    }
-    interface DistanceOptions {
-        bufferZoneWidth: number;
-    }
-    interface InsideOutsideOptions {
-        /**
-         * confidenceLevel can be 'low', 'medium', 'high'
-         */
-        confidenceLevel: string;
-    }
-    function getDistanceBetweenCoordinates(coordinate1: Coordinate, coordinate2: Coordinate): number;
-    function getDistanceToCircle(coordinate: Coordinate, circle: Circle, options: DistanceOptions): number;
-    function getDistanceToPolygon(coordinate: Coordinate, polygon: Coordinate[], options: DistanceOptions): number;
-    function isInsideCircle(coordinate: Coordinate, circle: Circle, options: InsideOutsideOptions): boolean;
-    function isInsidePolygon(coordinate: Coordinate, polygon: Coordinate[], options: InsideOutsideOptions): boolean;
-    function isOutsideCircle(coordinate: Coordinate, circle: Circle, options: InsideOutsideOptions): boolean;
-    function isOutsidePolygon(coordinate: Coordinate, polygon: Coordinate[], options: InsideOutsideOptions): boolean;
-}
-declare namespace WL {
-    class Item {
-        setEnabled(isEnable: string): void;
-        setImagePath(imagePath: string): void;
-        setTitle(title: string): void;
-    }
-}
-declare namespace WL.JSONStore {
-    /**
-     * Changes the password for the internal storage. You must have an initialized collection before calling WL.JSONStore.changePassword.
-     */
-    function changePassword(oldPassword: string, newPassword: string, username: string, options: WL.Options): JQueryDeferred<any>;
-    /**
-     * @deprecated since version 5.0.6, it is no longer needed if you use WL.JSONStore.init
-     */
-    function clearPassword(): boolean;
-    /**
-     * Locks access to all the collections until WL.JSONStore.init is called.
-     */
-    function closeAll(options?: WL.Options): JQueryDeferred<any>;
-    /**
-     * Commit a transaction.
-     */
-    function commitTransaction(): JQueryDeferred<number>;
-    /**
-     * Completely wipes data for all users, destroys the internal storage, and clears security artifacts.
-     * @parameters options is @deprecated
-     */
-    function destroy(username: string, options?: WL.Options): JQueryDeferred<number>;
-    /**
-     * @deprecated since version 6.2.0.
-     */
-    function documentify(id: number, data: any): any;
-    /**
-     * Returns information about the file that is used to persist data in the store. The following key value pairs are returned:
-     * name - name of the store
-     * size - the total size, in bytes, of the store
-     * isEncrypted - boolean that is true when encrypted and false otherwise.
-     */
-    function fileInfo(): JQueryDeferred<any>;
-    /**
-     * Provides an accessor to the collection if the collection exists, otherwise it returns undefined.
-     */
-    function get(collectionName: string): JSONStoreInstance;
-    /**
-     * Returns the message that is associated with a JSONStore error code.
-     */
-    function getErrorMessage(errorCode: number): string;
-    interface InitOptions {
-        username?: string;
-        password?: string;
-        clear?: boolean;
-        localKeyGen?: boolean;
-        analytics?: boolean;
-    }
-    function init(collections: any, options?: InitOptions): JQueryDeferred<any>;
-    /**
-     * @deprecated since version 5.0.6, it is no longer needed if you use WL.JSONStore.init
-     */
-    function initCollection(name: string, searchFields: any, options?: InitOptions): WL.JSONStore.JSONStoreInstance;
-    /**
-     * Creates a query for advanced find. See WL.JSONStore.QueryPart for more information.
-     */
-    function QueryPart(): QueryPartObj;
-    /**
-     * Roll back a transaction
-     */
-    function rollbackTransaction(): JQueryDeferred<number>;
-    /**
-     * Initiates a transaction
-     */
-    function startTransaction(): JQueryDeferred<number>;
-    /**
-     * Sets the password that is used to generate keys to encrypt data that is stored locally on the device.
-     * @deprecated since version 5.0.6, it is no longer needed if you use WL.JSONStore.init
-     */
-    function usePassword(pwd: string): boolean;
-    interface AddOptions extends WL.Options {
-        additionalSearchFields?: any;
-        markDirty?: boolean;
-        /**
-         * @deprecated
-         */
-        push?: boolean;
-    }
-    interface BasicFindOptions extends WL.Options {
-        filter?: string[];
-        sort?: string[];
-    }
-    interface AdvancedFindOptions extends BasicFindOptions {
-        limit?: number;
-        offset?: number;
-    }
-    interface FindOptions extends BasicFindOptions {
-        exact?: boolean;
-        limit?: number;
-        offset?: number;
-    }
-    interface EraseOptions extends WL.Options {
-        push?: boolean;
-    }
-    interface RefreshOptions extends WL.Options {
-        push: boolean;
-    }
-    interface ChangeOptions extends WL.Options {
-        addNew?: boolean;
-        markDirty?: boolean;
-        replaceCriteria?: string[];
-    }
-    interface RemoveOptions extends WL.Options {
-        markDirty?: boolean;
-        /**
-         * @deprecated
-         */
-        push?: boolean;
-        exact?: boolean;
-    }
-    interface ReplaceOptions extends WL.Options {
-        markDirty?: boolean;
-        /**
-         * @deprecated
-         */
-        push?: boolean;
-    }
-    interface StoreOptions extends WL.Options {
-        additionalSearchFields?: Object;
-        push?: boolean;
-    }
-    class JSONStoreInstance {
-        add(data: any, options?: AddOptions): JQueryDeferred<any>;
-        advancedFind(query: any[], options?: AdvancedFindOptions): JQueryDeferred<any>;
-        change(data: any, options?: ChangeOptions): JQueryDeferred<any>;
-        clear(options?: WL.Options): JQueryDeferred<any>;
-        count(query?: any, options?: WL.Options): JQueryDeferred<any>;
-        countAllDirty(options?: WL.Options): JQueryDeferred<any>;
-        enhance(name: string, fn: Function): number;
-        /**
-         * @deprecated since version 5.0.6, it is no longer needed if you use WL.JSONStore.JSONStoreInstance.remove with {push: false}.
-         */
-        erase(doc: any, options?: EraseOptions): void;
-        find(query: Object | Object[], options?: FindOptions): JQueryDeferred<any>;
-        findAll(options?: BasicFindOptions): JQueryDeferred<any>;
-        findById(options?: WL.Options): JQueryDeferred<any>;
-        isDirty(doc: any, options?: WL.Options): JQueryDeferred<boolean>;
-        /**
-         * @deprecated since version 6.2.0.
-         */
-        load(options?: WL.Options): JQueryDeferred<any>;
-        markClean(docs: any[], options?: WL.Options): JQueryDeferred<any>;
-        /**
-         * @deprecated since version 6.2.0.
-         */
-        push(options?: any): JQueryDeferred<any>;
-        /**
-         * @deprecated since version 5.0.6, it is no longer needed if you use WL.JSONStore.JSONStoreInstance.push.
-         */
-        pushSelected(doc: any, options?: WL.Options): JQueryDeferred<any>;
-        /**
-         * @deprecated since version 5.0.6. It is no longer needed if you use WL.JSONStore.JSONStoreInstance.replace with {push: false}.
-         */
-        refresh(doc: any, options?: RefreshOptions): JQueryDeferred<any>;
-        remove(doc: any, options?: RemoveOptions): JQueryDeferred<any>;
-        /**
-         * Deletes all the documents that are stored inside a collection.
-         */
-        removeCollection(options?: WL.Options): JQueryDeferred<any>;
-        replace(doc: Object | Object[], options?: ReplaceOptions): JQueryDeferred<any>;
-        /**
-         * Writes data to a collection.
-         * @deprecated since version 5.0.6, it is no longer needed if you use WL.JSONStore.JSONStoreInstance.add with {push: false}.
-         */
-        store(data: Object | Object[], options?: StoreOptions): void;
-        toString(limit?: number, offset?: number): JQueryDeferred<number>;
-    }
-    class QueryPartObj {
-        /**
-         * Add a between clause to a query for advanced find.
-         */
-        between(searchField: any, value: any): any[];
-        /**
-         * Add an equal to clause to a query for advanced find.
-         */
-        equal(searchField: any, value: any): any[];
-        /**
-         * Add a greater or equal thanclause to a query for advanced find.
-         */
-        greaterOrEqualThan(searchField: any, value: any): any[];
-        /**
-         * Add a greater than clause to a query for advanced find.
-         */
-        greaterThan(searchField: any, value: any): any[];
-        /**
-         * Add an in clause to a query for advanced find.
-         */
-        inside(searchField: any, value: any): any[];
-        /**
-         * Add a left clause to a query for advanced find.
-         */
-        leftLike(searchField: any, value: any): any[];
-        /**
-         * Add a less or equal than clause to a query for advanced find.
-         */
-        lessOrEqualThan(searchField: any, value: any): any[];
-        /**
-         * Add a less than clause to a query for advanced find.
-         */
-        lessThan(searchField: any, value: any): any[];
-        /**
-         * Add a like clause to a query for advanced find.
-         */
-        like(searchField: any, value: any): any[];
-        /**
-         * Add a not between clause to a query for advanced find.
-         */
-        notBetween(searchField: any, value: any): any[];
-        /**
-         * Add a not equal to clause to a query for advanced find.
-         */
-        notEqual(searchField: any, value: any): any[];
-        /**
-         * Add a not in clause to a query for advanced find.
-         */
-        notInside(searchField: any, value: any): any[];
-        /**
-         * Add a not left clause to a query for advanced find.
-         */
-        notLeftLike(searchField: any, value: any): any[];
-        /**
-         * Add a not like clause to a query for advanced find.
-         */
-        notLike(searchField: any, value: any): any[];
-        /**
-         * Add a not right clause to a query for advanced find.
-         */
-        notRightLike(searchField: any, value: any): any[];
-        /**
-         * Add a right clause to a query for advanced find.
-         */
-        rightLike(searchField: any, value: any): any[];
-    }
-}
-declare namespace WL.LocalStorage {
-    function getValue(key: string): string;
-    function setValue(key: string, value: string): void;
-    function clear(key: string): void;
-    function clearAll(): void;
-}
-declare namespace WL {
-    var Logger: LoggerObject;
-    interface LoggerCallback {
-        (message: string | string[], level: string, package: string): void;
-    }
-    interface Tag {
-        level?: boolean;
-        tag?: boolean;
-    }
-    interface Filter {
-        [name: string]: string;
-    }
-    interface LoggerOptions {
-        stringify?: boolean;
-        pretty?: boolean;
-        stacktrace?: boolean;
-        callback?: LoggerCallback;
-        pkg?: string;
-        tag?: Tag;
-        /**
-         * @deprecated since version 6.2. use filters instead.
-         */
-        whitelist?: string[];
-        /**
-         * @deprecated since version 6.2. use filters instead.
-         */
-        blacklist?: string[];
-        filters?: Filter;
-        capture?: boolean;
-        autoSendLogs?: boolean;
-        maxFileSize?: number;
-        level?: string[] | string | number;
-    }
-    interface NativeOptions {
-        maxFileSize?: number;
-        level?: string;
-        capture?: boolean;
-        autoSendLogs?: boolean;
-        autoUpdateConfig?: boolean;
-        filters?: Filter;
-    }
-    /**
-     * Artifact to allow chaining of Logger class as: WL.Logger.ctx({pkg: 'something'}).debug('Hello world');
-     */
-    class LoggerObject {
-        /**
-        * Configures the logger globally.
-        */
-        config(options?: LoggerOptions): LoggerObject;
-        /**
-         * Creates an instance of a logger with its own context (also called status or state).
-         */
-        create(options?: LoggerOptions): LogInstance;
-        /**
-         * Updates the state (also called context or status) of the logger.
-         */
-        ctx(options?: LoggerOptions): WL.LoggerObject;
-        /**
-         * Prints arguments to the console.
-         */
-        debug(message: string): void;
-        /**
-         * Prints arguments to the console.
-         */
-        error(message: string): void;
-        /**
-         * Prints arguments to the console.
-         */
-        fatal(message: string): void;
-        /**
-         * Prints arguments to the console.
-         */
-        info(message: string): void;
-        /**
-         * Prints arguments to the console.
-         */
-        log(message: string): void;
-        /**
-         * Attach additional metadata to the next logger instance call.
-         */
-        metadata(options: any): LoggerObject;
-        /**
-         * @deprecated since version 6.2. WL.Logger.on is now a no-op. WL.Logger is always enabled. Use WL.Logger.config with {'level': 'FATAL'} to reduce verbosity.
-         */
-        off(): WL.LoggerObject;
-        /**
-         * @deprecated since version 6.2. WL.Logger.on is now a no-op. WL.Logger is always enabled. Use WL.Logger.config with {'level': 'FATAL'} to reduce verbosity.
-         */
-        on(options: any): WL.LoggerObject;
-        /**
-         * Send any logs collected up to this point to the IBM® Worklight® server.
-         */
-        send(): JQueryDeferred<any>;
-        /**
-         * @deprecated since version 6.2. Use WL.Logger.config instead. Sets options in native application layer (iOS and Android only)
-         */
-        setNativeOptions(options?: NativeOptions): void;
-        /**
-         * Shows the status (current configuration) of the logger.
-         */
-        status(): JQueryDeferred<any>;
-        /**
-         * Prints arguments to the console.
-         */
-        trace(message: string): void;
-        /**
-         * Retrieves and applies any matching configuration profile from the IBM® Worklight® Server.
-         */
-        updateConfigFromServer(): JQueryDeferred<any>;
-        /**
-         * Prints arguments to the console.
-         */
-        warn(message: string): void;
-    }
-    /**
-     * Class which defines instances created via:  WL.Logger.create({pkg: 'something'});
-     * Actual definition is outside of WL namespace. For easier d.ts file compiling it is here
-     */
-    class LogInstance {
-        debug(message: string): void;
-        error(message: string): void;
-        fatal(message: string): void;
-        info(message: string): void;
-        trace(message: string): void;
-        warn(message: string): void;
-    }
-}
-declare namespace WL.NativePage {
-    function show(className: string, callback: (data: any) => void, data: any): void;
-}
-declare namespace WL.SecurityUtils {
-    interface DecryptOptions {
-        key: string;
-        ct: string;
-        lv: string;
-        src: string;
-        v: string;
-    }
-    interface EncryptOptions {
-        key: string;
-        text: string;
-    }
-    interface KeygenOptions {
-        password: string;
-        salt: string;
-        iterations: number;
-    }
-    function base64Decode(input: string): JQueryDeferred<string>;
-    function base64Encode(input: string): JQueryDeferred<string>;
-    function decrypt(options: DecryptOptions): JQueryDeferred<string>;
-    function encrypt(options: EncryptOptions): JQueryDeferred<string>;
-    function keygen(options: KeygenOptions): JQueryDeferred<string>;
-    function localRandomString(bytes?: number): JQueryDeferred<string>;
-    function remoteRandomString(bytes?: number): JQueryDeferred<string>;
-}
-declare namespace WL.SimpleDialog {
-    interface Button {
-        text: string;
-        handler?: Function;
-    }
-    interface Options {
-        title: string;
-        text: string;
-    }
-    function show(title: string, text: string, buttons: Button[], options?: Options): void;
-}
-
-declare namespace WL.TabBar {
-    interface ItemOptions {
-        image: string;
-        badge?: string; // for iOS
-        imageSelected?: string; // for Android
-    }
-    function addItem(id: string, callback: Function, title: string, options: ItemOptions): WL.TabBarItem;
-    function init(): void;
-    function isVisible(): boolean;
-    function RemoveAllItems(): void;
-    function setEnabled(isEnabled: boolean): void;
-    /**
-     * @deprecated
-     */
-    function setParentDivId(parentId: string): void;
-    function setSelectedItem(id: string): void;
-    function setVisible(isVisible: boolean): void;
-}
-
-declare namespace WL {
-    class TabBarItem {
-        setEnabled(isEnabled: boolean): void;
-        updateBadge(badge?: string): void;
-    }
-}
-
-declare namespace WL.Toast {
-    function show(): void;
-}
-declare namespace WL.Trusteer {
-    interface AssesmentRisk {
-        value: number;
-        additionalData: string;
-        lastCalculated: number;
-        name: string;
-    }
-    interface AssetmentRisks {
-        device_key: string;
-        'malware.any'?: AssesmentRisk;
-        'network.wifi'?: AssesmentRisk;
-        'os.rooted'?: AssesmentRisk;
-        'os.rooted.native'?: AssesmentRisk;
-        'os.rooted.hiders'?: AssesmentRisk;
-        'os.ver_up_to_date'?: AssesmentRisk;
-        'plat.android.dumpsys'?: AssesmentRisk;
-        'plat.android.apprestrict'?: AssesmentRisk;
-        'total.risk.generic'?: AssesmentRisk;
-        'tas.config_update'?: AssesmentRisk;
-    }
-    function getRiskAssessment(onSuccess: ResponseHandler<Response>, onFailure: ResponseHandler<FailureResponse>): AssetmentRisks;
-}
-declare namespace WL.UserAuth {
-    function deleteCertificate(provisioningEntity?: string): JQueryDeferred<void>;
-}
-declare namespace WLAuthorizationManager {
-    /**
-     * AuthorizationPersistencePolicy possible values
-     */
-    var ALWAYS: string;
-    var NEVER: string;
-    interface RequestObject {
-        setRequestHeader: (header: string, value: string) => void;
-    }
-    function addCachedAuthorizationHeader(request: RequestObject): JQueryDeferred<RequestObject>;
-    function getAppIdentity(): JQueryDeferred<any>;
-    function getAuthorizationScope(responseAuthenticationHeader: string): string;
-    /**
-     * TODO: Set Promise types. Should be something like: JQueryDeferred<data, error>()
-     */
-    function getCachedAuthorizationHeader(): JQueryDeferred<any>;
-    /**
-     * TODO: Set Promise types. Should be something like: JQueryDeferred<data, error>()
-     */
-    function getDeviceIdentity(): JQueryDeferred<any>;
-    /**
-     * TODO: Set Promise types. Should be something like: JQueryDeferred<data, error>()
-     */
-    function getUserIdentity(): JQueryDeferred<any>;
-    function isAuthorizationRequired(responseStatus: number, responseAuthenticationHeader: string): boolean;
-    /**
-     * TODO: Set Promise types. Should be something like: JQueryDeferred<header, error>()
-     */
-    function obtainAuthorizationHeader(scope: string): JQueryDeferred<any>;
-    /**
-     * See WLAuthorizarionManager.NEVER and WLAuthorizarionManager.ALWAYS
-     */
-    function setAuthorizationPersistencePolicy(authorizationPersistencePolicy: string): void;
-}
-
-declare namespace WL {
-    var ClientMessages: { [name: string]: string };
-}
-
-declare class WLResourceRequest {
-    constructor(url: string, method: string, timeout?: number);
-    addHeader(name: string, value: string|number|boolean): void;
-    getHeader(name: string): string;
-    getHeaderNames(): string[];
-    getHeaders(name: string): string[];
-    getMethod(): string;
-    getQueryParameters(): any; // JSON
-    getTimeout(): number;
-    getUrl(): string;
-    send(content?: any): JQueryDeferred<any>;
-    sendFormParameters(json: Object): JQueryDeferred<any>;
-    setHeader(name: string, value: string|number|boolean): void;
-    setHeaders(requestHeaders?: { [name: string]: string|string[] }): void;
-    setQueryParameter(name: string, value: string|number|boolean|Object): void;
-    setQueryParameters(parameters?: { [name: string]: string|number|boolean|Object }): void;
-    setTimeout(requestTimeout: number): void;
-
-    static GET: string;
-    static POST: string;
-    static PUT: string;
-    static DELETE: string;
-    static HEAD: string;
-    static OPTIONS: string;
-    static TRACE: string;
-    static CONNECT: string;
-}
diff --git a/ibm-mobilefirst/index.d.ts b/ibm-mobilefirst/index.d.ts
new file mode 100644
index 0000000000..957d9075e0
--- /dev/null
+++ b/ibm-mobilefirst/index.d.ts
@@ -0,0 +1,908 @@
+// Type definitions for IBM MobileFirst Platform Foundation
+// Project: http://www.ibm.com/software/products/en/mobilefirstfoundation
+// Definitions by: Guillermo Ignacio Enriquez Gutierrez <https://github.com/nacho4d>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace WL.Events {
+    var WORKLIGHT_IS_CONNECTED: string;
+    var WORKLIGHT_IS_DISCONNECTED: string;
+}
+declare namespace WL.AppProperty {
+    var AIR_ICON_16x16_PATH: string;
+    var AIR_ICON_128x128_PATH: string;
+    var DOWNLOAD_APP_LINK: string;
+    var APP_DISPLAY_NAME: string;
+    var APP_LOGIN_TYPE: string;
+    var APP_VERSION: string;
+    var LATEST_VERSION: string;
+    var MAIN_FILE_PATH: string;
+    var SHOW_IN_TASKBAR: string;
+    var THUMBNAIL_IMAGE_URL: string;
+}
+declare namespace WL.Environment {
+    var ADOBE_AIR: string;
+    var ANDROID: string;
+    var EMBEDDED: string;
+    var IPAD: string;
+    var IPHONE: string;
+    var MOBILE_WEB: string;
+    var PREVIEW: string;
+    var WINDOWS_PHONE_8: string;
+    var WINDOWS8: string;
+}
+declare namespace WL {
+    interface IResponse {
+        invocationContext?: any;
+    }
+    interface Headers {
+        [key: string]: string;
+    }
+    class ResponseBase {
+        invocationContext: any;
+        headerJSON: {[key: string]: any}; // JSON Object
+        readyState: number;
+        request: any;
+        responseJSON: {[key: string]: any}; // JSON Object
+        responseText: string;
+        responseXML: string;
+        status: number;
+        statusText: string;
+        errorCode: number;
+        errorMsg: string;
+    }
+    class FailureResponse extends ResponseBase {
+    }
+    class Response extends ResponseBase {
+        getHeaderNames(): string[];
+        getAllHeaders(): Headers;
+        getHeader(name: any): string;
+    }
+    interface Options {
+        onSuccess?: (response: IResponse) => void;
+        onFailure?: (response: IResponse) => void;
+        invocationContext?: any;
+    }
+    interface ResponseHandler<T> {
+        (response: T): void;
+    }
+}
+declare namespace WL.Analytics {
+    function disable(): void;
+    function enable(): void;
+    function log(message: string, name: string): void;
+    /**
+     * @deprecated since version 6.2. WL.Analytics.restart is now a NOP.
+     */
+    function restart(): void;
+    function send(): void;
+    function state(): void;
+}
+declare namespace WL.App {
+    interface ActionReceiverCallback {
+        (action: any): void;
+    }
+    interface Callback {
+        (): void;
+    }
+    interface OpenURLOptions {
+        status?: number;
+        toolbar?: number;
+        location?: number;
+        menubar?: number;
+        directories?: number;
+        resizable?: number;
+        scrollbars?: number;
+    }
+    interface Data {
+    }
+    interface KeepAliveInBackgroundOptions {
+        tickerText?: string;
+        contentTitle?: string;
+        contentTextText?: string;
+        icon?: string;
+        notificationId?: number;
+        className?: string;
+    }
+    function addActionReceiver(id: string, callback: ActionReceiverCallback): void;
+    /**
+     * @deprecate Deprecated.
+     */
+    function close(): void;
+    function copyToClipboard(stringToCopy: string, callback?: Callback): void;
+    function getDeviceLanguage(): string;
+    function getDeviceLocale(): string;
+    /**
+     * TODO: declare exception type. (Exceptions that are thrown by the IBM® Worklight® client runtime framework)
+     */
+    function getErrorMessage(exception: any): string;
+    function hideSplashScreen(): void;
+    function openURL(url: string, target?: string, options?: OpenURLOptions): void;
+    function overrideBackButton(callback: Callback): void;
+    function removeActionReceiver(id: string): void;
+    /**
+     * @deprecated since version 6.0.0
+     */
+    function resetBackButton(): void;
+    function sendActionToNative(action: string, data?: Data): void;
+    function setKeepAliveInBackground(enabled: boolean, options?: KeepAliveInBackgroundOptions): void;
+    function showSplashScreen(): void;
+}
+declare namespace WL.App.BackgroundHandler {
+    interface Handler {
+        (): void;
+    }
+    function setOnAppEnteringBackground(handler: Handler): void;
+    var hideView: Handler;
+    var defaultIOSBehavior: Handler;
+    /**
+     * @deprecated since version 6.0.0
+     */
+    var hideElements: Handler;
+}
+declare namespace WL.Badge {
+    function setNumber(badgeNumber: number): void;
+}
+declare namespace WL {
+    interface BusyIndicatorOptions {
+        tickerText?: string;
+        contentTitle?: string;
+        contentTextText?: string;
+        icon?: string;
+        notificationId?: number;
+        className?: string;
+    }
+    class BusyIndicator {
+        constructor(containerId?: string, options?: BusyIndicator);
+        hide(): void;
+        show(): void;
+    }
+}
+declare namespace WL.Client {
+    interface SharedTokenObject {
+        key: string;
+    }
+    interface ConnectOptions {
+        onSuccess: (response: ResponseBase) => void;
+        onFailure: (response: FailureResponse) => void;
+        timeout?: number;
+    }
+    interface ChallengehandlerInvocationData {
+        adapter: string;
+        procedure: string;
+        parameters: any[];
+    }
+    interface ChallengeHandlerAuthenticationOptions {
+    }
+    interface ChallengeHandlerSubmitLoginFormOptions {
+        timeout?: number;
+        headers?: Object;
+        parameters?: Object;
+    }
+    class AbstractChallengeHandler {
+        handleChallenge(challenge: any): boolean;
+        isCustomResponse(transport: any): boolean;
+        submitAdapterAuthentication(invocationData: ChallengehandlerInvocationData, options: ChallengeHandlerAuthenticationOptions): void;
+        submitFailure(error: string): void;
+        submitLoginForm(reqURL: string, options: ChallengeHandlerSubmitLoginFormOptions, submitLoginFormCallback: (transport: any) => void): void;
+        submitSuccess(): void;
+    }
+    interface InitOptions extends Options {
+        timeout?: number;
+        /**
+         * @deprecated since version 6.2. Use WL.Logger.config function with an object specifying the level instead.
+         */
+        enableLogger?: boolean;
+        messages?: string;
+        authenticator?: Object;
+        heartBeatIntervalInSecs?: number;
+        /**
+         * @deprecated. If you would like your application to connect to the Worklight Server, use WL.Client.connect().
+         */
+        connectOnStartup?: boolean;
+        onConnectionFailure?: (response: WL.FailureResponse) => void;
+        onUnsupportedVersion?: (response: WL.FailureResponse) => void;
+        onRequestTimeout?: (response: WL.FailureResponse) => void;
+        onUnsupportedBrowser?: (response: WL.FailureResponse) => void;
+        onDisabledCookies?: (response: WL.FailureResponse) => void;
+        onUserInstanceAccessViolation?: (response: WL.FailureResponse) => void;
+        onErrorRemoteDisableDenial?: (response: WL.FailureResponse) => void;
+        /**
+         * @deprecated since version 5.0.6. Instead, use onErrorRemoteDisableDenial.
+         */
+        onErrorAppVersionAccessDenial?: (response: WL.FailureResponse) => void;
+        validateArguments?: boolean;
+        autoHideSplash?: boolean;
+        onGetCustomDeviceProvisioningProperties: (resumeDeviceProvisioningProcess: (data: any) => void) => void;
+    }
+    interface ProcedureInvocationData {
+        adapter: string;
+        procedure: string;
+        parameters?: any[];
+        compressResponse?: boolean;
+    }
+    interface ProcedureInvocationResult {
+        isSuccessful: boolean;
+        errors?: string[];
+    }
+    interface ProcedureResponse extends ResponseBase {
+        invocationResult?: ProcedureInvocationResult;
+        parameters?: any[];
+    }
+    interface ProcedureInvocationOptions extends Options {
+        timeout: number;
+        onSuccess: (response: ProcedureResponse) => void;
+    }
+    function addGlobalHeader(headerName: string, headerValue: string): void;
+    function checkForDirectUpdate(options: Options): void;
+    function clearSharedToken(object: SharedTokenObject): JQueryDeferred<any>;
+    function close(): void;
+    function connect(options?: ConnectOptions): void;
+    function createChallengeHandler(realmName: string): AbstractChallengeHandler;
+    function createProvisioningChallengeHandler(realmName: string): AbstractChallengeHandler;
+    function createWLChallengeHandler(realName: string): AbstractChallengeHandler;
+    function deleteUserPref(key: string, options?: Options): void;
+    /**
+     * See WL.AppProperty for possible results
+     */
+    function getAppProperty(property: any): any;
+    /**
+     * See WL.Environment for possible results
+     */
+    function getEnvironment(): string;
+    function getLanguage(): string;
+    function getLastAccessToken(scope?: string): string;
+    function getLoginName(realmName: string): string;
+    /**
+     * @deprecated since version 7.0
+     */
+    function getRequiredAccessTokenScope(status: number, header: string): string;
+    function getSharedToken(object: SharedTokenObject): JQueryDeferred<any>;
+    function getUserInfo(realm: string, key: string): any;
+    function getUserName(realm: any): string;
+    function getUserPref(key: any): any;
+    function hasUserPref(key: any): boolean;
+    function init(options: InitOptions): void;
+    function invokeProcedure(invocationData: ProcedureInvocationData, options?: ProcedureInvocationOptions): JQueryDeferred<Response>;
+    /**
+     * @deprecated since version 4.1.3. Use WL.Device.getNetworkInfo instead.
+     */
+    function isConnected(): void;
+    function isUserAuthenticated(realm: string): boolean;
+    /**
+     * @deprecated since version 7.0. Use WL.Logger instead.
+     */
+    function logActivity(activityType: string): void;
+    function login(realm: string, options?: Options): void;
+    function logout(realm: string, options?: Options): void;
+    function minimize(): void;
+    /**
+     * @deprecated since version 7.0
+     */
+    function obtainAccessToken(scope: string, onSuccess: ResponseHandler<Response>, onFailure: ResponseHandler<FailureResponse>): void;
+    function purgeEventTransmissionBuffer(): void;
+    function reloadApp(): void;
+    function removeGlobalHeader(headerName: string): void;
+    interface EventTransmissionPolicy {
+        eventStorageEnabled?: boolean;
+        interval?: number;
+    }
+    function setEventTransmissionPolicy(policy: EventTransmissionPolicy): void;
+    function setHeartBeatInterval(interval: number): void;
+    function setSharedToken(token: SharedTokenObject): void;
+    function setUserPref(key: string, value: string, options?: Options): void;
+    interface UserPreferences {
+        [key: string]: string;
+    }
+    function setUserPrefs(userPrefsHash: UserPreferences, options?: Options): void;
+    function transmitEvent(event: any, immediate?: boolean): void;
+    function updateUserInfo(options: Options): void;
+}
+declare namespace WL.Device {
+    interface AddressPair {
+        wifiAddress: string;
+        "3GAddress": string;
+    }
+    interface NetworkInfo {
+        isNetworkConnected?: boolean;
+        isAirplaneMode?: boolean;
+        isRoaming?: boolean;
+        networkConnectionType?: string;
+        wifiName?: string;
+        telephonyNetworkType?: string;
+        carrierName?: string;
+        ipAddress?: string;
+        Ipv4Addresses?: AddressPair[];
+        Ipv6Addresses?: AddressPair[];
+    }
+    function getNetworkInfo(callback: (networkInfo: NetworkInfo) => void): void;
+}
+declare namespace WL.EncryptedCache {
+    var OK: number;
+    var ERROR_COULD_NOT_GENERATE_KEY: number;
+    var ERROR_CREDENTIALS_MISMATCH: number;
+    var ERROR_EOC_CLOSED: number;
+    var ERROR_EOC_DELETED: number;
+    var ERROR_EOC_TO_BE_DELETED: number;
+    var ERROR_INVALID_PARAMETER: number;
+    var ERROR_KEY_CREATION_IN_PROGRESS: number;
+    var ERROR_LOCAL_STORAGE_NOT_SUPPORTED: number;
+    var ERROR_MIGRATION: number;
+    var ERROR_NO_EOC: number;
+    var ERROR_NO_SUCH_KEY: number;
+    var ERROR_SECURE_RANDOM_GENERATOR_UNAVAILABLE: number;
+    var ERROR_UNKNOWN: number;
+    var ERROR_UNSAFE_CREDENTIALS: number;
+    /**
+     * See above statuses for possible values
+     */
+    interface StatusHandler {
+        (status: number): void;
+    }
+    function close(successHandler: StatusHandler, failureHandler: StatusHandler): void;
+    function destroy(successHandler: StatusHandler, failureHandler: StatusHandler): void;
+    function open(credentials: string, createIfNone: boolean, successHandler: StatusHandler, failureHandler: StatusHandler): void;
+    function read(key: string, successHandler: StatusHandler, failureHandler: StatusHandler): void;
+    function remove(key: string, successHandler: StatusHandler, failureHandler: StatusHandler): void;
+    function write(key: string, value: string, successHandler: StatusHandler, failureHandler: StatusHandler): void;
+}
+declare namespace WL.Geo {
+    interface Coordinate {
+        latitute: number;
+        longitude: number;
+    }
+    interface Circle extends Coordinate {
+        radius: number;
+    }
+    interface DistanceOptions {
+        bufferZoneWidth: number;
+    }
+    interface InsideOutsideOptions {
+        /**
+         * confidenceLevel can be 'low', 'medium', 'high'
+         */
+        confidenceLevel: string;
+    }
+    function getDistanceBetweenCoordinates(coordinate1: Coordinate, coordinate2: Coordinate): number;
+    function getDistanceToCircle(coordinate: Coordinate, circle: Circle, options: DistanceOptions): number;
+    function getDistanceToPolygon(coordinate: Coordinate, polygon: Coordinate[], options: DistanceOptions): number;
+    function isInsideCircle(coordinate: Coordinate, circle: Circle, options: InsideOutsideOptions): boolean;
+    function isInsidePolygon(coordinate: Coordinate, polygon: Coordinate[], options: InsideOutsideOptions): boolean;
+    function isOutsideCircle(coordinate: Coordinate, circle: Circle, options: InsideOutsideOptions): boolean;
+    function isOutsidePolygon(coordinate: Coordinate, polygon: Coordinate[], options: InsideOutsideOptions): boolean;
+}
+declare namespace WL {
+    class Item {
+        setEnabled(isEnable: string): void;
+        setImagePath(imagePath: string): void;
+        setTitle(title: string): void;
+    }
+}
+declare namespace WL.JSONStore {
+    /**
+     * Changes the password for the internal storage. You must have an initialized collection before calling WL.JSONStore.changePassword.
+     */
+    function changePassword(oldPassword: string, newPassword: string, username: string, options: WL.Options): JQueryDeferred<any>;
+    /**
+     * @deprecated since version 5.0.6, it is no longer needed if you use WL.JSONStore.init
+     */
+    function clearPassword(): boolean;
+    /**
+     * Locks access to all the collections until WL.JSONStore.init is called.
+     */
+    function closeAll(options?: WL.Options): JQueryDeferred<any>;
+    /**
+     * Commit a transaction.
+     */
+    function commitTransaction(): JQueryDeferred<number>;
+    /**
+     * Completely wipes data for all users, destroys the internal storage, and clears security artifacts.
+     * @parameters options is @deprecated
+     */
+    function destroy(username: string, options?: WL.Options): JQueryDeferred<number>;
+    /**
+     * @deprecated since version 6.2.0.
+     */
+    function documentify(id: number, data: any): any;
+    /**
+     * Returns information about the file that is used to persist data in the store. The following key value pairs are returned:
+     * name - name of the store
+     * size - the total size, in bytes, of the store
+     * isEncrypted - boolean that is true when encrypted and false otherwise.
+     */
+    function fileInfo(): JQueryDeferred<any>;
+    /**
+     * Provides an accessor to the collection if the collection exists, otherwise it returns undefined.
+     */
+    function get(collectionName: string): JSONStoreInstance;
+    /**
+     * Returns the message that is associated with a JSONStore error code.
+     */
+    function getErrorMessage(errorCode: number): string;
+    interface InitOptions {
+        username?: string;
+        password?: string;
+        clear?: boolean;
+        localKeyGen?: boolean;
+        analytics?: boolean;
+    }
+    function init(collections: any, options?: InitOptions): JQueryDeferred<any>;
+    /**
+     * @deprecated since version 5.0.6, it is no longer needed if you use WL.JSONStore.init
+     */
+    function initCollection(name: string, searchFields: any, options?: InitOptions): WL.JSONStore.JSONStoreInstance;
+    /**
+     * Creates a query for advanced find. See WL.JSONStore.QueryPart for more information.
+     */
+    function QueryPart(): QueryPartObj;
+    /**
+     * Roll back a transaction
+     */
+    function rollbackTransaction(): JQueryDeferred<number>;
+    /**
+     * Initiates a transaction
+     */
+    function startTransaction(): JQueryDeferred<number>;
+    /**
+     * Sets the password that is used to generate keys to encrypt data that is stored locally on the device.
+     * @deprecated since version 5.0.6, it is no longer needed if you use WL.JSONStore.init
+     */
+    function usePassword(pwd: string): boolean;
+    interface AddOptions extends WL.Options {
+        additionalSearchFields?: any;
+        markDirty?: boolean;
+        /**
+         * @deprecated
+         */
+        push?: boolean;
+    }
+    interface BasicFindOptions extends WL.Options {
+        filter?: string[];
+        sort?: string[];
+    }
+    interface AdvancedFindOptions extends BasicFindOptions {
+        limit?: number;
+        offset?: number;
+    }
+    interface FindOptions extends BasicFindOptions {
+        exact?: boolean;
+        limit?: number;
+        offset?: number;
+    }
+    interface EraseOptions extends WL.Options {
+        push?: boolean;
+    }
+    interface RefreshOptions extends WL.Options {
+        push: boolean;
+    }
+    interface ChangeOptions extends WL.Options {
+        addNew?: boolean;
+        markDirty?: boolean;
+        replaceCriteria?: string[];
+    }
+    interface RemoveOptions extends WL.Options {
+        markDirty?: boolean;
+        /**
+         * @deprecated
+         */
+        push?: boolean;
+        exact?: boolean;
+    }
+    interface ReplaceOptions extends WL.Options {
+        markDirty?: boolean;
+        /**
+         * @deprecated
+         */
+        push?: boolean;
+    }
+    interface StoreOptions extends WL.Options {
+        additionalSearchFields?: Object;
+        push?: boolean;
+    }
+    class JSONStoreInstance {
+        add(data: any, options?: AddOptions): JQueryDeferred<any>;
+        advancedFind(query: any[], options?: AdvancedFindOptions): JQueryDeferred<any>;
+        change(data: any, options?: ChangeOptions): JQueryDeferred<any>;
+        clear(options?: WL.Options): JQueryDeferred<any>;
+        count(query?: any, options?: WL.Options): JQueryDeferred<any>;
+        countAllDirty(options?: WL.Options): JQueryDeferred<any>;
+        enhance(name: string, fn: Function): number;
+        /**
+         * @deprecated since version 5.0.6, it is no longer needed if you use WL.JSONStore.JSONStoreInstance.remove with {push: false}.
+         */
+        erase(doc: any, options?: EraseOptions): void;
+        find(query: Object | Object[], options?: FindOptions): JQueryDeferred<any>;
+        findAll(options?: BasicFindOptions): JQueryDeferred<any>;
+        findById(options?: WL.Options): JQueryDeferred<any>;
+        isDirty(doc: any, options?: WL.Options): JQueryDeferred<boolean>;
+        /**
+         * @deprecated since version 6.2.0.
+         */
+        load(options?: WL.Options): JQueryDeferred<any>;
+        markClean(docs: any[], options?: WL.Options): JQueryDeferred<any>;
+        /**
+         * @deprecated since version 6.2.0.
+         */
+        push(options?: any): JQueryDeferred<any>;
+        /**
+         * @deprecated since version 5.0.6, it is no longer needed if you use WL.JSONStore.JSONStoreInstance.push.
+         */
+        pushSelected(doc: any, options?: WL.Options): JQueryDeferred<any>;
+        /**
+         * @deprecated since version 5.0.6. It is no longer needed if you use WL.JSONStore.JSONStoreInstance.replace with {push: false}.
+         */
+        refresh(doc: any, options?: RefreshOptions): JQueryDeferred<any>;
+        remove(doc: any, options?: RemoveOptions): JQueryDeferred<any>;
+        /**
+         * Deletes all the documents that are stored inside a collection.
+         */
+        removeCollection(options?: WL.Options): JQueryDeferred<any>;
+        replace(doc: Object | Object[], options?: ReplaceOptions): JQueryDeferred<any>;
+        /**
+         * Writes data to a collection.
+         * @deprecated since version 5.0.6, it is no longer needed if you use WL.JSONStore.JSONStoreInstance.add with {push: false}.
+         */
+        store(data: Object | Object[], options?: StoreOptions): void;
+        toString(limit?: number, offset?: number): JQueryDeferred<number>;
+    }
+    class QueryPartObj {
+        /**
+         * Add a between clause to a query for advanced find.
+         */
+        between(searchField: any, value: any): any[];
+        /**
+         * Add an equal to clause to a query for advanced find.
+         */
+        equal(searchField: any, value: any): any[];
+        /**
+         * Add a greater or equal thanclause to a query for advanced find.
+         */
+        greaterOrEqualThan(searchField: any, value: any): any[];
+        /**
+         * Add a greater than clause to a query for advanced find.
+         */
+        greaterThan(searchField: any, value: any): any[];
+        /**
+         * Add an in clause to a query for advanced find.
+         */
+        inside(searchField: any, value: any): any[];
+        /**
+         * Add a left clause to a query for advanced find.
+         */
+        leftLike(searchField: any, value: any): any[];
+        /**
+         * Add a less or equal than clause to a query for advanced find.
+         */
+        lessOrEqualThan(searchField: any, value: any): any[];
+        /**
+         * Add a less than clause to a query for advanced find.
+         */
+        lessThan(searchField: any, value: any): any[];
+        /**
+         * Add a like clause to a query for advanced find.
+         */
+        like(searchField: any, value: any): any[];
+        /**
+         * Add a not between clause to a query for advanced find.
+         */
+        notBetween(searchField: any, value: any): any[];
+        /**
+         * Add a not equal to clause to a query for advanced find.
+         */
+        notEqual(searchField: any, value: any): any[];
+        /**
+         * Add a not in clause to a query for advanced find.
+         */
+        notInside(searchField: any, value: any): any[];
+        /**
+         * Add a not left clause to a query for advanced find.
+         */
+        notLeftLike(searchField: any, value: any): any[];
+        /**
+         * Add a not like clause to a query for advanced find.
+         */
+        notLike(searchField: any, value: any): any[];
+        /**
+         * Add a not right clause to a query for advanced find.
+         */
+        notRightLike(searchField: any, value: any): any[];
+        /**
+         * Add a right clause to a query for advanced find.
+         */
+        rightLike(searchField: any, value: any): any[];
+    }
+}
+declare namespace WL.LocalStorage {
+    function getValue(key: string): string;
+    function setValue(key: string, value: string): void;
+    function clear(key: string): void;
+    function clearAll(): void;
+}
+declare namespace WL {
+    var Logger: LoggerObject;
+    interface LoggerCallback {
+        (message: string | string[], level: string, package: string): void;
+    }
+    interface Tag {
+        level?: boolean;
+        tag?: boolean;
+    }
+    interface Filter {
+        [name: string]: string;
+    }
+    interface LoggerOptions {
+        stringify?: boolean;
+        pretty?: boolean;
+        stacktrace?: boolean;
+        callback?: LoggerCallback;
+        pkg?: string;
+        tag?: Tag;
+        /**
+         * @deprecated since version 6.2. use filters instead.
+         */
+        whitelist?: string[];
+        /**
+         * @deprecated since version 6.2. use filters instead.
+         */
+        blacklist?: string[];
+        filters?: Filter;
+        capture?: boolean;
+        autoSendLogs?: boolean;
+        maxFileSize?: number;
+        level?: string[] | string | number;
+    }
+    interface NativeOptions {
+        maxFileSize?: number;
+        level?: string;
+        capture?: boolean;
+        autoSendLogs?: boolean;
+        autoUpdateConfig?: boolean;
+        filters?: Filter;
+    }
+    /**
+     * Artifact to allow chaining of Logger class as: WL.Logger.ctx({pkg: 'something'}).debug('Hello world');
+     */
+    class LoggerObject {
+        /**
+        * Configures the logger globally.
+        */
+        config(options?: LoggerOptions): LoggerObject;
+        /**
+         * Creates an instance of a logger with its own context (also called status or state).
+         */
+        create(options?: LoggerOptions): LogInstance;
+        /**
+         * Updates the state (also called context or status) of the logger.
+         */
+        ctx(options?: LoggerOptions): WL.LoggerObject;
+        /**
+         * Prints arguments to the console.
+         */
+        debug(message: string): void;
+        /**
+         * Prints arguments to the console.
+         */
+        error(message: string): void;
+        /**
+         * Prints arguments to the console.
+         */
+        fatal(message: string): void;
+        /**
+         * Prints arguments to the console.
+         */
+        info(message: string): void;
+        /**
+         * Prints arguments to the console.
+         */
+        log(message: string): void;
+        /**
+         * Attach additional metadata to the next logger instance call.
+         */
+        metadata(options: any): LoggerObject;
+        /**
+         * @deprecated since version 6.2. WL.Logger.on is now a no-op. WL.Logger is always enabled. Use WL.Logger.config with {'level': 'FATAL'} to reduce verbosity.
+         */
+        off(): WL.LoggerObject;
+        /**
+         * @deprecated since version 6.2. WL.Logger.on is now a no-op. WL.Logger is always enabled. Use WL.Logger.config with {'level': 'FATAL'} to reduce verbosity.
+         */
+        on(options: any): WL.LoggerObject;
+        /**
+         * Send any logs collected up to this point to the IBM® Worklight® server.
+         */
+        send(): JQueryDeferred<any>;
+        /**
+         * @deprecated since version 6.2. Use WL.Logger.config instead. Sets options in native application layer (iOS and Android only)
+         */
+        setNativeOptions(options?: NativeOptions): void;
+        /**
+         * Shows the status (current configuration) of the logger.
+         */
+        status(): JQueryDeferred<any>;
+        /**
+         * Prints arguments to the console.
+         */
+        trace(message: string): void;
+        /**
+         * Retrieves and applies any matching configuration profile from the IBM® Worklight® Server.
+         */
+        updateConfigFromServer(): JQueryDeferred<any>;
+        /**
+         * Prints arguments to the console.
+         */
+        warn(message: string): void;
+    }
+    /**
+     * Class which defines instances created via:  WL.Logger.create({pkg: 'something'});
+     * Actual definition is outside of WL namespace. For easier d.ts file compiling it is here
+     */
+    class LogInstance {
+        debug(message: string): void;
+        error(message: string): void;
+        fatal(message: string): void;
+        info(message: string): void;
+        trace(message: string): void;
+        warn(message: string): void;
+    }
+}
+declare namespace WL.NativePage {
+    function show(className: string, callback: (data: any) => void, data: any): void;
+}
+declare namespace WL.SecurityUtils {
+    interface DecryptOptions {
+        key: string;
+        ct: string;
+        lv: string;
+        src: string;
+        v: string;
+    }
+    interface EncryptOptions {
+        key: string;
+        text: string;
+    }
+    interface KeygenOptions {
+        password: string;
+        salt: string;
+        iterations: number;
+    }
+    function base64Decode(input: string): JQueryDeferred<string>;
+    function base64Encode(input: string): JQueryDeferred<string>;
+    function decrypt(options: DecryptOptions): JQueryDeferred<string>;
+    function encrypt(options: EncryptOptions): JQueryDeferred<string>;
+    function keygen(options: KeygenOptions): JQueryDeferred<string>;
+    function localRandomString(bytes?: number): JQueryDeferred<string>;
+    function remoteRandomString(bytes?: number): JQueryDeferred<string>;
+}
+declare namespace WL.SimpleDialog {
+    interface Button {
+        text: string;
+        handler?: Function;
+    }
+    interface Options {
+        title: string;
+        text: string;
+    }
+    function show(title: string, text: string, buttons: Button[], options?: Options): void;
+}
+
+declare namespace WL.TabBar {
+    interface ItemOptions {
+        image: string;
+        badge?: string; // for iOS
+        imageSelected?: string; // for Android
+    }
+    function addItem(id: string, callback: Function, title: string, options: ItemOptions): WL.TabBarItem;
+    function init(): void;
+    function isVisible(): boolean;
+    function RemoveAllItems(): void;
+    function setEnabled(isEnabled: boolean): void;
+    /**
+     * @deprecated
+     */
+    function setParentDivId(parentId: string): void;
+    function setSelectedItem(id: string): void;
+    function setVisible(isVisible: boolean): void;
+}
+
+declare namespace WL {
+    class TabBarItem {
+        setEnabled(isEnabled: boolean): void;
+        updateBadge(badge?: string): void;
+    }
+}
+
+declare namespace WL.Toast {
+    function show(): void;
+}
+declare namespace WL.Trusteer {
+    interface AssesmentRisk {
+        value: number;
+        additionalData: string;
+        lastCalculated: number;
+        name: string;
+    }
+    interface AssetmentRisks {
+        device_key: string;
+        'malware.any'?: AssesmentRisk;
+        'network.wifi'?: AssesmentRisk;
+        'os.rooted'?: AssesmentRisk;
+        'os.rooted.native'?: AssesmentRisk;
+        'os.rooted.hiders'?: AssesmentRisk;
+        'os.ver_up_to_date'?: AssesmentRisk;
+        'plat.android.dumpsys'?: AssesmentRisk;
+        'plat.android.apprestrict'?: AssesmentRisk;
+        'total.risk.generic'?: AssesmentRisk;
+        'tas.config_update'?: AssesmentRisk;
+    }
+    function getRiskAssessment(onSuccess: ResponseHandler<Response>, onFailure: ResponseHandler<FailureResponse>): AssetmentRisks;
+}
+declare namespace WL.UserAuth {
+    function deleteCertificate(provisioningEntity?: string): JQueryDeferred<void>;
+}
+declare namespace WLAuthorizationManager {
+    /**
+     * AuthorizationPersistencePolicy possible values
+     */
+    var ALWAYS: string;
+    var NEVER: string;
+    interface RequestObject {
+        setRequestHeader: (header: string, value: string) => void;
+    }
+    function addCachedAuthorizationHeader(request: RequestObject): JQueryDeferred<RequestObject>;
+    function getAppIdentity(): JQueryDeferred<any>;
+    function getAuthorizationScope(responseAuthenticationHeader: string): string;
+    /**
+     * TODO: Set Promise types. Should be something like: JQueryDeferred<data, error>()
+     */
+    function getCachedAuthorizationHeader(): JQueryDeferred<any>;
+    /**
+     * TODO: Set Promise types. Should be something like: JQueryDeferred<data, error>()
+     */
+    function getDeviceIdentity(): JQueryDeferred<any>;
+    /**
+     * TODO: Set Promise types. Should be something like: JQueryDeferred<data, error>()
+     */
+    function getUserIdentity(): JQueryDeferred<any>;
+    function isAuthorizationRequired(responseStatus: number, responseAuthenticationHeader: string): boolean;
+    /**
+     * TODO: Set Promise types. Should be something like: JQueryDeferred<header, error>()
+     */
+    function obtainAuthorizationHeader(scope: string): JQueryDeferred<any>;
+    /**
+     * See WLAuthorizarionManager.NEVER and WLAuthorizarionManager.ALWAYS
+     */
+    function setAuthorizationPersistencePolicy(authorizationPersistencePolicy: string): void;
+}
+
+declare namespace WL {
+    var ClientMessages: { [name: string]: string };
+}
+
+declare class WLResourceRequest {
+    constructor(url: string, method: string, timeout?: number);
+    addHeader(name: string, value: string|number|boolean): void;
+    getHeader(name: string): string;
+    getHeaderNames(): string[];
+    getHeaders(name: string): string[];
+    getMethod(): string;
+    getQueryParameters(): any; // JSON
+    getTimeout(): number;
+    getUrl(): string;
+    send(content?: any): JQueryDeferred<any>;
+    sendFormParameters(json: Object): JQueryDeferred<any>;
+    setHeader(name: string, value: string|number|boolean): void;
+    setHeaders(requestHeaders?: { [name: string]: string|string[] }): void;
+    setQueryParameter(name: string, value: string|number|boolean|Object): void;
+    setQueryParameters(parameters?: { [name: string]: string|number|boolean|Object }): void;
+    setTimeout(requestTimeout: number): void;
+
+    static GET: string;
+    static POST: string;
+    static PUT: string;
+    static DELETE: string;
+    static HEAD: string;
+    static OPTIONS: string;
+    static TRACE: string;
+    static CONNECT: string;
+}
diff --git a/ibm-mobilefirst/tsconfig.json b/ibm-mobilefirst/tsconfig.json
new file mode 100644
index 0000000000..8096d5cfbe
--- /dev/null
+++ b/ibm-mobilefirst/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ibm-mobilefirst-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/icepick/icepick-tests.ts b/icepick/icepick-tests.ts
index 4c6f79d0e9..8c7b654492 100644
--- a/icepick/icepick-tests.ts
+++ b/icepick/icepick-tests.ts
@@ -1,8 +1,5 @@
-/// <reference path="icepick.d.ts" />
-/// <reference path="../underscore/underscore.d.ts" />
-
-
 import i = require("icepick");
+import * as _ from 'underscore';
 
 "use strict"; // so attempted modifications of frozen objects will throw errors
 
diff --git a/icepick/icepick.d.ts b/icepick/icepick.d.ts
deleted file mode 100644
index 87b8d4bbac..0000000000
--- a/icepick/icepick.d.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-// Type definitions for icepick v1.1.0
-// Project: https://github.com/aearly/icepick
-// Definitions by: Nathan Brown <https://github.com/ngbrown>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "icepick" {
-  export function freeze<T>(collection: T): T;
-  export function thaw<T>(collection: T): T;
-  export function assoc<T>(collection: T, key: number | string, value: any): T;
-  export function dissoc<T>(collection: T, key: number | string): T;
-  export function assocIn<T>(collection: T, path: Array<number | string>, value: any): T;
-  export function getIn<Result>(collection: any, path: Array<number | string>): Result;
-  export function updateIn<T, V>(collection: T, path: Array<number | string>, callback: (value: V) => V): T;
-
-  export {assoc as set};
-  export {dissoc as unset};
-  export {assocIn as setIn};
-
-  export function assign<T>(target: T): T;
-  export function assign<T, S1>(target: T, source1: S1): (T & S1);
-  export function assign<T, S1, S2>(target: T, s1: S1, s2: S2): (T & S1 & S2);
-  export function assign<T, S1, S2, S3>(target: T, s1: S1, s2: S2, s3: S3): (T & S1 & S2 & S3);
-  export function assign<T, S1, S2, S3, S4>(target: T, s1: S1, s2: S2, s3: S3, s4: S4): (T & S1 & S2 & S3 & S4);
-
-  export {assign as extend};
-
-  export function merge<T, S1>(target: T, source: S1): (T & S1);
-
-  export function push<T>(array: T[], element: T): T[];
-  export function pop<T>(array: T[]): T[];
-  export function shift<T>(array: T[]): T[];
-  export function unshift<T>(array: T[], element: T): T[];
-  export function reverse<T>(array: T[]): T[];
-  export function sort<T>(array: T[], compareFunction?: (a:T, b:T) => number): T[];
-  export function splice<T>(array: T[], start: number, deleteCount: number, ...items: T[]): T[];
-  export function slice<T>(array: T[], begin?: number, end?: number): T[];
-
-  export function map<T, U>(fn: (value: T) => U, array: T[]): U[];
-  export function filter<T>(fn: (value: T) => boolean, array: T[]): T[];
-
-  interface IcepickWrapper<T> {
-    value(): T;
-
-    freeze(): IcepickWrapper<T>;
-    thaw(): IcepickWrapper<T>;
-
-    assoc(key: number | string, value: any): IcepickWrapper<T>;
-    set(key: number | string, value: any): IcepickWrapper<T>;
-
-    dissoc(key: number | string): IcepickWrapper<T>;
-    unset(key: number | string): IcepickWrapper<T>;
-
-    assocIn(path: Array<number | string>, value: any): IcepickWrapper<T>;
-    setIn(path: Array<number | string>, value: any): IcepickWrapper<T>;
-
-    getIn<Result>(collection: any, path: Array<number | string>): IcepickWrapper<Result>;
-    updateIn<T, V>(collection: T, path: Array<number | string>, callback: (value: V) => V): IcepickWrapper<T>;
-
-    assign<S1>(source1: S1): IcepickWrapper<T & S1>;
-    assign<S1, S2>(s1: S1, s2: S2): IcepickWrapper<T & S1 & S2>;
-    assign<S1, S2, S3>(s1: S1, s2: S2, s3: S3): IcepickWrapper<T & S1 & S2 & S3>;
-    assign<S1, S2, S3, S4>(s1: S1, s2: S2, s3: S3, s4: S4): IcepickWrapper<T & S1 & S2 & S3 & S4>;
-    extend<S1>(source1: S1): IcepickWrapper<T & S1>;
-    extend<S1, S2>(s1: S1, s2: S2): IcepickWrapper<T & S1 & S2>;
-    extend<S1, S2, S3>(s1: S1, s2: S2, s3: S3): IcepickWrapper<T & S1 & S2 & S3>;
-    extend<S1, S2, S3, S4>(s1: S1, s2: S2, s3: S3, s4: S4): IcepickWrapper<T & S1 & S2 & S3 & S4>;
-
-    merge<S1>(source: S1): IcepickWrapper<T & S1>;
-  }
-
-  export function chain<T>(target: T): IcepickWrapper<T>;
-}
diff --git a/icepick/index.d.ts b/icepick/index.d.ts
new file mode 100644
index 0000000000..184f0e12b1
--- /dev/null
+++ b/icepick/index.d.ts
@@ -0,0 +1,71 @@
+// Type definitions for icepick v1.1.0
+// Project: https://github.com/aearly/icepick
+// Definitions by: Nathan Brown <https://github.com/ngbrown>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export declare function freeze<T>(collection: T): T;
+export declare function thaw<T>(collection: T): T;
+export declare function assoc<T>(collection: T, key: number | string, value: any): T;
+export declare function dissoc<T>(collection: T, key: number | string): T;
+export declare function assocIn<T>(collection: T, path: Array<number | string>, value: any): T;
+export declare function getIn<Result>(collection: any, path: Array<number | string>): Result;
+export declare function updateIn<T, V>(collection: T, path: Array<number | string>, callback: (value: V) => V): T;
+
+export {assoc as set};
+export {dissoc as unset};
+export {assocIn as setIn};
+
+export declare function assign<T>(target: T): T;
+export declare function assign<T, S1>(target: T, source1: S1): (T & S1);
+export declare function assign<T, S1, S2>(target: T, s1: S1, s2: S2): (T & S1 & S2);
+export declare function assign<T, S1, S2, S3>(target: T, s1: S1, s2: S2, s3: S3): (T & S1 & S2 & S3);
+export declare function assign<T, S1, S2, S3, S4>(target: T, s1: S1, s2: S2, s3: S3, s4: S4): (T & S1 & S2 & S3 & S4);
+
+export {assign as extend};
+
+export declare function merge<T, S1>(target: T, source: S1): (T & S1);
+
+export declare function push<T>(array: T[], element: T): T[];
+export declare function pop<T>(array: T[]): T[];
+export declare function shift<T>(array: T[]): T[];
+export declare function unshift<T>(array: T[], element: T): T[];
+export declare function reverse<T>(array: T[]): T[];
+export declare function sort<T>(array: T[], compareFunction?: (a: T, b: T) => number): T[];
+export declare function splice<T>(array: T[], start: number, deleteCount: number, ...items: T[]): T[];
+export declare function slice<T>(array: T[], begin?: number, end?: number): T[];
+
+export declare function map<T, U>(fn: (value: T) => U, array: T[]): U[];
+export declare function filter<T>(fn: (value: T) => boolean, array: T[]): T[];
+
+interface IcepickWrapper<T> {
+    value(): T;
+
+    freeze(): IcepickWrapper<T>;
+    thaw(): IcepickWrapper<T>;
+
+    assoc(key: number | string, value: any): IcepickWrapper<T>;
+    set(key: number | string, value: any): IcepickWrapper<T>;
+
+    dissoc(key: number | string): IcepickWrapper<T>;
+    unset(key: number | string): IcepickWrapper<T>;
+
+    assocIn(path: Array<number | string>, value: any): IcepickWrapper<T>;
+    setIn(path: Array<number | string>, value: any): IcepickWrapper<T>;
+
+    getIn<Result>(collection: any, path: Array<number | string>): IcepickWrapper<Result>;
+    updateIn<T, V>(collection: T, path: Array<number | string>, callback: (value: V) => V): IcepickWrapper<T>;
+
+    assign<S1>(source1: S1): IcepickWrapper<T & S1>;
+    assign<S1, S2>(s1: S1, s2: S2): IcepickWrapper<T & S1 & S2>;
+    assign<S1, S2, S3>(s1: S1, s2: S2, s3: S3): IcepickWrapper<T & S1 & S2 & S3>;
+    assign<S1, S2, S3, S4>(s1: S1, s2: S2, s3: S3, s4: S4): IcepickWrapper<T & S1 & S2 & S3 & S4>;
+    extend<S1>(source1: S1): IcepickWrapper<T & S1>;
+    extend<S1, S2>(s1: S1, s2: S2): IcepickWrapper<T & S1 & S2>;
+    extend<S1, S2, S3>(s1: S1, s2: S2, s3: S3): IcepickWrapper<T & S1 & S2 & S3>;
+    extend<S1, S2, S3, S4>(s1: S1, s2: S2, s3: S3, s4: S4): IcepickWrapper<T & S1 & S2 & S3 & S4>;
+
+    merge<S1>(source: S1): IcepickWrapper<T & S1>;
+}
+
+export declare function chain<T>(target: T): IcepickWrapper<T>;
diff --git a/icepick/tsconfig.json b/icepick/tsconfig.json
new file mode 100644
index 0000000000..0d9a8bd442
--- /dev/null
+++ b/icepick/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "icepick-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/icheck/icheck-tests.ts b/icheck/icheck-tests.ts
index 7998d8ed6c..f7096f5851 100644
--- a/icheck/icheck-tests.ts
+++ b/icheck/icheck-tests.ts
@@ -1,5 +1,4 @@
-///<reference path="icheck.d.ts" />
-///<reference path="../jquery/jquery.d.ts" />
+/// <reference types="jquery" />
 
 $('input').iCheck({
     labelHover: false,
diff --git a/icheck/icheck.d.ts b/icheck/index.d.ts
similarity index 100%
rename from icheck/icheck.d.ts
rename to icheck/index.d.ts
diff --git a/icheck/tsconfig.json b/icheck/tsconfig.json
new file mode 100644
index 0000000000..635d211105
--- /dev/null
+++ b/icheck/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "icheck-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/iconv/iconv-tests.ts b/iconv/iconv-tests.ts
new file mode 100644
index 0000000000..396c207279
--- /dev/null
+++ b/iconv/iconv-tests.ts
@@ -0,0 +1,26 @@
+import Iconv = require("iconv");
+import {Writable} from "stream";
+
+const iconv: Iconv.Iconv = new Iconv("utf-8", "cp932");
+const iconvFromFunction: Iconv.Iconv = Iconv("utf-8", "cp932");
+
+iconv.writable = true;
+
+let buffer: Buffer;
+
+buffer = iconv.convert("hoge");
+buffer = iconv.convert("hoge", "utf-8");
+buffer = iconv.convert(new Buffer("hoge"), "utf-8");
+
+let result: boolean;
+
+result = iconv.write("hoge");
+result = iconv.write("hoge", "utf-8");
+result = iconv.write(new Buffer("hoge"), "utf-8");
+
+iconv.end();
+iconv.end("hoge");
+iconv.end("hoge", "utf-8");
+iconv.end(new Buffer("hoge"), "utf-8");
+
+const st: Writable = iconv.pipe(new Writable, {end: true});
diff --git a/iconv/index.d.ts b/iconv/index.d.ts
new file mode 100644
index 0000000000..7edebc5f65
--- /dev/null
+++ b/iconv/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for iconv 2.1.11
+// Project: https://github.com/bnoordhuis/node-iconv
+// Definitions by: delphinus <https://github.com/delphinus35/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="node" />
+
+declare namespace Iconv {
+
+    interface Static {
+
+        new(fromEncoding: string, toEncoding: string): Iconv;
+        (fromEncoding: string, toEncoding: string): Iconv;
+    }
+
+    interface Iconv extends NodeJS.WritableStream {
+
+        writable: boolean;
+        convert(input: string | Buffer, encoding?: string): Buffer;
+        write(input: string | Buffer, encoding?: string): boolean;
+        end(input?: string | Buffer, encoding?: string): void;
+
+        // copy from NodeJS.WritableStream for compatibility
+        write(buffer: Buffer|string, cb?: Function): boolean;
+        write(str: string, encoding?: string, cb?: Function): boolean;
+        end(): void;
+        end(buffer: Buffer, cb?: Function): void;
+        end(str: string, cb?: Function): void;
+        end(str: string, encoding?: string, cb?: Function): void;
+
+        // copy from stream.Stream
+        pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
+    }
+}
+
+declare var Iconv: Iconv.Static;
+export = Iconv;
diff --git a/iconv/tsconfig.json b/iconv/tsconfig.json
new file mode 100644
index 0000000000..3bdbacefe7
--- /dev/null
+++ b/iconv/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "iconv-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/image-size/image-size-tests.ts b/image-size/image-size-tests.ts
index 0f9b29618a..983389091e 100644
--- a/image-size/image-size-tests.ts
+++ b/image-size/image-size-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="image-size.d.ts" />
 
 import * as url from "url";
 import * as http from "http";
diff --git a/image-size/image-size.d.ts b/image-size/image-size.d.ts
deleted file mode 100644
index 6b553630c8..0000000000
--- a/image-size/image-size.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Type definitions for image-size
-// Project: https://github.com/image-size/image-size
-// Definitions by: Elisée MAURER <https://github.com/elisee/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "image-size" {
-
-  interface ImageInfo {
-    width: number;
-    height: number;
-    type: string;
-  }
-
-  function sizeOf(path: string): ImageInfo;
-  function sizeOf(path: string, callback: (err: Error, dimensions: ImageInfo) => void): void;
-
-  function sizeOf(buffer: Buffer): ImageInfo;
-
-  namespace sizeOf {}
-
-  export = sizeOf;
-}
diff --git a/image-size/index.d.ts b/image-size/index.d.ts
new file mode 100644
index 0000000000..311d81d97c
--- /dev/null
+++ b/image-size/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for image-size
+// Project: https://github.com/image-size/image-size
+// Definitions by: Elisée MAURER <https://github.com/elisee/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+interface ImageInfo {
+    width: number;
+    height: number;
+    type: string;
+}
+
+declare function sizeOf(path: string): ImageInfo;
+declare function sizeOf(path: string, callback: (err: Error, dimensions: ImageInfo) => void): void;
+
+declare function sizeOf(buffer: Buffer): ImageInfo;
+
+declare namespace sizeOf { }
+
+export = sizeOf;
diff --git a/image-size/tsconfig.json b/image-size/tsconfig.json
new file mode 100644
index 0000000000..82957b9586
--- /dev/null
+++ b/image-size/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "image-size-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/imagemagick-native/imagemagick-native-tests.ts b/imagemagick-native/imagemagick-native-tests.ts
index efefba8eeb..c872634ab2 100644
--- a/imagemagick-native/imagemagick-native-tests.ts
+++ b/imagemagick-native/imagemagick-native-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="imagemagick-native.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import imagemagick = require('imagemagick-native');
 import fs = require('fs');
diff --git a/imagemagick-native/imagemagick-native.d.ts b/imagemagick-native/imagemagick-native.d.ts
deleted file mode 100644
index 7397161bbe..0000000000
--- a/imagemagick-native/imagemagick-native.d.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-// Type definitions for imagemagick-native 1.7.0
-// Project: https://www.npmjs.org/package/imagemagick-native
-// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "imagemagick-native" {
-
-    import stream = require('stream');
-    export module streams {
-        export function convert(options: IStreamConvertOptions): stream.Transform;
-    }
-
-    function convert(options: IConvertOptions): Buffer;
-    function convert(options: IConvertOptions, callback: (err: any, result: Buffer) => void): void;
-    function identify(options: IIdentifyOptions): IIdentifyResult;
-    function identify(options: IIdentifyOptions, callback: (err: any, result: IIdentifyResult) => void): void;
-    function quantizeColors(options: IQuantizeColorsOptions): IQuantizeColorsItem[];
-    function composite(options: ICompositeOptions): Buffer;
-    function composite(options: ICompositeOptions, callback: (err: any, result: Buffer) => void): void;
-    function getConstPixels(options: IConstPixelsOptions): IConstPixelsItem[];
-    function quantumDepth(): number;
-    function version(): string;
-
-    export interface IStreamConvertOptions {
-        srcFormat?: string;
-        quality?: number;
-        trim?: boolean;
-        trimFuzz?: number;
-        width?: number;
-        height?: number;
-        density?: number;
-        resizeStyle?: string;
-        gravity?: string;
-        format?: string;
-        filter?: string;
-        blur?: number;
-        strip?: boolean;
-        rotate?: number;
-        flip?: boolean;
-        debug?: boolean;
-        ignoreWarnings?: boolean;
-    }
-    export interface IConvertOptions {
-        srcData: Buffer;
-        srcFormat?: string;
-        quality?: number;
-        trim?: boolean;
-        trimFuzz?: number;
-        width?: number;
-        height?: number;
-        density?: number;
-        resizeStyle?: string;
-        gravity?: string;
-        format?: string;
-        filter?: string;
-        blur?: number;
-        strip?: boolean;
-        rotate?: number;
-        flip?: boolean;
-        debug?: boolean;
-        ignoreWarnings?: boolean;
-    }
-    export interface IIdentifyOptions {
-        srcData: Buffer;
-        debug?: boolean;
-        ignoreWarnings?: boolean;
-    }
-    export interface IIdentifyResult {
-        format: string;
-        width: number;
-        height: number;
-        depth: number;
-        density : {
-            width : number;
-            height : number;
-        };
-        exif: {
-            orientation: number; // 0 if none exists or e.g. 3 (portrait iPad pictures)
-        };
-    }
-    export interface IQuantizeColorsOptions {
-        srcData: Buffer;
-        colors: number;
-        debug?: boolean;
-        ignoreWarnings?: boolean;
-    }
-    export interface IQuantizeColorsItem {
-        r: number;
-        g: number;
-        b: number;
-        hex: string;
-    }
-    export interface ICompositeOptions {
-        srcData: Buffer;
-        compositeData: Buffer;
-        gravity?: string;
-        debug?: boolean;
-        ignoreWarnings?: boolean;
-    }
-    export interface IConstPixelsOptions {
-        srcData: Buffer;
-        x: number;
-        y: number;
-        columns: number;
-        rows: number;
-    }
-    export interface IConstPixelsItem {
-        red: number;
-        green: number;
-        blue: number;
-        opacity: number;
-    }
-
-}
-
diff --git a/imagemagick-native/index.d.ts b/imagemagick-native/index.d.ts
new file mode 100644
index 0000000000..6523d12754
--- /dev/null
+++ b/imagemagick-native/index.d.ts
@@ -0,0 +1,114 @@
+// Type definitions for imagemagick-native 1.7.0
+// Project: https://www.npmjs.org/package/imagemagick-native
+// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+import stream = require('stream');
+export declare module streams {
+    export function convert(options: IStreamConvertOptions): stream.Transform;
+}
+
+declare function convert(options: IConvertOptions): Buffer;
+declare function convert(options: IConvertOptions, callback: (err: any, result: Buffer) => void): void;
+declare function identify(options: IIdentifyOptions): IIdentifyResult;
+declare function identify(options: IIdentifyOptions, callback: (err: any, result: IIdentifyResult) => void): void;
+declare function quantizeColors(options: IQuantizeColorsOptions): IQuantizeColorsItem[];
+declare function composite(options: ICompositeOptions): Buffer;
+declare function composite(options: ICompositeOptions, callback: (err: any, result: Buffer) => void): void;
+declare function getConstPixels(options: IConstPixelsOptions): IConstPixelsItem[];
+declare function quantumDepth(): number;
+declare function version(): string;
+
+export interface IStreamConvertOptions {
+    srcFormat?: string;
+    quality?: number;
+    trim?: boolean;
+    trimFuzz?: number;
+    width?: number;
+    height?: number;
+    density?: number;
+    resizeStyle?: string;
+    gravity?: string;
+    format?: string;
+    filter?: string;
+    blur?: number;
+    strip?: boolean;
+    rotate?: number;
+    flip?: boolean;
+    debug?: boolean;
+    ignoreWarnings?: boolean;
+}
+export interface IConvertOptions {
+    srcData: Buffer;
+    srcFormat?: string;
+    quality?: number;
+    trim?: boolean;
+    trimFuzz?: number;
+    width?: number;
+    height?: number;
+    density?: number;
+    resizeStyle?: string;
+    gravity?: string;
+    format?: string;
+    filter?: string;
+    blur?: number;
+    strip?: boolean;
+    rotate?: number;
+    flip?: boolean;
+    debug?: boolean;
+    ignoreWarnings?: boolean;
+}
+export interface IIdentifyOptions {
+    srcData: Buffer;
+    debug?: boolean;
+    ignoreWarnings?: boolean;
+}
+export interface IIdentifyResult {
+    format: string;
+    width: number;
+    height: number;
+    depth: number;
+    density: {
+        width: number;
+        height: number;
+    };
+    exif: {
+        orientation: number; // 0 if none exists or e.g. 3 (portrait iPad pictures)
+    };
+}
+export interface IQuantizeColorsOptions {
+    srcData: Buffer;
+    colors: number;
+    debug?: boolean;
+    ignoreWarnings?: boolean;
+}
+export interface IQuantizeColorsItem {
+    r: number;
+    g: number;
+    b: number;
+    hex: string;
+}
+export interface ICompositeOptions {
+    srcData: Buffer;
+    compositeData: Buffer;
+    gravity?: string;
+    debug?: boolean;
+    ignoreWarnings?: boolean;
+}
+export interface IConstPixelsOptions {
+    srcData: Buffer;
+    x: number;
+    y: number;
+    columns: number;
+    rows: number;
+}
+export interface IConstPixelsItem {
+    red: number;
+    green: number;
+    blue: number;
+    opacity: number;
+}
diff --git a/imagemagick-native/tsconfig.json b/imagemagick-native/tsconfig.json
new file mode 100644
index 0000000000..561572c681
--- /dev/null
+++ b/imagemagick-native/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "imagemagick-native-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/imagemagick/imagemagick-tests.ts b/imagemagick/imagemagick-tests.ts
index dbf03db04b..87ead6307a 100644
--- a/imagemagick/imagemagick-tests.ts
+++ b/imagemagick/imagemagick-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="imagemagick.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import imagemagick = require('imagemagick');
 import child_process = require('child_process');
diff --git a/imagemagick/imagemagick.d.ts b/imagemagick/imagemagick.d.ts
deleted file mode 100644
index d226d6a6cc..0000000000
--- a/imagemagick/imagemagick.d.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-// Type definitions for imagemagick
-// Project: http://github.com/rsms/node-imagemagick
-// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/imagemagick.d.ts
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "imagemagick" {
-	import child_process = require("child_process");
-
-	export function identify(path: string, callback: (err: Error, features: Features) => void): child_process.ChildProcess;
-	export function identify(path: any[], callback: (err: Error, result: string) => void): child_process.ChildProcess;
-	export module identify {
-		export var path: string;
-	}
-	export function readMetadata(path: string, callback: (err: Error, result: any) => void): child_process.ChildProcess;
-
-	export function convert(args: any, callback: (err: Error, result: any) => void): child_process.ChildProcess;
-	export function convert(args: any, timeout: number, callback: (err: Error, result: any) => void): child_process.ChildProcess;
-	export module convert {
-		export var path: string;
-	}
-
-	export function resize(options: Options, callback: (err: Error, result: any) => void): child_process.ChildProcess;
-	export function crop(options: Options, callback: (err: Error, result: any) => void): child_process.ChildProcess;
-	export function resizeArgs(options: Options): ResizeArgs;
-
-	export interface Features {
-		format?: string;
-		width?: number;
-		height?: number;
-		depth?: number;
-	}
-
-	export interface Options {
-		srcPath?: string; //: null,
-		srcData?: string; //: null,
-		srcFormat?: string; //: null,
-		dstPath?: string; //: null,
-		quality?: number; //: 0.8,
-		format?: string; //: 'jpg',
-		progressive?: boolean; //: false,
-		colorspace?: any; //: null,
-		width?: number; //: 0,
-		height?: number; //: 0,
-		strip?: boolean; //: true,
-		filter?: string; //: 'Lagrange',
-		sharpening?: number; //: 0.2,
-		customArgs?: any[]; //: [],
-		timeout?: number; //: 0
-	}
-
-	export interface ResizeArgs {
-		opt: Options;
-		args: string[];
-	}
-}
diff --git a/imagemagick/index.d.ts b/imagemagick/index.d.ts
new file mode 100644
index 0000000000..e5abea57ef
--- /dev/null
+++ b/imagemagick/index.d.ts
@@ -0,0 +1,58 @@
+// Type definitions for imagemagick
+// Project: http://github.com/rsms/node-imagemagick
+// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/imagemagick.d.ts
+
+/// <reference types="node" />
+
+
+import child_process = require("child_process");
+
+export declare function identify(path: string, callback: (err: Error, features: Features) => void): child_process.ChildProcess;
+export declare function identify(path: any[], callback: (err: Error, result: string) => void): child_process.ChildProcess;
+export declare module identify {
+    export var path: string;
+}
+export declare function readMetadata(path: string, callback: (err: Error, result: any) => void): child_process.ChildProcess;
+
+export declare function convert(args: any, callback: (err: Error, result: any) => void): child_process.ChildProcess;
+export declare function convert(args: any, timeout: number, callback: (err: Error, result: any) => void): child_process.ChildProcess;
+export declare module convert {
+    export var path: string;
+}
+
+export declare function resize(options: Options, callback: (err: Error, result: any) => void): child_process.ChildProcess;
+export declare function crop(options: Options, callback: (err: Error, result: any) => void): child_process.ChildProcess;
+export declare function resizeArgs(options: Options): ResizeArgs;
+
+export interface Features {
+    format?: string;
+    width?: number;
+    height?: number;
+    depth?: number;
+}
+
+export interface Options {
+    srcPath?: string; //: null,
+    srcData?: string; //: null,
+    srcFormat?: string; //: null,
+    dstPath?: string; //: null,
+    quality?: number; //: 0.8,
+    format?: string; //: 'jpg',
+    progressive?: boolean; //: false,
+    colorspace?: any; //: null,
+    width?: number; //: 0,
+    height?: number; //: 0,
+    strip?: boolean; //: true,
+    filter?: string; //: 'Lagrange',
+    sharpening?: number; //: 0.2,
+    customArgs?: any[]; //: [],
+    timeout?: number; //: 0
+}
+
+export interface ResizeArgs {
+    opt: Options;
+    args: string[];
+}
diff --git a/imagemagick/tsconfig.json b/imagemagick/tsconfig.json
new file mode 100644
index 0000000000..df27207667
--- /dev/null
+++ b/imagemagick/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "imagemagick-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/imagesloaded/imagesloaded-tests.ts b/imagesloaded/imagesloaded-tests.ts
index 7ab773822b..3f5ead2831 100644
--- a/imagesloaded/imagesloaded-tests.ts
+++ b/imagesloaded/imagesloaded-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="imagesloaded.d.ts" />
+
 
 function test_ctor() {
   // element
diff --git a/imagesloaded/imagesloaded.d.ts b/imagesloaded/imagesloaded.d.ts
deleted file mode 100644
index 1a842f5201..0000000000
--- a/imagesloaded/imagesloaded.d.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-// Type definitions for imagesLoaded 3.1.8+
-// Project: https://github.com/desandro/imagesloaded
-// Definitions by: Chris Charabaruk <http://github.com/coldacid>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../jquery/jquery.d.ts" />
-
-declare namespace ImagesLoaded {
-  type ElementSelector = Element | NodeList | Array<Element> | string;
-
-  /** interface for an image currently loading or completed */
-  interface LoadingImage {
-    img: HTMLImageElement;
-    isLoaded: boolean;
-  }
-
-  interface ImagesLoadedCallback {
-    (instance?: ImagesLoaded): void;
-  }
-
-  interface ImagesLoadedListener {
-    (instance: ImagesLoaded, image?: LoadingImage): void;
-  }
-
-  interface ImagesLoaded {
-    new (elem: ElementSelector, callback: ImagesLoadedCallback): ImagesLoaded;
-
-    images: Array<LoadingImage>;
-
-    // event listeners
-    on(event: string, listener: ImagesLoadedListener): void;
-    off(event: string, listener: ImagesLoadedListener): void;
-  }
-
-  interface ImagesLoadedConstructor {
-    /**
-     * Creates a new ImagesLoaded object with the provided callback
-     * @param elem Element, NodeList, Element array, or selector string for images to watch
-     * @param callback function triggered after all images have been loaded
-     */
-    (elem: ElementSelector, callback?: ImagesLoadedCallback): ImagesLoaded;
-  }
-}
-
-declare var imagesLoaded: ImagesLoaded.ImagesLoadedConstructor;
-
-declare module 'imagesloaded' {
-  export = imagesLoaded;
-}
-
-interface JQuery {
-  imagesLoaded(callback?: ImagesLoaded.ImagesLoadedCallback): JQueryDeferred<ImagesLoaded.ImagesLoaded>;
-}
diff --git a/imagesloaded/index.d.ts b/imagesloaded/index.d.ts
new file mode 100644
index 0000000000..24ab26d3cd
--- /dev/null
+++ b/imagesloaded/index.d.ts
@@ -0,0 +1,53 @@
+// Type definitions for imagesLoaded 3.1.8+
+// Project: https://github.com/desandro/imagesloaded
+// Definitions by: Chris Charabaruk <http://github.com/coldacid>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="jquery" />
+
+declare namespace ImagesLoaded {
+  type ElementSelector = Element | NodeList | Array<Element> | string;
+
+  /** interface for an image currently loading or completed */
+  interface LoadingImage {
+    img: HTMLImageElement;
+    isLoaded: boolean;
+  }
+
+  interface ImagesLoadedCallback {
+    (instance?: ImagesLoaded): void;
+  }
+
+  interface ImagesLoadedListener {
+    (instance: ImagesLoaded, image?: LoadingImage): void;
+  }
+
+  interface ImagesLoaded {
+    new (elem: ElementSelector, callback: ImagesLoadedCallback): ImagesLoaded;
+
+    images: Array<LoadingImage>;
+
+    // event listeners
+    on(event: string, listener: ImagesLoadedListener): void;
+    off(event: string, listener: ImagesLoadedListener): void;
+  }
+
+  interface ImagesLoadedConstructor {
+    /**
+     * Creates a new ImagesLoaded object with the provided callback
+     * @param elem Element, NodeList, Element array, or selector string for images to watch
+     * @param callback function triggered after all images have been loaded
+     */
+    (elem: ElementSelector, callback?: ImagesLoadedCallback): ImagesLoaded;
+  }
+}
+
+declare var imagesLoaded: ImagesLoaded.ImagesLoadedConstructor;
+
+declare module 'imagesloaded' {
+  export = imagesLoaded;
+}
+
+interface JQuery {
+  imagesLoaded(callback?: ImagesLoaded.ImagesLoadedCallback): JQueryDeferred<ImagesLoaded.ImagesLoaded>;
+}
diff --git a/imagesloaded/tsconfig.json b/imagesloaded/tsconfig.json
new file mode 100644
index 0000000000..65da3bd8a7
--- /dev/null
+++ b/imagesloaded/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "imagesloaded-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/imap/imap-tests.ts b/imap/imap-tests.ts
index 8d9ce6cce8..cae85ae697 100644
--- a/imap/imap-tests.ts
+++ b/imap/imap-tests.ts
@@ -1,18 +1,12 @@
-/// <reference path='imap.d.ts' />
-
 /*
 * This code contains all of the example code that was on https://www.npmjs.com/package/imap as of Sat Dec 13, 2014.
 */
 
-
-
-
-
-import Imap     = require('imap');
+import IMAP     = require('imap');
 import util     = require('util');
 import inspect  = util.inspect;
 
-var imap = new Imap({
+var imap = new IMAP({
     user: 'mygmailname@gmail.com',
     password: 'mygmailpassword',
     host: 'imap.gmail.com',
@@ -42,7 +36,7 @@ imap.once('ready', function() {
                     buffer += chunk.toString('utf8');
                 });
                 stream.once('end', function() {
-                    console.log(prefix + 'Parsed header: %s', inspect(Imap.parseHeader(buffer)));
+                    console.log(prefix + 'Parsed header: %s', inspect(IMAP.parseHeader(buffer)));
                 });
             });
             msg.once('attributes', function(attrs : Object) {
@@ -94,7 +88,7 @@ openInbox(function(err : Error, box : IMAP.Box) {
             });
             stream.once('end', function() {
                 if (info.which !== 'TEXT')
-                    console.log(prefix + 'Parsed header: %s', inspect(Imap.parseHeader(buffer)));
+                    console.log(prefix + 'Parsed header: %s', inspect(IMAP.parseHeader(buffer)));
                 else
                     console.log(prefix + 'Body [%s] Finished', inspect(info.which));
             });
@@ -154,8 +148,8 @@ openInbox(function(err : Error, box : IMAP.Box) {
 
 
 var rawHeader : string = '';
-var headers = Imap.parseHeader(rawHeader);
-headers = Imap.parseHeader(rawHeader, true);
+var headers = IMAP.parseHeader(rawHeader);
+headers = IMAP.parseHeader(rawHeader, true);
 
 var f : IMAP.ImapFetch;
 f = imap.fetch('1:3', { bodies: '' });
diff --git a/imap/imap.d.ts b/imap/imap.d.ts
deleted file mode 100644
index 1531035152..0000000000
--- a/imap/imap.d.ts
+++ /dev/null
@@ -1,342 +0,0 @@
-// Type definitions for imap v0.8.14
-// Project: https://www.npmjs.com/package/imap
-// Definitions by: Peter Snider <https://github.com/psnider/>
-// Definitions: https://github.com/psnider/DefinitelyTyped/imap
-
-/// <reference path='../node/node.d.ts' />
-
-declare namespace IMAP {
-
-    // The property names of these interfaces match the documentation (where type names were given).
-
-    export interface Config {
-        /** Username for plain-text authentication. */
-        user: string;
-        /** Password for plain-text authentication. */
-        password: string;
-        /** Base64-encoded OAuth token for OAuth authentication for servers that support it (See Andris Reinman's xoauth.js module to help generate this string). */
-        xoauth?: string;
-        /** Base64-encoded OAuth2 token for The SASL XOAUTH2 Mechanism for servers that support it (See Andris Reinman's xoauth2 module to help generate this string). */
-        xoauth2?: string;
-        /** Hostname or IP address of the IMAP server. Default: "localhost" */
-        host?: string;
-        /** Port number of the IMAP server. Default: 143 */
-        port?: number;
-        /** Perform implicit TLS connection? Default: false */
-        tls?: boolean;
-        /** Options object to pass to tls.connect() Default: (none) */
-        tlsOptions?: Object;
-        /** Set to 'always' to always attempt connection upgrades via STARTTLS, 'required' only if upgrading is required, or 'never' to never attempt upgrading. Default: 'never' */
-        autotls?: string;
-        /** Number of milliseconds to wait for a connection to be established. Default: 10000 */
-        connTimeout?: number;
-        /** Number of milliseconds to wait to be authenticated after a connection has been established. Default: 5000 */
-        authTimeout?: number;
-        /** Configures the keepalive mechanism. Set to true to enable keepalive with defaults or set to object to enable and configure keepalive behavior: Default: true */
-        keepalive?: any;  /* boolean|KeepAlive */
-        /** If set, the function will be called with one argument, a string containing some debug info Default: (no debug output) */
-        debug?: Function;
-    }
-
-    export interface KeepAlive {
-        /** This is the interval (in milliseconds) at which NOOPs are sent and the interval at which idleInterval is checked. Default: 10000 */
-        interval?: number;
-        /** This is the interval (in milliseconds) at which an IDLE command (for servers that support IDLE) is re-sent. Default: 300000 (5 mins) */
-        idleInterval?: number;
-        /** Set to true to force use of NOOP keepalive on servers also support IDLE. Default: false */
-        forceNoop?: boolean;
-    }
-
-    // One of:
-    // - a single message identifier
-    // - a message identifier range (e.g. '2504:2507' or '*' or '2504:*')
-    // - an array of message identifiers
-    // - an array of message identifier ranges.
-    // type MessageSource = string | string[]
-
-
-    export interface Box {
-        /** The name of this mailbox. */
-        name: string;
-        /** True if this mailbox was opened in read-only mode. (Only available with openBox() calls) */
-        readOnly?: boolean;
-        /** True if new keywords can be added to messages in this mailbox. */
-        newKeywords: boolean;
-        /** A 32-bit number that can be used to determine if UIDs in this mailbox have changed since the last time this mailbox was opened. */
-        uidvalidity: number;
-        /** The uid that will be assigned to the next message that arrives at this mailbox. */
-        uidnext: number;
-        /** array - A list of system-defined flags applicable for this mailbox. Flags in this list but not in permFlags may be stored for the current session only. Additional server implementation-specific flags may also be available. */
-        flags: string[];
-        /** A list of flags that can be permanently added/removed to/from messages in this mailbox. */
-        permFlags: string[];
-        /** Whether or not this mailbox has persistent UIDs. This should almost always be true for modern mailboxes and should only be false for legacy mail stores where supporting persistent UIDs was not technically feasible. */
-        persistentUIDs: boolean;
-        /** Contains various message counts for this mailbox: */
-        messages: {
-            /** Total number of messages in this mailbox. */
-            total: number;
-            /** Number of messages in this mailbox having the Recent flag (this IMAP session is the first to see these messages). */
-            new: number;
-            /** (Only available with status() calls) Number of messages in this mailbox not having the Seen flag (marked as not having been read). */
-            unseen: number;
-        };
-    }
-
-    export interface ImapMessageBodyInfo {
-        /** The specifier for this body (e.g. 'TEXT', 'HEADER.FIELDS (TO FROM SUBJECT)', etc). */
-        which: string;
-        /** The size of this body in bytes. */
-        size: number;
-    }
-
-    export interface ImapMessageAttributes {
-        /** A 32-bit ID that uniquely identifies this message within its mailbox. */
-        uid: number;
-        /** A list of flags currently set on this message. */
-        flags: string[];
-        /** The internal server date for the message. */
-        date: Date;
-        /** The message's body structure (only set if requested with fetch()). */
-        struct?: any[];
-        /** The RFC822 message size (only set if requested with fetch()). */
-        size?: number;
-    }
-
-    /** Given in a 'message' event from ImapFetch */
-    export interface ImapMessage extends NodeJS.EventEmitter {
-        on(event: string, listener: Function): this;
-        on(event: 'body', listener: (stream: NodeJS.ReadableStream, info: ImapMessageBodyInfo) => void): this;
-        on(event: 'attributes', listener: (attrs: ImapMessageAttributes) => void): this;
-        on(event: 'end', listener: () => void): this;
-    }
-
-    export interface FetchOptions {
-        /** Mark message(s) as read when fetched. Default: false */
-        markSeen?: boolean;
-        /** Fetch the message structure. Default: false */
-        struct?: boolean;
-        /** Fetch the message envelope. Default: false */
-        envelope?: boolean;
-        /** Fetch the RFC822 size. Default: false */
-        size?: boolean;
-        /** Fetch modifiers defined by IMAP extensions. Default: (none) */
-        modifiers?: Object;
-        /** A string or Array of strings containing the body part section to fetch. Default: (none) Example sections: */
-        bodies?: string | string[];
-    }
-
-
-    /** Returned from fetch() */
-    export interface ImapFetch extends NodeJS.EventEmitter {
-        on(event: string, listener: Function): this;
-        on(event: 'message', listener: (message: ImapMessage, seqno: number) => void): this;
-        on(event: 'error', listener: (error: Error) => void): this;
-        once(event: string, listener: Function): this;
-        once(event: 'error', listener: (error: Error) => void): this;
-    }
-
-
-    export interface Folder {
-        /** mailbox attributes. An attribute of 'NOSELECT' indicates the mailbox cannot be opened */
-        attribs: string[];
-        /** hierarchy delimiter for accessing this mailbox's direct children. */
-        delimiter: string;
-        /** an object containing another structure similar in format to this top level, otherwise null if no children */
-        children: MailBoxes;
-        /** pointer to parent mailbox, null if at the top level */
-        parent: Folder;
-    }
-
-
-    export interface MailBoxes {
-        [name: string]: Folder;
-    }
-
-
-    export interface AppendOptions {
-        /** The name of the mailbox to append the message to. Default: the currently open mailbox */
-        mailbox?: string;
-        /** A single flag (e.g. 'Seen') or an array of flags (e.g. ['Seen', 'Flagged']) to append to the message. Default: (no flags) */
-        flags?: any;  /* string|string[] */
-        /** What to use for message arrival date/time. Default: (current date/time) */
-        date?: Date;
-    }
-
-    export interface MessageFunctions {
-        /** Searches the currently open mailbox for messages using given criteria. criteria is a list describing what you want to find. For criteria types that require arguments, use an array instead of just the string criteria type name (e.g. ['FROM', 'foo@bar.com']). Prefix criteria types with an "!" to negate.
-
-        The following message flags are valid types that do not have arguments:
-
-        ALL:            void;    // All messages.
-        ANSWERED:       void;    // Messages with the Answered flag set.
-        DELETED:        void;    // Messages with the Deleted flag set.
-        DRAFT:          void;    // Messages with the Draft flag set.
-        FLAGGED:        void;    // Messages with the Flagged flag set.
-        NEW:            void;    // Messages that have the Recent flag set but not the Seen flag.
-        SEEN:           void;    // Messages that have the Seen flag set.
-        RECENT:         void;    // Messages that have the Recent flag set.
-        OLD:            void;    // Messages that do not have the Recent flag set. This is functionally equivalent to "!RECENT" (as opposed to "!NEW").
-        UNANSWERED:     void;    // Messages that do not have the Answered flag set.
-        UNDELETED:      void;    // Messages that do not have the Deleted flag set.
-        UNDRAFT:        void;    // Messages that do not have the Draft flag set.
-        UNFLAGGED:      void;    // Messages that do not have the Flagged flag set.
-        UNSEEN:         void;    // Messages that do not have the Seen flag set.
-
-        The following are valid types that require string value(s):
-
-        BCC:            any;    // Messages that contain the specified string in the BCC field.
-        CC:             any;    // Messages that contain the specified string in the CC field.
-        FROM:           any;    // Messages that contain the specified string in the FROM field.
-        SUBJECT:        any;    // Messages that contain the specified string in the SUBJECT field.
-        TO:             any;    // Messages that contain the specified string in the TO field.
-        BODY:           any;    // Messages that contain the specified string in the message body.
-        TEXT:           any;    // Messages that contain the specified string in the header OR the message body.
-        KEYWORD:        any;    // Messages with the specified keyword set.
-        HEADER:         any;    // Requires two string values, with the first being the header name and the second being the value to search for. If this second string is empty, all messages that contain the given header name will be returned.
-
-        The following are valid types that require a string parseable by JavaScripts Date object OR a Date instance:
-
-        BEFORE:         any;    // Messages whose internal date (disregarding time and timezone) is earlier than the specified date.
-        ON:             any;    // Messages whose internal date (disregarding time and timezone) is within the specified date.
-        SINCE:          any;    // Messages whose internal date (disregarding time and timezone) is within or later than the specified date.
-        SENTBEFORE:     any;    // Messages whose Date header (disregarding time and timezone) is earlier than the specified date.
-        SENTON:         any;    // Messages whose Date header (disregarding time and timezone) is within the specified date.
-        SENTSINCE:      any;    // Messages whose Date header (disregarding time and timezone) is within or later than the specified date.
-
-        The following are valid types that require one Integer value:
-
-        LARGER:         number;    // Messages with a size larger than the specified number of bytes.
-        SMALLER:        number;    // Messages with a size smaller than the specified number of bytes.
-
-        The following are valid criterion that require one or more Integer values:
-
-        UID:            any;    // Messages with UIDs corresponding to the specified UID set. Ranges are permitted (e.g. '2504:2507' or '*' or '2504:*').
-        */
-        search(criteria: any[], callback: (error: Error, uids: number[]) => void): void;
-        /** Fetches message(s) in the currently open mailbox; source can be a single message identifier, a message identifier range (e.g. '2504:2507' or '*' or '2504:*'), an array of message identifiers, or an array of message identifier ranges. */
-        fetch(source: any /* MessageSource */, options: FetchOptions): ImapFetch;
-        /** Copies message(s) in the currently open mailbox to another mailbox. */
-        copy(source: any /* MessageSource */, mailboxName: string, callback: (error: Error) => void): void;
-        /** Moves message(s) in the currently open mailbox to another mailbox. Note: The message(s) in the destination mailbox will have a new message UID. */
-        move(source: any /* MessageSource */, mailboxName: string, callback: (error: Error) => void): void;
-        /** Adds flag(s) to message(s). */
-        addFlags(source: any /* MessageSource */, flags: any, callback: (error: Error) => void): void;
-        /** Removes flag(s) from message(s). */
-        delFlags(source: any /* MessageSource */, flags: any, callback: (error: Error) => void): void;
-        /** Sets the flag(s) for message(s). */
-        setFlags(source: any /* MessageSource */, flags: any, callback: (error: Error) => void): void;
-        /** Adds keyword(s) to message(s). keywords is either a single keyword or an array of keywords. */
-        addKeywords(source: any /* MessageSource */, keywords: any /* string|string[] */, callback: (error: Error) => void): void;
-        /** Removes keyword(s) from message(s). keywords is either a single keyword or an array of keywords. */
-        delKeywords(source: any /* MessageSource */, keywords: any /* string|string[] */, callback: (error: Error) => void): void;
-        /** Sets keyword(s) for message(s). keywords is either a single keyword or an array of keywords. */
-        setKeywords(source: any /* MessageSource */, keywords: any /* string|string[] */, callback: (error: Error) => void): void;
-        /** Checks if the server supports the specified capability. */
-        serverSupports(capability: string): boolean;
-    }
-
-    export class Connection implements NodeJS.EventEmitter, MessageFunctions {
-        /** @constructor */
-        constructor(config: Config);
-
-        // from NodeJS.EventEmitter
-        addListener(event: string, listener: Function): this;
-        on(event: string, listener: Function): this;
-        once(event: string, listener: Function): this;
-        removeListener(event: string, listener: Function): this;
-        removeAllListeners(event?: string): this;
-        setMaxListeners(n: number): this;
-        getMaxListeners(): number;
-        listeners(event: string): Function[];
-        emit(event: string, ...args: any[]): boolean;
-        listenerCount(type: string): number;
-
-        // from MessageFunctions
-        /** Searches the currently open mailbox for messages using given criteria. criteria is a list describing what you want to find. For criteria types that require arguments, use an array instead of just the string criteria type name (e.g. ['FROM', 'foo@bar.com']). Prefix criteria types with an "!" to negate. */
-        search(criteria: any[], callback: (error: Error, uids: number[]) => void): void;
-        /** Fetches message(s) in the currently open mailbox. */
-        fetch(source: any /* MessageSource */, options: FetchOptions): ImapFetch;
-        /** Copies message(s) in the currently open mailbox to another mailbox. */
-        copy(source: any /* MessageSource */, mailboxName: string, callback: (error: Error) => void): void;
-        /** Moves message(s) in the currently open mailbox to another mailbox. Note: The message(s) in the destination mailbox will have a new message UID. */
-        move(source: any /* MessageSource */, mailboxName: string, callback: (error: Error) => void): void;
-        /** Adds flag(s) to message(s). */
-        addFlags(source: any /* MessageSource */, flags: any, callback: (error: Error) => void): void;
-        /** Removes flag(s) from message(s). */
-        delFlags(source: any /* MessageSource */, flags: any, callback: (error: Error) => void): void;
-        /** Sets the flag(s) for message(s). */
-        setFlags(source: any /* MessageSource */, flags: any, callback: (error: Error) => void): void;
-        /** Adds keyword(s) to message(s). keywords is either a single keyword or an array of keywords. */
-        addKeywords(source: any /* MessageSource */, keywords: any /* string|string[] */, callback: (error: Error) => void): void;
-        /** Removes keyword(s) from message(s). keywords is either a single keyword or an array of keywords. */
-        delKeywords(source: any /* MessageSource */, keywords: any /* string|string[] */, callback: (error: Error) => void): void;
-        /** Sets keyword(s) for message(s). keywords is either a single keyword or an array of keywords. */
-        setKeywords(source: any /* MessageSource */, keywords: any /* string|string[] */, callback: (error: Error) => void): void;
-        /** Checks if the server supports the specified capability. */
-        serverSupports(capability: string): boolean;
-
-        /** Parses a raw header and returns an object keyed on header fields and the values are Arrays of header field values. Set disableAutoDecode to true to disable automatic decoding of MIME encoded-words that may exist in header field values. */
-        static parseHeader(rawHeader: string, disableAutoDecode?: boolean): {[index: string]: string[]};
-
-        /** The current state of the connection (e.g. 'disconnected', 'connected', 'authenticated'). */
-        state: string;
-        /** The (top-level) mailbox hierarchy delimiter. If the server does not support mailbox hierarchies and only a flat list, this value will be falsey. */
-        delimiter: string;
-        /** Contains information about each namespace type (if supported by the server) with the following properties: */
-        namespaces: {
-            /** Mailboxes that belong to the logged in user. */
-            personal: any[];
-            /** Mailboxes that belong to other users that the logged in user has access to. */
-            other: any[];
-            /** Mailboxes that are accessible by any logged in user. */
-            shared: any[];
-        };
-        /**
-        seq exposes the search() ... serverSupports() set of commands, but returns sequence number(s) instead of UIDs.
-        */
-        seq: MessageFunctions;
-        /** Attempts to connect and authenticate with the IMAP server. */
-        connect(): void;
-        /** Closes the connection to the server after all requests in the queue have been sent. */
-        end(): void;
-        /** Immediately destroys the connection to the server. */
-        destroy(): void;
-        /** Opens a specific mailbox that exists on the server. mailboxName should include any necessary prefix/path. modifiers is used by IMAP extensions. */
-        openBox(mailboxName: string, callback: (error: Error, mailbox: Box) => void): void;
-        openBox(mailboxName: string, openReadOnly: boolean, callback: (error: Error, mailbox: Box) => void): void;
-        openBox(mailboxName: string, openReadOnly: boolean, modifiers: Object, callback: (error: Error, mailbox: Box) => void): void;
-        /** Closes the currently open mailbox. If autoExpunge is true, any messages marked as Deleted in the currently open mailbox will be removed if the mailbox was NOT opened in read-only mode. If autoExpunge is false, you disconnect, or you open another mailbox, messages marked as Deleted will NOT be removed from the currently open mailbox. */
-        closeBox(callback: (error: Error) => void): void;
-        closeBox(autoExpunge: boolean, callback: (error: Error) => void): void;
-        /** Creates a new mailbox on the server. mailboxName should include any necessary prefix/path. */
-        addBox(mailboxName: string, callback: (error: Error) => void): void;
-        /** Removes a specific mailbox that exists on the server. mailboxName should including any necessary prefix/path. */
-        delBox(mailboxName: string, callback: (error: Error) => void): void;
-        /** Renames a specific mailbox that exists on the server. Both oldMailboxName and newMailboxName should include any necessary prefix/path. Note: Renaming the 'INBOX' mailbox will instead cause all messages in 'INBOX' to be moved to the new mailbox. */
-        renameBox(oldMailboxName: string, newMailboxName: string, callback: (error: Error, mailbox: Box) => void): void;
-        /** Subscribes to a specific mailbox that exists on the server. mailboxName should include any necessary prefix/path. */
-        subscribeBox(mailboxName: string, callback: (error: Error) => void): void;
-        /** Unsubscribes from a specific mailbox that exists on the server. mailboxName should include any necessary prefix/path. */
-        unsubscribeBox(mailboxName: string, callback: (error: Error) => void): void;
-        /** Fetches information about a mailbox other than the one currently open. Note: There is no guarantee that this will be a fast operation on the server. Also, do not call this on the currently open mailbox. */
-        status(mailboxName: string, callback: (error: Error, mailbox: Box) => void): void;
-        /** Obtains the full list of mailboxes. If nsPrefix is not specified, the main personal namespace is used. */
-        getBoxes(callback: (error: Error, mailboxes: MailBoxes) => void): void;
-        getBoxes(nsPrefix: string, callback: (error: Error, mailboxes: MailBoxes) => void): void;
-        /** Obtains the full list of subscribed mailboxes. If nsPrefix is not specified, the main personal namespace is used. */
-        getSubscribedBoxes(callback: (error: Error, mailboxes: MailBoxes) => void): void;
-        getSubscribedBoxes(nsPrefix: string, callback: (error: Error, mailboxes: MailBoxes) => void): void;
-        /** Permanently removes all messages flagged as Deleted in the currently open mailbox. If the server supports the 'UIDPLUS' capability, uids can be supplied to only remove messages that both have their uid in uids and have the \Deleted flag set. Note: At least on Gmail, performing this operation with any currently open mailbox that is not the Spam or Trash mailbox will merely archive any messages marked as Deleted (by moving them to the 'All Mail' mailbox). */
-        expunge(callback: (error: Error) => void): void;
-        expunge(uids: any /* MessageSource */, callback: (error: Error) => void): void;
-        /** Appends a message to selected mailbox. msgData is a string or Buffer containing an RFC-822 compatible MIME message. Valid options properties are: */
-        append(msgData: any, callback: (error: Error) => void): void;
-        append(msgData: any, options: AppendOptions, callback: (error: Error) => void): void;
-    }
-}
-
-declare module "imap" {
-    var out: typeof IMAP.Connection;
-    export = out;
-}
diff --git a/imap/index.d.ts b/imap/index.d.ts
new file mode 100644
index 0000000000..b0d1ca1f92
--- /dev/null
+++ b/imap/index.d.ts
@@ -0,0 +1,341 @@
+// Type definitions for imap v0.8.14
+// Project: https://www.npmjs.com/package/imap
+// Definitions by: Peter Snider <https://github.com/psnider/>
+// Definitions: https://github.com/psnider/DefinitelyTyped/imap
+
+/// <reference types="node" />
+
+declare namespace Connection {
+
+    // The property names of these interfaces match the documentation (where type names were given).
+
+    export interface Config {
+        /** Username for plain-text authentication. */
+        user: string;
+        /** Password for plain-text authentication. */
+        password: string;
+        /** Base64-encoded OAuth token for OAuth authentication for servers that support it (See Andris Reinman's xoauth.js module to help generate this string). */
+        xoauth?: string;
+        /** Base64-encoded OAuth2 token for The SASL XOAUTH2 Mechanism for servers that support it (See Andris Reinman's xoauth2 module to help generate this string). */
+        xoauth2?: string;
+        /** Hostname or IP address of the IMAP server. Default: "localhost" */
+        host?: string;
+        /** Port number of the IMAP server. Default: 143 */
+        port?: number;
+        /** Perform implicit TLS connection? Default: false */
+        tls?: boolean;
+        /** Options object to pass to tls.connect() Default: (none) */
+        tlsOptions?: Object;
+        /** Set to 'always' to always attempt connection upgrades via STARTTLS, 'required' only if upgrading is required, or 'never' to never attempt upgrading. Default: 'never' */
+        autotls?: string;
+        /** Number of milliseconds to wait for a connection to be established. Default: 10000 */
+        connTimeout?: number;
+        /** Number of milliseconds to wait to be authenticated after a connection has been established. Default: 5000 */
+        authTimeout?: number;
+        /** Configures the keepalive mechanism. Set to true to enable keepalive with defaults or set to object to enable and configure keepalive behavior: Default: true */
+        keepalive?: any;  /* boolean|KeepAlive */
+        /** If set, the function will be called with one argument, a string containing some debug info Default: (no debug output) */
+        debug?: Function;
+    }
+
+    export interface KeepAlive {
+        /** This is the interval (in milliseconds) at which NOOPs are sent and the interval at which idleInterval is checked. Default: 10000 */
+        interval?: number;
+        /** This is the interval (in milliseconds) at which an IDLE command (for servers that support IDLE) is re-sent. Default: 300000 (5 mins) */
+        idleInterval?: number;
+        /** Set to true to force use of NOOP keepalive on servers also support IDLE. Default: false */
+        forceNoop?: boolean;
+    }
+
+    // One of:
+    // - a single message identifier
+    // - a message identifier range (e.g. '2504:2507' or '*' or '2504:*')
+    // - an array of message identifiers
+    // - an array of message identifier ranges.
+    // type MessageSource = string | string[]
+
+
+    export interface Box {
+        /** The name of this mailbox. */
+        name: string;
+        /** True if this mailbox was opened in read-only mode. (Only available with openBox() calls) */
+        readOnly?: boolean;
+        /** True if new keywords can be added to messages in this mailbox. */
+        newKeywords: boolean;
+        /** A 32-bit number that can be used to determine if UIDs in this mailbox have changed since the last time this mailbox was opened. */
+        uidvalidity: number;
+        /** The uid that will be assigned to the next message that arrives at this mailbox. */
+        uidnext: number;
+        /** array - A list of system-defined flags applicable for this mailbox. Flags in this list but not in permFlags may be stored for the current session only. Additional server implementation-specific flags may also be available. */
+        flags: string[];
+        /** A list of flags that can be permanently added/removed to/from messages in this mailbox. */
+        permFlags: string[];
+        /** Whether or not this mailbox has persistent UIDs. This should almost always be true for modern mailboxes and should only be false for legacy mail stores where supporting persistent UIDs was not technically feasible. */
+        persistentUIDs: boolean;
+        /** Contains various message counts for this mailbox: */
+        messages: {
+            /** Total number of messages in this mailbox. */
+            total: number;
+            /** Number of messages in this mailbox having the Recent flag (this IMAP session is the first to see these messages). */
+            new: number;
+            /** (Only available with status() calls) Number of messages in this mailbox not having the Seen flag (marked as not having been read). */
+            unseen: number;
+        };
+    }
+
+    export interface ImapMessageBodyInfo {
+        /** The specifier for this body (e.g. 'TEXT', 'HEADER.FIELDS (TO FROM SUBJECT)', etc). */
+        which: string;
+        /** The size of this body in bytes. */
+        size: number;
+    }
+
+    export interface ImapMessageAttributes {
+        /** A 32-bit ID that uniquely identifies this message within its mailbox. */
+        uid: number;
+        /** A list of flags currently set on this message. */
+        flags: string[];
+        /** The internal server date for the message. */
+        date: Date;
+        /** The message's body structure (only set if requested with fetch()). */
+        struct?: any[];
+        /** The RFC822 message size (only set if requested with fetch()). */
+        size?: number;
+    }
+
+    /** Given in a 'message' event from ImapFetch */
+    export interface ImapMessage extends NodeJS.EventEmitter {
+        on(event: string, listener: Function): this;
+        on(event: 'body', listener: (stream: NodeJS.ReadableStream, info: ImapMessageBodyInfo) => void): this;
+        on(event: 'attributes', listener: (attrs: ImapMessageAttributes) => void): this;
+        on(event: 'end', listener: () => void): this;
+    }
+
+    export interface FetchOptions {
+        /** Mark message(s) as read when fetched. Default: false */
+        markSeen?: boolean;
+        /** Fetch the message structure. Default: false */
+        struct?: boolean;
+        /** Fetch the message envelope. Default: false */
+        envelope?: boolean;
+        /** Fetch the RFC822 size. Default: false */
+        size?: boolean;
+        /** Fetch modifiers defined by IMAP extensions. Default: (none) */
+        modifiers?: Object;
+        /** A string or Array of strings containing the body part section to fetch. Default: (none) Example sections: */
+        bodies?: string | string[];
+    }
+
+
+    /** Returned from fetch() */
+    export interface ImapFetch extends NodeJS.EventEmitter {
+        on(event: string, listener: Function): this;
+        on(event: 'message', listener: (message: ImapMessage, seqno: number) => void): this;
+        on(event: 'error', listener: (error: Error) => void): this;
+        once(event: string, listener: Function): this;
+        once(event: 'error', listener: (error: Error) => void): this;
+    }
+
+
+    export interface Folder {
+        /** mailbox attributes. An attribute of 'NOSELECT' indicates the mailbox cannot be opened */
+        attribs: string[];
+        /** hierarchy delimiter for accessing this mailbox's direct children. */
+        delimiter: string;
+        /** an object containing another structure similar in format to this top level, otherwise null if no children */
+        children: MailBoxes;
+        /** pointer to parent mailbox, null if at the top level */
+        parent: Folder;
+    }
+
+
+    export interface MailBoxes {
+        [name: string]: Folder;
+    }
+
+
+    export interface AppendOptions {
+        /** The name of the mailbox to append the message to. Default: the currently open mailbox */
+        mailbox?: string;
+        /** A single flag (e.g. 'Seen') or an array of flags (e.g. ['Seen', 'Flagged']) to append to the message. Default: (no flags) */
+        flags?: any;  /* string|string[] */
+        /** What to use for message arrival date/time. Default: (current date/time) */
+        date?: Date;
+    }
+
+    export interface MessageFunctions {
+        /** Searches the currently open mailbox for messages using given criteria. criteria is a list describing what you want to find. For criteria types that require arguments, use an array instead of just the string criteria type name (e.g. ['FROM', 'foo@bar.com']). Prefix criteria types with an "!" to negate.
+
+        The following message flags are valid types that do not have arguments:
+
+        ALL:            void;    // All messages.
+        ANSWERED:       void;    // Messages with the Answered flag set.
+        DELETED:        void;    // Messages with the Deleted flag set.
+        DRAFT:          void;    // Messages with the Draft flag set.
+        FLAGGED:        void;    // Messages with the Flagged flag set.
+        NEW:            void;    // Messages that have the Recent flag set but not the Seen flag.
+        SEEN:           void;    // Messages that have the Seen flag set.
+        RECENT:         void;    // Messages that have the Recent flag set.
+        OLD:            void;    // Messages that do not have the Recent flag set. This is functionally equivalent to "!RECENT" (as opposed to "!NEW").
+        UNANSWERED:     void;    // Messages that do not have the Answered flag set.
+        UNDELETED:      void;    // Messages that do not have the Deleted flag set.
+        UNDRAFT:        void;    // Messages that do not have the Draft flag set.
+        UNFLAGGED:      void;    // Messages that do not have the Flagged flag set.
+        UNSEEN:         void;    // Messages that do not have the Seen flag set.
+
+        The following are valid types that require string value(s):
+
+        BCC:            any;    // Messages that contain the specified string in the BCC field.
+        CC:             any;    // Messages that contain the specified string in the CC field.
+        FROM:           any;    // Messages that contain the specified string in the FROM field.
+        SUBJECT:        any;    // Messages that contain the specified string in the SUBJECT field.
+        TO:             any;    // Messages that contain the specified string in the TO field.
+        BODY:           any;    // Messages that contain the specified string in the message body.
+        TEXT:           any;    // Messages that contain the specified string in the header OR the message body.
+        KEYWORD:        any;    // Messages with the specified keyword set.
+        HEADER:         any;    // Requires two string values, with the first being the header name and the second being the value to search for. If this second string is empty, all messages that contain the given header name will be returned.
+
+        The following are valid types that require a string parseable by JavaScripts Date object OR a Date instance:
+
+        BEFORE:         any;    // Messages whose internal date (disregarding time and timezone) is earlier than the specified date.
+        ON:             any;    // Messages whose internal date (disregarding time and timezone) is within the specified date.
+        SINCE:          any;    // Messages whose internal date (disregarding time and timezone) is within or later than the specified date.
+        SENTBEFORE:     any;    // Messages whose Date header (disregarding time and timezone) is earlier than the specified date.
+        SENTON:         any;    // Messages whose Date header (disregarding time and timezone) is within the specified date.
+        SENTSINCE:      any;    // Messages whose Date header (disregarding time and timezone) is within or later than the specified date.
+
+        The following are valid types that require one Integer value:
+
+        LARGER:         number;    // Messages with a size larger than the specified number of bytes.
+        SMALLER:        number;    // Messages with a size smaller than the specified number of bytes.
+
+        The following are valid criterion that require one or more Integer values:
+
+        UID:            any;    // Messages with UIDs corresponding to the specified UID set. Ranges are permitted (e.g. '2504:2507' or '*' or '2504:*').
+        */
+        search(criteria: any[], callback: (error: Error, uids: number[]) => void): void;
+        /** Fetches message(s) in the currently open mailbox; source can be a single message identifier, a message identifier range (e.g. '2504:2507' or '*' or '2504:*'), an array of message identifiers, or an array of message identifier ranges. */
+        fetch(source: any /* MessageSource */, options: FetchOptions): ImapFetch;
+        /** Copies message(s) in the currently open mailbox to another mailbox. */
+        copy(source: any /* MessageSource */, mailboxName: string, callback: (error: Error) => void): void;
+        /** Moves message(s) in the currently open mailbox to another mailbox. Note: The message(s) in the destination mailbox will have a new message UID. */
+        move(source: any /* MessageSource */, mailboxName: string, callback: (error: Error) => void): void;
+        /** Adds flag(s) to message(s). */
+        addFlags(source: any /* MessageSource */, flags: any, callback: (error: Error) => void): void;
+        /** Removes flag(s) from message(s). */
+        delFlags(source: any /* MessageSource */, flags: any, callback: (error: Error) => void): void;
+        /** Sets the flag(s) for message(s). */
+        setFlags(source: any /* MessageSource */, flags: any, callback: (error: Error) => void): void;
+        /** Adds keyword(s) to message(s). keywords is either a single keyword or an array of keywords. */
+        addKeywords(source: any /* MessageSource */, keywords: any /* string|string[] */, callback: (error: Error) => void): void;
+        /** Removes keyword(s) from message(s). keywords is either a single keyword or an array of keywords. */
+        delKeywords(source: any /* MessageSource */, keywords: any /* string|string[] */, callback: (error: Error) => void): void;
+        /** Sets keyword(s) for message(s). keywords is either a single keyword or an array of keywords. */
+        setKeywords(source: any /* MessageSource */, keywords: any /* string|string[] */, callback: (error: Error) => void): void;
+        /** Checks if the server supports the specified capability. */
+        serverSupports(capability: string): boolean;
+    }
+
+    
+}
+
+declare class Connection implements NodeJS.EventEmitter, Connection.MessageFunctions {
+        /** @constructor */
+        constructor(config: Connection.Config);
+
+        // from NodeJS.EventEmitter
+        addListener(event: string, listener: Function): this;
+        on(event: string, listener: Function): this;
+        once(event: string, listener: Function): this;
+        removeListener(event: string, listener: Function): this;
+        removeAllListeners(event?: string): this;
+        setMaxListeners(n: number): this;
+        getMaxListeners(): number;
+        listeners(event: string): Function[];
+        emit(event: string, ...args: any[]): boolean;
+        listenerCount(type: string): number;
+
+        // from MessageFunctions
+        /** Searches the currently open mailbox for messages using given criteria. criteria is a list describing what you want to find. For criteria types that require arguments, use an array instead of just the string criteria type name (e.g. ['FROM', 'foo@bar.com']). Prefix criteria types with an "!" to negate. */
+        search(criteria: any[], callback: (error: Error, uids: number[]) => void): void;
+        /** Fetches message(s) in the currently open mailbox. */
+        fetch(source: any /* MessageSource */, options: Connection.FetchOptions): Connection.ImapFetch;
+        /** Copies message(s) in the currently open mailbox to another mailbox. */
+        copy(source: any /* MessageSource */, mailboxName: string, callback: (error: Error) => void): void;
+        /** Moves message(s) in the currently open mailbox to another mailbox. Note: The message(s) in the destination mailbox will have a new message UID. */
+        move(source: any /* MessageSource */, mailboxName: string, callback: (error: Error) => void): void;
+        /** Adds flag(s) to message(s). */
+        addFlags(source: any /* MessageSource */, flags: any, callback: (error: Error) => void): void;
+        /** Removes flag(s) from message(s). */
+        delFlags(source: any /* MessageSource */, flags: any, callback: (error: Error) => void): void;
+        /** Sets the flag(s) for message(s). */
+        setFlags(source: any /* MessageSource */, flags: any, callback: (error: Error) => void): void;
+        /** Adds keyword(s) to message(s). keywords is either a single keyword or an array of keywords. */
+        addKeywords(source: any /* MessageSource */, keywords: any /* string|string[] */, callback: (error: Error) => void): void;
+        /** Removes keyword(s) from message(s). keywords is either a single keyword or an array of keywords. */
+        delKeywords(source: any /* MessageSource */, keywords: any /* string|string[] */, callback: (error: Error) => void): void;
+        /** Sets keyword(s) for message(s). keywords is either a single keyword or an array of keywords. */
+        setKeywords(source: any /* MessageSource */, keywords: any /* string|string[] */, callback: (error: Error) => void): void;
+        /** Checks if the server supports the specified capability. */
+        serverSupports(capability: string): boolean;
+
+        /** Parses a raw header and returns an object keyed on header fields and the values are Arrays of header field values. Set disableAutoDecode to true to disable automatic decoding of MIME encoded-words that may exist in header field values. */
+        static parseHeader(rawHeader: string, disableAutoDecode?: boolean): {[index: string]: string[]};
+
+        /** The current state of the connection (e.g. 'disconnected', 'connected', 'authenticated'). */
+        state: string;
+        /** The (top-level) mailbox hierarchy delimiter. If the server does not support mailbox hierarchies and only a flat list, this value will be falsey. */
+        delimiter: string;
+        /** Contains information about each namespace type (if supported by the server) with the following properties: */
+        namespaces: {
+            /** Mailboxes that belong to the logged in user. */
+            personal: any[];
+            /** Mailboxes that belong to other users that the logged in user has access to. */
+            other: any[];
+            /** Mailboxes that are accessible by any logged in user. */
+            shared: any[];
+        };
+        /**
+        seq exposes the search() ... serverSupports() set of commands, but returns sequence number(s) instead of UIDs.
+        */
+        seq: Connection.MessageFunctions;
+        /** Attempts to connect and authenticate with the IMAP server. */
+        connect(): void;
+        /** Closes the connection to the server after all requests in the queue have been sent. */
+        end(): void;
+        /** Immediately destroys the connection to the server. */
+        destroy(): void;
+        /** Opens a specific mailbox that exists on the server. mailboxName should include any necessary prefix/path. modifiers is used by IMAP extensions. */
+        openBox(mailboxName: string, callback: (error: Error, mailbox: Connection.Box) => void): void;
+        openBox(mailboxName: string, openReadOnly: boolean, callback: (error: Error, mailbox: Connection.Box) => void): void;
+        openBox(mailboxName: string, openReadOnly: boolean, modifiers: Object, callback: (error: Error, mailbox: Connection.Box) => void): void;
+        /** Closes the currently open mailbox. If autoExpunge is true, any messages marked as Deleted in the currently open mailbox will be removed if the mailbox was NOT opened in read-only mode. If autoExpunge is false, you disconnect, or you open another mailbox, messages marked as Deleted will NOT be removed from the currently open mailbox. */
+        closeBox(callback: (error: Error) => void): void;
+        closeBox(autoExpunge: boolean, callback: (error: Error) => void): void;
+        /** Creates a new mailbox on the server. mailboxName should include any necessary prefix/path. */
+        addBox(mailboxName: string, callback: (error: Error) => void): void;
+        /** Removes a specific mailbox that exists on the server. mailboxName should including any necessary prefix/path. */
+        delBox(mailboxName: string, callback: (error: Error) => void): void;
+        /** Renames a specific mailbox that exists on the server. Both oldMailboxName and newMailboxName should include any necessary prefix/path. Note: Renaming the 'INBOX' mailbox will instead cause all messages in 'INBOX' to be moved to the new mailbox. */
+        renameBox(oldMailboxName: string, newMailboxName: string, callback: (error: Error, mailbox: Connection.Box) => void): void;
+        /** Subscribes to a specific mailbox that exists on the server. mailboxName should include any necessary prefix/path. */
+        subscribeBox(mailboxName: string, callback: (error: Error) => void): void;
+        /** Unsubscribes from a specific mailbox that exists on the server. mailboxName should include any necessary prefix/path. */
+        unsubscribeBox(mailboxName: string, callback: (error: Error) => void): void;
+        /** Fetches information about a mailbox other than the one currently open. Note: There is no guarantee that this will be a fast operation on the server. Also, do not call this on the currently open mailbox. */
+        status(mailboxName: string, callback: (error: Error, mailbox: Connection.Box) => void): void;
+        /** Obtains the full list of mailboxes. If nsPrefix is not specified, the main personal namespace is used. */
+        getBoxes(callback: (error: Error, mailboxes: Connection.MailBoxes) => void): void;
+        getBoxes(nsPrefix: string, callback: (error: Error, mailboxes: Connection.MailBoxes) => void): void;
+        /** Obtains the full list of subscribed mailboxes. If nsPrefix is not specified, the main personal namespace is used. */
+        getSubscribedBoxes(callback: (error: Error, mailboxes: Connection.MailBoxes) => void): void;
+        getSubscribedBoxes(nsPrefix: string, callback: (error: Error, mailboxes: Connection.MailBoxes) => void): void;
+        /** Permanently removes all messages flagged as Deleted in the currently open mailbox. If the server supports the 'UIDPLUS' capability, uids can be supplied to only remove messages that both have their uid in uids and have the \Deleted flag set. Note: At least on Gmail, performing this operation with any currently open mailbox that is not the Spam or Trash mailbox will merely archive any messages marked as Deleted (by moving them to the 'All Mail' mailbox). */
+        expunge(callback: (error: Error) => void): void;
+        expunge(uids: any /* MessageSource */, callback: (error: Error) => void): void;
+        /** Appends a message to selected mailbox. msgData is a string or Buffer containing an RFC-822 compatible MIME message. Valid options properties are: */
+        append(msgData: any, callback: (error: Error) => void): void;
+        append(msgData: any, options: Connection.AppendOptions, callback: (error: Error) => void): void;
+}
+
+export = Connection;
diff --git a/imap/tsconfig.json b/imap/tsconfig.json
new file mode 100644
index 0000000000..a965d9d2de
--- /dev/null
+++ b/imap/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "imap-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/imgur-rest-api/imgur-rest-api-tests.ts b/imgur-rest-api/imgur-rest-api-tests.ts
index 247885557d..f54c6ba1c8 100644
--- a/imgur-rest-api/imgur-rest-api-tests.ts
+++ b/imgur-rest-api/imgur-rest-api-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="imgur-rest-api.d.ts" />
+
 
 function testAccount(account: ImgurRestApi.Account) : ImgurRestApi.Account {
     return account;
diff --git a/imgur-rest-api/imgur-rest-api.d.ts b/imgur-rest-api/index.d.ts
similarity index 100%
rename from imgur-rest-api/imgur-rest-api.d.ts
rename to imgur-rest-api/index.d.ts
diff --git a/imgur-rest-api/tsconfig.json b/imgur-rest-api/tsconfig.json
new file mode 100644
index 0000000000..43d7143661
--- /dev/null
+++ b/imgur-rest-api/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "imgur-rest-api-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/immutability-helper/immutability-helper-tests.ts b/immutability-helper/immutability-helper-tests.ts
new file mode 100644
index 0000000000..b30b7b46ef
--- /dev/null
+++ b/immutability-helper/immutability-helper-tests.ts
@@ -0,0 +1,48 @@
+import * as update from 'immutability-helper';
+import { newContext } from 'immutability-helper';
+
+namespace TestObjectUpdate {
+  update({}, {
+    foo: {
+      bar: { $set: 'baz' }
+    }
+  });
+}
+
+namespace TestArrayUpdate {
+  update([], {
+    foo: {
+      bar: { $set: 'baz' }
+    }
+  });
+}
+
+namespace TestExtend {
+  update.extend('$command', (specValue, originalValue) => originalValue);
+}
+
+namespace TestNewContext {
+  update.newContext().extend('$command', (specValue, originalValue) => originalValue);
+  newContext().extend('$command', (specValue, originalValue) => originalValue);
+
+  // This shouldn't compile, but we can't test negatives.
+  // newContext().newContext();
+}
+
+namespace TestFromReactDocs {
+  // These are copied from https://facebook.github.io/react/docs/update.html
+  let initialArray = [1, 2, 3];
+  let newArray = update(initialArray, { $push: [4] }); // => [1, 2, 3, 4]
+
+  let collection = [1, 2, { a: [12, 17, 15] }];
+  let newCollection = update(collection, { 2: { a: { $splice: [[1, 1, 13, 14]] } } });
+  // => [1, 2, {a: [12, 13, 14, 15]}]
+
+  let obj = { a: 5, b: 3 };
+  let newObj = update(obj, { b: { $apply: function(x: number) { return x * 2; } } });
+  // => {a: 5, b: 6}
+  let newObj2 = update(obj, { b: { $set: obj.b * 2 } });
+
+  let objShallow = { a: 5, b: 3 };
+  let newObjShallow = update(obj, { $merge: { b: 6, c: 7 } }); // => {a: 5, b: 6, c: 7}
+}
diff --git a/immutability-helper/index.d.ts b/immutability-helper/index.d.ts
new file mode 100644
index 0000000000..1da6c87b05
--- /dev/null
+++ b/immutability-helper/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for immutability-helper v2.0.0
+// Project: https://github.com/kolodny/immutability-helper
+// Definitions by: Sean Kelley <https://github.com/seansfkelley>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface UpdateSpecCommand {
+    $set?: any;
+    $merge?: {};
+    $apply?(value: any): any;
+    [customCommand: string]: any;
+}
+
+interface UpdateSpecPath {
+    [pathPart: string]: UpdateSpec;
+}
+
+type UpdateSpec = UpdateSpecCommand | UpdateSpecPath;
+
+interface UpdateArraySpec extends UpdateSpecCommand {
+    $push?: any[];
+    $unshift?: any[];
+    $splice?: any[][];
+    [customCommand: string]: any;
+}
+
+type CommandHandler = (specValue: any, originalValue: any) => any;
+
+interface UpdateFunction {
+    (value: any[], spec: UpdateArraySpec): any[];
+    (value: {}, spec: UpdateSpec): any;
+    extend: (commandName: string, handler: CommandHandler) => any;
+}
+
+interface Update extends UpdateFunction {
+    newContext(): UpdateFunction;
+}
+
+declare const update: Update;
+export = update;
diff --git a/immutability-helper/tsconfig.json b/immutability-helper/tsconfig.json
new file mode 100644
index 0000000000..6be88a256e
--- /dev/null
+++ b/immutability-helper/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "immutability-helper-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/impress/impress-tests.ts b/impress/impress-tests.ts
index 3e5c4c83fd..1dde1f4b82 100644
--- a/impress/impress-tests.ts
+++ b/impress/impress-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="impress.d.ts" />
+
 
 impress().init();
 
diff --git a/impress/impress.d.ts b/impress/index.d.ts
similarity index 100%
rename from impress/impress.d.ts
rename to impress/index.d.ts
diff --git a/impress/tsconfig.json b/impress/tsconfig.json
new file mode 100644
index 0000000000..d71c572b5f
--- /dev/null
+++ b/impress/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "impress-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/incremental-dom/all-tests.ts b/incremental-dom/all-tests.ts
index 099b41e3b2..aa04d08c57 100644
--- a/incremental-dom/all-tests.ts
+++ b/incremental-dom/all-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="incremental-dom.d.ts" />
 
 declare var describe:any
 ,it:any
diff --git a/incremental-dom/incremental-dom.d.ts b/incremental-dom/incremental-dom.d.ts
deleted file mode 100644
index 56fd84542f..0000000000
--- a/incremental-dom/incremental-dom.d.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-// Type definitions for Incremetal DOM
-// Project: https://github.com/google/incremental-dom
-// Definitions by: Basarat Ali Syed <https://github.com/basarat>, Markus Lanthaler <https://github.com/lanthaler>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "incremental-dom" {
-    /**
-     * Patches the document starting at el with the provided function. This function
-     * may be called during an existing patch operation.
-     * @param {!Element} el the element to patch
-     * @param {!function(T)} fn A function containing elementOpen/elementClose/etc.
-     *     calls that describe the DOM.
-     * @param {?T} data An argument passed to fn to represent DOM state.
-     */
-    export var patch: <T>(el: Node, fn: (data: T) => void, data?: T) => void;
-
-    /**
-     * Declares a virtual Element at the current location in the document. This
-     * corresponds to an opening tag and a elementClose tag is required.
-     * @param {string} tag The element's tag.
-     * @param {?string} key The key used to identify this element. This can be an
-     *     empty string, but performance may be better if a unique value is used
-     *     when iterating over an array of items.
-     * @param {?Array<*>} statics An array of attribute name/value pairs of the
-     *     static attributes for the Element. These will only be set once when the
-     *     Element is created.
-     * @param {...*} var_args Attribute name/value pairs of the dynamic attributes
-     *     for the Element.
-     */
-    export var elementOpen: (tag: string, key?: string, statics?: any[], ...var_args: any[]) => void;
-    /**
-     * Declares a virtual Element at the current location in the document. This
-     * corresponds to an opening tag and a elementClose tag is required. This is
-     * like elementOpen, but the attributes are defined using the attr function
-     * rather than being passed as arguments. Must be folllowed by 0 or more calls
-     * to attr, then a call to elementOpenEnd.
-     * @param {string} tag The element's tag.
-     * @param {?string} key The key used to identify this element. This can be an
-     *     empty string, but performance may be better if a unique value is used
-     *     when iterating over an array of items.
-     * @param {?Array<*>} statics An array of attribute name/value pairs of the
-     *     static attributes for the Element. These will only be set once when the
-     *     Element is created.
-     */
-    export var elementOpenStart: (tag: string, key?: any, ...statics: any[]) => void;
-    /***
-     * Defines a virtual attribute at this point of the DOM. This is only valid
-     * when called between elementOpenStart and elementOpenEnd.
-     *
-     * @param {string} name
-     * @param {*} value
-     */
-    export var attr: (name: string, value: any) => void;
-    /**
-     * Closes an open tag started with elementOpenStart.
-     */
-    export var elementOpenEnd: () => void;
-    /**
-     * Closes an open virtual Element.
-     */
-    export var elementClose: (tag: string) => void;
-    /**
-     * Declares a virtual Element at the current location in the document that has
-     * no children.
-     * @param {string} tag The element's tag.
-     * @param {?string} key The key used to identify this element. This can be an
-     *     empty string, but performance may be better if a unique value is used
-     *     when iterating over an array of items.
-     * @param {?Array<*>} statics An array of attribute name/value pairs of the
-     *     static attributes for the Element. These will only be set once when the
-     *     Element is created.
-     * @param {...*} var_args Attribute name/value pairs of the dynamic attributes
-     *     for the Element.
-     */
-    export var elementVoid: (tag: string, key?: string, statics?: any, ...var_args: any[]) => void;
-    /**
-     * Declares a virtual Text at this point in the document.
-     *
-     * @param {string} value The text of the Text.
-     */
-    export var text: (value: string) => void;
-}
diff --git a/incremental-dom/index.d.ts b/incremental-dom/index.d.ts
new file mode 100644
index 0000000000..6156031db1
--- /dev/null
+++ b/incremental-dom/index.d.ts
@@ -0,0 +1,81 @@
+// Type definitions for Incremetal DOM
+// Project: https://github.com/google/incremental-dom
+// Definitions by: Basarat Ali Syed <https://github.com/basarat>, Markus Lanthaler <https://github.com/lanthaler>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/**
+ * Patches the document starting at el with the provided function. This function
+ * may be called during an existing patch operation.
+ * @param {!Element} el the element to patch
+ * @param {!function(T)} fn A function containing elementOpen/elementClose/etc.
+ *     calls that describe the DOM.
+ * @param {?T} data An argument passed to fn to represent DOM state.
+ */
+export declare var patch: <T>(el: Node, fn: (data: T) => void, data?: T) => void;
+
+/**
+ * Declares a virtual Element at the current location in the document. This
+ * corresponds to an opening tag and a elementClose tag is required.
+ * @param {string} tag The element's tag.
+ * @param {?string} key The key used to identify this element. This can be an
+ *     empty string, but performance may be better if a unique value is used
+ *     when iterating over an array of items.
+ * @param {?Array<*>} statics An array of attribute name/value pairs of the
+ *     static attributes for the Element. These will only be set once when the
+ *     Element is created.
+ * @param {...*} var_args Attribute name/value pairs of the dynamic attributes
+ *     for the Element.
+ */
+export declare var elementOpen: (tag: string, key?: string, statics?: any[], ...var_args: any[]) => void;
+/**
+ * Declares a virtual Element at the current location in the document. This
+ * corresponds to an opening tag and a elementClose tag is required. This is
+ * like elementOpen, but the attributes are defined using the attr function
+ * rather than being passed as arguments. Must be folllowed by 0 or more calls
+ * to attr, then a call to elementOpenEnd.
+ * @param {string} tag The element's tag.
+ * @param {?string} key The key used to identify this element. This can be an
+ *     empty string, but performance may be better if a unique value is used
+ *     when iterating over an array of items.
+ * @param {?Array<*>} statics An array of attribute name/value pairs of the
+ *     static attributes for the Element. These will only be set once when the
+ *     Element is created.
+ */
+export declare var elementOpenStart: (tag: string, key?: any, ...statics: any[]) => void;
+/***
+ * Defines a virtual attribute at this point of the DOM. This is only valid
+ * when called between elementOpenStart and elementOpenEnd.
+ *
+ * @param {string} name
+ * @param {*} value
+ */
+export declare var attr: (name: string, value: any) => void;
+/**
+ * Closes an open tag started with elementOpenStart.
+ */
+export declare var elementOpenEnd: () => void;
+/**
+ * Closes an open virtual Element.
+ */
+export declare var elementClose: (tag: string) => void;
+/**
+ * Declares a virtual Element at the current location in the document that has
+ * no children.
+ * @param {string} tag The element's tag.
+ * @param {?string} key The key used to identify this element. This can be an
+ *     empty string, but performance may be better if a unique value is used
+ *     when iterating over an array of items.
+ * @param {?Array<*>} statics An array of attribute name/value pairs of the
+ *     static attributes for the Element. These will only be set once when the
+ *     Element is created.
+ * @param {...*} var_args Attribute name/value pairs of the dynamic attributes
+ *     for the Element.
+ */
+export declare var elementVoid: (tag: string, key?: string, statics?: any, ...var_args: any[]) => void;
+/**
+ * Declares a virtual Text at this point in the document.
+ *
+ * @param {string} value The text of the Text.
+ */
+export declare var text: (value: string) => void;
diff --git a/incremental-dom/tests/functional/attributes-tests.ts b/incremental-dom/tests/functional/attributes-tests.ts
index 80df028c5e..b1100b4ac0 100644
--- a/incremental-dom/tests/functional/attributes-tests.ts
+++ b/incremental-dom/tests/functional/attributes-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../all-tests.ts"/>
+/// <reference types="all-tests.ts"/>
 
 import id = require('incremental-dom');
 var patch = id.patch;
diff --git a/incremental-dom/tsconfig.json b/incremental-dom/tsconfig.json
new file mode 100644
index 0000000000..29dc64e6e5
--- /dev/null
+++ b/incremental-dom/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "all-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/inflected/index.d.ts b/inflected/index.d.ts
new file mode 100644
index 0000000000..bbd4509367
--- /dev/null
+++ b/inflected/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for inflected 1.1.6
+// Project: https://github.com/martinandert/inflected
+// Definitions by: Daniel Schmidt <https://github.com/dsci>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare namespace Options {
+    interface Humanize {
+        capitalize: boolean;
+    }
+
+    interface Transliterate {
+        locale: string;
+        replacement: string;
+    }
+
+    interface Parameterize {
+        separator: string;
+    }
+}
+
+interface Inflected {
+    pluralize(word: string, locale?: string): string;
+    singularize(word: string, locale?: string): string;
+    camelize(term: string, uppercaseFirstLetter?: boolean): string;
+    underscore(camelCaseWord: string): string;
+    humanize(lowerCaseAndUnderscoredWord: string,
+        options?: Options.Humanize): string;
+    titleize(sentence: string): string;
+    tableize(className: string): string;
+    classify(tableName: string): string;
+    dasherize(underscoredWord: string): string;
+    foreignKey(className: string,
+        separateClassNameAndIdWithUnderscore?: boolean): string;
+    ordinal(number: number): string;
+    ordinalize(number: number): string;
+    transliterate(sentence: string, options?: Options.Transliterate): string;
+    parameterize(sentence: string, options?: Options.Parameterize): string;
+}
+
+declare var Inflector: Inflected;
+export = Inflector;
diff --git a/inflected/inflected-tests.ts b/inflected/inflected-tests.ts
index 05a54a5d07..852398e8b3 100644
--- a/inflected/inflected-tests.ts
+++ b/inflected/inflected-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./inflected.d.ts" />
 
 import * as Inflector from "inflected";
 
diff --git a/inflected/inflected.d.ts b/inflected/inflected.d.ts
deleted file mode 100644
index c26476c381..0000000000
--- a/inflected/inflected.d.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-// Type definitions for inflected 1.1.6
-// Project: https://github.com/martinandert/inflected
-// Definitions by: Daniel Schmidt <https://github.com/dsci>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "inflected" {
-
-  namespace Options {
-    interface Humanize {
-      capitalize: boolean;
-    }
-
-    interface Transliterate {
-      locale: string;
-      replacement: string;
-    }
-
-    interface Parameterize {
-      separator: string;
-    }
-  }
-
-  interface Inflected {
-    pluralize(word: string, locale?: string): string;
-    singularize(word: string, locale?: string): string;
-    camelize(term: string, uppercaseFirstLetter?: boolean): string;
-    underscore(camelCaseWord: string): string;
-    humanize(lowerCaseAndUnderscoredWord: string,
-             options?: Options.Humanize): string;
-    titleize(sentence: string): string;
-    tableize(className: string): string;
-    classify(tableName: string): string;
-    dasherize(underscoredWord: string): string;
-    foreignKey(className: string,
-               separateClassNameAndIdWithUnderscore?:boolean): string;
-    ordinal(number: number): string;
-    ordinalize(number: number): string;
-    transliterate(sentence: string, options?: Options.Transliterate): string;
-    parameterize(sentence: string, options?: Options.Parameterize): string;
-  }
-
-  var Inflector:Inflected;
-  export = Inflector;
-}
diff --git a/inflected/tsconfig.json b/inflected/tsconfig.json
new file mode 100644
index 0000000000..bc378a27f8
--- /dev/null
+++ b/inflected/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "inflected-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/inflection/index.d.ts b/inflection/index.d.ts
new file mode 100644
index 0000000000..46cb32fcc0
--- /dev/null
+++ b/inflection/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for inflection 1.5.0
+// Project: https://github.com/dreamerslab/node.inflection
+// Definitions by: Shogo Iwano <https://github.com/shiwano>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface Inflection {
+    indexOf<T, T2>(arr: T[], item: T2, from_index?: number, compare_func?: (arr_item: T, item: T2) => boolean): number;
+    pluralize(str: string, plural?: string): string;
+    singularize(str: string, singular?: string): string;
+    inflect(str: string, count: number, singular?: string, plural?: string): string;
+    camelize(str: string, low_first_letter?: boolean): string;
+    underscore(str: string, all_upper_case?: boolean): string;
+    humanize(str: string, low_first_letter?: boolean): string;
+    capitalize(str: string): string;
+    dasherize(str: string): string;
+    titleize(str: string): string;
+    demodulize(str: string): string;
+    tableize(str: string): string;
+    classify(str: string): string;
+    foreign_key(str: string, drop_id_ubar?: boolean): string;
+    ordinalize(str: string): string;
+    transform(str: string, arr: string[]): string;
+}
+
+declare var inflection: Inflection;
+export = inflection;
+export as namespace inflection;
diff --git a/inflection/inflection-tests.ts b/inflection/inflection-tests.ts
index b4f758ef31..a0857d7098 100644
--- a/inflection/inflection-tests.ts
+++ b/inflection/inflection-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="inflection.d.ts" />
+
 
 import inflection = require("inflection");
 
diff --git a/inflection/inflection.d.ts b/inflection/inflection.d.ts
deleted file mode 100644
index 6a3ab01cbb..0000000000
--- a/inflection/inflection.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Type definitions for inflection 1.5.0
-// Project: https://github.com/dreamerslab/node.inflection
-// Definitions by: Shogo Iwano <https://github.com/shiwano>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface Inflection {
-    indexOf<T, T2>(arr: T[], item: T2, from_index?: number, compare_func?: (arr_item: T, item: T2) => boolean): number;
-    pluralize(str: string, plural?: string): string;
-    singularize(str: string, singular?: string): string;
-    inflect(str: string, count: number, singular?: string, plural?: string): string;
-    camelize(str: string, low_first_letter?: boolean): string;
-    underscore(str: string, all_upper_case?: boolean): string;
-    humanize(str: string, low_first_letter?: boolean): string;
-    capitalize(str: string): string;
-    dasherize(str: string): string;
-    titleize(str: string): string;
-    demodulize(str: string): string;
-    tableize(str: string): string;
-    classify(str: string): string;
-    foreign_key(str: string, drop_id_ubar?: boolean): string;
-    ordinalize(str: string): string;
-    transform(str: string, arr: string[]): string;
-}
-
-declare module "inflection" {
-    var inflection: Inflection;
-    export = inflection;
-}
diff --git a/inflection/tsconfig.json b/inflection/tsconfig.json
new file mode 100644
index 0000000000..a56414506b
--- /dev/null
+++ b/inflection/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "inflection-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/inherits/index.d.ts b/inherits/index.d.ts
new file mode 100644
index 0000000000..0c8b2f0f8c
--- /dev/null
+++ b/inherits/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for inherits
+// Project: https://github.com/isaacs/inherits
+// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import {inherits} from "util";
+export = inherits;
diff --git a/inherits/inherits-tests.ts b/inherits/inherits-tests.ts
index 7d05a7b0b5..d09db12718 100644
--- a/inherits/inherits-tests.ts
+++ b/inherits/inherits-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./inherits.d.ts" />
 
 import inherits = require('inherits');
 
diff --git a/inherits/inherits.d.ts b/inherits/inherits.d.ts
deleted file mode 100644
index 22ea03eb59..0000000000
--- a/inherits/inherits.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Type definitions for inherits
-// Project: https://github.com/isaacs/inherits
-// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "inherits" {
-	import {inherits} from "util";
-	export = inherits;
-}
diff --git a/inherits/tsconfig.json b/inherits/tsconfig.json
new file mode 100644
index 0000000000..df4c2fbccf
--- /dev/null
+++ b/inherits/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "inherits-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ini/index.d.ts b/ini/index.d.ts
new file mode 100644
index 0000000000..f534ff1b8d
--- /dev/null
+++ b/ini/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for ini v1.3.3
+// Project: https://github.com/isaacs/ini
+// Definitions by: Marcin Porębski <https://github.com/marcinporebski>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface EncodeOptions {
+    section: string
+    whitespace: boolean
+}
+
+export function decode(inistring: string): any;
+export function parse(initstring: string): any;
+export function encode(object: any, options?: EncodeOptions): string;
+export function stringify(object: any, options?: EncodeOptions): string;
+export function safe(val: string): string;
+export function unsafe(val: string): string;
diff --git a/ini/ini-tests.ts b/ini/ini-tests.ts
index 44241625f7..806d816a1a 100644
--- a/ini/ini-tests.ts
+++ b/ini/ini-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="ini.d.ts" />
-/// <reference path="../node/node.d.ts" />
+/// <reference types="node" />
 
 import fs = require("fs");
 import ini = require("ini");
diff --git a/ini/ini.d.ts b/ini/ini.d.ts
deleted file mode 100644
index e194f9ebe6..0000000000
--- a/ini/ini.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-// Type definitions for ini v1.3.3
-// Project: https://github.com/isaacs/ini
-// Definitions by: Marcin Porębski <https://github.com/marcinporebski>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "ini"
-{
-    interface EncodeOptions {
-        section: string
-        whitespace: boolean
-    }
-
-    function decode(inistring: string): any;
-
-    function parse(initstring: string): any;
-
-    function encode(object: any, options?: EncodeOptions): string;
-
-    function stringify(object: any, options?: EncodeOptions): string;
-
-    function safe(val: string): string;
-
-    function unsafe(val: string): string;
-
-}
diff --git a/ini/tsconfig.json b/ini/tsconfig.json
new file mode 100644
index 0000000000..3d9681509e
--- /dev/null
+++ b/ini/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ini-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/iniparser/index.d.ts b/iniparser/index.d.ts
new file mode 100644
index 0000000000..05f0919fce
--- /dev/null
+++ b/iniparser/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for iniparser
+// Project: https://github.com/shockie/node-iniparser
+// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export declare function parse<T>(
+    file: string,
+    callback: (err: any, data: T) => void
+): void;
+
+export declare function parseSync<T>(file: string): T;
+
+export declare function parseString<T>(data: string): T;
diff --git a/iniparser/iniparser-tests.ts b/iniparser/iniparser-tests.ts
index 8558766df6..c7dc0a604b 100644
--- a/iniparser/iniparser-tests.ts
+++ b/iniparser/iniparser-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="iniparser.d.ts" />
 
 import * as iniparser from 'iniparser';
 
diff --git a/iniparser/iniparser.d.ts b/iniparser/iniparser.d.ts
deleted file mode 100644
index ab97dd01f1..0000000000
--- a/iniparser/iniparser.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Type definitions for iniparser
-// Project: https://github.com/shockie/node-iniparser
-// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "iniparser" {
-	export function parse<T>(
-		file: string,
-		callback: (err: any, data: T) => void
-	): void;
-
-	export function parseSync<T>(file: string): T;
-
-	export function parseString<T>(data: string): T;
-}
diff --git a/iniparser/tsconfig.json b/iniparser/tsconfig.json
new file mode 100644
index 0000000000..36db5b5d88
--- /dev/null
+++ b/iniparser/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "iniparser-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/inline-css/index.d.ts b/inline-css/index.d.ts
new file mode 100644
index 0000000000..a6db3ef67b
--- /dev/null
+++ b/inline-css/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for inline-css
+// Project: https://github.com/jonkemp/inline-css
+// Definitions by: Philip Spain <https://github.com/philipisapain>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="bluebird" />
+
+
+import Promise = require('bluebird');
+
+declare namespace InlineCss {
+    export interface Options {
+        url: string;
+        extraCss?: string;
+        applyStyleTags?: boolean;
+        applyLinkTags?: boolean;
+        removeStyleTags?: boolean;
+        removeLinkTags?: boolean;
+        preserveMediaQueries?: boolean;
+        applyWidthAttributes?: boolean;
+        applyTableAttributes?: boolean;
+    }
+}
+
+declare function InlineCss(html: string, options: InlineCss.Options): Promise<string>;
+
+export = InlineCss;
diff --git a/inline-css/inline-css-tests.ts b/inline-css/inline-css-tests.ts
index e633e9e0ae..8fd6307dfe 100644
--- a/inline-css/inline-css-tests.ts
+++ b/inline-css/inline-css-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="inline-css.d.ts" />
 
 import inlineCss = require('inline-css');
 
diff --git a/inline-css/inline-css.d.ts b/inline-css/inline-css.d.ts
deleted file mode 100644
index 478f25226b..0000000000
--- a/inline-css/inline-css.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Type definitions for inline-css
-// Project: https://github.com/jonkemp/inline-css
-// Definitions by: Philip Spain <https://github.com/philipisapain>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../bluebird/bluebird.d.ts" />
-
-declare module 'inline-css' {
-	import Promise = require('bluebird');
-
-	namespace InlineCss {
-		export interface Options {
-			url:string;
-			extraCss?:string;
-			applyStyleTags?:boolean;
-			applyLinkTags?:boolean;
-			removeStyleTags?:boolean;
-			removeLinkTags?:boolean;
-			preserveMediaQueries?:boolean;
-			applyWidthAttributes?:boolean;
-			applyTableAttributes?:boolean;
-		}
-	}
-
-	function InlineCss(html:string, options:InlineCss.Options):Promise<string>;
-
-	export = InlineCss;
-}
diff --git a/inline-css/tsconfig.json b/inline-css/tsconfig.json
new file mode 100644
index 0000000000..fdf04d1f6c
--- /dev/null
+++ b/inline-css/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "inline-css-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/inquirer/index.d.ts b/inquirer/index.d.ts
new file mode 100644
index 0000000000..9ff36e3098
--- /dev/null
+++ b/inquirer/index.d.ts
@@ -0,0 +1,295 @@
+// Type definitions for Inquirer.js
+// Project: https://github.com/SBoudrias/Inquirer.js
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="rx" />
+
+import through = require('through');
+
+declare namespace inquirer {
+    type Prompts = { [name: string]: PromptModule };
+    type ChoiceType = string | objects.ChoiceOption | objects.Separator;
+    type Questions = Question | Question[] | Rx.Observable<Question>;
+
+    interface Inquirer {
+        restoreDefaultPrompts(): void;
+        /**
+         * Expose helper functions on the top level for easiest usage by common users
+         * @param name
+         * @param prompt
+         */
+        registerPrompt(name: string, prompt: PromptModule): void;
+        /**
+         * Create a new self-contained prompt module.
+         */
+        createPromptModule(): PromptModule;
+        /**
+         * Public CLI helper interface
+         * @param questions Questions settings array
+         * @param cb Callback being passed the user answers
+         * @return
+         */
+        prompt(questions: Questions, cb?: (answers: Answers) => any): ui.Prompt;
+        prompts: Prompts;
+        Separator: objects.SeparatorStatic;
+        ui: {
+            BottomBar: ui.BottomBar;
+            Prompt: ui.Prompt;
+        }
+    }
+
+    interface PromptModule {
+        (questions: Questions, cb: (answers: Answers) => any): ui.Prompt;
+        /**
+         * Register a prompt type
+         * @param name Prompt type name
+         * @param prompt Prompt constructor
+         */
+        registerPrompt(name: string, prompt: PromptModule): ui.Prompt;
+        /**
+         * Register the defaults provider prompts
+         */
+        restoreDefaultPrompts(): void;
+    }
+
+    interface Question {
+        /**
+         * Type of the prompt.
+         * Possible values:
+         * <ul>
+         *      <li>input</li>
+         *      <li>confirm</li>
+         *      <li>list</li>
+         *      <li>rawlist</li>
+         *      <li>password</li>
+         * </ul>
+         * @defaults: 'input'
+         */
+        type?: string;
+        /**
+         * The name to use when storing the answer in the anwers hash.
+         */
+        name?: string;
+        /**
+         * The question to print. If defined as a function,
+         * the first parameter will be the current inquirer session answers.
+         */
+        message?: string | ((answers: Answers) => string);
+        /**
+         * Default value(s) to use if nothing is entered, or a function that returns the default value(s).
+         * If defined as a function, the first parameter will be the current inquirer session answers.
+         */
+        default?: any | ((answers: Answers) => any);
+        /**
+         * Choices array or a function returning a choices array. If defined as a function,
+         * the first parameter will be the current inquirer session answers.
+         * Array values can be simple strings, or objects containing a name (to display) and a value properties
+         * (to save in the answers hash). Values can also be a Separator.
+         */
+        choices?: ChoiceType[] | ((answers: Answers) => ChoiceType[]);
+        /**
+         * Receive the user input and should return true if the value is valid, and an error message (String)
+         * otherwise. If false is returned, a default error message is provided.
+         */
+        validate?(input: string): boolean | string;
+        /**
+         * Receive the user input and return the filtered value to be used inside the program.
+         * The value returned will be added to the Answers hash.
+         */
+        filter?(input: string): string;
+        /**
+         * Receive the current user answers hash and should return true or false depending on whether or
+         * not this question should be asked. The value can also be a simple boolean.
+         */
+        when?: boolean | ((answers: Answers) => boolean);
+        paginated?: boolean;
+    }
+
+    /**
+     * A key/value hash containing the client answers in each prompt.
+     */
+    interface Answers {
+        [key: string]: string | boolean;
+    }
+
+    namespace ui {
+        /**
+         * Base interface class other can inherits from
+         */
+        interface Prompt extends BaseUI<Prompts> {
+            new (promptModule: Prompts): Prompt;
+            /**
+             * Once all prompt are over
+             */
+            onCompletion(): void;
+            processQuestion(question: Question): any;
+            fetchAnswer(question: Question): any;
+            setDefaultType(question: Question): any;
+            filterIfRunnable(question: Question): any;
+        }
+
+        /**
+         * Sticky bottom bar user interface
+         */
+        interface BottomBar extends BaseUI<BottomBarOption> {
+            new (opt?: BottomBarOption): BottomBar;
+            /**
+             * Render the prompt to screen
+             * @return self
+             */
+            render(): BottomBar;
+            /**
+             * Update the bottom bar content and rerender
+             * @param bottomBar Bottom bar content
+             * @return self
+             */
+            updateBottomBar(bottomBar: string): BottomBar;
+            /**
+             * Rerender the prompt
+             * @return self
+             */
+            writeLog(data: any): BottomBar;
+            /**
+             * Make sure line end on a line feed
+             * @param str Input string
+             * @return The input string with a final line feed
+             */
+            enforceLF(str: string): string;
+            /**
+             * Helper for writing message in Prompt
+             * @param message The message to be output
+             */
+            write(message: string): void;
+            log: through.ThroughStream;
+        }
+
+        interface BottomBarOption {
+            bottomBar?: string;
+        }
+        /**
+         * Base interface class other can inherits from
+         */
+        interface BaseUI<TOpt> {
+            new (opt: TOpt): void;
+            /**
+             * Handle the ^C exit
+             * @return {null}
+             */
+            onForceClose(): void;
+            /**
+             * Close the interface and cleanup listeners
+             */
+            close(): void;
+            /**
+             * Handle and propagate keypress events
+             */
+            onKeypress(s: string, key: Key): void;
+        }
+
+        interface Key {
+            sequence: string;
+            name: string;
+            meta: boolean;
+            shift: boolean;
+            ctrl: boolean;
+        }
+    }
+
+    namespace objects {
+        /**
+         * Choice object
+         * Normalize input as choice object
+         * @constructor
+         * @param {String|Object} val  Choice value. If an object is passed, it should contains
+         *                             at least one of `value` or `name` property
+         */
+        interface Choice {
+            new (str: string): Choice;
+            new (separator: Separator): Choice;
+            new (option: ChoiceOption): Choice;
+        }
+
+        interface ChoiceOption {
+            name?: string;
+            value?: string;
+            type?: string;
+            extra?: any;
+            key?: string;
+            checked?: boolean;
+            disabled?: string | ((answers: Answers) => any);
+        }
+
+        /**
+         * Choices collection
+         * Collection of multiple `choice` object
+         * @constructor
+         * @param choices  All `choice` to keep in the collection
+         */
+        interface Choices {
+            new (choices: (string | Separator | ChoiceOption)[], answers?: Answers): Choices;
+            choices: Choice[];
+            realChoices: Choice[];
+            length: number;
+            realLength: number;
+            /**
+             * Get a valid choice from the collection
+             * @param selector The selected choice index
+             * @return Return the matched choice or undefined
+             */
+            getChoice(selector: number): Choice;
+            /**
+             * Get a raw element from the collection
+             * @param selector The selected index value
+             * @return Return the matched choice or undefined
+             */
+            get(selector: number): Choice;
+            /**
+             * Match the valid choices against a where clause
+             * @param whereClause Lodash `where` clause
+             * @return Matching choices or empty array
+             */
+            where<U extends {}>(whereClause: U): Choice[];
+            /**
+             * Pluck a particular key from the choices
+             * @param propertyName Property name to select
+             * @return Selected properties
+             */
+            pluck(propertyName: string): any[];
+            forEach<T>(application: (choice: Choice) => T): T[];
+        }
+
+        interface SeparatorStatic {
+            /**
+             * @param line Separation line content (facultative)
+             */
+            new (line?: string): Separator;
+            /**
+             * Helper function returning false if object is a separator
+             * @param obj object to test against
+             * @return `false` if object is a separator
+             */
+            exclude(obj: any): boolean;
+        }
+
+        /**
+         * Separator object
+         * Used to space/separate choices group
+         * @constructor
+         * @param {String} line   Separation line content (facultative)
+         */
+        interface Separator {
+            type: string;
+            line: string;
+            /**
+             * Stringify separator
+             * @return {String} the separator display string
+             */
+            toString(): string;
+        }
+    }
+}
+
+declare var inquirer: inquirer.Inquirer;
+
+export = inquirer;
diff --git a/inquirer/inquirer-tests.ts b/inquirer/inquirer-tests.ts
index dd770e2367..2f2ac7079b 100644
--- a/inquirer/inquirer-tests.ts
+++ b/inquirer/inquirer-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../node/node.d.ts" />
-/// <reference path="inquirer.d.ts" />
+/// <reference types="node" />
 
 import inquirer = require('inquirer');
 
diff --git a/inquirer/inquirer.d.ts b/inquirer/inquirer.d.ts
deleted file mode 100644
index aef3ae8fcc..0000000000
--- a/inquirer/inquirer.d.ts
+++ /dev/null
@@ -1,299 +0,0 @@
-// Type definitions for Inquirer.js
-// Project: https://github.com/SBoudrias/Inquirer.js
-// Definitions by: Qubo <https://github.com/tkQubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../rx/rx-lite.d.ts" />
-/// <reference path="../through/through.d.ts" />
-
-declare module "inquirer" {
-    import through = require('through');
-
-    namespace inquirer {
-        type Prompts = { [name: string]: PromptModule };
-        type ChoiceType = string|objects.ChoiceOption|objects.Separator;
-        type Questions = Question|Question[]|Rx.Observable<Question>;
-
-        interface Inquirer {
-            restoreDefaultPrompts(): void;
-            /**
-             * Expose helper functions on the top level for easiest usage by common users
-             * @param name
-             * @param prompt
-             */
-            registerPrompt(name: string, prompt: PromptModule): void;
-            /**
-             * Create a new self-contained prompt module.
-             */
-            createPromptModule(): PromptModule;
-            /**
-             * Public CLI helper interface
-             * @param questions Questions settings array
-             * @param cb Callback being passed the user answers
-             * @return
-             */
-            prompt(questions: Questions, cb?: (answers: Answers) => any): ui.Prompt;
-            prompts: Prompts;
-            Separator: objects.SeparatorStatic;
-            ui: {
-                BottomBar: ui.BottomBar;
-                Prompt: ui.Prompt;
-            }
-        }
-
-        interface PromptModule {
-            (questions: Questions, cb: (answers: Answers) => any): ui.Prompt;
-            /**
-             * Register a prompt type
-             * @param name Prompt type name
-             * @param prompt Prompt constructor
-             */
-            registerPrompt(name: string, prompt: PromptModule): ui.Prompt;
-            /**
-             * Register the defaults provider prompts
-             */
-            restoreDefaultPrompts(): void;
-        }
-
-        interface Question {
-            /**
-             * Type of the prompt.
-             * Possible values:
-             * <ul>
-             *      <li>input</li>
-             *      <li>confirm</li>
-             *      <li>list</li>
-             *      <li>rawlist</li>
-             *      <li>password</li>
-             * </ul>
-             * @defaults: 'input'
-             */
-            type?: string;
-            /**
-             * The name to use when storing the answer in the anwers hash.
-             */
-            name?: string;
-            /**
-             * The question to print. If defined as a function,
-             * the first parameter will be the current inquirer session answers.
-             */
-            message?: string|((answers: Answers) => string);
-            /**
-             * Default value(s) to use if nothing is entered, or a function that returns the default value(s).
-             * If defined as a function, the first parameter will be the current inquirer session answers.
-             */
-            default?: any|((answers: Answers) => any);
-            /**
-             * Choices array or a function returning a choices array. If defined as a function,
-             * the first parameter will be the current inquirer session answers.
-             * Array values can be simple strings, or objects containing a name (to display) and a value properties
-             * (to save in the answers hash). Values can also be a Separator.
-             */
-            choices?: ChoiceType[]|((answers: Answers) => ChoiceType[]);
-            /**
-             * Receive the user input and should return true if the value is valid, and an error message (String)
-             * otherwise. If false is returned, a default error message is provided.
-             */
-            validate?(input: string): boolean|string;
-            /**
-             * Receive the user input and return the filtered value to be used inside the program.
-             * The value returned will be added to the Answers hash.
-             */
-            filter?(input: string): string;
-            /**
-             * Receive the current user answers hash and should return true or false depending on whether or
-             * not this question should be asked. The value can also be a simple boolean.
-             */
-            when?: boolean|((answers: Answers) => boolean);
-            paginated?: boolean;
-        }
-
-        /**
-         * A key/value hash containing the client answers in each prompt.
-         */
-        interface Answers {
-            [key: string]: string|boolean;
-        }
-
-        namespace ui {
-            /**
-             * Base interface class other can inherits from
-             */
-            interface Prompt extends BaseUI<Prompts> {
-                new(promptModule: Prompts): Prompt;
-                /**
-                 * Once all prompt are over
-                 */
-                onCompletion(): void;
-                processQuestion(question: Question): any;
-                fetchAnswer(question: Question): any;
-                setDefaultType(question: Question): any;
-                filterIfRunnable(question: Question): any;
-            }
-
-            /**
-             * Sticky bottom bar user interface
-             */
-            interface BottomBar extends BaseUI<BottomBarOption> {
-                new(opt?: BottomBarOption): BottomBar;
-                /**
-                 * Render the prompt to screen
-                 * @return self
-                 */
-                render(): BottomBar;
-                /**
-                 * Update the bottom bar content and rerender
-                 * @param bottomBar Bottom bar content
-                 * @return self
-                 */
-                updateBottomBar(bottomBar: string): BottomBar;
-                /**
-                 * Rerender the prompt
-                 * @return self
-                 */
-                writeLog(data: any): BottomBar;
-                /**
-                 * Make sure line end on a line feed
-                 * @param str Input string
-                 * @return The input string with a final line feed
-                 */
-                enforceLF(str: string): string;
-                /**
-                 * Helper for writing message in Prompt
-                 * @param message The message to be output
-                 */
-                write(message: string): void;
-                log: through.ThroughStream;
-            }
-
-            interface BottomBarOption {
-                bottomBar?: string;
-            }
-            /**
-             * Base interface class other can inherits from
-             */
-            interface BaseUI<TOpt> {
-                new(opt: TOpt): void;
-                /**
-                 * Handle the ^C exit
-                 * @return {null}
-                 */
-                onForceClose(): void;
-                /**
-                 * Close the interface and cleanup listeners
-                 */
-                close(): void;
-                /**
-                 * Handle and propagate keypress events
-                 */
-                onKeypress(s: string, key: Key): void;
-            }
-
-            interface Key {
-                sequence: string;
-                name: string;
-                meta: boolean;
-                shift: boolean;
-                ctrl: boolean;
-            }
-        }
-
-        namespace objects {
-            /**
-             * Choice object
-             * Normalize input as choice object
-             * @constructor
-             * @param {String|Object} val  Choice value. If an object is passed, it should contains
-             *                             at least one of `value` or `name` property
-             */
-            interface Choice {
-                new(str: string): Choice;
-                new(separator: Separator): Choice;
-                new(option: ChoiceOption): Choice;
-            }
-
-            interface ChoiceOption {
-                name?: string;
-                value?: string;
-                type?: string;
-                extra?: any;
-                key?: string;
-                checked?: boolean;
-                disabled?: string|((answers: Answers) => any);
-            }
-
-            /**
-             * Choices collection
-             * Collection of multiple `choice` object
-             * @constructor
-             * @param choices  All `choice` to keep in the collection
-             */
-            interface Choices {
-                new(choices: (string|Separator|ChoiceOption)[], answers?: Answers): Choices;
-                choices: Choice[];
-                realChoices: Choice[];
-                length: number;
-                realLength: number;
-                /**
-                 * Get a valid choice from the collection
-                 * @param selector The selected choice index
-                 * @return Return the matched choice or undefined
-                 */
-                getChoice(selector: number): Choice;
-                /**
-                 * Get a raw element from the collection
-                 * @param selector The selected index value
-                 * @return Return the matched choice or undefined
-                 */
-                get(selector: number): Choice;
-                /**
-                 * Match the valid choices against a where clause
-                 * @param whereClause Lodash `where` clause
-                 * @return Matching choices or empty array
-                 */
-                where<U extends {}>(whereClause: U): Choice[];
-                /**
-                 * Pluck a particular key from the choices
-                 * @param propertyName Property name to select
-                 * @return Selected properties
-                 */
-                pluck(propertyName: string): any[];
-                forEach<T>(application: (choice: Choice) => T): T[];
-            }
-
-            interface SeparatorStatic {
-                /**
-                 * @param line Separation line content (facultative)
-                 */
-                new(line?: string): Separator;
-                /**
-                 * Helper function returning false if object is a separator
-                 * @param obj object to test against
-                 * @return `false` if object is a separator
-                 */
-                exclude(obj: any): boolean;
-            }
-
-            /**
-             * Separator object
-             * Used to space/separate choices group
-             * @constructor
-             * @param {String} line   Separation line content (facultative)
-             */
-            interface Separator {
-                type: string;
-                line: string;
-                /**
-                 * Stringify separator
-                 * @return {String} the separator display string
-                 */
-                toString(): string;
-            }
-        }
-    }
-
-    var inquirer: inquirer.Inquirer;
-
-    export = inquirer;
-}
-
diff --git a/inquirer/tsconfig.json b/inquirer/tsconfig.json
new file mode 100644
index 0000000000..ffa41b82aa
--- /dev/null
+++ b/inquirer/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "inquirer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/insight/index.d.ts b/insight/index.d.ts
new file mode 100644
index 0000000000..2dfc147da6
--- /dev/null
+++ b/insight/index.d.ts
@@ -0,0 +1,49 @@
+// Type definitions for insight 0.4.3
+// Project: https://github.com/yeoman/insight
+// Definitions by: vvakame <http://github.com/vvakame>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace insight {
+    interface IOptions {
+        trackingCode:string;
+        trackingProvider?:string;
+        packageName:string;
+        packageVersion?:string;
+        config?:IConfigstore;
+    }
+
+    interface IConfigstore {
+        path:string;
+        all:any;
+        get(key:string):any;
+        set(key:string, val:any):void;
+        del(key:string):void;
+    }
+}
+
+
+import IOptions = insight.IOptions;
+import IConfigstore = insight.IConfigstore;
+
+declare class Insight {
+    trackingCode:string;
+    trackingProvider:string;
+    packageName:string;
+    packageVersion:string;
+    os:string;
+    nodeVersion:string;
+    appVersion:string;
+    config:IConfigstore;
+
+    optOut:boolean;
+    clientId:string;
+
+    constructor(options:IOptions);
+
+    track(...args:string[]):void;
+
+    askPermission(msg?:string, cb?:Function):void;
+}
+
+export = Insight;
+
diff --git a/insight/insight-tests.ts b/insight/insight-tests.ts
index a108aeff9e..93d50d8dca 100644
--- a/insight/insight-tests.ts
+++ b/insight/insight-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./insight.d.ts" />
+
 
 declare var require:any;
 
diff --git a/insight/insight.d.ts b/insight/insight.d.ts
deleted file mode 100644
index f747671bbc..0000000000
--- a/insight/insight.d.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-// Type definitions for insight 0.4.3
-// Project: https://github.com/yeoman/insight
-// Definitions by: vvakame <http://github.com/vvakame>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace insight {
-    interface IOptions {
-        trackingCode:string;
-        trackingProvider?:string;
-        packageName:string;
-        packageVersion?:string;
-        config?:IConfigstore;
-    }
-
-    interface IConfigstore {
-        path:string;
-        all:any;
-        get(key:string):any;
-        set(key:string, val:any):void;
-        del(key:string):void;
-    }
-}
-
-declare module "insight" {
-    import IOptions = insight.IOptions;
-    import IConfigstore = insight.IConfigstore;
-
-    class Insight {
-        trackingCode:string;
-        trackingProvider:string;
-        packageName:string;
-        packageVersion:string;
-        os:string;
-        nodeVersion:string;
-        appVersion:string;
-        config:IConfigstore;
-
-        optOut:boolean;
-        clientId:string;
-
-        constructor(options:IOptions);
-
-        track(...args:string[]):void;
-
-        askPermission(msg?:string, cb?:Function):void;
-    }
-
-    export = Insight;
-}
diff --git a/insight/tsconfig.json b/insight/tsconfig.json
new file mode 100644
index 0000000000..a5bce12dca
--- /dev/null
+++ b/insight/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "insight-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/interactjs/interact.d.ts b/interact.js/index.d.ts
similarity index 100%
rename from interactjs/interact.d.ts
rename to interact.js/index.d.ts
diff --git a/interactjs/interact-tests.ts b/interact.js/interact-tests.ts
similarity index 98%
rename from interactjs/interact-tests.ts
rename to interact.js/interact-tests.ts
index 90f43a9668..1b78264574 100644
--- a/interactjs/interact-tests.ts
+++ b/interact.js/interact-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./interact.d.ts" />
+
 
 import interact = require("interact");
 
diff --git a/interact.js/tsconfig.json b/interact.js/tsconfig.json
new file mode 100644
index 0000000000..bb93225939
--- /dev/null
+++ b/interact.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "interact-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/intercomjs/intercom.d.ts b/intercomjs/index.d.ts
similarity index 100%
rename from intercomjs/intercom.d.ts
rename to intercomjs/index.d.ts
diff --git a/intercomjs/intercom-tests.ts b/intercomjs/intercom-tests.ts
index 89729ca284..62120ccb1b 100644
--- a/intercomjs/intercom-tests.ts
+++ b/intercomjs/intercom-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="intercom.d.ts" />
+
 
 function test_intercom_static() {
     var instance: intercom.Intercom = Intercom.getInstance();
diff --git a/intercomjs/tsconfig.json b/intercomjs/tsconfig.json
new file mode 100644
index 0000000000..db593ef51d
--- /dev/null
+++ b/intercomjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "intercom-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/intro.js/intro.js.d.ts b/intro.js/index.d.ts
similarity index 100%
rename from intro.js/intro.js.d.ts
rename to intro.js/index.d.ts
diff --git a/intro.js/intro.js-tests.ts b/intro.js/intro.js-tests.ts
index a3e5c0e4dd..f4356aa364 100644
--- a/intro.js/intro.js-tests.ts
+++ b/intro.js/intro.js-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="intro.js.d.ts" />
+
 
 var intro = introJs();
 var introWithElement = introJs(document.body);
diff --git a/intro.js/tsconfig.json b/intro.js/tsconfig.json
new file mode 100644
index 0000000000..c4334166bf
--- /dev/null
+++ b/intro.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "intro.js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/invariant/index.d.ts b/invariant/index.d.ts
new file mode 100644
index 0000000000..2a52a0b490
--- /dev/null
+++ b/invariant/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for invariant 2.2.0
+// Project: https://github.com/zertosh/invariant
+// Definitions by: MichaelBennett <https://github.com/bennett000/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare let invariant:invariant.InvariantStatic;
+
+export = invariant;
+export as namespace invariant;
+
+declare namespace invariant {
+  interface InvariantStatic {
+    (testValue:any, format?:string, ...extra:any[]):void;
+  }
+}
+
diff --git a/invariant/invariant-tests.ts b/invariant/invariant-tests.ts
index 06a4e9b4ed..e0d90fa173 100644
--- a/invariant/invariant-tests.ts
+++ b/invariant/invariant-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./invariant.d.ts" />
+import invariant = require("invariant");
 
 // will throw in dev mode (process.env.NODE_ENV !== 'production')
 invariant(true);
diff --git a/invariant/invariant.d.ts b/invariant/invariant.d.ts
deleted file mode 100644
index ab69402426..0000000000
--- a/invariant/invariant.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for invariant 2.2.0
-// Project: https://github.com/zertosh/invariant
-// Definitions by: MichaelBennett <https://github.com/bennett000/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare let invariant:invariant.InvariantStatic;
-
-declare module "invariant" {
-  export = invariant;
-}
-
-declare namespace invariant {
-  interface InvariantStatic {
-    (testValue:any, format?:string, ...extra:any[]):void;
-  }
-}
-
diff --git a/invariant/tsconfig.json b/invariant/tsconfig.json
new file mode 100644
index 0000000000..f62ac0fd55
--- /dev/null
+++ b/invariant/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "invariant-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/inversify/index.d.ts b/inversify/index.d.ts
new file mode 100644
index 0000000000..871bb99a33
--- /dev/null
+++ b/inversify/index.d.ts
@@ -0,0 +1,141 @@
+// Type definitions for inversify 2.0.0-alpha.3
+// Project: https://github.com/inversify/InversifyJS
+// Definitions by: inversify <https://github.com/inversify>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="bluebird" />
+
+declare namespace inversify {
+
+    interface IKernelConstructor {
+        new(options?: IKernelOptions): IKernel;
+    }
+
+    export interface IKernel {
+        bind<T>(runtimeIdentifier: string): IBindingToSyntax<T>;
+        unbind(runtimeIdentifier: string): void;
+        unbindAll(): void;
+        get<T>(runtimeIdentifier: string): T;
+        getAll<T>(runtimeIdentifier: string): T[];
+    }
+
+    export interface IKernelOptions {
+        middleware?: IMiddleware[];
+        modules?: IKernelModule[];
+    }
+
+    interface IMiddleware extends Function {
+        (...args: any[]): any;
+    }
+
+    export interface IKernelModule extends Function {
+        (kernel: IKernel): void;
+    }
+
+    interface IBindingToSyntax<T> {
+        to(constructor: { new(...args: any[]): T; }): IBindingInWhenProxySyntax<T>;
+        toValue(value: T): IBindingInWhenProxySyntax<T>;
+        toConstructor<T2>(constructor: INewable<T2>): IBindingInWhenProxySyntax<T>;
+        toFactory<T2>(factory: IFactoryCreator<T2>): IBindingInWhenProxySyntax<T>;
+        toAutoFactory<T2>(): IBindingInWhenProxySyntax<T>;
+        toProvider<T2>(provider: IProviderCreator<T2>): IBindingInWhenProxySyntax<T>;
+    }
+
+    interface IBindingInWhenProxySyntax<T> {
+        inTransientScope(): IBindingInWhenProxySyntax<T>;
+        inSingletonScope(): IBindingInWhenProxySyntax<T>;
+        when(constraint: (request: IRequest) => boolean): IBindingInWhenProxySyntax<T>;
+        whenTargetNamed(name: string): IBindingInWhenProxySyntax<T>;
+        whenTargetTagged(tag: string, value: any): IBindingInWhenProxySyntax<T>;
+        proxy(fn: (injectable: T) => T): IBindingInWhenProxySyntax<T>;
+    }
+
+    export interface IFactory<T> extends Function {
+        (): T;
+    }
+
+    interface IFactoryCreator<T> extends Function {
+        (context: IContext): IFactory<T>;
+    }
+
+    export interface INewable<T> {
+        new(...args: any[]): T;
+    }
+
+    export interface IProvider<T> extends Function {
+        (): Promise<T>;
+    }
+
+    interface IProviderCreator<T> extends Function {
+        (context: IContext): IProvider<T>;
+    }
+
+    export interface IContext {
+        kernel: IKernel;
+        plan: IPlan;
+        addPlan(plan: IPlan): void;
+    }
+
+    export interface IPlan {
+        parentContext: IContext;
+        rootRequest: IRequest;
+    }
+
+    export interface IRequest {
+        service: string;
+        parentContext: IContext;
+        parentRequest: IRequest;
+        childRequests: IRequest[];
+        target: ITarget;
+        bindings: IBinding<any>[];
+        addChildRequest(
+            service: string,
+            bindings: (IBinding<any>|IBinding<any>[]),
+            target: ITarget): IRequest;
+    }
+
+    export interface IBinding<T> {
+        runtimeIdentifier: string;
+        implementationType: INewable<T>;
+        factory: IFactoryCreator<any>;
+        provider: IProviderCreator<any>;
+        constraint: (request: IRequest) => boolean;
+        proxyMaker: (injectable: T) => T;
+        cache: T;
+        scope: number; // BindingScope
+        type: number; // BindingType
+    }
+
+    export interface ITarget {
+        service: IQueryableString;
+        name: IQueryableString;
+        metadata: Array<IMetadata>;
+        isArray(): boolean;
+        isNamed(): boolean;
+        isTagged(): boolean;
+        matchesName(name: string): boolean;
+        matchesTag(name: IMetadata): boolean;
+    }
+
+    export interface IQueryableString {
+        startsWith(searchString: string): boolean;
+        endsWith(searchString: string): boolean;
+        contains(searchString: string): boolean;
+        equals(compareString: string): boolean;
+        value(): string;
+    }
+
+    export interface IMetadata {
+        key: string;
+        value: any;
+    }
+
+    export var Kernel: IKernelConstructor;
+    export var decorate: any;
+    export function inject(...typeIdentifiers: string[]): (typeConstructor: any) => void;
+    export var tagged: any;
+    export var named: any;
+    export var paramNames: any;
+}
+
+export = inversify;
diff --git a/inversify/inversify-global-tests.ts b/inversify/inversify-global-tests.ts
index c39b231b91..2e5736294d 100644
--- a/inversify/inversify-global-tests.ts
+++ b/inversify/inversify-global-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="inversify.d.ts" />
+
 
 namespace global_module_test {
 
diff --git a/inversify/inversify-tests.ts b/inversify/inversify-tests.ts
index 23af8db21f..47cab2499a 100644
--- a/inversify/inversify-tests.ts
+++ b/inversify/inversify-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="inversify.d.ts" />
+
 
 import {
     Kernel,
diff --git a/inversify/inversify.d.ts b/inversify/inversify.d.ts
deleted file mode 100644
index 79cd4e3dec..0000000000
--- a/inversify/inversify.d.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-// Type definitions for inversify 2.0.0-alpha.3
-// Project: https://github.com/inversify/InversifyJS
-// Definitions by: inversify <https://github.com/inversify>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../bluebird/bluebird.d.ts" />
-
-declare namespace inversify {
-
-    interface IKernelConstructor {
-        new(options?: IKernelOptions): IKernel;
-    }
-
-    export interface IKernel {
-        bind<T>(runtimeIdentifier: string): IBindingToSyntax<T>;
-        unbind(runtimeIdentifier: string): void;
-        unbindAll(): void;
-        get<T>(runtimeIdentifier: string): T;
-        getAll<T>(runtimeIdentifier: string): T[];
-    }
-
-    export interface IKernelOptions {
-        middleware?: IMiddleware[];
-        modules?: IKernelModule[];
-    }
-
-    interface IMiddleware extends Function {
-        (...args: any[]): any;
-    }
-
-    export interface IKernelModule extends Function {
-        (kernel: IKernel): void;
-    }
-
-    interface IBindingToSyntax<T> {
-        to(constructor: { new(...args: any[]): T; }): IBindingInWhenProxySyntax<T>;
-        toValue(value: T): IBindingInWhenProxySyntax<T>;
-        toConstructor<T2>(constructor: INewable<T2>): IBindingInWhenProxySyntax<T>;
-        toFactory<T2>(factory: IFactoryCreator<T2>): IBindingInWhenProxySyntax<T>;
-        toAutoFactory<T2>(): IBindingInWhenProxySyntax<T>;
-        toProvider<T2>(provider: IProviderCreator<T2>): IBindingInWhenProxySyntax<T>;
-    }
-
-    interface IBindingInWhenProxySyntax<T> {
-        inTransientScope(): IBindingInWhenProxySyntax<T>;
-        inSingletonScope(): IBindingInWhenProxySyntax<T>;
-        when(constraint: (request: IRequest) => boolean): IBindingInWhenProxySyntax<T>;
-        whenTargetNamed(name: string): IBindingInWhenProxySyntax<T>;
-        whenTargetTagged(tag: string, value: any): IBindingInWhenProxySyntax<T>;
-        proxy(fn: (injectable: T) => T): IBindingInWhenProxySyntax<T>;
-    }
-
-    export interface IFactory<T> extends Function {
-        (): T;
-    }
-
-    interface IFactoryCreator<T> extends Function {
-        (context: IContext): IFactory<T>;
-    }
-
-    export interface INewable<T> {
-        new(...args: any[]): T;
-    }
-
-    export interface IProvider<T> extends Function {
-        (): Promise<T>;
-    }
-
-    interface IProviderCreator<T> extends Function {
-        (context: IContext): IProvider<T>;
-    }
-
-    export interface IContext {
-        kernel: IKernel;
-        plan: IPlan;
-        addPlan(plan: IPlan): void;
-    }
-
-    export interface IPlan {
-        parentContext: IContext;
-        rootRequest: IRequest;
-    }
-
-    export interface IRequest {
-        service: string;
-        parentContext: IContext;
-        parentRequest: IRequest;
-        childRequests: IRequest[];
-        target: ITarget;
-        bindings: IBinding<any>[];
-        addChildRequest(
-            service: string,
-            bindings: (IBinding<any>|IBinding<any>[]),
-            target: ITarget): IRequest;
-    }
-
-    export interface IBinding<T> {
-        runtimeIdentifier: string;
-        implementationType: INewable<T>;
-        factory: IFactoryCreator<any>;
-        provider: IProviderCreator<any>;
-        constraint: (request: IRequest) => boolean;
-        proxyMaker: (injectable: T) => T;
-        cache: T;
-        scope: number; // BindingScope
-        type: number; // BindingType
-    }
-
-    export interface ITarget {
-        service: IQueryableString;
-        name: IQueryableString;
-        metadata: Array<IMetadata>;
-        isArray(): boolean;
-        isNamed(): boolean;
-        isTagged(): boolean;
-        matchesName(name: string): boolean;
-        matchesTag(name: IMetadata): boolean;
-    }
-
-    export interface IQueryableString {
-        startsWith(searchString: string): boolean;
-        endsWith(searchString: string): boolean;
-        contains(searchString: string): boolean;
-        equals(compareString: string): boolean;
-        value(): string;
-    }
-
-    export interface IMetadata {
-        key: string;
-        value: any;
-    }
-
-    export var Kernel: IKernelConstructor;
-    export var decorate: any;
-    export function inject(...typeIdentifiers: string[]): (typeConstructor: any) => void;
-    export var tagged: any;
-    export var named: any;
-    export var paramNames: any;
-}
-
-declare module "inversify" {
-  export = inversify;
-}
diff --git a/inversify/tsconfig.json b/inversify/tsconfig.json
new file mode 100644
index 0000000000..12b7ad31a1
--- /dev/null
+++ b/inversify/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "experimentalDecorators": true,
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "inversify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ion.rangeSlider/ion.rangeSlider.d.ts b/ion.rangeSlider/index.d.ts
similarity index 100%
rename from ion.rangeSlider/ion.rangeSlider.d.ts
rename to ion.rangeSlider/index.d.ts
diff --git a/ion.rangeSlider/ion.rangeSlider-1.9.1-tests.ts b/ion.rangeSlider/ion.rangeSlider-1.9.1-tests.ts
index c04d5715fe..224deab397 100644
--- a/ion.rangeSlider/ion.rangeSlider-1.9.1-tests.ts
+++ b/ion.rangeSlider/ion.rangeSlider-1.9.1-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
+/// <reference types="jquery"/>
 /// <reference path="ion.rangeSlider-1.9.1.d.ts"/>
 
 var sliderInputElement = $('<input />');
diff --git a/ion.rangeSlider/ion.rangeSlider-tests.ts b/ion.rangeSlider/ion.rangeSlider-tests.ts
index d233404d2d..e60287feb3 100644
--- a/ion.rangeSlider/ion.rangeSlider-tests.ts
+++ b/ion.rangeSlider/ion.rangeSlider-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="ion.rangeSlider.d.ts"/>
+/// <reference types="jquery"/>
 
 var sliderInputElement = $('<input />');
 sliderInputElement.ionRangeSlider({
diff --git a/ion.rangeSlider/tsconfig.json b/ion.rangeSlider/tsconfig.json
new file mode 100644
index 0000000000..0d27d893f2
--- /dev/null
+++ b/ion.rangeSlider/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "ion.rangeSlider-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/ionic/index.d.ts b/ionic/index.d.ts
new file mode 100644
index 0000000000..711841f5ef
--- /dev/null
+++ b/ionic/index.d.ts
@@ -0,0 +1,395 @@
+// Type definitions for Ionic
+// Project: http://ionicframework.com
+// Definitions by: Spencer Williams <https://github.com/spencerwi/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+interface IonicStatic {
+    /**
+     * What Ionic package version is.
+     */
+    version: string;
+    Platform: {
+        /**
+        * Trigger a callback once the device is ready, or immediately
+         * if the device is already ready. This method can be run from
+         * anywhere and does not need to be wrapped by any additonal methods.
+         * When the app is within a WebView (Cordova), it’ll fire
+         * the callback once the device is ready. If the app is within
+         * a web browser, it’ll fire the callback after window.load.
+         * Please remember that Cordova features (Camera, FileSystem, etc) still
+         * will not work in a web browser.
+         */
+        ready(callback: ()=>any): void;
+        /**
+         * Set the grade of the device: ‘a’, ‘b’, or ‘c’. ‘a’ is the best
+         * (most css features enabled), ‘c’ is the worst. By default, sets the grade
+         * depending on the current device.
+         */
+        setGrade(grade: string): void;
+        /**
+         * Return the current device (given by cordova).
+         */
+        device(): any;
+        /**
+         * Check if the platform name provided is detected.
+         */
+        is(platformName: string): boolean;
+        /**
+         * Check if we are running within a WebView (such as Cordova).
+         */
+        isWebView(): boolean;
+        /**
+         * Whether we are running on iPad.
+         */
+        isIPad(): boolean;
+        /**
+         * Whether we are running on iOS.
+         */
+        isIOS(): boolean;
+        /**
+         * Whether we are running on Android.
+         */
+        isAndroid(): boolean;
+        /**
+         * Whether we are running on Windows Phone.
+         */
+        isWindowsPhone(): boolean;
+        /**
+         * The name of the current platform.
+         */
+        platform(): string;
+        /**
+         * The version of the current device platform.
+         */
+        version(): number;
+        /**
+         * Exit the app.
+         */
+        exitApp(): void;
+        /**
+         * Shows or hides the device status bar (in Cordova). Requires cordova plugin add org.apache.cordova.statusbar
+         */
+        showStatusBar(shouldShow: boolean): void;
+        /**
+         * Sets whether the app is fullscreen or not (in Cordova).
+         */
+        fullScreen(showFullScreen?: boolean, showStatusBar?: boolean): void;
+        /**
+         * Whether the device is ready.
+         */
+        isReady: boolean;
+        /**
+         * Whether the device is fullscreen.
+         */
+        isFullScreen: boolean;
+        /**
+         * An array of all platforms found.
+         */
+        platforms: Array<string>;
+        /**
+         * What grade the current platform is.
+         */
+        grade: string;
+    };
+}
+
+declare var ionic: IonicStatic;
+
+declare module 'ionic' {
+    export = ionic;
+}
+
+declare namespace ionic {
+    namespace actionSheet {
+        interface IonicActionSheetService {
+            show(options: IonicActionSheetOptions): ()=>void;
+        }
+        interface IonicActionSheetButton {
+            text: string;
+        }
+        interface IonicActionSheetOptions {
+            buttons?: Array<IonicActionSheetButton>;
+            titleText?: string;
+            cancelText?: string;
+            destructiveText?: string;
+            cancel?: ()=>any;
+            buttonClicked?: (index: number)=>boolean;
+            destructiveButtonClicked?: ()=>boolean;
+            cancelOnStateChange?: boolean;
+            cssClass?: string;
+        }
+    }
+    namespace backdrop {
+        interface IonicBackdropService {
+            retain(): void;
+            release(): void;
+        }
+    }
+    namespace gestures {
+        interface IonicGestureService {
+            on(eventType: string, callback: (e: any)=>any, $element: angular.IAugmentedJQuery, options: any): IonicGesture;
+            off(gesture: IonicGesture, eventType: string, callback: (e: any)=>any): void;
+        }
+
+        interface IonicGesture {
+            element: Element;
+            enabled: boolean;
+            options: {stop_browser_behavior: string };
+            on(gesture: string, handler: Function): IonicGesture;
+            off(gesture: string, handler: Function): IonicGesture;
+            trigger(gesture: string, eventData: any): IonicGesture;
+            enable(state: boolean): IonicGesture;
+        }
+
+    }
+    namespace list {
+        interface IonicListDelegate {
+            showReorder(showReorder?: boolean): boolean;
+            showDelete(showDelete?: boolean): boolean;
+            canSwipeItems(canSwipeItems?: boolean): boolean;
+            closeOptionButtons(): void;
+            $getByHandle(handle: string): IonicListDelegate;
+        }
+    }
+    namespace loading {
+        interface IonicLoadingService {
+            show(opts?: IonicLoadingOptions): void;
+            hide(): void;
+        }
+        interface IonicLoadingOptions {
+            template?: string;
+            templateUrl?: string;
+            scope?: any;
+            noBackdrop?: boolean;
+            hideOnStateChange?: boolean;
+            delay?: number;
+            duration?: number;
+        }
+    }
+    namespace modal {
+        interface IonicModalService {
+            fromTemplate(templateString: string, options?: IonicModalOptions): IonicModalController;
+            fromTemplateUrl(templateUrl: string, options?: IonicModalOptions): angular.IPromise<IonicModalController>;
+        }
+
+        interface IonicModalController {
+            initialize(options: IonicModalOptions): void;
+            show(): angular.IPromise<void>;
+            hide(): angular.IPromise<void>;
+            remove(): angular.IPromise<void>;
+            isShown(): boolean;
+        }
+
+        interface IonicModalOptions {
+            scope?: any;
+            animation?: string;
+            focusFirstInput?: boolean;
+            backdropClickToClose?: boolean;
+            hardwareBackButtonClose?: boolean;
+        }
+    }
+    namespace navigation {
+        interface IonicNavBarDelegate {
+            align(direction?: string): void;
+            showBackButton(show?: boolean): boolean;
+            showBar(show?: boolean): boolean;
+            title(title: string): void;
+        }
+
+        interface IonicHistoryService {
+            viewHistory(): any;
+
+            currentView(): any;
+            currentHistoryId(): string;
+            currentTitle(val?: string): string;
+
+            backView(): any;
+            backTitle(): string;
+
+            forwardView(): any;
+
+            currentStateName(): string;
+
+            goBack(backCount?: number): void;
+            clearHistory(): void;
+            clearCache(): angular.IPromise<any>;
+            nextViewOptions(options: IonicHistoryNextViewOptions): void;
+        }
+        interface IonicHistoryNextViewOptions {
+            disableAnimate?: boolean;
+            disableBack?: boolean;
+            historyRoot?: boolean;
+        }
+    }
+    namespace platform {
+        interface IonicPlatformService {
+            onHardwareBackButton(callback: Function): void;
+            offHardwareBackButton(callback: Function): void;
+            registerBackButtonAction(callback: Function, priority: number, actionId?: any): Function;
+            on(type: string, callback: Function): Function;
+            ready(callback?: Function): angular.IPromise<any>;
+        }
+    }
+    namespace popover {
+        interface IonicPopoverService {
+            fromTemplate(templateString: string, options: IonicPopoverOptions): IonicPopoverController;
+            fromTemplateUrl(templateUrl: string, options: IonicPopoverOptions): angular.IPromise<IonicPopoverController>;
+        }
+        interface IonicPopoverController {
+            initialize(options: IonicPopoverOptions): void;
+            show($event?: any): angular.IPromise<any>;
+            hide(): angular.IPromise<any>;
+            isShown(): boolean;
+            remove(): angular.IPromise<any>;
+        }
+        interface IonicPopoverOptions {
+            scope?: any;
+            focusFirstInput?: boolean;
+            backdropClickToClose?: boolean;
+            hardwareBackButtonClose?: boolean;
+        }
+    }
+    namespace popup {
+        interface IonicPopupService {
+            show(options: IonicPopupFullOptions): IonicPopupPromise;
+            alert(options: IonicPopupAlertOptions): IonicPopupPromise;
+            confirm(options: IonicPopupConfirmOptions): IonicPopupConfirmPromise;
+            prompt(options: IonicPopupPromptOptions): IonicPopupPromise;
+        }
+
+        interface IonicPopupConfirmPromise extends angular.IPromise<boolean> {
+            close(value?: boolean): void;
+        }
+        interface IonicPopupPromise extends angular.IPromise<any> {
+            close(value?: any): any;
+        }
+        interface IonicPopupBaseOptions {
+            title?: string;
+            cssClass?: string;
+            subTitle?: string;
+            template?: string;
+            templateUrl?: string;
+        }
+        interface IonicPopupFullOptions extends IonicPopupBaseOptions {
+            scope?: any;
+            buttons?: Array<IonicPopupButton>;
+        }
+        interface IonicPopupButton {
+            text: string;
+            type?: string;
+            onTap?(event?: any): void;
+        }
+        interface IonicPopupAlertOptions extends IonicPopupBaseOptions {
+            okText?: string;
+            okType?: string;
+        }
+        interface IonicPopupConfirmOptions extends IonicPopupBaseOptions {
+            cancelText?: string;
+            cancelType?: string;
+            okText?: string;
+            okType?: string;
+        }
+        interface IonicPopupPromptOptions extends IonicPopupBaseOptions {
+            inputType?: string;
+            inputPlaceholder?: string;
+            cancelText?: string;
+            cancelType?: string;
+            okText?: string;
+            okType?: string;
+        }
+    }
+    namespace scroll {
+        interface IonicScrollDelegate {
+            resize(): void;
+            scrollTop(shouldAnimate?: boolean): void;
+            scrollBottom(shouldAnimate?: boolean): void;
+            scrollTo(left: number, top: number, shouldAnimate?: boolean): void;
+            scrollBy(left: number, top: number, shouldAnimate?: boolean): void;
+            zoomTo(level: number, animate?: boolean, originLeft?: number, originTop?: number): void;
+            zoomBy(factor: number, animate?: boolean, originLeft?: number, originTop?: number): void;
+            getScrollPosition(): {left: number; top: number};
+            anchorScroll(shouldAnimate?: boolean): void;
+            freezeScroll(shouldFreeze?: boolean): boolean;
+            freezeAllScrolls(shouldFreeze?: boolean): boolean;
+            getScrollView(): any;
+            $getByHandle(handle: string): IonicScrollDelegate;
+        }
+    }
+    namespace sideMenu {
+        interface IonicSideMenuDelegate {
+            toggleLeft(isOpen?: boolean): void;
+            toggleRight(isOpen?: boolean): void;
+            getOpenRatio(): number;
+            isOpen(): boolean;
+            isOpenLeft(): boolean;
+            isOpenRight(): boolean;
+            canDragContent(canDrag?: boolean): boolean;
+            edgeDragThreshold(value?: boolean|number): boolean;
+            $getByHandle(handle: string): IonicSideMenuDelegate;
+        }
+    }
+    namespace slideBox {
+        interface IonicSlideBoxDelegate {
+            update(): void;
+            slide(to: number, speed?: number): void;
+            enableSlide(shouldEnable?: boolean): boolean;
+            previous(speed?: number): void;
+            next(speed?: number): void;
+            stop(): void;
+            start(): void;
+            currentIndex(): number;
+            slidesCount(): number;
+            $getByHandle(handle: string): IonicSlideBoxDelegate;
+        }
+    }
+    namespace tabs {
+        interface IonicTabsDelegate {
+            select(index: number): void;
+            selectedIndex(): number;
+            $getByHandle(handle: string): IonicTabsDelegate;
+            showBar(show?: boolean): boolean;
+        }
+    }
+    namespace utility {
+        interface IonicConfigProvider {
+            views: {
+                transition(transition?: string): string;
+                maxCache(maxNumber?: number): number;
+                forwardCache(value?: boolean): boolean;
+            };
+            scrolling: {
+                jsScrolling(value?: boolean): boolean;
+            };
+            backButton: {
+                icon(value?: string): string;
+                text(value?: string): string;
+                previousTitleText(value?: boolean): boolean;
+            };
+            form: {
+                checkbox(value?: string): string;
+                toggle(value?: string): string;
+            };
+            spinner: {
+                icon(value?: string): string;
+            };
+            tabs: {
+                style(value?: string): string;
+                position(value?: string): string;
+            };
+            templates: {
+                maxPrefetch(value?: number): number;
+            };
+            navBar: {
+                alignTitle(value?: string): string;
+                positionPrimaryButtons(value?: string): string;
+                positionSecondaryButtons(value?: string): string;
+            };
+        }
+        interface IonicPositionService {
+            position(element: any): {top: number; left: number; width: number; height: number};
+            offset(element: any): {top: number; left: number; width: number; height: number};
+        }
+    }
+}
diff --git a/ionic/ionic-tests.ts b/ionic/ionic-tests.ts
index 8491fc13f8..2f587f0bf3 100644
--- a/ionic/ionic-tests.ts
+++ b/ionic/ionic-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./ionic.d.ts" />
+
 
 var testIonic = angular.module('testIonic', ['ionic']);
 
@@ -387,6 +387,7 @@ class IonicTestController {
         ready = ionic.Platform.ready(callbackWithReturn);
         var setGrade: void = ionic.Platform.setGrade('iOS');
         var deviceInformation: string = ionic.Platform.device();
+        var isBrowser: boolean = ionic.Platform.is('browser');
         var isWebView: boolean = ionic.Platform.isWebView();
         var isIPad: boolean = ionic.Platform.isIPad();
         var isIOS: boolean = ionic.Platform.isIOS();
diff --git a/ionic/ionic.d.ts b/ionic/ionic.d.ts
deleted file mode 100644
index 994b7ae27e..0000000000
--- a/ionic/ionic.d.ts
+++ /dev/null
@@ -1,391 +0,0 @@
-// Type definitions for Ionic
-// Project: http://ionicframework.com
-// Definitions by: Spencer Williams <https://github.com/spencerwi/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-interface IonicStatic {
-    /**
-     * What Ionic package version is.
-     */
-    version: string;
-    Platform: {
-        /**
-        * Trigger a callback once the device is ready, or immediately
-         * if the device is already ready. This method can be run from
-         * anywhere and does not need to be wrapped by any additonal methods.
-         * When the app is within a WebView (Cordova), it’ll fire
-         * the callback once the device is ready. If the app is within
-         * a web browser, it’ll fire the callback after window.load.
-         * Please remember that Cordova features (Camera, FileSystem, etc) still
-         * will not work in a web browser.
-         */
-        ready(callback: ()=>any): void;
-        /**
-         * Set the grade of the device: ‘a’, ‘b’, or ‘c’. ‘a’ is the best
-         * (most css features enabled), ‘c’ is the worst. By default, sets the grade
-         * depending on the current device.
-         */
-        setGrade(grade: string): void;
-        /**
-         * Return the current device (given by cordova).
-         */
-        device(): any;
-        /**
-         * Check if we are running within a WebView (such as Cordova).
-         */
-        isWebView(): boolean;
-        /**
-         * Whether we are running on iPad.
-         */
-        isIPad(): boolean;
-        /**
-         * Whether we are running on iOS.
-         */
-        isIOS(): boolean;
-        /**
-         * Whether we are running on Android.
-         */
-        isAndroid(): boolean;
-        /**
-         * Whether we are running on Windows Phone.
-         */
-        isWindowsPhone(): boolean;
-        /**
-         * The name of the current platform.
-         */
-        platform(): string;
-        /**
-         * The version of the current device platform.
-         */
-        version(): number;
-        /**
-         * Exit the app.
-         */
-        exitApp(): void;
-        /**
-         * Shows or hides the device status bar (in Cordova). Requires cordova plugin add org.apache.cordova.statusbar
-         */
-        showStatusBar(shouldShow: boolean): void;
-        /**
-         * Sets whether the app is fullscreen or not (in Cordova).
-         */
-        fullScreen(showFullScreen?: boolean, showStatusBar?: boolean): void;
-        /**
-         * Whether the device is ready.
-         */
-        isReady: boolean;
-        /**
-         * Whether the device is fullscreen.
-         */
-        isFullScreen: boolean;
-        /**
-         * An array of all platforms found.
-         */
-        platforms: Array<string>;
-        /**
-         * What grade the current platform is.
-         */
-        grade: string;
-    };
-}
-
-declare var ionic: IonicStatic;
-
-declare module 'ionic' {
-    export = ionic;
-}
-
-declare namespace ionic {
-    namespace actionSheet {
-        interface IonicActionSheetService {
-            show(options: IonicActionSheetOptions): ()=>void;
-        }
-        interface IonicActionSheetButton {
-            text: string;
-        }
-        interface IonicActionSheetOptions {
-            buttons?: Array<IonicActionSheetButton>;
-            titleText?: string;
-            cancelText?: string;
-            destructiveText?: string;
-            cancel?: ()=>any;
-            buttonClicked?: (index: number)=>boolean;
-            destructiveButtonClicked?: ()=>boolean;
-            cancelOnStateChange?: boolean;
-            cssClass?: string;
-        }
-    }
-    namespace backdrop {
-        interface IonicBackdropService {
-            retain(): void;
-            release(): void;
-        }
-    }
-    namespace gestures {
-        interface IonicGestureService {
-            on(eventType: string, callback: (e: any)=>any, $element: angular.IAugmentedJQuery, options: any): IonicGesture;
-            off(gesture: IonicGesture, eventType: string, callback: (e: any)=>any): void;
-        }
-
-        interface IonicGesture {
-            element: Element;
-            enabled: boolean;
-            options: {stop_browser_behavior: string };
-            on(gesture: string, handler: Function): IonicGesture;
-            off(gesture: string, handler: Function): IonicGesture;
-            trigger(gesture: string, eventData: any): IonicGesture;
-            enable(state: boolean): IonicGesture;
-        }
-
-    }
-    namespace list {
-        interface IonicListDelegate {
-            showReorder(showReorder?: boolean): boolean;
-            showDelete(showDelete?: boolean): boolean;
-            canSwipeItems(canSwipeItems?: boolean): boolean;
-            closeOptionButtons(): void;
-            $getByHandle(handle: string): IonicListDelegate;
-        }
-    }
-    namespace loading {
-        interface IonicLoadingService {
-            show(opts?: IonicLoadingOptions): void;
-            hide(): void;
-        }
-        interface IonicLoadingOptions {
-            template?: string;
-            templateUrl?: string;
-            scope?: any;
-            noBackdrop?: boolean;
-            hideOnStateChange?: boolean;
-            delay?: number;
-            duration?: number;
-        }
-    }
-    namespace modal {
-        interface IonicModalService {
-            fromTemplate(templateString: string, options?: IonicModalOptions): IonicModalController;
-            fromTemplateUrl(templateUrl: string, options?: IonicModalOptions): angular.IPromise<IonicModalController>;
-        }
-
-        interface IonicModalController {
-            initialize(options: IonicModalOptions): void;
-            show(): angular.IPromise<void>;
-            hide(): angular.IPromise<void>;
-            remove(): angular.IPromise<void>;
-            isShown(): boolean;
-        }
-
-        interface IonicModalOptions {
-            scope?: any;
-            animation?: string;
-            focusFirstInput?: boolean;
-            backdropClickToClose?: boolean;
-            hardwareBackButtonClose?: boolean;
-        }
-    }
-    namespace navigation {
-        interface IonicNavBarDelegate {
-            align(direction?: string): void;
-            showBackButton(show?: boolean): boolean;
-            showBar(show?: boolean): boolean;
-            title(title: string): void;
-        }
-
-        interface IonicHistoryService {
-            viewHistory(): any;
-
-            currentView(): any;
-            currentHistoryId(): string;
-            currentTitle(val?: string): string;
-
-            backView(): any;
-            backTitle(): string;
-
-            forwardView(): any;
-
-            currentStateName(): string;
-
-            goBack(backCount?: number): void;
-            clearHistory(): void;
-            clearCache(): angular.IPromise<any>;
-            nextViewOptions(options: IonicHistoryNextViewOptions): void;
-        }
-        interface IonicHistoryNextViewOptions {
-            disableAnimate?: boolean;
-            disableBack?: boolean;
-            historyRoot?: boolean;
-        }
-    }
-    namespace platform {
-        interface IonicPlatformService {
-            onHardwareBackButton(callback: Function): void;
-            offHardwareBackButton(callback: Function): void;
-            registerBackButtonAction(callback: Function, priority: number, actionId?: any): Function;
-            on(type: string, callback: Function): Function;
-            ready(callback?: Function): angular.IPromise<any>;
-        }
-    }
-    namespace popover {
-        interface IonicPopoverService {
-            fromTemplate(templateString: string, options: IonicPopoverOptions): IonicPopoverController;
-            fromTemplateUrl(templateUrl: string, options: IonicPopoverOptions): angular.IPromise<IonicPopoverController>;
-        }
-        interface IonicPopoverController {
-            initialize(options: IonicPopoverOptions): void;
-            show($event?: any): angular.IPromise<any>;
-            hide(): angular.IPromise<any>;
-            isShown(): boolean;
-            remove(): angular.IPromise<any>;
-        }
-        interface IonicPopoverOptions {
-            scope?: any;
-            focusFirstInput?: boolean;
-            backdropClickToClose?: boolean;
-            hardwareBackButtonClose?: boolean;
-        }
-    }
-    namespace popup {
-        interface IonicPopupService {
-            show(options: IonicPopupFullOptions): IonicPopupPromise;
-            alert(options: IonicPopupAlertOptions): IonicPopupPromise;
-            confirm(options: IonicPopupConfirmOptions): IonicPopupConfirmPromise;
-            prompt(options: IonicPopupPromptOptions): IonicPopupPromise;
-        }
-
-        interface IonicPopupConfirmPromise extends angular.IPromise<boolean> {
-            close(value?: boolean): void;
-        }
-        interface IonicPopupPromise extends angular.IPromise<any> {
-            close(value?: any): any;
-        }
-        interface IonicPopupBaseOptions {
-            title?: string;
-            cssClass?: string;
-            subTitle?: string;
-            template?: string;
-            templateUrl?: string;
-        }
-        interface IonicPopupFullOptions extends IonicPopupBaseOptions {
-            scope?: any;
-            buttons?: Array<IonicPopupButton>;
-        }
-        interface IonicPopupButton {
-            text: string;
-            type?: string;
-            onTap?(event?: any): void;
-        }
-        interface IonicPopupAlertOptions extends IonicPopupBaseOptions {
-            okText?: string;
-            okType?: string;
-        }
-        interface IonicPopupConfirmOptions extends IonicPopupBaseOptions {
-            cancelText?: string;
-            cancelType?: string;
-            okText?: string;
-            okType?: string;
-        }
-        interface IonicPopupPromptOptions extends IonicPopupBaseOptions {
-            inputType?: string;
-            inputPlaceholder?: string;
-            cancelText?: string;
-            cancelType?: string;
-            okText?: string;
-            okType?: string;
-        }
-    }
-    namespace scroll {
-        interface IonicScrollDelegate {
-            resize(): void;
-            scrollTop(shouldAnimate?: boolean): void;
-            scrollBottom(shouldAnimate?: boolean): void;
-            scrollTo(left: number, top: number, shouldAnimate?: boolean): void;
-            scrollBy(left: number, top: number, shouldAnimate?: boolean): void;
-            zoomTo(level: number, animate?: boolean, originLeft?: number, originTop?: number): void;
-            zoomBy(factor: number, animate?: boolean, originLeft?: number, originTop?: number): void;
-            getScrollPosition(): {left: number; top: number};
-            anchorScroll(shouldAnimate?: boolean): void;
-            freezeScroll(shouldFreeze?: boolean): boolean;
-            freezeAllScrolls(shouldFreeze?: boolean): boolean;
-            getScrollView(): any;
-            $getByHandle(handle: string): IonicScrollDelegate;
-        }
-    }
-    namespace sideMenu {
-        interface IonicSideMenuDelegate {
-            toggleLeft(isOpen?: boolean): void;
-            toggleRight(isOpen?: boolean): void;
-            getOpenRatio(): number;
-            isOpen(): boolean;
-            isOpenLeft(): boolean;
-            isOpenRight(): boolean;
-            canDragContent(canDrag?: boolean): boolean;
-            edgeDragThreshold(value?: boolean|number): boolean;
-            $getByHandle(handle: string): IonicSideMenuDelegate;
-        }
-    }
-    namespace slideBox {
-        interface IonicSlideBoxDelegate {
-            update(): void;
-            slide(to: number, speed?: number): void;
-            enableSlide(shouldEnable?: boolean): boolean;
-            previous(speed?: number): void;
-            next(speed?: number): void;
-            stop(): void;
-            start(): void;
-            currentIndex(): number;
-            slidesCount(): number;
-            $getByHandle(handle: string): IonicSlideBoxDelegate;
-        }
-    }
-    namespace tabs {
-        interface IonicTabsDelegate {
-            select(index: number): void;
-            selectedIndex(): number;
-            $getByHandle(handle: string): IonicTabsDelegate;
-            showBar(show?: boolean): boolean;
-        }
-    }
-    namespace utility {
-        interface IonicConfigProvider {
-            views: {
-                transition(transition?: string): string;
-                maxCache(maxNumber?: number): number;
-                forwardCache(value?: boolean): boolean;
-            };
-            scrolling: {
-                jsScrolling(value?: boolean): boolean;
-            };
-            backButton: {
-                icon(value?: string): string;
-                text(value?: string): string;
-                previousTitleText(value?: boolean): boolean;
-            };
-            form: {
-                checkbox(value?: string): string;
-                toggle(value?: string): string;
-            };
-            spinner: {
-                icon(value?: string): string;
-            };
-            tabs: {
-                style(value?: string): string;
-                position(value?: string): string;
-            };
-            templates: {
-                maxPrefetch(value?: number): number;
-            };
-            navBar: {
-                alignTitle(value?: string): string;
-                positionPrimaryButtons(value?: string): string;
-                positionSecondaryButtons(value?: string): string;
-            };
-        }
-        interface IonicPositionService {
-            position(element: any): {top: number; left: number; width: number; height: number};
-            offset(element: any): {top: number; left: number; width: number; height: number};
-        }
-    }
-}
diff --git a/ionic/tsconfig.json b/ionic/tsconfig.json
new file mode 100644
index 0000000000..7540547ded
--- /dev/null
+++ b/ionic/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ionic-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ioredis/index.d.ts b/ioredis/index.d.ts
new file mode 100644
index 0000000000..2460ba6f76
--- /dev/null
+++ b/ioredis/index.d.ts
@@ -0,0 +1,696 @@
+// Type definitions for ioredis
+// Project: https://github.com/luin/ioredis
+// Definitions by: York Yao <https://github.com/plantain-00/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* =================== USAGE ===================
+    import * as Redis from "ioredis";
+    var redis = new Redis();
+ =============================================== */
+
+/// <reference types="node" />
+
+interface RedisStatic {
+    new (port?: number, host?: string, options?: IORedis.RedisOptions): IORedis.Redis;
+    new (host?: string, options?: IORedis.RedisOptions): IORedis.Redis;
+    new (options: IORedis.RedisOptions): IORedis.Redis;
+    new (url: string): IORedis.Redis;
+    (port?: number, host?: string, options?: IORedis.RedisOptions): IORedis.Redis;
+    (host?: string, options?: IORedis.RedisOptions): IORedis.Redis;
+    (options: IORedis.RedisOptions): IORedis.Redis;
+    (url: string): IORedis.Redis;
+    Cluster: IORedis.Cluster;
+}
+
+declare var redis: RedisStatic;
+export = redis;
+
+declare module IORedis {
+    interface Commander {
+        new (): Commander;
+        getBuiltinCommands(): string[];
+        createBuiltinCommand(commandName: string): {};
+        defineCommand(name: string, definition: {
+            numberOfKeys?: number;
+            lua?: string;
+        }): any;
+        sendCommand(): void;
+    }
+
+    interface Redis extends NodeJS.EventEmitter, Commander {
+        connect(callback: Function): Promise<any>;
+        disconnect(): void;
+        duplicate(): Redis;
+        monitor(calback: (error: Error, monitor: NodeJS.EventEmitter) => void): Promise<NodeJS.EventEmitter>;
+
+        send_command(command: string, ...args: any[]): any;
+        auth(password: string, callback?: ResCallbackT<any>): any;
+        ping(callback?: ResCallbackT<number>): any;
+        append(key: string, value: string, callback?: ResCallbackT<number>): any;
+        bitcount(key: string, callback?: ResCallbackT<number>): any;
+        bitcount(key: string, start: number, end: number, callback?: ResCallbackT<number>): any;
+        set(key: string, value: string, callback?: ResCallbackT<string>): any;
+        get(key: string, callback?: ResCallbackT<string>): any;
+        exists(key: string, value: string, callback?: ResCallbackT<number>): any;
+        publish(channel: string, value: any): any;
+        subscribe(channel: string): any;
+        get(args: any[], callback?: ResCallbackT<string>): any;
+        get(...args: any[]): any;
+        set(args: any[], callback?: ResCallbackT<string>): any;
+        set(...args: any[]): any;
+        setnx(args: any[], callback?: ResCallbackT<any>): any;
+        setnx(...args: any[]): any;
+        setex(args: any[], callback?: ResCallbackT<any>): any;
+        setex(...args: any[]): any;
+        append(args: any[], callback?: ResCallbackT<any>): any;
+        append(...args: any[]): any;
+        strlen(args: any[], callback?: ResCallbackT<any>): any;
+        strlen(...args: any[]): any;
+        del(args: any[], callback?: ResCallbackT<any>): any;
+        del(...args: any[]): any;
+        exists(args: any[], callback?: ResCallbackT<any>): any;
+        exists(...args: any[]): any;
+        setbit(args: any[], callback?: ResCallbackT<any>): any;
+        setbit(...args: any[]): any;
+        getbit(args: any[], callback?: ResCallbackT<any>): any;
+        getbit(...args: any[]): any;
+        setrange(args: any[], callback?: ResCallbackT<any>): any;
+        setrange(...args: any[]): any;
+        getrange(args: any[], callback?: ResCallbackT<any>): any;
+        getrange(...args: any[]): any;
+        substr(args: any[], callback?: ResCallbackT<any>): any;
+        substr(...args: any[]): any;
+        incr(args: any[], callback?: ResCallbackT<any>): any;
+        incr(...args: any[]): any;
+        decr(args: any[], callback?: ResCallbackT<any>): any;
+        decr(...args: any[]): any;
+        mget(args: any[], callback?: ResCallbackT<any>): any;
+        mget(...args: any[]): any;
+        rpush(...args: any[]): any;
+        lpush(args: any[], callback?: ResCallbackT<any>): any;
+        lpush(...args: any[]): any;
+        rpushx(args: any[], callback?: ResCallbackT<any>): any;
+        rpushx(...args: any[]): any;
+        lpushx(args: any[], callback?: ResCallbackT<any>): any;
+        lpushx(...args: any[]): any;
+        linsert(args: any[], callback?: ResCallbackT<any>): any;
+        linsert(...args: any[]): any;
+        rpop(args: any[], callback?: ResCallbackT<any>): any;
+        rpop(...args: any[]): any;
+        lpop(args: any[], callback?: ResCallbackT<any>): any;
+        lpop(...args: any[]): any;
+        brpop(args: any[], callback?: ResCallbackT<any>): any;
+        brpop(...args: any[]): any;
+        brpoplpush(args: any[], callback?: ResCallbackT<any>): any;
+        brpoplpush(...args: any[]): any;
+        blpop(args: any[], callback?: ResCallbackT<any>): any;
+        blpop(...args: any[]): any;
+        llen(args: any[], callback?: ResCallbackT<any>): any;
+        llen(...args: any[]): any;
+        lindex(args: any[], callback?: ResCallbackT<any>): any;
+        lindex(...args: any[]): any;
+        lset(args: any[], callback?: ResCallbackT<any>): any;
+        lset(...args: any[]): any;
+        lrange(args: any[], callback?: ResCallbackT<any>): any;
+        lrange(...args: any[]): any;
+        ltrim(args: any[], callback?: ResCallbackT<any>): any;
+        ltrim(...args: any[]): any;
+        lrem(args: any[], callback?: ResCallbackT<any>): any;
+        lrem(...args: any[]): any;
+        rpoplpush(args: any[], callback?: ResCallbackT<any>): any;
+        rpoplpush(...args: any[]): any;
+        sadd(args: any[], callback?: ResCallbackT<any>): any;
+        sadd(...args: any[]): any;
+        srem(args: any[], callback?: ResCallbackT<any>): any;
+        srem(...args: any[]): any;
+        smove(args: any[], callback?: ResCallbackT<any>): any;
+        smove(...args: any[]): any;
+        sismember(args: any[], callback?: ResCallbackT<any>): any;
+        sismember(...args: any[]): any;
+        scard(args: any[], callback?: ResCallbackT<any>): any;
+        scard(...args: any[]): any;
+        spop(args: any[], callback?: ResCallbackT<any>): any;
+        spop(...args: any[]): any;
+        srandmember(args: any[], callback?: ResCallbackT<any>): any;
+        srandmember(...args: any[]): any;
+        sinter(args: any[], callback?: ResCallbackT<any>): any;
+        sinter(...args: any[]): any;
+        sinterstore(args: any[], callback?: ResCallbackT<any>): any;
+        sinterstore(...args: any[]): any;
+        sunion(args: any[], callback?: ResCallbackT<any>): any;
+        sunion(...args: any[]): any;
+        sunionstore(args: any[], callback?: ResCallbackT<any>): any;
+        sunionstore(...args: any[]): any;
+        sdiff(args: any[], callback?: ResCallbackT<any>): any;
+        sdiff(...args: any[]): any;
+        sdiffstore(args: any[], callback?: ResCallbackT<any>): any;
+        sdiffstore(...args: any[]): any;
+        smembers(args: any[], callback?: ResCallbackT<any>): any;
+        smembers(...args: any[]): any;
+        zadd(args: any[], callback?: ResCallbackT<any>): any;
+        zadd(...args: any[]): any;
+        zincrby(args: any[], callback?: ResCallbackT<any>): any;
+        zincrby(...args: any[]): any;
+        zrem(args: any[], callback?: ResCallbackT<any>): any;
+        zrem(...args: any[]): any;
+        zremrangebyscore(args: any[], callback?: ResCallbackT<any>): any;
+        zremrangebyscore(...args: any[]): any;
+        zremrangebyrank(args: any[], callback?: ResCallbackT<any>): any;
+        zremrangebyrank(...args: any[]): any;
+        zunionstore(args: any[], callback?: ResCallbackT<any>): any;
+        zunionstore(...args: any[]): any;
+        zinterstore(args: any[], callback?: ResCallbackT<any>): any;
+        zinterstore(...args: any[]): any;
+        zrange(args: any[], callback?: ResCallbackT<any>): any;
+        zrange(...args: any[]): any;
+        zrangebyscore(args: any[], callback?: ResCallbackT<any>): any;
+        zrangebyscore(...args: any[]): any;
+        zrevrangebyscore(args: any[], callback?: ResCallbackT<any>): any;
+        zrevrangebyscore(...args: any[]): any;
+        zcount(args: any[], callback?: ResCallbackT<any>): any;
+        zcount(...args: any[]): any;
+        zrevrange(args: any[], callback?: ResCallbackT<any>): any;
+        zrevrange(...args: any[]): any;
+        zcard(args: any[], callback?: ResCallbackT<any>): any;
+        zcard(...args: any[]): any;
+        zscore(args: any[], callback?: ResCallbackT<any>): any;
+        zscore(...args: any[]): any;
+        zrank(args: any[], callback?: ResCallbackT<any>): any;
+        zrank(...args: any[]): any;
+        zrevrank(args: any[], callback?: ResCallbackT<any>): any;
+        zrevrank(...args: any[]): any;
+        hset(args: any[], callback?: ResCallbackT<any>): any;
+        hset(...args: any[]): any;
+        hsetnx(args: any[], callback?: ResCallbackT<any>): any;
+        hsetnx(...args: any[]): any;
+        hget(args: any[], callback?: ResCallbackT<any>): any;
+        hget(...args: any[]): any;
+        hmset(args: any[], callback?: ResCallbackT<any>): any;
+        hmset(key: string, hash: any, callback?: ResCallbackT<any>): any;
+        hmset(...args: any[]): any;
+        hmget(args: any[], callback?: ResCallbackT<any>): any;
+        hmget(...args: any[]): any;
+        hincrby(args: any[], callback?: ResCallbackT<any>): any;
+        hincrby(...args: any[]): any;
+        hdel(args: any[], callback?: ResCallbackT<any>): any;
+        hdel(...args: any[]): any;
+        hlen(args: any[], callback?: ResCallbackT<any>): any;
+        hlen(...args: any[]): any;
+        hkeys(args: any[], callback?: ResCallbackT<any>): any;
+        hkeys(...args: any[]): any;
+        hvals(args: any[], callback?: ResCallbackT<any>): any;
+        hvals(...args: any[]): any;
+        hgetall(args: any[], callback?: ResCallbackT<any>): any;
+        hgetall(...args: any[]): any;
+        hgetall(key: string, callback?: ResCallbackT<any>): any;
+        hexists(args: any[], callback?: ResCallbackT<any>): any;
+        hexists(...args: any[]): any;
+        incrby(args: any[], callback?: ResCallbackT<any>): any;
+        incrby(...args: any[]): any;
+        decrby(args: any[], callback?: ResCallbackT<any>): any;
+        decrby(...args: any[]): any;
+        getset(args: any[], callback?: ResCallbackT<any>): any;
+        getset(...args: any[]): any;
+        mset(args: any[], callback?: ResCallbackT<any>): any;
+        mset(...args: any[]): any;
+        msetnx(args: any[], callback?: ResCallbackT<any>): any;
+        msetnx(...args: any[]): any;
+        randomkey(args: any[], callback?: ResCallbackT<any>): any;
+        randomkey(...args: any[]): any;
+        select(args: any[], callback?: ResCallbackT<any>): void;
+        select(...args: any[]): void;
+        move(args: any[], callback?: ResCallbackT<any>): any;
+        move(...args: any[]): any;
+        rename(args: any[], callback?: ResCallbackT<any>): any;
+        rename(...args: any[]): any;
+        renamenx(args: any[], callback?: ResCallbackT<any>): any;
+        renamenx(...args: any[]): any;
+        expire(args: any[], callback?: ResCallbackT<any>): any;
+        expire(...args: any[]): any;
+        expireat(args: any[], callback?: ResCallbackT<any>): any;
+        expireat(...args: any[]): any;
+        keys(args: any[], callback?: ResCallbackT<any>): any;
+        keys(...args: any[]): any;
+        dbsize(args: any[], callback?: ResCallbackT<any>): any;
+        dbsize(...args: any[]): any;
+        auth(args: any[], callback?: ResCallbackT<any>): void;
+        auth(...args: any[]): void;
+        ping(args: any[], callback?: ResCallbackT<any>): any;
+        ping(...args: any[]): any;
+        echo(args: any[], callback?: ResCallbackT<any>): any;
+        echo(...args: any[]): any;
+        save(args: any[], callback?: ResCallbackT<any>): any;
+        save(...args: any[]): any;
+        bgsave(args: any[], callback?: ResCallbackT<any>): any;
+        bgsave(...args: any[]): any;
+        bgrewriteaof(args: any[], callback?: ResCallbackT<any>): any;
+        bgrewriteaof(...args: any[]): any;
+        shutdown(args: any[], callback?: ResCallbackT<any>): any;
+        shutdown(...args: any[]): any;
+        lastsave(args: any[], callback?: ResCallbackT<any>): any;
+        lastsave(...args: any[]): any;
+        type(args: any[], callback?: ResCallbackT<any>): any;
+        type(...args: any[]): any;
+        multi(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        multi(...args: any[]): Pipeline;
+        exec(args: any[], callback?: ResCallbackT<any>): any;
+        exec(...args: any[]): any;
+        discard(args: any[], callback?: ResCallbackT<any>): any;
+        discard(...args: any[]): any;
+        sync(args: any[], callback?: ResCallbackT<any>): any;
+        sync(...args: any[]): any;
+        flushdb(args: any[], callback?: ResCallbackT<any>): any;
+        flushdb(...args: any[]): any;
+        flushall(args: any[], callback?: ResCallbackT<any>): any;
+        flushall(...args: any[]): any;
+        sort(args: any[], callback?: ResCallbackT<any>): any;
+        sort(...args: any[]): any;
+        info(args: any[], callback?: ResCallbackT<any>): any;
+        info(...args: any[]): any;
+        monitor(args: any[], callback?: ResCallbackT<any>): any;
+        monitor(...args: any[]): any;
+        ttl(args: any[], callback?: ResCallbackT<any>): any;
+        ttl(...args: any[]): any;
+        persist(args: any[], callback?: ResCallbackT<any>): any;
+        persist(...args: any[]): any;
+        slaveof(args: any[], callback?: ResCallbackT<any>): any;
+        slaveof(...args: any[]): any;
+        debug(args: any[], callback?: ResCallbackT<any>): any;
+        debug(...args: any[]): any;
+        config(args: any[], callback?: ResCallbackT<any>): any;
+        config(...args: any[]): any;
+        subscribe(args: any[], callback?: ResCallbackT<any>): any;
+        subscribe(...args: any[]): any;
+        unsubscribe(args: any[], callback?: ResCallbackT<any>): any;
+        unsubscribe(...args: any[]): any;
+        psubscribe(args: any[], callback?: ResCallbackT<any>): any;
+        psubscribe(...args: any[]): any;
+        punsubscribe(args: any[], callback?: ResCallbackT<any>): any;
+        punsubscribe(...args: any[]): any;
+        publish(args: any[], callback?: ResCallbackT<any>): any;
+        publish(...args: any[]): any;
+        watch(args: any[], callback?: ResCallbackT<any>): any;
+        watch(...args: any[]): any;
+        unwatch(args: any[], callback?: ResCallbackT<any>): any;
+        unwatch(...args: any[]): any;
+        cluster(args: any[], callback?: ResCallbackT<any>): any;
+        cluster(...args: any[]): any;
+        restore(args: any[], callback?: ResCallbackT<any>): any;
+        restore(...args: any[]): any;
+        migrate(args: any[], callback?: ResCallbackT<any>): any;
+        migrate(...args: any[]): any;
+        dump(args: any[], callback?: ResCallbackT<any>): any;
+        dump(...args: any[]): any;
+        object(args: any[], callback?: ResCallbackT<any>): any;
+        object(...args: any[]): any;
+        client(args: any[], callback?: ResCallbackT<any>): any;
+        client(...args: any[]): any;
+        eval(args: any[], callback?: ResCallbackT<any>): any;
+        eval(...args: any[]): any;
+        evalsha(args: any[], callback?: ResCallbackT<any>): any;
+        evalsha(...args: any[]): any;
+        script(args: any[], callback?: ResCallbackT<any>): any;
+        script(...args: any[]): any;
+        script(key: string, callback?: ResCallbackT<any>): any;
+        quit(args: any[], callback?: ResCallbackT<any>): any;
+        quit(...args: any[]): any;
+        scan(...args: any[]): any;
+        scan(args: any[], callback?: ResCallbackT<any>): any;
+        hscan(...args: any[]): any;
+        hscan(args: any[], callback?: ResCallbackT<any>): any;
+        zscan(...args: any[]): any;
+        zscan(args: any[], callback?: ResCallbackT<any>): any;
+
+        pipeline(): Pipeline;
+        pipeline(commands: string[][]): Pipeline;
+
+        scanStream(options?: IORedis.ScanStreamOption): NodeJS.EventEmitter;
+        hscanStream(key: string, options?: IORedis.ScanStreamOption): NodeJS.EventEmitter;
+    }
+
+    interface Pipeline {
+        exec(callback?: ResCallbackT<any[]>): any;
+
+        get(args: any[], callback?: ResCallbackT<string>): Pipeline;
+        get(...args: any[]): Pipeline;
+        set(args: any[], callback?: ResCallbackT<string>): Pipeline;
+        set(...args: any[]): Pipeline;
+        setnx(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        setnx(...args: any[]): Pipeline;
+        setex(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        setex(...args: any[]): Pipeline;
+        append(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        append(...args: any[]): Pipeline;
+        strlen(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        strlen(...args: any[]): Pipeline;
+        del(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        del(...args: any[]): Pipeline;
+        exists(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        exists(...args: any[]): Pipeline;
+        setbit(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        setbit(...args: any[]): Pipeline;
+        getbit(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        getbit(...args: any[]): Pipeline;
+        setrange(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        setrange(...args: any[]): Pipeline;
+        getrange(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        getrange(...args: any[]): Pipeline;
+        substr(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        substr(...args: any[]): Pipeline;
+        incr(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        incr(...args: any[]): Pipeline;
+        decr(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        decr(...args: any[]): Pipeline;
+        mget(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        mget(...args: any[]): Pipeline;
+        rpush(...args: any[]): Pipeline;
+        lpush(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        lpush(...args: any[]): Pipeline;
+        rpushx(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        rpushx(...args: any[]): Pipeline;
+        lpushx(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        lpushx(...args: any[]): Pipeline;
+        linsert(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        linsert(...args: any[]): Pipeline;
+        rpop(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        rpop(...args: any[]): Pipeline;
+        lpop(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        lpop(...args: any[]): Pipeline;
+        brpop(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        brpop(...args: any[]): Pipeline;
+        brpoplpush(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        brpoplpush(...args: any[]): Pipeline;
+        blpop(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        blpop(...args: any[]): Pipeline;
+        llen(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        llen(...args: any[]): Pipeline;
+        lindex(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        lindex(...args: any[]): Pipeline;
+        lset(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        lset(...args: any[]): Pipeline;
+        lrange(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        lrange(...args: any[]): Pipeline;
+        ltrim(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        ltrim(...args: any[]): Pipeline;
+        lrem(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        lrem(...args: any[]): Pipeline;
+        rpoplpush(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        rpoplpush(...args: any[]): Pipeline;
+        sadd(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        sadd(...args: any[]): Pipeline;
+        srem(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        srem(...args: any[]): Pipeline;
+        smove(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        smove(...args: any[]): Pipeline;
+        sismember(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        sismember(...args: any[]): Pipeline;
+        scard(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        scard(...args: any[]): Pipeline;
+        spop(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        spop(...args: any[]): Pipeline;
+        srandmember(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        srandmember(...args: any[]): Pipeline;
+        sinter(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        sinter(...args: any[]): Pipeline;
+        sinterstore(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        sinterstore(...args: any[]): Pipeline;
+        sunion(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        sunion(...args: any[]): Pipeline;
+        sunionstore(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        sunionstore(...args: any[]): Pipeline;
+        sdiff(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        sdiff(...args: any[]): Pipeline;
+        sdiffstore(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        sdiffstore(...args: any[]): Pipeline;
+        smembers(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        smembers(...args: any[]): Pipeline;
+        zadd(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        zadd(...args: any[]): Pipeline;
+        zincrby(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        zincrby(...args: any[]): Pipeline;
+        zrem(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        zrem(...args: any[]): Pipeline;
+        zremrangebyscore(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        zremrangebyscore(...args: any[]): Pipeline;
+        zremrangebyrank(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        zremrangebyrank(...args: any[]): Pipeline;
+        zunionstore(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        zunionstore(...args: any[]): Pipeline;
+        zinterstore(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        zinterstore(...args: any[]): Pipeline;
+        zrange(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        zrange(...args: any[]): Pipeline;
+        zrangebyscore(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        zrangebyscore(...args: any[]): Pipeline;
+        zrevrangebyscore(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        zrevrangebyscore(...args: any[]): Pipeline;
+        zcount(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        zcount(...args: any[]): Pipeline;
+        zrevrange(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        zrevrange(...args: any[]): Pipeline;
+        zcard(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        zcard(...args: any[]): Pipeline;
+        zscore(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        zscore(...args: any[]): Pipeline;
+        zrank(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        zrank(...args: any[]): Pipeline;
+        zrevrank(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        zrevrank(...args: any[]): Pipeline;
+        hset(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        hset(...args: any[]): Pipeline;
+        hsetnx(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        hsetnx(...args: any[]): Pipeline;
+        hget(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        hget(...args: any[]): Pipeline;
+        hmset(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        hmset(key: string, hash: any, callback?: ResCallbackT<any>): Pipeline;
+        hmset(...args: any[]): Pipeline;
+        hmget(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        hmget(...args: any[]): Pipeline;
+        hincrby(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        hincrby(...args: any[]): Pipeline;
+        hdel(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        hdel(...args: any[]): Pipeline;
+        hlen(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        hlen(...args: any[]): Pipeline;
+        hkeys(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        hkeys(...args: any[]): Pipeline;
+        hvals(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        hvals(...args: any[]): Pipeline;
+        hgetall(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        hgetall(...args: any[]): Pipeline;
+        hgetall(key: string, callback?: ResCallbackT<any>): Pipeline;
+        hexists(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        hexists(...args: any[]): Pipeline;
+        incrby(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        incrby(...args: any[]): Pipeline;
+        decrby(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        decrby(...args: any[]): Pipeline;
+        getset(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        getset(...args: any[]): Pipeline;
+        mset(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        mset(...args: any[]): Pipeline;
+        msetnx(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        msetnx(...args: any[]): Pipeline;
+        randomkey(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        randomkey(...args: any[]): Pipeline;
+        select(args: any[], callback?: ResCallbackT<any>): void;
+        select(...args: any[]): Pipeline;
+        move(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        move(...args: any[]): Pipeline;
+        rename(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        rename(...args: any[]): Pipeline;
+        renamenx(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        renamenx(...args: any[]): Pipeline;
+        expire(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        expire(...args: any[]): Pipeline;
+        expireat(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        expireat(...args: any[]): Pipeline;
+        keys(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        keys(...args: any[]): Pipeline;
+        dbsize(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        dbsize(...args: any[]): Pipeline;
+        auth(args: any[], callback?: ResCallbackT<any>): void;
+        auth(...args: any[]): void;
+        ping(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        ping(...args: any[]): Pipeline;
+        echo(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        echo(...args: any[]): Pipeline;
+        save(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        save(...args: any[]): Pipeline;
+        bgsave(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        bgsave(...args: any[]): Pipeline;
+        bgrewriteaof(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        bgrewriteaof(...args: any[]): Pipeline;
+        shutdown(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        shutdown(...args: any[]): Pipeline;
+        lastsave(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        lastsave(...args: any[]): Pipeline;
+        type(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        type(...args: any[]): Pipeline;
+        multi(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        multi(...args: any[]): Pipeline;
+        exec(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        exec(...args: any[]): Pipeline;
+        discard(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        discard(...args: any[]): Pipeline;
+        sync(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        sync(...args: any[]): Pipeline;
+        flushdb(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        flushdb(...args: any[]): Pipeline;
+        flushall(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        flushall(...args: any[]): Pipeline;
+        sort(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        sort(...args: any[]): Pipeline;
+        info(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        info(...args: any[]): Pipeline;
+        monitor(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        monitor(...args: any[]): Pipeline;
+        ttl(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        ttl(...args: any[]): Pipeline;
+        persist(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        persist(...args: any[]): Pipeline;
+        slaveof(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        slaveof(...args: any[]): Pipeline;
+        debug(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        debug(...args: any[]): Pipeline;
+        config(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        config(...args: any[]): Pipeline;
+        subscribe(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        subscribe(...args: any[]): Pipeline;
+        unsubscribe(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        unsubscribe(...args: any[]): Pipeline;
+        psubscribe(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        psubscribe(...args: any[]): Pipeline;
+        punsubscribe(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        punsubscribe(...args: any[]): Pipeline;
+        publish(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        publish(...args: any[]): Pipeline;
+        watch(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        watch(...args: any[]): Pipeline;
+        unwatch(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        unwatch(...args: any[]): Pipeline;
+        cluster(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        cluster(...args: any[]): Pipeline;
+        restore(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        restore(...args: any[]): Pipeline;
+        migrate(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        migrate(...args: any[]): Pipeline;
+        dump(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        dump(...args: any[]): Pipeline;
+        object(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        object(...args: any[]): Pipeline;
+        client(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        client(...args: any[]): Pipeline;
+        eval(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        eval(...args: any[]): Pipeline;
+        evalsha(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        evalsha(...args: any[]): Pipeline;
+        quit(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        quit(...args: any[]): Pipeline;
+        scan(...args: any[]): Pipeline;
+        scan(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        hscan(...args: any[]): Pipeline;
+        hscan(args: any[], callback?: ResCallbackT<any>): Pipeline;
+        zscan(...args: any[]): Pipeline;
+        zscan(args: any[], callback?: ResCallbackT<any>): Pipeline;
+    }
+
+    interface Cluster extends NodeJS.EventEmitter, Commander {
+        new (nodes: { host: string; port: number; }[], options?: IORedis.ClusterOptions): Redis;
+        connect(callback: Function): Promise<any>;
+        disconnect(): void;
+        nodes(role: string): Redis[];
+    }
+
+    interface ResCallbackT<R> {
+        (err: Error, res: R): void;
+    }
+
+    interface RedisOptions {
+        port?: number;
+        host?: string;
+        /**
+         * 4 (IPv4) or 6 (IPv6), Defaults to 4.
+         */
+        family?: number;
+        /**
+         * Local domain socket path. If set the port, host and family will be ignored.
+         */
+        path?: string;
+        /**
+         * TCP KeepAlive on the socket with a X ms delay before start. Set to a non-number value to disable keepAlive.
+         */
+        keepAlive?: number;
+        connectionName?: string;
+        /**
+         * If set, client will send AUTH command with the value of this option when connected.
+         */
+        password?: string;
+        /**
+         * Database index to use.
+         */
+        db?: number;
+        /**
+         * When a connection is established to the Redis server, the server might still be loading
+         * the database from disk. While loading, the server not respond to any commands.
+         * To work around this, when this option is true, ioredis will check the status of the Redis server,
+         * and when the Redis server is able to process commands, a ready event will be emitted.
+         */
+        enableReadyCheck?: boolean;
+        keyPrefix?: string;
+        retryStrategy?: (times: number) => number;
+        reconnectOnError?: (error: Error) => boolean;
+        /**
+         * By default, if there is no active connection to the Redis server, commands are added to a queue
+         * and are executed once the connection is "ready" (when enableReadyCheck is true, "ready" means
+         * the Redis server has loaded the database from disk, otherwise means the connection to the Redis
+         * server has been established). If this option is false, when execute the command when the connection
+         * isn't ready, an error will be returned.
+         */
+        enableOfflineQueue?: boolean;
+        /**
+         * The milliseconds before a timeout occurs during the initial connection to the Redis server.
+         * default: 10000.
+         */
+        connectTimeout?: number;
+        /**
+         * After reconnected, if the previous connection was in the subscriber mode, client will auto re-subscribe these channels.
+         * default: true.
+         */
+        autoResubscribe?: boolean;
+        /**
+         * If true, client will resend unfulfilled commands(e.g. block commands) in the previous connection when reconnected.
+         * default: true.
+         */
+        autoResendUnfulfilledCommands?: boolean;
+        lazyConnect?: boolean;
+        tls?: {
+            ca: Buffer;
+        };
+        sentinels?: { host: string; port: number; }[];
+        name?: string;
+        /**
+         * Enable READONLY mode for the connection. Only available for cluster mode.
+         * default: false.
+         */
+        readOnly?: boolean;
+    }
+
+    interface ScanStreamOption {
+        match?: string;
+        count?: number;
+    }
+
+    interface ClusterOptions {
+        clusterRetryStrategy?: (times: number) => number;
+        enableOfflineQueue?: boolean;
+        enableReadyCheck?: boolean;
+        scaleReads?: string;
+        maxRedirections?: number;
+        retryDelayOnFailover?: number;
+        retryDelayOnClusterDown?: number;
+        retryDelayOnTryAgain?: number;
+        redisOptions?: RedisOptions;
+    }
+}
diff --git a/ioredis/ioredis-tests.ts b/ioredis/ioredis-tests.ts
new file mode 100644
index 0000000000..f84f69b0fb
--- /dev/null
+++ b/ioredis/ioredis-tests.ts
@@ -0,0 +1,54 @@
+
+
+import * as Redis from "ioredis";
+var redis = new Redis();
+
+redis.set('foo', 'bar');
+redis.get('foo', function(err, result) {
+    console.log(result);
+});
+
+// Or using a promise if the last argument isn't a function
+redis.get('foo').then(function(result: any) {
+    console.log(result);
+});
+
+// Arguments to commands are flattened, so the following are the same:
+redis.sadd('set', 1, 3, 5, 7);
+redis.sadd('set', [1, 3, 5, 7]);
+
+// All arguments are passed directly to the redis server:
+redis.set('key', 100, 'EX', 10);
+
+new Redis()       // Connect to 127.0.0.1:6379
+new Redis(6380)   // 127.0.0.1:6380
+new Redis(6379, '192.168.1.1')        // 192.168.1.1:6379
+new Redis('/tmp/redis.sock')
+new Redis({
+    port: 6379,          // Redis port
+    host: '127.0.0.1',   // Redis host
+    family: 4,           // 4 (IPv4) or 6 (IPv6)
+    password: 'auth',
+    db: 0
+})
+
+var pub = new Redis();
+redis.subscribe('news', 'music', function(err: any, count: any) {
+    // Now we are subscribed to both the 'news' and 'music' channels.
+    // `count` represents the number of channels we are currently subscribed to.
+
+    pub.publish('news', 'Hello world!');
+    pub.publish('music', 'Hello again!');
+});
+
+redis.on('message', function(channel: any, message: any) {
+    // Receive message Hello world! from channel news
+    // Receive message Hello again! from channel music
+    console.log('Receive message %s from channel %s', message, channel);
+});
+
+// There's also an event called 'messageBuffer', which is the same as 'message' except
+// it returns buffers instead of strings.
+redis.on('messageBuffer', function(channel: any, message: any) {
+    // Both `channel` and `message` are buffers.
+});
diff --git a/ioredis/tsconfig.json b/ioredis/tsconfig.json
new file mode 100644
index 0000000000..479c8edc47
--- /dev/null
+++ b/ioredis/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ioredis-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ip/ip.d.ts b/ip/index.d.ts
similarity index 100%
rename from ip/ip.d.ts
rename to ip/index.d.ts
diff --git a/ip/ip-tests.ts b/ip/ip-tests.ts
index 338c2bc040..2605d90581 100644
--- a/ip/ip-tests.ts
+++ b/ip/ip-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="ip.d.ts" />
+
 
 import ip = require('ip');
 
diff --git a/ip/tsconfig.json b/ip/tsconfig.json
new file mode 100644
index 0000000000..53b93370ad
--- /dev/null
+++ b/ip/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ip-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/irc/index.d.ts b/irc/index.d.ts
new file mode 100644
index 0000000000..daa2c9e2ea
--- /dev/null
+++ b/irc/index.d.ts
@@ -0,0 +1,878 @@
+// Type definitions for irc v0.3.12
+// Project: https://github.com/martynsmith/node-irc
+// Definitions by: phillips1012 <https://github.com/phillips1012>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+/** This library provides IRC client functionality. */
+
+import events = require('events');
+import crypto = require('crypto');
+import net = require('net');
+
+/** This library provides IRC client functionality. */
+declare namespace NodeIRC {
+    /** A nick connect to an IRC server. */
+    export class Client extends events.EventEmitter {
+        /**
+         * Socket to the server. Rarely, if ever needed. Use Client#send
+         * instead.
+         */
+        public conn: net.Socket
+
+        /**
+         * Channels joined. Includes channel modes, user list, and topic
+         * information. Only updated after the server recognizes the join.
+         */
+        public chans: {
+            [index: string]: {
+                key: string;
+                serverName: string;
+                users: {
+                    [index: string]: string;
+                };
+                mode: string;
+                created: string;
+            }
+        }
+
+        /** Features supported by the server */
+        public supported: {
+            channel: {
+                idlength: string[];
+                length: number;
+                limit: string[];
+                modes: {
+                    [index: string]: string;
+                }
+                types: string;
+            };
+
+            kicklength: number;
+            maxlist: number[];
+            maxtargets: string[];
+            modes: number;
+            nicklength: number
+            topiclength: number;
+            usermodes: string;
+        }
+
+        /**
+         * The current nick of the client. Updated if the nick changes
+         */
+        public nick: string;
+
+        /** Channel listing data. */
+        public channellist: IChannel[];
+
+        /** IRC server MOTD */
+        public motd: string;
+
+        /** Maximum line length */
+        public maxLineLength: number;
+
+        /** Bot options */
+        public opt: IClientOpts;
+
+        /** Host mask */
+        public hostMask: string;
+
+        /**
+         * Connect to an IRC server
+         * @param server - server hostname
+         * @param nick - nickname
+         * @param opts
+         */
+        constructor(
+            server: string,
+            nick: string,
+            opts?: IClientOpts
+        );
+
+        /**
+         * Send a raw message to the server; generally speaking, it’s best
+         * not to use this method unless you know what you’re doing.
+         * @param command - irc command
+         * @param args - command arguments (splat)
+         */
+        public send(
+            command: string,
+            ...args: string[]
+        ): void;
+
+        /**
+         * Join the specified channel
+         * @param channel - channel to join
+         * @param callback
+         */
+        public join(
+            channel: string,
+            callback?: handlers.IJoinChannel
+        ): void;
+
+        /**
+         * Part the specified channel
+         * @param channel - channel to part
+         * @param message - optional message to send
+         * @param callback
+         */
+        public part(
+            channel: string,
+            message: string,
+            callback: handlers.IPartChannel
+        ): void;
+
+        /**
+         * Send a message to the specified target
+         * @param target - nick or channel
+         * @param message - message to send
+         */
+        public say(
+            target: string,
+            message: string
+        ): void;
+
+        /**
+         * Send a CTCP message to the specified target
+         * @param target - nick or channel
+         * @param type - "privmsg" for PRIVMSG, anything else for NOTICE
+         * @param text - CTCP message
+         */
+        public ctcp(
+            target: string,
+            type: string,
+            text: string
+        ): void;
+
+        /**
+         * Send an action to the specified target
+         * @param target - target
+         * @param message - message
+         */
+        public action(
+            target: string,
+            message: string
+        ): void;
+
+        /**
+         * Send a notice to the specified target.
+         * @param target - nick or channel
+         * @param message - message to send
+         */
+        public notice(
+            target: string,
+            message: string
+        ): void;
+
+        /**
+         * Request a whois for the specified nick
+         * @param nick - nickname
+         * @param callback
+         */
+        public whois(
+            nick: string,
+            callback: handlers.IWhois
+        ): void;
+
+        /**
+         * Request a channel listing from the server. The arguments for this
+         * are farily server specific, this method passes them as specified.
+         *
+         * Responses from the server are available via `channellist_start`,
+         * `channellist_item`, and `channellist` events.
+         *
+         * @param args - arguments
+         */
+        public list(
+            ...args: string[]
+        ): void;
+
+        /**
+         * Connect to the server. Use when `autoConnect` is false.
+         * @param retryCount - times to retry
+         * @param callback
+         */
+        public connect(
+            retryCount?: number,
+            callback?: handlers.IRaw
+        ): void;
+
+        /**
+         * Disconnect from the IRC server
+         * @param message - message to send
+         * @param callback
+         */
+        public disconnect(
+            message: string,
+            callback: () => void
+        ): void;
+
+        /**
+         * Activate flood protection “after the fact”. You can also use
+         * floodProtection while instantiating the Client to enable flood
+         * protection, and floodProtectionDelay to set the default message
+         * interval.
+         * @param interval - ms to wait between messages
+         */
+        public activateFloodProtection(
+            interval: number
+        ): void;
+    }
+
+    /** Client options object */
+    export interface IClientOpts {
+        /**
+         * IRC username
+         * @default 'nodebot'
+         */
+        userName?: string;
+
+        /**
+         * IRC "real name"
+         * @default 'nodeJS IRC client'
+         */
+        realName?: string;
+
+        /**
+         * IRC connection port. See
+         * https://nodejs.org/api/net.html#net_socket_remoteport
+         * @default 6667
+         */
+        port?: number;
+
+        /**
+         * Local interface to bind to for network connections. See
+         * https://nodejs.org/api/net.html#net_socket_localaddress
+         */
+        localAddress?: string;
+
+        /**
+         * Should we output debug messages to STDOUT?
+         * @default false
+         */
+        debug?: boolean;
+
+        /**
+         * Should we output IRC errors?
+         * @default false
+         */
+        showErrors?: boolean;
+
+        /**
+         * Should we auto-rejoin channels?
+         * @default false
+         */
+        autoRejoin?: boolean;
+
+        /**
+         * Should we auto-reconnect to networks?
+         * @default true
+         */
+        autoConnect?: boolean;
+
+        /**
+         * Channels to join
+         * @default []
+         */
+        channels?: string[];
+
+        /**
+         * Should SSL be used? Can either be true or crypto credentials.
+         * @default false
+         */
+        secure?: boolean | crypto.Credentials;
+
+        /**
+         * Should we accept self-signed certificates?
+         * @default false
+         */
+        selfSigned?: boolean;
+
+
+        /**
+         * Should we accept expired certificates?
+         * @default false
+         */
+        certExpired?: boolean;
+
+        /**
+         * Should we queue our messages to ensure we don't get kicked?
+         * @default false
+         */
+        floodProtection?: boolean;
+
+        /**
+         * Delay between messages when flood protection is active
+         * @default 1000
+         */
+        floodProtectionDelay?: number;
+
+        /**
+         * Should we use SASL authentication?
+         * @default false
+         */
+        sasl?: boolean;
+
+        /**
+         * Should we strip mIRC colors from the output messages?
+         * @default false
+         */
+        stripColors?: boolean;
+
+        /**
+         * Channel prefix
+         * @default '&#'
+         */
+        channelPrefixes?: string;
+
+        /**
+         * Characters to split a message at.
+         * @default 512
+         */
+        messageSplit?: number;
+
+        /**
+         * Encoding to use. See
+         * https://nodejs.org/api/stream.html#stream_readable_setencoding_encoding
+         * @default 'utf-8'
+         */
+        encoding?: string;
+    }
+
+    /** Command types */
+    export enum CommandType {
+        normal, reply, error
+    }
+
+    /** Parsed IRC message. */
+    export interface IMessage {
+        /** Prefix */
+        prefix?: string;
+
+        /** Mapped IRC command */
+        command: string;
+
+        /** Raw IRC command */
+        rawCommand: string;
+
+        /** Command type */
+        commandType: CommandType;
+
+        /** Command arguments */
+        args: string[];
+    }
+
+    /** Whois data */
+    export interface IWhoisData {
+        /** Nickname */
+        nick: string;
+
+        /** Username */
+        user: string;
+
+        /** Hostnamej */
+        host: string;
+
+        /** Real name" */
+        realname: string;
+
+        /** Channels */
+        channels: string[];
+
+        /** Server */
+        server: string;
+
+        /** Server description string */
+        serverinfo: string;
+
+        /** Is this user an operator? */
+        operator: string;
+    }
+
+    /** A channel returned by a channel listing. */
+    export interface IChannel {
+        /** Channel name */
+        name: string;
+
+        /** User count */
+        users: string;
+
+        /** Topic string */
+        topic: string;
+    }
+
+    /**
+     * Handler functions for Client.
+     */
+    namespace handlers {
+        /**
+         * 'registered': Emitted when the server sends the initial 001 line,
+         * indicating you’ve connected to the server. See the raw event for
+         * details on the message object.
+         */
+        export interface IRegistered {
+            /**
+             * @param message - raw message
+             */
+            (message: IMessage): void;
+        }
+
+        /**
+         * 'motd': Emitted when the server sends the message of the day to
+         * clients.
+         */
+        export interface IMotd {
+            /**
+             * @param motd - motd string
+             */
+            (motd: string): void;
+        }
+
+        /**
+         * 'names': Emitted when the server sends a list of nicks for a channel
+         * (which happens immediately after joining and on request. The nicks
+         * object passed to the callback is keyed by nick names, and has
+         * values ‘’, ‘+’, or ‘@’ depending on the level of that nick in the
+         * channel.
+         */
+        export interface INames {
+            /**
+             * @param channel - channel name
+             * @param nicks - nicks list
+             */
+            (channel: string, nicks: string[]): void;
+        }
+
+        /**
+         * 'names#*' As per ‘names’ event but only emits for the subscribed
+         * channel.
+         */
+        export interface INamesChannel {
+            /**
+             * @param channel - channel name
+             * @param nicks - nicks list
+             */
+            (nicks: string[]): void;
+        }
+
+        /**
+         * 'topic': Emitted when the server sends the channel topic on joining
+         * a channel, or when a user changes the topic on a channel. See the
+         * raw event for details on the message object.
+         */
+        export interface ITopic {
+            /**
+             * @param channel - channel name
+             * @param topic - topic
+             * @param nick - nick
+             * @param message - raw message
+             */
+            (
+                channel: string,
+                topic: string,
+                nick: string,
+                message: IMessage
+            ): void;
+        }
+
+        /**
+         * 'join': Emitted when a user joins a channel (including when the
+         * client itself joins a channel). See the raw event for details on the
+         * message object.
+         */
+        export interface IJoin {
+            /**
+             * @param channel - channel name
+             * @param nick - who joined
+             * @param message - raw message
+             */
+            (channel: string, nick: string, message: IMessage): void;
+        }
+
+        /**
+         * 'join#*': As per ‘join’ event but only emits for the subscribed
+         * channel. See the raw event for details on the message object.
+         */
+        export interface IJoinChannel {
+            /**
+             * @param nick - who joined
+             * @param message - raw message
+             */
+            (nick: string, message: IMessage): void;
+        }
+
+        /**
+         * 'part': Emitted when a user parts a channel (including when the
+         * client itself parts a channel). See the raw event for details on the
+         * message object.
+         */
+        export interface IPart {
+            /**
+             * @param channel - channel name
+             * @param nick - who parted
+             * @param reason - part reason
+             * @param message - raw message
+             */
+            (
+                channel: string,
+                nick: string,
+                reason: string,
+                message: IMessage
+            ): void
+        }
+
+        /**
+         * 'part': As per ‘part’ event but only emits for the subscribed
+         * channel. See the raw event for details on the message object.
+         */
+        export interface IPartChannel {
+            /**
+             * @param nick - who parted
+             * @param reason - part reason
+             * @param message - raw message
+             */
+            (
+                nick: string,
+                reason: string,
+                message: IMessage
+            ): void
+        }
+
+        /**
+         * 'kick': Emitted when a user is kicked from a channel. See the raw
+         * event for details on the message object.
+         */
+        export interface IKick {
+            /**
+             * @param channel - channel name
+             * @param nick - who was kicked
+             * @param by - kicker
+             * @param reason - kick reason
+             * @param message - raw message
+             */
+            (
+                channel: string,
+                nick: string,
+                by: string,
+                reason: string,
+                message: IMessage
+            ): void;
+        }
+
+        /**
+         * 'kick#*': Emitted when a user is kicked from a channel. See the raw
+         * event for details on the message object.
+         */
+        export interface IKickChannel {
+            /**
+             * @param nick - who was kicked
+             * @param by - kicker
+             * @param reason - kick reason
+             * @param message - raw message
+             */
+            (
+                nick: string,
+                by: string,
+                reason: string,
+                message: IMessage
+            ): void;
+        }
+
+        /**
+         * 'message': Emitted when a message is sent. to can be either a nick
+         * (which is most likely this clients nick and means a private message),
+         * or a channel (which means a message to that channel). See the raw
+         * event for details on the message object.
+         */
+        export interface IRecievedMessage {
+            /**
+             * @param nick - who sent the message
+             * @param to - to whom was the message sent
+             * @param text - message text
+             * @param message - raw message
+             */
+            (
+                nick: string, to: string, text: string, message: IMessage
+            ): void;
+        }
+
+        /**
+         * 'message#': Emitted when a message is sent to any channel (i.e.
+         * exactly the same as the message event but excluding private
+         * messages. See the raw event for details on the message object.
+         */
+        export interface IMessageAllChannels {
+            /**
+             * @param nick - who sent the message
+             * @param to - to whom was the message sent
+             * @param text - message text
+             * @param message - raw message
+             */
+            (
+                nick: string, to: string, text: string, message: IMessage
+            ): void;
+        }
+
+        /**
+         * 'message#*': As per ‘message’ event but only emits for the
+         * subscribed channel. See the raw event for details on the message
+         * object.
+         */
+        export interface IMessageChannel {
+            /**
+             * @param nick - who sent the message
+             * @param text - message text
+             * @param message - raw message
+             */
+            (nick: string, text: string, message: IMessage): void;
+        }
+
+        /**
+         * 'selfMessage': Emitted when a message is sent from the client.
+         * `to` is who the message was sent to. It can be either a nick
+         * (which most likely means a private message), or a channel (which
+         * means a message to that channel).
+         */
+        export interface ISelfMessage {
+            (to: string, text: string): void;
+        }
+
+        /**
+         * 'notice': Emitted when a notice is sent. to can be either a nick
+         * (which is most likely this clients nick and means a private
+         * message), or a channel (which means a message to that channel). nick
+         * is either the senders nick or null which means that the notice comes
+         * from the server. See the raw event for details on the message object.
+         */
+        export interface INotice {
+            /**
+             * @param nick - from
+             * @param to - to
+             * @param text - text
+             * @param message - raw message
+             */
+            (nick: string, to: string, text: string, message: IMessage): void;
+        }
+
+        /**
+         * 'ping': Emitted when a server PINGs the client. The client will
+         * automatically send a PONG request just before this is emitted.
+         */
+        export interface IPing {
+            /**
+             * @param server - server that adiministered the ping
+             */
+            (server: string): void;
+        }
+
+        /**
+         * 'pm': As per ‘message’ event but only emits when the message is
+         * direct to the client. See the raw event for details on the message
+         * object.
+         */
+        export interface IPm {
+            /**
+             * @param nick - sender
+             * @param text - message text
+             * @param message - raw message
+             */
+            (nick: string, text: string, message: IMessage): void;
+        }
+
+        /**
+         * 'ctcp': Emitted when a CTCP notice or privmsg was received (type
+         * is either ‘notice’ or ‘privmsg’). See the raw event for details
+         * on the message object.
+         */
+        export interface ICtcp {
+            /**
+             * @param from - sender
+             * @param to - recievier
+             * @param text - ctcp text
+             * @param type - ctcp type
+             * @param message - raw message
+             */
+            (
+                from: string,
+                to: string,
+                text: string,
+                type: string,
+                message: IMessage
+            ): void;
+        }
+
+
+        /**
+         * 'ctcp-*': Emitted when a specific type of CTCP request was
+         * recieved.
+         */
+        export interface ICtcpSpecific {
+            /**
+             * @param from - sender
+             * @param to - recievier
+             * @param message - raw message
+             */
+            (
+                from: string,
+                to: string,
+                text: string,
+                message: IMessage
+            ): void;
+
+            (
+                from: string,
+                to: string,
+                text: string,
+                type: string,
+                message: IMessage
+            ): void;
+        }
+
+        /**
+         * 'nick': Emitted when a user changes nick along with the channels
+         * the user is in. See the raw event for details on the message
+         * object.
+         */
+        export interface INick {
+            /**
+             * @param oldnick - old nickname
+             * @param newnick - new nickname
+             * @param channels - channels the nick changed in
+             * @param message - raw message
+             */
+            (
+                oldnick: string,
+                newnick: string,
+                channels: string[],
+                message: IMessage
+            ): void;
+        }
+
+        /**
+         * 'invite': Emitted when the client receives an /invite. See the
+         * raw event for details on the message object.
+         */
+        export interface IInvite {
+            /**
+             * @param channel - channel user was invited to
+             * @param from - user who invited
+             * @param message - raw message
+             */
+            (channel: string, from: string, message: IMessage): void;
+        }
+
+        /**
+         * '+mode'/'-mode': Emitted when a mode is added or removed from a user or
+         * channel. channel is the channel which the mode is being set on/in
+         * . by is the user setting the mode. mode is the single character
+         * mode identifier. If the mode is being set on a user, argument is
+         * the nick of the user. If the mode is being set on a channel,
+         * argument is the argument to the mode. If a channel mode doesn’t
+         * have any arguments, argument will be ‘undefined’. See the raw
+         * event for details on the message object.
+         */
+        export interface IModeChange {
+            /**
+             * @param channel - channel
+             * @param by - nick that changed mode
+             * @param mode - single character mode identifier
+             * @param argument - mode argument
+             * @param message - raw message
+             */
+            (
+                channel: string,
+                by: string,
+                mode: string,
+                argument: string,
+                message: IMessage
+            ): void;
+        }
+
+        /**
+         * 'whois': Emitted whenever the server finishes outputting a WHOIS
+         * response.
+         */
+        export interface IWhois {
+            (info: IWhoisData): void;
+        }
+
+        /**
+         * 'channellist': Emitted when the server has finished returning a
+         * channel list. The channel_list array is simply a list of the
+         * objects that were returned in the intervening channellist_item
+         * events.
+         *
+         * This data is also available via the Client.channellist property
+         * after this event has fired.
+         */
+        export interface IChannelList {
+            /**
+             * @param list - channels
+             */
+            (
+                list: IChannel[]
+            ): void;
+        }
+
+        /**
+         * 'raw': Emitted when ever the client receives a “message” from
+         * the server. A message is a parsed line from the server.
+         */
+        export interface IRaw {
+            /**
+             * @param message - raw message
+             */
+            (message: IMessage): void;
+        }
+
+        /**
+         * 'error': Emitted when ever the server responds with an error-type message. The message parameter is exactly as in the ‘raw’ event.
+         */
+        export interface IError {
+            /**
+             * @param message - raw message
+             */
+            (message: IMessage): void;
+        }
+
+        /**
+         * 'action': Emitted whenever a user performs an action
+         * (e.g. /me waves).
+         */
+        export interface IAction {
+            /**
+             * @param from - sender
+             * @param to - reciever
+             * @param text - text
+             * @param message - raw message
+             */
+            (
+                from: string, to: string, text: string, message: IMessage
+            ): void;
+        }
+    }
+}
+
+/** Colors */
+declare namespace NodeIRC.colors {
+    /**
+     * Takes a color by name, text, and optionally what color to return.
+     * @param color - name of color
+     * @param text - text to color
+     * @param reset_color - color to set after text
+     */
+    export function wrap(
+        color: string, text: string, reset_color?: string
+    ): string;
+
+    /**
+     * This contains the set of colors available and a function to wrap
+     * text in a color.
+     */
+    export var codes: {
+        [index: string]: string;
+    };
+}
+
+export = NodeIRC;
diff --git a/irc/irc-tests.ts b/irc/irc-tests.ts
index edda5e14fd..d2ef791106 100644
--- a/irc/irc-tests.ts
+++ b/irc/irc-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="irc.d.ts" />
+
 // https://github.com/martynsmith/node-irc/blob/master/example/bot.js
 
 import irc = require('irc');
diff --git a/irc/irc.d.ts b/irc/irc.d.ts
deleted file mode 100644
index 00dd3220e1..0000000000
--- a/irc/irc.d.ts
+++ /dev/null
@@ -1,879 +0,0 @@
-// Type definitions for irc v0.3.12
-// Project: https://github.com/martynsmith/node-irc
-// Definitions by: phillips1012 <https://github.com/phillips1012>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node-0.10.d.ts" />
-
-/** This library provides IRC client functionality. */
-declare module 'irc' {
-    import events = require('events');
-    import crypto = require('crypto');
-    import net = require('net');
-
-    /** This library provides IRC client functionality. */
-    namespace NodeIRC {
-        /** A nick connect to an IRC server. */
-        export class Client extends events.EventEmitter {
-            /**
-             * Socket to the server. Rarely, if ever needed. Use Client#send
-             * instead.
-             */
-            public conn: net.Socket
-
-            /**
-             * Channels joined. Includes channel modes, user list, and topic
-             * information. Only updated after the server recognizes the join.
-             */
-            public chans: {
-                [index: string]: {
-                    key: string;
-                    serverName: string;
-                    users: {
-                        [index: string]: string;
-                    };
-                    mode: string;
-                    created: string;
-                }
-            }
-
-            /** Features supported by the server */
-            public supported: {
-                channel: {
-                    idlength: string[];
-                    length: number;
-                    limit: string[];
-                    modes: {
-                        [index: string]: string;
-                    }
-                    types: string;
-                };
-
-                kicklength: number;
-                maxlist: number[];
-                maxtargets: string[];
-                modes: number;
-                nicklength: number
-                topiclength: number;
-                usermodes: string;
-            }
-
-            /**
-             * The current nick of the client. Updated if the nick changes
-             */
-            public nick: string;
-
-            /** Channel listing data. */
-            public channellist: IChannel[];
-
-            /** IRC server MOTD */
-            public motd: string;
-
-            /** Maximum line length */
-            public maxLineLength: number;
-
-            /** Bot options */
-            public opt: IClientOpts;
-
-            /** Host mask */
-            public hostMask: string;
-
-            /**
-             * Connect to an IRC server
-             * @param server - server hostname
-             * @param nick - nickname
-             * @param opts
-             */
-            constructor(
-                server: string,
-                nick: string,
-                opts?: IClientOpts
-            );
-
-            /**
-             * Send a raw message to the server; generally speaking, it’s best
-             * not to use this method unless you know what you’re doing.
-             * @param command - irc command
-             * @param args - command arguments (splat)
-             */
-            public send(
-                command: string,
-                ...args: string[]
-            ): void;
-
-            /**
-             * Join the specified channel
-             * @param channel - channel to join
-             * @param callback
-             */
-            public join(
-                channel: string,
-                callback?: handlers.IJoinChannel
-            ): void;
-
-            /**
-             * Part the specified channel
-             * @param channel - channel to part
-             * @param message - optional message to send
-             * @param callback
-             */
-            public part(
-                channel: string,
-                message: string,
-                callback: handlers.IPartChannel
-            ): void;
-
-            /**
-             * Send a message to the specified target
-             * @param target - nick or channel
-             * @param message - message to send
-             */
-            public say(
-                target: string,
-                message: string
-            ): void;
-
-            /**
-             * Send a CTCP message to the specified target
-             * @param target - nick or channel
-             * @param type - "privmsg" for PRIVMSG, anything else for NOTICE
-             * @param text - CTCP message
-             */
-            public ctcp(
-                target: string,
-                type: string,
-                text: string
-            ): void;
-
-            /**
-             * Send an action to the specified target
-             * @param target - target
-             * @param message - message
-             */
-            public action(
-                target: string,
-                message: string
-            ): void;
-
-            /**
-             * Send a notice to the specified target.
-             * @param target - nick or channel
-             * @param message - message to send
-             */
-            public notice(
-                target: string,
-                message: string
-            ): void;
-
-            /**
-             * Request a whois for the specified nick
-             * @param nick - nickname
-             * @param callback
-             */
-            public whois(
-                nick: string,
-                callback: handlers.IWhois
-            ): void;
-
-            /**
-             * Request a channel listing from the server. The arguments for this
-             * are farily server specific, this method passes them as specified.
-             *
-             * Responses from the server are available via `channellist_start`,
-             * `channellist_item`, and `channellist` events.
-             *
-             * @param args - arguments
-             */
-            public list(
-                ...args:  string[]
-            ): void;
-
-            /**
-             * Connect to the server. Use when `autoConnect` is false.
-             * @param retryCount - times to retry
-             * @param callback
-             */
-            public connect(
-                retryCount?: number,
-                callback?: handlers.IRaw
-            ): void;
-
-            /**
-             * Disconnect from the IRC server
-             * @param message - message to send
-             * @param callback
-             */
-            public disconnect(
-                message: string,
-                callback: () => void
-            ): void;
-
-            /**
-             * Activate flood protection “after the fact”. You can also use
-             * floodProtection while instantiating the Client to enable flood
-             * protection, and floodProtectionDelay to set the default message
-             * interval.
-             * @param interval - ms to wait between messages
-             */
-            public activateFloodProtection(
-                interval: number
-            ): void;
-        }
-
-        /** Client options object */
-        export interface IClientOpts {
-            /**
-             * IRC username
-             * @default 'nodebot'
-             */
-            userName?: string;
-
-            /**
-             * IRC "real name"
-             * @default 'nodeJS IRC client'
-             */
-            realName?: string;
-
-            /**
-             * IRC connection port. See
-             * https://nodejs.org/api/net.html#net_socket_remoteport
-             * @default 6667
-             */
-            port?: number;
-
-            /**
-             * Local interface to bind to for network connections. See
-             * https://nodejs.org/api/net.html#net_socket_localaddress
-             */
-            localAddress?: string;
-
-            /**
-             * Should we output debug messages to STDOUT?
-             * @default false
-             */
-            debug?: boolean;
-
-            /**
-             * Should we output IRC errors?
-             * @default false
-             */
-            showErrors?: boolean;
-
-            /**
-             * Should we auto-rejoin channels?
-             * @default false
-             */
-            autoRejoin?: boolean;
-
-            /**
-             * Should we auto-reconnect to networks?
-             * @default true
-             */
-            autoConnect?: boolean;
-
-            /**
-             * Channels to join
-             * @default []
-             */
-            channels?: string[];
-
-            /**
-             * Should SSL be used? Can either be true or crypto credentials.
-             * @default false
-             */
-            secure?: boolean | crypto.Credentials;
-
-            /**
-             * Should we accept self-signed certificates?
-             * @default false
-             */
-            selfSigned?: boolean;
-
-
-            /**
-             * Should we accept expired certificates?
-             * @default false
-             */
-            certExpired?: boolean;
-
-            /**
-             * Should we queue our messages to ensure we don't get kicked?
-             * @default false
-             */
-            floodProtection?: boolean;
-
-            /**
-             * Delay between messages when flood protection is active
-             * @default 1000
-             */
-            floodProtectionDelay?: number;
-
-            /**
-             * Should we use SASL authentication?
-             * @default false
-             */
-            sasl?: boolean;
-
-            /**
-             * Should we strip mIRC colors from the output messages?
-             * @default false
-             */
-            stripColors?: boolean;
-
-            /**
-             * Channel prefix
-             * @default '&#'
-             */
-            channelPrefixes?: string;
-
-            /**
-             * Characters to split a message at.
-             * @default 512
-             */
-            messageSplit?: number;
-
-            /**
-             * Encoding to use. See
-             * https://nodejs.org/api/stream.html#stream_readable_setencoding_encoding
-             * @default 'utf-8'
-             */
-            encoding?: string;
-        }
-
-        /** Command types */
-        export enum CommandType {
-            normal, reply, error
-        }
-
-        /** Parsed IRC message. */
-        export interface IMessage {
-            /** Prefix */
-            prefix?: string;
-
-            /** Mapped IRC command */
-            command: string;
-
-            /** Raw IRC command */
-            rawCommand: string;
-
-            /** Command type */
-            commandType: CommandType;
-
-            /** Command arguments */
-            args: string[];
-        }
-
-        /** Whois data */
-        export interface IWhoisData {
-            /** Nickname */
-            nick: string;
-
-            /** Username */
-            user: string;
-
-            /** Hostnamej */
-            host: string;
-
-            /** Real name" */
-            realname: string;
-
-            /** Channels */
-            channels: string[];
-
-            /** Server */
-            server: string;
-
-            /** Server description string */
-            serverinfo: string;
-
-            /** Is this user an operator? */
-            operator: string;
-        }
-
-        /** A channel returned by a channel listing. */
-        export interface IChannel {
-            /** Channel name */
-            name: string;
-
-            /** User count */
-            users: string;
-
-            /** Topic string */
-            topic: string;
-        }
-
-        /**
-         * Handler functions for Client.
-         */
-        namespace handlers {
-            /**
-             * 'registered': Emitted when the server sends the initial 001 line,
-             * indicating you’ve connected to the server. See the raw event for
-             * details on the message object.
-             */
-            export interface IRegistered {
-                /**
-                 * @param message - raw message
-                 */
-                (message: IMessage): void;
-            }
-
-            /**
-             * 'motd': Emitted when the server sends the message of the day to
-             * clients.
-             */
-            export interface IMotd {
-                /**
-                 * @param motd - motd string
-                 */
-                (motd: string): void;
-            }
-
-            /**
-             * 'names': Emitted when the server sends a list of nicks for a channel
-             * (which happens immediately after joining and on request. The nicks
-             * object passed to the callback is keyed by nick names, and has
-             * values ‘’, ‘+’, or ‘@’ depending on the level of that nick in the
-             * channel.
-             */
-            export interface INames {
-                /**
-                 * @param channel - channel name
-                 * @param nicks - nicks list
-                 */
-                (channel: string, nicks: string[]): void;
-            }
-
-            /**
-             * 'names#*' As per ‘names’ event but only emits for the subscribed
-             * channel.
-             */
-            export interface INamesChannel {
-                /**
-                 * @param channel - channel name
-                 * @param nicks - nicks list
-                 */
-                (nicks: string[]): void;
-            }
-
-            /**
-             * 'topic': Emitted when the server sends the channel topic on joining
-             * a channel, or when a user changes the topic on a channel. See the
-             * raw event for details on the message object.
-             */
-            export interface ITopic {
-                /**
-                 * @param channel - channel name
-                 * @param topic - topic
-                 * @param nick - nick
-                 * @param message - raw message
-                 */
-                (
-                    channel: string,
-                    topic: string,
-                    nick: string,
-                    message: IMessage
-                ): void;
-            }
-
-            /**
-             * 'join': Emitted when a user joins a channel (including when the
-             * client itself joins a channel). See the raw event for details on the
-             * message object.
-             */
-            export interface IJoin {
-                /**
-                 * @param channel - channel name
-                 * @param nick - who joined
-                 * @param message - raw message
-                 */
-                (channel: string, nick: string, message: IMessage): void;
-            }
-
-            /**
-             * 'join#*': As per ‘join’ event but only emits for the subscribed
-             * channel. See the raw event for details on the message object.
-             */
-            export interface IJoinChannel {
-                /**
-                 * @param nick - who joined
-                 * @param message - raw message
-                 */
-                (nick: string, message: IMessage): void;
-            }
-
-            /**
-             * 'part': Emitted when a user parts a channel (including when the
-             * client itself parts a channel). See the raw event for details on the
-             * message object.
-             */
-            export interface IPart {
-                /**
-                 * @param channel - channel name
-                 * @param nick - who parted
-                 * @param reason - part reason
-                 * @param message - raw message
-                 */
-                (
-                    channel: string,
-                    nick: string,
-                    reason: string,
-                    message: IMessage
-                ): void
-            }
-
-            /**
-             * 'part': As per ‘part’ event but only emits for the subscribed
-             * channel. See the raw event for details on the message object.
-             */
-            export interface IPartChannel {
-                /**
-                 * @param nick - who parted
-                 * @param reason - part reason
-                 * @param message - raw message
-                 */
-                (
-                    nick: string,
-                    reason: string,
-                    message: IMessage
-                ): void
-            }
-
-            /**
-             * 'kick': Emitted when a user is kicked from a channel. See the raw
-             * event for details on the message object.
-             */
-            export interface IKick {
-                /**
-                 * @param channel - channel name
-                 * @param nick - who was kicked
-                 * @param by - kicker
-                 * @param reason - kick reason
-                 * @param message - raw message
-                 */
-                (
-                    channel: string,
-                    nick: string,
-                    by: string,
-                    reason: string,
-                    message: IMessage
-                ): void;
-            }
-
-            /**
-             * 'kick#*': Emitted when a user is kicked from a channel. See the raw
-             * event for details on the message object.
-             */
-            export interface IKickChannel {
-                /**
-                 * @param nick - who was kicked
-                 * @param by - kicker
-                 * @param reason - kick reason
-                 * @param message - raw message
-                 */
-                (
-                    nick: string,
-                    by: string,
-                    reason: string,
-                    message: IMessage
-                ): void;
-            }
-
-            /**
-             * 'message': Emitted when a message is sent. to can be either a nick
-             * (which is most likely this clients nick and means a private message),
-             * or a channel (which means a message to that channel). See the raw
-             * event for details on the message object.
-             */
-            export interface IRecievedMessage {
-                /**
-                 * @param nick - who sent the message
-                 * @param to - to whom was the message sent
-                 * @param text - message text
-                 * @param message - raw message
-                 */
-                (
-                    nick: string, to: string, text: string, message: IMessage
-                ): void;
-            }
-
-            /**
-             * 'message#': Emitted when a message is sent to any channel (i.e.
-             * exactly the same as the message event but excluding private
-             * messages. See the raw event for details on the message object.
-             */
-            export interface IMessageAllChannels {
-                /**
-                 * @param nick - who sent the message
-                 * @param to - to whom was the message sent
-                 * @param text - message text
-                 * @param message - raw message
-                 */
-                (
-                    nick: string, to: string, text: string, message: IMessage
-                ): void;
-            }
-
-            /**
-             * 'message#*': As per ‘message’ event but only emits for the
-             * subscribed channel. See the raw event for details on the message
-             * object.
-             */
-            export interface IMessageChannel {
-                /**
-                 * @param nick - who sent the message
-                 * @param text - message text
-                 * @param message - raw message
-                 */
-                (nick: string, text: string, message: IMessage): void;
-            }
-
-            /**
-             * 'selfMessage': Emitted when a message is sent from the client.
-             * `to` is who the message was sent to. It can be either a nick
-             * (which most likely means a private message), or a channel (which
-             * means a message to that channel).
-             */
-            export interface ISelfMessage {
-                (to: string, text: string): void;
-            }
-
-            /**
-             * 'notice': Emitted when a notice is sent. to can be either a nick
-             * (which is most likely this clients nick and means a private
-             * message), or a channel (which means a message to that channel). nick
-             * is either the senders nick or null which means that the notice comes
-             * from the server. See the raw event for details on the message object.
-             */
-            export interface INotice {
-                /**
-                 * @param nick - from
-                 * @param to - to
-                 * @param text - text
-                 * @param message - raw message
-                 */
-                (nick: string, to: string, text: string, message: IMessage): void;
-            }
-
-            /**
-             * 'ping': Emitted when a server PINGs the client. The client will
-             * automatically send a PONG request just before this is emitted.
-             */
-            export interface IPing {
-                /**
-                 * @param server - server that adiministered the ping
-                 */
-                (server: string): void;
-            }
-
-            /**
-             * 'pm': As per ‘message’ event but only emits when the message is
-             * direct to the client. See the raw event for details on the message
-             * object.
-             */
-            export interface IPm {
-                /**
-                 * @param nick - sender
-                 * @param text - message text
-                 * @param message - raw message
-                 */
-                (nick: string, text: string, message: IMessage): void;
-            }
-
-            /**
-             * 'ctcp': Emitted when a CTCP notice or privmsg was received (type
-             * is either ‘notice’ or ‘privmsg’). See the raw event for details
-             * on the message object.
-             */
-            export interface ICtcp {
-                /**
-                 * @param from - sender
-                 * @param to - recievier
-                 * @param text - ctcp text
-                 * @param type - ctcp type
-                 * @param message - raw message
-                 */
-                (
-                    from: string,
-                    to: string,
-                    text: string,
-                    type: string,
-                    message: IMessage
-                ): void;
-            }
-
-
-            /**
-             * 'ctcp-*': Emitted when a specific type of CTCP request was
-             * recieved.
-             */
-            export interface ICtcpSpecific {
-                /**
-                 * @param from - sender
-                 * @param to - recievier
-                 * @param message - raw message
-                 */
-                (
-                    from: string,
-                    to: string,
-                    text: string,
-                    message: IMessage
-                ): void;
-
-                (
-                    from: string,
-                    to: string,
-                    text: string,
-                    type: string,
-                    message: IMessage
-                ): void;
-            }
-
-            /**
-             * 'nick': Emitted when a user changes nick along with the channels
-             * the user is in. See the raw event for details on the message
-             * object.
-             */
-            export interface INick {
-                /**
-                 * @param oldnick - old nickname
-                 * @param newnick - new nickname
-                 * @param channels - channels the nick changed in
-                 * @param message - raw message
-                 */
-                (
-                    oldnick: string,
-                    newnick: string,
-                    channels: string[],
-                    message: IMessage
-                ): void;
-            }
-
-            /**
-             * 'invite': Emitted when the client receives an /invite. See the
-             * raw event for details on the message object.
-             */
-            export interface IInvite {
-                /**
-                 * @param channel - channel user was invited to
-                 * @param from - user who invited
-                 * @param message - raw message
-                 */
-                (channel: string, from: string, message: IMessage): void;
-            }
-
-            /**
-             * '+mode'/'-mode': Emitted when a mode is added or removed from a user or
-             * channel. channel is the channel which the mode is being set on/in
-             * . by is the user setting the mode. mode is the single character
-             * mode identifier. If the mode is being set on a user, argument is
-             * the nick of the user. If the mode is being set on a channel,
-             * argument is the argument to the mode. If a channel mode doesn’t
-             * have any arguments, argument will be ‘undefined’. See the raw
-             * event for details on the message object.
-             */
-            export interface IModeChange {
-                /**
-                 * @param channel - channel
-                 * @param by - nick that changed mode
-                 * @param mode - single character mode identifier
-                 * @param argument - mode argument
-                 * @param message - raw message
-                 */
-                (
-                    channel: string,
-                    by: string,
-                    mode: string,
-                    argument: string,
-                    message: IMessage
-                ): void;
-            }
-
-            /**
-             * 'whois': Emitted whenever the server finishes outputting a WHOIS
-             * response.
-             */
-            export interface IWhois {
-                (info: IWhoisData): void;
-            }
-
-            /**
-             * 'channellist': Emitted when the server has finished returning a
-             * channel list. The channel_list array is simply a list of the
-             * objects that were returned in the intervening channellist_item
-             * events.
-             *
-             * This data is also available via the Client.channellist property
-             * after this event has fired.
-             */
-            export interface IChannelList {
-                /**
-                 * @param list - channels
-                 */
-                (
-                    list: IChannel[]
-                ): void;
-            }
-
-            /**
-             * 'raw': Emitted when ever the client receives a “message” from
-             * the server. A message is a parsed line from the server.
-             */
-            export interface IRaw {
-                /**
-                 * @param message - raw message
-                 */
-                (message: IMessage): void;
-            }
-
-            /**
-             * 'error': Emitted when ever the server responds with an error-type message. The message parameter is exactly as in the ‘raw’ event.
-             */
-            export interface IError {
-                /**
-                 * @param message - raw message
-                 */
-                (message: IMessage): void;
-            }
-
-            /**
-             * 'action': Emitted whenever a user performs an action
-             * (e.g. /me waves).
-             */
-            export interface IAction {
-                /**
-                 * @param from - sender
-                 * @param to - reciever
-                 * @param text - text
-                 * @param message - raw message
-                 */
-                (
-                    from: string, to: string, text: string, message: IMessage
-                ): void;
-            }
-        }
-    }
-
-    /** Colors */
-    namespace NodeIRC.colors {
-        /**
-         * Takes a color by name, text, and optionally what color to return.
-         * @param color - name of color
-         * @param text - text to color
-         * @param reset_color - color to set after text
-         */
-        export function wrap(
-            color: string, text: string, reset_color?: string
-        ): string;
-
-        /**
-         * This contains the set of colors available and a function to wrap
-         * text in a color.
-         */
-        export var codes: {
-            [index: string]: string;
-        };
-    }
-
-    export = NodeIRC;
-}
diff --git a/irc/tsconfig.json b/irc/tsconfig.json
new file mode 100644
index 0000000000..7a80f613c5
--- /dev/null
+++ b/irc/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "irc-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/is-lower-case/index.d.ts b/is-lower-case/index.d.ts
new file mode 100644
index 0000000000..1a489738f3
--- /dev/null
+++ b/is-lower-case/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for is-lower-case
+// Project: https://github.com/blakeembrey/is-lower-case 
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens> 
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function isLowerCase(string: string): boolean;
+export = isLowerCase;
diff --git a/is-lower-case/is-lower-case-tests.ts b/is-lower-case/is-lower-case-tests.ts
index 6b37359cc1..2ff5a8488e 100644
--- a/is-lower-case/is-lower-case-tests.ts
+++ b/is-lower-case/is-lower-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="is-lower-case.d.ts" />
 
 import isLowerCase = require('is-lower-case')
 
diff --git a/is-lower-case/is-lower-case.d.ts b/is-lower-case/is-lower-case.d.ts
deleted file mode 100644
index 7fad69960e..0000000000
--- a/is-lower-case/is-lower-case.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for is-lower-case
-// Project: https://github.com/blakeembrey/is-lower-case 
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens> 
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "is-lower-case" {
-	function isLowerCase(string: string): boolean;
-	export = isLowerCase;
-}
diff --git a/is-lower-case/tsconfig.json b/is-lower-case/tsconfig.json
new file mode 100644
index 0000000000..d3cd99acef
--- /dev/null
+++ b/is-lower-case/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "is-lower-case-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/is-my-json-valid/index.d.ts b/is-my-json-valid/index.d.ts
new file mode 100644
index 0000000000..f51281be22
--- /dev/null
+++ b/is-my-json-valid/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for is-my-json-valid
+// Project: https://github.com/mafintosh/is-my-json-valid
+// Definitions by: kruncher <https://github.com/kruncher/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+
+
+interface ValidationError {
+    field: string;
+    message: string;
+    value: any;
+    type: string;
+}
+
+interface ValidateFunction {
+    (data: any): boolean;
+
+    errors: ValidationError[];
+}
+
+interface Validator {
+    (schema: any, options?: any): ValidateFunction;
+
+    filter(schema: any): any;
+}
+
+declare var validator: Validator;
+export = validator;
diff --git a/is-my-json-valid/is-my-json-valid-tests.ts b/is-my-json-valid/is-my-json-valid-tests.ts
index 2a58f3da7f..c853a53e33 100644
--- a/is-my-json-valid/is-my-json-valid-tests.ts
+++ b/is-my-json-valid/is-my-json-valid-tests.ts
@@ -1,8 +1,5 @@
-/// <reference path="is-my-json-valid.d.ts"/>
-
 import validator = require('is-my-json-valid');
 
-
 //
 // Usage
 //
diff --git a/is-my-json-valid/is-my-json-valid.d.ts b/is-my-json-valid/is-my-json-valid.d.ts
deleted file mode 100644
index e584b8c4b2..0000000000
--- a/is-my-json-valid/is-my-json-valid.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Type definitions for is-my-json-valid
-// Project: https://github.com/mafintosh/is-my-json-valid
-// Definitions by: kruncher <https://github.com/kruncher/>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-declare module "is-my-json-valid" {
-
-  interface ValidationError {
-    field: string;
-    message: string;
-    value: any;
-    type: string;
-  }
-
-  interface ValidateFunction {
-    (data: any): boolean;
-
-    errors: ValidationError[];
-  }
-
-  interface Validator {
-    (schema: any, options?: any): ValidateFunction;
-
-    filter(schema: any): any;
-  }
-
-  var validator: Validator;
-  export = validator;
-
-}
diff --git a/is-my-json-valid/tsconfig.json b/is-my-json-valid/tsconfig.json
new file mode 100644
index 0000000000..c3fcd82658
--- /dev/null
+++ b/is-my-json-valid/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "is-my-json-valid-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/is-upper-case/index.d.ts b/is-upper-case/index.d.ts
new file mode 100644
index 0000000000..3bec58c214
--- /dev/null
+++ b/is-upper-case/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for is-upper-case
+// Project: https://github.com/blakeembrey/is-upper-case
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function isUpperCase(string: string, locale?: string): boolean;
+export = isUpperCase;
diff --git a/is-upper-case/is-upper-case-tests.ts b/is-upper-case/is-upper-case-tests.ts
index a02db58509..41fa04dc34 100644
--- a/is-upper-case/is-upper-case-tests.ts
+++ b/is-upper-case/is-upper-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="is-upper-case.d.ts" />
 
 import isUpperCase = require('is-upper-case')
 
diff --git a/is-upper-case/is-upper-case.d.ts b/is-upper-case/is-upper-case.d.ts
deleted file mode 100644
index 904b34f9bd..0000000000
--- a/is-upper-case/is-upper-case.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for is-upper-case
-// Project: https://github.com/blakeembrey/is-upper-case
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "is-upper-case" {
-	function isUpperCase(string: string, locale?: string): boolean;
-	export = isUpperCase;
-}
\ No newline at end of file
diff --git a/is-upper-case/tsconfig.json b/is-upper-case/tsconfig.json
new file mode 100644
index 0000000000..3afac63ddc
--- /dev/null
+++ b/is-upper-case/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "is-upper-case-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/is-url/index.d.ts b/is-url/index.d.ts
new file mode 100644
index 0000000000..00d9993e99
--- /dev/null
+++ b/is-url/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for is-url v1.2.1
+// Project: https://github.com/segmentio/is-url
+// Definitions by: Ryota Murohoshi <https://github.com/RyotaMurohoshi>
+// Definitions: https://github.com/RyotaMurohoshi/DefinitelyTyped
+
+
+export = isUrl
+
+declare function isUrl(string: string): boolean;
diff --git a/is-url/is-url-tests.ts b/is-url/is-url-tests.ts
index c8331d991d..ec2af504e9 100644
--- a/is-url/is-url-tests.ts
+++ b/is-url/is-url-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./is-url.d.ts" />
 
 import isUrl = require('is-url');
 
diff --git a/is-url/is-url.d.ts b/is-url/is-url.d.ts
deleted file mode 100644
index 67fe542b94..0000000000
--- a/is-url/is-url.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Type definitions for is-url v1.2.1
-// Project: https://github.com/segmentio/is-url
-// Definitions by: Ryota Murohoshi <https://github.com/RyotaMurohoshi>
-// Definitions: https://github.com/RyotaMurohoshi/DefinitelyTyped
-
-declare module "is-url" {
-    export = isUrl
-
-    function isUrl(string: string): boolean;
-}
diff --git a/is-url/tsconfig.json b/is-url/tsconfig.json
new file mode 100644
index 0000000000..1a72c33431
--- /dev/null
+++ b/is-url/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "is-url-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/is_js/is_js.d.ts b/is/index.d.ts
similarity index 100%
rename from is_js/is_js.d.ts
rename to is/index.d.ts
diff --git a/is_js/is_js-tests.ts b/is/is_js-tests.ts
similarity index 99%
rename from is_js/is_js-tests.ts
rename to is/is_js-tests.ts
index d90728e85e..fd0dee9c1f 100644
--- a/is_js/is_js-tests.ts
+++ b/is/is_js-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="is_js.d.ts" />
+
 
 //#region Type checks
 
diff --git a/is/tsconfig.json b/is/tsconfig.json
new file mode 100644
index 0000000000..d761816c27
--- /dev/null
+++ b/is/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "is_js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/iscroll/iscroll.d.ts b/iscroll/index.d.ts
similarity index 100%
rename from iscroll/iscroll.d.ts
rename to iscroll/index.d.ts
diff --git a/iscroll/iscroll-5-tests.ts b/iscroll/iscroll-5-tests.ts
index 07255e8333..7b485c4599 100644
--- a/iscroll/iscroll-5-tests.ts
+++ b/iscroll/iscroll-5-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="iscroll-5.d.ts" />
+
 
 var myScroll1 = new IScroll('#wrapper');
 var myScroll2 = new IScroll('#wrapper', { hScrollbar: false, vScrollbar: false });
diff --git a/iscroll/iscroll-tests.ts b/iscroll/iscroll-tests.ts
index 065f374ad3..09133f4175 100644
--- a/iscroll/iscroll-tests.ts
+++ b/iscroll/iscroll-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="iscroll.d.ts" />
+
 
 var myScroll1 = new iScroll('wrapper');
 var myScroll2 = new iScroll('wrapper', { hScrollbar: false, vScrollbar: false });
diff --git a/iscroll/tsconfig.json b/iscroll/tsconfig.json
new file mode 100644
index 0000000000..ff4da62423
--- /dev/null
+++ b/iscroll/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "iscroll-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/iso8601-localizer/iso8601-localizer.d.ts b/iso8601-localizer/index.d.ts
similarity index 100%
rename from iso8601-localizer/iso8601-localizer.d.ts
rename to iso8601-localizer/index.d.ts
diff --git a/iso8601-localizer/iso8601-localizer-tests.ts b/iso8601-localizer/iso8601-localizer-tests.ts
index 1368b8d78a..f2acae3101 100644
--- a/iso8601-localizer/iso8601-localizer-tests.ts
+++ b/iso8601-localizer/iso8601-localizer-tests.ts
@@ -9,7 +9,7 @@ import ISO8601Localizer = require('iso8601-localizer');
 For client-side users include the module as internal module as shown below:
 */
 
-/// <reference path="iso8601-localizer.d.ts" />
+
 
 new ISO8601Localizer('2015-06-02T14:13:12').localize();
 
diff --git a/iso8601-localizer/tsconfig.json b/iso8601-localizer/tsconfig.json
new file mode 100644
index 0000000000..8a79351210
--- /dev/null
+++ b/iso8601-localizer/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "iso8601-localizer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/isomorphic-fetch/isomorphic-fetch.d.ts b/isomorphic-fetch/index.d.ts
similarity index 100%
rename from isomorphic-fetch/isomorphic-fetch.d.ts
rename to isomorphic-fetch/index.d.ts
diff --git a/isomorphic-fetch/isomorphic-fetch-tests.ts b/isomorphic-fetch/isomorphic-fetch-tests.ts
index 3235912ac1..0e1789552f 100644
--- a/isomorphic-fetch/isomorphic-fetch-tests.ts
+++ b/isomorphic-fetch/isomorphic-fetch-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="isomorphic-fetch.d.ts"/>
-
 function test_isomorphicFetchTestCases() {
     expectSuccess(fetch('http://localhost:3000/good'), 'Good response');
     
diff --git a/isomorphic-fetch/isomorphic-fetch-tests.ts.tscparams b/isomorphic-fetch/isomorphic-fetch-tests.ts.tscparams
deleted file mode 100644
index f5c1d1215d..0000000000
--- a/isomorphic-fetch/isomorphic-fetch-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es6 --noImplicitAny
\ No newline at end of file
diff --git a/isomorphic-fetch/tsconfig.json b/isomorphic-fetch/tsconfig.json
new file mode 100644
index 0000000000..f87fd07fb8
--- /dev/null
+++ b/isomorphic-fetch/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "isomorphic-fetch-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/istanbul/index.d.ts b/istanbul/index.d.ts
new file mode 100644
index 0000000000..ee23e27782
--- /dev/null
+++ b/istanbul/index.d.ts
@@ -0,0 +1,72 @@
+// Type definitions for Istanbul v0.4.0
+// Project: https://github.com/gotwarlost/istanbul
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare namespace istanbul {
+    interface Istanbul {
+        new (options?: any): Istanbul;
+        Collector: Collector;
+        config: Config;
+        ContentWriter: ContentWriter;
+        FileWriter: FileWriter;
+        hook: Hook;
+        Instrumenter: Instrumenter;
+        Report: Report;
+        Reporter: Reporter;
+        Store: Store;
+        utils: ObjectUtils;
+        VERSION: string;
+        Writer: Writer;
+    }
+
+    interface Collector {
+        new (options?: any): Collector;
+        add(coverage: any, testName?: string): void;
+    }
+
+    interface Config {
+    }
+
+    interface ContentWriter {
+    }
+
+    interface FileWriter {
+    }
+
+    interface Hook {
+    }
+
+    interface Instrumenter {
+        new (options?: any): Instrumenter;
+        instrumentSync(code: string, filename: string): string;
+    }
+
+    interface Report {
+    }
+
+    interface Configuration {
+        new (obj: any, overrides: any): Configuration;
+    }
+
+    interface Reporter {
+        new (cfg?: Configuration, dir?: string): Reporter;
+        add(fmt: string): void;
+        addAll(fmts: Array<string>): void;
+        write(collector: Collector, sync: boolean, callback: Function): void;
+    }
+
+    interface Store {
+    }
+
+    interface ObjectUtils {
+    }
+
+    interface Writer {
+    }
+}
+
+declare var istanbul: istanbul.Istanbul;
+
+export = istanbul;
diff --git a/istanbul/istanbul-tests.ts b/istanbul/istanbul-tests.ts
index b283e2dcce..0ff7adebf5 100644
--- a/istanbul/istanbul-tests.ts
+++ b/istanbul/istanbul-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="istanbul.d.ts" />
 
 import * as istanbul from 'istanbul';
 
diff --git a/istanbul/istanbul.d.ts b/istanbul/istanbul.d.ts
deleted file mode 100644
index 1ccbd14ae6..0000000000
--- a/istanbul/istanbul.d.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-// Type definitions for Istanbul v0.4.0
-// Project: https://github.com/gotwarlost/istanbul
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'istanbul' {
-  namespace istanbul {
-    interface Istanbul {
-      new (options?: any): Istanbul;
-      Collector: Collector;
-      config: Config;
-      ContentWriter: ContentWriter;
-      FileWriter: FileWriter;
-      hook: Hook;
-      Instrumenter: Instrumenter;
-      Report: Report;
-      Reporter: Reporter;
-      Store: Store;
-      utils: ObjectUtils;
-      VERSION: string;
-      Writer: Writer;
-    }
-
-    interface Collector {
-      new (options?: any): Collector;
-      add(coverage: any, testName?: string): void;
-    }
-
-    interface Config {
-    }
-
-    interface ContentWriter {
-    }
-
-    interface FileWriter {
-    }
-
-    interface Hook {
-    }
-
-    interface Instrumenter {
-      new (options?: any): Instrumenter;
-      instrumentSync(code: string, filename: string): string;
-    }
-
-    interface Report {
-    }
-
-    interface Configuration {
-      new (obj: any, overrides: any): Configuration;
-    }
-
-    interface Reporter {
-      new (cfg?: Configuration, dir?: string): Reporter;
-      add(fmt: string): void;
-      addAll(fmts: Array<string>): void;
-      write(collector: Collector, sync: boolean, callback: Function): void;
-    }
-
-    interface Store {
-    }
-
-    interface ObjectUtils {
-    }
-
-    interface Writer {
-    }
-  }
-
-  var istanbul: istanbul.Istanbul;
-
-  export = istanbul;
-}
diff --git a/istanbul/tsconfig.json b/istanbul/tsconfig.json
new file mode 100644
index 0000000000..5dce8690d3
--- /dev/null
+++ b/istanbul/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "istanbul-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ix.js/ix.d.ts b/ix.js/index.d.ts
similarity index 100%
rename from ix.js/ix.d.ts
rename to ix.js/index.d.ts
diff --git a/ix.js/ix-tests.ts b/ix.js/ix-tests.ts
index 6953621ca3..a9cc960cc7 100644
--- a/ix.js/ix-tests.ts
+++ b/ix.js/ix-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="ix.d.ts"/>
-
 var ec_ns = (a: number, b: string) => a.toString() == b;	//equality comparer on number,string
 var ec_ss = (a: string, b: string) => a == b;				//equality comparer on string,string
 var ec_nn = (a: number, b: number) => a === b;				//equality comparer on number,number
diff --git a/ix.js/tsconfig.json b/ix.js/tsconfig.json
new file mode 100644
index 0000000000..99e16640e5
--- /dev/null
+++ b/ix.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ix-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jade/index.d.ts b/jade/index.d.ts
new file mode 100644
index 0000000000..bc97c52839
--- /dev/null
+++ b/jade/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for jade
+// Project: https://github.com/jadejs/jade
+// Definitions by: Panu Horsmalahti <https://github.com/panuhorsmalahti>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export declare function compile(template: string, options?: any): (locals?: any) => string;
+export declare function compileFile(path: string, options?: any): (locals?: any) => string;
+export declare function compileClient(template: string, options?: any): (locals?: any) => string;
+export declare function compileClientWithDependenciesTracked(template: string, options?: any): {
+    body: (locals?: any) => string;
+    dependencies: string[];
+};
+export declare function render(template: string, options?: any): string;
+export declare function renderFile(path: string, options?: any): string;
diff --git a/jade/jade-tests.ts b/jade/jade-tests.ts
index 6b4774021f..2f8fd9d70e 100644
--- a/jade/jade-tests.ts
+++ b/jade/jade-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="jade.d.ts"/>
-
 import * as jade from 'jade';
 
 jade.compile("b")();
diff --git a/jade/jade.d.ts b/jade/jade.d.ts
deleted file mode 100644
index 2dfd311256..0000000000
--- a/jade/jade.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Type definitions for jade
-// Project: https://github.com/jadejs/jade
-// Definitions by: Panu Horsmalahti <https://github.com/panuhorsmalahti>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'jade' {
-    export function compile(template: string, options?: any): (locals?: any) => string;
-    export function compileFile(path: string, options?: any): (locals?: any) => string;
-    export function compileClient(template: string, options?: any): (locals?: any) => string;
-    export function compileClientWithDependenciesTracked(template: string, options?: any): {
-        body: (locals?: any) => string;
-        dependencies: string[];
-    };
-    export function render(template: string, options?: any): string;
-    export function renderFile(path: string, options?: any): string;
-}
diff --git a/jade/tsconfig.json b/jade/tsconfig.json
new file mode 100644
index 0000000000..e6a07d9cc6
--- /dev/null
+++ b/jade/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jade-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jake/index.d.ts b/jake/index.d.ts
new file mode 100644
index 0000000000..69d0ec2d04
--- /dev/null
+++ b/jake/index.d.ts
@@ -0,0 +1,421 @@
+// Type definitions for jake
+// Project: https://github.com/mde/jake
+// Definitions by: Kon <http://phyzkit.net/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+/**
+ * Complets an asynchronous task, allowing Jake's execution to proceed to the next task
+ * @param value A value to return from the task.
+ */
+declare function complete(value?: any): void;
+
+/**
+ * Creates a description for a Jake Task (or FileTask, DirectoryTask). When invoked, the description that iscreated will be associated with whatever Task is created next.
+ * @param description The description for the Task
+ */
+declare function desc(description:string): void;
+
+/**
+ * Creates a Jake DirectoryTask. Can be used as a prerequisite for FileTasks, or for simply ensuring a directory exists for use with a Task's action.
+ * @param name The name of the DiretoryTask
+ */
+declare function directory(name:string): jake.DirectoryTask;
+
+/**
+ * Causes Jake execution to abort with an error. Allows passing an optional error code, which will be used to set the exit-code of exiting process.
+ * @param err The error to thow when aborting execution. If this argument is an Error object, it will simply be thrown. If a String, it will be used as the error-message. (If it is a multi-line String, the first line will be used as the Error message, and the remaining lines will be used as the error-stack.)
+ */
+declare function fail(...err:string[]): void;
+declare function fail(...err:Error[]): void;
+declare function fail(...err:any[]): void;
+
+/**
+ * Creates a Jake FileTask.
+ * @name name The name of the Task
+ * @param prereqs Prerequisites to be run before this task
+ * @param action The action to perform for this task
+ * @param opts Perform this task asynchronously. If you flag a task with this option, you must call the global `complete` method inside the task's action, for execution to proceed to the next task.
+ */
+declare function file(name:string, prereqs?:string[], action?:()=>void, opts?:jake.FileTaskOptions): jake.FileTask;
+
+/**
+ * Creates Jake FileTask from regex patterns
+ * @name name/pattern of the Task
+ * @param source calculated from the name pattern
+ * @param prereqs Prerequisites to be run before this task
+ * @param action The action to perform for this task
+ * @param opts Perform this task asynchronously. If you flag a task with this option, you must call the global `complete` method inside the task's action, for execution to proceed to the next task.
+ */
+declare function rule(pattern: RegExp, source: string | { (name: string): string; }, prereqs?: string[], action?: () => void, opts?: jake.TaskOptions): void;
+
+/**
+ * Creates a namespace which allows logical grouping of tasks, and prevents name-collisions with task-names. Namespaces can be nested inside of other namespaces.
+ * @param name The name of the namespace
+ * @param scope The enclosing scope for the namespaced tasks
+ */
+declare function namespace(name:string, scope:()=>void): void;
+
+/**
+ * @param name The name of the Task
+ * @param prereqs Prerequisites to be run before this task
+ * @param action The action to perform for this task
+ * @param opts
+ */
+declare function task(name:string, prereqs?:string[], action?:(...params:any[])=>any, opts?:jake.TaskOptions): jake.Task;
+declare function task(name:string, action?:(...params:any[])=>any, opts?:jake.TaskOptions): jake.Task;
+declare function task(name:string, opts?:jake.TaskOptions, action?:(...params:any[])=>any): jake.Task;
+
+/**
+ * @param name The name of the NpmPublishTask
+ * @param packageFiles The files to include in the package
+ * @param definition A function that creates the package definition
+ */
+declare function npmPublishTask(name:string, packageFiles:string[]): jake.NpmPublishTask;
+declare function npmPublishTask(name:string, definition?:()=>void): jake.NpmPublishTask;
+
+/**
+ * Creates a Jake TestTask.
+ * @name name The name of the Task
+ * @param prereqs Prerequisites to be run before this task
+ * @param definitions The function to update/add to TestTask members
+ */
+declare function testTask(name:string, prereqs?:string[], definitions?:()=>void): jake.TestTask;
+
+declare namespace jake{
+
+    ////////////////////////////////////////////////////////////////////////////////////
+	// File-utils //////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////////////////////
+
+	interface UtilOptions{
+		silent?: boolean;
+	}
+
+	/**
+	 * The jake.mkdirP utility recursively creates a set of nested directories. It will not throw an error if any of the directories already exists.
+	 * https://github.com/substack/node-mkdirp
+	 */
+	export function mkdirP(name:string, mode?:string, f?:(er:Error, made:any)=>void): void;
+	export function mkdirP(name:string, f?:(er:Error, made:any)=>void): void;
+
+	/**
+	 * The jake.cpR utility does a recursive copy of a file or directory.
+	 * Note that this command can only copy files and directories; it does not perform globbing (so arguments like '*.txt' are not possible).
+	 * @param path the file/directory to copy,
+	 * @param destination the destination.
+	 */
+	export function cpR(path:string, destination:string, opts?:UtilOptions, callback?:()=>void): void;
+	export function cpR(path:string, destination:string, callback?:(err:Error)=>void): void;
+
+	/**
+	 * The jake.readdirR utility gives you a recursive directory listing, giving you output somewhat similar to the Unix find command. It only works with a directory name, and does not perform filtering or globbing.
+	 * @return an array of filepaths for all files in the 'pkg' directory, and all its subdirectories.
+	 */
+	export function readdirR(name:string, opts?:UtilOptions): string[];
+
+	/**
+	 * The jake.rmRf utility recursively removes a directory and all its contents.
+	 */
+	export function rmRf(name:string, opts?:UtilOptions): void;
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	// Running shell-commands ////////////////////////////////////////////////////////////////////
+	//////////////////////////////////////////////////////////////////////////////////////////////
+
+	interface ExecOptions{
+		/**
+		 * print to stdout, default false
+		 */
+
+		printStdout?:boolean;
+		/**
+		 * print to stderr, default false
+		 */
+		printStderr?:boolean;
+
+		/**
+		 * stop execution on error, default true
+		 */
+		breakOnError?:boolean;
+
+		/**
+		*
+		*/
+		windowsVerbatimArguments?: boolean
+	}
+	export function exec(cmds:string[], callback?:()=>void, opts?:ExecOptions):void;
+
+
+	/**
+	 * @event cmdStart When a new command begins to run. Passes one arg, the command being run.
+	 * @event cmdEnd When a command finishes. Passes one arg, the command being run.
+	 * @event stdout When the stdout for the child-process recieves data. This streams the stdout data. Passes one arg, the chunk of data.
+	 * @event stderr When the stderr for the child-process recieves data. This streams the stderr data. Passes one arg, the chunk of data.
+	 * @event error When a shell-command
+	 */
+	export interface Exec extends NodeJS.EventEmitter {
+		append(cmd:string): void;
+		run(): void;
+	}
+
+	export function createExec(cmds:string[], callback?:()=>void, opts?:ExecOptions ):Exec;
+	export function createExec(cmds:string[], opts?:ExecOptions,  callback?:()=>void):Exec;
+	export function createExec(cmds:string,   callback?:()=>void, opts?:ExecOptions ):Exec;
+	export function createExec(cmds:string,   opts?:ExecOptions,  callback?:()=>void):Exec;
+
+	////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	// Logging and output ////////////////////////////////////////////////////////////////////////////////////////
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	interface Logger{
+		log(value:any): void;
+		error(value:any): void;
+	}
+
+	export var logger: Logger;
+
+	//////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	// program ////////////////////////////////////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	export var program: {
+		opts: {
+			[name:string]: any;
+			quiet: boolean;
+		};
+		taskNames: string[];
+        taskArgs: string[];
+        envVars: { [key:string]: string; };
+	};
+
+
+	//////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	// Tasks /////////////////////////////////////////////////////////////////////////////////////////////////////
+	//////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+	export interface TaskOptions{
+		/**
+		 * Perform this task asynchronously. If you flag a task with this option, you must call the global `complete` method inside the task's action, for execution to proceed to the next task.
+		 * @default false
+		 */
+		async?: boolean;
+
+		/**
+		 * number of parllel async tasks
+		*/
+		parallelLimit?: number;
+	}
+
+	/**
+	 * A Jake Task
+	 *
+	 * @event complete
+	 */
+	export class Task implements NodeJS.EventEmitter {
+		/**
+		 * @name name The name of the Task
+		 * @param prereqs Prerequisites to be run before this task
+		 * @param action The action to perform for this task
+		 * @param opts Perform this task asynchronously. If you flag a task with this option, you must call the global `complete` method inside the task's action, for execution to proceed to the next task.
+		 */
+		constructor(name:string, prereqs?:string[], action?:()=>void, opts?:TaskOptions);
+
+		/**
+		 * Runs prerequisites, then this task. If the task has already been run, will not run the task again.
+		 */
+		invoke(): void;
+
+		/**
+		 * Runs this task, without running any prerequisites. If the task has already been run, it will still run it again.
+		 */
+		reenable(): void;
+
+		addListener(event: string, listener: Function): this;
+		on(event: string, listener: Function): this;
+		once(event: string, listener: Function): this;
+		removeListener(event: string, listener: Function): this;
+		removeAllListeners(event?: string): this;
+		setMaxListeners(n: number): this;
+		getMaxListeners(): number;
+		listeners(event: string): Function[];
+		emit(event: string, ...args: any[]): boolean;
+		listenerCount(type: string): number;
+		value: any;
+	}
+
+	export class DirectoryTask{
+		/**
+         * @param name The name of the directory to create.
+		 */
+		constructor(name:string);
+	}
+
+	export interface FileTaskOptions{
+		/**
+		 * Perform this task asynchronously. If you flag a task with this option, you must call the global `complete` method inside the task's action, for execution to proceed to the next task.
+		 * @default false
+		 */
+		async?: boolean;
+	}
+
+	export class FileTask{
+		/**
+		 * @param name The name of the Task
+		 * @param prereqs Prerequisites to be run before this task
+		 * @param action The action to perform to create this file
+		 * @param opts Perform this task asynchronously. If you flag a task with this option, you must call the global `complete` method inside the task's action, for execution to proceed to the next task.
+	     */
+		constructor(name:string, prereqs?:string[], action?:()=>void, opts?:FileTaskOptions);
+	}
+
+	interface FileFilter{
+		(filename:string): boolean;
+	}
+
+	export class FileList{
+		constructor();
+
+		/**
+	     * Includes file-patterns in the FileList. Should be called with one or more
+		 * pattern for finding file to include in the list. Arguments should be strings
+		 * for either a glob-pattern or a specific file-name, or an array of them
+		 */
+		include(files:string[]): void;
+		include(...files:string[]): void;
+
+		/**
+		 * Indicates whether a particular file would be filtered out by the current
+		 * exclusion rules for this FileList.
+		 * @param name The filename to check
+         * @return Whether or not the file should be excluded
+         */
+		shouldExclude(name:string): boolean;
+
+		/**
+		 * Excludes file-patterns from the FileList. Should be called with one or more
+		 * pattern for finding file to include in the list. Arguments can be:
+		 * 1. Strings for either a glob-pattern or a specific file-name
+		 * 2. Regular expression literals
+		 * 3. Functions to be run on the filename that return a true/false
+		 */
+		exclude(file:string[]): void;
+		exclude(...file:string[]): void;
+		exclude(file:RegExp[]): void;
+		exclude(...file:RegExp[]): void;
+		exclude(file:FileFilter[]): void;
+		exclude(...file:FileFilter[]): void;
+
+		/**
+		 * Populates the FileList from the include/exclude rules with a list of
+		 * actual files
+		 */
+		resolve(): void;
+
+		/**
+		 * Convert to a plain-jane array
+		 */
+		toArray(): string[];
+
+		/**
+	 	 * Get rid of any current exclusion rules
+      	 */
+  		clearExclude(): void;
+	}
+
+	export class PackageTask{
+        /**
+         * Instantiating a PackageTask creates a number of Jake Tasks that make packaging and distributing your software easy.
+         * @param name The name of the project
+         * @param version The current project version (will be appended to the project-name in the package-archive
+         * @param definition Defines the contents of the package, and format of the package-archive. Will be executed on the instantiated PackageTask (i.e., 'this', will be the PackageTask instance), to set the various instance-propertiess.
+         */
+		constructor(name:string, version:string, definition:()=>void);
+
+		/**
+		 * 	Equivalent to the '-C' command for the `tar` and `jar` commands. ("Change to this directory before adding files.")
+		 */
+		archiveChangeDir: string;
+
+		/**
+		 * Specifies the files and directories to include in the package-archive. If unset, this will default to the main package directory -- i.e., name + version.
+         */
+     	archiveContentDir: string;
+
+     	/**
+     	 * The shell-command to use for creating jar archives.
+         */
+        jarCommand: string;
+
+        /**
+         * Can be set to point the `jar` utility at a manifest file to use in a .jar archive. If unset, one will be automatically created by the `jar` utility. This path should be relative to the root of the package directory (this.packageDir above, likely 'pkg')
+         */
+        manifestFile: string;
+
+        /**
+         * The name of the project
+         */
+		name: string;
+
+		/**
+		 * If set to true, uses the `jar` utility to create a .jar archive of the pagckage
+		 */
+		needJar: boolean;
+
+		/**
+         * If set to true, uses the `tar` utility to create a gzip .tgz archive of the pagckage
+         */
+        needTar: boolean;
+
+        /**
+         * If set to true, uses the `tar` utility to create a bzip2 .bz2 archive of the pagckage
+         */
+		needTarBz2: boolean;
+
+		/**
+         * If set to true, uses the `zip` utility to create a .zip archive of the pagckage
+		 */
+		needZip: boolean;
+
+		/**
+		 * The list of files and directories to include in the package-archive
+         */
+        packageFiles: FileList;
+
+        /**
+         * The shell-command to use for creating tar archives.
+         */
+        tarCommand: string;
+
+        /**
+         * The project version-string
+		 */
+		version: string;
+
+		/**
+		 * The shell-command to use for creating zip archives.
+		 */
+		zipCommand: string;
+
+	}
+
+	export class TestTask{
+		constructor(name:string, definition?:()=>void);
+	}
+
+	export class NpmPublishTask{
+		constructor(name:string, packageFiles:string[]);
+		constructor(name:string, definition?:()=>void);
+	}
+
+	export function addListener(event: string, listener: Function): NodeJS.EventEmitter;
+	export function on(event: string, listener: Function): NodeJS.EventEmitter;
+	export function once(event: string, listener: Function): NodeJS.EventEmitter;
+	export function removeListener(event: string, listener: Function): NodeJS.EventEmitter;
+	export function removeAllListener(event: string): NodeJS.EventEmitter;
+	export function setMaxListeners(n: number): void;
+	export function listeners(event: string): Function[];
+	export function emit(event: string, ...args: any[]): boolean;
+}
diff --git a/jake/jake-tests.ts b/jake/jake-tests.ts
index 3459083dc9..dc9691643f 100644
--- a/jake/jake-tests.ts
+++ b/jake/jake-tests.ts
@@ -1,5 +1,5 @@
 // https://github.com/mde/jake
-/// <reference path="jake.d.ts" />
+
 
 import path = require("path");
 
diff --git a/jake/jake-tests.ts.tscparams b/jake/jake-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jake/jake-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jake/jake.d.ts b/jake/jake.d.ts
deleted file mode 100644
index 38fade488b..0000000000
--- a/jake/jake.d.ts
+++ /dev/null
@@ -1,421 +0,0 @@
-// Type definitions for jake
-// Project: https://github.com/mde/jake
-// Definitions by: Kon <http://phyzkit.net/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-/**
- * Complets an asynchronous task, allowing Jake's execution to proceed to the next task
- * @param value A value to return from the task.
- */
-declare function complete(value?: any): void;
-
-/**
- * Creates a description for a Jake Task (or FileTask, DirectoryTask). When invoked, the description that iscreated will be associated with whatever Task is created next.
- * @param description The description for the Task
- */
-declare function desc(description:string): void;
-
-/**
- * Creates a Jake DirectoryTask. Can be used as a prerequisite for FileTasks, or for simply ensuring a directory exists for use with a Task's action.
- * @param name The name of the DiretoryTask
- */
-declare function directory(name:string): jake.DirectoryTask;
-
-/**
- * Causes Jake execution to abort with an error. Allows passing an optional error code, which will be used to set the exit-code of exiting process.
- * @param err The error to thow when aborting execution. If this argument is an Error object, it will simply be thrown. If a String, it will be used as the error-message. (If it is a multi-line String, the first line will be used as the Error message, and the remaining lines will be used as the error-stack.)
- */
-declare function fail(...err:string[]): void;
-declare function fail(...err:Error[]): void;
-declare function fail(...err:any[]): void;
-
-/**
- * Creates a Jake FileTask.
- * @name name The name of the Task
- * @param prereqs Prerequisites to be run before this task
- * @param action The action to perform for this task
- * @param opts Perform this task asynchronously. If you flag a task with this option, you must call the global `complete` method inside the task's action, for execution to proceed to the next task.
- */
-declare function file(name:string, prereqs?:string[], action?:()=>void, opts?:jake.FileTaskOptions): jake.FileTask;
-
-/**
- * Creates Jake FileTask from regex patterns
- * @name name/pattern of the Task
- * @param source calculated from the name pattern
- * @param prereqs Prerequisites to be run before this task
- * @param action The action to perform for this task
- * @param opts Perform this task asynchronously. If you flag a task with this option, you must call the global `complete` method inside the task's action, for execution to proceed to the next task.
- */
-declare function rule(pattern: RegExp, source: string | { (name: string): string; }, prereqs?: string[], action?: () => void, opts?: jake.TaskOptions): void;
-
-/**
- * Creates a namespace which allows logical grouping of tasks, and prevents name-collisions with task-names. Namespaces can be nested inside of other namespaces.
- * @param name The name of the namespace
- * @param scope The enclosing scope for the namespaced tasks
- */
-declare function namespace(name:string, scope:()=>void): void;
-
-/**
- * @param name The name of the Task
- * @param prereqs Prerequisites to be run before this task
- * @param action The action to perform for this task
- * @param opts
- */
-declare function task(name:string, prereqs?:string[], action?:(...params:any[])=>any, opts?:jake.TaskOptions): jake.Task;
-declare function task(name:string, action?:(...params:any[])=>any, opts?:jake.TaskOptions): jake.Task;
-declare function task(name:string, opts?:jake.TaskOptions, action?:(...params:any[])=>any): jake.Task;
-
-/**
- * @param name The name of the NpmPublishTask
- * @param packageFiles The files to include in the package
- * @param definition A function that creates the package definition
- */
-declare function npmPublishTask(name:string, packageFiles:string[]): jake.NpmPublishTask;
-declare function npmPublishTask(name:string, definition?:()=>void): jake.NpmPublishTask;
-
-/**
- * Creates a Jake TestTask.
- * @name name The name of the Task
- * @param prereqs Prerequisites to be run before this task
- * @param definitions The function to update/add to TestTask members
- */
-declare function testTask(name:string, prereqs?:string[], definitions?:()=>void): jake.TestTask;
-
-declare namespace jake{
-
-    ////////////////////////////////////////////////////////////////////////////////////
-	// File-utils //////////////////////////////////////////////////////////////////////
-	////////////////////////////////////////////////////////////////////////////////////
-
-	interface UtilOptions{
-		silent?: boolean;
-	}
-
-	/**
-	 * The jake.mkdirP utility recursively creates a set of nested directories. It will not throw an error if any of the directories already exists.
-	 * https://github.com/substack/node-mkdirp
-	 */
-	export function mkdirP(name:string, mode?:string, f?:(er:Error, made:any)=>void): void;
-	export function mkdirP(name:string, f?:(er:Error, made:any)=>void): void;
-
-	/**
-	 * The jake.cpR utility does a recursive copy of a file or directory.
-	 * Note that this command can only copy files and directories; it does not perform globbing (so arguments like '*.txt' are not possible).
-	 * @param path the file/directory to copy,
-	 * @param destination the destination.
-	 */
-	export function cpR(path:string, destination:string, opts?:UtilOptions, callback?:()=>void): void;
-	export function cpR(path:string, destination:string, callback?:(err:Error)=>void): void;
-
-	/**
-	 * The jake.readdirR utility gives you a recursive directory listing, giving you output somewhat similar to the Unix find command. It only works with a directory name, and does not perform filtering or globbing.
-	 * @return an array of filepaths for all files in the 'pkg' directory, and all its subdirectories.
-	 */
-	export function readdirR(name:string, opts?:UtilOptions): string[];
-
-	/**
-	 * The jake.rmRf utility recursively removes a directory and all its contents.
-	 */
-	export function rmRf(name:string, opts?:UtilOptions): void;
-
-	//////////////////////////////////////////////////////////////////////////////////////////////
-	// Running shell-commands ////////////////////////////////////////////////////////////////////
-	//////////////////////////////////////////////////////////////////////////////////////////////
-
-	interface ExecOptions{
-		/**
-		 * print to stdout, default false
-		 */
-
-		printStdout?:boolean;
-		/**
-		 * print to stderr, default false
-		 */
-		printStderr?:boolean;
-
-		/**
-		 * stop execution on error, default true
-		 */
-		breakOnError?:boolean;
-
-		/**
-		*
-		*/
-		windowsVerbatimArguments?: boolean
-	}
-	export function exec(cmds:string[], callback?:()=>void, opts?:ExecOptions):void;
-
-
-	/**
-	 * @event cmdStart When a new command begins to run. Passes one arg, the command being run.
-	 * @event cmdEnd When a command finishes. Passes one arg, the command being run.
-	 * @event stdout When the stdout for the child-process recieves data. This streams the stdout data. Passes one arg, the chunk of data.
-	 * @event stderr When the stderr for the child-process recieves data. This streams the stderr data. Passes one arg, the chunk of data.
-	 * @event error When a shell-command
-	 */
-	export interface Exec extends NodeJS.EventEmitter {
-		append(cmd:string): void;
-		run(): void;
-	}
-
-	export function createExec(cmds:string[], callback?:()=>void, opts?:ExecOptions ):Exec;
-	export function createExec(cmds:string[], opts?:ExecOptions,  callback?:()=>void):Exec;
-	export function createExec(cmds:string,   callback?:()=>void, opts?:ExecOptions ):Exec;
-	export function createExec(cmds:string,   opts?:ExecOptions,  callback?:()=>void):Exec;
-
-	////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	// Logging and output ////////////////////////////////////////////////////////////////////////////////////////
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-	interface Logger{
-		log(value:any): void;
-		error(value:any): void;
-	}
-
-	export var logger: Logger;
-
-	//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	// program ////////////////////////////////////////////////////////////////////////////////////////////////////
-	////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-	export var program: {
-		opts: {
-			[name:string]: any;
-			quiet: boolean;
-		};
-		taskNames: string[];
-        taskArgs: string[];
-        envVars: { [key:string]: string; };
-	};
-
-
-	//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	// Tasks /////////////////////////////////////////////////////////////////////////////////////////////////////
-	//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-	export interface TaskOptions{
-		/**
-		 * Perform this task asynchronously. If you flag a task with this option, you must call the global `complete` method inside the task's action, for execution to proceed to the next task.
-		 * @default false
-		 */
-		async?: boolean;
-
-		/**
-		 * number of parllel async tasks
-		*/
-		parallelLimit?: number;
-	}
-
-	/**
-	 * A Jake Task
-	 *
-	 * @event complete
-	 */
-	export class Task implements NodeJS.EventEmitter {
-		/**
-		 * @name name The name of the Task
-		 * @param prereqs Prerequisites to be run before this task
-		 * @param action The action to perform for this task
-		 * @param opts Perform this task asynchronously. If you flag a task with this option, you must call the global `complete` method inside the task's action, for execution to proceed to the next task.
-		 */
-		constructor(name:string, prereqs?:string[], action?:()=>void, opts?:TaskOptions);
-
-		/**
-		 * Runs prerequisites, then this task. If the task has already been run, will not run the task again.
-		 */
-		invoke(): void;
-
-		/**
-		 * Runs this task, without running any prerequisites. If the task has already been run, it will still run it again.
-		 */
-		reenable(): void;
-
-		addListener(event: string, listener: Function): this;
-		on(event: string, listener: Function): this;
-		once(event: string, listener: Function): this;
-		removeListener(event: string, listener: Function): this;
-		removeAllListeners(event?: string): this;
-		setMaxListeners(n: number): this;
-		getMaxListeners(): number;
-		listeners(event: string): Function[];
-		emit(event: string, ...args: any[]): boolean;
-		listenerCount(type: string): number;
-		value: any;
-	}
-
-	export class DirectoryTask{
-		/**
-         * @param name The name of the directory to create.
-		 */
-		constructor(name:string);
-	}
-
-	export interface FileTaskOptions{
-		/**
-		 * Perform this task asynchronously. If you flag a task with this option, you must call the global `complete` method inside the task's action, for execution to proceed to the next task.
-		 * @default false
-		 */
-		async?: boolean;
-	}
-
-	export class FileTask{
-		/**
-		 * @param name The name of the Task
-		 * @param prereqs Prerequisites to be run before this task
-		 * @param action The action to perform to create this file
-		 * @param opts Perform this task asynchronously. If you flag a task with this option, you must call the global `complete` method inside the task's action, for execution to proceed to the next task.
-	     */
-		constructor(name:string, prereqs?:string[], action?:()=>void, opts?:FileTaskOptions);
-	}
-
-	interface FileFilter{
-		(filename:string): boolean;
-	}
-
-	export class FileList{
-		constructor();
-
-		/**
-	     * Includes file-patterns in the FileList. Should be called with one or more
-		 * pattern for finding file to include in the list. Arguments should be strings
-		 * for either a glob-pattern or a specific file-name, or an array of them
-		 */
-		include(files:string[]): void;
-		include(...files:string[]): void;
-
-		/**
-		 * Indicates whether a particular file would be filtered out by the current
-		 * exclusion rules for this FileList.
-		 * @param name The filename to check
-         * @return Whether or not the file should be excluded
-         */
-		shouldExclude(name:string): boolean;
-
-		/**
-		 * Excludes file-patterns from the FileList. Should be called with one or more
-		 * pattern for finding file to include in the list. Arguments can be:
-		 * 1. Strings for either a glob-pattern or a specific file-name
-		 * 2. Regular expression literals
-		 * 3. Functions to be run on the filename that return a true/false
-		 */
-		exclude(file:string[]): void;
-		exclude(...file:string[]): void;
-		exclude(file:RegExp[]): void;
-		exclude(...file:RegExp[]): void;
-		exclude(file:FileFilter[]): void;
-		exclude(...file:FileFilter[]): void;
-
-		/**
-		 * Populates the FileList from the include/exclude rules with a list of
-		 * actual files
-		 */
-		resolve(): void;
-
-		/**
-		 * Convert to a plain-jane array
-		 */
-		toArray(): string[];
-
-		/**
-	 	 * Get rid of any current exclusion rules
-      	 */
-  		clearExclude(): void;
-	}
-
-	export class PackageTask{
-        /**
-         * Instantiating a PackageTask creates a number of Jake Tasks that make packaging and distributing your software easy.
-         * @param name The name of the project
-         * @param version The current project version (will be appended to the project-name in the package-archive
-         * @param definition Defines the contents of the package, and format of the package-archive. Will be executed on the instantiated PackageTask (i.e., 'this', will be the PackageTask instance), to set the various instance-propertiess.
-         */
-		constructor(name:string, version:string, definition:()=>void);
-
-		/**
-		 * 	Equivalent to the '-C' command for the `tar` and `jar` commands. ("Change to this directory before adding files.")
-		 */
-		archiveChangeDir: string;
-
-		/**
-		 * Specifies the files and directories to include in the package-archive. If unset, this will default to the main package directory -- i.e., name + version.
-         */
-     	archiveContentDir: string;
-
-     	/**
-     	 * The shell-command to use for creating jar archives.
-         */
-        jarCommand: string;
-
-        /**
-         * Can be set to point the `jar` utility at a manifest file to use in a .jar archive. If unset, one will be automatically created by the `jar` utility. This path should be relative to the root of the package directory (this.packageDir above, likely 'pkg')
-         */
-        manifestFile: string;
-
-        /**
-         * The name of the project
-         */
-		name: string;
-
-		/**
-		 * If set to true, uses the `jar` utility to create a .jar archive of the pagckage
-		 */
-		needJar: boolean;
-
-		/**
-         * If set to true, uses the `tar` utility to create a gzip .tgz archive of the pagckage
-         */
-        needTar: boolean;
-
-        /**
-         * If set to true, uses the `tar` utility to create a bzip2 .bz2 archive of the pagckage
-         */
-		needTarBz2: boolean;
-
-		/**
-         * If set to true, uses the `zip` utility to create a .zip archive of the pagckage
-		 */
-		needZip: boolean;
-
-		/**
-		 * The list of files and directories to include in the package-archive
-         */
-        packageFiles: FileList;
-
-        /**
-         * The shell-command to use for creating tar archives.
-         */
-        tarCommand: string;
-
-        /**
-         * The project version-string
-		 */
-		version: string;
-
-		/**
-		 * The shell-command to use for creating zip archives.
-		 */
-		zipCommand: string;
-
-	}
-
-	export class TestTask{
-		constructor(name:string, definition?:()=>void);
-	}
-
-	export class NpmPublishTask{
-		constructor(name:string, packageFiles:string[]);
-		constructor(name:string, definition?:()=>void);
-	}
-
-	export function addListener(event: string, listener: Function): NodeJS.EventEmitter;
-	export function on(event: string, listener: Function): NodeJS.EventEmitter;
-	export function once(event: string, listener: Function): NodeJS.EventEmitter;
-	export function removeListener(event: string, listener: Function): NodeJS.EventEmitter;
-	export function removeAllListener(event: string): NodeJS.EventEmitter;
-	export function setMaxListeners(n: number): void;
-	export function listeners(event: string): Function[];
-	export function emit(event: string, ...args: any[]): boolean;
-}
diff --git a/jake/tsconfig.json b/jake/tsconfig.json
new file mode 100644
index 0000000000..f9ba1b2a02
--- /dev/null
+++ b/jake/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jake-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jasmine-ajax/jasmine-ajax.d.ts b/jasmine-ajax/index.d.ts
similarity index 100%
rename from jasmine-ajax/jasmine-ajax.d.ts
rename to jasmine-ajax/index.d.ts
diff --git a/jasmine-ajax/jasmine-ajax-tests.ts b/jasmine-ajax/jasmine-ajax-tests.ts
index 14253b80af..8cea33e453 100644
--- a/jasmine-ajax/jasmine-ajax-tests.ts
+++ b/jasmine-ajax/jasmine-ajax-tests.ts
@@ -3,8 +3,8 @@
  * By Louis Grignon
  */
 
-/// <reference path="../jasmine/jasmine.d.ts" />
-/// <reference path="jasmine-ajax.d.ts" />
+/// <reference types="jasmine" />
+
 
 declare function getJasmineRequireObj();
 
diff --git a/jasmine-ajax/jasmine-ajax-tests.ts.tscparams b/jasmine-ajax/jasmine-ajax-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jasmine-ajax/jasmine-ajax-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jasmine-ajax/tsconfig.json b/jasmine-ajax/tsconfig.json
new file mode 100644
index 0000000000..ebcbb7c599
--- /dev/null
+++ b/jasmine-ajax/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jasmine-ajax-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jasmine-data_driven_tests/jasmine-data_driven_tests.d.ts b/jasmine-data_driven_tests/index.d.ts
similarity index 100%
rename from jasmine-data_driven_tests/jasmine-data_driven_tests.d.ts
rename to jasmine-data_driven_tests/index.d.ts
diff --git a/jasmine-data_driven_tests/jasmine-data_driven_tests-tests.ts b/jasmine-data_driven_tests/jasmine-data_driven_tests-tests.ts
index df48df8cfb..e14f89b7ad 100644
--- a/jasmine-data_driven_tests/jasmine-data_driven_tests-tests.ts
+++ b/jasmine-data_driven_tests/jasmine-data_driven_tests-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="jasmine-data_driven_tests.d.ts" />
-/// <reference path="../jasmine/jasmine.d.ts" />
+
+/// <reference types="jasmine" />
 
 all("A data driven test is a suite with multiple specs",
     ['a', 'b', 'c'],
diff --git a/jasmine-data_driven_tests/tsconfig.json b/jasmine-data_driven_tests/tsconfig.json
new file mode 100644
index 0000000000..df17df0066
--- /dev/null
+++ b/jasmine-data_driven_tests/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jasmine-data_driven_tests-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jasmine-es6-promise-matchers/index.d.ts b/jasmine-es6-promise-matchers/index.d.ts
new file mode 100644
index 0000000000..493a6a5312
--- /dev/null
+++ b/jasmine-es6-promise-matchers/index.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for jasmine-es6-promise-matchers
+// Project: https://github.com/bvaughn/jasmine-es6-promise-matchers
+// Definitions by: Stephen Lautier <https://github.com/stephenlautier>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jasmine" />
+
+declare namespace JasminePromiseMatchers  {
+	export function install():void;
+	export function uninstall():void;
+}
+
+declare namespace jasmine {
+
+	interface Matchers {
+		/**
+		 * Verifies that a Promise is (or has been) rejected.
+		 */
+		toBeRejected(done?: () => void): boolean;
+
+		/**
+		 * Verifies that a Promise is (or has been) rejected with the specified parameter.
+		 */
+		toBeRejectedWith(value: any, done?: () => void): boolean;
+
+		/**
+		 * Verifies that a Promise is (or has been) resolved.
+		 */
+		toBeResolved(done?: () => void): boolean;
+
+		/**
+		 * Verifies that a Promise is (or has been) resolved with the specified parameter.
+		 */
+		toBeResolvedWith(value: any, done?: () => void): boolean;
+	}
+}
diff --git a/jasmine-es6-promise-matchers/jasmine-es6-promise-matchers-tests.ts b/jasmine-es6-promise-matchers/jasmine-es6-promise-matchers-tests.ts
index d2917e7612..148725ca29 100644
--- a/jasmine-es6-promise-matchers/jasmine-es6-promise-matchers-tests.ts
+++ b/jasmine-es6-promise-matchers/jasmine-es6-promise-matchers-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jasmine-es6-promise-matchers.d.ts" />
+
 
 describe('specs', () => {
 	beforeEach(() => {
diff --git a/jasmine-es6-promise-matchers/jasmine-es6-promise-matchers.d.ts b/jasmine-es6-promise-matchers/jasmine-es6-promise-matchers.d.ts
deleted file mode 100644
index 302c211c70..0000000000
--- a/jasmine-es6-promise-matchers/jasmine-es6-promise-matchers.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Type definitions for jasmine-es6-promise-matchers
-// Project: https://github.com/bvaughn/jasmine-es6-promise-matchers
-// Definitions by: Stephen Lautier <https://github.com/stephenlautier>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jasmine/jasmine.d.ts" />
-
-declare namespace JasminePromiseMatchers  {
-	export function install():void;
-	export function uninstall():void;
-}
-
-declare namespace jasmine {
-
-	interface Matchers {
-		/**
-		 * Verifies that a Promise is (or has been) rejected.
-		 */
-		toBeRejected(done?: () => void): boolean;
-
-		/**
-		 * Verifies that a Promise is (or has been) rejected with the specified parameter.
-		 */
-		toBeRejectedWith(value: any, done?: () => void): boolean;
-
-		/**
-		 * Verifies that a Promise is (or has been) resolved.
-		 */
-		toBeResolved(done?: () => void): boolean;
-
-		/**
-		 * Verifies that a Promise is (or has been) resolved with the specified parameter.
-		 */
-		toBeResolvedWith(value: any, done?: () => void): boolean;
-	}
-}
diff --git a/jasmine-es6-promise-matchers/tsconfig.json b/jasmine-es6-promise-matchers/tsconfig.json
new file mode 100644
index 0000000000..35dfcb26d9
--- /dev/null
+++ b/jasmine-es6-promise-matchers/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jasmine-es6-promise-matchers-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jasmine-expect/index.d.ts b/jasmine-expect/index.d.ts
new file mode 100644
index 0000000000..98ef2ede0e
--- /dev/null
+++ b/jasmine-expect/index.d.ts
@@ -0,0 +1,92 @@
+// Type definitions for jasmine-expect 2.0.0-beta2
+// Project: https://github.com/JamieMason/Jasmine-Matchers
+// Definitions by: UserPixel <https://github.com/UserPixel>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jasmine" />
+
+declare namespace jasmine {
+  interface Matchers {
+    // These functions are written in the order defined in the src directory of jasmine-matchers
+    // The type system is used smartly whenever it can provide value (by looking at the code of every matcher)
+    toBeAfter(otherDate: Date): boolean; //
+    toBeArray(): boolean; //
+    toBeArrayOfBooleans(): boolean; //
+    toBeArrayOfNumbers(): boolean;
+    toBeArrayOfObjects(): boolean;
+    toBeArrayOfSize(size: number): boolean;
+    toBeArrayOfStrings(): boolean;
+    toBeBefore(otherDate: Date): boolean; //
+    toBeBoolean(): boolean;
+    toBeCalculable(): boolean;
+    toBeDate(): boolean;
+    toBeEmptyArray(): boolean;
+    toBeEmptyObject(): boolean;
+    toBeEmptyString(): boolean;
+    toBeEvenNumber(): boolean;
+    toBeFalse(): boolean;
+    toBeFunction(): boolean;
+    toBeHtmlString(): boolean;
+    toBeIso8601(): boolean;
+    toBeJsonString(): boolean;
+    toBeLongerThan(other: string): boolean;
+    toBeNonEmptyArray(): boolean;
+    toBeNonEmptyObject(): boolean;
+    toBeNonEmptyString(): boolean;
+    toBeNumber(): boolean;
+    toBeObject(): boolean;
+    toBeOddNumber(): boolean;
+    toBeSameLengthAs(other: string): boolean;
+    toBeShorterThan(other: string): boolean;
+    toBeString(): boolean;
+    toBeTrue(): boolean;
+    toBeWhitespace(): boolean;
+    toBeWholeNumber(): boolean;
+    toBeWithinRange(floor: number, ceiling: number): boolean;
+
+    toEndWith(subString: string): boolean;
+
+    toHaveArray(key: string): boolean;
+    toHaveArrayOfBooleans(key: string): boolean;
+    toHaveArrayOfNumbers(key: string): boolean;
+    toHaveArrayOfObjects(key: string): boolean;
+    toHaveArrayOfSize(key: string, size?: number): boolean;
+    toHaveArrayOfStrings(key: string): boolean;
+    toHaveBoolean(key: string): boolean;
+    toHaveCalculable(key: string): boolean;
+    toHaveDate(key: string): boolean;
+    toHaveDateAfter(key: string, otherDate: Date): boolean;
+    toHaveDateBefore(key: string, otherDate: Date): boolean;
+    toHaveEmptyArray(key: string): boolean;
+    toHaveEmptyObject(key: string): boolean;
+    toHaveEmptyString(key: string): boolean;
+    toHaveEvenNumber(key: string): boolean;
+    toHaveFalse(key: string): boolean;
+    toHaveHtmlString(key: string): boolean;
+    toHaveIso8601(key: string): boolean;
+    toHaveJsonString(key: string): boolean;
+    toHaveMember(key: string): boolean;
+    toHaveMethod(key: string): boolean;
+    toHaveNonEmptyArray(key: string): boolean;
+    toHaveNonEmptyObject(key: string): boolean;
+    toHaveNonEmptyString(key: string): boolean;
+    toHaveNumber(key: string): boolean;
+    toHaveNumberWithinRange(key: string, floor: number, ceiling: number): boolean;
+    toHaveObject(key: string): boolean;
+    toHaveOddNumber(key: string): boolean;
+    toHaveString(key: string): boolean;
+    toHaveStringLongerThan(key: string, other: string): boolean;
+    toHaveStringSameLengthAs(key: string, other: string): boolean;
+    toHaveStringShorterThan(key: string, other: string): boolean;
+    toHaveTrue(key: string): boolean;
+    toHaveWhitespaceString(key: string): boolean;
+    toHaveWholeNumber(key: string): boolean;
+
+    toImplement(api: {}): boolean;
+
+    toStartWith(subString: string): boolean;
+
+    toThrowAnyError(): boolean;
+    toThrowErrorOfType(type: string): boolean;
+  }
+}
diff --git a/jasmine-expect/jasmine-expect-tests.ts b/jasmine-expect/jasmine-expect-tests.ts
index ec54269f4d..7753cc7381 100644
--- a/jasmine-expect/jasmine-expect-tests.ts
+++ b/jasmine-expect/jasmine-expect-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jasmine/jasmine.d.ts" />
-/// <reference path="jasmine-expect.d.ts" />
+/// <reference types="jasmine" />
+
 
 // Taken directly from the test directory of the original repo
 
diff --git a/jasmine-expect/jasmine-expect.d.ts b/jasmine-expect/jasmine-expect.d.ts
deleted file mode 100644
index 851b4a87b6..0000000000
--- a/jasmine-expect/jasmine-expect.d.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-// Type definitions for jasmine-expect 2.0.0-beta2
-// Project: https://github.com/JamieMason/Jasmine-Matchers
-// Definitions by: UserPixel <https://github.com/UserPixel>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jasmine/jasmine.d.ts" />
-
-declare namespace jasmine {
-  interface Matchers {
-    // These functions are written in the order defined in the src directory of jasmine-matchers
-    // The type system is used smartly whenever it can provide value (by looking at the code of every matcher)
-    toBeAfter(otherDate: Date): boolean; //
-    toBeArray(): boolean; //
-    toBeArrayOfBooleans(): boolean; //
-    toBeArrayOfNumbers(): boolean;
-    toBeArrayOfObjects(): boolean;
-    toBeArrayOfSize(size: number): boolean;
-    toBeArrayOfStrings(): boolean;
-    toBeBefore(otherDate: Date): boolean; //
-    toBeBoolean(): boolean;
-    toBeCalculable(): boolean;
-    toBeDate(): boolean;
-    toBeEmptyArray(): boolean;
-    toBeEmptyObject(): boolean;
-    toBeEmptyString(): boolean;
-    toBeEvenNumber(): boolean;
-    toBeFalse(): boolean;
-    toBeFunction(): boolean;
-    toBeHtmlString(): boolean;
-    toBeIso8601(): boolean;
-    toBeJsonString(): boolean;
-    toBeLongerThan(other: string): boolean;
-    toBeNonEmptyArray(): boolean;
-    toBeNonEmptyObject(): boolean;
-    toBeNonEmptyString(): boolean;
-    toBeNumber(): boolean;
-    toBeObject(): boolean;
-    toBeOddNumber(): boolean;
-    toBeSameLengthAs(other: string): boolean;
-    toBeShorterThan(other: string): boolean;
-    toBeString(): boolean;
-    toBeTrue(): boolean;
-    toBeWhitespace(): boolean;
-    toBeWholeNumber(): boolean;
-    toBeWithinRange(floor: number, ceiling: number): boolean;
-
-    toEndWith(subString: string): boolean;
-
-    toHaveArray(key: string): boolean;
-    toHaveArrayOfBooleans(key: string): boolean;
-    toHaveArrayOfNumbers(key: string): boolean;
-    toHaveArrayOfObjects(key: string): boolean;
-    toHaveArrayOfSize(key: string, size?: number): boolean;
-    toHaveArrayOfStrings(key: string): boolean;
-    toHaveBoolean(key: string): boolean;
-    toHaveCalculable(key: string): boolean;
-    toHaveDate(key: string): boolean;
-    toHaveDateAfter(key: string, otherDate: Date): boolean;
-    toHaveDateBefore(key: string, otherDate: Date): boolean;
-    toHaveEmptyArray(key: string): boolean;
-    toHaveEmptyObject(key: string): boolean;
-    toHaveEmptyString(key: string): boolean;
-    toHaveEvenNumber(key: string): boolean;
-    toHaveFalse(key: string): boolean;
-    toHaveHtmlString(key: string): boolean;
-    toHaveIso8601(key: string): boolean;
-    toHaveJsonString(key: string): boolean;
-    toHaveMember(key: string): boolean;
-    toHaveMethod(key: string): boolean;
-    toHaveNonEmptyArray(key: string): boolean;
-    toHaveNonEmptyObject(key: string): boolean;
-    toHaveNonEmptyString(key: string): boolean;
-    toHaveNumber(key: string): boolean;
-    toHaveNumberWithinRange(key: string, floor: number, ceiling: number): boolean;
-    toHaveObject(key: string): boolean;
-    toHaveOddNumber(key: string): boolean;
-    toHaveString(key: string): boolean;
-    toHaveStringLongerThan(key: string, other: string): boolean;
-    toHaveStringSameLengthAs(key: string, other: string): boolean;
-    toHaveStringShorterThan(key: string, other: string): boolean;
-    toHaveTrue(key: string): boolean;
-    toHaveWhitespaceString(key: string): boolean;
-    toHaveWholeNumber(key: string): boolean;
-
-    toImplement(api: {}): boolean;
-
-    toStartWith(subString: string): boolean;
-
-    toThrowAnyError(): boolean;
-    toThrowErrorOfType(type: string): boolean;
-  }
-}
diff --git a/jasmine-expect/tsconfig.json b/jasmine-expect/tsconfig.json
new file mode 100644
index 0000000000..f6d5fe803f
--- /dev/null
+++ b/jasmine-expect/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jasmine-expect-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jasmine-fixture/jasmine-fixture.d.ts b/jasmine-fixture/index.d.ts
similarity index 100%
rename from jasmine-fixture/jasmine-fixture.d.ts
rename to jasmine-fixture/index.d.ts
diff --git a/jasmine-fixture/jasmine-fixture-tests.ts b/jasmine-fixture/jasmine-fixture-tests.ts
index 1246aafbd3..b0ec42d512 100644
--- a/jasmine-fixture/jasmine-fixture-tests.ts
+++ b/jasmine-fixture/jasmine-fixture-tests.ts
@@ -1,7 +1,7 @@
-/// <reference path="../jasmine/jasmine.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../jasmine-jquery/jasmine-jquery.d.ts" />
-/// <reference path="jasmine-fixture.d.ts" />
+/// <reference types="jasmine" />
+/// <reference types="jquery" />
+/// <reference types="jasmine-jquery" />
+
 
 describe("Jasmine fixture extension", () => {
     describe("Affixes dom elements to body", () => {
diff --git a/jasmine-fixture/tsconfig.json b/jasmine-fixture/tsconfig.json
new file mode 100644
index 0000000000..dbb73dcca3
--- /dev/null
+++ b/jasmine-fixture/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jasmine-fixture-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jasmine-jquery/index.d.ts b/jasmine-jquery/index.d.ts
new file mode 100644
index 0000000000..cfca2cc265
--- /dev/null
+++ b/jasmine-jquery/index.d.ts
@@ -0,0 +1,388 @@
+// Type definitions for Jasmine-JQuery 1.5.8
+// Project: https://github.com/velesin/jasmine-jquery
+// Definitions by: Gregor Stamac <https://github.com/gstamac/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jasmine"/>
+/// <reference types="jquery"/>
+
+declare function sandbox(attributes?: any): string;
+
+declare function readFixtures(...uls: string[]): string;
+declare function preloadFixtures(...uls: string[]) : void;
+declare function loadFixtures(...uls: string[]): void;
+declare function appendLoadFixtures(...uls: string[]): void;
+declare function setFixtures(html: string): string;
+declare function appendSetFixtures(html: string) : void;
+
+declare function preloadStyleFixtures(...uls: string[]) : void;
+declare function loadStyleFixtures(...uls: string[]) : void;
+declare function appendLoadStyleFixtures(...uls: string[]) : void;
+declare function setStyleFixtures(html: string) : void;
+declare function appendSetStyleFixtures(html: string) : void;
+
+declare function loadJSONFixtures(...uls: string[]): jasmine.JSONFixtures;
+declare function getJSONFixture(url: string): any;
+
+declare function spyOnEvent(selector: string, eventName: string): jasmine.JQueryEventSpy;
+
+declare namespace jasmine {
+    function spiedEventsKey(selector: JQuery, eventName: string): string;
+
+    function getFixtures(): Fixtures;
+    function getStyleFixtures(): StyleFixtures;
+    function getJSONFixtures(): JSONFixtures;
+
+    interface Fixtures {
+        fixturesPath: string;
+        containerId: string;
+        set(html: string): string;
+        appendSet(html: string): void;
+        preload(...uls: string[]): void;
+        load(...uls: string[]): void;
+        appendLoad(...uls: string[]): void;
+        read(...uls: string[]): string;
+        clearCache(): void;
+        cleanUp(): void;
+        sandbox(attributes?: any): string;
+        createContainer_(html: string) : string;
+        addToContainer_(html: string): void;
+        getFixtureHtml_(url: string): string;
+        loadFixtureIntoCache_(relativeUrl: string): void;
+        makeFixtureUrl_(relativeUrl: string): string;
+        proxyCallTo_(methodName: string, passedArguments: any): any;
+    }
+
+    interface StyleFixtures {
+        fixturesPath: string;
+        set(html: string): string;
+        appendSet(html: string): void;
+        preload(...uls: string[]) : void;
+        load(...uls: string[]) : void;
+        appendLoad(...uls: string[]) : void;
+        read_(...uls: string[]): string;
+        clearCache() : void;
+        cleanUp() : void;
+        createStyle_(html: string) : void;
+        getFixtureHtml_(url: string): string;
+        loadFixtureIntoCache_(relativeUrl: string) : void;
+        makeFixtureUrl_(relativeUrl: string): string;
+        proxyCallTo_(methodName: string, passedArguments: any): any;
+    }
+
+    interface JSONFixtures {
+        fixturesPath: string;
+        load(...uls: string[]): void;
+        read(...uls: string[]): string;
+        clearCache(): void;
+        getFixtureData_(url: string): any;
+        loadFixtureIntoCache_(relativeUrl: string): void;
+        proxyCallTo_(methodName: string, passedArguments: any): any;
+    }
+
+    interface Matchers {
+        /**
+         * Check if DOM element has class.
+         *
+         * @param className Name of the class to check.
+         *
+         * @example
+         * // returns true
+         * expect($('<div class="some-class"></div>')).toHaveClass("some-class")
+         */
+        toHaveClass(className: string): boolean;
+
+        /**
+         * Check if DOM element has the given CSS properties.
+         *
+         * @param css Object containing the properties (and values) to check.
+         *
+         * @example
+         * // returns true
+         * expect($('<div style="display: none; margin: 10px;"></div>')).toHaveCss({display: "none", margin: "10px"})
+         *
+         * @example
+         * // returns true
+         * expect($('<div style="display: none; margin: 10px;"></div>')).toHaveCss({margin: "10px"})
+         */
+        toHaveCss(css: any): boolean;
+
+        /**
+         * Checks if DOM element is visible.
+         * Elements are considered visible if they consume space in the document. Visible elements have a width or height that is greater than zero.
+         */
+        toBeVisible(): boolean;
+        /**
+         * Check if DOM element is hidden.
+         * Elements can be hidden for several reasons:
+         * - They have a CSS display value of none ;
+         * - They are form elements with type equal to hidden.
+         * - Their width and height are explicitly set to 0.
+         * - An ancestor element is hidden, so the element is not shown on the page.
+         */
+        toBeHidden(): boolean;
+
+        /**
+         * Only for tags that have checked attribute
+         *
+         * @example
+         * // returns true
+         * expect($('<option selected="selected"></option>')).toBeSelected()
+         */
+        toBeSelected(): boolean;
+
+        /**
+         * Only for tags that have checked attribute
+         * @example
+         * // returns true
+         * expect($('<input type="checkbox" checked="checked"/>')).toBeChecked()
+         */
+        toBeChecked(): boolean;
+
+        /**
+         * Checks for child DOM elements or text
+         */
+        toBeEmpty(): boolean;
+
+        /**
+         * Checks if element exists in or out the DOM.
+         */
+        toExist(): boolean;
+
+        /**
+         * Checks if array has the given length.
+         *
+         * @param length Expected length
+         */
+        toHaveLength(length: number): boolean;
+
+        /**
+         * Check if DOM element contains an attribute and, optionally, if the value of the attribute is equal to the expected one.
+         *
+         * @param attributeName Name of the attribute to check
+         * @param expectedAttributeValue Expected attribute value
+         */
+        toHaveAttr(attributeName: string, expectedAttributeValue? : any): boolean;
+
+        /**
+         * Check if DOM element contains a property and, optionally, if the value of the property is equal to the expected one.
+         *
+         * @param propertyName Property name to check
+         * @param expectedPropertyValue Expected property value
+         */
+        toHaveProp(propertyName: string, expectedPropertyValue? : any): boolean;
+
+        /**
+         * Check if DOM element has the given Id
+         *
+         * @param Id Expected identifier
+         */
+        toHaveId(id: string): boolean;
+
+        /**
+         * Check if DOM element has the specified HTML.
+         *
+         * @example
+         * // returns true
+         * expect($('<div><span></span></div>')).toHaveHtml('<span></span>')
+         */
+        toHaveHtml(html: string): boolean;
+
+        /**
+         * Check if DOM element contains the specified HTML.
+         *
+         * @example
+         * // returns true
+         * expect($('<div><ul></ul><h1>header</h1></div>')).toContainHtml('<ul></ul>')
+         */
+        toContainHtml(html: string): boolean;
+
+        /**
+         * Check if DOM element has the given Text.
+         * @param text Accepts a string or regular expression
+         *
+         * @example
+         * // returns true
+         * expect($('<div>some text</div>')).toHaveText('some text')
+         */
+        toHaveText(text: string): boolean;
+        /**
+         * Check if DOM element contains the specified text.
+         *
+         * @example
+         * // returns true
+         * expect($('<div><ul></ul><h1>header</h1></div>')).toContainText('header')
+         */
+        toContainText(text: string): boolean;
+
+        /**
+         * Check if DOM element has the given value.
+         * This can only be applied for element on with jQuery val() can be called.
+         *
+         * @example
+         * // returns true
+         * expect($('<input type="text" value="some text"/>')).toHaveValue('some text')
+         */
+        toHaveValue(value : string): boolean;
+
+        /**
+         * Check if DOM element has the given data.
+         * This can only be applied for element on with jQuery data(key) can be called.
+         *
+         */
+        toHaveData(key : string, expectedValue : string): boolean;
+        toBe(selector: JQuery): boolean;
+
+        /**
+         * Check if DOM element is matched by the given selector.
+         *
+         * @example
+         * // returns true
+         * expect($('<div><span class="some-class"></span></div>')).toContain('some-class')
+         */
+        toContain(selector: JQuery): boolean;
+
+        /**
+         * Check if DOM element exists inside the given parent element.
+         *
+         * @example
+         * // returns true
+         * expect($('<div><span class="some-class"></span></div>')).toContainElement('span.some-class')
+         */
+        toContainElement(selector: string): boolean;
+
+        /**
+         * Check to see if the set of matched elements matches the given selector
+         *
+         * @example
+         * expect($('<span></span>').addClass('js-something')).toBeMatchedBy('.js-something')
+         *
+         * @returns {Boolean} true if DOM contains the element
+         */
+        toBeMatchedBy(selector: string): boolean;
+
+        /**
+         * Only for tags that have disabled attribute
+         * @example
+         * // returns true
+         * expect('<input type="submit" disabled="disabled"/>').toBeDisabled()
+         */
+        toBeDisabled(): boolean;
+
+        /**
+         * Check if DOM element is focused
+         * @example
+         * // returns true
+         * expect($('<input type="text" />').focus()).toBeFocused()
+         */
+        toBeFocused(): boolean;
+
+        /**
+         * Checks if DOM element handles event.
+         *
+         * @example
+         * // returns true
+         * expect($form).toHandle("submit")
+         */
+        toHandle(eventName: string): boolean;
+
+        /**
+         * Assigns a callback to an event of the DOM element.
+         *
+         * @param eventName Name of the event to assign the callback to.
+         * @param eventHandler Callback function to be assigned.
+         *
+         * @example
+         * expect($form).toHandleWith("submit", yourSubmitCallback)
+         */
+        toHandleWith(eventName: string, eventHandler : JQueryCallback): boolean;
+
+        /**
+         * Checks if event was triggered.
+         */
+        toHaveBeenTriggered(): boolean;
+
+        /**
+         * Checks if the event has been triggered on selector.
+         * @param selector Selector that should have triggered the event.
+         */
+        toHaveBeenTriggeredOn(selector: string): boolean;
+
+        /**
+         * Checks if the event has been triggered on selector.
+         * @param selector Selector that should have triggered the event.
+         * @param args Extra arguments to be passed to jQuery events functions.
+         */
+        toHaveBeenTriggeredOnAndWith(selector: string, ...args: any[]): boolean;
+
+        /**
+         * Checks if event propagation has been prevented.
+         */
+        toHaveBeenPrevented(): boolean;
+
+        /**
+         * Checks if event propagation has been prevented on element with selector.
+         *
+         * @param selector Selector that should have prevented the event.
+         */
+        toHaveBeenPreventedOn(selector: string): boolean;
+
+        /**
+         * Checks if event propagation has been stopped.
+         *
+         * @example
+         * // returns true
+         * var spyEvent = spyOnEvent('#some_element', 'click')
+         * $('#some_element').click(function (event){event.stopPropagation();})
+         * $('#some_element').click()
+         * expect(spyEvent).toHaveBeenStopped()
+         */
+        toHaveBeenStopped(): boolean;
+
+        /**
+         * Checks if event propagation has been stopped by an element with the given selector.
+         * @param selector Selector of the element that should have stopped the event propagation.
+         *
+         * @example
+         * // returns true
+         * $('#some_element').click(function (event){event.stopPropagation();})
+         * $('#some_element').click()
+         * expect('click').toHaveBeenStoppedOn('#some_element')
+         */
+        toHaveBeenStoppedOn(selector: string): boolean;
+
+        /**
+         * Checks to see if the matched element is attached to the DOM.
+         * @example
+         * expect($('#id-name')[0]).toBeInDOM()
+         */
+        toBeInDOM(): boolean;
+
+    }
+
+    interface JQueryEventSpy {
+        selector: string;
+        eventName: string;
+        handler(eventObject: JQueryEventObject): any;
+        reset(): any;
+    }
+
+    interface JasmineJQuery {
+        browserTagCaseIndependentHtml(html: string): string;
+        elementToString(element: JQuery): string;
+        matchersClass: any;
+        events: JasmineJQueryEvents;
+    }
+
+    interface JasmineJQueryEvents {
+        spyOn(selector: string, eventName: string): JQueryEventSpy;
+        args(selector: string, eventName: string): any;
+        wasTriggered(selector: string, eventName: string): boolean;
+        wasTriggeredWith(selector: string, eventName: string, expectedArgs: any, env: jasmine.Env): boolean;
+        wasPrevented(selector: string, eventName: string): boolean;
+        wasStopped(selector: string, eventName: string): boolean;
+        cleanUp() : void;
+    }
+
+    var JQuery: JasmineJQuery;
+}
diff --git a/jasmine-jquery/jasmine-jquery-tests.ts b/jasmine-jquery/jasmine-jquery-tests.ts
index 1515f32ed2..67b349d45e 100644
--- a/jasmine-jquery/jasmine-jquery-tests.ts
+++ b/jasmine-jquery/jasmine-jquery-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="../jasmine/jasmine.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="jasmine-jquery.d.ts" />
+/// <reference types="jasmine" />
+/// <reference types="jquery" />
+
 
 describe("Jasmine jQuery extension", () => {
     it("Adds jQuery matchers", () => {
@@ -100,7 +100,6 @@ describe("Jasmine jQuery extension", () => {
 
         var data = getJSONFixture('myjsonfixture.json');
         var fixtures = loadJSONFixtures('myjsonfixture.json');
-        var data = fixtures['myjsonfixture.json'];
     });
 
     describe("Event Spies", () => {
diff --git a/jasmine-jquery/jasmine-jquery-tests.ts.tscparams b/jasmine-jquery/jasmine-jquery-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jasmine-jquery/jasmine-jquery-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jasmine-jquery/jasmine-jquery.d.ts b/jasmine-jquery/jasmine-jquery.d.ts
deleted file mode 100644
index ced8ef8103..0000000000
--- a/jasmine-jquery/jasmine-jquery.d.ts
+++ /dev/null
@@ -1,388 +0,0 @@
-// Type definitions for Jasmine-JQuery 1.5.8
-// Project: https://github.com/velesin/jasmine-jquery
-// Definitions by: Gregor Stamac <https://github.com/gstamac/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jasmine/jasmine.d.ts"/>
-/// <reference path="../jquery/jquery.d.ts"/>
-
-declare function sandbox(attributes?: any): string;
-
-declare function readFixtures(...uls: string[]): string;
-declare function preloadFixtures(...uls: string[]) : void;
-declare function loadFixtures(...uls: string[]): void;
-declare function appendLoadFixtures(...uls: string[]): void;
-declare function setFixtures(html: string): string;
-declare function appendSetFixtures(html: string) : void;
-
-declare function preloadStyleFixtures(...uls: string[]) : void;
-declare function loadStyleFixtures(...uls: string[]) : void;
-declare function appendLoadStyleFixtures(...uls: string[]) : void;
-declare function setStyleFixtures(html: string) : void;
-declare function appendSetStyleFixtures(html: string) : void;
-
-declare function loadJSONFixtures(...uls: string[]): jasmine.JSONFixtures;
-declare function getJSONFixture(url: string): any;
-
-declare function spyOnEvent(selector: string, eventName: string): jasmine.JQueryEventSpy;
-
-declare namespace jasmine {
-    function spiedEventsKey(selector: JQuery, eventName: string): string;
-
-    function getFixtures(): Fixtures;
-    function getStyleFixtures(): StyleFixtures;
-    function getJSONFixtures(): JSONFixtures;
-
-    interface Fixtures {
-        fixturesPath: string;
-        containerId: string;
-        set(html: string): string;
-        appendSet(html: string): void;
-        preload(...uls: string[]): void;
-        load(...uls: string[]): void;
-        appendLoad(...uls: string[]): void;
-        read(...uls: string[]): string;
-        clearCache(): void;
-        cleanUp(): void;
-        sandbox(attributes?: any): string;
-        createContainer_(html: string) : string;
-        addToContainer_(html: string): void;
-        getFixtureHtml_(url: string): string;
-        loadFixtureIntoCache_(relativeUrl: string): void;
-        makeFixtureUrl_(relativeUrl: string): string;
-        proxyCallTo_(methodName: string, passedArguments: any): any;
-    }
-
-    interface StyleFixtures {
-        fixturesPath: string;
-        set(html: string): string;
-        appendSet(html: string): void;
-        preload(...uls: string[]) : void;
-        load(...uls: string[]) : void;
-        appendLoad(...uls: string[]) : void;
-        read_(...uls: string[]): string;
-        clearCache() : void;
-        cleanUp() : void;
-        createStyle_(html: string) : void;
-        getFixtureHtml_(url: string): string;
-        loadFixtureIntoCache_(relativeUrl: string) : void;
-        makeFixtureUrl_(relativeUrl: string): string;
-        proxyCallTo_(methodName: string, passedArguments: any): any;
-    }
-
-    interface JSONFixtures {
-        fixturesPath: string;
-        load(...uls: string[]): void;
-        read(...uls: string[]): string;
-        clearCache(): void;
-        getFixtureData_(url: string): any;
-        loadFixtureIntoCache_(relativeUrl: string): void;
-        proxyCallTo_(methodName: string, passedArguments: any): any;
-    }
-
-    interface Matchers {
-        /**
-         * Check if DOM element has class.
-         *
-         * @param className Name of the class to check.
-         *
-         * @example
-         * // returns true
-         * expect($('<div class="some-class"></div>')).toHaveClass("some-class")
-         */
-        toHaveClass(className: string): boolean;
-
-        /**
-         * Check if DOM element has the given CSS properties.
-         *
-         * @param css Object containing the properties (and values) to check.
-         *
-         * @example
-         * // returns true
-         * expect($('<div style="display: none; margin: 10px;"></div>')).toHaveCss({display: "none", margin: "10px"})
-         *
-         * @example
-         * // returns true
-         * expect($('<div style="display: none; margin: 10px;"></div>')).toHaveCss({margin: "10px"})
-         */
-        toHaveCss(css: any): boolean;
-
-        /**
-         * Checks if DOM element is visible.
-         * Elements are considered visible if they consume space in the document. Visible elements have a width or height that is greater than zero.
-         */
-        toBeVisible(): boolean;
-        /**
-         * Check if DOM element is hidden.
-         * Elements can be hidden for several reasons:
-         * - They have a CSS display value of none ;
-         * - They are form elements with type equal to hidden.
-         * - Their width and height are explicitly set to 0.
-         * - An ancestor element is hidden, so the element is not shown on the page.
-         */
-        toBeHidden(): boolean;
-
-        /**
-         * Only for tags that have checked attribute
-         *
-         * @example
-         * // returns true
-         * expect($('<option selected="selected"></option>')).toBeSelected()
-         */
-        toBeSelected(): boolean;
-
-        /**
-         * Only for tags that have checked attribute
-         * @example
-         * // returns true
-         * expect($('<input type="checkbox" checked="checked"/>')).toBeChecked()
-         */
-        toBeChecked(): boolean;
-
-        /**
-         * Checks for child DOM elements or text
-         */
-        toBeEmpty(): boolean;
-
-        /**
-         * Checks if element exists in or out the DOM.
-         */
-        toExist(): boolean;
-
-        /**
-         * Checks if array has the given length.
-         *
-         * @param length Expected length
-         */
-        toHaveLength(length: number): boolean;
-
-        /**
-         * Check if DOM element contains an attribute and, optionally, if the value of the attribute is equal to the expected one.
-         *
-         * @param attributeName Name of the attribute to check
-         * @param expectedAttributeValue Expected attribute value
-         */
-        toHaveAttr(attributeName: string, expectedAttributeValue? : any): boolean;
-
-        /**
-         * Check if DOM element contains a property and, optionally, if the value of the property is equal to the expected one.
-         *
-         * @param propertyName Property name to check
-         * @param expectedPropertyValue Expected property value
-         */
-        toHaveProp(propertyName: string, expectedPropertyValue? : any): boolean;
-
-        /**
-         * Check if DOM element has the given Id
-         *
-         * @param Id Expected identifier
-         */
-        toHaveId(id: string): boolean;
-
-        /**
-         * Check if DOM element has the specified HTML.
-         *
-         * @example
-         * // returns true
-         * expect($('<div><span></span></div>')).toHaveHtml('<span></span>')
-         */
-        toHaveHtml(html: string): boolean;
-
-        /**
-         * Check if DOM element contains the specified HTML.
-         *
-         * @example
-         * // returns true
-         * expect($('<div><ul></ul><h1>header</h1></div>')).toContainHtml('<ul></ul>')
-         */
-        toContainHtml(html: string): boolean;
-
-        /**
-         * Check if DOM element has the given Text.
-         * @param text Accepts a string or regular expression
-         *
-         * @example
-         * // returns true
-         * expect($('<div>some text</div>')).toHaveText('some text')
-         */
-        toHaveText(text: string): boolean;
-        /**
-         * Check if DOM element contains the specified text.
-         *
-         * @example
-         * // returns true
-         * expect($('<div><ul></ul><h1>header</h1></div>')).toContainText('header')
-         */
-        toContainText(text: string): boolean;
-
-        /**
-         * Check if DOM element has the given value.
-         * This can only be applied for element on with jQuery val() can be called.
-         *
-         * @example
-         * // returns true
-         * expect($('<input type="text" value="some text"/>')).toHaveValue('some text')
-         */
-        toHaveValue(value : string): boolean;
-
-        /**
-         * Check if DOM element has the given data.
-         * This can only be applied for element on with jQuery data(key) can be called.
-         *
-         */
-        toHaveData(key : string, expectedValue : string): boolean;
-        toBe(selector: JQuery): boolean;
-
-        /**
-         * Check if DOM element is matched by the given selector.
-         *
-         * @example
-         * // returns true
-         * expect($('<div><span class="some-class"></span></div>')).toContain('some-class')
-         */
-        toContain(selector: JQuery): boolean;
-
-        /**
-         * Check if DOM element exists inside the given parent element.
-         *
-         * @example
-         * // returns true
-         * expect($('<div><span class="some-class"></span></div>')).toContainElement('span.some-class')
-         */
-        toContainElement(selector: string): boolean;
-
-        /**
-         * Check to see if the set of matched elements matches the given selector
-         *
-         * @example
-         * expect($('<span></span>').addClass('js-something')).toBeMatchedBy('.js-something')
-         *
-         * @returns {Boolean} true if DOM contains the element
-         */
-        toBeMatchedBy(selector: string): boolean;
-
-        /**
-         * Only for tags that have disabled attribute
-         * @example
-         * // returns true
-         * expect('<input type="submit" disabled="disabled"/>').toBeDisabled()
-         */
-        toBeDisabled(): boolean;
-
-        /**
-         * Check if DOM element is focused
-         * @example
-         * // returns true
-         * expect($('<input type="text" />').focus()).toBeFocused()
-         */
-        toBeFocused(): boolean;
-
-        /**
-         * Checks if DOM element handles event.
-         *
-         * @example
-         * // returns true
-         * expect($form).toHandle("submit")
-         */
-        toHandle(eventName: string): boolean;
-
-        /**
-         * Assigns a callback to an event of the DOM element.
-         *
-         * @param eventName Name of the event to assign the callback to.
-         * @param eventHandler Callback function to be assigned.
-         *
-         * @example
-         * expect($form).toHandleWith("submit", yourSubmitCallback)
-         */
-        toHandleWith(eventName: string, eventHandler : JQueryCallback): boolean;
-
-        /**
-         * Checks if event was triggered.
-         */
-        toHaveBeenTriggered(): boolean;
-
-        /**
-         * Checks if the event has been triggered on selector.
-         * @param selector Selector that should have triggered the event.
-         */
-        toHaveBeenTriggeredOn(selector: string): boolean;
-
-        /**
-         * Checks if the event has been triggered on selector.
-         * @param selector Selector that should have triggered the event.
-         * @param args Extra arguments to be passed to jQuery events functions.
-         */
-        toHaveBeenTriggeredOnAndWith(selector: string, ...args: any[]): boolean;
-
-        /**
-         * Checks if event propagation has been prevented.
-         */
-        toHaveBeenPrevented(): boolean;
-
-        /**
-         * Checks if event propagation has been prevented on element with selector.
-         *
-         * @param selector Selector that should have prevented the event.
-         */
-        toHaveBeenPreventedOn(selector: string): boolean;
-
-        /**
-         * Checks if event propagation has been stopped.
-         *
-         * @example
-         * // returns true
-         * var spyEvent = spyOnEvent('#some_element', 'click')
-         * $('#some_element').click(function (event){event.stopPropagation();})
-         * $('#some_element').click()
-         * expect(spyEvent).toHaveBeenStopped()
-         */
-        toHaveBeenStopped(): boolean;
-
-        /**
-         * Checks if event propagation has been stopped by an element with the given selector.
-         * @param selector Selector of the element that should have stopped the event propagation.
-         *
-         * @example
-         * // returns true
-         * $('#some_element').click(function (event){event.stopPropagation();})
-         * $('#some_element').click()
-         * expect('click').toHaveBeenStoppedOn('#some_element')
-         */
-        toHaveBeenStoppedOn(selector: string): boolean;
-
-        /**
-         * Checks to see if the matched element is attached to the DOM.
-         * @example
-         * expect($('#id-name')[0]).toBeInDOM()
-         */
-        toBeInDOM(): boolean;
-
-    }
-
-    interface JQueryEventSpy {
-        selector: string;
-        eventName: string;
-        handler(eventObject: JQueryEventObject): any;
-        reset(): any;
-    }
-
-    interface JasmineJQuery {
-        browserTagCaseIndependentHtml(html: string): string;
-        elementToString(element: JQuery): string;
-        matchersClass: any;
-        events: JasmineJQueryEvents;
-    }
-
-    interface JasmineJQueryEvents {
-        spyOn(selector: string, eventName: string): JQueryEventSpy;
-        args(selector: string, eventName: string): any;
-        wasTriggered(selector: string, eventName: string): boolean;
-        wasTriggeredWith(selector: string, eventName: string, expectedArgs: any, env: jasmine.Env): boolean;
-        wasPrevented(selector: string, eventName: string): boolean;
-        wasStopped(selector: string, eventName: string): boolean;
-        cleanUp() : void;
-    }
-
-    var JQuery: JasmineJQuery;
-}
diff --git a/jasmine-jquery/tsconfig.json b/jasmine-jquery/tsconfig.json
new file mode 100644
index 0000000000..8c150139fc
--- /dev/null
+++ b/jasmine-jquery/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jasmine-jquery-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jasmine-matchers/index.d.ts b/jasmine-matchers/index.d.ts
new file mode 100644
index 0000000000..23990c8364
--- /dev/null
+++ b/jasmine-matchers/index.d.ts
@@ -0,0 +1,69 @@
+// Type definitions for jasmine-matchers v0.2.1
+// Project: https://github.com/uxebu/jasmine-matchers
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*
+Typings 2013 Bart van der Schoor
+
+TypeScript tests auto-extracted from jasmine-matchers unit test.
+
+Original jasmine-matchers license applies:
+
+Copyright (C) 2013, uxebu Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+/// <reference types="jasmine" />
+
+declare namespace jasmine {
+    interface Matchers {
+
+        //toBe
+        toBeArray(): boolean;
+        toBeCloseToOneOf(values: any[], isCloseToFunction: (actual: number, expected: number) => boolean): boolean;
+        toBeInstanceOf(Constructor: Function): boolean;
+        toBeInRange(min: number, max: number): boolean;
+        toBeNan(): boolean;
+        toBeNumber(): boolean;
+        toBeOfType(type: string): boolean;
+        toBeOneOf(values: any[]): boolean;
+
+        //toContain
+        toContainOnce(value: any): boolean;
+
+        //toHave
+        toHaveBeenCalledXTimes(count:number): boolean;
+        toHaveLength(length:number): boolean;
+        toHaveOwnProperties(...names:string[]): boolean;
+        toHaveOwnPropertiesWithValues(obj:Object): boolean;
+        toHaveProperties(...names:string[]): boolean;
+        toHavePropertiesWithValues(obj:Object): boolean;
+        toExactlyHaveProperties(...names:string[]): boolean;
+
+        //toStartEndWith
+        toStartWith(value:any): boolean;
+        toStartWith(value:any[]): boolean;
+
+        toEndWith(value:any): boolean;
+        toEndWith(values:any[]): boolean;
+
+        toEachStartWith(searchString:string): boolean;
+        toSomeStartWith(searchString:string): boolean;
+
+        toEachEndWith(searchString:string): boolean;
+        toSomeEndWith(searchString:string): boolean;
+
+        toStartWithEither(...searchString:any[]): boolean;
+
+        //toThrow
+        toThrowInstanceOf(klass:Function): boolean;
+        toThrowStartsWith(text:string): boolean;
+    }
+}
+
diff --git a/jasmine-matchers/jasmine-matchers-tests.ts b/jasmine-matchers/jasmine-matchers-tests.ts
index f281b4a830..dc92e809dc 100644
--- a/jasmine-matchers/jasmine-matchers-tests.ts
+++ b/jasmine-matchers/jasmine-matchers-tests.ts
@@ -14,8 +14,8 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-/// <reference path="../jasmine/jasmine.d.ts" />
-/// <reference path="jasmine-matchers.d.ts" />
+/// <reference types="jasmine" />
+
 
 describe('toBeArray', function () {
     describe('matches', function () {
diff --git a/jasmine-matchers/jasmine-matchers.d.ts b/jasmine-matchers/jasmine-matchers.d.ts
deleted file mode 100644
index 6088ba0618..0000000000
--- a/jasmine-matchers/jasmine-matchers.d.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-// Type definitions for jasmine-matchers v0.2.1
-// Project: https://github.com/uxebu/jasmine-matchers
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/*
-Typings 2013 Bart van der Schoor
-
-TypeScript tests auto-extracted from jasmine-matchers unit test.
-
-Original jasmine-matchers license applies:
-
-Copyright (C) 2013, uxebu Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-/// <reference path="../jasmine/jasmine.d.ts" />
-
-declare namespace jasmine {
-    interface Matchers {
-
-        //toBe
-        toBeArray(): boolean;
-        toBeCloseToOneOf(values: any[], isCloseToFunction: (actual: number, expected: number) => boolean): boolean;
-        toBeInstanceOf(Constructor: Function): boolean;
-        toBeInRange(min: number, max: number): boolean;
-        toBeNan(): boolean;
-        toBeNumber(): boolean;
-        toBeOfType(type: string): boolean;
-        toBeOneOf(values: any[]): boolean;
-
-        //toContain
-        toContainOnce(value: any): boolean;
-
-        //toHave
-        toHaveBeenCalledXTimes(count:number): boolean;
-        toHaveLength(length:number): boolean;
-        toHaveOwnProperties(...names:string[]): boolean;
-        toHaveOwnPropertiesWithValues(obj:Object): boolean;
-        toHaveProperties(...names:string[]): boolean;
-        toHavePropertiesWithValues(obj:Object): boolean;
-        toExactlyHaveProperties(...names:string[]): boolean;
-
-        //toStartEndWith
-        toStartWith(value:any): boolean;
-        toStartWith(value:any[]): boolean;
-
-        toEndWith(value:any): boolean;
-        toEndWith(values:any[]): boolean;
-
-        toEachStartWith(searchString:string): boolean;
-        toSomeStartWith(searchString:string): boolean;
-
-        toEachEndWith(searchString:string): boolean;
-        toSomeEndWith(searchString:string): boolean;
-
-        toStartWithEither(...searchString:any[]): boolean;
-
-        //toThrow
-        toThrowInstanceOf(klass:Function): boolean;
-        toThrowStartsWith(text:string): boolean;
-    }
-}
-
diff --git a/jasmine-matchers/tsconfig.json b/jasmine-matchers/tsconfig.json
new file mode 100644
index 0000000000..385df27857
--- /dev/null
+++ b/jasmine-matchers/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jasmine-matchers-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jasmine-node/index.d.ts b/jasmine-node/index.d.ts
new file mode 100644
index 0000000000..e932a3529f
--- /dev/null
+++ b/jasmine-node/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for jasmine-node v1.14.5
+// Project: https://github.com/mhevery/jasmine-node
+// Definitions by: Sven Reglitzki <https://github.com/svi3c/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="jasmine"/>
+
+declare function it(expectation:string, assertion:(done:(err?:any) => void) => void, timeout?:number):void;
+
+interface ExecuteSpecsOptions {
+    specFolders: string[],
+    onComplete?: (runner:jasmine.Runner) => void,
+    isVerbose?: boolean,
+    showColors?: boolean,
+    teamcity?: string | boolean,
+    useRequireJs?: boolean,
+    regExpSpec: RegExp,
+    junitreport?: {
+        report: boolean,
+        savePath: string,
+        useDotNotation: boolean,
+        consolidate: boolean
+    },
+    includeStackTrace?: boolean,
+    growl?: boolean
+}
+
+interface JasmineNode {
+    executeSpecsInFolder(options:ExecuteSpecsOptions): void;
+    loadHelpersInFolder(path:string, pattern:RegExp): void;
+}
+
+declare var jasmine:JasmineNode;
+
+export = jasmine;
\ No newline at end of file
diff --git a/jasmine-node/jasmine-node-tests.ts b/jasmine-node/jasmine-node-tests.ts
index ca1615a676..9cf9540cfa 100644
--- a/jasmine-node/jasmine-node-tests.ts
+++ b/jasmine-node/jasmine-node-tests.ts
@@ -3,7 +3,7 @@
 // Definitions by: Sven Reglitzki <https://github.com/svi3c/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="jasmine-node.d.ts" />
+
 
 it("should have a timeout parameter", () => {}, 1000);
 it("should have an optional timeout parameter", () => {});
diff --git a/jasmine-node/jasmine-node.d.ts b/jasmine-node/jasmine-node.d.ts
deleted file mode 100644
index f547f844f6..0000000000
--- a/jasmine-node/jasmine-node.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-// Type definitions for jasmine-node v1.14.5
-// Project: https://github.com/mhevery/jasmine-node
-// Definitions by: Sven Reglitzki <https://github.com/svi3c/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../jasmine/legacy/jasmine-1.3.d.ts"/>
-
-declare function it(expectation:string, assertion:(done:(err?:any) => void) => void, timeout?:number):void;
-
-declare module "jasmine-node" {
-    interface ExecuteSpecsOptions {
-        specFolders: string[],
-        onComplete?: (runner:jasmine.Runner) => void,
-        isVerbose?: boolean,
-        showColors?: boolean,
-        teamcity?: string | boolean,
-        useRequireJs?: boolean,
-        regExpSpec: RegExp,
-        junitreport?: {
-            report: boolean,
-            savePath: string,
-            useDotNotation: boolean,
-            consolidate: boolean
-        },
-        includeStackTrace?: boolean,
-        growl?: boolean
-    }
-
-    interface JasmineNode {
-        executeSpecsInFolder(options:ExecuteSpecsOptions): void;
-        loadHelpersInFolder(path:string, pattern:RegExp): void;
-    }
-
-    var jasmine:JasmineNode;
-
-    export = jasmine;
-}
diff --git a/jasmine-node/tsconfig.json b/jasmine-node/tsconfig.json
new file mode 100644
index 0000000000..7a46356333
--- /dev/null
+++ b/jasmine-node/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jasmine-node-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jasmine-promise-matchers/index.d.ts b/jasmine-promise-matchers/index.d.ts
new file mode 100644
index 0000000000..1693c9fdca
--- /dev/null
+++ b/jasmine-promise-matchers/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for jasmine-promise-matchers
+// Project: https://github.com/bvaughn/jasmine-promise-matchers
+// Definitions by: Matthew Hill <https://github.com/matthewjh>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jasmine" />
+
+declare function installPromiseMatchers(): void;
+
+declare namespace jasmine {
+
+	interface Matchers {
+		/**
+		 * Verifies that a Promise is (or has been) rejected.
+		 */
+		toBeRejected(): boolean;
+
+		/**
+		 * Verifies that a Promise is (or has been) rejected with the specified parameter.
+		 */
+		toBeRejectedWith(value: any): boolean;
+
+		/**
+		 * Verifies that a Promise is (or has been) resolved.
+		 */
+		toBeResolved(): boolean;
+
+		/**
+		 * Verifies that a Promise is (or has been) resolved with the specified parameter.
+		 */
+		toBeResolvedWith(value: any): boolean;
+	}
+}
diff --git a/jasmine-promise-matchers/jasmine-promise-matchers-tests.ts b/jasmine-promise-matchers/jasmine-promise-matchers-tests.ts
index 28eb34aa1c..6ea4d32b94 100644
--- a/jasmine-promise-matchers/jasmine-promise-matchers-tests.ts
+++ b/jasmine-promise-matchers/jasmine-promise-matchers-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jasmine-promise-matchers.d.ts" />
+
 
 describe('something', () => {
 	beforeEach(() => {
diff --git a/jasmine-promise-matchers/jasmine-promise-matchers.d.ts b/jasmine-promise-matchers/jasmine-promise-matchers.d.ts
deleted file mode 100644
index 2c80fad7c0..0000000000
--- a/jasmine-promise-matchers/jasmine-promise-matchers.d.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// Type definitions for jasmine-promise-matchers
-// Project: https://github.com/bvaughn/jasmine-promise-matchers
-// Definitions by: Matthew Hill <https://github.com/matthewjh>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jasmine/jasmine.d.ts" />
-
-declare function installPromiseMatchers(): void;
-
-declare namespace jasmine {
-
-	interface Matchers {
-		/**
-		 * Verifies that a Promise is (or has been) rejected.
-		 */
-		toBeRejected(): boolean;
-
-		/**
-		 * Verifies that a Promise is (or has been) rejected with the specified parameter.
-		 */
-		toBeRejectedWith(value: any): boolean;
-
-		/**
-		 * Verifies that a Promise is (or has been) resolved.
-		 */
-		toBeResolved(): boolean;
-
-		/**
-		 * Verifies that a Promise is (or has been) resolved with the specified parameter.
-		 */
-		toBeResolvedWith(value: any): boolean;
-	}
-}
diff --git a/jasmine-promise-matchers/tsconfig.json b/jasmine-promise-matchers/tsconfig.json
new file mode 100644
index 0000000000..0f13d4d824
--- /dev/null
+++ b/jasmine-promise-matchers/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jasmine-promise-matchers-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jasmine/index.d.ts b/jasmine/index.d.ts
new file mode 100644
index 0000000000..911cd539cc
--- /dev/null
+++ b/jasmine/index.d.ts
@@ -0,0 +1,498 @@
+// Type definitions for Jasmine 2.2
+// Project: http://jasmine.github.io/
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Theodore Brown <https://github.com/theodorejb>, David Pärsson <https://github.com/davidparsson/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+// For ddescribe / iit use : https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/karma-jasmine/karma-jasmine.d.ts
+
+declare function describe(description: string, specDefinitions: () => void): void;
+declare function fdescribe(description: string, specDefinitions: () => void): void;
+declare function xdescribe(description: string, specDefinitions: () => void): void;
+
+declare function it(expectation: string, assertion?: (done: DoneFn) => void, timeout?: number): void;
+declare function fit(expectation: string, assertion?: (done: DoneFn) => void, timeout?: number): void;
+declare function xit(expectation: string, assertion?: (done: DoneFn) => void, timeout?: number): void;
+
+/** If you call the function pending anywhere in the spec body, no matter the expectations, the spec will be marked pending. */
+declare function pending(reason?: string): void;
+
+declare function beforeEach(action: (done: DoneFn) => void, timeout?: number): void;
+declare function afterEach(action: (done: DoneFn) => void, timeout?: number): void;
+
+declare function beforeAll(action: (done: DoneFn) => void, timeout?: number): void;
+declare function afterAll(action: (done: DoneFn) => void, timeout?: number): void;
+
+declare function expect(spy: Function): jasmine.Matchers;
+declare function expect(actual: any): jasmine.Matchers;
+
+declare function fail(e?: any): void;
+/** Action method that should be called when the async work is complete */
+interface DoneFn extends Function {
+    (): void;
+
+    /** fails the spec and indicates that it has completed. If the message is an Error, Error.message is used */
+    fail: (message?: Error|string) => void;
+}
+
+declare function spyOn(object: any, method: string): jasmine.Spy;
+
+declare function runs(asyncMethod: Function): void;
+declare function waitsFor(latchMethod: () => boolean, failureMessage?: string, timeout?: number): void;
+declare function waits(timeout?: number): void;
+
+declare namespace jasmine {
+
+    var clock: () => Clock;
+
+    function any(aclass: any): Any;
+    function anything(): Any;
+    function arrayContaining(sample: any[]): ArrayContaining;
+    function objectContaining(sample: any): ObjectContaining;
+    function createSpy(name: string, originalFn?: Function): Spy;
+    function createSpyObj(baseName: string, methodNames: any[]): any;
+    function createSpyObj<T>(baseName: string, methodNames: any[]): T;
+    function pp(value: any): string;
+    function getEnv(): Env;
+    function addCustomEqualityTester(equalityTester: CustomEqualityTester): void;
+    function addMatchers(matchers: CustomMatcherFactories): void;
+    function stringMatching(str: string): Any;
+    function stringMatching(str: RegExp): Any;
+
+    interface Any {
+
+        new (expectedClass: any): any;
+
+        jasmineMatches(other: any): boolean;
+        jasmineToString(): string;
+    }
+
+    // taken from TypeScript lib.core.es6.d.ts, applicable to CustomMatchers.contains()
+    interface ArrayLike<T> {
+        length: number;
+        [n: number]: T;
+    }
+
+    interface ArrayContaining {
+        new (sample: any[]): any;
+
+        asymmetricMatch(other: any): boolean;
+        jasmineToString(): string;
+    }
+
+    interface ObjectContaining {
+        new (sample: any): any;
+
+        jasmineMatches(other: any, mismatchKeys: any[], mismatchValues: any[]): boolean;
+        jasmineToString(): string;
+    }
+
+    interface Block {
+
+        new (env: Env, func: SpecFunction, spec: Spec): any;
+
+        execute(onComplete: () => void): void;
+    }
+
+    interface WaitsBlock extends Block {
+        new (env: Env, timeout: number, spec: Spec): any;
+    }
+
+    interface WaitsForBlock extends Block {
+        new (env: Env, timeout: number, latchFunction: SpecFunction, message: string, spec: Spec): any;
+    }
+
+    interface Clock {
+        install(): void;
+        uninstall(): void;
+        /** Calls to any registered callback are triggered when the clock is ticked forward via the jasmine.clock().tick function, which takes a number of milliseconds. */
+        tick(ms: number): void;
+        mockDate(date?: Date): void;
+    }
+
+    interface CustomEqualityTester {
+        (first: any, second: any): boolean;
+    }
+
+    interface CustomMatcher {
+        compare<T>(actual: T, expected: T): CustomMatcherResult;
+        compare(actual: any, expected: any): CustomMatcherResult;
+    }
+
+    interface CustomMatcherFactory {
+        (util: MatchersUtil, customEqualityTesters: Array<CustomEqualityTester>): CustomMatcher;
+    }
+
+    interface CustomMatcherFactories {
+        [index: string]: CustomMatcherFactory;
+    }
+
+    interface CustomMatcherResult {
+        pass: boolean;
+        message?: string;
+    }
+
+    interface MatchersUtil {
+        equals(a: any, b: any, customTesters?: Array<CustomEqualityTester>): boolean;
+        contains<T>(haystack: ArrayLike<T> | string, needle: any, customTesters?: Array<CustomEqualityTester>): boolean;
+        buildFailureMessage(matcherName: string, isNot: boolean, actual: any, ...expected: Array<any>): string;
+    }
+
+    interface Env {
+        setTimeout: any;
+        clearTimeout: void;
+        setInterval: any;
+        clearInterval: void;
+        updateInterval: number;
+
+        currentSpec: Spec;
+
+        matchersClass: Matchers;
+
+        version(): any;
+        versionString(): string;
+        nextSpecId(): number;
+        addReporter(reporter: Reporter): void;
+        execute(): void;
+        describe(description: string, specDefinitions: () => void): Suite;
+        // ddescribe(description: string, specDefinitions: () => void): Suite; Not a part of jasmine. Angular team adds these
+        beforeEach(beforeEachFunction: () => void): void;
+        beforeAll(beforeAllFunction: () => void): void;
+        currentRunner(): Runner;
+        afterEach(afterEachFunction: () => void): void;
+        afterAll(afterAllFunction: () => void): void;
+        xdescribe(desc: string, specDefinitions: () => void): XSuite;
+        it(description: string, func: () => void): Spec;
+        // iit(description: string, func: () => void): Spec; Not a part of jasmine. Angular team adds these
+        xit(desc: string, func: () => void): XSpec;
+        compareRegExps_(a: RegExp, b: RegExp, mismatchKeys: string[], mismatchValues: string[]): boolean;
+        compareObjects_(a: any, b: any, mismatchKeys: string[], mismatchValues: string[]): boolean;
+        equals_(a: any, b: any, mismatchKeys: string[], mismatchValues: string[]): boolean;
+        contains_(haystack: any, needle: any): boolean;
+        addCustomEqualityTester(equalityTester: CustomEqualityTester): void;
+        addMatchers(matchers: CustomMatcherFactories): void;
+        specFilter(spec: Spec): boolean;
+    }
+
+    interface FakeTimer {
+
+        new (): any;
+
+        reset(): void;
+        tick(millis: number): void;
+        runFunctionsWithinRange(oldMillis: number, nowMillis: number): void;
+        scheduleFunction(timeoutKey: any, funcToCall: () => void, millis: number, recurring: boolean): void;
+    }
+
+    interface HtmlReporter {
+        new (): any;
+    }
+
+    interface HtmlSpecFilter {
+        new (): any;
+    }
+
+    interface Result {
+        type: string;
+    }
+
+    interface NestedResults extends Result {
+        description: string;
+
+        totalCount: number;
+        passedCount: number;
+        failedCount: number;
+
+        skipped: boolean;
+
+        rollupCounts(result: NestedResults): void;
+        log(values: any): void;
+        getItems(): Result[];
+        addResult(result: Result): void;
+        passed(): boolean;
+    }
+
+    interface MessageResult extends Result  {
+        values: any;
+        trace: Trace;
+    }
+
+    interface ExpectationResult extends Result  {
+        matcherName: string;
+        passed(): boolean;
+        expected: any;
+        actual: any;
+        message: string;
+        trace: Trace;
+    }
+
+    interface Trace {
+        name: string;
+        message: string;
+        stack: any;
+    }
+
+    interface PrettyPrinter {
+
+        new (): any;
+
+        format(value: any): void;
+        iterateObject(obj: any, fn: (property: string, isGetter: boolean) => void): void;
+        emitScalar(value: any): void;
+        emitString(value: string): void;
+        emitArray(array: any[]): void;
+        emitObject(obj: any): void;
+        append(value: any): void;
+    }
+
+    interface StringPrettyPrinter extends PrettyPrinter {
+    }
+
+    interface Queue {
+
+        new (env: any): any;
+
+        env: Env;
+        ensured: boolean[];
+        blocks: Block[];
+        running: boolean;
+        index: number;
+        offset: number;
+        abort: boolean;
+
+        addBefore(block: Block, ensure?: boolean): void;
+        add(block: any, ensure?: boolean): void;
+        insertNext(block: any, ensure?: boolean): void;
+        start(onComplete?: () => void): void;
+        isRunning(): boolean;
+        next_(): void;
+        results(): NestedResults;
+    }
+
+    interface Matchers {
+
+        new (env: Env, actual: any, spec: Env, isNot?: boolean): any;
+
+        env: Env;
+        actual: any;
+        spec: Env;
+        isNot?: boolean;
+        message(): any;
+
+        toBe(expected: any, expectationFailOutput?: any): boolean;
+        toEqual(expected: any, expectationFailOutput?: any): boolean;
+        toMatch(expected: string | RegExp, expectationFailOutput?: any): boolean;
+        toBeDefined(expectationFailOutput?: any): boolean;
+        toBeUndefined(expectationFailOutput?: any): boolean;
+        toBeNull(expectationFailOutput?: any): boolean;
+        toBeNaN(): boolean;
+        toBeTruthy(expectationFailOutput?: any): boolean;
+        toBeFalsy(expectationFailOutput?: any): boolean;
+        toHaveBeenCalled(): boolean;
+        toHaveBeenCalledWith(...params: any[]): boolean;
+        toHaveBeenCalledTimes(expected: number): boolean;
+        toContain(expected: any, expectationFailOutput?: any): boolean;
+        toBeLessThan(expected: number, expectationFailOutput?: any): boolean;
+        toBeGreaterThan(expected: number, expectationFailOutput?: any): boolean;
+        toBeCloseTo(expected: number, precision: any, expectationFailOutput?: any): boolean;
+        toThrow(expected?: any): boolean;
+        toThrowError(message?: string | RegExp): boolean;
+        toThrowError(expected?: new (...args: any[]) => Error, message?: string | RegExp): boolean;
+        not: Matchers;
+
+        Any: Any;
+    }
+
+    interface Reporter {
+        reportRunnerStarting(runner: Runner): void;
+        reportRunnerResults(runner: Runner): void;
+        reportSuiteResults(suite: Suite): void;
+        reportSpecStarting(spec: Spec): void;
+        reportSpecResults(spec: Spec): void;
+        log(str: string): void;
+    }
+
+    interface MultiReporter extends Reporter {
+        addReporter(reporter: Reporter): void;
+    }
+
+    interface Runner {
+
+        new (env: Env): any;
+
+        execute(): void;
+        beforeEach(beforeEachFunction: SpecFunction): void;
+        afterEach(afterEachFunction: SpecFunction): void;
+        beforeAll(beforeAllFunction: SpecFunction): void;
+        afterAll(afterAllFunction: SpecFunction): void;
+        finishCallback(): void;
+        addSuite(suite: Suite): void;
+        add(block: Block): void;
+        specs(): Spec[];
+        suites(): Suite[];
+        topLevelSuites(): Suite[];
+        results(): NestedResults;
+    }
+
+    interface SpecFunction {
+        (spec?: Spec): void;
+    }
+
+    interface SuiteOrSpec {
+        id: number;
+        env: Env;
+        description: string;
+        queue: Queue;
+    }
+
+    interface Spec extends SuiteOrSpec {
+
+        new (env: Env, suite: Suite, description: string): any;
+
+        suite: Suite;
+
+        afterCallbacks: SpecFunction[];
+        spies_: Spy[];
+
+        results_: NestedResults;
+        matchersClass: Matchers;
+
+        getFullName(): string;
+        results(): NestedResults;
+        log(arguments: any): any;
+        runs(func: SpecFunction): Spec;
+        addToQueue(block: Block): void;
+        addMatcherResult(result: Result): void;
+        expect(actual: any): any;
+        waits(timeout: number): Spec;
+        waitsFor(latchFunction: SpecFunction, timeoutMessage?: string, timeout?: number): Spec;
+        fail(e?: any): void;
+        getMatchersClass_(): Matchers;
+        addMatchers(matchersPrototype: CustomMatcherFactories): void;
+        finishCallback(): void;
+        finish(onComplete?: () => void): void;
+        after(doAfter: SpecFunction): void;
+        execute(onComplete?: () => void): any;
+        addBeforesAndAftersToQueue(): void;
+        explodes(): void;
+        spyOn(obj: any, methodName: string, ignoreMethodDoesntExist: boolean): Spy;
+        removeAllSpies(): void;
+    }
+
+    interface XSpec {
+        id: number;
+        runs(): void;
+    }
+
+    interface Suite extends SuiteOrSpec {
+
+        new (env: Env, description: string, specDefinitions: () => void, parentSuite: Suite): any;
+
+        parentSuite: Suite;
+
+        getFullName(): string;
+        finish(onComplete?: () => void): void;
+        beforeEach(beforeEachFunction: SpecFunction): void;
+        afterEach(afterEachFunction: SpecFunction): void;
+        beforeAll(beforeAllFunction: SpecFunction): void;
+        afterAll(afterAllFunction: SpecFunction): void;
+        results(): NestedResults;
+        add(suiteOrSpec: SuiteOrSpec): void;
+        specs(): Spec[];
+        suites(): Suite[];
+        children(): any[];
+        execute(onComplete?: () => void): void;
+    }
+
+    interface XSuite {
+        execute(): void;
+    }
+
+    interface Spy {
+        (...params: any[]): any;
+
+        identity: string;
+        and: SpyAnd;
+        calls: Calls;
+        mostRecentCall: { args: any[]; };
+        argsForCall: any[];
+        wasCalled: boolean;
+    }
+
+    interface SpyAnd {
+        /** By chaining the spy with and.callThrough, the spy will still track all calls to it but in addition it will delegate to the actual implementation. */
+        callThrough(): Spy;
+        /** By chaining the spy with and.returnValue, all calls to the function will return a specific value. */
+        returnValue(val: any): Spy;
+        /** By chaining the spy with and.callFake, all calls to the spy will delegate to the supplied function. */
+        callFake(fn: Function): Spy;
+        /** By chaining the spy with and.throwError, all calls to the spy will throw the specified value. */
+        throwError(msg: string): Spy;
+        /** When a calling strategy is used for a spy, the original stubbing behavior can be returned at any time with and.stub. */
+        stub(): Spy;
+    }
+
+    interface Calls {
+        /** By chaining the spy with calls.any(), will return false if the spy has not been called at all, and then true once at least one call happens. **/
+        any(): boolean;
+        /** By chaining the spy with calls.count(), will return the number of times the spy was called **/
+        count(): number;
+        /** By chaining the spy with calls.argsFor(), will return the arguments passed to call number index **/
+        argsFor(index: number): any[];
+        /** By chaining the spy with calls.allArgs(), will return the arguments to all calls **/
+        allArgs(): any[];
+        /** By chaining the spy with calls.all(), will return the context (the this) and arguments passed all calls **/
+        all(): CallInfo[];
+        /** By chaining the spy with calls.mostRecent(), will return the context (the this) and arguments for the most recent call **/
+        mostRecent(): CallInfo;
+        /** By chaining the spy with calls.first(), will return the context (the this) and arguments for the first call **/
+        first(): CallInfo;
+        /** By chaining the spy with calls.reset(), will clears all tracking for a spy **/
+        reset(): void;
+    }
+
+    interface CallInfo {
+        /** The context (the this) for the call */
+        object: any;
+        /** All arguments passed to the call */
+        args: any[];
+        /** The return value of the call */
+        returnValue: any;
+    }
+
+    interface Util {
+        inherit(childClass: Function, parentClass: Function): any;
+        formatException(e: any): any;
+        htmlEscape(str: string): string;
+        argsToArray(args: any): any;
+        extend(destination: any, source: any): any;
+    }
+
+    interface JsApiReporter extends Reporter {
+
+        started: boolean;
+        finished: boolean;
+        result: any;
+        messages: any;
+
+        new (): any;
+
+        suites(): Suite[];
+        summarize_(suiteOrSpec: SuiteOrSpec): any;
+        results(): any;
+        resultsForSpec(specId: any): any;
+        log(str: any): any;
+        resultsForSpecs(specIds: any): any;
+        summarizeResult_(result: any): any;
+    }
+
+    interface Jasmine {
+        Spec: Spec;
+        clock: Clock;
+        util: Util;
+    }
+
+    export var HtmlReporter: HtmlReporter;
+    export var HtmlSpecFilter: HtmlSpecFilter;
+    export var DEFAULT_TIMEOUT_INTERVAL: number;
+}
diff --git a/jasmine/jasmine-tests.ts b/jasmine/jasmine-tests.ts
index 81f1a1a886..9d2a91ab7b 100644
--- a/jasmine/jasmine-tests.ts
+++ b/jasmine/jasmine-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jasmine.d.ts" />
+
 
 // tests based on http://jasmine.github.io/2.2/introduction.html
 
@@ -747,31 +747,31 @@ describe("Manually ticking the Jasmine Clock", function () {
 
 describe("Asynchronous specs", function () {
     var value: number;
-    beforeEach(function (done) {
+    beforeEach(function (done: DoneFn) {
         setTimeout(function () {
             value = 0;
             done();
         }, 1);
     });
 
-    it("should support async execution of test preparation and expectations", function (done) {
+    it("should support async execution of test preparation and expectations", function (done: DoneFn) {
         value++;
         expect(value).toBeGreaterThan(0);
         done();
     });
 
     describe("long asynchronous specs", function() {
-        beforeEach(function(done) {
+        beforeEach(function(done: DoneFn) {
           done();
         }, 1000);
 
-        it("takes a long time", function(done) {
+        it("takes a long time", function(done: DoneFn) {
           setTimeout(function() {
             done();
           }, 9000);
         }, 10000);
 
-        afterEach(function(done) {
+        afterEach(function(done: DoneFn) {
           done();
         }, 1000);
     });
diff --git a/jasmine/jasmine.d.ts b/jasmine/jasmine.d.ts
deleted file mode 100644
index 4fa5a7adef..0000000000
--- a/jasmine/jasmine.d.ts
+++ /dev/null
@@ -1,498 +0,0 @@
-// Type definitions for Jasmine 2.2
-// Project: http://jasmine.github.io/
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Theodore Brown <https://github.com/theodorejb>, David Pärsson <https://github.com/davidparsson/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-// For ddescribe / iit use : https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/karma-jasmine/karma-jasmine.d.ts
-
-declare function describe(description: string, specDefinitions: () => void): void;
-declare function fdescribe(description: string, specDefinitions: () => void): void;
-declare function xdescribe(description: string, specDefinitions: () => void): void;
-
-declare function it(expectation: string, assertion?: () => void, timeout?: number): void;
-declare function it(expectation: string, assertion?: (done: () => void) => void, timeout?: number): void;
-declare function fit(expectation: string, assertion?: () => void, timeout?: number): void;
-declare function fit(expectation: string, assertion?: (done: () => void) => void, timeout?: number): void;
-declare function xit(expectation: string, assertion?: () => void, timeout?: number): void;
-declare function xit(expectation: string, assertion?: (done: () => void) => void, timeout?: number): void;
-
-/** If you call the function pending anywhere in the spec body, no matter the expectations, the spec will be marked pending. */
-declare function pending(reason?: string): void;
-
-declare function beforeEach(action: () => void, timeout?: number): void;
-declare function beforeEach(action: (done: () => void) => void, timeout?: number): void;
-declare function afterEach(action: () => void, timeout?: number): void;
-declare function afterEach(action: (done: () => void) => void, timeout?: number): void;
-
-declare function beforeAll(action: () => void, timeout?: number): void;
-declare function beforeAll(action: (done: () => void) => void, timeout?: number): void;
-declare function afterAll(action: () => void, timeout?: number): void;
-declare function afterAll(action: (done: () => void) => void, timeout?: number): void;
-
-declare function expect(spy: Function): jasmine.Matchers;
-declare function expect(actual: any): jasmine.Matchers;
-
-declare function fail(e?: any): void;
-
-declare function spyOn(object: any, method: string): jasmine.Spy;
-
-declare function runs(asyncMethod: Function): void;
-declare function waitsFor(latchMethod: () => boolean, failureMessage?: string, timeout?: number): void;
-declare function waits(timeout?: number): void;
-
-declare namespace jasmine {
-
-    var clock: () => Clock;
-
-    function any(aclass: any): Any;
-    function anything(): Any;
-    function arrayContaining(sample: any[]): ArrayContaining;
-    function objectContaining(sample: any): ObjectContaining;
-    function createSpy(name: string, originalFn?: Function): Spy;
-    function createSpyObj(baseName: string, methodNames: any[]): any;
-    function createSpyObj<T>(baseName: string, methodNames: any[]): T;
-    function pp(value: any): string;
-    function getEnv(): Env;
-    function addCustomEqualityTester(equalityTester: CustomEqualityTester): void;
-    function addMatchers(matchers: CustomMatcherFactories): void;
-    function stringMatching(str: string): Any;
-    function stringMatching(str: RegExp): Any;
-
-    interface Any {
-
-        new (expectedClass: any): any;
-
-        jasmineMatches(other: any): boolean;
-        jasmineToString(): string;
-    }
-
-    // taken from TypeScript lib.core.es6.d.ts, applicable to CustomMatchers.contains()
-    interface ArrayLike<T> {
-        length: number;
-        [n: number]: T;
-    }
-
-    interface ArrayContaining {
-        new (sample: any[]): any;
-
-        asymmetricMatch(other: any): boolean;
-        jasmineToString(): string;
-    }
-
-    interface ObjectContaining {
-        new (sample: any): any;
-
-        jasmineMatches(other: any, mismatchKeys: any[], mismatchValues: any[]): boolean;
-        jasmineToString(): string;
-    }
-
-    interface Block {
-
-        new (env: Env, func: SpecFunction, spec: Spec): any;
-
-        execute(onComplete: () => void): void;
-    }
-
-    interface WaitsBlock extends Block {
-        new (env: Env, timeout: number, spec: Spec): any;
-    }
-
-    interface WaitsForBlock extends Block {
-        new (env: Env, timeout: number, latchFunction: SpecFunction, message: string, spec: Spec): any;
-    }
-
-    interface Clock {
-        install(): void;
-        uninstall(): void;
-        /** Calls to any registered callback are triggered when the clock is ticked forward via the jasmine.clock().tick function, which takes a number of milliseconds. */
-        tick(ms: number): void;
-        mockDate(date?: Date): void;
-    }
-
-    interface CustomEqualityTester {
-        (first: any, second: any): boolean;
-    }
-
-    interface CustomMatcher {
-        compare<T>(actual: T, expected: T): CustomMatcherResult;
-        compare(actual: any, expected: any): CustomMatcherResult;
-    }
-
-    interface CustomMatcherFactory {
-        (util: MatchersUtil, customEqualityTesters: Array<CustomEqualityTester>): CustomMatcher;
-    }
-
-    interface CustomMatcherFactories {
-        [index: string]: CustomMatcherFactory;
-    }
-
-    interface CustomMatcherResult {
-        pass: boolean;
-        message?: string;
-    }
-
-    interface MatchersUtil {
-        equals(a: any, b: any, customTesters?: Array<CustomEqualityTester>): boolean;
-        contains<T>(haystack: ArrayLike<T> | string, needle: any, customTesters?: Array<CustomEqualityTester>): boolean;
-        buildFailureMessage(matcherName: string, isNot: boolean, actual: any, ...expected: Array<any>): string;
-    }
-
-    interface Env {
-        setTimeout: any;
-        clearTimeout: void;
-        setInterval: any;
-        clearInterval: void;
-        updateInterval: number;
-
-        currentSpec: Spec;
-
-        matchersClass: Matchers;
-
-        version(): any;
-        versionString(): string;
-        nextSpecId(): number;
-        addReporter(reporter: Reporter): void;
-        execute(): void;
-        describe(description: string, specDefinitions: () => void): Suite;
-        // ddescribe(description: string, specDefinitions: () => void): Suite; Not a part of jasmine. Angular team adds these
-        beforeEach(beforeEachFunction: () => void): void;
-        beforeAll(beforeAllFunction: () => void): void;
-        currentRunner(): Runner;
-        afterEach(afterEachFunction: () => void): void;
-        afterAll(afterAllFunction: () => void): void;
-        xdescribe(desc: string, specDefinitions: () => void): XSuite;
-        it(description: string, func: () => void): Spec;
-        // iit(description: string, func: () => void): Spec; Not a part of jasmine. Angular team adds these
-        xit(desc: string, func: () => void): XSpec;
-        compareRegExps_(a: RegExp, b: RegExp, mismatchKeys: string[], mismatchValues: string[]): boolean;
-        compareObjects_(a: any, b: any, mismatchKeys: string[], mismatchValues: string[]): boolean;
-        equals_(a: any, b: any, mismatchKeys: string[], mismatchValues: string[]): boolean;
-        contains_(haystack: any, needle: any): boolean;
-        addCustomEqualityTester(equalityTester: CustomEqualityTester): void;
-        addMatchers(matchers: CustomMatcherFactories): void;
-        specFilter(spec: Spec): boolean;
-    }
-
-    interface FakeTimer {
-
-        new (): any;
-
-        reset(): void;
-        tick(millis: number): void;
-        runFunctionsWithinRange(oldMillis: number, nowMillis: number): void;
-        scheduleFunction(timeoutKey: any, funcToCall: () => void, millis: number, recurring: boolean): void;
-    }
-
-    interface HtmlReporter {
-        new (): any;
-    }
-
-    interface HtmlSpecFilter {
-        new (): any;
-    }
-
-    interface Result {
-        type: string;
-    }
-
-    interface NestedResults extends Result {
-        description: string;
-
-        totalCount: number;
-        passedCount: number;
-        failedCount: number;
-
-        skipped: boolean;
-
-        rollupCounts(result: NestedResults): void;
-        log(values: any): void;
-        getItems(): Result[];
-        addResult(result: Result): void;
-        passed(): boolean;
-    }
-
-    interface MessageResult extends Result  {
-        values: any;
-        trace: Trace;
-    }
-
-    interface ExpectationResult extends Result  {
-        matcherName: string;
-        passed(): boolean;
-        expected: any;
-        actual: any;
-        message: string;
-        trace: Trace;
-    }
-
-    interface Trace {
-        name: string;
-        message: string;
-        stack: any;
-    }
-
-    interface PrettyPrinter {
-
-        new (): any;
-
-        format(value: any): void;
-        iterateObject(obj: any, fn: (property: string, isGetter: boolean) => void): void;
-        emitScalar(value: any): void;
-        emitString(value: string): void;
-        emitArray(array: any[]): void;
-        emitObject(obj: any): void;
-        append(value: any): void;
-    }
-
-    interface StringPrettyPrinter extends PrettyPrinter {
-    }
-
-    interface Queue {
-
-        new (env: any): any;
-
-        env: Env;
-        ensured: boolean[];
-        blocks: Block[];
-        running: boolean;
-        index: number;
-        offset: number;
-        abort: boolean;
-
-        addBefore(block: Block, ensure?: boolean): void;
-        add(block: any, ensure?: boolean): void;
-        insertNext(block: any, ensure?: boolean): void;
-        start(onComplete?: () => void): void;
-        isRunning(): boolean;
-        next_(): void;
-        results(): NestedResults;
-    }
-
-    interface Matchers {
-
-        new (env: Env, actual: any, spec: Env, isNot?: boolean): any;
-
-        env: Env;
-        actual: any;
-        spec: Env;
-        isNot?: boolean;
-        message(): any;
-
-        toBe(expected: any, expectationFailOutput?: any): boolean;
-        toEqual(expected: any, expectationFailOutput?: any): boolean;
-        toMatch(expected: string | RegExp, expectationFailOutput?: any): boolean;
-        toBeDefined(expectationFailOutput?: any): boolean;
-        toBeUndefined(expectationFailOutput?: any): boolean;
-        toBeNull(expectationFailOutput?: any): boolean;
-        toBeNaN(): boolean;
-        toBeTruthy(expectationFailOutput?: any): boolean;
-        toBeFalsy(expectationFailOutput?: any): boolean;
-        toHaveBeenCalled(): boolean;
-        toHaveBeenCalledWith(...params: any[]): boolean;
-        toHaveBeenCalledTimes(expected: number): boolean;
-        toContain(expected: any, expectationFailOutput?: any): boolean;
-        toBeLessThan(expected: number, expectationFailOutput?: any): boolean;
-        toBeGreaterThan(expected: number, expectationFailOutput?: any): boolean;
-        toBeCloseTo(expected: number, precision: any, expectationFailOutput?: any): boolean;
-        toThrow(expected?: any): boolean;
-        toThrowError(message?: string | RegExp): boolean;
-        toThrowError(expected?: new (...args: any[]) => Error, message?: string | RegExp): boolean;
-        not: Matchers;
-
-        Any: Any;
-    }
-
-    interface Reporter {
-        reportRunnerStarting(runner: Runner): void;
-        reportRunnerResults(runner: Runner): void;
-        reportSuiteResults(suite: Suite): void;
-        reportSpecStarting(spec: Spec): void;
-        reportSpecResults(spec: Spec): void;
-        log(str: string): void;
-    }
-
-    interface MultiReporter extends Reporter {
-        addReporter(reporter: Reporter): void;
-    }
-
-    interface Runner {
-
-        new (env: Env): any;
-
-        execute(): void;
-        beforeEach(beforeEachFunction: SpecFunction): void;
-        afterEach(afterEachFunction: SpecFunction): void;
-        beforeAll(beforeAllFunction: SpecFunction): void;
-        afterAll(afterAllFunction: SpecFunction): void;
-        finishCallback(): void;
-        addSuite(suite: Suite): void;
-        add(block: Block): void;
-        specs(): Spec[];
-        suites(): Suite[];
-        topLevelSuites(): Suite[];
-        results(): NestedResults;
-    }
-
-    interface SpecFunction {
-        (spec?: Spec): void;
-    }
-
-    interface SuiteOrSpec {
-        id: number;
-        env: Env;
-        description: string;
-        queue: Queue;
-    }
-
-    interface Spec extends SuiteOrSpec {
-
-        new (env: Env, suite: Suite, description: string): any;
-
-        suite: Suite;
-
-        afterCallbacks: SpecFunction[];
-        spies_: Spy[];
-
-        results_: NestedResults;
-        matchersClass: Matchers;
-
-        getFullName(): string;
-        results(): NestedResults;
-        log(arguments: any): any;
-        runs(func: SpecFunction): Spec;
-        addToQueue(block: Block): void;
-        addMatcherResult(result: Result): void;
-        expect(actual: any): any;
-        waits(timeout: number): Spec;
-        waitsFor(latchFunction: SpecFunction, timeoutMessage?: string, timeout?: number): Spec;
-        fail(e?: any): void;
-        getMatchersClass_(): Matchers;
-        addMatchers(matchersPrototype: CustomMatcherFactories): void;
-        finishCallback(): void;
-        finish(onComplete?: () => void): void;
-        after(doAfter: SpecFunction): void;
-        execute(onComplete?: () => void): any;
-        addBeforesAndAftersToQueue(): void;
-        explodes(): void;
-        spyOn(obj: any, methodName: string, ignoreMethodDoesntExist: boolean): Spy;
-        removeAllSpies(): void;
-    }
-
-    interface XSpec {
-        id: number;
-        runs(): void;
-    }
-
-    interface Suite extends SuiteOrSpec {
-
-        new (env: Env, description: string, specDefinitions: () => void, parentSuite: Suite): any;
-
-        parentSuite: Suite;
-
-        getFullName(): string;
-        finish(onComplete?: () => void): void;
-        beforeEach(beforeEachFunction: SpecFunction): void;
-        afterEach(afterEachFunction: SpecFunction): void;
-        beforeAll(beforeAllFunction: SpecFunction): void;
-        afterAll(afterAllFunction: SpecFunction): void;
-        results(): NestedResults;
-        add(suiteOrSpec: SuiteOrSpec): void;
-        specs(): Spec[];
-        suites(): Suite[];
-        children(): any[];
-        execute(onComplete?: () => void): void;
-    }
-
-    interface XSuite {
-        execute(): void;
-    }
-
-    interface Spy {
-        (...params: any[]): any;
-
-        identity: string;
-        and: SpyAnd;
-        calls: Calls;
-        mostRecentCall: { args: any[]; };
-        argsForCall: any[];
-        wasCalled: boolean;
-    }
-
-    interface SpyAnd {
-        /** By chaining the spy with and.callThrough, the spy will still track all calls to it but in addition it will delegate to the actual implementation. */
-        callThrough(): Spy;
-        /** By chaining the spy with and.returnValue, all calls to the function will return a specific value. */
-        returnValue(val: any): Spy;
-        /** By chaining the spy with and.callFake, all calls to the spy will delegate to the supplied function. */
-        callFake(fn: Function): Spy;
-        /** By chaining the spy with and.throwError, all calls to the spy will throw the specified value. */
-        throwError(msg: string): Spy;
-        /** When a calling strategy is used for a spy, the original stubbing behavior can be returned at any time with and.stub. */
-        stub(): Spy;
-    }
-
-    interface Calls {
-        /** By chaining the spy with calls.any(), will return false if the spy has not been called at all, and then true once at least one call happens. **/
-        any(): boolean;
-        /** By chaining the spy with calls.count(), will return the number of times the spy was called **/
-        count(): number;
-        /** By chaining the spy with calls.argsFor(), will return the arguments passed to call number index **/
-        argsFor(index: number): any[];
-        /** By chaining the spy with calls.allArgs(), will return the arguments to all calls **/
-        allArgs(): any[];
-        /** By chaining the spy with calls.all(), will return the context (the this) and arguments passed all calls **/
-        all(): CallInfo[];
-        /** By chaining the spy with calls.mostRecent(), will return the context (the this) and arguments for the most recent call **/
-        mostRecent(): CallInfo;
-        /** By chaining the spy with calls.first(), will return the context (the this) and arguments for the first call **/
-        first(): CallInfo;
-        /** By chaining the spy with calls.reset(), will clears all tracking for a spy **/
-        reset(): void;
-    }
-
-    interface CallInfo {
-        /** The context (the this) for the call */
-        object: any;
-        /** All arguments passed to the call */
-        args: any[];
-        /** The return value of the call */
-        returnValue: any;
-    }
-
-    interface Util {
-        inherit(childClass: Function, parentClass: Function): any;
-        formatException(e: any): any;
-        htmlEscape(str: string): string;
-        argsToArray(args: any): any;
-        extend(destination: any, source: any): any;
-    }
-
-    interface JsApiReporter extends Reporter {
-
-        started: boolean;
-        finished: boolean;
-        result: any;
-        messages: any;
-
-        new (): any;
-
-        suites(): Suite[];
-        summarize_(suiteOrSpec: SuiteOrSpec): any;
-        results(): any;
-        resultsForSpec(specId: any): any;
-        log(str: any): any;
-        resultsForSpecs(specIds: any): any;
-        summarizeResult_(result: any): any;
-    }
-
-    interface Jasmine {
-        Spec: Spec;
-        clock: Clock;
-        util: Util;
-    }
-
-    export var HtmlReporter: HtmlReporter;
-    export var HtmlSpecFilter: HtmlSpecFilter;
-    export var DEFAULT_TIMEOUT_INTERVAL: number;
-}
diff --git a/jasmine/legacy/jasmine-1.3.d.ts b/jasmine/legacy/index.d.ts
similarity index 100%
rename from jasmine/legacy/jasmine-1.3.d.ts
rename to jasmine/legacy/index.d.ts
diff --git a/jasmine/legacy/jasmine-1.3-tests.ts b/jasmine/legacy/jasmine-1.3-tests.ts
index 0f3d0766ca..7d62ce546c 100644
--- a/jasmine/legacy/jasmine-1.3-tests.ts
+++ b/jasmine/legacy/jasmine-1.3-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jasmine-1.3.d.ts" />
+
 
 describe("A suite", () => {
     it("contains spec with an expectation", () => {
diff --git a/jasmine/legacy/tsconfig.json b/jasmine/legacy/tsconfig.json
new file mode 100644
index 0000000000..a8d513665b
--- /dev/null
+++ b/jasmine/legacy/tsconfig.json
@@ -0,0 +1,15 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../../",
+        "typesRoot": "../../",
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jasmine-1.3-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jasmine/tsconfig.json b/jasmine/tsconfig.json
new file mode 100644
index 0000000000..d326909cf5
--- /dev/null
+++ b/jasmine/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "jasmine-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/java-applet/java-applet.d.ts b/java-applet/index.d.ts
similarity index 100%
rename from java-applet/java-applet.d.ts
rename to java-applet/index.d.ts
diff --git a/java-applet/java-applet-tests.ts b/java-applet/java-applet-tests.ts
index cf652a4430..969b5102f6 100644
--- a/java-applet/java-applet-tests.ts
+++ b/java-applet/java-applet-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="java-applet.d.ts" />
+
 
 /**
  * @summary Test for the typage.
diff --git a/java-applet/tsconfig.json b/java-applet/tsconfig.json
new file mode 100644
index 0000000000..e5defd942b
--- /dev/null
+++ b/java-applet/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "java-applet-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/java/index.d.ts b/java/index.d.ts
new file mode 100644
index 0000000000..264a9cdc48
--- /dev/null
+++ b/java/index.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for java 0.5.4
+// Project: https://github.com/joeferner/node-java
+// Definitions by: Jim Lloyd <https://github.com/jimlloyd>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+// This is the core API exposed by https://github.com/joeferner/java.
+// To get the full power of Typescript with Java, see https://github.com/RedSeal-co/ts-java.
+
+declare var NodeJavaCore: NodeJavaCore.NodeAPI;
+export = NodeJavaCore;
+
+declare namespace NodeJavaCore {
+  export interface Callback<T> {
+    (err?: Error, result?: T): void;
+  }
+
+  interface Promisify {
+    (funct: Function, receiver?: any): Function;
+  }
+
+  interface AsyncOptions {
+    syncSuffix: string;
+    asyncSuffix?: string;
+    promiseSuffix?: string;
+    promisify?: Promisify;
+  }
+
+  interface ProxyFunctions {
+    [index: string]: Function;
+  }
+
+  // *NodeAPI* declares methods & members exported by the node java module.
+  interface NodeAPI {
+    classpath: string[];
+    asyncOptions: AsyncOptions;
+    callMethod(instance: any, className: string, methodName: string, args: any[], callback: Callback<any>): void;
+    callMethodSync(instance: any, className: string, methodName: string, ...args: any[]): any;
+    callStaticMethodSync(className: string, methodName: string, ...args: any[]): any;
+    instanceOf(javaObject: any, className: string): boolean;
+    registerClient(before: (cb: Callback<void>) => void, after?: (cb: Callback<void>) => void): void;
+    registerClientP(beforeP: () => Promise<void>, afterP?: () => Promise<void>): void;
+    ensureJvm(done: Callback<void>): void;
+    ensureJvm(): Promise<void>;
+
+    newShort(val: number): any;
+    newLong(val: number): any;
+    newFloat(val: number): any;
+    newDouble(val: number): any;
+
+    import(className: string): any;
+    newInstance(className: string, ...args: any[]): void;
+    newInstanceSync(className: string, ...args: any[]): any;
+    newInstanceP(className: string, ...args: any[]): Promise<any>;
+    newArray<T>(className: string, arg: any[]): any;
+    getClassLoader(): any;
+
+    newProxy(interfaceName: string, functions: ProxyFunctions): any;
+  }
+}
diff --git a/java/java-tests.ts b/java/java-tests.ts
index 568bd35a8c..e7cca6abb2 100644
--- a/java/java-tests.ts
+++ b/java/java-tests.ts
@@ -1,5 +1,4 @@
-///<reference path="java.d.ts"/>
-///<reference path="../bluebird/bluebird.d.ts"/>
+///<reference types="bluebird"/>
 
 import java = require('java');
 import BluePromise = require('bluebird');
diff --git a/java/java.d.ts b/java/java.d.ts
deleted file mode 100644
index 04f603db77..0000000000
--- a/java/java.d.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-// Type definitions for java 0.5.4
-// Project: https://github.com/joeferner/node-java
-// Definitions by: Jim Lloyd <https://github.com/jimlloyd>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-// This is the core API exposed by https://github.com/joeferner/java.
-// To get the full power of Typescript with Java, see https://github.com/RedSeal-co/ts-java.
-
-declare module 'java' {
-  var NodeJavaCore: NodeJavaCore.NodeAPI;
-  export = NodeJavaCore;
-}
-
-declare namespace NodeJavaCore {
-  export interface Callback<T> {
-    (err?: Error, result?: T): void;
-  }
-
-  interface Promisify {
-    (funct: Function, receiver?: any): Function;
-  }
-
-  interface AsyncOptions {
-    syncSuffix: string;
-    asyncSuffix?: string;
-    promiseSuffix?: string;
-    promisify?: Promisify;
-  }
-
-  interface ProxyFunctions {
-    [index: string]: Function;
-  }
-
-  // *NodeAPI* declares methods & members exported by the node java module.
-  interface NodeAPI {
-    classpath: string[];
-    asyncOptions: AsyncOptions;
-    callMethod(instance: any, className: string, methodName: string, args: any[], callback: Callback<any>): void;
-    callMethodSync(instance: any, className: string, methodName: string, ...args: any[]): any;
-    callStaticMethodSync(className: string, methodName: string, ...args: any[]): any;
-    instanceOf(javaObject: any, className: string): boolean;
-    registerClient(before: (cb: Callback<void>) => void, after?: (cb: Callback<void>) => void): void;
-    registerClientP(beforeP: () => Promise<void>, afterP?: () => Promise<void>): void;
-    ensureJvm(done: Callback<void>): void;
-    ensureJvm(): Promise<void>;
-
-    newShort(val: number): any;
-    newLong(val: number): any;
-    newFloat(val: number): any;
-    newDouble(val: number): any;
-
-    import(className: string): any;
-    newInstance(className: string, ...args: any[]): void;
-    newInstanceSync(className: string, ...args: any[]): any;
-    newInstanceP(className: string, ...args: any[]): Promise<any>;
-    newArray<T>(className: string, arg: any[]): any;
-    getClassLoader(): any;
-
-    newProxy(interfaceName: string, functions: ProxyFunctions): any;
-  }
-}
diff --git a/java/tsconfig.json b/java/tsconfig.json
new file mode 100644
index 0000000000..9ae0468519
--- /dev/null
+++ b/java/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "java-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/javascript-astar/javascript-astar.d.ts b/javascript-astar/index.d.ts
similarity index 100%
rename from javascript-astar/javascript-astar.d.ts
rename to javascript-astar/index.d.ts
diff --git a/javascript-astar/javascript-astar-tests.ts b/javascript-astar/javascript-astar-tests.ts
index 11e26fe030..c5a4eb3ac5 100644
--- a/javascript-astar/javascript-astar-tests.ts
+++ b/javascript-astar/javascript-astar-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="javascript-astar.d.ts" />
+
 
 function test_create() {
     let graph: Graph = new Graph([]);
diff --git a/javascript-astar/tsconfig.json b/javascript-astar/tsconfig.json
new file mode 100644
index 0000000000..87823da64b
--- /dev/null
+++ b/javascript-astar/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "javascript-astar-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/javascript-bignum/javascript-bignum.d.ts b/javascript-bignum/index.d.ts
similarity index 100%
rename from javascript-bignum/javascript-bignum.d.ts
rename to javascript-bignum/index.d.ts
diff --git a/javascript-bignum/javascript-bignum-tests.ts b/javascript-bignum/javascript-bignum-tests.ts
index 57555fcce2..d0cf2c34d9 100644
--- a/javascript-bignum/javascript-bignum-tests.ts
+++ b/javascript-bignum/javascript-bignum-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="javascript-bignum.d.ts"/>
 let m = SchemeNumber("1");
 let n = SchemeNumber(2);
 
diff --git a/javascript-bignum/tsconfig.json b/javascript-bignum/tsconfig.json
new file mode 100644
index 0000000000..4a9f0504a6
--- /dev/null
+++ b/javascript-bignum/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "javascript-bignum-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jbinary/index.d.ts b/jbinary/index.d.ts
new file mode 100644
index 0000000000..1e9c9c6f03
--- /dev/null
+++ b/jbinary/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for jBinary
+// Project: https://github.com/jDataView/jBinary
+// Definitions by: Tim Bureck <https://github.com/tbureck>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Additional notes:
+// Method stubs and types are taken from the official jBinary documentation, which can be found here:
+// https://github.com/jDataView/jBinary/wiki/jBinary-Constructor
+// https://github.com/jDataView/jBinary/wiki/jBinary-Methods
+
+/// <reference types="jdataview" />
+
+declare class jBinary
+{
+
+    static loadData(source:any, callback?: (error:string, data:any) => any):any;
+    static load(source:any, typeSet?:any, callback?: (error:string, data:any) => any):any;
+
+    static saveAs(destination:any, mimeType?:string, callback?: (error:string, data:any) => any):any;
+    static toURI(mimeType?:string):any;
+
+    constructor(data:Array<number>);
+    constructor(data:jDataView, typeSet:Object);
+    constructor(bufferSize:number, typeSet:Object);
+
+    read(type:string, offset?:number):any;
+    readAll():any;
+
+    write(type:string, data:any, offset?:number):number;
+    writeAll(data:any):number;
+
+    tell():number;
+    seek(position:number, callback?: (prop:jBinary, data:any) => any):number;
+    skip(count:number, callback?: (prop:jBinary, data:any) => any):number;
+
+    slice(start:number, end:number, forceCopy?:boolean):jBinary;
+    as(typeSet:Object, modifyOriginal?:boolean):jBinary;
+}
\ No newline at end of file
diff --git a/jbinary/jbinary-tests.ts b/jbinary/jbinary-tests.ts
index f5f2abcbb4..a519fa5819 100644
--- a/jbinary/jbinary-tests.ts
+++ b/jbinary/jbinary-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jbinary.d.ts" />
+
 
 jBinary.loadData([0x05, 0x03, 0x7F, 0x1E]);
 jBinary.load([0x05, 0x03, 0x7F, 0x1E]);
diff --git a/jbinary/jbinary-tests.ts.tscparams b/jbinary/jbinary-tests.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/jbinary/jbinary-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/jbinary/jbinary.d.ts b/jbinary/jbinary.d.ts
deleted file mode 100644
index 09249452ad..0000000000
--- a/jbinary/jbinary.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// Type definitions for jBinary
-// Project: https://github.com/jDataView/jBinary
-// Definitions by: Tim Bureck <https://github.com/tbureck>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Additional notes:
-// Method stubs and types are taken from the official jBinary documentation, which can be found here:
-// https://github.com/jDataView/jBinary/wiki/jBinary-Constructor
-// https://github.com/jDataView/jBinary/wiki/jBinary-Methods
-
-/// <reference path="../jdataview/jdataview.d.ts" />
-
-declare class jBinary
-{
-
-    static loadData(source:any, callback?: (error:string, data:any) => any):any;
-    static load(source:any, typeSet?:any, callback?: (error:string, data:any) => any):any;
-
-    static saveAs(destination:any, mimeType?:string, callback?: (error:string, data:any) => any):any;
-    static toURI(mimeType?:string):any;
-
-    constructor(data:Array<number>);
-    constructor(data:jDataView, typeSet:Object);
-    constructor(bufferSize:number, typeSet:Object);
-
-    read(type:string, offset?:number):any;
-    readAll():any;
-
-    write(type:string, data:any, offset?:number):number;
-    writeAll(data:any):number;
-
-    tell():number;
-    seek(position:number, callback?: (prop:jBinary, data:any) => any):number;
-    skip(count:number, callback?: (prop:jBinary, data:any) => any):number;
-
-    slice(start:number, end:number, forceCopy?:boolean):jBinary;
-    as(typeSet:Object, modifyOriginal?:boolean):jBinary;
-}
\ No newline at end of file
diff --git a/jbinary/jbinary.d.ts.tscparams b/jbinary/jbinary.d.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/jbinary/jbinary.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/jbinary/tsconfig.json b/jbinary/tsconfig.json
new file mode 100644
index 0000000000..31fc277f64
--- /dev/null
+++ b/jbinary/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jbinary-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jdataview/index.d.ts b/jdataview/index.d.ts
new file mode 100644
index 0000000000..6ed80f870a
--- /dev/null
+++ b/jdataview/index.d.ts
@@ -0,0 +1,106 @@
+// Type definitions for jDataView
+// Project: https://github.com/jDataView/jDataView
+// Definitions by: Ingvar Stepanyan <https://github.com/RReverser>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class jDataView implements DataView {
+	constructor(byteCount: number, offset?: number, length?: number, littleEndian?: boolean)
+	constructor(buffer: string, offset?: number, length?: number, littleEndian?: boolean)
+	constructor(buffer: jDataView.Bytes, offset?: number, length?: number, littleEndian?: boolean)
+	buffer: any
+	byteOffset: number
+	byteLength: number
+
+	// 64 bit integers
+	getInt64(byteOffset?: number, littleEndian?: boolean): jDataView.Int64
+	setInt64(byteOffset: number, value: jDataView.Int64, littleEndian?: boolean): void
+	writeInt64(value: jDataView.Int64, littleEndian?: boolean): void
+	getUint64(byteOffset?: number, littleEndian?: boolean): jDataView.Uint64
+	setUint64(byteOffset: number, value: jDataView.Uint64, littleEndian?: boolean): void
+	writeUint64(value: jDataView.Uint64, littleEndian?: boolean): void
+
+	// Bitfields
+	getSigned(bitLength: number, byteOffset?: number): number
+	setSigned(byteOffset: number, value: number, bitLength: number): void
+	writeSigned(value: number, bitLength: number): void
+	getUnsigned(bitLength: number, byteOffset?: number): number
+	setUnsigned(byteOffset: number, value: number, bitLength: number): void
+	writeUnsigned(value: number, bitLength: number): void
+
+	// Internal utilities
+	wrapBuffer(string: string): jDataView.Buffer
+	wrapBuffer(bytes: jDataView.Bytes): jDataView.Buffer
+	wrapBuffer(byteCount: number): jDataView.Buffer
+	createBuffer(...bytes: number[]): jDataView.Buffer
+
+	// Operation control
+	seek(byteOffset: number): number
+	tell(): number
+	skip(byteLength: number): number
+	slice(start: number, end?: number, forceCopy?: boolean): jDataView
+
+	// Specification getters
+	getInt8(byteOffset?: number): number
+	getUint8(byteOffset?: number): number
+	getInt16(byteOffset?: number, littleEndian?: boolean): number
+	getUint16(byteOffset?: number, littleEndian?: boolean): number
+	getInt32(byteOffset?: number, littleEndian?: boolean): number
+	getUint32(byteOffset?: number, littleEndian?: boolean): number
+	getFloat32(byteOffset?: number, littleEndian?: boolean): number
+	getFloat64(byteOffset?: number, littleEndian?: boolean): number
+
+	// Specification setters
+	setInt8(byteOffset: number, value: number): void
+	setUint8(byteOffset: number, value: number): void
+	setInt16(byteOffset: number, value: number, littleEndian?: boolean): void
+	setUint16(byteOffset: number, value: number, littleEndian?: boolean): void
+	setInt32(byteOffset: number, value: number, littleEndian?: boolean): void
+	setUint32(byteOffset: number, value: number, littleEndian?: boolean): void
+	setFloat32(byteOffset: number, value: number, littleEndian?: boolean): void
+	setFloat64(byteOffset: number, value: number, littleEndian?: boolean): void
+
+	// Strings and Blobs
+	getChar(byteOffset?: number): string
+	setChar(byteOffset: number, char: string): void
+	writeChar(char: string): void
+	getString(byteLength: number, byteOffset?: number, encoding?: string): string
+	setString(byteOffset: number, chars: string, encoding?: string): void
+	writeString(chars: string, encoding?: string): void
+	getBytes(length: number, byteOffset?: number, littleEndian?: boolean, toArray?: boolean): number[]
+	setBytes(byteOffset: number, bytes: number[], littleEndian?: boolean): void
+	writeBytes(bytes: number[], littleEndian?: boolean): void
+
+	// writeXXX methods
+	writeInt8(value: number): void
+	writeUint8(value: number): void
+	writeInt16(value: number, littleEndian?: boolean): void
+	writeUint16(value: number, littleEndian?: boolean): void
+	writeInt32(value: number, littleEndian?: boolean): void
+	writeUint32(value: number, littleEndian?: boolean): void
+	writeFloat32(value: number, littleEndian?: boolean): void
+	writeFloat64(value: number, littleEndian?: boolean): void
+}
+interface jDataView extends DataView { }
+
+declare namespace jDataView {
+	interface Bytes {
+		length: number;
+		[index: number]: number;
+	}
+
+	interface Buffer extends Bytes {
+		byteLength: number;
+	}
+
+	class Uint64 {
+		lo: number
+		hi: number
+		constructor(lo: number, hi: number)
+		valueOf(): number
+		static fromNumber(number: number): Uint64
+	}
+
+	class Int64 extends Uint64 {
+		static fromNumber(number: number): Int64
+	}
+}
diff --git a/jdataview/jdataview-tests.ts b/jdataview/jdataview-tests.ts
index 273db3ea39..1125054ab8 100644
--- a/jdataview/jdataview-tests.ts
+++ b/jdataview/jdataview-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="jdataview.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+
+/// <reference types="jquery" />
 
 interface TARMetaData {
 	name: string;
diff --git a/jdataview/jdataview-tests.ts.tscparams b/jdataview/jdataview-tests.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/jdataview/jdataview-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/jdataview/jdataview.d.ts b/jdataview/jdataview.d.ts
deleted file mode 100644
index 9df0c1ff73..0000000000
--- a/jdataview/jdataview.d.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-// Type definitions for jDataView
-// Project: https://github.com/jDataView/jDataView
-// Definitions by: Ingvar Stepanyan <https://github.com/RReverser>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare class jDataView implements DataView {
-	constructor(byteCount: number, offset?: number, length?: number, littleEndian?: boolean)
-	constructor(buffer: string, offset?: number, length?: number, littleEndian?: boolean)
-	constructor(buffer: jDataView.Bytes, offset?: number, length?: number, littleEndian?: boolean)
-	buffer: any
-	byteOffset: number
-	byteLength: number
-
-	// 64 bit integers
-	getInt64(byteOffset?: number, littleEndian?: boolean): jDataView.Int64
-	setInt64(byteOffset: number, value: jDataView.Int64, littleEndian?: boolean): void
-	writeInt64(value: jDataView.Int64, littleEndian?: boolean): void
-	getUint64(byteOffset?: number, littleEndian?: boolean): jDataView.Uint64
-	setUint64(byteOffset: number, value: jDataView.Uint64, littleEndian?: boolean): void
-	writeUint64(value: jDataView.Uint64, littleEndian?: boolean): void
-
-	// Bitfields
-	getSigned(bitLength: number, byteOffset?: number): number
-	setSigned(byteOffset: number, value: number, bitLength: number): void
-	writeSigned(value: number, bitLength: number): void
-	getUnsigned(bitLength: number, byteOffset?: number): number
-	setUnsigned(byteOffset: number, value: number, bitLength: number): void
-	writeUnsigned(value: number, bitLength: number): void
-
-	// Internal utilities
-	wrapBuffer(string: string): jDataView.Buffer
-	wrapBuffer(bytes: jDataView.Bytes): jDataView.Buffer
-	wrapBuffer(byteCount: number): jDataView.Buffer
-	createBuffer(...bytes: number[]): jDataView.Buffer
-
-	// Operation control
-	seek(byteOffset: number): number
-	tell(): number
-	skip(byteLength: number): number
-	slice(start: number, end?: number, forceCopy?: boolean): jDataView
-
-	// Specification getters
-	getInt8(byteOffset?: number): number
-	getUint8(byteOffset?: number): number
-	getInt16(byteOffset?: number, littleEndian?: boolean): number
-	getUint16(byteOffset?: number, littleEndian?: boolean): number
-	getInt32(byteOffset?: number, littleEndian?: boolean): number
-	getUint32(byteOffset?: number, littleEndian?: boolean): number
-	getFloat32(byteOffset?: number, littleEndian?: boolean): number
-	getFloat64(byteOffset?: number, littleEndian?: boolean): number
-
-	// Specification setters
-	setInt8(byteOffset: number, value: number): void
-	setUint8(byteOffset: number, value: number): void
-	setInt16(byteOffset: number, value: number, littleEndian?: boolean): void
-	setUint16(byteOffset: number, value: number, littleEndian?: boolean): void
-	setInt32(byteOffset: number, value: number, littleEndian?: boolean): void
-	setUint32(byteOffset: number, value: number, littleEndian?: boolean): void
-	setFloat32(byteOffset: number, value: number, littleEndian?: boolean): void
-	setFloat64(byteOffset: number, value: number, littleEndian?: boolean): void
-
-	// Strings and Blobs
-	getChar(byteOffset?: number): string
-	setChar(byteOffset: number, char: string): void
-	writeChar(char: string): void
-	getString(byteLength: number, byteOffset?: number, encoding?: string): string
-	setString(byteOffset: number, chars: string, encoding?: string): void
-	writeString(chars: string, encoding?: string): void
-	getBytes(length: number, byteOffset?: number, littleEndian?: boolean, toArray?: boolean): number[]
-	setBytes(byteOffset: number, bytes: number[], littleEndian?: boolean): void
-	writeBytes(bytes: number[], littleEndian?: boolean): void
-
-	// writeXXX methods
-	writeInt8(value: number): void
-	writeUint8(value: number): void
-	writeInt16(value: number, littleEndian?: boolean): void
-	writeUint16(value: number, littleEndian?: boolean): void
-	writeInt32(value: number, littleEndian?: boolean): void
-	writeUint32(value: number, littleEndian?: boolean): void
-	writeFloat32(value: number, littleEndian?: boolean): void
-	writeFloat64(value: number, littleEndian?: boolean): void
-}
-
-declare namespace jDataView {
-	interface Bytes {
-		length: number;
-		[index: number]: number;
-	}
-
-	interface Buffer extends Bytes {
-		byteLength: number;
-	}
-
-	class Uint64 {
-		lo: number
-		hi: number
-		constructor(lo: number, hi: number)
-		valueOf(): number
-		static fromNumber(number: number): Uint64
-	}
-
-	class Int64 extends Uint64 {
-		static fromNumber(number: number): Int64
-	}
-}
diff --git a/jdataview/jdataview.d.ts.tscparams b/jdataview/jdataview.d.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/jdataview/jdataview.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/jdataview/tsconfig.json b/jdataview/tsconfig.json
new file mode 100644
index 0000000000..b10b4b58e4
--- /dev/null
+++ b/jdataview/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jdataview-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jee-jsf/jsf.d.ts b/jee-jsf/index.d.ts
similarity index 100%
rename from jee-jsf/jsf.d.ts
rename to jee-jsf/index.d.ts
diff --git a/jee-jsf/jsf-tests.ts b/jee-jsf/jsf-tests.ts
index 76815bf9ee..1591bf1dd7 100644
--- a/jee-jsf/jsf-tests.ts
+++ b/jee-jsf/jsf-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jsf.d.ts" />
+
 
 function callbackWithoutData() {
 
diff --git a/jee-jsf/tsconfig.json b/jee-jsf/tsconfig.json
new file mode 100644
index 0000000000..5598e37238
--- /dev/null
+++ b/jee-jsf/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsf-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jest/index.d.ts b/jest/index.d.ts
new file mode 100644
index 0000000000..daedf995d2
--- /dev/null
+++ b/jest/index.d.ts
@@ -0,0 +1,124 @@
+// Type definitions for Jest 0.9.0
+// Project: http://facebook.github.io/jest/
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare function afterEach(fn: jest.EmptyFunction): void;
+declare function beforeEach(fn: jest.EmptyFunction): void;
+declare function describe(name: string, fn: jest.EmptyFunction): void;
+declare var it: jest.It;
+declare function pit(name: string, fn: jest.EmptyFunction): void;
+
+declare function xdescribe(name: string, fn: jest.EmptyFunction): void;
+declare function xit(name: string, fn: jest.EmptyFunction): void;
+
+declare function expect(actual: any): jest.Matchers;
+
+interface NodeRequire {
+    requireActual(moduleName: string): any;
+}
+
+declare namespace jest {
+    function addMatchers(matchers: CustomMatcherFactories): void;
+    function autoMockOff(): void;
+    function autoMockOn(): void;
+    function clearAllTimers(): void;
+    function currentTestPath(): string;
+    function fn<T>(implementation?: Function): Mock<T>;
+    function dontMock(moduleName: string): void;
+    function genMockFromModule<T>(moduleName: string): Mock<T>;
+    function mock(moduleName: string, factory?: Function): void;
+    function runAllTicks(): void;
+    function runAllTimers(): void;
+    function runOnlyPendingTimers(): void;
+    function setMock<T>(moduleName: string, moduleExports: T): void;
+    function unmock(moduleName: string): void;
+
+    interface EmptyFunction {
+        (): void;
+    }
+
+    interface Matchers {
+        not: Matchers;
+        toThrow(expected?: any): boolean;
+        toBe(expected: any): boolean;
+        toEqual(expected: any): boolean;
+        toBeFalsy(): boolean;
+        toBeTruthy(): boolean;
+        toBeNull(): boolean;
+        toBeDefined(): boolean;
+        toBeUndefined(): boolean;
+        toMatch(expected: RegExp): boolean;
+        toContain(expected: string): boolean;
+        toBeCloseTo(expected: number, delta: number): boolean;
+        toBeGreaterThan(expected: number): boolean;
+        toBeLessThan(expected: number): boolean;
+        toBeCalled(): boolean;
+        toBeCalledWith(...args: any[]): boolean;
+        lastCalledWith(...args: any[]): boolean;
+    }
+
+    interface It {
+        (name: string, fn: EmptyFunction): void;
+        only(name: string, fn: EmptyFunction): void;
+    }
+
+    interface Mock<T> {
+        new (): T;
+        (...args: any[]): any; // TODO please fix this line! added for TypeScript 1.1.0-1 https://github.com/DefinitelyTyped/DefinitelyTyped/pull/2932
+        mock: MockContext<T>;
+        mockClear(): void;
+        mockImplementation(fn: Function): Mock<T>;
+        mockImpl(fn: Function): Mock<T>;
+        mockReturnThis(): Mock<T>;
+        mockReturnValue(value: any): Mock<T>;
+        mockReturnValueOnce(value: any): Mock<T>;
+    }
+
+    interface MockContext<T> {
+        calls: any[][];
+        instances: T[];
+    }
+
+    // taken from Jasmine since addMatchers calls into the jasmine api
+    interface CustomMatcherFactories {
+        [index: string]: CustomMatcherFactory;
+    }
+
+    // taken from Jasmine since addMatchers calls into the jasmine api
+    interface CustomMatcherFactory {
+        (util: MatchersUtil, customEqualityTesters: Array<CustomEqualityTester>): CustomMatcher;
+    }
+
+    // taken from Jasmine since addMatchers calls into the jasmine api
+    interface MatchersUtil {
+        equals(a: any, b: any, customTesters?: Array<CustomEqualityTester>): boolean;
+        contains<T>(haystack: ArrayLike<T> | string, needle: any, customTesters?: Array<CustomEqualityTester>): boolean;
+        buildFailureMessage(matcherName: string, isNot: boolean, actual: any, ...expected: Array<any>): string;
+    }
+
+    // taken from Jasmine since addMatchers calls into the jasmine api
+    interface CustomEqualityTester {
+        (first: any, second: any): boolean;
+    }
+
+    // taken from Jasmine since addMatchers calls into the jasmine api
+    interface CustomMatcher {
+        compare<T>(actual: T, expected: T): CustomMatcherResult;
+        compare(actual: any, expected: any): CustomMatcherResult;
+    }
+
+    // taken from Jasmine since addMatchers calls into the jasmine api
+    interface CustomMatcherResult {
+        pass: boolean;
+        message: string;
+    }
+
+    // taken from Jasmine which takes from TypeScript lib.core.es6.d.ts, applicable to CustomMatchers.contains()
+    interface ArrayLike<T> {
+        length: number;
+        [n: number]: T;
+    }
+}
diff --git a/jest/jest-tests.ts b/jest/jest-tests.ts
index f3e33c4061..c35b5d19f2 100644
--- a/jest/jest-tests.ts
+++ b/jest/jest-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jest.d.ts" />
+
 
 // Tests based on the Jest website
 jest.unmock('../sum');
diff --git a/jest/jest.d.ts b/jest/jest.d.ts
deleted file mode 100644
index 033dd23faa..0000000000
--- a/jest/jest.d.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-// Type definitions for Jest 0.9.0
-// Project: http://facebook.github.io/jest/
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare function afterEach(fn: jest.EmptyFunction): void;
-declare function beforeEach(fn: jest.EmptyFunction): void;
-declare function describe(name: string, fn: jest.EmptyFunction): void;
-declare var it: jest.It;
-declare function pit(name: string, fn: jest.EmptyFunction): void;
-
-declare function xdescribe(name: string, fn: jest.EmptyFunction): void;
-declare function xit(name: string, fn: jest.EmptyFunction): void;
-
-declare function expect(actual: any): jest.Matchers;
-
-interface NodeRequire {
-    requireActual(moduleName: string): any;
-}
-
-declare namespace jest {
-    function addMatchers(matchers: CustomMatcherFactories): void;
-    function autoMockOff(): void;
-    function autoMockOn(): void;
-    function clearAllTimers(): void;
-    function currentTestPath(): string;
-    function fn<T>(implementation?: Function): Mock<T>;
-    function dontMock(moduleName: string): void;
-    function genMockFromModule<T>(moduleName: string): Mock<T>;
-    function mock(moduleName: string): void;
-    function runAllTicks(): void;
-    function runAllTimers(): void;
-    function runOnlyPendingTimers(): void;
-    function setMock<T>(moduleName: string, moduleExports: T): void;
-    function unmock(moduleName: string): void;
-
-    interface EmptyFunction {
-        (): void;
-    }
-
-    interface Matchers {
-        not: Matchers;
-        toThrow(expected?: any): boolean;
-        toBe(expected: any): boolean;
-        toEqual(expected: any): boolean;
-        toBeFalsy(): boolean;
-        toBeTruthy(): boolean;
-        toBeNull(): boolean;
-        toBeDefined(): boolean;
-        toBeUndefined(): boolean;
-        toMatch(expected: RegExp): boolean;
-        toContain(expected: string): boolean;
-        toBeCloseTo(expected: number, delta: number): boolean;
-        toBeGreaterThan(expected: number): boolean;
-        toBeLessThan(expected: number): boolean;
-        toBeCalled(): boolean;
-        toBeCalledWith(...args: any[]): boolean;
-        lastCalledWith(...args: any[]): boolean;
-    }
-
-    interface It {
-        (name: string, fn: EmptyFunction): void;
-        only(name: string, fn: EmptyFunction): void;
-    }
-
-    interface Mock<T> {
-        new (): T;
-        (...args: any[]): any; // TODO please fix this line! added for TypeScript 1.1.0-1 https://github.com/DefinitelyTyped/DefinitelyTyped/pull/2932
-        mock: MockContext<T>;
-        mockClear(): void;
-        mockImplementation(fn: Function): Mock<T>;
-        mockImpl(fn: Function): Mock<T>;
-        mockReturnThis(): Mock<T>;
-        mockReturnValue(value: any): Mock<T>;
-        mockReturnValueOnce(value: any): Mock<T>;
-    }
-
-    interface MockContext<T> {
-        calls: any[][];
-        instances: T[];
-    }
-
-    // taken from Jasmine since addMatchers calls into the jasmine api
-    interface CustomMatcherFactories {
-        [index: string]: CustomMatcherFactory;
-    }
-
-    // taken from Jasmine since addMatchers calls into the jasmine api
-    interface CustomMatcherFactory {
-        (util: MatchersUtil, customEqualityTesters: Array<CustomEqualityTester>): CustomMatcher;
-    }
-
-    // taken from Jasmine since addMatchers calls into the jasmine api
-    interface MatchersUtil {
-        equals(a: any, b: any, customTesters?: Array<CustomEqualityTester>): boolean;
-        contains<T>(haystack: ArrayLike<T> | string, needle: any, customTesters?: Array<CustomEqualityTester>): boolean;
-        buildFailureMessage(matcherName: string, isNot: boolean, actual: any, ...expected: Array<any>): string;
-    }
-
-    // taken from Jasmine since addMatchers calls into the jasmine api
-    interface CustomEqualityTester {
-        (first: any, second: any): boolean;
-    }
-
-    // taken from Jasmine since addMatchers calls into the jasmine api
-    interface CustomMatcher {
-        compare<T>(actual: T, expected: T): CustomMatcherResult;
-        compare(actual: any, expected: any): CustomMatcherResult;
-    }
-
-    // taken from Jasmine since addMatchers calls into the jasmine api
-    interface CustomMatcherResult {
-        pass: boolean;
-        message: string;
-    }
-
-    // taken from Jasmine which takes from TypeScript lib.core.es6.d.ts, applicable to CustomMatchers.contains()
-    interface ArrayLike<T> {
-        length: number;
-        [n: number]: T;
-    }
-}
diff --git a/jest/tsconfig.json b/jest/tsconfig.json
new file mode 100644
index 0000000000..2f703c72f4
--- /dev/null
+++ b/jest/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jest-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jfp/index.d.ts b/jfp/index.d.ts
new file mode 100644
index 0000000000..8770f3430c
--- /dev/null
+++ b/jfp/index.d.ts
@@ -0,0 +1,846 @@
+// Type definitions for JFP
+// Project: http://cmstead.github.io/JFP
+// Definitions by: Chris Stead <http://www.chrisstead.com>
+// Definitions: https://github.com/cmstead/DefinitelyTyped
+
+declare var j: j.JfpStatic;
+export = j;
+export as namespace j;
+
+declare namespace j {
+
+    interface JfpStatic {
+		/**
+		 * jfp supports string function aliasing -- alias is a jfp function name and seeking behavior
+		 * will happen against the jfp object only.
+		 */
+        (alias: string, ...args: any[]): JfpCurriedOutput<any>;
+        (externalFunction: (...args: any[]) => any, ...args: any[]): JfpCurriedOutput<any>;
+    }
+
+    interface JfpCurriedOutput<T> { }
+
+    //Array functions
+    interface JfpStatic {
+
+		/**
+		 * Removes falsey values from an array
+		 * @param values The array to compact
+		 */
+        compact(values: any[]): any[];
+
+		/**
+		 * Clones and concatenates two arrays
+		 * @param values1 The array to concatenate to
+		 * @param values2 The array to concatenate with
+		 */
+        concat(values1: any[], values2: any[]): any[];
+
+		/**
+		 * Appends value to clone of destination array
+		 * @param value The value to add to the end of an array
+		 * @param destination The array to be cloned and appended to
+		 */
+        conj(value: any, destination: any[]): any[];
+
+		/**
+		 * Prepends value to clone of destination array
+		 * @param value The value to add to the beginning of an array
+		 * @param destination The array to be cloned and prepended to
+		 */
+        cons(value: any, destination: any[]): any[];
+
+        /**
+         * Returns a copy of passed array
+         */
+        copyArray(list: any[]): any[];
+
+        /**
+         * Takes the difference of sets A and B where the difference is A - B
+         */
+        difference(lista: any[], listb: any[]): any[];
+
+		/**
+		 * Drops value at specified index from clone of array
+		 * @param index Index to perform drop at
+		 * @param values Array to remove value from
+		 */
+        drop(index: number, values: any[]): any[];
+
+		/**
+		 * Drops first element from clone of values array
+		 * @param values Array to drop first value of
+		 */
+        dropFirst(values: any[]): any[];
+
+		/**
+		 * Drops last element from clone of values array
+		 * @param values Array to drop last value from
+		 */
+        dropLast(values: any[]): any[];
+
+        /**
+         * Drops values from array until predicate is satisfied
+         */
+        dropUntil(predicate: (...args: any[]) => boolean, list: any[]): any[];
+
+		/**
+		 * Performs iterable function on each value of provided array
+		 * @param iterable Function to perform on each value of array
+		 * @param values Array to operate on
+		 */
+        each(iteratable: (value: any) => void, values: any[]): any[];
+
+		/**
+		 * Filters all values not passing provided predicate
+		 * @param predicate Function which performs a boolean resultant operation on a value of the array
+		 * @param values Array to filter
+		 */
+        filter(predicate: (value: any) => boolean, values: any[]): any[];
+
+		/**
+		 * Finds the first value in an array that satisfies provided predicate
+		 * @param predicate Function which performs a boolean resultant operation on a value of the array
+		 * @param values Array to run predicate against
+		 */
+        find(predicate: (value: any) => boolean, values: any[]): any;
+
+        /**
+         * Drops last element of array
+         */
+        init(list: any[]): any[];
+
+        /**
+         * Takes the intersection of two arrays
+         */
+        intersect(lista: any[], listb: any[]): any[];
+
+		/**
+		 * Returns the first value in an array
+		 * @param values Array of values
+		 */
+        first(values: any[]): any;
+
+		/**
+		 * Returns last value in an array
+		 * @param values Array of values
+		 */
+        last(values: any[]): any;
+
+		/**
+		 * Returns last index of an array
+		 * @param values Array
+		 */
+        lastIndex(values: any[]): number;
+
+		/**
+		 * Maps functions into new array using mapper function
+		 * @param mapper Mapping function
+		 * @param values Array to map
+		 */
+        map(mapper: (value: any) => any, values: any[]): any[];
+
+        /**
+         * Takes multiple partitions of a list using a partitioning predicate and criteria
+         */
+        multiPartition(predicate: (criterion: any, value: any) => boolean, criteria: any[], list: any[]): any[][];
+
+        /**
+         * Counts number of list values which satisfy predicate
+         */
+        numberOf(predicate: (value: any) => boolean, list: any[]): number;
+
+        /**
+         * Partitions array on values which pass and do not pass predicate
+         */
+        partition(predicate: (value: any) => boolean, list: any[]): any[][];
+
+		/**
+		 * Returns nth value of passed array
+		 * @param index Array index
+		 * @param values Array of values
+		 */
+        nth(index: number, values: any[]): any;
+
+		/**
+		 * Reduces array using reducer function
+		 * @param reducer Function to reduce values with
+		 * @param values Array to reduce
+		 */
+        reduce(reducer: (condition1: any, condition2: any) => any, values: any[]): any;
+
+		/**
+		 * Reduces array using reducer function
+		 * @param reducer Function to reduce values with
+		 * @param values Array to reduce
+		 * @param initialCondition Initial value to use in first reduction application
+		 */
+        reduce(reducer: (condition1: any, condition2: any) => any, values: any[], initialCondition: any): any;
+
+		/**
+		 * Returns all but the first element of array
+		 * @param values Array to return the rest of
+		 */
+        rest(values: any[]): any[];
+
+		/**
+		 * Returns a slice of an array
+		 * @param initialIndex index to start slicing at
+		 * @param values Array to slice
+		 */
+        slice(initialIndex: number, values: any[]): any[];
+
+		/**
+		 * Returns a slice of an array
+		 * @param initialIndex index to start slicing at
+		 * @param values Array to slice
+		 * @param lastIndex Index to end slice with
+		 */
+        slice(initialIndex: number, values: any[], lastIndex: number): any[];
+
+        /**
+         * Returns true if at least one array element satisfies predicate, else false
+         */
+        some(predicate: (value: any) => boolean, list: any[]): boolean;
+
+        /**
+         * Sorts values in an array with an optional comparator arguments
+         */
+        sort(list: any[]): any[];
+        sort(list: any[], comparator: (a: any, b: any) => number): any[];
+
+        /**
+         * Takes the symmetric difference of two arrays
+         */
+        symmetricDifference(lista: any[], listb: any[]): any[];
+
+		/**
+		 * Returns first n values of an array
+		 * @param quantity Number of values to return
+		 * @param values Array of values to take from
+		 */
+        take(quantity: number, values: any[]): any[];
+
+        /**
+         * Takes values from array until predicate is satisfied
+         */
+        takeUntil(predicate: (value: any) => boolean, list: any[]): any[];
+
+        /**
+         * Takes the union of two arrays
+         */
+        union(lista: any[], listb: any[]): any[];
+
+		/**
+		 * Returns array of values with duplicates removed
+		 * @param values Array of values to filter by uniqueness
+		 */
+        unique(values: any[]): any[];
+
+        /**
+         * Zips two arrays together into an array of arrays
+         */
+        zip(lista: any[], listb: any[]): any[][];
+
+    }
+
+    //Conditional functions
+    interface JfpStatic {
+
+		/**
+		 * Returns preferred value if truthy, otherwise returns default value
+		 * @param defaultValue Default value
+		 * @param preferredValue Preferred value
+		 */
+        either(defaultValue: any, preferredValue: any): any;
+
+		/**
+		 * Returns provided value if truthy or matches datatype, otherwise returns default value
+		 * @param defaultValue Default value
+		 * @param preferredValue Preferred value
+		 * @param datatype Type preferred value should be
+		 */
+        either(defaultValue: any, preferredValue: any, datatype: string): any;
+
+		/**
+		 * Returns preferred value if truthy, otherwise returns default value
+		 * @param defaultValue Default value
+		 * @param preferredValue Preferred value
+		 * @param predicateValue Boolean switch to return default or preferred value
+		 */
+        eitherIf(defaultValue: any, preferredValue: any, predicateValue: boolean): any;
+
+		/**
+		 * Returns provided value if truthy, otherwise returns default value
+		 * @param defaultValue Default value
+		 * @param preferredValue Preferred value
+		 * @param predicate Predicate function preferred value is tested against
+		 */
+        eitherWhen(defaultValue: any, preferredValue: any, predicate: (value: any) => boolean): any;
+
+		/**
+		 * Returns preferred value if truthy, otherwise null
+		 * @param preferredValue Preferred value to check
+		 */
+        maybe(preferredValue: any): any;
+
+		/**
+		 * Returns preferred value if truthy or matches datatype, otherwise null
+		 * @param preferredValue Preferred value to check
+		 * @param datatype Datatype to match
+		 */
+        maybe(preferredValue: any, datatype: string): any;
+
+        /**
+         * Executes function if value is truthy, otherwise returns default
+         * @param defaultValue
+         * @param userFn
+         * @param value
+         */
+        shortCircuit(defaultValue: any, userFn: (...args: any[]) => any, value: any): any;
+
+		/**
+		 * Executes function when condition is true
+		 * @param predicateValue Value to set behavior execution
+		 * @param userFunction Behavior to execute
+		 */
+        when(predicateValue: boolean, userFunction: (...args: any[]) => any): any;
+
+		/**
+		 * Executes function when condition is true
+		 * @param predicateValue Value to set behavior execution
+		 * @param userFunction Behavior to execute
+		 * @param ...args arguments for userFunction
+		 */
+        when(predicateValue: boolean, userFunction: (...args: any[]) => any, ...args: any[]): any;
+
+    }
+
+    interface JfpStatic {
+
+		/**
+		 * Converts value to decimal equivalent returns null if non-convertable
+		 * @param value String or number value to convert
+		 */
+        toDec(value: string): number;
+        toDec(value: number): number;
+
+		/**
+		 * Converts an object literal into an array of values
+		 * @param value Object literal
+		 */
+        toValues(value: Object): any[];
+
+    }
+
+    interface JfpStatic {
+
+        /**
+         * Returns function which returns provided value
+         * Signature: (any) -> () -> any
+         * @param value Value to return from produced function
+         */
+        always(value: any): (...args: any[]) => any;
+
+        /**
+         * Applies an array of values to a function
+         * @param userFn Function to perform application against
+         * @param values Array of arguments for function
+         */
+        apply(userFn: (...args: any[]) => any, values: any[]): void;
+
+		/**
+		 * Composes a set of functions into a new single function
+		 * @param ...args Arguments for compose
+		 */
+        compose(...args: ((...args: any[]) => any)[]): (...args: any[]) => any
+
+		/**
+		 * Counts the number of arguments in a function declaration
+		 * @param userFn Function to count arguments of
+		 */
+        countArguments(userFn: (...args: any[]) => any): number;
+
+		/**
+		 * Curries function until all arguments are satisfied
+		 * @param userFn Function to curry
+		 * @param ...argments Initial arguments for currying application
+		 */
+        curry(userFn: (...args: any[]) => any): (...args: any[]) => any;
+        curry(userFn: (...args: any[]) => any): any;
+        curry(userFn: (...args: any[]) => any, ...args: any[]): (...args: any[]) => any;
+        curry(userFn: (...args: any[]) => any, ...args: any[]): any;
+
+        /**
+         * Executes passed function
+         * @param userFn
+         */
+        execute(userFn: (...args: any[]) => any): any;
+
+        /**
+         * Gets type of passed value
+         * @param value
+         */
+        getType(value: any): string;
+
+		/**
+		 * Returns value passed to the function
+		 * @param value Value to return
+		 */
+        identity(value: any): any;
+
+		/**
+		 * Applies values to a function and returns partially applied function
+		 * @param userFn Function to apply values to
+		 * @param ...args Values to apply
+		 */
+        partial(userFn: (...args: any[]) => any): (...args: any[]) => any;
+        partial(userFn: (...args: any[]) => any, ...args: any[]): (...args: any[]) => any;
+
+		/**
+		 * Pipelines or chains functions producing a single final output
+		 * @param value Initial condition for function pipelining
+		 * @param ...args Functions to chain/pipeline
+		 */
+        pipeline(value: any, ...args: ((...args: any[]) => any)[]): any;
+
+		/**
+		 * Recursion function to allow for tail-optimized recursion
+		 * @param userFn Function to recur on
+		 * @param ...args Initial condition arguments
+		 */
+        recur(userFn: (...args: any[]) => any): any;
+        recur(userFn: (...args: any[]) => any, ...args: any[]): any;
+
+        /**
+         * Reverses arguments of provided function
+         * @param userFn
+         */
+        reverseArgs(userFn: (...args: any[]) => any): (...args: any[]) => any;
+
+		/**
+		 * Performs a right partial application on a function
+		 * @param userFn Function to apply arguments
+		 * @param ...args Inital arguments
+		 */
+        rpartial(userFn: (...args: any[]) => any): any;
+        rpartial(userFn: (...args: any[]) => any, ...args: any[]): any;
+
+        /**
+         * Performs a split partial application
+         * @param userFn
+         * @param leftArgs
+         * @param rightArgs
+         */
+        splitPartial(userFn: (...args: any[]) => any, leftArgs: any[], rightArgs: any[]): (...args: any[]) => any;
+    }
+
+    // Predicate functions
+    interface JfpStatic {
+
+        /**
+         * Returns true if array contains provided value, else false
+         */
+        contains(value: any, list: any[]): boolean;
+
+        /**
+         * Checks value equality of two arguments
+         * @param valuea
+         * @param valueb
+         */
+        equal(valuea: any, valueb: any): boolean;
+
+        /**
+         * Checks if every value in an array passes a predicate
+         */
+        every(predicate: (value: any) => boolean, list: any[]): boolean;
+
+        /**
+         * Checks if value is an empty string
+         * @param value
+         */
+        isEmptyString(value: any): boolean;
+
+        /**
+         * Checks if value is null
+         * @param value
+         */
+        isNull(value: any): boolean;
+
+        /**
+         * Checks if value is of type passed as string
+         * @param type
+         * @param value
+         */
+        isType(type: string, value: any): boolean;
+
+        /**
+         * Checks if passed value is an array
+         */
+        isArray(value: any): boolean;
+
+        /**
+         * Checks if passed value is a boolean
+         */
+        isBoolean(value: any): boolean;
+
+        /**
+         * Checks if passed value is a function
+         */
+        isFunction(value: any): boolean;
+
+        /**
+         * Checks if passed value is a number
+         */
+        isNumber(value: any): boolean;
+
+        /**
+         * Checks if passed value is an object
+         */
+        isObject(value: any): boolean;
+
+        /**
+         * Checks if passed value is a string
+         */
+        isString(value: any): boolean;
+
+        /**
+         * Checks if passed value is undefined
+         */
+        isUndefined(value: any): boolean;
+
+        /**
+         * Checks if passed value is a tuple
+         */
+        isTuple(value: any): boolean;
+
+        /**
+         * Checks if passed value is a tuple of length 2
+         */
+        isPair(value: any): boolean;
+
+        /**
+         * Checks if passed value is a tuple of length 1
+         */
+        isSingle(value: any): boolean;
+
+        /**
+         * Checks if passed value is a tuple of length 3
+         */
+        isTriple(value: any): boolean;
+
+        /**
+         * Checks that passed value is an array which contains a first value
+         */
+        hasFirst(value: any): boolean;
+
+        /**
+         * Checks if passed value is either a number or a numeric string
+         */
+        isNumeric(value: any): boolean;
+
+        /**
+         * Checks if passed value is a primitive Javascript type
+         */
+        isPrimitive(value: any): boolean;
+
+        /**
+         * Checks if passed value is truthy
+         */
+        isTruthy(value: any): boolean;
+
+        /**
+         * Returns boolean inverse of passed value
+         */
+        not(value: boolean): boolean;
+
+    }
+
+    // Composite functions
+    interface JfpStatic {
+
+        /**
+         * Clones values to an optional depth
+         */
+        clone(value: any): any;
+        clone(value: any, depth: number): any;
+
+        /**
+         * Composes functions together in common nested order
+         */
+        compose(...args: ((...args: any[]) => any)[]): (...args: any[]) => any;
+
+        /**
+         * Curries passed function and applies optional arguments
+         */
+        curry(fn: (...args: any[]) => any, ...args: any[]): (...args: any[]) => any;
+
+        /**
+         * Returns either typed value based on type parameter
+         */
+        eitherType(type: string, defaultValue: any, value: any): any;
+
+        /**
+         * Returns maybe typed value based on type parameter
+         */
+        maybeType(type: string, value: any): any;
+
+        /**
+         * Returns a partially applied function with remaining arguments reversed
+         */
+        partialReverse(fn: (...args: any[]) => any, ...args: any[]): (...args: any[]) => any;
+
+        /**
+         * Passes chains functions together with an initial arguments
+         */
+        pipeline(value: any, ...args: ((...args: any[]) => any)[]): any;
+
+        /**
+         * Composes functions executing from left to right
+         */
+        rcompose(...args: ((...args: any[]) => any)[]): (...args: any[]) => any;
+
+        /**
+         * Executes a trampolined tail-optimized recursive function
+         */
+        recur(fn: (...args: any[]) => any): any;
+
+        /**
+         * Repeats action n times
+         */
+        repeat(count: number, action: (...args: any[]) => any): any;
+
+        /**
+         * Outputs a string composed of n copies of base string
+         */
+        times(count: number, value: string): string;
+
+    }
+
+    interface JfpStatic {
+
+        /**
+         * Converts string to decimal safely
+         */
+        toDec(value: any): number;
+
+    }
+
+    interface JfpStatic {
+
+        /**
+         * Adds two numbers
+         */
+        add(a: number, b: number): number;
+
+        /**
+         * Divides first number by second
+         */
+        divide(numerator: number, denominator: number): number;
+
+        /**
+         * Takes the factorial of passed number
+         */
+        fac(n: number): number;
+
+        /**
+         * Increments a number
+         */
+        inc(value: number): number;
+
+        /**
+         * Takes the maximum of two numbers
+         */
+        max(a: number, b: number): number;
+
+        /**
+         * Takes the minimum of two numbers
+         */
+        min(a: number, b: number): number;
+
+        /**
+         * Takes the modulus of first number against second number
+         */
+        mod(a: number, b: number): number;
+
+        /**
+         * Takes mathematical modulo of first number against second number
+         */
+        modulo(a: number, b: number): number;
+
+        /**
+         * Multiplies two numbers
+         */
+        multiply(a: number, b: number): number;
+
+        /**
+         * Creates a range either from 0 to an integer or from one integer to another
+         */
+        range(end: number): number[];
+        range(start: number, end: number): number[];
+
+        /**
+         * Subtracts second argument from first
+         */
+        subtract(a: number, b: number): number;
+
+        /**
+         * Truncates number to floor if positive or to ceil if negative
+         */
+        truncate(value: number): number;
+
+    }
+
+    interface JfpStatic {
+
+        /**
+         * Checks if number is negative
+         */
+        isNegative(value: number): boolean;
+
+        /**
+         * Checks if number is positive
+         */
+        isPositive(value: number): boolean;
+
+        /**
+         * Checks if number is 0
+         */
+        isZero(value: number): boolean;
+
+        /**
+         * Checks if number is between two values
+         */
+        between(bounds: number[], value: number): boolean;
+
+        /**
+         * Checks if value is even
+         */
+        isEven(value: number): boolean;
+
+        /**
+         * Checks if value is an integer
+         */
+        isInt(value: number): boolean;
+
+        /**
+         * Checks if value is a multiple of base value
+         */
+        isMultipleOf(base: number, value: number): boolean;
+
+        /**
+         * Checks if value is positive or 0
+         */
+        isNonNegative(value: number): boolean;
+
+        /**
+         * Checks if value is negative or 0
+         */
+        isNonPositive(value: number): boolean;
+
+        /**
+         * Checks if value is not 0
+         */
+        isNonZero(value: number): boolean;
+
+        /**
+         * Checks if value is odd
+         */
+        isOdd(value: number): boolean;
+
+        /**
+         * Checks if a is greater or equal to b
+         */
+        geq(a: number, b: number): boolean;
+
+        /**
+         * Checks if a is greater than b
+         */
+        greater(a: number, b: number): boolean;
+
+        /**
+         * Checks if a is less than or equal to b
+         */
+        leq(a: number, b: number): boolean;
+
+        /**
+         * Checks if a is less than b
+         */
+        less(a: number, b: number): boolean;
+
+    }
+
+    interface JfpStatic {
+
+        /**
+         * Gets object keys
+         */
+        getKeys(dataset: {}): string[];
+
+        /**
+         * Merges right object into a copy of left object
+         */
+        merge(left: {}, right: {}): {};
+
+        /**
+         * Picks key from object
+         */
+        pick(key: string, dataset: {}): any;
+
+    }
+
+    interface JfpStatic {
+
+        /**
+         * Traverses object tree and retrieves dot-delimited key or returns null
+         */
+        deref(key: string, dataset: {}): any;
+
+        /**
+         * Picks value from object by key and returns a new object containing key value pair
+         */
+        pluck(key: string, dataset: {}): {};
+
+        /**
+         * Performs pluck across an array of keys, returns a single object containing all key value pairs
+         */
+        pluckKeys(keys: string[], dataset: {}): {};
+
+        /**
+         * Converts object to an array of values
+         */
+        toValues(dataset: {}): any[];
+
+        /**
+         * Transforms object to a new object containing transformed keys
+         */
+        transform(transformation: string[][], dataset: {}): {};
+
+    }
+
+    interface JfpStatic {
+
+        /**
+         * Performs a conjunction (and) operation on two or more booleans
+         */
+        and(a: boolean, b: boolean, ...args: boolean[]): boolean;
+
+        /**
+         * Performs a disjunction (or) operation on two or more booleans
+         */
+        or(a: boolean, b: boolean, ...args: boolean[]): boolean;
+
+        /**
+         * Performs an exclusive or operation on two booleans
+         */
+        xor(a: boolean, b: boolean): boolean;
+
+        /**
+         * Creates composite predicate which performs each check on a value and then conjoins the result
+         */
+        composePredicate(...args: ((...args: any[]) => boolean)[]): (...args: any[]) => boolean;
+
+
+    }
+
+}
\ No newline at end of file
diff --git a/jfp/jfp-tests.ts b/jfp/jfp-tests.ts
index 4612e36547..75e4e65be3 100644
--- a/jfp/jfp-tests.ts
+++ b/jfp/jfp-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jfp.d.ts" />
+import j = require("jfp");
 
 function testFn () {};
 
diff --git a/jfp/jfp.d.ts b/jfp/jfp.d.ts
deleted file mode 100644
index 3617dd2453..0000000000
--- a/jfp/jfp.d.ts
+++ /dev/null
@@ -1,848 +0,0 @@
-// Type definitions for JFP
-// Project: http://cmstead.github.io/JFP
-// Definitions by: Chris Stead <http://www.chrisstead.com>
-// Definitions: https://github.com/cmstead/DefinitelyTyped
-
-declare var j: j.JfpStatic
-
-declare namespace j {
-
-    interface JfpStatic {
-		/**
-		 * jfp supports string function aliasing -- alias is a jfp function name and seeking behavior
-		 * will happen against the jfp object only.
-		 */
-        (alias: string, ...arguments: any[]): JfpCurriedOutput<any>;
-        (externalFunction: (...arguments: any[]) => any, ...arguments: any[]): JfpCurriedOutput<any>;
-    }
-
-    interface JfpCurriedOutput<T> { }
-
-    //Array functions
-    interface JfpStatic {
-
-		/**
-		 * Removes falsey values from an array
-		 * @param values The array to compact
-		 */
-        compact(values: any[]): any[];
-
-		/**
-		 * Clones and concatenates two arrays
-		 * @param values1 The array to concatenate to
-		 * @param values2 The array to concatenate with
-		 */
-        concat(values1: any[], values2: any[]): any[];
-
-		/**
-		 * Appends value to clone of destination array
-		 * @param value The value to add to the end of an array
-		 * @param destination The array to be cloned and appended to
-		 */
-        conj(value: any, destination: any[]): any[];
-
-		/**
-		 * Prepends value to clone of destination array
-		 * @param value The value to add to the beginning of an array
-		 * @param destination The array to be cloned and prepended to
-		 */
-        cons(value: any, destination: any[]): any[];
-
-        /**
-         * Returns a copy of passed array
-         */
-        copyArray(list: any[]): any[];
-
-        /**
-         * Takes the difference of sets A and B where the difference is A - B
-         */
-        difference(lista: any[], listb: any[]): any[];
-
-		/**
-		 * Drops value at specified index from clone of array
-		 * @param index Index to perform drop at
-		 * @param values Array to remove value from
-		 */
-        drop(index: number, values: any[]): any[];
-
-		/**
-		 * Drops first element from clone of values array
-		 * @param values Array to drop first value of
-		 */
-        dropFirst(values: any[]): any[];
-
-		/**
-		 * Drops last element from clone of values array
-		 * @param values Array to drop last value from
-		 */
-        dropLast(values: any[]): any[];
-
-        /**
-         * Drops values from array until predicate is satisfied
-         */
-        dropUntil(predicate: (...arguments: any[]) => boolean, list: any[]): any[];
-
-		/**
-		 * Performs iterable function on each value of provided array
-		 * @param iterable Function to perform on each value of array
-		 * @param values Array to operate on
-		 */
-        each(iteratable: (value: any) => void, values: any[]): any[];
-
-		/**
-		 * Filters all values not passing provided predicate
-		 * @param predicate Function which performs a boolean resultant operation on a value of the array
-		 * @param values Array to filter
-		 */
-        filter(predicate: (value: any) => boolean, values: any[]): any[];
-
-		/**
-		 * Finds the first value in an array that satisfies provided predicate
-		 * @param predicate Function which performs a boolean resultant operation on a value of the array
-		 * @param values Array to run predicate against
-		 */
-        find(predicate: (value: any) => boolean, values: any[]): any;
-
-        /**
-         * Drops last element of array
-         */
-        init(list: any[]): any[];
-
-        /**
-         * Takes the intersection of two arrays
-         */
-        intersect(lista: any[], listb: any[]): any[];
-
-		/**
-		 * Returns the first value in an array
-		 * @param values Array of values
-		 */
-        first(values: any[]): any;
-
-		/**
-		 * Returns last value in an array
-		 * @param values Array of values
-		 */
-        last(values: any[]): any;
-
-		/**
-		 * Returns last index of an array
-		 * @param values Array
-		 */
-        lastIndex(values: any[]): number;
-
-		/**
-		 * Maps functions into new array using mapper function
-		 * @param mapper Mapping function
-		 * @param values Array to map
-		 */
-        map(mapper: (value: any) => any, values: any[]): any[];
-
-        /**
-         * Takes multiple partitions of a list using a partitioning predicate and criteria
-         */
-        multiPartition(predicate: (criterion: any, value: any) => boolean, criteria: any[], list: any[]): any[][];
-
-        /**
-         * Counts number of list values which satisfy predicate
-         */
-        numberOf(predicate: (value: any) => boolean, list: any[]): number;
-
-        /**
-         * Partitions array on values which pass and do not pass predicate
-         */
-        partition(predicate: (value: any) => boolean, list: any[]): any[][];
-
-		/**
-		 * Returns nth value of passed array
-		 * @param index Array index
-		 * @param values Array of values
-		 */
-        nth(index: number, values: any[]): any;
-
-		/**
-		 * Reduces array using reducer function
-		 * @param reducer Function to reduce values with
-		 * @param values Array to reduce
-		 */
-        reduce(reducer: (condition1: any, condition2: any) => any, values: any[]): any;
-
-		/**
-		 * Reduces array using reducer function
-		 * @param reducer Function to reduce values with
-		 * @param values Array to reduce
-		 * @param initialCondition Initial value to use in first reduction application
-		 */
-        reduce(reducer: (condition1: any, condition2: any) => any, values: any[], initialCondition: any): any;
-
-		/**
-		 * Returns all but the first element of array
-		 * @param values Array to return the rest of
-		 */
-        rest(values: any[]): any[];
-
-		/**
-		 * Returns a slice of an array
-		 * @param initialIndex index to start slicing at
-		 * @param values Array to slice
-		 */
-        slice(initialIndex: number, values: any[]): any[];
-
-		/**
-		 * Returns a slice of an array
-		 * @param initialIndex index to start slicing at
-		 * @param values Array to slice
-		 * @param lastIndex Index to end slice with
-		 */
-        slice(initialIndex: number, values: any[], lastIndex: number): any[];
-
-        /**
-         * Returns true if at least one array element satisfies predicate, else false
-         */
-        some(predicate: (value: any) => boolean, list: any[]): boolean;
-
-        /**
-         * Sorts values in an array with an optional comparator arguments
-         */
-        sort(list: any[]): any[];
-        sort(list: any[], comparator: (a: any, b: any) => number): any[];
-
-        /**
-         * Takes the symmetric difference of two arrays
-         */
-        symmetricDifference(lista: any[], listb: any[]): any[];
-
-		/**
-		 * Returns first n values of an array
-		 * @param quantity Number of values to return
-		 * @param values Array of values to take from
-		 */
-        take(quantity: number, values: any[]): any[];
-
-        /**
-         * Takes values from array until predicate is satisfied
-         */
-        takeUntil(predicate: (value: any) => boolean, list: any[]): any[];
-
-        /**
-         * Takes the union of two arrays
-         */
-        union(lista: any[], listb: any[]): any[];
-
-		/**
-		 * Returns array of values with duplicates removed
-		 * @param values Array of values to filter by uniqueness
-		 */
-        unique(values: any[]): any[];
-
-        /**
-         * Zips two arrays together into an array of arrays
-         */
-        zip(lista: any[], listb: any[]): any[][];
-
-    }
-
-    //Conditional functions
-    interface JfpStatic {
-
-		/**
-		 * Returns preferred value if truthy, otherwise returns default value
-		 * @param defaultValue Default value
-		 * @param preferredValue Preferred value
-		 */
-        either(defaultValue: any, preferredValue: any): any;
-
-		/**
-		 * Returns provided value if truthy or matches datatype, otherwise returns default value
-		 * @param defaultValue Default value
-		 * @param preferredValue Preferred value
-		 * @param datatype Type preferred value should be
-		 */
-        either(defaultValue: any, preferredValue: any, datatype: string): any;
-
-		/**
-		 * Returns preferred value if truthy, otherwise returns default value
-		 * @param defaultValue Default value
-		 * @param preferredValue Preferred value
-		 * @param predicateValue Boolean switch to return default or preferred value
-		 */
-        eitherIf(defaultValue: any, preferredValue: any, predicateValue: boolean): any;
-
-		/**
-		 * Returns provided value if truthy, otherwise returns default value
-		 * @param defaultValue Default value
-		 * @param preferredValue Preferred value
-		 * @param predicate Predicate function preferred value is tested against
-		 */
-        eitherWhen(defaultValue: any, preferredValue: any, predicate: (value: any) => boolean): any;
-
-		/**
-		 * Returns preferred value if truthy, otherwise null
-		 * @param preferredValue Preferred value to check
-		 */
-        maybe(preferredValue: any): any;
-
-		/**
-		 * Returns preferred value if truthy or matches datatype, otherwise null
-		 * @param preferredValue Preferred value to check
-		 * @param datatype Datatype to match
-		 */
-        maybe(preferredValue: any, datatype: string): any;
-
-        /**
-         * Executes function if value is truthy, otherwise returns default
-         * @param defaultValue
-         * @param userFn
-         * @param value
-         */
-        shortCircuit(defaultValue: any, userFn: (...arguments: any[]) => any, value: any): any;
-
-		/**
-		 * Executes function when condition is true
-		 * @param predicateValue Value to set behavior execution
-		 * @param userFunction Behavior to execute
-		 */
-        when(predicateValue: boolean, userFunction: (...arguments: any[]) => any): any;
-
-		/**
-		 * Executes function when condition is true
-		 * @param predicateValue Value to set behavior execution
-		 * @param userFunction Behavior to execute
-		 * @param ...arguments arguments for userFunction
-		 */
-        when(predicateValue: boolean, userFunction: (...arguments: any[]) => any, ...arguments: any[]): any;
-
-    }
-
-    interface JfpStatic {
-
-		/**
-		 * Converts value to decimal equivalent returns null if non-convertable
-		 * @param value String or number value to convert
-		 */
-        toDec(value: string): number;
-        toDec(value: number): number;
-
-		/**
-		 * Converts an object literal into an array of values
-		 * @param value Object literal
-		 */
-        toValues(value: Object): any[];
-
-    }
-
-    interface JfpStatic {
-
-        /**
-         * Returns function which returns provided value
-         * Signature: (any) -> () -> any
-         * @param value Value to return from produced function
-         */
-        always(value: any): (...arguments: any[]) => any;
-
-        /**
-         * Applies an array of values to a function
-         * @param userFn Function to perform application against
-         * @param values Array of arguments for function
-         */
-        apply(userFn: (...arguments: any[]) => any, values: any[]): void;
-
-		/**
-		 * Composes a set of functions into a new single function
-		 * @param ...arguments Arguments for compose
-		 */
-        compose(...arguments: ((...arguments: any[]) => any)[]): (...arguments: any[]) => any
-
-		/**
-		 * Counts the number of arguments in a function declaration
-		 * @param userFn Function to count arguments of
-		 */
-        countArguments(userFn: (...arguments: any[]) => any): number;
-
-		/**
-		 * Curries function until all arguments are satisfied
-		 * @param userFn Function to curry
-		 * @param ...argments Initial arguments for currying application
-		 */
-        curry(userFn: (...arguments: any[]) => any): (...arguments: any[]) => any;
-        curry(userFn: (...arguments: any[]) => any): any;
-        curry(userFn: (...arguments: any[]) => any, ...arguments: any[]): (...arguments: any[]) => any;
-        curry(userFn: (...arguments: any[]) => any, ...arguments: any[]): any;
-
-        /**
-         * Executes passed function
-         * @param userFn
-         */
-        execute(userFn: (...arguments: any[]) => any): any;
-
-        /**
-         * Gets type of passed value
-         * @param value
-         */
-        getType(value: any): string;
-
-		/**
-		 * Returns value passed to the function
-		 * @param value Value to return
-		 */
-        identity(value: any): any;
-
-		/**
-		 * Applies values to a function and returns partially applied function
-		 * @param userFn Function to apply values to
-		 * @param ...arguments Values to apply
-		 */
-        partial(userFn: (...arguments: any[]) => any): (...arguments: any[]) => any;
-        partial(userFn: (...arguments: any[]) => any, ...arguments: any[]): (...arguments: any[]) => any;
-
-		/**
-		 * Pipelines or chains functions producing a single final output
-		 * @param value Initial condition for function pipelining
-		 * @param ...arguments Functions to chain/pipeline
-		 */
-        pipeline(value: any, ...arguments: ((...arguments: any[]) => any)[]): any;
-
-		/**
-		 * Recursion function to allow for tail-optimized recursion
-		 * @param userFn Function to recur on
-		 * @param ...arguments Initial condition arguments
-		 */
-        recur(userFn: (...arguments: any[]) => any): any;
-        recur(userFn: (...arguments: any[]) => any, ...arguments: any[]): any;
-
-        /**
-         * Reverses arguments of provided function
-         * @param userFn
-         */
-        reverseArgs(userFn: (...arguments: any[]) => any): (...arguments: any[]) => any;
-
-		/**
-		 * Performs a right partial application on a function
-		 * @param userFn Function to apply arguments
-		 * @param ...arguments Inital arguments
-		 */
-        rpartial(userFn: (...arguments: any[]) => any): any;
-        rpartial(userFn: (...arguments: any[]) => any, ...arguments: any[]): any;
-
-        /**
-         * Performs a split partial application
-         * @param userFn
-         * @param leftArgs
-         * @param rightArgs
-         */
-        splitPartial(userFn: (...arguments: any[]) => any, leftArgs: any[], rightArgs: any[]): (...arguments: any[]) => any;
-    }
-
-    // Predicate functions
-    interface JfpStatic {
-
-        /**
-         * Returns true if array contains provided value, else false
-         */
-        contains(value: any, list: any[]): boolean;
-
-        /**
-         * Checks value equality of two arguments
-         * @param valuea
-         * @param valueb
-         */
-        equal(valuea: any, valueb: any): boolean;
-
-        /**
-         * Checks if every value in an array passes a predicate
-         */
-        every(predicate: (value: any) => boolean, list: any[]): boolean;
-
-        /**
-         * Checks if value is an empty string
-         * @param value
-         */
-        isEmptyString(value: any): boolean;
-
-        /**
-         * Checks if value is null
-         * @param value
-         */
-        isNull(value: any): boolean;
-
-        /**
-         * Checks if value is of type passed as string
-         * @param type
-         * @param value
-         */
-        isType(type: string, value: any): boolean;
-
-        /**
-         * Checks if passed value is an array
-         */
-        isArray(value: any): boolean;
-
-        /**
-         * Checks if passed value is a boolean
-         */
-        isBoolean(value: any): boolean;
-
-        /**
-         * Checks if passed value is a function
-         */
-        isFunction(value: any): boolean;
-
-        /**
-         * Checks if passed value is a number
-         */
-        isNumber(value: any): boolean;
-
-        /**
-         * Checks if passed value is an object
-         */
-        isObject(value: any): boolean;
-
-        /**
-         * Checks if passed value is a string
-         */
-        isString(value: any): boolean;
-
-        /**
-         * Checks if passed value is undefined
-         */
-        isUndefined(value: any): boolean;
-
-        /**
-         * Checks if passed value is a tuple
-         */
-        isTuple(value: any): boolean;
-
-        /**
-         * Checks if passed value is a tuple of length 2
-         */
-        isPair(value: any): boolean;
-
-        /**
-         * Checks if passed value is a tuple of length 1
-         */
-        isSingle(value: any): boolean;
-
-        /**
-         * Checks if passed value is a tuple of length 3
-         */
-        isTriple(value: any): boolean;
-
-        /**
-         * Checks that passed value is an array which contains a first value
-         */
-        hasFirst(value: any): boolean;
-
-        /**
-         * Checks if passed value is either a number or a numeric string
-         */
-        isNumeric(value: any): boolean;
-
-        /**
-         * Checks if passed value is a primitive Javascript type
-         */
-        isPrimitive(value: any): boolean;
-
-        /**
-         * Checks if passed value is truthy
-         */
-        isTruthy(value: any): boolean;
-
-        /**
-         * Returns boolean inverse of passed value
-         */
-        not(value: boolean): boolean;
-
-    }
-
-    // Composite functions
-    interface JfpStatic {
-
-        /**
-         * Clones values to an optional depth
-         */
-        clone(value: any): any;
-        clone(value: any, depth: number): any;
-
-        /**
-         * Composes functions together in common nested order
-         */
-        compose(...arguments: ((...arguments: any[]) => any)[]): (...arguments: any[]) => any;
-
-        /**
-         * Curries passed function and applies optional arguments
-         */
-        curry(fn: (...arguments: any[]) => any, ...arguments: any[]): (...arguments: any[]) => any;
-
-        /**
-         * Returns either typed value based on type parameter
-         */
-        eitherType(type: string, defaultValue: any, value: any): any;
-
-        /**
-         * Returns maybe typed value based on type parameter
-         */
-        maybeType(type: string, value: any): any;
-
-        /**
-         * Returns a partially applied function with remaining arguments reversed
-         */
-        partialReverse(fn: (...arguments: any[]) => any, ...arguments: any[]): (...arguments: any[]) => any;
-
-        /**
-         * Passes chains functions together with an initial arguments
-         */
-        pipeline(value: any, ...arguments: ((...arguments: any[]) => any)[]): any;
-
-        /**
-         * Composes functions executing from left to right
-         */
-        rcompose(...arguments: ((...arguments: any[]) => any)[]): (...arguments: any[]) => any;
-
-        /**
-         * Executes a trampolined tail-optimized recursive function
-         */
-        recur(fn: (...arguments: any[]) => any): any;
-
-        /**
-         * Repeats action n times
-         */
-        repeat(count: number, action: (...arguments: any[]) => any): any;
-
-        /**
-         * Outputs a string composed of n copies of base string
-         */
-        times(count: number, value: string): string;
-
-    }
-
-    interface JfpStatic {
-
-        /**
-         * Converts string to decimal safely
-         */
-        toDec(value: any): number;
-
-    }
-
-    interface JfpStatic {
-
-        /**
-         * Adds two numbers
-         */
-        add(a: number, b: number): number;
-
-        /**
-         * Divides first number by second
-         */
-        divide(numerator: number, denominator: number): number;
-
-        /**
-         * Takes the factorial of passed number
-         */
-        fac(n: number): number;
-
-        /**
-         * Increments a number
-         */
-        inc(value: number): number;
-
-        /**
-         * Takes the maximum of two numbers
-         */
-        max(a: number, b: number): number;
-
-        /**
-         * Takes the minimum of two numbers
-         */
-        min(a: number, b: number): number;
-
-        /**
-         * Takes the modulus of first number against second number
-         */
-        mod(a: number, b: number): number;
-
-        /**
-         * Takes mathematical modulo of first number against second number
-         */
-        modulo(a: number, b: number): number;
-
-        /**
-         * Multiplies two numbers
-         */
-        multiply(a: number, b: number): number;
-
-        /**
-         * Creates a range either from 0 to an integer or from one integer to another
-         */
-        range(end: number): number[];
-        range(start: number, end: number): number[];
-
-        /**
-         * Subtracts second argument from first
-         */
-        subtract(a: number, b: number): number;
-
-        /**
-         * Truncates number to floor if positive or to ceil if negative
-         */
-        truncate(value: number): number;
-
-    }
-
-    interface JfpStatic {
-
-        /**
-         * Checks if number is negative
-         */
-        isNegative(value: number): boolean;
-
-        /**
-         * Checks if number is positive
-         */
-        isPositive(value: number): boolean;
-
-        /**
-         * Checks if number is 0
-         */
-        isZero(value: number): boolean;
-
-        /**
-         * Checks if number is between two values
-         */
-        between(bounds: number[], value: number): boolean;
-
-        /**
-         * Checks if value is even
-         */
-        isEven(value: number): boolean;
-
-        /**
-         * Checks if value is an integer
-         */
-        isInt(value: number): boolean;
-
-        /**
-         * Checks if value is a multiple of base value
-         */
-        isMultipleOf(base: number, value: number): boolean;
-
-        /**
-         * Checks if value is positive or 0
-         */
-        isNonNegative(value: number): boolean;
-
-        /**
-         * Checks if value is negative or 0
-         */
-        isNonPositive(value: number): boolean;
-
-        /**
-         * Checks if value is not 0
-         */
-        isNonZero(value: number): boolean;
-
-        /**
-         * Checks if value is odd
-         */
-        isOdd(value: number): boolean;
-
-        /**
-         * Checks if a is greater or equal to b
-         */
-        geq(a: number, b: number): boolean;
-
-        /**
-         * Checks if a is greater than b
-         */
-        greater(a: number, b: number): boolean;
-
-        /**
-         * Checks if a is less than or equal to b
-         */
-        leq(a: number, b: number): boolean;
-
-        /**
-         * Checks if a is less than b
-         */
-        less(a: number, b: number): boolean;
-
-    }
-
-    interface JfpStatic {
-
-        /**
-         * Gets object keys
-         */
-        getKeys(dataset: {}): string[];
-
-        /**
-         * Merges right object into a copy of left object
-         */
-        merge(left: {}, right: {}): {};
-
-        /**
-         * Picks key from object
-         */
-        pick(key: string, dataset: {}): any;
-
-    }
-
-    interface JfpStatic {
-
-        /**
-         * Traverses object tree and retrieves dot-delimited key or returns null
-         */
-        deref(key: string, dataset: {}): any;
-
-        /**
-         * Picks value from object by key and returns a new object containing key value pair
-         */
-        pluck(key: string, dataset: {}): {};
-
-        /**
-         * Performs pluck across an array of keys, returns a single object containing all key value pairs
-         */
-        pluckKeys(keys: string[], dataset: {}): {};
-
-        /**
-         * Converts object to an array of values
-         */
-        toValues(dataset: {}): any[];
-
-        /**
-         * Transforms object to a new object containing transformed keys
-         */
-        transform(transformation: string[][], dataset: {}): {};
-
-    }
-
-    interface JfpStatic {
-
-        /**
-         * Performs a conjunction (and) operation on two or more booleans
-         */
-        and(a: boolean, b: boolean, ...arguments: boolean[]): boolean;
-
-        /**
-         * Performs a disjunction (or) operation on two or more booleans
-         */
-        or(a: boolean, b: boolean, ...arguments: boolean[]): boolean;
-
-        /**
-         * Performs an exclusive or operation on two booleans
-         */
-        xor(a: boolean, b: boolean): boolean;
-
-        /**
-         * Creates composite predicate which performs each check on a value and then conjoins the result
-         */
-        composePredicate(...arguments: ((...arguments: any[]) => boolean)[]): (...arguments: any[]) => boolean;
-
-
-    }
-
-}
-
-declare module "jfp" {
-    export = j;
-}
diff --git a/jfp/tsconfig.json b/jfp/tsconfig.json
new file mode 100644
index 0000000000..8d60a54d65
--- /dev/null
+++ b/jfp/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jfp-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jjv/index.d.ts b/jjv/index.d.ts
new file mode 100644
index 0000000000..c3c42aa032
--- /dev/null
+++ b/jjv/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for JJV v1.0.2
+// Project: https://github.com/acornejo/jjv
+// Definitions by: Wim Looman <https://github.com/Nemo157>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function jjv(): jjv.Env;
+
+declare namespace jjv {
+    interface Errors {
+        validation: {
+            [property: string]: {
+                required?: boolean;
+                type?: string;
+            }
+        };
+    }
+
+    interface Options {
+        checkRequired?: boolean;
+        useDefault?: boolean;
+        useCoerce?: boolean;
+        removeAdditional?: boolean;
+    }
+
+    interface Env {
+        defaultOptions: Options;
+
+        addSchema(name: string, schema: Object): void;
+
+        addType(name: string, parse: (input: any) => any): void;
+        addFormat(name: string, parse: (input: any) => any): void;
+        addCheck(name: string, check: (input: any, comparator: any) => any): void;
+        addTypeCoercion(name: string, coerce: (input: any) => any): void;
+
+        validate(name: string, object: any, options?: Options): Errors;
+        validate(schema: Object, object: any, options?: Options): Errors;
+    }
+}
+
+export = jjv;
diff --git a/jjv/jjv-tests.ts b/jjv/jjv-tests.ts
index d290fe9ab0..080dbb7740 100644
--- a/jjv/jjv-tests.ts
+++ b/jjv/jjv-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="jjv.d.ts" />
 
 import jjv = require('jjv');
 
diff --git a/jjv/jjv.d.ts b/jjv/jjv.d.ts
deleted file mode 100644
index 5eebaa5e10..0000000000
--- a/jjv/jjv.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// Type definitions for JJV v1.0.2
-// Project: https://github.com/acornejo/jjv
-// Definitions by: Wim Looman <https://github.com/Nemo157>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "jjv" {
-	function jjv(): jjv.Env;
-
-	namespace jjv {
-		interface Errors {
-			validation: {
-				[property: string]: {
-					required?: boolean;
-					type?: string;
-				}
-			};
-		}
-
-		interface Options {
-			checkRequired?: boolean;
-			useDefault?: boolean;
-			useCoerce?: boolean;
-			removeAdditional?: boolean;
-		}
-
-		interface Env {
-			defaultOptions: Options;
-
-			addSchema(name: string, schema: Object): void;
-
-			addType(name: string, parse: (input: any) => any): void;
-			addFormat(name: string, parse: (input: any) => any): void;
-			addCheck(name: string, check: (input: any, comparator: any) => any): void;
-			addTypeCoercion(name: string, coerce: (input: any) => any): void;
-
-			validate(name: string, object: any, options?: Options): Errors;
-			validate(schema: Object, object: any, options?: Options): Errors;
-		}
-	}
-
-	export = jjv;
-}
diff --git a/jjv/tsconfig.json b/jjv/tsconfig.json
new file mode 100644
index 0000000000..bd2725fff8
--- /dev/null
+++ b/jjv/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jjv-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jjve/index.d.ts b/jjve/index.d.ts
new file mode 100644
index 0000000000..0cae3d4079
--- /dev/null
+++ b/jjve/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for JJVE v0.4.0
+// Project: https://github.com/silas/jjve
+// Definitions by: Wim Looman <https://github.com/Nemo157>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+import jjv = require('jjv');
+
+declare function jjve(jjv: jjv.Env): jjve.Env;
+declare namespace jjve {
+    interface Issue {
+        code: string;
+        message: string;
+        data: any;
+        path: string;
+    }
+
+    interface Env {
+        (schema: Object, data: any, errors: jjv.Errors): Issue[];
+    }
+}
+
+export = jjve;
diff --git a/jjve/jjve-tests.ts b/jjve/jjve-tests.ts
index 4d5b3819e3..33fa93e08d 100644
--- a/jjve/jjve-tests.ts
+++ b/jjve/jjve-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="../jjv/jjv.d.ts" />
-/// <reference path="jjve.d.ts" />
-
 import jjv = require('jjv');
 import jjve = require('jjve');
 
diff --git a/jjve/jjve.d.ts b/jjve/jjve.d.ts
deleted file mode 100644
index fcb5241670..0000000000
--- a/jjve/jjve.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// Type definitions for JJVE v0.4.0
-// Project: https://github.com/silas/jjve
-// Definitions by: Wim Looman <https://github.com/Nemo157>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jjv/jjv.d.ts" />
-
-declare module 'jjve' {
-	import jjv  = require('jjv');
-
-	function jjve(jjv: jjv.Env): jjve.Env;
-	namespace jjve {
-		interface Issue {
-			code: string;
-			message: string;
-			data: any;
-			path: string;
-		}
-
-		interface Env {
-			(schema: Object, data: any, errors: jjv.Errors): Issue[];
-		}
-	}
-
-	export = jjve;
-}
diff --git a/jjve/tsconfig.json b/jjve/tsconfig.json
new file mode 100644
index 0000000000..a617554528
--- /dev/null
+++ b/jjve/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jjve-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/joData/joData.d.ts b/joData/index.d.ts
similarity index 100%
rename from joData/joData.d.ts
rename to joData/index.d.ts
diff --git a/joData/joData-tests.ts b/joData/joData-tests.ts
index 62dd1569ce..3327a23603 100644
--- a/joData/joData-tests.ts
+++ b/joData/joData-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="joData.d.ts" />
+
 
 var query = new jo('http://test.com');
 
diff --git a/joData/tsconfig.json b/joData/tsconfig.json
new file mode 100644
index 0000000000..9e3ef47261
--- /dev/null
+++ b/joData/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "joData-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/johnny-five/index.d.ts b/johnny-five/index.d.ts
new file mode 100644
index 0000000000..8f480c5e3e
--- /dev/null
+++ b/johnny-five/index.d.ts
@@ -0,0 +1,588 @@
+// Type definitions for johnny-five
+// Project: https://github.com/rwaldron/johnny-five
+// Definitions by: Toshiya Nakakura <https://github.com/nakakura>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="node"/>
+
+
+export interface AccelerometerOption {
+    controller: string;
+}
+
+export interface AccelerometerGeneralOption {
+    controller?: string;
+}
+
+export interface AccelerometerAnalogOption extends AccelerometerGeneralOption {
+    pins: Array<string>;
+    sensitivity?: number;
+    aref?: number;
+    zeroV?: number | Array<number>;
+    autoCalibrate?: boolean;
+}
+
+export interface AccelerometerMPU6050Option extends AccelerometerGeneralOption {
+    sensitivity?: number;
+}
+
+export interface AccelerometerMMA7361Option extends AccelerometerGeneralOption {
+    sleepPin?: number | string;
+}
+
+export declare class Accelerometer {
+    constructor(option: AccelerometerGeneralOption | AccelerometerAnalogOption | AccelerometerMPU6050Option | AccelerometerMMA7361Option);
+    on(event: string, cb: () => void): void;
+    on(event: "change", cb: () => void): void;
+    on(event: "data", cb: (freq: any) => void): void;
+    hasAxis(name: string): void;
+    enable(): void;
+    disable(): void;
+}
+
+export declare class Animation {
+    constructor(option: Servo | Array<Servo>);
+    enqueue(segment: any): void;
+    play(): void;
+    pause(): void;
+    stop(): void;
+    next(): void;
+    speed(speed: Array<number>): void;
+
+    target: number;
+    duration: number;
+    cuePoints: Array<number>;
+    keyFrames: number;
+    easing: string;
+    loop: boolean;
+    loopback: number;
+    metronomic: boolean;
+    progress: number;
+    currentSpeed: number;
+    fps: number;
+}
+
+export interface ButtonOptions {
+    pin: number | string;
+    invert?: boolean;
+    isPullup?: boolean;
+    holdtime?: number;
+}
+
+export declare class Button {
+    constructor(pin: number | string | ButtonOptions);
+    on(event: string, cb: () => void): void;
+    on(event: "hold", cb: (holdTime: number) => void): void;
+    on(event: "down", cb: () => void): void;
+    on(event: "press", cb: () => void): void;
+    on(event: "up", cb: () => void): void;
+    on(event: "release", cb: () => void): void;
+}
+
+export interface BoardOptions {
+    id?: number | string;
+    port?: string | any;
+    repl?: boolean;
+}
+
+export interface Repl {
+    inject(object: any): void;
+}
+
+export declare class Board {
+    constructor(option?: BoardOptions);
+    on(event: string, cb: () => void): void;
+    on(event: "ready", cb: () => void): void;
+    on(event: "connect", cb: () => void): void;
+    pinMode(pin: number, mode: number): void;
+    analogWrite(pin: number, value: number): void;
+    analogRead(pin: number, cb: (item: number) => void): void;
+    digitalWrite(pin: number, value: number): void;
+    digitalRead(pin: number, cb: (item: number) => void): void;
+    shiftOut(dataPin: Pin, clockPin: Pin, isBigEndian: boolean, value: number): void;
+    wait(ms: number, cb: () => void): void;
+    loop(ms: number, cb: () => void): void;
+
+    isReady: boolean;
+    io: any;
+    id: string;
+    pins: Array<Pin>;
+    port: string;
+    inject: Repl;
+}
+
+export interface CompassOptions {
+    controller: string;
+    gauss?: number;
+}
+
+export declare class Compass {
+    constructor(option: CompassOptions);
+    on(event: string, cb: () => void): void;
+    on(event: "change", cb: () => void): void;
+    on(event: "data", cb: (data: any) => void): void;
+}
+
+export interface ESCOption {
+    pin: number | string;
+    range?: Array<number>;
+    startAt?: number;
+}
+
+export declare class ESC {
+    constructor(option: number | string | ESCOption);
+    speed(value: number): void;
+    min(): void;
+    max(): void;
+    stop(): void;
+}
+
+export interface GyroGeneralOption {
+    controller?: string;
+}
+
+export interface GyroAnalogOption extends GyroGeneralOption {
+    pins: Array<string>;
+    sensitivity: number;
+    resolution?: number;
+}
+
+export interface GyroMPU6050Option extends GyroGeneralOption {
+    sensitivity: number;
+}
+
+export declare class Gyro {
+    constructor(option: GyroGeneralOption | GyroAnalogOption | GyroMPU6050Option);
+    on(event: string, cb: () => void): void;
+    on(event: "change", cb: () => void): void;
+    on(event: "data", cb: (data: any) => void): void;
+    recalibrate(): void;
+}
+
+export interface IMUGeneralOption {
+    controller?: string;
+    freq?: number;
+}
+
+export interface IMUMPU6050Option extends IMUGeneralOption {
+    address: number;
+}
+
+export declare class IMU {
+    constructor(option: IMUGeneralOption | IMUMPU6050Option);
+    on(event: string, cb: () => void): void;
+    on(event: "change", cb: () => void): void;
+    on(event: "data", cb: (data: any) => void): void;
+}
+
+export declare module IR {
+    export interface MotionOption {
+        pin: number | string;
+    }
+
+    export class Motion {
+        constructor(option: number | MotionOption);
+        on(event: string, cb: () => void): void;
+        on(event: "data", cb: (data: any) => void): void;
+        on(event: "motionstart", cb: () => void): void;
+        on(event: "motionend", cb: () => void): void;
+        on(event: "calibrated", cb: () => void): void;
+    }
+
+    export interface PloximityOption {
+        pin: number | string;
+        controller: string;
+    }
+
+    export class Proximity {
+        constructor(option: number | PloximityOption);
+        on(event: string, cb: () => void): void;
+        on(event: "data", cb: (data: any) => void): void;
+        on(event: "change", cb: () => void): void;
+    }
+
+    export interface ArrayOption {
+        pins: Array<number> | Array<string>;
+        emitter: number | string;
+        freq?: number;
+    }
+
+    export interface LoadCalibrationOption {
+        min: Array<number>;
+        max: Array<number>;
+    }
+
+    export module Reflect {
+        export class Array {
+            constructor(option: ArrayOption);
+            enable(): void;
+            disable(): void;
+            calibrate(): void;
+            calibrateUntil(predicate: () => void): void;
+            loadCalibration(option: LoadCalibrationOption): void;
+            on(event: string, cb: () => void): void;
+            on(event: "data", cb: (data: any) => void): void;
+            on(event: "calibratedData", cb: (data: any) => void): void;
+            on(event: "line", cb: (data: any) => void): void;
+        }
+    }
+}
+
+export interface JoystickOption {
+    pins: Array<string>;
+}
+
+export declare class Joystick {
+    constructor(option: JoystickOption);
+    on(event: string, cb: () => void): void;
+    on(event: "data", cb: (data: any) => void): void;
+    on(event: "change", cb: () => void): void;
+    on(event: "axismove", cb: (error: Error, date: Date) => void): void;
+
+    axis: Array<number>;
+    raw: Array<number>;
+}
+
+
+export interface LCDGeneralOption {
+    rows?: number;
+    cols?: number;
+}
+
+export interface LCDI2COption extends LCDGeneralOption {
+    controller: string;
+    backlight?: number;
+}
+
+export interface LCDParallelOption extends LCDGeneralOption {
+    pins: Array<any>;
+    backlight?: number;
+}
+
+export declare class LCD {
+    constructor(option: LCDGeneralOption | LCDI2COption | LCDParallelOption);
+    print(message: string): void;
+    useChar(char: string): void;
+    clear(): void;
+    cursor(row: number, col: number): void;
+    home(): void;
+    display(): void;
+    noDisplay(): void;
+    blink(): void;
+    noBlink(): void;
+    autoscroll(): void;
+    noAutoscroll(): void;
+}
+
+export interface LedOption {
+    pin: number;
+    type?: string;
+    controller?: string;
+    address?: number;
+    isAnode?: boolean;
+}
+
+export declare class Led {
+    constructor(option: number | LedOption);
+    on(): void;
+    off(): void;
+    toggle(): void;
+    strobe(ms: number): void;
+    blink(): void;
+    blink(ms: number): void;
+    brightness(val: number): void;
+    fade(brightness: number, ms: number): void;
+    fadeIn(ms: number): void;
+    fadeOut(ms: number): void;
+    pulse(ms: number): void;
+    stop(ms: number): void;
+}
+
+export declare module Led {
+    export interface DigitsOption {
+        pins: any;
+        devices?: number;
+    }
+
+    export class Digits {
+        constructor(option: DigitsOption);
+        on(): void;
+        on(index: number): void;
+        off(): void;
+        off(index: number): void;
+        clear(): void;
+        clear(index: number): void;
+        brightness(value: number): void;
+        brightness(index: number, value: number): void;
+        draw(position: number, character: number): void;
+        draw(index: number, position: number, character: number): void;
+    }
+
+    export interface MatrixOption {
+        pins: any;
+        devices?: number;
+    }
+
+    export interface MatrixIC2Option {
+        controller: string;
+        addresses?: Array<any>;
+        isBicolor?: boolean;
+        dims?: any;
+        rotation?: number;
+    }
+
+    export class Matrix {
+        constructor(option: MatrixOption | MatrixIC2Option);
+        on(): void;
+        on(index: number): void;
+        off(): void;
+        off(index: number): void;
+        clear(): void;
+        clear(index: number): void;
+        brightness(value: number): void;
+        brightness(index: number, value: number): void;
+        led(row: number, col: number, state: any): void;
+        led(index: number, row: number, col: number, state: any): void;
+        row(row: number, val: number): void;
+        row(index: number, row: number, val: number): void;
+        column(row: number, val: number): void;
+        column(index: number, row: number, val: number): void;
+        draw(position: number, character: number): void;
+        draw(index: number, position: number, character: number): void;
+    }
+
+    export interface RGBOption {
+        pins: Array<number>;
+        isAnode?: boolean;
+        controller?: string;
+    }
+
+    export class RGB {
+        constructor(option: RGBOption);
+        on(): void;
+        off(): void;
+        color(value: number): void;
+        toggle(): void;
+        strobe(ms: number): void;
+        brightness(value: number): void;
+        fadeIn(ms: number): void;
+        fadeOut(ms: number): void;
+        pulse(ms: number): void;
+        stop(ms: number): void;
+    }
+}
+
+export interface MotorOption {
+    pins: any;
+    current?: any;
+    invertPWM?: boolean;
+    address?: number;
+    controller?: string;
+    register?: any;
+    bits?: any;
+}
+
+export declare class Motor {
+    constructor(option: Array<number> | MotorOption);
+    forward(speed: number): void;
+    fwd(speed: number): void;
+    reverse(speed: number): void;
+    rev(speed: number): void;
+    start(): void;
+    start(speed: number): void;
+    stop(): void;
+    brake(): void;
+    release(): void;
+}
+
+export interface PiezoOption {
+    pin: number;
+}
+
+export declare class Piezo {
+    constructor(option: number | PiezoOption);
+    frequency(frequency: number, duration: number): void;
+    play(tune: any, cb?: () => void): void;
+    tone(frequency: number, duration: number): void;
+    noTone(): void;
+    off(): void;
+}
+
+export interface PinOption {
+    id?: number | string;
+    pin: number | string;
+    type?: string;
+}
+
+export interface PinState {
+    supportedModes: Array<number>;
+    mode: number;
+    value: number;
+    report: number;
+    analogChannel: number;
+}
+
+export declare class Pin {
+    constructor(option: number | string | PinOption);
+    query(cb: (pin: PinState) => void): void;
+    high(): void;
+    low(): void;
+    write(value: number): void;
+    read(cb: (value: number) => void): void;
+    static write(pin: number, value: number): void;
+    static read(pin: number, cb: (data: number) => void): void;
+}
+
+export interface PingOption {
+    pin: number | string;
+    freq?: number;
+    pulse?: number;
+}
+
+export declare class Ping {
+    constructor(option: number | PingOption);
+}
+
+export interface RelayOption {
+    pin: number | string;
+    type?: string;
+}
+
+export declare class Relay {
+    constructor(option: number | RelayOption);
+    open(): void;
+    close(): void;
+    toggle(): void;
+}
+
+export interface SensorOption {
+    pin: number | string;
+    freq?: boolean;
+    threshold?: number;
+}
+
+export declare class Sensor {
+    constructor(option: number | string | SensorOption);
+    scale(low: number, high: number): Sensor;
+    scale(range: number[]): Sensor;
+    scale(): Sensor;
+    booleanAt(barrier: number): boolean;
+    within(range: Array<number>, cb: () => void): void;
+    on(event: string, cb: () => void): void;
+    on(event: "data", cb: (data: any) => void): void;
+    on(event: "change", cb: () => void): void;
+}
+
+export interface ServoGeneralOption {
+    pin: number | string;
+    range?: Array<number>;
+    type?: string;
+    startAt?: number;
+    isInverted?: boolean;
+    center?: boolean;
+    controller?: string;
+}
+
+export interface ServoPCA9685Option extends ServoGeneralOption {
+    address?: number;
+}
+
+export interface ServoSweepOpts {
+    range: Array<number>;
+    interval?: number;
+    step?: number;
+}
+
+export declare class Servo {
+    constructor(option: number | string | ServoGeneralOption);
+    to(degrees: number, ms?: number, rage?: number): void;
+    min(): void;
+    max(): void;
+    center(): void;
+    sweep(): void;
+    sweep(range: Array<number>): void;
+    sweep(opt: ServoSweepOpts): void;
+    stop(): void;
+    cw(speed: number): void;
+    ccw(speed: number): void;
+    on(event: string, cb: () => void): void;
+    on(event: "move:complete", cb: () => void): void;
+}
+
+export interface ShiftRegisterOption {
+    pins: any;
+}
+
+export declare class ShiftRegister {
+    constructor(option: ShiftRegisterOption);
+    send(...value: number[]): void;
+}
+
+export interface SonarOption {
+    pin: number | string;
+    device: string;
+    freq?: number;
+    threshold?: number;
+}
+
+export declare class Sonar {
+    constructor(option: number | string | SonarOption);
+    within(range: Array<number>, cb: () => void): void;
+    within(range: Array<number>, unit: string, cb: () => void): void;
+    on(event: string, cb: () => void): void;
+    on(event: "data", cb: (data: any) => void): void;
+    on(event: "change", cb: () => void): void;
+}
+
+export interface StepperOption {
+    pins: any;
+    stepsPerRev: number;
+    type: number;
+    rpm?: number;
+    direction?: number;
+}
+
+export declare module Stepper {
+    export class TYPE {
+        static DRIVER: number;
+        static TWO_WIRE: number;
+        static FOUR_WIRE: number;
+    }
+}
+
+export declare class Stepper {
+    constructor(option: number | string | StepperOption);
+    step(stepsOrOpts: any, cb: () => void): void;
+    rpm(): Stepper;
+    rpm(value: number): Stepper;
+    speed(): Stepper;
+    speed(value: number): Stepper;
+    direction(): Stepper;
+    direction(value: number): Stepper;
+    accel(): Stepper;
+    accel(value: number): Stepper;
+    decel(): Stepper;
+    decel(value: number): Stepper;
+    cw(): Stepper;
+    ccw(): Stepper;
+
+    within(range: Array<number>, cb: () => void): void;
+    within(range: Array<number>, unit: string, cb: () => void): void;
+    on(event: string, cb: () => void): void;
+    on(event: "data", cb: (data: any) => void): void;
+    on(event: "change", cb: () => void): void;
+}
+
+export interface TemperatureOption {
+    controller?: string;
+    pin: string | number;
+    toCelsius?: (val: number) => number;
+    freq?: number;
+}
+
+export declare class Temperature {
+    constructor(option: TemperatureOption);
+    on(event: string, cb: () => void): void;
+    on(event: "data", cb: (data: any) => void): void;
+    on(event: "change", cb: () => void): void;
+}
diff --git a/johnny-five/johnny-five-tests.ts b/johnny-five/johnny-five-tests.ts
index 930a67ea88..919f1fd7d5 100644
--- a/johnny-five/johnny-five-tests.ts
+++ b/johnny-five/johnny-five-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="./johnny-five.d.ts"/>
-
 import five = require('johnny-five');
 var board = new five.Board();
 
diff --git a/johnny-five/johnny-five.d.ts b/johnny-five/johnny-five.d.ts
deleted file mode 100644
index 25763e8f8a..0000000000
--- a/johnny-five/johnny-five.d.ts
+++ /dev/null
@@ -1,590 +0,0 @@
-// Type definitions for johnny-five
-// Project: https://github.com/rwaldron/johnny-five
-// Definitions by: Toshiya Nakakura <https://github.com/nakakura>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../node/node.d.ts"/>
-
-declare module "johnny-five" {
-    export interface AccelerometerOption{
-        controller: string;
-    }
-
-    export interface AccelerometerGeneralOption{
-        controller?: string;
-    }
-
-    export interface AccelerometerAnalogOption extends AccelerometerGeneralOption{
-        pins: Array<string>;
-        sensitivity?: number;
-        aref?: number;
-        zeroV?: number | Array<number>;
-        autoCalibrate?: boolean;
-    }
-
-    export interface AccelerometerMPU6050Option extends AccelerometerGeneralOption{
-        sensitivity?: number;
-    }
-
-    export interface AccelerometerMMA7361Option extends AccelerometerGeneralOption{
-        sleepPin?: number | string;
-    }
-
-    export class Accelerometer{
-        constructor(option: AccelerometerGeneralOption | AccelerometerAnalogOption | AccelerometerMPU6050Option | AccelerometerMMA7361Option);
-        on(event: string, cb: ()=>void): void;
-        on(event: "change", cb: ()=>void): void;
-        on(event: "data", cb: (freq: any)=>void): void;
-        hasAxis(name: string): void;
-        enable(): void;
-        disable(): void;
-    }
-
-    export class Animation{
-        constructor(option: Servo | Array<Servo>);
-        enqueue(segment: any): void;
-        play(): void;
-        pause(): void;
-        stop(): void;
-        next(): void;
-        speed(speed: Array<number>): void;
-
-        target: number;
-        duration: number;
-        cuePoints: Array<number>;
-        keyFrames: number;
-        easing: string;
-        loop: boolean;
-        loopback: number;
-        metronomic: boolean;
-        progress: number;
-        currentSpeed: number;
-        fps: number;
-    }
-
-    export interface ButtonOptions{
-        pin: number | string;
-        invert?: boolean;
-        isPullup?: boolean;
-        holdtime?: number;
-    }
-
-    export class Button{
-        constructor(pin: number | string | ButtonOptions);
-        on(event: string, cb: ()=>void): void;
-        on(event: "hold", cb: (holdTime: number)=>void): void;
-        on(event: "down", cb: ()=>void): void;
-        on(event: "press", cb: ()=>void): void;
-        on(event: "up", cb: ()=>void): void;
-        on(event: "release", cb: ()=>void): void;
-    }
-
-    export interface BoardOptions{
-        id?: number | string;
-        port?: string | any;
-        repl?: boolean;
-    }
-
-    export interface Repl{
-        inject(object: any): void;
-    }
-
-    export class Board{
-        constructor(option?: BoardOptions);
-        on(event: string, cb: ()=>void): void;
-        on(event: "ready", cb: ()=>void): void;
-        on(event: "connect", cb: ()=>void): void;
-        pinMode(pin: number, mode: number): void;
-        analogWrite(pin: number, value: number): void;
-        analogRead(pin: number, cb: (item: number)=>void): void;
-        digitalWrite(pin: number, value: number): void;
-        digitalRead(pin: number, cb: (item: number)=>void): void;
-        shiftOut(dataPin: Pin, clockPin: Pin, isBigEndian: boolean, value: number): void;
-        wait(ms: number, cb: ()=>void): void;
-        loop(ms: number, cb: ()=>void): void;
-
-        isReady: boolean;
-        io: any;
-        id: string;
-        pins: Array<Pin>;
-        port: string;
-        inject: Repl;
-    }
-
-    export interface CompassOptions{
-        controller: string;
-        gauss?: number;
-    }
-
-    export class Compass{
-        constructor(option: CompassOptions);
-        on(event: string, cb: ()=>void): void;
-        on(event: "change", cb: ()=>void): void;
-        on(event: "data", cb: (data: any)=>void): void;
-    }
-
-    export interface ESCOption{
-        pin: number | string;
-        range?: Array<number>;
-        startAt?: number;
-    }
-
-    export class ESC{
-        constructor(option: number | string | ESCOption);
-        speed(value: number): void;
-        min(): void;
-        max(): void;
-        stop(): void;
-    }
-
-    export interface GyroGeneralOption{
-        controller?: string;
-    }
-
-    export interface GyroAnalogOption extends GyroGeneralOption{
-        pins: Array<string>;
-        sensitivity: number;
-        resolution?: number;
-    }
-
-    export interface GyroMPU6050Option extends GyroGeneralOption{
-        sensitivity: number;
-    }
-
-    export class Gyro{
-        constructor(option: GyroGeneralOption | GyroAnalogOption | GyroMPU6050Option);
-        on(event: string, cb: ()=>void): void;
-        on(event: "change", cb: ()=>void): void;
-        on(event: "data", cb: (data: any)=>void): void;
-        recalibrate(): void;
-    }
-
-    export interface IMUGeneralOption{
-        controller?: string;
-        freq?: number;
-    }
-
-    export interface IMUMPU6050Option extends IMUGeneralOption{
-        address: number;
-    }
-
-    export class IMU{
-        constructor(option: IMUGeneralOption | IMUMPU6050Option);
-        on(event: string, cb: ()=>void): void;
-        on(event: "change", cb: ()=>void): void;
-        on(event: "data", cb: (data: any)=>void): void;
-    }
-
-    export module IR{
-        export interface MotionOption{
-            pin: number | string;
-        }
-
-        export class Motion{
-            constructor(option: number | MotionOption);
-            on(event: string, cb: ()=>void): void;
-            on(event: "data", cb: (data: any)=>void): void;
-            on(event: "motionstart", cb: ()=>void): void;
-            on(event: "motionend", cb: ()=>void): void;
-            on(event: "calibrated", cb: ()=>void): void;
-        }
-
-        export interface PloximityOption{
-            pin: number | string;
-            controller: string;
-        }
-
-        export class Proximity{
-            constructor(option: number | PloximityOption);
-            on(event: string, cb: ()=>void): void;
-            on(event: "data", cb: (data: any)=>void): void;
-            on(event: "change", cb: ()=>void): void;
-        }
-
-        export interface ArrayOption{
-            pins: Array<number> | Array<string>;
-            emitter: number | string;
-            freq?: number;
-        }
-
-        export interface LoadCalibrationOption{
-            min: Array<number>;
-            max: Array<number>;
-        }
-
-        export module Reflect{
-            export class Array{
-                constructor(option: ArrayOption);
-                enable(): void;
-                disable(): void;
-                calibrate(): void;
-                calibrateUntil(predicate: ()=>void): void;
-                loadCalibration(option: LoadCalibrationOption): void;
-                on(event: string, cb: ()=>void): void;
-                on(event: "data", cb: (data: any)=>void): void;
-                on(event: "calibratedData", cb: (data: any)=>void): void;
-                on(event: "line", cb: (data: any)=>void): void;
-            }
-        }
-    }
-
-    export interface JoystickOption{
-        pins: Array<string>;
-    }
-
-    export class Joystick{
-        constructor(option: JoystickOption);
-        on(event: string, cb: ()=>void): void;
-        on(event: "data", cb: (data: any)=>void): void;
-        on(event: "change", cb: ()=>void): void;
-        on(event: "axismove", cb: (error: Error, date: Date)=>void): void;
-
-        axis: Array<number>;
-        raw: Array<number>;
-    }
-
-
-    export interface LCDGeneralOption{
-        rows?: number;
-        cols?: number;
-    }
-
-    export interface LCDI2COption extends LCDGeneralOption{
-        controller: string;
-        backlight?: number;
-    }
-
-    export interface LCDParallelOption extends LCDGeneralOption{
-        pins: Array<any>;
-        backlight?: number;
-    }
-
-    export class LCD{
-        constructor(option: LCDGeneralOption | LCDI2COption | LCDParallelOption);
-        print(message: string): void;
-        useChar(char: string): void;
-        clear(): void;
-        cursor(row: number, col: number): void;
-        home(): void;
-        display(): void;
-        noDisplay(): void;
-        blink(): void;
-        noBlink(): void;
-        autoscroll(): void;
-        noAutoscroll(): void;
-    }
-
-    export interface LedOption{
-        pin: number;
-        type?: string;
-        controller?: string;
-        address?: number;
-        isAnode?: boolean;
-    }
-
-    export class Led{
-        constructor(option: number | LedOption);
-        on(): void;
-        off(): void;
-        toggle(): void;
-        strobe(ms: number): void;
-        blink(): void;
-        blink(ms: number): void;
-        brightness(val: number): void;
-        fade(brightness: number, ms: number): void;
-        fadeIn(ms: number): void;
-        fadeOut(ms: number): void;
-        pulse(ms: number): void;
-        stop(ms: number): void;
-    }
-
-    export module Led{
-        export interface DigitsOption{
-            pins: any;
-            devices?: number;
-        }
-
-        export class Digits{
-            constructor(option: DigitsOption);
-            on(): void;
-            on(index: number): void;
-            off(): void;
-            off(index: number): void;
-            clear(): void;
-            clear(index: number): void;
-            brightness(value: number): void;
-            brightness(index: number, value: number): void;
-            draw(position: number, character: number): void;
-            draw(index: number, position: number, character: number): void;
-        }
-
-        export interface MatrixOption{
-            pins: any;
-            devices?: number;
-        }
-
-        export interface MatrixIC2Option{
-            controller: string;
-            addresses?: Array<any>;
-            isBicolor?: boolean;
-            dims? :any;
-            rotation?: number;
-        }
-
-        export class Matrix{
-            constructor(option: MatrixOption | MatrixIC2Option);
-            on(): void;
-            on(index: number): void;
-            off(): void;
-            off(index: number): void;
-            clear(): void;
-            clear(index: number): void;
-            brightness(value: number): void;
-            brightness(index: number, value: number): void;
-            led(row: number, col: number, state: any): void;
-            led(index: number, row: number, col: number, state: any): void;
-            row(row: number, val: number): void;
-            row(index: number, row: number, val: number): void;
-            column(row: number, val: number): void;
-            column(index: number, row: number, val: number): void;
-            draw(position: number, character: number): void;
-            draw(index: number, position: number, character: number): void;
-        }
-
-        export interface RGBOption{
-            pins: Array<number>;
-            isAnode?: boolean;
-            controller?: string;
-        }
-
-        export class RGB{
-            constructor(option: RGBOption);
-            on(): void;
-            off(): void;
-            color(value: number): void;
-            toggle(): void;
-            strobe(ms: number): void;
-            brightness(value: number): void;
-            fadeIn(ms: number): void;
-            fadeOut(ms: number): void;
-            pulse(ms: number): void;
-            stop(ms: number): void;
-        }
-    }
-
-    export interface MotorOption{
-        pins: any;
-        current?: any;
-        invertPWM?: boolean;
-        address?: number;
-        controller?: string;
-        register?: any;
-        bits?: any;
-    }
-
-    export class Motor{
-        constructor(option: Array<number> | MotorOption);
-        forward(speed: number): void;
-        fwd(speed: number): void;
-        reverse(speed: number): void;
-        rev(speed: number): void;
-        start(): void;
-        start(speed: number): void;
-        stop(): void;
-        brake(): void;
-        release(): void;
-    }
-
-    export interface PiezoOption{
-        pin: number;
-    }
-
-    export class Piezo{
-        constructor(option: number | PiezoOption);
-        frequency(frequency: number, duration: number): void;
-        play(tune: any, cb?: ()=>void): void;
-        tone(frequency: number, duration: number): void;
-        noTone(): void;
-        off(): void;
-    }
-
-    export interface PinOption{
-        id?: number | string;
-        pin: number | string;
-        type?: string;
-    }
-
-    export interface PinState{
-        supportedModes: Array<number>;
-        mode: number;
-        value: number;
-        report: number;
-        analogChannel: number;
-    }
-
-    export class Pin{
-        constructor(option: number | string | PinOption);
-        query(cb: (pin: PinState)=>void): void;
-        high(): void;
-        low(): void;
-        write(value: number): void;
-        read(cb: (value: number)=>void): void;
-        static write(pin: number, value: number): void;
-        static read(pin: number, cb: (data: number)=>void): void;
-    }
-
-    export interface PingOption{
-        pin: number | string;
-        freq?: number;
-        pulse?: number;
-    }
-
-    export class Ping{
-        constructor(option: number | PingOption);
-    }
-
-    export interface RelayOption{
-        pin: number | string;
-        type?: string;
-    }
-
-    export class Relay{
-        constructor(option: number | RelayOption);
-        open(): void;
-        close(): void;
-        toggle(): void;
-    }
-
-    export interface SensorOption{
-        pin: number | string;
-        freq?: boolean;
-        threshold?: number;
-    }
-
-    export class Sensor{
-        constructor(option: number | string | SensorOption);
-        scale(low: number, high: number): Sensor;
-        scale(range: number[]): Sensor;
-        scale(): Sensor;
-        booleanAt(barrier: number): boolean;
-        within(range: Array<number>, cb: ()=>void): void;
-        on(event: string, cb: ()=>void): void;
-        on(event: "data", cb: (data: any)=>void): void;
-        on(event: "change", cb: ()=>void): void;
-    }
-
-    export interface ServoGeneralOption{
-        pin: number | string;
-        range?: Array<number>;
-        type?: string;
-        startAt?: number;
-        isInverted?: boolean;
-        center?: boolean;
-        controller?: string;
-    }
-
-    export interface ServoPCA9685Option extends ServoGeneralOption{
-        address?: number;
-    }
-
-    export interface ServoSweepOpts{
-        range: Array<number>;
-        interval?: number;
-        step?: number;
-    }
-
-    export class Servo{
-        constructor(option: number | string | ServoGeneralOption);
-        to(degrees: number, ms?: number, rage?: number): void;
-        min(): void;
-        max(): void;
-        center(): void;
-        sweep(): void;
-        sweep(range: Array<number>): void;
-        sweep(opt: ServoSweepOpts): void;
-        stop(): void;
-        cw(speed: number): void;
-        ccw(speed: number): void;
-        on(event: string, cb: ()=>void): void;
-        on(event: "move:complete", cb: ()=>void): void;
-    }
-
-    export interface ShiftRegisterOption{
-        pins: any;
-    }
-
-    export class ShiftRegister{
-        constructor(option: ShiftRegisterOption);
-        send(...value: number[]): void;
-    }
-
-    export interface SonarOption{
-        pin: number | string;
-        device: string;
-        freq?: number;
-        threshold?: number;
-    }
-
-    export class Sonar{
-        constructor(option: number | string | SonarOption);
-        within(range: Array<number>, cb: ()=>void): void;
-        within(range: Array<number>, unit: string, cb: ()=>void): void;
-        on(event: string, cb: ()=>void): void;
-        on(event: "data", cb: (data: any)=>void): void;
-        on(event: "change", cb: ()=>void): void;
-    }
-
-    export interface StepperOption{
-        pins: any;
-        stepsPerRev: number;
-        type: number;
-        rpm?: number;
-        direction?: number;
-    }
-
-    export module Stepper{
-        export class TYPE{
-            static DRIVER: number;
-            static TWO_WIRE: number;
-            static FOUR_WIRE: number;
-        }
-    }
-
-    export class Stepper{
-        constructor(option: number | string | StepperOption);
-        step(stepsOrOpts: any, cb: ()=>void): void;
-        rpm(): Stepper;
-        rpm(value: number): Stepper;
-        speed(): Stepper;
-        speed(value: number): Stepper;
-        direction(): Stepper;
-        direction(value: number): Stepper;
-        accel(): Stepper;
-        accel(value: number): Stepper;
-        decel(): Stepper;
-        decel(value: number): Stepper;
-        cw(): Stepper;
-        ccw(): Stepper;
-
-        within(range: Array<number>, cb: ()=>void): void;
-        within(range: Array<number>, unit: string, cb: ()=>void): void;
-        on(event: string, cb: ()=>void): void;
-        on(event: "data", cb: (data: any)=>void): void;
-        on(event: "change", cb: ()=>void): void;
-    }
-
-    export interface TemperatureOption{
-        controller?: string;
-        pin: string | number;
-        toCelsius?: (val: number)=>number;
-        freq?: number;
-    }
-
-    export class Temperature{
-        constructor(option: TemperatureOption);
-        on(event: string, cb: ()=>void): void;
-        on(event: "data", cb: (data: any)=>void): void;
-        on(event: "change", cb: ()=>void): void;
-    }
-}
-
diff --git a/johnny-five/tsconfig.json b/johnny-five/tsconfig.json
new file mode 100644
index 0000000000..408f5b49de
--- /dev/null
+++ b/johnny-five/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "johnny-five-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/joi/index.d.ts b/joi/index.d.ts
new file mode 100644
index 0000000000..916d859498
--- /dev/null
+++ b/joi/index.d.ts
@@ -0,0 +1,777 @@
+// Type definitions for joi v6.5.0
+// Project: https://github.com/spumko/joi
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Laurence Dougal Myers <https://github.com/laurence-myers>, Christopher Glantschnig <https://github.com/cglantschnig>, David Broder-Rodgers <https://github.com/DavidBR-SW>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// TODO express type of Schema in a type-parameter (.default, .valid, .example etc)
+
+
+
+export interface ValidationOptions {
+    /**
+     * when true, stops validation on the first error, otherwise returns all the errors found. Defaults to true.
+     */
+    abortEarly?: boolean;
+    /**
+     * when true, attempts to cast values to the required types (e.g. a string to a number). Defaults to true.
+     */
+    convert?: boolean;
+    /**
+     * when true, allows object to contain unknown keys which are ignored. Defaults to false.
+     */
+    allowUnknown?: boolean;
+    /**
+     * when true, ignores unknown keys with a function value. Defaults to false.
+     */
+    skipFunctions?: boolean;
+    /**
+     * when true, unknown keys are deleted (only when value is an object). Defaults to false.
+     */
+    stripUnknown?: boolean;
+    /**
+     * overrides individual error messages. Defaults to no override ({}).
+     */
+    language?: Object;
+    /**
+     * sets the default presence requirements. Supported modes: 'optional', 'required', and 'forbidden'. Defaults to 'optional'.
+     */
+    presence?: string;
+    /**
+     * provides an external data set to be used in references
+     */
+    context?: Object;
+}
+
+export interface RenameOptions {
+    /**
+     * if true, does not delete the old key name, keeping both the new and old keys in place. Defaults to false.
+     */
+    alias?: boolean;
+    /**
+     * if true, allows renaming multiple keys to the same destination where the last rename wins. Defaults to false.
+     */
+    multiple?: boolean;
+    /**
+     * if true, allows renaming a key over an existing key. Defaults to false.
+     */
+    override?: boolean;
+    /**
+     * if true, skip renaming of a key if it's undefined. Defaults to false.
+     */
+    ignoreUndefined?: boolean;
+}
+
+export interface EmailOptions {
+    /**
+     * Numerical threshold at which an email address is considered invalid
+     */
+    errorLevel?: number | boolean;
+    /**
+     * Specifies a list of acceptable TLDs.
+     */
+    tldWhitelist?: string[] | Object;
+    /**
+     * Number of atoms required for the domain. Be careful since some domains, such as io, directly allow email.
+     */
+    minDomainAtoms?: number;
+}
+
+export interface IpOptions {
+    /**
+     * One or more IP address versions to validate against. Valid values: ipv4, ipv6, ipvfuture
+     */
+    version?: string | string[];
+    /**
+     * Used to determine if a CIDR is allowed or not. Valid values: optional, required, forbidden
+     */
+    cidr?: string;
+}
+
+export interface UriOptions {
+    /**
+     * Specifies one or more acceptable Schemes, should only include the scheme name.
+     * Can be an Array or String (strings are automatically escaped for use in a Regular Expression).
+     */
+    scheme?: string | RegExp | Array<string | RegExp>;
+}
+
+export interface WhenOptions<T> {
+    /**
+     * the required condition joi type.
+     */
+    is: T;
+    /**
+     * the alternative schema type if the condition is true. Required if otherwise is missing.
+     */
+    then?: Schema;
+    /**
+     * the alternative schema type if the condition is false. Required if then is missing
+     */
+    otherwise?: Schema;
+}
+
+export interface ReferenceOptions {
+    separator?: string;
+    contextPrefix?: string;
+}
+
+export interface IPOptions {
+    version?: Array<string>;
+    cidr?: string
+}
+
+export interface ValidationError extends Error {
+    message: string;
+    details: ValidationErrorItem[];
+    simple(): string;
+    annotated(): string;
+}
+
+export interface ValidationErrorItem {
+    message: string;
+    type: string;
+    path: string;
+    options?: ValidationOptions;
+}
+
+export interface ValidationResult<T> {
+    error: ValidationError;
+    value: T;
+}
+
+export interface SchemaMap {
+    [key: string]: Schema;
+}
+
+export interface Schema extends AnySchema<Schema> {
+
+}
+
+export interface Reference extends Schema {
+
+}
+
+export interface AnySchema<T extends AnySchema<Schema>> {
+    /**
+     * Whitelists a value
+     */
+    allow(value: any, ...values: any[]): T;
+    allow(values: any[]): T;
+
+    /**
+     * Adds the provided values into the allowed whitelist and marks them as the only valid values allowed.
+     */
+    valid(value: any, ...values: any[]): T;
+    valid(values: any[]): T;
+    only(value: any, ...values: any[]): T;
+    only(values: any[]): T;
+    equal(value: any, ...values: any[]): T;
+    equal(values: any[]): T;
+
+    /**
+     * Blacklists a value
+     */
+    invalid(value: any, ...values: any[]): T;
+    invalid(values: any[]): T;
+    disallow(value: any, ...values: any[]): T;
+    disallow(values: any[]): T;
+    not(value: any, ...values: any[]): T;
+    not(values: any[]): T;
+
+    /**
+     * Marks a key as required which will not allow undefined as value. All keys are optional by default.
+     */
+    required(): T;
+
+    /**
+     * Marks a key as optional which will allow undefined as values. Used to annotate the schema for readability as all keys are optional by default.
+     */
+    optional(): T;
+
+    /**
+     * Marks a key as forbidden which will not allow any value except undefined. Used to explicitly forbid keys.
+     */
+    forbidden(): T;
+
+    /**
+     * Marks a key to be removed from a resulting object or array after validation. Used to sanitize output.
+     */
+    strip(): T;
+
+    /**
+     * Annotates the key
+     */
+    description(desc: string): T;
+
+    /**
+     * Annotates the key
+     */
+    notes(notes: string): T;
+    notes(notes: string[]): T;
+
+    /**
+     * Annotates the key
+     */
+    tags(notes: string): T;
+    tags(notes: string[]): T;
+
+    /**
+     * Attaches metadata to the key.
+     */
+    meta(meta: Object): T;
+
+    /**
+     * Annotates the key with an example value, must be valid.
+     */
+    example(value: any): T;
+
+    /**
+     * Annotates the key with an unit name.
+     */
+    unit(name: string): T;
+
+    /**
+     * Overrides the global validate() options for the current key and any sub-key.
+     */
+    options(options: ValidationOptions): T;
+
+    /**
+     * Sets the options.convert options to false which prevent type casting for the current key and any child keys.
+     */
+    strict(isStrict?: boolean): T;
+
+    /**
+     * Sets a default value if the original value is undefined.
+     * @param value - the value.
+     *   value supports references.
+     *   value may also be a function which returns the default value.
+     *   If value is specified as a function that accepts a single parameter, that parameter will be a context
+     *    object that can be used to derive the resulting value. This clones the object however, which incurs some
+     *    overhead so if you don't need access to the context define your method so that it does not accept any
+     *    parameters.
+     *   Without any value, default has no effect, except for object that will then create nested defaults
+     *    (applying inner defaults of that object).
+     *
+     * Note that if value is an object, any changes to the object after default() is called will change the
+     *  reference and any future assignment.
+     *
+     * Additionally, when specifying a method you must either have a description property on your method or the
+     *  second parameter is required.
+     */
+    default(value: any, description?: string): T;
+    default(): T;
+
+    /**
+     * Returns a new type that is the result of adding the rules of one type to another.
+     */
+    concat(schema: T): T;
+
+    /**
+     * Converts the type into an alternatives type where the conditions are merged into the type definition where:
+     */
+    when<U>(ref: string, options: WhenOptions<U>): AlternativesSchema;
+    when<U>(ref: Reference, options: WhenOptions<U>): AlternativesSchema;
+
+    /**
+     * Overrides the key name in error messages.
+     */
+    label(name: string): T;
+
+    /**
+     * Outputs the original untouched value instead of the casted value.
+     */
+    raw(isRaw?: boolean): T;
+
+    /**
+     * Considers anything that matches the schema to be empty (undefined).
+     * @param schema - any object or joi schema to match. An undefined schema unsets that rule.
+     */
+    empty(schema?: any): T;
+}
+
+export interface BooleanSchema extends AnySchema<BooleanSchema> {
+
+}
+
+export interface NumberSchema extends AnySchema<NumberSchema> {
+    /**
+     * Specifies the minimum value.
+     * It can also be a reference to another field.
+     */
+    min(limit: number): NumberSchema;
+    min(limit: Reference): NumberSchema;
+
+    /**
+     * Specifies the maximum value.
+     * It can also be a reference to another field.
+     */
+    max(limit: number): NumberSchema;
+    max(limit: Reference): NumberSchema;
+
+    /**
+     * Specifies that the value must be greater than limit.
+     * It can also be a reference to another field.
+     */
+    greater(limit: number): NumberSchema;
+    greater(limit: Reference): NumberSchema;
+
+    /**
+     * Specifies that the value must be less than limit.
+     * It can also be a reference to another field.
+     */
+    less(limit: number): NumberSchema;
+    less(limit: Reference): NumberSchema;
+
+    /**
+     * Requires the number to be an integer (no floating point).
+     */
+    integer(): NumberSchema;
+
+    /**
+     * Specifies the maximum number of decimal places where:
+     *  limit - the maximum number of decimal places allowed.
+     */
+    precision(limit: number): NumberSchema;
+
+    /**
+     * Specifies that the value must be a multiple of base.
+     */
+    multiple(base: number): NumberSchema;
+
+    /**
+     * Requires the number to be positive.
+     */
+    positive(): NumberSchema;
+
+    /**
+     * Requires the number to be negative.
+     */
+    negative(): NumberSchema;
+}
+
+export interface StringSchema extends AnySchema<StringSchema> {
+    /**
+     * Allows the value to match any whitelist of blacklist item in a case insensitive comparison.
+     */
+    insensitive(): StringSchema;
+
+    /**
+     * Specifies the minimum number string characters.
+     * @param limit - the minimum number of string characters required. It can also be a reference to another field.
+     * @param encoding - if specified, the string length is calculated in bytes using the provided encoding.
+     */
+    min(limit: number, encoding?: string): StringSchema;
+    min(limit: Reference, encoding?: string): StringSchema;
+
+    /**
+     * Specifies the maximum number of string characters.
+     * @param limit - the maximum number of string characters allowed. It can also be a reference to another field.
+     * @param encoding - if specified, the string length is calculated in bytes using the provided encoding.
+     */
+    max(limit: number, encoding?: string): StringSchema;
+    max(limit: Reference, encoding?: string): StringSchema;
+
+    /**
+     * Requires the number to be a credit card number (Using Lunh Algorithm).
+     */
+    creditCard(): StringSchema;
+
+    /**
+     * Specifies the exact string length required
+     * @param limit - the required string length. It can also be a reference to another field.
+     * @param encoding - if specified, the string length is calculated in bytes using the provided encoding.
+     */
+    length(limit: number, encoding?: string): StringSchema;
+    length(limit: Reference, encoding?: string): StringSchema;
+
+    /**
+     * Defines a regular expression rule.
+     * @param pattern - a regular expression object the string value must match against.
+     * @param name - optional name for patterns (useful with multiple patterns). Defaults to 'required'.
+     */
+    regex(pattern: RegExp, name?: string): StringSchema;
+
+    /**
+     * Replace characters matching the given pattern with the specified replacement string where:
+     * @param pattern - a regular expression object to match against, or a string of which all occurrences will be replaced.
+     * @param replacement - the string that will replace the pattern.
+     */
+    replace(pattern: RegExp, replacement: string): StringSchema;
+    replace(pattern: string, replacement: string): StringSchema;
+
+    /**
+     * Requires the string value to only contain a-z, A-Z, and 0-9.
+     */
+    alphanum(): StringSchema;
+
+    /**
+     * Requires the string value to only contain a-z, A-Z, 0-9, and underscore _.
+     */
+    token(): StringSchema;
+
+    /**
+     * Requires the string value to be a valid email address.
+     */
+    email(options?: EmailOptions): StringSchema;
+
+    /**
+     * Requires the string value to be a valid ip address.
+     */
+    ip(options?: IpOptions): StringSchema;
+
+    /**
+     * Requires the string value to be a valid RFC 3986 URI.
+     */
+    uri(options?: UriOptions): StringSchema;
+
+    /**
+     * Requires the string value to be a valid GUID.
+     */
+    guid(): StringSchema;
+
+    /**
+     * Requires the string value to be a valid hexadecimal string.
+     */
+    hex(): StringSchema;
+
+    /**
+     * Requires the string value to be a valid hostname as per RFC1123.
+     */
+    hostname(): StringSchema;
+
+    /**
+     * Requires the string value to be in valid ISO 8601 date format.
+     */
+    isoDate(): StringSchema;
+
+    /**
+     * Requires the string value to be all lowercase. If the validation convert option is on (enabled by default), the string will be forced to lowercase.
+     */
+    lowercase(): StringSchema;
+
+    /**
+     * Requires the string value to be all uppercase. If the validation convert option is on (enabled by default), the string will be forced to uppercase.
+     */
+    uppercase(): StringSchema;
+
+    /**
+     * Requires the string value to contain no whitespace before or after. If the validation convert option is on (enabled by default), the string will be trimmed.
+     */
+    trim(): StringSchema;
+}
+
+export interface ArraySchema extends AnySchema<ArraySchema> {
+    /**
+     * Allow this array to be sparse.
+     * enabled can be used with a falsy value to go back to the default behavior.
+     */
+    sparse(enabled?: any): ArraySchema;
+
+    /**
+     * Allow single values to be checked against rules as if it were provided as an array.
+     * enabled can be used with a falsy value to go back to the default behavior.
+     */
+    single(enabled?: any): ArraySchema;
+
+    /**
+     * List the types allowed for the array values.
+     * type can be an array of values, or multiple values can be passed as individual arguments.
+     * If a given type is .required() then there must be a matching item in the array.
+     * If a type is .forbidden() then it cannot appear in the array.
+     * Required items can be added multiple times to signify that multiple items must be found.
+     * Errors will contain the number of items that didn't match.
+     * Any unmatched item having a label will be mentioned explicitly.
+     *
+     * @param type - a joi schema object to validate each array item against.
+     */
+    items(type: Schema, ...types: Schema[]): ArraySchema;
+    items(types: Schema[]): ArraySchema;
+
+    /**
+     * Specifies the minimum number of items in the array.
+     */
+    min(limit: number): ArraySchema;
+
+    /**
+     * Specifies the maximum number of items in the array.
+     */
+    max(limit: number): ArraySchema;
+
+    /**
+     * Specifies the exact number of items in the array.
+     */
+    length(limit: number): ArraySchema;
+
+    /**
+     * Requires the array values to be unique.
+     * Be aware that a deep equality is performed on elements of the array having a type of object,
+     * a performance penalty is to be expected for this kind of operation.
+     */
+    unique(): ArraySchema;
+}
+
+export interface ObjectSchema extends AnySchema<ObjectSchema> {
+    /**
+     * Sets the allowed object keys.
+     */
+    keys(schema?: SchemaMap): ObjectSchema;
+
+    /**
+     * Specifies the minimum number of keys in the object.
+     */
+    min(limit: number): ObjectSchema;
+
+    /**
+     * Specifies the maximum number of keys in the object.
+     */
+    max(limit: number): ObjectSchema;
+
+    /**
+     * Specifies the exact number of keys in the object.
+     */
+    length(limit: number): ObjectSchema;
+
+    /**
+     * Specify validation rules for unknown keys matching a pattern.
+     */
+    pattern(regex: RegExp, schema: Schema): ObjectSchema;
+
+    /**
+     * Defines an all-or-nothing relationship between keys where if one of the peers is present, all of them are required as well.
+     * @param peers - the key names of which if one present, all are required. peers can be a single string value,
+     * an array of string values, or each peer provided as an argument.
+     */
+    and(peer1: string, ...peers: string[]): ObjectSchema;
+    and(peers: string[]): ObjectSchema;
+
+    /**
+     * Defines a relationship between keys where not all peers can be present at the same time.
+     * @param peers - the key names of which if one present, the others may not all be present.
+     * peers can be a single string value, an array of string values, or each peer provided as an argument.
+     */
+    nand(peer1: string, ...peers: string[]): ObjectSchema;
+    nand(peers: string[]): ObjectSchema;
+
+    /**
+     * Defines a relationship between keys where one of the peers is required (and more than one is allowed).
+     */
+    or(peer1: string, ...peers: string[]): ObjectSchema;
+    or(peers: string[]): ObjectSchema;
+
+    /**
+     * Defines an exclusive relationship between a set of keys. one of them is required but not at the same time where:
+     */
+    xor(peer1: string, ...peers: string[]): ObjectSchema;
+    xor(peers: string[]): ObjectSchema;
+
+    /**
+     * Requires the presence of other keys whenever the specified key is present.
+     */
+    with(key: string, peers: string): ObjectSchema;
+    with(key: string, peers: string[]): ObjectSchema;
+
+    /**
+     * Forbids the presence of other keys whenever the specified is present.
+     */
+    without(key: string, peers: string): ObjectSchema;
+    without(key: string, peers: string[]): ObjectSchema;
+
+    /**
+     * Renames a key to another name (deletes the renamed key).
+     */
+    rename(from: string, to: string, options?: RenameOptions): ObjectSchema;
+
+    /**
+     * Verifies an assertion where.
+     */
+    assert(ref: string, schema: Schema, message?: string): ObjectSchema;
+    assert(ref: Reference, schema: Schema, message?: string): ObjectSchema;
+
+    /**
+     * Overrides the handling of unknown keys for the scope of the current object only (does not apply to children).
+     */
+    unknown(allow?: boolean): ObjectSchema;
+
+    /**
+     * Requires the object to be an instance of a given constructor.
+     *
+     * @param constructor - the constructor function that the object must be an instance of.
+     * @param name - an alternate name to use in validation errors. This is useful when the constructor function does not have a name.
+     */
+    type(constructor: Function, name?: string): ObjectSchema;
+
+    /**
+     * Sets the specified children to required.
+     *
+     * @param children - can be a single string value, an array of string values, or each child provided as an argument.
+     *
+     *   var schema = Joi.object().keys({ a: { b: Joi.number() }, c: { d: Joi.string() } });
+     *   var requiredSchema = schema.requiredKeys('', 'a.b', 'c', 'c.d');
+     *
+     * Note that in this example '' means the current object, a is not required but b is, as well as c and d.
+     */
+    requiredKeys(children: string): ObjectSchema;
+    requiredKeys(children: string[]): ObjectSchema;
+    requiredKeys(child: string, ...children: string[]): ObjectSchema;
+
+    /**
+     * Sets the specified children to optional.
+     *
+     * @param children - can be a single string value, an array of string values, or each child provided as an argument.
+     *
+     * The behavior is exactly the same as requiredKeys.
+     */
+    optionalKeys(children: string): ObjectSchema;
+    optionalKeys(children: string[]): ObjectSchema;
+    optionalKeys(child: string, ...children: string[]): ObjectSchema;
+}
+
+export interface BinarySchema extends AnySchema<BinarySchema> {
+    /**
+     * Sets the string encoding format if a string input is converted to a buffer.
+     */
+    encoding(encoding: string): BinarySchema;
+
+    /**
+     * Specifies the minimum length of the buffer.
+     */
+    min(limit: number): BinarySchema;
+
+    /**
+     * Specifies the maximum length of the buffer.
+     */
+    max(limit: number): BinarySchema;
+
+    /**
+     * Specifies the exact length of the buffer:
+     */
+    length(limit: number): BinarySchema;
+}
+
+export interface DateSchema extends AnySchema<DateSchema> {
+
+    /**
+     * Specifies the oldest date allowed.
+     * Notes: 'now' can be passed in lieu of date so as to always compare relatively to the current date,
+     * allowing to explicitly ensure a date is either in the past or in the future.
+     * It can also be a reference to another field.
+     */
+    min(date: Date): DateSchema;
+    min(date: number): DateSchema;
+    min(date: string): DateSchema;
+    min(date: Reference): DateSchema;
+
+    /**
+     * Specifies the latest date allowed.
+     * Notes: 'now' can be passed in lieu of date so as to always compare relatively to the current date,
+     * allowing to explicitly ensure a date is either in the past or in the future.
+     * It can also be a reference to another field.
+     */
+    max(date: Date): DateSchema;
+    max(date: number): DateSchema;
+    max(date: string): DateSchema;
+    max(date: Reference): DateSchema;
+
+    /**
+     * Specifies the allowed date format:
+     * @param format - string or array of strings that follow the moment.js format.
+     */
+    format(format: string): DateSchema;
+    format(format: string[]): DateSchema;
+
+    /**
+     * Requires the string value to be in valid ISO 8601 date format.
+     */
+    iso(): DateSchema;
+}
+
+export interface FunctionSchema extends AnySchema<FunctionSchema> {
+
+}
+
+export interface AlternativesSchema extends AnySchema<FunctionSchema> {
+    try(schemas: Schema[]): AlternativesSchema;
+    when<T>(ref: string, options: WhenOptions<T>): AlternativesSchema;
+    when<T>(ref: Reference, options: WhenOptions<T>): AlternativesSchema;
+}
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+/**
+ * Generates a schema object that matches any data type.
+ */
+export declare function any(): Schema;
+
+/**
+ * Generates a schema object that matches an array data type.
+ */
+export declare function array(): ArraySchema;
+
+/**
+ * Generates a schema object that matches a boolean data type (as well as the strings 'true', 'false', 'yes', and 'no'). Can also be called via bool().
+ */
+export declare function bool(): BooleanSchema;
+
+export declare function boolean(): BooleanSchema;
+
+/**
+ * Generates a schema object that matches a Buffer data type (as well as the strings which will be converted to Buffers).
+ */
+export declare function binary(): BinarySchema;
+
+/**
+ * Generates a schema object that matches a date type (as well as a JavaScript date string or number of milliseconds).
+ */
+export declare function date(): DateSchema;
+
+/**
+ * Generates a schema object that matches a function type.
+ */
+export declare function func(): FunctionSchema;
+
+/**
+ * Generates a schema object that matches a number data type (as well as strings that can be converted to numbers).
+ */
+export declare function number(): NumberSchema;
+
+/**
+ * Generates a schema object that matches an object data type (as well as JSON strings that parsed into objects).
+ */
+export declare function object(schema?: SchemaMap): ObjectSchema;
+
+/**
+ * Generates a schema object that matches a string data type. Note that empty strings are not allowed by default and must be enabled with allow('').
+ */
+export declare function string(): StringSchema;
+
+/**
+ * Generates a type that will match one of the provided alternative schemas
+ */
+export declare function alternatives(types: Schema[]): Schema;
+export declare function alternatives(type1: Schema, type2: Schema, ...types: Schema[]): Schema;
+
+/**
+ * Validates a value using the given schema and options.
+ */
+export declare function validate<T>(value: T, schema: Schema, callback: (err: ValidationError, value: T) => void): void;
+export declare function validate<T>(value: T, schema: Object, callback: (err: ValidationError, value: T) => void): void;
+export declare function validate<T>(value: T, schema: Object, options?: ValidationOptions, callback?: (err: ValidationError, value: T) => void): ValidationResult<T>;
+
+/**
+ * Converts literal schema definition to joi schema object (or returns the same back if already a joi schema object).
+ */
+export declare function compile(schema: Object): Schema;
+
+/**
+ * Validates a value against a schema and throws if validation fails.
+ *
+ * @param value - the value to validate.
+ * @param schema - the schema object.
+ * @param message - optional message string prefix added in front of the error message. may also be an Error object.
+ */
+export declare function assert(value: any, schema: Schema, message?: string | Error): void;
+
+/**
+ * Generates a reference to the value of the named key.
+ */
+export declare function ref(key: string, options?: ReferenceOptions): Reference;
diff --git a/joi/joi-tests.ts b/joi/joi-tests.ts
index a00543fe4e..e588bfac6a 100644
--- a/joi/joi-tests.ts
+++ b/joi/joi-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="joi.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import Joi = require('joi');
 
diff --git a/joi/joi.d.ts b/joi/joi.d.ts
deleted file mode 100644
index d9ee7c20d1..0000000000
--- a/joi/joi.d.ts
+++ /dev/null
@@ -1,778 +0,0 @@
-// Type definitions for joi v6.5.0
-// Project: https://github.com/spumko/joi
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Laurence Dougal Myers <https://github.com/laurence-myers>, Christopher Glantschnig <https://github.com/cglantschnig>, David Broder-Rodgers <https://github.com/DavidBR-SW>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// TODO express type of Schema in a type-parameter (.default, .valid, .example etc)
-
-declare module 'joi' {
-
-	export interface ValidationOptions {
-		/**
-		 * when true, stops validation on the first error, otherwise returns all the errors found. Defaults to true.
-		 */
-		abortEarly?: boolean;
-		/**
-		 * when true, attempts to cast values to the required types (e.g. a string to a number). Defaults to true.
-		 */
-		convert?: boolean;
-		/**
-		 * when true, allows object to contain unknown keys which are ignored. Defaults to false.
-		 */
-		allowUnknown?: boolean;
-		/**
-		 * when true, ignores unknown keys with a function value. Defaults to false.
-		 */
-		skipFunctions?: boolean;
-		/**
-		 * when true, unknown keys are deleted (only when value is an object). Defaults to false.
-		 */
-		stripUnknown?: boolean;
-		/**
-		 * overrides individual error messages. Defaults to no override ({}).
-		 */
-		language?: Object;
-		/**
-		 * sets the default presence requirements. Supported modes: 'optional', 'required', and 'forbidden'. Defaults to 'optional'.
-		 */
-		presence?: string;
-		/**
-		 * provides an external data set to be used in references
-		 */
-		context?: Object;
-	}
-
-	export interface RenameOptions {
-		/**
-		 * if true, does not delete the old key name, keeping both the new and old keys in place. Defaults to false.
-		 */
-		alias?: boolean;
-		/**
-		 * if true, allows renaming multiple keys to the same destination where the last rename wins. Defaults to false.
-		 */
-		multiple?: boolean;
-		/**
-		 * if true, allows renaming a key over an existing key. Defaults to false.
-		 */
-		override?: boolean;
-		/**
-		 * if true, skip renaming of a key if it's undefined. Defaults to false.
-		 */
-		ignoreUndefined?: boolean;
-	}
-
-	export interface EmailOptions {
-		/**
-		 * Numerical threshold at which an email address is considered invalid
-		 */
-		errorLevel?: number | boolean;
-		/**
-		 * Specifies a list of acceptable TLDs.
-		 */
-		tldWhitelist?: string[] | Object;
-		/**
-		 * Number of atoms required for the domain. Be careful since some domains, such as io, directly allow email.
-		 */
-		minDomainAtoms?: number;
-	}
-
-	export interface IpOptions {
-		/**
-		 * One or more IP address versions to validate against. Valid values: ipv4, ipv6, ipvfuture
-		 */
-		version ?: string | string[];
-		/**
-		 * Used to determine if a CIDR is allowed or not. Valid values: optional, required, forbidden
-		 */
-		cidr?: string;
-	}
-
-	export interface UriOptions {
-		/**
-		 * Specifies one or more acceptable Schemes, should only include the scheme name.
-		 * Can be an Array or String (strings are automatically escaped for use in a Regular Expression).
-		 */
-		scheme ?: string | RegExp | Array<string | RegExp>;
-	}
-
-	export interface WhenOptions<T> {
-		/**
-		 * the required condition joi type.
-		 */
-		is: T;
-		/**
-		 * the alternative schema type if the condition is true. Required if otherwise is missing.
-		 */
-		then?: Schema;
-		/**
-		 * the alternative schema type if the condition is false. Required if then is missing
-		 */
-		otherwise?: Schema;
-	}
-
-	export interface ReferenceOptions {
-		separator?: string;
-		contextPrefix?: string;
-	}
-
-	export interface IPOptions {
-		version?: Array<string>;
-		cidr?: string
-	}
-
-	export interface ValidationError extends Error {
-		message: string;
-		details: ValidationErrorItem[];
-		simple(): string;
-		annotated(): string;
-	}
-
-	export interface ValidationErrorItem {
-		message: string;
-		type: string;
-		path: string;
-		options?: ValidationOptions;
-	}
-
-	export interface ValidationResult<T> {
-		error: ValidationError;
-		value: T;
-	}
-
-	export interface SchemaMap {
-		[key: string]: Schema;
-	}
-
-	export interface Schema extends AnySchema<Schema> {
-
-	}
-
-	export interface Reference extends Schema {
-
-	}
-
-	export interface AnySchema<T extends AnySchema<Schema>> {
-		/**
-		 * Whitelists a value
-		 */
-		allow(value: any, ...values: any[]): T;
-		allow(values: any[]): T;
-
-		/**
-		 * Adds the provided values into the allowed whitelist and marks them as the only valid values allowed.
-		 */
-		valid(value: any, ...values: any[]): T;
-		valid(values: any[]): T;
-		only(value: any, ...values : any[]): T;
-		only(values: any[]): T;
-		equal(value: any, ...values : any[]): T;
-		equal(values: any[]): T;
-
-		/**
-		 * Blacklists a value
-		 */
-		invalid(value: any, ...values: any[]): T;
-		invalid(values: any[]): T;
-		disallow(value: any, ...values : any[]): T;
-		disallow(values: any[]): T;
-		not(value: any, ...values : any[]): T;
-		not(values: any[]): T;
-
-		/**
-		 * Marks a key as required which will not allow undefined as value. All keys are optional by default.
-		 */
-		required(): T;
-
-		/**
-		 * Marks a key as optional which will allow undefined as values. Used to annotate the schema for readability as all keys are optional by default.
-		 */
-		optional(): T;
-
-		/**
-		 * Marks a key as forbidden which will not allow any value except undefined. Used to explicitly forbid keys.
-		 */
-		forbidden(): T;
-
-		/**
-		 * Marks a key to be removed from a resulting object or array after validation. Used to sanitize output.
-		 */
-		strip(): T;
-
-		/**
-		 * Annotates the key
-		 */
-		description(desc: string): T;
-
-		/**
-		 * Annotates the key
-		 */
-		notes(notes: string): T;
-		notes(notes: string[]): T;
-
-		/**
-		 * Annotates the key
-		 */
-		tags(notes: string): T;
-		tags(notes: string[]): T;
-
-		/**
-		 * Attaches metadata to the key.
-		 */
-		meta(meta: Object): T;
-
-		/**
-		 * Annotates the key with an example value, must be valid.
-		 */
-		example(value: any): T;
-
-		/**
-		 * Annotates the key with an unit name.
-		 */
-		unit(name: string): T;
-
-		/**
-		 * Overrides the global validate() options for the current key and any sub-key.
-		 */
-		options(options: ValidationOptions): T;
-
-		/**
-		 * Sets the options.convert options to false which prevent type casting for the current key and any child keys.
-		 */
-		strict(isStrict?: boolean): T;
-
-		/**
-		 * Sets a default value if the original value is undefined.
-		 * @param value - the value.
-		 *   value supports references.
-		 *   value may also be a function which returns the default value.
-		 *   If value is specified as a function that accepts a single parameter, that parameter will be a context
-		 *    object that can be used to derive the resulting value. This clones the object however, which incurs some
-		 *    overhead so if you don't need access to the context define your method so that it does not accept any
-		 *    parameters.
-		 *   Without any value, default has no effect, except for object that will then create nested defaults
-		 *    (applying inner defaults of that object).
-		 *
-		 * Note that if value is an object, any changes to the object after default() is called will change the
-		 *  reference and any future assignment.
-		 *
-		 * Additionally, when specifying a method you must either have a description property on your method or the
-		 *  second parameter is required.
-		 */
-		default(value: any, description?: string): T;
-		default(): T;
-
-		/**
-		 * Returns a new type that is the result of adding the rules of one type to another.
-		 */
-		concat(schema: T): T;
-
-		/**
-		 * Converts the type into an alternatives type where the conditions are merged into the type definition where:
-		 */
-		when<U>(ref: string, options: WhenOptions<U>): AlternativesSchema;
-		when<U>(ref: Reference, options: WhenOptions<U>): AlternativesSchema;
-
-		/**
-		 * Overrides the key name in error messages.
-		 */
-		label(name: string): T;
-
-		/**
-		 * Outputs the original untouched value instead of the casted value.
-		 */
-		raw(isRaw?: boolean): T;
-
-		/**
-		 * Considers anything that matches the schema to be empty (undefined).
-		 * @param schema - any object or joi schema to match. An undefined schema unsets that rule.
-		 */
-		empty(schema?: any) : T;
-	}
-
-	export interface BooleanSchema extends AnySchema<BooleanSchema> {
-
-	}
-
-	export interface NumberSchema extends AnySchema<NumberSchema> {
-		/**
-		 * Specifies the minimum value.
-		 * It can also be a reference to another field.
-		 */
-		min(limit: number): NumberSchema;
-		min(limit: Reference): NumberSchema;
-
-		/**
-		 * Specifies the maximum value.
-		 * It can also be a reference to another field.
-		 */
-		max(limit: number): NumberSchema;
-		max(limit: Reference): NumberSchema;
-
-		/**
-		 * Specifies that the value must be greater than limit.
-		 * It can also be a reference to another field.
-		 */
-		greater(limit: number): NumberSchema;
-		greater(limit: Reference): NumberSchema;
-
-		/**
-		 * Specifies that the value must be less than limit.
-		 * It can also be a reference to another field.
-		 */
-		less(limit: number): NumberSchema;
-		less(limit: Reference): NumberSchema;
-
-		/**
-		 * Requires the number to be an integer (no floating point).
-		 */
-		integer(): NumberSchema;
-
-		/**
-		 * Specifies the maximum number of decimal places where:
-		 *  limit - the maximum number of decimal places allowed.
-		 */
-		precision(limit: number): NumberSchema;
-
-		/**
-		 * Specifies that the value must be a multiple of base.
-		 */
-		multiple(base: number): NumberSchema;
-
-		/**
-		 * Requires the number to be positive.
-		 */
-		positive(): NumberSchema;
-
-		/**
-		 * Requires the number to be negative.
-		 */
-		negative(): NumberSchema;
-	}
-
-	export interface StringSchema extends AnySchema<StringSchema> {
-		/**
-		 * Allows the value to match any whitelist of blacklist item in a case insensitive comparison.
-		 */
-		insensitive(): StringSchema;
-
-		/**
-		 * Specifies the minimum number string characters.
-		 * @param limit - the minimum number of string characters required. It can also be a reference to another field.
-		 * @param encoding - if specified, the string length is calculated in bytes using the provided encoding.
-		 */
-		min(limit: number, encoding?: string): StringSchema;
-		min(limit: Reference, encoding?: string): StringSchema;
-
-		/**
-		 * Specifies the maximum number of string characters.
-		 * @param limit - the maximum number of string characters allowed. It can also be a reference to another field.
-		 * @param encoding - if specified, the string length is calculated in bytes using the provided encoding.
-		 */
-		max(limit: number, encoding?: string): StringSchema;
-		max(limit: Reference, encoding?: string): StringSchema;
-
-		/**
-		 * Requires the number to be a credit card number (Using Lunh Algorithm).
-		 */
-		creditCard(): StringSchema;
-
-		/**
-		 * Specifies the exact string length required
-		 * @param limit - the required string length. It can also be a reference to another field.
-		 * @param encoding - if specified, the string length is calculated in bytes using the provided encoding.
-		 */
-		length(limit: number, encoding?: string): StringSchema;
-		length(limit: Reference, encoding?: string): StringSchema;
-
-		/**
-		 * Defines a regular expression rule.
-		 * @param pattern - a regular expression object the string value must match against.
-		 * @param name - optional name for patterns (useful with multiple patterns). Defaults to 'required'.
-		 */
-		regex(pattern: RegExp, name?: string): StringSchema;
-
-		/**
-		 * Replace characters matching the given pattern with the specified replacement string where:
-		 * @param pattern - a regular expression object to match against, or a string of which all occurrences will be replaced.
-		 * @param replacement - the string that will replace the pattern.
-		 */
-		replace(pattern: RegExp, replacement: string): StringSchema;
-		replace(pattern: string, replacement: string): StringSchema;
-
-		/**
-		 * Requires the string value to only contain a-z, A-Z, and 0-9.
-		 */
-		alphanum(): StringSchema;
-
-		/**
-		 * Requires the string value to only contain a-z, A-Z, 0-9, and underscore _.
-		 */
-		token(): StringSchema;
-
-		/**
-		 * Requires the string value to be a valid email address.
-		 */
-		email(options?: EmailOptions): StringSchema;
-
-		/**
-		 * Requires the string value to be a valid ip address.
-		 */
-		ip(options?: IpOptions): StringSchema;
-
-		/**
-		 * Requires the string value to be a valid RFC 3986 URI.
-		 */
-		uri(options?: UriOptions): StringSchema;
-
-		/**
-		 * Requires the string value to be a valid GUID.
-		 */
-		guid(): StringSchema;
-
-		/**
-		 * Requires the string value to be a valid hexadecimal string.
-		 */
-		hex(): StringSchema;
-
-		/**
-		 * Requires the string value to be a valid hostname as per RFC1123.
-		 */
-		hostname(): StringSchema;
-
-		/**
-		 * Requires the string value to be in valid ISO 8601 date format.
-		 */
-		isoDate(): StringSchema;
-
-		/**
-		 * Requires the string value to be all lowercase. If the validation convert option is on (enabled by default), the string will be forced to lowercase.
-		 */
-		lowercase(): StringSchema;
-
-		/**
-		 * Requires the string value to be all uppercase. If the validation convert option is on (enabled by default), the string will be forced to uppercase.
-		 */
-		uppercase(): StringSchema;
-
-		/**
-		 * Requires the string value to contain no whitespace before or after. If the validation convert option is on (enabled by default), the string will be trimmed.
-		 */
-		trim(): StringSchema;
-	}
-
-	export interface ArraySchema extends AnySchema<ArraySchema> {
-		/**
-		 * Allow this array to be sparse.
-		 * enabled can be used with a falsy value to go back to the default behavior.
-		 */
-		sparse(enabled?: any): ArraySchema;
-
-		/**
-		 * Allow single values to be checked against rules as if it were provided as an array.
-		 * enabled can be used with a falsy value to go back to the default behavior.
-		 */
-		single(enabled?: any): ArraySchema;
-
-		/**
-		 * List the types allowed for the array values.
-		 * type can be an array of values, or multiple values can be passed as individual arguments.
-		 * If a given type is .required() then there must be a matching item in the array.
-		 * If a type is .forbidden() then it cannot appear in the array.
-		 * Required items can be added multiple times to signify that multiple items must be found.
-		 * Errors will contain the number of items that didn't match.
-		 * Any unmatched item having a label will be mentioned explicitly.
-		 *
-		 * @param type - a joi schema object to validate each array item against.
-		 */
-		items(type: Schema, ...types: Schema[]): ArraySchema;
-		items(types: Schema[]): ArraySchema;
-
-		/**
-		 * Specifies the minimum number of items in the array.
-		 */
-		min(limit: number): ArraySchema;
-
-		/**
-		 * Specifies the maximum number of items in the array.
-		 */
-		max(limit: number): ArraySchema;
-
-		/**
-		 * Specifies the exact number of items in the array.
-		 */
-		length(limit: number): ArraySchema;
-
-		/**
-		 * Requires the array values to be unique.
-		 * Be aware that a deep equality is performed on elements of the array having a type of object,
-		 * a performance penalty is to be expected for this kind of operation.
-		 */
-		unique(): ArraySchema;
-	}
-
-	export interface ObjectSchema extends AnySchema<ObjectSchema> {
-		/**
-		 * Sets the allowed object keys.
-		 */
-		keys(schema?: SchemaMap): ObjectSchema;
-
-		/**
-		 * Specifies the minimum number of keys in the object.
-		 */
-		min(limit: number): ObjectSchema;
-
-		/**
-		 * Specifies the maximum number of keys in the object.
-		 */
-		max(limit: number): ObjectSchema;
-
-		/**
-		 * Specifies the exact number of keys in the object.
-		 */
-		length(limit: number): ObjectSchema;
-
-		/**
-		 * Specify validation rules for unknown keys matching a pattern.
-		 */
-		pattern(regex: RegExp, schema: Schema): ObjectSchema;
-
-		/**
-		 * Defines an all-or-nothing relationship between keys where if one of the peers is present, all of them are required as well.
-		 * @param peers - the key names of which if one present, all are required. peers can be a single string value,
-		 * an array of string values, or each peer provided as an argument.
-		 */
-		and(peer1: string, ...peers: string[]): ObjectSchema;
-		and(peers: string[]): ObjectSchema;
-
-		/**
-		 * Defines a relationship between keys where not all peers can be present at the same time.
-		 * @param peers - the key names of which if one present, the others may not all be present.
-		 * peers can be a single string value, an array of string values, or each peer provided as an argument.
-		 */
-		nand(peer1: string, ...peers: string[]): ObjectSchema;
-		nand(peers: string[]): ObjectSchema;
-
-		/**
-		 * Defines a relationship between keys where one of the peers is required (and more than one is allowed).
-		 */
-		or(peer1: string, ...peers: string[]): ObjectSchema;
-		or(peers: string[]): ObjectSchema;
-
-		/**
-		 * Defines an exclusive relationship between a set of keys. one of them is required but not at the same time where:
-		 */
-		xor(peer1: string, ...peers: string[]): ObjectSchema;
-		xor(peers: string[]): ObjectSchema;
-
-		/**
-		 * Requires the presence of other keys whenever the specified key is present.
-		 */
-		with(key: string, peers: string): ObjectSchema;
-		with(key: string, peers: string[]): ObjectSchema;
-
-		/**
-		 * Forbids the presence of other keys whenever the specified is present.
-		 */
-		without(key: string, peers: string): ObjectSchema;
-		without(key: string, peers: string[]): ObjectSchema;
-
-		/**
-		 * Renames a key to another name (deletes the renamed key).
-		 */
-		rename(from: string, to: string, options?: RenameOptions): ObjectSchema;
-
-		/**
-		 * Verifies an assertion where.
-		 */
-		assert(ref: string, schema: Schema, message?: string): ObjectSchema;
-		assert(ref: Reference, schema: Schema, message?: string): ObjectSchema;
-
-		/**
-		 * Overrides the handling of unknown keys for the scope of the current object only (does not apply to children).
-		 */
-		unknown(allow?: boolean): ObjectSchema;
-
-		/**
-		 * Requires the object to be an instance of a given constructor.
-		 *
-		 * @param constructor - the constructor function that the object must be an instance of.
-		 * @param name - an alternate name to use in validation errors. This is useful when the constructor function does not have a name.
-		 */
-		type(constructor: Function, name?: string): ObjectSchema;
-
-		/**
-		 * Sets the specified children to required.
-		 *
-		 * @param children - can be a single string value, an array of string values, or each child provided as an argument.
-		 *
-		 *   var schema = Joi.object().keys({ a: { b: Joi.number() }, c: { d: Joi.string() } });
-		 *   var requiredSchema = schema.requiredKeys('', 'a.b', 'c', 'c.d');
-		 *
-		 * Note that in this example '' means the current object, a is not required but b is, as well as c and d.
-		 */
-		requiredKeys(children: string): ObjectSchema;
-		requiredKeys(children: string[]): ObjectSchema;
-		requiredKeys(child:string, ...children: string[]): ObjectSchema;
-
-		/**
-		 * Sets the specified children to optional.
-		 *
-		 * @param children - can be a single string value, an array of string values, or each child provided as an argument.
-		 *
-		 * The behavior is exactly the same as requiredKeys.
-		 */
-		optionalKeys(children: string): ObjectSchema;
-		optionalKeys(children: string[]): ObjectSchema;
-		optionalKeys(child:string, ...children: string[]): ObjectSchema;
-	}
-
-	export interface BinarySchema extends AnySchema<BinarySchema> {
-		/**
-		 * Sets the string encoding format if a string input is converted to a buffer.
-		 */
-		encoding(encoding: string): BinarySchema;
-
-		/**
-		 * Specifies the minimum length of the buffer.
-		 */
-		min(limit: number): BinarySchema;
-
-		/**
-		 * Specifies the maximum length of the buffer.
-		 */
-		max(limit: number): BinarySchema;
-
-		/**
-		 * Specifies the exact length of the buffer:
-		 */
-		length(limit: number): BinarySchema;
-	}
-
-	export interface DateSchema extends AnySchema<DateSchema> {
-
-		/**
-		 * Specifies the oldest date allowed.
-		 * Notes: 'now' can be passed in lieu of date so as to always compare relatively to the current date,
-		 * allowing to explicitly ensure a date is either in the past or in the future.
-		 * It can also be a reference to another field.
-		 */
-		min(date: Date): DateSchema;
-		min(date: number): DateSchema;
-		min(date: string): DateSchema;
-		min(date: Reference): DateSchema;
-
-		/**
-		 * Specifies the latest date allowed.
-		 * Notes: 'now' can be passed in lieu of date so as to always compare relatively to the current date,
-		 * allowing to explicitly ensure a date is either in the past or in the future.
-		 * It can also be a reference to another field.
-		 */
-		max(date: Date): DateSchema;
-		max(date: number): DateSchema;
-		max(date: string): DateSchema;
-		max(date: Reference): DateSchema;
-
-		/**
-		 * Specifies the allowed date format:
-		 * @param format - string or array of strings that follow the moment.js format.
-		 */
-		format(format: string): DateSchema;
-		format(format: string[]): DateSchema;
-
-		/**
-		 * Requires the string value to be in valid ISO 8601 date format.
-		 */
-		iso(): DateSchema;
-	}
-
-	export interface FunctionSchema extends AnySchema<FunctionSchema> {
-
-	}
-
-	export interface AlternativesSchema extends AnySchema<FunctionSchema> {
-		try(schemas: Schema[]): AlternativesSchema;
-		when<T>(ref: string, options: WhenOptions<T>): AlternativesSchema;
-		when<T>(ref: Reference, options: WhenOptions<T>): AlternativesSchema;
-	}
-
-	// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
-
-	/**
-	 * Generates a schema object that matches any data type.
-	 */
-	export function any(): Schema;
-
-	/**
-	 * Generates a schema object that matches an array data type.
-	 */
-	export function array(): ArraySchema;
-
-	/**
-	 * Generates a schema object that matches a boolean data type (as well as the strings 'true', 'false', 'yes', and 'no'). Can also be called via bool().
-	 */
-	export function bool(): BooleanSchema;
-
-	export function boolean(): BooleanSchema;
-
-	/**
-	 * Generates a schema object that matches a Buffer data type (as well as the strings which will be converted to Buffers).
-	 */
-	export function binary(): BinarySchema;
-
-	/**
-	 * Generates a schema object that matches a date type (as well as a JavaScript date string or number of milliseconds).
-	 */
-	export function date(): DateSchema;
-
-	/**
-	 * Generates a schema object that matches a function type.
-	 */
-	export function func(): FunctionSchema;
-
-	/**
-	 * Generates a schema object that matches a number data type (as well as strings that can be converted to numbers).
-	 */
-	export function number(): NumberSchema;
-
-	/**
-	 * Generates a schema object that matches an object data type (as well as JSON strings that parsed into objects).
-	 */
-	export function object(schema?: SchemaMap): ObjectSchema;
-
-	/**
-	 * Generates a schema object that matches a string data type. Note that empty strings are not allowed by default and must be enabled with allow('').
-	 */
-	export function string(): StringSchema;
-
-	/**
-	 * Generates a type that will match one of the provided alternative schemas
-	 */
-	export function alternatives(types: Schema[]): Schema;
-	export function alternatives(type1: Schema, type2: Schema, ...types: Schema[]): Schema;
-
-	/**
-	 * Validates a value using the given schema and options.
-	 */
-	export function validate<T>(value: T, schema: Schema, callback: (err: ValidationError, value: T) => void): void;
-	export function validate<T>(value: T, schema: Object, callback: (err: ValidationError, value: T) => void): void;
-	export function validate<T>(value: T, schema: Object, options?: ValidationOptions, callback?: (err: ValidationError, value: T) => void): ValidationResult<T>;
-
-	/**
-	 * Converts literal schema definition to joi schema object (or returns the same back if already a joi schema object).
-	 */
-	export function compile(schema: Object): Schema;
-
-	/**
-	 * Validates a value against a schema and throws if validation fails.
-	 *
-	 * @param value - the value to validate.
-	 * @param schema - the schema object.
-	 * @param message - optional message string prefix added in front of the error message. may also be an Error object.
-	 */
-	export function assert(value: any, schema: Schema, message?: string | Error): void;
-
-	/**
-	 * Generates a reference to the value of the named key.
-	 */
-	export function ref(key: string, options?: ReferenceOptions): Reference;
-}
diff --git a/joi/tsconfig.json b/joi/tsconfig.json
new file mode 100644
index 0000000000..2075c60731
--- /dev/null
+++ b/joi/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "joi-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jointjs/README.md b/jointjs/README.md
index 5ea728842f..c15dce6c58 100644
--- a/jointjs/README.md
+++ b/jointjs/README.md
@@ -6,4 +6,4 @@ Current version 0.6
 
 ## Referencing JointJS definition files in your code
 
-Add `/// <reference path="jointjs.d.ts" />` at the top of your code.
\ No newline at end of file
+Add `` at the top of your code.
\ No newline at end of file
diff --git a/jointjs/index.d.ts b/jointjs/index.d.ts
new file mode 100644
index 0000000000..9af669fdea
--- /dev/null
+++ b/jointjs/index.d.ts
@@ -0,0 +1,135 @@
+// Type definitions for Joint JS 0.9.3
+// Project: http://www.jointjs.com/
+// Definitions by: Aidan Reel <http://github.com/areel>, David Durman <http://github.com/DavidDurman>, Ewout Van Gossum <https://github.com/DenEwout>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="backbone" />
+
+declare namespace joint {
+
+    namespace dia {
+
+        interface IElementSize {
+            width: number;
+            height: number;
+        }
+
+        class Graph extends Backbone.Model {
+            addCell(cell:Cell) : void;
+            addCells(cells:Cell[]) : void;
+            initialize() : void;
+            fromJSON(json:any) : void;
+            toJSON() : Object;
+            clear() : void;
+            getConnectedLinks(cell:Cell, opt?:any):Link[];
+            disconnectLinks(cell:Cell) : void;
+            removeLinks(cell:Cell) : void;
+            findModelsFromPoint(point:{x : number; y: number}):Element[];
+        }
+
+        class Cell extends Backbone.Model {
+            toJSON() : Object;
+            remove(options?:any) : void;
+            toFront() : void;
+            toBack() : void;
+            embed(cell:Cell) : void;
+            unembed(cell:Cell) : void;
+            getEmbeddedCells():Cell[];
+            clone(opt?:any):Backbone.Model;      // @todo: return can either be Cell or Cell[].
+            attr(attrs:any):Cell;
+        }
+
+        class Element extends Cell {
+            position(x:number, y:number):Element;
+            position(): {x:number, y:number}; 
+            translate(tx:number, ty?:number):Element;
+            resize(width:number, height:number):Element;
+            rotate(angle:number, options : {absolute : boolean; origin: {x:number;y:number}}):Element;
+            remove(): void;
+        }
+
+        interface IDefaults {
+            type: string;
+        }
+
+        class Link extends Cell {
+            defaults():IDefaults;
+            disconnect():Link;
+            label(idx?:number, value?:any):any;   // @todo: returns either a label under idx or Link if both idx and value were passed
+            remove(): void;
+        }
+
+        interface IOptions {
+            width?: number;
+            height?: number;
+            gridSize?: number;
+            perpendicularLinks?: boolean;
+            elementView?: ElementView;
+            linkView?: LinkView;
+        }
+
+        class Paper extends Backbone.View<Backbone.Model> {
+            options:IOptions;
+
+            setDimensions(width:number, height:number) : void;
+            scale(sx:number, sy?:number, ox?:number, oy?:number):Paper;
+            rotate(deg:number, ox?:number, oy?:number):Paper;      // @todo not released yet though it's in the source code already
+            findView(el:any):CellView;
+            findViewByModel(modelOrId:any):CellView;
+            findViewsFromPoint(p:{ x: number; y: number; }):CellView[];
+            findViewsInArea(r:{ x: number; y: number; width: number; height: number; }):CellView[];
+            fitToContent(opt?:any): void;
+        }
+
+        class ElementView extends CellView {
+            scale(sx:number, sy:number) : void;
+        }
+
+        class CellView extends Backbone.View<Cell> {
+            getBBox():{ x: number; y: number; width: number; height: number; };
+            highlight(el?:any): void;
+            unhighlight(el?:any): void;
+            findMagnet(el:any): void;
+            getSelector(el:any): void;
+
+            pointerdblclick(evt:any, x:number, y:number):void;
+            pointerclick(evt:any, x:number, y:number):void;
+            pointerdown(evt:any, x:number, y:number):void;
+            pointermove(evt:any, x:number, y:number):void;
+            pointerup(evt:any, x:number, y:number):void;
+        }
+
+        class LinkView extends CellView {
+            getConnectionLength():number;
+            getPointAtLength(length:number):{ x: number; y: number; };
+        }
+
+    }
+
+    namespace ui {}
+
+    namespace shapes {
+        namespace basic {
+            class Generic extends dia.Element {
+            }
+            class Rect extends Generic {
+            }
+            class Text extends Generic {
+            }
+            class Circle extends Generic {
+            }
+            class Image extends Generic {
+            }
+        }
+    }
+
+    namespace util {
+        function uuid():string;
+        function guid(obj:any):string;
+        function mixin(objects:any[]):any;
+        function supplement(objects:any[]):any;
+        function deepMixin(objects:any[]):any;
+        function deepSupplement(objects:any[], defaultIndicator?:any):any;
+    }
+
+}
diff --git a/jointjs/jointjs.d.ts b/jointjs/jointjs.d.ts
deleted file mode 100644
index b5de0684f0..0000000000
--- a/jointjs/jointjs.d.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-// Type definitions for Joint JS 0.9.3
-// Project: http://www.jointjs.com/
-// Definitions by: Aidan Reel <http://github.com/areel>, David Durman <http://github.com/DavidDurman>, Ewout Van Gossum <https://github.com/DenEwout>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../backbone/backbone.d.ts" />
-
-
-declare namespace joint {
-
-    namespace dia {
-
-        interface IElementSize {
-            width: number;
-            height: number;
-        }
-
-        class Graph extends Backbone.Model {
-            addCell(cell:Cell) : void;
-            addCells(cells:Cell[]) : void;
-            initialize() : void;
-            fromJSON(json:any) : void;
-            toJSON() : Object;
-            clear() : void;
-            getConnectedLinks(cell:Cell, opt?:any):Link[];
-            disconnectLinks(cell:Cell) : void;
-            removeLinks(cell:Cell) : void;
-            findModelsFromPoint(point:{x : number; y: number}):Element[];
-        }
-
-        class Cell extends Backbone.Model {
-            toJSON() : Object;
-            remove(options?:any) : void;
-            toFront() : void;
-            toBack() : void;
-            embed(cell:Cell) : void;
-            unembed(cell:Cell) : void;
-            getEmbeddedCells():Cell[];
-            clone(opt?:any):Backbone.Model;      // @todo: return can either be Cell or Cell[].
-            attr(attrs:any):Cell;
-        }
-
-        class Element extends Cell {
-            position(x:number, y:number):Element;
-            position(): {x:number, y:number}; 
-            translate(tx:number, ty?:number):Element;
-            resize(width:number, height:number):Element;
-            rotate(angle:number, options : {absolute : boolean; origin: {x:number;y:number}}):Element;
-            remove(): void;
-        }
-
-        interface IDefaults {
-            type: string;
-        }
-
-        class Link extends Cell {
-            defaults():IDefaults;
-            disconnect():Link;
-            label(idx?:number, value?:any):any;   // @todo: returns either a label under idx or Link if both idx and value were passed
-            remove(): void;
-        }
-
-        interface IOptions {
-            width?: number;
-            height?: number;
-            gridSize?: number;
-            perpendicularLinks?: boolean;
-            elementView?: ElementView;
-            linkView?: LinkView;
-        }
-
-        class Paper extends Backbone.View<Backbone.Model> {
-            options:IOptions;
-
-            setDimensions(width:number, height:number) : void;
-            scale(sx:number, sy?:number, ox?:number, oy?:number):Paper;
-            rotate(deg:number, ox?:number, oy?:number):Paper;      // @todo not released yet though it's in the source code already
-            findView(el:any):CellView;
-            findViewByModel(modelOrId:any):CellView;
-            findViewsFromPoint(p:{ x: number; y: number; }):CellView[];
-            findViewsInArea(r:{ x: number; y: number; width: number; height: number; }):CellView[];
-            fitToContent(opt?:any): void;
-        }
-
-        class ElementView extends CellView {
-            scale(sx:number, sy:number) : void;
-        }
-
-        class CellView extends Backbone.View<Cell> {
-            getBBox():{ x: number; y: number; width: number; height: number; };
-            highlight(el?:any): void;
-            unhighlight(el?:any): void;
-            findMagnet(el:any): void;
-            getSelector(el:any): void;
-
-            pointerdblclick(evt:any, x:number, y:number):void;
-            pointerclick(evt:any, x:number, y:number):void;
-            pointerdown(evt:any, x:number, y:number):void;
-            pointermove(evt:any, x:number, y:number):void;
-            pointerup(evt:any, x:number, y:number):void;
-        }
-
-        class LinkView extends CellView {
-            getConnectionLength():number;
-            getPointAtLength(length:number):{ x: number; y: number; };
-        }
-
-    }
-
-    namespace ui {}
-
-    namespace shapes {
-        namespace basic {
-            class Generic extends dia.Element {
-            }
-            class Rect extends Generic {
-            }
-            class Text extends Generic {
-            }
-            class Circle extends Generic {
-            }
-            class Image extends Generic {
-            }
-        }
-    }
-
-    namespace util {
-        function uuid():string;
-        function guid(obj:any):string;
-        function mixin(objects:any[]):any;
-        function supplement(objects:any[]):any;
-        function deepMixin(objects:any[]):any;
-        function deepSupplement(objects:any[], defaultIndicator?:any):any;
-    }
-
-}
diff --git a/jointjs/tsconfig.json b/jointjs/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/jointjs/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jqgrid/index.d.ts b/jqgrid/index.d.ts
new file mode 100644
index 0000000000..a2c0baa49e
--- /dev/null
+++ b/jqgrid/index.d.ts
@@ -0,0 +1,64 @@
+// Type definitions for jQuery jqgrid Plugin 1.3
+// Project: https://github.com/tonytomov/jqGrid
+// Definitions by: Lokesh Peta <https://github.com/lokeshpeta/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="jquery" />
+interface JQueryJqGridColumn {
+    name: string;
+    index: string;
+    hidden?: boolean;
+    sortable?: boolean;
+    search?: boolean;
+    width?: number;
+    formatter?: (cellvalue: any, options: any, rowObject: any) => any;
+}
+
+interface IJqGridJsonReader {
+    repeatitems: boolean;
+    root(obj: any): any;
+    page(obj: any): any;
+    total(obj: any): number;
+    records(obj: {data: any[]}): number;
+}
+
+interface JQueryJqGridOptions {
+    datatype?: string;
+    mtype?: string;
+    autoencode?: boolean;
+    pager?: string;
+    rowNum?: number;
+    rowList?: number[];
+    colNames?: string[];
+    colModel?: JQueryJqGridColumn[];
+    sortname?: string;
+    sortorder?: string;
+    multiselect?: boolean;
+    multiboxonly?: boolean;
+    forceFit?: boolean;
+    height?: number;
+    width?: number;
+    shrinkToFit?: boolean;
+    url?: string;
+    jsonReader?: IJqGridJsonReader;
+    gridComplete?:()=>void;
+}
+
+interface JQueryJqGridStatic {
+    (): JQuery;
+    (gridName: string): any;
+    (gridName: string, propName: string): any;
+    (gridName: string, obj: any): any;
+    (gridName: string, id: any, colname: any): any;
+    (options: JQueryJqGridOptions): JQuery;
+}
+
+interface JQueryStatic {
+    jqGrid?: JQueryJqGridStatic;
+}
+
+interface JQuery {
+    jqGrid?: JQueryJqGridStatic;
+
+    setGridParam(obj: any): void;
+}
\ No newline at end of file
diff --git a/jqgrid/jqgrid-tests.ts b/jqgrid/jqgrid-tests.ts
index 6f112d2976..2c84c39fe1 100644
--- a/jqgrid/jqgrid-tests.ts
+++ b/jqgrid/jqgrid-tests.ts
@@ -2,5 +2,4 @@
 // Definitions by: Lokesh Peta <https://github.com/lokeshpeta/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference path="../jquery/jquery.d.ts" />
-/// <reference path="jqgrid.d.ts" />
\ No newline at end of file
+///<reference types="jquery" />
diff --git a/jqgrid/jqgrid.d.ts b/jqgrid/jqgrid.d.ts
deleted file mode 100644
index 82807282a0..0000000000
--- a/jqgrid/jqgrid.d.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-// Type definitions for jQuery jqgrid Plugin 1.3
-// Project: https://github.com/tonytomov/jqGrid
-// Definitions by: Lokesh Peta <https://github.com/lokeshpeta/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../jquery/jquery.d.ts" />
-interface JQueryJqGridColumn {
-    name: string;
-    index: string;
-    hidden?: boolean;
-    sortable?: boolean;
-    search?: boolean;
-    width?: number;
-    formatter?: (cellvalue: any, options: any, rowObject: any) => any;
-}
-
-interface IJqGridJsonReader {
-    repeatitems: boolean;
-    root(obj: any): any;
-    page(obj: any): any;
-    total(obj: any): number;
-    records(obj: {data: any[]}): number;
-}
-
-interface JQueryJqGridOptions {
-    datatype?: string;
-    mtype?: string;
-    autoencode?: boolean;
-    pager?: string;
-    rowNum?: number;
-    rowList?: number[];
-    colNames?: string[];
-    colModel?: JQueryJqGridColumn[];
-    sortname?: string;
-    sortorder?: string;
-    multiselect?: boolean;
-    multiboxonly?: boolean;
-    forceFit?: boolean;
-    height?: number;
-    width?: number;
-    shrinkToFit?: boolean;
-    url?: string;
-    jsonReader?: IJqGridJsonReader;
-    gridComplete?:()=>void;
-}
-
-interface JQueryJqGridStatic {
-    (): JQuery;
-    (gridName: string): any;
-    (gridName: string, propName: string): any;
-    (gridName: string, obj: any): any;
-    (gridName: string, id: any, colname: any): any;
-    (options: JQueryJqGridOptions): JQuery;
-}
-
-interface JQueryStatic {
-    jqGrid?: JQueryJqGridStatic;
-}
-
-interface JQuery {
-    jqGrid?: JQueryJqGridStatic;
-
-    setGridParam(obj: any): void;
-}
\ No newline at end of file
diff --git a/jqgrid/tsconfig.json b/jqgrid/tsconfig.json
new file mode 100644
index 0000000000..9ca80d961a
--- /dev/null
+++ b/jqgrid/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jqgrid-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jqrangeslider/index.d.ts b/jqrangeslider/index.d.ts
new file mode 100644
index 0000000000..9e65d7fa5d
--- /dev/null
+++ b/jqrangeslider/index.d.ts
@@ -0,0 +1,74 @@
+// Type definitions for jQRangeSlider 4.2.8
+// Project: http://ghusse.github.com/jQRangeSlider
+// Definitions by: Dániel Tar <https://github.com/qcz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+/// <reference types="jqueryui"/>
+
+interface JQRangeSliderNumericRange {
+    min?: number;
+    max?: number;
+}
+
+interface JQRangeSliderDateRange {
+    min?: Date;
+    max?: Date;
+}
+
+interface JQRangeSliderRangeLength {
+    min?: any;
+    max?: any;
+}
+
+interface JQRangeSliderDateSteps {
+    years?: number;
+    months?: number;
+    weeks?: number;
+    days?: number;
+    hours?: number;
+    minutes?: number;
+    seconds?: number;
+}
+
+interface JQRangeSliderOptions {
+    wheelMode?: string; // function of the wheel, "zoom", "scroll" or null
+    wheelSpeed?: number; // speed of the wheel scrolling
+    arrows?: boolean; // hide the arrows or not
+    valueLabels?: string; // when to show value labels: "show" (always), "hide" (never) and "change" (only if slider changed)
+    durationIn?: number; // fade in length when displaying value labels (only when valueLabels = "change")
+    durationOut?: number; // fade out length when displaying value labels (only when valueLabels = "change")
+    delayOut?: number; // duration labels are shown after the user changed its values (only when valueLabels = "change")
+    range?: JQRangeSliderRangeLength; // lets you specify minimum and/or maximum range length
+}
+
+interface JQNumericRangeSliderOptions extends JQRangeSliderOptions {
+    bounds?: JQRangeSliderNumericRange; // min and max values of the slider
+    defaultValues?: JQRangeSliderNumericRange; // values selected by default on construction
+    formatter?: (int: number) => string; // customize displayed label text
+    step?: number; // allows to customize values rounding, and graphically render this rounding
+}
+
+interface JQDateRangeSliderOptions extends JQRangeSliderOptions {
+    bounds?: JQRangeSliderDateRange; // min and max values of the slider
+    defaultValues?: JQRangeSliderDateRange; // values selected by default on construction
+    formatter?: (date: Date) => string; // customize displayed label text
+    step?: JQRangeSliderDateSteps; // allows to customize values rounding, and graphically render this rounding
+}
+
+interface JQuery {
+    rangeSlider(method: string): any;
+    rangeSlider(method: string, value: number): JQuery;
+    rangeSlider(method: string, min: number, max: number): JQuery;
+    rangeSlider(options?: JQNumericRangeSliderOptions): JQuery;
+
+    editRangeSlider(method: string): any;
+    editRangeSlider(method: string, value: number): JQuery;
+    editRangeSlider(method: string, min: number, max: number): JQuery
+	editRangeSlider(options?: JQNumericRangeSliderOptions): JQuery;
+
+    dateRangeSlider(method: string): any;
+    dateRangeSlider(method: string, value: Date): JQuery;
+    dateRangeSlider(method: string, min: Date, max: Date): JQuery
+	dateRangeSlider(options?: JQDateRangeSliderOptions): JQuery;
+}
diff --git a/jqrangeslider/jqrangeslider-tests.ts b/jqrangeslider/jqrangeslider-tests.ts
index 152ab28e75..0e8d600559 100644
--- a/jqrangeslider/jqrangeslider-tests.ts
+++ b/jqrangeslider/jqrangeslider-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jqrangeslider.d.ts"/>
+/// <reference types="jquery"/>
 
 // Arrows
 $("#arrowsExample").rangeSlider({ arrows: false });
@@ -71,7 +70,7 @@ $("#formatterExample").dateRangeSlider({
     formatter: function (val) {
         var days = val.getDay(),
         month = val.getMonth() + 1,
-        year = val.getYear();
+        year = val.getFullYear();
         return days + "/" + month + "/" + year;
     }
 });
diff --git a/jqrangeslider/jqrangeslider-tests.ts.tscparams b/jqrangeslider/jqrangeslider-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jqrangeslider/jqrangeslider-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jqrangeslider/jqrangeslider.d.ts b/jqrangeslider/jqrangeslider.d.ts
deleted file mode 100644
index 2e93ae6f56..0000000000
--- a/jqrangeslider/jqrangeslider.d.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-// Type definitions for jQRangeSlider 4.2.8
-// Project: http://ghusse.github.com/jQRangeSlider
-// Definitions by: Dániel Tar <https://github.com/qcz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="../jqueryui/jqueryui.d.ts"/>
-
-interface JQRangeSliderNumericRange {
-    min?: number;
-    max?: number;
-}
-
-interface JQRangeSliderDateRange {
-    min?: Date;
-    max?: Date;
-}
-
-interface JQRangeSliderRangeLength {
-    min?: any;
-    max?: any;
-}
-
-interface JQRangeSliderDateSteps {
-    years?: number;
-    months?: number;
-    weeks?: number;
-    days?: number;
-    hours?: number;
-    minutes?: number;
-    seconds?: number;
-}
-
-interface JQRangeSliderOptions {
-    wheelMode?: string; // function of the wheel, "zoom", "scroll" or null
-    wheelSpeed?: number; // speed of the wheel scrolling
-    arrows?: boolean; // hide the arrows or not
-    valueLabels?: string; // when to show value labels: "show" (always), "hide" (never) and "change" (only if slider changed)
-    durationIn?: number; // fade in length when displaying value labels (only when valueLabels = "change")
-    durationOut?: number; // fade out length when displaying value labels (only when valueLabels = "change")
-    delayOut?: number; // duration labels are shown after the user changed its values (only when valueLabels = "change")
-    range?: JQRangeSliderRangeLength; // lets you specify minimum and/or maximum range length
-}
-
-interface JQNumericRangeSliderOptions extends JQRangeSliderOptions {
-    bounds?: JQRangeSliderNumericRange; // min and max values of the slider
-    defaultValues?: JQRangeSliderNumericRange; // values selected by default on construction
-    formatter?: (integer) => string; // customize displayed label text
-    step?: number; // allows to customize values rounding, and graphically render this rounding
-}
-
-interface JQDateRangeSliderOptions extends JQRangeSliderOptions {
-    bounds?: JQRangeSliderDateRange; // min and max values of the slider
-    defaultValues?: JQRangeSliderDateRange; // values selected by default on construction
-    formatter?: (Date) => string; // customize displayed label text
-    step?: JQRangeSliderDateSteps; // allows to customize values rounding, and graphically render this rounding
-}
-
-interface JQuery {
-    rangeSlider(method: string): any;
-    rangeSlider(method: string, value: number): JQuery;
-    rangeSlider(method: string, min: number, max: number): JQuery;
-    rangeSlider(options?: JQNumericRangeSliderOptions): JQuery;
-
-    editRangeSlider(method: string): any;
-    editRangeSlider(method: string, value: number): JQuery;
-    editRangeSlider(method: string, min: number, max: number): JQuery
-	editRangeSlider(options?: JQNumericRangeSliderOptions): JQuery;
-
-    dateRangeSlider(method: string): any;
-    dateRangeSlider(method: string, value: Date): JQuery;
-    dateRangeSlider(method: string, min: Date, max: Date): JQuery
-	dateRangeSlider(options?: JQDateRangeSliderOptions): JQuery;
-}
diff --git a/jqrangeslider/jqrangeslider.d.ts.tscparams b/jqrangeslider/jqrangeslider.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jqrangeslider/jqrangeslider.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jqrangeslider/tsconfig.json b/jqrangeslider/tsconfig.json
new file mode 100644
index 0000000000..5247dfa618
--- /dev/null
+++ b/jqrangeslider/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jqrangeslider-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery-ajax-chain/index.d.ts b/jquery-ajax-chain/index.d.ts
new file mode 100644
index 0000000000..6f15c1190f
--- /dev/null
+++ b/jquery-ajax-chain/index.d.ts
@@ -0,0 +1,97 @@
+// Type definitions for jquery-ajax-chain v 1.0.4
+// Project: https://github.com/humana-fragilitas/jQuery-Ajax-Chain/
+// Definitions by: Andrea Blasio <https://github.com/humana-fragilitas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace ajaxChain {
+
+    /**
+     * Static members of JQueryAjaxChain
+     */
+    interface JQueryAjaxChainStatic {
+
+        new (): JQueryAjaxChain
+
+    }
+
+    /**
+     * Instance members of JQueryAjaxChain
+     */
+    interface JQueryAjaxChain extends JQueryPromise<any> {
+
+        /**
+         * Enqueues one or more configuration objects for later processing.
+         */
+        enqueue(confObj: AjaxChainConfiguration | AjaxChainConfiguration[]): JQueryAjaxChain;
+        /**
+         * Sequentially and synchronously dequeues the configuration objects enqueued via enqueue() method
+         * in the order they were added, triggering the related Ajax calls.
+         */
+        dequeue(): JQueryAjaxChain;
+        /**
+         * Clears the currently queued configuration objects.
+         */
+        clearQueue(): JQueryAjaxChain;
+
+    }
+
+    /**
+     * A set of key/value pairs that configure the AjaxChain request; 'ajaxSettings' is mandatory.
+     */
+    interface AjaxChainConfiguration {
+
+        /**
+         * jQuery $.ajax method settings (required).
+         */
+        ajaxSettings: JQueryAjaxSettings;
+        /**
+         * Configuration object label (optional).
+         */
+        label?: String;
+        /**
+         * Returning a truthy value (Object) allows to arbitrarily overwrite the next queued Ajax call
+         * 'data' property value specified in the original jQuery $.ajax method configuration
+         * object ('ajaxSettings') (optional).
+         */
+        transform?: (response: any) => String | Object | Object[];
+        /**
+         * Returning a truthy value (String) allows to append a string to the next queued
+         * Ajax call 'url' property value specified in original jQuery $.ajax method configuration
+         * object ('ajaxSettings') (optional).
+         */
+        appendToUrl?: (response: any) => String;
+        /**
+         * Returning a truthy value determines any registered fail callback(s) to be called immediately,
+         * passing the former as an argument to the latter; the queue is then rejected (optional).
+         */
+        hasErrors?: (response: any) => any;
+        /**
+         * Returning a truthy value allows to prevent the related Ajax call from being executed,
+         * passing the former as a parameter to any registered handler(s); useful to create
+         * caching mechanisms (optional).
+         */
+        hasCache?: (response: any) => any;
+        /**
+         * Returning a truthy value prevents the queue from further progressing to the succeeding
+         * Ajax calls; the queue is then resolved (optional).
+         */
+        hasHaltingCapabilities?: (response: any) => Boolean;
+        /**
+         * Returning a truthy value prevents the queue from being halted in case of Ajax error (optional).
+         */
+        isSkippable?: (response: any) => Boolean;
+
+    }
+
+}
+
+interface JQueryStatic {
+
+    /**
+     * JQueryAjaxChain constructor
+     */
+    AjaxChain: ajaxChain.JQueryAjaxChainStatic;
+
+}
diff --git a/jquery-ajax-chain/jquery-ajax-chain-tests.ts b/jquery-ajax-chain/jquery-ajax-chain-tests.ts
index abaeac8a91..e5cbb8a26f 100644
--- a/jquery-ajax-chain/jquery-ajax-chain-tests.ts
+++ b/jquery-ajax-chain/jquery-ajax-chain-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery-ajax-chain/jquery-ajax-chain.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+/// <reference types="jquery-ajax-chain" />
+/// <reference types="jquery" />
 
 function test_public_methods(): void {
 
diff --git a/jquery-ajax-chain/jquery-ajax-chain.d.ts b/jquery-ajax-chain/jquery-ajax-chain.d.ts
deleted file mode 100644
index 8ecb1f0e7e..0000000000
--- a/jquery-ajax-chain/jquery-ajax-chain.d.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-// Type definitions for jquery-ajax-chain v 1.0.4
-// Project: https://github.com/humana-fragilitas/jQuery-Ajax-Chain/
-// Definitions by: Andrea Blasio <https://github.com/humana-fragilitas>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace ajaxChain {
-
-    /**
-     * Static members of JQueryAjaxChain
-     */
-    interface JQueryAjaxChainStatic {
-
-        new (): JQueryAjaxChain
-
-    }
-
-    /**
-     * Instance members of JQueryAjaxChain
-     */
-    interface JQueryAjaxChain extends JQueryPromise<any> {
-
-        /**
-         * Enqueues one or more configuration objects for later processing.
-         */
-        enqueue(confObj: AjaxChainConfiguration | AjaxChainConfiguration[]): JQueryAjaxChain;
-        /**
-         * Sequentially and synchronously dequeues the configuration objects enqueued via enqueue() method
-         * in the order they were added, triggering the related Ajax calls.
-         */
-        dequeue(): JQueryAjaxChain;
-        /**
-         * Clears the currently queued configuration objects.
-         */
-        clearQueue(): JQueryAjaxChain;
-
-    }
-
-    /**
-     * A set of key/value pairs that configure the AjaxChain request; 'ajaxSettings' is mandatory.
-     */
-    interface AjaxChainConfiguration {
-
-        /**
-         * jQuery $.ajax method settings (required).
-         */
-        ajaxSettings: JQueryAjaxSettings;
-        /**
-         * Configuration object label (optional).
-         */
-        label?: String;
-        /**
-         * Returning a truthy value (Object) allows to arbitrarily overwrite the next queued Ajax call
-         * 'data' property value specified in the original jQuery $.ajax method configuration
-         * object ('ajaxSettings') (optional).
-         */
-        transform?: (response: any) => String | Object | Object[];
-        /**
-         * Returning a truthy value (String) allows to append a string to the next queued
-         * Ajax call 'url' property value specified in original jQuery $.ajax method configuration
-         * object ('ajaxSettings') (optional).
-         */
-        appendToUrl?: (response: any) => String;
-        /**
-         * Returning a truthy value determines any registered fail callback(s) to be called immediately,
-         * passing the former as an argument to the latter; the queue is then rejected (optional).
-         */
-        hasErrors?: (response: any) => any;
-        /**
-         * Returning a truthy value allows to prevent the related Ajax call from being executed,
-         * passing the former as a parameter to any registered handler(s); useful to create
-         * caching mechanisms (optional).
-         */
-        hasCache?: (response: any) => any;
-        /**
-         * Returning a truthy value prevents the queue from further progressing to the succeeding
-         * Ajax calls; the queue is then resolved (optional).
-         */
-        hasHaltingCapabilities?: (response: any) => Boolean;
-        /**
-         * Returning a truthy value prevents the queue from being halted in case of Ajax error (optional).
-         */
-        isSkippable?: (response: any) => Boolean;
-
-    }
-
-}
-
-interface JQueryStatic {
-
-    /**
-     * JQueryAjaxChain constructor
-     */
-    AjaxChain: ajaxChain.JQueryAjaxChainStatic;
-
-}
diff --git a/jquery-ajax-chain/tsconfig.json b/jquery-ajax-chain/tsconfig.json
new file mode 100644
index 0000000000..b444bf0b0b
--- /dev/null
+++ b/jquery-ajax-chain/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-ajax-chain-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery-backstretch/index.d.ts b/jquery-backstretch/index.d.ts
new file mode 100644
index 0000000000..f868cc5c94
--- /dev/null
+++ b/jquery-backstretch/index.d.ts
@@ -0,0 +1,92 @@
+// Type definitions for backstretch v 2.0.4
+// Project: https://github.com/srobbin/jquery-backstretch
+// Definitions by: Dmytro Kulyk <https://github.com/dkulyk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace JQueryBackStretch {
+
+    interface BackStretchOptions {
+        /**
+         * The ratio of the width/height of the image doesn't always jive with the
+         * width/height of the window. This parameter controls whether or not we
+         * center the image on the X axis to account for the discrepancy.
+         */
+        centeredX?:boolean;
+
+        /**
+         * This parameter controls whether or not we center the image on the Y axis
+         * to account for the aforementioned discrepancy.
+         */
+        centeredY?:boolean;
+
+        /**
+         * This is the speed at which the image will fade in. Integers in
+         * milliseconds are accepted, as well as standard jQuery speed strings
+         * (slow, normal, fast).
+         */
+        duration?:number | string;
+
+        /**
+         * The amount of time in between slides, when using Backstretch as a
+         * slideshow, expressed as the number of milliseconds.
+         */
+        fade?:number;
+    }
+
+    interface BackStretch {
+        /**
+         * This method is called automatically when the container (window or
+         * block-level element) is resized, however you can always call this
+         * manually if needed.
+         */
+        resize():BackStretch;
+
+        /**
+         * Jump to the slide at a given index, where n is the number of the
+         * image that you'd like to display. Slide number starts at 0.
+         *
+         * @param {number} newIndex
+         */
+        show(newIndex:number):BackStretch;
+
+        /**
+         * Advance to the next image in a slideshow.
+         */
+        next():BackStretch;
+
+        /**
+         * Display the previous image in a slideshow.
+         */
+        prev():BackStretch;
+
+        /**
+         * Pause the slideshow.
+         */
+        pause():BackStretch;
+
+        /**
+         * Resume a paused slideshow.
+         */
+        resume():BackStretch;
+
+        /**
+         * Destroy the Backstretch instance. Optionally, you can pass in a Boolean
+         * parameter, preserveBackground, to determine whether or not you'd like
+         * to keep the current image stretched as the background image.
+         *
+         * @param {boolean} preserveBackground
+         */
+        destroy(preserveBackground?:boolean):void;
+    }
+}
+
+interface JQueryStatic {
+    backstretch(images:string[], config?:JQueryBackStretch.BackStretchOptions):JQueryBackStretch.BackStretch;
+}
+
+interface JQuery {
+    backstretch(images:string[], config?:JQueryBackStretch.BackStretchOptions):JQueryBackStretch.BackStretch;
+    backstretch(method:string):JQuery;
+}
\ No newline at end of file
diff --git a/jquery-backstretch/jquery-backstretch-tests.ts b/jquery-backstretch/jquery-backstretch-tests.ts
new file mode 100644
index 0000000000..7220458769
--- /dev/null
+++ b/jquery-backstretch/jquery-backstretch-tests.ts
@@ -0,0 +1,18 @@
+/// <reference types="jquery"/>
+
+var backstretch = jQuery.backstretch(['image.png'], {
+    centeredX: false,
+    centeredY: false,
+    duration: 'normal',
+    fade: 1000
+});
+
+backstretch.next();
+backstretch.prev();
+backstretch.pause();
+backstretch.resize();
+backstretch.resume();
+backstretch.destroy(true);
+
+jQuery('body').backstretch(['image.png']).pause();
+jQuery('body').backstretch('resume');
diff --git a/jquery-backstretch/tsconfig.json b/jquery-backstretch/tsconfig.json
new file mode 100644
index 0000000000..3f7c64a295
--- /dev/null
+++ b/jquery-backstretch/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-backstretch-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery-cropbox/index.d.ts b/jquery-cropbox/index.d.ts
new file mode 100644
index 0000000000..42d2ed9689
--- /dev/null
+++ b/jquery-cropbox/index.d.ts
@@ -0,0 +1,122 @@
+// Type definitions for jQuery cropbox
+// Project: https://github.com/acornejo/jquery-cropbox
+// Definitions by: Per Kastman <https://github.com/PerKastman/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+declare namespace jQueryCropBox {
+
+    enum ShowControls {
+        never,
+        always,
+        hover,
+        auto
+    }
+
+    interface CropboxArea {
+        cropX: number;
+        cropY: number;
+        cropW: number;
+        cropH: number;
+    }
+
+    interface CropboxOptions {
+        /**
+        * Width in pixels of the cropping window
+        */
+        width?: number;
+        /**
+         * Height in pixels of the cropping window
+         */
+        height?: number;
+        /**
+         * Number of incremental zoom steps. With the default of 10, you have to click the zoom-in button 9 times to reach 100%.
+         */
+        zoom?: number;
+        /**
+         * Maximum zoom value. With the default of 1.0 users can't zoom beyond the maximum image resolution.
+         */
+        maxZoom?: number;
+        /**
+         * If not null, this is the entire html block that should appear on hover over the image for instructions and/or buttons (could include the zoom in/out buttons for example). If null, the default html block is used which has the text "Click to drag" and the zoom in/out buttons. Use false to disable controls.
+         */
+        controls?: any;
+        /**
+         * Set the initial cropping area
+         */
+        result?: CropboxArea;
+        /**
+         * This flag is used to determine when to display the controls. Never, always and hover do exactly what you would expect (never show them, always show them, show them on hover). The auto flag is the same as the hover flag, except that on mobile devices it always shows the controls (since there is no hover event).
+         */
+        showControls?: ShowControls
+    }
+
+    interface CropboxDragOptions {
+        startX: number,
+        startY: number,
+        dx: number,
+        dy: number
+    }
+
+    interface CropboxSetCropOptions {
+        cropX: number,
+        cropY: number,
+        cropW: number,
+        cropH: number
+    }
+
+    interface Cropbox {
+        /**
+        * Increase image zoom level by one step
+        */
+        zoomIn(): void;
+        /**
+        * Decrease image zoom level by one step
+        */
+        zoomOut(): void;
+        /**
+        * Set zoom leevl to a value between 0 and 1. Need to call update to reflect the changes.
+        */
+        zoom(percent: number): void;
+        /**
+         * Simulate image dragging, starting from (startX,startY) and moving a delta of (dx,dy). Need to call update to reflect the changes.
+         */
+        drag(options: CropboxDragOptions): void;
+        /**
+         * Set crop window.
+         */
+        setCrop(options: CropboxSetCropOptions): void;
+        /**
+         * Update the cropped result (must call after zoom and drag).
+         */
+        update(): void;
+        /**
+         * Generate a URL for the cropped image on the client (requires HTML5 compliant browser).
+         */
+        getDataURL(): string;
+        /**
+         * Generate a Blob with the cropped image (requires HTML5 compliant browser).
+         */
+        getBlob(): any;
+        /**
+         * Remove the cropbox functionality from the image.
+         */
+        remove(): void;
+
+        /**
+             * Attach an event handler function for one event on the Crop Box
+             */
+        on(event: string, callback: jQueryCropBox.EventCallback): void;
+    }
+
+    type EventCallback = (e: Event, data: any, img: jQueryCropBox.Cropbox) => void;
+}
+
+interface JQuery {
+    cropbox(params?: jQueryCropBox.CropboxOptions): jQueryCropBox.Cropbox
+}
+
+interface JQueryStatic {
+    cropbox(params?: jQueryCropBox.CropboxOptions): jQueryCropBox.Cropbox
+}
diff --git a/jquery-cropbox/jquery-cropbox-tests.ts b/jquery-cropbox/jquery-cropbox-tests.ts
index 6e54848af8..ddc5389625 100644
--- a/jquery-cropbox/jquery-cropbox-tests.ts
+++ b/jquery-cropbox/jquery-cropbox-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery-cropbox.d.ts"/>
+/// <reference types="jquery"/>
 
 var cropboxWithDefaultSettings = $("#element").cropbox();
 
diff --git a/jquery-cropbox/jquery-cropbox.d.ts b/jquery-cropbox/jquery-cropbox.d.ts
deleted file mode 100644
index 31e5d63a8c..0000000000
--- a/jquery-cropbox/jquery-cropbox.d.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-// Type definitions for jQuery cropbox
-// Project: https://github.com/acornejo/jquery-cropbox
-// Definitions by: Per Kastman <https://github.com/PerKastman/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-declare namespace jQueryCropBox {
-
-    enum ShowControls {
-        never,
-        always,
-        hover,
-        auto
-    }
-
-    interface CropboxArea {
-        cropX: number;
-        cropY: number;
-        cropW: number;
-        cropH: number;
-    }
-
-    interface CropboxOptions {
-        /**
-        * Width in pixels of the cropping window
-        */
-        width?: number;
-        /**
-         * Height in pixels of the cropping window
-         */
-        height?: number;
-        /**
-         * Number of incremental zoom steps. With the default of 10, you have to click the zoom-in button 9 times to reach 100%.
-         */
-        zoom?: number;
-        /**
-         * Maximum zoom value. With the default of 1.0 users can't zoom beyond the maximum image resolution.
-         */
-        maxZoom?: number;
-        /**
-         * If not null, this is the entire html block that should appear on hover over the image for instructions and/or buttons (could include the zoom in/out buttons for example). If null, the default html block is used which has the text "Click to drag" and the zoom in/out buttons. Use false to disable controls.
-         */
-        controls?: any;
-        /**
-         * Set the initial cropping area
-         */
-        result?: CropboxArea;
-        /**
-         * This flag is used to determine when to display the controls. Never, always and hover do exactly what you would expect (never show them, always show them, show them on hover). The auto flag is the same as the hover flag, except that on mobile devices it always shows the controls (since there is no hover event).
-         */
-        showControls?: ShowControls
-    }
-
-    interface CropboxDragOptions {
-        startX: number,
-        startY: number,
-        dx: number,
-        dy: number
-    }
-
-    interface CropboxSetCropOptions {
-        cropX: number,
-        cropY: number,
-        cropW: number,
-        cropH: number
-    }
-
-    interface Cropbox {
-        /**
-        * Increase image zoom level by one step
-        */
-        zoomIn(): void;
-        /**
-        * Decrease image zoom level by one step
-        */
-        zoomOut(): void;
-        /**
-        * Set zoom leevl to a value between 0 and 1. Need to call update to reflect the changes.
-        */
-        zoom(percent: number): void;
-        /**
-         * Simulate image dragging, starting from (startX,startY) and moving a delta of (dx,dy). Need to call update to reflect the changes.
-         */
-        drag(options: CropboxDragOptions): void;
-        /**
-         * Set crop window.
-         */
-        setCrop(options: CropboxSetCropOptions): void;
-        /**
-         * Update the cropped result (must call after zoom and drag).
-         */
-        update(): void;
-        /**
-         * Generate a URL for the cropped image on the client (requires HTML5 compliant browser).
-         */
-        getDataURL(): string;
-        /**
-         * Generate a Blob with the cropped image (requires HTML5 compliant browser).
-         */
-        getBlob(): any;
-        /**
-         * Remove the cropbox functionality from the image.
-         */
-        remove(): void;
-
-        /**
-             * Attach an event handler function for one event on the Crop Box
-             */
-        on(event: string, callback: jQueryCropBox.EventCallback): void;
-    }
-
-    type EventCallback = (e: Event, data: any, img: jQueryCropBox.Cropbox) => void;
-}
-
-interface JQuery {
-    cropbox(params?: jQueryCropBox.CropboxOptions): jQueryCropBox.Cropbox
-}
-
-interface JQueryStatic {
-    cropbox(params?: jQueryCropBox.CropboxOptions): jQueryCropBox.Cropbox
-}
diff --git a/jquery-cropbox/tsconfig.json b/jquery-cropbox/tsconfig.json
new file mode 100644
index 0000000000..7f5c3a5f4e
--- /dev/null
+++ b/jquery-cropbox/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-cropbox-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery-easy-loading/index.d.ts b/jquery-easy-loading/index.d.ts
new file mode 100644
index 0000000000..c6d878df1a
--- /dev/null
+++ b/jquery-easy-loading/index.d.ts
@@ -0,0 +1,208 @@
+// Type definitions for jquery-easy-loading 1.2.0
+// Project: http://carlosbonetti.github.io/jquery-loading/
+// Definitions by: delphinus <https://github.com/delphinus35/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace JQueryEasyLoading {
+
+    interface Static {
+
+        /**
+         * Extend the Loading plugin default settings with the user options
+         * Use it as `$.Loading.setDefaults({ ... })`
+         *
+         * @param {Object} options Custom options to override the plugin defaults
+         */
+        setDefaults(options: Options): void;
+    }
+
+    interface LoadingObject {
+
+        /**
+         * Initializes the overlay and attach handlers to the appropriate events
+         */
+        init(): void;
+
+        /**
+         * Return a new default overlay
+         *
+         * @return {jQuery} A new overlay already appended to the page's body
+         */
+        createOerlay(): JQuery;
+
+        /**
+         * Attach some internal methods to external events
+         * e.g. overlay click, window resize etc
+         */
+        attachMethodsToExternalEvents(): void;
+
+        /**
+         * Attach the handlers defined on `options` for the respective events
+         */
+        attachOptionsHandlers(): void;
+
+        /**
+         * Calculate the z-index for the default overlay element
+         * Return the z-index passed as setting to the plugin or calculate it
+         * based on the target's z-index
+         */
+        calcZIndex(): number;
+
+        /**
+         * Reposition the overlay on the top of the target element
+         * This method needs to be called if the target element changes position
+         *  or dimension
+         */
+        resize(): void;
+
+        /**
+         * Trigger the `loading.start` event and turn on the loading state
+         */
+        start(): void;
+
+        /**
+         * Trigger the `loading.stop` event and turn off the loading state
+         */
+        stop(): void;
+
+        /**
+         * Check whether the loading state is active or not
+         *
+         * @return {Boolean}
+         */
+        active(): boolean;
+
+        /**
+         * Toggle the state of the loading overlay
+         */
+        toggle(): void;
+    }
+
+    interface Options {
+
+        /**
+         * jQuery element to be used as overlay
+         * If not defined, a default overlay will be created
+         */
+        overlay?: JQuery;
+
+        /**
+         * z-index to be used by the default overlay
+         * If not defined, a z-index will be calculated based on the
+         * target's z-index
+         * Has no effect if a custom overlay is defined
+         */
+        zIndex?: number;
+
+        /**
+         * Message to be rendered on the overlay content
+         * Has no effect if a custom overlay is defined
+         */
+        message?: string;
+
+        /**
+         * Theme to be applied on the loading element
+         *
+         * Some default themes are implemented on `jquery.loading.css`, but you can
+         *  define your own. Just add a `.loading-theme-my_awesome_theme` selector
+         *  somewhere with your custom styles and change this option
+         *  to 'my_awesome_theme'. The class is applied to the parent overlay div
+         *
+         * Has no effect if a custom overlay is defined
+         */
+        theme?: string;
+
+        /**
+         * Class(es) to be applied to the overlay element when the loading state is started
+         */
+        shownClass?: string;
+
+        /**
+         * Class(es) to be applied to the overlay element when the loading state is stopped
+         */
+        hiddenClass?: string;
+
+        /**
+         * Set to true to stop the loading state if the overlay is clicked
+         * This options does NOT override the onClick event
+         */
+        stoppable?: boolean;
+
+        /**
+         * Set to false to not start the loading state when initialized
+         */
+        start?: boolean;
+
+        /**
+         * Function to be executed when the loading state is started
+         * Receives the loading object as parameter
+         *
+         * The function is attached to the `loading.start` event
+         */
+        onStart?: (loading: LoadingObject) => void;
+
+        /**
+         * Function to be executed when the loading state is stopped
+         * Receives the loading object as parameter
+         *
+         * The function is attached to the `loading.stop` event
+         */
+        onStop?: (loading: LoadingObject) => void;
+
+        /**
+         * Function to be executed when the overlay is clicked
+         * Receives the loading object as parameter
+         *
+         * The function is attached to the `loading.click` event
+         */
+        onClick?: Function;
+    }
+
+    type Command = "resize" | "start" | "stop" | "toggle";
+}
+
+interface JQueryStatic {
+
+    Loading: JQueryEasyLoading.Static;
+}
+
+interface JQuery {
+    /**
+     * Initializes the plugin and return a chainable jQuery object
+     *
+     * @param {Object} [options] Initialization options. Extends `Loading.defaults`
+     * @return {jQuery}
+     */
+    loading(options?: JQueryEasyLoading.Options | JQueryEasyLoading.Command): JQuery;
+
+    /**
+     * Return the loading object associated to the element or initialize it
+     * This method is interesting if you need the plugin object to access the
+     * internal API
+     * Example: `$('#some-element').Loading().toggle()`
+     *
+     * @param {Object} [options] Initialization options. If new options are given
+     * to a previously initialized object, the old ones are overriden and the
+     * plugin restarted
+     * @return {Loading}
+     */
+    Loading(options?: JQueryEasyLoading.Options): JQueryEasyLoading.LoadingObject;
+}
+
+declare var factory: (root?: any, jQuery?: JQueryStatic) => JQueryStatic;
+
+declare module "jquery-easy-loading" {
+
+    /**
+     * The package `jquery-easy-loading` would return a factory for the library
+     * itself if you use this not in the browser env.
+     *
+     * <pre>
+     * import * as factory from "jquery-easy-loading";
+     * const $: JQueryStatic = factory(window);
+     * </pre>
+     */
+    export = factory;
+}
diff --git a/jquery-easy-loading/jquery-easy-loading-tests.ts b/jquery-easy-loading/jquery-easy-loading-tests.ts
index d96d8c2edf..7a59d3d617 100644
--- a/jquery-easy-loading/jquery-easy-loading-tests.ts
+++ b/jquery-easy-loading/jquery-easy-loading-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="jquery-easy-loading.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+
+/// <reference types="jquery" />
 
 function test_options() {
 
diff --git a/jquery-easy-loading/jquery-easy-loading.d.ts b/jquery-easy-loading/jquery-easy-loading.d.ts
deleted file mode 100644
index 6e231645a8..0000000000
--- a/jquery-easy-loading/jquery-easy-loading.d.ts
+++ /dev/null
@@ -1,208 +0,0 @@
-// Type definitions for jquery-easy-loading 1.2.0
-// Project: http://carlosbonetti.github.io/jquery-loading/
-// Definitions by: delphinus <https://github.com/delphinus35/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace JQueryEasyLoading {
-
-    interface Static {
-
-        /**
-         * Extend the Loading plugin default settings with the user options
-         * Use it as `$.Loading.setDefaults({ ... })`
-         *
-         * @param {Object} options Custom options to override the plugin defaults
-         */
-        setDefaults(options: Options): void;
-    }
-
-    interface LoadingObject {
-
-        /**
-         * Initializes the overlay and attach handlers to the appropriate events
-         */
-        init(): void;
-
-        /**
-         * Return a new default overlay
-         *
-         * @return {jQuery} A new overlay already appended to the page's body
-         */
-        createOerlay(): JQuery;
-
-        /**
-         * Attach some internal methods to external events
-         * e.g. overlay click, window resize etc
-         */
-        attachMethodsToExternalEvents(): void;
-
-        /**
-         * Attach the handlers defined on `options` for the respective events
-         */
-        attachOptionsHandlers(): void;
-
-        /**
-         * Calculate the z-index for the default overlay element
-         * Return the z-index passed as setting to the plugin or calculate it
-         * based on the target's z-index
-         */
-        calcZIndex(): number;
-
-        /**
-         * Reposition the overlay on the top of the target element
-         * This method needs to be called if the target element changes position
-         *  or dimension
-         */
-        resize(): void;
-
-        /**
-         * Trigger the `loading.start` event and turn on the loading state
-         */
-        start(): void;
-
-        /**
-         * Trigger the `loading.stop` event and turn off the loading state
-         */
-        stop(): void;
-
-        /**
-         * Check whether the loading state is active or not
-         *
-         * @return {Boolean}
-         */
-        active(): boolean;
-
-        /**
-         * Toggle the state of the loading overlay
-         */
-        toggle(): void;
-    }
-
-    interface Options {
-
-        /**
-         * jQuery element to be used as overlay
-         * If not defined, a default overlay will be created
-         */
-        overlay?: JQuery;
-
-        /**
-         * z-index to be used by the default overlay
-         * If not defined, a z-index will be calculated based on the
-         * target's z-index
-         * Has no effect if a custom overlay is defined
-         */
-        zIndex?: number;
-
-        /**
-         * Message to be rendered on the overlay content
-         * Has no effect if a custom overlay is defined
-         */
-        message?: string;
-
-        /**
-         * Theme to be applied on the loading element
-         *
-         * Some default themes are implemented on `jquery.loading.css`, but you can
-         *  define your own. Just add a `.loading-theme-my_awesome_theme` selector
-         *  somewhere with your custom styles and change this option
-         *  to 'my_awesome_theme'. The class is applied to the parent overlay div
-         *
-         * Has no effect if a custom overlay is defined
-         */
-        theme?: string;
-
-        /**
-         * Class(es) to be applied to the overlay element when the loading state is started
-         */
-        shownClass?: string;
-
-        /**
-         * Class(es) to be applied to the overlay element when the loading state is stopped
-         */
-        hiddenClass?: string;
-
-        /**
-         * Set to true to stop the loading state if the overlay is clicked
-         * This options does NOT override the onClick event
-         */
-        stoppable?: boolean;
-
-        /**
-         * Set to false to not start the loading state when initialized
-         */
-        start?: boolean;
-
-        /**
-         * Function to be executed when the loading state is started
-         * Receives the loading object as parameter
-         *
-         * The function is attached to the `loading.start` event
-         */
-        onStart?: (loading: LoadingObject) => void;
-
-        /**
-         * Function to be executed when the loading state is stopped
-         * Receives the loading object as parameter
-         *
-         * The function is attached to the `loading.stop` event
-         */
-        onStop?: (loading: LoadingObject) => void;
-
-        /**
-         * Function to be executed when the overlay is clicked
-         * Receives the loading object as parameter
-         *
-         * The function is attached to the `loading.click` event
-         */
-        onClick?: Function;
-    }
-
-    type Command = "resize" | "start" | "stop" | "toggle";
-}
-
-interface JQueryStatic {
-
-    Loading: JQueryEasyLoading.Static;
-}
-
-interface JQuery {
-    /**
-     * Initializes the plugin and return a chainable jQuery object
-     *
-     * @param {Object} [options] Initialization options. Extends `Loading.defaults`
-     * @return {jQuery}
-     */
-    loading(options?: JQueryEasyLoading.Options | JQueryEasyLoading.Command): JQuery;
-
-    /**
-     * Return the loading object associated to the element or initialize it
-     * This method is interesting if you need the plugin object to access the
-     * internal API
-     * Example: `$('#some-element').Loading().toggle()`
-     *
-     * @param {Object} [options] Initialization options. If new options are given
-     * to a previously initialized object, the old ones are overriden and the
-     * plugin restarted
-     * @return {Loading}
-     */
-    Loading(options?: JQueryEasyLoading.Options): JQueryEasyLoading.LoadingObject;
-}
-
-declare var factory: (root?: any, jQuery?: JQueryStatic) => JQueryStatic;
-
-declare module "jquery-easy-loading" {
-
-    /**
-     * The package `jquery-easy-loading` would return a factory for the library
-     * itself if you use this not in the browser env.
-     *
-     * <pre>
-     * import * as factory from "jquery-easy-loading";
-     * const $: JQueryStatic = factory(window);
-     * </pre>
-     */
-    export = factory;
-}
diff --git a/jquery-easy-loading/tsconfig.json b/jquery-easy-loading/tsconfig.json
new file mode 100644
index 0000000000..9bc46c0d6d
--- /dev/null
+++ b/jquery-easy-loading/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-easy-loading-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery-fullscreen/index.d.ts b/jquery-fullscreen/index.d.ts
new file mode 100644
index 0000000000..477caf3b45
--- /dev/null
+++ b/jquery-fullscreen/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for jquery-fullscreen 1.1.5
+// Project: https://github.com/kayahr/jquery-fullscreen-plugin
+// Definitions by: Bruno Grieder <https://github.com/bgrieder>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface JQuery {
+
+    /**
+     * You can either switch the whole page or a single HTML element to fullscreen mode
+     * This only works when the code was triggered by a user interaction (For example a onclick event on a button). Browsers don't allow entering fullscreen mode without user interaction.
+     * Fullscreen mode is always exited via the document but this plugin allows it also via any HTML element. The owner document of the selected HTML element is used
+     */
+    fullScreen(fullScreen: boolean): JQuery | boolean;
+
+    /**
+     * The method returns the current fullscreen element (or true if browser doesn't support this) when fullscreen mode is active,
+     * false if not active or null when the browser does not support fullscreen mode at all
+     */
+    fullScreen(): boolean;
+
+    /**
+     * The plugin provides another method for simple fullscreen mode toggling
+     */
+    toggleFullScreen(): JQuery | boolean;
+}
+
diff --git a/jquery-fullscreen/jquery-fullscreen-tests.ts b/jquery-fullscreen/jquery-fullscreen-tests.ts
index 633b3d3934..4863690f5f 100644
--- a/jquery-fullscreen/jquery-fullscreen-tests.ts
+++ b/jquery-fullscreen/jquery-fullscreen-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="jquery-fullscreen.d.ts"/>
-
 //
 // Examples from https://github.com/kayahr/jquery-fullscreen-plugin
 //
diff --git a/jquery-fullscreen/jquery-fullscreen.d.ts b/jquery-fullscreen/jquery-fullscreen.d.ts
deleted file mode 100644
index 4a5ea1d675..0000000000
--- a/jquery-fullscreen/jquery-fullscreen.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Type definitions for jquery-fullscreen 1.1.5
-// Project: https://github.com/kayahr/jquery-fullscreen-plugin
-// Definitions by: Bruno Grieder <https://github.com/bgrieder>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface JQuery {
-
-    /**
-     * You can either switch the whole page or a single HTML element to fullscreen mode
-     * This only works when the code was triggered by a user interaction (For example a onclick event on a button). Browsers don't allow entering fullscreen mode without user interaction.
-     * Fullscreen mode is always exited via the document but this plugin allows it also via any HTML element. The owner document of the selected HTML element is used
-     */
-    fullScreen(fullScreen: boolean): JQuery | boolean;
-
-    /**
-     * The method returns the current fullscreen element (or true if browser doesn't support this) when fullscreen mode is active,
-     * false if not active or null when the browser does not support fullscreen mode at all
-     */
-    fullScreen(): boolean;
-
-    /**
-     * The plugin provides another method for simple fullscreen mode toggling
-     */
-    toggleFullScreen(): JQuery | boolean;
-}
-
diff --git a/jquery-fullscreen/tsconfig.json b/jquery-fullscreen/tsconfig.json
new file mode 100644
index 0000000000..57157b3e29
--- /dev/null
+++ b/jquery-fullscreen/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-fullscreen-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery-galleria/jquery-galleria.d.ts b/jquery-galleria/index.d.ts
similarity index 100%
rename from jquery-galleria/jquery-galleria.d.ts
rename to jquery-galleria/index.d.ts
diff --git a/jquery-galleria/jquery-galleria-tests.ts b/jquery-galleria/jquery-galleria-tests.ts
index 4d132a931e..edf0ceb3cc 100644
--- a/jquery-galleria/jquery-galleria-tests.ts
+++ b/jquery-galleria/jquery-galleria-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jquery-galleria.d.ts" />
+
 namespace JqueryGalleriaTests {
     var container = document.createElement("galleria");
 
diff --git a/jquery-galleria/tsconfig.json b/jquery-galleria/tsconfig.json
new file mode 100644
index 0000000000..dc54f91150
--- /dev/null
+++ b/jquery-galleria/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-galleria-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery-handsontable/index.d.ts b/jquery-handsontable/index.d.ts
new file mode 100644
index 0000000000..7b4deaabdf
--- /dev/null
+++ b/jquery-handsontable/index.d.ts
@@ -0,0 +1,950 @@
+// Type definitions for jquery-handsontable
+// Project: http://handsontable.com
+// Definitions by: Ted John <https://github.com/intelorca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+declare namespace Handsontable {
+    interface CellPosition {
+        row: number;
+        col: number;
+    }
+
+    interface Options {
+        /**
+         * Initial data source that will be bound to the data grid by reference (editing data grid alters the data source. See Understanding binding as reference.
+         */
+        data?: any;
+
+        /**
+         * Width of the grid. Can be a number or a function that returns a number.
+         */
+        width?: any;
+
+        /**
+         * Height of the grid. Can be a number or a function that returns a number.
+         */
+        height?: any;
+
+        /**
+         * Minimum number of rows. At least that many of rows will be created during initialization.
+         */
+        minRows?: number;
+
+        /**
+         * Minimum number of columns. At least that many of columns will be created during initialization.
+         */
+        minCols?: number;
+
+        /**
+         * Maximum number of rows.
+         */
+        maxRows?: number;
+
+        /**
+         * Maximum number of columns.
+         */
+        maxCols?: number;
+
+        /**
+         * Initial number of rows. Notice: This option only has effect in Handsontable constructor and only if data option is not provided.
+         */
+        startRows?: number;
+
+        /**
+         * Initial number of rows. Notice: This option only has effect in Handsontable constructor and only if data option is not provided.
+         */
+        startCols?: number;
+
+        /**
+         * Setting true or false will enable or disable the default row headers (1, 2, 3). You can also define an array ['One', 'Two', 'Three', ...] or a function to define the headers. If a function is set the index of the rowis passed as a parameter.
+         */
+        rowHeaders?: any;
+
+        /**
+         * Setting true or false will enable or disable the default column headers (A, B, C). You can also define an array ['One', 'Two', 'Three', ...] or a function to define the headers. If a function is set the index of the column is passed as a parameter.
+         */
+        colHeaders?: any;
+
+        /**
+         * Defines column widths in pixels. Accepts number, string (that will be converted to number), array of numbers (if you want to define column width separately for each column) or a function (if you want to set column width dynamically on each render).
+         */
+        colWidths?: any;
+
+        /**
+         * Defines the cell properties and data binding for certain columns. Notice: Using this option sets a fixed number of columns (options startCols, minCols, maxCols will be ignored).
+         * @see https://github.com/handsontable/jquery-handsontable/wiki/Options below for more detailed explanation.
+         * @see http://handsontable.com/demo/datasources.html for examples
+         */
+        columns?: any[];
+
+        /**
+         * Defines the cell properties for given row, col, prop coordinates.
+         * See Cells section below for more detailed explanation.
+         */
+        cells?: (row: number, col: number, prop: string) => void;
+
+        /**
+         * Defines the structure of a new row when data source is an object.
+         * @see http://handsontable.com/demo/datasources.html for examples.
+         */
+        dataSchema?: any;
+
+        /**
+         * When set to 1 (or more), Handsontable will add a new row at the end of grid if there are no more empty rows.
+         */
+        minSpareRows?: number;
+
+        /**
+         * When set to 1 (or more), Handsontable will add a new column at the end of grid if there are no more empty columns.
+         */
+        minSpareCols?: number;
+
+        /**
+         * If true, selection of multiple cells using keyboard or mouse is allowed.
+         */
+        multiSelect?: boolean;
+
+        /**
+         * Enables the fill handle (drag-down and copy-down) functionality, which shows the small rectangle in bottom right corner of the selected area, that let's you expand values to the adjacent cells.
+         * Possible values: true (to enable in all directions), "vertical" or "horizontal" (to enable in one direction), false (to disable completely). Setting to true enables the fillHandle plugin, which,
+         */
+        fillHandle?: any;
+
+        /**
+         * Defines if the right-click context menu should be enabled. Context menu allows to create new row or column at any place in the grid.
+         * Possible values: true (to enable basic options), false (to disable completely) or array of any available strings: ["row_above", "row_below", "col_left", "col_right", "remove_row", "remove_col", "undo", "redo", "sep1", "sep2", "sep3"].
+         * @see http://handsontable.com/demo/contextmenu.html for examples.
+         */
+        contextMenu?: any;
+
+        /**
+         * If true, undo/redo functionality is enabled.
+         */
+        undo?: boolean;
+
+        /**
+         * If true, mouse click outside the grid will deselect the current selection.
+         */
+        outsideClickDeselects?: boolean;
+
+        /**
+         * If true, ENTER begins editing mode (like Google Docs). If false, ENTER moves to next row (like Excel) and adds new row if necessary. TAB adds new column if necessary.
+         */
+        enterBeginsEditing?: boolean;
+
+        /**
+         * Defines cursor move after ENTER is pressed (SHIFT+ENTER uses negative vector). Can be an object or a function that returns an object. The event argument passed to the function is a jQuery.Event object received after a ENTER key has been pressed. This event object can be used to check whether user pressed ENTER or SHIFT + ENTER.
+         */
+        enterMoves?: any;
+
+        /**
+         * Defines cursor move after TAB is pressed (SHIFT+TAB uses negative vector). Can be an object or a function that returns an object. The event argument passed to the function is a jQuery.Event object received after a TAB key has been pressed. This event object can be used to check whether user pressed TAB or SHIFT + TAB.
+         */
+        tabMoves?: any;
+
+        /**
+         * If true, pressing TAB or right arrow in the last column will move to first column in next row.
+         */
+        autoWrapRow?: boolean;
+
+        /**
+         * If true, pressing ENTER or down arrow in the last row will move to first row in next column.
+         */
+        autoWrapCol?: boolean;
+
+        /**
+         * Autocomplete definitions.
+         * @see demo/autocomplete.html for examples and definitions.
+         */
+        autoComplete?: any[];
+
+        /**
+         * Maximum number of rows than can be copied to clipboard using CTRL+C.
+         */
+        copyRowsLimit?: number;
+
+        /**
+         * Maximum number of columns than can be copied to clipboard using CTRL+C.
+         */
+        copyColsLimit?: number;
+
+        /**
+         * Defines paste (CTRL+V) behavior. Default value "overwrite" will paste clipboard value over current selection.
+         * When set to "shift_down", clipboard data will be pasted in place of current selection, while all selected cells are moved down.
+         * When set to "shift_right", clipboard data will be pasted in place of current selection, while all selected cells are moved right.
+         */
+        pasteMode?: string;
+
+        /**
+         * Column stretching mode. Possible values: "none", "last", "all".
+         */
+        stretchH?: string;
+
+        /**
+         * Lets you overwrite the default isEmptyRow method.
+         */
+        isEmptyRow?: (row: number) => boolean;
+
+        /**
+         * Lets you overwrite the default isEmptyCol method.
+         */
+        isEmptyCol?: (col: number) => boolean;
+
+        /**
+         * Turn on Manual column resize, if set to a boolean or define initial column resized widths, if set to an array of numbers.
+         */
+        manualColumnResize?: any;
+
+        /**
+         * Turn on Manual column move, if set to a boolean or define initial column order, if set to an array of column indexes.
+         */
+        manualColumnMove?: any;
+
+        /**
+         * Turn on Column sorting.
+         */
+        columnSorting?: boolean;
+
+        /**
+         * Turn on saving the state of column sorting, columns positions and columns sizes in local storage. For more information see How to save data localy.
+         */
+        persistentState?: boolean;
+
+        /**
+         * Class name for all visible rows in current selection.
+         */
+        currentRowClassName?: string;
+
+        /**
+         * Class name for all visible columns in current selection.
+         */
+        currentColClassName?: string;
+
+        /**
+         * Allows to specify the number of rows fixed (aka freezed) on the top of the table.
+         */
+        fixedRowsTop?: number;
+
+        /**
+         * Allows to specify the number of columns fixed (aka freezed) on the left side of the table.
+         */
+        fixedColumnsLeft?: number;
+
+        /**
+         * Setting to true enables selecting just a fragment of the text within a single cell or between adjacent cells.
+         */
+        fragmentSelection?: boolean;
+
+        /**
+         * Setting to true word wrapping of the cell text content that does not fit in the fixed column width.
+         */
+        wordWrap?: boolean;
+
+        /**
+         * CSS class name cells configured with wordWrap: false.
+         */
+        noWordWrapClassName?: string;
+
+        /**
+         * When set to an non-empty string, displayed as the cell content for empty cells.
+         */
+        placeholder?: any;
+
+        /**
+         * CSS class name for cells that have a placeholder in use.
+         */
+        placeholderCellClassName?: string;
+
+        /**
+         * CSS class name for cells that did not pass validation.
+         */
+        invalidCellClassName?: string;
+
+        /**
+         * CSS class name for read-only cells.
+         */
+        readOnlyCellClassName?: string;
+
+        /**
+         * Setting to true enables the debug mode, currently used to test the correctness of the row and column header fixed positioning on a layer above the master table.
+         */
+        debug?: boolean;
+
+        /**
+         * When set to true, the table is rerendered when it is detected that it was made visible in DOM.
+         */
+        observeDOMVisibility?: boolean;
+
+        /**
+         * Setting to true enables the autoColumnSize plugin, which makes sure each column gets enough space to show its content.
+         */
+        autoColumnSize?: boolean | Object;
+
+        /**
+         * Setting to true enables the observeChanges plugin, which automatically renders the table when a change in the data source is observed.
+         */
+        observeChanges?: boolean;
+
+        /**
+         * Setting to true enables the manualRowResize plugin, which allows to resize the row height with your mouse.
+         */
+        manualRowResize?: boolean;
+
+        /**
+         * Setting to true enables the copyPaste plugin, which enables the copying and pasting to the clipboard.
+         */
+        copyPaste?: boolean;
+
+        /**
+         * Setting to true enables the search plugin (see demo).
+         */
+        search?: boolean;
+
+        /**
+         * Setting to true or array enables the mergeCells plugin, which enables the merging of the cells. (see demo). You can provide the merged cells on the pageload if you feed the mergeCells option with an array.
+         */
+        mergeCells?: any;
+
+        /**
+         * Callback fired before Walkontable instance is initiated.
+         */
+        beforeInitWalkontable?: Function;
+
+        /**
+         * Callback fired before Handsontable instance is initiated.
+         * Note: this can be set only by global PluginHooks instance.
+         */
+        beforeInit?: Function;
+
+        /**
+         * Callback fired before Handsontable table is rendered. Parameters:
+         *   - isForced is true if rendering was triggered by a change of settings or data; or false if rendering was triggered by scrolling or moving selection.
+         */
+        beforeRender?: (isForced: boolean) => void;
+
+        /**
+         * Callback fired before one or more cells is changed. Its main purpose is to alter changes silently before input. Parameters:
+         *   - changes is a 2D array containing information about each of the edited cells [ [row, prop, oldVal, newVal], ... ].
+         *     - To disregard a single change, set changes[i] to null or remove it from array using changes.splice(i, 1).
+         *     - To alter a single change, overwrite the desired value to changes[i][3].
+         *     - To cancel all edit, return false from the callback or set array length to 0 (changes.length = 0).
+         *   - source is the name of a source of changes.
+         */
+        beforeChange?: (changes: any[][], source: string) => void;
+
+        beforeChangeRender?: Function;
+
+        /**
+         * Callback fired before sorting the table. The column argument is a relative (displayed) index of a column that is about to be sorted. To get the absolute column index, just add the current column offset. You can get the offset by using colOffset() method.
+         */
+        beforeColumnSort?: (column: number, order: boolean) => void;
+
+        /**
+         * Callback fired before setting single value from the data source array.
+         */
+        beforeSet?: (v: Object) => void;
+
+        /**
+         * Callback fired before getting cell settings.
+         */
+        beforeGetCellMeta?: (row: number, col: number, cellProperties: Object) => void;
+
+        /**
+         * Parameters:
+         *   - start is an object containing information about first filled cell: { row : 2, col : 0 }.
+         *   - end is an object containing information about last filled cell: { row : 4, col : 1 }.
+         *   - data is an 2D array containing information about fill pattern: [ ["1", "Ted"], ["1", "John"] ].
+         */
+        beforeAutofill?: (start: CellPosition, end: CellPosition, data: string[][]) => void;
+
+        /**
+         * Callback fired before keydown event is handled. It can be used to overwrite default key bindings. Caution - in your beforeKeyDown handler you need to call event.stopImmediatePropagation() to prevent default key behavior.
+         */
+        beforeKeyDown?: (event: KeyboardEvent) => void;
+
+        /**
+         * A plugin hook executed before validator function, only if validator function is defined. This can be used to manipulate value of changed cell before it is applied to the validator function. NOTICE: this will not affect values of changes. This will change value ONLY for validation!
+         */
+        beforeValidate?: (value: any, row: number, prop: string, source: string) => void;
+
+        /**
+         * Callback fired after Handsontable instance is initiated.
+         */
+        afterInit?: Function;
+
+        /**
+         * Callback fired after new data is loaded (by loadData method) into the data source array.
+         */
+        afterLoadData?: Function;
+
+        /**
+         * Callback fired after Handsontable table is rendered. Parameters:
+         *   - isForced is true if rendering was triggered by a change of settings or data; or false if rendering was triggered by scrolling or moving selection.
+         */
+        afterRender?: (isForced: boolean) => void;
+
+        /**
+         * Callback fired after one or more cells is changed. Its main use case is to save the input. Parameters:
+         *   - changes is a 2D array containing information about each of the edited cells [ [row, prop, oldVal, newVal], ... ].
+         *   - source is one of the strings: "alter", "empty", "edit", "populateFromArray", "loadData", "autofill", "paste".
+         * Note: for performance reasons, the changes array is null for "loadData" source.
+         */
+        afterChange?: (changes: any[], source: string) => void;
+
+        /**
+         * Callback fired after sorting the table. The column argument is a relative (displayed) index of a column that is about to be sorted. To get the absolute column index, just add the current column offset. You can get the offset by using colOffset() method.
+         */
+        afterColumnSort?: (column: number, order: boolean) => void;
+
+        /**
+         * Callback fired while one or more cells are being selected (on mouse move). Parameters:
+         *   - r selection start row
+         *   - c selection start column
+         *   - r2 selection end row
+         *   - c2 selection end column
+         */
+        afterSelection?: (r: number, c: number, r2: number, c2: number) => void;
+
+        /**
+         * The same as above, but data source object property name is used instead of the column number.
+         */
+        afterSelectionByProp?: (r: number, p: string, r2: number, p2: string) => void;
+
+        /**
+         * Callback fired while one or more cells are being selected (on mouse up). Parameters:
+         *   - r selection start row
+         *   - c selection start column
+         *   - r2 selection end row
+         *   - c2 selection end column
+         */
+        afterSelectionEnd?: (r: number, c: number, r2: number, c2: number) => void;
+
+        /**
+         * The same as above, but data source object property name is used instead of the column number.
+         */
+        afterSelectionEndByProp?: (r: number, p: string, r2: number, p2: string) => void;
+
+        /**
+         * Event called when current cell is deselected.
+         */
+        afterDeselect?: Function;
+
+        /**
+         * Callback fired after getting cell settings.
+         */
+        afterGetCellMeta?: (row: number, col: number, cellProperties: Object) => void;
+
+        /**
+         * Callback fired after getting info about column header.
+         */
+        afterGetColHeader?: (col: number, TH: HTMLTableHeaderCellElement) => void;
+
+        /**
+         * Callback fired after calculating column width.
+         */
+        afterGetColWidth?: (col: number, response: Object) => void;
+
+        /**
+         * Callback fired after destroing Handsontable instance.
+         */
+        afterDestroy?: Function;
+
+        /**
+         * Callback is fired when a new row is created. Parameters:
+         *   - index represents the index of first newly created row in the data source array.
+         *   - amount number of newly created rows in the data source array.
+         */
+        afterCreateRow?: (index: number, amount: number) => void;
+
+        /**
+         * Callback is fired when a new column is created. Parameters:
+         *   - index represents the index of first newly created column in the data source array.
+         *   - amount number of newly created columns in the data source array.
+         */
+        afterCreateCol?: (index: number, amount: number) => void;
+
+        /**
+         * Callback is fired when one or more rows are about to be removed. Parameters:
+         *   - index is an index of starter row.
+         *   - amount is an anount of rows to be removed.
+         */
+        beforeRemoveRow?: (index: number, amount: number) => void;
+
+        /**
+         * Callback is fired when one or more rows are removed. Parameters:
+         *   - index is an index of starter row.
+         *   - amount is an anount of removed rows.
+         */
+        afterRemoveRow?: (index: number, amount: number) => void;
+
+        /**
+         * Callback is fired when one or more columns are about to be removed. Parameters:
+         *   - index is an index of starter column.
+         *   - amount is an anount of columns to be removed.
+         */
+        beforeRemoveCol?: (index: number, amount: number) => void;
+
+        /**
+         * Callback is fired when one or more columns are removed. Parameters:
+         *   - index is an index of starter column.
+         *   - amount is an anount of removed columns.
+         */
+        afterRemoveCol?: (index: number, amount: number) => void;
+
+        /**
+         * Callback is fired after changing column size.
+         */
+        afterColumnResize?: (col: number, size: number) => void;
+
+        /**
+         * Callback is fired after changing column placement.
+         */
+        afterColumnMove?: (oldIndex: number, newIndex: number) => void;
+
+        /**
+         * Callback fired if copyRowsLimit or copyColumnsLimit was reached.
+         */
+        afterCopyLimit?: (selectedRowsCount: number, selectedColsCount: number, copyRowsLimit: number, copyColsLimit: number) => void;
+
+        /**
+         * A plugin hook executed after validator function, only if validator function is defined. Validation result is the first parameter. This can be used to determinate if validation passed successfully or not. You can cancel current change by returning false.
+         */
+        afterValidate?: (isValid: boolean, value: any, row: number, prop: string, source: string) => boolean;
+
+        /**
+         * Callback fired before setting range is ended. Parameters:
+         *   - coords is WalkontableCellCoords array
+         */
+        beforeSetRangeEnd?: (coords: any[]) => void;
+
+        afterUpdateSettings?: Function;
+
+        afterRenderer?: (TD: HTMLTableDataCellElement, row: number, col: number, prop: string, value: string, cellProperties: Object) => void;
+
+        /**
+         * Callback fired after clicking on a cell or row/column header.
+         * In case the row/column header was clicked, the index is negative. For example clicking on the row header of cell (0, 0) results with afterOnCellMouseDown called with coords {row: 0, col: -1}.
+         */
+        afterOnCellMouseDown?: (event: MouseEvent, coords: CellPosition, TD: HTMLTableDataCellElement) => void;
+
+        /**
+         * Callback fired after hovering a cell or row/column header with the mouse cursor.
+         * In case the row/column header was hovered, the index is negative. For example clicking on the row header of cell (0, 0) results with afterOnCellMouseOver called with coords {row: 0, col: -1}.
+         */
+        afterOnCellMouseOver?: (event: MouseEvent, coords: CellPosition, TD: HTMLTableDataCellElement) => void;
+
+        /**
+         * Callback fired after.
+         */
+        afterOnCellCornerMouseDown?: (event: MouseEvent) => void;
+
+        afterScrollVertically?: Function;
+
+        afterScrollHorizontally?: Function;
+
+        /**
+         * Callback fired after reset cell's meta.
+         */
+        afterCellMetaReset?: Function;
+
+        /**
+         * Callback fired after modify column's width.
+         */
+        modifyColWidth?: (width: number, col: number) => void;
+
+        /**
+         * Callback fired after modify hight of row.
+         */
+        modifyRowHeight?: (height: number, row: number) => void;
+
+        /**
+         * Callback fired after row modify.
+         */
+        modifyRow?: (row: number) => void;
+
+        /**
+         * Callback fired after column modify.
+         */
+        modifyCol?: (col: number) => void;
+
+        afterSetCellMeta?: Function;
+
+        /**
+         * Deprecated! Now event is called afterSelection.
+         */
+        onSelection?: (r: number, p: number, r2: number, p2: number) => void;
+
+        /**
+         * Deprecated! Now event is called afterSelectionByProp.
+         */
+        onSelectionByProp?: (r: number, p: number, r2: number, p2: number) => void;
+
+        /**
+         * Deprecated! Now event is called afterSelectionEnd.
+         */
+        onSelectionEnd?: (r: number, p: number, r2: number, p2: number) => void;
+
+        /**
+         * Deprecated! Now event is called afterSelectionEndByProp.
+         */
+        onSelectionEndByProp?: (r: number, p: number, r2: number, p2: number) => void;
+
+        /**
+         * Deprecated! Now event is called beforeChange.
+         */
+        onBeforeChange?: (changes: any[], source: string) => void;
+
+        /**
+         * Deprecated! Now event is called afterChange.
+         */
+        onChange?: (changes: any[], source: string) => void;
+
+        /**
+         * Deprecated! Now event is called afterCopyLimit.
+         */
+        onCopyLimit?: (selectedRowsCount: number, selectedColsCount: number, copyRowsLimit: number, copyColsLimit: number) => void;
+    }
+
+    interface Context {
+        /**
+         * Use it if you need to change configuration after initialization.
+         */
+        updateSettings(options: Options): void;
+
+        /**
+         * Returns an object containing the current grid settings.
+         */
+        getSettings(): Options;
+
+        /**
+         * Reset all cells in the grid to contain data from the data array.
+         */
+        loadData(data: any[]): void;
+
+        /**
+         * Listen to keyboard input on document body.
+         */
+        listen(): void;
+
+        /**
+         * Returns rederer type/
+         */
+        getCellRenderer(row: number, col: number): string;
+
+        /**
+         * Stop listening to keyboard input on document body.
+         */
+        unlisten(): void;
+
+        /**
+         * Returns true if current Handsontable instance is listening to keyboard input on document body.
+         */
+        isListening(): boolean;
+
+        /**
+         * Rerender the table.
+         */
+        render(): void;
+
+        /**
+         * Remove grid from DOM.
+         */
+        destroy(): void;
+
+        /**
+         * Validates all cells using their validator functions and calls callback when finished. Does not render the view.
+         */
+        validateCells(callback: Function): void;
+
+        /**
+         * Return the current data object (the same that was passed by data configuration option or loadData method). Optionally you can provide cell range row, col, row2, col2 to get only a fragment of grid data
+         */
+        getData(): any;
+
+        /**
+         * Return the current data object (the same that was passed by data configuration option or loadData method). Optionally you can provide cell range row, col, row2, col2 to get only a fragment of grid data
+         */
+        getData(row: number, col: number, row2: number, col2: number): any;
+
+        /**
+         * Return cell value at row, col. row and col are the visible indexes (note that if columns were reordered or sorted, the current order will be used).
+         */
+        getDataAtCell(row: number, col: number): any;
+
+        /**
+         * Same as getDataAtCell, except instead of col, you provide name of the object property (e.g. 'first.name').
+         */
+        getDataAtRowProp(row: number, prop: string): any;
+
+        /**
+         * Returns a single row of the data (array or object, depending on what you have). row is the visible index of the row
+         */
+        getDataAtRow(row: number): any;
+
+        /**
+         * Returns a single row of the data (array or object, depending on what you have). row is the index of the row in the data source.
+         */
+        getSourceDataAtRow(row: number): any;
+
+        /**
+         * Returns array of column values from the data source. col is the visible index of the column.
+         */
+        getDataAtCol(col: number): any[];
+
+        /**
+         * Returns array of column values from the data source. col is the index of the row in the data source.
+         */
+        getSourceDataAtCol(col: number): any[];
+
+        /**
+         * Given the object property name (e.g. 'first.name'), returns array of column values from the data source.
+         */
+        getDataAtProp(prop: string): any[];
+
+        /**
+         * Get value of selected range. Each column is separated by tab, each row is separated by new line character.
+         */
+        getCopyableData(startRow: number, startCol: number, endRow: number, endCol: number): any;
+
+        /**
+         * Returns value of selected cell.
+         */
+        getValue(): any;
+
+        /**
+         * Set new value to a cell. To change many cells at once, pass an array of changes in format [ [row, col, value], ... ] as the only parameter. col is the index of visible column (note that if columns were reordered, the current order will be used). source is a flag for before/afterChange events. If you pass only array of changes then source could be set as second parameter.
+         */
+        setDataAtCell(row: number, col: number, value: any, source?: string): void;
+
+        /**
+         * Set new value to a cell. To change many cells at once, pass an array of changes in format [ [row, col, value], ... ] as the only parameter. col is the index of visible column (note that if columns were reordered, the current order will be used). source is a flag for before/afterChange events. If you pass only array of changes then source could be set as second parameter.
+         */
+        setDataAtCell(changes: any[], source?: string): void;
+
+        /**
+         * Same as above, except instead of col, you provide name of the object property (e.g. [0, 'first.name', 'Jennifer']).
+         */
+        setDataAtRowProp(row: number, prop: string, value: any, source?: string): void;
+
+        /**
+         * Same as above, except instead of col, you provide name of the object property (e.g. [0, 'first.name', 'Jennifer']).
+         */
+        setDataAtRowProp(changes: any[], source?: string): void;
+
+        /**
+         * Populate cells at position with 2D input array (e.g. [ [1, 2], [3, 4] ]).
+         * Use endRow, endCol when you want to cut input when certain row is reached.
+         * @param source (default value "populateFromArray") is used to identify this call in the resulting events (beforeChange, afterChange).
+         * @param populateMethod (default value "overwrite", possible values "shift_down" and "shift_right") has the same effect as pasteMethod option (see Options page).
+         */
+        populateFromArray(row: number, col: number, input: any[], endRow: number, endCol: number, source?: string, populateMethod?: string): void;
+
+        /**
+         * Adds/removes data from the column. This function works is modelled after Array.splice. Parameter col is the index of column in which do you want to do splice. Parameter index is the row index at which to start changing the array. If negative, will begin that many elements from the end. Parameter amount, is the number of old array elements to remove. If the amount is 0, no elements are removed. Fourth and further parameters are the elements to add to the array. If you don't specify any elements, spliceCol simply removes elements from the array.
+         */
+        spliceCol(col: number, index: number, amount: number, ...elements: any[]): void;
+
+        /**
+         * Adds/removes data from the row. This function works is modelled after Array.splice. Parameter row is the index of row in which do you want to do splice. Parameter index is the column index at which to start changing the array. If negative, will begin that many elements from the end. Parameter amount, is the number of old array elements to remove. If the amount is 0, no elements are removed. Fourth and further parameters are the elements to add to the array. If you don't specify any elements, spliceCol simply removes elements from the array.
+         */
+        spliceRow(row: number, index: number, amount: number, ...elements: any[]): void;
+
+        /**
+         * Insert new row(s) above the row at given index. If index is null or undefined, the new row will be added after the current last row. Default amount equals 1.
+         */
+        alter(type: 'insert_row', index: number, amount?: number, source?: string): void;
+
+        /**
+         * Insert new column(s) before the column at given index. If index is null or undefined, the new column will be added after the current last column. Default amount equals 1.
+         */
+        alter(type: 'insert_col', index: number, amount?: number, source?: string): void;
+
+        /**
+         * Remove the row(s) at given index. Default amount equals 1.
+         */
+        alter(type: 'remove_row', index: number, amount?: number, source?: string): void;
+
+        /**
+         * Remove the column(s) at given index. Default amount equals 1.
+         */
+        alter(type: 'remove_col', index: number, amount?: number, source?: string): void;
+
+        alter(type: string, index: number, amount?: number, source?: string): void;
+
+        /**
+         * Returns TD element for given row, col if it is rendered on screen.
+         * Returns null if the TD is not rendered on screen (probably because that part of table is not visible).
+         */
+        getCell(row: number, col: number): any;
+
+        /**
+         * Return cell properties for given row, col coordinates.
+         */
+        getCellMeta(row: number, col: number): any;
+
+        /**
+         * Sets cell meta data object key corresponding to params row, col.
+         */
+        setCellMeta(row: number, col: number, key: string, val: string): void;
+
+        /**
+         * Destroys current editor, renders and selects current cell. If revertOriginal == false, edited data is saved. Otherwise previous value is restored.
+         */
+        destroyEditor(revertOriginal?: boolean): void;
+
+        /**
+         * Select cell row, col or range finishing at row2, col2. By default, viewport will be scrolled to selection.
+         */
+        selectCell(row: number, col: number, row2: number, col2: number, scrollToSelection?: boolean): void;
+
+        /**
+         * Deselect current selection.
+         */
+        deselectCell(): void;
+
+        /**
+         * Return index of the currently selected cells as an array [startRow, startCol, endRow, endCol]. Start row and start col are the coordinates of the active cell (where the selection was started).
+         */
+        getSelected(): number[];
+
+        /**
+         * Returns current selection as a WalkontableCellRange object. Returns undefined if there is no selection.
+         */
+        getSelectedRange(): void;
+
+        /**
+         * Clears grid.
+         */
+        clear(): void;
+
+        /**
+         * Returns total number of rows in the grid.
+         */
+        countRows(): number;
+
+        /**
+         * Returns total number of columns in the grid.
+         */
+        countCols(): number;
+
+        /**
+         * Returns property name that corresponds with the given column index.
+         */
+        colToProp(column: number): string;
+
+        /**
+         * Returns index of first visible row.
+         */
+        rowOffset(): number;
+
+        /**
+         * Returns index of first visible column.
+         */
+        colOffset(): number;
+
+        /**
+         * Returns number of visible rows.
+         */
+        countVisibleRows(): number;
+
+        /**
+         * Returns number of visible columns.
+         */
+        countVisibleCols(): number;
+
+        /**
+         * Returns number of empty rows. If the optional ending parameter is true, returns number of empty rows at the bottom of the table.
+         */
+        countEmptyRows(ending?: boolean): number;
+
+        /**
+         * Returns number of empty columns.If the optional ending parameter is true, returns number of empty columns at right hand edge of the table.
+         */
+        countEmptyCols(ending?: boolean): number;
+
+        /**
+         * Returns true if the row at the given index is empty, false otherwise.
+         */
+        isEmptyRow(row: number): boolean;
+
+        /**
+         * Returns true if the column at the given index is empty, false otherwise.
+         */
+        isEmptyCol(col: number): boolean;
+
+        /**
+         * Returns array of row headers (if they are enabled). If param row given, return header at given row as string.
+         */
+        getRowHeader(row: number): any;
+
+        /**
+         * Returns array of col headers (if they are enabled). If param col given, return header at given col as string.
+         */
+        getColHeader(col: number): any;
+
+        /**
+         * Returns information of this table is configured to display row headers.
+         */
+        hasRowHeaders(): boolean;
+
+        /**
+         * Returns information of this table is configured to display column headers.
+         */
+        hasColHeaders(): boolean;
+
+        /**
+         * Return column width.
+         */
+        getColWidth(col: number): number;
+
+        /**
+         * Return row height.
+         */
+        getRowHeight(row: number): number;
+
+        /**
+         * Returns column index that corresponds with the given property.
+         */
+        propToCol(property: string): number;
+
+        /**
+         * Clear undo history.
+         */
+        clearUndo(): void;
+
+        /**
+         * Return true if undo can be performed, false otherwise.
+         */
+        isUndoAvailable(): boolean;
+
+        /**
+         * Return true if redo can be performed, false otherwise.
+         */
+        isRedoAvailable(): boolean;
+
+        /**
+         * Undo last edit.
+         */
+        undo(): void;
+
+        /**
+         * Redo edit (used to reverse an undo).
+         */
+        redo(): void;
+
+        /**
+         * Sorts table content by cell values in given column, using order. column is a zero-based column index. Order of sorting can be either ascending (order = true) or descending (order = false).
+         * Note I: This method is only available when coulmnSorting plugin is enabled. See column sorting demo for details.
+         * Note II: Running this method will not alter the table data. Sorting takes place only in view layer.
+         */
+        sort(column: number, order: boolean): void;
+    }
+}
+
+interface JQuery {
+    handsontable(): JQuery;
+    handsontable(methodName: string, ...arguments: any[]): any;
+    handsontable(options: Handsontable.Options): JQuery;
+}
diff --git a/jquery-handsontable/jquery-handsontable-tests.ts b/jquery-handsontable/jquery-handsontable-tests.ts
index b17e6fffa0..267ab30d8a 100644
--- a/jquery-handsontable/jquery-handsontable-tests.ts
+++ b/jquery-handsontable/jquery-handsontable-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="jquery-handsontable.d.ts" />
+/// <reference types="jquery" />
+
 
 var data = [
     ["", "Maserati", "Mazda", "Mercedes", "Mini", "Mitsubishi"],
diff --git a/jquery-handsontable/jquery-handsontable.d.ts b/jquery-handsontable/jquery-handsontable.d.ts
deleted file mode 100644
index 14a6ab1b67..0000000000
--- a/jquery-handsontable/jquery-handsontable.d.ts
+++ /dev/null
@@ -1,950 +0,0 @@
-// Type definitions for jquery-handsontable
-// Project: http://handsontable.com
-// Definitions by: Ted John <https://github.com/intelorca>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-declare namespace Handsontable {
-    interface CellPosition {
-        row: number;
-        col: number;
-    }
-
-    interface Options {
-        /**
-         * Initial data source that will be bound to the data grid by reference (editing data grid alters the data source. See Understanding binding as reference.
-         */
-        data?: any;
-
-        /**
-         * Width of the grid. Can be a number or a function that returns a number.
-         */
-        width?: any;
-
-        /**
-         * Height of the grid. Can be a number or a function that returns a number.
-         */
-        height?: any;
-
-        /**
-         * Minimum number of rows. At least that many of rows will be created during initialization.
-         */
-        minRows?: number;
-
-        /**
-         * Minimum number of columns. At least that many of columns will be created during initialization.
-         */
-        minCols?: number;
-
-        /**
-         * Maximum number of rows.
-         */
-        maxRows?: number;
-
-        /**
-         * Maximum number of columns.
-         */
-        maxCols?: number;
-
-        /**
-         * Initial number of rows. Notice: This option only has effect in Handsontable constructor and only if data option is not provided.
-         */
-        startRows?: number;
-
-        /**
-         * Initial number of rows. Notice: This option only has effect in Handsontable constructor and only if data option is not provided.
-         */
-        startCols?: number;
-
-        /**
-         * Setting true or false will enable or disable the default row headers (1, 2, 3). You can also define an array ['One', 'Two', 'Three', ...] or a function to define the headers. If a function is set the index of the rowis passed as a parameter.
-         */
-        rowHeaders?: any;
-
-        /**
-         * Setting true or false will enable or disable the default column headers (A, B, C). You can also define an array ['One', 'Two', 'Three', ...] or a function to define the headers. If a function is set the index of the column is passed as a parameter.
-         */
-        colHeaders?: any;
-
-        /**
-         * Defines column widths in pixels. Accepts number, string (that will be converted to number), array of numbers (if you want to define column width separately for each column) or a function (if you want to set column width dynamically on each render).
-         */
-        colWidths?: any;
-
-        /**
-         * Defines the cell properties and data binding for certain columns. Notice: Using this option sets a fixed number of columns (options startCols, minCols, maxCols will be ignored).
-         * @see https://github.com/handsontable/jquery-handsontable/wiki/Options below for more detailed explanation.
-         * @see http://handsontable.com/demo/datasources.html for examples
-         */
-        columns?: any[];
-
-        /**
-         * Defines the cell properties for given row, col, prop coordinates.
-         * See Cells section below for more detailed explanation.
-         */
-        cells?: (row: number, col: number, prop: string) => void;
-
-        /**
-         * Defines the structure of a new row when data source is an object.
-         * @see http://handsontable.com/demo/datasources.html for examples.
-         */
-        dataSchema?: any;
-
-        /**
-         * When set to 1 (or more), Handsontable will add a new row at the end of grid if there are no more empty rows.
-         */
-        minSpareRows?: number;
-
-        /**
-         * When set to 1 (or more), Handsontable will add a new column at the end of grid if there are no more empty columns.
-         */
-        minSpareCols?: number;
-
-        /**
-         * If true, selection of multiple cells using keyboard or mouse is allowed.
-         */
-        multiSelect?: boolean;
-
-        /**
-         * Enables the fill handle (drag-down and copy-down) functionality, which shows the small rectangle in bottom right corner of the selected area, that let's you expand values to the adjacent cells.
-         * Possible values: true (to enable in all directions), "vertical" or "horizontal" (to enable in one direction), false (to disable completely). Setting to true enables the fillHandle plugin, which,
-         */
-        fillHandle?: any;
-
-        /**
-         * Defines if the right-click context menu should be enabled. Context menu allows to create new row or column at any place in the grid.
-         * Possible values: true (to enable basic options), false (to disable completely) or array of any available strings: ["row_above", "row_below", "col_left", "col_right", "remove_row", "remove_col", "undo", "redo", "sep1", "sep2", "sep3"].
-         * @see http://handsontable.com/demo/contextmenu.html for examples.
-         */
-        contextMenu?: any;
-
-        /**
-         * If true, undo/redo functionality is enabled.
-         */
-        undo?: boolean;
-
-        /**
-         * If true, mouse click outside the grid will deselect the current selection.
-         */
-        outsideClickDeselects?: boolean;
-
-        /**
-         * If true, ENTER begins editing mode (like Google Docs). If false, ENTER moves to next row (like Excel) and adds new row if necessary. TAB adds new column if necessary.
-         */
-        enterBeginsEditing?: boolean;
-
-        /**
-         * Defines cursor move after ENTER is pressed (SHIFT+ENTER uses negative vector). Can be an object or a function that returns an object. The event argument passed to the function is a jQuery.Event object received after a ENTER key has been pressed. This event object can be used to check whether user pressed ENTER or SHIFT + ENTER.
-         */
-        enterMoves?: any;
-
-        /**
-         * Defines cursor move after TAB is pressed (SHIFT+TAB uses negative vector). Can be an object or a function that returns an object. The event argument passed to the function is a jQuery.Event object received after a TAB key has been pressed. This event object can be used to check whether user pressed TAB or SHIFT + TAB.
-         */
-        tabMoves?: any;
-
-        /**
-         * If true, pressing TAB or right arrow in the last column will move to first column in next row.
-         */
-        autoWrapRow?: boolean;
-
-        /**
-         * If true, pressing ENTER or down arrow in the last row will move to first row in next column.
-         */
-        autoWrapCol?: boolean;
-
-        /**
-         * Autocomplete definitions.
-         * @see demo/autocomplete.html for examples and definitions.
-         */
-        autoComplete?: any[];
-
-        /**
-         * Maximum number of rows than can be copied to clipboard using CTRL+C.
-         */
-        copyRowsLimit?: number;
-
-        /**
-         * Maximum number of columns than can be copied to clipboard using CTRL+C.
-         */
-        copyColsLimit?: number;
-
-        /**
-         * Defines paste (CTRL+V) behavior. Default value "overwrite" will paste clipboard value over current selection.
-         * When set to "shift_down", clipboard data will be pasted in place of current selection, while all selected cells are moved down.
-         * When set to "shift_right", clipboard data will be pasted in place of current selection, while all selected cells are moved right.
-         */
-        pasteMode?: string;
-
-        /**
-         * Column stretching mode. Possible values: "none", "last", "all".
-         */
-        stretchH?: string;
-
-        /**
-         * Lets you overwrite the default isEmptyRow method.
-         */
-        isEmptyRow?: (row: number) => boolean;
-
-        /**
-         * Lets you overwrite the default isEmptyCol method.
-         */
-        isEmptyCol?: (col: number) => boolean;
-
-        /**
-         * Turn on Manual column resize, if set to a boolean or define initial column resized widths, if set to an array of numbers.
-         */
-        manualColumnResize?: any;
-
-        /**
-         * Turn on Manual column move, if set to a boolean or define initial column order, if set to an array of column indexes.
-         */
-        manualColumnMove?: any;
-
-        /**
-         * Turn on Column sorting.
-         */
-        columnSorting?: boolean;
-
-        /**
-         * Turn on saving the state of column sorting, columns positions and columns sizes in local storage. For more information see How to save data localy.
-         */
-        persistentState?: boolean;
-
-        /**
-         * Class name for all visible rows in current selection.
-         */
-        currentRowClassName?: string;
-
-        /**
-         * Class name for all visible columns in current selection.
-         */
-        currentColClassName?: string;
-
-        /**
-         * Allows to specify the number of rows fixed (aka freezed) on the top of the table.
-         */
-        fixedRowsTop?: number;
-
-        /**
-         * Allows to specify the number of columns fixed (aka freezed) on the left side of the table.
-         */
-        fixedColumnsLeft?: number;
-
-        /**
-         * Setting to true enables selecting just a fragment of the text within a single cell or between adjacent cells.
-         */
-        fragmentSelection?: boolean;
-
-        /**
-         * Setting to true word wrapping of the cell text content that does not fit in the fixed column width.
-         */
-        wordWrap?: boolean;
-
-        /**
-         * CSS class name cells configured with wordWrap: false.
-         */
-        noWordWrapClassName?: string;
-
-        /**
-         * When set to an non-empty string, displayed as the cell content for empty cells.
-         */
-        placeholder?: any;
-
-        /**
-         * CSS class name for cells that have a placeholder in use.
-         */
-        placeholderCellClassName?: string;
-
-        /**
-         * CSS class name for cells that did not pass validation.
-         */
-        invalidCellClassName?: string;
-
-        /**
-         * CSS class name for read-only cells.
-         */
-        readOnlyCellClassName?: string;
-
-        /**
-         * Setting to true enables the debug mode, currently used to test the correctness of the row and column header fixed positioning on a layer above the master table.
-         */
-        debug?: boolean;
-
-        /**
-         * When set to true, the table is rerendered when it is detected that it was made visible in DOM.
-         */
-        observeDOMVisibility?: boolean;
-
-        /**
-         * Setting to true enables the autoColumnSize plugin, which makes sure each column gets enough space to show its content.
-         */
-        autoColumnSize?: boolean | Object;
-
-        /**
-         * Setting to true enables the observeChanges plugin, which automatically renders the table when a change in the data source is observed.
-         */
-        observeChanges?: boolean;
-
-        /**
-         * Setting to true enables the manualRowResize plugin, which allows to resize the row height with your mouse.
-         */
-        manualRowResize?: boolean;
-
-        /**
-         * Setting to true enables the copyPaste plugin, which enables the copying and pasting to the clipboard.
-         */
-        copyPaste?: boolean;
-
-        /**
-         * Setting to true enables the search plugin (see demo).
-         */
-        search?: boolean;
-
-        /**
-         * Setting to true or array enables the mergeCells plugin, which enables the merging of the cells. (see demo). You can provide the merged cells on the pageload if you feed the mergeCells option with an array.
-         */
-        mergeCells?: any;
-
-        /**
-         * Callback fired before Walkontable instance is initiated.
-         */
-        beforeInitWalkontable?: Function;
-
-        /**
-         * Callback fired before Handsontable instance is initiated.
-         * Note: this can be set only by global PluginHooks instance.
-         */
-        beforeInit?: Function;
-
-        /**
-         * Callback fired before Handsontable table is rendered. Parameters:
-         *   - isForced is true if rendering was triggered by a change of settings or data; or false if rendering was triggered by scrolling or moving selection.
-         */
-        beforeRender?: (isForced: boolean) => void;
-
-        /**
-         * Callback fired before one or more cells is changed. Its main purpose is to alter changes silently before input. Parameters:
-         *   - changes is a 2D array containing information about each of the edited cells [ [row, prop, oldVal, newVal], ... ].
-         *     - To disregard a single change, set changes[i] to null or remove it from array using changes.splice(i, 1).
-         *     - To alter a single change, overwrite the desired value to changes[i][3].
-         *     - To cancel all edit, return false from the callback or set array length to 0 (changes.length = 0).
-         *   - source is the name of a source of changes.
-         */
-        beforeChange?: (changes: any[][], source: string) => void;
-
-        beforeChangeRender?: Function;
-
-        /**
-         * Callback fired before sorting the table. The column argument is a relative (displayed) index of a column that is about to be sorted. To get the absolute column index, just add the current column offset. You can get the offset by using colOffset() method.
-         */
-        beforeColumnSort?: (column: number, order: boolean) => void;
-
-        /**
-         * Callback fired before setting single value from the data source array.
-         */
-        beforeSet?: (v: Object) => void;
-
-        /**
-         * Callback fired before getting cell settings.
-         */
-        beforeGetCellMeta?: (row: number, col: number, cellProperties: Object) => void;
-
-        /**
-         * Parameters:
-         *   - start is an object containing information about first filled cell: { row : 2, col : 0 }.
-         *   - end is an object containing information about last filled cell: { row : 4, col : 1 }.
-         *   - data is an 2D array containing information about fill pattern: [ ["1", "Ted"], ["1", "John"] ].
-         */
-        beforeAutofill?: (start: CellPosition, end: CellPosition, data: string[][]) => void;
-
-        /**
-         * Callback fired before keydown event is handled. It can be used to overwrite default key bindings. Caution - in your beforeKeyDown handler you need to call event.stopImmediatePropagation() to prevent default key behavior.
-         */
-        beforeKeyDown?: (event: KeyboardEvent) => void;
-
-        /**
-         * A plugin hook executed before validator function, only if validator function is defined. This can be used to manipulate value of changed cell before it is applied to the validator function. NOTICE: this will not affect values of changes. This will change value ONLY for validation!
-         */
-        beforeValidate?: (value: any, row: number, prop: string, source: string) => void;
-
-        /**
-         * Callback fired after Handsontable instance is initiated.
-         */
-        afterInit?: Function;
-
-        /**
-         * Callback fired after new data is loaded (by loadData method) into the data source array.
-         */
-        afterLoadData?: Function;
-
-        /**
-         * Callback fired after Handsontable table is rendered. Parameters:
-         *   - isForced is true if rendering was triggered by a change of settings or data; or false if rendering was triggered by scrolling or moving selection.
-         */
-        afterRender?: (isForced: boolean) => void;
-
-        /**
-         * Callback fired after one or more cells is changed. Its main use case is to save the input. Parameters:
-         *   - changes is a 2D array containing information about each of the edited cells [ [row, prop, oldVal, newVal], ... ].
-         *   - source is one of the strings: "alter", "empty", "edit", "populateFromArray", "loadData", "autofill", "paste".
-         * Note: for performance reasons, the changes array is null for "loadData" source.
-         */
-        afterChange?: (changes: any[], source: string) => void;
-
-        /**
-         * Callback fired after sorting the table. The column argument is a relative (displayed) index of a column that is about to be sorted. To get the absolute column index, just add the current column offset. You can get the offset by using colOffset() method.
-         */
-        afterColumnSort?: (column: number, order: boolean) => void;
-
-        /**
-         * Callback fired while one or more cells are being selected (on mouse move). Parameters:
-         *   - r selection start row
-         *   - c selection start column
-         *   - r2 selection end row
-         *   - c2 selection end column
-         */
-        afterSelection?: (r: number, c: number, r2: number, c2: number) => void;
-
-        /**
-         * The same as above, but data source object property name is used instead of the column number.
-         */
-        afterSelectionByProp?: (r: number, p: string, r2: number, p2: string) => void;
-
-        /**
-         * Callback fired while one or more cells are being selected (on mouse up). Parameters:
-         *   - r selection start row
-         *   - c selection start column
-         *   - r2 selection end row
-         *   - c2 selection end column
-         */
-        afterSelectionEnd?: (r: number, c: number, r2: number, c2: number) => void;
-
-        /**
-         * The same as above, but data source object property name is used instead of the column number.
-         */
-        afterSelectionEndByProp?: (r: number, p: string, r2: number, p2: string) => void;
-
-        /**
-         * Event called when current cell is deselected.
-         */
-        afterDeselect?: Function;
-
-        /**
-         * Callback fired after getting cell settings.
-         */
-        afterGetCellMeta?: (row: number, col: number, cellProperties: Object) => void;
-
-        /**
-         * Callback fired after getting info about column header.
-         */
-        afterGetColHeader?: (col: number, TH: HTMLTableHeaderCellElement) => void;
-
-        /**
-         * Callback fired after calculating column width.
-         */
-        afterGetColWidth?: (col: number, response: Object) => void;
-
-        /**
-         * Callback fired after destroing Handsontable instance.
-         */
-        afterDestroy?: Function;
-
-        /**
-         * Callback is fired when a new row is created. Parameters:
-         *   - index represents the index of first newly created row in the data source array.
-         *   - amount number of newly created rows in the data source array.
-         */
-        afterCreateRow?: (index: number, amount: number) => void;
-
-        /**
-         * Callback is fired when a new column is created. Parameters:
-         *   - index represents the index of first newly created column in the data source array.
-         *   - amount number of newly created columns in the data source array.
-         */
-        afterCreateCol?: (index: number, amount: number) => void;
-
-        /**
-         * Callback is fired when one or more rows are about to be removed. Parameters:
-         *   - index is an index of starter row.
-         *   - amount is an anount of rows to be removed.
-         */
-        beforeRemoveRow?: (index: number, amount: number) => void;
-
-        /**
-         * Callback is fired when one or more rows are removed. Parameters:
-         *   - index is an index of starter row.
-         *   - amount is an anount of removed rows.
-         */
-        afterRemoveRow?: (index: number, amount: number) => void;
-
-        /**
-         * Callback is fired when one or more columns are about to be removed. Parameters:
-         *   - index is an index of starter column.
-         *   - amount is an anount of columns to be removed.
-         */
-        beforeRemoveCol?: (index: number, amount: number) => void;
-
-        /**
-         * Callback is fired when one or more columns are removed. Parameters:
-         *   - index is an index of starter column.
-         *   - amount is an anount of removed columns.
-         */
-        afterRemoveCol?: (index: number, amount: number) => void;
-
-        /**
-         * Callback is fired after changing column size.
-         */
-        afterColumnResize?: (col: number, size: number) => void;
-
-        /**
-         * Callback is fired after changing column placement.
-         */
-        afterColumnMove?: (oldIndex: number, newIndex: number) => void;
-
-        /**
-         * Callback fired if copyRowsLimit or copyColumnsLimit was reached.
-         */
-        afterCopyLimit?: (selectedRowsCount: number, selectedColsCount: number, copyRowsLimit: number, copyColsLimit: number) => void;
-
-        /**
-         * A plugin hook executed after validator function, only if validator function is defined. Validation result is the first parameter. This can be used to determinate if validation passed successfully or not. You can cancel current change by returning false.
-         */
-        afterValidate?: (isValid: boolean, value: any, row: number, prop: string, source: string) => boolean;
-
-        /**
-         * Callback fired before setting range is ended. Parameters:
-         *   - coords is WalkontableCellCoords array
-         */
-        beforeSetRangeEnd?: (coords: any[]) => void;
-
-        afterUpdateSettings?: Function;
-
-        afterRenderer?: (TD: HTMLTableDataCellElement, row: number, col: number, prop: string, value: string, cellProperties: Object) => void;
-
-        /**
-         * Callback fired after clicking on a cell or row/column header.
-         * In case the row/column header was clicked, the index is negative. For example clicking on the row header of cell (0, 0) results with afterOnCellMouseDown called with coords {row: 0, col: -1}.
-         */
-        afterOnCellMouseDown?: (event: MouseEvent, coords: CellPosition, TD: HTMLTableDataCellElement) => void;
-
-        /**
-         * Callback fired after hovering a cell or row/column header with the mouse cursor.
-         * In case the row/column header was hovered, the index is negative. For example clicking on the row header of cell (0, 0) results with afterOnCellMouseOver called with coords {row: 0, col: -1}.
-         */
-        afterOnCellMouseOver?: (event: MouseEvent, coords: CellPosition, TD: HTMLTableDataCellElement) => void;
-
-        /**
-         * Callback fired after.
-         */
-        afterOnCellCornerMouseDown?: (event: MouseEvent) => void;
-
-        afterScrollVertically?: Function;
-
-        afterScrollHorizontally?: Function;
-
-        /**
-         * Callback fired after reset cell's meta.
-         */
-        afterCellMetaReset?: Function;
-
-        /**
-         * Callback fired after modify column's width.
-         */
-        modifyColWidth?: (width: number, col: number) => void;
-
-        /**
-         * Callback fired after modify hight of row.
-         */
-        modifyRowHeight?: (height: number, row: number) => void;
-
-        /**
-         * Callback fired after row modify.
-         */
-        modifyRow?: (row: number) => void;
-
-        /**
-         * Callback fired after column modify.
-         */
-        modifyCol?: (col: number) => void;
-
-        afterSetCellMeta?: Function;
-
-        /**
-         * Deprecated! Now event is called afterSelection.
-         */
-        onSelection?: (r: number, p: number, r2: number, p2: number) => void;
-
-        /**
-         * Deprecated! Now event is called afterSelectionByProp.
-         */
-        onSelectionByProp?: (r: number, p: number, r2: number, p2: number) => void;
-
-        /**
-         * Deprecated! Now event is called afterSelectionEnd.
-         */
-        onSelectionEnd?: (r: number, p: number, r2: number, p2: number) => void;
-
-        /**
-         * Deprecated! Now event is called afterSelectionEndByProp.
-         */
-        onSelectionEndByProp?: (r: number, p: number, r2: number, p2: number) => void;
-
-        /**
-         * Deprecated! Now event is called beforeChange.
-         */
-        onBeforeChange?: (changes: any[], source: string) => void;
-
-        /**
-         * Deprecated! Now event is called afterChange.
-         */
-        onChange?: (changes: any[], source: string) => void;
-
-        /**
-         * Deprecated! Now event is called afterCopyLimit.
-         */
-        onCopyLimit?: (selectedRowsCount: number, selectedColsCount: number, copyRowsLimit: number, copyColsLimit: number) => void;
-    }
-
-    interface Context {
-        /**
-         * Use it if you need to change configuration after initialization.
-         */
-        updateSettings(options: Options): void;
-
-        /**
-         * Returns an object containing the current grid settings.
-         */
-        getSettings(): Options;
-
-        /**
-         * Reset all cells in the grid to contain data from the data array.
-         */
-        loadData(data: any[]): void;
-
-        /**
-         * Listen to keyboard input on document body.
-         */
-        listen(): void;
-
-        /**
-         * Returns rederer type/
-         */
-        getCellRenderer(row: number, col: number): string;
-
-        /**
-         * Stop listening to keyboard input on document body.
-         */
-        unlisten(): void;
-
-        /**
-         * Returns true if current Handsontable instance is listening to keyboard input on document body.
-         */
-        isListening(): boolean;
-
-        /**
-         * Rerender the table.
-         */
-        render(): void;
-
-        /**
-         * Remove grid from DOM.
-         */
-        destroy(): void;
-
-        /**
-         * Validates all cells using their validator functions and calls callback when finished. Does not render the view.
-         */
-        validateCells(callback: Function): void;
-
-        /**
-         * Return the current data object (the same that was passed by data configuration option or loadData method). Optionally you can provide cell range row, col, row2, col2 to get only a fragment of grid data
-         */
-        getData(): any;
-
-        /**
-         * Return the current data object (the same that was passed by data configuration option or loadData method). Optionally you can provide cell range row, col, row2, col2 to get only a fragment of grid data
-         */
-        getData(row: number, col: number, row2: number, col2: number): any;
-
-        /**
-         * Return cell value at row, col. row and col are the visible indexes (note that if columns were reordered or sorted, the current order will be used).
-         */
-        getDataAtCell(row: number, col: number): any;
-
-        /**
-         * Same as getDataAtCell, except instead of col, you provide name of the object property (e.g. 'first.name').
-         */
-        getDataAtRowProp(row: number, prop: string): any;
-
-        /**
-         * Returns a single row of the data (array or object, depending on what you have). row is the visible index of the row
-         */
-        getDataAtRow(row: number): any;
-
-        /**
-         * Returns a single row of the data (array or object, depending on what you have). row is the index of the row in the data source.
-         */
-        getSourceDataAtRow(row: number): any;
-
-        /**
-         * Returns array of column values from the data source. col is the visible index of the column.
-         */
-        getDataAtCol(col: number): any[];
-
-        /**
-         * Returns array of column values from the data source. col is the index of the row in the data source.
-         */
-        getSourceDataAtCol(col: number): any[];
-
-        /**
-         * Given the object property name (e.g. 'first.name'), returns array of column values from the data source.
-         */
-        getDataAtProp(prop: string): any[];
-
-        /**
-         * Get value of selected range. Each column is separated by tab, each row is separated by new line character.
-         */
-        getCopyableData(startRow: number, startCol: number, endRow: number, endCol: number): any;
-
-        /**
-         * Returns value of selected cell.
-         */
-        getValue(): any;
-
-        /**
-         * Set new value to a cell. To change many cells at once, pass an array of changes in format [ [row, col, value], ... ] as the only parameter. col is the index of visible column (note that if columns were reordered, the current order will be used). source is a flag for before/afterChange events. If you pass only array of changes then source could be set as second parameter.
-         */
-        setDataAtCell(row: number, col: number, value: any, source?: string): void;
-
-        /**
-         * Set new value to a cell. To change many cells at once, pass an array of changes in format [ [row, col, value], ... ] as the only parameter. col is the index of visible column (note that if columns were reordered, the current order will be used). source is a flag for before/afterChange events. If you pass only array of changes then source could be set as second parameter.
-         */
-        setDataAtCell(changes: any[], source?: string): void;
-
-        /**
-         * Same as above, except instead of col, you provide name of the object property (e.g. [0, 'first.name', 'Jennifer']).
-         */
-        setDataAtRowProp(row: number, prop: string, value: any, source?: string): void;
-
-        /**
-         * Same as above, except instead of col, you provide name of the object property (e.g. [0, 'first.name', 'Jennifer']).
-         */
-        setDataAtRowProp(changes: any[], source?: string): void;
-
-        /**
-         * Populate cells at position with 2D input array (e.g. [ [1, 2], [3, 4] ]).
-         * Use endRow, endCol when you want to cut input when certain row is reached.
-         * @param source (default value "populateFromArray") is used to identify this call in the resulting events (beforeChange, afterChange).
-         * @param populateMethod (default value "overwrite", possible values "shift_down" and "shift_right") has the same effect as pasteMethod option (see Options page).
-         */
-        populateFromArray(row: number, col: number, input: any[], endRow: number, endCol: number, source?: string, populateMethod?: string): void;
-
-        /**
-         * Adds/removes data from the column. This function works is modelled after Array.splice. Parameter col is the index of column in which do you want to do splice. Parameter index is the row index at which to start changing the array. If negative, will begin that many elements from the end. Parameter amount, is the number of old array elements to remove. If the amount is 0, no elements are removed. Fourth and further parameters are the elements to add to the array. If you don't specify any elements, spliceCol simply removes elements from the array.
-         */
-        spliceCol(col: number, index: number, amount: number, ...elements: any[]): void;
-
-        /**
-         * Adds/removes data from the row. This function works is modelled after Array.splice. Parameter row is the index of row in which do you want to do splice. Parameter index is the column index at which to start changing the array. If negative, will begin that many elements from the end. Parameter amount, is the number of old array elements to remove. If the amount is 0, no elements are removed. Fourth and further parameters are the elements to add to the array. If you don't specify any elements, spliceCol simply removes elements from the array.
-         */
-        spliceRow(row: number, index: number, amount: number, ...elements: any[]): void;
-
-        /**
-         * Insert new row(s) above the row at given index. If index is null or undefined, the new row will be added after the current last row. Default amount equals 1.
-         */
-        alter(type: 'insert_row', index: number, amount?: number, source?: string): void;
-
-        /**
-         * Insert new column(s) before the column at given index. If index is null or undefined, the new column will be added after the current last column. Default amount equals 1.
-         */
-        alter(type: 'insert_col', index: number, amount?: number, source?: string): void;
-
-        /**
-         * Remove the row(s) at given index. Default amount equals 1.
-         */
-        alter(type: 'remove_row', index: number, amount?: number, source?: string): void;
-
-        /**
-         * Remove the column(s) at given index. Default amount equals 1.
-         */
-        alter(type: 'remove_col', index: number, amount?: number, source?: string): void;
-
-        alter(type: string, index: number, amount?: number, source?: string): void;
-
-        /**
-         * Returns TD element for given row, col if it is rendered on screen.
-         * Returns null if the TD is not rendered on screen (probably because that part of table is not visible).
-         */
-        getCell(row: number, col: number): any;
-
-        /**
-         * Return cell properties for given row, col coordinates.
-         */
-        getCellMeta(row: number, col: number): any;
-
-        /**
-         * Sets cell meta data object key corresponding to params row, col.
-         */
-        setCellMeta(row: number, col: number, key: string, val: string): void;
-
-        /**
-         * Destroys current editor, renders and selects current cell. If revertOriginal == false, edited data is saved. Otherwise previous value is restored.
-         */
-        destroyEditor(revertOriginal?: boolean): void;
-
-        /**
-         * Select cell row, col or range finishing at row2, col2. By default, viewport will be scrolled to selection.
-         */
-        selectCell(row: number, col: number, row2: number, col2: number, scrollToSelection?: boolean): void;
-
-        /**
-         * Deselect current selection.
-         */
-        deselectCell(): void;
-
-        /**
-         * Return index of the currently selected cells as an array [startRow, startCol, endRow, endCol]. Start row and start col are the coordinates of the active cell (where the selection was started).
-         */
-        getSelected(): number[];
-
-        /**
-         * Returns current selection as a WalkontableCellRange object. Returns undefined if there is no selection.
-         */
-        getSelectedRange(): void;
-
-        /**
-         * Clears grid.
-         */
-        clear(): void;
-
-        /**
-         * Returns total number of rows in the grid.
-         */
-        countRows(): number;
-
-        /**
-         * Returns total number of columns in the grid.
-         */
-        countCols(): number;
-
-        /**
-         * Returns property name that corresponds with the given column index.
-         */
-        colToProp(column: number): string;
-
-        /**
-         * Returns index of first visible row.
-         */
-        rowOffset(): number;
-
-        /**
-         * Returns index of first visible column.
-         */
-        colOffset(): number;
-
-        /**
-         * Returns number of visible rows.
-         */
-        countVisibleRows(): number;
-
-        /**
-         * Returns number of visible columns.
-         */
-        countVisibleCols(): number;
-
-        /**
-         * Returns number of empty rows. If the optional ending parameter is true, returns number of empty rows at the bottom of the table.
-         */
-        countEmptyRows(ending?: boolean): number;
-
-        /**
-         * Returns number of empty columns.If the optional ending parameter is true, returns number of empty columns at right hand edge of the table.
-         */
-        countEmptyCols(ending?: boolean): number;
-
-        /**
-         * Returns true if the row at the given index is empty, false otherwise.
-         */
-        isEmptyRow(row: number): boolean;
-
-        /**
-         * Returns true if the column at the given index is empty, false otherwise.
-         */
-        isEmptyCol(col: number): boolean;
-
-        /**
-         * Returns array of row headers (if they are enabled). If param row given, return header at given row as string.
-         */
-        getRowHeader(row: number): any;
-
-        /**
-         * Returns array of col headers (if they are enabled). If param col given, return header at given col as string.
-         */
-        getColHeader(col: number): any;
-
-        /**
-         * Returns information of this table is configured to display row headers.
-         */
-        hasRowHeaders(): boolean;
-
-        /**
-         * Returns information of this table is configured to display column headers.
-         */
-        hasColHeaders(): boolean;
-
-        /**
-         * Return column width.
-         */
-        getColWidth(col: number): number;
-
-        /**
-         * Return row height.
-         */
-        getRowHeight(row: number): number;
-
-        /**
-         * Returns column index that corresponds with the given property.
-         */
-        propToCol(property: string): number;
-
-        /**
-         * Clear undo history.
-         */
-        clearUndo(): void;
-
-        /**
-         * Return true if undo can be performed, false otherwise.
-         */
-        isUndoAvailable(): boolean;
-
-        /**
-         * Return true if redo can be performed, false otherwise.
-         */
-        isRedoAvailable(): boolean;
-
-        /**
-         * Undo last edit.
-         */
-        undo(): void;
-
-        /**
-         * Redo edit (used to reverse an undo).
-         */
-        redo(): void;
-
-        /**
-         * Sorts table content by cell values in given column, using order. column is a zero-based column index. Order of sorting can be either ascending (order = true) or descending (order = false).
-         * Note I: This method is only available when coulmnSorting plugin is enabled. See column sorting demo for details.
-         * Note II: Running this method will not alter the table data. Sorting takes place only in view layer.
-         */
-        sort(column: number, order: boolean): void;
-    }
-}
-
-interface JQuery {
-    handsontable(): JQuery;
-    handsontable(methodName: string, ...arguments: any[]): any;
-    handsontable(options: Handsontable.Options): JQuery;
-}
diff --git a/jquery-handsontable/tsconfig.json b/jquery-handsontable/tsconfig.json
new file mode 100644
index 0000000000..99b0642b10
--- /dev/null
+++ b/jquery-handsontable/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-handsontable-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery-jsonrpcclient/index.d.ts b/jquery-jsonrpcclient/index.d.ts
new file mode 100644
index 0000000000..45995ec97b
--- /dev/null
+++ b/jquery-jsonrpcclient/index.d.ts
@@ -0,0 +1,103 @@
+// Type definitions for jquery.jsonrpc 0.7.0
+// Project: https://github.com/Textalk/jquery.jsonrpcclient.js
+// Definitions by: Maksim Karelov <https://github.com/Ty3uK>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface JsonRpcClientOptions extends JQueryAjaxSettings {
+    ajaxUrl: string;
+    headers?: {[key:string]: any};
+    socketUrl?: string;
+    onmessage?: (ev: MessageEvent) => void;
+    onopen?: (ev: Event) => void;
+    onclose?: (ev: CloseEvent) => void;
+    onerror?: (ev: Event) => void;
+    getSockect?: (onmessageCb: () => void) => WebSocket;
+
+    /**
+     * Sets timeout for calls in milliseconds.
+     * Works with WebSocket as well as AJAX.
+     */
+    timeout?: number;
+}
+
+interface JsonRpcClient {
+    /**
+    * @fn call
+    * @memberof JsonRpcClient
+    *
+    * @param {string}       method     The method to run on JSON-RPC server.
+    * @param {object|array} params     The params; an array or object.
+    * @param {function}     successCb  A callback for successful request.
+    * @param {function}     errorCb    A callback for error.
+    *
+    * @return {object} Returns the deferred object that $.ajax returns or {null} for websockets
+    */
+    call(method: string, params: Object | Array<any>, successCb: (result: any) => void, errorCb: (result: any) => void): JQueryDeferred<JQueryXHR>;
+        
+    /**
+    * Notify sends a command to the server that won't need a response.  In http, there is probably
+    * an empty response - that will be dropped, but in ws there should be no response at all.
+    *
+    * This is very similar to call, but has no id and no handling of callbacks.
+    *
+    * @fn notify
+    * @memberof JsonRpcClient
+    *
+    * @param {string} method       The method to run on JSON-RPC server.
+    * @param {object|array} params The params; an array or object.
+    *
+    * @return {object} Returns the deferred object that $.ajax returns or {null} for websockets
+    */
+    notify(method: string, params: Object | Array<any>): JQueryDeferred<JQueryXHR>;
+
+    /**
+    * Make a batch-call by using a callback.
+    *
+    * The callback will get an object "batch" as only argument.  On batch, you can call the methods
+    * "call" and "notify" just as if it was a normal JsonRpcClient object, and all calls will be
+    * sent as a batch call then the callback is done.
+    *
+    * @fn batch
+    * @memberof JsonRpcClient
+    *
+    * @param {function} callback   This function will get a batch handler to run call and notify on.
+    * @param {function} allDoneCb  A callback function to call after all results have been handled.
+    * @param {function} errorCb    A callback function to call if there is an error from the server.
+    *                    Note, that batch calls should always get an overall success, and the
+    *                    only error
+    */
+    batch(callback: (batch: JsonRpcClient) => void, allDoneCb: (result: any) => void, errorCb: (error: any) => void): void;
+}
+
+interface JsonRpcClientFactory {
+    /**
+    * @fn new
+    * @memberof JsonRpcClient
+    *
+    * @param {object} options An object stating the backends:
+    *                ajaxUrl    A url (relative or absolute) to a http(s) backend.
+    *                headers    An object that will be passed along to $.ajax in options.headers
+    *                xhrFields  An object that will be passed along to $.ajax in options.xhrFields
+    *                socketUrl  A url (relative of absolute) to a ws(s) backend.
+    *                onmessage  A socket message handler for other messages (non-responses).
+    *                onopen     A socket onopen handler. (Not used for custom getSocket.)
+    *                onclose    A socket onclose handler. (Not used for custom getSocket.)
+    *                onerror    A socket onerror handler. (Not used for custom getSocket.)
+    *                getSocket  A function returning a WebSocket or null.
+    *                           It must take an onmessage_cb and bind it to the onmessage event
+    *                           (or chain it before/after some other onmessage handler).
+    *                           Or, it could return null if no socket is available.
+    *                           The returned instance must have readyState <= 1, and if less than 1,
+    *                           react to onopen binding.
+    *                timeout    (optional) A number of ms to wait before timing out and failing a
+    *                           call. If specified a setTimeout will be used to keep track of calls
+    *                           made through a websocket.
+    */
+    new (options?: JsonRpcClientOptions): JsonRpcClient;
+}
+
+interface JQueryStatic {
+    JsonRpcClient: JsonRpcClientFactory;
+}
\ No newline at end of file
diff --git a/jquery-jsonrpcclient/jquery-jsonrpcclient-tests.ts b/jquery-jsonrpcclient/jquery-jsonrpcclient-tests.ts
index 7d23caddfd..30596aa477 100644
--- a/jquery-jsonrpcclient/jquery-jsonrpcclient-tests.ts
+++ b/jquery-jsonrpcclient/jquery-jsonrpcclient-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery-jsonrpcclient.d.ts"/>
+/// <reference types="jquery"/>
 
 var foo = new $.JsonRpcClient({ ajaxUrl: '/backend/jsonrpc' });
 foo.call(
diff --git a/jquery-jsonrpcclient/jquery-jsonrpcclient.d.ts b/jquery-jsonrpcclient/jquery-jsonrpcclient.d.ts
deleted file mode 100644
index 123001767d..0000000000
--- a/jquery-jsonrpcclient/jquery-jsonrpcclient.d.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-// Type definitions for jquery.jsonrpc 0.7.0
-// Project: https://github.com/Textalk/jquery.jsonrpcclient.js
-// Definitions by: Maksim Karelov <https://github.com/Ty3uK>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface JsonRpcClientOptions extends JQueryAjaxSettings {
-    ajaxUrl: string;
-    headers?: {[key:string]: any};
-    socketUrl?: string;
-    onmessage?: (ev: MessageEvent) => void;
-    onopen?: (ev: Event) => void;
-    onclose?: (ev: CloseEvent) => void;
-    onerror?: (ev: Event) => void;
-    getSockect?: (onmessageCb: () => void) => WebSocket;
-
-    /**
-     * Sets timeout for calls in milliseconds.
-     * Works with WebSocket as well as AJAX.
-     */
-    timeout?: number;
-}
-
-interface JsonRpcClient {
-    /**
-    * @fn call
-    * @memberof JsonRpcClient
-    *
-    * @param {string}       method     The method to run on JSON-RPC server.
-    * @param {object|array} params     The params; an array or object.
-    * @param {function}     successCb  A callback for successful request.
-    * @param {function}     errorCb    A callback for error.
-    *
-    * @return {object} Returns the deferred object that $.ajax returns or {null} for websockets
-    */
-    call(method: string, params: Object | Array<any>, successCb: (result: any) => void, errorCb: (result: any) => void): JQueryDeferred<JQueryXHR>;
-        
-    /**
-    * Notify sends a command to the server that won't need a response.  In http, there is probably
-    * an empty response - that will be dropped, but in ws there should be no response at all.
-    *
-    * This is very similar to call, but has no id and no handling of callbacks.
-    *
-    * @fn notify
-    * @memberof JsonRpcClient
-    *
-    * @param {string} method       The method to run on JSON-RPC server.
-    * @param {object|array} params The params; an array or object.
-    *
-    * @return {object} Returns the deferred object that $.ajax returns or {null} for websockets
-    */
-    notify(method: string, params: Object | Array<any>): JQueryDeferred<JQueryXHR>;
-
-    /**
-    * Make a batch-call by using a callback.
-    *
-    * The callback will get an object "batch" as only argument.  On batch, you can call the methods
-    * "call" and "notify" just as if it was a normal JsonRpcClient object, and all calls will be
-    * sent as a batch call then the callback is done.
-    *
-    * @fn batch
-    * @memberof JsonRpcClient
-    *
-    * @param {function} callback   This function will get a batch handler to run call and notify on.
-    * @param {function} allDoneCb  A callback function to call after all results have been handled.
-    * @param {function} errorCb    A callback function to call if there is an error from the server.
-    *                    Note, that batch calls should always get an overall success, and the
-    *                    only error
-    */
-    batch(callback: (batch: JsonRpcClient) => void, allDoneCb: (result: any) => void, errorCb: (error: any) => void): void;
-}
-
-interface JsonRpcClientFactory {
-    /**
-    * @fn new
-    * @memberof JsonRpcClient
-    *
-    * @param {object} options An object stating the backends:
-    *                ajaxUrl    A url (relative or absolute) to a http(s) backend.
-    *                headers    An object that will be passed along to $.ajax in options.headers
-    *                xhrFields  An object that will be passed along to $.ajax in options.xhrFields
-    *                socketUrl  A url (relative of absolute) to a ws(s) backend.
-    *                onmessage  A socket message handler for other messages (non-responses).
-    *                onopen     A socket onopen handler. (Not used for custom getSocket.)
-    *                onclose    A socket onclose handler. (Not used for custom getSocket.)
-    *                onerror    A socket onerror handler. (Not used for custom getSocket.)
-    *                getSocket  A function returning a WebSocket or null.
-    *                           It must take an onmessage_cb and bind it to the onmessage event
-    *                           (or chain it before/after some other onmessage handler).
-    *                           Or, it could return null if no socket is available.
-    *                           The returned instance must have readyState <= 1, and if less than 1,
-    *                           react to onopen binding.
-    *                timeout    (optional) A number of ms to wait before timing out and failing a
-    *                           call. If specified a setTimeout will be used to keep track of calls
-    *                           made through a websocket.
-    */
-    new (options?: JsonRpcClientOptions): JsonRpcClient;
-}
-
-interface JQueryStatic {
-    JsonRpcClient: JsonRpcClientFactory;
-}
\ No newline at end of file
diff --git a/jquery-jsonrpcclient/tsconfig.json b/jquery-jsonrpcclient/tsconfig.json
new file mode 100644
index 0000000000..514efa2e7b
--- /dev/null
+++ b/jquery-jsonrpcclient/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-jsonrpcclient-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery-knob/index.d.ts b/jquery-knob/index.d.ts
new file mode 100644
index 0000000000..925e632c68
--- /dev/null
+++ b/jquery-knob/index.d.ts
@@ -0,0 +1,116 @@
+// Type definitions for jQuery Knob 1.2.11
+// Project: http://anthonyterrien.com/knob/
+// Definitions by: Iain Buchanan <https://github.com/iain8/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace JQueryKnob {
+	export interface JQueryKnobOptions {
+		/**
+		 * min value | default=0
+		 */
+		min?: number;
+		/**
+		 * max value | default=100
+		 */
+		max?: number;
+		/**
+		 * step size | default=1
+		 */
+		step?: number;
+		/**
+		 * starting angle in degrees | default=0
+		 */
+		angleOffset?: number;
+		/**
+		 * arc size in degrees | default=360
+		 */
+		angleArc?: number;
+		/**
+		 * stop at min & max on keydown/mousewheel | default=true
+		 */
+		stopper?: boolean;
+		/**
+		 * disable input and events | default=false
+		 */
+		readOnly?: boolean;
+		/**
+		 * direction of progression | default=clockwise
+		 */
+		rotation?: string;
+		/**
+		 * display mode "cursor", cursor size could be changed passing a
+		 * numeric value to the option, default width is used when passing
+		 * boolean value "true" | default=gauge
+		 */
+		cursor?: string | boolean;
+		/**
+		 * gauge thickness
+		 */
+		thickness?: number;
+		/**
+		 * gauge stroke endings | default=butt, round=rounded line endings
+		 */
+		lineCap?: string;
+		/**
+		 * dial width
+		 */
+		width?: number;
+		/**
+		 * default=true | false=hide input
+		 */
+		displayInput?: boolean;
+		/**
+		 * default=false | true=displays the previous value with transparency
+		 */
+		displayPrevious?: boolean;
+		/**
+		 * foreground color
+		 */
+		fgColor?: string;
+		/**
+		 * input value (number) color
+		 */
+		inputColor?: string;
+		/**
+		 * font family
+		 */
+		font?: string;
+		/**
+		 * font weight
+		 */
+		fontWeight?: string;
+		/**
+		 * background color
+		 */
+		bgColor?: string;
+		/**
+		 * executed on release
+		 */
+		release?: (value: number) => void;
+		/**
+		 * executed at each change of the value
+		 */
+		change?: (value: number) => void;
+		/**
+		 * when drawing the canvas
+		 */
+		draw?: () => void;
+		/**
+		 * triggered on [esc] keydown
+		 */
+		cancel?: () => void;
+		/**
+		 * allows to format output (add unit %, ms...)
+		 */
+		format?: (value: number) => void;
+	}
+}
+
+interface JQuery {
+	/**
+	 * Create a knob for the given input field, with optional options
+	 */
+	knob(options?: JQueryKnob.JQueryKnobOptions): JQuery;
+}
diff --git a/jquery-knob/jquery-knob-tests.ts b/jquery-knob/jquery-knob-tests.ts
index a6c85e2c8b..13412284bd 100644
--- a/jquery-knob/jquery-knob-tests.ts
+++ b/jquery-knob/jquery-knob-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="jquery-knob.d.ts"/>
-
 // create from html attrs
 $('<input type="text" name="knob" value="50" data-min="0" data-max="100">').knob();
 
diff --git a/jquery-knob/jquery-knob.d.ts b/jquery-knob/jquery-knob.d.ts
deleted file mode 100644
index c1587fe392..0000000000
--- a/jquery-knob/jquery-knob.d.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-// Type definitions for jQuery Knob 1.2.11
-// Project: http://anthonyterrien.com/knob/
-// Definitions by: Iain Buchanan <https://github.com/iain8/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace JQueryKnob {
-	export interface JQueryKnobOptions {
-		/**
-		 * min value | default=0
-		 */
-		min?: number;
-		/**
-		 * max value | default=100
-		 */
-		max?: number;
-		/**
-		 * step size | default=1
-		 */
-		step?: number;
-		/**
-		 * starting angle in degrees | default=0
-		 */
-		angleOffset?: number;
-		/**
-		 * arc size in degrees | default=360
-		 */
-		angleArc?: number;
-		/**
-		 * stop at min & max on keydown/mousewheel | default=true
-		 */
-		stopper?: boolean;
-		/**
-		 * disable input and events | default=false
-		 */
-		readOnly?: boolean;
-		/**
-		 * direction of progression | default=clockwise
-		 */
-		rotation?: string;
-		/**
-		 * display mode "cursor", cursor size could be changed passing a
-		 * numeric value to the option, default width is used when passing
-		 * boolean value "true" | default=gauge
-		 */
-		cursor?: string | boolean;
-		/**
-		 * gauge thickness
-		 */
-		thickness?: number;
-		/**
-		 * gauge stroke endings | default=butt, round=rounded line endings
-		 */
-		lineCap?: string;
-		/**
-		 * dial width
-		 */
-		width?: number;
-		/**
-		 * default=true | false=hide input
-		 */
-		displayInput?: boolean;
-		/**
-		 * default=false | true=displays the previous value with transparency
-		 */
-		displayPrevious?: boolean;
-		/**
-		 * foreground color
-		 */
-		fgColor?: string;
-		/**
-		 * input value (number) color
-		 */
-		inputColor?: string;
-		/**
-		 * font family
-		 */
-		font?: string;
-		/**
-		 * font weight
-		 */
-		fontWeight?: string;
-		/**
-		 * background color
-		 */
-		bgColor?: string;
-		/**
-		 * executed on release
-		 */
-		release?: (value: number) => void;
-		/**
-		 * executed at each change of the value
-		 */
-		change?: (value: number) => void;
-		/**
-		 * when drawing the canvas
-		 */
-		draw?: () => void;
-		/**
-		 * triggered on [esc] keydown
-		 */
-		cancel?: () => void;
-		/**
-		 * allows to format output (add unit %, ms...)
-		 */
-		format?: (value: number) => void;
-	}
-}
-
-interface JQuery {
-	/**
-	 * Create a knob for the given input field, with optional options
-	 */
-	knob(options?: JQueryKnob.JQueryKnobOptions): JQuery;
-}
diff --git a/jquery-knob/tsconfig.json b/jquery-knob/tsconfig.json
new file mode 100644
index 0000000000..cd4e8498b3
--- /dev/null
+++ b/jquery-knob/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-knob-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery-mockjax/index.d.ts b/jquery-mockjax/index.d.ts
new file mode 100644
index 0000000000..2eea75919e
--- /dev/null
+++ b/jquery-mockjax/index.d.ts
@@ -0,0 +1,49 @@
+// Type definitions for jQuery Mockjax 2.0.1
+// Project: https://github.com/jakerella/jquery-mockjax
+// Definitions by: Laszlo Jakab <https://github.com/laszlojakab/>, Vladimir Đokić <https://github.com/vladeck/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface MockJaxSettingsHeaders {
+    [key: string]: string;
+}
+
+interface MockJaxSettings {
+    url?: string | RegExp;
+    urlParams?: string[];
+    data?: any;
+    type?: string;
+    headers?: MockJaxSettingsHeaders;
+    logging?: boolean;
+    status?: number;
+    statusText?: string;
+    responseTime?: number;
+    isTimeout?: boolean;
+    dataType?: string;
+    contentType?: string;
+    response?: (settings: any) => void;
+    responseText?: string | Object;
+    responseXml?: string;
+    proxy?: string;
+    proxyType?: string;
+    lastModified?: string;
+    etag?: string;
+    onAfterSuccess?: Function;
+    onAfterError?: Function;
+    onAfterComplete?: Function;
+}
+
+interface MockJaxStatic {
+    (options: MockJaxSettings): number;
+    handler(id?: number): any;
+    clear(id?: number): void;
+    mockedAjaxCalls(): any[];
+    unfiredHandlers(): any[];
+    unmockedAjaxCalls(): any[];
+}
+
+interface JQueryStatic {
+    mockjax: MockJaxStatic;
+    mockjaxSettings: MockJaxSettings;
+}
diff --git a/jquery-mockjax/jquery-mockjax-tests.ts b/jquery-mockjax/jquery-mockjax-tests.ts
index 6fae52eb07..e5b588a869 100644
--- a/jquery-mockjax/jquery-mockjax-tests.ts
+++ b/jquery-mockjax/jquery-mockjax-tests.ts
@@ -1,6 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery-mockjax.d.ts"/>
-/// <reference path="../qunit/qunit.d.ts" />
+/// <reference types="jquery"/>
+/// <reference types="qunit" />
 
 class Tests {
     private _noErrorCallbackExpected: (jqXHR: JQueryXHR, textStatus: string, errorThrown: string) => any;
diff --git a/jquery-mockjax/jquery-mockjax.d.ts b/jquery-mockjax/jquery-mockjax.d.ts
deleted file mode 100644
index 7505a30e6f..0000000000
--- a/jquery-mockjax/jquery-mockjax.d.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-// Type definitions for jQuery Mockjax 2.0.1
-// Project: https://github.com/jakerella/jquery-mockjax
-// Definitions by: Laszlo Jakab <https://github.com/laszlojakab/>, Vladimir Đokić <https://github.com/vladeck/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface MockJaxSettingsHeaders {
-    [key: string]: string;
-}
-
-interface MockJaxSettings {
-    url?: string | RegExp;
-    urlParams?: string[];
-    data?: any;
-    type?: string;
-    headers?: MockJaxSettingsHeaders;
-    logging?: boolean;
-    status?: number;
-    statusText?: string;
-    responseTime?: number;
-    isTimeout?: boolean;
-    dataType?: string;
-    contentType?: string;
-    response?: (settings: any) => void;
-    responseText?: string | Object;
-    responseXml?: string;
-    proxy?: string;
-    proxyType?: string;
-    lastModified?: string;
-    etag?: string;
-    onAfterSuccess?: Function;
-    onAfterError?: Function;
-    onAfterComplete?: Function;
-}
-
-interface MockJaxStatic {
-    (options: MockJaxSettings): number;
-    handler(id?: number): any;
-    clear(id?: number): void;
-    mockedAjaxCalls(): any[];
-    unfiredHandlers(): any[];
-    unmockedAjaxCalls(): any[];
-}
-
-interface JQueryStatic {
-    mockjax: MockJaxStatic;
-    mockjaxSettings: MockJaxSettings;
-}
diff --git a/jquery-mockjax/tsconfig.json b/jquery-mockjax/tsconfig.json
new file mode 100644
index 0000000000..2ea163a341
--- /dev/null
+++ b/jquery-mockjax/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-mockjax-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery-sortable/index.d.ts b/jquery-sortable/index.d.ts
new file mode 100644
index 0000000000..2205bf50e1
--- /dev/null
+++ b/jquery-sortable/index.d.ts
@@ -0,0 +1,103 @@
+// Type definitions for jQuery Sortable v0.9.12
+// Project: http://johnny.github.io/jquery-sortable/
+// Definitions by: Nathan Pitman <https://github.com/Seltzer>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace JQuerySortable {
+
+	interface Position {
+		top: number;
+		left: number;
+	}
+
+	type Dimensions = number[];
+
+	interface ContainerGroup {
+		$document: JQuery;
+		containerDimensions: Dimensions[]
+		containers: Container[];
+		delayMet: boolean;
+		dragInitDone: boolean;
+		dragProxy: any;
+		dragging: boolean;
+		dropProxy: any;
+		item: JQuery;
+		itemContainer: Container;
+		lastAppendedItem: JQuery;
+		lastPointer: Position;
+		lastRelativePointer: Position;
+		offsetParent: JQuery;
+		options: Options;
+		placeholder: JQuery;
+		pointer: Position;
+		relativePointer: Position;
+		sameResultBox: { bottom: number; left: number; right: number; top: number; };
+		scrollProxy: any;
+	}
+
+	interface Container {
+		el: JQuery;
+		options: Options;
+		group: ContainerGroup;
+		rootGroup: ContainerGroup;
+		handle: string;
+		target: JQuery;
+		itemDimensions: Dimensions[];
+		items: HTMLElement[];
+	}
+
+
+	type GenericEventHandler = ($item?: JQuery, container?: Container, _super?: GenericEventHandler, event?: Event) => void;
+	type OnDragEventHandler = ($item?: JQuery, position?: Position, _super?: OnDragEventHandler, event?: Event) => void;
+	type OnMousedownHandler = ($item?: JQuery, _super?: OnMousedownHandler, event?: Event) => void;
+	type OnCancelHandler = ($item?: JQuery, container?: Container, _super?: OnCancelHandler, event?: Event) => void;
+
+	// Deliberately typing $children as an any here as it makes it much easier to use. Actual type is JQuery | any[]
+	type SerializeFunc = ($parent: JQuery, $children: any, parentIsContainer: boolean) => void;
+
+	interface GroupOptions {
+		afterMove?: ($placeholder: JQuery, container: Container, $closestItemOrContainer: JQuery) => void;
+		containerPath?: string;
+		containerSelector?: string;
+		distance?: number;
+		delay?: number;
+		handle?: string;
+		itemPath?: string;
+		itemSelector?: string;
+		isValidTarget?: ($item: JQuery, container: Container) => boolean;
+		onCancel?: OnCancelHandler;
+		onDrag?: OnDragEventHandler;
+		onDragStart?: GenericEventHandler;
+		onDrop?: GenericEventHandler;
+		onMousedown?: OnMousedownHandler;
+		placeholder?: JQuery | any[] | Element | string;
+		pullPlaceholder?: boolean;
+		serialize?: SerializeFunc;
+		tolerance?: number;
+	}
+
+
+	interface ContainerOptions {
+		drag?: boolean;
+		drop?: boolean;
+		exclude?: string;
+		nested?: boolean;
+		vertical?: boolean;
+	}
+
+	interface Options extends GroupOptions, ContainerOptions {
+		group?: string;
+	}
+}
+
+interface JQuery {
+	sortable(methodName: 'enable'): JQuery;
+	sortable(methodName: 'disable'): JQuery;
+	sortable(methodName: 'refresh'): JQuery;
+	sortable(methodName: 'destroy'): JQuery;
+	sortable(methodName: 'serialize'): JQuery;
+	sortable(methodName: string): JQuery;
+	sortable(options?: JQuerySortable.Options): JQuery;
+}
diff --git a/jquery-sortable/jquery-sortable-tests.ts b/jquery-sortable/jquery-sortable-tests.ts
index defb44e429..84f07ccf42 100644
--- a/jquery-sortable/jquery-sortable-tests.ts
+++ b/jquery-sortable/jquery-sortable-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jquery-sortable.d.ts" />
+
 
 
 /**
diff --git a/jquery-sortable/jquery-sortable.d.ts b/jquery-sortable/jquery-sortable.d.ts
deleted file mode 100644
index b59516f854..0000000000
--- a/jquery-sortable/jquery-sortable.d.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-// Type definitions for jQuery Sortable v0.9.12
-// Project: http://johnny.github.io/jquery-sortable/
-// Definitions by: Nathan Pitman <https://github.com/Seltzer>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace JQuerySortable {
-
-	interface Position {
-		top: number;
-		left: number;
-	}
-
-	type Dimensions = number[];
-
-	interface ContainerGroup {
-		$document: JQuery;
-		containerDimensions: Dimensions[]
-		containers: Container[];
-		delayMet: boolean;
-		dragInitDone: boolean;
-		dragProxy: any;
-		dragging: boolean;
-		dropProxy: any;
-		item: JQuery;
-		itemContainer: Container;
-		lastAppendedItem: JQuery;
-		lastPointer: Position;
-		lastRelativePointer: Position;
-		offsetParent: JQuery;
-		options: Options;
-		placeholder: JQuery;
-		pointer: Position;
-		relativePointer: Position;
-		sameResultBox: { bottom: number; left: number; right: number; top: number; };
-		scrollProxy: any;
-	}
-
-	interface Container {
-		el: JQuery;
-		options: Options;
-		group: ContainerGroup;
-		rootGroup: ContainerGroup;
-		handle: string;
-		target: JQuery;
-		itemDimensions: Dimensions[];
-		items: HTMLElement[];
-	}
-
-
-	type GenericEventHandler = ($item?: JQuery, container?: Container, _super?: GenericEventHandler, event?: Event) => void;
-	type OnDragEventHandler = ($item?: JQuery, position?: Position, _super?: OnDragEventHandler, event?: Event) => void;
-	type OnMousedownHandler = ($item?: JQuery, _super?: OnMousedownHandler, event?: Event) => void;
-	type OnCancelHandler = ($item?: JQuery, container?: Container, _super?: OnCancelHandler, event?: Event) => void;
-
-	// Deliberately typing $children as an any here as it makes it much easier to use. Actual type is JQuery | any[]
-	type SerializeFunc = ($parent: JQuery, $children: any, parentIsContainer: boolean) => void;
-
-	interface GroupOptions {
-		afterMove?: ($placeholder: JQuery, container: Container, $closestItemOrContainer: JQuery) => void;
-		containerPath?: string;
-		containerSelector?: string;
-		distance?: number;
-		delay?: number;
-		handle?: string;
-		itemPath?: string;
-		itemSelector?: string;
-		isValidTarget?: ($item: JQuery, container: Container) => boolean;
-		onCancel?: OnCancelHandler;
-		onDrag?: OnDragEventHandler;
-		onDragStart?: GenericEventHandler;
-		onDrop?: GenericEventHandler;
-		onMousedown?: OnMousedownHandler;
-		placeholder?: JQuery | any[] | Element | string;
-		pullPlaceholder?: boolean;
-		serialize?: SerializeFunc;
-		tolerance?: number;
-	}
-
-
-	interface ContainerOptions {
-		drag?: boolean;
-		drop?: boolean;
-		exclude?: string;
-		nested?: boolean;
-		vertical?: boolean;
-	}
-
-	interface Options extends GroupOptions, ContainerOptions {
-		group?: string;
-	}
-}
-
-interface JQuery {
-	sortable(methodName: 'enable'): JQuery;
-	sortable(methodName: 'disable'): JQuery;
-	sortable(methodName: 'refresh'): JQuery;
-	sortable(methodName: 'destroy'): JQuery;
-	sortable(methodName: 'serialize'): JQuery;
-	sortable(methodName: string): JQuery;
-	sortable(options?: JQuerySortable.Options): JQuery;
-}
diff --git a/jquery-sortable/tsconfig.json b/jquery-sortable/tsconfig.json
new file mode 100644
index 0000000000..3ce3dfd6bd
--- /dev/null
+++ b/jquery-sortable/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-sortable-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery-timeentry/index.d.ts b/jquery-timeentry/index.d.ts
new file mode 100644
index 0000000000..1ba12a40d6
--- /dev/null
+++ b/jquery-timeentry/index.d.ts
@@ -0,0 +1,212 @@
+// Type definitions for jQuery-timeentry.js 2.0.1
+// Project: https://github.com/kbwood/timeentry
+// Definitions by: Mark Nadig <https://github.com/marknadig>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface ITimeEntryRegionalOptions {
+    /**
+     * Indicate whether to use 12-hour (false) or 24-hour (true) time. This is one of the regional settings fields.
+     *
+     * default: False
+     */
+    show24Hours?: boolean;
+    /**
+     * The separator between time portions. This is one of the regional settings fields.
+     *
+     * default: ':'
+     */
+    separator?: string;
+    /**
+     * The text that separates the time from the AM and PM indicators. This is one of the regional settings fields.
+     *
+     * default: ''
+     */
+    ampmPrefix?: string;
+    /**
+     * The AM and PM display text. This is one of the regional settings fields.
+     *
+     * default: ['AM','PM']
+     */
+    ampmNames?: string[];
+    /**
+     * The tooltip text for the spinner buttons. This is one of the regional settings fields.
+     *
+     * default: ['Now', 'Previous field', 'Next field', 'Increment', 'Decrement']
+     */
+    spinnerTexts?: string[];
+}
+
+interface ITimeEntryOptions extends ITimeEntryRegionalOptions {
+    /**
+     * Indicate whether or not the seconds part of the time should be displayed.
+     *
+     * default: False
+     */
+    showSeconds?: boolean;
+    /**
+     * Indicate whether to restrict hours to just those in one day (false) or to allow for any value for hours (true).
+     *
+     * default: false
+     */
+    unlimitedHours?: boolean;
+    /**
+     * Add content to display after each time field. This may contain HTML markup.
+     *
+     * default: ''
+     */
+    appendText?: string;
+    /**
+     * The increment/decrement values for each of the time portions - hours, minutes, and seconds.
+     * Use this to constrain the portions, e.g. [1, 15, 0] restricts the times to quarter hours.
+     *
+     * default: [1,1,1]
+     */
+    timeSteps?: number[];
+    /**
+     * The number of the portion of the time field to highlight initially.
+     * Use 0 for hours, 1 for minutes, etc., or null for the user selection.
+     *
+     * default: null
+     */
+    initialField?: number;
+    /**
+     * Set to true to allow direct entry of a time from the keyboard without needing to type separators,
+     * i.e. the field moves on after two digits.
+     *
+     * default: false
+     */
+    noSeparatorEntry?: boolean;
+    /**
+     * true to have the tab key exit this field and move to the next one, or false to have the tab key step
+     * through the date subfields.
+     *
+     * default: false
+     */
+    tabToExit?: boolean;
+    /**
+     * Set to true to use the mouse wheel for increment/decrement if possible, or false to never use it.
+     *
+     * default: true
+     */
+    useMouseWheel?: boolean;
+    /**
+     * The default time to show when no other value has been entered. This may be a Date object
+     * (but the year/month/day values are ignored), a string in the current time format, a numeric
+     * value as seconds offset from now, or a string value indicating a number and units, e.g. '+2h'.
+     * In the latter case, use 'h' for hours, 'm' for minutes, or 's' for seconds. Letters may be upper
+     * or lower case. Multiple offsets may be combined into one setting, e.g. '-2h -20m'. Prefix with '!'
+     * to prevent a wrap around into another day. Leave as null to default to the current time.
+     *
+     * default: null
+     */
+    defaultTime?: Date | number | string;
+    /**
+     * The minimum time that may be selected, or null for no limit. See defaultTime for a description
+     * of the possible formats. Use an array of number for hours, minutes, seconds in conjunction with unlimitedHours.
+     *
+     * default: null
+     */
+    minTime?: Date | number | number[] | string;
+    /**
+     * The maximum time that may be selected, or null for no limit. See defaultTime for a description of the possible
+     * formats. Use an array of number for hours, minutes, seconds in conjunction with unlimitedHours.
+     *
+     * Note that the maxTime may be set to less than the minTime in which case the entered time is restricted to
+     * the period between the minimum and the maximum on the "next day".
+     *
+     * default: null
+     */
+    maxTime?: Date | number | number[] | string;
+    /**
+     * The URL for the spinner images to use, or '' for no spinner. The file must contain seven images horizontally
+     * for the normal view, then for each "button" pressed (now, previous, next, increment, and decrement), and,
+     * finally, the disabled view.
+     *
+     * default: 'spinnerDefault.png'
+     */
+    spinnerImage?: string;
+    /**
+     * The dimensions of the spinner image for determining which "button" was clicked. The first two values are the
+     * width and height of the individual images, the third is the size of the central button for setting the current
+     * time, or 0 for no central button.
+     *
+     * default: [20, 20, 8]
+     */
+    spinnerSize?: number[];
+    /**
+     * The URL for an expanded spinner image to use, or '' for no expansion. The layout is the same as for
+     * spinnerImage but should be a larger size. The expanded spinner appears when the user hovers over the
+     * original spinner and disappears when they move off it.
+     *
+     * default: ''
+     */
+    spinnerBigImage?: string;
+    /**
+     * The dimensions of the expanded spinner image for determining which "button" was clicked. The first two values
+     * are the width and height of the individual images, the third is the size of the central button for setting the
+     * current time, or 0 for no central button.
+     *
+     * default: [40, 40, 16]
+     */
+    spinnerBigSize?: number[];
+    /**
+     * Set to true to have only the increment and decrement buttons on the spinner, or false for all the buttons.
+     *
+     * default: false
+     */
+    spinnerIncDecOnly?: boolean;
+    /**
+     * The times in milliseconds for the auto-repeat feature on the increment and decrement spinner buttons.
+     * The first value is the initial delay and the second one is the subsequent delay. Hold the mouse button down
+     * on these spinner buttons to trigger this feature. Use [0, 0] to disable the auto-repeat.
+     *
+     * default: [500, 250]
+     */
+    spinnerRepeat?: number[];
+    /**
+     * A function that accepts an input field and returns a settings object containing new settings for the time
+     * entry for this field. For example, you can use it to set up a time range wherein both fields restrict the
+     * possible values of the other field. this refers to the input field as well. Leave as null for no per-field
+     * customisation.
+     *
+     * default: null
+     */
+    beforeShow?: Function;
+    /**
+     * A function that accepts the old and new times, and minimum and maximum times, and returns an updated time.
+     * This refers to the associated input field. This call is made just before the time is updated into the field
+     * allowing for additional restrictions to be applied. Leave as null for no additional restrictions.
+     *
+     * default: null
+     */
+    beforeSetTime?: Function;
+}
+
+interface ITimeEntry {
+    /**
+     * initialize TimeEntry plugin
+     */
+    (configOrFnName?: ITimeEntryOptions | string, nameOrOption?: any, value?: any): any; // functions accessed with string key :/
+}
+
+interface ITimeEntryLocales {
+    [index: string]: ITimeEntryRegionalOptions;
+}
+
+interface ITimeEntryStatic {
+    regionalOptions: ITimeEntryLocales;
+    setDefaults(settings: ITimeEntryOptions): void;
+}
+
+interface JQuery {
+    /**
+     * initialize TimeEntry plugin
+     */
+    timeEntry: ITimeEntry;
+}
+
+interface JQueryStatic {
+    timeEntry: ITimeEntryStatic;
+}
diff --git a/jquery-timeentry/jquery-timeentry-tests.ts b/jquery-timeentry/jquery-timeentry-tests.ts
index b7f541fb15..ccfe0794a3 100644
--- a/jquery-timeentry/jquery-timeentry-tests.ts
+++ b/jquery-timeentry/jquery-timeentry-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery-timeentry.d.ts"/>
+/// <reference types="jquery"/>
 
 var selector = '#example';
 
diff --git a/jquery-timeentry/jquery-timeentry.d.ts b/jquery-timeentry/jquery-timeentry.d.ts
deleted file mode 100644
index 4f676a67a8..0000000000
--- a/jquery-timeentry/jquery-timeentry.d.ts
+++ /dev/null
@@ -1,212 +0,0 @@
-// Type definitions for jQuery-timeentry.js 2.0.1
-// Project: https://github.com/kbwood/timeentry
-// Definitions by: Mark Nadig <https://github.com/marknadig>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface ITimeEntryRegionalOptions {
-    /**
-     * Indicate whether to use 12-hour (false) or 24-hour (true) time. This is one of the regional settings fields.
-     *
-     * default: False
-     */
-    show24Hours?: boolean;
-    /**
-     * The separator between time portions. This is one of the regional settings fields.
-     *
-     * default: ':'
-     */
-    separator?: string;
-    /**
-     * The text that separates the time from the AM and PM indicators. This is one of the regional settings fields.
-     *
-     * default: ''
-     */
-    ampmPrefix?: string;
-    /**
-     * The AM and PM display text. This is one of the regional settings fields.
-     *
-     * default: ['AM','PM']
-     */
-    ampmNames?: string[];
-    /**
-     * The tooltip text for the spinner buttons. This is one of the regional settings fields.
-     *
-     * default: ['Now', 'Previous field', 'Next field', 'Increment', 'Decrement']
-     */
-    spinnerTexts?: string[];
-}
-
-interface ITimeEntryOptions extends ITimeEntryRegionalOptions {
-    /**
-     * Indicate whether or not the seconds part of the time should be displayed.
-     *
-     * default: False
-     */
-    showSeconds?: boolean;
-    /**
-     * Indicate whether to restrict hours to just those in one day (false) or to allow for any value for hours (true).
-     *
-     * default: false
-     */
-    unlimitedHours?: boolean;
-    /**
-     * Add content to display after each time field. This may contain HTML markup.
-     *
-     * default: ''
-     */
-    appendText?: string;
-    /**
-     * The increment/decrement values for each of the time portions - hours, minutes, and seconds.
-     * Use this to constrain the portions, e.g. [1, 15, 0] restricts the times to quarter hours.
-     *
-     * default: [1,1,1]
-     */
-    timeSteps?: number[];
-    /**
-     * The number of the portion of the time field to highlight initially.
-     * Use 0 for hours, 1 for minutes, etc., or null for the user selection.
-     *
-     * default: null
-     */
-    initialField?: number;
-    /**
-     * Set to true to allow direct entry of a time from the keyboard without needing to type separators,
-     * i.e. the field moves on after two digits.
-     *
-     * default: false
-     */
-    noSeparatorEntry?: boolean;
-    /**
-     * true to have the tab key exit this field and move to the next one, or false to have the tab key step
-     * through the date subfields.
-     *
-     * default: false
-     */
-    tabToExit?: boolean;
-    /**
-     * Set to true to use the mouse wheel for increment/decrement if possible, or false to never use it.
-     *
-     * default: true
-     */
-    useMouseWheel?: boolean;
-    /**
-     * The default time to show when no other value has been entered. This may be a Date object
-     * (but the year/month/day values are ignored), a string in the current time format, a numeric
-     * value as seconds offset from now, or a string value indicating a number and units, e.g. '+2h'.
-     * In the latter case, use 'h' for hours, 'm' for minutes, or 's' for seconds. Letters may be upper
-     * or lower case. Multiple offsets may be combined into one setting, e.g. '-2h -20m'. Prefix with '!'
-     * to prevent a wrap around into another day. Leave as null to default to the current time.
-     *
-     * default: null
-     */
-    defaultTime?: Date | number | string;
-    /**
-     * The minimum time that may be selected, or null for no limit. See defaultTime for a description
-     * of the possible formats. Use an array of number for hours, minutes, seconds in conjunction with unlimitedHours.
-     *
-     * default: null
-     */
-    minTime?: Date | number | number[] | string;
-    /**
-     * The maximum time that may be selected, or null for no limit. See defaultTime for a description of the possible
-     * formats. Use an array of number for hours, minutes, seconds in conjunction with unlimitedHours.
-     *
-     * Note that the maxTime may be set to less than the minTime in which case the entered time is restricted to
-     * the period between the minimum and the maximum on the "next day".
-     *
-     * default: null
-     */
-    maxTime?: Date | number | number[] | string;
-    /**
-     * The URL for the spinner images to use, or '' for no spinner. The file must contain seven images horizontally
-     * for the normal view, then for each "button" pressed (now, previous, next, increment, and decrement), and,
-     * finally, the disabled view.
-     *
-     * default: 'spinnerDefault.png'
-     */
-    spinnerImage?: string;
-    /**
-     * The dimensions of the spinner image for determining which "button" was clicked. The first two values are the
-     * width and height of the individual images, the third is the size of the central button for setting the current
-     * time, or 0 for no central button.
-     *
-     * default: [20, 20, 8]
-     */
-    spinnerSize?: number[];
-    /**
-     * The URL for an expanded spinner image to use, or '' for no expansion. The layout is the same as for
-     * spinnerImage but should be a larger size. The expanded spinner appears when the user hovers over the
-     * original spinner and disappears when they move off it.
-     *
-     * default: ''
-     */
-    spinnerBigImage?: string;
-    /**
-     * The dimensions of the expanded spinner image for determining which "button" was clicked. The first two values
-     * are the width and height of the individual images, the third is the size of the central button for setting the
-     * current time, or 0 for no central button.
-     *
-     * default: [40, 40, 16]
-     */
-    spinnerBigSize?: number[];
-    /**
-     * Set to true to have only the increment and decrement buttons on the spinner, or false for all the buttons.
-     *
-     * default: false
-     */
-    spinnerIncDecOnly?: boolean;
-    /**
-     * The times in milliseconds for the auto-repeat feature on the increment and decrement spinner buttons.
-     * The first value is the initial delay and the second one is the subsequent delay. Hold the mouse button down
-     * on these spinner buttons to trigger this feature. Use [0, 0] to disable the auto-repeat.
-     *
-     * default: [500, 250]
-     */
-    spinnerRepeat?: number[];
-    /**
-     * A function that accepts an input field and returns a settings object containing new settings for the time
-     * entry for this field. For example, you can use it to set up a time range wherein both fields restrict the
-     * possible values of the other field. this refers to the input field as well. Leave as null for no per-field
-     * customisation.
-     *
-     * default: null
-     */
-    beforeShow?: Function;
-    /**
-     * A function that accepts the old and new times, and minimum and maximum times, and returns an updated time.
-     * This refers to the associated input field. This call is made just before the time is updated into the field
-     * allowing for additional restrictions to be applied. Leave as null for no additional restrictions.
-     *
-     * default: null
-     */
-    beforeSetTime?: Function;
-}
-
-interface ITimeEntry {
-    /**
-     * initialize TimeEntry plugin
-     */
-    (configOrFnName?: ITimeEntryOptions | string, nameOrOption?: any, value?: any): any; // functions accessed with string key :/
-}
-
-interface ITimeEntryLocales {
-    [index: string]: ITimeEntryRegionalOptions;
-}
-
-interface ITimeEntryStatic {
-    regionalOptions: ITimeEntryLocales;
-    setDefaults(settings: ITimeEntryOptions): void;
-}
-
-interface JQuery {
-    /**
-     * initialize TimeEntry plugin
-     */
-    timeEntry: ITimeEntry;
-}
-
-interface JQueryStatic {
-    timeEntry: ITimeEntryStatic;
-}
diff --git a/jquery-timeentry/tsconfig.json b/jquery-timeentry/tsconfig.json
new file mode 100644
index 0000000000..89393fbca3
--- /dev/null
+++ b/jquery-timeentry/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-timeentry-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery-urlparam/index.d.ts b/jquery-urlparam/index.d.ts
new file mode 100644
index 0000000000..496bb2f26c
--- /dev/null
+++ b/jquery-urlparam/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for jquery-urlparam
+// Project: https://gist.github.com/stpettersens/e1f4478f299b6f4905c1
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface JQueryStatic {
+	urlParam(variable: string): string;
+}
diff --git a/jquery-urlparam/jquery-urlparam-tests.ts b/jquery-urlparam/jquery-urlparam-tests.ts
index 5ad4d26d5f..a8ca144bb3 100644
--- a/jquery-urlparam/jquery-urlparam-tests.ts
+++ b/jquery-urlparam/jquery-urlparam-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="jquery-urlparam.d.ts" />
+/// <reference types="jquery" />
+
 
 console.log($.urlParam('variable'));
diff --git a/jquery-urlparam/jquery-urlparam.d.ts b/jquery-urlparam/jquery-urlparam.d.ts
deleted file mode 100644
index 484b3afad6..0000000000
--- a/jquery-urlparam/jquery-urlparam.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Type definitions for jquery-urlparam
-// Project: https://gist.github.com/stpettersens/e1f4478f299b6f4905c1
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface JQueryStatic {
-	urlParam(variable: string): string;
-}
diff --git a/jquery-urlparam/tsconfig.json b/jquery-urlparam/tsconfig.json
new file mode 100644
index 0000000000..af9229ff29
--- /dev/null
+++ b/jquery-urlparam/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-urlparam-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery-validation-unobtrusive/index.d.ts b/jquery-validation-unobtrusive/index.d.ts
new file mode 100644
index 0000000000..a19f2a4990
--- /dev/null
+++ b/jquery-validation-unobtrusive/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for Microsoft jQuery Unobtrusive Validation v3.2.3
+// Project: http://aspnetwebstack.codeplex.com/
+// Definitions by: Matt Brooks <https://github.com/EnableSoftware>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery.validation" />
+
+declare namespace MicrosoftJQueryUnobtrusiveValidation {
+    type JQuerySelector = string | Document | Element | JQuery;
+
+    interface Adapter {
+        name: string;
+        params: string[];
+        adapt: Function
+    }
+
+    interface Adapters extends Array<Adapter> {
+        add(adapterName: string, fn: Function): Adapters;
+        add(adapterName: string, params: string[], fn: Function): Adapters;
+        addMinMax(adapterName: string, minRuleName: string, maxRuleName: string, minMaxRuleName: string, minAttribute?: string, maxAttribute?: string): Adapters;
+        addSingleVal(adapterName: string, ruleName: string): Adapters;
+        addSingleVal(adapterName: string, attribute: string, ruleName: string): Adapters;
+        addBool(adapterName: string, ruleName?: string): Adapters;
+        addMethod(adapterName: string, fn: (value: string, element: Element, params: any) => any): Adapters;
+    }
+
+    interface Validator {
+        adapters: Adapters;
+        parseElement(element: JQuerySelector, skipAttach?: boolean): void;
+        parse(selector: JQuerySelector): void;
+    }
+}
+
+declare namespace JQueryValidation {
+    interface ValidatorStatic {
+        unobtrusive: MicrosoftJQueryUnobtrusiveValidation.Validator;
+    }
+}
diff --git a/jquery-validation-unobtrusive/jquery-validation-unobtrusive-tests.ts b/jquery-validation-unobtrusive/jquery-validation-unobtrusive-tests.ts
index 96ccbe325a..ac57a4130a 100644
--- a/jquery-validation-unobtrusive/jquery-validation-unobtrusive-tests.ts
+++ b/jquery-validation-unobtrusive/jquery-validation-unobtrusive-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jquery-validation-unobtrusive.d.ts" />
+
 
 // Test overloads for `add` method
 $.validator.unobtrusive.adapters.add("adapter", () => { });
diff --git a/jquery-validation-unobtrusive/jquery-validation-unobtrusive.d.ts b/jquery-validation-unobtrusive/jquery-validation-unobtrusive.d.ts
deleted file mode 100644
index fcc3bac9da..0000000000
--- a/jquery-validation-unobtrusive/jquery-validation-unobtrusive.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// Type definitions for Microsoft jQuery Unobtrusive Validation v3.2.3
-// Project: http://aspnetwebstack.codeplex.com/
-// Definitions by: Matt Brooks <https://github.com/EnableSoftware>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery.validation/jquery.validation.d.ts" />
-
-declare namespace MicrosoftJQueryUnobtrusiveValidation {
-    type JQuerySelector = string | Document | Element | JQuery;
-
-    interface Adapter {
-        name: string;
-        params: string[];
-        adapt: Function
-    }
-
-    interface Adapters extends Array<Adapter> {
-        add(adapterName: string, fn: Function): Adapters;
-        add(adapterName: string, params: string[], fn: Function): Adapters;
-        addMinMax(adapterName: string, minRuleName: string, maxRuleName: string, minMaxRuleName: string, minAttribute?: string, maxAttribute?: string): Adapters;
-        addSingleVal(adapterName: string, ruleName: string): Adapters;
-        addSingleVal(adapterName: string, attribute: string, ruleName: string): Adapters;
-        addBool(adapterName: string, ruleName?: string): Adapters;
-        addMethod(adapterName: string, fn: (value: string, element: Element, params: any) => any): Adapters;
-    }
-
-    interface Validator {
-        adapters: Adapters;
-        parseElement(element: JQuerySelector, skipAttach?: boolean): void;
-        parse(selector: JQuerySelector): void;
-    }
-}
-
-declare namespace JQueryValidation {
-    interface ValidatorStatic {
-        unobtrusive: MicrosoftJQueryUnobtrusiveValidation.Validator;
-    }
-}
diff --git a/jquery-validation-unobtrusive/tsconfig.json b/jquery-validation-unobtrusive/tsconfig.json
new file mode 100644
index 0000000000..bb5e896dcd
--- /dev/null
+++ b/jquery-validation-unobtrusive/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-validation-unobtrusive-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.address/index.d.ts b/jquery.address/index.d.ts
new file mode 100644
index 0000000000..3c0003b8ca
--- /dev/null
+++ b/jquery.address/index.d.ts
@@ -0,0 +1,179 @@
+// Type definitions for jQuery.Address 1.5
+// Project: https://github.com/asual/jquery-address
+// Definitions by: Martin Duparc <https://github.com/martinduparc>, Tim Klingeleers <https://github.com/mardaneus86>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/
+
+/// <reference types="jquery" />
+
+interface JQueryAddressStatic {
+    (): any;
+    /**
+     * Binds any supported event type to a function with support for an optional map of data.
+     */
+    bind(type: any, data: any, callback: Function): JQueryAddressStatic;
+    /**
+     * Binds a function to be executed whenever the address is changed. 
+     * The function receives a single event object parameter that contains the following properties: 
+     * value, path, pathNames, parameterNames, parameters and queryString.
+     */
+    change(callback: Function): JQueryAddressStatic;
+    /**
+     * Binds a function to be executed once when the address is initiated. 
+     * The function receives a single event object parameter that contains the following properties: 
+     * value, path, pathNames, parameterNames, parameters and queryString.
+     */
+    init(callback: Function): JQueryAddressStatic;
+    /**
+     * Binds a function to be executed when the address is changed from inside the page that uses the plugin. 
+     * The function receives a single event object parameter that contains the following properties: 
+     * value, path, pathNames, parameterNames, parameters and queryString.
+     */
+    internalChange(eventhandler: Function): JQueryAddressStatic;
+    /**
+     * Binds a function to be executed when the address is changed from the browser usually when entering the page or using the back and forward buttons. 
+     * The function receives a single event object parameter that contains the following properties: 
+     * value, path, pathNames, parameterNames, parameters and queryString.
+     */
+    externalChange(eventhandler: Function): JQueryAddressStatic;
+    /**
+     * Provides the base address of the document.
+     */
+    baseURL(): string;
+    /**
+     * Provides the state of the auto update mode. Enabled by default.
+     */
+    autoUpdate(): boolean;
+    /**
+     * Enables or disables the auto update mode which can be turned off when multiple parameters values have to be changed at once.
+     */
+    autoUpdate(value: boolean): JQueryAddressStatic;
+    /**
+     * Provides the state of the crawling mode. Disables by default.
+     */
+    crawlable(): boolean;
+    /**
+     * Enables or disables the crawling mode which will automatically convert the values into a Google Ajax Crawling friendly format.
+     */
+    crawlable(value: boolean): JQueryAddressStatic;
+    /**
+     * Provides the hash fragment part of the deep linking value.
+     */
+    hash(): string;
+    /**
+     * Sets the hash fragment part of the deep linking value.
+     */
+    hash(value: string): JQueryAddressStatic;
+    /**
+     * Provides the state of the history mode setting. Enabled by default.
+     */
+    history(): boolean;
+    /**
+     * Enables or disables the history mode which generated entries in the browser history.
+     */
+    history(value: boolean): void;
+    /**
+     * Provides the value of a specific query parameter.
+     */
+    parameter(name: string): string;
+    /**
+     * Sets a query parameter value. Appending is disabled by default but can be enabled for array values.
+     */
+    parameter(name: string, value: string, append: boolean): JQueryAddressStatic;
+    /**
+     * Provides a list of all the query parameter names.
+     */
+    parameterNames(): Array<string>;
+    /**
+     * Provides the deep linking value without the query string and the hash fragment.
+     */
+    path(): string;
+    /**
+     * Sets the deep linking value without the query string and the hash fragment.
+     */
+    path(value: string): JQueryAddressStatic;
+    /**
+     * Provides a list of all the folders in the deep linking path.
+     */
+    pathNames(): Array<string>;
+    /**
+     * Provides the query string part of the deep linking value.
+     */
+    queryString(): string;
+    /**
+     * Sets the query string part of the deep linking value.
+     */
+    queryString(value: string): JQueryAddressStatic;
+    /**
+     * Provides the value used as a base path for the HTML5 state management.
+     */
+    state(): string;
+    /**
+     * Sets the base path of the website that is utilized in HTML5 state management.
+     */
+    state(value: string): JQueryAddressStatic;
+    /**
+     * Provides the state of the strict mode setting. Enabled by default.
+     */
+    strict(): boolean;
+    /**
+     * Enables or disables the strict mode which automatically appends a slash in the beginning of the deep linking value.
+     */
+    strict(value: boolean): JQueryAddressStatic;
+    /**
+     * Provides the title of the HTML document.
+     */
+    title(): string;
+    /**
+     * Sets the title of the HTML document.
+     */
+    title(value: string): JQueryAddressStatic;
+    /**
+     * Provides the currently set page view tracking function.
+     */
+    tracker(): any;
+    /**
+     * Sets a function for page view tracking. Google Analytics tracking is automatically invoked if it exists in the page.
+     */
+    tracker(value: Function): JQueryAddressStatic;
+    /**
+     * Provides the current deep linking value.
+     */
+    value(): string;
+    /**
+     * Sets the current deep linking value.
+     */
+    value(url: string): JQueryAddressStatic;
+    /**
+     * Updates the value when auto updating is disabled.
+     */
+    update(): JQueryAddressStatic;
+    /**
+     * Provides the state of the wrap mode. Disabled by default.
+     */
+    wrap(): boolean;
+    /**
+     * Enables or disables the wrap mode which generates a DIV wrapper around the page content and fixes any scroll issues caused by the use of hash fragments.
+     */
+    wrap(value: boolean): JQueryAddressStatic;
+}
+
+interface JQueryAddress {
+    /**
+     * Adds the plugin functionality to a DOM element and disables the default behavior. Designed primarily to support links and forms. 
+     * Accepts an optional function parameter that allows custom processing of the deep link value.
+     */
+    (): JQuery;
+    /**
+     * Adds the plugin functionality to a DOM element and disables the default behavior. Designed primarily to support links and forms. 
+     * Accepts an optional function parameter that allows custom processing of the deep link value.
+     */
+    (fn: Function): JQuery;
+}
+
+interface JQueryStatic {
+    address: JQueryAddressStatic;
+}
+
+interface JQuery {
+    address: JQueryAddress;
+}
diff --git a/jquery.address/jquery.address.d.ts b/jquery.address/jquery.address.d.ts
deleted file mode 100644
index 0e6b6f828b..0000000000
--- a/jquery.address/jquery.address.d.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-// Type definitions for jQuery.Address 1.5
-// Project: https://github.com/asual/jquery-address
-// Definitions by: Martin Duparc <https://github.com/martinduparc>, Tim Klingeleers <https://github.com/mardaneus86>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface JQueryAddressStatic {
-    (): any;
-    /**
-     * Binds any supported event type to a function with support for an optional map of data.
-     */
-    bind(type: any, data: any, callback: Function): JQueryAddressStatic;
-    /**
-     * Binds a function to be executed whenever the address is changed. 
-     * The function receives a single event object parameter that contains the following properties: 
-     * value, path, pathNames, parameterNames, parameters and queryString.
-     */
-    change(callback: Function): JQueryAddressStatic;
-    /**
-     * Binds a function to be executed once when the address is initiated. 
-     * The function receives a single event object parameter that contains the following properties: 
-     * value, path, pathNames, parameterNames, parameters and queryString.
-     */
-    init(callback: Function): JQueryAddressStatic;
-    /**
-     * Binds a function to be executed when the address is changed from inside the page that uses the plugin. 
-     * The function receives a single event object parameter that contains the following properties: 
-     * value, path, pathNames, parameterNames, parameters and queryString.
-     */
-    internalChange(eventhandler: Function): JQueryAddressStatic;
-    /**
-     * Binds a function to be executed when the address is changed from the browser usually when entering the page or using the back and forward buttons. 
-     * The function receives a single event object parameter that contains the following properties: 
-     * value, path, pathNames, parameterNames, parameters and queryString.
-     */
-    externalChange(eventhandler: Function): JQueryAddressStatic;
-    /**
-     * Provides the base address of the document.
-     */
-    baseURL(): string;
-    /**
-     * Provides the state of the auto update mode. Enabled by default.
-     */
-    autoUpdate(): boolean;
-    /**
-     * Enables or disables the auto update mode which can be turned off when multiple parameters values have to be changed at once.
-     */
-    autoUpdate(value: boolean): JQueryAddressStatic;
-    /**
-     * Provides the state of the crawling mode. Disables by default.
-     */
-    crawlable(): boolean;
-    /**
-     * Enables or disables the crawling mode which will automatically convert the values into a Google Ajax Crawling friendly format.
-     */
-    crawlable(value: boolean): JQueryAddressStatic;
-    /**
-     * Provides the hash fragment part of the deep linking value.
-     */
-    hash(): string;
-    /**
-     * Sets the hash fragment part of the deep linking value.
-     */
-    hash(value: string): JQueryAddressStatic;
-    /**
-     * Provides the state of the history mode setting. Enabled by default.
-     */
-    history(): boolean;
-    /**
-     * Enables or disables the history mode which generated entries in the browser history.
-     */
-    history(value: boolean): void;
-    /**
-     * Provides the value of a specific query parameter.
-     */
-    parameter(name: string): string;
-    /**
-     * Sets a query parameter value. Appending is disabled by default but can be enabled for array values.
-     */
-    parameter(name: string, value: string, append: boolean): JQueryAddressStatic;
-    /**
-     * Provides a list of all the query parameter names.
-     */
-    parameterNames(): Array<string>;
-    /**
-     * Provides the deep linking value without the query string and the hash fragment.
-     */
-    path(): string;
-    /**
-     * Sets the deep linking value without the query string and the hash fragment.
-     */
-    path(value: string): JQueryAddressStatic;
-    /**
-     * Provides a list of all the folders in the deep linking path.
-     */
-    pathNames(): Array<string>;
-    /**
-     * Provides the query string part of the deep linking value.
-     */
-    queryString(): string;
-    /**
-     * Sets the query string part of the deep linking value.
-     */
-    queryString(value: string): JQueryAddressStatic;
-    /**
-     * Provides the value used as a base path for the HTML5 state management.
-     */
-    state(): string;
-    /**
-     * Sets the base path of the website that is utilized in HTML5 state management.
-     */
-    state(value: string): JQueryAddressStatic;
-    /**
-     * Provides the state of the strict mode setting. Enabled by default.
-     */
-    strict(): boolean;
-    /**
-     * Enables or disables the strict mode which automatically appends a slash in the beginning of the deep linking value.
-     */
-    strict(value: boolean): JQueryAddressStatic;
-    /**
-     * Provides the title of the HTML document.
-     */
-    title(): string;
-    /**
-     * Sets the title of the HTML document.
-     */
-    title(value: string): JQueryAddressStatic;
-    /**
-     * Provides the currently set page view tracking function.
-     */
-    tracker(): any;
-    /**
-     * Sets a function for page view tracking. Google Analytics tracking is automatically invoked if it exists in the page.
-     */
-    tracker(value: Function): JQueryAddressStatic;
-    /**
-     * Provides the current deep linking value.
-     */
-    value(): string;
-    /**
-     * Sets the current deep linking value.
-     */
-    value(url: string): JQueryAddressStatic;
-    /**
-     * Updates the value when auto updating is disabled.
-     */
-    update(): JQueryAddressStatic;
-    /**
-     * Provides the state of the wrap mode. Disabled by default.
-     */
-    wrap(): boolean;
-    /**
-     * Enables or disables the wrap mode which generates a DIV wrapper around the page content and fixes any scroll issues caused by the use of hash fragments.
-     */
-    wrap(value: boolean): JQueryAddressStatic;
-}
-
-interface JQueryAddress {
-    /**
-     * Adds the plugin functionality to a DOM element and disables the default behavior. Designed primarily to support links and forms. 
-     * Accepts an optional function parameter that allows custom processing of the deep link value.
-     */
-    (): JQuery;
-    /**
-     * Adds the plugin functionality to a DOM element and disables the default behavior. Designed primarily to support links and forms. 
-     * Accepts an optional function parameter that allows custom processing of the deep link value.
-     */
-    (fn: Function): JQuery;
-}
-
-interface JQueryStatic {
-    address: JQueryAddressStatic;
-}
-
-interface JQuery {
-    address: JQueryAddress;
-}
diff --git a/jquery.address/tsconfig.json b/jquery.address/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/jquery.address/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.ajaxfile/index.d.ts b/jquery.ajaxfile/index.d.ts
new file mode 100644
index 0000000000..12ff53b389
--- /dev/null
+++ b/jquery.ajaxfile/index.d.ts
@@ -0,0 +1,116 @@
+// Type definitions for jquery.ajaxfile v0.2.0
+// Project: https://github.com/fpellet/jquery.ajaxFile
+// Definitions by: Florent PELLET <https://github.com/fpellet/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+/// <reference types="knockout" />
+
+declare namespace JQueryAjaxFile {
+	export enum DataType {
+		Json,
+		Xml,
+		Text
+	}
+
+	interface IFileData {
+		name: string;
+		element: HTMLInputElement;
+	}
+
+	interface IOption {
+		method?: string;
+		url?: string;
+
+		data?: any;
+		files?: IFileData[];
+		desiredResponseDataType?: DataType;
+
+		timeoutInSeconds?: number;
+	}
+
+	interface IResponseStatus {
+		code: number;
+		text: string;
+		isSuccess: boolean;
+	}
+
+	interface IAjaxFileResult<T> {
+		error?: any;
+		data?: any;
+		status?: IResponseStatus;
+	}
+
+	interface IAjaxFileResultCallback<T> {
+		(result: IAjaxFileResult<T>): void;
+	}
+
+	interface IAjaxFilePromise<T> {
+		then(success: IAjaxFileResultCallback<T>, error?: IAjaxFileResultCallback<T>): IAjaxFilePromise<T>;
+		done(success: IAjaxFileResultCallback<T>): IAjaxFilePromise<T>;
+		fail(error: IAjaxFileResultCallback<T>): IAjaxFilePromise<T>;
+		always(error: IAjaxFileResultCallback<T>): IAjaxFilePromise<T>;
+
+		abord(): void;
+	}
+
+	interface IAjaxFileStatic {
+		DataType: typeof DataType;
+		send<T>(option: IOption): IAjaxFilePromise<T>;
+	}
+	
+	interface IJQueryXHR {
+        readyState: any;
+        status: number;
+        statusText: string;
+        responseXML: Document;
+        responseText: string;
+        statusCode?: { [key: string]: any; };
+
+        abort(statusText?: string): void;
+
+        setRequestHeader(header: string, value: string): void;
+        getAllResponseHeaders(): string;
+        getResponseHeader(header: string): string;
+
+        beforeSend?(jqXHR: IJQueryXHR, settings: JQueryAjaxSettings): any;
+        dataFilter?(data: any, ty: any): any;
+        success?(data: any, textStatus: string, jqXHR: IJQueryXHR): any;
+        error?(jqXHR: IJQueryXHR, textStatus: string, errorThrown: string): any;
+        complete?(jqXHR: IJQueryXHR, textStatus: string): any;
+    }
+
+    interface IJQueryOption {
+        type?: string;
+        url?: string;
+
+        data?: any;
+        files?: IFileData[];
+        dataType?: string;
+
+        timeout?: number;
+
+        global?: boolean;
+
+        error?(jqXHR: IJQueryXHR, textStatus: string, errorThrown: string): any;
+        success?(data: any, textStatus: string, jqXHR: IJQueryXHR): any;
+        complete?(jqXHR: IJQueryXHR, textStatus: string): any;
+    }
+
+    interface IAjaxFileJQueryExtension {
+        ajaxWithFile<T>(jqueryOption: IJQueryOption): JQueryDeferred<T>;
+    }
+}
+
+declare var AjaxFile: JQueryAjaxFile.IAjaxFileStatic;
+
+declare namespace AjaxFileKnockout {
+    interface IFileInputWrapper {
+        getElement(): HTMLInputElement;
+        fileSelected(): boolean;
+    }
+}
+
+interface KnockoutBindingHandlers {
+    file: KnockoutBindingHandler;
+}
diff --git a/jquery.ajaxfile/jquery.ajaxFile-tests.ts b/jquery.ajaxfile/jquery.ajaxFile-tests.ts
index e5f82fb00a..364220325a 100644
--- a/jquery.ajaxfile/jquery.ajaxFile-tests.ts
+++ b/jquery.ajaxfile/jquery.ajaxFile-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="jquery.ajaxFile.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../knockout/knockout.d.ts" />
+
+/// <reference types="jquery" />
+/// <reference types="knockout" />
 
 function testRawApi(){
 	var inputElement:HTMLInputElement = null;
diff --git a/jquery.ajaxfile/jquery.ajaxFile.d.ts b/jquery.ajaxfile/jquery.ajaxFile.d.ts
deleted file mode 100644
index 269a41e2e1..0000000000
--- a/jquery.ajaxfile/jquery.ajaxFile.d.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-// Type definitions for jquery.ajaxfile v0.2.0
-// Project: https://github.com/fpellet/jquery.ajaxFile
-// Definitions by: Florent PELLET <https://github.com/fpellet/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../knockout/knockout.d.ts" />
-
-declare namespace JQueryAjaxFile {
-	export enum DataType {
-		Json,
-		Xml,
-		Text
-	}
-
-	interface IFileData {
-		name: string;
-		element: HTMLInputElement;
-	}
-
-	interface IOption {
-		method?: string;
-		url?: string;
-
-		data?: any;
-		files?: IFileData[];
-		desiredResponseDataType?: DataType;
-
-		timeoutInSeconds?: number;
-	}
-
-	interface IResponseStatus {
-		code: number;
-		text: string;
-		isSuccess: boolean;
-	}
-
-	interface IAjaxFileResult<T> {
-		error?: any;
-		data?: any;
-		status?: IResponseStatus;
-	}
-
-	interface IAjaxFileResultCallback<T> {
-		(result: IAjaxFileResult<T>): void;
-	}
-
-	interface IAjaxFilePromise<T> {
-		then(success: IAjaxFileResultCallback<T>, error?: IAjaxFileResultCallback<T>): IAjaxFilePromise<T>;
-		done(success: IAjaxFileResultCallback<T>): IAjaxFilePromise<T>;
-		fail(error: IAjaxFileResultCallback<T>): IAjaxFilePromise<T>;
-		always(error: IAjaxFileResultCallback<T>): IAjaxFilePromise<T>;
-
-		abord(): void;
-	}
-
-	interface IAjaxFileStatic {
-		DataType: typeof DataType;
-		send<T>(option: IOption): IAjaxFilePromise<T>;
-	}
-	
-	interface IJQueryXHR {
-        readyState: any;
-        status: number;
-        statusText: string;
-        responseXML: Document;
-        responseText: string;
-        statusCode?: { [key: string]: any; };
-
-        abort(statusText?: string): void;
-
-        setRequestHeader(header: string, value: string): void;
-        getAllResponseHeaders(): string;
-        getResponseHeader(header: string): string;
-
-        beforeSend?(jqXHR: IJQueryXHR, settings: JQueryAjaxSettings): any;
-        dataFilter?(data: any, ty: any): any;
-        success?(data: any, textStatus: string, jqXHR: IJQueryXHR): any;
-        error?(jqXHR: IJQueryXHR, textStatus: string, errorThrown: string): any;
-        complete?(jqXHR: IJQueryXHR, textStatus: string): any;
-    }
-
-    interface IJQueryOption {
-        type?: string;
-        url?: string;
-
-        data?: any;
-        files?: IFileData[];
-        dataType?: string;
-
-        timeout?: number;
-
-        global?: boolean;
-
-        error?(jqXHR: IJQueryXHR, textStatus: string, errorThrown: string): any;
-        success?(data: any, textStatus: string, jqXHR: IJQueryXHR): any;
-        complete?(jqXHR: IJQueryXHR, textStatus: string): any;
-    }
-
-    interface IAjaxFileJQueryExtension {
-        ajaxWithFile<T>(jqueryOption: IJQueryOption): JQueryDeferred<T>;
-    }
-}
-
-declare var AjaxFile: JQueryAjaxFile.IAjaxFileStatic;
-
-declare module 'ajaxfile' {
-    export = AjaxFile;
-}
-
-declare namespace AjaxFileKnockout {
-    interface IFileInputWrapper {
-        getElement(): HTMLInputElement;
-        fileSelected(): boolean;
-    }
-}
-
-interface KnockoutBindingHandlers {
-    file: KnockoutBindingHandler;
-}
diff --git a/jquery.ajaxfile/tsconfig.json b/jquery.ajaxfile/tsconfig.json
new file mode 100644
index 0000000000..1e04ce2a9d
--- /dev/null
+++ b/jquery.ajaxfile/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.ajaxfile-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.are-you-sure/index.d.ts b/jquery.are-you-sure/index.d.ts
new file mode 100644
index 0000000000..5bb4840210
--- /dev/null
+++ b/jquery.are-you-sure/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for jquery.are-you-sure.js
+// Project: https://github.com/codedance/jquery.AreYouSure
+// Definitions by: Jon Egerton <https://github.com/jonegerton>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+/**Options available to control dirty form checking*/
+interface AreYouSureOptions {
+    
+    /**Message to show when attempting to quit a dirty form without saving*/
+    message?: string;
+
+    /**Class to assign to the form when dirty*/
+    dirtyClass?: string;
+    
+    /**Callback when form is found to be dirty - allows control of submit/reset buttons etc*/
+    change?: Function;
+    
+    /**Jquery selector to use to find input elements*/
+    fieldSelector?: string;
+	
+	/**Make Are-You-Sure "silent" by disabling the warning message*/
+	silent?: boolean;
+}
+
+interface AreYouSure {
+	(): JQuery;
+    (options: AreYouSureOptions): JQuery;
+}
+
+interface JQuery {
+    areYouSure: AreYouSure;
+}
\ No newline at end of file
diff --git a/jquery.are-you-sure/jquery.are-you-sure-tests.ts b/jquery.are-you-sure/jquery.are-you-sure-tests.ts
index 59e3730937..4e10c1429f 100644
--- a/jquery.are-you-sure/jquery.are-you-sure-tests.ts
+++ b/jquery.are-you-sure/jquery.are-you-sure-tests.ts
@@ -3,8 +3,7 @@
 // Definitions by: Jon Egerton <https://github.com/jonegerton>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.are-you-sure.d.ts"/>
+/// <reference types="jquery"/>
 
 //Use defaults
 $("test").areYouSure();
diff --git a/jquery.are-you-sure/jquery.are-you-sure.d.ts b/jquery.are-you-sure/jquery.are-you-sure.d.ts
deleted file mode 100644
index 6a78958674..0000000000
--- a/jquery.are-you-sure/jquery.are-you-sure.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// Type definitions for jquery.are-you-sure.js
-// Project: https://github.com/codedance/jquery.AreYouSure
-// Definitions by: Jon Egerton <https://github.com/jonegerton>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-/**Options available to control dirty form checking*/
-interface AreYouSureOptions {
-    
-    /**Message to show when attempting to quit a dirty form without saving*/
-    message?: string;
-
-    /**Class to assign to the form when dirty*/
-    dirtyClass?: string;
-    
-    /**Callback when form is found to be dirty - allows control of submit/reset buttons etc*/
-    change?: Function;
-    
-    /**Jquery selector to use to find input elements*/
-    fieldSelector?: string;
-	
-	/**Make Are-You-Sure "silent" by disabling the warning message*/
-	silent?: boolean;
-}
-
-interface AreYouSure {
-	(): JQuery;
-    (options: AreYouSureOptions): JQuery;
-}
-
-interface JQuery {
-    areYouSure: AreYouSure;
-}
\ No newline at end of file
diff --git a/jquery.are-you-sure/tsconfig.json b/jquery.are-you-sure/tsconfig.json
new file mode 100644
index 0000000000..34595e2813
--- /dev/null
+++ b/jquery.are-you-sure/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.are-you-sure-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.autosize/index.d.ts b/jquery.autosize/index.d.ts
new file mode 100644
index 0000000000..f43e6bf7d3
--- /dev/null
+++ b/jquery.autosize/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for jquery.autosize 3.0.7
+// Project: http://www.jacklmoore.com/autosize/
+// Definitions by: Aaron T. King <https://github.com/kingdango>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+declare namespace autosize {
+    interface AutosizeStatic {
+        (el: Element): void;
+        (el: NodeList): void;
+        (el: JQuery): void;
+    }
+}
+
+declare var autosize: autosize.AutosizeStatic;
diff --git a/jquery.autosize/jquery.autosize-tests.ts b/jquery.autosize/jquery.autosize-tests.ts
index c6168dc279..c7dfdc6770 100644
--- a/jquery.autosize/jquery.autosize-tests.ts
+++ b/jquery.autosize/jquery.autosize-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jquery.autosize.d.ts" />
+
 
 // from a NodeList
 autosize(document.querySelectorAll('textarea'));
diff --git a/jquery.autosize/jquery.autosize.d.ts b/jquery.autosize/jquery.autosize.d.ts
deleted file mode 100644
index c8a37d743d..0000000000
--- a/jquery.autosize/jquery.autosize.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Type definitions for jquery.autosize 3.0.7
-// Project: http://www.jacklmoore.com/autosize/
-// Definitions by: Aaron T. King <https://github.com/kingdango>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-declare namespace autosize {
-    interface AutosizeStatic {
-        (el: Element): void;
-        (el: NodeList): void;
-        (el: JQuery): void;
-    }
-}
-
-declare var autosize: autosize.AutosizeStatic;
-
-declare module 'autosize' {
-    export = autosize;
-}
diff --git a/jquery.autosize/tsconfig.json b/jquery.autosize/tsconfig.json
new file mode 100644
index 0000000000..4d1e5df7db
--- /dev/null
+++ b/jquery.autosize/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.autosize-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.base64/index.d.ts b/jquery.base64/index.d.ts
new file mode 100644
index 0000000000..e071dc940a
--- /dev/null
+++ b/jquery.base64/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for jQuery Plugin - base64 codec
+// Project: https://github.com/yatt/jquery.base64/
+// Definitions by: Shinya Mochizuki <https://github.com/enrapt-mochizuki/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface JQueryBase64Static {
+  encode(data: string, isUTF8?: boolean): string;
+  decode(data: string, isUTF8?: boolean): string;
+}
+
+interface JQueryStatic {
+  base64: JQueryBase64Static;
+}
diff --git a/jquery.base64/jquery.base64-tests.ts b/jquery.base64/jquery.base64-tests.ts
index 5f6b6eaa62..447a917620 100644
--- a/jquery.base64/jquery.base64-tests.ts
+++ b/jquery.base64/jquery.base64-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="jquery.base64.d.ts" />
+/// <reference types="jquery" />
+
 
 var encoded = $.base64.encode("");
 $.base64.decode(encoded);
diff --git a/jquery.base64/jquery.base64.d.ts b/jquery.base64/jquery.base64.d.ts
deleted file mode 100644
index 2547c5bb87..0000000000
--- a/jquery.base64/jquery.base64.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Type definitions for jQuery Plugin - base64 codec
-// Project: https://github.com/yatt/jquery.base64/
-// Definitions by: Shinya Mochizuki <https://github.com/enrapt-mochizuki/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface JQueryBase64Static {
-  encode(data: string, isUTF8?: boolean): string;
-  decode(data: string, isUTF8?: boolean): string;
-}
-
-interface JQueryStatic {
-  base64: JQueryBase64Static;
-}
diff --git a/jquery.base64/tsconfig.json b/jquery.base64/tsconfig.json
new file mode 100644
index 0000000000..9deae806ee
--- /dev/null
+++ b/jquery.base64/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.base64-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.bbq/index.d.ts b/jquery.bbq/index.d.ts
new file mode 100644
index 0000000000..44deadb690
--- /dev/null
+++ b/jquery.bbq/index.d.ts
@@ -0,0 +1,160 @@
+// Type definitions for jquery.bbq 1.2
+// Project: http://benalman.com/projects/jquery-bbq-plugin/
+// Definitions by: Adam R. Smith <https://github.com/sunetos>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace JQueryBbq {
+
+    interface JQuery {
+        /**
+        * Adds a 'state' into the browser history at the current position, setting
+        * location.hash and triggering any bound <hashchange event> callbacks
+        * (provided the new state is different than the previous state).
+        *
+        * @name params A serialized params string or a hash string beginning with # to merge into location.hash.
+        * @name merge_mode Merge behavior defaults to 0 if merge_mode is not specified (unless a hash string beginning with # is specified, in which case merge behavior defaults to 2)
+        */
+        pushState(params?: string, merge_mode?: number): void;
+
+        pushState(params?: any, merge_mode?: number): void;
+
+        /**
+        * Retrieves the current 'state' from the browser history, parsing
+        * location.hash for a specific key or returning an object containing the
+        * entire state, optionally coercing numbers, booleans, null and undefined
+        * values.
+        *
+        * @name key An optional state key for which to return a value.
+        * @name coerce If true, coerces any numbers or true, false, null, and undefined to their actual value. Defaults to false
+        */
+        getState(key?: string, coerce?: boolean): any;
+
+        getState(coerce?: boolean): any;
+
+        /**
+        * Remove one or more keys from the current browser history 'state', creating
+        * a new state, setting location.hash and triggering any bound
+        * <hashchange event> callbacks (provided the new state is different than
+        * the previous state).
+        *
+        * @name key One or more key values to remove from the current state.
+        */
+        removeState(...key: any[]): void;
+    }
+
+    interface ParamFragment {
+        (url?: string): string;
+
+        (url: string, params: any, merge_mode?: number): string;
+
+        /**
+        * Specify characters that will be left unescaped when fragments are created
+        * or merged using <jQuery.param.fragment>, or when the fragment is modified
+        * using <jQuery.bbq.pushState>. This option only applies to serialized data
+        * object fragments, and not set-as-string fragments. Does not affect the
+        * query string. Defaults to ",/" (comma, forward slash).
+        *
+        * @name chars The characters to not escape in the fragment. If unspecified, defaults to empty string (escape all characters).
+        */
+        noEscape: (chars?: string) => void;
+
+        /**
+        * TODO: DESCRIBE
+        *
+        * @name state TODO: DESCRIBE
+        */
+        ajaxCrawlable(state?: boolean): boolean;
+    }
+
+    interface JQueryDeparam {
+        /**
+        * Deserialize a params string into an object, optionally coercing numbers,
+        * booleans, null and undefined values; this method is the counterpart to the
+        * internal jQuery.param method.
+        *
+        * @name params A params string to be parsed.
+        * @name coerce If true, coerces any numbers or true, false, null, and undefined to their actual value. Defaults to false if omitted.
+        */
+        (params: string, coerce?: boolean): any;
+
+
+        /**
+        * Parse the query string from a URL or the current window.location.href,
+        * deserializing it into an object, optionally coercing numbers, booleans,
+        * null and undefined values.
+        *
+        * @name url An optional params string or URL containing query string params to be parsed. If url is omitted, the current window.location.href is used.
+        * @name coerce If true, coerces any numbers or true, false, null, and undefined to their actual value. Defaults to false if omitted.
+        */
+        querystring(url?: string, coerce?: boolean): any;
+
+        /**
+        * Parse the fragment (hash) from a URL or the current window.location.href,
+        * deserializing it into an object, optionally coercing numbers, booleans,
+        * null and undefined values.
+        *
+        * @name url An optional params string or URL containing fragment (hash) params to be parsed. If url is omitted, the current window.location.href is used.
+        * @name coerce If true, coerces any numbers or true, false, null, and undefined to their actual value. Defaults to false if omitted.
+        */
+        fragment(url?: string, coerce?: boolean): any;
+    }
+
+    interface EventObject extends JQueryEventObject {
+        fragment: string;
+
+        getState(key?: string, coerce?: boolean);
+    }
+}
+
+interface JQueryParam {
+    /**
+    * Parse the query string from a URL or the current window.location.href,
+    * deserializing it into an object, optionally coercing numbers, booleans,
+    * null and undefined values.
+    *
+    * @name url An optional params string or URL containing query string params to be parsed. If url is omitted, the current window.location.href is used.
+    * @name coerce (Boolean) If true, coerces any numbers or true, false, null, and undefined to their actual value. Defaults to false if omitted.
+    * @name merge_mode An object representing the deserialized params string.
+    */
+    querystring(url?: string, coerce?: boolean, merge_mode?: number): string;
+
+    querystring(url?: string, coerce?: any, merge_mode?: number): string;
+
+    fragment: JQueryBbq.ParamFragment;
+
+    /**
+    * Returns a params string equivalent to that returned by the internal
+    * jQuery.param method, but sorted, which makes it suitable for use as a
+    * cache key.
+    *
+    * @name obj An object to be serialized.
+    * @name traditional Params deep/shallow serialization mode. See the documentation at http://api.jquery.com/jQuery.param/ for more detail.
+    */
+    sorted(obj: any, traditional?: boolean): string;
+}
+
+interface JQueryStatic {
+    bbq: JQueryBbq.JQuery;
+
+    deparam: JQueryBbq.JQueryDeparam;
+
+    /**
+    * Get the internal "Default URL attribute per tag" list, or augment the list
+    * with additional tag-attribute pairs, in case the defaults are insufficient.
+    *
+    * @name tag_attr An object containing a list of tag names and their associated default attribute names in the format { tag: 'attr', ... } to be merged into the internal tag-attribute list.
+    */
+    elemUrlAttr(tag_attr?: any): any;
+}
+
+interface JQuery {
+    querystring(attr?: any, params?: any, merge_mode?: number): JQuery;
+
+    fragment(attr?: any, params?: any, merge_mode?: number): JQuery;
+
+    hashchange(eventData?: any, handler?: (eventObject: JQueryBbq.EventObject) => any): JQuery;
+
+    hashchange(handler: (eventObject: JQueryBbq.EventObject) => any): JQuery;
+}
diff --git a/jquery.bbq/jquery.bbq-tests.ts b/jquery.bbq/jquery.bbq-tests.ts
index 77eb35b373..fd49051ed3 100644
--- a/jquery.bbq/jquery.bbq-tests.ts
+++ b/jquery.bbq/jquery.bbq-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../qunit/qunit.d.ts" />
-/// <reference path="jquery.bbq.d.ts" />
+/// <reference types="qunit" />
+
 
 
 // ************** Tests to jquery JQueryParam interface
diff --git a/jquery.bbq/jquery.bbq-tests.ts.tscparams b/jquery.bbq/jquery.bbq-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jquery.bbq/jquery.bbq-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jquery.bbq/jquery.bbq.d.ts b/jquery.bbq/jquery.bbq.d.ts
deleted file mode 100644
index fb0066c3ae..0000000000
--- a/jquery.bbq/jquery.bbq.d.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-// Type definitions for jquery.bbq 1.2
-// Project: http://benalman.com/projects/jquery-bbq-plugin/
-// Definitions by: Adam R. Smith <https://github.com/sunetos>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace JQueryBbq {
-
-    interface JQuery {
-        /**
-        * Adds a 'state' into the browser history at the current position, setting
-        * location.hash and triggering any bound <hashchange event> callbacks
-        * (provided the new state is different than the previous state).
-        *
-        * @name params A serialized params string or a hash string beginning with # to merge into location.hash.
-        * @name merge_mode Merge behavior defaults to 0 if merge_mode is not specified (unless a hash string beginning with # is specified, in which case merge behavior defaults to 2)
-        */
-        pushState(params?: string, merge_mode?: number): void;
-
-        pushState(params?: any, merge_mode?: number): void;
-
-        /**
-        * Retrieves the current 'state' from the browser history, parsing
-        * location.hash for a specific key or returning an object containing the
-        * entire state, optionally coercing numbers, booleans, null and undefined
-        * values.
-        *
-        * @name key An optional state key for which to return a value.
-        * @name coerce If true, coerces any numbers or true, false, null, and undefined to their actual value. Defaults to false
-        */
-        getState(key?: string, coerce?: boolean): any;
-
-        getState(coerce?: boolean): any;
-
-        /**
-        * Remove one or more keys from the current browser history 'state', creating
-        * a new state, setting location.hash and triggering any bound
-        * <hashchange event> callbacks (provided the new state is different than
-        * the previous state).
-        *
-        * @name key One or more key values to remove from the current state.
-        */
-        removeState(...key: any[]): void;
-    }
-
-    interface ParamFragment {
-        (url?: string): string;
-
-        (url: string, params: any, merge_mode?: number): string;
-
-        /**
-        * Specify characters that will be left unescaped when fragments are created
-        * or merged using <jQuery.param.fragment>, or when the fragment is modified
-        * using <jQuery.bbq.pushState>. This option only applies to serialized data
-        * object fragments, and not set-as-string fragments. Does not affect the
-        * query string. Defaults to ",/" (comma, forward slash).
-        *
-        * @name chars The characters to not escape in the fragment. If unspecified, defaults to empty string (escape all characters).
-        */
-        noEscape: (chars?: string) => void;
-
-        /**
-        * TODO: DESCRIBE
-        *
-        * @name state TODO: DESCRIBE
-        */
-        ajaxCrawlable(state?: boolean): boolean;
-    }
-
-    interface JQueryDeparam {
-        /**
-        * Deserialize a params string into an object, optionally coercing numbers,
-        * booleans, null and undefined values; this method is the counterpart to the
-        * internal jQuery.param method.
-        *
-        * @name params A params string to be parsed.
-        * @name coerce If true, coerces any numbers or true, false, null, and undefined to their actual value. Defaults to false if omitted.
-        */
-        (params: string, coerce?: boolean): any;
-
-
-        /**
-        * Parse the query string from a URL or the current window.location.href,
-        * deserializing it into an object, optionally coercing numbers, booleans,
-        * null and undefined values.
-        *
-        * @name url An optional params string or URL containing query string params to be parsed. If url is omitted, the current window.location.href is used.
-        * @name coerce If true, coerces any numbers or true, false, null, and undefined to their actual value. Defaults to false if omitted.
-        */
-        querystring(url?: string, coerce?: boolean): any;
-
-        /**
-        * Parse the fragment (hash) from a URL or the current window.location.href,
-        * deserializing it into an object, optionally coercing numbers, booleans,
-        * null and undefined values.
-        *
-        * @name url An optional params string or URL containing fragment (hash) params to be parsed. If url is omitted, the current window.location.href is used.
-        * @name coerce If true, coerces any numbers or true, false, null, and undefined to their actual value. Defaults to false if omitted.
-        */
-        fragment(url?: string, coerce?: boolean): any;
-    }
-
-    interface EventObject extends JQueryEventObject {
-        fragment: string;
-
-        getState(key?: string, coerce?: boolean);
-    }
-}
-
-interface JQueryParam {
-    /**
-    * Parse the query string from a URL or the current window.location.href,
-    * deserializing it into an object, optionally coercing numbers, booleans,
-    * null and undefined values.
-    *
-    * @name url An optional params string or URL containing query string params to be parsed. If url is omitted, the current window.location.href is used.
-    * @name coerce (Boolean) If true, coerces any numbers or true, false, null, and undefined to their actual value. Defaults to false if omitted.
-    * @name merge_mode An object representing the deserialized params string.
-    */
-    querystring(url?: string, coerce?: boolean, merge_mode?: number): string;
-
-    querystring(url?: string, coerce?: any, merge_mode?: number): string;
-
-    fragment: JQueryBbq.ParamFragment;
-
-    /**
-    * Returns a params string equivalent to that returned by the internal
-    * jQuery.param method, but sorted, which makes it suitable for use as a
-    * cache key.
-    *
-    * @name obj An object to be serialized.
-    * @name traditional Params deep/shallow serialization mode. See the documentation at http://api.jquery.com/jQuery.param/ for more detail.
-    */
-    sorted(obj: any, traditional?: boolean): string;
-}
-
-interface JQueryStatic {
-    bbq: JQueryBbq.JQuery;
-
-    deparam: JQueryBbq.JQueryDeparam;
-
-    /**
-    * Get the internal "Default URL attribute per tag" list, or augment the list
-    * with additional tag-attribute pairs, in case the defaults are insufficient.
-    *
-    * @name tag_attr An object containing a list of tag names and their associated default attribute names in the format { tag: 'attr', ... } to be merged into the internal tag-attribute list.
-    */
-    elemUrlAttr(tag_attr?: any): any;
-}
-
-interface JQuery {
-    querystring(attr?: any, params?: any, merge_mode?: number): JQuery;
-
-    fragment(attr?: any, params?: any, merge_mode?: number): JQuery;
-
-    hashchange(eventData?: any, handler?: (eventObject: JQueryBbq.EventObject) => any): JQuery;
-
-    hashchange(handler: (eventObject: JQueryBbq.EventObject) => any): JQuery;
-}
diff --git a/jquery.bbq/jquery.bbq.d.ts.tscparams b/jquery.bbq/jquery.bbq.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jquery.bbq/jquery.bbq.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jquery.bbq/tsconfig.json b/jquery.bbq/tsconfig.json
new file mode 100644
index 0000000000..27adf3f4f6
--- /dev/null
+++ b/jquery.bbq/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.bbq-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.blockUI/index.d.ts b/jquery.blockUI/index.d.ts
new file mode 100644
index 0000000000..42a6bf3f35
--- /dev/null
+++ b/jquery.blockUI/index.d.ts
@@ -0,0 +1,129 @@
+// Type definitions for jQuery BlockUI Plugin
+// Project: http://malsup.com/jquery/block/
+// Definitions by: Jeffrey Lee <http://blog.darkthread.net/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="jquery" />
+
+interface JQBlockUIOptions {
+    /** message displayed when blocking (use null for no message) */
+    message?: any;
+    /** title string; only used when theme == true  */
+    title?: string;
+    /** only used when theme == true (requires jquery-ui.js to be loaded) */
+    draggable?: boolean;
+    /** set to true to use with jQuery UI themes */
+    theme?: boolean;
+
+    /** 
+     * styles for the message when blocking; if you wish to disable 
+     * these and use an external stylesheet then do this in your code: 
+     * $.blockUI.defaults.css = {}; 
+     */
+    css?: any;
+
+    /** minimal style set used when themes are used  */
+    themedCSS?: any;
+
+    /** styles for the overlay */
+    overlayCSS?: any;
+
+    /** style to replace wait cursor before unblocking to correct issue of lingering wait cursor */
+    cursorReset?: string;
+
+    /** styles applied when using $.growlUI */
+    growlCSS?: any;
+    /** ifreamSrc for IE */
+    iframeSrc?: string;
+
+    /** force usage of iframe in non-IE browsers (handy for blocking applets) */
+    forceIframe?: boolean;
+
+    /** z-index for the blocking overlay */
+    baseZ?: number;
+
+
+    /** set true to have the message automatically centered for X */
+    centerX?: boolean;
+    /** set true to have the message automatically centered for Y */
+    centerY?: boolean;
+
+    /** 
+     * allow body element to be stetched in ie6; this makes blocking look better
+     * on "short" pages.  disable if you wish to prevent changes to the body height 
+     */
+    allowBodyStretch?: boolean;
+
+    /** enable if you want key and mouse events to be disabled for content that is blocked */
+    bindEvents?: boolean;
+
+    /** be default blockUI will supress tab navigation from leaving blocking content(if bindEvents is true) */
+    constrainTabKey?: boolean;
+
+    /** fadeIn time in millis; set to 0 to disable fadeIn on block  */
+    fadeIn?: number;
+
+    /** fadeOut time in millis; set to 0 to disable fadeOut on unblock */
+    fadeOut?: number;
+
+    /** time in millis to wait before auto-unblocking; set to 0 to disable auto-unblock */
+    timeout?: number;
+
+    /** disable if you don't want to show the overlay */
+    showOverlay?: boolean;
+
+    /** if true, focus will be placed in the first available input field when page blocking */
+    focusInput?: boolean;
+
+    /** callback method invoked when fadeIn has completed and blocking message is visible */
+    onBlock?: () => void;
+
+    /** 
+     * callback method invoked when unblocking has completed; the callback is 
+     * passed the element that has been unblocked (which is the window object for page 
+     * blocks) and the options that were passed to the unblock call: 
+     * onUnblock(element, options) 
+     */
+    onUnblock?: (element: any, options: any) => void;
+
+    // don't ask; if you really must know: http://groups.google.com/group/jquery-en/browse_thread/thread/36640a8730503595/2f6a79a77a78e493#2f6a79a77a78e493 
+    /** quirksmodeOffsetHack */
+    quirksmodeOffsetHack?: number;
+
+    /** class name of the message block */
+    blockMsgClass?: string;
+
+    /** if it is already blocked, then ignore it (don't unblock and reblock) */
+    ignoreIfBlocked?: boolean;
+}
+
+interface JQBlockUIStatic {
+    /** default options */
+    defaults?: JQBlockUIOptions;
+    /** block user activity for the page */
+    (): void;
+    /**
+     * block user activity for the page
+     * @param options options 
+     */
+    (option: JQBlockUIOptions): void;
+}
+
+interface JQueryStatic {
+    /** block user activity for the page */
+    blockUI?: JQBlockUIStatic;
+    /** unblock the page */
+    unblockUI?: JQBlockUIStatic;
+}
+
+interface JQuery {
+    /** 
+     * block the element(s)
+     * @param options block options
+     */
+    block(option?: JQBlockUIOptions): JQuery;
+    /**
+     * unblock the element(s)
+     */
+    unblock(option?: JQBlockUIOptions): JQuery;
+}
\ No newline at end of file
diff --git a/jquery.blockUI/jquery.blockUI-tests.ts b/jquery.blockUI/jquery.blockUI-tests.ts
index 234340b938..325ec6dc26 100644
--- a/jquery.blockUI/jquery.blockUI-tests.ts
+++ b/jquery.blockUI/jquery.blockUI-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jquery.blockUI.d.ts" />
+
 
 $.blockUI();
 var opt: JQBlockUIOptions = {
diff --git a/jquery.blockUI/jquery.blockUI.d.ts b/jquery.blockUI/jquery.blockUI.d.ts
deleted file mode 100644
index 4893fd23ce..0000000000
--- a/jquery.blockUI/jquery.blockUI.d.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-// Type definitions for jQuery BlockUI Plugin
-// Project: http://malsup.com/jquery/block/
-// Definitions by: Jeffrey Lee <http://blog.darkthread.net/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../jquery/jquery.d.ts" />
-
-interface JQBlockUIOptions {
-    /** message displayed when blocking (use null for no message) */
-    message?: any;
-    /** title string; only used when theme == true  */
-    title?: string;
-    /** only used when theme == true (requires jquery-ui.js to be loaded) */
-    draggable?: boolean;
-    /** set to true to use with jQuery UI themes */
-    theme?: boolean;
-
-    /** 
-     * styles for the message when blocking; if you wish to disable 
-     * these and use an external stylesheet then do this in your code: 
-     * $.blockUI.defaults.css = {}; 
-     */
-    css?: any;
-
-    /** minimal style set used when themes are used  */
-    themedCSS?: any;
-
-    /** styles for the overlay */
-    overlayCSS?: any;
-
-    /** style to replace wait cursor before unblocking to correct issue of lingering wait cursor */
-    cursorReset?: string;
-
-    /** styles applied when using $.growlUI */
-    growlCSS?: any;
-    /** ifreamSrc for IE */
-    iframeSrc?: string;
-
-    /** force usage of iframe in non-IE browsers (handy for blocking applets) */
-    forceIframe?: boolean;
-
-    /** z-index for the blocking overlay */
-    baseZ?: number;
-
-
-    /** set true to have the message automatically centered for X */
-    centerX?: boolean;
-    /** set true to have the message automatically centered for Y */
-    centerY?: boolean;
-
-    /** 
-     * allow body element to be stetched in ie6; this makes blocking look better
-     * on "short" pages.  disable if you wish to prevent changes to the body height 
-     */
-    allowBodyStretch?: boolean;
-
-    /** enable if you want key and mouse events to be disabled for content that is blocked */
-    bindEvents?: boolean;
-
-    /** be default blockUI will supress tab navigation from leaving blocking content(if bindEvents is true) */
-    constrainTabKey?: boolean;
-
-    /** fadeIn time in millis; set to 0 to disable fadeIn on block  */
-    fadeIn?: number;
-
-    /** fadeOut time in millis; set to 0 to disable fadeOut on unblock */
-    fadeOut?: number;
-
-    /** time in millis to wait before auto-unblocking; set to 0 to disable auto-unblock */
-    timeout?: number;
-
-    /** disable if you don't want to show the overlay */
-    showOverlay?: boolean;
-
-    /** if true, focus will be placed in the first available input field when page blocking */
-    focusInput?: boolean;
-
-    /** callback method invoked when fadeIn has completed and blocking message is visible */
-    onBlock?: () => void;
-
-    /** 
-     * callback method invoked when unblocking has completed; the callback is 
-     * passed the element that has been unblocked (which is the window object for page 
-     * blocks) and the options that were passed to the unblock call: 
-     * onUnblock(element, options) 
-     */
-    onUnblock?: (element: any, options: any) => void;
-
-    // don't ask; if you really must know: http://groups.google.com/group/jquery-en/browse_thread/thread/36640a8730503595/2f6a79a77a78e493#2f6a79a77a78e493 
-    /** quirksmodeOffsetHack */
-    quirksmodeOffsetHack?: number;
-
-    /** class name of the message block */
-    blockMsgClass?: string;
-
-    /** if it is already blocked, then ignore it (don't unblock and reblock) */
-    ignoreIfBlocked?: boolean;
-}
-
-interface JQBlockUIStatic {
-    /** default options */
-    defaults?: JQBlockUIOptions;
-    /** block user activity for the page */
-    (): void;
-    /**
-     * block user activity for the page
-     * @param options options 
-     */
-    (option: JQBlockUIOptions): void;
-}
-
-interface JQueryStatic {
-    /** block user activity for the page */
-    blockUI?: JQBlockUIStatic;
-    /** unblock the page */
-    unblockUI?: JQBlockUIStatic;
-}
-
-interface JQuery {
-    /** 
-     * block the element(s)
-     * @param options block options
-     */
-    block(option?: JQBlockUIOptions): JQuery;
-    /**
-     * unblock the element(s)
-     */
-    unblock(option?: JQBlockUIOptions): JQuery;
-}
\ No newline at end of file
diff --git a/jquery.blockUI/tsconfig.json b/jquery.blockUI/tsconfig.json
new file mode 100644
index 0000000000..564e3c83ce
--- /dev/null
+++ b/jquery.blockUI/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.blockUI-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.bootstrap.wizard/index.d.ts b/jquery.bootstrap.wizard/index.d.ts
new file mode 100644
index 0000000000..b04835e14e
--- /dev/null
+++ b/jquery.bootstrap.wizard/index.d.ts
@@ -0,0 +1,48 @@
+// Type definitions for twitter-bootstrap-wizard
+// Project: https://github.com/VinceG/twitter-bootstrap-wizard
+// Definitions by: Blake Niemyjski <https://github.com/niemyjski>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface WizardOptions {
+    tabClass?: string;
+    nextSelector?: string;
+    previousSelector?: string;
+    firstSelector?: string;
+    lastSelector?: string;
+    onShow?: (activeTab: any, navigation: any, nextIndex: number) => void;
+    onInit?: (activeTab: any, navigation: any, currentIndex: number) => void;
+    onNext?: (activeTab: any, navigation: any, nextIndex: number) => boolean;
+    onPrevious?: (activeTab: any, navigation: any, previousIndex: number) => boolean;
+    onLast?: (activeTab: any, navigation: any, lastIndex: number) => boolean;
+    onFirst?: (activeTab: any, navigation: any, firstIndex: number) => boolean;
+    onTabClick?: (activeTab: any, navigation: any, currentIndex: number) => boolean;
+    onTabShow?: (activeTab: any, navigation: any, currentIndex: number) => boolean;
+}
+
+interface Wizard {
+    next(): void;
+    previous(): void;
+    first(): void;
+    last(): void;
+    currentIndex(): number;
+    firstIndex(): number;
+    lastIndex(): number;
+    getIndex(element: any): number;
+    nextIndex(): number;
+    previousIndex(): number;
+    navigationLength(): number;
+    activeTab(): any;
+    nextTab(): any;
+    previousTab(): any;
+    show(index: number): any;
+}
+
+interface JQuery {
+    bootstrapWizard(options?: WizardOptions): Wizard;
+}
+
+interface JQueryStatic {
+    bootstrapWizard: Wizard;
+}
\ No newline at end of file
diff --git a/jquery.bootstrap.wizard/jquery.bootstrap.wizard.d.ts b/jquery.bootstrap.wizard/jquery.bootstrap.wizard.d.ts
deleted file mode 100644
index 197fb2fe3d..0000000000
--- a/jquery.bootstrap.wizard/jquery.bootstrap.wizard.d.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-// Type definitions for twitter-bootstrap-wizard
-// Project: https://github.com/VinceG/twitter-bootstrap-wizard
-// Definitions by: Blake Niemyjski <https://github.com/niemyjski>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface WizardOptions {
-    tabClass?: string;
-    nextSelector?: string;
-    previousSelector?: string;
-    firstSelector?: string;
-    lastSelector?: string;
-    onShow?: (activeTab: any, navigation: any, nextIndex: number) => void;
-    onInit?: (activeTab: any, navigation: any, currentIndex: number) => void;
-    onNext?: (activeTab: any, navigation: any, nextIndex: number) => boolean;
-    onPrevious?: (activeTab: any, navigation: any, previousIndex: number) => boolean;
-    onLast?: (activeTab: any, navigation: any, lastIndex: number) => boolean;
-    onFirst?: (activeTab: any, navigation: any, firstIndex: number) => boolean;
-    onTabClick?: (activeTab: any, navigation: any, currentIndex: number) => boolean;
-    onTabShow?: (activeTab: any, navigation: any, currentIndex: number) => boolean;
-}
-
-interface Wizard {
-    next(): void;
-    previous(): void;
-    first(): void;
-    last(): void;
-    currentIndex(): number;
-    firstIndex(): number;
-    lastIndex(): number;
-    getIndex(element: any): number;
-    nextIndex(): number;
-    previousIndex(): number;
-    navigationLength(): number;
-    activeTab(): any;
-    nextTab(): any;
-    previousTab(): any;
-    show(index: number): any;
-}
-
-interface JQuery {
-    bootstrapWizard(options?: WizardOptions): Wizard;
-}
-
-interface JQueryStatic {
-    bootstrapWizard: Wizard;
-}
\ No newline at end of file
diff --git a/jquery.bootstrap.wizard/tsconfig.json b/jquery.bootstrap.wizard/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/jquery.bootstrap.wizard/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.cleditor/index.d.ts b/jquery.cleditor/index.d.ts
new file mode 100644
index 0000000000..14ce2703ad
--- /dev/null
+++ b/jquery.cleditor/index.d.ts
@@ -0,0 +1,98 @@
+// Type definitions for jQuery CLEditor Plugin 1.4.3
+// Project: http://premiumsoftware.net/CLEditor
+// Definitions by: Jeffery Grajkowski <https://github.com/pushplay/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="jquery" />
+
+/**
+ * An editor is composed of a main div element used to hold a toolbar,
+ * a text area and an iframe. The toolbar can hold multiple groups
+ * which in turn hold multiple buttons.
+ */
+interface CLEditor {
+    $area: JQuery;
+    $frame: JQuery;
+    $main: JQuery;
+    $toolbar: JQuery;
+    disabled: boolean;
+    doc: Document;
+    options: JQueryCLEditorOptions;
+    change(handler: Function): CLEditor;
+    clear(): CLEditor;
+    disable(disabled: boolean): CLEditor;
+    execCommand(commands: string, value: any, useCSS?: boolean, button?: any): CLEditor;
+    focus(): CLEditor;
+    hidePopups(): CLEditor;
+    refresh(): CLEditor;
+    select(): CLEditor;
+    selectedHTML(): string;
+    selectedText(): string;
+    showMessage(message: string, button?: any): CLEditor;
+    sourceMode(): boolean;
+    updateFrame(): CLEditor;
+    updateTextArea(): CLEditor;
+}
+
+interface JQueryCLEditorOptions {
+    width?: number;
+    height?: number;
+    controls?: string;
+    colors?: string;
+    fonts?: string;
+    sizes?: string;
+    styles?: string[][];
+    useCSS?: boolean;
+    docType?: string;
+    docCSSFile?: string;
+    bodyStyle?: string;
+}
+
+interface JQueryCLEditorButtonDefinition {
+    name: string;
+    title: string;
+    css?: any;
+    image?: string;
+    stripIndex?: number;
+    command?: string;
+    popupName?: string;
+    popupContent?: string;
+    getEnabled?: (data: JQueryCLEditorButtonDefinitionEventData) => boolean;
+    getPressed?: (data: JQueryCLEditorButtonDefinitionEventData) => boolean;
+    buttonClick?: (event: Event, data: JQueryCLEditorButtonDefinitionEventData) => boolean;
+    popupClick?: (event: Event, data: JQueryCLEditorButtonDefinitionEventData) => boolean;
+}
+
+interface JQueryCLEditorButtonDefinitionEventData {
+    editor: CLEditor;
+    button: HTMLElement;
+    buttonName: string;
+    popup: HTMLElement;
+    popupName: string;
+    command: string;
+    value: any;
+    useCSS: boolean;
+}
+
+/**
+ * This object contains global properties and methods used to create
+ * custom plugins and override built in functionality.
+ */
+interface JQueryCLEditorStatic {
+    defaultOptions: JQueryCLEditorOptions;
+    buttons: JQueryCLEditorButtonDefinition[];
+    imagesPath: () => string;
+}
+
+interface JQueryStatic {
+    cleditor: JQueryCLEditorStatic;
+}
+
+interface JQuery {
+    /**
+     * If the cleditor object does not exist for a matched textarea element,
+     * it will be created using the default options combined with the supplied options.
+     * This is the core method for creating and selecting cleditor objects. 
+     */
+    cleditor(options?: JQueryCLEditorOptions): CLEditor;
+}
diff --git a/jquery.cleditor/jquery.cleditor-tests.ts b/jquery.cleditor/jquery.cleditor-tests.ts
index b298851500..7fe997c4c5 100644
--- a/jquery.cleditor/jquery.cleditor-tests.ts
+++ b/jquery.cleditor/jquery.cleditor-tests.ts
@@ -1,5 +1,4 @@
-///<reference path="../jquery/jquery.d.ts" />
-///<reference path="jquery.cleditor.d.ts" />
+///<reference types="jquery" />
 
 // cribbed from http://premiumsoftware.net/CLEditor/GettingStarted
 
diff --git a/jquery.cleditor/jquery.cleditor.d.ts b/jquery.cleditor/jquery.cleditor.d.ts
deleted file mode 100644
index b9f5c07de1..0000000000
--- a/jquery.cleditor/jquery.cleditor.d.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-// Type definitions for jQuery CLEditor Plugin 1.4.3
-// Project: http://premiumsoftware.net/CLEditor
-// Definitions by: Jeffery Grajkowski <https://github.com/pushplay/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../jquery/jquery.d.ts" />
-
-/**
- * An editor is composed of a main div element used to hold a toolbar,
- * a text area and an iframe. The toolbar can hold multiple groups
- * which in turn hold multiple buttons.
- */
-interface CLEditor {
-    $area: JQuery;
-    $frame: JQuery;
-    $main: JQuery;
-    $toolbar: JQuery;
-    disabled: boolean;
-    doc: Document;
-    options: JQueryCLEditorOptions;
-    change(handler: Function): CLEditor;
-    clear(): CLEditor;
-    disable(disabled: boolean): CLEditor;
-    execCommand(commands: string, value: any, useCSS?: boolean, button?: any): CLEditor;
-    focus(): CLEditor;
-    hidePopups(): CLEditor;
-    refresh(): CLEditor;
-    select(): CLEditor;
-    selectedHTML(): string;
-    selectedText(): string;
-    showMessage(message: string, button?: any): CLEditor;
-    sourceMode(): boolean;
-    updateFrame(): CLEditor;
-    updateTextArea(): CLEditor;
-}
-
-interface JQueryCLEditorOptions {
-    width?: number;
-    height?: number;
-    controls?: string;
-    colors?: string;
-    fonts?: string;
-    sizes?: string;
-    styles?: string[][];
-    useCSS?: boolean;
-    docType?: string;
-    docCSSFile?: string;
-    bodyStyle?: string;
-}
-
-interface JQueryCLEditorButtonDefinition {
-    name: string;
-    title: string;
-    css?: any;
-    image?: string;
-    stripIndex?: number;
-    command?: string;
-    popupName?: string;
-    popupContent?: string;
-    getEnabled?: (data: JQueryCLEditorButtonDefinitionEventData) => boolean;
-    getPressed?: (data: JQueryCLEditorButtonDefinitionEventData) => boolean;
-    buttonClick?: (event: Event, data: JQueryCLEditorButtonDefinitionEventData) => boolean;
-    popupClick?: (event: Event, data: JQueryCLEditorButtonDefinitionEventData) => boolean;
-}
-
-interface JQueryCLEditorButtonDefinitionEventData {
-    editor: CLEditor;
-    button: HTMLElement;
-    buttonName: string;
-    popup: HTMLElement;
-    popupName: string;
-    command: string;
-    value: any;
-    useCSS: boolean;
-}
-
-/**
- * This object contains global properties and methods used to create
- * custom plugins and override built in functionality.
- */
-interface JQueryCLEditorStatic {
-    defaultOptions: JQueryCLEditorOptions;
-    buttons: JQueryCLEditorButtonDefinition[];
-    imagesPath: () => string;
-}
-
-interface JQueryStatic {
-    cleditor: JQueryCLEditorStatic;
-}
-
-interface JQuery {
-    /**
-     * If the cleditor object does not exist for a matched textarea element,
-     * it will be created using the default options combined with the supplied options.
-     * This is the core method for creating and selecting cleditor objects. 
-     */
-    cleditor(options?: JQueryCLEditorOptions): CLEditor;
-}
diff --git a/jquery.cleditor/tsconfig.json b/jquery.cleditor/tsconfig.json
new file mode 100644
index 0000000000..35ca5516a6
--- /dev/null
+++ b/jquery.cleditor/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.cleditor-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.clientSideLogging/index.d.ts b/jquery.clientSideLogging/index.d.ts
new file mode 100644
index 0000000000..9266ff2f94
--- /dev/null
+++ b/jquery.clientSideLogging/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for jquery.clientSideLogging
+// Project: https://github.com/remybach/jQuery.clientSideLogging
+// Definitions by: Diullei Gomes <https://github.com/diullei>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface ClientSideLoggingClientInfoObject {
+    location?: boolean;	//  The url to the page on which the error occurred.
+    screen_size?: boolean;	//  The size of the user's screen (different to the window size because the window might not be maximized)
+    user_agent?: boolean;	//  The user agent string.
+    window_size?: boolean;	//  The window size.
+}
+
+interface ClientSideLoggingObject {
+	error_url?: string;		// The url to which errors logs are sent
+    info_url?: string;		// The url to which info logs are sent
+    log_url?: string;		// The url to which standard logs are sent
+    log_level?: number;		// The level at which to log. This allows you to keep the calls to the logging in your code and just change this variable to log varying degrees. 1 = only error, 2 = error & log, 3 = error, log & info
+    native_error?: boolean;	// Whether or not to send native js errors as well (using window.onerror).
+    hijack_console?: boolean;	// Hijacks the default console functionality (ie: all your console.error/info/log are belong to us).
+    query_var?: string;		// The variable to send the log message through as.
+    client_info?: ClientSideLoggingClientInfoObject;	// Configuration for what info about the client's browser is logged.
+}
+
+interface JQueryStatic {
+    info: (what?: any) => any;
+    log: (what?: any) => any;
+    clientSideLogging: (options: ClientSideLoggingObject) => any;
+}
diff --git a/jquery.clientSideLogging/jquery.clientSideLogging-tests.ts b/jquery.clientSideLogging/jquery.clientSideLogging-tests.ts
index 35974af26a..b0724ecc0f 100644
--- a/jquery.clientSideLogging/jquery.clientSideLogging-tests.ts
+++ b/jquery.clientSideLogging/jquery.clientSideLogging-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="jquery.clientSideLogging.d.ts" />
-
 $.clientSideLogging({
 	log_level: 3,
 	client_info: {
diff --git a/jquery.clientSideLogging/jquery.clientSideLogging.d.ts b/jquery.clientSideLogging/jquery.clientSideLogging.d.ts
deleted file mode 100644
index 5ca4773d8a..0000000000
--- a/jquery.clientSideLogging/jquery.clientSideLogging.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Type definitions for jquery.clientSideLogging
-// Project: https://github.com/remybach/jQuery.clientSideLogging
-// Definitions by: Diullei Gomes <https://github.com/diullei>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface ClientSideLoggingClientInfoObject {
-    location?: boolean;	//  The url to the page on which the error occurred.
-    screen_size?: boolean;	//  The size of the user's screen (different to the window size because the window might not be maximized)
-    user_agent?: boolean;	//  The user agent string.
-    window_size?: boolean;	//  The window size.
-}
-
-interface ClientSideLoggingObject {
-	error_url?: string;		// The url to which errors logs are sent
-    info_url?: string;		// The url to which info logs are sent
-    log_url?: string;		// The url to which standard logs are sent
-    log_level?: number;		// The level at which to log. This allows you to keep the calls to the logging in your code and just change this variable to log varying degrees. 1 = only error, 2 = error & log, 3 = error, log & info
-    native_error?: boolean;	// Whether or not to send native js errors as well (using window.onerror).
-    hijack_console?: boolean;	// Hijacks the default console functionality (ie: all your console.error/info/log are belong to us).
-    query_var?: string;		// The variable to send the log message through as.
-    client_info?: ClientSideLoggingClientInfoObject;	// Configuration for what info about the client's browser is logged.
-}
-
-interface JQueryStatic {
-    info: (what?: any) => any;
-    log: (what?: any) => any;
-    clientSideLogging: (options: ClientSideLoggingObject) => any;
-}
diff --git a/jquery.clientSideLogging/tsconfig.json b/jquery.clientSideLogging/tsconfig.json
new file mode 100644
index 0000000000..2ac7b9f4cb
--- /dev/null
+++ b/jquery.clientSideLogging/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.clientSideLogging-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.color/index.d.ts b/jquery.color/index.d.ts
new file mode 100644
index 0000000000..4b24a7c434
--- /dev/null
+++ b/jquery.color/index.d.ts
@@ -0,0 +1,203 @@
+// Type definitions for jquery.color.js v2.1.2
+// Project: https://github.com/jquery/jquery-color
+// Definitions by: Derek Cicerone <https://github.com/derekcicerone/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface JQueryColor {
+    /**
+     * Returns the red component of the color (integer from 0 - 255).
+     */
+    red(): number;
+
+    /**
+     * Returns a copy of the color object with the red set to val.
+     */
+    red(val: number): JQueryColor;
+
+    /**
+     * Returns a copy of the color object with the red set to val.
+     */
+    red(val: string): JQueryColor;
+
+    /**
+     * Returns the green component of the color (integer from 0 - 255).
+     */
+    green(): number;
+
+    /**
+     * Returns a copy of the color object with the green set to val.
+     */
+    green(val: number): JQueryColor;
+
+    /**
+     * Returns a copy of the color object with the green set to val.
+     */
+    green(val: string): JQueryColor;
+
+    /**
+     * Returns the blue component of the color (integer from 0 - 255).
+     */
+    blue(): number;
+
+    /**
+     * Returns a copy of the color object with the blue set to val.
+     */
+    blue(val: number): JQueryColor;
+    
+    /**
+     * Returns a copy of the color object with the blue set to val.
+     */
+    blue(val: string): JQueryColor;
+
+    /**
+     * Returns the alpha value of this color (float from 0.0 - 1.0).
+     */
+    alpha(): number;
+
+    /**
+     * Returns a copy of the color object with the alpha set to val.
+     */
+    alpha(val: number): JQueryColor;
+
+    /**
+     * Returns a copy of the color object with the alpha set to val.
+     */
+    alpha(val: string): JQueryColor;
+
+    /**
+     * Returns the hue component of the color (integer from 0 - 359).
+     */
+    hue(): number;
+
+    /**
+     * Returns a copy of the color object with the hue set to val.
+     */
+    hue(val: number): JQueryColor;
+
+    /**
+     * Returns a copy of the color object with the hue set to val.
+     */
+    hue(val: string): JQueryColor;
+
+    /**
+     * Returns the saturation component of the color (float from 0.0 - 1.0).
+     */
+    saturation(): number;
+
+    /**
+     * Returns a copy of the color object with the saturation set to val.
+     */
+    saturation(val: number): JQueryColor;
+
+    /**
+     * Returns a copy of the color object with the saturation set to val.
+     */
+    saturation(val: string): JQueryColor;
+
+    /**
+     * Returns the lightness component of the color (float from 0.0 - 1.0).
+     */
+    lightness(): number;
+
+    /**
+     * Returns a copy of the color object with the lightness set to val.
+     */
+    lightness(val: number): JQueryColor;
+
+    /**
+     * Returns a copy of the color object with the lightness set to val.
+     */
+    lightness(val: string): JQueryColor;
+
+    /**
+     * Returns a rgba "tuple" [ red, green, blue, alpha ].
+     */
+    rgba(): number[];
+
+    /**
+     * Returns a copy of the color with any defined values set to the new value.
+     */
+    rgba(red: number, green: number, blue: number, alpha?: number): JQueryColor;
+
+    /**
+     * Returns a copy of the color with any defined values set to the new value.
+     */
+    rgba(val: RgbaColor): JQueryColor;
+
+    /**
+     * Returns a copy of the color with any defined values set to the new value.
+     */
+    rgba(vals: number[]): JQueryColor;
+
+    /**
+     * Returns a HSL tuple [ hue, saturation, lightness, alpha ].
+     */
+    hsla(): number[];
+
+    /**
+     * Returns a copy of the color with any defined values set to the new value.
+     */
+    hsla(hue: number, saturation: number, lightness: number, alpha?: number): JQueryColor;
+
+    /**
+     * Returns a copy of the color with any defined values set to the new value.
+     */
+    hsla(val: HslaColor): JQueryColor;
+
+    /**
+     * Returns a copy of the color with any defined values set to the new value.
+     */
+    hsla(vals: number[]): JQueryColor;
+
+    /**
+     * Returns a CSS string "rgba(255, 255, 255, 0.4)".
+     */
+    toRgbaString(): string;
+
+    /**
+     * Returns a css string "hsla(330, 75%, 25%, 0.4)".
+     */
+    toHslaString(): string;
+
+    /**
+     * Returns a css string "#abcdef", with "includeAlpha" uses "#rrggbbaa" (alpha *= 255).
+     */
+    toHexString(includeAlpha?: boolean): string;
+
+    /**
+     * The color distance (0.0 - 1.0) of the way between this color and othercolor.
+     */
+    transition(othercolor: JQueryColor, distance: number): JQueryColor;
+
+    /**
+     * Will apply this color on top of the other color using alpha blending.
+     */
+    blend(othercolor: JQueryColor): void;
+
+    /**
+     * Checks if two colors are equal.
+     */
+    is(otherColor: JQueryColor): boolean;
+}
+
+interface HslaColor {
+    hue?: number;
+    saturation?: number;
+    lightness?: number;
+    alpha?: number;
+}
+
+interface RgbaColor {
+    red?: number;
+    green?: number;
+    blue?: number;
+    alpha?: number;
+}
+
+interface JQueryStatic {
+    Color(color: HslaColor): JQueryColor;
+    Color(color: RgbaColor): JQueryColor;
+    Color(color: string): JQueryColor;
+}
diff --git a/jquery.color/jquery.color-tests.ts b/jquery.color/jquery.color-tests.ts
index 267ee3b63b..c94a1cffed 100644
--- a/jquery.color/jquery.color-tests.ts
+++ b/jquery.color/jquery.color-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.color.d.ts"/>
+/// <reference types="jquery"/>
 
 var color = $.Color("rgba(255, 255, 255, 0.4)");
 var color1 = $.Color({red: 255, green: 255, blue: 255});
diff --git a/jquery.color/jquery.color.d.ts b/jquery.color/jquery.color.d.ts
deleted file mode 100644
index 15eb02ca17..0000000000
--- a/jquery.color/jquery.color.d.ts
+++ /dev/null
@@ -1,203 +0,0 @@
-// Type definitions for jquery.color.js v2.1.2
-// Project: https://github.com/jquery/jquery-color
-// Definitions by: Derek Cicerone <https://github.com/derekcicerone/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface JQueryColor {
-    /**
-     * Returns the red component of the color (integer from 0 - 255).
-     */
-    red(): number;
-
-    /**
-     * Returns a copy of the color object with the red set to val.
-     */
-    red(val: number): JQueryColor;
-
-    /**
-     * Returns a copy of the color object with the red set to val.
-     */
-    red(val: string): JQueryColor;
-
-    /**
-     * Returns the green component of the color (integer from 0 - 255).
-     */
-    green(): number;
-
-    /**
-     * Returns a copy of the color object with the green set to val.
-     */
-    green(val: number): JQueryColor;
-
-    /**
-     * Returns a copy of the color object with the green set to val.
-     */
-    green(val: string): JQueryColor;
-
-    /**
-     * Returns the blue component of the color (integer from 0 - 255).
-     */
-    blue(): number;
-
-    /**
-     * Returns a copy of the color object with the blue set to val.
-     */
-    blue(val: number): JQueryColor;
-    
-    /**
-     * Returns a copy of the color object with the blue set to val.
-     */
-    blue(val: string): JQueryColor;
-
-    /**
-     * Returns the alpha value of this color (float from 0.0 - 1.0).
-     */
-    alpha(): number;
-
-    /**
-     * Returns a copy of the color object with the alpha set to val.
-     */
-    alpha(val: number): JQueryColor;
-
-    /**
-     * Returns a copy of the color object with the alpha set to val.
-     */
-    alpha(val: string): JQueryColor;
-
-    /**
-     * Returns the hue component of the color (integer from 0 - 359).
-     */
-    hue(): number;
-
-    /**
-     * Returns a copy of the color object with the hue set to val.
-     */
-    hue(val: number): JQueryColor;
-
-    /**
-     * Returns a copy of the color object with the hue set to val.
-     */
-    hue(val: string): JQueryColor;
-
-    /**
-     * Returns the saturation component of the color (float from 0.0 - 1.0).
-     */
-    saturation(): number;
-
-    /**
-     * Returns a copy of the color object with the saturation set to val.
-     */
-    saturation(val: number): JQueryColor;
-
-    /**
-     * Returns a copy of the color object with the saturation set to val.
-     */
-    saturation(val: string): JQueryColor;
-
-    /**
-     * Returns the lightness component of the color (float from 0.0 - 1.0).
-     */
-    lightness(): number;
-
-    /**
-     * Returns a copy of the color object with the lightness set to val.
-     */
-    lightness(val: number): JQueryColor;
-
-    /**
-     * Returns a copy of the color object with the lightness set to val.
-     */
-    lightness(val: string): JQueryColor;
-
-    /**
-     * Returns a rgba "tuple" [ red, green, blue, alpha ].
-     */
-    rgba(): number[];
-
-    /**
-     * Returns a copy of the color with any defined values set to the new value.
-     */
-    rgba(red: number, green: number, blue: number, alpha?: number): JQueryColor;
-
-    /**
-     * Returns a copy of the color with any defined values set to the new value.
-     */
-    rgba(val: RgbaColor): JQueryColor;
-
-    /**
-     * Returns a copy of the color with any defined values set to the new value.
-     */
-    rgba(vals: number[]): JQueryColor;
-
-    /**
-     * Returns a HSL tuple [ hue, saturation, lightness, alpha ].
-     */
-    hsla(): number[];
-
-    /**
-     * Returns a copy of the color with any defined values set to the new value.
-     */
-    hsla(hue: number, saturation: number, lightness: number, alpha?: number): JQueryColor;
-
-    /**
-     * Returns a copy of the color with any defined values set to the new value.
-     */
-    hsla(val: HslaColor): JQueryColor;
-
-    /**
-     * Returns a copy of the color with any defined values set to the new value.
-     */
-    hsla(vals: number[]): JQueryColor;
-
-    /**
-     * Returns a CSS string "rgba(255, 255, 255, 0.4)".
-     */
-    toRgbaString(): string;
-
-    /**
-     * Returns a css string "hsla(330, 75%, 25%, 0.4)".
-     */
-    toHslaString(): string;
-
-    /**
-     * Returns a css string "#abcdef", with "includeAlpha" uses "#rrggbbaa" (alpha *= 255).
-     */
-    toHexString(includeAlpha?: boolean): string;
-
-    /**
-     * The color distance (0.0 - 1.0) of the way between this color and othercolor.
-     */
-    transition(othercolor: JQueryColor, distance: number): JQueryColor;
-
-    /**
-     * Will apply this color on top of the other color using alpha blending.
-     */
-    blend(othercolor: JQueryColor): void;
-
-    /**
-     * Checks if two colors are equal.
-     */
-    is(otherColor: JQueryColor): boolean;
-}
-
-interface HslaColor {
-    hue?: number;
-    saturation?: number;
-    lightness?: number;
-    alpha?: number;
-}
-
-interface RgbaColor {
-    red?: number;
-    green?: number;
-    blue?: number;
-    alpha?: number;
-}
-
-interface JQueryStatic {
-    Color(color: HslaColor): JQueryColor;
-    Color(color: RgbaColor): JQueryColor;
-    Color(color: string): JQueryColor;
-}
diff --git a/jquery.color/tsconfig.json b/jquery.color/tsconfig.json
new file mode 100644
index 0000000000..8f9ba28aaf
--- /dev/null
+++ b/jquery.color/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.color-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.colorbox/index.d.ts b/jquery.colorbox/index.d.ts
new file mode 100644
index 0000000000..2ec737fd44
--- /dev/null
+++ b/jquery.colorbox/index.d.ts
@@ -0,0 +1,303 @@
+// Type definitions for jQuery.Colorbox 1.4.15
+// Project: http://www.jacklmoore.com/colorbox/
+// Definitions by: Gidon Junge <https://github.com/gjunge>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/
+
+/// <reference types="jquery" />
+
+interface ColorboxResizeSettings {
+    height?: number;
+    innerHeight?: number;
+    width?: number;
+    innerWidth?: number;
+}
+
+interface ColorboxSettings {
+    /**
+    * The transition type. Can be set to "elastic", "fade", or "none".
+    */
+    transition?: string;
+    /**
+    * Sets the speed of the fade and elastic transitions, in milliseconds.
+    */
+    speed?: number;
+    /**
+    * This can be used as an alternative anchor URL or to associate a URL for non-anchor elements such as images or form buttons.
+    */
+    href?: any;
+    /**
+    * This can be used as an anchor title alternative for Colorbox.
+    */
+    title?: any;
+    /**
+    * This can be used as an anchor rel alternative for Colorbox.
+    */
+    rel?: any;
+    /**
+    * If true, and if maxWidth, maxHeight, innerWidth, innerHeight, width, or height have been defined, Colorbox will scale photos to fit within the those values.
+    */
+    scalePhotos?: boolean;
+    /**
+    * If false, Colorbox will hide scrollbars for overflowing content.
+    */
+    scrolling?: boolean;
+    /**
+    * The overlay opacity level. Range: 0 to 1.
+    */
+    opacity?: number;
+    /**
+    * If true, Colorbox will immediately open.
+    */
+    open?: boolean;
+    /**
+    * If true, focus will be returned when Colorbox exits to the element it was launched from.
+    */
+    returnFocus?: boolean;
+    /**
+    * If false, the loading graphic removal and onComplete event will be delayed until iframe's content has completely loaded.
+    */
+    fastIframe?: boolean;
+    /**
+    * Allows for preloading of 'Next' and 'Previous' content in a group, after the current content has finished loading. Set to false to disable.
+    */
+    preloading?: boolean;
+    /**
+    * If false, disables closing Colorbox by clicking on the background overlay.
+    */
+    overlayClose?: boolean;
+    /**
+    * If false, will disable closing colorbox on 'esc' key press.
+    */
+    escKey?: boolean;
+    /**
+    * If false, will disable the left and right arrow keys from navigating between the items in a group.
+    */
+    arrowKey?: boolean;
+    /**
+    * If false, will disable the ability to loop back to the beginning of the group when on the last element.
+    */
+    loop?: boolean;
+    /**
+    * For submitting GET or POST values through an ajax request. The data property will act exactly like jQuery's .load() data argument, as Colorbox uses .load() for ajax handling.
+    */
+    data?: any;
+    /**
+    * Adds a given class to colorbox and the overlay.
+    */
+    className?: any;
+    /**
+    * Sets the fadeOut speed, in milliseconds, when closing Colorbox.
+    */
+    fadeOut?: number;
+    /**
+    * Text or HTML for the group counter while viewing a group. {current} and {total} are detected and replaced with actual numbers while Colorbox runs.
+    */
+    current?: string;
+    /**
+    * Text or HTML for the previous button while viewing a group.
+    */
+    previous?: string;
+    /**
+    * Text or HTML for the next button while viewing a group.
+    */
+    next?: string;
+    /**
+    * Text or HTML for the close button. The 'esc' key will also close Colorbox.
+    */
+    close?: string;
+    /**
+    * Set to false to remove the close button.
+    */
+    closeButton?: boolean;
+    /**
+    * Error message given when ajax content for a given URL cannot be loaded.
+    */
+    xhrError?: string;
+    /**
+    * Error message given when a link to an image fails to load.
+    */
+    imgError?: string;
+    /**
+    * If true, specifies that content should be displayed in an iFrame.
+    */
+    iframe?: boolean;
+    /**
+    * If true, content from the current document can be displayed by passing the href property a jQuery selector, or jQuery object.
+    */
+    inline?: boolean;
+    /**
+    * For displaying a string of HTML or text: $.colorbox({html:"<p>Hello</p>"});
+    */
+    html?: any;
+    /**
+    * If true, this setting forces Colorbox to display a link as a photo. Use this when automatic photo detection fails (such as using a url like 'photo.php' instead of 'photo.jpg')
+    */
+    photo?: boolean;
+    /**
+    * This property isn't actually used as Colorbox assumes all hrefs should be treated as either ajax or photos, unless one of the other content types were specified.
+    */
+    ajax?: any;
+    /**
+    * Set a fixed total width. This includes borders and buttons. Example: "100%", "500px", or 500
+    */
+    width?: any;
+    /**
+    * Set a fixed total height. This includes borders and buttons. Example: "100%", "500px", or 500
+    */
+    height?: any;
+    /**
+    * This is an alternative to 'width' used to set a fixed inner width. This excludes borders and buttons. Example: "50%", "500px", or 500
+    */
+    innerWidth?: any;
+    /**
+    * This is an alternative to 'height' used to set a fixed inner height. This excludes borders and buttons. Example: "50%", "500px", or 500
+    */
+    innerHeight?: any;
+    /**
+    * Set the initial width, prior to any content being loaded.
+    */
+    initialWidth?: number;
+    /**
+    * Set the initial height, prior to any content being loaded.
+    */
+    initialHeight?: number;
+    /**
+    * Set a maximum width for loaded content. Example: "100%", 500, "500px"
+    */
+    maxWidth?: any;
+    /**
+    * Set a maximum height for loaded content. Example: "100%", 500, "500px"
+    */
+    maxHeight?: any;
+    /**
+    * If true, adds an automatic slideshow to a content group / gallery.
+    */
+    slideshow?: boolean;
+    /**
+    * Sets the speed of the slideshow, in milliseconds.
+    */
+    slideshowSpeed?: number;
+    /**
+    * If true, the slideshow will automatically start to play.
+    */
+    slideshowAuto?: boolean;
+    /**
+    * Text for the slideshow start button.
+    */
+    slideshowStart?: string;
+    /**
+    * Text for the slideshow stop button
+    */
+    slideshowStop?: string;
+    /**
+    * If true, Colorbox will be displayed in a fixed position within the visitor's viewport. This is unlike the default absolute positioning relative to the document.
+    */
+    fixed?: boolean;
+    /**
+    * Accepts a pixel or percent value (50, "50px", "10%"). Controls Colorbox's vertical positioning instead of using the default position of being centered in the viewport.
+    */
+    top?: any;
+    /**
+    * Accepts a pixel or percent value (50, "50px", "10%"). Controls Colorbox's vertical positioning instead of using the default position of being centered in the viewport.
+    */
+    bottom?: any;
+    /**
+    * Accepts a pixel or percent value (50, "50px", "10%"). Controls Colorbox's horizontal positioning instead of using the default position of being centered in the viewport.
+    */
+    left?: any;
+    /**
+    * Accepts a pixel or percent value (50, "50px", "10%"). Controls Colorbox's horizontal positioning instead of using the default position of being centered in the viewport.
+    */
+    right?: any;
+    /**
+    * Repositions Colorbox if the window's resize event is fired.
+    */
+    reposition?: boolean;
+    /**
+    * If true, Colorbox will scale down the current photo to match the screen's pixel ratio
+    */
+    retinaImage?: boolean;
+    /**
+    * If true and the device has a high resolution display, Colorbox will replace the current photo's file extention with the retinaSuffix+extension
+    */
+    retinaUrl?: boolean;
+    /**
+    * If retinaUrl is true and the device has a high resolution display, the href value will have it's extention extended with this suffix. For example, the default value would change `my-photo.jpg` to `my-photo@2x.jpg`
+    */
+    retinaSuffix?: string;
+    /**
+    * Callback that fires right before Colorbox begins to open.
+    */
+    onOpen?: any;
+    /**
+    * Callback that fires right before attempting to load the target content.
+    */
+    onLoad?: any;
+    /**
+    * Callback that fires right after loaded content is displayed.
+    */
+    onComplete?: any;
+    /**
+    * Callback that fires at the start of the close process.
+    */
+    onCleanup?: any;
+    /**
+    * Callback that fires once Colorbox is closed.
+    */
+    onClosed?: any;
+}
+
+interface ColorboxStatic {
+
+    /**
+    * This method allows you to call Colorbox without having to assign it to an element.
+    */
+    (settings: ColorboxSettings): any;
+    /**
+    * This method moves to the next item in a group and are the same as pressing the 'next' or 'previous' buttons.
+    */
+    next(): void;
+    /**
+    * This method moves to the previous item in a group and are the same as pressing the 'next' or 'previous' buttons.
+    */
+    prev(): void;
+    /**
+    * This method initiates the close sequence, which does not immediately complete. The lightbox will be completely closed only when the cbox_closed event / onClosed callback is fired.
+    */
+    close(): void;
+    /**
+    * This method is used to fetch the current HTML element that Colorbox is associated with. 
+    */
+    element(): JQuery;
+    /**
+    * This allows Colorbox to be resized based on it's own auto-calculations, or to a specific size. This must be called manually after Colorbox's content has loaded. 
+    */
+    resize(): void;
+    /**
+    * This allows Colorbox to be resized based on it's own auto-calculations, or to a specific size. This must be called manually after Colorbox's content has loaded. 
+    */
+    resize(settings: ColorboxResizeSettings): void;
+    /**
+    * Removes all traces of Colorbox from the document.
+    */
+    remove(): void;
+    /**
+    * Default settings used for Colorbox calls
+    */
+    settings: ColorboxSettings;
+
+}
+
+interface Colorbox {
+    (): JQuery;
+    (settings: ColorboxSettings): JQuery;
+
+}
+
+interface JQueryStatic {
+    colorbox: ColorboxStatic;
+}
+
+interface JQuery {
+    colorbox: Colorbox;
+}
diff --git a/jquery.colorbox/jquery.colorbox-tests.ts b/jquery.colorbox/jquery.colorbox-tests.ts
index 0a1da0bd7f..48762f9e9c 100644
--- a/jquery.colorbox/jquery.colorbox-tests.ts
+++ b/jquery.colorbox/jquery.colorbox-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.colorbox.d.ts"/>
+/// <reference types="jquery"/>
 
 //Image gallery
 var gallery : JQuery = $('a.gallery').colorbox({ rel: 'gal' });
diff --git a/jquery.colorbox/jquery.colorbox-tests.ts.tscparams b/jquery.colorbox/jquery.colorbox-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jquery.colorbox/jquery.colorbox-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jquery.colorbox/jquery.colorbox.d.ts b/jquery.colorbox/jquery.colorbox.d.ts
deleted file mode 100644
index 4af0e7e87f..0000000000
--- a/jquery.colorbox/jquery.colorbox.d.ts
+++ /dev/null
@@ -1,303 +0,0 @@
-// Type definitions for jQuery.Colorbox 1.4.15
-// Project: http://www.jacklmoore.com/colorbox/
-// Definitions by: Gidon Junge <https://github.com/gjunge>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface ColorboxResizeSettings {
-    height?: number;
-    innerHeight?: number;
-    width?: number;
-    innerWidth?: number;
-}
-
-interface ColorboxSettings {
-    /**
-    * The transition type. Can be set to "elastic", "fade", or "none".
-    */
-    transition?: string;
-    /**
-    * Sets the speed of the fade and elastic transitions, in milliseconds.
-    */
-    speed?: number;
-    /**
-    * This can be used as an alternative anchor URL or to associate a URL for non-anchor elements such as images or form buttons.
-    */
-    href?: any;
-    /**
-    * This can be used as an anchor title alternative for Colorbox.
-    */
-    title?: any;
-    /**
-    * This can be used as an anchor rel alternative for Colorbox.
-    */
-    rel?: any;
-    /**
-    * If true, and if maxWidth, maxHeight, innerWidth, innerHeight, width, or height have been defined, Colorbox will scale photos to fit within the those values.
-    */
-    scalePhotos?: boolean;
-    /**
-    * If false, Colorbox will hide scrollbars for overflowing content.
-    */
-    scrolling?: boolean;
-    /**
-    * The overlay opacity level. Range: 0 to 1.
-    */
-    opacity?: number;
-    /**
-    * If true, Colorbox will immediately open.
-    */
-    open?: boolean;
-    /**
-    * If true, focus will be returned when Colorbox exits to the element it was launched from.
-    */
-    returnFocus?: boolean;
-    /**
-    * If false, the loading graphic removal and onComplete event will be delayed until iframe's content has completely loaded.
-    */
-    fastIframe?: boolean;
-    /**
-    * Allows for preloading of 'Next' and 'Previous' content in a group, after the current content has finished loading. Set to false to disable.
-    */
-    preloading?: boolean;
-    /**
-    * If false, disables closing Colorbox by clicking on the background overlay.
-    */
-    overlayClose?: boolean;
-    /**
-    * If false, will disable closing colorbox on 'esc' key press.
-    */
-    escKey?: boolean;
-    /**
-    * If false, will disable the left and right arrow keys from navigating between the items in a group.
-    */
-    arrowKey?: boolean;
-    /**
-    * If false, will disable the ability to loop back to the beginning of the group when on the last element.
-    */
-    loop?: boolean;
-    /**
-    * For submitting GET or POST values through an ajax request. The data property will act exactly like jQuery's .load() data argument, as Colorbox uses .load() for ajax handling.
-    */
-    data?: any;
-    /**
-    * Adds a given class to colorbox and the overlay.
-    */
-    className?: any;
-    /**
-    * Sets the fadeOut speed, in milliseconds, when closing Colorbox.
-    */
-    fadeOut?: number;
-    /**
-    * Text or HTML for the group counter while viewing a group. {current} and {total} are detected and replaced with actual numbers while Colorbox runs.
-    */
-    current?: string;
-    /**
-    * Text or HTML for the previous button while viewing a group.
-    */
-    previous?: string;
-    /**
-    * Text or HTML for the next button while viewing a group.
-    */
-    next?: string;
-    /**
-    * Text or HTML for the close button. The 'esc' key will also close Colorbox.
-    */
-    close?: string;
-    /**
-    * Set to false to remove the close button.
-    */
-    closeButton?: boolean;
-    /**
-    * Error message given when ajax content for a given URL cannot be loaded.
-    */
-    xhrError?: string;
-    /**
-    * Error message given when a link to an image fails to load.
-    */
-    imgError?: string;
-    /**
-    * If true, specifies that content should be displayed in an iFrame.
-    */
-    iframe?: boolean;
-    /**
-    * If true, content from the current document can be displayed by passing the href property a jQuery selector, or jQuery object.
-    */
-    inline?: boolean;
-    /**
-    * For displaying a string of HTML or text: $.colorbox({html:"<p>Hello</p>"});
-    */
-    html?: any;
-    /**
-    * If true, this setting forces Colorbox to display a link as a photo. Use this when automatic photo detection fails (such as using a url like 'photo.php' instead of 'photo.jpg')
-    */
-    photo?: boolean;
-    /**
-    * This property isn't actually used as Colorbox assumes all hrefs should be treated as either ajax or photos, unless one of the other content types were specified.
-    */
-    ajax?: any;
-    /**
-    * Set a fixed total width. This includes borders and buttons. Example: "100%", "500px", or 500
-    */
-    width?: any;
-    /**
-    * Set a fixed total height. This includes borders and buttons. Example: "100%", "500px", or 500
-    */
-    height?: any;
-    /**
-    * This is an alternative to 'width' used to set a fixed inner width. This excludes borders and buttons. Example: "50%", "500px", or 500
-    */
-    innerWidth?: any;
-    /**
-    * This is an alternative to 'height' used to set a fixed inner height. This excludes borders and buttons. Example: "50%", "500px", or 500
-    */
-    innerHeight?: any;
-    /**
-    * Set the initial width, prior to any content being loaded.
-    */
-    initialWidth?: number;
-    /**
-    * Set the initial height, prior to any content being loaded.
-    */
-    initialHeight?: number;
-    /**
-    * Set a maximum width for loaded content. Example: "100%", 500, "500px"
-    */
-    maxWidth?: any;
-    /**
-    * Set a maximum height for loaded content. Example: "100%", 500, "500px"
-    */
-    maxHeight?: any;
-    /**
-    * If true, adds an automatic slideshow to a content group / gallery.
-    */
-    slideshow?: boolean;
-    /**
-    * Sets the speed of the slideshow, in milliseconds.
-    */
-    slideshowSpeed?: number;
-    /**
-    * If true, the slideshow will automatically start to play.
-    */
-    slideshowAuto?: boolean;
-    /**
-    * Text for the slideshow start button.
-    */
-    slideshowStart?: string;
-    /**
-    * Text for the slideshow stop button
-    */
-    slideshowStop?: string;
-    /**
-    * If true, Colorbox will be displayed in a fixed position within the visitor's viewport. This is unlike the default absolute positioning relative to the document.
-    */
-    fixed?: boolean;
-    /**
-    * Accepts a pixel or percent value (50, "50px", "10%"). Controls Colorbox's vertical positioning instead of using the default position of being centered in the viewport.
-    */
-    top?: any;
-    /**
-    * Accepts a pixel or percent value (50, "50px", "10%"). Controls Colorbox's vertical positioning instead of using the default position of being centered in the viewport.
-    */
-    bottom?: any;
-    /**
-    * Accepts a pixel or percent value (50, "50px", "10%"). Controls Colorbox's horizontal positioning instead of using the default position of being centered in the viewport.
-    */
-    left?: any;
-    /**
-    * Accepts a pixel or percent value (50, "50px", "10%"). Controls Colorbox's horizontal positioning instead of using the default position of being centered in the viewport.
-    */
-    right?: any;
-    /**
-    * Repositions Colorbox if the window's resize event is fired.
-    */
-    reposition?: boolean;
-    /**
-    * If true, Colorbox will scale down the current photo to match the screen's pixel ratio
-    */
-    retinaImage?: boolean;
-    /**
-    * If true and the device has a high resolution display, Colorbox will replace the current photo's file extention with the retinaSuffix+extension
-    */
-    retinaUrl?: boolean;
-    /**
-    * If retinaUrl is true and the device has a high resolution display, the href value will have it's extention extended with this suffix. For example, the default value would change `my-photo.jpg` to `my-photo@2x.jpg`
-    */
-    retinaSuffix?: string;
-    /**
-    * Callback that fires right before Colorbox begins to open.
-    */
-    onOpen?: any;
-    /**
-    * Callback that fires right before attempting to load the target content.
-    */
-    onLoad?: any;
-    /**
-    * Callback that fires right after loaded content is displayed.
-    */
-    onComplete?: any;
-    /**
-    * Callback that fires at the start of the close process.
-    */
-    onCleanup?: any;
-    /**
-    * Callback that fires once Colorbox is closed.
-    */
-    onClosed?: any;
-}
-
-interface ColorboxStatic {
-
-    /**
-    * This method allows you to call Colorbox without having to assign it to an element.
-    */
-    (settings: ColorboxSettings);
-    /**
-    * This method moves to the next item in a group and are the same as pressing the 'next' or 'previous' buttons.
-    */
-    next(): void;
-    /**
-    * This method moves to the previous item in a group and are the same as pressing the 'next' or 'previous' buttons.
-    */
-    prev(): void;
-    /**
-    * This method initiates the close sequence, which does not immediately complete. The lightbox will be completely closed only when the cbox_closed event / onClosed callback is fired.
-    */
-    close(): void;
-    /**
-    * This method is used to fetch the current HTML element that Colorbox is associated with. 
-    */
-    element(): JQuery;
-    /**
-    * This allows Colorbox to be resized based on it's own auto-calculations, or to a specific size. This must be called manually after Colorbox's content has loaded. 
-    */
-    resize(): void;
-    /**
-    * This allows Colorbox to be resized based on it's own auto-calculations, or to a specific size. This must be called manually after Colorbox's content has loaded. 
-    */
-    resize(settings: ColorboxResizeSettings): void;
-    /**
-    * Removes all traces of Colorbox from the document.
-    */
-    remove(): void;
-    /**
-    * Default settings used for Colorbox calls
-    */
-    settings: ColorboxSettings;
-
-}
-
-interface Colorbox {
-    (): JQuery;
-    (settings: ColorboxSettings): JQuery;
-
-}
-
-interface JQueryStatic {
-    colorbox: ColorboxStatic;
-}
-
-interface JQuery {
-    colorbox: Colorbox;
-}
diff --git a/jquery.colorbox/jquery.colorbox.d.ts.tscparams b/jquery.colorbox/jquery.colorbox.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jquery.colorbox/jquery.colorbox.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jquery.colorbox/tsconfig.json b/jquery.colorbox/tsconfig.json
new file mode 100644
index 0000000000..f27b57bcdd
--- /dev/null
+++ b/jquery.colorbox/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.colorbox-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.colorpicker/index.d.ts b/jquery.colorpicker/index.d.ts
new file mode 100644
index 0000000000..04508b14f1
--- /dev/null
+++ b/jquery.colorpicker/index.d.ts
@@ -0,0 +1,164 @@
+// Type definitions for jQuery Colorpicker Plugin 1.4.3
+// Project: https://github.com/vanderlee/colorpicker
+// Definitions by: Jeffery Grajkowski <https://github.com/pushplay/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface JQueryColorpickerOptions {
+    // Events
+    // TODO: Figure out actual types.
+    cancel: Function,
+    close: Function,
+    init: Function,
+    select: Function,
+    ok: Function,
+    open: Function,
+
+    alpha?: boolean;
+    altAlpha?: boolean;
+    altField?: string;
+    altOnChange?: boolean;
+    altProperties?: string;
+    autoOpen?: boolean;
+    buttonClass?: string;
+    buttonColorize?: boolean;
+    buttonImage?: string;
+    buttonImageOnly?: boolean;
+    buttonText?: string;
+    closeOnEscape?: boolean;
+    closeOnOutside?: boolean;
+    color?: string;
+    colorFormat?: string;
+    draggable?: boolean;
+    duration?: string;
+    hsv?: boolean;
+    inline?: boolean;
+    inlineFrame?: boolean;
+    layout?: {[part: string]: number[];};
+    limit?: string;
+    modal?: boolean;
+    mode?: string;
+    okOnEnter?: boolean;
+    part?: any;
+    parts?: any;
+    regional?: string;
+    revert?: boolean;
+    rgb?: boolean;
+    showAnim?: string;
+    showCancelButton?: boolean;
+    showCloseButton?: boolean;
+    showNoneButton?: boolean;
+    showOn?: string;
+    showOptions?: any;
+    swatches?: any;
+    swatchesWidth?: number;
+    title?: string;
+}
+
+interface JQueryColorpickerStatic {
+    limits: { [name: string]: (color: any) => void; };
+    parsers: { [name: string]: (color: any) => any; };
+    parts: { [name: string]: (inst: any) => any; };
+    partslists: { [name: string]: string[]; };
+    regional: { [key: string]: string; };
+    swatches: { [swatch: string]: { [name: string]: JQueryColorpickerStatic.RGB; }; };
+    writers: { [name: string]: (color: any, that: any) => any; };
+    Color: { new (r?: number, g?: number, b?: number, a?: number): JQueryColorpickerStatic.Color; };
+}
+
+declare namespace JQueryColorpickerStatic {
+    export interface CMYK {
+        c: number;
+        m: number;
+        y: number;
+        k: number;
+    }
+    export interface HSL {
+        h: number;
+        s: number;
+        l: number;
+    }
+    export interface HSV {
+        h: number;
+        s: number;
+        v: number;
+    }
+    export interface LAB {
+        l: number;
+        a: number;
+        b: number;
+    }
+    export interface RGB {
+        r: number;
+        g: number;
+        b: number;
+    }
+    export interface Color {
+        set: boolean;
+        copy(): Color;
+        distance(color: Color): number;
+        equals(color: Color): boolean;
+        getAlpha(): number;
+        getChannels(): {
+            A: number;
+            B: number;
+            L: number;
+            a: number;
+            b: number;
+            c: number;
+            g: number;
+            h: number;
+            k: number;
+            m: number;
+            r: number;
+            s: number;
+            v: number;
+            y: number;
+        };
+        getCMYK(): CMYK;
+        getHSL(): HSL;
+        getHSV(): HSV;
+        getLAB(): LAB;
+        getRGB(): RGB;
+        getSpaces(): {
+            cmyk: CMYK;
+            hsl: HSL;
+            hsv: HSV;
+            lab: LAB;
+            rgb: RGB;
+        };
+        limit(steps: number): void;
+        normalize(): Color;
+        setAlpha(a: number): Color;
+        setCMYK(c: number, m: number, y: number, k: number): Color;
+        setHSL(h: number, s: number, l: number): Color;
+        setHSV(h: number, s: number, v: number): Color;
+        setLAB(l: number, a: number, b: number): Color;
+        setRGB(r: number, g: number, b: number): Color;
+        setSpaces(new_spaces: any): Color;
+        toCSS(): string;
+        toHEX(): string;
+    }
+}
+
+interface JQueryColorpickerInstance {
+    close(): void;
+    destroy(): void;
+    open(): void;
+    setColor(color: any): void;
+}
+
+interface JQueryStatic {
+    colorpicker: JQueryColorpickerStatic;
+}
+
+interface JQuery {
+    colorpicker(method: "close"): JQuery;
+    colorpicker(method: "destroy"): JQuery;
+    colorpicker(method: "open"): JQuery;
+    colorpicker(method: string): JQuery;
+    colorpicker(method: "setColor", color: any): JQuery;
+    colorpicker(method: string, param: any): JQuery;
+    colorpicker(options?: JQueryColorpickerOptions): JQuery;
+}
diff --git a/jquery.colorpicker/jquery.colorpicker-tests.ts b/jquery.colorpicker/jquery.colorpicker-tests.ts
index 4d38c9b67f..707e2dd7f9 100644
--- a/jquery.colorpicker/jquery.colorpicker-tests.ts
+++ b/jquery.colorpicker/jquery.colorpicker-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="jquery.colorpicker.d.ts"/>
-/// <reference path="../jqueryui/jqueryui.d.ts" />
+/// <reference types="jqueryui" />
 
 // Default options copied from the source
 var colorpicker = $("<input type=\"text\"/>").colorpicker({
diff --git a/jquery.colorpicker/jquery.colorpicker-tests.ts.tscparams b/jquery.colorpicker/jquery.colorpicker-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jquery.colorpicker/jquery.colorpicker-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jquery.colorpicker/jquery.colorpicker.d.ts b/jquery.colorpicker/jquery.colorpicker.d.ts
deleted file mode 100644
index 0f904b8c1c..0000000000
--- a/jquery.colorpicker/jquery.colorpicker.d.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-// Type definitions for jQuery Colorpicker Plugin 1.4.3
-// Project: https://github.com/vanderlee/colorpicker
-// Definitions by: Jeffery Grajkowski <https://github.com/pushplay/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface JQueryColorpickerOptions {
-    // Events
-    // TODO: Figure out actual types.
-    cancel: Function,
-    close: Function,
-    init: Function,
-    select: Function,
-    ok: Function,
-    open: Function,
-
-    alpha?: boolean;
-    altAlpha?: boolean;
-    altField?: string;
-    altOnChange?: boolean;
-    altProperties?: string;
-    autoOpen?: boolean;
-    buttonClass?: string;
-    buttonColorize?: boolean;
-    buttonImage?: string;
-    buttonImageOnly?: boolean;
-    buttonText?: string;
-    closeOnEscape?: boolean;
-    closeOnOutside?: boolean;
-    color?: string;
-    colorFormat?: string;
-    draggable?: boolean;
-    duration?: string;
-    hsv?: boolean;
-    inline?: boolean;
-    inlineFrame?: boolean;
-    layout?: {[part: string]: number[];};
-    limit?: string;
-    modal?: boolean;
-    mode?: string;
-    okOnEnter?: boolean;
-    part?: any;
-    parts?: any;
-    regional?: string;
-    revert?: boolean;
-    rgb?: boolean;
-    showAnim?: string;
-    showCancelButton?: boolean;
-    showCloseButton?: boolean;
-    showNoneButton?: boolean;
-    showOn?: string;
-    showOptions?: any;
-    swatches?: any;
-    swatchesWidth?: number;
-    title?: string;
-}
-
-interface JQueryColorpickerStatic {
-    limits: { [name: string]: (color: any) => void; };
-    parsers: { [name: string]: (color: any) => any; };
-    parts: { [name: string]: (inst: any) => any; };
-    partslists: { [name: string]: string[]; };
-    regional: { [key: string]: string; };
-    swatches: { [swatch: string]: { [name: string]: JQueryColorpickerStatic.RGB; }; };
-    writers: { [name: string]: (color: any, that: any) => any; };
-    Color: { new (r?: number, g?: number, b?: number, a?: number): JQueryColorpickerStatic.Color; };
-}
-
-declare namespace JQueryColorpickerStatic {
-    export interface CMYK {
-        c: number;
-        m: number;
-        y: number;
-        k: number;
-    }
-    export interface HSL {
-        h: number;
-        s: number;
-        l: number;
-    }
-    export interface HSV {
-        h: number;
-        s: number;
-        v: number;
-    }
-    export interface LAB {
-        l: number;
-        a: number;
-        b: number;
-    }
-    export interface RGB {
-        r: number;
-        g: number;
-        b: number;
-    }
-    export interface Color {
-        set: boolean;
-        copy(): Color;
-        distance(color: Color): number;
-        equals(color: Color): boolean;
-        getAlpha(): number;
-        getChannels(): {
-            A: number;
-            B: number;
-            L: number;
-            a: number;
-            b: number;
-            c: number;
-            g: number;
-            h: number;
-            k: number;
-            m: number;
-            r: number;
-            s: number;
-            v: number;
-            y: number;
-        };
-        getCMYK(): CMYK;
-        getHSL(): HSL;
-        getHSV(): HSV;
-        getLAB(): LAB;
-        getRGB(): RGB;
-        getSpaces(): {
-            cmyk: CMYK;
-            hsl: HSL;
-            hsv: HSV;
-            lab: LAB;
-            rgb: RGB;
-        };
-        limit(steps: number): void;
-        normalize(): Color;
-        setAlpha(a: number): Color;
-        setCMYK(c: number, m: number, y: number, k: number): Color;
-        setHSL(h: number, s: number, l: number): Color;
-        setHSV(h: number, s: number, v: number): Color;
-        setLAB(l: number, a: number, b: number): Color;
-        setRGB(r: number, g: number, b: number): Color;
-        setSpaces(new_spaces: any): Color;
-        toCSS(): string;
-        toHEX(): string;
-    }
-}
-
-interface JQueryColorpickerInstance {
-    close(): void;
-    destroy(): void;
-    open(): void;
-    setColor(color: any): void;
-}
-
-interface JQueryStatic {
-    colorpicker: JQueryColorpickerStatic;
-}
-
-interface JQuery {
-    colorpicker(method: "close"): JQuery;
-    colorpicker(method: "destroy"): JQuery;
-    colorpicker(method: "open"): JQuery;
-    colorpicker(method: string): JQuery;
-    colorpicker(method: "setColor", color: any): JQuery;
-    colorpicker(method: string, param: any): JQuery;
-    colorpicker(options?: JQueryColorpickerOptions): JQuery;
-}
diff --git a/jquery.colorpicker/tsconfig.json b/jquery.colorpicker/tsconfig.json
new file mode 100644
index 0000000000..e4a8456a58
--- /dev/null
+++ b/jquery.colorpicker/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.colorpicker-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.contextMenu/index.d.ts b/jquery.contextMenu/index.d.ts
new file mode 100644
index 0000000000..e56843ba81
--- /dev/null
+++ b/jquery.contextMenu/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for jQuery contextMenu 1.7.0
+// Project: http://medialize.github.com/jQuery-contextMenu/
+// Definitions by: Natan Vivo <https://github.com/nvivo/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface JQueryContextMenuOptions {
+    selector: string;
+    appendTo?: string;
+    trigger?: string;
+    autoHide?: boolean;
+    delay?: number;
+    determinePosition?: (menu: JQuery) => void;
+    position?: (opt: JQuery, x: number, y: number) => void;
+    positionSubmenu?: (menu: JQuery) => void;
+    zIndex?: number;
+    animation?: {
+        duration?: number;
+        show?: string;
+        hide?: string;
+    };
+    events?: {
+        show?: () => void;
+        hide?: () => void;
+    };
+    callback?: (key: any, options: any) => any;
+    items: any;
+    reposition?: boolean;
+    className?: string;
+}
+
+interface JQueryStatic {
+    contextMenu(options?: JQueryContextMenuOptions): JQuery;
+    contextMenu(type: string, selector?: any): JQuery;
+}
+
+interface JQuery {
+    contextMenu(options?: any): JQuery;
+}
diff --git a/jquery.contextMenu/jquery.contextMenu-tests.ts b/jquery.contextMenu/jquery.contextMenu-tests.ts
index df1b479436..9e58851cff 100644
--- a/jquery.contextMenu/jquery.contextMenu-tests.ts
+++ b/jquery.contextMenu/jquery.contextMenu-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./jquery.contextMenu.d.ts" />
+
 
 //http://medialize.github.io/jQuery-contextMenu/docs.html
 
diff --git a/jquery.contextMenu/jquery.contextMenu.d.ts b/jquery.contextMenu/jquery.contextMenu.d.ts
deleted file mode 100644
index 030a83f9f6..0000000000
--- a/jquery.contextMenu/jquery.contextMenu.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// Type definitions for jQuery contextMenu 1.7.0
-// Project: http://medialize.github.com/jQuery-contextMenu/
-// Definitions by: Natan Vivo <https://github.com/nvivo/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface JQueryContextMenuOptions {
-    selector: string;
-    appendTo?: string;
-    trigger?: string;
-    autoHide?: boolean;
-    delay?: number;
-    determinePosition?: (menu: JQuery) => void;
-    position?: (opt: JQuery, x: number, y: number) => void;
-    positionSubmenu?: (menu: JQuery) => void;
-    zIndex?: number;
-    animation?: {
-        duration?: number;
-        show?: string;
-        hide?: string;
-    };
-    events?: {
-        show?: () => void;
-        hide?: () => void;
-    };
-    callback?: (key: any, options: any) => any;
-    items: any;
-    reposition?: boolean;
-    className?: string;
-}
-
-interface JQueryStatic {
-    contextMenu(options?: JQueryContextMenuOptions): JQuery;
-    contextMenu(type: string, selector?: any): JQuery;
-}
-
-interface JQuery {
-    contextMenu(options?: any): JQuery;
-}
diff --git a/jquery.contextMenu/tsconfig.json b/jquery.contextMenu/tsconfig.json
new file mode 100644
index 0000000000..1f29bf9be6
--- /dev/null
+++ b/jquery.contextMenu/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.contextMenu-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.cookie/index.d.ts b/jquery.cookie/index.d.ts
new file mode 100644
index 0000000000..8c3ef6190d
--- /dev/null
+++ b/jquery.cookie/index.d.ts
@@ -0,0 +1,106 @@
+// Type definitions for jQuery Cookie Plugin 1.4.1
+// Project: https://github.com/carhartl/jquery-cookie
+// Definitions by: Roy Goode <https://github.com/RoyGoode/>, Ben Lorantfy <https://github.com/BenLorantfy/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="jquery" />
+
+
+interface JQueryCookieOptions {
+    /**
+     * Define lifetime of the cookie. Value can be a Number which will be interpreted as days from time of creation or a Date object. If omitted, the cookie becomes a session cookie.
+     */
+    expires?: any;
+    /**
+     * Define the path where the cookie is valid. By default the path of the cookie is the path of the page where the cookie was created (standard browser behavior). If you want to make it available for instance across the entire domain use path: '/'. Default: path of page where the cookie was created.
+     */
+    path?: string;
+    /**
+     * Define the domain where the cookie is valid. Default: domain of page where the cookie was created.
+     */
+    domain?: string;
+    /**
+     * If true, the cookie transmission requires a secure protocol (https). Default: false.
+     */
+    secure?: boolean;
+}
+//
+// The following jsdoc comments are used to add intellisense to editors that support it. Uses snippets
+// of documentation from the Github repo when possible.
+// 
+// The ordering here matters. For example, the read function with the converter parameter is purposefully after
+// the set function. This is because the intellisense that shows up after you press comma should be the set first,
+// since that is more common, then the conversion function if user starts typing a parameter with a function type
+interface JQueryCookieStatic {
+    /**
+     * By default the cookie value is encoded/decoded when writing/reading, using encodeURIComponent/decodeURIComponent. Bypass this by setting raw to true:
+     */
+    raw?: boolean;
+    /**
+     * Turn on automatic storage of JSON objects passed as the cookie value. Assumes JSON.stringify and JSON.parse
+     */
+    json?: boolean;
+    /**
+     * Cookie attributes can be set globally by setting properties of the $.cookie.defaults object or individually for each call to $.cookie() by passing a plain object to the options argument. Per-call options override the default options.
+     */
+    defaults?: JQueryCookieOptions;
+    /**
+     * Gets an object of cookies as key-value pairs
+     */
+    (): {[key:string]:string};
+    /**
+     * Gets a cookie by name
+     * @param name The name of the cookie to get
+     */
+    (name: string): any;
+    /**
+     * Sets a cookie
+     * @param name The name of the cookie to set
+     * @param value The value to set the cookie to
+     */
+    (name: string, value: string): void;
+    /**
+     * Gets a cookie by name after applying a conversion function to the value
+     * @param name The name of the cookie to get
+     * @param converter A conversion function to change the cookie's value to a different representation on the fly
+     */
+    (name: string, converter: (value: string) => any): any;
+    /**
+     * Sets a cookie with some options
+     * @param name The name of the cookie to set
+     * @param value The value to set the cookie to
+     * @param options An object of options that change how the cookie is set
+     */
+    (name: string, value: string, options: JQueryCookieOptions): void;
+    /**
+     * Sets a cookie using .toString(), or if $.cookie.json is set to true using JSON.stringify()
+     * @param name The name of the cookie to set
+     * @param value The value to set the cookie to
+     */
+    (name: string, value: any): void;
+    /**
+     * Sets a cookie using .toString(), or if $.cookie.json is set to true using JSON.stringify()
+     * @param name The name of the cookie to set
+     * @param value The value to set the cookie to
+     * @param options An object of options that change how the cookie is set
+     */
+    (name: string, value: any, options: JQueryCookieOptions): void;
+}
+
+interface JQueryStatic {   
+    /**
+     * A simple, lightweight jQuery plugin for reading, writing and deleting cookies.
+     */
+    cookie?: JQueryCookieStatic;
+    /**
+     * Deletes a cookie
+     * @param name Name of cookie to delete
+     */
+    removeCookie(name: string): boolean;
+    /**
+     * Deletes a cookie
+     * @param name Name of cookie to delete
+     * @param options The same attributes (path, domain) as what the cookie was written with
+     */
+    removeCookie(name: string, options: JQueryCookieOptions): boolean;
+}
diff --git a/jquery.cookie/jquery.cookie-tests.ts b/jquery.cookie/jquery.cookie-tests.ts
index 0cbd57acd0..e93d29110c 100644
--- a/jquery.cookie/jquery.cookie-tests.ts
+++ b/jquery.cookie/jquery.cookie-tests.ts
@@ -1,5 +1,4 @@
-///<reference path="../jquery/jquery.d.ts" />
-///<reference path="jquery.cookie.d.ts" />
+/// <reference types="jquery" />
 
 class TestObject {
     text: string;
diff --git a/jquery.cookie/jquery.cookie.d.ts b/jquery.cookie/jquery.cookie.d.ts
deleted file mode 100644
index cf63005fce..0000000000
--- a/jquery.cookie/jquery.cookie.d.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-// Type definitions for jQuery Cookie Plugin 1.4.1
-// Project: https://github.com/carhartl/jquery-cookie
-// Definitions by: Roy Goode <https://github.com/RoyGoode/>, Ben Lorantfy <https://github.com/BenLorantfy/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../jquery/jquery.d.ts" />
-
-
-interface JQueryCookieOptions {
-    /**
-     * Define lifetime of the cookie. Value can be a Number which will be interpreted as days from time of creation or a Date object. If omitted, the cookie becomes a session cookie.
-     */
-    expires?: any;
-    /**
-     * Define the path where the cookie is valid. By default the path of the cookie is the path of the page where the cookie was created (standard browser behavior). If you want to make it available for instance across the entire domain use path: '/'. Default: path of page where the cookie was created.
-     */
-    path?: string;
-    /**
-     * Define the domain where the cookie is valid. Default: domain of page where the cookie was created.
-     */
-    domain?: string;
-    /**
-     * If true, the cookie transmission requires a secure protocol (https). Default: false.
-     */
-    secure?: boolean;
-}
-//
-// The following jsdoc comments are used to add intellisense to editors that support it. Uses snippets
-// of documentation from the Github repo when possible.
-// 
-// The ordering here matters. For example, the read function with the converter parameter is purposefully after
-// the set function. This is because the intellisense that shows up after you press comma should be the set first,
-// since that is more common, then the conversion function if user starts typing a parameter with a function type
-interface JQueryCookieStatic {
-    /**
-     * By default the cookie value is encoded/decoded when writing/reading, using encodeURIComponent/decodeURIComponent. Bypass this by setting raw to true:
-     */
-    raw?: boolean;
-    /**
-     * Turn on automatic storage of JSON objects passed as the cookie value. Assumes JSON.stringify and JSON.parse
-     */
-    json?: boolean;
-    /**
-     * Cookie attributes can be set globally by setting properties of the $.cookie.defaults object or individually for each call to $.cookie() by passing a plain object to the options argument. Per-call options override the default options.
-     */
-    defaults?: JQueryCookieOptions;
-    /**
-     * Gets an object of cookies as key-value pairs
-     */
-    (): {[key:string]:string};
-    /**
-     * Gets a cookie by name
-     * @param name The name of the cookie to get
-     */
-    (name: string): any;
-    /**
-     * Sets a cookie
-     * @param name The name of the cookie to set
-     * @param value The value to set the cookie to
-     */
-    (name: string, value: string): void;
-    /**
-     * Gets a cookie by name after applying a conversion function to the value
-     * @param name The name of the cookie to get
-     * @param converter A conversion function to change the cookie's value to a different representation on the fly
-     */
-    (name: string, converter: (value: string) => any): any;
-    /**
-     * Sets a cookie with some options
-     * @param name The name of the cookie to set
-     * @param value The value to set the cookie to
-     * @param options An object of options that change how the cookie is set
-     */
-    (name: string, value: string, options: JQueryCookieOptions): void;
-    /**
-     * Sets a cookie using .toString(), or if $.cookie.json is set to true using JSON.stringify()
-     * @param name The name of the cookie to set
-     * @param value The value to set the cookie to
-     */
-    (name: string, value: any): void;
-    /**
-     * Sets a cookie using .toString(), or if $.cookie.json is set to true using JSON.stringify()
-     * @param name The name of the cookie to set
-     * @param value The value to set the cookie to
-     * @param options An object of options that change how the cookie is set
-     */
-    (name: string, value: any, options: JQueryCookieOptions): void;
-}
-
-interface JQueryStatic {   
-    /**
-     * A simple, lightweight jQuery plugin for reading, writing and deleting cookies.
-     */
-    cookie?: JQueryCookieStatic;
-    /**
-     * Deletes a cookie
-     * @param name Name of cookie to delete
-     */
-    removeCookie(name: string): boolean;
-    /**
-     * Deletes a cookie
-     * @param name Name of cookie to delete
-     * @param options The same attributes (path, domain) as what the cookie was written with
-     */
-    removeCookie(name: string, options: JQueryCookieOptions): boolean;
-}
diff --git a/jquery.cookie/tsconfig.json b/jquery.cookie/tsconfig.json
new file mode 100644
index 0000000000..e6af7832b4
--- /dev/null
+++ b/jquery.cookie/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.cookie-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.customSelect/index.d.ts b/jquery.customSelect/index.d.ts
new file mode 100644
index 0000000000..faaf6df5af
--- /dev/null
+++ b/jquery.customSelect/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for jquery.customSelect.js 0.5.1
+// Project: http://adam.co/lab/jquery/customselect//
+// Definitions by: adamcoulombe <https://github.com/adamcoulombe>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="jquery" />
+
+interface JQueryCustomSelectOption {
+    customClass?: string;
+    mapClass?: boolean;
+    mapStyle?: boolean;
+}
+
+interface JQuery {
+    customSelect(val:JQueryCustomSelectOption): JQuery;
+}
\ No newline at end of file
diff --git a/jquery.customSelect/jquery.customSelect-tests.ts b/jquery.customSelect/jquery.customSelect-tests.ts
index ad2fb30192..b0dc9554a9 100644
--- a/jquery.customSelect/jquery.customSelect-tests.ts
+++ b/jquery.customSelect/jquery.customSelect-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="jquery.customSelect.d.ts" />
+/// <reference types="jquery" />
+
 
 class CustomSelectOptions implements JQueryCustomSelectOption {
     "customClass": string;
diff --git a/jquery.customSelect/jquery.customSelect.d.ts b/jquery.customSelect/jquery.customSelect.d.ts
deleted file mode 100644
index c98303911b..0000000000
--- a/jquery.customSelect/jquery.customSelect.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Type definitions for jquery.customSelect.js 0.5.1
-// Project: http://adam.co/lab/jquery/customselect//
-// Definitions by: adamcoulombe <https://github.com/adamcoulombe>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../jquery/jquery.d.ts" />
-
-interface JQueryCustomSelectOption {
-    customClass?: string;
-    mapClass?: boolean;
-    mapStyle?: boolean;
-}
-
-interface JQuery {
-    customSelect(val:JQueryCustomSelectOption): JQuery;
-}
\ No newline at end of file
diff --git a/jquery.customSelect/tsconfig.json b/jquery.customSelect/tsconfig.json
new file mode 100644
index 0000000000..d669877659
--- /dev/null
+++ b/jquery.customSelect/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.customSelect-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.cycle/index.d.ts b/jquery.cycle/index.d.ts
new file mode 100644
index 0000000000..3c91561f93
--- /dev/null
+++ b/jquery.cycle/index.d.ts
@@ -0,0 +1,93 @@
+// Type definitions for jQuery.cycle.js
+// Project: http://jquery.malsup.com/cycle/
+// Definitions by: François Guillot <http://fguillot.developpez.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="jquery"/>
+
+interface CycleOptions {
+    activePagerClass?: string;                                                                                                                // class name used for the active pager link
+    after?: (currSlideElement: Element, nextSlideElement: Element, options: CycleOptions, forwardFlag: boolean) => void;                         // transition callback (scope set to element that was shown):  function(currSlideElement, nextSlideElement, options, forwardFlag)
+    allowPagerClickBubble?: boolean;                                                                                                             // allows or prevents click event on pager anchors from bubbling
+    animIn?: any;                                                                                                                             // properties that define how the slide animates in
+    animOut?: any;                                                                                                                            // properties that define how the slide animates out
+    aspect?: boolean;                                                                                                                            // preserve aspect ratio during fit resizing, cropping if necessary (must be used with fit option)
+    autostop?: boolean;                                                                                                                          // true to end slideshow after X transitions (where X == slide count)
+    autostopCount?: number;                                                                                                                   // number of transitions (optionally used with autostop to define X)
+    backwards?: boolean;                                                                                                                         // true to start slideshow at last slide and move backwards through the stack
+    before?: (currSlideElement: Element, nextSlideElement: Element, options:CycleOptions, forwardFlag: boolean) => void;                         // transition callback (scope set to element to be shown):     function(currSlideElement, nextSlideElement, options, forwardFlag)
+    center?: boolean;                                                                                                                            // set to true to have cycle add top/left margin to each slide (use with width and height options)
+    cleartype?: boolean;                                                                                                                         // true if clearType corrections should be applied (for IE)
+    cleartypeNoBg?: boolean;                                                                                                                     // set to true to disable extra cleartype fixing (leave false to force background color setting on slides)
+    containerResize?: boolean;                                                                                                                   // resize container to fit largest slide
+    containerResizeHeight?: boolean;                                                                                                             // resize containers height to fit the largest slide but leave the width dynamic
+    continuous?: boolean;                                                                                                                        // true to start next transition immediately after current one completes
+    cssAfter?: any;                                                                                                                           // properties that defined the state of the slide after transitioning out
+    cssBefore?: any;                                                                                                                          // properties that define the initial state of the slide before transitioning in
+    delay?: number;                                                                                                                           // additional delay (in ms) for first transition (hint: can be negative)
+    easeIn?: string;                                                                                                                          // easing for "in" transition
+    easeOut?: string;                                                                                                                         // easing for "out" transition
+    easing?: string;                                                                                                                          // easing method for both in and out transitions
+    end?: (options: CycleOptions) => void;                                                                                                    // callback invoked when the slideshow terminates (use with autostop or nowrap options): function(options)
+    fastOnEvent?: boolean;                                                                                                                       // force fast transitions when triggered manually (via pager or prev/next); value == time in ms
+    fit?: boolean;                                                                                                                               // force slides to fit container
+    fx?: string;                                                                                                                              // name of transition effect (or comma separated names, ex: 'fade,scrollUp,shuffle')
+    fxFn?: (currSlideElement: Element, nextSlideElement: Element, options: CycleOptions, afterCalback: Function, forwardFlag: boolean) => void;  // function used to control the transition: function(currSlideElement, nextSlideElement, options, afterCalback, forwardFlag)
+    height?: any;                                                                                                                             // container height (if the 'fit' option is true, the slides will be set to this height as well)
+    manualTrump?: boolean;                                                                                                                       // causes manual transition to stop an active transition instead of being ignored
+    metaAttr?: string;                                                                                                                        // data- attribute that holds the option data for the slideshow
+    next?: any;                                                                                                                               // element, jQuery object, or jQuery selector string for the element to use as event trigger for next slide
+    nowrap?: boolean;                                                                                                                            // true to prevent slideshow from wrapping
+    onPagerEvent?: (zeroBasedSlideIndex: number, slideElement: Element) => void;                                                              // callback fn for pager events: function(zeroBasedSlideIndex, slideElement)
+    onPrevNextEvent?: (isNext: boolean, zeroBasedSlideIndex: number, slideElement: Element) => void;                                             // callback fn for prev/next events: function(isNext, zeroBasedSlideIndex, slideElement)
+    pager?: any;                                                                                                                              // element, jQuery object, or jQuery selector string for the element to use as pager container
+    pagerAnchorBuilder?: (index: number, DOMelement: Element) => string;                                                                      // callback fn for building anchor links:  function(index, DOMelement)
+    pagerEvent?: string;                                                                                                                      // name of event which drives the pager navigation
+    pause?: boolean;                                                                                                                             // true to enable "pause on hover"
+    pauseOnPagerHover?: boolean;                                                                                                                 // true to pause when hovering over pager link
+    prev?: any;                                                                                                                               // element, jQuery object, or jQuery selector string for the element to use as event trigger for previous slide
+    prevNextEvent?: string;                                                                                                                   // event which drives the manual transition to the previous or next slide
+    random?: boolean;                                                                                                                            // true for random, false for sequence (not applicable to shuffle fx)
+    randomizeEffects?: boolean;                                                                                                                  // valid when multiple effects are used; true to make the effect sequence random
+    requeueOnImageNotLoaded?: boolean;                                                                                                           // requeue the slideshow if any image slides are not yet loaded
+    requeueTimeout?: number;                                                                                                                  // ms delay for requeue
+    rev?: boolean;                                                                                                                               // causes animations to transition in reverse (for effects that support it such as scrollHorz/scrollVert/shuffle)
+    shuffle?: any;                                                                                                                            // coords for shuffle animation, ex: { top:15, left: 200 }
+    skipInitializationCallbacks?: boolean;                                                                                                       // set to true to disable the first before/after callback that occurs prior to any transition
+    slideExpr?: string;                                                                                                                       // expression for selecting slides (if something other than all children is required)
+    slideResize?: boolean;                                                                                                                       // force slide width/height to fixed size before every transition
+    speed?: any;                                                                                                                              // speed of the transition (any valid fx speed value)
+    speedIn?: any;                                                                                                                            // speed of the 'in' transition
+    speedOut?: any;                                                                                                                           // speed of the 'out' transition
+    startingSlide?: number;                                                                                                                   // zero-based index of the first slide to be displayed
+    sync?: boolean;                                                                                                                              // true if in/out transitions should occur simultaneously
+    timeout?: number;                                                                                                                         // milliseconds between slide transitions (0 to disable auto advance)
+    timeoutFn?: (currSlideElement: Element, nextSlideElement: Element, options: CycleOptions, forwardFlag: boolean) => void;                     // callback for determining per-slide timeout value:  function(currSlideElement, nextSlideElement, options, forwardFlag)
+    updateActivePagerLink?: (pager: any, currSlide: number, clsName: string) => void;                                                         // callback fn invoked to update the active pager link (adds/removes activePagerClass style)
+    width?: any;                                                                                                                              // container width (if the 'fit' option is true, the slides will be set to this width as well)
+}
+
+interface Cycle {
+    (fx?: string): JQuery;
+    (options?: CycleOptions): JQuery;
+    ver: () => string;
+    debug: boolean;
+    defaults: CycleOptions;
+
+    // expose next/prev function, caller must pass in state
+    next: (options?: CycleOptions) => void;
+    prev: (options?: CycleOptions) => void;
+
+    transitions: { [key: string]: ($cont: JQuery, $slides: JQuery, options: CycleOptions) => void; };                                                                 // transition definitions - only fade is defined here, transition pack defines the rest
+    custom: (currSlideElement: Element, nextSlideElement: Element, options: CycleOptions, afterCalback: Function, forwardFlag: boolean, speedOverride?: number) => void; // the actual fn for effecting a transition
+    commonReset: (currSlideElement: Element, nextSlideElement: Element, options: CycleOptions, w?: boolean, h?: boolean, rev?: boolean) => void;                               // reset common props before the next transition
+    hopsFromLast: (options: CycleOptions, forwardFlag?: boolean) => number;                                                                                              // helper fn to calculate the number of slides between the current and the next
+    createPagerAnchor: (index: number, DOMElement: Element, $pager: JQuery, els: any, options: CycleOptions) => string;                                               
+    updateActivePagerLink: (pager: any, currSlide: number, clsName: string) => void;                                                                                  // invoked after transition
+    resetState: (options: CycleOptions, fx?: string) => void;                                                                                                         // reset internal state; we do this on every pass in order to support multiple effects
+}
+
+interface JQuery {
+    cycle: Cycle;
+}
diff --git a/jquery.cycle/jquery.cycle-tests.ts b/jquery.cycle/jquery.cycle-tests.ts
index 2b5bd668e5..e93be101f6 100644
--- a/jquery.cycle/jquery.cycle-tests.ts
+++ b/jquery.cycle/jquery.cycle-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.cycle.d.ts"/>
+/// <reference types="jquery"/>
 
 // As basic as it can be
 $('#element').cycle();
diff --git a/jquery.cycle/jquery.cycle-tests.ts.tscparams b/jquery.cycle/jquery.cycle-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jquery.cycle/jquery.cycle-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jquery.cycle/jquery.cycle.d.ts b/jquery.cycle/jquery.cycle.d.ts
deleted file mode 100644
index 7182990a22..0000000000
--- a/jquery.cycle/jquery.cycle.d.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-// Type definitions for jQuery.cycle.js
-// Project: http://jquery.malsup.com/cycle/
-// Definitions by: François Guillot <http://fguillot.developpez.com/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface CycleOptions {
-    activePagerClass?: string;                                                                                                                // class name used for the active pager link
-    after?: (currSlideElement: Element, nextSlideElement: Element, options: CycleOptions, forwardFlag: boolean) => void;                         // transition callback (scope set to element that was shown):  function(currSlideElement, nextSlideElement, options, forwardFlag)
-    allowPagerClickBubble?: boolean;                                                                                                             // allows or prevents click event on pager anchors from bubbling
-    animIn?: any;                                                                                                                             // properties that define how the slide animates in
-    animOut?: any;                                                                                                                            // properties that define how the slide animates out
-    aspect?: boolean;                                                                                                                            // preserve aspect ratio during fit resizing, cropping if necessary (must be used with fit option)
-    autostop?: boolean;                                                                                                                          // true to end slideshow after X transitions (where X == slide count)
-    autostopCount?: number;                                                                                                                   // number of transitions (optionally used with autostop to define X)
-    backwards?: boolean;                                                                                                                         // true to start slideshow at last slide and move backwards through the stack
-    before?: (currSlideElement: Element, nextSlideElement: Element, options:CycleOptions, forwardFlag: boolean) => void;                         // transition callback (scope set to element to be shown):     function(currSlideElement, nextSlideElement, options, forwardFlag)
-    center?: boolean;                                                                                                                            // set to true to have cycle add top/left margin to each slide (use with width and height options)
-    cleartype?: boolean;                                                                                                                         // true if clearType corrections should be applied (for IE)
-    cleartypeNoBg?: boolean;                                                                                                                     // set to true to disable extra cleartype fixing (leave false to force background color setting on slides)
-    containerResize?: boolean;                                                                                                                   // resize container to fit largest slide
-    containerResizeHeight?: boolean;                                                                                                             // resize containers height to fit the largest slide but leave the width dynamic
-    continuous?: boolean;                                                                                                                        // true to start next transition immediately after current one completes
-    cssAfter?: any;                                                                                                                           // properties that defined the state of the slide after transitioning out
-    cssBefore?: any;                                                                                                                          // properties that define the initial state of the slide before transitioning in
-    delay?: number;                                                                                                                           // additional delay (in ms) for first transition (hint: can be negative)
-    easeIn?: string;                                                                                                                          // easing for "in" transition
-    easeOut?: string;                                                                                                                         // easing for "out" transition
-    easing?: string;                                                                                                                          // easing method for both in and out transitions
-    end?: (options: CycleOptions) => void;                                                                                                    // callback invoked when the slideshow terminates (use with autostop or nowrap options): function(options)
-    fastOnEvent?: boolean;                                                                                                                       // force fast transitions when triggered manually (via pager or prev/next); value == time in ms
-    fit?: boolean;                                                                                                                               // force slides to fit container
-    fx?: string;                                                                                                                              // name of transition effect (or comma separated names, ex: 'fade,scrollUp,shuffle')
-    fxFn?: (currSlideElement: Element, nextSlideElement: Element, options: CycleOptions, afterCalback: Function, forwardFlag: boolean) => void;  // function used to control the transition: function(currSlideElement, nextSlideElement, options, afterCalback, forwardFlag)
-    height?: any;                                                                                                                             // container height (if the 'fit' option is true, the slides will be set to this height as well)
-    manualTrump?: boolean;                                                                                                                       // causes manual transition to stop an active transition instead of being ignored
-    metaAttr?: string;                                                                                                                        // data- attribute that holds the option data for the slideshow
-    next?: any;                                                                                                                               // element, jQuery object, or jQuery selector string for the element to use as event trigger for next slide
-    nowrap?: boolean;                                                                                                                            // true to prevent slideshow from wrapping
-    onPagerEvent?: (zeroBasedSlideIndex: number, slideElement: Element) => void;                                                              // callback fn for pager events: function(zeroBasedSlideIndex, slideElement)
-    onPrevNextEvent?: (isNext: boolean, zeroBasedSlideIndex: number, slideElement: Element) => void;                                             // callback fn for prev/next events: function(isNext, zeroBasedSlideIndex, slideElement)
-    pager?: any;                                                                                                                              // element, jQuery object, or jQuery selector string for the element to use as pager container
-    pagerAnchorBuilder?: (index: number, DOMelement: Element) => string;                                                                      // callback fn for building anchor links:  function(index, DOMelement)
-    pagerEvent?: string;                                                                                                                      // name of event which drives the pager navigation
-    pause?: boolean;                                                                                                                             // true to enable "pause on hover"
-    pauseOnPagerHover?: boolean;                                                                                                                 // true to pause when hovering over pager link
-    prev?: any;                                                                                                                               // element, jQuery object, or jQuery selector string for the element to use as event trigger for previous slide
-    prevNextEvent?: string;                                                                                                                   // event which drives the manual transition to the previous or next slide
-    random?: boolean;                                                                                                                            // true for random, false for sequence (not applicable to shuffle fx)
-    randomizeEffects?: boolean;                                                                                                                  // valid when multiple effects are used; true to make the effect sequence random
-    requeueOnImageNotLoaded?: boolean;                                                                                                           // requeue the slideshow if any image slides are not yet loaded
-    requeueTimeout?: number;                                                                                                                  // ms delay for requeue
-    rev?: boolean;                                                                                                                               // causes animations to transition in reverse (for effects that support it such as scrollHorz/scrollVert/shuffle)
-    shuffle?: any;                                                                                                                            // coords for shuffle animation, ex: { top:15, left: 200 }
-    skipInitializationCallbacks?: boolean;                                                                                                       // set to true to disable the first before/after callback that occurs prior to any transition
-    slideExpr?: string;                                                                                                                       // expression for selecting slides (if something other than all children is required)
-    slideResize?: boolean;                                                                                                                       // force slide width/height to fixed size before every transition
-    speed?: any;                                                                                                                              // speed of the transition (any valid fx speed value)
-    speedIn?: any;                                                                                                                            // speed of the 'in' transition
-    speedOut?: any;                                                                                                                           // speed of the 'out' transition
-    startingSlide?: number;                                                                                                                   // zero-based index of the first slide to be displayed
-    sync?: boolean;                                                                                                                              // true if in/out transitions should occur simultaneously
-    timeout?: number;                                                                                                                         // milliseconds between slide transitions (0 to disable auto advance)
-    timeoutFn?: (currSlideElement: Element, nextSlideElement: Element, options: CycleOptions, forwardFlag: boolean) => void;                     // callback for determining per-slide timeout value:  function(currSlideElement, nextSlideElement, options, forwardFlag)
-    updateActivePagerLink?: (pager: any, currSlide: number, clsName: string) => void;                                                         // callback fn invoked to update the active pager link (adds/removes activePagerClass style)
-    width?: any;                                                                                                                              // container width (if the 'fit' option is true, the slides will be set to this width as well)
-}
-
-interface Cycle {
-    (fx?: string): JQuery;
-    (options?: CycleOptions): JQuery;
-    ver: () => string;
-    debug: boolean;
-    defaults: CycleOptions;
-
-    // expose next/prev function, caller must pass in state
-    next: (options?: CycleOptions) => void;
-    prev: (options?: CycleOptions) => void;
-
-    transitions: { [key: string]: ($cont: JQuery, $slides: JQuery, options: CycleOptions) => void; };                                                                 // transition definitions - only fade is defined here, transition pack defines the rest
-    custom: (currSlideElement: Element, nextSlideElement: Element, options: CycleOptions, afterCalback: Function, forwardFlag: boolean, speedOverride?: number) => void; // the actual fn for effecting a transition
-    commonReset: (currSlideElement: Element, nextSlideElement: Element, options: CycleOptions, w?: boolean, h?: boolean, rev?: boolean) => void;                               // reset common props before the next transition
-    hopsFromLast: (options: CycleOptions, forwardFlag?: boolean) => number;                                                                                              // helper fn to calculate the number of slides between the current and the next
-    createPagerAnchor: (index: number, DOMElement: Element, $pager: JQuery, els: any, options: CycleOptions) => string;                                               
-    updateActivePagerLink: (pager: any, currSlide: number, clsName: string) => void;                                                                                  // invoked after transition
-    resetState: (options: CycleOptions, fx?: string) => void;                                                                                                         // reset internal state; we do this on every pass in order to support multiple effects
-}
-
-interface JQuery {
-    cycle: Cycle;
-}
diff --git a/jquery.cycle/tsconfig.json b/jquery.cycle/tsconfig.json
new file mode 100644
index 0000000000..419a97e796
--- /dev/null
+++ b/jquery.cycle/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.cycle-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.cycle2/index.d.ts b/jquery.cycle2/index.d.ts
new file mode 100644
index 0000000000..aeff2a6b40
--- /dev/null
+++ b/jquery.cycle2/index.d.ts
@@ -0,0 +1,144 @@
+// Type definitions for jQuery Cycle2 version 2.1.2 (build 20140216)
+// Project: http://jquery.malsup.com/cycle2/
+//          https://github.com/malsup/cycle2
+// Definitions by: Donny Nadolny <https://github.com/dnadolny/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="jquery"/>
+
+interface JQuery {
+    cycle: JQueryCycle2.Cycle2;
+
+    on(methodName: 'cycle-after', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState, outgoingSlideEl: Element, incomingSlideEl: Element, forwardFlag: boolean) => void): JQuery;
+    on(methodName: 'cycle-before', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState, outgoingSlideEl: Element, incomingSlideEl: Element, forwardFlag: boolean) => void): JQuery;
+    on(methodName: 'cycle-bootstrap', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState, API: JQueryCycle2.API) => void): JQuery;
+    on(methodName: 'cycle-destroyed', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
+    on(methodName: 'cycle-finished', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
+    on(methodName: 'cycle-initialized', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
+    on(methodName: 'cycle-next', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
+    on(methodName: 'cycle-pager-activated', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
+    on(methodName: 'cycle-paused', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
+    on(methodName: 'cycle-post-initialize', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
+    on(methodName: 'cycle-pre-initialize', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
+    on(methodName: 'cycle-prev', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
+    on(methodName: 'cycle-resumed', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
+    on(methodName: 'cycle-slide-added', callback: (event: JQueryEventObject, jQueryWrappedSlideEl: JQuery) => void): JQuery;
+    on(methodName: 'cycle-slide-removed', callback: (event: JQueryEventObject, indexOfSlideRemoved: number, removedSlideEl: Element) => void): JQuery;
+    on(methodName: 'cycle-stopped', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
+    on(methodName: 'cycle-transition-stopped', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
+    on(methodName: 'cycle-update-view', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState, slideOptionsHash: JQueryCycle2.OptionsWithState, currentSlideEl: Element) => void): JQuery;
+}
+
+
+declare namespace JQueryCycle2 {
+    interface Cycle2 {
+        (options?: Options): JQuery;
+        (methodName: 'add', newSlide: any): JQuery; // string or JQuery
+        (methodName: 'destroy'): JQuery;
+        (methodName: 'goto', index: number): JQuery;
+        (methodName: 'next'): JQuery;
+        (methodName: 'pause'): JQuery;
+        (methodName: 'prev'): JQuery;
+        (methodName: 'reinit'): JQuery;
+        (methodName: 'remove', index: number): JQuery;
+        (methodName: 'resume'): JQuery;
+        (methodName: 'stop'): JQuery;
+        (methodNameDontCallMe: string, arg1DontCallMe: any, arg2DontCallMe: any): JQuery; // catch-all, shouldn't ever be called though
+    }
+
+    interface Options {
+        allowWrap?: boolean;
+        autoHeight?: any; // number or string
+        autoSelector?: string;
+        caption?: string;
+        captionTemplate?: string;
+        continueAuto?: boolean;
+        delay?: number;
+        disabledClass?: string;
+        easing?: string;
+        fx?: string;
+        hideNonActive?: boolean;
+        loader?: any; // boolean or 'wait'
+        log?: boolean;
+        loop?: number;
+        manualSpeed?: number;
+        manualTrump?: boolean;
+        next?: string;
+        nextEvent?: string;
+        overlay?: string;
+        overlayTemplate?: string;
+        pager?: string;
+        pagerActivateClass?: string;
+        pagerEvent?: string;
+        pagerTemplate?: string;
+        pauseOnHover?: any; // boolean or string
+        paused?: boolean;
+        prev?: string;
+        prevEvent?: string;
+        progressive?: string;
+        random?: boolean;
+        reverse?: boolean;
+        slideActiveClass?: string;
+        slideCss?: any;
+        slideClass?: string;
+        slides?: string;
+        speed?: number;
+        startingSlide?: number;
+        swipe?: boolean;
+        sync?: boolean;
+        timeout?: number;
+        tmplRegex?: string;
+        updateView?: number;
+    }
+
+    interface OptionsWithState extends Options {
+        busy: boolean;
+        currSlide: number;
+        nextSlide: number;
+        paused: boolean;
+        slideNum: number;
+        slideCount: number;
+    }
+
+    interface API {
+        add(slides: any, prepend?: boolean): void; // string or array or JQuery
+        addInitialSlides(): void;
+        advanceSlide(numberOfOpositions: number): boolean; // always false
+        buildPagerLink(slideOptionHash: Options, slide: any /*not sure*/): void;
+        buildSlideOpts(slide: any /*not sure*/): Options;
+        calcFirstSlide(): void;
+        calcNextSlide(): void;
+        calcTx(slideOptions: Options, manual: boolean): Transition;
+        destroy(): void;
+        doTransition(slideOptions: Options, currEl: Element, nextEl: Element, fwdFlag: boolean, callback: Function): void;
+        getComponent(nameOfComponent: string): JQuery;
+        getSlideIndex(slideElement: Element): number;
+        getSlideOpts(slideIndex: number): Options;
+        goto(index: number): void;
+        initSlide(slideOptions: Options, slide: any /*not sure*/, suggestedZindex: number): void;
+        initSlideshow(): void;
+        log(...args: any[]): void;
+        next(): void;
+        page(pagerEl: Element, targetEl: Element): void;
+        pause(): void;
+        postInitSlideshow(): void;
+        preInitSlideshow(): void;
+        prepareTx(manualFlag: boolean, fwdFlag: boolean): void;
+        prev(): void;
+        queueTransition(slideOptions: Options): void;
+        reinit(): void;
+        remove(slideIndexToRemove: number): void;
+        resume(): void;
+        stackSlides(currEl: Element, nextEl: Element, fwdFlag: boolean): void;
+        stop(): void;
+        stopTransition(): void;
+        tmpl(templateString: string, optionHash: Options, slideEl: Element): void;
+        trigger(eventName: String, ...args: any[]): void;
+        updateView(): void;
+    }
+
+    interface Transition {
+        before(opts: Options, curr: Element, next: Element, fwd: boolean): void;
+    }
+}
diff --git a/jquery.cycle2/jquery.cycle2-tests.ts b/jquery.cycle2/jquery.cycle2-tests.ts
index 8a7eedf635..0e16629a3e 100644
--- a/jquery.cycle2/jquery.cycle2-tests.ts
+++ b/jquery.cycle2/jquery.cycle2-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.cycle2.d.ts"/>
+/// <reference types="jquery"/>
 
 // basic
 $('#element').cycle();
diff --git a/jquery.cycle2/jquery.cycle2.d.ts b/jquery.cycle2/jquery.cycle2.d.ts
deleted file mode 100644
index 6533dd2149..0000000000
--- a/jquery.cycle2/jquery.cycle2.d.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-// Type definitions for jQuery Cycle2 version 2.1.2 (build 20140216)
-// Project: http://jquery.malsup.com/cycle2/
-//          https://github.com/malsup/cycle2
-// Definitions by: Donny Nadolny <https://github.com/dnadolny/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface JQuery {
-    cycle: JQueryCycle2.Cycle2;
-
-    on(methodName: 'cycle-after', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState, outgoingSlideEl: Element, incomingSlideEl: Element, forwardFlag: boolean) => void): JQuery;
-    on(methodName: 'cycle-before', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState, outgoingSlideEl: Element, incomingSlideEl: Element, forwardFlag: boolean) => void): JQuery;
-    on(methodName: 'cycle-bootstrap', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState, API: JQueryCycle2.API) => void): JQuery;
-    on(methodName: 'cycle-destroyed', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
-    on(methodName: 'cycle-finished', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
-    on(methodName: 'cycle-initialized', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
-    on(methodName: 'cycle-next', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
-    on(methodName: 'cycle-pager-activated', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
-    on(methodName: 'cycle-paused', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
-    on(methodName: 'cycle-post-initialize', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
-    on(methodName: 'cycle-pre-initialize', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
-    on(methodName: 'cycle-prev', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
-    on(methodName: 'cycle-resumed', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
-    on(methodName: 'cycle-slide-added', callback: (event: JQueryEventObject, jQueryWrappedSlideEl: JQuery) => void): JQuery;
-    on(methodName: 'cycle-slide-removed', callback: (event: JQueryEventObject, indexOfSlideRemoved: number, removedSlideEl: Element) => void): JQuery;
-    on(methodName: 'cycle-stopped', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
-    on(methodName: 'cycle-transition-stopped', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState) => void): JQuery;
-    on(methodName: 'cycle-update-view', callback: (event: JQueryEventObject, optionHash: JQueryCycle2.OptionsWithState, slideOptionsHash: JQueryCycle2.OptionsWithState, currentSlideEl: Element) => void): JQuery;
-}
-
-
-declare namespace JQueryCycle2 {
-    interface Cycle2 {
-        (options?: Options): JQuery;
-        (methodName: 'add', newSlide: any): JQuery; // string or JQuery
-        (methodName: 'destroy'): JQuery;
-        (methodName: 'goto', index: number): JQuery;
-        (methodName: 'next'): JQuery;
-        (methodName: 'pause'): JQuery;
-        (methodName: 'prev'): JQuery;
-        (methodName: 'reinit'): JQuery;
-        (methodName: 'remove', index: number): JQuery;
-        (methodName: 'resume'): JQuery;
-        (methodName: 'stop'): JQuery;
-        (methodNameDontCallMe: string, arg1DontCallMe: any, arg2DontCallMe: any): JQuery; // catch-all, shouldn't ever be called though
-    }
-
-    interface Options {
-        allowWrap?: boolean;
-        autoHeight?: any; // number or string
-        autoSelector?: string;
-        caption?: string;
-        captionTemplate?: string;
-        continueAuto?: boolean;
-        delay?: number;
-        disabledClass?: string;
-        easing?: string;
-        fx?: string;
-        hideNonActive?: boolean;
-        loader?: any; // boolean or 'wait'
-        log?: boolean;
-        loop?: number;
-        manualSpeed?: number;
-        manualTrump?: boolean;
-        next?: string;
-        nextEvent?: string;
-        overlay?: string;
-        overlayTemplate?: string;
-        pager?: string;
-        pagerActivateClass?: string;
-        pagerEvent?: string;
-        pagerTemplate?: string;
-        pauseOnHover?: any; // boolean or string
-        paused?: boolean;
-        prev?: string;
-        prevEvent?: string;
-        progressive?: string;
-        random?: boolean;
-        reverse?: boolean;
-        slideActiveClass?: string;
-        slideCss?: any;
-        slideClass?: string;
-        slides?: string;
-        speed?: number;
-        startingSlide?: number;
-        swipe?: boolean;
-        sync?: boolean;
-        timeout?: number;
-        tmplRegex?: string;
-        updateView?: number;
-    }
-
-    interface OptionsWithState extends Options {
-        busy: boolean;
-        currSlide: number;
-        nextSlide: number;
-        paused: boolean;
-        slideNum: number;
-        slideCount: number;
-    }
-
-    interface API {
-        add(slides: any, prepend?: boolean): void; // string or array or JQuery
-        addInitialSlides(): void;
-        advanceSlide(numberOfOpositions: number): boolean; // always false
-        buildPagerLink(slideOptionHash: Options, slide: any /*not sure*/): void;
-        buildSlideOpts(slide: any /*not sure*/): Options;
-        calcFirstSlide(): void;
-        calcNextSlide(): void;
-        calcTx(slideOptions: Options, manual: boolean): Transition;
-        destroy(): void;
-        doTransition(slideOptions: Options, currEl: Element, nextEl: Element, fwdFlag: boolean, callback: Function): void;
-        getComponent(nameOfComponent: string): JQuery;
-        getSlideIndex(slideElement: Element): number;
-        getSlideOpts(slideIndex: number): Options;
-        goto(index: number): void;
-        initSlide(slideOptions: Options, slide: any /*not sure*/, suggestedZindex: number): void;
-        initSlideshow(): void;
-        log(...args: any[]): void;
-        next(): void;
-        page(pagerEl: Element, targetEl: Element): void;
-        pause(): void;
-        postInitSlideshow(): void;
-        preInitSlideshow(): void;
-        prepareTx(manualFlag: boolean, fwdFlag: boolean): void;
-        prev(): void;
-        queueTransition(slideOptions: Options): void;
-        reinit(): void;
-        remove(slideIndexToRemove: number): void;
-        resume(): void;
-        stackSlides(currEl: Element, nextEl: Element, fwdFlag: boolean): void;
-        stop(): void;
-        stopTransition(): void;
-        tmpl(templateString: string, optionHash: Options, slideEl: Element): void;
-        trigger(eventName: String, ...args: any[]): void;
-        updateView(): void;
-    }
-
-    interface Transition {
-        before(opts: Options, curr: Element, next: Element, fwd: boolean): void;
-    }
-}
diff --git a/jquery.cycle2/tsconfig.json b/jquery.cycle2/tsconfig.json
new file mode 100644
index 0000000000..71db20b24f
--- /dev/null
+++ b/jquery.cycle2/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.cycle2-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.dataTables/index.d.ts b/jquery.dataTables/index.d.ts
new file mode 100644
index 0000000000..caa895b7d5
--- /dev/null
+++ b/jquery.dataTables/index.d.ts
@@ -0,0 +1,1835 @@
+// Type definitions for JQuery DataTables 1.10.5
+// Project: http://www.datatables.net
+// Definitions by: Kiarash Ghiaseddin <https://github.com/Silver-Connection/DefinitelyTyped>, Omid Rad <https://github.com/omidkrad>, Armin Sander <https://github.com/pragmatrix/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// missing:
+// - Static methods that are defined in JQueryStatic.fn are not typed.
+// - Plugin and extension definitions are not typed.
+// - Some return types are not fully wokring
+
+/// <reference types="jquery"/>
+
+interface JQuery {
+    DataTable(param?: DataTables.Settings): DataTables.DataTable;
+}
+
+//TODO: Wrong, as jquery.d.ts has no interface for fn
+//interface JQueryStatic {
+//    dataTable: DataTables.StaticFunctions;
+//}
+
+declare namespace DataTables {
+    export interface DataTable extends DataTableCore {
+        /**
+        * Get the data for the whole table.
+        */
+        data(): DataTable;
+
+        /**
+        * Order Methods / Object
+        */
+        order: OrderMethods;
+
+        //#region "Cell/Cells"
+
+        /**
+        * Select the cell found by a cell selector
+        *
+        * @param cellSelector Cell selector.
+        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
+        */
+        cell(cellSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[], modifier?: ObjectSelectorModifier): CellMethods;
+
+        /**
+        * Select the cell found by a cell selector
+        *
+        * @param rowSelector Row selector.
+        * @param cellSelector Cell selector.
+        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
+        */
+        cell(rowSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[], cellSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[], modifier?: ObjectSelectorModifier): CellMethods;
+
+        /**
+        * Select all cells
+        *
+        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
+        */
+        cells(modifier?: ObjectSelectorModifier): CellsMethods;
+
+        /**
+        * Select cells found by a cell selector
+        *
+        * @param cellSelector Cell selector.
+        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
+        */
+        cells(cellSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[], modifier?: ObjectSelectorModifier): CellsMethods;
+
+        /**
+        * Select cells found by both row and column selectors
+        *
+        * @param rowSelector Row selector.
+        * @param cellSelector Cell selector.
+        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
+        */
+        cells(rowSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[], cellSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[], modifier?: ObjectSelectorModifier): CellsMethods;
+        //#endregion "Cell/Cells"
+
+        //#region "Column/Columns"
+
+        /**
+        * Column Methods / Object
+        */
+        column: ColumnMethodsModel;
+
+        /**
+        * Columns Methods / Object
+        */
+        columns: ColumnsMethodsModel;
+
+        //#endregion "Column/Columns"
+
+        //#region "Row/Rows"
+
+        /**
+        * Row Methode / Object
+        */
+        row: RowMethodsModel
+
+        /**
+        * Rows Methods / Object
+        */
+        rows: RowsMethodsModel
+
+        //#endregion "Row/Rows"
+
+        //#region "Table/Tables"
+
+        /**
+        * Select a table based on a selector from the API's context
+        *
+        * @param tableSelector Table selector.
+        */
+        table(tableSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[]): TableMethods;
+
+        /**
+        * Select all tables
+        */
+        tables(): TablesMethods;
+
+        /**
+        * Select tables based on the given selector
+        *
+        * @param tableSelector Table selector.
+        */
+        tables(tableSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[]): TablesMethods;
+
+        //#endregion "Table/Tables"
+    }
+
+    export interface DataTables extends DataTableCore {
+        [index: number]: DataTable;
+    }
+
+    interface ObjectSelectorModifier {
+        /**
+        * The order modifier provides the ability to control which order the rows are processed in.
+        * Values: 'current', 'applied', 'index',  'original'
+        */
+        order?: string;
+
+        /**
+        * The search modifier provides the ability to govern which rows are used by the selector using the search options that are applied to the table.
+        * Values: 'none', 'applied', 'removed'
+        */
+        search?: string;
+
+        /**
+        * The page modifier allows you to control if the selector should consider all data in the table, regardless of paging, or if only the rows in the currently disabled page should be used.
+        * Values: 'all', 'current'
+        */
+        page?: string;
+    }
+
+    //#region "Namespaces"
+
+    //#region "core-methods"
+
+    interface DataTableCore extends UtilityMethods {
+        /**
+        * Get jquery object
+        */
+        $(selector: string | Node | Node[]| JQuery, modifier?: ObjectSelectorModifier): JQuery;
+
+        ///// Almost identical to $ in operation, but in this case returns the data for the matched rows.
+        //_(selector: string | Node | Node[] | JQuery, modifier?: ObjectSelectorModifier): JQuery;
+
+        /**
+        * Ajax Methods
+        */
+        ajax: AjaxMethodModel;
+
+        /**
+        * Clear the table of all data.
+        */
+        clear(): DataTable;
+
+        /**
+        * Destroy the DataTables in the current context.
+        *
+        * @param remove Completely remove the table from the DOM (true) or leave it in the DOM in its original plain un-enhanced HTML state (default, false).
+        */
+        destroy(remove?: boolean): DataTable;
+
+        /**
+        * Redraw the table.
+        *
+        * @param reset Reset (default) or hold the current paging position. A full re-sort and re-filter is performed when this method is called, which is why the pagination reset is the default action.
+        */
+        draw(reset?: boolean): DataTable;
+
+        /**
+        * Table events removal.
+        *
+        * @param event Event name to remove.
+        * @param callback Specific callback function to remove if you want to unbind a single event listener.
+        */
+        off(event: string, callback?: Function): DataTable;
+
+        /**
+        * Table events listener.
+        *
+        * @param event Event to listen for.
+        * @param callback Specific callback function to remove if you want to unbind a single event listener.
+        */
+        on(event: string, callback: Function): DataTable;
+
+        /**
+        * Listen for a table event once and then remove the listener.
+        *
+        * @param event Event to listen for.
+        * @param callback Specific callback function to remove if you want to unbind a single event listener.
+        */
+        one(event: string, callback: Function): DataTable;
+
+        /**
+        * Page Methods / Object
+        */
+        page: PageMethods;
+
+        /**
+        * Get current search
+        */
+        search(): string;
+
+        /**
+        * Search for data in the table.
+        *
+        * @param input Search string to apply to the table.
+        * @param regex Treat as a regular expression (true) or not (default, false).
+        * @param smart Perform smart search.
+        * @param caseInsen Do case-insensitive matching (default, true) or not (false).
+        */
+        search(input: string, regex?: boolean, smart?: boolean, caseInsen?: boolean): DataTable;
+
+        /**
+        * Obtain the table's settings object
+        */
+        settings(): DataTable;
+
+        /**
+        * Page Methods / Object
+        */
+        state: StateMethods;
+    }
+
+    //#region "ajax-methods"
+
+    interface AjaxMethods extends DataTable {
+        /**
+        * Reload the table data from the Ajax data source.
+        *
+        * @param callback Function which is executed when the data as been reloaded and the table fully redrawn.
+        * @param resetPaging Reset (default action or true) or hold the current paging position (false).
+        */
+        load(callback?: Function, resetPaging?: boolean): DataTable;
+    }
+
+    interface AjaxMethodModel {
+        /**
+        * Get the latest JSON data obtained from the last Ajax request DataTables made
+        */
+        json(): Object;
+
+        /**
+        * Get the data submitted by DataTables to the server in the last Ajax request
+        */
+        params(): Object;
+
+        /**
+        * Reload the table data from the Ajax data source.
+        *
+        * @param callback Function which is executed when the data as been reloaded and the table fully redrawn.
+        * @param resetPaging Reset (default action or true) or hold the current paging position (false).
+        */
+        reload(callback?: Function, resetPaging?: boolean): DataTable;
+
+        /**
+        * Reload the table data from the Ajax data source
+        */
+        url(): string;
+
+        /**
+        * Reload the table data from the Ajax data source
+        *
+        * @param url URL to set to be the Ajax data source for the table.
+        */
+        url(url: string): AjaxMethods;
+    }
+
+    //#endregion "ajax-methods"
+
+    //#region "order-methods"
+
+    interface OrderMethods {
+        /**
+        * Get the ordering applied to the table.
+        */
+        (): (string | number)[][];
+
+        /**
+        * Set the ordering applied to the table.
+        *
+        * @param order Order Model
+        */
+        (order?: (string | number)[]): DataTable;
+        (order?: (string | number)[][]): DataTable;
+        (order: (string | number)[], ...args: any[]): DataTable;
+
+        /**
+        * Add an ordering listener to an element, for a given column.
+        *
+        * @param node Selector
+        * @param column Column index
+        * @param callback Callback function
+        */
+        listener(node: string | Node | JQuery, column: number, callback: Function): DataTable;
+    }
+    //#endregion "order-methods"
+
+    //#region "page-methods"
+
+    interface PageMethods {
+        /**
+        * Get the current page of the table.
+        */
+        (): number;
+
+        /**
+        * Set the current page of the table.
+        *
+        * @param page Index or 'first', 'next', 'previous', 'last'
+        */
+        (page: number | string): DataTable;
+
+        /**
+        * Get paging information about the table
+        */
+        info(): PageMethodeModelInfoReturn;
+
+        /**
+        * Get the table's page length.
+        */
+        len(): number;
+
+        /**
+        * Set the table's page length.
+        *
+        * @param length Page length to set. use -1 to show all records.
+        */
+        len(length: number): DataTable;
+    }
+
+    interface PageMethodeModelInfoReturn {
+        page: number;
+        pages: number;
+        start: number;
+        end: number;
+        length: number;
+        recordsTotal: number;
+        recordsDisplay: number;
+    }
+
+    //#endregion "page-methods"
+
+    //#region "state-methods"
+
+    interface StateMethods {
+        /**
+        * Get the last saved state of the table
+        */
+        (): StateReturnModel;
+
+        /**
+        * Clear the saved state of the table.
+        */
+        clear(): DataTable;
+
+        /**
+        * Get the table state that was loaded during initialisation.
+        */
+        loaded(): StateReturnModel;
+
+        /**
+        * Trigger a state save.
+        */
+        save(): DataTable;
+    }
+
+    interface StateReturnModel {
+        time: number;
+        start: number;
+        length: number;
+        order: (string | number)[][];
+        search: SearchSettings;
+        columns: StateReturnModelColumns[];
+    }
+
+    interface StateReturnModelColumns {
+        search: SearchSettings;
+        visible: boolean;
+    }
+
+    //#endregion "state-methods"
+
+    //#endregion "core-methods"
+
+    //#region "util-methods"
+
+    interface UtilityMethods {
+        /**
+        * Concatenate two or more API instances together
+        *
+        * @param a API instance to concatenate to the initial instance.
+        * @param b Additional API instance(s) to concatenate to the initial instance.
+        */
+        concat(a: Object, ...b: Object[]): DataTable;
+
+        /**
+        * Iterate over the contents of the API result set.
+        *
+        * @param fn Callback function which is called for each item in the API instance result set. The callback is called with three parameters
+        */
+        each(fn: Function): DataTable;
+
+        /**
+        * Reduce an Api instance to a single context and result set.
+        *
+        * @param idx Index to select
+        */
+        eq(idx: number): DataTable;
+
+        /**
+        * Iterate over the result set of an API instance and test each item, creating a new instance from those items which pass.
+        *
+        * @param fn Callback function which is called for each item in the API instance result set. The callback is called with three parameters.
+        */
+        filter(fn: Function): DataTable;
+
+        /**
+        * Flatten a 2D array structured API instance to a 1D array structure.
+        */
+        flatten(): DataTable;
+
+        /**
+        * Find the first instance of a value in the API instance's result set.
+        *
+        * @param value Value to find in the instance's result set.
+        */
+        indexOf(value: any): number;
+
+        /**
+        * Join the elements in the result set into a string.
+        *
+        * @param separator The string that will be used to separate each element of the result set.
+        */
+        join(separator: string): string;
+
+        /**
+        * Find the last instance of a value in the API instance's result set.
+        *
+        * @param value Value to find in the instance's result set.
+        */
+        lastIndexOf(value: any): number;
+
+        /**
+        * Number of elements in an API instance's result set.
+        */
+        length: number;
+
+        /**
+        * Iterate over the result set of an API instance, creating a new API instance from the values returned by the callback.
+        *
+        * @param fn Callback function which is called for each item in the API instance result set. The callback is called with three parameters.
+        */
+        map(fn: Function): DataTable;
+
+        /**
+        * Iterate over the result set of an API instance, creating a new API instance from the values retrieved from the original elements.
+        *
+        * @param property Object property name to use from the element in the original result set for the new result set.
+        */
+        pluck(property: number | string): DataTable;
+
+        /**
+        * Remove the last item from an API instance's result set.
+        */
+        pop(): any;
+
+        /**
+        * Add one or more items to the end of an API instance's result set.
+        *
+        * @param value_1 Item to add to the API instance's result set.
+        */
+        push(value_1: any | any[], ...value_2: any[]): number;
+
+        /**
+        * Apply a callback function against and accumulator and each element in the Api's result set (left-to-right).
+        *
+        * @param fn Callback function which is called for each item in the API instance result set. The callback is called with four parameters.
+        * @param initialValue Value to use as the first argument of the first call to the fn callback.
+        */
+        reduce(fn: Function, initialValue?: any): any;
+
+        /**
+        * Apply a callback function against and accumulator and each element in the Api's result set (right-to-left).
+        *
+        * @param fn Callback function which is called for each item in the API instance result set. The callback is called with four parameters.
+        * @param initialValue Value to use as the first argument of the first call to the fn callback.
+        */
+        reduceRight(fn: Function, initialValue?: any): any;
+
+        /**
+        * Reverse the result set of the API instance and return the original array.
+        */
+        reverse(): DataTable;
+
+        /**
+        * Remove the first item from an API instance's result set.
+        */
+        shift(): any;
+
+        /**
+        * Sort the elements of the API instance's result set.
+        *
+        * @param fn This is a standard Javascript sort comparison function. It accepts two parameters.
+        */
+        sort(fn?: Function): DataTable;
+
+        /**
+        * Modify the contents of an Api instance's result set, adding or removing items from it as required.
+        *
+        * @param index Index at which to start modifying the Api instance's result set.
+        * @param howMany Number of elements to remove from the result set.
+        * @param value_1 Item to add to the result set at the index specified by the first parameter.
+        */
+        splice(index: number, howMany: number, value_1?: any | any[], ...value_2: any[]): any[];
+
+        /**
+        * Convert the API instance to a jQuery object, with the objects from the instance's result set in the jQuery result set.
+        */
+        to$(): JQuery;
+
+        /**
+        * Create a native Javascript array object from an API instance.
+        */
+        toArray(): any[];
+
+        /**
+        * Convert the API instance to a jQuery object, with the objects from the instance's result set in the jQuery result set.
+        */
+        toJQuery(): JQuery;
+
+        /**
+        * Create a new API instance containing only the unique items from a the elements in an instance's result set.
+        */
+        unique(): DataTable;
+
+        /**
+        * Add one or more items to the start of an API instance's result set.
+        *
+        * @param value_1 Item to add to the API instance's result set.
+        */
+        unshift(value_1: any | any[], ...value_2: any[]): number;
+    }
+
+    //#endregion "util-methods"
+
+    interface CommonSubMethods {
+        /**
+        * Get the DataTables cached data for the selected cell
+        *
+        * @param t Specify which cache the data should be read from. Can take one of two values: search or order
+        */
+        cache(t: string): DataTable;
+    }
+
+    //#region "cell-methods"
+
+    interface CommonCellMethods extends CommonSubMethods {
+        /**
+        * Invalidate the data held in DataTables for the selected cells
+        *
+        * @param source Data source to read the new data from.
+        */
+        invalidate(source?: string): DataTable;
+
+        /**
+        * Get data for the selected cell
+        *
+        * @param f Data type to get. This can be one of: 'display', 'filter', 'sort', 'type'
+        */
+        render(t: string): any;
+    }
+
+    interface CellMethods extends DataTableCore, CommonCellMethods {
+        /**
+        * Get data for the selected cell
+        */
+        data(): any;
+
+        /**
+        * Get data for the selected cell
+        *
+        * @param data Value to assign to the data for the cell
+        */
+        data(data: any): DataTable;
+
+        /**
+        * Get index information about the selected cell
+        */
+        index(): CellIndexReturn;
+
+        /**
+        * Get the DOM element for the selected cell
+        */
+        node(): Node;
+    }
+
+    interface CellIndexReturn {
+        row: number;
+        column: number;
+        columnVisible: number;
+    }
+
+    interface CellsMethods extends DataTableCore, CommonCellMethods {
+        /**
+        * Get data for the selected cells
+        */
+        data(): DataTable;
+
+        /**
+        * Get index information about the selected cells
+        */
+        indexes(): DataTable;
+
+        /**
+        * Get the DOM elements for the selected cells
+        */
+        nodes(): DataTable;
+    }
+    //#endregion "cell-methods"
+
+    //#region "column-methods"
+
+    interface CommonColumnMethod extends CommonSubMethods {
+        /**
+        * Get the footer th / td cell for the selected column.
+        */
+        footer(): any;
+
+        /**
+        * Get the header th / td cell for a column.
+        */
+        header(): Node;
+
+        /**
+        * Order the table, in the direction specified, by the column selected by the column()DT selector.
+        *
+        * @param direction Direction of sort to apply to the selected column - desc (descending) or asc (ascending).
+        */
+        order(direction: string): DataTable;
+
+        /**
+        * Get the visibility of the selected column.
+        */
+        visible(): boolean;
+
+        /**
+        * Set the visibility of the selected column.
+        *
+        * @param show Specify if the column should be visible (true) or not (false).
+        * @param redrawCalculations Indicate if DataTables should recalculate the column layout (true - default) or not (false). Typically this would be left as the default value, but it can be useful to disable when using the method in a loop - so the calculations are performed on every call as they can hamper performance.
+        */
+        visible(show: boolean, redrawCalculations?: boolean): DataTable;
+    }
+
+    interface ColumnMethodsModel {
+        /**
+        * Select the column found by a column selector
+        *
+        * @param cellSelector Cell selector.
+        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
+        */
+        (columnSelector: any, modifier?: ObjectSelectorModifier): ColumnMethods;
+
+        /**
+        * Convert from the input column index type to that required.
+        *
+        * @param t The type on conversion that should take place: 'fromVisible', 'toData', 'fromData', 'toVisible'
+        * @param index The index to be converted
+        */
+        index(t: string, index: number): number;
+    }
+
+    interface ColumnMethods extends DataTableCore, CommonColumnMethod {
+        /**
+        * Get the data for the cells in the selected column.
+        */
+        data(): DataTable;
+
+        /**
+        * Get the data source property for the selected column
+        */
+        dataSrc(): number | string | Function;
+
+        /**
+        * Get index information about the selected cell
+        *
+        * @param t Specify if you want to get the column data index (default) or the visible index (visible).
+        */
+        index(t?: string): DataTable;
+
+        /**
+        * Obtain the th / td nodes for the selected column
+        */
+        nodes(): DataTable[];
+    }
+
+    interface ColumnsMethodsModel {
+        /**
+        * Select all columns
+        *
+        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
+        */
+        (modifier?: ObjectSelectorModifier): ColumnsMethods;
+
+        /**
+        * Select columns found by a cell selector
+        *
+        * @param cellSelector Cell selector.
+        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
+        */
+        (columnSelector: any, modifier?: ObjectSelectorModifier): ColumnsMethods;
+
+        /**
+        * Recalculate the column widths for layout.
+        */
+        adjust(): DataTable;
+    }
+
+    interface ColumnsMethods extends DataTableCore, CommonColumnMethod {
+        /**
+        * Obtain the data for the columns from the selector
+        */
+        data(): DataTable;
+
+        /**
+        * Get the data source property for the selected columns.
+        */
+        dataSrc(): DataTable;
+
+        /**
+        * Get the column indexes of the selected columns.
+        *
+        * @param t Specify if you want to get the column data index (default) or the visible index (visible).
+        */
+        indexes(t?: string): DataTable;
+
+        /**
+        * Obtain the th / td nodes for the selected columns
+        */
+        nodes(): DataTable[][];
+    }
+    //#endregion "column-methods"
+
+    //#region "row-methods"
+
+    interface CommonRowMethod extends CommonSubMethods {
+        /**
+        * Obtain the th / td nodes for the selected column
+        *
+        * @param source Data source to read the new data from. Values: 'auto', 'data', 'dom'
+        */
+        invalidate(source?: string): DataTable;
+    }
+
+    interface RowChildMethodModel {
+        /**
+        * Get the child row(s) that have been set for a parent row
+        */
+        (): JQuery;
+
+        /**
+        * Get the child row(s) that have been set for a parent row
+        *
+        * @param showRemove This parameter can be given as true or false
+        */
+        (showRemove: boolean): RowChildMethods;
+
+        /**
+        * Set the data to show in the child row(s). Note that calling this method will replace any child rows which are already attached to the parent row.
+        *
+        * @param data The data to be shown in the child row can be given in multiple different ways.
+        * @param className Class name that is added to the td cell node(s) of the child row(s). As of 1.10.1 it is also added to the tr row node of the child row(s).
+        */
+        (data: (string | Node | JQuery) | (string | Node | JQuery)[], className?: string): RowChildMethods;
+
+        /**
+        * Hide the child row(s) of a parent row
+        */
+        hide(): DataTable;
+
+        /**
+        * Check if the child rows of a parent row are visible
+        */
+        isShown(): DataTable;
+
+        /**
+        * Remove child row(s) from display and release any allocated memory
+        */
+        remove(): DataTable;
+
+        /**
+        * Show the child row(s) of a parent row
+        */
+        show(): DataTable;
+    }
+
+    interface RowChildMethods extends DataTableCore {
+        /**
+        * Hide the child row(s) of a parent row
+        */
+        hide(): DataTable;
+
+        /**
+        * Remove child row(s) from display and release any allocated memory
+        */
+        remove(): DataTable;
+
+        /**
+        * Make newly defined child rows visible
+        */
+        show(): DataTable;
+    }
+
+    interface RowMethodsModel {
+        /**
+        * Select a row found by a row selector
+        *
+        * @param rowSelector Row selector.
+        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
+        */
+        (rowSelector: any, modifier?: ObjectSelectorModifier): RowMethods;
+
+        /**
+        * Add a new row to the table using the given data
+        *
+        * @param data Data to use for the new row. This may be an array, object or Javascript object instance, but must be in the same format as the other data in the table
+        */
+        add(data: any[]| Object): DataTable;
+    }
+
+    interface RowMethods extends DataTableCore, CommonRowMethod {
+        /**
+        * Order Methods / Object
+        */
+        child: RowChildMethodModel;
+
+        /**
+        * Get the data for the selected row
+        */
+        data(): any[]| Object;
+
+        /**
+        * Set the data for the selected row
+        *
+        * @param d Data to use for the row.
+        */
+        data(d: any[]| Object): DataTable;
+
+        /**
+        * Get the row index of the row column.
+        */
+        index(): number;
+
+        /**
+        * Obtain the tr node for the selected row
+        */
+        node(): Node;
+
+        /**
+        * Delete the selected row from the DataTable.
+        */
+        remove(): Node;
+    }
+
+    interface RowsMethodsModel {
+        /**
+        * Select all rows
+        *
+        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
+        */
+        (modifier?: ObjectSelectorModifier): RowsMethods;
+
+        /**
+        * Select rows found by a row selector
+        *
+        * @param cellSelector Row selector.
+        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
+        */
+        (rowSelector: any, modifier?: ObjectSelectorModifier): RowsMethods;
+
+        /**
+        * Add new rows to the table using the data given
+        *
+        * @param data Array of data elements, with each one describing a new row to be added to the table
+        */
+        add(data: any[]): DataTable;
+    }
+
+    interface RowsMethods extends DataTableCore, CommonRowMethod {
+        /**
+        * Get the data for the rows from the selector
+        */
+        data(): DataTable;
+
+        /**
+        * Set the data for the selected row
+        *
+        * @param d Data to use for the row.
+        */
+        data(d: any[]| Object): DataTable;
+
+        /**
+        * Get the row indexes of the selected rows.
+        */
+        indexes(): DataTable;
+
+        /**
+        * Obtain the tr nodes for the selected rows
+        */
+        nodes(): DataTable;
+
+        /**
+        * Delete the selected rows from the DataTable.
+        */
+        remove(): DataTable;
+    }
+    //#endregion "row-methods"
+
+    //#region "table-methods"
+
+    interface TableMethods extends DataTableCore {
+        /**
+        * Get the tfoot node for the table in the API's context
+        */
+        footer(): Node;
+
+        /**
+        * Get the thead node for the table in the API's context
+        */
+        header(): Node;
+
+        /**
+        * Get the tbody node for the table in the API's context
+        */
+        body(): Node;
+
+        /**
+        * Get the div container node for the table in the API's context
+        */
+        container(): Node;
+
+        /**
+        * Get the table node for the table in the API's context
+        */
+        node(): Node;
+    }
+
+    interface TablesMethods extends DataTableCore {
+        /**
+        * Get the tfoot nodes for the tables in the API's context
+        */
+        footer(): DataTable;
+
+        /**
+        * Get the thead nodes for the tables in the API's context
+        */
+        header(): DataTable;
+
+        /**
+        * Get the tbody nodes for the tables in the API's context
+        */
+        body(): DataTable;
+
+        /**
+        * Get the div container nodes for the tables in the API's context
+        */
+        containers(): DataTable;
+
+        /**
+        * Get the table nodes for the tables in the API's context
+        */
+        nodes(): DataTable;
+    }
+    //#endregion "table-methods"
+
+    //#endregion "Namespaces"
+
+    //#region "Static-Methods"
+
+    export interface StaticFunctions {
+        /**
+        * Check is a table node is a DataTable or not
+        *
+        * @param table Selector string for table
+        */
+        isDataTable(table: string): boolean;
+
+        /**
+        * Get all DataTables on the page
+        *
+        * @param visible Get only visible tables
+        */
+        tables(visible?: boolean): DataTables.DataTable[];
+
+        /**
+        * Version number compatibility check function
+        *
+        * @param version Version string
+        */
+        versionCheck(version: string): boolean;
+
+        /**
+        * Utils
+        */
+        util: StaticUtilFunctions;
+
+        /**
+        * Check is a table node is a DataTable or not
+        *
+        * @param table Selector string for table
+        */
+        Api(selector: string | Node | Node[]| JQuery): DataTables.DataTable;
+    }
+
+    export interface StaticUtilFunctions {
+        /**
+        * Escape special characters in a regular expression string. Since: 1.10.4
+        *
+        * @param str String to escape
+        */
+        escapeRegex(str: string): string;
+
+        /**
+        * Throttle the calls to a method to reduce call frequency. Since: 1.10.3
+        *
+        * @param fn Function
+        * @param period ms
+        */
+        throttle(fn: Function, period?: number): Function;
+    }
+
+    //#endregion "Static-Methods"
+
+    //#region "Settings"
+
+    export interface Settings {
+
+        //#region "Features"
+
+        /**
+        * Feature control DataTables' smart column width handling. Since: 1.10
+        */
+        autoWidth?: boolean;
+
+        /**
+        * Feature control deferred rendering for additional speed of initialisation. Since: 1.10
+        */
+        deferRender?: boolean;
+
+        /**
+        * Feature control table information display field. Since: 1.10
+        */
+        info?: boolean;
+
+        /**
+        * Use markup and classes for the table to be themed by jQuery UI ThemeRoller. Since: 1.10
+        */
+        jQueryUI?: boolean;
+
+        /**
+        * Feature control the end user's ability to change the paging display length of the table. Since: 1.10
+        */
+        lengthChange?: boolean;
+
+        /**
+        * Feature control ordering (sorting) abilities in DataTables. Since: 1.10
+        */
+        ordering?: boolean;
+
+        /**
+        * Enable or disable table pagination. Since: 1.10
+        */
+        paging?: boolean;
+
+        /**
+        * Feature control the processing indicator. Since: 1.10
+        */
+        processing?: boolean;
+
+        /**
+        * Horizontal scrolling. Since: 1.10
+        */
+        scrollX?: boolean;
+
+        /**
+        * Vertical scrolling. Since: 1.10 Exp: "200px"
+        */
+        scrollY?: string;
+
+        /**
+        * Feature control search (filtering) abilities Since: 1.10
+        */
+        searching?: boolean;
+
+        /**
+        * Feature control DataTables' server-side processing mode. Since: 1.10
+        */
+        serverSide?: boolean;
+
+        /**
+        * State saving - restore table state on page reload. Since: 1.10
+        */
+        stateSave?: boolean;
+
+        //#endregion "Features"
+
+        //#region "Data"
+
+        /**
+        * Load data for the table's content from an Ajax source. Since: 1.10
+        */
+        ajax?: string | AjaxSettings | FunctionAjax;
+
+        /**
+        * Data to use as the display data for the table. Since: 1.10
+        */
+        data?: Object;
+
+        //#endregion "Data"
+
+        //#region "Options"
+
+        /**
+        * Data to use as the display data for the table. Since: 1.10
+        */
+        columns?: ColumnSettings[];
+
+        /**
+        * Assign a column definition to one or more columns.. Since: 1.10
+        */
+        columnDefs?: ColumnDefsSettings[];
+
+        /**
+        * Delay the loading of server-side data until second draw
+        */
+        deferLoading?: number | number[];
+
+        /**
+        * Destroy any existing table matching the selector and replace with the new options. Since: 1.10
+        */
+        destroy?: boolean;
+
+        /**
+        * Initial paging start point. Since: 1.10
+        */
+        displayStart?: number;
+
+        /**
+        * Define the table control elements to appear on the page and in what order. Since: 1.10
+        */
+        dom?: string;
+
+        /**
+        * Change the options in the page length select list. Since: 1.10
+        */
+        lengthMenu?: (number | string)[]| (number | string)[][];
+
+        /**
+        * Control which cell the order event handler will be applied to in a column. Since: 1.10
+        */
+        orderCellsTop?: boolean;
+
+        /**
+        * Highlight the columns being ordered in the table's body. Since: 1.10
+        */
+        orderClasses?: boolean;
+
+        /**
+        * Initial order (sort) to apply to the table. Since: 1.10
+        */
+        order?: (string | number)[]| (string | number)[][];
+
+        /**
+        * Ordering to always be applied to the table. Since: 1.10
+        */
+        orderFixed?: (string | number)[]| (string | number)[][]| Object;
+
+        /**
+        * Multiple column ordering ability control. Since: 1.10
+        */
+        orderMulti?: boolean;
+
+        /**
+        * Change the initial page length (number of rows per page). Since: 1.10
+        */
+        pageLength?: number;
+
+        /**
+        * Pagination button display options. Basic Types: simple, simple_numbers, full, full_numbers
+        */
+        pagingType?: string;
+
+        /**
+        * Retrieve an existing DataTables instance. Since: 1.10
+        */
+        retrieve?: boolean
+
+        /**
+        * Display component renderer types. Since: 1.10
+        */
+        renderer?: string | RendererSettings;
+
+        /**
+        * Allow the table to reduce in height when a limited number of rows are shown. Since: 1.10
+        */
+        scrollCollapse?: boolean;
+
+        /**
+        * Set an initial filter in DataTables and / or filtering options. Since: 1.10
+        */
+        search?: SearchSettings;
+
+        /**
+        * Define an initial search for individual columns. Since: 1.10
+        */
+        searchCols?: SearchSettings[];
+
+        /**
+        * Set a throttle frequency for searching. Since: 1.10
+        */
+        searchDelay?: number;
+
+        /**
+        * Saved state validity duration. Since: 1.10
+        */
+        stateDuration?: number;
+
+        /**
+        * Set the zebra stripe class names for the rows in the table. Since: 1.10
+        */
+        stripeClasses?: string[];
+
+        /**
+        * Tab index control for keyboard navigation. Since: 1.10
+        */
+        tabIndex?: number;
+
+        //#endregion "Options"
+
+        //#region "Callbacks"
+
+        /**
+        * Callback for whenever a TR element is created for the table's body. Since: 1.10
+        */
+        createdRow?: FunctionCreateRow;
+
+        /**
+        * Function that is called every time DataTables performs a draw. Since: 1.10
+        */
+        drawCallback?: FunctionDrawCallback;
+
+        /**
+        * Footer display callback function. Since: 1.10
+        */
+        footerCallback?: FunctionFooterCallback;
+
+        /**
+        * Number formatting callback function. Since: 1.10
+        */
+        formatNumber?: FunctionFormatNumber;
+
+        /**
+        * Header display callback function. Since: 1.10
+        */
+        headerCallback?: FunctionHeaderCallback;
+
+        /**
+        * Table summary information display callback. Since: 1.10
+        */
+        infoCallback?: FunctionInfoCallback;
+
+        /**
+        * Initialisation complete callback. Since: 1.10
+        */
+        initComplete?: FunctionInitComplete;
+
+        /**
+        * Pre-draw callback. Since: 1.10
+        */
+        preDrawCallback?: FunctionPreDrawCallback;
+
+        /**
+        * Row draw callback.. Since: 1.10
+        */
+        rowCallback?: FunctionRowCallback;
+
+        /**
+        * Callback that defines where and how a saved state should be loaded. Since: 1.10
+        */
+        stateLoadCallback?: FunctionStateLoadCallback;
+
+        /**
+        * State loaded callback. Since: 1.10
+        */
+        stateLoaded?: FunctionStateLoaded;
+
+        /**
+        * State loaded - data manipulation callback. Since: 1.10
+        */
+        stateLoadParams?: FunctionStateLoadParams;
+
+        /**
+        * Callback that defines how the table state is stored and where. Since: 1.10
+        */
+        stateSaveCallback?: FunctionStateSaveCallback;
+
+        /**
+        * State save - data manipulation callback. Since: 1.10
+        */
+        stateSaveParams?: FunctionStateSaveParams;
+
+        //#endregion "Callbacks"
+
+        //#region "Language"
+
+        language?: LanguageSettings;
+
+        //#endregion "Language"
+    }
+
+    //#region "ajax-settings"
+
+    export interface AjaxDataRequest {
+        draw: number;
+        start: number;
+        length: number;
+        data: any;
+        order: AjaxDataRequestOrder[];
+        columns: AjaxDataRequestColumn[];
+        search: AjaxDataRequestSearch;
+    }
+
+    export interface AjaxDataRequestSearch {
+        value: string;
+        regex: boolean;
+    }
+
+    export interface AjaxDataRequestOrder {
+        column: number;
+        dir: string;
+    }
+
+    export interface AjaxDataRequestColumn {
+        data: string | number;
+        name: string;
+        searchable: boolean;
+        orderable: boolean;
+        search: AjaxDataRequestSearch;
+    }
+
+    export interface AjaxData {
+        draw: number;
+        recordsTotal: number;
+        recordsFiltered: number;
+        data: any;
+        error?: string;
+    }
+
+    interface AjaxSettings extends JQueryAjaxSettings {
+        /**
+        * Add or modify data submitted to the server upon an Ajax request. Since: 1.10
+        */
+        data?: Object | FunctionAjaxData;
+
+        /**
+        * Data property or manipulation method for table data. Since: 1.10
+        */
+        dataSrc?: string | Function;
+    }
+
+    interface FunctionAjax {
+        (data: Object, callback: Function, settings: SettingsLegacy): void;
+    }
+
+    interface FunctionAjaxData {
+        (data: Object): string | Object;
+    }
+
+    //#endregion "ajax-settings"
+
+    //#region "colunm-settings"
+
+    export interface ColumnSettings {
+        /**
+        * Cell type to be created for a column. th/td Since: 1.10
+        */
+        cellType?: string;
+
+        /**
+        * Class to assign to each cell in the column. Since: 1.10
+        */
+        className?: string;
+
+        /**
+        * Add padding to the text content used when calculating the optimal with for a table. Since: 1.10
+        */
+        contentPadding?: string;
+
+        /**
+        * Cell created callback to allow DOM manipulation. Since: 1.10
+        */
+        createdCell?: FunctionColumnCreatedCell;
+
+        /**
+        * Class to assign to each cell in the column. Since: 1.10
+        */
+        data?: number | string | ObjectColumnData | FunctionColumnData;
+
+        /**
+        * Set default, static, content for a column. Since: 1.10
+        */
+        defaultContent?: string;
+
+        /**
+        * Set a descriptive name for a column. Since: 1.10
+        */
+        name?: string;
+
+        /**
+        * Enable or disable ordering on this column. Since: 1.10
+        */
+        orderable?: boolean;
+
+        /**
+        * Define multiple column ordering as the default order for a column. Since: 1.10
+        */
+        orderData?: number | number[];
+
+        /**
+        * Live DOM sorting type assignment. Since: 1.10
+        */
+        orderDataType?: string;
+
+        /**
+        * Order direction application sequence. Since: 1.10
+        */
+        orderSequence?: string[];
+
+        /**
+        * Render (process) the data for use in the table. Since: 1.10
+        */
+        render?: number | string | ObjectColumnRender | FunctionColumnRender;
+
+        /**
+        * Enable or disable filtering on the data in this column. Since: 1.10
+        */
+        searchable?: boolean;
+
+        /**
+        * Set the column title. Since: 1.10
+        */
+        title?: string;
+
+        /**
+        * Set the column type - used for filtering and sorting string processing. Since: 1.10
+        */
+        type?: string;
+
+        /**
+        * Enable or disable the display of this column. Since: 1.10
+        */
+        visible?: boolean;
+
+        /**
+        * Column width assignment. Since: 1.10
+        */
+        width?: string;
+    }
+
+    interface ColumnDefsSettings extends ColumnSettings {
+        targets: string | number | (number | string)[]
+    }
+
+    interface FunctionColumnCreatedCell {
+        (cell: Node, cellData: any, rowData: any, row: number, col: number): void;
+    }
+
+    interface FunctionColumnData {
+        (row: any, t: string, s: any, meta: CellMetaSettings): void;
+    }
+
+    interface ObjectColumnData {
+        _: string;
+        filter?: string;
+        display?: string;
+        type?: string;
+        sort?: string;
+    }
+
+    interface ObjectColumnRender extends ObjectColumnData {
+    }
+
+    interface FunctionColumnRender {
+        (data: any, t: string, row: any, meta: CellMetaSettings): void;
+    }
+
+    interface CellMetaSettings {
+        row: number;
+        col: number;
+        settings: DataTables.Settings;
+    }
+
+    //#endregion "colunm-settings"
+
+    //#region "other-settings"
+
+    export interface RendererSettings {
+        header?: string;
+        pageButton?: string;
+    }
+
+    export interface SearchSettings {
+        /**
+        * Control case-sensitive filtering option. Since: 1.10
+        */
+        caseInsensitive?: boolean;
+
+        /**
+        * Enable / disable escaping of regular expression characters in the search term. Since: 1.10
+        */
+        regex?: boolean;
+
+        /**
+        * Enable / disable DataTables' smart filtering. Since: 1.10
+        */
+        smart?: boolean;
+
+        /**
+        * Set an initial filtering condition on the table. Since: 1.10
+        */
+        search?: string;
+    }
+
+    //#endregion "other-settings"
+
+    //#region "callback-functions"
+
+    interface FunctionCreateRow {
+        (row: Node, data: any[]| Object, dataIndex: number): void;
+    }
+
+    interface FunctionDrawCallback {
+        (settings: SettingsLegacy): void;
+    }
+
+    interface FunctionFooterCallback {
+        (tfoot: Node, data: any[], start: number, end: number, display: any[]): void;
+    }
+
+    interface FunctionFormatNumber {
+        (formatNumber: number): void;
+    }
+
+    interface FunctionHeaderCallback {
+        (thead: Node, data: any[], start: number, end: number, display: any[]): void;
+    }
+
+    interface FunctionInfoCallback {
+        (settings: SettingsLegacy, start: number, end: number, mnax: number, total: number, pre: string): void;
+    }
+
+    interface FunctionInitComplete {
+        (settings: SettingsLegacy, json: Object): void;
+    }
+
+    interface FunctionPreDrawCallback {
+        (settings: SettingsLegacy): void;
+    }
+
+    interface FunctionRowCallback {
+        (row: Node, data: any[]| Object): void;
+    }
+
+    interface FunctionStateLoadCallback {
+        (settings: SettingsLegacy): void;
+    }
+
+    interface FunctionStateLoaded {
+        (settings: SettingsLegacy, data: Object): void;
+    }
+
+    interface FunctionStateLoadParams {
+        (settings: SettingsLegacy, data: Object): void;
+    }
+
+    interface FunctionStateSaveCallback {
+        (settings: SettingsLegacy, data: Object): void;
+    }
+
+    interface FunctionStateSaveParams {
+        (settings: SettingsLegacy, data: Object): void;
+    }
+
+    //#endregion "callback-functions"
+
+    //#region "language-settings"
+
+	// these are all optional
+    interface LanguageSettings {
+        emptyTable?: string;
+        info?: string;
+        infoEmpty?: string;
+        infoFiltered?: string;
+        infoPostFix?: string;
+        thousands?: string;
+        lengthMenu?: string;
+        loadingRecords?: string;
+        processing?: string;
+        search?: string;
+        zeroRecords?: string;
+        paginate?: LanguagePaginateSettings;
+        aria?: LanguageAriaSettings;
+    }
+
+    interface LanguagePaginateSettings {
+        first: string;
+        last: string;
+        next: string;
+        previous: string;
+    }
+
+    interface LanguageAriaSettings {
+        sortAscending: string;
+        sortDescending: string;
+    }
+
+    //#endregion "language-settings"
+
+    //#endregion "Settings"
+
+    //#region "SettingsLegacy"
+
+    interface ArrayStringNode {
+        [index: string]: Node;
+    }
+
+    export interface SettingsLegacy {
+        ajax: any;
+        oApi: any;
+        oFeatures: FeaturesLegacy;
+        oScroll: ScrollingLegacy;
+        oLanguage: LanguageLegacy; // | { fnInfoCallback: FunctionInfoCallback; };
+        oBrowser: { bScrollOversize: boolean; };
+        aanFeatures: ArrayStringNode[][];
+        aoData: RowLegacy[];
+        aiDisplay: number[];
+        aiDisplayMaster: number[];
+        aoColumns: ColumnLegacy[];
+        aoHeader: any[];
+        aoFooter: any[];
+        asDataSearch: string[];
+        oPreviousSearch: any;
+        aoPreSearchCols: any[];
+        aaSorting: any[][];
+        aaSortingFixed: any[][];
+        asStripeClasses: string[];
+        asDestroyStripes: string[];
+        sDestroyWidth: number;
+        aoRowCallback: FunctionRowCallback[];
+        aoHeaderCallback: FunctionHeaderCallback[];
+        aoFooterCallback: FunctionFooterCallback[];
+        aoDrawCallback: FunctionDrawCallback[];
+        aoRowCreatedCallback: FunctionCreateRow[];
+        aoPreDrawCallback: FunctionPreDrawCallback[];
+        aoInitComplete: FunctionInitComplete[];
+        aoStateSaveParams: FunctionStateSaveParams[];
+        aoStateLoadParams: FunctionStateLoadParams[];
+        aoStateLoaded: FunctionStateLoaded[];
+        sTableId: string;
+        nTable: Node;
+        nTHead: Node;
+        nTFoot: Node;
+        nTBody: Node;
+        nTableWrapper: Node;
+        bDeferLoading: boolean;
+        bInitialized: boolean;
+        aoOpenRows: any[];
+        sDom: string;
+        sPaginationType: string;
+        iCookieDuration: number;
+        sCookiePrefix: string;
+        fnCookieCallback: CookieCallbackLegacy;
+        aoStateSave: FunctionStateSaveCallback[];
+        aoStateLoad: FunctionStateLoadCallback[];
+        oLoadedState: any;
+        sAjaxSource: string;
+        sAjaxDataProp: string;
+        bAjaxDataGet: boolean;
+        jqXHR: any;
+        fnServerData: any;
+        aoServerParams: any[];
+        sServerMethod: string;
+        fnFormatNumber: FunctionFormatNumber;
+        aLengthMenu: any[];
+        iDraw: number;
+        bDrawing: boolean;
+        iDrawError: number;
+        _iDisplayLength: number;
+        _iDisplayStart: number;
+        _iDisplayEnd: number;
+        _iRecordsTotal: number;
+        _iRecordsDisplay: number;
+        bJUI: boolean;
+        oClasses: any;
+        bFiltered: boolean;
+        bSorted: boolean;
+        bSortCellsTop: boolean;
+        oInit: any;
+        aoDestroyCallback: any[];
+        fnRecordsTotal: () => number;
+        fnRecordsDisplay: () => number;
+        fnDisplayEnd: () => number;
+        oInstance: any;
+        sInstance: string;
+        iTabIndex: number;
+        nScrollHead: Node;
+        nScrollFoot: Node;
+    }
+
+    export interface FeaturesLegacy {
+        bAutoWidth: boolean;
+        bDeferRender: boolean;
+        bFilter: boolean;
+        bInfo: boolean;
+        bLengthChange: boolean;
+        bPaginate: boolean;
+        bProcessing: boolean;
+        bServerSide: boolean;
+        bSort: boolean;
+        bSortClasses: boolean;
+        bStateSave: boolean;
+    }
+
+    export interface ScrollingLegacy {
+        bAutoCss: boolean;
+        bCollapse: boolean;
+        bInfinite: boolean;
+        iBarWidth: number;
+        iLoadGap: number;
+        sX: string;
+        sY: string;
+    }
+
+    export interface RowLegacy {
+        nTr: Node;
+        _aData: any;
+        _aSortData: any[];
+        _anHidden: Node[];
+        _sRowStripe: string;
+    }
+
+    export interface ColumnLegacy {
+        aDataSort: any;
+        asSorting: string[];
+        bSearchable: boolean;
+        bSortable: boolean;
+        bVisible: boolean;
+        _bAutoType: boolean;
+        fnCreatedCell: FunctionColumnCreatedCell;
+        fnGetData: (data: any, specific: string) => any;
+        fnSetData: (data: any, value: any) => void;
+        mData: any;
+        mRender: any;
+        nTh: Node;
+        nIf: Node;
+        sClass: string;
+        sContentPadding: string;
+        sDefaultContent: string;
+        sName: string;
+        sSortDataType: string;
+        sSortingClass: string;
+        sSortingClassJUI: string;
+        sTitle: string;
+        sType: string;
+        sWidth: string;
+        sWidthOrig: string;
+    }
+
+    export interface CookieCallbackLegacy {
+        (name: string, data: any, expires: string, path: string, cookie: string): void;
+    }
+
+    export interface LanguageLegacy {
+        oAria?: LanguageAriaLegacy;
+        oPaginate?: LanguagePaginateLegacy;
+        sEmptyTable?: string;
+        sInfo?: string;
+        sInfoEmpty?: string;
+        sInfoFiltered?: string;
+        sInfoPostFix?: string;
+        sInfoThousands?: string;
+        sLengthMenu?: string;
+        sLoadingRecords?: string;
+        sProcessing?: string;
+        sSearch?: string;
+        sUrl?: string;
+        sZeroRecords?: string;
+    }
+
+    export interface LanguageAriaLegacy {
+        sSortAscending?: string;
+        sSortDescending?: string;
+    }
+
+    export interface LanguagePaginateLegacy {
+        sFirst?: string;
+        sLast?: string;
+        sNext?: string;
+        sPrevious?: string;
+    }
+    //#endregion "SettingsLegacy"
+
+}
diff --git a/jquery.dataTables/jquery.dataTables-tests.ts b/jquery.dataTables/jquery.dataTables-tests.ts
index 4d1d114cb4..d1c8ebb3aa 100644
--- a/jquery.dataTables/jquery.dataTables-tests.ts
+++ b/jquery.dataTables/jquery.dataTables-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="jquery.dataTables.d.ts" />
+/// <reference types="jquery" />
+
 
 $(document).ready(function () {
     //#region "Language"
diff --git a/jquery.dataTables/jquery.dataTables-tests.ts.tscparams b/jquery.dataTables/jquery.dataTables-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jquery.dataTables/jquery.dataTables-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jquery.dataTables/jquery.dataTables.d.ts b/jquery.dataTables/jquery.dataTables.d.ts
deleted file mode 100644
index 256da7d8c5..0000000000
--- a/jquery.dataTables/jquery.dataTables.d.ts
+++ /dev/null
@@ -1,1835 +0,0 @@
-// Type definitions for JQuery DataTables 1.10.5
-// Project: http://www.datatables.net
-// Definitions by: Kiarash Ghiaseddin <https://github.com/Silver-Connection/DefinitelyTyped>, Omid Rad <https://github.com/omidkrad>, Armin Sander <https://github.com/pragmatrix/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// missing:
-// - Static methods that are defined in JQueryStatic.fn are not typed.
-// - Plugin and extension definitions are not typed.
-// - Some return types are not fully wokring
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface JQuery {
-    DataTable(param?: DataTables.Settings): DataTables.DataTable;
-}
-
-//TODO: Wrong, as jquery.d.ts has no interface for fn
-//interface JQueryStatic {
-//    dataTable: DataTables.StaticFunctions;
-//}
-
-declare namespace DataTables {
-    export interface DataTable extends DataTableCore {
-        /**
-        * Get the data for the whole table.
-        */
-        data(): DataTable;
-
-        /**
-        * Order Methods / Object
-        */
-        order: OrderMethods;
-
-        //#region "Cell/Cells"
-
-        /**
-        * Select the cell found by a cell selector
-        *
-        * @param cellSelector Cell selector.
-        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
-        */
-        cell(cellSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[], modifier?: ObjectSelectorModifier): CellMethods;
-
-        /**
-        * Select the cell found by a cell selector
-        *
-        * @param rowSelector Row selector.
-        * @param cellSelector Cell selector.
-        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
-        */
-        cell(rowSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[], cellSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[], modifier?: ObjectSelectorModifier): CellMethods;
-
-        /**
-        * Select all cells
-        *
-        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
-        */
-        cells(modifier?: ObjectSelectorModifier): CellsMethods;
-
-        /**
-        * Select cells found by a cell selector
-        *
-        * @param cellSelector Cell selector.
-        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
-        */
-        cells(cellSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[], modifier?: ObjectSelectorModifier): CellsMethods;
-
-        /**
-        * Select cells found by both row and column selectors
-        *
-        * @param rowSelector Row selector.
-        * @param cellSelector Cell selector.
-        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
-        */
-        cells(rowSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[], cellSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[], modifier?: ObjectSelectorModifier): CellsMethods;
-        //#endregion "Cell/Cells"
-
-        //#region "Column/Columns"
-
-        /**
-        * Column Methods / Object
-        */
-        column: ColumnMethodsModel;
-
-        /**
-        * Columns Methods / Object
-        */
-        columns: ColumnsMethodsModel;
-
-        //#endregion "Column/Columns"
-
-        //#region "Row/Rows"
-
-        /**
-        * Row Methode / Object
-        */
-        row: RowMethodsModel
-
-        /**
-        * Rows Methods / Object
-        */
-        rows: RowsMethodsModel
-
-        //#endregion "Row/Rows"
-
-        //#region "Table/Tables"
-
-        /**
-        * Select a table based on a selector from the API's context
-        *
-        * @param tableSelector Table selector.
-        */
-        table(tableSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[]): TableMethods;
-
-        /**
-        * Select all tables
-        */
-        tables(): TablesMethods;
-
-        /**
-        * Select tables based on the given selector
-        *
-        * @param tableSelector Table selector.
-        */
-        tables(tableSelector: (string | Node | Function | JQuery | Object) | (string | Node | Function | JQuery | Object)[]): TablesMethods;
-
-        //#endregion "Table/Tables"
-    }
-
-    export interface DataTables extends DataTableCore {
-        [index: number]: DataTable;
-    }
-
-    interface ObjectSelectorModifier {
-        /**
-        * The order modifier provides the ability to control which order the rows are processed in.
-        * Values: 'current', 'applied', 'index',  'original'
-        */
-        order?: string;
-
-        /**
-        * The search modifier provides the ability to govern which rows are used by the selector using the search options that are applied to the table.
-        * Values: 'none', 'applied', 'removed'
-        */
-        search?: string;
-
-        /**
-        * The page modifier allows you to control if the selector should consider all data in the table, regardless of paging, or if only the rows in the currently disabled page should be used.
-        * Values: 'all', 'current'
-        */
-        page?: string;
-    }
-
-    //#region "Namespaces"
-
-    //#region "core-methods"
-
-    interface DataTableCore extends UtilityMethods {
-        /**
-        * Get jquery object
-        */
-        $(selector: string | Node | Node[]| JQuery, modifier?: ObjectSelectorModifier): JQuery;
-
-        ///// Almost identical to $ in operation, but in this case returns the data for the matched rows.
-        //_(selector: string | Node | Node[] | JQuery, modifier?: ObjectSelectorModifier): JQuery;
-
-        /**
-        * Ajax Methods
-        */
-        ajax: AjaxMethodModel;
-
-        /**
-        * Clear the table of all data.
-        */
-        clear(): DataTable;
-
-        /**
-        * Destroy the DataTables in the current context.
-        *
-        * @param remove Completely remove the table from the DOM (true) or leave it in the DOM in its original plain un-enhanced HTML state (default, false).
-        */
-        destroy(remove?: boolean): DataTable;
-
-        /**
-        * Redraw the table.
-        *
-        * @param reset Reset (default) or hold the current paging position. A full re-sort and re-filter is performed when this method is called, which is why the pagination reset is the default action.
-        */
-        draw(reset?: boolean): DataTable;
-
-        /**
-        * Table events removal.
-        *
-        * @param event Event name to remove.
-        * @param callback Specific callback function to remove if you want to unbind a single event listener.
-        */
-        off(event: string, callback?: Function): DataTable;
-
-        /**
-        * Table events listener.
-        *
-        * @param event Event to listen for.
-        * @param callback Specific callback function to remove if you want to unbind a single event listener.
-        */
-        on(event: string, callback: Function): DataTable;
-
-        /**
-        * Listen for a table event once and then remove the listener.
-        *
-        * @param event Event to listen for.
-        * @param callback Specific callback function to remove if you want to unbind a single event listener.
-        */
-        one(event: string, callback: Function): DataTable;
-
-        /**
-        * Page Methods / Object
-        */
-        page: PageMethods;
-
-        /**
-        * Get current search
-        */
-        search(): string;
-
-        /**
-        * Search for data in the table.
-        *
-        * @param input Search string to apply to the table.
-        * @param regex Treat as a regular expression (true) or not (default, false).
-        * @param smart Perform smart search.
-        * @param caseInsen Do case-insensitive matching (default, true) or not (false).
-        */
-        search(input: string, regex?: boolean, smart?: boolean, caseInsen?: boolean): DataTable;
-
-        /**
-        * Obtain the table's settings object
-        */
-        settings(): DataTable;
-
-        /**
-        * Page Methods / Object
-        */
-        state: StateMethods;
-    }
-
-    //#region "ajax-methods"
-
-    interface AjaxMethods extends DataTable {
-        /**
-        * Reload the table data from the Ajax data source.
-        *
-        * @param callback Function which is executed when the data as been reloaded and the table fully redrawn.
-        * @param resetPaging Reset (default action or true) or hold the current paging position (false).
-        */
-        load(callback?: Function, resetPaging?: boolean): DataTable;
-    }
-
-    interface AjaxMethodModel {
-        /**
-        * Get the latest JSON data obtained from the last Ajax request DataTables made
-        */
-        json(): Object;
-
-        /**
-        * Get the data submitted by DataTables to the server in the last Ajax request
-        */
-        params(): Object;
-
-        /**
-        * Reload the table data from the Ajax data source.
-        *
-        * @param callback Function which is executed when the data as been reloaded and the table fully redrawn.
-        * @param resetPaging Reset (default action or true) or hold the current paging position (false).
-        */
-        reload(callback?: Function, resetPaging?: boolean): DataTable;
-
-        /**
-        * Reload the table data from the Ajax data source
-        */
-        url(): string;
-
-        /**
-        * Reload the table data from the Ajax data source
-        *
-        * @param url URL to set to be the Ajax data source for the table.
-        */
-        url(url: string): AjaxMethods;
-    }
-
-    //#endregion "ajax-methods"
-
-    //#region "order-methods"
-
-    interface OrderMethods {
-        /**
-        * Get the ordering applied to the table.
-        */
-        (): (string | number)[][];
-
-        /**
-        * Set the ordering applied to the table.
-        *
-        * @param order Order Model
-        */
-        (order?: (string | number)[]): DataTable;
-        (order?: (string | number)[][]): DataTable;
-        (order: (string | number)[], ...args: any[]): DataTable;
-
-        /**
-        * Add an ordering listener to an element, for a given column.
-        *
-        * @param node Selector
-        * @param column Column index
-        * @param callback Callback function
-        */
-        listener(node: string | Node | JQuery, column: number, callback: Function): DataTable;
-    }
-    //#endregion "order-methods"
-
-    //#region "page-methods"
-
-    interface PageMethods {
-        /**
-        * Get the current page of the table.
-        */
-        (): number;
-
-        /**
-        * Set the current page of the table.
-        *
-        * @param page Index or 'first', 'next', 'previous', 'last'
-        */
-        (page: number | string): DataTable;
-
-        /**
-        * Get paging information about the table
-        */
-        info(): PageMethodeModelInfoReturn;
-
-        /**
-        * Get the table's page length.
-        */
-        len(): number;
-
-        /**
-        * Set the table's page length.
-        *
-        * @param length Page length to set. use -1 to show all records.
-        */
-        len(length: number): DataTable;
-    }
-
-    interface PageMethodeModelInfoReturn {
-        page: number;
-        pages: number;
-        start: number;
-        end: number;
-        length: number;
-        recordsTotal: number;
-        recordsDisplay: number;
-    }
-
-    //#endregion "page-methods"
-
-    //#region "state-methods"
-
-    interface StateMethods {
-        /**
-        * Get the last saved state of the table
-        */
-        (): StateReturnModel;
-
-        /**
-        * Clear the saved state of the table.
-        */
-        clear(): DataTable;
-
-        /**
-        * Get the table state that was loaded during initialisation.
-        */
-        loaded(): StateReturnModel;
-
-        /**
-        * Trigger a state save.
-        */
-        save(): DataTable;
-    }
-
-    interface StateReturnModel {
-        time: number;
-        start: number;
-        length: number;
-        order: (string | number)[][];
-        search: SearchSettings;
-        columns: StateReturnModelColumns[];
-    }
-
-    interface StateReturnModelColumns {
-        search: SearchSettings;
-        visible: boolean;
-    }
-
-    //#endregion "state-methods"
-
-    //#endregion "core-methods"
-
-    //#region "util-methods"
-
-    interface UtilityMethods {
-        /**
-        * Concatenate two or more API instances together
-        *
-        * @param a API instance to concatenate to the initial instance.
-        * @param b Additional API instance(s) to concatenate to the initial instance.
-        */
-        concat(a: Object, ...b: Object[]): DataTable;
-
-        /**
-        * Iterate over the contents of the API result set.
-        *
-        * @param fn Callback function which is called for each item in the API instance result set. The callback is called with three parameters
-        */
-        each(fn: Function): DataTable;
-
-        /**
-        * Reduce an Api instance to a single context and result set.
-        *
-        * @param idx Index to select
-        */
-        eq(idx: number): DataTable;
-
-        /**
-        * Iterate over the result set of an API instance and test each item, creating a new instance from those items which pass.
-        *
-        * @param fn Callback function which is called for each item in the API instance result set. The callback is called with three parameters.
-        */
-        filter(fn: Function): DataTable;
-
-        /**
-        * Flatten a 2D array structured API instance to a 1D array structure.
-        */
-        flatten(): DataTable;
-
-        /**
-        * Find the first instance of a value in the API instance's result set.
-        *
-        * @param value Value to find in the instance's result set.
-        */
-        indexOf(value: any): number;
-
-        /**
-        * Join the elements in the result set into a string.
-        *
-        * @param separator The string that will be used to separate each element of the result set.
-        */
-        join(separator: string): string;
-
-        /**
-        * Find the last instance of a value in the API instance's result set.
-        *
-        * @param value Value to find in the instance's result set.
-        */
-        lastIndexOf(value: any): number;
-
-        /**
-        * Number of elements in an API instance's result set.
-        */
-        length: number;
-
-        /**
-        * Iterate over the result set of an API instance, creating a new API instance from the values returned by the callback.
-        *
-        * @param fn Callback function which is called for each item in the API instance result set. The callback is called with three parameters.
-        */
-        map(fn: Function): DataTable;
-
-        /**
-        * Iterate over the result set of an API instance, creating a new API instance from the values retrieved from the original elements.
-        *
-        * @param property Object property name to use from the element in the original result set for the new result set.
-        */
-        pluck(property: number | string): DataTable;
-
-        /**
-        * Remove the last item from an API instance's result set.
-        */
-        pop(): any;
-
-        /**
-        * Add one or more items to the end of an API instance's result set.
-        *
-        * @param value_1 Item to add to the API instance's result set.
-        */
-        push(value_1: any | any[], ...value_2: any[]): number;
-
-        /**
-        * Apply a callback function against and accumulator and each element in the Api's result set (left-to-right).
-        *
-        * @param fn Callback function which is called for each item in the API instance result set. The callback is called with four parameters.
-        * @param initialValue Value to use as the first argument of the first call to the fn callback.
-        */
-        reduce(fn: Function, initialValue?: any): any;
-
-        /**
-        * Apply a callback function against and accumulator and each element in the Api's result set (right-to-left).
-        *
-        * @param fn Callback function which is called for each item in the API instance result set. The callback is called with four parameters.
-        * @param initialValue Value to use as the first argument of the first call to the fn callback.
-        */
-        reduceRight(fn: Function, initialValue?: any): any;
-
-        /**
-        * Reverse the result set of the API instance and return the original array.
-        */
-        reverse(): DataTable;
-
-        /**
-        * Remove the first item from an API instance's result set.
-        */
-        shift(): any;
-
-        /**
-        * Sort the elements of the API instance's result set.
-        *
-        * @param fn This is a standard Javascript sort comparison function. It accepts two parameters.
-        */
-        sort(fn?: Function): DataTable;
-
-        /**
-        * Modify the contents of an Api instance's result set, adding or removing items from it as required.
-        *
-        * @param index Index at which to start modifying the Api instance's result set.
-        * @param howMany Number of elements to remove from the result set.
-        * @param value_1 Item to add to the result set at the index specified by the first parameter.
-        */
-        splice(index: number, howMany: number, value_1?: any | any[], ...value_2: any[]): any[];
-
-        /**
-        * Convert the API instance to a jQuery object, with the objects from the instance's result set in the jQuery result set.
-        */
-        to$(): JQuery;
-
-        /**
-        * Create a native Javascript array object from an API instance.
-        */
-        toArray(): any[];
-
-        /**
-        * Convert the API instance to a jQuery object, with the objects from the instance's result set in the jQuery result set.
-        */
-        toJQuery(): JQuery;
-
-        /**
-        * Create a new API instance containing only the unique items from a the elements in an instance's result set.
-        */
-        unique(): DataTable;
-
-        /**
-        * Add one or more items to the start of an API instance's result set.
-        *
-        * @param value_1 Item to add to the API instance's result set.
-        */
-        unshift(value_1: any | any[], ...value_2: any[]): number;
-    }
-
-    //#endregion "util-methods"
-
-    interface CommonSubMethods {
-        /**
-        * Get the DataTables cached data for the selected cell
-        *
-        * @param t Specify which cache the data should be read from. Can take one of two values: search or order
-        */
-        cache(t: string): DataTable;
-    }
-
-    //#region "cell-methods"
-
-    interface CommonCellMethods extends CommonSubMethods {
-        /**
-        * Invalidate the data held in DataTables for the selected cells
-        *
-        * @param source Data source to read the new data from.
-        */
-        invalidate(source?: string): DataTable;
-
-        /**
-        * Get data for the selected cell
-        *
-        * @param f Data type to get. This can be one of: 'display', 'filter', 'sort', 'type'
-        */
-        render(t: string): any;
-    }
-
-    interface CellMethods extends DataTableCore, CommonCellMethods {
-        /**
-        * Get data for the selected cell
-        */
-        data(): any;
-
-        /**
-        * Get data for the selected cell
-        *
-        * @param data Value to assign to the data for the cell
-        */
-        data(data: any): DataTable;
-
-        /**
-        * Get index information about the selected cell
-        */
-        index(): CellIndexReturn;
-
-        /**
-        * Get the DOM element for the selected cell
-        */
-        node(): Node;
-    }
-
-    interface CellIndexReturn {
-        row: number;
-        column: number;
-        columnVisible: number;
-    }
-
-    interface CellsMethods extends DataTableCore, CommonCellMethods {
-        /**
-        * Get data for the selected cells
-        */
-        data(): DataTable;
-
-        /**
-        * Get index information about the selected cells
-        */
-        indexes(): DataTable;
-
-        /**
-        * Get the DOM elements for the selected cells
-        */
-        nodes(): DataTable;
-    }
-    //#endregion "cell-methods"
-
-    //#region "column-methods"
-
-    interface CommonColumnMethod extends CommonSubMethods {
-        /**
-        * Get the footer th / td cell for the selected column.
-        */
-        footer(): any;
-
-        /**
-        * Get the header th / td cell for a column.
-        */
-        header(): Node;
-
-        /**
-        * Order the table, in the direction specified, by the column selected by the column()DT selector.
-        *
-        * @param direction Direction of sort to apply to the selected column - desc (descending) or asc (ascending).
-        */
-        order(direction: string): DataTable;
-
-        /**
-        * Get the visibility of the selected column.
-        */
-        visible(): boolean;
-
-        /**
-        * Set the visibility of the selected column.
-        *
-        * @param show Specify if the column should be visible (true) or not (false).
-        * @param redrawCalculations Indicate if DataTables should recalculate the column layout (true - default) or not (false). Typically this would be left as the default value, but it can be useful to disable when using the method in a loop - so the calculations are performed on every call as they can hamper performance.
-        */
-        visible(show: boolean, redrawCalculations?: boolean): DataTable;
-    }
-
-    interface ColumnMethodsModel {
-        /**
-        * Select the column found by a column selector
-        *
-        * @param cellSelector Cell selector.
-        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
-        */
-        (columnSelector: any, modifier?: ObjectSelectorModifier): ColumnMethods;
-
-        /**
-        * Convert from the input column index type to that required.
-        *
-        * @param t The type on conversion that should take place: 'fromVisible', 'toData', 'fromData', 'toVisible'
-        * @param index The index to be converted
-        */
-        index(t: string, index: number): number;
-    }
-
-    interface ColumnMethods extends DataTableCore, CommonColumnMethod {
-        /**
-        * Get the data for the cells in the selected column.
-        */
-        data(): DataTable;
-
-        /**
-        * Get the data source property for the selected column
-        */
-        dataSrc(): number | string | Function;
-
-        /**
-        * Get index information about the selected cell
-        *
-        * @param t Specify if you want to get the column data index (default) or the visible index (visible).
-        */
-        index(t?: string): DataTable;
-
-        /**
-        * Obtain the th / td nodes for the selected column
-        */
-        nodes(): DataTable[];
-    }
-
-    interface ColumnsMethodsModel {
-        /**
-        * Select all columns
-        *
-        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
-        */
-        (modifier?: ObjectSelectorModifier): ColumnsMethods;
-
-        /**
-        * Select columns found by a cell selector
-        *
-        * @param cellSelector Cell selector.
-        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
-        */
-        (columnSelector: any, modifier?: ObjectSelectorModifier): ColumnsMethods;
-
-        /**
-        * Recalculate the column widths for layout.
-        */
-        adjust(): DataTable;
-    }
-
-    interface ColumnsMethods extends DataTableCore, CommonColumnMethod {
-        /**
-        * Obtain the data for the columns from the selector
-        */
-        data(): DataTable;
-
-        /**
-        * Get the data source property for the selected columns.
-        */
-        dataSrc(): DataTable;
-
-        /**
-        * Get the column indexes of the selected columns.
-        *
-        * @param t Specify if you want to get the column data index (default) or the visible index (visible).
-        */
-        indexes(t?: string): DataTable;
-
-        /**
-        * Obtain the th / td nodes for the selected columns
-        */
-        nodes(): DataTable[][];
-    }
-    //#endregion "column-methods"
-
-    //#region "row-methods"
-
-    interface CommonRowMethod extends CommonSubMethods {
-        /**
-        * Obtain the th / td nodes for the selected column
-        *
-        * @param source Data source to read the new data from. Values: 'auto', 'data', 'dom'
-        */
-        invalidate(source?: string): DataTable;
-    }
-
-    interface RowChildMethodModel {
-        /**
-        * Get the child row(s) that have been set for a parent row
-        */
-        (): JQuery;
-
-        /**
-        * Get the child row(s) that have been set for a parent row
-        *
-        * @param showRemove This parameter can be given as true or false
-        */
-        (showRemove: boolean): RowChildMethods;
-
-        /**
-        * Set the data to show in the child row(s). Note that calling this method will replace any child rows which are already attached to the parent row.
-        *
-        * @param data The data to be shown in the child row can be given in multiple different ways.
-        * @param className Class name that is added to the td cell node(s) of the child row(s). As of 1.10.1 it is also added to the tr row node of the child row(s).
-        */
-        (data: (string | Node | JQuery) | (string | Node | JQuery)[], className?: string): RowChildMethods;
-
-        /**
-        * Hide the child row(s) of a parent row
-        */
-        hide(): DataTable;
-
-        /**
-        * Check if the child rows of a parent row are visible
-        */
-        isShown(): DataTable;
-
-        /**
-        * Remove child row(s) from display and release any allocated memory
-        */
-        remove(): DataTable;
-
-        /**
-        * Show the child row(s) of a parent row
-        */
-        show(): DataTable;
-    }
-
-    interface RowChildMethods extends DataTableCore {
-        /**
-        * Hide the child row(s) of a parent row
-        */
-        hide(): DataTable;
-
-        /**
-        * Remove child row(s) from display and release any allocated memory
-        */
-        remove(): DataTable;
-
-        /**
-        * Make newly defined child rows visible
-        */
-        show(): DataTable;
-    }
-
-    interface RowMethodsModel {
-        /**
-        * Select a row found by a row selector
-        *
-        * @param rowSelector Row selector.
-        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
-        */
-        (rowSelector: any, modifier?: ObjectSelectorModifier): RowMethods;
-
-        /**
-        * Add a new row to the table using the given data
-        *
-        * @param data Data to use for the new row. This may be an array, object or Javascript object instance, but must be in the same format as the other data in the table
-        */
-        add(data: any[]| Object): DataTable;
-    }
-
-    interface RowMethods extends DataTableCore, CommonRowMethod {
-        /**
-        * Order Methods / Object
-        */
-        child: RowChildMethodModel;
-
-        /**
-        * Get the data for the selected row
-        */
-        data(): any[]| Object;
-
-        /**
-        * Set the data for the selected row
-        *
-        * @param d Data to use for the row.
-        */
-        data(d: any[]| Object): DataTable;
-
-        /**
-        * Get the row index of the row column.
-        */
-        index(): number;
-
-        /**
-        * Obtain the tr node for the selected row
-        */
-        node(): Node;
-
-        /**
-        * Delete the selected row from the DataTable.
-        */
-        remove(): Node;
-    }
-
-    interface RowsMethodsModel {
-        /**
-        * Select all rows
-        *
-        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
-        */
-        (modifier?: ObjectSelectorModifier): RowsMethods;
-
-        /**
-        * Select rows found by a row selector
-        *
-        * @param cellSelector Row selector.
-        * @param Option used to specify how the cells should be ordered, and if paging or filtering in the table should be taken into account.
-        */
-        (rowSelector: any, modifier?: ObjectSelectorModifier): RowsMethods;
-
-        /**
-        * Add new rows to the table using the data given
-        *
-        * @param data Array of data elements, with each one describing a new row to be added to the table
-        */
-        add(data: any[]): DataTable;
-    }
-
-    interface RowsMethods extends DataTableCore, CommonRowMethod {
-        /**
-        * Get the data for the rows from the selector
-        */
-        data(): DataTable;
-
-        /**
-        * Set the data for the selected row
-        *
-        * @param d Data to use for the row.
-        */
-        data(d: any[]| Object): DataTable;
-
-        /**
-        * Get the row indexes of the selected rows.
-        */
-        indexes(): DataTable;
-
-        /**
-        * Obtain the tr nodes for the selected rows
-        */
-        nodes(): DataTable;
-
-        /**
-        * Delete the selected rows from the DataTable.
-        */
-        remove(): DataTable;
-    }
-    //#endregion "row-methods"
-
-    //#region "table-methods"
-
-    interface TableMethods extends DataTableCore {
-        /**
-        * Get the tfoot node for the table in the API's context
-        */
-        footer(): Node;
-
-        /**
-        * Get the thead node for the table in the API's context
-        */
-        header(): Node;
-
-        /**
-        * Get the tbody node for the table in the API's context
-        */
-        body(): Node;
-
-        /**
-        * Get the div container node for the table in the API's context
-        */
-        container(): Node;
-
-        /**
-        * Get the table node for the table in the API's context
-        */
-        node(): Node;
-    }
-
-    interface TablesMethods extends DataTableCore {
-        /**
-        * Get the tfoot nodes for the tables in the API's context
-        */
-        footer(): DataTable;
-
-        /**
-        * Get the thead nodes for the tables in the API's context
-        */
-        header(): DataTable;
-
-        /**
-        * Get the tbody nodes for the tables in the API's context
-        */
-        body(): DataTable;
-
-        /**
-        * Get the div container nodes for the tables in the API's context
-        */
-        containers(): DataTable;
-
-        /**
-        * Get the table nodes for the tables in the API's context
-        */
-        nodes(): DataTable;
-    }
-    //#endregion "table-methods"
-
-    //#endregion "Namespaces"
-
-    //#region "Static-Methods"
-
-    export interface StaticFunctions {
-        /**
-        * Check is a table node is a DataTable or not
-        *
-        * @param table Selector string for table
-        */
-        isDataTable(table: string): boolean;
-
-        /**
-        * Get all DataTables on the page
-        *
-        * @param visible Get only visible tables
-        */
-        tables(visible?: boolean): DataTables.DataTable[];
-
-        /**
-        * Version number compatibility check function
-        *
-        * @param version Version string
-        */
-        versionCheck(version: string): boolean;
-
-        /**
-        * Utils
-        */
-        util: StaticUtilFunctions;
-
-        /**
-        * Check is a table node is a DataTable or not
-        *
-        * @param table Selector string for table
-        */
-        Api(selector: string | Node | Node[]| JQuery): DataTables.DataTable;
-    }
-
-    export interface StaticUtilFunctions {
-        /**
-        * Escape special characters in a regular expression string. Since: 1.10.4
-        *
-        * @param str String to escape
-        */
-        escapeRegex(str: string): string;
-
-        /**
-        * Throttle the calls to a method to reduce call frequency. Since: 1.10.3
-        *
-        * @param fn Function
-        * @param period ms
-        */
-        throttle(fn: Function, period?: number): Function;
-    }
-
-    //#endregion "Static-Methods"
-
-    //#region "Settings"
-
-    export interface Settings {
-
-        //#region "Features"
-
-        /**
-        * Feature control DataTables' smart column width handling. Since: 1.10
-        */
-        autoWidth?: boolean;
-
-        /**
-        * Feature control deferred rendering for additional speed of initialisation. Since: 1.10
-        */
-        deferRender?: boolean;
-
-        /**
-        * Feature control table information display field. Since: 1.10
-        */
-        info?: boolean;
-
-        /**
-        * Use markup and classes for the table to be themed by jQuery UI ThemeRoller. Since: 1.10
-        */
-        jQueryUI?: boolean;
-
-        /**
-        * Feature control the end user's ability to change the paging display length of the table. Since: 1.10
-        */
-        lengthChange?: boolean;
-
-        /**
-        * Feature control ordering (sorting) abilities in DataTables. Since: 1.10
-        */
-        ordering?: boolean;
-
-        /**
-        * Enable or disable table pagination. Since: 1.10
-        */
-        paging?: boolean;
-
-        /**
-        * Feature control the processing indicator. Since: 1.10
-        */
-        processing?: boolean;
-
-        /**
-        * Horizontal scrolling. Since: 1.10
-        */
-        scrollX?: boolean;
-
-        /**
-        * Vertical scrolling. Since: 1.10 Exp: "200px"
-        */
-        scrollY?: string;
-
-        /**
-        * Feature control search (filtering) abilities Since: 1.10
-        */
-        searching?: boolean;
-
-        /**
-        * Feature control DataTables' server-side processing mode. Since: 1.10
-        */
-        serverSide?: boolean;
-
-        /**
-        * State saving - restore table state on page reload. Since: 1.10
-        */
-        stateSave?: boolean;
-
-        //#endregion "Features"
-
-        //#region "Data"
-
-        /**
-        * Load data for the table's content from an Ajax source. Since: 1.10
-        */
-        ajax?: string | AjaxSettings | FunctionAjax;
-
-        /**
-        * Data to use as the display data for the table. Since: 1.10
-        */
-        data?: Object;
-
-        //#endregion "Data"
-
-        //#region "Options"
-
-        /**
-        * Data to use as the display data for the table. Since: 1.10
-        */
-        columns?: ColumnSettings[];
-
-        /**
-        * Assign a column definition to one or more columns.. Since: 1.10
-        */
-        columnDefs?: ColumnDefsSettings[];
-
-        /**
-        * Delay the loading of server-side data until second draw
-        */
-        deferLoading?: number | number[];
-
-        /**
-        * Destroy any existing table matching the selector and replace with the new options. Since: 1.10
-        */
-        destroy?: boolean;
-
-        /**
-        * Initial paging start point. Since: 1.10
-        */
-        displayStart?: number;
-
-        /**
-        * Define the table control elements to appear on the page and in what order. Since: 1.10
-        */
-        dom?: string;
-
-        /**
-        * Change the options in the page length select list. Since: 1.10
-        */
-        lengthMenu?: (number | string)[]| (number | string)[][];
-
-        /**
-        * Control which cell the order event handler will be applied to in a column. Since: 1.10
-        */
-        orderCellsTop?: boolean;
-
-        /**
-        * Highlight the columns being ordered in the table's body. Since: 1.10
-        */
-        orderClasses?: boolean;
-
-        /**
-        * Initial order (sort) to apply to the table. Since: 1.10
-        */
-        order?: (string | number)[]| (string | number)[][];
-
-        /**
-        * Ordering to always be applied to the table. Since: 1.10
-        */
-        orderFixed?: (string | number)[]| (string | number)[][]| Object;
-
-        /**
-        * Multiple column ordering ability control. Since: 1.10
-        */
-        orderMulti?: boolean;
-
-        /**
-        * Change the initial page length (number of rows per page). Since: 1.10
-        */
-        pageLength?: number;
-
-        /**
-        * Pagination button display options. Basic Types: simple, simple_numbers, full, full_numbers
-        */
-        pagingType?: string;
-
-        /**
-        * Retrieve an existing DataTables instance. Since: 1.10
-        */
-        retrieve?: boolean
-
-        /**
-        * Display component renderer types. Since: 1.10
-        */
-        renderer?: string | RendererSettings;
-
-        /**
-        * Allow the table to reduce in height when a limited number of rows are shown. Since: 1.10
-        */
-        scrollCollapse?: boolean;
-
-        /**
-        * Set an initial filter in DataTables and / or filtering options. Since: 1.10
-        */
-        search?: SearchSettings;
-
-        /**
-        * Define an initial search for individual columns. Since: 1.10
-        */
-        searchCols?: SearchSettings[];
-
-        /**
-        * Set a throttle frequency for searching. Since: 1.10
-        */
-        searchDelay?: number;
-
-        /**
-        * Saved state validity duration. Since: 1.10
-        */
-        stateDuration?: number;
-
-        /**
-        * Set the zebra stripe class names for the rows in the table. Since: 1.10
-        */
-        stripeClasses?: string[];
-
-        /**
-        * Tab index control for keyboard navigation. Since: 1.10
-        */
-        tabIndex?: number;
-
-        //#endregion "Options"
-
-        //#region "Callbacks"
-
-        /**
-        * Callback for whenever a TR element is created for the table's body. Since: 1.10
-        */
-        createdRow?: FunctionCreateRow;
-
-        /**
-        * Function that is called every time DataTables performs a draw. Since: 1.10
-        */
-        drawCallback?: FunctionDrawCallback;
-
-        /**
-        * Footer display callback function. Since: 1.10
-        */
-        footerCallback?: FunctionFooterCallback;
-
-        /**
-        * Number formatting callback function. Since: 1.10
-        */
-        formatNumber?: FunctionFormatNumber;
-
-        /**
-        * Header display callback function. Since: 1.10
-        */
-        headerCallback?: FunctionHeaderCallback;
-
-        /**
-        * Table summary information display callback. Since: 1.10
-        */
-        infoCallback?: FunctionInfoCallback;
-
-        /**
-        * Initialisation complete callback. Since: 1.10
-        */
-        initComplete?: FunctionInitComplete;
-
-        /**
-        * Pre-draw callback. Since: 1.10
-        */
-        preDrawCallback?: FunctionPreDrawCallback;
-
-        /**
-        * Row draw callback.. Since: 1.10
-        */
-        rowCallback?: FunctionRowCallback;
-
-        /**
-        * Callback that defines where and how a saved state should be loaded. Since: 1.10
-        */
-        stateLoadCallback?: FunctionStateLoadCallback;
-
-        /**
-        * State loaded callback. Since: 1.10
-        */
-        stateLoaded?: FunctionStateLoaded;
-
-        /**
-        * State loaded - data manipulation callback. Since: 1.10
-        */
-        stateLoadParams?: FunctionStateLoadParams;
-
-        /**
-        * Callback that defines how the table state is stored and where. Since: 1.10
-        */
-        stateSaveCallback?: FunctionStateSaveCallback;
-
-        /**
-        * State save - data manipulation callback. Since: 1.10
-        */
-        stateSaveParams?: FunctionStateSaveParams;
-
-        //#endregion "Callbacks"
-
-        //#region "Language"
-
-        language?: LanguageSettings;
-
-        //#endregion "Language"
-    }
-
-    //#region "ajax-settings"
-
-    export interface AjaxDataRequest {
-        draw: number;
-        start: number;
-        length: number;
-        data: any;
-        order: AjaxDataRequestOrder[];
-        columns: AjaxDataRequestColumn[];
-        search: AjaxDataRequestSearch;
-    }
-
-    export interface AjaxDataRequestSearch {
-        value: string;
-        regex: boolean;
-    }
-
-    export interface AjaxDataRequestOrder {
-        column: number;
-        dir: string;
-    }
-
-    export interface AjaxDataRequestColumn {
-        data: string | number;
-        name: string;
-        searchable: boolean;
-        orderable: boolean;
-        search: AjaxDataRequestSearch;
-    }
-
-    export interface AjaxData {
-        draw: number;
-        recordsTotal: number;
-        recordsFiltered: number;
-        data: any;
-        error?: string;
-    }
-
-    interface AjaxSettings extends JQueryAjaxSettings {
-        /**
-        * Add or modify data submitted to the server upon an Ajax request. Since: 1.10
-        */
-        data?: Object | FunctionAjaxData;
-
-        /**
-        * Data property or manipulation method for table data. Since: 1.10
-        */
-        dataSrc?: string | Function;
-    }
-
-    interface FunctionAjax {
-        (data: Object, callback: Function, settings: SettingsLegacy): void;
-    }
-
-    interface FunctionAjaxData {
-        (data: Object): string | Object;
-    }
-
-    //#endregion "ajax-settings"
-
-    //#region "colunm-settings"
-
-    export interface ColumnSettings {
-        /**
-        * Cell type to be created for a column. th/td Since: 1.10
-        */
-        cellType?: string;
-
-        /**
-        * Class to assign to each cell in the column. Since: 1.10
-        */
-        className?: string;
-
-        /**
-        * Add padding to the text content used when calculating the optimal with for a table. Since: 1.10
-        */
-        contentPadding?: string;
-
-        /**
-        * Cell created callback to allow DOM manipulation. Since: 1.10
-        */
-        createdCell?: FunctionColumnCreatedCell;
-
-        /**
-        * Class to assign to each cell in the column. Since: 1.10
-        */
-        data?: number | string | ObjectColumnData | FunctionColumnData;
-
-        /**
-        * Set default, static, content for a column. Since: 1.10
-        */
-        defaultContent?: string;
-
-        /**
-        * Set a descriptive name for a column. Since: 1.10
-        */
-        name?: string;
-
-        /**
-        * Enable or disable ordering on this column. Since: 1.10
-        */
-        orderable?: boolean;
-
-        /**
-        * Define multiple column ordering as the default order for a column. Since: 1.10
-        */
-        orderData?: number | number[];
-
-        /**
-        * Live DOM sorting type assignment. Since: 1.10
-        */
-        orderDataType?: string;
-
-        /**
-        * Order direction application sequence. Since: 1.10
-        */
-        orderSequence?: string[];
-
-        /**
-        * Render (process) the data for use in the table. Since: 1.10
-        */
-        render?: number | string | ObjectColumnRender | FunctionColumnRender;
-
-        /**
-        * Enable or disable filtering on the data in this column. Since: 1.10
-        */
-        searchable?: boolean;
-
-        /**
-        * Set the column title. Since: 1.10
-        */
-        title?: string;
-
-        /**
-        * Set the column type - used for filtering and sorting string processing. Since: 1.10
-        */
-        type?: string;
-
-        /**
-        * Enable or disable the display of this column. Since: 1.10
-        */
-        visible?: boolean;
-
-        /**
-        * Column width assignment. Since: 1.10
-        */
-        width?: string;
-    }
-
-    interface ColumnDefsSettings extends ColumnSettings {
-        targets: string | number | (number | string)[]
-    }
-
-    interface FunctionColumnCreatedCell {
-        (cell: Node, cellData: any, rowData: any, row: number, col: number): void;
-    }
-
-    interface FunctionColumnData {
-        (row: any, t: string, s: any, meta: CellMetaSettings): void;
-    }
-
-    interface ObjectColumnData {
-        _: string;
-        filter?: string;
-        display?: string;
-        type?: string;
-        sort?: string;
-    }
-
-    interface ObjectColumnRender extends ObjectColumnData {
-    }
-
-    interface FunctionColumnRender {
-        (data: any, t: string, row: any, meta: CellMetaSettings): void;
-    }
-
-    interface CellMetaSettings {
-        row: number;
-        col: number;
-        settings: DataTables.Settings;
-    }
-
-    //#endregion "colunm-settings"
-
-    //#region "other-settings"
-
-    export interface RendererSettings {
-        header?: string;
-        pageButton?: string;
-    }
-
-    export interface SearchSettings {
-        /**
-        * Control case-sensitive filtering option. Since: 1.10
-        */
-        caseInsensitive?: boolean;
-
-        /**
-        * Enable / disable escaping of regular expression characters in the search term. Since: 1.10
-        */
-        regex?: boolean;
-
-        /**
-        * Enable / disable DataTables' smart filtering. Since: 1.10
-        */
-        smart?: boolean;
-
-        /**
-        * Set an initial filtering condition on the table. Since: 1.10
-        */
-        search?: string;
-    }
-
-    //#endregion "other-settings"
-
-    //#region "callback-functions"
-
-    interface FunctionCreateRow {
-        (row: Node, data: any[]| Object, dataIndex: number): void;
-    }
-
-    interface FunctionDrawCallback {
-        (settings: SettingsLegacy): void;
-    }
-
-    interface FunctionFooterCallback {
-        (tfoot: Node, data: any[], start: number, end: number, display: any[]): void;
-    }
-
-    interface FunctionFormatNumber {
-        (formatNumber: number): void;
-    }
-
-    interface FunctionHeaderCallback {
-        (thead: Node, data: any[], start: number, end: number, display: any[]): void;
-    }
-
-    interface FunctionInfoCallback {
-        (settings: SettingsLegacy, start: number, end: number, mnax: number, total: number, pre: string): void;
-    }
-
-    interface FunctionInitComplete {
-        (settings: SettingsLegacy, json: Object): void;
-    }
-
-    interface FunctionPreDrawCallback {
-        (settings: SettingsLegacy): void;
-    }
-
-    interface FunctionRowCallback {
-        (row: Node, data: any[]| Object): void;
-    }
-
-    interface FunctionStateLoadCallback {
-        (settings: SettingsLegacy): void;
-    }
-
-    interface FunctionStateLoaded {
-        (settings: SettingsLegacy, data: Object): void;
-    }
-
-    interface FunctionStateLoadParams {
-        (settings: SettingsLegacy, data: Object): void;
-    }
-
-    interface FunctionStateSaveCallback {
-        (settings: SettingsLegacy, data: Object): void;
-    }
-
-    interface FunctionStateSaveParams {
-        (settings: SettingsLegacy, data: Object): void;
-    }
-
-    //#endregion "callback-functions"
-
-    //#region "language-settings"
-
-	// these are all optional
-    interface LanguageSettings {
-        emptyTable?: string;
-        info?: string;
-        infoEmpty?: string;
-        infoFiltered?: string;
-        infoPostFix?: string;
-        thousands?: string;
-        lengthMenu?: string;
-        loadingRecords?: string;
-        processing?: string;
-        search?: string;
-        zeroRecords?: string;
-        paginate?: LanguagePaginateSettings;
-        aria?: LanguageAriaSettings;
-    }
-
-    interface LanguagePaginateSettings {
-        first: string;
-        last: string;
-        next: string;
-        previous: string;
-    }
-
-    interface LanguageAriaSettings {
-        sortAscending: string;
-        sortDescending: string;
-    }
-
-    //#endregion "language-settings"
-
-    //#endregion "Settings"
-
-    //#region "SettingsLegacy"
-
-    interface ArrayStringNode {
-        [index: string]: Node;
-    }
-
-    export interface SettingsLegacy {
-        ajax: any;
-        oApi: any;
-        oFeatures: FeaturesLegacy;
-        oScroll: ScrollingLegacy;
-        oLanguage: LanguageLegacy; // | { fnInfoCallback: FunctionInfoCallback; };
-        oBrowser: { bScrollOversize: boolean; };
-        aanFeatures: ArrayStringNode[][];
-        aoData: RowLegacy[];
-        aiDisplay: number[];
-        aiDisplayMaster: number[];
-        aoColumns: ColumnLegacy[];
-        aoHeader: any[];
-        aoFooter: any[];
-        asDataSearch: string[];
-        oPreviousSearch: any;
-        aoPreSearchCols: any[];
-        aaSorting: any[][];
-        aaSortingFixed: any[][];
-        asStripeClasses: string[];
-        asDestroyStripes: string[];
-        sDestroyWidth: number;
-        aoRowCallback: FunctionRowCallback[];
-        aoHeaderCallback: FunctionHeaderCallback[];
-        aoFooterCallback: FunctionFooterCallback[];
-        aoDrawCallback: FunctionDrawCallback[];
-        aoRowCreatedCallback: FunctionCreateRow[];
-        aoPreDrawCallback: FunctionPreDrawCallback[];
-        aoInitComplete: FunctionInitComplete[];
-        aoStateSaveParams: FunctionStateSaveParams[];
-        aoStateLoadParams: FunctionStateLoadParams[];
-        aoStateLoaded: FunctionStateLoaded[];
-        sTableId: string;
-        nTable: Node;
-        nTHead: Node;
-        nTFoot: Node;
-        nTBody: Node;
-        nTableWrapper: Node;
-        bDeferLoading: boolean;
-        bInitialized: boolean;
-        aoOpenRows: any[];
-        sDom: string;
-        sPaginationType: string;
-        iCookieDuration: number;
-        sCookiePrefix: string;
-        fnCookieCallback: CookieCallbackLegacy;
-        aoStateSave: FunctionStateSaveCallback[];
-        aoStateLoad: FunctionStateLoadCallback[];
-        oLoadedState: any;
-        sAjaxSource: string;
-        sAjaxDataProp: string;
-        bAjaxDataGet: boolean;
-        jqXHR: any;
-        fnServerData: any;
-        aoServerParams: any[];
-        sServerMethod: string;
-        fnFormatNumber: FunctionFormatNumber;
-        aLengthMenu: any[];
-        iDraw: number;
-        bDrawing: boolean;
-        iDrawError: number;
-        _iDisplayLength: number;
-        _iDisplayStart: number;
-        _iDisplayEnd: number;
-        _iRecordsTotal: number;
-        _iRecordsDisplay: number;
-        bJUI: boolean;
-        oClasses: any;
-        bFiltered: boolean;
-        bSorted: boolean;
-        bSortCellsTop: boolean;
-        oInit: any;
-        aoDestroyCallback: any[];
-        fnRecordsTotal: () => number;
-        fnRecordsDisplay: () => number;
-        fnDisplayEnd: () => number;
-        oInstance: any;
-        sInstance: string;
-        iTabIndex: number;
-        nScrollHead: Node;
-        nScrollFoot: Node;
-    }
-
-    export interface FeaturesLegacy {
-        bAutoWidth: boolean;
-        bDeferRender: boolean;
-        bFilter: boolean;
-        bInfo: boolean;
-        bLengthChange: boolean;
-        bPaginate: boolean;
-        bProcessing: boolean;
-        bServerSide: boolean;
-        bSort: boolean;
-        bSortClasses: boolean;
-        bStateSave: boolean;
-    }
-
-    export interface ScrollingLegacy {
-        bAutoCss: boolean;
-        bCollapse: boolean;
-        bInfinite: boolean;
-        iBarWidth: number;
-        iLoadGap: number;
-        sX: string;
-        sY: string;
-    }
-
-    export interface RowLegacy {
-        nTr: Node;
-        _aData: any;
-        _aSortData: any[];
-        _anHidden: Node[];
-        _sRowStripe: string;
-    }
-
-    export interface ColumnLegacy {
-        aDataSort: any;
-        asSorting: string[];
-        bSearchable: boolean;
-        bSortable: boolean;
-        bVisible: boolean;
-        _bAutoType: boolean;
-        fnCreatedCell: FunctionColumnCreatedCell;
-        fnGetData: (data: any, specific: string) => any;
-        fnSetData: (data: any, value: any) => void;
-        mData: any;
-        mRender: any;
-        nTh: Node;
-        nIf: Node;
-        sClass: string;
-        sContentPadding: string;
-        sDefaultContent: string;
-        sName: string;
-        sSortDataType: string;
-        sSortingClass: string;
-        sSortingClassJUI: string;
-        sTitle: string;
-        sType: string;
-        sWidth: string;
-        sWidthOrig: string;
-    }
-
-    export interface CookieCallbackLegacy {
-        (name: string, data: any, expires: string, path: string, cookie: string): void;
-    }
-
-    export interface LanguageLegacy {
-        oAria?: LanguageAriaLegacy;
-        oPaginate?: LanguagePaginateLegacy;
-        sEmptyTable?: string;
-        sInfo?: string;
-        sInfoEmpty?: string;
-        sInfoFiltered?: string;
-        sInfoPostFix?: string;
-        sInfoThousands?: string;
-        sLengthMenu?: string;
-        sLoadingRecords?: string;
-        sProcessing?: string;
-        sSearch?: string;
-        sUrl?: string;
-        sZeroRecords?: string;
-    }
-
-    export interface LanguageAriaLegacy {
-        sSortAscending?: string;
-        sSortDescending?: string;
-    }
-
-    export interface LanguagePaginateLegacy {
-        sFirst?: string;
-        sLast?: string;
-        sNext?: string;
-        sPrevious?: string;
-    }
-    //#endregion "SettingsLegacy"
-
-}
diff --git a/jquery.dataTables/tsconfig.json b/jquery.dataTables/tsconfig.json
new file mode 100644
index 0000000000..64d1bc6d5e
--- /dev/null
+++ b/jquery.dataTables/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "jquery.dataTables-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/jquery.dropotron/jquery.dropotron.d.ts b/jquery.dropotron/index.d.ts
similarity index 100%
rename from jquery.dropotron/jquery.dropotron.d.ts
rename to jquery.dropotron/index.d.ts
diff --git a/jquery.dropotron/jquery.dropotron-tests.ts b/jquery.dropotron/jquery.dropotron-tests.ts
index 6b55c6d584..3a535ae60c 100644
--- a/jquery.dropotron/jquery.dropotron-tests.ts
+++ b/jquery.dropotron/jquery.dropotron-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="jquery.dropotron.d.ts" />
+/// <reference types="jquery" />
+
 
 /**
  * @summary Test for "dropotron" without configurations.
diff --git a/jquery.dropotron/jquery.dropotron.ts.tscparams b/jquery.dropotron/jquery.dropotron.ts.tscparams
deleted file mode 100644
index 934bc29ef2..0000000000
--- a/jquery.dropotron/jquery.dropotron.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---noImplicitAny
\ No newline at end of file
diff --git a/jquery.dropotron/tsconfig.json b/jquery.dropotron/tsconfig.json
new file mode 100644
index 0000000000..52760397e7
--- /dev/null
+++ b/jquery.dropotron/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.dropotron-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.dynatree/index.d.ts b/jquery.dynatree/index.d.ts
new file mode 100644
index 0000000000..273f88a2c5
--- /dev/null
+++ b/jquery.dynatree/index.d.ts
@@ -0,0 +1,244 @@
+// Type definitions for jquery.dynatree 1.2.5
+// Project: http://code.google.com/p/dynatree/
+// Definitions by: François de Campredon <https://github.com/fdecampredon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="jquery"/>
+/// <reference types="jqueryui"/>
+
+declare namespace JQueryUI {
+    interface UI {
+        dynatree: DynatreeNamespace
+    }
+}
+
+interface JQuery {
+    dynatree(options?: DynatreeOptions): DynaTree;
+    dynatree(option?: string, ...rest: any[]): any;
+}
+
+interface DynaTree {
+    activateKey(key: string): DynaTreeNode;
+    count(): number;
+    enable(): void;
+    disable(): void;
+    enableUpdate(enable: boolean): void;
+    getActiveNode(): DynaTreeNode;
+    getNodeByKey(key: string): DynaTreeNode;
+    getPersistData(): any;
+    getRoot(): DynaTreeNode;
+    getSelectedNodes(stopOnParents: boolean): DynaTreeNode[];
+    initialize(): void;
+    isInitializing(): boolean;
+    isReloading(): boolean;
+    isUserEvent(): boolean;
+    loadKeyPath(keyPath: string, callback: (node: DynaTreeNode, status: string) =>void ): void;
+    reactivate(setFocus: boolean): void;
+    redraw(): void;
+    reload(): void;
+    renderInvisibleNodes(): void;
+    selectKey(key: string, flag: string): DynaTreeNode;
+    serializeArray(stopOnParents: boolean): any[];
+    toDict(includeRoot?: boolean): any;
+    visit(fn: (node: DynaTreeNode) =>boolean, includeRoot?: boolean): void;
+}
+
+
+interface DynaTreeNode {
+    data: DynaTreeDataModel;
+    activate(): void;
+    activateSilently(): void;
+    addChild(nodeData: DynaTreeDataModel, beforeNode?: DynaTreeNode): void;
+    addChild(nodeData: DynaTreeDataModel[], beforeNode?: DynaTreeNode): void;
+    appendAjax(ajaxOptions: JQueryAjaxSettings): void;
+    countChildren(): number;
+    deactivate(): void;
+    expand(flag: boolean): void;
+    focus(): void;
+    getChildren(): DynaTreeNode[];
+    getEventTargetType(event: Event): string;
+    getLevel(): number;
+    getNextSibling(): DynaTreeNode;
+    getParent(): DynaTreeNode;
+    getPrevSibling(): DynaTreeNode;
+    hasChildren(): boolean;
+    isActive(): boolean;
+    isChildOf(otherNode: DynaTreeNode): boolean;
+    isDescendantOf(otherNode: DynaTreeNode): boolean;
+    isExpanded(): boolean;
+    isFirstSibling(): boolean;
+    isFocused(): boolean;
+    isLastSibling(): boolean;
+    isLazy(): boolean;
+    isLoading(): boolean;
+    isSelected(): boolean;
+    isStatusNode(): boolean;
+    isVisible(): boolean;
+    makeVisible(): boolean;
+    move(targetNode: DynaTreeNode, mode: string): boolean;
+    reload(force: boolean): void;
+    reloadChildren(callback?: (node: DynaTreeNode, isOk: boolean) => any): void;
+    remove(): void;
+    removeChildren(): void;
+    render(useEffects: boolean, includeInvisible: boolean): void;
+    resetLazy(): void;
+    scheduleAction(mode: string, ms: number): void;
+    select(flag: boolean): void;
+    setLazyNodeStatus(status: number): void;
+    setTitle(title: string): void;
+    sortChildren(cmp?: (a: DynaTreeNode, b: DynaTreeNode) =>number, deep?: boolean): void;
+    toDict(recursive: boolean, callback?: (node: any) =>any): any;
+    toggleExpand(): void;
+    toggleSelect(): void;
+    visit(fn: (node: DynaTreeNode) =>boolean, includeSelf: boolean): void;
+    visitParents(fn: (node: DynaTreeNode) =>boolean, includeSelf: boolean): void;
+}
+
+interface DynatreeOptions {
+    title?: string; // Tree's name (only used for debug outpu)
+    minExpandLevel?: number; // 1: root node is not collapsible
+    imagePath?: string; // Path to a folder containing icons. Defaults to 'skin/' subdirectory.
+    children?: DynaTreeDataModel[]; // Init tree structure from this object array.
+    initId?: string; // Init tree structure from a <ul> element with this ID.
+    initAjax?: JQueryAjaxSettings; // Ajax options used to initialize the tree strucuture.
+    autoFocus?: boolean; // Set focus to first child, when expanding or lazy-loading.
+    keyboard?: boolean; // Support keyboard navigation.
+    persist?: boolean; // Persist expand-status to a cookie
+    autoCollapse?: boolean; // Automatically collapse all siblings, when a node is expanded.
+    clickFolderMode?: number; // 1:activate, 2:expand, 3:activate and expand
+    activeVisible?: boolean; // Make sure, active nodes are visible (expanded).
+    checkbox?: boolean; // Show checkboxes.
+    selectMode?: number; // 1:single, 2:multi, 3:multi-hier
+    fx?: any; // Animations, e.g. null or { height: "toggle", duration: 200 }
+    noLink?: boolean; // Use <span> instead of <a> tags for all nodes
+    debugLevel?: number; // 0:quiet, 1:normal, 2:debug
+    generateIds?: boolean; // Generate id attributes like <span id='dynatree-id-KEY'>
+    idPrefix?: string; // Used to generate node id's like <span id="dynatree-id-<key>">.
+    keyPathSeparator?: string; // Used by node.getKeyPath() and tree.loadKeyPath().
+    cookieId?: string; // Choose a more unique name, to allow multiple trees.
+
+    dnd?: DynaTreeDNDOptions;  // Drag'n'drop support
+    ajaxDefaults?: DynaTreeAjaxOptions;// Used by initAjax option
+    strings?: DynaTreeStringsOptions;
+    cookie?: DynaTreeCookieOptions;
+    // Class names used, when rendering the HTML markup.
+    // Note: if only single entries are passed for options.classNames, all other
+    // values are still set to default.
+    classNames?: DynatreeClassNamesOptions;
+
+
+    // Low level event handlers: onEvent(dtnode, event): return false, to stop default processing
+    onClick?: (dtnode: DynaTreeNode, event: Event) =>boolean; // null: generate focus, expand, activate, select events.
+    onDblClick?: (dtnode: DynaTreeNode, event: Event) =>boolean; // (No default actions.)
+    onKeydown?: (dtnode: DynaTreeNode, event: Event) =>boolean; // null: generate keyboard navigation (focus, expand, activate).
+    onKeypress?: (dtnode: DynaTreeNode, event: Event) =>boolean; // (No default actions.)
+    onFocus?: (dtnode: DynaTreeNode, event: Event) =>boolean; // null: set focus to node.
+    onBlur?: (dtnode: DynaTreeNode, event: Event) =>boolean; // null: remove focus from node.
+
+    // Pre-event handlers onQueryEvent(flag, dtnode): return false, to stop processing
+    onQueryActivate?: (flag: string, dtnode: DynaTreeNode) =>void; // Callback(flag, dtnode) before a node is (de)activated.
+    onQuerySelect?: (flag: string, dtnode: DynaTreeNode) =>void;// Callback(flag, dtnode) before a node is (de)selected.
+    onQueryExpand?: (flag: string, dtnode: DynaTreeNode) =>void;// Callback(flag, dtnode) before a node is expanded/collpsed.
+
+    // High level event handlers
+    onPostInit?: (isReloading: boolean, isError: boolean) =>void;// Callback(isReloading, isError) when tree was (re)loaded.
+    onActivate?: (dtnode: DynaTreeNode) =>void; // Callback(dtnode) when a node is activated.
+    onDeactivate?: (dtnode: DynaTreeNode) =>void; // Callback(dtnode) when a node is deactivated.
+    onSelect?: (flag: string, dtnode: DynaTreeNode) =>void; // Callback(flag, dtnode) when a node is (de)selected.
+    onExpand?: (flag: string, dtnode: DynaTreeNode) =>void; // Callback(flag, dtnode) when a node is expanded/collapsed.
+    onLazyRead?: (dtnode: DynaTreeNode) =>void; // Callback(dtnode) when a lazy node is expanded for the first time.
+    onCustomRender?: (dtnode: DynaTreeNode) =>void; // Callback(dtnode) before a node is rendered. Return a HTML string to override.
+    onCreate?: (dtnode: DynaTreeNode, nodeSpan: any) =>void; // Callback(dtnode, nodeSpan) after a node was rendered for the first time.
+    onRender?: (dtnode: DynaTreeNode, nodeSpan: any) =>void; // Callback(dtnode, nodeSpan) after a node was rendered.
+    postProcess?: (data: any, dataType: any) =>void; // Callback(data, dataType) before an Ajax result is passed to dynatree.
+}
+
+interface DynaTreeDataModel {
+    title: string; // (required) Displayed name of the node (html is allowed here)
+    key?: string; // May be used with activate(), select(), find(), ...
+    isFolder?: boolean; // Use a folder icon. Also the node is expandable but not selectable.
+    isLazy?: boolean; // Call onLazyRead(), when the node is expanded for the first time to allow for delayed creation of children.
+    tooltip?: string; // Show this popup text.
+    href?: string; // Added to the generated <a> tag.
+    icon?: string; // Use a custom image (filename relative to tree.options.imagePath). 'null' for default icon, 'false' for no icon.
+    addClass?: string; // Class name added to the node's span tag.
+    noLink?: boolean; // Use <span> instead of <a> tag for this node
+    activate?: boolean; // Initial active status.
+    focus?: boolean; // Initial focused status.
+    expand?: boolean; // Initial expanded status.
+    select?: boolean; // Initial selected status.
+    hideCheckbox?: boolean; // Suppress checkbox display for this node.
+    unselectable?: boolean; // Prevent selection.
+    // The following attributes are only valid if passed to some functions:
+    children?: DynaTreeDataModel[]; // Array of child nodes.
+    // NOTE: we can also add custom attributes here.
+    // This may then also be used in the onActivate(), onSelect() or onLazyTree() callbacks.
+}
+
+interface DynaTreeDNDOptions {
+    autoExpandMS?: number; // Expand nodes after n milliseconds of hovering.
+    preventVoidMoves?: boolean; // Prevent dropping nodes 'before self', etc.
+    revert: boolean; // true: slide helper back to source if drop is rejected
+
+    // Make tree nodes draggable:
+    onDragStart?: (sourceNode: any) =>void; // Callback(sourceNode), return true, to enable dnd
+    onDragStop?: (sourceNode: any) =>void; // Callback(sourceNode)
+    // Make tree nodes accept draggables
+
+    onDragEnter?: (targetNode: any, sourceNode: any) =>void; // Callback(targetNode, sourceNode)
+    onDragOver?: (targetNode: any, sourceNode: any, hitMode: string) =>void;  // Callback(targetNode, sourceNode, hitMode)
+    onDrop?: (targetNode: any, sourceNode: any, hitMode: string) =>void; // Callback(targetNode, sourceNode, hitMode)
+    onDragLeave?: (targetNode: any, sourceNode: any) =>void; // Callback(targetNode, sourceNode)
+}
+
+interface DynaTreeCookieOptions {
+    expires: any;
+}
+
+interface DynaTreeStringsOptions {
+    loading?: string;
+    loadError?: string;
+}
+
+interface DynaTreeAjaxOptions {
+
+    cache?: boolean; // false: Append random '_' argument to the request url to prevent caching.
+    timeout?: number; // >0: Make sure we get an ajax error for invalid URLs
+    dataType?: string; // Expect json format and pass json object to callbacks.
+}
+
+interface DynatreeClassNamesOptions {
+    container?: string;
+    node?: string;
+    folder?: string;
+
+    empty?: string;
+    vline?: string;
+    expander?: string;
+    connector?: string;
+    checkbox?: string;
+    nodeIcon?: string;
+    title?: string;
+    noConnector?: string;
+
+    nodeError?: string;
+    nodeWait?: string;
+    hidden?: string;
+    combinedExpanderPrefix?: string;
+    combinedIconPrefix?: string;
+    hasChildren?: string;
+    active?: string;
+    selected?: string;
+    expanded?: string;
+    lazy?: string;
+    focused?: string;
+    partsel?: string;
+    lastsib?: string;
+}
+
+interface DynatreeNamespace {
+    getNode(element: HTMLElement): DynaTreeNode;
+    getPersistData(cookieId: string, cookieOpts: DynaTreeCookieOptions): any;
+    version: number;
+}
diff --git a/jquery.dynatree/jquery.dynatree-tests.ts b/jquery.dynatree/jquery.dynatree-tests.ts
index df1a17f103..b9a509e277 100644
--- a/jquery.dynatree/jquery.dynatree-tests.ts
+++ b/jquery.dynatree/jquery.dynatree-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jquery.dynatree.d.ts" />
+
 
 var dynatree = $('element').dynatree();
 
diff --git a/jquery.dynatree/jquery.dynatree.d.ts b/jquery.dynatree/jquery.dynatree.d.ts
deleted file mode 100644
index 5dae6b673c..0000000000
--- a/jquery.dynatree/jquery.dynatree.d.ts
+++ /dev/null
@@ -1,244 +0,0 @@
-// Type definitions for jquery.dynatree 1.2.5
-// Project: http://code.google.com/p/dynatree/
-// Definitions by: François de Campredon <https://github.com/fdecampredon>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="../jqueryui/jqueryui.d.ts"/>
-
-declare namespace JQueryUI {
-    interface UI {
-        dynatree: DynatreeNamespace
-    }
-}
-
-interface JQuery {
-    dynatree(options?: DynatreeOptions): DynaTree;
-    dynatree(option?: string, ...rest: any[]): any;
-}
-
-interface DynaTree {
-    activateKey(key: string): DynaTreeNode;
-    count(): number;
-    enable(): void;
-    disable(): void;
-    enableUpdate(enable: boolean): void;
-    getActiveNode(): DynaTreeNode;
-    getNodeByKey(key: string): DynaTreeNode;
-    getPersistData(): any;
-    getRoot(): DynaTreeNode;
-    getSelectedNodes(stopOnParents: boolean): DynaTreeNode[];
-    initialize(): void;
-    isInitializing(): boolean;
-    isReloading(): boolean;
-    isUserEvent(): boolean;
-    loadKeyPath(keyPath: string, callback: (node: DynaTreeNode, status: string) =>void ): void;
-    reactivate(setFocus: boolean): void;
-    redraw(): void;
-    reload(): void;
-    renderInvisibleNodes(): void;
-    selectKey(key: string, flag: string): DynaTreeNode;
-    serializeArray(stopOnParents: boolean): any[];
-    toDict(includeRoot?: boolean): any;
-    visit(fn: (node: DynaTreeNode) =>boolean, includeRoot?: boolean): void;
-}
-
-
-interface DynaTreeNode {
-    data: DynaTreeDataModel;
-    activate(): void;
-    activateSilently(): void;
-    addChild(nodeData: DynaTreeDataModel, beforeNode?: DynaTreeNode): void;
-    addChild(nodeData: DynaTreeDataModel[], beforeNode?: DynaTreeNode): void;
-    appendAjax(ajaxOptions: JQueryAjaxSettings): void;
-    countChildren(): number;
-    deactivate(): void;
-    expand(flag: boolean): void;
-    focus(): void;
-    getChildren(): DynaTreeNode[];
-    getEventTargetType(event: Event): string;
-    getLevel(): number;
-    getNextSibling(): DynaTreeNode;
-    getParent(): DynaTreeNode;
-    getPrevSibling(): DynaTreeNode;
-    hasChildren(): boolean;
-    isActive(): boolean;
-    isChildOf(otherNode: DynaTreeNode): boolean;
-    isDescendantOf(otherNode: DynaTreeNode): boolean;
-    isExpanded(): boolean;
-    isFirstSibling(): boolean;
-    isFocused(): boolean;
-    isLastSibling(): boolean;
-    isLazy(): boolean;
-    isLoading(): boolean;
-    isSelected(): boolean;
-    isStatusNode(): boolean;
-    isVisible(): boolean;
-    makeVisible(): boolean;
-    move(targetNode: DynaTreeNode, mode: string): boolean;
-    reload(force: boolean): void;
-    reloadChildren(callback?: (node: DynaTreeNode, isOk: boolean) => any): void;
-    remove(): void;
-    removeChildren(): void;
-    render(useEffects: boolean, includeInvisible: boolean): void;
-    resetLazy(): void;
-    scheduleAction(mode: string, ms: number): void;
-    select(flag: boolean): void;
-    setLazyNodeStatus(status: number): void;
-    setTitle(title: string): void;
-    sortChildren(cmp?: (a: DynaTreeNode, b: DynaTreeNode) =>number, deep?: boolean): void;
-    toDict(recursive: boolean, callback?: (node: any) =>any): any;
-    toggleExpand(): void;
-    toggleSelect(): void;
-    visit(fn: (node: DynaTreeNode) =>boolean, includeSelf: boolean): void;
-    visitParents(fn: (node: DynaTreeNode) =>boolean, includeSelf: boolean): void;
-}
-
-interface DynatreeOptions {
-    title?: string; // Tree's name (only used for debug outpu)
-    minExpandLevel?: number; // 1: root node is not collapsible
-    imagePath?: string; // Path to a folder containing icons. Defaults to 'skin/' subdirectory.
-    children?: DynaTreeDataModel[]; // Init tree structure from this object array.
-    initId?: string; // Init tree structure from a <ul> element with this ID.
-    initAjax?: JQueryAjaxSettings; // Ajax options used to initialize the tree strucuture.
-    autoFocus?: boolean; // Set focus to first child, when expanding or lazy-loading.
-    keyboard?: boolean; // Support keyboard navigation.
-    persist?: boolean; // Persist expand-status to a cookie
-    autoCollapse?: boolean; // Automatically collapse all siblings, when a node is expanded.
-    clickFolderMode?: number; // 1:activate, 2:expand, 3:activate and expand
-    activeVisible?: boolean; // Make sure, active nodes are visible (expanded).
-    checkbox?: boolean; // Show checkboxes.
-    selectMode?: number; // 1:single, 2:multi, 3:multi-hier
-    fx?: any; // Animations, e.g. null or { height: "toggle", duration: 200 }
-    noLink?: boolean; // Use <span> instead of <a> tags for all nodes
-    debugLevel?: number; // 0:quiet, 1:normal, 2:debug
-    generateIds?: boolean; // Generate id attributes like <span id='dynatree-id-KEY'>
-    idPrefix?: string; // Used to generate node id's like <span id="dynatree-id-<key>">.
-    keyPathSeparator?: string; // Used by node.getKeyPath() and tree.loadKeyPath().
-    cookieId?: string; // Choose a more unique name, to allow multiple trees.
-
-    dnd?: DynaTreeDNDOptions;  // Drag'n'drop support
-    ajaxDefaults?: DynaTreeAjaxOptions;// Used by initAjax option
-    strings?: DynaTreeStringsOptions;
-    cookie?: DynaTreeCookieOptions;
-    // Class names used, when rendering the HTML markup.
-    // Note: if only single entries are passed for options.classNames, all other
-    // values are still set to default.
-    classNames?: DynatreeClassNamesOptions;
-
-
-    // Low level event handlers: onEvent(dtnode, event): return false, to stop default processing
-    onClick?: (dtnode: DynaTreeNode, event: Event) =>boolean; // null: generate focus, expand, activate, select events.
-    onDblClick?: (dtnode: DynaTreeNode, event: Event) =>boolean; // (No default actions.)
-    onKeydown?: (dtnode: DynaTreeNode, event: Event) =>boolean; // null: generate keyboard navigation (focus, expand, activate).
-    onKeypress?: (dtnode: DynaTreeNode, event: Event) =>boolean; // (No default actions.)
-    onFocus?: (dtnode: DynaTreeNode, event: Event) =>boolean; // null: set focus to node.
-    onBlur?: (dtnode: DynaTreeNode, event: Event) =>boolean; // null: remove focus from node.
-
-    // Pre-event handlers onQueryEvent(flag, dtnode): return false, to stop processing
-    onQueryActivate?: (flag: string, dtnode: DynaTreeNode) =>void; // Callback(flag, dtnode) before a node is (de)activated.
-    onQuerySelect?: (flag: string, dtnode: DynaTreeNode) =>void;// Callback(flag, dtnode) before a node is (de)selected.
-    onQueryExpand?: (flag: string, dtnode: DynaTreeNode) =>void;// Callback(flag, dtnode) before a node is expanded/collpsed.
-
-    // High level event handlers
-    onPostInit?: (isReloading: boolean, isError: boolean) =>void;// Callback(isReloading, isError) when tree was (re)loaded.
-    onActivate?: (dtnode: DynaTreeNode) =>void; // Callback(dtnode) when a node is activated.
-    onDeactivate?: (dtnode: DynaTreeNode) =>void; // Callback(dtnode) when a node is deactivated.
-    onSelect?: (flag: string, dtnode: DynaTreeNode) =>void; // Callback(flag, dtnode) when a node is (de)selected.
-    onExpand?: (flag: string, dtnode: DynaTreeNode) =>void; // Callback(flag, dtnode) when a node is expanded/collapsed.
-    onLazyRead?: (dtnode: DynaTreeNode) =>void; // Callback(dtnode) when a lazy node is expanded for the first time.
-    onCustomRender?: (dtnode: DynaTreeNode) =>void; // Callback(dtnode) before a node is rendered. Return a HTML string to override.
-    onCreate?: (dtnode: DynaTreeNode, nodeSpan: any) =>void; // Callback(dtnode, nodeSpan) after a node was rendered for the first time.
-    onRender?: (dtnode: DynaTreeNode, nodeSpan: any) =>void; // Callback(dtnode, nodeSpan) after a node was rendered.
-    postProcess?: (data: any, dataType: any) =>void; // Callback(data, dataType) before an Ajax result is passed to dynatree.
-}
-
-interface DynaTreeDataModel {
-    title: string; // (required) Displayed name of the node (html is allowed here)
-    key?: string; // May be used with activate(), select(), find(), ...
-    isFolder?: boolean; // Use a folder icon. Also the node is expandable but not selectable.
-    isLazy?: boolean; // Call onLazyRead(), when the node is expanded for the first time to allow for delayed creation of children.
-    tooltip?: string; // Show this popup text.
-    href?: string; // Added to the generated <a> tag.
-    icon?: string; // Use a custom image (filename relative to tree.options.imagePath). 'null' for default icon, 'false' for no icon.
-    addClass?: string; // Class name added to the node's span tag.
-    noLink?: boolean; // Use <span> instead of <a> tag for this node
-    activate?: boolean; // Initial active status.
-    focus?: boolean; // Initial focused status.
-    expand?: boolean; // Initial expanded status.
-    select?: boolean; // Initial selected status.
-    hideCheckbox?: boolean; // Suppress checkbox display for this node.
-    unselectable?: boolean; // Prevent selection.
-    // The following attributes are only valid if passed to some functions:
-    children?: DynaTreeDataModel[]; // Array of child nodes.
-    // NOTE: we can also add custom attributes here.
-    // This may then also be used in the onActivate(), onSelect() or onLazyTree() callbacks.
-}
-
-interface DynaTreeDNDOptions {
-    autoExpandMS?: number; // Expand nodes after n milliseconds of hovering.
-    preventVoidMoves?: boolean; // Prevent dropping nodes 'before self', etc.
-    revert: boolean; // true: slide helper back to source if drop is rejected
-
-    // Make tree nodes draggable:
-    onDragStart?: (sourceNode: any) =>void; // Callback(sourceNode), return true, to enable dnd
-    onDragStop?: (sourceNode: any) =>void; // Callback(sourceNode)
-    // Make tree nodes accept draggables
-
-    onDragEnter?: (targetNode: any, sourceNode: any) =>void; // Callback(targetNode, sourceNode)
-    onDragOver?: (targetNode: any, sourceNode: any, hitMode: string) =>void;  // Callback(targetNode, sourceNode, hitMode)
-    onDrop?: (targetNode: any, sourceNode: any, hitMode: string) =>void; // Callback(targetNode, sourceNode, hitMode)
-    onDragLeave?: (targetNode: any, sourceNode: any) =>void; // Callback(targetNode, sourceNode)
-}
-
-interface DynaTreeCookieOptions {
-    expires: any;
-}
-
-interface DynaTreeStringsOptions {
-    loading?: string;
-    loadError?: string;
-}
-
-interface DynaTreeAjaxOptions {
-
-    cache?: boolean; // false: Append random '_' argument to the request url to prevent caching.
-    timeout?: number; // >0: Make sure we get an ajax error for invalid URLs
-    dataType?: string; // Expect json format and pass json object to callbacks.
-}
-
-interface DynatreeClassNamesOptions {
-    container?: string;
-    node?: string;
-    folder?: string;
-
-    empty?: string;
-    vline?: string;
-    expander?: string;
-    connector?: string;
-    checkbox?: string;
-    nodeIcon?: string;
-    title?: string;
-    noConnector?: string;
-
-    nodeError?: string;
-    nodeWait?: string;
-    hidden?: string;
-    combinedExpanderPrefix?: string;
-    combinedIconPrefix?: string;
-    hasChildren?: string;
-    active?: string;
-    selected?: string;
-    expanded?: string;
-    lazy?: string;
-    focused?: string;
-    partsel?: string;
-    lastsib?: string;
-}
-
-interface DynatreeNamespace {
-    getNode(element: HTMLElement): DynaTreeNode;
-    getPersistData(cookieId: string, cookieOpts: DynaTreeCookieOptions): any;
-    version: number;
-}
diff --git a/jquery.dynatree/tsconfig.json b/jquery.dynatree/tsconfig.json
new file mode 100644
index 0000000000..b566736fd4
--- /dev/null
+++ b/jquery.dynatree/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.dynatree-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.elang/index.d.ts b/jquery.elang/index.d.ts
new file mode 100644
index 0000000000..6b860f03f4
--- /dev/null
+++ b/jquery.elang/index.d.ts
@@ -0,0 +1,314 @@
+// Type definitions for eLang 0.5.1
+// Project: https://github.com/sumegizoltan/ELang/
+// Definitions by: Zoltan Sumegi <https://github.com/sumegizoltan/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface IPageResource {
+    lang?: IPageLangItems;
+    selectedLang?: string;
+}
+
+interface IPageLangItems {
+    en?: IPageLabels;
+    hu?: IPageLabels;
+}
+
+interface IPageLabels {
+    lblTitle?: string;
+    lblPageHeader?: string;
+    lblSearchField?: string;
+    lblEditKeyField?: string;
+    lblEditValueField?: string;
+    lblFindedExpressionsHead?: string;
+    lblEditedExpressionsHead?: string;
+    lblFindHead?: string;
+    lblEditHead?: string;
+    lblFind?: string;
+    lblAdd?: string;
+    lblModify?: string;
+    lblRemove?: string;
+    lblSearchInExpressions?: string;
+    lblSearchInMeanings?: string;
+    lblSearchInExpressionsHlp?: string;
+    lblSearchInMeaningsHlp?: string;
+    lblTestHead?: string;
+    lblOrderedTest?: string;
+    lblRandomlyTest?: string;
+    lblTypedTest?: string;
+    lblSelectedTest?: string;
+    lblWrittedTest?: string;
+    lblVoicedTest?: string;
+    lblStartTest?: string;
+    lblStopTest?: string;
+    lblTypedTestHlp?: string;
+    lblSelectedTestHlp?: string;
+    lblOrderedTestHlp?: string;
+    lblRandomlyTestHlp?: string;
+    lblWrittedTestHlp?: string;
+    lblVoicedTestHlp?: string;
+}
+
+interface ELangCommonStatic {
+    resource: IPageResource;
+    getLabel(labelid: string, langid?: string): string;
+    setLang(langid: string, node?: JQuery): void;
+}
+
+// ELang database (LocalStorage) functionality with Singleton instance
+
+interface IELangDBOptions {
+    autocompleteRows: number;
+}
+
+interface IELangDBDelegates {
+    selectHandler: Function;
+    insertHandler: Function;
+    modifyHandler: Function;
+    removeHandler: Function;
+}
+
+interface IELangDBEvents {
+    select: JQueryDeferred<any>;
+    insert: JQueryDeferred<any>;
+    modify: JQueryDeferred<any>;
+    remove: JQueryDeferred<any>;
+}
+
+interface IELangDB {
+    cache?: any;
+    delegates?: IELangDBDelegates;
+    events?: IELangDBEvents;
+    isInitialized?: boolean;
+    options?: IELangDBOptions;
+
+    name?: string;
+    description?: string;
+
+    initialize(options?: IELangDBOptions): void;
+
+    _onSelect(id: string, callback?: Function): void;
+    _onInsert(id: string, value: string, callback?: Function): void;
+    _onModify(id: string, value: string, callback?: Function): void;
+    _onRemove(id: string, callback?: Function): void;
+
+    select(id: string, callback?: Function): void;
+    insert(id: string, value: string, callback?: Function): void;
+    modify(id: string, value: string, callback?: Function): void;
+    remove(id: string, callback?: Function): void;
+
+    sort(): void;
+    setOptions(options: IELangDBOptions): void;
+    getIndexHash(id: string): string;
+    getOptions(): IELangDBOptions;
+}
+
+interface ELangStatic {
+    getInstance(options?: IELangDBOptions): IELangDB;
+}
+
+// ELangBase
+
+interface IELangBaseDefaults {
+    contentCSS: string;
+    contentInnerCSS: string;
+    resultCSS: string;
+    resultHeadCSS: string;
+    contentInnerHtml: string;
+    fluidRowHtml: string;
+    radioGroupHtml: string;
+    radioButtonHtml: string;
+    submitButtonHtml: string;
+    headLabelHtml: string;
+    resultHeadLabelHtml: string;
+    resultHtml: string;
+    headLabel: string;
+    resultHeadLabel: string;
+}
+
+interface IELangBase {
+    name: string;
+    description: string;
+    delegates: any;
+    element: JQuery;
+    events: any;
+    options: any;
+    defaults: IELangBaseDefaults;
+
+    initialize(target: HTMLElement, options: any): void;
+
+    createContent(): void;
+
+    createRadioGroup(node: JQuery,
+                     isMethodAppend: boolean,
+                     buttonNumber: number,
+                     defaultButton: number,
+                     btnLabels: string[],
+                     clickHandler: Function,
+                     btnTooltips?: string[]): void;
+    appendAsLastChild(node: JQuery, element: JQuery): JQuery;
+    getLastChild(node: JQuery): JQuery;
+    isRdoChecked(eSrc: HTMLElement, rdoId: string): boolean;
+    processCommand(command: string): JQuery;
+    setOptions(options: any): void;
+}
+
+// ELangSearch
+
+interface IELangSearchDefaults extends IELangBaseDefaults {
+    expressionsLabel: string;
+    expressionsTooltip: string;
+    meaningsLabel: string;
+    meaningsTooltip: string;
+    searchFormHtml: string;
+    searchFieldHtml: string;
+    searchButtonLabel: string;
+}
+
+interface IELangSearchDelegates {
+    selectHandler: Function;
+    selectCallback: Function;
+    langDirectionHandler: Function;
+    langDirectionClickHandler: Function;
+    searchHandler: Function;
+    searchClickHandler: Function;
+}
+
+interface IELangSearchEvents {
+    select: JQueryDeferred<any>;
+}
+
+interface IELangSearch extends IELangBase {
+    defaults: IELangSearchDefaults;
+    delegates: IELangSearchDelegates;
+    events: IELangSearchEvents;
+    isSearchInExp: boolean;
+
+    initialize(target: HTMLElement, options: any): void;
+    createContent(): void;
+
+    _onDirectionClick(eSrc: HTMLElement): void;
+    _onSelect(eSrc: HTMLInputElement): void;
+    _onSelectCallback(): void;
+
+    _select(eSrc: HTMLInputElement): void;
+}
+
+// ELangEdit
+
+interface IELangEditDelegates {
+    insertHandler: Function;
+    modifyHandler: Function;
+    removeHandler: Function;
+    selectHandler: Function;
+    btnAddHandler: Function;
+    btnAddClickHandler: Function;
+
+    insertCallback: Function;
+    modifyCallback: Function;
+    removeCallback: Function;
+    selectCallback: Function;
+}
+
+interface IELangEditEvents {
+    insert: JQueryDeferred<any>;
+    modify: JQueryDeferred<any>;
+    remove: JQueryDeferred<any>;
+    select: JQueryDeferred<any>;
+}
+
+interface IELangEditDefaults extends IELangBaseDefaults {
+    editFormHtml: string;
+    editFieldHtml: string;
+    addButtonHtml: string;
+    addButtonLabel: string;
+    editKeyLabel: string;
+    editValueLabel: string;
+}
+
+interface IELangEdit extends IELangBase {
+    defaults: IELangEditDefaults;
+    delegates: IELangEditDelegates;
+    events: IELangEditEvents;
+
+    initialize(target: HTMLElement, options: any): void;
+    createContent(): void;
+
+    _onAddClick(key: HTMLInputElement, value: HTMLInputElement): void;
+    _onInsert(): void;
+    _onInsertCallback(): void;
+    _onModify(): void;
+    _onModifyCallback(): void;
+    _onRemove(): void;
+    _onRemoveCallback(): void;
+    _onSelect(): void;
+    _onSelectCallback(): void;
+
+
+    _insert(): void;
+    _modify(): void;
+    _remove(): void;
+    _select(): void;
+}
+
+// ELangTest
+
+interface IELangTestDefaults extends IELangBaseDefaults {
+    formHtml: string;
+    startButtonLabel: string;
+    stopButtonLabel: string;
+    rdoTypedLabel: string;
+    rdoSelectedLabel: string;
+    rdoOrderedLabel: string;
+    rdoRandomlyLabel: string;
+    rdoWrittedLabel: string;
+    rdoVoicedLabel: string;
+    rdoTypedTooltip: string;
+    rdoSelectedTooltip: string;
+    rdoOrderedTooltip: string;
+    rdoRandomlyTooltip: string;
+    rdoWrittedTooltip: string;
+    rdoVoicedTooltip: string;
+}
+
+interface IELangTestDelegates {
+    startStopHandler: Function;
+
+    rdoVariantHandler: Function;
+    rdoModeHandler: Function;
+    rdoQuestionHandler: Function;
+
+    rdoVariantClickHandler: Function;
+    rdoModeClickHandler: Function;
+    rdoQuestionClickHandler: Function;
+}
+
+interface IELangTest extends IELangBase {
+    defaults: IELangTestDefaults;
+    delegates: IELangTestDelegates;
+
+    initialize(target: HTMLElement, options: any): void;
+    createContent(): void;
+
+    _onRdoVariantClick(eSrc: HTMLElement): void;
+    _onRdoModeClick(eSrc: HTMLElement): void;
+    _onRdoQuestionClick(eSrc: HTMLElement): void;
+    _onStartStopClick(): void;
+}
+
+// interfaces for jQuery.fn.__plugin
+
+interface IFnNewInstance {
+    createInstance(el: HTMLElement,
+                   options: any,
+                   pluginName: string): JQuery;
+}
+
+interface IFnJQuery {
+    fnPlugin(context: JQuery,
+             options: any,
+             command: string,
+             pluginName: string,
+             pluginDataAttribute: string): JQuery;
+}
\ No newline at end of file
diff --git a/jquery.elang/jquery.elang.d.ts b/jquery.elang/jquery.elang.d.ts
deleted file mode 100644
index f882fc211c..0000000000
--- a/jquery.elang/jquery.elang.d.ts
+++ /dev/null
@@ -1,314 +0,0 @@
-// Type definitions for eLang 0.5.1
-// Project: https://github.com/sumegizoltan/ELang/
-// Definitions by: Zoltan Sumegi <https://github.com/sumegizoltan/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface IPageResource {
-    lang?: IPageLangItems;
-    selectedLang?: string;
-}
-
-interface IPageLangItems {
-    en?: IPageLabels;
-    hu?: IPageLabels;
-}
-
-interface IPageLabels {
-    lblTitle?: string;
-    lblPageHeader?: string;
-    lblSearchField?: string;
-    lblEditKeyField?: string;
-    lblEditValueField?: string;
-    lblFindedExpressionsHead?: string;
-    lblEditedExpressionsHead?: string;
-    lblFindHead?: string;
-    lblEditHead?: string;
-    lblFind?: string;
-    lblAdd?: string;
-    lblModify?: string;
-    lblRemove?: string;
-    lblSearchInExpressions?: string;
-    lblSearchInMeanings?: string;
-    lblSearchInExpressionsHlp?: string;
-    lblSearchInMeaningsHlp?: string;
-    lblTestHead?: string;
-    lblOrderedTest?: string;
-    lblRandomlyTest?: string;
-    lblTypedTest?: string;
-    lblSelectedTest?: string;
-    lblWrittedTest?: string;
-    lblVoicedTest?: string;
-    lblStartTest?: string;
-    lblStopTest?: string;
-    lblTypedTestHlp?: string;
-    lblSelectedTestHlp?: string;
-    lblOrderedTestHlp?: string;
-    lblRandomlyTestHlp?: string;
-    lblWrittedTestHlp?: string;
-    lblVoicedTestHlp?: string;
-}
-
-interface ELangCommonStatic {
-    resource: IPageResource;
-    getLabel(labelid: string, langid?: string): string;
-    setLang(langid: string, node?: JQuery): void;
-}
-
-// ELang database (LocalStorage) functionality with Singleton instance
-
-interface IELangDBOptions {
-    autocompleteRows: number;
-}
-
-interface IELangDBDelegates {
-    selectHandler: Function;
-    insertHandler: Function;
-    modifyHandler: Function;
-    removeHandler: Function;
-}
-
-interface IELangDBEvents {
-    select: JQueryDeferred<any>;
-    insert: JQueryDeferred<any>;
-    modify: JQueryDeferred<any>;
-    remove: JQueryDeferred<any>;
-}
-
-interface IELangDB {
-    cache?: any;
-    delegates?: IELangDBDelegates;
-    events?: IELangDBEvents;
-    isInitialized?: boolean;
-    options?: IELangDBOptions;
-
-    name?: string;
-    description?: string;
-
-    initialize(options?: IELangDBOptions): void;
-
-    _onSelect(id: string, callback?: Function): void;
-    _onInsert(id: string, value: string, callback?: Function): void;
-    _onModify(id: string, value: string, callback?: Function): void;
-    _onRemove(id: string, callback?: Function): void;
-
-    select(id: string, callback?: Function): void;
-    insert(id: string, value: string, callback?: Function): void;
-    modify(id: string, value: string, callback?: Function): void;
-    remove(id: string, callback?: Function): void;
-
-    sort(): void;
-    setOptions(options: IELangDBOptions): void;
-    getIndexHash(id: string): string;
-    getOptions(): IELangDBOptions;
-}
-
-interface ELangStatic {
-    getInstance(options?: IELangDBOptions): IELangDB;
-}
-
-// ELangBase
-
-interface IELangBaseDefaults {
-    contentCSS: string;
-    contentInnerCSS: string;
-    resultCSS: string;
-    resultHeadCSS: string;
-    contentInnerHtml: string;
-    fluidRowHtml: string;
-    radioGroupHtml: string;
-    radioButtonHtml: string;
-    submitButtonHtml: string;
-    headLabelHtml: string;
-    resultHeadLabelHtml: string;
-    resultHtml: string;
-    headLabel: string;
-    resultHeadLabel: string;
-}
-
-interface IELangBase {
-    name: string;
-    description: string;
-    delegates: any;
-    element: JQuery;
-    events: any;
-    options: any;
-    defaults: IELangBaseDefaults;
-
-    initialize(target: HTMLElement, options: any): void;
-
-    createContent(): void;
-
-    createRadioGroup(node: JQuery,
-                     isMethodAppend: boolean,
-                     buttonNumber: number,
-                     defaultButton: number,
-                     btnLabels: string[],
-                     clickHandler: Function,
-                     btnTooltips?: string[]): void;
-    appendAsLastChild(node: JQuery, element: JQuery): JQuery;
-    getLastChild(node: JQuery): JQuery;
-    isRdoChecked(eSrc: HTMLElement, rdoId: string): boolean;
-    processCommand(command: string): JQuery;
-    setOptions(options: any): void;
-}
-
-// ELangSearch
-
-interface IELangSearchDefaults extends IELangBaseDefaults {
-    expressionsLabel: string;
-    expressionsTooltip: string;
-    meaningsLabel: string;
-    meaningsTooltip: string;
-    searchFormHtml: string;
-    searchFieldHtml: string;
-    searchButtonLabel: string;
-}
-
-interface IELangSearchDelegates {
-    selectHandler: Function;
-    selectCallback: Function;
-    langDirectionHandler: Function;
-    langDirectionClickHandler: Function;
-    searchHandler: Function;
-    searchClickHandler: Function;
-}
-
-interface IELangSearchEvents {
-    select: JQueryDeferred<any>;
-}
-
-interface IELangSearch extends IELangBase {
-    defaults: IELangSearchDefaults;
-    delegates: IELangSearchDelegates;
-    events: IELangSearchEvents;
-    isSearchInExp: boolean;
-
-    initialize(target: HTMLElement, options: any): void;
-    createContent(): void;
-
-    _onDirectionClick(eSrc: HTMLElement): void;
-    _onSelect(eSrc: HTMLInputElement): void;
-    _onSelectCallback(): void;
-
-    _select(eSrc: HTMLInputElement): void;
-}
-
-// ELangEdit
-
-interface IELangEditDelegates {
-    insertHandler: Function;
-    modifyHandler: Function;
-    removeHandler: Function;
-    selectHandler: Function;
-    btnAddHandler: Function;
-    btnAddClickHandler: Function;
-
-    insertCallback: Function;
-    modifyCallback: Function;
-    removeCallback: Function;
-    selectCallback: Function;
-}
-
-interface IELangEditEvents {
-    insert: JQueryDeferred<any>;
-    modify: JQueryDeferred<any>;
-    remove: JQueryDeferred<any>;
-    select: JQueryDeferred<any>;
-}
-
-interface IELangEditDefaults extends IELangBaseDefaults {
-    editFormHtml: string;
-    editFieldHtml: string;
-    addButtonHtml: string;
-    addButtonLabel: string;
-    editKeyLabel: string;
-    editValueLabel: string;
-}
-
-interface IELangEdit extends IELangBase {
-    defaults: IELangEditDefaults;
-    delegates: IELangEditDelegates;
-    events: IELangEditEvents;
-
-    initialize(target: HTMLElement, options: any): void;
-    createContent(): void;
-
-    _onAddClick(key: HTMLInputElement, value: HTMLInputElement): void;
-    _onInsert(): void;
-    _onInsertCallback(): void;
-    _onModify(): void;
-    _onModifyCallback(): void;
-    _onRemove(): void;
-    _onRemoveCallback(): void;
-    _onSelect(): void;
-    _onSelectCallback(): void;
-
-
-    _insert(): void;
-    _modify(): void;
-    _remove(): void;
-    _select(): void;
-}
-
-// ELangTest
-
-interface IELangTestDefaults extends IELangBaseDefaults {
-    formHtml: string;
-    startButtonLabel: string;
-    stopButtonLabel: string;
-    rdoTypedLabel: string;
-    rdoSelectedLabel: string;
-    rdoOrderedLabel: string;
-    rdoRandomlyLabel: string;
-    rdoWrittedLabel: string;
-    rdoVoicedLabel: string;
-    rdoTypedTooltip: string;
-    rdoSelectedTooltip: string;
-    rdoOrderedTooltip: string;
-    rdoRandomlyTooltip: string;
-    rdoWrittedTooltip: string;
-    rdoVoicedTooltip: string;
-}
-
-interface IELangTestDelegates {
-    startStopHandler: Function;
-
-    rdoVariantHandler: Function;
-    rdoModeHandler: Function;
-    rdoQuestionHandler: Function;
-
-    rdoVariantClickHandler: Function;
-    rdoModeClickHandler: Function;
-    rdoQuestionClickHandler: Function;
-}
-
-interface IELangTest extends IELangBase {
-    defaults: IELangTestDefaults;
-    delegates: IELangTestDelegates;
-
-    initialize(target: HTMLElement, options: any): void;
-    createContent(): void;
-
-    _onRdoVariantClick(eSrc: HTMLElement): void;
-    _onRdoModeClick(eSrc: HTMLElement): void;
-    _onRdoQuestionClick(eSrc: HTMLElement): void;
-    _onStartStopClick(): void;
-}
-
-// interfaces for jQuery.fn.__plugin
-
-interface IFnNewInstance {
-    createInstance(el: HTMLElement,
-                   options: any,
-                   pluginName: string): JQuery;
-}
-
-interface IFnJQuery {
-    fnPlugin(context: JQuery,
-             options: any,
-             command: string,
-             pluginName: string,
-             pluginDataAttribute: string): JQuery;
-}
\ No newline at end of file
diff --git a/jquery.elang/tsconfig.json b/jquery.elang/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/jquery.elang/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.fancytree/index.d.ts b/jquery.fancytree/index.d.ts
new file mode 100644
index 0000000000..b3a6025b5a
--- /dev/null
+++ b/jquery.fancytree/index.d.ts
@@ -0,0 +1,864 @@
+// Type definitions for jquery.fancytree 2.7.0
+// Project: https://github.com/mar10/fancytree
+// Definitions by: Peter Palotas <https://github.com/alphaleonis>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+///<reference types="jquery" />
+///<reference types="jqueryui" />
+
+declare namespace JQueryUI {
+    interface UI {
+        fancytree: Fancytree.FancytreeStatic;
+    }
+}
+
+interface JQuery {
+    fancytree(options?: Fancytree.FancytreeOptions): Fancytree.Fancytree;
+    fancytree(option?: string, ...rest: any[]): any;
+}
+
+declare namespace Fancytree {
+    interface Fancytree {
+        $div: JQuery;
+
+        rootNode: FancytreeNode;
+
+        /** Activate node with a given key and fire focus and
+         * activate events. A prevously activated node will be
+         * deactivated. If activeVisible option is set, all parents
+         * will be expanded as necessary. Pass key = false, to deactivate
+         * the current node only.
+         *
+         * @returns {FancytreeNode} activate node (null, if not found)
+         */
+        activateKey(key: string): FancytreeNode;
+
+        /** (experimental)
+         *
+         * @returns resolved, when all patches have been applied
+         */
+        applyPatch(patchList: NodePatch[]): JQueryPromise<any>;
+
+        /** [ext-clones] Replace a refKey with a new one. */
+        changeRefKey(oldRefKey: string, newRefKey: string): void;
+
+        /** [ext-persist] Remove persistence cookies of the given type(s).
+         *  Called like $("#tree").fancytree("getTree").clearCookies("active expanded focus selected"); */
+        clearCookies(): void;
+
+        /** [ext-filter] Reset the filter.  */
+        clearFilter(): void;
+
+        /** Return the number of nodes. */
+        count(): number;
+
+        /** Write to browser console if debugLevel >= 2 (prepending tree name)  */
+        debug(msg: any): void;
+
+        /** [ext-filter] Dimm or hide whole branches.
+         * @returns {integer} count
+         */
+        filterBranches(filter: string): number;
+
+        /** [ext-filter] Dimm or hide whole branches.
+         * @returns {integer} count
+         */
+        filterBranches(filter: (node: FancytreeNode) => boolean): number;
+
+        /** [ext-filter] Dimm or hide nodes.
+         * @returns {integer} count
+         */
+        filterNodes(filter: string, leavesOnly?: boolean): number;
+
+        /** [ext-filter] Dimm or hide nodes.
+         * @returns {integer} count
+         */
+        filterNodes(filter: (node: FancytreeNode) => boolean, leavesOnly?: boolean): number;
+
+        /** Find the next visible node that starts with `match`, starting at `startNode` and wrap-around at the end.
+         *
+         * @returns matching node or null
+         */
+        findNextNode(match: string, startNode?: FancytreeNode): FancytreeNode;
+
+        /** Find the next visible node that starts with `match`, starting at `startNode` and wrap-around at the end.
+         *
+         * @returns matching node or null
+         */
+        findNextNode(match: (node: FancytreeNode) => boolean, startNode?: FancytreeNode): FancytreeNode;
+
+        /** Generate INPUT elements that can be submitted with html forms. In selectMode 3 only the topmost selected nodes are considered. */
+        generateFormElements(selected?: boolean, active?: boolean): void;
+
+        /** Return the currently active node or null.  */
+        getActiveNode(): FancytreeNode;
+
+        /** Return the first top level node if any (not the invisible root node). */
+        getFirstChild(): FancytreeNode;
+
+        /** Return node that has keyboard focus.
+         *
+         * @param ifTreeHasFocus (default: false) (not yet implemented)
+         */
+        getFocusNode(ifTreeHasFocus?: boolean): FancytreeNode;
+
+        /** Return node with a given key or null if not found.
+         *
+         * @param searchRoot (optional) only search below this node.
+         */
+        getNodeByKey(key: string, searchRoot?: FancytreeNode): FancytreeNode;
+
+        /** [ext-clones] Return all nodes with a given refKey (null if not found).
+         *
+         * @param rootNode optionally restrict results to descendants of this node.
+         */
+        getNodesByRef(refKey: string, rootNode?: FancytreeNode): FancytreeNode[];
+
+        /** [ext-persist] Return persistence information from cookies Called like $("#tree").fancytree("getTree").getPersistData(); */
+        getPersistData(): void;
+
+        /** Return the invisible system root node.  */
+        getRootNode(): FancytreeNode;
+
+        /** Return an array of selected nodes.
+         *
+         * @param stopOnParents only return the topmost selected node (useful with selectMode 3)
+         */
+        getSelectedNodes(stopOnParents?: boolean): FancytreeNode[];
+
+        /** Return true if the tree control has keyboard focus */
+        hasFocus(): boolean;
+
+        /** Write to browser console if debugLevel >= 1 (prepending tree name)  */
+        info(msg: any): void;
+
+        /**  [ext-edit] Check if any node in this tree in edit mode. */
+        isEditing(): FancytreeNode;
+
+        /** Make sure that a node with a given ID is loaded, by traversing - and loading - its parents. This method is ment for lazy hierarchies. A callback is executed for every node as we go.
+         *
+         * @param keyPathList one or more key paths  (e.g. '/3/2_1/7')
+         * @param callback callback(node, status) is called for every visited node ('loading', 'loaded', 'ok', 'error')
+         */
+        loadKeyPath(keyPathList: string[], callback: (node: FancytreeNode, status: string) => void): JQueryPromise<any>;
+
+        /** Make sure that a node with a given ID is loaded, by traversing - and loading - its parents. This method is ment for lazy hierarchies. A callback is executed for every node as we go.
+         *
+         * @param keyPath a key path (e.g. '/3/2_1/7')
+         * @param callback callback(node, status) is called for every visited node ('loading', 'loaded', 'ok', 'error')
+         */
+        loadKeyPath(keyPath: string, callback: (node: FancytreeNode, status: string) => void): JQueryPromise<any>;
+
+        /** Re-fire beforeActivate and activate events. */
+        reactivate(): void;
+
+        /** Reload tree from source and return a promise.
+         *
+         * @param source optional new source (defaults to initial source data)
+         */
+        reload(source?: any): JQueryPromise<any>;
+
+        /** Render tree (i.e. create DOM elements for all top-level nodes).
+         *
+         * @param force create DOM elements, even is parent is collapsed (default = false)
+         * @param deep (default = false)
+         */
+        render(force?: boolean, deep?: boolean): void;
+
+        /** @param flag (default = true) */
+        setFocus(flag?: boolean): void;
+
+        /** Return all nodes as nested list of NodeData.
+         *
+         * @param callback Called for every node
+         * @param includeRoot Returns the hidden system root node (and its children) (default = false)
+         */
+        toDict(includeRoot?: boolean, callback?: (node: FancytreeNode) => void): any;
+
+        /** Call fn(node) for all nodes.
+         *
+         * @param fn the callback function. Return false to stop iteration, return "skip" to skip this node and children only.
+         * @returns false, if the iterator was stopped.
+         */
+        visit(fn: (node: FancytreeNode) => any): boolean;
+
+        /** Write warning to browser console (prepending tree info) */
+        warn(msg: any): void;
+    }
+
+    /** A FancytreeNode represents the hierarchical data model and operations. */
+    interface FancytreeNode {
+        //#region Properties
+        /** The tree instance */
+        tree: Fancytree;
+        /** The parent node */
+        parent: FancytreeNode;
+        /** Node id (must be unique inside the tree) */
+        key: string;
+        /** Display name (may contain HTML) */
+        title: string;
+        /** Contains all extra data that was passed on node creation */
+        data: Object;
+        /** Array of child nodes. For lazy nodes, null or undefined means 'not yet loaded'. Use an empty array to define a node that has no children. */
+        children: FancytreeNode[];
+        /** Use isExpanded(), setExpanded() to access this property. */
+        expanded: boolean;
+        /** Addtional CSS classes, added to the node's `<span>`. */
+        extraClasses: string;
+        /** Folder nodes have different default icons and click behavior. Note: Also non-folders may have children. */
+        folder: boolean;
+        /** null or type of temporarily generated system node like 'loading', or 'error'. */
+        statusNodeType: string;
+        /** True if this node is loaded on demand, i.e. on first expansion. */
+        lazy: boolean;
+        /** Alternative description used as hover banner */
+        tooltip: string;
+        //#endregion
+
+        //#region Methods
+        /**
+         * Append (or insert) a list of child nodes.
+         *
+         * @param children array of child node definitions (also single child accepted)
+         * @param insertBefore child node to insert nodes before. If omitted, the new children is appended.
+         * @returns The first child added.
+         */
+        addChildren(children: Fancytree.NodeData[], insertBefore?: FancytreeNode): FancytreeNode;
+        /**
+         * Append (or insert) a list of child nodes.
+         *
+         * @param children array of child node definitions (also single child accepted)
+         * @param insertBefore key of the child node to insert nodes before. If omitted, the new children is appended.
+         * @returns The first child added.
+         */
+        addChildren(children: Fancytree.NodeData[], insertBefore?: string): FancytreeNode;
+        /**
+         * Append (or insert) a list of child nodes.
+         *
+         * @param children array of child node definitions (also single child accepted)
+         * @param insertBefore index of the child node to insert nodes before. If omitted, the new children is appended.
+         * @returns The first child added.
+         */
+        addChildren(children: Fancytree.NodeData[], insertBefore?: number): FancytreeNode;
+        /**
+         * Append (or insert) a single child node.
+         *
+         * @param child node to add
+         * @param insertBefore child node to insert this node before. If omitted, the new child is appended.
+         * @returns The child added.
+         */
+        addChildren(child: Fancytree.NodeData, insertBefore?: FancytreeNode): FancytreeNode;
+        /**
+         * Append (or insert) a single child node.
+         *
+         * @param child node to add
+         * @param insertBefore key of the child node to insert this node before. If omitted, the new child is appended.
+         * @returns The child added.
+         */
+        addChildren(child: Fancytree.NodeData, insertBefore?: string): FancytreeNode;
+        /**
+         * Append (or insert) a single child node.
+         *
+         * @param child node to add
+         * @param insertBefore index of the child node to insert this node before. If omitted, the new child is appended.
+         * @returns The child added.
+         */
+        addChildren(child: Fancytree.NodeData, insertBefore?: number): FancytreeNode;
+
+
+        /** Append or prepend a node, or append a child node. This a convenience function that calls addChildren()
+         *
+         * @param mode 'before', 'after', 'firstChild', or 'child' ('over' is a synonym for 'child') (default='child')
+         * @returns new node.
+         */
+        addNode(node: NodeData, mode?: string): FancytreeNode;
+
+        /** Modify existing child nodes. */
+        applyPatch(patch: NodePatch): JQueryPromise<any>;
+
+        /** Collapse all sibling nodes. */
+        collapseSiblings(): JQueryPromise<any>;
+
+        /** Copy this node as sibling or child of `node`.
+         *
+         * @param node source node
+         * @param mode 'before' | 'after' | 'child' (default='child')
+         * @param map callback function(NodeData) that could modify the new node
+         * @returns new node.
+         */
+        copyTo(node: FancytreeNode, mode?: string, map?: (node: NodeData) => void) : FancytreeNode;
+
+        /** Count direct and indirect children.
+         *
+         * @param deep pass 'false' to only count direct children. (default=true)
+         */
+        countChildren(deep?: boolean): number;
+
+        /** Write to browser console if debugLevel >= 2 (prepending node info) */
+        debug(msg: any): void;
+
+        /** [ext-edit] Create a new child or sibling node and start edit mode.
+         *
+         * @param mode 'before', 'after', or 'child' (default='child')
+         * @param init NodeData (or simple title string)
+         */
+        editCreateNode(mode?: string, init?: Object): void;
+
+        /** [ext-edit] Stop inline editing.
+         *
+         * @param applyChanges false: cancel edit, true: save (if modified)
+         */
+        editEnd(applyChanges: boolean): void;
+
+        /** [ext-edit] Start inline editing of current node title.  */
+        editStart(): void;
+
+        /** Find all nodes that contain `match` in the title.
+         *
+         * @param match string to search for
+         */
+        findAll(match: string): FancytreeNode[];
+
+        /** Find all nodes that contain `match` in the title.
+          *
+          * @param match a function that returns `true` if a node is matched.
+          */
+        findAll(match: (node: FancytreeNode) => boolean): FancytreeNode[];
+
+        /** Find first node that contains `match` in the title (not including self).
+         *
+         * @param match string to search for
+         */
+        findFirst(match: string): FancytreeNode;
+
+        /** Find first node that contains `match` in the title (not including self).
+          *
+          * @param match a function that returns `true` if a node is matched.
+          */
+        findFirst(match: (node: FancytreeNode) => boolean): FancytreeNode;
+
+        /** Fix selection status, after this node was (de)selected in multi-hier mode. This includes (de)selecting all children. */
+        fixSelection3AfterClick(): void;
+
+        /** Fix selection status for multi-hier mode. Only end-nodes are considered to update the descendants branch and parents. Should be called after this node has loaded new children or after children have been modified using the API. */
+        fixSelection3FromEndNodes(): void;
+
+        /** Update node data. If dict contains 'children', then also replace the hole sub tree.  */
+        fromDict(dict: NodeData): void;
+
+        /** Return the list of child nodes (undefined for unexpanded lazy nodes). */
+        getChildren(): FancytreeNode[];
+
+        /** [ext-clones] Return a list of clone-nodes or null. */
+        getCloneList(includeSelf?: boolean): FancytreeNode[];
+
+        /** Return the first child node or null. */
+        getFirstChild(): FancytreeNode;
+
+        /** Return the 0-based child index. */
+        getIndex(): number;
+
+        /** Return the hierarchical child index (1-based, e.g. '3.2.4').  */
+        getIndexHier(): string;
+
+        /** Return the parent keys separated by options.keyPathSeparator, e.g. "id_1/id_17/id_32". */
+        getKeyPath(excludeSelf: boolean): string;
+
+        /** Return the last child of this node or null. */
+        getLastChild(): FancytreeNode;
+
+        /** Return node depth. 0: System root node, 1: visible top-level node, 2: first sub-level, ... . */
+        getLevel(): number;
+
+        /** Return the successor node (under the same parent) or null. */
+        getNextSibling(): FancytreeNode;
+
+        /** Return the parent node (null for the system root node).  */
+        getParent(): FancytreeNode;
+
+        /**Return an array of all parent nodes (top-down).
+         *
+         * @param includeRoot Include the invisible system root node. (default=false)
+         * @param includeSelf Include the node itself (default=false).
+          */
+        getParentList(includeRoot: boolean, includeSelf: boolean): FancytreeNode[];
+
+        /** Return the predecessor node (under the same parent) or null. */
+        getPrevSibling(): FancytreeNode;
+
+        /** Return true if node has children. Return undefined if not sure, i.e. the node is lazy and not yet loaded). */
+        hasChildren(): boolean;
+
+        /** Return true if node has keyboard focus. */
+        hasFocus(): boolean;
+
+        /** Write to browser console if debugLevel >= 1 (prepending node info)  */
+        info(msg: string): void;
+
+        /** Return true if node is active (see also FancytreeNode.isSelected). */
+        isActive(): boolean;
+
+        /** Return true if node is a direct child of otherNode. */
+        isChildOf(otherNode: FancytreeNode): boolean;
+
+        /** [ext-clones] Return true if this node has at least another clone with same refKey. */
+        isClone(): boolean;
+
+        /** Return true, if node is a direct or indirect sub node of otherNode. */
+        isDescendantOf(otherNode: FancytreeNode): boolean;
+
+        /** [ext-edit] Check if this node is in edit mode. */
+        isEditing(): boolean;
+
+        /** Return true if node is expanded.  */
+        isExpanded(): boolean;
+
+        /** Return true if node is the first node of its parent's children.  */
+        isFirstSibling(): boolean;
+
+        /** Return true if node is a folder, i.e. has the node.folder attribute set. */
+        isFolder(): boolean;
+
+        /** Return true if node is the last node of its parent's children.  */
+        isLastSibling(): boolean;
+
+        /** Return true if node is lazy (even if data was already loaded)  */
+        isLazy(): boolean;
+
+        /** Return true if node is lazy and loaded. For non-lazy nodes always return true.  */
+        isLoaded(): boolean;
+
+        /**Return true if children are currently beeing loaded, i.e. a Ajax request is pending.  */
+        isLoading(): boolean;
+
+        /** Return true if this is the (invisible) system root node. */
+        isRootNode(): boolean;
+
+        /** Return true if node is selected, i.e. has a checkmark set (see also FancytreeNode#isActive). */
+        isSelected(): boolean;
+
+        /** Return true if this node is a temporarily generated system node like 'loading', or 'error' (node.statusNodeType contains the type). */
+        isStatusNode(): boolean;
+
+        /** Return true if this a top level node, i.e. a direct child of the (invisible) system root node. */
+        isTopLevel(): boolean;
+
+        /** Return true if node is lazy and not yet loaded. For non-lazy nodes always return false. */
+        isUndefined(): boolean;
+
+        /** Return true if all parent nodes are expanded. Note: this does not check whether the node is scrolled into the visible part of the screen. */
+        isVisible(): boolean;
+
+        /** Load all children of a lazy node if neccessary. The *expanded* state is maintained.
+         *
+         * @param forceReload Pass true to discard any existing nodes before.
+         */
+        load(forceReload?: boolean): JQueryPromise<any>;
+
+        /** Expand all parents and optionally scroll into visible area as neccessary. Promise is resolved, when lazy loading and animations are done.
+         *
+         * @param opts passed to `setExpanded()`. Defaults to {noAnimation: false, noEvents: false, scrollIntoView: true}
+         */
+        makeVisible(opts?: Object): JQueryPromise<any>;
+
+        /** Move this node to targetNode.
+         *
+         * @param mode 'child': append this node as last child of targetNode.
+         *                       This is the default. To be compatble with the D'n'd
+         *                       hitMode, we also accept 'over'.
+         *              'before': add this node as sibling before targetNode.
+         *              'after': add this node as sibling after targetNode.
+         *
+         * @param map optional callback(FancytreeNode) to allow modifcations
+         */
+        moveTo(targetNode: FancytreeNode, mode: string, map?: (node: FancytreeNode) => void): void;
+
+        /** Set focus relative to this node and optionally activate.
+         *
+         * @param where The keyCode that would normally trigger this move, e.g. `$.ui.keyCode.LEFT` would collapse the node if it is expanded or move to the parent oterwise.
+         * @param activate (default=true)
+         */
+        navigate(where: number, activate?: boolean): JQueryPromise<any>;
+
+        /** Remove this node (not allowed for system root).  */
+        remove(): void;
+
+        /** Remove childNode from list of direct children. */
+        removeChild(childNode: FancytreeNode): void;
+
+        /** Remove all child nodes and descendents. This converts the node into a leaf.
+         * If this was a lazy node, it is still considered 'loaded'; call node.resetLazy() in order to trigger lazyLoad on next expand.
+         */
+        removeChildren(): void;
+
+        /** This method renders and updates all HTML markup that is required to display this node in its current state.
+         *
+         * @param force re-render, even if html markup was already created
+         * @param deep  also render all descendants, even if parent is collapsed
+         */
+        render(force?: boolean, deep?: boolean): void;
+
+        /** Update element's CSS classes according to node state. */
+        renderStatus(): void;
+
+        /** Create HTML markup for the node's outer (expander, checkbox, icon, and title).  */
+        renderTitle(): void;
+
+        /** [ext-clones] Update key and/or refKey for an existing node. */
+        reRegister(key: string, refKey: string): boolean;
+
+        /** Remove all children, collapse, and set the lazy-flag, so that the lazyLoad event is triggered on next expand. */
+        resetLazy(): void;
+
+        /** Schedule activity for delayed execution (cancel any pending request). scheduleAction('cancel') will only cancel a pending request (if any). */
+        scheduleAction(mode: string, ms: number) : void;
+
+        /**
+         * @param effects animation options.
+         * @param options {topNode: null, effects: ..., parent: ...} this node will remain visible in any case, even if `this` is outside the scroll pane.
+         */
+        scrollIntoView(effects?: boolean, options?: Object): JQueryPromise<any>;
+
+        /**
+         * @param effects animation options.
+         * @param options {topNode: null, effects: ..., parent: ...} this node will remain visible in any case, even if `this` is outside the scroll pane.
+         */
+        scrollIntoView(effects?: Object, options?: Object): JQueryPromise<any>;
+
+        /**
+         * @param flag pass false to deactivate
+         * @param opts additional options. Defaults to {noEvents: false}
+         */
+        setActive(flag?: boolean, opts?: Object): JQueryPromise<any>;
+
+        /**
+         * @param flag pass false to collapse.
+         * @param opts additional options. Defaults to {noAnimation:false, noEvents:false}
+         */
+        setExpanded(flag?: boolean, opts?: Object): JQueryPromise<any>;
+
+        /**
+         * Set keyboard focus to this node.
+         *
+         * @param flag pass false to blur.
+         */
+        setFocus(flag?: boolean): void;
+
+        /**
+         * Select this node, i.e. check the checkbox.
+         *
+         * @param flag pass false to deselect.
+         */
+        setSelected(flag?: boolean): void;
+
+        /**
+         * Mark a lazy node as 'error', 'loading', or 'ok'.
+         *
+         * @param status 'error', 'ok'
+         */
+        setStatus(status: string, message?: string, details?: string): void;
+
+        /** Rename this node. */
+        setTitle(title: string): void;
+
+        /**
+         * Sort child list by title.
+         *
+         * @param cmp custom compare function(a, b) that returns -1, 0, or 1 (defaults to sort by title).
+         * @param deep pass true to sort all descendant nodes
+         */
+        sortChildren(cmp?: (a: FancytreeNode, b: FancytreeNode) => number, deep?: boolean): void;
+
+        /**
+         * Convert node (or whole branch) into a plain object. The result is compatible with node.addChildren().
+         *
+         * @param recursive include child nodes.
+         * @param callback callback(dict) is called for every node, in order to allow modifications
+         */
+        toDict(recursive?: boolean, callback?: (dict: NodeData) => void): NodeData;
+
+        /** Flip expanded status. */
+        toggleExpanded(): void;
+
+        /** Flip selection status. */
+        toggleSelected(): void;
+
+        /**
+         * Call fn(node) for all child nodes.
+         * Stop iteration, if fn() returns false. Skip current branch,
+         * if fn() returns "skip". Return false if iteration was stopped.
+         *
+         * @param fn the callback function. Return false to stop iteration, return "skip" to skip this node and its children only.
+         * @param includeSelf (default=false)
+         */
+        visit(fn: (node: FancytreeNode) => any, includeSelf?: boolean): boolean;
+
+        /**
+         * Call fn(node) for all child nodes and recursively load lazy children.
+         * Note: If you need this method, you probably should consider to review your architecture! Recursivley loading nodes is
+         * a perfect way for lazy programmers to flood the server with requests ;-)
+         *
+         * @param fn the callback function. Return false to stop iteration, return "skip" to skip this node and its children only.
+         * @param includeSelf (default=false)
+         */
+        visitAndLoad(fn: (node: FancytreeNode) => any, includeSelf?: boolean): JQueryPromise<any>;
+
+        /**
+         * Call fn(node) for all parent nodes, bottom-up, including invisible system root.
+         * Stop iteration, if fn() returns false.
+         * Return false if iteration was stopped.
+         *
+         * @param fn the callback function. Return false to stop iteration, return "skip" to skip this node and its children only.
+         * @param includeSelf (default=false)
+         */
+        visitParents(fn: (node: FancytreeNode) => any, includeSelf?: boolean): boolean;
+
+        /**
+         * Write warning to browser console (prepending node info)
+         */
+        warn(msg: any): void;
+        //#endregion
+    }
+
+    enum FancytreeClickFolderMode {
+        activate = 1,
+        expand = 2,
+        activate_and_expand = 3,
+        activate_dblclick_expands = 4
+    }
+
+    enum FancytreeSelectMode {
+        single = 1,
+        multi = 2,
+        mutlti_hier = 3
+    }
+
+    /** Context object passed to events and hook functions. */
+    interface EventData {
+        /** The tree instance */
+        tree: Fancytree;
+        /** The jQuery UI tree widget */
+        widget: Object;
+        /** Shortcut to tree.options */
+        options: FancytreeOptions;
+        /** The jQuery Event that initially triggered this call */
+        originalEvent: JQueryEventObject;
+        /** The node that this call applies to (`null` for tree events) */
+        node: FancytreeNode;
+        /** (output parameter) Event handlers can return values back to the
+          * caller. Used by `lazyLoad`, `postProcess`, ... */
+        result: any;
+        /** (only for click and dblclick events) 'title' | 'prefix' | 'expander' | 'checkbox' | 'icon' */
+        targetType: string;
+        /** (only for postProcess event) Original ajax response */
+        response: any;
+    }
+
+    /** The `this` context of any event function is set to tree's the HTMLDivElement  */
+    interface FancytreeEvents {
+        /** 'data.node' was deactivated. */
+        activate?(event: JQueryEventObject, data: EventData): void;
+        /** Return false to prevent default processing */
+        beforeActivate?(event: JQueryEventObject, data: EventData): boolean;
+        /** Return `false` to prevent default processing */
+        beforeExpand?(event: JQueryEventObject, data: EventData): boolean;
+        /** Return `false` to prevent default processing */
+        beforeSelect?(event: JQueryEventObject, data: EventData): boolean;
+        /** `data.node` lost keyboard focus */
+        blur?(event: JQueryEventObject, data: EventData): void;
+        /** `data.tree` lost keyboard focus */
+        blurTree?(event: JQueryEventObject, data: EventData): void;
+        /** `data.node` was clicked. `data.targetType` contains the region ("title", "expander", ...). Return `false` to prevent default processing, i.e. activating, etc. */
+        click?(event: JQueryEventObject, data: EventData): boolean;
+        /** `data.node` was collapsed */
+        collapse?(event: JQueryEventObject, data: EventData): void;
+        /** Widget was created (called only once, even if re-initialized). */
+        create?(event: JQueryEventObject, data: EventData): void;
+        /** Allow tweaking and binding, after node was created for the first time (NOTE: this event is only available as callback, but not for bind()) */
+        createNode?(event: JQueryEventObject, data: EventData): void;
+        /** `data.node` was double-clicked. `data.targetType` contains the region ("title", "expander", ...). Return `false` to prevent default processing, i.e. expanding, etc. */
+        dblclick?(event: JQueryEventObject, data: EventData): boolean;
+        /** `data.node` was deactivated */
+        deactivate?(event: JQueryEventObject, data: EventData): void;
+        /** `data.node` was expanded */
+        expand?(event: JQueryEventObject, data: EventData): void;
+        /** `data.node` received keyboard focus */
+        focus?(event: JQueryEventObject, data: EventData): void;
+        /**`data.tree` received keyboard focus */
+        focusTree?(event: JQueryEventObject, data: EventData): void;
+        /** Widget was (re-)initialized. */
+        init?(event: JQueryEventObject, data: EventData): void;
+        /** `data.node` received key. `event.which` contains the key. Return `false` to prevent default processing, i.e. navigation. Call `data.result = "preventNav";` to prevent navigation but still allow default handling inside embedded input controls. */
+        keydown?(event: JQueryEventObject, data: EventData): boolean;
+        /** (currently unused) */
+        keypress?(event: JQueryEventObject, data: EventData): void;
+        /** `data.node` is a lazy node that is expanded for the first time. The new child data must be returned in the `data.result` property (see `source` option for available formats). */
+        lazyLoad?(event: JQueryEventObject, data: EventData): void;
+        /** Node data was loaded, i.e. `node.nodeLoadChildren()` finished */
+        loadChildren?(event: JQueryEventObject, data: EventData): void;
+        /** A load error occured. Return `false` to prevent default processing. */
+        loadError?(event: JQueryEventObject, data: EventData): boolean;
+        /** Allows to modify the ajax response. */
+        postProcess?(event: JQueryEventObject, data: EventData): void;
+        /** `data.node` was removed (NOTE: this event is only available as callback, but not for bind()) */
+        removeNode?(event: JQueryEventObject, data: EventData): void;
+        /** (used by table extension) */
+        renderColumns?(event: JQueryEventObject, data: EventData): void;
+        /** Allow tweaking after node state was rendered (NOTE: this event is only available as callback, but not for bind()) */
+        renderNode?(event: JQueryEventObject, data: EventData): void;
+        /** Allow replacing the `<span class='fancytree-title'>` markup (NOTE: this event is only available as callback, but not for bind()) */
+        renderTitle?(event: JQueryEventObject, data: EventData): void;
+        /** ext-persist has expanded, selected, and activated the previous state */
+        restore?(event: JQueryEventObject, data: EventData): void;
+        /** `data.node` was selected */
+        select?(event: JQueryEventObject, data: EventData): void;
+    }
+
+    interface FancytreeOptions extends FancytreeEvents {
+        /** Make sure that the active node is always visible, i.e. its parents are expanded (default: true). */
+        activeVisible?: boolean;
+        /** Default options for ajax requests. */
+        ajax?: Object;
+        /** (default: false) Add WAI-ARIA attributes to markup */
+        aria?: boolean;
+        /** Activate a node when focused with the keyboard (default: true) */
+        autoActivate?: boolean;
+        /** Automatically collapse all siblings, when a node is expanded (default: false). */
+        autoCollapse?: boolean;
+        /** Scroll node into visible area, when focused by keyboard (default: false). */
+        autoScroll?: boolean;
+        /** Display checkboxes to allow selection (default: false) */
+        checkbox?: boolean;
+        /** Defines what happens, when the user click a folder node. (default: activate_dblclick_expands) */
+        clickFolderMode?: FancytreeClickFolderMode;
+        /** 0..2 (null: use global setting $.ui.fancytree.debugInfo) */
+        debugLevel?: number;
+        /** callback(node) is called for new nodes without a key. Must return a new unique key. (default null: generates default keys like that: "_" + counter) */
+        defaultKey?: (node: FancytreeNode) => string;
+        /** Accept passing ajax data in a property named `d` (default: true). */
+        enableAspx?: boolean;
+        /** List of active extensions (default: []) */
+        extensions?: string[];
+        /** Set focus when node is checked by a mouse click (default: false) */
+        focusOnSelect?: boolean;
+        /** Add `id="..."` to node markup (default: true). */
+        generateIds?: boolean;
+        /** Display node icons (default: true) */
+        icons?: boolean;
+        /** (default: "ft_") */
+        idPrefix?: string;
+        /** Path to a folder containing icons (default: null, using 'skin/' subdirectory). */
+        imagePath?: string;
+        /** Support keyboard navigation (default: true). */
+        keyboard?: boolean;
+        /** (default: "/") */
+        keyPathSeparator?: string;
+        /** 2: top-level nodes are not collapsible (default: 1) */
+        minExpandLevel?: number;
+        /** navigate to next node by typing the first letters (default: false) */
+        quicksearch?: boolean;
+        /** optional margins for node.scrollIntoView() (default: {top: 0, bottom: 0}) */
+        scrollOfs?: Object;
+        /** scrollable container for node.scrollIntoView() (default: $container) */
+        scrollParent?: JQuery;
+        /** default: multi_hier */
+        selectMode?: FancytreeSelectMode;
+        /** Used to Initialize the tree. */
+        source?: any;
+        /** Translation table */
+        strings?: Object;
+        /** Add tabindex='0' to container, so tree can be reached using TAB */
+        tabbable?: boolean;
+        /** Add tabindex='0' to node title span, so it can receive keyboard focus */
+        titlesTabbable?: boolean;
+        /** Animation options, false:off (default: { effect: "blind", options: {direction: "vertical", scale: "box"}, duration: 200 }) */
+        toggleEffect?: Object;
+    }
+
+    /** Data object passed to FancytreeNode() constructor. Note: typically these attributes are accessed by meber methods, e.g. `node.isExpanded()` and `node.setSelected(false)`.  */
+    interface NodeData {
+        /** node text (may contain HTML tags) */
+        title: string;
+        icon?: string;
+        /** unique key for this node (auto-generated if omitted) */
+        key?: string;
+        /** (reserved) */
+        refKey?: string;
+        expanded?: boolean;
+        /** (initialization only, but will not be stored with the node). */
+        active?: boolean;
+        /** (initialization only, but will not be stored with the node). */
+        focus?: boolean;
+        folder?: boolean;
+        hideCheckbox?: boolean;
+        lazy?: boolean;
+        selected?: boolean;
+        unselectable?: boolean;
+        /** optional array of child nodes */
+        children?: NodeData[];
+        tooltip?: string;
+        /** class names added to the node markup (separate with space) */
+        extraClasses?: string;
+        /** all properties from will be copied to `node.data` */
+        data?: Object;
+    }
+
+    /** Data object similar to NodeData, but with additional options.
+      * May be passed to FancytreeNode#applyPatch (Every property that is omitted (or set to undefined) will be ignored)  */
+    interface NodePatch {
+        /** (not yet implemented) */
+        appendChildren?: NodeData;
+        /** (not yet implemented) */
+        replaceChildren?: NodeData;
+        /** (not yet implemented) */
+        insertChildren?: NodeData;
+    }
+
+    /** May be passed to Fancytree#applyPatch. */
+    interface TreePatch {
+        [key: string]: NodePatch;
+    }
+
+    interface FancytreeStatic {
+        buildType: string;
+        debugLevel: number;
+        version: string;
+
+        /** Throw an error if condition fails (debug method).  */
+        assert(cond: boolean, msg: string): void;
+
+        /** Return a function that executes *fn* at most every *timeout* ms. */
+        debounce<T extends (...args: any[]) => void>(timeout: number, fn: T, invokeAsap?: boolean, ctx?: any): T;
+
+        debug(msg: string): void;
+
+        error(msg: string): void;
+
+        escapeHtml(s: string): string;
+
+        getEventTarget(event: Event): Object;
+
+        getEventTargetType(event: Event): string;
+
+        getNode(el: JQuery): FancytreeNode;
+        getNode(el: Event): FancytreeNode;
+        getNode(el: Element): FancytreeNode;
+
+        info(msg: string): void;
+
+        /** Convert a keydown event to a string like 'ctrl+a', 'ctrl+shift+f2'.  */
+        keyEventToString(event: Event): string;
+
+        /** Parse tree data from HTML markup */
+        parseHtml($ul: JQuery): NodeData[];
+
+        /** Add Fancytree extension definition to the list of globally available extensions. */
+        registerExtension(definition: Object): void;
+
+        unescapeHtml(s: string): string;
+
+        warn(msg: string): void;
+    }
+}
+
diff --git a/jquery.fancytree/jquery.fancytree-tests.ts b/jquery.fancytree/jquery.fancytree-tests.ts
index f0497ec702..8e1c4a1603 100644
--- a/jquery.fancytree/jquery.fancytree-tests.ts
+++ b/jquery.fancytree/jquery.fancytree-tests.ts
@@ -1,6 +1,4 @@
-///<reference path="jquery.fancytree.d.ts" />
-
-$("#tree").fancytree({
+$("#tree").fancytree({
 	source: [
 		{ title: "Node 1", key: "1" },
 		{
diff --git a/jquery.fancytree/jquery.fancytree.d.ts b/jquery.fancytree/jquery.fancytree.d.ts
deleted file mode 100644
index 9fb49d65b5..0000000000
--- a/jquery.fancytree/jquery.fancytree.d.ts
+++ /dev/null
@@ -1,864 +0,0 @@
-// Type definitions for jquery.fancytree 2.7.0
-// Project: https://github.com/mar10/fancytree
-// Definitions by: Peter Palotas <https://github.com/alphaleonis>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-///<reference path="../jquery/jquery.d.ts" />
-///<reference path="../jqueryui/jqueryui.d.ts" />
-
-declare namespace JQueryUI {
-    interface UI {
-        fancytree: Fancytree.FancytreeStatic;
-    }
-}
-
-interface JQuery {
-    fancytree(options?: Fancytree.FancytreeOptions): Fancytree.Fancytree;
-    fancytree(option?: string, ...rest: any[]): any;
-}
-
-declare namespace Fancytree {
-    interface Fancytree {
-        $div: JQuery;
-
-        rootNode: FancytreeNode;
-
-        /** Activate node with a given key and fire focus and
-         * activate events. A prevously activated node will be
-         * deactivated. If activeVisible option is set, all parents
-         * will be expanded as necessary. Pass key = false, to deactivate
-         * the current node only.
-         *
-         * @returns {FancytreeNode} activate node (null, if not found)
-         */
-        activateKey(key: string): FancytreeNode;
-
-        /** (experimental)
-         *
-         * @returns resolved, when all patches have been applied
-         */
-        applyPatch(patchList: NodePatch[]): JQueryPromise<any>;
-
-        /** [ext-clones] Replace a refKey with a new one. */
-        changeRefKey(oldRefKey: string, newRefKey: string): void;
-
-        /** [ext-persist] Remove persistence cookies of the given type(s).
-         *  Called like $("#tree").fancytree("getTree").clearCookies("active expanded focus selected"); */
-        clearCookies(): void;
-
-        /** [ext-filter] Reset the filter.  */
-        clearFilter(): void;
-
-        /** Return the number of nodes. */
-        count(): number;
-
-        /** Write to browser console if debugLevel >= 2 (prepending tree name)  */
-        debug(msg: any): void;
-
-        /** [ext-filter] Dimm or hide whole branches.
-         * @returns {integer} count
-         */
-        filterBranches(filter: string): number;
-
-        /** [ext-filter] Dimm or hide whole branches.
-         * @returns {integer} count
-         */
-        filterBranches(filter: (node: FancytreeNode) => boolean): number;
-
-        /** [ext-filter] Dimm or hide nodes.
-         * @returns {integer} count
-         */
-        filterNodes(filter: string, leavesOnly?: boolean): number;
-
-        /** [ext-filter] Dimm or hide nodes.
-         * @returns {integer} count
-         */
-        filterNodes(filter: (node: FancytreeNode) => boolean, leavesOnly?: boolean): number;
-
-        /** Find the next visible node that starts with `match`, starting at `startNode` and wrap-around at the end.
-         *
-         * @returns matching node or null
-         */
-        findNextNode(match: string, startNode?: FancytreeNode): FancytreeNode;
-
-        /** Find the next visible node that starts with `match`, starting at `startNode` and wrap-around at the end.
-         *
-         * @returns matching node or null
-         */
-        findNextNode(match: (node: FancytreeNode) => boolean, startNode?: FancytreeNode): FancytreeNode;
-
-        /** Generate INPUT elements that can be submitted with html forms. In selectMode 3 only the topmost selected nodes are considered. */
-        generateFormElements(selected?: boolean, active?: boolean): void;
-
-        /** Return the currently active node or null.  */
-        getActiveNode(): FancytreeNode;
-
-        /** Return the first top level node if any (not the invisible root node). */
-        getFirstChild(): FancytreeNode;
-
-        /** Return node that has keyboard focus.
-         *
-         * @param ifTreeHasFocus (default: false) (not yet implemented)
-         */
-        getFocusNode(ifTreeHasFocus?: boolean): FancytreeNode;
-
-        /** Return node with a given key or null if not found.
-         *
-         * @param searchRoot (optional) only search below this node.
-         */
-        getNodeByKey(key: string, searchRoot?: FancytreeNode): FancytreeNode;
-
-        /** [ext-clones] Return all nodes with a given refKey (null if not found).
-         *
-         * @param rootNode optionally restrict results to descendants of this node.
-         */
-        getNodesByRef(refKey: string, rootNode?: FancytreeNode): FancytreeNode[];
-
-        /** [ext-persist] Return persistence information from cookies Called like $("#tree").fancytree("getTree").getPersistData(); */
-        getPersistData(): void;
-
-        /** Return the invisible system root node.  */
-        getRootNode(): FancytreeNode;
-
-        /** Return an array of selected nodes.
-         *
-         * @param stopOnParents only return the topmost selected node (useful with selectMode 3)
-         */
-        getSelectedNodes(stopOnParents?: boolean): FancytreeNode[];
-
-        /** Return true if the tree control has keyboard focus */
-        hasFocus(): boolean;
-
-        /** Write to browser console if debugLevel >= 1 (prepending tree name)  */
-        info(msg: any): void;
-
-        /**  [ext-edit] Check if any node in this tree in edit mode. */
-        isEditing(): FancytreeNode;
-
-        /** Make sure that a node with a given ID is loaded, by traversing - and loading - its parents. This method is ment for lazy hierarchies. A callback is executed for every node as we go.
-         *
-         * @param keyPathList one or more key paths  (e.g. '/3/2_1/7')
-         * @param callback callback(node, status) is called for every visited node ('loading', 'loaded', 'ok', 'error')
-         */
-        loadKeyPath(keyPathList: string[], callback: (node: FancytreeNode, status: string) => void): JQueryPromise<any>;
-
-        /** Make sure that a node with a given ID is loaded, by traversing - and loading - its parents. This method is ment for lazy hierarchies. A callback is executed for every node as we go.
-         *
-         * @param keyPath a key path (e.g. '/3/2_1/7')
-         * @param callback callback(node, status) is called for every visited node ('loading', 'loaded', 'ok', 'error')
-         */
-        loadKeyPath(keyPath: string, callback: (node: FancytreeNode, status: string) => void): JQueryPromise<any>;
-
-        /** Re-fire beforeActivate and activate events. */
-        reactivate(): void;
-
-        /** Reload tree from source and return a promise.
-         *
-         * @param source optional new source (defaults to initial source data)
-         */
-        reload(source?: any): JQueryPromise<any>;
-
-        /** Render tree (i.e. create DOM elements for all top-level nodes).
-         *
-         * @param force create DOM elements, even is parent is collapsed (default = false)
-         * @param deep (default = false)
-         */
-        render(force?: boolean, deep?: boolean): void;
-
-        /** @param flag (default = true) */
-        setFocus(flag?: boolean): void;
-
-        /** Return all nodes as nested list of NodeData.
-         *
-         * @param callback Called for every node
-         * @param includeRoot Returns the hidden system root node (and its children) (default = false)
-         */
-        toDict(includeRoot?: boolean, callback?: (node: FancytreeNode) => void): any;
-
-        /** Call fn(node) for all nodes.
-         *
-         * @param fn the callback function. Return false to stop iteration, return "skip" to skip this node and children only.
-         * @returns false, if the iterator was stopped.
-         */
-        visit(fn: (node: FancytreeNode) => any): boolean;
-
-        /** Write warning to browser console (prepending tree info) */
-        warn(msg: any): void;
-    }
-
-    /** A FancytreeNode represents the hierarchical data model and operations. */
-    interface FancytreeNode {
-        //#region Properties
-        /** The tree instance */
-        tree: Fancytree;
-        /** The parent node */
-        parent: FancytreeNode;
-        /** Node id (must be unique inside the tree) */
-        key: string;
-        /** Display name (may contain HTML) */
-        title: string;
-        /** Contains all extra data that was passed on node creation */
-        data: Object;
-        /** Array of child nodes. For lazy nodes, null or undefined means 'not yet loaded'. Use an empty array to define a node that has no children. */
-        children: FancytreeNode[];
-        /** Use isExpanded(), setExpanded() to access this property. */
-        expanded: boolean;
-        /** Addtional CSS classes, added to the node's `<span>`. */
-        extraClasses: string;
-        /** Folder nodes have different default icons and click behavior. Note: Also non-folders may have children. */
-        folder: boolean;
-        /** null or type of temporarily generated system node like 'loading', or 'error'. */
-        statusNodeType: string;
-        /** True if this node is loaded on demand, i.e. on first expansion. */
-        lazy: boolean;
-        /** Alternative description used as hover banner */
-        tooltip: string;
-        //#endregion
-
-        //#region Methods
-        /**
-         * Append (or insert) a list of child nodes.
-         *
-         * @param children array of child node definitions (also single child accepted)
-         * @param insertBefore child node to insert nodes before. If omitted, the new children is appended.
-         * @returns The first child added.
-         */
-        addChildren(children: Fancytree.NodeData[], insertBefore?: FancytreeNode): FancytreeNode;
-        /**
-         * Append (or insert) a list of child nodes.
-         *
-         * @param children array of child node definitions (also single child accepted)
-         * @param insertBefore key of the child node to insert nodes before. If omitted, the new children is appended.
-         * @returns The first child added.
-         */
-        addChildren(children: Fancytree.NodeData[], insertBefore?: string): FancytreeNode;
-        /**
-         * Append (or insert) a list of child nodes.
-         *
-         * @param children array of child node definitions (also single child accepted)
-         * @param insertBefore index of the child node to insert nodes before. If omitted, the new children is appended.
-         * @returns The first child added.
-         */
-        addChildren(children: Fancytree.NodeData[], insertBefore?: number): FancytreeNode;
-        /**
-         * Append (or insert) a single child node.
-         *
-         * @param child node to add
-         * @param insertBefore child node to insert this node before. If omitted, the new child is appended.
-         * @returns The child added.
-         */
-        addChildren(child: Fancytree.NodeData, insertBefore?: FancytreeNode): FancytreeNode;
-        /**
-         * Append (or insert) a single child node.
-         *
-         * @param child node to add
-         * @param insertBefore key of the child node to insert this node before. If omitted, the new child is appended.
-         * @returns The child added.
-         */
-        addChildren(child: Fancytree.NodeData, insertBefore?: string): FancytreeNode;
-        /**
-         * Append (or insert) a single child node.
-         *
-         * @param child node to add
-         * @param insertBefore index of the child node to insert this node before. If omitted, the new child is appended.
-         * @returns The child added.
-         */
-        addChildren(child: Fancytree.NodeData, insertBefore?: number): FancytreeNode;
-
-
-        /** Append or prepend a node, or append a child node. This a convenience function that calls addChildren()
-         *
-         * @param mode 'before', 'after', 'firstChild', or 'child' ('over' is a synonym for 'child') (default='child')
-         * @returns new node.
-         */
-        addNode(node: NodeData, mode?: string): FancytreeNode;
-
-        /** Modify existing child nodes. */
-        applyPatch(patch: NodePatch): JQueryPromise<any>;
-
-        /** Collapse all sibling nodes. */
-        collapseSiblings(): JQueryPromise<any>;
-
-        /** Copy this node as sibling or child of `node`.
-         *
-         * @param node source node
-         * @param mode 'before' | 'after' | 'child' (default='child')
-         * @param map callback function(NodeData) that could modify the new node
-         * @returns new node.
-         */
-        copyTo(node: FancytreeNode, mode?: string, map?: (node: NodeData) => void) : FancytreeNode;
-
-        /** Count direct and indirect children.
-         *
-         * @param deep pass 'false' to only count direct children. (default=true)
-         */
-        countChildren(deep?: boolean): number;
-
-        /** Write to browser console if debugLevel >= 2 (prepending node info) */
-        debug(msg: any): void;
-
-        /** [ext-edit] Create a new child or sibling node and start edit mode.
-         *
-         * @param mode 'before', 'after', or 'child' (default='child')
-         * @param init NodeData (or simple title string)
-         */
-        editCreateNode(mode?: string, init?: Object): void;
-
-        /** [ext-edit] Stop inline editing.
-         *
-         * @param applyChanges false: cancel edit, true: save (if modified)
-         */
-        editEnd(applyChanges: boolean): void;
-
-        /** [ext-edit] Start inline editing of current node title.  */
-        editStart(): void;
-
-        /** Find all nodes that contain `match` in the title.
-         *
-         * @param match string to search for
-         */
-        findAll(match: string): FancytreeNode[];
-
-        /** Find all nodes that contain `match` in the title.
-          *
-          * @param match a function that returns `true` if a node is matched.
-          */
-        findAll(match: (node: FancytreeNode) => boolean): FancytreeNode[];
-
-        /** Find first node that contains `match` in the title (not including self).
-         *
-         * @param match string to search for
-         */
-        findFirst(match: string): FancytreeNode;
-
-        /** Find first node that contains `match` in the title (not including self).
-          *
-          * @param match a function that returns `true` if a node is matched.
-          */
-        findFirst(match: (node: FancytreeNode) => boolean): FancytreeNode;
-
-        /** Fix selection status, after this node was (de)selected in multi-hier mode. This includes (de)selecting all children. */
-        fixSelection3AfterClick(): void;
-
-        /** Fix selection status for multi-hier mode. Only end-nodes are considered to update the descendants branch and parents. Should be called after this node has loaded new children or after children have been modified using the API. */
-        fixSelection3FromEndNodes(): void;
-
-        /** Update node data. If dict contains 'children', then also replace the hole sub tree.  */
-        fromDict(dict: NodeData): void;
-
-        /** Return the list of child nodes (undefined for unexpanded lazy nodes). */
-        getChildren(): FancytreeNode[];
-
-        /** [ext-clones] Return a list of clone-nodes or null. */
-        getCloneList(includeSelf?: boolean): FancytreeNode[];
-
-        /** Return the first child node or null. */
-        getFirstChild(): FancytreeNode;
-
-        /** Return the 0-based child index. */
-        getIndex(): number;
-
-        /** Return the hierarchical child index (1-based, e.g. '3.2.4').  */
-        getIndexHier(): string;
-
-        /** Return the parent keys separated by options.keyPathSeparator, e.g. "id_1/id_17/id_32". */
-        getKeyPath(excludeSelf: boolean): string;
-
-        /** Return the last child of this node or null. */
-        getLastChild(): FancytreeNode;
-
-        /** Return node depth. 0: System root node, 1: visible top-level node, 2: first sub-level, ... . */
-        getLevel(): number;
-
-        /** Return the successor node (under the same parent) or null. */
-        getNextSibling(): FancytreeNode;
-
-        /** Return the parent node (null for the system root node).  */
-        getParent(): FancytreeNode;
-
-        /**Return an array of all parent nodes (top-down).
-         *
-         * @param includeRoot Include the invisible system root node. (default=false)
-         * @param includeSelf Include the node itself (default=false).
-          */
-        getParentList(includeRoot: boolean, includeSelf: boolean): FancytreeNode[];
-
-        /** Return the predecessor node (under the same parent) or null. */
-        getPrevSibling(): FancytreeNode;
-
-        /** Return true if node has children. Return undefined if not sure, i.e. the node is lazy and not yet loaded). */
-        hasChildren(): boolean;
-
-        /** Return true if node has keyboard focus. */
-        hasFocus(): boolean;
-
-        /** Write to browser console if debugLevel >= 1 (prepending node info)  */
-        info(msg: string): void;
-
-        /** Return true if node is active (see also FancytreeNode.isSelected). */
-        isActive(): boolean;
-
-        /** Return true if node is a direct child of otherNode. */
-        isChildOf(otherNode: FancytreeNode): boolean;
-
-        /** [ext-clones] Return true if this node has at least another clone with same refKey. */
-        isClone(): boolean;
-
-        /** Return true, if node is a direct or indirect sub node of otherNode. */
-        isDescendantOf(otherNode: FancytreeNode): boolean;
-
-        /** [ext-edit] Check if this node is in edit mode. */
-        isEditing(): boolean;
-
-        /** Return true if node is expanded.  */
-        isExpanded(): boolean;
-
-        /** Return true if node is the first node of its parent's children.  */
-        isFirstSibling(): boolean;
-
-        /** Return true if node is a folder, i.e. has the node.folder attribute set. */
-        isFolder(): boolean;
-
-        /** Return true if node is the last node of its parent's children.  */
-        isLastSibling(): boolean;
-
-        /** Return true if node is lazy (even if data was already loaded)  */
-        isLazy(): boolean;
-
-        /** Return true if node is lazy and loaded. For non-lazy nodes always return true.  */
-        isLoaded(): boolean;
-
-        /**Return true if children are currently beeing loaded, i.e. a Ajax request is pending.  */
-        isLoading(): boolean;
-
-        /** Return true if this is the (invisible) system root node. */
-        isRootNode(): boolean;
-
-        /** Return true if node is selected, i.e. has a checkmark set (see also FancytreeNode#isActive). */
-        isSelected(): boolean;
-
-        /** Return true if this node is a temporarily generated system node like 'loading', or 'error' (node.statusNodeType contains the type). */
-        isStatusNode(): boolean;
-
-        /** Return true if this a top level node, i.e. a direct child of the (invisible) system root node. */
-        isTopLevel(): boolean;
-
-        /** Return true if node is lazy and not yet loaded. For non-lazy nodes always return false. */
-        isUndefined(): boolean;
-
-        /** Return true if all parent nodes are expanded. Note: this does not check whether the node is scrolled into the visible part of the screen. */
-        isVisible(): boolean;
-
-        /** Load all children of a lazy node if neccessary. The *expanded* state is maintained.
-         *
-         * @param forceReload Pass true to discard any existing nodes before.
-         */
-        load(forceReload?: boolean): JQueryPromise<any>;
-
-        /** Expand all parents and optionally scroll into visible area as neccessary. Promise is resolved, when lazy loading and animations are done.
-         *
-         * @param opts passed to `setExpanded()`. Defaults to {noAnimation: false, noEvents: false, scrollIntoView: true}
-         */
-        makeVisible(opts?: Object): JQueryPromise<any>;
-
-        /** Move this node to targetNode.
-         *
-         * @param mode 'child': append this node as last child of targetNode.
-         *                       This is the default. To be compatble with the D'n'd
-         *                       hitMode, we also accept 'over'.
-         *              'before': add this node as sibling before targetNode.
-         *              'after': add this node as sibling after targetNode.
-         *
-         * @param map optional callback(FancytreeNode) to allow modifcations
-         */
-        moveTo(targetNode: FancytreeNode, mode: string, map?: (node: FancytreeNode) => void): void;
-
-        /** Set focus relative to this node and optionally activate.
-         *
-         * @param where The keyCode that would normally trigger this move, e.g. `$.ui.keyCode.LEFT` would collapse the node if it is expanded or move to the parent oterwise.
-         * @param activate (default=true)
-         */
-        navigate(where: number, activate?: boolean): JQueryPromise<any>;
-
-        /** Remove this node (not allowed for system root).  */
-        remove(): void;
-
-        /** Remove childNode from list of direct children. */
-        removeChild(childNode: FancytreeNode): void;
-
-        /** Remove all child nodes and descendents. This converts the node into a leaf.
-         * If this was a lazy node, it is still considered 'loaded'; call node.resetLazy() in order to trigger lazyLoad on next expand.
-         */
-        removeChildren(): void;
-
-        /** This method renders and updates all HTML markup that is required to display this node in its current state.
-         *
-         * @param force re-render, even if html markup was already created
-         * @param deep  also render all descendants, even if parent is collapsed
-         */
-        render(force?: boolean, deep?: boolean): void;
-
-        /** Update element's CSS classes according to node state. */
-        renderStatus(): void;
-
-        /** Create HTML markup for the node's outer (expander, checkbox, icon, and title).  */
-        renderTitle(): void;
-
-        /** [ext-clones] Update key and/or refKey for an existing node. */
-        reRegister(key: string, refKey: string): boolean;
-
-        /** Remove all children, collapse, and set the lazy-flag, so that the lazyLoad event is triggered on next expand. */
-        resetLazy(): void;
-
-        /** Schedule activity for delayed execution (cancel any pending request). scheduleAction('cancel') will only cancel a pending request (if any). */
-        scheduleAction(mode: string, ms: number) : void;
-
-        /**
-         * @param effects animation options.
-         * @param options {topNode: null, effects: ..., parent: ...} this node will remain visible in any case, even if `this` is outside the scroll pane.
-         */
-        scrollIntoView(effects?: boolean, options?: Object): JQueryPromise<any>;
-
-        /**
-         * @param effects animation options.
-         * @param options {topNode: null, effects: ..., parent: ...} this node will remain visible in any case, even if `this` is outside the scroll pane.
-         */
-        scrollIntoView(effects?: Object, options?: Object): JQueryPromise<any>;
-
-        /**
-         * @param flag pass false to deactivate
-         * @param opts additional options. Defaults to {noEvents: false}
-         */
-        setActive(flag?: boolean, opts?: Object): JQueryPromise<any>;
-
-        /**
-         * @param flag pass false to collapse.
-         * @param opts additional options. Defaults to {noAnimation:false, noEvents:false}
-         */
-        setExpanded(flag?: boolean, opts?: Object): JQueryPromise<any>;
-
-        /**
-         * Set keyboard focus to this node.
-         *
-         * @param flag pass false to blur.
-         */
-        setFocus(flag?: boolean): void;
-
-        /**
-         * Select this node, i.e. check the checkbox.
-         *
-         * @param flag pass false to deselect.
-         */
-        setSelected(flag?: boolean): void;
-
-        /**
-         * Mark a lazy node as 'error', 'loading', or 'ok'.
-         *
-         * @param status 'error', 'ok'
-         */
-        setStatus(status: string, message?: string, details?: string): void;
-
-        /** Rename this node. */
-        setTitle(title: string): void;
-
-        /**
-         * Sort child list by title.
-         *
-         * @param cmp custom compare function(a, b) that returns -1, 0, or 1 (defaults to sort by title).
-         * @param deep pass true to sort all descendant nodes
-         */
-        sortChildren(cmp?: (a: FancytreeNode, b: FancytreeNode) => number, deep?: boolean): void;
-
-        /**
-         * Convert node (or whole branch) into a plain object. The result is compatible with node.addChildren().
-         *
-         * @param recursive include child nodes.
-         * @param callback callback(dict) is called for every node, in order to allow modifications
-         */
-        toDict(recursive?: boolean, callback?: (dict: NodeData) => void): NodeData;
-
-        /** Flip expanded status. */
-        toggleExpanded(): void;
-
-        /** Flip selection status. */
-        toggleSelected(): void;
-
-        /**
-         * Call fn(node) for all child nodes.
-         * Stop iteration, if fn() returns false. Skip current branch,
-         * if fn() returns "skip". Return false if iteration was stopped.
-         *
-         * @param fn the callback function. Return false to stop iteration, return "skip" to skip this node and its children only.
-         * @param includeSelf (default=false)
-         */
-        visit(fn: (node: FancytreeNode) => any, includeSelf?: boolean): boolean;
-
-        /**
-         * Call fn(node) for all child nodes and recursively load lazy children.
-         * Note: If you need this method, you probably should consider to review your architecture! Recursivley loading nodes is
-         * a perfect way for lazy programmers to flood the server with requests ;-)
-         *
-         * @param fn the callback function. Return false to stop iteration, return "skip" to skip this node and its children only.
-         * @param includeSelf (default=false)
-         */
-        visitAndLoad(fn: (node: FancytreeNode) => any, includeSelf?: boolean): JQueryPromise<any>;
-
-        /**
-         * Call fn(node) for all parent nodes, bottom-up, including invisible system root.
-         * Stop iteration, if fn() returns false.
-         * Return false if iteration was stopped.
-         *
-         * @param fn the callback function. Return false to stop iteration, return "skip" to skip this node and its children only.
-         * @param includeSelf (default=false)
-         */
-        visitParents(fn: (node: FancytreeNode) => any, includeSelf?: boolean): boolean;
-
-        /**
-         * Write warning to browser console (prepending node info)
-         */
-        warn(msg: any): void;
-        //#endregion
-    }
-
-    enum FancytreeClickFolderMode {
-        activate = 1,
-        expand = 2,
-        activate_and_expand = 3,
-        activate_dblclick_expands = 4
-    }
-
-    enum FancytreeSelectMode {
-        single = 1,
-        multi = 2,
-        mutlti_hier = 3
-    }
-
-    /** Context object passed to events and hook functions. */
-    interface EventData {
-        /** The tree instance */
-        tree: Fancytree;
-        /** The jQuery UI tree widget */
-        widget: Object;
-        /** Shortcut to tree.options */
-        options: FancytreeOptions;
-        /** The jQuery Event that initially triggered this call */
-        originalEvent: JQueryEventObject;
-        /** The node that this call applies to (`null` for tree events) */
-        node: FancytreeNode;
-        /** (output parameter) Event handlers can return values back to the
-          * caller. Used by `lazyLoad`, `postProcess`, ... */
-        result: any;
-        /** (only for click and dblclick events) 'title' | 'prefix' | 'expander' | 'checkbox' | 'icon' */
-        targetType: string;
-        /** (only for postProcess event) Original ajax response */
-        response: any;
-    }
-
-    /** The `this` context of any event function is set to tree's the HTMLDivElement  */
-    interface FancytreeEvents {
-        /** 'data.node' was deactivated. */
-        activate?(event: JQueryEventObject, data: EventData): void;
-        /** Return false to prevent default processing */
-        beforeActivate?(event: JQueryEventObject, data: EventData): boolean;
-        /** Return `false` to prevent default processing */
-        beforeExpand?(event: JQueryEventObject, data: EventData): boolean;
-        /** Return `false` to prevent default processing */
-        beforeSelect?(event: JQueryEventObject, data: EventData): boolean;
-        /** `data.node` lost keyboard focus */
-        blur?(event: JQueryEventObject, data: EventData): void;
-        /** `data.tree` lost keyboard focus */
-        blurTree?(event: JQueryEventObject, data: EventData): void;
-        /** `data.node` was clicked. `data.targetType` contains the region ("title", "expander", ...). Return `false` to prevent default processing, i.e. activating, etc. */
-        click?(event: JQueryEventObject, data: EventData): boolean;
-        /** `data.node` was collapsed */
-        collapse?(event: JQueryEventObject, data: EventData): void;
-        /** Widget was created (called only once, even if re-initialized). */
-        create?(event: JQueryEventObject, data: EventData): void;
-        /** Allow tweaking and binding, after node was created for the first time (NOTE: this event is only available as callback, but not for bind()) */
-        createNode?(event: JQueryEventObject, data: EventData): void;
-        /** `data.node` was double-clicked. `data.targetType` contains the region ("title", "expander", ...). Return `false` to prevent default processing, i.e. expanding, etc. */
-        dblclick?(event: JQueryEventObject, data: EventData): boolean;
-        /** `data.node` was deactivated */
-        deactivate?(event: JQueryEventObject, data: EventData): void;
-        /** `data.node` was expanded */
-        expand?(event: JQueryEventObject, data: EventData): void;
-        /** `data.node` received keyboard focus */
-        focus?(event: JQueryEventObject, data: EventData): void;
-        /**`data.tree` received keyboard focus */
-        focusTree?(event: JQueryEventObject, data: EventData): void;
-        /** Widget was (re-)initialized. */
-        init?(event: JQueryEventObject, data: EventData): void;
-        /** `data.node` received key. `event.which` contains the key. Return `false` to prevent default processing, i.e. navigation. Call `data.result = "preventNav";` to prevent navigation but still allow default handling inside embedded input controls. */
-        keydown?(event: JQueryEventObject, data: EventData): boolean;
-        /** (currently unused) */
-        keypress?(event: JQueryEventObject, data: EventData): void;
-        /** `data.node` is a lazy node that is expanded for the first time. The new child data must be returned in the `data.result` property (see `source` option for available formats). */
-        lazyLoad?(event: JQueryEventObject, data: EventData): void;
-        /** Node data was loaded, i.e. `node.nodeLoadChildren()` finished */
-        loadChildren?(event: JQueryEventObject, data: EventData): void;
-        /** A load error occured. Return `false` to prevent default processing. */
-        loadError?(event: JQueryEventObject, data: EventData): boolean;
-        /** Allows to modify the ajax response. */
-        postProcess?(event: JQueryEventObject, data: EventData): void;
-        /** `data.node` was removed (NOTE: this event is only available as callback, but not for bind()) */
-        removeNode?(event: JQueryEventObject, data: EventData): void;
-        /** (used by table extension) */
-        renderColumns?(event: JQueryEventObject, data: EventData): void;
-        /** Allow tweaking after node state was rendered (NOTE: this event is only available as callback, but not for bind()) */
-        renderNode?(event: JQueryEventObject, data: EventData): void;
-        /** Allow replacing the `<span class='fancytree-title'>` markup (NOTE: this event is only available as callback, but not for bind()) */
-        renderTitle?(event: JQueryEventObject, data: EventData): void;
-        /** ext-persist has expanded, selected, and activated the previous state */
-        restore?(event: JQueryEventObject, data: EventData): void;
-        /** `data.node` was selected */
-        select?(event: JQueryEventObject, data: EventData): void;
-    }
-
-    interface FancytreeOptions extends FancytreeEvents {
-        /** Make sure that the active node is always visible, i.e. its parents are expanded (default: true). */
-        activeVisible?: boolean;
-        /** Default options for ajax requests. */
-        ajax?: Object;
-        /** (default: false) Add WAI-ARIA attributes to markup */
-        aria?: boolean;
-        /** Activate a node when focused with the keyboard (default: true) */
-        autoActivate?: boolean;
-        /** Automatically collapse all siblings, when a node is expanded (default: false). */
-        autoCollapse?: boolean;
-        /** Scroll node into visible area, when focused by keyboard (default: false). */
-        autoScroll?: boolean;
-        /** Display checkboxes to allow selection (default: false) */
-        checkbox?: boolean;
-        /** Defines what happens, when the user click a folder node. (default: activate_dblclick_expands) */
-        clickFolderMode?: FancytreeClickFolderMode;
-        /** 0..2 (null: use global setting $.ui.fancytree.debugInfo) */
-        debugLevel?: number;
-        /** callback(node) is called for new nodes without a key. Must return a new unique key. (default null: generates default keys like that: "_" + counter) */
-        defaultKey?: (node: FancytreeNode) => string;
-        /** Accept passing ajax data in a property named `d` (default: true). */
-        enableAspx?: boolean;
-        /** List of active extensions (default: []) */
-        extensions?: string[];
-        /** Set focus when node is checked by a mouse click (default: false) */
-        focusOnSelect?: boolean;
-        /** Add `id="..."` to node markup (default: true). */
-        generateIds?: boolean;
-        /** Display node icons (default: true) */
-        icons?: boolean;
-        /** (default: "ft_") */
-        idPrefix?: string;
-        /** Path to a folder containing icons (default: null, using 'skin/' subdirectory). */
-        imagePath?: string;
-        /** Support keyboard navigation (default: true). */
-        keyboard?: boolean;
-        /** (default: "/") */
-        keyPathSeparator?: string;
-        /** 2: top-level nodes are not collapsible (default: 1) */
-        minExpandLevel?: number;
-        /** navigate to next node by typing the first letters (default: false) */
-        quicksearch?: boolean;
-        /** optional margins for node.scrollIntoView() (default: {top: 0, bottom: 0}) */
-        scrollOfs?: Object;
-        /** scrollable container for node.scrollIntoView() (default: $container) */
-        scrollParent?: JQuery;
-        /** default: multi_hier */
-        selectMode?: FancytreeSelectMode;
-        /** Used to Initialize the tree. */
-        source?: any;
-        /** Translation table */
-        strings?: Object;
-        /** Add tabindex='0' to container, so tree can be reached using TAB */
-        tabbable?: boolean;
-        /** Add tabindex='0' to node title span, so it can receive keyboard focus */
-        titlesTabbable?: boolean;
-        /** Animation options, false:off (default: { effect: "blind", options: {direction: "vertical", scale: "box"}, duration: 200 }) */
-        toggleEffect?: Object;
-    }
-
-    /** Data object passed to FancytreeNode() constructor. Note: typically these attributes are accessed by meber methods, e.g. `node.isExpanded()` and `node.setSelected(false)`.  */
-    interface NodeData {
-        /** node text (may contain HTML tags) */
-        title: string;
-        icon?: string;
-        /** unique key for this node (auto-generated if omitted) */
-        key?: string;
-        /** (reserved) */
-        refKey?: string;
-        expanded?: boolean;
-        /** (initialization only, but will not be stored with the node). */
-        active?: boolean;
-        /** (initialization only, but will not be stored with the node). */
-        focus?: boolean;
-        folder?: boolean;
-        hideCheckbox?: boolean;
-        lazy?: boolean;
-        selected?: boolean;
-        unselectable?: boolean;
-        /** optional array of child nodes */
-        children?: NodeData[];
-        tooltip?: string;
-        /** class names added to the node markup (separate with space) */
-        extraClasses?: string;
-        /** all properties from will be copied to `node.data` */
-        data?: Object;
-    }
-
-    /** Data object similar to NodeData, but with additional options.
-      * May be passed to FancytreeNode#applyPatch (Every property that is omitted (or set to undefined) will be ignored)  */
-    interface NodePatch {
-        /** (not yet implemented) */
-        appendChildren?: NodeData;
-        /** (not yet implemented) */
-        replaceChildren?: NodeData;
-        /** (not yet implemented) */
-        insertChildren?: NodeData;
-    }
-
-    /** May be passed to Fancytree#applyPatch. */
-    interface TreePatch {
-        [key: string]: NodePatch;
-    }
-
-    interface FancytreeStatic {
-        buildType: string;
-        debugLevel: number;
-        version: string;
-
-        /** Throw an error if condition fails (debug method).  */
-        assert(cond: boolean, msg: string): void;
-
-        /** Return a function that executes *fn* at most every *timeout* ms. */
-        debounce<T extends (...args: any[]) => void>(timeout: number, fn: T, invokeAsap?: boolean, ctx?: any): T;
-
-        debug(msg: string): void;
-
-        error(msg: string): void;
-
-        escapeHtml(s: string): string;
-
-        getEventTarget(event: Event): Object;
-
-        getEventTargetType(event: Event): string;
-
-        getNode(el: JQuery): FancytreeNode;
-        getNode(el: Event): FancytreeNode;
-        getNode(el: Element): FancytreeNode;
-
-        info(msg: string): void;
-
-        /** Convert a keydown event to a string like 'ctrl+a', 'ctrl+shift+f2'.  */
-        keyEventToString(event: Event): string;
-
-        /** Parse tree data from HTML markup */
-        parseHtml($ul: JQuery): NodeData[];
-
-        /** Add Fancytree extension definition to the list of globally available extensions. */
-        registerExtension(definition: Object): void;
-
-        unescapeHtml(s: string): string;
-
-        warn(msg: string): void;
-    }
-}
-
diff --git a/jquery.fancytree/tsconfig.json b/jquery.fancytree/tsconfig.json
new file mode 100644
index 0000000000..8ad73d1184
--- /dev/null
+++ b/jquery.fancytree/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.fancytree-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.fileupload/index.d.ts b/jquery.fileupload/index.d.ts
new file mode 100644
index 0000000000..59c1301b9a
--- /dev/null
+++ b/jquery.fileupload/index.d.ts
@@ -0,0 +1,252 @@
+// Type definitions for jQuery File Upload Plugin 5.40.1
+// Project: https://github.com/blueimp/jQuery-File-Upload
+// Definitions by: Rob Alarcon <https://github.com/rob-alarcon/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+// Interface options for the plugin 
+interface JQueryFileInputOptions {
+
+    /**
+     * The type of data that is expected back from the server.
+     */
+    dataType?: string;
+
+    /**
+     * The drop target element(s), by the default the complete document.
+     * Set to null to disable drag & drop support:
+     */
+    dropZone?: HTMLElement;
+
+    /**
+     * The paste target element(s), by the default the complete document.
+     * Set to null to disable paste support:
+     */
+    pasteZone?: HTMLElement;
+
+    /**
+     * The file input field(s), that are listened to for change events.
+     * If undefined, it is set to the file input fields inside
+     * of the widget element on plugin initialization.
+     * Set to null to disable the change listener.
+     */
+    fileInput?: HTMLElement;
+
+    /**
+     * By default, the file input field is replaced with a clone after
+     * each input field change event. This is required for iframe transport
+     * queues and allows change events to be fired for the same file
+     * selection, but can be disabled by setting the following option to false:
+     */
+    replaceFileInput?: boolean;
+
+    /**
+     * The parameter name for the file form data (the request argument name).
+     * If undefined or empty, the name property of the file input field is
+     * used, or "files[]" if the file input name property is also empty,
+     * can be a string or an array of strings:
+     */
+    paramName?: any;
+
+    /**
+     * By default, each file of a selection is uploaded using an individual
+     * request for XHR type uploads. Set to false to upload file
+     * selections in one request each:
+     */
+    singleFileUploads?: boolean;
+
+    /**
+     * To limit the number of files uploaded with one XHR request,
+     * set the following option to an integer greater than 0:
+     */
+    limitMultiFileUploads?: number;
+
+    /**
+     * The following option limits the number of files uploaded with one
+     * XHR request to keep the request size under or equal to the defined
+     * limit in bytes
+     */
+    limitMultiFileUploadSize?: number;
+
+    /**
+     * Multipart file uploads add a number of bytes to each uploaded file,
+     * therefore the following option adds an overhead for each file used
+     * in the limitMultiFileUploadSize configuration:
+     */
+    limitMultiFileUploadSizeOverhead?: number;
+
+    /**
+     * Set the following option to true to issue all file upload requests
+     * in a sequential order:
+     */
+    sequentialUploads?: boolean;
+
+    /**
+     * To limit the number of concurrent uploads,
+     * set the following option to an integer greater than 0:
+     */
+    limitConcurrentUploads?: number;
+
+    /**
+     * Set the following option to true to force iframe transport uploads:
+     */
+    forceIframeTransport?: boolean;
+
+    /**
+     * Set the following option to the location of a redirect url on the
+     * origin server, for cross-domain iframe transport uploads:
+     */
+    redirect?: string;
+
+    /**
+     * The parameter name for the redirect url, sent as part of the form
+     * data and set to 'redirect' if this option is empty:
+     */
+    redirectParamName?: string;
+
+    /**
+     * Set the following option to the location of a postMessage window,
+     * to enable postMessage transport uploads:
+     */
+    postMessage?: string;
+
+    /**
+     * By default, XHR file uploads are sent as multipart/form-data.
+     * The iframe transport is always using multipart/form-data.
+     * Set to false to enable non-multipart XHR uploads:
+     */
+    multipart?: boolean;
+
+    /**
+     * To upload large files in smaller chunks, set the following option
+     * to a preferred maximum chunk size. If set to 0, null or undefined,
+     * or the browser does not support the required Blob API, files will
+     * be uploaded as a whole.
+     */
+    maxChunkSize?: number;
+
+    /**
+     * When a non-multipart upload or a chunked multipart upload has been
+     * aborted, this option can be used to resume the upload by setting
+     * it to the size of the already uploaded bytes. This option is most
+     * useful when modifying the options object inside of the "add" or
+     * "send" callbacks, as the options are cloned for each file upload.
+     */
+    uploadedBytes?: number;
+
+    /**
+     * By default, failed (abort or error) file uploads are removed from the
+     * global progress calculation. Set the following option to false to
+     * prevent recalculating the global progress data:
+     */
+    recalculateProgress?: boolean;
+
+    /**
+     * Interval in milliseconds to calculate and trigger progress events:
+     */
+    progressInterval?: number;
+
+    /**
+     * Interval in milliseconds to calculate progress bitrate:
+     */
+    bitrateInterval?: number;
+
+    /**
+     * By default, uploads are started automatically when adding files:
+     */
+    autoUpload?: boolean;
+
+    /**
+     * Error and info messages:
+     */
+    messages?: any;
+
+    /**
+     * Translation function, gets the message key to be translated
+     * and an object with context specific data as arguments:
+     */
+    i18n?: any;
+
+    /**
+     * Additional form data to be sent along with the file uploads can be set
+     * using this option, which accepts an array of objects with name and
+     * value properties, a function returning such an array, a FormData
+     * object (for XHR file uploads), or a simple object.
+     * The form of the first fileInput is given as parameter to the function:
+     */
+    formData?: any;
+
+    /**
+     * The add callback is invoked as soon as files are added to the fileupload
+     * widget (via file input selection, drag & drop, paste or add API call).
+     * If the singleFileUploads option is enabled, this callback will be
+     * called once for each file in the selection for XHR file uploads, else
+     * once for each file selection.
+     *
+     * The upload starts when the submit method is invoked on the data parameter.
+     * The data object contains a files property holding the added files
+     * and allows you to override plugin options as well as define ajax settings.
+     *
+     * Listeners for this callback can also be bound the following way:
+     * .bind('fileuploadadd', func);
+     *
+     * data.submit() returns a Promise object and allows to attach additional
+     * handlers using jQuery's Deferred callbacks:
+     * data.submit().done(func).fail(func).always(func);
+     */
+    add?: any;
+
+    // The plugin options are used as settings object for the ajax calls.
+    // The following are jQuery ajax settings required for the file uploads:
+    processData?: boolean;
+
+    contentType?: string;
+
+    cache?: boolean;
+    timeout?: number;
+    
+    active?: Function;
+    progress?: Function;
+    send?: Function;
+
+    // Other callbacks:
+    submit?: Function;
+    done?: Function;
+    fail?: Function;
+    always?: Function;
+    progressall?: Function;
+    start?: Function;
+    stop?: Function;
+    change?: Function;
+    paste?: Function;
+    drop?: Function;
+    dragover?: Function;
+    chunksend?: Function;
+    chunkdone?: Function;
+    chunkfail?: Function;
+    chunkalways?: Function;
+
+    // Others 
+    url?: string;
+    files?: any;
+
+    // Cross-site XMLHttpRequest file uploads
+    xhrFields?: any;
+
+}
+
+interface JQueryFileUpload extends JQuery  {
+    contentType:string;
+}
+
+interface JQuery {
+    // Interface to the main method of jQuery File Upload
+    fileupload(settings: JQueryFileInputOptions | string): JQueryFileUpload;
+    fileupload(action:string,  settings: JQueryFileInputOptions | string): JQueryFileUpload;
+    fileupload(action: string, message:string, settings: JQueryFileInputOptions | string): JQueryFileUpload;
+}
+
+interface JQuerySupport {
+    fileInput?: boolean;
+}
diff --git a/jquery.fileupload/jquery.fileupload-tests.ts b/jquery.fileupload/jquery.fileupload-tests.ts
index 87149e0151..89086c56fb 100644
--- a/jquery.fileupload/jquery.fileupload-tests.ts
+++ b/jquery.fileupload/jquery.fileupload-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jquery.fileupload.d.ts" />
+
 
 /* 
 * Handle the event of adding a file to the jQuery Upload plugin.
diff --git a/jquery.fileupload/jquery.fileupload.d.ts b/jquery.fileupload/jquery.fileupload.d.ts
deleted file mode 100644
index 3575ab2738..0000000000
--- a/jquery.fileupload/jquery.fileupload.d.ts
+++ /dev/null
@@ -1,252 +0,0 @@
-// Type definitions for jQuery File Upload Plugin 5.40.1
-// Project: https://github.com/blueimp/jQuery-File-Upload
-// Definitions by: Rob Alarcon <https://github.com/rob-alarcon/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-// Interface options for the plugin 
-interface JQueryFileInputOptions {
-
-    /**
-     * The type of data that is expected back from the server.
-     */
-    dataType?: string;
-
-    /**
-     * The drop target element(s), by the default the complete document.
-     * Set to null to disable drag & drop support:
-     */
-    dropZone?: HTMLElement;
-
-    /**
-     * The paste target element(s), by the default the complete document.
-     * Set to null to disable paste support:
-     */
-    pasteZone?: HTMLElement;
-
-    /**
-     * The file input field(s), that are listened to for change events.
-     * If undefined, it is set to the file input fields inside
-     * of the widget element on plugin initialization.
-     * Set to null to disable the change listener.
-     */
-    fileInput?: HTMLElement;
-
-    /**
-     * By default, the file input field is replaced with a clone after
-     * each input field change event. This is required for iframe transport
-     * queues and allows change events to be fired for the same file
-     * selection, but can be disabled by setting the following option to false:
-     */
-    replaceFileInput?: boolean;
-
-    /**
-     * The parameter name for the file form data (the request argument name).
-     * If undefined or empty, the name property of the file input field is
-     * used, or "files[]" if the file input name property is also empty,
-     * can be a string or an array of strings:
-     */
-    paramName?: any;
-
-    /**
-     * By default, each file of a selection is uploaded using an individual
-     * request for XHR type uploads. Set to false to upload file
-     * selections in one request each:
-     */
-    singleFileUploads?: boolean;
-
-    /**
-     * To limit the number of files uploaded with one XHR request,
-     * set the following option to an integer greater than 0:
-     */
-    limitMultiFileUploads?: number;
-
-    /**
-     * The following option limits the number of files uploaded with one
-     * XHR request to keep the request size under or equal to the defined
-     * limit in bytes
-     */
-    limitMultiFileUploadSize?: number;
-
-    /**
-     * Multipart file uploads add a number of bytes to each uploaded file,
-     * therefore the following option adds an overhead for each file used
-     * in the limitMultiFileUploadSize configuration:
-     */
-    limitMultiFileUploadSizeOverhead?: number;
-
-    /**
-     * Set the following option to true to issue all file upload requests
-     * in a sequential order:
-     */
-    sequentialUploads?: boolean;
-
-    /**
-     * To limit the number of concurrent uploads,
-     * set the following option to an integer greater than 0:
-     */
-    limitConcurrentUploads?: number;
-
-    /**
-     * Set the following option to true to force iframe transport uploads:
-     */
-    forceIframeTransport?: boolean;
-
-    /**
-     * Set the following option to the location of a redirect url on the
-     * origin server, for cross-domain iframe transport uploads:
-     */
-    redirect?: string;
-
-    /**
-     * The parameter name for the redirect url, sent as part of the form
-     * data and set to 'redirect' if this option is empty:
-     */
-    redirectParamName?: string;
-
-    /**
-     * Set the following option to the location of a postMessage window,
-     * to enable postMessage transport uploads:
-     */
-    postMessage?: string;
-
-    /**
-     * By default, XHR file uploads are sent as multipart/form-data.
-     * The iframe transport is always using multipart/form-data.
-     * Set to false to enable non-multipart XHR uploads:
-     */
-    multipart?: boolean;
-
-    /**
-     * To upload large files in smaller chunks, set the following option
-     * to a preferred maximum chunk size. If set to 0, null or undefined,
-     * or the browser does not support the required Blob API, files will
-     * be uploaded as a whole.
-     */
-    maxChunkSize?: number;
-
-    /**
-     * When a non-multipart upload or a chunked multipart upload has been
-     * aborted, this option can be used to resume the upload by setting
-     * it to the size of the already uploaded bytes. This option is most
-     * useful when modifying the options object inside of the "add" or
-     * "send" callbacks, as the options are cloned for each file upload.
-     */
-    uploadedBytes?: number;
-
-    /**
-     * By default, failed (abort or error) file uploads are removed from the
-     * global progress calculation. Set the following option to false to
-     * prevent recalculating the global progress data:
-     */
-    recalculateProgress?: boolean;
-
-    /**
-     * Interval in milliseconds to calculate and trigger progress events:
-     */
-    progressInterval?: number;
-
-    /**
-     * Interval in milliseconds to calculate progress bitrate:
-     */
-    bitrateInterval?: number;
-
-    /**
-     * By default, uploads are started automatically when adding files:
-     */
-    autoUpload?: boolean;
-
-    /**
-     * Error and info messages:
-     */
-    messages?: any;
-
-    /**
-     * Translation function, gets the message key to be translated
-     * and an object with context specific data as arguments:
-     */
-    i18n?: any;
-
-    /**
-     * Additional form data to be sent along with the file uploads can be set
-     * using this option, which accepts an array of objects with name and
-     * value properties, a function returning such an array, a FormData
-     * object (for XHR file uploads), or a simple object.
-     * The form of the first fileInput is given as parameter to the function:
-     */
-    formData?: any;
-
-    /**
-     * The add callback is invoked as soon as files are added to the fileupload
-     * widget (via file input selection, drag & drop, paste or add API call).
-     * If the singleFileUploads option is enabled, this callback will be
-     * called once for each file in the selection for XHR file uploads, else
-     * once for each file selection.
-     *
-     * The upload starts when the submit method is invoked on the data parameter.
-     * The data object contains a files property holding the added files
-     * and allows you to override plugin options as well as define ajax settings.
-     *
-     * Listeners for this callback can also be bound the following way:
-     * .bind('fileuploadadd', func);
-     *
-     * data.submit() returns a Promise object and allows to attach additional
-     * handlers using jQuery's Deferred callbacks:
-     * data.submit().done(func).fail(func).always(func);
-     */
-    add?: any;
-
-    // The plugin options are used as settings object for the ajax calls.
-    // The following are jQuery ajax settings required for the file uploads:
-    processData?: boolean;
-
-    contentType?: string;
-
-    cache?: boolean;
-    timeout?: number;
-    
-    active?: Function;
-    progress?: Function;
-    send?: Function;
-
-    // Other callbacks:
-    submit?: Function;
-    done?: Function;
-    fail?: Function;
-    always?: Function;
-    progressall?: Function;
-    start?: Function;
-    stop?: Function;
-    change?: Function;
-    paste?: Function;
-    drop?: Function;
-    dragover?: Function;
-    chunksend?: Function;
-    chunkdone?: Function;
-    chunkfail?: Function;
-    chunkalways?: Function;
-
-    // Others 
-    url?: string;
-    files?: any;
-
-    // Cross-site XMLHttpRequest file uploads
-    xhrFields?: any;
-
-}
-
-interface JQueryFileUpload extends JQuery  {
-    contentType:string;
-}
-
-interface JQuery {
-    // Interface to the main method of jQuery File Upload
-    fileupload(settings: JQueryFileInputOptions | string): JQueryFileUpload;
-    fileupload(action:string,  settings: JQueryFileInputOptions | string): JQueryFileUpload;
-    fileupload(action: string, message:string, settings: JQueryFileInputOptions | string): JQueryFileUpload;
-}
-
-interface JQuerySupport {
-    fileInput?: boolean;
-}
diff --git a/jquery.fileupload/tsconfig.json b/jquery.fileupload/tsconfig.json
new file mode 100644
index 0000000000..070d6f9e08
--- /dev/null
+++ b/jquery.fileupload/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.fileupload-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.finger/index.d.ts b/jquery.finger/index.d.ts
new file mode 100644
index 0000000000..dbdde4e03f
--- /dev/null
+++ b/jquery.finger/index.d.ts
@@ -0,0 +1,109 @@
+// Type definitions for jquery.finger.js
+// Project: http://ngryman.sh/jquery.finger/
+// Definitions by: Max Ackley <https://github.com/maxackley/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+declare namespace JQueryFinger {
+    export interface JQueryFingerOptions {
+        /**
+          * The time the user must hold in order to fire a press event. If this
+          * time is not reached, a tap event will be fired instead.
+          *     Default: 300(ms).
+          */
+        pressDuration: number;
+
+        /**
+          * The maximum time between two tap events to fire a doubletap event.
+          * If this time is reached, two distinct tap events will be fired instead.
+          *     Default: 300(ms).
+          */
+        doubleTapInterval: number;
+
+        /**
+          * The maximum time the user will have to swipe in order to fire a flick
+          * event. If this time is reached, only drag events will continue to be
+          * fired.
+          *     Default: 150(ms).
+          */
+        flickDuration: number;
+
+        /**
+          * The number of pixels the user will have to move in order to fire motion
+          * events (drag or flick). If this time is not reached, no motion will
+          * be handled and tap, doubletap or press event will be fired.
+          *     Default: 5(px).
+          */
+        motionThreshhold: number;
+
+        /**
+          * Globally prevents every native default behavior.
+          *     Default: undefined.
+          */
+        preventDefault: boolean;
+    }
+}
+
+interface JQueryFingerEventObject extends JQueryEventObject {
+    /**
+      * The x page coordinate.
+      */
+    x: number;
+
+    /**
+      * The y page coordinate.
+      */
+    y: number;
+
+    /**
+      * The x delta since the last event.
+      */
+    dx: number;
+
+    /**
+      * The y delta since the last event.
+      */
+    dy: number;
+
+    /**
+      * The absolute x delta since the last event.
+      */
+    adx: number;
+
+    /**
+      * The absolute y delta since the last event.
+      */
+    ady: number;
+
+    /**
+      * The orientation of the motion. Adjusted by $.Finger.motionThreshhold.
+      * Value is 'horizontal' or 'vertical'.
+      */
+    orientation: string;
+
+    /**
+      * The direction of the motion. Value is 1 if the motion is 'positive'
+      * (left-to-right or top-to-bottom) or -1 if 'negative'(right-to-left or
+      * bottom-to-top).
+      */
+    direction: number;
+}
+
+interface JQuery {
+    on(events: 'tap', handler: (eventObject: JQueryFingerEventObject, ...args: any[]) => any): JQuery;
+    on(events: 'doubletap', handler: (eventObject: JQueryFingerEventObject, ...args: any[]) => any): JQuery;
+    on(events: 'press', handler: (eventObject: JQueryFingerEventObject, ...args: any[]) => any): JQuery;
+    on(events: 'drag', handler: (eventObject: JQueryFingerEventObject, ...args: any[]) => any): JQuery;
+    on(events: 'flick', handler: (eventObject: JQueryFingerEventObject, ...args: any[]) => any): JQuery;
+
+    on(events: 'tap', data: any, handler: (eventObject: JQueryFingerEventObject, ...args: any[]) => any): JQuery;
+    on(events: 'doubletap', data: any, handler: (eventObject: JQueryFingerEventObject, ...args: any[]) => any): JQuery;
+    on(events: 'press', data: any, handler: (eventObject: JQueryFingerEventObject, ...args: any[]) => any): JQuery;
+    on(events: 'drag', data: any, handler: (eventObject: JQueryFingerEventObject, ...args: any[]) => any): JQuery;
+    on(events: 'flick', data: any, handler: (eventObject: JQueryFingerEventObject, ...args: any[]) => any): JQuery;
+}
+
+interface JQueryStatic {
+    Finger: JQueryFinger.JQueryFingerOptions;
+}
diff --git a/jquery.finger/jquery.finger-tests.ts b/jquery.finger/jquery.finger-tests.ts
index e50fe1d5f2..f0e8457dbf 100644
--- a/jquery.finger/jquery.finger-tests.ts
+++ b/jquery.finger/jquery.finger-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.finger.d.ts"/>
+/// <reference types="jquery"/>
 
 $.Finger.doubleTapInterval = 400;
 $.Finger.flickDuration = 250;
diff --git a/jquery.finger/jquery.finger.d.ts b/jquery.finger/jquery.finger.d.ts
deleted file mode 100644
index cfc0104dcd..0000000000
--- a/jquery.finger/jquery.finger.d.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-// Type definitions for jquery.finger.js
-// Project: http://ngryman.sh/jquery.finger/
-// Definitions by: Max Ackley <https://github.com/maxackley/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-declare namespace JQueryFinger {
-    export interface JQueryFingerOptions {
-        /**
-          * The time the user must hold in order to fire a press event. If this
-          * time is not reached, a tap event will be fired instead.
-          *     Default: 300(ms).
-          */
-        pressDuration: number;
-
-        /**
-          * The maximum time between two tap events to fire a doubletap event.
-          * If this time is reached, two distinct tap events will be fired instead.
-          *     Default: 300(ms).
-          */
-        doubleTapInterval: number;
-
-        /**
-          * The maximum time the user will have to swipe in order to fire a flick
-          * event. If this time is reached, only drag events will continue to be
-          * fired.
-          *     Default: 150(ms).
-          */
-        flickDuration: number;
-
-        /**
-          * The number of pixels the user will have to move in order to fire motion
-          * events (drag or flick). If this time is not reached, no motion will
-          * be handled and tap, doubletap or press event will be fired.
-          *     Default: 5(px).
-          */
-        motionThreshhold: number;
-
-        /**
-          * Globally prevents every native default behavior.
-          *     Default: undefined.
-          */
-        preventDefault: boolean;
-    }
-}
-
-interface JQueryFingerEventObject extends JQueryEventObject {
-    /**
-      * The x page coordinate.
-      */
-    x: number;
-
-    /**
-      * The y page coordinate.
-      */
-    y: number;
-
-    /**
-      * The x delta since the last event.
-      */
-    dx: number;
-
-    /**
-      * The y delta since the last event.
-      */
-    dy: number;
-
-    /**
-      * The absolute x delta since the last event.
-      */
-    adx: number;
-
-    /**
-      * The absolute y delta since the last event.
-      */
-    ady: number;
-
-    /**
-      * The orientation of the motion. Adjusted by $.Finger.motionThreshhold.
-      * Value is 'horizontal' or 'vertical'.
-      */
-    orientation: string;
-
-    /**
-      * The direction of the motion. Value is 1 if the motion is 'positive'
-      * (left-to-right or top-to-bottom) or -1 if 'negative'(right-to-left or
-      * bottom-to-top).
-      */
-    direction: number;
-}
-
-interface JQuery {
-    on(events: 'tap', handler: (eventObject: JQueryFingerEventObject, ...args: any[]) => any): JQuery;
-    on(events: 'doubletap', handler: (eventObject: JQueryFingerEventObject, ...args: any[]) => any): JQuery;
-    on(events: 'press', handler: (eventObject: JQueryFingerEventObject, ...args: any[]) => any): JQuery;
-    on(events: 'drag', handler: (eventObject: JQueryFingerEventObject, ...args: any[]) => any): JQuery;
-    on(events: 'flick', handler: (eventObject: JQueryFingerEventObject, ...args: any[]) => any): JQuery;
-
-    on(events: 'tap', data: any, handler: (eventObject: JQueryFingerEventObject, ...args: any[]) => any): JQuery;
-    on(events: 'doubletap', data: any, handler: (eventObject: JQueryFingerEventObject, ...args: any[]) => any): JQuery;
-    on(events: 'press', data: any, handler: (eventObject: JQueryFingerEventObject, ...args: any[]) => any): JQuery;
-    on(events: 'drag', data: any, handler: (eventObject: JQueryFingerEventObject, ...args: any[]) => any): JQuery;
-    on(events: 'flick', data: any, handler: (eventObject: JQueryFingerEventObject, ...args: any[]) => any): JQuery;
-}
-
-interface JQueryStatic {
-    Finger: JQueryFinger.JQueryFingerOptions;
-}
diff --git a/jquery.finger/tsconfig.json b/jquery.finger/tsconfig.json
new file mode 100644
index 0000000000..d47b07d84d
--- /dev/null
+++ b/jquery.finger/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.finger-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.form/index.d.ts b/jquery.form/index.d.ts
new file mode 100644
index 0000000000..002b1b03ae
--- /dev/null
+++ b/jquery.form/index.d.ts
@@ -0,0 +1,50 @@
+// Type definitions for jQuery.form.js 3.26.0-2013.01.28
+// Project: http://malsup.com/jquery/form/
+// Definitions by: François Guillot <http://fguillot.developpez.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="jquery"/>
+
+interface JQueryFormOptions extends JQueryAjaxSettings {
+    beforeSerialize?: ($form: JQuery, options: JQueryFormOptions) => boolean;
+    beforeSubmit?: (formData: any[], $form: JQuery, options: JQueryFormOptions) => boolean;
+    clearForm?: boolean;
+    forceSync?: boolean;
+    iframe?: boolean;
+    iframeSrc?: string;
+    iframeTarget?: any;
+    replaceTarget?: boolean;
+    resetForm?: boolean;
+    semantic?: boolean;
+    target?: any;
+    uploadProgress?: (event: ProgressEvent, position: number, total: number, percentComplete: number) => void;
+}
+
+interface JQueryForm {
+    (callback?: Function): JQuery;
+    (options?: JQueryFormOptions): JQuery;
+}
+
+interface JQueryFormWithDebug extends JQueryForm {
+    debug: boolean;
+}
+
+interface JQueryStatic {
+    fieldValue(element: Element, successful?: boolean): string;
+}
+
+interface JQuery {
+    ajaxForm: JQueryForm;
+    ajaxSubmit: JQueryFormWithDebug;
+    formSerialize(): string;
+    fieldSerialize(): string;
+    fieldValue(successful?: boolean): string[];
+    resetForm(): JQuery;
+    clearForm(): JQuery;
+    clearFields(): JQuery;
+    ajaxFormUnbind: () => JQuery;
+    formToArray: (semantic?: boolean, elements?: Element[]) => any[];
+    enable: (enable?: boolean) => JQuery;
+    selected: (select?: boolean) => JQuery;
+}
\ No newline at end of file
diff --git a/jquery.form/jquery.form-tests.ts b/jquery.form/jquery.form-tests.ts
index 8b8e42c5db..f115a97f57 100644
--- a/jquery.form/jquery.form-tests.ts
+++ b/jquery.form/jquery.form-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.form.d.ts"/>
+/// <reference types="jquery"/>
 
 // Basic usage
 
diff --git a/jquery.form/jquery.form.d.ts b/jquery.form/jquery.form.d.ts
deleted file mode 100644
index 522aa3c3df..0000000000
--- a/jquery.form/jquery.form.d.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-// Type definitions for jQuery.form.js 3.26.0-2013.01.28
-// Project: http://malsup.com/jquery/form/
-// Definitions by: François Guillot <http://fguillot.developpez.com/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface JQueryFormOptions extends JQueryAjaxSettings {
-    beforeSerialize?: ($form: JQuery, options: JQueryFormOptions) => boolean;
-    beforeSubmit?: (formData: any[], $form: JQuery, options: JQueryFormOptions) => boolean;
-    clearForm?: boolean;
-    forceSync?: boolean;
-    iframe?: boolean;
-    iframeSrc?: string;
-    iframeTarget?: any;
-    replaceTarget?: boolean;
-    resetForm?: boolean;
-    semantic?: boolean;
-    target?: any;
-    uploadProgress?: (event: ProgressEvent, position: number, total: number, percentComplete: number) => void;
-}
-
-interface JQueryForm {
-    (callback?: Function): JQuery;
-    (options?: JQueryFormOptions): JQuery;
-}
-
-interface JQueryFormWithDebug extends JQueryForm {
-    debug: boolean;
-}
-
-interface JQueryStatic {
-    fieldValue(element: Element, successful?: boolean): string;
-}
-
-interface JQuery {
-    ajaxForm: JQueryForm;
-    ajaxSubmit: JQueryFormWithDebug;
-    formSerialize(): string;
-    fieldSerialize(): string;
-    fieldValue(successful?: boolean): string[];
-    resetForm(): JQuery;
-    clearForm(): JQuery;
-    clearFields(): JQuery;
-    ajaxFormUnbind: () => JQuery;
-    formToArray: (semantic?: boolean, elements?: Element[]) => any[];
-    enable: (enable?: boolean) => JQuery;
-    selected: (select?: boolean) => JQuery;
-}
\ No newline at end of file
diff --git a/jquery.form/tsconfig.json b/jquery.form/tsconfig.json
new file mode 100644
index 0000000000..9b8bc2e265
--- /dev/null
+++ b/jquery.form/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.form-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.fullscreen/index.d.ts b/jquery.fullscreen/index.d.ts
new file mode 100644
index 0000000000..8831a68cbd
--- /dev/null
+++ b/jquery.fullscreen/index.d.ts
@@ -0,0 +1,57 @@
+// Type definitions for jquery.fullscreen
+// Project: https://github.com/private-face/jquery.fullscreen
+// Definitions by: Piraveen Kamalathas <https://github.com/piraveen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+/**
+ * Extends jQuery interface
+ * i.e: To use $elem.fullscreen()
+ */
+interface JQuery {
+	fullscreen(options?: Object): void;
+}
+
+/**
+ * Interface for the jquery plugin
+ */
+interface JQueryFullscreen {
+	/**
+	 * [open Activate fullscreen mode in a specific element through static method]
+	 * @param {Element} element [description]
+	 * @param {Object}  options [description]
+	 */
+	open(element: Element, options?: Object): void;
+
+	/**
+	 * [close Deactivate fullscreen mode]
+	 * TODO: have to check for params
+	 */
+	close(): void;
+
+	/**
+	 * [isFullScreen Get fullscreen status]
+	 * @return {boolean} [description]
+	 */
+	isFullScreen(): boolean;
+
+	/**
+	 * [isNativelySupported Check if fullscreen is supported by the browser]
+	 * @return {boolean} [description]
+	 */
+	isNativelySupported(): boolean;
+
+	/**
+	 * [exit Deactivate and destroy all fullscreen instances]
+	 */
+	exit(): void;
+}
+
+/**
+ * Extends JqueryStatic ($)
+ * i.e: To use $.fullscreen.functionName()
+ */
+interface JQueryStatic {
+	fullscreen: JQueryFullscreen;
+}
diff --git a/jquery.fullscreen/jquery.fullscreen-tests.ts b/jquery.fullscreen/jquery.fullscreen-tests.ts
index 39d686a873..4dc2147359 100644
--- a/jquery.fullscreen/jquery.fullscreen-tests.ts
+++ b/jquery.fullscreen/jquery.fullscreen-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="jquery.fullscreen.d.ts"/>
-
 //
 // Examples from https://github.com/kayahr/jquery-fullscreen-plugin
 //
diff --git a/jquery.fullscreen/jquery.fullscreen.d.ts b/jquery.fullscreen/jquery.fullscreen.d.ts
deleted file mode 100644
index 7ee5b43e1d..0000000000
--- a/jquery.fullscreen/jquery.fullscreen.d.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-// Type definitions for jquery.fullscreen
-// Project: https://github.com/private-face/jquery.fullscreen
-// Definitions by: Piraveen Kamalathas <https://github.com/piraveen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-/**
- * Extends jQuery interface
- * i.e: To use $elem.fullscreen()
- */
-interface JQuery {
-	fullscreen(options?: Object): void;
-}
-
-/**
- * Interface for the jquery plugin
- */
-interface JQueryFullscreen {
-	/**
-	 * [open Activate fullscreen mode in a specific element through static method]
-	 * @param {Element} element [description]
-	 * @param {Object}  options [description]
-	 */
-	open(element: Element, options?: Object): void;
-
-	/**
-	 * [close Deactivate fullscreen mode]
-	 * TODO: have to check for params
-	 */
-	close(): void;
-
-	/**
-	 * [isFullScreen Get fullscreen status]
-	 * @return {boolean} [description]
-	 */
-	isFullScreen(): boolean;
-
-	/**
-	 * [isNativelySupported Check if fullscreen is supported by the browser]
-	 * @return {boolean} [description]
-	 */
-	isNativelySupported(): boolean;
-
-	/**
-	 * [exit Deactivate and destroy all fullscreen instances]
-	 */
-	exit(): void;
-}
-
-/**
- * Extends JqueryStatic ($)
- * i.e: To use $.fullscreen.functionName()
- */
-interface JQueryStatic {
-	fullscreen: JQueryFullscreen;
-}
diff --git a/jquery.fullscreen/tsconfig.json b/jquery.fullscreen/tsconfig.json
new file mode 100644
index 0000000000..ca002c900b
--- /dev/null
+++ b/jquery.fullscreen/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.fullscreen-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.gridster/gridster-tests.ts b/jquery.gridster/gridster-tests.ts
index 99edbb9a82..4dc3e3f27e 100644
--- a/jquery.gridster/gridster-tests.ts
+++ b/jquery.gridster/gridster-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="gridster.d.ts" />
+
 
 interface SerializeData {
 	x?: number;
diff --git a/jquery.gridster/gridster.d.ts b/jquery.gridster/gridster.d.ts
deleted file mode 100644
index 75150f409d..0000000000
--- a/jquery.gridster/gridster.d.ts
+++ /dev/null
@@ -1,306 +0,0 @@
-// Type definitions for jQuery.gridster 0.5.6
-// Project: https://github.com/jbaldwin/gridster
-// Definitions by: Josh Baldwin <https://github.com/jbaldwin>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/*
-gridster-0.1.0.d.ts may be freely distributed under the MIT license.
-
-Copyright (c) 2013 Josh Baldwin https://github.com/jbaldwin/gridster.d.ts
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation 
-files (the "Software"), to deal in the Software without 
-restriction, including without limitation the rights to use, 
-copy, modify, merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom the 
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be 
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 
-OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface GridsterDraggable {
-	items?: any;
-	distance?: number;
-	limit?: boolean;
-	offset_left?: number;
-	handle?: string;
-	drag?: (event: Event, ui: GridsterUi) => void;
-	start?: (event: Event, ui: { helper: JQuery; }) => void;
-	stop?: (event: Event, ui: { helper: JQuery; }) => void;
-}
-
-interface GridsterResizable {
-    enabled?: boolean;
-    axes?: string[];
-    handle_append_to?: string;
-    handle_class?: string;
-    max_size?: number[];
-    min_size?: number[];
-    resize?: (event: Event, ui: GridsterUi, $el: JQuery) => void;
-    start?: (event: Event, ui: { helper: JQuery; }, $el: JQuery) => void;
-    stop?: (event: Event, ui: { helper: JQuery; }, $el: JQuery) => void;
-}
-
-interface GridsterUi {
-	position: {
-		left: number;
-		top: number;
-	};
-}
-
-interface GridsterCollision {
-	on_overlap_start: (data: GridsterCollisionData) => void;
-	on_overlap_stop: (data: GridsterCollisionData) => void;
-	on_overlap: (data: GridsterCollisionData) => void;
-}
-
-interface GridsterCollisionData {
-	area: number;
-	area_coords: GridsterCoords;
-	region: string;
-	coords: GridsterCoords;
-	player_coords: GridsterCoords;
-	el: HTMLElement;
-}
-
-interface GridsterCoords {
-	col: number;
-	row: number;
-	size_x: number;
-	size_y: number;
-}
-
-interface GridsterOptions {
-
-	/**
-	* Define who will be the draggable widgets.  Can be a CSS Selector String or a collection of HTMLElements.
-	* Type => string css selector
-	* Type => HTMLElement[]
-	* Default = 'li'
-	**/
-	widget_selector?: string|HTMLElement[];
-
-	/**
-	* Margin between widgets.  The first index for the horizontal margin (left, right) and the second for the vertical margin (top, bottom).
-	* Default = [10, 10]
-	**/
-	widget_margins?: number[];
-
-	/**
-	* Base widget dimensions in pixels.  The first index for the width and the second for the height.
-	* Default = [400, 225]
-	**/
-	widget_base_dimensions?: number[];
-
-	/**
-	* Add more columns in addition to those that have been calculated.
-	* Default = 0
-	**/
-	extra_cols?: number;
-
-	/**
-	* Add more rows in addition to those that have been calculated.
-	* Default = 0
-	**/
-	extra_rows?: number;
-
-	/**
-	* The minimum required columns.
-	* Default = 1
-	**/
-	min_cols?: number;
-
-	/**
-	* The maximum columns possible (set to null for no maximum).
-	* Default = null
-	**/
-	max_cols?: number;
-
-	/**
-	* The minimum required rows.
-	* Default = 15
-	**/
-	min_rows?: number;
-
-	/**
-	* The maximum number of columns that a widget can span.
-	* Default = 6
-	**/
-	max_size_x?: number;
-
-	/**
-	* If true, all the CSS required to  osition  	l widgets in their respective col umns and rows will be generated automatically and injectedt the<head> of thed cument.You can set this to false, and write your own CSS targeting rows and cols via data - attributes like so: [data - col = "1"] { left: 10px; }
-	* Default = true
-	**/
-	autogenerate_sytesheet?: boolean;
-
-	/**
-	* Avoid that widgets loaded from the DOM can be overlapped.  It is helpful if the positions were bad stored in the database or if there was any conflict.
-	* Default = true
-	**/
-	avoid_overlapped_widgets?: boolean;
-
-	/**
-	* Return the data you want for each widget in the serialization.
-	**/
-	serialize_params?: ($w: JQuery, wgd: GridsterCoords) => any;
-
-	/**
-	* An object with all options for Collision class you want to overwrite.  @see GridsterCollision or docs for more info.
-	**/
-	collision?: GridsterCollision;
-
-	/**
-	* An object with all options for Draggable class you want to overwrite.  @see GridsterDraggable or docs for more info.
-	**/
-	draggable?: GridsterDraggable;
-
-	/**
-	* A string to differentiate one gridster from another
-	**/
-	namespace?: string;
-
-    /**
-     * A boolean to specify if the stylesheet should be generated or not
-     **/
-    autogenerate_stylesheet?: boolean;
-
-    /**
-     * An object with all options for Resizable class you want to overwrite.  @see GridsterResizable or docs for more info.
-     **/
-    resize?: GridsterResizable;
-}
-
-interface JQuery {
-
-	/**
-	* Gridster
-	* @param options An object with all the gridster options you want to overwrite.
-	* @return Gridster jQuery instance.
-	**/
-	gridster(options?: GridsterOptions): JQuery;
-}
-
-interface Gridster {
-
-	/**
-	* Create a new widget with the given html and add it to the grid.
-	* @param html The string representing the HTML of the widget or the HTMLElement.
-	* @param size_x The number of rows the widget occupies horizontally.  Defaults to 1.
-	* @param size_y The number of columns the widget occupies vertically.  Defaults to 1.
-	* @param col The column the widget should start in.
-	* @param row The row the widget should start in.
-	* @return Returns the jQuery wrapped HTMLElement representing the widget that was just created.
-	**/
-	add_widget(html: string, size_x?: number, size_y?: number, col?: number, row?: number): JQuery;
-
-	/**
-	* @see add_widget
-	**/
-	add_widget(html: HTMLElement, size_x?: number, size_y?: number, col?: number, row?: number): JQuery;
-
-	/**
-	* @see add_widget
-	**/
-	add_widget(html: JQuery, size_x?: number, size_y?: number, col?: number, row?: number): JQuery;
-
-    /**
-     * Get the highest occupied cell.
-     * @return Returns the farthest position {row: number, col: number} occupied in the grid.
-     **/
-    get_highest_occupied_cell(): GridsterCoords;
-
-	/**
-	* Change the size of a widget.
-	* @param $widget The jQuery wrapped HTMLElement that represents the widget is going to be resized.
-	* @param size_x The number of rows that the widget is going to span.  Defaults to current size_x.
-	* @param size_y The number of columns that the widget is going to span.  Defaults to current size_y.
-	* @param callback Callback function wehn the widget is finished resizing.
-	* @return Returns $widget.
-	**/
-	resize_widget($widget: JQuery, size_x?: number, size_y?: number, callback?: (size_x: number, size_y: number) => void): JQuery;
-
-
-    /**
-     * Resize all the widgets in the grid.
-     * @param options The options to use to resize the widgets.
-     * @return Returns the instance of the Gridster class.
-     **/
-    resize_widget_dimensions(options: GridsterOptions): Gridster;
-
-	/**
-	* Remove a widget from the grid.
-	* @param el The jQuery wrapped HTMLElement you want to remove.
-	* @param silent Boolean If true widgets below the removed one will not move up.
-	* @param callback Callback function executed when the widget is removed.
-	* @return Returns the instance of the Gridster class.
-	**/
-	remove_widget(el: HTMLElement, silent?: boolean, callback?: (el: HTMLElement) => void): Gridster;
-
-	/**
-	* @see remove_widget
-	**/
-	remove_widget(el: HTMLElement, callback: (el: HTMLElement) => void): Gridster;
-
-	/**
-	* @see remove_widget
-	**/
-	remove_widget(el: JQuery, silent?: boolean, callback?: (el: HTMLElement) => void): Gridster;
-
-	/**
-	* @see remove_widget
-	**/
-	remove_widget(el: JQuery, callback: (el: HTMLElement) => void): Gridster;
-
-    /**
-     * Resize a widget in the grid.
-     * @param widget The index of the widget to be resized.
-     * @param size An array representing the size (x, y) to set on the widget.
-     * @return Returns the instance of the Gridster class.
-     **/
-    set_widget_min_size(widget: number, size: number[]): Gridster;
-
-	/**
-	* Returns a serialized array of the widgets in the grid.
-	* @param $widgets The collection of jQuery wrap ed HTMLElements you want to serialize.  If no argument is passed a l widgets will be serialized.
-	* @return Returns an array of objects with the data specified in the serialized_params option.
-	**/
-	serialize<T>($widgets?: HTMLElement[]): T[];
-
-	/**
-	* Returns a serialized array of the widgets that have changed their position.
-	* @return Returns an array of objects with the data specified in the serialized_params option.
-	**/
-	serialize_changed<T>(): T[];
-
-	/**
-	* Enables dragging.
-	* @return Returns the instance of the Gridster class.
-	**/
-	enable(): Gridster;
-	
-	/**
-	* Disables dragging.
-	* @return Returns the instance of the Gridster class.
-	**/
-	disable(): Gridster;
-
-    /**
-    * Returns the options used to initialize the grid
-    * @return Returns the options used to initialize the grid
-    **/
-    options: GridsterOptions;
-}
diff --git a/jquery.gridster/index.d.ts b/jquery.gridster/index.d.ts
new file mode 100644
index 0000000000..305788190b
--- /dev/null
+++ b/jquery.gridster/index.d.ts
@@ -0,0 +1,306 @@
+// Type definitions for jQuery.gridster 0.5.6
+// Project: https://github.com/jbaldwin/gridster
+// Definitions by: Josh Baldwin <https://github.com/jbaldwin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*
+gridster-0.1.0.d.ts may be freely distributed under the MIT license.
+
+Copyright (c) 2013 Josh Baldwin https://github.com/jbaldwin/gridster.d.ts
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation 
+files (the "Software"), to deal in the Software without 
+restriction, including without limitation the rights to use, 
+copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the 
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be 
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 
+OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+/// <reference types="jquery"/>
+
+interface GridsterDraggable {
+	items?: any;
+	distance?: number;
+	limit?: boolean;
+	offset_left?: number;
+	handle?: string;
+	drag?: (event: Event, ui: GridsterUi) => void;
+	start?: (event: Event, ui: { helper: JQuery; }) => void;
+	stop?: (event: Event, ui: { helper: JQuery; }) => void;
+}
+
+interface GridsterResizable {
+    enabled?: boolean;
+    axes?: string[];
+    handle_append_to?: string;
+    handle_class?: string;
+    max_size?: number[];
+    min_size?: number[];
+    resize?: (event: Event, ui: GridsterUi, $el: JQuery) => void;
+    start?: (event: Event, ui: { helper: JQuery; }, $el: JQuery) => void;
+    stop?: (event: Event, ui: { helper: JQuery; }, $el: JQuery) => void;
+}
+
+interface GridsterUi {
+	position: {
+		left: number;
+		top: number;
+	};
+}
+
+interface GridsterCollision {
+	on_overlap_start: (data: GridsterCollisionData) => void;
+	on_overlap_stop: (data: GridsterCollisionData) => void;
+	on_overlap: (data: GridsterCollisionData) => void;
+}
+
+interface GridsterCollisionData {
+	area: number;
+	area_coords: GridsterCoords;
+	region: string;
+	coords: GridsterCoords;
+	player_coords: GridsterCoords;
+	el: HTMLElement;
+}
+
+interface GridsterCoords {
+	col: number;
+	row: number;
+	size_x: number;
+	size_y: number;
+}
+
+interface GridsterOptions {
+
+	/**
+	* Define who will be the draggable widgets.  Can be a CSS Selector String or a collection of HTMLElements.
+	* Type => string css selector
+	* Type => HTMLElement[]
+	* Default = 'li'
+	**/
+	widget_selector?: string|HTMLElement[];
+
+	/**
+	* Margin between widgets.  The first index for the horizontal margin (left, right) and the second for the vertical margin (top, bottom).
+	* Default = [10, 10]
+	**/
+	widget_margins?: number[];
+
+	/**
+	* Base widget dimensions in pixels.  The first index for the width and the second for the height.
+	* Default = [400, 225]
+	**/
+	widget_base_dimensions?: number[];
+
+	/**
+	* Add more columns in addition to those that have been calculated.
+	* Default = 0
+	**/
+	extra_cols?: number;
+
+	/**
+	* Add more rows in addition to those that have been calculated.
+	* Default = 0
+	**/
+	extra_rows?: number;
+
+	/**
+	* The minimum required columns.
+	* Default = 1
+	**/
+	min_cols?: number;
+
+	/**
+	* The maximum columns possible (set to null for no maximum).
+	* Default = null
+	**/
+	max_cols?: number;
+
+	/**
+	* The minimum required rows.
+	* Default = 15
+	**/
+	min_rows?: number;
+
+	/**
+	* The maximum number of columns that a widget can span.
+	* Default = 6
+	**/
+	max_size_x?: number;
+
+	/**
+	* If true, all the CSS required to  osition  	l widgets in their respective col umns and rows will be generated automatically and injectedt the<head> of thed cument.You can set this to false, and write your own CSS targeting rows and cols via data - attributes like so: [data - col = "1"] { left: 10px; }
+	* Default = true
+	**/
+	autogenerate_sytesheet?: boolean;
+
+	/**
+	* Avoid that widgets loaded from the DOM can be overlapped.  It is helpful if the positions were bad stored in the database or if there was any conflict.
+	* Default = true
+	**/
+	avoid_overlapped_widgets?: boolean;
+
+	/**
+	* Return the data you want for each widget in the serialization.
+	**/
+	serialize_params?: ($w: JQuery, wgd: GridsterCoords) => any;
+
+	/**
+	* An object with all options for Collision class you want to overwrite.  @see GridsterCollision or docs for more info.
+	**/
+	collision?: GridsterCollision;
+
+	/**
+	* An object with all options for Draggable class you want to overwrite.  @see GridsterDraggable or docs for more info.
+	**/
+	draggable?: GridsterDraggable;
+
+	/**
+	* A string to differentiate one gridster from another
+	**/
+	namespace?: string;
+
+    /**
+     * A boolean to specify if the stylesheet should be generated or not
+     **/
+    autogenerate_stylesheet?: boolean;
+
+    /**
+     * An object with all options for Resizable class you want to overwrite.  @see GridsterResizable or docs for more info.
+     **/
+    resize?: GridsterResizable;
+}
+
+interface JQuery {
+
+	/**
+	* Gridster
+	* @param options An object with all the gridster options you want to overwrite.
+	* @return Gridster jQuery instance.
+	**/
+	gridster(options?: GridsterOptions): JQuery;
+}
+
+interface Gridster {
+
+	/**
+	* Create a new widget with the given html and add it to the grid.
+	* @param html The string representing the HTML of the widget or the HTMLElement.
+	* @param size_x The number of rows the widget occupies horizontally.  Defaults to 1.
+	* @param size_y The number of columns the widget occupies vertically.  Defaults to 1.
+	* @param col The column the widget should start in.
+	* @param row The row the widget should start in.
+	* @return Returns the jQuery wrapped HTMLElement representing the widget that was just created.
+	**/
+	add_widget(html: string, size_x?: number, size_y?: number, col?: number, row?: number): JQuery;
+
+	/**
+	* @see add_widget
+	**/
+	add_widget(html: HTMLElement, size_x?: number, size_y?: number, col?: number, row?: number): JQuery;
+
+	/**
+	* @see add_widget
+	**/
+	add_widget(html: JQuery, size_x?: number, size_y?: number, col?: number, row?: number): JQuery;
+
+    /**
+     * Get the highest occupied cell.
+     * @return Returns the farthest position {row: number, col: number} occupied in the grid.
+     **/
+    get_highest_occupied_cell(): GridsterCoords;
+
+	/**
+	* Change the size of a widget.
+	* @param $widget The jQuery wrapped HTMLElement that represents the widget is going to be resized.
+	* @param size_x The number of rows that the widget is going to span.  Defaults to current size_x.
+	* @param size_y The number of columns that the widget is going to span.  Defaults to current size_y.
+	* @param callback Callback function wehn the widget is finished resizing.
+	* @return Returns $widget.
+	**/
+	resize_widget($widget: JQuery, size_x?: number, size_y?: number, callback?: (size_x: number, size_y: number) => void): JQuery;
+
+
+    /**
+     * Resize all the widgets in the grid.
+     * @param options The options to use to resize the widgets.
+     * @return Returns the instance of the Gridster class.
+     **/
+    resize_widget_dimensions(options: GridsterOptions): Gridster;
+
+	/**
+	* Remove a widget from the grid.
+	* @param el The jQuery wrapped HTMLElement you want to remove.
+	* @param silent Boolean If true widgets below the removed one will not move up.
+	* @param callback Callback function executed when the widget is removed.
+	* @return Returns the instance of the Gridster class.
+	**/
+	remove_widget(el: HTMLElement, silent?: boolean, callback?: (el: HTMLElement) => void): Gridster;
+
+	/**
+	* @see remove_widget
+	**/
+	remove_widget(el: HTMLElement, callback: (el: HTMLElement) => void): Gridster;
+
+	/**
+	* @see remove_widget
+	**/
+	remove_widget(el: JQuery, silent?: boolean, callback?: (el: HTMLElement) => void): Gridster;
+
+	/**
+	* @see remove_widget
+	**/
+	remove_widget(el: JQuery, callback: (el: HTMLElement) => void): Gridster;
+
+    /**
+     * Resize a widget in the grid.
+     * @param widget The index of the widget to be resized.
+     * @param size An array representing the size (x, y) to set on the widget.
+     * @return Returns the instance of the Gridster class.
+     **/
+    set_widget_min_size(widget: number, size: number[]): Gridster;
+
+	/**
+	* Returns a serialized array of the widgets in the grid.
+	* @param $widgets The collection of jQuery wrap ed HTMLElements you want to serialize.  If no argument is passed a l widgets will be serialized.
+	* @return Returns an array of objects with the data specified in the serialized_params option.
+	**/
+	serialize<T>($widgets?: HTMLElement[]): T[];
+
+	/**
+	* Returns a serialized array of the widgets that have changed their position.
+	* @return Returns an array of objects with the data specified in the serialized_params option.
+	**/
+	serialize_changed<T>(): T[];
+
+	/**
+	* Enables dragging.
+	* @return Returns the instance of the Gridster class.
+	**/
+	enable(): Gridster;
+	
+	/**
+	* Disables dragging.
+	* @return Returns the instance of the Gridster class.
+	**/
+	disable(): Gridster;
+
+    /**
+    * Returns the options used to initialize the grid
+    * @return Returns the options used to initialize the grid
+    **/
+    options: GridsterOptions;
+}
diff --git a/jquery.gridster/tsconfig.json b/jquery.gridster/tsconfig.json
new file mode 100644
index 0000000000..fa6e72cf4a
--- /dev/null
+++ b/jquery.gridster/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "gridster-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.highlight-bartaz/index.d.ts b/jquery.highlight-bartaz/index.d.ts
new file mode 100644
index 0000000000..26fbb1e40a
--- /dev/null
+++ b/jquery.highlight-bartaz/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for jquery.highlight.js
+// Project: https://github.com/bartaz/sandbox.js/blob/master/jquery.highlight.js
+// Definitions by: Stefan Profanter <https://github.com/Pro/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+///<reference types="jquery" />
+
+interface JQuery {
+	unhighlight(options?: {
+		element?: string,
+		className?: string
+	}): JQuery;
+	highlight(words: string | string[], options?: {
+		element?: string,
+		className?: string
+		caseSensitive?: boolean,
+		wordsOnly?: boolean
+	}): JQuery;
+}
diff --git a/jquery.highlight-bartaz/jquery.highlight-bartaz-tests.ts b/jquery.highlight-bartaz/jquery.highlight-bartaz-tests.ts
index 90d60e83fd..39c1f9d28a 100644
--- a/jquery.highlight-bartaz/jquery.highlight-bartaz-tests.ts
+++ b/jquery.highlight-bartaz/jquery.highlight-bartaz-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jquery.highlight-bartaz.d.ts" />
+
 
 
 
diff --git a/jquery.highlight-bartaz/jquery.highlight-bartaz.d.ts b/jquery.highlight-bartaz/jquery.highlight-bartaz.d.ts
deleted file mode 100644
index d2492eb2fb..0000000000
--- a/jquery.highlight-bartaz/jquery.highlight-bartaz.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Type definitions for jquery.highlight.js
-// Project: https://github.com/bartaz/sandbox.js/blob/master/jquery.highlight.js
-// Definitions by: Stefan Profanter <https://github.com/Pro/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-///<reference path="../jquery/jquery.d.ts" />
-
-interface JQuery {
-	unhighlight(options?: {
-		element?: string,
-		className?: string
-	}): JQuery;
-	highlight(words: string | string[], options?: {
-		element?: string,
-		className?: string
-		caseSensitive?: boolean,
-		wordsOnly?: boolean
-	}): JQuery;
-}
diff --git a/jquery.highlight-bartaz/tsconfig.json b/jquery.highlight-bartaz/tsconfig.json
new file mode 100644
index 0000000000..67abeeeb63
--- /dev/null
+++ b/jquery.highlight-bartaz/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.highlight-bartaz-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.jnotify/index.d.ts b/jquery.jnotify/index.d.ts
new file mode 100644
index 0000000000..d85fceb054
--- /dev/null
+++ b/jquery.jnotify/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for jQuery.jNotify 1.0
+// Project: http://jnotify.codeplex.com
+// Definitions by: James Curran <https://github.com/jamescurran/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Project by: Fabio Franzini
+
+/// <reference types="jquery"/>
+
+interface JNotifyInitOptions {
+    oneAtTime?: boolean;
+    appendType?: string;
+}
+
+interface JNotifyOptions {
+    text?: string;
+    type?: string;
+    showIcon?: boolean;
+    permanent?: boolean;
+    disappearTime?: number;
+}
+
+interface JQuery {
+    jnotifyInizialize(options?: JNotifyInitOptions);
+    jnotifyAddMessage(options?: JNotifyOptions);
+}
diff --git a/jquery.jnotify/jquery.jnotify-tests.ts b/jquery.jnotify/jquery.jnotify-tests.ts
index f1eefd6adb..b5ad3927e2 100644
--- a/jquery.jnotify/jquery.jnotify-tests.ts
+++ b/jquery.jnotify/jquery.jnotify-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path='../jquery/jquery.d.ts'/>
-/// <reference path='jquery.jnotify.d.ts'/>
+/// <reference types="jquery"/>
 
 $(document).ready(function () {
     $('#StatusBar').jnotifyInizialize({
diff --git a/jquery.jnotify/jquery.jnotify-tests.ts.tscparams b/jquery.jnotify/jquery.jnotify-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jquery.jnotify/jquery.jnotify-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jquery.jnotify/jquery.jnotify.d.ts b/jquery.jnotify/jquery.jnotify.d.ts
deleted file mode 100644
index 02141e714d..0000000000
--- a/jquery.jnotify/jquery.jnotify.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-// Type definitions for jQuery.jNotify 1.0
-// Project: http://jnotify.codeplex.com
-// Definitions by: James Curran <https://github.com/jamescurran/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Project by: Fabio Franzini
-
-/// <reference path='../jquery/jquery.d.ts'/>
-
-interface JNotifyInitOptions {
-    oneAtTime?: boolean;
-    appendType?: string;
-}
-
-interface JNotifyOptions {
-    text?: string;
-    type?: string;
-    showIcon?: boolean;
-    permanent?: boolean;
-    disappearTime?: number;
-}
-
-interface JQuery {
-    jnotifyInizialize(options?: JNotifyInitOptions);
-    jnotifyAddMessage(options?: JNotifyOptions);
-}
diff --git a/jquery.jnotify/jquery.jnotify.d.ts.tscparams b/jquery.jnotify/jquery.jnotify.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jquery.jnotify/jquery.jnotify.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jquery.jnotify/tsconfig.json b/jquery.jnotify/tsconfig.json
new file mode 100644
index 0000000000..d831983b6e
--- /dev/null
+++ b/jquery.jnotify/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.jnotify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.joyride/index.d.ts b/jquery.joyride/index.d.ts
new file mode 100644
index 0000000000..ee918d83c0
--- /dev/null
+++ b/jquery.joyride/index.d.ts
@@ -0,0 +1,273 @@
+// Type definitions for jQuery JoyRide Plugin 2.1
+// Project: https://github.com/zurb/joyride
+// Definitions by: Vincent Bortone <https://github.com/vbortone/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+/**
+* HTML segments for tip layout
+*/
+interface JoyrideTemplate {
+	/**
+	* Link template
+	* @member {string}
+	*/
+	link?: string;
+
+	/**
+	* Timer template
+	* @member {string}
+	*/
+	timer?: string;
+
+	/**
+	* Tip template
+	* @member {string}
+	*/
+	tip?: string;    
+
+	/**
+	* Wrapper template
+	* @member {string}
+	*/
+	wrapper?: string;
+
+	/**
+	* Button template
+	* @member {string}
+	*/
+	button?: string;
+
+	/**
+	* Modal template
+	* @member {string}
+	*/
+	modal?: string;
+
+	/**
+	* Exposed Cover template
+	* @member {string}
+	*/
+	exposeCover?: string;
+}
+
+interface JoyrideOptions {
+	/**
+	* Version
+	* @member {string}
+	*/
+	version?: string;
+
+	/** 
+	* 'top' or 'bottom' in relation to parent
+	* @member {string}
+	*/
+	tipLocation?: string;
+
+	/**
+	* override on a per tooltip bases
+	* @member {any}
+	*/
+	nubPosition?: any;
+
+	/**
+	* whether to scroll to tips
+	* @member {boolean}
+	*/
+	scroll?: boolean;
+
+	/**
+	* Page scrolling speed in ms
+	* @member {number}
+	*/
+	scrollSpeed?: number;
+
+	/**
+	* 0 = off, all other numbers = time(ms)
+	* @member {number}
+	*/
+	timer?: number;
+
+	/**
+	* true or false - false tour starts when restart called
+	* @member {boolean}
+	*/
+	autoStart?: boolean;
+
+	/**
+	* true/false to start timer on first click
+	* @member {boolean}
+	*/
+	startTimerOnClick?: boolean;
+
+	/**
+	* the index of the tooltip you want to start on (index of the li)
+	* @member {number}
+	*/
+	startOffset?: number;
+
+	/**
+	* true/false for next button visibility
+	* @member {boolean}
+	*/
+	nextButton?: boolean;
+
+	/**
+	* 'pop' or 'fade' in each tip
+	* @member {string}
+	*/
+	tipAnimation?: string;
+
+	/**
+	* array of indexes where to pause the tour after
+	* @member {any[]}
+	*/
+	pauseAfter?: any[];
+
+	/**
+	* if 'fade'- speed in ms of transition
+	* @member {number}
+	*/
+	tipAnimationFadeSpeed?: number;
+
+	/**
+	* true/false for whether cookies are used
+	* @member {boolean}
+	*/
+	cookieMonster?: boolean;
+
+	/**
+	* choose your own cookie name
+	* member {string}
+	*/
+	cookieName?: string;
+
+	/**
+	* Will this cookie be attached to a domain, ie. '.notableapp.com'
+	* @member {any}
+	*/
+	cookieDomain?: any;
+
+	/**
+	* Set to '/' if you want the cookie for the whole website
+	* @member {any}
+	*/
+	cookiePath?: any;
+
+	/**
+	* true or false to control whether localstorage is used
+	* @member {boolean}
+	*/
+	localStorage?: boolean;
+
+	/**
+	* Keyname in localstorage
+	@member {string}
+	*/
+	localStorageKey?: string;
+
+	/**
+	* Where the tip be attached if not inline
+	* @member {HTMLElement}
+	*/
+	tipContainer?: HTMLElement;
+
+	/**
+	* Whether to cover page with modal during the tour
+	* @member {boolean}
+	*/
+	modal?: boolean;
+
+	/**
+	*  Whether to expose the elements at each step in the tour (requires modal:true)
+	* @member {boolean}
+	*/
+	expose?: boolean;
+
+	/**
+	* A method to call after an element has been exposed
+	* @method
+	* @param {number} index Tip Index
+	* @param {JQuery} nextTip Tip object
+	* @param {JQuery} el Element
+	*/
+	postExposeCallback?: (index: number, nextTip: JQuery, el?: JQuery) => void;
+
+	/**
+	* A method to call before the tour starts (passed index, tip, and cloned exposed element)
+	* @method
+	* @param {number} index Current Tip Index
+	* @param {JQuery} currentTip Current Tip object
+	* @param {JQuery} el Element
+	*/
+	preRideCallback?: (index: number, currentTip: JQuery, el?: JQuery) => void;
+
+	/**
+	* a method to call once the tour closes
+	* @method
+	* @param {number} index Current Tip Index
+	* @param {JQuery} currentTip Current Tip object
+	* @param {boolean} isAborted Is Aborted?
+	*/
+	postRideCallback?: (index: number, currentTip: JQuery, isAborted?: boolean) => void;
+
+	/**
+	* A method to call after each step
+	* @method
+	* @param {number} index Current Tip Index
+	* @param {JQuery} currentTip Current Tip object
+	* @param {boolean} isAborted Is Aborted?
+	*/
+	postStepCallback?: (index: number, currentTip: JQuery, isAborted?: boolean) => void;
+
+	/**
+	* A method to call before each step
+	* @method
+	* @param {number} index Tip Index
+	* @param {JQuery} nextTip Tip object
+	* @param {JQuery} el Element
+	*/
+	preStepCallback?: (index: number, nextTip: JQuery, el?: JQuery) => void;
+
+	/**
+	* HTML segments for tip layout
+	* @member {JoyrideTemplate}
+	*/
+	template?: JoyrideTemplate;
+}
+
+interface Joyride
+{
+	/**
+	* Default function, no options
+	* @method
+	* @return {JQuery} JQuery instance
+	*/
+	(): JQuery;
+
+	/**
+	* Function with options
+	* @method
+	* @param {JoyrideOptions} options An object with all the joyride options you want to overwrite.
+	* @return {JQuery} JQuery instance
+	*/
+	(options: JoyrideOptions): JQuery;
+
+	/**
+	* Function with method name and params
+	* @method
+	* @param {string} methodName Name of method to call.
+	* @param {any[]} params parameters for method
+	* @return {JQuery} JQuery instance
+	*/
+	(methodName: string, ...params: any[]): JQuery;
+}
+
+interface JQuery {
+	/**
+	* joyride function
+	* @return {Joyride} Joyride instance.
+	*/
+	joyride: Joyride;
+}
\ No newline at end of file
diff --git a/jquery.joyride/jquery.joyride-tests.ts b/jquery.joyride/jquery.joyride-tests.ts
index ea79c9e50a..f0a51b5270 100644
--- a/jquery.joyride/jquery.joyride-tests.ts
+++ b/jquery.joyride/jquery.joyride-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="jquery.joyride.d.ts" />
+/// <reference types="jquery" />
+
 
 var options: JoyrideOptions;
 options.autoStart = true;
diff --git a/jquery.joyride/jquery.joyride.d.ts b/jquery.joyride/jquery.joyride.d.ts
deleted file mode 100644
index 328a38fd1f..0000000000
--- a/jquery.joyride/jquery.joyride.d.ts
+++ /dev/null
@@ -1,273 +0,0 @@
-// Type definitions for jQuery JoyRide Plugin 2.1
-// Project: https://github.com/zurb/joyride
-// Definitions by: Vincent Bortone <https://github.com/vbortone/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-/**
-* HTML segments for tip layout
-*/
-interface JoyrideTemplate {
-	/**
-	* Link template
-	* @member {string}
-	*/
-	link?: string;
-
-	/**
-	* Timer template
-	* @member {string}
-	*/
-	timer?: string;
-
-	/**
-	* Tip template
-	* @member {string}
-	*/
-	tip?: string;    
-
-	/**
-	* Wrapper template
-	* @member {string}
-	*/
-	wrapper?: string;
-
-	/**
-	* Button template
-	* @member {string}
-	*/
-	button?: string;
-
-	/**
-	* Modal template
-	* @member {string}
-	*/
-	modal?: string;
-
-	/**
-	* Exposed Cover template
-	* @member {string}
-	*/
-	exposeCover?: string;
-}
-
-interface JoyrideOptions {
-	/**
-	* Version
-	* @member {string}
-	*/
-	version?: string;
-
-	/** 
-	* 'top' or 'bottom' in relation to parent
-	* @member {string}
-	*/
-	tipLocation?: string;
-
-	/**
-	* override on a per tooltip bases
-	* @member {any}
-	*/
-	nubPosition?: any;
-
-	/**
-	* whether to scroll to tips
-	* @member {boolean}
-	*/
-	scroll?: boolean;
-
-	/**
-	* Page scrolling speed in ms
-	* @member {number}
-	*/
-	scrollSpeed?: number;
-
-	/**
-	* 0 = off, all other numbers = time(ms)
-	* @member {number}
-	*/
-	timer?: number;
-
-	/**
-	* true or false - false tour starts when restart called
-	* @member {boolean}
-	*/
-	autoStart?: boolean;
-
-	/**
-	* true/false to start timer on first click
-	* @member {boolean}
-	*/
-	startTimerOnClick?: boolean;
-
-	/**
-	* the index of the tooltip you want to start on (index of the li)
-	* @member {number}
-	*/
-	startOffset?: number;
-
-	/**
-	* true/false for next button visibility
-	* @member {boolean}
-	*/
-	nextButton?: boolean;
-
-	/**
-	* 'pop' or 'fade' in each tip
-	* @member {string}
-	*/
-	tipAnimation?: string;
-
-	/**
-	* array of indexes where to pause the tour after
-	* @member {any[]}
-	*/
-	pauseAfter?: any[];
-
-	/**
-	* if 'fade'- speed in ms of transition
-	* @member {number}
-	*/
-	tipAnimationFadeSpeed?: number;
-
-	/**
-	* true/false for whether cookies are used
-	* @member {boolean}
-	*/
-	cookieMonster?: boolean;
-
-	/**
-	* choose your own cookie name
-	* member {string}
-	*/
-	cookieName?: string;
-
-	/**
-	* Will this cookie be attached to a domain, ie. '.notableapp.com'
-	* @member {any}
-	*/
-	cookieDomain?: any;
-
-	/**
-	* Set to '/' if you want the cookie for the whole website
-	* @member {any}
-	*/
-	cookiePath?: any;
-
-	/**
-	* true or false to control whether localstorage is used
-	* @member {boolean}
-	*/
-	localStorage?: boolean;
-
-	/**
-	* Keyname in localstorage
-	@member {string}
-	*/
-	localStorageKey?: string;
-
-	/**
-	* Where the tip be attached if not inline
-	* @member {HTMLElement}
-	*/
-	tipContainer?: HTMLElement;
-
-	/**
-	* Whether to cover page with modal during the tour
-	* @member {boolean}
-	*/
-	modal?: boolean;
-
-	/**
-	*  Whether to expose the elements at each step in the tour (requires modal:true)
-	* @member {boolean}
-	*/
-	expose?: boolean;
-
-	/**
-	* A method to call after an element has been exposed
-	* @method
-	* @param {number} index Tip Index
-	* @param {JQuery} nextTip Tip object
-	* @param {JQuery} el Element
-	*/
-	postExposeCallback?: (index: number, nextTip: JQuery, el?: JQuery) => void;
-
-	/**
-	* A method to call before the tour starts (passed index, tip, and cloned exposed element)
-	* @method
-	* @param {number} index Current Tip Index
-	* @param {JQuery} currentTip Current Tip object
-	* @param {JQuery} el Element
-	*/
-	preRideCallback?: (index: number, currentTip: JQuery, el?: JQuery) => void;
-
-	/**
-	* a method to call once the tour closes
-	* @method
-	* @param {number} index Current Tip Index
-	* @param {JQuery} currentTip Current Tip object
-	* @param {boolean} isAborted Is Aborted?
-	*/
-	postRideCallback?: (index: number, currentTip: JQuery, isAborted?: boolean) => void;
-
-	/**
-	* A method to call after each step
-	* @method
-	* @param {number} index Current Tip Index
-	* @param {JQuery} currentTip Current Tip object
-	* @param {boolean} isAborted Is Aborted?
-	*/
-	postStepCallback?: (index: number, currentTip: JQuery, isAborted?: boolean) => void;
-
-	/**
-	* A method to call before each step
-	* @method
-	* @param {number} index Tip Index
-	* @param {JQuery} nextTip Tip object
-	* @param {JQuery} el Element
-	*/
-	preStepCallback?: (index: number, nextTip: JQuery, el?: JQuery) => void;
-
-	/**
-	* HTML segments for tip layout
-	* @member {JoyrideTemplate}
-	*/
-	template?: JoyrideTemplate;
-}
-
-interface Joyride
-{
-	/**
-	* Default function, no options
-	* @method
-	* @return {JQuery} JQuery instance
-	*/
-	(): JQuery;
-
-	/**
-	* Function with options
-	* @method
-	* @param {JoyrideOptions} options An object with all the joyride options you want to overwrite.
-	* @return {JQuery} JQuery instance
-	*/
-	(options: JoyrideOptions): JQuery;
-
-	/**
-	* Function with method name and params
-	* @method
-	* @param {string} methodName Name of method to call.
-	* @param {any[]} params parameters for method
-	* @return {JQuery} JQuery instance
-	*/
-	(methodName: string, ...params: any[]): JQuery;
-}
-
-interface JQuery {
-	/**
-	* joyride function
-	* @return {Joyride} Joyride instance.
-	*/
-	joyride: Joyride;
-}
\ No newline at end of file
diff --git a/jquery.joyride/tsconfig.json b/jquery.joyride/tsconfig.json
new file mode 100644
index 0000000000..39636856c4
--- /dev/null
+++ b/jquery.joyride/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.joyride-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.jsignature/index.d.ts b/jquery.jsignature/index.d.ts
new file mode 100644
index 0000000000..bec78605e1
--- /dev/null
+++ b/jquery.jsignature/index.d.ts
@@ -0,0 +1,46 @@
+// Type definitions for jQuery.jsignature v2
+// Project: https://github.com/willowsystems/jSignature
+// Definitions by: Patrick Magee <https://github.com/pjmagee>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Project by: Willow Systems Corp
+
+/// <reference types="jquery"/>
+
+interface JQuery {
+
+    /** 
+     * inits the jSignature widget
+     */
+    jSignature(): JQuery;
+    
+    /**
+     * Arguments vary per command. When provided, command is expected to be a string with a command for jSignature. Commands supported at this time: init, reset, getData, setData, listPlugins
+     * @summary
+     * init is the default, assumed action. init takes one argument - a settings Object. You can omit the command and just pass the settings object in upon init. Returns (in a traditional jQuery chainable way) jQuery object ref to the element onto which the plugin was applied.
+     * clear (also aliased as reset) clears the signature pad, data store (and puts back signature line and other decor). Returns (in a traditional jQuery chainable way) jQuery object ref to the element onto which the plugin was applied.
+     * getData takes an argument - the name of the data format. Returns a data object appropriate for the data format.
+     * setData (also aliased as importData) takes two arguments - data object, (optional) data format name. When data object is a string formatted in data-url pattern you don't need to specify the data dormat name. The data format name (mime) will be implied from the data-url prefix. Returns (in a traditional jQuery chainable way) jQuery object ref to the element onto which the plugin was applied.
+     * listPlugins takes an argument - a string denoting the category (Only export, import supported at this time) of plugins to list. Returns an array of strings.
+     *
+     * @param command the command used to perform an action on the jSignature canvas
+     * @see http://willowsystems.github.io/jSignature/#/about/
+     *
+     */
+    jSignature(command: string): any;
+
+    /**
+     * Arguments vary per command. When provided, command is expected to be a string with a command for jSignature. Commands supported at this time: init, reset, getData, setData, listPlugins
+     * @summary
+     * init is the default, assumed action. init takes one argument - a settings Object. You can omit the command and just pass the settings object in upon init. Returns (in a traditional jQuery chainable way) jQuery object ref to the element onto which the plugin was applied.
+     * clear (also aliased as reset) clears the signature pad, data store (and puts back signature line and other decor). Returns (in a traditional jQuery chainable way) jQuery object ref to the element onto which the plugin was applied.
+     * getData takes an argument - the name of the data format. Returns a data object appropriate for the data format.
+     * setData (also aliased as importData) takes two arguments - data object, (optional) data format name. When data object is a string formatted in data-url pattern you don't need to specify the data dormat name. The data format name (mime) will be implied from the data-url prefix. Returns (in a traditional jQuery chainable way) jQuery object ref to the element onto which the plugin was applied.
+     * listPlugins takes an argument - a string denoting the category (Only export, import supported at this time) of plugins to list. Returns an array of strings.
+     *
+     * @param command the command used to perform an action on the jSignature canvas
+     * @param arg the argument used with the specified command
+     * @see http://willowsystems.github.io/jSignature/#/about/
+     *
+     */
+    jSignature(command: string, ...arg: string[]): any;
+}
diff --git a/jquery.jsignature/jquery.jsignature-tests.ts b/jquery.jsignature/jquery.jsignature-tests.ts
index b7e9631a50..5ec4bc486d 100644
--- a/jquery.jsignature/jquery.jsignature-tests.ts
+++ b/jquery.jsignature/jquery.jsignature-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path='../jquery/jquery.d.ts'/>
-/// <reference path='jquery.jsignature.d.ts'/>
+/// <reference types="jquery"/>
 
 /*
  * Taken from the tests section on jSignature
diff --git a/jquery.jsignature/jquery.jsignature.d.ts b/jquery.jsignature/jquery.jsignature.d.ts
deleted file mode 100644
index 1aa5a11633..0000000000
--- a/jquery.jsignature/jquery.jsignature.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// Type definitions for jQuery.jsignature v2
-// Project: https://github.com/willowsystems/jSignature
-// Definitions by: Patrick Magee <https://github.com/pjmagee>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Project by: Willow Systems Corp
-
-/// <reference path='../jquery/jquery.d.ts'/>
-
-interface JQuery {
-
-    /** 
-     * inits the jSignature widget
-     */
-    jSignature(): JQuery;
-    
-    /**
-     * Arguments vary per command. When provided, command is expected to be a string with a command for jSignature. Commands supported at this time: init, reset, getData, setData, listPlugins
-     * @summary
-     * init is the default, assumed action. init takes one argument - a settings Object. You can omit the command and just pass the settings object in upon init. Returns (in a traditional jQuery chainable way) jQuery object ref to the element onto which the plugin was applied.
-     * clear (also aliased as reset) clears the signature pad, data store (and puts back signature line and other decor). Returns (in a traditional jQuery chainable way) jQuery object ref to the element onto which the plugin was applied.
-     * getData takes an argument - the name of the data format. Returns a data object appropriate for the data format.
-     * setData (also aliased as importData) takes two arguments - data object, (optional) data format name. When data object is a string formatted in data-url pattern you don't need to specify the data dormat name. The data format name (mime) will be implied from the data-url prefix. Returns (in a traditional jQuery chainable way) jQuery object ref to the element onto which the plugin was applied.
-     * listPlugins takes an argument - a string denoting the category (Only export, import supported at this time) of plugins to list. Returns an array of strings.
-     *
-     * @param command the command used to perform an action on the jSignature canvas
-     * @see http://willowsystems.github.io/jSignature/#/about/
-     *
-     */
-    jSignature(command: string): any;
-
-    /**
-     * Arguments vary per command. When provided, command is expected to be a string with a command for jSignature. Commands supported at this time: init, reset, getData, setData, listPlugins
-     * @summary
-     * init is the default, assumed action. init takes one argument - a settings Object. You can omit the command and just pass the settings object in upon init. Returns (in a traditional jQuery chainable way) jQuery object ref to the element onto which the plugin was applied.
-     * clear (also aliased as reset) clears the signature pad, data store (and puts back signature line and other decor). Returns (in a traditional jQuery chainable way) jQuery object ref to the element onto which the plugin was applied.
-     * getData takes an argument - the name of the data format. Returns a data object appropriate for the data format.
-     * setData (also aliased as importData) takes two arguments - data object, (optional) data format name. When data object is a string formatted in data-url pattern you don't need to specify the data dormat name. The data format name (mime) will be implied from the data-url prefix. Returns (in a traditional jQuery chainable way) jQuery object ref to the element onto which the plugin was applied.
-     * listPlugins takes an argument - a string denoting the category (Only export, import supported at this time) of plugins to list. Returns an array of strings.
-     *
-     * @param command the command used to perform an action on the jSignature canvas
-     * @param arg the argument used with the specified command
-     * @see http://willowsystems.github.io/jSignature/#/about/
-     *
-     */
-    jSignature(command: string, ...arg: string[]): any;
-}
diff --git a/jquery.jsignature/tsconfig.json b/jquery.jsignature/tsconfig.json
new file mode 100644
index 0000000000..8f6bdda1e6
--- /dev/null
+++ b/jquery.jsignature/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.jsignature-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.leanModal/index.d.ts b/jquery.leanModal/index.d.ts
new file mode 100644
index 0000000000..e0c2f7f707
--- /dev/null
+++ b/jquery.leanModal/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for leanModal.js 1.1
+// Project: http://leanmodal.finelysliced.com.au/
+// Definitions by: FinelySliced <https://github.com/FinelySliced>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="jquery" />
+
+interface JQueryLeanModalOption {
+    top? : number;
+    overlay? : number;
+    closeButton? : String;
+}
+
+interface JQueryStatic {
+    leanModal(): JQuery;
+    leanModal(val : JQueryLeanModalOption): JQuery;
+}
+
+interface JQuery {
+    leanModal(): JQuery;
+    leanModal(val : JQueryLeanModalOption): JQuery;
+}
\ No newline at end of file
diff --git a/jquery.leanModal/jquery.leanModal-tests.ts b/jquery.leanModal/jquery.leanModal-tests.ts
index e785d2a4bf..fb6c4ae344 100644
--- a/jquery.leanModal/jquery.leanModal-tests.ts
+++ b/jquery.leanModal/jquery.leanModal-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="jquery.leanModal.d.ts" />
+/// <reference types="jquery" />
+
 
 class LeanModalOptions implements JQueryLeanModalOption {
     top : number;
diff --git a/jquery.leanModal/jquery.leanModal.d.ts b/jquery.leanModal/jquery.leanModal.d.ts
deleted file mode 100644
index a192ffa171..0000000000
--- a/jquery.leanModal/jquery.leanModal.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// Type definitions for leanModal.js 1.1
-// Project: http://leanmodal.finelysliced.com.au/
-// Definitions by: FinelySliced <https://github.com/FinelySliced>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../jquery/jquery.d.ts" />
-
-interface JQueryLeanModalOption {
-    top? : number;
-    overlay? : number;
-    closeButton? : String;
-}
-
-interface JQueryStatic {
-    leanModal(): JQuery;
-    leanModal(val : JQueryLeanModalOption): JQuery;
-}
-
-interface JQuery {
-    leanModal(): JQuery;
-    leanModal(val : JQueryLeanModalOption): JQuery;
-}
\ No newline at end of file
diff --git a/jquery.leanModal/tsconfig.json b/jquery.leanModal/tsconfig.json
new file mode 100644
index 0000000000..c2776b960e
--- /dev/null
+++ b/jquery.leanModal/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.leanModal-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.livestampjs/index.d.ts b/jquery.livestampjs/index.d.ts
new file mode 100644
index 0000000000..4a63ee0157
--- /dev/null
+++ b/jquery.livestampjs/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for Livestamp.js
+// Project: http://mattbradley.github.com/livestampjs/
+// Definitions by: Vincent Bortone <https://github.com/vbortone/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// A simple, unobtrusive jQuery plugin that provides auto-updating timeago text to your timestamped HTML elements using Moment.js.
+
+/// <reference types="jquery"/>
+
+import * as moment from '../moment';
+
+export as namespace LivestampGlobal;
+
+export = LivestampGlobal;
+
+interface LivestampGlobal {
+	update(): void;
+	pause(): void;
+	resume(): void;
+	interval(): number;
+	interval(interval: number): void;
+}
+
+declare global {
+	interface JQueryStatic {
+		livestamp: LivestampGlobal;
+	}
+
+	interface JQuery {
+		livestamp(date: Date): JQuery;
+		livestamp(moment: moment.Moment): JQuery;
+		livestamp(timestamp: number): JQuery;
+		livestamp(timestamp: string): JQuery;
+	}
+}
diff --git a/jquery.livestampjs/jquery.livestampjs-tests.ts b/jquery.livestampjs/jquery.livestampjs-tests.ts
index 72dc968cbc..bfa3937f97 100644
--- a/jquery.livestampjs/jquery.livestampjs-tests.ts
+++ b/jquery.livestampjs/jquery.livestampjs-tests.ts
@@ -1,7 +1,5 @@
-// Tests for Livestamp.js type definitions
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="../moment/moment.d.ts"/>
-/// <reference path="jquery.livestampjs.d.ts"/>
+/// <reference types="jquery"/>
+/// <reference types="moment"/>
 
 $('#test1').livestamp(new Date('June 18, 1987'));
 $('#test2').livestamp(1362282933);
diff --git a/jquery.livestampjs/jquery.livestampjs.d.ts b/jquery.livestampjs/jquery.livestampjs.d.ts
deleted file mode 100644
index 0a9a74678d..0000000000
--- a/jquery.livestampjs/jquery.livestampjs.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Type definitions for Livestamp.js
-// Project: http://mattbradley.github.com/livestampjs/
-// Definitions by: Vincent Bortone <https://github.com/vbortone/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// A simple, unobtrusive jQuery plugin that provides auto-updating timeago text to your timestamped HTML elements using Moment.js.
-
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="../moment/moment.d.ts"/>
-
-interface LivestampGlobal {
-	update(): void;
-	pause(): void;
-	resume(): void;
-	interval(): number;
-	interval(interval: number): void;
-}
-
-interface JQueryStatic {
-	livestamp: LivestampGlobal;
-}
-
-interface JQuery {
-	livestamp(date: Date): JQuery;
-	livestamp(moment: moment.Moment): JQuery;
-	livestamp(timestamp: number): JQuery;
-	livestamp(timestamp: string): JQuery;
-}
diff --git a/jquery.livestampjs/tsconfig.json b/jquery.livestampjs/tsconfig.json
new file mode 100644
index 0000000000..db57cc87de
--- /dev/null
+++ b/jquery.livestampjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.livestampjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.menuaim/index.d.ts b/jquery.menuaim/index.d.ts
new file mode 100644
index 0000000000..623374fa3c
--- /dev/null
+++ b/jquery.menuaim/index.d.ts
@@ -0,0 +1,65 @@
+// Type definitions for jQuery-menu-aim
+// Project: https://github.com/kamens/jQuery-menu-aim
+// Definitions by: Robert Fonseca-Ensor <http://www.robfe.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface JQueryMenuAimOptions {
+    /** Function to call when a row is purposefully activated. Use this
+    * to show a submenu's content for the activated row.
+    */
+    activate? (): void;
+
+    /** Function to call when a row is deactivated.
+    */
+    deactivate? (): void;
+
+    /** Function to call when mouse enters a menu row. Entering a row
+    * does not mean the row has been activated, as the user may be
+    * mousing over to a submenu.
+    */
+    enter? (): void;
+
+    /** Function to call when mouse exits a menu row.
+    */
+    exit? (): void;
+
+    /** Function to call when mouse exits the entire menu. If this returns
+    * true, the current row's deactivation event and callback function
+    * will be fired. Otherwise, if this isn't supplied or it returns
+    * false, the currently activated row will stay activated when the
+    * mouse leaves the menu entirely.
+    */
+    exitMenu? (): void;
+
+    /** Selector for identifying which elements in the menu are rows
+    * that can trigger the above events. Defaults to "> li".
+    * rowSelector: "> li",
+    */
+    rowSelector?: string;
+
+    /** You may have some menu rows that aren't submenus and therefore
+    * shouldn't ever need to "activate." If so, filter submenu rows w/
+    * this selector. Defaults to "*" (all elements).
+    * submenuSelector: "*",
+    */
+    submenuSelector?: string;
+
+    /** Direction the submenu opens relative to the main menu. This
+    * controls which direction is "forgiving" as the user moves their
+    * cursor from the main menu into the submenu. Can be one of "right",
+    * "left", "above", or "below". Defaults to "right".
+    * submenuDirection: "right"
+    */
+    submenuDirection?: string;
+}
+
+interface JQuery {
+    /** Dropdown menus that can differentiate between a user trying hover over a dropdown item vs trying to navigate into a submenu's contents.
+     * @author Ben Kamens
+     * https://github.com/kamens/jQuery-menu-aim
+     */
+    menuAim(options: JQueryMenuAimOptions): JQuery;
+}
+
diff --git a/jquery.menuaim/jquery.menuaim-tests.ts b/jquery.menuaim/jquery.menuaim-tests.ts
index 9c4b7cbdb7..d1f83e322e 100644
--- a/jquery.menuaim/jquery.menuaim-tests.ts
+++ b/jquery.menuaim/jquery.menuaim-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="jquery.menuaim.d.ts" />
+/// <reference types="jquery" />
+
 $('div').menuAim({
     activate: function () { },
     deactivate: function () { },
diff --git a/jquery.menuaim/jquery.menuaim.d.ts b/jquery.menuaim/jquery.menuaim.d.ts
deleted file mode 100644
index 5b833a6b9d..0000000000
--- a/jquery.menuaim/jquery.menuaim.d.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-// Type definitions for jQuery-menu-aim
-// Project: https://github.com/kamens/jQuery-menu-aim
-// Definitions by: Robert Fonseca-Ensor <http://www.robfe.com/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface JQueryMenuAimOptions {
-    /** Function to call when a row is purposefully activated. Use this
-    * to show a submenu's content for the activated row.
-    */
-    activate? (): void;
-
-    /** Function to call when a row is deactivated.
-    */
-    deactivate? (): void;
-
-    /** Function to call when mouse enters a menu row. Entering a row
-    * does not mean the row has been activated, as the user may be
-    * mousing over to a submenu.
-    */
-    enter? (): void;
-
-    /** Function to call when mouse exits a menu row.
-    */
-    exit? (): void;
-
-    /** Function to call when mouse exits the entire menu. If this returns
-    * true, the current row's deactivation event and callback function
-    * will be fired. Otherwise, if this isn't supplied or it returns
-    * false, the currently activated row will stay activated when the
-    * mouse leaves the menu entirely.
-    */
-    exitMenu? (): void;
-
-    /** Selector for identifying which elements in the menu are rows
-    * that can trigger the above events. Defaults to "> li".
-    * rowSelector: "> li",
-    */
-    rowSelector?: string;
-
-    /** You may have some menu rows that aren't submenus and therefore
-    * shouldn't ever need to "activate." If so, filter submenu rows w/
-    * this selector. Defaults to "*" (all elements).
-    * submenuSelector: "*",
-    */
-    submenuSelector?: string;
-
-    /** Direction the submenu opens relative to the main menu. This
-    * controls which direction is "forgiving" as the user moves their
-    * cursor from the main menu into the submenu. Can be one of "right",
-    * "left", "above", or "below". Defaults to "right".
-    * submenuDirection: "right"
-    */
-    submenuDirection?: string;
-}
-
-interface JQuery {
-    /** Dropdown menus that can differentiate between a user trying hover over a dropdown item vs trying to navigate into a submenu's contents.
-     * @author Ben Kamens
-     * https://github.com/kamens/jQuery-menu-aim
-     */
-    menuAim(options: JQueryMenuAimOptions): JQuery;
-}
-
diff --git a/jquery.menuaim/tsconfig.json b/jquery.menuaim/tsconfig.json
new file mode 100644
index 0000000000..35ce8b97d2
--- /dev/null
+++ b/jquery.menuaim/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.menuaim-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.mmenu/index.d.ts b/jquery.mmenu/index.d.ts
new file mode 100644
index 0000000000..9c27bdb530
--- /dev/null
+++ b/jquery.mmenu/index.d.ts
@@ -0,0 +1,242 @@
+// Type definitions for jQuery mmenu v5.5.3
+// Project: http://mmenu.frebsite.nl/
+// Definitions by: John Gouigouix <https://github.com/orchestra-ts/DefinitelyTyped/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+declare namespace JQueryMmenu {
+
+    interface NavbarOptions {
+
+        /**
+         * Whether or not to add a navbar above the panels.
+         * Default: true
+         */
+        add?: boolean;
+
+        /**
+         * The title above the main panel.
+         * Default: "Menu"
+         */
+        title?: string;
+
+        /**
+         * The type of link to set for the title.
+         * Possible values: "parent", "anchor" or "none".
+         * Default: "parent"
+         */
+        titleLink?: string;
+
+    }
+
+    interface OnclickOptions {
+
+        /**
+         * Whether or not the menu should close after clicking a link inside it.
+         * The default value varies per link: true if the default behavior for
+         * the clicked link is prevented, false otherwise.
+         * Default: null
+         */
+        close?: boolean | any;
+
+        /**
+         * Whether or not to prevent the default behavior for the clicked link.
+         * The default value varies per link: true if its href is equal to
+         * or starts with a hash (#), false otherwise.
+         * Default: null
+         */
+        preventDefault?: boolean | any;
+
+        /**
+         * Whether or not the clicked link should be visibly "selected".
+         * Default: true
+         */
+        setSelected?: boolean | any;
+
+    }
+
+    interface Options {
+
+        /**
+         * A collection of extension names to enable for the menu.
+         * You'll need this option when using the extensions.
+         * Default: []
+         */
+        extensions?: Array<Object>;
+
+        /**
+         * navbar options
+         */
+        navbar?: NavbarOptions;
+
+        /**
+         * onClick options
+         */
+        onClick?: OnclickOptions;
+
+        /**
+         * Whether or not submenus should come sliding in from the right.
+         * If false, submenus expand below their parent.
+         * To expand a single submenu below its parent item, add the class "Vertical" to it.
+         * Default: true
+         */
+        slidingSubmenus?: boolean;
+
+    }
+
+    interface ClassnamesConfigurations {
+
+        /**
+         * The classname on a LI that should be displayed as a divider.
+         * Default: "Divider"
+         */
+        divider?: string;
+
+        /**
+         * The classname on a submenu (a nested UL) that should be displayed as a default list.
+         * Default: "Inset"
+         */
+        inset?: string;
+
+        /**
+         * The classname on an element (for example a DIV) that should be considered to be a panel.
+         * Only applies if the "isMenu" option is set to false.
+         * Default: "Panel"
+         */
+        panel?: string;
+
+        /**
+         * The classname on the LI that should be displayed as selected.
+         * Default: "Selected"
+         */
+        selected?: string;
+
+        /**
+         * The classname on a submenu (a nested UL) that should expand below
+         * their parent instead of slide in from the right.
+         * Default: "vertical"
+         */
+        vertical?: string;
+
+    }
+
+    interface Configurations {
+
+        /**
+         * the CSS class names object
+         */
+        classNames?: ClassnamesConfigurations;
+
+        /**
+         * Whether or not the menu should be cloned (and the original menu kept intact).
+         * Default: false
+         */
+        clone?: boolean;
+
+        /**
+         * The number of milliseconds between opening/closing the menu and panels,
+         * needed to force CSS transitions.
+         * Default: 25
+         */
+        openingInterval?: number;
+
+        /**
+         * jQuery selector containing the node-type of panels.
+         * Default: "div, ul, ol"
+         */
+        panelNodetype?: string;
+
+        /**
+         * The number of milliseconds used in the CSS transitions.
+         * Default: 400 (The value should match the associated CSS value.)
+         */
+        transitionDuration?: number;
+
+    }
+
+    interface API {
+
+        /**
+         * Trigger non-specialized signature method
+         * @param methodName
+         * @param callback
+         */
+        bind(methodName: string, callback: (...args: any[]) => void): any;
+
+        /**
+         * Trigger this method to close all opened panels and go back to the first panel.
+         */
+        closeAllPanels(): JQuery;
+        /** @see closeAllPanels() */
+        bind(methodName: "closeAllPanels", callback: () => void): JQuery;
+
+        /**
+         * Trigger this method to close a panel
+         * (only available if the "slidingSubmenus" option is set to false).
+         * @param panel
+         */
+        closePanel(panel: JQuery): void;
+        /** @see closePanel() */
+        bind(methodName: "closePanel", callback: (panel: JQuery) => void): void;
+
+        /**
+         * Trigger this method to get the class instance for the menu.
+         */
+        getInstance(): void;
+        /** @see getInstance() */
+        bind(methodName: "getInstance", callback: () => void): void;
+
+        /**
+         * Trigger this method to (re)initialize a newly added panel.
+         * @param panel The panel to (re)initialize.
+         */
+        init(panel: JQuery): void;
+        /** @see init() */
+        bind(methodName: "init", callback: (panel: JQuery) => void): void;
+
+        /**
+         * Trigger this method to open a panel.
+         * @param panel The panel to open.
+         */
+        openPanel(panel: JQuery): void;
+        /** @see openPanel() */
+        bind(methodName: "openPanel", callback: (panel: JQuery) => void): void;
+
+        /**
+         * Trigger this method to set or unset a list item as "selected".
+         * @param li The list item to set or unset as "selected".
+         * @param selected Whether to set or unset the list item as "selected". Default: true
+         */
+        setSelected(li: JQuery, selected?: boolean): void;
+        /** @see setSelected() */
+        bind(methodName: "setSelected", callback: (li: JQuery, selected?: boolean) => void): void;
+
+        /**
+         * Trigger this method to update the appearance for the menu.
+         */
+        update(): void;
+        /** @see update() */
+        bind(methodName: "update", callback: () => void): void;
+
+    }
+
+}
+
+
+interface JQuery {
+
+    /**
+     * Create mmenu component
+     */
+    mmenu(): JQuery;
+    mmenu(options: JQueryMmenu.Options): JQuery;
+    mmenu(options: JQueryMmenu.Options, configurations: JQueryMmenu.Configurations): JQuery;
+
+    /**
+     * Return the mmenu object
+     * @param element
+     */
+    data(element: "mmenu"): JQueryMmenu.API;
+
+}
diff --git a/jquery.mmenu/jquery.mmenu-tests.ts b/jquery.mmenu/jquery.mmenu-tests.ts
index ae52793d62..385f479507 100644
--- a/jquery.mmenu/jquery.mmenu-tests.ts
+++ b/jquery.mmenu/jquery.mmenu-tests.ts
@@ -1,5 +1,5 @@
-///<reference path="../jquery/jquery.d.ts" />
-///<reference path="../jquery.mmenu/jquery.mmenu.d.ts" />
+///<reference types="jquery" />
+///<reference types="jquery.mmenu" />
 
 
 // --------------------------------------------------------
diff --git a/jquery.mmenu/jquery.mmenu.d.ts b/jquery.mmenu/jquery.mmenu.d.ts
deleted file mode 100644
index f88e89ca26..0000000000
--- a/jquery.mmenu/jquery.mmenu.d.ts
+++ /dev/null
@@ -1,242 +0,0 @@
-// Type definitions for jQuery mmenu v5.5.3
-// Project: http://mmenu.frebsite.nl/
-// Definitions by: John Gouigouix <https://github.com/orchestra-ts/DefinitelyTyped/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-declare namespace JQueryMmenu {
-
-    interface NavbarOptions {
-
-        /**
-         * Whether or not to add a navbar above the panels.
-         * Default: true
-         */
-        add?: boolean;
-
-        /**
-         * The title above the main panel.
-         * Default: "Menu"
-         */
-        title?: string;
-
-        /**
-         * The type of link to set for the title.
-         * Possible values: "parent", "anchor" or "none".
-         * Default: "parent"
-         */
-        titleLink?: string;
-
-    }
-
-    interface OnclickOptions {
-
-        /**
-         * Whether or not the menu should close after clicking a link inside it.
-         * The default value varies per link: true if the default behavior for
-         * the clicked link is prevented, false otherwise.
-         * Default: null
-         */
-        close?: boolean | any;
-
-        /**
-         * Whether or not to prevent the default behavior for the clicked link.
-         * The default value varies per link: true if its href is equal to
-         * or starts with a hash (#), false otherwise.
-         * Default: null
-         */
-        preventDefault?: boolean | any;
-
-        /**
-         * Whether or not the clicked link should be visibly "selected".
-         * Default: true
-         */
-        setSelected?: boolean | any;
-
-    }
-
-    interface Options {
-
-        /**
-         * A collection of extension names to enable for the menu.
-         * You'll need this option when using the extensions.
-         * Default: []
-         */
-        extensions?: Array<Object>;
-
-        /**
-         * navbar options
-         */
-        navbar?: NavbarOptions;
-
-        /**
-         * onClick options
-         */
-        onClick?: OnclickOptions;
-
-        /**
-         * Whether or not submenus should come sliding in from the right.
-         * If false, submenus expand below their parent.
-         * To expand a single submenu below its parent item, add the class "Vertical" to it.
-         * Default: true
-         */
-        slidingSubmenus?: boolean;
-
-    }
-
-    interface ClassnamesConfigurations {
-
-        /**
-         * The classname on a LI that should be displayed as a divider.
-         * Default: "Divider"
-         */
-        divider?: string;
-
-        /**
-         * The classname on a submenu (a nested UL) that should be displayed as a default list.
-         * Default: "Inset"
-         */
-        inset?: string;
-
-        /**
-         * The classname on an element (for example a DIV) that should be considered to be a panel.
-         * Only applies if the "isMenu" option is set to false.
-         * Default: "Panel"
-         */
-        panel?: string;
-
-        /**
-         * The classname on the LI that should be displayed as selected.
-         * Default: "Selected"
-         */
-        selected?: string;
-
-        /**
-         * The classname on a submenu (a nested UL) that should expand below
-         * their parent instead of slide in from the right.
-         * Default: "vertical"
-         */
-        vertical?: string;
-
-    }
-
-    interface Configurations {
-
-        /**
-         * the CSS class names object
-         */
-        classNames?: ClassnamesConfigurations;
-
-        /**
-         * Whether or not the menu should be cloned (and the original menu kept intact).
-         * Default: false
-         */
-        clone?: boolean;
-
-        /**
-         * The number of milliseconds between opening/closing the menu and panels,
-         * needed to force CSS transitions.
-         * Default: 25
-         */
-        openingInterval?: number;
-
-        /**
-         * jQuery selector containing the node-type of panels.
-         * Default: "div, ul, ol"
-         */
-        panelNodetype?: string;
-
-        /**
-         * The number of milliseconds used in the CSS transitions.
-         * Default: 400 (The value should match the associated CSS value.)
-         */
-        transitionDuration?: number;
-
-    }
-
-    interface API {
-
-        /**
-         * Trigger non-specialized signature method
-         * @param methodName
-         * @param callback
-         */
-        bind(methodName: string, callback: (...args: any[]) => void): any;
-
-        /**
-         * Trigger this method to close all opened panels and go back to the first panel.
-         */
-        closeAllPanels(): JQuery;
-        /** @see closeAllPanels() */
-        bind(methodName: "closeAllPanels", callback: () => void): JQuery;
-
-        /**
-         * Trigger this method to close a panel
-         * (only available if the "slidingSubmenus" option is set to false).
-         * @param panel
-         */
-        closePanel(panel: JQuery): void;
-        /** @see closePanel() */
-        bind(methodName: "closePanel", callback: (panel: JQuery) => void): void;
-
-        /**
-         * Trigger this method to get the class instance for the menu.
-         */
-        getInstance(): void;
-        /** @see getInstance() */
-        bind(methodName: "getInstance", callback: () => void): void;
-
-        /**
-         * Trigger this method to (re)initialize a newly added panel.
-         * @param panel The panel to (re)initialize.
-         */
-        init(panel: JQuery): void;
-        /** @see init() */
-        bind(methodName: "init", callback: (panel: JQuery) => void): void;
-
-        /**
-         * Trigger this method to open a panel.
-         * @param panel The panel to open.
-         */
-        openPanel(panel: JQuery): void;
-        /** @see openPanel() */
-        bind(methodName: "openPanel", callback: (panel: JQuery) => void): void;
-
-        /**
-         * Trigger this method to set or unset a list item as "selected".
-         * @param li The list item to set or unset as "selected".
-         * @param selected Whether to set or unset the list item as "selected". Default: true
-         */
-        setSelected(li: JQuery, selected?: boolean): void;
-        /** @see setSelected() */
-        bind(methodName: "setSelected", callback: (li: JQuery, selected?: boolean) => void): void;
-
-        /**
-         * Trigger this method to update the appearance for the menu.
-         */
-        update(): void;
-        /** @see update() */
-        bind(methodName: "update", callback: () => void): void;
-
-    }
-
-}
-
-
-interface JQuery {
-
-    /**
-     * Create mmenu component
-     */
-    mmenu(): JQuery;
-    mmenu(options: JQueryMmenu.Options): JQuery;
-    mmenu(options: JQueryMmenu.Options, configurations: JQueryMmenu.Configurations): JQuery;
-
-    /**
-     * Return the mmenu object
-     * @param element
-     */
-    data(element: "mmenu"): JQueryMmenu.API;
-
-}
diff --git a/jquery.mmenu/tsconfig.json b/jquery.mmenu/tsconfig.json
new file mode 100644
index 0000000000..555a915ae7
--- /dev/null
+++ b/jquery.mmenu/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.mmenu-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.notifyBar/index.d.ts b/jquery.notifyBar/index.d.ts
new file mode 100644
index 0000000000..f1e500d420
--- /dev/null
+++ b/jquery.notifyBar/index.d.ts
@@ -0,0 +1,106 @@
+// Type definitions for jQuery Notify Bar 1.4
+// Project: http://www.whoop.ee/posts/2013-04-05-the-resurrection-of-jquery-notify-bar/
+// Definitions by: Shunsuke Ohtani <https://github.com/zaneli>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace JQueryNotifyBar {
+
+    interface NotifyBarOptions {
+        /**
+         * What text will be inside bar. Can be HTML or just text.
+         */
+        html?: string;
+
+        /**
+         * How long bar will be delayed, doesn't count animation time.
+         */
+        delay?: number;
+
+        /**
+         * How long this bar will be slided up and down.
+         *
+         * Default: "normal"
+         */
+        animationSpeed?: string | number;
+
+        /**
+         * Custom jQuery object for notify bar.
+         */
+        jqObject?: JQuery;
+
+        /**
+         * You can define own CSS class for Notify bar. There are too premade classes "error", "warning" and "success".
+         */
+        cssClass?: string;
+
+        /**
+         * If set to true close button will be displayed.
+         */
+        close?: boolean;
+
+        /**
+         * Sets the text to close button.
+         */
+        closeText?: string;
+
+        /**
+         * If enabled, user can hide notify bar just by click on it.
+         */
+        closeOnClick?: boolean;
+
+        /**
+         * If enabled, user can hide notify bar just by moving mouse cursor on it.
+         */
+        closeOnOver?: boolean;
+
+        /**
+         * Callback on before show.
+         */
+        onBeforeShow?: () => any;
+
+        /**
+         * Callback on show.
+         */
+        onShow?: () => any;
+
+        /**
+         * Callback on before hide.
+         */
+        onBeforeHide?: () => any;
+
+        /**
+         * Callback on hide.
+         */
+        onHide?: () => any;
+
+        /**
+         * Set the position of notify bar. Possible values are "top", "bottom".
+         */
+        position?: string;
+    }
+
+    interface NotifyBarOptionsForAnimationSpeedString extends NotifyBarOptions {
+        /**
+         * How long this bar will be slided up and down. Possible values are "slow", "default", "normal", "fast".
+         */
+        animationSpeed?: string;
+    }
+
+    interface NotifyBarOptionsForAnimationSpeedNumber extends NotifyBarOptions {
+        /**
+         * How long this bar will be slided up and down.
+         */
+        animationSpeed?: number;
+    }
+}
+
+interface JQueryStatic {
+    /**
+     * Show notify bar.
+     *
+     * @param options notify bar options
+     */
+    notifyBar(options?: JQueryNotifyBar.NotifyBarOptions): void;
+}
diff --git a/jquery.notifyBar/jquery.notifyBar-tests.ts b/jquery.notifyBar/jquery.notifyBar-tests.ts
index 8338fc8304..e5cb4454c1 100644
--- a/jquery.notifyBar/jquery.notifyBar-tests.ts
+++ b/jquery.notifyBar/jquery.notifyBar-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jquery.notifyBar.d.ts" />
+
 
 $(function() {
     $.notifyBar({
diff --git a/jquery.notifyBar/jquery.notifyBar.d.ts b/jquery.notifyBar/jquery.notifyBar.d.ts
deleted file mode 100644
index 421dadb8ef..0000000000
--- a/jquery.notifyBar/jquery.notifyBar.d.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-// Type definitions for jQuery Notify Bar 1.4
-// Project: http://www.whoop.ee/posts/2013-04-05-the-resurrection-of-jquery-notify-bar/
-// Definitions by: Shunsuke Ohtani <https://github.com/zaneli>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace JQueryNotifyBar {
-
-    interface NotifyBarOptions {
-        /**
-         * What text will be inside bar. Can be HTML or just text.
-         */
-        html?: string;
-
-        /**
-         * How long bar will be delayed, doesn't count animation time.
-         */
-        delay?: number;
-
-        /**
-         * How long this bar will be slided up and down.
-         *
-         * Default: "normal"
-         */
-        animationSpeed?: string | number;
-
-        /**
-         * Custom jQuery object for notify bar.
-         */
-        jqObject?: JQuery;
-
-        /**
-         * You can define own CSS class for Notify bar. There are too premade classes "error", "warning" and "success".
-         */
-        cssClass?: string;
-
-        /**
-         * If set to true close button will be displayed.
-         */
-        close?: boolean;
-
-        /**
-         * Sets the text to close button.
-         */
-        closeText?: string;
-
-        /**
-         * If enabled, user can hide notify bar just by click on it.
-         */
-        closeOnClick?: boolean;
-
-        /**
-         * If enabled, user can hide notify bar just by moving mouse cursor on it.
-         */
-        closeOnOver?: boolean;
-
-        /**
-         * Callback on before show.
-         */
-        onBeforeShow?: () => any;
-
-        /**
-         * Callback on show.
-         */
-        onShow?: () => any;
-
-        /**
-         * Callback on before hide.
-         */
-        onBeforeHide?: () => any;
-
-        /**
-         * Callback on hide.
-         */
-        onHide?: () => any;
-
-        /**
-         * Set the position of notify bar. Possible values are "top", "bottom".
-         */
-        position?: string;
-    }
-
-    interface NotifyBarOptionsForAnimationSpeedString extends NotifyBarOptions {
-        /**
-         * How long this bar will be slided up and down. Possible values are "slow", "default", "normal", "fast".
-         */
-        animationSpeed?: string;
-    }
-
-    interface NotifyBarOptionsForAnimationSpeedNumber extends NotifyBarOptions {
-        /**
-         * How long this bar will be slided up and down.
-         */
-        animationSpeed?: number;
-    }
-}
-
-interface JQueryStatic {
-    /**
-     * Show notify bar.
-     *
-     * @param options notify bar options
-     */
-    notifyBar(options?: JQueryNotifyBar.NotifyBarOptions): void;
-}
diff --git a/jquery.notifyBar/tsconfig.json b/jquery.notifyBar/tsconfig.json
new file mode 100644
index 0000000000..51a4fa2f2f
--- /dev/null
+++ b/jquery.notifyBar/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.notifyBar-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.noty/index.d.ts b/jquery.noty/index.d.ts
new file mode 100644
index 0000000000..85fc2fca4c
--- /dev/null
+++ b/jquery.noty/index.d.ts
@@ -0,0 +1,82 @@
+// Type definitions for jQuery.noty v2.0
+// Project: http://needim.github.io/noty/
+// Definitions by: Aaron King <https://github.com/kingdango/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Project by: Nedim Carter <http://needim.github.io>
+
+/// <reference types="jquery"/>
+
+interface NotyOptions {
+    layout?: string;
+    theme?: string;
+    type?: string;
+    /** Text to show. Can be html or string. */
+    text?: string; 
+    /** If you want to use queue feature set this true. */
+    dismissQueue?: boolean; 
+    /** The note`s optional template like '<div class="noty_message"><span class="noty_text"></span><div class="noty_close"></div></div>' */
+    template?: string; 
+    animation?: NotyAnimationOptions;
+    /** Delay for closing event. Set false for sticky notifications */
+    timeout?: any; 
+    /** Adds notification to the beginning of queue when set to true */
+    force?: boolean; 
+    modal?: boolean;
+    /** You can set max visible notification for dismissQueue true option */
+    maxVisible?: number;
+    /** To close all notifications before show */
+    killer?: boolean;
+    closeWith?: any[];
+    callback?: NotyCallbackOptions;
+    /** An array of buttons or false to hide them */
+    buttons?: any;
+}
+
+interface NotyAnimationOptions {
+	open?: any;
+	close?: any;
+	easing?: string;
+	speed?: number;
+}
+
+interface NotyCallbackOptions {
+	onShow?: Function;
+	afterShow?: Function;
+	onClose?: Function;
+	afterClose?: Function;
+}
+
+interface NotyStatic {
+	(notyOptions: NotyOptions);
+	defaults: NotyOptions;
+
+	get(id: any);
+	close(id: any);
+	clearQueue();
+	closeAll();
+	setText(id: any, text: string);
+	setType(id: any, type: string);
+}
+
+interface Noty {
+    (notyOptions: NotyOptions);
+
+    show();
+    close();
+    setText(text: string);
+    setType(type: string);
+    setTimeout(timeout: number);
+
+    closed: boolean;
+    shown: boolean;
+}
+
+interface JQueryStatic {
+	noty: NotyStatic;
+}
+
+interface JQuery {
+    noty: Noty;
+}
+
+declare var noty: Noty;
diff --git a/jquery.noty/jquery.noty.d.ts b/jquery.noty/jquery.noty.d.ts
deleted file mode 100644
index a1f6d81720..0000000000
--- a/jquery.noty/jquery.noty.d.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-// Type definitions for jQuery.noty v2.0
-// Project: http://needim.github.io/noty/
-// Definitions by: Aaron King <https://github.com/kingdango/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Project by: Nedim Carter <http://needim.github.io>
-
-/// <reference path='../jquery/jquery.d.ts'/>
-
-interface NotyOptions {
-    layout?: string;
-    theme?: string;
-    type?: string;
-    /** Text to show. Can be html or string. */
-    text?: string; 
-    /** If you want to use queue feature set this true. */
-    dismissQueue?: boolean; 
-    /** The note`s optional template like '<div class="noty_message"><span class="noty_text"></span><div class="noty_close"></div></div>' */
-    template?: string; 
-    animation?: NotyAnimationOptions;
-    /** Delay for closing event. Set false for sticky notifications */
-    timeout?: any; 
-    /** Adds notification to the beginning of queue when set to true */
-    force?: boolean; 
-    modal?: boolean;
-    /** You can set max visible notification for dismissQueue true option */
-    maxVisible?: number;
-    /** To close all notifications before show */
-    killer?: boolean;
-    closeWith?: any[];
-    callback?: NotyCallbackOptions;
-    /** An array of buttons or false to hide them */
-    buttons?: any;
-}
-
-interface NotyAnimationOptions {
-	open?: any;
-	close?: any;
-	easing?: string;
-	speed?: number;
-}
-
-interface NotyCallbackOptions {
-	onShow?: Function;
-	afterShow?: Function;
-	onClose?: Function;
-	afterClose?: Function;
-}
-
-interface NotyStatic {
-	(notyOptions: NotyOptions);
-	defaults: NotyOptions;
-
-	get(id: any);
-	close(id: any);
-	clearQueue();
-	closeAll();
-	setText(id: any, text: string);
-	setType(id: any, type: string);
-}
-
-interface Noty {
-    (notyOptions: NotyOptions);
-
-    show();
-    close();
-    setText(text: string);
-    setType(type: string);
-    setTimeout(timeout: number);
-
-    closed: boolean;
-    shown: boolean;
-}
-
-interface JQueryStatic {
-	noty: NotyStatic;
-}
-
-interface JQuery {
-    noty: Noty;
-}
-
-declare var noty: Noty;
diff --git a/jquery.noty/jquery.noty.d.ts.tscparams b/jquery.noty/jquery.noty.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jquery.noty/jquery.noty.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jquery.noty/tsconfig.json b/jquery.noty/tsconfig.json
new file mode 100644
index 0000000000..af6755830c
--- /dev/null
+++ b/jquery.noty/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.payment/jquery.payment.d.ts b/jquery.payment/index.d.ts
similarity index 100%
rename from jquery.payment/jquery.payment.d.ts
rename to jquery.payment/index.d.ts
diff --git a/jquery.payment/tsconfig.json b/jquery.payment/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/jquery.payment/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.pjax.falsandtru/index.d.ts b/jquery.pjax.falsandtru/index.d.ts
new file mode 100644
index 0000000000..e302996914
--- /dev/null
+++ b/jquery.pjax.falsandtru/index.d.ts
@@ -0,0 +1,189 @@
+// Type definitions for jquery.pjax.ts by falsandtru
+// Project: https://github.com/falsandtru/jquery.pjax.js/
+// Definitions by: 新ゝ月 NewNotMoon <http://new.not-moon.net/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface PjaxSetting {
+    gns?: string;
+    ns?: string;
+    area?: any; // string, array, function( event, param, origUrl, destUrl )
+    link?: string;
+    filter?: any; // string, function()
+    form?: string;
+    scope?: Object;
+    state?: any; // any, function(event, param, origUrl, destUrl )
+    scrollTop?: any; // number, function( event, param, origUrl, destUrl ), null, false
+    scrollLeft?: any; // number, function( event, param, origUrl, destUrl ), null, false
+    scroll?: {
+        delay?: number;
+        record?: boolean //internal
+        queue?: number[] //internal
+    };
+    ajax?: JQueryAjaxSettings;
+    contentType?: string;
+    load?: {
+        head?: string;
+        css?: boolean;
+        script?: boolean;
+        execute?: boolean;
+        reload?: string;
+        ignore?: string;
+        sync?: boolean;
+        ajax?: JQueryAjaxSettings;
+        rewrite?: (element: any) => any;
+        redirect?: boolean;
+    };
+    interval?: number;
+    cache?: {
+        click?: boolean;
+        submit?: boolean;
+        popstate?: boolean;
+        get?: boolean;
+        post?: boolean;
+        page?: boolean;
+        size?: number;
+        mix?: number;
+        expires?: {
+            min?: number;
+            max?: number;
+        };
+    };
+    wait?: any; // number, function( event, param, origUrl, destUrl ): number
+    fallback?: any; // boolean, function( event, param, origUrl, destUrl ): boolean
+    fix?: {
+        location?: boolean;
+        history?: boolean;
+        scroll?: boolean;
+        reset?: boolean;
+    };
+    database?: boolean;
+    server?: {
+        query?: any; // string, object
+        header?: {
+            area?: boolean;
+            head?: boolean;
+            css?: boolean;
+            script?: boolean;
+        };
+    };
+    callback?: (event: JQueryEventObject, param: any) => any;
+    callbacks?: {
+        before?: (event: JQueryEventObject, param: any) => any;
+        after?: (event: JQueryEventObject, param: any) => any;
+        ajax?: {
+            xhr?: (event: JQueryEventObject, param: any) => any;
+            beforeSend?: (event: JQueryEventObject, param: any, data: any, ajaxSettings: any) => any;
+            dataFilter?: (event: JQueryEventObject, param: any, data: any, dataType: any) => any;
+            success?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
+            error?: (event: JQueryEventObject, param: any, XMLHttpRequest: XMLHttpRequest, textStatus: string, errorThrown: any) => any;
+            complete?: (event: JQueryEventObject, param: any, XMLHttpRequest: XMLHttpRequest, textStatus: string) => any;
+            done?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
+            fail?: (event: JQueryEventObject, param: any, XMLHttpRequest: XMLHttpRequest, textStatus: string, errorThrown: any) => any;
+            always?: (event: JQueryEventObject, param: any, XMLHttpRequest: XMLHttpRequest, textStatus: string) => any;
+        };
+        update?: {
+            before?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
+            after?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
+            cache?: {
+                before?: (event: JQueryEventObject, param: any, cache: any) => any;
+                after?: (event: JQueryEventObject, param: any, cache: any) => any;
+            };
+            redirect?: {
+                before?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
+                after?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
+            };
+            url?: {
+                before?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
+                after?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
+            };
+            title?: {
+                before?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
+                after?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
+            };
+            head?: {
+                before?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
+                after?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
+            };
+            content?: {
+                before?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
+                after?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
+            };
+            scroll?: {
+                before?: (event: JQueryEventObject, param: any) => any;
+                after?: (event: JQueryEventObject, param: any) => any;
+            };
+            css?: {
+                before?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
+                after?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
+            };
+            script?: {
+                before?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
+                after?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
+            };
+            render?: {
+                before?: (event: JQueryEventObject, param: any) => any;
+                after?: (event: JQueryEventObject, param: any) => any;
+            };
+            verify?: {
+                before?: (event: JQueryEventObject, param: any) => any;
+                after?: (event: JQueryEventObject, param: any) => any;
+            };
+            success?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
+            error?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
+            complete?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
+        };
+        param?: any;
+
+        // internal
+        uuid?: string;
+        nss?: {
+            name?: string;
+            event?: string[];
+            click?: string;
+            submit?: string;
+            popstate?: string;
+            scroll?: string;
+            data?: string;
+            class4html?: string;
+            requestHeader?: string;
+        };
+        origLocation?: HTMLAnchorElement;
+        destLocation?: HTMLAnchorElement;
+        retry?: boolean;
+        speedcheck?: boolean;
+        disable?: boolean;
+        option?: any;
+    };
+}
+
+interface JQueryStatic {
+    pjax: {
+        (setting?: PjaxSetting): any;
+        enable(): any;
+        disable(): any;
+        click(url: string, attr: { href?: string; }): any;
+        click(url: HTMLAnchorElement, attr: { href?: string; }): any;
+        click(url: JQuery, attr: { href?: string; }): any;
+        click(url: any, attr: { href?: string; }): any;
+        submit(url: string, attr: { action?: string; method?: string; }, data: any): any;
+        submit(url: HTMLFormElement, attr?: { action?: string; method?: string; }, data?: any): any;
+        submit(url: JQuery, attr?: { action?: string; method?: string; }, data?: any): any;
+        submit(url: any, attr?: { action?: string; method?: string; }, data?: any): any;
+        follow(event: JQueryEventObject, ajax: JQueryXHR, timeStamp?: number): boolean;
+        setCache(): any;
+        setCache(url: string): any;
+        setCache(url: string, data: string): any;
+        setCache(url: string, data: string, textStatus: string, XMLHttpRequest: XMLHttpRequest): any;
+        getCache(): any;
+        getCache(url: string): any;
+        removeCache(url: string): any;
+        removeCache(): any;
+        clearCache(): any;
+    };
+}
+
+interface JQuery {
+    pjax(setting?: PjaxSetting): any;
+}
\ No newline at end of file
diff --git a/jquery.pjax.falsandtru/jquery.pjax-tests.ts b/jquery.pjax.falsandtru/jquery.pjax-tests.ts
index f116da5dfd..33a3efa5cf 100644
--- a/jquery.pjax.falsandtru/jquery.pjax-tests.ts
+++ b/jquery.pjax.falsandtru/jquery.pjax-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="jquery.pjax.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+
+/// <reference types="jquery" />
 
 function test_pjax() {
     $.pjax();
diff --git a/jquery.pjax.falsandtru/jquery.pjax.d.ts b/jquery.pjax.falsandtru/jquery.pjax.d.ts
deleted file mode 100644
index 29aa2304b5..0000000000
--- a/jquery.pjax.falsandtru/jquery.pjax.d.ts
+++ /dev/null
@@ -1,189 +0,0 @@
-// Type definitions for jquery.pjax.ts by falsandtru
-// Project: https://github.com/falsandtru/jquery.pjax.js/
-// Definitions by: 新ゝ月 NewNotMoon <http://new.not-moon.net/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface PjaxSetting {
-    gns?: string;
-    ns?: string;
-    area?: any; // string, array, function( event, param, origUrl, destUrl )
-    link?: string;
-    filter?: any; // string, function()
-    form?: string;
-    scope?: Object;
-    state?: any; // any, function(event, param, origUrl, destUrl )
-    scrollTop?: any; // number, function( event, param, origUrl, destUrl ), null, false
-    scrollLeft?: any; // number, function( event, param, origUrl, destUrl ), null, false
-    scroll?: {
-        delay?: number;
-        record?: boolean //internal
-        queue?: number[] //internal
-    };
-    ajax?: JQueryAjaxSettings;
-    contentType?: string;
-    load?: {
-        head?: string;
-        css?: boolean;
-        script?: boolean;
-        execute?: boolean;
-        reload?: string;
-        ignore?: string;
-        sync?: boolean;
-        ajax?: JQueryAjaxSettings;
-        rewrite?: (element: any) => any;
-        redirect?: boolean;
-    };
-    interval?: number;
-    cache?: {
-        click?: boolean;
-        submit?: boolean;
-        popstate?: boolean;
-        get?: boolean;
-        post?: boolean;
-        page?: boolean;
-        size?: number;
-        mix?: number;
-        expires?: {
-            min?: number;
-            max?: number;
-        };
-    };
-    wait?: any; // number, function( event, param, origUrl, destUrl ): number
-    fallback?: any; // boolean, function( event, param, origUrl, destUrl ): boolean
-    fix?: {
-        location?: boolean;
-        history?: boolean;
-        scroll?: boolean;
-        reset?: boolean;
-    };
-    database?: boolean;
-    server?: {
-        query?: any; // string, object
-        header?: {
-            area?: boolean;
-            head?: boolean;
-            css?: boolean;
-            script?: boolean;
-        };
-    };
-    callback?: (event: JQueryEventObject, param: any) => any;
-    callbacks?: {
-        before?: (event: JQueryEventObject, param: any) => any;
-        after?: (event: JQueryEventObject, param: any) => any;
-        ajax?: {
-            xhr?: (event: JQueryEventObject, param: any) => any;
-            beforeSend?: (event: JQueryEventObject, param: any, data: any, ajaxSettings: any) => any;
-            dataFilter?: (event: JQueryEventObject, param: any, data: any, dataType: any) => any;
-            success?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
-            error?: (event: JQueryEventObject, param: any, XMLHttpRequest: XMLHttpRequest, textStatus: string, errorThrown: any) => any;
-            complete?: (event: JQueryEventObject, param: any, XMLHttpRequest: XMLHttpRequest, textStatus: string) => any;
-            done?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
-            fail?: (event: JQueryEventObject, param: any, XMLHttpRequest: XMLHttpRequest, textStatus: string, errorThrown: any) => any;
-            always?: (event: JQueryEventObject, param: any, XMLHttpRequest: XMLHttpRequest, textStatus: string) => any;
-        };
-        update?: {
-            before?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
-            after?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
-            cache?: {
-                before?: (event: JQueryEventObject, param: any, cache: any) => any;
-                after?: (event: JQueryEventObject, param: any, cache: any) => any;
-            };
-            redirect?: {
-                before?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
-                after?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
-            };
-            url?: {
-                before?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
-                after?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
-            };
-            title?: {
-                before?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
-                after?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
-            };
-            head?: {
-                before?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
-                after?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
-            };
-            content?: {
-                before?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
-                after?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
-            };
-            scroll?: {
-                before?: (event: JQueryEventObject, param: any) => any;
-                after?: (event: JQueryEventObject, param: any) => any;
-            };
-            css?: {
-                before?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
-                after?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
-            };
-            script?: {
-                before?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
-                after?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
-            };
-            render?: {
-                before?: (event: JQueryEventObject, param: any) => any;
-                after?: (event: JQueryEventObject, param: any) => any;
-            };
-            verify?: {
-                before?: (event: JQueryEventObject, param: any) => any;
-                after?: (event: JQueryEventObject, param: any) => any;
-            };
-            success?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
-            error?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
-            complete?: (event: JQueryEventObject, param: any, data: any, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any;
-        };
-        param?: any;
-
-        // internal
-        uuid?: string;
-        nss?: {
-            name?: string;
-            event?: string[];
-            click?: string;
-            submit?: string;
-            popstate?: string;
-            scroll?: string;
-            data?: string;
-            class4html?: string;
-            requestHeader?: string;
-        };
-        origLocation?: HTMLAnchorElement;
-        destLocation?: HTMLAnchorElement;
-        retry?: boolean;
-        speedcheck?: boolean;
-        disable?: boolean;
-        option?: any;
-    };
-}
-
-interface JQueryStatic {
-    pjax: {
-        (setting?: PjaxSetting): any;
-        enable(): any;
-        disable(): any;
-        click(url: string, attr: { href?: string; }): any;
-        click(url: HTMLAnchorElement, attr: { href?: string; }): any;
-        click(url: JQuery, attr: { href?: string; }): any;
-        click(url: any, attr: { href?: string; }): any;
-        submit(url: string, attr: { action?: string; method?: string; }, data: any): any;
-        submit(url: HTMLFormElement, attr?: { action?: string; method?: string; }, data?: any): any;
-        submit(url: JQuery, attr?: { action?: string; method?: string; }, data?: any): any;
-        submit(url: any, attr?: { action?: string; method?: string; }, data?: any): any;
-        follow(event: JQueryEventObject, ajax: JQueryXHR, timeStamp?: number): boolean;
-        setCache(): any;
-        setCache(url: string): any;
-        setCache(url: string, data: string): any;
-        setCache(url: string, data: string, textStatus: string, XMLHttpRequest: XMLHttpRequest): any;
-        getCache(): any;
-        getCache(url: string): any;
-        removeCache(url: string): any;
-        removeCache(): any;
-        clearCache(): any;
-    };
-}
-
-interface JQuery {
-    pjax(setting?: PjaxSetting): any;
-}
\ No newline at end of file
diff --git a/jquery.pjax.falsandtru/tsconfig.json b/jquery.pjax.falsandtru/tsconfig.json
new file mode 100644
index 0000000000..200d4f0e99
--- /dev/null
+++ b/jquery.pjax.falsandtru/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.pjax-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.pjax/index.d.ts b/jquery.pjax/index.d.ts
new file mode 100644
index 0000000000..2657a90f44
--- /dev/null
+++ b/jquery.pjax/index.d.ts
@@ -0,0 +1,178 @@
+// Type definitions for jquery-pjax
+// Project: https://github.com/defunkt/jquery-pjax
+// Definitions by: Junle Li <https://github.com/lijunle>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+/**
+ * Interface for pjax:popstate event.
+ */
+interface PjaxPopStateEventObject extends JQueryEventObject {
+    /**
+     * Navigation direction. Could be "back" or "forward".
+     */
+    direction: string
+}
+
+interface PjaxSettings extends JQueryAjaxSettings {
+    /**
+     * A jQuery selector indicates where to stick the response body. E.g., $(container).html(xhr.responseBody).
+     * If it is not defined, the `data-pjax` attribute of the link will be treated as container.
+     * If such an attribute is not defined too, the context will be treated as container.
+     */
+    container?: string;
+
+    /**
+     * Whether to pushState the URL. Defaults to true.
+     */
+    push?: boolean;
+
+    /**
+     * Whether to replaceState the URL. Defaults to false.
+     */
+    replace?: boolean;
+    
+    /**
+     * How many requests to cache. Defaults to 20.
+     */
+    maxCacheLength?: number;
+
+    /**
+     * A string or function returning the current pjax version
+     */
+    version?: string | (() => string);
+
+    /**
+     * Vertical position to scroll to after navigation.
+     * To avoid changing scroll position, pass false.
+     */
+    scrollTo?: number | boolean;
+
+    /**
+     * Eventually the relatedTarget value for pjax events.
+     */
+    target?: EventTarget;
+
+    /**
+     * CSS selector for the fragment to extract from ajax response.
+     */
+    fragment?: string;
+}
+
+interface JQuery {
+    /**
+     * Tell PJAX to listen links with delegation selector that, when click on them, fetches the href with ajax into the container.
+     * Tries to make sure the back button and ctrl+click work the way you'd expect.
+     * If `options.container` is not defined, the `data-pjax` attribute of the link will be treated as container.
+     * If such an attribute is not defined too, the context runs with this statement will be treated as container.
+     * @param delegationSelector The selector to limit which links PJAX should listen on.
+     * @param options PJAX settings, which is a superset of jQuery AJAX settings. It includes the following specific options:
+     * - container: a jQuery selector indicates where to stick the response body. E.g., $(container).html(xhr.responseBody).
+     * - push: a boolean indicates whether to pushState the URL. Default is true.
+     * - replace: a boolean indicates whether to use replaceState instead of pushState. Default is false.
+     * @return Returns the jQuery object
+     */
+    pjax(delegationSelector: string, options?: PjaxSettings): JQuery;
+
+    /**
+     * Tell PJAX to listen links with delegation selector that, when click on them, fetches the href with ajax into the container.
+     * Tries to make sure the back button and ctrl+click work the way you'd expect.
+     * If `options.container` is not defined, the `data-pjax` attribute of the link will be treated as container.
+     * If such an attribute is not defined too, the context runs with this statement will be treated as container.
+     * @param delegationSelector The selector to limit which links PJAX should listen on.
+     * @param containerSelector A jQuery selector indicates where to stick the response body. E.g., $(containerSelector).html(xhr.responseBody).
+     * @param options PJAX settings, which is a superset of jQuery AJAX settings. It includes the following specific options:
+     * - container: a jQuery selector indicates where to stick the response body. The `containerSelector` parameter has priority.
+     * - push: a boolean indicates whether to pushState the URL. Default is true.
+     * - replace: a boolean indicates whether to use replaceState instead of pushState. Default is false.
+     * @return Returns the jQuery object
+     */
+    pjax(delegationSelector: string, containerSelector?: string, options?: PjaxSettings): JQuery;
+}
+
+interface JQueryStatic {
+    pjax: PjaxStatic;
+}
+
+interface PjaxStatic {
+    /**
+     * PJAX default settings.
+     */
+    defaults: PjaxSettings;
+
+    /**
+     * Loads a URL with ajax, puts the response body inside a container, then pushState()'s the loaded URL.
+     * Works just like $.ajax in that it accepts a jQuery ajax settings object (with keys like url, type, data, etc).
+     * @param options PJAX settings, which is a superset of jQuery AJAX settings. It includes the following specific options:
+     * - container: a jQuery selector indicates where to stick the response body. E.g., $(container).html(xhr.responseBody).
+     * - push: a boolean indicates whether to pushState the URL. Default is true.
+     * - replace: a boolean indicates whether to use replaceState instead of pushState. Default is false.
+     */
+    (options?: PjaxSettings): JQueryXHR;
+
+    /**
+     * PJAX on click handler.
+     * @param event A jQuery click event.
+     * @param options PJAX settings, which is a superset of jQuery AJAX settings. It includes the following specific options:
+     * - container: a jQuery selector indicates where to stick the response body. E.g., $(container).html(xhr.responseBody).
+     * - push: a boolean indicates whether to pushState the URL. Default is true.
+     * - replace: a boolean indicates whether to use replaceState instead of pushState. Default is false.
+     */
+    click(event: JQueryEventObject, options?: PjaxSettings): void;
+
+    /**
+     * PJAX on click handler.
+     * @param event A jQuery click event.
+     * @param containerSelector A jQuery selector indicates where to stick the response body. E.g., $(containerSelector).html(xhr.responseBody).
+     * @param options PJAX settings, which is a superset of jQuery AJAX settings. It includes the following specific options:
+     * - container: a jQuery selector indicates where to stick the response body. The `containerSelector` parameter has priority.
+     * - push: a boolean indicates whether to pushState the URL. Default is true.
+     * - replace: a boolean indicates whether to use replaceState instead of pushState. Default is false.
+     */
+    click(event: JQueryEventObject, containerSelector?: string, options?: PjaxSettings): void;
+
+    /**
+     * PJAX on form submit handler
+     * @param event A jQuery click event.
+     * @param options PJAX settings, which is a superset of jQuery AJAX settings. It includes the following specific options:
+     * - container: a jQuery selector indicates where to stick the response body. E.g., $(container).html(xhr.responseBody).
+     * - push: a boolean indicates whether to pushState the URL. Default is true.
+     * - replace: a boolean indicates whether to use replaceState instead of pushState. Default is false.
+     */
+    submit(event: JQueryEventObject, options?: PjaxSettings): void;
+
+    /**
+     * PJAX on form submit handler
+     * @param event A jQuery click event.
+     * @param containerSelector A jQuery selector indicates where to stick the response body. E.g., $(containerSelector).html(xhr.responseBody).
+     * @param options PJAX settings, which is a superset of jQuery AJAX settings. It includes the following specific options:
+     * - container: a jQuery selector indicates where to stick the response body. The `containerSelector` parameter has priority.
+     * - push: a boolean indicates whether to pushState the URL. Default is true.
+     * - replace: a boolean indicates whether to use replaceState instead of pushState. Default is false.
+     */
+    submit(event: JQueryEventObject, containerSelector?: string, options?: PjaxSettings): void;
+
+    /**
+     * Install pjax functions on $.pjax to enable pushState behavior. Does nothing if already enabled.
+     */
+    enable(): void;
+
+    /**
+     * Disable pushState behavior.
+     * This is the case when a browser doesn't support pushState. It is sometimes useful to disable pushState for debugging on a modern browser.
+     */
+    disable(): void;
+
+    /**
+     * Reload current page with pjax.
+     */
+    reload(container: string, options?: PjaxSettings): JQueryXHR;
+}
+
+interface JQuerySupport {
+    /**
+     * A boolean value indicates if pjax is supported by the browser.
+     */
+    pjax: boolean;
+}
diff --git a/jquery.pjax/jquery.pjax-tests.ts b/jquery.pjax/jquery.pjax-tests.ts
index 6af27618e0..25422922d8 100644
--- a/jquery.pjax/jquery.pjax-tests.ts
+++ b/jquery.pjax/jquery.pjax-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="jquery.pjax.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+
+/// <reference types="jquery" />
 
 function test_fn_pjax() {
     $(document).pjax("a");
diff --git a/jquery.pjax/jquery.pjax.d.ts b/jquery.pjax/jquery.pjax.d.ts
deleted file mode 100644
index 7173abdab6..0000000000
--- a/jquery.pjax/jquery.pjax.d.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-// Type definitions for jquery-pjax
-// Project: https://github.com/defunkt/jquery-pjax
-// Definitions by: Junle Li <https://github.com/lijunle>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-/**
- * Interface for pjax:popstate event.
- */
-interface PjaxPopStateEventObject extends JQueryEventObject {
-    /**
-     * Navigation direction. Could be "back" or "forward".
-     */
-    direction: string
-}
-
-interface PjaxSettings extends JQueryAjaxSettings {
-    /**
-     * A jQuery selector indicates where to stick the response body. E.g., $(container).html(xhr.responseBody).
-     * If it is not defined, the `data-pjax` attribute of the link will be treated as container.
-     * If such an attribute is not defined too, the context will be treated as container.
-     */
-    container?: string;
-
-    /**
-     * Whether to pushState the URL. Defaults to true.
-     */
-    push?: boolean;
-
-    /**
-     * Whether to replaceState the URL. Defaults to false.
-     */
-    replace?: boolean;
-    
-    /**
-     * How many requests to cache. Defaults to 20.
-     */
-    maxCacheLength?: number;
-
-    /**
-     * A string or function returning the current pjax version
-     */
-    version?: string | (() => string);
-
-    /**
-     * Vertical position to scroll to after navigation.
-     * To avoid changing scroll position, pass false.
-     */
-    scrollTo?: number | boolean;
-
-    /**
-     * Eventually the relatedTarget value for pjax events.
-     */
-    target?: EventTarget;
-
-    /**
-     * CSS selector for the fragment to extract from ajax response.
-     */
-    fragment?: string;
-}
-
-interface JQuery {
-    /**
-     * Tell PJAX to listen links with delegation selector that, when click on them, fetches the href with ajax into the container.
-     * Tries to make sure the back button and ctrl+click work the way you'd expect.
-     * If `options.container` is not defined, the `data-pjax` attribute of the link will be treated as container.
-     * If such an attribute is not defined too, the context runs with this statement will be treated as container.
-     * @param delegationSelector The selector to limit which links PJAX should listen on.
-     * @param options PJAX settings, which is a superset of jQuery AJAX settings. It includes the following specific options:
-     * - container: a jQuery selector indicates where to stick the response body. E.g., $(container).html(xhr.responseBody).
-     * - push: a boolean indicates whether to pushState the URL. Default is true.
-     * - replace: a boolean indicates whether to use replaceState instead of pushState. Default is false.
-     * @return Returns the jQuery object
-     */
-    pjax(delegationSelector: string, options?: PjaxSettings): JQuery;
-
-    /**
-     * Tell PJAX to listen links with delegation selector that, when click on them, fetches the href with ajax into the container.
-     * Tries to make sure the back button and ctrl+click work the way you'd expect.
-     * If `options.container` is not defined, the `data-pjax` attribute of the link will be treated as container.
-     * If such an attribute is not defined too, the context runs with this statement will be treated as container.
-     * @param delegationSelector The selector to limit which links PJAX should listen on.
-     * @param containerSelector A jQuery selector indicates where to stick the response body. E.g., $(containerSelector).html(xhr.responseBody).
-     * @param options PJAX settings, which is a superset of jQuery AJAX settings. It includes the following specific options:
-     * - container: a jQuery selector indicates where to stick the response body. The `containerSelector` parameter has priority.
-     * - push: a boolean indicates whether to pushState the URL. Default is true.
-     * - replace: a boolean indicates whether to use replaceState instead of pushState. Default is false.
-     * @return Returns the jQuery object
-     */
-    pjax(delegationSelector: string, containerSelector?: string, options?: PjaxSettings): JQuery;
-}
-
-interface JQueryStatic {
-    pjax: PjaxStatic;
-}
-
-interface PjaxStatic {
-    /**
-     * PJAX default settings.
-     */
-    defaults: PjaxSettings;
-
-    /**
-     * Loads a URL with ajax, puts the response body inside a container, then pushState()'s the loaded URL.
-     * Works just like $.ajax in that it accepts a jQuery ajax settings object (with keys like url, type, data, etc).
-     * @param options PJAX settings, which is a superset of jQuery AJAX settings. It includes the following specific options:
-     * - container: a jQuery selector indicates where to stick the response body. E.g., $(container).html(xhr.responseBody).
-     * - push: a boolean indicates whether to pushState the URL. Default is true.
-     * - replace: a boolean indicates whether to use replaceState instead of pushState. Default is false.
-     */
-    (options?: PjaxSettings): JQueryXHR;
-
-    /**
-     * PJAX on click handler.
-     * @param event A jQuery click event.
-     * @param options PJAX settings, which is a superset of jQuery AJAX settings. It includes the following specific options:
-     * - container: a jQuery selector indicates where to stick the response body. E.g., $(container).html(xhr.responseBody).
-     * - push: a boolean indicates whether to pushState the URL. Default is true.
-     * - replace: a boolean indicates whether to use replaceState instead of pushState. Default is false.
-     */
-    click(event: JQueryEventObject, options?: PjaxSettings): void;
-
-    /**
-     * PJAX on click handler.
-     * @param event A jQuery click event.
-     * @param containerSelector A jQuery selector indicates where to stick the response body. E.g., $(containerSelector).html(xhr.responseBody).
-     * @param options PJAX settings, which is a superset of jQuery AJAX settings. It includes the following specific options:
-     * - container: a jQuery selector indicates where to stick the response body. The `containerSelector` parameter has priority.
-     * - push: a boolean indicates whether to pushState the URL. Default is true.
-     * - replace: a boolean indicates whether to use replaceState instead of pushState. Default is false.
-     */
-    click(event: JQueryEventObject, containerSelector?: string, options?: PjaxSettings): void;
-
-    /**
-     * PJAX on form submit handler
-     * @param event A jQuery click event.
-     * @param options PJAX settings, which is a superset of jQuery AJAX settings. It includes the following specific options:
-     * - container: a jQuery selector indicates where to stick the response body. E.g., $(container).html(xhr.responseBody).
-     * - push: a boolean indicates whether to pushState the URL. Default is true.
-     * - replace: a boolean indicates whether to use replaceState instead of pushState. Default is false.
-     */
-    submit(event: JQueryEventObject, options?: PjaxSettings): void;
-
-    /**
-     * PJAX on form submit handler
-     * @param event A jQuery click event.
-     * @param containerSelector A jQuery selector indicates where to stick the response body. E.g., $(containerSelector).html(xhr.responseBody).
-     * @param options PJAX settings, which is a superset of jQuery AJAX settings. It includes the following specific options:
-     * - container: a jQuery selector indicates where to stick the response body. The `containerSelector` parameter has priority.
-     * - push: a boolean indicates whether to pushState the URL. Default is true.
-     * - replace: a boolean indicates whether to use replaceState instead of pushState. Default is false.
-     */
-    submit(event: JQueryEventObject, containerSelector?: string, options?: PjaxSettings): void;
-
-    /**
-     * Install pjax functions on $.pjax to enable pushState behavior. Does nothing if already enabled.
-     */
-    enable(): void;
-
-    /**
-     * Disable pushState behavior.
-     * This is the case when a browser doesn't support pushState. It is sometimes useful to disable pushState for debugging on a modern browser.
-     */
-    disable(): void;
-
-    /**
-     * Reload current page with pjax.
-     */
-    reload(container: string, options?: PjaxSettings): JQueryXHR;
-}
-
-interface JQuerySupport {
-    /**
-     * A boolean value indicates if pjax is supported by the browser.
-     */
-    pjax: boolean;
-}
diff --git a/jquery.pjax/tsconfig.json b/jquery.pjax/tsconfig.json
new file mode 100644
index 0000000000..200d4f0e99
--- /dev/null
+++ b/jquery.pjax/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.pjax-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.placeholder/index.d.ts b/jquery.placeholder/index.d.ts
new file mode 100644
index 0000000000..92fe7e5f02
--- /dev/null
+++ b/jquery.placeholder/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for jquery.placeholder.js 2.1.1
+// Project: https://github.com/mathiasbynens/jquery-placeholder
+// Definitions by: Peter Gill <https://github.com/majorsilence>, Neil Culver <https://github.com/EnableSoftware>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface JQuery {
+    placeholder(options: { customClass: string }) : JQuery
+    placeholder() : JQuery
+}
+
diff --git a/jquery.placeholder/jquery.placeholder-tests.ts b/jquery.placeholder/jquery.placeholder-tests.ts
index b0e7629f34..edaf3ea111 100644
--- a/jquery.placeholder/jquery.placeholder-tests.ts
+++ b/jquery.placeholder/jquery.placeholder-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.placeholder.d.ts"/>
+/// <reference types="jquery"/>
 
 $('input').placeholder();
 
diff --git a/jquery.placeholder/jquery.placeholder.d.ts b/jquery.placeholder/jquery.placeholder.d.ts
deleted file mode 100644
index 7fc96b5402..0000000000
--- a/jquery.placeholder/jquery.placeholder.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for jquery.placeholder.js 2.1.1
-// Project: https://github.com/mathiasbynens/jquery-placeholder
-// Definitions by: Peter Gill <https://github.com/majorsilence>, Neil Culver <https://github.com/EnableSoftware>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface JQuery {
-    placeholder(options: { customClass: string }) : JQuery
-    placeholder() : JQuery
-}
-
diff --git a/jquery.placeholder/tsconfig.json b/jquery.placeholder/tsconfig.json
new file mode 100644
index 0000000000..055a09b194
--- /dev/null
+++ b/jquery.placeholder/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.placeholder-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.pnotify/index.d.ts b/jquery.pnotify/index.d.ts
new file mode 100644
index 0000000000..3434e73184
--- /dev/null
+++ b/jquery.pnotify/index.d.ts
@@ -0,0 +1,182 @@
+// Type definitions for jquery.pnotify 2.x
+// Project: https://github.com/sciactive/pnotify
+// Definitions by: David Sichau <https://github.com/DavidSichau>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface PNotifyStack {
+    dir1?: string;
+    dir2?: string;
+    push?: string;
+    spacing1?: number;
+    spacing2?: number;
+    firstpos1?: number;
+    firstpos2?: number;
+    context?: JQuery
+}
+
+interface PNotifyLabel {
+    redisplay?: string;
+    all?: string;
+    last?: string;
+    close?: string;
+    stick?: string;
+}
+
+interface PNotifyOptions {
+    /**
+     * The notice's title. Either boolean false or string
+     */
+    title?: any;
+    /**
+     * Whether to escape the content of the title. (Not allow HTML.)
+     */
+    title_escape?: boolean;
+    /**
+     * The notice's text. Either boolean false or string
+     */
+    text?: any;
+    /**
+     * Whether to escape the content of the text. (Not allow HTML.)
+     */
+    text_escape?: boolean;
+    /**
+     * What styling classes to use. (Can be either jqueryui or bootstrap.)
+     */
+    styling?: string;
+    /**
+     * Additional classes to be added to the notice. (For custom styling.)
+     */
+    addclass?: string;
+    /**
+     * Class to be added to the notice for corner styling.
+     */
+    cornerclass?: string;
+
+    nonblock?: {
+        /**
+         * Create a non-blocking notice. It lets the user click elements underneath it.
+         */
+        nonblock: boolean;
+
+        /**
+         * The opacity of the notice (if it's non-blocking) when the mouse is over it.
+         */
+        nonblock_opacity?: number
+    };
+
+    /**
+     * Display a pull down menu to redisplay previous notices, and place the notice in the history.
+     */
+    history?: boolean;
+    /**
+     * Maximum number of notifications to have onscreen.
+     */
+    maxonscreen?: number;
+    /**
+     * Display the notice when it is created. Turn this off to add notifications to the history without displaying them.
+     */
+    auto_display?: boolean;
+    /**
+     * Width of the notice.
+     */
+    width?: string;
+    /**
+     * Minimum height of the notice. It will expand to fit content.
+     */
+    min_height?: string;
+    /**
+     * Type of the notice. "notice", "info", "success", or "error".
+     */
+    type?: string;
+    /**
+     * Set icon to true to use the default icon for the selected style/type, false for no icon, or a string for your own icon class.
+     */
+    icon?: any;
+    /**
+     * The animation to use when displaying and hiding the notice. "none", "show", "fade", and "slide" are built in to jQuery. Others require jQuery UI. Use an object with effect_in and effect_out to use different effects.
+     */
+    animation?: any;
+    /**
+     * Speed at which the notice animates in and out. "slow", "def" or "normal", "fast" or number of milliseconds.
+     */
+    animate_speed?: string;
+    /**
+     * Specify a specific duration of position animation
+     */
+    position_animate_speed?: number;
+    /**
+     * Opacity of the notice.
+     */
+    opacity?: number;
+    /**
+     * Display a drop shadow.
+     */
+    shadow?: boolean;
+
+    buttons?: {
+        /**
+         * Provide a button for the user to manually close the notice.
+         */
+        closer?: boolean;
+        /**
+         * Only show the closer button on hover.
+         */
+        closer_hover?: boolean;
+
+        /**
+         * Provide a button for the user to manually stick the notice.
+         */
+        sticker?: boolean;
+        /**
+         * Only show the sticker button on hover.
+         */
+        sticker_hover?: boolean;
+    }
+
+    /**
+     * After a delay, remove the notice.
+     */
+    hide?: boolean;
+    /**
+     * Delay in milliseconds before the notice is removed.
+     */
+    delay?: number;
+    /**
+     * Reset the hide timer if the mouse moves over the notice.
+     */
+    mouse_reset?: boolean;
+    /**
+     * Remove the notice's elements from the DOM after it is removed.
+     */
+    remove?: boolean;
+    /**
+     * Change new lines to br tags.
+     */
+    insert_brs?: boolean;
+    /**
+     * The stack on which the notices will be placed. Also controls the direction the notices stack.
+     */
+    stack?: PNotifyStack;
+    /**
+     * The various displayed text, helps facilitating internationalization.
+     */
+    labels?: PNotifyLabel;
+}
+
+interface PNotify {
+    elem: JQuery;
+    
+    update(options?: PNotifyOptions): void;
+    remove(): void;
+}
+
+interface PNotifyConstructor {
+    new (options?: PNotifyOptions): PNotify;
+    
+    removeAll(): void;
+}
+
+declare var PNotify: PNotifyConstructor;
+
diff --git a/jquery.pnotify/jquery.pnotify-tests.ts b/jquery.pnotify/jquery.pnotify-tests.ts
index 8704da19f3..f14a490668 100644
--- a/jquery.pnotify/jquery.pnotify-tests.ts
+++ b/jquery.pnotify/jquery.pnotify-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.pnotify.d.ts" />
+/// <reference types="jquery"/>
+
 
 function test_pnotify() {
 
diff --git a/jquery.pnotify/jquery.pnotify.d.ts b/jquery.pnotify/jquery.pnotify.d.ts
deleted file mode 100644
index edb7e2468c..0000000000
--- a/jquery.pnotify/jquery.pnotify.d.ts
+++ /dev/null
@@ -1,182 +0,0 @@
-// Type definitions for jquery.pnotify 2.x
-// Project: https://github.com/sciactive/pnotify
-// Definitions by: David Sichau <https://github.com/DavidSichau>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface PNotifyStack {
-    dir1?: string;
-    dir2?: string;
-    push?: string;
-    spacing1?: number;
-    spacing2?: number;
-    firstpos1?: number;
-    firstpos2?: number;
-    context?: JQuery
-}
-
-interface PNotifyLabel {
-    redisplay?: string;
-    all?: string;
-    last?: string;
-    close?: string;
-    stick?: string;
-}
-
-interface PNotifyOptions {
-    /**
-     * The notice's title. Either boolean false or string
-     */
-    title?: any;
-    /**
-     * Whether to escape the content of the title. (Not allow HTML.)
-     */
-    title_escape?: boolean;
-    /**
-     * The notice's text. Either boolean false or string
-     */
-    text?: any;
-    /**
-     * Whether to escape the content of the text. (Not allow HTML.)
-     */
-    text_escape?: boolean;
-    /**
-     * What styling classes to use. (Can be either jqueryui or bootstrap.)
-     */
-    styling?: string;
-    /**
-     * Additional classes to be added to the notice. (For custom styling.)
-     */
-    addclass?: string;
-    /**
-     * Class to be added to the notice for corner styling.
-     */
-    cornerclass?: string;
-
-    nonblock?: {
-        /**
-         * Create a non-blocking notice. It lets the user click elements underneath it.
-         */
-        nonblock: boolean;
-
-        /**
-         * The opacity of the notice (if it's non-blocking) when the mouse is over it.
-         */
-        nonblock_opacity?: number
-    };
-
-    /**
-     * Display a pull down menu to redisplay previous notices, and place the notice in the history.
-     */
-    history?: boolean;
-    /**
-     * Maximum number of notifications to have onscreen.
-     */
-    maxonscreen?: number;
-    /**
-     * Display the notice when it is created. Turn this off to add notifications to the history without displaying them.
-     */
-    auto_display?: boolean;
-    /**
-     * Width of the notice.
-     */
-    width?: string;
-    /**
-     * Minimum height of the notice. It will expand to fit content.
-     */
-    min_height?: string;
-    /**
-     * Type of the notice. "notice", "info", "success", or "error".
-     */
-    type?: string;
-    /**
-     * Set icon to true to use the default icon for the selected style/type, false for no icon, or a string for your own icon class.
-     */
-    icon?: any;
-    /**
-     * The animation to use when displaying and hiding the notice. "none", "show", "fade", and "slide" are built in to jQuery. Others require jQuery UI. Use an object with effect_in and effect_out to use different effects.
-     */
-    animation?: any;
-    /**
-     * Speed at which the notice animates in and out. "slow", "def" or "normal", "fast" or number of milliseconds.
-     */
-    animate_speed?: string;
-    /**
-     * Specify a specific duration of position animation
-     */
-    position_animate_speed?: number;
-    /**
-     * Opacity of the notice.
-     */
-    opacity?: number;
-    /**
-     * Display a drop shadow.
-     */
-    shadow?: boolean;
-
-    buttons?: {
-        /**
-         * Provide a button for the user to manually close the notice.
-         */
-        closer?: boolean;
-        /**
-         * Only show the closer button on hover.
-         */
-        closer_hover?: boolean;
-
-        /**
-         * Provide a button for the user to manually stick the notice.
-         */
-        sticker?: boolean;
-        /**
-         * Only show the sticker button on hover.
-         */
-        sticker_hover?: boolean;
-    }
-
-    /**
-     * After a delay, remove the notice.
-     */
-    hide?: boolean;
-    /**
-     * Delay in milliseconds before the notice is removed.
-     */
-    delay?: number;
-    /**
-     * Reset the hide timer if the mouse moves over the notice.
-     */
-    mouse_reset?: boolean;
-    /**
-     * Remove the notice's elements from the DOM after it is removed.
-     */
-    remove?: boolean;
-    /**
-     * Change new lines to br tags.
-     */
-    insert_brs?: boolean;
-    /**
-     * The stack on which the notices will be placed. Also controls the direction the notices stack.
-     */
-    stack?: PNotifyStack;
-    /**
-     * The various displayed text, helps facilitating internationalization.
-     */
-    labels?: PNotifyLabel;
-}
-
-interface PNotify {
-    elem: JQuery;
-    
-    update(options?: PNotifyOptions): void;
-    remove(): void;
-}
-
-interface PNotifyConstructor {
-    new (options?: PNotifyOptions): PNotify;
-    
-    removeAll(): void;
-}
-
-declare var PNotify: PNotifyConstructor;
-
diff --git a/jquery.pnotify/tsconfig.json b/jquery.pnotify/tsconfig.json
new file mode 100644
index 0000000000..96cb1e845d
--- /dev/null
+++ b/jquery.pnotify/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.pnotify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.postMessage/jquery.postMessage.d.ts b/jquery.postMessage/index.d.ts
similarity index 100%
rename from jquery.postMessage/jquery.postMessage.d.ts
rename to jquery.postMessage/index.d.ts
diff --git a/jquery.postMessage/jquery.postMessage-tests.ts b/jquery.postMessage/jquery.postMessage-tests.ts
index 077063303d..f7db3a8f50 100644
--- a/jquery.postMessage/jquery.postMessage-tests.ts
+++ b/jquery.postMessage/jquery.postMessage-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="jquery.postMessage.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+
+/// <reference types="jquery" />
 
 function test_postMessage() {
     // post plain message
diff --git a/jquery.postMessage/tsconfig.json b/jquery.postMessage/tsconfig.json
new file mode 100644
index 0000000000..518de0e1e1
--- /dev/null
+++ b/jquery.postMessage/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.postMessage-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.prettyphoto/index.d.ts b/jquery.prettyphoto/index.d.ts
new file mode 100644
index 0000000000..80c381525c
--- /dev/null
+++ b/jquery.prettyphoto/index.d.ts
@@ -0,0 +1,290 @@
+// Type definitions for jQuery prettyPhoto 3.1.5
+// Project: https://github.com/scaron/prettyphoto
+// Definitions by: pgaske <https://github.com/pgaske>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace scaron_prettyPhoto {
+    /**
+    * Pretty photo settings
+    */
+    interface PrettyPhotoSettings {
+        /**
+        * the attribute tag to use for prettyPhoto hooks.  For HTML5, use "data-rel" or similar.
+        * @default 'rel'
+        */
+        hook?: string;
+
+        /**
+        * fast/slow/normal
+        * @default 'fast'
+        */
+        animation_speed?: string;
+
+
+        ajaxcallback?: () => void;
+
+        /**
+        * false OR interval time in ms
+        * @default 5000
+        */
+        slideshow?: any;
+
+        /**
+        * true/false
+        * @default false
+        */
+        autoplay_slideshow?: boolean;
+
+        /**
+        * Value between 0 and 1
+        * @default 0.80
+        */
+        opacity?: number;
+
+        /**
+        * true/false
+        * @default true
+        */
+        show_title?: boolean;
+
+        /**
+        * Resize the photos bigger than viewport. true/false
+        * @default true
+        */
+        allow_resize?: boolean;
+
+        /**
+        * Allow the user to expand a resized image. true/false
+        * @default true
+        */
+        allow_expand?: boolean;
+
+        /**
+        * Pixels
+        * @default 500
+        */
+        default_width?: number;
+
+        /**
+        * Pixels
+        * @default 344
+        */
+        default_height?: number;
+
+        /**
+        * The separator for the gallery counter 1 "of" 2
+        * @default '/'
+        */
+        counter_separator_label?: string;
+
+        /**
+        * light_rounded / dark_rounded / light_square / dark_square / facebook
+        * @default 'pp_default'
+        */
+        theme?: string;
+
+        /**
+        * The padding on each side of the picture
+        * @default 20
+        */
+        horizontal_padding?: number;
+
+        /**
+        * Hides all the flash object on a page, set to TRUE if flash appears over prettyPhoto
+        * @default false
+        */
+        hideflash?: boolean;
+
+        /**
+        * Set the flash wmode attribute
+        * @default 'opaque'
+        */
+        wmode?: string;
+
+        /**
+        * Automatically start videos: True/False
+        * @default true
+        */
+        autoplay?: boolean;
+
+        /**
+        * If set to true, only the close button will close the window
+        * @default false
+        */
+        modal?: boolean;
+
+        /**
+        * Allow prettyPhoto to update the url to enable deeplinking.
+        * @default true
+        */
+        deeplinking?: boolean;
+
+        /**
+        * If set to true, a gallery will overlay the fullscreen image on mouse over
+        * @default true
+        */
+        overlay_gallery?: boolean;
+
+        /**
+        * Maximum number of pictures in the overlay gallery
+        * @default 30
+        */
+        overlay_gallery_max?: number;
+
+        /**
+        * Set to false if you open forms inside prettyPhoto
+        * @default true
+        */
+        keyboard_shortcuts?: boolean;
+
+        /**
+        * Called everytime an item is shown/changed
+        * @default function () { }
+        */
+        changepicturecallback?: () => void;
+
+        /**
+        * Called when prettyPhoto is closed
+        * @default function () { }
+        */
+        callback?: () => void;
+
+        /**
+        * @default true
+        */
+        ie6_fallback?: boolean;
+
+        /**
+        * Markup for pretty photo
+        * @default omitted for brevity
+        */
+        markup?: string;
+
+        /**
+        * Markup for pretty photo gallery
+        * @default omitted for brevity
+        */
+        gallery_markup?: string;
+
+        /**
+        * Markup for image
+        * @default '<img id="fullResImage" src="{path}" />'
+        */
+        image_markup?: string;
+
+        /**
+        * Markup for flash
+        * @default '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="{width}" height="{height}"><param name="wmode" value="{wmode}" /><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="{path}" /><embed src="{path}" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="{width}" height="{height}" wmode="{wmode}"></embed></object>'
+        */
+        flash_markup?: string;
+
+        /**
+        * Markup for quicktime
+        * @default '<object classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab" height="{height}" width="{width}"><param name="src" value="{path}"><param name="autoplay" value="{autoplay}"><param name="type" value="video/quicktime"><embed src="{path}" height="{height}" width="{width}" autoplay="{autoplay}" type="video/quicktime" pluginspage="http://www.apple.com/quicktime/download/"></embed></object>'
+        */
+        quicktime_markup?: string;
+
+        /**
+        * Markup for iframe
+        * @default '<iframe src ="{path}" width="{width}" height="{height}" frameborder="no"></iframe>'
+        */
+        iframe_markup?: string;
+
+        /**
+        * @default '<div class="pp_inline">{content}</div>'
+        */
+        inline_markup?: string;
+
+        /**
+        * @default ''
+        */
+        custom_markup?: string;
+
+        /**
+        * Markup for social tools, set to html or false to disable
+        * @default '<div class="twitter"><a href="http://twitter.com/share" class="twitter-share-button" data-count="none">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script></div><div class="facebook"><iframe src="//www.facebook.com/plugins/like.php?locale=en_US&href={location_href}&amp;layout=button_count&amp;show_faces=true&amp;width=500&amp;action=like&amp;font&amp;colorscheme=light&amp;height=23" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:500px; height:23px;" allowTransparency="true"></iframe></div>'
+        */
+        social_tools?: any;
+    }
+
+    interface moduleJQuery {
+        /**
+        * Initialises prettyPhoto
+        */
+        (): JQuery;
+
+        /**
+        * Initialises prettyPhoto specificying overrides for the defaults
+        * @param pp_settings custom prettyPhoto settings
+        */
+        (pp_settings: PrettyPhotoSettings): JQuery;
+    }
+
+    interface moduleJQueryStatic {
+        /**
+        * prettyPhoto version number
+        */
+        version: string;
+
+        /**
+        * Opens the prettyPhoto modal box.
+        * Note: Always returns false.
+        */
+        open(): boolean;
+
+        /**
+        * Opens the prettyPhoto modal box.
+        * Note: Always returns false.
+        * @param image {String} Full path to the image to be open, can also be an array containing full images paths.
+        * @param title {String} The title to be displayed with the picture, can also be an array containing all the titles.
+        * @param description {String} The description to be displayed with the picture, can also be an array containing all the descriptions.
+        */
+        open(image: string, title: string, description: string): boolean;
+
+        /**
+        * Opens the prettyPhoto modal box.
+        * Note: Always returns false.
+        * @param image {Array} Full path to the image to be open, can also be an array containing full images paths.
+        * @param title {Array} The title to be displayed with the picture, can also be an array containing all the titles.
+        * @param description {Array} The description to be displayed with the picture, can also be an array containing all the descriptions.
+        */
+        open(images: string[], titles: string[], descriptions: string[]): boolean;
+
+        /**
+        * Change page in the prettyPhoto modal box
+        * @param direction {String} Direction of the paging, previous or next.
+        */
+        changePage(direction: string): void;
+
+        /**
+        * Change gallery page in the prettyPhoto modal box
+        * @param direction {String} Direction of the paging, previous or next.
+        */
+        changeGalleryPage(direction: string): void;
+
+        /**
+        * Start the slideshow...
+        */
+        startSlideshow(): void;
+
+        /**
+        * Stop the slideshow...
+        */
+        stopSlideshow(): void;
+
+        /**
+        * Closes prettyPhoto.
+        */
+        close(): void;
+    }
+}
+
+interface JQuery {
+    prettyPhoto: scaron_prettyPhoto.moduleJQuery;
+}
+
+interface JQueryStatic {
+    prettyPhoto: scaron_prettyPhoto.moduleJQueryStatic;
+}
diff --git a/jquery.prettyphoto/jquery.prettyphoto-tests.ts b/jquery.prettyphoto/jquery.prettyphoto-tests.ts
index 1cf3b40a89..54198cc265 100644
--- a/jquery.prettyphoto/jquery.prettyphoto-tests.ts
+++ b/jquery.prettyphoto/jquery.prettyphoto-tests.ts
@@ -1,7 +1,7 @@
 // Tests for prettyPhoto library 
 
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="jquery.prettyphoto.d.ts" />
+/// <reference types="jquery" />
+
 
 // JQUERY
 
diff --git a/jquery.prettyphoto/jquery.prettyphoto.d.ts b/jquery.prettyphoto/jquery.prettyphoto.d.ts
deleted file mode 100644
index dc0003212d..0000000000
--- a/jquery.prettyphoto/jquery.prettyphoto.d.ts
+++ /dev/null
@@ -1,290 +0,0 @@
-// Type definitions for jQuery prettyPhoto 3.1.5
-// Project: https://github.com/scaron/prettyphoto
-// Definitions by: pgaske <https://github.com/pgaske>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace scaron_prettyPhoto {
-    /**
-    * Pretty photo settings
-    */
-    interface PrettyPhotoSettings {
-        /**
-        * the attribute tag to use for prettyPhoto hooks.  For HTML5, use "data-rel" or similar.
-        * @default 'rel'
-        */
-        hook?: string;
-
-        /**
-        * fast/slow/normal
-        * @default 'fast'
-        */
-        animation_speed?: string;
-
-
-        ajaxcallback?: () => void;
-
-        /**
-        * false OR interval time in ms
-        * @default 5000
-        */
-        slideshow?: any;
-
-        /**
-        * true/false
-        * @default false
-        */
-        autoplay_slideshow?: boolean;
-
-        /**
-        * Value between 0 and 1
-        * @default 0.80
-        */
-        opacity?: number;
-
-        /**
-        * true/false
-        * @default true
-        */
-        show_title?: boolean;
-
-        /**
-        * Resize the photos bigger than viewport. true/false
-        * @default true
-        */
-        allow_resize?: boolean;
-
-        /**
-        * Allow the user to expand a resized image. true/false
-        * @default true
-        */
-        allow_expand?: boolean;
-
-        /**
-        * Pixels
-        * @default 500
-        */
-        default_width?: number;
-
-        /**
-        * Pixels
-        * @default 344
-        */
-        default_height?: number;
-
-        /**
-        * The separator for the gallery counter 1 "of" 2
-        * @default '/'
-        */
-        counter_separator_label?: string;
-
-        /**
-        * light_rounded / dark_rounded / light_square / dark_square / facebook
-        * @default 'pp_default'
-        */
-        theme?: string;
-
-        /**
-        * The padding on each side of the picture
-        * @default 20
-        */
-        horizontal_padding?: number;
-
-        /**
-        * Hides all the flash object on a page, set to TRUE if flash appears over prettyPhoto
-        * @default false
-        */
-        hideflash?: boolean;
-
-        /**
-        * Set the flash wmode attribute
-        * @default 'opaque'
-        */
-        wmode?: string;
-
-        /**
-        * Automatically start videos: True/False
-        * @default true
-        */
-        autoplay?: boolean;
-
-        /**
-        * If set to true, only the close button will close the window
-        * @default false
-        */
-        modal?: boolean;
-
-        /**
-        * Allow prettyPhoto to update the url to enable deeplinking.
-        * @default true
-        */
-        deeplinking?: boolean;
-
-        /**
-        * If set to true, a gallery will overlay the fullscreen image on mouse over
-        * @default true
-        */
-        overlay_gallery?: boolean;
-
-        /**
-        * Maximum number of pictures in the overlay gallery
-        * @default 30
-        */
-        overlay_gallery_max?: number;
-
-        /**
-        * Set to false if you open forms inside prettyPhoto
-        * @default true
-        */
-        keyboard_shortcuts?: boolean;
-
-        /**
-        * Called everytime an item is shown/changed
-        * @default function () { }
-        */
-        changepicturecallback?: () => void;
-
-        /**
-        * Called when prettyPhoto is closed
-        * @default function () { }
-        */
-        callback?: () => void;
-
-        /**
-        * @default true
-        */
-        ie6_fallback?: boolean;
-
-        /**
-        * Markup for pretty photo
-        * @default omitted for brevity
-        */
-        markup?: string;
-
-        /**
-        * Markup for pretty photo gallery
-        * @default omitted for brevity
-        */
-        gallery_markup?: string;
-
-        /**
-        * Markup for image
-        * @default '<img id="fullResImage" src="{path}" />'
-        */
-        image_markup?: string;
-
-        /**
-        * Markup for flash
-        * @default '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="{width}" height="{height}"><param name="wmode" value="{wmode}" /><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="{path}" /><embed src="{path}" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="{width}" height="{height}" wmode="{wmode}"></embed></object>'
-        */
-        flash_markup?: string;
-
-        /**
-        * Markup for quicktime
-        * @default '<object classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab" height="{height}" width="{width}"><param name="src" value="{path}"><param name="autoplay" value="{autoplay}"><param name="type" value="video/quicktime"><embed src="{path}" height="{height}" width="{width}" autoplay="{autoplay}" type="video/quicktime" pluginspage="http://www.apple.com/quicktime/download/"></embed></object>'
-        */
-        quicktime_markup?: string;
-
-        /**
-        * Markup for iframe
-        * @default '<iframe src ="{path}" width="{width}" height="{height}" frameborder="no"></iframe>'
-        */
-        iframe_markup?: string;
-
-        /**
-        * @default '<div class="pp_inline">{content}</div>'
-        */
-        inline_markup?: string;
-
-        /**
-        * @default ''
-        */
-        custom_markup?: string;
-
-        /**
-        * Markup for social tools, set to html or false to disable
-        * @default '<div class="twitter"><a href="http://twitter.com/share" class="twitter-share-button" data-count="none">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script></div><div class="facebook"><iframe src="//www.facebook.com/plugins/like.php?locale=en_US&href={location_href}&amp;layout=button_count&amp;show_faces=true&amp;width=500&amp;action=like&amp;font&amp;colorscheme=light&amp;height=23" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:500px; height:23px;" allowTransparency="true"></iframe></div>'
-        */
-        social_tools?: any;
-    }
-
-    interface moduleJQuery {
-        /**
-        * Initialises prettyPhoto
-        */
-        (): JQuery;
-
-        /**
-        * Initialises prettyPhoto specificying overrides for the defaults
-        * @param pp_settings custom prettyPhoto settings
-        */
-        (pp_settings: PrettyPhotoSettings): JQuery;
-    }
-
-    interface moduleJQueryStatic {
-        /**
-        * prettyPhoto version number
-        */
-        version: string;
-
-        /**
-        * Opens the prettyPhoto modal box.
-        * Note: Always returns false.
-        */
-        open(): boolean;
-
-        /**
-        * Opens the prettyPhoto modal box.
-        * Note: Always returns false.
-        * @param image {String} Full path to the image to be open, can also be an array containing full images paths.
-        * @param title {String} The title to be displayed with the picture, can also be an array containing all the titles.
-        * @param description {String} The description to be displayed with the picture, can also be an array containing all the descriptions.
-        */
-        open(image: string, title: string, description: string): boolean;
-
-        /**
-        * Opens the prettyPhoto modal box.
-        * Note: Always returns false.
-        * @param image {Array} Full path to the image to be open, can also be an array containing full images paths.
-        * @param title {Array} The title to be displayed with the picture, can also be an array containing all the titles.
-        * @param description {Array} The description to be displayed with the picture, can also be an array containing all the descriptions.
-        */
-        open(images: string[], titles: string[], descriptions: string[]): boolean;
-
-        /**
-        * Change page in the prettyPhoto modal box
-        * @param direction {String} Direction of the paging, previous or next.
-        */
-        changePage(direction: string): void;
-
-        /**
-        * Change gallery page in the prettyPhoto modal box
-        * @param direction {String} Direction of the paging, previous or next.
-        */
-        changeGalleryPage(direction: string): void;
-
-        /**
-        * Start the slideshow...
-        */
-        startSlideshow(): void;
-
-        /**
-        * Stop the slideshow...
-        */
-        stopSlideshow(): void;
-
-        /**
-        * Closes prettyPhoto.
-        */
-        close(): void;
-    }
-}
-
-interface JQuery {
-    prettyPhoto: scaron_prettyPhoto.moduleJQuery;
-}
-
-interface JQueryStatic {
-    prettyPhoto: scaron_prettyPhoto.moduleJQueryStatic;
-}
diff --git a/jquery.prettyphoto/tsconfig.json b/jquery.prettyphoto/tsconfig.json
new file mode 100644
index 0000000000..15326adc30
--- /dev/null
+++ b/jquery.prettyphoto/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.prettyphoto-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.qrcode/index.d.ts b/jquery.qrcode/index.d.ts
new file mode 100644
index 0000000000..94504d4dda
--- /dev/null
+++ b/jquery.qrcode/index.d.ts
@@ -0,0 +1,127 @@
+// Type definitions for jQuery.qrcode v0.12.0
+// Project: https://github.com/lrsjng/jquery-qrcode
+// Definitions by: Dan Manastireanu <https://github.com/danmana>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace JQueryQRCode {
+    /**
+     * One of the possible mode types.
+     */
+    export const enum Mode {
+        NORMAL,
+        LABEL_STRIP,
+        LABEL_BOX,
+        IMAGE_STRIP,
+        IMAGE_BOX
+    }
+
+    interface Options {
+        /**
+         * Render method: 'canvas', 'image' or 'div'
+         * @default 'canvas'
+         */
+        render?: string,
+
+        /**
+         * Start of version range, somewhere in 1 .. 40
+         * @default 1
+         */
+        minVersion?: number,
+        /**
+         * End of version range, somewhere in 1 .. 40
+         * @default 40
+         */
+        maxVersion?: number,
+
+        /**
+         * Error correction level: 'L', 'M', 'Q' or 'H'
+         * @default 'L'
+         */
+        ecLevel?: string,
+
+        /**
+         * Left offset in pixels, if drawn onto existing canvas
+         * @default 0
+         */
+        left?: number,
+        /**
+         * Top offset in pixels, if drawn onto existing canvas
+         * @default 0
+         */
+        top?: number,
+
+        /**
+         * Size in pixel
+         * @default 200
+         */
+        size?: number,
+
+        /**
+         * Code color or image element
+         * @default '#000'
+         */
+        fill?: string,
+
+        /**
+         * Background color or image element, null for transparent background
+         * @default null
+         */
+        background?: string,
+
+        /**
+         * The text content of the QR code.
+         * @default 'no text'
+         */
+        text?: string,
+
+        /**
+         * Corner radius relative to module width: 0.0 .. 0.5
+         * @default 0
+         */
+        radius?: number,
+
+        /**
+         * Quiet zone in modules
+         * @default 0
+         */
+        quiet?: number,
+
+        /**
+         * Mode
+         * @default Mode.NORMAL
+         */
+        mode?: Mode,
+
+
+        /** @default 0.1 */
+        mSize?: number,
+        /** @default 0.5 */
+        mPosX?: number,
+        /** @default 0.5 */
+        mPosY?: number,
+
+        /** @default 'no label' */
+        label?: string,
+        /** @default 'sans' */
+        fontname?: string,
+        /** @default '#000' */
+        fontcolor?: string,
+
+        /** @default null */
+        image?: string
+    }
+
+
+}
+
+
+
+interface JQuery {
+    /**
+     * Create a QR Code inside the selected container.
+     * @param options
+     */
+    qrcode(options?: JQueryQRCode.Options): JQuery;
+}
diff --git a/jquery.qrcode/jquery.qrcode-tests.ts b/jquery.qrcode/jquery.qrcode-tests.ts
index 716010c516..a634bd6f07 100644
--- a/jquery.qrcode/jquery.qrcode-tests.ts
+++ b/jquery.qrcode/jquery.qrcode-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.qrcode.d.ts"/>
+/// <reference types="jquery"/>
 
 // Examples from website (note: the examples use color instead of fill, which is not supported)
 $('.container').qrcode();
diff --git a/jquery.qrcode/jquery.qrcode.d.ts b/jquery.qrcode/jquery.qrcode.d.ts
deleted file mode 100644
index 0abc536ab6..0000000000
--- a/jquery.qrcode/jquery.qrcode.d.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-// Type definitions for jQuery.qrcode v0.12.0
-// Project: https://github.com/lrsjng/jquery-qrcode
-// Definitions by: Dan Manastireanu <https://github.com/danmana>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace JQueryQRCode {
-    /**
-     * One of the possible mode types.
-     */
-    export const enum Mode {
-        NORMAL,
-        LABEL_STRIP,
-        LABEL_BOX,
-        IMAGE_STRIP,
-        IMAGE_BOX
-    }
-
-    interface Options {
-        /**
-         * Render method: 'canvas', 'image' or 'div'
-         * @default 'canvas'
-         */
-        render?: string,
-
-        /**
-         * Start of version range, somewhere in 1 .. 40
-         * @default 1
-         */
-        minVersion?: number,
-        /**
-         * End of version range, somewhere in 1 .. 40
-         * @default 40
-         */
-        maxVersion?: number,
-
-        /**
-         * Error correction level: 'L', 'M', 'Q' or 'H'
-         * @default 'L'
-         */
-        ecLevel?: string,
-
-        /**
-         * Left offset in pixels, if drawn onto existing canvas
-         * @default 0
-         */
-        left?: number,
-        /**
-         * Top offset in pixels, if drawn onto existing canvas
-         * @default 0
-         */
-        top?: number,
-
-        /**
-         * Size in pixel
-         * @default 200
-         */
-        size?: number,
-
-        /**
-         * Code color or image element
-         * @default '#000'
-         */
-        fill?: string,
-
-        /**
-         * Background color or image element, null for transparent background
-         * @default null
-         */
-        background?: string,
-
-        /**
-         * The text content of the QR code.
-         * @default 'no text'
-         */
-        text?: string,
-
-        /**
-         * Corner radius relative to module width: 0.0 .. 0.5
-         * @default 0
-         */
-        radius?: number,
-
-        /**
-         * Quiet zone in modules
-         * @default 0
-         */
-        quiet?: number,
-
-        /**
-         * Mode
-         * @default Mode.NORMAL
-         */
-        mode?: Mode,
-
-
-        /** @default 0.1 */
-        mSize?: number,
-        /** @default 0.5 */
-        mPosX?: number,
-        /** @default 0.5 */
-        mPosY?: number,
-
-        /** @default 'no label' */
-        label?: string,
-        /** @default 'sans' */
-        fontname?: string,
-        /** @default '#000' */
-        fontcolor?: string,
-
-        /** @default null */
-        image?: string
-    }
-
-
-}
-
-
-
-interface JQuery {
-    /**
-     * Create a QR Code inside the selected container.
-     * @param options
-     */
-    qrcode(options?: JQueryQRCode.Options): JQuery;
-}
diff --git a/jquery.qrcode/tsconfig.json b/jquery.qrcode/tsconfig.json
new file mode 100644
index 0000000000..40d335bbb2
--- /dev/null
+++ b/jquery.qrcode/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.qrcode-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.rowGrid/index.d.ts b/jquery.rowGrid/index.d.ts
new file mode 100644
index 0000000000..ed6284b54e
--- /dev/null
+++ b/jquery.rowGrid/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for jQuery rowGrid.js plugin (v1.0.2)
+// Project: https://github.com/brunjo/rowGrid.js
+// Definitions by: Vinayak Garg <https://github.com/vinayak-garg>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface JQueryRowGridJSOptions {
+    minMargin?: number;
+    maxMargin?: number;
+    itemSelector: string;
+}
+
+interface JQuery {
+    rowGrid(options?: JQueryRowGridJSOptions): JQuery;
+    rowGrid(appended: string): JQuery;
+}
\ No newline at end of file
diff --git a/jquery.rowGrid/jquery.rowGrid-tests.ts b/jquery.rowGrid/jquery.rowGrid-tests.ts
index cb11d65964..ba3e5f822d 100644
--- a/jquery.rowGrid/jquery.rowGrid-tests.ts
+++ b/jquery.rowGrid/jquery.rowGrid-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.rowGrid.d.ts"/>
+/// <reference types="jquery"/>
 
 /*
  * Test different options
diff --git a/jquery.rowGrid/jquery.rowGrid.d.ts b/jquery.rowGrid/jquery.rowGrid.d.ts
deleted file mode 100644
index 1613d6d59c..0000000000
--- a/jquery.rowGrid/jquery.rowGrid.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for jQuery rowGrid.js plugin (v1.0.2)
-// Project: https://github.com/brunjo/rowGrid.js
-// Definitions by: Vinayak Garg <https://github.com/vinayak-garg>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface JQueryRowGridJSOptions {
-    minMargin?: number;
-    maxMargin?: number;
-    itemSelector: string;
-}
-
-interface JQuery {
-    rowGrid(options?: JQueryRowGridJSOptions): JQuery;
-    rowGrid(appended: string): JQuery;
-}
\ No newline at end of file
diff --git a/jquery.rowGrid/tsconfig.json b/jquery.rowGrid/tsconfig.json
new file mode 100644
index 0000000000..0e3e6885d2
--- /dev/null
+++ b/jquery.rowGrid/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.rowGrid-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.scrollTo/index.d.ts b/jquery.scrollTo/index.d.ts
new file mode 100644
index 0000000000..3a4f13d1a8
--- /dev/null
+++ b/jquery.scrollTo/index.d.ts
@@ -0,0 +1,116 @@
+// Type definitions for jQuery.scrollTo.js 1.4.4
+// Project: https://github.com/flesler/jquery.scrollTo
+// Definitions by: Neil Stalker <https://github.com/nestalk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface ScrollToOptions {
+    /**
+    * Which axis must be scrolled, use 'x', 'y', 'xy' or 'yx'.
+    */
+    axis?: string;
+    /**
+    * The OVERALL length of the animation.
+    */
+    duration?: any;
+    /**
+    * The easing method for the animation.
+    */
+    easing?: string;
+    /**
+    * If true, the margin of the target element will be deducted from the final position.
+    */
+    margin?: boolean;
+    /**
+    * Add/deduct from the end position. 
+    * One number for both axes or { top:x, left:y }.
+    */
+    offset?: any;
+    /**
+    * Add/deduct the height/width multiplied by 'over'.
+    * Can be { top:x, left:y } when using both axes.
+    */
+    over? : any;
+    /**
+    * If true, and both axis are given.
+    * The 2nd axis will only be animated after the first one ends.
+    */
+    queue?: boolean;
+    /**
+    * Function to be called after the scrolling ends. 
+    */
+    onAfter?: () => void;
+    /**
+    *  If queuing is activated, this function will be called after the first scrolling ends.
+    */
+    onAfterFirst?: () => void;
+}
+
+interface JQuery {
+    /**
+    * Scroll the matched elements
+    */
+    scrollTo: {
+        /**
+        * Scroll the matched elements
+        *
+        * @param target Where to scroll the matched elements.
+        * @param duration The OVERALL length of the animation
+        * @param settings Set of settings.
+        */
+        (target: any, duration?: number, settings?: ScrollToOptions): JQuery;
+        /**
+        * Scroll the matched elements
+        *
+        * @param target Where to scroll the matched elements.
+        * @param duration The OVERALL length of the animation
+        * @param onAfter The onAfter callback.
+        */
+        (target: any, duration: number, onAfter?: Function): JQuery;
+        /**
+        * Scroll the matched elements
+        *
+        * @param target Where to scroll the matched elements.
+        * @param settings Set of settings.
+        * @param onAfter The onAfter callback.
+        */
+        (target: any, settings: ScrollToOptions, onAfter?: Function): JQuery;
+
+    };
+
+}
+
+interface JQueryStatic {
+    /**
+    * Scroll window
+    */
+    scrollTo: {
+        /**
+        * Scroll window
+        *
+        * @param target Where to scroll the matched elements.
+        * @param duration The OVERALL length of the animation
+        * @param settings Set of settings.
+        */
+        (target: any, duration?: number, settings?: ScrollToOptions): JQuery;
+        /**
+        * Scroll window
+        *
+        * @param target Where to scroll the matched elements.
+        * @param duration The OVERALL length of the animation
+        * @param onAfter The onAfter callback.
+        */
+        (target: any, duration: number, onAfter?: Function): JQuery;
+        /**
+        * Scroll window
+        *
+        * @param target Where to scroll the matched elements.
+        * @param settings Set of settings.
+        * @param onAfter The onAfter callback.
+        */
+        (target: any, settings: ScrollToOptions, onAfter?: Function): JQuery;
+
+    };
+
+}
diff --git a/jquery.scrollTo/jquery.scrollTo-tests.ts b/jquery.scrollTo/jquery.scrollTo-tests.ts
index 009112606f..303ce0cd01 100644
--- a/jquery.scrollTo/jquery.scrollTo-tests.ts
+++ b/jquery.scrollTo/jquery.scrollTo-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.scrollTo.d.ts"/>
+/// <reference types="jquery"/>
 
 $('div').scrollTo(340);
 
diff --git a/jquery.scrollTo/jquery.scrollTo.d.ts b/jquery.scrollTo/jquery.scrollTo.d.ts
deleted file mode 100644
index 484d4dbb78..0000000000
--- a/jquery.scrollTo/jquery.scrollTo.d.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-// Type definitions for jQuery.scrollTo.js 1.4.4
-// Project: https://github.com/flesler/jquery.scrollTo
-// Definitions by: Neil Stalker <https://github.com/nestalk>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface ScrollToOptions {
-    /**
-    * Which axis must be scrolled, use 'x', 'y', 'xy' or 'yx'.
-    */
-    axis?: string;
-    /**
-    * The OVERALL length of the animation.
-    */
-    duration?: any;
-    /**
-    * The easing method for the animation.
-    */
-    easing?: string;
-    /**
-    * If true, the margin of the target element will be deducted from the final position.
-    */
-    margin?: boolean;
-    /**
-    * Add/deduct from the end position. 
-    * One number for both axes or { top:x, left:y }.
-    */
-    offset?: any;
-    /**
-    * Add/deduct the height/width multiplied by 'over'.
-    * Can be { top:x, left:y } when using both axes.
-    */
-    over? : any;
-    /**
-    * If true, and both axis are given.
-    * The 2nd axis will only be animated after the first one ends.
-    */
-    queue?: boolean;
-    /**
-    * Function to be called after the scrolling ends. 
-    */
-    onAfter?: () => void;
-    /**
-    *  If queuing is activated, this function will be called after the first scrolling ends.
-    */
-    onAfterFirst?: () => void;
-}
-
-interface JQuery {
-    /**
-    * Scroll the matched elements
-    */
-    scrollTo: {
-        /**
-        * Scroll the matched elements
-        *
-        * @param target Where to scroll the matched elements.
-        * @param duration The OVERALL length of the animation
-        * @param settings Set of settings.
-        */
-        (target: any, duration?: number, settings?: ScrollToOptions): JQuery;
-        /**
-        * Scroll the matched elements
-        *
-        * @param target Where to scroll the matched elements.
-        * @param duration The OVERALL length of the animation
-        * @param onAfter The onAfter callback.
-        */
-        (target: any, duration: number, onAfter?: Function): JQuery;
-        /**
-        * Scroll the matched elements
-        *
-        * @param target Where to scroll the matched elements.
-        * @param settings Set of settings.
-        * @param onAfter The onAfter callback.
-        */
-        (target: any, settings: ScrollToOptions, onAfter?: Function): JQuery;
-
-    };
-
-}
-
-interface JQueryStatic {
-    /**
-    * Scroll window
-    */
-    scrollTo: {
-        /**
-        * Scroll window
-        *
-        * @param target Where to scroll the matched elements.
-        * @param duration The OVERALL length of the animation
-        * @param settings Set of settings.
-        */
-        (target: any, duration?: number, settings?: ScrollToOptions): JQuery;
-        /**
-        * Scroll window
-        *
-        * @param target Where to scroll the matched elements.
-        * @param duration The OVERALL length of the animation
-        * @param onAfter The onAfter callback.
-        */
-        (target: any, duration: number, onAfter?: Function): JQuery;
-        /**
-        * Scroll window
-        *
-        * @param target Where to scroll the matched elements.
-        * @param settings Set of settings.
-        * @param onAfter The onAfter callback.
-        */
-        (target: any, settings: ScrollToOptions, onAfter?: Function): JQuery;
-
-    };
-
-}
diff --git a/jquery.scrollTo/tsconfig.json b/jquery.scrollTo/tsconfig.json
new file mode 100644
index 0000000000..60aacf69e4
--- /dev/null
+++ b/jquery.scrollTo/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.scrollTo-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.simplePagination/index.d.ts b/jquery.simplePagination/index.d.ts
new file mode 100644
index 0000000000..c09ea685e3
--- /dev/null
+++ b/jquery.simplePagination/index.d.ts
@@ -0,0 +1,39 @@
+// Type definitions for jQuery simplePagination.js v1.4
+// Project: https://github.com/flaviusmatis/simplePagination.js
+// Definitions by: Natan Vivo <https://github.com/nvivo/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface SimplePaginationOptions {
+    items?: number;
+    itemsOnPage?: number;
+    pages?: number;
+    displayedPages?: number;
+    edges?: number;
+    currentPage?: number;
+    hrefTextPrefix?: string;
+    hrefTextSuffix?: string;
+    prevText?: string;
+    nextText?: string;
+    cssStyle?: string;
+    selectOnClick?: boolean;
+    onPageClick?: (page: number, event: any) => void;
+    onInit?: () => void;
+}
+
+interface JQuery {
+    pagination(options?: SimplePaginationOptions): JQuery;
+    pagination(method: 'selectPage', pageNumber: number): void;
+    pagination(method: 'prevPage'): void;
+    pagination(method: 'nextPage'): void;
+    pagination(method: 'getPagesCount'): number;
+    pagination(method: 'getCurrentPage'): number;
+    pagination(method: 'disable'): void;
+    pagination(method: 'enable'): void;
+    pagination(method: 'destroy'): void;
+    pagination(method: 'redraw'): void;
+    pagination(method: 'updateItems', items: number): void;
+    pagination(method: string): any;
+    pagination(method: string, value: any): any;
+}
diff --git a/jquery.simplePagination/jquery.simplePagination-tests.ts b/jquery.simplePagination/jquery.simplePagination-tests.ts
index 728ca03a85..b35a6f42a0 100644
--- a/jquery.simplePagination/jquery.simplePagination-tests.ts
+++ b/jquery.simplePagination/jquery.simplePagination-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.simplePagination.d.ts"/>
+/// <reference types="jquery"/>
 
 var selector = '#elementId';
 
diff --git a/jquery.simplePagination/jquery.simplePagination.d.ts b/jquery.simplePagination/jquery.simplePagination.d.ts
deleted file mode 100644
index 7fc6543575..0000000000
--- a/jquery.simplePagination/jquery.simplePagination.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-// Type definitions for jQuery simplePagination.js v1.4
-// Project: https://github.com/flaviusmatis/simplePagination.js
-// Definitions by: Natan Vivo <https://github.com/nvivo/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface SimplePaginationOptions {
-    items?: number;
-    itemsOnPage?: number;
-    pages?: number;
-    displayedPages?: number;
-    edges?: number;
-    currentPage?: number;
-    hrefTextPrefix?: string;
-    hrefTextSuffix?: string;
-    prevText?: string;
-    nextText?: string;
-    cssStyle?: string;
-    selectOnClick?: boolean;
-    onPageClick?: (page: number, event: any) => void;
-    onInit?: () => void;
-}
-
-interface JQuery {
-    pagination(options?: SimplePaginationOptions): JQuery;
-    pagination(method: 'selectPage', pageNumber: number): void;
-    pagination(method: 'prevPage'): void;
-    pagination(method: 'nextPage'): void;
-    pagination(method: 'getPagesCount'): number;
-    pagination(method: 'getCurrentPage'): number;
-    pagination(method: 'disable'): void;
-    pagination(method: 'enable'): void;
-    pagination(method: 'destroy'): void;
-    pagination(method: 'redraw'): void;
-    pagination(method: 'updateItems', items: number): void;
-    pagination(method: string): any;
-    pagination(method: string, value: any): any;
-}
diff --git a/jquery.simplePagination/tsconfig.json b/jquery.simplePagination/tsconfig.json
new file mode 100644
index 0000000000..e4b1bc679c
--- /dev/null
+++ b/jquery.simplePagination/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.simplePagination-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.simplemodal/index.d.ts b/jquery.simplemodal/index.d.ts
new file mode 100644
index 0000000000..19ad376bfd
--- /dev/null
+++ b/jquery.simplemodal/index.d.ts
@@ -0,0 +1,118 @@
+// Type definitions for SimpleModal 1.4.4
+// Project: http://www.ericmmartin.com/projects/simplemodal/
+// Definitions by: Friedrich von Never <https://github.com/ForNeVeR>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace SimpleModal {
+    interface SimpleModalOptions {
+        /** The jQuery selector to append the elements to. For ASP.NET, use 'form'. Default: 'body'. */
+        appendTo?: string;
+
+        /** Focus in the first visible, enabled element? Default: true. */
+        focus?: boolean;
+
+        /** The opacity value for the overlay div, from 0 - 100. Default: 50. */
+        opacity?: number;
+
+        /** The DOM element id for the overlay div. Default: 'simplemodal-overlay'. */
+        overlayId?: string;
+
+        /** The CSS styling for the overlay div. Default: {}. */
+        overlayCss?: Object;
+
+        /** The DOM element id for the container div. Default: 'simplemodal-container'. */
+        containerId?: string;
+
+        /** The CSS styling for the container div. Default: {}. */
+        containerCss?: Object;
+
+        /** The DOM element id for the data div. Default: 'simplemodal-data'. */
+        dataId?: string;
+
+        /** The CSS styling for the data div. Default: {}. */
+        dataCss?: Object;
+
+        /** The minimum height for the container. Default: null. */
+        minHeight?: number;
+
+        /** The minimum width for the container. Default: null. */
+        minWidth?: number;
+
+        /** The maximum height for the container. If not specified, the window height is used. Default: null. */
+        maxHeight?: number;
+
+        /** The maximum width for the container. If not specified, the window width is used. Default: null. */
+        maxWidth?: number;
+
+        /** Resize the container if it exceeds the browser window dimensions? Default: false. (Changed in 1.4) */
+        autoResize?: boolean;
+
+        /** Automatically position the container upon creation and on window resize? Default: true. (Changed in 1.4) */
+        autoPosition?: boolean;
+
+        /** Starting z-index value. Default: 1000. */
+        zIndex?: number;
+
+        /** If true, closeHTML, escClose and overlayClose will be used if set. If false, none of them will be used. Default: true. */
+        close?: boolean;
+
+        /** The HTML for the default close link. SimpleModal will automatically add the closeClass to this element. Default: ''. */
+        closeHTML?: string;
+
+        /** The CSS class used to bind to the close event. Default: 'simplemodal-close'. */
+        closeClass?: string;
+
+        /** Allow Esc keypress to close the dialog? Default: true. */
+        escClose?: boolean;
+
+        /** Allow click on overlay to close the dialog? Default: false. */
+        overlayClose?: boolean;
+
+        /** Position of container [top, left]. Can be number of pixels or percentage. Default: null. */
+        position?: Array<any>;
+
+        /** Persist the data across modal calls? Only used for existing DOM elements. If true, the data will be maintained across modal calls, if false, the data will be reverted to its original state. Default: true. */
+        persist?: boolean;
+
+        /** User will be unable to interact with the page below the modal or tab away from the dialog. If false, the overlay, iframe, and certain events will be disabled allowing the user to interact with the page below the dialog. Default: true. (Added in 1.3.4. Name changed from transient in 1.3.5) */
+        modal?: boolean;
+
+        /** The callback function used in place of SimpleModal's open. Default: null. */
+        onOpen?: (dialog: SimpleModalDialog) => void;
+
+        /** The callback function used after the modal dialog has opened. Default: null. */
+        onShow?: (dialog: SimpleModalDialog) => void;
+
+        /** The callback function used in place of SimpleModal's close. Default: null. */
+        onClose?: (dialog: SimpleModalDialog) => void;
+    }
+
+    /** Sent to callbacks as a parameter. */
+    interface SimpleModalDialog {
+        overlay: JQuery;
+        container: JQuery;
+        data: any;
+        iframe: JQuery;
+    }
+
+    interface Static {
+        defaults: SimpleModalOptions;
+        (element: JQuery, options?: SimpleModalOptions): JQuery;
+        (html: string, options?: SimpleModalOptions): JQuery;
+        close(): void;
+    }
+
+    interface JQueryExtension {
+        (options?: SimpleModalOptions): JQuery;
+    }
+}
+
+interface JQueryStatic {
+    modal: SimpleModal.Static;
+}
+
+interface JQuery {
+    modal: SimpleModal.JQueryExtension;
+}
diff --git a/jquery.simplemodal/jquery.simplemodal-tests.ts b/jquery.simplemodal/jquery.simplemodal-tests.ts
index fc27d11c73..8e73e057cc 100644
--- a/jquery.simplemodal/jquery.simplemodal-tests.ts
+++ b/jquery.simplemodal/jquery.simplemodal-tests.ts
@@ -1,7 +1,6 @@
 // Tests taken from documentation: http://www.ericmmartin.com/projects/simplemodal/
 
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.simplemodal.d.ts"/>
+/// <reference types="jquery"/>
 
 // Chained call with no options
 $("#sample").modal();
diff --git a/jquery.simplemodal/jquery.simplemodal.d.ts b/jquery.simplemodal/jquery.simplemodal.d.ts
deleted file mode 100644
index 25dfa4aa2a..0000000000
--- a/jquery.simplemodal/jquery.simplemodal.d.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-// Type definitions for SimpleModal 1.4.4
-// Project: http://www.ericmmartin.com/projects/simplemodal/
-// Definitions by: Friedrich von Never <https://github.com/ForNeVeR>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace SimpleModal {
-    interface SimpleModalOptions {
-        /** The jQuery selector to append the elements to. For ASP.NET, use 'form'. Default: 'body'. */
-        appendTo?: string;
-
-        /** Focus in the first visible, enabled element? Default: true. */
-        focus?: boolean;
-
-        /** The opacity value for the overlay div, from 0 - 100. Default: 50. */
-        opacity?: number;
-
-        /** The DOM element id for the overlay div. Default: 'simplemodal-overlay'. */
-        overlayId?: string;
-
-        /** The CSS styling for the overlay div. Default: {}. */
-        overlayCss?: Object;
-
-        /** The DOM element id for the container div. Default: 'simplemodal-container'. */
-        containerId?: string;
-
-        /** The CSS styling for the container div. Default: {}. */
-        containerCss?: Object;
-
-        /** The DOM element id for the data div. Default: 'simplemodal-data'. */
-        dataId?: string;
-
-        /** The CSS styling for the data div. Default: {}. */
-        dataCss?: Object;
-
-        /** The minimum height for the container. Default: null. */
-        minHeight?: number;
-
-        /** The minimum width for the container. Default: null. */
-        minWidth?: number;
-
-        /** The maximum height for the container. If not specified, the window height is used. Default: null. */
-        maxHeight?: number;
-
-        /** The maximum width for the container. If not specified, the window width is used. Default: null. */
-        maxWidth?: number;
-
-        /** Resize the container if it exceeds the browser window dimensions? Default: false. (Changed in 1.4) */
-        autoResize?: boolean;
-
-        /** Automatically position the container upon creation and on window resize? Default: true. (Changed in 1.4) */
-        autoPosition?: boolean;
-
-        /** Starting z-index value. Default: 1000. */
-        zIndex?: number;
-
-        /** If true, closeHTML, escClose and overlayClose will be used if set. If false, none of them will be used. Default: true. */
-        close?: boolean;
-
-        /** The HTML for the default close link. SimpleModal will automatically add the closeClass to this element. Default: ''. */
-        closeHTML?: string;
-
-        /** The CSS class used to bind to the close event. Default: 'simplemodal-close'. */
-        closeClass?: string;
-
-        /** Allow Esc keypress to close the dialog? Default: true. */
-        escClose?: boolean;
-
-        /** Allow click on overlay to close the dialog? Default: false. */
-        overlayClose?: boolean;
-
-        /** Position of container [top, left]. Can be number of pixels or percentage. Default: null. */
-        position?: Array<any>;
-
-        /** Persist the data across modal calls? Only used for existing DOM elements. If true, the data will be maintained across modal calls, if false, the data will be reverted to its original state. Default: true. */
-        persist?: boolean;
-
-        /** User will be unable to interact with the page below the modal or tab away from the dialog. If false, the overlay, iframe, and certain events will be disabled allowing the user to interact with the page below the dialog. Default: true. (Added in 1.3.4. Name changed from transient in 1.3.5) */
-        modal?: boolean;
-
-        /** The callback function used in place of SimpleModal's open. Default: null. */
-        onOpen?: (dialog: SimpleModalDialog) => void;
-
-        /** The callback function used after the modal dialog has opened. Default: null. */
-        onShow?: (dialog: SimpleModalDialog) => void;
-
-        /** The callback function used in place of SimpleModal's close. Default: null. */
-        onClose?: (dialog: SimpleModalDialog) => void;
-    }
-
-    /** Sent to callbacks as a parameter. */
-    interface SimpleModalDialog {
-        overlay: JQuery;
-        container: JQuery;
-        data: any;
-        iframe: JQuery;
-    }
-
-    interface Static {
-        defaults: SimpleModalOptions;
-        (element: JQuery, options?: SimpleModalOptions): JQuery;
-        (html: string, options?: SimpleModalOptions): JQuery;
-        close(): void;
-    }
-
-    interface JQueryExtension {
-        (options?: SimpleModalOptions): JQuery;
-    }
-}
-
-interface JQueryStatic {
-    modal: SimpleModal.Static;
-}
-
-interface JQuery {
-    modal: SimpleModal.JQueryExtension;
-}
-
-/** Ambient wrapper so it can be loaded through require. */
-declare module 'simplemodal' {
-    export = SimpleModal;
-}
diff --git a/jquery.simplemodal/tsconfig.json b/jquery.simplemodal/tsconfig.json
new file mode 100644
index 0000000000..dbe58c81d5
--- /dev/null
+++ b/jquery.simplemodal/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.simplemodal-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.simulate/index.d.ts b/jquery.simulate/index.d.ts
new file mode 100644
index 0000000000..65a80a263e
--- /dev/null
+++ b/jquery.simulate/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for jquery.simulate.js
+// Project: https://github.com/jquery/jquery-simulate
+// Definitions by: Derek Cicerone <https://github.com/derekcicerone/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface JQuery {
+
+    /**
+     * Simulates an event.
+     *
+     * @param type
+     *            the type of event (eg: "mousemove", "keydown", etc...)
+     * @param options
+     *            the options for the event (these are event-specific)
+     */
+    simulate(type: string, options?: any): void;
+}
diff --git a/jquery.simulate/jquery.simulate-tests.ts b/jquery.simulate/jquery.simulate-tests.ts
index 98de970342..774c471fb6 100644
--- a/jquery.simulate/jquery.simulate-tests.ts
+++ b/jquery.simulate/jquery.simulate-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="jquery.simulate.d.ts"/>
-
 var $element = $("body");
 
 $element.simulate("click");
diff --git a/jquery.simulate/jquery.simulate.d.ts b/jquery.simulate/jquery.simulate.d.ts
deleted file mode 100644
index 5aa43a82bb..0000000000
--- a/jquery.simulate/jquery.simulate.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Type definitions for jquery.simulate.js
-// Project: https://github.com/jquery/jquery-simulate
-// Definitions by: Derek Cicerone <https://github.com/derekcicerone/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface JQuery {
-
-    /**
-     * Simulates an event.
-     *
-     * @param type
-     *            the type of event (eg: "mousemove", "keydown", etc...)
-     * @param options
-     *            the options for the event (these are event-specific)
-     */
-    simulate(type: string, options?: any): void;
-}
diff --git a/jquery.simulate/tsconfig.json b/jquery.simulate/tsconfig.json
new file mode 100644
index 0000000000..48dbb98ab9
--- /dev/null
+++ b/jquery.simulate/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.simulate-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.slimScroll/index.d.ts b/jquery.slimScroll/index.d.ts
new file mode 100644
index 0000000000..f07ef9636f
--- /dev/null
+++ b/jquery.slimScroll/index.d.ts
@@ -0,0 +1,64 @@
+// Type definitions for jQuery.slimScroll v1.3.3
+// Project: https://github.com/rochal/jQuery-slimScroll
+// Definitions by: Chintan Shah <https://github.com/Promact>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/// <reference types="jquery"/>
+
+interface IJQuerySlimScrollOptions {
+    // width in pixels of the visible scroll area
+    width? :string;
+    // height in pixels of the visible scroll area
+    height? :string;
+    // width in pixels of the scrollbar and rail
+    size? :string;
+    // scrollbar color, accepts any hex/color value
+    color?:string;
+    // scrollbar position - left/right
+    position?:string;
+    // distance in pixels between the side edge and the scrollbar
+    distance?:string;
+    // default scroll position on load - top / bottom / $('selector')
+    start?:any;
+    // sets scrollbar opacity
+    opacity? :number;
+    // enables always-on mode for the scrollbar
+    alwaysVisible?: boolean;
+    // check if we should hide the scrollbar when user is hovering over
+    disableFadeOut?: boolean;
+    // sets visibility of the rail
+    railVisible?: boolean;
+    // sets rail color
+    railColor?: string;
+    // sets rail opacity
+    railOpacity?:number;
+    // whether  we should use jQuery UI Draggable to enable bar dragging
+    railDraggable?: boolean;
+    // defautlt CSS class of the slimscroll rail
+    railClass?: string;
+    // defautlt CSS class of the slimscroll bar
+    barClass?: string;
+    // defautlt CSS class of the slimscroll wrapper
+    wrapperClass?: string;
+    // check if mousewheel should scroll the window if we reach top/bottom
+    allowPageScroll?: boolean;
+    // scroll amount applied to each mouse wheel step
+    wheelStep?: number;
+    // scroll amount applied when user is using gestures
+    touchScrollStep?: number;
+    // sets border radius
+    borderRadius?: string;
+    // sets border radius of the rail
+    railBorderRadius?: string;
+    // jumps to the specified scroll value
+    scrollTo?: string;
+    // increases/decreases current scroll value by specified amount
+    scrollBy?: string;
+}
+
+interface JQuery {
+    slimScroll:{
+        (): JQuery;
+        (options:IJQuerySlimScrollOptions): JQuery;
+    }
+}
+
diff --git a/jquery.slimScroll/jquery.SlimScroll-tests.ts b/jquery.slimScroll/jquery.SlimScroll-tests.ts
index deb4f2406d..1a997232fa 100644
--- a/jquery.slimScroll/jquery.SlimScroll-tests.ts
+++ b/jquery.slimScroll/jquery.SlimScroll-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.slimScroll.d.ts"/>
+/// <reference types="jquery"/>
 
 $("div").slimScroll();
 
diff --git a/jquery.slimScroll/jquery.slimScroll.d.ts b/jquery.slimScroll/jquery.slimScroll.d.ts
deleted file mode 100644
index 4d77d28817..0000000000
--- a/jquery.slimScroll/jquery.slimScroll.d.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-// Type definitions for jQuery.slimScroll v1.3.3
-// Project: https://github.com/rochal/jQuery-slimScroll
-// Definitions by: Chintan Shah <https://github.com/Promact>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface IJQuerySlimScrollOptions {
-    // width in pixels of the visible scroll area
-    width? :string;
-    // height in pixels of the visible scroll area
-    height? :string;
-    // width in pixels of the scrollbar and rail
-    size? :string;
-    // scrollbar color, accepts any hex/color value
-    color?:string;
-    // scrollbar position - left/right
-    position?:string;
-    // distance in pixels between the side edge and the scrollbar
-    distance?:string;
-    // default scroll position on load - top / bottom / $('selector')
-    start?:any;
-    // sets scrollbar opacity
-    opacity? :number;
-    // enables always-on mode for the scrollbar
-    alwaysVisible?: boolean;
-    // check if we should hide the scrollbar when user is hovering over
-    disableFadeOut?: boolean;
-    // sets visibility of the rail
-    railVisible?: boolean;
-    // sets rail color
-    railColor?: string;
-    // sets rail opacity
-    railOpacity?:number;
-    // whether  we should use jQuery UI Draggable to enable bar dragging
-    railDraggable?: boolean;
-    // defautlt CSS class of the slimscroll rail
-    railClass?: string;
-    // defautlt CSS class of the slimscroll bar
-    barClass?: string;
-    // defautlt CSS class of the slimscroll wrapper
-    wrapperClass?: string;
-    // check if mousewheel should scroll the window if we reach top/bottom
-    allowPageScroll?: boolean;
-    // scroll amount applied to each mouse wheel step
-    wheelStep?: number;
-    // scroll amount applied when user is using gestures
-    touchScrollStep?: number;
-    // sets border radius
-    borderRadius?: string;
-    // sets border radius of the rail
-    railBorderRadius?: string;
-    // jumps to the specified scroll value
-    scrollTo?: string;
-    // increases/decreases current scroll value by specified amount
-    scrollBy?: string;
-}
-
-interface JQuery {
-    slimScroll:{
-        (): JQuery;
-        (options:IJQuerySlimScrollOptions): JQuery;
-    }
-}
-
diff --git a/jquery.slimScroll/tsconfig.json b/jquery.slimScroll/tsconfig.json
new file mode 100644
index 0000000000..05200690d1
--- /dev/null
+++ b/jquery.slimScroll/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.slimScroll-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.soap/index.d.ts b/jquery.soap/index.d.ts
new file mode 100644
index 0000000000..384b5bc480
--- /dev/null
+++ b/jquery.soap/index.d.ts
@@ -0,0 +1,83 @@
+// Type definitions for jQuery.SOAP 1.6.7
+// Project: https://github.com/doedje/jquery.soap
+// Definitions by: Roland Greim <https://github.com/tigerxy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/
+
+/// <reference types="jquery"/>
+
+declare namespace JQuerySOAP {
+    interface SOAPEnvelope {
+        attributes: Object
+        bodies: Array<SOAPObject>
+        headers: Array<SOAPObject>
+        prefix: string
+        soapConfig: any
+        typeOf: string
+        addAttribute(name: String, value: string): void
+        addAttribute(name: String, value: number): void
+        addBody(soapObject: SOAPObject): void
+        addHeader(soapObject: SOAPObject): void
+        addNamespace(name: String, uri: string): void
+        toString(): string
+        send(options: Options): void
+    }
+    interface SOAPResponse {
+        toJSON(): any
+        toString(): String
+        toXML(): XMLDocument
+    }
+
+    interface SOAPObject {
+        attributes: Object
+        children: Array<SOAPObject>
+        name: string
+        ns: Object
+        _parent: SOAPObject
+        value: any
+        typeOf: string
+        addNamespace(name: String, url: string): void
+        addParameter(name: String, value: string): void
+        addParameter(name: String, value: number): void
+        appendChild(soapObject: SOAPObject): SOAPObject
+        attr(name: string, value: string): Object
+        attr(name: string, value: number): Object
+        end(): SOAPObject
+        find(name: string): SOAPObject
+        hasChildren(): boolean
+        newChild(name: string): SOAPObject
+        parent(): SOAPObject
+        toString(): string
+        val(value: string): SOAPObject
+        val(value: number): SOAPObject
+    }
+    interface Options {
+        appendMethodToURL?: boolean;
+        async?: boolean;
+        beforeSend?: (SOAPEnvelope: SOAPEnvelope) => void;
+        context?: any;
+        data?: Object;
+        envAttributes?: any;
+        elementName?: string;
+        enableLogging?: boolean;
+        error?: (SOAPResponse: SOAPResponse) => void;
+        HTTPHeaders?: Object;
+        method?: string;
+        namespaceQualifier?: string;
+        namespaceURL?: string;
+        noPrefix?: boolean;
+        request?: (SOAPEnvelope: SOAPEnvelope) => void;
+        soap12?: boolean;
+        SOAPAction?: string;
+        SOAPHeader?: Object;
+        statusCode?: Object;
+        success?: (SOAPResponse: SOAPResponse) => void;
+        url?: string;
+        wss?: Object;
+    }
+    interface SOAP {
+        (options?: Options): JQueryXHR;
+    }
+}
+interface JQueryStatic {
+    soap: JQuerySOAP.SOAP;
+}
diff --git a/jquery.soap/jquery.soap-tests.ts b/jquery.soap/jquery.soap-tests.ts
index acef40d8cd..519f1cbae4 100644
--- a/jquery.soap/jquery.soap-tests.ts
+++ b/jquery.soap/jquery.soap-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="jquery.soap.d.ts"/>
-
 $.soap({
     url: 'http://my.server.com/soapservices/',
     method: 'helloWorld',
diff --git a/jquery.soap/jquery.soap.d.ts b/jquery.soap/jquery.soap.d.ts
deleted file mode 100644
index 340a5221df..0000000000
--- a/jquery.soap/jquery.soap.d.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-// Type definitions for jQuery.SOAP 1.6.7
-// Project: https://github.com/doedje/jquery.soap
-// Definitions by: Roland Greim <https://github.com/tigerxy>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-declare namespace JQuerySOAP {
-    interface SOAPEnvelope {
-        attributes: Object
-        bodies: Array<SOAPObject>
-        headers: Array<SOAPObject>
-        prefix: string
-        soapConfig: any
-        typeOf: string
-        addAttribute(name: String, value: string): void
-        addAttribute(name: String, value: number): void
-        addBody(soapObject: SOAPObject): void
-        addHeader(soapObject: SOAPObject): void
-        addNamespace(name: String, uri: string): void
-        toString(): string
-        send(options: Options): void
-    }
-    interface SOAPResponse {
-        toJSON(): any
-        toString(): String
-        toXML(): XMLDocument
-    }
-
-    interface SOAPObject {
-        attributes: Object
-        children: Array<SOAPObject>
-        name: string
-        ns: Object
-        _parent: SOAPObject
-        value: any
-        typeOf: string
-        addNamespace(name: String, url: string): void
-        addParameter(name: String, value: string): void
-        addParameter(name: String, value: number): void
-        appendChild(soapObject: SOAPObject): SOAPObject
-        attr(name: string, value: string): Object
-        attr(name: string, value: number): Object
-        end(): SOAPObject
-        find(name: string): SOAPObject
-        hasChildren(): boolean
-        newChild(name: string): SOAPObject
-        parent(): SOAPObject
-        toString(): string
-        val(value: string): SOAPObject
-        val(value: number): SOAPObject
-    }
-    interface Options {
-        appendMethodToURL?: boolean;
-        async?: boolean;
-        beforeSend?: (SOAPEnvelope: SOAPEnvelope) => void;
-        context?: any;
-        data?: Object;
-        envAttributes?: any;
-        elementName?: string;
-        enableLogging?: boolean;
-        error?: (SOAPResponse: SOAPResponse) => void;
-        HTTPHeaders?: Object;
-        method?: string;
-        namespaceQualifier?: string;
-        namespaceURL?: string;
-        noPrefix?: boolean;
-        request?: (SOAPEnvelope: SOAPEnvelope) => void;
-        soap12?: boolean;
-        SOAPAction?: string;
-        SOAPHeader?: Object;
-        statusCode?: Object;
-        success?: (SOAPResponse: SOAPResponse) => void;
-        url?: string;
-        wss?: Object;
-    }
-    interface SOAP {
-        (options?: Options): JQueryXHR;
-    }
-}
-interface JQueryStatic {
-    soap: JQuerySOAP.SOAP;
-}
diff --git a/jquery.soap/tsconfig.json b/jquery.soap/tsconfig.json
new file mode 100644
index 0000000000..b1b0dd411e
--- /dev/null
+++ b/jquery.soap/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.soap-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.sortElements/index.d.ts b/jquery.sortElements/index.d.ts
new file mode 100644
index 0000000000..5fbf62ab8e
--- /dev/null
+++ b/jquery.sortElements/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for jQuery.sortElements
+// Project: http://james.padolsey.com/javascript/sorting-elements-with-jquery/
+// Definitions by: Tim Bureck <https://github.com/tbureck>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface JQuery {
+    sortElements(comparator:Function, getSortable?:Function):JQuery;
+}
diff --git a/jquery.sortElements/jquery.sortElement.d.ts b/jquery.sortElements/jquery.sortElement.d.ts
deleted file mode 100644
index 6a3e6581b7..0000000000
--- a/jquery.sortElements/jquery.sortElement.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Type definitions for jQuery.sortElements
-// Project: http://james.padolsey.com/javascript/sorting-elements-with-jquery/
-// Definitions by: Tim Bureck <https://github.com/tbureck>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path='../jquery/jquery.d.ts'/>
-
-interface JQuery {
-    sortElements(comparator:Function, getSortable?:Function):JQuery;
-}
diff --git a/jquery.sortElements/tsconfig.json b/jquery.sortElements/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/jquery.sortElements/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.superLink/index.d.ts b/jquery.superLink/index.d.ts
new file mode 100644
index 0000000000..3c7bffc074
--- /dev/null
+++ b/jquery.superLink/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for jquery.superLink
+// Project: http://james.padolsey.com/demos/plugins/jQuery/superLink/superlink.jquery.js
+// Definitions by: Blake Niemyjski <https://github.com/niemyjski/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface JQuery {
+    superLink(link?: string): JQuery;
+}
\ No newline at end of file
diff --git a/jquery.superLink/jquery.superLink.d.ts b/jquery.superLink/jquery.superLink.d.ts
deleted file mode 100644
index a70d97d2e8..0000000000
--- a/jquery.superLink/jquery.superLink.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Type definitions for jquery.superLink
-// Project: http://james.padolsey.com/demos/plugins/jQuery/superLink/superlink.jquery.js
-// Definitions by: Blake Niemyjski <https://github.com/niemyjski/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface JQuery {
-    superLink(link?: string): JQuery;
-}
\ No newline at end of file
diff --git a/jquery.superLink/tsconfig.json b/jquery.superLink/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/jquery.superLink/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.tagsmanager/index.d.ts b/jquery.tagsmanager/index.d.ts
new file mode 100644
index 0000000000..aa9ff8e74f
--- /dev/null
+++ b/jquery.tagsmanager/index.d.ts
@@ -0,0 +1,72 @@
+// Type definitions for jQuery Tags Manager
+// Project: http://welldonethings.com/tags/manager
+// Definitions by: Vincent Bortone <https://github.com/vbortone>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface ITagsManagerOptions {
+    prefilled?: any;
+    CapitalizeFirstLetter?: boolean;
+    preventSubmitOnEnter?: boolean;
+    isClearInputOnEsc?: boolean;
+    typeahead?: boolean;
+    typeaheadAjaxSource?: string;
+    typeaheadAjaxPolling?: boolean;
+    typeaheadDelegate?: Function;
+    typeaheadOverrides?: ITypeaheadOverrides;
+    typeaheadSource?: any;
+    AjaxPush?: string; //url
+    delimeters?: number[];
+    backspace?: number[];
+    maxTags?: number;
+    blinkBGColor_1?: string;
+    blinkBGColor_2?: string;
+    hiddenTagListName?: string;
+    hiddenTagListId?: string;
+    deleteTagsOnBackspace?: boolean;
+    tagsContainer?: HTMLElement;
+    tagCloseIcon?: string;
+    tagClass?: string;
+    validator?: Function;
+}
+
+interface ITypeaheadOverrides {
+    instanceSelectHandler?: Function;
+    selectedClass?: string;
+    select?: Function;
+}
+
+interface ITagsManager {
+    tagManagerOptions: ITagsManagerOptions;
+    obj: JQuery;
+    objName: string;
+    queuedTag: string;
+    delimeters: number[];
+    backspace: number[];
+    tagToManipulate: string;
+
+    initialize(context: JQuery,
+               options?: ITagsManagerOptions,
+               tagToManipulate?: string): void;
+    setupTypeahead(): void;
+    onTypeaheadAjaxSuccess(data: any, isSetTypeaheadSource: boolean, process?: Function): void;
+    ajaxPolling(query: string, process: Function): void;
+    setTypeaheadSource(source: any): void;
+    trimTag(tag: string): string;
+    popTag(): void;
+    empty(): void;
+    refreshHiddenTagList(): void;
+    spliceTag(tagId: number, eventData: any): void;
+    pushTag(tag: string, objToPush: any, isValid: boolean): void;
+
+    setOptions(options: ITagsManagerOptions): void;
+    setContext(context: JQuery, tagToManipulate?: string): void;
+    processCommand(context: JQuery, command: string, tagToManipulate?: string): JQuery;
+    processTags(command?: string, context?: JQuery, tagToManipulate?: string): JQuery;
+}
+
+interface JQuery {
+	tagsManager(options?: ITagsManagerOptions): JQuery;
+	tagsManager(command: string, tagToManipulate?: string): JQuery;
+}
diff --git a/jquery.tagsmanager/jquery.tagsmanager-tests.ts b/jquery.tagsmanager/jquery.tagsmanager-tests.ts
index 1e0df62c25..33af6a8b7b 100644
--- a/jquery.tagsmanager/jquery.tagsmanager-tests.ts
+++ b/jquery.tagsmanager/jquery.tagsmanager-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.tagsmanager.d.ts" />
+/// <reference types="jquery"/>
+
 
 var options: ITagsManagerOptions = {
 	prefilled: ["Pisa", "Rome"],
diff --git a/jquery.tagsmanager/jquery.tagsmanager.d.ts b/jquery.tagsmanager/jquery.tagsmanager.d.ts
deleted file mode 100644
index 2e98a0231c..0000000000
--- a/jquery.tagsmanager/jquery.tagsmanager.d.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-// Type definitions for jQuery Tags Manager
-// Project: http://welldonethings.com/tags/manager
-// Definitions by: Vincent Bortone <https://github.com/vbortone>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface ITagsManagerOptions {
-    prefilled?: any;
-    CapitalizeFirstLetter?: boolean;
-    preventSubmitOnEnter?: boolean;
-    isClearInputOnEsc?: boolean;
-    typeahead?: boolean;
-    typeaheadAjaxSource?: string;
-    typeaheadAjaxPolling?: boolean;
-    typeaheadDelegate?: Function;
-    typeaheadOverrides?: ITypeaheadOverrides;
-    typeaheadSource?: any;
-    AjaxPush?: string; //url
-    delimeters?: number[];
-    backspace?: number[];
-    maxTags?: number;
-    blinkBGColor_1?: string;
-    blinkBGColor_2?: string;
-    hiddenTagListName?: string;
-    hiddenTagListId?: string;
-    deleteTagsOnBackspace?: boolean;
-    tagsContainer?: HTMLElement;
-    tagCloseIcon?: string;
-    tagClass?: string;
-    validator?: Function;
-}
-
-interface ITypeaheadOverrides {
-    instanceSelectHandler?: Function;
-    selectedClass?: string;
-    select?: Function;
-}
-
-interface ITagsManager {
-    tagManagerOptions: ITagsManagerOptions;
-    obj: JQuery;
-    objName: string;
-    queuedTag: string;
-    delimeters: number[];
-    backspace: number[];
-    tagToManipulate: string;
-
-    initialize(context: JQuery,
-               options?: ITagsManagerOptions,
-               tagToManipulate?: string): void;
-    setupTypeahead(): void;
-    onTypeaheadAjaxSuccess(data: any, isSetTypeaheadSource: boolean, process?: Function): void;
-    ajaxPolling(query: string, process: Function): void;
-    setTypeaheadSource(source: any): void;
-    trimTag(tag: string): string;
-    popTag(): void;
-    empty(): void;
-    refreshHiddenTagList(): void;
-    spliceTag(tagId: number, eventData: any): void;
-    pushTag(tag: string, objToPush: any, isValid: boolean): void;
-
-    setOptions(options: ITagsManagerOptions): void;
-    setContext(context: JQuery, tagToManipulate?: string): void;
-    processCommand(context: JQuery, command: string, tagToManipulate?: string): JQuery;
-    processTags(command?: string, context?: JQuery, tagToManipulate?: string): JQuery;
-}
-
-interface JQuery {
-	tagsManager(options?: ITagsManagerOptions): JQuery;
-	tagsManager(command: string, tagToManipulate?: string): JQuery;
-}
diff --git a/jquery.tagsmanager/tsconfig.json b/jquery.tagsmanager/tsconfig.json
new file mode 100644
index 0000000000..e3f9caaa97
--- /dev/null
+++ b/jquery.tagsmanager/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.tagsmanager-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.tile/index.d.ts b/jquery.tile/index.d.ts
new file mode 100644
index 0000000000..d8437b0b01
--- /dev/null
+++ b/jquery.tile/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for jquery.tile.js 1.1.0
+// Project: https://github.com/urin/jquery.tile.js
+// Definitions by: Shunsuke Ohtani <https://github.com/zaneli>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface JQuery {
+    /**
+     * Align the height of the largest of the elements arranged in the same row.
+     * if columns is not specified, align the height of the largest of the all elements.
+     *
+     * @param columns Number of elements in a row
+     */
+    tile(columns?: number): void;
+}
diff --git a/jquery.tile/jquery.tile-tests.ts b/jquery.tile/jquery.tile-tests.ts
index e4f63a0a7f..e9c4aaa6e5 100644
--- a/jquery.tile/jquery.tile-tests.ts
+++ b/jquery.tile/jquery.tile-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="jquery.tile.d.ts"/>
-
 $('div').tile();
 
 $('div').tile(4);
diff --git a/jquery.tile/jquery.tile.d.ts b/jquery.tile/jquery.tile.d.ts
deleted file mode 100644
index fce65eefbc..0000000000
--- a/jquery.tile/jquery.tile.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Type definitions for jquery.tile.js 1.1.0
-// Project: https://github.com/urin/jquery.tile.js
-// Definitions by: Shunsuke Ohtani <https://github.com/zaneli>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface JQuery {
-    /**
-     * Align the height of the largest of the elements arranged in the same row.
-     * if columns is not specified, align the height of the largest of the all elements.
-     *
-     * @param columns Number of elements in a row
-     */
-    tile(columns?: number): void;
-}
diff --git a/jquery.tile/tsconfig.json b/jquery.tile/tsconfig.json
new file mode 100644
index 0000000000..c5ce2d30ac
--- /dev/null
+++ b/jquery.tile/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.tile-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.timeago/index.d.ts b/jquery.timeago/index.d.ts
new file mode 100644
index 0000000000..8563792d7a
--- /dev/null
+++ b/jquery.timeago/index.d.ts
@@ -0,0 +1,62 @@
+// Type definitions for jQuery.timeago.js 1.0.2
+// Project: http://timeago.yarp.com/
+// Definitions by: François Guillot <http://fguillot.developpez.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="jquery"/>
+
+interface TimeagoSetings {
+    refreshMillis?: number;
+    allowFuture?: boolean;
+    strings?: {
+        prefixAgo?: string;
+        prefixFromNow?: string;
+        suffixAgo?: string;
+        suffixFromNow?: string;
+
+        // Those can be string or Function
+        seconds?: any;
+        minute?: any;
+        minutes?: any;
+        hour?: any;
+        hours?: any;
+        day?: any;
+        days?: any;
+        month?: any;
+        months?: any;
+        year?: any;
+        years?: any;
+        
+        wordSeparator?: string;
+        numbers?: any[];
+    };
+}
+
+interface TimeagoStatic {
+    (timestamp: Date): string;
+    (timestamp: number): string;
+    (timestamp: string): string;
+    (timestamp: Element): string;
+    (timestamp: JQuery): string;
+    settings: TimeagoSetings;
+    inWords(distanceMillis: Date): string;
+    inWords(distanceMillis: number): string;
+    parse(iso8601: string): Date;
+    datetime(element: Element): Date;
+    datetime(element: JQuery): Date;
+    isTime(element: Element): boolean;
+    isTime(element: JQuery): boolean;
+}
+
+interface Timeago {
+    (): JQuery;
+}
+
+interface JQueryStatic {
+    timeago: TimeagoStatic;
+}
+
+interface JQuery {
+    timeago: Timeago;
+}
\ No newline at end of file
diff --git a/jquery.timeago/jquery.timeago-tests.ts b/jquery.timeago/jquery.timeago-tests.ts
index 8a40389bca..86abc6fe59 100644
--- a/jquery.timeago/jquery.timeago-tests.ts
+++ b/jquery.timeago/jquery.timeago-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.timeago.d.ts"/>
+/// <reference types="jquery"/>
 
 // Basic usage
 
diff --git a/jquery.timeago/jquery.timeago-tests.ts.tscparams b/jquery.timeago/jquery.timeago-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jquery.timeago/jquery.timeago-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jquery.timeago/jquery.timeago.d.ts b/jquery.timeago/jquery.timeago.d.ts
deleted file mode 100644
index 510ad67d0a..0000000000
--- a/jquery.timeago/jquery.timeago.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-// Type definitions for jQuery.timeago.js 1.0.2
-// Project: http://timeago.yarp.com/
-// Definitions by: François Guillot <http://fguillot.developpez.com/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface TimeagoSetings {
-    refreshMillis?: number;
-    allowFuture?: boolean;
-    strings?: {
-        prefixAgo?: string;
-        prefixFromNow?: string;
-        suffixAgo?: string;
-        suffixFromNow?: string;
-
-        // Those can be string or Function
-        seconds?: any;
-        minute?: any;
-        minutes?: any;
-        hour?: any;
-        hours?: any;
-        day?: any;
-        days?: any;
-        month?: any;
-        months?: any;
-        year?: any;
-        years?: any;
-        
-        wordSeparator?: string;
-        numbers?: any[];
-    };
-}
-
-interface TimeagoStatic {
-    (timestamp: Date): string;
-    (timestamp: number): string;
-    (timestamp: string): string;
-    (timestamp: Element): string;
-    (timestamp: JQuery): string;
-    settings: TimeagoSetings;
-    inWords(distanceMillis: Date): string;
-    inWords(distanceMillis: number): string;
-    parse(iso8601: string): Date;
-    datetime(element: Element): Date;
-    datetime(element: JQuery): Date;
-    isTime(element: Element): boolean;
-    isTime(element: JQuery): boolean;
-}
-
-interface Timeago {
-    (): JQuery;
-}
-
-interface JQueryStatic {
-    timeago: TimeagoStatic;
-}
-
-interface JQuery {
-    timeago: Timeago;
-}
\ No newline at end of file
diff --git a/jquery.timeago/tsconfig.json b/jquery.timeago/tsconfig.json
new file mode 100644
index 0000000000..8aa475744a
--- /dev/null
+++ b/jquery.timeago/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.timeago-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.timepicker/index.d.ts b/jquery.timepicker/index.d.ts
new file mode 100644
index 0000000000..d6a8d45a3b
--- /dev/null
+++ b/jquery.timepicker/index.d.ts
@@ -0,0 +1,144 @@
+// Type definitions for jQuery UI Timepicker 0.3
+// Project: http://fgelinas.com/code/timepicker/
+// Definitions by: Anwar Javed <https://github.com/anwarjaved>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+/// <reference types="jqueryui"/>
+
+interface TimePickerHour {
+    /** first displayed hour */
+    starts?: number;
+    /** last displayed hour */
+    ends?: number;
+}
+
+interface TimePickerMinutes {
+    /** first displayed minute */
+    starts?: number;
+    /** last displayed minute */
+    ends?: number;
+    /** interval of displayed minutes */
+    interval?: number;
+}
+
+interface TimePickerOptions {
+    /** 'focus' for popup on focus, */
+    showOn?: string;
+    
+    /**
+     * 'button' element that will trigger the timepicker.
+     *
+     * "button" for trigger button, or "both" for either (not yet implemented).
+     */
+    button?: string;
+
+    // Localization
+
+    /** Define the locale text for "Hours" */
+    hourText?: string;
+
+    /** Define the locale text for "Minute" */
+    minuteText?: string;
+
+    /** Define the locale text for periods. */
+    amPmText?: [string, string];
+
+    /** Name of jQuery animation for popup */
+    showAnim?: string;
+    /** Options for enhanced animations */
+    showOptions?: any;
+    /** Display text following the input box, e.g. showing the format */
+    appendText?: string;
+
+    /** Define a callback function executed before the timepicker is shown */
+    beforeShow?: () => any;
+    /** Define a callback function when a hour / minutes is selected */
+    onSelect?: (timeText: string, inst: any) => any;
+    /** Define a callback function when the timepicker is closed */
+    onClose?: (timeText: string, inst: any) => any;
+
+    /** The character to use to separate hours and minutes. */
+    timeSeparator?: string;
+    /** The character to use to separate the time from the time period. */
+    periodSeparator?: string;
+    /** Define whether or not to show AM/PM with selected time */
+    showPeriod?: boolean;
+    /** Show the AM/PM labels on the left of the time picker */
+    showPeriodLabels?: boolean;
+    /** Define whether or not to show a leading zero for hours < 10. [true/false] */
+    showLeadingZero?: boolean;
+    /** Define whether or not to show a leading zero for minutes < 10. */
+    showMinutesLeadingZero?: boolean;
+    /** Selector for an alternate field to store selected time into */
+    altField?: string;
+    /**
+     * Used as default time when input field is empty or for inline timePicker
+     * (set to 'now' for the current time, '' for no highlighted time)
+     **/
+    defaultTime?: string;
+    /**
+     * Position of the dialog relative to the input.
+     *
+     * See the position utility for more info : http://jqueryui.com/demos/position/
+     */
+    myPosition?: string;
+    /**
+     * Position of the input element to match
+     *
+     * Note : if the position utility is not loaded, the timepicker will attach left top to left bottom
+     * See the position utility for more info : http://jqueryui.com/demos/position/
+     */
+    atPosition?: string;
+
+    //NEW: 2011-02-03
+    /** callback for enabling / disabling on selectable hours  ex : function(hour) { return true; } */
+    onHourShow?: () => any;
+    /** callback for enabling / disabling on time selection  ex : function(hour,minute) { return true; } */
+    onMinuteShow?: () => any;
+
+    hours?: TimePickerHour;
+    minutes?: TimePickerMinutes;
+
+    /** number of rows for the input tables, minimum 2, makes more sense if you use multiple of 2 */
+    rows?: number;
+    // 2011-08-05 0.2.4
+    /** display the hours section of the dialog */
+    showHours?: boolean;
+    /** display the minute section of the dialog */
+    showMinutes?: boolean;
+    /** optionally parse inputs of whole hours with minutes omitted */
+    optionalMinutes?: boolean;
+
+    // buttons
+    /** shows an OK button to confirm the edit */
+    showCloseButton?: boolean;
+
+    /** Text for the confirmation button (ok button).*/
+    closeButtonText?: string;
+
+    /** Shows the 'now' button */
+    showNowButton?: boolean;
+
+    /** Text for the 'now' button.*/
+    nowButtonText?: string;
+
+    /** Shows the deselect time button */
+    showDeselectButton?: boolean;
+
+    /** Text for the deselect button */
+    deselectButtonText?: string;
+}
+
+
+interface JQuery {
+    timepicker(): JQuery;
+    timepicker(methodName: 'getTime'): string;
+    timepicker(methodName: 'getTimeAsDate'): Date;
+    timepicker(methodName: 'getHour'): number;
+    timepicker(methodName: 'getMinute'): number;
+    timepicker(methodName: string): any;
+    timepicker(methodName: string, methodParameter: any): any;
+    timepicker(optionLiteral: string, optionName: string): any;
+    timepicker(options: TimePickerOptions): JQuery;
+}
diff --git a/jquery.timepicker/jquery.timepicker-tests.ts b/jquery.timepicker/jquery.timepicker-tests.ts
index f0e5f49854..cbb14dfe7c 100644
--- a/jquery.timepicker/jquery.timepicker-tests.ts
+++ b/jquery.timepicker/jquery.timepicker-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.timepicker.d.ts"/>
+/// <reference types="jquery"/>
 
 var beforeShowCallback, onSelectCallback, onCloseCallback, onHourShow, onMinuteShow;
 $('#timepicker').timepicker({
diff --git a/jquery.timepicker/jquery.timepicker-tests.ts.tscparams b/jquery.timepicker/jquery.timepicker-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jquery.timepicker/jquery.timepicker-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jquery.timepicker/jquery.timepicker.d.ts b/jquery.timepicker/jquery.timepicker.d.ts
deleted file mode 100644
index c267dedf2c..0000000000
--- a/jquery.timepicker/jquery.timepicker.d.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-// Type definitions for jQuery UI Timepicker 0.3
-// Project: http://fgelinas.com/code/timepicker/
-// Definitions by: Anwar Javed <https://github.com/anwarjaved>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="../jqueryui/jqueryui.d.ts"/>
-
-interface TimePickerHour {
-    /** first displayed hour */
    starts?: number;
-    /** last displayed hour */
    ends?: number;
-}
-
-interface TimePickerMinutes {
-    /** first displayed minute */
    starts?: number;
-    /** last displayed minute */
    ends?: number;
-    /** interval of displayed minutes */
    interval?: number;
-}
-
-interface TimePickerOptions {
-    /** 'focus' for popup on focus, */
    showOn?: string;
-    
-    /**
     * 'button' element that will trigger the timepicker.
     *
     * "button" for trigger button, or "both" for either (not yet implemented).
     */
    button?: string;
-
-    // Localization
-
-    /** Define the locale text for "Hours" */
-    hourText?: string;
-
-    /** Define the locale text for "Minute" */
-    minuteText?: string;
-
-    /** Define the locale text for periods. */
-    amPmText?: [string, string];
-
-    /** Name of jQuery animation for popup */
    showAnim?: string;
-    /** Options for enhanced animations */
    showOptions?: any;
-    /** Display text following the input box, e.g. showing the format */
    appendText?: string;
-
-    /** Define a callback function executed before the timepicker is shown */
    beforeShow?: () => any;
-    /** Define a callback function when a hour / minutes is selected */
    onSelect?: (timeText: string, inst: any) => any;
-    /** Define a callback function when the timepicker is closed */
    onClose?: (timeText: string, inst: any) => any;
-
-    /** The character to use to separate hours and minutes. */
    timeSeparator?: string;
-    /** The character to use to separate the time from the time period. */
    periodSeparator?: string;
-    /** Define whether or not to show AM/PM with selected time */
    showPeriod?: boolean;
-    /** Show the AM/PM labels on the left of the time picker */
    showPeriodLabels?: boolean;
-    /** Define whether or not to show a leading zero for hours < 10. [true/false] */
    showLeadingZero?: boolean;
-    /** Define whether or not to show a leading zero for minutes < 10. */
    showMinutesLeadingZero?: boolean;
-    /** Selector for an alternate field to store selected time into */
    altField?: string;
-    /**
     * Used as default time when input field is empty or for inline timePicker
     * (set to 'now' for the current time, '' for no highlighted time)
     **/
    defaultTime?: string;
-    /**
     * Position of the dialog relative to the input.
     *
     * See the position utility for more info : http://jqueryui.com/demos/position/
     */
    myPosition?: string;
-    /**
     * Position of the input element to match
     *
     * Note : if the position utility is not loaded, the timepicker will attach left top to left bottom
     * See the position utility for more info : http://jqueryui.com/demos/position/
     */
    atPosition?: string;
-
-    //NEW: 2011-02-03
-    /** callback for enabling / disabling on selectable hours  ex : function(hour) { return true; } */
    onHourShow?: () => any;
-    /** callback for enabling / disabling on time selection  ex : function(hour,minute) { return true; } */
    onMinuteShow?: () => any;
-
-    hours?: TimePickerHour;
-    minutes?: TimePickerMinutes;
-
-    /** number of rows for the input tables, minimum 2, makes more sense if you use multiple of 2 */
    rows?: number;
-    // 2011-08-05 0.2.4
-    /** display the hours section of the dialog */
    showHours?: boolean;
-    /** display the minute section of the dialog */
    showMinutes?: boolean;
-    /** optionally parse inputs of whole hours with minutes omitted */
    optionalMinutes?: boolean;
-
-    // buttons
-    /** shows an OK button to confirm the edit */
    showCloseButton?: boolean;
-
-    /** Text for the confirmation button (ok button).*/
-    closeButtonText?: string;
-
-    /** Shows the 'now' button */
    showNowButton?: boolean;
-
-    /** Text for the 'now' button.*/
-    nowButtonText?: string;
-
-    /** Shows the deselect time button */
    showDeselectButton?: boolean;
-
-    /** Text for the deselect button */
-    deselectButtonText?: string;
-}
-
-
-interface JQuery {
-    timepicker(): JQuery;
-    timepicker(methodName: 'getTime'): string;
-    timepicker(methodName: 'getTimeAsDate'): Date;
-    timepicker(methodName: 'getHour'): number;
-    timepicker(methodName: 'getMinute'): number;
-    timepicker(methodName: string): any;
-    timepicker(methodName: string, methodParameter: any): any;
-    timepicker(optionLiteral: string, optionName: string): any;
-    timepicker(options: TimePickerOptions): JQuery;
-}
diff --git a/jquery.timepicker/tsconfig.json b/jquery.timepicker/tsconfig.json
new file mode 100644
index 0000000000..4ea0a00729
--- /dev/null
+++ b/jquery.timepicker/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.timepicker-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.timer/index.d.ts b/jquery.timer/index.d.ts
new file mode 100644
index 0000000000..e6b26e0b2e
--- /dev/null
+++ b/jquery.timer/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for jQueryTimer 1.0
+// Project: https://github.com/jchavannes/jquery-timer
+// Definitions by: Joshua Strobl <https://github.com/JoshStrobl/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface JQueryTimer {
+    // #region Constructors
+    (action?: Function, time?: Number, autostart?: Boolean): Object;
+    set(x: any): Object;
+    // #endregion
+
+    // #region Actions
+    once(time: Number): Object;
+    play(reset?: Boolean): Object;
+    pause(): Object;
+    stop(): Object;
+    toggle(reset?: Boolean): Object;
+    // #endregion
+
+    // #region Properties
+    isActive: Boolean;
+    remaining: Number;
+    // #endregion
+
+}
+
+interface JQuery {
+    timer: JQueryTimer;
+}
\ No newline at end of file
diff --git a/jquery.timer/jquery.timer-tests.ts b/jquery.timer/jquery.timer-tests.ts
index 2e48bbe893..e5d1cdaa3a 100644
--- a/jquery.timer/jquery.timer-tests.ts
+++ b/jquery.timer/jquery.timer-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="jquery.timer.d.ts" />
+/// <reference types="jquery" />
+
 
     // Create the timer
     $("body").timer(
diff --git a/jquery.timer/jquery.timer-tests.ts.tscparams b/jquery.timer/jquery.timer-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jquery.timer/jquery.timer-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jquery.timer/jquery.timer.d.ts b/jquery.timer/jquery.timer.d.ts
deleted file mode 100644
index 6b8c5d6358..0000000000
--- a/jquery.timer/jquery.timer.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-// Type definitions for jQueryTimer 1.0
-// Project: https://github.com/jchavannes/jquery-timer
-// Definitions by: Joshua Strobl <https://github.com/JoshStrobl/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface JQueryTimer {
-    // #region Constructors
-    (action?: Function, time?: Number, autostart?: Boolean): Object;
-    set(any): Object;
-    // #endregion
-
-    // #region Actions
-    once(time: Number): Object;
-    play(reset?: Boolean): Object;
-    pause(): Object;
-    stop(): Object;
-    toggle(reset?: Boolean): Object;
-    // #endregion
-
-    // #region Properties
-    isActive: Boolean;
-    remaining: Number;
-    // #endregion
-
-}
-
-interface JQuery {
-    timer: JQueryTimer;
-}
\ No newline at end of file
diff --git a/jquery.timer/jquery.timer.d.ts.tscparams b/jquery.timer/jquery.timer.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jquery.timer/jquery.timer.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jquery.timer/tsconfig.json b/jquery.timer/tsconfig.json
new file mode 100644
index 0000000000..48d3d6e5f4
--- /dev/null
+++ b/jquery.timer/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.timer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.tinycarousel/index.d.ts b/jquery.tinycarousel/index.d.ts
new file mode 100644
index 0000000000..10c363f4fa
--- /dev/null
+++ b/jquery.tinycarousel/index.d.ts
@@ -0,0 +1,79 @@
+// Type definitions for jQuery tinycarousel 1.9
+// Project: http://baijs.nl/tinycarousel/
+// Definitions by: Christiaan Rakowski <https://github.com/csrakowski/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace JQueryTinyCarousel {
+    export interface JQueryTinyCarouselOptions {
+        /**
+        * Start block of the carousel. (default: 1)
+        */
+        start?: number;
+        /**
+        * Vertical or horizontal scroller? 'x' or 'y'. (default: 'x')
+        */
+        axis?: string;
+        /**
+        * How many blocks do you want to move at a time? (default: 1)
+        */
+        display?: number;
+        /**
+        * If interval is true and rewind is true it will play in reverse if the last slide is reached. (default: false)
+        */
+        rewind?: boolean;
+        /**
+        * Show left and right navigation buttons? (default: true)
+        */
+        controls?: boolean;
+        /**
+        * Show page number navigation buttons? (default: false)
+        */
+        pager?: boolean;
+        /**
+        * Move to the next block on an interval. (default: false)
+        */
+        interval?: boolean;
+        /**
+        * Interval time in milliseconds. (default: 3000)
+        */
+        intervaltime?: number;
+        /**
+        * Show animation when changing block? (default: true)
+        */
+        animation?: boolean;
+        /**
+        * Time of the animation in miliseconds (default: 1000)
+        */
+        duration?: number;
+        /**
+        * Function that executes after every move (default: null)
+        */
+        callback? : (element: HTMLElement, index: number) => void;
+    }
+}
+interface JQuery {
+    /**
+    * Creates a new tinycarousel with the specified, or default, options.
+    *
+    * @param options The options
+    */
+    tinycarousel(options?: JQueryTinyCarousel.JQueryTinyCarouselOptions): JQuery;
+    /**
+    * Moves the tinycarousel to the specified block.
+    *
+    * @param index The index of the block to move to
+    */
+    tinycarousel_move(index: number): void;
+
+    /**
+    * Starts the interval.
+    */
+    tinycarousel_start(): void;
+
+    /**
+    * Stops the interval.
+    */
+    tinycarousel_stop(): void;
+}
diff --git a/jquery.tinycarousel/jquery.tinycarousel-tests.ts b/jquery.tinycarousel/jquery.tinycarousel-tests.ts
index 1a4eb79944..b0d32bfe77 100644
--- a/jquery.tinycarousel/jquery.tinycarousel-tests.ts
+++ b/jquery.tinycarousel/jquery.tinycarousel-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jquery.tinycarousel.d.ts" />
+
 
 $('#slider1').tinycarousel();
 
diff --git a/jquery.tinycarousel/jquery.tinycarousel.d.ts b/jquery.tinycarousel/jquery.tinycarousel.d.ts
deleted file mode 100644
index 32ba3da18f..0000000000
--- a/jquery.tinycarousel/jquery.tinycarousel.d.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-// Type definitions for jQuery tinycarousel 1.9
-// Project: http://baijs.nl/tinycarousel/
-// Definitions by: Christiaan Rakowski <https://github.com/csrakowski/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace JQueryTinyCarousel {
-    export interface JQueryTinyCarouselOptions {
-        /**
-        * Start block of the carousel. (default: 1)
-        */
-        start?: number;
-        /**
-        * Vertical or horizontal scroller? 'x' or 'y'. (default: 'x')
-        */
-        axis?: string;
-        /**
-        * How many blocks do you want to move at a time? (default: 1)
-        */
-        display?: number;
-        /**
-        * If interval is true and rewind is true it will play in reverse if the last slide is reached. (default: false)
-        */
-        rewind?: boolean;
-        /**
-        * Show left and right navigation buttons? (default: true)
-        */
-        controls?: boolean;
-        /**
-        * Show page number navigation buttons? (default: false)
-        */
-        pager?: boolean;
-        /**
-        * Move to the next block on an interval. (default: false)
-        */
-        interval?: boolean;
-        /**
-        * Interval time in milliseconds. (default: 3000)
-        */
-        intervaltime?: number;
-        /**
-        * Show animation when changing block? (default: true)
-        */
-        animation?: boolean;
-        /**
-        * Time of the animation in miliseconds (default: 1000)
-        */
-        duration?: number;
-        /**
-        * Function that executes after every move (default: null)
-        */
-        callback? : (element: HTMLElement, index: number) => void;
-    }
-}
-interface JQuery {
-    /**
-    * Creates a new tinycarousel with the specified, or default, options.
-    *
-    * @param options The options
-    */
-    tinycarousel(options?: JQueryTinyCarousel.JQueryTinyCarouselOptions): JQuery;
-    /**
-    * Moves the tinycarousel to the specified block.
-    *
-    * @param index The index of the block to move to
-    */
-    tinycarousel_move(index: number): void;
-
-    /**
-    * Starts the interval.
-    */
-    tinycarousel_start(): void;
-
-    /**
-    * Stops the interval.
-    */
-    tinycarousel_stop(): void;
-}
diff --git a/jquery.tinycarousel/tsconfig.json b/jquery.tinycarousel/tsconfig.json
new file mode 100644
index 0000000000..90edc80a75
--- /dev/null
+++ b/jquery.tinycarousel/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.tinycarousel-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.tinyscrollbar/index.d.ts b/jquery.tinyscrollbar/index.d.ts
new file mode 100644
index 0000000000..098353d831
--- /dev/null
+++ b/jquery.tinyscrollbar/index.d.ts
@@ -0,0 +1,53 @@
+// Type definitions for jQuery tinyscrollbar 1.8
+// Project: http://baijs.nl/tinyscrollbar/
+// Definitions by: Christiaan Rakowski <https://github.com/csrakowski/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace JQueryTinyScrollbar {
+    export interface JQueryTinyScrollbarOptions {
+        /**
+        * Enable mobile invert style scrolling. (default: false)
+        */
+        invertscroll?: boolean;
+        /**
+        * Vertical or horizontal scroller? 'x' or 'y'. (default: 'x')
+        */
+        axis?: string;
+        /**
+        * How many pixels must the mouswheel scrolls at a time. (default: 40)
+        */
+        wheel?: number;
+        /**
+        * Enable or disable the mousewheel. (default: true)
+        */
+        scroll?: boolean;
+        /**
+        * Return scrollwheel event to browser if there is no more content. (default: true)
+        */
+        lockscroll?: boolean;
+        /**
+        * Set the size of the scrollbar to auto or a fixed number. (default: 'auto')
+        */
+        size?: any;
+        /**
+        * Set the size of the thumb to auto or a fixed number. (default: 'auto')
+        */
+        sizethumb?: any;
+    }
+}
+interface JQuery {
+    /**
+    * Creates a new tinyscrollbar with the specified, or default, options.
+    *
+    * @param options The options
+    */
+    tinyscrollbar(options?: JQueryTinyScrollbar.JQueryTinyScrollbarOptions): JQuery;
+    /**
+    * Updates an existing tinyscrollbar with the specified, or default, options.
+    *
+    * @param options The options
+    */
+    tinyscrollbar_update(options?: any): JQuery;
+}
diff --git a/jquery.tinyscrollbar/jquery.tinyscrollbar-tests.ts b/jquery.tinyscrollbar/jquery.tinyscrollbar-tests.ts
index d66388cb18..fbf646dbe5 100644
--- a/jquery.tinyscrollbar/jquery.tinyscrollbar-tests.ts
+++ b/jquery.tinyscrollbar/jquery.tinyscrollbar-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jquery.tinyscrollbar.d.ts" />
+
 
 $('#scrollbar1').tinyscrollbar();
 $('#scrollbar2').tinyscrollbar({ axis: 'x' });
diff --git a/jquery.tinyscrollbar/jquery.tinyscrollbar.d.ts b/jquery.tinyscrollbar/jquery.tinyscrollbar.d.ts
deleted file mode 100644
index 802741f0be..0000000000
--- a/jquery.tinyscrollbar/jquery.tinyscrollbar.d.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-// Type definitions for jQuery tinyscrollbar 1.8
-// Project: http://baijs.nl/tinyscrollbar/
-// Definitions by: Christiaan Rakowski <https://github.com/csrakowski/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace JQueryTinyScrollbar {
-    export interface JQueryTinyScrollbarOptions {
-        /**
-        * Enable mobile invert style scrolling. (default: false)
-        */
-        invertscroll?: boolean;
-        /**
-        * Vertical or horizontal scroller? 'x' or 'y'. (default: 'x')
-        */
-        axis?: string;
-        /**
-        * How many pixels must the mouswheel scrolls at a time. (default: 40)
-        */
-        wheel?: number;
-        /**
-        * Enable or disable the mousewheel. (default: true)
-        */
-        scroll?: boolean;
-        /**
-        * Return scrollwheel event to browser if there is no more content. (default: true)
-        */
-        lockscroll?: boolean;
-        /**
-        * Set the size of the scrollbar to auto or a fixed number. (default: 'auto')
-        */
-        size?: any;
-        /**
-        * Set the size of the thumb to auto or a fixed number. (default: 'auto')
-        */
-        sizethumb?: any;
-    }
-}
-interface JQuery {
-    /**
-    * Creates a new tinyscrollbar with the specified, or default, options.
-    *
-    * @param options The options
-    */
-    tinyscrollbar(options?: JQueryTinyScrollbar.JQueryTinyScrollbarOptions): JQuery;
-    /**
-    * Updates an existing tinyscrollbar with the specified, or default, options.
-    *
-    * @param options The options
-    */
-    tinyscrollbar_update(options?: any): JQuery;
-}
diff --git a/jquery.tinyscrollbar/tsconfig.json b/jquery.tinyscrollbar/tsconfig.json
new file mode 100644
index 0000000000..101d8d1090
--- /dev/null
+++ b/jquery.tinyscrollbar/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.tinyscrollbar-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.tipsy/index.d.ts b/jquery.tipsy/index.d.ts
new file mode 100644
index 0000000000..678c2a77f0
--- /dev/null
+++ b/jquery.tipsy/index.d.ts
@@ -0,0 +1,107 @@
+// Type definitions for jQuery.tipsy
+// Project: http://onehackoranother.com/projects/jquery/tipsy/
+// Definitions by: Brian Dukes <https://github.com/bdukes/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface JQuery {
+    /**
+    * initialize tipsy plugin
+    */
+    tipsy: JQueryTipsy.Tipsy;
+}
+
+declare namespace JQueryTipsy {
+    interface Options {
+        /**
+        * delay before showing tooltip (ms)
+        *
+        * default: 0
+        */
+        delayIn?: number;
+        /**
+        * delay before hiding  tooltip (ms)
+        *
+        * default: 0
+        */
+        delayOut?: number;
+        /**
+        * fade tooltips in/out?
+        *
+        * default: false
+        */
+        fade?: boolean;
+        /**
+        * fallback text to use when no tooltip text
+        *
+        * default: ''
+        */
+        fallback?: string;
+        /**
+        * gravity
+        *
+        * default: 'n'
+        */
+        gravity?: any; // string or () => string
+        /**
+        * is tooltip content HTML?
+        *
+        * default: false
+        */
+        html?: boolean;
+        /**
+        * use live event support?
+        *
+        * default: false
+        */
+        live?: boolean;
+        /**
+        * pixel offset of tooltip from element
+        *
+        * default: 0
+        */
+        offset?: number;
+        /**
+        * opacity of tooltip
+        *
+        * default: 0.8
+        */
+        opacity?: number;
+        /**
+        * attribute/callback containing tooltip text
+        *
+        * default: 'title'
+        */
+        title?: any; // string or () => string
+        /**
+        * how tooltip is triggered - hover | focus | manual
+        *
+        * default: 'hover'
+        */
+        trigger?: string;
+    }
+
+    interface Tipsy {
+        /**
+        * initialize tipsy plugin
+        */
+        (options?: Options): JQuery;
+        /**
+        * determine gravity either to North or South automatically based on the element's location in the viewport
+        */
+        autoNS: () => string;
+        /**
+        * determine gravity either to West or East automatically based on the element's location in the viewport
+        */
+        autoWE: () => string;
+        /**
+        * determine gravity either to Southwest or Southeast automatically based on the element's location in the viewport
+        */
+        autoSWSE: () => string;
+        /**
+        * determine gravity either to Northwest or Northeast automatically based on the element's location in the viewport
+        */
+        autoNWNE: () => string;
+    }
+}
diff --git a/jquery.tipsy/jquery.tipsy-tests.ts b/jquery.tipsy/jquery.tipsy-tests.ts
index 384e34a217..e307e5d364 100644
--- a/jquery.tipsy/jquery.tipsy-tests.ts
+++ b/jquery.tipsy/jquery.tipsy-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.tipsy.d.ts"/>
+/// <reference types="jquery"/>
 
 // basic
 $('#example-1').tipsy();
diff --git a/jquery.tipsy/jquery.tipsy.d.ts b/jquery.tipsy/jquery.tipsy.d.ts
deleted file mode 100644
index cbd4d29744..0000000000
--- a/jquery.tipsy/jquery.tipsy.d.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-// Type definitions for jQuery.tipsy
-// Project: http://onehackoranother.com/projects/jquery/tipsy/
-// Definitions by: Brian Dukes <https://github.com/bdukes/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface JQuery {
-    /**
-    * initialize tipsy plugin
-    */
-    tipsy: JQueryTipsy.Tipsy;
-}
-
-declare namespace JQueryTipsy {
-    interface Options {
-        /**
-        * delay before showing tooltip (ms)
-        *
-        * default: 0
-        */
-        delayIn?: number;
-        /**
-        * delay before hiding  tooltip (ms)
-        *
-        * default: 0
-        */
-        delayOut?: number;
-        /**
-        * fade tooltips in/out?
-        *
-        * default: false
-        */
-        fade?: boolean;
-        /**
-        * fallback text to use when no tooltip text
-        *
-        * default: ''
-        */
-        fallback?: string;
-        /**
-        * gravity
-        *
-        * default: 'n'
-        */
-        gravity?: any; // string or () => string
-        /**
-        * is tooltip content HTML?
-        *
-        * default: false
-        */
-        html?: boolean;
-        /**
-        * use live event support?
-        *
-        * default: false
-        */
-        live?: boolean;
-        /**
-        * pixel offset of tooltip from element
-        *
-        * default: 0
-        */
-        offset?: number;
-        /**
-        * opacity of tooltip
-        *
-        * default: 0.8
-        */
-        opacity?: number;
-        /**
-        * attribute/callback containing tooltip text
-        *
-        * default: 'title'
-        */
-        title?: any; // string or () => string
-        /**
-        * how tooltip is triggered - hover | focus | manual
-        *
-        * default: 'hover'
-        */
-        trigger?: string;
-    }
-
-    interface Tipsy {
-        /**
-        * initialize tipsy plugin
-        */
-        (options?: Options): JQuery;
-        /**
-        * determine gravity either to North or South automatically based on the element's location in the viewport
-        */
-        autoNS: () => string;
-        /**
-        * determine gravity either to West or East automatically based on the element's location in the viewport
-        */
-        autoWE: () => string;
-        /**
-        * determine gravity either to Southwest or Southeast automatically based on the element's location in the viewport
-        */
-        autoSWSE: () => string;
-        /**
-        * determine gravity either to Northwest or Northeast automatically based on the element's location in the viewport
-        */
-        autoNWNE: () => string;
-    }
-}
diff --git a/jquery.tipsy/tsconfig.json b/jquery.tipsy/tsconfig.json
new file mode 100644
index 0000000000..b77f1937b9
--- /dev/null
+++ b/jquery.tipsy/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.tipsy-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.tooltipster/index.d.ts b/jquery.tooltipster/index.d.ts
new file mode 100644
index 0000000000..5dad37aef4
--- /dev/null
+++ b/jquery.tooltipster/index.d.ts
@@ -0,0 +1,186 @@
+// Type definitions for jQuery Tooltipster 3.0.5
+// Project: https://github.com/iamceege/tooltipster
+// Definitions by: Patrick Magee <https://github.com/pjmagee/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface JQueryTooltipsterOptions {
+    /**
+    * Determines how the tooltip will animate in and out. Feel free to modify or create custom transitions in the tooltipster.css file. In IE9 and 8, all animations default to a JavaScript generated, fade animation. Default: 'fade'
+    * fade, grow, swing, slide, fall
+    */
+    animation?: string;
+    /**
+    * Adds the "speech bubble arrow" to the tooltip. Default: true
+    */
+    arrow?: boolean;
+    /**
+    * Select a specific color for the "speech bubble arrow". Default: will inherit the tooltip's background color
+    * hex code / rgb
+    */
+    arrowColor?: any;
+    /**
+    * If autoClose is set to false, the tooltip will never close unless you call the 'close' method yourself. Default: true
+    */
+    autoClose?: boolean;
+    /**
+    * If set, this will override the content of the tooltip. Default: null
+    * @type string, jQuery object
+    */
+    content?: any;
+    /**
+    * If the content of the tooltip is provided as a string, it is displayed as plain text by default. If this content should actually be interpreted as HTML, set this option to true. Default: false
+    */
+    contentAsHTML?: boolean;
+    /**
+    * If you provide a jQuery object to the 'content' option, this sets if it is a clone of this object that should actually be used. Default: true
+    */
+    contentCloning?: boolean;
+    /**
+    * Delay how long it takes (in milliseconds) for the tooltip to start animating in. Default: 200
+    */
+    delay?: number;
+    /**
+    * Set a fixed width for the tooltip. The tooltip will always be a consistent width - no matter your content size. Default: 0 (auto width)
+    */
+    fixedWidth?: number;
+    /**
+    * Set a max width for the tooltip. If the tooltip ends up being smaller than the set max width, the tooltip's width will be set automatically. Default: 0 (no max width)
+    */
+    maxWidth?: number;
+    /**
+    * Create a custom function to be fired only once at instantiation. If the function returns a value, this value will become the content of the tooltip. See the advanced section to learn more. Default: function(origin, content) {}
+    */
+    functionInit?: (origin, content) => any;
+    /**
+    * Create a custom function to be fired before the tooltip opens. This function may prevent or hold off the opening. See the advanced section to learn more. Default: function(origin, continueTooltip) { continueTooltip(); }
+    */
+    functionBefore?: (origin, continueTooltip) => void;
+    /**
+    * Create a custom function to be fired when the tooltip and its contents have been added to the DOM. Default: function(origin, tooltip) {}
+    */
+    functionReady?: (origin, tooltip) => void;
+    /**
+    * Create a custom function to be fired once the tooltip has been closed and removed from the DOM. Default: function(origin) {}
+    */
+    functionAfter?: (origin) => void;
+    /**
+    * If using the iconDesktop or iconTouch options, this sets the content for your icon. Default: '(?)'
+    * @type string, jQuery object
+    */
+    icon?: any;
+    /**
+    * If you provide a jQuery object to the 'icon' option, this sets if it is a clone of this object that should actually be used. Default: true
+    */
+    iconCloning?: boolean;
+    /**
+    * Generate an icon next to your content that is responsible for activating the tooltip on non-touch devices. Default: false
+    */
+    iconDesktop?: boolean;
+    /**
+    * If using the iconDesktop or iconTouch options, this sets the class on the icon (used to style the icon). Default: 'tooltipster-icon'
+    */
+    iconTheme?: string;
+    /**
+    * Generate an icon next to your content that is responsible for activating the tooltip on touch devices (tablets, phones, etc). Default: false
+    */
+    iconTouch?: boolean;
+    /**
+    * Give users the possibility to interact with the tooltip. Unless autoClose is set to false, the tooltip will still close if the user moves away from or clicks out of the tooltip. Default: false
+    */
+    interactive?: boolean;
+    /**
+    * If the tooltip is interactive and activated by a hover event, set the amount of time (milliseconds) allowed for a user to hover off of the tooltip activator (origin) on to the tooltip itself - keeping the tooltip from closing. Default: 350
+    */
+    interactiveTolerance?: number;
+    /**
+    * Offsets the tooltip (in pixels) farther left/right from the origin. Default: 0
+    */
+    offsetX?: number;
+    /**
+    * Offsets the tooltip (in pixels) farther up/down from the origin. Default: 0
+    */
+    offsetY?: number;
+    /**
+    * If true, only one tooltip will be allowed to be active at a time. Non-autoclosing tooltips will not be closed though. Default: false
+    */
+    onlyOne?: boolean;
+    /**
+    * Set the position of the tooltip. Default: 'top'
+    * right, left, top, top-right, top-left, bottom, bottom-right, bottom-left
+    */
+    position?: string;
+    /**
+    * Will reposition the tooltip if the origin moves. As this option may have an impact on performance, we suggest you enable it only if you need to. Default: false
+    */
+    positionTracker?: boolean;
+    /**
+    * Set the speed of the animation. Default: 350
+    */
+    speed?: number;
+    /**
+    * How long the tooltip should be allowed to live before closing. Default: 0 (disabled)
+    */
+    timer?: number;
+    /**
+    * Set the theme used for your tooltip. Default: 'tooltipster-default'
+    */
+    theme?: string;
+    /**
+    * If set to false, tooltips will not show on pure-touch devices, unless you open them yourself with the 'show' method. Touch gestures on devices which also have a mouse will still open the tooltips though. Default: true
+    */
+    touchDevices?: boolean;
+    /**
+    * Set how tooltips should be activated and closed. See the advanced section to learn how to build custom triggers. Default: 'hover'
+    * hover, click, custom
+    */
+    trigger?: string;
+    /**
+    * If a tooltip is open while its content is updated, play a subtle animation when the content changes. Default: true
+    */
+    updateAnimation?: boolean;
+}
+
+interface JQuery {
+    /**
+    * Initiate the Tooltipster plugin
+    */ 
+    tooltipster(): void;
+    /**
+    * Creates a new tooltip with the specified, or default, options.
+    * @param options The options
+    * @example
+    * $('.tooltip').tooltipster({
+    *   animation: 'fade',
+    *   delay: 200,
+    *   theme: 'tooltipster-default',
+    *   touchDevices: false,
+    *   trigger: 'hover'
+    * });
+    */
+    tooltipster(options?: JQueryTooltipsterOptions): JQuery;
+    /**
+    * Updates an existing tinyscrollbar with the specified, or default, options.
+    * @param options The options
+    * @param callback optional argument callback
+    * @example
+    * $(window).keypress(function() {
+    *     $('#example').tooltipster('hide', function() {
+    *         alert('The tooltip is now fully closed');
+    *      });
+    * });
+    */
+    tooltipster(method: string, callback?: Function): JQuery;
+    /**
+    * Call a method trigger with optional paramter
+    * @example $('#my-special-tooltip').tooltipster('content', 'My new content');
+    * @example
+    * $('#example').tooltipster('show', function() {
+    *   alert('The tooltip is now fully open. The content is: ' + this.tooltipster('content'));
+    * });
+    */
+    tooltipster(method: string, param?: string): any;
+
+}
+
diff --git a/jquery.tooltipster/jquery.tooltipster-tests.ts b/jquery.tooltipster/jquery.tooltipster-tests.ts
index 8a8f29acae..dde6ef1408 100644
--- a/jquery.tooltipster/jquery.tooltipster-tests.ts
+++ b/jquery.tooltipster/jquery.tooltipster-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jquery.tooltipster.d.ts" />
+
 
 // Type definition tests for jQuery Tooltipster 3.0.5
 // Project: https://github.com/iamceege/tooltipster
diff --git a/jquery.tooltipster/jquery.tooltipster-tests.ts.tscparams b/jquery.tooltipster/jquery.tooltipster-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jquery.tooltipster/jquery.tooltipster-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jquery.tooltipster/jquery.tooltipster.d.ts b/jquery.tooltipster/jquery.tooltipster.d.ts
deleted file mode 100644
index a4df0a36e3..0000000000
--- a/jquery.tooltipster/jquery.tooltipster.d.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-// Type definitions for jQuery Tooltipster 3.0.5
-// Project: https://github.com/iamceege/tooltipster
-// Definitions by: Patrick Magee <https://github.com/pjmagee/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface JQueryTooltipsterOptions {
-    /**
-    * Determines how the tooltip will animate in and out. Feel free to modify or create custom transitions in the tooltipster.css file. In IE9 and 8, all animations default to a JavaScript generated, fade animation. Default: 'fade'
-    * fade, grow, swing, slide, fall
-    */
-    animation?: string;
-    /**
-    * Adds the "speech bubble arrow" to the tooltip. Default: true
-    */
-    arrow?: boolean;
-    /**
-    * Select a specific color for the "speech bubble arrow". Default: will inherit the tooltip's background color
-    * hex code / rgb
-    */
-    arrowColor?: any;
-    /**
-    * If autoClose is set to false, the tooltip will never close unless you call the 'close' method yourself. Default: true
-    */
-    autoClose?: boolean;
-    /**
-    * If set, this will override the content of the tooltip. Default: null
-    * @type string, jQuery object
-    */
-    content?: any;
-    /**
-    * If the content of the tooltip is provided as a string, it is displayed as plain text by default. If this content should actually be interpreted as HTML, set this option to true. Default: false
-    */
-    contentAsHTML?: boolean;
-    /**
-    * If you provide a jQuery object to the 'content' option, this sets if it is a clone of this object that should actually be used. Default: true
-    */
-    contentCloning?: boolean;
-    /**
-    * Delay how long it takes (in milliseconds) for the tooltip to start animating in. Default: 200
-    */
-    delay?: number;
-    /**
-    * Set a fixed width for the tooltip. The tooltip will always be a consistent width - no matter your content size. Default: 0 (auto width)
-    */
-    fixedWidth?: number;
-    /**
-    * Set a max width for the tooltip. If the tooltip ends up being smaller than the set max width, the tooltip's width will be set automatically. Default: 0 (no max width)
-    */
-    maxWidth?: number;
-    /**
-    * Create a custom function to be fired only once at instantiation. If the function returns a value, this value will become the content of the tooltip. See the advanced section to learn more. Default: function(origin, content) {}
-    */
-    functionInit?: (origin, content) => any;
-    /**
-    * Create a custom function to be fired before the tooltip opens. This function may prevent or hold off the opening. See the advanced section to learn more. Default: function(origin, continueTooltip) { continueTooltip(); }
-    */
-    functionBefore?: (origin, continueTooltip) => void;
-    /**
-    * Create a custom function to be fired when the tooltip and its contents have been added to the DOM. Default: function(origin, tooltip) {}
-    */
-    functionReady?: (origin, tooltip) => void;
-    /**
-    * Create a custom function to be fired once the tooltip has been closed and removed from the DOM. Default: function(origin) {}
-    */
-    functionAfter?: (origin) => void;
-    /**
-    * If using the iconDesktop or iconTouch options, this sets the content for your icon. Default: '(?)'
-    * @type string, jQuery object
-    */
-    icon?: any;
-    /**
-    * If you provide a jQuery object to the 'icon' option, this sets if it is a clone of this object that should actually be used. Default: true
-    */
-    iconCloning?: boolean;
-    /**
-    * Generate an icon next to your content that is responsible for activating the tooltip on non-touch devices. Default: false
-    */
-    iconDesktop?: boolean;
-    /**
-    * If using the iconDesktop or iconTouch options, this sets the class on the icon (used to style the icon). Default: 'tooltipster-icon'
-    */
-    iconTheme?: string;
-    /**
-    * Generate an icon next to your content that is responsible for activating the tooltip on touch devices (tablets, phones, etc). Default: false
-    */
-    iconTouch?: boolean;
-    /**
-    * Give users the possibility to interact with the tooltip. Unless autoClose is set to false, the tooltip will still close if the user moves away from or clicks out of the tooltip. Default: false
-    */
-    interactive?: boolean;
-    /**
-    * If the tooltip is interactive and activated by a hover event, set the amount of time (milliseconds) allowed for a user to hover off of the tooltip activator (origin) on to the tooltip itself - keeping the tooltip from closing. Default: 350
-    */
-    interactiveTolerance?: number;
-    /**
-    * Offsets the tooltip (in pixels) farther left/right from the origin. Default: 0
-    */
-    offsetX?: number;
-    /**
-    * Offsets the tooltip (in pixels) farther up/down from the origin. Default: 0
-    */
-    offsetY?: number;
-    /**
-    * If true, only one tooltip will be allowed to be active at a time. Non-autoclosing tooltips will not be closed though. Default: false
-    */
-    onlyOne?: boolean;
-    /**
-    * Set the position of the tooltip. Default: 'top'
-    * right, left, top, top-right, top-left, bottom, bottom-right, bottom-left
-    */
-    position?: string;
-    /**
-    * Will reposition the tooltip if the origin moves. As this option may have an impact on performance, we suggest you enable it only if you need to. Default: false
-    */
-    positionTracker?: boolean;
-    /**
-    * Set the speed of the animation. Default: 350
-    */
-    speed?: number;
-    /**
-    * How long the tooltip should be allowed to live before closing. Default: 0 (disabled)
-    */
-    timer?: number;
-    /**
-    * Set the theme used for your tooltip. Default: 'tooltipster-default'
-    */
-    theme?: string;
-    /**
-    * If set to false, tooltips will not show on pure-touch devices, unless you open them yourself with the 'show' method. Touch gestures on devices which also have a mouse will still open the tooltips though. Default: true
-    */
-    touchDevices?: boolean;
-    /**
-    * Set how tooltips should be activated and closed. See the advanced section to learn how to build custom triggers. Default: 'hover'
-    * hover, click, custom
-    */
-    trigger?: string;
-    /**
-    * If a tooltip is open while its content is updated, play a subtle animation when the content changes. Default: true
-    */
-    updateAnimation?: boolean;
-}
-
-interface JQuery {
-    /**
-    * Initiate the Tooltipster plugin
-    */ 
-    tooltipster(): void;
-    /**
-    * Creates a new tooltip with the specified, or default, options.
-    * @param options The options
-    * @example
-    * $('.tooltip').tooltipster({
-    *   animation: 'fade',
-    *   delay: 200,
-    *   theme: 'tooltipster-default',
-    *   touchDevices: false,
-    *   trigger: 'hover'
-    * });
-    */
-    tooltipster(options?: JQueryTooltipsterOptions): JQuery;
-    /**
-    * Updates an existing tinyscrollbar with the specified, or default, options.
-    * @param options The options
-    * @param callback optional argument callback
-    * @example
-    * $(window).keypress(function() {
-    *     $('#example').tooltipster('hide', function() {
-    *         alert('The tooltip is now fully closed');
-    *      });
-    * });
-    */
-    tooltipster(method: string, callback?: Function): JQuery;
-    /**
-    * Call a method trigger with optional paramter
-    * @example $('#my-special-tooltip').tooltipster('content', 'My new content');
-    * @example
-    * $('#example').tooltipster('show', function() {
-    *   alert('The tooltip is now fully open. The content is: ' + this.tooltipster('content'));
-    * });
-    */
-    tooltipster(method: string, param?: string): any;
-
-}
-
diff --git a/jquery.tooltipster/jquery.tooltipster.d.ts.tscparams b/jquery.tooltipster/jquery.tooltipster.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jquery.tooltipster/jquery.tooltipster.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jquery.tooltipster/tsconfig.json b/jquery.tooltipster/tsconfig.json
new file mode 100644
index 0000000000..5837673c12
--- /dev/null
+++ b/jquery.tooltipster/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.tooltipster-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.total-storage/index.d.ts b/jquery.total-storage/index.d.ts
new file mode 100644
index 0000000000..5de79c34a6
--- /dev/null
+++ b/jquery.total-storage/index.d.ts
@@ -0,0 +1,64 @@
+// Type definitions for jQueryTotalStorage 1.1.2
+// Project: https://github.com/Upstatement/jquery-total-storage
+// Definitions by: Jeremy Brooks <https://github.com/JeremyCBrooks/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+/**
+* @desc Set the value of a key to a string
+* @example $.totalStorage('the_key', 'the_value');
+* @desc Set the value of a key to a number
+* @example $.totalStorage('the_key', 800.2);
+* @desc Set the value of a key to a complex Array
+* @example	var myArray = new Array();
+*       myArray.push({name:'Jared', company:'Upstatement', zip:63124});
+*       myArray.push({name:'McGruff', company:'Police', zip:60652};
+*       $.totalStorage('people', myArray);
+*       //to return:
+*       $.totalStorage('people');
+*
+*/
+
+interface JQueryTotalStorage {
+
+    /**
+    * @desc Set or get a key's value
+    * @param key Key to set.
+    * @param value Value to set for key. If ommited, current value for key is returned.
+	* @param options Not implemented.
+    */
+    (key: string, value?: any, options?: JQueryTotalStorageOptions): any;
+
+    /**
+    * @desc Set a key's value
+    * @param key Key to set.
+    * @param value Value to set for key.
+    */
+    setItem(key: string, value: any): any;
+
+    /**
+    * @desc Get a key's value
+    * @param key Key to get.
+    */
+    getItem(key: string): any;
+
+    /**
+    * @desc Get all set values
+    */
+    getAll(): any[];
+
+    /**
+    * @desc Delete item by key
+    * @param key Key of item to delete
+    */
+    deleteItem(key: string): boolean;
+}
+
+interface JQueryTotalStorageOptions {
+    //not implemented...
+}
+
+interface JQueryStatic {
+    totalStorage: JQueryTotalStorage;
+}
\ No newline at end of file
diff --git a/jquery.total-storage/jquery.total-storage-tests.ts b/jquery.total-storage/jquery.total-storage-tests.ts
index 4bbb60b454..0a23dd67cf 100644
--- a/jquery.total-storage/jquery.total-storage-tests.ts
+++ b/jquery.total-storage/jquery.total-storage-tests.ts
@@ -3,8 +3,7 @@
 // Definitions by: Jeremy Brooks <https://github.com/JeremyCBrooks/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.total-storage.d.ts"/>
+/// <reference types="jquery"/>
 
 //direct call
 $.totalStorage("test_key1", "test_value");
diff --git a/jquery.total-storage/jquery.total-storage.d.ts b/jquery.total-storage/jquery.total-storage.d.ts
deleted file mode 100644
index 6830e4e11a..0000000000
--- a/jquery.total-storage/jquery.total-storage.d.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-// Type definitions for jQueryTotalStorage 1.1.2
-// Project: https://github.com/Upstatement/jquery-total-storage
-// Definitions by: Jeremy Brooks <https://github.com/JeremyCBrooks/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-/**
-* @desc Set the value of a key to a string
-* @example $.totalStorage('the_key', 'the_value');
-* @desc Set the value of a key to a number
-* @example $.totalStorage('the_key', 800.2);
-* @desc Set the value of a key to a complex Array
-* @example	var myArray = new Array();
-*       myArray.push({name:'Jared', company:'Upstatement', zip:63124});
-*       myArray.push({name:'McGruff', company:'Police', zip:60652};
-*       $.totalStorage('people', myArray);
-*       //to return:
-*       $.totalStorage('people');
-*
-*/
-
-interface JQueryTotalStorage {
-
-    /**
-    * @desc Set or get a key's value
-    * @param key Key to set.
-    * @param value Value to set for key. If ommited, current value for key is returned.
-	* @param options Not implemented.
-    */
-    (key: string, value?: any, options?: JQueryTotalStorageOptions): any;
-
-    /**
-    * @desc Set a key's value
-    * @param key Key to set.
-    * @param value Value to set for key.
-    */
-    setItem(key: string, value: any): any;
-
-    /**
-    * @desc Get a key's value
-    * @param key Key to get.
-    */
-    getItem(key: string): any;
-
-    /**
-    * @desc Get all set values
-    */
-    getAll(): any[];
-
-    /**
-    * @desc Delete item by key
-    * @param key Key of item to delete
-    */
-    deleteItem(key: string): boolean;
-}
-
-interface JQueryTotalStorageOptions {
-    //not implemented...
-}
-
-interface JQueryStatic {
-    totalStorage: JQueryTotalStorage;
-}
\ No newline at end of file
diff --git a/jquery.total-storage/tsconfig.json b/jquery.total-storage/tsconfig.json
new file mode 100644
index 0000000000..4bb8b8a26d
--- /dev/null
+++ b/jquery.total-storage/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.total-storage-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.transit/index.d.ts b/jquery.transit/index.d.ts
new file mode 100644
index 0000000000..f267bbb24f
--- /dev/null
+++ b/jquery.transit/index.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for jQuery.transit.js 0.9.9
+// Project: http://ricostacruz.com/jquery.transit/
+// Definitions by: MrBigDog2U <https://github.com/MrBigDog2U>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+// Transit //////////////////////////////////////////////////
+
+interface JQueryTransitOptions {
+	opacity?: number;
+	duration?: number;
+	delay?: number;
+	easing?: string;
+	complete?: () => void;
+	scale?: any;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+interface JQuery {
+    transition(options: JQueryTransitOptions): JQuery;
+    transition(options: JQueryTransitOptions, duration: number): JQuery;
+    transition(options: JQueryTransitOptions, easing: string): JQuery;
+    transition(options: JQueryTransitOptions, duration: number, easing: string): JQuery;
+    transition(options: JQueryTransitOptions, complete: () => void): JQuery;
+    transition(options: JQueryTransitOptions, duration: number, easing: string, complete: () => void): JQuery;
+
+    /**
+     * Set one or more CSS properties for the set of matched elements.
+     *
+     * @param propertyName A CSS property name.
+     * @param value A value to set for the property.
+     */
+    css(propertyName: string, value: number[]): JQuery;
+}
diff --git a/jquery.transit/jquery.transit-tests.ts b/jquery.transit/jquery.transit-tests.ts
index 6fdb562d7d..2a672ec979 100644
--- a/jquery.transit/jquery.transit-tests.ts
+++ b/jquery.transit/jquery.transit-tests.ts
@@ -1,6 +1,4 @@
-///<reference path="../jquery/jquery.d.ts" />
-///<reference path="jquery.transit.d.ts" />
-
+///<reference types="jquery" />
 
 class TransitOptions implements JQueryTransitOptions {
 	opacity: number;
diff --git a/jquery.transit/jquery.transit.d.ts b/jquery.transit/jquery.transit.d.ts
deleted file mode 100644
index dddb56d7db..0000000000
--- a/jquery.transit/jquery.transit.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Type definitions for jQuery.transit.js 0.9.9
-// Project: http://ricostacruz.com/jquery.transit/
-// Definitions by: MrBigDog2U <https://github.com/MrBigDog2U>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-// Transit //////////////////////////////////////////////////
-
-interface JQueryTransitOptions {
-	opacity?: number;
-	duration?: number;
-	delay?: number;
-	easing?: string;
-	complete?: () => void;
-	scale?: any;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-interface JQuery {
-    transition(options: JQueryTransitOptions): JQuery;
-    transition(options: JQueryTransitOptions, duration: number): JQuery;
-    transition(options: JQueryTransitOptions, easing: string): JQuery;
-    transition(options: JQueryTransitOptions, duration: number, easing: string): JQuery;
-    transition(options: JQueryTransitOptions, complete: () => void): JQuery;
-    transition(options: JQueryTransitOptions, duration: number, easing: string, complete: () => void): JQuery;
-
-    /**
-     * Set one or more CSS properties for the set of matched elements.
-     *
-     * @param propertyName A CSS property name.
-     * @param value A value to set for the property.
-     */
-    css(propertyName: string, value: number[]): JQuery;
-}
diff --git a/jquery.transit/tsconfig.json b/jquery.transit/tsconfig.json
new file mode 100644
index 0000000000..2b17d118c5
--- /dev/null
+++ b/jquery.transit/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.transit-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.ui.datetimepicker/index.d.ts b/jquery.ui.datetimepicker/index.d.ts
new file mode 100644
index 0000000000..96ed13e2bc
--- /dev/null
+++ b/jquery.ui.datetimepicker/index.d.ts
@@ -0,0 +1,131 @@
+// Type definitions for jQuery UI DateTimePicker 0.3
+// Project: http://trentrichardson.com/examples/timepicker/
+// Definitions by: dougajmcdonald <https://github.com/dougajmcdonald>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+/// <reference types="jqueryui"/>
+
+interface DateTimePickerOptions extends JQueryUI.DatepickerOptions {
+
+    // Control options
+    showButtonPanel?: boolean; //Default: true - Whether to show the button panel at the bottom.This is generally needed.
+    timeOnly?: boolean; //Default: false - Hide the datepicker and only provide a time interface.
+    onSelect?: () => any; //Default: null - Function to be called when a date is chosen or time has changed(parameters: datetimeText, datepickerInstance).
+    alwaysSetTime?: boolean; //Default: true - Always have a time set internally, even before user has chosen one.
+    separator?: string; //Default: " " - When formatting the time this string is placed between the formatted date and formatted time.
+    pickerTimeFormat?: string; //Default: (timeFormat option) - How to format the time displayed within the timepicker.
+    pickerTimeSuffix?: string; //Default: (timeSuffix option) - String to place after the formatted time within the timepicker.
+    showTimepicker?: boolean; //Default: true - Whether to show the timepicker within the datepicker.
+    addSliderAccess?: boolean; //Default: false - Adds the sliderAccess plugin to sliders within timepicker
+    sliderAccessArgs?: any; //Default: null - Object to pass to sliderAccess when used.
+    defaultValue?: string; //Default: null - String of the default time value placed in the input on focus when the input is empty.
+    minDateTime?: Date; //Default: null - Date object of the minimum datetime allowed.Also available as minDate.
+    maxDateTime?: Date; //Default: null - Date object of the maximum datetime allowed.Also Available as maxDate.
+    parse?: string; //Default: 'strict' - How to parse the time string. Two methods are provided: 'strict' which must match the timeFormat exactly, and 'loose' which uses javascript's new Date(timeString) to guess the time. You may also pass in a function(timeFormat, timeString, options) to handle the parsing yourself, returning a simple object:      
+
+    // Alt field options
+    altFieldTimeOnly?: boolean;  //Default: true - When altField is used from datepicker altField will only receive the formatted time and the original field only receives date.
+    altSeparator?: string;       //Default: (separator option) - String placed between formatted date and formatted time in the altField.
+    altTimeSuffix?: string;      //Default: (timeSuffix option) - String always placed after the formatted time in the altField.
+    altTimeFormat?: string;      //Default: (timeFormat option) - The time format to use with the altField.
+
+    // Localization options
+    currentText?: string;    //Default: "Now", A Localization Setting - Text for the Now button.
+    closeText?: string;      //Default: "Done", A Localization Setting - Text for the Close button.
+    amNames?: string;        //Default: ['AM', 'A'], A Localization Setting - Array of strings to try and parse against to determine AM.
+    pmNames?: string;        //Default: ['PM', 'P'], A Localization Setting - Array of strings to try and parse against to determine PM.
+    timeFormat?: string;     //Default: "HH:mm", A Localization Setting - String of format tokens to be replaced with the time.See Formatting.
+    timeSuffix?: string;     //Default: "", A Localization Setting - String to place after the formatted time.
+    timeOnlyTitle?: string;  //Default: "Choose Time", A Localization Setting - Title of the wigit when using only timepicker.
+    timeText?: string;       //Default: "Time", A Localization Setting - Label used within timepicker for the formatted time.
+    hourText?: string;       //Default: "Hour", A Localization Setting - Label used to identify the hour slider.
+    minuteText?: string;     //Default: "Minute", A Localization Setting - Label used to identify the minute slider.
+    secondText?: string;     //Default: "Second", A Localization Setting - Label used to identify the second slider.
+    millisecText?: string;   //Default: "Millisecond", A Localization Setting - Label used to identify the millisecond slider.
+    microsecText?: string;   //Default: "Microsecond", A Localization Setting - Label used to identify the microsecond slider.
+    timezoneText?: string;   //Default: "Timezone", A Localization Setting - Label used to identify the timezone slider.
+    isRTL?: boolean;         //Default: false, A Localization Setting - Right to Left support. 
+
+    // Timefield options
+    controlType?: string;    //Default: 'slider' - Whether to use 'slider' or 'select'.If 'slider' is unavailable through jQueryUI, 'select' will be used.For advanced usage you may pass an object which implements "create", "options", "value" methods to use controls other than sliders or selects.See the _controls property in the source code for more details.
+    showHour?: boolean;     //Default: null - Whether to show the hour control. The default of null will use detection from timeFormat.
+    showMinute?: boolean;   //Default: null - Whether to show the minute control. The default of null will use detection from timeFormat.
+    showSecond?: boolean;   //Default: null - Whether to show the second control. The default of null will use detection from timeFormat.
+    showMillisec?: boolean; //Default: null - Whether to show the millisecond control. The default of null will use detection from timeFormat.
+    showMicrosec?: boolean; //Default: null - Whether to show the microsecond control. The default of null will use detection from timeFormat.
+    showTimezone?: boolean; //Default: null - Whether to show the timezone select.
+    showTime?: boolean;      //Default: true - Whether to show the time selected within the datetimepicker.
+    stepHour?: number;       //Default: 1 - Hours per step the slider makes.
+    stepMinute?: number;     //Default: 1 - Minutes per step the slider makes.
+    stepSecond?: number;     //Default: 1 - Seconds per step the slider makes.
+    stepMillisec?: number;   //Default: 1 - Milliseconds per step the slider makes.
+    stepMicrosec?: number;   //Default: 1 - Microseconds per step the slider makes.
+    hour?: number;           //Default: 0 - Initial hour set.
+    minute?: number;         //Default: 0 - Initial minute set.
+    second?: number;         //Default: 0 - Initial second set.
+    millisec?: number;       //Default: 0 - Initial millisecond set.
+    microsec?: number;       //Default: 0 - Initial microsecond set. Note: Javascript's native Date object does not natively support microseconds. Timepicker adds ability to simply Date.setMicroseconds(m) and Date.getMicroseconds(). Date comparisons will not acknowledge microseconds. Use this only for display purposes.
+    timezone?: number;      //Default: null - Initial timezone set.This is the offset in minutes.If null the browser's local timezone will be used. If you're timezone is "-0400" you would use - 240. For backwards compatibility you may pass "-0400", however the timezone is stored in minutes and more reliable.
+    hourMin?: number;        //Default: 0 - The minimum hour allowed for all dates.
+    minuteMin?: number;      //Default: 0 - The minimum minute allowed for all dates.
+    secondMin?: number;      //Default: 0 - The minimum second allowed for all dates.
+    millisecMin?: number;    //Default: 0 - The minimum millisecond allowed for all dates.
+    microsecMin?: number;    //Default: 0 - The minimum microsecond allowed for all dates.
+    hourMax?: number;        //Default: 23 - The maximum hour allowed for all dates.
+    minuteMax?: number;      //Default: 59 - The maximum minute allowed for all dates.
+    secondMax?: number;      //Default: 59 - The maximum second allowed for all dates.
+    millisecMax?: number;    //Default: 999 - The maximum millisecond allowed for all dates.
+    microsecMax?: number;    //Default: 999 - The maximum microsecond allowed for all dates.
+    hourGrid?: number;       //Default: 0 - When greater than 0 a label grid will be generated under the slider.This number represents the units (in hours) between labels.
+    minuteGrid?: number;     //Default: 0 - When greater than 0 a label grid will be generated under the slider.This number represents the units (in minutes) between labels.
+    secondGrid?: number;     //Default: 0 - When greater than 0 a label grid will be genereated under the slider.This number represents the units (in seconds) between labels.
+    millisecGrid?: number;   //Default: 0 - When greater than 0 a label grid will be genereated under the slider.This number represents the units (in milliseconds) between labels.
+    microsecGrid?: number;   //Default: 0 - When greater than 0 a label grid will be genereated under the slider.This number represents the units (in microseconds) between labels.
+
+    // Timezone options
+    timezoneList?: Array<TimezoneOptions> //Default: [generated timezones] - An array of timezones used to populate the timezone select.Can be an array of values or an array of objects: { label: "EDT", value: -240 }. The value should be the offset number in minutes.So "-0400" which is the format "-hhmm", would equate to - 240 minutes.
+}
+
+interface TimezoneOptions {
+    label: string;
+    value: number;
+}
+
+interface Time {
+    hour?: number;
+    minute?: number;
+    second?: number;
+    millisecond?: number;
+    timezone?: string;
+}
+
+interface formatTimeOptions {
+    format: string;
+    time: Time;
+    options?: DateTimePickerOptions;
+}
+
+interface parseTimeOptions {
+    format: string;
+    time: string;
+    options?: DateTimePickerOptions;
+}
+
+interface parseDateTimeOptions {
+    dateFormat: string;
+    timeFormat: string;
+    dateTimeString: string;
+    dateSettings: string;
+    timeSettings: string;
+}
+
+interface JQuery {
+    datetimepicker(): JQuery;
+    datetimepicker(options?: DateTimePickerOptions): JQuery;            
+    datetimepicker(method: string, methodParameter: any): any;
+    datetimepicker(method: 'formatTime', methodParameter: formatTimeOptions): string;
+    datetimepicker(method: 'parseTime', methodParameter: parseTimeOptions): Time;
+    datetimepicker(method: 'parseDateTime', methodParameter: parseDateTimeOptions): Date;
+}
+
diff --git a/jquery.ui.datetimepicker/jquery.ui.datetimepicker-tests.ts b/jquery.ui.datetimepicker/jquery.ui.datetimepicker-tests.ts
index 52ae3e2e64..44996637da 100644
--- a/jquery.ui.datetimepicker/jquery.ui.datetimepicker-tests.ts
+++ b/jquery.ui.datetimepicker/jquery.ui.datetimepicker-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.ui.datetimepicker.d.ts" />
+/// <reference types="jquery"/>
+
 
 // basic no options
 $('#datetimepicker').datetimepicker({
diff --git a/jquery.ui.datetimepicker/jquery.ui.datetimepicker.d.ts b/jquery.ui.datetimepicker/jquery.ui.datetimepicker.d.ts
deleted file mode 100644
index 3cd4891bd7..0000000000
--- a/jquery.ui.datetimepicker/jquery.ui.datetimepicker.d.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-// Type definitions for jQuery UI DateTimePicker 0.3
-// Project: http://trentrichardson.com/examples/timepicker/
-// Definitions by: dougajmcdonald <https://github.com/dougajmcdonald>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="../jqueryui/jqueryui.d.ts"/>
-
-interface DateTimePickerOptions extends JQueryUI.DatepickerOptions {
-
-    // Control options
-    showButtonPanel?: boolean; //Default: true - Whether to show the button panel at the bottom.This is generally needed.
-    timeOnly?: boolean; //Default: false - Hide the datepicker and only provide a time interface.
-    onSelect?: () => any; //Default: null - Function to be called when a date is chosen or time has changed(parameters: datetimeText, datepickerInstance).
-    alwaysSetTime?: boolean; //Default: true - Always have a time set internally, even before user has chosen one.
-    separator?: string; //Default: " " - When formatting the time this string is placed between the formatted date and formatted time.
-    pickerTimeFormat?: string; //Default: (timeFormat option) - How to format the time displayed within the timepicker.
-    pickerTimeSuffix?: string; //Default: (timeSuffix option) - String to place after the formatted time within the timepicker.
-    showTimepicker?: boolean; //Default: true - Whether to show the timepicker within the datepicker.
-    addSliderAccess?: boolean; //Default: false - Adds the sliderAccess plugin to sliders within timepicker
-    sliderAccessArgs?: any; //Default: null - Object to pass to sliderAccess when used.
-    defaultValue?: string; //Default: null - String of the default time value placed in the input on focus when the input is empty.
-    minDateTime?: Date; //Default: null - Date object of the minimum datetime allowed.Also available as minDate.
-    maxDateTime?: Date; //Default: null - Date object of the maximum datetime allowed.Also Available as maxDate.
-    parse?: string; //Default: 'strict' - How to parse the time string. Two methods are provided: 'strict' which must match the timeFormat exactly, and 'loose' which uses javascript's new Date(timeString) to guess the time. You may also pass in a function(timeFormat, timeString, options) to handle the parsing yourself, returning a simple object:      
-
-    // Alt field options
-    altFieldTimeOnly?: boolean;  //Default: true - When altField is used from datepicker altField will only receive the formatted time and the original field only receives date.
-    altSeparator?: string;       //Default: (separator option) - String placed between formatted date and formatted time in the altField.
-    altTimeSuffix?: string;      //Default: (timeSuffix option) - String always placed after the formatted time in the altField.
-    altTimeFormat?: string;      //Default: (timeFormat option) - The time format to use with the altField.
-
-    // Localization options
-    currentText?: string;    //Default: "Now", A Localization Setting - Text for the Now button.
-    closeText?: string;      //Default: "Done", A Localization Setting - Text for the Close button.
-    amNames?: string;        //Default: ['AM', 'A'], A Localization Setting - Array of strings to try and parse against to determine AM.
-    pmNames?: string;        //Default: ['PM', 'P'], A Localization Setting - Array of strings to try and parse against to determine PM.
-    timeFormat?: string;     //Default: "HH:mm", A Localization Setting - String of format tokens to be replaced with the time.See Formatting.
-    timeSuffix?: string;     //Default: "", A Localization Setting - String to place after the formatted time.
-    timeOnlyTitle?: string;  //Default: "Choose Time", A Localization Setting - Title of the wigit when using only timepicker.
-    timeText?: string;       //Default: "Time", A Localization Setting - Label used within timepicker for the formatted time.
-    hourText?: string;       //Default: "Hour", A Localization Setting - Label used to identify the hour slider.
-    minuteText?: string;     //Default: "Minute", A Localization Setting - Label used to identify the minute slider.
-    secondText?: string;     //Default: "Second", A Localization Setting - Label used to identify the second slider.
-    millisecText?: string;   //Default: "Millisecond", A Localization Setting - Label used to identify the millisecond slider.
-    microsecText?: string;   //Default: "Microsecond", A Localization Setting - Label used to identify the microsecond slider.
-    timezoneText?: string;   //Default: "Timezone", A Localization Setting - Label used to identify the timezone slider.
-    isRTL?: boolean;         //Default: false, A Localization Setting - Right to Left support. 
-
-    // Timefield options
-    controlType?: string;    //Default: 'slider' - Whether to use 'slider' or 'select'.If 'slider' is unavailable through jQueryUI, 'select' will be used.For advanced usage you may pass an object which implements "create", "options", "value" methods to use controls other than sliders or selects.See the _controls property in the source code for more details.
-    showHour?: boolean;     //Default: null - Whether to show the hour control. The default of null will use detection from timeFormat.
-    showMinute?: boolean;   //Default: null - Whether to show the minute control. The default of null will use detection from timeFormat.
-    showSecond?: boolean;   //Default: null - Whether to show the second control. The default of null will use detection from timeFormat.
-    showMillisec?: boolean; //Default: null - Whether to show the millisecond control. The default of null will use detection from timeFormat.
-    showMicrosec?: boolean; //Default: null - Whether to show the microsecond control. The default of null will use detection from timeFormat.
-    showTimezone?: boolean; //Default: null - Whether to show the timezone select.
-    showTime?: boolean;      //Default: true - Whether to show the time selected within the datetimepicker.
-    stepHour?: number;       //Default: 1 - Hours per step the slider makes.
-    stepMinute?: number;     //Default: 1 - Minutes per step the slider makes.
-    stepSecond?: number;     //Default: 1 - Seconds per step the slider makes.
-    stepMillisec?: number;   //Default: 1 - Milliseconds per step the slider makes.
-    stepMicrosec?: number;   //Default: 1 - Microseconds per step the slider makes.
-    hour?: number;           //Default: 0 - Initial hour set.
-    minute?: number;         //Default: 0 - Initial minute set.
-    second?: number;         //Default: 0 - Initial second set.
-    millisec?: number;       //Default: 0 - Initial millisecond set.
-    microsec?: number;       //Default: 0 - Initial microsecond set. Note: Javascript's native Date object does not natively support microseconds. Timepicker adds ability to simply Date.setMicroseconds(m) and Date.getMicroseconds(). Date comparisons will not acknowledge microseconds. Use this only for display purposes.
-    timezone?: number;      //Default: null - Initial timezone set.This is the offset in minutes.If null the browser's local timezone will be used. If you're timezone is "-0400" you would use - 240. For backwards compatibility you may pass "-0400", however the timezone is stored in minutes and more reliable.
-    hourMin?: number;        //Default: 0 - The minimum hour allowed for all dates.
-    minuteMin?: number;      //Default: 0 - The minimum minute allowed for all dates.
-    secondMin?: number;      //Default: 0 - The minimum second allowed for all dates.
-    millisecMin?: number;    //Default: 0 - The minimum millisecond allowed for all dates.
-    microsecMin?: number;    //Default: 0 - The minimum microsecond allowed for all dates.
-    hourMax?: number;        //Default: 23 - The maximum hour allowed for all dates.
-    minuteMax?: number;      //Default: 59 - The maximum minute allowed for all dates.
-    secondMax?: number;      //Default: 59 - The maximum second allowed for all dates.
-    millisecMax?: number;    //Default: 999 - The maximum millisecond allowed for all dates.
-    microsecMax?: number;    //Default: 999 - The maximum microsecond allowed for all dates.
-    hourGrid?: number;       //Default: 0 - When greater than 0 a label grid will be generated under the slider.This number represents the units (in hours) between labels.
-    minuteGrid?: number;     //Default: 0 - When greater than 0 a label grid will be generated under the slider.This number represents the units (in minutes) between labels.
-    secondGrid?: number;     //Default: 0 - When greater than 0 a label grid will be genereated under the slider.This number represents the units (in seconds) between labels.
-    millisecGrid?: number;   //Default: 0 - When greater than 0 a label grid will be genereated under the slider.This number represents the units (in milliseconds) between labels.
-    microsecGrid?: number;   //Default: 0 - When greater than 0 a label grid will be genereated under the slider.This number represents the units (in microseconds) between labels.
-
-    // Timezone options
-    timezoneList?: Array<TimezoneOptions> //Default: [generated timezones] - An array of timezones used to populate the timezone select.Can be an array of values or an array of objects: { label: "EDT", value: -240 }. The value should be the offset number in minutes.So "-0400" which is the format "-hhmm", would equate to - 240 minutes.
-}
-
-interface TimezoneOptions {
-    label: string;
-    value: number;
-}
-
-interface Time {
-    hour?: number;
-    minute?: number;
-    second?: number;
-    millisecond?: number;
-    timezone?: string;
-}
-
-interface formatTimeOptions {
-    format: string;
-    time: Time;
-    options?: DateTimePickerOptions;
-}
-
-interface parseTimeOptions {
-    format: string;
-    time: string;
-    options?: DateTimePickerOptions;
-}
-
-interface parseDateTimeOptions {
-    dateFormat: string;
-    timeFormat: string;
-    dateTimeString: string;
-    dateSettings: string;
-    timeSettings: string;
-}
-
-interface JQuery {
-    datetimepicker(): JQuery;
-    datetimepicker(options?: DateTimePickerOptions): JQuery;            
-    datetimepicker(method: string, methodParameter: any): any;
-    datetimepicker(method: 'formatTime', methodParameter: formatTimeOptions): string;
-    datetimepicker(method: 'parseTime', methodParameter: parseTimeOptions): Time;
-    datetimepicker(method: 'parseDateTime', methodParameter: parseDateTimeOptions): Date;
-}
-
diff --git a/jquery.ui.datetimepicker/tsconfig.json b/jquery.ui.datetimepicker/tsconfig.json
new file mode 100644
index 0000000000..167600f87d
--- /dev/null
+++ b/jquery.ui.datetimepicker/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.ui.datetimepicker-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.ui.layout/index.d.ts b/jquery.ui.layout/index.d.ts
new file mode 100644
index 0000000000..cab45fe24d
--- /dev/null
+++ b/jquery.ui.layout/index.d.ts
@@ -0,0 +1,484 @@
+// Type definitions for jQuery UI Layout Plug-in
+// Project: http://layout.jquery-dev.net/
+// Definitions by: Steve Fenton <https://github.com/Steve-Fenton>, Douglas Armstrong <https://github.com/drarmstr>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+/// <reference types="jqueryui"/>
+
+declare namespace JQueryUILayout {
+
+    interface PaneOptions {
+        applyDefaultStyles?: boolean;
+        scrollToBookmarkOnLoad?: boolean;
+        showOverflowOnHover?: boolean;
+        closable?: boolean;
+        resizable?: boolean;
+        slidable?: boolean;
+        paneSelector?: string;
+        contentSelector?: string;
+        contentIgnoreSelector?: string;
+        paneClass?: string;
+        resizerClass?: string;
+        togglerClass?: string;
+        buttonClass?: string;
+        size?: string | number;
+        minSize?: number;
+        maxSize?: number;
+        spacing_open?: number;
+        spacing_closed?: number;
+        resizerTip?: string;
+        resizerCursor?: string;
+        resizerDragOpacity?: number;
+        maskIframesOnResize?: boolean | string;
+        sliderTip?: string;
+        sliderCursor?: string;
+        slideTrigger_open?: string;
+        slideTrigger_close?: string;
+        togglerTip_open?: string;
+        togglerTip_closed?: string;
+        togglerLength_open?: number | string;
+        togglerLength_closed?: number | string;
+        hideTogglerOnSlide?: boolean;
+        togglerAlign_open?: string | number;
+        togglerAlign_closed?: string | number;
+        togglerContent_open?: string;
+        togglerContent_closed?: string;
+        enableCursorHotkey?: boolean;
+        customHotkeyModifier?: string;
+        customHotkey?: string | number;
+        fxName?: string;
+        fxSpeed?: string | number;
+        fxSettings?: JQueryAnimationOptions;
+        initClosed?: boolean;
+        initHidden?: boolean;
+        onshow_start?: string | { (name:string, pane:JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        onshow_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        onshow?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        onhide_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        onhide_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        onhide?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        onopen_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        onopen_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        onopen?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        onclose_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        onclose_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        onclose?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        onresize_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        onresize_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        onresize?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+    }
+
+    interface Options extends PaneOptions {
+        defaults?: PaneOptions;
+        north?: PaneOptions;
+        east?: PaneOptions;
+        south?: PaneOptions;
+        west?: PaneOptions;
+        center?: PaneOptions;
+
+        defaults__applyDefaultStyles?: boolean;
+        defaults__scrollToBookmarkOnLoad?: boolean;
+        defaults__showOverflowOnHover?: boolean;
+        defaults__closable?: boolean;
+        defaults__resizable?: boolean;
+        defaults__slidable?: boolean;
+        defaults__paneSelector?: string;
+        defaults__contentSelector?: string;
+        defaults__contentIgnoreSelector?: string;
+        defaults__paneClass?: string;
+        defaults__resizerClass?: string;
+        defaults__togglerClass?: string;
+        defaults__buttonClass?: string;
+        defaults__size?: string | number;
+        defaults__minSize?: number;
+        defaults__maxSize?: number;
+        defaults__spacing_open?: number;
+        defaults__spacing_closed?: number;
+        defaults__resizerTip?: string;
+        defaults__resizerCursor?: string;
+        defaults__resizerDragOpacity?: number;
+        defaults__maskIframesOnResize?: boolean | string;
+        defaults__sliderTip?: string;
+        defaults__sliderCursor?: string;
+        defaults__slideTrigger_open?: string;
+        defaults__slideTrigger_close?: string;
+        defaults__togglerTip_open?: string;
+        defaults__togglerTip_closed?: string;
+        defaults__togglerLength_open?: number | string;
+        defaults__togglerLength_closed?: number | string;
+        defaults__hideTogglerOnSlide?: boolean;
+        defaults__togglerAlign_open?: string | number;
+        defaults__togglerAlign_closed?: string | number;
+        defaults__togglerContent_open?: string;
+        defaults__togglerContent_closed?: string;
+        defaults__enableCursorHotkey?: boolean;
+        defaults__customHotkeyModifier?: string;
+        defaults__customHotkey?: string | number;
+        defaults__fxName?: string;
+        defaults__fxSpeed?: string | number;
+        defaults__fxSettings?: JQueryAnimationOptions;
+        defaults__initClosed?: boolean;
+        defaults__initHidden?: boolean;
+        defaults__onshow_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        defaults__onshow_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        defaults__onshow?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        defaults__onhide_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        defaults__onhide_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        defaults__onhide?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        defaults__onopen_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        defaults__onopen_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        defaults__onopen?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        defaults__onclose_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        defaults__onclose_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        defaults__onclose?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        defaults__onresize_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        defaults__onresize_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        defaults__onresize?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+
+        north__applyDefaultStyles?: boolean;
+        north__scrollToBookmarkOnLoad?: boolean;
+        north__showOverflowOnHover?: boolean;
+        north__closable?: boolean;
+        north__resizable?: boolean;
+        north__slidable?: boolean;
+        north__paneSelector?: string;
+        north__contentSelector?: string;
+        north__contentIgnoreSelector?: string;
+        north__paneClass?: string;
+        north__resizerClass?: string;
+        north__togglerClass?: string;
+        north__buttonClass?: string;
+        north__size?: string | number;
+        north__minSize?: number;
+        north__maxSize?: number;
+        north__spacing_open?: number;
+        north__spacing_closed?: number;
+        north__resizerTip?: string;
+        north__resizerCursor?: string;
+        north__resizerDragOpacity?: number;
+        north__maskIframesOnResize?: boolean | string;
+        north__sliderTip?: string;
+        north__sliderCursor?: string;
+        north__slideTrigger_open?: string;
+        north__slideTrigger_close?: string;
+        north__togglerTip_open?: string;
+        north__togglerTip_closed?: string;
+        north__togglerLength_open?: number | string;
+        north__togglerLength_closed?: number | string;
+        north__hideTogglerOnSlide?: boolean;
+        north__togglerAlign_open?: string | number;
+        north__togglerAlign_closed?: string | number;
+        north__togglerContent_open?: string;
+        north__togglerContent_closed?: string;
+        north__enableCursorHotkey?: boolean;
+        north__customHotkeyModifier?: string;
+        north__customHotkey?: string | number;
+        north__fxName?: string;
+        north__fxSpeed?: string | number;
+        north__fxSettings?: JQueryAnimationOptions;
+        north__initClosed?: boolean;
+        north__initHidden?: boolean;
+        north__onshow_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        north__onshow_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        north__onshow?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        north__onhide_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        north__onhide_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        north__onhide?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        north__onopen_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        north__onopen_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        north__onopen?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        north__onclose_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        north__onclose_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        north__onclose?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        north__onresize_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        north__onresize_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        north__onresize?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+
+        east__applyDefaultStyles?: boolean;
+        east__scrollToBookmarkOnLoad?: boolean;
+        east__showOverflowOnHover?: boolean;
+        east__closable?: boolean;
+        east__resizable?: boolean;
+        east__slidable?: boolean;
+        east__paneSelector?: string;
+        east__contentSelector?: string;
+        east__contentIgnoreSelector?: string;
+        east__paneClass?: string;
+        east__resizerClass?: string;
+        east__togglerClass?: string;
+        east__buttonClass?: string;
+        east__size?: string | number;
+        east__minSize?: number;
+        east__maxSize?: number;
+        east__spacing_open?: number;
+        east__spacing_closed?: number;
+        east__resizerTip?: string;
+        east__resizerCursor?: string;
+        east__resizerDragOpacity?: number;
+        east__maskIframesOnResize?: boolean | string;
+        east__sliderTip?: string;
+        east__sliderCursor?: string;
+        east__slideTrigger_open?: string;
+        east__slideTrigger_close?: string;
+        east__togglerTip_open?: string;
+        east__togglerTip_closed?: string;
+        east__togglerLength_open?: number | string;
+        east__togglerLength_closed?: number | string;
+        east__hideTogglerOnSlide?: boolean;
+        east__togglerAlign_open?: string | number;
+        east__togglerAlign_closed?: string | number;
+        east__togglerContent_open?: string;
+        east__togglerContent_closed?: string;
+        east__enableCursorHotkey?: boolean;
+        east__customHotkeyModifier?: string;
+        east__customHotkey?: string | number;
+        east__fxName?: string;
+        east__fxSpeed?: string | number;
+        east__fxSettings?: JQueryAnimationOptions;
+        east__initClosed?: boolean;
+        east__initHidden?: boolean;
+        east__onshow_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        east__onshow_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        east__onshow?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        east__onhide_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        east__onhide_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        east__onhide?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        east__onopen_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        east__onopen_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        east__onopen?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        east__onclose_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        east__onclose_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        east__onclose?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        east__onresize_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        east__onresize_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        east__onresize?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+
+        south__applyDefaultStyles?: boolean;
+        south__scrollToBookmarkOnLoad?: boolean;
+        south__showOverflowOnHover?: boolean;
+        south__closable?: boolean;
+        south__resizable?: boolean;
+        south__slidable?: boolean;
+        south__paneSelector?: string;
+        south__contentSelector?: string;
+        south__contentIgnoreSelector?: string;
+        south__paneClass?: string;
+        south__resizerClass?: string;
+        south__togglerClass?: string;
+        south__buttonClass?: string;
+        south__size?: string | number;
+        south__minSize?: number;
+        south__maxSize?: number;
+        south__spacing_open?: number;
+        south__spacing_closed?: number;
+        south__resizerTip?: string;
+        south__resizerCursor?: string;
+        south__resizerDragOpacity?: number;
+        south__maskIframesOnResize?: boolean | string;
+        south__sliderTip?: string;
+        south__sliderCursor?: string;
+        south__slideTrigger_open?: string;
+        south__slideTrigger_close?: string;
+        south__togglerTip_open?: string;
+        south__togglerTip_closed?: string;
+        south__togglerLength_open?: number | string;
+        south__togglerLength_closed?: number | string;
+        south__hideTogglerOnSlide?: boolean;
+        south__togglerAlign_open?: string | number;
+        south__togglerAlign_closed?: string | number;
+        south__togglerContent_open?: string;
+        south__togglerContent_closed?: string;
+        south__enableCursorHotkey?: boolean;
+        south__customHotkeyModifier?: string;
+        south__customHotkey?: string | number;
+        south__fxName?: string;
+        south__fxSpeed?: string | number;
+        south__fxSettings?: JQueryAnimationOptions;
+        south__initClosed?: boolean;
+        south__initHidden?: boolean;
+        south__onshow_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        south__onshow_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        south__onshow?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        south__onhide_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        south__onhide_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        south__onhide?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        south__onopen_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        south__onopen_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        south__onopen?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        south__onclose_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        south__onclose_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        south__onclose?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        south__onresize_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        south__onresize_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        south__onresize?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+
+        west__applyDefaultStyles?: boolean;
+        west__scrollToBookmarkOnLoad?: boolean;
+        west__showOverflowOnHover?: boolean;
+        west__closable?: boolean;
+        west__resizable?: boolean;
+        west__slidable?: boolean;
+        west__paneSelector?: string;
+        west__contentSelector?: string;
+        west__contentIgnoreSelector?: string;
+        west__paneClass?: string;
+        west__resizerClass?: string;
+        west__togglerClass?: string;
+        west__buttonClass?: string;
+        west__size?: string | number;
+        west__minSize?: number;
+        west__maxSize?: number;
+        west__spacing_open?: number;
+        west__spacing_closed?: number;
+        west__resizerTip?: string;
+        west__resizerCursor?: string;
+        west__resizerDragOpacity?: number;
+        west__maskIframesOnResize?: boolean | string;
+        west__sliderTip?: string;
+        west__sliderCursor?: string;
+        west__slideTrigger_open?: string;
+        west__slideTrigger_close?: string;
+        west__togglerTip_open?: string;
+        west__togglerTip_closed?: string;
+        west__togglerLength_open?: number | string;
+        west__togglerLength_closed?: number | string;
+        west__hideTogglerOnSlide?: boolean;
+        west__togglerAlign_open?: string | number;
+        west__togglerAlign_closed?: string | number;
+        west__togglerContent_open?: string;
+        west__togglerContent_closed?: string;
+        west__enableCursorHotkey?: boolean;
+        west__customHotkeyModifier?: string;
+        west__customHotkey?: string | number;
+        west__fxName?: string;
+        west__fxSpeed?: string | number;
+        west__fxSettings?: JQueryAnimationOptions;
+        west__initClosed?: boolean;
+        west__initHidden?: boolean;
+        west__onshow_start?: string | { (name:string, pane:JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        west__onshow_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        west__onshow?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        west__onhide_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        west__onhide_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        west__onhide?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        west__onopen_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        west__onopen_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        west__onopen?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        west__onclose_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        west__onclose_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        west__onclose?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        west__onresize_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        west__onresize_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        west__onresize?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+
+        center__applyDefaultStyles?: boolean;
+        center__scrollToBookmarkOnLoad?: boolean;
+        center__showOverflowOnHover?: boolean;
+        center__closable?: boolean;
+        center__resizable?: boolean;
+        center__slidable?: boolean;
+        center__paneSelector?: string;
+        center__contentSelector?: string;
+        center__contentIgnoreSelector?: string;
+        center__paneClass?: string;
+        center__resizerClass?: string;
+        center__togglerClass?: string;
+        center__buttonClass?: string;
+        center__size?: string | number;
+        center__minSize?: number;
+        center__maxSize?: number;
+        center__spacing_open?: number;
+        center__spacing_closed?: number;
+        center__resizerTip?: string;
+        center__resizerCursor?: string;
+        center__resizerDragOpacity?: number;
+        center__maskIframesOnResize?: boolean | string;
+        center__sliderTip?: string;
+        center__sliderCursor?: string;
+        center__slideTrigger_open?: string;
+        center__slideTrigger_close?: string;
+        center__togglerTip_open?: string;
+        center__togglerTip_closed?: string;
+        center__togglerLength_open?: number | string;
+        center__togglerLength_closed?: number | string;
+        center__hideTogglerOnSlide?: boolean;
+        center__togglerAlign_open?: string | number;
+        center__togglerAlign_closed?: string | number;
+        center__togglerContent_open?: string;
+        center__togglerContent_closed?: string;
+        center__enableCursorHotkey?: boolean;
+        center__customHotkeyModifier?: string;
+        center__customHotkey?: string | number;
+        center__fxName?: string;
+        center__fxSpeed?: string | number;
+        center__fxSettings?: JQueryAnimationOptions;
+        center__initClosed?: boolean;
+        center__initHidden?: boolean;
+        center__onshow_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        center__onshow_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        center__onshow?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        center__onhide_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        center__onhide_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        center__onhide?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        center__onopen_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        center__onopen_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        center__onopen?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        center__onclose_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        center__onclose_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        center__onclose?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        center__onresize_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
+        center__onresize_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+        center__onresize?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
+    }
+
+
+    interface PaneState {
+        isClosed: boolean;
+        isSliding: boolean;
+        isResizing: boolean;
+        isHidden: boolean;
+        noRoom: boolean;
+        size: number;
+        minSize: number;
+        maxSize: number;
+    }
+
+
+    interface Layout {
+        panes: {
+            north: JQuery | boolean;
+            east: JQuery | boolean;
+            south: JQuery | boolean;
+            west: JQuery | boolean;
+        };
+        options: Options;
+        state: {
+            north: PaneState;
+            east: PaneState;
+            south: PaneState;
+            west: PaneState;
+        }
+
+        toggle(pane: string): JQuery;
+        open(pane: string): JQuery;
+        close(pane: string): JQuery;
+        show(pane: string, openPane?: boolean): JQuery;
+        hide(pane: string): JQuery;
+        sizePane(pane: string, sizeInPixels: number): JQuery;
+        resizeContent(pane: string): JQuery;
+        resizeAll(): JQuery;
+
+        addToggleBtn(selector: string, pane: string): JQuery;
+        addCloseBtn(selector: string, pane: string): JQuery;
+        addOpenBtn(selector: string, pane: string): JQuery;
+        addPinBtn(selector: string, pane: string): JQuery;
+        allowOverflow(elemOrPane: HTMLElement | string): JQuery;
+        resetOverflow(elemOrPane: HTMLElement | string): JQuery;
+    }
+}
+
+
+interface JQuery {
+    layout(options?: JQueryUILayout.Options): JQueryUILayout.Layout;
+}
diff --git a/jquery.ui.layout/jquery.ui.layout.d.ts b/jquery.ui.layout/jquery.ui.layout.d.ts
deleted file mode 100644
index dd120edd7e..0000000000
--- a/jquery.ui.layout/jquery.ui.layout.d.ts
+++ /dev/null
@@ -1,484 +0,0 @@
-// Type definitions for jQuery UI Layout Plug-in
-// Project: http://layout.jquery-dev.net/
-// Definitions by: Steve Fenton <https://github.com/Steve-Fenton>, Douglas Armstrong <https://github.com/drarmstr>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="../jqueryui/jqueryui.d.ts"/>
-
-declare namespace JQueryUILayout {
-
-    interface PaneOptions {
-        applyDefaultStyles?: boolean;
-        scrollToBookmarkOnLoad?: boolean;
-        showOverflowOnHover?: boolean;
-        closable?: boolean;
-        resizable?: boolean;
-        slidable?: boolean;
-        paneSelector?: string;
-        contentSelector?: string;
-        contentIgnoreSelector?: string;
-        paneClass?: string;
-        resizerClass?: string;
-        togglerClass?: string;
-        buttonClass?: string;
-        size?: string | number;
-        minSize?: number;
-        maxSize?: number;
-        spacing_open?: number;
-        spacing_closed?: number;
-        resizerTip?: string;
-        resizerCursor?: string;
-        resizerDragOpacity?: number;
-        maskIframesOnResize?: boolean | string;
-        sliderTip?: string;
-        sliderCursor?: string;
-        slideTrigger_open?: string;
-        slideTrigger_close?: string;
-        togglerTip_open?: string;
-        togglerTip_closed?: string;
-        togglerLength_open?: number | string;
-        togglerLength_closed?: number | string;
-        hideTogglerOnSlide?: boolean;
-        togglerAlign_open?: string | number;
-        togglerAlign_closed?: string | number;
-        togglerContent_open?: string;
-        togglerContent_closed?: string;
-        enableCursorHotkey?: boolean;
-        customHotkeyModifier?: string;
-        customHotkey?: string | number;
-        fxName?: string;
-        fxSpeed?: string | number;
-        fxSettings?: JQueryAnimationOptions;
-        initClosed?: boolean;
-        initHidden?: boolean;
-        onshow_start?: string | { (name:string, pane:JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        onshow_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        onshow?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        onhide_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        onhide_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        onhide?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        onopen_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        onopen_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        onopen?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        onclose_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        onclose_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        onclose?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        onresize_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        onresize_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        onresize?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-    }
-
-    interface Options extends PaneOptions {
-        defaults?: PaneOptions;
-        north?: PaneOptions;
-        east?: PaneOptions;
-        south?: PaneOptions;
-        west?: PaneOptions;
-        center?: PaneOptions;
-
-        defaults__applyDefaultStyles?: boolean;
-        defaults__scrollToBookmarkOnLoad?: boolean;
-        defaults__showOverflowOnHover?: boolean;
-        defaults__closable?: boolean;
-        defaults__resizable?: boolean;
-        defaults__slidable?: boolean;
-        defaults__paneSelector?: string;
-        defaults__contentSelector?: string;
-        defaults__contentIgnoreSelector?: string;
-        defaults__paneClass?: string;
-        defaults__resizerClass?: string;
-        defaults__togglerClass?: string;
-        defaults__buttonClass?: string;
-        defaults__size?: string | number;
-        defaults__minSize?: number;
-        defaults__maxSize?: number;
-        defaults__spacing_open?: number;
-        defaults__spacing_closed?: number;
-        defaults__resizerTip?: string;
-        defaults__resizerCursor?: string;
-        defaults__resizerDragOpacity?: number;
-        defaults__maskIframesOnResize?: boolean | string;
-        defaults__sliderTip?: string;
-        defaults__sliderCursor?: string;
-        defaults__slideTrigger_open?: string;
-        defaults__slideTrigger_close?: string;
-        defaults__togglerTip_open?: string;
-        defaults__togglerTip_closed?: string;
-        defaults__togglerLength_open?: number | string;
-        defaults__togglerLength_closed?: number | string;
-        defaults__hideTogglerOnSlide?: boolean;
-        defaults__togglerAlign_open?: string | number;
-        defaults__togglerAlign_closed?: string | number;
-        defaults__togglerContent_open?: string;
-        defaults__togglerContent_closed?: string;
-        defaults__enableCursorHotkey?: boolean;
-        defaults__customHotkeyModifier?: string;
-        defaults__customHotkey?: string | number;
-        defaults__fxName?: string;
-        defaults__fxSpeed?: string | number;
-        defaults__fxSettings?: JQueryAnimationOptions;
-        defaults__initClosed?: boolean;
-        defaults__initHidden?: boolean;
-        defaults__onshow_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        defaults__onshow_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        defaults__onshow?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        defaults__onhide_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        defaults__onhide_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        defaults__onhide?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        defaults__onopen_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        defaults__onopen_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        defaults__onopen?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        defaults__onclose_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        defaults__onclose_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        defaults__onclose?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        defaults__onresize_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        defaults__onresize_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        defaults__onresize?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-
-        north__applyDefaultStyles?: boolean;
-        north__scrollToBookmarkOnLoad?: boolean;
-        north__showOverflowOnHover?: boolean;
-        north__closable?: boolean;
-        north__resizable?: boolean;
-        north__slidable?: boolean;
-        north__paneSelector?: string;
-        north__contentSelector?: string;
-        north__contentIgnoreSelector?: string;
-        north__paneClass?: string;
-        north__resizerClass?: string;
-        north__togglerClass?: string;
-        north__buttonClass?: string;
-        north__size?: string | number;
-        north__minSize?: number;
-        north__maxSize?: number;
-        north__spacing_open?: number;
-        north__spacing_closed?: number;
-        north__resizerTip?: string;
-        north__resizerCursor?: string;
-        north__resizerDragOpacity?: number;
-        north__maskIframesOnResize?: boolean | string;
-        north__sliderTip?: string;
-        north__sliderCursor?: string;
-        north__slideTrigger_open?: string;
-        north__slideTrigger_close?: string;
-        north__togglerTip_open?: string;
-        north__togglerTip_closed?: string;
-        north__togglerLength_open?: number | string;
-        north__togglerLength_closed?: number | string;
-        north__hideTogglerOnSlide?: boolean;
-        north__togglerAlign_open?: string | number;
-        north__togglerAlign_closed?: string | number;
-        north__togglerContent_open?: string;
-        north__togglerContent_closed?: string;
-        north__enableCursorHotkey?: boolean;
-        north__customHotkeyModifier?: string;
-        north__customHotkey?: string | number;
-        north__fxName?: string;
-        north__fxSpeed?: string | number;
-        north__fxSettings?: JQueryAnimationOptions;
-        north__initClosed?: boolean;
-        north__initHidden?: boolean;
-        north__onshow_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        north__onshow_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        north__onshow?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        north__onhide_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        north__onhide_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        north__onhide?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        north__onopen_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        north__onopen_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        north__onopen?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        north__onclose_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        north__onclose_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        north__onclose?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        north__onresize_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        north__onresize_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        north__onresize?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-
-        east__applyDefaultStyles?: boolean;
-        east__scrollToBookmarkOnLoad?: boolean;
-        east__showOverflowOnHover?: boolean;
-        east__closable?: boolean;
-        east__resizable?: boolean;
-        east__slidable?: boolean;
-        east__paneSelector?: string;
-        east__contentSelector?: string;
-        east__contentIgnoreSelector?: string;
-        east__paneClass?: string;
-        east__resizerClass?: string;
-        east__togglerClass?: string;
-        east__buttonClass?: string;
-        east__size?: string | number;
-        east__minSize?: number;
-        east__maxSize?: number;
-        east__spacing_open?: number;
-        east__spacing_closed?: number;
-        east__resizerTip?: string;
-        east__resizerCursor?: string;
-        east__resizerDragOpacity?: number;
-        east__maskIframesOnResize?: boolean | string;
-        east__sliderTip?: string;
-        east__sliderCursor?: string;
-        east__slideTrigger_open?: string;
-        east__slideTrigger_close?: string;
-        east__togglerTip_open?: string;
-        east__togglerTip_closed?: string;
-        east__togglerLength_open?: number | string;
-        east__togglerLength_closed?: number | string;
-        east__hideTogglerOnSlide?: boolean;
-        east__togglerAlign_open?: string | number;
-        east__togglerAlign_closed?: string | number;
-        east__togglerContent_open?: string;
-        east__togglerContent_closed?: string;
-        east__enableCursorHotkey?: boolean;
-        east__customHotkeyModifier?: string;
-        east__customHotkey?: string | number;
-        east__fxName?: string;
-        east__fxSpeed?: string | number;
-        east__fxSettings?: JQueryAnimationOptions;
-        east__initClosed?: boolean;
-        east__initHidden?: boolean;
-        east__onshow_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        east__onshow_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        east__onshow?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        east__onhide_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        east__onhide_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        east__onhide?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        east__onopen_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        east__onopen_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        east__onopen?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        east__onclose_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        east__onclose_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        east__onclose?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        east__onresize_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        east__onresize_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        east__onresize?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-
-        south__applyDefaultStyles?: boolean;
-        south__scrollToBookmarkOnLoad?: boolean;
-        south__showOverflowOnHover?: boolean;
-        south__closable?: boolean;
-        south__resizable?: boolean;
-        south__slidable?: boolean;
-        south__paneSelector?: string;
-        south__contentSelector?: string;
-        south__contentIgnoreSelector?: string;
-        south__paneClass?: string;
-        south__resizerClass?: string;
-        south__togglerClass?: string;
-        south__buttonClass?: string;
-        south__size?: string | number;
-        south__minSize?: number;
-        south__maxSize?: number;
-        south__spacing_open?: number;
-        south__spacing_closed?: number;
-        south__resizerTip?: string;
-        south__resizerCursor?: string;
-        south__resizerDragOpacity?: number;
-        south__maskIframesOnResize?: boolean | string;
-        south__sliderTip?: string;
-        south__sliderCursor?: string;
-        south__slideTrigger_open?: string;
-        south__slideTrigger_close?: string;
-        south__togglerTip_open?: string;
-        south__togglerTip_closed?: string;
-        south__togglerLength_open?: number | string;
-        south__togglerLength_closed?: number | string;
-        south__hideTogglerOnSlide?: boolean;
-        south__togglerAlign_open?: string | number;
-        south__togglerAlign_closed?: string | number;
-        south__togglerContent_open?: string;
-        south__togglerContent_closed?: string;
-        south__enableCursorHotkey?: boolean;
-        south__customHotkeyModifier?: string;
-        south__customHotkey?: string | number;
-        south__fxName?: string;
-        south__fxSpeed?: string | number;
-        south__fxSettings?: JQueryAnimationOptions;
-        south__initClosed?: boolean;
-        south__initHidden?: boolean;
-        south__onshow_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        south__onshow_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        south__onshow?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        south__onhide_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        south__onhide_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        south__onhide?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        south__onopen_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        south__onopen_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        south__onopen?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        south__onclose_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        south__onclose_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        south__onclose?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        south__onresize_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        south__onresize_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        south__onresize?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-
-        west__applyDefaultStyles?: boolean;
-        west__scrollToBookmarkOnLoad?: boolean;
-        west__showOverflowOnHover?: boolean;
-        west__closable?: boolean;
-        west__resizable?: boolean;
-        west__slidable?: boolean;
-        west__paneSelector?: string;
-        west__contentSelector?: string;
-        west__contentIgnoreSelector?: string;
-        west__paneClass?: string;
-        west__resizerClass?: string;
-        west__togglerClass?: string;
-        west__buttonClass?: string;
-        west__size?: string | number;
-        west__minSize?: number;
-        west__maxSize?: number;
-        west__spacing_open?: number;
-        west__spacing_closed?: number;
-        west__resizerTip?: string;
-        west__resizerCursor?: string;
-        west__resizerDragOpacity?: number;
-        west__maskIframesOnResize?: boolean | string;
-        west__sliderTip?: string;
-        west__sliderCursor?: string;
-        west__slideTrigger_open?: string;
-        west__slideTrigger_close?: string;
-        west__togglerTip_open?: string;
-        west__togglerTip_closed?: string;
-        west__togglerLength_open?: number | string;
-        west__togglerLength_closed?: number | string;
-        west__hideTogglerOnSlide?: boolean;
-        west__togglerAlign_open?: string | number;
-        west__togglerAlign_closed?: string | number;
-        west__togglerContent_open?: string;
-        west__togglerContent_closed?: string;
-        west__enableCursorHotkey?: boolean;
-        west__customHotkeyModifier?: string;
-        west__customHotkey?: string | number;
-        west__fxName?: string;
-        west__fxSpeed?: string | number;
-        west__fxSettings?: JQueryAnimationOptions;
-        west__initClosed?: boolean;
-        west__initHidden?: boolean;
-        west__onshow_start?: string | { (name:string, pane:JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        west__onshow_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        west__onshow?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        west__onhide_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        west__onhide_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        west__onhide?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        west__onopen_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        west__onopen_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        west__onopen?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        west__onclose_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        west__onclose_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        west__onclose?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        west__onresize_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        west__onresize_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        west__onresize?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-
-        center__applyDefaultStyles?: boolean;
-        center__scrollToBookmarkOnLoad?: boolean;
-        center__showOverflowOnHover?: boolean;
-        center__closable?: boolean;
-        center__resizable?: boolean;
-        center__slidable?: boolean;
-        center__paneSelector?: string;
-        center__contentSelector?: string;
-        center__contentIgnoreSelector?: string;
-        center__paneClass?: string;
-        center__resizerClass?: string;
-        center__togglerClass?: string;
-        center__buttonClass?: string;
-        center__size?: string | number;
-        center__minSize?: number;
-        center__maxSize?: number;
-        center__spacing_open?: number;
-        center__spacing_closed?: number;
-        center__resizerTip?: string;
-        center__resizerCursor?: string;
-        center__resizerDragOpacity?: number;
-        center__maskIframesOnResize?: boolean | string;
-        center__sliderTip?: string;
-        center__sliderCursor?: string;
-        center__slideTrigger_open?: string;
-        center__slideTrigger_close?: string;
-        center__togglerTip_open?: string;
-        center__togglerTip_closed?: string;
-        center__togglerLength_open?: number | string;
-        center__togglerLength_closed?: number | string;
-        center__hideTogglerOnSlide?: boolean;
-        center__togglerAlign_open?: string | number;
-        center__togglerAlign_closed?: string | number;
-        center__togglerContent_open?: string;
-        center__togglerContent_closed?: string;
-        center__enableCursorHotkey?: boolean;
-        center__customHotkeyModifier?: string;
-        center__customHotkey?: string | number;
-        center__fxName?: string;
-        center__fxSpeed?: string | number;
-        center__fxSettings?: JQueryAnimationOptions;
-        center__initClosed?: boolean;
-        center__initHidden?: boolean;
-        center__onshow_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        center__onshow_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        center__onshow?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        center__onhide_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        center__onhide_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        center__onhide?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        center__onopen_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        center__onopen_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        center__onopen?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        center__onclose_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        center__onclose_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        center__onclose?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        center__onresize_start?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): (boolean | void) };
-        center__onresize_end?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-        center__onresize?: string | { (name: string, pane: JQuery, state: PaneState, options: PaneOptions, layout_name: string): void };
-    }
-
-
-    interface PaneState {
-        isClosed: boolean;
-        isSliding: boolean;
-        isResizing: boolean;
-        isHidden: boolean;
-        noRoom: boolean;
-        size: number;
-        minSize: number;
-        maxSize: number;
-    }
-
-
-    interface Layout {
-        panes: {
-            north: JQuery | boolean;
-            east: JQuery | boolean;
-            south: JQuery | boolean;
-            west: JQuery | boolean;
-        };
-        options: Options;
-        state: {
-            north: PaneState;
-            east: PaneState;
-            south: PaneState;
-            west: PaneState;
-        }
-
-        toggle(pane: string): JQuery;
-        open(pane: string): JQuery;
-        close(pane: string): JQuery;
-        show(pane: string, openPane?: boolean): JQuery;
-        hide(pane: string): JQuery;
-        sizePane(pane: string, sizeInPixels: number): JQuery;
-        resizeContent(pane: string): JQuery;
-        resizeAll(): JQuery;
-
-        addToggleBtn(selector: string, pane: string): JQuery;
-        addCloseBtn(selector: string, pane: string): JQuery;
-        addOpenBtn(selector: string, pane: string): JQuery;
-        addPinBtn(selector: string, pane: string): JQuery;
-        allowOverflow(elemOrPane: HTMLElement | string): JQuery;
-        resetOverflow(elemOrPane: HTMLElement | string): JQuery;
-    }
-}
-
-
-interface JQuery {
-    layout(options?: JQueryUILayout.Options): JQueryUILayout.Layout;
-}
diff --git a/jquery.ui.layout/tsconfig.json b/jquery.ui.layout/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/jquery.ui.layout/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.uniform/index.d.ts b/jquery.uniform/index.d.ts
new file mode 100644
index 0000000000..b8b44f9b88
--- /dev/null
+++ b/jquery.uniform/index.d.ts
@@ -0,0 +1,55 @@
+// Type definitions for Uniform.js
+// Project: https://github.com/pixelmatrix/uniform
+// Definitions by: flyfishMT <https://github.com/flyfishMT/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface UniformCoreOptions {
+    activeClass?: string;
+    autoHide?: boolean;
+    buttonClass?: string;
+    checkboxClass?: string;
+    checkedClass?: string;
+    disabledClass?: string;
+    eventNamespace?: string;
+    fileButtonClass?: string;
+    fileButtonHtml?: string;
+    fileClass?: string;
+    fileDefaultHtml?: string;
+    filenameClass?: string;
+    focusClass?: string;
+    hoverClass?: string;
+    idPrefix?: string;
+    inputAddTypeAsClass?: boolean;
+    inputClass?: string;
+    radioClass?: string;
+    resetDefaultHtml?: string;
+    resetSelector?: any;
+    selectAutoWidth?: boolean;
+    selectClass?: string;
+    selectMultiClass?: string;
+    submitDefaultHtml?: string;
+    textareaClass?: string;
+    useID?: boolean;
+    wrapperClass?: string;
+}
+
+interface UniformOptions extends UniformCoreOptions {
+    [option: string]: any;
+}
+
+interface Uniform {
+    (options?: UniformOptions): JQuery;
+    update(elemOrSelector?: any): void;
+    restore(elemOrSelector?: any): void;
+    elements: JQuery[];
+    defaults: UniformOptions;
+}
+interface JQueryStatic {
+    uniform: Uniform;
+}
+
+interface JQuery {
+    uniform: Uniform;
+}
diff --git a/jquery.uniform/jquery.uniform-tests.ts b/jquery.uniform/jquery.uniform-tests.ts
index 593ebab2b9..758a2c7c21 100644
--- a/jquery.uniform/jquery.uniform-tests.ts
+++ b/jquery.uniform/jquery.uniform-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jquery.uniform.d.ts" />
+
 
 // Style all <select> elements
 $("select").uniform();
diff --git a/jquery.uniform/jquery.uniform.d.ts b/jquery.uniform/jquery.uniform.d.ts
deleted file mode 100644
index 07e32f8893..0000000000
--- a/jquery.uniform/jquery.uniform.d.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-// Type definitions for Uniform.js
-// Project: https://github.com/pixelmatrix/uniform
-// Definitions by: flyfishMT <https://github.com/flyfishMT/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface UniformCoreOptions {
-    activeClass?: string;
-    autoHide?: boolean;
-    buttonClass?: string;
-    checkboxClass?: string;
-    checkedClass?: string;
-    disabledClass?: string;
-    eventNamespace?: string;
-    fileButtonClass?: string;
-    fileButtonHtml?: string;
-    fileClass?: string;
-    fileDefaultHtml?: string;
-    filenameClass?: string;
-    focusClass?: string;
-    hoverClass?: string;
-    idPrefix?: string;
-    inputAddTypeAsClass?: boolean;
-    inputClass?: string;
-    radioClass?: string;
-    resetDefaultHtml?: string;
-    resetSelector?: any;
-    selectAutoWidth?: boolean;
-    selectClass?: string;
-    selectMultiClass?: string;
-    submitDefaultHtml?: string;
-    textareaClass?: string;
-    useID?: boolean;
-    wrapperClass?: string;
-}
-
-interface UniformOptions extends UniformCoreOptions {
-    [option: string]: any;
-}
-
-interface Uniform {
-    (options?: UniformOptions): JQuery;
-    update(elemOrSelector?: any): void;
-    restore(elemOrSelector?: any): void;
-    elements: JQuery[];
-    defaults: UniformOptions;
-}
-interface JQueryStatic {
-    uniform: Uniform;
-}
-
-interface JQuery {
-    uniform: Uniform;
-}
diff --git a/jquery.uniform/tsconfig.json b/jquery.uniform/tsconfig.json
new file mode 100644
index 0000000000..a566c3de59
--- /dev/null
+++ b/jquery.uniform/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.uniform-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.validation/index.d.ts b/jquery.validation/index.d.ts
new file mode 100644
index 0000000000..94cf310411
--- /dev/null
+++ b/jquery.validation/index.d.ts
@@ -0,0 +1,306 @@
+// Type definitions for jquery.validation 1.13.1
+// Project: http://jqueryvalidation.org/
+// Definitions by: François de Campredon <https://github.com/fdecampredon>, John Reilly <https://github.com/johnnyreilly>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="jquery"/>
+
+
+declare namespace JQueryValidation
+{
+    type RulesDictionary = { [name: string]: any };
+
+    type ShouldValidatePredicate = boolean|((element: HTMLElement, event: JQueryEventObject) => void);
+
+    interface ValidationOptions
+    {
+        /**
+         * Enables debug mode. If true, the form is not submitted and certain errors are displayed on the console (will check if a window.console property exists). Try to enable when a form is just submitted instead of validation stopping the submit.
+         *
+         * default: false
+         */
+        debug?: boolean;
+        /**
+         * Use this class to create error labels, to look for existing error labels and to add it to invalid elements.
+         *
+         * default: "error"
+         */
+        errorClass?: string;
+        /**
+         * Hide and show this container when validating.
+         */
+        errorContainer?: string;
+        /**
+         * Use this element type to create error messages and to look for existing error messages. The default, "label", has the advantage of creating a meaningful link between error message and invalid field using the for attribute (which is always used, regardless of element type).
+         *
+         * default: "label"
+         */
+        errorElement?: string;
+        /**
+         * Hide and show this container when validating. (eg "#messageBox")
+         */
+        errorLabelContainer?: string;
+        /**
+         * Customize placement of created error labels. First argument: The created error label as a jQuery object. Second argument: The invalid element as a jQuery object.
+         *
+         * default: Places the error label after the invalid element
+         */
+        errorPlacement?: (error: JQuery, element: JQuery) => void;
+        /**
+         * If enabled, removes the errorClass from the invalid elements and hides all error messages whenever the element is focused. Avoid combination with focusInvalid.
+         *
+         * default: false
+         */
+        focusCleanup?: boolean;
+        /**
+         * Focus the last active or first invalid element on submit via validator.focusInvalid(). The last active element is the one that had focus when the form was submitted, avoiding stealing its focus. If there was no element focused, the first one in the form gets it, unless this option is turned off.
+         *
+         * default: true
+         */
+        focusInvalid?: boolean;
+        /**
+         * Specify grouping of error messages. A group consists of an arbitrary group name as the key and a space separated list of element names as the value. Use errorPlacement to control where the group message is placed.
+         */
+        groups?: { [groupName: string]: string };
+        /**
+         * How to highlight invalid fields. Override to decide which fields and how to highlight.
+         *
+         * default: Adds errorClass (see the option) to the element
+         */
+        highlight?: (element: HTMLElement, errorClass: string, validClass: string) => void;
+        /**
+         * Elements to ignore when validating, simply filtering them out. jQuery's not-method is used, therefore everything that is accepted by not() can be passed as this option. Inputs of type submit and reset are always ignored, so are disabled elements.
+         */
+        ignore?: string;
+        /**
+         * Set to skip reading messages from the title attribute, helps to avoid issues with Google Toolbar; default is false for compability, the message-from-title is likely to be completely removed in a future release.
+         *
+         * default: false
+         */
+        ignoreTitle?: boolean;
+        /**
+         * Callback for custom code when an invalid form is submitted. Called with an event object as the first argument, and the validator as the second.
+         */
+        invalidHandler?: (event: JQueryEventObject, validator: Validator) => void;
+        /**
+         * Key/value pairs defining custom messages. Key is the name of an element, value the message to display for that element. Instead of a plain message, another map with specific messages for each rule can be used. Overrides the title attribute of an element or the default message for the method (in that order). Each message can be a String or a Callback. The callback is called in the scope of the validator, with the rule's parameters as the first argument and the element as the second, and must return a String to display as the message.
+         *
+         * default: the default message for the method used
+         */
+        messages?: Object;
+        meta?: string;
+        /**
+         * Boolean or Function. Validate checkboxes and radio buttons on click. Set to false to disable.
+         *
+         * Set to a Function to decide for yourself when to run validation.
+         * A boolean true is not a valid value.
+         */
+        onclick?: ShouldValidatePredicate;
+        /**
+         * Boolean or Function. Validate elements (except checkboxes/radio buttons) on blur. If nothing is entered, all rules are skipped, except when the field was already marked as invalid.
+         *
+         * Set to a Function to decide for yourself when to run validation.
+         * A boolean true is not a valid value.
+         */
+        onfocusout?: ShouldValidatePredicate;
+        /**
+         * Boolean or Function. Validate elements on keyup. As long as the field is not marked as invalid, nothing happens. Otherwise, all rules are checked on each key up event. Set to false to disable.
+         *
+         * Set to a Function to decide for yourself when to run validation.
+         * A boolean true is not a valid value.
+         */
+        onkeyup?: ShouldValidatePredicate;
+        /**
+         * Validate the form on submit. Set to false to use only other events for validation.
+         * Set to a Function to decide for yourself when to run validation.
+         * A boolean true is not a valid value.
+         *
+         * default: true
+         */
+        onsubmit?: boolean;
+        /**
+         * A custom message display handler. Gets the map of errors as the first argument and an array of errors as the second, called in the context of the validator object. The arguments contain only those elements currently validated, which can be a single element when doing validation onblur/keyup. You can trigger (in addition to your own messages) the default behaviour by calling this.defaultShowErrors().
+         */
+        rules?: RulesDictionary;
+        /**
+         * A custom message display handler. Gets the map of errors as the first argument and an array of errors as the second, called in the context of the validator object. The arguments contain only those elements currently validated, which can be a single element when doing validation onblur/keyup. You can trigger (in addition to your own messages) the default behaviour by calling this.defaultShowErrors().
+         */
+        showErrors?: (errorMap: ErrorDictionary, errorList: ErrorListItem[]) => void;
+        /**
+         * Callback for handling the actual submit when the form is valid. Gets the form as the only argument. Replaces the default submit. The right place to submit a form via Ajax after it is validated.
+         */
+        submitHandler?: (form: HTMLFormElement) => void;
+        /**
+         * String or Function. If specified, the error label is displayed to show a valid element. If a String is given, it is added as a class to the label. If a Function is given, it is called with the label (as a jQuery object) and the validated input (as a DOM element). The label can be used to add a text like "ok!".
+         */
+        success?: string|{($label: JQuery, validatedInput: HTMLElement):void};
+        /**
+         * Called to revert changes made by option highlight, same arguments as highlight.
+         *
+         * default: Removes the errorClass
+         */
+        unhighlight?: (element: HTMLElement, errorClass: string, validClass: string) => void;
+        /**
+         * This class is added to an element after it was validated and considered valid.
+         *
+         * default: "valid"
+         */
+        validClass?: string;
+        /**
+         * Wrap error labels with the specified element. Useful in combination with errorLabelContainer to create a list of error messages.
+         *
+         * default: window
+         */
+        wrapper?: string;
+    }
+
+    interface ErrorDictionary
+    {
+        [name: string]: string;
+    }
+
+    interface ErrorListItem
+    {
+        message: string;
+        element: HTMLElement;
+    }
+
+    interface ValidatorStatic
+    {
+        /**
+         * Add a compound class method - useful to refactor common combinations of rules into a single class.
+         *
+         * @param name The name of the class rule to add
+         * @param rules The compound rules
+         */
+        addClassRules(name: string, rules: RulesDictionary): void;
+        /**
+         * Add a compound class method - useful to refactor common combinations of rules into a single class.
+         *
+         * @param rules A map of className-rules pairs
+         */
+        addClassRules(rules: RulesDictionary): void;
+        /**
+         * Add a custom validation method. It must consist of a name (must be a legal javascript identifier), a javascript based function and a default string message.
+         *
+         * @param name The name of the method used to identify it and referencing it; this must be a valid JavaScript identifier
+         * @param method The actual method implementation, returning true if an element is valid. First argument: Current value. Second argument: Validated element. Third argument: Parameters.
+         */
+        addMethod(name: string, method: (value: any, element: HTMLElement, params: any) => boolean, message?: string): void;
+        /**
+         * Replaces {n} placeholders with arguments.
+         *
+         * @param template The string to format.
+         */
+        format(template: string): ( (...args: any[]) => string);
+        format(template: string, ...args: any[]): string;
+        /**
+         * Modify default settings for validation.
+         *
+         * @param options Options to set as default.
+         */
+        setDefaults(defaults: ValidationOptions): void;
+
+        messages: { [index: string]: string };
+        methods: { [index: string]: Function };
+    }
+
+    interface Validator
+    {
+        element(element: string|JQuery): boolean;
+        /**
+         * Validates the form, returns true if it is valid, false otherwise.
+         */
+        form(): boolean;
+
+        invalidElements(): HTMLElement[];
+
+        /**
+         * Returns the number of invalid fields.
+         */
+        numberOfInvalids(): number;
+        /**
+         * Resets the controlled form.
+         */
+        resetForm(): void;
+
+        settings: ValidationOptions;
+        /**
+         * Show the specified messages.
+         *
+         * @param errors One or more key/value pairs of input names and messages.
+         */
+        showErrors(errors: any): void;
+
+        hideErrors(): void;
+
+        valid(): boolean;
+        validElements(): HTMLElement[];
+        size(): number;
+        focusInvalid(): void;
+        errorMap: ErrorDictionary;
+        errorList: ErrorListItem[];
+    }
+}
+
+interface JQuery
+{
+    /**
+     * Remove the specified attributes from the first matched element and return them.
+     *
+     * @param attributes A space-separated list of attribute names to remove.
+     */
+    removeAttrs(attributes: string): any;
+
+    /**
+     * Returns the validations rules for the first selected element
+     */
+    rules(): any;
+
+    /**
+     * Removes the specified rules and returns all rules for the first matched element.
+     *
+     * @param command "remove"
+     * @param rules Removes and returns all rules. Manipulates only rules specified via rules-option or via rules("add").
+     */
+    rules(command: string): any;
+    /**
+     * Removes the specified rules and returns all rules for the first matched element.
+     *
+     * @param command "remove"
+     * @param rules The space-separated names of rules to remove and return. Manipulates only rules specified via rules-option or via rules("add").
+     */
+    rules(command: string, rules: string): any;
+    /**
+     * Adds the specified rules and returns all rules for the first matched element. Requires that the parent form is validated, that is, $("form").validate() is called first
+     *
+     * @param command "add"
+     * @param rules The rules to add. Accepts the same format as the rules-option of the validate-method.
+     */
+    rules(command: string, rules: JQueryValidation.RulesDictionary): any;
+
+    /**
+     * Checks whether the selected form is valid or whether all selected elements are valid.
+     */
+    valid(): boolean;
+
+    /**
+     * Validates the selected form.
+     *
+     * @param options options for validation
+     */
+    validate(options?: JQueryValidation.ValidationOptions): JQueryValidation.Validator;
+}
+
+interface JQueryStatic
+{
+    /**
+     * Replaces {n} placeholders with arguments.
+     *
+     * @param template The string to format.
+     */
+    format(template: string, ...arguments: string[]): string;
+
+    validator: JQueryValidation.ValidatorStatic;
+}
diff --git a/jquery.validation/jquery.validation-tests.ts b/jquery.validation/jquery.validation-tests.ts
index a2b931c86a..15bb9f790c 100644
--- a/jquery.validation/jquery.validation-tests.ts
+++ b/jquery.validation/jquery.validation-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="../jquery.form/jquery.form.d.ts"/>
-/// <reference path="jquery.validation.d.ts" />
+/// <reference types="jquery"/>
+/// <reference types="jquery.form"/>
+
 
 function test_validate() {
     $("#commentForm").validate();
diff --git a/jquery.validation/jquery.validation-tests.ts.tscparams b/jquery.validation/jquery.validation-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jquery.validation/jquery.validation-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jquery.validation/jquery.validation.d.ts b/jquery.validation/jquery.validation.d.ts
deleted file mode 100644
index 7527652e80..0000000000
--- a/jquery.validation/jquery.validation.d.ts
+++ /dev/null
@@ -1,306 +0,0 @@
-// Type definitions for jquery.validation 1.13.1
-// Project: http://jqueryvalidation.org/
-// Definitions by: François de Campredon <https://github.com/fdecampredon>, John Reilly <https://github.com/johnnyreilly>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-
-declare namespace JQueryValidation
-{
-    type RulesDictionary = { [name: string]: any };
-
-    type ShouldValidatePredicate = boolean|((element: HTMLElement, event: JQueryEventObject) => void);
-
-    interface ValidationOptions
-    {
-        /**
-         * Enables debug mode. If true, the form is not submitted and certain errors are displayed on the console (will check if a window.console property exists). Try to enable when a form is just submitted instead of validation stopping the submit.
-         *
-         * default: false
-         */
-        debug?: boolean;
-        /**
-         * Use this class to create error labels, to look for existing error labels and to add it to invalid elements.
-         *
-         * default: "error"
-         */
-        errorClass?: string;
-        /**
-         * Hide and show this container when validating.
-         */
-        errorContainer?: string;
-        /**
-         * Use this element type to create error messages and to look for existing error messages. The default, "label", has the advantage of creating a meaningful link between error message and invalid field using the for attribute (which is always used, regardless of element type).
-         *
-         * default: "label"
-         */
-        errorElement?: string;
-        /**
-         * Hide and show this container when validating. (eg "#messageBox")
-         */
-        errorLabelContainer?: string;
-        /**
-         * Customize placement of created error labels. First argument: The created error label as a jQuery object. Second argument: The invalid element as a jQuery object.
-         *
-         * default: Places the error label after the invalid element
-         */
-        errorPlacement?: (error: JQuery, element: JQuery) => void;
-        /**
-         * If enabled, removes the errorClass from the invalid elements and hides all error messages whenever the element is focused. Avoid combination with focusInvalid.
-         *
-         * default: false
-         */
-        focusCleanup?: boolean;
-        /**
-         * Focus the last active or first invalid element on submit via validator.focusInvalid(). The last active element is the one that had focus when the form was submitted, avoiding stealing its focus. If there was no element focused, the first one in the form gets it, unless this option is turned off.
-         *
-         * default: true
-         */
-        focusInvalid?: boolean;
-        /**
-         * Specify grouping of error messages. A group consists of an arbitrary group name as the key and a space separated list of element names as the value. Use errorPlacement to control where the group message is placed.
-         */
-        groups?: { [groupName: string]: string };
-        /**
-         * How to highlight invalid fields. Override to decide which fields and how to highlight.
-         *
-         * default: Adds errorClass (see the option) to the element
-         */
-        highlight?: (element: HTMLElement, errorClass: string, validClass: string) => void;
-        /**
-         * Elements to ignore when validating, simply filtering them out. jQuery's not-method is used, therefore everything that is accepted by not() can be passed as this option. Inputs of type submit and reset are always ignored, so are disabled elements.
-         */
-        ignore?: string;
-        /**
-         * Set to skip reading messages from the title attribute, helps to avoid issues with Google Toolbar; default is false for compability, the message-from-title is likely to be completely removed in a future release.
-         *
-         * default: false
-         */
-        ignoreTitle?: boolean;
-        /**
-         * Callback for custom code when an invalid form is submitted. Called with an event object as the first argument, and the validator as the second.
-         */
-        invalidHandler?: (event: JQueryEventObject, validator: Validator) => void;
-        /**
-         * Key/value pairs defining custom messages. Key is the name of an element, value the message to display for that element. Instead of a plain message, another map with specific messages for each rule can be used. Overrides the title attribute of an element or the default message for the method (in that order). Each message can be a String or a Callback. The callback is called in the scope of the validator, with the rule's parameters as the first argument and the element as the second, and must return a String to display as the message.
-         *
-         * default: the default message for the method used
-         */
-        messages?: Object;
-        meta?: string;
-        /**
-         * Boolean or Function. Validate checkboxes and radio buttons on click. Set to false to disable.
-         *
-         * Set to a Function to decide for yourself when to run validation.
-         * A boolean true is not a valid value.
-         */
-        onclick?: ShouldValidatePredicate;
-        /**
-         * Boolean or Function. Validate elements (except checkboxes/radio buttons) on blur. If nothing is entered, all rules are skipped, except when the field was already marked as invalid.
-         *
-         * Set to a Function to decide for yourself when to run validation.
-         * A boolean true is not a valid value.
-         */
-        onfocusout?: ShouldValidatePredicate;
-        /**
-         * Boolean or Function. Validate elements on keyup. As long as the field is not marked as invalid, nothing happens. Otherwise, all rules are checked on each key up event. Set to false to disable.
-         *
-         * Set to a Function to decide for yourself when to run validation.
-         * A boolean true is not a valid value.
-         */
-        onkeyup?: ShouldValidatePredicate;
-        /**
-         * Validate the form on submit. Set to false to use only other events for validation.
-         * Set to a Function to decide for yourself when to run validation.
-         * A boolean true is not a valid value.
-         *
-         * default: true
-         */
-        onsubmit?: boolean;
-        /**
-         * A custom message display handler. Gets the map of errors as the first argument and an array of errors as the second, called in the context of the validator object. The arguments contain only those elements currently validated, which can be a single element when doing validation onblur/keyup. You can trigger (in addition to your own messages) the default behaviour by calling this.defaultShowErrors().
-         */
-        rules?: RulesDictionary;
-        /**
-         * A custom message display handler. Gets the map of errors as the first argument and an array of errors as the second, called in the context of the validator object. The arguments contain only those elements currently validated, which can be a single element when doing validation onblur/keyup. You can trigger (in addition to your own messages) the default behaviour by calling this.defaultShowErrors().
-         */
-        showErrors?: (errorMap: ErrorDictionary, errorList: ErrorListItem[]) => void;
-        /**
-         * Callback for handling the actual submit when the form is valid. Gets the form as the only argument. Replaces the default submit. The right place to submit a form via Ajax after it is validated.
-         */
-        submitHandler?: (form: HTMLFormElement) => void;
-        /**
-         * String or Function. If specified, the error label is displayed to show a valid element. If a String is given, it is added as a class to the label. If a Function is given, it is called with the label (as a jQuery object) and the validated input (as a DOM element). The label can be used to add a text like "ok!".
-         */
-        success?: string|{($label: JQuery, validatedInput: HTMLElement):void};
-        /**
-         * Called to revert changes made by option highlight, same arguments as highlight.
-         *
-         * default: Removes the errorClass
-         */
-        unhighlight?: (element: HTMLElement, errorClass: string, validClass: string) => void;
-        /**
-         * This class is added to an element after it was validated and considered valid.
-         *
-         * default: "valid"
-         */
-        validClass?: string;
-        /**
-         * Wrap error labels with the specified element. Useful in combination with errorLabelContainer to create a list of error messages.
-         *
-         * default: window
-         */
-        wrapper?: string;
-    }
-
-    interface ErrorDictionary
-    {
-        [name: string]: string;
-    }
-
-    interface ErrorListItem
-    {
-        message: string;
-        element: HTMLElement;
-    }
-
-    interface ValidatorStatic
-    {
-        /**
-         * Add a compound class method - useful to refactor common combinations of rules into a single class.
-         *
-         * @param name The name of the class rule to add
-         * @param rules The compound rules
-         */
-        addClassRules(name: string, rules: RulesDictionary): void;
-        /**
-         * Add a compound class method - useful to refactor common combinations of rules into a single class.
-         *
-         * @param rules A map of className-rules pairs
-         */
-        addClassRules(rules: RulesDictionary): void;
-        /**
-         * Add a custom validation method. It must consist of a name (must be a legal javascript identifier), a javascript based function and a default string message.
-         *
-         * @param name The name of the method used to identify it and referencing it; this must be a valid JavaScript identifier
-         * @param method The actual method implementation, returning true if an element is valid. First argument: Current value. Second argument: Validated element. Third argument: Parameters.
-         */
-        addMethod(name: string, method: (value: any, element: HTMLElement, params: any) => boolean, message?: string): void;
-        /**
-         * Replaces {n} placeholders with arguments.
-         *
-         * @param template The string to format.
-         */
-        format(template: string): ( (...args: any[]) => string);
-        format(template: string, ...args: any[]): string;
-        /**
-         * Modify default settings for validation.
-         *
-         * @param options Options to set as default.
-         */
-        setDefaults(defaults: ValidationOptions): void;
-
-        messages: { [index: string]: string };
-        methods: { [index: string]: Function };
-    }
-
-    interface Validator
-    {
-        element(element: string|JQuery): boolean;
-        /**
-         * Validates the form, returns true if it is valid, false otherwise.
-         */
-        form(): boolean;
-
-        invalidElements(): HTMLElement[];
-
-        /**
-         * Returns the number of invalid fields.
-         */
-        numberOfInvalids(): number;
-        /**
-         * Resets the controlled form.
-         */
-        resetForm(): void;
-
-        settings: ValidationOptions;
-        /**
-         * Show the specified messages.
-         *
-         * @param errors One or more key/value pairs of input names and messages.
-         */
-        showErrors(errors: any): void;
-
-        hideErrors(): void;
-
-        valid(): boolean;
-        validElements(): HTMLElement[];
-        size(): number;
-        focusInvalid(): void;
-        errorMap: ErrorDictionary;
-        errorList: ErrorListItem[];
-    }
-}
-
-interface JQuery
-{
-    /**
-     * Remove the specified attributes from the first matched element and return them.
-     *
-     * @param attributes A space-separated list of attribute names to remove.
-     */
-    removeAttrs(attributes: string): any;
-
-    /**
-     * Returns the validations rules for the first selected element
-     */
-    rules(): any;
-
-    /**
-     * Removes the specified rules and returns all rules for the first matched element.
-     *
-     * @param command "remove"
-     * @param rules Removes and returns all rules. Manipulates only rules specified via rules-option or via rules("add").
-     */
-    rules(command: string): any;
-    /**
-     * Removes the specified rules and returns all rules for the first matched element.
-     *
-     * @param command "remove"
-     * @param rules The space-separated names of rules to remove and return. Manipulates only rules specified via rules-option or via rules("add").
-     */
-    rules(command: string, rules: string): any;
-    /**
-     * Adds the specified rules and returns all rules for the first matched element. Requires that the parent form is validated, that is, $("form").validate() is called first
-     *
-     * @param command "add"
-     * @param rules The rules to add. Accepts the same format as the rules-option of the validate-method.
-     */
-    rules(command: string, rules: JQueryValidation.RulesDictionary): any;
-
-    /**
-     * Checks whether the selected form is valid or whether all selected elements are valid.
-     */
-    valid(): boolean;
-
-    /**
-     * Validates the selected form.
-     *
-     * @param options options for validation
-     */
-    validate(options?: JQueryValidation.ValidationOptions): JQueryValidation.Validator;
-}
-
-interface JQueryStatic
-{
-    /**
-     * Replaces {n} placeholders with arguments.
-     *
-     * @param template The string to format.
-     */
-    format(template: string, ...arguments: string[]): string;
-
-    validator: JQueryValidation.ValidatorStatic;
-}
diff --git a/jquery.validation/tsconfig.json b/jquery.validation/tsconfig.json
new file mode 100644
index 0000000000..f9c2a199e1
--- /dev/null
+++ b/jquery.validation/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.validation-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.watermark/index.d.ts b/jquery.watermark/index.d.ts
new file mode 100644
index 0000000000..bb6c5e1f0c
--- /dev/null
+++ b/jquery.watermark/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for Watermark plugin for jQuery 3.1
+// Project: http://jquery-watermark.googlecode.com
+// Definitions by: Anwar Javed <https://github.com/anwarjaved>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="jquery"/>
+
+interface WatermarkOptions {
+    className?: string; // Default class name for all watermarks
+    useNative?: boolean; // If true, plugin will detect and use native browser support for watermarks, if available. (e.g., WebKit's placeholder attribute.)
+    hideBeforeUnload?: boolean; // If true, all watermarks will be hidden during the window beforeunload event.
+}
+
+interface Watermark {
+    options: WatermarkOptions;
+
+    show(element: string): void;
+    hide(element: string): void;
+    showAll(): void;
+    hideAll(): void;
+}
+
+interface JQuery {
+    watermark(text: string, options?: WatermarkOptions): JQuery;
+}
+
+interface JQueryStatic {
+    watermark: Watermark;
+}
diff --git a/jquery.watermark/jquery.watermark-tests.ts b/jquery.watermark/jquery.watermark-tests.ts
index 816845bfc9..225ba0a482 100644
--- a/jquery.watermark/jquery.watermark-tests.ts
+++ b/jquery.watermark/jquery.watermark-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.watermark.d.ts"/>
-
+/// <reference types="jquery"/>
 
 $('#inputId').watermark('Required information');
 $('#inputId').watermark('Required information', { className: 'myClassName' });
diff --git a/jquery.watermark/jquery.watermark-tests.ts.tscparams b/jquery.watermark/jquery.watermark-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jquery.watermark/jquery.watermark-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jquery.watermark/jquery.watermark.d.ts b/jquery.watermark/jquery.watermark.d.ts
deleted file mode 100644
index 892cf77660..0000000000
--- a/jquery.watermark/jquery.watermark.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Type definitions for Watermark plugin for jQuery 3.1
-// Project: http://jquery-watermark.googlecode.com
-// Definitions by: Anwar Javed <https://github.com/anwarjaved>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface WatermarkOptions {
-    className?: string; // Default class name for all watermarks
-    useNative?: boolean; // If true, plugin will detect and use native browser support for watermarks, if available. (e.g., WebKit's placeholder attribute.)
-    hideBeforeUnload?: boolean; // If true, all watermarks will be hidden during the window beforeunload event.
-}
-
-interface Watermark {
-    options: WatermarkOptions;
-
-    show(element: string): void;
-    hide(element: string): void;
-    showAll(): void;
-    hideAll(): void;
-}
-
-interface JQuery {
-    watermark(text: string, options?: WatermarkOptions): JQuery;
-}
-
-interface JQueryStatic {
-    watermark: Watermark;
-}
diff --git a/jquery.watermark/tsconfig.json b/jquery.watermark/tsconfig.json
new file mode 100644
index 0000000000..43c802b520
--- /dev/null
+++ b/jquery.watermark/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.watermark-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery.window/index.d.ts b/jquery.window/index.d.ts
new file mode 100644
index 0000000000..2dc8f75309
--- /dev/null
+++ b/jquery.window/index.d.ts
@@ -0,0 +1,460 @@
+// Type definitions for Window plugin for jQuery 5.0.4
+// Project: http://fstoke.me/jquery/window/
+// Definitions by: Ryan Graham <https://github.com/ryan-codingintrigue/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+declare namespace JQueryWindow {
+    // Instance methods
+    interface Window {
+        /**
+        get window id
+        **/
+        getWindowId(): string;
+        /**
+        get window container's parent panel, it's a jQuery object
+        **/
+        getCaller(): JQuery;
+        /**
+        get window container panel, it's a jQuery object
+        **/
+        getContainer(): JQuery;
+        /**
+        get window header panel, it's a jQuery object
+        **/
+        getHeader(): JQuery;
+        /**
+        get window frame panel, it's a jQuery object
+        **/
+        getFrame(): JQuery;
+        /**
+        get window footer panel, it's a jQuery object
+        **/
+        getFooter(): JQuery;
+        /**
+        set current window as screen center
+        **/
+        alignCenter(): void;
+        /**
+        set current window as horizontal center
+        **/
+        alignHorizontalCenter(): void;
+        /**
+        set current window as vertical center
+        **/
+        alignVerticalCenter(): void;
+        /**
+        select current window, it will increase the original z-index value with 2
+        **/
+        select(): void;
+        /**
+        unselect current window, it will set the z-index as original options.z
+        **/
+        unselect(): void;
+        /**
+        move current window to target position or shift it by passed distance
+        **/
+        move(x: number, y: number, bShift: boolean): void;
+        /**
+        resize current window to target width/height
+        **/
+        resize(width: number, height: number): void;
+        /**
+        maximize current window
+        **/
+        maximize(): void;
+        /**
+        minimize current window
+        **/
+        minimize(): void;
+        /**
+        restore current window, it could be maximized or cascade status
+        **/
+        restore(): void;
+        /**
+        close current window
+        **/
+        close(quiet: boolean): void;
+        /**
+        hide current window
+        **/
+        hide(): void;
+        /**
+        show current window
+        **/
+        show(): void;
+        /**
+        change window title
+        **/
+        setTitle(title: string): void;
+        /**
+        change iframe url
+        **/
+        setUrl(url: string): void;
+        /**
+        change frame content
+        **/
+        setContent(content: string|JQuery|HTMLElement): void;
+        /**
+        change footer content
+        **/
+        setFooterContent(content: string|JQuery|HTMLElement): void;
+        /**
+        get window title text
+        **/
+        getTitle(): string;
+        /**
+        get url string
+        **/
+        getUrl(): string;
+        /**
+        get frame html content
+        **/
+        getContent(): string;
+        /**
+        get footer html content
+        **/
+        getFooterContent(): string;
+        /**
+        get window maximized status
+        **/
+        isMaximized(): boolean;
+        /**
+        get window minmized status
+        **/
+        isMinimized(): boolean;
+        /**
+        get window selected status
+        **/
+        isSelected(): boolean;
+        /**
+        set window icon
+        **/
+        setIcon(iconUrl: string): void;
+        /**
+        show window icon
+        **/
+        showIcon(): void;
+        /**
+        hide window icon
+        **/
+        hideIcon(): void;
+    }
+
+    // Static methods
+    interface Static {
+        (options: WindowOptions): JQueryWindow.Window;
+        /**
+        initialize with customerized static setting attributes
+        **/
+        prepare(options?: StaticOptions): void;
+        /**
+        close all created windows
+        **/
+        closeAll(quiet?: boolean): void;
+        /**
+        hide all created windows
+        **/
+        hideAll(): void;
+        /**
+        show all created windows
+        **/
+        showAll(): void;
+        /**
+        return all created windows instance
+        **/
+        getAll(): Array<JQueryWindow.Window>;
+        /**
+        get the window instance by passed window id
+        **/
+        getWindow(windowId: string): JQueryWindow.Window;
+        /**
+        get the selected window instance
+        **/
+        getSelectedWindow(): JQueryWindow.Window;
+    }
+
+    // Static options
+    interface StaticOptions {
+        /**
+        the direction of minimized window dock at. the available values are [left, right, top, bottom]
+        **/
+        dock?: string;
+        /**
+        the area which the windows will dock at
+        **/
+        dockArea?: JQuery|HTMLElement;
+        /**
+        the speed of animations: maximize, minimize, restore, shift, in milliseconds
+        **/
+        animationSpeed?: number;
+        /**
+        the narrow dimension of minimized window
+        **/
+        minWinNarrow?: number;
+        /**
+        the long dimension of minimized window
+        **/
+        minWinLong?: number;
+        /**
+        to handle browser scrollbar when window status changed(maximize, minimize, cascade)
+        **/
+        handleScrollbar?: boolean;
+        /**
+        to decide show log in firebug, IE8, chrome console
+        **/
+        showLog?: boolean;
+    }
+
+    // Instance options
+    interface WindowOptions {
+        /**
+        an icon image url string. if this attribute is given, it will force to replace the original favicon of remote page on window. or you can set it as null to hide icon.
+        **/
+        icon?: string;
+        /**
+        the title text of window
+        **/
+        title: string;
+        /**
+        the target url of iframe ready to load.
+        **/
+        url?: string;
+        /**
+        this attribute only works when url is null. when passing a jquery object or a element, it will clone the original one to append.
+        **/
+        content?: string|JQuery|HTMLElement;
+        /**
+        same as content attribute, but it's put on footer panel.
+        **/
+        footerContent?: string|JQuery|HTMLElement;
+        /**
+        container extra class
+        **/
+        containerClass?: string;
+        /**
+        header extra class
+        **/
+        headerClass?: string;
+        /**
+        frame extra class
+        **/
+        frameClass?: string;
+        /**
+        footer extra class
+        **/
+        footerClass?: string;
+        /**
+        selected header extra class
+        **/
+        selectedHeaderClass?: string;
+        /**
+        the x-axis value on screen(or caller element), if -1 means put on screen(or caller element) center
+        **/
+        x?: number;
+        /**
+        the y-axis value on screen(or caller element), if -1 means put on screen(or caller element) center
+        **/
+        y?: number;
+        /**
+        the css z-index value
+        **/
+        z?: number;
+        /**
+        window width
+        **/
+        width?: number;
+        /**
+        window height
+        **/
+        height?: number;
+        /**
+        the minimum width, if -1 means no checking
+        **/
+        minWidth?: number;
+        /**
+        the minimum height, if -1 means no checking
+        **/
+        minHeight?: number;
+        /**
+        the maximum width, if -1 means no checking
+        **/
+        maxWidth?: number;
+        /**
+        the maximum height, if -1 means no checking
+        **/
+        maxHeight?: number;
+        /**
+        to control show modal on background
+        **/
+        showModal?: boolean;
+        /**
+        the opacity of modal dialog
+        **/
+        modalOpacity?: number;
+        /**
+        to control show footer panel
+        **/
+        showFooter?: boolean;
+        /**
+        to control display window as round corner
+        **/
+        showRoundCorner?: boolean;
+        /**
+        to control window closable
+        **/
+        closable?: boolean;
+        /**
+        to control window minimizable
+        **/
+        minimizable?: boolean;
+        /**
+        to control window maximizable
+        **/
+        maximizable?: boolean;
+        /**
+        to control window with remote url could be bookmarked
+        **/
+        bookmarkable?: boolean;
+        /**
+        to control window draggable
+        **/
+        draggable?: boolean;
+        /**
+        to control window resizable
+        **/
+        resizable?: boolean;
+        /**
+        to show scroll bar or not
+        **/
+        scrollable?: boolean;
+        /**
+        to check window dialog overflow html body or caller element
+        **/
+        checkBoundary?: boolean;
+        /**
+         to limit window only can be dragged within browser window. this attribute only works when checkBoundary is true and caller is null.
+        **/
+        withinBrowserWindow?: boolean;
+        /**
+        to describe the customized button display and callback function
+        **/
+        custBtns?: Array<JQueryWindow.Button>;
+        /**
+        a callback function while container is added into body
+        **/
+        onOpen?: (wnd: JQueryWindow.Window) => void;
+        /**
+        a callback function while whole window display routine is finished
+        **/
+        onShow?: (wnd: JQueryWindow.Window) => void;
+        /**
+        a callback function while user click close button
+        **/
+        onClose?: (wnd: JQueryWindow.Window) => void;
+        /**
+        a callback function while user select the window
+        **/
+        onSelect?: (wnd: JQueryWindow.Window) => void;
+        /**
+        a callback function while window unselected
+        **/
+        onUnselect?: (wnd: JQueryWindow.Window) => void;
+        /**
+        a callback function while window is going to drag
+        **/
+        onDrag?: (wnd: JQueryWindow.Window) => void;
+        /**
+        a callback function after window dragged
+        **/
+        afterDrag?: (wnd: JQueryWindow.Window) => void;
+        /**
+        a callback function while window is going to resize
+        **/
+        onResize?: (wnd: JQueryWindow.Window) => void;
+        /**
+        a callback function after window resized
+        **/
+        afterResize?: (wnd: JQueryWindow.Window) => void;
+        /**
+        a callback function while window is going to minimize
+        **/
+        onMinimize?: (wnd: JQueryWindow.Window) => void;
+        /**
+        a callback function after window minimized
+        **/
+        afterMinimize?: (wnd: JQueryWindow.Window) => void;
+        /**
+        a callback function while window is going to maximize
+        **/
+        onMaximize?: (wnd: JQueryWindow.Window) => void;
+        /**
+        a callback function after window maximized
+        **/
+        afterMaximize?: (wnd: JQueryWindow.Window) => void;
+        /**
+        a callback function while window is going to cascade
+        **/
+        onCascade?: (wnd: JQueryWindow.Window) => void;
+        /**
+        a callback function after window cascaded
+        **/
+        afterCascade?: (wnd: JQueryWindow.Window) => void;
+        /**
+        a callback function while iframe ready to connect remoting url. this attribute only works while url attribute is given
+        **/
+        onIframeStart?: (wnd: JQueryWindow.Window) => void;
+        /**
+        a callback function while iframe load finished. this attribute only works while url attribute is given
+        **/
+        onIframeEnd?: (wnd: JQueryWindow.Window) => void;
+        /**
+        if null means no check, or pass a string to show warning message while iframe is going to redirect current top page
+        **/
+        iframeRedirectCheckMsg?: string;
+        /**
+        random the new created window position, it only works when options x,y value both are -1
+        **/
+        createRandomOffset?: { x: number; y: number };
+    }
+
+    // Button definition
+    interface Button {
+        /**
+
+        **/
+        id: string;
+        /**
+
+        **/
+        title?: string;
+        /**
+
+        **/
+        clazz?: string;
+        /**
+
+        **/
+        style?: string;
+        /**
+
+        **/
+        image: string;
+        /**
+
+        **/
+        callback: (btn: JQueryWindow.Button, wnd: JQueryWindow.Window) => void;
+    }
+
+}
+
+// Register with JQuery instance
+interface JQuery {
+    window(options: JQueryWindow.WindowOptions): JQueryWindow.Window;
+}
+
+// Register with JQuery static
+interface JQueryStatic {
+    window: JQueryWindow.Static;
+}
diff --git a/jquery.window/jquery.window-tests.ts b/jquery.window/jquery.window-tests.ts
index 0b5fa7e83f..4b1b9b6eb2 100644
--- a/jquery.window/jquery.window-tests.ts
+++ b/jquery.window/jquery.window-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jquery.window.d.ts"/>
+/// <reference types="jquery"/>
 
 function example_1() {
 	$.window({
diff --git a/jquery.window/jquery.window.d.ts b/jquery.window/jquery.window.d.ts
deleted file mode 100644
index 7e8437a3a4..0000000000
--- a/jquery.window/jquery.window.d.ts
+++ /dev/null
@@ -1,460 +0,0 @@
-// Type definitions for Window plugin for jQuery 5.0.4
-// Project: http://fstoke.me/jquery/window/
-// Definitions by: Ryan Graham <https://github.com/ryan-codingintrigue/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-declare namespace JQueryWindow {
-    // Instance methods
-    interface Window {
-        /**
-        get window id
-        **/
-        getWindowId(): string;
-        /**
-        get window container's parent panel, it's a jQuery object
-        **/
-        getCaller(): JQuery;
-        /**
-        get window container panel, it's a jQuery object
-        **/
-        getContainer(): JQuery;
-        /**
-        get window header panel, it's a jQuery object
-        **/
-        getHeader(): JQuery;
-        /**
-        get window frame panel, it's a jQuery object
-        **/
-        getFrame(): JQuery;
-        /**
-        get window footer panel, it's a jQuery object
-        **/
-        getFooter(): JQuery;
-        /**
-        set current window as screen center
-        **/
-        alignCenter(): void;
-        /**
-        set current window as horizontal center
-        **/
-        alignHorizontalCenter(): void;
-        /**
-        set current window as vertical center
-        **/
-        alignVerticalCenter(): void;
-        /**
-        select current window, it will increase the original z-index value with 2
-        **/
-        select(): void;
-        /**
-        unselect current window, it will set the z-index as original options.z
-        **/
-        unselect(): void;
-        /**
-        move current window to target position or shift it by passed distance
-        **/
-        move(x: number, y: number, bShift: boolean): void;
-        /**
-        resize current window to target width/height
-        **/
-        resize(width: number, height: number): void;
-        /**
-        maximize current window
-        **/
-        maximize(): void;
-        /**
-        minimize current window
-        **/
-        minimize(): void;
-        /**
-        restore current window, it could be maximized or cascade status
-        **/
-        restore(): void;
-        /**
-        close current window
-        **/
-        close(quiet: boolean): void;
-        /**
-        hide current window
-        **/
-        hide(): void;
-        /**
-        show current window
-        **/
-        show(): void;
-        /**
-        change window title
-        **/
-        setTitle(title: string): void;
-        /**
-        change iframe url
-        **/
-        setUrl(url: string): void;
-        /**
-        change frame content
-        **/
-        setContent(content: string|JQuery|HTMLElement): void;
-        /**
-        change footer content
-        **/
-        setFooterContent(content: string|JQuery|HTMLElement): void;
-        /**
-        get window title text
-        **/
-        getTitle(): string;
-        /**
-        get url string
-        **/
-        getUrl(): string;
-        /**
-        get frame html content
-        **/
-        getContent(): string;
-        /**
-        get footer html content
-        **/
-        getFooterContent(): string;
-        /**
-        get window maximized status
-        **/
-        isMaximized(): boolean;
-        /**
-        get window minmized status
-        **/
-        isMinimized(): boolean;
-        /**
-        get window selected status
-        **/
-        isSelected(): boolean;
-        /**
-        set window icon
-        **/
-        setIcon(iconUrl: string): void;
-        /**
-        show window icon
-        **/
-        showIcon(): void;
-        /**
-        hide window icon
-        **/
-        hideIcon(): void;
-    }
-
-    // Static methods
-    interface Static {
-        (options: WindowOptions): JQueryWindow.Window;
-        /**
-        initialize with customerized static setting attributes
-        **/
-        prepare(options?: StaticOptions): void;
-        /**
-        close all created windows
-        **/
-        closeAll(quiet?: boolean): void;
-        /**
-        hide all created windows
-        **/
-        hideAll(): void;
-        /**
-        show all created windows
-        **/
-        showAll(): void;
-        /**
-        return all created windows instance
-        **/
-        getAll(): Array<JQueryWindow.Window>;
-        /**
-        get the window instance by passed window id
-        **/
-        getWindow(windowId: string): JQueryWindow.Window;
-        /**
-        get the selected window instance
-        **/
-        getSelectedWindow(): JQueryWindow.Window;
-    }
-
-    // Static options
-    interface StaticOptions {
-        /**
-        the direction of minimized window dock at. the available values are [left, right, top, bottom]
-        **/
-        dock?: string;
-        /**
-        the area which the windows will dock at
-        **/
-        dockArea?: JQuery|HTMLElement;
-        /**
-        the speed of animations: maximize, minimize, restore, shift, in milliseconds
-        **/
-        animationSpeed?: number;
-        /**
-        the narrow dimension of minimized window
-        **/
-        minWinNarrow?: number;
-        /**
-        the long dimension of minimized window
-        **/
-        minWinLong?: number;
-        /**
-        to handle browser scrollbar when window status changed(maximize, minimize, cascade)
-        **/
-        handleScrollbar?: boolean;
-        /**
-        to decide show log in firebug, IE8, chrome console
-        **/
-        showLog?: boolean;
-    }
-
-    // Instance options
-    interface WindowOptions {
-        /**
-        an icon image url string. if this attribute is given, it will force to replace the original favicon of remote page on window. or you can set it as null to hide icon.
-        **/
-        icon?: string;
-        /**
-        the title text of window
-        **/
-        title: string;
-        /**
-        the target url of iframe ready to load.
-        **/
-        url?: string;
-        /**
-        this attribute only works when url is null. when passing a jquery object or a element, it will clone the original one to append.
-        **/
-        content?: string|JQuery|HTMLElement;
-        /**
-        same as content attribute, but it's put on footer panel.
-        **/
-        footerContent?: string|JQuery|HTMLElement;
-        /**
-        container extra class
-        **/
-        containerClass?: string;
-        /**
-        header extra class
-        **/
-        headerClass?: string;
-        /**
-        frame extra class
-        **/
-        frameClass?: string;
-        /**
-        footer extra class
-        **/
-        footerClass?: string;
-        /**
-        selected header extra class
-        **/
-        selectedHeaderClass?: string;
-        /**
-        the x-axis value on screen(or caller element), if -1 means put on screen(or caller element) center
-        **/
-        x?: number;
-        /**
-        the y-axis value on screen(or caller element), if -1 means put on screen(or caller element) center
-        **/
-        y?: number;
-        /**
-        the css z-index value
-        **/
-        z?: number;
-        /**
-        window width
-        **/
-        width?: number;
-        /**
-        window height
-        **/
-        height?: number;
-        /**
-        the minimum width, if -1 means no checking
-        **/
-        minWidth?: number;
-        /**
-        the minimum height, if -1 means no checking
-        **/
-        minHeight?: number;
-        /**
-        the maximum width, if -1 means no checking
-        **/
-        maxWidth?: number;
-        /**
-        the maximum height, if -1 means no checking
-        **/
-        maxHeight?: number;
-        /**
-        to control show modal on background
-        **/
-        showModal?: boolean;
-        /**
-        the opacity of modal dialog
-        **/
-        modalOpacity?: number;
-        /**
-        to control show footer panel
-        **/
-        showFooter?: boolean;
-        /**
-        to control display window as round corner
-        **/
-        showRoundCorner?: boolean;
-        /**
-        to control window closable
-        **/
-        closable?: boolean;
-        /**
-        to control window minimizable
-        **/
-        minimizable?: boolean;
-        /**
-        to control window maximizable
-        **/
-        maximizable?: boolean;
-        /**
-        to control window with remote url could be bookmarked
-        **/
-        bookmarkable?: boolean;
-        /**
-        to control window draggable
-        **/
-        draggable?: boolean;
-        /**
-        to control window resizable
-        **/
-        resizable?: boolean;
-        /**
-        to show scroll bar or not
-        **/
-        scrollable?: boolean;
-        /**
-        to check window dialog overflow html body or caller element
-        **/
-        checkBoundary?: boolean;
-        /**
-         to limit window only can be dragged within browser window. this attribute only works when checkBoundary is true and caller is null.
-        **/
-        withinBrowserWindow?: boolean;
-        /**
-        to describe the customized button display and callback function
-        **/
-        custBtns?: Array<JQueryWindow.Button>;
-        /**
-        a callback function while container is added into body
-        **/
-        onOpen?: (wnd: JQueryWindow.Window) => void;
-        /**
-        a callback function while whole window display routine is finished
-        **/
-        onShow?: (wnd: JQueryWindow.Window) => void;
-        /**
-        a callback function while user click close button
-        **/
-        onClose?: (wnd: JQueryWindow.Window) => void;
-        /**
-        a callback function while user select the window
-        **/
-        onSelect?: (wnd: JQueryWindow.Window) => void;
-        /**
-        a callback function while window unselected
-        **/
-        onUnselect?: (wnd: JQueryWindow.Window) => void;
-        /**
-        a callback function while window is going to drag
-        **/
-        onDrag?: (wnd: JQueryWindow.Window) => void;
-        /**
-        a callback function after window dragged
-        **/
-        afterDrag?: (wnd: JQueryWindow.Window) => void;
-        /**
-        a callback function while window is going to resize
-        **/
-        onResize?: (wnd: JQueryWindow.Window) => void;
-        /**
-        a callback function after window resized
-        **/
-        afterResize?: (wnd: JQueryWindow.Window) => void;
-        /**
-        a callback function while window is going to minimize
-        **/
-        onMinimize?: (wnd: JQueryWindow.Window) => void;
-        /**
-        a callback function after window minimized
-        **/
-        afterMinimize?: (wnd: JQueryWindow.Window) => void;
-        /**
-        a callback function while window is going to maximize
-        **/
-        onMaximize?: (wnd: JQueryWindow.Window) => void;
-        /**
-        a callback function after window maximized
-        **/
-        afterMaximize?: (wnd: JQueryWindow.Window) => void;
-        /**
-        a callback function while window is going to cascade
-        **/
-        onCascade?: (wnd: JQueryWindow.Window) => void;
-        /**
-        a callback function after window cascaded
-        **/
-        afterCascade?: (wnd: JQueryWindow.Window) => void;
-        /**
-        a callback function while iframe ready to connect remoting url. this attribute only works while url attribute is given
-        **/
-        onIframeStart?: (wnd: JQueryWindow.Window) => void;
-        /**
-        a callback function while iframe load finished. this attribute only works while url attribute is given
-        **/
-        onIframeEnd?: (wnd: JQueryWindow.Window) => void;
-        /**
-        if null means no check, or pass a string to show warning message while iframe is going to redirect current top page
-        **/
-        iframeRedirectCheckMsg?: string;
-        /**
-        random the new created window position, it only works when options x,y value both are -1
-        **/
-        createRandomOffset?: { x: number; y: number };
-    }
-
-    // Button definition
-    interface Button {
-        /**
-
-        **/
-        id: string;
-        /**
-
-        **/
-        title?: string;
-        /**
-
-        **/
-        clazz?: string;
-        /**
-
-        **/
-        style?: string;
-        /**
-
-        **/
-        image: string;
-        /**
-
-        **/
-        callback: (btn: JQueryWindow.Button, wnd: JQueryWindow.Window) => void;
-    }
-
-}
-
-// Register with JQuery instance
-interface JQuery {
-    window(options: JQueryWindow.WindowOptions): JQueryWindow.Window;
-}
-
-// Register with JQuery static
-interface JQueryStatic {
-    window: JQueryWindow.Static;
-}
diff --git a/jquery.window/tsconfig.json b/jquery.window/tsconfig.json
new file mode 100644
index 0000000000..5877e3a013
--- /dev/null
+++ b/jquery.window/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.window-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquery/index.d.ts b/jquery/index.d.ts
new file mode 100644
index 0000000000..6478529dad
--- /dev/null
+++ b/jquery/index.d.ts
@@ -0,0 +1,3221 @@
+// Type definitions for jQuery 1.10.x / 2.0.x
+// Project: http://jquery.com/
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Christian Hoffmeister <https://github.com/choffmeister>, Steve Fenton <https://github.com/Steve-Fenton>, Diullei Gomes <https://github.com/Diullei>, Tass Iliopoulos <https://github.com/tasoili>, Jason Swearingen <https://github.com/jasons-novaleaf>, Sean Hill <https://github.com/seanski>, Guus Goossens <https://github.com/Guuz>, Kelly Summerlin <https://github.com/ksummerlin>, Basarat Ali Syed <https://github.com/basarat>, Nicholas Wolverson <https://github.com/nwolverson>, Derek Cicerone <https://github.com/derekcicerone>, Andrew Gaspar <https://github.com/AndrewGaspar>, James Harrison Fisher <https://github.com/jameshfisher>, Seikichi Kondo <https://github.com/seikichi>, Benjamin Jackman <https://github.com/benjaminjackman>, Poul Sorensen <https://github.com/s093294>, Josh Strobl <https://github.com/JoshStrobl>, John Reilly <https://github.com/johnnyreilly/>, Dick van den Brink <https://github.com/DickvdBrink>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+
+/**
+ * Interface for the AJAX setting that will configure the AJAX request
+ */
+interface JQueryAjaxSettings {
+    /**
+     * The content type sent in the request header that tells the server what kind of response it will accept in return. If the accepts setting needs modification, it is recommended to do so once in the $.ajaxSetup() method.
+     */
+    accepts?: any;
+    /**
+     * By default, all requests are sent asynchronously (i.e. this is set to true by default). If you need synchronous requests, set this option to false. Cross-domain requests and dataType: "jsonp" requests do not support synchronous operation. Note that synchronous requests may temporarily lock the browser, disabling any actions while the request is active. As of jQuery 1.8, the use of async: false with jqXHR ($.Deferred) is deprecated; you must use the success/error/complete callback options instead of the corresponding methods of the jqXHR object such as jqXHR.done() or the deprecated jqXHR.success().
+     */
+    async?: boolean;
+    /**
+     * A pre-request callback function that can be used to modify the jqXHR (in jQuery 1.4.x, XMLHTTPRequest) object before it is sent. Use this to set custom headers, etc. The jqXHR and settings objects are passed as arguments. This is an Ajax Event. Returning false in the beforeSend function will cancel the request. As of jQuery 1.5, the beforeSend option will be called regardless of the type of request.
+     */
+    beforeSend? (jqXHR: JQueryXHR, settings: JQueryAjaxSettings): any;
+    /**
+     * If set to false, it will force requested pages not to be cached by the browser. Note: Setting cache to false will only work correctly with HEAD and GET requests. It works by appending "_={timestamp}" to the GET parameters. The parameter is not needed for other types of requests, except in IE8 when a POST is made to a URL that has already been requested by a GET.
+     */
+    cache?: boolean;
+    /**
+     * A function to be called when the request finishes (after success and error callbacks are executed). The function gets passed two arguments: The jqXHR (in jQuery 1.4.x, XMLHTTPRequest) object and a string categorizing the status of the request ("success", "notmodified", "error", "timeout", "abort", or "parsererror"). As of jQuery 1.5, the complete setting can accept an array of functions. Each function will be called in turn. This is an Ajax Event.
+     */
+    complete? (jqXHR: JQueryXHR, textStatus: string): any;
+    /**
+     * An object of string/regular-expression pairs that determine how jQuery will parse the response, given its content type. (version added: 1.5)
+     */
+    contents?: { [key: string]: any; };
+    //According to jQuery.ajax source code, ajax's option actually allows contentType to set to "false"
+    // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/742
+    /**
+     * When sending data to the server, use this content type. Default is "application/x-www-form-urlencoded; charset=UTF-8", which is fine for most cases. If you explicitly pass in a content-type to $.ajax(), then it is always sent to the server (even if no data is sent). The W3C XMLHttpRequest specification dictates that the charset is always UTF-8; specifying another charset will not force the browser to change the encoding.
+     */
+    contentType?: any;
+    /**
+     * This object will be made the context of all Ajax-related callbacks. By default, the context is an object that represents the ajax settings used in the call ($.ajaxSettings merged with the settings passed to $.ajax).
+     */
+    context?: any;
+    /**
+     * An object containing dataType-to-dataType converters. Each converter's value is a function that returns the transformed value of the response. (version added: 1.5)
+     */
+    converters?: { [key: string]: any; };
+    /**
+     * If you wish to force a crossDomain request (such as JSONP) on the same domain, set the value of crossDomain to true. This allows, for example, server-side redirection to another domain. (version added: 1.5)
+     */
+    crossDomain?: boolean;
+    /**
+     * Data to be sent to the server. It is converted to a query string, if not already a string. It's appended to the url for GET-requests. See processData option to prevent this automatic processing. Object must be Key/Value pairs. If value is an Array, jQuery serializes multiple values with same key based on the value of the traditional setting (described below).
+     */
+    data?: any;
+    /**
+     * A function to be used to handle the raw response data of XMLHttpRequest.This is a pre-filtering function to sanitize the response. You should return the sanitized data. The function accepts two arguments: The raw data returned from the server and the 'dataType' parameter.
+     */
+    dataFilter? (data: any, ty: any): any;
+    /**
+     * The type of data that you're expecting back from the server. If none is specified, jQuery will try to infer it based on the MIME type of the response (an XML MIME type will yield XML, in 1.4 JSON will yield a JavaScript object, in 1.4 script will execute the script, and anything else will be returned as a string). 
+     */
+    dataType?: string;
+    /**
+     * A function to be called if the request fails. The function receives three arguments: The jqXHR (in jQuery 1.4.x, XMLHttpRequest) object, a string describing the type of error that occurred and an optional exception object, if one occurred. Possible values for the second argument (besides null) are "timeout", "error", "abort", and "parsererror". When an HTTP error occurs, errorThrown receives the textual portion of the HTTP status, such as "Not Found" or "Internal Server Error." As of jQuery 1.5, the error setting can accept an array of functions. Each function will be called in turn. Note: This handler is not called for cross-domain script and cross-domain JSONP requests. This is an Ajax Event.
+     */
+    error? (jqXHR: JQueryXHR, textStatus: string, errorThrown: string): any;
+    /**
+     * Whether to trigger global Ajax event handlers for this request. The default is true. Set to false to prevent the global handlers like ajaxStart or ajaxStop from being triggered. This can be used to control various Ajax Events.
+     */
+    global?: boolean;
+    /**
+     * An object of additional header key/value pairs to send along with requests using the XMLHttpRequest transport. The header X-Requested-With: XMLHttpRequest is always added, but its default XMLHttpRequest value can be changed here. Values in the headers setting can also be overwritten from within the beforeSend function. (version added: 1.5)
+     */
+    headers?: { [key: string]: any; };
+    /**
+     * Allow the request to be successful only if the response has changed since the last request. This is done by checking the Last-Modified header. Default value is false, ignoring the header. In jQuery 1.4 this technique also checks the 'etag' specified by the server to catch unmodified data.
+     */
+    ifModified?: boolean;
+    /**
+     * Allow the current environment to be recognized as "local," (e.g. the filesystem), even if jQuery does not recognize it as such by default. The following protocols are currently recognized as local: file, *-extension, and widget. If the isLocal setting needs modification, it is recommended to do so once in the $.ajaxSetup() method. (version added: 1.5.1)
+     */
+    isLocal?: boolean;
+    /**
+     * Override the callback function name in a jsonp request. This value will be used instead of 'callback' in the 'callback=?' part of the query string in the url. So {jsonp:'onJSONPLoad'} would result in 'onJSONPLoad=?' passed to the server. As of jQuery 1.5, setting the jsonp option to false prevents jQuery from adding the "?callback" string to the URL or attempting to use "=?" for transformation. In this case, you should also explicitly set the jsonpCallback setting. For example, { jsonp: false, jsonpCallback: "callbackName" }
+     */
+    jsonp?: any;
+    /**
+     * Specify the callback function name for a JSONP request. This value will be used instead of the random name automatically generated by jQuery. It is preferable to let jQuery generate a unique name as it'll make it easier to manage the requests and provide callbacks and error handling. You may want to specify the callback when you want to enable better browser caching of GET requests. As of jQuery 1.5, you can also use a function for this setting, in which case the value of jsonpCallback is set to the return value of that function.
+     */
+    jsonpCallback?: any;
+    /**
+     * The HTTP method to use for the request (e.g. "POST", "GET", "PUT"). (version added: 1.9.0)
+     */
+    method?: string;
+    /**
+     * A mime type to override the XHR mime type. (version added: 1.5.1)
+     */
+    mimeType?: string;
+    /**
+     * A password to be used with XMLHttpRequest in response to an HTTP access authentication request.
+     */
+    password?: string;
+    /**
+     * By default, data passed in to the data option as an object (technically, anything other than a string) will be processed and transformed into a query string, fitting to the default content-type "application/x-www-form-urlencoded". If you want to send a DOMDocument, or other non-processed data, set this option to false.
+     */
+    processData?: boolean;
+    /**
+     * Only applies when the "script" transport is used (e.g., cross-domain requests with "jsonp" or "script" dataType and "GET" type). Sets the charset attribute on the script tag used in the request. Used when the character set on the local page is not the same as the one on the remote script.
+     */
+    scriptCharset?: string;
+    /**
+     * An object of numeric HTTP codes and functions to be called when the response has the corresponding code. f the request is successful, the status code functions take the same parameters as the success callback; if it results in an error (including 3xx redirect), they take the same parameters as the error callback. (version added: 1.5)
+     */
+    statusCode?: { [key: string]: any; };
+    /**
+     * A function to be called if the request succeeds. The function gets passed three arguments: The data returned from the server, formatted according to the dataType parameter; a string describing the status; and the jqXHR (in jQuery 1.4.x, XMLHttpRequest) object. As of jQuery 1.5, the success setting can accept an array of functions. Each function will be called in turn. This is an Ajax Event.
+     */
+    success? (data: any, textStatus: string, jqXHR: JQueryXHR): any;
+    /**
+     * Set a timeout (in milliseconds) for the request. This will override any global timeout set with $.ajaxSetup(). The timeout period starts at the point the $.ajax call is made; if several other requests are in progress and the browser has no connections available, it is possible for a request to time out before it can be sent. In jQuery 1.4.x and below, the XMLHttpRequest object will be in an invalid state if the request times out; accessing any object members may throw an exception. In Firefox 3.0+ only, script and JSONP requests cannot be cancelled by a timeout; the script will run even if it arrives after the timeout period.
+     */
+    timeout?: number;
+    /**
+     * Set this to true if you wish to use the traditional style of param serialization.
+     */
+    traditional?: boolean;
+    /**
+     * The type of request to make ("POST" or "GET"), default is "GET". Note: Other HTTP request methods, such as PUT and DELETE, can also be used here, but they are not supported by all browsers.
+     */
+    type?: string;
+    /**
+     * A string containing the URL to which the request is sent.
+     */
+    url?: string;
+    /**
+     * A username to be used with XMLHttpRequest in response to an HTTP access authentication request.
+     */
+    username?: string;
+    /**
+     * Callback for creating the XMLHttpRequest object. Defaults to the ActiveXObject when available (IE), the XMLHttpRequest otherwise. Override to provide your own implementation for XMLHttpRequest or enhancements to the factory.
+     */
+    xhr?: any;
+    /**
+     * An object of fieldName-fieldValue pairs to set on the native XHR object. For example, you can use it to set withCredentials to true for cross-domain requests if needed. In jQuery 1.5, the withCredentials property was not propagated to the native XHR and thus CORS requests requiring it would ignore this flag. For this reason, we recommend using jQuery 1.5.1+ should you require the use of it. (version added: 1.5.1)
+     */
+    xhrFields?: { [key: string]: any; };
+}
+
+/**
+ * Interface for the jqXHR object
+ */
+interface JQueryXHR extends XMLHttpRequest, JQueryPromise<any> {
+    /**
+     * The .overrideMimeType() method may be used in the beforeSend() callback function, for example, to modify the response content-type header. As of jQuery 1.5.1, the jqXHR object also contains the overrideMimeType() method (it was available in jQuery 1.4.x, as well, but was temporarily removed in jQuery 1.5). 
+     */
+    overrideMimeType(mimeType: string): any;
+    /**
+     * Cancel the request. 
+     *
+     * @param statusText A string passed as the textStatus parameter for the done callback. Default value: "canceled"
+     */
+    abort(statusText?: string): void;
+    /**
+     * Incorporates the functionality of the .done() and .fail() methods, allowing (as of jQuery 1.8) the underlying Promise to be manipulated. Refer to deferred.then() for implementation details.
+     */
+    then<R>(doneCallback: (data: any, textStatus: string, jqXHR: JQueryXHR) => R, failCallback?: (jqXHR: JQueryXHR, textStatus: string, errorThrown: any) => void): JQueryPromise<R>;
+    /**
+     * Property containing the parsed response if the response Content-Type is json
+     */
+    responseJSON?: any;
+    /**
+     * A function to be called if the request fails.
+     */
+    error(xhr: JQueryXHR, textStatus: string, errorThrown: string): void;
+}
+
+/**
+ * Interface for the JQuery callback
+ */
+interface JQueryCallback {
+    /**
+     * Add a callback or a collection of callbacks to a callback list.
+     * 
+     * @param callbacks A function, or array of functions, that are to be added to the callback list.
+     */
+    add(callbacks: Function): JQueryCallback;
+    /**
+     * Add a callback or a collection of callbacks to a callback list.
+     * 
+     * @param callbacks A function, or array of functions, that are to be added to the callback list.
+     */
+    add(callbacks: Function[]): JQueryCallback;
+
+    /**
+     * Disable a callback list from doing anything more.
+     */
+    disable(): JQueryCallback;
+
+    /**
+     * Determine if the callbacks list has been disabled.
+     */
+    disabled(): boolean;
+
+    /**
+     * Remove all of the callbacks from a list.
+     */
+    empty(): JQueryCallback;
+
+    /**
+     * Call all of the callbacks with the given arguments
+     * 
+     * @param arguments The argument or list of arguments to pass back to the callback list.
+     */
+    fire(...arguments: any[]): JQueryCallback;
+
+    /**
+     * Determine if the callbacks have already been called at least once.
+     */
+    fired(): boolean;
+
+    /**
+     * Call all callbacks in a list with the given context and arguments.
+     * 
+     * @param context A reference to the context in which the callbacks in the list should be fired.
+     * @param arguments An argument, or array of arguments, to pass to the callbacks in the list.
+     */
+    fireWith(context?: any, args?: any[]): JQueryCallback;
+
+    /**
+     * Determine whether a supplied callback is in a list
+     * 
+     * @param callback The callback to search for.
+     */
+    has(callback: Function): boolean;
+
+    /**
+     * Lock a callback list in its current state.
+     */
+    lock(): JQueryCallback;
+
+    /**
+     * Determine if the callbacks list has been locked.
+     */
+    locked(): boolean;
+
+    /**
+     * Remove a callback or a collection of callbacks from a callback list.
+     * 
+     * @param callbacks A function, or array of functions, that are to be removed from the callback list.
+     */
+    remove(callbacks: Function): JQueryCallback;
+    /**
+     * Remove a callback or a collection of callbacks from a callback list.
+     * 
+     * @param callbacks A function, or array of functions, that are to be removed from the callback list.
+     */
+    remove(callbacks: Function[]): JQueryCallback;
+}
+
+/**
+ * Allows jQuery Promises to interop with non-jQuery promises
+ */
+interface JQueryGenericPromise<T> {
+    /**
+     * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+     * 
+     * @param doneFilter A function that is called when the Deferred is resolved.
+     * @param failFilter An optional function that is called when the Deferred is rejected.
+     */
+    then<U>(doneFilter: (value?: T, ...values: any[]) => U|JQueryPromise<U>, failFilter?: (...reasons: any[]) => any, progressFilter?: (...progression: any[]) => any): JQueryPromise<U>;
+
+    /**
+     * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+     * 
+     * @param doneFilter A function that is called when the Deferred is resolved.
+     * @param failFilter An optional function that is called when the Deferred is rejected.
+     */
+    then(doneFilter: (value?: T, ...values: any[]) => void, failFilter?: (...reasons: any[]) => any, progressFilter?: (...progression: any[]) => any): JQueryPromise<void>;
+}
+
+/**
+ * Interface for the JQuery promise/deferred callbacks
+ */
+interface JQueryPromiseCallback<T> {
+    (value?: T, ...args: any[]): void;
+}
+
+interface JQueryPromiseOperator<T, U> {
+    (callback1: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...callbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<U>;
+}
+
+/**
+ * Interface for the JQuery promise, part of callbacks
+ */
+interface JQueryPromise<T> extends JQueryGenericPromise<T> {
+    /**
+     * Determine the current state of a Deferred object.
+     */
+    state(): string;
+    /**
+     * Add handlers to be called when the Deferred object is either resolved or rejected.
+     * 
+     * @param alwaysCallbacks1 A function, or array of functions, that is called when the Deferred is resolved or rejected.
+     * @param alwaysCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
+     */
+    always(alwaysCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...alwaysCallbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
+    /**
+     * Add handlers to be called when the Deferred object is resolved.
+     * 
+     * @param doneCallbacks1 A function, or array of functions, that are called when the Deferred is resolved.
+     * @param doneCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
+     */
+    done(doneCallback1?: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...doneCallbackN: Array<JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[]>): JQueryPromise<T>;
+    /**
+     * Add handlers to be called when the Deferred object is rejected.
+     * 
+     * @param failCallbacks1 A function, or array of functions, that are called when the Deferred is rejected.
+     * @param failCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
+     */
+    fail(failCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...failCallbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
+    /**
+     * Add handlers to be called when the Deferred object generates progress notifications.
+     * 
+     * @param progressCallbacks A function, or array of functions, to be called when the Deferred generates progress notifications.
+     */
+    progress(progressCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...progressCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
+
+    // Deprecated - given no typings
+    pipe(doneFilter?: (x: any) => any, failFilter?: (x: any) => any, progressFilter?: (x: any) => any): JQueryPromise<any>;
+}
+
+/**
+ * Interface for the JQuery deferred, part of callbacks
+ */
+interface JQueryDeferred<T> extends JQueryGenericPromise<T> {
+    /**
+     * Determine the current state of a Deferred object.
+     */
+    state(): string;
+    /**
+     * Add handlers to be called when the Deferred object is either resolved or rejected.
+     * 
+     * @param alwaysCallbacks1 A function, or array of functions, that is called when the Deferred is resolved or rejected.
+     * @param alwaysCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
+     */
+    always(alwaysCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...alwaysCallbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
+    /**
+     * Add handlers to be called when the Deferred object is resolved.
+     * 
+     * @param doneCallbacks1 A function, or array of functions, that are called when the Deferred is resolved.
+     * @param doneCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
+     */
+    done(doneCallback1?: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...doneCallbackN: Array<JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[]>): JQueryDeferred<T>;
+    /**
+     * Add handlers to be called when the Deferred object is rejected.
+     * 
+     * @param failCallbacks1 A function, or array of functions, that are called when the Deferred is rejected.
+     * @param failCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
+     */
+    fail(failCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...failCallbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
+    /**
+     * Add handlers to be called when the Deferred object generates progress notifications.
+     * 
+     * @param progressCallbacks A function, or array of functions, to be called when the Deferred generates progress notifications.
+     */
+    progress(progressCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...progressCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
+
+    /**
+     * Call the progressCallbacks on a Deferred object with the given args.
+     * 
+     * @param args Optional arguments that are passed to the progressCallbacks.
+     */
+    notify(value?: any, ...args: any[]): JQueryDeferred<T>;
+
+    /**
+     * Call the progressCallbacks on a Deferred object with the given context and args.
+     * 
+     * @param context Context passed to the progressCallbacks as the this object.
+     * @param args Optional arguments that are passed to the progressCallbacks.
+     */
+    notifyWith(context: any, value?: any[]): JQueryDeferred<T>;
+
+    /**
+     * Reject a Deferred object and call any failCallbacks with the given args.
+     * 
+     * @param args Optional arguments that are passed to the failCallbacks.
+     */
+    reject(value?: any, ...args: any[]): JQueryDeferred<T>;
+    /**
+     * Reject a Deferred object and call any failCallbacks with the given context and args.
+     * 
+     * @param context Context passed to the failCallbacks as the this object.
+     * @param args An optional array of arguments that are passed to the failCallbacks.
+     */
+    rejectWith(context: any, value?: any[]): JQueryDeferred<T>;
+
+    /**
+     * Resolve a Deferred object and call any doneCallbacks with the given args.
+     * 
+     * @param value First argument passed to doneCallbacks.
+     * @param args Optional subsequent arguments that are passed to the doneCallbacks.
+     */
+    resolve(value?: T, ...args: any[]): JQueryDeferred<T>;
+
+    /**
+     * Resolve a Deferred object and call any doneCallbacks with the given context and args.
+     * 
+     * @param context Context passed to the doneCallbacks as the this object.
+     * @param args An optional array of arguments that are passed to the doneCallbacks.
+     */
+    resolveWith(context: any, value?: T[]): JQueryDeferred<T>;
+
+    /**
+     * Return a Deferred's Promise object.
+     * 
+     * @param target Object onto which the promise methods have to be attached
+     */
+    promise(target?: any): JQueryPromise<T>;
+
+    // Deprecated - given no typings
+    pipe(doneFilter?: (x: any) => any, failFilter?: (x: any) => any, progressFilter?: (x: any) => any): JQueryPromise<any>;
+}
+
+/**
+ * Interface of the JQuery extension of the W3C event object
+ */
+interface BaseJQueryEventObject extends Event {
+    data: any;
+    delegateTarget: Element;
+    isDefaultPrevented(): boolean;
+    isImmediatePropagationStopped(): boolean;
+    isPropagationStopped(): boolean;
+    namespace: string;
+    originalEvent: Event;
+    preventDefault(): any;
+    relatedTarget: Element;
+    result: any;
+    stopImmediatePropagation(): void;
+    stopPropagation(): void;
+    target: Element;
+    pageX: number;
+    pageY: number;
+    which: number;
+    metaKey: boolean;
+}
+
+interface JQueryInputEventObject extends BaseJQueryEventObject {
+    altKey: boolean;
+    ctrlKey: boolean;
+    metaKey: boolean;
+    shiftKey: boolean;
+}
+
+interface JQueryMouseEventObject extends JQueryInputEventObject {
+    button: number;
+    clientX: number;
+    clientY: number;
+    offsetX: number;
+    offsetY: number;
+    pageX: number;
+    pageY: number;
+    screenX: number;
+    screenY: number;
+}
+
+interface JQueryKeyEventObject extends JQueryInputEventObject {
+    char: any;
+    charCode: number;
+    key: any;
+    keyCode: number;
+}
+
+interface JQueryEventObject extends BaseJQueryEventObject, JQueryInputEventObject, JQueryMouseEventObject, JQueryKeyEventObject{
+}
+
+/*
+    Collection of properties of the current browser
+*/
+
+interface JQuerySupport {
+    ajax?: boolean;
+    boxModel?: boolean;
+    changeBubbles?: boolean;
+    checkClone?: boolean;
+    checkOn?: boolean;
+    cors?: boolean;
+    cssFloat?: boolean;
+    hrefNormalized?: boolean;
+    htmlSerialize?: boolean;
+    leadingWhitespace?: boolean;
+    noCloneChecked?: boolean;
+    noCloneEvent?: boolean;
+    opacity?: boolean;
+    optDisabled?: boolean;
+    optSelected?: boolean;
+    scriptEval? (): boolean;
+    style?: boolean;
+    submitBubbles?: boolean;
+    tbody?: boolean;
+}
+
+interface JQueryParam {
+    /**
+     * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request.
+     * 
+     * @param obj An array or object to serialize.
+     */
+    (obj: any): string;
+
+    /**
+     * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request.
+     * 
+     * @param obj An array or object to serialize.
+     * @param traditional A Boolean indicating whether to perform a traditional "shallow" serialization.
+     */
+    (obj: any, traditional: boolean): string;
+}
+
+/**
+ * The interface used to construct jQuery events (with $.Event). It is
+ * defined separately instead of inline in JQueryStatic to allow
+ * overriding the construction function with specific strings
+ * returning specific event objects.
+ */
+interface JQueryEventConstructor {
+    (name: string, eventProperties?: any): JQueryEventObject;
+    new (name: string, eventProperties?: any): JQueryEventObject;
+}
+
+/**
+ * The interface used to specify coordinates.
+ */
+interface JQueryCoordinates {
+    left: number;
+    top: number;
+}
+
+/**
+ * Elements in the array returned by serializeArray()
+ */
+interface JQuerySerializeArrayElement {
+    name: string;
+    value: string;
+}
+
+interface JQueryAnimationOptions { 
+    /**
+     * A string or number determining how long the animation will run.
+     */
+    duration?: any; 
+    /**
+     * A string indicating which easing function to use for the transition.
+     */
+    easing?: string; 
+    /**
+     * A function to call once the animation is complete.
+     */
+    complete?: Function; 
+    /**
+     * A function to be called for each animated property of each animated element. This function provides an opportunity to modify the Tween object to change the value of the property before it is set.
+     */
+    step?: (now: number, tween: any) => any; 
+    /**
+     * A function to be called after each step of the animation, only once per animated element regardless of the number of animated properties. (version added: 1.8)
+     */
+    progress?: (animation: JQueryPromise<any>, progress: number, remainingMs: number) => any; 
+    /**
+     * A function to call when the animation begins. (version added: 1.8)
+     */
+    start?: (animation: JQueryPromise<any>) => any; 
+    /**
+     * A function to be called when the animation completes (its Promise object is resolved). (version added: 1.8)
+     */
+    done?: (animation: JQueryPromise<any>, jumpedToEnd: boolean) => any; 
+    /**
+     * A function to be called when the animation fails to complete (its Promise object is rejected). (version added: 1.8)
+     */
+    fail?: (animation: JQueryPromise<any>, jumpedToEnd: boolean) => any; 
+    /**
+     * A function to be called when the animation completes or stops without completing (its Promise object is either resolved or rejected). (version added: 1.8)
+     */
+    always?: (animation: JQueryPromise<any>, jumpedToEnd: boolean) => any; 
+    /**
+     * A Boolean indicating whether to place the animation in the effects queue. If false, the animation will begin immediately. As of jQuery 1.7, the queue option can also accept a string, in which case the animation is added to the queue represented by that string. When a custom queue name is used the animation does not automatically start; you must call .dequeue("queuename") to start it.
+     */
+    queue?: any; 
+    /**
+     * A map of one or more of the CSS properties defined by the properties argument and their corresponding easing functions. (version added: 1.4)
+     */
+    specialEasing?: Object;
+}
+
+interface JQueryEasingFunction {
+    ( percent: number ): number;
+}
+
+interface JQueryEasingFunctions {
+    [ name: string ]: JQueryEasingFunction;
+    linear: JQueryEasingFunction;
+    swing: JQueryEasingFunction;
+}
+
+/**
+ * Static members of jQuery (those on $ and jQuery themselves)
+ */
+interface JQueryStatic {
+
+    /**
+     * Perform an asynchronous HTTP (Ajax) request.
+     *
+     * @param settings A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with $.ajaxSetup().
+     */
+    ajax(settings: JQueryAjaxSettings): JQueryXHR;
+    /**
+     * Perform an asynchronous HTTP (Ajax) request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param settings A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with $.ajaxSetup().
+     */
+    ajax(url: string, settings?: JQueryAjaxSettings): JQueryXHR;
+
+    /**
+     * Handle custom Ajax options or modify existing options before each request is sent and before they are processed by $.ajax().
+     *
+     * @param dataTypes An optional string containing one or more space-separated dataTypes
+     * @param handler A handler to set default values for future Ajax requests.
+     */
+    ajaxPrefilter(dataTypes: string, handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void;
+    /**
+     * Handle custom Ajax options or modify existing options before each request is sent and before they are processed by $.ajax().
+     *
+     * @param handler A handler to set default values for future Ajax requests.
+     */
+    ajaxPrefilter(handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void;
+
+    ajaxSettings: JQueryAjaxSettings;
+
+     /**
+      * Set default values for future Ajax requests. Its use is not recommended.
+      *
+      * @param options A set of key/value pairs that configure the default Ajax request. All options are optional.
+      */
+    ajaxSetup(options: JQueryAjaxSettings): void;
+
+    /**
+     * Load data from the server using a HTTP GET request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param success A callback function that is executed if the request succeeds.
+     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, or html).
+     */
+    get(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
+    /**
+     * Load data from the server using a HTTP GET request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param data A plain object or string that is sent to the server with the request.
+     * @param success A callback function that is executed if the request succeeds.
+     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, or html).
+     */
+    get(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
+    /**
+     * Load data from the server using a HTTP GET request.
+     *
+     * @param settings The JQueryAjaxSettings to be used for the request
+     */
+    get(settings : JQueryAjaxSettings): JQueryXHR;
+    /**
+     * Load JSON-encoded data from the server using a GET HTTP request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param success A callback function that is executed if the request succeeds.
+     */
+    getJSON(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR;
+    /**
+     * Load JSON-encoded data from the server using a GET HTTP request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param data A plain object or string that is sent to the server with the request.
+     * @param success A callback function that is executed if the request succeeds.
+     */
+    getJSON(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR;
+    /**
+     * Load a JavaScript file from the server using a GET HTTP request, then execute it.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param success A callback function that is executed if the request succeeds.
+     */
+    getScript(url: string, success?: (script: string, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR;
+
+    /**
+     * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request.
+     */
+    param: JQueryParam;
+
+    /**
+     * Load data from the server using a HTTP POST request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but can be null in that case.
+     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
+     */
+    post(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
+    /**
+     * Load data from the server using a HTTP POST request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param data A plain object or string that is sent to the server with the request.
+     * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but can be null in that case.
+     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
+     */
+    post(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
+    /**
+     * Load data from the server using a HTTP POST request.
+     *
+     * @param settings The JQueryAjaxSettings to be used for the request
+     */
+    post(settings : JQueryAjaxSettings): JQueryXHR;
+    /**
+     * A multi-purpose callbacks list object that provides a powerful way to manage callback lists.
+     *
+     * @param flags An optional list of space-separated flags that change how the callback list behaves.
+     */
+    Callbacks(flags?: string): JQueryCallback;
+
+    /**
+     * Holds or releases the execution of jQuery's ready event.
+     *
+     * @param hold Indicates whether the ready hold is being requested or released
+     */
+    holdReady(hold: boolean): void;
+
+    /**
+     * Accepts a string containing a CSS selector which is then used to match a set of elements.
+     *
+     * @param selector A string containing a selector expression
+     * @param context A DOM Element, Document, or jQuery to use as context
+     */
+    (selector: string, context?: Element|JQuery): JQuery;
+
+    /**
+     * Accepts a string containing a CSS selector which is then used to match a set of elements.
+     *
+     * @param element A DOM element to wrap in a jQuery object.
+     */
+    (element: Element): JQuery;
+
+    /**
+     * Accepts a string containing a CSS selector which is then used to match a set of elements.
+     *
+     * @param elementArray An array containing a set of DOM elements to wrap in a jQuery object.
+     */
+    (elementArray: Element[]): JQuery;
+
+    /**
+     * Binds a function to be executed when the DOM has finished loading.
+     *
+     * @param callback A function to execute after the DOM is ready.
+     */
+    (callback: (jQueryAlias?: JQueryStatic) => any): JQuery;
+
+    /**
+     * Accepts a string containing a CSS selector which is then used to match a set of elements.
+     *
+     * @param object A plain object to wrap in a jQuery object.
+     */
+    (object: {}): JQuery;
+
+    /**
+     * Accepts a string containing a CSS selector which is then used to match a set of elements.
+     *
+     * @param object An existing jQuery object to clone.
+     */
+    (object: JQuery): JQuery;
+
+    /**
+     * Specify a function to execute when the DOM is fully loaded.
+     */
+    (): JQuery;
+
+    /**
+     * Creates DOM elements on the fly from the provided string of raw HTML.
+     *
+     * @param html A string of HTML to create on the fly. Note that this parses HTML, not XML.
+     * @param ownerDocument A document in which the new elements will be created.
+     */
+    (html: string, ownerDocument?: Document): JQuery;
+
+    /**
+     * Creates DOM elements on the fly from the provided string of raw HTML.
+     *
+     * @param html A string defining a single, standalone, HTML element (e.g. <div/> or <div></div>).
+     * @param attributes An object of attributes, events, and methods to call on the newly-created element.
+     */
+    (html: string, attributes: Object): JQuery;
+
+    /**
+     * Relinquish jQuery's control of the $ variable.
+     *
+     * @param removeAll A Boolean indicating whether to remove all jQuery variables from the global scope (including jQuery itself).
+     */
+    noConflict(removeAll?: boolean): JQueryStatic;
+
+    /**
+     * Provides a way to execute callback functions based on one or more objects, usually Deferred objects that represent asynchronous events.
+     *
+     * @param deferreds One or more Deferred objects, or plain JavaScript objects.
+     */
+    when<T>(...deferreds: Array<T|JQueryPromise<T>/* as JQueryDeferred<T> */>): JQueryPromise<T>;
+
+    /**
+     * Hook directly into jQuery to override how particular CSS properties are retrieved or set, normalize CSS property naming, or create custom properties.
+     */
+    cssHooks: { [key: string]: any; };
+    cssNumber: any;
+
+    /**
+     * Store arbitrary data associated with the specified element. Returns the value that was set.
+     *
+     * @param element The DOM element to associate with the data.
+     * @param key A string naming the piece of data to set.
+     * @param value The new data value.
+     */
+    data<T>(element: Element, key: string, value: T): T;
+    /**
+     * Returns value at named data store for the element, as set by jQuery.data(element, name, value), or the full data store for the element.
+     *
+     * @param element The DOM element to associate with the data.
+     * @param key A string naming the piece of data to set.
+     */
+    data(element: Element, key: string): any;
+    /**
+     * Returns value at named data store for the element, as set by jQuery.data(element, name, value), or the full data store for the element.
+     *
+     * @param element The DOM element to associate with the data.
+     */
+    data(element: Element): any;
+
+    /**
+     * Execute the next function on the queue for the matched element.
+     *
+     * @param element A DOM element from which to remove and execute a queued function.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     */
+    dequeue(element: Element, queueName?: string): void;
+
+    /**
+     * Determine whether an element has any jQuery data associated with it.
+     *
+     * @param element A DOM element to be checked for data.
+     */
+    hasData(element: Element): boolean;
+
+    /**
+     * Show the queue of functions to be executed on the matched element.
+     *
+     * @param element A DOM element to inspect for an attached queue.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     */
+    queue(element: Element, queueName?: string): any[];
+    /**
+     * Manipulate the queue of functions to be executed on the matched element.
+     *
+     * @param element A DOM element where the array of queued functions is attached.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @param newQueue An array of functions to replace the current queue contents.
+     */
+    queue(element: Element, queueName: string, newQueue: Function[]): JQuery;
+    /**
+     * Manipulate the queue of functions to be executed on the matched element.
+     *
+     * @param element A DOM element on which to add a queued function.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @param callback The new function to add to the queue.
+     */
+    queue(element: Element, queueName: string, callback: Function): JQuery;
+
+    /**
+     * Remove a previously-stored piece of data.
+     *
+     * @param element A DOM element from which to remove data.
+     * @param name A string naming the piece of data to remove.
+     */
+    removeData(element: Element, name?: string): JQuery;
+
+    /**
+     * A constructor function that returns a chainable utility object with methods to register multiple callbacks into callback queues, invoke callback queues, and relay the success or failure state of any synchronous or asynchronous function.
+     *
+     * @param beforeStart A function that is called just before the constructor returns.
+     */
+    Deferred<T>(beforeStart?: (deferred: JQueryDeferred<T>) => any): JQueryDeferred<T>;
+
+    /**
+     * Effects
+     */
+
+    easing: JQueryEasingFunctions;
+
+    fx: {
+        tick: () => void;
+        /**
+         * The rate (in milliseconds) at which animations fire.
+         */
+        interval: number;
+        stop: () => void;
+        speeds: { slow: number; fast: number; };
+        /**
+         * Globally disable all animations.
+         */
+        off: boolean;
+        step: any;
+    };
+
+    /**
+     * Takes a function and returns a new one that will always have a particular context.
+     *
+     * @param fnction The function whose context will be changed.
+     * @param context The object to which the context (this) of the function should be set.
+     * @param additionalArguments Any number of arguments to be passed to the function referenced in the function argument.
+     */
+    proxy(fnction: (...args: any[]) => any, context: Object, ...additionalArguments: any[]): any;
+    /**
+     * Takes a function and returns a new one that will always have a particular context.
+     *
+     * @param context The object to which the context (this) of the function should be set.
+     * @param name The name of the function whose context will be changed (should be a property of the context object).
+     * @param additionalArguments Any number of arguments to be passed to the function named in the name argument.
+     */
+    proxy(context: Object, name: string, ...additionalArguments: any[]): any;
+
+    Event: JQueryEventConstructor;
+
+    /**
+     * Takes a string and throws an exception containing it.
+     *
+     * @param message The message to send out.
+     */
+    error(message: any): JQuery;
+
+    expr: any;
+    fn: any;  //TODO: Decide how we want to type this
+
+    isReady: boolean;
+
+    // Properties
+    support: JQuerySupport;
+
+    /**
+     * Check to see if a DOM element is a descendant of another DOM element.
+     * 
+     * @param container The DOM element that may contain the other element.
+     * @param contained The DOM element that may be contained by (a descendant of) the other element.
+     */
+    contains(container: Element, contained: Element): boolean;
+
+    /**
+     * A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties.
+     * 
+     * @param collection The object or array to iterate over.
+     * @param callback The function that will be executed on every object.
+     */
+    each<T>(
+        collection: T[],
+        callback: (indexInArray: number, valueOfElement: T) => any
+        ): any;
+
+    /**
+     * A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties.
+     * 
+     * @param collection The object or array to iterate over.
+     * @param callback The function that will be executed on every object.
+     */
+    each(
+        collection: any,
+        callback: (indexInArray: any, valueOfElement: any) => any
+        ): any;
+
+    /**
+     * Merge the contents of two or more objects together into the first object.
+     *
+     * @param target An object that will receive the new properties if additional objects are passed in or that will extend the jQuery namespace if it is the sole argument.
+     * @param object1 An object containing additional properties to merge in.
+     * @param objectN Additional objects containing properties to merge in.
+     */
+    extend(target: any, object1?: any, ...objectN: any[]): any;
+    /**
+     * Merge the contents of two or more objects together into the first object.
+     *
+     * @param deep If true, the merge becomes recursive (aka. deep copy).
+     * @param target The object to extend. It will receive the new properties.
+     * @param object1 An object containing additional properties to merge in.
+     * @param objectN Additional objects containing properties to merge in.
+     */
+    extend(deep: boolean, target: any, object1?: any, ...objectN: any[]): any;
+
+    /**
+     * Execute some JavaScript code globally.
+     *
+     * @param code The JavaScript code to execute.
+     */
+    globalEval(code: string): any;
+
+    /**
+     * Finds the elements of an array which satisfy a filter function. The original array is not affected.
+     *
+     * @param array The array to search through.
+     * @param func The function to process each item against. The first argument to the function is the item, and the second argument is the index. The function should return a Boolean value.  this will be the global window object.
+     * @param invert If "invert" is false, or not provided, then the function returns an array consisting of all elements for which "callback" returns true. If "invert" is true, then the function returns an array consisting of all elements for which "callback" returns false.
+     */
+    grep<T>(array: T[], func: (elementOfArray: T, indexInArray: number) => boolean, invert?: boolean): T[];
+
+    /**
+     * Search for a specified value within an array and return its index (or -1 if not found).
+     *
+     * @param value The value to search for.
+     * @param array An array through which to search.
+     * @param fromIndex he index of the array at which to begin the search. The default is 0, which will search the whole array.
+     */
+    inArray<T>(value: T, array: T[], fromIndex?: number): number;
+
+    /**
+     * Determine whether the argument is an array.
+     *
+     * @param obj Object to test whether or not it is an array.
+     */
+    isArray(obj: any): boolean;
+    /**
+     * Check to see if an object is empty (contains no enumerable properties).
+     *
+     * @param obj The object that will be checked to see if it's empty.
+     */
+    isEmptyObject(obj: any): boolean;
+    /**
+     * Determine if the argument passed is a Javascript function object.
+     *
+     * @param obj Object to test whether or not it is a function.
+     */
+    isFunction(obj: any): boolean;
+    /**
+     * Determines whether its argument is a number.
+     *
+     * @param obj The value to be tested.
+     */
+    isNumeric(value: any): boolean;
+    /**
+     * Check to see if an object is a plain object (created using "{}" or "new Object").
+     *
+     * @param obj The object that will be checked to see if it's a plain object.
+     */
+    isPlainObject(obj: any): boolean;
+    /**
+     * Determine whether the argument is a window.
+     *
+     * @param obj Object to test whether or not it is a window.
+     */
+    isWindow(obj: any): boolean;
+    /**
+     * Check to see if a DOM node is within an XML document (or is an XML document).
+     *
+     * @param node he DOM node that will be checked to see if it's in an XML document.
+     */
+    isXMLDoc(node: Node): boolean;
+
+    /**
+     * Convert an array-like object into a true JavaScript array.
+     * 
+     * @param obj Any object to turn into a native Array.
+     */
+    makeArray(obj: any): any[];
+
+    /**
+     * Translate all items in an array or object to new array of items.
+     * 
+     * @param array The Array to translate.
+     * @param callback The function to process each item against. The first argument to the function is the array item, the second argument is the index in array The function can return any value. Within the function, this refers to the global (window) object.
+     */
+    map<T, U>(array: T[], callback: (elementOfArray: T, indexInArray: number) => U): U[];
+    /**
+     * Translate all items in an array or object to new array of items.
+     * 
+     * @param arrayOrObject The Array or Object to translate.
+     * @param callback The function to process each item against. The first argument to the function is the value; the second argument is the index or key of the array or object property. The function can return any value to add to the array. A returned array will be flattened into the resulting array. Within the function, this refers to the global (window) object.
+     */
+    map(arrayOrObject: any, callback: (value: any, indexOrKey: any) => any): any;
+
+    /**
+     * Merge the contents of two arrays together into the first array.
+     * 
+     * @param first The first array to merge, the elements of second added.
+     * @param second The second array to merge into the first, unaltered.
+     */
+    merge<T>(first: T[], second: T[]): T[];
+
+    /**
+     * An empty function.
+     */
+    noop(): any;
+
+    /**
+     * Return a number representing the current time.
+     */
+    now(): number;
+
+    /**
+     * Takes a well-formed JSON string and returns the resulting JavaScript object.
+     * 
+     * @param json The JSON string to parse.
+     */
+    parseJSON(json: string): any;
+
+    /**
+     * Parses a string into an XML document.
+     *
+     * @param data a well-formed XML string to be parsed
+     */
+    parseXML(data: string): XMLDocument;
+
+    /**
+     * Remove the whitespace from the beginning and end of a string.
+     * 
+     * @param str Remove the whitespace from the beginning and end of a string.
+     */
+    trim(str: string): string;
+
+    /**
+     * Determine the internal JavaScript [[Class]] of an object.
+     * 
+     * @param obj Object to get the internal JavaScript [[Class]] of.
+     */
+    type(obj: any): string;
+
+    /**
+     * Sorts an array of DOM elements, in place, with the duplicates removed. Note that this only works on arrays of DOM elements, not strings or numbers.
+     * 
+     * @param array The Array of DOM elements.
+     */
+    unique(array: Element[]): Element[];
+
+    /**
+     * Parses a string into an array of DOM nodes.
+     *
+     * @param data HTML string to be parsed
+     * @param context DOM element to serve as the context in which the HTML fragment will be created
+     * @param keepScripts A Boolean indicating whether to include scripts passed in the HTML string
+     */
+    parseHTML(data: string, context?: HTMLElement, keepScripts?: boolean): any[];
+
+    /**
+     * Parses a string into an array of DOM nodes.
+     *
+     * @param data HTML string to be parsed
+     * @param context DOM element to serve as the context in which the HTML fragment will be created
+     * @param keepScripts A Boolean indicating whether to include scripts passed in the HTML string
+     */
+    parseHTML(data: string, context?: Document, keepScripts?: boolean): any[];
+}
+
+/**
+ * The jQuery instance members
+ */
+interface JQuery {
+    /**
+     * Register a handler to be called when Ajax requests complete. This is an AjaxEvent.
+     *
+     * @param handler The function to be invoked.
+     */
+    ajaxComplete(handler: (event: JQueryEventObject, XMLHttpRequest: XMLHttpRequest, ajaxOptions: any) => any): JQuery;
+    /**
+     * Register a handler to be called when Ajax requests complete with an error. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     */
+    ajaxError(handler: (event: JQueryEventObject, jqXHR: JQueryXHR, ajaxSettings: JQueryAjaxSettings, thrownError: any) => any): JQuery;
+    /**
+     * Attach a function to be executed before an Ajax request is sent. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     */
+    ajaxSend(handler: (event: JQueryEventObject, jqXHR: JQueryXHR, ajaxOptions: JQueryAjaxSettings) => any): JQuery;
+    /**
+     * Register a handler to be called when the first Ajax request begins. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     */
+    ajaxStart(handler: () => any): JQuery;
+    /**
+     * Register a handler to be called when all Ajax requests have completed. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     */
+    ajaxStop(handler: () => any): JQuery;
+    /**
+     * Attach a function to be executed whenever an Ajax request completes successfully. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     */
+    ajaxSuccess(handler: (event: JQueryEventObject, XMLHttpRequest: XMLHttpRequest, ajaxOptions: JQueryAjaxSettings) => any): JQuery;
+
+    /**
+     * Load data from the server and place the returned HTML into the matched element.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param data A plain object or string that is sent to the server with the request.
+     * @param complete A callback function that is executed when the request completes.
+     */
+    load(url: string, data?: string|Object, complete?: (responseText: string, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any): JQuery;
+
+    /**
+     * Encode a set of form elements as a string for submission.
+     */
+    serialize(): string;
+    /**
+     * Encode a set of form elements as an array of names and values.
+     */
+    serializeArray(): JQuerySerializeArrayElement[];
+
+    /**
+     * Adds the specified class(es) to each of the set of matched elements.
+     *
+     * @param className One or more space-separated classes to be added to the class attribute of each matched element.
+     */
+    addClass(className: string): JQuery;
+    /**
+     * Adds the specified class(es) to each of the set of matched elements.
+     *
+     * @param function A function returning one or more space-separated class names to be added to the existing class name(s). Receives the index position of the element in the set and the existing class name(s) as arguments. Within the function, this refers to the current element in the set.
+     */
+    addClass(func: (index: number, className: string) => string): JQuery;
+
+    /**
+     * Add the previous set of elements on the stack to the current set, optionally filtered by a selector.
+     */
+    addBack(selector?: string): JQuery;
+
+    /**
+     * Get the value of an attribute for the first element in the set of matched elements.
+     *
+     * @param attributeName The name of the attribute to get.
+     */
+    attr(attributeName: string): string;
+    /**
+     * Set one or more attributes for the set of matched elements.
+     *
+     * @param attributeName The name of the attribute to set.
+     * @param value A value to set for the attribute.
+     */
+    attr(attributeName: string, value: string|number): JQuery;
+    /**
+     * Set one or more attributes for the set of matched elements.
+     *
+     * @param attributeName The name of the attribute to set.
+     * @param func A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old attribute value as arguments.
+     */
+    attr(attributeName: string, func: (index: number, attr: string) => string|number): JQuery;
+    /**
+     * Set one or more attributes for the set of matched elements.
+     *
+     * @param attributes An object of attribute-value pairs to set.
+     */
+    attr(attributes: Object): JQuery;
+    
+    /**
+     * Determine whether any of the matched elements are assigned the given class.
+     *
+     * @param className The class name to search for.
+     */
+    hasClass(className: string): boolean;
+
+    /**
+     * Get the HTML contents of the first element in the set of matched elements.
+     */
+    html(): string;
+    /**
+     * Set the HTML contents of each element in the set of matched elements.
+     *
+     * @param htmlString A string of HTML to set as the content of each matched element.
+     */
+    html(htmlString: string): JQuery;
+    /**
+     * Set the HTML contents of each element in the set of matched elements.
+     *
+     * @param func A function returning the HTML content to set. Receives the index position of the element in the set and the old HTML value as arguments. jQuery empties the element before calling the function; use the oldhtml argument to reference the previous content. Within the function, this refers to the current element in the set.
+     */
+    html(func: (index: number, oldhtml: string) => string): JQuery;
+    /**
+     * Set the HTML contents of each element in the set of matched elements.
+     *
+     * @param func A function returning the HTML content to set. Receives the index position of the element in the set and the old HTML value as arguments. jQuery empties the element before calling the function; use the oldhtml argument to reference the previous content. Within the function, this refers to the current element in the set.
+     */
+
+    /**
+     * Get the value of a property for the first element in the set of matched elements.
+     *
+     * @param propertyName The name of the property to get.
+     */
+    prop(propertyName: string): any;
+    /**
+     * Set one or more properties for the set of matched elements.
+     *
+     * @param propertyName The name of the property to set.
+     * @param value A value to set for the property.
+     */
+    prop(propertyName: string, value: string|number|boolean): JQuery;
+    /**
+     * Set one or more properties for the set of matched elements.
+     *
+     * @param properties An object of property-value pairs to set.
+     */
+    prop(properties: Object): JQuery;
+    /**
+     * Set one or more properties for the set of matched elements.
+     *
+     * @param propertyName The name of the property to set.
+     * @param func A function returning the value to set. Receives the index position of the element in the set and the old property value as arguments. Within the function, the keyword this refers to the current element.
+     */
+    prop(propertyName: string, func: (index: number, oldPropertyValue: any) => any): JQuery;
+
+    /**
+     * Remove an attribute from each element in the set of matched elements.
+     *
+     * @param attributeName An attribute to remove; as of version 1.7, it can be a space-separated list of attributes.
+     */
+    removeAttr(attributeName: string): JQuery;
+
+    /**
+     * Remove a single class, multiple classes, or all classes from each element in the set of matched elements.
+     *
+     * @param className One or more space-separated classes to be removed from the class attribute of each matched element.
+     */
+    removeClass(className?: string): JQuery;
+    /**
+     * Remove a single class, multiple classes, or all classes from each element in the set of matched elements.
+     *
+     * @param function A function returning one or more space-separated class names to be removed. Receives the index position of the element in the set and the old class value as arguments.
+     */
+    removeClass(func: (index: number, className: string) => string): JQuery;
+
+    /**
+     * Remove a property for the set of matched elements.
+     *
+     * @param propertyName The name of the property to remove.
+     */
+    removeProp(propertyName: string): JQuery;
+
+    /**
+     * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.
+     *
+     * @param className One or more class names (separated by spaces) to be toggled for each element in the matched set.
+     * @param swtch A Boolean (not just truthy/falsy) value to determine whether the class should be added or removed.
+     */
+    toggleClass(className: string, swtch?: boolean): JQuery;
+    /**
+     * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.
+     *
+     * @param swtch A boolean value to determine whether the class should be added or removed.
+     */
+    toggleClass(swtch?: boolean): JQuery;
+    /**
+     * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.
+     *
+     * @param func A function that returns class names to be toggled in the class attribute of each element in the matched set. Receives the index position of the element in the set, the old class value, and the switch as arguments.
+     * @param swtch A boolean value to determine whether the class should be added or removed.
+     */
+    toggleClass(func: (index: number, className: string, swtch: boolean) => string, swtch?: boolean): JQuery;
+
+    /**
+     * Get the current value of the first element in the set of matched elements.
+     */
+    val(): any;
+    /**
+     * Set the value of each element in the set of matched elements.
+     *
+     * @param value A string of text, an array of strings or number corresponding to the value of each matched element to set as selected/checked.
+     */
+    val(value: string|string[]|number): JQuery;
+    /**
+     * Set the value of each element in the set of matched elements.
+     *
+     * @param func A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old value as arguments.
+     */
+    val(func: (index: number, value: string) => string): JQuery;
+
+
+    /**
+     * Get the value of style properties for the first element in the set of matched elements.
+     *
+     * @param propertyName A CSS property.
+     */
+    css(propertyName: string): string;
+    /**
+     * Set one or more CSS properties for the set of matched elements.
+     *
+     * @param propertyName A CSS property name.
+     * @param value A value to set for the property.
+     */
+    css(propertyName: string, value: string|number): JQuery;
+    /**
+     * Set one or more CSS properties for the set of matched elements.
+     *
+     * @param propertyName A CSS property name.
+     * @param value A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old value as arguments.
+     */
+    css(propertyName: string, value: (index: number, value: string) => string|number): JQuery;
+    /**
+     * Set one or more CSS properties for the set of matched elements.
+     *
+     * @param properties An object of property-value pairs to set.
+     */
+    css(properties: Object): JQuery;
+
+    /**
+     * Get the current computed height for the first element in the set of matched elements.
+     */
+    height(): number;
+    /**
+     * Set the CSS height of every matched element.
+     *
+     * @param value An integer representing the number of pixels, or an integer with an optional unit of measure appended (as a string).
+     */
+    height(value: number|string): JQuery;
+    /**
+     * Set the CSS height of every matched element.
+     *
+     * @param func A function returning the height to set. Receives the index position of the element in the set and the old height as arguments. Within the function, this refers to the current element in the set.
+     */
+    height(func: (index: number, height: number) => number|string): JQuery;
+
+    /**
+     * Get the current computed height for the first element in the set of matched elements, including padding but not border.
+     */
+    innerHeight(): number;
+
+    /**
+     * Sets the inner height on elements in the set of matched elements, including padding but not border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     */
+    innerHeight(height: number|string): JQuery;
+    
+    /**
+     * Get the current computed width for the first element in the set of matched elements, including padding but not border.
+     */
+    innerWidth(): number;
+
+    /**
+     * Sets the inner width on elements in the set of matched elements, including padding but not border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     */
+    innerWidth(width: number|string): JQuery;
+    
+    /**
+     * Get the current coordinates of the first element in the set of matched elements, relative to the document.
+     */
+    offset(): JQueryCoordinates;
+    /**
+     * An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
+     *
+     * @param coordinates An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
+     */
+    offset(coordinates: JQueryCoordinates): JQuery;
+    /**
+     * An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
+     *
+     * @param func A function to return the coordinates to set. Receives the index of the element in the collection as the first argument and the current coordinates as the second argument. The function should return an object with the new top and left properties.
+     */
+    offset(func: (index: number, coords: JQueryCoordinates) => JQueryCoordinates): JQuery;
+
+    /**
+     * Get the current computed height for the first element in the set of matched elements, including padding, border, and optionally margin. Returns an integer (without "px") representation of the value or null if called on an empty set of elements.
+     *
+     * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation.
+     */
+    outerHeight(includeMargin?: boolean): number;
+
+    /**
+     * Sets the outer height on elements in the set of matched elements, including padding and border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     */
+    outerHeight(height: number|string): JQuery;
+
+    /**
+     * Get the current computed width for the first element in the set of matched elements, including padding and border.
+     *
+     * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation.
+     */
+    outerWidth(includeMargin?: boolean): number;
+
+    /**
+     * Sets the outer width on elements in the set of matched elements, including padding and border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     */
+    outerWidth(width: number|string): JQuery;
+
+    /**
+     * Get the current coordinates of the first element in the set of matched elements, relative to the offset parent.
+     */
+    position(): JQueryCoordinates;
+
+    /**
+     * Get the current horizontal position of the scroll bar for the first element in the set of matched elements or set the horizontal position of the scroll bar for every matched element.
+     */
+    scrollLeft(): number;
+    /**
+     * Set the current horizontal position of the scroll bar for each of the set of matched elements.
+     *
+     * @param value An integer indicating the new position to set the scroll bar to.
+     */
+    scrollLeft(value: number): JQuery;
+
+    /**
+     * Get the current vertical position of the scroll bar for the first element in the set of matched elements or set the vertical position of the scroll bar for every matched element.
+     */
+    scrollTop(): number;
+    /**
+     * Set the current vertical position of the scroll bar for each of the set of matched elements.
+     *
+     * @param value An integer indicating the new position to set the scroll bar to.
+     */
+    scrollTop(value: number): JQuery;
+
+    /**
+     * Get the current computed width for the first element in the set of matched elements.
+     */
+    width(): number;
+    /**
+     * Set the CSS width of each element in the set of matched elements.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     */
+    width(value: number|string): JQuery;
+    /**
+     * Set the CSS width of each element in the set of matched elements.
+     *
+     * @param func A function returning the width to set. Receives the index position of the element in the set and the old width as arguments. Within the function, this refers to the current element in the set.
+     */
+    width(func: (index: number, width: number) => number|string): JQuery;
+
+    /**
+     * Remove from the queue all items that have not yet been run.
+     *
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     */
+    clearQueue(queueName?: string): JQuery;
+
+    /**
+     * Store arbitrary data associated with the matched elements.
+     *
+     * @param key A string naming the piece of data to set.
+     * @param value The new data value; it can be any Javascript type including Array or Object.
+     */
+    data(key: string, value: any): JQuery;
+    /**
+     * Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute.
+     *
+     * @param key Name of the data stored.
+     */
+    data(key: string): any;
+    /**
+     * Store arbitrary data associated with the matched elements.
+     *
+     * @param obj An object of key-value pairs of data to update.
+     */
+    data(obj: { [key: string]: any; }): JQuery;
+    /**
+     * Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute.
+     */
+    data(): any;
+
+    /**
+     * Execute the next function on the queue for the matched elements.
+     *
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     */
+    dequeue(queueName?: string): JQuery;
+
+    /**
+     * Remove a previously-stored piece of data.
+     *
+     * @param name A string naming the piece of data to delete or space-separated string naming the pieces of data to delete.
+     */
+    removeData(name: string): JQuery;
+    /**
+     * Remove a previously-stored piece of data.
+     *
+     * @param list An array of strings naming the pieces of data to delete.
+     */
+    removeData(list: string[]): JQuery;
+    /**
+     * Remove all previously-stored piece of data.
+     */
+    removeData(): JQuery;
+
+    /**
+     * Return a Promise object to observe when all actions of a certain type bound to the collection, queued or not, have finished.
+     *
+     * @param type The type of queue that needs to be observed. (default: fx)
+     * @param target Object onto which the promise methods have to be attached
+     */
+    promise(type?: string, target?: Object): JQueryPromise<any>;
+
+    /**
+     * Perform a custom animation of a set of CSS properties.
+     *
+     * @param properties An object of CSS properties and values that the animation will move toward.
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     */
+    animate(properties: Object, duration?: string|number, complete?: Function): JQuery;
+    /**
+     * Perform a custom animation of a set of CSS properties.
+     *
+     * @param properties An object of CSS properties and values that the animation will move toward.
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition. (default: swing)
+     * @param complete A function to call once the animation is complete.
+     */
+    animate(properties: Object, duration?: string|number, easing?: string, complete?: Function): JQuery;
+    /**
+     * Perform a custom animation of a set of CSS properties.
+     *
+     * @param properties An object of CSS properties and values that the animation will move toward.
+     * @param options A map of additional options to pass to the method.
+     */
+    animate(properties: Object, options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Set a timer to delay execution of subsequent items in the queue.
+     *
+     * @param duration An integer indicating the number of milliseconds to delay execution of the next item in the queue.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     */
+    delay(duration: number, queueName?: string): JQuery;
+
+    /**
+     * Display the matched elements by fading them to opaque.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     */
+    fadeIn(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Display the matched elements by fading them to opaque.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     */
+    fadeIn(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Display the matched elements by fading them to opaque.
+     *
+     * @param options A map of additional options to pass to the method.
+     */
+    fadeIn(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Hide the matched elements by fading them to transparent.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     */
+    fadeOut(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Hide the matched elements by fading them to transparent.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     */
+    fadeOut(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Hide the matched elements by fading them to transparent.
+     *
+     * @param options A map of additional options to pass to the method.
+     */
+    fadeOut(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Adjust the opacity of the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param opacity A number between 0 and 1 denoting the target opacity.
+     * @param complete A function to call once the animation is complete.
+     */
+    fadeTo(duration: string|number, opacity: number, complete?: Function): JQuery;
+    /**
+     * Adjust the opacity of the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param opacity A number between 0 and 1 denoting the target opacity.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     */
+    fadeTo(duration: string|number, opacity: number, easing?: string, complete?: Function): JQuery;
+
+    /**
+     * Display or hide the matched elements by animating their opacity.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     */
+    fadeToggle(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Display or hide the matched elements by animating their opacity.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     */
+    fadeToggle(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Display or hide the matched elements by animating their opacity.
+     *
+     * @param options A map of additional options to pass to the method.
+     */
+    fadeToggle(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Stop the currently-running animation, remove all queued animations, and complete all animations for the matched elements.
+     *
+     * @param queue The name of the queue in which to stop animations.
+     */
+    finish(queue?: string): JQuery;
+
+    /**
+     * Hide the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     */
+    hide(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Hide the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     */
+    hide(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Hide the matched elements.
+     *
+     * @param options A map of additional options to pass to the method.
+     */
+    hide(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Display the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     */
+    show(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Display the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     */
+    show(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Display the matched elements.
+     *
+     * @param options A map of additional options to pass to the method.
+     */
+    show(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Display the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     */
+    slideDown(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Display the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     */
+    slideDown(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Display the matched elements with a sliding motion.
+     *
+     * @param options A map of additional options to pass to the method.
+     */
+    slideDown(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Display or hide the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     */
+    slideToggle(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Display or hide the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     */
+    slideToggle(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Display or hide the matched elements with a sliding motion.
+     *
+     * @param options A map of additional options to pass to the method.
+     */
+    slideToggle(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Hide the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     */
+    slideUp(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Hide the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     */
+    slideUp(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Hide the matched elements with a sliding motion.
+     *
+     * @param options A map of additional options to pass to the method.
+     */
+    slideUp(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Stop the currently-running animation on the matched elements.
+     *
+     * @param clearQueue A Boolean indicating whether to remove queued animation as well. Defaults to false.
+     * @param jumpToEnd A Boolean indicating whether to complete the current animation immediately. Defaults to false.
+     */
+    stop(clearQueue?: boolean, jumpToEnd?: boolean): JQuery;
+    /**
+     * Stop the currently-running animation on the matched elements.
+     *
+     * @param queue The name of the queue in which to stop animations.
+     * @param clearQueue A Boolean indicating whether to remove queued animation as well. Defaults to false.
+     * @param jumpToEnd A Boolean indicating whether to complete the current animation immediately. Defaults to false.
+     */
+    stop(queue?: string, clearQueue?: boolean, jumpToEnd?: boolean): JQuery;
+
+    /**
+     * Display or hide the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     */
+    toggle(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Display or hide the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     */
+    toggle(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Display or hide the matched elements.
+     *
+     * @param options A map of additional options to pass to the method.
+     */
+    toggle(options: JQueryAnimationOptions): JQuery;
+    /**
+     * Display or hide the matched elements.
+     *
+     * @param showOrHide A Boolean indicating whether to show or hide the elements.
+     */
+    toggle(showOrHide: boolean): JQuery;
+
+    /**
+     * Attach a handler to an event for the elements.
+     * 
+     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    bind(eventType: string, eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Attach a handler to an event for the elements.
+     * 
+     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    bind(eventType: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Attach a handler to an event for the elements.
+     * 
+     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param preventBubble Setting the third argument to false will attach a function that prevents the default action from occurring and stops the event from bubbling. The default is true.
+     */
+    bind(eventType: string, eventData: any, preventBubble: boolean): JQuery;
+    /**
+     * Attach a handler to an event for the elements.
+     * 
+     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+     * @param preventBubble Setting the third argument to false will attach a function that prevents the default action from occurring and stops the event from bubbling. The default is true.
+     */
+    bind(eventType: string, preventBubble: boolean): JQuery;
+    /**
+     * Attach a handler to an event for the elements.
+     * 
+     * @param events An object containing one or more DOM event types and functions to execute for them.
+     */
+    bind(events: any): JQuery;
+
+    /**
+     * Trigger the "blur" event on an element
+     */
+    blur(): JQuery;
+    /**
+     * Bind an event handler to the "blur" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    blur(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "blur" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    blur(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "change" event on an element.
+     */
+    change(): JQuery;
+    /**
+     * Bind an event handler to the "change" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    change(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "change" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    change(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "click" event on an element.
+     */
+    click(): JQuery;
+    /**
+     * Bind an event handler to the "click" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     */
+    click(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "click" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    click(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "dblclick" event on an element.
+     */
+    dblclick(): JQuery;
+    /**
+     * Bind an event handler to the "dblclick" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    dblclick(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "dblclick" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    dblclick(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    delegate(selector: any, eventType: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
+    delegate(selector: any, eventType: string, eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "focus" event on an element.
+     */
+    focus(): JQuery;
+    /**
+     * Bind an event handler to the "focus" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    focus(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "focus" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    focus(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "focusin" event on an element.
+     */
+    focusin(): JQuery;
+    /**
+     * Bind an event handler to the "focusin" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    focusin(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "focusin" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    focusin(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "focusout" event on an element.
+     */
+    focusout(): JQuery;
+    /**
+     * Bind an event handler to the "focusout" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    focusout(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "focusout" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    focusout(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Bind two handlers to the matched elements, to be executed when the mouse pointer enters and leaves the elements.
+     *
+     * @param handlerIn A function to execute when the mouse pointer enters the element.
+     * @param handlerOut A function to execute when the mouse pointer leaves the element.
+     */
+    hover(handlerIn: (eventObject: JQueryEventObject) => any, handlerOut: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind a single handler to the matched elements, to be executed when the mouse pointer enters or leaves the elements.
+     *
+     * @param handlerInOut A function to execute when the mouse pointer enters or leaves the element.
+     */
+    hover(handlerInOut: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "keydown" event on an element.
+     */
+    keydown(): JQuery;
+    /**
+     * Bind an event handler to the "keydown" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    keydown(handler: (eventObject: JQueryKeyEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "keydown" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    keydown(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "keypress" event on an element.
+     */
+    keypress(): JQuery;
+    /**
+     * Bind an event handler to the "keypress" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    keypress(handler: (eventObject: JQueryKeyEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "keypress" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    keypress(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "keyup" event on an element.
+     */
+    keyup(): JQuery;
+    /**
+     * Bind an event handler to the "keyup" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    keyup(handler: (eventObject: JQueryKeyEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "keyup" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    keyup(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): JQuery;
+
+    /**
+     * Bind an event handler to the "load" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     */
+    load(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "load" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     */
+    load(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "mousedown" event on an element.
+     */
+    mousedown(): JQuery;
+    /**
+     * Bind an event handler to the "mousedown" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     */
+    mousedown(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "mousedown" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     */
+    mousedown(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "mouseenter" event on an element.
+     */
+    mouseenter(): JQuery;
+    /**
+     * Bind an event handler to be fired when the mouse enters an element.
+     *
+     * @param handler A function to execute when the event is triggered.
+     */
+    mouseenter(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to be fired when the mouse enters an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     */
+    mouseenter(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "mouseleave" event on an element.
+     */
+    mouseleave(): JQuery;
+    /**
+     * Bind an event handler to be fired when the mouse leaves an element.
+     *
+     * @param handler A function to execute when the event is triggered.
+     */
+    mouseleave(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to be fired when the mouse leaves an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     */
+    mouseleave(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "mousemove" event on an element.
+     */
+    mousemove(): JQuery;
+    /**
+     * Bind an event handler to the "mousemove" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     */
+    mousemove(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "mousemove" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     */
+    mousemove(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "mouseout" event on an element.
+     */
+    mouseout(): JQuery;
+    /**
+     * Bind an event handler to the "mouseout" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     */
+    mouseout(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "mouseout" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     */
+    mouseout(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "mouseover" event on an element.
+     */
+    mouseover(): JQuery;
+    /**
+     * Bind an event handler to the "mouseover" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     */
+    mouseover(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "mouseover" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     */
+    mouseover(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "mouseup" event on an element.
+     */
+    mouseup(): JQuery;
+    /**
+     * Bind an event handler to the "mouseup" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     */
+    mouseup(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "mouseup" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     */
+    mouseup(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     */
+    off(): JQuery;
+    /**
+     * Remove an event handler.
+     *
+     * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin".
+     * @param selector A selector which should match the one originally passed to .on() when attaching event handlers.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: string, selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Remove an event handler.
+     *
+     * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin".
+     * @param handler A handler function previously attached for the event(s), or the special value false. Takes handler with extra args that can be attached with on().
+     */
+    off(events: string, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+    /**
+     * Remove an event handler.
+     *
+     * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin".
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Remove an event handler.
+     *
+     * @param events An object where the string keys represent one or more space-separated event types and optional namespaces, and the values represent handler functions previously attached for the event(s).
+     * @param selector A selector which should match the one originally passed to .on() when attaching event handlers.
+     */
+    off(events: { [key: string]: any; }, selector?: string): JQuery;
+
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: string, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: string, data : any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: string, selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: string, selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
+     * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If the selector is null or omitted, the handler is always called when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event occurs.
+     */
+    on(events: { [key: string]: any; }, selector?: string, data?: any): JQuery;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
+     * @param data Data to be passed to the handler in event.data when an event occurs.
+     */
+    on(events: { [key: string]: any; }, data?: any): JQuery;
+
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events A string containing one or more JavaScript event types, such as "click" or "submit," or custom event names.
+     * @param handler A function to execute at the time the event is triggered.
+     */
+    one(events: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events A string containing one or more JavaScript event types, such as "click" or "submit," or custom event names.
+     * @param data An object containing data that will be passed to the event handler.
+     * @param handler A function to execute at the time the event is triggered.
+     */
+    one(events: string, data: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    one(events: string, selector: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    one(events: string, selector: string, data: any, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
+     * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If the selector is null or omitted, the handler is always called when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event occurs.
+     */
+    one(events: { [key: string]: any; }, selector?: string, data?: any): JQuery;
+
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
+     * @param data Data to be passed to the handler in event.data when an event occurs.
+     */
+    one(events: { [key: string]: any; }, data?: any): JQuery;
+
+
+    /**
+     * Specify a function to execute when the DOM is fully loaded.
+     *
+     * @param handler A function to execute after the DOM is ready.
+     */
+    ready(handler: (jQueryAlias?: JQueryStatic) => any): JQuery;
+
+    /**
+     * Trigger the "resize" event on an element.
+     */
+    resize(): JQuery;
+    /**
+     * Bind an event handler to the "resize" JavaScript event.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    resize(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "resize" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    resize(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "scroll" event on an element.
+     */
+    scroll(): JQuery;
+    /**
+     * Bind an event handler to the "scroll" JavaScript event.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    scroll(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "scroll" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    scroll(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "select" event on an element.
+     */
+    select(): JQuery;
+    /**
+     * Bind an event handler to the "select" JavaScript event.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    select(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "select" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    select(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "submit" event on an element.
+     */
+    submit(): JQuery;
+    /**
+     * Bind an event handler to the "submit" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     */
+    submit(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "submit" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     */
+    submit(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Execute all handlers and behaviors attached to the matched elements for the given event type.
+     * 
+     * @param eventType A string containing a JavaScript event type, such as click or submit.
+     * @param extraParameters Additional parameters to pass along to the event handler.
+     */
+    trigger(eventType: string, extraParameters?: any[]|Object): JQuery;
+    /**
+     * Execute all handlers and behaviors attached to the matched elements for the given event type.
+     * 
+     * @param event A jQuery.Event object.
+     * @param extraParameters Additional parameters to pass along to the event handler.
+     */
+    trigger(event: JQueryEventObject, extraParameters?: any[]|Object): JQuery;
+
+    /**
+     * Execute all handlers attached to an element for an event.
+     * 
+     * @param eventType A string containing a JavaScript event type, such as click or submit.
+     * @param extraParameters An array of additional parameters to pass along to the event handler.
+     */
+    triggerHandler(eventType: string, ...extraParameters: any[]): Object;
+
+    /**
+     * Execute all handlers attached to an element for an event.
+     * 
+     * @param event A jQuery.Event object.
+     * @param extraParameters An array of additional parameters to pass along to the event handler.
+     */
+    triggerHandler(event: JQueryEventObject, ...extraParameters: any[]): Object;
+
+    /**
+     * Remove a previously-attached event handler from the elements.
+     * 
+     * @param eventType A string containing a JavaScript event type, such as click or submit.
+     * @param handler The function that is to be no longer executed.
+     */
+    unbind(eventType?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Remove a previously-attached event handler from the elements.
+     * 
+     * @param eventType A string containing a JavaScript event type, such as click or submit.
+     * @param fls Unbinds the corresponding 'return false' function that was bound using .bind( eventType, false ).
+     */
+    unbind(eventType: string, fls: boolean): JQuery;
+    /**
+     * Remove a previously-attached event handler from the elements.
+     * 
+     * @param evt A JavaScript event object as passed to an event handler.
+     */
+    unbind(evt: any): JQuery;
+
+    /**
+     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
+     */
+    undelegate(): JQuery;
+    /**
+     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
+     * 
+     * @param selector A selector which will be used to filter the event results.
+     * @param eventType A string containing a JavaScript event type, such as "click" or "keydown"
+     * @param handler A function to execute at the time the event is triggered.
+     */
+    undelegate(selector: string, eventType: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
+     * 
+     * @param selector A selector which will be used to filter the event results.
+     * @param events An object of one or more event types and previously bound functions to unbind from them.
+     */
+    undelegate(selector: string, events: Object): JQuery;
+    /**
+     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
+     * 
+     * @param namespace A string containing a namespace to unbind all events from.
+     */
+    undelegate(namespace: string): JQuery;
+
+    /**
+     * Bind an event handler to the "unload" JavaScript event. (DEPRECATED from v1.8)
+     * 
+     * @param handler A function to execute when the event is triggered.
+     */
+    unload(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "unload" JavaScript event. (DEPRECATED from v1.8)
+     * 
+     * @param eventData A plain object of data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     */
+    unload(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * The DOM node context originally passed to jQuery(); if none was passed then context will likely be the document. (DEPRECATED from v1.10)
+     */
+    context: Element;
+
+    jquery: string;
+
+    /**
+     * Bind an event handler to the "error" JavaScript event. (DEPRECATED from v1.8)
+     * 
+     * @param handler A function to execute when the event is triggered.
+     */
+    error(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "error" JavaScript event. (DEPRECATED from v1.8)
+     * 
+     * @param eventData A plain object of data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     */
+    error(eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Add a collection of DOM elements onto the jQuery stack.
+     * 
+     * @param elements An array of elements to push onto the stack and make into a new jQuery object.
+     */
+    pushStack(elements: any[]): JQuery;
+    /**
+     * Add a collection of DOM elements onto the jQuery stack.
+     * 
+     * @param elements An array of elements to push onto the stack and make into a new jQuery object.
+     * @param name The name of a jQuery method that generated the array of elements.
+     * @param arguments The arguments that were passed in to the jQuery method (for serialization).
+     */
+    pushStack(elements: any[], name: string, arguments: any[]): JQuery;
+
+    /**
+     * Insert content, specified by the parameter, after each element in the set of matched elements.
+     * 
+     * param content1 HTML string, DOM element, array of elements, or jQuery object to insert after each element in the set of matched elements.
+     * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert after each element in the set of matched elements.
+     */
+    after(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): JQuery;
+    /**
+     * Insert content, specified by the parameter, after each element in the set of matched elements.
+     * 
+     * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert after each element in the set of matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
+     */
+    after(func: (index: number, html: string) => string|Element|JQuery): JQuery;
+
+    /**
+     * Insert content, specified by the parameter, to the end of each element in the set of matched elements.
+     * 
+     * param content1 DOM element, array of elements, HTML string, or jQuery object to insert at the end of each element in the set of matched elements.
+     * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the end of each element in the set of matched elements.
+     */
+    append(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): JQuery;
+    /**
+     * Insert content, specified by the parameter, to the end of each element in the set of matched elements.
+     * 
+     * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert at the end of each element in the set of matched elements. Receives the index position of the element in the set and the old HTML value of the element as arguments. Within the function, this refers to the current element in the set.
+     */
+    append(func: (index: number, html: string) => string|Element|JQuery): JQuery;
+
+    /**
+     * Insert every element in the set of matched elements to the end of the target.
+     * 
+     * @param target A selector, element, HTML string, array of elements, or jQuery object; the matched set of elements will be inserted at the end of the element(s) specified by this parameter.
+     */
+    appendTo(target: JQuery|any[]|Element|string): JQuery;
+
+    /**
+     * Insert content, specified by the parameter, before each element in the set of matched elements.
+     * 
+     * param content1 HTML string, DOM element, array of elements, or jQuery object to insert before each element in the set of matched elements.
+     * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert before each element in the set of matched elements.
+     */
+    before(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): JQuery;
+    /**
+     * Insert content, specified by the parameter, before each element in the set of matched elements.
+     * 
+     * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert before each element in the set of matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
+     */
+    before(func: (index: number, html: string) => string|Element|JQuery): JQuery;
+
+    /**
+     * Create a deep copy of the set of matched elements.
+     * 
+     * param withDataAndEvents A Boolean indicating whether event handlers and data should be copied along with the elements. The default value is false.
+     * param deepWithDataAndEvents A Boolean indicating whether event handlers and data for all children of the cloned element should be copied. By default its value matches the first argument's value (which defaults to false).
+     */
+    clone(withDataAndEvents?: boolean, deepWithDataAndEvents?: boolean): JQuery;
+
+    /**
+     * Remove the set of matched elements from the DOM.
+     * 
+     * param selector A selector expression that filters the set of matched elements to be removed.
+     */
+    detach(selector?: string): JQuery;
+
+    /**
+     * Remove all child nodes of the set of matched elements from the DOM.
+     */
+    empty(): JQuery;
+
+    /**
+     * Insert every element in the set of matched elements after the target.
+     * 
+     * param target A selector, element, array of elements, HTML string, or jQuery object; the matched set of elements will be inserted after the element(s) specified by this parameter.
+     */
+    insertAfter(target: JQuery|any[]|Element|Text|string): JQuery;
+
+    /**
+     * Insert every element in the set of matched elements before the target.
+     * 
+     * param target A selector, element, array of elements, HTML string, or jQuery object; the matched set of elements will be inserted before the element(s) specified by this parameter.
+     */
+    insertBefore(target: JQuery|any[]|Element|Text|string): JQuery;
+
+    /**
+     * Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.
+     * 
+     * param content1 DOM element, array of elements, HTML string, or jQuery object to insert at the beginning of each element in the set of matched elements.
+     * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the beginning of each element in the set of matched elements.
+     */
+    prepend(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): JQuery;
+    /**
+     * Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.
+     * 
+     * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert at the beginning of each element in the set of matched elements. Receives the index position of the element in the set and the old HTML value of the element as arguments. Within the function, this refers to the current element in the set.
+     */
+    prepend(func: (index: number, html: string) => string|Element|JQuery): JQuery;
+
+    /**
+     * Insert every element in the set of matched elements to the beginning of the target.
+     * 
+     * @param target A selector, element, HTML string, array of elements, or jQuery object; the matched set of elements will be inserted at the beginning of the element(s) specified by this parameter.
+     */
+    prependTo(target: JQuery|any[]|Element|string): JQuery;
+
+    /**
+     * Remove the set of matched elements from the DOM.
+     * 
+     * @param selector A selector expression that filters the set of matched elements to be removed.
+     */
+    remove(selector?: string): JQuery;
+
+    /**
+     * Replace each target element with the set of matched elements.
+     * 
+     * @param target A selector string, jQuery object, DOM element, or array of elements indicating which element(s) to replace.
+     */
+    replaceAll(target: JQuery|any[]|Element|string): JQuery;
+
+    /**
+     * Replace each element in the set of matched elements with the provided new content and return the set of elements that was removed.
+     * 
+     * param newContent The content to insert. May be an HTML string, DOM element, array of DOM elements, or jQuery object.
+     */
+    replaceWith(newContent: JQuery|any[]|Element|Text|string): JQuery;
+    /**
+     * Replace each element in the set of matched elements with the provided new content and return the set of elements that was removed.
+     * 
+     * param func A function that returns content with which to replace the set of matched elements.
+     */
+    replaceWith(func: () => Element|JQuery): JQuery;
+
+    /**
+     * Get the combined text contents of each element in the set of matched elements, including their descendants.
+     */
+    text(): string;
+    /**
+     * Set the content of each element in the set of matched elements to the specified text.
+     * 
+     * @param text The text to set as the content of each matched element. When Number or Boolean is supplied, it will be converted to a String representation.
+     */
+    text(text: string|number|boolean): JQuery;
+    /**
+     * Set the content of each element in the set of matched elements to the specified text.
+     * 
+     * @param func A function returning the text content to set. Receives the index position of the element in the set and the old text value as arguments.
+     */
+    text(func: (index: number, text: string) => string): JQuery;
+
+    /**
+     * Retrieve all the elements contained in the jQuery set, as an array.
+     */
+    toArray(): any[];
+
+    /**
+     * Remove the parents of the set of matched elements from the DOM, leaving the matched elements in their place.
+     */
+    unwrap(): JQuery;
+
+    /**
+     * Wrap an HTML structure around each element in the set of matched elements.
+     * 
+     * @param wrappingElement A selector, element, HTML string, or jQuery object specifying the structure to wrap around the matched elements.
+     */
+    wrap(wrappingElement: JQuery|Element|string): JQuery;
+    /**
+     * Wrap an HTML structure around each element in the set of matched elements.
+     * 
+     * @param func A callback function returning the HTML content or jQuery object to wrap around the matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
+     */
+    wrap(func: (index: number) => string|JQuery): JQuery;
+
+    /**
+     * Wrap an HTML structure around all elements in the set of matched elements.
+     * 
+     * @param wrappingElement A selector, element, HTML string, or jQuery object specifying the structure to wrap around the matched elements.
+     */
+    wrapAll(wrappingElement: JQuery|Element|string): JQuery;
+    wrapAll(func: (index: number) => string): JQuery;
+
+    /**
+     * Wrap an HTML structure around the content of each element in the set of matched elements.
+     * 
+     * @param wrappingElement An HTML snippet, selector expression, jQuery object, or DOM element specifying the structure to wrap around the content of the matched elements.
+     */
+    wrapInner(wrappingElement: JQuery|Element|string): JQuery;
+    /**
+     * Wrap an HTML structure around the content of each element in the set of matched elements.
+     * 
+     * @param func A callback function which generates a structure to wrap around the content of the matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
+     */
+    wrapInner(func: (index: number) => string): JQuery;
+
+    /**
+     * Iterate over a jQuery object, executing a function for each matched element.
+     * 
+     * @param func A function to execute for each matched element.
+     */
+    each(func: (index: number, elem: Element) => any): JQuery;
+
+    /**
+     * Retrieve one of the elements matched by the jQuery object.
+     * 
+     * @param index A zero-based integer indicating which element to retrieve.
+     */
+    get(index: number): HTMLElement;
+    /**
+     * Retrieve the elements matched by the jQuery object.
+     */
+    get(): any[];
+
+    /**
+     * Search for a given element from among the matched elements.
+     */
+    index(): number;
+    /**
+     * Search for a given element from among the matched elements.
+     * 
+     * @param selector A selector representing a jQuery collection in which to look for an element.
+     */
+    index(selector: string|JQuery|Element): number;
+
+    /**
+     * The number of elements in the jQuery object.
+     */
+    length: number;
+    /**
+     * A selector representing selector passed to jQuery(), if any, when creating the original set.
+     * version deprecated: 1.7, removed: 1.9
+     */
+    selector: string;
+    [index: string]: any;
+    [index: number]: HTMLElement;
+
+    /**
+     * Add elements to the set of matched elements.
+     * 
+     * @param selector A string representing a selector expression to find additional elements to add to the set of matched elements.
+     * @param context The point in the document at which the selector should begin matching; similar to the context argument of the $(selector, context) method.
+     */
+    add(selector: string, context?: Element): JQuery;
+    /**
+     * Add elements to the set of matched elements.
+     * 
+     * @param elements One or more elements to add to the set of matched elements.
+     */
+    add(...elements: Element[]): JQuery;
+    /**
+     * Add elements to the set of matched elements.
+     * 
+     * @param html An HTML fragment to add to the set of matched elements.
+     */
+    add(html: string): JQuery;
+    /**
+     * Add elements to the set of matched elements.
+     * 
+     * @param obj An existing jQuery object to add to the set of matched elements.
+     */
+    add(obj: JQuery): JQuery;
+
+    /**
+     * Get the children of each element in the set of matched elements, optionally filtered by a selector.
+     * 
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    children(selector?: string): JQuery;
+
+    /**
+     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
+     * 
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    closest(selector: string): JQuery;
+    /**
+     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
+     * 
+     * @param selector A string containing a selector expression to match elements against.
+     * @param context A DOM element within which a matching element may be found. If no context is passed in then the context of the jQuery set will be used instead.
+     */
+    closest(selector: string, context?: Element): JQuery;
+    /**
+     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
+     * 
+     * @param obj A jQuery object to match elements against.
+     */
+    closest(obj: JQuery): JQuery;
+    /**
+     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
+     * 
+     * @param element An element to match elements against.
+     */
+    closest(element: Element): JQuery;
+
+    /**
+     * Get an array of all the elements and selectors matched against the current element up through the DOM tree.
+     * 
+     * @param selectors An array or string containing a selector expression to match elements against (can also be a jQuery object).
+     * @param context A DOM element within which a matching element may be found. If no context is passed in then the context of the jQuery set will be used instead.
+     */
+    closest(selectors: any, context?: Element): any[];
+
+    /**
+     * Get the children of each element in the set of matched elements, including text and comment nodes.
+     */
+    contents(): JQuery;
+
+    /**
+     * End the most recent filtering operation in the current chain and return the set of matched elements to its previous state.
+     */
+    end(): JQuery;
+
+    /**
+     * Reduce the set of matched elements to the one at the specified index.
+     * 
+     * @param index An integer indicating the 0-based position of the element. OR An integer indicating the position of the element, counting backwards from the last element in the set.
+     *  
+     */
+    eq(index: number): JQuery;
+
+    /**
+     * Reduce the set of matched elements to those that match the selector or pass the function's test.
+     * 
+     * @param selector A string containing a selector expression to match the current set of elements against.
+     */
+    filter(selector: string): JQuery;
+    /**
+     * Reduce the set of matched elements to those that match the selector or pass the function's test.
+     * 
+     * @param func A function used as a test for each element in the set. this is the current DOM element.
+     */
+    filter(func: (index: number, element: Element) => any): JQuery;
+    /**
+     * Reduce the set of matched elements to those that match the selector or pass the function's test.
+     * 
+     * @param element An element to match the current set of elements against.
+     */
+    filter(element: Element): JQuery;
+    /**
+     * Reduce the set of matched elements to those that match the selector or pass the function's test.
+     * 
+     * @param obj An existing jQuery object to match the current set of elements against.
+     */
+    filter(obj: JQuery): JQuery;
+
+    /**
+     * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.
+     * 
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    find(selector: string): JQuery;
+    /**
+     * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.
+     * 
+     * @param element An element to match elements against.
+     */
+    find(element: Element): JQuery;
+    /**
+     * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.
+     * 
+     * @param obj A jQuery object to match elements against.
+     */
+    find(obj: JQuery): JQuery;
+
+    /**
+     * Reduce the set of matched elements to the first in the set.
+     */
+    first(): JQuery;
+
+    /**
+     * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.
+     * 
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    has(selector: string): JQuery;
+    /**
+     * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.
+     * 
+     * @param contained A DOM element to match elements against.
+     */
+    has(contained: Element): JQuery;
+
+    /**
+     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
+     * 
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    is(selector: string): boolean;
+    /**
+     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
+     * 
+     * @param func A function used as a test for the set of elements. It accepts one argument, index, which is the element's index in the jQuery collection.Within the function, this refers to the current DOM element.
+     */
+    is(func: (index: number, element: Element) => boolean): boolean;
+    /**
+     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
+     * 
+     * @param obj An existing jQuery object to match the current set of elements against.
+     */
+    is(obj: JQuery): boolean;
+    /**
+     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
+     * 
+     * @param elements One or more elements to match the current set of elements against.
+     */
+    is(elements: any): boolean;
+
+    /**
+     * Reduce the set of matched elements to the final one in the set.
+     */
+    last(): JQuery;
+
+    /**
+     * Pass each element in the current matched set through a function, producing a new jQuery object containing the return values.
+     * 
+     * @param callback A function object that will be invoked for each element in the current set.
+     */
+    map(callback: (index: number, domElement: Element) => any): JQuery;
+
+    /**
+     * Get the immediately following sibling of each element in the set of matched elements. If a selector is provided, it retrieves the next sibling only if it matches that selector.
+     * 
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    next(selector?: string): JQuery;
+
+    /**
+     * Get all following siblings of each element in the set of matched elements, optionally filtered by a selector.
+     * 
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    nextAll(selector?: string): JQuery;
+
+    /**
+     * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.
+     * 
+     * @param selector A string containing a selector expression to indicate where to stop matching following sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     */
+    nextUntil(selector?: string, filter?: string): JQuery;
+    /**
+     * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.
+     * 
+     * @param element A DOM node or jQuery object indicating where to stop matching following sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     */
+    nextUntil(element?: Element, filter?: string): JQuery;
+    /**
+     * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.
+     * 
+     * @param obj A DOM node or jQuery object indicating where to stop matching following sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     */
+    nextUntil(obj?: JQuery, filter?: string): JQuery;
+
+    /**
+     * Remove elements from the set of matched elements.
+     * 
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    not(selector: string): JQuery;
+    /**
+     * Remove elements from the set of matched elements.
+     * 
+     * @param func A function used as a test for each element in the set. this is the current DOM element.
+     */
+    not(func: (index: number, element: Element) => boolean): JQuery;
+    /**
+     * Remove elements from the set of matched elements.
+     * 
+     * @param elements One or more DOM elements to remove from the matched set.
+     */
+    not(elements: Element|Element[]): JQuery;
+    /**
+     * Remove elements from the set of matched elements.
+     * 
+     * @param obj An existing jQuery object to match the current set of elements against.
+     */
+    not(obj: JQuery): JQuery;
+
+    /**
+     * Get the closest ancestor element that is positioned.
+     */
+    offsetParent(): JQuery;
+
+    /**
+     * Get the parent of each element in the current set of matched elements, optionally filtered by a selector.
+     * 
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    parent(selector?: string): JQuery;
+
+    /**
+     * Get the ancestors of each element in the current set of matched elements, optionally filtered by a selector.
+     * 
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    parents(selector?: string): JQuery;
+
+    /**
+     * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.
+     * 
+     * @param selector A string containing a selector expression to indicate where to stop matching ancestor elements.
+     * @param filter A string containing a selector expression to match elements against.
+     */
+    parentsUntil(selector?: string, filter?: string): JQuery;
+    /**
+     * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.
+     * 
+     * @param element A DOM node or jQuery object indicating where to stop matching ancestor elements.
+     * @param filter A string containing a selector expression to match elements against.
+     */
+    parentsUntil(element?: Element, filter?: string): JQuery;
+    /**
+     * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.
+     * 
+     * @param obj A DOM node or jQuery object indicating where to stop matching ancestor elements.
+     * @param filter A string containing a selector expression to match elements against.
+     */
+    parentsUntil(obj?: JQuery, filter?: string): JQuery;
+
+    /**
+     * Get the immediately preceding sibling of each element in the set of matched elements, optionally filtered by a selector.
+     * 
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    prev(selector?: string): JQuery;
+
+    /**
+     * Get all preceding siblings of each element in the set of matched elements, optionally filtered by a selector.
+     * 
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    prevAll(selector?: string): JQuery;
+
+    /**
+     * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.
+     * 
+     * @param selector A string containing a selector expression to indicate where to stop matching preceding sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     */
+    prevUntil(selector?: string, filter?: string): JQuery;
+    /**
+     * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.
+     * 
+     * @param element A DOM node or jQuery object indicating where to stop matching preceding sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     */
+    prevUntil(element?: Element, filter?: string): JQuery;
+    /**
+     * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.
+     * 
+     * @param obj A DOM node or jQuery object indicating where to stop matching preceding sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     */
+    prevUntil(obj?: JQuery, filter?: string): JQuery;
+
+    /**
+     * Get the siblings of each element in the set of matched elements, optionally filtered by a selector.
+     * 
+     * @param selector A string containing a selector expression to match elements against.
+     */
+    siblings(selector?: string): JQuery;
+
+    /**
+     * Reduce the set of matched elements to a subset specified by a range of indices.
+     * 
+     * @param start An integer indicating the 0-based position at which the elements begin to be selected. If negative, it indicates an offset from the end of the set.
+     * @param end An integer indicating the 0-based position at which the elements stop being selected. If negative, it indicates an offset from the end of the set. If omitted, the range continues until the end of the set.
+     */
+    slice(start: number, end?: number): JQuery;
+
+    /**
+     * Show the queue of functions to be executed on the matched elements.
+     * 
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     */
+    queue(queueName?: string): any[];
+    /**
+     * Manipulate the queue of functions to be executed, once for each matched element.
+     * 
+     * @param newQueue An array of functions to replace the current queue contents.
+     */
+    queue(newQueue: Function[]): JQuery;
+    /**
+     * Manipulate the queue of functions to be executed, once for each matched element.
+     * 
+     * @param callback The new function to add to the queue, with a function to call that will dequeue the next item.
+     */
+    queue(callback: Function): JQuery;
+    /**
+     * Manipulate the queue of functions to be executed, once for each matched element.
+     * 
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @param newQueue An array of functions to replace the current queue contents.
+     */
+    queue(queueName: string, newQueue: Function[]): JQuery;
+    /**
+     * Manipulate the queue of functions to be executed, once for each matched element.
+     * 
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @param callback The new function to add to the queue, with a function to call that will dequeue the next item.
+     */
+    queue(queueName: string, callback: Function): JQuery;
+}
+declare module "jquery" {
+    export = $;
+}
+declare var jQuery: JQueryStatic;
+declare var $: JQueryStatic;
diff --git a/jquery/jquery-tests.ts b/jquery/jquery-tests.ts
index ecd9266b45..0df8a74e39 100644
--- a/jquery/jquery-tests.ts
+++ b/jquery/jquery-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jquery.d.ts" />
+
 
 function test_add() {
     $("p").add("div").addClass("widget");
@@ -1039,7 +1039,6 @@ function test_css() {
 function test_cssHooks() {
     if (!$.cssHooks) {
         throw ("jQuery 1.4.3 or above is required for this plugin to work");
-        return;
     }
     $.cssHooks["someCSSProp"] = {
         get: function (elem, computed, extra) { },
@@ -2528,6 +2527,18 @@ function test_jQuery() {
     $.post('url.xml', function (data) {
         var $child = $(data).find('child');
     });
+    $.post({
+        url: "test.php",
+        success : () => {
+            console.log("successfull");
+        }
+    });
+    $.get({
+        url: "test.php",
+        success : () => {
+            console.log("successfull");
+        }
+    });
     var foo = { foo: 'bar', hello: 'world' };
     var $foo = $(foo);
     var test1 = $foo.prop('foo');
diff --git a/jquery/jquery-tests.ts.tscparams b/jquery/jquery-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jquery/jquery-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jquery/jquery.d.ts b/jquery/jquery.d.ts
deleted file mode 100644
index 51a2773bf2..0000000000
--- a/jquery/jquery.d.ts
+++ /dev/null
@@ -1,3210 +0,0 @@
-// Type definitions for jQuery 1.10.x / 2.0.x
-// Project: http://jquery.com/
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Christian Hoffmeister <https://github.com/choffmeister>, Steve Fenton <https://github.com/Steve-Fenton>, Diullei Gomes <https://github.com/Diullei>, Tass Iliopoulos <https://github.com/tasoili>, Jason Swearingen <https://github.com/jasons-novaleaf>, Sean Hill <https://github.com/seanski>, Guus Goossens <https://github.com/Guuz>, Kelly Summerlin <https://github.com/ksummerlin>, Basarat Ali Syed <https://github.com/basarat>, Nicholas Wolverson <https://github.com/nwolverson>, Derek Cicerone <https://github.com/derekcicerone>, Andrew Gaspar <https://github.com/AndrewGaspar>, James Harrison Fisher <https://github.com/jameshfisher>, Seikichi Kondo <https://github.com/seikichi>, Benjamin Jackman <https://github.com/benjaminjackman>, Poul Sorensen <https://github.com/s093294>, Josh Strobl <https://github.com/JoshStrobl>, John Reilly <https://github.com/johnnyreilly/>, Dick van den Brink <https://github.com/DickvdBrink>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/* *****************************************************************************
-Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0
-
-THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-MERCHANTABLITY OR NON-INFRINGEMENT.
-
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-***************************************************************************** */
-
-
-/**
- * Interface for the AJAX setting that will configure the AJAX request
- */
-interface JQueryAjaxSettings {
-    /**
-     * The content type sent in the request header that tells the server what kind of response it will accept in return. If the accepts setting needs modification, it is recommended to do so once in the $.ajaxSetup() method.
-     */
-    accepts?: any;
-    /**
-     * By default, all requests are sent asynchronously (i.e. this is set to true by default). If you need synchronous requests, set this option to false. Cross-domain requests and dataType: "jsonp" requests do not support synchronous operation. Note that synchronous requests may temporarily lock the browser, disabling any actions while the request is active. As of jQuery 1.8, the use of async: false with jqXHR ($.Deferred) is deprecated; you must use the success/error/complete callback options instead of the corresponding methods of the jqXHR object such as jqXHR.done() or the deprecated jqXHR.success().
-     */
-    async?: boolean;
-    /**
-     * A pre-request callback function that can be used to modify the jqXHR (in jQuery 1.4.x, XMLHTTPRequest) object before it is sent. Use this to set custom headers, etc. The jqXHR and settings objects are passed as arguments. This is an Ajax Event. Returning false in the beforeSend function will cancel the request. As of jQuery 1.5, the beforeSend option will be called regardless of the type of request.
-     */
-    beforeSend? (jqXHR: JQueryXHR, settings: JQueryAjaxSettings): any;
-    /**
-     * If set to false, it will force requested pages not to be cached by the browser. Note: Setting cache to false will only work correctly with HEAD and GET requests. It works by appending "_={timestamp}" to the GET parameters. The parameter is not needed for other types of requests, except in IE8 when a POST is made to a URL that has already been requested by a GET.
-     */
-    cache?: boolean;
-    /**
-     * A function to be called when the request finishes (after success and error callbacks are executed). The function gets passed two arguments: The jqXHR (in jQuery 1.4.x, XMLHTTPRequest) object and a string categorizing the status of the request ("success", "notmodified", "error", "timeout", "abort", or "parsererror"). As of jQuery 1.5, the complete setting can accept an array of functions. Each function will be called in turn. This is an Ajax Event.
-     */
-    complete? (jqXHR: JQueryXHR, textStatus: string): any;
-    /**
-     * An object of string/regular-expression pairs that determine how jQuery will parse the response, given its content type. (version added: 1.5)
-     */
-    contents?: { [key: string]: any; };
-    //According to jQuery.ajax source code, ajax's option actually allows contentType to set to "false"
-    // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/742
-    /**
-     * When sending data to the server, use this content type. Default is "application/x-www-form-urlencoded; charset=UTF-8", which is fine for most cases. If you explicitly pass in a content-type to $.ajax(), then it is always sent to the server (even if no data is sent). The W3C XMLHttpRequest specification dictates that the charset is always UTF-8; specifying another charset will not force the browser to change the encoding.
-     */
-    contentType?: any;
-    /**
-     * This object will be made the context of all Ajax-related callbacks. By default, the context is an object that represents the ajax settings used in the call ($.ajaxSettings merged with the settings passed to $.ajax).
-     */
-    context?: any;
-    /**
-     * An object containing dataType-to-dataType converters. Each converter's value is a function that returns the transformed value of the response. (version added: 1.5)
-     */
-    converters?: { [key: string]: any; };
-    /**
-     * If you wish to force a crossDomain request (such as JSONP) on the same domain, set the value of crossDomain to true. This allows, for example, server-side redirection to another domain. (version added: 1.5)
-     */
-    crossDomain?: boolean;
-    /**
-     * Data to be sent to the server. It is converted to a query string, if not already a string. It's appended to the url for GET-requests. See processData option to prevent this automatic processing. Object must be Key/Value pairs. If value is an Array, jQuery serializes multiple values with same key based on the value of the traditional setting (described below).
-     */
-    data?: any;
-    /**
-     * A function to be used to handle the raw response data of XMLHttpRequest.This is a pre-filtering function to sanitize the response. You should return the sanitized data. The function accepts two arguments: The raw data returned from the server and the 'dataType' parameter.
-     */
-    dataFilter? (data: any, ty: any): any;
-    /**
-     * The type of data that you're expecting back from the server. If none is specified, jQuery will try to infer it based on the MIME type of the response (an XML MIME type will yield XML, in 1.4 JSON will yield a JavaScript object, in 1.4 script will execute the script, and anything else will be returned as a string). 
-     */
-    dataType?: string;
-    /**
-     * A function to be called if the request fails. The function receives three arguments: The jqXHR (in jQuery 1.4.x, XMLHttpRequest) object, a string describing the type of error that occurred and an optional exception object, if one occurred. Possible values for the second argument (besides null) are "timeout", "error", "abort", and "parsererror". When an HTTP error occurs, errorThrown receives the textual portion of the HTTP status, such as "Not Found" or "Internal Server Error." As of jQuery 1.5, the error setting can accept an array of functions. Each function will be called in turn. Note: This handler is not called for cross-domain script and cross-domain JSONP requests. This is an Ajax Event.
-     */
-    error? (jqXHR: JQueryXHR, textStatus: string, errorThrown: string): any;
-    /**
-     * Whether to trigger global Ajax event handlers for this request. The default is true. Set to false to prevent the global handlers like ajaxStart or ajaxStop from being triggered. This can be used to control various Ajax Events.
-     */
-    global?: boolean;
-    /**
-     * An object of additional header key/value pairs to send along with requests using the XMLHttpRequest transport. The header X-Requested-With: XMLHttpRequest is always added, but its default XMLHttpRequest value can be changed here. Values in the headers setting can also be overwritten from within the beforeSend function. (version added: 1.5)
-     */
-    headers?: { [key: string]: any; };
-    /**
-     * Allow the request to be successful only if the response has changed since the last request. This is done by checking the Last-Modified header. Default value is false, ignoring the header. In jQuery 1.4 this technique also checks the 'etag' specified by the server to catch unmodified data.
-     */
-    ifModified?: boolean;
-    /**
-     * Allow the current environment to be recognized as "local," (e.g. the filesystem), even if jQuery does not recognize it as such by default. The following protocols are currently recognized as local: file, *-extension, and widget. If the isLocal setting needs modification, it is recommended to do so once in the $.ajaxSetup() method. (version added: 1.5.1)
-     */
-    isLocal?: boolean;
-    /**
-     * Override the callback function name in a jsonp request. This value will be used instead of 'callback' in the 'callback=?' part of the query string in the url. So {jsonp:'onJSONPLoad'} would result in 'onJSONPLoad=?' passed to the server. As of jQuery 1.5, setting the jsonp option to false prevents jQuery from adding the "?callback" string to the URL or attempting to use "=?" for transformation. In this case, you should also explicitly set the jsonpCallback setting. For example, { jsonp: false, jsonpCallback: "callbackName" }
-     */
-    jsonp?: any;
-    /**
-     * Specify the callback function name for a JSONP request. This value will be used instead of the random name automatically generated by jQuery. It is preferable to let jQuery generate a unique name as it'll make it easier to manage the requests and provide callbacks and error handling. You may want to specify the callback when you want to enable better browser caching of GET requests. As of jQuery 1.5, you can also use a function for this setting, in which case the value of jsonpCallback is set to the return value of that function.
-     */
-    jsonpCallback?: any;
-    /**
-     * The HTTP method to use for the request (e.g. "POST", "GET", "PUT"). (version added: 1.9.0)
-     */
-    method?: string;
-    /**
-     * A mime type to override the XHR mime type. (version added: 1.5.1)
-     */
-    mimeType?: string;
-    /**
-     * A password to be used with XMLHttpRequest in response to an HTTP access authentication request.
-     */
-    password?: string;
-    /**
-     * By default, data passed in to the data option as an object (technically, anything other than a string) will be processed and transformed into a query string, fitting to the default content-type "application/x-www-form-urlencoded". If you want to send a DOMDocument, or other non-processed data, set this option to false.
-     */
-    processData?: boolean;
-    /**
-     * Only applies when the "script" transport is used (e.g., cross-domain requests with "jsonp" or "script" dataType and "GET" type). Sets the charset attribute on the script tag used in the request. Used when the character set on the local page is not the same as the one on the remote script.
-     */
-    scriptCharset?: string;
-    /**
-     * An object of numeric HTTP codes and functions to be called when the response has the corresponding code. f the request is successful, the status code functions take the same parameters as the success callback; if it results in an error (including 3xx redirect), they take the same parameters as the error callback. (version added: 1.5)
-     */
-    statusCode?: { [key: string]: any; };
-    /**
-     * A function to be called if the request succeeds. The function gets passed three arguments: The data returned from the server, formatted according to the dataType parameter; a string describing the status; and the jqXHR (in jQuery 1.4.x, XMLHttpRequest) object. As of jQuery 1.5, the success setting can accept an array of functions. Each function will be called in turn. This is an Ajax Event.
-     */
-    success? (data: any, textStatus: string, jqXHR: JQueryXHR): any;
-    /**
-     * Set a timeout (in milliseconds) for the request. This will override any global timeout set with $.ajaxSetup(). The timeout period starts at the point the $.ajax call is made; if several other requests are in progress and the browser has no connections available, it is possible for a request to time out before it can be sent. In jQuery 1.4.x and below, the XMLHttpRequest object will be in an invalid state if the request times out; accessing any object members may throw an exception. In Firefox 3.0+ only, script and JSONP requests cannot be cancelled by a timeout; the script will run even if it arrives after the timeout period.
-     */
-    timeout?: number;
-    /**
-     * Set this to true if you wish to use the traditional style of param serialization.
-     */
-    traditional?: boolean;
-    /**
-     * The type of request to make ("POST" or "GET"), default is "GET". Note: Other HTTP request methods, such as PUT and DELETE, can also be used here, but they are not supported by all browsers.
-     */
-    type?: string;
-    /**
-     * A string containing the URL to which the request is sent.
-     */
-    url?: string;
-    /**
-     * A username to be used with XMLHttpRequest in response to an HTTP access authentication request.
-     */
-    username?: string;
-    /**
-     * Callback for creating the XMLHttpRequest object. Defaults to the ActiveXObject when available (IE), the XMLHttpRequest otherwise. Override to provide your own implementation for XMLHttpRequest or enhancements to the factory.
-     */
-    xhr?: any;
-    /**
-     * An object of fieldName-fieldValue pairs to set on the native XHR object. For example, you can use it to set withCredentials to true for cross-domain requests if needed. In jQuery 1.5, the withCredentials property was not propagated to the native XHR and thus CORS requests requiring it would ignore this flag. For this reason, we recommend using jQuery 1.5.1+ should you require the use of it. (version added: 1.5.1)
-     */
-    xhrFields?: { [key: string]: any; };
-}
-
-/**
- * Interface for the jqXHR object
- */
-interface JQueryXHR extends XMLHttpRequest, JQueryPromise<any> {
-    /**
-     * The .overrideMimeType() method may be used in the beforeSend() callback function, for example, to modify the response content-type header. As of jQuery 1.5.1, the jqXHR object also contains the overrideMimeType() method (it was available in jQuery 1.4.x, as well, but was temporarily removed in jQuery 1.5). 
-     */
-    overrideMimeType(mimeType: string): any;
-    /**
-     * Cancel the request. 
-     *
-     * @param statusText A string passed as the textStatus parameter for the done callback. Default value: "canceled"
-     */
-    abort(statusText?: string): void;
-    /**
-     * Incorporates the functionality of the .done() and .fail() methods, allowing (as of jQuery 1.8) the underlying Promise to be manipulated. Refer to deferred.then() for implementation details.
-     */
-    then<R>(doneCallback: (data: any, textStatus: string, jqXHR: JQueryXHR) => R, failCallback?: (jqXHR: JQueryXHR, textStatus: string, errorThrown: any) => void): JQueryPromise<R>;
-    /**
-     * Property containing the parsed response if the response Content-Type is json
-     */
-    responseJSON?: any;
-    /**
-     * A function to be called if the request fails.
-     */
-    error(xhr: JQueryXHR, textStatus: string, errorThrown: string): void;
-}
-
-/**
- * Interface for the JQuery callback
- */
-interface JQueryCallback {
-    /**
-     * Add a callback or a collection of callbacks to a callback list.
-     * 
-     * @param callbacks A function, or array of functions, that are to be added to the callback list.
-     */
-    add(callbacks: Function): JQueryCallback;
-    /**
-     * Add a callback or a collection of callbacks to a callback list.
-     * 
-     * @param callbacks A function, or array of functions, that are to be added to the callback list.
-     */
-    add(callbacks: Function[]): JQueryCallback;
-
-    /**
-     * Disable a callback list from doing anything more.
-     */
-    disable(): JQueryCallback;
-
-    /**
-     * Determine if the callbacks list has been disabled.
-     */
-    disabled(): boolean;
-
-    /**
-     * Remove all of the callbacks from a list.
-     */
-    empty(): JQueryCallback;
-
-    /**
-     * Call all of the callbacks with the given arguments
-     * 
-     * @param arguments The argument or list of arguments to pass back to the callback list.
-     */
-    fire(...arguments: any[]): JQueryCallback;
-
-    /**
-     * Determine if the callbacks have already been called at least once.
-     */
-    fired(): boolean;
-
-    /**
-     * Call all callbacks in a list with the given context and arguments.
-     * 
-     * @param context A reference to the context in which the callbacks in the list should be fired.
-     * @param arguments An argument, or array of arguments, to pass to the callbacks in the list.
-     */
-    fireWith(context?: any, args?: any[]): JQueryCallback;
-
-    /**
-     * Determine whether a supplied callback is in a list
-     * 
-     * @param callback The callback to search for.
-     */
-    has(callback: Function): boolean;
-
-    /**
-     * Lock a callback list in its current state.
-     */
-    lock(): JQueryCallback;
-
-    /**
-     * Determine if the callbacks list has been locked.
-     */
-    locked(): boolean;
-
-    /**
-     * Remove a callback or a collection of callbacks from a callback list.
-     * 
-     * @param callbacks A function, or array of functions, that are to be removed from the callback list.
-     */
-    remove(callbacks: Function): JQueryCallback;
-    /**
-     * Remove a callback or a collection of callbacks from a callback list.
-     * 
-     * @param callbacks A function, or array of functions, that are to be removed from the callback list.
-     */
-    remove(callbacks: Function[]): JQueryCallback;
-}
-
-/**
- * Allows jQuery Promises to interop with non-jQuery promises
- */
-interface JQueryGenericPromise<T> {
-    /**
-     * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-     * 
-     * @param doneFilter A function that is called when the Deferred is resolved.
-     * @param failFilter An optional function that is called when the Deferred is rejected.
-     */
-    then<U>(doneFilter: (value?: T, ...values: any[]) => U|JQueryPromise<U>, failFilter?: (...reasons: any[]) => any, progressFilter?: (...progression: any[]) => any): JQueryPromise<U>;
-
-    /**
-     * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-     * 
-     * @param doneFilter A function that is called when the Deferred is resolved.
-     * @param failFilter An optional function that is called when the Deferred is rejected.
-     */
-    then(doneFilter: (value?: T, ...values: any[]) => void, failFilter?: (...reasons: any[]) => any, progressFilter?: (...progression: any[]) => any): JQueryPromise<void>;
-}
-
-/**
- * Interface for the JQuery promise/deferred callbacks
- */
-interface JQueryPromiseCallback<T> {
-    (value?: T, ...args: any[]): void;
-}
-
-interface JQueryPromiseOperator<T, U> {
-    (callback1: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...callbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<U>;
-}
-
-/**
- * Interface for the JQuery promise, part of callbacks
- */
-interface JQueryPromise<T> extends JQueryGenericPromise<T> {
-    /**
-     * Determine the current state of a Deferred object.
-     */
-    state(): string;
-    /**
-     * Add handlers to be called when the Deferred object is either resolved or rejected.
-     * 
-     * @param alwaysCallbacks1 A function, or array of functions, that is called when the Deferred is resolved or rejected.
-     * @param alwaysCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
-     */
-    always(alwaysCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...alwaysCallbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
-    /**
-     * Add handlers to be called when the Deferred object is resolved.
-     * 
-     * @param doneCallbacks1 A function, or array of functions, that are called when the Deferred is resolved.
-     * @param doneCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
-     */
-    done(doneCallback1?: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...doneCallbackN: Array<JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[]>): JQueryPromise<T>;
-    /**
-     * Add handlers to be called when the Deferred object is rejected.
-     * 
-     * @param failCallbacks1 A function, or array of functions, that are called when the Deferred is rejected.
-     * @param failCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
-     */
-    fail(failCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...failCallbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
-    /**
-     * Add handlers to be called when the Deferred object generates progress notifications.
-     * 
-     * @param progressCallbacks A function, or array of functions, to be called when the Deferred generates progress notifications.
-     */
-    progress(progressCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...progressCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
-
-    // Deprecated - given no typings
-    pipe(doneFilter?: (x: any) => any, failFilter?: (x: any) => any, progressFilter?: (x: any) => any): JQueryPromise<any>;
-}
-
-/**
- * Interface for the JQuery deferred, part of callbacks
- */
-interface JQueryDeferred<T> extends JQueryGenericPromise<T> {
-    /**
-     * Determine the current state of a Deferred object.
-     */
-    state(): string;
-    /**
-     * Add handlers to be called when the Deferred object is either resolved or rejected.
-     * 
-     * @param alwaysCallbacks1 A function, or array of functions, that is called when the Deferred is resolved or rejected.
-     * @param alwaysCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
-     */
-    always(alwaysCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...alwaysCallbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
-    /**
-     * Add handlers to be called when the Deferred object is resolved.
-     * 
-     * @param doneCallbacks1 A function, or array of functions, that are called when the Deferred is resolved.
-     * @param doneCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
-     */
-    done(doneCallback1?: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...doneCallbackN: Array<JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[]>): JQueryDeferred<T>;
-    /**
-     * Add handlers to be called when the Deferred object is rejected.
-     * 
-     * @param failCallbacks1 A function, or array of functions, that are called when the Deferred is rejected.
-     * @param failCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
-     */
-    fail(failCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...failCallbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
-    /**
-     * Add handlers to be called when the Deferred object generates progress notifications.
-     * 
-     * @param progressCallbacks A function, or array of functions, to be called when the Deferred generates progress notifications.
-     */
-    progress(progressCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...progressCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
-
-    /**
-     * Call the progressCallbacks on a Deferred object with the given args.
-     * 
-     * @param args Optional arguments that are passed to the progressCallbacks.
-     */
-    notify(value?: any, ...args: any[]): JQueryDeferred<T>;
-
-    /**
-     * Call the progressCallbacks on a Deferred object with the given context and args.
-     * 
-     * @param context Context passed to the progressCallbacks as the this object.
-     * @param args Optional arguments that are passed to the progressCallbacks.
-     */
-    notifyWith(context: any, value?: any[]): JQueryDeferred<T>;
-
-    /**
-     * Reject a Deferred object and call any failCallbacks with the given args.
-     * 
-     * @param args Optional arguments that are passed to the failCallbacks.
-     */
-    reject(value?: any, ...args: any[]): JQueryDeferred<T>;
-    /**
-     * Reject a Deferred object and call any failCallbacks with the given context and args.
-     * 
-     * @param context Context passed to the failCallbacks as the this object.
-     * @param args An optional array of arguments that are passed to the failCallbacks.
-     */
-    rejectWith(context: any, value?: any[]): JQueryDeferred<T>;
-
-    /**
-     * Resolve a Deferred object and call any doneCallbacks with the given args.
-     * 
-     * @param value First argument passed to doneCallbacks.
-     * @param args Optional subsequent arguments that are passed to the doneCallbacks.
-     */
-    resolve(value?: T, ...args: any[]): JQueryDeferred<T>;
-
-    /**
-     * Resolve a Deferred object and call any doneCallbacks with the given context and args.
-     * 
-     * @param context Context passed to the doneCallbacks as the this object.
-     * @param args An optional array of arguments that are passed to the doneCallbacks.
-     */
-    resolveWith(context: any, value?: T[]): JQueryDeferred<T>;
-
-    /**
-     * Return a Deferred's Promise object.
-     * 
-     * @param target Object onto which the promise methods have to be attached
-     */
-    promise(target?: any): JQueryPromise<T>;
-
-    // Deprecated - given no typings
-    pipe(doneFilter?: (x: any) => any, failFilter?: (x: any) => any, progressFilter?: (x: any) => any): JQueryPromise<any>;
-}
-
-/**
- * Interface of the JQuery extension of the W3C event object
- */
-interface BaseJQueryEventObject extends Event {
-    data: any;
-    delegateTarget: Element;
-    isDefaultPrevented(): boolean;
-    isImmediatePropagationStopped(): boolean;
-    isPropagationStopped(): boolean;
-    namespace: string;
-    originalEvent: Event;
-    preventDefault(): any;
-    relatedTarget: Element;
-    result: any;
-    stopImmediatePropagation(): void;
-    stopPropagation(): void;
-    target: Element;
-    pageX: number;
-    pageY: number;
-    which: number;
-    metaKey: boolean;
-}
-
-interface JQueryInputEventObject extends BaseJQueryEventObject {
-    altKey: boolean;
-    ctrlKey: boolean;
-    metaKey: boolean;
-    shiftKey: boolean;
-}
-
-interface JQueryMouseEventObject extends JQueryInputEventObject {
-    button: number;
-    clientX: number;
-    clientY: number;
-    offsetX: number;
-    offsetY: number;
-    pageX: number;
-    pageY: number;
-    screenX: number;
-    screenY: number;
-}
-
-interface JQueryKeyEventObject extends JQueryInputEventObject {
-    char: any;
-    charCode: number;
-    key: any;
-    keyCode: number;
-}
-
-interface JQueryEventObject extends BaseJQueryEventObject, JQueryInputEventObject, JQueryMouseEventObject, JQueryKeyEventObject{
-}
-
-/*
-    Collection of properties of the current browser
-*/
-
-interface JQuerySupport {
-    ajax?: boolean;
-    boxModel?: boolean;
-    changeBubbles?: boolean;
-    checkClone?: boolean;
-    checkOn?: boolean;
-    cors?: boolean;
-    cssFloat?: boolean;
-    hrefNormalized?: boolean;
-    htmlSerialize?: boolean;
-    leadingWhitespace?: boolean;
-    noCloneChecked?: boolean;
-    noCloneEvent?: boolean;
-    opacity?: boolean;
-    optDisabled?: boolean;
-    optSelected?: boolean;
-    scriptEval? (): boolean;
-    style?: boolean;
-    submitBubbles?: boolean;
-    tbody?: boolean;
-}
-
-interface JQueryParam {
-    /**
-     * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request.
-     * 
-     * @param obj An array or object to serialize.
-     */
-    (obj: any): string;
-
-    /**
-     * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request.
-     * 
-     * @param obj An array or object to serialize.
-     * @param traditional A Boolean indicating whether to perform a traditional "shallow" serialization.
-     */
-    (obj: any, traditional: boolean): string;
-}
-
-/**
- * The interface used to construct jQuery events (with $.Event). It is
- * defined separately instead of inline in JQueryStatic to allow
- * overriding the construction function with specific strings
- * returning specific event objects.
- */
-interface JQueryEventConstructor {
-    (name: string, eventProperties?: any): JQueryEventObject;
-    new (name: string, eventProperties?: any): JQueryEventObject;
-}
-
-/**
- * The interface used to specify coordinates.
- */
-interface JQueryCoordinates {
-    left: number;
-    top: number;
-}
-
-/**
- * Elements in the array returned by serializeArray()
- */
-interface JQuerySerializeArrayElement {
-    name: string;
-    value: string;
-}
-
-interface JQueryAnimationOptions { 
-    /**
-     * A string or number determining how long the animation will run.
-     */
-    duration?: any; 
-    /**
-     * A string indicating which easing function to use for the transition.
-     */
-    easing?: string; 
-    /**
-     * A function to call once the animation is complete.
-     */
-    complete?: Function; 
-    /**
-     * A function to be called for each animated property of each animated element. This function provides an opportunity to modify the Tween object to change the value of the property before it is set.
-     */
-    step?: (now: number, tween: any) => any; 
-    /**
-     * A function to be called after each step of the animation, only once per animated element regardless of the number of animated properties. (version added: 1.8)
-     */
-    progress?: (animation: JQueryPromise<any>, progress: number, remainingMs: number) => any; 
-    /**
-     * A function to call when the animation begins. (version added: 1.8)
-     */
-    start?: (animation: JQueryPromise<any>) => any; 
-    /**
-     * A function to be called when the animation completes (its Promise object is resolved). (version added: 1.8)
-     */
-    done?: (animation: JQueryPromise<any>, jumpedToEnd: boolean) => any; 
-    /**
-     * A function to be called when the animation fails to complete (its Promise object is rejected). (version added: 1.8)
-     */
-    fail?: (animation: JQueryPromise<any>, jumpedToEnd: boolean) => any; 
-    /**
-     * A function to be called when the animation completes or stops without completing (its Promise object is either resolved or rejected). (version added: 1.8)
-     */
-    always?: (animation: JQueryPromise<any>, jumpedToEnd: boolean) => any; 
-    /**
-     * A Boolean indicating whether to place the animation in the effects queue. If false, the animation will begin immediately. As of jQuery 1.7, the queue option can also accept a string, in which case the animation is added to the queue represented by that string. When a custom queue name is used the animation does not automatically start; you must call .dequeue("queuename") to start it.
-     */
-    queue?: any; 
-    /**
-     * A map of one or more of the CSS properties defined by the properties argument and their corresponding easing functions. (version added: 1.4)
-     */
-    specialEasing?: Object;
-}
-
-interface JQueryEasingFunction {
-    ( percent: number ): number;
-}
-
-interface JQueryEasingFunctions {
-    [ name: string ]: JQueryEasingFunction;
-    linear: JQueryEasingFunction;
-    swing: JQueryEasingFunction;
-}
-
-/**
- * Static members of jQuery (those on $ and jQuery themselves)
- */
-interface JQueryStatic {
-
-    /**
-     * Perform an asynchronous HTTP (Ajax) request.
-     *
-     * @param settings A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with $.ajaxSetup().
-     */
-    ajax(settings: JQueryAjaxSettings): JQueryXHR;
-    /**
-     * Perform an asynchronous HTTP (Ajax) request.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param settings A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with $.ajaxSetup().
-     */
-    ajax(url: string, settings?: JQueryAjaxSettings): JQueryXHR;
-
-    /**
-     * Handle custom Ajax options or modify existing options before each request is sent and before they are processed by $.ajax().
-     *
-     * @param dataTypes An optional string containing one or more space-separated dataTypes
-     * @param handler A handler to set default values for future Ajax requests.
-     */
-    ajaxPrefilter(dataTypes: string, handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void;
-    /**
-     * Handle custom Ajax options or modify existing options before each request is sent and before they are processed by $.ajax().
-     *
-     * @param handler A handler to set default values for future Ajax requests.
-     */
-    ajaxPrefilter(handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void;
-
-    ajaxSettings: JQueryAjaxSettings;
-
-     /**
-      * Set default values for future Ajax requests. Its use is not recommended.
-      *
-      * @param options A set of key/value pairs that configure the default Ajax request. All options are optional.
-      */
-    ajaxSetup(options: JQueryAjaxSettings): void;
-
-    /**
-     * Load data from the server using a HTTP GET request.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param success A callback function that is executed if the request succeeds.
-     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, or html).
-     */
-    get(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
-    /**
-     * Load data from the server using a HTTP GET request.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param data A plain object or string that is sent to the server with the request.
-     * @param success A callback function that is executed if the request succeeds.
-     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, or html).
-     */
-    get(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
-    /**
-     * Load JSON-encoded data from the server using a GET HTTP request.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param success A callback function that is executed if the request succeeds.
-     */
-    getJSON(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR;
-    /**
-     * Load JSON-encoded data from the server using a GET HTTP request.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param data A plain object or string that is sent to the server with the request.
-     * @param success A callback function that is executed if the request succeeds.
-     */
-    getJSON(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR;
-    /**
-     * Load a JavaScript file from the server using a GET HTTP request, then execute it.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param success A callback function that is executed if the request succeeds.
-     */
-    getScript(url: string, success?: (script: string, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR;
-
-    /**
-     * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request.
-     */
-    param: JQueryParam;
-
-    /**
-     * Load data from the server using a HTTP POST request.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but can be null in that case.
-     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
-     */
-    post(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
-    /**
-     * Load data from the server using a HTTP POST request.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param data A plain object or string that is sent to the server with the request.
-     * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but can be null in that case.
-     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
-     */
-    post(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
-
-    /**
-     * A multi-purpose callbacks list object that provides a powerful way to manage callback lists.
-     *
-     * @param flags An optional list of space-separated flags that change how the callback list behaves.
-     */
-    Callbacks(flags?: string): JQueryCallback;
-
-    /**
-     * Holds or releases the execution of jQuery's ready event.
-     *
-     * @param hold Indicates whether the ready hold is being requested or released
-     */
-    holdReady(hold: boolean): void;
-
-    /**
-     * Accepts a string containing a CSS selector which is then used to match a set of elements.
-     *
-     * @param selector A string containing a selector expression
-     * @param context A DOM Element, Document, or jQuery to use as context
-     */
-    (selector: string, context?: Element|JQuery): JQuery;
-
-    /**
-     * Accepts a string containing a CSS selector which is then used to match a set of elements.
-     *
-     * @param element A DOM element to wrap in a jQuery object.
-     */
-    (element: Element): JQuery;
-
-    /**
-     * Accepts a string containing a CSS selector which is then used to match a set of elements.
-     *
-     * @param elementArray An array containing a set of DOM elements to wrap in a jQuery object.
-     */
-    (elementArray: Element[]): JQuery;
-
-    /**
-     * Binds a function to be executed when the DOM has finished loading.
-     *
-     * @param callback A function to execute after the DOM is ready.
-     */
-    (callback: (jQueryAlias?: JQueryStatic) => any): JQuery;
-
-    /**
-     * Accepts a string containing a CSS selector which is then used to match a set of elements.
-     *
-     * @param object A plain object to wrap in a jQuery object.
-     */
-    (object: {}): JQuery;
-
-    /**
-     * Accepts a string containing a CSS selector which is then used to match a set of elements.
-     *
-     * @param object An existing jQuery object to clone.
-     */
-    (object: JQuery): JQuery;
-
-    /**
-     * Specify a function to execute when the DOM is fully loaded.
-     */
-    (): JQuery;
-
-    /**
-     * Creates DOM elements on the fly from the provided string of raw HTML.
-     *
-     * @param html A string of HTML to create on the fly. Note that this parses HTML, not XML.
-     * @param ownerDocument A document in which the new elements will be created.
-     */
-    (html: string, ownerDocument?: Document): JQuery;
-
-    /**
-     * Creates DOM elements on the fly from the provided string of raw HTML.
-     *
-     * @param html A string defining a single, standalone, HTML element (e.g. <div/> or <div></div>).
-     * @param attributes An object of attributes, events, and methods to call on the newly-created element.
-     */
-    (html: string, attributes: Object): JQuery;
-
-    /**
-     * Relinquish jQuery's control of the $ variable.
-     *
-     * @param removeAll A Boolean indicating whether to remove all jQuery variables from the global scope (including jQuery itself).
-     */
-    noConflict(removeAll?: boolean): JQueryStatic;
-
-    /**
-     * Provides a way to execute callback functions based on one or more objects, usually Deferred objects that represent asynchronous events.
-     *
-     * @param deferreds One or more Deferred objects, or plain JavaScript objects.
-     */
-    when<T>(...deferreds: Array<T|JQueryPromise<T>/* as JQueryDeferred<T> */>): JQueryPromise<T>;
-
-    /**
-     * Hook directly into jQuery to override how particular CSS properties are retrieved or set, normalize CSS property naming, or create custom properties.
-     */
-    cssHooks: { [key: string]: any; };
-    cssNumber: any;
-
-    /**
-     * Store arbitrary data associated with the specified element. Returns the value that was set.
-     *
-     * @param element The DOM element to associate with the data.
-     * @param key A string naming the piece of data to set.
-     * @param value The new data value.
-     */
-    data<T>(element: Element, key: string, value: T): T;
-    /**
-     * Returns value at named data store for the element, as set by jQuery.data(element, name, value), or the full data store for the element.
-     *
-     * @param element The DOM element to associate with the data.
-     * @param key A string naming the piece of data to set.
-     */
-    data(element: Element, key: string): any;
-    /**
-     * Returns value at named data store for the element, as set by jQuery.data(element, name, value), or the full data store for the element.
-     *
-     * @param element The DOM element to associate with the data.
-     */
-    data(element: Element): any;
-
-    /**
-     * Execute the next function on the queue for the matched element.
-     *
-     * @param element A DOM element from which to remove and execute a queued function.
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     */
-    dequeue(element: Element, queueName?: string): void;
-
-    /**
-     * Determine whether an element has any jQuery data associated with it.
-     *
-     * @param element A DOM element to be checked for data.
-     */
-    hasData(element: Element): boolean;
-
-    /**
-     * Show the queue of functions to be executed on the matched element.
-     *
-     * @param element A DOM element to inspect for an attached queue.
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     */
-    queue(element: Element, queueName?: string): any[];
-    /**
-     * Manipulate the queue of functions to be executed on the matched element.
-     *
-     * @param element A DOM element where the array of queued functions is attached.
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @param newQueue An array of functions to replace the current queue contents.
-     */
-    queue(element: Element, queueName: string, newQueue: Function[]): JQuery;
-    /**
-     * Manipulate the queue of functions to be executed on the matched element.
-     *
-     * @param element A DOM element on which to add a queued function.
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @param callback The new function to add to the queue.
-     */
-    queue(element: Element, queueName: string, callback: Function): JQuery;
-
-    /**
-     * Remove a previously-stored piece of data.
-     *
-     * @param element A DOM element from which to remove data.
-     * @param name A string naming the piece of data to remove.
-     */
-    removeData(element: Element, name?: string): JQuery;
-
-    /**
-     * A constructor function that returns a chainable utility object with methods to register multiple callbacks into callback queues, invoke callback queues, and relay the success or failure state of any synchronous or asynchronous function.
-     *
-     * @param beforeStart A function that is called just before the constructor returns.
-     */
-    Deferred<T>(beforeStart?: (deferred: JQueryDeferred<T>) => any): JQueryDeferred<T>;
-
-    /**
-     * Effects
-     */
-
-    easing: JQueryEasingFunctions;
-
-    fx: {
-        tick: () => void;
-        /**
-         * The rate (in milliseconds) at which animations fire.
-         */
-        interval: number;
-        stop: () => void;
-        speeds: { slow: number; fast: number; };
-        /**
-         * Globally disable all animations.
-         */
-        off: boolean;
-        step: any;
-    };
-
-    /**
-     * Takes a function and returns a new one that will always have a particular context.
-     *
-     * @param fnction The function whose context will be changed.
-     * @param context The object to which the context (this) of the function should be set.
-     * @param additionalArguments Any number of arguments to be passed to the function referenced in the function argument.
-     */
-    proxy(fnction: (...args: any[]) => any, context: Object, ...additionalArguments: any[]): any;
-    /**
-     * Takes a function and returns a new one that will always have a particular context.
-     *
-     * @param context The object to which the context (this) of the function should be set.
-     * @param name The name of the function whose context will be changed (should be a property of the context object).
-     * @param additionalArguments Any number of arguments to be passed to the function named in the name argument.
-     */
-    proxy(context: Object, name: string, ...additionalArguments: any[]): any;
-
-    Event: JQueryEventConstructor;
-
-    /**
-     * Takes a string and throws an exception containing it.
-     *
-     * @param message The message to send out.
-     */
-    error(message: any): JQuery;
-
-    expr: any;
-    fn: any;  //TODO: Decide how we want to type this
-
-    isReady: boolean;
-
-    // Properties
-    support: JQuerySupport;
-
-    /**
-     * Check to see if a DOM element is a descendant of another DOM element.
-     * 
-     * @param container The DOM element that may contain the other element.
-     * @param contained The DOM element that may be contained by (a descendant of) the other element.
-     */
-    contains(container: Element, contained: Element): boolean;
-
-    /**
-     * A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties.
-     * 
-     * @param collection The object or array to iterate over.
-     * @param callback The function that will be executed on every object.
-     */
-    each<T>(
-        collection: T[],
-        callback: (indexInArray: number, valueOfElement: T) => any
-        ): any;
-
-    /**
-     * A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties.
-     * 
-     * @param collection The object or array to iterate over.
-     * @param callback The function that will be executed on every object.
-     */
-    each(
-        collection: any,
-        callback: (indexInArray: any, valueOfElement: any) => any
-        ): any;
-
-    /**
-     * Merge the contents of two or more objects together into the first object.
-     *
-     * @param target An object that will receive the new properties if additional objects are passed in or that will extend the jQuery namespace if it is the sole argument.
-     * @param object1 An object containing additional properties to merge in.
-     * @param objectN Additional objects containing properties to merge in.
-     */
-    extend(target: any, object1?: any, ...objectN: any[]): any;
-    /**
-     * Merge the contents of two or more objects together into the first object.
-     *
-     * @param deep If true, the merge becomes recursive (aka. deep copy).
-     * @param target The object to extend. It will receive the new properties.
-     * @param object1 An object containing additional properties to merge in.
-     * @param objectN Additional objects containing properties to merge in.
-     */
-    extend(deep: boolean, target: any, object1?: any, ...objectN: any[]): any;
-
-    /**
-     * Execute some JavaScript code globally.
-     *
-     * @param code The JavaScript code to execute.
-     */
-    globalEval(code: string): any;
-
-    /**
-     * Finds the elements of an array which satisfy a filter function. The original array is not affected.
-     *
-     * @param array The array to search through.
-     * @param func The function to process each item against. The first argument to the function is the item, and the second argument is the index. The function should return a Boolean value.  this will be the global window object.
-     * @param invert If "invert" is false, or not provided, then the function returns an array consisting of all elements for which "callback" returns true. If "invert" is true, then the function returns an array consisting of all elements for which "callback" returns false.
-     */
-    grep<T>(array: T[], func: (elementOfArray: T, indexInArray: number) => boolean, invert?: boolean): T[];
-
-    /**
-     * Search for a specified value within an array and return its index (or -1 if not found).
-     *
-     * @param value The value to search for.
-     * @param array An array through which to search.
-     * @param fromIndex he index of the array at which to begin the search. The default is 0, which will search the whole array.
-     */
-    inArray<T>(value: T, array: T[], fromIndex?: number): number;
-
-    /**
-     * Determine whether the argument is an array.
-     *
-     * @param obj Object to test whether or not it is an array.
-     */
-    isArray(obj: any): boolean;
-    /**
-     * Check to see if an object is empty (contains no enumerable properties).
-     *
-     * @param obj The object that will be checked to see if it's empty.
-     */
-    isEmptyObject(obj: any): boolean;
-    /**
-     * Determine if the argument passed is a Javascript function object.
-     *
-     * @param obj Object to test whether or not it is a function.
-     */
-    isFunction(obj: any): boolean;
-    /**
-     * Determines whether its argument is a number.
-     *
-     * @param obj The value to be tested.
-     */
-    isNumeric(value: any): boolean;
-    /**
-     * Check to see if an object is a plain object (created using "{}" or "new Object").
-     *
-     * @param obj The object that will be checked to see if it's a plain object.
-     */
-    isPlainObject(obj: any): boolean;
-    /**
-     * Determine whether the argument is a window.
-     *
-     * @param obj Object to test whether or not it is a window.
-     */
-    isWindow(obj: any): boolean;
-    /**
-     * Check to see if a DOM node is within an XML document (or is an XML document).
-     *
-     * @param node he DOM node that will be checked to see if it's in an XML document.
-     */
-    isXMLDoc(node: Node): boolean;
-
-    /**
-     * Convert an array-like object into a true JavaScript array.
-     * 
-     * @param obj Any object to turn into a native Array.
-     */
-    makeArray(obj: any): any[];
-
-    /**
-     * Translate all items in an array or object to new array of items.
-     * 
-     * @param array The Array to translate.
-     * @param callback The function to process each item against. The first argument to the function is the array item, the second argument is the index in array The function can return any value. Within the function, this refers to the global (window) object.
-     */
-    map<T, U>(array: T[], callback: (elementOfArray: T, indexInArray: number) => U): U[];
-    /**
-     * Translate all items in an array or object to new array of items.
-     * 
-     * @param arrayOrObject The Array or Object to translate.
-     * @param callback The function to process each item against. The first argument to the function is the value; the second argument is the index or key of the array or object property. The function can return any value to add to the array. A returned array will be flattened into the resulting array. Within the function, this refers to the global (window) object.
-     */
-    map(arrayOrObject: any, callback: (value: any, indexOrKey: any) => any): any;
-
-    /**
-     * Merge the contents of two arrays together into the first array.
-     * 
-     * @param first The first array to merge, the elements of second added.
-     * @param second The second array to merge into the first, unaltered.
-     */
-    merge<T>(first: T[], second: T[]): T[];
-
-    /**
-     * An empty function.
-     */
-    noop(): any;
-
-    /**
-     * Return a number representing the current time.
-     */
-    now(): number;
-
-    /**
-     * Takes a well-formed JSON string and returns the resulting JavaScript object.
-     * 
-     * @param json The JSON string to parse.
-     */
-    parseJSON(json: string): any;
-
-    /**
-     * Parses a string into an XML document.
-     *
-     * @param data a well-formed XML string to be parsed
-     */
-    parseXML(data: string): XMLDocument;
-
-    /**
-     * Remove the whitespace from the beginning and end of a string.
-     * 
-     * @param str Remove the whitespace from the beginning and end of a string.
-     */
-    trim(str: string): string;
-
-    /**
-     * Determine the internal JavaScript [[Class]] of an object.
-     * 
-     * @param obj Object to get the internal JavaScript [[Class]] of.
-     */
-    type(obj: any): string;
-
-    /**
-     * Sorts an array of DOM elements, in place, with the duplicates removed. Note that this only works on arrays of DOM elements, not strings or numbers.
-     * 
-     * @param array The Array of DOM elements.
-     */
-    unique(array: Element[]): Element[];
-
-    /**
-     * Parses a string into an array of DOM nodes.
-     *
-     * @param data HTML string to be parsed
-     * @param context DOM element to serve as the context in which the HTML fragment will be created
-     * @param keepScripts A Boolean indicating whether to include scripts passed in the HTML string
-     */
-    parseHTML(data: string, context?: HTMLElement, keepScripts?: boolean): any[];
-
-    /**
-     * Parses a string into an array of DOM nodes.
-     *
-     * @param data HTML string to be parsed
-     * @param context DOM element to serve as the context in which the HTML fragment will be created
-     * @param keepScripts A Boolean indicating whether to include scripts passed in the HTML string
-     */
-    parseHTML(data: string, context?: Document, keepScripts?: boolean): any[];
-}
-
-/**
- * The jQuery instance members
- */
-interface JQuery {
-    /**
-     * Register a handler to be called when Ajax requests complete. This is an AjaxEvent.
-     *
-     * @param handler The function to be invoked.
-     */
-    ajaxComplete(handler: (event: JQueryEventObject, XMLHttpRequest: XMLHttpRequest, ajaxOptions: any) => any): JQuery;
-    /**
-     * Register a handler to be called when Ajax requests complete with an error. This is an Ajax Event.
-     *
-     * @param handler The function to be invoked.
-     */
-    ajaxError(handler: (event: JQueryEventObject, jqXHR: JQueryXHR, ajaxSettings: JQueryAjaxSettings, thrownError: any) => any): JQuery;
-    /**
-     * Attach a function to be executed before an Ajax request is sent. This is an Ajax Event.
-     *
-     * @param handler The function to be invoked.
-     */
-    ajaxSend(handler: (event: JQueryEventObject, jqXHR: JQueryXHR, ajaxOptions: JQueryAjaxSettings) => any): JQuery;
-    /**
-     * Register a handler to be called when the first Ajax request begins. This is an Ajax Event.
-     *
-     * @param handler The function to be invoked.
-     */
-    ajaxStart(handler: () => any): JQuery;
-    /**
-     * Register a handler to be called when all Ajax requests have completed. This is an Ajax Event.
-     *
-     * @param handler The function to be invoked.
-     */
-    ajaxStop(handler: () => any): JQuery;
-    /**
-     * Attach a function to be executed whenever an Ajax request completes successfully. This is an Ajax Event.
-     *
-     * @param handler The function to be invoked.
-     */
-    ajaxSuccess(handler: (event: JQueryEventObject, XMLHttpRequest: XMLHttpRequest, ajaxOptions: JQueryAjaxSettings) => any): JQuery;
-
-    /**
-     * Load data from the server and place the returned HTML into the matched element.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param data A plain object or string that is sent to the server with the request.
-     * @param complete A callback function that is executed when the request completes.
-     */
-    load(url: string, data?: string|Object, complete?: (responseText: string, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any): JQuery;
-
-    /**
-     * Encode a set of form elements as a string for submission.
-     */
-    serialize(): string;
-    /**
-     * Encode a set of form elements as an array of names and values.
-     */
-    serializeArray(): JQuerySerializeArrayElement[];
-
-    /**
-     * Adds the specified class(es) to each of the set of matched elements.
-     *
-     * @param className One or more space-separated classes to be added to the class attribute of each matched element.
-     */
-    addClass(className: string): JQuery;
-    /**
-     * Adds the specified class(es) to each of the set of matched elements.
-     *
-     * @param function A function returning one or more space-separated class names to be added to the existing class name(s). Receives the index position of the element in the set and the existing class name(s) as arguments. Within the function, this refers to the current element in the set.
-     */
-    addClass(func: (index: number, className: string) => string): JQuery;
-
-    /**
-     * Add the previous set of elements on the stack to the current set, optionally filtered by a selector.
-     */
-    addBack(selector?: string): JQuery;
-
-    /**
-     * Get the value of an attribute for the first element in the set of matched elements.
-     *
-     * @param attributeName The name of the attribute to get.
-     */
-    attr(attributeName: string): string;
-    /**
-     * Set one or more attributes for the set of matched elements.
-     *
-     * @param attributeName The name of the attribute to set.
-     * @param value A value to set for the attribute.
-     */
-    attr(attributeName: string, value: string|number): JQuery;
-    /**
-     * Set one or more attributes for the set of matched elements.
-     *
-     * @param attributeName The name of the attribute to set.
-     * @param func A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old attribute value as arguments.
-     */
-    attr(attributeName: string, func: (index: number, attr: string) => string|number): JQuery;
-    /**
-     * Set one or more attributes for the set of matched elements.
-     *
-     * @param attributes An object of attribute-value pairs to set.
-     */
-    attr(attributes: Object): JQuery;
-    
-    /**
-     * Determine whether any of the matched elements are assigned the given class.
-     *
-     * @param className The class name to search for.
-     */
-    hasClass(className: string): boolean;
-
-    /**
-     * Get the HTML contents of the first element in the set of matched elements.
-     */
-    html(): string;
-    /**
-     * Set the HTML contents of each element in the set of matched elements.
-     *
-     * @param htmlString A string of HTML to set as the content of each matched element.
-     */
-    html(htmlString: string): JQuery;
-    /**
-     * Set the HTML contents of each element in the set of matched elements.
-     *
-     * @param func A function returning the HTML content to set. Receives the index position of the element in the set and the old HTML value as arguments. jQuery empties the element before calling the function; use the oldhtml argument to reference the previous content. Within the function, this refers to the current element in the set.
-     */
-    html(func: (index: number, oldhtml: string) => string): JQuery;
-    /**
-     * Set the HTML contents of each element in the set of matched elements.
-     *
-     * @param func A function returning the HTML content to set. Receives the index position of the element in the set and the old HTML value as arguments. jQuery empties the element before calling the function; use the oldhtml argument to reference the previous content. Within the function, this refers to the current element in the set.
-     */
-
-    /**
-     * Get the value of a property for the first element in the set of matched elements.
-     *
-     * @param propertyName The name of the property to get.
-     */
-    prop(propertyName: string): any;
-    /**
-     * Set one or more properties for the set of matched elements.
-     *
-     * @param propertyName The name of the property to set.
-     * @param value A value to set for the property.
-     */
-    prop(propertyName: string, value: string|number|boolean): JQuery;
-    /**
-     * Set one or more properties for the set of matched elements.
-     *
-     * @param properties An object of property-value pairs to set.
-     */
-    prop(properties: Object): JQuery;
-    /**
-     * Set one or more properties for the set of matched elements.
-     *
-     * @param propertyName The name of the property to set.
-     * @param func A function returning the value to set. Receives the index position of the element in the set and the old property value as arguments. Within the function, the keyword this refers to the current element.
-     */
-    prop(propertyName: string, func: (index: number, oldPropertyValue: any) => any): JQuery;
-
-    /**
-     * Remove an attribute from each element in the set of matched elements.
-     *
-     * @param attributeName An attribute to remove; as of version 1.7, it can be a space-separated list of attributes.
-     */
-    removeAttr(attributeName: string): JQuery;
-
-    /**
-     * Remove a single class, multiple classes, or all classes from each element in the set of matched elements.
-     *
-     * @param className One or more space-separated classes to be removed from the class attribute of each matched element.
-     */
-    removeClass(className?: string): JQuery;
-    /**
-     * Remove a single class, multiple classes, or all classes from each element in the set of matched elements.
-     *
-     * @param function A function returning one or more space-separated class names to be removed. Receives the index position of the element in the set and the old class value as arguments.
-     */
-    removeClass(func: (index: number, className: string) => string): JQuery;
-
-    /**
-     * Remove a property for the set of matched elements.
-     *
-     * @param propertyName The name of the property to remove.
-     */
-    removeProp(propertyName: string): JQuery;
-
-    /**
-     * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.
-     *
-     * @param className One or more class names (separated by spaces) to be toggled for each element in the matched set.
-     * @param swtch A Boolean (not just truthy/falsy) value to determine whether the class should be added or removed.
-     */
-    toggleClass(className: string, swtch?: boolean): JQuery;
-    /**
-     * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.
-     *
-     * @param swtch A boolean value to determine whether the class should be added or removed.
-     */
-    toggleClass(swtch?: boolean): JQuery;
-    /**
-     * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.
-     *
-     * @param func A function that returns class names to be toggled in the class attribute of each element in the matched set. Receives the index position of the element in the set, the old class value, and the switch as arguments.
-     * @param swtch A boolean value to determine whether the class should be added or removed.
-     */
-    toggleClass(func: (index: number, className: string, swtch: boolean) => string, swtch?: boolean): JQuery;
-
-    /**
-     * Get the current value of the first element in the set of matched elements.
-     */
-    val(): any;
-    /**
-     * Set the value of each element in the set of matched elements.
-     *
-     * @param value A string of text, an array of strings or number corresponding to the value of each matched element to set as selected/checked.
-     */
-    val(value: string|string[]|number): JQuery;
-    /**
-     * Set the value of each element in the set of matched elements.
-     *
-     * @param func A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old value as arguments.
-     */
-    val(func: (index: number, value: string) => string): JQuery;
-
-
-    /**
-     * Get the value of style properties for the first element in the set of matched elements.
-     *
-     * @param propertyName A CSS property.
-     */
-    css(propertyName: string): string;
-    /**
-     * Set one or more CSS properties for the set of matched elements.
-     *
-     * @param propertyName A CSS property name.
-     * @param value A value to set for the property.
-     */
-    css(propertyName: string, value: string|number): JQuery;
-    /**
-     * Set one or more CSS properties for the set of matched elements.
-     *
-     * @param propertyName A CSS property name.
-     * @param value A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old value as arguments.
-     */
-    css(propertyName: string, value: (index: number, value: string) => string|number): JQuery;
-    /**
-     * Set one or more CSS properties for the set of matched elements.
-     *
-     * @param properties An object of property-value pairs to set.
-     */
-    css(properties: Object): JQuery;
-
-    /**
-     * Get the current computed height for the first element in the set of matched elements.
-     */
-    height(): number;
-    /**
-     * Set the CSS height of every matched element.
-     *
-     * @param value An integer representing the number of pixels, or an integer with an optional unit of measure appended (as a string).
-     */
-    height(value: number|string): JQuery;
-    /**
-     * Set the CSS height of every matched element.
-     *
-     * @param func A function returning the height to set. Receives the index position of the element in the set and the old height as arguments. Within the function, this refers to the current element in the set.
-     */
-    height(func: (index: number, height: number) => number|string): JQuery;
-
-    /**
-     * Get the current computed height for the first element in the set of matched elements, including padding but not border.
-     */
-    innerHeight(): number;
-
-    /**
-     * Sets the inner height on elements in the set of matched elements, including padding but not border.
-     *
-     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
-     */
-    innerHeight(height: number|string): JQuery;
-    
-    /**
-     * Get the current computed width for the first element in the set of matched elements, including padding but not border.
-     */
-    innerWidth(): number;
-
-    /**
-     * Sets the inner width on elements in the set of matched elements, including padding but not border.
-     *
-     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
-     */
-    innerWidth(width: number|string): JQuery;
-    
-    /**
-     * Get the current coordinates of the first element in the set of matched elements, relative to the document.
-     */
-    offset(): JQueryCoordinates;
-    /**
-     * An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
-     *
-     * @param coordinates An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
-     */
-    offset(coordinates: JQueryCoordinates): JQuery;
-    /**
-     * An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
-     *
-     * @param func A function to return the coordinates to set. Receives the index of the element in the collection as the first argument and the current coordinates as the second argument. The function should return an object with the new top and left properties.
-     */
-    offset(func: (index: number, coords: JQueryCoordinates) => JQueryCoordinates): JQuery;
-
-    /**
-     * Get the current computed height for the first element in the set of matched elements, including padding, border, and optionally margin. Returns an integer (without "px") representation of the value or null if called on an empty set of elements.
-     *
-     * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation.
-     */
-    outerHeight(includeMargin?: boolean): number;
-
-    /**
-     * Sets the outer height on elements in the set of matched elements, including padding and border.
-     *
-     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
-     */
-    outerHeight(height: number|string): JQuery;
-
-    /**
-     * Get the current computed width for the first element in the set of matched elements, including padding and border.
-     *
-     * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation.
-     */
-    outerWidth(includeMargin?: boolean): number;
-
-    /**
-     * Sets the outer width on elements in the set of matched elements, including padding and border.
-     *
-     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
-     */
-    outerWidth(width: number|string): JQuery;
-
-    /**
-     * Get the current coordinates of the first element in the set of matched elements, relative to the offset parent.
-     */
-    position(): JQueryCoordinates;
-
-    /**
-     * Get the current horizontal position of the scroll bar for the first element in the set of matched elements or set the horizontal position of the scroll bar for every matched element.
-     */
-    scrollLeft(): number;
-    /**
-     * Set the current horizontal position of the scroll bar for each of the set of matched elements.
-     *
-     * @param value An integer indicating the new position to set the scroll bar to.
-     */
-    scrollLeft(value: number): JQuery;
-
-    /**
-     * Get the current vertical position of the scroll bar for the first element in the set of matched elements or set the vertical position of the scroll bar for every matched element.
-     */
-    scrollTop(): number;
-    /**
-     * Set the current vertical position of the scroll bar for each of the set of matched elements.
-     *
-     * @param value An integer indicating the new position to set the scroll bar to.
-     */
-    scrollTop(value: number): JQuery;
-
-    /**
-     * Get the current computed width for the first element in the set of matched elements.
-     */
-    width(): number;
-    /**
-     * Set the CSS width of each element in the set of matched elements.
-     *
-     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
-     */
-    width(value: number|string): JQuery;
-    /**
-     * Set the CSS width of each element in the set of matched elements.
-     *
-     * @param func A function returning the width to set. Receives the index position of the element in the set and the old width as arguments. Within the function, this refers to the current element in the set.
-     */
-    width(func: (index: number, width: number) => number|string): JQuery;
-
-    /**
-     * Remove from the queue all items that have not yet been run.
-     *
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     */
-    clearQueue(queueName?: string): JQuery;
-
-    /**
-     * Store arbitrary data associated with the matched elements.
-     *
-     * @param key A string naming the piece of data to set.
-     * @param value The new data value; it can be any Javascript type including Array or Object.
-     */
-    data(key: string, value: any): JQuery;
-    /**
-     * Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute.
-     *
-     * @param key Name of the data stored.
-     */
-    data(key: string): any;
-    /**
-     * Store arbitrary data associated with the matched elements.
-     *
-     * @param obj An object of key-value pairs of data to update.
-     */
-    data(obj: { [key: string]: any; }): JQuery;
-    /**
-     * Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute.
-     */
-    data(): any;
-
-    /**
-     * Execute the next function on the queue for the matched elements.
-     *
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     */
-    dequeue(queueName?: string): JQuery;
-
-    /**
-     * Remove a previously-stored piece of data.
-     *
-     * @param name A string naming the piece of data to delete or space-separated string naming the pieces of data to delete.
-     */
-    removeData(name: string): JQuery;
-    /**
-     * Remove a previously-stored piece of data.
-     *
-     * @param list An array of strings naming the pieces of data to delete.
-     */
-    removeData(list: string[]): JQuery;
-    /**
-     * Remove all previously-stored piece of data.
-     */
-    removeData(): JQuery;
-
-    /**
-     * Return a Promise object to observe when all actions of a certain type bound to the collection, queued or not, have finished.
-     *
-     * @param type The type of queue that needs to be observed. (default: fx)
-     * @param target Object onto which the promise methods have to be attached
-     */
-    promise(type?: string, target?: Object): JQueryPromise<any>;
-
-    /**
-     * Perform a custom animation of a set of CSS properties.
-     *
-     * @param properties An object of CSS properties and values that the animation will move toward.
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     */
-    animate(properties: Object, duration?: string|number, complete?: Function): JQuery;
-    /**
-     * Perform a custom animation of a set of CSS properties.
-     *
-     * @param properties An object of CSS properties and values that the animation will move toward.
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition. (default: swing)
-     * @param complete A function to call once the animation is complete.
-     */
-    animate(properties: Object, duration?: string|number, easing?: string, complete?: Function): JQuery;
-    /**
-     * Perform a custom animation of a set of CSS properties.
-     *
-     * @param properties An object of CSS properties and values that the animation will move toward.
-     * @param options A map of additional options to pass to the method.
-     */
-    animate(properties: Object, options: JQueryAnimationOptions): JQuery;
-
-    /**
-     * Set a timer to delay execution of subsequent items in the queue.
-     *
-     * @param duration An integer indicating the number of milliseconds to delay execution of the next item in the queue.
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     */
-    delay(duration: number, queueName?: string): JQuery;
-
-    /**
-     * Display the matched elements by fading them to opaque.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     */
-    fadeIn(duration?: number|string, complete?: Function): JQuery;
-    /**
-     * Display the matched elements by fading them to opaque.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     */
-    fadeIn(duration?: number|string, easing?: string, complete?: Function): JQuery;
-    /**
-     * Display the matched elements by fading them to opaque.
-     *
-     * @param options A map of additional options to pass to the method.
-     */
-    fadeIn(options: JQueryAnimationOptions): JQuery;
-
-    /**
-     * Hide the matched elements by fading them to transparent.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     */
-    fadeOut(duration?: number|string, complete?: Function): JQuery;
-    /**
-     * Hide the matched elements by fading them to transparent.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     */
-    fadeOut(duration?: number|string, easing?: string, complete?: Function): JQuery;
-    /**
-     * Hide the matched elements by fading them to transparent.
-     *
-     * @param options A map of additional options to pass to the method.
-     */
-    fadeOut(options: JQueryAnimationOptions): JQuery;
-
-    /**
-     * Adjust the opacity of the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param opacity A number between 0 and 1 denoting the target opacity.
-     * @param complete A function to call once the animation is complete.
-     */
-    fadeTo(duration: string|number, opacity: number, complete?: Function): JQuery;
-    /**
-     * Adjust the opacity of the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param opacity A number between 0 and 1 denoting the target opacity.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     */
-    fadeTo(duration: string|number, opacity: number, easing?: string, complete?: Function): JQuery;
-
-    /**
-     * Display or hide the matched elements by animating their opacity.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     */
-    fadeToggle(duration?: number|string, complete?: Function): JQuery;
-    /**
-     * Display or hide the matched elements by animating their opacity.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     */
-    fadeToggle(duration?: number|string, easing?: string, complete?: Function): JQuery;
-    /**
-     * Display or hide the matched elements by animating their opacity.
-     *
-     * @param options A map of additional options to pass to the method.
-     */
-    fadeToggle(options: JQueryAnimationOptions): JQuery;
-
-    /**
-     * Stop the currently-running animation, remove all queued animations, and complete all animations for the matched elements.
-     *
-     * @param queue The name of the queue in which to stop animations.
-     */
-    finish(queue?: string): JQuery;
-
-    /**
-     * Hide the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     */
-    hide(duration?: number|string, complete?: Function): JQuery;
-    /**
-     * Hide the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     */
-    hide(duration?: number|string, easing?: string, complete?: Function): JQuery;
-    /**
-     * Hide the matched elements.
-     *
-     * @param options A map of additional options to pass to the method.
-     */
-    hide(options: JQueryAnimationOptions): JQuery;
-
-    /**
-     * Display the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     */
-    show(duration?: number|string, complete?: Function): JQuery;
-    /**
-     * Display the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     */
-    show(duration?: number|string, easing?: string, complete?: Function): JQuery;
-    /**
-     * Display the matched elements.
-     *
-     * @param options A map of additional options to pass to the method.
-     */
-    show(options: JQueryAnimationOptions): JQuery;
-
-    /**
-     * Display the matched elements with a sliding motion.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     */
-    slideDown(duration?: number|string, complete?: Function): JQuery;
-    /**
-     * Display the matched elements with a sliding motion.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     */
-    slideDown(duration?: number|string, easing?: string, complete?: Function): JQuery;
-    /**
-     * Display the matched elements with a sliding motion.
-     *
-     * @param options A map of additional options to pass to the method.
-     */
-    slideDown(options: JQueryAnimationOptions): JQuery;
-
-    /**
-     * Display or hide the matched elements with a sliding motion.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     */
-    slideToggle(duration?: number|string, complete?: Function): JQuery;
-    /**
-     * Display or hide the matched elements with a sliding motion.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     */
-    slideToggle(duration?: number|string, easing?: string, complete?: Function): JQuery;
-    /**
-     * Display or hide the matched elements with a sliding motion.
-     *
-     * @param options A map of additional options to pass to the method.
-     */
-    slideToggle(options: JQueryAnimationOptions): JQuery;
-
-    /**
-     * Hide the matched elements with a sliding motion.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     */
-    slideUp(duration?: number|string, complete?: Function): JQuery;
-    /**
-     * Hide the matched elements with a sliding motion.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     */
-    slideUp(duration?: number|string, easing?: string, complete?: Function): JQuery;
-    /**
-     * Hide the matched elements with a sliding motion.
-     *
-     * @param options A map of additional options to pass to the method.
-     */
-    slideUp(options: JQueryAnimationOptions): JQuery;
-
-    /**
-     * Stop the currently-running animation on the matched elements.
-     *
-     * @param clearQueue A Boolean indicating whether to remove queued animation as well. Defaults to false.
-     * @param jumpToEnd A Boolean indicating whether to complete the current animation immediately. Defaults to false.
-     */
-    stop(clearQueue?: boolean, jumpToEnd?: boolean): JQuery;
-    /**
-     * Stop the currently-running animation on the matched elements.
-     *
-     * @param queue The name of the queue in which to stop animations.
-     * @param clearQueue A Boolean indicating whether to remove queued animation as well. Defaults to false.
-     * @param jumpToEnd A Boolean indicating whether to complete the current animation immediately. Defaults to false.
-     */
-    stop(queue?: string, clearQueue?: boolean, jumpToEnd?: boolean): JQuery;
-
-    /**
-     * Display or hide the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     */
-    toggle(duration?: number|string, complete?: Function): JQuery;
-    /**
-     * Display or hide the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     */
-    toggle(duration?: number|string, easing?: string, complete?: Function): JQuery;
-    /**
-     * Display or hide the matched elements.
-     *
-     * @param options A map of additional options to pass to the method.
-     */
-    toggle(options: JQueryAnimationOptions): JQuery;
-    /**
-     * Display or hide the matched elements.
-     *
-     * @param showOrHide A Boolean indicating whether to show or hide the elements.
-     */
-    toggle(showOrHide: boolean): JQuery;
-
-    /**
-     * Attach a handler to an event for the elements.
-     * 
-     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    bind(eventType: string, eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Attach a handler to an event for the elements.
-     * 
-     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    bind(eventType: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Attach a handler to an event for the elements.
-     * 
-     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param preventBubble Setting the third argument to false will attach a function that prevents the default action from occurring and stops the event from bubbling. The default is true.
-     */
-    bind(eventType: string, eventData: any, preventBubble: boolean): JQuery;
-    /**
-     * Attach a handler to an event for the elements.
-     * 
-     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
-     * @param preventBubble Setting the third argument to false will attach a function that prevents the default action from occurring and stops the event from bubbling. The default is true.
-     */
-    bind(eventType: string, preventBubble: boolean): JQuery;
-    /**
-     * Attach a handler to an event for the elements.
-     * 
-     * @param events An object containing one or more DOM event types and functions to execute for them.
-     */
-    bind(events: any): JQuery;
-
-    /**
-     * Trigger the "blur" event on an element
-     */
-    blur(): JQuery;
-    /**
-     * Bind an event handler to the "blur" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    blur(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "blur" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    blur(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "change" event on an element.
-     */
-    change(): JQuery;
-    /**
-     * Bind an event handler to the "change" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    change(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "change" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    change(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "click" event on an element.
-     */
-    click(): JQuery;
-    /**
-     * Bind an event handler to the "click" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     */
-    click(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "click" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    click(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "dblclick" event on an element.
-     */
-    dblclick(): JQuery;
-    /**
-     * Bind an event handler to the "dblclick" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    dblclick(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "dblclick" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    dblclick(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    delegate(selector: any, eventType: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
-    delegate(selector: any, eventType: string, eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "focus" event on an element.
-     */
-    focus(): JQuery;
-    /**
-     * Bind an event handler to the "focus" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    focus(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "focus" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    focus(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "focusin" event on an element.
-     */
-    focusin(): JQuery;
-    /**
-     * Bind an event handler to the "focusin" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    focusin(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "focusin" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    focusin(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "focusout" event on an element.
-     */
-    focusout(): JQuery;
-    /**
-     * Bind an event handler to the "focusout" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    focusout(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "focusout" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    focusout(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Bind two handlers to the matched elements, to be executed when the mouse pointer enters and leaves the elements.
-     *
-     * @param handlerIn A function to execute when the mouse pointer enters the element.
-     * @param handlerOut A function to execute when the mouse pointer leaves the element.
-     */
-    hover(handlerIn: (eventObject: JQueryEventObject) => any, handlerOut: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind a single handler to the matched elements, to be executed when the mouse pointer enters or leaves the elements.
-     *
-     * @param handlerInOut A function to execute when the mouse pointer enters or leaves the element.
-     */
-    hover(handlerInOut: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "keydown" event on an element.
-     */
-    keydown(): JQuery;
-    /**
-     * Bind an event handler to the "keydown" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    keydown(handler: (eventObject: JQueryKeyEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "keydown" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    keydown(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "keypress" event on an element.
-     */
-    keypress(): JQuery;
-    /**
-     * Bind an event handler to the "keypress" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    keypress(handler: (eventObject: JQueryKeyEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "keypress" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    keypress(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "keyup" event on an element.
-     */
-    keyup(): JQuery;
-    /**
-     * Bind an event handler to the "keyup" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    keyup(handler: (eventObject: JQueryKeyEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "keyup" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    keyup(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): JQuery;
-
-    /**
-     * Bind an event handler to the "load" JavaScript event.
-     *
-     * @param handler A function to execute when the event is triggered.
-     */
-    load(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "load" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     */
-    load(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "mousedown" event on an element.
-     */
-    mousedown(): JQuery;
-    /**
-     * Bind an event handler to the "mousedown" JavaScript event.
-     *
-     * @param handler A function to execute when the event is triggered.
-     */
-    mousedown(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "mousedown" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     */
-    mousedown(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "mouseenter" event on an element.
-     */
-    mouseenter(): JQuery;
-    /**
-     * Bind an event handler to be fired when the mouse enters an element.
-     *
-     * @param handler A function to execute when the event is triggered.
-     */
-    mouseenter(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to be fired when the mouse enters an element.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     */
-    mouseenter(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "mouseleave" event on an element.
-     */
-    mouseleave(): JQuery;
-    /**
-     * Bind an event handler to be fired when the mouse leaves an element.
-     *
-     * @param handler A function to execute when the event is triggered.
-     */
-    mouseleave(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to be fired when the mouse leaves an element.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     */
-    mouseleave(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "mousemove" event on an element.
-     */
-    mousemove(): JQuery;
-    /**
-     * Bind an event handler to the "mousemove" JavaScript event.
-     *
-     * @param handler A function to execute when the event is triggered.
-     */
-    mousemove(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "mousemove" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     */
-    mousemove(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "mouseout" event on an element.
-     */
-    mouseout(): JQuery;
-    /**
-     * Bind an event handler to the "mouseout" JavaScript event.
-     *
-     * @param handler A function to execute when the event is triggered.
-     */
-    mouseout(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "mouseout" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     */
-    mouseout(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "mouseover" event on an element.
-     */
-    mouseover(): JQuery;
-    /**
-     * Bind an event handler to the "mouseover" JavaScript event.
-     *
-     * @param handler A function to execute when the event is triggered.
-     */
-    mouseover(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "mouseover" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     */
-    mouseover(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "mouseup" event on an element.
-     */
-    mouseup(): JQuery;
-    /**
-     * Bind an event handler to the "mouseup" JavaScript event.
-     *
-     * @param handler A function to execute when the event is triggered.
-     */
-    mouseup(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "mouseup" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     */
-    mouseup(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     */
-    off(): JQuery;
-    /**
-     * Remove an event handler.
-     *
-     * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin".
-     * @param selector A selector which should match the one originally passed to .on() when attaching event handlers.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: string, selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Remove an event handler.
-     *
-     * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin".
-     * @param handler A handler function previously attached for the event(s), or the special value false. Takes handler with extra args that can be attached with on().
-     */
-    off(events: string, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-    /**
-     * Remove an event handler.
-     *
-     * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin".
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Remove an event handler.
-     *
-     * @param events An object where the string keys represent one or more space-separated event types and optional namespaces, and the values represent handler functions previously attached for the event(s).
-     * @param selector A selector which should match the one originally passed to .on() when attaching event handlers.
-     */
-    off(events: { [key: string]: any; }, selector?: string): JQuery;
-
-    /**
-     * Attach an event handler function for one or more events to the selected elements.
-     *
-     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: string, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-    /**
-     * Attach an event handler function for one or more events to the selected elements.
-     *
-     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: string, data : any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-    /**
-     * Attach an event handler function for one or more events to the selected elements.
-     *
-     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: string, selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-    /**
-     * Attach an event handler function for one or more events to the selected elements.
-     *
-     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: string, selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-    /**
-     * Attach an event handler function for one or more events to the selected elements.
-     *
-     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
-     * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If the selector is null or omitted, the handler is always called when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event occurs.
-     */
-    on(events: { [key: string]: any; }, selector?: string, data?: any): JQuery;
-    /**
-     * Attach an event handler function for one or more events to the selected elements.
-     *
-     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
-     * @param data Data to be passed to the handler in event.data when an event occurs.
-     */
-    on(events: { [key: string]: any; }, data?: any): JQuery;
-
-    /**
-     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
-     *
-     * @param events A string containing one or more JavaScript event types, such as "click" or "submit," or custom event names.
-     * @param handler A function to execute at the time the event is triggered.
-     */
-    one(events: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
-     *
-     * @param events A string containing one or more JavaScript event types, such as "click" or "submit," or custom event names.
-     * @param data An object containing data that will be passed to the event handler.
-     * @param handler A function to execute at the time the event is triggered.
-     */
-    one(events: string, data: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
-     *
-     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    one(events: string, selector: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
-     *
-     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    one(events: string, selector: string, data: any, handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
-     *
-     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
-     * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If the selector is null or omitted, the handler is always called when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event occurs.
-     */
-    one(events: { [key: string]: any; }, selector?: string, data?: any): JQuery;
-
-    /**
-     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
-     *
-     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
-     * @param data Data to be passed to the handler in event.data when an event occurs.
-     */
-    one(events: { [key: string]: any; }, data?: any): JQuery;
-
-
-    /**
-     * Specify a function to execute when the DOM is fully loaded.
-     *
-     * @param handler A function to execute after the DOM is ready.
-     */
-    ready(handler: (jQueryAlias?: JQueryStatic) => any): JQuery;
-
-    /**
-     * Trigger the "resize" event on an element.
-     */
-    resize(): JQuery;
-    /**
-     * Bind an event handler to the "resize" JavaScript event.
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    resize(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "resize" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    resize(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "scroll" event on an element.
-     */
-    scroll(): JQuery;
-    /**
-     * Bind an event handler to the "scroll" JavaScript event.
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    scroll(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "scroll" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    scroll(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "select" event on an element.
-     */
-    select(): JQuery;
-    /**
-     * Bind an event handler to the "select" JavaScript event.
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    select(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "select" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    select(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "submit" event on an element.
-     */
-    submit(): JQuery;
-    /**
-     * Bind an event handler to the "submit" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     */
-    submit(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "submit" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     */
-    submit(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Execute all handlers and behaviors attached to the matched elements for the given event type.
-     * 
-     * @param eventType A string containing a JavaScript event type, such as click or submit.
-     * @param extraParameters Additional parameters to pass along to the event handler.
-     */
-    trigger(eventType: string, extraParameters?: any[]|Object): JQuery;
-    /**
-     * Execute all handlers and behaviors attached to the matched elements for the given event type.
-     * 
-     * @param event A jQuery.Event object.
-     * @param extraParameters Additional parameters to pass along to the event handler.
-     */
-    trigger(event: JQueryEventObject, extraParameters?: any[]|Object): JQuery;
-
-    /**
-     * Execute all handlers attached to an element for an event.
-     * 
-     * @param eventType A string containing a JavaScript event type, such as click or submit.
-     * @param extraParameters An array of additional parameters to pass along to the event handler.
-     */
-    triggerHandler(eventType: string, ...extraParameters: any[]): Object;
-
-    /**
-     * Execute all handlers attached to an element for an event.
-     * 
-     * @param event A jQuery.Event object.
-     * @param extraParameters An array of additional parameters to pass along to the event handler.
-     */
-    triggerHandler(event: JQueryEventObject, ...extraParameters: any[]): Object;
-
-    /**
-     * Remove a previously-attached event handler from the elements.
-     * 
-     * @param eventType A string containing a JavaScript event type, such as click or submit.
-     * @param handler The function that is to be no longer executed.
-     */
-    unbind(eventType?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Remove a previously-attached event handler from the elements.
-     * 
-     * @param eventType A string containing a JavaScript event type, such as click or submit.
-     * @param fls Unbinds the corresponding 'return false' function that was bound using .bind( eventType, false ).
-     */
-    unbind(eventType: string, fls: boolean): JQuery;
-    /**
-     * Remove a previously-attached event handler from the elements.
-     * 
-     * @param evt A JavaScript event object as passed to an event handler.
-     */
-    unbind(evt: any): JQuery;
-
-    /**
-     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
-     */
-    undelegate(): JQuery;
-    /**
-     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
-     * 
-     * @param selector A selector which will be used to filter the event results.
-     * @param eventType A string containing a JavaScript event type, such as "click" or "keydown"
-     * @param handler A function to execute at the time the event is triggered.
-     */
-    undelegate(selector: string, eventType: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
-     * 
-     * @param selector A selector which will be used to filter the event results.
-     * @param events An object of one or more event types and previously bound functions to unbind from them.
-     */
-    undelegate(selector: string, events: Object): JQuery;
-    /**
-     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
-     * 
-     * @param namespace A string containing a namespace to unbind all events from.
-     */
-    undelegate(namespace: string): JQuery;
-
-    /**
-     * Bind an event handler to the "unload" JavaScript event. (DEPRECATED from v1.8)
-     * 
-     * @param handler A function to execute when the event is triggered.
-     */
-    unload(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "unload" JavaScript event. (DEPRECATED from v1.8)
-     * 
-     * @param eventData A plain object of data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     */
-    unload(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * The DOM node context originally passed to jQuery(); if none was passed then context will likely be the document. (DEPRECATED from v1.10)
-     */
-    context: Element;
-
-    jquery: string;
-
-    /**
-     * Bind an event handler to the "error" JavaScript event. (DEPRECATED from v1.8)
-     * 
-     * @param handler A function to execute when the event is triggered.
-     */
-    error(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "error" JavaScript event. (DEPRECATED from v1.8)
-     * 
-     * @param eventData A plain object of data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     */
-    error(eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Add a collection of DOM elements onto the jQuery stack.
-     * 
-     * @param elements An array of elements to push onto the stack and make into a new jQuery object.
-     */
-    pushStack(elements: any[]): JQuery;
-    /**
-     * Add a collection of DOM elements onto the jQuery stack.
-     * 
-     * @param elements An array of elements to push onto the stack and make into a new jQuery object.
-     * @param name The name of a jQuery method that generated the array of elements.
-     * @param arguments The arguments that were passed in to the jQuery method (for serialization).
-     */
-    pushStack(elements: any[], name: string, arguments: any[]): JQuery;
-
-    /**
-     * Insert content, specified by the parameter, after each element in the set of matched elements.
-     * 
-     * param content1 HTML string, DOM element, array of elements, or jQuery object to insert after each element in the set of matched elements.
-     * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert after each element in the set of matched elements.
-     */
-    after(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): JQuery;
-    /**
-     * Insert content, specified by the parameter, after each element in the set of matched elements.
-     * 
-     * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert after each element in the set of matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
-     */
-    after(func: (index: number, html: string) => string|Element|JQuery): JQuery;
-
-    /**
-     * Insert content, specified by the parameter, to the end of each element in the set of matched elements.
-     * 
-     * param content1 DOM element, array of elements, HTML string, or jQuery object to insert at the end of each element in the set of matched elements.
-     * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the end of each element in the set of matched elements.
-     */
-    append(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): JQuery;
-    /**
-     * Insert content, specified by the parameter, to the end of each element in the set of matched elements.
-     * 
-     * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert at the end of each element in the set of matched elements. Receives the index position of the element in the set and the old HTML value of the element as arguments. Within the function, this refers to the current element in the set.
-     */
-    append(func: (index: number, html: string) => string|Element|JQuery): JQuery;
-
-    /**
-     * Insert every element in the set of matched elements to the end of the target.
-     * 
-     * @param target A selector, element, HTML string, array of elements, or jQuery object; the matched set of elements will be inserted at the end of the element(s) specified by this parameter.
-     */
-    appendTo(target: JQuery|any[]|Element|string): JQuery;
-
-    /**
-     * Insert content, specified by the parameter, before each element in the set of matched elements.
-     * 
-     * param content1 HTML string, DOM element, array of elements, or jQuery object to insert before each element in the set of matched elements.
-     * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert before each element in the set of matched elements.
-     */
-    before(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): JQuery;
-    /**
-     * Insert content, specified by the parameter, before each element in the set of matched elements.
-     * 
-     * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert before each element in the set of matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
-     */
-    before(func: (index: number, html: string) => string|Element|JQuery): JQuery;
-
-    /**
-     * Create a deep copy of the set of matched elements.
-     * 
-     * param withDataAndEvents A Boolean indicating whether event handlers and data should be copied along with the elements. The default value is false.
-     * param deepWithDataAndEvents A Boolean indicating whether event handlers and data for all children of the cloned element should be copied. By default its value matches the first argument's value (which defaults to false).
-     */
-    clone(withDataAndEvents?: boolean, deepWithDataAndEvents?: boolean): JQuery;
-
-    /**
-     * Remove the set of matched elements from the DOM.
-     * 
-     * param selector A selector expression that filters the set of matched elements to be removed.
-     */
-    detach(selector?: string): JQuery;
-
-    /**
-     * Remove all child nodes of the set of matched elements from the DOM.
-     */
-    empty(): JQuery;
-
-    /**
-     * Insert every element in the set of matched elements after the target.
-     * 
-     * param target A selector, element, array of elements, HTML string, or jQuery object; the matched set of elements will be inserted after the element(s) specified by this parameter.
-     */
-    insertAfter(target: JQuery|any[]|Element|Text|string): JQuery;
-
-    /**
-     * Insert every element in the set of matched elements before the target.
-     * 
-     * param target A selector, element, array of elements, HTML string, or jQuery object; the matched set of elements will be inserted before the element(s) specified by this parameter.
-     */
-    insertBefore(target: JQuery|any[]|Element|Text|string): JQuery;
-
-    /**
-     * Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.
-     * 
-     * param content1 DOM element, array of elements, HTML string, or jQuery object to insert at the beginning of each element in the set of matched elements.
-     * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the beginning of each element in the set of matched elements.
-     */
-    prepend(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): JQuery;
-    /**
-     * Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.
-     * 
-     * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert at the beginning of each element in the set of matched elements. Receives the index position of the element in the set and the old HTML value of the element as arguments. Within the function, this refers to the current element in the set.
-     */
-    prepend(func: (index: number, html: string) => string|Element|JQuery): JQuery;
-
-    /**
-     * Insert every element in the set of matched elements to the beginning of the target.
-     * 
-     * @param target A selector, element, HTML string, array of elements, or jQuery object; the matched set of elements will be inserted at the beginning of the element(s) specified by this parameter.
-     */
-    prependTo(target: JQuery|any[]|Element|string): JQuery;
-
-    /**
-     * Remove the set of matched elements from the DOM.
-     * 
-     * @param selector A selector expression that filters the set of matched elements to be removed.
-     */
-    remove(selector?: string): JQuery;
-
-    /**
-     * Replace each target element with the set of matched elements.
-     * 
-     * @param target A selector string, jQuery object, DOM element, or array of elements indicating which element(s) to replace.
-     */
-    replaceAll(target: JQuery|any[]|Element|string): JQuery;
-
-    /**
-     * Replace each element in the set of matched elements with the provided new content and return the set of elements that was removed.
-     * 
-     * param newContent The content to insert. May be an HTML string, DOM element, array of DOM elements, or jQuery object.
-     */
-    replaceWith(newContent: JQuery|any[]|Element|Text|string): JQuery;
-    /**
-     * Replace each element in the set of matched elements with the provided new content and return the set of elements that was removed.
-     * 
-     * param func A function that returns content with which to replace the set of matched elements.
-     */
-    replaceWith(func: () => Element|JQuery): JQuery;
-
-    /**
-     * Get the combined text contents of each element in the set of matched elements, including their descendants.
-     */
-    text(): string;
-    /**
-     * Set the content of each element in the set of matched elements to the specified text.
-     * 
-     * @param text The text to set as the content of each matched element. When Number or Boolean is supplied, it will be converted to a String representation.
-     */
-    text(text: string|number|boolean): JQuery;
-    /**
-     * Set the content of each element in the set of matched elements to the specified text.
-     * 
-     * @param func A function returning the text content to set. Receives the index position of the element in the set and the old text value as arguments.
-     */
-    text(func: (index: number, text: string) => string): JQuery;
-
-    /**
-     * Retrieve all the elements contained in the jQuery set, as an array.
-     */
-    toArray(): any[];
-
-    /**
-     * Remove the parents of the set of matched elements from the DOM, leaving the matched elements in their place.
-     */
-    unwrap(): JQuery;
-
-    /**
-     * Wrap an HTML structure around each element in the set of matched elements.
-     * 
-     * @param wrappingElement A selector, element, HTML string, or jQuery object specifying the structure to wrap around the matched elements.
-     */
-    wrap(wrappingElement: JQuery|Element|string): JQuery;
-    /**
-     * Wrap an HTML structure around each element in the set of matched elements.
-     * 
-     * @param func A callback function returning the HTML content or jQuery object to wrap around the matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
-     */
-    wrap(func: (index: number) => string|JQuery): JQuery;
-
-    /**
-     * Wrap an HTML structure around all elements in the set of matched elements.
-     * 
-     * @param wrappingElement A selector, element, HTML string, or jQuery object specifying the structure to wrap around the matched elements.
-     */
-    wrapAll(wrappingElement: JQuery|Element|string): JQuery;
-    wrapAll(func: (index: number) => string): JQuery;
-
-    /**
-     * Wrap an HTML structure around the content of each element in the set of matched elements.
-     * 
-     * @param wrappingElement An HTML snippet, selector expression, jQuery object, or DOM element specifying the structure to wrap around the content of the matched elements.
-     */
-    wrapInner(wrappingElement: JQuery|Element|string): JQuery;
-    /**
-     * Wrap an HTML structure around the content of each element in the set of matched elements.
-     * 
-     * @param func A callback function which generates a structure to wrap around the content of the matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
-     */
-    wrapInner(func: (index: number) => string): JQuery;
-
-    /**
-     * Iterate over a jQuery object, executing a function for each matched element.
-     * 
-     * @param func A function to execute for each matched element.
-     */
-    each(func: (index: number, elem: Element) => any): JQuery;
-
-    /**
-     * Retrieve one of the elements matched by the jQuery object.
-     * 
-     * @param index A zero-based integer indicating which element to retrieve.
-     */
-    get(index: number): HTMLElement;
-    /**
-     * Retrieve the elements matched by the jQuery object.
-     */
-    get(): any[];
-
-    /**
-     * Search for a given element from among the matched elements.
-     */
-    index(): number;
-    /**
-     * Search for a given element from among the matched elements.
-     * 
-     * @param selector A selector representing a jQuery collection in which to look for an element.
-     */
-    index(selector: string|JQuery|Element): number;
-
-    /**
-     * The number of elements in the jQuery object.
-     */
-    length: number;
-    /**
-     * A selector representing selector passed to jQuery(), if any, when creating the original set.
-     * version deprecated: 1.7, removed: 1.9
-     */
-    selector: string;
-    [index: string]: any;
-    [index: number]: HTMLElement;
-
-    /**
-     * Add elements to the set of matched elements.
-     * 
-     * @param selector A string representing a selector expression to find additional elements to add to the set of matched elements.
-     * @param context The point in the document at which the selector should begin matching; similar to the context argument of the $(selector, context) method.
-     */
-    add(selector: string, context?: Element): JQuery;
-    /**
-     * Add elements to the set of matched elements.
-     * 
-     * @param elements One or more elements to add to the set of matched elements.
-     */
-    add(...elements: Element[]): JQuery;
-    /**
-     * Add elements to the set of matched elements.
-     * 
-     * @param html An HTML fragment to add to the set of matched elements.
-     */
-    add(html: string): JQuery;
-    /**
-     * Add elements to the set of matched elements.
-     * 
-     * @param obj An existing jQuery object to add to the set of matched elements.
-     */
-    add(obj: JQuery): JQuery;
-
-    /**
-     * Get the children of each element in the set of matched elements, optionally filtered by a selector.
-     * 
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    children(selector?: string): JQuery;
-
-    /**
-     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
-     * 
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    closest(selector: string): JQuery;
-    /**
-     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
-     * 
-     * @param selector A string containing a selector expression to match elements against.
-     * @param context A DOM element within which a matching element may be found. If no context is passed in then the context of the jQuery set will be used instead.
-     */
-    closest(selector: string, context?: Element): JQuery;
-    /**
-     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
-     * 
-     * @param obj A jQuery object to match elements against.
-     */
-    closest(obj: JQuery): JQuery;
-    /**
-     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
-     * 
-     * @param element An element to match elements against.
-     */
-    closest(element: Element): JQuery;
-
-    /**
-     * Get an array of all the elements and selectors matched against the current element up through the DOM tree.
-     * 
-     * @param selectors An array or string containing a selector expression to match elements against (can also be a jQuery object).
-     * @param context A DOM element within which a matching element may be found. If no context is passed in then the context of the jQuery set will be used instead.
-     */
-    closest(selectors: any, context?: Element): any[];
-
-    /**
-     * Get the children of each element in the set of matched elements, including text and comment nodes.
-     */
-    contents(): JQuery;
-
-    /**
-     * End the most recent filtering operation in the current chain and return the set of matched elements to its previous state.
-     */
-    end(): JQuery;
-
-    /**
-     * Reduce the set of matched elements to the one at the specified index.
-     * 
-     * @param index An integer indicating the 0-based position of the element. OR An integer indicating the position of the element, counting backwards from the last element in the set.
-     *  
-     */
-    eq(index: number): JQuery;
-
-    /**
-     * Reduce the set of matched elements to those that match the selector or pass the function's test.
-     * 
-     * @param selector A string containing a selector expression to match the current set of elements against.
-     */
-    filter(selector: string): JQuery;
-    /**
-     * Reduce the set of matched elements to those that match the selector or pass the function's test.
-     * 
-     * @param func A function used as a test for each element in the set. this is the current DOM element.
-     */
-    filter(func: (index: number, element: Element) => any): JQuery;
-    /**
-     * Reduce the set of matched elements to those that match the selector or pass the function's test.
-     * 
-     * @param element An element to match the current set of elements against.
-     */
-    filter(element: Element): JQuery;
-    /**
-     * Reduce the set of matched elements to those that match the selector or pass the function's test.
-     * 
-     * @param obj An existing jQuery object to match the current set of elements against.
-     */
-    filter(obj: JQuery): JQuery;
-
-    /**
-     * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.
-     * 
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    find(selector: string): JQuery;
-    /**
-     * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.
-     * 
-     * @param element An element to match elements against.
-     */
-    find(element: Element): JQuery;
-    /**
-     * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.
-     * 
-     * @param obj A jQuery object to match elements against.
-     */
-    find(obj: JQuery): JQuery;
-
-    /**
-     * Reduce the set of matched elements to the first in the set.
-     */
-    first(): JQuery;
-
-    /**
-     * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.
-     * 
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    has(selector: string): JQuery;
-    /**
-     * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.
-     * 
-     * @param contained A DOM element to match elements against.
-     */
-    has(contained: Element): JQuery;
-
-    /**
-     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
-     * 
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    is(selector: string): boolean;
-    /**
-     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
-     * 
-     * @param func A function used as a test for the set of elements. It accepts one argument, index, which is the element's index in the jQuery collection.Within the function, this refers to the current DOM element.
-     */
-    is(func: (index: number, element: Element) => boolean): boolean;
-    /**
-     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
-     * 
-     * @param obj An existing jQuery object to match the current set of elements against.
-     */
-    is(obj: JQuery): boolean;
-    /**
-     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
-     * 
-     * @param elements One or more elements to match the current set of elements against.
-     */
-    is(elements: any): boolean;
-
-    /**
-     * Reduce the set of matched elements to the final one in the set.
-     */
-    last(): JQuery;
-
-    /**
-     * Pass each element in the current matched set through a function, producing a new jQuery object containing the return values.
-     * 
-     * @param callback A function object that will be invoked for each element in the current set.
-     */
-    map(callback: (index: number, domElement: Element) => any): JQuery;
-
-    /**
-     * Get the immediately following sibling of each element in the set of matched elements. If a selector is provided, it retrieves the next sibling only if it matches that selector.
-     * 
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    next(selector?: string): JQuery;
-
-    /**
-     * Get all following siblings of each element in the set of matched elements, optionally filtered by a selector.
-     * 
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    nextAll(selector?: string): JQuery;
-
-    /**
-     * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.
-     * 
-     * @param selector A string containing a selector expression to indicate where to stop matching following sibling elements.
-     * @param filter A string containing a selector expression to match elements against.
-     */
-    nextUntil(selector?: string, filter?: string): JQuery;
-    /**
-     * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.
-     * 
-     * @param element A DOM node or jQuery object indicating where to stop matching following sibling elements.
-     * @param filter A string containing a selector expression to match elements against.
-     */
-    nextUntil(element?: Element, filter?: string): JQuery;
-    /**
-     * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.
-     * 
-     * @param obj A DOM node or jQuery object indicating where to stop matching following sibling elements.
-     * @param filter A string containing a selector expression to match elements against.
-     */
-    nextUntil(obj?: JQuery, filter?: string): JQuery;
-
-    /**
-     * Remove elements from the set of matched elements.
-     * 
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    not(selector: string): JQuery;
-    /**
-     * Remove elements from the set of matched elements.
-     * 
-     * @param func A function used as a test for each element in the set. this is the current DOM element.
-     */
-    not(func: (index: number, element: Element) => boolean): JQuery;
-    /**
-     * Remove elements from the set of matched elements.
-     * 
-     * @param elements One or more DOM elements to remove from the matched set.
-     */
-    not(elements: Element|Element[]): JQuery;
-    /**
-     * Remove elements from the set of matched elements.
-     * 
-     * @param obj An existing jQuery object to match the current set of elements against.
-     */
-    not(obj: JQuery): JQuery;
-
-    /**
-     * Get the closest ancestor element that is positioned.
-     */
-    offsetParent(): JQuery;
-
-    /**
-     * Get the parent of each element in the current set of matched elements, optionally filtered by a selector.
-     * 
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    parent(selector?: string): JQuery;
-
-    /**
-     * Get the ancestors of each element in the current set of matched elements, optionally filtered by a selector.
-     * 
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    parents(selector?: string): JQuery;
-
-    /**
-     * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.
-     * 
-     * @param selector A string containing a selector expression to indicate where to stop matching ancestor elements.
-     * @param filter A string containing a selector expression to match elements against.
-     */
-    parentsUntil(selector?: string, filter?: string): JQuery;
-    /**
-     * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.
-     * 
-     * @param element A DOM node or jQuery object indicating where to stop matching ancestor elements.
-     * @param filter A string containing a selector expression to match elements against.
-     */
-    parentsUntil(element?: Element, filter?: string): JQuery;
-    /**
-     * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.
-     * 
-     * @param obj A DOM node or jQuery object indicating where to stop matching ancestor elements.
-     * @param filter A string containing a selector expression to match elements against.
-     */
-    parentsUntil(obj?: JQuery, filter?: string): JQuery;
-
-    /**
-     * Get the immediately preceding sibling of each element in the set of matched elements, optionally filtered by a selector.
-     * 
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    prev(selector?: string): JQuery;
-
-    /**
-     * Get all preceding siblings of each element in the set of matched elements, optionally filtered by a selector.
-     * 
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    prevAll(selector?: string): JQuery;
-
-    /**
-     * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.
-     * 
-     * @param selector A string containing a selector expression to indicate where to stop matching preceding sibling elements.
-     * @param filter A string containing a selector expression to match elements against.
-     */
-    prevUntil(selector?: string, filter?: string): JQuery;
-    /**
-     * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.
-     * 
-     * @param element A DOM node or jQuery object indicating where to stop matching preceding sibling elements.
-     * @param filter A string containing a selector expression to match elements against.
-     */
-    prevUntil(element?: Element, filter?: string): JQuery;
-    /**
-     * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.
-     * 
-     * @param obj A DOM node or jQuery object indicating where to stop matching preceding sibling elements.
-     * @param filter A string containing a selector expression to match elements against.
-     */
-    prevUntil(obj?: JQuery, filter?: string): JQuery;
-
-    /**
-     * Get the siblings of each element in the set of matched elements, optionally filtered by a selector.
-     * 
-     * @param selector A string containing a selector expression to match elements against.
-     */
-    siblings(selector?: string): JQuery;
-
-    /**
-     * Reduce the set of matched elements to a subset specified by a range of indices.
-     * 
-     * @param start An integer indicating the 0-based position at which the elements begin to be selected. If negative, it indicates an offset from the end of the set.
-     * @param end An integer indicating the 0-based position at which the elements stop being selected. If negative, it indicates an offset from the end of the set. If omitted, the range continues until the end of the set.
-     */
-    slice(start: number, end?: number): JQuery;
-
-    /**
-     * Show the queue of functions to be executed on the matched elements.
-     * 
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     */
-    queue(queueName?: string): any[];
-    /**
-     * Manipulate the queue of functions to be executed, once for each matched element.
-     * 
-     * @param newQueue An array of functions to replace the current queue contents.
-     */
-    queue(newQueue: Function[]): JQuery;
-    /**
-     * Manipulate the queue of functions to be executed, once for each matched element.
-     * 
-     * @param callback The new function to add to the queue, with a function to call that will dequeue the next item.
-     */
-    queue(callback: Function): JQuery;
-    /**
-     * Manipulate the queue of functions to be executed, once for each matched element.
-     * 
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @param newQueue An array of functions to replace the current queue contents.
-     */
-    queue(queueName: string, newQueue: Function[]): JQuery;
-    /**
-     * Manipulate the queue of functions to be executed, once for each matched element.
-     * 
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @param callback The new function to add to the queue, with a function to call that will dequeue the next item.
-     */
-    queue(queueName: string, callback: Function): JQuery;
-}
-declare module "jquery" {
-    export = $;
-}
-declare var jQuery: JQueryStatic;
-declare var $: JQueryStatic;
diff --git a/jquery/tsconfig.json b/jquery/tsconfig.json
new file mode 100644
index 0000000000..bf3bd76378
--- /dev/null
+++ b/jquery/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jquerymobile/index.d.ts b/jquerymobile/index.d.ts
new file mode 100644
index 0000000000..8d72e7d2a3
--- /dev/null
+++ b/jquerymobile/index.d.ts
@@ -0,0 +1,492 @@
+// Type definitions for jQuery Mobile 1.4
+// Project: http://jquerymobile.com/
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="jquery"/>
+
+interface JQueryMobileEvent { (event: Event, ui: any): void; }
+
+interface DialogOptions {
+    closeBtn?: string;
+    closeBtnText?: string;
+    corners?: boolean;
+    initSelector?: string;
+    overlayTheme?: string;
+}
+
+interface DialogEvents {
+    create?: JQueryMobileEvent;
+}
+
+interface PopupOptions {
+    corners?: boolean;
+    history?: boolean;
+    initSelector?: string;
+    overlayTheme?: string;
+    positionTo?: string;
+    shadow?: boolean;
+    theme?: string;
+    tolerance?: string;
+    transition?: string;
+}
+
+interface PopupEvents {
+    popupbeforeposition?: JQueryMobileEvent;
+    popupafteropen?: JQueryMobileEvent;
+    popupafterclose?: JQueryMobileEvent;
+}
+
+interface FixedToolbarOptions {
+    visibleOnPageShow?: boolean;
+    disablePageZoom?: boolean;
+    transition?: string;
+    fullscreen?: boolean;
+    tapToggle?: boolean;
+    tapToggleBlacklist?: string;
+    hideDuringFocus?: string;
+    updatePagePadding?: boolean;
+    supportBlacklist?: Function;
+    initSelector?: string;
+}
+
+interface FixedToolbarEvents {
+    create?: JQueryMobileEvent;
+}
+
+interface ButtonOptions {
+    corners?: boolean;
+    icon?: string;
+    iconpos?: string;
+    iconshadow?: boolean;
+    inline?: boolean;
+    mini?: boolean;
+    shadow?: boolean;
+    theme?: string;
+    initSelector?: string;
+}
+
+interface ButtonEvents {
+    create?: JQueryMobileEvent;
+}
+
+interface CollapsibleOptions {
+    collapsed?: boolean;
+    collapseCueText?: string;
+    collapsedIcon?: string;
+    contentTheme?: string;
+    expandCueText?: string;
+    expandedIcon?: string;
+    heading?: string;
+    iconpos?: string;
+    initSelector?: string;
+    inset?: boolean;
+    mini?: boolean;
+    theme?: string;
+}
+
+interface CollapsibleEvents {
+    create?: JQueryMobileEvent;
+    collapse?: JQueryMobileEvent;
+    expand?: JQueryMobileEvent;
+}
+
+interface CollapsibleSetOptions {
+    collapsedIcon?: string;
+    expandedIcon?: string;
+    iconpos?: string;
+    initSelector?: string;
+    inset?: boolean;
+    mini?: boolean;
+    theme?: string;
+}
+
+interface CollapsibleSetEvents {
+    create?: JQueryMobileEvent;
+}
+
+interface TextInputOptions {
+    clearBtn?: boolean;
+    clearBtnText?: string;
+    disabled?: boolean;
+    initSelector?: string;
+    mini?: boolean;
+    preventFocusZoom?: boolean;
+    theme?: string;
+}
+
+interface TextInputEvents {
+    create?: JQueryMobileEvent;
+}
+
+interface SearchInputOptions {
+    clearSearchButtonText?: string;
+    disabled?: boolean;
+    initSelector?: string;
+    mini?: boolean;
+    theme?: string;
+}
+
+interface SliderOptions {
+    disabled?: boolean;
+    highlight?: boolean;
+    initSelector?: string;
+    mini?: boolean;
+    theme?: string;
+    trackTheme?: string;
+}
+
+interface SliderEvents {
+    create?: JQueryMobileEvent;
+    slidestart?: JQueryMobileEvent;
+    slidestop?: JQueryMobileEvent;
+}
+
+interface FlipswitchOptions {
+    corners?: boolean;
+    defaults?: boolean;
+    disabled?: boolean;
+    enhanced?: boolean;
+    mini?: boolean;
+    offText?: string;
+    onText?: string;
+    theme?: string;
+    wrapperClass?: string;
+}
+
+interface CheckboxRadioOptions {
+    mini?: boolean;
+    theme?: string;
+}
+
+interface CheckboxRadioEvents {
+    create?: JQueryMobileEvent;
+}
+
+interface SelectMenuOptions {
+    corners?: boolean;
+    icon?: string;
+    iconpos?: string;
+    iconshadow?: boolean;
+    initSelector?: string;
+    inline?: boolean;
+    hidePlaceholderMenuItems: boolean;
+    mini?: boolean;
+    nativeMenu?: boolean;
+    overlayTheme?: string;
+    preventFocusZoom?: boolean;
+    shadow?: boolean;
+    theme?: string;
+}
+
+interface SelectMenuEvents {
+    create?: JQueryMobileEvent;
+}
+
+interface ListViewOptions {
+    autodividers?: boolean;
+    autodividersSelector?: (jq?: JQuery) => string;
+    countTheme?: string;
+    defaults?: boolean;
+    disabled?: boolean;
+    dividerTheme?: string;
+    filter?: boolean;
+    filterCallback?: Function;
+    filterPlaceholder?: string;
+    filterTheme?: string;
+    headerTheme?: string;
+    initSelector?: string;
+    inset?: boolean;
+    splitIcon?: string;
+    splitTheme?: string;
+    theme?: string;
+}
+
+interface ListViewEvents {
+    create?: JQueryMobileEvent;
+}
+
+interface FilterableOptions {
+    children?: any;
+    defaults?: boolean;
+    disabled?: boolean;
+    enhanced?: boolean;
+    filterCallback?: {(index: number, searchValue?: string): boolean; };
+    filterPlaceholder?: string;
+    filterReveal?: boolean;
+    filterTheme?: string;
+    input: any;
+}
+
+interface NavbarOptions {
+    iconpos: string;
+}
+
+interface ControlgroupOptions {
+    corners?: boolean;
+    excludeInvisible?: boolean;
+    mini?: boolean;
+    shadow?: boolean;
+    type?: string;
+}
+
+interface JQueryMobileOptions {
+    activeBtnClass?: string;
+    activePageClass?: string;
+    ajaxEnabled?: boolean;
+    allowCrossDomainPages?: boolean;
+    autoInitializePage?: boolean;
+    buttonMarkup: any;
+    defaultDialogTransition?: string;
+    defaultPageTransition?: string;
+    getMaxScrollForTransition?: number;
+    gradeA?: Function;
+    hashListeningEnabled?: boolean;
+    ignoreContentEnabled?: boolean;
+    linkBindingEnabled?: boolean;
+    loadingMessageTextVisible?: boolean;
+    loadingMessageTheme?: string;
+    maxTransitionWidth?: number;
+    minScrollBack?: number;
+    ns?: number;
+    pageLoadErrorMessage?: string;
+    pageLoadErrorMessageTheme?: string;
+    phonegapNavigationEnabled?: boolean;
+    pushStateEnabled?: boolean;
+    subPageUrlKey?: string;
+    touchOverflowEnabled?: boolean;
+    transitionFallbacks: any;
+}
+
+interface JQueryMobileEvents {
+    tap: any;
+    taphold: any;
+    swipe: any;
+    swipeleft: any;
+    swiperight: any;
+
+    vmouseover: any;
+    vmouseout: any;
+    vmousedown: any;
+    vmousemove: any;
+    vmouseup: any;
+    vclick: any;
+    vmousecancel: any;
+
+    orientationchange: any;
+    scrollstart: any;
+    scrollstop: any;
+
+    pagebeforeload: any;
+    pageload: any;
+    pageloadfailed: any;
+    pagebeforechange: any;
+    pagechange: any;
+    pagechangefailed: any;
+    pagebeforeshow: any;
+    pagebeforehide: any;
+    pageshow: any;
+    pagehide: any;
+    pagebeforecreate: any;
+    pagecreate: any;
+    pageinit: any;
+    pageremove: any;
+    updatelayout: any;
+}
+
+interface ChangePageOptions {
+    allowSamePageTransition?: boolean;
+    changeHash?: boolean;
+    data?: any;
+    dataUrl?: string;
+    pageContainer?: JQuery;
+    reloadPage?: boolean;
+    reverse?: boolean;
+    role?: string;
+    showLoadMsg?: boolean;
+    transition?: string;
+    type?: string;
+}
+
+interface LoadPageOptions {
+    data?: any;
+    loadMsgDelay?: number;
+    pageContainer?: JQuery;
+    reloadPage?: boolean;
+    role?: string;
+    showLoadMsg?: boolean;
+    type?: string;
+}
+
+interface LoaderOptions {
+    theme?: string;
+    textVisible?: boolean;
+    html?: string;
+    text?: string;
+    textonly?: boolean;
+}
+
+interface JQueryMobilePath {
+    get(url: string): string;
+    getDocumentBase(asParsedObject?: boolean): any;
+    getDocumentUrl(asParsedObject?: boolean): any;
+    getLocation(): string;
+    isAbsoluteUrl(url: string): boolean;
+    isRelativeUrl(url: string): boolean;
+    makeUrlAbsolute(relUrl: string, absUrl: string): string;
+    parseLocation(): ParsedPath;
+    parseUrl(url: string): ParsedPath;
+}
+
+interface ParsedPath {
+    authority: string;
+    directory: string;
+    domain: string;
+    doubleSlash: string;
+    filename: string;
+    hash: string;
+    host: string;
+    hostname: string;
+    href: string;
+    hrefNoHash: string;
+    hrefNoSearch: string;
+    password: string;
+    pathname: string;
+    port: string;
+    protocol: string;
+    search: string;
+    username: string;
+}
+
+interface JQueryMobile extends JQueryMobileOptions {
+
+    version: string;
+
+    changePage(to: any, options?: ChangePageOptions): void;
+    initializePage(): void;
+    loadPage(url: any, options?: LoadPageOptions): void;
+    loading(): JQuery;
+    loading(command: string, options?: LoaderOptions): JQuery;
+
+    pageContainer: any;
+    base: any;
+    silentScroll(yPos: number): void;
+    activePage: JQuery;
+
+    options: JQueryMobileOptions;
+
+    transitionFallbacks: any;
+    loader: any;
+    page: any;
+
+    touchOverflow: any;
+    showCategory: any;
+    path: JQueryMobilePath;
+
+    dialog: any;
+    popup: any;
+    fixedtoolbar: any;
+    button: any;
+    collapsible: any;
+    collapsibleset: any;
+    textinput: any;
+    slider: any;
+    flipswitch: any;
+    checkboxradio: any;
+    selectmenu: any;
+    listview: any;
+    filterable: any;
+    defaultHomeScroll: number;
+}
+
+interface JQuerySupport {
+    touchOverflow: any;
+}
+
+interface JQuery {
+
+    enhanceWithin(): JQuery;
+
+    dialog(): JQuery;
+    dialog(command: string): JQuery;
+    dialog(options: DialogOptions): JQuery;
+    dialog(events: DialogEvents): JQuery;
+
+    popup(): JQuery;
+    popup(command: string): JQuery;
+    popup(options: PopupOptions): JQuery;
+    popup(command: string, options: PopupOptions): JQuery;
+    popup(events: PopupEvents): JQuery;
+
+    fixedtoolbar(): JQuery;
+    fixedtoolbar(command: string): JQuery;
+    fixedtoolbar(options: FixedToolbarOptions): JQuery;
+    fixedtoolbar(events: FixedToolbarEvents): JQuery;
+
+
+    button(): JQuery;
+    button(command: string): JQuery;
+    button(options?: ButtonOptions): JQuery;
+    button(events: ButtonEvents): JQuery;
+    
+    buttonMarkup(options?: ButtonOptions): JQuery;
+
+    collapsible(): JQuery;
+    collapsible(command: string): JQuery;
+    collapsible(options: CollapsibleOptions): JQuery;
+    collapsible(events: CollapsibleEvents): JQuery;
+    collapsibleSet(): JQuery;
+    collapsibleSet(command: string): JQuery;
+    collapsibleset(options: CollapsibleSetOptions): JQuery;
+    collapsibleset(events: CollapsibleSetEvents): JQuery;
+
+    textinput(): JQuery;
+    textinput(command: string): JQuery;
+    textinput(options: TextInputOptions): JQuery;
+    textinput(events: TextInputEvents): JQuery;
+    textinput(options: SearchInputOptions): JQuery;
+
+    slider(): JQuery;
+    slider(command: string): JQuery;
+    slider(options: SliderOptions): JQuery;
+    slider(events: SliderEvents): JQuery;
+
+    flipswitch(): JQuery;
+    flipswitch(command: string): JQuery;
+    flipswitch(options: FlipswitchOptions): JQuery;
+
+    checkboxradio(): JQuery;
+    checkboxradio(command: string): JQuery;
+    checkboxradio(options: CheckboxRadioOptions): JQuery;
+    checkboxradio(events: CheckboxRadioEvents): JQuery;
+
+    selectmenu(): JQuery;
+    selectmenu(command: string): JQuery;
+    selectmenu(command: string, update: boolean): JQuery;
+    selectmenu(options: SelectMenuOptions): JQuery;
+    selectmenu(events: SelectMenuEvents): JQuery;
+
+    listview(): JQuery;
+    listview(command: string): JQuery;
+    listview(options: ListViewOptions): JQuery;
+    listview(events: ListViewEvents): JQuery;
+
+    filterable(): JQuery;
+    filterable(command: string): JQuery;
+    filterable(options: FilterableOptions): JQuery;
+
+    navbar(options?: NavbarOptions): JQuery;
+
+    table(): JQuery;
+    table(command: string): JQuery;
+
+    controlgroup(): JQuery;
+    controlgroup(command: string): JQuery;
+    controlgroup(options: ControlgroupOptions): JQuery;
+}
+
+
+interface JQueryStatic {
+    mobile: JQueryMobile;
+}
diff --git a/jquerymobile/jquerymobile-tests.ts b/jquerymobile/jquerymobile-tests.ts
index ad655ad538..105edc3f88 100644
--- a/jquerymobile/jquerymobile-tests.ts
+++ b/jquerymobile/jquerymobile-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="jquerymobile.d.ts" />
+/// <reference types="jquery" />
+
 
 function test_api() {
     $.mobile.changePage("about/us.html", { transition: "slideup" });
diff --git a/jquerymobile/jquerymobile-tests.ts.tscparams b/jquerymobile/jquerymobile-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jquerymobile/jquerymobile-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jquerymobile/jquerymobile.d.ts b/jquerymobile/jquerymobile.d.ts
deleted file mode 100644
index acee39ed0e..0000000000
--- a/jquerymobile/jquerymobile.d.ts
+++ /dev/null
@@ -1,492 +0,0 @@
-// Type definitions for jQuery Mobile 1.4
-// Project: http://jquerymobile.com/
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface JQueryMobileEvent { (event: Event, ui: any): void; }
-
-interface DialogOptions {
-    closeBtn?: string;
-    closeBtnText?: string;
-    corners?: boolean;
-    initSelector?: string;
-    overlayTheme?: string;
-}
-
-interface DialogEvents {
-    create?: JQueryMobileEvent;
-}
-
-interface PopupOptions {
-    corners?: boolean;
-    history?: boolean;
-    initSelector?: string;
-    overlayTheme?: string;
-    positionTo?: string;
-    shadow?: boolean;
-    theme?: string;
-    tolerance?: string;
-    transition?: string;
-}
-
-interface PopupEvents {
-    popupbeforeposition?: JQueryMobileEvent;
-    popupafteropen?: JQueryMobileEvent;
-    popupafterclose?: JQueryMobileEvent;
-}
-
-interface FixedToolbarOptions {
-    visibleOnPageShow?: boolean;
-    disablePageZoom?: boolean;
-    transition?: string;
-    fullscreen?: boolean;
-    tapToggle?: boolean;
-    tapToggleBlacklist?: string;
-    hideDuringFocus?: string;
-    updatePagePadding?: boolean;
-    supportBlacklist?: Function;
-    initSelector?: string;
-}
-
-interface FixedToolbarEvents {
-    create?: JQueryMobileEvent;
-}
-
-interface ButtonOptions {
-    corners?: boolean;
-    icon?: string;
-    iconpos?: string;
-    iconshadow?: boolean;
-    inline?: boolean;
-    mini?: boolean;
-    shadow?: boolean;
-    theme?: string;
-    initSelector?: string;
-}
-
-interface ButtonEvents {
-    create?: JQueryMobileEvent;
-}
-
-interface CollapsibleOptions {
-    collapsed?: boolean;
-    collapseCueText?: string;
-    collapsedIcon?: string;
-    contentTheme?: string;
-    expandCueText?: string;
-    expandedIcon?: string;
-    heading?: string;
-    iconpos?: string;
-    initSelector?: string;
-    inset?: boolean;
-    mini?: boolean;
-    theme?: string;
-}
-
-interface CollapsibleEvents {
-    create?: JQueryMobileEvent;
-    collapse?: JQueryMobileEvent;
-    expand?: JQueryMobileEvent;
-}
-
-interface CollapsibleSetOptions {
-    collapsedIcon?: string;
-    expandedIcon?: string;
-    iconpos?: string;
-    initSelector?: string;
-    inset?: boolean;
-    mini?: boolean;
-    theme?: string;
-}
-
-interface CollapsibleSetEvents {
-    create?: JQueryMobileEvent;
-}
-
-interface TextInputOptions {
-    clearBtn?: boolean;
-    clearBtnText?: string;
-    disabled?: boolean;
-    initSelector?: string;
-    mini?: boolean;
-    preventFocusZoom?: boolean;
-    theme?: string;
-}
-
-interface TextInputEvents {
-    create?: JQueryMobileEvent;
-}
-
-interface SearchInputOptions {
-    clearSearchButtonText?: string;
-    disabled?: boolean;
-    initSelector?: string;
-    mini?: boolean;
-    theme?: string;
-}
-
-interface SliderOptions {
-    disabled?: boolean;
-    highlight?: boolean;
-    initSelector?: string;
-    mini?: boolean;
-    theme?: string;
-    trackTheme?: string;
-}
-
-interface SliderEvents {
-    create?: JQueryMobileEvent;
-    slidestart?: JQueryMobileEvent;
-    slidestop?: JQueryMobileEvent;
-}
-
-interface FlipswitchOptions {
-    corners?: boolean;
-    defaults?: boolean;
-    disabled?: boolean;
-    enhanced?: boolean;
-    mini?: boolean;
-    offText?: string;
-    onText?: string;
-    theme?: string;
-    wrapperClass?: string;
-}
-
-interface CheckboxRadioOptions {
-    mini?: boolean;
-    theme?: string;
-}
-
-interface CheckboxRadioEvents {
-    create?: JQueryMobileEvent;
-}
-
-interface SelectMenuOptions {
-    corners?: boolean;
-    icon?: string;
-    iconpos?: string;
-    iconshadow?: boolean;
-    initSelector?: string;
-    inline?: boolean;
-    hidePlaceholderMenuItems: boolean;
-    mini?: boolean;
-    nativeMenu?: boolean;
-    overlayTheme?: string;
-    preventFocusZoom?: boolean;
-    shadow?: boolean;
-    theme?: string;
-}
-
-interface SelectMenuEvents {
-    create?: JQueryMobileEvent;
-}
-
-interface ListViewOptions {
-    autodividers?: boolean;
-    autodividersSelector?: (jq?: JQuery) => string;
-    countTheme?: string;
-    defaults?: boolean;
-    disabled?: boolean;
-    dividerTheme?: string;
-    filter?: boolean;
-    filterCallback?: Function;
-    filterPlaceholder?: string;
-    filterTheme?: string;
-    headerTheme?: string;
-    initSelector?: string;
-    inset?: boolean;
-    splitIcon?: string;
-    splitTheme?: string;
-    theme?: string;
-}
-
-interface ListViewEvents {
-    create?: JQueryMobileEvent;
-}
-
-interface FilterableOptions {
-    children?: any;
-    defaults?: boolean;
-    disabled?: boolean;
-    enhanced?: boolean;
-    filterCallback?: {(index: number, searchValue?: string): boolean; };
-    filterPlaceholder?: string;
-    filterReveal?: boolean;
-    filterTheme?: string;
-    input: any;
-}
-
-interface NavbarOptions {
-    iconpos: string;
-}
-
-interface ControlgroupOptions {
-    corners?: boolean;
-    excludeInvisible?: boolean;
-    mini?: boolean;
-    shadow?: boolean;
-    type?: string;
-}
-
-interface JQueryMobileOptions {
-    activeBtnClass?: string;
-    activePageClass?: string;
-    ajaxEnabled?: boolean;
-    allowCrossDomainPages?: boolean;
-    autoInitializePage?: boolean;
-    buttonMarkup: any;
-    defaultDialogTransition?: string;
-    defaultPageTransition?: string;
-    getMaxScrollForTransition?: number;
-    gradeA?: Function;
-    hashListeningEnabled?: boolean;
-    ignoreContentEnabled?: boolean;
-    linkBindingEnabled?: boolean;
-    loadingMessageTextVisible?: boolean;
-    loadingMessageTheme?: string;
-    maxTransitionWidth?: number;
-    minScrollBack?: number;
-    ns?: number;
-    pageLoadErrorMessage?: string;
-    pageLoadErrorMessageTheme?: string;
-    phonegapNavigationEnabled?: boolean;
-    pushStateEnabled?: boolean;
-    subPageUrlKey?: string;
-    touchOverflowEnabled?: boolean;
-    transitionFallbacks: any;
-}
-
-interface JQueryMobileEvents {
-    tap: any;
-    taphold: any;
-    swipe: any;
-    swipeleft: any;
-    swiperight: any;
-
-    vmouseover: any;
-    vmouseout: any;
-    vmousedown: any;
-    vmousemove: any;
-    vmouseup: any;
-    vclick: any;
-    vmousecancel: any;
-
-    orientationchange: any;
-    scrollstart: any;
-    scrollstop: any;
-
-    pagebeforeload: any;
-    pageload: any;
-    pageloadfailed: any;
-    pagebeforechange: any;
-    pagechange: any;
-    pagechangefailed: any;
-    pagebeforeshow: any;
-    pagebeforehide: any;
-    pageshow: any;
-    pagehide: any;
-    pagebeforecreate: any;
-    pagecreate: any;
-    pageinit: any;
-    pageremove: any;
-    updatelayout: any;
-}
-
-interface ChangePageOptions {
-    allowSamePageTransition?: boolean;
-    changeHash?: boolean;
-    data?: any;
-    dataUrl?: string;
-    pageContainer?: JQuery;
-    reloadPage?: boolean;
-    reverse?: boolean;
-    role?: string;
-    showLoadMsg?: boolean;
-    transition?: string;
-    type?: string;
-}
-
-interface LoadPageOptions {
-    data?: any;
-    loadMsgDelay?: number;
-    pageContainer?: JQuery;
-    reloadPage?: boolean;
-    role?: string;
-    showLoadMsg?: boolean;
-    type?: string;
-}
-
-interface LoaderOptions {
-    theme?: string;
-    textVisible?: boolean;
-    html?: string;
-    text?: string;
-    textonly?: boolean;
-}
-
-interface JQueryMobilePath {
-    get(url: string): string;
-    getDocumentBase(asParsedObject?: boolean): any;
-    getDocumentUrl(asParsedObject?: boolean): any;
-    getLocation(): string;
-    isAbsoluteUrl(url: string): boolean;
-    isRelativeUrl(url: string): boolean;
-    makeUrlAbsolute(relUrl: string, absUrl: string): string;
-    parseLocation(): ParsedPath;
-    parseUrl(url: string): ParsedPath;
-}
-
-interface ParsedPath {
-    authority: string;
-    directory: string;
-    domain: string;
-    doubleSlash: string;
-    filename: string;
-    hash: string;
-    host: string;
-    hostname: string;
-    href: string;
-    hrefNoHash: string;
-    hrefNoSearch: string;
-    password: string;
-    pathname: string;
-    port: string;
-    protocol: string;
-    search: string;
-    username: string;
-}
-
-interface JQueryMobile extends JQueryMobileOptions {
-
-    version: string;
-
-    changePage(to: any, options?: ChangePageOptions): void;
-    initializePage(): void;
-    loadPage(url: any, options?: LoadPageOptions): void;
-    loading(): JQuery;
-    loading(command: string, options?: LoaderOptions): JQuery;
-
-    pageContainer: any;
-    base: any;
-    silentScroll(yPos: number): void;
-    activePage: JQuery;
-
-    options: JQueryMobileOptions;
-
-    transitionFallbacks: any;
-    loader: any;
-    page: any;
-
-    touchOverflow: any;
-    showCategory: any;
-    path: JQueryMobilePath;
-
-    dialog: any;
-    popup: any;
-    fixedtoolbar: any;
-    button: any;
-    collapsible: any;
-    collapsibleset: any;
-    textinput: any;
-    slider: any;
-    flipswitch: any;
-    checkboxradio: any;
-    selectmenu: any;
-    listview: any;
-    filterable: any;
-    defaultHomeScroll: number;
-}
-
-interface JQuerySupport {
-    touchOverflow: any;
-}
-
-interface JQuery {
-
-    enhanceWithin(): JQuery;
-
-    dialog(): JQuery;
-    dialog(command: string): JQuery;
-    dialog(options: DialogOptions): JQuery;
-    dialog(events: DialogEvents): JQuery;
-
-    popup(): JQuery;
-    popup(command: string): JQuery;
-    popup(options: PopupOptions): JQuery;
-    popup(command: string, options: PopupOptions): JQuery;
-    popup(events: PopupEvents): JQuery;
-
-    fixedtoolbar(): JQuery;
-    fixedtoolbar(command: string): JQuery;
-    fixedtoolbar(options: FixedToolbarOptions): JQuery;
-    fixedtoolbar(events: FixedToolbarEvents): JQuery;
-
-
-    button(): JQuery;
-    button(command: string): JQuery;
-    button(options?: ButtonOptions): JQuery;
-    button(events: ButtonEvents): JQuery;
-    
-    buttonMarkup(options?: ButtonOptions): JQuery;
-
-    collapsible(): JQuery;
-    collapsible(command: string): JQuery;
-    collapsible(options: CollapsibleOptions): JQuery;
-    collapsible(events: CollapsibleEvents): JQuery;
-    collapsibleSet(): JQuery;
-    collapsibleSet(command: string): JQuery;
-    collapsibleset(options: CollapsibleSetOptions): JQuery;
-    collapsibleset(events: CollapsibleSetEvents): JQuery;
-
-    textinput(): JQuery;
-    textinput(command: string): JQuery;
-    textinput(options: TextInputOptions): JQuery;
-    textinput(events: TextInputEvents): JQuery;
-    textinput(options: SearchInputOptions): JQuery;
-
-    slider(): JQuery;
-    slider(command: string): JQuery;
-    slider(options: SliderOptions): JQuery;
-    slider(events: SliderEvents): JQuery;
-
-    flipswitch(): JQuery;
-    flipswitch(command: string): JQuery;
-    flipswitch(options: FlipswitchOptions): JQuery;
-
-    checkboxradio(): JQuery;
-    checkboxradio(command: string): JQuery;
-    checkboxradio(options: CheckboxRadioOptions): JQuery;
-    checkboxradio(events: CheckboxRadioEvents): JQuery;
-
-    selectmenu(): JQuery;
-    selectmenu(command: string): JQuery;
-    selectmenu(command: string, update: boolean): JQuery;
-    selectmenu(options: SelectMenuOptions): JQuery;
-    selectmenu(events: SelectMenuEvents): JQuery;
-
-    listview(): JQuery;
-    listview(command: string): JQuery;
-    listview(options: ListViewOptions): JQuery;
-    listview(events: ListViewEvents): JQuery;
-
-    filterable(): JQuery;
-    filterable(command: string): JQuery;
-    filterable(options: FilterableOptions): JQuery;
-
-    navbar(options?: NavbarOptions): JQuery;
-
-    table(): JQuery;
-    table(command: string): JQuery;
-
-    controlgroup(): JQuery;
-    controlgroup(command: string): JQuery;
-    controlgroup(options: ControlgroupOptions): JQuery;
-}
-
-
-interface JQueryStatic {
-    mobile: JQueryMobile;
-}
diff --git a/jquerymobile/tsconfig.json b/jquerymobile/tsconfig.json
new file mode 100644
index 0000000000..865230caff
--- /dev/null
+++ b/jquerymobile/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquerymobile-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jqueryui/index.d.ts b/jqueryui/index.d.ts
new file mode 100644
index 0000000000..7559783996
--- /dev/null
+++ b/jqueryui/index.d.ts
@@ -0,0 +1,1843 @@
+// Type definitions for jQueryUI 1.9
+// Project: http://jqueryui.com/
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>, John Reilly <https://github.com/johnnyreilly>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="jquery"/>
+
+declare namespace JQueryUI {
+    // Accordion //////////////////////////////////////////////////
+
+    interface AccordionOptions extends AccordionEvents {
+        active?: any; // boolean or number
+        animate?: any; // boolean, number, string or object
+        collapsible?: boolean;
+        disabled?: boolean;
+        event?: string;
+        header?: string;
+        heightStyle?: string;
+        icons?: any;
+    }
+
+    interface AccordionUIParams {
+        newHeader: JQuery;
+        oldHeader: JQuery;
+        newPanel: JQuery;
+        oldPanel: JQuery;
+    }
+
+    interface AccordionEvent {
+        (event: Event, ui: AccordionUIParams): void;
+    }
+
+    interface AccordionEvents {
+        activate?: AccordionEvent;
+        beforeActivate?: AccordionEvent;
+        create?: AccordionEvent;
+    }
+
+    interface Accordion extends Widget, AccordionOptions {
+    }
+
+
+    // Autocomplete //////////////////////////////////////////////////
+
+    interface AutocompleteOptions extends AutocompleteEvents {
+        appendTo?: any; //Selector;
+        autoFocus?: boolean;
+        delay?: number;
+        disabled?: boolean;
+        minLength?: number;
+        position?: any; // object
+        source?: any; // [], string or ()
+    }
+
+    interface AutocompleteUIParams {
+        /**
+         * The item selected from the menu, if any. Otherwise the property is null
+         */
+        item?: any;
+    }
+
+    interface AutocompleteEvent {
+        (event: Event, ui: AutocompleteUIParams): void;
+    }
+
+    interface AutocompleteEvents {
+        change?: AutocompleteEvent;
+        close?: AutocompleteEvent;
+        create?: AutocompleteEvent;
+        focus?: AutocompleteEvent;
+        open?: AutocompleteEvent;
+        response?: AutocompleteEvent;
+        search?: AutocompleteEvent;
+        select?: AutocompleteEvent;
+    }
+
+    interface Autocomplete extends Widget, AutocompleteOptions {
+        escapeRegex: (value: string) => string;
+        filter: (array: any, term: string) => any;
+    }
+
+
+    // Button //////////////////////////////////////////////////
+
+    interface ButtonOptions {
+        disabled?: boolean;
+        icons?: any;
+        label?: string;
+        text?: string|boolean;
+        click?: (event?: Event) => void;
+    }
+
+    interface Button extends Widget, ButtonOptions {
+    }
+
+
+    // Datepicker //////////////////////////////////////////////////
+
+    interface DatepickerOptions {
+        /**
+         * An input element that is to be updated with the selected date from the datepicker. Use the altFormat option to change the format of the date within this field. Leave as blank for no alternate field.
+         */
+        altField?: any; // Selector, jQuery or Element
+        /**
+         * The dateFormat to be used for the altField option. This allows one date format to be shown to the user for selection purposes, while a different format is actually sent behind the scenes. For a full list of the possible formats see the formatDate function
+         */
+        altFormat?: string;
+        /**
+         * The text to display after each date field, e.g., to show the required format.
+         */
+        appendText?: string;
+        /**
+         * Set to true to automatically resize the input field to accommodate dates in the current dateFormat.
+         */
+        autoSize?: boolean;
+        /**
+         * A function that takes an input field and current datepicker instance and returns an options object to update the datepicker with. It is called just before the datepicker is displayed.
+         */
+        beforeShow?: (input: Element, inst: any) => JQueryUI.DatepickerOptions;
+        /**
+         * A function that takes a date as a parameter and must return an array with:
+         * [0]: true/false indicating whether or not this date is selectable
+         * [1]: a CSS class name to add to the date's cell or "" for the default presentation
+         * [2]: an optional popup tooltip for this date
+         * The function is called for each day in the datepicker before it is displayed.
+         */
+        beforeShowDay?: (date: Date) => any[];
+        /**
+         * A URL of an image to use to display the datepicker when the showOn option is set to "button" or "both". If set, the buttonText option becomes the alt value and is not directly displayed.
+         */
+        buttonImage?: string;
+        /**
+         * Whether the button image should be rendered by itself instead of inside a button element. This option is only relevant if the buttonImage option has also been set.
+         */
+        buttonImageOnly?: boolean;
+        /**
+         * The text to display on the trigger button. Use in conjunction with the showOn option set to "button" or "both".
+         */
+        buttonText?: string;
+        /**
+         * A function to calculate the week of the year for a given date. The default implementation uses the ISO 8601 definition: weeks start on a Monday; the first week of the year contains the first Thursday of the year.
+         */
+        calculateWeek?: (date: Date) => string;
+        /**
+         * Whether the month should be rendered as a dropdown instead of text.
+         */
+        changeMonth?: boolean;
+        /**
+         * Whether the year should be rendered as a dropdown instead of text. Use the yearRange option to control which years are made available for selection.
+         */
+        changeYear?: boolean;
+        /**
+         * The text to display for the close link. Use the showButtonPanel option to display this button.
+         */
+        closeText?: string;
+        /**
+         * When true, entry in the input field is constrained to those characters allowed by the current dateFormat option.
+         */
+        constrainInput?: boolean;
+        /**
+         * The text to display for the current day link. Use the showButtonPanel option to display this button.
+         */
+        currentText?: string;
+        /**
+         * The format for parsed and displayed dates. For a full list of the possible formats see the formatDate function.
+         */
+        dateFormat?: string;
+        /**
+         * The list of long day names, starting from Sunday, for use as requested via the dateFormat option.
+         */
+        dayNames?: string[];
+        /**
+         * The list of minimised day names, starting from Sunday, for use as column headers within the datepicker.
+         */
+        dayNamesMin?: string[];
+        /**
+         * The list of abbreviated day names, starting from Sunday, for use as requested via the dateFormat option.
+         */
+        dayNamesShort?: string[];
+        /**
+         * Set the date to highlight on first opening if the field is blank. Specify either an actual date via a Date object or as a string in the current dateFormat, or a number of days from today (e.g. +7) or a string of values and periods ('y' for years, 'm' for months, 'w' for weeks, 'd' for days, e.g. '+1m +7d'), or null for today.
+         * Multiple types supported:
+         * Date: A date object containing the default date.
+         * Number: A number of days from today. For example 2 represents two days from today and -1 represents yesterday.
+         * String: A string in the format defined by the dateFormat option, or a relative date. Relative dates must contain value and period pairs; valid periods are "y" for years, "m" for months, "w" for weeks, and "d" for days. For example, "+1m +7d" represents one month and seven days from today.
+         */
+        defaultDate?: any; // Date, number or string
+        /**
+         * Control the speed at which the datepicker appears, it may be a time in milliseconds or a string representing one of the three predefined speeds ("slow", "normal", "fast").
+         */
+        duration?: string;
+        /**
+         * Set the first day of the week: Sunday is 0, Monday is 1, etc.
+         */
+        firstDay?: number;
+        /**
+         * When true, the current day link moves to the currently selected date instead of today.
+         */
+        gotoCurrent?: boolean;
+        /**
+         * Normally the previous and next links are disabled when not applicable (see the minDate and maxDate options). You can hide them altogether by setting this attribute to true.
+         */
+        hideIfNoPrevNext?: boolean;
+        /**
+         * Whether the current language is drawn from right to left.
+         */
+        isRTL?: boolean;
+        /**
+         * The maximum selectable date. When set to null, there is no maximum.
+         * Multiple types supported:
+         * Date: A date object containing the maximum date.
+         * Number: A number of days from today. For example 2 represents two days from today and -1 represents yesterday.
+         * String: A string in the format defined by the dateFormat option, or a relative date. Relative dates must contain value and period pairs; valid periods are "y" for years, "m" for months, "w" for weeks, and "d" for days. For example, "+1m +7d" represents one month and seven days from today.
+         */
+        maxDate?: any; // Date, number or string
+        /**
+         * The minimum selectable date. When set to null, there is no minimum.
+         * Multiple types supported:
+         * Date: A date object containing the minimum date.
+         * Number: A number of days from today. For example 2 represents two days from today and -1 represents yesterday.
+         * String: A string in the format defined by the dateFormat option, or a relative date. Relative dates must contain value and period pairs; valid periods are "y" for years, "m" for months, "w" for weeks, and "d" for days. For example, "+1m +7d" represents one month and seven days from today.
+         */
+        minDate?: any; // Date, number or string
+        /**
+         * The list of full month names, for use as requested via the dateFormat option.
+         */
+        monthNames?: string[];
+        /**
+         * The list of abbreviated month names, as used in the month header on each datepicker and as requested via the dateFormat option.
+         */
+        monthNamesShort?: string[];
+        /**
+         * Whether the prevText and nextText options should be parsed as dates by the formatDate function, allowing them to display the target month names for example.
+         */
+        navigationAsDateFormat?: boolean;
+        /**
+         * The text to display for the next month link. With the standard ThemeRoller styling, this value is replaced by an icon.
+         */
+        nextText?: string;
+        /**
+         * The number of months to show at once.
+         * Multiple types supported:
+         * Number: The number of months to display in a single row.
+         * Array: An array defining the number of rows and columns to display.
+         */
+        numberOfMonths?: any; // number or number[]
+        /**
+         * Called when the datepicker moves to a new month and/or year. The function receives the selected year, month (1-12), and the datepicker instance as parameters. this refers to the associated input field.
+         */
+        onChangeMonthYear?: (year: number, month: number, inst: any) => void;
+        /**
+         * Called when the datepicker is closed, whether or not a date is selected. The function receives the selected date as text ("" if none) and the datepicker instance as parameters. this refers to the associated input field.
+         */
+        onClose?: (dateText: string, inst: any) => void;
+        /**
+         * Called when the datepicker is selected. The function receives the selected date as text and the datepicker instance as parameters. this refers to the associated input field.
+         */
+        onSelect?: (dateText: string, inst: any) => void;
+        /**
+         * The text to display for the previous month link. With the standard ThemeRoller styling, this value is replaced by an icon.
+         */
+        prevText?: string;
+        /**
+         * Whether days in other months shown before or after the current month are selectable. This only applies if the showOtherMonths option is set to true.
+         */
+        selectOtherMonths?: boolean;
+        /**
+         * The cutoff year for determining the century for a date (used in conjunction with dateFormat 'y'). Any dates entered with a year value less than or equal to the cutoff year are considered to be in the current century, while those greater than it are deemed to be in the previous century.
+         * Multiple types supported:
+         * Number: A value between 0 and 99 indicating the cutoff year.
+         * String: A relative number of years from the current year, e.g., "+3" or "-5".
+         */
+        shortYearCutoff?: any; // number or string
+        /**
+         * The name of the animation used to show and hide the datepicker. Use "show" (the default), "slideDown", "fadeIn", any of the jQuery UI effects. Set to an empty string to disable animation.
+         */
+        showAnim?: string;
+        /**
+         * Whether to display a button pane underneath the calendar. The button pane contains two buttons, a Today button that links to the current day, and a Done button that closes the datepicker. The buttons' text can be customized using the currentText and closeText options respectively.
+         */
+        showButtonPanel?: boolean;
+        /**
+         * When displaying multiple months via the numberOfMonths option, the showCurrentAtPos option defines which position to display the current month in.
+         */
+        showCurrentAtPos?: number;
+        /**
+         * Whether to show the month after the year in the header.
+         */
+        showMonthAfterYear?: boolean;
+        /**
+         * When the datepicker should appear. The datepicker can appear when the field receives focus ("focus"), when a button is clicked ("button"), or when either event occurs ("both").
+         */
+        showOn?: string;
+        /**
+         * If using one of the jQuery UI effects for the showAnim option, you can provide additional settings for that animation via this option.
+         */
+        showOptions?: any; // TODO
+        /**
+         * Whether to display dates in other months (non-selectable) at the start or end of the current month. To make these days selectable use the selectOtherMonths option.
+         */
+        showOtherMonths?: boolean;
+        /**
+         * When true, a column is added to show the week of the year. The calculateWeek option determines how the week of the year is calculated. You may also want to change the firstDay option.
+         */
+        showWeek?: boolean;
+        /**
+         * Set how many months to move when clicking the previous/next links.
+         */
+        stepMonths?: number;
+        /**
+         * The text to display for the week of the year column heading. Use the showWeek option to display this column.
+         */
+        weekHeader?: string;
+        /**
+         * The range of years displayed in the year drop-down: either relative to today's year ("-nn:+nn"), relative to the currently selected year ("c-nn:c+nn"), absolute ("nnnn:nnnn"), or combinations of these formats ("nnnn:-nn"). Note that this option only affects what appears in the drop-down, to restrict which dates may be selected use the minDate and/or maxDate options.
+         */
+        yearRange?: string;
+        /**
+         * Additional text to display after the year in the month headers.
+         */
+        yearSuffix?: string;
+    }
+
+    interface DatepickerFormatDateOptions {
+        dayNamesShort?: string[];
+        dayNames?: string[];
+        monthNamesShort?: string[];
+        monthNames?: string[];
+    }
+
+    interface Datepicker extends Widget, DatepickerOptions {
+        regional: { [languageCod3: string]: any; };
+        setDefaults(defaults: DatepickerOptions): void;
+        formatDate(format: string, date: Date, settings?: DatepickerFormatDateOptions): string;
+        parseDate(format: string, date: string, settings?: DatepickerFormatDateOptions): Date;
+        iso8601Week(date: Date): number;
+        noWeekends(date: Date): any[];
+    }
+
+
+    // Dialog //////////////////////////////////////////////////
+
+    interface DialogOptions extends DialogEvents {
+        autoOpen?: boolean;
+        buttons?: { [buttonText: string]: (event?: Event) => void } | DialogButtonOptions[];
+        closeOnEscape?: boolean;
+        closeText?: string;
+        appendTo?: string;
+        dialogClass?: string;
+        disabled?: boolean;
+        draggable?: boolean;
+        height?: number | string;
+        hide?: boolean | number | string | DialogShowHideOptions;
+        maxHeight?: number;
+        maxWidth?: number;
+        minHeight?: number;
+        minWidth?: number;
+        modal?: boolean;
+        position?: any; // object, string or []
+        resizable?: boolean;
+        show?: boolean | number | string | DialogShowHideOptions;
+        stack?: boolean;
+        title?: string;
+        width?: any; // number or string
+        zIndex?: number;
+
+		open?: DialogEvent;
+        close?: DialogEvent;
+    }
+
+    interface DialogButtonOptions {
+        icons?: any;
+        showText?: string | boolean;
+        text?: string;
+        click?: (eventObject: JQueryEventObject) => any;
+        [attr: string]: any; // attributes for the <button> element
+    }
+
+    interface DialogShowHideOptions {
+        effect: string;
+        delay?: number;
+        duration?: number;
+        easing?: string;
+    }
+
+    interface DialogUIParams {
+    }
+
+    interface DialogEvent {
+        (event: Event, ui: DialogUIParams): void;
+    }
+
+    interface DialogEvents {
+        beforeClose?: DialogEvent;
+        close?: DialogEvent;
+        create?: DialogEvent;
+        drag?: DialogEvent;
+        dragStart?: DialogEvent;
+        dragStop?: DialogEvent;
+        focus?: DialogEvent;
+        open?: DialogEvent;
+        resize?: DialogEvent;
+        resizeStart?: DialogEvent;
+        resizeStop?: DialogEvent;
+    }
+
+    interface Dialog extends Widget, DialogOptions {
+    }
+
+
+    // Draggable //////////////////////////////////////////////////
+
+    interface DraggableEventUIParams {
+        helper: JQuery;
+        position: { top: number; left: number; };
+        offset: { top: number; left: number; };
+    }
+
+    interface DraggableEvent {
+        (event: Event, ui: DraggableEventUIParams): void;
+    }
+
+    interface DraggableOptions extends DraggableEvents {
+        disabled?: boolean;
+        addClasses?: boolean;
+        appendTo?: any;
+        axis?: string;
+        cancel?: string;
+        connectToSortable?: string;
+        containment?: any;
+        cursor?: string;
+        cursorAt?: any;
+        delay?: number;
+        distance?: number;
+        grid?: number[];
+        handle?: any;
+        helper?: any;
+        iframeFix?: any;
+        opacity?: number;
+        refreshPositions?: boolean;
+        revert?: any;
+        revertDuration?: number;
+        scope?: string;
+        scroll?: boolean;
+        scrollSensitivity?: number;
+        scrollSpeed?: number;
+        snap?: any;
+        snapMode?: string;
+        snapTolerance?: number;
+        stack?: string;
+        zIndex?: number;
+    }
+
+    interface DraggableEvents {
+        create?: DraggableEvent;
+        start?: DraggableEvent;
+        drag?: DraggableEvent;
+        stop?: DraggableEvent;
+    }
+
+    interface Draggable extends Widget, DraggableOptions, DraggableEvent {
+    }
+
+
+    // Droppable //////////////////////////////////////////////////
+
+    interface DroppableEventUIParam {
+        draggable: JQuery;
+        helper: JQuery;
+        position: { top: number; left: number; };
+        offset: { top: number; left: number; };
+    }
+
+    interface DroppableEvent {
+        (event: Event, ui: DroppableEventUIParam): void;
+    }
+
+    interface DroppableOptions extends DroppableEvents {
+        disabled?: boolean;
+        accept?: any;
+        activeClass?: string;
+        greedy?: boolean;
+        hoverClass?: string;
+        scope?: string;
+        tolerance?: string;
+    }
+
+    interface DroppableEvents {
+        create?: DroppableEvent;
+        activate?: DroppableEvent;
+        deactivate?: DroppableEvent;
+        over?: DroppableEvent;
+        out?: DroppableEvent;
+        drop?: DroppableEvent;
+    }
+
+    interface Droppable extends Widget, DroppableOptions {
+    }
+
+    // Menu //////////////////////////////////////////////////
+
+    interface MenuOptions extends MenuEvents {
+        disabled?: boolean;
+        icons?: any;
+        menus?: string;
+        position?: any; // TODO
+        role?: string;
+    }
+
+    interface MenuUIParams {
+        item?: JQuery;
+    }
+
+    interface MenuEvent {
+        (event: Event, ui: MenuUIParams): void;
+    }
+
+    interface MenuEvents {
+        blur?: MenuEvent;
+        create?: MenuEvent;
+        focus?: MenuEvent;
+        select?: MenuEvent;
+    }
+
+    interface Menu extends Widget, MenuOptions {
+    }
+
+
+    // Progressbar //////////////////////////////////////////////////
+
+    interface ProgressbarOptions extends ProgressbarEvents {
+        disabled?: boolean;
+        value?: number | boolean;
+        max?: number;
+    }
+
+    interface ProgressbarUIParams {
+    }
+
+    interface ProgressbarEvent {
+        (event: Event, ui: ProgressbarUIParams): void;
+    }
+
+    interface ProgressbarEvents {
+        change?: ProgressbarEvent;
+        complete?: ProgressbarEvent;
+        create?: ProgressbarEvent;
+    }
+
+    interface Progressbar extends Widget, ProgressbarOptions {
+    }
+
+
+    // Resizable //////////////////////////////////////////////////
+
+    interface ResizableOptions extends ResizableEvents {
+        alsoResize?: any; // Selector, JQuery or Element
+        animate?: boolean;
+        animateDuration?: any; // number or string
+        animateEasing?: string;
+        aspectRatio?: any; // boolean or number
+        autoHide?: boolean;
+        cancel?: string;
+        containment?: any; // Selector, Element or string
+        delay?: number;
+        disabled?: boolean;
+        distance?: number;
+        ghost?: boolean;
+        grid?: any;
+        handles?: any; // string or object
+        helper?: string;
+        maxHeight?: number;
+        maxWidth?: number;
+        minHeight?: number;
+        minWidth?: number;
+    }
+
+    interface ResizableUIParams {
+        element: JQuery;
+        helper: JQuery;
+        originalElement: JQuery;
+        originalPosition: any;
+        originalSize: any;
+        position: any;
+        size: any;
+    }
+
+    interface ResizableEvent {
+        (event: Event, ui: ResizableUIParams): void;
+    }
+
+    interface ResizableEvents {
+        resize?: ResizableEvent;
+        start?: ResizableEvent;
+        stop?: ResizableEvent;
+        create?: ResizableEvents;
+    }
+
+    interface Resizable extends Widget, ResizableOptions {
+    }
+
+
+    // Selectable //////////////////////////////////////////////////
+
+    interface SelectableOptions extends SelectableEvents {
+        autoRefresh?: boolean;
+        cancel?: string;
+        delay?: number;
+        disabled?: boolean;
+        distance?: number;
+        filter?: string;
+        tolerance?: string;
+    }
+
+    interface SelectableEvents {
+        selected? (event: Event, ui: { selected?: Element; }): void;
+        selecting? (event: Event, ui: { selecting?: Element; }): void;
+        start? (event: Event, ui: any): void;
+        stop? (event: Event, ui: any): void;
+        unselected? (event: Event, ui: { unselected: Element; }): void;
+        unselecting? (event: Event, ui: { unselecting: Element; }): void;
+    }
+
+    interface Selectable extends Widget, SelectableOptions {
+    }
+
+    // Slider //////////////////////////////////////////////////
+
+    interface SliderOptions extends SliderEvents {
+        animate?: any; // boolean, string or number
+        disabled?: boolean;
+        max?: number;
+        min?: number;
+        orientation?: string;
+        range?: any; // boolean or string
+        step?: number;
+        value?: number;
+        values?: number[];
+        highlight?: boolean;
+    }
+
+    interface SliderUIParams {
+        handle?: JQuery;
+        value?: number;
+        values?: number[];
+    }
+
+    interface SliderEvent {
+        (event: Event, ui: SliderUIParams): void;
+    }
+
+    interface SliderEvents {
+        change?: SliderEvent;
+        create?: SliderEvent;
+        slide?: SliderEvent;
+        start?: SliderEvent;
+        stop?: SliderEvent;
+    }
+
+    interface Slider extends Widget, SliderOptions {
+    }
+
+
+    // Sortable //////////////////////////////////////////////////
+
+    interface SortableOptions extends SortableEvents {
+        appendTo?: any; // jQuery, Element, Selector or string
+        axis?: string;
+        cancel?: any; // Selector
+        connectWith?: any; // Selector
+        containment?: any; // Element, Selector or string
+        cursor?: string;
+        cursorAt?: any;
+        delay?: number;
+        disabled?: boolean;
+        distance?: number;
+        dropOnEmpty?: boolean;
+        forceHelperSize?: boolean;
+        forcePlaceholderSize?: boolean;
+        grid?: number[];
+        helper?: string | ((event: Event, element: Sortable) => Element);
+        handle?: any; // Selector or Element
+        items?: any; // Selector
+        opacity?: number;
+        placeholder?: string;
+        revert?: any; // boolean or number
+        scroll?: boolean;
+        scrollSensitivity?: number;
+        scrollSpeed?: number;
+        tolerance?: string;
+        zIndex?: number;
+    }
+
+    interface SortableUIParams {
+        helper: JQuery;
+        item: JQuery;
+        offset: any;
+        position: any;
+        originalPosition: any;
+        sender: JQuery;
+        placeholder: JQuery;
+    }
+
+    interface SortableEvent {
+        (event: JQueryEventObject, ui: SortableUIParams): void;
+    }
+
+    interface SortableEvents {
+        activate?: SortableEvent;
+        beforeStop?: SortableEvent;
+        change?: SortableEvent;
+        deactivate?: SortableEvent;
+        out?: SortableEvent;
+        over?: SortableEvent;
+        receive?: SortableEvent;
+        remove?: SortableEvent;
+        sort?: SortableEvent;
+        start?: SortableEvent;
+        stop?: SortableEvent;
+        update?: SortableEvent;
+    }
+
+    interface Sortable extends Widget, SortableOptions, SortableEvents {
+    }
+
+
+    // Spinner //////////////////////////////////////////////////
+
+    interface SpinnerOptions extends SpinnerEvents {
+        culture?: string;
+        disabled?: boolean;
+        icons?: any;
+        incremental?: any; // boolean or ()
+        max?: any; // number or string
+        min?: any; // number or string
+        numberFormat?: string;
+        page?: number;
+        step?: any; // number or string
+    }
+
+    interface SpinnerUIParam {
+        value: number;
+    }
+
+    interface SpinnerEvent<T> {
+        (event: Event, ui: T): void;
+    }
+
+    interface SpinnerEvents {
+        change?: SpinnerEvent<{}>;
+        create?: SpinnerEvent<{}>;
+        spin?: SpinnerEvent<SpinnerUIParam>;
+        start?: SpinnerEvent<{}>;
+        stop?: SpinnerEvent<{}>;
+    }
+
+    interface Spinner extends Widget, SpinnerOptions {
+    }
+
+
+    // Tabs //////////////////////////////////////////////////
+
+    interface TabsOptions extends TabsEvents {
+        active?: any; // boolean or number
+        collapsible?: boolean;
+        disabled?: any; // boolean or []
+        event?: string;
+        heightStyle?: string;
+        hide?: any; // boolean, number, string or object
+        show?: any; // boolean, number, string or object
+    }
+
+    interface TabsActivationUIParams {
+        newTab: JQuery;
+        oldTab: JQuery;
+        newPanel: JQuery;
+        oldPanel: JQuery;
+    }
+
+    interface TabsBeforeLoadUIParams {
+        tab: JQuery;
+        panel: JQuery;
+        jqXHR: JQueryXHR;
+        ajaxSettings: any;
+    }
+
+    interface TabsCreateOrLoadUIParams {
+        tab: JQuery;
+        panel: JQuery;
+    }
+
+    interface TabsEvent<UI> {
+        (event: Event, ui: UI): void;
+    }
+
+    interface TabsEvents {
+        activate?: TabsEvent<TabsActivationUIParams>;
+        beforeActivate?: TabsEvent<TabsActivationUIParams>;
+        beforeLoad?: TabsEvent<TabsBeforeLoadUIParams>;
+        load?: TabsEvent<TabsCreateOrLoadUIParams>;
+        create?: TabsEvent<TabsCreateOrLoadUIParams>;
+    }
+
+    interface Tabs extends Widget, TabsOptions {
+    }
+
+
+    // Tooltip //////////////////////////////////////////////////
+
+    interface TooltipOptions extends TooltipEvents {
+        content?: any; // () or string
+        disabled?: boolean;
+        hide?: any; // boolean, number, string or object
+        items?: string;
+        position?: any; // TODO
+        show?: any; // boolean, number, string or object
+        tooltipClass?: string;
+        track?: boolean;
+    }
+
+    interface TooltipUIParams {
+    }
+
+    interface TooltipEvent {
+        (event: Event, ui: TooltipUIParams): void;
+    }
+
+    interface TooltipEvents {
+        close?: TooltipEvent;
+        open?: TooltipEvent;
+    }
+
+    interface Tooltip extends Widget, TooltipOptions {
+    }
+
+
+    // Effects //////////////////////////////////////////////////
+
+    interface EffectOptions {
+        effect: string;
+        easing?: string;
+        duration?: number;
+        complete: Function;
+    }
+
+    interface BlindEffect {
+        direction?: string;
+    }
+
+    interface BounceEffect {
+        distance?: number;
+        times?: number;
+    }
+
+    interface ClipEffect {
+        direction?: number;
+    }
+
+    interface DropEffect {
+        direction?: number;
+    }
+
+    interface ExplodeEffect {
+        pieces?: number;
+    }
+
+    interface FadeEffect { }
+
+    interface FoldEffect {
+        size?: any;
+        horizFirst?: boolean;
+    }
+
+    interface HighlightEffect {
+        color?: string;
+    }
+
+    interface PuffEffect {
+        percent?: number;
+    }
+
+    interface PulsateEffect {
+        times?: number;
+    }
+
+    interface ScaleEffect {
+        direction?: string;
+        origin?: string[];
+        percent?: number;
+        scale?: string;
+    }
+
+    interface ShakeEffect {
+        direction?: string;
+        distance?: number;
+        times?: number;
+    }
+
+    interface SizeEffect {
+        to?: any;
+        origin?: string[];
+        scale?: string;
+    }
+
+    interface SlideEffect {
+        direction?: string;
+        distance?: number;
+    }
+
+    interface TransferEffect {
+        className?: string;
+        to?: string;
+    }
+
+    interface JQueryPositionOptions {
+        my?: string;
+        at?: string;
+        of?: any;
+        collision?: string;
+        using?: Function;
+        within?: any;
+    }
+
+
+    // UI //////////////////////////////////////////////////
+
+    interface MouseOptions {
+        cancel?: string;
+        delay?: number;
+        distance?: number;
+    }
+
+    interface KeyCode {
+        BACKSPACE: number;
+        COMMA: number;
+        DELETE: number;
+        DOWN: number;
+        END: number;
+        ENTER: number;
+        ESCAPE: number;
+        HOME: number;
+        LEFT: number;
+        NUMPAD_ADD: number;
+        NUMPAD_DECIMAL: number;
+        NUMPAD_DIVIDE: number;
+        NUMPAD_ENTER: number;
+        NUMPAD_MULTIPLY: number;
+        NUMPAD_SUBTRACT: number;
+        PAGE_DOWN: number;
+        PAGE_UP: number;
+        PERIOD: number;
+        RIGHT: number;
+        SPACE: number;
+        TAB: number;
+        UP: number;
+    }
+
+    interface UI {
+        mouse(method: string): JQuery;
+        mouse(options: MouseOptions): JQuery;
+        mouse(optionLiteral: string, optionName: string, optionValue: any): JQuery;
+        mouse(optionLiteral: string, optionValue: any): any;
+
+        accordion: Accordion;
+        autocomplete: Autocomplete;
+        button: Button;
+        buttonset: Button;
+        datepicker: Datepicker;
+        dialog: Dialog;
+        keyCode: KeyCode;
+        menu: Menu;
+        progressbar: Progressbar;
+        slider: Slider;
+        spinner: Spinner;
+        tabs: Tabs;
+        tooltip: Tooltip;
+        version: string;
+    }
+
+
+    // Widget //////////////////////////////////////////////////
+
+    interface WidgetOptions {
+        disabled?: boolean;
+        hide?: any;
+        show?: any;
+    }
+
+    interface Widget {
+        (methodName: string): JQuery;
+        (options: WidgetOptions): JQuery;
+        (options: AccordionOptions): JQuery;
+        (optionLiteral: string, optionName: string): any;
+        (optionLiteral: string, options: WidgetOptions): any;
+        (optionLiteral: string, optionName: string, optionValue: any): JQuery;
+
+        (name: string, prototype: any): JQuery;
+        (name: string, base: Function, prototype: any): JQuery;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+
+}
+
+interface JQuery {
+
+    accordion(): JQuery;
+    accordion(methodName: 'destroy'): void;
+    accordion(methodName: 'disable'): void;
+    accordion(methodName: 'enable'): void;
+    accordion(methodName: 'refresh'): void;
+    accordion(methodName: 'widget'): JQuery;
+    accordion(methodName: string): JQuery;
+    accordion(options: JQueryUI.AccordionOptions): JQuery;
+    accordion(optionLiteral: string, optionName: string): any;
+    accordion(optionLiteral: string, options: JQueryUI.AccordionOptions): any;
+    accordion(optionLiteral: string, optionName: string, optionValue: any): JQuery;
+
+    autocomplete(): JQuery;
+    autocomplete(methodName: 'close'): void;
+    autocomplete(methodName: 'destroy'): void;
+    autocomplete(methodName: 'disable'): void;
+    autocomplete(methodName: 'enable'): void;
+    autocomplete(methodName: 'search', value?: string): void;
+    autocomplete(methodName: 'widget'): JQuery;
+    autocomplete(methodName: string): JQuery;
+    autocomplete(options: JQueryUI.AutocompleteOptions): JQuery;
+    autocomplete(optionLiteral: string, optionName: string): any;
+    autocomplete(optionLiteral: string, options: JQueryUI.AutocompleteOptions): any;
+    autocomplete(optionLiteral: string, optionName: string, optionValue: any): JQuery;
+
+    button(): JQuery;
+    button(methodName: 'destroy'): void;
+    button(methodName: 'disable'): void;
+    button(methodName: 'enable'): void;
+    button(methodName: 'refresh'): void;
+    button(methodName: 'widget'): JQuery;
+    button(methodName: string): JQuery;
+    button(options: JQueryUI.ButtonOptions): JQuery;
+    button(optionLiteral: string, optionName: string): any;
+    button(optionLiteral: string, options: JQueryUI.ButtonOptions): any;
+    button(optionLiteral: string, optionName: string, optionValue: any): JQuery;
+
+    buttonset(): JQuery;
+    buttonset(methodName: 'destroy'): void;
+    buttonset(methodName: 'disable'): void;
+    buttonset(methodName: 'enable'): void;
+    buttonset(methodName: 'refresh'): void;
+    buttonset(methodName: 'widget'): JQuery;
+    buttonset(methodName: string): JQuery;
+    buttonset(options: JQueryUI.ButtonOptions): JQuery;
+    buttonset(optionLiteral: string, optionName: string): any;
+    buttonset(optionLiteral: string, options: JQueryUI.ButtonOptions): any;
+    buttonset(optionLiteral: string, optionName: string, optionValue: any): JQuery;
+
+    /**
+     * Initialize a datepicker
+     */
+    datepicker(): JQuery;
+    /**
+     * Removes the datepicker functionality completely. This will return the element back to its pre-init state.
+     *
+     * @param methodName 'destroy'
+     */
+    datepicker(methodName: 'destroy'): JQuery;
+    /**
+     * Opens the datepicker in a dialog box.
+     *
+     * @param methodName 'dialog'
+     * @param date The initial date.
+     * @param onSelect A callback function when a date is selected. The function receives the date text and date picker instance as parameters.
+     * @param settings The new settings for the date picker.
+     * @param pos The position of the top/left of the dialog as [x, y] or a MouseEvent that contains the coordinates. If not specified the dialog is centered on the screen.
+     */
+    datepicker(methodName: 'dialog', date: Date, onSelect?: () => void, settings?: JQueryUI.DatepickerOptions, pos?: number[]): JQuery;
+    /**
+     * Opens the datepicker in a dialog box.
+     *
+     * @param methodName 'dialog'
+     * @param date The initial date.
+     * @param onSelect A callback function when a date is selected. The function receives the date text and date picker instance as parameters.
+     * @param settings The new settings for the date picker.
+     * @param pos The position of the top/left of the dialog as [x, y] or a MouseEvent that contains the coordinates. If not specified the dialog is centered on the screen.
+     */
+    datepicker(methodName: 'dialog', date: Date, onSelect?: () => void, settings?: JQueryUI.DatepickerOptions, pos?: MouseEvent): JQuery;
+    /**
+     * Opens the datepicker in a dialog box.
+     *
+     * @param methodName 'dialog'
+     * @param date The initial date.
+     * @param onSelect A callback function when a date is selected. The function receives the date text and date picker instance as parameters.
+     * @param settings The new settings for the date picker.
+     * @param pos The position of the top/left of the dialog as [x, y] or a MouseEvent that contains the coordinates. If not specified the dialog is centered on the screen.
+     */
+    datepicker(methodName: 'dialog', date: string, onSelect?: () => void, settings?: JQueryUI.DatepickerOptions, pos?: number[]): JQuery;
+    /**
+     * Opens the datepicker in a dialog box.
+     *
+     * @param methodName 'dialog'
+     * @param date The initial date.
+     * @param onSelect A callback function when a date is selected. The function receives the date text and date picker instance as parameters.
+     * @param settings The new settings for the date picker.
+     * @param pos The position of the top/left of the dialog as [x, y] or a MouseEvent that contains the coordinates. If not specified the dialog is centered on the screen.
+     */
+    datepicker(methodName: 'dialog', date: string, onSelect?: () => void, settings?: JQueryUI.DatepickerOptions, pos?: MouseEvent): JQuery;
+    /**
+     * Returns the current date for the datepicker or null if no date has been selected.
+     *
+     * @param methodName 'getDate'
+     */
+    datepicker(methodName: 'getDate'): Date;
+    /**
+     * Close a previously opened date picker.
+     *
+     * @param methodName 'hide'
+     */
+    datepicker(methodName: 'hide'): JQuery;
+    /**
+     * Determine whether a date picker has been disabled.
+     *
+     * @param methodName 'isDisabled'
+     */
+    datepicker(methodName: 'isDisabled'): boolean;
+    /**
+     * Redraw the date picker, after having made some external modifications.
+     *
+     * @param methodName 'refresh'
+     */
+    datepicker(methodName: 'refresh'): JQuery;
+    /**
+     * Sets the date for the datepicker. The new date may be a Date object or a string in the current date format (e.g., "01/26/2009"), a number of days from today (e.g., +7) or a string of values and periods ("y" for years, "m" for months, "w" for weeks, "d" for days, e.g., "+1m +7d"), or null to clear the selected date.
+     *
+     * @param methodName 'setDate'
+     * @param date The new date.
+     */
+    datepicker(methodName: 'setDate', date: Date): JQuery;
+    /**
+     * Sets the date for the datepicker. The new date may be a Date object or a string in the current date format (e.g., "01/26/2009"), a number of days from today (e.g., +7) or a string of values and periods ("y" for years, "m" for months, "w" for weeks, "d" for days, e.g., "+1m +7d"), or null to clear the selected date.
+     *
+     * @param methodName 'setDate'
+     * @param date The new date.
+     */
+    datepicker(methodName: 'setDate', date: string): JQuery;
+    /**
+     * Open the date picker. If the datepicker is attached to an input, the input must be visible for the datepicker to be shown.
+     *
+     * @param methodName 'show'
+     */
+    datepicker(methodName: 'show'): JQuery;
+    /**
+     * Returns a jQuery object containing the datepicker.
+     *
+     * @param methodName 'widget'
+     */
+    datepicker(methodName: 'widget'): JQuery;
+
+    /**
+     * Get the altField option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'altField'
+     */
+    datepicker(methodName: 'option', optionName: 'altField'): any;
+    /**
+     * Set the altField option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'altField'
+     * @param altFieldValue An input element that is to be updated with the selected date from the datepicker. Use the altFormat option to change the format of the date within this field. Leave as blank for no alternate field.
+     */
+    datepicker(methodName: 'option', optionName: 'altField', altFieldValue: string): JQuery;
+    /**
+     * Set the altField option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'altField'
+     * @param altFieldValue An input element that is to be updated with the selected date from the datepicker. Use the altFormat option to change the format of the date within this field. Leave as blank for no alternate field.
+     */
+    datepicker(methodName: 'option', optionName: 'altField', altFieldValue: JQuery): JQuery;
+    /**
+     * Set the altField option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'altField'
+     * @param altFieldValue An input element that is to be updated with the selected date from the datepicker. Use the altFormat option to change the format of the date within this field. Leave as blank for no alternate field.
+     */
+    datepicker(methodName: 'option', optionName: 'altField', altFieldValue: Element): JQuery;
+
+    /**
+     * Get the altFormat option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'altFormat'
+     */
+    datepicker(methodName: 'option', optionName: 'altFormat'): string;
+    /**
+     * Set the altFormat option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'altFormat'
+     * @param altFormatValue The dateFormat to be used for the altField option. This allows one date format to be shown to the user for selection purposes, while a different format is actually sent behind the scenes. For a full list of the possible formats see the formatDate function
+     */
+    datepicker(methodName: 'option', optionName: 'altFormat', altFormatValue: string): JQuery;
+
+    /**
+     * Get the appendText option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'appendText'
+     */
+    datepicker(methodName: 'option', optionName: 'appendText'): string;
+    /**
+     * Set the appendText option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'appendText'
+     * @param appendTextValue The text to display after each date field, e.g., to show the required format.
+     */
+    datepicker(methodName: 'option', optionName: 'appendText', appendTextValue: string): JQuery;
+
+    /**
+     * Get the autoSize option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'autoSize'
+     */
+    datepicker(methodName: 'option', optionName: 'autoSize'): boolean;
+    /**
+     * Set the autoSize option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'autoSize'
+     * @param autoSizeValue Set to true to automatically resize the input field to accommodate dates in the current dateFormat.
+     */
+    datepicker(methodName: 'option', optionName: 'autoSize', autoSizeValue: boolean): JQuery;
+
+    /**
+     * Get the beforeShow option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'beforeShow'
+     */
+    datepicker(methodName: 'option', optionName: 'beforeShow'): (input: Element, inst: any) => JQueryUI.DatepickerOptions;
+    /**
+     * Set the beforeShow option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'beforeShow'
+     * @param beforeShowValue A function that takes an input field and current datepicker instance and returns an options object to update the datepicker with. It is called just before the datepicker is displayed.
+     */
+    datepicker(methodName: 'option', optionName: 'beforeShow', beforeShowValue: (input: Element, inst: any) => JQueryUI.DatepickerOptions): JQuery;
+
+    /**
+     * Get the beforeShow option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'beforeShowDay'
+     */
+    datepicker(methodName: 'option', optionName: 'beforeShowDay'): (date: Date) => any[];
+    /**
+     * Set the beforeShow option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'beforeShowDay'
+     * @param beforeShowDayValue A function that takes a date as a parameter and must return an array with:
+     * [0]: true/false indicating whether or not this date is selectable
+     * [1]: a CSS class name to add to the date's cell or "" for the default presentation
+     * [2]: an optional popup tooltip for this date
+     * The function is called for each day in the datepicker before it is displayed.
+     */
+    datepicker(methodName: 'option', optionName: 'beforeShowDay', beforeShowDayValue: (date: Date) => any[]): JQuery;
+
+    /**
+     * Get the buttonImage option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'buttonImage'
+     */
+    datepicker(methodName: 'option', optionName: 'buttonImage'): string;
+    /**
+     * Set the buttonImage option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'buttonImage'
+     * @param buttonImageValue A URL of an image to use to display the datepicker when the showOn option is set to "button" or "both". If set, the buttonText option becomes the alt value and is not directly displayed.
+     */
+    datepicker(methodName: 'option', optionName: 'buttonImage', buttonImageValue: string): JQuery;
+
+    /**
+     * Get the buttonImageOnly option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'buttonImageOnly'
+     */
+    datepicker(methodName: 'option', optionName: 'buttonImageOnly'): boolean;
+    /**
+     * Set the buttonImageOnly option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'buttonImageOnly'
+     * @param buttonImageOnlyValue Whether the button image should be rendered by itself instead of inside a button element. This option is only relevant if the buttonImage option has also been set.
+     */
+    datepicker(methodName: 'option', optionName: 'buttonImageOnly', buttonImageOnlyValue: boolean): JQuery;
+
+    /**
+     * Get the buttonText option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'buttonText'
+     */
+    datepicker(methodName: 'option', optionName: 'buttonText'): string;
+    /**
+     * Set the buttonText option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'buttonText'
+     * @param buttonTextValue The text to display on the trigger button. Use in conjunction with the showOn option set to "button" or "both".
+     */
+    datepicker(methodName: 'option', optionName: 'buttonText', buttonTextValue: string): JQuery;
+
+    /**
+     * Get the calculateWeek option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'calculateWeek'
+     */
+    datepicker(methodName: 'option', optionName: 'calculateWeek'): (date: Date) => string;
+    /**
+     * Set the calculateWeek option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'calculateWeek'
+     * @param calculateWeekValue A function to calculate the week of the year for a given date. The default implementation uses the ISO 8601 definition: weeks start on a Monday; the first week of the year contains the first Thursday of the year.
+     */
+    datepicker(methodName: 'option', optionName: 'calculateWeek', calculateWeekValue: (date: Date) => string): JQuery;
+
+    /**
+     * Get the changeMonth option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'changeMonth'
+     */
+    datepicker(methodName: 'option', optionName: 'changeMonth'): boolean;
+    /**
+     * Set the changeMonth option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'changeMonth'
+     * @param changeMonthValue Whether the month should be rendered as a dropdown instead of text.
+     */
+    datepicker(methodName: 'option', optionName: 'changeMonth', changeMonthValue: boolean): JQuery;
+
+    /**
+     * Get the changeYear option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'changeYear'
+     */
+    datepicker(methodName: 'option', optionName: 'changeYear'): boolean;
+    /**
+     * Set the changeYear option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'changeYear'
+     * @param changeYearValue Whether the year should be rendered as a dropdown instead of text. Use the yearRange option to control which years are made available for selection.
+     */
+    datepicker(methodName: 'option', optionName: 'changeYear', changeYearValue: boolean): JQuery;
+
+    /**
+     * Get the closeText option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'closeText'
+     */
+    datepicker(methodName: 'option', optionName: 'closeText'): string;
+    /**
+     * Set the closeText option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'closeText'
+     * @param closeTextValue The text to display for the close link. Use the showButtonPanel option to display this button.
+     */
+    datepicker(methodName: 'option', optionName: 'closeText', closeTextValue: string): JQuery;
+
+    /**
+     * Get the constrainInput option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'constrainInput'
+     */
+    datepicker(methodName: 'option', optionName: 'constrainInput'): boolean;
+    /**
+     * Set the constrainInput option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'constrainInput'
+     * @param constrainInputValue When true, entry in the input field is constrained to those characters allowed by the current dateFormat option.
+     */
+    datepicker(methodName: 'option', optionName: 'constrainInput', constrainInputValue: boolean): JQuery;
+
+    /**
+     * Get the currentText option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'currentText'
+     */
+    datepicker(methodName: 'option', optionName: 'currentText'): string;
+    /**
+     * Set the currentText option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'currentText'
+     * @param currentTextValue The text to display for the current day link. Use the showButtonPanel option to display this button.
+     */
+    datepicker(methodName: 'option', optionName: 'currentText', currentTextValue: string): JQuery;
+
+    /**
+     * Get the dateFormat option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'dateFormat'
+     */
+    datepicker(methodName: 'option', optionName: 'dateFormat'): string;
+    /**
+     * Set the dateFormat option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'dateFormat'
+     * @param dateFormatValue The format for parsed and displayed dates. For a full list of the possible formats see the formatDate function.
+     */
+    datepicker(methodName: 'option', optionName: 'dateFormat', dateFormatValue: string): JQuery;
+
+    /**
+     * Get the dayNames option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'dayNames'
+     */
+    datepicker(methodName: 'option', optionName: 'dayNames'): string[];
+    /**
+     * Set the dayNames option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'dayNames'
+     * @param dayNamesValue The list of long day names, starting from Sunday, for use as requested via the dateFormat option.
+     */
+    datepicker(methodName: 'option', optionName: 'dayNames', dayNamesValue: string[]): JQuery;
+
+    /**
+     * Get the dayNamesMin option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'dayNamesMin'
+     */
+    datepicker(methodName: 'option', optionName: 'dayNamesMin'): string[];
+    /**
+     * Set the dayNamesMin option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'dayNamesMin'
+     * @param dayNamesMinValue The list of minimised day names, starting from Sunday, for use as column headers within the datepicker.
+     */
+    datepicker(methodName: 'option', optionName: 'dayNamesMin', dayNamesMinValue: string[]): JQuery;
+
+    /**
+     * Get the dayNamesShort option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'dayNamesShort'
+     */
+    datepicker(methodName: 'option', optionName: 'dayNamesShort'): string[];
+    /**
+     * Set the dayNamesShort option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'dayNamesShort'
+     * @param dayNamesShortValue The list of abbreviated day names, starting from Sunday, for use as requested via the dateFormat option.
+     */
+    datepicker(methodName: 'option', optionName: 'dayNamesShort', dayNamesShortValue: string[]): JQuery;
+
+    /**
+     * Get the defaultDate option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'defaultDate'
+     */
+    datepicker(methodName: 'option', optionName: 'defaultDate'): any;
+    /**
+     * Set the defaultDate option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'defaultDate'
+     * @param defaultDateValue A date object containing the default date.
+     */
+    datepicker(methodName: 'option', optionName: 'defaultDate', defaultDateValue: Date): JQuery;
+    /**
+     * Set the defaultDate option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'defaultDate'
+     * @param defaultDateValue A number of days from today. For example 2 represents two days from today and -1 represents yesterday.
+     */
+    datepicker(methodName: 'option', optionName: 'defaultDate', defaultDateValue: number): JQuery;
+    /**
+     * Set the defaultDate option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'defaultDate'
+     * @param defaultDateValue A string in the format defined by the dateFormat option, or a relative date. Relative dates must contain value and period pairs; valid periods are "y" for years, "m" for months, "w" for weeks, and "d" for days. For example, "+1m +7d" represents one month and seven days from today.
+     */
+    datepicker(methodName: 'option', optionName: 'defaultDate', defaultDateValue: string): JQuery;
+
+    /**
+     * Get the duration option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'duration'
+     */
+    datepicker(methodName: 'option', optionName: 'duration'): string;
+    /**
+     * Set the duration option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'duration'
+     * @param durationValue Control the speed at which the datepicker appears, it may be a time in milliseconds or a string representing one of the three predefined speeds ("slow", "normal", "fast").
+     */
+    datepicker(methodName: 'option', optionName: 'duration', durationValue: string): JQuery;
+
+    /**
+     * Get the firstDay option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'firstDay'
+     */
+    datepicker(methodName: 'option', optionName: 'firstDay'): number;
+    /**
+     * Set the firstDay option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'firstDay'
+     * @param firstDayValue Set the first day of the week: Sunday is 0, Monday is 1, etc.
+     */
+    datepicker(methodName: 'option', optionName: 'firstDay', firstDayValue: number): JQuery;
+
+    /**
+     * Get the gotoCurrent option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'gotoCurrent'
+     */
+    datepicker(methodName: 'option', optionName: 'gotoCurrent'): boolean;
+    /**
+     * Set the gotoCurrent option, after initialization
+     *
+     * @param methodName 'option'
+     * @param optionName 'gotoCurrent'
+     * @param gotoCurrentValue When true, the current day link moves to the currently selected date instead of today.
+     */
+    datepicker(methodName: 'option', optionName: 'gotoCurrent', gotoCurrentValue: boolean): JQuery;
+
+    /**
+     * Gets the value currently associated with the specified optionName.
+     *
+     * @param methodName 'option'
+     * @param optionName The name of the option to get.
+     */
+    datepicker(methodName: 'option', optionName: string): any;
+
+    datepicker(methodName: 'option', optionName: string, ...otherParams: any[]): any; // Used for getting and setting options
+
+    datepicker(methodName: string, ...otherParams: any[]): any;
+
+    /**
+     * Initialize a datepicker with the given options
+     */
+    datepicker(options: JQueryUI.DatepickerOptions): JQuery;
+
+    dialog(): JQuery;
+    dialog(methodName: 'close'): JQuery;
+    dialog(methodName: 'destroy'): JQuery;
+    dialog(methodName: 'isOpen'): boolean;
+    dialog(methodName: 'moveToTop'): JQuery;
+    dialog(methodName: 'open'): JQuery;
+    dialog(methodName: 'widget'): JQuery;
+    dialog(methodName: string): JQuery;
+    dialog(options: JQueryUI.DialogOptions): JQuery;
+    dialog(optionLiteral: string, optionName: string): any;
+    dialog(optionLiteral: string, options: JQueryUI.DialogOptions): any;
+    dialog(optionLiteral: string, optionName: string, optionValue: any): JQuery;
+
+    draggable(): JQuery;
+    draggable(methodName: 'destroy'): void;
+    draggable(methodName: 'disable'): void;
+    draggable(methodName: 'enable'): void;
+    draggable(methodName: 'widget'): JQuery;
+    draggable(methodName: string): JQuery;
+    draggable(options: JQueryUI.DraggableOptions): JQuery;
+    draggable(optionLiteral: string, optionName: string): any;
+    draggable(optionLiteral: string, options: JQueryUI.DraggableOptions): any;
+    draggable(optionLiteral: string, optionName: string, optionValue: any): JQuery;
+
+    droppable(): JQuery;
+    droppable(methodName: 'destroy'): void;
+    droppable(methodName: 'disable'): void;
+    droppable(methodName: 'enable'): void;
+    droppable(methodName: 'widget'): JQuery;
+    droppable(methodName: string): JQuery;
+    droppable(options: JQueryUI.DroppableOptions): JQuery;
+    droppable(optionLiteral: string, optionName: string): any;
+    droppable(optionLiteral: string, options: JQueryUI.DraggableOptions): any;
+    droppable(optionLiteral: string, optionName: string, optionValue: any): JQuery;
+
+    menu: {
+        (): JQuery;
+        (methodName: 'blur'): void;
+        (methodName: 'collapse', event?: JQueryEventObject): void;
+        (methodName: 'collapseAll', event?: JQueryEventObject, all?: boolean): void;
+        (methodName: 'destroy'): void;
+        (methodName: 'disable'): void;
+        (methodName: 'enable'): void;
+        (methodName: string, event: JQueryEventObject, item: JQuery): void;
+        (methodName: 'focus', event: JQueryEventObject, item: JQuery): void;
+        (methodName: 'isFirstItem'): boolean;
+        (methodName: 'isLastItem'): boolean;
+        (methodName: 'next', event?: JQueryEventObject): void;
+        (methodName: 'nextPage', event?: JQueryEventObject): void;
+        (methodName: 'previous', event?: JQueryEventObject): void;
+        (methodName: 'previousPage', event?: JQueryEventObject): void;
+        (methodName: 'refresh'): void;
+        (methodName: 'select', event?: JQueryEventObject): void;
+        (methodName: 'widget'): JQuery;
+        (methodName: string): JQuery;
+        (options: JQueryUI.MenuOptions): JQuery;
+        (optionLiteral: string, optionName: string): any;
+        (optionLiteral: string, options: JQueryUI.MenuOptions): any;
+        (optionLiteral: string, optionName: string, optionValue: any): JQuery;
+        active: boolean;
+    }
+
+    progressbar(): JQuery;
+    progressbar(methodName: 'destroy'): void;
+    progressbar(methodName: 'disable'): void;
+    progressbar(methodName: 'enable'): void;
+    progressbar(methodName: 'refresh'): void;
+    progressbar(methodName: 'value'): any; // number or boolean
+    progressbar(methodName: 'value', value: number): void;
+    progressbar(methodName: 'value', value: boolean): void;
+    progressbar(methodName: 'widget'): JQuery;
+    progressbar(methodName: string): JQuery;
+    progressbar(options: JQueryUI.ProgressbarOptions): JQuery;
+    progressbar(optionLiteral: string, optionName: string): any;
+    progressbar(optionLiteral: string, options: JQueryUI.ProgressbarOptions): any;
+    progressbar(optionLiteral: string, optionName: string, optionValue: any): JQuery;
+
+    resizable(): JQuery;
+    resizable(methodName: 'destroy'): void;
+    resizable(methodName: 'disable'): void;
+    resizable(methodName: 'enable'): void;
+    resizable(methodName: 'widget'): JQuery;
+    resizable(methodName: string): JQuery;
+    resizable(options: JQueryUI.ResizableOptions): JQuery;
+    resizable(optionLiteral: string, optionName: string): any;
+    resizable(optionLiteral: string, options: JQueryUI.ResizableOptions): any;
+    resizable(optionLiteral: string, optionName: string, optionValue: any): JQuery;
+
+    selectable(): JQuery;
+    selectable(methodName: 'destroy'): void;
+    selectable(methodName: 'disable'): void;
+    selectable(methodName: 'enable'): void;
+    selectable(methodName: 'widget'): JQuery;
+    selectable(methodName: string): JQuery;
+    selectable(options: JQueryUI.SelectableOptions): JQuery;
+    selectable(optionLiteral: string, optionName: string): any;
+    selectable(optionLiteral: string, options: JQueryUI.SelectableOptions): any;
+    selectable(optionLiteral: string, optionName: string, optionValue: any): JQuery;
+
+    slider(): JQuery;
+    slider(methodName: 'destroy'): void;
+    slider(methodName: 'disable'): void;
+    slider(methodName: 'enable'): void;
+    slider(methodName: 'refresh'): void;
+    slider(methodName: 'value'): number;
+    slider(methodName: 'value', value: number): void;
+    slider(methodName: 'values'): Array<number>;
+    slider(methodName: 'values', index: number): number;
+    slider(methodName: string, index: number, value: number): void;
+    slider(methodName: 'values', index: number, value: number): void;
+    slider(methodName: string, values: Array<number>): void;
+    slider(methodName: 'values', values: Array<number>): void;
+    slider(methodName: 'widget'): JQuery;
+    slider(methodName: string): JQuery;
+    slider(options: JQueryUI.SliderOptions): JQuery;
+    slider(optionLiteral: string, optionName: string): any;
+    slider(optionLiteral: string, options: JQueryUI.SliderOptions): any;
+    slider(optionLiteral: string, optionName: string, optionValue: any): JQuery;
+
+    sortable(): JQuery;
+    sortable(methodName: 'destroy'): void;
+    sortable(methodName: 'disable'): void;
+    sortable(methodName: 'enable'): void;
+    sortable(methodName: 'widget'): JQuery;
+    sortable(methodName: 'toArray'): string[];
+    sortable(methodName: string): JQuery;
+    sortable(options: JQueryUI.SortableOptions): JQuery;
+    sortable(optionLiteral: string, optionName: string): any;
+    sortable(methodName: 'serialize', options?: { key?: string; attribute?: string; expression?: RegExp }): string;
+    sortable(optionLiteral: string, options: JQueryUI.SortableOptions): any;
+    sortable(optionLiteral: string, optionName: string, optionValue: any): JQuery;
+
+    spinner(): JQuery;
+    spinner(methodName: 'destroy'): void;
+    spinner(methodName: 'disable'): void;
+    spinner(methodName: 'enable'): void;
+    spinner(methodName: 'pageDown', pages?: number): void;
+    spinner(methodName: 'pageUp', pages?: number): void;
+    spinner(methodName: 'stepDown', steps?: number): void;
+    spinner(methodName: 'stepUp', steps?: number): void;
+    spinner(methodName: 'value'): number;
+    spinner(methodName: 'value', value: number): void;
+    spinner(methodName: 'widget'): JQuery;
+    spinner(methodName: string): JQuery;
+    spinner(options: JQueryUI.SpinnerOptions): JQuery;
+    spinner(optionLiteral: string, optionName: string): any;
+    spinner(optionLiteral: string, options: JQueryUI.SpinnerOptions): any;
+    spinner(optionLiteral: string, optionName: string, optionValue: any): JQuery;
+
+    tabs(): JQuery;
+    tabs(methodName: 'destroy'): void;
+    tabs(methodName: 'disable'): void;
+    tabs(methodName: 'enable'): void;
+    tabs(methodName: 'load', index: number): void;
+    tabs(methodName: 'refresh'): void;
+    tabs(methodName: 'widget'): JQuery;
+    tabs(methodName: string): JQuery;
+    tabs(options: JQueryUI.TabsOptions): JQuery;
+    tabs(optionLiteral: string, optionName: string): any;
+    tabs(optionLiteral: string, options: JQueryUI.TabsOptions): any;
+    tabs(optionLiteral: string, optionName: string, optionValue: any): JQuery;
+
+    tooltip(): JQuery;
+    tooltip(methodName: 'destroy'): void;
+    tooltip(methodName: 'disable'): void;
+    tooltip(methodName: 'enable'): void;
+    tooltip(methodName: 'open'): void;
+    tooltip(methodName: 'close'): void;
+    tooltip(methodName: 'widget'): JQuery;
+    tooltip(methodName: string): JQuery;
+    tooltip(options: JQueryUI.TooltipOptions): JQuery;
+    tooltip(optionLiteral: string, optionName: string): any;
+    tooltip(optionLiteral: string, options: JQueryUI.TooltipOptions): any;
+    tooltip(optionLiteral: string, optionName: string, optionValue: any): JQuery;
+
+
+    addClass(classNames: string, speed?: number, callback?: Function): JQuery;
+    addClass(classNames: string, speed?: string, callback?: Function): JQuery;
+    addClass(classNames: string, speed?: number, easing?: string, callback?: Function): JQuery;
+    addClass(classNames: string, speed?: string, easing?: string, callback?: Function): JQuery;
+
+    removeClass(classNames: string, speed?: number, callback?: Function): JQuery;
+    removeClass(classNames: string, speed?: string, callback?: Function): JQuery;
+    removeClass(classNames: string, speed?: number, easing?: string, callback?: Function): JQuery;
+    removeClass(classNames: string, speed?: string, easing?: string, callback?: Function): JQuery;
+
+    switchClass(removeClassName: string, addClassName: string, duration?: number, easing?: string, complete?: Function): JQuery;
+    switchClass(removeClassName: string, addClassName: string, duration?: string, easing?: string, complete?: Function): JQuery;
+
+    toggleClass(className: string, duration?: number, easing?: string, complete?: Function): JQuery;
+    toggleClass(className: string, duration?: string, easing?: string, complete?: Function): JQuery;
+    toggleClass(className: string, aswitch?: boolean, duration?: number, easing?: string, complete?: Function): JQuery;
+    toggleClass(className: string, aswitch?: boolean, duration?: string, easing?: string, complete?: Function): JQuery;
+
+    effect(options: any): JQuery;
+    effect(effect: string, options?: any, duration?: number, complete?: Function): JQuery;
+    effect(effect: string, options?: any, duration?: string, complete?: Function): JQuery;
+
+    hide(options: any): JQuery;
+    hide(effect: string, options?: any, duration?: number, complete?: Function): JQuery;
+    hide(effect: string, options?: any, duration?: string, complete?: Function): JQuery;
+
+    show(options: any): JQuery;
+    show(effect: string, options?: any, duration?: number, complete?: Function): JQuery;
+    show(effect: string, options?: any, duration?: string, complete?: Function): JQuery;
+
+    toggle(options: any): JQuery;
+    toggle(effect: string, options?: any, duration?: number, complete?: Function): JQuery;
+    toggle(effect: string, options?: any, duration?: string, complete?: Function): JQuery;
+
+    position(options: JQueryUI.JQueryPositionOptions): JQuery;
+
+    enableSelection(): JQuery;
+    disableSelection(): JQuery;
+    focus(delay: number, callback?: Function): JQuery;
+    uniqueId(): JQuery;
+    removeUniqueId(): JQuery;
+    scrollParent(): JQuery;
+    zIndex(): JQuery;
+    zIndex(zIndex: number): JQuery;
+
+    widget: JQueryUI.Widget;
+
+    jQuery: JQueryStatic;
+}
+
+interface JQueryStatic {
+    ui: JQueryUI.UI;
+    datepicker: JQueryUI.Datepicker;
+    widget: JQueryUI.Widget;
+    Widget: JQueryUI.Widget;
+}
+
+interface JQueryEasingFunctions {
+    easeInQuad: JQueryEasingFunction;
+    easeOutQuad: JQueryEasingFunction;
+    easeInOutQuad: JQueryEasingFunction;
+    easeInCubic: JQueryEasingFunction;
+    easeOutCubic: JQueryEasingFunction;
+    easeInOutCubic: JQueryEasingFunction;
+    easeInQuart: JQueryEasingFunction;
+    easeOutQuart: JQueryEasingFunction;
+    easeInOutQuart: JQueryEasingFunction;
+    easeInQuint: JQueryEasingFunction;
+    easeOutQuint: JQueryEasingFunction;
+    easeInOutQuint: JQueryEasingFunction;
+    easeInExpo: JQueryEasingFunction;
+    easeOutExpo: JQueryEasingFunction;
+    easeInOutExpo: JQueryEasingFunction;
+    easeInSine: JQueryEasingFunction;
+    easeOutSine: JQueryEasingFunction;
+    easeInOutSine: JQueryEasingFunction;
+    easeInCirc: JQueryEasingFunction;
+    easeOutCirc: JQueryEasingFunction;
+    easeInOutCirc: JQueryEasingFunction;
+    easeInElastic: JQueryEasingFunction;
+    easeOutElastic: JQueryEasingFunction;
+    easeInOutElastic: JQueryEasingFunction;
+    easeInBack: JQueryEasingFunction;
+    easeOutBack: JQueryEasingFunction;
+    easeInOutBack: JQueryEasingFunction;
+    easeInBounce: JQueryEasingFunction;
+    easeOutBounce: JQueryEasingFunction;
+    easeInOutBounce: JQueryEasingFunction;
+}
diff --git a/jqueryui/jqueryui-tests.ts b/jqueryui/jqueryui-tests.ts
index 607a5bd1dd..20cd77ec65 100644
--- a/jqueryui/jqueryui-tests.ts
+++ b/jqueryui/jqueryui-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="jqueryui.d.ts" />
+/// <reference types="jquery" />
+
 
 function test_draggable() {
 
diff --git a/jqueryui/jqueryui-tests.ts.tscparams b/jqueryui/jqueryui-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jqueryui/jqueryui-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jqueryui/jqueryui.d.ts b/jqueryui/jqueryui.d.ts
deleted file mode 100644
index 63a1591a21..0000000000
--- a/jqueryui/jqueryui.d.ts
+++ /dev/null
@@ -1,1843 +0,0 @@
-// Type definitions for jQueryUI 1.9
-// Project: http://jqueryui.com/
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>, John Reilly <https://github.com/johnnyreilly>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-declare namespace JQueryUI {
-    // Accordion //////////////////////////////////////////////////
-
-    interface AccordionOptions extends AccordionEvents {
-        active?: any; // boolean or number
-        animate?: any; // boolean, number, string or object
-        collapsible?: boolean;
-        disabled?: boolean;
-        event?: string;
-        header?: string;
-        heightStyle?: string;
-        icons?: any;
-    }
-
-    interface AccordionUIParams {
-        newHeader: JQuery;
-        oldHeader: JQuery;
-        newPanel: JQuery;
-        oldPanel: JQuery;
-    }
-
-    interface AccordionEvent {
-        (event: Event, ui: AccordionUIParams): void;
-    }
-
-    interface AccordionEvents {
-        activate?: AccordionEvent;
-        beforeActivate?: AccordionEvent;
-        create?: AccordionEvent;
-    }
-
-    interface Accordion extends Widget, AccordionOptions {
-    }
-
-
-    // Autocomplete //////////////////////////////////////////////////
-
-    interface AutocompleteOptions extends AutocompleteEvents {
-        appendTo?: any; //Selector;
-        autoFocus?: boolean;
-        delay?: number;
-        disabled?: boolean;
-        minLength?: number;
-        position?: any; // object
-        source?: any; // [], string or ()
-    }
-
-    interface AutocompleteUIParams {
-        /**
-         * The item selected from the menu, if any. Otherwise the property is null
-         */
-        item?: any;
-    }
-
-    interface AutocompleteEvent {
-        (event: Event, ui: AutocompleteUIParams): void;
-    }
-
-    interface AutocompleteEvents {
-        change?: AutocompleteEvent;
-        close?: AutocompleteEvent;
-        create?: AutocompleteEvent;
-        focus?: AutocompleteEvent;
-        open?: AutocompleteEvent;
-        response?: AutocompleteEvent;
-        search?: AutocompleteEvent;
-        select?: AutocompleteEvent;
-    }
-
-    interface Autocomplete extends Widget, AutocompleteOptions {
-        escapeRegex: (value: string) => string;
-        filter: (array: any, term: string) => any;
-    }
-
-
-    // Button //////////////////////////////////////////////////
-
-    interface ButtonOptions {
-        disabled?: boolean;
-        icons?: any;
-        label?: string;
-        text?: string|boolean;
-        click?: (event?: Event) => void;
-    }
-
-    interface Button extends Widget, ButtonOptions {
-    }
-
-
-    // Datepicker //////////////////////////////////////////////////
-
-    interface DatepickerOptions {
-        /**
-         * An input element that is to be updated with the selected date from the datepicker. Use the altFormat option to change the format of the date within this field. Leave as blank for no alternate field.
-         */
-        altField?: any; // Selector, jQuery or Element
-        /**
-         * The dateFormat to be used for the altField option. This allows one date format to be shown to the user for selection purposes, while a different format is actually sent behind the scenes. For a full list of the possible formats see the formatDate function
-         */
-        altFormat?: string;
-        /**
-         * The text to display after each date field, e.g., to show the required format.
-         */
-        appendText?: string;
-        /**
-         * Set to true to automatically resize the input field to accommodate dates in the current dateFormat.
-         */
-        autoSize?: boolean;
-        /**
-         * A function that takes an input field and current datepicker instance and returns an options object to update the datepicker with. It is called just before the datepicker is displayed.
-         */
-        beforeShow?: (input: Element, inst: any) => JQueryUI.DatepickerOptions;
-        /**
-         * A function that takes a date as a parameter and must return an array with:
-         * [0]: true/false indicating whether or not this date is selectable
-         * [1]: a CSS class name to add to the date's cell or "" for the default presentation
-         * [2]: an optional popup tooltip for this date
-         * The function is called for each day in the datepicker before it is displayed.
-         */
-        beforeShowDay?: (date: Date) => any[];
-        /**
-         * A URL of an image to use to display the datepicker when the showOn option is set to "button" or "both". If set, the buttonText option becomes the alt value and is not directly displayed.
-         */
-        buttonImage?: string;
-        /**
-         * Whether the button image should be rendered by itself instead of inside a button element. This option is only relevant if the buttonImage option has also been set.
-         */
-        buttonImageOnly?: boolean;
-        /**
-         * The text to display on the trigger button. Use in conjunction with the showOn option set to "button" or "both".
-         */
-        buttonText?: string;
-        /**
-         * A function to calculate the week of the year for a given date. The default implementation uses the ISO 8601 definition: weeks start on a Monday; the first week of the year contains the first Thursday of the year.
-         */
-        calculateWeek?: (date: Date) => string;
-        /**
-         * Whether the month should be rendered as a dropdown instead of text.
-         */
-        changeMonth?: boolean;
-        /**
-         * Whether the year should be rendered as a dropdown instead of text. Use the yearRange option to control which years are made available for selection.
-         */
-        changeYear?: boolean;
-        /**
-         * The text to display for the close link. Use the showButtonPanel option to display this button.
-         */
-        closeText?: string;
-        /**
-         * When true, entry in the input field is constrained to those characters allowed by the current dateFormat option.
-         */
-        constrainInput?: boolean;
-        /**
-         * The text to display for the current day link. Use the showButtonPanel option to display this button.
-         */
-        currentText?: string;
-        /**
-         * The format for parsed and displayed dates. For a full list of the possible formats see the formatDate function.
-         */
-        dateFormat?: string;
-        /**
-         * The list of long day names, starting from Sunday, for use as requested via the dateFormat option.
-         */
-        dayNames?: string[];
-        /**
-         * The list of minimised day names, starting from Sunday, for use as column headers within the datepicker.
-         */
-        dayNamesMin?: string[];
-        /**
-         * The list of abbreviated day names, starting from Sunday, for use as requested via the dateFormat option.
-         */
-        dayNamesShort?: string[];
-        /**
-         * Set the date to highlight on first opening if the field is blank. Specify either an actual date via a Date object or as a string in the current dateFormat, or a number of days from today (e.g. +7) or a string of values and periods ('y' for years, 'm' for months, 'w' for weeks, 'd' for days, e.g. '+1m +7d'), or null for today.
-         * Multiple types supported:
-         * Date: A date object containing the default date.
-         * Number: A number of days from today. For example 2 represents two days from today and -1 represents yesterday.
-         * String: A string in the format defined by the dateFormat option, or a relative date. Relative dates must contain value and period pairs; valid periods are "y" for years, "m" for months, "w" for weeks, and "d" for days. For example, "+1m +7d" represents one month and seven days from today.
-         */
-        defaultDate?: any; // Date, number or string
-        /**
-         * Control the speed at which the datepicker appears, it may be a time in milliseconds or a string representing one of the three predefined speeds ("slow", "normal", "fast").
-         */
-        duration?: string;
-        /**
-         * Set the first day of the week: Sunday is 0, Monday is 1, etc.
-         */
-        firstDay?: number;
-        /**
-         * When true, the current day link moves to the currently selected date instead of today.
-         */
-        gotoCurrent?: boolean;
-        /**
-         * Normally the previous and next links are disabled when not applicable (see the minDate and maxDate options). You can hide them altogether by setting this attribute to true.
-         */
-        hideIfNoPrevNext?: boolean;
-        /**
-         * Whether the current language is drawn from right to left.
-         */
-        isRTL?: boolean;
-        /**
-         * The maximum selectable date. When set to null, there is no maximum.
-         * Multiple types supported:
-         * Date: A date object containing the maximum date.
-         * Number: A number of days from today. For example 2 represents two days from today and -1 represents yesterday.
-         * String: A string in the format defined by the dateFormat option, or a relative date. Relative dates must contain value and period pairs; valid periods are "y" for years, "m" for months, "w" for weeks, and "d" for days. For example, "+1m +7d" represents one month and seven days from today.
-         */
-        maxDate?: any; // Date, number or string
-        /**
-         * The minimum selectable date. When set to null, there is no minimum.
-         * Multiple types supported:
-         * Date: A date object containing the minimum date.
-         * Number: A number of days from today. For example 2 represents two days from today and -1 represents yesterday.
-         * String: A string in the format defined by the dateFormat option, or a relative date. Relative dates must contain value and period pairs; valid periods are "y" for years, "m" for months, "w" for weeks, and "d" for days. For example, "+1m +7d" represents one month and seven days from today.
-         */
-        minDate?: any; // Date, number or string
-        /**
-         * The list of full month names, for use as requested via the dateFormat option.
-         */
-        monthNames?: string[];
-        /**
-         * The list of abbreviated month names, as used in the month header on each datepicker and as requested via the dateFormat option.
-         */
-        monthNamesShort?: string[];
-        /**
-         * Whether the prevText and nextText options should be parsed as dates by the formatDate function, allowing them to display the target month names for example.
-         */
-        navigationAsDateFormat?: boolean;
-        /**
-         * The text to display for the next month link. With the standard ThemeRoller styling, this value is replaced by an icon.
-         */
-        nextText?: string;
-        /**
-         * The number of months to show at once.
-         * Multiple types supported:
-         * Number: The number of months to display in a single row.
-         * Array: An array defining the number of rows and columns to display.
-         */
-        numberOfMonths?: any; // number or number[]
-        /**
-         * Called when the datepicker moves to a new month and/or year. The function receives the selected year, month (1-12), and the datepicker instance as parameters. this refers to the associated input field.
-         */
-        onChangeMonthYear?: (year: number, month: number, inst: any) => void;
-        /**
-         * Called when the datepicker is closed, whether or not a date is selected. The function receives the selected date as text ("" if none) and the datepicker instance as parameters. this refers to the associated input field.
-         */
-        onClose?: (dateText: string, inst: any) => void;
-        /**
-         * Called when the datepicker is selected. The function receives the selected date as text and the datepicker instance as parameters. this refers to the associated input field.
-         */
-        onSelect?: (dateText: string, inst: any) => void;
-        /**
-         * The text to display for the previous month link. With the standard ThemeRoller styling, this value is replaced by an icon.
-         */
-        prevText?: string;
-        /**
-         * Whether days in other months shown before or after the current month are selectable. This only applies if the showOtherMonths option is set to true.
-         */
-        selectOtherMonths?: boolean;
-        /**
-         * The cutoff year for determining the century for a date (used in conjunction with dateFormat 'y'). Any dates entered with a year value less than or equal to the cutoff year are considered to be in the current century, while those greater than it are deemed to be in the previous century.
-         * Multiple types supported:
-         * Number: A value between 0 and 99 indicating the cutoff year.
-         * String: A relative number of years from the current year, e.g., "+3" or "-5".
-         */
-        shortYearCutoff?: any; // number or string
-        /**
-         * The name of the animation used to show and hide the datepicker. Use "show" (the default), "slideDown", "fadeIn", any of the jQuery UI effects. Set to an empty string to disable animation.
-         */
-        showAnim?: string;
-        /**
-         * Whether to display a button pane underneath the calendar. The button pane contains two buttons, a Today button that links to the current day, and a Done button that closes the datepicker. The buttons' text can be customized using the currentText and closeText options respectively.
-         */
-        showButtonPanel?: boolean;
-        /**
-         * When displaying multiple months via the numberOfMonths option, the showCurrentAtPos option defines which position to display the current month in.
-         */
-        showCurrentAtPos?: number;
-        /**
-         * Whether to show the month after the year in the header.
-         */
-        showMonthAfterYear?: boolean;
-        /**
-         * When the datepicker should appear. The datepicker can appear when the field receives focus ("focus"), when a button is clicked ("button"), or when either event occurs ("both").
-         */
-        showOn?: string;
-        /**
-         * If using one of the jQuery UI effects for the showAnim option, you can provide additional settings for that animation via this option.
-         */
-        showOptions?: any; // TODO
-        /**
-         * Whether to display dates in other months (non-selectable) at the start or end of the current month. To make these days selectable use the selectOtherMonths option.
-         */
-        showOtherMonths?: boolean;
-        /**
-         * When true, a column is added to show the week of the year. The calculateWeek option determines how the week of the year is calculated. You may also want to change the firstDay option.
-         */
-        showWeek?: boolean;
-        /**
-         * Set how many months to move when clicking the previous/next links.
-         */
-        stepMonths?: number;
-        /**
-         * The text to display for the week of the year column heading. Use the showWeek option to display this column.
-         */
-        weekHeader?: string;
-        /**
-         * The range of years displayed in the year drop-down: either relative to today's year ("-nn:+nn"), relative to the currently selected year ("c-nn:c+nn"), absolute ("nnnn:nnnn"), or combinations of these formats ("nnnn:-nn"). Note that this option only affects what appears in the drop-down, to restrict which dates may be selected use the minDate and/or maxDate options.
-         */
-        yearRange?: string;
-        /**
-         * Additional text to display after the year in the month headers.
-         */
-        yearSuffix?: string;
-    }
-
-    interface DatepickerFormatDateOptions {
-        dayNamesShort?: string[];
-        dayNames?: string[];
-        monthNamesShort?: string[];
-        monthNames?: string[];
-    }
-
-    interface Datepicker extends Widget, DatepickerOptions {
-        regional: { [languageCod3: string]: any; };
-        setDefaults(defaults: DatepickerOptions): void;
-        formatDate(format: string, date: Date, settings?: DatepickerFormatDateOptions): string;
-        parseDate(format: string, date: string, settings?: DatepickerFormatDateOptions): Date;
-        iso8601Week(date: Date): number;
-        noWeekends(date: Date): any[];
-    }
-
-
-    // Dialog //////////////////////////////////////////////////
-
-    interface DialogOptions extends DialogEvents {
-        autoOpen?: boolean;
-        buttons?: { [buttonText: string]: (event?: Event) => void } | DialogButtonOptions[];
-        closeOnEscape?: boolean;
-        closeText?: string;
-        appendTo?: string;
-        dialogClass?: string;
-        disabled?: boolean;
-        draggable?: boolean;
-        height?: number | string;
-        hide?: boolean | number | string | DialogShowHideOptions;
-        maxHeight?: number;
-        maxWidth?: number;
-        minHeight?: number;
-        minWidth?: number;
-        modal?: boolean;
-        position?: any; // object, string or []
-        resizable?: boolean;
-        show?: boolean | number | string | DialogShowHideOptions;
-        stack?: boolean;
-        title?: string;
-        width?: any; // number or string
-        zIndex?: number;
-
-		open?: DialogEvent;
-        close?: DialogEvent;
-    }
-
-    interface DialogButtonOptions {
-        icons?: any;
-        showText?: string | boolean;
-        text?: string;
-        click?: (eventObject: JQueryEventObject) => any;
-        [attr: string]: any; // attributes for the <button> element
-    }
-
-    interface DialogShowHideOptions {
-        effect: string;
-        delay?: number;
-        duration?: number;
-        easing?: string;
-    }
-
-    interface DialogUIParams {
-    }
-
-    interface DialogEvent {
-        (event: Event, ui: DialogUIParams): void;
-    }
-
-    interface DialogEvents {
-        beforeClose?: DialogEvent;
-        close?: DialogEvent;
-        create?: DialogEvent;
-        drag?: DialogEvent;
-        dragStart?: DialogEvent;
-        dragStop?: DialogEvent;
-        focus?: DialogEvent;
-        open?: DialogEvent;
-        resize?: DialogEvent;
-        resizeStart?: DialogEvent;
-        resizeStop?: DialogEvent;
-    }
-
-    interface Dialog extends Widget, DialogOptions {
-    }
-
-
-    // Draggable //////////////////////////////////////////////////
-
-    interface DraggableEventUIParams {
-        helper: JQuery;
-        position: { top: number; left: number; };
-        offset: { top: number; left: number; };
-    }
-
-    interface DraggableEvent {
-        (event: Event, ui: DraggableEventUIParams): void;
-    }
-
-    interface DraggableOptions extends DraggableEvents {
-        disabled?: boolean;
-        addClasses?: boolean;
-        appendTo?: any;
-        axis?: string;
-        cancel?: string;
-        connectToSortable?: string;
-        containment?: any;
-        cursor?: string;
-        cursorAt?: any;
-        delay?: number;
-        distance?: number;
-        grid?: number[];
-        handle?: any;
-        helper?: any;
-        iframeFix?: any;
-        opacity?: number;
-        refreshPositions?: boolean;
-        revert?: any;
-        revertDuration?: number;
-        scope?: string;
-        scroll?: boolean;
-        scrollSensitivity?: number;
-        scrollSpeed?: number;
-        snap?: any;
-        snapMode?: string;
-        snapTolerance?: number;
-        stack?: string;
-        zIndex?: number;
-    }
-
-    interface DraggableEvents {
-        create?: DraggableEvent;
-        start?: DraggableEvent;
-        drag?: DraggableEvent;
-        stop?: DraggableEvent;
-    }
-
-    interface Draggable extends Widget, DraggableOptions, DraggableEvent {
-    }
-
-
-    // Droppable //////////////////////////////////////////////////
-
-    interface DroppableEventUIParam {
-        draggable: JQuery;
-        helper: JQuery;
-        position: { top: number; left: number; };
-        offset: { top: number; left: number; };
-    }
-
-    interface DroppableEvent {
-        (event: Event, ui: DroppableEventUIParam): void;
-    }
-
-    interface DroppableOptions extends DroppableEvents {
-        disabled?: boolean;
-        accept?: any;
-        activeClass?: string;
-        greedy?: boolean;
-        hoverClass?: string;
-        scope?: string;
-        tolerance?: string;
-    }
-
-    interface DroppableEvents {
-        create?: DroppableEvent;
-        activate?: DroppableEvent;
-        deactivate?: DroppableEvent;
-        over?: DroppableEvent;
-        out?: DroppableEvent;
-        drop?: DroppableEvent;
-    }
-
-    interface Droppable extends Widget, DroppableOptions {
-    }
-
-    // Menu //////////////////////////////////////////////////
-
-    interface MenuOptions extends MenuEvents {
-        disabled?: boolean;
-        icons?: any;
-        menus?: string;
-        position?: any; // TODO
-        role?: string;
-    }
-
-    interface MenuUIParams {
-        item?: JQuery;
-    }
-
-    interface MenuEvent {
-        (event: Event, ui: MenuUIParams): void;
-    }
-
-    interface MenuEvents {
-        blur?: MenuEvent;
-        create?: MenuEvent;
-        focus?: MenuEvent;
-        select?: MenuEvent;
-    }
-
-    interface Menu extends Widget, MenuOptions {
-    }
-
-
-    // Progressbar //////////////////////////////////////////////////
-
-    interface ProgressbarOptions extends ProgressbarEvents {
-        disabled?: boolean;
-        value?: number | boolean;
-        max?: number;
-    }
-
-    interface ProgressbarUIParams {
-    }
-
-    interface ProgressbarEvent {
-        (event: Event, ui: ProgressbarUIParams): void;
-    }
-
-    interface ProgressbarEvents {
-        change?: ProgressbarEvent;
-        complete?: ProgressbarEvent;
-        create?: ProgressbarEvent;
-    }
-
-    interface Progressbar extends Widget, ProgressbarOptions {
-    }
-
-
-    // Resizable //////////////////////////////////////////////////
-
-    interface ResizableOptions extends ResizableEvents {
-        alsoResize?: any; // Selector, JQuery or Element
-        animate?: boolean;
-        animateDuration?: any; // number or string
-        animateEasing?: string;
-        aspectRatio?: any; // boolean or number
-        autoHide?: boolean;
-        cancel?: string;
-        containment?: any; // Selector, Element or string
-        delay?: number;
-        disabled?: boolean;
-        distance?: number;
-        ghost?: boolean;
-        grid?: any;
-        handles?: any; // string or object
-        helper?: string;
-        maxHeight?: number;
-        maxWidth?: number;
-        minHeight?: number;
-        minWidth?: number;
-    }
-
-    interface ResizableUIParams {
-        element: JQuery;
-        helper: JQuery;
-        originalElement: JQuery;
-        originalPosition: any;
-        originalSize: any;
-        position: any;
-        size: any;
-    }
-
-    interface ResizableEvent {
-        (event: Event, ui: ResizableUIParams): void;
-    }
-
-    interface ResizableEvents {
-        resize?: ResizableEvent;
-        start?: ResizableEvent;
-        stop?: ResizableEvent;
-        create?: ResizableEvents;
-    }
-
-    interface Resizable extends Widget, ResizableOptions {
-    }
-
-
-    // Selectable //////////////////////////////////////////////////
-
-    interface SelectableOptions extends SelectableEvents {
-        autoRefresh?: boolean;
-        cancel?: string;
-        delay?: number;
-        disabled?: boolean;
-        distance?: number;
-        filter?: string;
-        tolerance?: string;
-    }
-
-    interface SelectableEvents {
-        selected? (event: Event, ui: { selected?: Element; }): void;
-        selecting? (event: Event, ui: { selecting?: Element; }): void;
-        start? (event: Event, ui: any): void;
-        stop? (event: Event, ui: any): void;
-        unselected? (event: Event, ui: { unselected: Element; }): void;
-        unselecting? (event: Event, ui: { unselecting: Element; }): void;
-    }
-
-    interface Selectable extends Widget, SelectableOptions {
-    }
-
-    // Slider //////////////////////////////////////////////////
-
-    interface SliderOptions extends SliderEvents {
-        animate?: any; // boolean, string or number
-        disabled?: boolean;
-        max?: number;
-        min?: number;
-        orientation?: string;
-        range?: any; // boolean or string
-        step?: number;
-        value?: number;
-        values?: number[];
-        highlight?: boolean;
-    }
-
-    interface SliderUIParams {
-        handle?: JQuery;
-        value?: number;
-        values?: number[];
-    }
-
-    interface SliderEvent {
-        (event: Event, ui: SliderUIParams): void;
-    }
-
-    interface SliderEvents {
-        change?: SliderEvent;
-        create?: SliderEvent;
-        slide?: SliderEvent;
-        start?: SliderEvent;
-        stop?: SliderEvent;
-    }
-
-    interface Slider extends Widget, SliderOptions {
-    }
-
-
-    // Sortable //////////////////////////////////////////////////
-
-    interface SortableOptions extends SortableEvents {
-        appendTo?: any; // jQuery, Element, Selector or string
-        axis?: string;
-        cancel?: any; // Selector
-        connectWith?: any; // Selector
-        containment?: any; // Element, Selector or string
-        cursor?: string;
-        cursorAt?: any;
-        delay?: number;
-        disabled?: boolean;
-        distance?: number;
-        dropOnEmpty?: boolean;
-        forceHelperSize?: boolean;
-        forcePlaceholderSize?: boolean;
-        grid?: number[];
-        helper?: string | ((event: Event, element: Sortable) => Element);
-        handle?: any; // Selector or Element
-        items?: any; // Selector
-        opacity?: number;
-        placeholder?: string;
-        revert?: any; // boolean or number
-        scroll?: boolean;
-        scrollSensitivity?: number;
-        scrollSpeed?: number;
-        tolerance?: string;
-        zIndex?: number;
-    }
-
-    interface SortableUIParams {
-        helper: JQuery;
-        item: JQuery;
-        offset: any;
-        position: any;
-        originalPosition: any;
-        sender: JQuery;
-        placeholder: JQuery;
-    }
-
-    interface SortableEvent {
-        (event: JQueryEventObject, ui: SortableUIParams): void;
-    }
-
-    interface SortableEvents {
-        activate?: SortableEvent;
-        beforeStop?: SortableEvent;
-        change?: SortableEvent;
-        deactivate?: SortableEvent;
-        out?: SortableEvent;
-        over?: SortableEvent;
-        receive?: SortableEvent;
-        remove?: SortableEvent;
-        sort?: SortableEvent;
-        start?: SortableEvent;
-        stop?: SortableEvent;
-        update?: SortableEvent;
-    }
-
-    interface Sortable extends Widget, SortableOptions, SortableEvents {
-    }
-
-
-    // Spinner //////////////////////////////////////////////////
-
-    interface SpinnerOptions extends SpinnerEvents {
-        culture?: string;
-        disabled?: boolean;
-        icons?: any;
-        incremental?: any; // boolean or ()
-        max?: any; // number or string
-        min?: any; // number or string
-        numberFormat?: string;
-        page?: number;
-        step?: any; // number or string
-    }
-
-    interface SpinnerUIParam {
-        value: number;
-    }
-
-    interface SpinnerEvent<T> {
-        (event: Event, ui: T): void;
-    }
-
-    interface SpinnerEvents {
-        change?: SpinnerEvent<{}>;
-        create?: SpinnerEvent<{}>;
-        spin?: SpinnerEvent<SpinnerUIParam>;
-        start?: SpinnerEvent<{}>;
-        stop?: SpinnerEvent<{}>;
-    }
-
-    interface Spinner extends Widget, SpinnerOptions {
-    }
-
-
-    // Tabs //////////////////////////////////////////////////
-
-    interface TabsOptions extends TabsEvents {
-        active?: any; // boolean or number
-        collapsible?: boolean;
-        disabled?: any; // boolean or []
-        event?: string;
-        heightStyle?: string;
-        hide?: any; // boolean, number, string or object
-        show?: any; // boolean, number, string or object
-    }
-
-    interface TabsActivationUIParams {
-        newTab: JQuery;
-        oldTab: JQuery;
-        newPanel: JQuery;
-        oldPanel: JQuery;
-    }
-
-    interface TabsBeforeLoadUIParams {
-        tab: JQuery;
-        panel: JQuery;
-        jqXHR: JQueryXHR;
-        ajaxSettings: any;
-    }
-
-    interface TabsCreateOrLoadUIParams {
-        tab: JQuery;
-        panel: JQuery;
-    }
-
-    interface TabsEvent<UI> {
-        (event: Event, ui: UI): void;
-    }
-
-    interface TabsEvents {
-        activate?: TabsEvent<TabsActivationUIParams>;
-        beforeActivate?: TabsEvent<TabsActivationUIParams>;
-        beforeLoad?: TabsEvent<TabsBeforeLoadUIParams>;
-        load?: TabsEvent<TabsCreateOrLoadUIParams>;
-        create?: TabsEvent<TabsCreateOrLoadUIParams>;
-    }
-
-    interface Tabs extends Widget, TabsOptions {
-    }
-
-
-    // Tooltip //////////////////////////////////////////////////
-
-    interface TooltipOptions extends TooltipEvents {
-        content?: any; // () or string
-        disabled?: boolean;
-        hide?: any; // boolean, number, string or object
-        items?: string;
-        position?: any; // TODO
-        show?: any; // boolean, number, string or object
-        tooltipClass?: string;
-        track?: boolean;
-    }
-
-    interface TooltipUIParams {
-    }
-
-    interface TooltipEvent {
-        (event: Event, ui: TooltipUIParams): void;
-    }
-
-    interface TooltipEvents {
-        close?: TooltipEvent;
-        open?: TooltipEvent;
-    }
-
-    interface Tooltip extends Widget, TooltipOptions {
-    }
-
-
-    // Effects //////////////////////////////////////////////////
-
-    interface EffectOptions {
-        effect: string;
-        easing?: string;
-        duration?: number;
-        complete: Function;
-    }
-
-    interface BlindEffect {
-        direction?: string;
-    }
-
-    interface BounceEffect {
-        distance?: number;
-        times?: number;
-    }
-
-    interface ClipEffect {
-        direction?: number;
-    }
-
-    interface DropEffect {
-        direction?: number;
-    }
-
-    interface ExplodeEffect {
-        pieces?: number;
-    }
-
-    interface FadeEffect { }
-
-    interface FoldEffect {
-        size?: any;
-        horizFirst?: boolean;
-    }
-
-    interface HighlightEffect {
-        color?: string;
-    }
-
-    interface PuffEffect {
-        percent?: number;
-    }
-
-    interface PulsateEffect {
-        times?: number;
-    }
-
-    interface ScaleEffect {
-        direction?: string;
-        origin?: string[];
-        percent?: number;
-        scale?: string;
-    }
-
-    interface ShakeEffect {
-        direction?: string;
-        distance?: number;
-        times?: number;
-    }
-
-    interface SizeEffect {
-        to?: any;
-        origin?: string[];
-        scale?: string;
-    }
-
-    interface SlideEffect {
-        direction?: string;
-        distance?: number;
-    }
-
-    interface TransferEffect {
-        className?: string;
-        to?: string;
-    }
-
-    interface JQueryPositionOptions {
-        my?: string;
-        at?: string;
-        of?: any;
-        collision?: string;
-        using?: Function;
-        within?: any;
-    }
-
-
-    // UI //////////////////////////////////////////////////
-
-    interface MouseOptions {
-        cancel?: string;
-        delay?: number;
-        distance?: number;
-    }
-
-    interface KeyCode {
-        BACKSPACE: number;
-        COMMA: number;
-        DELETE: number;
-        DOWN: number;
-        END: number;
-        ENTER: number;
-        ESCAPE: number;
-        HOME: number;
-        LEFT: number;
-        NUMPAD_ADD: number;
-        NUMPAD_DECIMAL: number;
-        NUMPAD_DIVIDE: number;
-        NUMPAD_ENTER: number;
-        NUMPAD_MULTIPLY: number;
-        NUMPAD_SUBTRACT: number;
-        PAGE_DOWN: number;
-        PAGE_UP: number;
-        PERIOD: number;
-        RIGHT: number;
-        SPACE: number;
-        TAB: number;
-        UP: number;
-    }
-
-    interface UI {
-        mouse(method: string): JQuery;
-        mouse(options: MouseOptions): JQuery;
-        mouse(optionLiteral: string, optionName: string, optionValue: any): JQuery;
-        mouse(optionLiteral: string, optionValue: any): any;
-
-        accordion: Accordion;
-        autocomplete: Autocomplete;
-        button: Button;
-        buttonset: Button;
-        datepicker: Datepicker;
-        dialog: Dialog;
-        keyCode: KeyCode;
-        menu: Menu;
-        progressbar: Progressbar;
-        slider: Slider;
-        spinner: Spinner;
-        tabs: Tabs;
-        tooltip: Tooltip;
-        version: string;
-    }
-
-
-    // Widget //////////////////////////////////////////////////
-
-    interface WidgetOptions {
-        disabled?: boolean;
-        hide?: any;
-        show?: any;
-    }
-
-    interface Widget {
-        (methodName: string): JQuery;
-        (options: WidgetOptions): JQuery;
-        (options: AccordionOptions): JQuery;
-        (optionLiteral: string, optionName: string): any;
-        (optionLiteral: string, options: WidgetOptions): any;
-        (optionLiteral: string, optionName: string, optionValue: any): JQuery;
-
-        (name: string, prototype: any): JQuery;
-        (name: string, base: Function, prototype: any): JQuery;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////
-
-}
-
-interface JQuery {
-
-    accordion(): JQuery;
-    accordion(methodName: 'destroy'): void;
-    accordion(methodName: 'disable'): void;
-    accordion(methodName: 'enable'): void;
-    accordion(methodName: 'refresh'): void;
-    accordion(methodName: 'widget'): JQuery;
-    accordion(methodName: string): JQuery;
-    accordion(options: JQueryUI.AccordionOptions): JQuery;
-    accordion(optionLiteral: string, optionName: string): any;
-    accordion(optionLiteral: string, options: JQueryUI.AccordionOptions): any;
-    accordion(optionLiteral: string, optionName: string, optionValue: any): JQuery;
-
-    autocomplete(): JQuery;
-    autocomplete(methodName: 'close'): void;
-    autocomplete(methodName: 'destroy'): void;
-    autocomplete(methodName: 'disable'): void;
-    autocomplete(methodName: 'enable'): void;
-    autocomplete(methodName: 'search', value?: string): void;
-    autocomplete(methodName: 'widget'): JQuery;
-    autocomplete(methodName: string): JQuery;
-    autocomplete(options: JQueryUI.AutocompleteOptions): JQuery;
-    autocomplete(optionLiteral: string, optionName: string): any;
-    autocomplete(optionLiteral: string, options: JQueryUI.AutocompleteOptions): any;
-    autocomplete(optionLiteral: string, optionName: string, optionValue: any): JQuery;
-
-    button(): JQuery;
-    button(methodName: 'destroy'): void;
-    button(methodName: 'disable'): void;
-    button(methodName: 'enable'): void;
-    button(methodName: 'refresh'): void;
-    button(methodName: 'widget'): JQuery;
-    button(methodName: string): JQuery;
-    button(options: JQueryUI.ButtonOptions): JQuery;
-    button(optionLiteral: string, optionName: string): any;
-    button(optionLiteral: string, options: JQueryUI.ButtonOptions): any;
-    button(optionLiteral: string, optionName: string, optionValue: any): JQuery;
-
-    buttonset(): JQuery;
-    buttonset(methodName: 'destroy'): void;
-    buttonset(methodName: 'disable'): void;
-    buttonset(methodName: 'enable'): void;
-    buttonset(methodName: 'refresh'): void;
-    buttonset(methodName: 'widget'): JQuery;
-    buttonset(methodName: string): JQuery;
-    buttonset(options: JQueryUI.ButtonOptions): JQuery;
-    buttonset(optionLiteral: string, optionName: string): any;
-    buttonset(optionLiteral: string, options: JQueryUI.ButtonOptions): any;
-    buttonset(optionLiteral: string, optionName: string, optionValue: any): JQuery;
-
-    /**
-     * Initialize a datepicker
-     */
-    datepicker(): JQuery;
-    /**
-     * Removes the datepicker functionality completely. This will return the element back to its pre-init state.
-     *
-     * @param methodName 'destroy'
-     */
-    datepicker(methodName: 'destroy'): JQuery;
-    /**
-     * Opens the datepicker in a dialog box.
-     *
-     * @param methodName 'dialog'
-     * @param date The initial date.
-     * @param onSelect A callback function when a date is selected. The function receives the date text and date picker instance as parameters.
-     * @param settings The new settings for the date picker.
-     * @param pos The position of the top/left of the dialog as [x, y] or a MouseEvent that contains the coordinates. If not specified the dialog is centered on the screen.
-     */
-    datepicker(methodName: 'dialog', date: Date, onSelect?: () => void, settings?: JQueryUI.DatepickerOptions, pos?: number[]): JQuery;
-    /**
-     * Opens the datepicker in a dialog box.
-     *
-     * @param methodName 'dialog'
-     * @param date The initial date.
-     * @param onSelect A callback function when a date is selected. The function receives the date text and date picker instance as parameters.
-     * @param settings The new settings for the date picker.
-     * @param pos The position of the top/left of the dialog as [x, y] or a MouseEvent that contains the coordinates. If not specified the dialog is centered on the screen.
-     */
-    datepicker(methodName: 'dialog', date: Date, onSelect?: () => void, settings?: JQueryUI.DatepickerOptions, pos?: MouseEvent): JQuery;
-    /**
-     * Opens the datepicker in a dialog box.
-     *
-     * @param methodName 'dialog'
-     * @param date The initial date.
-     * @param onSelect A callback function when a date is selected. The function receives the date text and date picker instance as parameters.
-     * @param settings The new settings for the date picker.
-     * @param pos The position of the top/left of the dialog as [x, y] or a MouseEvent that contains the coordinates. If not specified the dialog is centered on the screen.
-     */
-    datepicker(methodName: 'dialog', date: string, onSelect?: () => void, settings?: JQueryUI.DatepickerOptions, pos?: number[]): JQuery;
-    /**
-     * Opens the datepicker in a dialog box.
-     *
-     * @param methodName 'dialog'
-     * @param date The initial date.
-     * @param onSelect A callback function when a date is selected. The function receives the date text and date picker instance as parameters.
-     * @param settings The new settings for the date picker.
-     * @param pos The position of the top/left of the dialog as [x, y] or a MouseEvent that contains the coordinates. If not specified the dialog is centered on the screen.
-     */
-    datepicker(methodName: 'dialog', date: string, onSelect?: () => void, settings?: JQueryUI.DatepickerOptions, pos?: MouseEvent): JQuery;
-    /**
-     * Returns the current date for the datepicker or null if no date has been selected.
-     *
-     * @param methodName 'getDate'
-     */
-    datepicker(methodName: 'getDate'): Date;
-    /**
-     * Close a previously opened date picker.
-     *
-     * @param methodName 'hide'
-     */
-    datepicker(methodName: 'hide'): JQuery;
-    /**
-     * Determine whether a date picker has been disabled.
-     *
-     * @param methodName 'isDisabled'
-     */
-    datepicker(methodName: 'isDisabled'): boolean;
-    /**
-     * Redraw the date picker, after having made some external modifications.
-     *
-     * @param methodName 'refresh'
-     */
-    datepicker(methodName: 'refresh'): JQuery;
-    /**
-     * Sets the date for the datepicker. The new date may be a Date object or a string in the current date format (e.g., "01/26/2009"), a number of days from today (e.g., +7) or a string of values and periods ("y" for years, "m" for months, "w" for weeks, "d" for days, e.g., "+1m +7d"), or null to clear the selected date.
-     *
-     * @param methodName 'setDate'
-     * @param date The new date.
-     */
-    datepicker(methodName: 'setDate', date: Date): JQuery;
-    /**
-     * Sets the date for the datepicker. The new date may be a Date object or a string in the current date format (e.g., "01/26/2009"), a number of days from today (e.g., +7) or a string of values and periods ("y" for years, "m" for months, "w" for weeks, "d" for days, e.g., "+1m +7d"), or null to clear the selected date.
-     *
-     * @param methodName 'setDate'
-     * @param date The new date.
-     */
-    datepicker(methodName: 'setDate', date: string): JQuery;
-    /**
-     * Open the date picker. If the datepicker is attached to an input, the input must be visible for the datepicker to be shown.
-     *
-     * @param methodName 'show'
-     */
-    datepicker(methodName: 'show'): JQuery;
-    /**
-     * Returns a jQuery object containing the datepicker.
-     *
-     * @param methodName 'widget'
-     */
-    datepicker(methodName: 'widget'): JQuery;
-
-    /**
-     * Get the altField option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'altField'
-     */
-    datepicker(methodName: 'option', optionName: 'altField'): any;
-    /**
-     * Set the altField option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'altField'
-     * @param altFieldValue An input element that is to be updated with the selected date from the datepicker. Use the altFormat option to change the format of the date within this field. Leave as blank for no alternate field.
-     */
-    datepicker(methodName: 'option', optionName: 'altField', altFieldValue: string): JQuery;
-    /**
-     * Set the altField option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'altField'
-     * @param altFieldValue An input element that is to be updated with the selected date from the datepicker. Use the altFormat option to change the format of the date within this field. Leave as blank for no alternate field.
-     */
-    datepicker(methodName: 'option', optionName: 'altField', altFieldValue: JQuery): JQuery;
-    /**
-     * Set the altField option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'altField'
-     * @param altFieldValue An input element that is to be updated with the selected date from the datepicker. Use the altFormat option to change the format of the date within this field. Leave as blank for no alternate field.
-     */
-    datepicker(methodName: 'option', optionName: 'altField', altFieldValue: Element): JQuery;
-
-    /**
-     * Get the altFormat option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'altFormat'
-     */
-    datepicker(methodName: 'option', optionName: 'altFormat'): string;
-    /**
-     * Set the altFormat option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'altFormat'
-     * @param altFormatValue The dateFormat to be used for the altField option. This allows one date format to be shown to the user for selection purposes, while a different format is actually sent behind the scenes. For a full list of the possible formats see the formatDate function
-     */
-    datepicker(methodName: 'option', optionName: 'altFormat', altFormatValue: string): JQuery;
-
-    /**
-     * Get the appendText option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'appendText'
-     */
-    datepicker(methodName: 'option', optionName: 'appendText'): string;
-    /**
-     * Set the appendText option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'appendText'
-     * @param appendTextValue The text to display after each date field, e.g., to show the required format.
-     */
-    datepicker(methodName: 'option', optionName: 'appendText', appendTextValue: string): JQuery;
-
-    /**
-     * Get the autoSize option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'autoSize'
-     */
-    datepicker(methodName: 'option', optionName: 'autoSize'): boolean;
-    /**
-     * Set the autoSize option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'autoSize'
-     * @param autoSizeValue Set to true to automatically resize the input field to accommodate dates in the current dateFormat.
-     */
-    datepicker(methodName: 'option', optionName: 'autoSize', autoSizeValue: boolean): JQuery;
-
-    /**
-     * Get the beforeShow option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'beforeShow'
-     */
-    datepicker(methodName: 'option', optionName: 'beforeShow'): (input: Element, inst: any) => JQueryUI.DatepickerOptions;
-    /**
-     * Set the beforeShow option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'beforeShow'
-     * @param beforeShowValue A function that takes an input field and current datepicker instance and returns an options object to update the datepicker with. It is called just before the datepicker is displayed.
-     */
-    datepicker(methodName: 'option', optionName: 'beforeShow', beforeShowValue: (input: Element, inst: any) => JQueryUI.DatepickerOptions): JQuery;
-
-    /**
-     * Get the beforeShow option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'beforeShowDay'
-     */
-    datepicker(methodName: 'option', optionName: 'beforeShowDay'): (date: Date) => any[];
-    /**
-     * Set the beforeShow option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'beforeShowDay'
-     * @param beforeShowDayValue A function that takes a date as a parameter and must return an array with:
-     * [0]: true/false indicating whether or not this date is selectable
-     * [1]: a CSS class name to add to the date's cell or "" for the default presentation
-     * [2]: an optional popup tooltip for this date
-     * The function is called for each day in the datepicker before it is displayed.
-     */
-    datepicker(methodName: 'option', optionName: 'beforeShowDay', beforeShowDayValue: (date: Date) => any[]): JQuery;
-
-    /**
-     * Get the buttonImage option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'buttonImage'
-     */
-    datepicker(methodName: 'option', optionName: 'buttonImage'): string;
-    /**
-     * Set the buttonImage option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'buttonImage'
-     * @param buttonImageValue A URL of an image to use to display the datepicker when the showOn option is set to "button" or "both". If set, the buttonText option becomes the alt value and is not directly displayed.
-     */
-    datepicker(methodName: 'option', optionName: 'buttonImage', buttonImageValue: string): JQuery;
-
-    /**
-     * Get the buttonImageOnly option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'buttonImageOnly'
-     */
-    datepicker(methodName: 'option', optionName: 'buttonImageOnly'): boolean;
-    /**
-     * Set the buttonImageOnly option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'buttonImageOnly'
-     * @param buttonImageOnlyValue Whether the button image should be rendered by itself instead of inside a button element. This option is only relevant if the buttonImage option has also been set.
-     */
-    datepicker(methodName: 'option', optionName: 'buttonImageOnly', buttonImageOnlyValue: boolean): JQuery;
-
-    /**
-     * Get the buttonText option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'buttonText'
-     */
-    datepicker(methodName: 'option', optionName: 'buttonText'): string;
-    /**
-     * Set the buttonText option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'buttonText'
-     * @param buttonTextValue The text to display on the trigger button. Use in conjunction with the showOn option set to "button" or "both".
-     */
-    datepicker(methodName: 'option', optionName: 'buttonText', buttonTextValue: string): JQuery;
-
-    /**
-     * Get the calculateWeek option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'calculateWeek'
-     */
-    datepicker(methodName: 'option', optionName: 'calculateWeek'): (date: Date) => string;
-    /**
-     * Set the calculateWeek option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'calculateWeek'
-     * @param calculateWeekValue A function to calculate the week of the year for a given date. The default implementation uses the ISO 8601 definition: weeks start on a Monday; the first week of the year contains the first Thursday of the year.
-     */
-    datepicker(methodName: 'option', optionName: 'calculateWeek', calculateWeekValue: (date: Date) => string): JQuery;
-
-    /**
-     * Get the changeMonth option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'changeMonth'
-     */
-    datepicker(methodName: 'option', optionName: 'changeMonth'): boolean;
-    /**
-     * Set the changeMonth option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'changeMonth'
-     * @param changeMonthValue Whether the month should be rendered as a dropdown instead of text.
-     */
-    datepicker(methodName: 'option', optionName: 'changeMonth', changeMonthValue: boolean): JQuery;
-
-    /**
-     * Get the changeYear option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'changeYear'
-     */
-    datepicker(methodName: 'option', optionName: 'changeYear'): boolean;
-    /**
-     * Set the changeYear option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'changeYear'
-     * @param changeYearValue Whether the year should be rendered as a dropdown instead of text. Use the yearRange option to control which years are made available for selection.
-     */
-    datepicker(methodName: 'option', optionName: 'changeYear', changeYearValue: boolean): JQuery;
-
-    /**
-     * Get the closeText option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'closeText'
-     */
-    datepicker(methodName: 'option', optionName: 'closeText'): string;
-    /**
-     * Set the closeText option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'closeText'
-     * @param closeTextValue The text to display for the close link. Use the showButtonPanel option to display this button.
-     */
-    datepicker(methodName: 'option', optionName: 'closeText', closeTextValue: string): JQuery;
-
-    /**
-     * Get the constrainInput option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'constrainInput'
-     */
-    datepicker(methodName: 'option', optionName: 'constrainInput'): boolean;
-    /**
-     * Set the constrainInput option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'constrainInput'
-     * @param constrainInputValue When true, entry in the input field is constrained to those characters allowed by the current dateFormat option.
-     */
-    datepicker(methodName: 'option', optionName: 'constrainInput', constrainInputValue: boolean): JQuery;
-
-    /**
-     * Get the currentText option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'currentText'
-     */
-    datepicker(methodName: 'option', optionName: 'currentText'): string;
-    /**
-     * Set the currentText option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'currentText'
-     * @param currentTextValue The text to display for the current day link. Use the showButtonPanel option to display this button.
-     */
-    datepicker(methodName: 'option', optionName: 'currentText', currentTextValue: string): JQuery;
-
-    /**
-     * Get the dateFormat option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'dateFormat'
-     */
-    datepicker(methodName: 'option', optionName: 'dateFormat'): string;
-    /**
-     * Set the dateFormat option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'dateFormat'
-     * @param dateFormatValue The format for parsed and displayed dates. For a full list of the possible formats see the formatDate function.
-     */
-    datepicker(methodName: 'option', optionName: 'dateFormat', dateFormatValue: string): JQuery;
-
-    /**
-     * Get the dayNames option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'dayNames'
-     */
-    datepicker(methodName: 'option', optionName: 'dayNames'): string[];
-    /**
-     * Set the dayNames option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'dayNames'
-     * @param dayNamesValue The list of long day names, starting from Sunday, for use as requested via the dateFormat option.
-     */
-    datepicker(methodName: 'option', optionName: 'dayNames', dayNamesValue: string[]): JQuery;
-
-    /**
-     * Get the dayNamesMin option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'dayNamesMin'
-     */
-    datepicker(methodName: 'option', optionName: 'dayNamesMin'): string[];
-    /**
-     * Set the dayNamesMin option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'dayNamesMin'
-     * @param dayNamesMinValue The list of minimised day names, starting from Sunday, for use as column headers within the datepicker.
-     */
-    datepicker(methodName: 'option', optionName: 'dayNamesMin', dayNamesMinValue: string[]): JQuery;
-
-    /**
-     * Get the dayNamesShort option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'dayNamesShort'
-     */
-    datepicker(methodName: 'option', optionName: 'dayNamesShort'): string[];
-    /**
-     * Set the dayNamesShort option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'dayNamesShort'
-     * @param dayNamesShortValue The list of abbreviated day names, starting from Sunday, for use as requested via the dateFormat option.
-     */
-    datepicker(methodName: 'option', optionName: 'dayNamesShort', dayNamesShortValue: string[]): JQuery;
-
-    /**
-     * Get the defaultDate option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'defaultDate'
-     */
-    datepicker(methodName: 'option', optionName: 'defaultDate'): any;
-    /**
-     * Set the defaultDate option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'defaultDate'
-     * @param defaultDateValue A date object containing the default date.
-     */
-    datepicker(methodName: 'option', optionName: 'defaultDate', defaultDateValue: Date): JQuery;
-    /**
-     * Set the defaultDate option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'defaultDate'
-     * @param defaultDateValue A number of days from today. For example 2 represents two days from today and -1 represents yesterday.
-     */
-    datepicker(methodName: 'option', optionName: 'defaultDate', defaultDateValue: number): JQuery;
-    /**
-     * Set the defaultDate option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'defaultDate'
-     * @param defaultDateValue A string in the format defined by the dateFormat option, or a relative date. Relative dates must contain value and period pairs; valid periods are "y" for years, "m" for months, "w" for weeks, and "d" for days. For example, "+1m +7d" represents one month and seven days from today.
-     */
-    datepicker(methodName: 'option', optionName: 'defaultDate', defaultDateValue: string): JQuery;
-
-    /**
-     * Get the duration option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'duration'
-     */
-    datepicker(methodName: 'option', optionName: 'duration'): string;
-    /**
-     * Set the duration option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'duration'
-     * @param durationValue Control the speed at which the datepicker appears, it may be a time in milliseconds or a string representing one of the three predefined speeds ("slow", "normal", "fast").
-     */
-    datepicker(methodName: 'option', optionName: 'duration', durationValue: string): JQuery;
-
-    /**
-     * Get the firstDay option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'firstDay'
-     */
-    datepicker(methodName: 'option', optionName: 'firstDay'): number;
-    /**
-     * Set the firstDay option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'firstDay'
-     * @param firstDayValue Set the first day of the week: Sunday is 0, Monday is 1, etc.
-     */
-    datepicker(methodName: 'option', optionName: 'firstDay', firstDayValue: number): JQuery;
-
-    /**
-     * Get the gotoCurrent option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'gotoCurrent'
-     */
-    datepicker(methodName: 'option', optionName: 'gotoCurrent'): boolean;
-    /**
-     * Set the gotoCurrent option, after initialization
-     *
-     * @param methodName 'option'
-     * @param optionName 'gotoCurrent'
-     * @param gotoCurrentValue When true, the current day link moves to the currently selected date instead of today.
-     */
-    datepicker(methodName: 'option', optionName: 'gotoCurrent', gotoCurrentValue: boolean): JQuery;
-
-    /**
-     * Gets the value currently associated with the specified optionName.
-     *
-     * @param methodName 'option'
-     * @param optionName The name of the option to get.
-     */
-    datepicker(methodName: 'option', optionName: string): any;
-
-    datepicker(methodName: 'option', optionName: string, ...otherParams: any[]): any; // Used for getting and setting options
-
-    datepicker(methodName: string, ...otherParams: any[]): any;
-
-    /**
-     * Initialize a datepicker with the given options
-     */
-    datepicker(options: JQueryUI.DatepickerOptions): JQuery;
-
-    dialog(): JQuery;
-    dialog(methodName: 'close'): JQuery;
-    dialog(methodName: 'destroy'): JQuery;
-    dialog(methodName: 'isOpen'): boolean;
-    dialog(methodName: 'moveToTop'): JQuery;
-    dialog(methodName: 'open'): JQuery;
-    dialog(methodName: 'widget'): JQuery;
-    dialog(methodName: string): JQuery;
-    dialog(options: JQueryUI.DialogOptions): JQuery;
-    dialog(optionLiteral: string, optionName: string): any;
-    dialog(optionLiteral: string, options: JQueryUI.DialogOptions): any;
-    dialog(optionLiteral: string, optionName: string, optionValue: any): JQuery;
-
-    draggable(): JQuery;
-    draggable(methodName: 'destroy'): void;
-    draggable(methodName: 'disable'): void;
-    draggable(methodName: 'enable'): void;
-    draggable(methodName: 'widget'): JQuery;
-    draggable(methodName: string): JQuery;
-    draggable(options: JQueryUI.DraggableOptions): JQuery;
-    draggable(optionLiteral: string, optionName: string): any;
-    draggable(optionLiteral: string, options: JQueryUI.DraggableOptions): any;
-    draggable(optionLiteral: string, optionName: string, optionValue: any): JQuery;
-
-    droppable(): JQuery;
-    droppable(methodName: 'destroy'): void;
-    droppable(methodName: 'disable'): void;
-    droppable(methodName: 'enable'): void;
-    droppable(methodName: 'widget'): JQuery;
-    droppable(methodName: string): JQuery;
-    droppable(options: JQueryUI.DroppableOptions): JQuery;
-    droppable(optionLiteral: string, optionName: string): any;
-    droppable(optionLiteral: string, options: JQueryUI.DraggableOptions): any;
-    droppable(optionLiteral: string, optionName: string, optionValue: any): JQuery;
-
-    menu: {
-        (): JQuery;
-        (methodName: 'blur'): void;
-        (methodName: 'collapse', event?: JQueryEventObject): void;
-        (methodName: 'collapseAll', event?: JQueryEventObject, all?: boolean): void;
-        (methodName: 'destroy'): void;
-        (methodName: 'disable'): void;
-        (methodName: 'enable'): void;
-        (methodName: string, event: JQueryEventObject, item: JQuery): void;
-        (methodName: 'focus', event: JQueryEventObject, item: JQuery): void;
-        (methodName: 'isFirstItem'): boolean;
-        (methodName: 'isLastItem'): boolean;
-        (methodName: 'next', event?: JQueryEventObject): void;
-        (methodName: 'nextPage', event?: JQueryEventObject): void;
-        (methodName: 'previous', event?: JQueryEventObject): void;
-        (methodName: 'previousPage', event?: JQueryEventObject): void;
-        (methodName: 'refresh'): void;
-        (methodName: 'select', event?: JQueryEventObject): void;
-        (methodName: 'widget'): JQuery;
-        (methodName: string): JQuery;
-        (options: JQueryUI.MenuOptions): JQuery;
-        (optionLiteral: string, optionName: string): any;
-        (optionLiteral: string, options: JQueryUI.MenuOptions): any;
-        (optionLiteral: string, optionName: string, optionValue: any): JQuery;
-        active: boolean;
-    }
-
-    progressbar(): JQuery;
-    progressbar(methodName: 'destroy'): void;
-    progressbar(methodName: 'disable'): void;
-    progressbar(methodName: 'enable'): void;
-    progressbar(methodName: 'refresh'): void;
-    progressbar(methodName: 'value'): any; // number or boolean
-    progressbar(methodName: 'value', value: number): void;
-    progressbar(methodName: 'value', value: boolean): void;
-    progressbar(methodName: 'widget'): JQuery;
-    progressbar(methodName: string): JQuery;
-    progressbar(options: JQueryUI.ProgressbarOptions): JQuery;
-    progressbar(optionLiteral: string, optionName: string): any;
-    progressbar(optionLiteral: string, options: JQueryUI.ProgressbarOptions): any;
-    progressbar(optionLiteral: string, optionName: string, optionValue: any): JQuery;
-
-    resizable(): JQuery;
-    resizable(methodName: 'destroy'): void;
-    resizable(methodName: 'disable'): void;
-    resizable(methodName: 'enable'): void;
-    resizable(methodName: 'widget'): JQuery;
-    resizable(methodName: string): JQuery;
-    resizable(options: JQueryUI.ResizableOptions): JQuery;
-    resizable(optionLiteral: string, optionName: string): any;
-    resizable(optionLiteral: string, options: JQueryUI.ResizableOptions): any;
-    resizable(optionLiteral: string, optionName: string, optionValue: any): JQuery;
-
-    selectable(): JQuery;
-    selectable(methodName: 'destroy'): void;
-    selectable(methodName: 'disable'): void;
-    selectable(methodName: 'enable'): void;
-    selectable(methodName: 'widget'): JQuery;
-    selectable(methodName: string): JQuery;
-    selectable(options: JQueryUI.SelectableOptions): JQuery;
-    selectable(optionLiteral: string, optionName: string): any;
-    selectable(optionLiteral: string, options: JQueryUI.SelectableOptions): any;
-    selectable(optionLiteral: string, optionName: string, optionValue: any): JQuery;
-
-    slider(): JQuery;
-    slider(methodName: 'destroy'): void;
-    slider(methodName: 'disable'): void;
-    slider(methodName: 'enable'): void;
-    slider(methodName: 'refresh'): void;
-    slider(methodName: 'value'): number;
-    slider(methodName: 'value', value: number): void;
-    slider(methodName: 'values'): Array<number>;
-    slider(methodName: 'values', index: number): number;
-    slider(methodName: string, index: number, value: number): void;
-    slider(methodName: 'values', index: number, value: number): void;
-    slider(methodName: string, values: Array<number>): void;
-    slider(methodName: 'values', values: Array<number>): void;
-    slider(methodName: 'widget'): JQuery;
-    slider(methodName: string): JQuery;
-    slider(options: JQueryUI.SliderOptions): JQuery;
-    slider(optionLiteral: string, optionName: string): any;
-    slider(optionLiteral: string, options: JQueryUI.SliderOptions): any;
-    slider(optionLiteral: string, optionName: string, optionValue: any): JQuery;
-
-    sortable(): JQuery;
-    sortable(methodName: 'destroy'): void;
-    sortable(methodName: 'disable'): void;
-    sortable(methodName: 'enable'): void;
-    sortable(methodName: 'widget'): JQuery;
-    sortable(methodName: 'toArray'): string[];
-    sortable(methodName: string): JQuery;
-    sortable(options: JQueryUI.SortableOptions): JQuery;
-    sortable(optionLiteral: string, optionName: string): any;
-    sortable(methodName: 'serialize', options?: { key?: string; attribute?: string; expression?: RegExp }): string;
-    sortable(optionLiteral: string, options: JQueryUI.SortableOptions): any;
-    sortable(optionLiteral: string, optionName: string, optionValue: any): JQuery;
-
-    spinner(): JQuery;
-    spinner(methodName: 'destroy'): void;
-    spinner(methodName: 'disable'): void;
-    spinner(methodName: 'enable'): void;
-    spinner(methodName: 'pageDown', pages?: number): void;
-    spinner(methodName: 'pageUp', pages?: number): void;
-    spinner(methodName: 'stepDown', steps?: number): void;
-    spinner(methodName: 'stepUp', steps?: number): void;
-    spinner(methodName: 'value'): number;
-    spinner(methodName: 'value', value: number): void;
-    spinner(methodName: 'widget'): JQuery;
-    spinner(methodName: string): JQuery;
-    spinner(options: JQueryUI.SpinnerOptions): JQuery;
-    spinner(optionLiteral: string, optionName: string): any;
-    spinner(optionLiteral: string, options: JQueryUI.SpinnerOptions): any;
-    spinner(optionLiteral: string, optionName: string, optionValue: any): JQuery;
-
-    tabs(): JQuery;
-    tabs(methodName: 'destroy'): void;
-    tabs(methodName: 'disable'): void;
-    tabs(methodName: 'enable'): void;
-    tabs(methodName: 'load', index: number): void;
-    tabs(methodName: 'refresh'): void;
-    tabs(methodName: 'widget'): JQuery;
-    tabs(methodName: string): JQuery;
-    tabs(options: JQueryUI.TabsOptions): JQuery;
-    tabs(optionLiteral: string, optionName: string): any;
-    tabs(optionLiteral: string, options: JQueryUI.TabsOptions): any;
-    tabs(optionLiteral: string, optionName: string, optionValue: any): JQuery;
-
-    tooltip(): JQuery;
-    tooltip(methodName: 'destroy'): void;
-    tooltip(methodName: 'disable'): void;
-    tooltip(methodName: 'enable'): void;
-    tooltip(methodName: 'open'): void;
-    tooltip(methodName: 'close'): void;
-    tooltip(methodName: 'widget'): JQuery;
-    tooltip(methodName: string): JQuery;
-    tooltip(options: JQueryUI.TooltipOptions): JQuery;
-    tooltip(optionLiteral: string, optionName: string): any;
-    tooltip(optionLiteral: string, options: JQueryUI.TooltipOptions): any;
-    tooltip(optionLiteral: string, optionName: string, optionValue: any): JQuery;
-
-
-    addClass(classNames: string, speed?: number, callback?: Function): JQuery;
-    addClass(classNames: string, speed?: string, callback?: Function): JQuery;
-    addClass(classNames: string, speed?: number, easing?: string, callback?: Function): JQuery;
-    addClass(classNames: string, speed?: string, easing?: string, callback?: Function): JQuery;
-
-    removeClass(classNames: string, speed?: number, callback?: Function): JQuery;
-    removeClass(classNames: string, speed?: string, callback?: Function): JQuery;
-    removeClass(classNames: string, speed?: number, easing?: string, callback?: Function): JQuery;
-    removeClass(classNames: string, speed?: string, easing?: string, callback?: Function): JQuery;
-
-    switchClass(removeClassName: string, addClassName: string, duration?: number, easing?: string, complete?: Function): JQuery;
-    switchClass(removeClassName: string, addClassName: string, duration?: string, easing?: string, complete?: Function): JQuery;
-
-    toggleClass(className: string, duration?: number, easing?: string, complete?: Function): JQuery;
-    toggleClass(className: string, duration?: string, easing?: string, complete?: Function): JQuery;
-    toggleClass(className: string, aswitch?: boolean, duration?: number, easing?: string, complete?: Function): JQuery;
-    toggleClass(className: string, aswitch?: boolean, duration?: string, easing?: string, complete?: Function): JQuery;
-
-    effect(options: any): JQuery;
-    effect(effect: string, options?: any, duration?: number, complete?: Function): JQuery;
-    effect(effect: string, options?: any, duration?: string, complete?: Function): JQuery;
-
-    hide(options: any): JQuery;
-    hide(effect: string, options?: any, duration?: number, complete?: Function): JQuery;
-    hide(effect: string, options?: any, duration?: string, complete?: Function): JQuery;
-
-    show(options: any): JQuery;
-    show(effect: string, options?: any, duration?: number, complete?: Function): JQuery;
-    show(effect: string, options?: any, duration?: string, complete?: Function): JQuery;
-
-    toggle(options: any): JQuery;
-    toggle(effect: string, options?: any, duration?: number, complete?: Function): JQuery;
-    toggle(effect: string, options?: any, duration?: string, complete?: Function): JQuery;
-
-    position(options: JQueryUI.JQueryPositionOptions): JQuery;
-
-    enableSelection(): JQuery;
-    disableSelection(): JQuery;
-    focus(delay: number, callback?: Function): JQuery;
-    uniqueId(): JQuery;
-    removeUniqueId(): JQuery;
-    scrollParent(): JQuery;
-    zIndex(): JQuery;
-    zIndex(zIndex: number): JQuery;
-
-    widget: JQueryUI.Widget;
-
-    jQuery: JQueryStatic;
-}
-
-interface JQueryStatic {
-    ui: JQueryUI.UI;
-    datepicker: JQueryUI.Datepicker;
-    widget: JQueryUI.Widget;
-    Widget: JQueryUI.Widget;
-}
-
-interface JQueryEasingFunctions {
-    easeInQuad: JQueryEasingFunction;
-    easeOutQuad: JQueryEasingFunction;
-    easeInOutQuad: JQueryEasingFunction;
-    easeInCubic: JQueryEasingFunction;
-    easeOutCubic: JQueryEasingFunction;
-    easeInOutCubic: JQueryEasingFunction;
-    easeInQuart: JQueryEasingFunction;
-    easeOutQuart: JQueryEasingFunction;
-    easeInOutQuart: JQueryEasingFunction;
-    easeInQuint: JQueryEasingFunction;
-    easeOutQuint: JQueryEasingFunction;
-    easeInOutQuint: JQueryEasingFunction;
-    easeInExpo: JQueryEasingFunction;
-    easeOutExpo: JQueryEasingFunction;
-    easeInOutExpo: JQueryEasingFunction;
-    easeInSine: JQueryEasingFunction;
-    easeOutSine: JQueryEasingFunction;
-    easeInOutSine: JQueryEasingFunction;
-    easeInCirc: JQueryEasingFunction;
-    easeOutCirc: JQueryEasingFunction;
-    easeInOutCirc: JQueryEasingFunction;
-    easeInElastic: JQueryEasingFunction;
-    easeOutElastic: JQueryEasingFunction;
-    easeInOutElastic: JQueryEasingFunction;
-    easeInBack: JQueryEasingFunction;
-    easeOutBack: JQueryEasingFunction;
-    easeInOutBack: JQueryEasingFunction;
-    easeInBounce: JQueryEasingFunction;
-    easeOutBounce: JQueryEasingFunction;
-    easeInOutBounce: JQueryEasingFunction;
-}
diff --git a/jqueryui/tsconfig.json b/jqueryui/tsconfig.json
new file mode 100644
index 0000000000..6ba69493a3
--- /dev/null
+++ b/jqueryui/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jqueryui-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/js-beautify/js-beautify.d.ts b/js-beautify/index.d.ts
similarity index 100%
rename from js-beautify/js-beautify.d.ts
rename to js-beautify/index.d.ts
diff --git a/js-beautify/js-beautify-tests.ts b/js-beautify/js-beautify-tests.ts
index bcd431c2bd..6604957a98 100644
--- a/js-beautify/js-beautify-tests.ts
+++ b/js-beautify/js-beautify-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="js-beautify.d.ts" />
+
 
 var simple: string = js_beautify("console.log('Hello world!');");
 
diff --git a/js-beautify/tsconfig.json b/js-beautify/tsconfig.json
new file mode 100644
index 0000000000..48b9a3af7f
--- /dev/null
+++ b/js-beautify/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "js-beautify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/js-clipper/js-clipper.d.ts b/js-clipper/index.d.ts
similarity index 100%
rename from js-clipper/js-clipper.d.ts
rename to js-clipper/index.d.ts
diff --git a/js-clipper/js-clipper-tests.ts b/js-clipper/js-clipper-tests.ts
index 316b3ab578..72a7717daa 100644
--- a/js-clipper/js-clipper-tests.ts
+++ b/js-clipper/js-clipper-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="js-clipper.d.ts" />
+
 
 class jsClipperTest{
 	public intPointTest(){
diff --git a/js-clipper/tsconfig.json b/js-clipper/tsconfig.json
new file mode 100644
index 0000000000..1eddce5376
--- /dev/null
+++ b/js-clipper/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "js-clipper-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/js-combinatorics/index.d.ts b/js-combinatorics/index.d.ts
new file mode 100644
index 0000000000..6a5fa8e249
--- /dev/null
+++ b/js-combinatorics/index.d.ts
@@ -0,0 +1,134 @@
+// Type definitions for js-combinatorics v0.5.0
+// Project: https://github.com/dankogai/js-combinatorics
+// Definitions by: Vasya Aksyonov <https://github.com/outring>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace __Combinatorics {
+
+	interface IGenerator<T> {
+
+		/**
+		 * Returns the element or undefined if no more element is available.
+		 */
+		next():T;
+
+		/**
+		 * Applies the callback function for each element.
+		 */
+		forEach(f:(item:T) => void):void;
+
+		/**
+		 * All elements at once with function applied to each element.
+		 */
+		map<TResult>(f:(item:T) => TResult):TResult[];
+
+		/**
+		 * Returns an array with elements that passes the filter function.
+		 */
+		filter(predicate:(item:T) => boolean):T[];
+
+		/**
+		 * All elements at once.
+		 */
+		toArray():T[];
+
+		/**
+		 * Returns the number of elements to be generated which equals to generator.toArray().length
+		 * but it is precalculated without actually generating elements.
+		 * Handy when you prepare for large iteration.
+		 */
+		length:number;
+
+	}
+
+	interface IPredictableGenerator<T> extends IGenerator<T> {
+
+		/**
+		 * Returns the nth element (starting 0).
+		 */
+		nth(n:number):T;
+
+	}
+
+	interface ICartesianProductGenerator<T> extends IPredictableGenerator<T> {
+
+		/**
+		 * Arguments are coordinates in integer.
+		 * Arguments can be out of bounds but it returns undefined in such cases.
+		 */
+		get(...coordinates:number[]):T;
+
+	}
+
+	/**
+	 * Calculates m P n
+	 */
+	function P(m:number, n:number):number;
+
+	/**
+	 * Calculates m C n
+	 */
+	function C(m:number, n:number):number;
+
+	/**
+	 * Calculates n!
+	 */
+	function factorial(n:number):number;
+
+	/**
+	 * Returns the factoradic representation of n in array, in least significant order.
+	 * See http://en.wikipedia.org/wiki/Factorial_number_system
+	 */
+	function factoradic(n:number):number[];
+
+	/**
+	 * Generates the power set of array.
+	 */
+	function power<T>(a:T[]):IPredictableGenerator<T[]>;
+
+	/**
+	 * Generates the combination of array with n elements.
+	 * When n is ommited, the length of the array is used.
+	 */
+	function combination<T>(a:T[], n?:number):IGenerator<T[]>;
+
+	/**
+	 * Generates the permutation of array with n elements.
+	 * When n is ommited, the length of the array is used.
+	 */
+	function permutation<T>(a:T[], n?:number):IGenerator<T[]>;
+
+	/**
+	 * Generates the permutation of the combination of n.
+	 * Equivalent to permutation(combination(a)), but more efficient.
+	 */
+	function permutationCombination<T>(a:T[]):IGenerator<T[]>;
+
+	/**
+	 * Generates n-digit "numbers" where each digit is an element in array.
+	 * Note this "number" is in the least significant order.
+	 * When n is ommited, the length of the array is used.
+	 */
+	function baseN<T>(a:T[], n?:number):IPredictableGenerator<T[]>;
+
+	/**
+	 * Generates the cartesian product of the arrays. All arguments must be arrays with more than one element.
+	 */
+	function cartesianProduct<T1>(a1:T1[]):ICartesianProductGenerator<[T1]>;
+	function cartesianProduct<T1, T2>(a1:T1[], a2:T2[]):ICartesianProductGenerator<[T1, T2]>;
+	function cartesianProduct<T1, T2, T3>(a1:T1[], a2:T2[], a3:T3[]):ICartesianProductGenerator<[T1, T2, T3]>;
+	function cartesianProduct<T1, T2, T3, T4>(a1:T1[], a2:T2[], a3:T3[], a4:T4[]):ICartesianProductGenerator<[T1, T2, T3, T4]>;
+	function cartesianProduct<T1, T2, T3, T4, T5>(a1:T1[], a2:T2[], a3:T3[], a4:T4[], a5:T5[]):ICartesianProductGenerator<[T1, T2, T3, T4, T5]>;
+	function cartesianProduct<T1, T2, T3, T4, T5, T6>(a1:T1[], a2:T2[], a3:T3[], a4:T4[], a5:T5[], a6:T6[]):ICartesianProductGenerator<[T1, T2, T3, T4, T5, T6]>;
+	function cartesianProduct<T1, T2, T3, T4, T5, T6, T7>(a1:T1[], a2:T2[], a3:T3[], a4:T4[], a5:T5[], a6:T6[], a7:T7[]):ICartesianProductGenerator<[T1, T2, T3, T4, T5, T6, T7]>;
+	function cartesianProduct<T1, T2, T3, T4, T5, T6, T7, T8>(a1:T1[], a2:T2[], a3:T3[], a4:T4[], a5:T5[], a6:T6[], a7:T7[], a8:T8[]):ICartesianProductGenerator<[T1, T2, T3, T4, T5, T6, T7, T8]>;
+	function cartesianProduct<T1, T2, T3, T4, T5, T6, T7, T8, T9>(a1:T1[], a2:T2[], a3:T3[], a4:T4[], a5:T5[], a6:T6[], a7:T7[], a8:T8[], a9:T9[]):ICartesianProductGenerator<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>;
+	function cartesianProduct<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(a1:T1[], a2:T2[], a3:T3[], a4:T4[], a5:T5[], a6:T6[], a7:T7[], a8:T8[], a9:T9[], a10:T10[]):ICartesianProductGenerator<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>;
+	function cartesianProduct(...a:any[][]):ICartesianProductGenerator<any[]>;
+
+	const VERSION:string;
+
+}
+
+export = __Combinatorics;
+export as namespace Combinatorics;
diff --git a/js-combinatorics/js-combinatorics-global-tests.ts b/js-combinatorics/js-combinatorics-global-tests.ts
index e8591fbc20..2bdddc9897 100644
--- a/js-combinatorics/js-combinatorics-global-tests.ts
+++ b/js-combinatorics/js-combinatorics-global-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./js-combinatorics-global.d.ts" />
+
 
 const p:number = Combinatorics.P(1, 2);
 const c:number = Combinatorics.C(1, 2);
diff --git a/js-combinatorics/js-combinatorics-global.d.ts b/js-combinatorics/js-combinatorics-global.d.ts
index 91ed7903cd..b3a4b7b49a 100644
--- a/js-combinatorics/js-combinatorics-global.d.ts
+++ b/js-combinatorics/js-combinatorics-global.d.ts
@@ -3,6 +3,6 @@
 // Definitions by: Vasya Aksyonov <https://github.com/outring>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./js-combinatorics.d.ts" />
+
 
 import Combinatorics = __Combinatorics;
diff --git a/js-combinatorics/js-combinatorics-tests.ts b/js-combinatorics/js-combinatorics-tests.ts
index 08e04c374f..68714ca17a 100644
--- a/js-combinatorics/js-combinatorics-tests.ts
+++ b/js-combinatorics/js-combinatorics-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./js-combinatorics.d.ts" />
+
 
 import * as Combinatorics from "js-combinatorics";
 
diff --git a/js-combinatorics/js-combinatorics.d.ts b/js-combinatorics/js-combinatorics.d.ts
deleted file mode 100644
index d09ce432bb..0000000000
--- a/js-combinatorics/js-combinatorics.d.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-// Type definitions for js-combinatorics v0.5.0
-// Project: https://github.com/dankogai/js-combinatorics
-// Definitions by: Vasya Aksyonov <https://github.com/outring>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace __Combinatorics {
-
-	interface IGenerator<T> {
-
-		/**
-		 * Returns the element or undefined if no more element is available.
-		 */
-		next():T;
-
-		/**
-		 * Applies the callback function for each element.
-		 */
-		forEach(f:(item:T) => void):void;
-
-		/**
-		 * All elements at once with function applied to each element.
-		 */
-		map<TResult>(f:(item:T) => TResult):TResult[];
-
-		/**
-		 * Returns an array with elements that passes the filter function.
-		 */
-		filter(predicate:(item:T) => boolean):T[];
-
-		/**
-		 * All elements at once.
-		 */
-		toArray():T[];
-
-		/**
-		 * Returns the number of elements to be generated which equals to generator.toArray().length
-		 * but it is precalculated without actually generating elements.
-		 * Handy when you prepare for large iteration.
-		 */
-		length:number;
-
-	}
-
-	interface IPredictableGenerator<T> extends IGenerator<T> {
-
-		/**
-		 * Returns the nth element (starting 0).
-		 */
-		nth(n:number):T;
-
-	}
-
-	interface ICartesianProductGenerator<T> extends IPredictableGenerator<T> {
-
-		/**
-		 * Arguments are coordinates in integer.
-		 * Arguments can be out of bounds but it returns undefined in such cases.
-		 */
-		get(...coordinates:number[]):T;
-
-	}
-
-	/**
-	 * Calculates m P n
-	 */
-	function P(m:number, n:number):number;
-
-	/**
-	 * Calculates m C n
-	 */
-	function C(m:number, n:number):number;
-
-	/**
-	 * Calculates n!
-	 */
-	function factorial(n:number):number;
-
-	/**
-	 * Returns the factoradic representation of n in array, in least significant order.
-	 * See http://en.wikipedia.org/wiki/Factorial_number_system
-	 */
-	function factoradic(n:number):number[];
-
-	/**
-	 * Generates the power set of array.
-	 */
-	function power<T>(a:T[]):IPredictableGenerator<T[]>;
-
-	/**
-	 * Generates the combination of array with n elements.
-	 * When n is ommited, the length of the array is used.
-	 */
-	function combination<T>(a:T[], n?:number):IGenerator<T[]>;
-
-	/**
-	 * Generates the permutation of array with n elements.
-	 * When n is ommited, the length of the array is used.
-	 */
-	function permutation<T>(a:T[], n?:number):IGenerator<T[]>;
-
-	/**
-	 * Generates the permutation of the combination of n.
-	 * Equivalent to permutation(combination(a)), but more efficient.
-	 */
-	function permutationCombination<T>(a:T[]):IGenerator<T[]>;
-
-	/**
-	 * Generates n-digit "numbers" where each digit is an element in array.
-	 * Note this "number" is in the least significant order.
-	 * When n is ommited, the length of the array is used.
-	 */
-	function baseN<T>(a:T[], n?:number):IPredictableGenerator<T[]>;
-
-	/**
-	 * Generates the cartesian product of the arrays. All arguments must be arrays with more than one element.
-	 */
-	function cartesianProduct<T1>(a1:T1[]):ICartesianProductGenerator<[T1]>;
-	function cartesianProduct<T1, T2>(a1:T1[], a2:T2[]):ICartesianProductGenerator<[T1, T2]>;
-	function cartesianProduct<T1, T2, T3>(a1:T1[], a2:T2[], a3:T3[]):ICartesianProductGenerator<[T1, T2, T3]>;
-	function cartesianProduct<T1, T2, T3, T4>(a1:T1[], a2:T2[], a3:T3[], a4:T4[]):ICartesianProductGenerator<[T1, T2, T3, T4]>;
-	function cartesianProduct<T1, T2, T3, T4, T5>(a1:T1[], a2:T2[], a3:T3[], a4:T4[], a5:T5[]):ICartesianProductGenerator<[T1, T2, T3, T4, T5]>;
-	function cartesianProduct<T1, T2, T3, T4, T5, T6>(a1:T1[], a2:T2[], a3:T3[], a4:T4[], a5:T5[], a6:T6[]):ICartesianProductGenerator<[T1, T2, T3, T4, T5, T6]>;
-	function cartesianProduct<T1, T2, T3, T4, T5, T6, T7>(a1:T1[], a2:T2[], a3:T3[], a4:T4[], a5:T5[], a6:T6[], a7:T7[]):ICartesianProductGenerator<[T1, T2, T3, T4, T5, T6, T7]>;
-	function cartesianProduct<T1, T2, T3, T4, T5, T6, T7, T8>(a1:T1[], a2:T2[], a3:T3[], a4:T4[], a5:T5[], a6:T6[], a7:T7[], a8:T8[]):ICartesianProductGenerator<[T1, T2, T3, T4, T5, T6, T7, T8]>;
-	function cartesianProduct<T1, T2, T3, T4, T5, T6, T7, T8, T9>(a1:T1[], a2:T2[], a3:T3[], a4:T4[], a5:T5[], a6:T6[], a7:T7[], a8:T8[], a9:T9[]):ICartesianProductGenerator<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>;
-	function cartesianProduct<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(a1:T1[], a2:T2[], a3:T3[], a4:T4[], a5:T5[], a6:T6[], a7:T7[], a8:T8[], a9:T9[], a10:T10[]):ICartesianProductGenerator<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>;
-	function cartesianProduct(...a:any[][]):ICartesianProductGenerator<any[]>;
-
-	const VERSION:string;
-
-}
-
-declare module "js-combinatorics" {
-	export = __Combinatorics;
-}
diff --git a/js-combinatorics/tsconfig.json b/js-combinatorics/tsconfig.json
new file mode 100644
index 0000000000..6623e7d290
--- /dev/null
+++ b/js-combinatorics/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "js-combinatorics-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/js-cookie/index.d.ts b/js-cookie/index.d.ts
new file mode 100644
index 0000000000..a54f4f4864
--- /dev/null
+++ b/js-cookie/index.d.ts
@@ -0,0 +1,95 @@
+// Type definitions for js-cookie v2.0
+// Project: https://github.com/js-cookie/js-cookie
+// Definitions by: Theodore Brown <https://github.com/theodorejb>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace Cookies {
+    interface CookieAttributes {
+        /**
+         * Define when the cookie will be removed. Value can be a Number
+         * which will be interpreted as days from time of creation or a
+         * Date instance. If omitted, the cookie becomes a session cookie.
+         */
+        expires?: number | Date;
+
+        /**
+         * Define the path where the cookie is available. Defaults to '/'
+         */
+        path?: string;
+
+        /**
+         * Define the domain where the cookie is available. Defaults to
+         * the domain of the page where the cookie was created.
+         */
+        domain?: string;
+
+        /**
+         * A Boolean indicating if the cookie transmission requires a
+         * secure protocol (https). Defaults to false.
+         */
+        secure?: boolean;
+    }
+
+    interface CookiesStatic {
+        /**
+         * Allows default cookie attributes to be accessed, changed, or reset
+         */
+        defaults: CookieAttributes;
+
+        /**
+         * Create a cookie
+         */
+        set(name: string, value: string | any, options?: CookieAttributes): void;
+
+        /**
+         * Read cookie
+         */
+        get(name: string): string;
+
+        /**
+         * Read all available cookies
+         */
+        get(): {[key: string]: string};
+
+        /**
+         * Returns the parsed representation of the string
+         * stored in the cookie according to JSON.parse
+         */
+        getJSON(name: string): any;
+
+        /**
+         * Returns the parsed representation of
+         * all cookies according to JSON.parse
+         */
+        getJSON(): {[key: string]: any};
+
+        /**
+         * Delete cookie
+         */
+        remove(name: string, options?: CookieAttributes): void;
+
+        /**
+         * If there is any danger of a conflict with the namespace Cookies,
+         * the noConflict method will allow you to define a new namespace
+         * and preserve the original one. This is especially useful when
+         * running the script on third party sites e.g. as part of a widget
+         * or SDK. Note: The noConflict method is not necessary when using
+         * AMD or CommonJS, thus it is not exposed in those environments.
+         */
+        noConflict(): CookiesStatic;
+
+        /**
+         * Create a new instance of the api that overrides the default
+         * decoding implementation. All methods that rely in a proper
+         * decoding to work, such as Cookies.remove() and Cookies.get(),
+         * will run the converter first for each cookie. The returned
+         * string will be used as the cookie value.
+         */
+        withConverter(converter: (value: string, name: string) => string): CookiesStatic;
+    }
+}
+
+declare var Cookies: Cookies.CookiesStatic;
+
+export = Cookies;
+export as namespace Cookies;
diff --git a/js-cookie/js-cookie-tests.ts b/js-cookie/js-cookie-tests.ts
index 819f42903a..3b2509fe8a 100644
--- a/js-cookie/js-cookie-tests.ts
+++ b/js-cookie/js-cookie-tests.ts
@@ -1,5 +1,4 @@
-///<reference path="js-cookie.d.ts" />
-
+import Cookies = require("js-cookie");
 // Create a cookie, valid across the entire site
 Cookies.set('name', 'value');
 
diff --git a/js-cookie/js-cookie.d.ts b/js-cookie/js-cookie.d.ts
deleted file mode 100644
index a00b2d5272..0000000000
--- a/js-cookie/js-cookie.d.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-// Type definitions for js-cookie v2.0
-// Project: https://github.com/js-cookie/js-cookie
-// Definitions by: Theodore Brown <https://github.com/theodorejb>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace Cookies {
-    interface CookieAttributes {
-        /**
-         * Define when the cookie will be removed. Value can be a Number
-         * which will be interpreted as days from time of creation or a
-         * Date instance. If omitted, the cookie becomes a session cookie.
-         */
-        expires?: number | Date;
-
-        /**
-         * Define the path where the cookie is available. Defaults to '/'
-         */
-        path?: string;
-
-        /**
-         * Define the domain where the cookie is available. Defaults to
-         * the domain of the page where the cookie was created.
-         */
-        domain?: string;
-
-        /**
-         * A Boolean indicating if the cookie transmission requires a
-         * secure protocol (https). Defaults to false.
-         */
-        secure?: boolean;
-    }
-
-    interface CookiesStatic {
-        /**
-         * Allows default cookie attributes to be accessed, changed, or reset
-         */
-        defaults: CookieAttributes;
-
-        /**
-         * Create a cookie
-         */
-        set(name: string, value: string | any, options?: CookieAttributes): void;
-
-        /**
-         * Read cookie
-         */
-        get(name: string): string;
-
-        /**
-         * Read all available cookies
-         */
-        get(): {[key: string]: string};
-
-        /**
-         * Returns the parsed representation of the string
-         * stored in the cookie according to JSON.parse
-         */
-        getJSON(name: string): any;
-
-        /**
-         * Returns the parsed representation of
-         * all cookies according to JSON.parse
-         */
-        getJSON(): {[key: string]: any};
-
-        /**
-         * Delete cookie
-         */
-        remove(name: string, options?: CookieAttributes): void;
-
-        /**
-         * If there is any danger of a conflict with the namespace Cookies,
-         * the noConflict method will allow you to define a new namespace
-         * and preserve the original one. This is especially useful when
-         * running the script on third party sites e.g. as part of a widget
-         * or SDK. Note: The noConflict method is not necessary when using
-         * AMD or CommonJS, thus it is not exposed in those environments.
-         */
-        noConflict(): CookiesStatic;
-
-        /**
-         * Create a new instance of the api that overrides the default
-         * decoding implementation. All methods that rely in a proper
-         * decoding to work, such as Cookies.remove() and Cookies.get(),
-         * will run the converter first for each cookie. The returned
-         * string will be used as the cookie value.
-         */
-        withConverter(converter: (value: string, name: string) => string): CookiesStatic;
-    }
-}
-
-declare var Cookies: Cookies.CookiesStatic;
-
-declare module 'js-cookie' {
-    export = Cookies;
-}
diff --git a/js-cookie/tsconfig.json b/js-cookie/tsconfig.json
new file mode 100644
index 0000000000..1f92314b91
--- /dev/null
+++ b/js-cookie/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "js-cookie-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/js-data-angular/index.d.ts b/js-data-angular/index.d.ts
new file mode 100644
index 0000000000..51d3195900
--- /dev/null
+++ b/js-data-angular/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for JSDataAngular v2.1.0
+// Project: https://github.com/js-data/js-data-angular
+// Definitions by: Stefan Steinhart <https://github.com/reppners>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="js-data" />
+/// <reference types="angularjs" />
+
+declare namespace JSData {
+
+    interface DSProvider {
+        defaults:DSConfiguration;
+    }
+
+    interface DS {
+        bindAll<T>(resourceName:string, params:DSFilterParams, scope:ng.IScope, expr:string, cb?:(err:DSError, items:Array<T & DSInstanceShorthands<T>>)=>void):Function;
+        bindOne<T>(resourceName:string, id:string | number, scope:ng.IScope, expr:string, cb?:(err:DSError, item:T & DSInstanceShorthands<T>)=>void):Function;
+    }
+
+    interface DSResourceDefinition<T> {
+        bindAll(params:DSFilterParams, scope:ng.IScope, expr:string, cb?:(err:DSError, items:Array<T & DSInstanceShorthands<T>>)=>void):Function;
+        bindOne(id:string | number, scope:ng.IScope, expr:string, cb?:(err:DSError, item:T & DSInstanceShorthands<T>)=>void):Function;
+    }
+}
diff --git a/js-data-angular/js-data-angular-tests.ts b/js-data-angular/js-data-angular-tests.ts
index 8e036212fb..ffb5aed8c4 100644
--- a/js-data-angular/js-data-angular-tests.ts
+++ b/js-data-angular/js-data-angular-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="js-data-angular.d.ts" />
+
 
 interface IUser {
 
diff --git a/js-data-angular/js-data-angular.d.ts b/js-data-angular/js-data-angular.d.ts
deleted file mode 100644
index 56037690e6..0000000000
--- a/js-data-angular/js-data-angular.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Type definitions for JSDataAngular v2.1.0
-// Project: https://github.com/js-data/js-data-angular
-// Definitions by: Stefan Steinhart <https://github.com/reppners>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../js-data/js-data.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace JSData {
-
-    interface DSProvider {
-        defaults:DSConfiguration;
-    }
-
-    interface DS {
-        bindAll<T>(resourceName:string, params:DSFilterParams, scope:ng.IScope, expr:string, cb?:(err:DSError, items:Array<T & DSInstanceShorthands<T>>)=>void):Function;
-        bindOne<T>(resourceName:string, id:string | number, scope:ng.IScope, expr:string, cb?:(err:DSError, item:T & DSInstanceShorthands<T>)=>void):Function;
-    }
-
-    interface DSResourceDefinition<T> {
-        bindAll(params:DSFilterParams, scope:ng.IScope, expr:string, cb?:(err:DSError, items:Array<T & DSInstanceShorthands<T>>)=>void):Function;
-        bindOne(id:string | number, scope:ng.IScope, expr:string, cb?:(err:DSError, item:T & DSInstanceShorthands<T>)=>void):Function;
-    }
-}
diff --git a/js-data-angular/tsconfig.json b/js-data-angular/tsconfig.json
new file mode 100644
index 0000000000..6ec75edb5f
--- /dev/null
+++ b/js-data-angular/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "js-data-angular-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/js-data-http/index.d.ts b/js-data-http/index.d.ts
new file mode 100644
index 0000000000..5c51b1ec65
--- /dev/null
+++ b/js-data-http/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for JSData Http Adapter v1.2.0
+// Project: https://github.com/js-data/js-data-http
+// Definitions by: Stefan Steinhart <https://github.com/reppners>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="js-data" />
+
+declare namespace JSData {
+
+    interface DSHttpAdapterOptions {
+        serialize?: (resourceName:string, data:any)=>any;
+        deserialize?: (resourceName:string, data:any)=>any;
+        queryTransform?: (resourceName:string, params:DSFilterParams)=>any;
+        httpConfig?: any;
+        forceTrailingSlash?: boolean;
+        log?: boolean | ((message?:any, ...optionalParams:any[])=> void);
+        error?: boolean | ((message?:any, ...optionalParams:any[])=> void);
+    }
+
+    interface DSHttpAdapterPromiseResolveType {
+        data: any;
+        headers: any;
+        status: number;
+        config: any;
+    }
+
+    interface DSHttpAdapter extends IDSAdapter {
+
+        new(options?:DSHttpAdapterOptions):DSHttpAdapter;
+
+        // DSHttpAdapter uses axios so options are axios config objects.
+        HTTP(options?:Object):JSDataPromise<DSHttpAdapterPromiseResolveType>;
+        DEL(url:string, data?:Object, options?:Object):JSDataPromise<DSHttpAdapterPromiseResolveType>;
+        GET(url:string, data?:Object, options?:Object):JSDataPromise<DSHttpAdapterPromiseResolveType>;
+        POST(url:string, data?:Object, options?:Object):JSDataPromise<DSHttpAdapterPromiseResolveType>;
+        PUT(url:string, data?:Object, options?:Object):JSDataPromise<DSHttpAdapterPromiseResolveType>;
+    }
+}
+
+declare var DSHttpAdapter:JSData.DSHttpAdapter;
+
+declare module 'js-data-http' {
+    export = DSHttpAdapter;
+}
diff --git a/js-data-http/js-data-http-tests.ts b/js-data-http/js-data-http-tests.ts
index 390e20aa9e..97a0fc9b03 100644
--- a/js-data-http/js-data-http-tests.ts
+++ b/js-data-http/js-data-http-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="js-data-http.d.ts" />
+
 
 var adapter = new DSHttpAdapter();
 var store = new JSData.DS();
diff --git a/js-data-http/js-data-http.d.ts b/js-data-http/js-data-http.d.ts
deleted file mode 100644
index cde3b4a2e1..0000000000
--- a/js-data-http/js-data-http.d.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-// Type definitions for JSData Http Adapter v1.2.0
-// Project: https://github.com/js-data/js-data-http
-// Definitions by: Stefan Steinhart <https://github.com/reppners>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../js-data/js-data.d.ts" />
-
-declare namespace JSData {
-
-    interface DSHttpAdapterOptions {
-        serialize?: (resourceName:string, data:any)=>any;
-        deserialize?: (resourceName:string, data:any)=>any;
-        queryTransform?: (resourceName:string, params:DSFilterParams)=>any;
-        httpConfig?: any;
-        forceTrailingSlash?: boolean;
-        log?: boolean | ((message?:any, ...optionalParams:any[])=> void);
-        error?: boolean | ((message?:any, ...optionalParams:any[])=> void);
-    }
-
-    interface DSHttpAdapterPromiseResolveType {
-        data: any;
-        headers: any;
-        status: number;
-        config: any;
-    }
-
-    interface DSHttpAdapter extends IDSAdapter {
-
-        new(options?:DSHttpAdapterOptions):DSHttpAdapter;
-
-        // DSHttpAdapter uses axios so options are axios config objects.
-        HTTP(options?:Object):JSDataPromise<DSHttpAdapterPromiseResolveType>;
-        DEL(url:string, data?:Object, options?:Object):JSDataPromise<DSHttpAdapterPromiseResolveType>;
-        GET(url:string, data?:Object, options?:Object):JSDataPromise<DSHttpAdapterPromiseResolveType>;
-        POST(url:string, data?:Object, options?:Object):JSDataPromise<DSHttpAdapterPromiseResolveType>;
-        PUT(url:string, data?:Object, options?:Object):JSDataPromise<DSHttpAdapterPromiseResolveType>;
-    }
-}
-
-declare var DSHttpAdapter:JSData.DSHttpAdapter;
-
-declare module 'js-data-http' {
-    export = DSHttpAdapter;
-}
diff --git a/js-data-http/tsconfig.json b/js-data-http/tsconfig.json
new file mode 100644
index 0000000000..0046cc2bbd
--- /dev/null
+++ b/js-data-http/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "js-data-http-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/js-data/js-data.d.ts b/js-data/index.d.ts
similarity index 100%
rename from js-data/js-data.d.ts
rename to js-data/index.d.ts
diff --git a/js-data/js-data-node-tests.ts b/js-data/js-data-node-tests.ts
index e1989bb20b..7317132605 100644
--- a/js-data/js-data-node-tests.ts
+++ b/js-data/js-data-node-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../js-data-http/js-data-http.d.ts" />
+/// <reference types="js-data-http" />
 
 import JSData = require('js-data');
 import DSHttpAdapter = require('js-data-http')
diff --git a/js-data/js-data-tests.ts b/js-data/js-data-tests.ts
index 7c66952162..596e0077df 100644
--- a/js-data/js-data-tests.ts
+++ b/js-data/js-data-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="js-data.d.ts" />
+import JSData = require("js-data");
 
 interface IUser {
     id?: number;
diff --git a/js-data/legacy/js-data-1.5.4.d.ts b/js-data/legacy/index.d.ts
similarity index 100%
rename from js-data/legacy/js-data-1.5.4.d.ts
rename to js-data/legacy/index.d.ts
diff --git a/js-data/legacy/js-data-1.5.4-tests.ts b/js-data/legacy/js-data-1.5.4-tests.ts
index c5e2d236f1..0832f066d9 100644
--- a/js-data/legacy/js-data-1.5.4-tests.ts
+++ b/js-data/legacy/js-data-1.5.4-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="js-data-1.5.4.d.ts" />
+
 
 interface IUser {
     id?: number;
diff --git a/js-data/legacy/js-data-node-1.5.4-tests.ts b/js-data/legacy/js-data-node-1.5.4-tests.ts
index 2a89031e74..547643fed0 100644
--- a/js-data/legacy/js-data-node-1.5.4-tests.ts
+++ b/js-data/legacy/js-data-node-1.5.4-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="js-data-1.5.4.d.ts" />
+
 
 import JSData = require('js-data');
 var store = new JSData.DS();
diff --git a/js-data/legacy/tsconfig.json b/js-data/legacy/tsconfig.json
new file mode 100644
index 0000000000..4c63efc65d
--- /dev/null
+++ b/js-data/legacy/tsconfig.json
@@ -0,0 +1,15 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../../",
+        "typesRoot": "../../",
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "js-data-1.5.4-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/js-data/tsconfig.json b/js-data/tsconfig.json
new file mode 100644
index 0000000000..1a39927610
--- /dev/null
+++ b/js-data/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "js-data-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/js-fixtures/fixtures-tests.ts b/js-fixtures/fixtures-tests.ts
index 96c15e5d81..58440667d5 100644
--- a/js-fixtures/fixtures-tests.ts
+++ b/js-fixtures/fixtures-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="fixtures.d.ts" />
+
 
 function test_path() {
     fixtures.path = "/fixtures";
diff --git a/js-fixtures/fixtures.d.ts b/js-fixtures/index.d.ts
similarity index 100%
rename from js-fixtures/fixtures.d.ts
rename to js-fixtures/index.d.ts
diff --git a/js-fixtures/tsconfig.json b/js-fixtures/tsconfig.json
new file mode 100644
index 0000000000..af9b9d5d61
--- /dev/null
+++ b/js-fixtures/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "fixtures-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/js-git/js-git.d.ts b/js-git/index.d.ts
similarity index 100%
rename from js-git/js-git.d.ts
rename to js-git/index.d.ts
diff --git a/js-git/js-git-tests.ts b/js-git/js-git-tests.ts
index 2df372df3b..3c817e4a4a 100644
--- a/js-git/js-git-tests.ts
+++ b/js-git/js-git-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="js-git.d.ts" />
+
 
 var obj:Object;
 var bool:boolean;
diff --git a/js-git/tsconfig.json b/js-git/tsconfig.json
new file mode 100644
index 0000000000..e94076e6d1
--- /dev/null
+++ b/js-git/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "js-git-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/js-md5/index.d.ts b/js-md5/index.d.ts
new file mode 100644
index 0000000000..32ef8b30ff
--- /dev/null
+++ b/js-md5/index.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for js-md5 v0.3.0
+// Project: https://github.com/emn178/js-md5
+// Definitions by: Roland Greim <https://github.com/tigerxy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/
+
+/// <reference types="jquery"/>
+
+interface JQuery {
+    md5(value: string): string;
+    md5(value: Array<any>): string;
+    md5(value: Uint8Array): string;
+}
+
+interface JQueryStatic {
+    md5(value: string): string;
+    md5(value: Array<any>): string;
+    md5(value: Uint8Array): string;
+}
+
+interface md5 {
+    (value: string): string;
+    (value: Array<any>): string;
+    (value: Uint8Array): string;
+}
+
+interface String {
+    md5(value: string): string;
+    md5(value: Array<any>): string;
+    md5(value: Uint8Array): string;
+}
+
+declare module "js-md5" {
+    export = md5;
+}
+
+declare var md5: md5;
diff --git a/js-md5/md5-tests.ts b/js-md5/md5-tests.ts
index a536773aa9..984a919ec3 100644
--- a/js-md5/md5-tests.ts
+++ b/js-md5/md5-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="md5.d.ts" />
+
 
 md5('Message to hash');
 md5('');
diff --git a/js-md5/md5.d.ts b/js-md5/md5.d.ts
deleted file mode 100644
index 13f0db9354..0000000000
--- a/js-md5/md5.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// Type definitions for js-md5 v0.3.0
-// Project: https://github.com/emn178/js-md5
-// Definitions by: Roland Greim <https://github.com/tigerxy>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface JQuery {
-    md5(value: string): string;
-    md5(value: Array<any>): string;
-    md5(value: Uint8Array): string;
-}
-
-interface JQueryStatic {
-    md5(value: string): string;
-    md5(value: Array<any>): string;
-    md5(value: Uint8Array): string;
-}
-
-interface md5 {
-    (value: string): string;
-    (value: Array<any>): string;
-    (value: Uint8Array): string;
-}
-
-interface String {
-    md5(value: string): string;
-    md5(value: Array<any>): string;
-    md5(value: Uint8Array): string;
-}
-
-declare var md5: md5;
diff --git a/js-md5/tsconfig.json b/js-md5/tsconfig.json
new file mode 100644
index 0000000000..3138056769
--- /dev/null
+++ b/js-md5/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "md5-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/js-schema/js-schema.d.ts b/js-schema/index.d.ts
similarity index 100%
rename from js-schema/js-schema.d.ts
rename to js-schema/index.d.ts
diff --git a/js-schema/js-schema-tests.ts b/js-schema/js-schema-tests.ts
index 4a9a33e58f..bb5098a434 100644
--- a/js-schema/js-schema-tests.ts
+++ b/js-schema/js-schema-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="js-schema.d.ts" />
-
 import {default as schema} from 'js-schema';
 
 var Duck = schema({              // A duck
diff --git a/js-schema/tsconfig.json b/js-schema/tsconfig.json
new file mode 100644
index 0000000000..57400bd57e
--- /dev/null
+++ b/js-schema/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "js-schema-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/js-signals/js-signals.d.ts b/js-signals/js-signals.d.ts
deleted file mode 100644
index 1825999fe7..0000000000
--- a/js-signals/js-signals.d.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-// Type definitions for JS-Signals
-// Project: http://millermedeiros.github.io/js-signals/
-// Definitions by: Diullei Gomes <https://github.com/diullei>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare var signals: SignalWrapper;
-
-declare module "signals" {
-	export = signals;
-}
-
-interface SignalWrapper {
-    Signal: Signal
-}
-
-interface SignalBinding {
-    active: boolean;
-    context: any;
-    params: any;
-    detach(): Function;
-    execute(paramsArr?:any[]): any;
-    getListener(): Function;
-    getSignal(): Signal;
-    isBound(): boolean;
-    isOnce(): boolean;
-}
-
-interface Signal {
-    /**
-     * Custom event broadcaster
-     * <br />- inspired by Robert Penner's AS3 Signals.
-     * @name Signal
-     * @author Miller Medeiros
-     * @constructor
-     */
-    new(): Signal;
-
-    /**
-     * If Signal is active and should broadcast events.
-     */
-    active: boolean;
-
-    /**
-     * If Signal should keep record of previously dispatched parameters and automatically
-     * execute listener during add()/addOnce() if Signal was already dispatched before.
-     */
-    memorize: boolean;
-
-    /**
-     * Signals Version Number
-     */
-    VERSION: string;
-
-    /**
-     * Add a listener to the signal.
-     *
-     * @param listener Signal handler function.
-     * @param listenercontext Context on which listener will be executed (object that should represent the `this` variable inside listener function).
-     * @param priority The priority level of the event listener. Listeners with higher priority will be executed before listeners with lower priority. Listeners with same priority level will be executed at the same order as they were added. (default = 0)
-     */
-    add(listener: Function, listenerContext?: any, priority?: Number): SignalBinding;
-
-     /**
-     * Add listener to the signal that should be removed after first execution (will be executed only once).
-     *
-     * @param listener Signal handler function.
-     * @param listenercontext Context on which listener will be executed (object that should represent the `this` variable inside listener function).
-     * @param priority The priority level of the event listener. Listeners with higher priority will be executed before listeners with lower priority. Listeners with same priority level will be executed at the same order as they were added. (default = 0)
-     */
-    addOnce(listener: Function, listenerContext?: any, priority?: Number): SignalBinding;
-
-    /**
-     * Dispatch/Broadcast Signal to all listeners added to the queue.
-     *
-     * @param params Parameters that should be passed to each handler.
-     */
-    dispatch(...params: any[]): void;
-
-    /**
-     * Remove all bindings from signal and destroy any reference to external objects (destroy Signal object).
-     */
-    dispose(): void;
-
-    /**
-     * Forget memorized arguments.
-     */
-    forget(): void;
-
-    /**
-     * Returns a number of listeners attached to the Signal.
-     */
-    getNumListeners(): number;
-
-    /**
-     * Stop propagation of the event, blocking the dispatch to next listeners on the queue.
-     */
-    halt(): void;
-
-    /**
-     * Check if listener was attached to Signal.
-     */
-    has(listener: Function, context?: any): boolean;
-
-    /**
-     * Remove a single listener from the dispatch queue.
-     */
-    remove(listener: Function, context?: any): Function;
-
-    removeAll(): void;
-}
diff --git a/js-url/js-url.d.ts b/js-url/index.d.ts
similarity index 100%
rename from js-url/js-url.d.ts
rename to js-url/index.d.ts
diff --git a/js-url/js-url-tests.ts b/js-url/js-url-tests.ts
index e5d3eaece1..6ba04bd057 100644
--- a/js-url/js-url-tests.ts
+++ b/js-url/js-url-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="js-url.d.ts" />
+
 
 url();
 
diff --git a/js-url/tsconfig.json b/js-url/tsconfig.json
new file mode 100644
index 0000000000..bf27a83d8f
--- /dev/null
+++ b/js-url/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "js-url-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/js-yaml/index.d.ts b/js-yaml/index.d.ts
new file mode 100644
index 0000000000..1ac7b6ec26
--- /dev/null
+++ b/js-yaml/index.d.ts
@@ -0,0 +1,84 @@
+// Type definitions for js-yaml 3.5.2
+// Project: https://github.com/nodeca/js-yaml
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Sebastian Clausen <https://github.com/sclausen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace jsyaml {
+	export function safeLoad(str: string, opts?: LoadOptions): any;
+	export function load(str: string, opts?: LoadOptions): any;
+
+	export class Type implements TypeConstructorOptions {
+			constructor(tag: string, opts?: TypeConstructorOptions);
+			tag: string;
+	}
+	export class Schema {
+		constructor(definition: SchemaDefinition);
+		public static create(args: any[]): Schema;
+	}
+
+	export function safeLoadAll(str: string, iterator: (doc: any) => void, opts?: LoadOptions): any;
+	export function loadAll(str: string, iterator: (doc: any) => void, opts?: LoadOptions): any;
+
+	export function safeDump(obj: any, opts?: DumpOptions): string;
+	export function dump(obj: any, opts?: DumpOptions): string;
+
+	export interface LoadOptions {
+		// string to be used as a file path in error/warning messages.
+		filename?: string;
+		// makes the loader to throw errors instead of warnings.
+		strict?: boolean;
+		// specifies a schema to use.
+		schema?: any;
+	}
+
+	export interface DumpOptions {
+		// indentation width to use (in spaces).
+		indent?: number;
+		// do not throw on invalid types (like function in the safe schema) and skip pairs and single values with such types.
+		skipInvalid?: boolean;
+		// specifies level of nesting, when to switch from block to flow style for collections. -1 means block style everwhere
+		flowLevel?: number;
+		// Each tag may have own set of styles.	- "tag" => "style" map.
+		styles?: Object;
+		// specifies a schema to use.
+		schema?: any;
+	}
+
+	export interface TypeConstructorOptions {
+		kind?: string;
+		resolve?: Function;
+		construct?: Function;
+		instanceOf?: Object;
+		predicate?: string;
+		represent?: Function;
+		defaultStyle?: string;
+		styleAliases?: Object;
+	}
+
+	export interface SchemaDefinition {
+		implicit?: any[];
+		explicit?: any[];
+		include?: any[];
+	}
+
+	// only strings, arrays and plain objects: http://www.yaml.org/spec/1.2/spec.html#id2802346
+	export var FAILSAFE_SCHEMA: any;
+	// only strings, arrays and plain objects: http://www.yaml.org/spec/1.2/spec.html#id2802346
+	export var JSON_SCHEMA: any;
+	// same as JSON_SCHEMA: http://www.yaml.org/spec/1.2/spec.html#id2804923
+	export var CORE_SCHEMA: any;
+	// all supported YAML types, without unsafe ones (!!js/undefined, !!js/regexp and !!js/function): http://yaml.org/type/
+	export var DEFAULT_SAFE_SCHEMA: any;
+	// all supported YAML types.
+	export var DEFAULT_FULL_SCHEMA: any;
+	export var MINIMAL_SCHEMA: any;
+	export var SAFE_SCHEMA: any;
+
+	export class YAMLException extends Error {
+		constructor(reason?: any, mark?: any);
+		toString(compact?: boolean): string;
+	}
+}
+
+export = jsyaml;
+export as namespace jsyaml;
diff --git a/js-yaml/js-yaml-tests.ts b/js-yaml/js-yaml-tests.ts
index cd5f63c491..494b815572 100644
--- a/js-yaml/js-yaml-tests.ts
+++ b/js-yaml/js-yaml-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="js-yaml.d.ts" />
+
 
 import yaml = require('js-yaml');
 import LoadOptions = yaml.LoadOptions;
diff --git a/js-yaml/js-yaml.d.ts b/js-yaml/js-yaml.d.ts
deleted file mode 100644
index dca80dc228..0000000000
--- a/js-yaml/js-yaml.d.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-// Type definitions for js-yaml 3.5.2
-// Project: https://github.com/nodeca/js-yaml
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Sebastian Clausen <https://github.com/sclausen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace jsyaml {
-	export function safeLoad(str: string, opts?: LoadOptions): any;
-	export function load(str: string, opts?: LoadOptions): any;
-
-	export class Type implements TypeConstructorOptions {
-			constructor(tag: string, opts?: TypeConstructorOptions);
-			tag: string;
-	}
-	export class Schema {
-		constructor(definition: SchemaDefinition);
-		public static create(args: any[]): Schema;
-	}
-
-	export function safeLoadAll(str: string, iterator: (doc: any) => void, opts?: LoadOptions): any;
-	export function loadAll(str: string, iterator: (doc: any) => void, opts?: LoadOptions): any;
-
-	export function safeDump(obj: any, opts?: DumpOptions): string;
-	export function dump(obj: any, opts?: DumpOptions): string;
-
-	export interface LoadOptions {
-		// string to be used as a file path in error/warning messages.
-		filename?: string;
-		// makes the loader to throw errors instead of warnings.
-		strict?: boolean;
-		// specifies a schema to use.
-		schema?: any;
-	}
-
-	export interface DumpOptions {
-		// indentation width to use (in spaces).
-		indent?: number;
-		// do not throw on invalid types (like function in the safe schema) and skip pairs and single values with such types.
-		skipInvalid?: boolean;
-		// specifies level of nesting, when to switch from block to flow style for collections. -1 means block style everwhere
-		flowLevel?: number;
-		// Each tag may have own set of styles.	- "tag" => "style" map.
-		styles?: Object;
-		// specifies a schema to use.
-		schema?: any;
-	}
-
-	export interface TypeConstructorOptions {
-		kind?: string;
-		resolve?: Function;
-		construct?: Function;
-		instanceOf?: Object;
-		predicate?: string;
-		represent?: Function;
-		defaultStyle?: string;
-		styleAliases?: Object;
-	}
-
-	export interface SchemaDefinition {
-		implicit?: any[];
-		explicit?: any[];
-		include?: any[];
-	}
-
-	// only strings, arrays and plain objects: http://www.yaml.org/spec/1.2/spec.html#id2802346
-	export var FAILSAFE_SCHEMA: any;
-	// only strings, arrays and plain objects: http://www.yaml.org/spec/1.2/spec.html#id2802346
-	export var JSON_SCHEMA: any;
-	// same as JSON_SCHEMA: http://www.yaml.org/spec/1.2/spec.html#id2804923
-	export var CORE_SCHEMA: any;
-	// all supported YAML types, without unsafe ones (!!js/undefined, !!js/regexp and !!js/function): http://yaml.org/type/
-	export var DEFAULT_SAFE_SCHEMA: any;
-	// all supported YAML types.
-	export var DEFAULT_FULL_SCHEMA: any;
-	export var MINIMAL_SCHEMA: any;
-	export var SAFE_SCHEMA: any;
-
-	export class YAMLException extends Error {
-		constructor(reason?: any, mark?: any);
-		toString(compact?: boolean): string;
-	}
-}
-
-declare module 'js-yaml' {
-	export = jsyaml;
-}
diff --git a/js-yaml/tsconfig.json b/js-yaml/tsconfig.json
new file mode 100644
index 0000000000..b71700709c
--- /dev/null
+++ b/js-yaml/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "js-yaml-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jsbn/jsbn.d.ts b/jsbn/index.d.ts
similarity index 100%
rename from jsbn/jsbn.d.ts
rename to jsbn/index.d.ts
diff --git a/jsbn/jsbn-tests.ts b/jsbn/jsbn-tests.ts
index 667f785538..76088a32b6 100644
--- a/jsbn/jsbn-tests.ts
+++ b/jsbn/jsbn-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jsbn.d.ts" />
+
 var BigInteger = jsbn.BigInteger;
 
 // constructor tests
diff --git a/jsbn/tsconfig.json b/jsbn/tsconfig.json
new file mode 100644
index 0000000000..723347d649
--- /dev/null
+++ b/jsbn/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsbn-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jscrollpane/index.d.ts b/jscrollpane/index.d.ts
new file mode 100644
index 0000000000..a2bde3955b
--- /dev/null
+++ b/jscrollpane/index.d.ts
@@ -0,0 +1,316 @@
+// Type definitions for jScrollPane v2.0.14
+// Project: http://jscrollpane.kelvinluck.com/
+// Definitions by: Dániel Tar <https://github.com/qcz/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface JScrollPaneSettings {
+	/**
+	 * Whether arrows should be shown on the generated scroll pane. When set to false only the scrollbar
+	 * track and drag will be shown, if set to true then arrows buttons will also be shown.
+	 */
+	showArrows?: boolean;
+	/**
+	 * Whether the scrollpane should attempt to maintain it's position whenever it is reinitialised.
+	 * If true then the viewport of the scrollpane will remain the same when it is reinitialised, if false
+		then the viewport will jump back up to the top when the scrollpane is reinitialised. See also stickToBottom and stickToRight. 
+	 */
+	maintainPosition?: boolean;
+	/**
+	 * If maintainPosition is true and the scrollpane is scrolled to the bottom then the scrollpane then the scrollpane will
+	 * remain scrolled to the bottom even if new content is added to the pane which makes it taller. 
+	*/
+	stickToBottom?: boolean;
+	/**
+	 * If maintainPosition is true and the scrollpane is scrolled to its right edge then the scrollpane then the scrollpane
+	 * will remain scrolled to the right edge even if new content is added to the pane which makes it wider. 
+	*/
+	stickToRight?: boolean;
+	/**
+	 * Whether jScrollPane should automatically reinitialise itself periodically after you have initially initialised it.
+	 * This can help with instances when the size of the content of the scrollpane (or the surrounding element) changes.
+	 * However, it does involve an overhead of running a javascript function on a timer so it is recommended only to activate
+	 * where necessary.
+	*/
+	autoReinitialise?: boolean;
+	/**
+	 * The number of milliseconds between each reinitialisation (if autoReinitialise is true). 
+	*/
+	autoReinitialiseDelay?: number;
+	/**
+	 * The smallest height that the vertical drag can have. The size of the drag elements is based on the proportion of the
+	 * size of the content to the size of the viewport but is contrained within the minimum and maximum dimensions given.
+	*/
+	verticalDragMinHeight?: number;
+	/**
+	 * The largest height that the vertical drag can have. The size of the drag elements is based on the proportion of the
+	 * size of the content to the size of the viewport but is contrained within the minimum and maximum dimensions given.
+	*/
+	verticalDragMaxHeight?: number;
+	/**
+	 * The smallest width that the horizontal drag can have. The size of the drag elements is based on the proportion of the
+	 * size of the content to the size of the viewport but is contrained within the minimum and maximum dimensions given.
+	*/
+	horizontalDragMinWidth?: number;
+	/**
+	 * The largest width that the horizontal drag can have. The size of the drag elements is based on the proportion of the
+	 * size of the content to the size of the viewport but is contrained within the minimum and maximum dimensions given.
+	*/
+	horizontalDragMaxWidth?: number;
+	/**
+	 * The width of the content of the scroll pane. The default value of undefined will allow jScrollPane to calculate the
+	 * width of it's content. However, in some cases you will want to disable this (e.g. to prevent horizontal scrolling or
+	 * where the calculation of the size of the content doesn't return reliable results)
+	*/
+	contentWidth?: number;
+	/**
+	 * Whether to use animation when calling scrollTo or scrollBy. You can control the animation speed and easing by using
+	 * the animateDuration and animateEase settings or if you want to exercise more complete control then you can override
+	 * the animate API method. Demo. 
+	*/
+	animateScroll?: boolean;
+	/**
+	 * The number of milliseconds taken to animate to a new position
+	*/
+	animateDuration?: number;
+	/**
+	 * The type of easing to use when animating to a new position
+	*/
+	animateEase?: string;
+	/**
+	 * Whether internal links on the page should be hijacked so that if they point so content within a jScrollPane then
+	 * they automatically scroll the jScrollPane to the correct place.
+	*/
+	hijackInternalLinks?: boolean;
+	/**
+	 * The amount of space between the side of the content and the vertical scrollbar. 
+	*/
+	verticalGutter?: number;
+	/**
+	 * The amount of space between the bottom of the content and the horizontal scrollbar. 
+	*/
+	horizontalGutter?: number;
+	/**
+	 * A multiplier which is used to control the amount that the scrollpane scrolls each time the mouse wheel is turned. 
+	*/
+	mouseWheelSpeed?: number;
+	/**
+	 * A multiplier which is used to control the amount that the scrollpane scrolls each time on of the arrow buttons is pressed.
+	*/
+	arrowButtonSpeed?: number;
+	/**
+	 * The number of milliseconds between each repeated scroll event when the mouse is held down over one of the arrow keys.
+	*/
+	arrowRepeatFreq?: number;
+	/**
+	 * Whether the arrow buttons should cause the jScrollPane to scroll while you are hovering over them. 
+	*/
+	arrowScrollOnHover?: boolean;
+	/**
+	 * Where the vertical arrows should appear relative to the vertical track.
+	*/
+	verticalArrowPositions?: string;
+	/**
+	 * Where the horizontal arrows should appear relative to the horizontal track.
+	*/
+	horizontalArrowPositions?: string;
+	/**
+	 * Whether keyboard navigation should be enabled (e.g. whether the user can focus the scrollpane and then use
+	 * the arrow (and other) keys to navigate around. 
+	*/
+	enableKeyboardNavigation?: boolean;
+	/**
+	 * Whether the focus outline should be hidden in all browsers. For best accessibility you should not change
+	 * this option. You can style the outline with the CSS property outline and outline-offset. 
+	*/
+	hideFocus?: boolean;
+	/**
+	 * Whether clicking on the track (e.g. the area behind the drag) should scroll towards the point clicked on.
+	 * Defaults to true as this is the native behaviour in these situations. 
+	*/
+	clickOnTrack?: boolean;
+	/**
+	 * A multiplier which is used to control the amount that the scrollpane scrolls each trackClickRepeatFreq
+	 * while the mouse button is held down over the track. 
+	*/
+	trackClickSpeed?: number;
+	/**
+	 * The number of milliseconds between each repeated scroll event when the mouse is held down over the track. 
+	*/
+	trackClickRepeatFreq?: number;
+}
+
+interface JScrollPaneApi {
+	/**
+	 * Reinitialises the scroll pane (if it's internal dimensions have changed since the last time it was initialised).
+	 * The settings object which is passed in will override any settings from the previous time it was initialised -
+	 * if you don't pass any settings then the ones from the previous initialisation will be used.
+	*/
+	reinitialise(options?: JScrollPaneSettings): void;
+	/**
+	 * Scrolls the specified element (a jQuery object) into view so that it can be seen within the viewport.
+	 * @param ele A jQuery object to scroll to
+	 * @param stickToTop If it is true then the element will appear at the top of the viewport, if it is false
+			then the viewport will scroll as little as possible to show the element.
+	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
+			value from the settings object is used instead.
+	*/
+	scrollToElement(ele: JQuery, stickToTop?: boolean, animate?: boolean): void;
+	/**
+	 * Scrolls the specified element (a jQuery selector string) into view so that it can be seen within the viewport.
+	 * @param ele A jQuery selector of the object to scroll to
+	 * @param stickToTop If it is true then the element will appear at the top of the viewport, if it is false
+			then the viewport will scroll as little as possible to show the element.
+	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
+			value from the settings object is used instead.
+	*/
+	scrollToElement(ele: string, stickToTop?: boolean, animate?: boolean): void;
+	/**
+	 * Scrolls the specified element (a DOM node) into view so that it can be seen within the viewport.
+	 * @param ele A DOM node to scroll to
+	 * @param stickToTop If it is true then the element will appear at the top of the viewport, if it is false
+			then the viewport will scroll as little as possible to show the element.
+	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
+			value from the settings object is used instead.
+	*/
+	scrollToElement(ele: HTMLElement, stickToTop?: boolean, animate?: boolean): void;
+	/**
+	 * Scrolls the pane so that the specified co-ordinates within the content are at the top left of the viewport.
+	 * @param destX Left position of the viewport to scroll to
+	 * @param destY Top position of the viewport to scroll to
+	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
+			value from the settings object is used instead.
+	*/
+	scrollTo(destX: number, destY: number, animate?: boolean): void;
+	/**
+	 * Scrolls the pane so that the specified co-ordinate within the content is at the left of the viewport.
+	 * @param destX Left position of the viewport to scroll to
+	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
+			value from the settings object is used instead.
+	*/
+	scrollToX(destX: number, animate?: boolean): void;
+	/**
+	 * Scrolls the pane so that the specified co-ordinate within the content is at the top of the viewport.
+	 * @param destY Top position of the viewport to scroll to
+	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
+			value from the settings object is used instead.
+	*/
+	scrollToY(destY: number, animate?: boolean): void;
+	/**
+	 * Scrolls the pane to the specified percentage of its maximum horizontal scroll position.
+	 * @param destPercentX Percentage from left of the full width of the viewport to scroll to
+	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
+			value from the settings object is used instead.
+	*/
+	scrollToPercentX(destPercentX: number, animate?: boolean): void;
+	/**
+	 * Scrolls the pane to the specified percentage of its maximum vertical scroll position.
+	 * @param destPercentY Percentage from top of the full width of the viewport to scroll to
+	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
+			value from the settings object is used instead.
+	*/
+	scrollToPercentY(destPercentY: number, animate?: boolean): void;
+	/**
+	 * Scrolls the pane by the specified amount of pixels.
+	 * @param deltaX Number of pixels to scroll horizontally
+	 * @param deltaY Number of pixels to scroll vertically
+	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
+			value from the settings object is used instead.
+	*/
+	scrollBy(deltaX: number, deltaY: number, animate?: boolean): void;
+	/**
+	 * Scrolls the pane by the specified amount of pixels.
+	 * @param deltaX Number of pixels to scroll horizontally
+	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
+			value from the settings object is used instead.
+	*/
+	scrollByX(deltaX: number, animate?: boolean): void;
+	/**
+	 * Scrolls the pane by the specified amount of pixels
+	 * @param deltaY Number of pixels to scroll vertically
+	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
+			value from the settings object is used instead.
+	*/
+	scrollByY(deltaY: number, animate?: boolean): void;
+	/**
+	 * Positions the horizontal drag at the specified x position (and updates the viewport to reflect this)
+	 * @param x New position of the horizontal drag
+	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
+			value from the settings object is used instead.
+	*/
+	positionDragX(x: number, animate?: boolean): void;
+	/**
+	 * Positions the vertical drag at the specified y position (and updates the viewport to reflect this)
+	 * @param x New position of the vertical drag
+	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
+			value from the settings object is used instead.
+	*/
+	positionDragY(y: number, animate?: boolean): void;
+	/**
+	 * This method is called when jScrollPane is trying to animate to a new position. You can override it if you want
+	 * to provide advanced animation functionality.
+	*/
+	animate(ele: JQuery, prop: string, value: any, stepCallback: (...args: any[]) => any): void;
+	/**
+	 * Returns the current x position of the viewport with regards to the content pane. 
+	*/
+	getContentPositionX(): number;
+	/**
+	 * Returns the current y position of the viewport with regards to the content pane. 
+	*/
+	getContentPositionY(): number;
+	/**
+	 * Returns the width of the content within the scroll pane. 
+	*/
+	getContentWidth(): number;
+	/**
+	 * Returns the height of the content within the scroll pane. 
+	*/
+	getContentHeight(): number;
+	/**
+	 * Returns whether or not this scrollpane has a horizontal scrollbar. 
+	*/
+	getIsScrollableH(): boolean;
+	/**
+	 * Returns the horizontal position of the viewport within the pane content. 
+	*/
+	getPercentScrolledX(): number;
+	/**
+	 * Returns the vertical position of the viewport within the pane content. 
+	*/
+	getPercentScrolledY(): number;
+	/**
+	 * Returns whether or not this scrollpane has a vertical scrollbar. 
+	*/
+	getIsScrollableV(): boolean;
+	/**
+	 * Gets a reference to the content pane. It is important that you use this method if you want to edit the content
+	 * of your jScrollPane as if you access the element directly then you may have some problems (as your original
+	 * element has had additional elements for the scrollbars etc added into it). 
+	*/
+	getContentPane(): JQuery;
+	/**
+	 * Scrolls this jScrollPane down as far as it can currently scroll.
+	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
+			value from the settings object is used instead.
+	*/
+	scrollToBottom(animate?: boolean): void;
+	/**
+	 * Hijacks the links on the page which link to content inside the scrollpane. If you have changed the content of
+	 * your page (e.g. via AJAX) and want to make sure any new anchor links to the contents of your scroll pane will
+	 * work then call this function. 
+	*/
+	hijackInternalLinks(): void;
+	/**
+	 * Destroys the jScrollPane on the instance matching this API object and restores the browser's default behaviour.
+	*/
+	destroy(): void;
+}
+
+interface JQuery {
+	/**
+	 * Initialises the jScrollPane on the JQuery object.
+	*/
+	jScrollPane(options?: JScrollPaneSettings): JQuery;
+}
diff --git a/jscrollpane/jscrollpane.d.ts b/jscrollpane/jscrollpane.d.ts
deleted file mode 100644
index 0180185bb6..0000000000
--- a/jscrollpane/jscrollpane.d.ts
+++ /dev/null
@@ -1,316 +0,0 @@
-// Type definitions for jScrollPane v2.0.14
-// Project: http://jscrollpane.kelvinluck.com/
-// Definitions by: Dániel Tar <https://github.com/qcz/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface JScrollPaneSettings {
-	/**
-	 * Whether arrows should be shown on the generated scroll pane. When set to false only the scrollbar
-	 * track and drag will be shown, if set to true then arrows buttons will also be shown.
-	 */
-	showArrows?: boolean;
-	/**
-	 * Whether the scrollpane should attempt to maintain it's position whenever it is reinitialised.
-	 * If true then the viewport of the scrollpane will remain the same when it is reinitialised, if false
-		then the viewport will jump back up to the top when the scrollpane is reinitialised. See also stickToBottom and stickToRight. 
-	 */
-	maintainPosition?: boolean;
-	/**
-	 * If maintainPosition is true and the scrollpane is scrolled to the bottom then the scrollpane then the scrollpane will
-	 * remain scrolled to the bottom even if new content is added to the pane which makes it taller. 
-	*/
-	stickToBottom?: boolean;
-	/**
-	 * If maintainPosition is true and the scrollpane is scrolled to its right edge then the scrollpane then the scrollpane
-	 * will remain scrolled to the right edge even if new content is added to the pane which makes it wider. 
-	*/
-	stickToRight?: boolean;
-	/**
-	 * Whether jScrollPane should automatically reinitialise itself periodically after you have initially initialised it.
-	 * This can help with instances when the size of the content of the scrollpane (or the surrounding element) changes.
-	 * However, it does involve an overhead of running a javascript function on a timer so it is recommended only to activate
-	 * where necessary.
-	*/
-	autoReinitialise?: boolean;
-	/**
-	 * The number of milliseconds between each reinitialisation (if autoReinitialise is true). 
-	*/
-	autoReinitialiseDelay?: number;
-	/**
-	 * The smallest height that the vertical drag can have. The size of the drag elements is based on the proportion of the
-	 * size of the content to the size of the viewport but is contrained within the minimum and maximum dimensions given.
-	*/
-	verticalDragMinHeight?: number;
-	/**
-	 * The largest height that the vertical drag can have. The size of the drag elements is based on the proportion of the
-	 * size of the content to the size of the viewport but is contrained within the minimum and maximum dimensions given.
-	*/
-	verticalDragMaxHeight?: number;
-	/**
-	 * The smallest width that the horizontal drag can have. The size of the drag elements is based on the proportion of the
-	 * size of the content to the size of the viewport but is contrained within the minimum and maximum dimensions given.
-	*/
-	horizontalDragMinWidth?: number;
-	/**
-	 * The largest width that the horizontal drag can have. The size of the drag elements is based on the proportion of the
-	 * size of the content to the size of the viewport but is contrained within the minimum and maximum dimensions given.
-	*/
-	horizontalDragMaxWidth?: number;
-	/**
-	 * The width of the content of the scroll pane. The default value of undefined will allow jScrollPane to calculate the
-	 * width of it's content. However, in some cases you will want to disable this (e.g. to prevent horizontal scrolling or
-	 * where the calculation of the size of the content doesn't return reliable results)
-	*/
-	contentWidth?: number;
-	/**
-	 * Whether to use animation when calling scrollTo or scrollBy. You can control the animation speed and easing by using
-	 * the animateDuration and animateEase settings or if you want to exercise more complete control then you can override
-	 * the animate API method. Demo. 
-	*/
-	animateScroll?: boolean;
-	/**
-	 * The number of milliseconds taken to animate to a new position
-	*/
-	animateDuration?: number;
-	/**
-	 * The type of easing to use when animating to a new position
-	*/
-	animateEase?: string;
-	/**
-	 * Whether internal links on the page should be hijacked so that if they point so content within a jScrollPane then
-	 * they automatically scroll the jScrollPane to the correct place.
-	*/
-	hijackInternalLinks?: boolean;
-	/**
-	 * The amount of space between the side of the content and the vertical scrollbar. 
-	*/
-	verticalGutter?: number;
-	/**
-	 * The amount of space between the bottom of the content and the horizontal scrollbar. 
-	*/
-	horizontalGutter?: number;
-	/**
-	 * A multiplier which is used to control the amount that the scrollpane scrolls each time the mouse wheel is turned. 
-	*/
-	mouseWheelSpeed?: number;
-	/**
-	 * A multiplier which is used to control the amount that the scrollpane scrolls each time on of the arrow buttons is pressed.
-	*/
-	arrowButtonSpeed?: number;
-	/**
-	 * The number of milliseconds between each repeated scroll event when the mouse is held down over one of the arrow keys.
-	*/
-	arrowRepeatFreq?: number;
-	/**
-	 * Whether the arrow buttons should cause the jScrollPane to scroll while you are hovering over them. 
-	*/
-	arrowScrollOnHover?: boolean;
-	/**
-	 * Where the vertical arrows should appear relative to the vertical track.
-	*/
-	verticalArrowPositions?: string;
-	/**
-	 * Where the horizontal arrows should appear relative to the horizontal track.
-	*/
-	horizontalArrowPositions?: string;
-	/**
-	 * Whether keyboard navigation should be enabled (e.g. whether the user can focus the scrollpane and then use
-	 * the arrow (and other) keys to navigate around. 
-	*/
-	enableKeyboardNavigation?: boolean;
-	/**
-	 * Whether the focus outline should be hidden in all browsers. For best accessibility you should not change
-	 * this option. You can style the outline with the CSS property outline and outline-offset. 
-	*/
-	hideFocus?: boolean;
-	/**
-	 * Whether clicking on the track (e.g. the area behind the drag) should scroll towards the point clicked on.
-	 * Defaults to true as this is the native behaviour in these situations. 
-	*/
-	clickOnTrack?: boolean;
-	/**
-	 * A multiplier which is used to control the amount that the scrollpane scrolls each trackClickRepeatFreq
-	 * while the mouse button is held down over the track. 
-	*/
-	trackClickSpeed?: number;
-	/**
-	 * The number of milliseconds between each repeated scroll event when the mouse is held down over the track. 
-	*/
-	trackClickRepeatFreq?: number;
-}
-
-interface JScrollPaneApi {
-	/**
-	 * Reinitialises the scroll pane (if it's internal dimensions have changed since the last time it was initialised).
-	 * The settings object which is passed in will override any settings from the previous time it was initialised -
-	 * if you don't pass any settings then the ones from the previous initialisation will be used.
-	*/
-	reinitialise(options?: JScrollPaneSettings): void;
-	/**
-	 * Scrolls the specified element (a jQuery object) into view so that it can be seen within the viewport.
-	 * @param ele A jQuery object to scroll to
-	 * @param stickToTop If it is true then the element will appear at the top of the viewport, if it is false
-			then the viewport will scroll as little as possible to show the element.
-	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
-			value from the settings object is used instead.
-	*/
-	scrollToElement(ele: JQuery, stickToTop?: boolean, animate?: boolean): void;
-	/**
-	 * Scrolls the specified element (a jQuery selector string) into view so that it can be seen within the viewport.
-	 * @param ele A jQuery selector of the object to scroll to
-	 * @param stickToTop If it is true then the element will appear at the top of the viewport, if it is false
-			then the viewport will scroll as little as possible to show the element.
-	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
-			value from the settings object is used instead.
-	*/
-	scrollToElement(ele: string, stickToTop?: boolean, animate?: boolean): void;
-	/**
-	 * Scrolls the specified element (a DOM node) into view so that it can be seen within the viewport.
-	 * @param ele A DOM node to scroll to
-	 * @param stickToTop If it is true then the element will appear at the top of the viewport, if it is false
-			then the viewport will scroll as little as possible to show the element.
-	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
-			value from the settings object is used instead.
-	*/
-	scrollToElement(ele: HTMLElement, stickToTop?: boolean, animate?: boolean): void;
-	/**
-	 * Scrolls the pane so that the specified co-ordinates within the content are at the top left of the viewport.
-	 * @param destX Left position of the viewport to scroll to
-	 * @param destY Top position of the viewport to scroll to
-	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
-			value from the settings object is used instead.
-	*/
-	scrollTo(destX: number, destY: number, animate?: boolean): void;
-	/**
-	 * Scrolls the pane so that the specified co-ordinate within the content is at the left of the viewport.
-	 * @param destX Left position of the viewport to scroll to
-	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
-			value from the settings object is used instead.
-	*/
-	scrollToX(destX: number, animate?: boolean): void;
-	/**
-	 * Scrolls the pane so that the specified co-ordinate within the content is at the top of the viewport.
-	 * @param destY Top position of the viewport to scroll to
-	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
-			value from the settings object is used instead.
-	*/
-	scrollToY(destY: number, animate?: boolean): void;
-	/**
-	 * Scrolls the pane to the specified percentage of its maximum horizontal scroll position.
-	 * @param destPercentX Percentage from left of the full width of the viewport to scroll to
-	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
-			value from the settings object is used instead.
-	*/
-	scrollToPercentX(destPercentX: number, animate?: boolean): void;
-	/**
-	 * Scrolls the pane to the specified percentage of its maximum vertical scroll position.
-	 * @param destPercentY Percentage from top of the full width of the viewport to scroll to
-	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
-			value from the settings object is used instead.
-	*/
-	scrollToPercentY(destPercentY: number, animate?: boolean): void;
-	/**
-	 * Scrolls the pane by the specified amount of pixels.
-	 * @param deltaX Number of pixels to scroll horizontally
-	 * @param deltaY Number of pixels to scroll vertically
-	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
-			value from the settings object is used instead.
-	*/
-	scrollBy(deltaX: number, deltaY: number, animate?: boolean): void;
-	/**
-	 * Scrolls the pane by the specified amount of pixels.
-	 * @param deltaX Number of pixels to scroll horizontally
-	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
-			value from the settings object is used instead.
-	*/
-	scrollByX(deltaX: number, animate?: boolean): void;
-	/**
-	 * Scrolls the pane by the specified amount of pixels
-	 * @param deltaY Number of pixels to scroll vertically
-	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
-			value from the settings object is used instead.
-	*/
-	scrollByY(deltaY: number, animate?: boolean): void;
-	/**
-	 * Positions the horizontal drag at the specified x position (and updates the viewport to reflect this)
-	 * @param x New position of the horizontal drag
-	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
-			value from the settings object is used instead.
-	*/
-	positionDragX(x: number, animate?: boolean): void;
-	/**
-	 * Positions the vertical drag at the specified y position (and updates the viewport to reflect this)
-	 * @param x New position of the vertical drag
-	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
-			value from the settings object is used instead.
-	*/
-	positionDragY(y: number, animate?: boolean): void;
-	/**
-	 * This method is called when jScrollPane is trying to animate to a new position. You can override it if you want
-	 * to provide advanced animation functionality.
-	*/
-	animate(ele: JQuery, prop: string, value: any, stepCallback: (...args: any[]) => any): void;
-	/**
-	 * Returns the current x position of the viewport with regards to the content pane. 
-	*/
-	getContentPositionX(): number;
-	/**
-	 * Returns the current y position of the viewport with regards to the content pane. 
-	*/
-	getContentPositionY(): number;
-	/**
-	 * Returns the width of the content within the scroll pane. 
-	*/
-	getContentWidth(): number;
-	/**
-	 * Returns the height of the content within the scroll pane. 
-	*/
-	getContentHeight(): number;
-	/**
-	 * Returns whether or not this scrollpane has a horizontal scrollbar. 
-	*/
-	getIsScrollableH(): boolean;
-	/**
-	 * Returns the horizontal position of the viewport within the pane content. 
-	*/
-	getPercentScrolledX(): number;
-	/**
-	 * Returns the vertical position of the viewport within the pane content. 
-	*/
-	getPercentScrolledY(): number;
-	/**
-	 * Returns whether or not this scrollpane has a vertical scrollbar. 
-	*/
-	getIsScrollableV(): boolean;
-	/**
-	 * Gets a reference to the content pane. It is important that you use this method if you want to edit the content
-	 * of your jScrollPane as if you access the element directly then you may have some problems (as your original
-	 * element has had additional elements for the scrollbars etc added into it). 
-	*/
-	getContentPane(): JQuery;
-	/**
-	 * Scrolls this jScrollPane down as far as it can currently scroll.
-	 * @param animate Should an animation occur. If you don't provide this argument then the animateScroll
-			value from the settings object is used instead.
-	*/
-	scrollToBottom(animate?: boolean): void;
-	/**
-	 * Hijacks the links on the page which link to content inside the scrollpane. If you have changed the content of
-	 * your page (e.g. via AJAX) and want to make sure any new anchor links to the contents of your scroll pane will
-	 * work then call this function. 
-	*/
-	hijackInternalLinks(): void;
-	/**
-	 * Destroys the jScrollPane on the instance matching this API object and restores the browser's default behaviour.
-	*/
-	destroy(): void;
-}
-
-interface JQuery {
-	/**
-	 * Initialises the jScrollPane on the JQuery object.
-	*/
-	jScrollPane(options?: JScrollPaneSettings): JQuery;
-}
diff --git a/jscrollpane/tsconfig.json b/jscrollpane/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/jscrollpane/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jsdeferred/index.d.ts b/jsdeferred/index.d.ts
new file mode 100644
index 0000000000..ecfeff3a57
--- /dev/null
+++ b/jsdeferred/index.d.ts
@@ -0,0 +1,83 @@
+// Type definitions for JSDeferred
+// Project: https://github.com/cho45/jsdeferred
+// Definitions by: Daisuke Mino <https://github.com/minodisk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface Loop {
+    begin?: number;
+    end?: number;
+    step?: number;
+}
+
+interface ConnectOption {
+    target: any;
+    args?: any[];
+    ok?: number;
+    ng?: number;
+}
+
+interface RetryOption {
+    wait: number;
+}
+
+interface DeferredizedFunction { (...arg: any[]): Deferred; }
+interface DeferredizedFunctionWithNumber { (n: number): Deferred; }
+interface FunctionWithNumber { (i: number, o?: any): any;  }
+interface ErrorCallback { (d: Deferred, ...args: any[]): any; }
+
+declare class Deferred {
+
+    static methods: string[];
+    static isDeferred(obj: any): boolean;
+    static next(fun: Function): Deferred;
+    static chain(...args: any[]): Deferred;
+    static wait(n: number): Deferred;
+    static call(fun?: Function, ...args: any[]): Deferred;
+    static parallel(dl: any): Deferred;
+    static earlier(dl: any): Deferred;
+
+    static loop(n: number, fun: FunctionWithNumber): Deferred;
+    static loop(n: Loop, fun: FunctionWithNumber): Deferred;
+
+    static repeat(n: number, fun: FunctionWithNumber): Deferred;
+    static register(name: string, fun: DeferredizedFunction): void;
+
+    static connect(funo: any, options: string): DeferredizedFunction;
+    static connect(funo: Function, options?: ConnectOption): DeferredizedFunction;
+
+    static retry(retryCount: number, funcDeferred: DeferredizedFunctionWithNumber, options?: RetryOption): Deferred;
+    static define(obj?: any, list?: string[]): any;
+
+    constructor();
+
+    next(fun: Function): Deferred;
+    wait(n: number): Deferred;
+    error(fun: ErrorCallback): Deferred;
+    call(val?: any): Deferred;
+    fail(err: any): Deferred;
+    cancel(): Deferred;
+    parallel(dl: any): Deferred;
+
+    loop(n: number, fun: FunctionWithNumber): Deferred;
+    loop(n: Loop, fun: FunctionWithNumber): Deferred;
+}
+
+interface JQueryXHR {
+    next(fun: Function): Deferred;
+}
+
+declare function chain(...args: any[]): Deferred;
+declare function wait(n: number): Deferred;
+declare function call(fun?: Function, ...args: any[]): Deferred;
+declare function parallel(dl: any): Deferred;
+declare function earlier(dl: any): Deferred;
+
+declare function loop(n: number, fun: FunctionWithNumber): Deferred;
+declare function loop(n: Loop, fun: FunctionWithNumber): Deferred;
+
+declare function repeat(n: number, fun: FunctionWithNumber): Deferred;
+
+declare function next(fun: Function): Deferred;
+
diff --git a/jsdeferred/jsdeferred-tests.ts b/jsdeferred/jsdeferred-tests.ts
index 57ddfcc522..3b0d39ec2e 100644
--- a/jsdeferred/jsdeferred-tests.ts
+++ b/jsdeferred/jsdeferred-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="jsdeferred.d.ts"/>
-
 declare function alert(a: any): void;
 
 interface IHttp {
diff --git a/jsdeferred/jsdeferred-tests.ts.tscparams b/jsdeferred/jsdeferred-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jsdeferred/jsdeferred-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jsdeferred/jsdeferred.d.ts b/jsdeferred/jsdeferred.d.ts
deleted file mode 100644
index d91a92aea5..0000000000
--- a/jsdeferred/jsdeferred.d.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-// Type definitions for JSDeferred
-// Project: https://github.com/cho45/jsdeferred
-// Definitions by: Daisuke Mino <https://github.com/minodisk>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface Loop {
-    begin?: number;
-    end?: number;
-    step?: number;
-}
-
-interface ConnectOption {
-    target: any;
-    args?: any[];
-    ok?: number;
-    ng?: number;
-}
-
-interface RetryOption {
-    wait: number;
-}
-
-interface DeferredizedFunction { (...arg: any[]): Deferred; }
-interface DeferredizedFunctionWithNumber { (n: number): Deferred; }
-interface FunctionWithNumber { (i: number, o?: any): any;  }
-interface ErrorCallback { (d: Deferred, ...args: any[]): any; }
-
-declare class Deferred {
-
-    static methods: string[];
-    static isDeferred(obj: any): boolean;
-    static next(fun: Function): Deferred;
-    static chain(...args: any[]): Deferred;
-    static wait(n: number): Deferred;
-    static call(fun?: Function, ...args: any[]): Deferred;
-    static parallel(dl: any): Deferred;
-    static earlier(dl: any): Deferred;
-
-    static loop(n: number, fun: FunctionWithNumber): Deferred;
-    static loop(n: Loop, fun: FunctionWithNumber): Deferred;
-
-    static repeat(n: number, fun: FunctionWithNumber): Deferred;
-    static register(name: string, fun: DeferredizedFunction): void;
-
-    static connect(funo: any, options: string): DeferredizedFunction;
-    static connect(funo: Function, options?: ConnectOption): DeferredizedFunction;
-
-    static retry(retryCount: number, funcDeferred: DeferredizedFunctionWithNumber, options?: RetryOption): Deferred;
-    static define(obj?: any, list?: string[]): any;
-
-    constructor();
-
-    next(fun: Function): Deferred;
-    wait(n: number): Deferred;
-    error(fun: ErrorCallback): Deferred;
-    call(val?: any): Deferred;
-    fail(err: any): Deferred;
-    cancel(): Deferred;
-    parallel(dl: any): Deferred;
-
-    loop(n: number, fun: FunctionWithNumber): Deferred;
-    loop(n: Loop, fun: FunctionWithNumber): Deferred;
-}
-
-interface JQueryXHR {
-    next(fun: Function): Deferred;
-}
-
-declare function chain(...args: any[]): Deferred;
-declare function wait(n: number): Deferred;
-declare function call(fun?: Function, ...args: any[]): Deferred;
-declare function parallel(dl: any): Deferred;
-declare function earlier(dl: any): Deferred;
-
-declare function loop(n: number, fun: FunctionWithNumber): Deferred;
-declare function loop(n: Loop, fun: FunctionWithNumber): Deferred;
-
-declare function repeat(n: number, fun: FunctionWithNumber): Deferred;
-
-declare function next(fun: Function): Deferred;
-
diff --git a/jsdeferred/tsconfig.json b/jsdeferred/tsconfig.json
new file mode 100644
index 0000000000..6aa5c6d697
--- /dev/null
+++ b/jsdeferred/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsdeferred-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jsdom/index.d.ts b/jsdom/index.d.ts
new file mode 100644
index 0000000000..f3865ad33f
--- /dev/null
+++ b/jsdom/index.d.ts
@@ -0,0 +1,197 @@
+// Type definitions for jsdom 2.0.0
+// Project: https://github.com/tmpvar/jsdom
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+/// <reference types="jquery" />
+
+
+
+import EventEmitter = NodeJS.EventEmitter;
+
+/**
+ * The do-what-I-mean API.
+ *
+ * Example:
+ * jsdom.env(html, function (errors, window) {
+ *  // free memory associated with the window
+ *  window.close();
+ * });
+ *
+ * @param urlOrSource may be a URL, file name, or HTML fragment
+ * @param scriptUrlsOrSources a string or array of strings, containing file names or URLs that will be inserted as
+ * @param config  Configuration object
+ * @param callback 
+ */
+export declare function env(urlOrHtml: string, scripts: string, config: Config, callback?: Callback): void;
+export declare function env(urlOrHtml: string, scripts: string, callback: Callback): void;
+export declare function env(urlOrHtml: string, scripts: string[], config: Config, callback?: Callback): void;
+export declare function env(urlOrHtml: string, scripts: string[], callback: Callback): void;
+export declare function env(urlOrHtml: string, callback: Callback): void;
+export declare function env(urlOrHtml: string, config: Config, callback?: Callback): void;
+export declare function env(config: Config, callback?: Callback): void;
+
+export declare function serializeDocument(doc: Document): string;
+
+export interface VirtualConsole extends EventEmitter {
+    sendTo(console: Console): VirtualConsole;
+}
+
+export interface VirtualConsoleOptions {
+}
+
+export interface WindowProperties {
+    parsingMode?: string; // html, xml, auto, undefined
+    contentType?: string;
+    parser?: any;
+    url?: string;
+    referrer?: string;
+    cookieJar?: CookieJar;
+    cookie?: string;
+    resourceLoader?: any;
+    deferClose?: boolean;
+    concurrentNodeIterators?: number;
+    virtualConsole?: VirtualConsole;
+    created?: (something: any, window: Window) => any;
+    features?: FeatureOptions;
+    top?: Window;
+}
+
+// tough-cookie
+export interface CookieJar {
+
+}
+
+export declare function createVirtualConsole(options?: VirtualConsoleOptions): VirtualConsole;
+export declare function getVirtualConsole(window: Window): VirtualConsole;
+export declare function createCookieJar(): CookieJar;
+export declare function nodeLocation(node: Node): any;
+export declare function reconfigureWindow(window: Window, newProps: WindowProperties): void;
+
+export declare function jQueryify(window: Window, jqueryUrl: string, callback: (window: Window, jquery: JQuery) => any): void;
+
+export declare var debugMode: boolean;
+
+export interface DocumentWithParentWindow extends Document {
+    parentWindow: Window;
+}
+
+/**
+ * The jsdom.jsdom method does less things automatically; it takes in only HTML source, and does not let you to
+ * separately supply script that it will inject and execute. It just gives you back a document object,
+ * with usable document.parentWindow, and starts asynchronously executing any <script>s included in the HTML source.
+ * You can listen for the 'load' event to wait until scripts are done loading and executing, just like you would in a
+ * normal HTML page.
+ *
+ * @param markup	is a HTML document to be parsed. You can also pass undefined to get the basic document,
+ *					equivalent to what a browser will give if you open up an empty .html file.
+ * @param options	see the explanation of the config object above.
+ */
+export declare function jsdom(markup: string, config?: Config): DocumentWithParentWindow;
+
+/**
+ * Before creating any documents, you can modify the defaults for all future documents:
+ */
+export declare var availableDocumentFeatures: FeatureOptions;
+export declare var defaultDocumentFeatures: FeatureOptions;
+export declare var applyDocumentFeatures: FeatureOptions;
+
+export interface Callback {
+    (errors: Error[], window: Window): any;
+}
+
+export interface FeatureOptions {
+    /**
+     * Enables/disables fetching files over the file system/HTTP
+     * Allowed: ["script", "img", "css", "frame", "iframe", "link"] or false
+     * Default for jsdom.env: false
+     */
+    FetchExternalResources?: string[] | boolean;
+
+    /**
+     * Enables/disables JavaScript execution
+     * Default: ["script"]
+     * Allowed: ["script"] or false, 
+     * Default for jsdom.env: false
+     */
+    ProcessExternalResources?: string[] | boolean;
+
+    /**
+     * Filters resource downloading and processing to disallow those matching the given regular expression
+     * Default: false (allow all)
+     * Allowed: /url to be skipped/ or false
+     * Example: /http:\/\/example.org/js/bad\.js/
+     */
+    SkipExternalResources?: string | boolean;
+}
+
+export interface EnvDocument {
+    /**
+     * the new document will have this referrer.
+     */
+    referrer?: string;
+    /**
+     * manually set a cookie value, e.g. 'key=value; expires=Wed, Sep 21 2011 12:00:00 GMT; path=/'.
+     */
+    cookie?: string;
+    /**
+     * a cookie domain for the manually set cookie; defaults to 127.0.0.1.
+     */
+    cookieDomain?: string;
+}
+
+export interface Config {
+    /**
+     * a HTML fragment
+     */
+    html?: string;
+    /**
+     * a file which jsdom will load HTML from; the resulting window's location.href will be a file:// URL.
+     */
+    file?: string;
+    /**
+     * sets the resulting window's location.href; if config.html and config.file are not provided, jsdom will load HTML from this URL
+     */
+    url?: string;
+    /**
+     * a string or array of strings, containing file names or URLs that will be inserted as <script> tags
+     */
+    scripts?: string[];
+    /**
+     * an array of JavaScript strings that will be evaluated against the resulting document. Similar to scripts, but it accepts JavaScript instead of paths/URLs.
+     */
+    src?: string[];
+    /**
+     * a custom cookie jar, if desired; see mikeal/request documentation.
+     */
+    jar?: CookieJar;
+    /**
+     *  either "auto", "html", or "xml". The default is "auto", which uses HTML behavior unless config.url responds with an XML Content-Type, or config.file contains a filename ending in .xml or .xhtml. Setting to "xml" will attempt to parse the document as an XHTML document. (jsdom is currently only OK at doing that.)
+     */
+    parsingMode?: string;
+    document?: EnvDocument;
+    /**
+     * Note: the default feature set for jsdom.env does not include fetching remote JavaScript and executing it. This is something that you will need to carefully enable yourself.
+     */
+    features?: FeatureOptions;
+
+    virtualConsole?: VirtualConsole;
+
+    /**
+     * Now that you know about created and loaded, you can see that done is essentially both of them smashed together:
+     * If window creation succeeds and no <script>s cause errors, then errors will be null, and window will be usable.
+     * If window creation succeeds but there are script errors, then errors will be an array containing those errors, but window will still be usable.
+     * If window creation fails, then errors will be an array containing the creation error, and window will not be passed.
+     */
+    done?: Callback;
+    /**
+     * The loaded callback is called along with the window's 'load' event. This means it will only be called if creation succeeds without error. Note that by the time it has called, any external resources will have been downloaded, and any <script>s will have finished executing. If errors is non-null, it will contain an array of all JavaScript errors that occured during script execution. window will still be passed, however.
+     */
+    loaded?: Callback;
+
+    /**
+     * The created callback is called as soon as the window is created, or if that process fails. You may access all window properties here; however, window.document is not ready for use yet, as the HTML has not been parsed. The primary use-case for created is to modify the window object (e.g. add new functions on built-in prototypes) before any scripts execute. You can also set an event handler for 'load' or other events on the window if you wish. But the loaded callback, below, can be more useful, since it includes script errors. If the error argument is non-null, it will contain whatever loading error caused the window creation to fail; in that case window will not be passed.
+     */
+    created?: (error: Error, window: Window) => void;
+}
diff --git a/jsdom/jsdom-tests.ts b/jsdom/jsdom-tests.ts
index 1f0d04a0b5..ec9e60b250 100644
--- a/jsdom/jsdom-tests.ts
+++ b/jsdom/jsdom-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./jsdom.d.ts" />
 
 import jsdom = require("jsdom");
 
diff --git a/jsdom/jsdom.d.ts b/jsdom/jsdom.d.ts
deleted file mode 100644
index c6ebde2ce3..0000000000
--- a/jsdom/jsdom.d.ts
+++ /dev/null
@@ -1,198 +0,0 @@
-// Type definitions for jsdom 2.0.0
-// Project: https://github.com/tmpvar/jsdom
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path='../node/node.d.ts' />
-/// <reference path='../jquery/jquery.d.ts' />
-
-declare module "jsdom" {
-
-    import EventEmitter = NodeJS.EventEmitter;
-
-	/**
-	 * The do-what-I-mean API.
-	 *
-	 * Example:
-	 * jsdom.env(html, function (errors, window) {
-	 *  // free memory associated with the window
-	 *  window.close();
-	 * });
-	 *
-	 * @param urlOrSource may be a URL, file name, or HTML fragment
-	 * @param scriptUrlsOrSources a string or array of strings, containing file names or URLs that will be inserted as
-	 * @param config  Configuration object
-	 * @param callback 
-	 */
-	export function env(urlOrHtml: string, scripts: string, config: Config, callback?: Callback): void;
-	export function env(urlOrHtml: string, scripts: string, callback: Callback): void;
-	export function env(urlOrHtml: string, scripts: string[], config: Config, callback?: Callback): void;
-	export function env(urlOrHtml: string, scripts: string[], callback: Callback): void;
-	export function env(urlOrHtml: string, callback: Callback): void;
-	export function env(urlOrHtml: string, config: Config, callback?: Callback): void;
-	export function env(config: Config, callback?: Callback): void;
-
-	export function serializeDocument(doc: Document): string;
-
-	export interface VirtualConsole extends EventEmitter {
-		sendTo(console: Console): VirtualConsole;
-	}
-	
-	export interface VirtualConsoleOptions {
-	}
-	
-	export interface WindowProperties {
-		parsingMode?: string; // html, xml, auto, undefined
-		contentType?: string;
-		parser?: any;
-		url?: string;
-		referrer?: string;
-		cookieJar?: CookieJar;
-		cookie?: string;
-		resourceLoader?: any;
-		deferClose?: boolean;
-		concurrentNodeIterators?: number;
-		virtualConsole?: VirtualConsole;
-		created?: (something: any, window: Window) => any;
-		features?: FeatureOptions;
-		top?: Window;
-	}
-
-    // tough-cookie
-    export interface CookieJar {
-        
-    }
-
-	export function createVirtualConsole(options?: VirtualConsoleOptions): VirtualConsole;
-	export function getVirtualConsole(window: Window): VirtualConsole;
-	export function createCookieJar(): CookieJar;
-	export function nodeLocation(node: Node): any;
-	export function reconfigureWindow(window: Window, newProps: WindowProperties): void;
-	
-	export function jQueryify(window: Window, jqueryUrl: string, callback: (window: Window, jquery: JQuery) => any): void;
-	
-	export var debugMode: boolean;
-	
-	export interface DocumentWithParentWindow extends Document {
-		parentWindow: Window;
-	}
-
-	/**
-	 * The jsdom.jsdom method does less things automatically; it takes in only HTML source, and does not let you to
-	 * separately supply script that it will inject and execute. It just gives you back a document object,
-	 * with usable document.parentWindow, and starts asynchronously executing any <script>s included in the HTML source.
-	 * You can listen for the 'load' event to wait until scripts are done loading and executing, just like you would in a
-	 * normal HTML page.
-	 *
-	 * @param markup	is a HTML document to be parsed. You can also pass undefined to get the basic document,
-	 *					equivalent to what a browser will give if you open up an empty .html file.
-	 * @param options	see the explanation of the config object above.
-	 */
-	export function jsdom(markup: string, config?: Config): DocumentWithParentWindow;
-
-	/**
-	 * Before creating any documents, you can modify the defaults for all future documents:
-	 */
-	export var availableDocumentFeatures: FeatureOptions;
- 	export var defaultDocumentFeatures: FeatureOptions;
-	export var applyDocumentFeatures: FeatureOptions;
-
-    export interface Callback {
-        (errors: Error[], window: Window): any;
-    }
-	
-	export interface FeatureOptions {
-		/**
-		 * Enables/disables fetching files over the file system/HTTP
-		 * Allowed: ["script", "img", "css", "frame", "iframe", "link"] or false
-		 * Default for jsdom.env: false
-		 */
-		FetchExternalResources?: string[] | boolean;
-
-		/**
-		 * Enables/disables JavaScript execution
-		 * Default: ["script"]
-		 * Allowed: ["script"] or false, 
-		 * Default for jsdom.env: false
-		 */
-		ProcessExternalResources?: string[] | boolean;
-
-		/**
-		 * Filters resource downloading and processing to disallow those matching the given regular expression
-		 * Default: false (allow all)
-		 * Allowed: /url to be skipped/ or false
-		 * Example: /http:\/\/example.org/js/bad\.js/
-		 */
-		SkipExternalResources?: string | boolean;
-	}
-
-	export interface EnvDocument {
-		/**
-		 * the new document will have this referrer.
-		 */
-		referrer?: string;
-		/**
-		 * manually set a cookie value, e.g. 'key=value; expires=Wed, Sep 21 2011 12:00:00 GMT; path=/'.
-		 */
-		cookie?: string;
-		/**
-		 * a cookie domain for the manually set cookie; defaults to 127.0.0.1.
-		 */
-		cookieDomain?: string;
-	}
-	
-    export interface Config {
-		/**
-		 * a HTML fragment
-		 */
-		html?: string;
-		/**
-		 * a file which jsdom will load HTML from; the resulting window's location.href will be a file:// URL.
-		 */
-		file?: string;
-		/**
-		 * sets the resulting window's location.href; if config.html and config.file are not provided, jsdom will load HTML from this URL
-		 */
-		url?: string;
-		/**
-		 * a string or array of strings, containing file names or URLs that will be inserted as <script> tags
-		 */
-		scripts?: string[];
-		/**
-		 * an array of JavaScript strings that will be evaluated against the resulting document. Similar to scripts, but it accepts JavaScript instead of paths/URLs.
-		 */
-		src?: string[];
-		/**
-		 * a custom cookie jar, if desired; see mikeal/request documentation.
-		 */
-		jar?: CookieJar;
-		/**
-		 *  either "auto", "html", or "xml". The default is "auto", which uses HTML behavior unless config.url responds with an XML Content-Type, or config.file contains a filename ending in .xml or .xhtml. Setting to "xml" will attempt to parse the document as an XHTML document. (jsdom is currently only OK at doing that.)
-		 */
-		parsingMode?: string;
-		document?: EnvDocument;
-		/**
-		 * Note: the default feature set for jsdom.env does not include fetching remote JavaScript and executing it. This is something that you will need to carefully enable yourself.
-		 */
-		features?: FeatureOptions;
-		
-		virtualConsole?: VirtualConsole;
-		
-		/**
-		 * Now that you know about created and loaded, you can see that done is essentially both of them smashed together:
-		 * If window creation succeeds and no <script>s cause errors, then errors will be null, and window will be usable.
-		 * If window creation succeeds but there are script errors, then errors will be an array containing those errors, but window will still be usable.
-		 * If window creation fails, then errors will be an array containing the creation error, and window will not be passed.
-		 */
-		done?: Callback;
-		/**
-		 * The loaded callback is called along with the window's 'load' event. This means it will only be called if creation succeeds without error. Note that by the time it has called, any external resources will have been downloaded, and any <script>s will have finished executing. If errors is non-null, it will contain an array of all JavaScript errors that occured during script execution. window will still be passed, however.
-		 */
-		loaded?: Callback;
-		
-		/**
-		 * The created callback is called as soon as the window is created, or if that process fails. You may access all window properties here; however, window.document is not ready for use yet, as the HTML has not been parsed. The primary use-case for created is to modify the window object (e.g. add new functions on built-in prototypes) before any scripts execute. You can also set an event handler for 'load' or other events on the window if you wish. But the loaded callback, below, can be more useful, since it includes script errors. If the error argument is non-null, it will contain whatever loading error caused the window creation to fail; in that case window will not be passed.
-		 */
-		created?: (error: Error, window: Window) => void;
-    }
-}
diff --git a/jsdom/tsconfig.json b/jsdom/tsconfig.json
new file mode 100644
index 0000000000..e9a3428003
--- /dev/null
+++ b/jsdom/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsdom-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jsen/index.d.ts b/jsen/index.d.ts
new file mode 100644
index 0000000000..7be072ab1a
--- /dev/null
+++ b/jsen/index.d.ts
@@ -0,0 +1,51 @@
+// Type definitions for jsen (JSON Sentinel)
+// Project: https://github.com/bugventure/jsen
+// Definitions by: Vladimir Đokić <https://github.com/vladeck/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare namespace Jsen {
+
+    export interface JsenFormats {
+        [key: string]: string | RegExp | Function;
+    }
+
+    export interface JsenSettings {
+        missing$Ref?: boolean;
+        greedy?: boolean;
+        formats?: JsenFormats;
+        schemas?: any;
+    }
+
+    export interface JsenBuildSettings {
+        copy?: boolean;
+        additionalProperties?: boolean;
+    }
+
+    export interface JsenValidator {
+        (data?: any): boolean;
+        build(initial?: any, options?: JsenBuildSettings): any;
+        errors: JsenValidateError[];
+    }
+
+    export interface JsenValidateError {
+        path: string;
+        keyword: string;
+        message?: string;
+    }
+
+    export interface JsenUnique {
+        (array: any[]): boolean;
+        findIndex(array: any[], value: any, comparator: (obj1: any, obj2: any) => boolean): number;
+    }
+
+    export interface JsenMain {
+        (schema?: any, options?: JsenSettings): JsenValidator;
+        clone(data: any): any;
+        equal(a: any, b: any): boolean;
+        unique: JsenUnique;
+    }
+}
+
+declare var Jsen: Jsen.JsenMain;
+export = Jsen;
+export as namespace jsen;
diff --git a/jsen/jsen-tests.ts b/jsen/jsen-tests.ts
index 9957a01200..16cded3688 100644
--- a/jsen/jsen-tests.ts
+++ b/jsen/jsen-tests.ts
@@ -1,7 +1,5 @@
-/// <reference path="jsen.d.ts"/>
-
 import jsen = require("jsen");
-import JsenSettings = Jsen.JsenSettings;
+import JsenSettings = jsen.JsenSettings;
 
 // any
 {
diff --git a/jsen/jsen.d.ts b/jsen/jsen.d.ts
deleted file mode 100644
index 19407c849f..0000000000
--- a/jsen/jsen.d.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// Type definitions for jsen (JSON Sentinel)
-// Project: https://github.com/bugventure/jsen
-// Definitions by: Vladimir Đokić <https://github.com/vladeck/>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-declare module Jsen {
-
-    export interface JsenFormats {
-        [key: string]: string | RegExp | Function;
-    }
-
-    export interface JsenSettings {
-        missing$Ref?: boolean;
-        greedy?: boolean;
-        formats?: JsenFormats;
-        schemas?: any;
-    }
-
-    export interface JsenBuildSettings {
-        copy?: boolean;
-        additionalProperties?: boolean;
-    }
-
-    export interface JsenValidator {
-        (data?: any): boolean;
-        build(initial?: any, options?: JsenBuildSettings): any;
-        errors: JsenValidateError[];
-    }
-
-    export interface JsenValidateError {
-        path: string;
-        keyword: string;
-        message?: string;
-    }
-
-    export interface JsenUnique {
-        (array: any[]): boolean;
-        findIndex(array: any[], value: any, comparator: (obj1: any, obj2: any) => boolean): number;
-    }
-
-    export interface JsenMain {
-        (schema?: any, options?: JsenSettings): JsenValidator;
-        clone(data: any): any;
-        equal(a: any, b: any): boolean;
-        unique: JsenUnique;
-    }
-}
-
-declare module "jsen" {
-    var _jsen: Jsen.JsenMain;
-    export = _jsen;
-}
diff --git a/jsen/tsconfig.json b/jsen/tsconfig.json
new file mode 100644
index 0000000000..e30a3a8ad4
--- /dev/null
+++ b/jsen/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsen-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jsend/jsend.d.ts b/jsend/index.d.ts
similarity index 100%
rename from jsend/jsend.d.ts
rename to jsend/index.d.ts
diff --git a/jsend/jsend-tests.ts b/jsend/jsend-tests.ts
index 72598c904b..960e7493f3 100644
--- a/jsend/jsend-tests.ts
+++ b/jsend/jsend-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jsend.d.ts" />
+
 
 import jsend = require('jsend');
 
diff --git a/jsend/tsconfig.json b/jsend/tsconfig.json
new file mode 100644
index 0000000000..bfa9a1659d
--- /dev/null
+++ b/jsend/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsend-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jsesc/index.d.ts b/jsesc/index.d.ts
new file mode 100644
index 0000000000..10e322f379
--- /dev/null
+++ b/jsesc/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for jsesc 0.4.3
+// Project: https://github.com/mathiasbynens/jsesc
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare function jsesc(str: string, opts?: any): string;
+
+declare namespace jsesc {
+    var version: string;
+
+    interface Opts {
+        quotes?: string;
+        wrap?: boolean;
+        es6?: boolean;
+        escapeEverything?: boolean;
+        compact?: boolean;
+        indent?: string;
+        json?: boolean;
+    }
+}
+
+export = jsesc;
diff --git a/jsesc/jsesc-tests.ts b/jsesc/jsesc-tests.ts
index 355b2a7988..1afe116e29 100644
--- a/jsesc/jsesc-tests.ts
+++ b/jsesc/jsesc-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="jsesc.d.ts" />
 
 import jsesc = require('jsesc');
 import Opts = jsesc.Opts;
diff --git a/jsesc/jsesc.d.ts b/jsesc/jsesc.d.ts
deleted file mode 100644
index 9034aa76f7..0000000000
--- a/jsesc/jsesc.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-// Type definitions for jsesc 0.4.3
-// Project: https://github.com/mathiasbynens/jsesc
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'jsesc' {
-
-	function jsesc(str: string, opts?: any): string;
-
-	namespace jsesc {
-		var version: string;
-
-		interface Opts {
-			quotes?: string;
-			wrap?: boolean;
-			es6?: boolean;
-			escapeEverything?: boolean;
-			compact?: boolean;
-			indent?: string;
-			json?: boolean;
-		}
-	}
-
-	export = jsesc;
-}
diff --git a/jsesc/tsconfig.json b/jsesc/tsconfig.json
new file mode 100644
index 0000000000..b21a2d2a02
--- /dev/null
+++ b/jsesc/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsesc-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jsfl/jsfl.d.ts b/jsfl/index.d.ts
similarity index 100%
rename from jsfl/jsfl.d.ts
rename to jsfl/index.d.ts
diff --git a/jsfl/jsfl.d.ts.tscparams b/jsfl/jsfl.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jsfl/jsfl.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jsfl/tsconfig.json b/jsfl/tsconfig.json
new file mode 100644
index 0000000000..af6755830c
--- /dev/null
+++ b/jsfl/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jsfl/xJSFL.d.ts.tscparams b/jsfl/xJSFL.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jsfl/xJSFL.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jshamcrest/jshamcrest.d.ts b/jshamcrest/index.d.ts
similarity index 100%
rename from jshamcrest/jshamcrest.d.ts
rename to jshamcrest/index.d.ts
diff --git a/jshamcrest/jshamcrest-tests.ts b/jshamcrest/jshamcrest-tests.ts
index a65290e6d2..74ad61b6ae 100644
--- a/jshamcrest/jshamcrest-tests.ts
+++ b/jshamcrest/jshamcrest-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jshamcrest.d.ts" />
+
 
 
 function test_version() {
diff --git a/jshamcrest/tsconfig.json b/jshamcrest/tsconfig.json
new file mode 100644
index 0000000000..757a60cd17
--- /dev/null
+++ b/jshamcrest/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jshamcrest-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jsmockito/jsmockito.d.ts b/jsmockito/index.d.ts
similarity index 100%
rename from jsmockito/jsmockito.d.ts
rename to jsmockito/index.d.ts
diff --git a/jsmockito/jsmockito-tests.ts b/jsmockito/jsmockito-tests.ts
index 461f82982d..94f94d9552 100644
--- a/jsmockito/jsmockito-tests.ts
+++ b/jsmockito/jsmockito-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jsmockito.d.ts" />
+
 
 function test_version() {
     var version: string = JsMockito.version;
diff --git a/jsmockito/tsconfig.json b/jsmockito/tsconfig.json
new file mode 100644
index 0000000000..69ed0f57fd
--- /dev/null
+++ b/jsmockito/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsmockito-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jsnlog/jsnlog.d.ts b/jsnlog/index.d.ts
similarity index 100%
rename from jsnlog/jsnlog.d.ts
rename to jsnlog/index.d.ts
diff --git a/jsnlog/jsnlog-tests.ts b/jsnlog/jsnlog-tests.ts
index dfb32a6c85..fdaa6b425c 100644
--- a/jsnlog/jsnlog-tests.ts
+++ b/jsnlog/jsnlog-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jsnlog.d.ts" />
+
 
 // ----------------------------------------------------------
 // JL
diff --git a/jsnlog/tsconfig.json b/jsnlog/tsconfig.json
new file mode 100644
index 0000000000..dc49db14bb
--- /dev/null
+++ b/jsnlog/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsnlog-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jsnox/index.d.ts b/jsnox/index.d.ts
new file mode 100644
index 0000000000..51e02521de
--- /dev/null
+++ b/jsnox/index.d.ts
@@ -0,0 +1,69 @@
+// Type definitions for JSnoX
+// Project: https://github.com/af/jsnox
+// Definitions by: Steve Baker <https://github.com/stkb/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react" />
+
+
+
+import React = require("react");
+
+/*
+ * JSnoX requires an object with a createElement method.
+ * This will normally be the React object but could be something else
+ */
+interface ReactLikeObject {
+    createElement<P>(type: React.ComponentClass<P> | string,
+        props: P, children: React.ReactNode): React.ReactElement<P>;
+}
+
+interface Module {
+    (reactObj: ReactLikeObject): CreateElement
+}
+
+interface CreateElement {
+    /**
+     * Renders an HTML element from the given spec string, with children but without
+     * extra props.
+     * @param specString A string that defines a component in a way that resembles 
+     * CSS selectors. Eg. "input:email#foo.bar.baz[name=email][required]"
+     * @param children A single React node (string or ReactElement) or array of nodes.
+     * Note that unlike with React itself, multiple children must be placed into an array. 
+     */
+    <P>(specString: string, children: React.ReactNode): React.DOMElement<P, Element>
+
+    /**
+     * Renders an HTML element from the given spec string, with optional props 
+     * and children
+     * @param specString A string that defines a component in a way that resembles 
+     * CSS selectors. Eg. "input:email#foo.bar.baz[name=email][required]"
+     * @param props Object of html attribute key-value pairs
+     * @param children A single React node (string or ReactElement) or array of nodes.
+     * Note that unlike with React itself, multiple children must be placed into an array. 
+     */
+    <P>(specString: string, props?: React.HTMLAttributes, children?: React.ReactNode): React.DOMElement<P, Element>
+
+
+    /**
+     * Renders a React component, with children but no props
+     * @param component A plain React component (created from React.createClass()) or 
+     * component factory (created from React.createFactory())
+     * @param children A single React node (string or ReactElement) or array of nodes.
+     * Note that unlike with React itself, multiple children must be placed into an array. 
+     */
+    <P>(component: React.ComponentClass<P>, children: React.ReactNode): React.ReactElement<P>
+
+    /** 
+     * Renders a React component, with optional props and children
+     * @param component A plain React component (created from React.createClass()) or 
+     * component factory (created from React.createFactory())
+     * @param props Props object to pass to the component
+     * @param children A single React node (string or ReactElement) or array of nodes.
+     * Note that unlike with React itself, multiple children must be placed into an array. 
+     */
+    <P>(component: React.ComponentClass<P>, props?: P, children?: React.ReactNode): React.ReactElement<P>
+}
+
+declare var exports: Module
+export = exports
diff --git a/jsnox/jsnox-tests.ts b/jsnox/jsnox-tests.ts
index c1203f089b..05c8a81cb4 100644
--- a/jsnox/jsnox-tests.ts
+++ b/jsnox/jsnox-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jsnox.d.ts" />
+
 import React = require('react');
 import jsnox = require('jsnox');
 var $ = jsnox(React);
diff --git a/jsnox/jsnox.d.ts b/jsnox/jsnox.d.ts
deleted file mode 100644
index aec7265739..0000000000
--- a/jsnox/jsnox.d.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-// Type definitions for JSnoX
-// Project: https://github.com/af/jsnox
-// Definitions by: Steve Baker <https://github.com/stkb/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts" />
-
-declare module 'jsnox' {
-
-    import React = require("react");
-    
-    /*
-     * JSnoX requires an object with a createElement method.
-     * This will normally be the React object but could be something else
-     */
-    interface ReactLikeObject {
-        createElement<P>(type: React.ComponentClass<P> | string,
-            props: P, children: React.ReactNode): React.ReactElement<P>;
-    }
-
-    interface Module {
-        (reactObj: ReactLikeObject): CreateElement
-    }
-
-    interface CreateElement {
-        /**
-         * Renders an HTML element from the given spec string, with children but without
-         * extra props.
-         * @param specString A string that defines a component in a way that resembles 
-         * CSS selectors. Eg. "input:email#foo.bar.baz[name=email][required]"
-         * @param children A single React node (string or ReactElement) or array of nodes.
-         * Note that unlike with React itself, multiple children must be placed into an array. 
-         */
-        <P>(specString: string, children: React.ReactNode): React.DOMElement<P, Element>
-
-        /**
-         * Renders an HTML element from the given spec string, with optional props 
-         * and children
-         * @param specString A string that defines a component in a way that resembles 
-         * CSS selectors. Eg. "input:email#foo.bar.baz[name=email][required]"
-         * @param props Object of html attribute key-value pairs
-         * @param children A single React node (string or ReactElement) or array of nodes.
-         * Note that unlike with React itself, multiple children must be placed into an array. 
-         */
-        <P>(specString: string, props?: React.HTMLAttributes, children?: React.ReactNode): React.DOMElement<P, Element>
-
-
-        /**
-         * Renders a React component, with children but no props
-         * @param component A plain React component (created from React.createClass()) or 
-         * component factory (created from React.createFactory())
-         * @param children A single React node (string or ReactElement) or array of nodes.
-         * Note that unlike with React itself, multiple children must be placed into an array. 
-         */
-        <P>(component: React.ComponentClass<P>, children: React.ReactNode): React.ReactElement<P>
-
-        /** 
-         * Renders a React component, with optional props and children
-         * @param component A plain React component (created from React.createClass()) or 
-         * component factory (created from React.createFactory())
-         * @param props Props object to pass to the component
-         * @param children A single React node (string or ReactElement) or array of nodes.
-         * Note that unlike with React itself, multiple children must be placed into an array. 
-         */
-        <P>(component: React.ComponentClass<P>, props?: P, children?: React.ReactNode): React.ReactElement<P>
-    }
-
-    var exports: Module
-    export = exports
-}
diff --git a/jsnox/tsconfig.json b/jsnox/tsconfig.json
new file mode 100644
index 0000000000..f9dad1ab31
--- /dev/null
+++ b/jsnox/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsnox-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/json-patch/index.d.ts b/json-patch/index.d.ts
new file mode 100644
index 0000000000..bb70cff6c6
--- /dev/null
+++ b/json-patch/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for json-patch
+// Project: https://github.com/bruth/jsonpatch-js
+// Definitions by: vvakame <https://github.com/vvakame/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace jsonpatch {
+    type OpPatch = AddPath | RemovePath | ReplacePath | MovePath | CopyPath | TestPath;
+    interface Patch {
+        op: string;
+    }
+    interface AddPath extends Patch {
+        path: string;
+        value: any;
+    }
+    interface RemovePath extends Patch {
+        path: string;
+    }
+    interface ReplacePath extends Patch {
+        path: string;
+        value: any;
+    }
+    interface MovePath extends Patch {
+        from: string;
+        path: string;
+    }
+    interface CopyPath extends Patch {
+        from: string;
+        path: string;
+    }
+    interface TestPath extends Patch {
+        path: string;
+        value: any;
+    }
+
+    function apply(document: any, patches: OpPatch[]): any;
+    function compile(patches: OpPatch[]): (document: any) => any;
+}
+
+export = jsonpatch;
+export as namespace jsonpatch;
diff --git a/json-patch/json-patch-tests.ts b/json-patch/json-patch-tests.ts
index c2736c403f..b57f1d6fe0 100644
--- a/json-patch/json-patch-tests.ts
+++ b/json-patch/json-patch-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./json-patch.d.ts" />
+
 
 import jp = require("json-patch");
 
diff --git a/json-patch/json-patch.d.ts b/json-patch/json-patch.d.ts
deleted file mode 100644
index cbe2add41c..0000000000
--- a/json-patch/json-patch.d.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-// Type definitions for json-patch
-// Project: https://github.com/bruth/jsonpatch-js
-// Definitions by: vvakame <https://github.com/vvakame/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace jsonpatch {
-    type OpPatch = AddPath | RemovePath | ReplacePath | MovePath | CopyPath | TestPath;
-    interface Patch {
-        op: string;
-    }
-    interface AddPath extends Patch {
-        path: string;
-        value: any;
-    }
-    interface RemovePath extends Patch {
-        path: string;
-    }
-    interface ReplacePath extends Patch {
-        path: string;
-        value: any;
-    }
-    interface MovePath extends Patch {
-        from: string;
-        path: string;
-    }
-    interface CopyPath extends Patch {
-        from: string;
-        path: string;
-    }
-    interface TestPath extends Patch {
-        path: string;
-        value: any;
-    }
-
-    function apply(document: any, patches: OpPatch[]): any;
-    function compile(patches: OpPatch[]): (document: any) => any;
-}
-
-declare module "json-patch" {
-    export = jsonpatch;
-}
diff --git a/json-patch/tsconfig.json b/json-patch/tsconfig.json
new file mode 100644
index 0000000000..4a698c8ada
--- /dev/null
+++ b/json-patch/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "json-patch-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/json-pointer/index.d.ts b/json-pointer/index.d.ts
new file mode 100644
index 0000000000..a462801795
--- /dev/null
+++ b/json-pointer/index.d.ts
@@ -0,0 +1,82 @@
+// Type definitions for json-pointer 1.0 l
+// Project: https://www.npmjs.org/package/json-pointer
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function JSON_Pointer(object: Object): JSON_Pointer.JSON_PointerWrap;
+
+declare namespace JSON_Pointer {
+    /**
+     *  Wrap an object with accessors
+     */
+    /**
+     *  Looks up a JSON pointer in an object.
+     */
+    function get(object: Object, pointer: string): any;
+    /**
+     *  Set a value for a JSON pointer on object.
+     */
+    function set(object: Object, pointer: string, value: any): void;
+    /**
+     *  Removes an attribute of object referenced by pointer
+     */
+    function remove(object: Object, pointer: string): void;
+    /**
+     *  Creates a dictionary object (pointer -> value).
+     */
+    function dict(object: Object): Object;
+    /**
+     *  Just like: each(pointer.dict(obj), iterator);
+     */
+    function walk(object: Object, iterator: (value: any, key: string) => void): void;
+    /**
+     *  Tests if an object has a value for a JSON pointer.
+     */
+    function has(object: Object, pointer: string): boolean;
+    /**
+     *  Escapes a reference token.
+     */
+    function escape(str: string): string;
+    /**
+     *  Unescape a reference token.
+     */
+    function unescape(str: string): string;
+    /**
+     *  Converts a JSON pointer into an array of reference tokens.
+     */
+    function parse(str: string): string[];
+    /**
+     *  Builds a json pointer from an array of reference tokens.
+     */
+    function compile(str: string[]): string;
+
+    interface JSON_PointerWrap {
+        /**
+         *  Looks up a JSON pointer in an object.
+         */
+        get(pointer: string): any;
+        /**
+         *  Set a value for a JSON pointer on object.
+         */
+        set(pointer: string, value: any): void;
+        /**
+         *  Removes an attribute of object referenced by pointer
+         */
+        remove(pointer: string): void;
+        /**
+         *  Creates a dictionary object (pointer -> value).
+         */
+        dict(): Object;
+        /**
+         *  Just like: each(pointer.dict(obj), iterator);
+         */
+        walk(iterator: (value: any, key: string) => void): void;
+        /**
+         *  Tests if an object has a value for a JSON pointer.
+         */
+        has(pointer: string): boolean;
+    }
+}
+
+export = JSON_Pointer;
diff --git a/json-pointer/json-pointer-tests.ts b/json-pointer/json-pointer-tests.ts
index 79297c0f0e..7a55d1a3ec 100644
--- a/json-pointer/json-pointer-tests.ts
+++ b/json-pointer/json-pointer-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="json-pointer.d.ts" />
 
 import JsonPointer = require('json-pointer');
 
diff --git a/json-pointer/json-pointer.d.ts b/json-pointer/json-pointer.d.ts
deleted file mode 100644
index ba8fc00b3a..0000000000
--- a/json-pointer/json-pointer.d.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-// Type definitions for json-pointer 1.0 l
-// Project: https://www.npmjs.org/package/json-pointer
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "json-pointer" {
-	function JSON_Pointer(object: Object): JSON_Pointer.JSON_PointerWrap;
-
-	namespace JSON_Pointer {
-		/**
-		 *  Wrap an object with accessors
-		 */
-		/**
-		 *  Looks up a JSON pointer in an object.
-		 */
-		function get(object: Object, pointer: string): any;
-		/**
-		 *  Set a value for a JSON pointer on object.
-		 */
-		function set(object: Object, pointer: string, value: any): void;
-		/**
-		 *  Removes an attribute of object referenced by pointer
-		 */
-		function remove(object: Object, pointer: string): void;
-		/**
-		 *  Creates a dictionary object (pointer -> value).
-		 */
-		function dict(object: Object): Object;
-		/**
-		 *  Just like: each(pointer.dict(obj), iterator);
-		 */
-		function walk(object: Object, iterator: (value: any, key: string) =>  void): void;
-		/**
-		 *  Tests if an object has a value for a JSON pointer.
-		 */
-		function has(object: Object, pointer: string): boolean;
-		/**
-		 *  Escapes a reference token.
-		 */
-		function escape(str: string): string;
-		/**
-		 *  Unescape a reference token.
-		 */
-		function unescape(str: string): string;
-		/**
-		 *  Converts a JSON pointer into an array of reference tokens.
-		 */
-		function parse(str: string): string[];
-		/**
-		 *  Builds a json pointer from an array of reference tokens.
-		 */
-		function compile(str: string[]): string;
-
-		interface JSON_PointerWrap {
-			/**
-			 *  Looks up a JSON pointer in an object.
-			 */
-			get(pointer: string): any;
-			/**
-			 *  Set a value for a JSON pointer on object.
-			 */
-			set(pointer: string, value: any): void;
-			/**
-			 *  Removes an attribute of object referenced by pointer
-			 */
-			remove(pointer: string): void;
-			/**
-			 *  Creates a dictionary object (pointer -> value).
-			 */
-			dict(): Object;
-			/**
-			 *  Just like: each(pointer.dict(obj), iterator);
-			 */
-			walk(iterator: (value: any, key: string) =>  void): void;
-			/**
-			 *  Tests if an object has a value for a JSON pointer.
-			 */
-			has(pointer: string): boolean;
-		}
-	}
-
-	export = JSON_Pointer;
-}
diff --git a/json-pointer/tsconfig.json b/json-pointer/tsconfig.json
new file mode 100644
index 0000000000..b18870861e
--- /dev/null
+++ b/json-pointer/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "json-pointer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/json-socket/index.d.ts b/json-socket/index.d.ts
new file mode 100644
index 0000000000..cd38cf94c2
--- /dev/null
+++ b/json-socket/index.d.ts
@@ -0,0 +1,70 @@
+// Type definitions for json-socket v0.1.2
+// Project: https://github.com/sebastianseilund/node-json-socket
+// Definitions by: Sven Reglitzki <https://github.com/svi3c/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+
+import {Socket} from "net";
+
+declare class JsonSocket extends Socket {
+
+    constructor(socket: Socket);
+
+    /**
+     * sends a single message and closes the connection instantly. Use this if you need to send a server a message,
+     * but you don't need any response.
+     * @param port port to send the message to
+     * @param host host to send the message to
+     * @param message the message to send
+     * @param callback will be called after the message has been sent
+     */
+    static sendSingleMessage(port: number, host: string, message: any, callback: (err: Error) => void): void;
+
+    /**
+     * sends a single message, waits for a single response message from the server and closes the connection right after.
+     * Use this if you need to send a server a message, and get a response, but you don't need the connection to stay
+     * open.
+     * @param port port to send the message to
+     * @param host host to send the message to
+     * @param message the message to send
+     * @param callback will be called when the response message has been received
+     */
+    static sendSingleMessageAndReceive(port: number, host: string, message: any, callback: (err: Error, message: any) => void): void;
+
+    /**
+    * Convenience method for sending an error as a message.
+    * @param err an Error object that should be formatted as a message
+    * @param callback will be called after the message has been sent
+    */
+    sendError(err: Error, callback: (err: Error) => void): void;
+
+    /**
+     * Same as {@link JsonSocket.sendError}, except that the socket is closed right after the message has been sent
+     * using <a href="https://nodejs.org/api/net.html#net_socket_end_data_encoding">net.end()</a>.
+     * No more messages can be sent from either the server or client through this socket.
+     * @param err
+     * @param callback
+     */
+    sendEndError(err: Error, callback: (err: Error) => void): void;
+
+    /**
+     * Sends a JSON message over the socket.
+     * @param message the message to send
+     * @param callback will be called after the message has been sent
+     */
+    sendMessage(message: any, callback: (err: Error) => void): void;
+
+    /**
+     * Same as {@link JsonSocket.sendMessage}, except that the socket is closed right after the message has been sent
+     * using <a href="https://nodejs.org/api/net.html#net_socket_end_data_encoding">net.end()</a>.
+     * No more messages can be sent from either the server or client through this socket.
+     * @param message the message to send
+     * @param callback will be called after the message has been sent
+     */
+    sendEndMessage(message: any, callback: (err: Error) => void): void;
+}
+
+export = JsonSocket;
diff --git a/json-socket/json-socket-tests.ts b/json-socket/json-socket-tests.ts
new file mode 100644
index 0000000000..f8a4a4a1a7
--- /dev/null
+++ b/json-socket/json-socket-tests.ts
@@ -0,0 +1,12 @@
+
+import JsonSocket = require("json-socket");
+import {Socket} from "net";
+
+JsonSocket.sendSingleMessage(42, "localhost", {foo: "bar"}, (err: Error) => {});
+JsonSocket.sendSingleMessageAndReceive(42, "localhost", {foo: "bar"}, (err: Error, message: any) => {});
+
+let jsonSocket = new JsonSocket(new Socket());
+jsonSocket.sendMessage({foo: "bar"}, (err: Error) => {});
+jsonSocket.sendEndMessage({foo: "bar"}, (err: Error) => {});
+jsonSocket.sendError(new Error("foo"), (err: Error) => {});
+jsonSocket.sendEndError(new Error("foo"), (err: Error) => {});
diff --git a/json-socket/tsconfig.json b/json-socket/tsconfig.json
new file mode 100644
index 0000000000..03bfe98795
--- /dev/null
+++ b/json-socket/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "json-socket-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/json-stable-stringify/index.d.ts b/json-stable-stringify/index.d.ts
new file mode 100644
index 0000000000..79402210f3
--- /dev/null
+++ b/json-stable-stringify/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for json-stable-stringify 1.0.0
+// Project: https://github.com/substack/json-stable-stringify
+// Definitions by: Matt Frantz <https://github.com/mhfrantz/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare function stringify(obj: any, opts?: stringify.Comparator | stringify.Options): string;
+
+declare namespace stringify {
+
+    interface Element {
+        key: string;
+        value: any;
+    }
+
+    interface Comparator {
+        (a: Element, b: Element): number;
+    }
+
+    interface Replacer {
+        (key: string, value: any): any;
+    }
+
+    interface Options {
+        cmp?: Comparator;
+        space?: number | string;
+        replacer?: Replacer;
+    }
+}
+
+export = stringify;
diff --git a/json-stable-stringify/json-stable-stringify-tests.ts b/json-stable-stringify/json-stable-stringify-tests.ts
index f28fb88e66..dfd2ced587 100644
--- a/json-stable-stringify/json-stable-stringify-tests.ts
+++ b/json-stable-stringify/json-stable-stringify-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="json-stable-stringify.d.ts"/>
-
 import stringify = require('json-stable-stringify');
 
 var obj = { c: 8, b: [{z:6,y:5,x:4},7], a: 3 };
diff --git a/json-stable-stringify/json-stable-stringify.d.ts b/json-stable-stringify/json-stable-stringify.d.ts
deleted file mode 100644
index eafc8bd899..0000000000
--- a/json-stable-stringify/json-stable-stringify.d.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// Type definitions for json-stable-stringify 1.0.0
-// Project: https://github.com/substack/json-stable-stringify
-// Definitions by: Matt Frantz <https://github.com/mhfrantz/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'json-stable-stringify' {
-
-  function stringify(obj: any, opts?: stringify.Comparator | stringify.Options): string;
-
-  namespace stringify {
-
-    interface Element {
-      key: string;
-      value: any;
-    }
-
-    interface Comparator {
-      (a: Element, b: Element): number;
-    }
-
-    interface Replacer {
-      (key: string, value: any): any;
-    }
-
-    interface Options {
-      cmp?: Comparator;
-      space?: number | string;
-      replacer?: Replacer;
-    }
-  }
-
-  export = stringify;
-}
diff --git a/json-stable-stringify/tsconfig.json b/json-stable-stringify/tsconfig.json
new file mode 100644
index 0000000000..c57257c014
--- /dev/null
+++ b/json-stable-stringify/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "json-stable-stringify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/json5/index.d.ts b/json5/index.d.ts
new file mode 100644
index 0000000000..76a0352616
--- /dev/null
+++ b/json5/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for JSON5
+// Project: http://json5.org/
+// Definitions by: Jason Swearingen <https://jasonswearingen.github.io>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+//commonjs loader
+
+/** 
+ * The following is the exact list of additions to JSON's syntax introduced by JSON5. All of these are optional, and all of these come from ES5.
+
+Objects
+
+Object keys can be unquoted if they're valid identifiers. Yes, even reserved keywords (like default) are valid unquoted keys in ES5 [§11.1.5, §7.6]. (More info)
+
+(TODO: Unicode characters and escape sequences aren’t yet supported in this implementation.)
+
+Objects can have trailing commas.
+
+Arrays
+
+Arrays can have trailing commas.
+Strings
+
+Strings can be single-quoted.
+
+Strings can be split across multiple lines; just prefix each newline with a backslash. [ES5 §7.8.4]
+
+Numbers
+
+Numbers can be hexadecimal (base 16).
+
+Numbers can begin or end with a (leading or trailing) decimal point.
+
+Numbers can include Infinity, -Infinity, NaN, and -NaN.
+
+Numbers can begin with an explicit plus sign.
+
+Comments
+
+Both inline (single-line) and block (multi-line) comments are allowed.
+  */
+declare var json5: JSON;
+export = json5;
diff --git a/json5/json5-tests.ts b/json5/json5-tests.ts
index da945c3413..f1be5b1038 100644
--- a/json5/json5-tests.ts
+++ b/json5/json5-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="json5.d.ts" />
+
 import JSON5 = require('json5');
 
 var obj = JSON5.parse("{ key:'val', 'key2':[0,1,2,] } //comment ");
diff --git a/json5/json5.d.ts b/json5/json5.d.ts
deleted file mode 100644
index c1dac8622d..0000000000
--- a/json5/json5.d.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-// Type definitions for JSON5
-// Project: http://json5.org/
-// Definitions by: Jason Swearingen <https://jasonswearingen.github.io>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-//commonjs loader
-declare module "json5" {
-	/** 
-	 * The following is the exact list of additions to JSON's syntax introduced by JSON5. All of these are optional, and all of these come from ES5.
-
-Objects
-
-Object keys can be unquoted if they're valid identifiers. Yes, even reserved keywords (like default) are valid unquoted keys in ES5 [§11.1.5, §7.6]. (More info)
-
-(TODO: Unicode characters and escape sequences aren’t yet supported in this implementation.)
-
-Objects can have trailing commas.
-
-Arrays
-
-Arrays can have trailing commas.
-Strings
-
-Strings can be single-quoted.
-
-Strings can be split across multiple lines; just prefix each newline with a backslash. [ES5 §7.8.4]
-
-Numbers
-
-Numbers can be hexadecimal (base 16).
-
-Numbers can begin or end with a (leading or trailing) decimal point.
-
-Numbers can include Infinity, -Infinity, NaN, and -NaN.
-
-Numbers can begin with an explicit plus sign.
-
-Comments
-
-Both inline (single-line) and block (multi-line) comments are allowed.
-	  */
-    var json5: JSON;
-    export = json5;
-}
\ No newline at end of file
diff --git a/json5/tsconfig.json b/json5/tsconfig.json
new file mode 100644
index 0000000000..f2e2444caf
--- /dev/null
+++ b/json5/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "json5-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jsoneditoronline/jsoneditoronline.d.ts b/jsoneditoronline/index.d.ts
similarity index 100%
rename from jsoneditoronline/jsoneditoronline.d.ts
rename to jsoneditoronline/index.d.ts
diff --git a/jsoneditoronline/jsoneditoronline-tests.ts b/jsoneditoronline/jsoneditoronline-tests.ts
index e390fc6a79..ecb37b595a 100644
--- a/jsoneditoronline/jsoneditoronline-tests.ts
+++ b/jsoneditoronline/jsoneditoronline-tests.ts
@@ -1,5 +1,4 @@
 // Tests for JSONEditorOnline type definitions
-///<reference path="jsoneditoronline.d.ts" />
 
 var container: HTMLElement;
 
@@ -10,7 +9,7 @@ var editor:JSONEditor = new JSONEditor(container, options);
 var json = {
     "Array": [1, 2, 3],
     "Boolean": true, 
-    "Null": null, 
+    "Null": <any>null, 
     "Number": 123, 
     "Object": {"a": "b", "c": "d"},
     "String": "Hello World"
@@ -28,7 +27,7 @@ var formatter: JSONFormatter = new JSONFormatter(container, options);
 var json2 = {
     "Array": [1, 2, 3],
     "Boolean": true, 
-    "Null": null, 
+    "Null": <any>null, 
     "Number": 123, 
     "Object": {"a": "b", "c": "d"},
     "String": "Hello World"
diff --git a/jsoneditoronline/jsoneditoronline-tests.ts.tscparams b/jsoneditoronline/jsoneditoronline-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jsoneditoronline/jsoneditoronline-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jsoneditoronline/jsoneditoronline.d.ts.tscparams b/jsoneditoronline/jsoneditoronline.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jsoneditoronline/jsoneditoronline.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jsoneditoronline/tsconfig.json b/jsoneditoronline/tsconfig.json
new file mode 100644
index 0000000000..cea6345e29
--- /dev/null
+++ b/jsoneditoronline/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsoneditoronline-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jsonpath/index.d.ts b/jsonpath/index.d.ts
new file mode 100644
index 0000000000..e691f860e1
--- /dev/null
+++ b/jsonpath/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for jsonpath 0.1.3
+// Project: https://www.npmjs.org/package/jsonpath
+// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+type PathComponent = string | number;
+
+export declare function query(obj: any, pathExpression: string): any[];
+export declare function paths(obj: any, pathExpression: string): PathComponent[][];
+export declare function nodes(obj: any, pathExpression: string): { path: PathComponent[]; value: any; }[];
+export declare function value(obj: any, pathExpression: string): any;
+export declare function value(obj: any, pathExpression: string, newValue: any): any;
+export declare function parent(obj: any, pathExpression: string): any;
+export declare function apply(obj: any, pathExpression: string, fn: (x: any) => any): { path: PathComponent[]; value: any; }[];
+export declare function parse(pathExpression: string): any[];
+export declare function stringify(path: PathComponent[]): string;
diff --git a/jsonpath/jsonpath-tests.ts b/jsonpath/jsonpath-tests.ts
index d7fd50868a..770258a94f 100644
--- a/jsonpath/jsonpath-tests.ts
+++ b/jsonpath/jsonpath-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="jsonpath.d.ts" />
 
 import jp = require('jsonpath');
 
diff --git a/jsonpath/jsonpath.d.ts b/jsonpath/jsonpath.d.ts
deleted file mode 100644
index e80f536187..0000000000
--- a/jsonpath/jsonpath.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Type definitions for jsonpath 0.1.3
-// Project: https://www.npmjs.org/package/jsonpath
-// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "jsonpath" {
-
-  type PathComponent = string|number;
-
-  export function query(obj: any, pathExpression: string): any[];
-  export function paths(obj: any, pathExpression: string): PathComponent[][];
-  export function nodes(obj: any, pathExpression: string): { path: PathComponent[]; value: any; }[];
-  export function value(obj: any, pathExpression: string): any;
-  export function value(obj: any, pathExpression: string, newValue: any): any;
-  export function parent(obj: any, pathExpression: string): any;
-  export function apply(obj: any, pathExpression: string, fn: (x: any) => any): { path: PathComponent[]; value: any; }[];
-  export function parse(pathExpression: string): any[];
-  export function stringify(path: PathComponent[]): string;
-
-}
-
diff --git a/jsonpath/tsconfig.json b/jsonpath/tsconfig.json
new file mode 100644
index 0000000000..b1d763c233
--- /dev/null
+++ b/jsonpath/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsonpath-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jsonwebtoken/index.d.ts b/jsonwebtoken/index.d.ts
new file mode 100644
index 0000000000..3ce4c37ff5
--- /dev/null
+++ b/jsonwebtoken/index.d.ts
@@ -0,0 +1,113 @@
+// Type definitions for jsonwebtoken 5.7.0
+// Project: https://github.com/auth0/node-jsonwebtoken
+// Definitions by: Maxime LUCE <https://github.com/SomaticIT>, Daniel Heim <https://github.com/danielheim>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+export interface SignOptions {
+    /**
+     * Signature algorithm. Could be one of these values :
+     * - HS256:    HMAC using SHA-256 hash algorithm
+     * - HS384:    HMAC using SHA-384 hash algorithm
+     * - HS512:    HMAC using SHA-512 hash algorithm
+     * - RS256:    RSASSA using SHA-256 hash algorithm
+     * - RS384:    RSASSA using SHA-384 hash algorithm
+     * - RS512:    RSASSA using SHA-512 hash algorithm
+     * - ES256:    ECDSA using P-256 curve and SHA-256 hash algorithm
+     * - ES384:    ECDSA using P-384 curve and SHA-384 hash algorithm
+     * - ES512:    ECDSA using P-521 curve and SHA-512 hash algorithm
+     * - none:     No digital signature or MAC value included
+     */
+    algorithm?: string;
+    /**
+     *@deprecated - see expiresIn
+     *@member {number} - Lifetime for the token in minutes
+     */
+    expiresInMinutes?: number;
+    /** @member {string} - Lifetime for the token expressed in a string describing a time span [rauchg/ms](https://github.com/rauchg/ms.js). Eg: `60`, `"2 days"`, `"10h"`, `"7d"` */
+    expiresIn?: string;
+    notBefore?: string;
+    audience?: string;
+    subject?: string;
+    issuer?: string;
+    jwtid?: string;
+    noTimestamp?: boolean;
+    headers?: Object;
+}
+
+export interface VerifyOptions {
+    algorithms?: string[];
+    audience?: string;
+    issuer?: string;
+    ignoreExpiration?: boolean;
+    ignoreNotBefore?: boolean;
+    subject?: string;
+    /**
+     *@deprecated
+     *@member {string} - Max age of token
+     */
+    maxAge?: string;
+}
+
+export interface DecodeOptions {
+    complete?: boolean;
+    json?: boolean;
+}
+
+export interface VerifyCallback {
+    (err: Error, decoded: any): void;
+}
+
+export interface SignCallback {
+    (encoded: string): void;
+}
+
+/**
+ * Synchronously sign the given payload into a JSON Web Token string
+ * @param {String|Object|Buffer} payload - Payload to sign, could be an literal, buffer or string
+ * @param {String|Buffer} secretOrPrivateKey - Either the secret for HMAC algorithms, or the PEM encoded private key for RSA and ECDSA.
+ * @param {SignOptions} [options] - Options for the signature
+ * @returns {String} The JSON Web Token string
+ */
+export declare function sign(payload: string | Buffer | Object, secretOrPrivateKey: string | Buffer, options?: SignOptions): string;
+
+/**
+ * Sign the given payload into a JSON Web Token string
+ * @param {String|Object|Buffer} payload - Payload to sign, could be an literal, buffer or string
+ * @param {String|Buffer} secretOrPrivateKey - Either the secret for HMAC algorithms, or the PEM encoded private key for RSA and ECDSA.
+ * @param {SignOptions} [options] - Options for the signature
+ * @param {Function} callback - Callback to get the encoded token on
+ */
+export declare function sign(payload: string | Buffer | Object, secretOrPrivateKey: string | Buffer, callback: SignCallback): void;
+export declare function sign(payload: string | Buffer | Object, secretOrPrivateKey: string | Buffer, options: SignOptions, callback: SignCallback): void;
+
+/**
+ * Synchronously verify given token using a secret or a public key to get a decoded token
+ * @param {String} token - JWT string to verify
+ * @param {String|Buffer} secretOrPublicKey - Either the secret for HMAC algorithms, or the PEM encoded public key for RSA and ECDSA.
+ * @param {VerifyOptions} [options] - Options for the verification
+ * @returns The decoded token.
+ */
+declare function verify(token: string, secretOrPublicKey: string | Buffer): any;
+declare function verify(token: string, secretOrPublicKey: string | Buffer, options?: VerifyOptions): any;
+
+/**
+ * Asynchronously verify given token using a secret or a public key to get a decoded token
+ * @param {String} token - JWT string to verify
+ * @param {String|Buffer} secretOrPublicKey - Either the secret for HMAC algorithms, or the PEM encoded public key for RSA and ECDSA.
+ * @param {VerifyOptions} [options] - Options for the verification
+ * @param {Function} callback - Callback to get the decoded token on
+ */
+declare function verify(token: string, secretOrPublicKey: string | Buffer, callback?: VerifyCallback): void;
+declare function verify(token: string, secretOrPublicKey: string | Buffer, options?: VerifyOptions, callback?: VerifyCallback): void;
+
+/**
+ * Returns the decoded payload without verifying if the signature is valid.
+ * @param {String} token - JWT string to decode
+ * @param {DecodeOptions} [options] - Options for decoding
+ * @returns {Object} The decoded Token
+ */
+declare function decode(token: string, options?: DecodeOptions): any;
diff --git a/jsonwebtoken/jsonwebtoken-tests.ts b/jsonwebtoken/jsonwebtoken-tests.ts
index d7ac4c8e2b..404e5e6248 100644
--- a/jsonwebtoken/jsonwebtoken-tests.ts
+++ b/jsonwebtoken/jsonwebtoken-tests.ts
@@ -4,8 +4,7 @@
  * Created by using code samples from https://github.com/auth0/node-jsonwebtoken.
  */ 
  
-/// <reference path="../node/node.d.ts" /> 
-/// <reference path="jsonwebtoken.d.ts" />
+/// <reference types="node" /> 
 
 import jwt = require("jsonwebtoken");
 import fs = require("fs");
diff --git a/jsonwebtoken/jsonwebtoken.d.ts b/jsonwebtoken/jsonwebtoken.d.ts
deleted file mode 100644
index bddb01226b..0000000000
--- a/jsonwebtoken/jsonwebtoken.d.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-// Type definitions for jsonwebtoken 5.7.0
-// Project: https://github.com/auth0/node-jsonwebtoken
-// Definitions by: Maxime LUCE <https://github.com/SomaticIT>, Daniel Heim <https://github.com/danielheim>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "jsonwebtoken" {
-
-    export interface SignOptions {
-        /**
-         * Signature algorithm. Could be one of these values :
-         * - HS256:    HMAC using SHA-256 hash algorithm
-         * - HS384:    HMAC using SHA-384 hash algorithm
-         * - HS512:    HMAC using SHA-512 hash algorithm
-         * - RS256:    RSASSA using SHA-256 hash algorithm
-         * - RS384:    RSASSA using SHA-384 hash algorithm
-         * - RS512:    RSASSA using SHA-512 hash algorithm
-         * - ES256:    ECDSA using P-256 curve and SHA-256 hash algorithm
-         * - ES384:    ECDSA using P-384 curve and SHA-384 hash algorithm
-         * - ES512:    ECDSA using P-521 curve and SHA-512 hash algorithm
-         * - none:     No digital signature or MAC value included
-         */
-        algorithm?: string;
-        /**
-         *@deprecated - see expiresIn
-         *@member {number} - Lifetime for the token in minutes
-         */
-        expiresInMinutes?: number;
-        /** @member {string} - Lifetime for the token expressed in a string describing a time span [rauchg/ms](https://github.com/rauchg/ms.js). Eg: `60`, `"2 days"`, `"10h"`, `"7d"` */
-        expiresIn?: string;
-        notBefore?: string;
-        audience?: string;
-        subject?: string;
-        issuer?: string;
-        jwtid?: string;
-        noTimestamp?: boolean;
-        headers?: Object;
-    }
-
-    export interface VerifyOptions {
-        algorithms?: string[];
-        audience?: string;
-        issuer?: string;
-        ignoreExpiration?: boolean;
-        ignoreNotBefore?: boolean;
-        subject?: string;
-        /**
-         *@deprecated
-         *@member {string} - Max age of token
-         */
-        maxAge?: string;
-    }
-
-    export interface DecodeOptions {
-      complete?: boolean;
-      json?: boolean;
-    }
-
-    export interface VerifyCallback {
-        (err: Error, decoded: any): void;
-    }
-
-    export interface SignCallback {
-        (encoded: string): void;
-    }
-
-    /**
-     * Synchronously sign the given payload into a JSON Web Token string
-     * @param {String|Object|Buffer} payload - Payload to sign, could be an literal, buffer or string
-     * @param {String|Buffer} secretOrPrivateKey - Either the secret for HMAC algorithms, or the PEM encoded private key for RSA and ECDSA.
-     * @param {SignOptions} [options] - Options for the signature
-     * @returns {String} The JSON Web Token string
-     */
-    export function sign(payload: string | Buffer | Object, secretOrPrivateKey: string | Buffer, options?: SignOptions): string;
-
-    /**
-     * Sign the given payload into a JSON Web Token string
-     * @param {String|Object|Buffer} payload - Payload to sign, could be an literal, buffer or string
-     * @param {String|Buffer} secretOrPrivateKey - Either the secret for HMAC algorithms, or the PEM encoded private key for RSA and ECDSA.
-     * @param {SignOptions} [options] - Options for the signature
-     * @param {Function} callback - Callback to get the encoded token on
-     */
-    export function sign(payload: string | Buffer | Object, secretOrPrivateKey: string | Buffer, callback: SignCallback): void;
-    export function sign(payload: string | Buffer | Object, secretOrPrivateKey: string | Buffer, options: SignOptions, callback: SignCallback): void;
-
-    /**
-     * Synchronously verify given token using a secret or a public key to get a decoded token
-     * @param {String} token - JWT string to verify
-     * @param {String|Buffer} secretOrPublicKey - Either the secret for HMAC algorithms, or the PEM encoded public key for RSA and ECDSA.
-     * @param {VerifyOptions} [options] - Options for the verification
-     * @returns The decoded token.
-     */
-    function verify(token: string, secretOrPublicKey: string | Buffer): any;
-    function verify(token: string, secretOrPublicKey: string | Buffer, options?: VerifyOptions): any;
-
-    /**
-     * Asynchronously verify given token using a secret or a public key to get a decoded token
-     * @param {String} token - JWT string to verify
-     * @param {String|Buffer} secretOrPublicKey - Either the secret for HMAC algorithms, or the PEM encoded public key for RSA and ECDSA.
-     * @param {VerifyOptions} [options] - Options for the verification
-     * @param {Function} callback - Callback to get the decoded token on
-     */
-    function verify(token: string, secretOrPublicKey: string | Buffer, callback?: VerifyCallback): void;
-    function verify(token: string, secretOrPublicKey: string | Buffer, options?: VerifyOptions, callback?: VerifyCallback): void;
-
-    /**
-     * Returns the decoded payload without verifying if the signature is valid.
-     * @param {String} token - JWT string to decode
-     * @param {DecodeOptions} [options] - Options for decoding
-     * @returns {Object} The decoded Token
-     */
-    function decode(token: string, options?: DecodeOptions): any;
-}
diff --git a/jsonwebtoken/tsconfig.json b/jsonwebtoken/tsconfig.json
new file mode 100644
index 0000000000..2cdd39365b
--- /dev/null
+++ b/jsonwebtoken/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsonwebtoken-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jspdf/jspdf.d.ts b/jspdf/index.d.ts
similarity index 100%
rename from jspdf/jspdf.d.ts
rename to jspdf/index.d.ts
diff --git a/jspdf/jspdf-tests.ts b/jspdf/jspdf-tests.ts
index 385eb7fc4a..35eba3e224 100644
--- a/jspdf/jspdf-tests.ts
+++ b/jspdf/jspdf-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jspdf.d.ts" />
+
 
 // From: https://mrrio.github.io/jsPDF/examples/basic.html
 
diff --git a/jspdf/tsconfig.json b/jspdf/tsconfig.json
new file mode 100644
index 0000000000..2e077d9ed9
--- /dev/null
+++ b/jspdf/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jspdf-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jsplumb/index.d.ts b/jsplumb/index.d.ts
new file mode 100644
index 0000000000..f5978eca37
--- /dev/null
+++ b/jsplumb/index.d.ts
@@ -0,0 +1,131 @@
+// Type definitions for jsPlumb 1.3.16 jQuery adapter
+// Project: http://jsplumb.org
+// Definitions by: Steve Shearn <https://github.com/shearnie/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+declare var jsPlumb: jsPlumbInstance;
+
+interface jsPlumbInstance {
+	setRenderMode(renderMode: string): string;
+	bind(event: string, callback: (e: any) => void ): void;
+	unbind(event?: string): void;
+	ready(callback: () => void): void;
+	importDefaults(defaults: Defaults): void;
+	Defaults: Defaults;
+	restoreDefaults(): void;
+	addClass(el: any, clazz: string): void;
+	addEndpoint(ep: string): any;
+	removeClass(el: any, clazz: string): void;
+	hasClass(el: any, clazz: string): void;
+    	draggable(el: string, options?: DragOptions): jsPlumbInstance;
+    	draggable(ids: string[], options?: DragOptions): jsPlumbInstance;
+    	connect(connection: ConnectParams, referenceParams?: ConnectParams): Connection;
+    	makeSource(el: string, options: SourceOptions): void;
+    	makeTarget(el: string, options: TargetOptions): void;
+    	repaintEverything(): void;
+    	detachEveryConnection(): void;
+	detachAllConnections(el: string): void;
+    	removeAllEndpoints(el: string, recurse?: boolean): jsPlumbInstance;
+    	removeAllEndpoints(el: Element, recurse?: boolean): jsPlumbInstance;
+    	select(params: SelectParams): Connections;
+    	getConnections(options?: any, flat?: any): any[];
+    	deleteEndpoint(uuid: string, doNotRepaintAfterwards?: boolean): jsPlumbInstance;
+    	deleteEndpoint(endpoint: Endpoint, doNotRepaintAfterwards?: boolean): jsPlumbInstance;
+    	repaint(el: string): jsPlumbInstance;
+    	repaint(el: Element): jsPlumbInstance;
+    	getInstance(): jsPlumbInstance;
+	getInstance(defaults: Defaults): jsPlumbInstance;
+	getInstanceIndex(): number;
+	
+    SVG: string;
+    CANVAS: string;
+    VML: string;
+}
+
+interface Defaults {
+	Endpoint?: any[];
+	PaintStyle?: PaintStyle;
+	HoverPaintStyle?: PaintStyle;
+	ConnectionsDetachable?: boolean;
+	ReattachConnections?: boolean;
+	ConnectionOverlays?: any[][];
+    Container?: any; // string(selector or id) or element
+    DragOptions?: DragOptions;
+}
+
+interface PaintStyle {
+	strokeStyle: string;
+	lineWidth: number;
+}
+
+interface ArrowOverlay {
+	location: number;
+	id: string;
+	length: number;
+	foldback: number;
+}
+
+interface LabelOverlay {
+	label: string;
+	id: string;
+	location: number;
+}
+
+interface Connections {
+	detach(): void;
+	length: number;
+}
+
+interface ConnectParams {
+    source?: any; // string, element or endpoint
+    target?: any; // string, element or endpoint
+	detachable?: boolean;
+	deleteEndpointsOnDetach?: boolean;
+	endPoint?: string;
+	anchor?: string;
+	anchors?: any[];
+	label?: string;
+}
+
+interface DragOptions {
+	containment?: string;
+}
+
+interface SourceOptions {
+	parent: string;
+	endpoint?: string;
+	anchor?: string;
+	connector?: any[];
+	connectorStyle?: PaintStyle;
+}
+
+interface TargetOptions {
+	isTarget?: boolean;
+	maxConnections?: number;
+	uniqueEndpoint?: boolean;
+	deleteEndpointsOnDetach?: boolean;
+	endpoint?: string;
+	dropOptions?: DropOptions;
+	anchor?: any;
+}
+
+interface DropOptions {
+	hoverClass: string;
+}
+
+interface SelectParams {
+	scope?: string;
+	source: string;
+	target: string;
+}
+
+interface Connection {
+    setDetachable(detachable: boolean): void;
+    setParameter<T>(name: string, value: T): void;
+    endpoints: Endpoint[];
+}
+
+interface Endpoint {
+}
diff --git a/jsplumb/jquery.jsPlumb.d.ts b/jsplumb/jquery.jsPlumb.d.ts
deleted file mode 100644
index ab69dda1de..0000000000
--- a/jsplumb/jquery.jsPlumb.d.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-// Type definitions for jsPlumb 1.3.16 jQuery adapter
-// Project: http://jsplumb.org
-// Definitions by: Steve Shearn <https://github.com/shearnie/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-declare var jsPlumb: jsPlumbInstance;
-
-interface jsPlumbInstance {
-	setRenderMode(renderMode: string): string;
-	bind(event: string, callback: (e) => void ): void;
-	unbind(event?: string): void;
-	ready(callback: () => void): void;
-	importDefaults(defaults: Defaults): void;
-	Defaults: Defaults;
-	restoreDefaults(): void;
-	addClass(el: any, clazz: string): void;
-	addEndpoint(ep: string): any;
-	removeClass(el: any, clazz: string): void;
-	hasClass(el: any, clazz: string): void;
-    	draggable(el: string, options?: DragOptions): jsPlumbInstance;
-    	draggable(ids: string[], options?: DragOptions): jsPlumbInstance;
-    	connect(connection: ConnectParams, referenceParams?: ConnectParams): Connection;
-    	makeSource(el: string, options: SourceOptions): void;
-    	makeTarget(el: string, options: TargetOptions): void;
-    	repaintEverything(): void;
-    	detachEveryConnection(): void;
-	detachAllConnections(el: string): void;
-    	removeAllEndpoints(el: string, recurse?: boolean): jsPlumbInstance;
-    	removeAllEndpoints(el: Element, recurse?: boolean): jsPlumbInstance;
-    	select(params: SelectParams): Connections;
-    	getConnections(options?: any, flat?: any): any[];
-    	deleteEndpoint(uuid: string, doNotRepaintAfterwards?: boolean): jsPlumbInstance;
-    	deleteEndpoint(endpoint: Endpoint, doNotRepaintAfterwards?: boolean): jsPlumbInstance;
-    	repaint(el: string): jsPlumbInstance;
-    	repaint(el: Element): jsPlumbInstance;
-    	getInstance(): jsPlumbInstance;
-	getInstance(defaults: Defaults): jsPlumbInstance;
-	getInstanceIndex(): number;
-	
-    SVG: string;
-    CANVAS: string;
-    VML: string;
-}
-
-interface Defaults {
-	Endpoint?: any[];
-	PaintStyle?: PaintStyle;
-	HoverPaintStyle?: PaintStyle;
-	ConnectionsDetachable?: boolean;
-	ReattachConnections?: boolean;
-	ConnectionOverlays?: any[][];
-    Container?: any; // string(selector or id) or element
-    DragOptions?: DragOptions;
-}
-
-interface PaintStyle {
-	strokeStyle: string;
-	lineWidth: number;
-}
-
-interface ArrowOverlay {
-	location: number;
-	id: string;
-	length: number;
-	foldback: number;
-}
-
-interface LabelOverlay {
-	label: string;
-	id: string;
-	location: number;
-}
-
-interface Connections {
-	detach(): void;
-	length: number;
-}
-
-interface ConnectParams {
-    source?: any; // string, element or endpoint
-    target?: any; // string, element or endpoint
-	detachable?: boolean;
-	deleteEndpointsOnDetach?: boolean;
-	endPoint?: string;
-	anchor?: string;
-	anchors?: any[];
-	label?: string;
-}
-
-interface DragOptions {
-	containment?: string;
-}
-
-interface SourceOptions {
-	parent: string;
-	endpoint?: string;
-	anchor?: string;
-	connector?: any[];
-	connectorStyle?: PaintStyle;
-}
-
-interface TargetOptions {
-	isTarget?: boolean;
-	maxConnections?: number;
-	uniqueEndpoint?: boolean;
-	deleteEndpointsOnDetach?: boolean;
-	endpoint?: string;
-	dropOptions?: DropOptions;
-	anchor?: any;
-}
-
-interface DropOptions {
-	hoverClass: string;
-}
-
-interface SelectParams {
-	scope?: string;
-	source: string;
-	target: string;
-}
-
-interface Connection {
-    setDetachable(detachable: boolean): void;
-    setParameter<T>(name: string, value: T): void;
-    endpoints: Endpoint[];
-}
-
-interface Endpoint {
-}
diff --git a/jsplumb/jquery.jsPlumb.d.ts.tscparams b/jsplumb/jquery.jsPlumb.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/jsplumb/jquery.jsPlumb.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jsplumb/tsconfig.json b/jsplumb/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/jsplumb/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jsrender/index.d.ts b/jsrender/index.d.ts
new file mode 100644
index 0000000000..240bbe0bf3
--- /dev/null
+++ b/jsrender/index.d.ts
@@ -0,0 +1,56 @@
+// Type definitions for JsRender
+// Project: http://www.jsviews.com/#jsrender
+// Definitions by: Kensuke Matsuzaki <https://github.com/zakki>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+declare namespace JsRender {
+    interface Converters {
+        (name: string, converterFn: (value: any) => any): any;
+        (namedConverters: any, parentTemplate?: any): any;
+
+        html(valueToEncode: string): string;
+        attr(valueToEncode: string): string;
+        url(valueToEncode: string): string;
+    }
+
+    interface Views {
+        converters: Converters;
+
+        tags(name: string, tagFn: (value: any) => any): any;
+        tags(name: string, tagOptions: any): any;
+        tags(namedTags: any): any;
+
+        helpers(name: string, helper: any): any;
+        helpers(namedHelpers: any, parentTemplate?: any): any;
+    }
+
+    interface Template {
+        render(data?: any): string;
+    }
+
+    interface NamedTemplate {
+        (data?: any): string;
+    }
+
+    interface Render {
+        (data?: any, helpersOrContext?: any): string;
+    }
+
+    interface RenderStatic {
+        [index: string]: NamedTemplate;
+    }
+}
+
+interface JQuery {
+    render: JsRender.Render;
+}
+
+interface JQueryStatic {
+    render: JsRender.RenderStatic;
+    views: JsRender.Views;
+    templates(markupOrSelector: string): JsRender.Template;
+    templates(name: string, markupOrSelector: string): JsRender.Template;
+    templates(namedTemplates: any): any;
+}
diff --git a/jsrender/jsrender-tests.ts b/jsrender/jsrender-tests.ts
index 048c327de0..d728f968ae 100644
--- a/jsrender/jsrender-tests.ts
+++ b/jsrender/jsrender-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="jsrender.d.ts"/>
+/// <reference types="jquery"/>
 
 $.views.converters("upper", function(val) {
   return val.toUpperCase();
diff --git a/jsrender/jsrender.d.ts b/jsrender/jsrender.d.ts
deleted file mode 100644
index a3ac30fa8f..0000000000
--- a/jsrender/jsrender.d.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-// Type definitions for JsRender
-// Project: http://www.jsviews.com/#jsrender
-// Definitions by: Kensuke Matsuzaki <https://github.com/zakki>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-declare namespace JsRender {
-    interface Converters {
-        (name: string, converterFn: (value: any) => any): any;
-        (namedConverters: any, parentTemplate?: any): any;
-
-        html(valueToEncode: string): string;
-        attr(valueToEncode: string): string;
-        url(valueToEncode: string): string;
-    }
-
-    interface Views {
-        converters: Converters;
-
-        tags(name: string, tagFn: (value: any) => any): any;
-        tags(name: string, tagOptions: any): any;
-        tags(namedTags: any): any;
-
-        helpers(name: string, helper: any): any;
-        helpers(namedHelpers: any, parentTemplate?: any): any;
-    }
-
-    interface Template {
-        render(data?: any): string;
-    }
-
-    interface NamedTemplate {
-        (data?: any): string;
-    }
-
-    interface Render {
-        (data?: any, helpersOrContext?: any): string;
-    }
-
-    interface RenderStatic {
-        [index: string]: NamedTemplate;
-    }
-}
-
-interface JQuery {
-    render: JsRender.Render;
-}
-
-interface JQueryStatic {
-    render: JsRender.RenderStatic;
-    views: JsRender.Views;
-    templates(markupOrSelector: string): JsRender.Template;
-    templates(name: string, markupOrSelector: string): JsRender.Template;
-    templates(namedTemplates: any): any;
-}
diff --git a/jsrender/tsconfig.json b/jsrender/tsconfig.json
new file mode 100644
index 0000000000..a2db4b15d3
--- /dev/null
+++ b/jsrender/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsrender-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jss/jss.d.ts b/jss/index.d.ts
similarity index 100%
rename from jss/jss.d.ts
rename to jss/index.d.ts
diff --git a/jss/jss-tests.ts b/jss/jss-tests.ts
index e5bde70be3..2863bbfb66 100644
--- a/jss/jss-tests.ts
+++ b/jss/jss-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jss.d.ts" />
+
 
 jss.set('.demo', {
     'font-size': '15px',
diff --git a/jss/tsconfig.json b/jss/tsconfig.json
new file mode 100644
index 0000000000..63e16fb2ca
--- /dev/null
+++ b/jss/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jss-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jssha/index.d.ts b/jssha/index.d.ts
new file mode 100644
index 0000000000..45d6686aed
--- /dev/null
+++ b/jssha/index.d.ts
@@ -0,0 +1,84 @@
+// Type definitions for jsSHA
+// Project: https://github.com/Caligatio/jsSHA
+// Definitions by: David Li <https://github.com/randombk>, Tobias Kahlert <https://github.com/SrTobi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare namespace jsSHA {
+
+    export interface EncodingOptions {
+        encoding? : string;
+    }
+
+    export interface Options extends EncodingOptions {
+        numRounds? : number;
+    }
+
+    export interface OutputFormatOptions {
+        outputUpper? : boolean;
+        b64Pad? : string;
+    }
+
+    export interface jsSHA {
+        /**
+         * jsSHA is the workhorse of the library.  Instantiate it with the string to
+         * be hashed as the parameter
+         *
+         * @param {string} variant The desired SHA variant (SHA-1, SHA-224, SHA-256,
+         *   SHA-384, or SHA-512)
+         * @param {string} inputFormat The format of srcString: HEX, TEXT, B64, or BYTES
+         * @param {{encoding: (string|undefined), numRounds: (string|undefined)}=}
+         *   options Optional values
+         */
+        new (variant:string, inputFormat:string, options?:Options):jsSHA;
+
+        /**
+		 * Sets the HMAC key for an eventual getHMAC call.  Must be called
+		 * immediately after jsSHA object instantiation
+		 *
+		 * @param {string} key The key used to calculate the HMAC
+		 * @param {string} inputFormat The format of key, HEX, TEXT, B64, or BYTES
+		 * @param {{encoding : (string|undefined)}=} encodingOpts Associative array
+		 *   of input format options
+		 */
+        setHMACKey(key:string, inputFormat:string, encodingOpts?:EncodingOptions):void;
+
+        /**
+		 * Takes strString and hashes as many blocks as possible.  Stores the
+		 * rest for either a future update or getHash call.
+		 *
+		 * @param {string} srcString The string to be hashed
+		 */
+        update(srcString:string):void;
+
+
+        /**
+		 * Returns the desired SHA hash of the string specified at instantiation
+		 * using the specified parameters
+		 *
+		 * @param {string} format The desired output formatting (B64, HEX, or BYTES)
+		 * @param {{outputUpper : (boolean|undefined), b64Pad : (string|undefined)}=}
+		 *   outputFormatOpts Hash list of output formatting options
+		 * @return {string} The string representation of the hash in the format
+		 *   specified
+		 */
+        getHash(format:string, outputFormatOpts?:OutputFormatOptions):string;
+
+        /**
+		 * Returns the the HMAC in the specified format using the key given by
+		 * a previous setHMACKey call.
+		 *
+		 * @param {string} format The desired output formatting
+		 *   (B64, HEX, or BYTES)
+		 * @param {{outputUpper : (boolean|undefined), b64Pad : (string|undefined)}=}
+		 *   outputFormatOpts associative array of output formatting options
+		 * @return {string} The string representation of the hash in the format
+		 *   specified
+		 */
+        getHMAC(format:string, outputFormatOpts?:OutputFormatOptions):string;
+    }
+}
+
+declare var jsSHA: jsSHA.jsSHA;
+export = jsSHA;
+export as namespace jsSHA;
diff --git a/jssha/jssha-1.6.0-tests.ts b/jssha/jssha-1.6.0-tests.ts
index 67e1ec026c..f0df88f7fe 100644
--- a/jssha/jssha-1.6.0-tests.ts
+++ b/jssha/jssha-1.6.0-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="jssha-1.6.0.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 var imported = require("jssha");
 
diff --git a/jssha/jssha-tests.ts b/jssha/jssha-tests.ts
index e5a83b14a8..a6869d6a22 100644
--- a/jssha/jssha-tests.ts
+++ b/jssha/jssha-tests.ts
@@ -1,14 +1,14 @@
-/// <reference path="jssha.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import imported = require("jssha");
 
 // constructor
-let shaObj1:jsSHA.jsSHA = new imported("SHA-512", "TEXT");
-let shaObj2:jsSHA.jsSHA = new imported("SHA-512", "TEXT", { });
-let shaObj3:jsSHA.jsSHA = new imported("SHA-512", "TEXT", { encoding: "UTF8" });
-let shaObj4:jsSHA.jsSHA = new imported("SHA-512", "TEXT", { numRounds: 1 });
-let shaObj5:jsSHA.jsSHA = new imported("SHA-512", "TEXT", { encoding: "UTF8", numRounds: 1 });
+let shaObj1 = new imported("SHA-512", "TEXT");
+let shaObj2 = new imported("SHA-512", "TEXT", { });
+let shaObj3 = new imported("SHA-512", "TEXT", { encoding: "UTF8" });
+let shaObj4 = new imported("SHA-512", "TEXT", { numRounds: 1 });
+let shaObj5 = new imported("SHA-512", "TEXT", { encoding: "UTF8", numRounds: 1 });
 
 // setHMACKey
 shaObj1.setHMACKey("key", "TEXT");
@@ -50,7 +50,7 @@ let hmac5:string = shaObj1.getHMAC("HEX", { outputUpper: true, b64Pad: '=' });
 
 // Browser global test
 {
-	var shaObj = new jsSHA("SHA-512", "TEXT");
+	var shaObj = new imported("SHA-512", "TEXT");
 	shaObj.update("This is a test");
 	var hash = shaObj.getHash("HEX");
 }
\ No newline at end of file
diff --git a/jssha/jssha.d.ts b/jssha/jssha.d.ts
deleted file mode 100644
index 18b41beebd..0000000000
--- a/jssha/jssha.d.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-// Type definitions for jsSHA
-// Project: https://github.com/Caligatio/jsSHA
-// Definitions by: David Li <https://github.com/randombk>, Tobias Kahlert <https://github.com/SrTobi>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-declare namespace jsSHA {
-
-    export interface EncodingOptions {
-        encoding? : string;
-    }
-
-    export interface Options extends EncodingOptions {
-        numRounds? : number;
-    }
-
-    export interface OutputFormatOptions {
-        outputUpper? : boolean;
-        b64Pad? : string;
-    }
-
-    export interface jsSHA {
-        /**
-         * jsSHA is the workhorse of the library.  Instantiate it with the string to
-         * be hashed as the parameter
-         *
-         * @param {string} variant The desired SHA variant (SHA-1, SHA-224, SHA-256,
-         *   SHA-384, or SHA-512)
-         * @param {string} inputFormat The format of srcString: HEX, TEXT, B64, or BYTES
-         * @param {{encoding: (string|undefined), numRounds: (string|undefined)}=}
-         *   options Optional values
-         */
-        new (variant:string, inputFormat:string, options?:Options):jsSHA;
-
-        /**
-		 * Sets the HMAC key for an eventual getHMAC call.  Must be called
-		 * immediately after jsSHA object instantiation
-		 *
-		 * @param {string} key The key used to calculate the HMAC
-		 * @param {string} inputFormat The format of key, HEX, TEXT, B64, or BYTES
-		 * @param {{encoding : (string|undefined)}=} encodingOpts Associative array
-		 *   of input format options
-		 */
-        setHMACKey(key:string, inputFormat:string, encodingOpts?:EncodingOptions):void;
-
-        /**
-		 * Takes strString and hashes as many blocks as possible.  Stores the
-		 * rest for either a future update or getHash call.
-		 *
-		 * @param {string} srcString The string to be hashed
-		 */
-        update(srcString:string):void;
-
-
-        /**
-		 * Returns the desired SHA hash of the string specified at instantiation
-		 * using the specified parameters
-		 *
-		 * @param {string} format The desired output formatting (B64, HEX, or BYTES)
-		 * @param {{outputUpper : (boolean|undefined), b64Pad : (string|undefined)}=}
-		 *   outputFormatOpts Hash list of output formatting options
-		 * @return {string} The string representation of the hash in the format
-		 *   specified
-		 */
-        getHash(format:string, outputFormatOpts?:OutputFormatOptions):string;
-
-        /**
-		 * Returns the the HMAC in the specified format using the key given by
-		 * a previous setHMACKey call.
-		 *
-		 * @param {string} format The desired output formatting
-		 *   (B64, HEX, or BYTES)
-		 * @param {{outputUpper : (boolean|undefined), b64Pad : (string|undefined)}=}
-		 *   outputFormatOpts associative array of output formatting options
-		 * @return {string} The string representation of the hash in the format
-		 *   specified
-		 */
-        getHMAC(format:string, outputFormatOpts?:OutputFormatOptions):string;
-    }
-}
-
-declare var jsSHA: jsSHA.jsSHA;
-declare module 'jssha' {
-    export = jsSHA;
-}
diff --git a/jssha/tsconfig.json b/jssha/tsconfig.json
new file mode 100644
index 0000000000..b7e026e40c
--- /dev/null
+++ b/jssha/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "jssha-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/jstorage/jstorage.d.ts b/jstorage/index.d.ts
similarity index 100%
rename from jstorage/jstorage.d.ts
rename to jstorage/index.d.ts
diff --git a/jstorage/jstorage-tests.ts b/jstorage/jstorage-tests.ts
index e86e9ffd43..9c2c54fe1e 100644
--- a/jstorage/jstorage-tests.ts
+++ b/jstorage/jstorage-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="jstorage.d.ts" />
+/// <reference types="jquery" />
+
 
 // Test set first overload
 var storedValue = $.jStorage.set("testObj", { foo: 'bar' });
diff --git a/jstorage/tsconfig.json b/jstorage/tsconfig.json
new file mode 100644
index 0000000000..d97b26ebc2
--- /dev/null
+++ b/jstorage/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jstorage-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jstree/index.d.ts b/jstree/index.d.ts
new file mode 100644
index 0000000000..b7af930fb2
--- /dev/null
+++ b/jstree/index.d.ts
@@ -0,0 +1,1822 @@
+// Type definitions for jsTree v3.0.9 
+// Project: http://www.jstree.com/
+// Definitions by: Adam Pluciński <https://github.com/adaskothebeast>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// 45 commit df38535 2015-03-02 13:23 +2:00
+
+///<reference types="jquery" />
+
+interface JQueryStatic {
+    /**
+    * holds all jstree related functions and variables, 
+    * including the actual class and methods to create, 
+    * access and manipulate instances.
+    * @property jstree
+    * @type {JSTreeStatic}
+    */
+    jstree?: JSTreeStatic;
+}
+
+interface JQuery {
+    /**
+     * Create an instance, get an instance or invoke a command on a instance. 
+     * 
+     * If there is no instance associated with the current node a new one is created 
+     * and `arg` is used to extend `$.jstree.defaults` for this new instance. There would be no return value (chaining is not broken).
+     * 
+     * If there is an existing instance and `arg` is a string the command specified by `arg` is executed on the instance, 
+     * with any additional arguments passed to the function. If the function returns a value it will be returned (chaining could break depending on function).
+     * 
+     * If there is an existing instance and `arg` is not a string the instance itself is returned (similar to `$.jstree.reference`).
+     * 
+     * In any other case - nothing is returned and chaining is not broken.
+     *
+     * __Examples__
+     *
+     *	$('#tree1').jstree(); // creates an instance
+     *	$('#tree2').jstree({ plugins : [] }); // create an instance with some options
+     *	$('#tree1').jstree('open_node', '#branch_1'); // call a method on an existing instance, passing additional arguments
+     *	$('#tree2').jstree(); // get an existing instance (or create an instance)
+     *	$('#tree2').jstree(true); // get an existing instance (will not create new instance)
+     *	$('#branch_1').jstree().select_node('#branch_1'); // get an instance (using a nested element and call a method)
+     *
+     * @name $().jstree([arg])
+     * @param {String|Object} arg
+     * @return {Mixed}
+     */
+    jstree(): JSTree;
+    jstree(options: JSTreeStaticDefaults): JSTree;
+    jstree(arg: boolean): JSTree;
+    jstree(...args: any[]): any;
+}
+
+interface JSTreeStatic {
+    /**
+     * specifies the jstree version in use
+     * @name $.jstree.version
+     */
+    version: string;
+
+    /**
+     * holds all the default options used when creating new instances
+     * @name $.jstree.defaults
+     */
+    defaults: JSTreeStaticDefaults;
+
+    /**
+    * stores all loaded jstree plugins (used internally)
+    */
+    plugins: any[];
+    path: string;
+    idregex: any;
+
+    /**
+     * creates a jstree instance
+     * @name $.jstree.create(el [, options])
+     * @param {DOMElement|jQuery|String} el the element to create the instance on, can be jQuery extended or a selector
+     * @param {Object} options options for this instance (extends `$.jstree.defaults`)
+     * @return {jsTree} the new instance
+     */
+    create(el: any, options?: JSTreeStaticDefaults): JSTree;
+
+    /**
+     * remove all traces of jstree from the DOM and destroy all instances
+     * @name $.jstree.destroy()
+     */
+    destroy(): void;
+
+    /**
+     * the jstree class constructor, used only internally
+     * @private
+     * @name $.jstree.core(id)
+     * @param {Number} id this instance's index
+     */
+    core(id: number): void;
+
+    /**
+    * get a reference to an existing instance
+    * 
+    * __Examples__
+    *
+    * $.jstree.reference('tree');
+    * $.jstree.reference('#tree');
+    * $.jstree.reference('branch');
+    * $.jstree.reference('#branch');
+    *
+    * @param {String} selector 
+    * @returns {JSTree|null} the instance or `null` if not found
+    */
+    reference(selector: string): JSTree;
+
+    /**
+    * get a reference to an existing instance
+    * 
+    * __Examples__
+    *
+    * $.jstree.reference(document.getElementByID('tree'));
+    * $.jstree.reference(document.getElementByID('branch'));
+    *
+    * @param {HTMLElement} element 
+    * @returns {JSTree|null} the instance or `null` if not found
+    */
+    reference(element: HTMLElement): JSTree;
+
+    /**
+    * get a reference to an existing instance
+    * 
+    * __Examples__
+    *
+    * $.jstree.reference($('#tree'));
+    * $.jstree.reference($('#branch'));
+    *
+    * @param {JQuery} object 
+    * @returns {JSTree|null} the instance or `null` if not found
+    */
+    reference(object: JQuery): JSTree;
+}
+
+interface JSTreeStaticDefaults {
+    /**
+     * configure which plugins will be active on an instance.
+     * Should be an array of strings, where each element is a plugin name.
+     * The default is `[]`
+     * @name $.jstree.defaults.plugins
+     */
+    plugins: string[];
+
+    /**
+     * stores all defaults for the core
+     * @name $.jstree.defaults.core
+     */
+    core: JSTreeStaticDefaultsCore;
+
+    /**
+    * stores all defaults for the checkbox plugin
+    */
+    checkbox?: JSTreeStaticDefaultsCheckbox;
+
+    /**
+    * stores all defaults for the contextmenu plugin
+    */
+    contextmenu?: JSTreeStaticDefaultsContextMenu;
+
+    /**
+    * stores all defaults for the drag'n'drop plugin
+    */
+    dnd?: JSTreeStaticDefaultsDragNDrop;
+
+    /**
+     * Adds massload functionality to jsTree, so that multiple nodes can be loaded in a single request (only useful with lazy loading).
+     */
+    massload?: JSTreeStaticDefaultsMassload;
+
+    /**
+    * stores all defaults for the search plugin
+    */
+    search?: JSTreeStaticDefaultsSearch;
+
+    /**
+     * the settings function used to sort the nodes.
+     * It is executed in the tree's context, accepts two nodes as arguments and should return `1` or `-1`.
+     * @name $.jstree.defaults.sort
+     * @plugin sort
+     */
+    sort?: (x: any, y: any) => number;
+
+    /**
+    * stores all defaults for the state plugin
+    */
+    state?: JSTreeStaticDefaultsState;
+
+    /**
+    * An object storing all types as key value pairs,
+    * where the key is the type name and the value is an object 
+    * that could contain following keys (all optional).
+    * max_children the maximum number of immediate children this node type can have.
+    * Do not specify or set to -1 for unlimited.
+    * max_depth the maximum number of nesting this node type can have. 
+    * A value of 1 would mean that the node can have children, but no grandchildren. 
+    * Do not specify or set to -1 for unlimited.
+    * valid_children an array of node type strings, that nodes of this type can have as children. 
+    * Do not specify or set to -1 for no limits.
+    * icon a string - can be a path to an icon or a className, if using an image 
+    * that is in the current directory use a ./ prefix, otherwise it will be detected as a class. 
+    * Omit to use the default icon from your theme.
+    * There are two predefined types:
+    * # represents the root of the tree, for example max_children would control the maximum number of root nodes.
+    * default represents the default node - any settings here will be applied to all nodes that do not have a type specified.
+    */
+    types?: any;
+
+    /**
+    * stores all defaults for the unique plugin
+    * @name $.jstree.defaults.unique
+    * @plugin unique
+    */
+    unique?: JSTreeStaticDefaultsUnique;
+}
+
+interface JSTreeStaticDefaultsCore {
+    /**
+    * data configuration
+    * 
+    * If left as `false` the HTML inside the jstree container element is used to populate the tree (that should be an unordered list with list items).
+    *
+    * You can also pass in a HTML string or a JSON array here.
+    * 
+    * It is possible to pass in a standard jQuery-like AJAX config and jstree will automatically determine if the response is JSON or HTML and use that to populate the tree. 
+    * In addition to the standard jQuery ajax options here you can suppy functions for `data` and `url`, the functions will be run in the current instance's scope and a param will be passed indicating which node is being loaded, the return value of those functions will be used.
+    * 
+    * The last option is to specify a function, that function will receive the node being loaded as argument and a second param which is a function which should be called with the result.
+    *
+    * __Examples__
+    *
+    *	// AJAX
+    *	$('#tree').jstree({
+    *		'core' : {
+    *			'data' : {
+    *				'url' : '/get/children/',
+    *				'data' : function (node) {
+    *					return { 'id' : node.id };
+    *				}
+    *			}
+    *		});
+    *
+    *	// direct data
+    *	$('#tree').jstree({
+    *		'core' : {
+    *			'data' : [
+    *				'Simple root node',
+    *				{
+    *					'id' : 'node_2',
+    *					'text' : 'Root node with options',
+    *					'state' : { 'opened' : true, 'selected' : true },
+    *					'children' : [ { 'text' : 'Child 1' }, 'Child 2']
+    *				}
+    *			]
+    *		});
+    *	
+    *	// function
+    *	$('#tree').jstree({
+    *		'core' : {
+    *			'data' : function (obj, callback) {
+    *				callback.call(this, ['Root 1', 'Root 2']);
+    *			}
+    *		});
+    * 
+    * @name $.jstree.defaults.core.data
+    */
+    data?: any;
+
+    /**
+    * configure the various strings used throughout the tree
+    *
+    * You can use an object where the key is the string you need to replace and the value is your replacement.
+    * Another option is to specify a function which will be called with an argument of the needed string and should return the replacement.
+    * If left as `false` no replacement is made.
+    *
+    * __Examples__
+    *
+    *	$('#tree').jstree({
+    *		'core' : {
+    *			'strings' : {
+    *				'Loading ...' : 'Please wait ...'
+    *			}
+    *		}
+    *	});
+    *
+    * @name $.jstree.defaults.core.strings
+    */
+    strings?: any;
+
+    /**
+    * determines what happens when a user tries to modify the structure of the tree
+    * If left as `false` all operations like create, rename, delete, move or copy are prevented.
+    * You can set this to `true` to allow all interactions or use a function to have better control.
+    *
+    * __Examples__
+    *
+    *	$('#tree').jstree({
+    *		'core' : {
+    *			'check_callback' : function (operation, node, node_parent, node_position, more) {
+    *				// operation can be 'create_node', 'rename_node', 'delete_node', 'move_node' or 'copy_node'
+    *				// in case of 'rename_node' node_position is filled with the new node name
+    *				return operation === 'rename_node' ? true : false;
+    *			}
+    *		}
+    *	});
+    * 
+    * @name $.jstree.defaults.core.check_callback
+    */
+    check_callback?: any;
+
+    /**
+    * a callback called with a single object parameter in the instance's scope when something goes wrong (operation prevented, ajax failed, etc)
+    * @name $.jstree.defaults.core.error
+    */
+    error: () => any;
+
+    /**
+    * the open / close animation duration in milliseconds - set this to `false` to disable the animation (default is `200`)
+    * @name $.jstree.defaults.core.animation
+    */
+    animation?: any;
+
+    /**
+    * a boolean indicating if multiple nodes can be selected
+    * @name $.jstree.defaults.core.multiple
+    */
+    multiple?: boolean;
+
+    /**
+    * theme configuration object
+    * @name $.jstree.defaults.core.themes
+    */
+    themes?: JSTreeStaticDefaultsCoreThemes;
+
+    /**
+    * if left as `true` all parents of all selected nodes will be opened once the tree loads (so that all selected nodes are visible to the user)
+    * @name $.jstree.defaults.core.expand_selected_onload
+    */
+    expand_selected_onload?: boolean;
+
+    /**
+    * if left as `true` web workers will be used to parse incoming JSON data where possible, so that the UI will not be blocked by large requests. 
+    * Workers are however about 30% slower. Defaults to `true`
+    * @name $.jstree.defaults.core.worker
+    */
+    worker?: boolean;
+
+    /**
+    * Force node text to plain text (and escape HTML). Defaults to `false`
+    * @name $.jstree.defaults.core.force_text
+    */
+    force_text?: boolean;
+
+    /**
+    * Should the node should be toggled if the text is double clicked . Defaults to `true`
+    * @name $.jstree.defaults.core.dblclick_toggle
+    */
+    dblclick_toggle?: boolean;
+}
+
+interface JSTreeStaticDefaultsCoreThemes {
+    /**
+    * the name of the theme to use (if left as `false` the default theme is used)
+    * @name $.jstree.defaults.core.themes.name
+    */
+    name?: string;
+
+    /**
+    * the URL of the theme's CSS file, leave this as `false` if you have manually included the theme CSS (recommended). You can set this to `true` too which will try to autoload the theme.
+    * @name $.jstree.defaults.core.themes.url
+    */
+    url?: string;
+
+    /**
+    * the location of all jstree themes - only used if `url` is set to `true`
+    * @name $.jstree.defaults.core.themes.dir
+    */
+    dir?: string;
+
+    /**
+    * a boolean indicating if connecting dots are shown
+    * @name $.jstree.defaults.core.themes.dots
+    */
+    dots?: boolean;
+
+    /**
+    * a boolean indicating if node icons are shown
+    * @name $.jstree.defaults.core.themes.icons
+    */
+    icons?: boolean;
+
+    /**
+    * a boolean indicating if the tree background is striped
+    * @name $.jstree.defaults.core.themes.stripes
+    */
+    stripes?: boolean;
+
+    /**
+    * a string (or boolean `false`) specifying the theme variant to use (if the theme supports variants)
+    * @name $.jstree.defaults.core.themes.variant
+    */
+    variant?: any;
+
+    /**
+    * a boolean specifying if a reponsive version of the theme should kick in on smaller screens (if the theme supports it). Defaults to `false`.
+    * @name $.jstree.defaults.core.themes.responsive
+    */
+    responsive?: boolean;
+}
+
+interface JSTreeStaticDefaultsCheckbox {
+    /**
+    * a boolean indicating if checkboxes should be visible (can be changed at a later time using `show_checkboxes()` and `hide_checkboxes`). Defaults to `true`.
+    * @name $.jstree.defaults.checkbox.visible
+    * @plugin checkbox
+    */
+    visible: boolean;
+
+    /**
+    * a boolean indicating if checkboxes should cascade down and have an undetermined state. Defaults to `true`.
+    * @name $.jstree.defaults.checkbox.three_state
+    * @plugin checkbox
+    */
+    three_state: boolean;
+
+    /**
+    * a boolean indicating if clicking anywhere on the node should act as clicking on the checkbox. Defaults to `true`.
+    * @name $.jstree.defaults.checkbox.whole_node
+    * @plugin checkbox
+    */
+    whole_node: boolean;
+
+    /**
+    * a boolean indicating if the selected style of a node should be kept, or removed. Defaults to `true`.
+    * @name $.jstree.defaults.checkbox.keep_selected_style
+    * @plugin checkbox
+    */
+    keep_selected_style: boolean;
+
+    /**
+    * This setting controls how cascading and undetermined nodes are applied. 
+    * If 'up' is in the string - cascading up is enabled, if 'down' is in the string - cascading down is enabled, if 'undetermined' is in the string - undetermined nodes will be used. 
+    * If `three_state` is set to `true` this setting is automatically set to 'up+down+undetermined'. Defaults to ''.
+    * @name $.jstree.defaults.checkbox.cascade
+    * @plugin checkbox
+    */
+    cascade: boolean;
+
+    /**
+    * This setting controls if checkbox are bound to the general tree selection 
+    * or to an internal array maintained by the checkbox plugin. 
+    * Defaults to `true`, only set to `false` if you know exactly what you are doing. 
+    * @name $.jstree.defaults.checkbox.tie_selection
+    * @plugin checkbox
+    */
+    tie_selection: boolean;
+}
+
+interface JSTreeStaticDefaultsContextMenu {
+    /**
+    * a boolean indicating if the node should be selected when the context menu is invoked on it. Defaults to `true`.
+    * @name $.jstree.defaults.contextmenu.select_node
+    * @plugin contextmenu
+    */
+    select_node: boolean;
+
+    /**
+    * a boolean indicating if the menu should be shown aligned with the node. Defaults to `true`, otherwise the mouse coordinates are used.
+    * @name $.jstree.defaults.contextmenu.show_at_node
+    * @plugin contextmenu
+    */
+    show_at_node: boolean;
+
+    /**
+    * an object of actions, or a function that accepts a node and a callback function and calls the callback function with an object of actions available for that node (you can also return the items too).
+    * 
+    * Each action consists of a key (a unique name) and a value which is an object with the following properties (only label and action are required):
+    * 
+    * * `separator_before` - a boolean indicating if there should be a separator before this item
+    * * `separator_after` - a boolean indicating if there should be a separator after this item
+    * * `_disabled` - a boolean indicating if this action should be disabled
+    * * `label` - a string - the name of the action (could be a function returning a string)
+    * * `action` - a function to be executed if this item is chosen
+    * * `icon` - a string, can be a path to an icon or a className, if using an image that is in the current directory use a `./` prefix, otherwise it will be detected as a class
+    * * `shortcut` - keyCode which will trigger the action if the menu is open (for example `113` for rename, which equals F2)
+    * * `shortcut_label` - shortcut label (like for example `F2` for rename)
+    * 
+    * @name $.jstree.defaults.contextmenu.items
+    * @plugin contextmenu
+    */
+    items: any;
+}
+
+interface JSTreeStaticDefaultsDragNDrop {
+    /**
+    * a boolean indicating if a copy should be possible while dragging (by pressint the meta key or Ctrl). Defaults to `true`.
+    * @name $.jstree.defaults.dnd.copy
+    * @plugin dnd
+    */
+    copy: boolean;
+
+    /**
+    * a number indicating how long a node should remain hovered while dragging to be opened. Defaults to `500`.
+    * @name $.jstree.defaults.dnd.open_timeout
+    * @plugin dnd
+    */
+    open_timeout: number;
+
+    /**
+    * a function invoked each time a node is about to be dragged, invoked in the tree's scope and receives the nodes about to be dragged as an argument (array) - return `false` to prevent dragging
+    * @name $.jstree.defaults.dnd.is_draggable
+    * @plugin dnd
+    */
+    is_draggable: boolean;
+
+    /**
+    * a boolean indicating if checks should constantly be made while the user is dragging the node (as opposed to checking only on drop), default is `true`
+    * @name $.jstree.defaults.dnd.check_while_dragging
+    * @plugin dnd
+    */
+    check_while_dragging: boolean;
+
+    /**
+    * a boolean indicating if nodes from this tree should only be copied with dnd (as opposed to moved), default is `false`
+    * @name $.jstree.defaults.dnd.always_copy
+    * @plugin dnd
+    */
+    always_copy: boolean;
+
+    /**
+    * when dropping a node "inside", this setting indicates the position the node should go to - it can be an integer or a string: "first" (same as 0) or "last", default is `0`
+    * @name $.jstree.defaults.dnd.inside_pos
+    * @plugin dnd
+    */
+    inside_pos: any;
+
+    /**
+    * when starting the drag on a node that is selected this setting controls if all selected nodes are dragged or only the single node, default is `true`, which means all selected nodes are dragged when the drag is started on a selected node
+    * @name $.jstree.defaults.dnd.drag_selection
+    * @plugin dnd
+    */
+    drag_selection: boolean;
+
+    /**
+    * controls whether dnd works on touch devices. If left as boolean true dnd will work the same as in desktop browsers, which in some cases may impair scrolling. If set to boolean false dnd will not work on touch devices. There is a special third option - string "selected" which means only selected nodes can be dragged on touch devices.
+    * @name $.jstree.defaults.dnd.touch
+    * @plugin dnd
+    */
+    touch: boolean;
+
+    /**
+    * controls whether items can be dropped anywhere on the node, not just on the anchor, by default only the node anchor is a valid drop target. Works best with the wholerow plugin. If enabled on mobile depending on the interface it might be hard for the user to cancel the drop, since the whole tree container will be a valid drop target.
+    * @name $.jstree.defaults.dnd.large_drop_target
+    * @plugin dnd
+    */
+    large_drop_target: boolean;
+
+    /**
+    * controls whether a drag can be initiated from any part of the node and not just the text/icon part, works best with the wholerow plugin. Keep in mind it can cause problems with tree scrolling on mobile depending on the interface - in that case set the touch option to "selected".
+    * @name $.jstree.defaults.dnd.large_drag_target
+    * @plugin dnd
+    */
+    large_drag_target: boolean;
+}
+
+interface JSTreeStaticDefaultsMassload {
+    /**
+    * massload configuration
+    *
+    * It is possible to set this to a standard jQuery-like AJAX config.
+    * In addition to the standard jQuery ajax options here you can supply functions for `data` and `url`, the functions will be run in the current instance's scope and a param will be passed indicating which node IDs need to be loaded, the return value of those functions will be used.
+    *
+    * You can also set this to a function, that function will receive the node IDs being loaded as argument and a second param which is a function (callback) which should be called with the result.
+    *
+    * Both the AJAX and the function approach rely on the same return value - an object where the keys are the node IDs, and the value is the children of that node as an array.
+    *
+    *	{
+    *		"id1" : [{ "text" : "Child of ID1", "id" : "c1" }, { "text" : "Another child of ID1", "id" : "c2" }],
+    *		"id2" : [{ "text" : "Child of ID2", "id" : "c3" }]
+    *	}
+    * 
+    * @name $.jstree.defaults.massload
+    * @plugin massload
+    */
+
+    url: any;
+
+    data: any;
+}
+
+interface JSTreeStaticDefaultsSearch {
+    /**
+    * a jQuery-like AJAX config, which jstree uses if a server should be queried for results. 
+    * 
+    * A `str` (which is the search string) parameter will be added with the request, 
+    * an optional `inside` parameter will be added if the search is limited to a node id. 
+    * The expected result is a JSON array with nodes that need to be opened so that matching nodes will be revealed.
+    * Leave this setting as `false` to not query the server. You can also set this to a function, 
+    * which will be invoked in the instance's scope and receive 3 parameters - the search string, 
+    * the callback to call with the array of nodes to load, and the optional node ID to limit the search to 
+    * @name $.jstree.defaults.search.ajax
+    * @plugin search
+    */
+    ajax: any;
+
+    /**
+    * Indicates if the search should be fuzzy or not (should `chnd3` match `child node 3`). Default is `true`.
+    * @name $.jstree.defaults.search.fuzzy
+    * @plugin search
+    */
+    fuzzy: boolean;
+
+    /**
+    * Indicates if the search should be case sensitive. Default is `false`.
+    * @name $.jstree.defaults.search.case_sensitive
+    * @plugin search
+    */
+    case_sensitive: boolean;
+
+    /**
+    * Indicates if the tree should be filtered (by default) to show only matching nodes 
+    * (keep in mind this can be a heavy on large trees in old browsers).
+    * This setting can be changed at runtime when calling the search method. Default is `false`.
+    * @name $.jstree.defaults.search.show_only_matches
+    * @plugin search
+    */
+    show_only_matches: boolean;
+
+    /**
+    * Indicates if all nodes opened to reveal the search result, 
+    * should be closed when the search is cleared or a new search is performed. Default is `true`.
+    * @name $.jstree.defaults.search.close_opened_onclear
+    * @plugin search
+    */
+    close_opened_onclear: boolean;
+
+    /**
+    * Indicates if only leaf nodes should be included in search results. Default is `false`.
+    * @name $.jstree.defaults.search.search_leaves_only
+    * @plugin search
+    */
+    search_leaves_only: boolean;
+
+    /**
+    * If set to a function it wil be called in the instance's scope with two arguments - 
+    * search string and node (where node will be every node in the structure, so use with caution).
+    * If the function returns a truthy value the node will be considered a match 
+    * (it might not be displayed if search_only_leaves is set to true and the node is not a leaf). Default is `false`.
+    * @name $.jstree.defaults.search.search_callback
+    * @plugin search
+    */
+    search_callback: any;
+}
+
+interface JSTreeStaticDefaultsState {
+    /**
+    * A string for the key to use when saving the current tree (change if using multiple trees in your project). Defaults to `jstree`.
+    * @name $.jstree.defaults.state.key
+    * @plugin state
+    */
+    key: string;
+
+    /**
+    * A space separated list of events that trigger a state save. Defaults to `changed.jstree open_node.jstree close_node.jstree`.
+    * @name $.jstree.defaults.state.events
+    * @plugin state
+    */
+    events: string;
+
+    /**
+    * Time in milliseconds after which the state will expire. Defaults to 'false' meaning - no expire.
+    * @name $.jstree.defaults.state.ttl
+    * @plugin state
+    */
+    ttl: any;
+
+    /**
+    * A function that will be executed prior to restoring state with one argument - the state object. Can be used to clear unwanted parts of the state.
+    * @name $.jstree.defaults.state.filter
+    * @plugin state
+    */
+    filter: any;
+}
+
+interface JSTreeStaticDefaultsUnique {
+    /**
+    * Indicates if the comparison should be case sensitive. Default is `false`.
+    * @name $.jstree.defaults.unique.case_sensitive
+    * @plugin unique
+    */
+    case_sensitive: boolean;
+    /**
+    * A callback executed in the instance's scope when a new node is created 
+    * and the name is already taken, the two arguments are the conflicting name and the counter. 
+    * The default will produce results like `New node (2)`.
+    * @name $.jstree.defaults.unique.duplicate
+    * @plugin unique
+    */
+    duplicate: (name: string, counter: number) => string;
+}
+
+interface JSTree extends JQuery {
+    /**
+    * used to decorate an instance with a plugin. Used internally.
+    * @private
+    * @name plugin(deco [, opts])
+    * @param  {String} deco the plugin to decorate with
+    * @param  {Object} opts options for the plugin
+    * @return {jsTree}
+    */
+    plugin: (deco: string, opts?: any) => JSTree;
+
+    /**
+    * used to decorate an instance with a plugin. Used internally.
+    * @private
+    * @name init(el, options)
+    * @param {DOMElement|jQuery|String} el the element we are transforming
+    * @param {Object} options options for this instance
+    * @trigger init.jstree, loading.jstree, loaded.jstree, ready.jstree, changed.jstree
+    */
+    init: (el:any, options:any) => void;
+
+    /**
+    * destroy an instance
+    * @name destroy()
+    * @param  {Boolean} keep_html if not set to `true` the container will be emptied, otherwise the current DOM elements will be kept intact
+    */
+    destroy: (keep_html?: boolean) => void;
+
+    /**
+    * part of the destroying of an instance. Used internally.
+    * @private
+    * @name teardown()
+    */
+    teardown: () => void;
+
+    /**
+    * bind all events. Used internally.
+    * @private
+    * @name bind()
+    */
+    bind: () => any;
+
+    /**
+    * part of the destroying of an instance. Used internally.
+    * @private
+    * @name unbind()
+    */
+    unbind: () => any;
+
+    /**
+    * trigger an event. Used internally.
+    * @private
+    * @name trigger(ev [, data])
+    * @param  {String} ev the name of the event to trigger
+    * @param  {Object} data additional data to pass with the event
+    */
+    /*
+     * defined in JQuery
+     */
+    // trigger: (ev: string, data?: Object) => any;
+    
+    /**
+    * returns the jQuery extended instance container
+    * @name get_container()
+    * @return {jQuery}
+    */
+    get_container: () => JQuery;
+
+    /**
+    * returns the jQuery extended main UL node inside the instance container. Used internally.
+    * @private
+    * @name get_container_ul()
+    * @return {jQuery}
+    */
+    get_container_ul: () => JQuery;
+
+    /**
+    * gets string replacements (localization). Used internally.
+    * @private
+    * @name get_string(key)
+    * @param  {String} key
+    * @return {String}
+    */
+    get_string: (key: string) => string;
+
+    /**
+    * gets the first child of a DOM node. Used internally.
+    * @private
+    * @name _firstChild(dom)
+    * @param  {DOMElement} dom
+    * @return {DOMElement}
+    */
+    _firstChild: (dom: HTMLElement) => HTMLElement;
+
+    /**
+    * gets the next sibling of a DOM node. Used internally.
+    * @private
+    * @name _nextSibling(dom)
+    * @param  {DOMElement} dom
+    * @return {DOMElement}
+    */
+    _nextSibling: (dom: HTMLElement) => HTMLElement;
+
+    /**
+    * gets the previous sibling of a DOM node. Used internally.
+    * @private
+    * @name _previousSibling(dom)
+    * @param  {DOMElement} dom
+    * @return {DOMElement}
+    */
+    _previousSibling: (dom: HTMLElement) => HTMLElement;
+
+    /**
+    * get the JSON representation of a node (or the actual jQuery extended DOM node) by using any input (child DOM element, ID string, selector, etc)
+    * @name get_node(obj [, as_dom])
+    * @param  {mixed} obj
+    * @param  {Boolean} as_dom
+    * @return {Object|jQuery}
+    */
+    get_node: (obj: any, as_dom?: boolean) => any;
+
+    /**
+    * get the path to a node, either consisting of node texts, or of node IDs, optionally glued together (otherwise an array)
+    * @name get_path(obj [, glue, ids])
+    * @param  {mixed} obj the node
+    * @param  {String} glue if you want the path as a string - pass the glue here (for example '/'), if a falsy value is supplied here, an array is returned
+    * @param  {Boolean} ids if set to true build the path using ID, otherwise node text is used
+    * @return {mixed}
+    */
+    get_path: (obj: any, glue: string, ids: boolean) => any;
+
+    /**
+    * get the next visible node that is below the `obj` node. If `strict` is set to `true` only sibling nodes are returned.
+    * @name get_next_dom(obj [, strict])
+    * @param  {mixed} obj
+    * @param  {Boolean} strict
+    * @return {jQuery}
+    */
+    get_next_dom: (obj: any, strict?: boolean) => JQuery;
+
+    /**
+    * get the previous visible node that is above the `obj` node. If `strict` is set to `true` only sibling nodes are returned.
+    * @name get_prev_dom(obj [, strict])
+    * @param  {mixed} obj
+    * @param  {Boolean} strict
+    * @return {jQuery}
+    */
+    get_prev_dom: (obj: any, strict?: boolean) => JQuery;
+
+    /**
+    * get the parent ID of a node
+    * @name get_parent(obj)
+    * @param  {mixed} obj
+    * @return {String}
+    */
+    get_parent: (obj: any) => string;
+
+    /**
+    * get a jQuery collection of all the children of a node (node must be rendered)
+    * @name get_children_dom(obj)
+    * @param  {mixed} obj
+    * @return {jQuery}
+    */
+    get_children_dom: (obj: any) => JQuery;
+
+    /**
+    * checks if a node has children
+    * @name is_parent(obj)
+    * @param  {mixed} obj
+    * @return {Boolean}
+    */
+    is_parent: (obj: any) => boolean;
+
+    /**
+    * checks if a node is loaded (its children are available)
+    * @name is_loaded(obj)
+    * @param  {mixed} obj
+    * @return {Boolean}
+    */
+    is_loaded: (obj: any) => boolean;
+
+    /**
+    * check if a node is currently loading (fetching children)
+    * @name is_loading(obj)
+    * @param  {mixed} obj
+    * @return {Boolean}
+    */
+    is_loading: (obj: any) => boolean;
+
+    /**
+    * check if a node is opened
+    * @name is_open(obj)
+    * @param  {mixed} obj
+    * @return {Boolean}
+    */
+    is_open: (obj: any) => boolean;
+
+    /**
+    * check if a node is in a closed state
+    * @name is_closed(obj)
+    * @param  {mixed} obj
+    * @return {Boolean}
+    */
+    is_closed: (obj: any) => boolean;
+
+    /**
+    * check if a node has no children
+    * @name is_leaf(obj)
+    * @param  {mixed} obj
+    * @return {Boolean}
+    */
+    is_leaf: (obj: any) => boolean;
+
+    /**
+    * loads a node (fetches its children using the `core.data` setting). Multiple nodes can be passed to by using an array.
+    * @name load_node(obj [, callback])
+    * @param  {mixed} obj
+    * @param  {function} callback a function to be executed once loading is conplete, the function is executed in the instance's scope 
+    * and receives two arguments - the node and a boolean status
+    * @return {Boolean}
+    * @trigger load_node.jstree
+    */
+    load_node: (obj: any, callback: (node: any, status: boolean) => void) => boolean;
+
+    /**
+    * load an array of nodes (will also load unavailable nodes as soon as the appear in the structure). Used internally.
+    * @private
+    * @name _load_nodes(nodes [, callback])
+    * @param  {array} nodes
+    * @param  {function} callback a function to be executed once loading is complete, the function is executed in the instance's scope and receives one argument - the array passed to _load_nodes
+    * @param  {Boolean} is_callback - if false reloads node (AP - original comment missing in source code)
+    */
+    _load_nodes: (nodes: any[], callback?: (nodes: any[]) => void, is_callback?: boolean) => void;
+
+    /**
+    * loads all unloaded nodes
+    * @name load_all([obj, callback])
+    * @param {mixed} obj the node to load recursively, omit to load all nodes in the tree
+    * @param {function} callback a function to be executed once loading all the nodes is complete,
+    * @trigger load_all.jstree
+    */
+    load_all: (obj: any, callback: () => void) => void;
+
+    /**
+    * handles the actual loading of a node. Used only internally.
+    * @private
+    * @name _load_node(obj [, callback])
+    * @param  {mixed} obj
+    * @param  {function} callback a function to be executed once loading is complete, the function is executed in the instance's scope and receives one argument - a boolean status
+    * @return {Boolean}
+    */
+    _load_node: (obj: any, callback?: (status: boolean) => void) => boolean;
+    
+    /**
+    * adds a node to the list of nodes to redraw. Used only internally.
+    * @private
+    * @name _node_changed(obj)
+    * @param  {mixed} obj
+    */
+    _node_changed: (obj: any) => void;
+
+    /**
+    * appends HTML content to the tree. Used internally.
+    * @private
+    * @name _append_html_data(obj, data)
+    * @param  {mixed} obj the node to append to
+    * @param  {String} data the HTML string to parse and append
+    * @param {function} callback function which takes boolean flag executes after append (AP: originally lack of comment)
+    * @trigger model.jstree, changed.jstree
+    */
+    _append_html_data: (dom: any, data: string, cb: (flag: boolean) => void) => void;
+
+    /**
+    * appends JSON content to the tree. Used internally.
+    * @private
+    * @name _append_json_data(obj, data)
+    * @param  {mixed} dom the node to append to
+    * @param  {String} data the JSON object to parse and append
+    * @param  {function} cb function which takes boolean flag executes after append (AP: originally lack of comment)
+    * @param  {Boolean} force_processing internal param - do not set
+    * @trigger model.jstree, changed.jstree
+    */
+    _append_json_data: (dom: any, data: string, cb: (flag: boolean) => void, force_processing: boolean) => void;
+
+    /**
+    * parses a node from a jQuery object and appends them to the in memory tree model. Used internally.
+    * @private
+    * @name _parse_model_from_html(d [, p, ps])
+    * @param  {jQuery} d the jQuery object to parse
+    * @param  {String} p the parent ID
+    * @param  {Array} ps list of all parents
+    * @return {String} the ID of the object added to the model
+    */
+    _parse_model_from_html: (d: JQuery, p?: string, ps?: any[]) => string;
+
+    /**
+    * parses a node from a JSON object (used when dealing with flat data, which has no nesting of children, but has id and parent properties) and appends it to the in memory tree model. Used internally.
+    * @private
+    * @name _parse_model_from_flat_json(d [, p, ps])
+    * @param  {Object} d the JSON object to parse
+    * @param  {String} p the parent ID
+    * @param  {Array} ps list of all parents
+    * @return {String} the ID of the object added to the model
+    */
+    _parse_model_from_flat_json: (d: any, p?: string, ps?: any[]) => string;
+
+    /**
+    * parses a node from a JSON object and appends it to the in memory tree model. Used internally.
+    * @private
+    * @name _parse_model_from_json(d [, p, ps])
+    * @param  {Object} d the JSON object to parse
+    * @param  {String} p the parent ID
+    * @param  {Array} ps list of all parents
+    * @return {String} the ID of the object added to the model
+    */
+    _parse_model_from_json: (d: any, p?: string, ps?: any[]) => string;
+
+    /**
+    * redraws all nodes that need to be redrawn. Used internally.
+    * @private
+    * @name _redraw()
+    * @trigger redraw.jstree
+    */
+    _redraw: () => void ;
+    
+    /**
+    * redraws all nodes that need to be redrawn or optionally - the whole tree
+    * @name redraw([full])
+    * @param {Boolean} full if set to `true` all nodes are redrawn.
+    */
+    redraw: (full?: boolean) => void;
+
+    /**
+    * redraws a single node's children. Used internally.
+    * @private
+    * @name draw_children(node)
+    * @param {mixed} node the node whose children will be redrawn
+    */
+    draw_children: (node: any) => void;
+
+    /**
+    * redraws a single node. Used internally.
+    * @private
+    * @name redraw_node(node, deep, is_callback, force_render)
+    * @param {mixed} node the node to redraw
+    * @param {Boolean} deep should child nodes be redrawn too
+    * @param {Boolean} is_callback is this a recursion call
+    * @param {Boolean} force_render should children of closed parents be drawn anyway
+    */
+    redraw_node: (node: any, deep: boolean, is_callback: boolean, force_render: boolean) => void;
+
+    /**
+    * opens a node, revaling its children. If the node is not loaded it will be loaded and opened once ready.
+    * @name open_node(obj [, callback, animation])
+    * @param {mixed} obj the node to open
+    * @param {Function} callback a function to execute once the node is opened
+    * @param {Number} animation the animation duration in milliseconds 
+    * when opening the node (overrides the `core.animation` setting). Use `false` for no animation.
+    * @trigger open_node.jstree, after_open.jstree, before_open.jstree
+    */
+    open_node: (obj: any, callback?: any, animation?: any) => void;
+
+    /**
+    * opens every parent of a node (node should be loaded)
+    * @name _open_to(obj)
+    * @param {mixed} obj the node to reveal
+    * @private
+    */
+    _open_to: (obj:any) => void;
+
+    /**
+    * closes a node, hiding its children
+    * @name close_node(obj [, animation])
+    * @param {mixed} obj the node to close
+    * @param {Number} animation the animation duration in milliseconds 
+    * when closing the node (overrides the `core.animation` setting). Use `false` for no animation.
+    * @trigger close_node.jstree, after_close.jstree
+    */
+    close_node: (obj: any, animation?: any) => void;
+
+    /**
+    * toggles a node - closing it if it is open, opening it if it is closed
+    * @name toggle_node(obj)
+    * @param {mixed} obj the node to toggle
+    */
+    toggle_node: (obj: any) => void;
+
+    /**
+    * opens all nodes within a node (or the tree), revaling their children. If the node is not loaded it will be loaded and opened once ready.
+    * @name open_all([obj, animation, original_obj])
+    * @param {mixed} obj the node to open recursively, omit to open all nodes in the tree
+    * @param {Number} animation the animation duration in milliseconds when opening the nodes, the default is no animation
+    * @param {jQuery} reference to the node that started the process (internal use)
+    * @trigger open_all.jstree
+    */
+    open_all: (obj?: any, animation?: number, original_obj?: any) => void;
+
+    /**
+    * closes all nodes within a node (or the tree), revaling their children
+    * @name close_all([obj, animation])
+    * @param {mixed} obj the node to close recursively, omit to close all nodes in the tree
+    * @param {Number} animation the animation duration in milliseconds when closing the nodes, the default is no animation
+    * @trigger close_all.jstree
+    */
+    close_all: (obj?: any, animation?: number) => void;
+
+    /**
+    * checks if a node is disabled (not selectable)
+    * @name is_disabled(obj)
+    * @param  {mixed} obj
+    * @return {Boolean}
+    */
+    is_disabled: (obj: any) => boolean;
+
+    /**
+    * enables a node - so that it can be selected
+    * @name enable_node(obj)
+    * @param {mixed} obj the node to enable
+    * @trigger enable_node.jstree
+    */
+    enable_node: (obj: any) => boolean;
+
+    /**
+    * disables a node - so that it can not be selected
+    * @name disable_node(obj)
+    * @param {mixed} obj the node to disable
+    * @trigger disable_node.jstree
+    */
+    disable_node: (obj: any) => boolean;
+
+    /**
+    * called when a node is selected by the user. Used internally.
+    * @private
+    * @name activate_node(obj, e)
+    * @param {mixed} obj the node
+    * @param {Object} e the related event
+    * @trigger activate_node.jstree, changed.jstree
+    */
+    activate_node: (obj: any, e: any) => void;
+
+    /**
+    * applies the hover state on a node, called when a node is hovered by the user. Used internally.
+    * @private
+    * @name hover_node(obj)
+    * @param {mixed} obj
+    * @trigger hover_node.jstree
+    */
+    hover_node: (obj: any) => void;
+
+    /**
+    * removes the hover state from a nodecalled when a node is no longer hovered by the user. Used internally.
+    * @private
+    * @name dehover_node(obj)
+    * @param {mixed} obj
+    * @trigger dehover_node.jstree
+    */
+    dehover_node: (obj: any) => void;
+
+    /**
+    * select a node
+    * @name select_node(obj [, supress_event, prevent_open])
+    * @param {mixed} obj an array can be used to select multiple nodes
+    * @param {Boolean} supress_event if set to `true` the `changed.jstree` event won't be triggered
+    * @param {Boolean} prevent_open if set to `true` parents of the selected node won't be opened
+    * @trigger select_node.jstree, changed.jstree
+    */
+    select_node: (obj: any, supress_event?: boolean, prevent_open?: boolean, e?: any) => any;
+
+    /**
+    * deselect a node
+    * @name deselect_node(obj [, supress_event])
+    * @param {mixed} obj an array can be used to deselect multiple nodes
+    * @param {Boolean} supress_event if set to `true` the `changed.jstree` event won't be triggered
+    * @trigger deselect_node.jstree, changed.jstree
+    */
+    deselect_node: (obj: any, supress_event?: boolean, e?: any) => void;
+
+    /**
+    * select all nodes in the tree
+    * @name select_all([supress_event])
+    * @param {Boolean} supress_event if set to `true` the `changed.jstree` event won't be triggered
+    * @trigger select_all.jstree, changed.jstree
+    */
+    select_all: (supress_event?: boolean) => void;
+
+    /**
+    * deselect all selected nodes
+    * @name deselect_all([supress_event])
+    * @param {Boolean} supress_event if set to `true` the `changed.jstree` event won't be triggered
+    * @trigger deselect_all.jstree, changed.jstree
+    */
+    deselect_all: (supress_event?: boolean) => void;
+
+    /**
+    * checks if a node is selected
+    * @name is_selected(obj)
+    * @param  {mixed}  obj
+    * @return {Boolean}
+    */
+    is_selected: (obj: any) => boolean;
+
+    /**
+    * get an array of all selected nodes
+    * @name get_selected([full])
+    * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
+    * @return {Array}
+    */
+    get_selected: (full?: any) => any[];
+
+    /**
+    * get an array of all top level selected nodes (ignoring children of selected nodes)
+    * @name get_top_selected([full])
+    * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
+    * @return {Array}
+    */
+    get_top_selected: (full?: any) => any[];
+
+    /**
+    * get an array of all bottom level selected nodes (ignoring selected parents)
+    * @name get_top_selected([full])
+    * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
+    * @return {Array}
+    */
+    get_bottom_selected: (full?: any) => any[];
+
+    /**
+    * gets the current state of the tree so that it can be restored later with `set_state(state)`. Used internally.
+    * @name get_state()
+    * @private
+    * @return {Object}
+    */
+    get_state: () => any;
+
+    /**
+    * sets the state of the tree. Used internally.
+    * @name set_state(state [, callback])
+    * @private
+    * @param {Object} state the state to restore
+    * @param {Function} callback an optional function to execute once the state is restored.
+    * @trigger set_state.jstree
+    */
+    set_state: (state: any, callback: () => void) => void;
+
+    /**
+    * refreshes the tree - all nodes are reloaded with calls to `load_node`.
+    * @name refresh()
+    * @param {Boolean} skip_loading an option to skip showing the loading indicator
+    * @param {Mixed} forget_state if set to `true` state will not be reapplied, 
+    * if set to a function (receiving the current state as argument) the result of that function will be used as state
+    * @trigger refresh.jstree
+    */
+    refresh: (skip_loading: boolean, forget_state: any) => void;
+
+    /**
+    * refreshes a node in the tree (reload its children) all opened nodes inside that node are reloaded with calls to `load_node`.
+    * @name refresh_node(obj)
+    * @param  {mixed} obj the node
+    * @trigger refresh_node.jstree
+    */
+    refresh_node: (obj: any) => void;
+
+    /**
+    * set (change) the ID of a node
+    * @name set_id(obj, id)
+    * @param  {mixed} obj the node
+    * @param  {String} id the new ID
+    * @return {Boolean}
+    */
+    set_id: (obj: any, id: string) => boolean;
+
+    /**
+    * get the text value of a node
+    * @name get_text(obj)
+    * @param  {mixed} obj the node
+    * @return {String}
+    */
+    get_text: (obj: any) => string;
+
+    /**
+    * set the text value of a node. Used internally, please use `rename_node(obj, val)`.
+    * @private
+    * @name set_text(obj, val)
+    * @param  {mixed} obj the node, you can pass an array to set the text on multiple nodes
+    * @param  {String} val the new text value
+    * @return {Boolean}
+    * @trigger set_text.jstree
+    */
+    set_text: (obj:any, val:string) => boolean;
+
+    /**
+    * gets a JSON representation of a node (or the whole tree)
+    * @name get_json([obj, options])
+    * @param  {mixed} obj
+    * @param  {Object} options
+    * @param  {Boolean} options.no_state do not return state information
+    * @param  {Boolean} options.no_id do not return ID
+    * @param  {Boolean} options.no_children do not include children
+    * @param  {Boolean} options.no_data do not include node data
+    * @param  {Boolean} options.flat return flat JSON instead of nested
+    * @return {Object}
+    */
+    get_json: (obj?: any, options?: JSTreeGetJsonOptions, flat?: boolean) => any;
+
+    /**
+    * create a new node (do not confuse with load_node)
+    * @name create_node([obj, node, pos, callback, is_loaded])
+    * @param  {mixed}   par       the parent node (to create a root node use either "#" (string) or `null`)
+    * @param  {mixed}   node      the data for the new node (a valid JSON object, or a simple string with the name)
+    * @param  {mixed}   pos       the index at which to insert the node, "first" and "last" are also supported, default is "last"
+    * @param  {Function} callback a function to be called once the node is created
+    * @param  {Boolean} is_loaded internal argument indicating if the parent node was succesfully loaded
+    * @return {String}            the ID of the newly create node
+    * @trigger model.jstree, create_node.jstree
+    */
+    create_node: (par?: any, node?: any, pos?: any, callback?: any, is_loaded?: boolean) => string;
+
+    /**
+    * set the text value of a node
+    * @name rename_node(obj, val)
+    * @param  {mixed} obj the node, you can pass an array to rename multiple nodes to the same name
+    * @param  {String} val the new text value
+    * @return {Boolean}
+    * @trigger rename_node.jstree
+    */
+    rename_node: (obj: any, val: string) => boolean;
+
+    /**
+    * remove a node
+    * @name delete_node(obj)
+    * @param  {mixed} obj the node, you can pass an array to delete multiple nodes
+    * @return {Boolean}
+    * @trigger delete_node.jstree, changed.jstree
+    */
+    delete_node: (obj: any) => boolean;
+
+    /**
+    * check if an operation is premitted on the tree. Used internally.
+    * @private
+    * @name check(chk, obj, par, pos)
+    * @param  {String} chk the operation to check, can be "create_node", "rename_node", "delete_node", "copy_node" or "move_node"
+    * @param  {mixed} obj the node
+    * @param  {mixed} par the parent
+    * @param  {mixed} pos the position to insert at, or if "rename_node" - the new name
+    * @param  {mixed} more some various additional information, for example if a "move_node" operations is triggered by DND this will be the hovered node
+    * @return {Boolean}
+    */
+    check: (chk: string, obj: any, par: any, pos: any, more: any) => boolean;
+
+    /**
+    * get the last error
+    * @name last_error()
+    * @return {Object}
+    */
+    last_error: () => any;
+
+    /**
+    * move a node to a new parent
+    * @name move_node(obj, par [, pos, callback, is_loaded])
+    * @param  {mixed} obj the node to move, pass an array to move multiple nodes
+    * @param  {mixed} par the new parent
+    * @param  {mixed} pos the position to insert at (besides integer values, "first" and "last" are supported, as well as "before" and "after"), defaults to integer `0`
+    * @param  {function} callback a function to call once the move is completed, receives 3 arguments - the node, the new parent and the position
+    * @param  {Boolean} is_loaded internal parameter indicating if the parent node has been loaded
+    * @param  {Boolean} skip_redraw internal parameter indicating if the tree should be redrawn
+    * @param  {Boolean} instance internal parameter indicating if the node comes from another instance
+    * @trigger move_node.jstree
+    */
+    move_node: (obj: any, par: any, pos?: any, callback?: (node: any, new_par: any, pos: any) => void, is_loaded?: boolean, skip_redraw?: boolean, origin?: boolean) => void;
+
+    /**
+    * copy a node to a new parent
+    * @name copy_node(obj, par [, pos, callback, is_loaded])
+    * @param  {mixed} obj the node to copy, pass an array to copy multiple nodes
+    * @param  {mixed} par the new parent
+    * @param  {mixed} pos the position to insert at (besides integer values, "first" and "last" are supported, as well as "before" and "after"), defaults to integer `0`
+    * @param  {function} callback a function to call once the move is completed, receives 3 arguments - the node, the new parent and the position
+    * @param  {Boolean} is_loaded internal parameter indicating if the parent node has been loaded
+    * @param  {Boolean} skip_redraw internal parameter indicating if the tree should be redrawn
+    * @param  {Boolean} instance internal parameter indicating if the node comes from another instance
+    * @trigger model.jstree copy_node.jstree
+    */
+    copy_node: (obj: any, par: any, pos?: any, callback?: (node: any, new_par: any, pos: any) => void, is_loaded?: boolean, skip_redraw?: boolean, origin?: boolean) => void;
+
+    /**
+    * cut a node (a later call to `paste(obj)` would move the node)
+    * @name cut(obj)
+    * @param  {mixed} obj multiple objects can be passed using an array
+    * @trigger cut.jstree
+    */
+    cut: (obj: any) => void;
+
+    /**
+    * copy a node (a later call to `paste(obj)` would copy the node)
+    * @name copy(obj)
+    * @param  {mixed} obj multiple objects can be passed using an array
+    * @trigger copy.jstre
+    */
+    copy: (obj: any) => void;
+
+    /**
+    * get the current buffer (any nodes that are waiting for a paste operation)
+    * @name get_buffer()
+    * @return {Object} an object consisting of `mode` ("copy_node" or "move_node"), `node` (an array of objects) and `inst` (the instance)
+    */
+    get_buffer: () => Buffer;
+
+    /**
+    * check if there is something in the buffer to paste
+    * @name can_paste()
+    * @return {Boolean}
+    */
+    can_paste: () => boolean;
+
+    /**
+    * copy or move the previously cut or copied nodes to a new parent
+    * @name paste(obj [, pos])
+    * @param  {mixed} obj the new parent
+    * @param  {mixed} pos the position to insert at (besides integer, "first" and "last" are supported), defaults to integer `0`
+    * @trigger paste.jstree
+    */
+    paste: (obj: any, pos: any) => void;
+
+    /**
+    * clear the buffer of previously copied or cut nodes
+    * @name clear_buffer()
+    * @trigger clear_buffer.jstree
+    */
+    clear_buffer: () => void;
+
+    /**
+    * put a node in edit mode (input field to rename the node)
+    * @name edit(obj [, default_text])
+    * @param  {mixed} obj
+    * @param  {String} default_text the text to populate the input with (if omitted the node text value is used)
+    */
+    edit: (obj: any, default_text?: string) => void;
+
+    /**
+    * changes the theme
+    * @name set_theme(theme_name [, theme_url])
+    * @param {String} theme_name the name of the new theme to apply
+    * @param {mixed} theme_url  the location of the CSS file for this theme. Omit or set to `false` 
+    * if you manually included the file. Set to `true` to autoload from the `core.themes.dir` directory.
+    * @trigger set_theme.jstree
+    */
+    set_theme: (theme_name: string, theme_url?: any) => void;
+
+    /**
+    * gets the name of the currently applied theme name
+    * @name get_theme()
+    * @return {String}
+    */
+    get_theme: () => string;
+
+    /**
+    * changes the theme variant (if the theme has variants)
+    * @name set_theme_variant(variant_name)
+    * @param {String|Boolean} variant_name the variant to apply (if `false` is used the current variant is removed)
+    */
+    set_theme_variant: (variant_name: any) => void;
+
+    /**
+    * gets the name of the currently applied theme variant
+    * @name get_theme()
+    * @return {String}
+    */
+    get_theme_variant: () => string;
+
+    /**
+    * shows a striped background on the container (if the theme supports it)
+    * @name show_stripes()
+    */
+    show_stripes: () => void;
+
+    /**
+    * hides the striped background on the container
+    * @name hide_stripes()
+    */
+    hide_stripes: () => void;
+
+    /**
+    * toggles the striped background on the container
+    * @name toggle_stripes()
+    */
+    toggle_stripes: () => void;
+
+    /**
+    * shows the connecting dots (if the theme supports it)
+    * @name show_dots()
+    */
+    show_dots: () => void;
+
+    /**
+    * hides the connecting dots
+    * @name hide_dots()
+    */
+    hide_dots: () => void;
+
+    /**
+    * toggles the connecting dots
+    * @name toggle_dots()
+    */
+    toggle_dots: () => void;
+
+    /**
+    * show the node icons
+    * @name show_icons()
+    */
+    show_icons: () => void;
+
+    /**
+    * hide the node icons
+    * @name hide_icons()
+    */
+    hide_icons: () => void;
+
+    /**
+    * toggle the node icons
+    * @name toggle_icons()
+    */
+    toggle_icons: () => void;
+
+    /**
+    * set the node icon for a node
+    * @name set_icon(obj, icon)
+    * @param {mixed} obj
+    * @param {String} icon the new icon - can be a path to an icon or a className, 
+    * if using an image that is in the current directory use a `./` prefix, otherwise it will be detected as a class
+    */
+    set_icon: (obj: any, icon: string) => void;
+
+    /**
+    * get the node icon for a node
+    * @name get_icon(obj)
+    * @param {mixed} obj
+    * @return {String}
+    */
+    get_icon: (obj: any) => string;
+
+    /**
+    * hide the icon on an individual node
+    * @name hide_icon(obj)
+    * @param {mixed} obj
+    */
+    hide_icon: (obj: any) => void;
+
+    /**
+    * show the icon on an individual node
+    * @name show_icon(obj)
+    * @param {mixed} obj
+    */
+    show_icon: (obj: any) => void;
+
+    /**
+    * set the undetermined state where and if necessary. Used internally.
+    * @private
+    * @name _undetermined()
+    * @plugin checkbox
+    */
+    _undetermined: () => void;
+
+    /**
+    * show the node checkbox icons
+    * @name show_checkboxes()
+    * @plugin checkbox
+    */
+    show_checkboxes: () => void;
+
+    /**
+    * hide the node checkbox icons
+    * @name hide_checkboxes()
+    * @plugin checkbox
+    */
+    hide_checkboxes: () => void;
+
+    /**
+    * toggle the node icons
+    * @name toggle_checkboxes()
+    * @plugin checkbox
+    */
+    toggle_checkboxes: () => void;
+
+    /**
+    * checks if a node is in an undetermined state
+    * @name is_undetermined(obj)
+    * @param  {mixed} obj
+    * @return {Boolean}
+    */
+    is_undetermined: (obj: any) => boolean;
+
+    /**
+    * check a node (only if tie_selection in checkbox settings is false, otherwise select_node will be called internally)
+    * @name check_node(obj)
+    * @param {mixed} obj an array can be used to check multiple nodes
+    * @trigger check_node.jstree
+    * @plugin checkbox
+    */
+    check_node: (obj: any, e: any) => any;
+
+    /**
+    * uncheck a node (only if tie_selection in checkbox settings is false, otherwise deselect_node will be called internally)
+    * @name deselect_node(obj)
+    * @param {mixed} obj an array can be used to deselect multiple nodes
+    * @trigger uncheck_node.jstree
+    * @plugin checkbox
+    */
+    uncheck_node: (obj: any, e: any) => any;
+
+    /**
+    * checks all nodes in the tree (only if tie_selection in checkbox settings is false, otherwise select_all will be called internally)
+    * @name check_all()
+    * @trigger check_all.jstree, changed.jstree
+    * @plugin checkbox
+    */
+    check_all: () => any;
+
+    /**
+    * uncheck all checked nodes (only if tie_selection in checkbox settings is false, otherwise deselect_all will be called internally)
+    * @name uncheck_all()
+    * @trigger uncheck_all.jstree
+    * @plugin checkbox
+    */
+    uncheck_all: () => any;
+
+    /**
+    * checks if a node is checked (if tie_selection is on in the settings this function will return the same as is_selected)
+    * @name is_checked(obj)
+    * @param  {mixed}  obj
+    * @return {Boolean}
+    * @plugin checkbox
+    */
+    is_checked: (obj: any) => boolean;
+
+    /**
+    * get an array of all checked nodes (if tie_selection is on in the settings this function will return the same as get_selected)
+    * @name get_checked([full])
+    * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
+    * @return {Array}
+    * @plugin checkbox
+    */
+    get_checked: (full: any) => any[];
+
+    /**
+    * get an array of all top level checked nodes (ignoring children of checked nodes) (if tie_selection is on in the settings this function will return the same as get_top_selected)
+    * @name get_top_checked([full])
+    * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
+    * @return {Array}
+    * @plugin checkbox
+    */
+    get_top_checked: (full: any) => any[];
+
+    /**
+    * get an array of all bottom level checked nodes (ignoring selected parents) (if tie_selection is on in the settings this function will return the same as get_bottom_selected)
+    * @name get_bottom_checked([full])
+    * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
+    * @return {Array}
+    * @plugin checkbox
+    */
+    get_bottom_checked: (full: any) => any[];
+    
+    /**
+    * context menu plugin
+    */
+
+    /**
+    * prepare and show the context menu for a node
+    * @name show_contextmenu(obj [, x, y])
+    * @param {mixed} obj the node
+    * @param {Number} x the x-coordinate relative to the document to show the menu at
+    * @param {Number} y the y-coordinate relative to the document to show the menu at
+    * @param {Object} e the event if available that triggered the contextmenu
+    * @plugin contextmenu
+    * @trigger show_contextmenu.jstree
+    */
+    show_contextmenu: (obj: any, x?: number, y?: number, e?: any) => void;
+
+    /**
+    * show the prepared context menu for a node
+    * @name _show_contextmenu(obj, x, y, i)
+    * @param {mixed} obj the node
+    * @param {Number} x the x-coordinate relative to the document to show the menu at
+    * @param {Number} y the y-coordinate relative to the document to show the menu at
+    * @param {Number} i the object of items to show
+    * @plugin contextmenu
+    * @trigger show_contextmenu.jstree
+    * @private
+    */
+    _show_contextmenu: (obj: any, x: number, y: number, i: number) => void;
+
+    /**
+    * used to search the tree nodes for a given string
+    * @name search(str [, skip_async])
+    * @param {String} str the search string
+    * @param {Boolean} skip_async if set to true server will not be queried even if configured
+    * @param {Boolean} show_only_matches if set to true only matching nodes will be shown (keep in mind this can be very slow on large trees or old browsers)
+    * @param {mixed} inside an optional node to whose children to limit the search
+    * @param {Boolean} append if set to true the results of this search are appended to the previous search
+    * @plugin search
+    * @trigger search.jstree
+    */
+    search: (str: string, skip_async?: boolean, show_only_matches?: boolean, inside?: any, append?: boolean) => void;
+
+    /**
+    * used to clear the last search (removes classes and shows all nodes if filtering is on)
+    * @name clear_search()
+    * @plugin search
+    * @trigger clear_search.jstree
+    */
+    clear_search: () => void;
+
+    /**
+    * opens nodes that need to be opened to reveal the search results. Used only internally.
+    * @private
+    * @name _search_open(d)
+    * @param {Array} d an array of node IDs
+    * @plugin search
+    */
+    _search_open: (d: string[]) => void;
+
+    /**
+    * used to sort a node's children
+    * @private
+    * @name sort(obj [, deep])
+    * @param  {mixed} obj the node
+    * @param {Boolean} deep if set to `true` nodes are sorted recursively.
+    * @plugin sort
+    * @trigger search.jstree
+    */
+    sort: (obj: any, deep?: boolean) => void;
+
+    /**
+    * save the state
+    * @name save_state()
+    * @plugin state
+    */
+    save_state: () => void;
+
+    /**
+    * restore the state from the user's computer
+    * @name restore_state()
+    * @plugin state
+    */
+    restore_state: () => void;
+
+    /**
+    * clear the state on the user's computer
+    * @name clear_state()
+    * @plugin state
+    */
+    clear_state: () => void;
+
+    /**
+    * used to retrieve the type settings object for a node
+    * @name get_rules(obj)
+    * @param {mixed} obj the node to find the rules for
+    * @return {Object}
+    * @plugin types
+    */
+    get_rules: (obj: any) => any;
+
+    /**
+    * used to retrieve the type string or settings object for a node
+    * @name get_type(obj [, rules])
+    * @param {mixed} obj the node to find the rules for
+    * @param {Boolean} rules if set to `true` instead of a string the settings object will be returned
+    * @return {String|Object}
+    * @plugin types
+    */
+    get_type: (obj: any, rules?: any) => any;
+
+    /**
+    * used to change a node's type
+    * @name set_type(obj, type)
+    * @param {mixed} obj the node to change
+    * @param {String} type the new type
+    * @plugin types
+    */
+    set_type: (obj: any, type: string) => any;
+}
+
+interface JSTreeGetJsonOptions {
+    /**
+    * do not return state information
+    */
+    no_state: boolean;
+    
+    /**
+    * do not return ID
+    */
+    no_id: boolean;
+    
+    /**
+    * do not include children
+    */
+    no_children: boolean;
+
+    /**
+    * do not include node data
+    */
+    no_data: boolean;
+
+    /**
+    * return flat JSON instead of nested
+    */
+    flat: boolean;
+}
+
+interface JSTreeBindOptions {
+    inst?: any;
+    args?: any;
+    rslt?: any;
+    rlbk?: any;
+}
+
+interface Buffer {
+    mode: string;
+    node: any[];
+    inst: any;
+}
diff --git a/jstree/jstree-tests.ts b/jstree/jstree-tests.ts
index 1c8ef86c48..ab54eb95d0 100644
--- a/jstree/jstree-tests.ts
+++ b/jstree/jstree-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jstree.d.ts" />
+
 
 // gets version of lib
 var version: string = $.jstree.version;
diff --git a/jstree/jstree.d.ts b/jstree/jstree.d.ts
deleted file mode 100644
index db60de893d..0000000000
--- a/jstree/jstree.d.ts
+++ /dev/null
@@ -1,1822 +0,0 @@
-// Type definitions for jsTree v3.0.9 
-// Project: http://www.jstree.com/
-// Definitions by: Adam Pluciński <https://github.com/adaskothebeast>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// 45 commit df38535 2015-03-02 13:23 +2:00
-
-///<reference path="../jquery/jquery.d.ts" />
-
-interface JQueryStatic {
-    /**
-    * holds all jstree related functions and variables, 
-    * including the actual class and methods to create, 
-    * access and manipulate instances.
-    * @property jstree
-    * @type {JSTreeStatic}
-    */
-    jstree?: JSTreeStatic;
-}
-
-interface JQuery {
-    /**
-     * Create an instance, get an instance or invoke a command on a instance. 
-     * 
-     * If there is no instance associated with the current node a new one is created 
-     * and `arg` is used to extend `$.jstree.defaults` for this new instance. There would be no return value (chaining is not broken).
-     * 
-     * If there is an existing instance and `arg` is a string the command specified by `arg` is executed on the instance, 
-     * with any additional arguments passed to the function. If the function returns a value it will be returned (chaining could break depending on function).
-     * 
-     * If there is an existing instance and `arg` is not a string the instance itself is returned (similar to `$.jstree.reference`).
-     * 
-     * In any other case - nothing is returned and chaining is not broken.
-     *
-     * __Examples__
-     *
-     *	$('#tree1').jstree(); // creates an instance
-     *	$('#tree2').jstree({ plugins : [] }); // create an instance with some options
-     *	$('#tree1').jstree('open_node', '#branch_1'); // call a method on an existing instance, passing additional arguments
-     *	$('#tree2').jstree(); // get an existing instance (or create an instance)
-     *	$('#tree2').jstree(true); // get an existing instance (will not create new instance)
-     *	$('#branch_1').jstree().select_node('#branch_1'); // get an instance (using a nested element and call a method)
-     *
-     * @name $().jstree([arg])
-     * @param {String|Object} arg
-     * @return {Mixed}
-     */
-    jstree(): JSTree;
-    jstree(options: JSTreeStaticDefaults): JSTree;
-    jstree(arg: boolean): JSTree;
-    jstree(...args: any[]): any;
-}
-
-interface JSTreeStatic {
-    /**
-     * specifies the jstree version in use
-     * @name $.jstree.version
-     */
-    version: string;
-
-    /**
-     * holds all the default options used when creating new instances
-     * @name $.jstree.defaults
-     */
-    defaults: JSTreeStaticDefaults;
-
-    /**
-    * stores all loaded jstree plugins (used internally)
-    */
-    plugins: any[];
-    path: string;
-    idregex: any;
-
-    /**
-     * creates a jstree instance
-     * @name $.jstree.create(el [, options])
-     * @param {DOMElement|jQuery|String} el the element to create the instance on, can be jQuery extended or a selector
-     * @param {Object} options options for this instance (extends `$.jstree.defaults`)
-     * @return {jsTree} the new instance
-     */
-    create(el: any, options?: JSTreeStaticDefaults): JSTree;
-
-    /**
-     * remove all traces of jstree from the DOM and destroy all instances
-     * @name $.jstree.destroy()
-     */
-    destroy(): void;
-
-    /**
-     * the jstree class constructor, used only internally
-     * @private
-     * @name $.jstree.core(id)
-     * @param {Number} id this instance's index
-     */
-    core(id: number): void;
-
-    /**
-    * get a reference to an existing instance
-    * 
-    * __Examples__
-    *
-    * $.jstree.reference('tree');
-    * $.jstree.reference('#tree');
-    * $.jstree.reference('branch');
-    * $.jstree.reference('#branch');
-    *
-    * @param {String} selector 
-    * @returns {JSTree|null} the instance or `null` if not found
-    */
-    reference(selector: string): JSTree;
-
-    /**
-    * get a reference to an existing instance
-    * 
-    * __Examples__
-    *
-    * $.jstree.reference(document.getElementByID('tree'));
-    * $.jstree.reference(document.getElementByID('branch'));
-    *
-    * @param {HTMLElement} element 
-    * @returns {JSTree|null} the instance or `null` if not found
-    */
-    reference(element: HTMLElement): JSTree;
-
-    /**
-    * get a reference to an existing instance
-    * 
-    * __Examples__
-    *
-    * $.jstree.reference($('#tree'));
-    * $.jstree.reference($('#branch'));
-    *
-    * @param {JQuery} object 
-    * @returns {JSTree|null} the instance or `null` if not found
-    */
-    reference(object: JQuery): JSTree;
-}
-
-interface JSTreeStaticDefaults {
-    /**
-     * configure which plugins will be active on an instance.
-     * Should be an array of strings, where each element is a plugin name.
-     * The default is `[]`
-     * @name $.jstree.defaults.plugins
-     */
-    plugins: string[];
-
-    /**
-     * stores all defaults for the core
-     * @name $.jstree.defaults.core
-     */
-    core: JSTreeStaticDefaultsCore;
-
-    /**
-    * stores all defaults for the checkbox plugin
-    */
-    checkbox?: JSTreeStaticDefaultsCheckbox;
-
-    /**
-    * stores all defaults for the contextmenu plugin
-    */
-    contextmenu?: JSTreeStaticDefaultsContextMenu;
-
-    /**
-    * stores all defaults for the drag'n'drop plugin
-    */
-    dnd?: JSTreeStaticDefaultsDragNDrop;
-
-    /**
-     * Adds massload functionality to jsTree, so that multiple nodes can be loaded in a single request (only useful with lazy loading).
-     */
-    massload?: JSTreeStaticDefaultsMassload;
-
-    /**
-    * stores all defaults for the search plugin
-    */
-    search?: JSTreeStaticDefaultsSearch;
-
-    /**
-     * the settings function used to sort the nodes.
-     * It is executed in the tree's context, accepts two nodes as arguments and should return `1` or `-1`.
-     * @name $.jstree.defaults.sort
-     * @plugin sort
-     */
-    sort?: (x: any, y: any) => number;
-
-    /**
-    * stores all defaults for the state plugin
-    */
-    state?: JSTreeStaticDefaultsState;
-
-    /**
-    * An object storing all types as key value pairs,
-    * where the key is the type name and the value is an object 
-    * that could contain following keys (all optional).
-    * max_children the maximum number of immediate children this node type can have.
-    * Do not specify or set to -1 for unlimited.
-    * max_depth the maximum number of nesting this node type can have. 
-    * A value of 1 would mean that the node can have children, but no grandchildren. 
-    * Do not specify or set to -1 for unlimited.
-    * valid_children an array of node type strings, that nodes of this type can have as children. 
-    * Do not specify or set to -1 for no limits.
-    * icon a string - can be a path to an icon or a className, if using an image 
-    * that is in the current directory use a ./ prefix, otherwise it will be detected as a class. 
-    * Omit to use the default icon from your theme.
-    * There are two predefined types:
-    * # represents the root of the tree, for example max_children would control the maximum number of root nodes.
-    * default represents the default node - any settings here will be applied to all nodes that do not have a type specified.
-    */
-    types?: any;
-
-    /**
-    * stores all defaults for the unique plugin
-    * @name $.jstree.defaults.unique
-    * @plugin unique
-    */
-    unique?: JSTreeStaticDefaultsUnique;
-}
-
-interface JSTreeStaticDefaultsCore {
-    /**
-    * data configuration
-    * 
-    * If left as `false` the HTML inside the jstree container element is used to populate the tree (that should be an unordered list with list items).
-    *
-    * You can also pass in a HTML string or a JSON array here.
-    * 
-    * It is possible to pass in a standard jQuery-like AJAX config and jstree will automatically determine if the response is JSON or HTML and use that to populate the tree. 
-    * In addition to the standard jQuery ajax options here you can suppy functions for `data` and `url`, the functions will be run in the current instance's scope and a param will be passed indicating which node is being loaded, the return value of those functions will be used.
-    * 
-    * The last option is to specify a function, that function will receive the node being loaded as argument and a second param which is a function which should be called with the result.
-    *
-    * __Examples__
-    *
-    *	// AJAX
-    *	$('#tree').jstree({
-    *		'core' : {
-    *			'data' : {
-    *				'url' : '/get/children/',
-    *				'data' : function (node) {
-    *					return { 'id' : node.id };
-    *				}
-    *			}
-    *		});
-    *
-    *	// direct data
-    *	$('#tree').jstree({
-    *		'core' : {
-    *			'data' : [
-    *				'Simple root node',
-    *				{
-    *					'id' : 'node_2',
-    *					'text' : 'Root node with options',
-    *					'state' : { 'opened' : true, 'selected' : true },
-    *					'children' : [ { 'text' : 'Child 1' }, 'Child 2']
-    *				}
-    *			]
-    *		});
-    *	
-    *	// function
-    *	$('#tree').jstree({
-    *		'core' : {
-    *			'data' : function (obj, callback) {
-    *				callback.call(this, ['Root 1', 'Root 2']);
-    *			}
-    *		});
-    * 
-    * @name $.jstree.defaults.core.data
-    */
-    data?: any;
-
-    /**
-    * configure the various strings used throughout the tree
-    *
-    * You can use an object where the key is the string you need to replace and the value is your replacement.
-    * Another option is to specify a function which will be called with an argument of the needed string and should return the replacement.
-    * If left as `false` no replacement is made.
-    *
-    * __Examples__
-    *
-    *	$('#tree').jstree({
-    *		'core' : {
-    *			'strings' : {
-    *				'Loading ...' : 'Please wait ...'
-    *			}
-    *		}
-    *	});
-    *
-    * @name $.jstree.defaults.core.strings
-    */
-    strings?: any;
-
-    /**
-    * determines what happens when a user tries to modify the structure of the tree
-    * If left as `false` all operations like create, rename, delete, move or copy are prevented.
-    * You can set this to `true` to allow all interactions or use a function to have better control.
-    *
-    * __Examples__
-    *
-    *	$('#tree').jstree({
-    *		'core' : {
-    *			'check_callback' : function (operation, node, node_parent, node_position, more) {
-    *				// operation can be 'create_node', 'rename_node', 'delete_node', 'move_node' or 'copy_node'
-    *				// in case of 'rename_node' node_position is filled with the new node name
-    *				return operation === 'rename_node' ? true : false;
-    *			}
-    *		}
-    *	});
-    * 
-    * @name $.jstree.defaults.core.check_callback
-    */
-    check_callback?: any;
-
-    /**
-    * a callback called with a single object parameter in the instance's scope when something goes wrong (operation prevented, ajax failed, etc)
-    * @name $.jstree.defaults.core.error
-    */
-    error: () => any;
-
-    /**
-    * the open / close animation duration in milliseconds - set this to `false` to disable the animation (default is `200`)
-    * @name $.jstree.defaults.core.animation
-    */
-    animation?: any;
-
-    /**
-    * a boolean indicating if multiple nodes can be selected
-    * @name $.jstree.defaults.core.multiple
-    */
-    multiple?: boolean;
-
-    /**
-    * theme configuration object
-    * @name $.jstree.defaults.core.themes
-    */
-    themes?: JSTreeStaticDefaultsCoreThemes;
-
-    /**
-    * if left as `true` all parents of all selected nodes will be opened once the tree loads (so that all selected nodes are visible to the user)
-    * @name $.jstree.defaults.core.expand_selected_onload
-    */
-    expand_selected_onload?: boolean;
-
-    /**
-    * if left as `true` web workers will be used to parse incoming JSON data where possible, so that the UI will not be blocked by large requests. 
-    * Workers are however about 30% slower. Defaults to `true`
-    * @name $.jstree.defaults.core.worker
-    */
-    worker?: boolean;
-
-    /**
-    * Force node text to plain text (and escape HTML). Defaults to `false`
-    * @name $.jstree.defaults.core.force_text
-    */
-    force_text?: boolean;
-
-    /**
-    * Should the node should be toggled if the text is double clicked . Defaults to `true`
-    * @name $.jstree.defaults.core.dblclick_toggle
-    */
-    dblclick_toggle?: boolean;
-}
-
-interface JSTreeStaticDefaultsCoreThemes {
-    /**
-    * the name of the theme to use (if left as `false` the default theme is used)
-    * @name $.jstree.defaults.core.themes.name
-    */
-    name?: string;
-
-    /**
-    * the URL of the theme's CSS file, leave this as `false` if you have manually included the theme CSS (recommended). You can set this to `true` too which will try to autoload the theme.
-    * @name $.jstree.defaults.core.themes.url
-    */
-    url?: string;
-
-    /**
-    * the location of all jstree themes - only used if `url` is set to `true`
-    * @name $.jstree.defaults.core.themes.dir
-    */
-    dir?: string;
-
-    /**
-    * a boolean indicating if connecting dots are shown
-    * @name $.jstree.defaults.core.themes.dots
-    */
-    dots?: boolean;
-
-    /**
-    * a boolean indicating if node icons are shown
-    * @name $.jstree.defaults.core.themes.icons
-    */
-    icons?: boolean;
-
-    /**
-    * a boolean indicating if the tree background is striped
-    * @name $.jstree.defaults.core.themes.stripes
-    */
-    stripes?: boolean;
-
-    /**
-    * a string (or boolean `false`) specifying the theme variant to use (if the theme supports variants)
-    * @name $.jstree.defaults.core.themes.variant
-    */
-    variant?: any;
-
-    /**
-    * a boolean specifying if a reponsive version of the theme should kick in on smaller screens (if the theme supports it). Defaults to `false`.
-    * @name $.jstree.defaults.core.themes.responsive
-    */
-    responsive?: boolean;
-}
-
-interface JSTreeStaticDefaultsCheckbox {
-    /**
-    * a boolean indicating if checkboxes should be visible (can be changed at a later time using `show_checkboxes()` and `hide_checkboxes`). Defaults to `true`.
-    * @name $.jstree.defaults.checkbox.visible
-    * @plugin checkbox
-    */
-    visible: boolean;
-
-    /**
-    * a boolean indicating if checkboxes should cascade down and have an undetermined state. Defaults to `true`.
-    * @name $.jstree.defaults.checkbox.three_state
-    * @plugin checkbox
-    */
-    three_state: boolean;
-
-    /**
-    * a boolean indicating if clicking anywhere on the node should act as clicking on the checkbox. Defaults to `true`.
-    * @name $.jstree.defaults.checkbox.whole_node
-    * @plugin checkbox
-    */
-    whole_node: boolean;
-
-    /**
-    * a boolean indicating if the selected style of a node should be kept, or removed. Defaults to `true`.
-    * @name $.jstree.defaults.checkbox.keep_selected_style
-    * @plugin checkbox
-    */
-    keep_selected_style: boolean;
-
-    /**
-    * This setting controls how cascading and undetermined nodes are applied. 
-    * If 'up' is in the string - cascading up is enabled, if 'down' is in the string - cascading down is enabled, if 'undetermined' is in the string - undetermined nodes will be used. 
-    * If `three_state` is set to `true` this setting is automatically set to 'up+down+undetermined'. Defaults to ''.
-    * @name $.jstree.defaults.checkbox.cascade
-    * @plugin checkbox
-    */
-    cascade: boolean;
-
-    /**
-    * This setting controls if checkbox are bound to the general tree selection 
-    * or to an internal array maintained by the checkbox plugin. 
-    * Defaults to `true`, only set to `false` if you know exactly what you are doing. 
-    * @name $.jstree.defaults.checkbox.tie_selection
-    * @plugin checkbox
-    */
-    tie_selection: boolean;
-}
-
-interface JSTreeStaticDefaultsContextMenu {
-    /**
-    * a boolean indicating if the node should be selected when the context menu is invoked on it. Defaults to `true`.
-    * @name $.jstree.defaults.contextmenu.select_node
-    * @plugin contextmenu
-    */
-    select_node: boolean;
-
-    /**
-    * a boolean indicating if the menu should be shown aligned with the node. Defaults to `true`, otherwise the mouse coordinates are used.
-    * @name $.jstree.defaults.contextmenu.show_at_node
-    * @plugin contextmenu
-    */
-    show_at_node: boolean;
-
-    /**
-    * an object of actions, or a function that accepts a node and a callback function and calls the callback function with an object of actions available for that node (you can also return the items too).
-    * 
-    * Each action consists of a key (a unique name) and a value which is an object with the following properties (only label and action are required):
-    * 
-    * * `separator_before` - a boolean indicating if there should be a separator before this item
-    * * `separator_after` - a boolean indicating if there should be a separator after this item
-    * * `_disabled` - a boolean indicating if this action should be disabled
-    * * `label` - a string - the name of the action (could be a function returning a string)
-    * * `action` - a function to be executed if this item is chosen
-    * * `icon` - a string, can be a path to an icon or a className, if using an image that is in the current directory use a `./` prefix, otherwise it will be detected as a class
-    * * `shortcut` - keyCode which will trigger the action if the menu is open (for example `113` for rename, which equals F2)
-    * * `shortcut_label` - shortcut label (like for example `F2` for rename)
-    * 
-    * @name $.jstree.defaults.contextmenu.items
-    * @plugin contextmenu
-    */
-    items: any;
-}
-
-interface JSTreeStaticDefaultsDragNDrop {
-    /**
-    * a boolean indicating if a copy should be possible while dragging (by pressint the meta key or Ctrl). Defaults to `true`.
-    * @name $.jstree.defaults.dnd.copy
-    * @plugin dnd
-    */
-    copy: boolean;
-
-    /**
-    * a number indicating how long a node should remain hovered while dragging to be opened. Defaults to `500`.
-    * @name $.jstree.defaults.dnd.open_timeout
-    * @plugin dnd
-    */
-    open_timeout: number;
-
-    /**
-    * a function invoked each time a node is about to be dragged, invoked in the tree's scope and receives the nodes about to be dragged as an argument (array) - return `false` to prevent dragging
-    * @name $.jstree.defaults.dnd.is_draggable
-    * @plugin dnd
-    */
-    is_draggable: boolean;
-
-    /**
-    * a boolean indicating if checks should constantly be made while the user is dragging the node (as opposed to checking only on drop), default is `true`
-    * @name $.jstree.defaults.dnd.check_while_dragging
-    * @plugin dnd
-    */
-    check_while_dragging: boolean;
-
-    /**
-    * a boolean indicating if nodes from this tree should only be copied with dnd (as opposed to moved), default is `false`
-    * @name $.jstree.defaults.dnd.always_copy
-    * @plugin dnd
-    */
-    always_copy: boolean;
-
-    /**
-    * when dropping a node "inside", this setting indicates the position the node should go to - it can be an integer or a string: "first" (same as 0) or "last", default is `0`
-    * @name $.jstree.defaults.dnd.inside_pos
-    * @plugin dnd
-    */
-    inside_pos: any;
-
-    /**
-    * when starting the drag on a node that is selected this setting controls if all selected nodes are dragged or only the single node, default is `true`, which means all selected nodes are dragged when the drag is started on a selected node
-    * @name $.jstree.defaults.dnd.drag_selection
-    * @plugin dnd
-    */
-    drag_selection: boolean;
-
-    /**
-    * controls whether dnd works on touch devices. If left as boolean true dnd will work the same as in desktop browsers, which in some cases may impair scrolling. If set to boolean false dnd will not work on touch devices. There is a special third option - string "selected" which means only selected nodes can be dragged on touch devices.
-    * @name $.jstree.defaults.dnd.touch
-    * @plugin dnd
-    */
-    touch: boolean;
-
-    /**
-    * controls whether items can be dropped anywhere on the node, not just on the anchor, by default only the node anchor is a valid drop target. Works best with the wholerow plugin. If enabled on mobile depending on the interface it might be hard for the user to cancel the drop, since the whole tree container will be a valid drop target.
-    * @name $.jstree.defaults.dnd.large_drop_target
-    * @plugin dnd
-    */
-    large_drop_target: boolean;
-
-    /**
-    * controls whether a drag can be initiated from any part of the node and not just the text/icon part, works best with the wholerow plugin. Keep in mind it can cause problems with tree scrolling on mobile depending on the interface - in that case set the touch option to "selected".
-    * @name $.jstree.defaults.dnd.large_drag_target
-    * @plugin dnd
-    */
-    large_drag_target: boolean;
-}
-
-interface JSTreeStaticDefaultsMassload {
-    /**
-    * massload configuration
-    *
-    * It is possible to set this to a standard jQuery-like AJAX config.
-    * In addition to the standard jQuery ajax options here you can supply functions for `data` and `url`, the functions will be run in the current instance's scope and a param will be passed indicating which node IDs need to be loaded, the return value of those functions will be used.
-    *
-    * You can also set this to a function, that function will receive the node IDs being loaded as argument and a second param which is a function (callback) which should be called with the result.
-    *
-    * Both the AJAX and the function approach rely on the same return value - an object where the keys are the node IDs, and the value is the children of that node as an array.
-    *
-    *	{
-    *		"id1" : [{ "text" : "Child of ID1", "id" : "c1" }, { "text" : "Another child of ID1", "id" : "c2" }],
-    *		"id2" : [{ "text" : "Child of ID2", "id" : "c3" }]
-    *	}
-    * 
-    * @name $.jstree.defaults.massload
-    * @plugin massload
-    */
-
-    url: any;
-
-    data: any;
-}
-
-interface JSTreeStaticDefaultsSearch {
-    /**
-    * a jQuery-like AJAX config, which jstree uses if a server should be queried for results. 
-    * 
-    * A `str` (which is the search string) parameter will be added with the request, 
-    * an optional `inside` parameter will be added if the search is limited to a node id. 
-    * The expected result is a JSON array with nodes that need to be opened so that matching nodes will be revealed.
-    * Leave this setting as `false` to not query the server. You can also set this to a function, 
-    * which will be invoked in the instance's scope and receive 3 parameters - the search string, 
-    * the callback to call with the array of nodes to load, and the optional node ID to limit the search to 
-    * @name $.jstree.defaults.search.ajax
-    * @plugin search
-    */
-    ajax: any;
-
-    /**
-    * Indicates if the search should be fuzzy or not (should `chnd3` match `child node 3`). Default is `true`.
-    * @name $.jstree.defaults.search.fuzzy
-    * @plugin search
-    */
-    fuzzy: boolean;
-
-    /**
-    * Indicates if the search should be case sensitive. Default is `false`.
-    * @name $.jstree.defaults.search.case_sensitive
-    * @plugin search
-    */
-    case_sensitive: boolean;
-
-    /**
-    * Indicates if the tree should be filtered (by default) to show only matching nodes 
-    * (keep in mind this can be a heavy on large trees in old browsers).
-    * This setting can be changed at runtime when calling the search method. Default is `false`.
-    * @name $.jstree.defaults.search.show_only_matches
-    * @plugin search
-    */
-    show_only_matches: boolean;
-
-    /**
-    * Indicates if all nodes opened to reveal the search result, 
-    * should be closed when the search is cleared or a new search is performed. Default is `true`.
-    * @name $.jstree.defaults.search.close_opened_onclear
-    * @plugin search
-    */
-    close_opened_onclear: boolean;
-
-    /**
-    * Indicates if only leaf nodes should be included in search results. Default is `false`.
-    * @name $.jstree.defaults.search.search_leaves_only
-    * @plugin search
-    */
-    search_leaves_only: boolean;
-
-    /**
-    * If set to a function it wil be called in the instance's scope with two arguments - 
-    * search string and node (where node will be every node in the structure, so use with caution).
-    * If the function returns a truthy value the node will be considered a match 
-    * (it might not be displayed if search_only_leaves is set to true and the node is not a leaf). Default is `false`.
-    * @name $.jstree.defaults.search.search_callback
-    * @plugin search
-    */
-    search_callback: any;
-}
-
-interface JSTreeStaticDefaultsState {
-    /**
-    * A string for the key to use when saving the current tree (change if using multiple trees in your project). Defaults to `jstree`.
-    * @name $.jstree.defaults.state.key
-    * @plugin state
-    */
-    key: string;
-
-    /**
-    * A space separated list of events that trigger a state save. Defaults to `changed.jstree open_node.jstree close_node.jstree`.
-    * @name $.jstree.defaults.state.events
-    * @plugin state
-    */
-    events: string;
-
-    /**
-    * Time in milliseconds after which the state will expire. Defaults to 'false' meaning - no expire.
-    * @name $.jstree.defaults.state.ttl
-    * @plugin state
-    */
-    ttl: any;
-
-    /**
-    * A function that will be executed prior to restoring state with one argument - the state object. Can be used to clear unwanted parts of the state.
-    * @name $.jstree.defaults.state.filter
-    * @plugin state
-    */
-    filter: any;
-}
-
-interface JSTreeStaticDefaultsUnique {
-    /**
-    * Indicates if the comparison should be case sensitive. Default is `false`.
-    * @name $.jstree.defaults.unique.case_sensitive
-    * @plugin unique
-    */
-    case_sensitive: boolean;
-    /**
-    * A callback executed in the instance's scope when a new node is created 
-    * and the name is already taken, the two arguments are the conflicting name and the counter. 
-    * The default will produce results like `New node (2)`.
-    * @name $.jstree.defaults.unique.duplicate
-    * @plugin unique
-    */
-    duplicate: (name: string, counter: number) => string;
-}
-
-interface JSTree extends JQuery {
-    /**
-    * used to decorate an instance with a plugin. Used internally.
-    * @private
-    * @name plugin(deco [, opts])
-    * @param  {String} deco the plugin to decorate with
-    * @param  {Object} opts options for the plugin
-    * @return {jsTree}
-    */
-    plugin: (deco: string, opts?: any) => JSTree;
-
-    /**
-    * used to decorate an instance with a plugin. Used internally.
-    * @private
-    * @name init(el, options)
-    * @param {DOMElement|jQuery|String} el the element we are transforming
-    * @param {Object} options options for this instance
-    * @trigger init.jstree, loading.jstree, loaded.jstree, ready.jstree, changed.jstree
-    */
-    init: (el:any, options:any) => void;
-
-    /**
-    * destroy an instance
-    * @name destroy()
-    * @param  {Boolean} keep_html if not set to `true` the container will be emptied, otherwise the current DOM elements will be kept intact
-    */
-    destroy: (keep_html?: boolean) => void;
-
-    /**
-    * part of the destroying of an instance. Used internally.
-    * @private
-    * @name teardown()
-    */
-    teardown: () => void;
-
-    /**
-    * bind all events. Used internally.
-    * @private
-    * @name bind()
-    */
-    bind: () => any;
-
-    /**
-    * part of the destroying of an instance. Used internally.
-    * @private
-    * @name unbind()
-    */
-    unbind: () => any;
-
-    /**
-    * trigger an event. Used internally.
-    * @private
-    * @name trigger(ev [, data])
-    * @param  {String} ev the name of the event to trigger
-    * @param  {Object} data additional data to pass with the event
-    */
-    /*
-     * defined in JQuery
-     */
-    // trigger: (ev: string, data?: Object) => any;
-    
-    /**
-    * returns the jQuery extended instance container
-    * @name get_container()
-    * @return {jQuery}
-    */
-    get_container: () => JQuery;
-
-    /**
-    * returns the jQuery extended main UL node inside the instance container. Used internally.
-    * @private
-    * @name get_container_ul()
-    * @return {jQuery}
-    */
-    get_container_ul: () => JQuery;
-
-    /**
-    * gets string replacements (localization). Used internally.
-    * @private
-    * @name get_string(key)
-    * @param  {String} key
-    * @return {String}
-    */
-    get_string: (key: string) => string;
-
-    /**
-    * gets the first child of a DOM node. Used internally.
-    * @private
-    * @name _firstChild(dom)
-    * @param  {DOMElement} dom
-    * @return {DOMElement}
-    */
-    _firstChild: (dom: HTMLElement) => HTMLElement;
-
-    /**
-    * gets the next sibling of a DOM node. Used internally.
-    * @private
-    * @name _nextSibling(dom)
-    * @param  {DOMElement} dom
-    * @return {DOMElement}
-    */
-    _nextSibling: (dom: HTMLElement) => HTMLElement;
-
-    /**
-    * gets the previous sibling of a DOM node. Used internally.
-    * @private
-    * @name _previousSibling(dom)
-    * @param  {DOMElement} dom
-    * @return {DOMElement}
-    */
-    _previousSibling: (dom: HTMLElement) => HTMLElement;
-
-    /**
-    * get the JSON representation of a node (or the actual jQuery extended DOM node) by using any input (child DOM element, ID string, selector, etc)
-    * @name get_node(obj [, as_dom])
-    * @param  {mixed} obj
-    * @param  {Boolean} as_dom
-    * @return {Object|jQuery}
-    */
-    get_node: (obj: any, as_dom?: boolean) => any;
-
-    /**
-    * get the path to a node, either consisting of node texts, or of node IDs, optionally glued together (otherwise an array)
-    * @name get_path(obj [, glue, ids])
-    * @param  {mixed} obj the node
-    * @param  {String} glue if you want the path as a string - pass the glue here (for example '/'), if a falsy value is supplied here, an array is returned
-    * @param  {Boolean} ids if set to true build the path using ID, otherwise node text is used
-    * @return {mixed}
-    */
-    get_path: (obj: any, glue: string, ids: boolean) => any;
-
-    /**
-    * get the next visible node that is below the `obj` node. If `strict` is set to `true` only sibling nodes are returned.
-    * @name get_next_dom(obj [, strict])
-    * @param  {mixed} obj
-    * @param  {Boolean} strict
-    * @return {jQuery}
-    */
-    get_next_dom: (obj: any, strict?: boolean) => JQuery;
-
-    /**
-    * get the previous visible node that is above the `obj` node. If `strict` is set to `true` only sibling nodes are returned.
-    * @name get_prev_dom(obj [, strict])
-    * @param  {mixed} obj
-    * @param  {Boolean} strict
-    * @return {jQuery}
-    */
-    get_prev_dom: (obj: any, strict?: boolean) => JQuery;
-
-    /**
-    * get the parent ID of a node
-    * @name get_parent(obj)
-    * @param  {mixed} obj
-    * @return {String}
-    */
-    get_parent: (obj: any) => string;
-
-    /**
-    * get a jQuery collection of all the children of a node (node must be rendered)
-    * @name get_children_dom(obj)
-    * @param  {mixed} obj
-    * @return {jQuery}
-    */
-    get_children_dom: (obj: any) => JQuery;
-
-    /**
-    * checks if a node has children
-    * @name is_parent(obj)
-    * @param  {mixed} obj
-    * @return {Boolean}
-    */
-    is_parent: (obj: any) => boolean;
-
-    /**
-    * checks if a node is loaded (its children are available)
-    * @name is_loaded(obj)
-    * @param  {mixed} obj
-    * @return {Boolean}
-    */
-    is_loaded: (obj: any) => boolean;
-
-    /**
-    * check if a node is currently loading (fetching children)
-    * @name is_loading(obj)
-    * @param  {mixed} obj
-    * @return {Boolean}
-    */
-    is_loading: (obj: any) => boolean;
-
-    /**
-    * check if a node is opened
-    * @name is_open(obj)
-    * @param  {mixed} obj
-    * @return {Boolean}
-    */
-    is_open: (obj: any) => boolean;
-
-    /**
-    * check if a node is in a closed state
-    * @name is_closed(obj)
-    * @param  {mixed} obj
-    * @return {Boolean}
-    */
-    is_closed: (obj: any) => boolean;
-
-    /**
-    * check if a node has no children
-    * @name is_leaf(obj)
-    * @param  {mixed} obj
-    * @return {Boolean}
-    */
-    is_leaf: (obj: any) => boolean;
-
-    /**
-    * loads a node (fetches its children using the `core.data` setting). Multiple nodes can be passed to by using an array.
-    * @name load_node(obj [, callback])
-    * @param  {mixed} obj
-    * @param  {function} callback a function to be executed once loading is conplete, the function is executed in the instance's scope 
-    * and receives two arguments - the node and a boolean status
-    * @return {Boolean}
-    * @trigger load_node.jstree
-    */
-    load_node: (obj: any, callback: (node: any, status: boolean) => void) => boolean;
-
-    /**
-    * load an array of nodes (will also load unavailable nodes as soon as the appear in the structure). Used internally.
-    * @private
-    * @name _load_nodes(nodes [, callback])
-    * @param  {array} nodes
-    * @param  {function} callback a function to be executed once loading is complete, the function is executed in the instance's scope and receives one argument - the array passed to _load_nodes
-    * @param  {Boolean} is_callback - if false reloads node (AP - original comment missing in source code)
-    */
-    _load_nodes: (nodes: any[], callback?: (nodes: any[]) => void, is_callback?: boolean) => void;
-
-    /**
-    * loads all unloaded nodes
-    * @name load_all([obj, callback])
-    * @param {mixed} obj the node to load recursively, omit to load all nodes in the tree
-    * @param {function} callback a function to be executed once loading all the nodes is complete,
-    * @trigger load_all.jstree
-    */
-    load_all: (obj: any, callback: () => void) => void;
-
-    /**
-    * handles the actual loading of a node. Used only internally.
-    * @private
-    * @name _load_node(obj [, callback])
-    * @param  {mixed} obj
-    * @param  {function} callback a function to be executed once loading is complete, the function is executed in the instance's scope and receives one argument - a boolean status
-    * @return {Boolean}
-    */
-    _load_node: (obj: any, callback?: (status: boolean) => void) => boolean;
-    
-    /**
-    * adds a node to the list of nodes to redraw. Used only internally.
-    * @private
-    * @name _node_changed(obj)
-    * @param  {mixed} obj
-    */
-    _node_changed: (obj: any) => void;
-
-    /**
-    * appends HTML content to the tree. Used internally.
-    * @private
-    * @name _append_html_data(obj, data)
-    * @param  {mixed} obj the node to append to
-    * @param  {String} data the HTML string to parse and append
-    * @param {function} callback function which takes boolean flag executes after append (AP: originally lack of comment)
-    * @trigger model.jstree, changed.jstree
-    */
-    _append_html_data: (dom: any, data: string, cb: (flag: boolean) => void) => void;
-
-    /**
-    * appends JSON content to the tree. Used internally.
-    * @private
-    * @name _append_json_data(obj, data)
-    * @param  {mixed} dom the node to append to
-    * @param  {String} data the JSON object to parse and append
-    * @param  {function} cb function which takes boolean flag executes after append (AP: originally lack of comment)
-    * @param  {Boolean} force_processing internal param - do not set
-    * @trigger model.jstree, changed.jstree
-    */
-    _append_json_data: (dom: any, data: string, cb: (flag: boolean) => void, force_processing: boolean) => void;
-
-    /**
-    * parses a node from a jQuery object and appends them to the in memory tree model. Used internally.
-    * @private
-    * @name _parse_model_from_html(d [, p, ps])
-    * @param  {jQuery} d the jQuery object to parse
-    * @param  {String} p the parent ID
-    * @param  {Array} ps list of all parents
-    * @return {String} the ID of the object added to the model
-    */
-    _parse_model_from_html: (d: JQuery, p?: string, ps?: any[]) => string;
-
-    /**
-    * parses a node from a JSON object (used when dealing with flat data, which has no nesting of children, but has id and parent properties) and appends it to the in memory tree model. Used internally.
-    * @private
-    * @name _parse_model_from_flat_json(d [, p, ps])
-    * @param  {Object} d the JSON object to parse
-    * @param  {String} p the parent ID
-    * @param  {Array} ps list of all parents
-    * @return {String} the ID of the object added to the model
-    */
-    _parse_model_from_flat_json: (d: any, p?: string, ps?: any[]) => string;
-
-    /**
-    * parses a node from a JSON object and appends it to the in memory tree model. Used internally.
-    * @private
-    * @name _parse_model_from_json(d [, p, ps])
-    * @param  {Object} d the JSON object to parse
-    * @param  {String} p the parent ID
-    * @param  {Array} ps list of all parents
-    * @return {String} the ID of the object added to the model
-    */
-    _parse_model_from_json: (d: any, p?: string, ps?: any[]) => string;
-
-    /**
-    * redraws all nodes that need to be redrawn. Used internally.
-    * @private
-    * @name _redraw()
-    * @trigger redraw.jstree
-    */
-    _redraw: () => void ;
-    
-    /**
-    * redraws all nodes that need to be redrawn or optionally - the whole tree
-    * @name redraw([full])
-    * @param {Boolean} full if set to `true` all nodes are redrawn.
-    */
-    redraw: (full?: boolean) => void;
-
-    /**
-    * redraws a single node's children. Used internally.
-    * @private
-    * @name draw_children(node)
-    * @param {mixed} node the node whose children will be redrawn
-    */
-    draw_children: (node: any) => void;
-
-    /**
-    * redraws a single node. Used internally.
-    * @private
-    * @name redraw_node(node, deep, is_callback, force_render)
-    * @param {mixed} node the node to redraw
-    * @param {Boolean} deep should child nodes be redrawn too
-    * @param {Boolean} is_callback is this a recursion call
-    * @param {Boolean} force_render should children of closed parents be drawn anyway
-    */
-    redraw_node: (node: any, deep: boolean, is_callback: boolean, force_render: boolean) => void;
-
-    /**
-    * opens a node, revaling its children. If the node is not loaded it will be loaded and opened once ready.
-    * @name open_node(obj [, callback, animation])
-    * @param {mixed} obj the node to open
-    * @param {Function} callback a function to execute once the node is opened
-    * @param {Number} animation the animation duration in milliseconds 
-    * when opening the node (overrides the `core.animation` setting). Use `false` for no animation.
-    * @trigger open_node.jstree, after_open.jstree, before_open.jstree
-    */
-    open_node: (obj: any, callback?: any, animation?: any) => void;
-
-    /**
-    * opens every parent of a node (node should be loaded)
-    * @name _open_to(obj)
-    * @param {mixed} obj the node to reveal
-    * @private
-    */
-    _open_to: (obj:any) => void;
-
-    /**
-    * closes a node, hiding its children
-    * @name close_node(obj [, animation])
-    * @param {mixed} obj the node to close
-    * @param {Number} animation the animation duration in milliseconds 
-    * when closing the node (overrides the `core.animation` setting). Use `false` for no animation.
-    * @trigger close_node.jstree, after_close.jstree
-    */
-    close_node: (obj: any, animation?: any) => void;
-
-    /**
-    * toggles a node - closing it if it is open, opening it if it is closed
-    * @name toggle_node(obj)
-    * @param {mixed} obj the node to toggle
-    */
-    toggle_node: (obj: any) => void;
-
-    /**
-    * opens all nodes within a node (or the tree), revaling their children. If the node is not loaded it will be loaded and opened once ready.
-    * @name open_all([obj, animation, original_obj])
-    * @param {mixed} obj the node to open recursively, omit to open all nodes in the tree
-    * @param {Number} animation the animation duration in milliseconds when opening the nodes, the default is no animation
-    * @param {jQuery} reference to the node that started the process (internal use)
-    * @trigger open_all.jstree
-    */
-    open_all: (obj?: any, animation?: number, original_obj?: any) => void;
-
-    /**
-    * closes all nodes within a node (or the tree), revaling their children
-    * @name close_all([obj, animation])
-    * @param {mixed} obj the node to close recursively, omit to close all nodes in the tree
-    * @param {Number} animation the animation duration in milliseconds when closing the nodes, the default is no animation
-    * @trigger close_all.jstree
-    */
-    close_all: (obj?: any, animation?: number) => void;
-
-    /**
-    * checks if a node is disabled (not selectable)
-    * @name is_disabled(obj)
-    * @param  {mixed} obj
-    * @return {Boolean}
-    */
-    is_disabled: (obj: any) => boolean;
-
-    /**
-    * enables a node - so that it can be selected
-    * @name enable_node(obj)
-    * @param {mixed} obj the node to enable
-    * @trigger enable_node.jstree
-    */
-    enable_node: (obj: any) => boolean;
-
-    /**
-    * disables a node - so that it can not be selected
-    * @name disable_node(obj)
-    * @param {mixed} obj the node to disable
-    * @trigger disable_node.jstree
-    */
-    disable_node: (obj: any) => boolean;
-
-    /**
-    * called when a node is selected by the user. Used internally.
-    * @private
-    * @name activate_node(obj, e)
-    * @param {mixed} obj the node
-    * @param {Object} e the related event
-    * @trigger activate_node.jstree, changed.jstree
-    */
-    activate_node: (obj: any, e: any) => void;
-
-    /**
-    * applies the hover state on a node, called when a node is hovered by the user. Used internally.
-    * @private
-    * @name hover_node(obj)
-    * @param {mixed} obj
-    * @trigger hover_node.jstree
-    */
-    hover_node: (obj: any) => void;
-
-    /**
-    * removes the hover state from a nodecalled when a node is no longer hovered by the user. Used internally.
-    * @private
-    * @name dehover_node(obj)
-    * @param {mixed} obj
-    * @trigger dehover_node.jstree
-    */
-    dehover_node: (obj: any) => void;
-
-    /**
-    * select a node
-    * @name select_node(obj [, supress_event, prevent_open])
-    * @param {mixed} obj an array can be used to select multiple nodes
-    * @param {Boolean} supress_event if set to `true` the `changed.jstree` event won't be triggered
-    * @param {Boolean} prevent_open if set to `true` parents of the selected node won't be opened
-    * @trigger select_node.jstree, changed.jstree
-    */
-    select_node: (obj: any, supress_event?: boolean, prevent_open?: boolean, e?: any) => any;
-
-    /**
-    * deselect a node
-    * @name deselect_node(obj [, supress_event])
-    * @param {mixed} obj an array can be used to deselect multiple nodes
-    * @param {Boolean} supress_event if set to `true` the `changed.jstree` event won't be triggered
-    * @trigger deselect_node.jstree, changed.jstree
-    */
-    deselect_node: (obj: any, supress_event?: boolean, e?: any) => void;
-
-    /**
-    * select all nodes in the tree
-    * @name select_all([supress_event])
-    * @param {Boolean} supress_event if set to `true` the `changed.jstree` event won't be triggered
-    * @trigger select_all.jstree, changed.jstree
-    */
-    select_all: (supress_event?: boolean) => void;
-
-    /**
-    * deselect all selected nodes
-    * @name deselect_all([supress_event])
-    * @param {Boolean} supress_event if set to `true` the `changed.jstree` event won't be triggered
-    * @trigger deselect_all.jstree, changed.jstree
-    */
-    deselect_all: (supress_event?: boolean) => void;
-
-    /**
-    * checks if a node is selected
-    * @name is_selected(obj)
-    * @param  {mixed}  obj
-    * @return {Boolean}
-    */
-    is_selected: (obj: any) => boolean;
-
-    /**
-    * get an array of all selected nodes
-    * @name get_selected([full])
-    * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
-    * @return {Array}
-    */
-    get_selected: (full?: any) => any[];
-
-    /**
-    * get an array of all top level selected nodes (ignoring children of selected nodes)
-    * @name get_top_selected([full])
-    * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
-    * @return {Array}
-    */
-    get_top_selected: (full?: any) => any[];
-
-    /**
-    * get an array of all bottom level selected nodes (ignoring selected parents)
-    * @name get_top_selected([full])
-    * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
-    * @return {Array}
-    */
-    get_bottom_selected: (full?: any) => any[];
-
-    /**
-    * gets the current state of the tree so that it can be restored later with `set_state(state)`. Used internally.
-    * @name get_state()
-    * @private
-    * @return {Object}
-    */
-    get_state: () => any;
-
-    /**
-    * sets the state of the tree. Used internally.
-    * @name set_state(state [, callback])
-    * @private
-    * @param {Object} state the state to restore
-    * @param {Function} callback an optional function to execute once the state is restored.
-    * @trigger set_state.jstree
-    */
-    set_state: (state: any, callback: () => void) => void;
-
-    /**
-    * refreshes the tree - all nodes are reloaded with calls to `load_node`.
-    * @name refresh()
-    * @param {Boolean} skip_loading an option to skip showing the loading indicator
-    * @param {Mixed} forget_state if set to `true` state will not be reapplied, 
-    * if set to a function (receiving the current state as argument) the result of that function will be used as state
-    * @trigger refresh.jstree
-    */
-    refresh: (skip_loading: boolean, forget_state: any) => void;
-
-    /**
-    * refreshes a node in the tree (reload its children) all opened nodes inside that node are reloaded with calls to `load_node`.
-    * @name refresh_node(obj)
-    * @param  {mixed} obj the node
-    * @trigger refresh_node.jstree
-    */
-    refresh_node: (obj: any) => void;
-
-    /**
-    * set (change) the ID of a node
-    * @name set_id(obj, id)
-    * @param  {mixed} obj the node
-    * @param  {String} id the new ID
-    * @return {Boolean}
-    */
-    set_id: (obj: any, id: string) => boolean;
-
-    /**
-    * get the text value of a node
-    * @name get_text(obj)
-    * @param  {mixed} obj the node
-    * @return {String}
-    */
-    get_text: (obj: any) => string;
-
-    /**
-    * set the text value of a node. Used internally, please use `rename_node(obj, val)`.
-    * @private
-    * @name set_text(obj, val)
-    * @param  {mixed} obj the node, you can pass an array to set the text on multiple nodes
-    * @param  {String} val the new text value
-    * @return {Boolean}
-    * @trigger set_text.jstree
-    */
-    set_text: (obj:any, val:string) => boolean;
-
-    /**
-    * gets a JSON representation of a node (or the whole tree)
-    * @name get_json([obj, options])
-    * @param  {mixed} obj
-    * @param  {Object} options
-    * @param  {Boolean} options.no_state do not return state information
-    * @param  {Boolean} options.no_id do not return ID
-    * @param  {Boolean} options.no_children do not include children
-    * @param  {Boolean} options.no_data do not include node data
-    * @param  {Boolean} options.flat return flat JSON instead of nested
-    * @return {Object}
-    */
-    get_json: (obj?: any, options?: JSTreeGetJsonOptions, flat?: boolean) => any;
-
-    /**
-    * create a new node (do not confuse with load_node)
-    * @name create_node([obj, node, pos, callback, is_loaded])
-    * @param  {mixed}   par       the parent node (to create a root node use either "#" (string) or `null`)
-    * @param  {mixed}   node      the data for the new node (a valid JSON object, or a simple string with the name)
-    * @param  {mixed}   pos       the index at which to insert the node, "first" and "last" are also supported, default is "last"
-    * @param  {Function} callback a function to be called once the node is created
-    * @param  {Boolean} is_loaded internal argument indicating if the parent node was succesfully loaded
-    * @return {String}            the ID of the newly create node
-    * @trigger model.jstree, create_node.jstree
-    */
-    create_node: (par?: any, node?: any, pos?: any, callback?: any, is_loaded?: boolean) => string;
-
-    /**
-    * set the text value of a node
-    * @name rename_node(obj, val)
-    * @param  {mixed} obj the node, you can pass an array to rename multiple nodes to the same name
-    * @param  {String} val the new text value
-    * @return {Boolean}
-    * @trigger rename_node.jstree
-    */
-    rename_node: (obj: any, val: string) => boolean;
-
-    /**
-    * remove a node
-    * @name delete_node(obj)
-    * @param  {mixed} obj the node, you can pass an array to delete multiple nodes
-    * @return {Boolean}
-    * @trigger delete_node.jstree, changed.jstree
-    */
-    delete_node: (obj: any) => boolean;
-
-    /**
-    * check if an operation is premitted on the tree. Used internally.
-    * @private
-    * @name check(chk, obj, par, pos)
-    * @param  {String} chk the operation to check, can be "create_node", "rename_node", "delete_node", "copy_node" or "move_node"
-    * @param  {mixed} obj the node
-    * @param  {mixed} par the parent
-    * @param  {mixed} pos the position to insert at, or if "rename_node" - the new name
-    * @param  {mixed} more some various additional information, for example if a "move_node" operations is triggered by DND this will be the hovered node
-    * @return {Boolean}
-    */
-    check: (chk: string, obj: any, par: any, pos: any, more: any) => boolean;
-
-    /**
-    * get the last error
-    * @name last_error()
-    * @return {Object}
-    */
-    last_error: () => any;
-
-    /**
-    * move a node to a new parent
-    * @name move_node(obj, par [, pos, callback, is_loaded])
-    * @param  {mixed} obj the node to move, pass an array to move multiple nodes
-    * @param  {mixed} par the new parent
-    * @param  {mixed} pos the position to insert at (besides integer values, "first" and "last" are supported, as well as "before" and "after"), defaults to integer `0`
-    * @param  {function} callback a function to call once the move is completed, receives 3 arguments - the node, the new parent and the position
-    * @param  {Boolean} is_loaded internal parameter indicating if the parent node has been loaded
-    * @param  {Boolean} skip_redraw internal parameter indicating if the tree should be redrawn
-    * @param  {Boolean} instance internal parameter indicating if the node comes from another instance
-    * @trigger move_node.jstree
-    */
-    move_node: (obj: any, par: any, pos?: any, callback?: (node: any, new_par: any, pos: any) => void, is_loaded?: boolean, skip_redraw?: boolean, origin?: boolean) => void;
-
-    /**
-    * copy a node to a new parent
-    * @name copy_node(obj, par [, pos, callback, is_loaded])
-    * @param  {mixed} obj the node to copy, pass an array to copy multiple nodes
-    * @param  {mixed} par the new parent
-    * @param  {mixed} pos the position to insert at (besides integer values, "first" and "last" are supported, as well as "before" and "after"), defaults to integer `0`
-    * @param  {function} callback a function to call once the move is completed, receives 3 arguments - the node, the new parent and the position
-    * @param  {Boolean} is_loaded internal parameter indicating if the parent node has been loaded
-    * @param  {Boolean} skip_redraw internal parameter indicating if the tree should be redrawn
-    * @param  {Boolean} instance internal parameter indicating if the node comes from another instance
-    * @trigger model.jstree copy_node.jstree
-    */
-    copy_node: (obj: any, par: any, pos?: any, callback?: (node: any, new_par: any, pos: any) => void, is_loaded?: boolean, skip_redraw?: boolean, origin?: boolean) => void;
-
-    /**
-    * cut a node (a later call to `paste(obj)` would move the node)
-    * @name cut(obj)
-    * @param  {mixed} obj multiple objects can be passed using an array
-    * @trigger cut.jstree
-    */
-    cut: (obj: any) => void;
-
-    /**
-    * copy a node (a later call to `paste(obj)` would copy the node)
-    * @name copy(obj)
-    * @param  {mixed} obj multiple objects can be passed using an array
-    * @trigger copy.jstre
-    */
-    copy: (obj: any) => void;
-
-    /**
-    * get the current buffer (any nodes that are waiting for a paste operation)
-    * @name get_buffer()
-    * @return {Object} an object consisting of `mode` ("copy_node" or "move_node"), `node` (an array of objects) and `inst` (the instance)
-    */
-    get_buffer: () => Buffer;
-
-    /**
-    * check if there is something in the buffer to paste
-    * @name can_paste()
-    * @return {Boolean}
-    */
-    can_paste: () => boolean;
-
-    /**
-    * copy or move the previously cut or copied nodes to a new parent
-    * @name paste(obj [, pos])
-    * @param  {mixed} obj the new parent
-    * @param  {mixed} pos the position to insert at (besides integer, "first" and "last" are supported), defaults to integer `0`
-    * @trigger paste.jstree
-    */
-    paste: (obj: any, pos: any) => void;
-
-    /**
-    * clear the buffer of previously copied or cut nodes
-    * @name clear_buffer()
-    * @trigger clear_buffer.jstree
-    */
-    clear_buffer: () => void;
-
-    /**
-    * put a node in edit mode (input field to rename the node)
-    * @name edit(obj [, default_text])
-    * @param  {mixed} obj
-    * @param  {String} default_text the text to populate the input with (if omitted the node text value is used)
-    */
-    edit: (obj: any, default_text?: string) => void;
-
-    /**
-    * changes the theme
-    * @name set_theme(theme_name [, theme_url])
-    * @param {String} theme_name the name of the new theme to apply
-    * @param {mixed} theme_url  the location of the CSS file for this theme. Omit or set to `false` 
-    * if you manually included the file. Set to `true` to autoload from the `core.themes.dir` directory.
-    * @trigger set_theme.jstree
-    */
-    set_theme: (theme_name: string, theme_url?: any) => void;
-
-    /**
-    * gets the name of the currently applied theme name
-    * @name get_theme()
-    * @return {String}
-    */
-    get_theme: () => string;
-
-    /**
-    * changes the theme variant (if the theme has variants)
-    * @name set_theme_variant(variant_name)
-    * @param {String|Boolean} variant_name the variant to apply (if `false` is used the current variant is removed)
-    */
-    set_theme_variant: (variant_name: any) => void;
-
-    /**
-    * gets the name of the currently applied theme variant
-    * @name get_theme()
-    * @return {String}
-    */
-    get_theme_variant: () => string;
-
-    /**
-    * shows a striped background on the container (if the theme supports it)
-    * @name show_stripes()
-    */
-    show_stripes: () => void;
-
-    /**
-    * hides the striped background on the container
-    * @name hide_stripes()
-    */
-    hide_stripes: () => void;
-
-    /**
-    * toggles the striped background on the container
-    * @name toggle_stripes()
-    */
-    toggle_stripes: () => void;
-
-    /**
-    * shows the connecting dots (if the theme supports it)
-    * @name show_dots()
-    */
-    show_dots: () => void;
-
-    /**
-    * hides the connecting dots
-    * @name hide_dots()
-    */
-    hide_dots: () => void;
-
-    /**
-    * toggles the connecting dots
-    * @name toggle_dots()
-    */
-    toggle_dots: () => void;
-
-    /**
-    * show the node icons
-    * @name show_icons()
-    */
-    show_icons: () => void;
-
-    /**
-    * hide the node icons
-    * @name hide_icons()
-    */
-    hide_icons: () => void;
-
-    /**
-    * toggle the node icons
-    * @name toggle_icons()
-    */
-    toggle_icons: () => void;
-
-    /**
-    * set the node icon for a node
-    * @name set_icon(obj, icon)
-    * @param {mixed} obj
-    * @param {String} icon the new icon - can be a path to an icon or a className, 
-    * if using an image that is in the current directory use a `./` prefix, otherwise it will be detected as a class
-    */
-    set_icon: (obj: any, icon: string) => void;
-
-    /**
-    * get the node icon for a node
-    * @name get_icon(obj)
-    * @param {mixed} obj
-    * @return {String}
-    */
-    get_icon: (obj: any) => string;
-
-    /**
-    * hide the icon on an individual node
-    * @name hide_icon(obj)
-    * @param {mixed} obj
-    */
-    hide_icon: (obj: any) => void;
-
-    /**
-    * show the icon on an individual node
-    * @name show_icon(obj)
-    * @param {mixed} obj
-    */
-    show_icon: (obj: any) => void;
-
-    /**
-    * set the undetermined state where and if necessary. Used internally.
-    * @private
-    * @name _undetermined()
-    * @plugin checkbox
-    */
-    _undetermined: () => void;
-
-    /**
-    * show the node checkbox icons
-    * @name show_checkboxes()
-    * @plugin checkbox
-    */
-    show_checkboxes: () => void;
-
-    /**
-    * hide the node checkbox icons
-    * @name hide_checkboxes()
-    * @plugin checkbox
-    */
-    hide_checkboxes: () => void;
-
-    /**
-    * toggle the node icons
-    * @name toggle_checkboxes()
-    * @plugin checkbox
-    */
-    toggle_checkboxes: () => void;
-
-    /**
-    * checks if a node is in an undetermined state
-    * @name is_undetermined(obj)
-    * @param  {mixed} obj
-    * @return {Boolean}
-    */
-    is_undetermined: (obj: any) => boolean;
-
-    /**
-    * check a node (only if tie_selection in checkbox settings is false, otherwise select_node will be called internally)
-    * @name check_node(obj)
-    * @param {mixed} obj an array can be used to check multiple nodes
-    * @trigger check_node.jstree
-    * @plugin checkbox
-    */
-    check_node: (obj: any, e: any) => any;
-
-    /**
-    * uncheck a node (only if tie_selection in checkbox settings is false, otherwise deselect_node will be called internally)
-    * @name deselect_node(obj)
-    * @param {mixed} obj an array can be used to deselect multiple nodes
-    * @trigger uncheck_node.jstree
-    * @plugin checkbox
-    */
-    uncheck_node: (obj: any, e: any) => any;
-
-    /**
-    * checks all nodes in the tree (only if tie_selection in checkbox settings is false, otherwise select_all will be called internally)
-    * @name check_all()
-    * @trigger check_all.jstree, changed.jstree
-    * @plugin checkbox
-    */
-    check_all: () => any;
-
-    /**
-    * uncheck all checked nodes (only if tie_selection in checkbox settings is false, otherwise deselect_all will be called internally)
-    * @name uncheck_all()
-    * @trigger uncheck_all.jstree
-    * @plugin checkbox
-    */
-    uncheck_all: () => any;
-
-    /**
-    * checks if a node is checked (if tie_selection is on in the settings this function will return the same as is_selected)
-    * @name is_checked(obj)
-    * @param  {mixed}  obj
-    * @return {Boolean}
-    * @plugin checkbox
-    */
-    is_checked: (obj: any) => boolean;
-
-    /**
-    * get an array of all checked nodes (if tie_selection is on in the settings this function will return the same as get_selected)
-    * @name get_checked([full])
-    * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
-    * @return {Array}
-    * @plugin checkbox
-    */
-    get_checked: (full: any) => any[];
-
-    /**
-    * get an array of all top level checked nodes (ignoring children of checked nodes) (if tie_selection is on in the settings this function will return the same as get_top_selected)
-    * @name get_top_checked([full])
-    * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
-    * @return {Array}
-    * @plugin checkbox
-    */
-    get_top_checked: (full: any) => any[];
-
-    /**
-    * get an array of all bottom level checked nodes (ignoring selected parents) (if tie_selection is on in the settings this function will return the same as get_bottom_selected)
-    * @name get_bottom_checked([full])
-    * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
-    * @return {Array}
-    * @plugin checkbox
-    */
-    get_bottom_checked: (full: any) => any[];
-    
-    /**
-    * context menu plugin
-    */
-
-    /**
-    * prepare and show the context menu for a node
-    * @name show_contextmenu(obj [, x, y])
-    * @param {mixed} obj the node
-    * @param {Number} x the x-coordinate relative to the document to show the menu at
-    * @param {Number} y the y-coordinate relative to the document to show the menu at
-    * @param {Object} e the event if available that triggered the contextmenu
-    * @plugin contextmenu
-    * @trigger show_contextmenu.jstree
-    */
-    show_contextmenu: (obj: any, x?: number, y?: number, e?: any) => void;
-
-    /**
-    * show the prepared context menu for a node
-    * @name _show_contextmenu(obj, x, y, i)
-    * @param {mixed} obj the node
-    * @param {Number} x the x-coordinate relative to the document to show the menu at
-    * @param {Number} y the y-coordinate relative to the document to show the menu at
-    * @param {Number} i the object of items to show
-    * @plugin contextmenu
-    * @trigger show_contextmenu.jstree
-    * @private
-    */
-    _show_contextmenu: (obj: any, x: number, y: number, i: number) => void;
-
-    /**
-    * used to search the tree nodes for a given string
-    * @name search(str [, skip_async])
-    * @param {String} str the search string
-    * @param {Boolean} skip_async if set to true server will not be queried even if configured
-    * @param {Boolean} show_only_matches if set to true only matching nodes will be shown (keep in mind this can be very slow on large trees or old browsers)
-    * @param {mixed} inside an optional node to whose children to limit the search
-    * @param {Boolean} append if set to true the results of this search are appended to the previous search
-    * @plugin search
-    * @trigger search.jstree
-    */
-    search: (str: string, skip_async?: boolean, show_only_matches?: boolean, inside?: any, append?: boolean) => void;
-
-    /**
-    * used to clear the last search (removes classes and shows all nodes if filtering is on)
-    * @name clear_search()
-    * @plugin search
-    * @trigger clear_search.jstree
-    */
-    clear_search: () => void;
-
-    /**
-    * opens nodes that need to be opened to reveal the search results. Used only internally.
-    * @private
-    * @name _search_open(d)
-    * @param {Array} d an array of node IDs
-    * @plugin search
-    */
-    _search_open: (d: string[]) => void;
-
-    /**
-    * used to sort a node's children
-    * @private
-    * @name sort(obj [, deep])
-    * @param  {mixed} obj the node
-    * @param {Boolean} deep if set to `true` nodes are sorted recursively.
-    * @plugin sort
-    * @trigger search.jstree
-    */
-    sort: (obj: any, deep?: boolean) => void;
-
-    /**
-    * save the state
-    * @name save_state()
-    * @plugin state
-    */
-    save_state: () => void;
-
-    /**
-    * restore the state from the user's computer
-    * @name restore_state()
-    * @plugin state
-    */
-    restore_state: () => void;
-
-    /**
-    * clear the state on the user's computer
-    * @name clear_state()
-    * @plugin state
-    */
-    clear_state: () => void;
-
-    /**
-    * used to retrieve the type settings object for a node
-    * @name get_rules(obj)
-    * @param {mixed} obj the node to find the rules for
-    * @return {Object}
-    * @plugin types
-    */
-    get_rules: (obj: any) => any;
-
-    /**
-    * used to retrieve the type string or settings object for a node
-    * @name get_type(obj [, rules])
-    * @param {mixed} obj the node to find the rules for
-    * @param {Boolean} rules if set to `true` instead of a string the settings object will be returned
-    * @return {String|Object}
-    * @plugin types
-    */
-    get_type: (obj: any, rules?: any) => any;
-
-    /**
-    * used to change a node's type
-    * @name set_type(obj, type)
-    * @param {mixed} obj the node to change
-    * @param {String} type the new type
-    * @plugin types
-    */
-    set_type: (obj: any, type: string) => any;
-}
-
-interface JSTreeGetJsonOptions {
-    /**
-    * do not return state information
-    */
-    no_state: boolean;
-    
-    /**
-    * do not return ID
-    */
-    no_id: boolean;
-    
-    /**
-    * do not include children
-    */
-    no_children: boolean;
-
-    /**
-    * do not include node data
-    */
-    no_data: boolean;
-
-    /**
-    * return flat JSON instead of nested
-    */
-    flat: boolean;
-}
-
-interface JSTreeBindOptions {
-    inst?: any;
-    args?: any;
-    rslt?: any;
-    rlbk?: any;
-}
-
-interface Buffer {
-    mode: string;
-    node: any[];
-    inst: any;
-}
diff --git a/jstree/tsconfig.json b/jstree/tsconfig.json
new file mode 100644
index 0000000000..a3033dd4d9
--- /dev/null
+++ b/jstree/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jstree-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jsts/jsts.d.ts b/jsts/index.d.ts
similarity index 100%
rename from jsts/jsts.d.ts
rename to jsts/index.d.ts
diff --git a/jsts/jsts-tests.ts b/jsts/jsts-tests.ts
index 3b37d0f185..3327c11d2f 100644
--- a/jsts/jsts-tests.ts
+++ b/jsts/jsts-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jsts.d.ts" />
+
 var str: string;
 var n: number;
 var bool: boolean;
diff --git a/jsts/tsconfig.json b/jsts/tsconfig.json
new file mode 100644
index 0000000000..61a410c9cc
--- /dev/null
+++ b/jsts/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsts-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jsuri/jsuri.d.ts b/jsuri/index.d.ts
similarity index 100%
rename from jsuri/jsuri.d.ts
rename to jsuri/index.d.ts
diff --git a/jsuri/jsuri-tests.ts b/jsuri/jsuri-tests.ts
index 73ecbc50df..6c7885a11c 100644
--- a/jsuri/jsuri-tests.ts
+++ b/jsuri/jsuri-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jsuri.d.ts" />
+
 
 function test_createUri() {
   var uri = new jsuri.Uri('http://user:pass@www.test.com:81/index.html?q=books#fragment');
diff --git a/jsuri/tsconfig.json b/jsuri/tsconfig.json
new file mode 100644
index 0000000000..88b46e034f
--- /dev/null
+++ b/jsuri/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsuri-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jsurl/jsurl.d.ts b/jsurl/index.d.ts
similarity index 100%
rename from jsurl/jsurl.d.ts
rename to jsurl/index.d.ts
diff --git a/jsurl/jsurl-tests.ts b/jsurl/jsurl-tests.ts
index a10d0a763e..abdbb45851 100644
--- a/jsurl/jsurl-tests.ts
+++ b/jsurl/jsurl-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="jsurl.d.ts" />
+
 
 interface UModel extends UrlQuery {
     a: any;
diff --git a/jsurl/tsconfig.json b/jsurl/tsconfig.json
new file mode 100644
index 0000000000..06fb61bf08
--- /dev/null
+++ b/jsurl/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsurl-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jsx-chai/index.d.ts b/jsx-chai/index.d.ts
new file mode 100644
index 0000000000..7201b56004
--- /dev/null
+++ b/jsx-chai/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for jsx-chai 3.0.0
+// Project: https://github.com/bkonkle/jsx-chai
+// Definitions by: Philipp Holzer <https://github.com/nupplaphil/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="chai" />
+
+
+interface JsxChaiStatic {
+    jsxChai: jsxChaiFunction;
+}
+
+interface jsxChaiFunction {
+    (chai: any, utils: any): void;
+}
+
+declare var jsxChai: JsxChaiStatic;
+
+export = jsxChai;
diff --git a/jsx-chai/jsx-chai-tests.ts b/jsx-chai/jsx-chai-tests.ts
new file mode 100644
index 0000000000..d421ae0874
--- /dev/null
+++ b/jsx-chai/jsx-chai-tests.ts
@@ -0,0 +1,8 @@
+/// <reference types="chai"/>
+
+import chai = require('chai');
+import jsxChai = require('jsx-chai');
+
+function testUseJsxChai() {
+	chai.use(jsxChai.jsxChai);
+}
diff --git a/jsx-chai/tsconfig.json b/jsx-chai/tsconfig.json
new file mode 100644
index 0000000000..b2fe2f95c2
--- /dev/null
+++ b/jsx-chai/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsx-chai-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jszip/jszip.d.ts b/jszip/index.d.ts
similarity index 100%
rename from jszip/jszip.d.ts
rename to jszip/index.d.ts
diff --git a/jszip/jszip-tests.ts b/jszip/jszip-tests.ts
index 514beb5012..1e283e6d68 100644
--- a/jszip/jszip-tests.ts
+++ b/jszip/jszip-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path='jszip.d.ts' />
-
 var SEVERITY = {
 	DEBUG: 0,
 	INFO: 1,
diff --git a/jszip/tsconfig.json b/jszip/tsconfig.json
new file mode 100644
index 0000000000..bc9f97ea6d
--- /dev/null
+++ b/jszip/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jszip-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jug/index.d.ts b/jug/index.d.ts
new file mode 100644
index 0000000000..cdd9daa927
--- /dev/null
+++ b/jug/index.d.ts
@@ -0,0 +1,134 @@
+// Type definitions for jug
+// Project: https://github.com/kaiquewdev/Graph
+// Definitions by: yevt <https://github.com/yevt>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/**
+ * Internal structure of a vertex
+ */
+interface VertexStructure {
+    level: number;
+    edge: Array<Vertex>,
+    data: VertexData,
+    parent: Vertex
+}
+
+/**
+ * User data of a vertex.
+ */
+type VertexData = Object;
+
+/**
+ * Graph constructor function.
+ */
+interface GraphConstructor {
+    new (): Graph;
+}
+
+/**
+ * Creates root node of a graph.
+ */
+interface Graph {
+    vertex: VertexConstructor;
+    init(data?: VertexData): Vertex;
+}
+
+/**
+ * Vertex constructor function.
+ */
+interface VertexConstructor {
+    new (obj?: VertexData): Vertex;
+}
+
+/**
+ * Represents one node of a graph.
+ */
+interface Vertex {
+
+    /**
+     * Initial vertex data.
+     */
+    internal: VertexStructure;
+
+    /**
+     * Verify the level.
+     */
+    level(): number;
+
+    /**
+     * Get edge count.
+     */
+    edge(): number;
+
+    /**
+     * Access node.
+     * @param index - edge index.
+     */
+    edge(index: number): Vertex;
+
+    /**
+     * Seed node.
+     * @param [data] - created vertex UserData.
+     */
+    seed(data?: VertexData): Vertex;
+
+    /**
+     * Verify if the current node is the root.
+     */
+    isRoot(): boolean;
+
+    /**
+     * Set node data.
+     * @param obj - data to be set.
+     */
+    data(obj: VertexData): Vertex;
+
+    /**
+     * Get node data.
+     */
+    data(): VertexData;
+
+    /**
+     * Get distance between nodes.
+     * @param from
+     * @param to
+     */
+    proximity(from: string, to: string): Array<number>;
+
+    /**
+     * Find a node.
+     * @param {string} type - object type.
+     * @param {Object} query - _.where query object.
+     */
+    find(type: string | void, query: Object): Array<VertexData>;
+
+    /**
+     * Get siblings of specified edge.
+     * @param {number} index - edge index.
+     */
+    getSiblingsOf(index: number): Array<VertexData>;
+
+    /**
+     * Getting childs of an specified edge.
+     * @param egde - target vertex;
+     */
+    getChildsOf(egde: number): Array<VertexData>;
+
+    /**
+     * Getting parents of an specified level and edge.
+     * @param {number} level - max level.
+     * @param {number} edge - edge index.
+     */
+    getParentsFrom(level: number, edge: number): Array<VertexData>;
+
+    /**
+     * Getting the length of childs of an specified edge.
+     * @param {number} edge - edge index.
+     */
+    getScopeOf(edge: number): number;
+}
+
+declare var jug: Graph;
+
+export = jug;
diff --git a/jug/jug-tests.ts b/jug/jug-tests.ts
index 7353428e0c..42ce38f0d6 100644
--- a/jug/jug-tests.ts
+++ b/jug/jug-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path='./jug.d.ts' />
+
 import jug = require('jug');
 
 /*
diff --git a/jug/jug.d.ts b/jug/jug.d.ts
deleted file mode 100644
index ed86a30d6d..0000000000
--- a/jug/jug.d.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-// Type definitions for jug
-// Project: https://github.com/kaiquewdev/Graph
-// Definitions by: yevt <https://github.com/yevt>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "jug" {
-    /**
-     * Internal structure of a vertex
-     */
-    interface VertexStructure {
-        level: number;
-        edge: Array<Vertex>,
-        data: VertexData,
-        parent: Vertex
-    }
-
-    /**
-     * User data of a vertex.
-     */
-    type VertexData = Object;
-
-    /**
-     * Graph constructor function.
-     */
-    interface GraphConstructor {
-        new():Graph;
-    }
-
-    /**
-     * Creates root node of a graph.
-     */
-    interface Graph {
-        vertex:VertexConstructor;
-        init(data?:VertexData):Vertex;
-    }
-
-    /**
-     * Vertex constructor function.
-     */
-    interface VertexConstructor {
-        new(obj?:VertexData):Vertex;
-    }
-
-    /**
-     * Represents one node of a graph.
-     */
-    interface Vertex {
-
-        /**
-         * Initial vertex data.
-         */
-        internal: VertexStructure;
-
-        /**
-         * Verify the level.
-         */
-        level(): number;
-
-        /**
-         * Get edge count.
-         */
-        edge(): number;
-
-        /**
-         * Access node.
-         * @param index - edge index.
-         */
-        edge(index:number): Vertex;
-
-        /**
-         * Seed node.
-         * @param [data] - created vertex UserData.
-         */
-        seed(data?:VertexData): Vertex;
-
-        /**
-         * Verify if the current node is the root.
-         */
-        isRoot(): boolean;
-
-        /**
-         * Set node data.
-         * @param obj - data to be set.
-         */
-        data(obj:VertexData): Vertex;
-
-        /**
-         * Get node data.
-         */
-        data(): VertexData;
-
-        /**
-         * Get distance between nodes.
-         * @param from
-         * @param to
-         */
-        proximity(from:string, to:string): Array<number>;
-
-        /**
-         * Find a node.
-         * @param {string} type - object type.
-         * @param {Object} query - _.where query object.
-         */
-        find(type:string|void, query:Object): Array<VertexData>;
-
-        /**
-         * Get siblings of specified edge.
-         * @param {number} index - edge index.
-         */
-        getSiblingsOf(index:number): Array<VertexData>;
-
-        /**
-         * Getting childs of an specified edge.
-         * @param egde - target vertex;
-         */
-        getChildsOf(egde:number): Array<VertexData>;
-
-        /**
-         * Getting parents of an specified level and edge.
-         * @param {number} level - max level.
-         * @param {number} edge - edge index.
-         */
-        getParentsFrom(level:number, edge:number): Array<VertexData>;
-
-        /**
-         * Getting the length of childs of an specified edge.
-         * @param {number} edge - edge index.
-         */
-        getScopeOf(edge:number): number;
-    }
-
-    var jug:Graph;
-
-    export = jug;
-}
diff --git a/jug/tsconfig.json b/jug/tsconfig.json
new file mode 100644
index 0000000000..22a189e296
--- /dev/null
+++ b/jug/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jug-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jwplayer/jwplayer.d.ts b/jwplayer/index.d.ts
similarity index 100%
rename from jwplayer/jwplayer.d.ts
rename to jwplayer/index.d.ts
diff --git a/jwplayer/tsconfig.json b/jwplayer/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/jwplayer/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jwt-decode/index.d.ts b/jwt-decode/index.d.ts
new file mode 100644
index 0000000000..5cf3772b68
--- /dev/null
+++ b/jwt-decode/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for jwt-decode v1.4.0
+// Project: https://github.com/auth0/jwt-decode
+// Definitions by: Giedrius Grabauskas <https://github.com/QuatroDevOfficial/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare namespace JwtDecode {
+    interface JwtDecodeStatic {
+        (token: string): any;
+    }
+}
+
+declare var jwtDecode: JwtDecode.JwtDecodeStatic;
+export = jwtDecode;
+export as namespace jwt_decode;
\ No newline at end of file
diff --git a/jwt-decode/jwt-decode-tests.ts b/jwt-decode/jwt-decode-tests.ts
index 66d639b409..4ec792fde1 100644
--- a/jwt-decode/jwt-decode-tests.ts
+++ b/jwt-decode/jwt-decode-tests.ts
@@ -1,4 +1,4 @@
- /// <reference path="jwt-decode.d.ts" />
+ 
 import jwtDecode = require('jwt-decode');
  
 let token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJmb28iOiJiYXIiLCJleHAiOjEzOTMyODY4OTMsImlhdCI6MTM5MzI2ODg5M30.4-iaDojEVl0pJQMjrbM1EzUIfAZgsbK_kgnVyVxFSVo";
diff --git a/jwt-decode/jwt-decode.d.ts b/jwt-decode/jwt-decode.d.ts
deleted file mode 100644
index 61ce1ec7cf..0000000000
--- a/jwt-decode/jwt-decode.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Type definitions for jwt-decode v1.4.0
-// Project: https://github.com/auth0/jwt-decode
-// Definitions by: Giedrius Grabauskas <https://github.com/QuatroDevOfficial/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-declare namespace JwtDecode {
-    interface JwtDecodeStatic {
-        (token: string): any;
-    }
-}
-
-declare module 'jwt-decode' {
-    var jwtDecode: JwtDecode.JwtDecodeStatic;
-    export = jwtDecode;
-}
diff --git a/jwt-decode/tsconfig.json b/jwt-decode/tsconfig.json
new file mode 100644
index 0000000000..b930dfde8b
--- /dev/null
+++ b/jwt-decode/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jwt-decode-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/jwt-simple/index.d.ts b/jwt-simple/index.d.ts
new file mode 100644
index 0000000000..83a0e37aed
--- /dev/null
+++ b/jwt-simple/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for jwt-simple v0.2.0
+// Project: https://github.com/hokaccha/node-jwt-simple
+// Definitions by: Ken Fukuyama <https://github.com/kenfdev>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Decode jwt
+ * @param token
+ * @param key
+ * @param noVerify
+ * @api public
+ */
+export declare function decode(token: any, key: string, noVerify?: boolean): any;
+/**
+ * Encode jwt
+ * @param payload
+ * @param key
+ * @param algorithm default is HS256
+ * @api public
+ */
+export declare function encode(payload: any, key: string, algorithm?: string): string;
diff --git a/jwt-simple/jwt-simple-tests.ts b/jwt-simple/jwt-simple-tests.ts
index 8a0cc59c52..cb87cd3b3a 100644
--- a/jwt-simple/jwt-simple-tests.ts
+++ b/jwt-simple/jwt-simple-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path='jwt-simple.d.ts' />
 
 import jwt = require('jwt-simple');
 var payload = { foo: 'bar' };
diff --git a/jwt-simple/jwt-simple.d.ts b/jwt-simple/jwt-simple.d.ts
deleted file mode 100644
index 208c7e6beb..0000000000
--- a/jwt-simple/jwt-simple.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// Type definitions for jwt-simple v0.2.0
-// Project: https://github.com/hokaccha/node-jwt-simple
-// Definitions by: Ken Fukuyama <https://github.com/kenfdev>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-declare module "jwt-simple" {
-  /**
-   * Decode jwt
-   * @param token
-   * @param key
-   * @param noVerify
-   * @api public
-   */
-  export function decode(token:any, key:string, noVerify?:boolean):any;
-  /**
-   * Encode jwt
-   * @param payload
-   * @param key
-   * @param algorithm default is HS256
-   * @api public
-   */
-  export function encode(payload:any, key:string, algorithm?:string):string;
-}
diff --git a/jwt-simple/tsconfig.json b/jwt-simple/tsconfig.json
new file mode 100644
index 0000000000..56f0821f00
--- /dev/null
+++ b/jwt-simple/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "jwt-simple-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/kafka-node/index.d.ts b/kafka-node/index.d.ts
new file mode 100644
index 0000000000..81bfb7a0b3
--- /dev/null
+++ b/kafka-node/index.d.ts
@@ -0,0 +1,121 @@
+// Type definitions for kafka-node 0.2.22
+// Project: https://github.com/SOHU-Co/kafka-node/
+// Definitions by: Daniel Imrie-Situnayake <https://github.com/dansitu/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+// # Classes
+export declare class Client {
+    constructor(connectionString: string, clientId: string, options?: ZKOptions);
+    close(callback?: Function): void;
+}
+
+export declare class Producer {
+    constructor(client: Client);
+    on(eventName: string, cb: () => any): void;
+    on(eventName: string, cb: (error: any) => any): void;
+    send(payloads: Array<ProduceRequest>, cb: (error: any, data: any) => any): void;
+    createTopics(topics: Array<string>, async: boolean, cb?: (error: any, data: any) => any): void;
+}
+
+export declare class HighLevelProducer {
+    constructor(client: Client);
+    on(eventName: string, cb: () => any): void;
+    on(eventName: string, cb: (error: any) => any): void;
+    send(payloads: Array<ProduceRequest>, cb: (error: any, data: any) => any): void;
+    createTopics(topics: Array<string>, async: boolean, cb?: (error: any, data: any) => any): void;
+}
+
+export declare class Consumer {
+    constructor(client: Client, fetchRequests: Array<Topic>, options: ConsumerOptions);
+    on(eventName: string, cb: (message: string) => any): void;
+    on(eventName: string, cb: (error: any) => any): void;
+    addTopics(topics: Array<string>, cb: (error: any, added: boolean) => any): void;
+    addTopics(topics: Array<Topic>, cb: (error: any, added: boolean) => any, fromOffset: boolean): void;
+    removeTopics(topics: Array<string>, cb: (error: any, removed: boolean) => any): void;
+    commit(cb: (error: any, data: any) => any): void;
+    setOffset(topic: string, partition: number, offset: number): void;
+    pause(): void;
+    resume(): void;
+    pauseTopics(topics: Array<any> /* Array<string|Topic> */): void;
+    resumeTopics(topics: Array<any> /* Array<string|Topic> */): void;
+    close(force: boolean, cb: () => any): void;
+}
+
+export declare class HighLevelConsumer {
+    constructor(client: Client, payloads: Array<Topic>, options: ConsumerOptions);
+    on(eventName: string, cb: (message: string) => any): void;
+    on(eventName: string, cb: (error: any) => any): void;
+    addTopics(topics: Array<string>, cb: (error: any, added: boolean) => any): void;
+    addTopics(topics: Array<Topic>, cb: (error: any, added: boolean) => any, fromOffset: boolean): void;
+    removeTopics(topics: Array<string>, cb: (error: any, removed: boolean) => any): void;
+    commit(cb: (error: any, data: any) => any): void;
+    setOffset(topic: string, partition: number, offset: number): void;
+    pause(): void;
+    resume(): void;
+    pauseTopics(topics: Array<any> /* Array<string|Topic> */): void;
+    resumeTopics(topics: Array<any> /* Array<string|Topic> */): void;
+    close(force: boolean, cb: () => any): void;
+}
+
+export declare class Offset {
+    constructor(client: Client);
+    on(eventName: string, cb: () => any): void;
+    fetch(payloads: Array<OffsetRequest>, cb: (error: any, data: any) => any): void;
+    commit(groupId: string, payloads: Array<OffsetCommitRequest>, cb: (error: any, data: any) => any): void;
+    fetchCommits(groupId: string, payloads: Array<OffsetFetchRequest>, cb: (error: any, data: any) => any): void;
+}
+
+export declare class KeyedMessage {
+    constructor(key: string, message: string);
+}
+
+// # Interfaces
+export interface ZKOptions {
+    sessionTimeout?: number;
+    spinDelay?: number;
+    retries?: number;
+}
+
+export interface ProduceRequest {
+    topic: string;
+    messages: any; // Array<string> | Array<KeyedMessage> | string | KeyedMessage
+    partition?: number;
+    attributes?: number;
+}
+
+export interface ConsumerOptions {
+    groupId?: string;
+    autoCommit?: boolean;
+    autoCommitIntervalMs?: number;
+    fetchMaxWaitMs?: number;
+    fetchMinBytes?: number;
+    fetchMaxBytes?: number;
+    fromOffset?: boolean;
+    encoding?: string;
+}
+
+export interface Topic {
+    topic: string;
+    offset?: number;
+}
+
+export interface OffsetRequest {
+    topic: string;
+    partition?: number;
+    time?: number;
+    maxNum?: number;
+}
+
+export interface OffsetCommitRequest {
+    topic: string;
+    partition?: number;
+    offset: number;
+    metadata?: string;
+}
+
+export interface OffsetFetchRequest {
+    topic: string;
+    partition?: number;
+}
diff --git a/kafka-node/kafka-node-tests.ts b/kafka-node/kafka-node-tests.ts
index 607ad5c19a..a5b9e9ca3e 100644
--- a/kafka-node/kafka-node-tests.ts
+++ b/kafka-node/kafka-node-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="kafka-node.d.ts" />
 
 import kafka = require('kafka-node');
 
diff --git a/kafka-node/kafka-node.d.ts b/kafka-node/kafka-node.d.ts
deleted file mode 100644
index 5af357021d..0000000000
--- a/kafka-node/kafka-node.d.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-// Type definitions for kafka-node 0.2.22
-// Project: https://github.com/SOHU-Co/kafka-node/
-// Definitions by: Daniel Imrie-Situnayake <https://github.com/dansitu/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'kafka-node' {
-
-    // # Classes
-    export class Client {
-        constructor(connectionString: string, clientId: string, options?: ZKOptions);
-        close(callback?: Function): void;
-    }
-
-    export class Producer {
-        constructor(client: Client);
-        on(eventName: string, cb: () => any): void;
-        on(eventName: string, cb: (error: any) => any): void;
-        send(payloads: Array<ProduceRequest>, cb: (error: any, data: any) => any): void;
-        createTopics(topics: Array<string>, async: boolean, cb?: (error: any, data: any) => any): void;
-    }
-
-    export class HighLevelProducer {
-        constructor(client: Client);
-        on(eventName: string, cb: () => any): void;
-        on(eventName: string, cb: (error: any) => any): void;
-        send(payloads: Array<ProduceRequest>, cb: (error: any, data: any) => any): void;
-        createTopics(topics: Array<string>, async: boolean, cb?: (error: any, data: any) => any): void;
-    }
-
-    export class Consumer {
-        constructor(client: Client, fetchRequests: Array<Topic>, options: ConsumerOptions);
-        on(eventName: string, cb: (message: string) => any): void;
-        on(eventName: string, cb: (error: any) => any): void;
-        addTopics(topics: Array<string>, cb: (error: any, added: boolean) => any): void;
-        addTopics(topics: Array<Topic>, cb: (error: any, added: boolean) => any, fromOffset: boolean): void;
-        removeTopics(topics: Array<string>, cb: (error: any, removed: boolean) => any): void;
-        commit(cb: (error: any, data: any) => any): void;
-        setOffset(topic: string, partition: number, offset: number): void;
-        pause(): void;
-        resume(): void;
-        pauseTopics(topics: Array<any> /* Array<string|Topic> */): void;
-        resumeTopics(topics: Array<any> /* Array<string|Topic> */): void;
-        close(force: boolean, cb: () => any): void;
-    }
-
-    export class HighLevelConsumer {
-        constructor(client: Client, payloads: Array<Topic>, options: ConsumerOptions);
-        on(eventName: string, cb: (message: string) => any): void;
-        on(eventName: string, cb: (error: any) => any): void;
-        addTopics(topics: Array<string>, cb: (error: any, added: boolean) => any): void;
-        addTopics(topics: Array<Topic>, cb: (error: any, added: boolean) => any, fromOffset: boolean): void;
-        removeTopics(topics: Array<string>, cb: (error: any, removed: boolean) => any): void;
-        commit(cb: (error: any, data: any) => any): void;
-        setOffset(topic: string, partition: number, offset: number): void;
-        pause(): void;
-        resume(): void;
-        pauseTopics(topics: Array<any> /* Array<string|Topic> */): void;
-        resumeTopics(topics: Array<any> /* Array<string|Topic> */): void;
-        close(force: boolean, cb: () => any): void;
-    }
-
-    export class Offset {
-        constructor(client: Client);
-        on(eventName: string, cb: () => any): void;
-        fetch(payloads: Array<OffsetRequest>, cb: (error: any, data: any) => any): void;
-        commit(groupId: string, payloads: Array<OffsetCommitRequest>, cb: (error: any, data: any) => any): void;
-        fetchCommits(groupId: string, payloads: Array<OffsetFetchRequest>, cb: (error: any, data: any) => any): void;
-    }
-
-    export class KeyedMessage {
-        constructor(key: string, message: string);
-    }
-
-    // # Interfaces
-    export interface ZKOptions {
-        sessionTimeout?: number;
-        spinDelay?: number;
-        retries?: number;
-    }
-
-    export interface ProduceRequest {
-        topic: string;
-        messages: any; // Array<string> | Array<KeyedMessage> | string | KeyedMessage
-        partition?: number;
-        attributes?: number;
-    }
-
-    export interface ConsumerOptions {
-        groupId?: string;
-        autoCommit?: boolean;
-        autoCommitIntervalMs?: number;
-        fetchMaxWaitMs?: number;
-        fetchMinBytes?: number;
-        fetchMaxBytes?: number;
-        fromOffset?: boolean;
-        encoding?: string;
-    }
-
-    export interface Topic {
-        topic: string;
-        offset?: number;
-    }
-
-    export interface OffsetRequest {
-        topic: string;
-        partition?: number;
-        time?: number;
-        maxNum?: number;
-    }
-
-    export interface OffsetCommitRequest {
-        topic: string;
-        partition?: number;
-        offset: number;
-        metadata?: string;
-    }
-
-    export interface OffsetFetchRequest {
-        topic: string;
-        partition?: number;
-    }
-
-}
diff --git a/kafka-node/tsconfig.json b/kafka-node/tsconfig.json
new file mode 100644
index 0000000000..20a6f8c88c
--- /dev/null
+++ b/kafka-node/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "kafka-node-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/karma-coverage/index.d.ts b/karma-coverage/index.d.ts
new file mode 100644
index 0000000000..dd6a382239
--- /dev/null
+++ b/karma-coverage/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for karma-coverage v0.5.3
+// Project: https://github.com/karma-runner/karma-coverage
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as karma from 'karma';
+import * as istanbul from 'istanbul';
+
+declare namespace karmaCoverage {
+    interface Karma extends karma.Karma { }
+
+    interface Config extends karma.Config {
+        set: (config: ConfigOptions) => void;
+    }
+
+    interface ConfigOptions extends karma.ConfigOptions {
+        /**
+         * See https://github.com/karma-runner/karma-coverage/blob/master/docs/configuration.md
+         */
+        coverageReporter?: (Reporter | Reporter[]);
+    }
+
+    interface Reporter {
+        type?: string;
+        dir?: string;
+        subdir?: string | ((browser: string) => string);
+        check?: any;
+        watermarks?: any;
+        includeAllSources?: boolean;
+        sourceStore?: istanbul.Store;
+        instrumenter?: any;
+    }
+}
+
+declare var karmaCoverage: karmaCoverage.Karma;
+
+export = karmaCoverage;
diff --git a/karma-coverage/karma-coverage-tests.ts b/karma-coverage/karma-coverage-tests.ts
index 8ca9edc63b..a59ca7cdea 100644
--- a/karma-coverage/karma-coverage-tests.ts
+++ b/karma-coverage/karma-coverage-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="karma-coverage.d.ts" />
 
 import * as karma from 'karma-coverage';
 
diff --git a/karma-coverage/karma-coverage.d.ts b/karma-coverage/karma-coverage.d.ts
deleted file mode 100644
index 8e2717cf24..0000000000
--- a/karma-coverage/karma-coverage.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// Type definitions for karma-coverage v0.5.3
-// Project: https://github.com/karma-runner/karma-coverage
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../karma/karma.d.ts" />
-/// <reference path="../istanbul/istanbul.d.ts" />
-
-declare module 'karma-coverage' {
-  import * as karma from 'karma';
-  import * as istanbul from 'istanbul';
-
-  namespace karmaCoverage {
-    interface Karma extends karma.Karma {}
-
-    interface Config extends karma.Config {
-      set: (config: ConfigOptions) => void;
-    }
-
-    interface ConfigOptions extends karma.ConfigOptions {
-      /**
-       * See https://github.com/karma-runner/karma-coverage/blob/master/docs/configuration.md
-       */
-      coverageReporter?: (Reporter|Reporter[]);
-    }
-
-    interface Reporter {
-      type?: string;
-      dir?: string;
-      subdir?: string | ((browser: string) => string);
-      check?: any;
-      watermarks?: any;
-      includeAllSources?: boolean;
-      sourceStore?: istanbul.Store;
-      instrumenter?: any;
-    }
-  }
-
-  var karmaCoverage: karmaCoverage.Karma;
-
-  export = karmaCoverage;
-}
diff --git a/karma-coverage/tsconfig.json b/karma-coverage/tsconfig.json
new file mode 100644
index 0000000000..0c208edf2d
--- /dev/null
+++ b/karma-coverage/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "karma-coverage-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/karma-jasmine/index.d.ts b/karma-jasmine/index.d.ts
new file mode 100644
index 0000000000..a5f0a22f5b
--- /dev/null
+++ b/karma-jasmine/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for karma-jasmine plugin
+// Project: https://github.com/karma-runner/karma-jasmine
+// Definitions by: Michel Salib <https://github.com/michelsalib>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jasmine" />
+
+declare function fdescribe(description: string, specDefinitions: () => void): void;
+declare function fit(expectation: string, assertion: () => void): void;
diff --git a/karma-jasmine/karma-jasmine-tests.ts b/karma-jasmine/karma-jasmine-tests.ts
index 19e5436129..d31c9e415d 100644
--- a/karma-jasmine/karma-jasmine-tests.ts
+++ b/karma-jasmine/karma-jasmine-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="karma-jasmine.d.ts" />
+
 
 fdescribe("A suite", () => {
     fit("contains spec with an expectation", () => {
diff --git a/karma-jasmine/karma-jasmine.d.ts b/karma-jasmine/karma-jasmine.d.ts
deleted file mode 100644
index bf9baaa157..0000000000
--- a/karma-jasmine/karma-jasmine.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for karma-jasmine plugin
-// Project: https://github.com/karma-runner/karma-jasmine
-// Definitions by: Michel Salib <https://github.com/michelsalib>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jasmine/jasmine.d.ts" />
-
-declare function fdescribe(description: string, specDefinitions: () => void): void;
-declare function fit(expectation: string, assertion: () => void): void;
diff --git a/karma-jasmine/tsconfig.json b/karma-jasmine/tsconfig.json
new file mode 100644
index 0000000000..8812b8dd4f
--- /dev/null
+++ b/karma-jasmine/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "karma-jasmine-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/karma/index.d.ts b/karma/index.d.ts
new file mode 100644
index 0000000000..943ae8bc0b
--- /dev/null
+++ b/karma/index.d.ts
@@ -0,0 +1,378 @@
+// Type definitions for karma v0.13.9
+// Project: https://github.com/karma-runner/karma
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="bluebird" />
+/// <reference types="node" />
+
+// See Karma public API https://karma-runner.github.io/0.13/dev/public-api.html
+import Promise = require('bluebird');
+import https = require('https');
+import log4js = require('log4js');
+
+declare namespace karma {
+    interface Karma {
+        /**
+         * `start` method is deprecated since 0.13. It will be removed in 0.14.
+         * Please use
+         * <code>
+         *     server = new Server(config, [done])
+         *     server.start()
+         * </code>
+         * instead.
+         */
+        server: DeprecatedServer;
+        Server: Server;
+        runner: Runner;
+        launcher: Launcher;
+        VERSION: string;
+    }
+
+    interface LauncherStatic {
+        generateId(): string;
+        //TODO: injector should be of type `di.Injector`
+        new (emitter: NodeJS.EventEmitter, injector: any): Launcher;
+    }
+
+    interface Launcher {
+        Launcher: LauncherStatic;
+        //TODO: Can this return value ever be typified?
+        launch(names: string[], protocol: string, hostname: string, port: number, urlRoot: string): any[];
+        kill(id: string, callback: Function): boolean;
+        restart(id: string): boolean;
+        killAll(callback: Function): void;
+        areAllCaptured(): boolean;
+        markCaptured(id: string): void;
+    }
+
+    interface DeprecatedServer {
+        start(options?: any, callback?: ServerCallback): void;
+    }
+
+    interface Runner {
+        run(options?: ConfigOptions | ConfigFile, callback?: ServerCallback): void;
+    }
+
+    interface Server extends NodeJS.EventEmitter {
+        new (options?: ConfigOptions | ConfigFile, callback?: ServerCallback): Server;
+        /**
+         * Start the server
+         */
+        start(): void;
+        /**
+         * Get properties from the injector
+         * @param token
+         */
+        get(token: string): any;
+        /**
+         * Force a refresh of the file list
+         */
+        refreshFiles(): Promise<any>;
+
+        ///**
+        // * Backward-compatibility with karma-intellij bundled with WebStorm.
+        // * Deprecated since version 0.13, to be removed in 0.14
+        // */
+        //static start(): void;
+    }
+
+    interface ServerCallback {
+        (exitCode: number): void;
+    }
+
+    interface Config {
+        set: (config: ConfigOptions) => void;
+        LOG_DISABLE: string;
+        LOG_ERROR: string;
+        LOG_WARN: string;
+        LOG_INFO: string;
+        LOG_DEBUG: string;
+    }
+
+    interface ConfigFile {
+        configFile: string;
+    }
+
+    interface ConfigOptions {
+        /**
+         * @description Enable or disable watching files and executing the tests whenever one of these files changes.
+         * @default true
+         */
+        autoWatch?: boolean;
+        /**
+         * @description When Karma is watching the files for changes, it tries to batch multiple changes into a single run
+         * so that the test runner doesn't try to start and restart running tests more than it should.
+         * The configuration setting tells Karma how long to wait (in milliseconds) after any changes have occurred
+         * before starting the test process again.
+         * @default 250
+         */
+        autoWatchBatchDelay?: number;
+        /**
+         * @default ''
+         * @description The root path location that will be used to resolve all relative paths defined in <code>files</code> and <code>exclude</code>.
+         * If the basePath configuration is a relative path then it will be resolved to
+         * the <code>__dirname</code> of the configuration file.
+         */
+        basePath?: string;
+        /**
+         * @default 2000
+         * @description How long does Karma wait for a browser to reconnect (in ms).
+         * <p>
+         * With a flaky connection it is pretty common that the browser disconnects,
+         * but the actual test execution is still running without any problems. Karma does not treat a disconnection
+         * as immediate failure and will wait <code>browserDisconnectTimeout</code> (ms).
+         * If the browser reconnects during that time, everything is fine.
+         * </p>
+         */
+        browserDisconnectTimeout?: number;
+        /**
+         * @default 0
+         * @description The number of disconnections tolerated.
+         * <p>
+         * The <code>disconnectTolerance</code> value represents the maximum number of tries a browser will attempt
+         * in the case of a disconnection. Usually any disconnection is considered a failure,
+         * but this option allows you to define a tolerance level when there is a flaky network link between
+         * the Karma server and the browsers.
+         * </p>
+         */
+        browserDisconnectTolerance?: number;
+        /**
+         * @default 10000
+         * @description How long will Karma wait for a message from a browser before disconnecting from it (in ms).
+         * <p>
+         * If, during test execution, Karma does not receive any message from a browser within
+         * <code>browserNoActivityTimeout</code> (ms), it will disconnect from the browser
+         * </p>
+         */
+        browserNoActivityTimeout?: number;
+        /**
+         * @default []
+         * Possible Values:
+         * <ul>
+         *     <li>Chrome (launcher comes installed with Karma)</li>
+         *     <li>ChromeCanary (launcher comes installed with Karma)</li>
+         *     <li>PhantomJS (launcher comes installed with Karma)</li>
+         *     <li>Firefox (launcher requires karma-firefox-launcher plugin)</li>
+         *     <li>Opera (launcher requires karma-opera-launcher plugin)</li>
+         *     <li>Internet Explorer (launcher requires karma-ie-launcher plugin)</li>
+         *     <li>Safari (launcher requires karma-safari-launcher plugin)</li>
+         * </ul>
+         * @description A list of browsers to launch and capture. When Karma starts up, it will also start up each browser
+         * which is placed within this setting. Once Karma is shut down, it will shut down these browsers as well.
+         * You can capture any browser manually by opening the browser and visiting the URL where
+         * the Karma web server is listening (by default it is <code>http://localhost:9876/</code>).
+         */
+        browsers?: string[];
+        /**
+         * @default 60000
+         * @description Timeout for capturing a browser (in ms).
+         * <p>
+         * The <code>captureTimeout</code> value represents the maximum boot-up time allowed for a
+         * browser to start and connect to Karma. If any browser does not get captured within the timeout, Karma
+         * will kill it and try to launch it again and, after three attempts to capture it, Karma will give up.
+         * </p>
+         */
+        captureTimeout?: number;
+        client?: ClientOptions;
+        /**
+         * @default true
+         * @description Enable or disable colors in the output (reporters and logs).
+         */
+        colors?: boolean;
+        /**
+         * @default []
+         * @description List of files/patterns to exclude from loaded files.
+         */
+        exclude?: string[];
+        /**
+         * @default []
+         * @description List of files/patterns to load in the browser.
+         */
+        files?: (FilePattern | string)[];
+        /**
+         * @default []
+         * @description List of test frameworks you want to use. Typically, you will set this to ['jasmine'], ['mocha'] or ['qunit']...
+         * Please note just about all frameworks in Karma require an additional plugin/framework library to be installed (via NPM).
+         */
+        frameworks?: string[];
+        /**
+         * @default 'localhost'
+         * @description Hostname to be used when capturing browsers.
+         */
+        hostname?: string;
+        /**
+         * @default {}
+         * @description Options object to be used by Node's https class.
+         * Object description can be found in the
+         * [NodeJS.org API docs](https://nodejs.org/api/tls.html#tls_tls_createserver_options_secureconnectionlistener)
+         */
+        httpsServerOptions?: https.ServerOptions;
+        /**
+         * @default config.LOG_INFO
+         * Possible values:
+         * <ul>
+         *   <li>config.LOG_DISABLE</li>
+         *   <li>config.LOG_ERROR</li>
+         *   <li>config.LOG_WARN</li>
+         *   <li>config.LOG_INFO</li>
+         *   <li>config.LOG_DEBUG</li>
+         * </ul>
+         * @description Level of logging.
+         */
+        logLevel?: string;
+        /**
+         * @default [{type: 'console'}]
+         * @description A list of log appenders to be used. See the documentation for [log4js] for more information.
+         */
+        loggers?: log4js.AppenderConfigBase[];
+        /**
+         * @default ['karma-*']
+         * @description List of plugins to load. A plugin can be a string (in which case it will be required
+         * by Karma) or an inlined plugin - Object.
+         * By default, Karma loads all sibling NPM modules which have a name starting with karma-*.
+         * Note: Just about all plugins in Karma require an additional library to be installed (via NPM).
+         */
+        plugins?: any[];
+        /**
+         * @default 9876
+         * @description The port where the web server will be listening.
+         */
+        port?: number;
+        /**
+         * @default {'**\/*.coffee': 'coffee'}
+         * @description A map of preprocessors to use.
+         *
+         * Preprocessors can be loaded through [plugins].
+         *
+         * Note: Just about all preprocessors in Karma (other than CoffeeScript and some other defaults)
+         * require an additional library to be installed (via NPM).
+         *
+         * Be aware that preprocessors may be transforming the files and file types that are available at run time. For instance,
+         * if you are using the "coverage" preprocessor on your source files, if you then attempt to interactively debug
+         * your tests, you'll discover that your expected source code is completely changed from what you expected.  Because
+         * of that, you'll want to engineer this so that your automated builds use the coverage entry in the "reporters" list,
+         * but your interactive debugging does not.
+         *
+         */
+        preprocessors?: { [name: string]: string | string[] }
+        /**
+         * @default 'http:'
+         * Possible Values:
+         * <ul>
+         *   <li>http:</li>
+         *   <li>https:</li>
+         * </ul>
+         * @description Protocol used for running the Karma webserver.
+         * Determines the use of the Node http or https class.
+         * Note: Using <code>'https:'</code> requires you to specify <code>httpsServerOptions</code>.
+         */
+        protocol?: string;
+        /**
+         * @default {}
+         * @description A map of path-proxy pairs.
+         */
+        proxies?: { [path: string]: string }
+        /**
+         * @default true
+         * @description Whether or not Karma or any browsers should raise an error when an inavlid SSL certificate is found.
+         */
+        proxyValidateSSL?: boolean;
+        /**
+         * @default 0
+         * @description Karma will report all the tests that are slower than given time limit (in ms).
+         * This is disabled by default (since the default value is 0).
+         */
+        reportSlowerThan?: number;
+        /**
+         * @default ['progress']
+         * Possible Values:
+         * <ul>
+         *   <li>dots</li>
+         *   <li>progress</li>
+         * </ul>
+         * @description A list of reporters to use.
+         * Additional reporters, such as growl, junit, teamcity or coverage can be loaded through plugins.
+         * Note: Just about all additional reporters in Karma (other than progress) require an additional library to be installed (via NPM).
+         */
+        reporters?: string[];
+        /**
+         * @default false
+         * @description Continuous Integration mode.
+         * If true, Karma will start and capture all configured browsers, run tests and then exit with an exit code of 0 or 1 depending
+         * on whether all tests passed or any tests failed.
+         */
+        singleRun?: boolean;
+        /**
+         * @default ['polling', 'websocket']
+         * @description An array of allowed transport methods between the browser and testing server. This configuration setting
+         * is handed off to [socket.io](http://socket.io/) (which manages the communication
+         * between browsers and the testing server).
+         */
+        transports?: string[];
+        /**
+         * @default '/'
+         * @description The base url, where Karma runs.
+         * All of Karma's urls get prefixed with the urlRoot. This is helpful when using proxies, as
+         * sometimes you might want to proxy a url that is already taken by Karma.
+         */
+        urlRoot?: string;
+    }
+
+    interface ClientOptions {
+        /**
+         * @default undefined
+         * @description When karma run is passed additional arguments on the command-line, they
+         * are passed through to the test adapter as karma.config.args (an array of strings).
+         * The client.args option allows you to set this value for actions other than run.
+         * How this value is used is up to your test adapter - you should check your adapter's
+         * documentation to see how (and if) it uses this value.
+         */
+        args?: string[];
+        /**
+         * @default true
+         * @description Run the tests inside an iFrame or a new window
+         * If true, Karma runs the tests inside an iFrame. If false, Karma runs the tests in a new window. Some tests may not run in an
+         * iFrame and may need a new window to run.
+         */
+        useIframe?: boolean;
+        /**
+         * @default true
+         * @description Capture all console output and pipe it to the terminal.
+         */
+        captureConsole?: boolean;
+    }
+
+    interface FilePattern {
+        /**
+         * The pattern to use for matching. This property is mandatory.
+         */
+        pattern: string;
+        /**
+         * @default true
+         * @description If <code>autoWatch</code> is true all files that have set watched to true will be watched
+         * for changes.
+         */
+        watched?: boolean;
+        /**
+         * @default true
+         * @description Should the files be included in the browser using <script> tag? Use false if you want to
+         * load them manually, eg. using Require.js.
+         */
+        included?: boolean;
+        /**
+         * @default true
+         * @description Should the files be served by Karma's webserver?
+         */
+        served?: boolean;
+        /**
+         * @default false
+         * @description Should the files be served from disk on each request by Karma's webserver?
+         */
+        nocache?: boolean;
+    }
+}
+
+declare var karma: karma.Karma;
+
+export = karma;
diff --git a/karma/karma-0.12-tests.ts b/karma/karma-0.12-tests.ts
index b402c08049..7e2c7230db 100644
--- a/karma/karma-0.12-tests.ts
+++ b/karma/karma-0.12-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="karma-0.12.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
 
 import gulp = require('gulp');
 import karma = require('karma');
diff --git a/karma/karma-0.12.d.ts b/karma/karma-0.12.d.ts
index fe7af6d29a..dc9939d205 100644
--- a/karma/karma-0.12.d.ts
+++ b/karma/karma-0.12.d.ts
@@ -3,22 +3,21 @@
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'karma' {
-    // See Karma public API https://karma-runner.github.io/0.12/dev/public-api.html
 
-    interface IKarmaServer {
-        start(options?: any, callback?: (exitCode: number) => void): void;
-    }
+// See Karma public API https://karma-runner.github.io/0.12/dev/public-api.html
 
-    interface IKarmaRunner {
-        run(options?: any, callback?: (exitCode: number) => void): void;
-    }
-
-    interface IKarma {
-        server: IKarmaServer;
-        runner: IKarmaRunner;
-    }
-
-    var karma: IKarma;
-    export = karma;
+interface IKarmaServer {
+    start(options?: any, callback?: (exitCode: number) => void): void;
 }
+
+interface IKarmaRunner {
+    run(options?: any, callback?: (exitCode: number) => void): void;
+}
+
+interface IKarma {
+    server: IKarmaServer;
+    runner: IKarmaRunner;
+}
+
+declare var karma: IKarma;
+export = karma;
diff --git a/karma/karma-tests.ts b/karma/karma-tests.ts
index 7dbd533b59..b96536c97d 100644
--- a/karma/karma-tests.ts
+++ b/karma/karma-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="karma.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import gulp = require('gulp');
 import karma = require('karma');
diff --git a/karma/karma.d.ts b/karma/karma.d.ts
deleted file mode 100644
index 455d1df911..0000000000
--- a/karma/karma.d.ts
+++ /dev/null
@@ -1,381 +0,0 @@
-// Type definitions for karma v0.13.9
-// Project: https://github.com/karma-runner/karma
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../bluebird/bluebird.d.ts" />
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../log4js/log4js.d.ts" />
-
-declare module 'karma' {
-    // See Karma public API https://karma-runner.github.io/0.13/dev/public-api.html
-    import Promise = require('bluebird');
-    import https = require('https');
-    import log4js = require('log4js');
-
-    namespace karma {
-        interface Karma {
-            /**
-             * `start` method is deprecated since 0.13. It will be removed in 0.14.
-             * Please use
-             * <code>
-             *     server = new Server(config, [done])
-             *     server.start()
-             * </code>
-             * instead.
-             */
-            server: DeprecatedServer;
-            Server: Server;
-            runner: Runner;
-            launcher: Launcher;
-            VERSION: string;
-        }
-
-        interface LauncherStatic {
-            generateId(): string;
-            //TODO: injector should be of type `di.Injector`
-            new(emitter: NodeJS.EventEmitter, injector: any): Launcher;
-        }
-
-        interface Launcher {
-            Launcher: LauncherStatic;
-            //TODO: Can this return value ever be typified?
-            launch(names: string[], protocol: string, hostname: string, port: number, urlRoot: string): any[];
-            kill(id: string, callback: Function): boolean;
-            restart(id: string): boolean;
-            killAll(callback: Function): void;
-            areAllCaptured(): boolean;
-            markCaptured(id: string): void;
-        }
-
-        interface DeprecatedServer {
-            start(options?: any, callback?: ServerCallback): void;
-        }
-
-        interface Runner {
-            run(options?: ConfigOptions|ConfigFile, callback?: ServerCallback): void;
-        }
-
-        interface Server extends NodeJS.EventEmitter {
-            new(options?: ConfigOptions|ConfigFile, callback?: ServerCallback): Server;
-            /**
-             * Start the server
-             */
-            start(): void;
-            /**
-             * Get properties from the injector
-             * @param token
-             */
-            get(token: string): any;
-            /**
-             * Force a refresh of the file list
-             */
-            refreshFiles(): Promise<any>;
-
-            ///**
-            // * Backward-compatibility with karma-intellij bundled with WebStorm.
-            // * Deprecated since version 0.13, to be removed in 0.14
-            // */
-            //static start(): void;
-        }
-
-        interface ServerCallback {
-            (exitCode: number): void;
-        }
-
-        interface Config {
-            set: (config: ConfigOptions) => void;
-            LOG_DISABLE: string;
-            LOG_ERROR: string;
-            LOG_WARN: string;
-            LOG_INFO: string;
-            LOG_DEBUG: string;
-        }
-
-        interface ConfigFile {
-            configFile: string;
-        }
-
-        interface ConfigOptions {
-            /**
-             * @description Enable or disable watching files and executing the tests whenever one of these files changes.
-             * @default true
-             */
-            autoWatch?: boolean;
-            /**
-             * @description When Karma is watching the files for changes, it tries to batch multiple changes into a single run
-             * so that the test runner doesn't try to start and restart running tests more than it should.
-             * The configuration setting tells Karma how long to wait (in milliseconds) after any changes have occurred
-             * before starting the test process again.
-             * @default 250
-             */
-            autoWatchBatchDelay?: number;
-            /**
-             * @default ''
-             * @description The root path location that will be used to resolve all relative paths defined in <code>files</code> and <code>exclude</code>.
-             * If the basePath configuration is a relative path then it will be resolved to
-             * the <code>__dirname</code> of the configuration file.
-             */
-            basePath?: string;
-            /**
-             * @default 2000
-             * @description How long does Karma wait for a browser to reconnect (in ms).
-             * <p>
-             * With a flaky connection it is pretty common that the browser disconnects,
-             * but the actual test execution is still running without any problems. Karma does not treat a disconnection
-             * as immediate failure and will wait <code>browserDisconnectTimeout</code> (ms).
-             * If the browser reconnects during that time, everything is fine.
-             * </p>
-             */
-            browserDisconnectTimeout?: number;
-            /**
-             * @default 0
-             * @description The number of disconnections tolerated.
-             * <p>
-             * The <code>disconnectTolerance</code> value represents the maximum number of tries a browser will attempt
-             * in the case of a disconnection. Usually any disconnection is considered a failure,
-             * but this option allows you to define a tolerance level when there is a flaky network link between
-             * the Karma server and the browsers.
-             * </p>
-             */
-            browserDisconnectTolerance?: number;
-            /**
-             * @default 10000
-             * @description How long will Karma wait for a message from a browser before disconnecting from it (in ms).
-             * <p>
-             * If, during test execution, Karma does not receive any message from a browser within
-             * <code>browserNoActivityTimeout</code> (ms), it will disconnect from the browser
-             * </p>
-             */
-            browserNoActivityTimeout?: number;
-            /**
-             * @default []
-             * Possible Values:
-             * <ul>
-             *     <li>Chrome (launcher comes installed with Karma)</li>
-             *     <li>ChromeCanary (launcher comes installed with Karma)</li>
-             *     <li>PhantomJS (launcher comes installed with Karma)</li>
-             *     <li>Firefox (launcher requires karma-firefox-launcher plugin)</li>
-             *     <li>Opera (launcher requires karma-opera-launcher plugin)</li>
-             *     <li>Internet Explorer (launcher requires karma-ie-launcher plugin)</li>
-             *     <li>Safari (launcher requires karma-safari-launcher plugin)</li>
-             * </ul>
-             * @description A list of browsers to launch and capture. When Karma starts up, it will also start up each browser
-             * which is placed within this setting. Once Karma is shut down, it will shut down these browsers as well.
-             * You can capture any browser manually by opening the browser and visiting the URL where
-             * the Karma web server is listening (by default it is <code>http://localhost:9876/</code>).
-             */
-            browsers?: string[];
-            /**
-             * @default 60000
-             * @description Timeout for capturing a browser (in ms).
-             * <p>
-             * The <code>captureTimeout</code> value represents the maximum boot-up time allowed for a
-             * browser to start and connect to Karma. If any browser does not get captured within the timeout, Karma
-             * will kill it and try to launch it again and, after three attempts to capture it, Karma will give up.
-             * </p>
-             */
-            captureTimeout?: number;
-            client?: ClientOptions;
-            /**
-             * @default true
-             * @description Enable or disable colors in the output (reporters and logs).
-             */
-            colors?: boolean;
-            /**
-             * @default []
-             * @description List of files/patterns to exclude from loaded files.
-             */
-            exclude?: string[];
-            /**
-             * @default []
-             * @description List of files/patterns to load in the browser.
-             */
-            files?: (FilePattern|string)[];
-            /**
-             * @default []
-             * @description List of test frameworks you want to use. Typically, you will set this to ['jasmine'], ['mocha'] or ['qunit']...
-             * Please note just about all frameworks in Karma require an additional plugin/framework library to be installed (via NPM).
-             */
-            frameworks?: string[];
-            /**
-             * @default 'localhost'
-             * @description Hostname to be used when capturing browsers.
-             */
-            hostname?: string;
-            /**
-             * @default {}
-             * @description Options object to be used by Node's https class.
-             * Object description can be found in the
-             * [NodeJS.org API docs](https://nodejs.org/api/tls.html#tls_tls_createserver_options_secureconnectionlistener)
-             */
-            httpsServerOptions?: https.ServerOptions;
-            /**
-             * @default config.LOG_INFO
-             * Possible values:
-             * <ul>
-             *   <li>config.LOG_DISABLE</li>
-             *   <li>config.LOG_ERROR</li>
-             *   <li>config.LOG_WARN</li>
-             *   <li>config.LOG_INFO</li>
-             *   <li>config.LOG_DEBUG</li>
-             * </ul>
-             * @description Level of logging.
-             */
-            logLevel?: string;
-            /**
-             * @default [{type: 'console'}]
-             * @description A list of log appenders to be used. See the documentation for [log4js] for more information.
-             */
-            loggers?: log4js.AppenderConfigBase[];
-            /**
-             * @default ['karma-*']
-             * @description List of plugins to load. A plugin can be a string (in which case it will be required
-             * by Karma) or an inlined plugin - Object.
-             * By default, Karma loads all sibling NPM modules which have a name starting with karma-*.
-             * Note: Just about all plugins in Karma require an additional library to be installed (via NPM).
-             */
-            plugins?: any[];
-            /**
-             * @default 9876
-             * @description The port where the web server will be listening.
-             */
-            port?: number;
-            /**
-             * @default {'**\/*.coffee': 'coffee'}
-             * @description A map of preprocessors to use.
-             *
-             * Preprocessors can be loaded through [plugins].
-             *
-             * Note: Just about all preprocessors in Karma (other than CoffeeScript and some other defaults)
-             * require an additional library to be installed (via NPM).
-             *
-             * Be aware that preprocessors may be transforming the files and file types that are available at run time. For instance,
-             * if you are using the "coverage" preprocessor on your source files, if you then attempt to interactively debug
-             * your tests, you'll discover that your expected source code is completely changed from what you expected.  Because
-             * of that, you'll want to engineer this so that your automated builds use the coverage entry in the "reporters" list,
-             * but your interactive debugging does not.
-             *
-             */
-            preprocessors?: { [name: string]: string|string[] }
-            /**
-             * @default 'http:'
-             * Possible Values:
-             * <ul>
-             *   <li>http:</li>
-             *   <li>https:</li>
-             * </ul>
-             * @description Protocol used for running the Karma webserver.
-             * Determines the use of the Node http or https class.
-             * Note: Using <code>'https:'</code> requires you to specify <code>httpsServerOptions</code>.
-             */
-            protocol?: string;
-            /**
-             * @default {}
-             * @description A map of path-proxy pairs.
-             */
-            proxies?: { [path: string]: string }
-            /**
-             * @default true
-             * @description Whether or not Karma or any browsers should raise an error when an inavlid SSL certificate is found.
-             */
-            proxyValidateSSL?: boolean;
-            /**
-             * @default 0
-             * @description Karma will report all the tests that are slower than given time limit (in ms).
-             * This is disabled by default (since the default value is 0).
-             */
-            reportSlowerThan?: number;
-            /**
-             * @default ['progress']
-             * Possible Values:
-             * <ul>
-             *   <li>dots</li>
-             *   <li>progress</li>
-             * </ul>
-             * @description A list of reporters to use.
-             * Additional reporters, such as growl, junit, teamcity or coverage can be loaded through plugins.
-             * Note: Just about all additional reporters in Karma (other than progress) require an additional library to be installed (via NPM).
-             */
-            reporters?: string[];
-            /**
-             * @default false
-             * @description Continuous Integration mode.
-             * If true, Karma will start and capture all configured browsers, run tests and then exit with an exit code of 0 or 1 depending
-             * on whether all tests passed or any tests failed.
-             */
-            singleRun?: boolean;
-            /**
-             * @default ['polling', 'websocket']
-             * @description An array of allowed transport methods between the browser and testing server. This configuration setting
-             * is handed off to [socket.io](http://socket.io/) (which manages the communication
-             * between browsers and the testing server).
-             */
-            transports?: string[];
-            /**
-             * @default '/'
-             * @description The base url, where Karma runs.
-             * All of Karma's urls get prefixed with the urlRoot. This is helpful when using proxies, as
-             * sometimes you might want to proxy a url that is already taken by Karma.
-             */
-            urlRoot?: string;
-        }
-
-        interface ClientOptions {
-            /**
-             * @default undefined
-             * @description When karma run is passed additional arguments on the command-line, they
-             * are passed through to the test adapter as karma.config.args (an array of strings).
-             * The client.args option allows you to set this value for actions other than run.
-             * How this value is used is up to your test adapter - you should check your adapter's
-             * documentation to see how (and if) it uses this value.
-             */
-            args?: string[];
-            /**
-             * @default true
-             * @description Run the tests inside an iFrame or a new window
-             * If true, Karma runs the tests inside an iFrame. If false, Karma runs the tests in a new window. Some tests may not run in an
-             * iFrame and may need a new window to run.
-             */
-            useIframe?: boolean;
-            /**
-             * @default true
-             * @description Capture all console output and pipe it to the terminal.
-             */
-            captureConsole?: boolean;
-        }
-
-        interface FilePattern {
-            /**
-             * The pattern to use for matching. This property is mandatory.
-             */
-            pattern: string;
-            /**
-             * @default true
-             * @description If <code>autoWatch</code> is true all files that have set watched to true will be watched
-             * for changes.
-             */
-            watched?: boolean;
-            /**
-             * @default true
-             * @description Should the files be included in the browser using <script> tag? Use false if you want to
-             * load them manually, eg. using Require.js.
-             */
-            included?: boolean;
-            /**
-             * @default true
-             * @description Should the files be served by Karma's webserver?
-             */
-            served?: boolean;
-            /**
-             * @default false
-             * @description Should the files be served from disk on each request by Karma's webserver?
-             */
-            nocache?: boolean;
-        }
-    }
-
-    var karma: karma.Karma;
-
-    export = karma;
-}
diff --git a/karma/tsconfig.json b/karma/tsconfig.json
new file mode 100644
index 0000000000..421ef92f43
--- /dev/null
+++ b/karma/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "karma-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/katex/index.d.ts b/katex/index.d.ts
new file mode 100644
index 0000000000..db3c0999d1
--- /dev/null
+++ b/katex/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for KaTeX v.0.5.0
+// Project: http://khan.github.io/KaTeX/
+// Definitions by: Michael Randolph <https://github.com/mrand01>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace katex;
+
+export interface KatexOptions {
+    displayMode?: boolean;
+    breakOnUnsupportedCmds?: boolean;
+    errorColor?: string;
+}
+
+export class ParseError implements Error {
+    constructor(message: string, lexer: any, position: number);
+    name: string;
+    message: string;
+    position: number;
+}
+
+/**
+ * Renders a TeX expression into the specified DOM element
+ * @param tex A TeX expression
+ * @param element The DOM element to render into
+ * @param options KaTeX options
+ */
+export function render(tex: string, element: HTMLElement, options?: KatexOptions): void;
+/**
+ * Renders a TeX expression into an HTML string
+ * @param tex A TeX expression
+ * @param options KaTeX options
+ */
+export function renderToString(tex: string, options?: KatexOptions): string;
diff --git a/katex/katex-tests.ts b/katex/katex-tests.ts
index 9829fcddf7..77e745d6a0 100644
--- a/katex/katex-tests.ts
+++ b/katex/katex-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="katex.d.ts" />
-
 import katexLib = require('katex');
 
 class KatexTest {
diff --git a/katex/katex.d.ts b/katex/katex.d.ts
deleted file mode 100644
index 1251a141fc..0000000000
--- a/katex/katex.d.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// Type definitions for KaTeX v.0.5.0
-// Project: http://khan.github.io/KaTeX/
-// Definitions by: Michael Randolph <https://github.com/mrand01>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "katex" {
-	interface KatexOptions {
-		displayMode?: boolean;
-		breakOnUnsupportedCmds?: boolean;
-		errorColor?: string;
-	}
-
-	class ParseError implements Error {
-		constructor(message: string, lexer: any, position: number);
-		name: string;
-		message: string;
-		position: number;
-	}
-	
-	/**
-	 * Renders a TeX expression into the specified DOM element
-	 * @param tex A TeX expression
-	 * @param element The DOM element to render into
-	 * @param options KaTeX options
-	 */
-	function render(tex: string, element: HTMLElement, options?:KatexOptions): void;
-	/**
-	 * Renders a TeX expression into an HTML string
-	 * @param tex A TeX expression
-	 * @param options KaTeX options
-	 */
-	function renderToString(tex: string, options?:KatexOptions): string;
-}
\ No newline at end of file
diff --git a/katex/tsconfig.json b/katex/tsconfig.json
new file mode 100644
index 0000000000..e6d5da4e65
--- /dev/null
+++ b/katex/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "katex-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/kefir/index.d.ts b/kefir/index.d.ts
new file mode 100644
index 0000000000..12afaad5e2
--- /dev/null
+++ b/kefir/index.d.ts
@@ -0,0 +1,181 @@
+// Type definitions for Kefir 3.2.0
+// Project: http://rpominov.github.io/kefir/
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+export interface Observable<T, S> {
+    // Subscribe / add side effects
+    onValue(callback: (value: T) => void): void;
+    offValue(callback: (value: T) => void): void;
+    onError(callback: (error: S) => void): void;
+    offError(callback: (error: S) => void): void;
+    onEnd(callback: () => void): void;
+    offEnd(callback: () => void): void;
+    onAny(callback: (event: Event<T | S>) => void): void;
+    offAny(callback: (event: Event<T | S>) => void): void;
+    log(name?: string): void;
+    offLog(name?: string): void;
+    flatten<U>(transformer?: (value: T) => U[]): Stream<U, S>;
+    toPromise(PromiseConstructor?: any): any;
+    toESObservable(): any;
+}
+
+export interface Stream<T, S> extends Observable<T, S> {
+    toProperty(getCurrent?: () => T): Property<T, S>;
+
+    // Modify an stream
+    map<U>(fn: (value: T) => U): Stream<U, S>;
+    filter(predicate?: (value: T) => boolean): Stream<T, S>;
+    take(n: number): Stream<T, S>;
+    takeWhile(predicate?: (value: T) => boolean): Stream<T, S>;
+    last(): Stream<T, S>;
+    skip(n: number): Stream<T, S>;
+    skipWhile(predicate?: (value: T) => boolean): Stream<T, S>;
+    skipDuplicates(comparator?: (a: T, b: T) => boolean): Stream<T, S>;
+    diff(fn?: (prev: T, next: T) => T, seed?: T): Stream<T, S>;
+    scan(fn: (prev: T, next: T) => T, seed?: T): Stream<T, S>;
+    delay(wait: number): Stream<T, S>;
+    throttle(wait: number, options?: { leading?: boolean, trailing?: boolean }): Stream<T, S>;
+    debounce(wait: number, options?: { immediate: boolean }): Stream<T, S>;
+    valuesToErrors<U>(handler?: (value: T) => { convert: boolean, error: U }): Stream<void, S | U>;
+    errorsToValues<U>(handler?: (error: S) => { convert: boolean, value: U }): Stream<T | U, void>;
+    mapErrors<U>(fn: (error: S) => U): Stream<T, U>;
+    filterErrors(predicate?: (error: S) => boolean): Stream<T, S>;
+    endOnError(): Stream<T, S>;
+    takeErrors(n: number): Stream<T, S>;
+    ignoreValues(): Stream<void, S>;
+    ignoreErrors(): Stream<T, void>;
+    ignoreEnd(): Stream<T, S>;
+    beforeEnd<U>(fn: () => U): Stream<T | U, S>;
+    slidingWindow(max: number, mix?: number): Stream<T[], S>;
+    bufferWhile(predicate: (value: T) => boolean): Stream<T[], S>;
+    bufferWithCount(count: number, options?: { flushOnEnd: boolean }): Stream<T[], S>;
+    bufferWithTimeOrCount(interval: number, count: number, options?: { flushOnEnd: boolean }): Stream<T[], S>;
+    transduce<U>(transducer: any): Stream<U, S>;
+    withHandler<U, V>(handler: (emitter: Emitter<U, S>, event: Event<T | S>) => void): Stream<U, S>;
+
+    // Combine streams
+    combine<U, V, W>(otherObs: Stream<U, V>, combinator?: (value: T, ...values: U[]) => W): Stream<W, S | V>;
+    zip<U, V, W>(otherObs: Stream<U, V>, combinator?: (value: T, ...values: U[]) => W): Stream<W, S | V>;
+    merge<U, V>(otherObs: Stream<U, V>): Stream<T | U, S | V>;
+    concat<U, V>(otherObs: Stream<U, V>): Stream<T | U, S | V>;
+    flatMap<U, V>(transform: (value: T) => Stream<U, V>): Stream<U, V>;
+    flatMapLatest<U, V>(fn: (value: T) => Stream<U, V>): Stream<U, V>;
+    flatMapFirst<U, V>(fn: (value: T) => Stream<U, V>): Stream<U, V>;
+    flatMapConcat<U, V>(fn: (value: T) => Stream<U, V>): Stream<U, V>;
+    flatMapConcurLimit<U, V>(fn: (value: T) => Stream<U, V>, limit: number): Stream<U, V>;
+    flatMapErrors<U, V>(transform: (error: S) => Stream<U, V>): Stream<U, V>;
+
+    // Combine two streams
+    filterBy<U>(otherObs: Observable<boolean, U>): Stream<T, S>;
+    sampledBy<U, V, W>(otherObs: Observable<U, V>, combinator?: (a: T, b: U) => W): Stream<W, S>;
+    skipUntilBy<U, V>(otherObs: Observable<U, V>): Stream<U, V>;
+    takeUntilBy<U, V>(otherObs: Observable<U, V>): Stream<U, V>;
+    bufferBy<U, V>(otherObs: Observable<U, V>, options?: { flushOnEnd: boolean }): Stream<T[], S>;
+    bufferWhileBy<U>(otherObs: Observable<boolean, U>, options?: { flushOnEnd?: boolean, flushOnChange?: boolean }): Stream<T[], S>;
+    awaiting<U, V>(otherObs: Observable<U, V>): Stream<boolean, S>;
+}
+
+export interface Property<T, S> extends Observable<T, S> {
+    changes(): Stream<T, S>;
+
+    // Modify an property
+    map<U>(fn: (value: T) => U): Property<U, S>;
+    filter(predicate?: (value: T) => boolean): Property<T, S>;
+    take(n: number): Property<T, S>;
+    takeWhile(predicate?: (value: T) => boolean): Property<T, S>;
+    last(): Property<T, S>;
+    skip(n: number): Property<T, S>;
+    skipWhile(predicate?: (value: T) => boolean): Property<T, S>;
+    skipDuplicates(comparator?: (a: T, b: T) => boolean): Property<T, S>;
+    diff(fn?: (prev: T, next: T) => T, seed?: T): Property<T, S>;
+    scan(fn: (prev: T, next: T) => T, seed?: T): Property<T, S>;
+    delay(wait: number): Property<T, S>;
+    throttle(wait: number, options?: { leading?: boolean, trailing?: boolean }): Property<T, S>;
+    debounce(wait: number, options?: { immediate: boolean }): Property<T, S>;
+    valuesToErrors<U>(handler?: (value: T) => { convert: boolean, error: U }): Property<void, S | U>;
+    errorsToValues<U>(handler?: (error: S) => { convert: boolean, value: U }): Property<T | U, void>;
+    mapErrors<U>(fn: (error: S) => U): Property<T, U>;
+    filterErrors(predicate?: (error: S) => boolean): Property<T, S>;
+    endOnError(): Property<T, S>;
+    takeErrors(n: number): Stream<T, S>;
+    ignoreValues(): Property<void, S>;
+    ignoreErrors(): Property<T, void>;
+    ignoreEnd(): Property<T, S>;
+    beforeEnd<U>(fn: () => U): Property<T | U, S>;
+    slidingWindow(max: number, mix?: number): Property<T[], S>;
+    bufferWhile(predicate: (value: T) => boolean): Property<T[], S>;
+    bufferWithCount(count: number, options?: { flushOnEnd: boolean }): Property<T[], S>;
+    bufferWithTimeOrCount(interval: number, count: number, options?: { flushOnEnd: boolean }): Property<T[], S>;
+    transduce<U>(transducer: any): Property<U, S>;
+    withHandler<U, V>(handler: (emitter: Emitter<T, S>, event: Event<T | S>) => void): Property<U, S>;
+
+    // Combine properties
+    combine<U, V, W>(otherObs: Property<U, V>, combinator?: (value: T, ...values: U[]) => W): Property<W, S | V>;
+    zip<U, V, W>(otherObs: Property<U, V>, combinator?: (value: T, ...values: U[]) => W): Property<W, S | V>;
+    merge<U, V>(otherObs: Property<U, V>): Property<T | U, S | V>;
+    concat<U, V>(otherObs: Property<U, V>): Property<T | U, S | V>;
+    flatMap<U, V>(transform: (value: T) => Property<U, V>): Property<U, V>;
+    flatMapLatest<U, V>(fn: (value: T) => Property<U, V>): Property<U, V>;
+    flatMapFirst<U, V>(fn: (value: T) => Property<U, V>): Property<U, V>;
+    flatMapConcat<U, V>(fn: (value: T) => Property<U, V>): Property<U, V>;
+    flatMapConcurLimit<U, V>(fn: (value: T) => Property<U, V>, limit: number): Property<U, V>;
+    flatMapErrors<U, V>(transform: (error: S) => Property<U, V>): Property<U, V>;
+
+    // Combine two properties
+    filterBy<U>(otherObs: Observable<boolean, U>): Property<T, S>;
+    sampledBy<U, V, W>(otherObs: Observable<U, V>, combinator?: (a: T, b: U) => W): Property<W, S>;
+    skipUntilBy<U, V>(otherObs: Observable<U, V>): Property<U, V>;
+    takeUntilBy<U, V>(otherObs: Observable<U, V>): Property<U, V>;
+    bufferBy<U, V>(otherObs: Observable<U, V>, options?: { flushOnEnd: boolean }): Property<T[], S>;
+    bufferWhileBy<U>(otherObs: Observable<boolean, U>, options?: { flushOnEnd?: boolean, flushOnChange?: boolean }): Property<T[], S>;
+    awaiting<U, V>(otherObs: Observable<U, V>): Property<boolean, S>;
+}
+
+export interface ObservablePool<T, S> extends Observable<T, S> {
+    plug(obs: Observable<T, S>): void;
+    unPlug(obs: Observable<T, S>): void;
+}
+
+export interface Event<T> {
+    type: string;
+    value: T;
+}
+
+export interface Emitter<T, S> {
+    emit(value: T): void;
+    error(error: S): void;
+    end(): void;
+    emitEvent(event: { type: string, value: T | S }): void;
+}
+
+// Create a stream
+export declare function never(): Stream<void, void>;
+export declare function later<T>(wait: number, value: T): Stream<T, void>;
+export declare function interval<T>(interval: number, value: T): Stream<T, void>;
+export declare function sequentially<T>(interval: number, values: T[]): Stream<T, void>;
+export declare function fromPoll<T>(interval: number, fn: () => T): Stream<T, void>;
+export declare function withInterval<T, S>(interval: number, handler: (emitter: Emitter<T, S>) => void): Stream<T, S>;
+export declare function fromCallback<T>(fn: (callback: (value: T) => void) => void): Stream<T, void>;
+export declare function fromNodeCallback<T, S>(fn: (callback: (error: S, result: T) => void) => void): Stream<T, S>;
+export declare function fromEvents<T, S>(target: EventTarget | NodeJS.EventEmitter | { on: Function, off: Function }, eventName: string, transform?: (value: T) => S): Stream<T, S>;
+export declare function stream<T, S>(subscribe: (emitter: Emitter<T, S>) => Function | void): Stream<T, S>;
+export declare function fromESObservable<T, S>(observable: any): Stream<T, S>
+
+// Create a property
+export declare function constant<T>(value: T): Property<T, void>;
+export declare function constantError<T>(error: T): Property<void, T>;
+export declare function fromPromise<T, S>(promise: any): Property<T, S>;
+
+// Combine observables
+export declare function combine<T, S, U>(obss: Observable<T, S>[], passiveObss: Observable<T, S>[], combinator?: (...values: T[]) => U): Observable<U, S>;
+export declare function combine<T, S, U>(obss: Observable<T, S>[], combinator?: (...values: T[]) => U): Observable<U, S>;
+export declare function zip<T, S, U>(obss: Observable<T, S>[], passiveObss?: Observable<T, S>[], combinator?: (...values: T[]) => U): Observable<U, S>;
+export declare function merge<T, S>(obss: Observable<T, S>[]): Observable<T, S>;
+export declare function concat<T, S>(obss: Observable<T, S>[]): Observable<T, S>;
+export declare function pool<T, S>(): ObservablePool<T, S>;
+export declare function repeat<T, S>(generator: (i: number) => Observable<T, S> | boolean): Observable<T, S>;
diff --git a/kefir/kefir-tests.ts b/kefir/kefir-tests.ts
index 94300550b4..56055d0a22 100644
--- a/kefir/kefir-tests.ts
+++ b/kefir/kefir-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./kefir.d.ts" />
 
 import * as Kefir from 'kefir';
 import { Observable, ObservablePool, Stream, Property, Event, Emitter } from 'kefir';
diff --git a/kefir/kefir.d.ts b/kefir/kefir.d.ts
deleted file mode 100644
index e726dba915..0000000000
--- a/kefir/kefir.d.ts
+++ /dev/null
@@ -1,182 +0,0 @@
-// Type definitions for Kefir 3.2.0
-// Project: http://rpominov.github.io/kefir/
-// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "kefir" {
-
-	export interface Observable<T, S> {
-		// Subscribe / add side effects
-		onValue(callback: (value: T) => void): void;
-		offValue(callback: (value: T) => void): void;
-		onError(callback: (error: S) => void): void;
-		offError(callback: (error: S) => void): void;
-		onEnd(callback: () => void): void;
-		offEnd(callback: () => void): void;
-		onAny(callback: (event: Event<T | S>) => void): void;
-		offAny(callback: (event: Event<T | S>) => void): void;
-		log(name?: string): void;
-		offLog(name?: string): void;
-		flatten<U>(transformer?: (value: T) => U[]): Stream<U, S>;
-		toPromise(PromiseConstructor?: any): any;
-		toESObservable(): any;
-	}
-
-	export interface Stream<T, S> extends Observable<T, S> {
-		toProperty(getCurrent?: () => T): Property<T, S>;
-
-		// Modify an stream
-		map<U>(fn: (value: T) => U): Stream<U, S>;
-		filter(predicate?: (value: T) => boolean): Stream<T, S>;
-		take(n: number): Stream<T, S>;
-		takeWhile(predicate?: (value: T) => boolean): Stream<T, S>;
-		last(): Stream<T, S>;
-		skip(n: number): Stream<T, S>;
-		skipWhile(predicate?: (value: T) => boolean): Stream<T, S>;
-		skipDuplicates(comparator?: (a: T, b: T) => boolean): Stream<T, S>;
-		diff(fn?: (prev: T, next: T) => T, seed?: T): Stream<T, S>;
-		scan(fn: (prev: T, next: T) => T, seed?: T): Stream<T, S>;
-		delay(wait: number): Stream<T, S>;
-		throttle(wait: number, options?: {leading?: boolean, trailing?: boolean}): Stream<T, S>;
-		debounce(wait: number, options?: {immediate: boolean}): Stream<T, S>;
-		valuesToErrors<U>(handler?: (value: T) => {convert: boolean, error: U}): Stream<void, S | U>;
-		errorsToValues<U>(handler?: (error: S) => {convert: boolean, value: U}): Stream<T | U, void>;
-		mapErrors<U>(fn: (error: S) => U): Stream<T, U>;
-		filterErrors(predicate?: (error: S) => boolean): Stream<T, S>;
-		endOnError(): Stream<T, S>;
-		takeErrors(n: number): Stream<T, S>;
-		ignoreValues(): Stream<void, S>;
-		ignoreErrors(): Stream<T, void>;
-		ignoreEnd(): Stream<T, S>;
-		beforeEnd<U>(fn: () => U): Stream<T | U, S>;
-		slidingWindow(max: number, mix?: number): Stream<T[], S>;
-		bufferWhile(predicate: (value: T) => boolean): Stream<T[], S>;
-		bufferWithCount(count: number, options?: {flushOnEnd: boolean}): Stream<T[], S>;
-		bufferWithTimeOrCount(interval: number, count: number, options?: {flushOnEnd: boolean}): Stream<T[], S>;
-		transduce<U>(transducer: any): Stream<U, S>;
-		withHandler<U, V>(handler: (emitter: Emitter<U, S>, event: Event<T | S>) => void): Stream<U, S>;
-
-		// Combine streams
-		combine<U, V, W>(otherObs: Stream<U, V>, combinator?: (value: T, ...values: U[]) => W): Stream<W, S | V>;
-		zip<U, V, W>(otherObs: Stream<U, V>, combinator?: (value: T, ...values: U[]) => W): Stream<W, S | V>;
-		merge<U, V>(otherObs: Stream<U, V>): Stream<T | U, S | V>;
-		concat<U, V>(otherObs: Stream<U, V>): Stream<T | U, S | V>;
-		flatMap<U, V>(transform: (value: T) => Stream<U, V>): Stream<U, V>;
-		flatMapLatest<U, V>(fn: (value: T) => Stream<U, V>): Stream<U, V>;
-		flatMapFirst<U, V>(fn: (value: T) => Stream<U, V>): Stream<U, V>;
-		flatMapConcat<U, V>(fn: (value: T) => Stream<U, V>): Stream<U, V>;
-		flatMapConcurLimit<U, V>(fn: (value: T) => Stream<U, V>, limit: number): Stream<U, V>;
-		flatMapErrors<U, V>(transform: (error: S) => Stream<U, V>): Stream<U, V>;
-
-		// Combine two streams
-		filterBy<U>(otherObs: Observable<boolean, U>): Stream<T, S>;
-		sampledBy<U, V, W>(otherObs: Observable<U, V>, combinator?: (a: T, b: U) => W): Stream<W, S>;
-		skipUntilBy<U, V>(otherObs: Observable<U, V>): Stream<U, V>;
-		takeUntilBy<U, V>(otherObs: Observable<U, V>): Stream<U, V>;
-		bufferBy<U, V>(otherObs: Observable<U, V>, options?: {flushOnEnd: boolean}): Stream<T[], S>;
-		bufferWhileBy<U>(otherObs: Observable<boolean, U>, options?: {flushOnEnd?: boolean, flushOnChange?: boolean}): Stream<T[], S>;
-		awaiting<U, V>(otherObs: Observable<U, V>): Stream<boolean, S>;
-	}
-
-	export interface Property<T, S> extends Observable<T, S> {
-		changes(): Stream<T, S>;
-
-		// Modify an property
-		map<U>(fn: (value: T) => U): Property<U, S>;
-		filter(predicate?: (value: T) => boolean): Property<T, S>;
-		take(n: number): Property<T, S>;
-		takeWhile(predicate?: (value: T) => boolean): Property<T, S>;
-		last(): Property<T, S>;
-		skip(n: number): Property<T, S>;
-		skipWhile(predicate?: (value: T) => boolean): Property<T, S>;
-		skipDuplicates(comparator?: (a: T, b: T) => boolean): Property<T, S>;
-		diff(fn?: (prev: T, next: T) => T, seed?: T): Property<T, S>;
-		scan(fn: (prev: T, next: T) => T, seed?: T): Property<T, S>;
-		delay(wait: number): Property<T, S>;
-		throttle(wait: number, options?: {leading?: boolean, trailing?: boolean}): Property<T, S>;
-		debounce(wait: number, options?: {immediate: boolean}): Property<T, S>;
-		valuesToErrors<U>(handler?: (value: T) => {convert: boolean, error: U}): Property<void, S | U>;
-		errorsToValues<U>(handler?: (error: S) => {convert: boolean, value: U}): Property<T | U, void>;
-		mapErrors<U>(fn: (error: S) => U): Property<T, U>;
-		filterErrors(predicate?: (error: S) => boolean): Property<T, S>;
-		endOnError(): Property<T, S>;
-		takeErrors(n: number): Stream<T, S>;
-		ignoreValues(): Property<void, S>;
-		ignoreErrors(): Property<T, void>;
-		ignoreEnd(): Property<T, S>;
-		beforeEnd<U>(fn: () => U): Property<T | U, S>;
-		slidingWindow(max: number, mix?: number): Property<T[], S>;
-		bufferWhile(predicate: (value: T) => boolean): Property<T[], S>;
-		bufferWithCount(count: number, options?: {flushOnEnd: boolean}): Property<T[], S>;
-		bufferWithTimeOrCount(interval: number, count: number, options?: {flushOnEnd: boolean}): Property<T[], S>;
-		transduce<U>(transducer: any): Property<U, S>;
-		withHandler<U, V>(handler: (emitter: Emitter<T, S>, event: Event<T | S>) => void): Property<U, S>;
-
-		// Combine properties
-		combine<U, V, W>(otherObs: Property<U, V>, combinator?: (value: T, ...values: U[]) => W): Property<W, S | V>;
-		zip<U, V, W>(otherObs: Property<U, V>, combinator?: (value: T, ...values: U[]) => W): Property<W, S | V>;
-		merge<U, V>(otherObs: Property<U, V>): Property<T | U, S | V>;
-		concat<U, V>(otherObs: Property<U, V>): Property<T | U, S | V>;
-		flatMap<U, V>(transform: (value: T) => Property<U, V>): Property<U, V>;
-		flatMapLatest<U, V>(fn: (value: T) => Property<U, V>): Property<U, V>;
-		flatMapFirst<U, V>(fn: (value: T) => Property<U, V>): Property<U, V>;
-		flatMapConcat<U, V>(fn: (value: T) => Property<U, V>): Property<U, V>;
-		flatMapConcurLimit<U, V>(fn: (value: T) => Property<U, V>, limit: number): Property<U, V>;
-		flatMapErrors<U, V>(transform: (error: S) => Property<U, V>): Property<U, V>;
-
-		// Combine two properties
-		filterBy<U>(otherObs: Observable<boolean, U>): Property<T, S>;
-		sampledBy<U, V, W>(otherObs: Observable<U, V>, combinator?: (a: T, b: U) => W): Property<W, S>;
-		skipUntilBy<U, V>(otherObs: Observable<U, V>): Property<U, V>;
-		takeUntilBy<U, V>(otherObs: Observable<U, V>): Property<U, V>;
-		bufferBy<U, V>(otherObs: Observable<U, V>, options?: {flushOnEnd: boolean}): Property<T[], S>;
-		bufferWhileBy<U>(otherObs: Observable<boolean, U>, options?: {flushOnEnd?: boolean, flushOnChange?: boolean}): Property<T[], S>;
-		awaiting<U, V>(otherObs: Observable<U, V>): Property<boolean, S>;
-	}
-
-	export interface ObservablePool<T, S> extends Observable<T, S> {
-		plug(obs: Observable<T, S>): void;
-		unPlug(obs: Observable<T, S>): void;
-	}
-
-	export interface Event<T> {
-		type: string;
-		value: T;
-	}
-
-	export interface Emitter<T, S> {
-		emit(value: T): void;
-		error(error: S): void;
-		end(): void;
-		emitEvent(event: {type: string, value: T | S}): void;
-	}
-
-	// Create a stream
-	export function never(): Stream<void, void>;
-	export function later<T>(wait: number, value: T): Stream<T, void>;
-	export function interval<T>(interval: number, value: T): Stream<T, void>;
-	export function sequentially<T>(interval: number, values: T[]): Stream<T, void>;
-	export function fromPoll<T>(interval: number, fn: () => T): Stream<T, void>;
-	export function withInterval<T, S>(interval: number, handler: (emitter: Emitter<T, S>) => void): Stream<T, S>;
-	export function fromCallback<T>(fn: (callback: (value: T) => void) => void): Stream<T, void>;
-	export function fromNodeCallback<T, S>(fn: (callback: (error: S, result: T) => void) => void): Stream<T, S>;
-	export function fromEvents<T, S>(target: EventTarget | NodeJS.EventEmitter | { on: Function, off: Function }, eventName: string, transform?: (value: T) => S): Stream<T, S>;
-	export function stream<T, S>(subscribe: (emitter: Emitter<T, S>) => Function | void): Stream<T, S>;
-	export function fromESObservable<T, S>(observable: any): Stream<T, S>
-
-	// Create a property
-	export function constant<T>(value: T): Property<T, void>;
-	export function constantError<T>(error: T): Property<void, T>;
-	export function fromPromise<T, S>(promise: any): Property<T, S>;
-
-	// Combine observables
-	export function combine<T, S, U>(obss: Observable<T, S>[], passiveObss: Observable<T, S>[], combinator?: (...values: T[]) => U): Observable<U, S>;
-	export function combine<T, S, U>(obss: Observable<T, S>[], combinator?: (...values: T[]) => U): Observable<U, S>;
-	export function zip<T, S, U>(obss: Observable<T, S>[], passiveObss?: Observable<T, S>[], combinator?: (...values: T[]) => U): Observable<U, S>;
-	export function merge<T, S>(obss: Observable<T, S>[]): Observable<T, S>;
-	export function concat<T, S>(obss: Observable<T, S>[]): Observable<T, S>;
-	export function pool<T, S>(): ObservablePool<T, S>;
-	export function repeat<T, S>(generator: (i: number) => Observable<T, S> | boolean): Observable<T, S>;
-}
diff --git a/kefir/tsconfig.json b/kefir/tsconfig.json
new file mode 100644
index 0000000000..359dcbf071
--- /dev/null
+++ b/kefir/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "kefir-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/kendo-ui/index.d.ts b/kendo-ui/index.d.ts
new file mode 100644
index 0000000000..9477766f67
--- /dev/null
+++ b/kendo-ui/index.d.ts
@@ -0,0 +1,18740 @@
+// Type definitions for Kendo UI Professional v2016.1.314
+// Project: http://www.telerik.com/kendo-ui
+// Definitions by: Telerik <https://github.com/telerik/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace kendo {
+    function culture(): {
+        name: string;
+        calendar: {
+            AM: string[];
+            PM: string[];
+            days: {
+                names: string[];
+                namesAbbr: string[];
+                namesShort: string[];
+                firstDay: number;
+            };
+            months: {
+                names: string[];
+                namesAbbr: string[];
+            };
+            patterns: {
+                D: string;
+                F: string;
+                G: string;
+                M: string;
+                T: string;
+                Y: string;
+                d: string;
+                g: string;
+                m: string;
+                s: string;
+                t: string;
+                u: string;
+                y: string;
+            };
+            twoDigitYearMax: number;
+        };
+        calendars: {
+            standard: {
+                AM: string[];
+                PM: string[];
+                days: {
+                    names: string[];
+                    namesAbbr: string[];
+                    namesShort: string[];
+                    firstDay: number;
+                };
+                months: {
+                    names: string[];
+                    namesAbbr: string[];
+                };
+                patterns: {
+                    D: string;
+                    F: string;
+                    G: string;
+                    M: string;
+                    T: string;
+                    Y: string;
+                    d: string;
+                    g: string;
+                    m: string;
+                    s: string;
+                    t: string;
+                    u: string;
+                    y: string;
+                };
+                twoDigitYearMax: number;
+            };
+        };
+        numberFormat: {
+            currency: {
+                decimals: number;
+                groupSize: number[];
+                pattern: string[];
+                symbol: string;
+            };
+            decimals: number;
+            groupSize: number[];
+            pattern: string[];
+            percent: {
+                decimals: number;
+                groupSize: number[];
+                pattern: string[];
+                symbol: string;
+            };
+        };
+    };
+
+    var cultures: {[culture: string] : {
+        name?: string;
+        calendar?: {
+            AM: string[];
+            PM: string[];
+            days: {
+                names: string[];
+                namesAbbr: string[];
+                namesShort: string[];
+                firstDay: number;
+            };
+            months: {
+                names: string[];
+                namesAbbr: string[];
+            };
+            patterns: {
+                D: string;
+                F: string;
+                G: string;
+                M: string;
+                T: string;
+                Y: string;
+                d: string;
+                g: string;
+                m: string;
+                s: string;
+                t: string;
+                u: string;
+                y: string;
+            };
+            twoDigitYearMax: number;
+        };
+        calendars?: {
+            standard: {
+                AM: string[];
+                PM: string[];
+                days: {
+                    names: string[];
+                    namesAbbr: string[];
+                    namesShort: string[];
+                    firstDay: number;
+                };
+                months: {
+                    names: string[];
+                    namesAbbr: string[];
+                };
+                patterns: {
+                    D: string;
+                    F: string;
+                    G: string;
+                    M: string;
+                    T: string;
+                    Y: string;
+                    d: string;
+                    g: string;
+                    m: string;
+                    s: string;
+                    t: string;
+                    u: string;
+                    y: string;
+                };
+                twoDigitYearMax: number;
+            };
+        };
+        numberFormat?: {
+            currency: {
+                decimals: number;
+                groupSize: number[];
+                pattern: string[];
+                symbol: string;
+            };
+            decimals: number;
+            groupSize: number[];
+            pattern: string[];
+            percent: {
+                decimals: number;
+                groupSize: number[];
+                pattern: string[];
+                symbol: string;
+            };
+        };
+    }};
+
+    function format(format: string, ...values: any[]): string;
+
+    function fx(selector: string): effects.Element;
+    function fx(element: Element): effects.Element;
+    function fx(element: JQuery): effects.Element;
+
+    function init(selector: string, ...namespaces: any[]): void;
+    function init(element: JQuery, ...namespaces: any[]): void;
+    function init(element: Element, ...namespaces: any[]): void;
+
+    function observable(data: any): kendo.data.ObservableObject;
+    function observableHierarchy(array: any[]): kendo.data.ObservableArray;
+
+    function render(template: (data: any) => string, data: any[]): string;
+    function template(template: string, options?: TemplateOptions): (data: any) => string;
+
+    function guid(): string;
+
+    function widgetInstance(element: JQuery, suite: typeof kendo.ui): kendo.ui.Widget;
+    function widgetInstance(element: JQuery, suite: typeof kendo.mobile.ui): kendo.ui.Widget;
+    function widgetInstance(element: JQuery, suite: typeof kendo.dataviz.ui): kendo.ui.Widget;
+
+
+    var ns: string;
+
+    var keys: {
+        INSERT: number;
+        DELETE: number;
+        BACKSPACE: number;
+        TAB: number;
+        ENTER: number;
+        ESC: number;
+        LEFT: number;
+        UP: number;
+        RIGHT: number;
+        DOWN: number;
+        END: number;
+        HOME: number;
+        SPACEBAR: number;
+        PAGEUP: number;
+        PAGEDOWN: number;
+        F2: number;
+        F10: number;
+        F12: number;
+    };
+
+    var support: {
+        touch: boolean;
+        pointers: boolean;
+        scrollbar(): number;
+        hasHW3D: boolean;
+        hasNativeScrolling: boolean;
+        devicePixelRatio: number;
+        placeHolder: boolean;
+        zoomLevel: number;
+        mobileOS: {
+            device: string;
+            tablet: any;
+            browser: string;
+            name: string;
+            majorVersion: string;
+            minorVersion: string;
+            flatVersion: number;
+            appMode: boolean;
+        };
+        browser: {
+            msie: boolean;
+            webkit: boolean;
+            safari: boolean;
+            opera: boolean;
+            version: string;
+        };
+    };
+
+    var version: string;
+
+    interface TemplateOptions {
+        paramName?: string;
+        useWithBlock?: boolean;
+    }
+
+    class Class {
+        static fn: Class;
+        static extend(prototype: Object): Class;
+    }
+
+    class Observable extends Class {
+        static fn: Observable;
+        static extend(prototype: Object): Observable;
+
+        init(...args: any[]): void
+        bind(eventName: string, handler: Function): Observable;
+        one(eventName: string, handler: Function): Observable;
+        first(eventName: string, handler: Function): Observable;
+        trigger(eventName: string, e?: any): boolean;
+        unbind(eventName: string, handler?: any): Observable;
+    }
+
+    interface ViewOptions {
+        tagName?: string;
+        wrap?: boolean;
+        model?: Object;
+        evalTemplate?: boolean;
+        init?: (e: ViewEvent) => void;
+        show?: (e: ViewEvent) => void;
+        hide?: (e: ViewEvent) => void;
+    }
+
+    interface ViewEvent {
+        sender: View;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    class View extends Observable {
+        constructor(element: Element, options?: ViewOptions);
+        constructor(element: string, options?: ViewOptions);
+        element: JQuery;
+        content: any;
+        tagName: string;
+        model: Object;
+        init(element: Element, options?: ViewOptions): void;
+        init(element: string, options?: ViewOptions): void;
+        render(container?: any): JQuery;
+        destroy(): void;
+    }
+
+    class ViewContainer extends Observable {
+       view: View;
+    }
+
+    class Layout extends View {
+        containers: { [selector: string]: ViewContainer; };
+        showIn(selector: string, view: View, transitionClass?: string): void;
+    }
+
+    class History extends Observable {
+        current: string;
+        root: string;
+        start(options: Object): void;
+        stop(): void;
+        change(callback: Function): void;
+        navigate(location: string, silent?: boolean): void;
+    }
+
+    var history: History;
+
+    interface RouterOptions {
+        init?: (e: RouterEvent) => void;
+        pushState?: boolean;
+        hashBang?: boolean;
+        root?: string;
+        ignoreCase?: boolean;
+        change?(e: RouterChangeEvent): void;
+        routeMissing?(e: RouterRouteMissingEvent): void;
+        same?(e: RouterEvent): void;
+    }
+
+    interface RouterEvent {
+        sender: Router;
+        url: string;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface RouterChangeEvent extends RouterEvent {
+        params: any;
+        backButtonPressed: boolean;
+    }
+
+    interface RouterRouteMissingEvent extends RouterEvent {
+        params: any;
+    }
+
+    class Route extends Class {
+        route: RegExp;
+        callback(url: string): void;
+        worksWith(url: string): void;
+    }
+
+    class Router extends Observable {
+        constructor(options?: RouterOptions);
+        routes: Route[];
+        init(options?: RouterOptions): void;
+        start(): void;
+        destroy(): void;
+        route(route: string, callback: Function): void;
+        navigate(location: string, silent?: boolean): void;
+        replace(location: string, silent?: boolean): void;
+    }
+
+}
+
+declare namespace kendo.effects {
+    function enable(): void;
+    function disable(): void;
+
+    interface Element {
+        expand(direction: string): effects.Expand;
+        expandHorizontal(): effects.Expand;
+        expandVertical(): effects.Expand;
+        fade(direction: string): effects.Fade;
+        fadeIn(): effects.Fade;
+        fadeOut(): effects.Fade;
+        flip(axis: string, face: JQuery, back: JQuery): effects.Flip;
+        flipHorizontal(face: JQuery, back: JQuery): effects.Flip;
+        flipVertical(face: JQuery, back: JQuery): effects.Flip;
+        pageturn(axis: string, face: JQuery, back: JQuery): effects.PageTurn;
+        pageturnHorizontal(face: JQuery, back: JQuery): effects.PageTurn;
+        pageturnVertical(face: JQuery, back: JQuery): effects.PageTurn;
+        slideIn(direction: string): effects.SlideIn;
+        slideInDown(): effects.SlideIn;
+        slideInLeft(): effects.SlideIn;
+        slideInRight(): effects.SlideIn;
+        slideInUp(): effects.SlideIn;
+        tile(direction: string, previous: JQuery): effects.Tile;
+        tileDown(previous: JQuery): effects.Tile;
+        tileLeft(previous: JQuery): effects.Tile;
+        tileRight(previous: JQuery): effects.Tile;
+        tileUp(previous: JQuery): effects.Tile;
+        transfer(target: JQuery): effects.Transfer;
+        zoom(direction: string): effects.Zoom;
+        zoomIn(): effects.Zoom;
+        zoomOut(): effects.Zoom;
+    }
+
+    interface Effect {
+        play(): JQueryPromise<any>;
+        reverse(): JQueryPromise<any>;
+        duration(value: number): Effect;
+        add(effect: Effect): Effect;
+        stop(): Effect;
+    }
+
+    interface Expand extends Effect {
+        duration(value: number): Expand;
+        direction(value: string): Expand;
+        stop(): Expand;
+        add(effect: Effect): Expand;
+    }
+
+    interface Fade extends Effect {
+        duration(value: number): Fade;
+        direction(value: string): Fade;
+        stop(): Fade;
+        add(effect: Effect): Fade;
+        startValue(value: number): Fade;
+        endValue(value: number): Fade;
+    }
+
+    interface Flip extends Effect {
+        duration(value: number): Flip;
+        direction(value: string): Flip;
+        stop(): Flip;
+        add(effect: Effect): Flip;
+    }
+
+    interface PageTurn extends Effect {
+        duration(value: number): PageTurn;
+        direction(value: string): PageTurn;
+        stop(): PageTurn;
+        add(effect: Effect): PageTurn;
+    }
+
+    interface SlideIn extends Effect {
+        duration(value: number): SlideIn;
+        direction(value: string): SlideIn;
+        stop(): SlideIn;
+        add(effect: Effect): SlideIn;
+    }
+
+    interface Tile extends Effect {
+        duration(value: number): Tile;
+        direction(value: string): Tile;
+        stop(): Tile;
+        add(effect: Effect): Tile;
+    }
+
+    interface Transfer extends Effect {
+        duration(value: number): Transfer;
+        stop(): Transfer;
+        add(effect: Effect): Transfer;
+    }
+
+    interface Zoom extends Effect {
+        duration(value: number): Zoom;
+        direction(value: string): Zoom;
+        stop(): Zoom;
+        add(effect: Effect): Zoom;
+        startValue(value: number): Zoom;
+        endValue(value: number): Zoom;
+    }
+}
+
+declare namespace kendo.data {
+    interface ObservableObjectEvent {
+        sender?: ObservableObject;
+        field?: string;
+    }
+
+    interface ObservableObjectSetEvent extends ObservableObjectEvent {
+        value?: any;
+        preventDefault?: Function;
+    }
+
+
+    class Binding extends Observable {
+        source: any;
+        parents: any[];
+        path: string;
+        observable: boolean;
+        dependencies: { [path: string]: boolean; };
+        constructor(parents: any[], path: string);
+        change(e: Object): void;
+        start(source: kendo.Observable): void;
+        stop(source: kendo.Observable): void;
+        get (): any;
+        set (value: any): void;
+        destroy(): void;
+    }
+
+    class BindingTarget {
+        target: any;
+        options: any;
+        source: any;
+    }
+
+    class EventBinding extends Binding {
+        get (): void;
+    }
+
+    class TemplateBinding extends Binding {
+        constructor(source: kendo.Observable, path: string, template: Function);
+        render(value: Object): string;
+    }
+
+    namespace binders { }
+
+    interface Bindings {
+        [key: string]: Binding;
+    }
+
+    class Binder extends Class {
+        static fn: Binder;
+        element: any;
+        bindings: Bindings;
+        options: BinderOptions;
+        constructor(element: any, bindings: Bindings, options?: BinderOptions);
+        static extend(prototype: Object): Binder;
+        init(element: any, bindings: Bindings, options?: BinderOptions): void;
+        bind(binding: Binding, attribute: string): void;
+        destroy(): void;
+        refresh(): void;
+        refresh(attribute: string): void;
+    }
+
+    interface BinderOptions {
+    }
+
+    class ObservableObject extends Observable{
+        constructor(value?: any);
+        uid: string;
+        init(value?: any): void;
+        get(name: string): any;
+        parent(): ObservableObject;
+        set(name: string, value: any): void;
+        toJSON(): Object;
+    }
+
+    class Model extends ObservableObject {
+        static idField: string;
+        static fields: DataSourceSchemaModelFields;
+
+        idField: string;
+        _defaultId: any;
+        fields: DataSourceSchemaModelFields;
+        defaults: {
+            [field: string]: any;
+        };
+        id: any;
+        dirty: boolean;
+
+        static define(options: DataSourceSchemaModelWithFieldsObject): typeof Model;
+        static define(options: DataSourceSchemaModelWithFieldsArray): typeof Model;
+
+        constructor(data?: any);
+        init(data?: any): void;
+        accept(data?: any): void;
+        editable(field: string): boolean;
+        isNew(): boolean;
+    }
+
+    interface SchedulerEventData {
+        description?: string;
+        end?: Date;
+        endTimezone?: string;
+        isAllDay?: boolean;
+        id?: any;
+        start?: Date;
+        startTimezone?: string;
+        recurrenceId?: any;
+        recurrenceRule?: string;
+        recurrenceException?: string;
+        title?: string;
+    }
+
+    class SchedulerEvent extends Model {
+        static idField: string;
+        static fields: DataSourceSchemaModelFields;
+
+        constructor(data?: SchedulerEventData);
+
+        description: string;
+        end: Date;
+        endTimezone: string;
+        isAllDay: boolean;
+        id: any;
+        start: Date;
+        startTimezone: string;
+        recurrenceId: any;
+        recurrenceRule: string;
+        recurrenceException: string;
+        title: string;
+
+        static define(options: DataSourceSchemaModelWithFieldsObject): typeof SchedulerEvent;
+        static define(options: DataSourceSchemaModelWithFieldsArray): typeof SchedulerEvent;
+
+        init(data?: SchedulerEventData): void;
+        clone(options: any, updateUid: boolean): SchedulerEvent;
+        duration(): number;
+        expand(start: Date, end: Date, zone: any): SchedulerEvent[];
+        update(eventInfo: SchedulerEventData): void;
+        isMultiDay(): boolean;
+        isException(): boolean;
+        isOccurrence(): boolean;
+        isRecurring(): boolean;
+        isRecurrenceHead(): boolean;
+        toOccurrence(options: any): SchedulerEvent;
+    }
+
+    class TreeListModel extends Model {
+        static idField: string;
+        static fields: DataSourceSchemaModelFields;
+
+        id: any;
+        parentId: any;
+
+        static define(options: DataSourceSchemaModelWithFieldsObject): typeof TreeListModel;
+        static define(options: DataSourceSchemaModelWithFieldsArray): typeof TreeListModel;
+
+        constructor(data?: any);
+        init(data?: any): void;
+        loaded(value: boolean): void;
+        loaded(): boolean;
+    }
+
+    class TreeListDataSource extends DataSource {
+        load(model: kendo.data.TreeListModel): JQueryPromise<any>;
+        childNodes(model: kendo.data.TreeListModel): kendo.data.TreeListModel[];
+        rootNodes(): kendo.data.TreeListModel[];
+        parentNode(model: kendo.data.TreeListModel): kendo.data.TreeListModel;
+        level(model: kendo.data.TreeListModel): number;
+        level(model: any): number;
+
+        add(model: Object): kendo.data.TreeListModel;
+        add(model: kendo.data.TreeListModel): kendo.data.TreeListModel;
+        at(index: number): kendo.data.TreeListModel;
+        cancelChanges(model?: kendo.data.TreeListModel): void;
+        get(id: any): kendo.data.TreeListModel;
+        getByUid(uid: string): kendo.data.TreeListModel;
+        indexOf(value: kendo.data.TreeListModel): number;
+        insert(index: number, model: kendo.data.TreeListModel): kendo.data.TreeListModel;
+        insert(index: number, model: Object): kendo.data.TreeListModel;
+        remove(model: kendo.data.TreeListModel): void;
+    }
+
+    class GanttTask extends Model {
+        static idField: string;
+        static fields: DataSourceSchemaModelFields;
+
+        id: any;
+        parentId: number;
+        orderId: number;
+        title: string;
+        start: Date;
+        end: Date;
+        percentComplete: number;
+        summary: boolean;
+        expanded: boolean;
+
+        static define(options: DataSourceSchemaModelWithFieldsObject): typeof GanttTask;
+        static define(options: DataSourceSchemaModelWithFieldsArray): typeof GanttTask;
+
+        constructor(data?: any);
+        init(data?: any): void;
+    }
+
+    class GanttDependency extends Model {
+        static idField: string;
+        static fields: DataSourceSchemaModelFields;
+
+        id: any;
+        predecessorId: number;
+        successorId: number;
+        type: number;
+
+        static define(options: DataSourceSchemaModelWithFieldsObject): typeof GanttDependency;
+        static define(options: DataSourceSchemaModelWithFieldsArray): typeof GanttDependency;
+
+        constructor(data?: any);
+        init(data?: any): void;
+    }
+
+    class Node extends Model {
+        children: HierarchicalDataSource;
+
+        append(model: any): void;
+        level(): number;
+        load(id: any): void;
+        loaded(value: boolean): void;
+        loaded(): boolean;
+        parentNode(): Node;
+    }
+
+    class SchedulerDataSource extends DataSource {
+        add(model: Object): kendo.data.SchedulerEvent;
+        add(model: kendo.data.SchedulerEvent): kendo.data.SchedulerEvent;
+        at(index: number): kendo.data.SchedulerEvent;
+        cancelChanges(model?: kendo.data.SchedulerEvent): void;
+        get(id: any): kendo.data.SchedulerEvent;
+        getByUid(uid: string): kendo.data.SchedulerEvent;
+        indexOf(value: kendo.data.SchedulerEvent): number;
+        insert(index: number, model: kendo.data.SchedulerEvent): kendo.data.SchedulerEvent;
+        insert(index: number, model: Object): kendo.data.SchedulerEvent;
+        remove(model: kendo.data.SchedulerEvent): void;
+    }
+
+    class GanttDataSource extends DataSource {
+        add(model: Object): kendo.data.GanttTask;
+        add(model: kendo.data.GanttTask): kendo.data.GanttTask;
+        at(index: number): kendo.data.GanttTask;
+        cancelChanges(model?: kendo.data.GanttTask): void;
+        get(id: any): kendo.data.GanttTask;
+        getByUid(uid: string): kendo.data.GanttTask;
+        indexOf(value: kendo.data.GanttTask): number;
+        insert(index: number, model: Object): kendo.data.GanttTask;
+        insert(index: number, model: kendo.data.GanttTask): kendo.data.GanttTask;
+        remove(model: kendo.data.GanttTask): void;
+    }
+
+    class GanttDependencyDataSource extends DataSource {
+        add(model: Object): kendo.data.GanttDependency;
+        add(model: kendo.data.GanttDependency): kendo.data.GanttDependency;
+        at(index: number): kendo.data.GanttDependency;
+        cancelChanges(model?: kendo.data.GanttDependency): void;
+        get(id: any): kendo.data.GanttDependency;
+        getByUid(uid: string): kendo.data.GanttDependency;
+        indexOf(value: kendo.data.GanttDependency): number;
+        insert(index: number, model: Object): kendo.data.GanttDependency;
+        insert(index: number, model: kendo.data.GanttDependency): kendo.data.GanttDependency;
+        remove(model: kendo.data.GanttDependency): void;
+    }
+
+    class HierarchicalDataSource extends DataSource {
+        constructor(options?: HierarchicalDataSourceOptions);
+        init(options?: HierarchicalDataSourceOptions): void;
+    }
+
+    interface HierarchicalDataSourceOptions extends DataSourceOptions {
+        schema?: HierarchicalDataSourceSchema;
+    }
+
+
+    interface HierarchicalDataSourceSchema extends DataSourceSchemaWithOptionsModel {
+        model?: HierarchicalDataSourceSchemaModel;
+    }
+
+    interface HierarchicalDataSourceSchemaModel extends DataSourceSchemaModel {
+        hasChildren?: any;
+        children?: any;
+    }
+
+    interface PivotDiscoverRequestRestrictionOptions {
+        catalogName: string;
+        cubeName: string;
+    }
+
+    interface PivotDiscoverRequestDataOptions {
+        command: string;
+        restrictions: PivotDiscoverRequestRestrictionOptions;
+    }
+
+    interface PivotDiscoverRequestOptions {
+        data: PivotDiscoverRequestDataOptions;
+    }
+
+    interface PivotTransportConnection {
+        catalog?: string;
+        cube?: string;
+    }
+
+    interface PivotTransportDiscover {
+        cache?: boolean;
+        contentType?: string;
+        data?: any;
+        dataType?: string;
+        type?: string;
+        url?: any;
+    }
+
+    interface PivotTransport {
+        discover?: any;
+        read?: any;
+    }
+
+    interface PivotTransportWithObjectOperations extends PivotTransport {
+        connection: PivotTransportConnection;
+        discover?: PivotTransportDiscover;
+        read?: DataSourceTransportRead;
+    }
+
+    interface PivotTransportWithFunctionOperations extends PivotTransport {
+        discover?: (options: DataSourceTransportOptions) => void;
+        read?: (options: DataSourceTransportOptions) => void;
+    }
+
+    interface PivotDataSourceAxisOptions {
+        name: string;
+        expand?: boolean;
+    }
+
+    interface PivotDataSourceMeasureOptions {
+        values: string[];
+        axis?: string;
+    }
+
+    interface PivotDataSourceOptions extends DataSourceOptions {
+        columns?: PivotDataSourceAxisOptions[];
+        measures?: PivotDataSourceMeasureOptions[];
+        rows?: PivotDataSourceAxisOptions[];
+        transport?: PivotTransport;
+        schema?: PivotSchema;
+    }
+
+    interface PivotTupleModel {
+        children: PivotTupleModel[];
+        caption?: string;
+        name: string;
+        levelName?: string;
+        levelNum: number;
+        hasChildren?: boolean;
+        hierarchy?: string;
+    }
+
+    interface PivotSchemaRowAxis {
+        tuples: PivotTupleModel[];
+    }
+
+    interface PivotSchemaColumnAxis {
+        tuples: PivotTupleModel[];
+    }
+
+    interface PivotSchemaAxes {
+        rows: PivotSchemaRowAxis;
+        columns: PivotSchemaColumnAxis;
+    }
+
+    interface PivotSchema extends DataSourceSchema{
+        axes?: any;
+        catalogs?: any;
+        cubes?: any;
+        data?: any;
+        dimensions?: any;
+        hierarchies?: any;
+        levels?: any;
+        measures?: any;
+    }
+
+    class PivotDataSource extends DataSource {
+        axes(): PivotSchemaAxes;
+        constructor(options?: PivotDataSourceOptions);
+        init(options?: PivotDataSourceOptions): void;
+        catalog(val: string): void;
+        columns(val: string[]): string[];
+        cube(val: string): void;
+        discover(options: PivotDiscoverRequestOptions): JQueryPromise<any>;
+        measures(val: string[]): string[];
+        measuresAxis(): string;
+        rows(val: string[]): string[];
+        schemaCatalogs(): JQueryPromise<any>;
+        schemaCubes(): JQueryPromise<any>;
+        schemaDimensions(): JQueryPromise<any>;
+        schemaHierarchies(): JQueryPromise<any>;
+        schemaLevels(): JQueryPromise<any>;
+        schemaMeasures(): JQueryPromise<any>;
+    }
+
+    interface DataSourceTransport {
+        create?: DataSourceTransportCreate;
+        destroy?: DataSourceTransportDestroy;
+        push?: Function;
+        read?: DataSourceTransportRead;
+        signalr?: DataSourceTransportSignalr;
+        update?: DataSourceTransportUpdate;
+
+        parameterMap?(data: DataSourceTransportParameterMapData, type: string): any;
+    }
+
+    interface DataSourceTransportSignalrClient {
+        create?: string;
+        destroy?: string;
+        read?: string;
+        update?: string;
+    }
+
+    interface DataSourceTransportSignalrServer {
+        create?: string;
+        destroy?: string;
+        read?: string;
+        update?: string;
+    }
+
+    interface DataSourceTransportSignalr {
+        client?: DataSourceTransportSignalrClient;
+        hub?: any;
+        promise?: any;
+        server?: DataSourceTransportSignalrServer;
+    }
+
+
+    interface DataSourceParameterMapDataAggregate {
+        field?: string;
+        aggregate?: string;
+    }
+
+    interface DataSourceParameterMapDataGroup {
+        aggregate?: DataSourceParameterMapDataAggregate[];
+        field?: string;
+        dir?: string;
+    }
+
+    interface DataSourceParameterMapDataFilter {
+        field?: string;
+        filters?: DataSourceParameterMapDataFilter[];
+        logic?: string;
+        operator?: string;
+        value?: any;
+    }
+
+    interface DataSourceParameterMapDataSort {
+        field?: string;
+        dir?: string;
+    }
+
+    interface DataSourceTransportParameterMapData {
+        aggregate?: DataSourceParameterMapDataAggregate[];
+        group?: DataSourceParameterMapDataGroup[];
+        filter?: DataSourceParameterMapDataFilter;
+        models?: Model[];
+        page?: number;
+        pageSize?: number;
+        skip?: number;
+        sort?: DataSourceParameterMapDataSort[];
+        take?: number;
+    }
+
+    interface DataSourceSchema {
+        model?: any;
+    }
+
+    interface DataSourceSchemaWithOptionsModel extends DataSourceSchema {
+        model?: DataSourceSchemaModel;
+    }
+
+    interface DataSourceSchemaWithConstructorModel extends DataSourceSchema {
+        model?:  typeof Model;
+    }
+
+    interface DataSourceSchemaModel {
+        id?: string;
+        fields?: any;
+        [index: string]: any;
+    }
+
+    interface DataSourceSchemaModelWithFieldsArray extends DataSourceSchemaModel {
+        fields?: DataSourceSchemaModelField[];
+    }
+
+    interface DataSourceSchemaModelWithFieldsObject extends DataSourceSchemaModel {
+        fields?: DataSourceSchemaModelFields;
+    }
+
+    interface DataSourceSchemaModelFields {
+        [index: string]: DataSourceSchemaModelField;
+    }
+
+    interface DataSourceSchemaModelField {
+        field?: string;
+        from?: string;
+        defaultValue?: any;
+        editable?: boolean;
+        nullable?: boolean;
+        parse?: Function;
+        type?: string;
+        validation?: DataSourceSchemaModelFieldValidation;
+    }
+
+    interface DataSourceSchemaModelFieldValidation {
+        required?: boolean;
+        min?: any;
+        max?: any;
+    }
+
+    class ObservableArray extends Observable {
+        length: number;
+        [index: number]: any;
+
+        constructor(array: any[]);
+        init(array: any[]): void;
+        empty(): void;
+        every(callback: (item: Object, index: number, source: ObservableArray) => boolean): boolean;
+        filter(callback: (item: Object, index: number, source: ObservableArray) => boolean): any[];
+        find(callback: (item: Object, index: number, source: ObservableArray) => boolean): any;
+        forEach(callback: (item: Object, index: number, source: ObservableArray) => void ): void;
+        indexOf(item: any): number;
+        join(separator: string): string;
+        map(callback: (item: Object, index: number, source: ObservableArray) => any): any[];
+        parent(): ObservableObject;
+        pop(): ObservableObject;
+        push(...items: any[]): number;
+        remove(item: Object): void;
+        shift(): any;
+        slice(begin: number, end?: number): any[];
+        some(callback: (item: Object, index: number, source: ObservableArray) => boolean): boolean;
+        splice(start: number): any[];
+        splice(start: number, deleteCount: number, ...items: any[]): any[];
+        toJSON(): any[];
+        unshift(...items: any[]): number;
+        wrap(object: Object, parent: Object): any;
+        wrapAll(source: Object, target: Object): any;
+    }
+
+    interface ObservableArrayEvent {
+        field?: string;
+        action?: string;
+        index?: number;
+        items?: kendo.data.Model[];
+    }
+
+    class DataSource extends Observable{
+        options: DataSourceOptions;
+
+        static create(options?: DataSourceOptions): DataSource;
+
+        constructor(options?: DataSourceOptions);
+        init(options?: DataSourceOptions): void;
+        add(model: Object): kendo.data.Model;
+        add(model: kendo.data.Model): kendo.data.Model;
+        aggregate(val: any): void;
+        aggregate(): any;
+        aggregates(): any;
+        at(index: number): kendo.data.ObservableObject;
+        cancelChanges(model?: kendo.data.Model): void;
+        data(): kendo.data.ObservableArray;
+        data(value: any): void;
+        fetch(callback?: Function): JQueryPromise<any>;
+        filter(filters: DataSourceFilterItem): void;
+        filter(filters: DataSourceFilterItem[]): void;
+        filter(filters: DataSourceFilters): void;
+        filter(): DataSourceFilters;
+        get(id: any): kendo.data.Model;
+        getByUid(uid: string): kendo.data.Model;
+        group(groups: any): void;
+        group(): any;
+        hasChanges(): boolean;
+        indexOf(value: kendo.data.ObservableObject): number;
+        insert(index: number, model: kendo.data.Model): kendo.data.Model;
+        insert(index: number, model: Object): kendo.data.Model;
+        online(value: boolean): void;
+        online(): boolean;
+        offlineData(data: any[]): void;
+        offlineData(): any[];
+        page(): number;
+        page(page: number): void;
+        pageSize(): number;
+        pageSize(size: number): void;
+        pushCreate(model: Object): void;
+        pushCreate(models: any[]): void;
+        pushDestroy(model: Object): void;
+        pushDestroy(models: any[]): void;
+        pushUpdate(model: Object): void;
+        pushUpdate(models: any[]): void;
+        query(options?: any): JQueryPromise<any>;
+        read(data?: any): JQueryPromise<any>;
+        remove(model: kendo.data.ObservableObject): void;
+        sort(sort: DataSourceSortItem): void;
+        sort(sort: DataSourceSortItem[]): void;
+        sort(): DataSourceSortItem[];
+        sync(): JQueryPromise<any>;
+        total(): number;
+        totalPages(): number;
+        view(): kendo.data.ObservableArray;
+    }
+
+    class Query {
+        data: any[];
+
+        static process(data: any[], options: DataSourceTransportReadOptionsData): QueryResult;
+
+        constructor(data: any[]);
+        toArray(): any[];
+        range(intex: number, count: number): kendo.data.Query;
+        skip(count: number): kendo.data.Query;
+        take(count: number): kendo.data.Query;
+        select(selector: Function): kendo.data.Query;
+        order(selector: string, dir?: string): kendo.data.Query;
+        order(selector: Function, dir?: string): kendo.data.Query;
+        filter(filters: DataSourceFilterItem): kendo.data.Query;
+        filter(filters: DataSourceFilterItem[]): kendo.data.Query;
+        filter(filters: DataSourceFilters): kendo.data.Query;
+        group(descriptors: DataSourceGroupItem): kendo.data.Query;
+        group(descriptors: DataSourceGroupItem[]): kendo.data.Query;
+    }
+
+    interface QueryResult {
+        total?: number;
+        data?: any[];
+    }
+
+    interface DataSourceAggregateItem {
+        field?: string;
+        aggregate?: string;
+    }
+
+    interface DataSourceFilter {
+    }
+
+    interface DataSourceFilterItem extends DataSourceFilter {
+        operator?: string;
+        field?: string;
+        value?: any;
+    }
+
+    interface DataSourceFilters extends DataSourceFilter {
+        logic?: string;
+        filters?: DataSourceFilter[];
+    }
+
+    interface DataSourceGroupItemAggregate {
+        field?: string;
+        aggregate?: string;
+    }
+
+    interface DataSourceGroupItem {
+        field?: string;
+        dir?: string;
+        aggregates?: DataSourceGroupItemAggregate[];
+    }
+
+    interface DataSourceSchema {
+        aggregates?: any;
+        data?: any;
+        errors?: any;
+        groups?: any;
+        parse?: Function;
+        total?: any;
+        type?: string;
+    }
+
+    interface DataSourceSortItem {
+        field?: string;
+        dir?: string;
+    }
+
+    interface DataSourceTransportCreate extends JQueryAjaxSettings {
+        cache?: boolean;
+        contentType?: string;
+        data?: any;
+        dataType?: string;
+        type?: string;
+        url?: any;
+    }
+
+    interface DataSourceTransportDestroy extends JQueryAjaxSettings {
+        cache?: boolean;
+        contentType?: string;
+        data?: any;
+        dataType?: string;
+        type?: string;
+        url?: any;
+    }
+
+    interface DataSourceTransportRead extends JQueryAjaxSettings {
+        cache?: boolean;
+        contentType?: string;
+        data?: any;
+        dataType?: string;
+        type?: string;
+        url?: any;
+    }
+
+    interface DataSourceTransportUpdate extends JQueryAjaxSettings {
+        cache?: boolean;
+        contentType?: string;
+        data?: any;
+        dataType?: string;
+        type?: string;
+        url?: any;
+    }
+
+    interface DataSourceTransportWithObjectOperations extends DataSourceTransport {
+        create?: DataSourceTransportCreate;
+        destroy?: DataSourceTransportDestroy;
+        read?: DataSourceTransportRead;
+        update?: DataSourceTransportUpdate;
+    }
+
+    interface DataSourceTransportWithFunctionOperations extends DataSourceTransport {
+        create?: (options: DataSourceTransportOptions) => void;
+        destroy?: (options: DataSourceTransportOptions) => void;
+        read?: (options: DataSourceTransportReadOptions) => void;
+        update?: (options: DataSourceTransportOptions) => void;
+    }
+
+    interface DataSourceTransportOptions {
+        success: (data?: any) => void;
+        error: (error?: any) => void;
+        data: any;
+    }
+
+    interface DataSourceTransportReadOptionsData {
+        sort?: DataSourceSortItem[];
+        filter?: DataSourceFilters;
+        group?: DataSourceGroupItem[];
+        take?: number;
+        skip?: number;
+    }
+
+    interface DataSourceTransportReadOptions extends DataSourceTransportOptions {
+        data: DataSourceTransportReadOptionsData;
+    }
+
+    interface DataSourceTransportBatchOptionsData {
+        models: any[];
+    }
+
+    interface DataSourceTransportBatchOptions extends DataSourceTransportOptions {
+        data: DataSourceTransportBatchOptionsData;
+    }
+
+    interface DataSourceOptions {
+        aggregate?: DataSourceAggregateItem[];
+        autoSync?: boolean;
+        batch?: boolean;
+        data?: any;
+        filter?: any;
+        group?: DataSourceGroupItem[];
+        offlineStorage?: any;
+        page?: number;
+        pageSize?: number;
+        schema?: DataSourceSchema;
+        serverAggregates?: boolean;
+        serverFiltering?: boolean;
+        serverGrouping?: boolean;
+        serverPaging?: boolean;
+        serverSorting?: boolean;
+        sort?: any;
+        transport?: DataSourceTransport;
+        type?: string;
+        change? (e: DataSourceChangeEvent): void;
+        error?(e: DataSourceErrorEvent): void;
+        sync?(e: DataSourceEvent): void;
+        requestStart?(e: DataSourceRequestStartEvent): void;
+        requestEnd?(e: DataSourceRequestEndEvent): void;
+    }
+
+    interface DataSourceEvent {
+        sender?: DataSource;
+    }
+
+    interface DataSourceItemOrGroup {
+    }
+
+    interface DataSourceGroup extends DataSourceItemOrGroup {
+        aggregates: any[];
+        field: string;
+        hasSubgroups: boolean;
+        items: DataSourceItemOrGroup[];
+        value: any;
+    }
+
+    interface DataSourceChangeEvent extends DataSourceEvent {
+        field?: string;
+        value?: Model;
+        action?: string;
+        index?: number;
+        items?: DataSourceItemOrGroup[];
+        node?: any;
+    }
+
+    interface DataSourceErrorEvent extends DataSourceEvent {
+        xhr: JQueryXHR;
+        status: string;
+        errorThrown: any;
+        errors?: any;
+    }
+
+    interface DataSourceRequestStartEvent extends DataSourceEvent {
+        type?: string;
+    }
+
+    interface DataSourceRequestEndEvent extends DataSourceEvent {
+        response?: any;
+        type?: string;
+    }
+}
+
+declare namespace kendo.data.transports {
+    var odata: DataSourceTransport;
+}
+
+declare namespace kendo.ui {
+    function progress(container: JQuery, toggle: boolean): void;
+
+    class Widget extends Observable {
+        static fn: Widget;
+
+        element: JQuery;
+        options: Object;
+        events: string[];
+
+        static extend(prototype: Object): Widget;
+
+        constructor(element: Element, options?: Object);
+        constructor(element: JQuery, options?: Object);
+        constructor(selector: String, options?: Object);
+        init(element: Element, options?: Object): void;
+        init(element: JQuery, options?: Object): void;
+        init(selector: String, options?: Object): void;
+        destroy(): void;
+        setOptions(options: Object): void;
+        resize(force?: boolean): void;
+    }
+
+    function plugin(widget: typeof kendo.ui.Widget, register?: typeof kendo.ui, prefix?: String): void;
+    function plugin(widget: any, register?: typeof kendo.ui, prefix?: String): void;
+    function plugin(widget: typeof kendo.ui.Widget, register?: typeof kendo.mobile.ui, prefix?: String): void;
+    function plugin(widget: any, register?: typeof kendo.mobile.ui, prefix?: String): void;
+    function plugin(widget: typeof kendo.ui.Widget, register?: typeof kendo.dataviz.ui, prefix?: String): void;
+    function plugin(widget: any, register?: typeof kendo.dataviz.ui, prefix?: String): void;
+
+    class Draggable extends kendo.ui.Widget{
+        element: JQuery;
+        currentTarget: JQuery;
+        constructor(element: Element, options?: DraggableOptions);
+        options: DraggableOptions;
+    }
+
+    interface DraggableEvent {
+        sender?: Draggable;
+    }
+
+    class DropTarget extends kendo.ui.Widget{
+        element: JQuery;
+        constructor(element: Element, options?: DropTargetOptions);
+        options: DropTargetOptions;
+        static destroyGroup(groupName: string): void;
+    }
+
+    interface DropTargetOptions {
+        group?: string;
+        dragenter?(e: DropTargetDragenterEvent): void;
+        dragleave?(e: DropTargetDragleaveEvent): void;
+        drop?(e: DropTargetDropEvent): void;
+    }
+
+    interface DropTargetEvent {
+        sender?: DropTarget;
+    }
+
+    interface DropTargetDragenterEvent extends DropTargetEvent {
+        draggable?: kendo.ui.Draggable;
+    }
+
+    interface DropTargetDragleaveEvent extends DropTargetEvent {
+        draggable?: kendo.ui.Draggable;
+    }
+
+    interface DropTargetDropEvent extends DropTargetEvent {
+        draggable?: kendo.ui.Draggable;
+    }
+
+    class DropTargetArea extends kendo.ui.Widget{
+        element: JQuery;
+        constructor(element: Element, options?: DropTargetAreaOptions);
+        options: DropTargetAreaOptions;
+    }
+
+    interface DropTargetAreaOptions {
+        group?: string;
+        filter?: string;
+        dragenter?(e: DropTargetAreaDragenterEvent): void;
+        dragleave?(e: DropTargetAreaDragleaveEvent): void;
+        drop?(e: DropTargetAreaDropEvent): void;
+    }
+
+    interface DropTargetAreaEvent {
+        sender: DropTargetArea;
+    }
+
+    interface DropTargetAreaDragenterEvent extends DropTargetAreaEvent {
+        draggable?: JQuery;
+        dropTarget?: JQuery;
+    }
+
+    interface DropTargetAreaDragleaveEvent extends DropTargetAreaEvent {
+        draggable?: JQuery;
+        dropTarget?: JQuery;
+    }
+
+    interface DropTargetAreaDropEvent extends DropTargetAreaEvent {
+        draggable?: kendo.ui.Draggable;
+        dropTarget?: JQuery;
+    }
+
+    interface DraggableOptions {
+        axis?: string;
+        container?: JQuery;
+        cursorOffset?: any;
+        distance?: number;
+        filter?: string;
+        group?: string;
+        hint?: Function;
+        ignore?: string;
+        drag?(e: DraggableEvent): void;
+        dragcancel?(e: DraggableEvent): void;
+        dragend?(e: DraggableEvent): void;
+        dragstart?(e: DraggableEvent): void;
+    }
+
+    interface GridColumnEditorOptions {
+        field?: string;
+        format?: string;
+        model?: kendo.data.Model;
+        values?: any[];
+    }
+
+    interface GridColumn {
+        editor?(container: JQuery, options: GridColumnEditorOptions): void;
+    }
+
+    interface TreeListEditorOptions {
+        field?: string;
+        format?: string;
+        model?: kendo.data.Model;
+        values?: any[];
+    }
+
+    interface TreeListColumn {
+        editor?(container: JQuery, options: TreeListEditorOptions): void;
+    }
+}
+
+declare namespace kendo.mobile {
+    function init(selector: string): void;
+    function init(element: JQuery): void;
+    function init(element: Element): void;
+
+    class Application extends Observable {
+        options: ApplicationOptions;
+        router: kendo.Router;
+        pane: kendo.mobile.ui.Pane;
+
+        constructor(element?: any, options?: ApplicationOptions);
+        init(element?: any, options?: ApplicationOptions): void;
+        hideLoading(): void;
+        navigate(url: string, transition?: string): void;
+        replace(url: string, transition?: string): void;
+        scroller(): kendo.mobile.ui.Scroller;
+        showLoading(): void;
+        view(): kendo.mobile.ui.View;
+    }
+
+    interface ApplicationOptions {
+        hideAddressBar?: boolean;
+        updateDocumentTitle?: boolean;
+        initial?: string;
+        layout?: string;
+        loading?: string;
+        platform?: string;
+        serverNavigation?: boolean;
+        transition?: string;
+    }
+
+    interface ApplicationEvent {
+        sender: Application;
+    }
+}
+
+declare namespace kendo.mobile.ui {
+
+    class Widget extends kendo.ui.Widget {
+    }
+
+    interface TouchAxis {
+        location?: number;
+        startLocation?: number;
+        client?: number;
+        delta?: number;
+        velocity?: number;
+    }
+
+    interface TouchEventOptions {
+        target?: JQuery;
+        x?: TouchAxis;
+        y?: TouchAxis;
+    }
+
+    interface Point {
+        x?: number;
+        y?: number;
+    }
+}
+declare namespace kendo.dataviz.ui {
+    function registerTheme(name: string, options: any): void;
+
+    function plugin(widget: typeof kendo.ui.Widget): void;
+    function plugin(widget: any): void;
+}
+
+declare namespace kendo.dataviz.map.layer {
+    class Shape {
+    }
+}
+
+declare namespace kendo.drawing.pdf {
+    function saveAs(group: kendo.drawing.Group, fileName: string,
+                    proxyUrl?: string, callback?: Function): void;
+}
+
+declare namespace kendo.geometry {
+    class Arc extends Observable {
+
+
+        options: ArcOptions;
+
+        anticlockwise: boolean;
+        center: kendo.geometry.Point;
+        endAngle: number;
+        radiusX: number;
+        radiusY: number;
+        startAngle: number;
+
+
+
+        bbox(matrix: kendo.geometry.Matrix): kendo.geometry.Rect;
+        getAnticlockwise(): boolean;
+        getCenter(): kendo.geometry.Point;
+        getEndAngle(): number;
+        getRadiusX(): number;
+        getRadiusY(): number;
+        getStartAngle(): number;
+        pointAt(angle: number): kendo.geometry.Point;
+        setAnticlockwise(value: boolean): kendo.geometry.Arc;
+        setCenter(value: kendo.geometry.Point): kendo.geometry.Arc;
+        setEndAngle(value: number): kendo.geometry.Arc;
+        setRadiusX(value: number): kendo.geometry.Arc;
+        setRadiusY(value: number): kendo.geometry.Arc;
+        setStartAngle(value: number): kendo.geometry.Arc;
+
+    }
+
+    interface ArcOptions {
+        name?: string;
+    }
+    interface ArcEvent {
+        sender: Arc;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Circle extends Observable {
+
+
+        options: CircleOptions;
+
+        center: kendo.geometry.Point;
+        radius: number;
+
+
+
+        bbox(matrix: kendo.geometry.Matrix): kendo.geometry.Rect;
+        clone(): kendo.geometry.Circle;
+        equals(other: kendo.geometry.Circle): boolean;
+        getCenter(): kendo.geometry.Point;
+        getRadius(): number;
+        pointAt(angle: number): kendo.geometry.Point;
+        setCenter(value: kendo.geometry.Point): kendo.geometry.Point;
+        setCenter(value: any): kendo.geometry.Point;
+        setRadius(value: number): kendo.geometry.Circle;
+
+    }
+
+    interface CircleOptions {
+        name?: string;
+    }
+    interface CircleEvent {
+        sender: Circle;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Matrix extends Observable {
+
+
+        options: MatrixOptions;
+
+        a: number;
+        b: number;
+        c: number;
+        d: number;
+        e: number;
+        f: number;
+
+
+        static rotate(angle: number, x: number, y: number): kendo.geometry.Matrix;
+        static scale(scaleX: number, scaleY: number): kendo.geometry.Matrix;
+        static translate(x: number, y: number): kendo.geometry.Matrix;
+        static unit(): kendo.geometry.Matrix;
+
+        clone(): kendo.geometry.Matrix;
+        equals(other: kendo.geometry.Matrix): boolean;
+        round(digits: number): kendo.geometry.Matrix;
+        multiplyCopy(matrix: kendo.geometry.Matrix): kendo.geometry.Matrix;
+        toArray(digits: number): any;
+        toString(digits: number, separator: string): string;
+
+    }
+
+    interface MatrixOptions {
+        name?: string;
+    }
+    interface MatrixEvent {
+        sender: Matrix;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Point extends Observable {
+
+
+        options: PointOptions;
+
+        x: number;
+        y: number;
+
+        constructor(x: number, y: number);
+
+        static create(x: number, y: number): kendo.geometry.Point;
+        static create(x: any, y: number): kendo.geometry.Point;
+        static create(x: kendo.geometry.Point, y: number): kendo.geometry.Point;
+        static min(): kendo.geometry.Point;
+        static max(): kendo.geometry.Point;
+        static minPoint(): kendo.geometry.Point;
+        static maxPoint(): kendo.geometry.Point;
+
+        clone(): kendo.geometry.Point;
+        distanceTo(point: kendo.geometry.Point): number;
+        equals(other: kendo.geometry.Point): boolean;
+        getX(): number;
+        getY(): number;
+        move(x: number, y: number): kendo.geometry.Point;
+        rotate(angle: number, center: kendo.geometry.Point): kendo.geometry.Point;
+        rotate(angle: number, center: any): kendo.geometry.Point;
+        round(digits: number): kendo.geometry.Point;
+        scale(scaleX: number, scaleY: number): kendo.geometry.Point;
+        scaleCopy(scaleX: number, scaleY: number): kendo.geometry.Point;
+        setX(value: number): kendo.geometry.Point;
+        setY(value: number): kendo.geometry.Point;
+        toArray(digits: number): any;
+        toString(digits: number, separator: string): string;
+        transform(tansformation: kendo.geometry.Transformation): kendo.geometry.Point;
+        transformCopy(tansformation: kendo.geometry.Transformation): kendo.geometry.Point;
+        translate(dx: number, dy: number): kendo.geometry.Point;
+        translateWith(vector: kendo.geometry.Point): kendo.geometry.Point;
+        translateWith(vector: any): kendo.geometry.Point;
+
+    }
+
+    interface PointOptions {
+        name?: string;
+    }
+    interface PointEvent {
+        sender: Point;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Rect extends Observable {
+
+
+        options: RectOptions;
+
+        origin: kendo.geometry.Point;
+        size: kendo.geometry.Size;
+
+        constructor(origin: kendo.geometry.Point, size: kendo.geometry.Size);
+
+        static fromPoints(pointA: kendo.geometry.Point, pointB: kendo.geometry.Point): kendo.geometry.Rect;
+        static union(rectA: kendo.geometry.Rect, rectB: kendo.geometry.Rect): kendo.geometry.Rect;
+
+        bbox(matrix: kendo.geometry.Matrix): kendo.geometry.Rect;
+        bottomLeft(): kendo.geometry.Point;
+        bottomRight(): kendo.geometry.Point;
+        center(): kendo.geometry.Point;
+        clone(): kendo.geometry.Rect;
+        equals(other: kendo.geometry.Rect): boolean;
+        getOrigin(): kendo.geometry.Point;
+        getSize(): kendo.geometry.Size;
+        height(): number;
+        setOrigin(value: kendo.geometry.Point): kendo.geometry.Rect;
+        setOrigin(value: any): kendo.geometry.Rect;
+        setSize(value: kendo.geometry.Size): kendo.geometry.Rect;
+        setSize(value: any): kendo.geometry.Rect;
+        topLeft(): kendo.geometry.Point;
+        topRight(): kendo.geometry.Point;
+        width(): number;
+
+    }
+
+    interface RectOptions {
+        name?: string;
+    }
+    interface RectEvent {
+        sender: Rect;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Size extends Observable {
+
+
+        options: SizeOptions;
+
+        width: number;
+        height: number;
+
+
+        static create(width: number, height: number): kendo.geometry.Size;
+        static create(width: any, height: number): kendo.geometry.Size;
+        static create(width: kendo.geometry.Size, height: number): kendo.geometry.Size;
+
+        clone(): kendo.geometry.Size;
+        equals(other: kendo.geometry.Size): boolean;
+        getWidth(): number;
+        getHeight(): number;
+        setWidth(value: number): kendo.geometry.Size;
+        setHeight(value: number): kendo.geometry.Size;
+
+    }
+
+    interface SizeOptions {
+        name?: string;
+    }
+    interface SizeEvent {
+        sender: Size;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Transformation extends Observable {
+
+
+        options: TransformationOptions;
+
+
+
+
+        clone(): kendo.geometry.Transformation;
+        equals(other: kendo.geometry.Transformation): boolean;
+        matrix(): kendo.geometry.Matrix;
+        multiply(transformation: kendo.geometry.Transformation): kendo.geometry.Transformation;
+        rotate(angle: number, center: any): kendo.geometry.Transformation;
+        rotate(angle: number, center: kendo.geometry.Point): kendo.geometry.Transformation;
+        scale(scaleX: number, scaleY: number): kendo.geometry.Transformation;
+        translate(x: number, y: number): kendo.geometry.Transformation;
+
+    }
+
+    interface TransformationOptions {
+        name?: string;
+    }
+    interface TransformationEvent {
+        sender: Transformation;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+}
+declare namespace kendo.drawing {
+    class Arc extends kendo.drawing.Element {
+
+
+        options: ArcOptions;
+
+
+        constructor(geometry: kendo.geometry.Arc, options?: ArcOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        geometry(): kendo.geometry.Arc;
+        geometry(value: kendo.geometry.Arc): void;
+        fill(color: string, opacity?: number): kendo.drawing.Arc;
+        opacity(): number;
+        opacity(opacity: number): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Arc;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface ArcOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        cursor?: string;
+        fill?: kendo.drawing.FillOptions;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface ArcEvent {
+        sender: Arc;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Circle extends kendo.drawing.Element {
+
+
+        options: CircleOptions;
+
+
+        constructor(geometry: kendo.geometry.Circle, options?: CircleOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        geometry(): kendo.geometry.Circle;
+        geometry(value: kendo.geometry.Circle): void;
+        fill(color: string, opacity?: number): kendo.drawing.Circle;
+        opacity(): number;
+        opacity(opacity: number): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Circle;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface CircleOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        cursor?: string;
+        fill?: kendo.drawing.FillOptions;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface CircleEvent {
+        sender: Circle;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Element extends kendo.Class {
+
+
+        options: ElementOptions;
+
+
+        constructor(options?: ElementOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        opacity(): number;
+        opacity(opacity: number): void;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface ElementOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        cursor?: string;
+        opacity?: number;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface ElementEvent {
+        sender: Element;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    interface FillOptions  {
+
+
+
+        color?: string;
+        opacity?: number;
+
+
+
+
+    }
+
+
+
+    class Gradient extends kendo.Class {
+
+
+        options: GradientOptions;
+
+        stops: any;
+
+        constructor(options?: GradientOptions);
+
+
+        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
+        removeStop(stop: kendo.drawing.GradientStop): void;
+
+    }
+
+    interface GradientOptions {
+        name?: string;
+        stops?: any;
+    }
+    interface GradientEvent {
+        sender: Gradient;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class GradientStop extends kendo.Class {
+
+
+        options: GradientStopOptions;
+
+
+        constructor(options?: GradientStopOptions);
+
+
+
+    }
+
+    interface GradientStopOptions {
+        name?: string;
+        offset?: number;
+        color?: string;
+        opacity?: number;
+    }
+    interface GradientStopEvent {
+        sender: GradientStop;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Group extends kendo.drawing.Element {
+
+
+        options: GroupOptions;
+
+        children: any;
+
+        constructor(options?: GroupOptions);
+
+
+        append(element: kendo.drawing.Element): void;
+        clear(): void;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        insert(position: number, element: kendo.drawing.Element): void;
+        opacity(): number;
+        opacity(opacity: number): void;
+        remove(element: kendo.drawing.Element): void;
+        removeAt(index: number): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface GroupOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        cursor?: string;
+        opacity?: number;
+        pdf?: kendo.drawing.PDFOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface GroupEvent {
+        sender: Group;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Image extends kendo.drawing.Element {
+
+
+        options: ImageOptions;
+
+
+        constructor(src: string, rect: kendo.geometry.Rect);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        opacity(): number;
+        opacity(opacity: number): void;
+        src(): string;
+        src(value: string): void;
+        rect(): kendo.geometry.Rect;
+        rect(value: kendo.geometry.Rect): void;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface ImageOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        cursor?: string;
+        opacity?: number;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface ImageEvent {
+        sender: Image;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Layout extends kendo.drawing.Group {
+
+
+        options: LayoutOptions;
+
+
+        constructor(rect: kendo.geometry.Rect, options?: LayoutOptions);
+
+
+        rect(): kendo.geometry.Rect;
+        rect(rect: kendo.geometry.Rect): void;
+        reflow(): void;
+
+    }
+
+    interface LayoutOptions {
+        name?: string;
+        alignContent?: string;
+        alignItems?: string;
+        justifyContent?: string;
+        lineSpacing?: number;
+        spacing?: number;
+        orientation?: string;
+        wrap?: boolean;
+    }
+    interface LayoutEvent {
+        sender: Layout;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class LinearGradient extends kendo.drawing.Gradient {
+
+
+        options: LinearGradientOptions;
+
+        stops: any;
+
+        constructor(options?: LinearGradientOptions);
+
+
+        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
+        end(): kendo.geometry.Point;
+        end(end: any): void;
+        end(end: kendo.geometry.Point): void;
+        start(): kendo.geometry.Point;
+        start(start: any): void;
+        start(start: kendo.geometry.Point): void;
+        removeStop(stop: kendo.drawing.GradientStop): void;
+
+    }
+
+    interface LinearGradientOptions {
+        name?: string;
+        stops?: any;
+    }
+    interface LinearGradientEvent {
+        sender: LinearGradient;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class MultiPath extends kendo.drawing.Element {
+
+
+        options: MultiPathOptions;
+
+        paths: any;
+
+        constructor(options?: MultiPathOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        close(): kendo.drawing.MultiPath;
+        curveTo(controlOut: any, controlIn: any, endPoint: any): kendo.drawing.MultiPath;
+        curveTo(controlOut: any, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
+        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.MultiPath;
+        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: any): kendo.drawing.MultiPath;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.MultiPath;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
+        fill(color: string, opacity?: number): kendo.drawing.MultiPath;
+        lineTo(x: number, y?: number): kendo.drawing.MultiPath;
+        lineTo(x: any, y?: number): kendo.drawing.MultiPath;
+        lineTo(x: kendo.geometry.Point, y?: number): kendo.drawing.MultiPath;
+        moveTo(x: number, y?: number): kendo.drawing.MultiPath;
+        moveTo(x: any, y?: number): kendo.drawing.MultiPath;
+        moveTo(x: kendo.geometry.Point, y?: number): kendo.drawing.MultiPath;
+        opacity(): number;
+        opacity(opacity: number): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.MultiPath;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface MultiPathOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        cursor?: string;
+        fill?: kendo.drawing.FillOptions;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface MultiPathEvent {
+        sender: MultiPath;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class OptionsStore extends kendo.Class {
+
+
+        options: OptionsStoreOptions;
+
+        observer: any;
+
+        constructor(options?: OptionsStoreOptions);
+
+
+        get(field: string): any;
+        set(field: string, value: any): void;
+
+    }
+
+    interface OptionsStoreOptions {
+        name?: string;
+    }
+    interface OptionsStoreEvent {
+        sender: OptionsStore;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    interface PDFOptions  {
+
+
+
+        creator?: string;
+        date?: Date;
+        keywords?: string;
+        landscape?: boolean;
+        margin?: any;
+        paperSize?: any;
+        subject?: string;
+        title?: string;
+
+
+
+
+    }
+
+
+
+    class Path extends kendo.drawing.Element {
+
+
+        options: PathOptions;
+
+        segments: any;
+
+        constructor(options?: PathOptions);
+
+        static fromPoints(points: any): kendo.drawing.Path;
+        static fromRect(rect: kendo.geometry.Rect): kendo.drawing.Path;
+        static parse(svgPath: string, options?: any): kendo.drawing.Path;
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        close(): kendo.drawing.Path;
+        curveTo(controlOut: any, controlIn: any, endPoint: any): kendo.drawing.Path;
+        curveTo(controlOut: any, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.Path;
+        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.Path;
+        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.Path;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: any): kendo.drawing.Path;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.Path;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.Path;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.Path;
+        fill(color: string, opacity?: number): kendo.drawing.Path;
+        lineTo(x: number, y?: number): kendo.drawing.Path;
+        lineTo(x: any, y?: number): kendo.drawing.Path;
+        lineTo(x: kendo.geometry.Point, y?: number): kendo.drawing.Path;
+        moveTo(x: number, y?: number): kendo.drawing.Path;
+        moveTo(x: any, y?: number): kendo.drawing.Path;
+        moveTo(x: kendo.geometry.Point, y?: number): kendo.drawing.Path;
+        opacity(): number;
+        opacity(opacity: number): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Path;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface PathOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        cursor?: string;
+        fill?: kendo.drawing.FillOptions;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface PathEvent {
+        sender: Path;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class RadialGradient extends kendo.drawing.Gradient {
+
+
+        options: RadialGradientOptions;
+
+        stops: any;
+
+        constructor(options?: RadialGradientOptions);
+
+
+        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
+        center(): kendo.geometry.Point;
+        center(center: any): void;
+        center(center: kendo.geometry.Point): void;
+        radius(): number;
+        radius(value: number): void;
+        removeStop(stop: kendo.drawing.GradientStop): void;
+
+    }
+
+    interface RadialGradientOptions {
+        name?: string;
+        center?: any|kendo.geometry.Point;
+        radius?: number;
+        stops?: any;
+    }
+    interface RadialGradientEvent {
+        sender: RadialGradient;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Rect extends kendo.drawing.Element {
+
+
+        options: RectOptions;
+
+
+        constructor(geometry: kendo.geometry.Rect, options?: RectOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        geometry(): kendo.geometry.Rect;
+        geometry(value: kendo.geometry.Rect): void;
+        fill(color: string, opacity?: number): kendo.drawing.Rect;
+        opacity(): number;
+        opacity(opacity: number): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Rect;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface RectOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        cursor?: string;
+        fill?: kendo.drawing.FillOptions;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface RectEvent {
+        sender: Rect;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Segment extends kendo.Class {
+
+
+        options: SegmentOptions;
+
+
+        constructor(anchor: kendo.geometry.Point, controlIn: kendo.geometry.Point, controlOut: kendo.geometry.Point);
+
+
+        anchor(): kendo.geometry.Point;
+        anchor(value: kendo.geometry.Point): void;
+        controlIn(): kendo.geometry.Point;
+        controlIn(value: kendo.geometry.Point): void;
+        controlOut(): kendo.geometry.Point;
+        controlOut(value: kendo.geometry.Point): void;
+
+    }
+
+    interface SegmentOptions {
+        name?: string;
+    }
+    interface SegmentEvent {
+        sender: Segment;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    interface StrokeOptions  {
+
+
+
+        color?: string;
+        dashType?: string;
+        lineCap?: string;
+        lineJoin?: string;
+        opacity?: number;
+        width?: number;
+
+
+
+
+    }
+
+
+
+    class Surface extends kendo.Observable {
+
+
+        options: SurfaceOptions;
+
+
+        constructor(options?: SurfaceOptions);
+
+        static create(element: JQuery, options?: any): kendo.drawing.Surface;
+        static create(element: Element, options?: any): kendo.drawing.Surface;
+
+        clear(): void;
+        draw(element: kendo.drawing.Element): void;
+        eventTarget(e: any): kendo.drawing.Element;
+        resize(force?: boolean): void;
+
+    }
+
+    interface SurfaceOptions {
+        name?: string;
+        type?: string;
+        height?: string;
+        width?: string;
+        click?(e: SurfaceClickEvent): void;
+        mouseenter?(e: SurfaceMouseenterEvent): void;
+        mouseleave?(e: SurfaceMouseleaveEvent): void;
+    }
+    interface SurfaceEvent {
+        sender: Surface;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface SurfaceClickEvent extends SurfaceEvent {
+        element?: kendo.drawing.Element;
+        originalEvent?: any;
+    }
+
+    interface SurfaceMouseenterEvent extends SurfaceEvent {
+        element?: kendo.drawing.Element;
+        originalEvent?: any;
+    }
+
+    interface SurfaceMouseleaveEvent extends SurfaceEvent {
+        element?: kendo.drawing.Element;
+        originalEvent?: any;
+    }
+
+
+    class Text extends kendo.drawing.Element {
+
+
+        options: TextOptions;
+
+
+        constructor(content: string, position: kendo.geometry.Point, options?: TextOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        content(): string;
+        content(value: string): void;
+        fill(color: string, opacity?: number): kendo.drawing.Text;
+        opacity(): number;
+        opacity(opacity: number): void;
+        position(): kendo.geometry.Point;
+        position(value: kendo.geometry.Point): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Text;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface TextOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        cursor?: string;
+        fill?: kendo.drawing.FillOptions;
+        font?: string;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface TextEvent {
+        sender: Text;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+}
+declare namespace kendo.ui {
+    class AutoComplete extends kendo.ui.Widget {
+
+        static fn: AutoComplete;
+
+        options: AutoCompleteOptions;
+
+        dataSource: kendo.data.DataSource;
+        list: JQuery;
+        ul: JQuery;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): AutoComplete;
+
+        constructor(element: Element, options?: AutoCompleteOptions);
+
+
+        close(): void;
+        dataItem(index: number): any;
+        destroy(): void;
+        enable(enable: boolean): void;
+        focus(): void;
+        items(): any;
+        readonly(readonly: boolean): void;
+        refresh(): void;
+        search(word: string): void;
+        select(item: string): void;
+        select(item: Element): void;
+        select(item: JQuery): void;
+        setDataSource(dataSource: kendo.data.DataSource): void;
+        suggest(value: string): void;
+        value(): string;
+        value(value: string): void;
+
+    }
+
+    interface AutoCompleteAnimationClose {
+        duration?: number;
+        effects?: string;
+    }
+
+    interface AutoCompleteAnimationOpen {
+        duration?: number;
+        effects?: string;
+    }
+
+    interface AutoCompleteAnimation {
+        close?: AutoCompleteAnimationClose;
+        open?: AutoCompleteAnimationOpen;
+    }
+
+    interface AutoCompleteVirtual {
+        itemHeight?: number;
+        valueMapper?: Function;
+    }
+
+    interface AutoCompleteOptions {
+        name?: string;
+        animation?: AutoCompleteAnimation;
+        dataSource?: any|any|kendo.data.DataSource;
+        dataTextField?: string;
+        delay?: number;
+        enable?: boolean;
+        filter?: string;
+        fixedGroupTemplate?: string|Function;
+        groupTemplate?: string|Function;
+        height?: number;
+        highlightFirst?: boolean;
+        ignoreCase?: boolean;
+        minLength?: number;
+        placeholder?: string;
+        popup?: any;
+        separator?: string;
+        suggest?: boolean;
+        headerTemplate?: string|Function;
+        template?: string|Function;
+        valuePrimitive?: boolean;
+        virtual?: AutoCompleteVirtual;
+        change?(e: AutoCompleteChangeEvent): void;
+        close?(e: AutoCompleteCloseEvent): void;
+        dataBound?(e: AutoCompleteDataBoundEvent): void;
+        filtering?(e: AutoCompleteFilteringEvent): void;
+        open?(e: AutoCompleteOpenEvent): void;
+        select?(e: AutoCompleteSelectEvent): void;
+    }
+    interface AutoCompleteEvent {
+        sender: AutoComplete;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface AutoCompleteChangeEvent extends AutoCompleteEvent {
+    }
+
+    interface AutoCompleteCloseEvent extends AutoCompleteEvent {
+    }
+
+    interface AutoCompleteDataBoundEvent extends AutoCompleteEvent {
+    }
+
+    interface AutoCompleteFilteringEvent extends AutoCompleteEvent {
+        filter?: any;
+    }
+
+    interface AutoCompleteOpenEvent extends AutoCompleteEvent {
+    }
+
+    interface AutoCompleteSelectEvent extends AutoCompleteEvent {
+        item?: JQuery;
+    }
+
+
+    class Button extends kendo.ui.Widget {
+
+        static fn: Button;
+
+        options: ButtonOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Button;
+
+        constructor(element: Element, options?: ButtonOptions);
+
+
+        enable(toggle: boolean): void;
+
+    }
+
+    interface ButtonOptions {
+        name?: string;
+        enable?: boolean;
+        icon?: string;
+        imageUrl?: string;
+        spriteCssClass?: string;
+        click?(e: ButtonClickEvent): void;
+    }
+    interface ButtonEvent {
+        sender: Button;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface ButtonClickEvent extends ButtonEvent {
+        event?: any;
+    }
+
+
+    class Calendar extends kendo.ui.Widget {
+
+        static fn: Calendar;
+
+        options: CalendarOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Calendar;
+
+        constructor(element: Element, options?: CalendarOptions);
+
+
+        current(): Date;
+        destroy(): void;
+        max(): Date;
+        max(value: Date): void;
+        max(value: string): void;
+        min(): Date;
+        min(value: Date): void;
+        min(value: string): void;
+        navigate(value: Date, view: string): void;
+        navigateDown(value: Date): void;
+        navigateToFuture(): void;
+        navigateToPast(): void;
+        navigateUp(): void;
+        value(): Date;
+        value(value: Date): void;
+        value(value: string): void;
+        view(): any;
+
+    }
+
+    interface CalendarMonth {
+        content?: string;
+        empty?: string;
+    }
+
+    interface CalendarOptions {
+        name?: string;
+        culture?: string;
+        dates?: any;
+        depth?: string;
+        disableDates?: any|Function;
+        footer?: string|Function;
+        format?: string;
+        max?: Date;
+        min?: Date;
+        month?: CalendarMonth;
+        start?: string;
+        value?: Date;
+        change?(e: CalendarEvent): void;
+        navigate?(e: CalendarEvent): void;
+    }
+    interface CalendarEvent {
+        sender: Calendar;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class ColorPalette extends kendo.ui.Widget {
+
+        static fn: ColorPalette;
+
+        options: ColorPaletteOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): ColorPalette;
+
+        constructor(element: Element, options?: ColorPaletteOptions);
+
+
+        value(): string;
+        value(color?: string): void;
+        color(): kendo.Color;
+        color(color?: kendo.Color): void;
+        enable(enable?: boolean): void;
+
+    }
+
+    interface ColorPaletteTileSize {
+        width?: number;
+        height?: number;
+    }
+
+    interface ColorPaletteOptions {
+        name?: string;
+        palette?: string|any;
+        columns?: number;
+        tileSize?: ColorPaletteTileSize;
+        value?: string;
+        change?(e: ColorPaletteEvent): void;
+    }
+    interface ColorPaletteEvent {
+        sender: ColorPalette;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class ColorPicker extends kendo.ui.Widget {
+
+        static fn: ColorPicker;
+
+        options: ColorPickerOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): ColorPicker;
+
+        constructor(element: Element, options?: ColorPickerOptions);
+
+
+        close(): void;
+        open(): void;
+        toggle(): void;
+        value(): string;
+        value(color?: string): void;
+        color(): kendo.Color;
+        color(color?: kendo.Color): void;
+        enable(enable?: boolean): void;
+
+    }
+
+    interface ColorPickerMessages {
+        apply?: string;
+        cancel?: string;
+    }
+
+    interface ColorPickerTileSize {
+        width?: number;
+        height?: number;
+    }
+
+    interface ColorPickerOptions {
+        name?: string;
+        buttons?: boolean;
+        columns?: number;
+        tileSize?: ColorPickerTileSize;
+        messages?: ColorPickerMessages;
+        palette?: string|any;
+        opacity?: boolean;
+        preview?: boolean;
+        toolIcon?: string;
+        value?: string;
+        change?(e: ColorPickerChangeEvent): void;
+        select?(e: ColorPickerSelectEvent): void;
+        open?(e: ColorPickerEvent): void;
+        close?(e: ColorPickerEvent): void;
+    }
+    interface ColorPickerEvent {
+        sender: ColorPicker;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface ColorPickerChangeEvent extends ColorPickerEvent {
+        value?: string;
+    }
+
+    interface ColorPickerSelectEvent extends ColorPickerEvent {
+        value?: string;
+    }
+
+
+    class ComboBox extends kendo.ui.Widget {
+
+        static fn: ComboBox;
+
+        options: ComboBoxOptions;
+
+        dataSource: kendo.data.DataSource;
+        input: JQuery;
+        list: JQuery;
+        ul: JQuery;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): ComboBox;
+
+        constructor(element: Element, options?: ComboBoxOptions);
+
+
+        close(): void;
+        dataItem(index?: number): any;
+        destroy(): void;
+        enable(enable: boolean): void;
+        focus(): void;
+        items(): any;
+        open(): void;
+        readonly(readonly: boolean): void;
+        refresh(): void;
+        search(word: string): void;
+        select(): number;
+        select(li: JQuery): void;
+        select(li: number): void;
+        select(li: Function): void;
+        setDataSource(dataSource: kendo.data.DataSource): void;
+        suggest(value: string): void;
+        text(): string;
+        text(text: string): void;
+        toggle(toggle: boolean): void;
+        value(): string;
+        value(value: string): void;
+
+    }
+
+    interface ComboBoxAnimationClose {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface ComboBoxAnimationOpen {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface ComboBoxAnimation {
+        close?: ComboBoxAnimationClose;
+        open?: ComboBoxAnimationOpen;
+    }
+
+    interface ComboBoxPopup {
+        appendTo?: string;
+        origin?: string;
+        position?: string;
+    }
+
+    interface ComboBoxVirtual {
+        itemHeight?: number;
+        valueMapper?: Function;
+    }
+
+    interface ComboBoxOptions {
+        name?: string;
+        animation?: ComboBoxAnimation;
+        autoBind?: boolean;
+        cascadeFrom?: string;
+        cascadeFromField?: string;
+        dataSource?: any|any|kendo.data.DataSource;
+        dataTextField?: string;
+        dataValueField?: string;
+        delay?: number;
+        enable?: boolean;
+        filter?: string;
+        fixedGroupTemplate?: string|Function;
+        groupTemplate?: string|Function;
+        height?: number;
+        highlightFirst?: boolean;
+        ignoreCase?: boolean;
+        index?: number;
+        minLength?: number;
+        placeholder?: string;
+        popup?: ComboBoxPopup;
+        suggest?: boolean;
+        headerTemplate?: string|Function;
+        template?: string|Function;
+        text?: string;
+        value?: string;
+        valuePrimitive?: boolean;
+        virtual?: ComboBoxVirtual;
+        change?(e: ComboBoxChangeEvent): void;
+        close?(e: ComboBoxCloseEvent): void;
+        dataBound?(e: ComboBoxDataBoundEvent): void;
+        filtering?(e: ComboBoxFilteringEvent): void;
+        open?(e: ComboBoxOpenEvent): void;
+        select?(e: ComboBoxSelectEvent): void;
+        cascade?(e: ComboBoxCascadeEvent): void;
+    }
+    interface ComboBoxEvent {
+        sender: ComboBox;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface ComboBoxChangeEvent extends ComboBoxEvent {
+    }
+
+    interface ComboBoxCloseEvent extends ComboBoxEvent {
+    }
+
+    interface ComboBoxDataBoundEvent extends ComboBoxEvent {
+    }
+
+    interface ComboBoxFilteringEvent extends ComboBoxEvent {
+        filter?: any;
+    }
+
+    interface ComboBoxOpenEvent extends ComboBoxEvent {
+    }
+
+    interface ComboBoxSelectEvent extends ComboBoxEvent {
+        item?: JQuery;
+    }
+
+    interface ComboBoxCascadeEvent extends ComboBoxEvent {
+    }
+
+
+    class ContextMenu extends kendo.ui.Widget {
+
+        static fn: ContextMenu;
+
+        options: ContextMenuOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): ContextMenu;
+
+        constructor(element: Element, options?: ContextMenuOptions);
+
+
+        append(item: any, referenceItem: string): kendo.ui.ContextMenu;
+        append(item: any, referenceItem: JQuery): kendo.ui.ContextMenu;
+        close(element: Element): kendo.ui.ContextMenu;
+        close(element: JQuery): kendo.ui.ContextMenu;
+        destroy(): void;
+        enable(element: string, enable: boolean): kendo.ui.ContextMenu;
+        enable(element: Element, enable: boolean): kendo.ui.ContextMenu;
+        enable(element: JQuery, enable: boolean): kendo.ui.ContextMenu;
+        insertAfter(item: any, referenceItem: string): kendo.ui.ContextMenu;
+        insertAfter(item: any, referenceItem: Element): kendo.ui.ContextMenu;
+        insertAfter(item: any, referenceItem: JQuery): kendo.ui.ContextMenu;
+        insertBefore(item: any, referenceItem: string): kendo.ui.ContextMenu;
+        insertBefore(item: any, referenceItem: Element): kendo.ui.ContextMenu;
+        insertBefore(item: any, referenceItem: JQuery): kendo.ui.ContextMenu;
+        open(x: number, y?: number): kendo.ui.ContextMenu;
+        open(x: Element, y?: number): kendo.ui.ContextMenu;
+        open(x: JQuery, y?: number): kendo.ui.ContextMenu;
+        remove(element: string): kendo.ui.ContextMenu;
+        remove(element: Element): kendo.ui.ContextMenu;
+        remove(element: JQuery): kendo.ui.ContextMenu;
+
+    }
+
+    interface ContextMenuAnimationClose {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface ContextMenuAnimationOpen {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface ContextMenuAnimation {
+        close?: ContextMenuAnimationClose;
+        open?: ContextMenuAnimationOpen;
+    }
+
+    interface ContextMenuOptions {
+        name?: string;
+        alignToAnchor?: boolean;
+        animation?: ContextMenuAnimation;
+        closeOnClick?: boolean;
+        dataSource?: any|any;
+        direction?: string;
+        filter?: string;
+        hoverDelay?: number;
+        orientation?: string;
+        popupCollision?: string;
+        showOn?: string;
+        target?: string|JQuery;
+        close?(e: ContextMenuCloseEvent): void;
+        open?(e: ContextMenuOpenEvent): void;
+        activate?(e: ContextMenuActivateEvent): void;
+        deactivate?(e: ContextMenuDeactivateEvent): void;
+        select?(e: ContextMenuSelectEvent): void;
+    }
+    interface ContextMenuEvent {
+        sender: ContextMenu;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface ContextMenuCloseEvent extends ContextMenuEvent {
+        item?: Element;
+        type?: string;
+        target?: Element;
+        event?: JQueryEventObject;
+    }
+
+    interface ContextMenuOpenEvent extends ContextMenuEvent {
+        item?: Element;
+        type?: string;
+        target?: Element;
+        event?: JQueryEventObject;
+    }
+
+    interface ContextMenuActivateEvent extends ContextMenuEvent {
+        item?: Element;
+        type?: string;
+        target?: Element;
+    }
+
+    interface ContextMenuDeactivateEvent extends ContextMenuEvent {
+        item?: Element;
+        type?: string;
+        target?: Element;
+    }
+
+    interface ContextMenuSelectEvent extends ContextMenuEvent {
+        item?: Element;
+        type?: string;
+        target?: Element;
+    }
+
+
+    class DatePicker extends kendo.ui.Widget {
+
+        static fn: DatePicker;
+
+        options: DatePickerOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): DatePicker;
+
+        constructor(element: Element, options?: DatePickerOptions);
+
+
+        close(): void;
+        destroy(): void;
+        enable(enable: boolean): void;
+        readonly(readonly: boolean): void;
+        max(): Date;
+        max(value: Date): void;
+        max(value: string): void;
+        min(): Date;
+        min(value: Date): void;
+        min(value: string): void;
+        open(): void;
+        setOptions(options: any): void;
+        value(): Date;
+        value(value: Date): void;
+        value(value: string): void;
+
+    }
+
+    interface DatePickerAnimationClose {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface DatePickerAnimationOpen {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface DatePickerAnimation {
+        close?: DatePickerAnimationClose;
+        open?: DatePickerAnimationOpen;
+    }
+
+    interface DatePickerMonth {
+        content?: string;
+        empty?: string;
+    }
+
+    interface DatePickerOptions {
+        name?: string;
+        animation?: DatePickerAnimation;
+        ARIATemplate?: string;
+        culture?: string;
+        dates?: any;
+        depth?: string;
+        disableDates?: any|Function;
+        footer?: string|Function;
+        format?: string;
+        max?: Date;
+        min?: Date;
+        month?: DatePickerMonth;
+        parseFormats?: any;
+        start?: string;
+        value?: Date;
+        change?(e: DatePickerChangeEvent): void;
+        close?(e: DatePickerCloseEvent): void;
+        open?(e: DatePickerOpenEvent): void;
+    }
+    interface DatePickerEvent {
+        sender: DatePicker;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface DatePickerChangeEvent extends DatePickerEvent {
+    }
+
+    interface DatePickerCloseEvent extends DatePickerEvent {
+    }
+
+    interface DatePickerOpenEvent extends DatePickerEvent {
+    }
+
+
+    class DateTimePicker extends kendo.ui.Widget {
+
+        static fn: DateTimePicker;
+
+        options: DateTimePickerOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): DateTimePicker;
+
+        constructor(element: Element, options?: DateTimePickerOptions);
+
+
+        close(view: string): void;
+        destroy(): void;
+        enable(enable: boolean): void;
+        readonly(readonly: boolean): void;
+        max(): Date;
+        max(value: Date): void;
+        max(value: string): void;
+        min(): Date;
+        min(value: Date): void;
+        min(value: string): void;
+        open(view: string): void;
+        setOptions(options: any): void;
+        toggle(view: string): void;
+        value(): Date;
+        value(value: Date): void;
+        value(value: string): void;
+
+    }
+
+    interface DateTimePickerAnimationClose {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface DateTimePickerAnimationOpen {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface DateTimePickerAnimation {
+        close?: DateTimePickerAnimationClose;
+        open?: DateTimePickerAnimationOpen;
+    }
+
+    interface DateTimePickerMonth {
+        content?: string;
+        empty?: string;
+    }
+
+    interface DateTimePickerOptions {
+        name?: string;
+        animation?: DateTimePickerAnimation;
+        ARIATemplate?: string;
+        culture?: string;
+        dates?: any;
+        depth?: string;
+        disableDates?: any|Function;
+        footer?: string;
+        format?: string;
+        interval?: number;
+        max?: Date;
+        min?: Date;
+        month?: DateTimePickerMonth;
+        parseFormats?: any;
+        start?: string;
+        timeFormat?: string;
+        value?: Date;
+        change?(e: DateTimePickerChangeEvent): void;
+        close?(e: DateTimePickerCloseEvent): void;
+        open?(e: DateTimePickerOpenEvent): void;
+    }
+    interface DateTimePickerEvent {
+        sender: DateTimePicker;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface DateTimePickerChangeEvent extends DateTimePickerEvent {
+    }
+
+    interface DateTimePickerCloseEvent extends DateTimePickerEvent {
+        view?: string;
+    }
+
+    interface DateTimePickerOpenEvent extends DateTimePickerEvent {
+        view?: string;
+    }
+
+
+    class DropDownList extends kendo.ui.Widget {
+
+        static fn: DropDownList;
+
+        options: DropDownListOptions;
+
+        dataSource: kendo.data.DataSource;
+        span: JQuery;
+        filterInput: JQuery;
+        list: JQuery;
+        ul: JQuery;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): DropDownList;
+
+        constructor(element: Element, options?: DropDownListOptions);
+
+
+        close(): void;
+        dataItem(index?: JQuery): any;
+        dataItem(index?: number): any;
+        destroy(): void;
+        focus(): void;
+        items(): any;
+        enable(enable: boolean): void;
+        open(): void;
+        readonly(readonly: boolean): void;
+        refresh(): void;
+        search(word: string): void;
+        select(): number;
+        select(li: JQuery): void;
+        select(li: number): void;
+        select(li: Function): void;
+        setDataSource(dataSource: kendo.data.DataSource): void;
+        text(): string;
+        text(text: string): void;
+        toggle(toggle: boolean): void;
+        value(): string;
+        value(value: string): void;
+
+    }
+
+    interface DropDownListAnimationClose {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface DropDownListAnimationOpen {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface DropDownListAnimation {
+        close?: DropDownListAnimationClose;
+        open?: DropDownListAnimationOpen;
+    }
+
+    interface DropDownListPopup {
+        appendTo?: string;
+        origin?: string;
+        position?: string;
+    }
+
+    interface DropDownListVirtual {
+        itemHeight?: number;
+        valueMapper?: Function;
+    }
+
+    interface DropDownListOptions {
+        name?: string;
+        animation?: DropDownListAnimation;
+        autoBind?: boolean;
+        cascadeFrom?: string;
+        cascadeFromField?: string;
+        dataSource?: any|any|kendo.data.DataSource;
+        dataTextField?: string;
+        dataValueField?: string;
+        delay?: number;
+        enable?: boolean;
+        filter?: string;
+        fixedGroupTemplate?: string|Function;
+        groupTemplate?: string|Function;
+        height?: number;
+        ignoreCase?: boolean;
+        index?: number;
+        minLength?: number;
+        popup?: DropDownListPopup;
+        optionLabel?: string|any;
+        optionLabelTemplate?: string|Function;
+        headerTemplate?: string|Function;
+        template?: string|Function;
+        valueTemplate?: string|Function;
+        text?: string;
+        value?: string;
+        valuePrimitive?: boolean;
+        virtual?: DropDownListVirtual;
+        change?(e: DropDownListChangeEvent): void;
+        close?(e: DropDownListCloseEvent): void;
+        dataBound?(e: DropDownListDataBoundEvent): void;
+        filtering?(e: DropDownListFilteringEvent): void;
+        open?(e: DropDownListOpenEvent): void;
+        select?(e: DropDownListSelectEvent): void;
+        cascade?(e: DropDownListCascadeEvent): void;
+    }
+    interface DropDownListEvent {
+        sender: DropDownList;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface DropDownListChangeEvent extends DropDownListEvent {
+    }
+
+    interface DropDownListCloseEvent extends DropDownListEvent {
+    }
+
+    interface DropDownListDataBoundEvent extends DropDownListEvent {
+    }
+
+    interface DropDownListFilteringEvent extends DropDownListEvent {
+        filter?: any;
+    }
+
+    interface DropDownListOpenEvent extends DropDownListEvent {
+    }
+
+    interface DropDownListSelectEvent extends DropDownListEvent {
+        item?: JQuery;
+    }
+
+    interface DropDownListCascadeEvent extends DropDownListEvent {
+    }
+
+
+    class Editor extends kendo.ui.Widget {
+
+        static fn: Editor;
+
+        options: EditorOptions;
+
+        body: Element;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Editor;
+
+        constructor(element: Element, options?: EditorOptions);
+
+
+        createRange(document?: Document): Range;
+        destroy(): void;
+        encodedValue(): void;
+        exec(name: string, params: any): void;
+        focus(): void;
+        getRange(): Range;
+        getSelection(): Selection;
+        paste(html: string, options: any): void;
+        selectedHtml(): string;
+        refresh(): void;
+        saveAsPDF(): JQueryPromise<any>;
+        selectRange(range: Range): void;
+        update(): void;
+        state(toolName: string): boolean;
+        value(): string;
+        value(value: string): void;
+
+    }
+
+    interface EditorFileBrowserMessages {
+        uploadFile?: string;
+        orderBy?: string;
+        orderByName?: string;
+        orderBySize?: string;
+        directoryNotFound?: string;
+        emptyFolder?: string;
+        deleteFile?: string;
+        invalidFileType?: string;
+        overwriteFile?: string;
+        search?: string;
+    }
+
+    interface EditorFileBrowserSchemaModelFieldsName {
+        field?: string;
+        parse?: Function;
+    }
+
+    interface EditorFileBrowserSchemaModelFieldsSize {
+        field?: string;
+        parse?: Function;
+    }
+
+    interface EditorFileBrowserSchemaModelFieldsType {
+        parse?: Function;
+        field?: string;
+    }
+
+    interface EditorFileBrowserSchemaModelFields {
+        name?: EditorFileBrowserSchemaModelFieldsName;
+        type?: EditorFileBrowserSchemaModelFieldsType;
+        size?: EditorFileBrowserSchemaModelFieldsSize;
+    }
+
+    interface EditorFileBrowserSchemaModel {
+        id?: string;
+        fields?: EditorFileBrowserSchemaModelFields;
+    }
+
+    interface EditorFileBrowserSchema {
+    }
+
+    interface EditorFileBrowserTransportCreate {
+        contentType?: string;
+        data?: any|string|Function;
+        dataType?: string;
+        type?: string;
+        url?: string|Function;
+    }
+
+    interface EditorFileBrowserTransportDestroy {
+        contentType?: string;
+        data?: any|string|Function;
+        dataType?: string;
+        type?: string;
+        url?: string|Function;
+    }
+
+    interface EditorFileBrowserTransportRead {
+        contentType?: string;
+        data?: any|string|Function;
+        dataType?: string;
+        type?: string;
+        url?: string|Function;
+    }
+
+    interface EditorFileBrowserTransport {
+        read?: EditorFileBrowserTransportRead;
+        uploadUrl?: string;
+        fileUrl?: string|Function;
+        destroy?: EditorFileBrowserTransportDestroy;
+        create?: EditorFileBrowserTransportCreate;
+    }
+
+    interface EditorFileBrowser {
+        fileTypes?: string;
+        path?: string;
+        transport?: EditorFileBrowserTransport;
+        schema?: EditorFileBrowserSchema;
+        messages?: EditorFileBrowserMessages;
+    }
+
+    interface EditorImageBrowserMessages {
+        uploadFile?: string;
+        orderBy?: string;
+        orderByName?: string;
+        orderBySize?: string;
+        directoryNotFound?: string;
+        emptyFolder?: string;
+        deleteFile?: string;
+        invalidFileType?: string;
+        overwriteFile?: string;
+        search?: string;
+    }
+
+    interface EditorImageBrowserSchemaModelFieldsName {
+        field?: string;
+        parse?: Function;
+    }
+
+    interface EditorImageBrowserSchemaModelFieldsSize {
+        field?: string;
+        parse?: Function;
+    }
+
+    interface EditorImageBrowserSchemaModelFieldsType {
+        parse?: Function;
+        field?: string;
+    }
+
+    interface EditorImageBrowserSchemaModelFields {
+        name?: EditorImageBrowserSchemaModelFieldsName;
+        type?: EditorImageBrowserSchemaModelFieldsType;
+        size?: EditorImageBrowserSchemaModelFieldsSize;
+    }
+
+    interface EditorImageBrowserSchemaModel {
+        id?: string;
+        fields?: EditorImageBrowserSchemaModelFields;
+    }
+
+    interface EditorImageBrowserSchema {
+    }
+
+    interface EditorImageBrowserTransportCreate {
+        contentType?: string;
+        data?: any|string|Function;
+        dataType?: string;
+        type?: string;
+        url?: string|Function;
+    }
+
+    interface EditorImageBrowserTransportDestroy {
+        contentType?: string;
+        data?: any|string|Function;
+        dataType?: string;
+        type?: string;
+        url?: string|Function;
+    }
+
+    interface EditorImageBrowserTransportRead {
+        contentType?: string;
+        data?: any|string|Function;
+        dataType?: string;
+        type?: string;
+        url?: string|Function;
+    }
+
+    interface EditorImageBrowserTransport {
+        read?: EditorImageBrowserTransportRead;
+        thumbnailUrl?: string|Function;
+        uploadUrl?: string;
+        imageUrl?: string|Function;
+        destroy?: EditorImageBrowserTransportDestroy;
+        create?: EditorImageBrowserTransportCreate;
+    }
+
+    interface EditorImageBrowser {
+        fileTypes?: string;
+        path?: string;
+        transport?: EditorImageBrowserTransport;
+        schema?: EditorImageBrowserSchema;
+        messages?: EditorImageBrowserMessages;
+    }
+
+    interface EditorMessages {
+        bold?: string;
+        italic?: string;
+        underline?: string;
+        strikethrough?: string;
+        superscript?: string;
+        subscript?: string;
+        justifyCenter?: string;
+        justifyLeft?: string;
+        justifyRight?: string;
+        justifyFull?: string;
+        insertUnorderedList?: string;
+        insertOrderedList?: string;
+        indent?: string;
+        outdent?: string;
+        createLink?: string;
+        unlink?: string;
+        insertImage?: string;
+        insertFile?: string;
+        insertHtml?: string;
+        viewHtml?: string;
+        fontName?: string;
+        fontNameInherit?: string;
+        fontSize?: string;
+        fontSizeInherit?: string;
+        formatBlock?: string;
+        formatting?: string;
+        foreColor?: string;
+        backColor?: string;
+        style?: string;
+        emptyFolder?: string;
+        uploadFile?: string;
+        editAreaTitle?: string;
+        orderBy?: string;
+        orderBySize?: string;
+        orderByName?: string;
+        invalidFileType?: string;
+        deleteFile?: string;
+        overwriteFile?: string;
+        directoryNotFound?: string;
+        imageWebAddress?: string;
+        imageAltText?: string;
+        imageWidth?: string;
+        imageHeight?: string;
+        fileWebAddress?: string;
+        fileTitle?: string;
+        linkWebAddress?: string;
+        linkText?: string;
+        linkToolTip?: string;
+        linkOpenInNewWindow?: string;
+        dialogUpdate?: string;
+        dialogInsert?: string;
+        dialogCancel?: string;
+        createTable?: string;
+        createTableHint?: string;
+        addColumnLeft?: string;
+        addColumnRight?: string;
+        addRowAbove?: string;
+        addRowBelow?: string;
+        deleteRow?: string;
+        deleteColumn?: string;
+    }
+
+    interface EditorPdfMargin {
+        bottom?: number|string;
+        left?: number|string;
+        right?: number|string;
+        top?: number|string;
+    }
+
+    interface EditorPdf {
+        author?: string;
+        avoidLinks?: boolean|string;
+        creator?: string;
+        date?: Date;
+        fileName?: string;
+        forceProxy?: boolean;
+        keywords?: string;
+        landscape?: boolean;
+        margin?: EditorPdfMargin;
+        paperSize?: string|any;
+        proxyURL?: string;
+        proxyTarget?: string;
+        subject?: string;
+        title?: string;
+    }
+
+    interface EditorResizable {
+        content?: boolean;
+        min?: number;
+        max?: number;
+        toolbar?: boolean;
+    }
+
+    interface EditorSerialization {
+        entities?: boolean;
+        scripts?: boolean;
+        semantic?: boolean;
+    }
+
+    interface EditorToolItem {
+        text?: string;
+        value?: string;
+        context?: string;
+    }
+
+    interface EditorTool {
+        name?: string;
+        tooltip?: string;
+        exec?: Function;
+        items?: EditorToolItem[];
+        template?: string;
+    }
+
+    interface EditorExecParams {
+        value?: any;
+    }
+
+    interface EditorPasteOptions {
+        split?: boolean;
+    }
+
+    interface EditorOptions {
+        name?: string;
+        domain?: string;
+        encoded?: boolean;
+        messages?: EditorMessages;
+        pdf?: EditorPdf;
+        resizable?: EditorResizable;
+        serialization?: EditorSerialization;
+        stylesheets?: any;
+        tools?: EditorTool[];
+        imageBrowser?: EditorImageBrowser;
+        fileBrowser?: EditorFileBrowser;
+        change?(e: EditorEvent): void;
+        execute?(e: EditorExecuteEvent): void;
+        keydown?(e: EditorEvent): void;
+        keyup?(e: EditorEvent): void;
+        paste?(e: EditorPasteEvent): void;
+        pdfExport?(e: EditorPdfExportEvent): void;
+        select?(e: EditorEvent): void;
+    }
+    interface EditorEvent {
+        sender: Editor;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface EditorExecuteEvent extends EditorEvent {
+        name?: string;
+        command?: any;
+    }
+
+    interface EditorPasteEvent extends EditorEvent {
+        html?: any;
+    }
+
+    interface EditorPdfExportEvent extends EditorEvent {
+        promise?: JQueryPromise<any>;
+    }
+
+
+    class FlatColorPicker extends kendo.ui.Widget {
+
+        static fn: FlatColorPicker;
+
+        options: FlatColorPickerOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): FlatColorPicker;
+
+        constructor(element: Element, options?: FlatColorPickerOptions);
+
+
+        focus(): void;
+        value(): string;
+        value(color?: string): void;
+        color(): kendo.Color;
+        color(color?: kendo.Color): void;
+        enable(enable?: boolean): void;
+
+    }
+
+    interface FlatColorPickerMessages {
+        apply?: string;
+        cancel?: string;
+    }
+
+    interface FlatColorPickerOptions {
+        name?: string;
+        opacity?: boolean;
+        buttons?: boolean;
+        value?: string;
+        preview?: boolean;
+        autoupdate?: boolean;
+        messages?: FlatColorPickerMessages;
+        change?(e: FlatColorPickerChangeEvent): void;
+    }
+    interface FlatColorPickerEvent {
+        sender: FlatColorPicker;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface FlatColorPickerChangeEvent extends FlatColorPickerEvent {
+        value?: string;
+    }
+
+
+    class Gantt extends kendo.ui.Widget {
+
+        static fn: Gantt;
+
+        options: GanttOptions;
+
+        dataSource: kendo.data.DataSource;
+        dependencies: kendo.data.GanttDependencyDataSource;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Gantt;
+
+        constructor(element: Element, options?: GanttOptions);
+
+
+        clearSelection(): void;
+        dataItem(row: string): kendo.data.GanttTask;
+        dataItem(row: Element): kendo.data.GanttTask;
+        dataItem(row: JQuery): kendo.data.GanttTask;
+        destroy(): void;
+        refresh(): void;
+        refreshDependencies(): void;
+        removeDependency(dependency: string): void;
+        removeDependency(dependency: kendo.data.GanttDependency): void;
+        removeTask(task: string): void;
+        removeTask(task: kendo.data.GanttTask): void;
+        saveAsPDF(): JQueryPromise<any>;
+        select(): JQuery;
+        select(row: string): void;
+        select(row: Element): void;
+        select(row: JQuery): void;
+        setDataSource(dataSource: kendo.data.GanttDataSource): void;
+        setDependenciesDataSource(dataSource: kendo.data.GanttDependencyDataSource): void;
+        view(): kendo.ui.GanttView;
+        view(type?: string): void;
+
+    }
+
+    interface GanttAssignments {
+        dataSource?: any|any|kendo.data.DataSource;
+        dataResourceIdField?: string;
+        dataTaskIdField?: string;
+        dataValueField?: string;
+    }
+
+    interface GanttColumn {
+        field?: string;
+        title?: string;
+        format?: string;
+        width?: string|number;
+        editable?: boolean;
+        sortable?: boolean;
+    }
+
+    interface GanttCurrentTimeMarker {
+        updateInterval?: number;
+    }
+
+    interface GanttEditable {
+        confirmation?: boolean;
+        template?: string|Function;
+    }
+
+    interface GanttMessagesActions {
+        addChild?: string;
+        append?: string;
+        insertAfter?: string;
+        insertBefore?: string;
+        pdf?: string;
+    }
+
+    interface GanttMessagesEditor {
+        assignButton?: string;
+        editorTitle?: string;
+        end?: string;
+        percentComplete?: string;
+        resources?: string;
+        resourcesEditorTitle?: string;
+        resourcesHeader?: string;
+        start?: string;
+        title?: string;
+        unitsHeader?: string;
+    }
+
+    interface GanttMessagesViews {
+        day?: string;
+        end?: string;
+        month?: string;
+        start?: string;
+        week?: string;
+        year?: string;
+    }
+
+    interface GanttMessages {
+        actions?: GanttMessagesActions;
+        cancel?: string;
+        deleteDependencyConfirmation?: string;
+        deleteDependencyWindowTitle?: string;
+        deleteTaskConfirmation?: string;
+        deleteTaskWindowTitle?: string;
+        destroy?: string;
+        editor?: GanttMessagesEditor;
+        save?: string;
+        views?: GanttMessagesViews;
+    }
+
+    interface GanttPdfMargin {
+        bottom?: number|string;
+        left?: number|string;
+        right?: number|string;
+        top?: number|string;
+    }
+
+    interface GanttPdf {
+        author?: string;
+        avoidLinks?: boolean|string;
+        creator?: string;
+        date?: Date;
+        fileName?: string;
+        forceProxy?: boolean;
+        keywords?: string;
+        landscape?: boolean;
+        margin?: GanttPdfMargin;
+        paperSize?: string|any;
+        proxyURL?: string;
+        proxyTarget?: string;
+        subject?: string;
+        title?: string;
+    }
+
+    interface GanttResources {
+        dataFormatField?: string;
+        dataColorField?: string;
+        dataSource?: any|any|kendo.data.DataSource;
+        dataTextField?: string;
+        field?: string;
+    }
+
+    interface GanttToolbarItem {
+        name?: string;
+        template?: string|Function;
+        text?: string;
+    }
+
+    interface GanttTooltip {
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface GanttView {
+        type?: string;
+        selected?: boolean;
+        slotSize?: number|string;
+        timeHeaderTemplate?: string|Function;
+        dayHeaderTemplate?: string|Function;
+        weekHeaderTemplate?: string|Function;
+        monthHeaderTemplate?: string|Function;
+        yearHeaderTemplate?: string|Function;
+        resizeTooltipFormat?: string;
+    }
+
+    interface GanttOptions {
+        name?: string;
+        assignments?: GanttAssignments;
+        autoBind?: boolean;
+        columnResizeHandleWidth?: number;
+        columns?: GanttColumn[];
+        currentTimeMarker?: GanttCurrentTimeMarker;
+        dataSource?: any|any|kendo.data.GanttDataSource;
+        dependencies?: any|any|kendo.data.GanttDependencyDataSource;
+        editable?: GanttEditable;
+        navigatable?: boolean;
+        workDayStart?: Date;
+        workDayEnd?: Date;
+        workWeekStart?: number;
+        workWeekEnd?: number;
+        hourSpan?: number;
+        snap?: boolean;
+        height?: number|string;
+        listWidth?: string|number;
+        messages?: GanttMessages;
+        pdf?: GanttPdf;
+        resizable?: boolean;
+        selectable?: boolean;
+        showWorkDays?: boolean;
+        showWorkHours?: boolean;
+        taskTemplate?: string|Function;
+        toolbar?: GanttToolbarItem[];
+        tooltip?: GanttTooltip;
+        views?: GanttView[];
+        resources?: GanttResources;
+        rowHeight?: number|string;
+        dataBinding?(e: GanttDataBindingEvent): void;
+        dataBound?(e: GanttDataBoundEvent): void;
+        add?(e: GanttAddEvent): void;
+        edit?(e: GanttEditEvent): void;
+        remove?(e: GanttRemoveEvent): void;
+        cancel?(e: GanttCancelEvent): void;
+        save?(e: GanttSaveEvent): void;
+        change?(e: GanttChangeEvent): void;
+        columnResize?(e: GanttColumnResizeEvent): void;
+        navigate?(e: GanttNavigateEvent): void;
+        moveStart?(e: GanttMoveStartEvent): void;
+        move?(e: GanttMoveEvent): void;
+        moveEnd?(e: GanttMoveEndEvent): void;
+        pdfExport?(e: GanttPdfExportEvent): void;
+        resizeStart?(e: GanttResizeStartEvent): void;
+        resize?(e: GanttResizeEvent): void;
+        resizeEnd?(e: GanttResizeEndEvent): void;
+    }
+    interface GanttEvent {
+        sender: Gantt;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface GanttDataBindingEvent extends GanttEvent {
+    }
+
+    interface GanttDataBoundEvent extends GanttEvent {
+    }
+
+    interface GanttAddEvent extends GanttEvent {
+        task?: kendo.data.GanttTask;
+        dependency?: kendo.data.GanttDependency;
+    }
+
+    interface GanttEditEvent extends GanttEvent {
+        container?: JQuery;
+        task?: kendo.data.GanttTask;
+    }
+
+    interface GanttRemoveEvent extends GanttEvent {
+        task?: kendo.data.GanttTask;
+        dependencies?: any;
+    }
+
+    interface GanttCancelEvent extends GanttEvent {
+        container?: JQuery;
+        task?: kendo.data.GanttTask;
+    }
+
+    interface GanttSaveEvent extends GanttEvent {
+        task?: kendo.data.GanttTask;
+        values?: any;
+    }
+
+    interface GanttChangeEvent extends GanttEvent {
+    }
+
+    interface GanttColumnResizeEvent extends GanttEvent {
+        column?: any;
+        newWidth?: number;
+        oldWidth?: number;
+    }
+
+    interface GanttNavigateEvent extends GanttEvent {
+        view?: string;
+    }
+
+    interface GanttMoveStartEvent extends GanttEvent {
+        task?: kendo.data.GanttTask;
+    }
+
+    interface GanttMoveEvent extends GanttEvent {
+        task?: kendo.data.GanttTask;
+        start?: Date;
+        end?: Date;
+    }
+
+    interface GanttMoveEndEvent extends GanttEvent {
+        task?: kendo.data.GanttTask;
+        start?: Date;
+        end?: Date;
+    }
+
+    interface GanttPdfExportEvent extends GanttEvent {
+        promise?: JQueryPromise<any>;
+    }
+
+    interface GanttResizeStartEvent extends GanttEvent {
+        task?: kendo.data.GanttTask;
+    }
+
+    interface GanttResizeEvent extends GanttEvent {
+        task?: kendo.data.GanttTask;
+        start?: Date;
+        end?: Date;
+    }
+
+    interface GanttResizeEndEvent extends GanttEvent {
+        task?: kendo.data.GanttTask;
+        start?: Date;
+        end?: Date;
+    }
+
+
+    class Grid extends kendo.ui.Widget {
+
+        static fn: Grid;
+
+        options: GridOptions;
+
+        dataSource: kendo.data.DataSource;
+        columns: GridColumn[];
+        footer: JQuery;
+        pager: kendo.ui.Pager;
+        table: JQuery;
+        tbody: JQuery;
+        thead: JQuery;
+        content: JQuery;
+        lockedHeader: JQuery;
+        lockedTable: JQuery;
+        lockedContent: JQuery;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Grid;
+
+        constructor(element: Element, options?: GridOptions);
+
+
+        addRow(): void;
+        autoFitColumn(column: number): void;
+        autoFitColumn(column: string): void;
+        autoFitColumn(column: any): void;
+        cancelChanges(): void;
+        cancelRow(): void;
+        cellIndex(cell: string): number;
+        cellIndex(cell: Element): number;
+        cellIndex(cell: JQuery): number;
+        clearSelection(): void;
+        closeCell(isCancel?: boolean): void;
+        collapseGroup(row: string): void;
+        collapseGroup(row: Element): void;
+        collapseGroup(row: JQuery): void;
+        collapseRow(row: string): void;
+        collapseRow(row: Element): void;
+        collapseRow(row: JQuery): void;
+        current(): JQuery;
+        current(cell: JQuery): void;
+        dataItem(row: string): kendo.data.ObservableObject;
+        dataItem(row: Element): kendo.data.ObservableObject;
+        dataItem(row: JQuery): kendo.data.ObservableObject;
+        destroy(): void;
+        editCell(cell: JQuery): void;
+        editRow(row: JQuery): void;
+        expandGroup(row: string): void;
+        expandGroup(row: Element): void;
+        expandGroup(row: JQuery): void;
+        expandRow(row: string): void;
+        expandRow(row: Element): void;
+        expandRow(row: JQuery): void;
+        getOptions(): GridOptions;
+        hideColumn(column: number): void;
+        hideColumn(column: string): void;
+        hideColumn(column: any): void;
+        items(): any;
+        lockColumn(column: number): void;
+        lockColumn(column: string): void;
+        refresh(): void;
+        removeRow(row: string): void;
+        removeRow(row: Element): void;
+        removeRow(row: JQuery): void;
+        reorderColumn(destIndex: number, column: any): void;
+        saveAsExcel(): void;
+        saveAsPDF(): JQueryPromise<any>;
+        saveChanges(): void;
+        saveRow(): void;
+        select(): JQuery;
+        select(rows: string): void;
+        select(rows: Element): void;
+        select(rows: JQuery): void;
+        setDataSource(dataSource: kendo.data.DataSource): void;
+        setOptions(options: any): void;
+        showColumn(column: number): void;
+        showColumn(column: string): void;
+        showColumn(column: any): void;
+        unlockColumn(column: number): void;
+        unlockColumn(column: string): void;
+
+    }
+
+    interface GridAllowCopy {
+        delimeter?: string|any;
+    }
+
+    interface GridColumnMenuMessages {
+        columns?: string;
+        filter?: string;
+        sortAscending?: string;
+        sortDescending?: string;
+        settings?: string;
+        done?: string;
+        lock?: string;
+        unlock?: string;
+    }
+
+    interface GridColumnMenu {
+        columns?: boolean;
+        filterable?: boolean;
+        sortable?: boolean;
+        messages?: GridColumnMenuMessages;
+    }
+
+    interface GridColumnCommandItemText {
+        edit?: string;
+        cancel?: string;
+        update?: string;
+    }
+
+    interface GridColumnCommandItem {
+        name?: string;
+        text?: GridColumnCommandItemText;
+        className?: string;
+        imageClass?: string;
+        click?: Function;
+    }
+
+    interface GridColumnFilterableCell {
+        dataSource?: any|kendo.data.DataSource;
+        dataTextField?: string;
+        delay?: number;
+        inputWidth?: number;
+        suggestionOperator?: string;
+        minLength?: number;
+        enabled?: boolean;
+        operator?: string;
+        showOperators?: boolean;
+        template?: Function;
+    }
+
+    interface GridColumnFilterable {
+        cell?: GridColumnFilterableCell;
+        multi?: boolean;
+        dataSource?: any|any|kendo.data.DataSource;
+        checkAll?: boolean;
+        itemTemplate?: Function;
+        operators?: any;
+        search?: boolean;
+        ignoreCase?: boolean;
+        ui?: string|Function;
+    }
+
+    interface GridColumnSortable {
+        compare?: Function;
+    }
+
+    interface GridColumn {
+        aggregates?: any;
+        attributes?: any;
+        columns?: any;
+        command?: GridColumnCommandItem[];
+        encoded?: boolean;
+        field?: string;
+        filterable?: GridColumnFilterable;
+        footerTemplate?: string|Function;
+        format?: string;
+        groupable?: boolean;
+        groupHeaderTemplate?: string|Function;
+        groupFooterTemplate?: string|Function;
+        headerAttributes?: any;
+        headerTemplate?: string|Function;
+        hidden?: boolean;
+        locked?: boolean;
+        lockable?: boolean;
+        minScreenWidth?: number;
+        sortable?: GridColumnSortable;
+        template?: string|Function;
+        title?: string;
+        width?: string|number;
+        values?: any;
+        menu?: boolean;
+    }
+
+    interface GridEditable {
+        confirmation?: boolean|string|Function;
+        cancelDelete?: string;
+        confirmDelete?: string;
+        createAt?: string;
+        destroy?: boolean;
+        mode?: string;
+        template?: string|Function;
+        update?: boolean;
+        window?: any;
+    }
+
+    interface GridExcel {
+        allPages?: boolean;
+        fileName?: string;
+        filterable?: boolean;
+        forceProxy?: boolean;
+        proxyURL?: string;
+    }
+
+    interface GridFilterableMessages {
+        and?: string;
+        clear?: string;
+        filter?: string;
+        info?: string;
+        isFalse?: string;
+        isTrue?: string;
+        or?: string;
+        selectValue?: string;
+        cancel?: string;
+        operator?: string;
+        value?: string;
+        checkAll?: string;
+    }
+
+    interface GridFilterableOperatorsDate {
+        eq?: string;
+        neq?: string;
+        isnull?: string;
+        isnotnull?: string;
+        gte?: string;
+        gt?: string;
+        lte?: string;
+        lt?: string;
+    }
+
+    interface GridFilterableOperatorsEnums {
+        eq?: string;
+        neq?: string;
+        isnull?: string;
+        isnotnull?: string;
+    }
+
+    interface GridFilterableOperatorsNumber {
+        eq?: string;
+        neq?: string;
+        isnull?: string;
+        isnotnull?: string;
+        gte?: string;
+        gt?: string;
+        lte?: string;
+        lt?: string;
+    }
+
+    interface GridFilterableOperatorsString {
+        eq?: string;
+        neq?: string;
+        isnull?: string;
+        isnotnull?: string;
+        isempty?: string;
+        isnotempty?: string;
+        startswith?: string;
+        contains?: string;
+        doesnotcontain?: string;
+        endswith?: string;
+    }
+
+    interface GridFilterableOperators {
+        string?: GridFilterableOperatorsString;
+        number?: GridFilterableOperatorsNumber;
+        date?: GridFilterableOperatorsDate;
+        enums?: GridFilterableOperatorsEnums;
+    }
+
+    interface GridFilterable {
+        extra?: boolean;
+        messages?: GridFilterableMessages;
+        operators?: GridFilterableOperators;
+        mode?: string;
+    }
+
+    interface GridGroupableMessages {
+        empty?: string;
+    }
+
+    interface GridGroupable {
+        enabled?: boolean;
+        showFooter?: boolean;
+        messages?: GridGroupableMessages;
+    }
+
+    interface GridMessagesCommands {
+        cancel?: string;
+        canceledit?: string;
+        create?: string;
+        destroy?: string;
+        edit?: string;
+        excel?: string;
+        save?: string;
+        update?: string;
+    }
+
+    interface GridMessages {
+        commands?: GridMessagesCommands;
+        noRecords?: string;
+    }
+
+    interface GridNoRecords {
+        template?: string|Function;
+    }
+
+    interface GridPageableMessages {
+        display?: string;
+        empty?: string;
+        page?: string;
+        of?: string;
+        itemsPerPage?: string;
+        first?: string;
+        last?: string;
+        next?: string;
+        previous?: string;
+        refresh?: string;
+        morePages?: string;
+    }
+
+    interface GridPageable {
+        pageSize?: number;
+        previousNext?: boolean;
+        numeric?: boolean;
+        buttonCount?: number;
+        input?: boolean;
+        pageSizes?: boolean|any;
+        refresh?: boolean;
+        info?: boolean;
+        messages?: GridPageableMessages;
+    }
+
+    interface GridPdfMargin {
+        bottom?: number|string;
+        left?: number|string;
+        right?: number|string;
+        top?: number|string;
+    }
+
+    interface GridPdf {
+        allPages?: boolean;
+        author?: string;
+        avoidLinks?: boolean|string;
+        creator?: string;
+        date?: Date;
+        fileName?: string;
+        forceProxy?: boolean;
+        keywords?: string;
+        landscape?: boolean;
+        margin?: GridPdfMargin;
+        paperSize?: string|any;
+        template?: string;
+        repeatHeaders?: boolean;
+        scale?: number|any|any;
+        proxyURL?: string;
+        proxyTarget?: string;
+        subject?: string;
+        title?: string;
+    }
+
+    interface GridScrollable {
+        virtual?: boolean;
+    }
+
+    interface GridSortable {
+        allowUnsort?: boolean;
+        mode?: string;
+    }
+
+    interface GridToolbarItem {
+        name?: string;
+        template?: string|Function;
+        text?: string;
+    }
+
+    interface GridOptions {
+        name?: string;
+        allowCopy?: GridAllowCopy;
+        altRowTemplate?: string|Function;
+        autoBind?: boolean;
+        columnResizeHandleWidth?: number;
+        columns?: GridColumn[];
+        columnMenu?: GridColumnMenu;
+        dataSource?: any|any|kendo.data.DataSource;
+        detailTemplate?: string|Function;
+        editable?: GridEditable;
+        excel?: GridExcel;
+        filterable?: GridFilterable;
+        groupable?: GridGroupable;
+        height?: number|string;
+        messages?: GridMessages;
+        mobile?: boolean|string;
+        navigatable?: boolean;
+        noRecords?: GridNoRecords;
+        pageable?: GridPageable;
+        pdf?: GridPdf;
+        reorderable?: boolean;
+        resizable?: boolean;
+        rowTemplate?: string|Function;
+        scrollable?: GridScrollable;
+        selectable?: boolean|string;
+        sortable?: GridSortable;
+        toolbar?: string | ((...args:any[]) => string) | GridToolbarItem[];
+        cancel?(e: GridCancelEvent): void;
+        change?(e: GridChangeEvent): void;
+        columnHide?(e: GridColumnHideEvent): void;
+        columnMenuInit?(e: GridColumnMenuInitEvent): void;
+        columnReorder?(e: GridColumnReorderEvent): void;
+        columnResize?(e: GridColumnResizeEvent): void;
+        columnShow?(e: GridColumnShowEvent): void;
+        dataBinding?(e: GridDataBindingEvent): void;
+        dataBound?(e: GridDataBoundEvent): void;
+        detailCollapse?(e: GridDetailCollapseEvent): void;
+        detailExpand?(e: GridDetailExpandEvent): void;
+        detailInit?(e: GridDetailInitEvent): void;
+        edit?(e: GridEditEvent): void;
+        excelExport?(e: GridExcelExportEvent): void;
+        pdfExport?(e: GridPdfExportEvent): void;
+        filterMenuInit?(e: GridFilterMenuInitEvent): void;
+        remove?(e: GridRemoveEvent): void;
+        save?(e: GridSaveEvent): void;
+        saveChanges?(e: GridSaveChangesEvent): void;
+        columnLock?(e: GridColumnLockEvent): void;
+        columnUnlock?(e: GridColumnUnlockEvent): void;
+        navigate?(e: GridNavigateEvent): void;
+    }
+    interface GridEvent {
+        sender: Grid;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface GridCancelEvent extends GridEvent {
+        container?: JQuery;
+        model?: kendo.data.Model;
+    }
+
+    interface GridChangeEvent extends GridEvent {
+    }
+
+    interface GridColumnHideEvent extends GridEvent {
+        column?: any;
+    }
+
+    interface GridColumnMenuInitEvent extends GridEvent {
+        container?: JQuery;
+        field?: string;
+    }
+
+    interface GridColumnReorderEvent extends GridEvent {
+        column?: any;
+        newIndex?: number;
+        oldIndex?: number;
+    }
+
+    interface GridColumnResizeEvent extends GridEvent {
+        column?: any;
+        newWidth?: number;
+        oldWidth?: number;
+    }
+
+    interface GridColumnShowEvent extends GridEvent {
+        column?: any;
+    }
+
+    interface GridDataBindingEvent extends GridEvent {
+        action?: string;
+        index?: number;
+        items?: any;
+    }
+
+    interface GridDataBoundEvent extends GridEvent {
+    }
+
+    interface GridDetailCollapseEvent extends GridEvent {
+        detailRow?: JQuery;
+        masterRow?: JQuery;
+    }
+
+    interface GridDetailExpandEvent extends GridEvent {
+        detailRow?: JQuery;
+        masterRow?: JQuery;
+    }
+
+    interface GridDetailInitEvent extends GridEvent {
+        data?: kendo.data.ObservableObject;
+        detailCell?: JQuery;
+        detailRow?: JQuery;
+        masterRow?: JQuery;
+    }
+
+    interface GridEditEvent extends GridEvent {
+        container?: JQuery;
+        model?: kendo.data.Model;
+    }
+
+    interface GridExcelExportEvent extends GridEvent {
+        data?: any;
+        workbook?: kendo.ooxml.Workbook;
+    }
+
+    interface GridPdfExportEvent extends GridEvent {
+        promise?: JQueryPromise<any>;
+    }
+
+    interface GridFilterMenuInitEvent extends GridEvent {
+        container?: JQuery;
+        field?: string;
+    }
+
+    interface GridRemoveEvent extends GridEvent {
+        model?: kendo.data.Model;
+        row?: JQuery;
+    }
+
+    interface GridSaveEvent extends GridEvent {
+        model?: kendo.data.Model;
+        container?: JQuery;
+        values?: any;
+    }
+
+    interface GridSaveChangesEvent extends GridEvent {
+    }
+
+    interface GridColumnLockEvent extends GridEvent {
+        column?: any;
+    }
+
+    interface GridColumnUnlockEvent extends GridEvent {
+        column?: any;
+    }
+
+    interface GridNavigateEvent extends GridEvent {
+        element?: JQuery;
+    }
+
+
+    class ListView extends kendo.ui.Widget {
+
+        static fn: ListView;
+
+        options: ListViewOptions;
+
+        dataSource: kendo.data.DataSource;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): ListView;
+
+        constructor(element: Element, options?: ListViewOptions);
+
+
+        add(): void;
+        cancel(): void;
+        clearSelection(): void;
+        dataItem(row: string): kendo.data.ObservableObject;
+        dataItem(row: Element): kendo.data.ObservableObject;
+        dataItem(row: JQuery): kendo.data.ObservableObject;
+        dataItems(): void;
+        destroy(): void;
+        edit(item: JQuery): void;
+        items(): any;
+        refresh(): void;
+        remove(item: any): void;
+        save(): void;
+        select(): JQuery;
+        select(items: JQuery): void;
+        select(items: any): void;
+        setDataSource(dataSource: kendo.data.DataSource): void;
+
+    }
+
+    interface ListViewOptions {
+        name?: string;
+        autoBind?: boolean;
+        dataSource?: any|any|kendo.data.DataSource;
+        editTemplate?: Function;
+        navigatable?: boolean;
+        selectable?: boolean|string;
+        template?: Function;
+        altTemplate?: Function;
+        cancel?(e: ListViewCancelEvent): void;
+        change?(e: ListViewEvent): void;
+        dataBound?(e: ListViewEvent): void;
+        dataBinding?(e: ListViewEvent): void;
+        edit?(e: ListViewEditEvent): void;
+        remove?(e: ListViewRemoveEvent): void;
+        save?(e: ListViewSaveEvent): void;
+    }
+    interface ListViewEvent {
+        sender: ListView;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface ListViewCancelEvent extends ListViewEvent {
+        container?: JQuery;
+        model?: kendo.data.Model;
+    }
+
+    interface ListViewEditEvent extends ListViewEvent {
+        item?: JQuery;
+        model?: kendo.data.Model;
+    }
+
+    interface ListViewRemoveEvent extends ListViewEvent {
+        item?: JQuery;
+        model?: kendo.data.Model;
+    }
+
+    interface ListViewSaveEvent extends ListViewEvent {
+        model?: kendo.data.Model;
+        item?: JQuery;
+    }
+
+
+    class MaskedTextBox extends kendo.ui.Widget {
+
+        static fn: MaskedTextBox;
+
+        options: MaskedTextBoxOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): MaskedTextBox;
+
+        constructor(element: Element, options?: MaskedTextBoxOptions);
+
+
+        destroy(): void;
+        enable(enable: boolean): void;
+        readonly(readonly: boolean): void;
+        raw(): string;
+        value(): string;
+        value(value: string): void;
+
+    }
+
+    interface MaskedTextBoxOptions {
+        name?: string;
+        clearPromptChar?: boolean;
+        culture?: string;
+        mask?: string;
+        promptChar?: string;
+        rules?: any;
+        unmaskOnPost?: boolean;
+        value?: string;
+        change?(e: MaskedTextBoxChangeEvent): void;
+    }
+    interface MaskedTextBoxEvent {
+        sender: MaskedTextBox;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface MaskedTextBoxChangeEvent extends MaskedTextBoxEvent {
+    }
+
+
+    class Menu extends kendo.ui.Widget {
+
+        static fn: Menu;
+
+        options: MenuOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Menu;
+
+        constructor(element: Element, options?: MenuOptions);
+
+
+        append(item: any, referenceItem: string): kendo.ui.Menu;
+        append(item: any, referenceItem: JQuery): kendo.ui.Menu;
+        close(element: string): kendo.ui.Menu;
+        close(element: Element): kendo.ui.Menu;
+        close(element: JQuery): kendo.ui.Menu;
+        destroy(): void;
+        enable(element: string, enable: boolean): kendo.ui.Menu;
+        enable(element: Element, enable: boolean): kendo.ui.Menu;
+        enable(element: JQuery, enable: boolean): kendo.ui.Menu;
+        insertAfter(item: any, referenceItem: string): kendo.ui.Menu;
+        insertAfter(item: any, referenceItem: Element): kendo.ui.Menu;
+        insertAfter(item: any, referenceItem: JQuery): kendo.ui.Menu;
+        insertBefore(item: any, referenceItem: string): kendo.ui.Menu;
+        insertBefore(item: any, referenceItem: Element): kendo.ui.Menu;
+        insertBefore(item: any, referenceItem: JQuery): kendo.ui.Menu;
+        open(element: string): kendo.ui.Menu;
+        open(element: Element): kendo.ui.Menu;
+        open(element: JQuery): kendo.ui.Menu;
+        remove(element: string): kendo.ui.Menu;
+        remove(element: Element): kendo.ui.Menu;
+        remove(element: JQuery): kendo.ui.Menu;
+
+    }
+
+    interface MenuAnimationClose {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface MenuAnimationOpen {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface MenuAnimation {
+        close?: MenuAnimationClose;
+        open?: MenuAnimationOpen;
+    }
+
+    interface MenuOptions {
+        name?: string;
+        animation?: MenuAnimation;
+        closeOnClick?: boolean;
+        dataSource?: any|any;
+        direction?: string;
+        hoverDelay?: number;
+        openOnClick?: boolean;
+        orientation?: string;
+        popupCollision?: string;
+        close?(e: MenuCloseEvent): void;
+        open?(e: MenuOpenEvent): void;
+        activate?(e: MenuActivateEvent): void;
+        deactivate?(e: MenuDeactivateEvent): void;
+        select?(e: MenuSelectEvent): void;
+    }
+    interface MenuEvent {
+        sender: Menu;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface MenuCloseEvent extends MenuEvent {
+        item?: HTMLElement;
+    }
+
+    interface MenuOpenEvent extends MenuEvent {
+        item?: HTMLElement;
+    }
+
+    interface MenuActivateEvent extends MenuEvent {
+        item?: HTMLElement;
+    }
+
+    interface MenuDeactivateEvent extends MenuEvent {
+        item?: HTMLElement;
+    }
+
+    interface MenuSelectEvent extends MenuEvent {
+        item?: HTMLElement;
+    }
+
+
+    class MultiSelect extends kendo.ui.Widget {
+
+        static fn: MultiSelect;
+
+        options: MultiSelectOptions;
+
+        dataSource: kendo.data.DataSource;
+        input: JQuery;
+        list: JQuery;
+        ul: JQuery;
+        tagList: JQuery;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): MultiSelect;
+
+        constructor(element: Element, options?: MultiSelectOptions);
+
+
+        close(): void;
+        dataItems(): any;
+        destroy(): void;
+        enable(enable: boolean): void;
+        focus(): void;
+        items(): any;
+        open(): void;
+        readonly(readonly: boolean): void;
+        refresh(): void;
+        search(word: string): void;
+        setDataSource(dataSource: kendo.data.DataSource): void;
+        toggle(toggle: boolean): void;
+        value(): any;
+        value(value: any): void;
+        value(value: string): void;
+
+    }
+
+    interface MultiSelectAnimationClose {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface MultiSelectAnimationOpen {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface MultiSelectAnimation {
+        close?: MultiSelectAnimationClose;
+        open?: MultiSelectAnimationOpen;
+    }
+
+    interface MultiSelectPopup {
+        appendTo?: string;
+        origin?: string;
+        position?: string;
+    }
+
+    interface MultiSelectVirtual {
+        itemHeight?: number;
+        valueMapper?: Function;
+    }
+
+    interface MultiSelectOptions {
+        name?: string;
+        animation?: MultiSelectAnimation;
+        autoBind?: boolean;
+        autoClose?: boolean;
+        dataSource?: any|any|kendo.data.DataSource;
+        dataTextField?: string;
+        dataValueField?: string;
+        delay?: number;
+        enable?: boolean;
+        filter?: string;
+        fixedGroupTemplate?: string|Function;
+        groupTemplate?: string|Function;
+        height?: number;
+        highlightFirst?: boolean;
+        ignoreCase?: boolean;
+        minLength?: number;
+        maxSelectedItems?: number;
+        placeholder?: string;
+        popup?: MultiSelectPopup;
+        headerTemplate?: string|Function;
+        itemTemplate?: string|Function;
+        tagTemplate?: string;
+        tagMode?: string;
+        value?: any;
+        valuePrimitive?: boolean;
+        virtual?: MultiSelectVirtual;
+        change?(e: MultiSelectChangeEvent): void;
+        close?(e: MultiSelectCloseEvent): void;
+        dataBound?(e: MultiSelectDataBoundEvent): void;
+        filtering?(e: MultiSelectFilteringEvent): void;
+        open?(e: MultiSelectOpenEvent): void;
+        select?(e: MultiSelectSelectEvent): void;
+    }
+    interface MultiSelectEvent {
+        sender: MultiSelect;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface MultiSelectChangeEvent extends MultiSelectEvent {
+    }
+
+    interface MultiSelectCloseEvent extends MultiSelectEvent {
+    }
+
+    interface MultiSelectDataBoundEvent extends MultiSelectEvent {
+    }
+
+    interface MultiSelectFilteringEvent extends MultiSelectEvent {
+        filter?: any;
+    }
+
+    interface MultiSelectOpenEvent extends MultiSelectEvent {
+    }
+
+    interface MultiSelectSelectEvent extends MultiSelectEvent {
+        item?: JQuery;
+    }
+
+
+    class Notification extends kendo.ui.Widget {
+
+        static fn: Notification;
+
+        options: NotificationOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Notification;
+
+        constructor(element: Element, options?: NotificationOptions);
+
+
+        error(data: any): void;
+        error(data: string): void;
+        error(data: Function): void;
+        getNotifications(): JQuery;
+        hide(): void;
+        info(data: any): void;
+        info(data: string): void;
+        info(data: Function): void;
+        show(data: any, type: string): void;
+        show(data: string, type: string): void;
+        show(data: Function, type: string): void;
+        showText(data: any, type: string): void;
+        showText(data: string, type: string): void;
+        showText(data: Function, type: string): void;
+        success(data: any): void;
+        success(data: string): void;
+        success(data: Function): void;
+        warning(data: any): void;
+        warning(data: string): void;
+        warning(data: Function): void;
+
+    }
+
+    interface NotificationPosition {
+        bottom?: number;
+        left?: number;
+        pinned?: boolean;
+        right?: number;
+        top?: number;
+    }
+
+    interface NotificationTemplate {
+        type?: string;
+        template?: string;
+    }
+
+    interface NotificationOptions {
+        name?: string;
+        allowHideAfter?: number;
+        animation?: any|boolean;
+        appendTo?: string|JQuery;
+        autoHideAfter?: number;
+        button?: boolean;
+        height?: number|string;
+        hideOnClick?: boolean;
+        position?: NotificationPosition;
+        stacking?: string;
+        templates?: NotificationTemplate[];
+        width?: number|string;
+        hide?(e: NotificationHideEvent): void;
+        show?(e: NotificationShowEvent): void;
+    }
+    interface NotificationEvent {
+        sender: Notification;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface NotificationHideEvent extends NotificationEvent {
+        element?: JQuery;
+    }
+
+    interface NotificationShowEvent extends NotificationEvent {
+        element?: JQuery;
+    }
+
+
+    class NumericTextBox extends kendo.ui.Widget {
+
+        static fn: NumericTextBox;
+
+        options: NumericTextBoxOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): NumericTextBox;
+
+        constructor(element: Element, options?: NumericTextBoxOptions);
+
+
+        destroy(): void;
+        enable(enable: boolean): void;
+        readonly(readonly: boolean): void;
+        focus(): void;
+        max(): number;
+        max(value: number): void;
+        max(value: string): void;
+        min(): number;
+        min(value: number): void;
+        min(value: string): void;
+        step(): number;
+        step(value: number): void;
+        step(value: string): void;
+        value(): number;
+        value(value: number): void;
+        value(value: string): void;
+
+    }
+
+    interface NumericTextBoxOptions {
+        name?: string;
+        culture?: string;
+        decimals?: number;
+        downArrowText?: string;
+        format?: string;
+        max?: number;
+        min?: number;
+        placeholder?: string;
+        spinners?: boolean;
+        step?: number;
+        upArrowText?: string;
+        value?: number;
+        change?(e: NumericTextBoxChangeEvent): void;
+        spin?(e: NumericTextBoxSpinEvent): void;
+    }
+    interface NumericTextBoxEvent {
+        sender: NumericTextBox;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface NumericTextBoxChangeEvent extends NumericTextBoxEvent {
+    }
+
+    interface NumericTextBoxSpinEvent extends NumericTextBoxEvent {
+    }
+
+
+    class Pager extends kendo.ui.Widget {
+
+        static fn: Pager;
+
+        options: PagerOptions;
+
+        dataSource: kendo.data.DataSource;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Pager;
+
+        constructor(element: Element, options?: PagerOptions);
+
+
+        totalPages(): number;
+        pageSize(): number;
+        page(): number;
+        page(page: number): void;
+        refresh(): void;
+        destroy(): void;
+
+    }
+
+    interface PagerMessages {
+        display?: string;
+        empty?: string;
+        allPages?: string;
+        page?: string;
+        of?: string;
+        itemsPerPage?: string;
+        first?: string;
+        previous?: string;
+        next?: string;
+        last?: string;
+        refresh?: string;
+    }
+
+    interface PagerOptions {
+        name?: string;
+        autoBind?: boolean;
+        buttonCount?: number;
+        dataSource?: any|kendo.data.DataSource;
+        selectTemplate?: string;
+        linkTemplate?: string;
+        info?: boolean;
+        input?: boolean;
+        numeric?: boolean;
+        pageSizes?: boolean|any;
+        previousNext?: boolean;
+        refresh?: boolean;
+        messages?: PagerMessages;
+        change?(e: PagerChangeEvent): void;
+    }
+    interface PagerEvent {
+        sender: Pager;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface PagerChangeEvent extends PagerEvent {
+    }
+
+
+    class PanelBar extends kendo.ui.Widget {
+
+        static fn: PanelBar;
+
+        options: PanelBarOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): PanelBar;
+
+        constructor(element: Element, options?: PanelBarOptions);
+
+
+        append(item: string, referenceItem: string): kendo.ui.PanelBar;
+        append(item: string, referenceItem: Element): kendo.ui.PanelBar;
+        append(item: string, referenceItem: JQuery): kendo.ui.PanelBar;
+        append(item: Element, referenceItem: string): kendo.ui.PanelBar;
+        append(item: Element, referenceItem: Element): kendo.ui.PanelBar;
+        append(item: Element, referenceItem: JQuery): kendo.ui.PanelBar;
+        append(item: JQuery, referenceItem: string): kendo.ui.PanelBar;
+        append(item: JQuery, referenceItem: Element): kendo.ui.PanelBar;
+        append(item: JQuery, referenceItem: JQuery): kendo.ui.PanelBar;
+        append(item: any, referenceItem: string): kendo.ui.PanelBar;
+        append(item: any, referenceItem: Element): kendo.ui.PanelBar;
+        append(item: any, referenceItem: JQuery): kendo.ui.PanelBar;
+        clearSelection(): void;
+        collapse(element: string, useAnimation: boolean): kendo.ui.PanelBar;
+        collapse(element: Element, useAnimation: boolean): kendo.ui.PanelBar;
+        collapse(element: JQuery, useAnimation: boolean): kendo.ui.PanelBar;
+        destroy(): void;
+        enable(element: string, enable: boolean): void;
+        enable(element: Element, enable: boolean): void;
+        enable(element: JQuery, enable: boolean): void;
+        expand(element: string, useAnimation: boolean): kendo.ui.PanelBar;
+        expand(element: Element, useAnimation: boolean): kendo.ui.PanelBar;
+        expand(element: JQuery, useAnimation: boolean): kendo.ui.PanelBar;
+        insertAfter(item: string, referenceItem: string): void;
+        insertAfter(item: string, referenceItem: Element): void;
+        insertAfter(item: string, referenceItem: JQuery): void;
+        insertAfter(item: Element, referenceItem: string): void;
+        insertAfter(item: Element, referenceItem: Element): void;
+        insertAfter(item: Element, referenceItem: JQuery): void;
+        insertAfter(item: JQuery, referenceItem: string): void;
+        insertAfter(item: JQuery, referenceItem: Element): void;
+        insertAfter(item: JQuery, referenceItem: JQuery): void;
+        insertAfter(item: any, referenceItem: string): void;
+        insertAfter(item: any, referenceItem: Element): void;
+        insertAfter(item: any, referenceItem: JQuery): void;
+        insertBefore(item: string, referenceItem: string): kendo.ui.PanelBar;
+        insertBefore(item: string, referenceItem: Element): kendo.ui.PanelBar;
+        insertBefore(item: string, referenceItem: JQuery): kendo.ui.PanelBar;
+        insertBefore(item: Element, referenceItem: string): kendo.ui.PanelBar;
+        insertBefore(item: Element, referenceItem: Element): kendo.ui.PanelBar;
+        insertBefore(item: Element, referenceItem: JQuery): kendo.ui.PanelBar;
+        insertBefore(item: JQuery, referenceItem: string): kendo.ui.PanelBar;
+        insertBefore(item: JQuery, referenceItem: Element): kendo.ui.PanelBar;
+        insertBefore(item: JQuery, referenceItem: JQuery): kendo.ui.PanelBar;
+        insertBefore(item: any, referenceItem: string): kendo.ui.PanelBar;
+        insertBefore(item: any, referenceItem: Element): kendo.ui.PanelBar;
+        insertBefore(item: any, referenceItem: JQuery): kendo.ui.PanelBar;
+        reload(element: string): void;
+        reload(element: Element): void;
+        reload(element: JQuery): void;
+        remove(element: string): void;
+        remove(element: Element): void;
+        remove(element: JQuery): void;
+        select(): JQuery;
+        select(element?: string): void;
+        select(element?: Element): void;
+        select(element?: JQuery): void;
+
+    }
+
+    interface PanelBarAnimationCollapse {
+        duration?: number;
+        effects?: string;
+    }
+
+    interface PanelBarAnimationExpand {
+        duration?: number;
+        effects?: string;
+    }
+
+    interface PanelBarAnimation {
+        collapse?: PanelBarAnimationCollapse;
+        expand?: PanelBarAnimationExpand;
+    }
+
+    interface PanelBarOptions {
+        name?: string;
+        animation?: PanelBarAnimation;
+        contentUrls?: any;
+        dataSource?: any|any;
+        expandMode?: string;
+        activate?(e: PanelBarActivateEvent): void;
+        collapse?(e: PanelBarCollapseEvent): void;
+        contentLoad?(e: PanelBarContentLoadEvent): void;
+        error?(e: PanelBarErrorEvent): void;
+        expand?(e: PanelBarExpandEvent): void;
+        select?(e: PanelBarSelectEvent): void;
+    }
+    interface PanelBarEvent {
+        sender: PanelBar;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface PanelBarActivateEvent extends PanelBarEvent {
+        item?: Element;
+    }
+
+    interface PanelBarCollapseEvent extends PanelBarEvent {
+        item?: Element;
+    }
+
+    interface PanelBarContentLoadEvent extends PanelBarEvent {
+        item?: Element;
+        contentElement?: Element;
+    }
+
+    interface PanelBarErrorEvent extends PanelBarEvent {
+        xhr?: JQueryXHR;
+        status?: string;
+    }
+
+    interface PanelBarExpandEvent extends PanelBarEvent {
+        item?: Element;
+    }
+
+    interface PanelBarSelectEvent extends PanelBarEvent {
+        item?: Element;
+    }
+
+
+    class PivotConfigurator extends kendo.ui.Widget {
+
+        static fn: PivotConfigurator;
+
+        options: PivotConfiguratorOptions;
+
+        dataSource: kendo.data.DataSource;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): PivotConfigurator;
+
+        constructor(element: Element, options?: PivotConfiguratorOptions);
+
+
+        destroy(): void;
+        refresh(): void;
+        setDataSource(dataSource: kendo.data.PivotDataSource): void;
+
+    }
+
+    interface PivotConfiguratorMessagesFieldMenuOperators {
+        contains?: string;
+        doesnotcontain?: string;
+        startswith?: string;
+        endswith?: string;
+        eq?: string;
+        neq?: string;
+    }
+
+    interface PivotConfiguratorMessagesFieldMenu {
+        info?: string;
+        sortAscending?: string;
+        sortDescending?: string;
+        filterFields?: string;
+        filter?: string;
+        include?: string;
+        title?: string;
+        clear?: string;
+        ok?: string;
+        cancel?: string;
+        operators?: PivotConfiguratorMessagesFieldMenuOperators;
+    }
+
+    interface PivotConfiguratorMessages {
+        measures?: string;
+        columns?: string;
+        rows?: string;
+        measuresLabel?: string;
+        rowsLabel?: string;
+        columnsLabel?: string;
+        fieldsLabel?: string;
+        fieldMenu?: PivotConfiguratorMessagesFieldMenu;
+    }
+
+    interface PivotConfiguratorSortable {
+        allowUnsort?: boolean;
+    }
+
+    interface PivotConfiguratorOptions {
+        name?: string;
+        dataSource?: any|kendo.data.PivotDataSource;
+        filterable?: boolean;
+        sortable?: PivotConfiguratorSortable;
+        height?: number|string;
+        messages?: PivotConfiguratorMessages;
+    }
+    interface PivotConfiguratorEvent {
+        sender: PivotConfigurator;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class PivotGrid extends kendo.ui.Widget {
+
+        static fn: PivotGrid;
+
+        options: PivotGridOptions;
+
+        dataSource: kendo.data.DataSource;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): PivotGrid;
+
+        constructor(element: Element, options?: PivotGridOptions);
+
+
+        cellInfo(columnIndex: number, rowIndex: number): any;
+        cellInfoByElement(cell: string): any;
+        cellInfoByElement(cell: Element): any;
+        cellInfoByElement(cell: JQuery): any;
+        destroy(): void;
+        refresh(): void;
+        setDataSource(dataSource: kendo.data.PivotDataSource): void;
+        saveAsExcel(): void;
+        saveAsPDF(): JQueryPromise<any>;
+
+    }
+
+    interface PivotGridExcel {
+        fileName?: string;
+        filterable?: boolean;
+        forceProxy?: boolean;
+        proxyURL?: string;
+    }
+
+    interface PivotGridMessagesFieldMenuOperators {
+        contains?: string;
+        doesnotcontain?: string;
+        startswith?: string;
+        endswith?: string;
+        eq?: string;
+        neq?: string;
+    }
+
+    interface PivotGridMessagesFieldMenu {
+        info?: string;
+        sortAscending?: string;
+        sortDescending?: string;
+        filterFields?: string;
+        filter?: string;
+        include?: string;
+        title?: string;
+        clear?: string;
+        ok?: string;
+        cancel?: string;
+        operators?: PivotGridMessagesFieldMenuOperators;
+    }
+
+    interface PivotGridMessages {
+        measureFields?: string;
+        columnFields?: string;
+        rowFields?: string;
+        fieldMenu?: PivotGridMessagesFieldMenu;
+    }
+
+    interface PivotGridPdfMargin {
+        bottom?: number|string;
+        left?: number|string;
+        right?: number|string;
+        top?: number|string;
+    }
+
+    interface PivotGridPdf {
+        author?: string;
+        avoidLinks?: boolean|string;
+        creator?: string;
+        date?: Date;
+        fileName?: string;
+        forceProxy?: boolean;
+        keywords?: string;
+        landscape?: boolean;
+        margin?: PivotGridPdfMargin;
+        paperSize?: string|any;
+        proxyURL?: string;
+        proxyTarget?: string;
+        subject?: string;
+        title?: string;
+    }
+
+    interface PivotGridSortable {
+        allowUnsort?: boolean;
+    }
+
+    interface PivotGridOptions {
+        name?: string;
+        dataSource?: any|kendo.data.PivotDataSource;
+        autoBind?: boolean;
+        reorderable?: boolean;
+        excel?: PivotGridExcel;
+        pdf?: PivotGridPdf;
+        filterable?: boolean;
+        sortable?: PivotGridSortable;
+        columnWidth?: number;
+        height?: number|string;
+        columnHeaderTemplate?: string|Function;
+        dataCellTemplate?: string|Function;
+        kpiStatusTemplate?: string|Function;
+        kpiTrendTemplate?: string|Function;
+        rowHeaderTemplate?: string|Function;
+        messages?: PivotGridMessages;
+        dataBinding?(e: PivotGridDataBindingEvent): void;
+        dataBound?(e: PivotGridDataBoundEvent): void;
+        expandMember?(e: PivotGridExpandMemberEvent): void;
+        collapseMember?(e: PivotGridCollapseMemberEvent): void;
+        excelExport?(e: PivotGridExcelExportEvent): void;
+        pdfExport?(e: PivotGridPdfExportEvent): void;
+    }
+    interface PivotGridEvent {
+        sender: PivotGrid;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface PivotGridDataBindingEvent extends PivotGridEvent {
+    }
+
+    interface PivotGridDataBoundEvent extends PivotGridEvent {
+    }
+
+    interface PivotGridExpandMemberEvent extends PivotGridEvent {
+        axis?: string;
+        path?: string;
+    }
+
+    interface PivotGridCollapseMemberEvent extends PivotGridEvent {
+        axis?: string;
+        path?: string;
+    }
+
+    interface PivotGridExcelExportEvent extends PivotGridEvent {
+        data?: any;
+        workbook?: any;
+    }
+
+    interface PivotGridPdfExportEvent extends PivotGridEvent {
+        promise?: JQueryPromise<any>;
+    }
+
+
+    class Popup extends kendo.ui.Widget {
+
+        static fn: Popup;
+
+        options: PopupOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Popup;
+
+        constructor(element: Element, options?: PopupOptions);
+
+
+        close(): void;
+        open(): void;
+        position(): void;
+        setOptions(options: any): void;
+        visible(): boolean;
+
+    }
+
+    interface PopupAnimationClose {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface PopupAnimationOpen {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface PopupAnimation {
+        close?: PopupAnimationClose;
+        open?: PopupAnimationOpen;
+    }
+
+    interface PopupOptions {
+        name?: string;
+        adjustSize?: any;
+        animation?: PopupAnimation;
+        anchor?: string|JQuery;
+        appendTo?: string|JQuery;
+        collision?: string;
+        origin?: string;
+        position?: string;
+        activate?(e: PopupActivateEvent): void;
+        close?(e: PopupCloseEvent): void;
+        deactivate?(e: PopupDeactivateEvent): void;
+        open?(e: PopupOpenEvent): void;
+    }
+    interface PopupEvent {
+        sender: Popup;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface PopupActivateEvent extends PopupEvent {
+    }
+
+    interface PopupCloseEvent extends PopupEvent {
+    }
+
+    interface PopupDeactivateEvent extends PopupEvent {
+    }
+
+    interface PopupOpenEvent extends PopupEvent {
+    }
+
+
+    class ProgressBar extends kendo.ui.Widget {
+
+        static fn: ProgressBar;
+
+        options: ProgressBarOptions;
+
+        progressStatus: JQuery;
+        progressWrapper: JQuery;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): ProgressBar;
+
+        constructor(element: Element, options?: ProgressBarOptions);
+
+
+        enable(enable: boolean): void;
+        value(): number;
+        value(value: number): void;
+
+    }
+
+    interface ProgressBarAnimation {
+        duration?: number;
+    }
+
+    interface ProgressBarOptions {
+        name?: string;
+        animation?: ProgressBarAnimation;
+        chunkCount?: number;
+        enable?: boolean;
+        max?: number;
+        min?: number;
+        orientation?: string;
+        reverse?: boolean;
+        showStatus?: boolean;
+        type?: string;
+        value?: number;
+        change?(e: ProgressBarChangeEvent): void;
+        complete?(e: ProgressBarCompleteEvent): void;
+    }
+    interface ProgressBarEvent {
+        sender: ProgressBar;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface ProgressBarChangeEvent extends ProgressBarEvent {
+        value?: number;
+    }
+
+    interface ProgressBarCompleteEvent extends ProgressBarEvent {
+        value?: number;
+    }
+
+
+    class RangeSlider extends kendo.ui.Widget {
+
+        static fn: RangeSlider;
+
+        options: RangeSliderOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): RangeSlider;
+
+        constructor(element: Element, options?: RangeSliderOptions);
+
+
+        destroy(): void;
+        enable(enable: boolean): void;
+        value(): any;
+        value(selectionStart: number, selectionEnd: number): void;
+        resize(): void;
+
+    }
+
+    interface RangeSliderTooltip {
+        enabled?: boolean;
+        format?: string;
+        template?: string;
+    }
+
+    interface RangeSliderOptions {
+        name?: string;
+        largeStep?: number;
+        max?: number;
+        min?: number;
+        orientation?: string;
+        selectionEnd?: number;
+        selectionStart?: number;
+        smallStep?: number;
+        tickPlacement?: string;
+        tooltip?: RangeSliderTooltip;
+        change?(e: RangeSliderChangeEvent): void;
+        slide?(e: RangeSliderSlideEvent): void;
+    }
+    interface RangeSliderEvent {
+        sender: RangeSlider;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface RangeSliderChangeEvent extends RangeSliderEvent {
+        value?: any;
+    }
+
+    interface RangeSliderSlideEvent extends RangeSliderEvent {
+        value?: any;
+    }
+
+
+    class ResponsivePanel extends kendo.ui.Widget {
+
+        static fn: ResponsivePanel;
+
+        options: ResponsivePanelOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): ResponsivePanel;
+
+        constructor(element: Element, options?: ResponsivePanelOptions);
+
+
+        close(): void;
+        destroy(): void;
+        open(): void;
+
+    }
+
+    interface ResponsivePanelOptions {
+        name?: string;
+        autoClose?: boolean;
+        breakpoint?: number;
+        orientation?: string;
+        toggleButton?: string;
+        close?(e: ResponsivePanelEvent): void;
+        open?(e: ResponsivePanelEvent): void;
+    }
+    interface ResponsivePanelEvent {
+        sender: ResponsivePanel;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Scheduler extends kendo.ui.Widget {
+
+        static fn: Scheduler;
+
+        options: SchedulerOptions;
+
+        dataSource: kendo.data.DataSource;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Scheduler;
+
+        constructor(element: Element, options?: SchedulerOptions);
+
+
+        addEvent(data: any): void;
+        cancelEvent(): void;
+        data(): void;
+        date(): Date;
+        date(value?: Date): void;
+        destroy(): void;
+        editEvent(event: string): void;
+        editEvent(event: kendo.data.SchedulerEvent): void;
+        items(): any;
+        occurrenceByUid(uid: string): kendo.data.SchedulerEvent;
+        occurrencesInRange(start: Date, end: Date): any;
+        refresh(): void;
+        removeEvent(event: string): void;
+        removeEvent(event: kendo.data.SchedulerEvent): void;
+        resourcesBySlot(slot: any): any;
+        saveAsPDF(): JQueryPromise<any>;
+        saveEvent(): void;
+        select(): void;
+        select(events: any, options: any): void;
+        setDataSource(dataSource: kendo.data.SchedulerDataSource): void;
+        slotByPosition(xPosition: number, yPosition: number): any;
+        slotByElement(element: Element): any;
+        slotByElement(element: JQuery): any;
+        view(): kendo.ui.SchedulerView;
+        view(type?: string): void;
+        viewName(): string;
+
+    }
+
+    interface SchedulerCurrentTimeMarker {
+        updateInterval?: number;
+        useLocalTimezone?: boolean;
+    }
+
+    interface SchedulerEditable {
+        confirmation?: boolean|string;
+        create?: boolean;
+        destroy?: boolean;
+        editRecurringMode?: string;
+        move?: boolean;
+        resize?: boolean;
+        template?: string|Function;
+        update?: boolean;
+        window?: any;
+    }
+
+    interface SchedulerFooter {
+        command?: string|boolean;
+    }
+
+    interface SchedulerGroup {
+        resources?: any;
+        orientation?: string;
+    }
+
+    interface SchedulerMessagesEditable {
+        confirmation?: string;
+    }
+
+    interface SchedulerMessagesEditor {
+        allDayEvent?: string;
+        description?: string;
+        editorTitle?: string;
+        end?: string;
+        endTimezone?: string;
+        repeat?: string;
+        separateTimezones?: string;
+        start?: string;
+        startTimezone?: string;
+        timezone?: string;
+        timezoneEditorButton?: string;
+        timezoneEditorTitle?: string;
+        title?: string;
+    }
+
+    interface SchedulerMessagesRecurrenceEditorDaily {
+        interval?: string;
+        repeatEvery?: string;
+    }
+
+    interface SchedulerMessagesRecurrenceEditorEnd {
+        after?: string;
+        occurrence?: string;
+        label?: string;
+        never?: string;
+        mobileLabel?: string;
+        on?: string;
+    }
+
+    interface SchedulerMessagesRecurrenceEditorFrequencies {
+        daily?: string;
+        monthly?: string;
+        never?: string;
+        weekly?: string;
+        yearly?: string;
+    }
+
+    interface SchedulerMessagesRecurrenceEditorMonthly {
+        day?: string;
+        interval?: string;
+        repeatEvery?: string;
+        repeatOn?: string;
+    }
+
+    interface SchedulerMessagesRecurrenceEditorOffsetPositions {
+        first?: string;
+        second?: string;
+        third?: string;
+        fourth?: string;
+        last?: string;
+    }
+
+    interface SchedulerMessagesRecurrenceEditorWeekdays {
+        day?: string;
+        weekday?: string;
+        weekend?: string;
+    }
+
+    interface SchedulerMessagesRecurrenceEditorWeekly {
+        interval?: string;
+        repeatEvery?: string;
+        repeatOn?: string;
+    }
+
+    interface SchedulerMessagesRecurrenceEditorYearly {
+        of?: string;
+        repeatEvery?: string;
+        repeatOn?: string;
+        interval?: string;
+    }
+
+    interface SchedulerMessagesRecurrenceEditor {
+        daily?: SchedulerMessagesRecurrenceEditorDaily;
+        end?: SchedulerMessagesRecurrenceEditorEnd;
+        frequencies?: SchedulerMessagesRecurrenceEditorFrequencies;
+        monthly?: SchedulerMessagesRecurrenceEditorMonthly;
+        offsetPositions?: SchedulerMessagesRecurrenceEditorOffsetPositions;
+        weekly?: SchedulerMessagesRecurrenceEditorWeekly;
+        weekdays?: SchedulerMessagesRecurrenceEditorWeekdays;
+        yearly?: SchedulerMessagesRecurrenceEditorYearly;
+    }
+
+    interface SchedulerMessagesRecurrenceMessages {
+        deleteRecurring?: string;
+        deleteWindowOccurrence?: string;
+        deleteWindowSeries?: string;
+        deleteWindowTitle?: string;
+        editRecurring?: string;
+        editWindowOccurrence?: string;
+        editWindowSeries?: string;
+        editWindowTitle?: string;
+    }
+
+    interface SchedulerMessagesViews {
+        day?: string;
+        week?: string;
+        month?: string;
+        agenda?: string;
+    }
+
+    interface SchedulerMessages {
+        allDay?: string;
+        ariaEventLabel?: string;
+        ariaSlotLabel?: string;
+        cancel?: string;
+        date?: string;
+        deleteWindowTitle?: string;
+        destroy?: string;
+        event?: string;
+        defaultRowText?: string;
+        pdf?: string;
+        save?: string;
+        showFullDay?: string;
+        showWorkDay?: string;
+        time?: string;
+        today?: string;
+        editable?: SchedulerMessagesEditable;
+        editor?: SchedulerMessagesEditor;
+        recurrenceEditor?: SchedulerMessagesRecurrenceEditor;
+        recurrenceMessages?: SchedulerMessagesRecurrenceMessages;
+        views?: SchedulerMessagesViews;
+    }
+
+    interface SchedulerPdfMargin {
+        bottom?: number|string;
+        left?: number|string;
+        right?: number|string;
+        top?: number|string;
+    }
+
+    interface SchedulerPdf {
+        author?: string;
+        avoidLinks?: boolean|string;
+        creator?: string;
+        date?: Date;
+        fileName?: string;
+        forceProxy?: boolean;
+        keywords?: string;
+        landscape?: boolean;
+        margin?: SchedulerPdfMargin;
+        paperSize?: string|any;
+        proxyURL?: string;
+        proxyTarget?: string;
+        subject?: string;
+        title?: string;
+    }
+
+    interface SchedulerResource {
+        dataColorField?: string;
+        dataSource?: any|any|kendo.data.DataSource;
+        dataTextField?: string;
+        dataValueField?: string;
+        field?: string;
+        multiple?: boolean;
+        name?: string;
+        title?: string;
+        valuePrimitive?: boolean;
+    }
+
+    interface SchedulerToolbarItem {
+        name?: string;
+    }
+
+    interface SchedulerViewEditable {
+        create?: boolean;
+        destroy?: boolean;
+        update?: boolean;
+    }
+
+    interface SchedulerViewGroup {
+        orientation?: string;
+    }
+
+    interface SchedulerView {
+        allDayEventTemplate?: string|Function;
+        allDaySlot?: boolean;
+        allDaySlotTemplate?: string|Function;
+        columnWidth?: number;
+        dateHeaderTemplate?: string|Function;
+        dayTemplate?: string|Function;
+        editable?: SchedulerViewEditable;
+        endTime?: Date;
+        eventHeight?: number;
+        eventTemplate?: string|Function;
+        eventTimeTemplate?: string|Function;
+        group?: SchedulerViewGroup;
+        majorTick?: number;
+        majorTimeHeaderTemplate?: string|Function;
+        minorTickCount?: number;
+        minorTimeHeaderTemplate?: string|Function;
+        selected?: boolean;
+        selectedDateFormat?: string;
+        showWorkHours?: boolean;
+        slotTemplate?: string|Function;
+        startTime?: Date;
+        title?: string;
+        type?: string;
+        workWeekStart?: number;
+        workWeekEnd?: number;
+    }
+
+    interface SchedulerSelectOptions {
+        events?: any;
+        resources?: any;
+        start?: Date;
+        end?: Date;
+        isAllDay?: boolean;
+    }
+
+    interface SchedulerOptions {
+        name?: string;
+        allDayEventTemplate?: string|Function;
+        allDaySlot?: boolean;
+        autoBind?: boolean;
+        currentTimeMarker?: SchedulerCurrentTimeMarker;
+        dataSource?: any|any|kendo.data.SchedulerDataSource;
+        date?: Date;
+        dateHeaderTemplate?: string|Function;
+        editable?: SchedulerEditable;
+        endTime?: Date;
+        eventTemplate?: string|Function;
+        footer?: SchedulerFooter;
+        group?: SchedulerGroup;
+        height?: number|string;
+        majorTick?: number;
+        majorTimeHeaderTemplate?: string|Function;
+        max?: Date;
+        messages?: SchedulerMessages;
+        min?: Date;
+        minorTickCount?: number;
+        minorTimeHeaderTemplate?: string|Function;
+        mobile?: boolean|string;
+        pdf?: SchedulerPdf;
+        resources?: SchedulerResource[];
+        selectable?: boolean;
+        showWorkHours?: boolean;
+        snap?: boolean;
+        startTime?: Date;
+        timezone?: string;
+        toolbar?: SchedulerToolbarItem[];
+        views?: SchedulerView[];
+        groupHeaderTemplate?: string|Function;
+        width?: number|string;
+        workDayStart?: Date;
+        workDayEnd?: Date;
+        workWeekStart?: number;
+        workWeekEnd?: number;
+        add?(e: SchedulerAddEvent): void;
+        cancel?(e: SchedulerCancelEvent): void;
+        change?(e: SchedulerChangeEvent): void;
+        dataBinding?(e: SchedulerDataBindingEvent): void;
+        dataBound?(e: SchedulerDataBoundEvent): void;
+        edit?(e: SchedulerEditEvent): void;
+        moveStart?(e: SchedulerMoveStartEvent): void;
+        move?(e: SchedulerMoveEvent): void;
+        moveEnd?(e: SchedulerMoveEndEvent): void;
+        navigate?(e: SchedulerNavigateEvent): void;
+        pdfExport?(e: SchedulerPdfExportEvent): void;
+        remove?(e: SchedulerRemoveEvent): void;
+        resizeStart?(e: SchedulerResizeStartEvent): void;
+        resize?(e: SchedulerResizeEvent): void;
+        resizeEnd?(e: SchedulerResizeEndEvent): void;
+        save?(e: SchedulerSaveEvent): void;
+    }
+    interface SchedulerEvent {
+        sender: Scheduler;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface SchedulerAddEvent extends SchedulerEvent {
+        event?: any;
+    }
+
+    interface SchedulerCancelEvent extends SchedulerEvent {
+        container?: JQuery;
+        event?: kendo.data.SchedulerEvent;
+    }
+
+    interface SchedulerChangeEvent extends SchedulerEvent {
+        start?: Date;
+        end?: Date;
+        events?: any;
+        slots?: any;
+        resources?: any;
+    }
+
+    interface SchedulerDataBindingEvent extends SchedulerEvent {
+    }
+
+    interface SchedulerDataBoundEvent extends SchedulerEvent {
+    }
+
+    interface SchedulerEditEvent extends SchedulerEvent {
+        container?: JQuery;
+        event?: kendo.data.SchedulerEvent;
+    }
+
+    interface SchedulerMoveStartEvent extends SchedulerEvent {
+        event?: kendo.data.SchedulerEvent;
+    }
+
+    interface SchedulerMoveEvent extends SchedulerEvent {
+        event?: kendo.data.SchedulerEvent;
+        slot?: any;
+    }
+
+    interface SchedulerMoveEndEvent extends SchedulerEvent {
+        start?: Date;
+        end?: Date;
+        event?: kendo.data.SchedulerEvent;
+        slot?: any;
+        resources?: any;
+    }
+
+    interface SchedulerNavigateEvent extends SchedulerEvent {
+        action?: string;
+        date?: Date;
+        view?: string;
+    }
+
+    interface SchedulerPdfExportEvent extends SchedulerEvent {
+        promise?: JQueryPromise<any>;
+    }
+
+    interface SchedulerRemoveEvent extends SchedulerEvent {
+        event?: kendo.data.SchedulerEvent;
+    }
+
+    interface SchedulerResizeStartEvent extends SchedulerEvent {
+        event?: kendo.data.SchedulerEvent;
+    }
+
+    interface SchedulerResizeEvent extends SchedulerEvent {
+        event?: kendo.data.SchedulerEvent;
+        slot?: any;
+    }
+
+    interface SchedulerResizeEndEvent extends SchedulerEvent {
+        event?: kendo.data.SchedulerEvent;
+        slot?: any;
+    }
+
+    interface SchedulerSaveEvent extends SchedulerEvent {
+        container?: JQuery;
+        event?: kendo.data.SchedulerEvent;
+    }
+
+
+    class Slider extends kendo.ui.Widget {
+
+        static fn: Slider;
+
+        options: SliderOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Slider;
+
+        constructor(element: Element, options?: SliderOptions);
+
+
+        destroy(): void;
+        enable(enable: boolean): void;
+        value(): number;
+        value(value: number): void;
+        resize(): void;
+
+    }
+
+    interface SliderTooltip {
+        enabled?: boolean;
+        format?: string;
+        template?: string;
+    }
+
+    interface SliderOptions {
+        name?: string;
+        decreaseButtonTitle?: string;
+        increaseButtonTitle?: string;
+        largeStep?: number;
+        max?: number;
+        min?: number;
+        orientation?: string;
+        showButtons?: boolean;
+        smallStep?: number;
+        tickPlacement?: string;
+        tooltip?: SliderTooltip;
+        value?: number;
+        change?(e: SliderChangeEvent): void;
+        slide?(e: SliderSlideEvent): void;
+    }
+    interface SliderEvent {
+        sender: Slider;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface SliderChangeEvent extends SliderEvent {
+        value?: number;
+    }
+
+    interface SliderSlideEvent extends SliderEvent {
+        value?: number;
+    }
+
+
+    class Sortable extends kendo.ui.Widget {
+
+        static fn: Sortable;
+
+        options: SortableOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Sortable;
+
+        constructor(element: Element, options?: SortableOptions);
+
+
+        indexOf(element: JQuery): number;
+        items(): JQuery;
+
+    }
+
+    interface SortableCursorOffset {
+        left?: number;
+        top?: number;
+    }
+
+    interface SortableOptions {
+        name?: string;
+        axis?: string;
+        autoScroll?: boolean;
+        container?: string|JQuery;
+        connectWith?: string;
+        cursor?: string;
+        cursorOffset?: SortableCursorOffset;
+        disabled?: string;
+        filter?: string;
+        handler?: string;
+        hint?: Function|string|JQuery;
+        holdToDrag?: boolean;
+        ignore?: string;
+        placeholder?: Function|string|JQuery;
+        start?(e: SortableStartEvent): void;
+        move?(e: SortableMoveEvent): void;
+        end?(e: SortableEndEvent): void;
+        change?(e: SortableChangeEvent): void;
+        cancel?(e: SortableCancelEvent): void;
+    }
+    interface SortableEvent {
+        sender: Sortable;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface SortableStartEvent extends SortableEvent {
+        draggableEvent?: any;
+        item?: JQuery;
+    }
+
+    interface SortableMoveEvent extends SortableEvent {
+        item?: JQuery;
+        target?: JQuery;
+        list?: kendo.ui.Sortable;
+        draggableEvent?: any;
+    }
+
+    interface SortableEndEvent extends SortableEvent {
+        action?: string;
+        item?: JQuery;
+        oldIndex?: number;
+        newIndex?: number;
+        draggableEvent?: any;
+    }
+
+    interface SortableChangeEvent extends SortableEvent {
+        action?: string;
+        item?: JQuery;
+        oldIndex?: number;
+        newIndex?: number;
+        draggableEvent?: any;
+    }
+
+    interface SortableCancelEvent extends SortableEvent {
+        item?: JQuery;
+    }
+
+
+    class Splitter extends kendo.ui.Widget {
+
+        static fn: Splitter;
+
+        options: SplitterOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Splitter;
+
+        constructor(element: Element, options?: SplitterOptions);
+
+
+        ajaxRequest(pane: string, url: string, data: any): void;
+        ajaxRequest(pane: string, url: string, data: string): void;
+        ajaxRequest(pane: Element, url: string, data: any): void;
+        ajaxRequest(pane: Element, url: string, data: string): void;
+        ajaxRequest(pane: JQuery, url: string, data: any): void;
+        ajaxRequest(pane: JQuery, url: string, data: string): void;
+        append(config?: any): JQuery;
+        collapse(pane: string): void;
+        collapse(pane: Element): void;
+        collapse(pane: JQuery): void;
+        destroy(): void;
+        expand(pane: string): void;
+        expand(pane: Element): void;
+        expand(pane: JQuery): void;
+        insertAfter(config: any, referencePane: string): JQuery;
+        insertAfter(config: any, referencePane: Element): JQuery;
+        insertAfter(config: any, referencePane: JQuery): JQuery;
+        insertBefore(config: any, referencePane: string): JQuery;
+        insertBefore(config: any, referencePane: Element): JQuery;
+        insertBefore(config: any, referencePane: JQuery): JQuery;
+        max(pane: string, value: string): void;
+        max(pane: Element, value: string): void;
+        max(pane: JQuery, value: string): void;
+        min(pane: string, value: string): void;
+        min(pane: Element, value: string): void;
+        min(pane: JQuery, value: string): void;
+        remove(pane: string): void;
+        remove(pane: Element): void;
+        remove(pane: JQuery): void;
+        size(pane: string, value: string): void;
+        size(pane: Element, value: string): void;
+        size(pane: JQuery, value: string): void;
+        toggle(pane: string, expand?: boolean): void;
+        toggle(pane: Element, expand?: boolean): void;
+        toggle(pane: JQuery, expand?: boolean): void;
+
+    }
+
+    interface SplitterPane {
+        collapsed?: boolean;
+        collapsedSize?: string;
+        collapsible?: boolean;
+        contentUrl?: string;
+        max?: string;
+        min?: string;
+        resizable?: boolean;
+        scrollable?: boolean;
+        size?: string;
+    }
+
+    interface SplitterOptions {
+        name?: string;
+        orientation?: string;
+        panes?: SplitterPane[];
+        collapse?(e: SplitterCollapseEvent): void;
+        contentLoad?(e: SplitterContentLoadEvent): void;
+        error?(e: SplitterErrorEvent): void;
+        expand?(e: SplitterExpandEvent): void;
+        layoutChange?(e: SplitterEvent): void;
+        resize?(e: SplitterEvent): void;
+    }
+    interface SplitterEvent {
+        sender: Splitter;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface SplitterCollapseEvent extends SplitterEvent {
+        pane?: Element;
+    }
+
+    interface SplitterContentLoadEvent extends SplitterEvent {
+        pane?: Element;
+    }
+
+    interface SplitterErrorEvent extends SplitterEvent {
+        xhr?: JQueryXHR;
+        status?: string;
+    }
+
+    interface SplitterExpandEvent extends SplitterEvent {
+        pane?: Element;
+    }
+
+
+    class Spreadsheet extends kendo.ui.Widget {
+
+        static fn: Spreadsheet;
+
+        options: SpreadsheetOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Spreadsheet;
+
+        constructor(element: Element, options?: SpreadsheetOptions);
+
+
+        activeSheet(): kendo.spreadsheet.Sheet;
+        activeSheet(sheet?: kendo.spreadsheet.Sheet): void;
+        sheets(): any;
+        fromFile(blob: Blob): JQueryPromise<any>;
+        fromFile(blob: File): JQueryPromise<any>;
+        saveAsExcel(): void;
+        saveAsPDF(): JQueryPromise<any>;
+        sheetByName(name: string): kendo.spreadsheet.Sheet;
+        sheetIndex(sheet: kendo.spreadsheet.Sheet): number;
+        sheetByIndex(index: number): kendo.spreadsheet.Sheet;
+        insertSheet(options: any): kendo.spreadsheet.Sheet;
+        moveSheetToIndex(sheet: kendo.spreadsheet.Sheet, index: number): void;
+        removeSheet(sheet: kendo.spreadsheet.Sheet): void;
+        renameSheet(sheet: kendo.spreadsheet.Sheet, newSheetName: string): kendo.spreadsheet.Sheet;
+        toJSON(): any;
+        fromJSON(data: any): void;
+
+    }
+
+    interface SpreadsheetExcel {
+        fileName?: string;
+        forceProxy?: boolean;
+        proxyURL?: string;
+    }
+
+    interface SpreadsheetPdfMargin {
+        bottom?: number|string;
+        left?: number|string;
+        right?: number|string;
+        top?: number|string;
+    }
+
+    interface SpreadsheetPdf {
+        area?: string;
+        author?: string;
+        creator?: string;
+        date?: Date;
+        fileName?: string;
+        fitWidth?: boolean;
+        forceProxy?: boolean;
+        guidelines?: boolean;
+        hCenter?: boolean;
+        keywords?: string;
+        landscape?: boolean;
+        margin?: SpreadsheetPdfMargin;
+        paperSize?: string|any;
+        proxyURL?: string;
+        proxyTarget?: string;
+        subject?: string;
+        title?: string;
+        vCenter?: boolean;
+    }
+
+    interface SpreadsheetSheetColumn {
+        index?: number;
+        width?: number;
+    }
+
+    interface SpreadsheetSheetFilterColumnCriteriaItem {
+        operator?: string;
+        value?: string;
+    }
+
+    interface SpreadsheetSheetFilterColumn {
+        criteria?: SpreadsheetSheetFilterColumnCriteriaItem[];
+        filter?: string;
+        index?: number;
+        logic?: string;
+        type?: string;
+        value?: number|string|Date;
+        values?: any;
+    }
+
+    interface SpreadsheetSheetFilter {
+        columns?: SpreadsheetSheetFilterColumn[];
+        ref?: string;
+    }
+
+    interface SpreadsheetSheetRowCellBorderBottom {
+        color?: string;
+        size?: string;
+    }
+
+    interface SpreadsheetSheetRowCellBorderLeft {
+        color?: string;
+        size?: string;
+    }
+
+    interface SpreadsheetSheetRowCellBorderRight {
+        color?: string;
+        size?: string;
+    }
+
+    interface SpreadsheetSheetRowCellBorderTop {
+        color?: string;
+        size?: string;
+    }
+
+    interface SpreadsheetSheetRowCellValidation {
+        type?: string;
+        comparerType?: string;
+        dataType?: string;
+        from?: string;
+        to?: string;
+        allowNulls?: boolean;
+        messageTemplate?: string;
+        titleTemplate?: string;
+    }
+
+    interface SpreadsheetSheetRowCell {
+        background?: string;
+        borderBottom?: SpreadsheetSheetRowCellBorderBottom;
+        borderLeft?: SpreadsheetSheetRowCellBorderLeft;
+        borderTop?: SpreadsheetSheetRowCellBorderTop;
+        borderRight?: SpreadsheetSheetRowCellBorderRight;
+        color?: string;
+        fontFamily?: string;
+        fontSize?: number;
+        italic?: boolean;
+        bold?: boolean;
+        enable?: boolean;
+        format?: string;
+        formula?: string;
+        index?: number;
+        textAlign?: string;
+        underline?: boolean;
+        value?: number|string|boolean|Date;
+        validation?: SpreadsheetSheetRowCellValidation;
+        verticalAlign?: string;
+        wrap?: boolean;
+    }
+
+    interface SpreadsheetSheetRow {
+        cells?: SpreadsheetSheetRowCell[];
+        height?: number;
+        index?: number;
+    }
+
+    interface SpreadsheetSheetSortColumn {
+        ascending?: boolean;
+        index?: number;
+    }
+
+    interface SpreadsheetSheetSort {
+        columns?: SpreadsheetSheetSortColumn[];
+        ref?: string;
+    }
+
+    interface SpreadsheetSheet {
+        activeCell?: string;
+        name?: string;
+        columns?: SpreadsheetSheetColumn[];
+        dataSource?: kendo.data.DataSource;
+        filter?: SpreadsheetSheetFilter;
+        frozenColumns?: number;
+        frozenRows?: number;
+        mergedCells?: any;
+        rows?: SpreadsheetSheetRow[];
+        selection?: string;
+        showGridLines?: boolean;
+        sort?: SpreadsheetSheetSort;
+    }
+
+    interface SpreadsheetToolbar {
+        home?: boolean|any;
+        insert?: boolean|any;
+        data?: boolean|any;
+    }
+
+    interface SpreadsheetInsertSheetOptions {
+        rows?: number;
+        columns?: number;
+        rowHeight?: number;
+        columnWidth?: number;
+        headerHeight?: number;
+        headerWidth?: number;
+        dataSource?: kendo.data.DataSource;
+        data?: any;
+    }
+
+    interface SpreadsheetOptions {
+        name?: string;
+        activeSheet?: string;
+        columnWidth?: number;
+        columns?: number;
+        headerHeight?: number;
+        headerWidth?: number;
+        excel?: SpreadsheetExcel;
+        pdf?: SpreadsheetPdf;
+        rowHeight?: number;
+        rows?: number;
+        sheets?: SpreadsheetSheet[];
+        sheetsbar?: boolean;
+        toolbar?: SpreadsheetToolbar;
+        change?(e: SpreadsheetChangeEvent): void;
+        render?(e: SpreadsheetRenderEvent): void;
+        excelExport?(e: SpreadsheetExcelExportEvent): void;
+        excelImport?(e: SpreadsheetExcelImportEvent): void;
+        pdfExport?(e: SpreadsheetPdfExportEvent): void;
+    }
+    interface SpreadsheetEvent {
+        sender: Spreadsheet;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface SpreadsheetChangeEvent extends SpreadsheetEvent {
+        range?: kendo.spreadsheet.Range;
+    }
+
+    interface SpreadsheetRenderEvent extends SpreadsheetEvent {
+    }
+
+    interface SpreadsheetExcelExportEvent extends SpreadsheetEvent {
+        data?: any;
+        workbook?: kendo.ooxml.Workbook;
+    }
+
+    interface SpreadsheetExcelImportEvent extends SpreadsheetEvent {
+        file?: Blob|File;
+        progress?: JQueryPromise<any>;
+    }
+
+    interface SpreadsheetPdfExportEvent extends SpreadsheetEvent {
+        promise?: JQueryPromise<any>;
+    }
+
+
+    class TabStrip extends kendo.ui.Widget {
+
+        static fn: TabStrip;
+
+        options: TabStripOptions;
+
+        dataSource: kendo.data.DataSource;
+        tabGroup: JQuery;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): TabStrip;
+
+        constructor(element: Element, options?: TabStripOptions);
+
+
+        activateTab(item: JQuery): void;
+        append(tab: any): kendo.ui.TabStrip;
+        contentElement(itemIndex: number): Element;
+        contentHolder(itemIndex: number): Element;
+        deactivateTab(item: JQuery): void;
+        destroy(): void;
+        disable(element: string): kendo.ui.TabStrip;
+        disable(element: Element): kendo.ui.TabStrip;
+        disable(element: JQuery): kendo.ui.TabStrip;
+        enable(element: string, enable?: boolean): kendo.ui.TabStrip;
+        enable(element: Element, enable?: boolean): kendo.ui.TabStrip;
+        enable(element: JQuery, enable?: boolean): kendo.ui.TabStrip;
+        insertAfter(item: any, referenceTab: string): kendo.ui.TabStrip;
+        insertAfter(item: any, referenceTab: Element): kendo.ui.TabStrip;
+        insertAfter(item: any, referenceTab: JQuery): kendo.ui.TabStrip;
+        insertAfter(item: string, referenceTab: string): kendo.ui.TabStrip;
+        insertAfter(item: string, referenceTab: Element): kendo.ui.TabStrip;
+        insertAfter(item: string, referenceTab: JQuery): kendo.ui.TabStrip;
+        insertAfter(item: Element, referenceTab: string): kendo.ui.TabStrip;
+        insertAfter(item: Element, referenceTab: Element): kendo.ui.TabStrip;
+        insertAfter(item: Element, referenceTab: JQuery): kendo.ui.TabStrip;
+        insertAfter(item: JQuery, referenceTab: string): kendo.ui.TabStrip;
+        insertAfter(item: JQuery, referenceTab: Element): kendo.ui.TabStrip;
+        insertAfter(item: JQuery, referenceTab: JQuery): kendo.ui.TabStrip;
+        insertBefore(item: any, referenceTab: string): kendo.ui.TabStrip;
+        insertBefore(item: any, referenceTab: Element): kendo.ui.TabStrip;
+        insertBefore(item: any, referenceTab: JQuery): kendo.ui.TabStrip;
+        insertBefore(item: string, referenceTab: string): kendo.ui.TabStrip;
+        insertBefore(item: string, referenceTab: Element): kendo.ui.TabStrip;
+        insertBefore(item: string, referenceTab: JQuery): kendo.ui.TabStrip;
+        insertBefore(item: Element, referenceTab: string): kendo.ui.TabStrip;
+        insertBefore(item: Element, referenceTab: Element): kendo.ui.TabStrip;
+        insertBefore(item: Element, referenceTab: JQuery): kendo.ui.TabStrip;
+        insertBefore(item: JQuery, referenceTab: string): kendo.ui.TabStrip;
+        insertBefore(item: JQuery, referenceTab: Element): kendo.ui.TabStrip;
+        insertBefore(item: JQuery, referenceTab: JQuery): kendo.ui.TabStrip;
+        items(): HTMLCollection;
+        reload(element: string): kendo.ui.TabStrip;
+        reload(element: Element): kendo.ui.TabStrip;
+        reload(element: JQuery): kendo.ui.TabStrip;
+        remove(element: string): kendo.ui.TabStrip;
+        remove(element: number): kendo.ui.TabStrip;
+        remove(element: JQuery): kendo.ui.TabStrip;
+        select(): JQuery;
+        select(element: string): void;
+        select(element: Element): void;
+        select(element: JQuery): void;
+        select(element: number): void;
+        setDataSource(dataSource: any): void;
+        setDataSource(dataSource: kendo.data.DataSource): void;
+
+    }
+
+    interface TabStripAnimationClose {
+        duration?: number;
+        effects?: string;
+    }
+
+    interface TabStripAnimationOpen {
+        duration?: number;
+        effects?: string;
+    }
+
+    interface TabStripAnimation {
+        close?: TabStripAnimationClose;
+        open?: TabStripAnimationOpen;
+    }
+
+    interface TabStripScrollable {
+        distance?: number;
+    }
+
+    interface TabStripOptions {
+        name?: string;
+        animation?: TabStripAnimation;
+        collapsible?: boolean;
+        contentUrls?: any;
+        dataContentField?: string;
+        dataContentUrlField?: string;
+        dataImageUrlField?: string;
+        dataSource?: any|any|kendo.data.DataSource;
+        dataSpriteCssClass?: string;
+        dataTextField?: string;
+        dataUrlField?: string;
+        navigatable?: boolean;
+        scrollable?: TabStripScrollable;
+        tabPosition?: string;
+        value?: string;
+        activate?(e: TabStripActivateEvent): void;
+        contentLoad?(e: TabStripContentLoadEvent): void;
+        error?(e: TabStripErrorEvent): void;
+        select?(e: TabStripSelectEvent): void;
+        show?(e: TabStripShowEvent): void;
+    }
+    interface TabStripEvent {
+        sender: TabStrip;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface TabStripActivateEvent extends TabStripEvent {
+        item?: Element;
+        contentElement?: Element;
+    }
+
+    interface TabStripContentLoadEvent extends TabStripEvent {
+        item?: Element;
+        contentElement?: Element;
+    }
+
+    interface TabStripErrorEvent extends TabStripEvent {
+        xhr?: JQueryXHR;
+        status?: string;
+    }
+
+    interface TabStripSelectEvent extends TabStripEvent {
+        item?: Element;
+        contentElement?: Element;
+    }
+
+    interface TabStripShowEvent extends TabStripEvent {
+        item?: Element;
+        contentElement?: Element;
+    }
+
+
+    class TimePicker extends kendo.ui.Widget {
+
+        static fn: TimePicker;
+
+        options: TimePickerOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): TimePicker;
+
+        constructor(element: Element, options?: TimePickerOptions);
+
+
+        close(): void;
+        destroy(): void;
+        enable(enable: boolean): void;
+        readonly(readonly: boolean): void;
+        max(): Date;
+        max(value: Date): void;
+        max(value: string): void;
+        min(): Date;
+        min(value: Date): void;
+        min(value: string): void;
+        open(): void;
+        setOptions(options: any): void;
+        value(): Date;
+        value(value: Date): void;
+        value(value: string): void;
+
+    }
+
+    interface TimePickerAnimationClose {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface TimePickerAnimationOpen {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface TimePickerAnimation {
+        close?: TimePickerAnimationClose;
+        open?: TimePickerAnimationOpen;
+    }
+
+    interface TimePickerOptions {
+        name?: string;
+        animation?: TimePickerAnimation;
+        culture?: string;
+        dates?: any;
+        format?: string;
+        interval?: number;
+        max?: Date;
+        min?: Date;
+        parseFormats?: any;
+        value?: Date;
+        change?(e: TimePickerChangeEvent): void;
+        close?(e: TimePickerCloseEvent): void;
+        open?(e: TimePickerOpenEvent): void;
+    }
+    interface TimePickerEvent {
+        sender: TimePicker;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface TimePickerChangeEvent extends TimePickerEvent {
+    }
+
+    interface TimePickerCloseEvent extends TimePickerEvent {
+    }
+
+    interface TimePickerOpenEvent extends TimePickerEvent {
+    }
+
+
+    class ToolBar extends kendo.ui.Widget {
+
+        static fn: ToolBar;
+
+        options: ToolBarOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): ToolBar;
+
+        constructor(element: Element, options?: ToolBarOptions);
+
+
+        add(command: any): void;
+        destroy(): void;
+        enable(command: string, enable: boolean): void;
+        enable(command: Element, enable: boolean): void;
+        enable(command: JQuery, enable: boolean): void;
+        getSelectedFromGroup(groupName: string): void;
+        hide(command: string): void;
+        hide(command: Element): void;
+        hide(command: JQuery): void;
+        remove(command: string): void;
+        remove(command: Element): void;
+        remove(command: JQuery): void;
+        show(command: string): void;
+        show(command: Element): void;
+        show(command: JQuery): void;
+        toggle(): void;
+
+    }
+
+    interface ToolBarItemButton {
+        attributes?: any;
+        click?: Function;
+        enable?: boolean;
+        group?: string;
+        hidden?: boolean;
+        icon?: string;
+        id?: string;
+        imageUrl?: string;
+        selected?: boolean;
+        showIcon?: string;
+        showText?: string;
+        spriteCssClass?: string;
+        toggle?: Function;
+        togglable?: boolean;
+        text?: string;
+        url?: string;
+    }
+
+    interface ToolBarItemMenuButton {
+        attributes?: any;
+        enable?: boolean;
+        hidden?: boolean;
+        icon?: string;
+        id?: string;
+        imageUrl?: string;
+        spriteCssClass?: string;
+        text?: string;
+        url?: string;
+    }
+
+    interface ToolBarItem {
+        attributes?: any;
+        buttons?: ToolBarItemButton[];
+        click?: Function;
+        enable?: boolean;
+        group?: string;
+        hidden?: boolean;
+        icon?: string;
+        id?: string;
+        imageUrl?: string;
+        menuButtons?: ToolBarItemMenuButton[];
+        overflow?: string;
+        overflowTemplate?: string|Function;
+        primary?: boolean;
+        selected?: boolean;
+        showIcon?: string;
+        showText?: string;
+        spriteCssClass?: string;
+        template?: string|Function;
+        text?: string;
+        togglable?: boolean;
+        toggle?: Function;
+        type?: string;
+        url?: string;
+    }
+
+    interface ToolBarOptions {
+        name?: string;
+        resizable?: boolean;
+        items?: ToolBarItem[];
+        click?(e: ToolBarClickEvent): void;
+        close?(e: ToolBarCloseEvent): void;
+        open?(e: ToolBarOpenEvent): void;
+        toggle?(e: ToolBarToggleEvent): void;
+        overflowClose?(e: ToolBarOverflowCloseEvent): void;
+        overflowOpen?(e: ToolBarOverflowOpenEvent): void;
+    }
+    interface ToolBarEvent {
+        sender: ToolBar;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface ToolBarClickEvent extends ToolBarEvent {
+        target?: JQuery;
+        id?: string;
+    }
+
+    interface ToolBarCloseEvent extends ToolBarEvent {
+        SplitButton?: JQuery;
+    }
+
+    interface ToolBarOpenEvent extends ToolBarEvent {
+        SplitButton?: JQuery;
+    }
+
+    interface ToolBarToggleEvent extends ToolBarEvent {
+        target?: JQuery;
+        checked?: boolean;
+        id?: string;
+    }
+
+    interface ToolBarOverflowCloseEvent extends ToolBarEvent {
+    }
+
+    interface ToolBarOverflowOpenEvent extends ToolBarEvent {
+    }
+
+
+    class Tooltip extends kendo.ui.Widget {
+
+        static fn: Tooltip;
+
+        options: TooltipOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Tooltip;
+
+        constructor(element: Element, options?: TooltipOptions);
+
+
+        show(element: JQuery): void;
+        hide(): void;
+        refresh(): void;
+        target(): JQuery;
+
+    }
+
+    interface TooltipAnimationClose {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface TooltipAnimationOpen {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface TooltipAnimation {
+        close?: TooltipAnimationClose;
+        open?: TooltipAnimationOpen;
+    }
+
+    interface TooltipContent {
+        url?: string;
+    }
+
+    interface TooltipOptions {
+        name?: string;
+        autoHide?: boolean;
+        animation?: TooltipAnimation;
+        content?: TooltipContent;
+        callout?: boolean;
+        filter?: string;
+        iframe?: boolean;
+        height?: number;
+        width?: number;
+        position?: string;
+        showAfter?: number;
+        showOn?: string;
+        contentLoad?(e: TooltipEvent): void;
+        show?(e: TooltipEvent): void;
+        hide?(e: TooltipEvent): void;
+        requestStart?(e: TooltipRequestStartEvent): void;
+        error?(e: TooltipErrorEvent): void;
+    }
+    interface TooltipEvent {
+        sender: Tooltip;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface TooltipRequestStartEvent extends TooltipEvent {
+        target?: JQuery;
+        options?: any;
+    }
+
+    interface TooltipErrorEvent extends TooltipEvent {
+        xhr?: JQueryXHR;
+        status?: string;
+    }
+
+
+    class Touch extends kendo.ui.Widget {
+
+        static fn: Touch;
+
+        options: TouchOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Touch;
+
+        constructor(element: Element, options?: TouchOptions);
+
+
+        cancel(): void;
+        destroy(): void;
+
+    }
+
+    interface TouchOptions {
+        name?: string;
+        filter?: string;
+        surface?: JQuery;
+        multiTouch?: boolean;
+        enableSwipe?: boolean;
+        minXDelta?: number;
+        maxYDelta?: number;
+        maxDuration?: number;
+        minHold?: number;
+        doubleTapTimeout?: number;
+        touchstart?(e: TouchTouchstartEvent): void;
+        dragstart?(e: TouchDragstartEvent): void;
+        drag?(e: TouchDragEvent): void;
+        dragend?(e: TouchDragendEvent): void;
+        tap?(e: TouchTapEvent): void;
+        doubletap?(e: TouchDoubletapEvent): void;
+        hold?(e: TouchHoldEvent): void;
+        swipe?(e: TouchSwipeEvent): void;
+        gesturestart?(e: TouchGesturestartEvent): void;
+        gesturechange?(e: TouchGesturechangeEvent): void;
+        gestureend?(e: TouchGestureendEvent): void;
+    }
+    interface TouchEvent {
+        sender: Touch;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface TouchTouchstartEvent extends TouchEvent {
+        touch?: kendo.mobile.ui.TouchEventOptions;
+        event?: JQueryEventObject;
+    }
+
+    interface TouchDragstartEvent extends TouchEvent {
+        touch?: kendo.mobile.ui.TouchEventOptions;
+        event?: JQueryEventObject;
+    }
+
+    interface TouchDragEvent extends TouchEvent {
+        touch?: kendo.mobile.ui.TouchEventOptions;
+        event?: JQueryEventObject;
+    }
+
+    interface TouchDragendEvent extends TouchEvent {
+        touch?: kendo.mobile.ui.TouchEventOptions;
+        event?: JQueryEventObject;
+    }
+
+    interface TouchTapEvent extends TouchEvent {
+        touch?: kendo.mobile.ui.TouchEventOptions;
+        event?: JQueryEventObject;
+    }
+
+    interface TouchDoubletapEvent extends TouchEvent {
+        touch?: kendo.mobile.ui.TouchEventOptions;
+        event?: JQueryEventObject;
+    }
+
+    interface TouchHoldEvent extends TouchEvent {
+        touch?: kendo.mobile.ui.TouchEventOptions;
+        event?: JQueryEventObject;
+    }
+
+    interface TouchSwipeEvent extends TouchEvent {
+        touch?: kendo.mobile.ui.TouchEventOptions;
+        event?: JQueryEventObject;
+    }
+
+    interface TouchGesturestartEvent extends TouchEvent {
+        touches?: any;
+        event?: JQueryEventObject;
+        distance?: number;
+        center?: kendo.mobile.ui.Point;
+    }
+
+    interface TouchGesturechangeEvent extends TouchEvent {
+        touches?: any;
+        event?: JQueryEventObject;
+        distance?: number;
+        center?: kendo.mobile.ui.Point;
+    }
+
+    interface TouchGestureendEvent extends TouchEvent {
+        touches?: any;
+        event?: JQueryEventObject;
+        distance?: number;
+        center?: kendo.mobile.ui.Point;
+    }
+
+
+    class TreeList extends kendo.ui.Widget {
+
+        static fn: TreeList;
+
+        options: TreeListOptions;
+
+        dataSource: kendo.data.DataSource;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): TreeList;
+
+        constructor(element: Element, options?: TreeListOptions);
+
+
+        addRow(parentRow: string): void;
+        addRow(parentRow: Element): void;
+        addRow(parentRow: JQuery): void;
+        cancelRow(): void;
+        clearSelection(): void;
+        collapse(): void;
+        dataItem(row: string): kendo.data.TreeListModel;
+        dataItem(row: Element): kendo.data.TreeListModel;
+        dataItem(row: JQuery): kendo.data.TreeListModel;
+        destroy(): void;
+        editRow(row: JQuery): void;
+        expand(row: string): void;
+        expand(row: Element): void;
+        expand(row: JQuery): void;
+        itemFor(model: kendo.data.TreeListModel): JQuery;
+        itemFor(model: any): JQuery;
+        items(): any;
+        refresh(): void;
+        removeRow(row: string): void;
+        removeRow(row: Element): void;
+        removeRow(row: JQuery): void;
+        saveAsExcel(): void;
+        saveAsPDF(): JQueryPromise<any>;
+        saveRow(): void;
+        select(): JQuery;
+        select(rows: Element): void;
+        select(rows: JQuery): void;
+        setDataSource(dataSource: kendo.data.TreeListDataSource): void;
+        showColumn(column: number): void;
+        showColumn(column: string): void;
+        hideColumn(column: number): void;
+        hideColumn(column: string): void;
+        lockColumn(column: number): void;
+        lockColumn(column: string): void;
+        unlockColumn(column: number): void;
+        unlockColumn(column: string): void;
+        reorderColumn(destIndex: number, column: any): void;
+
+    }
+
+    interface TreeListColumnMenuMessages {
+        columns?: string;
+        filter?: string;
+        sortAscending?: string;
+        sortDescending?: string;
+    }
+
+    interface TreeListColumnMenu {
+        columns?: boolean;
+        filterable?: boolean;
+        sortable?: boolean;
+        messages?: TreeListColumnMenuMessages;
+    }
+
+    interface TreeListColumnCommandItem {
+        className?: string;
+        click?: Function;
+        name?: string;
+        text?: string;
+    }
+
+    interface TreeListColumnFilterable {
+        ui?: string|Function;
+    }
+
+    interface TreeListColumnSortable {
+        compare?: Function;
+    }
+
+    interface TreeListColumn {
+        attributes?: any;
+        command?: TreeListColumnCommandItem[];
+        encoded?: boolean;
+        expandable?: boolean;
+        field?: string;
+        filterable?: TreeListColumnFilterable;
+        footerTemplate?: string|Function;
+        format?: string;
+        headerAttributes?: any;
+        headerTemplate?: string|Function;
+        minScreenWidth?: number;
+        sortable?: TreeListColumnSortable;
+        template?: string|Function;
+        title?: string;
+        width?: string|number;
+        hidden?: boolean;
+        menu?: boolean;
+        locked?: boolean;
+        lockable?: boolean;
+    }
+
+    interface TreeListEditable {
+        mode?: string;
+        move?: boolean;
+        template?: string|Function;
+        window?: any;
+    }
+
+    interface TreeListExcel {
+        fileName?: string;
+        filterable?: boolean;
+        forceProxy?: boolean;
+        proxyURL?: string;
+    }
+
+    interface TreeListFilterableMessages {
+        and?: string;
+        clear?: string;
+        filter?: string;
+        info?: string;
+        isFalse?: string;
+        isTrue?: string;
+        or?: string;
+        selectValue?: string;
+        cancel?: string;
+        operator?: string;
+    }
+
+    interface TreeListFilterable {
+        extra?: boolean;
+        messages?: TreeListFilterableMessages;
+    }
+
+    interface TreeListMessagesCommands {
+        canceledit?: string;
+        create?: string;
+        createchild?: string;
+        destroy?: string;
+        edit?: string;
+        excel?: string;
+        pdf?: string;
+        update?: string;
+    }
+
+    interface TreeListMessages {
+        commands?: TreeListMessagesCommands;
+        loading?: string;
+        noRows?: string;
+        requestFailed?: string;
+        retry?: string;
+    }
+
+    interface TreeListPdfMargin {
+        bottom?: number|string;
+        left?: number|string;
+        right?: number|string;
+        top?: number|string;
+    }
+
+    interface TreeListPdf {
+        author?: string;
+        avoidLinks?: boolean|string;
+        creator?: string;
+        date?: Date;
+        fileName?: string;
+        forceProxy?: boolean;
+        keywords?: string;
+        landscape?: boolean;
+        margin?: TreeListPdfMargin;
+        paperSize?: string|any;
+        proxyURL?: string;
+        proxyTarget?: string;
+        subject?: string;
+        title?: string;
+    }
+
+    interface TreeListSortable {
+        allowUnsort?: boolean;
+        mode?: string;
+    }
+
+    interface TreeListToolbarItem {
+        name?: string;
+        text?: string;
+    }
+
+    interface TreeListOptions {
+        name?: string;
+        autoBind?: boolean;
+        columns?: TreeListColumn[];
+        resizable?: boolean;
+        reorderable?: boolean;
+        columnMenu?: TreeListColumnMenu;
+        dataSource?: any|any|kendo.data.TreeListDataSource;
+        editable?: TreeListEditable;
+        excel?: TreeListExcel;
+        filterable?: TreeListFilterable;
+        height?: number|string;
+        messages?: TreeListMessages;
+        pdf?: TreeListPdf;
+        scrollable?: boolean|any;
+        selectable?: boolean|string;
+        sortable?: TreeListSortable;
+        toolbar?: TreeListToolbarItem[];
+        cancel?(e: TreeListCancelEvent): void;
+        change?(e: TreeListChangeEvent): void;
+        collapse?(e: TreeListCollapseEvent): void;
+        dataBinding?(e: TreeListDataBindingEvent): void;
+        dataBound?(e: TreeListDataBoundEvent): void;
+        dragstart?(e: TreeListDragstartEvent): void;
+        drag?(e: TreeListDragEvent): void;
+        dragend?(e: TreeListDragendEvent): void;
+        drop?(e: TreeListDropEvent): void;
+        edit?(e: TreeListEditEvent): void;
+        excelExport?(e: TreeListExcelExportEvent): void;
+        expand?(e: TreeListExpandEvent): void;
+        filterMenuInit?(e: TreeListFilterMenuInitEvent): void;
+        pdfExport?(e: TreeListPdfExportEvent): void;
+        remove?(e: TreeListRemoveEvent): void;
+        save?(e: TreeListSaveEvent): void;
+        columnShow?(e: TreeListColumnShowEvent): void;
+        columnHide?(e: TreeListColumnHideEvent): void;
+        columnReorder?(e: TreeListColumnReorderEvent): void;
+        columnResize?(e: TreeListColumnResizeEvent): void;
+        columnMenuInit?(e: TreeListColumnMenuInitEvent): void;
+        columnLock?(e: TreeListColumnLockEvent): void;
+        columnUnlock?(e: TreeListColumnUnlockEvent): void;
+    }
+    interface TreeListEvent {
+        sender: TreeList;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface TreeListCancelEvent extends TreeListEvent {
+        container?: JQuery;
+        model?: kendo.data.TreeListModel;
+    }
+
+    interface TreeListChangeEvent extends TreeListEvent {
+    }
+
+    interface TreeListCollapseEvent extends TreeListEvent {
+        model?: kendo.data.TreeListModel;
+    }
+
+    interface TreeListDataBindingEvent extends TreeListEvent {
+    }
+
+    interface TreeListDataBoundEvent extends TreeListEvent {
+    }
+
+    interface TreeListDragstartEvent extends TreeListEvent {
+        source?: kendo.data.TreeListModel;
+    }
+
+    interface TreeListDragEvent extends TreeListEvent {
+        source?: kendo.data.TreeListModel;
+        target?: JQuery;
+    }
+
+    interface TreeListDragendEvent extends TreeListEvent {
+        source?: kendo.data.TreeListModel;
+        destination?: kendo.data.TreeListModel;
+    }
+
+    interface TreeListDropEvent extends TreeListEvent {
+        source?: kendo.data.TreeListModel;
+        destination?: kendo.data.TreeListModel;
+        valid?: boolean;
+        setValid?: boolean;
+    }
+
+    interface TreeListEditEvent extends TreeListEvent {
+        container?: JQuery;
+        model?: kendo.data.TreeListModel;
+    }
+
+    interface TreeListExcelExportEvent extends TreeListEvent {
+        data?: any;
+        workbook?: any;
+    }
+
+    interface TreeListExpandEvent extends TreeListEvent {
+        model?: kendo.data.TreeListModel;
+    }
+
+    interface TreeListFilterMenuInitEvent extends TreeListEvent {
+        container?: JQuery;
+        field?: string;
+    }
+
+    interface TreeListPdfExportEvent extends TreeListEvent {
+        promise?: JQueryPromise<any>;
+    }
+
+    interface TreeListRemoveEvent extends TreeListEvent {
+        model?: kendo.data.TreeListModel;
+        row?: JQuery;
+    }
+
+    interface TreeListSaveEvent extends TreeListEvent {
+        model?: kendo.data.TreeListModel;
+        container?: JQuery;
+    }
+
+    interface TreeListColumnShowEvent extends TreeListEvent {
+        column?: any;
+    }
+
+    interface TreeListColumnHideEvent extends TreeListEvent {
+        column?: any;
+    }
+
+    interface TreeListColumnReorderEvent extends TreeListEvent {
+        column?: any;
+        newIndex?: number;
+        oldIndex?: number;
+    }
+
+    interface TreeListColumnResizeEvent extends TreeListEvent {
+        column?: any;
+        newWidth?: number;
+        oldWidth?: number;
+    }
+
+    interface TreeListColumnMenuInitEvent extends TreeListEvent {
+        container?: JQuery;
+        field?: string;
+    }
+
+    interface TreeListColumnLockEvent extends TreeListEvent {
+        column?: any;
+    }
+
+    interface TreeListColumnUnlockEvent extends TreeListEvent {
+        column?: any;
+    }
+
+
+    class TreeView extends kendo.ui.Widget {
+
+        static fn: TreeView;
+
+        options: TreeViewOptions;
+
+        dataSource: kendo.data.DataSource;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): TreeView;
+
+        constructor(element: Element, options?: TreeViewOptions);
+
+
+        append(nodeData: any, parentNode?: JQuery, success?: Function): JQuery;
+        append(nodeData: JQuery, parentNode?: JQuery, success?: Function): JQuery;
+        collapse(nodes: JQuery): void;
+        collapse(nodes: Element): void;
+        collapse(nodes: string): void;
+        dataItem(node: JQuery): kendo.data.Node;
+        dataItem(node: Element): kendo.data.Node;
+        dataItem(node: string): kendo.data.Node;
+        destroy(): void;
+        detach(node: JQuery): JQuery;
+        detach(node: Element): JQuery;
+        detach(node: string): JQuery;
+        enable(nodes: JQuery, enable?: boolean): void;
+        enable(nodes: Element, enable?: boolean): void;
+        enable(nodes: string, enable?: boolean): void;
+        expand(nodes: JQuery): void;
+        expand(nodes: Element): void;
+        expand(nodes: string): void;
+        expandPath(path: any, complete: Function): void;
+        expandTo(targetNode: kendo.data.Node): void;
+        expandTo(targetNode: any): void;
+        findByText(text: string): JQuery;
+        findByUid(text: string): JQuery;
+        insertAfter(nodeData: any, referenceNode: JQuery): void;
+        insertBefore(nodeData: any, referenceNode: JQuery): void;
+        items(): any;
+        parent(node: JQuery): JQuery;
+        parent(node: Element): JQuery;
+        parent(node: string): JQuery;
+        remove(node: JQuery): void;
+        remove(node: Element): void;
+        remove(node: string): void;
+        select(): JQuery;
+        select(node?: JQuery): void;
+        select(node?: Element): void;
+        select(node?: string): void;
+        setDataSource(dataSource: kendo.data.HierarchicalDataSource): void;
+        text(node: JQuery): string;
+        text(node: Element): string;
+        text(node: string): string;
+        text(node: JQuery, newText: string): void;
+        text(node: Element, newText: string): void;
+        text(node: string, newText: string): void;
+        toggle(node: JQuery): void;
+        toggle(node: Element): void;
+        toggle(node: string): void;
+        updateIndeterminate(node: JQuery): void;
+
+    }
+
+    interface TreeViewAnimationCollapse {
+        duration?: number;
+        effects?: string;
+    }
+
+    interface TreeViewAnimationExpand {
+        duration?: number;
+        effects?: string;
+    }
+
+    interface TreeViewAnimation {
+        collapse?: TreeViewAnimationCollapse;
+        expand?: TreeViewAnimationExpand;
+    }
+
+    interface TreeViewCheckboxes {
+        checkChildren?: boolean;
+        name?: string;
+        template?: string|Function;
+    }
+
+    interface TreeViewMessages {
+        loading?: string;
+        requestFailed?: string;
+        retry?: string;
+    }
+
+    interface TreeViewOptions {
+        name?: string;
+        animation?: TreeViewAnimation;
+        autoBind?: boolean;
+        autoScroll?: boolean;
+        checkboxes?: TreeViewCheckboxes;
+        dataImageUrlField?: string;
+        dataSource?: any|any|kendo.data.HierarchicalDataSource;
+        dataSpriteCssClassField?: string;
+        dataTextField?: string|any;
+        dataUrlField?: string;
+        dragAndDrop?: boolean;
+        loadOnDemand?: boolean;
+        messages?: TreeViewMessages;
+        template?: string|Function;
+        change?(e: TreeViewEvent): void;
+        check?(e: TreeViewCheckEvent): void;
+        collapse?(e: TreeViewCollapseEvent): void;
+        dataBound?(e: TreeViewDataBoundEvent): void;
+        drag?(e: TreeViewDragEvent): void;
+        dragend?(e: TreeViewDragendEvent): void;
+        dragstart?(e: TreeViewDragstartEvent): void;
+        drop?(e: TreeViewDropEvent): void;
+        expand?(e: TreeViewExpandEvent): void;
+        navigate?(e: TreeViewNavigateEvent): void;
+        select?(e: TreeViewSelectEvent): void;
+    }
+    interface TreeViewEvent {
+        sender: TreeView;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface TreeViewCheckEvent extends TreeViewEvent {
+        node?: Element;
+    }
+
+    interface TreeViewCollapseEvent extends TreeViewEvent {
+        node?: Element;
+    }
+
+    interface TreeViewDataBoundEvent extends TreeViewEvent {
+        node?: JQuery;
+    }
+
+    interface TreeViewDragEvent extends TreeViewEvent {
+        sourceNode?: Element;
+        dropTarget?: Element;
+        pageX?: number;
+        pageY?: number;
+        statusClass?: string;
+        setStatusClass?: Function;
+    }
+
+    interface TreeViewDragendEvent extends TreeViewEvent {
+        sourceNode?: Element;
+        destinationNode?: Element;
+        dropPosition?: string;
+    }
+
+    interface TreeViewDragstartEvent extends TreeViewEvent {
+        sourceNode?: Element;
+    }
+
+    interface TreeViewDropEvent extends TreeViewEvent {
+        sourceNode?: Element;
+        destinationNode?: Element;
+        valid?: boolean;
+        setValid?: Function;
+        dropTarget?: Element;
+        dropPosition?: string;
+    }
+
+    interface TreeViewExpandEvent extends TreeViewEvent {
+        node?: Element;
+    }
+
+    interface TreeViewNavigateEvent extends TreeViewEvent {
+        node?: Element;
+    }
+
+    interface TreeViewSelectEvent extends TreeViewEvent {
+        node?: Element;
+    }
+
+
+    class Upload extends kendo.ui.Widget {
+
+        static fn: Upload;
+
+        options: UploadOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Upload;
+
+        constructor(element: Element, options?: UploadOptions);
+
+
+        destroy(): void;
+        disable(): void;
+        enable(enable?: boolean): void;
+        toggle(enable: boolean): void;
+
+    }
+
+    interface UploadAsync {
+        autoUpload?: boolean;
+        batch?: boolean;
+        removeField?: string;
+        removeUrl?: string;
+        removeVerb?: string;
+        saveField?: string;
+        saveUrl?: string;
+        withCredentials?: boolean;
+    }
+
+    interface UploadFile {
+        extension?: string;
+        name?: string;
+        size?: number;
+    }
+
+    interface UploadLocalization {
+        cancel?: string;
+        dropFilesHere?: string;
+        headerStatusUploaded?: string;
+        headerStatusUploading?: string;
+        remove?: string;
+        retry?: string;
+        select?: string;
+        statusFailed?: string;
+        statusUploaded?: string;
+        statusUploading?: string;
+        uploadSelectedFiles?: string;
+    }
+
+    interface UploadOptions {
+        name?: string;
+        async?: UploadAsync;
+        enabled?: boolean;
+        files?: UploadFile[];
+        localization?: UploadLocalization;
+        multiple?: boolean;
+        showFileList?: boolean;
+        template?: string|Function;
+        cancel?(e: UploadCancelEvent): void;
+        complete?(e: UploadEvent): void;
+        error?(e: UploadErrorEvent): void;
+        progress?(e: UploadProgressEvent): void;
+        remove?(e: UploadRemoveEvent): void;
+        select?(e: UploadSelectEvent): void;
+        success?(e: UploadSuccessEvent): void;
+        upload?(e: UploadUploadEvent): void;
+    }
+    interface UploadEvent {
+        sender: Upload;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface UploadCancelEvent extends UploadEvent {
+        files?: UploadFile[];
+    }
+
+    interface UploadErrorEvent extends UploadEvent {
+        files?: UploadFile[];
+        operation?: string;
+        XMLHttpRequest?: any;
+    }
+
+    interface UploadProgressEvent extends UploadEvent {
+        files?: UploadFile[];
+        percentComplete?: number;
+    }
+
+    interface UploadRemoveEvent extends UploadEvent {
+        files?: UploadFile[];
+        data?: any;
+    }
+
+    interface UploadSelectEvent extends UploadEvent {
+        e?: any;
+        files?: UploadFile[];
+    }
+
+    interface UploadSuccessEvent extends UploadEvent {
+        files?: UploadFile[];
+        operation?: string;
+        response?: any;
+        XMLHttpRequest?: any;
+    }
+
+    interface UploadUploadEvent extends UploadEvent {
+        files?: UploadFile[];
+        data?: any;
+        formData?: any;
+        XMLHttpRequest?: any;
+    }
+
+
+    class Validator extends kendo.ui.Widget {
+
+        static fn: Validator;
+
+        options: ValidatorOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Validator;
+
+        constructor(element: Element, options?: ValidatorOptions);
+
+
+        errors(): any;
+        hideMessages(): void;
+        validate(): boolean;
+        validateInput(input: Element): boolean;
+        validateInput(input: JQuery): boolean;
+
+    }
+
+    interface ValidatorOptions {
+        name?: string;
+        errorTemplate?: string;
+        messages?: any;
+        rules?: any;
+        validateOnBlur?: boolean;
+        validate?(e: ValidatorValidateEvent): void;
+    }
+    interface ValidatorEvent {
+        sender: Validator;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface ValidatorValidateEvent extends ValidatorEvent {
+        valid?: boolean;
+    }
+
+
+    class Window extends kendo.ui.Widget {
+
+        static fn: Window;
+
+        options: WindowOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Window;
+
+        constructor(element: Element, options?: WindowOptions);
+
+
+        center(): kendo.ui.Window;
+        close(): kendo.ui.Window;
+        content(): string;
+        content(content?: string): kendo.ui.Window;
+        content(content?: JQuery): kendo.ui.Window;
+        destroy(): void;
+        maximize(): kendo.ui.Window;
+        minimize(): kendo.ui.Window;
+        open(): kendo.ui.Window;
+        pin(): void;
+        refresh(options: any): kendo.ui.Window;
+        restore(): kendo.ui.Window;
+        setOptions(options: any): void;
+        title(): string;
+        title(text?: string): kendo.ui.Window;
+        toFront(): kendo.ui.Window;
+        toggleMaximization(): kendo.ui.Window;
+        unpin(): void;
+
+    }
+
+    interface WindowAnimationClose {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface WindowAnimationOpen {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface WindowAnimation {
+        close?: WindowAnimationClose;
+        open?: WindowAnimationOpen;
+    }
+
+    interface WindowContent {
+        template?: string;
+    }
+
+    interface WindowPosition {
+        top?: number|string;
+        left?: number|string;
+    }
+
+    interface WindowRefreshOptions {
+        url?: string;
+        cache?: boolean;
+        data?: any;
+        type?: string;
+        template?: string;
+        iframe?: boolean;
+    }
+
+    interface WindowOptions {
+        name?: string;
+        actions?: any;
+        animation?: WindowAnimation;
+        appendTo?: any|string;
+        autoFocus?: boolean;
+        content?: WindowContent;
+        draggable?: boolean;
+        iframe?: boolean;
+        height?: number|string;
+        maxHeight?: number;
+        maxWidth?: number;
+        minHeight?: number;
+        minWidth?: number;
+        modal?: boolean;
+        pinned?: boolean;
+        position?: WindowPosition;
+        resizable?: boolean;
+        scrollable?: boolean;
+        title?: string|boolean;
+        visible?: boolean;
+        width?: number|string;
+        activate?(e: WindowEvent): void;
+        close?(e: WindowCloseEvent): void;
+        deactivate?(e: WindowEvent): void;
+        dragend?(e: WindowEvent): void;
+        dragstart?(e: WindowEvent): void;
+        error?(e: WindowErrorEvent): void;
+        maximize?(e: WindowEvent): void;
+        minimize?(e: WindowEvent): void;
+        open?(e: WindowEvent): void;
+        refresh?(e: WindowEvent): void;
+        resize?(e: WindowEvent): void;
+    }
+    interface WindowEvent {
+        sender: Window;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface WindowCloseEvent extends WindowEvent {
+        userTriggered?: boolean;
+    }
+
+    interface WindowErrorEvent extends WindowEvent {
+        xhr?: JQueryXHR;
+        status?: string;
+    }
+
+
+}
+declare namespace kendo.dataviz.ui {
+    class Barcode extends kendo.ui.Widget {
+
+        static fn: Barcode;
+
+        options: BarcodeOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Barcode;
+
+        constructor(element: Element, options?: BarcodeOptions);
+
+
+        exportImage(options: any): JQueryPromise<any>;
+        exportPDF(options?: kendo.drawing.PDFOptions): JQueryPromise<any>;
+        exportSVG(options: any): JQueryPromise<any>;
+        imageDataURL(): string;
+        redraw(): void;
+        resize(force?: boolean): void;
+        svg(): string;
+        value(): string;
+        value(value: number): void;
+        value(value: string): void;
+
+    }
+
+    interface BarcodeBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface BarcodePadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface BarcodeTextMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface BarcodeText {
+        color?: string;
+        font?: string;
+        margin?: BarcodeTextMargin;
+        visible?: boolean;
+    }
+
+    interface BarcodeExportImageOptions {
+        width?: string;
+        height?: string;
+    }
+
+    interface BarcodeExportSVGOptions {
+        raw?: boolean;
+    }
+
+    interface BarcodeOptions {
+        name?: string;
+        renderAs?: string;
+        background?: string;
+        border?: BarcodeBorder;
+        checksum?: boolean;
+        color?: string;
+        height?: number;
+        padding?: BarcodePadding;
+        text?: BarcodeText;
+        type?: string;
+        value?: string;
+        width?: number;
+    }
+    interface BarcodeEvent {
+        sender: Barcode;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Chart extends kendo.ui.Widget {
+
+        static fn: Chart;
+
+        options: ChartOptions;
+
+        dataSource: kendo.data.DataSource;
+        surface: kendo.drawing.Surface;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Chart;
+
+        constructor(element: Element, options?: ChartOptions);
+
+
+        destroy(): void;
+        exportImage(options: any): JQueryPromise<any>;
+        exportPDF(options?: kendo.drawing.PDFOptions): JQueryPromise<any>;
+        exportSVG(options: any): JQueryPromise<any>;
+        getAxis(name: string): kendo.dataviz.ChartAxis;
+        redraw(): void;
+        refresh(): void;
+        resize(force?: boolean): void;
+        saveAsPDF(): void;
+        setDataSource(dataSource: kendo.data.DataSource): void;
+        setOptions(options: any): void;
+        svg(): string;
+        imageDataURL(): string;
+        toggleHighlight(show: boolean, options: any): void;
+
+    }
+
+    interface ChartAxisDefaultsCrosshairTooltipBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartAxisDefaultsCrosshairTooltipPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartAxisDefaultsCrosshairTooltip {
+        background?: string;
+        border?: ChartAxisDefaultsCrosshairTooltipBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        padding?: ChartAxisDefaultsCrosshairTooltipPadding;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface ChartAxisDefaultsCrosshair {
+        color?: string;
+        opacity?: number;
+        tooltip?: ChartAxisDefaultsCrosshairTooltip;
+        visible?: boolean;
+        width?: number;
+    }
+
+    interface ChartAxisDefaultsLabelsMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartAxisDefaultsLabelsPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartAxisDefaultsLabelsRotation {
+        align?: string;
+        angle?: number|string;
+    }
+
+    interface ChartAxisDefaultsLabels {
+        font?: string;
+        format?: string;
+        margin?: ChartAxisDefaultsLabelsMargin;
+        mirror?: boolean;
+        padding?: ChartAxisDefaultsLabelsPadding;
+        rotation?: ChartAxisDefaultsLabelsRotation;
+        skip?: number;
+        step?: number;
+        template?: string|Function;
+        visible?: boolean;
+        visual?: Function;
+    }
+
+    interface ChartAxisDefaultsLine {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+    }
+
+    interface ChartAxisDefaultsMajorGridLines {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface ChartAxisDefaultsMajorTicks {
+        color?: string;
+        size?: number;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface ChartAxisDefaultsMinorGridLines {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface ChartAxisDefaultsMinorTicks {
+        color?: string;
+        size?: number;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface ChartAxisDefaultsPlotBand {
+        color?: string;
+        from?: number;
+        opacity?: number;
+        to?: number;
+    }
+
+    interface ChartAxisDefaultsTitleBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartAxisDefaultsTitleMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartAxisDefaultsTitlePadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartAxisDefaultsTitle {
+        background?: string;
+        border?: ChartAxisDefaultsTitleBorder;
+        color?: string;
+        font?: string;
+        margin?: ChartAxisDefaultsTitleMargin;
+        padding?: ChartAxisDefaultsTitlePadding;
+        position?: string;
+        rotation?: number;
+        text?: string;
+        visible?: boolean;
+        visual?: Function;
+    }
+
+    interface ChartAxisDefaults {
+        background?: string;
+        color?: string;
+        crosshair?: ChartAxisDefaultsCrosshair;
+        labels?: ChartAxisDefaultsLabels;
+        line?: ChartAxisDefaultsLine;
+        majorGridLines?: ChartAxisDefaultsMajorGridLines;
+        majorTicks?: ChartAxisDefaultsMajorTicks;
+        minorGridLines?: ChartAxisDefaultsMinorGridLines;
+        minorTicks?: ChartAxisDefaultsMinorTicks;
+        narrowRange?: boolean;
+        pane?: string;
+        plotBands?: ChartAxisDefaultsPlotBand[];
+        reverse?: boolean;
+        startAngle?: number;
+        title?: ChartAxisDefaultsTitle;
+        visible?: boolean;
+    }
+
+    interface ChartCategoryAxisItemAutoBaseUnitSteps {
+        seconds?: any;
+        minutes?: any;
+        hours?: any;
+        days?: any;
+        weeks?: any;
+        months?: any;
+        years?: any;
+    }
+
+    interface ChartCategoryAxisItemCrosshairTooltipBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartCategoryAxisItemCrosshairTooltipPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartCategoryAxisItemCrosshairTooltip {
+        background?: string;
+        border?: ChartCategoryAxisItemCrosshairTooltipBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        padding?: ChartCategoryAxisItemCrosshairTooltipPadding;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface ChartCategoryAxisItemCrosshair {
+        color?: string;
+        opacity?: number;
+        tooltip?: ChartCategoryAxisItemCrosshairTooltip;
+        visible?: boolean;
+        width?: number;
+    }
+
+    interface ChartCategoryAxisItemLabelsBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartCategoryAxisItemLabelsDateFormats {
+        days?: string;
+        hours?: string;
+        months?: string;
+        weeks?: string;
+        years?: string;
+    }
+
+    interface ChartCategoryAxisItemLabelsMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartCategoryAxisItemLabelsPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartCategoryAxisItemLabelsRotation {
+        align?: string;
+        angle?: number|string;
+    }
+
+    interface ChartCategoryAxisItemLabels {
+        background?: string;
+        border?: ChartCategoryAxisItemLabelsBorder;
+        color?: string;
+        culture?: string;
+        dateFormats?: ChartCategoryAxisItemLabelsDateFormats;
+        font?: string;
+        format?: string;
+        margin?: ChartCategoryAxisItemLabelsMargin;
+        mirror?: boolean;
+        padding?: ChartCategoryAxisItemLabelsPadding;
+        rotation?: ChartCategoryAxisItemLabelsRotation;
+        skip?: number;
+        step?: number;
+        template?: string|Function;
+        visible?: boolean;
+        visual?: Function;
+    }
+
+    interface ChartCategoryAxisItemLine {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+    }
+
+    interface ChartCategoryAxisItemMajorGridLines {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface ChartCategoryAxisItemMajorTicks {
+        color?: string;
+        size?: number;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface ChartCategoryAxisItemMinorGridLines {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface ChartCategoryAxisItemMinorTicks {
+        color?: string;
+        size?: number;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface ChartCategoryAxisItemNotesDataItemIconBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface ChartCategoryAxisItemNotesDataItemIcon {
+        background?: string;
+        border?: ChartCategoryAxisItemNotesDataItemIconBorder;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface ChartCategoryAxisItemNotesDataItemLabelBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartCategoryAxisItemNotesDataItemLabel {
+        background?: string;
+        border?: ChartCategoryAxisItemNotesDataItemLabelBorder;
+        color?: string;
+        font?: string;
+        template?: string|Function;
+        visible?: boolean;
+        rotation?: number;
+        format?: string;
+        text?: string;
+        position?: string;
+    }
+
+    interface ChartCategoryAxisItemNotesDataItemLine {
+        width?: number;
+        color?: string;
+        length?: number;
+    }
+
+    interface ChartCategoryAxisItemNotesDataItem {
+        value?: any;
+        position?: string;
+        icon?: ChartCategoryAxisItemNotesDataItemIcon;
+        label?: ChartCategoryAxisItemNotesDataItemLabel;
+        line?: ChartCategoryAxisItemNotesDataItemLine;
+    }
+
+    interface ChartCategoryAxisItemNotesIconBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface ChartCategoryAxisItemNotesIcon {
+        background?: string;
+        border?: ChartCategoryAxisItemNotesIconBorder;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface ChartCategoryAxisItemNotesLabelBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartCategoryAxisItemNotesLabel {
+        background?: string;
+        border?: ChartCategoryAxisItemNotesLabelBorder;
+        color?: string;
+        font?: string;
+        template?: string|Function;
+        visible?: boolean;
+        rotation?: number;
+        format?: string;
+        position?: string;
+    }
+
+    interface ChartCategoryAxisItemNotesLine {
+        width?: number;
+        color?: string;
+        length?: number;
+    }
+
+    interface ChartCategoryAxisItemNotes {
+        position?: string;
+        icon?: ChartCategoryAxisItemNotesIcon;
+        label?: ChartCategoryAxisItemNotesLabel;
+        line?: ChartCategoryAxisItemNotesLine;
+        data?: ChartCategoryAxisItemNotesDataItem[];
+        visual?: Function;
+    }
+
+    interface ChartCategoryAxisItemPlotBand {
+        color?: string;
+        from?: number;
+        opacity?: number;
+        to?: number;
+    }
+
+    interface ChartCategoryAxisItemSelectMousewheel {
+        reverse?: boolean;
+        zoom?: string;
+    }
+
+    interface ChartCategoryAxisItemSelect {
+        from?: any;
+        max?: any;
+        min?: any;
+        mousewheel?: ChartCategoryAxisItemSelectMousewheel;
+        to?: any;
+    }
+
+    interface ChartCategoryAxisItemTitleBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartCategoryAxisItemTitleMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartCategoryAxisItemTitlePadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartCategoryAxisItemTitle {
+        background?: string;
+        border?: ChartCategoryAxisItemTitleBorder;
+        color?: string;
+        font?: string;
+        margin?: ChartCategoryAxisItemTitleMargin;
+        padding?: ChartCategoryAxisItemTitlePadding;
+        position?: string;
+        rotation?: number;
+        text?: string;
+        visible?: boolean;
+        visual?: Function;
+    }
+
+    interface ChartCategoryAxisItem {
+        autoBaseUnitSteps?: ChartCategoryAxisItemAutoBaseUnitSteps;
+        axisCrossingValue?: any|Date|any;
+        background?: string;
+        baseUnit?: string;
+        baseUnitStep?: any;
+        categories?: any;
+        color?: string;
+        crosshair?: ChartCategoryAxisItemCrosshair;
+        field?: string;
+        justified?: boolean;
+        labels?: ChartCategoryAxisItemLabels;
+        line?: ChartCategoryAxisItemLine;
+        majorGridLines?: ChartCategoryAxisItemMajorGridLines;
+        majorTicks?: ChartCategoryAxisItemMajorTicks;
+        max?: any;
+        maxDateGroups?: number;
+        min?: any;
+        minorGridLines?: ChartCategoryAxisItemMinorGridLines;
+        minorTicks?: ChartCategoryAxisItemMinorTicks;
+        name?: string;
+        pane?: string;
+        plotBands?: ChartCategoryAxisItemPlotBand[];
+        reverse?: boolean;
+        roundToBaseUnit?: boolean;
+        select?: ChartCategoryAxisItemSelect;
+        startAngle?: number;
+        title?: ChartCategoryAxisItemTitle;
+        type?: string;
+        visible?: boolean;
+        weekStartDay?: number;
+        notes?: ChartCategoryAxisItemNotes;
+    }
+
+    interface ChartChartAreaBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartChartAreaMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartChartArea {
+        background?: string;
+        border?: ChartChartAreaBorder;
+        height?: number;
+        margin?: ChartChartAreaMargin;
+        opacity?: number;
+        width?: number;
+    }
+
+    interface ChartLegendBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartLegendInactiveItemsLabels {
+        color?: string;
+        font?: string;
+        template?: string|Function;
+    }
+
+    interface ChartLegendInactiveItems {
+        labels?: ChartLegendInactiveItemsLabels;
+    }
+
+    interface ChartLegendItem {
+        cursor?: string;
+        visual?: Function;
+    }
+
+    interface ChartLegendLabelsMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartLegendLabelsPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartLegendLabels {
+        color?: string;
+        font?: string;
+        margin?: ChartLegendLabelsMargin;
+        padding?: ChartLegendLabelsPadding;
+        template?: string|Function;
+    }
+
+    interface ChartLegendMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartLegendPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartLegend {
+        align?: string;
+        background?: string;
+        border?: ChartLegendBorder;
+        height?: number;
+        inactiveItems?: ChartLegendInactiveItems;
+        item?: ChartLegendItem;
+        labels?: ChartLegendLabels;
+        margin?: ChartLegendMargin;
+        offsetX?: number;
+        offsetY?: number;
+        orientation?: string;
+        padding?: ChartLegendPadding;
+        position?: string;
+        reverse?: boolean;
+        visible?: boolean;
+        width?: number;
+    }
+
+    interface ChartPaneBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartPaneMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartPanePadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartPaneTitleBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartPaneTitleMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartPaneTitle {
+        background?: string;
+        border?: ChartPaneTitleBorder;
+        color?: string;
+        font?: string;
+        margin?: ChartPaneTitleMargin;
+        position?: string;
+        text?: string;
+        visible?: boolean;
+        visual?: Function;
+    }
+
+    interface ChartPane {
+        background?: string;
+        border?: ChartPaneBorder;
+        clip?: boolean;
+        height?: number;
+        margin?: ChartPaneMargin;
+        name?: string;
+        padding?: ChartPanePadding;
+        title?: ChartPaneTitle;
+    }
+
+    interface ChartPannable {
+        key?: string;
+        lock?: string;
+    }
+
+    interface ChartPdfMargin {
+        bottom?: number|string;
+        left?: number|string;
+        right?: number|string;
+        top?: number|string;
+    }
+
+    interface ChartPdf {
+        author?: string;
+        creator?: string;
+        date?: Date;
+        forceProxy?: boolean;
+        fileName?: string;
+        keywords?: string;
+        landscape?: boolean;
+        margin?: ChartPdfMargin;
+        paperSize?: string|any;
+        proxyURL?: string;
+        proxyTarget?: string;
+        subject?: string;
+        title?: string;
+    }
+
+    interface ChartPlotAreaBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartPlotAreaMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartPlotAreaPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartPlotArea {
+        background?: string;
+        border?: ChartPlotAreaBorder;
+        margin?: ChartPlotAreaMargin;
+        opacity?: number;
+        padding?: ChartPlotAreaPadding;
+    }
+
+    interface ChartSeriesItemBorder {
+        color?: string|Function;
+        dashType?: string|Function;
+        opacity?: number|Function;
+        width?: number|Function;
+    }
+
+    interface ChartSeriesItemConnectors {
+        color?: string;
+        padding?: number;
+        width?: number;
+    }
+
+    interface ChartSeriesItemErrorBarsLine {
+        width?: number;
+        dashType?: string;
+    }
+
+    interface ChartSeriesItemErrorBars {
+        value?: string|number|any|Function;
+        visual?: Function;
+        xValue?: string|number|any|Function;
+        yValue?: string|number|any|Function;
+        endCaps?: boolean;
+        color?: string;
+        line?: ChartSeriesItemErrorBarsLine;
+    }
+
+    interface ChartSeriesItemExtremesBorder {
+        color?: string|Function;
+        width?: number|Function;
+    }
+
+    interface ChartSeriesItemExtremes {
+        background?: string|Function;
+        border?: ChartSeriesItemExtremesBorder;
+        size?: number|Function;
+        type?: string|Function;
+        rotation?: number|Function;
+    }
+
+    interface ChartSeriesItemHighlightBorder {
+        color?: string;
+        opacity?: number;
+        width?: number;
+    }
+
+    interface ChartSeriesItemHighlightLine {
+        color?: string;
+        opacity?: number;
+        width?: number;
+    }
+
+    interface ChartSeriesItemHighlight {
+        border?: ChartSeriesItemHighlightBorder;
+        color?: string;
+        line?: ChartSeriesItemHighlightLine;
+        opacity?: number;
+        toggle?: Function;
+        visible?: boolean;
+        visual?: Function;
+    }
+
+    interface ChartSeriesItemLabelsBorder {
+        color?: string|Function;
+        dashType?: string|Function;
+        width?: number|Function;
+    }
+
+    interface ChartSeriesItemLabelsFromBorder {
+        color?: string|Function;
+        dashType?: string|Function;
+        width?: number|Function;
+    }
+
+    interface ChartSeriesItemLabelsFromMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartSeriesItemLabelsFromPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartSeriesItemLabelsFrom {
+        background?: string|Function;
+        border?: ChartSeriesItemLabelsFromBorder;
+        color?: string|Function;
+        font?: string|Function;
+        format?: string|Function;
+        margin?: ChartSeriesItemLabelsFromMargin;
+        padding?: ChartSeriesItemLabelsFromPadding;
+        position?: string|Function;
+        template?: string|Function;
+        visible?: boolean|Function;
+    }
+
+    interface ChartSeriesItemLabelsMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartSeriesItemLabelsPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartSeriesItemLabelsToBorder {
+        color?: string|Function;
+        dashType?: string|Function;
+        width?: number|Function;
+    }
+
+    interface ChartSeriesItemLabelsToMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartSeriesItemLabelsToPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartSeriesItemLabelsTo {
+        background?: string|Function;
+        border?: ChartSeriesItemLabelsToBorder;
+        color?: string|Function;
+        font?: string|Function;
+        format?: string|Function;
+        margin?: ChartSeriesItemLabelsToMargin;
+        padding?: ChartSeriesItemLabelsToPadding;
+        position?: string|Function;
+        template?: string|Function;
+        visible?: boolean|Function;
+    }
+
+    interface ChartSeriesItemLabels {
+        align?: string;
+        background?: string|Function;
+        border?: ChartSeriesItemLabelsBorder;
+        color?: string|Function;
+        distance?: number;
+        font?: string|Function;
+        format?: string|Function;
+        margin?: ChartSeriesItemLabelsMargin;
+        padding?: ChartSeriesItemLabelsPadding;
+        position?: string|Function;
+        template?: string|Function;
+        visible?: boolean|Function;
+        visual?: Function;
+        from?: ChartSeriesItemLabelsFrom;
+        to?: ChartSeriesItemLabelsTo;
+    }
+
+    interface ChartSeriesItemLine {
+        color?: string;
+        opacity?: number;
+        width?: string;
+        style?: string;
+    }
+
+    interface ChartSeriesItemMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartSeriesItemMarkersBorder {
+        color?: string|Function;
+        width?: number|Function;
+    }
+
+    interface ChartSeriesItemMarkers {
+        background?: string|Function;
+        border?: ChartSeriesItemMarkersBorder;
+        size?: number|Function;
+        type?: string|Function;
+        visible?: boolean|Function;
+        visual?: Function;
+        rotation?: number|Function;
+    }
+
+    interface ChartSeriesItemNegativeValues {
+        color?: string;
+        visible?: boolean;
+    }
+
+    interface ChartSeriesItemNotesIconBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface ChartSeriesItemNotesIcon {
+        background?: string;
+        border?: ChartSeriesItemNotesIconBorder;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface ChartSeriesItemNotesLabelBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartSeriesItemNotesLabel {
+        background?: string;
+        border?: ChartSeriesItemNotesLabelBorder;
+        color?: string;
+        font?: string;
+        template?: string|Function;
+        visible?: boolean;
+        rotation?: number;
+        format?: string;
+        position?: string;
+    }
+
+    interface ChartSeriesItemNotesLine {
+        width?: number;
+        color?: string;
+        length?: number;
+    }
+
+    interface ChartSeriesItemNotes {
+        position?: string;
+        icon?: ChartSeriesItemNotesIcon;
+        label?: ChartSeriesItemNotesLabel;
+        line?: ChartSeriesItemNotesLine;
+        visual?: Function;
+    }
+
+    interface ChartSeriesItemOutliersBorder {
+        color?: string|Function;
+        width?: number|Function;
+    }
+
+    interface ChartSeriesItemOutliers {
+        background?: string|Function;
+        border?: ChartSeriesItemOutliersBorder;
+        size?: number|Function;
+        type?: string|Function;
+        rotation?: number|Function;
+    }
+
+    interface ChartSeriesItemOverlay {
+        gradient?: string;
+    }
+
+    interface ChartSeriesItemStack {
+        type?: string;
+        group?: string;
+    }
+
+    interface ChartSeriesItemTargetBorder {
+        color?: string|Function;
+        dashType?: string|Function;
+        width?: number|Function;
+    }
+
+    interface ChartSeriesItemTargetLine {
+        width?: any|Function;
+    }
+
+    interface ChartSeriesItemTarget {
+        border?: ChartSeriesItemTargetBorder;
+        color?: string|Function;
+        line?: ChartSeriesItemTargetLine;
+    }
+
+    interface ChartSeriesItemTooltipBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface ChartSeriesItemTooltipPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartSeriesItemTooltip {
+        background?: string;
+        border?: ChartSeriesItemTooltipBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        padding?: ChartSeriesItemTooltipPadding;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface ChartSeriesItem {
+        aggregate?: string|Function;
+        axis?: string;
+        border?: ChartSeriesItemBorder;
+        categoryField?: string;
+        closeField?: string;
+        color?: string|Function;
+        colorField?: string;
+        connectors?: ChartSeriesItemConnectors;
+        currentField?: string;
+        dashType?: string;
+        data?: any;
+        downColor?: string|Function;
+        downColorField?: string;
+        segmentSpacing?: number;
+        summaryField?: string;
+        neckRatio?: number;
+        dynamicSlope?: boolean;
+        dynamicHeight?: boolean;
+        errorBars?: ChartSeriesItemErrorBars;
+        errorLowField?: string;
+        errorHighField?: string;
+        xErrorLowField?: string;
+        xErrorHighField?: string;
+        yErrorLowField?: string;
+        yErrorHighField?: string;
+        explodeField?: string;
+        field?: string;
+        fromField?: string;
+        toField?: string;
+        noteTextField?: string;
+        lowerField?: string;
+        q1Field?: string;
+        medianField?: string;
+        q3Field?: string;
+        upperField?: string;
+        meanField?: string;
+        outliersField?: string;
+        gap?: number;
+        highField?: string;
+        highlight?: ChartSeriesItemHighlight;
+        holeSize?: number;
+        labels?: ChartSeriesItemLabels;
+        line?: ChartSeriesItemLine;
+        lowField?: string;
+        margin?: ChartSeriesItemMargin;
+        markers?: ChartSeriesItemMarkers;
+        outliers?: ChartSeriesItemOutliers;
+        extremes?: ChartSeriesItemExtremes;
+        maxSize?: number;
+        minSize?: number;
+        missingValues?: string;
+        style?: string;
+        name?: string;
+        negativeColor?: string;
+        negativeValues?: ChartSeriesItemNegativeValues;
+        opacity?: number;
+        openField?: string;
+        overlay?: ChartSeriesItemOverlay;
+        padding?: number;
+        size?: number;
+        sizeField?: string;
+        spacing?: number;
+        stack?: ChartSeriesItemStack;
+        startAngle?: number;
+        target?: ChartSeriesItemTarget;
+        targetField?: string;
+        tooltip?: ChartSeriesItemTooltip;
+        type?: string;
+        visible?: boolean;
+        visibleInLegend?: boolean;
+        visibleInLegendField?: string;
+        visual?: Function;
+        width?: number;
+        xAxis?: string;
+        xField?: string;
+        yAxis?: string;
+        yField?: string;
+        notes?: ChartSeriesItemNotes;
+        zIndex?: number;
+    }
+
+    interface ChartSeriesDefaultsBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartSeriesDefaultsLabelsBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartSeriesDefaultsLabelsFromBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartSeriesDefaultsLabelsFromMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartSeriesDefaultsLabelsFromPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartSeriesDefaultsLabelsFrom {
+        background?: string;
+        border?: ChartSeriesDefaultsLabelsFromBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        margin?: ChartSeriesDefaultsLabelsFromMargin;
+        padding?: ChartSeriesDefaultsLabelsFromPadding;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface ChartSeriesDefaultsLabelsMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartSeriesDefaultsLabelsPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartSeriesDefaultsLabelsToBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartSeriesDefaultsLabelsToMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartSeriesDefaultsLabelsToPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartSeriesDefaultsLabelsTo {
+        background?: string;
+        border?: ChartSeriesDefaultsLabelsToBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        margin?: ChartSeriesDefaultsLabelsToMargin;
+        padding?: ChartSeriesDefaultsLabelsToPadding;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface ChartSeriesDefaultsLabels {
+        background?: string;
+        border?: ChartSeriesDefaultsLabelsBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        margin?: ChartSeriesDefaultsLabelsMargin;
+        padding?: ChartSeriesDefaultsLabelsPadding;
+        template?: string|Function;
+        visible?: boolean;
+        visual?: Function;
+        from?: ChartSeriesDefaultsLabelsFrom;
+        to?: ChartSeriesDefaultsLabelsTo;
+    }
+
+    interface ChartSeriesDefaultsNotesIconBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface ChartSeriesDefaultsNotesIcon {
+        background?: string;
+        border?: ChartSeriesDefaultsNotesIconBorder;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface ChartSeriesDefaultsNotesLabelBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartSeriesDefaultsNotesLabel {
+        background?: string;
+        border?: ChartSeriesDefaultsNotesLabelBorder;
+        color?: string;
+        font?: string;
+        template?: string|Function;
+        visible?: boolean;
+        rotation?: number;
+        format?: string;
+        position?: string;
+    }
+
+    interface ChartSeriesDefaultsNotesLine {
+        width?: number;
+        color?: string;
+        length?: number;
+    }
+
+    interface ChartSeriesDefaultsNotes {
+        icon?: ChartSeriesDefaultsNotesIcon;
+        label?: ChartSeriesDefaultsNotesLabel;
+        line?: ChartSeriesDefaultsNotesLine;
+        visual?: Function;
+    }
+
+    interface ChartSeriesDefaultsOverlay {
+        gradient?: string;
+    }
+
+    interface ChartSeriesDefaultsStack {
+        type?: string;
+    }
+
+    interface ChartSeriesDefaultsTooltipBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface ChartSeriesDefaultsTooltipPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartSeriesDefaultsTooltip {
+        background?: string;
+        border?: ChartSeriesDefaultsTooltipBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        padding?: ChartSeriesDefaultsTooltipPadding;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface ChartSeriesDefaults {
+        area?: any;
+        bar?: any;
+        border?: ChartSeriesDefaultsBorder;
+        bubble?: any;
+        candlestick?: any;
+        column?: any;
+        donut?: any;
+        gap?: number;
+        labels?: ChartSeriesDefaultsLabels;
+        line?: any;
+        ohlc?: any;
+        overlay?: ChartSeriesDefaultsOverlay;
+        pie?: any;
+        scatter?: any;
+        scatterLine?: any;
+        spacing?: number;
+        stack?: ChartSeriesDefaultsStack;
+        type?: string;
+        tooltip?: ChartSeriesDefaultsTooltip;
+        verticalArea?: any;
+        verticalLine?: any;
+        visual?: Function;
+        notes?: ChartSeriesDefaultsNotes;
+    }
+
+    interface ChartTitleBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartTitleMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartTitlePadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartTitle {
+        align?: string;
+        background?: string;
+        border?: ChartTitleBorder;
+        color?: string;
+        font?: string;
+        margin?: ChartTitleMargin;
+        padding?: ChartTitlePadding;
+        position?: string;
+        text?: string;
+        visible?: boolean;
+    }
+
+    interface ChartTooltipBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface ChartTooltipPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartTooltip {
+        background?: string;
+        border?: ChartTooltipBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        opacity?: number;
+        padding?: ChartTooltipPadding;
+        shared?: boolean;
+        sharedTemplate?: string|Function;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface ChartValueAxisItemCrosshairTooltipBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartValueAxisItemCrosshairTooltipPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartValueAxisItemCrosshairTooltip {
+        background?: string;
+        border?: ChartValueAxisItemCrosshairTooltipBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        padding?: ChartValueAxisItemCrosshairTooltipPadding;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface ChartValueAxisItemCrosshair {
+        color?: string;
+        opacity?: number;
+        tooltip?: ChartValueAxisItemCrosshairTooltip;
+        visible?: boolean;
+        width?: number;
+    }
+
+    interface ChartValueAxisItemLabelsBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartValueAxisItemLabelsMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartValueAxisItemLabelsPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartValueAxisItemLabelsRotation {
+        align?: string;
+        angle?: number|string;
+    }
+
+    interface ChartValueAxisItemLabels {
+        background?: string;
+        border?: ChartValueAxisItemLabelsBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        margin?: ChartValueAxisItemLabelsMargin;
+        mirror?: boolean;
+        padding?: ChartValueAxisItemLabelsPadding;
+        rotation?: ChartValueAxisItemLabelsRotation;
+        skip?: number;
+        step?: number;
+        template?: string|Function;
+        visible?: boolean;
+        visual?: Function;
+    }
+
+    interface ChartValueAxisItemLine {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+    }
+
+    interface ChartValueAxisItemMajorGridLines {
+        color?: string;
+        dashType?: string;
+        type?: string;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface ChartValueAxisItemMajorTicks {
+        color?: string;
+        size?: number;
+        visible?: boolean;
+        step?: number;
+        skip?: number;
+    }
+
+    interface ChartValueAxisItemMinorGridLines {
+        color?: string;
+        dashType?: string;
+        type?: string;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface ChartValueAxisItemMinorTicks {
+        color?: string;
+        size?: number;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface ChartValueAxisItemNotesDataItemIconBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface ChartValueAxisItemNotesDataItemIcon {
+        background?: string;
+        border?: ChartValueAxisItemNotesDataItemIconBorder;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface ChartValueAxisItemNotesDataItemLabelBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartValueAxisItemNotesDataItemLabel {
+        background?: string;
+        border?: ChartValueAxisItemNotesDataItemLabelBorder;
+        color?: string;
+        font?: string;
+        template?: string|Function;
+        visible?: boolean;
+        rotation?: number;
+        format?: string;
+        text?: string;
+        position?: string;
+    }
+
+    interface ChartValueAxisItemNotesDataItemLine {
+        width?: number;
+        color?: string;
+        length?: number;
+    }
+
+    interface ChartValueAxisItemNotesDataItem {
+        value?: any;
+        position?: string;
+        icon?: ChartValueAxisItemNotesDataItemIcon;
+        label?: ChartValueAxisItemNotesDataItemLabel;
+        line?: ChartValueAxisItemNotesDataItemLine;
+    }
+
+    interface ChartValueAxisItemNotesIconBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface ChartValueAxisItemNotesIcon {
+        background?: string;
+        border?: ChartValueAxisItemNotesIconBorder;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface ChartValueAxisItemNotesLabelBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartValueAxisItemNotesLabel {
+        background?: string;
+        border?: ChartValueAxisItemNotesLabelBorder;
+        color?: string;
+        font?: string;
+        template?: string|Function;
+        visible?: boolean;
+        rotation?: number;
+        format?: string;
+        position?: string;
+    }
+
+    interface ChartValueAxisItemNotesLine {
+        width?: number;
+        color?: string;
+        length?: number;
+    }
+
+    interface ChartValueAxisItemNotes {
+        position?: string;
+        icon?: ChartValueAxisItemNotesIcon;
+        label?: ChartValueAxisItemNotesLabel;
+        line?: ChartValueAxisItemNotesLine;
+        data?: ChartValueAxisItemNotesDataItem[];
+        visual?: Function;
+    }
+
+    interface ChartValueAxisItemPlotBand {
+        color?: string;
+        from?: number;
+        opacity?: number;
+        to?: number;
+    }
+
+    interface ChartValueAxisItemTitleBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartValueAxisItemTitleMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartValueAxisItemTitlePadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartValueAxisItemTitle {
+        background?: string;
+        border?: ChartValueAxisItemTitleBorder;
+        color?: string;
+        font?: string;
+        margin?: ChartValueAxisItemTitleMargin;
+        padding?: ChartValueAxisItemTitlePadding;
+        position?: string;
+        rotation?: number;
+        text?: string;
+        visible?: boolean;
+        visual?: Function;
+    }
+
+    interface ChartValueAxisItem {
+        axisCrossingValue?: any|Date|any;
+        background?: string;
+        color?: string;
+        crosshair?: ChartValueAxisItemCrosshair;
+        labels?: ChartValueAxisItemLabels;
+        line?: ChartValueAxisItemLine;
+        majorGridLines?: ChartValueAxisItemMajorGridLines;
+        majorUnit?: number;
+        max?: number;
+        min?: number;
+        minorGridLines?: ChartValueAxisItemMinorGridLines;
+        majorTicks?: ChartValueAxisItemMajorTicks;
+        minorTicks?: ChartValueAxisItemMinorTicks;
+        minorUnit?: number;
+        name?: string;
+        narrowRange?: boolean;
+        pane?: string;
+        plotBands?: ChartValueAxisItemPlotBand[];
+        reverse?: boolean;
+        title?: ChartValueAxisItemTitle;
+        type?: string;
+        visible?: boolean;
+        notes?: ChartValueAxisItemNotes;
+    }
+
+    interface ChartXAxisItemCrosshairTooltipBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartXAxisItemCrosshairTooltipPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartXAxisItemCrosshairTooltip {
+        background?: string;
+        border?: ChartXAxisItemCrosshairTooltipBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        padding?: ChartXAxisItemCrosshairTooltipPadding;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface ChartXAxisItemCrosshair {
+        color?: string;
+        opacity?: number;
+        tooltip?: ChartXAxisItemCrosshairTooltip;
+        visible?: boolean;
+        width?: number;
+    }
+
+    interface ChartXAxisItemLabelsBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartXAxisItemLabelsDateFormats {
+        days?: string;
+        hours?: string;
+        months?: string;
+        weeks?: string;
+        years?: string;
+    }
+
+    interface ChartXAxisItemLabelsMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartXAxisItemLabelsPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartXAxisItemLabelsRotation {
+        align?: string;
+        angle?: number|string;
+    }
+
+    interface ChartXAxisItemLabels {
+        background?: string;
+        border?: ChartXAxisItemLabelsBorder;
+        color?: string;
+        culture?: string;
+        dateFormats?: ChartXAxisItemLabelsDateFormats;
+        font?: string;
+        format?: string;
+        margin?: ChartXAxisItemLabelsMargin;
+        mirror?: boolean;
+        padding?: ChartXAxisItemLabelsPadding;
+        rotation?: ChartXAxisItemLabelsRotation;
+        skip?: number;
+        step?: number;
+        template?: string|Function;
+        visible?: boolean;
+        visual?: Function;
+    }
+
+    interface ChartXAxisItemLine {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+    }
+
+    interface ChartXAxisItemMajorGridLines {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface ChartXAxisItemMajorTicks {
+        color?: string;
+        size?: number;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface ChartXAxisItemMinorGridLines {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface ChartXAxisItemMinorTicks {
+        color?: string;
+        size?: number;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface ChartXAxisItemNotesDataItemIconBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface ChartXAxisItemNotesDataItemIcon {
+        background?: string;
+        border?: ChartXAxisItemNotesDataItemIconBorder;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface ChartXAxisItemNotesDataItemLabelBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartXAxisItemNotesDataItemLabel {
+        background?: string;
+        border?: ChartXAxisItemNotesDataItemLabelBorder;
+        color?: string;
+        font?: string;
+        template?: string|Function;
+        visible?: boolean;
+        rotation?: number;
+        format?: string;
+        text?: string;
+        position?: string;
+    }
+
+    interface ChartXAxisItemNotesDataItemLine {
+        width?: number;
+        color?: string;
+        length?: number;
+    }
+
+    interface ChartXAxisItemNotesDataItem {
+        value?: any;
+        position?: string;
+        icon?: ChartXAxisItemNotesDataItemIcon;
+        label?: ChartXAxisItemNotesDataItemLabel;
+        line?: ChartXAxisItemNotesDataItemLine;
+    }
+
+    interface ChartXAxisItemNotesIconBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface ChartXAxisItemNotesIcon {
+        background?: string;
+        border?: ChartXAxisItemNotesIconBorder;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface ChartXAxisItemNotesLabelBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartXAxisItemNotesLabel {
+        background?: string;
+        border?: ChartXAxisItemNotesLabelBorder;
+        color?: string;
+        font?: string;
+        template?: string|Function;
+        visible?: boolean;
+        rotation?: number;
+        format?: string;
+        position?: string;
+    }
+
+    interface ChartXAxisItemNotesLine {
+        width?: number;
+        color?: string;
+        length?: number;
+    }
+
+    interface ChartXAxisItemNotes {
+        position?: string;
+        icon?: ChartXAxisItemNotesIcon;
+        label?: ChartXAxisItemNotesLabel;
+        line?: ChartXAxisItemNotesLine;
+        data?: ChartXAxisItemNotesDataItem[];
+        visual?: Function;
+    }
+
+    interface ChartXAxisItemPlotBand {
+        color?: string;
+        from?: number;
+        opacity?: number;
+        to?: number;
+    }
+
+    interface ChartXAxisItemTitleBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartXAxisItemTitleMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartXAxisItemTitlePadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartXAxisItemTitle {
+        background?: string;
+        border?: ChartXAxisItemTitleBorder;
+        color?: string;
+        font?: string;
+        margin?: ChartXAxisItemTitleMargin;
+        padding?: ChartXAxisItemTitlePadding;
+        position?: string;
+        rotation?: number;
+        text?: string;
+        visible?: boolean;
+        visual?: Function;
+    }
+
+    interface ChartXAxisItem {
+        axisCrossingValue?: any|Date|any;
+        background?: string;
+        baseUnit?: string;
+        color?: string;
+        crosshair?: ChartXAxisItemCrosshair;
+        labels?: ChartXAxisItemLabels;
+        line?: ChartXAxisItemLine;
+        majorGridLines?: ChartXAxisItemMajorGridLines;
+        minorGridLines?: ChartXAxisItemMinorGridLines;
+        minorTicks?: ChartXAxisItemMinorTicks;
+        majorTicks?: ChartXAxisItemMajorTicks;
+        majorUnit?: number;
+        max?: any;
+        min?: any;
+        minorUnit?: number;
+        name?: string;
+        narrowRange?: boolean;
+        pane?: string;
+        plotBands?: ChartXAxisItemPlotBand[];
+        reverse?: boolean;
+        startAngle?: number;
+        title?: ChartXAxisItemTitle;
+        type?: string;
+        visible?: boolean;
+        notes?: ChartXAxisItemNotes;
+    }
+
+    interface ChartYAxisItemCrosshairTooltipBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartYAxisItemCrosshairTooltipPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartYAxisItemCrosshairTooltip {
+        background?: string;
+        border?: ChartYAxisItemCrosshairTooltipBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        padding?: ChartYAxisItemCrosshairTooltipPadding;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface ChartYAxisItemCrosshair {
+        color?: string;
+        opacity?: number;
+        tooltip?: ChartYAxisItemCrosshairTooltip;
+        visible?: boolean;
+        width?: number;
+    }
+
+    interface ChartYAxisItemLabelsBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartYAxisItemLabelsDateFormats {
+        days?: string;
+        hours?: string;
+        months?: string;
+        weeks?: string;
+        years?: string;
+    }
+
+    interface ChartYAxisItemLabelsMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartYAxisItemLabelsPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartYAxisItemLabelsRotation {
+        align?: string;
+        angle?: number;
+    }
+
+    interface ChartYAxisItemLabels {
+        background?: string;
+        border?: ChartYAxisItemLabelsBorder;
+        color?: string;
+        culture?: string;
+        dateFormats?: ChartYAxisItemLabelsDateFormats;
+        font?: string;
+        format?: string;
+        margin?: ChartYAxisItemLabelsMargin;
+        mirror?: boolean;
+        padding?: ChartYAxisItemLabelsPadding;
+        rotation?: ChartYAxisItemLabelsRotation;
+        skip?: number;
+        step?: number;
+        template?: string|Function;
+        visible?: boolean;
+        visual?: Function;
+    }
+
+    interface ChartYAxisItemLine {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+    }
+
+    interface ChartYAxisItemMajorGridLines {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface ChartYAxisItemMajorTicks {
+        color?: string;
+        size?: number;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface ChartYAxisItemMinorGridLines {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface ChartYAxisItemMinorTicks {
+        color?: string;
+        size?: number;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface ChartYAxisItemNotesDataItemIconBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface ChartYAxisItemNotesDataItemIcon {
+        background?: string;
+        border?: ChartYAxisItemNotesDataItemIconBorder;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface ChartYAxisItemNotesDataItemLabelBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartYAxisItemNotesDataItemLabel {
+        background?: string;
+        border?: ChartYAxisItemNotesDataItemLabelBorder;
+        color?: string;
+        font?: string;
+        template?: string|Function;
+        visible?: boolean;
+        rotation?: number;
+        format?: string;
+        text?: string;
+        position?: string;
+    }
+
+    interface ChartYAxisItemNotesDataItemLine {
+        width?: number;
+        color?: string;
+        length?: number;
+    }
+
+    interface ChartYAxisItemNotesDataItem {
+        value?: any;
+        position?: string;
+        icon?: ChartYAxisItemNotesDataItemIcon;
+        label?: ChartYAxisItemNotesDataItemLabel;
+        line?: ChartYAxisItemNotesDataItemLine;
+    }
+
+    interface ChartYAxisItemNotesIconBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface ChartYAxisItemNotesIcon {
+        background?: string;
+        border?: ChartYAxisItemNotesIconBorder;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface ChartYAxisItemNotesLabelBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartYAxisItemNotesLabel {
+        background?: string;
+        border?: ChartYAxisItemNotesLabelBorder;
+        color?: string;
+        font?: string;
+        template?: string|Function;
+        visible?: boolean;
+        rotation?: number;
+        format?: string;
+        position?: string;
+    }
+
+    interface ChartYAxisItemNotesLine {
+        width?: number;
+        color?: string;
+        length?: number;
+    }
+
+    interface ChartYAxisItemNotes {
+        position?: string;
+        icon?: ChartYAxisItemNotesIcon;
+        label?: ChartYAxisItemNotesLabel;
+        line?: ChartYAxisItemNotesLine;
+        data?: ChartYAxisItemNotesDataItem[];
+        visual?: Function;
+    }
+
+    interface ChartYAxisItemPlotBand {
+        color?: string;
+        from?: number;
+        opacity?: number;
+        to?: number;
+    }
+
+    interface ChartYAxisItemTitleBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ChartYAxisItemTitleMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartYAxisItemTitlePadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface ChartYAxisItemTitle {
+        background?: string;
+        border?: ChartYAxisItemTitleBorder;
+        color?: string;
+        font?: string;
+        margin?: ChartYAxisItemTitleMargin;
+        padding?: ChartYAxisItemTitlePadding;
+        position?: string;
+        rotation?: number;
+        text?: string;
+        visible?: boolean;
+        visual?: Function;
+    }
+
+    interface ChartYAxisItem {
+        axisCrossingValue?: any|Date|any;
+        background?: string;
+        baseUnit?: string;
+        color?: string;
+        crosshair?: ChartYAxisItemCrosshair;
+        labels?: ChartYAxisItemLabels;
+        line?: ChartYAxisItemLine;
+        majorGridLines?: ChartYAxisItemMajorGridLines;
+        minorGridLines?: ChartYAxisItemMinorGridLines;
+        minorTicks?: ChartYAxisItemMinorTicks;
+        majorTicks?: ChartYAxisItemMajorTicks;
+        majorUnit?: number;
+        max?: any;
+        min?: any;
+        minorUnit?: number;
+        name?: string;
+        narrowRange?: boolean;
+        pane?: string;
+        plotBands?: ChartYAxisItemPlotBand[];
+        reverse?: boolean;
+        title?: ChartYAxisItemTitle;
+        type?: string;
+        visible?: boolean;
+        notes?: ChartYAxisItemNotes;
+    }
+
+    interface ChartZoomableMousewheel {
+        lock?: string;
+    }
+
+    interface ChartZoomableSelection {
+        key?: string;
+        lock?: string;
+    }
+
+    interface ChartZoomable {
+        mousewheel?: ChartZoomableMousewheel;
+        selection?: ChartZoomableSelection;
+    }
+
+    interface ChartExportImageOptions {
+        width?: string;
+        height?: string;
+        cors?: string;
+    }
+
+    interface ChartExportSVGOptions {
+        raw?: boolean;
+    }
+
+    interface ChartToggleHighlightOptions {
+        series?: string;
+        category?: string;
+    }
+
+    interface ChartSeriesClickEventSeries {
+        type?: string;
+        name?: string;
+        data?: any;
+    }
+
+    interface ChartSeriesHoverEventSeries {
+        type?: string;
+        name?: string;
+        data?: any;
+    }
+
+    interface ChartOptions {
+        name?: string;
+        autoBind?: boolean;
+        axisDefaults?: ChartAxisDefaults;
+        categoryAxis?: ChartCategoryAxisItem[];
+        chartArea?: ChartChartArea;
+        dataSource?: any|any|kendo.data.DataSource;
+        legend?: ChartLegend;
+        panes?: ChartPane[];
+        pannable?: ChartPannable;
+        pdf?: ChartPdf;
+        plotArea?: ChartPlotArea;
+        renderAs?: string;
+        series?: ChartSeriesItem[];
+        seriesColors?: any;
+        seriesDefaults?: ChartSeriesDefaults;
+        theme?: string;
+        title?: ChartTitle;
+        tooltip?: ChartTooltip;
+        transitions?: boolean;
+        valueAxis?: ChartValueAxisItem[];
+        xAxis?: ChartXAxisItem[];
+        yAxis?: ChartYAxisItem[];
+        zoomable?: ChartZoomable;
+        axisLabelClick?(e: ChartAxisLabelClickEvent): void;
+        legendItemClick?(e: ChartLegendItemClickEvent): void;
+        legendItemHover?(e: ChartLegendItemHoverEvent): void;
+        dataBound?(e: ChartDataBoundEvent): void;
+        drag?(e: ChartDragEvent): void;
+        dragEnd?(e: ChartDragEndEvent): void;
+        dragStart?(e: ChartDragStartEvent): void;
+        noteClick?(e: ChartNoteClickEvent): void;
+        noteHover?(e: ChartNoteHoverEvent): void;
+        plotAreaClick?(e: ChartPlotAreaClickEvent): void;
+        render?(e: ChartEvent): void;
+        select?(e: ChartSelectEvent): void;
+        selectEnd?(e: ChartSelectEndEvent): void;
+        selectStart?(e: ChartSelectStartEvent): void;
+        seriesClick?(e: ChartSeriesClickEvent): void;
+        seriesHover?(e: ChartSeriesHoverEvent): void;
+        zoom?(e: ChartZoomEvent): void;
+        zoomEnd?(e: ChartZoomEndEvent): void;
+        zoomStart?(e: ChartZoomStartEvent): void;
+    }
+    interface ChartEvent {
+        sender: Chart;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface ChartAxisLabelClickEvent extends ChartEvent {
+        axis?: any;
+        dataItem?: any;
+        element?: any;
+        index?: any;
+        text?: string;
+        value?: any;
+    }
+
+    interface ChartLegendItemClickEvent extends ChartEvent {
+        text?: string;
+        series?: any;
+        seriesIndex?: number;
+        pointIndex?: number;
+        element?: any;
+    }
+
+    interface ChartLegendItemHoverEvent extends ChartEvent {
+        text?: string;
+        series?: any;
+        seriesIndex?: number;
+        pointIndex?: number;
+        element?: any;
+    }
+
+    interface ChartDataBoundEvent extends ChartEvent {
+    }
+
+    interface ChartDragEvent extends ChartEvent {
+        axisRanges?: any;
+        originalEvent?: any;
+    }
+
+    interface ChartDragEndEvent extends ChartEvent {
+        axisRanges?: any;
+        originalEvent?: any;
+    }
+
+    interface ChartDragStartEvent extends ChartEvent {
+        axisRanges?: any;
+        originalEvent?: any;
+    }
+
+    interface ChartNoteClickEvent extends ChartEvent {
+        category?: any;
+        element?: any;
+        value?: any;
+        series?: any;
+        dataItem?: any;
+        visual?: any;
+    }
+
+    interface ChartNoteHoverEvent extends ChartEvent {
+        category?: any;
+        element?: any;
+        value?: any;
+        series?: any;
+        dataItem?: any;
+        visual?: any;
+    }
+
+    interface ChartPlotAreaClickEvent extends ChartEvent {
+        category?: any;
+        element?: any;
+        originalEvent?: any;
+        value?: any;
+        x?: any;
+        y?: any;
+    }
+
+    interface ChartSelectEvent extends ChartEvent {
+        axis?: any;
+        from?: any;
+        to?: any;
+    }
+
+    interface ChartSelectEndEvent extends ChartEvent {
+        axis?: any;
+        from?: any;
+        to?: any;
+    }
+
+    interface ChartSelectStartEvent extends ChartEvent {
+        axis?: any;
+        from?: any;
+        to?: any;
+    }
+
+    interface ChartSeriesClickEvent extends ChartEvent {
+        category?: any;
+        element?: any;
+        originalEvent?: any;
+        series?: ChartSeriesClickEventSeries;
+        dataItem?: any;
+        value?: any;
+        percentage?: any;
+    }
+
+    interface ChartSeriesHoverEvent extends ChartEvent {
+        category?: any;
+        categoryPoints?: any;
+        element?: any;
+        originalEvent?: any;
+        series?: ChartSeriesHoverEventSeries;
+        dataItem?: any;
+        value?: any;
+        percentage?: any;
+    }
+
+    interface ChartZoomEvent extends ChartEvent {
+        axisRanges?: any;
+        delta?: number;
+        originalEvent?: any;
+    }
+
+    interface ChartZoomEndEvent extends ChartEvent {
+        axisRanges?: any;
+        originalEvent?: any;
+    }
+
+    interface ChartZoomStartEvent extends ChartEvent {
+        axisRanges?: any;
+        originalEvent?: any;
+    }
+
+
+    class Diagram extends kendo.ui.Widget {
+
+        static fn: Diagram;
+
+        options: DiagramOptions;
+
+        dataSource: kendo.data.DataSource;
+        connections: DiagramConnection[];
+        connectionsDataSource: kendo.data.DataSource;
+        shapes: DiagramShape[];
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Diagram;
+
+        constructor(element: Element, options?: DiagramOptions);
+
+
+        addConnection(connection: any, undoable: boolean): void;
+        addShape(obj: any, undoable: boolean): kendo.dataviz.diagram.Shape;
+        alignShapes(direction: string): void;
+        boundingBox(items: any): kendo.dataviz.diagram.Rect;
+        bringIntoView(obj: any, options: any): void;
+        cancelEdit(): void;
+        clear(): void;
+        connect(source: any, target: any, options: any): void;
+        connected(source: any, target: any): void;
+        copy(): void;
+        createConnection(item: any): void;
+        createShape(item: any): void;
+        cut(): void;
+        destroy(): void;
+        documentToModel(point: any): any;
+        documentToView(point: any): any;
+        edit(item: any): void;
+        exportImage(options: any): JQueryPromise<any>;
+        exportPDF(options?: kendo.drawing.PDFOptions): JQueryPromise<any>;
+        exportSVG(options: any): JQueryPromise<any>;
+        focus(): void;
+        getShapeById(id: string): any;
+        layerToModel(point: any): any;
+        layout(options: any): void;
+        load(json: string): void;
+        modelToDocument(point: any): any;
+        modelToLayer(point: any): any;
+        modelToView(point: any): any;
+        pan(pan: any): void;
+        paste(): void;
+        redo(): void;
+        remove(items: any, undoable: boolean): void;
+        resize(): void;
+        save(): void;
+        saveEdit(): void;
+        select(): any;
+        select(elements: kendo.dataviz.diagram.Connection, options: any): void;
+        select(elements: kendo.dataviz.diagram.Shape, options: any): void;
+        select(elements: any, options: any): void;
+        selectAll(): void;
+        selectArea(rect: kendo.dataviz.diagram.Rect): void;
+        setConnectionsDataSource(dataSource: kendo.data.DataSource): void;
+        setDataSource(dataSource: kendo.data.DataSource): void;
+        toBack(items: any, undoable: boolean): void;
+        toFront(items: any, undoable: boolean): void;
+        transformPoint(p: any): void;
+        transformRect(r: any): void;
+        undo(): void;
+        viewToDocument(point: kendo.dataviz.diagram.Point): kendo.dataviz.diagram.Point;
+        viewToModel(point: kendo.dataviz.diagram.Point): kendo.dataviz.diagram.Point;
+        viewport(): kendo.dataviz.diagram.Rect;
+        zoom(): number;
+        zoom(zoom: number, point: kendo.dataviz.diagram.Point): void;
+
+    }
+
+    interface DiagramConnectionDefaultsContent {
+        color?: string;
+        fontFamily?: string;
+        fontSize?: number;
+        template?: string|Function;
+        text?: string;
+        visual?: Function;
+    }
+
+    interface DiagramConnectionDefaultsEditableTool {
+        name?: string;
+    }
+
+    interface DiagramConnectionDefaultsEditable {
+        drag?: boolean;
+        remove?: boolean;
+        tools?: DiagramConnectionDefaultsEditableTool[];
+    }
+
+    interface DiagramConnectionDefaultsEndCapFill {
+        color?: string;
+    }
+
+    interface DiagramConnectionDefaultsEndCapStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface DiagramConnectionDefaultsEndCap {
+        fill?: DiagramConnectionDefaultsEndCapFill;
+        stroke?: DiagramConnectionDefaultsEndCapStroke;
+        type?: string;
+    }
+
+    interface DiagramConnectionDefaultsHoverStroke {
+        color?: string;
+    }
+
+    interface DiagramConnectionDefaultsHover {
+        stroke?: DiagramConnectionDefaultsHoverStroke;
+    }
+
+    interface DiagramConnectionDefaultsSelectionHandlesFill {
+        color?: string;
+    }
+
+    interface DiagramConnectionDefaultsSelectionHandlesStroke {
+        color?: string;
+    }
+
+    interface DiagramConnectionDefaultsSelectionHandles {
+        fill?: DiagramConnectionDefaultsSelectionHandlesFill;
+        stroke?: DiagramConnectionDefaultsSelectionHandlesStroke;
+        width?: number;
+        height?: number;
+    }
+
+    interface DiagramConnectionDefaultsSelection {
+        handles?: DiagramConnectionDefaultsSelectionHandles;
+    }
+
+    interface DiagramConnectionDefaultsStartCapFill {
+        color?: string;
+    }
+
+    interface DiagramConnectionDefaultsStartCapStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface DiagramConnectionDefaultsStartCap {
+        fill?: DiagramConnectionDefaultsStartCapFill;
+        stroke?: DiagramConnectionDefaultsStartCapStroke;
+        type?: string;
+    }
+
+    interface DiagramConnectionDefaultsStroke {
+        color?: string;
+        width?: number;
+    }
+
+    interface DiagramConnectionDefaults {
+        content?: DiagramConnectionDefaultsContent;
+        editable?: DiagramConnectionDefaultsEditable;
+        endCap?: DiagramConnectionDefaultsEndCap;
+        fromConnector?: string;
+        hover?: DiagramConnectionDefaultsHover;
+        selectable?: boolean;
+        selection?: DiagramConnectionDefaultsSelection;
+        startCap?: DiagramConnectionDefaultsStartCap;
+        stroke?: DiagramConnectionDefaultsStroke;
+        toConnector?: string;
+        type?: string;
+    }
+
+    interface DiagramConnectionContent {
+        color?: string;
+        fontFamily?: string;
+        fontSize?: number;
+        template?: string|Function;
+        text?: string;
+        visual?: Function;
+    }
+
+    interface DiagramConnectionEditableTool {
+        name?: string;
+    }
+
+    interface DiagramConnectionEditable {
+        tools?: DiagramConnectionEditableTool[];
+    }
+
+    interface DiagramConnectionEndCapFill {
+        color?: string;
+    }
+
+    interface DiagramConnectionEndCapStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface DiagramConnectionEndCap {
+        fill?: DiagramConnectionEndCapFill;
+        stroke?: DiagramConnectionEndCapStroke;
+        type?: string;
+    }
+
+    interface DiagramConnectionFrom {
+        x?: number;
+        y?: number;
+    }
+
+    interface DiagramConnectionHoverStroke {
+        color?: string;
+    }
+
+    interface DiagramConnectionHover {
+        stroke?: DiagramConnectionHoverStroke;
+    }
+
+    interface DiagramConnectionPoint {
+        x?: number;
+        y?: number;
+    }
+
+    interface DiagramConnectionSelectionHandlesFill {
+        color?: string;
+    }
+
+    interface DiagramConnectionSelectionHandlesStroke {
+        color?: string;
+    }
+
+    interface DiagramConnectionSelectionHandles {
+        fill?: DiagramConnectionSelectionHandlesFill;
+        stroke?: DiagramConnectionSelectionHandlesStroke;
+        width?: number;
+        height?: number;
+    }
+
+    interface DiagramConnectionSelection {
+        handles?: DiagramConnectionSelectionHandles;
+    }
+
+    interface DiagramConnectionStartCapFill {
+        color?: string;
+    }
+
+    interface DiagramConnectionStartCapStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface DiagramConnectionStartCap {
+        fill?: DiagramConnectionStartCapFill;
+        stroke?: DiagramConnectionStartCapStroke;
+        type?: string;
+    }
+
+    interface DiagramConnectionStroke {
+        color?: string;
+        width?: number;
+    }
+
+    interface DiagramConnectionTo {
+        x?: number;
+        y?: number;
+    }
+
+    interface DiagramConnection {
+        content?: DiagramConnectionContent;
+        editable?: DiagramConnectionEditable;
+        endCap?: DiagramConnectionEndCap;
+        from?: DiagramConnectionFrom;
+        fromConnector?: string;
+        hover?: DiagramConnectionHover;
+        points?: DiagramConnectionPoint[];
+        selection?: DiagramConnectionSelection;
+        startCap?: DiagramConnectionStartCap;
+        stroke?: DiagramConnectionStroke;
+        to?: DiagramConnectionTo;
+        toConnector?: string;
+        type?: string;
+    }
+
+    interface DiagramEditableDragSnap {
+        size?: number;
+    }
+
+    interface DiagramEditableDrag {
+        snap?: DiagramEditableDragSnap;
+    }
+
+    interface DiagramEditableResizeHandlesFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface DiagramEditableResizeHandlesHoverFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface DiagramEditableResizeHandlesHoverStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface DiagramEditableResizeHandlesHover {
+        fill?: DiagramEditableResizeHandlesHoverFill;
+        stroke?: DiagramEditableResizeHandlesHoverStroke;
+    }
+
+    interface DiagramEditableResizeHandlesStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface DiagramEditableResizeHandles {
+        fill?: DiagramEditableResizeHandlesFill;
+        height?: number;
+        hover?: DiagramEditableResizeHandlesHover;
+        stroke?: DiagramEditableResizeHandlesStroke;
+        width?: number;
+    }
+
+    interface DiagramEditableResize {
+        handles?: DiagramEditableResizeHandles;
+    }
+
+    interface DiagramEditableRotateFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface DiagramEditableRotateStroke {
+        color?: string;
+        width?: number;
+    }
+
+    interface DiagramEditableRotate {
+        fill?: DiagramEditableRotateFill;
+        stroke?: DiagramEditableRotateStroke;
+    }
+
+    interface DiagramEditableTool {
+        name?: string;
+        step?: number;
+    }
+
+    interface DiagramEditable {
+        connectionTemplate?: string|Function;
+        drag?: DiagramEditableDrag;
+        remove?: boolean;
+        resize?: DiagramEditableResize;
+        rotate?: DiagramEditableRotate;
+        shapeTemplate?: string|Function;
+        tools?: DiagramEditableTool[];
+    }
+
+    interface DiagramLayoutGrid {
+        componentSpacingX?: number;
+        componentSpacingY?: number;
+        offsetX?: number;
+        offsetY?: number;
+        width?: number;
+    }
+
+    interface DiagramLayout {
+        endRadialAngle?: number;
+        grid?: DiagramLayoutGrid;
+        horizontalSeparation?: number;
+        iterations?: number;
+        layerSeparation?: number;
+        nodeDistance?: number;
+        radialFirstLevelSeparation?: number;
+        radialSeparation?: number;
+        startRadialAngle?: number;
+        subtype?: string;
+        tipOverTreeStartLevel?: number;
+        type?: string;
+        underneathHorizontalOffset?: number;
+        underneathVerticalSeparation?: number;
+        underneathVerticalTopOffset?: number;
+        verticalSeparation?: number;
+    }
+
+    interface DiagramPannable {
+        key?: string;
+    }
+
+    interface DiagramPdfMargin {
+        bottom?: number|string;
+        left?: number|string;
+        right?: number|string;
+        top?: number|string;
+    }
+
+    interface DiagramPdf {
+        author?: string;
+        creator?: string;
+        date?: Date;
+        fileName?: string;
+        forceProxy?: boolean;
+        keywords?: string;
+        landscape?: boolean;
+        margin?: DiagramPdfMargin;
+        paperSize?: string|any;
+        proxyURL?: string;
+        proxyTarget?: string;
+        subject?: string;
+        title?: string;
+    }
+
+    interface DiagramSelectableStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface DiagramSelectable {
+        key?: string;
+        stroke?: DiagramSelectableStroke;
+    }
+
+    interface DiagramShapeDefaultsConnectorDefaultsFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface DiagramShapeDefaultsConnectorDefaultsHoverFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface DiagramShapeDefaultsConnectorDefaultsHoverStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface DiagramShapeDefaultsConnectorDefaultsHover {
+        fill?: DiagramShapeDefaultsConnectorDefaultsHoverFill;
+        stroke?: DiagramShapeDefaultsConnectorDefaultsHoverStroke;
+    }
+
+    interface DiagramShapeDefaultsConnectorDefaultsStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface DiagramShapeDefaultsConnectorDefaults {
+        width?: number;
+        height?: number;
+        hover?: DiagramShapeDefaultsConnectorDefaultsHover;
+        fill?: DiagramShapeDefaultsConnectorDefaultsFill;
+        stroke?: DiagramShapeDefaultsConnectorDefaultsStroke;
+    }
+
+    interface DiagramShapeDefaultsConnectorFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface DiagramShapeDefaultsConnectorHoverFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface DiagramShapeDefaultsConnectorHoverStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface DiagramShapeDefaultsConnectorHover {
+        fill?: DiagramShapeDefaultsConnectorHoverFill;
+        stroke?: DiagramShapeDefaultsConnectorHoverStroke;
+    }
+
+    interface DiagramShapeDefaultsConnectorStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface DiagramShapeDefaultsConnector {
+        name?: string;
+        position?: Function;
+        width?: number;
+        height?: number;
+        hover?: DiagramShapeDefaultsConnectorHover;
+        fill?: DiagramShapeDefaultsConnectorFill;
+        stroke?: DiagramShapeDefaultsConnectorStroke;
+    }
+
+    interface DiagramShapeDefaultsContent {
+        align?: string;
+        color?: string;
+        fontFamily?: string;
+        fontSize?: number;
+        template?: string|Function;
+        text?: string;
+    }
+
+    interface DiagramShapeDefaultsEditableTool {
+        name?: string;
+        step?: number;
+    }
+
+    interface DiagramShapeDefaultsEditable {
+        connect?: boolean;
+        drag?: boolean;
+        remove?: boolean;
+        tools?: DiagramShapeDefaultsEditableTool[];
+    }
+
+    interface DiagramShapeDefaultsFillGradientStop {
+        offset?: number;
+        color?: string;
+        opacity?: number;
+    }
+
+    interface DiagramShapeDefaultsFillGradient {
+        type?: string;
+        center?: any;
+        radius?: number;
+        start?: any;
+        end?: any;
+        stops?: DiagramShapeDefaultsFillGradientStop[];
+    }
+
+    interface DiagramShapeDefaultsFill {
+        color?: string;
+        opacity?: number;
+        gradient?: DiagramShapeDefaultsFillGradient;
+    }
+
+    interface DiagramShapeDefaultsHoverFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface DiagramShapeDefaultsHover {
+        fill?: DiagramShapeDefaultsHoverFill;
+    }
+
+    interface DiagramShapeDefaultsRotation {
+        angle?: number;
+    }
+
+    interface DiagramShapeDefaultsStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface DiagramShapeDefaults {
+        connectors?: DiagramShapeDefaultsConnector[];
+        connectorDefaults?: DiagramShapeDefaultsConnectorDefaults;
+        content?: DiagramShapeDefaultsContent;
+        editable?: DiagramShapeDefaultsEditable;
+        fill?: DiagramShapeDefaultsFill;
+        height?: number;
+        hover?: DiagramShapeDefaultsHover;
+        minHeight?: number;
+        minWidth?: number;
+        path?: string;
+        rotation?: DiagramShapeDefaultsRotation;
+        selectable?: boolean;
+        source?: string;
+        stroke?: DiagramShapeDefaultsStroke;
+        type?: string;
+        visual?: Function;
+        width?: number;
+        x?: number;
+        y?: number;
+    }
+
+    interface DiagramShapeConnectorDefaultsFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface DiagramShapeConnectorDefaultsHoverFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface DiagramShapeConnectorDefaultsHoverStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface DiagramShapeConnectorDefaultsHover {
+        fill?: DiagramShapeConnectorDefaultsHoverFill;
+        stroke?: DiagramShapeConnectorDefaultsHoverStroke;
+    }
+
+    interface DiagramShapeConnectorDefaultsStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface DiagramShapeConnectorDefaults {
+        width?: number;
+        height?: number;
+        hover?: DiagramShapeConnectorDefaultsHover;
+        fill?: DiagramShapeConnectorDefaultsFill;
+        stroke?: DiagramShapeConnectorDefaultsStroke;
+    }
+
+    interface DiagramShapeConnectorFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface DiagramShapeConnectorHoverFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface DiagramShapeConnectorHoverStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface DiagramShapeConnectorHover {
+        fill?: DiagramShapeConnectorHoverFill;
+        stroke?: DiagramShapeConnectorHoverStroke;
+    }
+
+    interface DiagramShapeConnectorStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface DiagramShapeConnector {
+        description?: string;
+        name?: string;
+        position?: Function;
+        width?: number;
+        height?: number;
+        hover?: DiagramShapeConnectorHover;
+        fill?: DiagramShapeConnectorFill;
+        stroke?: DiagramShapeConnectorStroke;
+    }
+
+    interface DiagramShapeContent {
+        align?: string;
+        color?: string;
+        fontFamily?: string;
+        fontSize?: number;
+        template?: string|Function;
+        text?: string;
+    }
+
+    interface DiagramShapeEditableTool {
+        name?: string;
+        step?: number;
+    }
+
+    interface DiagramShapeEditable {
+        connect?: boolean;
+        tools?: DiagramShapeEditableTool[];
+    }
+
+    interface DiagramShapeFillGradientStop {
+        offset?: number;
+        color?: string;
+        opacity?: number;
+    }
+
+    interface DiagramShapeFillGradient {
+        type?: string;
+        center?: any;
+        radius?: number;
+        start?: any;
+        end?: any;
+        stops?: DiagramShapeFillGradientStop[];
+    }
+
+    interface DiagramShapeFill {
+        color?: string;
+        opacity?: number;
+        gradient?: DiagramShapeFillGradient;
+    }
+
+    interface DiagramShapeHoverFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface DiagramShapeHover {
+        fill?: DiagramShapeHoverFill;
+    }
+
+    interface DiagramShapeRotation {
+        angle?: number;
+    }
+
+    interface DiagramShapeStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface DiagramShape {
+        connectors?: DiagramShapeConnector[];
+        connectorDefaults?: DiagramShapeConnectorDefaults;
+        content?: DiagramShapeContent;
+        editable?: DiagramShapeEditable;
+        fill?: DiagramShapeFill;
+        height?: number;
+        hover?: DiagramShapeHover;
+        id?: string;
+        minHeight?: number;
+        minWidth?: number;
+        path?: string;
+        rotation?: DiagramShapeRotation;
+        source?: string;
+        stroke?: DiagramShapeStroke;
+        type?: string;
+        visual?: Function;
+        width?: number;
+        x?: number;
+        y?: number;
+    }
+
+    interface DiagramExportImageOptions {
+        width?: string;
+        height?: string;
+        cors?: string;
+    }
+
+    interface DiagramExportSVGOptions {
+        raw?: boolean;
+    }
+
+    interface DiagramSelectOptions {
+        addToSelection?: boolean;
+    }
+
+    interface DiagramOptions {
+        name?: string;
+        autoBind?: boolean;
+        connectionDefaults?: DiagramConnectionDefaults;
+        connections?: DiagramConnection[];
+        connectionsDataSource?: any|any|kendo.data.DataSource;
+        dataSource?: any|any|kendo.data.DataSource;
+        editable?: DiagramEditable;
+        layout?: DiagramLayout;
+        pannable?: DiagramPannable;
+        pdf?: DiagramPdf;
+        selectable?: DiagramSelectable;
+        shapeDefaults?: DiagramShapeDefaults;
+        shapes?: DiagramShape[];
+        template?: string|Function;
+        zoom?: number;
+        zoomMax?: number;
+        zoomMin?: number;
+        zoomRate?: number;
+        add?(e: DiagramAddEvent): void;
+        cancel?(e: DiagramCancelEvent): void;
+        change?(e: DiagramChangeEvent): void;
+        click?(e: DiagramClickEvent): void;
+        dataBound?(e: DiagramDataBoundEvent): void;
+        drag?(e: DiagramDragEvent): void;
+        dragEnd?(e: DiagramDragEndEvent): void;
+        dragStart?(e: DiagramDragStartEvent): void;
+        edit?(e: DiagramEditEvent): void;
+        itemBoundsChange?(e: DiagramItemBoundsChangeEvent): void;
+        itemRotate?(e: DiagramItemRotateEvent): void;
+        mouseEnter?(e: DiagramMouseEnterEvent): void;
+        mouseLeave?(e: DiagramMouseLeaveEvent): void;
+        pan?(e: DiagramPanEvent): void;
+        remove?(e: DiagramRemoveEvent): void;
+        save?(e: DiagramSaveEvent): void;
+        select?(e: DiagramSelectEvent): void;
+        toolBarClick?(e: DiagramToolBarClickEvent): void;
+        zoomEnd?(e: DiagramZoomEndEvent): void;
+        zoomStart?(e: DiagramZoomStartEvent): void;
+    }
+    interface DiagramEvent {
+        sender: Diagram;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface DiagramAddEvent extends DiagramEvent {
+        connection?: kendo.dataviz.diagram.Connection;
+        shape?: kendo.dataviz.diagram.Shape;
+    }
+
+    interface DiagramCancelEvent extends DiagramEvent {
+        container?: JQuery;
+        connection?: kendo.data.Model;
+        shape?: kendo.data.Model;
+    }
+
+    interface DiagramChangeEvent extends DiagramEvent {
+        added?: any;
+        removed?: any;
+    }
+
+    interface DiagramClickEvent extends DiagramEvent {
+        item?: any;
+        meta?: any;
+        point?: kendo.dataviz.diagram.Point;
+    }
+
+    interface DiagramDataBoundEvent extends DiagramEvent {
+    }
+
+    interface DiagramDragEvent extends DiagramEvent {
+        connections?: any;
+        shapes?: any;
+    }
+
+    interface DiagramDragEndEvent extends DiagramEvent {
+        connections?: any;
+        shapes?: any;
+    }
+
+    interface DiagramDragStartEvent extends DiagramEvent {
+        connections?: any;
+        shapes?: any;
+    }
+
+    interface DiagramEditEvent extends DiagramEvent {
+        container?: JQuery;
+        connection?: kendo.data.Model;
+        shape?: kendo.data.Model;
+    }
+
+    interface DiagramItemBoundsChangeEvent extends DiagramEvent {
+        bounds?: kendo.dataviz.diagram.Rect;
+        item?: kendo.dataviz.diagram.Shape;
+    }
+
+    interface DiagramItemRotateEvent extends DiagramEvent {
+        item?: kendo.dataviz.diagram.Shape;
+    }
+
+    interface DiagramMouseEnterEvent extends DiagramEvent {
+        item?: any;
+    }
+
+    interface DiagramMouseLeaveEvent extends DiagramEvent {
+        item?: any;
+    }
+
+    interface DiagramPanEvent extends DiagramEvent {
+        pan?: kendo.dataviz.diagram.Point;
+    }
+
+    interface DiagramRemoveEvent extends DiagramEvent {
+        connection?: kendo.dataviz.diagram.Connection;
+        shape?: kendo.dataviz.diagram.Shape;
+    }
+
+    interface DiagramSaveEvent extends DiagramEvent {
+        container?: JQuery;
+        connection?: kendo.data.Model;
+        shape?: kendo.data.Model;
+    }
+
+    interface DiagramSelectEvent extends DiagramEvent {
+        selected?: any;
+        deselected?: any;
+    }
+
+    interface DiagramToolBarClickEvent extends DiagramEvent {
+        action?: string;
+        shapes?: any;
+        connections?: any;
+        target?: JQuery;
+    }
+
+    interface DiagramZoomEndEvent extends DiagramEvent {
+        point?: kendo.dataviz.diagram.Point;
+        zoom?: number;
+    }
+
+    interface DiagramZoomStartEvent extends DiagramEvent {
+        point?: kendo.dataviz.diagram.Point;
+        zoom?: number;
+    }
+
+
+    class LinearGauge extends kendo.ui.Widget {
+
+        static fn: LinearGauge;
+
+        options: LinearGaugeOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): LinearGauge;
+
+        constructor(element: Element, options?: LinearGaugeOptions);
+
+
+        allValues(values: any): any;
+        destroy(): void;
+        exportImage(options: any): JQueryPromise<any>;
+        exportPDF(options?: kendo.drawing.PDFOptions): JQueryPromise<any>;
+        exportSVG(options: any): JQueryPromise<any>;
+        redraw(): void;
+        resize(force?: boolean): void;
+        svg(): void;
+        imageDataURL(): string;
+        value(): void;
+
+    }
+
+    interface LinearGaugeGaugeAreaBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface LinearGaugeGaugeAreaMargin {
+        top?: number;
+        bottom?: number;
+        left?: number;
+        right?: number;
+    }
+
+    interface LinearGaugeGaugeArea {
+        background?: any;
+        border?: LinearGaugeGaugeAreaBorder;
+        height?: number;
+        margin?: LinearGaugeGaugeAreaMargin;
+        width?: number;
+    }
+
+    interface LinearGaugePointerItemBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface LinearGaugePointerItemTrackBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface LinearGaugePointerItemTrack {
+        border?: LinearGaugePointerItemTrackBorder;
+        color?: string;
+        opacity?: number;
+        size?: number;
+        visible?: boolean;
+    }
+
+    interface LinearGaugePointerItem {
+        border?: LinearGaugePointerItemBorder;
+        color?: string;
+        margin?: number|any;
+        opacity?: number;
+        shape?: string;
+        size?: number;
+        track?: LinearGaugePointerItemTrack;
+        value?: number;
+    }
+
+    interface LinearGaugeScaleLabelsBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface LinearGaugeScaleLabelsMargin {
+        top?: number;
+        bottom?: number;
+        left?: number;
+        right?: number;
+    }
+
+    interface LinearGaugeScaleLabelsPadding {
+        top?: number;
+        bottom?: number;
+        left?: number;
+        right?: number;
+    }
+
+    interface LinearGaugeScaleLabels {
+        background?: string;
+        border?: LinearGaugeScaleLabelsBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        margin?: LinearGaugeScaleLabelsMargin;
+        padding?: LinearGaugeScaleLabelsPadding;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface LinearGaugeScaleLine {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+    }
+
+    interface LinearGaugeScaleMajorTicks {
+        color?: string;
+        size?: number;
+        visible?: boolean;
+        width?: number;
+    }
+
+    interface LinearGaugeScaleMinorTicks {
+        color?: string;
+        size?: number;
+        visible?: boolean;
+        width?: number;
+    }
+
+    interface LinearGaugeScaleRange {
+        from?: number;
+        to?: number;
+        opacity?: number;
+        color?: string;
+    }
+
+    interface LinearGaugeScale {
+        line?: LinearGaugeScaleLine;
+        labels?: LinearGaugeScaleLabels;
+        majorTicks?: LinearGaugeScaleMajorTicks;
+        majorUnit?: number;
+        max?: number;
+        min?: number;
+        minorTicks?: LinearGaugeScaleMinorTicks;
+        minorUnit?: number;
+        mirror?: boolean;
+        ranges?: LinearGaugeScaleRange[];
+        rangePlaceholderColor?: string;
+        rangeSize?: number;
+        reverse?: boolean;
+        vertical?: boolean;
+    }
+
+    interface LinearGaugeExportImageOptions {
+        width?: string;
+        height?: string;
+    }
+
+    interface LinearGaugeExportSVGOptions {
+        raw?: boolean;
+    }
+
+    interface LinearGaugeOptions {
+        name?: string;
+        gaugeArea?: LinearGaugeGaugeArea;
+        pointer?: LinearGaugePointerItem[];
+        renderAs?: string;
+        scale?: LinearGaugeScale;
+        transitions?: boolean;
+    }
+    interface LinearGaugeEvent {
+        sender: LinearGauge;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Map extends kendo.ui.Widget {
+
+        static fn: Map;
+
+        options: MapOptions;
+
+        layers: any;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Map;
+
+        constructor(element: Element, options?: MapOptions);
+
+
+        center(): kendo.dataviz.map.Location;
+        center(center: any): void;
+        center(center: kendo.dataviz.map.Location): void;
+        destroy(): void;
+        eventOffset(e: any): kendo.geometry.Point;
+        eventOffset(e: JQueryEventObject): kendo.geometry.Point;
+        eventToLayer(e: any): kendo.geometry.Point;
+        eventToLayer(e: JQueryEventObject): kendo.geometry.Point;
+        eventToLocation(e: any): kendo.geometry.Point;
+        eventToLocation(e: JQueryEventObject): kendo.geometry.Point;
+        eventToView(e: any): kendo.geometry.Point;
+        eventToView(e: JQueryEventObject): kendo.geometry.Point;
+        extent(): kendo.dataviz.map.Extent;
+        extent(extent: kendo.dataviz.map.Extent): void;
+        layerToLocation(point: any, zoom: number): kendo.dataviz.map.Location;
+        layerToLocation(point: kendo.geometry.Point, zoom: number): kendo.dataviz.map.Location;
+        locationToLayer(location: any, zoom: number): kendo.geometry.Point;
+        locationToLayer(location: kendo.dataviz.map.Location, zoom: number): kendo.geometry.Point;
+        locationToView(location: any): kendo.geometry.Point;
+        locationToView(location: kendo.dataviz.map.Location): kendo.geometry.Point;
+        resize(force?: boolean): void;
+        setOptions(options: any): void;
+        viewSize(): any;
+        viewToLocation(point: any, zoom: number): kendo.dataviz.map.Location;
+        viewToLocation(point: kendo.geometry.Point, zoom: number): kendo.dataviz.map.Location;
+        zoom(): number;
+        zoom(level: number): void;
+
+    }
+
+    interface MapControlsAttribution {
+        position?: string;
+    }
+
+    interface MapControlsNavigator {
+        position?: string;
+    }
+
+    interface MapControlsZoom {
+        position?: string;
+    }
+
+    interface MapControls {
+        attribution?: MapControlsAttribution;
+        navigator?: MapControlsNavigator;
+        zoom?: MapControlsZoom;
+    }
+
+    interface MapLayerDefaultsBing {
+        attribution?: string;
+        opacity?: number;
+        key?: string;
+        imagerySet?: string;
+        culture?: string;
+    }
+
+    interface MapLayerDefaultsBubbleStyleFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface MapLayerDefaultsBubbleStyleStroke {
+        color?: string;
+        dashType?: string;
+        opacity?: number;
+        width?: number;
+    }
+
+    interface MapLayerDefaultsBubbleStyle {
+        fill?: MapLayerDefaultsBubbleStyleFill;
+        stroke?: MapLayerDefaultsBubbleStyleStroke;
+    }
+
+    interface MapLayerDefaultsBubble {
+        attribution?: string;
+        opacity?: number;
+        maxSize?: number;
+        minSize?: number;
+        style?: MapLayerDefaultsBubbleStyle;
+        symbol?: string|Function;
+    }
+
+    interface MapLayerDefaultsMarkerTooltipAnimationClose {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface MapLayerDefaultsMarkerTooltipAnimationOpen {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface MapLayerDefaultsMarkerTooltipAnimation {
+        close?: MapLayerDefaultsMarkerTooltipAnimationClose;
+        open?: MapLayerDefaultsMarkerTooltipAnimationOpen;
+    }
+
+    interface MapLayerDefaultsMarkerTooltipContent {
+        url?: string;
+    }
+
+    interface MapLayerDefaultsMarkerTooltip {
+        autoHide?: boolean;
+        animation?: MapLayerDefaultsMarkerTooltipAnimation;
+        content?: MapLayerDefaultsMarkerTooltipContent;
+        template?: string;
+        callout?: boolean;
+        iframe?: boolean;
+        height?: number;
+        width?: number;
+        position?: string;
+        showAfter?: number;
+        showOn?: string;
+    }
+
+    interface MapLayerDefaultsMarker {
+        shape?: string;
+        tooltip?: MapLayerDefaultsMarkerTooltip;
+        opacity?: number;
+    }
+
+    interface MapLayerDefaultsShapeStyleFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface MapLayerDefaultsShapeStyleStroke {
+        color?: string;
+        dashType?: string;
+        opacity?: number;
+        width?: number;
+    }
+
+    interface MapLayerDefaultsShapeStyle {
+        fill?: MapLayerDefaultsShapeStyleFill;
+        stroke?: MapLayerDefaultsShapeStyleStroke;
+    }
+
+    interface MapLayerDefaultsShape {
+        attribution?: string;
+        opacity?: number;
+        style?: MapLayerDefaultsShapeStyle;
+    }
+
+    interface MapLayerDefaultsTile {
+        urlTemplate?: string;
+        attribution?: string;
+        subdomains?: any;
+        opacity?: number;
+    }
+
+    interface MapLayerDefaults {
+        marker?: MapLayerDefaultsMarker;
+        shape?: MapLayerDefaultsShape;
+        bubble?: MapLayerDefaultsBubble;
+        tileSize?: number;
+        tile?: MapLayerDefaultsTile;
+        bing?: MapLayerDefaultsBing;
+    }
+
+    interface MapLayerStyleFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface MapLayerStyleStroke {
+        color?: string;
+        dashType?: number;
+        opacity?: number;
+        width?: number;
+    }
+
+    interface MapLayerStyle {
+        fill?: MapLayerStyleFill;
+        stroke?: MapLayerStyleStroke;
+    }
+
+    interface MapLayerTooltipAnimationClose {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface MapLayerTooltipAnimationOpen {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface MapLayerTooltipAnimation {
+        close?: MapLayerTooltipAnimationClose;
+        open?: MapLayerTooltipAnimationOpen;
+    }
+
+    interface MapLayerTooltipContent {
+        url?: string;
+    }
+
+    interface MapLayerTooltip {
+        autoHide?: boolean;
+        animation?: MapLayerTooltipAnimation;
+        content?: MapLayerTooltipContent;
+        template?: string;
+        callout?: boolean;
+        iframe?: boolean;
+        height?: number;
+        width?: number;
+        position?: string;
+        showAfter?: number;
+        showOn?: string;
+    }
+
+    interface MapLayer {
+        attribution?: string;
+        autoBind?: boolean;
+        dataSource?: any|any|kendo.data.DataSource;
+        extent?: any|kendo.dataviz.map.Extent;
+        key?: string;
+        imagerySet?: string;
+        culture?: string;
+        locationField?: string;
+        shape?: string;
+        tileSize?: number;
+        titleField?: string;
+        tooltip?: MapLayerTooltip;
+        maxSize?: number;
+        minSize?: number;
+        opacity?: number;
+        subdomains?: any;
+        symbol?: string|Function;
+        type?: string;
+        style?: MapLayerStyle;
+        urlTemplate?: string;
+        valueField?: string;
+        zIndex?: number;
+    }
+
+    interface MapMarkerDefaultsTooltipAnimationClose {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface MapMarkerDefaultsTooltipAnimationOpen {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface MapMarkerDefaultsTooltipAnimation {
+        close?: MapMarkerDefaultsTooltipAnimationClose;
+        open?: MapMarkerDefaultsTooltipAnimationOpen;
+    }
+
+    interface MapMarkerDefaultsTooltipContent {
+        url?: string;
+    }
+
+    interface MapMarkerDefaultsTooltip {
+        autoHide?: boolean;
+        animation?: MapMarkerDefaultsTooltipAnimation;
+        content?: MapMarkerDefaultsTooltipContent;
+        template?: string;
+        callout?: boolean;
+        iframe?: boolean;
+        height?: number;
+        width?: number;
+        position?: string;
+        showAfter?: number;
+        showOn?: string;
+    }
+
+    interface MapMarkerDefaults {
+        shape?: string;
+        tooltip?: MapMarkerDefaultsTooltip;
+    }
+
+    interface MapMarkerTooltipAnimationClose {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface MapMarkerTooltipAnimationOpen {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface MapMarkerTooltipAnimation {
+        close?: MapMarkerTooltipAnimationClose;
+        open?: MapMarkerTooltipAnimationOpen;
+    }
+
+    interface MapMarkerTooltipContent {
+        url?: string;
+    }
+
+    interface MapMarkerTooltip {
+        autoHide?: boolean;
+        animation?: MapMarkerTooltipAnimation;
+        content?: MapMarkerTooltipContent;
+        template?: string;
+        callout?: boolean;
+        iframe?: boolean;
+        height?: number;
+        width?: number;
+        position?: string;
+        showAfter?: number;
+        showOn?: string;
+    }
+
+    interface MapMarker {
+        location?: any|kendo.dataviz.map.Location;
+        shape?: string;
+        title?: string;
+        tooltip?: MapMarkerTooltip;
+    }
+
+    interface MapOptions {
+        name?: string;
+        center?: any|kendo.dataviz.map.Location;
+        controls?: MapControls;
+        layerDefaults?: MapLayerDefaults;
+        layers?: MapLayer[];
+        markerDefaults?: MapMarkerDefaults;
+        markers?: MapMarker[];
+        minZoom?: number;
+        maxZoom?: number;
+        minSize?: number;
+        pannable?: boolean;
+        wraparound?: boolean;
+        zoom?: number;
+        zoomable?: boolean;
+        beforeReset?(e: MapBeforeResetEvent): void;
+        click?(e: MapClickEvent): void;
+        markerActivate?(e: MapMarkerActivateEvent): void;
+        markerCreated?(e: MapMarkerCreatedEvent): void;
+        markerClick?(e: MapMarkerClickEvent): void;
+        pan?(e: MapPanEvent): void;
+        panEnd?(e: MapPanEndEvent): void;
+        reset?(e: MapResetEvent): void;
+        shapeClick?(e: MapShapeClickEvent): void;
+        shapeCreated?(e: MapShapeCreatedEvent): void;
+        shapeMouseEnter?(e: MapShapeMouseEnterEvent): void;
+        shapeMouseLeave?(e: MapShapeMouseLeaveEvent): void;
+        zoomStart?(e: MapZoomStartEvent): void;
+        zoomEnd?(e: MapZoomEndEvent): void;
+    }
+    interface MapEvent {
+        sender: Map;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface MapBeforeResetEvent extends MapEvent {
+    }
+
+    interface MapClickEvent extends MapEvent {
+        location?: kendo.dataviz.map.Location;
+        originalEvent?: any;
+    }
+
+    interface MapMarkerActivateEvent extends MapEvent {
+        marker?: kendo.dataviz.map.Marker;
+        layer?: kendo.dataviz.map.Marker;
+    }
+
+    interface MapMarkerCreatedEvent extends MapEvent {
+        marker?: kendo.dataviz.map.Marker;
+        layer?: kendo.dataviz.map.Marker;
+    }
+
+    interface MapMarkerClickEvent extends MapEvent {
+        marker?: kendo.dataviz.map.Marker;
+        layer?: kendo.dataviz.map.Marker;
+    }
+
+    interface MapPanEvent extends MapEvent {
+        origin?: kendo.dataviz.map.Location;
+        center?: kendo.dataviz.map.Location;
+        originalEvent?: any;
+    }
+
+    interface MapPanEndEvent extends MapEvent {
+        origin?: kendo.dataviz.map.Location;
+        center?: kendo.dataviz.map.Location;
+        originalEvent?: any;
+    }
+
+    interface MapResetEvent extends MapEvent {
+    }
+
+    interface MapShapeClickEvent extends MapEvent {
+        layer?: kendo.dataviz.map.layer.Shape;
+        shape?: kendo.drawing.Element;
+        originalEvent?: any;
+    }
+
+    interface MapShapeCreatedEvent extends MapEvent {
+        layer?: kendo.dataviz.map.layer.Shape;
+        shape?: kendo.drawing.Element;
+        originalEvent?: any;
+    }
+
+    interface MapShapeMouseEnterEvent extends MapEvent {
+        layer?: kendo.dataviz.map.layer.Shape;
+        shape?: kendo.drawing.Element;
+        originalEvent?: any;
+    }
+
+    interface MapShapeMouseLeaveEvent extends MapEvent {
+        layer?: kendo.dataviz.map.layer.Shape;
+        shape?: kendo.drawing.Element;
+        originalEvent?: any;
+    }
+
+    interface MapZoomStartEvent extends MapEvent {
+        originalEvent?: any;
+    }
+
+    interface MapZoomEndEvent extends MapEvent {
+        originalEvent?: any;
+    }
+
+
+    class QRCode extends kendo.ui.Widget {
+
+        static fn: QRCode;
+
+        options: QRCodeOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): QRCode;
+
+        constructor(element: Element, options?: QRCodeOptions);
+
+
+        destroy(): void;
+        exportImage(options: any): JQueryPromise<any>;
+        exportPDF(options?: kendo.drawing.PDFOptions): JQueryPromise<any>;
+        exportSVG(options: any): JQueryPromise<any>;
+        imageDataURL(): string;
+        redraw(): void;
+        resize(force?: boolean): void;
+        setOptions(options: any): void;
+        svg(): string;
+        value(options: string): void;
+        value(options: number): void;
+
+    }
+
+    interface QRCodeBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface QRCodeExportImageOptions {
+        width?: string;
+        height?: string;
+    }
+
+    interface QRCodeExportSVGOptions {
+        raw?: boolean;
+    }
+
+    interface QRCodeOptions {
+        name?: string;
+        background?: string;
+        border?: QRCodeBorder;
+        color?: string;
+        encoding?: string;
+        errorCorrection?: string;
+        padding?: number;
+        renderAs?: string;
+        size?: number|string;
+        value?: number|string;
+    }
+    interface QRCodeEvent {
+        sender: QRCode;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class RadialGauge extends kendo.ui.Widget {
+
+        static fn: RadialGauge;
+
+        options: RadialGaugeOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): RadialGauge;
+
+        constructor(element: Element, options?: RadialGaugeOptions);
+
+
+        allValues(values: any): any;
+        destroy(): void;
+        exportImage(options: any): JQueryPromise<any>;
+        exportPDF(options?: kendo.drawing.PDFOptions): JQueryPromise<any>;
+        exportSVG(options: any): JQueryPromise<any>;
+        redraw(): void;
+        resize(force?: boolean): void;
+        svg(): void;
+        imageDataURL(): string;
+        value(): void;
+
+    }
+
+    interface RadialGaugeGaugeAreaBorder {
+        color?: string;
+        dashType?: string;
+        opacity?: number;
+        width?: number;
+    }
+
+    interface RadialGaugeGaugeAreaMargin {
+        top?: number;
+        bottom?: number;
+        left?: number;
+        right?: number;
+    }
+
+    interface RadialGaugeGaugeArea {
+        background?: any;
+        border?: RadialGaugeGaugeAreaBorder;
+        height?: number;
+        margin?: RadialGaugeGaugeAreaMargin;
+        width?: number;
+    }
+
+    interface RadialGaugePointerItemCap {
+        color?: string;
+        size?: number;
+    }
+
+    interface RadialGaugePointerItem {
+        cap?: RadialGaugePointerItemCap;
+        color?: string;
+        value?: number;
+    }
+
+    interface RadialGaugeScaleLabelsBorder {
+        color?: string;
+        dashType?: string;
+        opacity?: number;
+        width?: number;
+    }
+
+    interface RadialGaugeScaleLabelsMargin {
+        top?: number;
+        bottom?: number;
+        left?: number;
+        right?: number;
+    }
+
+    interface RadialGaugeScaleLabelsPadding {
+        top?: number;
+        bottom?: number;
+        left?: number;
+        right?: number;
+    }
+
+    interface RadialGaugeScaleLabels {
+        background?: string;
+        border?: RadialGaugeScaleLabelsBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        margin?: RadialGaugeScaleLabelsMargin;
+        padding?: RadialGaugeScaleLabelsPadding;
+        position?: string;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface RadialGaugeScaleMajorTicks {
+        color?: string;
+        size?: number;
+        visible?: boolean;
+        width?: number;
+    }
+
+    interface RadialGaugeScaleMinorTicks {
+        color?: string;
+        size?: number;
+        visible?: boolean;
+        width?: number;
+    }
+
+    interface RadialGaugeScaleRange {
+        from?: number;
+        to?: number;
+        opacity?: number;
+        color?: string;
+    }
+
+    interface RadialGaugeScale {
+        endAngle?: number;
+        labels?: RadialGaugeScaleLabels;
+        majorTicks?: RadialGaugeScaleMajorTicks;
+        majorUnit?: number;
+        max?: number;
+        min?: number;
+        minorTicks?: RadialGaugeScaleMinorTicks;
+        minorUnit?: number;
+        ranges?: RadialGaugeScaleRange[];
+        rangePlaceholderColor?: string;
+        rangeSize?: number;
+        rangeDistance?: number;
+        reverse?: boolean;
+        startAngle?: number;
+    }
+
+    interface RadialGaugeExportImageOptions {
+        width?: string;
+        height?: string;
+    }
+
+    interface RadialGaugeExportSVGOptions {
+        raw?: boolean;
+    }
+
+    interface RadialGaugeOptions {
+        name?: string;
+        gaugeArea?: RadialGaugeGaugeArea;
+        pointer?: RadialGaugePointerItem[];
+        renderAs?: string;
+        scale?: RadialGaugeScale;
+        transitions?: boolean;
+    }
+    interface RadialGaugeEvent {
+        sender: RadialGauge;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Sparkline extends kendo.ui.Widget {
+
+        static fn: Sparkline;
+
+        options: SparklineOptions;
+
+        dataSource: kendo.data.DataSource;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Sparkline;
+
+        constructor(element: Element, options?: SparklineOptions);
+
+
+        destroy(): void;
+        exportImage(options: any): JQueryPromise<any>;
+        exportPDF(options?: kendo.drawing.PDFOptions): JQueryPromise<any>;
+        exportSVG(options: any): JQueryPromise<any>;
+        refresh(): void;
+        setDataSource(dataSource: kendo.data.DataSource): void;
+        setOptions(options: any): void;
+        svg(): string;
+        imageDataURL(): string;
+
+    }
+
+    interface SparklineCategoryAxisItemCrosshairTooltipBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface SparklineCategoryAxisItemCrosshairTooltip {
+        background?: string;
+        border?: SparklineCategoryAxisItemCrosshairTooltipBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        padding?: number|any;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface SparklineCategoryAxisItemCrosshair {
+        color?: string;
+        width?: number;
+        opacity?: number;
+        dashType?: number;
+        visible?: boolean;
+        tooltip?: SparklineCategoryAxisItemCrosshairTooltip;
+    }
+
+    interface SparklineCategoryAxisItemLabelsBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface SparklineCategoryAxisItemLabels {
+        background?: string;
+        border?: SparklineCategoryAxisItemLabelsBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        margin?: number|any;
+        mirror?: boolean;
+        padding?: number|any;
+        rotation?: number;
+        skip?: number;
+        step?: number;
+        template?: string|Function;
+        visible?: boolean;
+        culture?: string;
+        dateFormats?: any;
+    }
+
+    interface SparklineCategoryAxisItemLine {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+    }
+
+    interface SparklineCategoryAxisItemMajorGridLines {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface SparklineCategoryAxisItemMajorTicks {
+        size?: number;
+        visible?: boolean;
+        color?: string;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface SparklineCategoryAxisItemMinorGridLines {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface SparklineCategoryAxisItemMinorTicks {
+        size?: number;
+        visible?: boolean;
+        color?: string;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface SparklineCategoryAxisItemNotesDataItemIconBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface SparklineCategoryAxisItemNotesDataItemIcon {
+        background?: string;
+        border?: SparklineCategoryAxisItemNotesDataItemIconBorder;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface SparklineCategoryAxisItemNotesDataItemLabelBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface SparklineCategoryAxisItemNotesDataItemLabel {
+        background?: string;
+        border?: SparklineCategoryAxisItemNotesDataItemLabelBorder;
+        color?: string;
+        font?: string;
+        template?: string|Function;
+        visible?: boolean;
+        rotation?: number;
+        format?: string;
+        text?: string;
+        position?: string;
+    }
+
+    interface SparklineCategoryAxisItemNotesDataItemLine {
+        width?: number;
+        color?: string;
+        length?: number;
+    }
+
+    interface SparklineCategoryAxisItemNotesDataItem {
+        value?: any;
+        position?: string;
+        icon?: SparklineCategoryAxisItemNotesDataItemIcon;
+        label?: SparklineCategoryAxisItemNotesDataItemLabel;
+        line?: SparklineCategoryAxisItemNotesDataItemLine;
+    }
+
+    interface SparklineCategoryAxisItemNotesIconBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface SparklineCategoryAxisItemNotesIcon {
+        background?: string;
+        border?: SparklineCategoryAxisItemNotesIconBorder;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface SparklineCategoryAxisItemNotesLabelBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface SparklineCategoryAxisItemNotesLabel {
+        background?: string;
+        border?: SparklineCategoryAxisItemNotesLabelBorder;
+        color?: string;
+        font?: string;
+        template?: string|Function;
+        visible?: boolean;
+        rotation?: number;
+        format?: string;
+        position?: string;
+    }
+
+    interface SparklineCategoryAxisItemNotesLine {
+        width?: number;
+        color?: string;
+        length?: number;
+    }
+
+    interface SparklineCategoryAxisItemNotes {
+        position?: string;
+        icon?: SparklineCategoryAxisItemNotesIcon;
+        label?: SparklineCategoryAxisItemNotesLabel;
+        line?: SparklineCategoryAxisItemNotesLine;
+        data?: SparklineCategoryAxisItemNotesDataItem[];
+    }
+
+    interface SparklineCategoryAxisItemPlotBand {
+        from?: number;
+        to?: number;
+        color?: string;
+        opacity?: number;
+    }
+
+    interface SparklineCategoryAxisItemTitleBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface SparklineCategoryAxisItemTitle {
+        background?: string;
+        border?: SparklineCategoryAxisItemTitleBorder;
+        color?: string;
+        font?: string;
+        margin?: number|any;
+        position?: string;
+        rotation?: number;
+        text?: string;
+        visible?: boolean;
+    }
+
+    interface SparklineCategoryAxisItem {
+        axisCrossingValue?: any|Date|any;
+        categories?: any;
+        color?: string;
+        field?: string;
+        justified?: boolean;
+        labels?: SparklineCategoryAxisItemLabels;
+        line?: SparklineCategoryAxisItemLine;
+        majorGridLines?: SparklineCategoryAxisItemMajorGridLines;
+        majorTicks?: SparklineCategoryAxisItemMajorTicks;
+        minorGridLines?: SparklineCategoryAxisItemMinorGridLines;
+        minorTicks?: SparklineCategoryAxisItemMinorTicks;
+        name?: string;
+        plotBands?: SparklineCategoryAxisItemPlotBand[];
+        reverse?: boolean;
+        title?: SparklineCategoryAxisItemTitle;
+        type?: string;
+        autoBaseUnitSteps?: any;
+        baseUnit?: string;
+        baseUnitStep?: any;
+        max?: any;
+        min?: any;
+        roundToBaseUnit?: boolean;
+        weekStartDay?: number;
+        maxDateGroups?: number;
+        visible?: boolean;
+        crosshair?: SparklineCategoryAxisItemCrosshair;
+        notes?: SparklineCategoryAxisItemNotes;
+    }
+
+    interface SparklineChartAreaBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface SparklineChartArea {
+        background?: string;
+        opacity?: number;
+        border?: SparklineChartAreaBorder;
+        height?: number;
+        margin?: number|any;
+        width?: number;
+    }
+
+    interface SparklinePlotAreaBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface SparklinePlotArea {
+        background?: string;
+        opacity?: number;
+        border?: SparklinePlotAreaBorder;
+        margin?: number|any;
+    }
+
+    interface SparklineSeriesItemBorder {
+        color?: string|Function;
+        dashType?: string|Function;
+        opacity?: number|Function;
+        width?: number|Function;
+    }
+
+    interface SparklineSeriesItemConnectors {
+        color?: string;
+        padding?: number;
+        width?: number;
+    }
+
+    interface SparklineSeriesItemHighlightBorder {
+        width?: number;
+        color?: string;
+        opacity?: number;
+    }
+
+    interface SparklineSeriesItemHighlight {
+        border?: SparklineSeriesItemHighlightBorder;
+        color?: string;
+        opacity?: number;
+        visible?: boolean;
+    }
+
+    interface SparklineSeriesItemLabelsBorder {
+        color?: string|Function;
+        dashType?: string|Function;
+        width?: number|Function;
+    }
+
+    interface SparklineSeriesItemLabels {
+        align?: string;
+        background?: string|Function;
+        border?: SparklineSeriesItemLabelsBorder;
+        color?: string|Function;
+        distance?: number;
+        font?: string|Function;
+        format?: string|Function;
+        margin?: number|any;
+        padding?: number|any;
+        position?: string|Function;
+        template?: string|Function;
+        visible?: boolean|Function;
+    }
+
+    interface SparklineSeriesItemLine {
+        color?: string;
+        opacity?: number;
+        width?: string;
+        style?: string;
+    }
+
+    interface SparklineSeriesItemMarkersBorder {
+        color?: string|Function;
+        width?: number|Function;
+    }
+
+    interface SparklineSeriesItemMarkers {
+        background?: string|Function;
+        border?: SparklineSeriesItemMarkersBorder;
+        size?: number|Function;
+        type?: string|Function;
+        visible?: boolean|Function;
+        rotation?: number|Function;
+    }
+
+    interface SparklineSeriesItemNotesIconBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface SparklineSeriesItemNotesIcon {
+        background?: string;
+        border?: SparklineSeriesItemNotesIconBorder;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface SparklineSeriesItemNotesLabelBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface SparklineSeriesItemNotesLabel {
+        background?: string;
+        border?: SparklineSeriesItemNotesLabelBorder;
+        color?: string;
+        font?: string;
+        template?: string|Function;
+        visible?: boolean;
+        rotation?: number;
+        format?: string;
+        position?: string;
+    }
+
+    interface SparklineSeriesItemNotesLine {
+        width?: number;
+        color?: string;
+        length?: number;
+    }
+
+    interface SparklineSeriesItemNotes {
+        position?: string;
+        icon?: SparklineSeriesItemNotesIcon;
+        label?: SparklineSeriesItemNotesLabel;
+        line?: SparklineSeriesItemNotesLine;
+    }
+
+    interface SparklineSeriesItemOverlay {
+        gradient?: string;
+    }
+
+    interface SparklineSeriesItemStack {
+        type?: string;
+        group?: string;
+    }
+
+    interface SparklineSeriesItemTargetBorder {
+        color?: string|Function;
+        dashType?: string|Function;
+        width?: number;
+    }
+
+    interface SparklineSeriesItemTargetLine {
+        width?: any|Function;
+    }
+
+    interface SparklineSeriesItemTarget {
+        line?: SparklineSeriesItemTargetLine;
+        color?: string|Function;
+        border?: SparklineSeriesItemTargetBorder;
+    }
+
+    interface SparklineSeriesItemTooltipBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface SparklineSeriesItemTooltip {
+        background?: string;
+        border?: SparklineSeriesItemTooltipBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        padding?: number|any;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface SparklineSeriesItem {
+        type?: string;
+        dashType?: string;
+        data?: any;
+        explodeField?: string;
+        currentField?: string;
+        targetField?: string;
+        field?: string;
+        name?: string;
+        highlight?: SparklineSeriesItemHighlight;
+        aggregate?: string|Function;
+        axis?: string;
+        border?: SparklineSeriesItemBorder;
+        categoryField?: string;
+        color?: string|Function;
+        colorField?: string;
+        connectors?: SparklineSeriesItemConnectors;
+        gap?: number;
+        labels?: SparklineSeriesItemLabels;
+        line?: SparklineSeriesItemLine;
+        markers?: SparklineSeriesItemMarkers;
+        missingValues?: string;
+        style?: string;
+        negativeColor?: string;
+        opacity?: number;
+        overlay?: SparklineSeriesItemOverlay;
+        padding?: number;
+        size?: number;
+        startAngle?: number;
+        spacing?: number;
+        stack?: SparklineSeriesItemStack;
+        tooltip?: SparklineSeriesItemTooltip;
+        width?: number;
+        target?: SparklineSeriesItemTarget;
+        notes?: SparklineSeriesItemNotes;
+        zIndex?: number;
+    }
+
+    interface SparklineSeriesDefaultsBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface SparklineSeriesDefaultsLabelsBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface SparklineSeriesDefaultsLabels {
+        background?: string;
+        border?: SparklineSeriesDefaultsLabelsBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        margin?: number|any;
+        padding?: number|any;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface SparklineSeriesDefaultsStack {
+        type?: string;
+    }
+
+    interface SparklineSeriesDefaultsTooltipBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface SparklineSeriesDefaultsTooltip {
+        background?: string;
+        border?: SparklineSeriesDefaultsTooltipBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        padding?: number|any;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface SparklineSeriesDefaults {
+        area?: any;
+        bar?: any;
+        border?: SparklineSeriesDefaultsBorder;
+        column?: any;
+        gap?: number;
+        labels?: SparklineSeriesDefaultsLabels;
+        line?: any;
+        overlay?: any;
+        pie?: any;
+        spacing?: number;
+        stack?: SparklineSeriesDefaultsStack;
+        type?: string;
+        tooltip?: SparklineSeriesDefaultsTooltip;
+    }
+
+    interface SparklineTooltipBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface SparklineTooltip {
+        background?: string;
+        border?: SparklineTooltipBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        padding?: number|any;
+        template?: string|Function;
+        visible?: boolean;
+        shared?: boolean;
+        sharedTemplate?: string;
+    }
+
+    interface SparklineValueAxisItemCrosshairTooltipBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface SparklineValueAxisItemCrosshairTooltip {
+        background?: string;
+        border?: SparklineValueAxisItemCrosshairTooltipBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        padding?: number|any;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface SparklineValueAxisItemCrosshair {
+        color?: string;
+        width?: number;
+        opacity?: number;
+        dashType?: number;
+        visible?: boolean;
+        tooltip?: SparklineValueAxisItemCrosshairTooltip;
+    }
+
+    interface SparklineValueAxisItemLabelsBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface SparklineValueAxisItemLabels {
+        background?: string;
+        border?: SparklineValueAxisItemLabelsBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        margin?: number|any;
+        mirror?: boolean;
+        padding?: number|any;
+        rotation?: number;
+        skip?: number;
+        step?: number;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface SparklineValueAxisItemLine {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+    }
+
+    interface SparklineValueAxisItemMajorGridLines {
+        color?: string;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface SparklineValueAxisItemMajorTicks {
+        size?: number;
+        visible?: boolean;
+        color?: string;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface SparklineValueAxisItemMinorGridLines {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface SparklineValueAxisItemMinorTicks {
+        size?: number;
+        color?: string;
+        width?: number;
+        visible?: boolean;
+        step?: number;
+        skip?: number;
+    }
+
+    interface SparklineValueAxisItemNotesDataItemIconBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface SparklineValueAxisItemNotesDataItemIcon {
+        background?: string;
+        border?: SparklineValueAxisItemNotesDataItemIconBorder;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface SparklineValueAxisItemNotesDataItemLabelBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface SparklineValueAxisItemNotesDataItemLabel {
+        background?: string;
+        border?: SparklineValueAxisItemNotesDataItemLabelBorder;
+        color?: string;
+        font?: string;
+        template?: string|Function;
+        visible?: boolean;
+        rotation?: number;
+        format?: string;
+        text?: string;
+        position?: string;
+    }
+
+    interface SparklineValueAxisItemNotesDataItemLine {
+        width?: number;
+        color?: string;
+        length?: number;
+    }
+
+    interface SparklineValueAxisItemNotesDataItem {
+        value?: any;
+        position?: string;
+        icon?: SparklineValueAxisItemNotesDataItemIcon;
+        label?: SparklineValueAxisItemNotesDataItemLabel;
+        line?: SparklineValueAxisItemNotesDataItemLine;
+    }
+
+    interface SparklineValueAxisItemNotesIconBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface SparklineValueAxisItemNotesIcon {
+        background?: string;
+        border?: SparklineValueAxisItemNotesIconBorder;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface SparklineValueAxisItemNotesLabelBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface SparklineValueAxisItemNotesLabel {
+        background?: string;
+        border?: SparklineValueAxisItemNotesLabelBorder;
+        color?: string;
+        font?: string;
+        template?: string|Function;
+        visible?: boolean;
+        rotation?: number;
+        format?: string;
+        position?: string;
+    }
+
+    interface SparklineValueAxisItemNotesLine {
+        width?: number;
+        color?: string;
+        length?: number;
+    }
+
+    interface SparklineValueAxisItemNotes {
+        position?: string;
+        icon?: SparklineValueAxisItemNotesIcon;
+        label?: SparklineValueAxisItemNotesLabel;
+        line?: SparklineValueAxisItemNotesLine;
+        data?: SparklineValueAxisItemNotesDataItem[];
+    }
+
+    interface SparklineValueAxisItemPlotBand {
+        from?: number;
+        to?: number;
+        color?: string;
+        opacity?: number;
+    }
+
+    interface SparklineValueAxisItemTitleBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface SparklineValueAxisItemTitle {
+        background?: string;
+        border?: SparklineValueAxisItemTitleBorder;
+        color?: string;
+        font?: string;
+        margin?: number|any;
+        padding?: number|any;
+        position?: string;
+        rotation?: number;
+        text?: string;
+        visible?: boolean;
+    }
+
+    interface SparklineValueAxisItem {
+        axisCrossingValue?: any|Date|any;
+        color?: string;
+        labels?: SparklineValueAxisItemLabels;
+        line?: SparklineValueAxisItemLine;
+        majorGridLines?: SparklineValueAxisItemMajorGridLines;
+        majorTicks?: SparklineValueAxisItemMajorTicks;
+        majorUnit?: number;
+        max?: number;
+        min?: number;
+        minorGridLines?: SparklineValueAxisItemMinorGridLines;
+        minorTicks?: SparklineValueAxisItemMinorTicks;
+        minorUnit?: number;
+        name?: any;
+        narrowRange?: boolean;
+        plotBands?: SparklineValueAxisItemPlotBand[];
+        reverse?: boolean;
+        title?: SparklineValueAxisItemTitle;
+        visible?: boolean;
+        crosshair?: SparklineValueAxisItemCrosshair;
+        notes?: SparklineValueAxisItemNotes;
+    }
+
+    interface SparklineExportImageOptions {
+        width?: string;
+        height?: string;
+    }
+
+    interface SparklineExportSVGOptions {
+        raw?: boolean;
+    }
+
+    interface SparklineSeriesClickEventSeries {
+        type?: string;
+        name?: string;
+        data?: any;
+    }
+
+    interface SparklineSeriesHoverEventSeries {
+        type?: string;
+        name?: string;
+        data?: any;
+    }
+
+    interface SparklineOptions {
+        name?: string;
+        axisDefaults?: any;
+        categoryAxis?: SparklineCategoryAxisItem[];
+        chartArea?: SparklineChartArea;
+        data?: any;
+        dataSource?: any;
+        autoBind?: boolean;
+        plotArea?: SparklinePlotArea;
+        pointWidth?: number;
+        renderAs?: string;
+        series?: SparklineSeriesItem[];
+        seriesColors?: any;
+        seriesDefaults?: SparklineSeriesDefaults;
+        theme?: string;
+        tooltip?: SparklineTooltip;
+        transitions?: boolean;
+        type?: string;
+        valueAxis?: SparklineValueAxisItem[];
+        axisLabelClick?(e: SparklineAxisLabelClickEvent): void;
+        dataBound?(e: SparklineEvent): void;
+        dragStart?(e: SparklineDragStartEvent): void;
+        drag?(e: SparklineDragEvent): void;
+        dragEnd?(e: SparklineDragEndEvent): void;
+        plotAreaClick?(e: SparklinePlotAreaClickEvent): void;
+        seriesClick?(e: SparklineSeriesClickEvent): void;
+        seriesHover?(e: SparklineSeriesHoverEvent): void;
+        zoomStart?(e: SparklineZoomStartEvent): void;
+        zoom?(e: SparklineZoomEvent): void;
+        zoomEnd?(e: SparklineZoomEndEvent): void;
+    }
+    interface SparklineEvent {
+        sender: Sparkline;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface SparklineAxisLabelClickEvent extends SparklineEvent {
+        axis?: any;
+        value?: any;
+        text?: any;
+        index?: any;
+        dataItem?: any;
+        element?: any;
+    }
+
+    interface SparklineDragStartEvent extends SparklineEvent {
+        axisRanges?: any;
+        originalEvent?: any;
+    }
+
+    interface SparklineDragEvent extends SparklineEvent {
+        axisRanges?: any;
+        originalEvent?: any;
+    }
+
+    interface SparklineDragEndEvent extends SparklineEvent {
+        axisRanges?: any;
+        originalEvent?: any;
+    }
+
+    interface SparklinePlotAreaClickEvent extends SparklineEvent {
+        value?: any;
+        category?: any;
+        element?: any;
+        x?: any;
+        y?: any;
+    }
+
+    interface SparklineSeriesClickEvent extends SparklineEvent {
+        value?: any;
+        category?: any;
+        series?: SparklineSeriesClickEventSeries;
+        dataItem?: any;
+        element?: any;
+        percentage?: any;
+    }
+
+    interface SparklineSeriesHoverEvent extends SparklineEvent {
+        value?: any;
+        category?: any;
+        series?: SparklineSeriesHoverEventSeries;
+        dataItem?: any;
+        element?: any;
+        percentage?: any;
+    }
+
+    interface SparklineZoomStartEvent extends SparklineEvent {
+        axisRanges?: any;
+        originalEvent?: any;
+    }
+
+    interface SparklineZoomEvent extends SparklineEvent {
+        axisRanges?: any;
+        delta?: number;
+        originalEvent?: any;
+    }
+
+    interface SparklineZoomEndEvent extends SparklineEvent {
+        axisRanges?: any;
+        originalEvent?: any;
+    }
+
+
+    class StockChart extends kendo.ui.Widget {
+
+        static fn: StockChart;
+
+        options: StockChartOptions;
+
+        dataSource: kendo.data.DataSource;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): StockChart;
+
+        constructor(element: Element, options?: StockChartOptions);
+
+
+        destroy(): void;
+        exportImage(options: any): JQueryPromise<any>;
+        exportPDF(options?: kendo.drawing.PDFOptions): JQueryPromise<any>;
+        exportSVG(options: any): JQueryPromise<any>;
+        redraw(): void;
+        refresh(): void;
+        resize(force?: boolean): void;
+        setDataSource(dataSource: kendo.data.DataSource): void;
+        svg(): string;
+        imageDataURL(): string;
+
+    }
+
+    interface StockChartCategoryAxisItemAutoBaseUnitSteps {
+        days?: any;
+        hours?: any;
+        minutes?: any;
+        months?: any;
+        weeks?: any;
+        years?: any;
+    }
+
+    interface StockChartCategoryAxisItemCrosshairTooltipBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface StockChartCategoryAxisItemCrosshairTooltip {
+        background?: string;
+        border?: StockChartCategoryAxisItemCrosshairTooltipBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        padding?: number|any;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface StockChartCategoryAxisItemCrosshair {
+        color?: string;
+        width?: number;
+        opacity?: number;
+        dashType?: number;
+        visible?: boolean;
+        tooltip?: StockChartCategoryAxisItemCrosshairTooltip;
+    }
+
+    interface StockChartCategoryAxisItemLabelsBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartCategoryAxisItemLabels {
+        background?: string;
+        border?: StockChartCategoryAxisItemLabelsBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        margin?: number|any;
+        mirror?: boolean;
+        padding?: number|any;
+        rotation?: number;
+        skip?: number;
+        step?: number;
+        template?: string|Function;
+        visible?: boolean;
+        culture?: string;
+        dateFormats?: any;
+    }
+
+    interface StockChartCategoryAxisItemLine {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+    }
+
+    interface StockChartCategoryAxisItemMajorGridLines {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface StockChartCategoryAxisItemMajorTicks {
+        color?: string;
+        size?: number;
+        width?: number;
+        visible?: boolean;
+        step?: number;
+        skip?: number;
+    }
+
+    interface StockChartCategoryAxisItemMinorGridLines {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface StockChartCategoryAxisItemMinorTicks {
+        size?: number;
+        visible?: boolean;
+        color?: string;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface StockChartCategoryAxisItemNotesDataItemIconBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface StockChartCategoryAxisItemNotesDataItemIcon {
+        background?: string;
+        border?: StockChartCategoryAxisItemNotesDataItemIconBorder;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface StockChartCategoryAxisItemNotesDataItemLabelBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartCategoryAxisItemNotesDataItemLabel {
+        background?: string;
+        border?: StockChartCategoryAxisItemNotesDataItemLabelBorder;
+        color?: string;
+        font?: string;
+        template?: string|Function;
+        visible?: boolean;
+        rotation?: number;
+        format?: string;
+        text?: string;
+        position?: string;
+    }
+
+    interface StockChartCategoryAxisItemNotesDataItemLine {
+        width?: number;
+        color?: string;
+        length?: number;
+    }
+
+    interface StockChartCategoryAxisItemNotesDataItem {
+        value?: any;
+        position?: string;
+        icon?: StockChartCategoryAxisItemNotesDataItemIcon;
+        label?: StockChartCategoryAxisItemNotesDataItemLabel;
+        line?: StockChartCategoryAxisItemNotesDataItemLine;
+    }
+
+    interface StockChartCategoryAxisItemNotesIconBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface StockChartCategoryAxisItemNotesIcon {
+        background?: string;
+        border?: StockChartCategoryAxisItemNotesIconBorder;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface StockChartCategoryAxisItemNotesLabelBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartCategoryAxisItemNotesLabel {
+        background?: string;
+        border?: StockChartCategoryAxisItemNotesLabelBorder;
+        color?: string;
+        font?: string;
+        template?: string|Function;
+        visible?: boolean;
+        rotation?: number;
+        format?: string;
+        position?: string;
+    }
+
+    interface StockChartCategoryAxisItemNotesLine {
+        width?: number;
+        color?: string;
+        length?: number;
+    }
+
+    interface StockChartCategoryAxisItemNotes {
+        position?: string;
+        icon?: StockChartCategoryAxisItemNotesIcon;
+        label?: StockChartCategoryAxisItemNotesLabel;
+        line?: StockChartCategoryAxisItemNotesLine;
+        data?: StockChartCategoryAxisItemNotesDataItem[];
+    }
+
+    interface StockChartCategoryAxisItemPlotBand {
+        from?: number;
+        to?: number;
+        color?: string;
+        opacity?: number;
+    }
+
+    interface StockChartCategoryAxisItemSelectMousewheel {
+        reverse?: boolean;
+        zoom?: string;
+    }
+
+    interface StockChartCategoryAxisItemSelect {
+        from?: any;
+        to?: any;
+        min?: any;
+        max?: any;
+        mousewheel?: StockChartCategoryAxisItemSelectMousewheel;
+    }
+
+    interface StockChartCategoryAxisItemTitleBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartCategoryAxisItemTitle {
+        background?: string;
+        border?: StockChartCategoryAxisItemTitleBorder;
+        color?: string;
+        font?: string;
+        margin?: number|any;
+        position?: string;
+        rotation?: number;
+        text?: string;
+        visible?: boolean;
+    }
+
+    interface StockChartCategoryAxisItem {
+        axisCrossingValue?: any|Date|any;
+        categories?: any;
+        color?: string;
+        field?: string;
+        justified?: boolean;
+        labels?: StockChartCategoryAxisItemLabels;
+        line?: StockChartCategoryAxisItemLine;
+        majorGridLines?: StockChartCategoryAxisItemMajorGridLines;
+        majorTicks?: StockChartCategoryAxisItemMajorTicks;
+        minorGridLines?: StockChartCategoryAxisItemMinorGridLines;
+        minorTicks?: StockChartCategoryAxisItemMinorTicks;
+        name?: string;
+        pane?: string;
+        plotBands?: StockChartCategoryAxisItemPlotBand[];
+        reverse?: boolean;
+        select?: StockChartCategoryAxisItemSelect;
+        title?: StockChartCategoryAxisItemTitle;
+        type?: string;
+        autoBaseUnitSteps?: StockChartCategoryAxisItemAutoBaseUnitSteps;
+        background?: string;
+        baseUnit?: string;
+        baseUnitStep?: any;
+        max?: any;
+        min?: any;
+        roundToBaseUnit?: boolean;
+        weekStartDay?: number;
+        maxDateGroups?: number;
+        visible?: boolean;
+        crosshair?: StockChartCategoryAxisItemCrosshair;
+        notes?: StockChartCategoryAxisItemNotes;
+    }
+
+    interface StockChartChartAreaBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartChartArea {
+        background?: string;
+        opacity?: number;
+        border?: StockChartChartAreaBorder;
+        height?: number;
+        margin?: number|any;
+        width?: number;
+    }
+
+    interface StockChartLegendBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartLegendInactiveItemsLabels {
+        color?: string;
+        font?: string;
+        template?: string;
+    }
+
+    interface StockChartLegendInactiveItemsMarkers {
+        color?: string;
+    }
+
+    interface StockChartLegendInactiveItems {
+        labels?: StockChartLegendInactiveItemsLabels;
+        markers?: StockChartLegendInactiveItemsMarkers;
+    }
+
+    interface StockChartLegendItem {
+        cursor?: string;
+        visual?: Function;
+    }
+
+    interface StockChartLegendLabels {
+        color?: string;
+        font?: string;
+        template?: string;
+    }
+
+    interface StockChartLegend {
+        background?: string;
+        border?: StockChartLegendBorder;
+        item?: StockChartLegendItem;
+        labels?: StockChartLegendLabels;
+        margin?: number|any;
+        offsetX?: number;
+        offsetY?: number;
+        padding?: number|any;
+        position?: string;
+        reverse?: boolean;
+        visible?: boolean;
+        inactiveItems?: StockChartLegendInactiveItems;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemAutoBaseUnitSteps {
+        seconds?: any;
+        minutes?: any;
+        hours?: any;
+        days?: any;
+        weeks?: any;
+        months?: any;
+        years?: any;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemCrosshairTooltipBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemCrosshairTooltipPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemCrosshairTooltip {
+        background?: string;
+        border?: StockChartNavigatorCategoryAxisItemCrosshairTooltipBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        padding?: StockChartNavigatorCategoryAxisItemCrosshairTooltipPadding;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemCrosshair {
+        color?: string;
+        opacity?: number;
+        tooltip?: StockChartNavigatorCategoryAxisItemCrosshairTooltip;
+        visible?: boolean;
+        width?: number;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemLabelsBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemLabelsDateFormats {
+        days?: string;
+        hours?: string;
+        months?: string;
+        weeks?: string;
+        years?: string;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemLabelsMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemLabelsPadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemLabels {
+        background?: string;
+        border?: StockChartNavigatorCategoryAxisItemLabelsBorder;
+        color?: string;
+        culture?: string;
+        dateFormats?: StockChartNavigatorCategoryAxisItemLabelsDateFormats;
+        font?: string;
+        format?: string;
+        margin?: StockChartNavigatorCategoryAxisItemLabelsMargin;
+        mirror?: boolean;
+        padding?: StockChartNavigatorCategoryAxisItemLabelsPadding;
+        rotation?: number;
+        skip?: number;
+        step?: number;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemLine {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemMajorGridLines {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemMajorTicks {
+        color?: string;
+        size?: number;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemMinorGridLines {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemMinorTicks {
+        color?: string;
+        size?: number;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemNotesDataItemIconBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemNotesDataItemIcon {
+        background?: string;
+        border?: StockChartNavigatorCategoryAxisItemNotesDataItemIconBorder;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemNotesDataItemLabelBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemNotesDataItemLabel {
+        background?: string;
+        border?: StockChartNavigatorCategoryAxisItemNotesDataItemLabelBorder;
+        color?: string;
+        font?: string;
+        template?: string|Function;
+        visible?: boolean;
+        rotation?: number;
+        format?: string;
+        text?: string;
+        position?: string;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemNotesDataItemLine {
+        width?: number;
+        color?: string;
+        length?: number;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemNotesDataItem {
+        value?: any;
+        position?: string;
+        icon?: StockChartNavigatorCategoryAxisItemNotesDataItemIcon;
+        label?: StockChartNavigatorCategoryAxisItemNotesDataItemLabel;
+        line?: StockChartNavigatorCategoryAxisItemNotesDataItemLine;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemNotesIconBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemNotesIcon {
+        background?: string;
+        border?: StockChartNavigatorCategoryAxisItemNotesIconBorder;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemNotesLabelBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemNotesLabel {
+        background?: string;
+        border?: StockChartNavigatorCategoryAxisItemNotesLabelBorder;
+        color?: string;
+        font?: string;
+        template?: string|Function;
+        visible?: boolean;
+        rotation?: number;
+        format?: string;
+        position?: string;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemNotesLine {
+        width?: number;
+        color?: string;
+        length?: number;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemNotes {
+        position?: string;
+        icon?: StockChartNavigatorCategoryAxisItemNotesIcon;
+        label?: StockChartNavigatorCategoryAxisItemNotesLabel;
+        line?: StockChartNavigatorCategoryAxisItemNotesLine;
+        data?: StockChartNavigatorCategoryAxisItemNotesDataItem[];
+    }
+
+    interface StockChartNavigatorCategoryAxisItemPlotBand {
+        color?: string;
+        from?: number;
+        opacity?: number;
+        to?: number;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemTitleBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemTitleMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemTitlePadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface StockChartNavigatorCategoryAxisItemTitle {
+        background?: string;
+        border?: StockChartNavigatorCategoryAxisItemTitleBorder;
+        color?: string;
+        font?: string;
+        margin?: StockChartNavigatorCategoryAxisItemTitleMargin;
+        padding?: StockChartNavigatorCategoryAxisItemTitlePadding;
+        position?: string;
+        rotation?: number;
+        text?: string;
+        visible?: boolean;
+    }
+
+    interface StockChartNavigatorCategoryAxisItem {
+        autoBaseUnitSteps?: StockChartNavigatorCategoryAxisItemAutoBaseUnitSteps;
+        axisCrossingValue?: any|Date|any;
+        background?: string;
+        baseUnit?: string;
+        baseUnitStep?: any;
+        categories?: any;
+        color?: string;
+        crosshair?: StockChartNavigatorCategoryAxisItemCrosshair;
+        field?: string;
+        justified?: boolean;
+        labels?: StockChartNavigatorCategoryAxisItemLabels;
+        line?: StockChartNavigatorCategoryAxisItemLine;
+        majorGridLines?: StockChartNavigatorCategoryAxisItemMajorGridLines;
+        majorTicks?: StockChartNavigatorCategoryAxisItemMajorTicks;
+        max?: any;
+        maxDateGroups?: number;
+        min?: any;
+        minorGridLines?: StockChartNavigatorCategoryAxisItemMinorGridLines;
+        minorTicks?: StockChartNavigatorCategoryAxisItemMinorTicks;
+        plotBands?: StockChartNavigatorCategoryAxisItemPlotBand[];
+        reverse?: boolean;
+        roundToBaseUnit?: boolean;
+        title?: StockChartNavigatorCategoryAxisItemTitle;
+        visible?: boolean;
+        weekStartDay?: number;
+        notes?: StockChartNavigatorCategoryAxisItemNotes;
+    }
+
+    interface StockChartNavigatorHint {
+        visible?: boolean;
+        template?: string|Function;
+        format?: string;
+    }
+
+    interface StockChartNavigatorPaneBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartNavigatorPaneMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface StockChartNavigatorPanePadding {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface StockChartNavigatorPaneTitleBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartNavigatorPaneTitleMargin {
+        bottom?: number;
+        left?: number;
+        right?: number;
+        top?: number;
+    }
+
+    interface StockChartNavigatorPaneTitle {
+        background?: string;
+        border?: StockChartNavigatorPaneTitleBorder;
+        color?: string;
+        font?: string;
+        margin?: StockChartNavigatorPaneTitleMargin;
+        position?: string;
+        text?: string;
+        visible?: boolean;
+    }
+
+    interface StockChartNavigatorPane {
+        background?: string;
+        border?: StockChartNavigatorPaneBorder;
+        height?: number;
+        margin?: StockChartNavigatorPaneMargin;
+        name?: string;
+        padding?: StockChartNavigatorPanePadding;
+        title?: StockChartNavigatorPaneTitle;
+    }
+
+    interface StockChartNavigatorSelect {
+        from?: Date;
+        to?: Date;
+    }
+
+    interface StockChartNavigatorSeriesItemBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartNavigatorSeriesItemHighlightBorder {
+        width?: number;
+        color?: string;
+        opacity?: number;
+    }
+
+    interface StockChartNavigatorSeriesItemHighlightLine {
+        width?: number;
+        color?: string;
+        opacity?: number;
+    }
+
+    interface StockChartNavigatorSeriesItemHighlight {
+        border?: StockChartNavigatorSeriesItemHighlightBorder;
+        color?: string;
+        line?: StockChartNavigatorSeriesItemHighlightLine;
+        opacity?: number;
+        visible?: boolean;
+    }
+
+    interface StockChartNavigatorSeriesItemLabelsBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartNavigatorSeriesItemLabels {
+        background?: string;
+        border?: StockChartNavigatorSeriesItemLabelsBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        margin?: number|any;
+        padding?: number|any;
+        position?: string;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface StockChartNavigatorSeriesItemLine {
+        color?: string;
+        opacity?: number;
+        width?: string;
+    }
+
+    interface StockChartNavigatorSeriesItemMarkersBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface StockChartNavigatorSeriesItemMarkers {
+        background?: string;
+        border?: StockChartNavigatorSeriesItemMarkersBorder;
+        rotation?: number|Function;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface StockChartNavigatorSeriesItemOverlay {
+        gradient?: string;
+    }
+
+    interface StockChartNavigatorSeriesItemStack {
+        type?: string;
+        group?: string;
+    }
+
+    interface StockChartNavigatorSeriesItemTooltipBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface StockChartNavigatorSeriesItemTooltip {
+        background?: string;
+        border?: StockChartNavigatorSeriesItemTooltipBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        padding?: number|any;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface StockChartNavigatorSeriesItem {
+        type?: string;
+        dashType?: string;
+        data?: any;
+        highField?: string;
+        field?: string;
+        categoryField?: string;
+        name?: string;
+        highlight?: StockChartNavigatorSeriesItemHighlight;
+        aggregate?: string|Function;
+        axis?: string;
+        border?: StockChartNavigatorSeriesItemBorder;
+        closeField?: string;
+        color?: string;
+        colorField?: string;
+        downColor?: string;
+        downColorField?: string;
+        gap?: number;
+        labels?: StockChartNavigatorSeriesItemLabels;
+        line?: StockChartNavigatorSeriesItemLine;
+        lowField?: string;
+        markers?: StockChartNavigatorSeriesItemMarkers;
+        missingValues?: string;
+        style?: string;
+        opacity?: number;
+        openField?: string;
+        overlay?: StockChartNavigatorSeriesItemOverlay;
+        spacing?: number;
+        stack?: StockChartNavigatorSeriesItemStack;
+        tooltip?: StockChartNavigatorSeriesItemTooltip;
+        width?: number;
+    }
+
+    interface StockChartNavigator {
+        categoryAxis?: StockChartNavigatorCategoryAxisItem[];
+        dataSource?: any;
+        autoBind?: boolean;
+        dateField?: string;
+        pane?: StockChartNavigatorPane;
+        visible?: boolean;
+        series?: StockChartNavigatorSeriesItem[];
+        select?: StockChartNavigatorSelect;
+        hint?: StockChartNavigatorHint;
+    }
+
+    interface StockChartPaneBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartPaneTitleBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartPaneTitle {
+        background?: string;
+        border?: StockChartPaneTitleBorder;
+        color?: string;
+        font?: string;
+        margin?: number|any;
+        position?: string;
+        text?: string;
+        visible?: boolean;
+    }
+
+    interface StockChartPane {
+        name?: string;
+        margin?: number|any;
+        padding?: number|any;
+        background?: string;
+        border?: StockChartPaneBorder;
+        clip?: boolean;
+        height?: number;
+        title?: StockChartPaneTitle;
+    }
+
+    interface StockChartPdfMargin {
+        bottom?: number|string;
+        left?: number|string;
+        right?: number|string;
+        top?: number|string;
+    }
+
+    interface StockChartPdf {
+        author?: string;
+        creator?: string;
+        date?: Date;
+        forceProxy?: boolean;
+        fileName?: string;
+        keywords?: string;
+        landscape?: boolean;
+        margin?: StockChartPdfMargin;
+        paperSize?: string|any;
+        proxyURL?: string;
+        proxyTarget?: string;
+        subject?: string;
+        title?: string;
+    }
+
+    interface StockChartPlotAreaBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartPlotArea {
+        background?: string;
+        opacity?: number;
+        border?: StockChartPlotAreaBorder;
+        margin?: number|any;
+    }
+
+    interface StockChartSeriesItemBorder {
+        color?: string|Function;
+        dashType?: string|Function;
+        opacity?: number|Function;
+        width?: number|Function;
+    }
+
+    interface StockChartSeriesItemHighlightBorder {
+        width?: number;
+        color?: string;
+        opacity?: number;
+    }
+
+    interface StockChartSeriesItemHighlightLine {
+        width?: number;
+        color?: string;
+        opacity?: number;
+    }
+
+    interface StockChartSeriesItemHighlight {
+        visible?: boolean;
+        border?: StockChartSeriesItemHighlightBorder;
+        color?: string;
+        line?: StockChartSeriesItemHighlightLine;
+        opacity?: number;
+    }
+
+    interface StockChartSeriesItemLabelsBorder {
+        color?: string|Function;
+        dashType?: string|Function;
+        width?: number|Function;
+    }
+
+    interface StockChartSeriesItemLabels {
+        background?: string|Function;
+        border?: StockChartSeriesItemLabelsBorder;
+        color?: string|Function;
+        font?: string|Function;
+        format?: string|Function;
+        margin?: number|any;
+        padding?: number|any;
+        position?: string|Function;
+        template?: string|Function;
+        visible?: boolean|Function;
+    }
+
+    interface StockChartSeriesItemLine {
+        color?: string;
+        opacity?: number;
+        width?: string;
+        style?: string;
+    }
+
+    interface StockChartSeriesItemMarkersBorder {
+        color?: string|Function;
+        width?: number|Function;
+    }
+
+    interface StockChartSeriesItemMarkers {
+        background?: string|Function;
+        border?: StockChartSeriesItemMarkersBorder;
+        size?: number|Function;
+        rotation?: number|Function;
+        type?: string|Function;
+        visible?: boolean|Function;
+    }
+
+    interface StockChartSeriesItemNotesIconBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface StockChartSeriesItemNotesIcon {
+        background?: string;
+        border?: StockChartSeriesItemNotesIconBorder;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface StockChartSeriesItemNotesLabelBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartSeriesItemNotesLabel {
+        background?: string;
+        border?: StockChartSeriesItemNotesLabelBorder;
+        color?: string;
+        font?: string;
+        template?: string|Function;
+        visible?: boolean;
+        rotation?: number;
+        format?: string;
+        position?: string;
+    }
+
+    interface StockChartSeriesItemNotesLine {
+        width?: number;
+        color?: string;
+        length?: number;
+    }
+
+    interface StockChartSeriesItemNotes {
+        position?: string;
+        icon?: StockChartSeriesItemNotesIcon;
+        label?: StockChartSeriesItemNotesLabel;
+        line?: StockChartSeriesItemNotesLine;
+    }
+
+    interface StockChartSeriesItemOverlay {
+        gradient?: string;
+    }
+
+    interface StockChartSeriesItemStack {
+        type?: string;
+        group?: string;
+    }
+
+    interface StockChartSeriesItemTargetBorder {
+        color?: string|Function;
+        dashType?: string|Function;
+        width?: number|Function;
+    }
+
+    interface StockChartSeriesItemTargetLine {
+        width?: any|Function;
+    }
+
+    interface StockChartSeriesItemTarget {
+        line?: StockChartSeriesItemTargetLine;
+        color?: string|Function;
+        border?: StockChartSeriesItemTargetBorder;
+    }
+
+    interface StockChartSeriesItemTooltipBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface StockChartSeriesItemTooltip {
+        background?: string;
+        border?: StockChartSeriesItemTooltipBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        padding?: number|any;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface StockChartSeriesItem {
+        type?: string;
+        dashType?: string;
+        data?: any;
+        highField?: string;
+        field?: string;
+        categoryField?: string;
+        currentField?: string;
+        targetField?: string;
+        name?: string;
+        highlight?: StockChartSeriesItemHighlight;
+        aggregate?: string|Function;
+        axis?: string;
+        border?: StockChartSeriesItemBorder;
+        closeField?: string;
+        color?: string|Function;
+        colorField?: string;
+        downColor?: string|Function;
+        downColorField?: string;
+        gap?: number;
+        labels?: StockChartSeriesItemLabels;
+        line?: StockChartSeriesItemLine;
+        lowField?: string;
+        markers?: StockChartSeriesItemMarkers;
+        missingValues?: string;
+        style?: string;
+        negativeColor?: string;
+        opacity?: number;
+        openField?: string;
+        overlay?: StockChartSeriesItemOverlay;
+        spacing?: number;
+        stack?: StockChartSeriesItemStack;
+        tooltip?: StockChartSeriesItemTooltip;
+        visibleInLegend?: boolean;
+        width?: number;
+        target?: StockChartSeriesItemTarget;
+        notes?: StockChartSeriesItemNotes;
+        zIndex?: number;
+    }
+
+    interface StockChartSeriesDefaultsBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartSeriesDefaultsLabelsBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartSeriesDefaultsLabels {
+        background?: string;
+        border?: StockChartSeriesDefaultsLabelsBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        margin?: number|any;
+        padding?: number|any;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface StockChartSeriesDefaultsStack {
+        type?: string;
+    }
+
+    interface StockChartSeriesDefaultsTooltipBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface StockChartSeriesDefaultsTooltip {
+        background?: string;
+        border?: StockChartSeriesDefaultsTooltipBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        padding?: number|any;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface StockChartSeriesDefaults {
+        area?: any;
+        candlestick?: any;
+        ohlc?: any;
+        border?: StockChartSeriesDefaultsBorder;
+        column?: any;
+        gap?: number;
+        labels?: StockChartSeriesDefaultsLabels;
+        line?: any;
+        overlay?: any;
+        pie?: any;
+        spacing?: number;
+        stack?: StockChartSeriesDefaultsStack;
+        type?: string;
+        tooltip?: StockChartSeriesDefaultsTooltip;
+    }
+
+    interface StockChartTitleBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartTitle {
+        align?: string;
+        background?: string;
+        border?: StockChartTitleBorder;
+        font?: string;
+        color?: string;
+        margin?: number|any;
+        padding?: number|any;
+        position?: string;
+        text?: string;
+        visible?: boolean;
+    }
+
+    interface StockChartTooltipBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface StockChartTooltip {
+        background?: string;
+        border?: StockChartTooltipBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        padding?: number|any;
+        template?: string|Function;
+        visible?: boolean;
+        shared?: boolean;
+        sharedTemplate?: string;
+    }
+
+    interface StockChartValueAxisItemCrosshairTooltipBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface StockChartValueAxisItemCrosshairTooltip {
+        background?: string;
+        border?: StockChartValueAxisItemCrosshairTooltipBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        padding?: number|any;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface StockChartValueAxisItemCrosshair {
+        color?: string;
+        width?: number;
+        opacity?: number;
+        dashType?: number;
+        visible?: boolean;
+        tooltip?: StockChartValueAxisItemCrosshairTooltip;
+    }
+
+    interface StockChartValueAxisItemLabelsBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartValueAxisItemLabels {
+        background?: string;
+        border?: StockChartValueAxisItemLabelsBorder;
+        color?: string;
+        font?: string;
+        format?: string;
+        margin?: number|any;
+        mirror?: boolean;
+        padding?: number|any;
+        rotation?: number;
+        skip?: number;
+        step?: number;
+        template?: string|Function;
+        visible?: boolean;
+    }
+
+    interface StockChartValueAxisItemLine {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+    }
+
+    interface StockChartValueAxisItemMajorGridLines {
+        color?: string;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface StockChartValueAxisItemMajorTicks {
+        size?: number;
+        visible?: boolean;
+        color?: string;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface StockChartValueAxisItemMinorGridLines {
+        color?: string;
+        dashType?: string;
+        visible?: boolean;
+        width?: number;
+        step?: number;
+        skip?: number;
+    }
+
+    interface StockChartValueAxisItemMinorTicks {
+        size?: number;
+        color?: string;
+        width?: number;
+        visible?: boolean;
+        step?: number;
+        skip?: number;
+    }
+
+    interface StockChartValueAxisItemNotesDataItemIconBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface StockChartValueAxisItemNotesDataItemIcon {
+        background?: string;
+        border?: StockChartValueAxisItemNotesDataItemIconBorder;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface StockChartValueAxisItemNotesDataItemLabelBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartValueAxisItemNotesDataItemLabel {
+        background?: string;
+        border?: StockChartValueAxisItemNotesDataItemLabelBorder;
+        color?: string;
+        font?: string;
+        template?: string|Function;
+        visible?: boolean;
+        rotation?: number;
+        format?: string;
+        text?: string;
+        position?: string;
+    }
+
+    interface StockChartValueAxisItemNotesDataItemLine {
+        width?: number;
+        color?: string;
+        length?: number;
+    }
+
+    interface StockChartValueAxisItemNotesDataItem {
+        value?: any;
+        position?: string;
+        icon?: StockChartValueAxisItemNotesDataItemIcon;
+        label?: StockChartValueAxisItemNotesDataItemLabel;
+        line?: StockChartValueAxisItemNotesDataItemLine;
+    }
+
+    interface StockChartValueAxisItemNotesIconBorder {
+        color?: string;
+        width?: number;
+    }
+
+    interface StockChartValueAxisItemNotesIcon {
+        background?: string;
+        border?: StockChartValueAxisItemNotesIconBorder;
+        size?: number;
+        type?: string;
+        visible?: boolean;
+    }
+
+    interface StockChartValueAxisItemNotesLabelBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartValueAxisItemNotesLabel {
+        background?: string;
+        border?: StockChartValueAxisItemNotesLabelBorder;
+        color?: string;
+        font?: string;
+        template?: string|Function;
+        visible?: boolean;
+        rotation?: number;
+        format?: string;
+        position?: string;
+    }
+
+    interface StockChartValueAxisItemNotesLine {
+        width?: number;
+        color?: string;
+        length?: number;
+    }
+
+    interface StockChartValueAxisItemNotes {
+        position?: string;
+        icon?: StockChartValueAxisItemNotesIcon;
+        label?: StockChartValueAxisItemNotesLabel;
+        line?: StockChartValueAxisItemNotesLine;
+        data?: StockChartValueAxisItemNotesDataItem[];
+    }
+
+    interface StockChartValueAxisItemPlotBand {
+        from?: number;
+        to?: number;
+        color?: string;
+        opacity?: number;
+    }
+
+    interface StockChartValueAxisItemTitleBorder {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface StockChartValueAxisItemTitle {
+        background?: string;
+        border?: StockChartValueAxisItemTitleBorder;
+        color?: string;
+        font?: string;
+        margin?: number|any;
+        padding?: number|any;
+        position?: string;
+        rotation?: number;
+        text?: string;
+        visible?: boolean;
+    }
+
+    interface StockChartValueAxisItem {
+        axisCrossingValue?: any|Date|any;
+        background?: string;
+        color?: string;
+        labels?: StockChartValueAxisItemLabels;
+        line?: StockChartValueAxisItemLine;
+        majorGridLines?: StockChartValueAxisItemMajorGridLines;
+        majorTicks?: StockChartValueAxisItemMajorTicks;
+        majorUnit?: number;
+        max?: number;
+        min?: number;
+        minorGridLines?: StockChartValueAxisItemMinorGridLines;
+        minorTicks?: StockChartValueAxisItemMinorTicks;
+        minorUnit?: number;
+        name?: any;
+        narrowRange?: boolean;
+        pane?: string;
+        plotBands?: StockChartValueAxisItemPlotBand[];
+        reverse?: boolean;
+        title?: StockChartValueAxisItemTitle;
+        visible?: boolean;
+        crosshair?: StockChartValueAxisItemCrosshair;
+        notes?: StockChartValueAxisItemNotes;
+    }
+
+    interface StockChartExportImageOptions {
+        width?: string;
+        height?: string;
+    }
+
+    interface StockChartExportSVGOptions {
+        raw?: boolean;
+    }
+
+    interface StockChartSeriesClickEventSeries {
+        type?: string;
+        name?: string;
+        data?: any;
+    }
+
+    interface StockChartSeriesHoverEventSeries {
+        type?: string;
+        name?: string;
+        data?: any;
+    }
+
+    interface StockChartOptions {
+        name?: string;
+        dateField?: string;
+        navigator?: StockChartNavigator;
+        axisDefaults?: any;
+        categoryAxis?: StockChartCategoryAxisItem[];
+        chartArea?: StockChartChartArea;
+        dataSource?: any;
+        autoBind?: boolean;
+        legend?: StockChartLegend;
+        panes?: StockChartPane[];
+        pdf?: StockChartPdf;
+        plotArea?: StockChartPlotArea;
+        renderAs?: string;
+        series?: StockChartSeriesItem[];
+        seriesColors?: any;
+        seriesDefaults?: StockChartSeriesDefaults;
+        theme?: string;
+        title?: StockChartTitle;
+        tooltip?: StockChartTooltip;
+        transitions?: boolean;
+        valueAxis?: StockChartValueAxisItem[];
+        axisLabelClick?(e: StockChartAxisLabelClickEvent): void;
+        legendItemClick?(e: StockChartLegendItemClickEvent): void;
+        legendItemHover?(e: StockChartLegendItemHoverEvent): void;
+        dataBound?(e: StockChartEvent): void;
+        dragStart?(e: StockChartDragStartEvent): void;
+        drag?(e: StockChartDragEvent): void;
+        dragEnd?(e: StockChartDragEndEvent): void;
+        noteClick?(e: StockChartNoteClickEvent): void;
+        noteHover?(e: StockChartNoteHoverEvent): void;
+        plotAreaClick?(e: StockChartPlotAreaClickEvent): void;
+        render?(e: StockChartEvent): void;
+        seriesClick?(e: StockChartSeriesClickEvent): void;
+        seriesHover?(e: StockChartSeriesHoverEvent): void;
+        zoomStart?(e: StockChartZoomStartEvent): void;
+        zoom?(e: StockChartZoomEvent): void;
+        zoomEnd?(e: StockChartZoomEndEvent): void;
+        selectStart?(e: StockChartSelectStartEvent): void;
+        select?(e: StockChartSelectEvent): void;
+        selectEnd?(e: StockChartSelectEndEvent): void;
+    }
+    interface StockChartEvent {
+        sender: StockChart;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface StockChartAxisLabelClickEvent extends StockChartEvent {
+        axis?: any;
+        value?: any;
+        text?: any;
+        index?: any;
+        dataItem?: any;
+        element?: any;
+    }
+
+    interface StockChartLegendItemClickEvent extends StockChartEvent {
+        text?: string;
+        series?: any;
+        seriesIndex?: number;
+        pointIndex?: number;
+        element?: any;
+    }
+
+    interface StockChartLegendItemHoverEvent extends StockChartEvent {
+        text?: string;
+        series?: any;
+        seriesIndex?: number;
+        pointIndex?: number;
+        element?: any;
+    }
+
+    interface StockChartDragStartEvent extends StockChartEvent {
+        axisRanges?: any;
+        originalEvent?: any;
+    }
+
+    interface StockChartDragEvent extends StockChartEvent {
+        axisRanges?: any;
+        originalEvent?: any;
+    }
+
+    interface StockChartDragEndEvent extends StockChartEvent {
+        axisRanges?: any;
+        originalEvent?: any;
+    }
+
+    interface StockChartNoteClickEvent extends StockChartEvent {
+        category?: any;
+        element?: any;
+        value?: any;
+        series?: any;
+        dataItem?: any;
+    }
+
+    interface StockChartNoteHoverEvent extends StockChartEvent {
+        category?: any;
+        element?: any;
+        value?: any;
+        series?: any;
+        dataItem?: any;
+    }
+
+    interface StockChartPlotAreaClickEvent extends StockChartEvent {
+        value?: any;
+        category?: any;
+        element?: any;
+        x?: any;
+        y?: any;
+    }
+
+    interface StockChartSeriesClickEvent extends StockChartEvent {
+        value?: any;
+        category?: any;
+        series?: StockChartSeriesClickEventSeries;
+        dataItem?: any;
+        element?: any;
+        percentage?: any;
+    }
+
+    interface StockChartSeriesHoverEvent extends StockChartEvent {
+        value?: any;
+        category?: any;
+        series?: StockChartSeriesHoverEventSeries;
+        dataItem?: any;
+        element?: any;
+        percentage?: any;
+    }
+
+    interface StockChartZoomStartEvent extends StockChartEvent {
+        axisRanges?: any;
+        originalEvent?: any;
+    }
+
+    interface StockChartZoomEvent extends StockChartEvent {
+        axisRanges?: any;
+        delta?: number;
+        originalEvent?: any;
+    }
+
+    interface StockChartZoomEndEvent extends StockChartEvent {
+        axisRanges?: any;
+        originalEvent?: any;
+    }
+
+    interface StockChartSelectStartEvent extends StockChartEvent {
+        axis?: any;
+        from?: any;
+        to?: any;
+    }
+
+    interface StockChartSelectEvent extends StockChartEvent {
+        axis?: any;
+        from?: any;
+        to?: any;
+    }
+
+    interface StockChartSelectEndEvent extends StockChartEvent {
+        axis?: any;
+        from?: any;
+        to?: any;
+    }
+
+
+    class TreeMap extends kendo.ui.Widget {
+
+        static fn: TreeMap;
+
+        options: TreeMapOptions;
+
+        dataSource: kendo.data.DataSource;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): TreeMap;
+
+        constructor(element: Element, options?: TreeMapOptions);
+
+
+
+    }
+
+    interface TreeMapOptions {
+        name?: string;
+        dataSource?: any|any|kendo.data.HierarchicalDataSource;
+        autoBind?: boolean;
+        type?: string;
+        theme?: string;
+        valueField?: string;
+        colorField?: string;
+        textField?: string;
+        template?: string|Function;
+        colors?: any;
+        itemCreated?(e: TreeMapItemCreatedEvent): void;
+        dataBound?(e: TreeMapDataBoundEvent): void;
+    }
+    interface TreeMapEvent {
+        sender: TreeMap;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface TreeMapItemCreatedEvent extends TreeMapEvent {
+        element?: JQuery|Element;
+    }
+
+    interface TreeMapDataBoundEvent extends TreeMapEvent {
+    }
+
+
+}
+declare namespace kendo.dataviz.map {
+    class BingLayer extends kendo.dataviz.map.TileLayer {
+
+
+        options: BingLayerOptions;
+
+        map: kendo.dataviz.ui.Map;
+
+        constructor(map: kendo.dataviz.ui.Map, options?: BingLayerOptions);
+
+
+        show(): void;
+        hide(): void;
+        imagerySet(): void;
+
+    }
+
+    interface BingLayerOptions {
+        name?: string;
+        baseUrl?: string;
+        imagerySet?: string;
+    }
+    interface BingLayerEvent {
+        sender: BingLayer;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Extent extends kendo.Class {
+
+
+        options: ExtentOptions;
+
+        nw: kendo.dataviz.map.Location;
+        se: kendo.dataviz.map.Location;
+
+        constructor(nw: kendo.dataviz.map.Location, se: kendo.dataviz.map.Location);
+
+        static create(a: kendo.dataviz.map.Location, b?: kendo.dataviz.map.Location): kendo.dataviz.map.Extent;
+        static create(a: kendo.dataviz.map.Location, b?: any): kendo.dataviz.map.Extent;
+        static create(a: any, b?: kendo.dataviz.map.Location): kendo.dataviz.map.Extent;
+        static create(a: any, b?: any): kendo.dataviz.map.Extent;
+
+        contains(location: kendo.dataviz.map.Location): boolean;
+        containsAny(locations: any): boolean;
+        center(): kendo.dataviz.map.Location;
+        include(location: kendo.dataviz.map.Location): void;
+        includeAll(locations: any): void;
+        edges(): any;
+        toArray(): any;
+        overlaps(extent: kendo.dataviz.map.Extent): boolean;
+
+    }
+
+    interface ExtentOptions {
+        name?: string;
+    }
+    interface ExtentEvent {
+        sender: Extent;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Layer extends kendo.Class {
+
+
+        options: LayerOptions;
+
+        map: kendo.dataviz.ui.Map;
+
+        constructor(map: kendo.dataviz.ui.Map, options?: LayerOptions);
+
+
+        show(): void;
+        hide(): void;
+
+    }
+
+    interface LayerOptions {
+        name?: string;
+    }
+    interface LayerEvent {
+        sender: Layer;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Location extends kendo.Class {
+
+
+        options: LocationOptions;
+
+        lat: number;
+        lng: number;
+
+        constructor(lat: number, lng: number);
+
+        static create(lat: number, lng?: number): kendo.dataviz.map.Location;
+        static create(lat: any, lng?: number): kendo.dataviz.map.Location;
+        static create(lat: kendo.dataviz.map.Location, lng?: number): kendo.dataviz.map.Location;
+        static fromLngLat(lnglat: any): kendo.dataviz.map.Location;
+        static fromLatLng(lnglat: any): kendo.dataviz.map.Location;
+
+        clone(): kendo.dataviz.map.Location;
+        destination(destination: kendo.dataviz.map.Location, bearing: number): number;
+        distanceTo(distance: number, bearing: number): kendo.dataviz.map.Location;
+        equals(location: kendo.dataviz.map.Location): boolean;
+        round(digits: number): kendo.dataviz.map.Location;
+        toArray(): any;
+        toString(): string;
+        wrap(): kendo.dataviz.map.Location;
+
+    }
+
+    interface LocationOptions {
+        name?: string;
+    }
+    interface LocationEvent {
+        sender: Location;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Marker extends Observable {
+
+
+        options: MarkerOptions;
+
+
+        constructor(options?: MarkerOptions);
+
+
+        location(): kendo.dataviz.map.Location;
+        location(location: any): void;
+        location(location: kendo.dataviz.map.Location): void;
+
+    }
+
+    interface MarkerTooltipAnimationClose {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface MarkerTooltipAnimationOpen {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface MarkerTooltipAnimation {
+        close?: MarkerTooltipAnimationClose;
+        open?: MarkerTooltipAnimationOpen;
+    }
+
+    interface MarkerTooltipContent {
+        url?: string;
+    }
+
+    interface MarkerTooltip {
+        autoHide?: boolean;
+        animation?: MarkerTooltipAnimation;
+        content?: MarkerTooltipContent;
+        template?: string;
+        callout?: boolean;
+        iframe?: boolean;
+        height?: number;
+        width?: number;
+        position?: string;
+        showAfter?: number;
+        showOn?: string;
+    }
+
+    interface MarkerOptions {
+        name?: string;
+        location?: any|kendo.dataviz.map.Location;
+        shape?: string;
+        title?: string;
+        tooltip?: MarkerTooltip;
+    }
+    interface MarkerEvent {
+        sender: Marker;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class MarkerLayer extends kendo.dataviz.map.Layer {
+
+
+        options: MarkerLayerOptions;
+
+        map: kendo.dataviz.ui.Map;
+        items: any;
+
+        constructor(map: kendo.dataviz.ui.Map, options?: MarkerLayerOptions);
+
+
+        add(marker: kendo.dataviz.map.Marker): void;
+        clear(): void;
+        hide(): void;
+        remove(marker: kendo.dataviz.map.Marker): void;
+        setDataSource(dataSource: any): void;
+        show(): void;
+
+    }
+
+    interface MarkerLayerOptions {
+        name?: string;
+    }
+    interface MarkerLayerEvent {
+        sender: MarkerLayer;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class ShapeLayer extends kendo.dataviz.map.Layer {
+
+
+        options: ShapeLayerOptions;
+
+        map: kendo.dataviz.ui.Map;
+
+        constructor(map: kendo.dataviz.ui.Map, options?: ShapeLayerOptions);
+
+
+        show(): void;
+        hide(): void;
+        setDataSource(): void;
+
+    }
+
+    interface ShapeLayerOptions {
+        name?: string;
+    }
+    interface ShapeLayerEvent {
+        sender: ShapeLayer;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class TileLayer extends kendo.dataviz.map.Layer {
+
+
+        options: TileLayerOptions;
+
+        map: kendo.dataviz.ui.Map;
+
+        constructor(map: kendo.dataviz.ui.Map, options?: TileLayerOptions);
+
+
+        show(): void;
+        hide(): void;
+
+    }
+
+    interface TileLayerOptions {
+        name?: string;
+        urlTemplate?: string;
+        subdomains?: any;
+        tileSize?: number;
+    }
+    interface TileLayerEvent {
+        sender: TileLayer;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+}
+declare namespace kendo.dataviz {
+    class ChartAxis extends Observable {
+
+
+        options: ChartAxisOptions;
+
+
+
+
+        range(): any;
+        slot(from: string, to?: string): kendo.geometry.Rect;
+        slot(from: string, to?: number): kendo.geometry.Rect;
+        slot(from: string, to?: Date): kendo.geometry.Rect;
+        slot(from: number, to?: string): kendo.geometry.Rect;
+        slot(from: number, to?: number): kendo.geometry.Rect;
+        slot(from: number, to?: Date): kendo.geometry.Rect;
+        slot(from: Date, to?: string): kendo.geometry.Rect;
+        slot(from: Date, to?: number): kendo.geometry.Rect;
+        slot(from: Date, to?: Date): kendo.geometry.Rect;
+
+    }
+
+    interface ChartAxisOptions {
+        name?: string;
+    }
+    interface ChartAxisEvent {
+        sender: ChartAxis;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+}
+declare namespace kendo.dataviz.diagram {
+    class Circle extends Observable {
+
+
+        options: CircleOptions;
+
+
+        constructor(options?: CircleOptions);
+
+
+        position(): void;
+        position(offset: kendo.dataviz.diagram.Point): void;
+        rotate(angle: number, center: kendo.dataviz.diagram.Point): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface CircleFillGradientStop {
+        offset?: number;
+        color?: string;
+        opacity?: number;
+    }
+
+    interface CircleFillGradient {
+        type?: string;
+        center?: any;
+        radius?: number;
+        start?: any;
+        end?: any;
+        stops?: CircleFillGradientStop[];
+    }
+
+    interface CircleFill {
+        color?: string;
+        opacity?: number;
+        gradient?: CircleFillGradient;
+    }
+
+    interface CircleStroke {
+        color?: string;
+        width?: number;
+    }
+
+    interface CircleOptions {
+        name?: string;
+        fill?: CircleFill;
+        stroke?: CircleStroke;
+        center?: any;
+        radius?: number;
+    }
+    interface CircleEvent {
+        sender: Circle;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Connection extends Observable {
+
+
+        options: ConnectionOptions;
+
+        dataItem: any;
+        from: kendo.dataviz.diagram.Shape;
+        sourceConnector: kendo.dataviz.diagram.Connector;
+        targetConnector: kendo.dataviz.diagram.Connector;
+        to: kendo.dataviz.diagram.Shape;
+
+        constructor(options?: ConnectionOptions);
+
+
+        source(): any;
+        source(source: kendo.dataviz.diagram.Shape): void;
+        source(source: kendo.dataviz.diagram.Point): void;
+        source(source: kendo.dataviz.diagram.Connector): void;
+        sourcePoint(): kendo.dataviz.diagram.Point;
+        target(): any;
+        target(target: kendo.dataviz.diagram.Shape): void;
+        target(target: kendo.dataviz.diagram.Point): void;
+        target(target: kendo.dataviz.diagram.Connector): void;
+        targetPoint(): kendo.dataviz.diagram.Point;
+        select(value: boolean): void;
+        type(): void;
+        type(value: string): void;
+        points(): any;
+        allPoints(): any;
+        redraw(options?: any): void;
+
+    }
+
+    interface ConnectionContent {
+        color?: string;
+        fontFamily?: string;
+        fontSize?: number;
+        template?: string|Function;
+        text?: string;
+        visual?: Function;
+    }
+
+    interface ConnectionEndCapFill {
+        color?: string;
+    }
+
+    interface ConnectionEndCapStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ConnectionEndCap {
+        fill?: ConnectionEndCapFill;
+        stroke?: ConnectionEndCapStroke;
+        type?: string;
+    }
+
+    interface ConnectionHoverStroke {
+        color?: string;
+    }
+
+    interface ConnectionHover {
+        stroke?: ConnectionHoverStroke;
+    }
+
+    interface ConnectionPoint {
+        x?: number;
+        y?: number;
+    }
+
+    interface ConnectionStartCapFill {
+        color?: string;
+    }
+
+    interface ConnectionStartCapStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ConnectionStartCap {
+        fill?: ConnectionStartCapFill;
+        stroke?: ConnectionStartCapStroke;
+        type?: string;
+    }
+
+    interface ConnectionStroke {
+        color?: string;
+    }
+
+    interface ConnectionOptions {
+        name?: string;
+        content?: ConnectionContent;
+        fromConnector?: string;
+        fromX?: number;
+        fromY?: number;
+        stroke?: ConnectionStroke;
+        hover?: ConnectionHover;
+        startCap?: ConnectionStartCap;
+        endCap?: ConnectionEndCap;
+        points?: ConnectionPoint[];
+        selectable?: boolean;
+        toConnector?: string;
+        toX?: number;
+        toY?: number;
+        type?: string;
+    }
+    interface ConnectionEvent {
+        sender: Connection;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Connector extends Observable {
+
+
+        options: ConnectorOptions;
+
+        connections: any;
+        shape: kendo.dataviz.diagram.Shape;
+
+        constructor(options?: ConnectorOptions);
+
+
+        position(): kendo.dataviz.diagram.Point;
+
+    }
+
+    interface ConnectorFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface ConnectorHoverFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface ConnectorHoverStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ConnectorHover {
+        fill?: ConnectorHoverFill;
+        stroke?: ConnectorHoverStroke;
+    }
+
+    interface ConnectorStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ConnectorOptions {
+        name?: string;
+        width?: number;
+        height?: number;
+        hover?: ConnectorHover;
+        fill?: ConnectorFill;
+        stroke?: ConnectorStroke;
+    }
+    interface ConnectorEvent {
+        sender: Connector;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Group extends Observable {
+
+
+        options: GroupOptions;
+
+
+        constructor(options?: GroupOptions);
+
+
+        append(element: any): void;
+        clear(): void;
+        remove(element: any): void;
+        position(): void;
+        position(offset: kendo.dataviz.diagram.Point): void;
+        rotate(angle: number, center: kendo.dataviz.diagram.Point): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface GroupOptions {
+        name?: string;
+        x?: number;
+        y?: number;
+    }
+    interface GroupEvent {
+        sender: Group;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Image extends Observable {
+
+
+        options: ImageOptions;
+
+
+        constructor(options?: ImageOptions);
+
+
+        position(): void;
+        position(offset: kendo.dataviz.diagram.Point): void;
+        rotate(angle: number, center: kendo.dataviz.diagram.Point): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface ImageOptions {
+        name?: string;
+        height?: number;
+        width?: number;
+        x?: number;
+        y?: number;
+        source?: string;
+    }
+    interface ImageEvent {
+        sender: Image;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Layout extends Observable {
+
+
+        options: LayoutOptions;
+
+
+        constructor(rect: kendo.dataviz.diagram.Rect, options?: LayoutOptions);
+
+
+        append(element: any): void;
+        clear(): void;
+        rect(): kendo.dataviz.diagram.Rect;
+        rect(rect: kendo.dataviz.diagram.Rect): void;
+        reflow(): void;
+        remove(element: any): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface LayoutOptions {
+        name?: string;
+        alignContent?: string;
+        alignItems?: string;
+        justifyContent?: string;
+        lineSpacing?: number;
+        spacing?: number;
+        orientation?: string;
+        wrap?: boolean;
+    }
+    interface LayoutEvent {
+        sender: Layout;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Line extends Observable {
+
+
+        options: LineOptions;
+
+
+        constructor(options?: LineOptions);
+
+
+        position(): void;
+        position(offset: kendo.dataviz.diagram.Point): void;
+        rotate(angle: number, center: kendo.dataviz.diagram.Point): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface LineStroke {
+        color?: string;
+        width?: number;
+    }
+
+    interface LineOptions {
+        name?: string;
+        stroke?: LineStroke;
+        from?: any;
+        to?: any;
+    }
+    interface LineEvent {
+        sender: Line;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Path extends Observable {
+
+
+        options: PathOptions;
+
+
+        constructor(options?: PathOptions);
+
+
+        data(): string;
+        data(path: string): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface PathEndCapFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface PathEndCapStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface PathEndCap {
+        fill?: PathEndCapFill;
+        stroke?: PathEndCapStroke;
+        type?: string;
+    }
+
+    interface PathFillGradientStop {
+        offset?: number;
+        color?: string;
+        opacity?: number;
+    }
+
+    interface PathFillGradient {
+        type?: string;
+        center?: any;
+        radius?: number;
+        start?: any;
+        end?: any;
+        stops?: PathFillGradientStop[];
+    }
+
+    interface PathFill {
+        color?: string;
+        opacity?: number;
+        gradient?: PathFillGradient;
+    }
+
+    interface PathStartCapFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface PathStartCapStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface PathStartCap {
+        fill?: PathStartCapFill;
+        stroke?: PathStartCapStroke;
+        type?: string;
+    }
+
+    interface PathStroke {
+        color?: string;
+        width?: number;
+    }
+
+    interface PathOptions {
+        name?: string;
+        data?: string;
+        endCap?: PathEndCap;
+        fill?: PathFill;
+        height?: number;
+        startCap?: PathStartCap;
+        stroke?: PathStroke;
+        width?: number;
+        x?: number;
+        y?: number;
+    }
+    interface PathEvent {
+        sender: Path;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Point extends Observable {
+
+
+        options: PointOptions;
+
+        x: number;
+        y: number;
+
+        constructor(x: number, y: number);
+
+
+
+    }
+
+    interface PointOptions {
+        name?: string;
+    }
+    interface PointEvent {
+        sender: Point;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Polyline extends Observable {
+
+
+        options: PolylineOptions;
+
+
+        constructor(options?: PolylineOptions);
+
+
+        points(): any;
+        points(points: any): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface PolylineEndCapFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface PolylineEndCapStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface PolylineEndCap {
+        fill?: PolylineEndCapFill;
+        stroke?: PolylineEndCapStroke;
+        type?: string;
+    }
+
+    interface PolylineFillGradientStop {
+        offset?: number;
+        color?: string;
+        opacity?: number;
+    }
+
+    interface PolylineFillGradient {
+        type?: string;
+        center?: any;
+        radius?: number;
+        start?: any;
+        end?: any;
+        stops?: PolylineFillGradientStop[];
+    }
+
+    interface PolylineFill {
+        color?: string;
+        opacity?: number;
+        gradient?: PolylineFillGradient;
+    }
+
+    interface PolylineStartCapFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface PolylineStartCapStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface PolylineStartCap {
+        fill?: PolylineStartCapFill;
+        stroke?: PolylineStartCapStroke;
+        type?: string;
+    }
+
+    interface PolylineStroke {
+        color?: string;
+        width?: number;
+    }
+
+    interface PolylineOptions {
+        name?: string;
+        endCap?: PolylineEndCap;
+        fill?: PolylineFill;
+        startCap?: PolylineStartCap;
+        stroke?: PolylineStroke;
+    }
+    interface PolylineEvent {
+        sender: Polyline;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Rect extends Observable {
+
+
+        options: RectOptions;
+
+
+        constructor(options?: RectOptions);
+
+
+        position(): void;
+        position(offset: kendo.dataviz.diagram.Point): void;
+        rotate(angle: number, center: kendo.dataviz.diagram.Point): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface RectOptions {
+        name?: string;
+        height?: number;
+        width?: number;
+        x?: number;
+        y?: number;
+    }
+    interface RectEvent {
+        sender: Rect;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Rectangle extends Observable {
+
+
+        options: RectangleOptions;
+
+
+        constructor(options?: RectangleOptions);
+
+
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface RectangleFillGradientStop {
+        offset?: number;
+        color?: string;
+        opacity?: number;
+    }
+
+    interface RectangleFillGradient {
+        type?: string;
+        center?: any;
+        radius?: number;
+        start?: any;
+        end?: any;
+        stops?: RectangleFillGradientStop[];
+    }
+
+    interface RectangleFill {
+        color?: string;
+        opacity?: number;
+        gradient?: RectangleFillGradient;
+    }
+
+    interface RectangleStroke {
+        color?: string;
+        width?: number;
+    }
+
+    interface RectangleOptions {
+        name?: string;
+        fill?: RectangleFill;
+        height?: number;
+        stroke?: RectangleStroke;
+        width?: number;
+        x?: number;
+        y?: number;
+    }
+    interface RectangleEvent {
+        sender: Rectangle;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Shape extends Observable {
+
+
+        options: ShapeOptions;
+
+        connectors: any;
+        dataItem: any;
+        shapeVisual: any;
+        visual: kendo.dataviz.diagram.Group;
+
+        constructor(options?: ShapeOptions);
+
+
+        position(): void;
+        position(point: kendo.dataviz.diagram.Point): void;
+        clone(): kendo.dataviz.diagram.Shape;
+        select(value: boolean): void;
+        connections(type: string): void;
+        getConnector(): void;
+        getPosition(side: string): void;
+        redraw(options: any): void;
+
+    }
+
+    interface ShapeConnectorDefaultsFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface ShapeConnectorDefaultsHoverFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface ShapeConnectorDefaultsHoverStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ShapeConnectorDefaultsHover {
+        fill?: ShapeConnectorDefaultsHoverFill;
+        stroke?: ShapeConnectorDefaultsHoverStroke;
+    }
+
+    interface ShapeConnectorDefaultsStroke {
+        color?: string;
+        dashType?: string;
+        width?: number;
+    }
+
+    interface ShapeConnectorDefaults {
+        width?: number;
+        height?: number;
+        hover?: ShapeConnectorDefaultsHover;
+        fill?: ShapeConnectorDefaultsFill;
+        stroke?: ShapeConnectorDefaultsStroke;
+    }
+
+    interface ShapeConnector {
+        name?: string;
+        description?: string;
+        position?: Function;
+    }
+
+    interface ShapeContent {
+        align?: string;
+        color?: string;
+        fontFamily?: string;
+        fontSize?: number;
+        text?: string;
+    }
+
+    interface ShapeEditable {
+        connect?: boolean;
+    }
+
+    interface ShapeFillGradientStop {
+        offset?: number;
+        color?: string;
+        opacity?: number;
+    }
+
+    interface ShapeFillGradient {
+        type?: string;
+        center?: any;
+        radius?: number;
+        start?: any;
+        end?: any;
+        stops?: ShapeFillGradientStop[];
+    }
+
+    interface ShapeFill {
+        color?: string;
+        opacity?: number;
+        gradient?: ShapeFillGradient;
+    }
+
+    interface ShapeHoverFill {
+        color?: string;
+        opacity?: number;
+    }
+
+    interface ShapeHover {
+        fill?: ShapeHoverFill;
+    }
+
+    interface ShapeRotation {
+        angle?: number;
+    }
+
+    interface ShapeStroke {
+        color?: string;
+        width?: number;
+        dashType?: string;
+    }
+
+    interface ShapeOptions {
+        name?: string;
+        id?: string;
+        editable?: ShapeEditable;
+        path?: string;
+        stroke?: ShapeStroke;
+        type?: string;
+        x?: number;
+        y?: number;
+        minWidth?: number;
+        minHeight?: number;
+        width?: number;
+        height?: number;
+        fill?: ShapeFill;
+        hover?: ShapeHover;
+        connectors?: ShapeConnector[];
+        rotation?: ShapeRotation;
+        content?: ShapeContent;
+        selectable?: boolean;
+        visual?: Function;
+        connectorDefaults?: ShapeConnectorDefaults;
+    }
+    interface ShapeEvent {
+        sender: Shape;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class TextBlock extends Observable {
+
+
+        options: TextBlockOptions;
+
+
+        constructor(options?: TextBlockOptions);
+
+
+        content(): string;
+        content(content: string): void;
+        position(): void;
+        position(offset: kendo.dataviz.diagram.Point): void;
+        rotate(angle: number, center: kendo.dataviz.diagram.Point): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface TextBlockOptions {
+        name?: string;
+        color?: string;
+        fontFamily?: string;
+        fontSize?: number;
+        height?: number;
+        text?: string;
+        width?: number;
+        x?: number;
+        y?: number;
+    }
+    interface TextBlockEvent {
+        sender: TextBlock;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+}
+declare namespace kendo {
+    class Color extends Observable {
+
+
+        options: ColorOptions;
+
+
+
+
+        diff(): number;
+        equals(): boolean;
+        toHSV(): any;
+        toRGB(): any;
+        toBytes(): any;
+        toHex(): string;
+        toCss(): string;
+        toCssRgba(): string;
+        toDisplay(): string;
+
+    }
+
+    interface ColorOptions {
+        name?: string;
+    }
+    interface ColorEvent {
+        sender: Color;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    namespace drawing {
+        function align(elements: any, rect: kendo.geometry.Rect, alignment: string): void;
+        function drawDOM(element: JQuery, options: any): JQueryPromise<any>;
+        function exportImage(group: kendo.drawing.Group, options: any): JQueryPromise<any>;
+        function exportPDF(group: kendo.drawing.Group, options: kendo.drawing.PDFOptions): JQueryPromise<any>;
+        function exportSVG(group: kendo.drawing.Group, options: any): JQueryPromise<any>;
+        function fit(element: kendo.drawing.Element, rect: kendo.geometry.Rect): void;
+        function stack(elements: any): void;
+        function vAlign(elements: any, rect: kendo.geometry.Rect, alignment: string): void;
+        function vStack(elements: any): void;
+        function vWrap(elements: any, rect: kendo.geometry.Rect): any;
+        function wrap(elements: any, rect: kendo.geometry.Rect): any;
+    }
+
+    namespace effects {
+        function box(element: HTMLElement): any;
+        function fillScale(firstElement: HTMLElement, secondElement: HTMLElement): number;
+        function fitScale(firstElement: HTMLElement, secondElement: HTMLElement): number;
+        function transformOrigin(firstElement: HTMLElement, secondElement: HTMLElement): any;
+    }
+
+        function antiForgeryTokens(): any;
+        function bind(element: string, viewModel: any, namespace?: any): void;
+        function bind(element: string, viewModel: kendo.data.ObservableObject, namespace?: any): void;
+        function bind(element: JQuery, viewModel: any, namespace?: any): void;
+        function bind(element: JQuery, viewModel: kendo.data.ObservableObject, namespace?: any): void;
+        function bind(element: Element, viewModel: any, namespace?: any): void;
+        function bind(element: Element, viewModel: kendo.data.ObservableObject, namespace?: any): void;
+        function observableHierarchy(array: any): void;
+        function culture(culture: string): void;
+        function destroy(element: string): void;
+        function destroy(element: JQuery): void;
+        function destroy(element: Element): void;
+        function htmlEncode(value: string): string;
+        function parseDate(value: string, formats?: string, culture?: string): Date;
+        function parseDate(value: string, formats?: any, culture?: string): Date;
+        function parseFloat(value: string, culture?: string): number;
+        function parseInt(value: string, culture?: string): number;
+        function parseColor(color: string, noerror: boolean): kendo.Color;
+        function proxyModelSetters(): void;
+        function proxyModelSetters(data: kendo.data.Model): void;
+        function resize(element: string, force: boolean): void;
+        function resize(element: JQuery, force: boolean): void;
+        function resize(element: Element, force: boolean): void;
+        function saveAs(options: any): void;
+        function stringify(value: any): string;
+        function throttle(fn: Function, timeout: number): void;
+        function touchScroller(element: string): void;
+        function touchScroller(element: JQuery): void;
+        function touchScroller(element: Element): void;
+        function toString(value: Date, format: string, culture?: string): string;
+        function toString(value: number, format: string, culture?: string): string;
+        function unbind(element: string): void;
+        function unbind(element: JQuery): void;
+        function unbind(element: Element): void;
+
+    namespace pdf {
+        function defineFont(map: any): void;
+    }
+
+}
+declare namespace kendo.spreadsheet {
+    class CustomFilter extends Observable {
+
+
+        options: CustomFilterOptions;
+
+
+
+
+        init(options: any): void;
+
+    }
+
+    interface CustomFilterOptions {
+        name?: string;
+    }
+    interface CustomFilterEvent {
+        sender: CustomFilter;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class DynamicFilter extends Observable {
+
+
+        options: DynamicFilterOptions;
+
+
+
+
+        init(options: any): void;
+
+    }
+
+    interface DynamicFilterOptions {
+        name?: string;
+    }
+    interface DynamicFilterEvent {
+        sender: DynamicFilter;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Range extends Observable {
+
+
+        options: RangeOptions;
+
+
+
+
+        background(): string;
+        background(value?: string): void;
+        bold(): boolean;
+        bold(value?: boolean): void;
+        borderBottom(): any;
+        borderBottom(value?: any): void;
+        borderLeft(): any;
+        borderLeft(value?: any): void;
+        borderRight(): any;
+        borderRight(value?: any): void;
+        borderTop(): any;
+        borderTop(value?: any): void;
+        color(): string;
+        color(value?: string): void;
+        clear(options?: any): void;
+        clearFilter(indices: any): void;
+        clearFilter(indices: number): void;
+        enable(): boolean;
+        enable(value?: boolean): void;
+        fillFrom(srcRange: Range, direction?: number): void;
+        fillFrom(srcRange: string, direction?: number): void;
+        filter(filter: boolean): void;
+        filter(filter: any): void;
+        fontFamily(): string;
+        fontFamily(value?: string): void;
+        fontSize(): number;
+        fontSize(value?: number): void;
+        forEachCell(callback: Function): void;
+        format(): string;
+        format(format?: string): void;
+        formula(): string;
+        formula(formula?: string): void;
+        hasFilter(): boolean;
+        input(): any;
+        input(value?: string): void;
+        input(value?: number): void;
+        input(value?: Date): void;
+        isSortable(): boolean;
+        isFilterable(): boolean;
+        italic(): boolean;
+        italic(value?: boolean): void;
+        merge(): void;
+        select(): void;
+        sort(sort: number): void;
+        sort(sort: any): void;
+        textAlign(): string;
+        textAlign(value?: string): void;
+        unmerge(): void;
+        values(values: any): void;
+        validation(): any;
+        validation(value?: any): void;
+        value(): any;
+        value(value?: string): void;
+        value(value?: number): void;
+        value(value?: Date): void;
+        verticalAlign(): string;
+        verticalAlign(value?: string): void;
+        wrap(): boolean;
+        wrap(value?: boolean): void;
+
+    }
+
+    interface RangeOptions {
+        name?: string;
+    }
+    interface RangeEvent {
+        sender: Range;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Sheet extends Observable {
+
+
+        options: SheetOptions;
+
+
+
+
+        clearFilter(indexes: number): void;
+        clearFilter(indexes: any): void;
+        columnWidth(): void;
+        columnWidth(index: number, width?: number): void;
+        batch(callback: Function, changeEventArgs: any): void;
+        deleteColumn(index: number): void;
+        fromJSON(data: any): void;
+        frozenColumns(): number;
+        frozenColumns(count?: number): void;
+        frozenRows(): number;
+        frozenRows(count?: number): void;
+        hideColumn(index: number): void;
+        hideRow(index: number): void;
+        insertColumn(index: number): void;
+        insertRow(index: number): void;
+        range(ref: string): kendo.spreadsheet.Range;
+        rowHeight(): void;
+        rowHeight(index: number, width?: number): void;
+        selection(): kendo.spreadsheet.Range;
+        showGridLines(): boolean;
+        showGridLines(showGridLiens?: boolean): void;
+        toJSON(): void;
+        setDataSource(dataSource: kendo.data.DataSource, columns?: any): void;
+        unhideColumn(index: number): void;
+        unhideRow(index: number): void;
+
+    }
+
+    interface SheetOptions {
+        name?: string;
+        change?(e: SheetChangeEvent): void;
+    }
+    interface SheetEvent {
+        sender: Sheet;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface SheetChangeEvent extends SheetEvent {
+    }
+
+
+    class TopFilter extends Observable {
+
+
+        options: TopFilterOptions;
+
+
+
+
+        init(options: any): void;
+
+    }
+
+    interface TopFilterOptions {
+        name?: string;
+    }
+    interface TopFilterEvent {
+        sender: TopFilter;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class ValueFilter extends Observable {
+
+
+        options: ValueFilterOptions;
+
+
+
+
+        init(options: any): void;
+
+    }
+
+    interface ValueFilterOptions {
+        name?: string;
+    }
+    interface ValueFilterEvent {
+        sender: ValueFilter;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+}
+declare namespace kendo.mobile.ui {
+    class ActionSheet extends kendo.mobile.ui.Widget {
+
+        static fn: ActionSheet;
+
+        options: ActionSheetOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): ActionSheet;
+
+        constructor(element: Element, options?: ActionSheetOptions);
+
+
+        close(): void;
+        destroy(): void;
+        open(target: JQuery, context: any): void;
+
+    }
+
+    interface ActionSheetPopup {
+        direction?: number|string;
+        height?: number|string;
+        width?: number|string;
+    }
+
+    interface ActionSheetOptions {
+        name?: string;
+        cancel?: string;
+        popup?: ActionSheetPopup;
+        type?: string;
+        close?(e: ActionSheetEvent): void;
+        open?(e: ActionSheetOpenEvent): void;
+    }
+    interface ActionSheetEvent {
+        sender: ActionSheet;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface ActionSheetOpenEvent extends ActionSheetEvent {
+        target?: JQuery;
+        context?: JQuery;
+    }
+
+
+    class BackButton extends kendo.mobile.ui.Widget {
+
+        static fn: BackButton;
+
+        options: BackButtonOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): BackButton;
+
+        constructor(element: Element, options?: BackButtonOptions);
+
+
+        destroy(): void;
+
+    }
+
+    interface BackButtonOptions {
+        name?: string;
+        click?(e: BackButtonClickEvent): void;
+    }
+    interface BackButtonEvent {
+        sender: BackButton;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface BackButtonClickEvent extends BackButtonEvent {
+        target?: JQuery;
+        button?: JQuery;
+    }
+
+
+    class Button extends kendo.mobile.ui.Widget {
+
+        static fn: Button;
+
+        options: ButtonOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Button;
+
+        constructor(element: Element, options?: ButtonOptions);
+
+
+        badge(value: string): string;
+        badge(value: boolean): string;
+        destroy(): void;
+        enable(enable: boolean): void;
+
+    }
+
+    interface ButtonOptions {
+        name?: string;
+        badge?: string;
+        clickOn?: string;
+        enable?: boolean;
+        icon?: string;
+        click?(e: ButtonClickEvent): void;
+    }
+    interface ButtonEvent {
+        sender: Button;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface ButtonClickEvent extends ButtonEvent {
+        target?: JQuery;
+        button?: JQuery;
+    }
+
+
+    class ButtonGroup extends kendo.mobile.ui.Widget {
+
+        static fn: ButtonGroup;
+
+        options: ButtonGroupOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): ButtonGroup;
+
+        constructor(element: Element, options?: ButtonGroupOptions);
+
+
+        badge(button: string, value: string): string;
+        badge(button: string, value: boolean): string;
+        badge(button: number, value: string): string;
+        badge(button: number, value: boolean): string;
+        current(): JQuery;
+        destroy(): void;
+        enable(enable: boolean): void;
+        select(li: JQuery): void;
+        select(li: number): void;
+
+    }
+
+    interface ButtonGroupOptions {
+        name?: string;
+        enable?: boolean;
+        index?: number;
+        selectOn?: string;
+        select?(e: ButtonGroupSelectEvent): void;
+    }
+    interface ButtonGroupEvent {
+        sender: ButtonGroup;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface ButtonGroupSelectEvent extends ButtonGroupEvent {
+        index?: number;
+    }
+
+
+    class Collapsible extends kendo.mobile.ui.Widget {
+
+        static fn: Collapsible;
+
+        options: CollapsibleOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Collapsible;
+
+        constructor(element: Element, options?: CollapsibleOptions);
+
+
+        collapse(instant: boolean): void;
+        destroy(): void;
+        expand(instant?: boolean): void;
+        resize(): void;
+        toggle(instant?: boolean): void;
+
+    }
+
+    interface CollapsibleOptions {
+        name?: string;
+        animation?: boolean;
+        collapsed?: boolean;
+        expandIcon?: string;
+        iconPosition?: string;
+        inset?: boolean;
+        collapse?(e: CollapsibleEvent): void;
+        expand?(e: CollapsibleEvent): void;
+    }
+    interface CollapsibleEvent {
+        sender: Collapsible;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class DetailButton extends kendo.mobile.ui.Widget {
+
+        static fn: DetailButton;
+
+        options: DetailButtonOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): DetailButton;
+
+        constructor(element: Element, options?: DetailButtonOptions);
+
+
+        destroy(): void;
+
+    }
+
+    interface DetailButtonOptions {
+        name?: string;
+        click?(e: DetailButtonClickEvent): void;
+    }
+    interface DetailButtonEvent {
+        sender: DetailButton;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface DetailButtonClickEvent extends DetailButtonEvent {
+        target?: JQuery;
+        button?: JQuery;
+    }
+
+
+    class Drawer extends kendo.mobile.ui.Widget {
+
+        static fn: Drawer;
+
+        options: DrawerOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Drawer;
+
+        constructor(element: Element, options?: DrawerOptions);
+
+
+        destroy(): void;
+        hide(): void;
+        show(): void;
+
+    }
+
+    interface DrawerOptions {
+        name?: string;
+        container?: JQuery;
+        position?: string;
+        swipeToOpen?: boolean;
+        swipeToOpenViews?: any;
+        title?: string;
+        views?: any;
+        afterHide?(e: DrawerAfterHideEvent): void;
+        beforeShow?(e: DrawerEvent): void;
+        hide?(e: DrawerHideEvent): void;
+        init?(e: DrawerInitEvent): void;
+        show?(e: DrawerShowEvent): void;
+    }
+    interface DrawerEvent {
+        sender: Drawer;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface DrawerAfterHideEvent extends DrawerEvent {
+    }
+
+    interface DrawerHideEvent extends DrawerEvent {
+    }
+
+    interface DrawerInitEvent extends DrawerEvent {
+    }
+
+    interface DrawerShowEvent extends DrawerEvent {
+    }
+
+
+    class Layout extends kendo.mobile.ui.Widget {
+
+        static fn: Layout;
+
+        options: LayoutOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Layout;
+
+        constructor(element: Element, options?: LayoutOptions);
+
+
+
+    }
+
+    interface LayoutOptions {
+        name?: string;
+        id?: string;
+        platform?: string;
+        hide?(e: LayoutHideEvent): void;
+        init?(e: LayoutInitEvent): void;
+        show?(e: LayoutShowEvent): void;
+    }
+    interface LayoutEvent {
+        sender: Layout;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface LayoutHideEvent extends LayoutEvent {
+        layout?: JQuery;
+        view?: JQuery;
+    }
+
+    interface LayoutInitEvent extends LayoutEvent {
+        layout?: JQuery;
+    }
+
+    interface LayoutShowEvent extends LayoutEvent {
+        layout?: JQuery;
+        view?: JQuery;
+    }
+
+
+    class ListView extends kendo.mobile.ui.Widget {
+
+        static fn: ListView;
+
+        options: ListViewOptions;
+
+        dataSource: kendo.data.DataSource;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): ListView;
+
+        constructor(element: Element, options?: ListViewOptions);
+
+
+        append(dataItems: any): void;
+        prepend(dataItems: any): void;
+        replace(dataItems: any): void;
+        remove(dataItems: any): void;
+        setDataItem(item: JQuery, dataItem: kendo.data.Model): void;
+        destroy(): void;
+        items(): JQuery;
+        refresh(): void;
+        setDataSource(dataSource: kendo.data.DataSource): void;
+
+    }
+
+    interface ListViewFilterable {
+        placeholder?: string;
+        autoFilter?: boolean;
+        field?: string;
+        ignoreCase?: boolean;
+        operator?: string;
+    }
+
+    interface ListViewMessages {
+        loadMoreText?: string;
+        pullTemplate?: string;
+        refreshTemplate?: string;
+        releaseTemplate?: string;
+    }
+
+    interface ListViewOptions {
+        name?: string;
+        appendOnRefresh?: boolean;
+        autoBind?: boolean;
+        dataSource?: kendo.data.DataSource|any;
+        endlessScroll?: boolean;
+        fixedHeaders?: boolean;
+        headerTemplate?: string|Function;
+        loadMore?: boolean;
+        messages?: ListViewMessages;
+        pullToRefresh?: boolean;
+        pullParameters?: Function;
+        style?: string;
+        template?: string|Function;
+        type?: string;
+        filterable?: ListViewFilterable;
+        virtualViewSize?: number;
+        click?(e: ListViewClickEvent): void;
+        dataBound?(e: ListViewEvent): void;
+        dataBinding?(e: ListViewEvent): void;
+        itemChange?(e: ListViewEvent): void;
+    }
+    interface ListViewEvent {
+        sender: ListView;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface ListViewClickEvent extends ListViewEvent {
+        item?: JQuery;
+        target?: JQuery;
+        dataItem?: any;
+        button?: kendo.mobile.ui.Button;
+    }
+
+
+    class Loader extends kendo.mobile.ui.Widget {
+
+        static fn: Loader;
+
+        options: LoaderOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Loader;
+
+        constructor(element: Element, options?: LoaderOptions);
+
+
+        hide(): void;
+        show(): void;
+
+    }
+
+    interface LoaderOptions {
+        name?: string;
+    }
+    interface LoaderEvent {
+        sender: Loader;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class ModalView extends kendo.mobile.ui.Widget {
+
+        static fn: ModalView;
+
+        options: ModalViewOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): ModalView;
+
+        constructor(element: Element, options?: ModalViewOptions);
+
+
+        close(): void;
+        destroy(): void;
+        open(target?: JQuery): void;
+
+    }
+
+    interface ModalViewOptions {
+        name?: string;
+        height?: number;
+        modal?: boolean;
+        width?: number;
+        beforeOpen?(e: ModalViewBeforeOpenEvent): void;
+        close?(e: ModalViewCloseEvent): void;
+        init?(e: ModalViewInitEvent): void;
+        open?(e: ModalViewOpenEvent): void;
+    }
+    interface ModalViewEvent {
+        sender: ModalView;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface ModalViewBeforeOpenEvent extends ModalViewEvent {
+        target?: JQuery;
+    }
+
+    interface ModalViewCloseEvent extends ModalViewEvent {
+    }
+
+    interface ModalViewInitEvent extends ModalViewEvent {
+    }
+
+    interface ModalViewOpenEvent extends ModalViewEvent {
+        target?: JQuery;
+    }
+
+
+    class NavBar extends kendo.mobile.ui.Widget {
+
+        static fn: NavBar;
+
+        options: NavBarOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): NavBar;
+
+        constructor(element: Element, options?: NavBarOptions);
+
+
+        destroy(): void;
+        title(value: string): void;
+
+    }
+
+    interface NavBarOptions {
+        name?: string;
+    }
+    interface NavBarEvent {
+        sender: NavBar;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Pane extends kendo.mobile.ui.Widget {
+
+        static fn: Pane;
+
+        options: PaneOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Pane;
+
+        constructor(element: Element, options?: PaneOptions);
+
+
+        destroy(): void;
+        hideLoading(): void;
+        navigate(url: string, transition: string): void;
+        replace(url: string, transition: string): void;
+        showLoading(): void;
+        view(): kendo.mobile.ui.View;
+
+    }
+
+    interface PaneOptions {
+        name?: string;
+        collapsible?: boolean;
+        initial?: string;
+        layout?: string;
+        loading?: string;
+        portraitWidth?: number;
+        transition?: string;
+        navigate?(e: PaneNavigateEvent): void;
+        viewShow?(e: PaneViewShowEvent): void;
+    }
+    interface PaneEvent {
+        sender: Pane;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface PaneNavigateEvent extends PaneEvent {
+        url?: JQuery;
+    }
+
+    interface PaneViewShowEvent extends PaneEvent {
+        view?: kendo.mobile.ui.View;
+    }
+
+
+    class PopOver extends kendo.mobile.ui.Widget {
+
+        static fn: PopOver;
+
+        options: PopOverOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): PopOver;
+
+        constructor(element: Element, options?: PopOverOptions);
+
+
+        close(): void;
+        destroy(): void;
+        open(target: JQuery): void;
+
+    }
+
+    interface PopOverPane {
+        initial?: string;
+        layout?: string;
+        loading?: string;
+        transition?: string;
+    }
+
+    interface PopOverPopup {
+        height?: number|string;
+        width?: number|string;
+    }
+
+    interface PopOverOptions {
+        name?: string;
+        pane?: PopOverPane;
+        popup?: PopOverPopup;
+        close?(e: PopOverCloseEvent): void;
+        open?(e: PopOverOpenEvent): void;
+    }
+    interface PopOverEvent {
+        sender: PopOver;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface PopOverCloseEvent extends PopOverEvent {
+    }
+
+    interface PopOverOpenEvent extends PopOverEvent {
+        target?: JQuery;
+    }
+
+
+    class ScrollView extends kendo.mobile.ui.Widget {
+
+        static fn: ScrollView;
+
+        options: ScrollViewOptions;
+
+        dataSource: kendo.data.DataSource;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): ScrollView;
+
+        constructor(element: Element, options?: ScrollViewOptions);
+
+
+        content(content: string): void;
+        content(content: JQuery): void;
+        destroy(): void;
+        next(): void;
+        prev(): void;
+        refresh(): void;
+        scrollTo(page: number, instant: boolean): void;
+        setDataSource(dataSource: kendo.data.DataSource): void;
+        value(dataItem: any): any;
+
+    }
+
+    interface ScrollViewOptions {
+        name?: string;
+        autoBind?: boolean;
+        bounceVelocityThreshold?: number;
+        contentHeight?: number|string;
+        dataSource?: kendo.data.DataSource|any;
+        duration?: number;
+        emptyTemplate?: string;
+        enablePager?: boolean;
+        itemsPerPage?: number;
+        page?: number;
+        pageSize?: number;
+        template?: string;
+        velocityThreshold?: number;
+        changing?(e: ScrollViewChangingEvent): void;
+        change?(e: ScrollViewChangeEvent): void;
+        refresh?(e: ScrollViewRefreshEvent): void;
+    }
+    interface ScrollViewEvent {
+        sender: ScrollView;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface ScrollViewChangingEvent extends ScrollViewEvent {
+        currentPage?: number;
+        nextPage?: number;
+    }
+
+    interface ScrollViewChangeEvent extends ScrollViewEvent {
+        page?: number;
+        element?: JQuery;
+        data?: any;
+    }
+
+    interface ScrollViewRefreshEvent extends ScrollViewEvent {
+        pageCount?: number;
+        page?: number;
+    }
+
+
+    class Scroller extends kendo.mobile.ui.Widget {
+
+        static fn: Scroller;
+
+        options: ScrollerOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Scroller;
+
+        constructor(element: Element, options?: ScrollerOptions);
+
+
+        animatedScrollTo(x: number, y: number): void;
+        contentResized(): void;
+        destroy(): void;
+        disable(): void;
+        enable(): void;
+        height(): number;
+        pullHandled(): void;
+        reset(): void;
+        scrollHeight(): void;
+        scrollTo(x: number, y: number): void;
+        scrollWidth(): void;
+        zoomOut(): void;
+
+    }
+
+    interface ScrollerMessages {
+        pullTemplate?: string;
+        refreshTemplate?: string;
+        releaseTemplate?: string;
+    }
+
+    interface ScrollerOptions {
+        name?: string;
+        elastic?: boolean;
+        messages?: ScrollerMessages;
+        pullOffset?: number;
+        pullToRefresh?: boolean;
+        useNative?: boolean;
+        visibleScrollHints?: boolean;
+        zoom?: boolean;
+        pull?(e: ScrollerEvent): void;
+        resize?(e: ScrollerEvent): void;
+        scroll?(e: ScrollerScrollEvent): void;
+    }
+    interface ScrollerEvent {
+        sender: Scroller;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface ScrollerScrollEvent extends ScrollerEvent {
+        scrollTop?: number;
+        scrollLeft?: number;
+    }
+
+
+    class SplitView extends kendo.mobile.ui.Widget {
+
+        static fn: SplitView;
+
+        options: SplitViewOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): SplitView;
+
+        constructor(element: Element, options?: SplitViewOptions);
+
+
+        destroy(): void;
+        expandPanes(): void;
+        collapsePanes(): void;
+
+    }
+
+    interface SplitViewOptions {
+        name?: string;
+        style?: string;
+        init?(e: SplitViewInitEvent): void;
+        show?(e: SplitViewShowEvent): void;
+    }
+    interface SplitViewEvent {
+        sender: SplitView;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface SplitViewInitEvent extends SplitViewEvent {
+        view?: JQuery;
+    }
+
+    interface SplitViewShowEvent extends SplitViewEvent {
+        view?: JQuery;
+    }
+
+
+    class Switch extends kendo.mobile.ui.Widget {
+
+        static fn: Switch;
+
+        options: SwitchOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Switch;
+
+        constructor(element: Element, options?: SwitchOptions);
+
+
+        check(): boolean;
+        check(check: boolean): void;
+        destroy(): void;
+        enable(enable: boolean): void;
+        refresh(): void;
+        toggle(): void;
+
+    }
+
+    interface SwitchOptions {
+        name?: string;
+        checked?: boolean;
+        enable?: boolean;
+        offLabel?: string;
+        onLabel?: string;
+        change?(e: SwitchChangeEvent): void;
+    }
+    interface SwitchEvent {
+        sender: Switch;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface SwitchChangeEvent extends SwitchEvent {
+        checked?: any;
+    }
+
+
+    class TabStrip extends kendo.mobile.ui.Widget {
+
+        static fn: TabStrip;
+
+        options: TabStripOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): TabStrip;
+
+        constructor(element: Element, options?: TabStripOptions);
+
+
+        badge(tab: string, value: string): string;
+        badge(tab: string, value: boolean): string;
+        badge(tab: number, value: string): string;
+        badge(tab: number, value: boolean): string;
+        currentItem(): JQuery;
+        destroy(): void;
+        switchTo(url: string): void;
+        switchTo(url: number): void;
+        switchByFullUrl(url: string): void;
+        clear(): void;
+
+    }
+
+    interface TabStripOptions {
+        name?: string;
+        selectedIndex?: number;
+        select?(e: TabStripSelectEvent): void;
+    }
+    interface TabStripEvent {
+        sender: TabStrip;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface TabStripSelectEvent extends TabStripEvent {
+        item?: JQuery;
+    }
+
+
+    class View extends kendo.mobile.ui.Widget {
+
+        static fn: View;
+
+        options: ViewOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): View;
+
+        constructor(element: Element, options?: ViewOptions);
+
+
+        contentElement(): void;
+        destroy(): void;
+        enable(enable: boolean): void;
+
+    }
+
+    interface ViewOptions {
+        name?: string;
+        model?: string;
+        reload?: boolean;
+        scroller?: any;
+        stretch?: boolean;
+        title?: string;
+        useNativeScrolling?: boolean;
+        zoom?: boolean;
+        afterShow?(e: ViewAfterShowEvent): void;
+        beforeHide?(e: ViewBeforeHideEvent): void;
+        beforeShow?(e: ViewBeforeShowEvent): void;
+        hide?(e: ViewHideEvent): void;
+        init?(e: ViewInitEvent): void;
+        show?(e: ViewShowEvent): void;
+        transitionStart?(e: ViewTransitionStartEvent): void;
+        transitionEnd?(e: ViewTransitionEndEvent): void;
+    }
+    interface ViewEvent {
+        sender: View;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface ViewAfterShowEvent extends ViewEvent {
+        view?: kendo.mobile.ui.View;
+    }
+
+    interface ViewBeforeHideEvent extends ViewEvent {
+        view?: kendo.mobile.ui.View;
+    }
+
+    interface ViewBeforeShowEvent extends ViewEvent {
+        view?: kendo.mobile.ui.View;
+    }
+
+    interface ViewHideEvent extends ViewEvent {
+        view?: kendo.mobile.ui.View;
+    }
+
+    interface ViewInitEvent extends ViewEvent {
+        view?: kendo.mobile.ui.View;
+    }
+
+    interface ViewShowEvent extends ViewEvent {
+        view?: kendo.mobile.ui.View;
+    }
+
+    interface ViewTransitionStartEvent extends ViewEvent {
+        type?: string;
+    }
+
+    interface ViewTransitionEndEvent extends ViewEvent {
+        type?: string;
+    }
+
+
+}
+declare namespace kendo.ooxml {
+    class Workbook extends Observable {
+
+
+        options: WorkbookOptions;
+
+        sheets: WorkbookSheet[];
+
+        constructor(options?: WorkbookOptions);
+
+
+        toDataURL(): string;
+
+    }
+
+    interface WorkbookSheetColumn {
+        autoWidth?: boolean;
+        index?: number;
+        width?: number;
+    }
+
+    interface WorkbookSheetFilter {
+        from?: number;
+        to?: number;
+    }
+
+    interface WorkbookSheetFreezePane {
+        colSplit?: number;
+        rowSplit?: number;
+    }
+
+    interface WorkbookSheetRowCellBorderBottom {
+        color?: string;
+        size?: string;
+    }
+
+    interface WorkbookSheetRowCellBorderLeft {
+        color?: string;
+        size?: string;
+    }
+
+    interface WorkbookSheetRowCellBorderRight {
+        color?: string;
+        size?: string;
+    }
+
+    interface WorkbookSheetRowCellBorderTop {
+        color?: string;
+        size?: string;
+    }
+
+    interface WorkbookSheetRowCell {
+        background?: string;
+        borderBottom?: WorkbookSheetRowCellBorderBottom;
+        borderLeft?: WorkbookSheetRowCellBorderLeft;
+        borderTop?: WorkbookSheetRowCellBorderTop;
+        borderRight?: WorkbookSheetRowCellBorderRight;
+        bold?: boolean;
+        color?: string;
+        colSpan?: number;
+        fontFamily?: string;
+        fontName?: string;
+        fontSize?: number;
+        format?: string;
+        formula?: string;
+        hAlign?: string;
+        index?: any;
+        italic?: boolean;
+        rowSpan?: number;
+        textAlign?: string;
+        underline?: boolean;
+        wrap?: boolean;
+        vAlign?: string;
+        verticalAlign?: string;
+        value?: Date|number|string|boolean;
+    }
+
+    interface WorkbookSheetRow {
+        cells?: WorkbookSheetRowCell[];
+        index?: number;
+        height?: number;
+    }
+
+    interface WorkbookSheet {
+        columns?: WorkbookSheetColumn[];
+        freezePane?: WorkbookSheetFreezePane;
+        frozenColumns?: number;
+        frozenRows?: number;
+        filter?: WorkbookSheetFilter;
+        name?: string;
+        rows?: WorkbookSheetRow[];
+        showGridLines?: boolean;
+        title?: string;
+    }
+
+    interface WorkbookOptions {
+        name?: string;
+        creator?: string;
+        date?: Date;
+        sheets?: WorkbookSheet[];
+    }
+    interface WorkbookEvent {
+        sender: Workbook;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+}
+
+declare namespace kendo.dataviz.geometry {
+    class Arc extends Observable {
+
+
+        options: ArcOptions;
+
+        anticlockwise: boolean;
+        center: kendo.geometry.Point;
+        endAngle: number;
+        radiusX: number;
+        radiusY: number;
+        startAngle: number;
+
+
+
+        bbox(matrix: kendo.geometry.Matrix): kendo.geometry.Rect;
+        getAnticlockwise(): boolean;
+        getCenter(): kendo.geometry.Point;
+        getEndAngle(): number;
+        getRadiusX(): number;
+        getRadiusY(): number;
+        getStartAngle(): number;
+        pointAt(angle: number): kendo.geometry.Point;
+        setAnticlockwise(value: boolean): kendo.geometry.Arc;
+        setCenter(value: kendo.geometry.Point): kendo.geometry.Arc;
+        setEndAngle(value: number): kendo.geometry.Arc;
+        setRadiusX(value: number): kendo.geometry.Arc;
+        setRadiusY(value: number): kendo.geometry.Arc;
+        setStartAngle(value: number): kendo.geometry.Arc;
+
+    }
+
+    interface ArcOptions {
+        name?: string;
+    }
+    interface ArcEvent {
+        sender: Arc;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Circle extends Observable {
+
+
+        options: CircleOptions;
+
+        center: kendo.geometry.Point;
+        radius: number;
+
+
+
+        bbox(matrix: kendo.geometry.Matrix): kendo.geometry.Rect;
+        clone(): kendo.geometry.Circle;
+        equals(other: kendo.geometry.Circle): boolean;
+        getCenter(): kendo.geometry.Point;
+        getRadius(): number;
+        pointAt(angle: number): kendo.geometry.Point;
+        setCenter(value: kendo.geometry.Point): kendo.geometry.Point;
+        setCenter(value: any): kendo.geometry.Point;
+        setRadius(value: number): kendo.geometry.Circle;
+
+    }
+
+    interface CircleOptions {
+        name?: string;
+    }
+    interface CircleEvent {
+        sender: Circle;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Matrix extends Observable {
+
+
+        options: MatrixOptions;
+
+        a: number;
+        b: number;
+        c: number;
+        d: number;
+        e: number;
+        f: number;
+
+
+        static rotate(angle: number, x: number, y: number): kendo.geometry.Matrix;
+        static scale(scaleX: number, scaleY: number): kendo.geometry.Matrix;
+        static translate(x: number, y: number): kendo.geometry.Matrix;
+        static unit(): kendo.geometry.Matrix;
+
+        clone(): kendo.geometry.Matrix;
+        equals(other: kendo.geometry.Matrix): boolean;
+        round(digits: number): kendo.geometry.Matrix;
+        multiplyCopy(matrix: kendo.geometry.Matrix): kendo.geometry.Matrix;
+        toArray(digits: number): any;
+        toString(digits: number, separator: string): string;
+
+    }
+
+    interface MatrixOptions {
+        name?: string;
+    }
+    interface MatrixEvent {
+        sender: Matrix;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Point extends Observable {
+
+
+        options: PointOptions;
+
+        x: number;
+        y: number;
+
+        constructor(x: number, y: number);
+
+        static create(x: number, y: number): kendo.geometry.Point;
+        static create(x: any, y: number): kendo.geometry.Point;
+        static create(x: kendo.geometry.Point, y: number): kendo.geometry.Point;
+        static min(): kendo.geometry.Point;
+        static max(): kendo.geometry.Point;
+        static minPoint(): kendo.geometry.Point;
+        static maxPoint(): kendo.geometry.Point;
+
+        clone(): kendo.geometry.Point;
+        distanceTo(point: kendo.geometry.Point): number;
+        equals(other: kendo.geometry.Point): boolean;
+        getX(): number;
+        getY(): number;
+        move(x: number, y: number): kendo.geometry.Point;
+        rotate(angle: number, center: kendo.geometry.Point): kendo.geometry.Point;
+        rotate(angle: number, center: any): kendo.geometry.Point;
+        round(digits: number): kendo.geometry.Point;
+        scale(scaleX: number, scaleY: number): kendo.geometry.Point;
+        scaleCopy(scaleX: number, scaleY: number): kendo.geometry.Point;
+        setX(value: number): kendo.geometry.Point;
+        setY(value: number): kendo.geometry.Point;
+        toArray(digits: number): any;
+        toString(digits: number, separator: string): string;
+        transform(tansformation: kendo.geometry.Transformation): kendo.geometry.Point;
+        transformCopy(tansformation: kendo.geometry.Transformation): kendo.geometry.Point;
+        translate(dx: number, dy: number): kendo.geometry.Point;
+        translateWith(vector: kendo.geometry.Point): kendo.geometry.Point;
+        translateWith(vector: any): kendo.geometry.Point;
+
+    }
+
+    interface PointOptions {
+        name?: string;
+    }
+    interface PointEvent {
+        sender: Point;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Rect extends Observable {
+
+
+        options: RectOptions;
+
+        origin: kendo.geometry.Point;
+        size: kendo.geometry.Size;
+
+        constructor(origin: kendo.geometry.Point, size: kendo.geometry.Size);
+
+        static fromPoints(pointA: kendo.geometry.Point, pointB: kendo.geometry.Point): kendo.geometry.Rect;
+        static union(rectA: kendo.geometry.Rect, rectB: kendo.geometry.Rect): kendo.geometry.Rect;
+
+        bbox(matrix: kendo.geometry.Matrix): kendo.geometry.Rect;
+        bottomLeft(): kendo.geometry.Point;
+        bottomRight(): kendo.geometry.Point;
+        center(): kendo.geometry.Point;
+        clone(): kendo.geometry.Rect;
+        equals(other: kendo.geometry.Rect): boolean;
+        getOrigin(): kendo.geometry.Point;
+        getSize(): kendo.geometry.Size;
+        height(): number;
+        setOrigin(value: kendo.geometry.Point): kendo.geometry.Rect;
+        setOrigin(value: any): kendo.geometry.Rect;
+        setSize(value: kendo.geometry.Size): kendo.geometry.Rect;
+        setSize(value: any): kendo.geometry.Rect;
+        topLeft(): kendo.geometry.Point;
+        topRight(): kendo.geometry.Point;
+        width(): number;
+
+    }
+
+    interface RectOptions {
+        name?: string;
+    }
+    interface RectEvent {
+        sender: Rect;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Size extends Observable {
+
+
+        options: SizeOptions;
+
+        width: number;
+        height: number;
+
+
+        static create(width: number, height: number): kendo.geometry.Size;
+        static create(width: any, height: number): kendo.geometry.Size;
+        static create(width: kendo.geometry.Size, height: number): kendo.geometry.Size;
+
+        clone(): kendo.geometry.Size;
+        equals(other: kendo.geometry.Size): boolean;
+        getWidth(): number;
+        getHeight(): number;
+        setWidth(value: number): kendo.geometry.Size;
+        setHeight(value: number): kendo.geometry.Size;
+
+    }
+
+    interface SizeOptions {
+        name?: string;
+    }
+    interface SizeEvent {
+        sender: Size;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Transformation extends Observable {
+
+
+        options: TransformationOptions;
+
+
+
+
+        clone(): kendo.geometry.Transformation;
+        equals(other: kendo.geometry.Transformation): boolean;
+        matrix(): kendo.geometry.Matrix;
+        multiply(transformation: kendo.geometry.Transformation): kendo.geometry.Transformation;
+        rotate(angle: number, center: any): kendo.geometry.Transformation;
+        rotate(angle: number, center: kendo.geometry.Point): kendo.geometry.Transformation;
+        scale(scaleX: number, scaleY: number): kendo.geometry.Transformation;
+        translate(x: number, y: number): kendo.geometry.Transformation;
+
+    }
+
+    interface TransformationOptions {
+        name?: string;
+    }
+    interface TransformationEvent {
+        sender: Transformation;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+}
+declare namespace kendo.dataviz.drawing {
+    class Arc extends kendo.drawing.Element {
+
+
+        options: ArcOptions;
+
+
+        constructor(geometry: kendo.geometry.Arc, options?: ArcOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        geometry(): kendo.geometry.Arc;
+        geometry(value: kendo.geometry.Arc): void;
+        fill(color: string, opacity?: number): kendo.drawing.Arc;
+        opacity(): number;
+        opacity(opacity: number): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Arc;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface ArcOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        cursor?: string;
+        fill?: kendo.drawing.FillOptions;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface ArcEvent {
+        sender: Arc;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Circle extends kendo.drawing.Element {
+
+
+        options: CircleOptions;
+
+
+        constructor(geometry: kendo.geometry.Circle, options?: CircleOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        geometry(): kendo.geometry.Circle;
+        geometry(value: kendo.geometry.Circle): void;
+        fill(color: string, opacity?: number): kendo.drawing.Circle;
+        opacity(): number;
+        opacity(opacity: number): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Circle;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface CircleOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        cursor?: string;
+        fill?: kendo.drawing.FillOptions;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface CircleEvent {
+        sender: Circle;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Element extends kendo.Class {
+
+
+        options: ElementOptions;
+
+
+        constructor(options?: ElementOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        opacity(): number;
+        opacity(opacity: number): void;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface ElementOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        cursor?: string;
+        opacity?: number;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface ElementEvent {
+        sender: Element;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    interface FillOptions  {
+
+
+
+        color?: string;
+        opacity?: number;
+
+
+
+
+    }
+
+
+
+    class Gradient extends kendo.Class {
+
+
+        options: GradientOptions;
+
+        stops: any;
+
+        constructor(options?: GradientOptions);
+
+
+        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
+        removeStop(stop: kendo.drawing.GradientStop): void;
+
+    }
+
+    interface GradientOptions {
+        name?: string;
+        stops?: any;
+    }
+    interface GradientEvent {
+        sender: Gradient;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class GradientStop extends kendo.Class {
+
+
+        options: GradientStopOptions;
+
+
+        constructor(options?: GradientStopOptions);
+
+
+
+    }
+
+    interface GradientStopOptions {
+        name?: string;
+        offset?: number;
+        color?: string;
+        opacity?: number;
+    }
+    interface GradientStopEvent {
+        sender: GradientStop;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Group extends kendo.drawing.Element {
+
+
+        options: GroupOptions;
+
+        children: any;
+
+        constructor(options?: GroupOptions);
+
+
+        append(element: kendo.drawing.Element): void;
+        clear(): void;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        insert(position: number, element: kendo.drawing.Element): void;
+        opacity(): number;
+        opacity(opacity: number): void;
+        remove(element: kendo.drawing.Element): void;
+        removeAt(index: number): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface GroupOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        cursor?: string;
+        opacity?: number;
+        pdf?: kendo.drawing.PDFOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface GroupEvent {
+        sender: Group;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Image extends kendo.drawing.Element {
+
+
+        options: ImageOptions;
+
+
+        constructor(src: string, rect: kendo.geometry.Rect);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        opacity(): number;
+        opacity(opacity: number): void;
+        src(): string;
+        src(value: string): void;
+        rect(): kendo.geometry.Rect;
+        rect(value: kendo.geometry.Rect): void;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface ImageOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        cursor?: string;
+        opacity?: number;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface ImageEvent {
+        sender: Image;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Layout extends kendo.drawing.Group {
+
+
+        options: LayoutOptions;
+
+
+        constructor(rect: kendo.geometry.Rect, options?: LayoutOptions);
+
+
+        rect(): kendo.geometry.Rect;
+        rect(rect: kendo.geometry.Rect): void;
+        reflow(): void;
+
+    }
+
+    interface LayoutOptions {
+        name?: string;
+        alignContent?: string;
+        alignItems?: string;
+        justifyContent?: string;
+        lineSpacing?: number;
+        spacing?: number;
+        orientation?: string;
+        wrap?: boolean;
+    }
+    interface LayoutEvent {
+        sender: Layout;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class LinearGradient extends kendo.drawing.Gradient {
+
+
+        options: LinearGradientOptions;
+
+        stops: any;
+
+        constructor(options?: LinearGradientOptions);
+
+
+        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
+        end(): kendo.geometry.Point;
+        end(end: any): void;
+        end(end: kendo.geometry.Point): void;
+        start(): kendo.geometry.Point;
+        start(start: any): void;
+        start(start: kendo.geometry.Point): void;
+        removeStop(stop: kendo.drawing.GradientStop): void;
+
+    }
+
+    interface LinearGradientOptions {
+        name?: string;
+        stops?: any;
+    }
+    interface LinearGradientEvent {
+        sender: LinearGradient;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class MultiPath extends kendo.drawing.Element {
+
+
+        options: MultiPathOptions;
+
+        paths: any;
+
+        constructor(options?: MultiPathOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        close(): kendo.drawing.MultiPath;
+        curveTo(controlOut: any, controlIn: any, endPoint: any): kendo.drawing.MultiPath;
+        curveTo(controlOut: any, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
+        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.MultiPath;
+        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: any): kendo.drawing.MultiPath;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.MultiPath;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
+        fill(color: string, opacity?: number): kendo.drawing.MultiPath;
+        lineTo(x: number, y?: number): kendo.drawing.MultiPath;
+        lineTo(x: any, y?: number): kendo.drawing.MultiPath;
+        lineTo(x: kendo.geometry.Point, y?: number): kendo.drawing.MultiPath;
+        moveTo(x: number, y?: number): kendo.drawing.MultiPath;
+        moveTo(x: any, y?: number): kendo.drawing.MultiPath;
+        moveTo(x: kendo.geometry.Point, y?: number): kendo.drawing.MultiPath;
+        opacity(): number;
+        opacity(opacity: number): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.MultiPath;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface MultiPathOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        cursor?: string;
+        fill?: kendo.drawing.FillOptions;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface MultiPathEvent {
+        sender: MultiPath;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class OptionsStore extends kendo.Class {
+
+
+        options: OptionsStoreOptions;
+
+        observer: any;
+
+        constructor(options?: OptionsStoreOptions);
+
+
+        get(field: string): any;
+        set(field: string, value: any): void;
+
+    }
+
+    interface OptionsStoreOptions {
+        name?: string;
+    }
+    interface OptionsStoreEvent {
+        sender: OptionsStore;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    interface PDFOptions  {
+
+
+
+        creator?: string;
+        date?: Date;
+        keywords?: string;
+        landscape?: boolean;
+        margin?: any;
+        paperSize?: any;
+        subject?: string;
+        title?: string;
+
+
+
+
+    }
+
+
+
+    class Path extends kendo.drawing.Element {
+
+
+        options: PathOptions;
+
+        segments: any;
+
+        constructor(options?: PathOptions);
+
+        static fromPoints(points: any): kendo.drawing.Path;
+        static fromRect(rect: kendo.geometry.Rect): kendo.drawing.Path;
+        static parse(svgPath: string, options?: any): kendo.drawing.Path;
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        close(): kendo.drawing.Path;
+        curveTo(controlOut: any, controlIn: any, endPoint: any): kendo.drawing.Path;
+        curveTo(controlOut: any, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.Path;
+        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.Path;
+        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.Path;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: any): kendo.drawing.Path;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.Path;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.Path;
+        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.Path;
+        fill(color: string, opacity?: number): kendo.drawing.Path;
+        lineTo(x: number, y?: number): kendo.drawing.Path;
+        lineTo(x: any, y?: number): kendo.drawing.Path;
+        lineTo(x: kendo.geometry.Point, y?: number): kendo.drawing.Path;
+        moveTo(x: number, y?: number): kendo.drawing.Path;
+        moveTo(x: any, y?: number): kendo.drawing.Path;
+        moveTo(x: kendo.geometry.Point, y?: number): kendo.drawing.Path;
+        opacity(): number;
+        opacity(opacity: number): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Path;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface PathOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        cursor?: string;
+        fill?: kendo.drawing.FillOptions;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface PathEvent {
+        sender: Path;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class RadialGradient extends kendo.drawing.Gradient {
+
+
+        options: RadialGradientOptions;
+
+        stops: any;
+
+        constructor(options?: RadialGradientOptions);
+
+
+        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
+        center(): kendo.geometry.Point;
+        center(center: any): void;
+        center(center: kendo.geometry.Point): void;
+        radius(): number;
+        radius(value: number): void;
+        removeStop(stop: kendo.drawing.GradientStop): void;
+
+    }
+
+    interface RadialGradientOptions {
+        name?: string;
+        center?: any|kendo.geometry.Point;
+        radius?: number;
+        stops?: any;
+    }
+    interface RadialGradientEvent {
+        sender: RadialGradient;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Rect extends kendo.drawing.Element {
+
+
+        options: RectOptions;
+
+
+        constructor(geometry: kendo.geometry.Rect, options?: RectOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        geometry(): kendo.geometry.Rect;
+        geometry(value: kendo.geometry.Rect): void;
+        fill(color: string, opacity?: number): kendo.drawing.Rect;
+        opacity(): number;
+        opacity(opacity: number): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Rect;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface RectOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        cursor?: string;
+        fill?: kendo.drawing.FillOptions;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface RectEvent {
+        sender: Rect;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    class Segment extends kendo.Class {
+
+
+        options: SegmentOptions;
+
+
+        constructor(anchor: kendo.geometry.Point, controlIn: kendo.geometry.Point, controlOut: kendo.geometry.Point);
+
+
+        anchor(): kendo.geometry.Point;
+        anchor(value: kendo.geometry.Point): void;
+        controlIn(): kendo.geometry.Point;
+        controlIn(value: kendo.geometry.Point): void;
+        controlOut(): kendo.geometry.Point;
+        controlOut(value: kendo.geometry.Point): void;
+
+    }
+
+    interface SegmentOptions {
+        name?: string;
+    }
+    interface SegmentEvent {
+        sender: Segment;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+    interface StrokeOptions  {
+
+
+
+        color?: string;
+        dashType?: string;
+        lineCap?: string;
+        lineJoin?: string;
+        opacity?: number;
+        width?: number;
+
+
+
+
+    }
+
+
+
+    class Surface extends kendo.Observable {
+
+
+        options: SurfaceOptions;
+
+
+        constructor(options?: SurfaceOptions);
+
+        static create(element: JQuery, options?: any): kendo.drawing.Surface;
+        static create(element: Element, options?: any): kendo.drawing.Surface;
+
+        clear(): void;
+        draw(element: kendo.drawing.Element): void;
+        eventTarget(e: any): kendo.drawing.Element;
+        resize(force?: boolean): void;
+
+    }
+
+    interface SurfaceOptions {
+        name?: string;
+        type?: string;
+        height?: string;
+        width?: string;
+        click?(e: SurfaceClickEvent): void;
+        mouseenter?(e: SurfaceMouseenterEvent): void;
+        mouseleave?(e: SurfaceMouseleaveEvent): void;
+    }
+    interface SurfaceEvent {
+        sender: Surface;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface SurfaceClickEvent extends SurfaceEvent {
+        element?: kendo.drawing.Element;
+        originalEvent?: any;
+    }
+
+    interface SurfaceMouseenterEvent extends SurfaceEvent {
+        element?: kendo.drawing.Element;
+        originalEvent?: any;
+    }
+
+    interface SurfaceMouseleaveEvent extends SurfaceEvent {
+        element?: kendo.drawing.Element;
+        originalEvent?: any;
+    }
+
+
+    class Text extends kendo.drawing.Element {
+
+
+        options: TextOptions;
+
+
+        constructor(content: string, position: kendo.geometry.Point, options?: TextOptions);
+
+
+        bbox(): kendo.geometry.Rect;
+        clip(): kendo.drawing.Path;
+        clip(clip: kendo.drawing.Path): void;
+        clippedBBox(): kendo.geometry.Rect;
+        content(): string;
+        content(value: string): void;
+        fill(color: string, opacity?: number): kendo.drawing.Text;
+        opacity(): number;
+        opacity(opacity: number): void;
+        position(): kendo.geometry.Point;
+        position(value: kendo.geometry.Point): void;
+        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Text;
+        transform(): kendo.geometry.Transformation;
+        transform(transform: kendo.geometry.Transformation): void;
+        visible(): boolean;
+        visible(visible: boolean): void;
+
+    }
+
+    interface TextOptions {
+        name?: string;
+        clip?: kendo.drawing.Path;
+        cursor?: string;
+        fill?: kendo.drawing.FillOptions;
+        font?: string;
+        opacity?: number;
+        stroke?: kendo.drawing.StrokeOptions;
+        transform?: kendo.geometry.Transformation;
+        visible?: boolean;
+    }
+    interface TextEvent {
+        sender: Text;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+
+}
+
+interface HTMLElement {
+    kendoBindingTarget: kendo.data.BindingTarget;
+}
+
+interface JQueryXHR {
+}
+
+interface JQueryEventObject {
+}
+
+interface JQueryPromise<T> {
+}
+
+interface JQuery {
+
+    kendoDraggable(): JQuery;
+    kendoDraggable(options: kendo.ui.DraggableOptions): JQuery;
+
+    kendoDropTarget(): JQuery;
+    kendoDropTarget(options: kendo.ui.DropTargetOptions): JQuery;
+
+    kendoDropTargetArea(): JQuery;
+    kendoDropTargetArea(options: kendo.ui.DropTargetAreaOptions): JQuery;
+
+    data(key: any): any;
+
+    kendoAutoComplete(): JQuery;
+    kendoAutoComplete(options: kendo.ui.AutoCompleteOptions): JQuery;
+    data(key: "kendoAutoComplete"): kendo.ui.AutoComplete;
+
+    kendoBarcode(): JQuery;
+    kendoBarcode(options: kendo.dataviz.ui.BarcodeOptions): JQuery;
+    data(key: "kendoBarcode"): kendo.dataviz.ui.Barcode;
+
+    kendoButton(): JQuery;
+    kendoButton(options: kendo.ui.ButtonOptions): JQuery;
+    data(key: "kendoButton"): kendo.ui.Button;
+
+    kendoCalendar(): JQuery;
+    kendoCalendar(options: kendo.ui.CalendarOptions): JQuery;
+    data(key: "kendoCalendar"): kendo.ui.Calendar;
+
+    kendoChart(): JQuery;
+    kendoChart(options: kendo.dataviz.ui.ChartOptions): JQuery;
+    data(key: "kendoChart"): kendo.dataviz.ui.Chart;
+
+    kendoColorPalette(): JQuery;
+    kendoColorPalette(options: kendo.ui.ColorPaletteOptions): JQuery;
+    data(key: "kendoColorPalette"): kendo.ui.ColorPalette;
+
+    kendoColorPicker(): JQuery;
+    kendoColorPicker(options: kendo.ui.ColorPickerOptions): JQuery;
+    data(key: "kendoColorPicker"): kendo.ui.ColorPicker;
+
+    kendoComboBox(): JQuery;
+    kendoComboBox(options: kendo.ui.ComboBoxOptions): JQuery;
+    data(key: "kendoComboBox"): kendo.ui.ComboBox;
+
+    kendoContextMenu(): JQuery;
+    kendoContextMenu(options: kendo.ui.ContextMenuOptions): JQuery;
+    data(key: "kendoContextMenu"): kendo.ui.ContextMenu;
+
+    kendoDatePicker(): JQuery;
+    kendoDatePicker(options: kendo.ui.DatePickerOptions): JQuery;
+    data(key: "kendoDatePicker"): kendo.ui.DatePicker;
+
+    kendoDateTimePicker(): JQuery;
+    kendoDateTimePicker(options: kendo.ui.DateTimePickerOptions): JQuery;
+    data(key: "kendoDateTimePicker"): kendo.ui.DateTimePicker;
+
+    kendoDiagram(): JQuery;
+    kendoDiagram(options: kendo.dataviz.ui.DiagramOptions): JQuery;
+    data(key: "kendoDiagram"): kendo.dataviz.ui.Diagram;
+
+    kendoDropDownList(): JQuery;
+    kendoDropDownList(options: kendo.ui.DropDownListOptions): JQuery;
+    data(key: "kendoDropDownList"): kendo.ui.DropDownList;
+
+    kendoEditor(): JQuery;
+    kendoEditor(options: kendo.ui.EditorOptions): JQuery;
+    data(key: "kendoEditor"): kendo.ui.Editor;
+
+    kendoFlatColorPicker(): JQuery;
+    kendoFlatColorPicker(options: kendo.ui.FlatColorPickerOptions): JQuery;
+    data(key: "kendoFlatColorPicker"): kendo.ui.FlatColorPicker;
+
+    kendoGantt(): JQuery;
+    kendoGantt(options: kendo.ui.GanttOptions): JQuery;
+    data(key: "kendoGantt"): kendo.ui.Gantt;
+
+    kendoGrid(): JQuery;
+    kendoGrid(options: kendo.ui.GridOptions): JQuery;
+    data(key: "kendoGrid"): kendo.ui.Grid;
+
+    kendoLinearGauge(): JQuery;
+    kendoLinearGauge(options: kendo.dataviz.ui.LinearGaugeOptions): JQuery;
+    data(key: "kendoLinearGauge"): kendo.dataviz.ui.LinearGauge;
+
+    kendoListView(): JQuery;
+    kendoListView(options: kendo.ui.ListViewOptions): JQuery;
+    data(key: "kendoListView"): kendo.ui.ListView;
+
+    kendoMap(): JQuery;
+    kendoMap(options: kendo.dataviz.ui.MapOptions): JQuery;
+    data(key: "kendoMap"): kendo.dataviz.ui.Map;
+
+    kendoMaskedTextBox(): JQuery;
+    kendoMaskedTextBox(options: kendo.ui.MaskedTextBoxOptions): JQuery;
+    data(key: "kendoMaskedTextBox"): kendo.ui.MaskedTextBox;
+
+    kendoMenu(): JQuery;
+    kendoMenu(options: kendo.ui.MenuOptions): JQuery;
+    data(key: "kendoMenu"): kendo.ui.Menu;
+
+    kendoMobileActionSheet(): JQuery;
+    kendoMobileActionSheet(options: kendo.mobile.ui.ActionSheetOptions): JQuery;
+    data(key: "kendoMobileActionSheet"): kendo.mobile.ui.ActionSheet;
+
+    kendoMobileBackButton(): JQuery;
+    kendoMobileBackButton(options: kendo.mobile.ui.BackButtonOptions): JQuery;
+    data(key: "kendoMobileBackButton"): kendo.mobile.ui.BackButton;
+
+    kendoMobileButton(): JQuery;
+    kendoMobileButton(options: kendo.mobile.ui.ButtonOptions): JQuery;
+    data(key: "kendoMobileButton"): kendo.mobile.ui.Button;
+
+    kendoMobileButtonGroup(): JQuery;
+    kendoMobileButtonGroup(options: kendo.mobile.ui.ButtonGroupOptions): JQuery;
+    data(key: "kendoMobileButtonGroup"): kendo.mobile.ui.ButtonGroup;
+
+    kendoMobileCollapsible(): JQuery;
+    kendoMobileCollapsible(options: kendo.mobile.ui.CollapsibleOptions): JQuery;
+    data(key: "kendoMobileCollapsible"): kendo.mobile.ui.Collapsible;
+
+    kendoMobileDetailButton(): JQuery;
+    kendoMobileDetailButton(options: kendo.mobile.ui.DetailButtonOptions): JQuery;
+    data(key: "kendoMobileDetailButton"): kendo.mobile.ui.DetailButton;
+
+    kendoMobileDrawer(): JQuery;
+    kendoMobileDrawer(options: kendo.mobile.ui.DrawerOptions): JQuery;
+    data(key: "kendoMobileDrawer"): kendo.mobile.ui.Drawer;
+
+    kendoMobileLayout(): JQuery;
+    kendoMobileLayout(options: kendo.mobile.ui.LayoutOptions): JQuery;
+    data(key: "kendoMobileLayout"): kendo.mobile.ui.Layout;
+
+    kendoMobileListView(): JQuery;
+    kendoMobileListView(options: kendo.mobile.ui.ListViewOptions): JQuery;
+    data(key: "kendoMobileListView"): kendo.mobile.ui.ListView;
+
+    kendoMobileLoader(): JQuery;
+    kendoMobileLoader(options: kendo.mobile.ui.LoaderOptions): JQuery;
+    data(key: "kendoMobileLoader"): kendo.mobile.ui.Loader;
+
+    kendoMobileModalView(): JQuery;
+    kendoMobileModalView(options: kendo.mobile.ui.ModalViewOptions): JQuery;
+    data(key: "kendoMobileModalView"): kendo.mobile.ui.ModalView;
+
+    kendoMobileNavBar(): JQuery;
+    kendoMobileNavBar(options: kendo.mobile.ui.NavBarOptions): JQuery;
+    data(key: "kendoMobileNavBar"): kendo.mobile.ui.NavBar;
+
+    kendoMobilePane(): JQuery;
+    kendoMobilePane(options: kendo.mobile.ui.PaneOptions): JQuery;
+    data(key: "kendoMobilePane"): kendo.mobile.ui.Pane;
+
+    kendoMobilePopOver(): JQuery;
+    kendoMobilePopOver(options: kendo.mobile.ui.PopOverOptions): JQuery;
+    data(key: "kendoMobilePopOver"): kendo.mobile.ui.PopOver;
+
+    kendoMobileScrollView(): JQuery;
+    kendoMobileScrollView(options: kendo.mobile.ui.ScrollViewOptions): JQuery;
+    data(key: "kendoMobileScrollView"): kendo.mobile.ui.ScrollView;
+
+    kendoMobileScroller(): JQuery;
+    kendoMobileScroller(options: kendo.mobile.ui.ScrollerOptions): JQuery;
+    data(key: "kendoMobileScroller"): kendo.mobile.ui.Scroller;
+
+    kendoMobileSplitView(): JQuery;
+    kendoMobileSplitView(options: kendo.mobile.ui.SplitViewOptions): JQuery;
+    data(key: "kendoMobileSplitView"): kendo.mobile.ui.SplitView;
+
+    kendoMobileSwitch(): JQuery;
+    kendoMobileSwitch(options: kendo.mobile.ui.SwitchOptions): JQuery;
+    data(key: "kendoMobileSwitch"): kendo.mobile.ui.Switch;
+
+    kendoMobileTabStrip(): JQuery;
+    kendoMobileTabStrip(options: kendo.mobile.ui.TabStripOptions): JQuery;
+    data(key: "kendoMobileTabStrip"): kendo.mobile.ui.TabStrip;
+
+    kendoMobileView(): JQuery;
+    kendoMobileView(options: kendo.mobile.ui.ViewOptions): JQuery;
+    data(key: "kendoMobileView"): kendo.mobile.ui.View;
+
+    kendoMultiSelect(): JQuery;
+    kendoMultiSelect(options: kendo.ui.MultiSelectOptions): JQuery;
+    data(key: "kendoMultiSelect"): kendo.ui.MultiSelect;
+
+    kendoNotification(): JQuery;
+    kendoNotification(options: kendo.ui.NotificationOptions): JQuery;
+    data(key: "kendoNotification"): kendo.ui.Notification;
+
+    kendoNumericTextBox(): JQuery;
+    kendoNumericTextBox(options: kendo.ui.NumericTextBoxOptions): JQuery;
+    data(key: "kendoNumericTextBox"): kendo.ui.NumericTextBox;
+
+    kendoPager(): JQuery;
+    kendoPager(options: kendo.ui.PagerOptions): JQuery;
+    data(key: "kendoPager"): kendo.ui.Pager;
+
+    kendoPanelBar(): JQuery;
+    kendoPanelBar(options: kendo.ui.PanelBarOptions): JQuery;
+    data(key: "kendoPanelBar"): kendo.ui.PanelBar;
+
+    kendoPivotConfigurator(): JQuery;
+    kendoPivotConfigurator(options: kendo.ui.PivotConfiguratorOptions): JQuery;
+    data(key: "kendoPivotConfigurator"): kendo.ui.PivotConfigurator;
+
+    kendoPivotGrid(): JQuery;
+    kendoPivotGrid(options: kendo.ui.PivotGridOptions): JQuery;
+    data(key: "kendoPivotGrid"): kendo.ui.PivotGrid;
+
+    kendoPopup(): JQuery;
+    kendoPopup(options: kendo.ui.PopupOptions): JQuery;
+    data(key: "kendoPopup"): kendo.ui.Popup;
+
+    kendoProgressBar(): JQuery;
+    kendoProgressBar(options: kendo.ui.ProgressBarOptions): JQuery;
+    data(key: "kendoProgressBar"): kendo.ui.ProgressBar;
+
+    kendoQRCode(): JQuery;
+    kendoQRCode(options: kendo.dataviz.ui.QRCodeOptions): JQuery;
+    data(key: "kendoQRCode"): kendo.dataviz.ui.QRCode;
+
+    kendoRadialGauge(): JQuery;
+    kendoRadialGauge(options: kendo.dataviz.ui.RadialGaugeOptions): JQuery;
+    data(key: "kendoRadialGauge"): kendo.dataviz.ui.RadialGauge;
+
+    kendoRangeSlider(): JQuery;
+    kendoRangeSlider(options: kendo.ui.RangeSliderOptions): JQuery;
+    data(key: "kendoRangeSlider"): kendo.ui.RangeSlider;
+
+    kendoResponsivePanel(): JQuery;
+    kendoResponsivePanel(options: kendo.ui.ResponsivePanelOptions): JQuery;
+    data(key: "kendoResponsivePanel"): kendo.ui.ResponsivePanel;
+
+    kendoScheduler(): JQuery;
+    kendoScheduler(options: kendo.ui.SchedulerOptions): JQuery;
+    data(key: "kendoScheduler"): kendo.ui.Scheduler;
+
+    kendoSlider(): JQuery;
+    kendoSlider(options: kendo.ui.SliderOptions): JQuery;
+    data(key: "kendoSlider"): kendo.ui.Slider;
+
+    kendoSortable(): JQuery;
+    kendoSortable(options: kendo.ui.SortableOptions): JQuery;
+    data(key: "kendoSortable"): kendo.ui.Sortable;
+
+    kendoSparkline(): JQuery;
+    kendoSparkline(options: kendo.dataviz.ui.SparklineOptions): JQuery;
+    data(key: "kendoSparkline"): kendo.dataviz.ui.Sparkline;
+
+    kendoSplitter(): JQuery;
+    kendoSplitter(options: kendo.ui.SplitterOptions): JQuery;
+    data(key: "kendoSplitter"): kendo.ui.Splitter;
+
+    kendoSpreadsheet(): JQuery;
+    kendoSpreadsheet(options: kendo.ui.SpreadsheetOptions): JQuery;
+    data(key: "kendoSpreadsheet"): kendo.ui.Spreadsheet;
+
+    kendoStockChart(): JQuery;
+    kendoStockChart(options: kendo.dataviz.ui.StockChartOptions): JQuery;
+    data(key: "kendoStockChart"): kendo.dataviz.ui.StockChart;
+
+    kendoTabStrip(): JQuery;
+    kendoTabStrip(options: kendo.ui.TabStripOptions): JQuery;
+    data(key: "kendoTabStrip"): kendo.ui.TabStrip;
+
+    kendoTimePicker(): JQuery;
+    kendoTimePicker(options: kendo.ui.TimePickerOptions): JQuery;
+    data(key: "kendoTimePicker"): kendo.ui.TimePicker;
+
+    kendoToolBar(): JQuery;
+    kendoToolBar(options: kendo.ui.ToolBarOptions): JQuery;
+    data(key: "kendoToolBar"): kendo.ui.ToolBar;
+
+    kendoTooltip(): JQuery;
+    kendoTooltip(options: kendo.ui.TooltipOptions): JQuery;
+    data(key: "kendoTooltip"): kendo.ui.Tooltip;
+
+    kendoTouch(): JQuery;
+    kendoTouch(options: kendo.ui.TouchOptions): JQuery;
+    data(key: "kendoTouch"): kendo.ui.Touch;
+
+    kendoTreeList(): JQuery;
+    kendoTreeList(options: kendo.ui.TreeListOptions): JQuery;
+    data(key: "kendoTreeList"): kendo.ui.TreeList;
+
+    kendoTreeMap(): JQuery;
+    kendoTreeMap(options: kendo.dataviz.ui.TreeMapOptions): JQuery;
+    data(key: "kendoTreeMap"): kendo.dataviz.ui.TreeMap;
+
+    kendoTreeView(): JQuery;
+    kendoTreeView(options: kendo.ui.TreeViewOptions): JQuery;
+    data(key: "kendoTreeView"): kendo.ui.TreeView;
+
+    kendoUpload(): JQuery;
+    kendoUpload(options: kendo.ui.UploadOptions): JQuery;
+    data(key: "kendoUpload"): kendo.ui.Upload;
+
+    kendoValidator(): JQuery;
+    kendoValidator(options: kendo.ui.ValidatorOptions): JQuery;
+    data(key: "kendoValidator"): kendo.ui.Validator;
+
+    kendoWindow(): JQuery;
+    kendoWindow(options: kendo.ui.WindowOptions): JQuery;
+    data(key: "kendoWindow"): kendo.ui.Window;
+
+}
diff --git a/kendo-ui/kendo-ui-tests.ts b/kendo-ui/kendo-ui-tests.ts
index fba08a02ed..d1cc528edb 100644
--- a/kendo-ui/kendo-ui-tests.ts
+++ b/kendo-ui/kendo-ui-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="kendo-ui.d.ts" />
+/// <reference types="jquery" />
+
 
 var is = {
     string: (msg: string) => {
diff --git a/kendo-ui/kendo-ui.d.ts b/kendo-ui/kendo-ui.d.ts
deleted file mode 100644
index 62b6912b81..0000000000
--- a/kendo-ui/kendo-ui.d.ts
+++ /dev/null
@@ -1,18315 +0,0 @@
-// Type definitions for Kendo UI Professional v2016.1.314
-// Project: http://www.telerik.com/kendo-ui
-// Definitions by: Telerik <https://github.com/telerik/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace kendo {
-    function culture(): {
-        name: string;
-        calendar: {
-            AM: string[];
-            PM: string[];
-            days: {
-                names: string[];
-                namesAbbr: string[];
-                namesShort: string[];
-                firstDay: number;
-            };
-            months: {
-                names: string[];
-                namesAbbr: string[];
-            };
-            patterns: {
-                D: string;
-                F: string;
-                G: string;
-                M: string;
-                T: string;
-                Y: string;
-                d: string;
-                g: string;
-                m: string;
-                s: string;
-                t: string;
-                u: string;
-                y: string;
-            };
-            twoDigitYearMax: number;
-        };
-        calendars: {
-            standard: {
-                AM: string[];
-                PM: string[];
-                days: {
-                    names: string[];
-                    namesAbbr: string[];
-                    namesShort: string[];
-                    firstDay: number;
-                };
-                months: {
-                    names: string[];
-                    namesAbbr: string[];
-                };
-                patterns: {
-                    D: string;
-                    F: string;
-                    G: string;
-                    M: string;
-                    T: string;
-                    Y: string;
-                    d: string;
-                    g: string;
-                    m: string;
-                    s: string;
-                    t: string;
-                    u: string;
-                    y: string;
-                };
-                twoDigitYearMax: number;
-            };
-        };
-        numberFormat: {
-            currency: {
-                decimals: number;
-                groupSize: number[];
-                pattern: string[];
-                symbol: string;
-            };
-            decimals: number;
-            groupSize: number[];
-            pattern: string[];
-            percent: {
-                decimals: number;
-                groupSize: number[];
-                pattern: string[];
-                symbol: string;
-            };
-        };
-    };
-
-    var cultures: {[culture: string] : {
-        name?: string;
-        calendar?: {
-            AM: string[];
-            PM: string[];
-            days: {
-                names: string[];
-                namesAbbr: string[];
-                namesShort: string[];
-                firstDay: number;
-            };
-            months: {
-                names: string[];
-                namesAbbr: string[];
-            };
-            patterns: {
-                D: string;
-                F: string;
-                G: string;
-                M: string;
-                T: string;
-                Y: string;
-                d: string;
-                g: string;
-                m: string;
-                s: string;
-                t: string;
-                u: string;
-                y: string;
-            };
-            twoDigitYearMax: number;
-        };
-        calendars?: {
-            standard: {
-                AM: string[];
-                PM: string[];
-                days: {
-                    names: string[];
-                    namesAbbr: string[];
-                    namesShort: string[];
-                    firstDay: number;
-                };
-                months: {
-                    names: string[];
-                    namesAbbr: string[];
-                };
-                patterns: {
-                    D: string;
-                    F: string;
-                    G: string;
-                    M: string;
-                    T: string;
-                    Y: string;
-                    d: string;
-                    g: string;
-                    m: string;
-                    s: string;
-                    t: string;
-                    u: string;
-                    y: string;
-                };
-                twoDigitYearMax: number;
-            };
-        };
-        numberFormat?: {
-            currency: {
-                decimals: number;
-                groupSize: number[];
-                pattern: string[];
-                symbol: string;
-            };
-            decimals: number;
-            groupSize: number[];
-            pattern: string[];
-            percent: {
-                decimals: number;
-                groupSize: number[];
-                pattern: string[];
-                symbol: string;
-            };
-        };
-    }};
-
-    function format(format: string, ...values: any[]): string;
-
-    function fx(selector: string): effects.Element;
-    function fx(element: Element): effects.Element;
-    function fx(element: JQuery): effects.Element;
-
-    function init(selector: string, ...namespaces: any[]): void;
-    function init(element: JQuery, ...namespaces: any[]): void;
-    function init(element: Element, ...namespaces: any[]): void;
-
-    function observable(data: any): kendo.data.ObservableObject;
-    function observableHierarchy(array: any[]): kendo.data.ObservableArray;
-
-    function render(template: (data: any) => string, data: any[]): string;
-    function template(template: string, options?: TemplateOptions): (data: any) => string;
-
-    function guid(): string;
-
-    function widgetInstance(element: JQuery, suite: typeof kendo.ui): kendo.ui.Widget;
-    function widgetInstance(element: JQuery, suite: typeof kendo.mobile.ui): kendo.ui.Widget;
-    function widgetInstance(element: JQuery, suite: typeof kendo.dataviz.ui): kendo.ui.Widget;
-
-
-    var ns: string;
-
-    var keys: {
-        INSERT: number;
-        DELETE: number;
-        BACKSPACE: number;
-        TAB: number;
-        ENTER: number;
-        ESC: number;
-        LEFT: number;
-        UP: number;
-        RIGHT: number;
-        DOWN: number;
-        END: number;
-        HOME: number;
-        SPACEBAR: number;
-        PAGEUP: number;
-        PAGEDOWN: number;
-        F2: number;
-        F10: number;
-        F12: number;
-    };
-
-    var support: {
-        touch: boolean;
-        pointers: boolean;
-        scrollbar(): number;
-        hasHW3D: boolean;
-        hasNativeScrolling: boolean;
-        devicePixelRatio: number;
-        placeHolder: boolean;
-        zoomLevel: number;
-        mobileOS: {
-            device: string;
-            tablet: any;
-            browser: string;
-            name: string;
-            majorVersion: string;
-            minorVersion: string;
-            flatVersion: number;
-            appMode: boolean;
-        };
-        browser: {
-            msie: boolean;
-            webkit: boolean;
-            safari: boolean;
-            opera: boolean;
-            version: string;
-        };
-    };
-
-    var version: string;
-
-    interface TemplateOptions {
-        paramName?: string;
-        useWithBlock?: boolean;
-    }
-
-    class Class {
-        static fn: Class;
-        static extend(prototype: Object): Class;
-    }
-
-    class Observable extends Class {
-        static fn: Observable;
-        static extend(prototype: Object): Observable;
-
-        bind(eventName: string, handler: Function): Observable;
-        one(eventName: string, handler: Function): Observable;
-        trigger(eventName: string, e?: any): boolean;
-        unbind(eventName: string, handler?: any): Observable;
-    }
-
-    interface ViewOptions {
-        tagName?: string;
-        wrap?: boolean;
-        model?: Object;
-        evalTemplate?: boolean;
-        init?: (e: ViewEvent) => void;
-        show?: (e: ViewEvent) => void;
-        hide?: (e: ViewEvent) => void;
-    }
-
-    interface ViewEvent {
-        sender: View;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    class View extends Observable {
-        constructor(element: Element, options?: ViewOptions);
-        constructor(element: string, options?: ViewOptions);
-        element: JQuery;
-        content: any;
-        tagName: string;
-        model: Object;
-        init(element: Element, options?: ViewOptions): void;
-        init(element: string, options?: ViewOptions): void;
-        render(container?: any): JQuery;
-        destroy(): void;
-    }
-
-    class ViewContainer extends Observable {
-       view: View;
-    }
-
-    class Layout extends View {
-        containers: { [selector: string]: ViewContainer; };
-        showIn(selector: string, view: View, transitionClass?: string): void;
-    }
-
-    class History extends Observable {
-        current: string;
-        root: string;
-        start(options: Object): void;
-        stop(): void;
-        change(callback: Function): void;
-        navigate(location: string, silent?: boolean): void;
-    }
-
-    var history: History;
-
-    interface RouterOptions {
-        init?: (e: RouterEvent) => void;
-        pushState?: boolean;
-        hashBang?: boolean;
-        root?: string;
-        ignoreCase?: boolean;
-        change?(e: RouterChangeEvent): void;
-        routeMissing?(e: RouterRouteMissingEvent): void;
-        same?(e: RouterEvent): void;
-    }
-
-    interface RouterEvent {
-        sender: Router;
-        url: string;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface RouterChangeEvent extends RouterEvent {
-        params: any;
-        backButtonPressed: boolean;
-    }
-
-    interface RouterRouteMissingEvent extends RouterEvent {
-        params: any;
-    }
-
-    class Route extends Class {
-        route: RegExp;
-        callback(url: string): void;
-        worksWith(url: string): void;
-    }
-
-    class Router extends Observable {
-        constructor(options?: RouterOptions);
-        routes: Route[];
-        init(options?: RouterOptions): void;
-        start(): void;
-        destroy(): void;
-        route(route: string, callback: Function): void;
-        navigate(location: string, silent?: boolean): void;
-        replace(location: string, silent?: boolean): void;
-    }
-
-}
-
-declare namespace kendo.effects {
-    function enable(): void;
-    function disable(): void;
-
-    interface Element {
-        expand(direction: string): effects.Expand;
-        expandHorizontal(): effects.Expand;
-        expandVertical(): effects.Expand;
-        fade(direction: string): effects.Fade;
-        fadeIn(): effects.Fade;
-        fadeOut(): effects.Fade;
-        flip(axis: string, face: JQuery, back: JQuery): effects.Flip;
-        flipHorizontal(face: JQuery, back: JQuery): effects.Flip;
-        flipVertical(face: JQuery, back: JQuery): effects.Flip;
-        pageturn(axis: string, face: JQuery, back: JQuery): effects.PageTurn;
-        pageturnHorizontal(face: JQuery, back: JQuery): effects.PageTurn;
-        pageturnVertical(face: JQuery, back: JQuery): effects.PageTurn;
-        slideIn(direction: string): effects.SlideIn;
-        slideInDown(): effects.SlideIn;
-        slideInLeft(): effects.SlideIn;
-        slideInRight(): effects.SlideIn;
-        slideInUp(): effects.SlideIn;
-        tile(direction: string, previous: JQuery): effects.Tile;
-        tileDown(previous: JQuery): effects.Tile;
-        tileLeft(previous: JQuery): effects.Tile;
-        tileRight(previous: JQuery): effects.Tile;
-        tileUp(previous: JQuery): effects.Tile;
-        transfer(target: JQuery): effects.Transfer;
-        zoom(direction: string): effects.Zoom;
-        zoomIn(): effects.Zoom;
-        zoomOut(): effects.Zoom;
-    }
-
-    interface Effect {
-        play(): JQueryPromise<any>;
-        reverse(): JQueryPromise<any>;
-        duration(value: number): Effect;
-        add(effect: Effect): Effect;
-        stop(): Effect;
-    }
-
-    interface Expand extends Effect {
-        duration(value: number): Expand;
-        direction(value: string): Expand;
-        stop(): Expand;
-        add(effect: Effect): Expand;
-    }
-
-    interface Fade extends Effect {
-        duration(value: number): Fade;
-        direction(value: string): Fade;
-        stop(): Fade;
-        add(effect: Effect): Fade;
-        startValue(value: number): Fade;
-        endValue(value: number): Fade;
-    }
-
-    interface Flip extends Effect {
-        duration(value: number): Flip;
-        direction(value: string): Flip;
-        stop(): Flip;
-        add(effect: Effect): Flip;
-    }
-
-    interface PageTurn extends Effect {
-        duration(value: number): PageTurn;
-        direction(value: string): PageTurn;
-        stop(): PageTurn;
-        add(effect: Effect): PageTurn;
-    }
-
-    interface SlideIn extends Effect {
-        duration(value: number): SlideIn;
-        direction(value: string): SlideIn;
-        stop(): SlideIn;
-        add(effect: Effect): SlideIn;
-    }
-
-    interface Tile extends Effect {
-        duration(value: number): Tile;
-        direction(value: string): Tile;
-        stop(): Tile;
-        add(effect: Effect): Tile;
-    }
-
-    interface Transfer extends Effect {
-        duration(value: number): Transfer;
-        stop(): Transfer;
-        add(effect: Effect): Transfer;
-    }
-
-    interface Zoom extends Effect {
-        duration(value: number): Zoom;
-        direction(value: string): Zoom;
-        stop(): Zoom;
-        add(effect: Effect): Zoom;
-        startValue(value: number): Zoom;
-        endValue(value: number): Zoom;
-    }
-}
-
-declare namespace kendo.data {
-    interface ObservableObjectEvent {
-        sender?: ObservableObject;
-        field?: string;
-    }
-
-    interface ObservableObjectSetEvent extends ObservableObjectEvent {
-        value?: any;
-        preventDefault?: Function;
-    }
-
-
-    class Binding extends Observable {
-        source: any;
-        parents: any[];
-        path: string;
-        observable: boolean;
-        dependencies: { [path: string]: boolean; };
-        constructor(parents: any[], path: string);
-        change(e: Object): void;
-        start(source: kendo.Observable): void;
-        stop(source: kendo.Observable): void;
-        get (): any;
-        set (value: any): void;
-        destroy(): void;
-    }
-
-    class BindingTarget {
-        target: any;
-        options: any;
-        source: any;
-    }
-
-    class EventBinding extends Binding {
-        get (): void;
-    }
-
-    class TemplateBinding extends Binding {
-        constructor(source: kendo.Observable, path: string, template: Function);
-        render(value: Object): string;
-    }
-
-    namespace binders { }
-
-    interface Bindings {
-        [key: string]: Binding;
-    }
-
-    class Binder extends Class {
-        static fn: Binder;
-        element: any;
-        bindings: Bindings;
-        options: BinderOptions;
-        constructor(element: any, bindings: Bindings, options?: BinderOptions);
-        static extend(prototype: Object): Binder;
-        init(element: any, bindings: Bindings, options?: BinderOptions): void;
-        bind(binding: Binding, attribute: string): void;
-        destroy(): void;
-        refresh(): void;
-        refresh(attribute: string): void;
-    }
-
-    interface BinderOptions {
-    }
-
-    class ObservableObject extends Observable{
-        constructor(value?: any);
-        uid: string;
-        init(value?: any): void;
-        get(name: string): any;
-        parent(): ObservableObject;
-        set(name: string, value: any): void;
-        toJSON(): Object;
-    }
-
-    class Model extends ObservableObject {
-        static idField: string;
-        static fields: DataSourceSchemaModelFields;
-
-        idField: string;
-        _defaultId: any;
-        fields: DataSourceSchemaModelFields;
-        defaults: {
-            [field: string]: any;
-        };
-        id: any;
-        dirty: boolean;
-
-        static define(options: DataSourceSchemaModelWithFieldsObject): typeof Model;
-        static define(options: DataSourceSchemaModelWithFieldsArray): typeof Model;
-
-        constructor(data?: any);
-        init(data?: any): void;
-        accept(data?: any): void;
-        editable(field: string): boolean;
-        isNew(): boolean;
-    }
-
-    interface SchedulerEventData {
-        description?: string;
-        end?: Date;
-        endTimezone?: string;
-        isAllDay?: boolean;
-        id?: any;
-        start?: Date;
-        startTimezone?: string;
-        recurrenceId?: any;
-        recurrenceRule?: string;
-        recurrenceException?: string;
-        title?: string;
-    }
-
-    class SchedulerEvent extends Model {
-        static idField: string;
-        static fields: DataSourceSchemaModelFields;
-
-        constructor(data?: SchedulerEventData);
-
-        description: string;
-        end: Date;
-        endTimezone: string;
-        isAllDay: boolean;
-        id: any;
-        start: Date;
-        startTimezone: string;
-        recurrenceId: any;
-        recurrenceRule: string;
-        recurrenceException: string;
-        title: string;
-
-        static define(options: DataSourceSchemaModelWithFieldsObject): typeof SchedulerEvent;
-        static define(options: DataSourceSchemaModelWithFieldsArray): typeof SchedulerEvent;
-
-        init(data?: SchedulerEventData): void;
-        clone(options: any, updateUid: boolean): SchedulerEvent;
-        duration(): number;
-        expand(start: Date, end: Date, zone: any): SchedulerEvent[];
-        update(eventInfo: SchedulerEventData): void;
-        isMultiDay(): boolean;
-        isException(): boolean;
-        isOccurrence(): boolean;
-        isRecurring(): boolean;
-        isRecurrenceHead(): boolean;
-        toOccurrence(options: any): SchedulerEvent;
-    }
-
-    class TreeListModel extends Model {
-        static idField: string;
-        static fields: DataSourceSchemaModelFields;
-
-        id: any;
-        parentId: any;
-
-        static define(options: DataSourceSchemaModelWithFieldsObject): typeof TreeListModel;
-        static define(options: DataSourceSchemaModelWithFieldsArray): typeof TreeListModel;
-
-        constructor(data?: any);
-        init(data?: any): void;
-        loaded(value: boolean): void;
-        loaded(): boolean;
-    }
-
-    class TreeListDataSource extends DataSource {
-        load(model: kendo.data.TreeListModel): JQueryPromise<any>;
-        childNodes(model: kendo.data.TreeListModel): kendo.data.TreeListModel[];
-        rootNodes(): kendo.data.TreeListModel[];
-        parentNode(model: kendo.data.TreeListModel): kendo.data.TreeListModel;
-        level(model: kendo.data.TreeListModel): number;
-        level(model: any): number;
-
-        add(model: Object): kendo.data.TreeListModel;
-        add(model: kendo.data.TreeListModel): kendo.data.TreeListModel;
-        at(index: number): kendo.data.TreeListModel;
-        cancelChanges(model?: kendo.data.TreeListModel): void;
-        get(id: any): kendo.data.TreeListModel;
-        getByUid(uid: string): kendo.data.TreeListModel;
-        indexOf(value: kendo.data.TreeListModel): number;
-        insert(index: number, model: kendo.data.TreeListModel): kendo.data.TreeListModel;
-        insert(index: number, model: Object): kendo.data.TreeListModel;
-        remove(model: kendo.data.TreeListModel): void;
-    }
-
-    class GanttTask extends Model {
-        static idField: string;
-        static fields: DataSourceSchemaModelFields;
-
-        id: any;
-        parentId: number;
-        orderId: number;
-        title: string;
-        start: Date;
-        end: Date;
-        percentComplete: number;
-        summary: boolean;
-        expanded: boolean;
-
-        static define(options: DataSourceSchemaModelWithFieldsObject): typeof GanttTask;
-        static define(options: DataSourceSchemaModelWithFieldsArray): typeof GanttTask;
-
-        constructor(data?: any);
-        init(data?: any): void;
-    }
-
-    class GanttDependency extends Model {
-        static idField: string;
-        static fields: DataSourceSchemaModelFields;
-
-        id: any;
-        predecessorId: number;
-        successorId: number;
-        type: number;
-
-        static define(options: DataSourceSchemaModelWithFieldsObject): typeof GanttDependency;
-        static define(options: DataSourceSchemaModelWithFieldsArray): typeof GanttDependency;
-
-        constructor(data?: any);
-        init(data?: any): void;
-    }
-
-    class Node extends Model {
-        children: HierarchicalDataSource;
-
-        append(model: any): void;
-        level(): number;
-        load(id: any): void;
-        loaded(value: boolean): void;
-        loaded(): boolean;
-        parentNode(): Node;
-    }
-
-    class SchedulerDataSource extends DataSource {
-        add(model: Object): kendo.data.SchedulerEvent;
-        add(model: kendo.data.SchedulerEvent): kendo.data.SchedulerEvent;
-        at(index: number): kendo.data.SchedulerEvent;
-        cancelChanges(model?: kendo.data.SchedulerEvent): void;
-        get(id: any): kendo.data.SchedulerEvent;
-        getByUid(uid: string): kendo.data.SchedulerEvent;
-        indexOf(value: kendo.data.SchedulerEvent): number;
-        insert(index: number, model: kendo.data.SchedulerEvent): kendo.data.SchedulerEvent;
-        insert(index: number, model: Object): kendo.data.SchedulerEvent;
-        remove(model: kendo.data.SchedulerEvent): void;
-    }
-
-    class GanttDataSource extends DataSource {
-        add(model: Object): kendo.data.GanttTask;
-        add(model: kendo.data.GanttTask): kendo.data.GanttTask;
-        at(index: number): kendo.data.GanttTask;
-        cancelChanges(model?: kendo.data.GanttTask): void;
-        get(id: any): kendo.data.GanttTask;
-        getByUid(uid: string): kendo.data.GanttTask;
-        indexOf(value: kendo.data.GanttTask): number;
-        insert(index: number, model: Object): kendo.data.GanttTask;
-        insert(index: number, model: kendo.data.GanttTask): kendo.data.GanttTask;
-        remove(model: kendo.data.GanttTask): void;
-    }
-
-    class GanttDependencyDataSource extends DataSource {
-        add(model: Object): kendo.data.GanttDependency;
-        add(model: kendo.data.GanttDependency): kendo.data.GanttDependency;
-        at(index: number): kendo.data.GanttDependency;
-        cancelChanges(model?: kendo.data.GanttDependency): void;
-        get(id: any): kendo.data.GanttDependency;
-        getByUid(uid: string): kendo.data.GanttDependency;
-        indexOf(value: kendo.data.GanttDependency): number;
-        insert(index: number, model: Object): kendo.data.GanttDependency;
-        insert(index: number, model: kendo.data.GanttDependency): kendo.data.GanttDependency;
-        remove(model: kendo.data.GanttDependency): void;
-    }
-
-    class HierarchicalDataSource extends DataSource {
-        constructor(options?: HierarchicalDataSourceOptions);
-        init(options?: HierarchicalDataSourceOptions): void;
-    }
-
-    interface HierarchicalDataSourceOptions extends DataSourceOptions {
-        schema?: HierarchicalDataSourceSchema;
-    }
-
-
-    interface HierarchicalDataSourceSchema extends DataSourceSchemaWithOptionsModel {
-        model?: HierarchicalDataSourceSchemaModel;
-    }
-
-    interface HierarchicalDataSourceSchemaModel extends DataSourceSchemaModel {
-        hasChildren?: any;
-        children?: any;
-    }
-
-    interface PivotDiscoverRequestRestrictionOptions {
-        catalogName: string;
-        cubeName: string;
-    }
-
-    interface PivotDiscoverRequestDataOptions {
-        command: string;
-        restrictions: PivotDiscoverRequestRestrictionOptions;
-    }
-
-    interface PivotDiscoverRequestOptions {
-        data: PivotDiscoverRequestDataOptions;
-    }
-
-    interface PivotTransportConnection {
-        catalog?: string;
-        cube?: string;
-    }
-
-    interface PivotTransportDiscover {
-        cache?: boolean;
-        contentType?: string;
-        data?: any;
-        dataType?: string;
-        type?: string;
-        url?: any;
-    }
-
-    interface PivotTransport {
-        discover?: any;
-        read?: any;
-    }
-
-    interface PivotTransportWithObjectOperations extends PivotTransport {
-        connection: PivotTransportConnection;
-        discover?: PivotTransportDiscover;
-        read?: DataSourceTransportRead;
-    }
-
-    interface PivotTransportWithFunctionOperations extends PivotTransport {
-        discover?: (options: DataSourceTransportOptions) => void;
-        read?: (options: DataSourceTransportOptions) => void;
-    }
-
-    interface PivotDataSourceAxisOptions {
-        name: string;
-        expand?: boolean;
-    }
-
-    interface PivotDataSourceMeasureOptions {
-        values: string[];
-        axis?: string;
-    }
-
-    interface PivotDataSourceOptions extends DataSourceOptions {
-        columns?: PivotDataSourceAxisOptions[];
-        measures?: PivotDataSourceMeasureOptions[];
-        rows?: PivotDataSourceAxisOptions[];
-        transport?: PivotTransport;
-        schema?: PivotSchema;
-    }
-
-    interface PivotTupleModel {
-        children: PivotTupleModel[];
-        caption?: string;
-        name: string;
-        levelName?: string;
-        levelNum: number;
-        hasChildren?: boolean;
-        hierarchy?: string;
-    }
-
-    interface PivotSchemaRowAxis {
-        tuples: PivotTupleModel[];
-    }
-
-    interface PivotSchemaColumnAxis {
-        tuples: PivotTupleModel[];
-    }
-
-    interface PivotSchemaAxes {
-        rows: PivotSchemaRowAxis;
-        columns: PivotSchemaColumnAxis;
-    }
-
-    interface PivotSchema extends DataSourceSchema{
-        axes?: any;
-        catalogs?: any;
-        cubes?: any;
-        data?: any;
-        dimensions?: any;
-        hierarchies?: any;
-        levels?: any;
-        measures?: any;
-    }
-
-    class PivotDataSource extends DataSource {
-        axes(): PivotSchemaAxes;
-        constructor(options?: PivotDataSourceOptions);
-        init(options?: PivotDataSourceOptions): void;
-        catalog(val: string): void;
-        columns(val: string[]): string[];
-        cube(val: string): void;
-        discover(options: PivotDiscoverRequestOptions): JQueryPromise<any>;
-        measures(val: string[]): string[];
-        measuresAxis(): string;
-        rows(val: string[]): string[];
-        schemaCatalogs(): JQueryPromise<any>;
-        schemaCubes(): JQueryPromise<any>;
-        schemaDimensions(): JQueryPromise<any>;
-        schemaHierarchies(): JQueryPromise<any>;
-        schemaLevels(): JQueryPromise<any>;
-        schemaMeasures(): JQueryPromise<any>;
-    }
-
-    interface DataSourceTransport {
-        create?: DataSourceTransportCreate;
-        destroy?: DataSourceTransportDestroy;
-        push?: Function;
-        read?: DataSourceTransportRead;
-        signalr?: DataSourceTransportSignalr;
-        update?: DataSourceTransportUpdate;
-
-        parameterMap?(data: DataSourceTransportParameterMapData, type: string): any;
-    }
-
-    interface DataSourceTransportSignalrClient {
-        create?: string;
-        destroy?: string;
-        read?: string;
-        update?: string;
-    }
-
-    interface DataSourceTransportSignalrServer {
-        create?: string;
-        destroy?: string;
-        read?: string;
-        update?: string;
-    }
-
-    interface DataSourceTransportSignalr {
-        client?: DataSourceTransportSignalrClient;
-        hub?: any;
-        promise?: any;
-        server?: DataSourceTransportSignalrServer;
-    }
-
-
-    interface DataSourceParameterMapDataAggregate {
-        field?: string;
-        aggregate?: string;
-    }
-
-    interface DataSourceParameterMapDataGroup {
-        aggregate?: DataSourceParameterMapDataAggregate[];
-        field?: string;
-        dir?: string;
-    }
-
-    interface DataSourceParameterMapDataFilter {
-        field?: string;
-        filters?: DataSourceParameterMapDataFilter[];
-        logic?: string;
-        operator?: string;
-        value?: any;
-    }
-
-    interface DataSourceParameterMapDataSort {
-        field?: string;
-        dir?: string;
-    }
-
-    interface DataSourceTransportParameterMapData {
-        aggregate?: DataSourceParameterMapDataAggregate[];
-        group?: DataSourceParameterMapDataGroup[];
-        filter?: DataSourceParameterMapDataFilter;
-        models?: Model[];
-        page?: number;
-        pageSize?: number;
-        skip?: number;
-        sort?: DataSourceParameterMapDataSort[];
-        take?: number;
-    }
-
-    interface DataSourceSchema {
-        model?: any;
-    }
-
-    interface DataSourceSchemaWithOptionsModel extends DataSourceSchema {
-        model?: DataSourceSchemaModel;
-    }
-
-    interface DataSourceSchemaWithConstructorModel extends DataSourceSchema {
-        model?:  typeof Model;
-    }
-
-    interface DataSourceSchemaModel {
-        id?: string;
-        fields?: any;
-        [index: string]: any;
-    }
-
-    interface DataSourceSchemaModelWithFieldsArray extends DataSourceSchemaModel {
-        fields?: DataSourceSchemaModelField[];
-    }
-
-    interface DataSourceSchemaModelWithFieldsObject extends DataSourceSchemaModel {
-        fields?: DataSourceSchemaModelFields;
-    }
-
-    interface DataSourceSchemaModelFields {
-        [index: string]: DataSourceSchemaModelField;
-    }
-
-    interface DataSourceSchemaModelField {
-        field?: string;
-        from?: string;
-        defaultValue?: any;
-        editable?: boolean;
-        nullable?: boolean;
-        parse?: Function;
-        type?: string;
-        validation?: DataSourceSchemaModelFieldValidation;
-    }
-
-    interface DataSourceSchemaModelFieldValidation {
-        required?: boolean;
-        min?: any;
-        max?: any;
-    }
-
-    class ObservableArray extends Observable {
-        length: number;
-        [index: number]: any;
-
-        constructor(array: any[]);
-        init(array: any[]): void;
-        empty(): void;
-        every(callback: (item: Object, index: number, source: ObservableArray) => boolean): boolean;
-        filter(callback: (item: Object, index: number, source: ObservableArray) => boolean): any[];
-        find(callback: (item: Object, index: number, source: ObservableArray) => boolean): any;
-        forEach(callback: (item: Object, index: number, source: ObservableArray) => void ): void;
-        indexOf(item: any): number;
-        join(separator: string): string;
-        map(callback: (item: Object, index: number, source: ObservableArray) => any): any[];
-        parent(): ObservableObject;
-        pop(): ObservableObject;
-        push(...items: any[]): number;
-        remove(item: Object): void;
-        shift(): any;
-        slice(begin: number, end?: number): any[];
-        some(callback: (item: Object, index: number, source: ObservableArray) => boolean): boolean;
-        splice(start: number): any[];
-        splice(start: number, deleteCount: number, ...items: any[]): any[];
-        toJSON(): any[];
-        unshift(...items: any[]): number;
-        wrap(object: Object, parent: Object): any;
-        wrapAll(source: Object, target: Object): any;
-    }
-
-    interface ObservableArrayEvent {
-        field?: string;
-        action?: string;
-        index?: number;
-        items?: kendo.data.Model[];
-    }
-
-    class DataSource extends Observable{
-        options: DataSourceOptions;
-
-        static create(options?: DataSourceOptions): DataSource;
-
-        constructor(options?: DataSourceOptions);
-        init(options?: DataSourceOptions): void;
-        add(model: Object): kendo.data.Model;
-        add(model: kendo.data.Model): kendo.data.Model;
-        aggregate(val: any): void;
-        aggregate(): any;
-        aggregates(): any;
-        at(index: number): kendo.data.ObservableObject;
-        cancelChanges(model?: kendo.data.Model): void;
-        data(): kendo.data.ObservableArray;
-        data(value: any): void;
-        fetch(callback?: Function): JQueryPromise<any>;
-        filter(filters: DataSourceFilterItem): void;
-        filter(filters: DataSourceFilterItem[]): void;
-        filter(filters: DataSourceFilters): void;
-        filter(): DataSourceFilters;
-        get(id: any): kendo.data.Model;
-        getByUid(uid: string): kendo.data.Model;
-        group(groups: any): void;
-        group(): any;
-        hasChanges(): boolean;
-        indexOf(value: kendo.data.ObservableObject): number;
-        insert(index: number, model: kendo.data.Model): kendo.data.Model;
-        insert(index: number, model: Object): kendo.data.Model;
-        online(value: boolean): void;
-        online(): boolean;
-        offlineData(data: any[]): void;
-        offlineData(): any[];
-        page(): number;
-        page(page: number): void;
-        pageSize(): number;
-        pageSize(size: number): void;
-        pushCreate(model: Object): void;
-        pushCreate(models: any[]): void;
-        pushDestroy(model: Object): void;
-        pushDestroy(models: any[]): void;
-        pushUpdate(model: Object): void;
-        pushUpdate(models: any[]): void;
-        query(options?: any): JQueryPromise<any>;
-        read(data?: any): JQueryPromise<any>;
-        remove(model: kendo.data.ObservableObject): void;
-        sort(sort: DataSourceSortItem): void;
-        sort(sort: DataSourceSortItem[]): void;
-        sort(): DataSourceSortItem[];
-        sync(): JQueryPromise<any>;
-        total(): number;
-        totalPages(): number;
-        view(): kendo.data.ObservableArray;
-    }
-
-    interface DataSourceAggregateItem {
-        field?: string;
-        aggregate?: string;
-    }
-
-    interface DataSourceFilter {
-    }
-
-    interface DataSourceFilterItem extends DataSourceFilter {
-        operator?: string;
-        field?: string;
-        value?: any;
-    }
-
-    interface DataSourceFilters extends DataSourceFilter {
-        logic?: string;
-        filters?: DataSourceFilter[];
-    }
-
-    interface DataSourceGroupItemAggregate {
-        field?: string;
-        aggregate?: string;
-    }
-
-    interface DataSourceGroupItem {
-        field?: string;
-        dir?: string;
-        aggregates?: DataSourceGroupItemAggregate[];
-    }
-
-    interface DataSourceSchema {
-        aggregates?: any;
-        data?: any;
-        errors?: any;
-        groups?: any;
-        parse?: Function;
-        total?: any;
-        type?: string;
-    }
-
-    interface DataSourceSortItem {
-        field?: string;
-        dir?: string;
-    }
-
-    interface DataSourceTransportCreate extends JQueryAjaxSettings {
-        cache?: boolean;
-        contentType?: string;
-        data?: any;
-        dataType?: string;
-        type?: string;
-        url?: any;
-    }
-
-    interface DataSourceTransportDestroy extends JQueryAjaxSettings {
-        cache?: boolean;
-        contentType?: string;
-        data?: any;
-        dataType?: string;
-        type?: string;
-        url?: any;
-    }
-
-    interface DataSourceTransportRead extends JQueryAjaxSettings {
-        cache?: boolean;
-        contentType?: string;
-        data?: any;
-        dataType?: string;
-        type?: string;
-        url?: any;
-    }
-
-    interface DataSourceTransportUpdate extends JQueryAjaxSettings {
-        cache?: boolean;
-        contentType?: string;
-        data?: any;
-        dataType?: string;
-        type?: string;
-        url?: any;
-    }
-
-    interface DataSourceTransportWithObjectOperations extends DataSourceTransport {
-        create?: DataSourceTransportCreate;
-        destroy?: DataSourceTransportDestroy;
-        read?: DataSourceTransportRead;
-        update?: DataSourceTransportUpdate;
-    }
-
-    interface DataSourceTransportWithFunctionOperations extends DataSourceTransport {
-        create?: (options: DataSourceTransportOptions) => void;
-        destroy?: (options: DataSourceTransportOptions) => void;
-        read?: (options: DataSourceTransportReadOptions) => void;
-        update?: (options: DataSourceTransportOptions) => void;
-    }
-
-    interface DataSourceTransportOptions {
-        success: (data?: any) => void;
-        error: (error?: any) => void;
-        data: any;
-    }
-
-    interface DataSourceTransportReadOptionsData {
-        sort?: DataSourceSortItem[];
-        filter?: DataSourceFilters;
-        group?: DataSourceGroupItem[];
-        take?: number;
-        skip?: number;
-    }
-
-    interface DataSourceTransportReadOptions extends DataSourceTransportOptions {
-        data: DataSourceTransportReadOptionsData;
-    }
-
-    interface DataSourceTransportBatchOptionsData {
-        models: any[];
-    }
-
-    interface DataSourceTransportBatchOptions extends DataSourceTransportOptions {
-        data: DataSourceTransportBatchOptionsData;
-    }
-
-    interface DataSourceOptions {
-        aggregate?: DataSourceAggregateItem[];
-        autoSync?: boolean;
-        batch?: boolean;
-        data?: any;
-        filter?: any;
-        group?: DataSourceGroupItem[];
-        offlineStorage?: any;
-        page?: number;
-        pageSize?: number;
-        schema?: DataSourceSchema;
-        serverAggregates?: boolean;
-        serverFiltering?: boolean;
-        serverGrouping?: boolean;
-        serverPaging?: boolean;
-        serverSorting?: boolean;
-        sort?: any;
-        transport?: DataSourceTransport;
-        type?: string;
-        change? (e: DataSourceChangeEvent): void;
-        error?(e: DataSourceErrorEvent): void;
-        sync?(e: DataSourceEvent): void;
-        requestStart?(e: DataSourceRequestStartEvent): void;
-        requestEnd?(e: DataSourceRequestEndEvent): void;
-    }
-
-    interface DataSourceEvent {
-        sender?: DataSource;
-    }
-
-    interface DataSourceItemOrGroup {
-    }
-
-    interface DataSourceGroup extends DataSourceItemOrGroup {
-        aggregates: any[];
-        field: string;
-        hasSubgroups: boolean;
-        items: DataSourceItemOrGroup[];
-        value: any;
-    }
-
-    interface DataSourceChangeEvent extends DataSourceEvent {
-        field?: string;
-        value?: Model;
-        action?: string;
-        index?: number;
-        items?: DataSourceItemOrGroup[];
-        node?: any;
-    }
-
-    interface DataSourceErrorEvent extends DataSourceEvent {
-        xhr: JQueryXHR;
-        status: string;
-        errorThrown: any;
-        errors?: any;
-    }
-
-    interface DataSourceRequestStartEvent extends DataSourceEvent {
-        type?: string;
-    }
-
-    interface DataSourceRequestEndEvent extends DataSourceEvent {
-        response?: any;
-        type?: string;
-    }
-}
-
-declare namespace kendo.data.transports {
-    var odata: DataSourceTransport;
-}
-
-declare namespace kendo.ui {
-    function progress(container: JQuery, toggle: boolean): void;
-
-    class Widget extends Observable {
-        static fn: Widget;
-
-        element: JQuery;
-        options: Object;
-        events: string[];
-
-        static extend(prototype: Object): Widget;
-
-        constructor(element: Element, options?: Object);
-        constructor(element: JQuery, options?: Object);
-        constructor(selector: String, options?: Object);
-        init(element: Element, options?: Object): void;
-        init(element: JQuery, options?: Object): void;
-        init(selector: String, options?: Object): void;
-        destroy(): void;
-        setOptions(options: Object): void;
-        resize(force?: boolean): void;
-    }
-
-    function plugin(widget: typeof kendo.ui.Widget, register?: typeof kendo.ui, prefix?: String): void;
-    function plugin(widget: any, register?: typeof kendo.ui, prefix?: String): void;
-    function plugin(widget: typeof kendo.ui.Widget, register?: typeof kendo.mobile.ui, prefix?: String): void;
-    function plugin(widget: any, register?: typeof kendo.mobile.ui, prefix?: String): void;
-    function plugin(widget: typeof kendo.ui.Widget, register?: typeof kendo.dataviz.ui, prefix?: String): void;
-    function plugin(widget: any, register?: typeof kendo.dataviz.ui, prefix?: String): void;
-
-    class Draggable extends kendo.ui.Widget{
-        element: JQuery;
-        currentTarget: JQuery;
-        constructor(element: Element, options?: DraggableOptions);
-        options: DraggableOptions;
-    }
-
-    interface DraggableEvent {
-        sender?: Draggable;
-    }
-
-    class DropTarget extends kendo.ui.Widget{
-        element: JQuery;
-        constructor(element: Element, options?: DropTargetOptions);
-        options: DropTargetOptions;
-        static destroyGroup(groupName: string): void;
-    }
-
-    interface DropTargetOptions {
-        group?: string;
-        dragenter?(e: DropTargetDragenterEvent): void;
-        dragleave?(e: DropTargetDragleaveEvent): void;
-        drop?(e: DropTargetDropEvent): void;
-    }
-
-    interface DropTargetEvent {
-        sender?: DropTarget;
-    }
-
-    interface DropTargetDragenterEvent extends DropTargetEvent {
-        draggable?: kendo.ui.Draggable;
-    }
-
-    interface DropTargetDragleaveEvent extends DropTargetEvent {
-        draggable?: kendo.ui.Draggable;
-    }
-
-    interface DropTargetDropEvent extends DropTargetEvent {
-        draggable?: kendo.ui.Draggable;
-    }
-
-    class DropTargetArea extends kendo.ui.Widget{
-        element: JQuery;
-        constructor(element: Element, options?: DropTargetAreaOptions);
-        options: DropTargetAreaOptions;
-    }
-
-    interface DropTargetAreaOptions {
-        group?: string;
-        filter?: string;
-        dragenter?(e: DropTargetAreaDragenterEvent): void;
-        dragleave?(e: DropTargetAreaDragleaveEvent): void;
-        drop?(e: DropTargetAreaDropEvent): void;
-    }
-
-    interface DropTargetAreaEvent {
-        sender: DropTargetArea;
-    }
-
-    interface DropTargetAreaDragenterEvent extends DropTargetAreaEvent {
-        draggable?: JQuery;
-        dropTarget?: JQuery;
-    }
-
-    interface DropTargetAreaDragleaveEvent extends DropTargetAreaEvent {
-        draggable?: JQuery;
-        dropTarget?: JQuery;
-    }
-
-    interface DropTargetAreaDropEvent extends DropTargetAreaEvent {
-        draggable?: kendo.ui.Draggable;
-        dropTarget?: JQuery;
-    }
-
-    interface DraggableOptions {
-        axis?: string;
-        container?: JQuery;
-        cursorOffset?: any;
-        distance?: number;
-        filter?: string;
-        group?: string;
-        hint?: Function;
-        ignore?: string;
-        drag?(e: DraggableEvent): void;
-        dragcancel?(e: DraggableEvent): void;
-        dragend?(e: DraggableEvent): void;
-        dragstart?(e: DraggableEvent): void;
-    }
-
-    interface GridColumnEditorOptions {
-        field?: string;
-        format?: string;
-        model?: kendo.data.Model;
-        values?: any[];
-    }
-
-    interface GridColumn {
-        editor?(container: JQuery, options: GridColumnEditorOptions): void;
-    }
-
-    interface TreeListEditorOptions {
-        field?: string;
-        format?: string;
-        model?: kendo.data.Model;
-        values?: any[];
-    }
-
-    interface TreeListColumn {
-        editor?(container: JQuery, options: TreeListEditorOptions): void;
-    }
-}
-
-declare namespace kendo.mobile {
-    function init(selector: string): void;
-    function init(element: JQuery): void;
-    function init(element: Element): void;
-
-    class Application extends Observable {
-        options: ApplicationOptions;
-        router: kendo.Router;
-        pane: kendo.mobile.ui.Pane;
-
-        constructor(element?: any, options?: ApplicationOptions);
-        init(element?: any, options?: ApplicationOptions): void;
-        hideLoading(): void;
-        navigate(url: string, transition?: string): void;
-        replace(url: string, transition?: string): void;
-        scroller(): kendo.mobile.ui.Scroller;
-        showLoading(): void;
-        view(): kendo.mobile.ui.View;
-    }
-
-    interface ApplicationOptions {
-        hideAddressBar?: boolean;
-        updateDocumentTitle?: boolean;
-        initial?: string;
-        layout?: string;
-        loading?: string;
-        platform?: string;
-        serverNavigation?: boolean;
-        transition?: string;
-    }
-
-    interface ApplicationEvent {
-        sender: Application;
-    }
-}
-
-declare namespace kendo.mobile.ui {
-
-    class Widget extends kendo.ui.Widget {
-    }
-
-    interface TouchAxis {
-        location?: number;
-        startLocation?: number;
-        client?: number;
-        delta?: number;
-        velocity?: number;
-    }
-
-    interface TouchEventOptions {
-        target?: JQuery;
-        x?: TouchAxis;
-        y?: TouchAxis;
-    }
-
-    interface Point {
-        x?: number;
-        y?: number;
-    }
-}
-declare namespace kendo.dataviz.ui {
-    function registerTheme(name: string, options: any): void;
-
-    function plugin(widget: typeof kendo.ui.Widget): void;
-    function plugin(widget: any): void;
-}
-
-declare namespace kendo.dataviz.map.layer {
-    class Shape {
-    }
-}
-
-declare namespace kendo.drawing.pdf {
-    function saveAs(group: kendo.drawing.Group, fileName: string,
-                    proxyUrl?: string, callback?: Function): void;
-}
-
-declare namespace kendo.geometry {
-    class Arc extends Observable {
-
-
-        options: ArcOptions;
-
-        anticlockwise: boolean;
-        center: kendo.geometry.Point;
-        endAngle: number;
-        radiusX: number;
-        radiusY: number;
-        startAngle: number;
-
-
-
-        bbox(matrix: kendo.geometry.Matrix): kendo.geometry.Rect;
-        getAnticlockwise(): boolean;
-        getCenter(): kendo.geometry.Point;
-        getEndAngle(): number;
-        getRadiusX(): number;
-        getRadiusY(): number;
-        getStartAngle(): number;
-        pointAt(angle: number): kendo.geometry.Point;
-        setAnticlockwise(value: boolean): kendo.geometry.Arc;
-        setCenter(value: kendo.geometry.Point): kendo.geometry.Arc;
-        setEndAngle(value: number): kendo.geometry.Arc;
-        setRadiusX(value: number): kendo.geometry.Arc;
-        setRadiusY(value: number): kendo.geometry.Arc;
-        setStartAngle(value: number): kendo.geometry.Arc;
-
-    }
-
-    interface ArcOptions {
-        name?: string;
-    }
-    interface ArcEvent {
-        sender: Arc;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Circle extends Observable {
-
-
-        options: CircleOptions;
-
-        center: kendo.geometry.Point;
-        radius: number;
-
-
-
-        bbox(matrix: kendo.geometry.Matrix): kendo.geometry.Rect;
-        clone(): kendo.geometry.Circle;
-        equals(other: kendo.geometry.Circle): boolean;
-        getCenter(): kendo.geometry.Point;
-        getRadius(): number;
-        pointAt(angle: number): kendo.geometry.Point;
-        setCenter(value: kendo.geometry.Point): kendo.geometry.Point;
-        setCenter(value: any): kendo.geometry.Point;
-        setRadius(value: number): kendo.geometry.Circle;
-
-    }
-
-    interface CircleOptions {
-        name?: string;
-    }
-    interface CircleEvent {
-        sender: Circle;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Matrix extends Observable {
-
-
-        options: MatrixOptions;
-
-        a: number;
-        b: number;
-        c: number;
-        d: number;
-        e: number;
-        f: number;
-
-
-        static rotate(angle: number, x: number, y: number): kendo.geometry.Matrix;
-        static scale(scaleX: number, scaleY: number): kendo.geometry.Matrix;
-        static translate(x: number, y: number): kendo.geometry.Matrix;
-        static unit(): kendo.geometry.Matrix;
-
-        clone(): kendo.geometry.Matrix;
-        equals(other: kendo.geometry.Matrix): boolean;
-        round(digits: number): kendo.geometry.Matrix;
-        multiplyCopy(matrix: kendo.geometry.Matrix): kendo.geometry.Matrix;
-        toArray(digits: number): any;
-        toString(digits: number, separator: string): string;
-
-    }
-
-    interface MatrixOptions {
-        name?: string;
-    }
-    interface MatrixEvent {
-        sender: Matrix;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Point extends Observable {
-
-
-        options: PointOptions;
-
-        x: number;
-        y: number;
-
-        constructor(x: number, y: number);
-
-        static create(x: number, y: number): kendo.geometry.Point;
-        static create(x: any, y: number): kendo.geometry.Point;
-        static create(x: kendo.geometry.Point, y: number): kendo.geometry.Point;
-        static min(): kendo.geometry.Point;
-        static max(): kendo.geometry.Point;
-        static minPoint(): kendo.geometry.Point;
-        static maxPoint(): kendo.geometry.Point;
-
-        clone(): kendo.geometry.Point;
-        distanceTo(point: kendo.geometry.Point): number;
-        equals(other: kendo.geometry.Point): boolean;
-        getX(): number;
-        getY(): number;
-        move(x: number, y: number): kendo.geometry.Point;
-        rotate(angle: number, center: kendo.geometry.Point): kendo.geometry.Point;
-        rotate(angle: number, center: any): kendo.geometry.Point;
-        round(digits: number): kendo.geometry.Point;
-        scale(scaleX: number, scaleY: number): kendo.geometry.Point;
-        scaleCopy(scaleX: number, scaleY: number): kendo.geometry.Point;
-        setX(value: number): kendo.geometry.Point;
-        setY(value: number): kendo.geometry.Point;
-        toArray(digits: number): any;
-        toString(digits: number, separator: string): string;
-        transform(tansformation: kendo.geometry.Transformation): kendo.geometry.Point;
-        transformCopy(tansformation: kendo.geometry.Transformation): kendo.geometry.Point;
-        translate(dx: number, dy: number): kendo.geometry.Point;
-        translateWith(vector: kendo.geometry.Point): kendo.geometry.Point;
-        translateWith(vector: any): kendo.geometry.Point;
-
-    }
-
-    interface PointOptions {
-        name?: string;
-    }
-    interface PointEvent {
-        sender: Point;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Rect extends Observable {
-
-
-        options: RectOptions;
-
-        origin: kendo.geometry.Point;
-        size: kendo.geometry.Size;
-
-        constructor(origin: kendo.geometry.Point, size: kendo.geometry.Size);
-
-        static fromPoints(pointA: kendo.geometry.Point, pointB: kendo.geometry.Point): kendo.geometry.Rect;
-        static union(rectA: kendo.geometry.Rect, rectB: kendo.geometry.Rect): kendo.geometry.Rect;
-
-        bbox(matrix: kendo.geometry.Matrix): kendo.geometry.Rect;
-        bottomLeft(): kendo.geometry.Point;
-        bottomRight(): kendo.geometry.Point;
-        center(): kendo.geometry.Point;
-        clone(): kendo.geometry.Rect;
-        equals(other: kendo.geometry.Rect): boolean;
-        getOrigin(): kendo.geometry.Point;
-        getSize(): kendo.geometry.Size;
-        height(): number;
-        setOrigin(value: kendo.geometry.Point): kendo.geometry.Rect;
-        setOrigin(value: any): kendo.geometry.Rect;
-        setSize(value: kendo.geometry.Size): kendo.geometry.Rect;
-        setSize(value: any): kendo.geometry.Rect;
-        topLeft(): kendo.geometry.Point;
-        topRight(): kendo.geometry.Point;
-        width(): number;
-
-    }
-
-    interface RectOptions {
-        name?: string;
-    }
-    interface RectEvent {
-        sender: Rect;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Size extends Observable {
-
-
-        options: SizeOptions;
-
-        width: number;
-        height: number;
-
-
-        static create(width: number, height: number): kendo.geometry.Size;
-        static create(width: any, height: number): kendo.geometry.Size;
-        static create(width: kendo.geometry.Size, height: number): kendo.geometry.Size;
-
-        clone(): kendo.geometry.Size;
-        equals(other: kendo.geometry.Size): boolean;
-        getWidth(): number;
-        getHeight(): number;
-        setWidth(value: number): kendo.geometry.Size;
-        setHeight(value: number): kendo.geometry.Size;
-
-    }
-
-    interface SizeOptions {
-        name?: string;
-    }
-    interface SizeEvent {
-        sender: Size;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Transformation extends Observable {
-
-
-        options: TransformationOptions;
-
-
-
-
-        clone(): kendo.geometry.Transformation;
-        equals(other: kendo.geometry.Transformation): boolean;
-        matrix(): kendo.geometry.Matrix;
-        multiply(transformation: kendo.geometry.Transformation): kendo.geometry.Transformation;
-        rotate(angle: number, center: any): kendo.geometry.Transformation;
-        rotate(angle: number, center: kendo.geometry.Point): kendo.geometry.Transformation;
-        scale(scaleX: number, scaleY: number): kendo.geometry.Transformation;
-        translate(x: number, y: number): kendo.geometry.Transformation;
-
-    }
-
-    interface TransformationOptions {
-        name?: string;
-    }
-    interface TransformationEvent {
-        sender: Transformation;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-}
-declare namespace kendo.drawing {
-    class Arc extends kendo.drawing.Element {
-
-
-        options: ArcOptions;
-
-
-        constructor(geometry: kendo.geometry.Arc, options?: ArcOptions);
-
-
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        geometry(): kendo.geometry.Arc;
-        geometry(value: kendo.geometry.Arc): void;
-        fill(color: string, opacity?: number): kendo.drawing.Arc;
-        opacity(): number;
-        opacity(opacity: number): void;
-        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Arc;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface ArcOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        cursor?: string;
-        fill?: kendo.drawing.FillOptions;
-        opacity?: number;
-        stroke?: kendo.drawing.StrokeOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface ArcEvent {
-        sender: Arc;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Circle extends kendo.drawing.Element {
-
-
-        options: CircleOptions;
-
-
-        constructor(geometry: kendo.geometry.Circle, options?: CircleOptions);
-
-
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        geometry(): kendo.geometry.Circle;
-        geometry(value: kendo.geometry.Circle): void;
-        fill(color: string, opacity?: number): kendo.drawing.Circle;
-        opacity(): number;
-        opacity(opacity: number): void;
-        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Circle;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface CircleOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        cursor?: string;
-        fill?: kendo.drawing.FillOptions;
-        opacity?: number;
-        stroke?: kendo.drawing.StrokeOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface CircleEvent {
-        sender: Circle;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Element extends kendo.Class {
-
-
-        options: ElementOptions;
-
-
-        constructor(options?: ElementOptions);
-
-
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        opacity(): number;
-        opacity(opacity: number): void;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface ElementOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        cursor?: string;
-        opacity?: number;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface ElementEvent {
-        sender: Element;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    interface FillOptions  {
-
-
-
-        color?: string;
-        opacity?: number;
-
-
-
-
-    }
-
-
-
-    class Gradient extends kendo.Class {
-
-
-        options: GradientOptions;
-
-        stops: any;
-
-        constructor(options?: GradientOptions);
-
-
-        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
-        removeStop(stop: kendo.drawing.GradientStop): void;
-
-    }
-
-    interface GradientOptions {
-        name?: string;
-        stops?: any;
-    }
-    interface GradientEvent {
-        sender: Gradient;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class GradientStop extends kendo.Class {
-
-
-        options: GradientStopOptions;
-
-
-        constructor(options?: GradientStopOptions);
-
-
-
-    }
-
-    interface GradientStopOptions {
-        name?: string;
-        offset?: number;
-        color?: string;
-        opacity?: number;
-    }
-    interface GradientStopEvent {
-        sender: GradientStop;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Group extends kendo.drawing.Element {
-
-
-        options: GroupOptions;
-
-        children: any;
-
-        constructor(options?: GroupOptions);
-
-
-        append(element: kendo.drawing.Element): void;
-        clear(): void;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        insert(position: number, element: kendo.drawing.Element): void;
-        opacity(): number;
-        opacity(opacity: number): void;
-        remove(element: kendo.drawing.Element): void;
-        removeAt(index: number): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface GroupOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        cursor?: string;
-        opacity?: number;
-        pdf?: kendo.drawing.PDFOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface GroupEvent {
-        sender: Group;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Image extends kendo.drawing.Element {
-
-
-        options: ImageOptions;
-
-
-        constructor(src: string, rect: kendo.geometry.Rect);
-
-
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        opacity(): number;
-        opacity(opacity: number): void;
-        src(): string;
-        src(value: string): void;
-        rect(): kendo.geometry.Rect;
-        rect(value: kendo.geometry.Rect): void;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface ImageOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        cursor?: string;
-        opacity?: number;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface ImageEvent {
-        sender: Image;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Layout extends kendo.drawing.Group {
-
-
-        options: LayoutOptions;
-
-
-        constructor(rect: kendo.geometry.Rect, options?: LayoutOptions);
-
-
-        rect(): kendo.geometry.Rect;
-        rect(rect: kendo.geometry.Rect): void;
-        reflow(): void;
-
-    }
-
-    interface LayoutOptions {
-        name?: string;
-        alignContent?: string;
-        alignItems?: string;
-        justifyContent?: string;
-        lineSpacing?: number;
-        spacing?: number;
-        orientation?: string;
-        wrap?: boolean;
-    }
-    interface LayoutEvent {
-        sender: Layout;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class LinearGradient extends kendo.drawing.Gradient {
-
-
-        options: LinearGradientOptions;
-
-        stops: any;
-
-        constructor(options?: LinearGradientOptions);
-
-
-        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
-        end(): kendo.geometry.Point;
-        end(end: any): void;
-        end(end: kendo.geometry.Point): void;
-        start(): kendo.geometry.Point;
-        start(start: any): void;
-        start(start: kendo.geometry.Point): void;
-        removeStop(stop: kendo.drawing.GradientStop): void;
-
-    }
-
-    interface LinearGradientOptions {
-        name?: string;
-        stops?: any;
-    }
-    interface LinearGradientEvent {
-        sender: LinearGradient;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class MultiPath extends kendo.drawing.Element {
-
-
-        options: MultiPathOptions;
-
-        paths: any;
-
-        constructor(options?: MultiPathOptions);
-
-
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        close(): kendo.drawing.MultiPath;
-        curveTo(controlOut: any, controlIn: any, endPoint: any): kendo.drawing.MultiPath;
-        curveTo(controlOut: any, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
-        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.MultiPath;
-        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: any): kendo.drawing.MultiPath;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.MultiPath;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
-        fill(color: string, opacity?: number): kendo.drawing.MultiPath;
-        lineTo(x: number, y?: number): kendo.drawing.MultiPath;
-        lineTo(x: any, y?: number): kendo.drawing.MultiPath;
-        lineTo(x: kendo.geometry.Point, y?: number): kendo.drawing.MultiPath;
-        moveTo(x: number, y?: number): kendo.drawing.MultiPath;
-        moveTo(x: any, y?: number): kendo.drawing.MultiPath;
-        moveTo(x: kendo.geometry.Point, y?: number): kendo.drawing.MultiPath;
-        opacity(): number;
-        opacity(opacity: number): void;
-        stroke(color: string, width?: number, opacity?: number): kendo.drawing.MultiPath;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface MultiPathOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        cursor?: string;
-        fill?: kendo.drawing.FillOptions;
-        opacity?: number;
-        stroke?: kendo.drawing.StrokeOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface MultiPathEvent {
-        sender: MultiPath;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class OptionsStore extends kendo.Class {
-
-
-        options: OptionsStoreOptions;
-
-        observer: any;
-
-        constructor(options?: OptionsStoreOptions);
-
-
-        get(field: string): any;
-        set(field: string, value: any): void;
-
-    }
-
-    interface OptionsStoreOptions {
-        name?: string;
-    }
-    interface OptionsStoreEvent {
-        sender: OptionsStore;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    interface PDFOptions  {
-
-
-
-        creator?: string;
-        date?: Date;
-        keywords?: string;
-        landscape?: boolean;
-        margin?: any;
-        paperSize?: any;
-        subject?: string;
-        title?: string;
-
-
-
-
-    }
-
-
-
-    class Path extends kendo.drawing.Element {
-
-
-        options: PathOptions;
-
-        segments: any;
-
-        constructor(options?: PathOptions);
-
-        static fromPoints(points: any): kendo.drawing.Path;
-        static fromRect(rect: kendo.geometry.Rect): kendo.drawing.Path;
-        static parse(svgPath: string, options?: any): kendo.drawing.Path;
-
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        close(): kendo.drawing.Path;
-        curveTo(controlOut: any, controlIn: any, endPoint: any): kendo.drawing.Path;
-        curveTo(controlOut: any, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.Path;
-        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.Path;
-        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.Path;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: any): kendo.drawing.Path;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.Path;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.Path;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.Path;
-        fill(color: string, opacity?: number): kendo.drawing.Path;
-        lineTo(x: number, y?: number): kendo.drawing.Path;
-        lineTo(x: any, y?: number): kendo.drawing.Path;
-        lineTo(x: kendo.geometry.Point, y?: number): kendo.drawing.Path;
-        moveTo(x: number, y?: number): kendo.drawing.Path;
-        moveTo(x: any, y?: number): kendo.drawing.Path;
-        moveTo(x: kendo.geometry.Point, y?: number): kendo.drawing.Path;
-        opacity(): number;
-        opacity(opacity: number): void;
-        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Path;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface PathOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        cursor?: string;
-        fill?: kendo.drawing.FillOptions;
-        opacity?: number;
-        stroke?: kendo.drawing.StrokeOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface PathEvent {
-        sender: Path;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class RadialGradient extends kendo.drawing.Gradient {
-
-
-        options: RadialGradientOptions;
-
-        stops: any;
-
-        constructor(options?: RadialGradientOptions);
-
-
-        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
-        center(): kendo.geometry.Point;
-        center(center: any): void;
-        center(center: kendo.geometry.Point): void;
-        radius(): number;
-        radius(value: number): void;
-        removeStop(stop: kendo.drawing.GradientStop): void;
-
-    }
-
-    interface RadialGradientOptions {
-        name?: string;
-        center?: any|kendo.geometry.Point;
-        radius?: number;
-        stops?: any;
-    }
-    interface RadialGradientEvent {
-        sender: RadialGradient;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Rect extends kendo.drawing.Element {
-
-
-        options: RectOptions;
-
-
-        constructor(geometry: kendo.geometry.Rect, options?: RectOptions);
-
-
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        geometry(): kendo.geometry.Rect;
-        geometry(value: kendo.geometry.Rect): void;
-        fill(color: string, opacity?: number): kendo.drawing.Rect;
-        opacity(): number;
-        opacity(opacity: number): void;
-        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Rect;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface RectOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        cursor?: string;
-        fill?: kendo.drawing.FillOptions;
-        opacity?: number;
-        stroke?: kendo.drawing.StrokeOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface RectEvent {
-        sender: Rect;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Segment extends kendo.Class {
-
-
-        options: SegmentOptions;
-
-
-        constructor(anchor: kendo.geometry.Point, controlIn: kendo.geometry.Point, controlOut: kendo.geometry.Point);
-
-
-        anchor(): kendo.geometry.Point;
-        anchor(value: kendo.geometry.Point): void;
-        controlIn(): kendo.geometry.Point;
-        controlIn(value: kendo.geometry.Point): void;
-        controlOut(): kendo.geometry.Point;
-        controlOut(value: kendo.geometry.Point): void;
-
-    }
-
-    interface SegmentOptions {
-        name?: string;
-    }
-    interface SegmentEvent {
-        sender: Segment;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    interface StrokeOptions  {
-
-
-
-        color?: string;
-        dashType?: string;
-        lineCap?: string;
-        lineJoin?: string;
-        opacity?: number;
-        width?: number;
-
-
-
-
-    }
-
-
-
-    class Surface extends kendo.Observable {
-
-
-        options: SurfaceOptions;
-
-
-        constructor(options?: SurfaceOptions);
-
-        static create(element: JQuery, options?: any): kendo.drawing.Surface;
-        static create(element: Element, options?: any): kendo.drawing.Surface;
-
-        clear(): void;
-        draw(element: kendo.drawing.Element): void;
-        eventTarget(e: any): kendo.drawing.Element;
-        resize(force?: boolean): void;
-
-    }
-
-    interface SurfaceOptions {
-        name?: string;
-        type?: string;
-        height?: string;
-        width?: string;
-        click?(e: SurfaceClickEvent): void;
-        mouseenter?(e: SurfaceMouseenterEvent): void;
-        mouseleave?(e: SurfaceMouseleaveEvent): void;
-    }
-    interface SurfaceEvent {
-        sender: Surface;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface SurfaceClickEvent extends SurfaceEvent {
-        element?: kendo.drawing.Element;
-        originalEvent?: any;
-    }
-
-    interface SurfaceMouseenterEvent extends SurfaceEvent {
-        element?: kendo.drawing.Element;
-        originalEvent?: any;
-    }
-
-    interface SurfaceMouseleaveEvent extends SurfaceEvent {
-        element?: kendo.drawing.Element;
-        originalEvent?: any;
-    }
-
-
-    class Text extends kendo.drawing.Element {
-
-
-        options: TextOptions;
-
-
-        constructor(content: string, position: kendo.geometry.Point, options?: TextOptions);
-
-
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        content(): string;
-        content(value: string): void;
-        fill(color: string, opacity?: number): kendo.drawing.Text;
-        opacity(): number;
-        opacity(opacity: number): void;
-        position(): kendo.geometry.Point;
-        position(value: kendo.geometry.Point): void;
-        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Text;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface TextOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        cursor?: string;
-        fill?: kendo.drawing.FillOptions;
-        font?: string;
-        opacity?: number;
-        stroke?: kendo.drawing.StrokeOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface TextEvent {
-        sender: Text;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-}
-declare namespace kendo.ui {
-    class AutoComplete extends kendo.ui.Widget {
-
-        static fn: AutoComplete;
-
-        options: AutoCompleteOptions;
-
-        dataSource: kendo.data.DataSource;
-        list: JQuery;
-        ul: JQuery;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): AutoComplete;
-
-        constructor(element: Element, options?: AutoCompleteOptions);
-
-
-        close(): void;
-        dataItem(index: number): any;
-        destroy(): void;
-        enable(enable: boolean): void;
-        focus(): void;
-        items(): any;
-        readonly(readonly: boolean): void;
-        refresh(): void;
-        search(word: string): void;
-        select(item: string): void;
-        select(item: Element): void;
-        select(item: JQuery): void;
-        setDataSource(dataSource: kendo.data.DataSource): void;
-        suggest(value: string): void;
-        value(): string;
-        value(value: string): void;
-
-    }
-
-    interface AutoCompleteAnimationClose {
-        duration?: number;
-        effects?: string;
-    }
-
-    interface AutoCompleteAnimationOpen {
-        duration?: number;
-        effects?: string;
-    }
-
-    interface AutoCompleteAnimation {
-        close?: AutoCompleteAnimationClose;
-        open?: AutoCompleteAnimationOpen;
-    }
-
-    interface AutoCompleteVirtual {
-        itemHeight?: number;
-        valueMapper?: Function;
-    }
-
-    interface AutoCompleteOptions {
-        name?: string;
-        animation?: AutoCompleteAnimation;
-        dataSource?: any|any|kendo.data.DataSource;
-        dataTextField?: string;
-        delay?: number;
-        enable?: boolean;
-        filter?: string;
-        fixedGroupTemplate?: string|Function;
-        groupTemplate?: string|Function;
-        height?: number;
-        highlightFirst?: boolean;
-        ignoreCase?: boolean;
-        minLength?: number;
-        placeholder?: string;
-        popup?: any;
-        separator?: string;
-        suggest?: boolean;
-        headerTemplate?: string|Function;
-        template?: string|Function;
-        valuePrimitive?: boolean;
-        virtual?: AutoCompleteVirtual;
-        change?(e: AutoCompleteChangeEvent): void;
-        close?(e: AutoCompleteCloseEvent): void;
-        dataBound?(e: AutoCompleteDataBoundEvent): void;
-        filtering?(e: AutoCompleteFilteringEvent): void;
-        open?(e: AutoCompleteOpenEvent): void;
-        select?(e: AutoCompleteSelectEvent): void;
-    }
-    interface AutoCompleteEvent {
-        sender: AutoComplete;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface AutoCompleteChangeEvent extends AutoCompleteEvent {
-    }
-
-    interface AutoCompleteCloseEvent extends AutoCompleteEvent {
-    }
-
-    interface AutoCompleteDataBoundEvent extends AutoCompleteEvent {
-    }
-
-    interface AutoCompleteFilteringEvent extends AutoCompleteEvent {
-        filter?: any;
-    }
-
-    interface AutoCompleteOpenEvent extends AutoCompleteEvent {
-    }
-
-    interface AutoCompleteSelectEvent extends AutoCompleteEvent {
-        item?: JQuery;
-    }
-
-
-    class Button extends kendo.ui.Widget {
-
-        static fn: Button;
-
-        options: ButtonOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Button;
-
-        constructor(element: Element, options?: ButtonOptions);
-
-
-        enable(toggle: boolean): void;
-
-    }
-
-    interface ButtonOptions {
-        name?: string;
-        enable?: boolean;
-        icon?: string;
-        imageUrl?: string;
-        spriteCssClass?: string;
-        click?(e: ButtonClickEvent): void;
-    }
-    interface ButtonEvent {
-        sender: Button;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface ButtonClickEvent extends ButtonEvent {
-        event?: any;
-    }
-
-
-    class Calendar extends kendo.ui.Widget {
-
-        static fn: Calendar;
-
-        options: CalendarOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Calendar;
-
-        constructor(element: Element, options?: CalendarOptions);
-
-
-        current(): Date;
-        destroy(): void;
-        max(): Date;
-        max(value: Date): void;
-        max(value: string): void;
-        min(): Date;
-        min(value: Date): void;
-        min(value: string): void;
-        navigate(value: Date, view: string): void;
-        navigateDown(value: Date): void;
-        navigateToFuture(): void;
-        navigateToPast(): void;
-        navigateUp(): void;
-        value(): Date;
-        value(value: Date): void;
-        value(value: string): void;
-        view(): any;
-
-    }
-
-    interface CalendarMonth {
-        content?: string;
-        empty?: string;
-    }
-
-    interface CalendarOptions {
-        name?: string;
-        culture?: string;
-        dates?: any;
-        depth?: string;
-        disableDates?: any|Function;
-        footer?: string|Function;
-        format?: string;
-        max?: Date;
-        min?: Date;
-        month?: CalendarMonth;
-        start?: string;
-        value?: Date;
-        change?(e: CalendarEvent): void;
-        navigate?(e: CalendarEvent): void;
-    }
-    interface CalendarEvent {
-        sender: Calendar;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class ColorPalette extends kendo.ui.Widget {
-
-        static fn: ColorPalette;
-
-        options: ColorPaletteOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): ColorPalette;
-
-        constructor(element: Element, options?: ColorPaletteOptions);
-
-
-        value(): string;
-        value(color?: string): void;
-        color(): kendo.Color;
-        color(color?: kendo.Color): void;
-        enable(enable?: boolean): void;
-
-    }
-
-    interface ColorPaletteTileSize {
-        width?: number;
-        height?: number;
-    }
-
-    interface ColorPaletteOptions {
-        name?: string;
-        palette?: string|any;
-        columns?: number;
-        tileSize?: ColorPaletteTileSize;
-        value?: string;
-        change?(e: ColorPaletteEvent): void;
-    }
-    interface ColorPaletteEvent {
-        sender: ColorPalette;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class ColorPicker extends kendo.ui.Widget {
-
-        static fn: ColorPicker;
-
-        options: ColorPickerOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): ColorPicker;
-
-        constructor(element: Element, options?: ColorPickerOptions);
-
-
-        close(): void;
-        open(): void;
-        toggle(): void;
-        value(): string;
-        value(color?: string): void;
-        color(): kendo.Color;
-        color(color?: kendo.Color): void;
-        enable(enable?: boolean): void;
-
-    }
-
-    interface ColorPickerMessages {
-        apply?: string;
-        cancel?: string;
-    }
-
-    interface ColorPickerTileSize {
-        width?: number;
-        height?: number;
-    }
-
-    interface ColorPickerOptions {
-        name?: string;
-        buttons?: boolean;
-        columns?: number;
-        tileSize?: ColorPickerTileSize;
-        messages?: ColorPickerMessages;
-        palette?: string|any;
-        opacity?: boolean;
-        preview?: boolean;
-        toolIcon?: string;
-        value?: string;
-        change?(e: ColorPickerChangeEvent): void;
-        select?(e: ColorPickerSelectEvent): void;
-        open?(e: ColorPickerEvent): void;
-        close?(e: ColorPickerEvent): void;
-    }
-    interface ColorPickerEvent {
-        sender: ColorPicker;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface ColorPickerChangeEvent extends ColorPickerEvent {
-        value?: string;
-    }
-
-    interface ColorPickerSelectEvent extends ColorPickerEvent {
-        value?: string;
-    }
-
-
-    class ComboBox extends kendo.ui.Widget {
-
-        static fn: ComboBox;
-
-        options: ComboBoxOptions;
-
-        dataSource: kendo.data.DataSource;
-        input: JQuery;
-        list: JQuery;
-        ul: JQuery;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): ComboBox;
-
-        constructor(element: Element, options?: ComboBoxOptions);
-
-
-        close(): void;
-        dataItem(index?: number): any;
-        destroy(): void;
-        enable(enable: boolean): void;
-        focus(): void;
-        items(): any;
-        open(): void;
-        readonly(readonly: boolean): void;
-        refresh(): void;
-        search(word: string): void;
-        select(): number;
-        select(li: JQuery): void;
-        select(li: number): void;
-        select(li: Function): void;
-        setDataSource(dataSource: kendo.data.DataSource): void;
-        suggest(value: string): void;
-        text(): string;
-        text(text: string): void;
-        toggle(toggle: boolean): void;
-        value(): string;
-        value(value: string): void;
-
-    }
-
-    interface ComboBoxAnimationClose {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface ComboBoxAnimationOpen {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface ComboBoxAnimation {
-        close?: ComboBoxAnimationClose;
-        open?: ComboBoxAnimationOpen;
-    }
-
-    interface ComboBoxPopup {
-        appendTo?: string;
-        origin?: string;
-        position?: string;
-    }
-
-    interface ComboBoxVirtual {
-        itemHeight?: number;
-        valueMapper?: Function;
-    }
-
-    interface ComboBoxOptions {
-        name?: string;
-        animation?: ComboBoxAnimation;
-        autoBind?: boolean;
-        cascadeFrom?: string;
-        cascadeFromField?: string;
-        dataSource?: any|any|kendo.data.DataSource;
-        dataTextField?: string;
-        dataValueField?: string;
-        delay?: number;
-        enable?: boolean;
-        filter?: string;
-        fixedGroupTemplate?: string|Function;
-        groupTemplate?: string|Function;
-        height?: number;
-        highlightFirst?: boolean;
-        ignoreCase?: boolean;
-        index?: number;
-        minLength?: number;
-        placeholder?: string;
-        popup?: ComboBoxPopup;
-        suggest?: boolean;
-        headerTemplate?: string|Function;
-        template?: string|Function;
-        text?: string;
-        value?: string;
-        valuePrimitive?: boolean;
-        virtual?: ComboBoxVirtual;
-        change?(e: ComboBoxChangeEvent): void;
-        close?(e: ComboBoxCloseEvent): void;
-        dataBound?(e: ComboBoxDataBoundEvent): void;
-        filtering?(e: ComboBoxFilteringEvent): void;
-        open?(e: ComboBoxOpenEvent): void;
-        select?(e: ComboBoxSelectEvent): void;
-        cascade?(e: ComboBoxCascadeEvent): void;
-    }
-    interface ComboBoxEvent {
-        sender: ComboBox;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface ComboBoxChangeEvent extends ComboBoxEvent {
-    }
-
-    interface ComboBoxCloseEvent extends ComboBoxEvent {
-    }
-
-    interface ComboBoxDataBoundEvent extends ComboBoxEvent {
-    }
-
-    interface ComboBoxFilteringEvent extends ComboBoxEvent {
-        filter?: any;
-    }
-
-    interface ComboBoxOpenEvent extends ComboBoxEvent {
-    }
-
-    interface ComboBoxSelectEvent extends ComboBoxEvent {
-        item?: JQuery;
-    }
-
-    interface ComboBoxCascadeEvent extends ComboBoxEvent {
-    }
-
-
-    class ContextMenu extends kendo.ui.Widget {
-
-        static fn: ContextMenu;
-
-        options: ContextMenuOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): ContextMenu;
-
-        constructor(element: Element, options?: ContextMenuOptions);
-
-
-        append(item: any, referenceItem: string): kendo.ui.ContextMenu;
-        append(item: any, referenceItem: JQuery): kendo.ui.ContextMenu;
-        close(element: Element): kendo.ui.ContextMenu;
-        close(element: JQuery): kendo.ui.ContextMenu;
-        destroy(): void;
-        enable(element: string, enable: boolean): kendo.ui.ContextMenu;
-        enable(element: Element, enable: boolean): kendo.ui.ContextMenu;
-        enable(element: JQuery, enable: boolean): kendo.ui.ContextMenu;
-        insertAfter(item: any, referenceItem: string): kendo.ui.ContextMenu;
-        insertAfter(item: any, referenceItem: Element): kendo.ui.ContextMenu;
-        insertAfter(item: any, referenceItem: JQuery): kendo.ui.ContextMenu;
-        insertBefore(item: any, referenceItem: string): kendo.ui.ContextMenu;
-        insertBefore(item: any, referenceItem: Element): kendo.ui.ContextMenu;
-        insertBefore(item: any, referenceItem: JQuery): kendo.ui.ContextMenu;
-        open(x: number, y?: number): kendo.ui.ContextMenu;
-        open(x: Element, y?: number): kendo.ui.ContextMenu;
-        open(x: JQuery, y?: number): kendo.ui.ContextMenu;
-        remove(element: string): kendo.ui.ContextMenu;
-        remove(element: Element): kendo.ui.ContextMenu;
-        remove(element: JQuery): kendo.ui.ContextMenu;
-
-    }
-
-    interface ContextMenuAnimationClose {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface ContextMenuAnimationOpen {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface ContextMenuAnimation {
-        close?: ContextMenuAnimationClose;
-        open?: ContextMenuAnimationOpen;
-    }
-
-    interface ContextMenuOptions {
-        name?: string;
-        alignToAnchor?: boolean;
-        animation?: ContextMenuAnimation;
-        closeOnClick?: boolean;
-        dataSource?: any|any;
-        direction?: string;
-        filter?: string;
-        hoverDelay?: number;
-        orientation?: string;
-        popupCollision?: string;
-        showOn?: string;
-        target?: string|JQuery;
-        close?(e: ContextMenuCloseEvent): void;
-        open?(e: ContextMenuOpenEvent): void;
-        activate?(e: ContextMenuActivateEvent): void;
-        deactivate?(e: ContextMenuDeactivateEvent): void;
-        select?(e: ContextMenuSelectEvent): void;
-    }
-    interface ContextMenuEvent {
-        sender: ContextMenu;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface ContextMenuCloseEvent extends ContextMenuEvent {
-        item?: Element;
-        type?: string;
-        target?: Element;
-        event?: JQueryEventObject;
-    }
-
-    interface ContextMenuOpenEvent extends ContextMenuEvent {
-        item?: Element;
-        type?: string;
-        target?: Element;
-        event?: JQueryEventObject;
-    }
-
-    interface ContextMenuActivateEvent extends ContextMenuEvent {
-        item?: Element;
-        type?: string;
-        target?: Element;
-    }
-
-    interface ContextMenuDeactivateEvent extends ContextMenuEvent {
-        item?: Element;
-        type?: string;
-        target?: Element;
-    }
-
-    interface ContextMenuSelectEvent extends ContextMenuEvent {
-        item?: Element;
-        type?: string;
-        target?: Element;
-    }
-
-
-    class DatePicker extends kendo.ui.Widget {
-
-        static fn: DatePicker;
-
-        options: DatePickerOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): DatePicker;
-
-        constructor(element: Element, options?: DatePickerOptions);
-
-
-        close(): void;
-        destroy(): void;
-        enable(enable: boolean): void;
-        readonly(readonly: boolean): void;
-        max(): Date;
-        max(value: Date): void;
-        max(value: string): void;
-        min(): Date;
-        min(value: Date): void;
-        min(value: string): void;
-        open(): void;
-        setOptions(options: any): void;
-        value(): Date;
-        value(value: Date): void;
-        value(value: string): void;
-
-    }
-
-    interface DatePickerAnimationClose {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface DatePickerAnimationOpen {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface DatePickerAnimation {
-        close?: DatePickerAnimationClose;
-        open?: DatePickerAnimationOpen;
-    }
-
-    interface DatePickerMonth {
-        content?: string;
-        empty?: string;
-    }
-
-    interface DatePickerOptions {
-        name?: string;
-        animation?: DatePickerAnimation;
-        ARIATemplate?: string;
-        culture?: string;
-        dates?: any;
-        depth?: string;
-        disableDates?: any|Function;
-        footer?: string|Function;
-        format?: string;
-        max?: Date;
-        min?: Date;
-        month?: DatePickerMonth;
-        parseFormats?: any;
-        start?: string;
-        value?: Date;
-        change?(e: DatePickerChangeEvent): void;
-        close?(e: DatePickerCloseEvent): void;
-        open?(e: DatePickerOpenEvent): void;
-    }
-    interface DatePickerEvent {
-        sender: DatePicker;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface DatePickerChangeEvent extends DatePickerEvent {
-    }
-
-    interface DatePickerCloseEvent extends DatePickerEvent {
-    }
-
-    interface DatePickerOpenEvent extends DatePickerEvent {
-    }
-
-
-    class DateTimePicker extends kendo.ui.Widget {
-
-        static fn: DateTimePicker;
-
-        options: DateTimePickerOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): DateTimePicker;
-
-        constructor(element: Element, options?: DateTimePickerOptions);
-
-
-        close(view: string): void;
-        destroy(): void;
-        enable(enable: boolean): void;
-        readonly(readonly: boolean): void;
-        max(): Date;
-        max(value: Date): void;
-        max(value: string): void;
-        min(): Date;
-        min(value: Date): void;
-        min(value: string): void;
-        open(view: string): void;
-        setOptions(options: any): void;
-        toggle(view: string): void;
-        value(): Date;
-        value(value: Date): void;
-        value(value: string): void;
-
-    }
-
-    interface DateTimePickerAnimationClose {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface DateTimePickerAnimationOpen {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface DateTimePickerAnimation {
-        close?: DateTimePickerAnimationClose;
-        open?: DateTimePickerAnimationOpen;
-    }
-
-    interface DateTimePickerMonth {
-        content?: string;
-        empty?: string;
-    }
-
-    interface DateTimePickerOptions {
-        name?: string;
-        animation?: DateTimePickerAnimation;
-        ARIATemplate?: string;
-        culture?: string;
-        dates?: any;
-        depth?: string;
-        disableDates?: any|Function;
-        footer?: string;
-        format?: string;
-        interval?: number;
-        max?: Date;
-        min?: Date;
-        month?: DateTimePickerMonth;
-        parseFormats?: any;
-        start?: string;
-        timeFormat?: string;
-        value?: Date;
-        change?(e: DateTimePickerChangeEvent): void;
-        close?(e: DateTimePickerCloseEvent): void;
-        open?(e: DateTimePickerOpenEvent): void;
-    }
-    interface DateTimePickerEvent {
-        sender: DateTimePicker;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface DateTimePickerChangeEvent extends DateTimePickerEvent {
-    }
-
-    interface DateTimePickerCloseEvent extends DateTimePickerEvent {
-        view?: string;
-    }
-
-    interface DateTimePickerOpenEvent extends DateTimePickerEvent {
-        view?: string;
-    }
-
-
-    class DropDownList extends kendo.ui.Widget {
-
-        static fn: DropDownList;
-
-        options: DropDownListOptions;
-
-        dataSource: kendo.data.DataSource;
-        span: JQuery;
-        filterInput: JQuery;
-        list: JQuery;
-        ul: JQuery;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): DropDownList;
-
-        constructor(element: Element, options?: DropDownListOptions);
-
-
-        close(): void;
-        dataItem(index?: JQuery): any;
-        dataItem(index?: number): any;
-        destroy(): void;
-        focus(): void;
-        items(): any;
-        enable(enable: boolean): void;
-        open(): void;
-        readonly(readonly: boolean): void;
-        refresh(): void;
-        search(word: string): void;
-        select(): number;
-        select(li: JQuery): void;
-        select(li: number): void;
-        select(li: Function): void;
-        setDataSource(dataSource: kendo.data.DataSource): void;
-        text(): string;
-        text(text: string): void;
-        toggle(toggle: boolean): void;
-        value(): string;
-        value(value: string): void;
-
-    }
-
-    interface DropDownListAnimationClose {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface DropDownListAnimationOpen {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface DropDownListAnimation {
-        close?: DropDownListAnimationClose;
-        open?: DropDownListAnimationOpen;
-    }
-
-    interface DropDownListPopup {
-        appendTo?: string;
-        origin?: string;
-        position?: string;
-    }
-
-    interface DropDownListVirtual {
-        itemHeight?: number;
-        valueMapper?: Function;
-    }
-
-    interface DropDownListOptions {
-        name?: string;
-        animation?: DropDownListAnimation;
-        autoBind?: boolean;
-        cascadeFrom?: string;
-        cascadeFromField?: string;
-        dataSource?: any|any|kendo.data.DataSource;
-        dataTextField?: string;
-        dataValueField?: string;
-        delay?: number;
-        enable?: boolean;
-        filter?: string;
-        fixedGroupTemplate?: string|Function;
-        groupTemplate?: string|Function;
-        height?: number;
-        ignoreCase?: boolean;
-        index?: number;
-        minLength?: number;
-        popup?: DropDownListPopup;
-        optionLabel?: string|any;
-        optionLabelTemplate?: string|Function;
-        headerTemplate?: string|Function;
-        template?: string|Function;
-        valueTemplate?: string|Function;
-        text?: string;
-        value?: string;
-        valuePrimitive?: boolean;
-        virtual?: DropDownListVirtual;
-        change?(e: DropDownListChangeEvent): void;
-        close?(e: DropDownListCloseEvent): void;
-        dataBound?(e: DropDownListDataBoundEvent): void;
-        filtering?(e: DropDownListFilteringEvent): void;
-        open?(e: DropDownListOpenEvent): void;
-        select?(e: DropDownListSelectEvent): void;
-        cascade?(e: DropDownListCascadeEvent): void;
-    }
-    interface DropDownListEvent {
-        sender: DropDownList;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface DropDownListChangeEvent extends DropDownListEvent {
-    }
-
-    interface DropDownListCloseEvent extends DropDownListEvent {
-    }
-
-    interface DropDownListDataBoundEvent extends DropDownListEvent {
-    }
-
-    interface DropDownListFilteringEvent extends DropDownListEvent {
-        filter?: any;
-    }
-
-    interface DropDownListOpenEvent extends DropDownListEvent {
-    }
-
-    interface DropDownListSelectEvent extends DropDownListEvent {
-        item?: JQuery;
-    }
-
-    interface DropDownListCascadeEvent extends DropDownListEvent {
-    }
-
-
-    class Editor extends kendo.ui.Widget {
-
-        static fn: Editor;
-
-        options: EditorOptions;
-
-        body: Element;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Editor;
-
-        constructor(element: Element, options?: EditorOptions);
-
-
-        createRange(document?: Document): Range;
-        destroy(): void;
-        encodedValue(): void;
-        exec(name: string, params: any): void;
-        focus(): void;
-        getRange(): Range;
-        getSelection(): Selection;
-        paste(html: string, options: any): void;
-        selectedHtml(): string;
-        refresh(): void;
-        saveAsPDF(): JQueryPromise<any>;
-        selectRange(range: Range): void;
-        update(): void;
-        state(toolName: string): boolean;
-        value(): string;
-        value(value: string): void;
-
-    }
-
-    interface EditorFileBrowserMessages {
-        uploadFile?: string;
-        orderBy?: string;
-        orderByName?: string;
-        orderBySize?: string;
-        directoryNotFound?: string;
-        emptyFolder?: string;
-        deleteFile?: string;
-        invalidFileType?: string;
-        overwriteFile?: string;
-        search?: string;
-    }
-
-    interface EditorFileBrowserSchemaModelFieldsName {
-        field?: string;
-        parse?: Function;
-    }
-
-    interface EditorFileBrowserSchemaModelFieldsSize {
-        field?: string;
-        parse?: Function;
-    }
-
-    interface EditorFileBrowserSchemaModelFieldsType {
-        parse?: Function;
-        field?: string;
-    }
-
-    interface EditorFileBrowserSchemaModelFields {
-        name?: EditorFileBrowserSchemaModelFieldsName;
-        type?: EditorFileBrowserSchemaModelFieldsType;
-        size?: EditorFileBrowserSchemaModelFieldsSize;
-    }
-
-    interface EditorFileBrowserSchemaModel {
-        id?: string;
-        fields?: EditorFileBrowserSchemaModelFields;
-    }
-
-    interface EditorFileBrowserSchema {
-    }
-
-    interface EditorFileBrowserTransportCreate {
-        contentType?: string;
-        data?: any|string|Function;
-        dataType?: string;
-        type?: string;
-        url?: string|Function;
-    }
-
-    interface EditorFileBrowserTransportDestroy {
-        contentType?: string;
-        data?: any|string|Function;
-        dataType?: string;
-        type?: string;
-        url?: string|Function;
-    }
-
-    interface EditorFileBrowserTransportRead {
-        contentType?: string;
-        data?: any|string|Function;
-        dataType?: string;
-        type?: string;
-        url?: string|Function;
-    }
-
-    interface EditorFileBrowserTransport {
-        read?: EditorFileBrowserTransportRead;
-        uploadUrl?: string;
-        fileUrl?: string|Function;
-        destroy?: EditorFileBrowserTransportDestroy;
-        create?: EditorFileBrowserTransportCreate;
-    }
-
-    interface EditorFileBrowser {
-        fileTypes?: string;
-        path?: string;
-        transport?: EditorFileBrowserTransport;
-        schema?: EditorFileBrowserSchema;
-        messages?: EditorFileBrowserMessages;
-    }
-
-    interface EditorImageBrowserMessages {
-        uploadFile?: string;
-        orderBy?: string;
-        orderByName?: string;
-        orderBySize?: string;
-        directoryNotFound?: string;
-        emptyFolder?: string;
-        deleteFile?: string;
-        invalidFileType?: string;
-        overwriteFile?: string;
-        search?: string;
-    }
-
-    interface EditorImageBrowserSchemaModelFieldsName {
-        field?: string;
-        parse?: Function;
-    }
-
-    interface EditorImageBrowserSchemaModelFieldsSize {
-        field?: string;
-        parse?: Function;
-    }
-
-    interface EditorImageBrowserSchemaModelFieldsType {
-        parse?: Function;
-        field?: string;
-    }
-
-    interface EditorImageBrowserSchemaModelFields {
-        name?: EditorImageBrowserSchemaModelFieldsName;
-        type?: EditorImageBrowserSchemaModelFieldsType;
-        size?: EditorImageBrowserSchemaModelFieldsSize;
-    }
-
-    interface EditorImageBrowserSchemaModel {
-        id?: string;
-        fields?: EditorImageBrowserSchemaModelFields;
-    }
-
-    interface EditorImageBrowserSchema {
-    }
-
-    interface EditorImageBrowserTransportCreate {
-        contentType?: string;
-        data?: any|string|Function;
-        dataType?: string;
-        type?: string;
-        url?: string|Function;
-    }
-
-    interface EditorImageBrowserTransportDestroy {
-        contentType?: string;
-        data?: any|string|Function;
-        dataType?: string;
-        type?: string;
-        url?: string|Function;
-    }
-
-    interface EditorImageBrowserTransportRead {
-        contentType?: string;
-        data?: any|string|Function;
-        dataType?: string;
-        type?: string;
-        url?: string|Function;
-    }
-
-    interface EditorImageBrowserTransport {
-        read?: EditorImageBrowserTransportRead;
-        thumbnailUrl?: string|Function;
-        uploadUrl?: string;
-        imageUrl?: string|Function;
-        destroy?: EditorImageBrowserTransportDestroy;
-        create?: EditorImageBrowserTransportCreate;
-    }
-
-    interface EditorImageBrowser {
-        fileTypes?: string;
-        path?: string;
-        transport?: EditorImageBrowserTransport;
-        schema?: EditorImageBrowserSchema;
-        messages?: EditorImageBrowserMessages;
-    }
-
-    interface EditorMessages {
-        bold?: string;
-        italic?: string;
-        underline?: string;
-        strikethrough?: string;
-        superscript?: string;
-        subscript?: string;
-        justifyCenter?: string;
-        justifyLeft?: string;
-        justifyRight?: string;
-        justifyFull?: string;
-        insertUnorderedList?: string;
-        insertOrderedList?: string;
-        indent?: string;
-        outdent?: string;
-        createLink?: string;
-        unlink?: string;
-        insertImage?: string;
-        insertFile?: string;
-        insertHtml?: string;
-        viewHtml?: string;
-        fontName?: string;
-        fontNameInherit?: string;
-        fontSize?: string;
-        fontSizeInherit?: string;
-        formatBlock?: string;
-        formatting?: string;
-        foreColor?: string;
-        backColor?: string;
-        style?: string;
-        emptyFolder?: string;
-        uploadFile?: string;
-        editAreaTitle?: string;
-        orderBy?: string;
-        orderBySize?: string;
-        orderByName?: string;
-        invalidFileType?: string;
-        deleteFile?: string;
-        overwriteFile?: string;
-        directoryNotFound?: string;
-        imageWebAddress?: string;
-        imageAltText?: string;
-        imageWidth?: string;
-        imageHeight?: string;
-        fileWebAddress?: string;
-        fileTitle?: string;
-        linkWebAddress?: string;
-        linkText?: string;
-        linkToolTip?: string;
-        linkOpenInNewWindow?: string;
-        dialogUpdate?: string;
-        dialogInsert?: string;
-        dialogCancel?: string;
-        createTable?: string;
-        createTableHint?: string;
-        addColumnLeft?: string;
-        addColumnRight?: string;
-        addRowAbove?: string;
-        addRowBelow?: string;
-        deleteRow?: string;
-        deleteColumn?: string;
-    }
-
-    interface EditorPdfMargin {
-        bottom?: number|string;
-        left?: number|string;
-        right?: number|string;
-        top?: number|string;
-    }
-
-    interface EditorPdf {
-        author?: string;
-        avoidLinks?: boolean|string;
-        creator?: string;
-        date?: Date;
-        fileName?: string;
-        forceProxy?: boolean;
-        keywords?: string;
-        landscape?: boolean;
-        margin?: EditorPdfMargin;
-        paperSize?: string|any;
-        proxyURL?: string;
-        proxyTarget?: string;
-        subject?: string;
-        title?: string;
-    }
-
-    interface EditorResizable {
-        content?: boolean;
-        min?: number;
-        max?: number;
-        toolbar?: boolean;
-    }
-
-    interface EditorSerialization {
-        entities?: boolean;
-        scripts?: boolean;
-        semantic?: boolean;
-    }
-
-    interface EditorToolItem {
-        text?: string;
-        value?: string;
-        context?: string;
-    }
-
-    interface EditorTool {
-        name?: string;
-        tooltip?: string;
-        exec?: Function;
-        items?: EditorToolItem[];
-        template?: string;
-    }
-
-    interface EditorExecParams {
-        value?: any;
-    }
-
-    interface EditorPasteOptions {
-        split?: boolean;
-    }
-
-    interface EditorOptions {
-        name?: string;
-        domain?: string;
-        encoded?: boolean;
-        messages?: EditorMessages;
-        pdf?: EditorPdf;
-        resizable?: EditorResizable;
-        serialization?: EditorSerialization;
-        stylesheets?: any;
-        tools?: EditorTool[];
-        imageBrowser?: EditorImageBrowser;
-        fileBrowser?: EditorFileBrowser;
-        change?(e: EditorEvent): void;
-        execute?(e: EditorExecuteEvent): void;
-        keydown?(e: EditorEvent): void;
-        keyup?(e: EditorEvent): void;
-        paste?(e: EditorPasteEvent): void;
-        pdfExport?(e: EditorPdfExportEvent): void;
-        select?(e: EditorEvent): void;
-    }
-    interface EditorEvent {
-        sender: Editor;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface EditorExecuteEvent extends EditorEvent {
-        name?: string;
-        command?: any;
-    }
-
-    interface EditorPasteEvent extends EditorEvent {
-        html?: any;
-    }
-
-    interface EditorPdfExportEvent extends EditorEvent {
-        promise?: JQueryPromise<any>;
-    }
-
-
-    class FlatColorPicker extends kendo.ui.Widget {
-
-        static fn: FlatColorPicker;
-
-        options: FlatColorPickerOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): FlatColorPicker;
-
-        constructor(element: Element, options?: FlatColorPickerOptions);
-
-
-        focus(): void;
-        value(): string;
-        value(color?: string): void;
-        color(): kendo.Color;
-        color(color?: kendo.Color): void;
-        enable(enable?: boolean): void;
-
-    }
-
-    interface FlatColorPickerMessages {
-        apply?: string;
-        cancel?: string;
-    }
-
-    interface FlatColorPickerOptions {
-        name?: string;
-        opacity?: boolean;
-        buttons?: boolean;
-        value?: string;
-        preview?: boolean;
-        autoupdate?: boolean;
-        messages?: FlatColorPickerMessages;
-        change?(e: FlatColorPickerChangeEvent): void;
-    }
-    interface FlatColorPickerEvent {
-        sender: FlatColorPicker;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface FlatColorPickerChangeEvent extends FlatColorPickerEvent {
-        value?: string;
-    }
-
-
-    class Gantt extends kendo.ui.Widget {
-
-        static fn: Gantt;
-
-        options: GanttOptions;
-
-        dataSource: kendo.data.DataSource;
-        dependencies: kendo.data.GanttDependencyDataSource;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Gantt;
-
-        constructor(element: Element, options?: GanttOptions);
-
-
-        clearSelection(): void;
-        dataItem(row: string): kendo.data.GanttTask;
-        dataItem(row: Element): kendo.data.GanttTask;
-        dataItem(row: JQuery): kendo.data.GanttTask;
-        destroy(): void;
-        refresh(): void;
-        refreshDependencies(): void;
-        removeDependency(dependency: string): void;
-        removeDependency(dependency: kendo.data.GanttDependency): void;
-        removeTask(task: string): void;
-        removeTask(task: kendo.data.GanttTask): void;
-        saveAsPDF(): JQueryPromise<any>;
-        select(): JQuery;
-        select(row: string): void;
-        select(row: Element): void;
-        select(row: JQuery): void;
-        setDataSource(dataSource: kendo.data.GanttDataSource): void;
-        setDependenciesDataSource(dataSource: kendo.data.GanttDependencyDataSource): void;
-        view(): kendo.ui.GanttView;
-        view(type?: string): void;
-
-    }
-
-    interface GanttAssignments {
-        dataSource?: any|any|kendo.data.DataSource;
-        dataResourceIdField?: string;
-        dataTaskIdField?: string;
-        dataValueField?: string;
-    }
-
-    interface GanttColumn {
-        field?: string;
-        title?: string;
-        format?: string;
-        width?: string|number;
-        editable?: boolean;
-        sortable?: boolean;
-    }
-
-    interface GanttCurrentTimeMarker {
-        updateInterval?: number;
-    }
-
-    interface GanttEditable {
-        confirmation?: boolean;
-        template?: string|Function;
-    }
-
-    interface GanttMessagesActions {
-        addChild?: string;
-        append?: string;
-        insertAfter?: string;
-        insertBefore?: string;
-        pdf?: string;
-    }
-
-    interface GanttMessagesEditor {
-        assignButton?: string;
-        editorTitle?: string;
-        end?: string;
-        percentComplete?: string;
-        resources?: string;
-        resourcesEditorTitle?: string;
-        resourcesHeader?: string;
-        start?: string;
-        title?: string;
-        unitsHeader?: string;
-    }
-
-    interface GanttMessagesViews {
-        day?: string;
-        end?: string;
-        month?: string;
-        start?: string;
-        week?: string;
-        year?: string;
-    }
-
-    interface GanttMessages {
-        actions?: GanttMessagesActions;
-        cancel?: string;
-        deleteDependencyConfirmation?: string;
-        deleteDependencyWindowTitle?: string;
-        deleteTaskConfirmation?: string;
-        deleteTaskWindowTitle?: string;
-        destroy?: string;
-        editor?: GanttMessagesEditor;
-        save?: string;
-        views?: GanttMessagesViews;
-    }
-
-    interface GanttPdfMargin {
-        bottom?: number|string;
-        left?: number|string;
-        right?: number|string;
-        top?: number|string;
-    }
-
-    interface GanttPdf {
-        author?: string;
-        avoidLinks?: boolean|string;
-        creator?: string;
-        date?: Date;
-        fileName?: string;
-        forceProxy?: boolean;
-        keywords?: string;
-        landscape?: boolean;
-        margin?: GanttPdfMargin;
-        paperSize?: string|any;
-        proxyURL?: string;
-        proxyTarget?: string;
-        subject?: string;
-        title?: string;
-    }
-
-    interface GanttResources {
-        dataFormatField?: string;
-        dataColorField?: string;
-        dataSource?: any|any|kendo.data.DataSource;
-        dataTextField?: string;
-        field?: string;
-    }
-
-    interface GanttToolbarItem {
-        name?: string;
-        template?: string|Function;
-        text?: string;
-    }
-
-    interface GanttTooltip {
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface GanttView {
-        type?: string;
-        selected?: boolean;
-        slotSize?: number|string;
-        timeHeaderTemplate?: string|Function;
-        dayHeaderTemplate?: string|Function;
-        weekHeaderTemplate?: string|Function;
-        monthHeaderTemplate?: string|Function;
-        yearHeaderTemplate?: string|Function;
-        resizeTooltipFormat?: string;
-    }
-
-    interface GanttOptions {
-        name?: string;
-        assignments?: GanttAssignments;
-        autoBind?: boolean;
-        columnResizeHandleWidth?: number;
-        columns?: GanttColumn[];
-        currentTimeMarker?: GanttCurrentTimeMarker;
-        dataSource?: any|any|kendo.data.GanttDataSource;
-        dependencies?: any|any|kendo.data.GanttDependencyDataSource;
-        editable?: GanttEditable;
-        navigatable?: boolean;
-        workDayStart?: Date;
-        workDayEnd?: Date;
-        workWeekStart?: number;
-        workWeekEnd?: number;
-        hourSpan?: number;
-        snap?: boolean;
-        height?: number|string;
-        listWidth?: string|number;
-        messages?: GanttMessages;
-        pdf?: GanttPdf;
-        resizable?: boolean;
-        selectable?: boolean;
-        showWorkDays?: boolean;
-        showWorkHours?: boolean;
-        taskTemplate?: string|Function;
-        toolbar?: GanttToolbarItem[];
-        tooltip?: GanttTooltip;
-        views?: GanttView[];
-        resources?: GanttResources;
-        rowHeight?: number|string;
-        dataBinding?(e: GanttDataBindingEvent): void;
-        dataBound?(e: GanttDataBoundEvent): void;
-        add?(e: GanttAddEvent): void;
-        edit?(e: GanttEditEvent): void;
-        remove?(e: GanttRemoveEvent): void;
-        cancel?(e: GanttCancelEvent): void;
-        save?(e: GanttSaveEvent): void;
-        change?(e: GanttChangeEvent): void;
-        columnResize?(e: GanttColumnResizeEvent): void;
-        navigate?(e: GanttNavigateEvent): void;
-        moveStart?(e: GanttMoveStartEvent): void;
-        move?(e: GanttMoveEvent): void;
-        moveEnd?(e: GanttMoveEndEvent): void;
-        pdfExport?(e: GanttPdfExportEvent): void;
-        resizeStart?(e: GanttResizeStartEvent): void;
-        resize?(e: GanttResizeEvent): void;
-        resizeEnd?(e: GanttResizeEndEvent): void;
-    }
-    interface GanttEvent {
-        sender: Gantt;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface GanttDataBindingEvent extends GanttEvent {
-    }
-
-    interface GanttDataBoundEvent extends GanttEvent {
-    }
-
-    interface GanttAddEvent extends GanttEvent {
-        task?: kendo.data.GanttTask;
-        dependency?: kendo.data.GanttDependency;
-    }
-
-    interface GanttEditEvent extends GanttEvent {
-        container?: JQuery;
-        task?: kendo.data.GanttTask;
-    }
-
-    interface GanttRemoveEvent extends GanttEvent {
-        task?: kendo.data.GanttTask;
-        dependencies?: any;
-    }
-
-    interface GanttCancelEvent extends GanttEvent {
-        container?: JQuery;
-        task?: kendo.data.GanttTask;
-    }
-
-    interface GanttSaveEvent extends GanttEvent {
-        task?: kendo.data.GanttTask;
-        values?: any;
-    }
-
-    interface GanttChangeEvent extends GanttEvent {
-    }
-
-    interface GanttColumnResizeEvent extends GanttEvent {
-        column?: any;
-        newWidth?: number;
-        oldWidth?: number;
-    }
-
-    interface GanttNavigateEvent extends GanttEvent {
-        view?: string;
-    }
-
-    interface GanttMoveStartEvent extends GanttEvent {
-        task?: kendo.data.GanttTask;
-    }
-
-    interface GanttMoveEvent extends GanttEvent {
-        task?: kendo.data.GanttTask;
-        start?: Date;
-        end?: Date;
-    }
-
-    interface GanttMoveEndEvent extends GanttEvent {
-        task?: kendo.data.GanttTask;
-        start?: Date;
-        end?: Date;
-    }
-
-    interface GanttPdfExportEvent extends GanttEvent {
-        promise?: JQueryPromise<any>;
-    }
-
-    interface GanttResizeStartEvent extends GanttEvent {
-        task?: kendo.data.GanttTask;
-    }
-
-    interface GanttResizeEvent extends GanttEvent {
-        task?: kendo.data.GanttTask;
-        start?: Date;
-        end?: Date;
-    }
-
-    interface GanttResizeEndEvent extends GanttEvent {
-        task?: kendo.data.GanttTask;
-        start?: Date;
-        end?: Date;
-    }
-
-
-    class Grid extends kendo.ui.Widget {
-
-        static fn: Grid;
-
-        options: GridOptions;
-
-        dataSource: kendo.data.DataSource;
-        columns: GridColumn[];
-        footer: JQuery;
-        pager: kendo.ui.Pager;
-        table: JQuery;
-        tbody: JQuery;
-        thead: JQuery;
-        content: JQuery;
-        lockedHeader: JQuery;
-        lockedTable: JQuery;
-        lockedContent: JQuery;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Grid;
-
-        constructor(element: Element, options?: GridOptions);
-
-
-        addRow(): void;
-        autoFitColumn(column: number): void;
-        autoFitColumn(column: string): void;
-        autoFitColumn(column: any): void;
-        cancelChanges(): void;
-        cancelRow(): void;
-        cellIndex(cell: string): number;
-        cellIndex(cell: Element): number;
-        cellIndex(cell: JQuery): number;
-        clearSelection(): void;
-        closeCell(isCancel?: boolean): void;
-        collapseGroup(row: string): void;
-        collapseGroup(row: Element): void;
-        collapseGroup(row: JQuery): void;
-        collapseRow(row: string): void;
-        collapseRow(row: Element): void;
-        collapseRow(row: JQuery): void;
-        current(): JQuery;
-        current(cell: JQuery): void;
-        dataItem(row: string): kendo.data.ObservableObject;
-        dataItem(row: Element): kendo.data.ObservableObject;
-        dataItem(row: JQuery): kendo.data.ObservableObject;
-        destroy(): void;
-        editCell(cell: JQuery): void;
-        editRow(row: JQuery): void;
-        expandGroup(row: string): void;
-        expandGroup(row: Element): void;
-        expandGroup(row: JQuery): void;
-        expandRow(row: string): void;
-        expandRow(row: Element): void;
-        expandRow(row: JQuery): void;
-        getOptions(): GridOptions;
-        hideColumn(column: number): void;
-        hideColumn(column: string): void;
-        hideColumn(column: any): void;
-        items(): any;
-        lockColumn(column: number): void;
-        lockColumn(column: string): void;
-        refresh(): void;
-        removeRow(row: string): void;
-        removeRow(row: Element): void;
-        removeRow(row: JQuery): void;
-        reorderColumn(destIndex: number, column: any): void;
-        saveAsExcel(): void;
-        saveAsPDF(): JQueryPromise<any>;
-        saveChanges(): void;
-        saveRow(): void;
-        select(): JQuery;
-        select(rows: string): void;
-        select(rows: Element): void;
-        select(rows: JQuery): void;
-        setDataSource(dataSource: kendo.data.DataSource): void;
-        setOptions(options: any): void;
-        showColumn(column: number): void;
-        showColumn(column: string): void;
-        showColumn(column: any): void;
-        unlockColumn(column: number): void;
-        unlockColumn(column: string): void;
-
-    }
-
-    interface GridAllowCopy {
-        delimeter?: string|any;
-    }
-
-    interface GridColumnMenuMessages {
-        columns?: string;
-        filter?: string;
-        sortAscending?: string;
-        sortDescending?: string;
-        settings?: string;
-        done?: string;
-        lock?: string;
-        unlock?: string;
-    }
-
-    interface GridColumnMenu {
-        columns?: boolean;
-        filterable?: boolean;
-        sortable?: boolean;
-        messages?: GridColumnMenuMessages;
-    }
-
-    interface GridColumnCommandItemText {
-        edit?: string;
-        cancel?: string;
-        update?: string;
-    }
-
-    interface GridColumnCommandItem {
-        name?: string;
-        text?: GridColumnCommandItemText;
-        className?: string;
-        imageClass?: string;
-        click?: Function;
-    }
-
-    interface GridColumnFilterableCell {
-        dataSource?: any|kendo.data.DataSource;
-        dataTextField?: string;
-        delay?: number;
-        inputWidth?: number;
-        suggestionOperator?: string;
-        minLength?: number;
-        enabled?: boolean;
-        operator?: string;
-        showOperators?: boolean;
-        template?: Function;
-    }
-
-    interface GridColumnFilterable {
-        cell?: GridColumnFilterableCell;
-        multi?: boolean;
-        dataSource?: any|any|kendo.data.DataSource;
-        checkAll?: boolean;
-        itemTemplate?: Function;
-        search?: boolean;
-        ignoreCase?: boolean;
-        ui?: string|Function;
-    }
-
-    interface GridColumnSortable {
-        compare?: Function;
-    }
-
-    interface GridColumn {
-        aggregates?: any;
-        attributes?: any;
-        columns?: any;
-        command?: GridColumnCommandItem[];
-        encoded?: boolean;
-        field?: string;
-        filterable?: GridColumnFilterable;
-        footerTemplate?: string|Function;
-        format?: string;
-        groupable?: boolean;
-        groupHeaderTemplate?: string|Function;
-        groupFooterTemplate?: string|Function;
-        headerAttributes?: any;
-        headerTemplate?: string|Function;
-        hidden?: boolean;
-        locked?: boolean;
-        lockable?: boolean;
-        minScreenWidth?: number;
-        sortable?: GridColumnSortable;
-        template?: string|Function;
-        title?: string;
-        width?: string|number;
-        values?: any;
-        menu?: boolean;
-    }
-
-    interface GridEditable {
-        confirmation?: boolean|string|Function;
-        cancelDelete?: string;
-        confirmDelete?: string;
-        createAt?: string;
-        destroy?: boolean;
-        mode?: string;
-        template?: string|Function;
-        update?: boolean;
-        window?: any;
-    }
-
-    interface GridExcel {
-        allPages?: boolean;
-        fileName?: string;
-        filterable?: boolean;
-        forceProxy?: boolean;
-        proxyURL?: string;
-    }
-
-    interface GridFilterableMessages {
-        and?: string;
-        clear?: string;
-        filter?: string;
-        info?: string;
-        isFalse?: string;
-        isTrue?: string;
-        or?: string;
-        selectValue?: string;
-        cancel?: string;
-        operator?: string;
-        value?: string;
-        checkAll?: string;
-    }
-
-    interface GridFilterableOperatorsDate {
-        eq?: string;
-        neq?: string;
-        isnull?: string;
-        isnotnull?: string;
-        gte?: string;
-        gt?: string;
-        lte?: string;
-        lt?: string;
-    }
-
-    interface GridFilterableOperatorsEnums {
-        eq?: string;
-        neq?: string;
-        isnull?: string;
-        isnotnull?: string;
-    }
-
-    interface GridFilterableOperatorsNumber {
-        eq?: string;
-        neq?: string;
-        isnull?: string;
-        isnotnull?: string;
-        gte?: string;
-        gt?: string;
-        lte?: string;
-        lt?: string;
-    }
-
-    interface GridFilterableOperatorsString {
-        eq?: string;
-        neq?: string;
-        isnull?: string;
-        isnotnull?: string;
-        isempty?: string;
-        isnotempty?: string;
-        startswith?: string;
-        contains?: string;
-        doesnotcontain?: string;
-        endswith?: string;
-    }
-
-    interface GridFilterableOperators {
-        string?: GridFilterableOperatorsString;
-        number?: GridFilterableOperatorsNumber;
-        date?: GridFilterableOperatorsDate;
-        enums?: GridFilterableOperatorsEnums;
-    }
-
-    interface GridFilterable {
-        extra?: boolean;
-        messages?: GridFilterableMessages;
-        operators?: GridFilterableOperators;
-        mode?: string;
-    }
-
-    interface GridGroupableMessages {
-        empty?: string;
-    }
-
-    interface GridGroupable {
-        enabled?: boolean;
-        showFooter?: boolean;
-        messages?: GridGroupableMessages;
-    }
-
-    interface GridMessagesCommands {
-        cancel?: string;
-        canceledit?: string;
-        create?: string;
-        destroy?: string;
-        edit?: string;
-        excel?: string;
-        save?: string;
-        update?: string;
-    }
-
-    interface GridMessages {
-        commands?: GridMessagesCommands;
-        noRecords?: string;
-    }
-
-    interface GridNoRecords {
-        template?: string|Function;
-    }
-
-    interface GridPageableMessages {
-        display?: string;
-        empty?: string;
-        page?: string;
-        of?: string;
-        itemsPerPage?: string;
-        first?: string;
-        last?: string;
-        next?: string;
-        previous?: string;
-        refresh?: string;
-        morePages?: string;
-    }
-
-    interface GridPageable {
-        pageSize?: number;
-        previousNext?: boolean;
-        numeric?: boolean;
-        buttonCount?: number;
-        input?: boolean;
-        pageSizes?: boolean|any;
-        refresh?: boolean;
-        info?: boolean;
-        messages?: GridPageableMessages;
-    }
-
-    interface GridPdfMargin {
-        bottom?: number|string;
-        left?: number|string;
-        right?: number|string;
-        top?: number|string;
-    }
-
-    interface GridPdf {
-        allPages?: boolean;
-        author?: string;
-        avoidLinks?: boolean|string;
-        creator?: string;
-        date?: Date;
-        fileName?: string;
-        forceProxy?: boolean;
-        keywords?: string;
-        landscape?: boolean;
-        margin?: GridPdfMargin;
-        paperSize?: string|any;
-        template?: string;
-        repeatHeaders?: boolean;
-        scale?: number|any|any;
-        proxyURL?: string;
-        proxyTarget?: string;
-        subject?: string;
-        title?: string;
-    }
-
-    interface GridScrollable {
-        virtual?: boolean;
-    }
-
-    interface GridSortable {
-        allowUnsort?: boolean;
-        mode?: string;
-    }
-
-    interface GridToolbarItem {
-        name?: string;
-        template?: string|Function;
-        text?: string;
-    }
-
-    interface GridOptions {
-        name?: string;
-        allowCopy?: GridAllowCopy;
-        altRowTemplate?: string|Function;
-        autoBind?: boolean;
-        columnResizeHandleWidth?: number;
-        columns?: GridColumn[];
-        columnMenu?: GridColumnMenu;
-        dataSource?: any|any|kendo.data.DataSource;
-        detailTemplate?: string|Function;
-        editable?: GridEditable;
-        excel?: GridExcel;
-        filterable?: GridFilterable;
-        groupable?: GridGroupable;
-        height?: number|string;
-        messages?: GridMessages;
-        mobile?: boolean|string;
-        navigatable?: boolean;
-        noRecords?: GridNoRecords;
-        pageable?: GridPageable;
-        pdf?: GridPdf;
-        reorderable?: boolean;
-        resizable?: boolean;
-        rowTemplate?: string|Function;
-        scrollable?: GridScrollable;
-        selectable?: boolean|string;
-        sortable?: GridSortable;
-        toolbar?: string | ((...args:any[]) => string) | GridToolbarItem[];
-        cancel?(e: GridCancelEvent): void;
-        change?(e: GridChangeEvent): void;
-        columnHide?(e: GridColumnHideEvent): void;
-        columnMenuInit?(e: GridColumnMenuInitEvent): void;
-        columnReorder?(e: GridColumnReorderEvent): void;
-        columnResize?(e: GridColumnResizeEvent): void;
-        columnShow?(e: GridColumnShowEvent): void;
-        dataBinding?(e: GridDataBindingEvent): void;
-        dataBound?(e: GridDataBoundEvent): void;
-        detailCollapse?(e: GridDetailCollapseEvent): void;
-        detailExpand?(e: GridDetailExpandEvent): void;
-        detailInit?(e: GridDetailInitEvent): void;
-        edit?(e: GridEditEvent): void;
-        excelExport?(e: GridExcelExportEvent): void;
-        pdfExport?(e: GridPdfExportEvent): void;
-        filterMenuInit?(e: GridFilterMenuInitEvent): void;
-        remove?(e: GridRemoveEvent): void;
-        save?(e: GridSaveEvent): void;
-        saveChanges?(e: GridSaveChangesEvent): void;
-        columnLock?(e: GridColumnLockEvent): void;
-        columnUnlock?(e: GridColumnUnlockEvent): void;
-        navigate?(e: GridNavigateEvent): void;
-    }
-    interface GridEvent {
-        sender: Grid;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface GridCancelEvent extends GridEvent {
-        container?: JQuery;
-        model?: kendo.data.Model;
-    }
-
-    interface GridChangeEvent extends GridEvent {
-    }
-
-    interface GridColumnHideEvent extends GridEvent {
-        column?: any;
-    }
-
-    interface GridColumnMenuInitEvent extends GridEvent {
-        container?: JQuery;
-        field?: string;
-    }
-
-    interface GridColumnReorderEvent extends GridEvent {
-        column?: any;
-        newIndex?: number;
-        oldIndex?: number;
-    }
-
-    interface GridColumnResizeEvent extends GridEvent {
-        column?: any;
-        newWidth?: number;
-        oldWidth?: number;
-    }
-
-    interface GridColumnShowEvent extends GridEvent {
-        column?: any;
-    }
-
-    interface GridDataBindingEvent extends GridEvent {
-        action?: string;
-        index?: number;
-        items?: any;
-    }
-
-    interface GridDataBoundEvent extends GridEvent {
-    }
-
-    interface GridDetailCollapseEvent extends GridEvent {
-        detailRow?: JQuery;
-        masterRow?: JQuery;
-    }
-
-    interface GridDetailExpandEvent extends GridEvent {
-        detailRow?: JQuery;
-        masterRow?: JQuery;
-    }
-
-    interface GridDetailInitEvent extends GridEvent {
-        data?: kendo.data.ObservableObject;
-        detailCell?: JQuery;
-        detailRow?: JQuery;
-        masterRow?: JQuery;
-    }
-
-    interface GridEditEvent extends GridEvent {
-        container?: JQuery;
-        model?: kendo.data.Model;
-    }
-
-    interface GridExcelExportEvent extends GridEvent {
-        data?: any;
-        workbook?: kendo.ooxml.Workbook;
-    }
-
-    interface GridPdfExportEvent extends GridEvent {
-        promise?: JQueryPromise<any>;
-    }
-
-    interface GridFilterMenuInitEvent extends GridEvent {
-        container?: JQuery;
-        field?: string;
-    }
-
-    interface GridRemoveEvent extends GridEvent {
-        model?: kendo.data.Model;
-        row?: JQuery;
-    }
-
-    interface GridSaveEvent extends GridEvent {
-        model?: kendo.data.Model;
-        container?: JQuery;
-        values?: any;
-    }
-
-    interface GridSaveChangesEvent extends GridEvent {
-    }
-
-    interface GridColumnLockEvent extends GridEvent {
-        column?: any;
-    }
-
-    interface GridColumnUnlockEvent extends GridEvent {
-        column?: any;
-    }
-
-    interface GridNavigateEvent extends GridEvent {
-        element?: JQuery;
-    }
-
-
-    class ListView extends kendo.ui.Widget {
-
-        static fn: ListView;
-
-        options: ListViewOptions;
-
-        dataSource: kendo.data.DataSource;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): ListView;
-
-        constructor(element: Element, options?: ListViewOptions);
-
-
-        add(): void;
-        cancel(): void;
-        clearSelection(): void;
-        dataItem(row: string): kendo.data.ObservableObject;
-        dataItem(row: Element): kendo.data.ObservableObject;
-        dataItem(row: JQuery): kendo.data.ObservableObject;
-        dataItems(): void;
-        destroy(): void;
-        edit(item: JQuery): void;
-        items(): any;
-        refresh(): void;
-        remove(item: any): void;
-        save(): void;
-        select(): JQuery;
-        select(items: JQuery): void;
-        select(items: any): void;
-        setDataSource(dataSource: kendo.data.DataSource): void;
-
-    }
-
-    interface ListViewOptions {
-        name?: string;
-        autoBind?: boolean;
-        dataSource?: any|any|kendo.data.DataSource;
-        editTemplate?: Function;
-        navigatable?: boolean;
-        selectable?: boolean|string;
-        template?: Function;
-        altTemplate?: Function;
-        cancel?(e: ListViewCancelEvent): void;
-        change?(e: ListViewEvent): void;
-        dataBound?(e: ListViewEvent): void;
-        dataBinding?(e: ListViewEvent): void;
-        edit?(e: ListViewEditEvent): void;
-        remove?(e: ListViewRemoveEvent): void;
-        save?(e: ListViewSaveEvent): void;
-    }
-    interface ListViewEvent {
-        sender: ListView;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface ListViewCancelEvent extends ListViewEvent {
-        container?: JQuery;
-        model?: kendo.data.Model;
-    }
-
-    interface ListViewEditEvent extends ListViewEvent {
-        item?: JQuery;
-        model?: kendo.data.Model;
-    }
-
-    interface ListViewRemoveEvent extends ListViewEvent {
-        item?: JQuery;
-        model?: kendo.data.Model;
-    }
-
-    interface ListViewSaveEvent extends ListViewEvent {
-        model?: kendo.data.Model;
-        item?: JQuery;
-    }
-
-
-    class MaskedTextBox extends kendo.ui.Widget {
-
-        static fn: MaskedTextBox;
-
-        options: MaskedTextBoxOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): MaskedTextBox;
-
-        constructor(element: Element, options?: MaskedTextBoxOptions);
-
-
-        destroy(): void;
-        enable(enable: boolean): void;
-        readonly(readonly: boolean): void;
-        raw(): string;
-        value(): string;
-        value(value: string): void;
-
-    }
-
-    interface MaskedTextBoxOptions {
-        name?: string;
-        clearPromptChar?: boolean;
-        culture?: string;
-        mask?: string;
-        promptChar?: string;
-        rules?: any;
-        unmaskOnPost?: boolean;
-        value?: string;
-        change?(e: MaskedTextBoxChangeEvent): void;
-    }
-    interface MaskedTextBoxEvent {
-        sender: MaskedTextBox;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface MaskedTextBoxChangeEvent extends MaskedTextBoxEvent {
-    }
-
-
-    class Menu extends kendo.ui.Widget {
-
-        static fn: Menu;
-
-        options: MenuOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Menu;
-
-        constructor(element: Element, options?: MenuOptions);
-
-
-        append(item: any, referenceItem: string): kendo.ui.Menu;
-        append(item: any, referenceItem: JQuery): kendo.ui.Menu;
-        close(element: string): kendo.ui.Menu;
-        close(element: Element): kendo.ui.Menu;
-        close(element: JQuery): kendo.ui.Menu;
-        destroy(): void;
-        enable(element: string, enable: boolean): kendo.ui.Menu;
-        enable(element: Element, enable: boolean): kendo.ui.Menu;
-        enable(element: JQuery, enable: boolean): kendo.ui.Menu;
-        insertAfter(item: any, referenceItem: string): kendo.ui.Menu;
-        insertAfter(item: any, referenceItem: Element): kendo.ui.Menu;
-        insertAfter(item: any, referenceItem: JQuery): kendo.ui.Menu;
-        insertBefore(item: any, referenceItem: string): kendo.ui.Menu;
-        insertBefore(item: any, referenceItem: Element): kendo.ui.Menu;
-        insertBefore(item: any, referenceItem: JQuery): kendo.ui.Menu;
-        open(element: string): kendo.ui.Menu;
-        open(element: Element): kendo.ui.Menu;
-        open(element: JQuery): kendo.ui.Menu;
-        remove(element: string): kendo.ui.Menu;
-        remove(element: Element): kendo.ui.Menu;
-        remove(element: JQuery): kendo.ui.Menu;
-
-    }
-
-    interface MenuAnimationClose {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface MenuAnimationOpen {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface MenuAnimation {
-        close?: MenuAnimationClose;
-        open?: MenuAnimationOpen;
-    }
-
-    interface MenuOptions {
-        name?: string;
-        animation?: MenuAnimation;
-        closeOnClick?: boolean;
-        dataSource?: any|any;
-        direction?: string;
-        hoverDelay?: number;
-        openOnClick?: boolean;
-        orientation?: string;
-        popupCollision?: string;
-        close?(e: MenuCloseEvent): void;
-        open?(e: MenuOpenEvent): void;
-        activate?(e: MenuActivateEvent): void;
-        deactivate?(e: MenuDeactivateEvent): void;
-        select?(e: MenuSelectEvent): void;
-    }
-    interface MenuEvent {
-        sender: Menu;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface MenuCloseEvent extends MenuEvent {
-        item?: HTMLElement;
-    }
-
-    interface MenuOpenEvent extends MenuEvent {
-        item?: HTMLElement;
-    }
-
-    interface MenuActivateEvent extends MenuEvent {
-        item?: HTMLElement;
-    }
-
-    interface MenuDeactivateEvent extends MenuEvent {
-        item?: HTMLElement;
-    }
-
-    interface MenuSelectEvent extends MenuEvent {
-        item?: HTMLElement;
-    }
-
-
-    class MultiSelect extends kendo.ui.Widget {
-
-        static fn: MultiSelect;
-
-        options: MultiSelectOptions;
-
-        dataSource: kendo.data.DataSource;
-        input: JQuery;
-        list: JQuery;
-        ul: JQuery;
-        tagList: JQuery;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): MultiSelect;
-
-        constructor(element: Element, options?: MultiSelectOptions);
-
-
-        close(): void;
-        dataItems(): any;
-        destroy(): void;
-        enable(enable: boolean): void;
-        focus(): void;
-        items(): any;
-        open(): void;
-        readonly(readonly: boolean): void;
-        refresh(): void;
-        search(word: string): void;
-        setDataSource(dataSource: kendo.data.DataSource): void;
-        toggle(toggle: boolean): void;
-        value(): any;
-        value(value: any): void;
-        value(value: string): void;
-
-    }
-
-    interface MultiSelectAnimationClose {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface MultiSelectAnimationOpen {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface MultiSelectAnimation {
-        close?: MultiSelectAnimationClose;
-        open?: MultiSelectAnimationOpen;
-    }
-
-    interface MultiSelectPopup {
-        appendTo?: string;
-        origin?: string;
-        position?: string;
-    }
-
-    interface MultiSelectVirtual {
-        itemHeight?: number;
-        valueMapper?: Function;
-    }
-
-    interface MultiSelectOptions {
-        name?: string;
-        animation?: MultiSelectAnimation;
-        autoBind?: boolean;
-        autoClose?: boolean;
-        dataSource?: any|any|kendo.data.DataSource;
-        dataTextField?: string;
-        dataValueField?: string;
-        delay?: number;
-        enable?: boolean;
-        filter?: string;
-        fixedGroupTemplate?: string|Function;
-        groupTemplate?: string|Function;
-        height?: number;
-        highlightFirst?: boolean;
-        ignoreCase?: boolean;
-        minLength?: number;
-        maxSelectedItems?: number;
-        placeholder?: string;
-        popup?: MultiSelectPopup;
-        headerTemplate?: string|Function;
-        itemTemplate?: string|Function;
-        tagTemplate?: string;
-        tagMode?: string;
-        value?: any;
-        valuePrimitive?: boolean;
-        virtual?: MultiSelectVirtual;
-        change?(e: MultiSelectChangeEvent): void;
-        close?(e: MultiSelectCloseEvent): void;
-        dataBound?(e: MultiSelectDataBoundEvent): void;
-        filtering?(e: MultiSelectFilteringEvent): void;
-        open?(e: MultiSelectOpenEvent): void;
-        select?(e: MultiSelectSelectEvent): void;
-    }
-    interface MultiSelectEvent {
-        sender: MultiSelect;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface MultiSelectChangeEvent extends MultiSelectEvent {
-    }
-
-    interface MultiSelectCloseEvent extends MultiSelectEvent {
-    }
-
-    interface MultiSelectDataBoundEvent extends MultiSelectEvent {
-    }
-
-    interface MultiSelectFilteringEvent extends MultiSelectEvent {
-        filter?: any;
-    }
-
-    interface MultiSelectOpenEvent extends MultiSelectEvent {
-    }
-
-    interface MultiSelectSelectEvent extends MultiSelectEvent {
-        item?: JQuery;
-    }
-
-
-    class Notification extends kendo.ui.Widget {
-
-        static fn: Notification;
-
-        options: NotificationOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Notification;
-
-        constructor(element: Element, options?: NotificationOptions);
-
-
-        error(data: any): void;
-        error(data: string): void;
-        error(data: Function): void;
-        getNotifications(): JQuery;
-        hide(): void;
-        info(data: any): void;
-        info(data: string): void;
-        info(data: Function): void;
-        show(data: any, type: string): void;
-        show(data: string, type: string): void;
-        show(data: Function, type: string): void;
-        showText(data: any, type: string): void;
-        showText(data: string, type: string): void;
-        showText(data: Function, type: string): void;
-        success(data: any): void;
-        success(data: string): void;
-        success(data: Function): void;
-        warning(data: any): void;
-        warning(data: string): void;
-        warning(data: Function): void;
-
-    }
-
-    interface NotificationPosition {
-        bottom?: number;
-        left?: number;
-        pinned?: boolean;
-        right?: number;
-        top?: number;
-    }
-
-    interface NotificationTemplate {
-        type?: string;
-        template?: string;
-    }
-
-    interface NotificationOptions {
-        name?: string;
-        allowHideAfter?: number;
-        animation?: any|boolean;
-        appendTo?: string|JQuery;
-        autoHideAfter?: number;
-        button?: boolean;
-        height?: number|string;
-        hideOnClick?: boolean;
-        position?: NotificationPosition;
-        stacking?: string;
-        templates?: NotificationTemplate[];
-        width?: number|string;
-        hide?(e: NotificationHideEvent): void;
-        show?(e: NotificationShowEvent): void;
-    }
-    interface NotificationEvent {
-        sender: Notification;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface NotificationHideEvent extends NotificationEvent {
-        element?: JQuery;
-    }
-
-    interface NotificationShowEvent extends NotificationEvent {
-        element?: JQuery;
-    }
-
-
-    class NumericTextBox extends kendo.ui.Widget {
-
-        static fn: NumericTextBox;
-
-        options: NumericTextBoxOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): NumericTextBox;
-
-        constructor(element: Element, options?: NumericTextBoxOptions);
-
-
-        destroy(): void;
-        enable(enable: boolean): void;
-        readonly(readonly: boolean): void;
-        focus(): void;
-        max(): number;
-        max(value: number): void;
-        max(value: string): void;
-        min(): number;
-        min(value: number): void;
-        min(value: string): void;
-        step(): number;
-        step(value: number): void;
-        step(value: string): void;
-        value(): number;
-        value(value: number): void;
-        value(value: string): void;
-
-    }
-
-    interface NumericTextBoxOptions {
-        name?: string;
-        culture?: string;
-        decimals?: number;
-        downArrowText?: string;
-        format?: string;
-        max?: number;
-        min?: number;
-        placeholder?: string;
-        spinners?: boolean;
-        step?: number;
-        upArrowText?: string;
-        value?: number;
-        change?(e: NumericTextBoxChangeEvent): void;
-        spin?(e: NumericTextBoxSpinEvent): void;
-    }
-    interface NumericTextBoxEvent {
-        sender: NumericTextBox;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface NumericTextBoxChangeEvent extends NumericTextBoxEvent {
-    }
-
-    interface NumericTextBoxSpinEvent extends NumericTextBoxEvent {
-    }
-
-
-    class Pager extends kendo.ui.Widget {
-
-        static fn: Pager;
-
-        options: PagerOptions;
-
-        dataSource: kendo.data.DataSource;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Pager;
-
-        constructor(element: Element, options?: PagerOptions);
-
-
-        totalPages(): number;
-        pageSize(): number;
-        page(): number;
-        page(page: number): void;
-        refresh(): void;
-        destroy(): void;
-
-    }
-
-    interface PagerMessages {
-        display?: string;
-        empty?: string;
-        allPages?: string;
-        page?: string;
-        of?: string;
-        itemsPerPage?: string;
-        first?: string;
-        previous?: string;
-        next?: string;
-        last?: string;
-        refresh?: string;
-    }
-
-    interface PagerOptions {
-        name?: string;
-        autoBind?: boolean;
-        buttonCount?: number;
-        dataSource?: any|kendo.data.DataSource;
-        selectTemplate?: string;
-        linkTemplate?: string;
-        info?: boolean;
-        input?: boolean;
-        numeric?: boolean;
-        pageSizes?: boolean|any;
-        previousNext?: boolean;
-        refresh?: boolean;
-        messages?: PagerMessages;
-        change?(e: PagerChangeEvent): void;
-    }
-    interface PagerEvent {
-        sender: Pager;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface PagerChangeEvent extends PagerEvent {
-    }
-
-
-    class PanelBar extends kendo.ui.Widget {
-
-        static fn: PanelBar;
-
-        options: PanelBarOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): PanelBar;
-
-        constructor(element: Element, options?: PanelBarOptions);
-
-
-        append(item: string, referenceItem: string): kendo.ui.PanelBar;
-        append(item: string, referenceItem: Element): kendo.ui.PanelBar;
-        append(item: string, referenceItem: JQuery): kendo.ui.PanelBar;
-        append(item: Element, referenceItem: string): kendo.ui.PanelBar;
-        append(item: Element, referenceItem: Element): kendo.ui.PanelBar;
-        append(item: Element, referenceItem: JQuery): kendo.ui.PanelBar;
-        append(item: JQuery, referenceItem: string): kendo.ui.PanelBar;
-        append(item: JQuery, referenceItem: Element): kendo.ui.PanelBar;
-        append(item: JQuery, referenceItem: JQuery): kendo.ui.PanelBar;
-        append(item: any, referenceItem: string): kendo.ui.PanelBar;
-        append(item: any, referenceItem: Element): kendo.ui.PanelBar;
-        append(item: any, referenceItem: JQuery): kendo.ui.PanelBar;
-        clearSelection(): void;
-        collapse(element: string, useAnimation: boolean): kendo.ui.PanelBar;
-        collapse(element: Element, useAnimation: boolean): kendo.ui.PanelBar;
-        collapse(element: JQuery, useAnimation: boolean): kendo.ui.PanelBar;
-        destroy(): void;
-        enable(element: string, enable: boolean): void;
-        enable(element: Element, enable: boolean): void;
-        enable(element: JQuery, enable: boolean): void;
-        expand(element: string, useAnimation: boolean): kendo.ui.PanelBar;
-        expand(element: Element, useAnimation: boolean): kendo.ui.PanelBar;
-        expand(element: JQuery, useAnimation: boolean): kendo.ui.PanelBar;
-        insertAfter(item: string, referenceItem: string): void;
-        insertAfter(item: string, referenceItem: Element): void;
-        insertAfter(item: string, referenceItem: JQuery): void;
-        insertAfter(item: Element, referenceItem: string): void;
-        insertAfter(item: Element, referenceItem: Element): void;
-        insertAfter(item: Element, referenceItem: JQuery): void;
-        insertAfter(item: JQuery, referenceItem: string): void;
-        insertAfter(item: JQuery, referenceItem: Element): void;
-        insertAfter(item: JQuery, referenceItem: JQuery): void;
-        insertAfter(item: any, referenceItem: string): void;
-        insertAfter(item: any, referenceItem: Element): void;
-        insertAfter(item: any, referenceItem: JQuery): void;
-        insertBefore(item: string, referenceItem: string): kendo.ui.PanelBar;
-        insertBefore(item: string, referenceItem: Element): kendo.ui.PanelBar;
-        insertBefore(item: string, referenceItem: JQuery): kendo.ui.PanelBar;
-        insertBefore(item: Element, referenceItem: string): kendo.ui.PanelBar;
-        insertBefore(item: Element, referenceItem: Element): kendo.ui.PanelBar;
-        insertBefore(item: Element, referenceItem: JQuery): kendo.ui.PanelBar;
-        insertBefore(item: JQuery, referenceItem: string): kendo.ui.PanelBar;
-        insertBefore(item: JQuery, referenceItem: Element): kendo.ui.PanelBar;
-        insertBefore(item: JQuery, referenceItem: JQuery): kendo.ui.PanelBar;
-        insertBefore(item: any, referenceItem: string): kendo.ui.PanelBar;
-        insertBefore(item: any, referenceItem: Element): kendo.ui.PanelBar;
-        insertBefore(item: any, referenceItem: JQuery): kendo.ui.PanelBar;
-        reload(element: string): void;
-        reload(element: Element): void;
-        reload(element: JQuery): void;
-        remove(element: string): void;
-        remove(element: Element): void;
-        remove(element: JQuery): void;
-        select(): JQuery;
-        select(element?: string): void;
-        select(element?: Element): void;
-        select(element?: JQuery): void;
-
-    }
-
-    interface PanelBarAnimationCollapse {
-        duration?: number;
-        effects?: string;
-    }
-
-    interface PanelBarAnimationExpand {
-        duration?: number;
-        effects?: string;
-    }
-
-    interface PanelBarAnimation {
-        collapse?: PanelBarAnimationCollapse;
-        expand?: PanelBarAnimationExpand;
-    }
-
-    interface PanelBarOptions {
-        name?: string;
-        animation?: PanelBarAnimation;
-        contentUrls?: any;
-        dataSource?: any|any;
-        expandMode?: string;
-        activate?(e: PanelBarActivateEvent): void;
-        collapse?(e: PanelBarCollapseEvent): void;
-        contentLoad?(e: PanelBarContentLoadEvent): void;
-        error?(e: PanelBarErrorEvent): void;
-        expand?(e: PanelBarExpandEvent): void;
-        select?(e: PanelBarSelectEvent): void;
-    }
-    interface PanelBarEvent {
-        sender: PanelBar;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface PanelBarActivateEvent extends PanelBarEvent {
-        item?: Element;
-    }
-
-    interface PanelBarCollapseEvent extends PanelBarEvent {
-        item?: Element;
-    }
-
-    interface PanelBarContentLoadEvent extends PanelBarEvent {
-        item?: Element;
-        contentElement?: Element;
-    }
-
-    interface PanelBarErrorEvent extends PanelBarEvent {
-        xhr?: JQueryXHR;
-        status?: string;
-    }
-
-    interface PanelBarExpandEvent extends PanelBarEvent {
-        item?: Element;
-    }
-
-    interface PanelBarSelectEvent extends PanelBarEvent {
-        item?: Element;
-    }
-
-
-    class PivotConfigurator extends kendo.ui.Widget {
-
-        static fn: PivotConfigurator;
-
-        options: PivotConfiguratorOptions;
-
-        dataSource: kendo.data.DataSource;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): PivotConfigurator;
-
-        constructor(element: Element, options?: PivotConfiguratorOptions);
-
-
-        destroy(): void;
-        refresh(): void;
-        setDataSource(dataSource: kendo.data.PivotDataSource): void;
-
-    }
-
-    interface PivotConfiguratorMessagesFieldMenuOperators {
-        contains?: string;
-        doesnotcontain?: string;
-        startswith?: string;
-        endswith?: string;
-        eq?: string;
-        neq?: string;
-    }
-
-    interface PivotConfiguratorMessagesFieldMenu {
-        info?: string;
-        sortAscending?: string;
-        sortDescending?: string;
-        filterFields?: string;
-        filter?: string;
-        include?: string;
-        title?: string;
-        clear?: string;
-        ok?: string;
-        cancel?: string;
-        operators?: PivotConfiguratorMessagesFieldMenuOperators;
-    }
-
-    interface PivotConfiguratorMessages {
-        measures?: string;
-        columns?: string;
-        rows?: string;
-        measuresLabel?: string;
-        rowsLabel?: string;
-        columnsLabel?: string;
-        fieldsLabel?: string;
-        fieldMenu?: PivotConfiguratorMessagesFieldMenu;
-    }
-
-    interface PivotConfiguratorSortable {
-        allowUnsort?: boolean;
-    }
-
-    interface PivotConfiguratorOptions {
-        name?: string;
-        dataSource?: any|kendo.data.PivotDataSource;
-        filterable?: boolean;
-        sortable?: PivotConfiguratorSortable;
-        height?: number|string;
-        messages?: PivotConfiguratorMessages;
-    }
-    interface PivotConfiguratorEvent {
-        sender: PivotConfigurator;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class PivotGrid extends kendo.ui.Widget {
-
-        static fn: PivotGrid;
-
-        options: PivotGridOptions;
-
-        dataSource: kendo.data.DataSource;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): PivotGrid;
-
-        constructor(element: Element, options?: PivotGridOptions);
-
-
-        cellInfo(columnIndex: number, rowIndex: number): any;
-        cellInfoByElement(cell: string): any;
-        cellInfoByElement(cell: Element): any;
-        cellInfoByElement(cell: JQuery): any;
-        destroy(): void;
-        refresh(): void;
-        setDataSource(dataSource: kendo.data.PivotDataSource): void;
-        saveAsExcel(): void;
-        saveAsPDF(): JQueryPromise<any>;
-
-    }
-
-    interface PivotGridExcel {
-        fileName?: string;
-        filterable?: boolean;
-        forceProxy?: boolean;
-        proxyURL?: string;
-    }
-
-    interface PivotGridMessagesFieldMenuOperators {
-        contains?: string;
-        doesnotcontain?: string;
-        startswith?: string;
-        endswith?: string;
-        eq?: string;
-        neq?: string;
-    }
-
-    interface PivotGridMessagesFieldMenu {
-        info?: string;
-        sortAscending?: string;
-        sortDescending?: string;
-        filterFields?: string;
-        filter?: string;
-        include?: string;
-        title?: string;
-        clear?: string;
-        ok?: string;
-        cancel?: string;
-        operators?: PivotGridMessagesFieldMenuOperators;
-    }
-
-    interface PivotGridMessages {
-        measureFields?: string;
-        columnFields?: string;
-        rowFields?: string;
-        fieldMenu?: PivotGridMessagesFieldMenu;
-    }
-
-    interface PivotGridPdfMargin {
-        bottom?: number|string;
-        left?: number|string;
-        right?: number|string;
-        top?: number|string;
-    }
-
-    interface PivotGridPdf {
-        author?: string;
-        avoidLinks?: boolean|string;
-        creator?: string;
-        date?: Date;
-        fileName?: string;
-        forceProxy?: boolean;
-        keywords?: string;
-        landscape?: boolean;
-        margin?: PivotGridPdfMargin;
-        paperSize?: string|any;
-        proxyURL?: string;
-        proxyTarget?: string;
-        subject?: string;
-        title?: string;
-    }
-
-    interface PivotGridSortable {
-        allowUnsort?: boolean;
-    }
-
-    interface PivotGridOptions {
-        name?: string;
-        dataSource?: any|kendo.data.PivotDataSource;
-        autoBind?: boolean;
-        reorderable?: boolean;
-        excel?: PivotGridExcel;
-        pdf?: PivotGridPdf;
-        filterable?: boolean;
-        sortable?: PivotGridSortable;
-        columnWidth?: number;
-        height?: number|string;
-        columnHeaderTemplate?: string|Function;
-        dataCellTemplate?: string|Function;
-        kpiStatusTemplate?: string|Function;
-        kpiTrendTemplate?: string|Function;
-        rowHeaderTemplate?: string|Function;
-        messages?: PivotGridMessages;
-        dataBinding?(e: PivotGridDataBindingEvent): void;
-        dataBound?(e: PivotGridDataBoundEvent): void;
-        expandMember?(e: PivotGridExpandMemberEvent): void;
-        collapseMember?(e: PivotGridCollapseMemberEvent): void;
-        excelExport?(e: PivotGridExcelExportEvent): void;
-        pdfExport?(e: PivotGridPdfExportEvent): void;
-    }
-    interface PivotGridEvent {
-        sender: PivotGrid;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface PivotGridDataBindingEvent extends PivotGridEvent {
-    }
-
-    interface PivotGridDataBoundEvent extends PivotGridEvent {
-    }
-
-    interface PivotGridExpandMemberEvent extends PivotGridEvent {
-        axis?: string;
-        path?: string;
-    }
-
-    interface PivotGridCollapseMemberEvent extends PivotGridEvent {
-        axis?: string;
-        path?: string;
-    }
-
-    interface PivotGridExcelExportEvent extends PivotGridEvent {
-        data?: any;
-        workbook?: any;
-    }
-
-    interface PivotGridPdfExportEvent extends PivotGridEvent {
-        promise?: JQueryPromise<any>;
-    }
-
-
-    class Popup extends kendo.ui.Widget {
-
-        static fn: Popup;
-
-        options: PopupOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Popup;
-
-        constructor(element: Element, options?: PopupOptions);
-
-
-        close(): void;
-        open(): void;
-        position(): void;
-        setOptions(options: any): void;
-        visible(): boolean;
-
-    }
-
-    interface PopupAnimationClose {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface PopupAnimationOpen {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface PopupAnimation {
-        close?: PopupAnimationClose;
-        open?: PopupAnimationOpen;
-    }
-
-    interface PopupOptions {
-        name?: string;
-        animation?: PopupAnimation;
-        anchor?: string|JQuery;
-        appendTo?: string|JQuery;
-        origin?: string;
-        position?: string;
-        activate?(e: PopupActivateEvent): void;
-        close?(e: PopupCloseEvent): void;
-        deactivate?(e: PopupDeactivateEvent): void;
-        open?(e: PopupOpenEvent): void;
-    }
-    interface PopupEvent {
-        sender: Popup;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface PopupActivateEvent extends PopupEvent {
-    }
-
-    interface PopupCloseEvent extends PopupEvent {
-    }
-
-    interface PopupDeactivateEvent extends PopupEvent {
-    }
-
-    interface PopupOpenEvent extends PopupEvent {
-    }
-
-
-    class ProgressBar extends kendo.ui.Widget {
-
-        static fn: ProgressBar;
-
-        options: ProgressBarOptions;
-
-        progressStatus: JQuery;
-        progressWrapper: JQuery;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): ProgressBar;
-
-        constructor(element: Element, options?: ProgressBarOptions);
-
-
-        enable(enable: boolean): void;
-        value(): number;
-        value(value: number): void;
-
-    }
-
-    interface ProgressBarAnimation {
-        duration?: number;
-    }
-
-    interface ProgressBarOptions {
-        name?: string;
-        animation?: ProgressBarAnimation;
-        chunkCount?: number;
-        enable?: boolean;
-        max?: number;
-        min?: number;
-        orientation?: string;
-        reverse?: boolean;
-        showStatus?: boolean;
-        type?: string;
-        value?: number;
-        change?(e: ProgressBarChangeEvent): void;
-        complete?(e: ProgressBarCompleteEvent): void;
-    }
-    interface ProgressBarEvent {
-        sender: ProgressBar;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface ProgressBarChangeEvent extends ProgressBarEvent {
-        value?: number;
-    }
-
-    interface ProgressBarCompleteEvent extends ProgressBarEvent {
-        value?: number;
-    }
-
-
-    class RangeSlider extends kendo.ui.Widget {
-
-        static fn: RangeSlider;
-
-        options: RangeSliderOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): RangeSlider;
-
-        constructor(element: Element, options?: RangeSliderOptions);
-
-
-        destroy(): void;
-        enable(enable: boolean): void;
-        value(): any;
-        value(selectionStart: number, selectionEnd: number): void;
-        resize(): void;
-
-    }
-
-    interface RangeSliderTooltip {
-        enabled?: boolean;
-        format?: string;
-        template?: string;
-    }
-
-    interface RangeSliderOptions {
-        name?: string;
-        largeStep?: number;
-        max?: number;
-        min?: number;
-        orientation?: string;
-        selectionEnd?: number;
-        selectionStart?: number;
-        smallStep?: number;
-        tickPlacement?: string;
-        tooltip?: RangeSliderTooltip;
-        change?(e: RangeSliderChangeEvent): void;
-        slide?(e: RangeSliderSlideEvent): void;
-    }
-    interface RangeSliderEvent {
-        sender: RangeSlider;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface RangeSliderChangeEvent extends RangeSliderEvent {
-        value?: any;
-    }
-
-    interface RangeSliderSlideEvent extends RangeSliderEvent {
-        value?: any;
-    }
-
-
-    class ResponsivePanel extends kendo.ui.Widget {
-
-        static fn: ResponsivePanel;
-
-        options: ResponsivePanelOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): ResponsivePanel;
-
-        constructor(element: Element, options?: ResponsivePanelOptions);
-
-
-        close(): void;
-        destroy(): void;
-        open(): void;
-
-    }
-
-    interface ResponsivePanelOptions {
-        name?: string;
-        autoClose?: boolean;
-        breakpoint?: number;
-        orientation?: string;
-        toggleButton?: string;
-        close?(e: ResponsivePanelEvent): void;
-        open?(e: ResponsivePanelEvent): void;
-    }
-    interface ResponsivePanelEvent {
-        sender: ResponsivePanel;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Scheduler extends kendo.ui.Widget {
-
-        static fn: Scheduler;
-
-        options: SchedulerOptions;
-
-        dataSource: kendo.data.DataSource;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Scheduler;
-
-        constructor(element: Element, options?: SchedulerOptions);
-
-
-        addEvent(data: any): void;
-        cancelEvent(): void;
-        data(): void;
-        date(): Date;
-        date(value?: Date): void;
-        destroy(): void;
-        editEvent(event: string): void;
-        editEvent(event: kendo.data.SchedulerEvent): void;
-        items(): any;
-        occurrenceByUid(uid: string): kendo.data.SchedulerEvent;
-        occurrencesInRange(start: Date, end: Date): any;
-        refresh(): void;
-        removeEvent(event: string): void;
-        removeEvent(event: kendo.data.SchedulerEvent): void;
-        resourcesBySlot(slot: any): any;
-        saveAsPDF(): JQueryPromise<any>;
-        saveEvent(): void;
-        select(): void;
-        select(events: any, options: any): void;
-        setDataSource(dataSource: kendo.data.SchedulerDataSource): void;
-        slotByPosition(xPosition: number, yPosition: number): any;
-        slotByElement(element: Element): any;
-        slotByElement(element: JQuery): any;
-        view(): kendo.ui.SchedulerView;
-        view(type?: string): void;
-        viewName(): string;
-
-    }
-
-    interface SchedulerCurrentTimeMarker {
-        updateInterval?: number;
-        useLocalTimezone?: boolean;
-    }
-
-    interface SchedulerEditable {
-        confirmation?: boolean|string;
-        create?: boolean;
-        destroy?: boolean;
-        editRecurringMode?: string;
-        move?: boolean;
-        resize?: boolean;
-        template?: string|Function;
-        update?: boolean;
-        window?: any;
-    }
-
-    interface SchedulerFooter {
-        command?: string|boolean;
-    }
-
-    interface SchedulerGroup {
-        resources?: any;
-        orientation?: string;
-    }
-
-    interface SchedulerMessagesEditable {
-        confirmation?: string;
-    }
-
-    interface SchedulerMessagesEditor {
-        allDayEvent?: string;
-        description?: string;
-        editorTitle?: string;
-        end?: string;
-        endTimezone?: string;
-        repeat?: string;
-        separateTimezones?: string;
-        start?: string;
-        startTimezone?: string;
-        timezone?: string;
-        timezoneEditorButton?: string;
-        timezoneEditorTitle?: string;
-        title?: string;
-    }
-
-    interface SchedulerMessagesRecurrenceEditorDaily {
-        interval?: string;
-        repeatEvery?: string;
-    }
-
-    interface SchedulerMessagesRecurrenceEditorEnd {
-        after?: string;
-        occurrence?: string;
-        label?: string;
-        never?: string;
-        mobileLabel?: string;
-        on?: string;
-    }
-
-    interface SchedulerMessagesRecurrenceEditorFrequencies {
-        daily?: string;
-        monthly?: string;
-        never?: string;
-        weekly?: string;
-        yearly?: string;
-    }
-
-    interface SchedulerMessagesRecurrenceEditorMonthly {
-        day?: string;
-        interval?: string;
-        repeatEvery?: string;
-        repeatOn?: string;
-    }
-
-    interface SchedulerMessagesRecurrenceEditorOffsetPositions {
-        first?: string;
-        second?: string;
-        third?: string;
-        fourth?: string;
-        last?: string;
-    }
-
-    interface SchedulerMessagesRecurrenceEditorWeekdays {
-        day?: string;
-        weekday?: string;
-        weekend?: string;
-    }
-
-    interface SchedulerMessagesRecurrenceEditorWeekly {
-        interval?: string;
-        repeatEvery?: string;
-        repeatOn?: string;
-    }
-
-    interface SchedulerMessagesRecurrenceEditorYearly {
-        of?: string;
-        repeatEvery?: string;
-        repeatOn?: string;
-        interval?: string;
-    }
-
-    interface SchedulerMessagesRecurrenceEditor {
-        daily?: SchedulerMessagesRecurrenceEditorDaily;
-        end?: SchedulerMessagesRecurrenceEditorEnd;
-        frequencies?: SchedulerMessagesRecurrenceEditorFrequencies;
-        monthly?: SchedulerMessagesRecurrenceEditorMonthly;
-        offsetPositions?: SchedulerMessagesRecurrenceEditorOffsetPositions;
-        weekly?: SchedulerMessagesRecurrenceEditorWeekly;
-        weekdays?: SchedulerMessagesRecurrenceEditorWeekdays;
-        yearly?: SchedulerMessagesRecurrenceEditorYearly;
-    }
-
-    interface SchedulerMessagesRecurrenceMessages {
-        deleteRecurring?: string;
-        deleteWindowOccurrence?: string;
-        deleteWindowSeries?: string;
-        deleteWindowTitle?: string;
-        editRecurring?: string;
-        editWindowOccurrence?: string;
-        editWindowSeries?: string;
-        editWindowTitle?: string;
-    }
-
-    interface SchedulerMessagesViews {
-        day?: string;
-        week?: string;
-        month?: string;
-        agenda?: string;
-    }
-
-    interface SchedulerMessages {
-        allDay?: string;
-        ariaEventLabel?: string;
-        ariaSlotLabel?: string;
-        cancel?: string;
-        date?: string;
-        deleteWindowTitle?: string;
-        destroy?: string;
-        event?: string;
-        defaultRowText?: string;
-        pdf?: string;
-        save?: string;
-        showFullDay?: string;
-        showWorkDay?: string;
-        time?: string;
-        today?: string;
-        editable?: SchedulerMessagesEditable;
-        editor?: SchedulerMessagesEditor;
-        recurrenceEditor?: SchedulerMessagesRecurrenceEditor;
-        recurrenceMessages?: SchedulerMessagesRecurrenceMessages;
-        views?: SchedulerMessagesViews;
-    }
-
-    interface SchedulerPdfMargin {
-        bottom?: number|string;
-        left?: number|string;
-        right?: number|string;
-        top?: number|string;
-    }
-
-    interface SchedulerPdf {
-        author?: string;
-        avoidLinks?: boolean|string;
-        creator?: string;
-        date?: Date;
-        fileName?: string;
-        forceProxy?: boolean;
-        keywords?: string;
-        landscape?: boolean;
-        margin?: SchedulerPdfMargin;
-        paperSize?: string|any;
-        proxyURL?: string;
-        proxyTarget?: string;
-        subject?: string;
-        title?: string;
-    }
-
-    interface SchedulerResource {
-        dataColorField?: string;
-        dataSource?: any|any|kendo.data.DataSource;
-        dataTextField?: string;
-        dataValueField?: string;
-        field?: string;
-        multiple?: boolean;
-        name?: string;
-        title?: string;
-        valuePrimitive?: boolean;
-    }
-
-    interface SchedulerToolbarItem {
-        name?: string;
-    }
-
-    interface SchedulerViewEditable {
-        create?: boolean;
-        destroy?: boolean;
-        update?: boolean;
-    }
-
-    interface SchedulerViewGroup {
-        orientation?: string;
-    }
-
-    interface SchedulerView {
-        allDayEventTemplate?: string|Function;
-        allDaySlot?: boolean;
-        allDaySlotTemplate?: string|Function;
-        columnWidth?: number;
-        dateHeaderTemplate?: string|Function;
-        dayTemplate?: string|Function;
-        editable?: SchedulerViewEditable;
-        endTime?: Date;
-        eventHeight?: number;
-        eventTemplate?: string|Function;
-        eventTimeTemplate?: string|Function;
-        group?: SchedulerViewGroup;
-        majorTick?: number;
-        majorTimeHeaderTemplate?: string|Function;
-        minorTickCount?: number;
-        minorTimeHeaderTemplate?: string|Function;
-        selected?: boolean;
-        selectedDateFormat?: string;
-        showWorkHours?: boolean;
-        slotTemplate?: string|Function;
-        startTime?: Date;
-        title?: string;
-        type?: string;
-        workWeekStart?: number;
-        workWeekEnd?: number;
-    }
-
-    interface SchedulerSelectOptions {
-        events?: any;
-        resources?: any;
-        start?: Date;
-        end?: Date;
-        isAllDay?: boolean;
-    }
-
-    interface SchedulerOptions {
-        name?: string;
-        allDayEventTemplate?: string|Function;
-        allDaySlot?: boolean;
-        autoBind?: boolean;
-        currentTimeMarker?: SchedulerCurrentTimeMarker;
-        dataSource?: any|any|kendo.data.SchedulerDataSource;
-        date?: Date;
-        dateHeaderTemplate?: string|Function;
-        editable?: SchedulerEditable;
-        endTime?: Date;
-        eventTemplate?: string|Function;
-        footer?: SchedulerFooter;
-        group?: SchedulerGroup;
-        height?: number|string;
-        majorTick?: number;
-        majorTimeHeaderTemplate?: string|Function;
-        max?: Date;
-        messages?: SchedulerMessages;
-        min?: Date;
-        minorTickCount?: number;
-        minorTimeHeaderTemplate?: string|Function;
-        mobile?: boolean|string;
-        pdf?: SchedulerPdf;
-        resources?: SchedulerResource[];
-        selectable?: boolean;
-        showWorkHours?: boolean;
-        snap?: boolean;
-        startTime?: Date;
-        timezone?: string;
-        toolbar?: SchedulerToolbarItem[];
-        views?: SchedulerView[];
-        groupHeaderTemplate?: string|Function;
-        width?: number|string;
-        workDayStart?: Date;
-        workDayEnd?: Date;
-        workWeekStart?: number;
-        workWeekEnd?: number;
-        add?(e: SchedulerAddEvent): void;
-        cancel?(e: SchedulerCancelEvent): void;
-        change?(e: SchedulerChangeEvent): void;
-        dataBinding?(e: SchedulerDataBindingEvent): void;
-        dataBound?(e: SchedulerDataBoundEvent): void;
-        edit?(e: SchedulerEditEvent): void;
-        moveStart?(e: SchedulerMoveStartEvent): void;
-        move?(e: SchedulerMoveEvent): void;
-        moveEnd?(e: SchedulerMoveEndEvent): void;
-        navigate?(e: SchedulerNavigateEvent): void;
-        pdfExport?(e: SchedulerPdfExportEvent): void;
-        remove?(e: SchedulerRemoveEvent): void;
-        resizeStart?(e: SchedulerResizeStartEvent): void;
-        resize?(e: SchedulerResizeEvent): void;
-        resizeEnd?(e: SchedulerResizeEndEvent): void;
-        save?(e: SchedulerSaveEvent): void;
-    }
-    interface SchedulerEvent {
-        sender: Scheduler;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface SchedulerAddEvent extends SchedulerEvent {
-        event?: any;
-    }
-
-    interface SchedulerCancelEvent extends SchedulerEvent {
-        container?: JQuery;
-        event?: kendo.data.SchedulerEvent;
-    }
-
-    interface SchedulerChangeEvent extends SchedulerEvent {
-        start?: Date;
-        end?: Date;
-        events?: any;
-        slots?: any;
-        resources?: any;
-    }
-
-    interface SchedulerDataBindingEvent extends SchedulerEvent {
-    }
-
-    interface SchedulerDataBoundEvent extends SchedulerEvent {
-    }
-
-    interface SchedulerEditEvent extends SchedulerEvent {
-        container?: JQuery;
-        event?: kendo.data.SchedulerEvent;
-    }
-
-    interface SchedulerMoveStartEvent extends SchedulerEvent {
-        event?: kendo.data.SchedulerEvent;
-    }
-
-    interface SchedulerMoveEvent extends SchedulerEvent {
-        event?: kendo.data.SchedulerEvent;
-        slot?: any;
-    }
-
-    interface SchedulerMoveEndEvent extends SchedulerEvent {
-        start?: Date;
-        end?: Date;
-        event?: kendo.data.SchedulerEvent;
-        slot?: any;
-        resources?: any;
-    }
-
-    interface SchedulerNavigateEvent extends SchedulerEvent {
-        action?: string;
-        date?: Date;
-        view?: string;
-    }
-
-    interface SchedulerPdfExportEvent extends SchedulerEvent {
-        promise?: JQueryPromise<any>;
-    }
-
-    interface SchedulerRemoveEvent extends SchedulerEvent {
-        event?: kendo.data.SchedulerEvent;
-    }
-
-    interface SchedulerResizeStartEvent extends SchedulerEvent {
-        event?: kendo.data.SchedulerEvent;
-    }
-
-    interface SchedulerResizeEvent extends SchedulerEvent {
-        event?: kendo.data.SchedulerEvent;
-        slot?: any;
-    }
-
-    interface SchedulerResizeEndEvent extends SchedulerEvent {
-        event?: kendo.data.SchedulerEvent;
-        slot?: any;
-    }
-
-    interface SchedulerSaveEvent extends SchedulerEvent {
-        container?: JQuery;
-        event?: kendo.data.SchedulerEvent;
-    }
-
-
-    class Slider extends kendo.ui.Widget {
-
-        static fn: Slider;
-
-        options: SliderOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Slider;
-
-        constructor(element: Element, options?: SliderOptions);
-
-
-        destroy(): void;
-        enable(enable: boolean): void;
-        value(): number;
-        value(value: number): void;
-        resize(): void;
-
-    }
-
-    interface SliderTooltip {
-        enabled?: boolean;
-        format?: string;
-        template?: string;
-    }
-
-    interface SliderOptions {
-        name?: string;
-        decreaseButtonTitle?: string;
-        increaseButtonTitle?: string;
-        largeStep?: number;
-        max?: number;
-        min?: number;
-        orientation?: string;
-        showButtons?: boolean;
-        smallStep?: number;
-        tickPlacement?: string;
-        tooltip?: SliderTooltip;
-        value?: number;
-        change?(e: SliderChangeEvent): void;
-        slide?(e: SliderSlideEvent): void;
-    }
-    interface SliderEvent {
-        sender: Slider;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface SliderChangeEvent extends SliderEvent {
-        value?: number;
-    }
-
-    interface SliderSlideEvent extends SliderEvent {
-        value?: number;
-    }
-
-
-    class Sortable extends kendo.ui.Widget {
-
-        static fn: Sortable;
-
-        options: SortableOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Sortable;
-
-        constructor(element: Element, options?: SortableOptions);
-
-
-        indexOf(element: JQuery): number;
-        items(): JQuery;
-
-    }
-
-    interface SortableCursorOffset {
-        left?: number;
-        top?: number;
-    }
-
-    interface SortableOptions {
-        name?: string;
-        axis?: string;
-        autoScroll?: boolean;
-        container?: string|JQuery;
-        connectWith?: string;
-        cursor?: string;
-        cursorOffset?: SortableCursorOffset;
-        disabled?: string;
-        filter?: string;
-        handler?: string;
-        hint?: Function|string|JQuery;
-        holdToDrag?: boolean;
-        ignore?: string;
-        placeholder?: Function|string|JQuery;
-        start?(e: SortableStartEvent): void;
-        move?(e: SortableMoveEvent): void;
-        end?(e: SortableEndEvent): void;
-        change?(e: SortableChangeEvent): void;
-        cancel?(e: SortableCancelEvent): void;
-    }
-    interface SortableEvent {
-        sender: Sortable;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface SortableStartEvent extends SortableEvent {
-        draggableEvent?: any;
-        item?: JQuery;
-    }
-
-    interface SortableMoveEvent extends SortableEvent {
-        item?: JQuery;
-        target?: JQuery;
-        list?: kendo.ui.Sortable;
-        draggableEvent?: any;
-    }
-
-    interface SortableEndEvent extends SortableEvent {
-        action?: string;
-        item?: JQuery;
-        oldIndex?: number;
-        newIndex?: number;
-        draggableEvent?: any;
-    }
-
-    interface SortableChangeEvent extends SortableEvent {
-        action?: string;
-        item?: JQuery;
-        oldIndex?: number;
-        newIndex?: number;
-        draggableEvent?: any;
-    }
-
-    interface SortableCancelEvent extends SortableEvent {
-        item?: JQuery;
-    }
-
-
-    class Splitter extends kendo.ui.Widget {
-
-        static fn: Splitter;
-
-        options: SplitterOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Splitter;
-
-        constructor(element: Element, options?: SplitterOptions);
-
-
-        ajaxRequest(pane: string, url: string, data: any): void;
-        ajaxRequest(pane: string, url: string, data: string): void;
-        ajaxRequest(pane: Element, url: string, data: any): void;
-        ajaxRequest(pane: Element, url: string, data: string): void;
-        ajaxRequest(pane: JQuery, url: string, data: any): void;
-        ajaxRequest(pane: JQuery, url: string, data: string): void;
-        append(config?: any): JQuery;
-        collapse(pane: string): void;
-        collapse(pane: Element): void;
-        collapse(pane: JQuery): void;
-        destroy(): void;
-        expand(pane: string): void;
-        expand(pane: Element): void;
-        expand(pane: JQuery): void;
-        insertAfter(config: any, referencePane: string): JQuery;
-        insertAfter(config: any, referencePane: Element): JQuery;
-        insertAfter(config: any, referencePane: JQuery): JQuery;
-        insertBefore(config: any, referencePane: string): JQuery;
-        insertBefore(config: any, referencePane: Element): JQuery;
-        insertBefore(config: any, referencePane: JQuery): JQuery;
-        max(pane: string, value: string): void;
-        max(pane: Element, value: string): void;
-        max(pane: JQuery, value: string): void;
-        min(pane: string, value: string): void;
-        min(pane: Element, value: string): void;
-        min(pane: JQuery, value: string): void;
-        remove(pane: string): void;
-        remove(pane: Element): void;
-        remove(pane: JQuery): void;
-        size(pane: string, value: string): void;
-        size(pane: Element, value: string): void;
-        size(pane: JQuery, value: string): void;
-        toggle(pane: string, expand?: boolean): void;
-        toggle(pane: Element, expand?: boolean): void;
-        toggle(pane: JQuery, expand?: boolean): void;
-
-    }
-
-    interface SplitterPane {
-        collapsed?: boolean;
-        collapsedSize?: string;
-        collapsible?: boolean;
-        contentUrl?: string;
-        max?: string;
-        min?: string;
-        resizable?: boolean;
-        scrollable?: boolean;
-        size?: string;
-    }
-
-    interface SplitterOptions {
-        name?: string;
-        orientation?: string;
-        panes?: SplitterPane[];
-        collapse?(e: SplitterCollapseEvent): void;
-        contentLoad?(e: SplitterContentLoadEvent): void;
-        error?(e: SplitterErrorEvent): void;
-        expand?(e: SplitterExpandEvent): void;
-        layoutChange?(e: SplitterEvent): void;
-        resize?(e: SplitterEvent): void;
-    }
-    interface SplitterEvent {
-        sender: Splitter;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface SplitterCollapseEvent extends SplitterEvent {
-        pane?: Element;
-    }
-
-    interface SplitterContentLoadEvent extends SplitterEvent {
-        pane?: Element;
-    }
-
-    interface SplitterErrorEvent extends SplitterEvent {
-        xhr?: JQueryXHR;
-        status?: string;
-    }
-
-    interface SplitterExpandEvent extends SplitterEvent {
-        pane?: Element;
-    }
-
-
-    class Spreadsheet extends kendo.ui.Widget {
-
-        static fn: Spreadsheet;
-
-        options: SpreadsheetOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Spreadsheet;
-
-        constructor(element: Element, options?: SpreadsheetOptions);
-
-
-        activeSheet(): kendo.spreadsheet.Sheet;
-        activeSheet(sheet?: kendo.spreadsheet.Sheet): void;
-        sheets(): any;
-        fromFile(blob: Blob): JQueryPromise<any>;
-        fromFile(blob: File): JQueryPromise<any>;
-        saveAsExcel(): void;
-        saveAsPDF(): JQueryPromise<any>;
-        sheetByName(name: string): kendo.spreadsheet.Sheet;
-        sheetIndex(sheet: kendo.spreadsheet.Sheet): number;
-        sheetByIndex(index: number): kendo.spreadsheet.Sheet;
-        insertSheet(options: any): kendo.spreadsheet.Sheet;
-        moveSheetToIndex(sheet: kendo.spreadsheet.Sheet, index: number): void;
-        removeSheet(sheet: kendo.spreadsheet.Sheet): void;
-        renameSheet(sheet: kendo.spreadsheet.Sheet, newSheetName: string): kendo.spreadsheet.Sheet;
-        toJSON(): any;
-        fromJSON(data: any): void;
-
-    }
-
-    interface SpreadsheetExcel {
-        fileName?: string;
-        forceProxy?: boolean;
-        proxyURL?: string;
-    }
-
-    interface SpreadsheetPdfMargin {
-        bottom?: number|string;
-        left?: number|string;
-        right?: number|string;
-        top?: number|string;
-    }
-
-    interface SpreadsheetPdf {
-        area?: string;
-        author?: string;
-        creator?: string;
-        date?: Date;
-        fileName?: string;
-        fitWidth?: boolean;
-        forceProxy?: boolean;
-        guidelines?: boolean;
-        hCenter?: boolean;
-        keywords?: string;
-        landscape?: boolean;
-        margin?: SpreadsheetPdfMargin;
-        paperSize?: string|any;
-        proxyURL?: string;
-        proxyTarget?: string;
-        subject?: string;
-        title?: string;
-        vCenter?: boolean;
-    }
-
-    interface SpreadsheetSheetColumn {
-        index?: number;
-        width?: number;
-    }
-
-    interface SpreadsheetSheetFilterColumnCriteriaItem {
-        operator?: string;
-        value?: string;
-    }
-
-    interface SpreadsheetSheetFilterColumn {
-        criteria?: SpreadsheetSheetFilterColumnCriteriaItem[];
-        filter?: string;
-        index?: number;
-        logic?: string;
-        type?: string;
-        value?: number|string|Date;
-        values?: any;
-    }
-
-    interface SpreadsheetSheetFilter {
-        columns?: SpreadsheetSheetFilterColumn[];
-        ref?: string;
-    }
-
-    interface SpreadsheetSheetRowCellBorderBottom {
-        color?: string;
-        size?: string;
-    }
-
-    interface SpreadsheetSheetRowCellBorderLeft {
-        color?: string;
-        size?: string;
-    }
-
-    interface SpreadsheetSheetRowCellBorderRight {
-        color?: string;
-        size?: string;
-    }
-
-    interface SpreadsheetSheetRowCellBorderTop {
-        color?: string;
-        size?: string;
-    }
-
-    interface SpreadsheetSheetRowCellValidation {
-        type?: string;
-        comparerType?: string;
-        dataType?: string;
-        from?: string;
-        to?: string;
-        allowNulls?: boolean;
-        messageTemplate?: string;
-        titleTemplate?: string;
-    }
-
-    interface SpreadsheetSheetRowCell {
-        background?: string;
-        borderBottom?: SpreadsheetSheetRowCellBorderBottom;
-        borderLeft?: SpreadsheetSheetRowCellBorderLeft;
-        borderTop?: SpreadsheetSheetRowCellBorderTop;
-        borderRight?: SpreadsheetSheetRowCellBorderRight;
-        color?: string;
-        fontFamily?: string;
-        fontSize?: number;
-        italic?: boolean;
-        bold?: boolean;
-        enable?: boolean;
-        format?: string;
-        formula?: string;
-        index?: number;
-        textAlign?: string;
-        underline?: boolean;
-        value?: number|string|boolean|Date;
-        validation?: SpreadsheetSheetRowCellValidation;
-        verticalAlign?: string;
-        wrap?: boolean;
-    }
-
-    interface SpreadsheetSheetRow {
-        cells?: SpreadsheetSheetRowCell[];
-        height?: number;
-        index?: number;
-    }
-
-    interface SpreadsheetSheetSortColumn {
-        ascending?: boolean;
-        index?: number;
-    }
-
-    interface SpreadsheetSheetSort {
-        columns?: SpreadsheetSheetSortColumn[];
-        ref?: string;
-    }
-
-    interface SpreadsheetSheet {
-        activeCell?: string;
-        name?: string;
-        columns?: SpreadsheetSheetColumn[];
-        dataSource?: kendo.data.DataSource;
-        filter?: SpreadsheetSheetFilter;
-        frozenColumns?: number;
-        frozenRows?: number;
-        mergedCells?: any;
-        rows?: SpreadsheetSheetRow[];
-        selection?: string;
-        showGridLines?: boolean;
-        sort?: SpreadsheetSheetSort;
-    }
-
-    interface SpreadsheetToolbar {
-        home?: boolean|any;
-        insert?: boolean|any;
-        data?: boolean|any;
-    }
-
-    interface SpreadsheetInsertSheetOptions {
-        rows?: number;
-        columns?: number;
-        rowHeight?: number;
-        columnWidth?: number;
-        headerHeight?: number;
-        headerWidth?: number;
-        dataSource?: kendo.data.DataSource;
-        data?: any;
-    }
-
-    interface SpreadsheetOptions {
-        name?: string;
-        activeSheet?: string;
-        columnWidth?: number;
-        columns?: number;
-        headerHeight?: number;
-        headerWidth?: number;
-        excel?: SpreadsheetExcel;
-        pdf?: SpreadsheetPdf;
-        rowHeight?: number;
-        rows?: number;
-        sheets?: SpreadsheetSheet[];
-        sheetsbar?: boolean;
-        toolbar?: SpreadsheetToolbar;
-        change?(e: SpreadsheetChangeEvent): void;
-        render?(e: SpreadsheetRenderEvent): void;
-        excelExport?(e: SpreadsheetExcelExportEvent): void;
-        excelImport?(e: SpreadsheetExcelImportEvent): void;
-        pdfExport?(e: SpreadsheetPdfExportEvent): void;
-    }
-    interface SpreadsheetEvent {
-        sender: Spreadsheet;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface SpreadsheetChangeEvent extends SpreadsheetEvent {
-        range?: kendo.spreadsheet.Range;
-    }
-
-    interface SpreadsheetRenderEvent extends SpreadsheetEvent {
-    }
-
-    interface SpreadsheetExcelExportEvent extends SpreadsheetEvent {
-        data?: any;
-        workbook?: kendo.ooxml.Workbook;
-    }
-
-    interface SpreadsheetExcelImportEvent extends SpreadsheetEvent {
-        file?: Blob|File;
-        progress?: JQueryPromise<any>;
-    }
-
-    interface SpreadsheetPdfExportEvent extends SpreadsheetEvent {
-        promise?: JQueryPromise<any>;
-    }
-
-
-    class TabStrip extends kendo.ui.Widget {
-
-        static fn: TabStrip;
-
-        options: TabStripOptions;
-
-        dataSource: kendo.data.DataSource;
-        tabGroup: JQuery;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): TabStrip;
-
-        constructor(element: Element, options?: TabStripOptions);
-
-
-        activateTab(item: JQuery): void;
-        append(tab: any): kendo.ui.TabStrip;
-        contentElement(itemIndex: number): Element;
-        contentHolder(itemIndex: number): Element;
-        deactivateTab(item: JQuery): void;
-        destroy(): void;
-        disable(element: string): kendo.ui.TabStrip;
-        disable(element: Element): kendo.ui.TabStrip;
-        disable(element: JQuery): kendo.ui.TabStrip;
-        enable(element: string, enable?: boolean): kendo.ui.TabStrip;
-        enable(element: Element, enable?: boolean): kendo.ui.TabStrip;
-        enable(element: JQuery, enable?: boolean): kendo.ui.TabStrip;
-        insertAfter(item: string, referenceTab: string): kendo.ui.TabStrip;
-        insertAfter(item: string, referenceTab: Element): kendo.ui.TabStrip;
-        insertAfter(item: string, referenceTab: JQuery): kendo.ui.TabStrip;
-        insertAfter(item: Element, referenceTab: string): kendo.ui.TabStrip;
-        insertAfter(item: Element, referenceTab: Element): kendo.ui.TabStrip;
-        insertAfter(item: Element, referenceTab: JQuery): kendo.ui.TabStrip;
-        insertAfter(item: JQuery, referenceTab: string): kendo.ui.TabStrip;
-        insertAfter(item: JQuery, referenceTab: Element): kendo.ui.TabStrip;
-        insertAfter(item: JQuery, referenceTab: JQuery): kendo.ui.TabStrip;
-        insertBefore(item: string, referenceTab: string): kendo.ui.TabStrip;
-        insertBefore(item: string, referenceTab: Element): kendo.ui.TabStrip;
-        insertBefore(item: string, referenceTab: JQuery): kendo.ui.TabStrip;
-        insertBefore(item: Element, referenceTab: string): kendo.ui.TabStrip;
-        insertBefore(item: Element, referenceTab: Element): kendo.ui.TabStrip;
-        insertBefore(item: Element, referenceTab: JQuery): kendo.ui.TabStrip;
-        insertBefore(item: JQuery, referenceTab: string): kendo.ui.TabStrip;
-        insertBefore(item: JQuery, referenceTab: Element): kendo.ui.TabStrip;
-        insertBefore(item: JQuery, referenceTab: JQuery): kendo.ui.TabStrip;
-        items(): HTMLCollection;
-        reload(element: string): kendo.ui.TabStrip;
-        reload(element: Element): kendo.ui.TabStrip;
-        reload(element: JQuery): kendo.ui.TabStrip;
-        remove(element: string): kendo.ui.TabStrip;
-        remove(element: number): kendo.ui.TabStrip;
-        remove(element: JQuery): kendo.ui.TabStrip;
-        select(): JQuery;
-        select(element: string): void;
-        select(element: Element): void;
-        select(element: JQuery): void;
-        select(element: number): void;
-        setDataSource(dataSource: any): void;
-        setDataSource(dataSource: kendo.data.DataSource): void;
-
-    }
-
-    interface TabStripAnimationClose {
-        duration?: number;
-        effects?: string;
-    }
-
-    interface TabStripAnimationOpen {
-        duration?: number;
-        effects?: string;
-    }
-
-    interface TabStripAnimation {
-        close?: TabStripAnimationClose;
-        open?: TabStripAnimationOpen;
-    }
-
-    interface TabStripScrollable {
-        distance?: number;
-    }
-
-    interface TabStripOptions {
-        name?: string;
-        animation?: TabStripAnimation;
-        collapsible?: boolean;
-        contentUrls?: any;
-        dataContentField?: string;
-        dataContentUrlField?: string;
-        dataImageUrlField?: string;
-        dataSource?: any|any|kendo.data.DataSource;
-        dataSpriteCssClass?: string;
-        dataTextField?: string;
-        dataUrlField?: string;
-        navigatable?: boolean;
-        scrollable?: TabStripScrollable;
-        tabPosition?: string;
-        value?: string;
-        activate?(e: TabStripActivateEvent): void;
-        contentLoad?(e: TabStripContentLoadEvent): void;
-        error?(e: TabStripErrorEvent): void;
-        select?(e: TabStripSelectEvent): void;
-        show?(e: TabStripShowEvent): void;
-    }
-    interface TabStripEvent {
-        sender: TabStrip;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface TabStripActivateEvent extends TabStripEvent {
-        item?: Element;
-        contentElement?: Element;
-    }
-
-    interface TabStripContentLoadEvent extends TabStripEvent {
-        item?: Element;
-        contentElement?: Element;
-    }
-
-    interface TabStripErrorEvent extends TabStripEvent {
-        xhr?: JQueryXHR;
-        status?: string;
-    }
-
-    interface TabStripSelectEvent extends TabStripEvent {
-        item?: Element;
-        contentElement?: Element;
-    }
-
-    interface TabStripShowEvent extends TabStripEvent {
-        item?: Element;
-        contentElement?: Element;
-    }
-
-
-    class TimePicker extends kendo.ui.Widget {
-
-        static fn: TimePicker;
-
-        options: TimePickerOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): TimePicker;
-
-        constructor(element: Element, options?: TimePickerOptions);
-
-
-        close(): void;
-        destroy(): void;
-        enable(enable: boolean): void;
-        readonly(readonly: boolean): void;
-        max(): Date;
-        max(value: Date): void;
-        max(value: string): void;
-        min(): Date;
-        min(value: Date): void;
-        min(value: string): void;
-        open(): void;
-        setOptions(options: any): void;
-        value(): Date;
-        value(value: Date): void;
-        value(value: string): void;
-
-    }
-
-    interface TimePickerAnimationClose {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface TimePickerAnimationOpen {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface TimePickerAnimation {
-        close?: TimePickerAnimationClose;
-        open?: TimePickerAnimationOpen;
-    }
-
-    interface TimePickerOptions {
-        name?: string;
-        animation?: TimePickerAnimation;
-        culture?: string;
-        dates?: any;
-        format?: string;
-        interval?: number;
-        max?: Date;
-        min?: Date;
-        parseFormats?: any;
-        value?: Date;
-        change?(e: TimePickerChangeEvent): void;
-        close?(e: TimePickerCloseEvent): void;
-        open?(e: TimePickerOpenEvent): void;
-    }
-    interface TimePickerEvent {
-        sender: TimePicker;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface TimePickerChangeEvent extends TimePickerEvent {
-    }
-
-    interface TimePickerCloseEvent extends TimePickerEvent {
-    }
-
-    interface TimePickerOpenEvent extends TimePickerEvent {
-    }
-
-
-    class ToolBar extends kendo.ui.Widget {
-
-        static fn: ToolBar;
-
-        options: ToolBarOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): ToolBar;
-
-        constructor(element: Element, options?: ToolBarOptions);
-
-
-        add(command: any): void;
-        destroy(): void;
-        enable(command: string, enable: boolean): void;
-        enable(command: Element, enable: boolean): void;
-        enable(command: JQuery, enable: boolean): void;
-        getSelectedFromGroup(groupName: string): void;
-        hide(command: string): void;
-        hide(command: Element): void;
-        hide(command: JQuery): void;
-        remove(command: string): void;
-        remove(command: Element): void;
-        remove(command: JQuery): void;
-        show(command: string): void;
-        show(command: Element): void;
-        show(command: JQuery): void;
-        toggle(): void;
-
-    }
-
-    interface ToolBarItemButton {
-        attributes?: any;
-        click?: Function;
-        enable?: boolean;
-        group?: string;
-        hidden?: boolean;
-        icon?: string;
-        id?: string;
-        imageUrl?: string;
-        selected?: boolean;
-        showIcon?: string;
-        showText?: string;
-        spriteCssClass?: string;
-        toggle?: Function;
-        togglable?: boolean;
-        text?: string;
-        url?: string;
-    }
-
-    interface ToolBarItemMenuButton {
-        attributes?: any;
-        enable?: boolean;
-        hidden?: boolean;
-        icon?: string;
-        id?: string;
-        imageUrl?: string;
-        spriteCssClass?: string;
-        text?: string;
-        url?: string;
-    }
-
-    interface ToolBarItem {
-        attributes?: any;
-        buttons?: ToolBarItemButton[];
-        click?: Function;
-        enable?: boolean;
-        group?: string;
-        hidden?: boolean;
-        icon?: string;
-        id?: string;
-        imageUrl?: string;
-        menuButtons?: ToolBarItemMenuButton[];
-        overflow?: string;
-        overflowTemplate?: string|Function;
-        primary?: boolean;
-        selected?: boolean;
-        showIcon?: string;
-        showText?: string;
-        spriteCssClass?: string;
-        template?: string|Function;
-        text?: string;
-        togglable?: boolean;
-        toggle?: Function;
-        type?: string;
-        url?: string;
-    }
-
-    interface ToolBarOptions {
-        name?: string;
-        resizable?: boolean;
-        items?: ToolBarItem[];
-        click?(e: ToolBarClickEvent): void;
-        close?(e: ToolBarCloseEvent): void;
-        open?(e: ToolBarOpenEvent): void;
-        toggle?(e: ToolBarToggleEvent): void;
-        overflowClose?(e: ToolBarOverflowCloseEvent): void;
-        overflowOpen?(e: ToolBarOverflowOpenEvent): void;
-    }
-    interface ToolBarEvent {
-        sender: ToolBar;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface ToolBarClickEvent extends ToolBarEvent {
-        target?: JQuery;
-        id?: string;
-    }
-
-    interface ToolBarCloseEvent extends ToolBarEvent {
-        SplitButton?: JQuery;
-    }
-
-    interface ToolBarOpenEvent extends ToolBarEvent {
-        SplitButton?: JQuery;
-    }
-
-    interface ToolBarToggleEvent extends ToolBarEvent {
-        target?: JQuery;
-        checked?: boolean;
-        id?: string;
-    }
-
-    interface ToolBarOverflowCloseEvent extends ToolBarEvent {
-    }
-
-    interface ToolBarOverflowOpenEvent extends ToolBarEvent {
-    }
-
-
-    class Tooltip extends kendo.ui.Widget {
-
-        static fn: Tooltip;
-
-        options: TooltipOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Tooltip;
-
-        constructor(element: Element, options?: TooltipOptions);
-
-
-        show(element: JQuery): void;
-        hide(): void;
-        refresh(): void;
-        target(): JQuery;
-
-    }
-
-    interface TooltipAnimationClose {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface TooltipAnimationOpen {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface TooltipAnimation {
-        close?: TooltipAnimationClose;
-        open?: TooltipAnimationOpen;
-    }
-
-    interface TooltipContent {
-        url?: string;
-    }
-
-    interface TooltipOptions {
-        name?: string;
-        autoHide?: boolean;
-        animation?: TooltipAnimation;
-        content?: TooltipContent;
-        callout?: boolean;
-        filter?: string;
-        iframe?: boolean;
-        height?: number;
-        width?: number;
-        position?: string;
-        showAfter?: number;
-        showOn?: string;
-        contentLoad?(e: TooltipEvent): void;
-        show?(e: TooltipEvent): void;
-        hide?(e: TooltipEvent): void;
-        requestStart?(e: TooltipRequestStartEvent): void;
-        error?(e: TooltipErrorEvent): void;
-    }
-    interface TooltipEvent {
-        sender: Tooltip;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface TooltipRequestStartEvent extends TooltipEvent {
-        target?: JQuery;
-        options?: any;
-    }
-
-    interface TooltipErrorEvent extends TooltipEvent {
-        xhr?: JQueryXHR;
-        status?: string;
-    }
-
-
-    class Touch extends kendo.ui.Widget {
-
-        static fn: Touch;
-
-        options: TouchOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Touch;
-
-        constructor(element: Element, options?: TouchOptions);
-
-
-        cancel(): void;
-        destroy(): void;
-
-    }
-
-    interface TouchOptions {
-        name?: string;
-        filter?: string;
-        surface?: JQuery;
-        multiTouch?: boolean;
-        enableSwipe?: boolean;
-        minXDelta?: number;
-        maxYDelta?: number;
-        maxDuration?: number;
-        minHold?: number;
-        doubleTapTimeout?: number;
-        touchstart?(e: TouchTouchstartEvent): void;
-        dragstart?(e: TouchDragstartEvent): void;
-        drag?(e: TouchDragEvent): void;
-        dragend?(e: TouchDragendEvent): void;
-        tap?(e: TouchTapEvent): void;
-        doubletap?(e: TouchDoubletapEvent): void;
-        hold?(e: TouchHoldEvent): void;
-        swipe?(e: TouchSwipeEvent): void;
-        gesturestart?(e: TouchGesturestartEvent): void;
-        gesturechange?(e: TouchGesturechangeEvent): void;
-        gestureend?(e: TouchGestureendEvent): void;
-    }
-    interface TouchEvent {
-        sender: Touch;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface TouchTouchstartEvent extends TouchEvent {
-        touch?: kendo.mobile.ui.TouchEventOptions;
-        event?: JQueryEventObject;
-    }
-
-    interface TouchDragstartEvent extends TouchEvent {
-        touch?: kendo.mobile.ui.TouchEventOptions;
-        event?: JQueryEventObject;
-    }
-
-    interface TouchDragEvent extends TouchEvent {
-        touch?: kendo.mobile.ui.TouchEventOptions;
-        event?: JQueryEventObject;
-    }
-
-    interface TouchDragendEvent extends TouchEvent {
-        touch?: kendo.mobile.ui.TouchEventOptions;
-        event?: JQueryEventObject;
-    }
-
-    interface TouchTapEvent extends TouchEvent {
-        touch?: kendo.mobile.ui.TouchEventOptions;
-        event?: JQueryEventObject;
-    }
-
-    interface TouchDoubletapEvent extends TouchEvent {
-        touch?: kendo.mobile.ui.TouchEventOptions;
-        event?: JQueryEventObject;
-    }
-
-    interface TouchHoldEvent extends TouchEvent {
-        touch?: kendo.mobile.ui.TouchEventOptions;
-        event?: JQueryEventObject;
-    }
-
-    interface TouchSwipeEvent extends TouchEvent {
-        touch?: kendo.mobile.ui.TouchEventOptions;
-        event?: JQueryEventObject;
-    }
-
-    interface TouchGesturestartEvent extends TouchEvent {
-        touches?: any;
-        event?: JQueryEventObject;
-        distance?: number;
-        center?: kendo.mobile.ui.Point;
-    }
-
-    interface TouchGesturechangeEvent extends TouchEvent {
-        touches?: any;
-        event?: JQueryEventObject;
-        distance?: number;
-        center?: kendo.mobile.ui.Point;
-    }
-
-    interface TouchGestureendEvent extends TouchEvent {
-        touches?: any;
-        event?: JQueryEventObject;
-        distance?: number;
-        center?: kendo.mobile.ui.Point;
-    }
-
-
-    class TreeList extends kendo.ui.Widget {
-
-        static fn: TreeList;
-
-        options: TreeListOptions;
-
-        dataSource: kendo.data.DataSource;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): TreeList;
-
-        constructor(element: Element, options?: TreeListOptions);
-
-
-        addRow(parentRow: string): void;
-        addRow(parentRow: Element): void;
-        addRow(parentRow: JQuery): void;
-        cancelRow(): void;
-        clearSelection(): void;
-        collapse(): void;
-        dataItem(row: string): kendo.data.TreeListModel;
-        dataItem(row: Element): kendo.data.TreeListModel;
-        dataItem(row: JQuery): kendo.data.TreeListModel;
-        destroy(): void;
-        editRow(row: JQuery): void;
-        expand(): void;
-        itemFor(model: kendo.data.TreeListModel): JQuery;
-        itemFor(model: any): JQuery;
-        items(): any;
-        refresh(): void;
-        removeRow(row: string): void;
-        removeRow(row: Element): void;
-        removeRow(row: JQuery): void;
-        saveAsExcel(): void;
-        saveAsPDF(): JQueryPromise<any>;
-        saveRow(): void;
-        select(): JQuery;
-        select(rows: Element): void;
-        select(rows: JQuery): void;
-        setDataSource(dataSource: kendo.data.TreeListDataSource): void;
-        showColumn(column: number): void;
-        showColumn(column: string): void;
-        hideColumn(column: number): void;
-        hideColumn(column: string): void;
-        lockColumn(column: number): void;
-        lockColumn(column: string): void;
-        unlockColumn(column: number): void;
-        unlockColumn(column: string): void;
-        reorderColumn(destIndex: number, column: any): void;
-
-    }
-
-    interface TreeListColumnMenuMessages {
-        columns?: string;
-        filter?: string;
-        sortAscending?: string;
-        sortDescending?: string;
-    }
-
-    interface TreeListColumnMenu {
-        columns?: boolean;
-        filterable?: boolean;
-        sortable?: boolean;
-        messages?: TreeListColumnMenuMessages;
-    }
-
-    interface TreeListColumnCommandItem {
-        className?: string;
-        click?: Function;
-        name?: string;
-        text?: string;
-    }
-
-    interface TreeListColumnFilterable {
-        ui?: string|Function;
-    }
-
-    interface TreeListColumnSortable {
-        compare?: Function;
-    }
-
-    interface TreeListColumn {
-        attributes?: any;
-        command?: TreeListColumnCommandItem[];
-        encoded?: boolean;
-        expandable?: boolean;
-        field?: string;
-        filterable?: TreeListColumnFilterable;
-        footerTemplate?: string|Function;
-        format?: string;
-        headerAttributes?: any;
-        headerTemplate?: string|Function;
-        minScreenWidth?: number;
-        sortable?: TreeListColumnSortable;
-        template?: string|Function;
-        title?: string;
-        width?: string|number;
-        hidden?: boolean;
-        menu?: boolean;
-        locked?: boolean;
-        lockable?: boolean;
-    }
-
-    interface TreeListEditable {
-        mode?: string;
-        move?: boolean;
-        template?: string|Function;
-        window?: any;
-    }
-
-    interface TreeListExcel {
-        fileName?: string;
-        filterable?: boolean;
-        forceProxy?: boolean;
-        proxyURL?: string;
-    }
-
-    interface TreeListFilterableMessages {
-        and?: string;
-        clear?: string;
-        filter?: string;
-        info?: string;
-        isFalse?: string;
-        isTrue?: string;
-        or?: string;
-        selectValue?: string;
-        cancel?: string;
-        operator?: string;
-    }
-
-    interface TreeListFilterable {
-        extra?: boolean;
-        messages?: TreeListFilterableMessages;
-    }
-
-    interface TreeListMessagesCommands {
-        canceledit?: string;
-        create?: string;
-        createchild?: string;
-        destroy?: string;
-        edit?: string;
-        excel?: string;
-        pdf?: string;
-        update?: string;
-    }
-
-    interface TreeListMessages {
-        commands?: TreeListMessagesCommands;
-        loading?: string;
-        noRows?: string;
-        requestFailed?: string;
-        retry?: string;
-    }
-
-    interface TreeListPdfMargin {
-        bottom?: number|string;
-        left?: number|string;
-        right?: number|string;
-        top?: number|string;
-    }
-
-    interface TreeListPdf {
-        author?: string;
-        avoidLinks?: boolean|string;
-        creator?: string;
-        date?: Date;
-        fileName?: string;
-        forceProxy?: boolean;
-        keywords?: string;
-        landscape?: boolean;
-        margin?: TreeListPdfMargin;
-        paperSize?: string|any;
-        proxyURL?: string;
-        proxyTarget?: string;
-        subject?: string;
-        title?: string;
-    }
-
-    interface TreeListSortable {
-        allowUnsort?: boolean;
-        mode?: string;
-    }
-
-    interface TreeListToolbarItem {
-        name?: string;
-        text?: string;
-    }
-
-    interface TreeListOptions {
-        name?: string;
-        autoBind?: boolean;
-        columns?: TreeListColumn[];
-        resizable?: boolean;
-        reorderable?: boolean;
-        columnMenu?: TreeListColumnMenu;
-        dataSource?: any|any|kendo.data.TreeListDataSource;
-        editable?: TreeListEditable;
-        excel?: TreeListExcel;
-        filterable?: TreeListFilterable;
-        height?: number|string;
-        messages?: TreeListMessages;
-        pdf?: TreeListPdf;
-        scrollable?: boolean|any;
-        selectable?: boolean|string;
-        sortable?: TreeListSortable;
-        toolbar?: TreeListToolbarItem[];
-        cancel?(e: TreeListCancelEvent): void;
-        change?(e: TreeListChangeEvent): void;
-        collapse?(e: TreeListCollapseEvent): void;
-        dataBinding?(e: TreeListDataBindingEvent): void;
-        dataBound?(e: TreeListDataBoundEvent): void;
-        dragstart?(e: TreeListDragstartEvent): void;
-        drag?(e: TreeListDragEvent): void;
-        dragend?(e: TreeListDragendEvent): void;
-        drop?(e: TreeListDropEvent): void;
-        edit?(e: TreeListEditEvent): void;
-        excelExport?(e: TreeListExcelExportEvent): void;
-        expand?(e: TreeListExpandEvent): void;
-        filterMenuInit?(e: TreeListFilterMenuInitEvent): void;
-        pdfExport?(e: TreeListPdfExportEvent): void;
-        remove?(e: TreeListRemoveEvent): void;
-        save?(e: TreeListSaveEvent): void;
-        columnShow?(e: TreeListColumnShowEvent): void;
-        columnHide?(e: TreeListColumnHideEvent): void;
-        columnReorder?(e: TreeListColumnReorderEvent): void;
-        columnResize?(e: TreeListColumnResizeEvent): void;
-        columnMenuInit?(e: TreeListColumnMenuInitEvent): void;
-        columnLock?(e: TreeListColumnLockEvent): void;
-        columnUnlock?(e: TreeListColumnUnlockEvent): void;
-    }
-    interface TreeListEvent {
-        sender: TreeList;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface TreeListCancelEvent extends TreeListEvent {
-        container?: JQuery;
-        model?: kendo.data.TreeListModel;
-    }
-
-    interface TreeListChangeEvent extends TreeListEvent {
-    }
-
-    interface TreeListCollapseEvent extends TreeListEvent {
-        model?: kendo.data.TreeListModel;
-    }
-
-    interface TreeListDataBindingEvent extends TreeListEvent {
-    }
-
-    interface TreeListDataBoundEvent extends TreeListEvent {
-    }
-
-    interface TreeListDragstartEvent extends TreeListEvent {
-        source?: kendo.data.TreeListModel;
-    }
-
-    interface TreeListDragEvent extends TreeListEvent {
-        source?: kendo.data.TreeListModel;
-        target?: JQuery;
-    }
-
-    interface TreeListDragendEvent extends TreeListEvent {
-        source?: kendo.data.TreeListModel;
-        destination?: kendo.data.TreeListModel;
-    }
-
-    interface TreeListDropEvent extends TreeListEvent {
-        source?: kendo.data.TreeListModel;
-        destination?: kendo.data.TreeListModel;
-        valid?: boolean;
-        setValid?: boolean;
-    }
-
-    interface TreeListEditEvent extends TreeListEvent {
-        container?: JQuery;
-        model?: kendo.data.TreeListModel;
-    }
-
-    interface TreeListExcelExportEvent extends TreeListEvent {
-        data?: any;
-        workbook?: any;
-    }
-
-    interface TreeListExpandEvent extends TreeListEvent {
-        model?: kendo.data.TreeListModel;
-    }
-
-    interface TreeListFilterMenuInitEvent extends TreeListEvent {
-        container?: JQuery;
-        field?: string;
-    }
-
-    interface TreeListPdfExportEvent extends TreeListEvent {
-        promise?: JQueryPromise<any>;
-    }
-
-    interface TreeListRemoveEvent extends TreeListEvent {
-        model?: kendo.data.TreeListModel;
-        row?: JQuery;
-    }
-
-    interface TreeListSaveEvent extends TreeListEvent {
-        model?: kendo.data.TreeListModel;
-        container?: JQuery;
-    }
-
-    interface TreeListColumnShowEvent extends TreeListEvent {
-        column?: any;
-    }
-
-    interface TreeListColumnHideEvent extends TreeListEvent {
-        column?: any;
-    }
-
-    interface TreeListColumnReorderEvent extends TreeListEvent {
-        column?: any;
-        newIndex?: number;
-        oldIndex?: number;
-    }
-
-    interface TreeListColumnResizeEvent extends TreeListEvent {
-        column?: any;
-        newWidth?: number;
-        oldWidth?: number;
-    }
-
-    interface TreeListColumnMenuInitEvent extends TreeListEvent {
-        container?: JQuery;
-        field?: string;
-    }
-
-    interface TreeListColumnLockEvent extends TreeListEvent {
-        column?: any;
-    }
-
-    interface TreeListColumnUnlockEvent extends TreeListEvent {
-        column?: any;
-    }
-
-
-    class TreeView extends kendo.ui.Widget {
-
-        static fn: TreeView;
-
-        options: TreeViewOptions;
-
-        dataSource: kendo.data.DataSource;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): TreeView;
-
-        constructor(element: Element, options?: TreeViewOptions);
-
-
-        append(nodeData: any, parentNode?: JQuery, success?: Function): JQuery;
-        append(nodeData: JQuery, parentNode?: JQuery, success?: Function): JQuery;
-        collapse(nodes: JQuery): void;
-        collapse(nodes: Element): void;
-        collapse(nodes: string): void;
-        dataItem(node: JQuery): kendo.data.Node;
-        dataItem(node: Element): kendo.data.Node;
-        dataItem(node: string): kendo.data.Node;
-        destroy(): void;
-        detach(node: JQuery): JQuery;
-        detach(node: Element): JQuery;
-        detach(node: string): JQuery;
-        enable(nodes: JQuery, enable?: boolean): void;
-        enable(nodes: Element, enable?: boolean): void;
-        enable(nodes: string, enable?: boolean): void;
-        expand(nodes: JQuery): void;
-        expand(nodes: Element): void;
-        expand(nodes: string): void;
-        expandPath(path: any, complete: Function): void;
-        expandTo(targetNode: kendo.data.Node): void;
-        expandTo(targetNode: any): void;
-        findByText(text: string): JQuery;
-        findByUid(text: string): JQuery;
-        insertAfter(nodeData: any, referenceNode: JQuery): void;
-        insertBefore(nodeData: any, referenceNode: JQuery): void;
-        items(): any;
-        parent(node: JQuery): JQuery;
-        parent(node: Element): JQuery;
-        parent(node: string): JQuery;
-        remove(node: JQuery): void;
-        remove(node: Element): void;
-        remove(node: string): void;
-        select(): JQuery;
-        select(node?: JQuery): void;
-        select(node?: Element): void;
-        select(node?: string): void;
-        setDataSource(dataSource: kendo.data.HierarchicalDataSource): void;
-        text(node: JQuery): string;
-        text(node: Element): string;
-        text(node: string): string;
-        text(node: JQuery, newText: string): void;
-        text(node: Element, newText: string): void;
-        text(node: string, newText: string): void;
-        toggle(node: JQuery): void;
-        toggle(node: Element): void;
-        toggle(node: string): void;
-        updateIndeterminate(node: JQuery): void;
-
-    }
-
-    interface TreeViewAnimationCollapse {
-        duration?: number;
-        effects?: string;
-    }
-
-    interface TreeViewAnimationExpand {
-        duration?: number;
-        effects?: string;
-    }
-
-    interface TreeViewAnimation {
-        collapse?: TreeViewAnimationCollapse;
-        expand?: TreeViewAnimationExpand;
-    }
-
-    interface TreeViewCheckboxes {
-        checkChildren?: boolean;
-        name?: string;
-        template?: string|Function;
-    }
-
-    interface TreeViewMessages {
-        loading?: string;
-        requestFailed?: string;
-        retry?: string;
-    }
-
-    interface TreeViewOptions {
-        name?: string;
-        animation?: TreeViewAnimation;
-        autoBind?: boolean;
-        autoScroll?: boolean;
-        checkboxes?: TreeViewCheckboxes;
-        dataImageUrlField?: string;
-        dataSource?: any|any|kendo.data.HierarchicalDataSource;
-        dataSpriteCssClassField?: string;
-        dataTextField?: string|any;
-        dataUrlField?: string;
-        dragAndDrop?: boolean;
-        loadOnDemand?: boolean;
-        messages?: TreeViewMessages;
-        template?: string|Function;
-        change?(e: TreeViewEvent): void;
-        check?(e: TreeViewCheckEvent): void;
-        collapse?(e: TreeViewCollapseEvent): void;
-        dataBound?(e: TreeViewDataBoundEvent): void;
-        drag?(e: TreeViewDragEvent): void;
-        dragend?(e: TreeViewDragendEvent): void;
-        dragstart?(e: TreeViewDragstartEvent): void;
-        drop?(e: TreeViewDropEvent): void;
-        expand?(e: TreeViewExpandEvent): void;
-        navigate?(e: TreeViewNavigateEvent): void;
-        select?(e: TreeViewSelectEvent): void;
-    }
-    interface TreeViewEvent {
-        sender: TreeView;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface TreeViewCheckEvent extends TreeViewEvent {
-        node?: Element;
-    }
-
-    interface TreeViewCollapseEvent extends TreeViewEvent {
-        node?: Element;
-    }
-
-    interface TreeViewDataBoundEvent extends TreeViewEvent {
-        node?: JQuery;
-    }
-
-    interface TreeViewDragEvent extends TreeViewEvent {
-        sourceNode?: Element;
-        dropTarget?: Element;
-        pageX?: number;
-        pageY?: number;
-        statusClass?: string;
-        setStatusClass?: Function;
-    }
-
-    interface TreeViewDragendEvent extends TreeViewEvent {
-        sourceNode?: Element;
-        destinationNode?: Element;
-        dropPosition?: string;
-    }
-
-    interface TreeViewDragstartEvent extends TreeViewEvent {
-        sourceNode?: Element;
-    }
-
-    interface TreeViewDropEvent extends TreeViewEvent {
-        sourceNode?: Element;
-        destinationNode?: Element;
-        valid?: boolean;
-        setValid?: Function;
-        dropTarget?: Element;
-        dropPosition?: string;
-    }
-
-    interface TreeViewExpandEvent extends TreeViewEvent {
-        node?: Element;
-    }
-
-    interface TreeViewNavigateEvent extends TreeViewEvent {
-        node?: Element;
-    }
-
-    interface TreeViewSelectEvent extends TreeViewEvent {
-        node?: Element;
-    }
-
-
-    class Upload extends kendo.ui.Widget {
-
-        static fn: Upload;
-
-        options: UploadOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Upload;
-
-        constructor(element: Element, options?: UploadOptions);
-
-
-        destroy(): void;
-        disable(): void;
-        enable(enable?: boolean): void;
-        toggle(enable: boolean): void;
-
-    }
-
-    interface UploadAsync {
-        autoUpload?: boolean;
-        batch?: boolean;
-        removeField?: string;
-        removeUrl?: string;
-        removeVerb?: string;
-        saveField?: string;
-        saveUrl?: string;
-        withCredentials?: boolean;
-    }
-
-    interface UploadFile {
-        extension?: string;
-        name?: string;
-        size?: number;
-    }
-
-    interface UploadLocalization {
-        cancel?: string;
-        dropFilesHere?: string;
-        headerStatusUploaded?: string;
-        headerStatusUploading?: string;
-        remove?: string;
-        retry?: string;
-        select?: string;
-        statusFailed?: string;
-        statusUploaded?: string;
-        statusUploading?: string;
-        uploadSelectedFiles?: string;
-    }
-
-    interface UploadOptions {
-        name?: string;
-        async?: UploadAsync;
-        enabled?: boolean;
-        files?: UploadFile[];
-        localization?: UploadLocalization;
-        multiple?: boolean;
-        showFileList?: boolean;
-        template?: string|Function;
-        cancel?(e: UploadCancelEvent): void;
-        complete?(e: UploadEvent): void;
-        error?(e: UploadErrorEvent): void;
-        progress?(e: UploadProgressEvent): void;
-        remove?(e: UploadRemoveEvent): void;
-        select?(e: UploadSelectEvent): void;
-        success?(e: UploadSuccessEvent): void;
-        upload?(e: UploadUploadEvent): void;
-    }
-    interface UploadEvent {
-        sender: Upload;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface UploadCancelEvent extends UploadEvent {
-        files?: UploadFile[];
-    }
-
-    interface UploadErrorEvent extends UploadEvent {
-        files?: UploadFile[];
-        operation?: string;
-        XMLHttpRequest?: any;
-    }
-
-    interface UploadProgressEvent extends UploadEvent {
-        files?: UploadFile[];
-        percentComplete?: number;
-    }
-
-    interface UploadRemoveEvent extends UploadEvent {
-        files?: UploadFile[];
-        data?: any;
-    }
-
-    interface UploadSelectEvent extends UploadEvent {
-        e?: any;
-        files?: UploadFile[];
-    }
-
-    interface UploadSuccessEvent extends UploadEvent {
-        files?: UploadFile[];
-        operation?: string;
-        response?: any;
-        XMLHttpRequest?: any;
-    }
-
-    interface UploadUploadEvent extends UploadEvent {
-        files?: UploadFile[];
-        data?: any;
-        formData?: any;
-        XMLHttpRequest?: any;
-    }
-
-
-    class Validator extends kendo.ui.Widget {
-
-        static fn: Validator;
-
-        options: ValidatorOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Validator;
-
-        constructor(element: Element, options?: ValidatorOptions);
-
-
-        errors(): any;
-        hideMessages(): void;
-        validate(): boolean;
-        validateInput(input: Element): boolean;
-        validateInput(input: JQuery): boolean;
-
-    }
-
-    interface ValidatorOptions {
-        name?: string;
-        errorTemplate?: string;
-        messages?: any;
-        rules?: any;
-        validateOnBlur?: boolean;
-        validate?(e: ValidatorValidateEvent): void;
-    }
-    interface ValidatorEvent {
-        sender: Validator;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface ValidatorValidateEvent extends ValidatorEvent {
-        valid?: boolean;
-    }
-
-
-    class Window extends kendo.ui.Widget {
-
-        static fn: Window;
-
-        options: WindowOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Window;
-
-        constructor(element: Element, options?: WindowOptions);
-
-
-        center(): kendo.ui.Window;
-        close(): kendo.ui.Window;
-        content(): string;
-        content(content?: string): kendo.ui.Window;
-        content(content?: JQuery): kendo.ui.Window;
-        destroy(): void;
-        maximize(): kendo.ui.Window;
-        minimize(): kendo.ui.Window;
-        open(): kendo.ui.Window;
-        pin(): void;
-        refresh(options: any): kendo.ui.Window;
-        restore(): kendo.ui.Window;
-        setOptions(options: any): void;
-        title(): string;
-        title(text?: string): kendo.ui.Window;
-        toFront(): kendo.ui.Window;
-        toggleMaximization(): kendo.ui.Window;
-        unpin(): void;
-
-    }
-
-    interface WindowAnimationClose {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface WindowAnimationOpen {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface WindowAnimation {
-        close?: WindowAnimationClose;
-        open?: WindowAnimationOpen;
-    }
-
-    interface WindowContent {
-        template?: string;
-    }
-
-    interface WindowPosition {
-        top?: number|string;
-        left?: number|string;
-    }
-
-    interface WindowRefreshOptions {
-        url?: string;
-        data?: any;
-        type?: string;
-        template?: string;
-        iframe?: boolean;
-    }
-
-    interface WindowOptions {
-        name?: string;
-        actions?: any;
-        animation?: WindowAnimation;
-        appendTo?: any|string;
-        autoFocus?: boolean;
-        content?: WindowContent;
-        draggable?: boolean;
-        iframe?: boolean;
-        maxHeight?: number;
-        maxWidth?: number;
-        minHeight?: number;
-        minWidth?: number;
-        modal?: boolean;
-        pinned?: boolean;
-        position?: WindowPosition;
-        resizable?: boolean;
-        scrollable?: boolean;
-        title?: string|boolean;
-        visible?: boolean;
-        width?: number|string;
-        height?: number|string;
-        activate?(e: WindowEvent): void;
-        close?(e: WindowCloseEvent): void;
-        deactivate?(e: WindowEvent): void;
-        dragend?(e: WindowEvent): void;
-        dragstart?(e: WindowEvent): void;
-        error?(e: WindowErrorEvent): void;
-        maximize?(e: WindowEvent): void;
-        minimize?(e: WindowEvent): void;
-        open?(e: WindowEvent): void;
-        refresh?(e: WindowEvent): void;
-        resize?(e: WindowEvent): void;
-    }
-    interface WindowEvent {
-        sender: Window;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface WindowCloseEvent extends WindowEvent {
-        userTriggered?: boolean;
-    }
-
-    interface WindowErrorEvent extends WindowEvent {
-        xhr?: JQueryXHR;
-        status?: string;
-    }
-
-
-}
-declare namespace kendo.dataviz.ui {
-    class Barcode extends kendo.ui.Widget {
-
-        static fn: Barcode;
-
-        options: BarcodeOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Barcode;
-
-        constructor(element: Element, options?: BarcodeOptions);
-
-
-        exportImage(options: any): JQueryPromise<any>;
-        exportPDF(options?: kendo.drawing.PDFOptions): JQueryPromise<any>;
-        exportSVG(options: any): JQueryPromise<any>;
-        imageDataURL(): string;
-        redraw(): void;
-        resize(force?: boolean): void;
-        svg(): string;
-        value(): string;
-        value(value: number): void;
-        value(value: string): void;
-
-    }
-
-    interface BarcodeBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface BarcodePadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface BarcodeTextMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface BarcodeText {
-        color?: string;
-        font?: string;
-        margin?: BarcodeTextMargin;
-        visible?: boolean;
-    }
-
-    interface BarcodeExportImageOptions {
-        width?: string;
-        height?: string;
-    }
-
-    interface BarcodeExportSVGOptions {
-        raw?: boolean;
-    }
-
-    interface BarcodeOptions {
-        name?: string;
-        renderAs?: string;
-        background?: string;
-        border?: BarcodeBorder;
-        checksum?: boolean;
-        color?: string;
-        height?: number;
-        padding?: BarcodePadding;
-        text?: BarcodeText;
-        type?: string;
-        value?: string;
-        width?: number;
-    }
-    interface BarcodeEvent {
-        sender: Barcode;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Chart extends kendo.ui.Widget {
-
-        static fn: Chart;
-
-        options: ChartOptions;
-
-        dataSource: kendo.data.DataSource;
-        surface: kendo.drawing.Surface;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Chart;
-
-        constructor(element: Element, options?: ChartOptions);
-
-
-        destroy(): void;
-        exportImage(options: any): JQueryPromise<any>;
-        exportPDF(options?: kendo.drawing.PDFOptions): JQueryPromise<any>;
-        exportSVG(options: any): JQueryPromise<any>;
-        getAxis(name: string): kendo.dataviz.ChartAxis;
-        redraw(): void;
-        refresh(): void;
-        resize(force?: boolean): void;
-        saveAsPDF(): void;
-        setDataSource(dataSource: kendo.data.DataSource): void;
-        setOptions(options: any): void;
-        svg(): string;
-        imageDataURL(): string;
-        toggleHighlight(show: boolean, options: any): void;
-
-    }
-
-    interface ChartCategoryAxisItemAutoBaseUnitSteps {
-        seconds?: any;
-        minutes?: any;
-        hours?: any;
-        days?: any;
-        weeks?: any;
-        months?: any;
-        years?: any;
-    }
-
-    interface ChartCategoryAxisItemCrosshairTooltipBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartCategoryAxisItemCrosshairTooltipPadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartCategoryAxisItemCrosshairTooltip {
-        background?: string;
-        border?: ChartCategoryAxisItemCrosshairTooltipBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        padding?: ChartCategoryAxisItemCrosshairTooltipPadding;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface ChartCategoryAxisItemCrosshair {
-        color?: string;
-        opacity?: number;
-        tooltip?: ChartCategoryAxisItemCrosshairTooltip;
-        visible?: boolean;
-        width?: number;
-    }
-
-    interface ChartCategoryAxisItemLabelsBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartCategoryAxisItemLabelsDateFormats {
-        days?: string;
-        hours?: string;
-        months?: string;
-        weeks?: string;
-        years?: string;
-    }
-
-    interface ChartCategoryAxisItemLabelsMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartCategoryAxisItemLabelsPadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartCategoryAxisItemLabelsRotation {
-        align?: string;
-        angle?: number|string;
-    }
-
-    interface ChartCategoryAxisItemLabels {
-        background?: string;
-        border?: ChartCategoryAxisItemLabelsBorder;
-        color?: string;
-        culture?: string;
-        dateFormats?: ChartCategoryAxisItemLabelsDateFormats;
-        font?: string;
-        format?: string;
-        margin?: ChartCategoryAxisItemLabelsMargin;
-        mirror?: boolean;
-        padding?: ChartCategoryAxisItemLabelsPadding;
-        rotation?: ChartCategoryAxisItemLabelsRotation;
-        skip?: number;
-        step?: number;
-        template?: string|Function;
-        visible?: boolean;
-        visual?: Function;
-    }
-
-    interface ChartCategoryAxisItemLine {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-    }
-
-    interface ChartCategoryAxisItemMajorGridLines {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface ChartCategoryAxisItemMajorTicks {
-        color?: string;
-        size?: number;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface ChartCategoryAxisItemMinorGridLines {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface ChartCategoryAxisItemMinorTicks {
-        color?: string;
-        size?: number;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface ChartCategoryAxisItemNotesDataItemIconBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface ChartCategoryAxisItemNotesDataItemIcon {
-        background?: string;
-        border?: ChartCategoryAxisItemNotesDataItemIconBorder;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface ChartCategoryAxisItemNotesDataItemLabelBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartCategoryAxisItemNotesDataItemLabel {
-        background?: string;
-        border?: ChartCategoryAxisItemNotesDataItemLabelBorder;
-        color?: string;
-        font?: string;
-        template?: string|Function;
-        visible?: boolean;
-        rotation?: number;
-        format?: string;
-        text?: string;
-        position?: string;
-    }
-
-    interface ChartCategoryAxisItemNotesDataItemLine {
-        width?: number;
-        color?: string;
-        length?: number;
-    }
-
-    interface ChartCategoryAxisItemNotesDataItem {
-        value?: any;
-        position?: string;
-        icon?: ChartCategoryAxisItemNotesDataItemIcon;
-        label?: ChartCategoryAxisItemNotesDataItemLabel;
-        line?: ChartCategoryAxisItemNotesDataItemLine;
-    }
-
-    interface ChartCategoryAxisItemNotesIconBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface ChartCategoryAxisItemNotesIcon {
-        background?: string;
-        border?: ChartCategoryAxisItemNotesIconBorder;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface ChartCategoryAxisItemNotesLabelBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartCategoryAxisItemNotesLabel {
-        background?: string;
-        border?: ChartCategoryAxisItemNotesLabelBorder;
-        color?: string;
-        font?: string;
-        template?: string|Function;
-        visible?: boolean;
-        rotation?: number;
-        format?: string;
-        position?: string;
-    }
-
-    interface ChartCategoryAxisItemNotesLine {
-        width?: number;
-        color?: string;
-        length?: number;
-    }
-
-    interface ChartCategoryAxisItemNotes {
-        position?: string;
-        icon?: ChartCategoryAxisItemNotesIcon;
-        label?: ChartCategoryAxisItemNotesLabel;
-        line?: ChartCategoryAxisItemNotesLine;
-        data?: ChartCategoryAxisItemNotesDataItem[];
-        visual?: Function;
-    }
-
-    interface ChartCategoryAxisItemPlotBand {
-        color?: string;
-        from?: number;
-        opacity?: number;
-        to?: number;
-    }
-
-    interface ChartCategoryAxisItemSelectMousewheel {
-        reverse?: boolean;
-        zoom?: string;
-    }
-
-    interface ChartCategoryAxisItemSelect {
-        from?: any;
-        max?: any;
-        min?: any;
-        mousewheel?: ChartCategoryAxisItemSelectMousewheel;
-        to?: any;
-    }
-
-    interface ChartCategoryAxisItemTitleBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartCategoryAxisItemTitleMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartCategoryAxisItemTitlePadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartCategoryAxisItemTitle {
-        background?: string;
-        border?: ChartCategoryAxisItemTitleBorder;
-        color?: string;
-        font?: string;
-        margin?: ChartCategoryAxisItemTitleMargin;
-        padding?: ChartCategoryAxisItemTitlePadding;
-        position?: string;
-        rotation?: number;
-        text?: string;
-        visible?: boolean;
-        visual?: Function;
-    }
-
-    interface ChartCategoryAxisItem {
-        autoBaseUnitSteps?: ChartCategoryAxisItemAutoBaseUnitSteps;
-        axisCrossingValue?: any|Date|any;
-        background?: string;
-        baseUnit?: string;
-        baseUnitStep?: any;
-        categories?: any;
-        color?: string;
-        crosshair?: ChartCategoryAxisItemCrosshair;
-        field?: string;
-        justified?: boolean;
-        labels?: ChartCategoryAxisItemLabels;
-        line?: ChartCategoryAxisItemLine;
-        majorGridLines?: ChartCategoryAxisItemMajorGridLines;
-        majorTicks?: ChartCategoryAxisItemMajorTicks;
-        max?: any;
-        maxDateGroups?: number;
-        min?: any;
-        minorGridLines?: ChartCategoryAxisItemMinorGridLines;
-        minorTicks?: ChartCategoryAxisItemMinorTicks;
-        name?: string;
-        pane?: string;
-        plotBands?: ChartCategoryAxisItemPlotBand[];
-        reverse?: boolean;
-        roundToBaseUnit?: boolean;
-        select?: ChartCategoryAxisItemSelect;
-        startAngle?: number;
-        title?: ChartCategoryAxisItemTitle;
-        type?: string;
-        visible?: boolean;
-        weekStartDay?: number;
-        notes?: ChartCategoryAxisItemNotes;
-    }
-
-    interface ChartChartAreaBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartChartAreaMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartChartArea {
-        background?: string;
-        border?: ChartChartAreaBorder;
-        height?: number;
-        margin?: ChartChartAreaMargin;
-        opacity?: number;
-        width?: number;
-    }
-
-    interface ChartLegendBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartLegendInactiveItemsLabels {
-        color?: string;
-        font?: string;
-        template?: string|Function;
-    }
-
-    interface ChartLegendInactiveItems {
-        labels?: ChartLegendInactiveItemsLabels;
-    }
-
-    interface ChartLegendItem {
-        cursor?: string;
-        visual?: Function;
-    }
-
-    interface ChartLegendLabelsMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartLegendLabelsPadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartLegendLabels {
-        color?: string;
-        font?: string;
-        margin?: ChartLegendLabelsMargin;
-        padding?: ChartLegendLabelsPadding;
-        template?: string|Function;
-    }
-
-    interface ChartLegendMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartLegendPadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartLegend {
-        align?: string;
-        background?: string;
-        border?: ChartLegendBorder;
-        height?: number;
-        inactiveItems?: ChartLegendInactiveItems;
-        item?: ChartLegendItem;
-        labels?: ChartLegendLabels;
-        margin?: ChartLegendMargin;
-        offsetX?: number;
-        offsetY?: number;
-        orientation?: string;
-        padding?: ChartLegendPadding;
-        position?: string;
-        reverse?: boolean;
-        visible?: boolean;
-        width?: number;
-    }
-
-    interface ChartPaneBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartPaneMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartPanePadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartPaneTitleBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartPaneTitleMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartPaneTitle {
-        background?: string;
-        border?: ChartPaneTitleBorder;
-        color?: string;
-        font?: string;
-        margin?: ChartPaneTitleMargin;
-        position?: string;
-        text?: string;
-        visible?: boolean;
-        visual?: Function;
-    }
-
-    interface ChartPane {
-        background?: string;
-        border?: ChartPaneBorder;
-        clip?: boolean;
-        height?: number;
-        margin?: ChartPaneMargin;
-        name?: string;
-        padding?: ChartPanePadding;
-        title?: ChartPaneTitle;
-    }
-
-    interface ChartPannable {
-        key?: string;
-        lock?: string;
-    }
-
-    interface ChartPdfMargin {
-        bottom?: number|string;
-        left?: number|string;
-        right?: number|string;
-        top?: number|string;
-    }
-
-    interface ChartPdf {
-        author?: string;
-        creator?: string;
-        date?: Date;
-        forceProxy?: boolean;
-        fileName?: string;
-        keywords?: string;
-        landscape?: boolean;
-        margin?: ChartPdfMargin;
-        paperSize?: string|any;
-        proxyURL?: string;
-        proxyTarget?: string;
-        subject?: string;
-        title?: string;
-    }
-
-    interface ChartPlotAreaBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartPlotAreaMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartPlotAreaPadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartPlotArea {
-        background?: string;
-        border?: ChartPlotAreaBorder;
-        margin?: ChartPlotAreaMargin;
-        opacity?: number;
-        padding?: ChartPlotAreaPadding;
-    }
-
-    interface ChartSeriesItemBorder {
-        color?: string|Function;
-        dashType?: string|Function;
-        opacity?: number|Function;
-        width?: number|Function;
-    }
-
-    interface ChartSeriesItemConnectors {
-        color?: string;
-        padding?: number;
-        width?: number;
-    }
-
-    interface ChartSeriesItemErrorBarsLine {
-        width?: number;
-        dashType?: string;
-    }
-
-    interface ChartSeriesItemErrorBars {
-        value?: string|number|any|Function;
-        visual?: Function;
-        xValue?: string|number|any|Function;
-        yValue?: string|number|any|Function;
-        endCaps?: boolean;
-        color?: string;
-        line?: ChartSeriesItemErrorBarsLine;
-    }
-
-    interface ChartSeriesItemExtremesBorder {
-        color?: string|Function;
-        width?: number|Function;
-    }
-
-    interface ChartSeriesItemExtremes {
-        background?: string|Function;
-        border?: ChartSeriesItemExtremesBorder;
-        size?: number|Function;
-        type?: string|Function;
-        rotation?: number|Function;
-    }
-
-    interface ChartSeriesItemHighlightBorder {
-        color?: string;
-        opacity?: number;
-        width?: number;
-    }
-
-    interface ChartSeriesItemHighlightLine {
-        color?: string;
-        opacity?: number;
-        width?: number;
-    }
-
-    interface ChartSeriesItemHighlight {
-        border?: ChartSeriesItemHighlightBorder;
-        color?: string;
-        line?: ChartSeriesItemHighlightLine;
-        opacity?: number;
-        toggle?: Function;
-        visible?: boolean;
-        visual?: Function;
-    }
-
-    interface ChartSeriesItemLabelsBorder {
-        color?: string|Function;
-        dashType?: string|Function;
-        width?: number|Function;
-    }
-
-    interface ChartSeriesItemLabelsFromBorder {
-        color?: string|Function;
-        dashType?: string|Function;
-        width?: number|Function;
-    }
-
-    interface ChartSeriesItemLabelsFromMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartSeriesItemLabelsFromPadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartSeriesItemLabelsFrom {
-        background?: string|Function;
-        border?: ChartSeriesItemLabelsFromBorder;
-        color?: string|Function;
-        font?: string|Function;
-        format?: string|Function;
-        margin?: ChartSeriesItemLabelsFromMargin;
-        padding?: ChartSeriesItemLabelsFromPadding;
-        position?: string|Function;
-        template?: string|Function;
-        visible?: boolean|Function;
-    }
-
-    interface ChartSeriesItemLabelsMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartSeriesItemLabelsPadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartSeriesItemLabelsToBorder {
-        color?: string|Function;
-        dashType?: string|Function;
-        width?: number|Function;
-    }
-
-    interface ChartSeriesItemLabelsToMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartSeriesItemLabelsToPadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartSeriesItemLabelsTo {
-        background?: string|Function;
-        border?: ChartSeriesItemLabelsToBorder;
-        color?: string|Function;
-        font?: string|Function;
-        format?: string|Function;
-        margin?: ChartSeriesItemLabelsToMargin;
-        padding?: ChartSeriesItemLabelsToPadding;
-        position?: string|Function;
-        template?: string|Function;
-        visible?: boolean|Function;
-    }
-
-    interface ChartSeriesItemLabels {
-        align?: string;
-        background?: string|Function;
-        border?: ChartSeriesItemLabelsBorder;
-        color?: string|Function;
-        distance?: number;
-        font?: string|Function;
-        format?: string|Function;
-        margin?: ChartSeriesItemLabelsMargin;
-        padding?: ChartSeriesItemLabelsPadding;
-        position?: string|Function;
-        template?: string|Function;
-        visible?: boolean|Function;
-        visual?: Function;
-        from?: ChartSeriesItemLabelsFrom;
-        to?: ChartSeriesItemLabelsTo;
-    }
-
-    interface ChartSeriesItemLine {
-        color?: string;
-        opacity?: number;
-        width?: string;
-        style?: string;
-    }
-
-    interface ChartSeriesItemMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartSeriesItemMarkersBorder {
-        color?: string|Function;
-        width?: number|Function;
-    }
-
-    interface ChartSeriesItemMarkers {
-        background?: string|Function;
-        border?: ChartSeriesItemMarkersBorder;
-        size?: number|Function;
-        type?: string|Function;
-        visible?: boolean|Function;
-        visual?: Function;
-        rotation?: number|Function;
-    }
-
-    interface ChartSeriesItemNegativeValues {
-        color?: string;
-        visible?: boolean;
-    }
-
-    interface ChartSeriesItemNotesIconBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface ChartSeriesItemNotesIcon {
-        background?: string;
-        border?: ChartSeriesItemNotesIconBorder;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface ChartSeriesItemNotesLabelBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartSeriesItemNotesLabel {
-        background?: string;
-        border?: ChartSeriesItemNotesLabelBorder;
-        color?: string;
-        font?: string;
-        template?: string|Function;
-        visible?: boolean;
-        rotation?: number;
-        format?: string;
-        position?: string;
-    }
-
-    interface ChartSeriesItemNotesLine {
-        width?: number;
-        color?: string;
-        length?: number;
-    }
-
-    interface ChartSeriesItemNotes {
-        position?: string;
-        icon?: ChartSeriesItemNotesIcon;
-        label?: ChartSeriesItemNotesLabel;
-        line?: ChartSeriesItemNotesLine;
-        visual?: Function;
-    }
-
-    interface ChartSeriesItemOutliersBorder {
-        color?: string|Function;
-        width?: number|Function;
-    }
-
-    interface ChartSeriesItemOutliers {
-        background?: string|Function;
-        border?: ChartSeriesItemOutliersBorder;
-        size?: number|Function;
-        type?: string|Function;
-        rotation?: number|Function;
-    }
-
-    interface ChartSeriesItemOverlay {
-        gradient?: string;
-    }
-
-    interface ChartSeriesItemStack {
-        type?: string;
-        group?: string;
-    }
-
-    interface ChartSeriesItemTargetBorder {
-        color?: string|Function;
-        dashType?: string|Function;
-        width?: number|Function;
-    }
-
-    interface ChartSeriesItemTargetLine {
-        width?: any|Function;
-    }
-
-    interface ChartSeriesItemTarget {
-        border?: ChartSeriesItemTargetBorder;
-        color?: string|Function;
-        line?: ChartSeriesItemTargetLine;
-    }
-
-    interface ChartSeriesItemTooltipBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface ChartSeriesItemTooltipPadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartSeriesItemTooltip {
-        background?: string;
-        border?: ChartSeriesItemTooltipBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        padding?: ChartSeriesItemTooltipPadding;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface ChartSeriesItem {
-        aggregate?: string|Function;
-        axis?: string;
-        border?: ChartSeriesItemBorder;
-        categoryField?: string;
-        closeField?: string;
-        color?: string|Function;
-        colorField?: string;
-        connectors?: ChartSeriesItemConnectors;
-        currentField?: string;
-        dashType?: string;
-        data?: any;
-        downColor?: string|Function;
-        downColorField?: string;
-        segmentSpacing?: number;
-        summaryField?: string;
-        neckRatio?: number;
-        dynamicSlope?: boolean;
-        dynamicHeight?: boolean;
-        errorBars?: ChartSeriesItemErrorBars;
-        errorLowField?: string;
-        errorHighField?: string;
-        xErrorLowField?: string;
-        xErrorHighField?: string;
-        yErrorLowField?: string;
-        yErrorHighField?: string;
-        explodeField?: string;
-        field?: string;
-        fromField?: string;
-        toField?: string;
-        noteTextField?: string;
-        lowerField?: string;
-        q1Field?: string;
-        medianField?: string;
-        q3Field?: string;
-        upperField?: string;
-        meanField?: string;
-        outliersField?: string;
-        gap?: number;
-        highField?: string;
-        highlight?: ChartSeriesItemHighlight;
-        holeSize?: number;
-        labels?: ChartSeriesItemLabels;
-        line?: ChartSeriesItemLine;
-        lowField?: string;
-        margin?: ChartSeriesItemMargin;
-        markers?: ChartSeriesItemMarkers;
-        outliers?: ChartSeriesItemOutliers;
-        extremes?: ChartSeriesItemExtremes;
-        maxSize?: number;
-        minSize?: number;
-        missingValues?: string;
-        style?: string;
-        name?: string;
-        negativeColor?: string;
-        negativeValues?: ChartSeriesItemNegativeValues;
-        opacity?: number;
-        openField?: string;
-        overlay?: ChartSeriesItemOverlay;
-        padding?: number;
-        size?: number;
-        sizeField?: string;
-        spacing?: number;
-        stack?: ChartSeriesItemStack;
-        startAngle?: number;
-        target?: ChartSeriesItemTarget;
-        targetField?: string;
-        tooltip?: ChartSeriesItemTooltip;
-        type?: string;
-        visible?: boolean;
-        visibleInLegend?: boolean;
-        visibleInLegendField?: string;
-        visual?: Function;
-        width?: number;
-        xAxis?: string;
-        xField?: string;
-        yAxis?: string;
-        yField?: string;
-        notes?: ChartSeriesItemNotes;
-        zIndex?: number;
-    }
-
-    interface ChartSeriesDefaultsBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartSeriesDefaultsLabelsBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartSeriesDefaultsLabelsFromBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartSeriesDefaultsLabelsFromMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartSeriesDefaultsLabelsFromPadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartSeriesDefaultsLabelsFrom {
-        background?: string;
-        border?: ChartSeriesDefaultsLabelsFromBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        margin?: ChartSeriesDefaultsLabelsFromMargin;
-        padding?: ChartSeriesDefaultsLabelsFromPadding;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface ChartSeriesDefaultsLabelsMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartSeriesDefaultsLabelsPadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartSeriesDefaultsLabelsToBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartSeriesDefaultsLabelsToMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartSeriesDefaultsLabelsToPadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartSeriesDefaultsLabelsTo {
-        background?: string;
-        border?: ChartSeriesDefaultsLabelsToBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        margin?: ChartSeriesDefaultsLabelsToMargin;
-        padding?: ChartSeriesDefaultsLabelsToPadding;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface ChartSeriesDefaultsLabels {
-        background?: string;
-        border?: ChartSeriesDefaultsLabelsBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        margin?: ChartSeriesDefaultsLabelsMargin;
-        padding?: ChartSeriesDefaultsLabelsPadding;
-        template?: string|Function;
-        visible?: boolean;
-        visual?: Function;
-        from?: ChartSeriesDefaultsLabelsFrom;
-        to?: ChartSeriesDefaultsLabelsTo;
-    }
-
-    interface ChartSeriesDefaultsNotesIconBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface ChartSeriesDefaultsNotesIcon {
-        background?: string;
-        border?: ChartSeriesDefaultsNotesIconBorder;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface ChartSeriesDefaultsNotesLabelBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartSeriesDefaultsNotesLabel {
-        background?: string;
-        border?: ChartSeriesDefaultsNotesLabelBorder;
-        color?: string;
-        font?: string;
-        template?: string|Function;
-        visible?: boolean;
-        rotation?: number;
-        format?: string;
-        position?: string;
-    }
-
-    interface ChartSeriesDefaultsNotesLine {
-        width?: number;
-        color?: string;
-        length?: number;
-    }
-
-    interface ChartSeriesDefaultsNotes {
-        icon?: ChartSeriesDefaultsNotesIcon;
-        label?: ChartSeriesDefaultsNotesLabel;
-        line?: ChartSeriesDefaultsNotesLine;
-        visual?: Function;
-    }
-
-    interface ChartSeriesDefaultsOverlay {
-        gradient?: string;
-    }
-
-    interface ChartSeriesDefaultsStack {
-        type?: string;
-    }
-
-    interface ChartSeriesDefaultsTooltipBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface ChartSeriesDefaultsTooltipPadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartSeriesDefaultsTooltip {
-        background?: string;
-        border?: ChartSeriesDefaultsTooltipBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        padding?: ChartSeriesDefaultsTooltipPadding;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface ChartSeriesDefaults {
-        area?: any;
-        bar?: any;
-        border?: ChartSeriesDefaultsBorder;
-        bubble?: any;
-        candlestick?: any;
-        column?: any;
-        donut?: any;
-        gap?: number;
-        labels?: ChartSeriesDefaultsLabels;
-        line?: any;
-        ohlc?: any;
-        overlay?: ChartSeriesDefaultsOverlay;
-        pie?: any;
-        scatter?: any;
-        scatterLine?: any;
-        spacing?: number;
-        stack?: ChartSeriesDefaultsStack;
-        type?: string;
-        tooltip?: ChartSeriesDefaultsTooltip;
-        verticalArea?: any;
-        verticalLine?: any;
-        visual?: Function;
-        notes?: ChartSeriesDefaultsNotes;
-    }
-
-    interface ChartTitleBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartTitleMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartTitlePadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartTitle {
-        align?: string;
-        background?: string;
-        border?: ChartTitleBorder;
-        color?: string;
-        font?: string;
-        margin?: ChartTitleMargin;
-        padding?: ChartTitlePadding;
-        position?: string;
-        text?: string;
-        visible?: boolean;
-    }
-
-    interface ChartTooltipBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface ChartTooltipPadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartTooltip {
-        background?: string;
-        border?: ChartTooltipBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        padding?: ChartTooltipPadding;
-        shared?: boolean;
-        sharedTemplate?: string|Function;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface ChartValueAxisItemCrosshairTooltipBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartValueAxisItemCrosshairTooltipPadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartValueAxisItemCrosshairTooltip {
-        background?: string;
-        border?: ChartValueAxisItemCrosshairTooltipBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        padding?: ChartValueAxisItemCrosshairTooltipPadding;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface ChartValueAxisItemCrosshair {
-        color?: string;
-        opacity?: number;
-        tooltip?: ChartValueAxisItemCrosshairTooltip;
-        visible?: boolean;
-        width?: number;
-    }
-
-    interface ChartValueAxisItemLabelsBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartValueAxisItemLabelsMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartValueAxisItemLabelsPadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartValueAxisItemLabelsRotation {
-        align?: string;
-        angle?: number|string;
-    }
-
-    interface ChartValueAxisItemLabels {
-        background?: string;
-        border?: ChartValueAxisItemLabelsBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        margin?: ChartValueAxisItemLabelsMargin;
-        mirror?: boolean;
-        padding?: ChartValueAxisItemLabelsPadding;
-        rotation?: ChartValueAxisItemLabelsRotation;
-        skip?: number;
-        step?: number;
-        template?: string|Function;
-        visible?: boolean;
-        visual?: Function;
-    }
-
-    interface ChartValueAxisItemLine {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-    }
-
-    interface ChartValueAxisItemMajorGridLines {
-        color?: string;
-        dashType?: string;
-        type?: string;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface ChartValueAxisItemMajorTicks {
-        color?: string;
-        size?: number;
-        visible?: boolean;
-        step?: number;
-        skip?: number;
-    }
-
-    interface ChartValueAxisItemMinorGridLines {
-        color?: string;
-        dashType?: string;
-        type?: string;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface ChartValueAxisItemMinorTicks {
-        color?: string;
-        size?: number;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface ChartValueAxisItemNotesDataItemIconBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface ChartValueAxisItemNotesDataItemIcon {
-        background?: string;
-        border?: ChartValueAxisItemNotesDataItemIconBorder;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface ChartValueAxisItemNotesDataItemLabelBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartValueAxisItemNotesDataItemLabel {
-        background?: string;
-        border?: ChartValueAxisItemNotesDataItemLabelBorder;
-        color?: string;
-        font?: string;
-        template?: string|Function;
-        visible?: boolean;
-        rotation?: number;
-        format?: string;
-        text?: string;
-        position?: string;
-    }
-
-    interface ChartValueAxisItemNotesDataItemLine {
-        width?: number;
-        color?: string;
-        length?: number;
-    }
-
-    interface ChartValueAxisItemNotesDataItem {
-        value?: any;
-        position?: string;
-        icon?: ChartValueAxisItemNotesDataItemIcon;
-        label?: ChartValueAxisItemNotesDataItemLabel;
-        line?: ChartValueAxisItemNotesDataItemLine;
-    }
-
-    interface ChartValueAxisItemNotesIconBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface ChartValueAxisItemNotesIcon {
-        background?: string;
-        border?: ChartValueAxisItemNotesIconBorder;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface ChartValueAxisItemNotesLabelBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartValueAxisItemNotesLabel {
-        background?: string;
-        border?: ChartValueAxisItemNotesLabelBorder;
-        color?: string;
-        font?: string;
-        template?: string|Function;
-        visible?: boolean;
-        rotation?: number;
-        format?: string;
-        position?: string;
-    }
-
-    interface ChartValueAxisItemNotesLine {
-        width?: number;
-        color?: string;
-        length?: number;
-    }
-
-    interface ChartValueAxisItemNotes {
-        position?: string;
-        icon?: ChartValueAxisItemNotesIcon;
-        label?: ChartValueAxisItemNotesLabel;
-        line?: ChartValueAxisItemNotesLine;
-        data?: ChartValueAxisItemNotesDataItem[];
-        visual?: Function;
-    }
-
-    interface ChartValueAxisItemPlotBand {
-        color?: string;
-        from?: number;
-        opacity?: number;
-        to?: number;
-    }
-
-    interface ChartValueAxisItemTitleBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartValueAxisItemTitleMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartValueAxisItemTitlePadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartValueAxisItemTitle {
-        background?: string;
-        border?: ChartValueAxisItemTitleBorder;
-        color?: string;
-        font?: string;
-        margin?: ChartValueAxisItemTitleMargin;
-        padding?: ChartValueAxisItemTitlePadding;
-        position?: string;
-        rotation?: number;
-        text?: string;
-        visible?: boolean;
-        visual?: Function;
-    }
-
-    interface ChartValueAxisItem {
-        axisCrossingValue?: any|Date|any;
-        background?: string;
-        color?: string;
-        crosshair?: ChartValueAxisItemCrosshair;
-        labels?: ChartValueAxisItemLabels;
-        line?: ChartValueAxisItemLine;
-        majorGridLines?: ChartValueAxisItemMajorGridLines;
-        majorUnit?: number;
-        max?: number;
-        min?: number;
-        minorGridLines?: ChartValueAxisItemMinorGridLines;
-        majorTicks?: ChartValueAxisItemMajorTicks;
-        minorTicks?: ChartValueAxisItemMinorTicks;
-        minorUnit?: number;
-        name?: string;
-        narrowRange?: boolean;
-        pane?: string;
-        plotBands?: ChartValueAxisItemPlotBand[];
-        reverse?: boolean;
-        title?: ChartValueAxisItemTitle;
-        type?: string;
-        visible?: boolean;
-        notes?: ChartValueAxisItemNotes;
-    }
-
-    interface ChartXAxisItemCrosshairTooltipBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartXAxisItemCrosshairTooltipPadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartXAxisItemCrosshairTooltip {
-        background?: string;
-        border?: ChartXAxisItemCrosshairTooltipBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        padding?: ChartXAxisItemCrosshairTooltipPadding;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface ChartXAxisItemCrosshair {
-        color?: string;
-        opacity?: number;
-        tooltip?: ChartXAxisItemCrosshairTooltip;
-        visible?: boolean;
-        width?: number;
-    }
-
-    interface ChartXAxisItemLabelsBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartXAxisItemLabelsDateFormats {
-        days?: string;
-        hours?: string;
-        months?: string;
-        weeks?: string;
-        years?: string;
-    }
-
-    interface ChartXAxisItemLabelsMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartXAxisItemLabelsPadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartXAxisItemLabelsRotation {
-        align?: string;
-        angle?: number|string;
-    }
-
-    interface ChartXAxisItemLabels {
-        background?: string;
-        border?: ChartXAxisItemLabelsBorder;
-        color?: string;
-        culture?: string;
-        dateFormats?: ChartXAxisItemLabelsDateFormats;
-        font?: string;
-        format?: string;
-        margin?: ChartXAxisItemLabelsMargin;
-        mirror?: boolean;
-        padding?: ChartXAxisItemLabelsPadding;
-        rotation?: ChartXAxisItemLabelsRotation;
-        skip?: number;
-        step?: number;
-        template?: string|Function;
-        visible?: boolean;
-        visual?: Function;
-    }
-
-    interface ChartXAxisItemLine {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-    }
-
-    interface ChartXAxisItemMajorGridLines {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface ChartXAxisItemMajorTicks {
-        color?: string;
-        size?: number;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface ChartXAxisItemMinorGridLines {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface ChartXAxisItemMinorTicks {
-        color?: string;
-        size?: number;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface ChartXAxisItemNotesDataItemIconBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface ChartXAxisItemNotesDataItemIcon {
-        background?: string;
-        border?: ChartXAxisItemNotesDataItemIconBorder;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface ChartXAxisItemNotesDataItemLabelBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartXAxisItemNotesDataItemLabel {
-        background?: string;
-        border?: ChartXAxisItemNotesDataItemLabelBorder;
-        color?: string;
-        font?: string;
-        template?: string|Function;
-        visible?: boolean;
-        rotation?: number;
-        format?: string;
-        text?: string;
-        position?: string;
-    }
-
-    interface ChartXAxisItemNotesDataItemLine {
-        width?: number;
-        color?: string;
-        length?: number;
-    }
-
-    interface ChartXAxisItemNotesDataItem {
-        value?: any;
-        position?: string;
-        icon?: ChartXAxisItemNotesDataItemIcon;
-        label?: ChartXAxisItemNotesDataItemLabel;
-        line?: ChartXAxisItemNotesDataItemLine;
-    }
-
-    interface ChartXAxisItemNotesIconBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface ChartXAxisItemNotesIcon {
-        background?: string;
-        border?: ChartXAxisItemNotesIconBorder;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface ChartXAxisItemNotesLabelBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartXAxisItemNotesLabel {
-        background?: string;
-        border?: ChartXAxisItemNotesLabelBorder;
-        color?: string;
-        font?: string;
-        template?: string|Function;
-        visible?: boolean;
-        rotation?: number;
-        format?: string;
-        position?: string;
-    }
-
-    interface ChartXAxisItemNotesLine {
-        width?: number;
-        color?: string;
-        length?: number;
-    }
-
-    interface ChartXAxisItemNotes {
-        position?: string;
-        icon?: ChartXAxisItemNotesIcon;
-        label?: ChartXAxisItemNotesLabel;
-        line?: ChartXAxisItemNotesLine;
-        data?: ChartXAxisItemNotesDataItem[];
-        visual?: Function;
-    }
-
-    interface ChartXAxisItemPlotBand {
-        color?: string;
-        from?: number;
-        opacity?: number;
-        to?: number;
-    }
-
-    interface ChartXAxisItemTitleBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartXAxisItemTitleMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartXAxisItemTitlePadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartXAxisItemTitle {
-        background?: string;
-        border?: ChartXAxisItemTitleBorder;
-        color?: string;
-        font?: string;
-        margin?: ChartXAxisItemTitleMargin;
-        padding?: ChartXAxisItemTitlePadding;
-        position?: string;
-        rotation?: number;
-        text?: string;
-        visible?: boolean;
-        visual?: Function;
-    }
-
-    interface ChartXAxisItem {
-        axisCrossingValue?: any|Date|any;
-        background?: string;
-        baseUnit?: string;
-        color?: string;
-        crosshair?: ChartXAxisItemCrosshair;
-        labels?: ChartXAxisItemLabels;
-        line?: ChartXAxisItemLine;
-        majorGridLines?: ChartXAxisItemMajorGridLines;
-        minorGridLines?: ChartXAxisItemMinorGridLines;
-        minorTicks?: ChartXAxisItemMinorTicks;
-        majorTicks?: ChartXAxisItemMajorTicks;
-        majorUnit?: number;
-        max?: any;
-        min?: any;
-        minorUnit?: number;
-        name?: string;
-        narrowRange?: boolean;
-        pane?: string;
-        plotBands?: ChartXAxisItemPlotBand[];
-        reverse?: boolean;
-        startAngle?: number;
-        title?: ChartXAxisItemTitle;
-        type?: string;
-        visible?: boolean;
-        notes?: ChartXAxisItemNotes;
-    }
-
-    interface ChartYAxisItemCrosshairTooltipBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartYAxisItemCrosshairTooltipPadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartYAxisItemCrosshairTooltip {
-        background?: string;
-        border?: ChartYAxisItemCrosshairTooltipBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        padding?: ChartYAxisItemCrosshairTooltipPadding;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface ChartYAxisItemCrosshair {
-        color?: string;
-        opacity?: number;
-        tooltip?: ChartYAxisItemCrosshairTooltip;
-        visible?: boolean;
-        width?: number;
-    }
-
-    interface ChartYAxisItemLabelsBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartYAxisItemLabelsDateFormats {
-        days?: string;
-        hours?: string;
-        months?: string;
-        weeks?: string;
-        years?: string;
-    }
-
-    interface ChartYAxisItemLabelsMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartYAxisItemLabelsPadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartYAxisItemLabelsRotation {
-        align?: string;
-        angle?: number;
-    }
-
-    interface ChartYAxisItemLabels {
-        background?: string;
-        border?: ChartYAxisItemLabelsBorder;
-        color?: string;
-        culture?: string;
-        dateFormats?: ChartYAxisItemLabelsDateFormats;
-        font?: string;
-        format?: string;
-        margin?: ChartYAxisItemLabelsMargin;
-        mirror?: boolean;
-        padding?: ChartYAxisItemLabelsPadding;
-        rotation?: ChartYAxisItemLabelsRotation;
-        skip?: number;
-        step?: number;
-        template?: string|Function;
-        visible?: boolean;
-        visual?: Function;
-    }
-
-    interface ChartYAxisItemLine {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-    }
-
-    interface ChartYAxisItemMajorGridLines {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface ChartYAxisItemMajorTicks {
-        color?: string;
-        size?: number;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface ChartYAxisItemMinorGridLines {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface ChartYAxisItemMinorTicks {
-        color?: string;
-        size?: number;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface ChartYAxisItemNotesDataItemIconBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface ChartYAxisItemNotesDataItemIcon {
-        background?: string;
-        border?: ChartYAxisItemNotesDataItemIconBorder;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface ChartYAxisItemNotesDataItemLabelBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartYAxisItemNotesDataItemLabel {
-        background?: string;
-        border?: ChartYAxisItemNotesDataItemLabelBorder;
-        color?: string;
-        font?: string;
-        template?: string|Function;
-        visible?: boolean;
-        rotation?: number;
-        format?: string;
-        text?: string;
-        position?: string;
-    }
-
-    interface ChartYAxisItemNotesDataItemLine {
-        width?: number;
-        color?: string;
-        length?: number;
-    }
-
-    interface ChartYAxisItemNotesDataItem {
-        value?: any;
-        position?: string;
-        icon?: ChartYAxisItemNotesDataItemIcon;
-        label?: ChartYAxisItemNotesDataItemLabel;
-        line?: ChartYAxisItemNotesDataItemLine;
-    }
-
-    interface ChartYAxisItemNotesIconBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface ChartYAxisItemNotesIcon {
-        background?: string;
-        border?: ChartYAxisItemNotesIconBorder;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface ChartYAxisItemNotesLabelBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartYAxisItemNotesLabel {
-        background?: string;
-        border?: ChartYAxisItemNotesLabelBorder;
-        color?: string;
-        font?: string;
-        template?: string|Function;
-        visible?: boolean;
-        rotation?: number;
-        format?: string;
-        position?: string;
-    }
-
-    interface ChartYAxisItemNotesLine {
-        width?: number;
-        color?: string;
-        length?: number;
-    }
-
-    interface ChartYAxisItemNotes {
-        position?: string;
-        icon?: ChartYAxisItemNotesIcon;
-        label?: ChartYAxisItemNotesLabel;
-        line?: ChartYAxisItemNotesLine;
-        data?: ChartYAxisItemNotesDataItem[];
-        visual?: Function;
-    }
-
-    interface ChartYAxisItemPlotBand {
-        color?: string;
-        from?: number;
-        opacity?: number;
-        to?: number;
-    }
-
-    interface ChartYAxisItemTitleBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ChartYAxisItemTitleMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartYAxisItemTitlePadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface ChartYAxisItemTitle {
-        background?: string;
-        border?: ChartYAxisItemTitleBorder;
-        color?: string;
-        font?: string;
-        margin?: ChartYAxisItemTitleMargin;
-        padding?: ChartYAxisItemTitlePadding;
-        position?: string;
-        rotation?: number;
-        text?: string;
-        visible?: boolean;
-        visual?: Function;
-    }
-
-    interface ChartYAxisItem {
-        axisCrossingValue?: any|Date|any;
-        background?: string;
-        baseUnit?: string;
-        color?: string;
-        crosshair?: ChartYAxisItemCrosshair;
-        labels?: ChartYAxisItemLabels;
-        line?: ChartYAxisItemLine;
-        majorGridLines?: ChartYAxisItemMajorGridLines;
-        minorGridLines?: ChartYAxisItemMinorGridLines;
-        minorTicks?: ChartYAxisItemMinorTicks;
-        majorTicks?: ChartYAxisItemMajorTicks;
-        majorUnit?: number;
-        max?: any;
-        min?: any;
-        minorUnit?: number;
-        name?: string;
-        narrowRange?: boolean;
-        pane?: string;
-        plotBands?: ChartYAxisItemPlotBand[];
-        reverse?: boolean;
-        title?: ChartYAxisItemTitle;
-        type?: string;
-        visible?: boolean;
-        notes?: ChartYAxisItemNotes;
-    }
-
-    interface ChartZoomableMousewheel {
-        lock?: string;
-    }
-
-    interface ChartZoomableSelection {
-        key?: string;
-        lock?: string;
-    }
-
-    interface ChartZoomable {
-        mousewheel?: ChartZoomableMousewheel;
-        selection?: ChartZoomableSelection;
-    }
-
-    interface ChartExportImageOptions {
-        width?: string;
-        height?: string;
-        cors?: string;
-    }
-
-    interface ChartExportSVGOptions {
-        raw?: boolean;
-    }
-
-    interface ChartToggleHighlightOptions {
-        series?: string;
-        category?: string;
-    }
-
-    interface ChartSeriesClickEventSeries {
-        type?: string;
-        name?: string;
-        data?: any;
-    }
-
-    interface ChartSeriesHoverEventSeries {
-        type?: string;
-        name?: string;
-        data?: any;
-    }
-
-    interface ChartOptions {
-        name?: string;
-        autoBind?: boolean;
-        axisDefaults?: any;
-        categoryAxis?: ChartCategoryAxisItem[];
-        chartArea?: ChartChartArea;
-        dataSource?: any|any|kendo.data.DataSource;
-        legend?: ChartLegend;
-        panes?: ChartPane[];
-        pannable?: ChartPannable;
-        pdf?: ChartPdf;
-        plotArea?: ChartPlotArea;
-        renderAs?: string;
-        series?: ChartSeriesItem[];
-        seriesColors?: any;
-        seriesDefaults?: ChartSeriesDefaults;
-        theme?: string;
-        title?: ChartTitle;
-        tooltip?: ChartTooltip;
-        transitions?: boolean;
-        valueAxis?: ChartValueAxisItem[];
-        xAxis?: ChartXAxisItem[];
-        yAxis?: ChartYAxisItem[];
-        zoomable?: ChartZoomable;
-        axisLabelClick?(e: ChartAxisLabelClickEvent): void;
-        legendItemClick?(e: ChartLegendItemClickEvent): void;
-        legendItemHover?(e: ChartLegendItemHoverEvent): void;
-        dataBound?(e: ChartDataBoundEvent): void;
-        drag?(e: ChartDragEvent): void;
-        dragEnd?(e: ChartDragEndEvent): void;
-        dragStart?(e: ChartDragStartEvent): void;
-        noteClick?(e: ChartNoteClickEvent): void;
-        noteHover?(e: ChartNoteHoverEvent): void;
-        plotAreaClick?(e: ChartPlotAreaClickEvent): void;
-        render?(e: ChartEvent): void;
-        select?(e: ChartSelectEvent): void;
-        selectEnd?(e: ChartSelectEndEvent): void;
-        selectStart?(e: ChartSelectStartEvent): void;
-        seriesClick?(e: ChartSeriesClickEvent): void;
-        seriesHover?(e: ChartSeriesHoverEvent): void;
-        zoom?(e: ChartZoomEvent): void;
-        zoomEnd?(e: ChartZoomEndEvent): void;
-        zoomStart?(e: ChartZoomStartEvent): void;
-    }
-    interface ChartEvent {
-        sender: Chart;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface ChartAxisLabelClickEvent extends ChartEvent {
-        axis?: any;
-        dataItem?: any;
-        element?: any;
-        index?: any;
-        text?: string;
-        value?: any;
-    }
-
-    interface ChartLegendItemClickEvent extends ChartEvent {
-        text?: string;
-        series?: any;
-        seriesIndex?: number;
-        pointIndex?: number;
-        element?: any;
-    }
-
-    interface ChartLegendItemHoverEvent extends ChartEvent {
-        text?: string;
-        series?: any;
-        seriesIndex?: number;
-        pointIndex?: number;
-        element?: any;
-    }
-
-    interface ChartDataBoundEvent extends ChartEvent {
-    }
-
-    interface ChartDragEvent extends ChartEvent {
-        axisRanges?: any;
-        originalEvent?: any;
-    }
-
-    interface ChartDragEndEvent extends ChartEvent {
-        axisRanges?: any;
-        originalEvent?: any;
-    }
-
-    interface ChartDragStartEvent extends ChartEvent {
-        axisRanges?: any;
-        originalEvent?: any;
-    }
-
-    interface ChartNoteClickEvent extends ChartEvent {
-        category?: any;
-        element?: any;
-        value?: any;
-        series?: any;
-        dataItem?: any;
-        visual?: any;
-    }
-
-    interface ChartNoteHoverEvent extends ChartEvent {
-        category?: any;
-        element?: any;
-        value?: any;
-        series?: any;
-        dataItem?: any;
-        visual?: any;
-    }
-
-    interface ChartPlotAreaClickEvent extends ChartEvent {
-        category?: any;
-        element?: any;
-        originalEvent?: any;
-        value?: any;
-        x?: any;
-        y?: any;
-    }
-
-    interface ChartSelectEvent extends ChartEvent {
-        axis?: any;
-        from?: any;
-        to?: any;
-    }
-
-    interface ChartSelectEndEvent extends ChartEvent {
-        axis?: any;
-        from?: any;
-        to?: any;
-    }
-
-    interface ChartSelectStartEvent extends ChartEvent {
-        axis?: any;
-        from?: any;
-        to?: any;
-    }
-
-    interface ChartSeriesClickEvent extends ChartEvent {
-        category?: any;
-        element?: any;
-        originalEvent?: any;
-        series?: ChartSeriesClickEventSeries;
-        dataItem?: any;
-        value?: any;
-        percentage?: any;
-    }
-
-    interface ChartSeriesHoverEvent extends ChartEvent {
-        category?: any;
-        categoryPoints?: any;
-        element?: any;
-        originalEvent?: any;
-        series?: ChartSeriesHoverEventSeries;
-        dataItem?: any;
-        value?: any;
-        percentage?: any;
-    }
-
-    interface ChartZoomEvent extends ChartEvent {
-        axisRanges?: any;
-        delta?: number;
-        originalEvent?: any;
-    }
-
-    interface ChartZoomEndEvent extends ChartEvent {
-        axisRanges?: any;
-        originalEvent?: any;
-    }
-
-    interface ChartZoomStartEvent extends ChartEvent {
-        axisRanges?: any;
-        originalEvent?: any;
-    }
-
-
-    class Diagram extends kendo.ui.Widget {
-
-        static fn: Diagram;
-
-        options: DiagramOptions;
-
-        dataSource: kendo.data.DataSource;
-        connections: kendo.dataviz.diagram.Connection[];
-        connectionsDataSource: kendo.data.DataSource;
-        shapes: kendo.dataviz.diagram.Shape[];
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Diagram;
-
-        constructor(element: Element, options?: DiagramOptions);
-
-
-        addConnection(connection: any, undoable: boolean): void;
-        addShape(obj: any, undoable: boolean): kendo.dataviz.diagram.Shape;
-        alignShapes(direction: string): void;
-        boundingBox(items: any): kendo.dataviz.diagram.Rect;
-        bringIntoView(obj: any, options: any): void;
-        cancelEdit(): void;
-        clear(): void;
-        connect(source: any, target: any, options: any): void;
-        connected(source: any, target: any): void;
-        copy(): void;
-        createConnection(item: any): void;
-        createShape(item: any): void;
-        cut(): void;
-        destroy(): void;
-        documentToModel(point: any): any;
-        documentToView(point: any): any;
-        edit(item: any): void;
-        exportImage(options: any): JQueryPromise<any>;
-        exportPDF(options?: kendo.drawing.PDFOptions): JQueryPromise<any>;
-        exportSVG(options: any): JQueryPromise<any>;
-        focus(): void;
-        getShapeById(id: string): any;
-        layerToModel(point: any): any;
-        layout(options: any): void;
-        load(json: string): void;
-        modelToDocument(point: any): any;
-        modelToLayer(point: any): any;
-        modelToView(point: any): any;
-        pan(pan: any): void;
-        paste(): void;
-        redo(): void;
-        remove(items: any, undoable: boolean): void;
-        resize(): void;
-        save(): void;
-        saveEdit(): void;
-        select(): any;
-        select(elements: kendo.dataviz.diagram.Connection, options: any): void;
-        select(elements: kendo.dataviz.diagram.Shape, options: any): void;
-        select(elements: any, options: any): void;
-        selectAll(): void;
-        selectArea(rect: kendo.dataviz.diagram.Rect): void;
-        setConnectionsDataSource(dataSource: kendo.data.DataSource): void;
-        setDataSource(dataSource: kendo.data.DataSource): void;
-        toBack(items: any, undoable: boolean): void;
-        toFront(items: any, undoable: boolean): void;
-        transformPoint(p: any): void;
-        transformRect(r: any): void;
-        undo(): void;
-        viewToDocument(point: kendo.dataviz.diagram.Point): kendo.dataviz.diagram.Point;
-        viewToModel(point: kendo.dataviz.diagram.Point): kendo.dataviz.diagram.Point;
-        viewport(): kendo.dataviz.diagram.Rect;
-        zoom(): number;
-        zoom(zoom: number, point: kendo.dataviz.diagram.Point): void;
-
-    }
-
-    interface DiagramConnectionDefaultsContent {
-        template?: string|Function;
-        text?: string;
-        visual?: Function;
-    }
-
-    interface DiagramConnectionDefaultsEditableTool {
-        name?: string;
-    }
-
-    interface DiagramConnectionDefaultsEditable {
-        drag?: boolean;
-        remove?: boolean;
-        tools?: DiagramConnectionDefaultsEditableTool[];
-    }
-
-    interface DiagramConnectionDefaultsEndCapFill {
-        color?: string;
-    }
-
-    interface DiagramConnectionDefaultsEndCapStroke {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface DiagramConnectionDefaultsEndCap {
-        fill?: DiagramConnectionDefaultsEndCapFill;
-        stroke?: DiagramConnectionDefaultsEndCapStroke;
-        type?: string;
-    }
-
-    interface DiagramConnectionDefaultsHoverStroke {
-        color?: string;
-    }
-
-    interface DiagramConnectionDefaultsHover {
-        stroke?: DiagramConnectionDefaultsHoverStroke;
-    }
-
-    interface DiagramConnectionDefaultsSelectionHandlesFill {
-        color?: string;
-    }
-
-    interface DiagramConnectionDefaultsSelectionHandlesStroke {
-        color?: string;
-    }
-
-    interface DiagramConnectionDefaultsSelectionHandles {
-        fill?: DiagramConnectionDefaultsSelectionHandlesFill;
-        stroke?: DiagramConnectionDefaultsSelectionHandlesStroke;
-        width?: number;
-        height?: number;
-    }
-
-    interface DiagramConnectionDefaultsSelection {
-        handles?: DiagramConnectionDefaultsSelectionHandles;
-    }
-
-    interface DiagramConnectionDefaultsStartCapFill {
-        color?: string;
-    }
-
-    interface DiagramConnectionDefaultsStartCapStroke {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface DiagramConnectionDefaultsStartCap {
-        fill?: DiagramConnectionDefaultsStartCapFill;
-        stroke?: DiagramConnectionDefaultsStartCapStroke;
-        type?: string;
-    }
-
-    interface DiagramConnectionDefaultsStroke {
-        color?: string;
-        width?: number;
-    }
-
-    interface DiagramConnectionDefaults {
-        content?: DiagramConnectionDefaultsContent;
-        editable?: DiagramConnectionDefaultsEditable;
-        endCap?: DiagramConnectionDefaultsEndCap;
-        fromConnector?: string;
-        hover?: DiagramConnectionDefaultsHover;
-        selectable?: boolean;
-        selection?: DiagramConnectionDefaultsSelection;
-        startCap?: DiagramConnectionDefaultsStartCap;
-        stroke?: DiagramConnectionDefaultsStroke;
-        toConnector?: string;
-        type?: string;
-    }
-
-    interface DiagramConnectionContent {
-        template?: string|Function;
-        text?: string;
-        visual?: Function;
-    }
-
-    interface DiagramConnectionEditableTool {
-        name?: string;
-    }
-
-    interface DiagramConnectionEditable {
-        tools?: DiagramConnectionEditableTool[];
-    }
-
-    interface DiagramConnectionEndCapFill {
-        color?: string;
-    }
-
-    interface DiagramConnectionEndCapStroke {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface DiagramConnectionEndCap {
-        fill?: DiagramConnectionEndCapFill;
-        stroke?: DiagramConnectionEndCapStroke;
-        type?: string;
-    }
-
-    interface DiagramConnectionFrom {
-        x?: number;
-        y?: number;
-    }
-
-    interface DiagramConnectionHoverStroke {
-        color?: string;
-    }
-
-    interface DiagramConnectionHover {
-        stroke?: DiagramConnectionHoverStroke;
-    }
-
-    interface DiagramConnectionPoint {
-        x?: number;
-        y?: number;
-    }
-
-    interface DiagramConnectionSelectionHandlesFill {
-        color?: string;
-    }
-
-    interface DiagramConnectionSelectionHandlesStroke {
-        color?: string;
-    }
-
-    interface DiagramConnectionSelectionHandles {
-        fill?: DiagramConnectionSelectionHandlesFill;
-        stroke?: DiagramConnectionSelectionHandlesStroke;
-        width?: number;
-        height?: number;
-    }
-
-    interface DiagramConnectionSelection {
-        handles?: DiagramConnectionSelectionHandles;
-    }
-
-    interface DiagramConnectionStartCapFill {
-        color?: string;
-    }
-
-    interface DiagramConnectionStartCapStroke {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface DiagramConnectionStartCap {
-        fill?: DiagramConnectionStartCapFill;
-        stroke?: DiagramConnectionStartCapStroke;
-        type?: string;
-    }
-
-    interface DiagramConnectionStroke {
-        color?: string;
-        width?: number;
-    }
-
-    interface DiagramConnectionTo {
-        x?: number;
-        y?: number;
-    }
-
-    interface DiagramConnection {
-        content?: DiagramConnectionContent;
-        editable?: DiagramConnectionEditable;
-        endCap?: DiagramConnectionEndCap;
-        from?: DiagramConnectionFrom;
-        fromConnector?: string;
-        hover?: DiagramConnectionHover;
-        points?: DiagramConnectionPoint[];
-        selection?: DiagramConnectionSelection;
-        startCap?: DiagramConnectionStartCap;
-        stroke?: DiagramConnectionStroke;
-        to?: DiagramConnectionTo;
-        toConnector?: string;
-        type?: string;
-    }
-
-    interface DiagramEditableDragSnap {
-        size?: number;
-    }
-
-    interface DiagramEditableDrag {
-        snap?: DiagramEditableDragSnap;
-    }
-
-    interface DiagramEditableResizeHandlesFill {
-        color?: string;
-        opacity?: number;
-    }
-
-    interface DiagramEditableResizeHandlesHoverFill {
-        color?: string;
-        opacity?: number;
-    }
-
-    interface DiagramEditableResizeHandlesHoverStroke {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface DiagramEditableResizeHandlesHover {
-        fill?: DiagramEditableResizeHandlesHoverFill;
-        stroke?: DiagramEditableResizeHandlesHoverStroke;
-    }
-
-    interface DiagramEditableResizeHandlesStroke {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface DiagramEditableResizeHandles {
-        fill?: DiagramEditableResizeHandlesFill;
-        height?: number;
-        hover?: DiagramEditableResizeHandlesHover;
-        stroke?: DiagramEditableResizeHandlesStroke;
-        width?: number;
-    }
-
-    interface DiagramEditableResize {
-        handles?: DiagramEditableResizeHandles;
-    }
-
-    interface DiagramEditableRotateFill {
-        color?: string;
-        opacity?: number;
-    }
-
-    interface DiagramEditableRotateStroke {
-        color?: string;
-        width?: number;
-    }
-
-    interface DiagramEditableRotate {
-        fill?: DiagramEditableRotateFill;
-        stroke?: DiagramEditableRotateStroke;
-    }
-
-    interface DiagramEditableTool {
-        name?: string;
-        step?: number;
-    }
-
-    interface DiagramEditable {
-        connectionTemplate?: string|Function;
-        drag?: DiagramEditableDrag;
-        remove?: boolean;
-        resize?: DiagramEditableResize;
-        rotate?: DiagramEditableRotate;
-        shapeTemplate?: string|Function;
-        tools?: DiagramEditableTool[];
-    }
-
-    interface DiagramLayoutGrid {
-        componentSpacingX?: number;
-        componentSpacingY?: number;
-        offsetX?: number;
-        offsetY?: number;
-        width?: number;
-    }
-
-    interface DiagramLayout {
-        endRadialAngle?: number;
-        grid?: DiagramLayoutGrid;
-        horizontalSeparation?: number;
-        iterations?: number;
-        layerSeparation?: number;
-        nodeDistance?: number;
-        radialFirstLevelSeparation?: number;
-        radialSeparation?: number;
-        startRadialAngle?: number;
-        subtype?: string;
-        tipOverTreeStartLevel?: number;
-        type?: string;
-        underneathHorizontalOffset?: number;
-        underneathVerticalSeparation?: number;
-        underneathVerticalTopOffset?: number;
-        verticalSeparation?: number;
-    }
-
-    interface DiagramPannable {
-        key?: string;
-    }
-
-    interface DiagramPdfMargin {
-        bottom?: number|string;
-        left?: number|string;
-        right?: number|string;
-        top?: number|string;
-    }
-
-    interface DiagramPdf {
-        author?: string;
-        creator?: string;
-        date?: Date;
-        fileName?: string;
-        forceProxy?: boolean;
-        keywords?: string;
-        landscape?: boolean;
-        margin?: DiagramPdfMargin;
-        paperSize?: string|any;
-        proxyURL?: string;
-        proxyTarget?: string;
-        subject?: string;
-        title?: string;
-    }
-
-    interface DiagramSelectableStroke {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface DiagramSelectable {
-        key?: string;
-        stroke?: DiagramSelectableStroke;
-    }
-
-    interface DiagramShapeDefaultsConnector {
-        name?: string;
-        position?: Function;
-    }
-
-    interface DiagramShapeDefaultsContent {
-        align?: string;
-        color?: string;
-        fontFamily?: string;
-        fontSize?: number;
-        template?: string|Function;
-        text?: string;
-    }
-
-    interface DiagramShapeDefaultsEditableTool {
-        name?: string;
-        step?: number;
-    }
-
-    interface DiagramShapeDefaultsEditable {
-        connect?: boolean;
-        drag?: boolean;
-        remove?: boolean;
-        tools?: DiagramShapeDefaultsEditableTool[];
-    }
-
-    interface DiagramShapeDefaultsFillGradientStop {
-        offset?: number;
-        color?: string;
-        opacity?: number;
-    }
-
-    interface DiagramShapeDefaultsFillGradient {
-        type?: string;
-        center?: any;
-        radius?: number;
-        start?: any;
-        end?: any;
-        stops?: DiagramShapeDefaultsFillGradientStop[];
-    }
-
-    interface DiagramShapeDefaultsFill {
-        color?: string;
-        opacity?: number;
-        gradient?: DiagramShapeDefaultsFillGradient;
-    }
-
-    interface DiagramShapeDefaultsHoverFill {
-        color?: string;
-        opacity?: number;
-    }
-
-    interface DiagramShapeDefaultsHover {
-        fill?: DiagramShapeDefaultsHoverFill;
-    }
-
-    interface DiagramShapeDefaultsRotation {
-        angle?: number;
-    }
-
-    interface DiagramShapeDefaultsStroke {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface DiagramShapeDefaults {
-        connectors?: DiagramShapeDefaultsConnector[];
-        content?: DiagramShapeDefaultsContent;
-        editable?: DiagramShapeDefaultsEditable;
-        fill?: DiagramShapeDefaultsFill;
-        height?: number;
-        hover?: DiagramShapeDefaultsHover;
-        minHeight?: number;
-        minWidth?: number;
-        path?: string;
-        rotation?: DiagramShapeDefaultsRotation;
-        selectable?: boolean;
-        source?: string;
-        stroke?: DiagramShapeDefaultsStroke;
-        type?: string;
-        visual?: Function;
-        width?: number;
-        x?: number;
-        y?: number;
-    }
-
-    interface DiagramShapeConnector {
-        description?: string;
-        name?: string;
-        position?: Function;
-    }
-
-    interface DiagramShapeContent {
-        align?: string;
-        color?: string;
-        fontFamily?: string;
-        fontSize?: number;
-        template?: string|Function;
-        text?: string;
-    }
-
-    interface DiagramShapeEditableTool {
-        name?: string;
-        step?: number;
-    }
-
-    interface DiagramShapeEditable {
-        connect?: boolean;
-        tools?: DiagramShapeEditableTool[];
-    }
-
-    interface DiagramShapeFillGradientStop {
-        offset?: number;
-        color?: string;
-        opacity?: number;
-    }
-
-    interface DiagramShapeFillGradient {
-        type?: string;
-        center?: any;
-        radius?: number;
-        start?: any;
-        end?: any;
-        stops?: DiagramShapeFillGradientStop[];
-    }
-
-    interface DiagramShapeFill {
-        color?: string;
-        opacity?: number;
-        gradient?: DiagramShapeFillGradient;
-    }
-
-    interface DiagramShapeHoverFill {
-        color?: string;
-        opacity?: number;
-    }
-
-    interface DiagramShapeHover {
-        fill?: DiagramShapeHoverFill;
-    }
-
-    interface DiagramShapeRotation {
-        angle?: number;
-    }
-
-    interface DiagramShapeStroke {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface DiagramShape {
-        connectors?: DiagramShapeConnector[];
-        content?: DiagramShapeContent;
-        editable?: DiagramShapeEditable;
-        fill?: DiagramShapeFill;
-        height?: number;
-        hover?: DiagramShapeHover;
-        id?: string;
-        minHeight?: number;
-        minWidth?: number;
-        path?: string;
-        rotation?: DiagramShapeRotation;
-        source?: string;
-        stroke?: DiagramShapeStroke;
-        type?: string;
-        visual?: Function;
-        width?: number;
-        x?: number;
-        y?: number;
-    }
-
-    interface DiagramExportImageOptions {
-        width?: string;
-        height?: string;
-        cors?: string;
-    }
-
-    interface DiagramExportSVGOptions {
-        raw?: boolean;
-    }
-
-    interface DiagramSelectOptions {
-        addToSelection?: boolean;
-    }
-
-    interface DiagramOptions {
-        name?: string;
-        autoBind?: boolean;
-        connectionDefaults?: DiagramConnectionDefaults;
-        connections?: DiagramConnection[];
-        connectionsDataSource?: any|any|kendo.data.DataSource;
-        dataSource?: any|any|kendo.data.DataSource;
-        editable?: DiagramEditable;
-        layout?: DiagramLayout;
-        pannable?: DiagramPannable;
-        pdf?: DiagramPdf;
-        selectable?: DiagramSelectable;
-        shapeDefaults?: DiagramShapeDefaults;
-        shapes?: DiagramShape[];
-        template?: string|Function;
-        zoom?: number;
-        zoomMax?: number;
-        zoomMin?: number;
-        zoomRate?: number;
-        add?(e: DiagramAddEvent): void;
-        cancel?(e: DiagramCancelEvent): void;
-        change?(e: DiagramChangeEvent): void;
-        click?(e: DiagramClickEvent): void;
-        dataBound?(e: DiagramDataBoundEvent): void;
-        drag?(e: DiagramDragEvent): void;
-        dragEnd?(e: DiagramDragEndEvent): void;
-        dragStart?(e: DiagramDragStartEvent): void;
-        edit?(e: DiagramEditEvent): void;
-        itemBoundsChange?(e: DiagramItemBoundsChangeEvent): void;
-        itemRotate?(e: DiagramItemRotateEvent): void;
-        mouseEnter?(e: DiagramMouseEnterEvent): void;
-        mouseLeave?(e: DiagramMouseLeaveEvent): void;
-        pan?(e: DiagramPanEvent): void;
-        remove?(e: DiagramRemoveEvent): void;
-        save?(e: DiagramSaveEvent): void;
-        select?(e: DiagramSelectEvent): void;
-        zoomEnd?(e: DiagramZoomEndEvent): void;
-        zoomStart?(e: DiagramZoomStartEvent): void;
-    }
-    interface DiagramEvent {
-        sender: Diagram;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface DiagramAddEvent extends DiagramEvent {
-        connection?: kendo.dataviz.diagram.Connection;
-        shape?: kendo.dataviz.diagram.Shape;
-    }
-
-    interface DiagramCancelEvent extends DiagramEvent {
-        container?: JQuery;
-        connection?: kendo.data.Model;
-        shape?: kendo.data.Model;
-    }
-
-    interface DiagramChangeEvent extends DiagramEvent {
-        added?: any;
-        removed?: any;
-    }
-
-    interface DiagramClickEvent extends DiagramEvent {
-        item?: any;
-        meta?: any;
-        point?: kendo.dataviz.diagram.Point;
-    }
-
-    interface DiagramDataBoundEvent extends DiagramEvent {
-    }
-
-    interface DiagramDragEvent extends DiagramEvent {
-        connections?: any;
-        shapes?: any;
-    }
-
-    interface DiagramDragEndEvent extends DiagramEvent {
-        connections?: any;
-        shapes?: any;
-    }
-
-    interface DiagramDragStartEvent extends DiagramEvent {
-        connections?: any;
-        shapes?: any;
-    }
-
-    interface DiagramEditEvent extends DiagramEvent {
-        container?: JQuery;
-        connection?: kendo.data.Model;
-        shape?: kendo.data.Model;
-    }
-
-    interface DiagramItemBoundsChangeEvent extends DiagramEvent {
-        bounds?: kendo.dataviz.diagram.Rect;
-        item?: kendo.dataviz.diagram.Shape;
-    }
-
-    interface DiagramItemRotateEvent extends DiagramEvent {
-        item?: kendo.dataviz.diagram.Shape;
-    }
-
-    interface DiagramMouseEnterEvent extends DiagramEvent {
-        item?: any;
-    }
-
-    interface DiagramMouseLeaveEvent extends DiagramEvent {
-        item?: any;
-    }
-
-    interface DiagramPanEvent extends DiagramEvent {
-        pan?: kendo.dataviz.diagram.Point;
-    }
-
-    interface DiagramRemoveEvent extends DiagramEvent {
-        connection?: kendo.dataviz.diagram.Connection;
-        shape?: kendo.dataviz.diagram.Shape;
-    }
-
-    interface DiagramSaveEvent extends DiagramEvent {
-        container?: JQuery;
-        connection?: kendo.data.Model;
-        shape?: kendo.data.Model;
-    }
-
-    interface DiagramSelectEvent extends DiagramEvent {
-        selected?: any;
-        deselected?: any;
-    }
-
-    interface DiagramZoomEndEvent extends DiagramEvent {
-        point?: kendo.dataviz.diagram.Point;
-        zoom?: number;
-    }
-
-    interface DiagramZoomStartEvent extends DiagramEvent {
-        point?: kendo.dataviz.diagram.Point;
-        zoom?: number;
-    }
-
-
-    class LinearGauge extends kendo.ui.Widget {
-
-        static fn: LinearGauge;
-
-        options: LinearGaugeOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): LinearGauge;
-
-        constructor(element: Element, options?: LinearGaugeOptions);
-
-
-        allValues(values: any): any;
-        destroy(): void;
-        exportImage(options: any): JQueryPromise<any>;
-        exportPDF(options?: kendo.drawing.PDFOptions): JQueryPromise<any>;
-        exportSVG(options: any): JQueryPromise<any>;
-        redraw(): void;
-        resize(force?: boolean): void;
-        svg(): void;
-        imageDataURL(): string;
-        value(): void;
-
-    }
-
-    interface LinearGaugeGaugeAreaBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface LinearGaugeGaugeAreaMargin {
-        top?: number;
-        bottom?: number;
-        left?: number;
-        right?: number;
-    }
-
-    interface LinearGaugeGaugeArea {
-        background?: any;
-        border?: LinearGaugeGaugeAreaBorder;
-        height?: number;
-        margin?: LinearGaugeGaugeAreaMargin;
-        width?: number;
-    }
-
-    interface LinearGaugePointerItemBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface LinearGaugePointerItemTrackBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface LinearGaugePointerItemTrack {
-        border?: LinearGaugePointerItemTrackBorder;
-        color?: string;
-        opacity?: number;
-        size?: number;
-        visible?: boolean;
-    }
-
-    interface LinearGaugePointerItem {
-        border?: LinearGaugePointerItemBorder;
-        color?: string;
-        margin?: number|any;
-        opacity?: number;
-        shape?: string;
-        size?: number;
-        track?: LinearGaugePointerItemTrack;
-        value?: number;
-    }
-
-    interface LinearGaugeScaleLabelsBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface LinearGaugeScaleLabelsMargin {
-        top?: number;
-        bottom?: number;
-        left?: number;
-        right?: number;
-    }
-
-    interface LinearGaugeScaleLabelsPadding {
-        top?: number;
-        bottom?: number;
-        left?: number;
-        right?: number;
-    }
-
-    interface LinearGaugeScaleLabels {
-        background?: string;
-        border?: LinearGaugeScaleLabelsBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        margin?: LinearGaugeScaleLabelsMargin;
-        padding?: LinearGaugeScaleLabelsPadding;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface LinearGaugeScaleLine {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-    }
-
-    interface LinearGaugeScaleMajorTicks {
-        color?: string;
-        size?: number;
-        visible?: boolean;
-        width?: number;
-    }
-
-    interface LinearGaugeScaleMinorTicks {
-        color?: string;
-        size?: number;
-        visible?: boolean;
-        width?: number;
-    }
-
-    interface LinearGaugeScaleRange {
-        from?: number;
-        to?: number;
-        opacity?: number;
-        color?: string;
-    }
-
-    interface LinearGaugeScale {
-        line?: LinearGaugeScaleLine;
-        labels?: LinearGaugeScaleLabels;
-        majorTicks?: LinearGaugeScaleMajorTicks;
-        majorUnit?: number;
-        max?: number;
-        min?: number;
-        minorTicks?: LinearGaugeScaleMinorTicks;
-        minorUnit?: number;
-        mirror?: boolean;
-        ranges?: LinearGaugeScaleRange[];
-        rangePlaceholderColor?: string;
-        rangeSize?: number;
-        reverse?: boolean;
-        vertical?: boolean;
-    }
-
-    interface LinearGaugeExportImageOptions {
-        width?: string;
-        height?: string;
-    }
-
-    interface LinearGaugeExportSVGOptions {
-        raw?: boolean;
-    }
-
-    interface LinearGaugeOptions {
-        name?: string;
-        gaugeArea?: LinearGaugeGaugeArea;
-        pointer?: LinearGaugePointerItem[];
-        renderAs?: string;
-        scale?: LinearGaugeScale;
-        transitions?: boolean;
-    }
-    interface LinearGaugeEvent {
-        sender: LinearGauge;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Map extends kendo.ui.Widget {
-
-        static fn: Map;
-
-        options: MapOptions;
-
-        layers: any;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Map;
-
-        constructor(element: Element, options?: MapOptions);
-
-
-        center(): kendo.dataviz.map.Location;
-        center(center: any): void;
-        center(center: kendo.dataviz.map.Location): void;
-        destroy(): void;
-        eventOffset(e: any): kendo.geometry.Point;
-        eventOffset(e: JQueryEventObject): kendo.geometry.Point;
-        eventToLayer(e: any): kendo.geometry.Point;
-        eventToLayer(e: JQueryEventObject): kendo.geometry.Point;
-        eventToLocation(e: any): kendo.geometry.Point;
-        eventToLocation(e: JQueryEventObject): kendo.geometry.Point;
-        eventToView(e: any): kendo.geometry.Point;
-        eventToView(e: JQueryEventObject): kendo.geometry.Point;
-        extent(): kendo.dataviz.map.Extent;
-        extent(extent: kendo.dataviz.map.Extent): void;
-        layerToLocation(point: any, zoom: number): kendo.dataviz.map.Location;
-        layerToLocation(point: kendo.geometry.Point, zoom: number): kendo.dataviz.map.Location;
-        locationToLayer(location: any, zoom: number): kendo.geometry.Point;
-        locationToLayer(location: kendo.dataviz.map.Location, zoom: number): kendo.geometry.Point;
-        locationToView(location: any): kendo.geometry.Point;
-        locationToView(location: kendo.dataviz.map.Location): kendo.geometry.Point;
-        resize(force?: boolean): void;
-        setOptions(options: any): void;
-        viewSize(): any;
-        viewToLocation(point: any, zoom: number): kendo.dataviz.map.Location;
-        viewToLocation(point: kendo.geometry.Point, zoom: number): kendo.dataviz.map.Location;
-        zoom(): number;
-        zoom(level: number): void;
-
-    }
-
-    interface MapControlsAttribution {
-        position?: string;
-    }
-
-    interface MapControlsNavigator {
-        position?: string;
-    }
-
-    interface MapControlsZoom {
-        position?: string;
-    }
-
-    interface MapControls {
-        attribution?: MapControlsAttribution;
-        navigator?: MapControlsNavigator;
-        zoom?: MapControlsZoom;
-    }
-
-    interface MapLayerDefaultsBing {
-        attribution?: string;
-        opacity?: number;
-        key?: string;
-        imagerySet?: string;
-        culture?: string;
-    }
-
-    interface MapLayerDefaultsBubbleStyleFill {
-        color?: string;
-        opacity?: number;
-    }
-
-    interface MapLayerDefaultsBubbleStyleStroke {
-        color?: string;
-        dashType?: string;
-        opacity?: number;
-        width?: number;
-    }
-
-    interface MapLayerDefaultsBubbleStyle {
-        fill?: MapLayerDefaultsBubbleStyleFill;
-        stroke?: MapLayerDefaultsBubbleStyleStroke;
-    }
-
-    interface MapLayerDefaultsBubble {
-        attribution?: string;
-        opacity?: number;
-        maxSize?: number;
-        minSize?: number;
-        style?: MapLayerDefaultsBubbleStyle;
-        symbol?: string|Function;
-    }
-
-    interface MapLayerDefaultsMarkerTooltipAnimationClose {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface MapLayerDefaultsMarkerTooltipAnimationOpen {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface MapLayerDefaultsMarkerTooltipAnimation {
-        close?: MapLayerDefaultsMarkerTooltipAnimationClose;
-        open?: MapLayerDefaultsMarkerTooltipAnimationOpen;
-    }
-
-    interface MapLayerDefaultsMarkerTooltipContent {
-        url?: string;
-    }
-
-    interface MapLayerDefaultsMarkerTooltip {
-        autoHide?: boolean;
-        animation?: MapLayerDefaultsMarkerTooltipAnimation;
-        content?: MapLayerDefaultsMarkerTooltipContent;
-        template?: string;
-        callout?: boolean;
-        iframe?: boolean;
-        height?: number;
-        width?: number;
-        position?: string;
-        showAfter?: number;
-        showOn?: string;
-    }
-
-    interface MapLayerDefaultsMarker {
-        shape?: string;
-        tooltip?: MapLayerDefaultsMarkerTooltip;
-        opacity?: number;
-    }
-
-    interface MapLayerDefaultsShapeStyleFill {
-        color?: string;
-        opacity?: number;
-    }
-
-    interface MapLayerDefaultsShapeStyleStroke {
-        color?: string;
-        dashType?: string;
-        opacity?: number;
-        width?: number;
-    }
-
-    interface MapLayerDefaultsShapeStyle {
-        fill?: MapLayerDefaultsShapeStyleFill;
-        stroke?: MapLayerDefaultsShapeStyleStroke;
-    }
-
-    interface MapLayerDefaultsShape {
-        attribution?: string;
-        opacity?: number;
-        style?: MapLayerDefaultsShapeStyle;
-    }
-
-    interface MapLayerDefaultsTile {
-        urlTemplate?: string;
-        attribution?: string;
-        subdomains?: any;
-        opacity?: number;
-    }
-
-    interface MapLayerDefaults {
-        marker?: MapLayerDefaultsMarker;
-        shape?: MapLayerDefaultsShape;
-        bubble?: MapLayerDefaultsBubble;
-        tileSize?: number;
-        tile?: MapLayerDefaultsTile;
-        bing?: MapLayerDefaultsBing;
-    }
-
-    interface MapLayerStyleFill {
-        color?: string;
-        opacity?: number;
-    }
-
-    interface MapLayerStyleStroke {
-        color?: string;
-        dashType?: number;
-        opacity?: number;
-        width?: number;
-    }
-
-    interface MapLayerStyle {
-        fill?: MapLayerStyleFill;
-        stroke?: MapLayerStyleStroke;
-    }
-
-    interface MapLayerTooltipAnimationClose {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface MapLayerTooltipAnimationOpen {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface MapLayerTooltipAnimation {
-        close?: MapLayerTooltipAnimationClose;
-        open?: MapLayerTooltipAnimationOpen;
-    }
-
-    interface MapLayerTooltipContent {
-        url?: string;
-    }
-
-    interface MapLayerTooltip {
-        autoHide?: boolean;
-        animation?: MapLayerTooltipAnimation;
-        content?: MapLayerTooltipContent;
-        template?: string;
-        callout?: boolean;
-        iframe?: boolean;
-        height?: number;
-        width?: number;
-        position?: string;
-        showAfter?: number;
-        showOn?: string;
-    }
-
-    interface MapLayer {
-        attribution?: string;
-        autoBind?: boolean;
-        dataSource?: any|any|kendo.data.DataSource;
-        extent?: any|kendo.dataviz.map.Extent;
-        key?: string;
-        imagerySet?: string;
-        culture?: string;
-        locationField?: string;
-        shape?: string;
-        tileSize?: number;
-        titleField?: string;
-        tooltip?: MapLayerTooltip;
-        maxSize?: number;
-        minSize?: number;
-        opacity?: number;
-        subdomains?: any;
-        symbol?: string|Function;
-        type?: string;
-        style?: MapLayerStyle;
-        urlTemplate?: string;
-        valueField?: string;
-        zIndex?: number;
-    }
-
-    interface MapMarkerDefaultsTooltipAnimationClose {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface MapMarkerDefaultsTooltipAnimationOpen {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface MapMarkerDefaultsTooltipAnimation {
-        close?: MapMarkerDefaultsTooltipAnimationClose;
-        open?: MapMarkerDefaultsTooltipAnimationOpen;
-    }
-
-    interface MapMarkerDefaultsTooltipContent {
-        url?: string;
-    }
-
-    interface MapMarkerDefaultsTooltip {
-        autoHide?: boolean;
-        animation?: MapMarkerDefaultsTooltipAnimation;
-        content?: MapMarkerDefaultsTooltipContent;
-        template?: string;
-        callout?: boolean;
-        iframe?: boolean;
-        height?: number;
-        width?: number;
-        position?: string;
-        showAfter?: number;
-        showOn?: string;
-    }
-
-    interface MapMarkerDefaults {
-        shape?: string;
-        tooltip?: MapMarkerDefaultsTooltip;
-    }
-
-    interface MapMarkerTooltipAnimationClose {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface MapMarkerTooltipAnimationOpen {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface MapMarkerTooltipAnimation {
-        close?: MapMarkerTooltipAnimationClose;
-        open?: MapMarkerTooltipAnimationOpen;
-    }
-
-    interface MapMarkerTooltipContent {
-        url?: string;
-    }
-
-    interface MapMarkerTooltip {
-        autoHide?: boolean;
-        animation?: MapMarkerTooltipAnimation;
-        content?: MapMarkerTooltipContent;
-        template?: string;
-        callout?: boolean;
-        iframe?: boolean;
-        height?: number;
-        width?: number;
-        position?: string;
-        showAfter?: number;
-        showOn?: string;
-    }
-
-    interface MapMarker {
-        location?: any|kendo.dataviz.map.Location;
-        shape?: string;
-        title?: string;
-        tooltip?: MapMarkerTooltip;
-    }
-
-    interface MapOptions {
-        name?: string;
-        center?: any|kendo.dataviz.map.Location;
-        controls?: MapControls;
-        layerDefaults?: MapLayerDefaults;
-        layers?: MapLayer[];
-        markerDefaults?: MapMarkerDefaults;
-        markers?: MapMarker[];
-        minZoom?: number;
-        maxZoom?: number;
-        minSize?: number;
-        pannable?: boolean;
-        wraparound?: boolean;
-        zoom?: number;
-        zoomable?: boolean;
-        beforeReset?(e: MapBeforeResetEvent): void;
-        click?(e: MapClickEvent): void;
-        markerActivate?(e: MapMarkerActivateEvent): void;
-        markerCreated?(e: MapMarkerCreatedEvent): void;
-        markerClick?(e: MapMarkerClickEvent): void;
-        pan?(e: MapPanEvent): void;
-        panEnd?(e: MapPanEndEvent): void;
-        reset?(e: MapResetEvent): void;
-        shapeClick?(e: MapShapeClickEvent): void;
-        shapeCreated?(e: MapShapeCreatedEvent): void;
-        shapeMouseEnter?(e: MapShapeMouseEnterEvent): void;
-        shapeMouseLeave?(e: MapShapeMouseLeaveEvent): void;
-        zoomStart?(e: MapZoomStartEvent): void;
-        zoomEnd?(e: MapZoomEndEvent): void;
-    }
-    interface MapEvent {
-        sender: Map;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface MapBeforeResetEvent extends MapEvent {
-    }
-
-    interface MapClickEvent extends MapEvent {
-        location?: kendo.dataviz.map.Location;
-        originalEvent?: any;
-    }
-
-    interface MapMarkerActivateEvent extends MapEvent {
-        marker?: kendo.dataviz.map.Marker;
-        layer?: kendo.dataviz.map.Marker;
-    }
-
-    interface MapMarkerCreatedEvent extends MapEvent {
-        marker?: kendo.dataviz.map.Marker;
-        layer?: kendo.dataviz.map.Marker;
-    }
-
-    interface MapMarkerClickEvent extends MapEvent {
-        marker?: kendo.dataviz.map.Marker;
-        layer?: kendo.dataviz.map.Marker;
-    }
-
-    interface MapPanEvent extends MapEvent {
-        origin?: kendo.dataviz.map.Location;
-        center?: kendo.dataviz.map.Location;
-        originalEvent?: any;
-    }
-
-    interface MapPanEndEvent extends MapEvent {
-        origin?: kendo.dataviz.map.Location;
-        center?: kendo.dataviz.map.Location;
-        originalEvent?: any;
-    }
-
-    interface MapResetEvent extends MapEvent {
-    }
-
-    interface MapShapeClickEvent extends MapEvent {
-        layer?: kendo.dataviz.map.layer.Shape;
-        shape?: kendo.drawing.Element;
-        originalEvent?: any;
-    }
-
-    interface MapShapeCreatedEvent extends MapEvent {
-        layer?: kendo.dataviz.map.layer.Shape;
-        shape?: kendo.drawing.Element;
-        originalEvent?: any;
-    }
-
-    interface MapShapeMouseEnterEvent extends MapEvent {
-        layer?: kendo.dataviz.map.layer.Shape;
-        shape?: kendo.drawing.Element;
-        originalEvent?: any;
-    }
-
-    interface MapShapeMouseLeaveEvent extends MapEvent {
-        layer?: kendo.dataviz.map.layer.Shape;
-        shape?: kendo.drawing.Element;
-        originalEvent?: any;
-    }
-
-    interface MapZoomStartEvent extends MapEvent {
-        originalEvent?: any;
-    }
-
-    interface MapZoomEndEvent extends MapEvent {
-        originalEvent?: any;
-    }
-
-
-    class QRCode extends kendo.ui.Widget {
-
-        static fn: QRCode;
-
-        options: QRCodeOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): QRCode;
-
-        constructor(element: Element, options?: QRCodeOptions);
-
-
-        destroy(): void;
-        exportImage(options: any): JQueryPromise<any>;
-        exportPDF(options?: kendo.drawing.PDFOptions): JQueryPromise<any>;
-        exportSVG(options: any): JQueryPromise<any>;
-        imageDataURL(): string;
-        redraw(): void;
-        resize(force?: boolean): void;
-        setOptions(options: any): void;
-        svg(): string;
-        value(options: string): void;
-        value(options: number): void;
-
-    }
-
-    interface QRCodeBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface QRCodeExportImageOptions {
-        width?: string;
-        height?: string;
-    }
-
-    interface QRCodeExportSVGOptions {
-        raw?: boolean;
-    }
-
-    interface QRCodeOptions {
-        name?: string;
-        background?: string;
-        border?: QRCodeBorder;
-        color?: string;
-        encoding?: string;
-        errorCorrection?: string;
-        padding?: number;
-        renderAs?: string;
-        size?: number|string;
-        value?: number|string;
-    }
-    interface QRCodeEvent {
-        sender: QRCode;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class RadialGauge extends kendo.ui.Widget {
-
-        static fn: RadialGauge;
-
-        options: RadialGaugeOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): RadialGauge;
-
-        constructor(element: Element, options?: RadialGaugeOptions);
-
-
-        allValues(values: any): any;
-        destroy(): void;
-        exportImage(options: any): JQueryPromise<any>;
-        exportPDF(options?: kendo.drawing.PDFOptions): JQueryPromise<any>;
-        exportSVG(options: any): JQueryPromise<any>;
-        redraw(): void;
-        resize(force?: boolean): void;
-        svg(): void;
-        imageDataURL(): string;
-        value(): void;
-
-    }
-
-    interface RadialGaugeGaugeAreaBorder {
-        color?: string;
-        dashType?: string;
-        opacity?: number;
-        width?: number;
-    }
-
-    interface RadialGaugeGaugeAreaMargin {
-        top?: number;
-        bottom?: number;
-        left?: number;
-        right?: number;
-    }
-
-    interface RadialGaugeGaugeArea {
-        background?: any;
-        border?: RadialGaugeGaugeAreaBorder;
-        height?: number;
-        margin?: RadialGaugeGaugeAreaMargin;
-        width?: number;
-    }
-
-    interface RadialGaugePointerItemCap {
-        color?: string;
-        size?: number;
-    }
-
-    interface RadialGaugePointerItem {
-        cap?: RadialGaugePointerItemCap;
-        color?: string;
-        value?: number;
-    }
-
-    interface RadialGaugeScaleLabelsBorder {
-        color?: string;
-        dashType?: string;
-        opacity?: number;
-        width?: number;
-    }
-
-    interface RadialGaugeScaleLabelsMargin {
-        top?: number;
-        bottom?: number;
-        left?: number;
-        right?: number;
-    }
-
-    interface RadialGaugeScaleLabelsPadding {
-        top?: number;
-        bottom?: number;
-        left?: number;
-        right?: number;
-    }
-
-    interface RadialGaugeScaleLabels {
-        background?: string;
-        border?: RadialGaugeScaleLabelsBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        margin?: RadialGaugeScaleLabelsMargin;
-        padding?: RadialGaugeScaleLabelsPadding;
-        position?: string;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface RadialGaugeScaleMajorTicks {
-        color?: string;
-        size?: number;
-        visible?: boolean;
-        width?: number;
-    }
-
-    interface RadialGaugeScaleMinorTicks {
-        color?: string;
-        size?: number;
-        visible?: boolean;
-        width?: number;
-    }
-
-    interface RadialGaugeScaleRange {
-        from?: number;
-        to?: number;
-        opacity?: number;
-        color?: string;
-    }
-
-    interface RadialGaugeScale {
-        endAngle?: number;
-        labels?: RadialGaugeScaleLabels;
-        majorTicks?: RadialGaugeScaleMajorTicks;
-        majorUnit?: number;
-        max?: number;
-        min?: number;
-        minorTicks?: RadialGaugeScaleMinorTicks;
-        minorUnit?: number;
-        ranges?: RadialGaugeScaleRange[];
-        rangePlaceholderColor?: string;
-        rangeSize?: number;
-        rangeDistance?: number;
-        reverse?: boolean;
-        startAngle?: number;
-    }
-
-    interface RadialGaugeExportImageOptions {
-        width?: string;
-        height?: string;
-    }
-
-    interface RadialGaugeExportSVGOptions {
-        raw?: boolean;
-    }
-
-    interface RadialGaugeOptions {
-        name?: string;
-        gaugeArea?: RadialGaugeGaugeArea;
-        pointer?: RadialGaugePointerItem[];
-        renderAs?: string;
-        scale?: RadialGaugeScale;
-        transitions?: boolean;
-    }
-    interface RadialGaugeEvent {
-        sender: RadialGauge;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Sparkline extends kendo.ui.Widget {
-
-        static fn: Sparkline;
-
-        options: SparklineOptions;
-
-        dataSource: kendo.data.DataSource;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Sparkline;
-
-        constructor(element: Element, options?: SparklineOptions);
-
-
-        destroy(): void;
-        exportImage(options: any): JQueryPromise<any>;
-        exportPDF(options?: kendo.drawing.PDFOptions): JQueryPromise<any>;
-        exportSVG(options: any): JQueryPromise<any>;
-        refresh(): void;
-        setDataSource(dataSource: kendo.data.DataSource): void;
-        setOptions(options: any): void;
-        svg(): string;
-        imageDataURL(): string;
-
-    }
-
-    interface SparklineCategoryAxisItemCrosshairTooltipBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface SparklineCategoryAxisItemCrosshairTooltip {
-        background?: string;
-        border?: SparklineCategoryAxisItemCrosshairTooltipBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        padding?: number|any;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface SparklineCategoryAxisItemCrosshair {
-        color?: string;
-        width?: number;
-        opacity?: number;
-        dashType?: number;
-        visible?: boolean;
-        tooltip?: SparklineCategoryAxisItemCrosshairTooltip;
-    }
-
-    interface SparklineCategoryAxisItemLabelsBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface SparklineCategoryAxisItemLabels {
-        background?: string;
-        border?: SparklineCategoryAxisItemLabelsBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        margin?: number|any;
-        mirror?: boolean;
-        padding?: number|any;
-        rotation?: number;
-        skip?: number;
-        step?: number;
-        template?: string|Function;
-        visible?: boolean;
-        culture?: string;
-        dateFormats?: any;
-    }
-
-    interface SparklineCategoryAxisItemLine {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-    }
-
-    interface SparklineCategoryAxisItemMajorGridLines {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface SparklineCategoryAxisItemMajorTicks {
-        size?: number;
-        visible?: boolean;
-        color?: string;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface SparklineCategoryAxisItemMinorGridLines {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface SparklineCategoryAxisItemMinorTicks {
-        size?: number;
-        visible?: boolean;
-        color?: string;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface SparklineCategoryAxisItemNotesDataItemIconBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface SparklineCategoryAxisItemNotesDataItemIcon {
-        background?: string;
-        border?: SparklineCategoryAxisItemNotesDataItemIconBorder;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface SparklineCategoryAxisItemNotesDataItemLabelBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface SparklineCategoryAxisItemNotesDataItemLabel {
-        background?: string;
-        border?: SparklineCategoryAxisItemNotesDataItemLabelBorder;
-        color?: string;
-        font?: string;
-        template?: string|Function;
-        visible?: boolean;
-        rotation?: number;
-        format?: string;
-        text?: string;
-        position?: string;
-    }
-
-    interface SparklineCategoryAxisItemNotesDataItemLine {
-        width?: number;
-        color?: string;
-        length?: number;
-    }
-
-    interface SparklineCategoryAxisItemNotesDataItem {
-        value?: any;
-        position?: string;
-        icon?: SparklineCategoryAxisItemNotesDataItemIcon;
-        label?: SparklineCategoryAxisItemNotesDataItemLabel;
-        line?: SparklineCategoryAxisItemNotesDataItemLine;
-    }
-
-    interface SparklineCategoryAxisItemNotesIconBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface SparklineCategoryAxisItemNotesIcon {
-        background?: string;
-        border?: SparklineCategoryAxisItemNotesIconBorder;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface SparklineCategoryAxisItemNotesLabelBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface SparklineCategoryAxisItemNotesLabel {
-        background?: string;
-        border?: SparklineCategoryAxisItemNotesLabelBorder;
-        color?: string;
-        font?: string;
-        template?: string|Function;
-        visible?: boolean;
-        rotation?: number;
-        format?: string;
-        position?: string;
-    }
-
-    interface SparklineCategoryAxisItemNotesLine {
-        width?: number;
-        color?: string;
-        length?: number;
-    }
-
-    interface SparklineCategoryAxisItemNotes {
-        position?: string;
-        icon?: SparklineCategoryAxisItemNotesIcon;
-        label?: SparklineCategoryAxisItemNotesLabel;
-        line?: SparklineCategoryAxisItemNotesLine;
-        data?: SparklineCategoryAxisItemNotesDataItem[];
-    }
-
-    interface SparklineCategoryAxisItemPlotBand {
-        from?: number;
-        to?: number;
-        color?: string;
-        opacity?: number;
-    }
-
-    interface SparklineCategoryAxisItemTitleBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface SparklineCategoryAxisItemTitle {
-        background?: string;
-        border?: SparklineCategoryAxisItemTitleBorder;
-        color?: string;
-        font?: string;
-        margin?: number|any;
-        position?: string;
-        rotation?: number;
-        text?: string;
-        visible?: boolean;
-    }
-
-    interface SparklineCategoryAxisItem {
-        axisCrossingValue?: any|Date|any;
-        categories?: any;
-        color?: string;
-        field?: string;
-        justified?: boolean;
-        labels?: SparklineCategoryAxisItemLabels;
-        line?: SparklineCategoryAxisItemLine;
-        majorGridLines?: SparklineCategoryAxisItemMajorGridLines;
-        majorTicks?: SparklineCategoryAxisItemMajorTicks;
-        minorGridLines?: SparklineCategoryAxisItemMinorGridLines;
-        minorTicks?: SparklineCategoryAxisItemMinorTicks;
-        name?: string;
-        plotBands?: SparklineCategoryAxisItemPlotBand[];
-        reverse?: boolean;
-        title?: SparklineCategoryAxisItemTitle;
-        type?: string;
-        autoBaseUnitSteps?: any;
-        baseUnit?: string;
-        baseUnitStep?: any;
-        max?: any;
-        min?: any;
-        roundToBaseUnit?: boolean;
-        weekStartDay?: number;
-        maxDateGroups?: number;
-        visible?: boolean;
-        crosshair?: SparklineCategoryAxisItemCrosshair;
-        notes?: SparklineCategoryAxisItemNotes;
-    }
-
-    interface SparklineChartAreaBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface SparklineChartArea {
-        background?: string;
-        opacity?: number;
-        border?: SparklineChartAreaBorder;
-        height?: number;
-        margin?: number|any;
-        width?: number;
-    }
-
-    interface SparklinePlotAreaBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface SparklinePlotArea {
-        background?: string;
-        opacity?: number;
-        border?: SparklinePlotAreaBorder;
-        margin?: number|any;
-    }
-
-    interface SparklineSeriesItemBorder {
-        color?: string|Function;
-        dashType?: string|Function;
-        opacity?: number|Function;
-        width?: number|Function;
-    }
-
-    interface SparklineSeriesItemConnectors {
-        color?: string;
-        padding?: number;
-        width?: number;
-    }
-
-    interface SparklineSeriesItemHighlightBorder {
-        width?: number;
-        color?: string;
-        opacity?: number;
-    }
-
-    interface SparklineSeriesItemHighlight {
-        border?: SparklineSeriesItemHighlightBorder;
-        color?: string;
-        opacity?: number;
-        visible?: boolean;
-    }
-
-    interface SparklineSeriesItemLabelsBorder {
-        color?: string|Function;
-        dashType?: string|Function;
-        width?: number|Function;
-    }
-
-    interface SparklineSeriesItemLabels {
-        align?: string;
-        background?: string|Function;
-        border?: SparklineSeriesItemLabelsBorder;
-        color?: string|Function;
-        distance?: number;
-        font?: string|Function;
-        format?: string|Function;
-        margin?: number|any;
-        padding?: number|any;
-        position?: string|Function;
-        template?: string|Function;
-        visible?: boolean|Function;
-    }
-
-    interface SparklineSeriesItemLine {
-        color?: string;
-        opacity?: number;
-        width?: string;
-        style?: string;
-    }
-
-    interface SparklineSeriesItemMarkersBorder {
-        color?: string|Function;
-        width?: number|Function;
-    }
-
-    interface SparklineSeriesItemMarkers {
-        background?: string|Function;
-        border?: SparklineSeriesItemMarkersBorder;
-        size?: number|Function;
-        type?: string|Function;
-        visible?: boolean|Function;
-        rotation?: number|Function;
-    }
-
-    interface SparklineSeriesItemNotesIconBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface SparklineSeriesItemNotesIcon {
-        background?: string;
-        border?: SparklineSeriesItemNotesIconBorder;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface SparklineSeriesItemNotesLabelBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface SparklineSeriesItemNotesLabel {
-        background?: string;
-        border?: SparklineSeriesItemNotesLabelBorder;
-        color?: string;
-        font?: string;
-        template?: string|Function;
-        visible?: boolean;
-        rotation?: number;
-        format?: string;
-        position?: string;
-    }
-
-    interface SparklineSeriesItemNotesLine {
-        width?: number;
-        color?: string;
-        length?: number;
-    }
-
-    interface SparklineSeriesItemNotes {
-        position?: string;
-        icon?: SparklineSeriesItemNotesIcon;
-        label?: SparklineSeriesItemNotesLabel;
-        line?: SparklineSeriesItemNotesLine;
-    }
-
-    interface SparklineSeriesItemOverlay {
-        gradient?: string;
-    }
-
-    interface SparklineSeriesItemStack {
-        type?: string;
-        group?: string;
-    }
-
-    interface SparklineSeriesItemTargetBorder {
-        color?: string|Function;
-        dashType?: string|Function;
-        width?: number;
-    }
-
-    interface SparklineSeriesItemTargetLine {
-        width?: any|Function;
-    }
-
-    interface SparklineSeriesItemTarget {
-        line?: SparklineSeriesItemTargetLine;
-        color?: string|Function;
-        border?: SparklineSeriesItemTargetBorder;
-    }
-
-    interface SparklineSeriesItemTooltipBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface SparklineSeriesItemTooltip {
-        background?: string;
-        border?: SparklineSeriesItemTooltipBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        padding?: number|any;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface SparklineSeriesItem {
-        type?: string;
-        dashType?: string;
-        data?: any;
-        explodeField?: string;
-        currentField?: string;
-        targetField?: string;
-        field?: string;
-        name?: string;
-        highlight?: SparklineSeriesItemHighlight;
-        aggregate?: string|Function;
-        axis?: string;
-        border?: SparklineSeriesItemBorder;
-        categoryField?: string;
-        color?: string|Function;
-        colorField?: string;
-        connectors?: SparklineSeriesItemConnectors;
-        gap?: number;
-        labels?: SparklineSeriesItemLabels;
-        line?: SparklineSeriesItemLine;
-        markers?: SparklineSeriesItemMarkers;
-        missingValues?: string;
-        style?: string;
-        negativeColor?: string;
-        opacity?: number;
-        overlay?: SparklineSeriesItemOverlay;
-        padding?: number;
-        size?: number;
-        startAngle?: number;
-        spacing?: number;
-        stack?: SparklineSeriesItemStack;
-        tooltip?: SparklineSeriesItemTooltip;
-        width?: number;
-        target?: SparklineSeriesItemTarget;
-        notes?: SparklineSeriesItemNotes;
-        zIndex?: number;
-    }
-
-    interface SparklineSeriesDefaultsBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface SparklineSeriesDefaultsLabelsBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface SparklineSeriesDefaultsLabels {
-        background?: string;
-        border?: SparklineSeriesDefaultsLabelsBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        margin?: number|any;
-        padding?: number|any;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface SparklineSeriesDefaultsStack {
-        type?: string;
-    }
-
-    interface SparklineSeriesDefaultsTooltipBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface SparklineSeriesDefaultsTooltip {
-        background?: string;
-        border?: SparklineSeriesDefaultsTooltipBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        padding?: number|any;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface SparklineSeriesDefaults {
-        area?: any;
-        bar?: any;
-        border?: SparklineSeriesDefaultsBorder;
-        column?: any;
-        gap?: number;
-        labels?: SparklineSeriesDefaultsLabels;
-        line?: any;
-        overlay?: any;
-        pie?: any;
-        spacing?: number;
-        stack?: SparklineSeriesDefaultsStack;
-        type?: string;
-        tooltip?: SparklineSeriesDefaultsTooltip;
-    }
-
-    interface SparklineTooltipBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface SparklineTooltip {
-        background?: string;
-        border?: SparklineTooltipBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        padding?: number|any;
-        template?: string|Function;
-        visible?: boolean;
-        shared?: boolean;
-        sharedTemplate?: string;
-    }
-
-    interface SparklineValueAxisItemCrosshairTooltipBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface SparklineValueAxisItemCrosshairTooltip {
-        background?: string;
-        border?: SparklineValueAxisItemCrosshairTooltipBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        padding?: number|any;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface SparklineValueAxisItemCrosshair {
-        color?: string;
-        width?: number;
-        opacity?: number;
-        dashType?: number;
-        visible?: boolean;
-        tooltip?: SparklineValueAxisItemCrosshairTooltip;
-    }
-
-    interface SparklineValueAxisItemLabelsBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface SparklineValueAxisItemLabels {
-        background?: string;
-        border?: SparklineValueAxisItemLabelsBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        margin?: number|any;
-        mirror?: boolean;
-        padding?: number|any;
-        rotation?: number;
-        skip?: number;
-        step?: number;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface SparklineValueAxisItemLine {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-    }
-
-    interface SparklineValueAxisItemMajorGridLines {
-        color?: string;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface SparklineValueAxisItemMajorTicks {
-        size?: number;
-        visible?: boolean;
-        color?: string;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface SparklineValueAxisItemMinorGridLines {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface SparklineValueAxisItemMinorTicks {
-        size?: number;
-        color?: string;
-        width?: number;
-        visible?: boolean;
-        step?: number;
-        skip?: number;
-    }
-
-    interface SparklineValueAxisItemNotesDataItemIconBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface SparklineValueAxisItemNotesDataItemIcon {
-        background?: string;
-        border?: SparklineValueAxisItemNotesDataItemIconBorder;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface SparklineValueAxisItemNotesDataItemLabelBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface SparklineValueAxisItemNotesDataItemLabel {
-        background?: string;
-        border?: SparklineValueAxisItemNotesDataItemLabelBorder;
-        color?: string;
-        font?: string;
-        template?: string|Function;
-        visible?: boolean;
-        rotation?: number;
-        format?: string;
-        text?: string;
-        position?: string;
-    }
-
-    interface SparklineValueAxisItemNotesDataItemLine {
-        width?: number;
-        color?: string;
-        length?: number;
-    }
-
-    interface SparklineValueAxisItemNotesDataItem {
-        value?: any;
-        position?: string;
-        icon?: SparklineValueAxisItemNotesDataItemIcon;
-        label?: SparklineValueAxisItemNotesDataItemLabel;
-        line?: SparklineValueAxisItemNotesDataItemLine;
-    }
-
-    interface SparklineValueAxisItemNotesIconBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface SparklineValueAxisItemNotesIcon {
-        background?: string;
-        border?: SparklineValueAxisItemNotesIconBorder;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface SparklineValueAxisItemNotesLabelBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface SparklineValueAxisItemNotesLabel {
-        background?: string;
-        border?: SparklineValueAxisItemNotesLabelBorder;
-        color?: string;
-        font?: string;
-        template?: string|Function;
-        visible?: boolean;
-        rotation?: number;
-        format?: string;
-        position?: string;
-    }
-
-    interface SparklineValueAxisItemNotesLine {
-        width?: number;
-        color?: string;
-        length?: number;
-    }
-
-    interface SparklineValueAxisItemNotes {
-        position?: string;
-        icon?: SparklineValueAxisItemNotesIcon;
-        label?: SparklineValueAxisItemNotesLabel;
-        line?: SparklineValueAxisItemNotesLine;
-        data?: SparklineValueAxisItemNotesDataItem[];
-    }
-
-    interface SparklineValueAxisItemPlotBand {
-        from?: number;
-        to?: number;
-        color?: string;
-        opacity?: number;
-    }
-
-    interface SparklineValueAxisItemTitleBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface SparklineValueAxisItemTitle {
-        background?: string;
-        border?: SparklineValueAxisItemTitleBorder;
-        color?: string;
-        font?: string;
-        margin?: number|any;
-        padding?: number|any;
-        position?: string;
-        rotation?: number;
-        text?: string;
-        visible?: boolean;
-    }
-
-    interface SparklineValueAxisItem {
-        axisCrossingValue?: any|Date|any;
-        color?: string;
-        labels?: SparklineValueAxisItemLabels;
-        line?: SparklineValueAxisItemLine;
-        majorGridLines?: SparklineValueAxisItemMajorGridLines;
-        majorTicks?: SparklineValueAxisItemMajorTicks;
-        majorUnit?: number;
-        max?: number;
-        min?: number;
-        minorGridLines?: SparklineValueAxisItemMinorGridLines;
-        minorTicks?: SparklineValueAxisItemMinorTicks;
-        minorUnit?: number;
-        name?: any;
-        narrowRange?: boolean;
-        plotBands?: SparklineValueAxisItemPlotBand[];
-        reverse?: boolean;
-        title?: SparklineValueAxisItemTitle;
-        visible?: boolean;
-        crosshair?: SparklineValueAxisItemCrosshair;
-        notes?: SparklineValueAxisItemNotes;
-    }
-
-    interface SparklineExportImageOptions {
-        width?: string;
-        height?: string;
-    }
-
-    interface SparklineExportSVGOptions {
-        raw?: boolean;
-    }
-
-    interface SparklineSeriesClickEventSeries {
-        type?: string;
-        name?: string;
-        data?: any;
-    }
-
-    interface SparklineSeriesHoverEventSeries {
-        type?: string;
-        name?: string;
-        data?: any;
-    }
-
-    interface SparklineOptions {
-        name?: string;
-        axisDefaults?: any;
-        categoryAxis?: SparklineCategoryAxisItem[];
-        chartArea?: SparklineChartArea;
-        data?: any;
-        dataSource?: any;
-        autoBind?: boolean;
-        plotArea?: SparklinePlotArea;
-        pointWidth?: number;
-        renderAs?: string;
-        series?: SparklineSeriesItem[];
-        seriesColors?: any;
-        seriesDefaults?: SparklineSeriesDefaults;
-        theme?: string;
-        tooltip?: SparklineTooltip;
-        transitions?: boolean;
-        type?: string;
-        valueAxis?: SparklineValueAxisItem[];
-        axisLabelClick?(e: SparklineAxisLabelClickEvent): void;
-        dataBound?(e: SparklineEvent): void;
-        dragStart?(e: SparklineDragStartEvent): void;
-        drag?(e: SparklineDragEvent): void;
-        dragEnd?(e: SparklineDragEndEvent): void;
-        plotAreaClick?(e: SparklinePlotAreaClickEvent): void;
-        seriesClick?(e: SparklineSeriesClickEvent): void;
-        seriesHover?(e: SparklineSeriesHoverEvent): void;
-        zoomStart?(e: SparklineZoomStartEvent): void;
-        zoom?(e: SparklineZoomEvent): void;
-        zoomEnd?(e: SparklineZoomEndEvent): void;
-    }
-    interface SparklineEvent {
-        sender: Sparkline;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface SparklineAxisLabelClickEvent extends SparklineEvent {
-        axis?: any;
-        value?: any;
-        text?: any;
-        index?: any;
-        dataItem?: any;
-        element?: any;
-    }
-
-    interface SparklineDragStartEvent extends SparklineEvent {
-        axisRanges?: any;
-        originalEvent?: any;
-    }
-
-    interface SparklineDragEvent extends SparklineEvent {
-        axisRanges?: any;
-        originalEvent?: any;
-    }
-
-    interface SparklineDragEndEvent extends SparklineEvent {
-        axisRanges?: any;
-        originalEvent?: any;
-    }
-
-    interface SparklinePlotAreaClickEvent extends SparklineEvent {
-        value?: any;
-        category?: any;
-        element?: any;
-        x?: any;
-        y?: any;
-    }
-
-    interface SparklineSeriesClickEvent extends SparklineEvent {
-        value?: any;
-        category?: any;
-        series?: SparklineSeriesClickEventSeries;
-        dataItem?: any;
-        element?: any;
-        percentage?: any;
-    }
-
-    interface SparklineSeriesHoverEvent extends SparklineEvent {
-        value?: any;
-        category?: any;
-        series?: SparklineSeriesHoverEventSeries;
-        dataItem?: any;
-        element?: any;
-        percentage?: any;
-    }
-
-    interface SparklineZoomStartEvent extends SparklineEvent {
-        axisRanges?: any;
-        originalEvent?: any;
-    }
-
-    interface SparklineZoomEvent extends SparklineEvent {
-        axisRanges?: any;
-        delta?: number;
-        originalEvent?: any;
-    }
-
-    interface SparklineZoomEndEvent extends SparklineEvent {
-        axisRanges?: any;
-        originalEvent?: any;
-    }
-
-
-    class StockChart extends kendo.ui.Widget {
-
-        static fn: StockChart;
-
-        options: StockChartOptions;
-
-        dataSource: kendo.data.DataSource;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): StockChart;
-
-        constructor(element: Element, options?: StockChartOptions);
-
-
-        destroy(): void;
-        exportImage(options: any): JQueryPromise<any>;
-        exportPDF(options?: kendo.drawing.PDFOptions): JQueryPromise<any>;
-        exportSVG(options: any): JQueryPromise<any>;
-        redraw(): void;
-        refresh(): void;
-        resize(force?: boolean): void;
-        setDataSource(dataSource: kendo.data.DataSource): void;
-        svg(): string;
-        imageDataURL(): string;
-
-    }
-
-    interface StockChartCategoryAxisItemAutoBaseUnitSteps {
-        days?: any;
-        hours?: any;
-        minutes?: any;
-        months?: any;
-        weeks?: any;
-        years?: any;
-    }
-
-    interface StockChartCategoryAxisItemCrosshairTooltipBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface StockChartCategoryAxisItemCrosshairTooltip {
-        background?: string;
-        border?: StockChartCategoryAxisItemCrosshairTooltipBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        padding?: number|any;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface StockChartCategoryAxisItemCrosshair {
-        color?: string;
-        width?: number;
-        opacity?: number;
-        dashType?: number;
-        visible?: boolean;
-        tooltip?: StockChartCategoryAxisItemCrosshairTooltip;
-    }
-
-    interface StockChartCategoryAxisItemLabelsBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartCategoryAxisItemLabels {
-        background?: string;
-        border?: StockChartCategoryAxisItemLabelsBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        margin?: number|any;
-        mirror?: boolean;
-        padding?: number|any;
-        rotation?: number;
-        skip?: number;
-        step?: number;
-        template?: string|Function;
-        visible?: boolean;
-        culture?: string;
-        dateFormats?: any;
-    }
-
-    interface StockChartCategoryAxisItemLine {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-    }
-
-    interface StockChartCategoryAxisItemMajorGridLines {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface StockChartCategoryAxisItemMajorTicks {
-        color?: string;
-        size?: number;
-        width?: number;
-        visible?: boolean;
-        step?: number;
-        skip?: number;
-    }
-
-    interface StockChartCategoryAxisItemMinorGridLines {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface StockChartCategoryAxisItemMinorTicks {
-        size?: number;
-        visible?: boolean;
-        color?: string;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface StockChartCategoryAxisItemNotesDataItemIconBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface StockChartCategoryAxisItemNotesDataItemIcon {
-        background?: string;
-        border?: StockChartCategoryAxisItemNotesDataItemIconBorder;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface StockChartCategoryAxisItemNotesDataItemLabelBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartCategoryAxisItemNotesDataItemLabel {
-        background?: string;
-        border?: StockChartCategoryAxisItemNotesDataItemLabelBorder;
-        color?: string;
-        font?: string;
-        template?: string|Function;
-        visible?: boolean;
-        rotation?: number;
-        format?: string;
-        text?: string;
-        position?: string;
-    }
-
-    interface StockChartCategoryAxisItemNotesDataItemLine {
-        width?: number;
-        color?: string;
-        length?: number;
-    }
-
-    interface StockChartCategoryAxisItemNotesDataItem {
-        value?: any;
-        position?: string;
-        icon?: StockChartCategoryAxisItemNotesDataItemIcon;
-        label?: StockChartCategoryAxisItemNotesDataItemLabel;
-        line?: StockChartCategoryAxisItemNotesDataItemLine;
-    }
-
-    interface StockChartCategoryAxisItemNotesIconBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface StockChartCategoryAxisItemNotesIcon {
-        background?: string;
-        border?: StockChartCategoryAxisItemNotesIconBorder;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface StockChartCategoryAxisItemNotesLabelBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartCategoryAxisItemNotesLabel {
-        background?: string;
-        border?: StockChartCategoryAxisItemNotesLabelBorder;
-        color?: string;
-        font?: string;
-        template?: string|Function;
-        visible?: boolean;
-        rotation?: number;
-        format?: string;
-        position?: string;
-    }
-
-    interface StockChartCategoryAxisItemNotesLine {
-        width?: number;
-        color?: string;
-        length?: number;
-    }
-
-    interface StockChartCategoryAxisItemNotes {
-        position?: string;
-        icon?: StockChartCategoryAxisItemNotesIcon;
-        label?: StockChartCategoryAxisItemNotesLabel;
-        line?: StockChartCategoryAxisItemNotesLine;
-        data?: StockChartCategoryAxisItemNotesDataItem[];
-    }
-
-    interface StockChartCategoryAxisItemPlotBand {
-        from?: number;
-        to?: number;
-        color?: string;
-        opacity?: number;
-    }
-
-    interface StockChartCategoryAxisItemSelectMousewheel {
-        reverse?: boolean;
-        zoom?: string;
-    }
-
-    interface StockChartCategoryAxisItemSelect {
-        from?: any;
-        to?: any;
-        min?: any;
-        max?: any;
-        mousewheel?: StockChartCategoryAxisItemSelectMousewheel;
-    }
-
-    interface StockChartCategoryAxisItemTitleBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartCategoryAxisItemTitle {
-        background?: string;
-        border?: StockChartCategoryAxisItemTitleBorder;
-        color?: string;
-        font?: string;
-        margin?: number|any;
-        position?: string;
-        rotation?: number;
-        text?: string;
-        visible?: boolean;
-    }
-
-    interface StockChartCategoryAxisItem {
-        axisCrossingValue?: any|Date|any;
-        categories?: any;
-        color?: string;
-        field?: string;
-        justified?: boolean;
-        labels?: StockChartCategoryAxisItemLabels;
-        line?: StockChartCategoryAxisItemLine;
-        majorGridLines?: StockChartCategoryAxisItemMajorGridLines;
-        majorTicks?: StockChartCategoryAxisItemMajorTicks;
-        minorGridLines?: StockChartCategoryAxisItemMinorGridLines;
-        minorTicks?: StockChartCategoryAxisItemMinorTicks;
-        name?: string;
-        pane?: string;
-        plotBands?: StockChartCategoryAxisItemPlotBand[];
-        reverse?: boolean;
-        select?: StockChartCategoryAxisItemSelect;
-        title?: StockChartCategoryAxisItemTitle;
-        type?: string;
-        autoBaseUnitSteps?: StockChartCategoryAxisItemAutoBaseUnitSteps;
-        background?: string;
-        baseUnit?: string;
-        baseUnitStep?: any;
-        max?: any;
-        min?: any;
-        roundToBaseUnit?: boolean;
-        weekStartDay?: number;
-        maxDateGroups?: number;
-        visible?: boolean;
-        crosshair?: StockChartCategoryAxisItemCrosshair;
-        notes?: StockChartCategoryAxisItemNotes;
-    }
-
-    interface StockChartChartAreaBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartChartArea {
-        background?: string;
-        opacity?: number;
-        border?: StockChartChartAreaBorder;
-        height?: number;
-        margin?: number|any;
-        width?: number;
-    }
-
-    interface StockChartLegendBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartLegendInactiveItemsLabels {
-        color?: string;
-        font?: string;
-        template?: string;
-    }
-
-    interface StockChartLegendInactiveItemsMarkers {
-        color?: string;
-    }
-
-    interface StockChartLegendInactiveItems {
-        labels?: StockChartLegendInactiveItemsLabels;
-        markers?: StockChartLegendInactiveItemsMarkers;
-    }
-
-    interface StockChartLegendItem {
-        cursor?: string;
-        visual?: Function;
-    }
-
-    interface StockChartLegendLabels {
-        color?: string;
-        font?: string;
-        template?: string;
-    }
-
-    interface StockChartLegend {
-        background?: string;
-        border?: StockChartLegendBorder;
-        item?: StockChartLegendItem;
-        labels?: StockChartLegendLabels;
-        margin?: number|any;
-        offsetX?: number;
-        offsetY?: number;
-        padding?: number|any;
-        position?: string;
-        reverse?: boolean;
-        visible?: boolean;
-        inactiveItems?: StockChartLegendInactiveItems;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemAutoBaseUnitSteps {
-        seconds?: any;
-        minutes?: any;
-        hours?: any;
-        days?: any;
-        weeks?: any;
-        months?: any;
-        years?: any;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemCrosshairTooltipBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemCrosshairTooltipPadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemCrosshairTooltip {
-        background?: string;
-        border?: StockChartNavigatorCategoryAxisItemCrosshairTooltipBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        padding?: StockChartNavigatorCategoryAxisItemCrosshairTooltipPadding;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemCrosshair {
-        color?: string;
-        opacity?: number;
-        tooltip?: StockChartNavigatorCategoryAxisItemCrosshairTooltip;
-        visible?: boolean;
-        width?: number;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemLabelsBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemLabelsDateFormats {
-        days?: string;
-        hours?: string;
-        months?: string;
-        weeks?: string;
-        years?: string;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemLabelsMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemLabelsPadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemLabels {
-        background?: string;
-        border?: StockChartNavigatorCategoryAxisItemLabelsBorder;
-        color?: string;
-        culture?: string;
-        dateFormats?: StockChartNavigatorCategoryAxisItemLabelsDateFormats;
-        font?: string;
-        format?: string;
-        margin?: StockChartNavigatorCategoryAxisItemLabelsMargin;
-        mirror?: boolean;
-        padding?: StockChartNavigatorCategoryAxisItemLabelsPadding;
-        rotation?: number;
-        skip?: number;
-        step?: number;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemLine {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemMajorGridLines {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemMajorTicks {
-        color?: string;
-        size?: number;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemMinorGridLines {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemMinorTicks {
-        color?: string;
-        size?: number;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemNotesDataItemIconBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemNotesDataItemIcon {
-        background?: string;
-        border?: StockChartNavigatorCategoryAxisItemNotesDataItemIconBorder;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemNotesDataItemLabelBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemNotesDataItemLabel {
-        background?: string;
-        border?: StockChartNavigatorCategoryAxisItemNotesDataItemLabelBorder;
-        color?: string;
-        font?: string;
-        template?: string|Function;
-        visible?: boolean;
-        rotation?: number;
-        format?: string;
-        text?: string;
-        position?: string;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemNotesDataItemLine {
-        width?: number;
-        color?: string;
-        length?: number;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemNotesDataItem {
-        value?: any;
-        position?: string;
-        icon?: StockChartNavigatorCategoryAxisItemNotesDataItemIcon;
-        label?: StockChartNavigatorCategoryAxisItemNotesDataItemLabel;
-        line?: StockChartNavigatorCategoryAxisItemNotesDataItemLine;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemNotesIconBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemNotesIcon {
-        background?: string;
-        border?: StockChartNavigatorCategoryAxisItemNotesIconBorder;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemNotesLabelBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemNotesLabel {
-        background?: string;
-        border?: StockChartNavigatorCategoryAxisItemNotesLabelBorder;
-        color?: string;
-        font?: string;
-        template?: string|Function;
-        visible?: boolean;
-        rotation?: number;
-        format?: string;
-        position?: string;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemNotesLine {
-        width?: number;
-        color?: string;
-        length?: number;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemNotes {
-        position?: string;
-        icon?: StockChartNavigatorCategoryAxisItemNotesIcon;
-        label?: StockChartNavigatorCategoryAxisItemNotesLabel;
-        line?: StockChartNavigatorCategoryAxisItemNotesLine;
-        data?: StockChartNavigatorCategoryAxisItemNotesDataItem[];
-    }
-
-    interface StockChartNavigatorCategoryAxisItemPlotBand {
-        color?: string;
-        from?: number;
-        opacity?: number;
-        to?: number;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemTitleBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemTitleMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemTitlePadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface StockChartNavigatorCategoryAxisItemTitle {
-        background?: string;
-        border?: StockChartNavigatorCategoryAxisItemTitleBorder;
-        color?: string;
-        font?: string;
-        margin?: StockChartNavigatorCategoryAxisItemTitleMargin;
-        padding?: StockChartNavigatorCategoryAxisItemTitlePadding;
-        position?: string;
-        rotation?: number;
-        text?: string;
-        visible?: boolean;
-    }
-
-    interface StockChartNavigatorCategoryAxisItem {
-        autoBaseUnitSteps?: StockChartNavigatorCategoryAxisItemAutoBaseUnitSteps;
-        axisCrossingValue?: any|Date|any;
-        background?: string;
-        baseUnit?: string;
-        baseUnitStep?: any;
-        categories?: any;
-        color?: string;
-        crosshair?: StockChartNavigatorCategoryAxisItemCrosshair;
-        field?: string;
-        justified?: boolean;
-        labels?: StockChartNavigatorCategoryAxisItemLabels;
-        line?: StockChartNavigatorCategoryAxisItemLine;
-        majorGridLines?: StockChartNavigatorCategoryAxisItemMajorGridLines;
-        majorTicks?: StockChartNavigatorCategoryAxisItemMajorTicks;
-        max?: any;
-        maxDateGroups?: number;
-        min?: any;
-        minorGridLines?: StockChartNavigatorCategoryAxisItemMinorGridLines;
-        minorTicks?: StockChartNavigatorCategoryAxisItemMinorTicks;
-        plotBands?: StockChartNavigatorCategoryAxisItemPlotBand[];
-        reverse?: boolean;
-        roundToBaseUnit?: boolean;
-        title?: StockChartNavigatorCategoryAxisItemTitle;
-        visible?: boolean;
-        weekStartDay?: number;
-        notes?: StockChartNavigatorCategoryAxisItemNotes;
-    }
-
-    interface StockChartNavigatorHint {
-        visible?: boolean;
-        template?: string|Function;
-        format?: string;
-    }
-
-    interface StockChartNavigatorPaneBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartNavigatorPaneMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface StockChartNavigatorPanePadding {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface StockChartNavigatorPaneTitleBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartNavigatorPaneTitleMargin {
-        bottom?: number;
-        left?: number;
-        right?: number;
-        top?: number;
-    }
-
-    interface StockChartNavigatorPaneTitle {
-        background?: string;
-        border?: StockChartNavigatorPaneTitleBorder;
-        color?: string;
-        font?: string;
-        margin?: StockChartNavigatorPaneTitleMargin;
-        position?: string;
-        text?: string;
-        visible?: boolean;
-    }
-
-    interface StockChartNavigatorPane {
-        background?: string;
-        border?: StockChartNavigatorPaneBorder;
-        height?: number;
-        margin?: StockChartNavigatorPaneMargin;
-        name?: string;
-        padding?: StockChartNavigatorPanePadding;
-        title?: StockChartNavigatorPaneTitle;
-    }
-
-    interface StockChartNavigatorSelect {
-        from?: Date;
-        to?: Date;
-    }
-
-    interface StockChartNavigatorSeriesItemBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartNavigatorSeriesItemHighlightBorder {
-        width?: number;
-        color?: string;
-        opacity?: number;
-    }
-
-    interface StockChartNavigatorSeriesItemHighlightLine {
-        width?: number;
-        color?: string;
-        opacity?: number;
-    }
-
-    interface StockChartNavigatorSeriesItemHighlight {
-        border?: StockChartNavigatorSeriesItemHighlightBorder;
-        color?: string;
-        line?: StockChartNavigatorSeriesItemHighlightLine;
-        opacity?: number;
-        visible?: boolean;
-    }
-
-    interface StockChartNavigatorSeriesItemLabelsBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartNavigatorSeriesItemLabels {
-        background?: string;
-        border?: StockChartNavigatorSeriesItemLabelsBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        margin?: number|any;
-        padding?: number|any;
-        position?: string;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface StockChartNavigatorSeriesItemLine {
-        color?: string;
-        opacity?: number;
-        width?: string;
-    }
-
-    interface StockChartNavigatorSeriesItemMarkersBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface StockChartNavigatorSeriesItemMarkers {
-        background?: string;
-        border?: StockChartNavigatorSeriesItemMarkersBorder;
-        rotation?: number|Function;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface StockChartNavigatorSeriesItemOverlay {
-        gradient?: string;
-    }
-
-    interface StockChartNavigatorSeriesItemStack {
-        type?: string;
-        group?: string;
-    }
-
-    interface StockChartNavigatorSeriesItemTooltipBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface StockChartNavigatorSeriesItemTooltip {
-        background?: string;
-        border?: StockChartNavigatorSeriesItemTooltipBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        padding?: number|any;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface StockChartNavigatorSeriesItem {
-        type?: string;
-        dashType?: string;
-        data?: any;
-        highField?: string;
-        field?: string;
-        categoryField?: string;
-        name?: string;
-        highlight?: StockChartNavigatorSeriesItemHighlight;
-        aggregate?: string|Function;
-        axis?: string;
-        border?: StockChartNavigatorSeriesItemBorder;
-        closeField?: string;
-        color?: string;
-        colorField?: string;
-        downColor?: string;
-        downColorField?: string;
-        gap?: number;
-        labels?: StockChartNavigatorSeriesItemLabels;
-        line?: StockChartNavigatorSeriesItemLine;
-        lowField?: string;
-        markers?: StockChartNavigatorSeriesItemMarkers;
-        missingValues?: string;
-        style?: string;
-        opacity?: number;
-        openField?: string;
-        overlay?: StockChartNavigatorSeriesItemOverlay;
-        spacing?: number;
-        stack?: StockChartNavigatorSeriesItemStack;
-        tooltip?: StockChartNavigatorSeriesItemTooltip;
-        width?: number;
-    }
-
-    interface StockChartNavigator {
-        categoryAxis?: StockChartNavigatorCategoryAxisItem[];
-        dataSource?: any;
-        autoBind?: boolean;
-        dateField?: string;
-        pane?: StockChartNavigatorPane;
-        visible?: boolean;
-        series?: StockChartNavigatorSeriesItem[];
-        select?: StockChartNavigatorSelect;
-        hint?: StockChartNavigatorHint;
-    }
-
-    interface StockChartPaneBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartPaneTitleBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartPaneTitle {
-        background?: string;
-        border?: StockChartPaneTitleBorder;
-        color?: string;
-        font?: string;
-        margin?: number|any;
-        position?: string;
-        text?: string;
-        visible?: boolean;
-    }
-
-    interface StockChartPane {
-        name?: string;
-        margin?: number|any;
-        padding?: number|any;
-        background?: string;
-        border?: StockChartPaneBorder;
-        clip?: boolean;
-        height?: number;
-        title?: StockChartPaneTitle;
-    }
-
-    interface StockChartPdfMargin {
-        bottom?: number|string;
-        left?: number|string;
-        right?: number|string;
-        top?: number|string;
-    }
-
-    interface StockChartPdf {
-        author?: string;
-        creator?: string;
-        date?: Date;
-        forceProxy?: boolean;
-        fileName?: string;
-        keywords?: string;
-        landscape?: boolean;
-        margin?: StockChartPdfMargin;
-        paperSize?: string|any;
-        proxyURL?: string;
-        proxyTarget?: string;
-        subject?: string;
-        title?: string;
-    }
-
-    interface StockChartPlotAreaBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartPlotArea {
-        background?: string;
-        opacity?: number;
-        border?: StockChartPlotAreaBorder;
-        margin?: number|any;
-    }
-
-    interface StockChartSeriesItemBorder {
-        color?: string|Function;
-        dashType?: string|Function;
-        opacity?: number|Function;
-        width?: number|Function;
-    }
-
-    interface StockChartSeriesItemHighlightBorder {
-        width?: number;
-        color?: string;
-        opacity?: number;
-    }
-
-    interface StockChartSeriesItemHighlightLine {
-        width?: number;
-        color?: string;
-        opacity?: number;
-    }
-
-    interface StockChartSeriesItemHighlight {
-        visible?: boolean;
-        border?: StockChartSeriesItemHighlightBorder;
-        color?: string;
-        line?: StockChartSeriesItemHighlightLine;
-        opacity?: number;
-    }
-
-    interface StockChartSeriesItemLabelsBorder {
-        color?: string|Function;
-        dashType?: string|Function;
-        width?: number|Function;
-    }
-
-    interface StockChartSeriesItemLabels {
-        background?: string|Function;
-        border?: StockChartSeriesItemLabelsBorder;
-        color?: string|Function;
-        font?: string|Function;
-        format?: string|Function;
-        margin?: number|any;
-        padding?: number|any;
-        position?: string|Function;
-        template?: string|Function;
-        visible?: boolean|Function;
-    }
-
-    interface StockChartSeriesItemLine {
-        color?: string;
-        opacity?: number;
-        width?: string;
-        style?: string;
-    }
-
-    interface StockChartSeriesItemMarkersBorder {
-        color?: string|Function;
-        width?: number|Function;
-    }
-
-    interface StockChartSeriesItemMarkers {
-        background?: string|Function;
-        border?: StockChartSeriesItemMarkersBorder;
-        size?: number|Function;
-        rotation?: number|Function;
-        type?: string|Function;
-        visible?: boolean|Function;
-    }
-
-    interface StockChartSeriesItemNotesIconBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface StockChartSeriesItemNotesIcon {
-        background?: string;
-        border?: StockChartSeriesItemNotesIconBorder;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface StockChartSeriesItemNotesLabelBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartSeriesItemNotesLabel {
-        background?: string;
-        border?: StockChartSeriesItemNotesLabelBorder;
-        color?: string;
-        font?: string;
-        template?: string|Function;
-        visible?: boolean;
-        rotation?: number;
-        format?: string;
-        position?: string;
-    }
-
-    interface StockChartSeriesItemNotesLine {
-        width?: number;
-        color?: string;
-        length?: number;
-    }
-
-    interface StockChartSeriesItemNotes {
-        position?: string;
-        icon?: StockChartSeriesItemNotesIcon;
-        label?: StockChartSeriesItemNotesLabel;
-        line?: StockChartSeriesItemNotesLine;
-    }
-
-    interface StockChartSeriesItemOverlay {
-        gradient?: string;
-    }
-
-    interface StockChartSeriesItemStack {
-        type?: string;
-        group?: string;
-    }
-
-    interface StockChartSeriesItemTargetBorder {
-        color?: string|Function;
-        dashType?: string|Function;
-        width?: number|Function;
-    }
-
-    interface StockChartSeriesItemTargetLine {
-        width?: any|Function;
-    }
-
-    interface StockChartSeriesItemTarget {
-        line?: StockChartSeriesItemTargetLine;
-        color?: string|Function;
-        border?: StockChartSeriesItemTargetBorder;
-    }
-
-    interface StockChartSeriesItemTooltipBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface StockChartSeriesItemTooltip {
-        background?: string;
-        border?: StockChartSeriesItemTooltipBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        padding?: number|any;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface StockChartSeriesItem {
-        type?: string;
-        dashType?: string;
-        data?: any;
-        highField?: string;
-        field?: string;
-        categoryField?: string;
-        currentField?: string;
-        targetField?: string;
-        name?: string;
-        highlight?: StockChartSeriesItemHighlight;
-        aggregate?: string|Function;
-        axis?: string;
-        border?: StockChartSeriesItemBorder;
-        closeField?: string;
-        color?: string|Function;
-        colorField?: string;
-        downColor?: string|Function;
-        downColorField?: string;
-        gap?: number;
-        labels?: StockChartSeriesItemLabels;
-        line?: StockChartSeriesItemLine;
-        lowField?: string;
-        markers?: StockChartSeriesItemMarkers;
-        missingValues?: string;
-        style?: string;
-        negativeColor?: string;
-        opacity?: number;
-        openField?: string;
-        overlay?: StockChartSeriesItemOverlay;
-        spacing?: number;
-        stack?: StockChartSeriesItemStack;
-        tooltip?: StockChartSeriesItemTooltip;
-        visibleInLegend?: boolean;
-        width?: number;
-        target?: StockChartSeriesItemTarget;
-        notes?: StockChartSeriesItemNotes;
-        zIndex?: number;
-    }
-
-    interface StockChartSeriesDefaultsBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartSeriesDefaultsLabelsBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartSeriesDefaultsLabels {
-        background?: string;
-        border?: StockChartSeriesDefaultsLabelsBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        margin?: number|any;
-        padding?: number|any;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface StockChartSeriesDefaultsStack {
-        type?: string;
-    }
-
-    interface StockChartSeriesDefaultsTooltipBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface StockChartSeriesDefaultsTooltip {
-        background?: string;
-        border?: StockChartSeriesDefaultsTooltipBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        padding?: number|any;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface StockChartSeriesDefaults {
-        area?: any;
-        candlestick?: any;
-        ohlc?: any;
-        border?: StockChartSeriesDefaultsBorder;
-        column?: any;
-        gap?: number;
-        labels?: StockChartSeriesDefaultsLabels;
-        line?: any;
-        overlay?: any;
-        pie?: any;
-        spacing?: number;
-        stack?: StockChartSeriesDefaultsStack;
-        type?: string;
-        tooltip?: StockChartSeriesDefaultsTooltip;
-    }
-
-    interface StockChartTitleBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartTitle {
-        align?: string;
-        background?: string;
-        border?: StockChartTitleBorder;
-        font?: string;
-        color?: string;
-        margin?: number|any;
-        padding?: number|any;
-        position?: string;
-        text?: string;
-        visible?: boolean;
-    }
-
-    interface StockChartTooltipBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface StockChartTooltip {
-        background?: string;
-        border?: StockChartTooltipBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        padding?: number|any;
-        template?: string|Function;
-        visible?: boolean;
-        shared?: boolean;
-        sharedTemplate?: string;
-    }
-
-    interface StockChartValueAxisItemCrosshairTooltipBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface StockChartValueAxisItemCrosshairTooltip {
-        background?: string;
-        border?: StockChartValueAxisItemCrosshairTooltipBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        padding?: number|any;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface StockChartValueAxisItemCrosshair {
-        color?: string;
-        width?: number;
-        opacity?: number;
-        dashType?: number;
-        visible?: boolean;
-        tooltip?: StockChartValueAxisItemCrosshairTooltip;
-    }
-
-    interface StockChartValueAxisItemLabelsBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartValueAxisItemLabels {
-        background?: string;
-        border?: StockChartValueAxisItemLabelsBorder;
-        color?: string;
-        font?: string;
-        format?: string;
-        margin?: number|any;
-        mirror?: boolean;
-        padding?: number|any;
-        rotation?: number;
-        skip?: number;
-        step?: number;
-        template?: string|Function;
-        visible?: boolean;
-    }
-
-    interface StockChartValueAxisItemLine {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-    }
-
-    interface StockChartValueAxisItemMajorGridLines {
-        color?: string;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface StockChartValueAxisItemMajorTicks {
-        size?: number;
-        visible?: boolean;
-        color?: string;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface StockChartValueAxisItemMinorGridLines {
-        color?: string;
-        dashType?: string;
-        visible?: boolean;
-        width?: number;
-        step?: number;
-        skip?: number;
-    }
-
-    interface StockChartValueAxisItemMinorTicks {
-        size?: number;
-        color?: string;
-        width?: number;
-        visible?: boolean;
-        step?: number;
-        skip?: number;
-    }
-
-    interface StockChartValueAxisItemNotesDataItemIconBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface StockChartValueAxisItemNotesDataItemIcon {
-        background?: string;
-        border?: StockChartValueAxisItemNotesDataItemIconBorder;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface StockChartValueAxisItemNotesDataItemLabelBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartValueAxisItemNotesDataItemLabel {
-        background?: string;
-        border?: StockChartValueAxisItemNotesDataItemLabelBorder;
-        color?: string;
-        font?: string;
-        template?: string|Function;
-        visible?: boolean;
-        rotation?: number;
-        format?: string;
-        text?: string;
-        position?: string;
-    }
-
-    interface StockChartValueAxisItemNotesDataItemLine {
-        width?: number;
-        color?: string;
-        length?: number;
-    }
-
-    interface StockChartValueAxisItemNotesDataItem {
-        value?: any;
-        position?: string;
-        icon?: StockChartValueAxisItemNotesDataItemIcon;
-        label?: StockChartValueAxisItemNotesDataItemLabel;
-        line?: StockChartValueAxisItemNotesDataItemLine;
-    }
-
-    interface StockChartValueAxisItemNotesIconBorder {
-        color?: string;
-        width?: number;
-    }
-
-    interface StockChartValueAxisItemNotesIcon {
-        background?: string;
-        border?: StockChartValueAxisItemNotesIconBorder;
-        size?: number;
-        type?: string;
-        visible?: boolean;
-    }
-
-    interface StockChartValueAxisItemNotesLabelBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartValueAxisItemNotesLabel {
-        background?: string;
-        border?: StockChartValueAxisItemNotesLabelBorder;
-        color?: string;
-        font?: string;
-        template?: string|Function;
-        visible?: boolean;
-        rotation?: number;
-        format?: string;
-        position?: string;
-    }
-
-    interface StockChartValueAxisItemNotesLine {
-        width?: number;
-        color?: string;
-        length?: number;
-    }
-
-    interface StockChartValueAxisItemNotes {
-        position?: string;
-        icon?: StockChartValueAxisItemNotesIcon;
-        label?: StockChartValueAxisItemNotesLabel;
-        line?: StockChartValueAxisItemNotesLine;
-        data?: StockChartValueAxisItemNotesDataItem[];
-    }
-
-    interface StockChartValueAxisItemPlotBand {
-        from?: number;
-        to?: number;
-        color?: string;
-        opacity?: number;
-    }
-
-    interface StockChartValueAxisItemTitleBorder {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface StockChartValueAxisItemTitle {
-        background?: string;
-        border?: StockChartValueAxisItemTitleBorder;
-        color?: string;
-        font?: string;
-        margin?: number|any;
-        padding?: number|any;
-        position?: string;
-        rotation?: number;
-        text?: string;
-        visible?: boolean;
-    }
-
-    interface StockChartValueAxisItem {
-        axisCrossingValue?: any|Date|any;
-        background?: string;
-        color?: string;
-        labels?: StockChartValueAxisItemLabels;
-        line?: StockChartValueAxisItemLine;
-        majorGridLines?: StockChartValueAxisItemMajorGridLines;
-        majorTicks?: StockChartValueAxisItemMajorTicks;
-        majorUnit?: number;
-        max?: number;
-        min?: number;
-        minorGridLines?: StockChartValueAxisItemMinorGridLines;
-        minorTicks?: StockChartValueAxisItemMinorTicks;
-        minorUnit?: number;
-        name?: any;
-        narrowRange?: boolean;
-        pane?: string;
-        plotBands?: StockChartValueAxisItemPlotBand[];
-        reverse?: boolean;
-        title?: StockChartValueAxisItemTitle;
-        visible?: boolean;
-        crosshair?: StockChartValueAxisItemCrosshair;
-        notes?: StockChartValueAxisItemNotes;
-    }
-
-    interface StockChartExportImageOptions {
-        width?: string;
-        height?: string;
-    }
-
-    interface StockChartExportSVGOptions {
-        raw?: boolean;
-    }
-
-    interface StockChartSeriesClickEventSeries {
-        type?: string;
-        name?: string;
-        data?: any;
-    }
-
-    interface StockChartSeriesHoverEventSeries {
-        type?: string;
-        name?: string;
-        data?: any;
-    }
-
-    interface StockChartOptions {
-        name?: string;
-        dateField?: string;
-        navigator?: StockChartNavigator;
-        axisDefaults?: any;
-        categoryAxis?: StockChartCategoryAxisItem[];
-        chartArea?: StockChartChartArea;
-        dataSource?: any;
-        autoBind?: boolean;
-        legend?: StockChartLegend;
-        panes?: StockChartPane[];
-        pdf?: StockChartPdf;
-        plotArea?: StockChartPlotArea;
-        renderAs?: string;
-        series?: StockChartSeriesItem[];
-        seriesColors?: any;
-        seriesDefaults?: StockChartSeriesDefaults;
-        theme?: string;
-        title?: StockChartTitle;
-        tooltip?: StockChartTooltip;
-        transitions?: boolean;
-        valueAxis?: StockChartValueAxisItem[];
-        axisLabelClick?(e: StockChartAxisLabelClickEvent): void;
-        legendItemClick?(e: StockChartLegendItemClickEvent): void;
-        legendItemHover?(e: StockChartLegendItemHoverEvent): void;
-        dataBound?(e: StockChartEvent): void;
-        dragStart?(e: StockChartDragStartEvent): void;
-        drag?(e: StockChartDragEvent): void;
-        dragEnd?(e: StockChartDragEndEvent): void;
-        noteClick?(e: StockChartNoteClickEvent): void;
-        noteHover?(e: StockChartNoteHoverEvent): void;
-        plotAreaClick?(e: StockChartPlotAreaClickEvent): void;
-        render?(e: StockChartEvent): void;
-        seriesClick?(e: StockChartSeriesClickEvent): void;
-        seriesHover?(e: StockChartSeriesHoverEvent): void;
-        zoomStart?(e: StockChartZoomStartEvent): void;
-        zoom?(e: StockChartZoomEvent): void;
-        zoomEnd?(e: StockChartZoomEndEvent): void;
-        selectStart?(e: StockChartSelectStartEvent): void;
-        select?(e: StockChartSelectEvent): void;
-        selectEnd?(e: StockChartSelectEndEvent): void;
-    }
-    interface StockChartEvent {
-        sender: StockChart;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface StockChartAxisLabelClickEvent extends StockChartEvent {
-        axis?: any;
-        value?: any;
-        text?: any;
-        index?: any;
-        dataItem?: any;
-        element?: any;
-    }
-
-    interface StockChartLegendItemClickEvent extends StockChartEvent {
-        text?: string;
-        series?: any;
-        seriesIndex?: number;
-        pointIndex?: number;
-        element?: any;
-    }
-
-    interface StockChartLegendItemHoverEvent extends StockChartEvent {
-        text?: string;
-        series?: any;
-        seriesIndex?: number;
-        pointIndex?: number;
-        element?: any;
-    }
-
-    interface StockChartDragStartEvent extends StockChartEvent {
-        axisRanges?: any;
-        originalEvent?: any;
-    }
-
-    interface StockChartDragEvent extends StockChartEvent {
-        axisRanges?: any;
-        originalEvent?: any;
-    }
-
-    interface StockChartDragEndEvent extends StockChartEvent {
-        axisRanges?: any;
-        originalEvent?: any;
-    }
-
-    interface StockChartNoteClickEvent extends StockChartEvent {
-        category?: any;
-        element?: any;
-        value?: any;
-        series?: any;
-        dataItem?: any;
-    }
-
-    interface StockChartNoteHoverEvent extends StockChartEvent {
-        category?: any;
-        element?: any;
-        value?: any;
-        series?: any;
-        dataItem?: any;
-    }
-
-    interface StockChartPlotAreaClickEvent extends StockChartEvent {
-        value?: any;
-        category?: any;
-        element?: any;
-        x?: any;
-        y?: any;
-    }
-
-    interface StockChartSeriesClickEvent extends StockChartEvent {
-        value?: any;
-        category?: any;
-        series?: StockChartSeriesClickEventSeries;
-        dataItem?: any;
-        element?: any;
-        percentage?: any;
-    }
-
-    interface StockChartSeriesHoverEvent extends StockChartEvent {
-        value?: any;
-        category?: any;
-        series?: StockChartSeriesHoverEventSeries;
-        dataItem?: any;
-        element?: any;
-        percentage?: any;
-    }
-
-    interface StockChartZoomStartEvent extends StockChartEvent {
-        axisRanges?: any;
-        originalEvent?: any;
-    }
-
-    interface StockChartZoomEvent extends StockChartEvent {
-        axisRanges?: any;
-        delta?: number;
-        originalEvent?: any;
-    }
-
-    interface StockChartZoomEndEvent extends StockChartEvent {
-        axisRanges?: any;
-        originalEvent?: any;
-    }
-
-    interface StockChartSelectStartEvent extends StockChartEvent {
-        axis?: any;
-        from?: any;
-        to?: any;
-    }
-
-    interface StockChartSelectEvent extends StockChartEvent {
-        axis?: any;
-        from?: any;
-        to?: any;
-    }
-
-    interface StockChartSelectEndEvent extends StockChartEvent {
-        axis?: any;
-        from?: any;
-        to?: any;
-    }
-
-
-    class TreeMap extends kendo.ui.Widget {
-
-        static fn: TreeMap;
-
-        options: TreeMapOptions;
-
-        dataSource: kendo.data.DataSource;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): TreeMap;
-
-        constructor(element: Element, options?: TreeMapOptions);
-
-
-
-    }
-
-    interface TreeMapOptions {
-        name?: string;
-        dataSource?: any|any|kendo.data.HierarchicalDataSource;
-        autoBind?: boolean;
-        type?: string;
-        theme?: string;
-        valueField?: string;
-        colorField?: string;
-        textField?: string;
-        template?: string|Function;
-        colors?: any;
-        itemCreated?(e: TreeMapItemCreatedEvent): void;
-        dataBound?(e: TreeMapDataBoundEvent): void;
-    }
-    interface TreeMapEvent {
-        sender: TreeMap;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface TreeMapItemCreatedEvent extends TreeMapEvent {
-        element?: JQuery|Element;
-    }
-
-    interface TreeMapDataBoundEvent extends TreeMapEvent {
-    }
-
-
-}
-declare namespace kendo.dataviz.map {
-    class BingLayer extends kendo.dataviz.map.TileLayer {
-
-
-        options: BingLayerOptions;
-
-        map: kendo.dataviz.ui.Map;
-
-        constructor(map: kendo.dataviz.ui.Map, options?: BingLayerOptions);
-
-
-        show(): void;
-        hide(): void;
-        imagerySet(): void;
-
-    }
-
-    interface BingLayerOptions {
-        name?: string;
-        baseUrl?: string;
-        imagerySet?: string;
-    }
-    interface BingLayerEvent {
-        sender: BingLayer;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Extent extends kendo.Class {
-
-
-        options: ExtentOptions;
-
-        nw: kendo.dataviz.map.Location;
-        se: kendo.dataviz.map.Location;
-
-        constructor(nw: kendo.dataviz.map.Location, se: kendo.dataviz.map.Location);
-
-        static create(a: kendo.dataviz.map.Location, b?: kendo.dataviz.map.Location): kendo.dataviz.map.Extent;
-        static create(a: kendo.dataviz.map.Location, b?: any): kendo.dataviz.map.Extent;
-        static create(a: any, b?: kendo.dataviz.map.Location): kendo.dataviz.map.Extent;
-        static create(a: any, b?: any): kendo.dataviz.map.Extent;
-
-        contains(location: kendo.dataviz.map.Location): boolean;
-        containsAny(locations: any): boolean;
-        center(): kendo.dataviz.map.Location;
-        include(location: kendo.dataviz.map.Location): void;
-        includeAll(locations: any): void;
-        edges(): any;
-        toArray(): any;
-        overlaps(extent: kendo.dataviz.map.Extent): boolean;
-
-    }
-
-    interface ExtentOptions {
-        name?: string;
-    }
-    interface ExtentEvent {
-        sender: Extent;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Layer extends kendo.Class {
-
-
-        options: LayerOptions;
-
-        map: kendo.dataviz.ui.Map;
-
-        constructor(map: kendo.dataviz.ui.Map, options?: LayerOptions);
-
-
-        show(): void;
-        hide(): void;
-
-    }
-
-    interface LayerOptions {
-        name?: string;
-    }
-    interface LayerEvent {
-        sender: Layer;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Location extends kendo.Class {
-
-
-        options: LocationOptions;
-
-        lat: number;
-        lng: number;
-
-        constructor(lat: number, lng: number);
-
-        static create(lat: number, lng?: number): kendo.dataviz.map.Location;
-        static create(lat: any, lng?: number): kendo.dataviz.map.Location;
-        static create(lat: kendo.dataviz.map.Location, lng?: number): kendo.dataviz.map.Location;
-        static fromLngLat(lnglat: any): kendo.dataviz.map.Location;
-        static fromLatLng(lnglat: any): kendo.dataviz.map.Location;
-
-        clone(): kendo.dataviz.map.Location;
-        destination(destination: kendo.dataviz.map.Location, bearing: number): number;
-        distanceTo(distance: number, bearing: number): kendo.dataviz.map.Location;
-        equals(location: kendo.dataviz.map.Location): boolean;
-        round(digits: number): kendo.dataviz.map.Location;
-        toArray(): any;
-        toString(): string;
-        wrap(): kendo.dataviz.map.Location;
-
-    }
-
-    interface LocationOptions {
-        name?: string;
-    }
-    interface LocationEvent {
-        sender: Location;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Marker extends Observable {
-
-
-        options: MarkerOptions;
-
-
-        constructor(options?: MarkerOptions);
-
-
-        location(): kendo.dataviz.map.Location;
-        location(location: any): void;
-        location(location: kendo.dataviz.map.Location): void;
-
-    }
-
-    interface MarkerTooltipAnimationClose {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface MarkerTooltipAnimationOpen {
-        effects?: string;
-        duration?: number;
-    }
-
-    interface MarkerTooltipAnimation {
-        close?: MarkerTooltipAnimationClose;
-        open?: MarkerTooltipAnimationOpen;
-    }
-
-    interface MarkerTooltipContent {
-        url?: string;
-    }
-
-    interface MarkerTooltip {
-        autoHide?: boolean;
-        animation?: MarkerTooltipAnimation;
-        content?: MarkerTooltipContent;
-        template?: string;
-        callout?: boolean;
-        iframe?: boolean;
-        height?: number;
-        width?: number;
-        position?: string;
-        showAfter?: number;
-        showOn?: string;
-    }
-
-    interface MarkerOptions {
-        name?: string;
-        location?: any|kendo.dataviz.map.Location;
-        shape?: string;
-        title?: string;
-        tooltip?: MarkerTooltip;
-    }
-    interface MarkerEvent {
-        sender: Marker;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class MarkerLayer extends kendo.dataviz.map.Layer {
-
-
-        options: MarkerLayerOptions;
-
-        map: kendo.dataviz.ui.Map;
-        items: any;
-
-        constructor(map: kendo.dataviz.ui.Map, options?: MarkerLayerOptions);
-
-
-        add(marker: kendo.dataviz.map.Marker): void;
-        clear(): void;
-        hide(): void;
-        remove(marker: kendo.dataviz.map.Marker): void;
-        setDataSource(dataSource: any): void;
-        show(): void;
-
-    }
-
-    interface MarkerLayerOptions {
-        name?: string;
-    }
-    interface MarkerLayerEvent {
-        sender: MarkerLayer;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class ShapeLayer extends kendo.dataviz.map.Layer {
-
-
-        options: ShapeLayerOptions;
-
-        map: kendo.dataviz.ui.Map;
-
-        constructor(map: kendo.dataviz.ui.Map, options?: ShapeLayerOptions);
-
-
-        show(): void;
-        hide(): void;
-        setDataSource(): void;
-
-    }
-
-    interface ShapeLayerOptions {
-        name?: string;
-    }
-    interface ShapeLayerEvent {
-        sender: ShapeLayer;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class TileLayer extends kendo.dataviz.map.Layer {
-
-
-        options: TileLayerOptions;
-
-        map: kendo.dataviz.ui.Map;
-
-        constructor(map: kendo.dataviz.ui.Map, options?: TileLayerOptions);
-
-
-        show(): void;
-        hide(): void;
-
-    }
-
-    interface TileLayerOptions {
-        name?: string;
-        urlTemplate?: string;
-        subdomains?: any;
-        tileSize?: number;
-    }
-    interface TileLayerEvent {
-        sender: TileLayer;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-}
-declare namespace kendo.dataviz {
-    class ChartAxis extends Observable {
-
-
-        options: ChartAxisOptions;
-
-
-
-
-        range(): any;
-        slot(from: string, to?: string): kendo.geometry.Rect;
-        slot(from: string, to?: number): kendo.geometry.Rect;
-        slot(from: string, to?: Date): kendo.geometry.Rect;
-        slot(from: number, to?: string): kendo.geometry.Rect;
-        slot(from: number, to?: number): kendo.geometry.Rect;
-        slot(from: number, to?: Date): kendo.geometry.Rect;
-        slot(from: Date, to?: string): kendo.geometry.Rect;
-        slot(from: Date, to?: number): kendo.geometry.Rect;
-        slot(from: Date, to?: Date): kendo.geometry.Rect;
-
-    }
-
-    interface ChartAxisOptions {
-        name?: string;
-    }
-    interface ChartAxisEvent {
-        sender: ChartAxis;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-}
-declare namespace kendo.dataviz.diagram {
-    class Circle extends Observable {
-
-
-        options: CircleOptions;
-
-
-        constructor(options?: CircleOptions);
-
-
-        position(): void;
-        position(offset: kendo.dataviz.diagram.Point): void;
-        rotate(angle: number, center: kendo.dataviz.diagram.Point): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface CircleFillGradientStop {
-        offset?: number;
-        color?: string;
-        opacity?: number;
-    }
-
-    interface CircleFillGradient {
-        type?: string;
-        center?: any;
-        radius?: number;
-        start?: any;
-        end?: any;
-        stops?: CircleFillGradientStop[];
-    }
-
-    interface CircleFill {
-        color?: string;
-        opacity?: number;
-        gradient?: CircleFillGradient;
-    }
-
-    interface CircleStroke {
-        color?: string;
-        width?: number;
-    }
-
-    interface CircleOptions {
-        name?: string;
-        fill?: CircleFill;
-        stroke?: CircleStroke;
-        center?: any;
-        radius?: number;
-    }
-    interface CircleEvent {
-        sender: Circle;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Connection extends Observable {
-
-
-        options: ConnectionOptions;
-
-        dataItem: any;
-        from: kendo.dataviz.diagram.Shape;
-        sourceConnector: kendo.dataviz.diagram.Connector;
-        targetConnector: kendo.dataviz.diagram.Connector;
-        to: kendo.dataviz.diagram.Shape;
-
-        constructor(options?: ConnectionOptions);
-
-
-        source(): any;
-        source(source: kendo.dataviz.diagram.Shape): void;
-        source(source: kendo.dataviz.diagram.Point): void;
-        source(source: kendo.dataviz.diagram.Connector): void;
-        sourcePoint(): kendo.dataviz.diagram.Point;
-        target(): any;
-        target(target: kendo.dataviz.diagram.Shape): void;
-        target(target: kendo.dataviz.diagram.Point): void;
-        target(target: kendo.dataviz.diagram.Connector): void;
-        targetPoint(): kendo.dataviz.diagram.Point;
-        select(value: boolean): void;
-        type(): void;
-        type(value: string): void;
-        points(): any;
-        allPoints(): any;
-        redraw(options?: any): void;
-
-    }
-
-    interface ConnectionContent {
-        template?: string|Function;
-        text?: string;
-        visual?: Function;
-    }
-
-    interface ConnectionEndCapFill {
-        color?: string;
-    }
-
-    interface ConnectionEndCapStroke {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ConnectionEndCap {
-        fill?: ConnectionEndCapFill;
-        stroke?: ConnectionEndCapStroke;
-        type?: string;
-    }
-
-    interface ConnectionHoverStroke {
-        color?: string;
-    }
-
-    interface ConnectionHover {
-        stroke?: ConnectionHoverStroke;
-    }
-
-    interface ConnectionPoint {
-        x?: number;
-        y?: number;
-    }
-
-    interface ConnectionStartCapFill {
-        color?: string;
-    }
-
-    interface ConnectionStartCapStroke {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface ConnectionStartCap {
-        fill?: ConnectionStartCapFill;
-        stroke?: ConnectionStartCapStroke;
-        type?: string;
-    }
-
-    interface ConnectionStroke {
-        color?: string;
-    }
-
-    interface ConnectionOptions {
-        name?: string;
-        content?: ConnectionContent;
-        fromConnector?: string;
-        fromX?: number;
-        fromY?: number;
-        stroke?: ConnectionStroke;
-        hover?: ConnectionHover;
-        startCap?: ConnectionStartCap;
-        endCap?: ConnectionEndCap;
-        points?: ConnectionPoint[];
-        selectable?: boolean;
-        toConnector?: string;
-        toX?: number;
-        toY?: number;
-        type?: string;
-    }
-    interface ConnectionEvent {
-        sender: Connection;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Connector extends Observable {
-
-
-        options: ConnectorOptions;
-
-        connections: any;
-        shape: kendo.dataviz.diagram.Shape;
-
-        constructor(options?: ConnectorOptions);
-
-
-        position(): kendo.dataviz.diagram.Point;
-
-    }
-
-    interface ConnectorFill {
-        color?: string;
-        opacity?: number;
-    }
-
-    interface ConnectorOptions {
-        name?: string;
-        width?: number;
-        height?: number;
-        fill?: ConnectorFill;
-    }
-    interface ConnectorEvent {
-        sender: Connector;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Group extends Observable {
-
-
-        options: GroupOptions;
-
-
-        constructor(options?: GroupOptions);
-
-
-        append(element: any): void;
-        clear(): void;
-        remove(element: any): void;
-        position(): void;
-        position(offset: kendo.dataviz.diagram.Point): void;
-        rotate(angle: number, center: kendo.dataviz.diagram.Point): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface GroupOptions {
-        name?: string;
-        x?: number;
-        y?: number;
-    }
-    interface GroupEvent {
-        sender: Group;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Image extends Observable {
-
-
-        options: ImageOptions;
-
-
-        constructor(options?: ImageOptions);
-
-
-        position(): void;
-        position(offset: kendo.dataviz.diagram.Point): void;
-        rotate(angle: number, center: kendo.dataviz.diagram.Point): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface ImageOptions {
-        name?: string;
-        height?: number;
-        width?: number;
-        x?: number;
-        y?: number;
-        source?: string;
-    }
-    interface ImageEvent {
-        sender: Image;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Layout extends Observable {
-
-
-        options: LayoutOptions;
-
-
-        constructor(rect: kendo.dataviz.diagram.Rect, options?: LayoutOptions);
-
-
-        append(element: any): void;
-        clear(): void;
-        rect(): kendo.dataviz.diagram.Rect;
-        rect(rect: kendo.dataviz.diagram.Rect): void;
-        reflow(): void;
-        remove(element: any): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface LayoutOptions {
-        name?: string;
-        alignContent?: string;
-        alignItems?: string;
-        justifyContent?: string;
-        lineSpacing?: number;
-        spacing?: number;
-        orientation?: string;
-        wrap?: boolean;
-    }
-    interface LayoutEvent {
-        sender: Layout;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Line extends Observable {
-
-
-        options: LineOptions;
-
-
-        constructor(options?: LineOptions);
-
-
-        position(): void;
-        position(offset: kendo.dataviz.diagram.Point): void;
-        rotate(angle: number, center: kendo.dataviz.diagram.Point): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface LineStroke {
-        color?: string;
-        width?: number;
-    }
-
-    interface LineOptions {
-        name?: string;
-        stroke?: LineStroke;
-        from?: any;
-        to?: any;
-    }
-    interface LineEvent {
-        sender: Line;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Path extends Observable {
-
-
-        options: PathOptions;
-
-
-        constructor(options?: PathOptions);
-
-
-        data(): string;
-        data(path: string): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface PathEndCapFill {
-        color?: string;
-        opacity?: number;
-    }
-
-    interface PathEndCapStroke {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface PathEndCap {
-        fill?: PathEndCapFill;
-        stroke?: PathEndCapStroke;
-        type?: string;
-    }
-
-    interface PathFillGradientStop {
-        offset?: number;
-        color?: string;
-        opacity?: number;
-    }
-
-    interface PathFillGradient {
-        type?: string;
-        center?: any;
-        radius?: number;
-        start?: any;
-        end?: any;
-        stops?: PathFillGradientStop[];
-    }
-
-    interface PathFill {
-        color?: string;
-        opacity?: number;
-        gradient?: PathFillGradient;
-    }
-
-    interface PathStartCapFill {
-        color?: string;
-        opacity?: number;
-    }
-
-    interface PathStartCapStroke {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface PathStartCap {
-        fill?: PathStartCapFill;
-        stroke?: PathStartCapStroke;
-        type?: string;
-    }
-
-    interface PathStroke {
-        color?: string;
-        width?: number;
-    }
-
-    interface PathOptions {
-        name?: string;
-        data?: string;
-        endCap?: PathEndCap;
-        fill?: PathFill;
-        height?: number;
-        startCap?: PathStartCap;
-        stroke?: PathStroke;
-        width?: number;
-        x?: number;
-        y?: number;
-    }
-    interface PathEvent {
-        sender: Path;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Point extends Observable {
-
-
-        options: PointOptions;
-
-        x: number;
-        y: number;
-
-        constructor(x: number, y: number);
-
-
-
-    }
-
-    interface PointOptions {
-        name?: string;
-    }
-    interface PointEvent {
-        sender: Point;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Polyline extends Observable {
-
-
-        options: PolylineOptions;
-
-
-        constructor(options?: PolylineOptions);
-
-
-        points(): any;
-        points(points: any): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface PolylineEndCapFill {
-        color?: string;
-        opacity?: number;
-    }
-
-    interface PolylineEndCapStroke {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface PolylineEndCap {
-        fill?: PolylineEndCapFill;
-        stroke?: PolylineEndCapStroke;
-        type?: string;
-    }
-
-    interface PolylineFillGradientStop {
-        offset?: number;
-        color?: string;
-        opacity?: number;
-    }
-
-    interface PolylineFillGradient {
-        type?: string;
-        center?: any;
-        radius?: number;
-        start?: any;
-        end?: any;
-        stops?: PolylineFillGradientStop[];
-    }
-
-    interface PolylineFill {
-        color?: string;
-        opacity?: number;
-        gradient?: PolylineFillGradient;
-    }
-
-    interface PolylineStartCapFill {
-        color?: string;
-        opacity?: number;
-    }
-
-    interface PolylineStartCapStroke {
-        color?: string;
-        dashType?: string;
-        width?: number;
-    }
-
-    interface PolylineStartCap {
-        fill?: PolylineStartCapFill;
-        stroke?: PolylineStartCapStroke;
-        type?: string;
-    }
-
-    interface PolylineStroke {
-        color?: string;
-        width?: number;
-    }
-
-    interface PolylineOptions {
-        name?: string;
-        endCap?: PolylineEndCap;
-        fill?: PolylineFill;
-        startCap?: PolylineStartCap;
-        stroke?: PolylineStroke;
-    }
-    interface PolylineEvent {
-        sender: Polyline;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Rect extends Observable {
-
-
-        options: RectOptions;
-
-
-        constructor(options?: RectOptions);
-
-
-        position(): void;
-        position(offset: kendo.dataviz.diagram.Point): void;
-        rotate(angle: number, center: kendo.dataviz.diagram.Point): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface RectOptions {
-        name?: string;
-        height?: number;
-        width?: number;
-        x?: number;
-        y?: number;
-    }
-    interface RectEvent {
-        sender: Rect;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Rectangle extends Observable {
-
-
-        options: RectangleOptions;
-
-
-        constructor(options?: RectangleOptions);
-
-
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface RectangleFillGradientStop {
-        offset?: number;
-        color?: string;
-        opacity?: number;
-    }
-
-    interface RectangleFillGradient {
-        type?: string;
-        center?: any;
-        radius?: number;
-        start?: any;
-        end?: any;
-        stops?: RectangleFillGradientStop[];
-    }
-
-    interface RectangleFill {
-        color?: string;
-        opacity?: number;
-        gradient?: RectangleFillGradient;
-    }
-
-    interface RectangleStroke {
-        color?: string;
-        width?: number;
-    }
-
-    interface RectangleOptions {
-        name?: string;
-        fill?: RectangleFill;
-        height?: number;
-        stroke?: RectangleStroke;
-        width?: number;
-        x?: number;
-        y?: number;
-    }
-    interface RectangleEvent {
-        sender: Rectangle;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Shape extends Observable {
-
-
-        options: ShapeOptions;
-
-        connectors: any;
-        dataItem: any;
-        shapeVisual: any;
-        visual: kendo.dataviz.diagram.Group;
-
-        constructor(options?: ShapeOptions);
-
-
-        position(): void;
-        position(point: kendo.dataviz.diagram.Point): void;
-        clone(): kendo.dataviz.diagram.Shape;
-        select(value: boolean): void;
-        connections(type: string): void;
-        getConnector(): void;
-        getPosition(side: string): void;
-        redraw(options: any): void;
-
-    }
-
-    interface ShapeConnector {
-        name?: string;
-        description?: string;
-        position?: Function;
-    }
-
-    interface ShapeContent {
-        text?: string;
-        align?: string;
-    }
-
-    interface ShapeEditable {
-        connect?: boolean;
-    }
-
-    interface ShapeFillGradientStop {
-        offset?: number;
-        color?: string;
-        opacity?: number;
-    }
-
-    interface ShapeFillGradient {
-        type?: string;
-        center?: any;
-        radius?: number;
-        start?: any;
-        end?: any;
-        stops?: ShapeFillGradientStop[];
-    }
-
-    interface ShapeFill {
-        color?: string;
-        opacity?: number;
-        gradient?: ShapeFillGradient;
-    }
-
-    interface ShapeHoverFill {
-        color?: string;
-        opacity?: number;
-    }
-
-    interface ShapeHover {
-        fill?: ShapeHoverFill;
-    }
-
-    interface ShapeRotation {
-        angle?: number;
-    }
-
-    interface ShapeStroke {
-        color?: string;
-        width?: number;
-        dashType?: string;
-    }
-
-    interface ShapeOptions {
-        name?: string;
-        id?: string;
-        editable?: ShapeEditable;
-        path?: string;
-        stroke?: ShapeStroke;
-        type?: string;
-        x?: number;
-        y?: number;
-        minWidth?: number;
-        minHeight?: number;
-        width?: number;
-        height?: number;
-        fill?: ShapeFill;
-        hover?: ShapeHover;
-        connectors?: ShapeConnector[];
-        rotation?: ShapeRotation;
-        content?: ShapeContent;
-        selectable?: boolean;
-        visual?: Function;
-    }
-    interface ShapeEvent {
-        sender: Shape;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class TextBlock extends Observable {
-
-
-        options: TextBlockOptions;
-
-
-        constructor(options?: TextBlockOptions);
-
-
-        content(): string;
-        content(content: string): void;
-        position(): void;
-        position(offset: kendo.dataviz.diagram.Point): void;
-        rotate(angle: number, center: kendo.dataviz.diagram.Point): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface TextBlockOptions {
-        name?: string;
-        color?: string;
-        fontFamily?: string;
-        fontSize?: number;
-        height?: number;
-        text?: string;
-        width?: number;
-        x?: number;
-        y?: number;
-    }
-    interface TextBlockEvent {
-        sender: TextBlock;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-}
-declare namespace kendo {
-    class Color extends Observable {
-
-
-        options: ColorOptions;
-
-
-
-
-        diff(): number;
-        equals(): boolean;
-        toHSV(): any;
-        toRGB(): any;
-        toBytes(): any;
-        toHex(): string;
-        toCss(): string;
-        toCssRgba(): string;
-        toDisplay(): string;
-
-    }
-
-    interface ColorOptions {
-        name?: string;
-    }
-    interface ColorEvent {
-        sender: Color;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    namespace drawing {
-        function align(elements: any, rect: kendo.geometry.Rect, alignment: string): void;
-        function drawDOM(element: JQuery, options: any): JQueryPromise<any>;
-        function exportImage(group: kendo.drawing.Group, options: any): JQueryPromise<any>;
-        function exportPDF(group: kendo.drawing.Group, options: kendo.drawing.PDFOptions): JQueryPromise<any>;
-        function exportSVG(group: kendo.drawing.Group, options: any): JQueryPromise<any>;
-        function fit(element: kendo.drawing.Element, rect: kendo.geometry.Rect): void;
-        function stack(elements: any): void;
-        function vAlign(elements: any, rect: kendo.geometry.Rect, alignment: string): void;
-        function vStack(elements: any): void;
-        function vWrap(elements: any, rect: kendo.geometry.Rect): any;
-        function wrap(elements: any, rect: kendo.geometry.Rect): any;
-    }
-
-    namespace effects {
-        function box(element: HTMLElement): any;
-        function fillScale(firstElement: HTMLElement, secondElement: HTMLElement): number;
-        function fitScale(firstElement: HTMLElement, secondElement: HTMLElement): number;
-        function transformOrigin(firstElement: HTMLElement, secondElement: HTMLElement): any;
-    }
-
-        function antiForgeryTokens(): any;
-        function bind(element: string, viewModel: any, namespace?: any): void;
-        function bind(element: string, viewModel: kendo.data.ObservableObject, namespace?: any): void;
-        function bind(element: JQuery, viewModel: any, namespace?: any): void;
-        function bind(element: JQuery, viewModel: kendo.data.ObservableObject, namespace?: any): void;
-        function bind(element: Element, viewModel: any, namespace?: any): void;
-        function bind(element: Element, viewModel: kendo.data.ObservableObject, namespace?: any): void;
-        function observableHierarchy(array: any): void;
-        function culture(culture: string): void;
-        function destroy(element: string): void;
-        function destroy(element: JQuery): void;
-        function destroy(element: Element): void;
-        function htmlEncode(value: string): string;
-        function parseDate(value: string, formats?: string, culture?: string): Date;
-        function parseDate(value: string, formats?: any, culture?: string): Date;
-        function parseFloat(value: string, culture?: string): number;
-        function parseInt(value: string, culture?: string): number;
-        function parseColor(color: string, noerror: boolean): kendo.Color;
-        function proxyModelSetters(): void;
-        function proxyModelSetters(data: kendo.data.Model): void;
-        function resize(element: string, force: boolean): void;
-        function resize(element: JQuery, force: boolean): void;
-        function resize(element: Element, force: boolean): void;
-        function saveAs(options: any): void;
-        function stringify(value: any): string;
-        function throttle(fn: Function, timeout: number): void;
-        function touchScroller(element: string): void;
-        function touchScroller(element: JQuery): void;
-        function touchScroller(element: Element): void;
-        function toString(value: Date, format: string, culture?: string): string;
-        function toString(value: number, format: string, culture?: string): string;
-        function unbind(element: string): void;
-        function unbind(element: JQuery): void;
-        function unbind(element: Element): void;
-
-    namespace pdf {
-        function defineFont(map: any): void;
-    }
-
-}
-declare namespace kendo.spreadsheet {
-    class CustomFilter extends Observable {
-
-
-        options: CustomFilterOptions;
-
-
-
-
-        init(options: any): void;
-
-    }
-
-    interface CustomFilterOptions {
-        name?: string;
-    }
-    interface CustomFilterEvent {
-        sender: CustomFilter;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class DynamicFilter extends Observable {
-
-
-        options: DynamicFilterOptions;
-
-
-
-
-        init(options: any): void;
-
-    }
-
-    interface DynamicFilterOptions {
-        name?: string;
-    }
-    interface DynamicFilterEvent {
-        sender: DynamicFilter;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Range extends Observable {
-
-
-        options: RangeOptions;
-
-
-
-
-        background(): string;
-        background(value?: string): void;
-        bold(): boolean;
-        bold(value?: boolean): void;
-        borderBottom(): any;
-        borderBottom(value?: any): void;
-        borderLeft(): any;
-        borderLeft(value?: any): void;
-        borderRight(): any;
-        borderRight(value?: any): void;
-        borderTop(): any;
-        borderTop(value?: any): void;
-        color(): string;
-        color(value?: string): void;
-        clear(options?: any): void;
-        clearFilter(indices: any): void;
-        clearFilter(indices: number): void;
-        enable(): boolean;
-        enable(value?: boolean): void;
-        fillFrom(srcRange: Range, direction?: number): void;
-        fillFrom(srcRange: string, direction?: number): void;
-        filter(filter: boolean): void;
-        filter(filter: any): void;
-        fontFamily(): string;
-        fontFamily(value?: string): void;
-        fontSize(): number;
-        fontSize(value?: number): void;
-        forEachCell(callback: Function): void;
-        format(): string;
-        format(format?: string): void;
-        formula(): string;
-        formula(formula?: string): void;
-        hasFilter(): boolean;
-        input(): any;
-        input(value?: string): void;
-        input(value?: number): void;
-        input(value?: Date): void;
-        isSortable(): boolean;
-        isFilterable(): boolean;
-        italic(): boolean;
-        italic(value?: boolean): void;
-        merge(): void;
-        select(): void;
-        sort(sort: number): void;
-        sort(sort: any): void;
-        textAlign(): string;
-        textAlign(value?: string): void;
-        unmerge(): void;
-        values(values: any): void;
-        validation(): any;
-        validation(value?: any): void;
-        value(): any;
-        value(value?: string): void;
-        value(value?: number): void;
-        value(value?: Date): void;
-        verticalAlign(): string;
-        verticalAlign(value?: string): void;
-        wrap(): boolean;
-        wrap(value?: boolean): void;
-
-    }
-
-    interface RangeOptions {
-        name?: string;
-    }
-    interface RangeEvent {
-        sender: Range;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Sheet extends Observable {
-
-
-        options: SheetOptions;
-
-
-
-
-        clearFilter(indexes: number): void;
-        clearFilter(indexes: any): void;
-        columnWidth(): void;
-        columnWidth(index: number, width?: number): void;
-        batch(callback: Function, changeEventArgs: any): void;
-        deleteColumn(index: number): void;
-        fromJSON(data: any): void;
-        frozenColumns(): number;
-        frozenColumns(count?: number): void;
-        frozenRows(): number;
-        frozenRows(count?: number): void;
-        hideColumn(index: number): void;
-        hideRow(index: number): void;
-        insertColumn(index: number): void;
-        insertRow(index: number): void;
-        range(ref: string): kendo.spreadsheet.Range;
-        rowHeight(): void;
-        rowHeight(index: number, width?: number): void;
-        selection(): kendo.spreadsheet.Range;
-        showGridLines(): boolean;
-        showGridLines(showGridLiens?: boolean): void;
-        toJSON(): void;
-        unhideColumn(index: number): void;
-        unhideRow(index: number): void;
-
-    }
-
-    interface SheetOptions {
-        name?: string;
-        change?(e: SheetChangeEvent): void;
-    }
-    interface SheetEvent {
-        sender: Sheet;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface SheetChangeEvent extends SheetEvent {
-    }
-
-
-    class TopFilter extends Observable {
-
-
-        options: TopFilterOptions;
-
-
-
-
-        init(options: any): void;
-
-    }
-
-    interface TopFilterOptions {
-        name?: string;
-    }
-    interface TopFilterEvent {
-        sender: TopFilter;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class ValueFilter extends Observable {
-
-
-        options: ValueFilterOptions;
-
-
-
-
-        init(options: any): void;
-
-    }
-
-    interface ValueFilterOptions {
-        name?: string;
-    }
-    interface ValueFilterEvent {
-        sender: ValueFilter;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-}
-declare namespace kendo.mobile.ui {
-    class ActionSheet extends kendo.mobile.ui.Widget {
-
-        static fn: ActionSheet;
-
-        options: ActionSheetOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): ActionSheet;
-
-        constructor(element: Element, options?: ActionSheetOptions);
-
-
-        close(): void;
-        destroy(): void;
-        open(target: JQuery, context: any): void;
-
-    }
-
-    interface ActionSheetPopup {
-        direction?: number|string;
-        height?: number|string;
-        width?: number|string;
-    }
-
-    interface ActionSheetOptions {
-        name?: string;
-        cancel?: string;
-        popup?: ActionSheetPopup;
-        type?: string;
-        close?(e: ActionSheetEvent): void;
-        open?(e: ActionSheetOpenEvent): void;
-    }
-    interface ActionSheetEvent {
-        sender: ActionSheet;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface ActionSheetOpenEvent extends ActionSheetEvent {
-        target?: JQuery;
-        context?: JQuery;
-    }
-
-
-    class BackButton extends kendo.mobile.ui.Widget {
-
-        static fn: BackButton;
-
-        options: BackButtonOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): BackButton;
-
-        constructor(element: Element, options?: BackButtonOptions);
-
-
-        destroy(): void;
-
-    }
-
-    interface BackButtonOptions {
-        name?: string;
-        click?(e: BackButtonClickEvent): void;
-    }
-    interface BackButtonEvent {
-        sender: BackButton;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface BackButtonClickEvent extends BackButtonEvent {
-        target?: JQuery;
-        button?: JQuery;
-    }
-
-
-    class Button extends kendo.mobile.ui.Widget {
-
-        static fn: Button;
-
-        options: ButtonOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Button;
-
-        constructor(element: Element, options?: ButtonOptions);
-
-
-        badge(value: string): string;
-        badge(value: boolean): string;
-        destroy(): void;
-        enable(enable: boolean): void;
-
-    }
-
-    interface ButtonOptions {
-        name?: string;
-        badge?: string;
-        clickOn?: string;
-        enable?: boolean;
-        icon?: string;
-        click?(e: ButtonClickEvent): void;
-    }
-    interface ButtonEvent {
-        sender: Button;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface ButtonClickEvent extends ButtonEvent {
-        target?: JQuery;
-        button?: JQuery;
-    }
-
-
-    class ButtonGroup extends kendo.mobile.ui.Widget {
-
-        static fn: ButtonGroup;
-
-        options: ButtonGroupOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): ButtonGroup;
-
-        constructor(element: Element, options?: ButtonGroupOptions);
-
-
-        badge(button: string, value: string): string;
-        badge(button: string, value: boolean): string;
-        badge(button: number, value: string): string;
-        badge(button: number, value: boolean): string;
-        current(): JQuery;
-        destroy(): void;
-        enable(enable: boolean): void;
-        select(li: JQuery): void;
-        select(li: number): void;
-
-    }
-
-    interface ButtonGroupOptions {
-        name?: string;
-        enable?: boolean;
-        index?: number;
-        selectOn?: string;
-        select?(e: ButtonGroupSelectEvent): void;
-    }
-    interface ButtonGroupEvent {
-        sender: ButtonGroup;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface ButtonGroupSelectEvent extends ButtonGroupEvent {
-        index?: number;
-    }
-
-
-    class Collapsible extends kendo.mobile.ui.Widget {
-
-        static fn: Collapsible;
-
-        options: CollapsibleOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Collapsible;
-
-        constructor(element: Element, options?: CollapsibleOptions);
-
-
-        collapse(instant: boolean): void;
-        destroy(): void;
-        expand(instant?: boolean): void;
-        resize(): void;
-        toggle(instant?: boolean): void;
-
-    }
-
-    interface CollapsibleOptions {
-        name?: string;
-        animation?: boolean;
-        collapsed?: boolean;
-        expandIcon?: string;
-        iconPosition?: string;
-        inset?: boolean;
-        collapse?(e: CollapsibleEvent): void;
-        expand?(e: CollapsibleEvent): void;
-    }
-    interface CollapsibleEvent {
-        sender: Collapsible;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class DetailButton extends kendo.mobile.ui.Widget {
-
-        static fn: DetailButton;
-
-        options: DetailButtonOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): DetailButton;
-
-        constructor(element: Element, options?: DetailButtonOptions);
-
-
-        destroy(): void;
-
-    }
-
-    interface DetailButtonOptions {
-        name?: string;
-        click?(e: DetailButtonClickEvent): void;
-    }
-    interface DetailButtonEvent {
-        sender: DetailButton;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface DetailButtonClickEvent extends DetailButtonEvent {
-        target?: JQuery;
-        button?: JQuery;
-    }
-
-
-    class Drawer extends kendo.mobile.ui.Widget {
-
-        static fn: Drawer;
-
-        options: DrawerOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Drawer;
-
-        constructor(element: Element, options?: DrawerOptions);
-
-
-        destroy(): void;
-        hide(): void;
-        show(): void;
-
-    }
-
-    interface DrawerOptions {
-        name?: string;
-        container?: JQuery;
-        position?: string;
-        swipeToOpen?: boolean;
-        swipeToOpenViews?: any;
-        title?: string;
-        views?: any;
-        afterHide?(e: DrawerAfterHideEvent): void;
-        beforeShow?(e: DrawerEvent): void;
-        hide?(e: DrawerHideEvent): void;
-        init?(e: DrawerInitEvent): void;
-        show?(e: DrawerShowEvent): void;
-    }
-    interface DrawerEvent {
-        sender: Drawer;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface DrawerAfterHideEvent extends DrawerEvent {
-    }
-
-    interface DrawerHideEvent extends DrawerEvent {
-    }
-
-    interface DrawerInitEvent extends DrawerEvent {
-    }
-
-    interface DrawerShowEvent extends DrawerEvent {
-    }
-
-
-    class Layout extends kendo.mobile.ui.Widget {
-
-        static fn: Layout;
-
-        options: LayoutOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Layout;
-
-        constructor(element: Element, options?: LayoutOptions);
-
-
-
-    }
-
-    interface LayoutOptions {
-        name?: string;
-        id?: string;
-        platform?: string;
-        hide?(e: LayoutHideEvent): void;
-        init?(e: LayoutInitEvent): void;
-        show?(e: LayoutShowEvent): void;
-    }
-    interface LayoutEvent {
-        sender: Layout;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface LayoutHideEvent extends LayoutEvent {
-        layout?: JQuery;
-        view?: JQuery;
-    }
-
-    interface LayoutInitEvent extends LayoutEvent {
-        layout?: JQuery;
-    }
-
-    interface LayoutShowEvent extends LayoutEvent {
-        layout?: JQuery;
-        view?: JQuery;
-    }
-
-
-    class ListView extends kendo.mobile.ui.Widget {
-
-        static fn: ListView;
-
-        options: ListViewOptions;
-
-        dataSource: kendo.data.DataSource;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): ListView;
-
-        constructor(element: Element, options?: ListViewOptions);
-
-
-        append(dataItems: any): void;
-        prepend(dataItems: any): void;
-        replace(dataItems: any): void;
-        remove(dataItems: any): void;
-        setDataItem(item: JQuery, dataItem: kendo.data.Model): void;
-        destroy(): void;
-        items(): JQuery;
-        refresh(): void;
-        setDataSource(dataSource: kendo.data.DataSource): void;
-
-    }
-
-    interface ListViewFilterable {
-        placeholder?: string;
-        autoFilter?: boolean;
-        field?: string;
-        ignoreCase?: boolean;
-        operator?: string;
-    }
-
-    interface ListViewMessages {
-        loadMoreText?: string;
-        pullTemplate?: string;
-        refreshTemplate?: string;
-        releaseTemplate?: string;
-    }
-
-    interface ListViewOptions {
-        name?: string;
-        appendOnRefresh?: boolean;
-        autoBind?: boolean;
-        dataSource?: kendo.data.DataSource|any;
-        endlessScroll?: boolean;
-        fixedHeaders?: boolean;
-        headerTemplate?: string|Function;
-        loadMore?: boolean;
-        messages?: ListViewMessages;
-        pullToRefresh?: boolean;
-        pullParameters?: Function;
-        style?: string;
-        template?: string|Function;
-        type?: string;
-        filterable?: ListViewFilterable;
-        virtualViewSize?: number;
-        click?(e: ListViewClickEvent): void;
-        dataBound?(e: ListViewEvent): void;
-        dataBinding?(e: ListViewEvent): void;
-        itemChange?(e: ListViewEvent): void;
-    }
-    interface ListViewEvent {
-        sender: ListView;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface ListViewClickEvent extends ListViewEvent {
-        item?: JQuery;
-        target?: JQuery;
-        dataItem?: any;
-        button?: kendo.mobile.ui.Button;
-    }
-
-
-    class Loader extends kendo.mobile.ui.Widget {
-
-        static fn: Loader;
-
-        options: LoaderOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Loader;
-
-        constructor(element: Element, options?: LoaderOptions);
-
-
-        hide(): void;
-        show(): void;
-
-    }
-
-    interface LoaderOptions {
-        name?: string;
-    }
-    interface LoaderEvent {
-        sender: Loader;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class ModalView extends kendo.mobile.ui.Widget {
-
-        static fn: ModalView;
-
-        options: ModalViewOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): ModalView;
-
-        constructor(element: Element, options?: ModalViewOptions);
-
-
-        close(): void;
-        destroy(): void;
-        open(target?: JQuery): void;
-
-    }
-
-    interface ModalViewOptions {
-        name?: string;
-        height?: number;
-        modal?: boolean;
-        width?: number;
-        beforeOpen?(e: ModalViewBeforeOpenEvent): void;
-        close?(e: ModalViewCloseEvent): void;
-        init?(e: ModalViewInitEvent): void;
-        open?(e: ModalViewOpenEvent): void;
-    }
-    interface ModalViewEvent {
-        sender: ModalView;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface ModalViewBeforeOpenEvent extends ModalViewEvent {
-        target?: JQuery;
-    }
-
-    interface ModalViewCloseEvent extends ModalViewEvent {
-    }
-
-    interface ModalViewInitEvent extends ModalViewEvent {
-    }
-
-    interface ModalViewOpenEvent extends ModalViewEvent {
-        target?: JQuery;
-    }
-
-
-    class NavBar extends kendo.mobile.ui.Widget {
-
-        static fn: NavBar;
-
-        options: NavBarOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): NavBar;
-
-        constructor(element: Element, options?: NavBarOptions);
-
-
-        destroy(): void;
-        title(value: string): void;
-
-    }
-
-    interface NavBarOptions {
-        name?: string;
-    }
-    interface NavBarEvent {
-        sender: NavBar;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Pane extends kendo.mobile.ui.Widget {
-
-        static fn: Pane;
-
-        options: PaneOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Pane;
-
-        constructor(element: Element, options?: PaneOptions);
-
-
-        destroy(): void;
-        hideLoading(): void;
-        navigate(url: string, transition: string): void;
-        replace(url: string, transition: string): void;
-        showLoading(): void;
-        view(): kendo.mobile.ui.View;
-
-    }
-
-    interface PaneOptions {
-        name?: string;
-        collapsible?: boolean;
-        initial?: string;
-        layout?: string;
-        loading?: string;
-        portraitWidth?: number;
-        transition?: string;
-        navigate?(e: PaneNavigateEvent): void;
-        viewShow?(e: PaneViewShowEvent): void;
-    }
-    interface PaneEvent {
-        sender: Pane;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface PaneNavigateEvent extends PaneEvent {
-        url?: JQuery;
-    }
-
-    interface PaneViewShowEvent extends PaneEvent {
-        view?: kendo.mobile.ui.View;
-    }
-
-
-    class PopOver extends kendo.mobile.ui.Widget {
-
-        static fn: PopOver;
-
-        options: PopOverOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): PopOver;
-
-        constructor(element: Element, options?: PopOverOptions);
-
-
-        close(): void;
-        destroy(): void;
-        open(target: JQuery): void;
-
-    }
-
-    interface PopOverPane {
-        initial?: string;
-        layout?: string;
-        loading?: string;
-        transition?: string;
-    }
-
-    interface PopOverPopup {
-        height?: number|string;
-        width?: number|string;
-    }
-
-    interface PopOverOptions {
-        name?: string;
-        pane?: PopOverPane;
-        popup?: PopOverPopup;
-        close?(e: PopOverCloseEvent): void;
-        open?(e: PopOverOpenEvent): void;
-    }
-    interface PopOverEvent {
-        sender: PopOver;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface PopOverCloseEvent extends PopOverEvent {
-    }
-
-    interface PopOverOpenEvent extends PopOverEvent {
-        target?: JQuery;
-    }
-
-
-    class ScrollView extends kendo.mobile.ui.Widget {
-
-        static fn: ScrollView;
-
-        options: ScrollViewOptions;
-
-        dataSource: kendo.data.DataSource;
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): ScrollView;
-
-        constructor(element: Element, options?: ScrollViewOptions);
-
-
-        content(content: string): void;
-        content(content: JQuery): void;
-        destroy(): void;
-        next(): void;
-        prev(): void;
-        refresh(): void;
-        scrollTo(page: number, instant: boolean): void;
-        setDataSource(dataSource: kendo.data.DataSource): void;
-        value(dataItem: any): any;
-
-    }
-
-    interface ScrollViewOptions {
-        name?: string;
-        autoBind?: boolean;
-        bounceVelocityThreshold?: number;
-        contentHeight?: number|string;
-        dataSource?: kendo.data.DataSource|any;
-        duration?: number;
-        emptyTemplate?: string;
-        enablePager?: boolean;
-        itemsPerPage?: number;
-        page?: number;
-        pageSize?: number;
-        template?: string;
-        velocityThreshold?: number;
-        changing?(e: ScrollViewChangingEvent): void;
-        change?(e: ScrollViewChangeEvent): void;
-        refresh?(e: ScrollViewRefreshEvent): void;
-    }
-    interface ScrollViewEvent {
-        sender: ScrollView;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface ScrollViewChangingEvent extends ScrollViewEvent {
-        currentPage?: number;
-        nextPage?: number;
-    }
-
-    interface ScrollViewChangeEvent extends ScrollViewEvent {
-        page?: number;
-        element?: JQuery;
-        data?: any;
-    }
-
-    interface ScrollViewRefreshEvent extends ScrollViewEvent {
-        pageCount?: number;
-        page?: number;
-    }
-
-
-    class Scroller extends kendo.mobile.ui.Widget {
-
-        static fn: Scroller;
-
-        options: ScrollerOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Scroller;
-
-        constructor(element: Element, options?: ScrollerOptions);
-
-
-        animatedScrollTo(x: number, y: number): void;
-        contentResized(): void;
-        destroy(): void;
-        disable(): void;
-        enable(): void;
-        height(): number;
-        pullHandled(): void;
-        reset(): void;
-        scrollHeight(): void;
-        scrollTo(x: number, y: number): void;
-        scrollWidth(): void;
-        zoomOut(): void;
-
-    }
-
-    interface ScrollerMessages {
-        pullTemplate?: string;
-        refreshTemplate?: string;
-        releaseTemplate?: string;
-    }
-
-    interface ScrollerOptions {
-        name?: string;
-        elastic?: boolean;
-        messages?: ScrollerMessages;
-        pullOffset?: number;
-        pullToRefresh?: boolean;
-        useNative?: boolean;
-        visibleScrollHints?: boolean;
-        zoom?: boolean;
-        pull?(e: ScrollerEvent): void;
-        resize?(e: ScrollerEvent): void;
-        scroll?(e: ScrollerScrollEvent): void;
-    }
-    interface ScrollerEvent {
-        sender: Scroller;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface ScrollerScrollEvent extends ScrollerEvent {
-        scrollTop?: number;
-        scrollLeft?: number;
-    }
-
-
-    class SplitView extends kendo.mobile.ui.Widget {
-
-        static fn: SplitView;
-
-        options: SplitViewOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): SplitView;
-
-        constructor(element: Element, options?: SplitViewOptions);
-
-
-        destroy(): void;
-        expandPanes(): void;
-        collapsePanes(): void;
-
-    }
-
-    interface SplitViewOptions {
-        name?: string;
-        style?: string;
-        init?(e: SplitViewInitEvent): void;
-        show?(e: SplitViewShowEvent): void;
-    }
-    interface SplitViewEvent {
-        sender: SplitView;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface SplitViewInitEvent extends SplitViewEvent {
-        view?: JQuery;
-    }
-
-    interface SplitViewShowEvent extends SplitViewEvent {
-        view?: JQuery;
-    }
-
-
-    class Switch extends kendo.mobile.ui.Widget {
-
-        static fn: Switch;
-
-        options: SwitchOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): Switch;
-
-        constructor(element: Element, options?: SwitchOptions);
-
-
-        check(): boolean;
-        check(check: boolean): void;
-        destroy(): void;
-        enable(enable: boolean): void;
-        refresh(): void;
-        toggle(): void;
-
-    }
-
-    interface SwitchOptions {
-        name?: string;
-        checked?: boolean;
-        enable?: boolean;
-        offLabel?: string;
-        onLabel?: string;
-        change?(e: SwitchChangeEvent): void;
-    }
-    interface SwitchEvent {
-        sender: Switch;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface SwitchChangeEvent extends SwitchEvent {
-        checked?: any;
-    }
-
-
-    class TabStrip extends kendo.mobile.ui.Widget {
-
-        static fn: TabStrip;
-
-        options: TabStripOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): TabStrip;
-
-        constructor(element: Element, options?: TabStripOptions);
-
-
-        badge(tab: string, value: string): string;
-        badge(tab: string, value: boolean): string;
-        badge(tab: number, value: string): string;
-        badge(tab: number, value: boolean): string;
-        currentItem(): JQuery;
-        destroy(): void;
-        switchTo(url: string): void;
-        switchTo(url: number): void;
-        switchByFullUrl(url: string): void;
-        clear(): void;
-
-    }
-
-    interface TabStripOptions {
-        name?: string;
-        selectedIndex?: number;
-        select?(e: TabStripSelectEvent): void;
-    }
-    interface TabStripEvent {
-        sender: TabStrip;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface TabStripSelectEvent extends TabStripEvent {
-        item?: JQuery;
-    }
-
-
-    class View extends kendo.mobile.ui.Widget {
-
-        static fn: View;
-
-        options: ViewOptions;
-
-
-        element: JQuery;
-        wrapper: JQuery;
-
-        static extend(proto: Object): View;
-
-        constructor(element: Element, options?: ViewOptions);
-
-
-        contentElement(): void;
-        destroy(): void;
-        enable(enable: boolean): void;
-
-    }
-
-    interface ViewOptions {
-        name?: string;
-        model?: string;
-        reload?: boolean;
-        scroller?: any;
-        stretch?: boolean;
-        title?: string;
-        useNativeScrolling?: boolean;
-        zoom?: boolean;
-        afterShow?(e: ViewAfterShowEvent): void;
-        beforeHide?(e: ViewBeforeHideEvent): void;
-        beforeShow?(e: ViewBeforeShowEvent): void;
-        hide?(e: ViewHideEvent): void;
-        init?(e: ViewInitEvent): void;
-        show?(e: ViewShowEvent): void;
-        transitionStart?(e: ViewTransitionStartEvent): void;
-        transitionEnd?(e: ViewTransitionEndEvent): void;
-    }
-    interface ViewEvent {
-        sender: View;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface ViewAfterShowEvent extends ViewEvent {
-        view?: kendo.mobile.ui.View;
-    }
-
-    interface ViewBeforeHideEvent extends ViewEvent {
-        view?: kendo.mobile.ui.View;
-    }
-
-    interface ViewBeforeShowEvent extends ViewEvent {
-        view?: kendo.mobile.ui.View;
-    }
-
-    interface ViewHideEvent extends ViewEvent {
-        view?: kendo.mobile.ui.View;
-    }
-
-    interface ViewInitEvent extends ViewEvent {
-        view?: kendo.mobile.ui.View;
-    }
-
-    interface ViewShowEvent extends ViewEvent {
-        view?: kendo.mobile.ui.View;
-    }
-
-    interface ViewTransitionStartEvent extends ViewEvent {
-        type?: string;
-    }
-
-    interface ViewTransitionEndEvent extends ViewEvent {
-        type?: string;
-    }
-
-
-}
-declare namespace kendo.ooxml {
-    class Workbook extends Observable {
-
-
-        options: WorkbookOptions;
-
-        sheets: WorkbookSheet[];
-
-        constructor(options?: WorkbookOptions);
-
-
-        toDataURL(): string;
-
-    }
-
-    interface WorkbookSheetColumn {
-        autoWidth?: boolean;
-        index?: number;
-        width?: number;
-    }
-
-    interface WorkbookSheetFilter {
-        from?: number;
-        to?: number;
-    }
-
-    interface WorkbookSheetFreezePane {
-        colSplit?: number;
-        rowSplit?: number;
-    }
-
-    interface WorkbookSheetRowCellBorderBottom {
-        color?: string;
-        size?: string;
-    }
-
-    interface WorkbookSheetRowCellBorderLeft {
-        color?: string;
-        size?: string;
-    }
-
-    interface WorkbookSheetRowCellBorderRight {
-        color?: string;
-        size?: string;
-    }
-
-    interface WorkbookSheetRowCellBorderTop {
-        color?: string;
-        size?: string;
-    }
-
-    interface WorkbookSheetRowCell {
-        background?: string;
-        borderBottom?: WorkbookSheetRowCellBorderBottom;
-        borderLeft?: WorkbookSheetRowCellBorderLeft;
-        borderTop?: WorkbookSheetRowCellBorderTop;
-        borderRight?: WorkbookSheetRowCellBorderRight;
-        bold?: boolean;
-        color?: string;
-        colSpan?: number;
-        fontFamily?: string;
-        fontName?: string;
-        fontSize?: number;
-        format?: string;
-        formula?: string;
-        hAlign?: string;
-        index?: any;
-        italic?: boolean;
-        rowSpan?: number;
-        textAlign?: string;
-        underline?: boolean;
-        wrap?: boolean;
-        vAlign?: string;
-        verticalAlign?: string;
-        value?: Date|number|string|boolean;
-    }
-
-    interface WorkbookSheetRow {
-        cells?: WorkbookSheetRowCell[];
-        index?: number;
-        height?: number;
-    }
-
-    interface WorkbookSheet {
-        columns?: WorkbookSheetColumn[];
-        freezePane?: WorkbookSheetFreezePane;
-        frozenColumns?: number;
-        frozenRows?: number;
-        filter?: WorkbookSheetFilter;
-        name?: string;
-        rows?: WorkbookSheetRow[];
-        showGridLines?: boolean;
-        title?: string;
-    }
-
-    interface WorkbookOptions {
-        name?: string;
-        creator?: string;
-        date?: Date;
-        sheets?: WorkbookSheet[];
-    }
-    interface WorkbookEvent {
-        sender: Workbook;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-}
-
-declare namespace kendo.dataviz.geometry {
-    class Arc extends Observable {
-
-
-        options: ArcOptions;
-
-        anticlockwise: boolean;
-        center: kendo.geometry.Point;
-        endAngle: number;
-        radiusX: number;
-        radiusY: number;
-        startAngle: number;
-
-
-
-        bbox(matrix: kendo.geometry.Matrix): kendo.geometry.Rect;
-        getAnticlockwise(): boolean;
-        getCenter(): kendo.geometry.Point;
-        getEndAngle(): number;
-        getRadiusX(): number;
-        getRadiusY(): number;
-        getStartAngle(): number;
-        pointAt(angle: number): kendo.geometry.Point;
-        setAnticlockwise(value: boolean): kendo.geometry.Arc;
-        setCenter(value: kendo.geometry.Point): kendo.geometry.Arc;
-        setEndAngle(value: number): kendo.geometry.Arc;
-        setRadiusX(value: number): kendo.geometry.Arc;
-        setRadiusY(value: number): kendo.geometry.Arc;
-        setStartAngle(value: number): kendo.geometry.Arc;
-
-    }
-
-    interface ArcOptions {
-        name?: string;
-    }
-    interface ArcEvent {
-        sender: Arc;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Circle extends Observable {
-
-
-        options: CircleOptions;
-
-        center: kendo.geometry.Point;
-        radius: number;
-
-
-
-        bbox(matrix: kendo.geometry.Matrix): kendo.geometry.Rect;
-        clone(): kendo.geometry.Circle;
-        equals(other: kendo.geometry.Circle): boolean;
-        getCenter(): kendo.geometry.Point;
-        getRadius(): number;
-        pointAt(angle: number): kendo.geometry.Point;
-        setCenter(value: kendo.geometry.Point): kendo.geometry.Point;
-        setCenter(value: any): kendo.geometry.Point;
-        setRadius(value: number): kendo.geometry.Circle;
-
-    }
-
-    interface CircleOptions {
-        name?: string;
-    }
-    interface CircleEvent {
-        sender: Circle;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Matrix extends Observable {
-
-
-        options: MatrixOptions;
-
-        a: number;
-        b: number;
-        c: number;
-        d: number;
-        e: number;
-        f: number;
-
-
-        static rotate(angle: number, x: number, y: number): kendo.geometry.Matrix;
-        static scale(scaleX: number, scaleY: number): kendo.geometry.Matrix;
-        static translate(x: number, y: number): kendo.geometry.Matrix;
-        static unit(): kendo.geometry.Matrix;
-
-        clone(): kendo.geometry.Matrix;
-        equals(other: kendo.geometry.Matrix): boolean;
-        round(digits: number): kendo.geometry.Matrix;
-        multiplyCopy(matrix: kendo.geometry.Matrix): kendo.geometry.Matrix;
-        toArray(digits: number): any;
-        toString(digits: number, separator: string): string;
-
-    }
-
-    interface MatrixOptions {
-        name?: string;
-    }
-    interface MatrixEvent {
-        sender: Matrix;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Point extends Observable {
-
-
-        options: PointOptions;
-
-        x: number;
-        y: number;
-
-        constructor(x: number, y: number);
-
-        static create(x: number, y: number): kendo.geometry.Point;
-        static create(x: any, y: number): kendo.geometry.Point;
-        static create(x: kendo.geometry.Point, y: number): kendo.geometry.Point;
-        static min(): kendo.geometry.Point;
-        static max(): kendo.geometry.Point;
-        static minPoint(): kendo.geometry.Point;
-        static maxPoint(): kendo.geometry.Point;
-
-        clone(): kendo.geometry.Point;
-        distanceTo(point: kendo.geometry.Point): number;
-        equals(other: kendo.geometry.Point): boolean;
-        getX(): number;
-        getY(): number;
-        move(x: number, y: number): kendo.geometry.Point;
-        rotate(angle: number, center: kendo.geometry.Point): kendo.geometry.Point;
-        rotate(angle: number, center: any): kendo.geometry.Point;
-        round(digits: number): kendo.geometry.Point;
-        scale(scaleX: number, scaleY: number): kendo.geometry.Point;
-        scaleCopy(scaleX: number, scaleY: number): kendo.geometry.Point;
-        setX(value: number): kendo.geometry.Point;
-        setY(value: number): kendo.geometry.Point;
-        toArray(digits: number): any;
-        toString(digits: number, separator: string): string;
-        transform(tansformation: kendo.geometry.Transformation): kendo.geometry.Point;
-        transformCopy(tansformation: kendo.geometry.Transformation): kendo.geometry.Point;
-        translate(dx: number, dy: number): kendo.geometry.Point;
-        translateWith(vector: kendo.geometry.Point): kendo.geometry.Point;
-        translateWith(vector: any): kendo.geometry.Point;
-
-    }
-
-    interface PointOptions {
-        name?: string;
-    }
-    interface PointEvent {
-        sender: Point;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Rect extends Observable {
-
-
-        options: RectOptions;
-
-        origin: kendo.geometry.Point;
-        size: kendo.geometry.Size;
-
-        constructor(origin: kendo.geometry.Point, size: kendo.geometry.Size);
-
-        static fromPoints(pointA: kendo.geometry.Point, pointB: kendo.geometry.Point): kendo.geometry.Rect;
-        static union(rectA: kendo.geometry.Rect, rectB: kendo.geometry.Rect): kendo.geometry.Rect;
-
-        bbox(matrix: kendo.geometry.Matrix): kendo.geometry.Rect;
-        bottomLeft(): kendo.geometry.Point;
-        bottomRight(): kendo.geometry.Point;
-        center(): kendo.geometry.Point;
-        clone(): kendo.geometry.Rect;
-        equals(other: kendo.geometry.Rect): boolean;
-        getOrigin(): kendo.geometry.Point;
-        getSize(): kendo.geometry.Size;
-        height(): number;
-        setOrigin(value: kendo.geometry.Point): kendo.geometry.Rect;
-        setOrigin(value: any): kendo.geometry.Rect;
-        setSize(value: kendo.geometry.Size): kendo.geometry.Rect;
-        setSize(value: any): kendo.geometry.Rect;
-        topLeft(): kendo.geometry.Point;
-        topRight(): kendo.geometry.Point;
-        width(): number;
-
-    }
-
-    interface RectOptions {
-        name?: string;
-    }
-    interface RectEvent {
-        sender: Rect;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Size extends Observable {
-
-
-        options: SizeOptions;
-
-        width: number;
-        height: number;
-
-
-        static create(width: number, height: number): kendo.geometry.Size;
-        static create(width: any, height: number): kendo.geometry.Size;
-        static create(width: kendo.geometry.Size, height: number): kendo.geometry.Size;
-
-        clone(): kendo.geometry.Size;
-        equals(other: kendo.geometry.Size): boolean;
-        getWidth(): number;
-        getHeight(): number;
-        setWidth(value: number): kendo.geometry.Size;
-        setHeight(value: number): kendo.geometry.Size;
-
-    }
-
-    interface SizeOptions {
-        name?: string;
-    }
-    interface SizeEvent {
-        sender: Size;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Transformation extends Observable {
-
-
-        options: TransformationOptions;
-
-
-
-
-        clone(): kendo.geometry.Transformation;
-        equals(other: kendo.geometry.Transformation): boolean;
-        matrix(): kendo.geometry.Matrix;
-        multiply(transformation: kendo.geometry.Transformation): kendo.geometry.Transformation;
-        rotate(angle: number, center: any): kendo.geometry.Transformation;
-        rotate(angle: number, center: kendo.geometry.Point): kendo.geometry.Transformation;
-        scale(scaleX: number, scaleY: number): kendo.geometry.Transformation;
-        translate(x: number, y: number): kendo.geometry.Transformation;
-
-    }
-
-    interface TransformationOptions {
-        name?: string;
-    }
-    interface TransformationEvent {
-        sender: Transformation;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-}
-declare namespace kendo.dataviz.drawing {
-    class Arc extends kendo.drawing.Element {
-
-
-        options: ArcOptions;
-
-
-        constructor(geometry: kendo.geometry.Arc, options?: ArcOptions);
-
-
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        geometry(): kendo.geometry.Arc;
-        geometry(value: kendo.geometry.Arc): void;
-        fill(color: string, opacity?: number): kendo.drawing.Arc;
-        opacity(): number;
-        opacity(opacity: number): void;
-        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Arc;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface ArcOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        cursor?: string;
-        fill?: kendo.drawing.FillOptions;
-        opacity?: number;
-        stroke?: kendo.drawing.StrokeOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface ArcEvent {
-        sender: Arc;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Circle extends kendo.drawing.Element {
-
-
-        options: CircleOptions;
-
-
-        constructor(geometry: kendo.geometry.Circle, options?: CircleOptions);
-
-
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        geometry(): kendo.geometry.Circle;
-        geometry(value: kendo.geometry.Circle): void;
-        fill(color: string, opacity?: number): kendo.drawing.Circle;
-        opacity(): number;
-        opacity(opacity: number): void;
-        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Circle;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface CircleOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        cursor?: string;
-        fill?: kendo.drawing.FillOptions;
-        opacity?: number;
-        stroke?: kendo.drawing.StrokeOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface CircleEvent {
-        sender: Circle;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Element extends kendo.Class {
-
-
-        options: ElementOptions;
-
-
-        constructor(options?: ElementOptions);
-
-
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        opacity(): number;
-        opacity(opacity: number): void;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface ElementOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        cursor?: string;
-        opacity?: number;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface ElementEvent {
-        sender: Element;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    interface FillOptions  {
-
-
-
-        color?: string;
-        opacity?: number;
-
-
-
-
-    }
-
-
-
-    class Gradient extends kendo.Class {
-
-
-        options: GradientOptions;
-
-        stops: any;
-
-        constructor(options?: GradientOptions);
-
-
-        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
-        removeStop(stop: kendo.drawing.GradientStop): void;
-
-    }
-
-    interface GradientOptions {
-        name?: string;
-        stops?: any;
-    }
-    interface GradientEvent {
-        sender: Gradient;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class GradientStop extends kendo.Class {
-
-
-        options: GradientStopOptions;
-
-
-        constructor(options?: GradientStopOptions);
-
-
-
-    }
-
-    interface GradientStopOptions {
-        name?: string;
-        offset?: number;
-        color?: string;
-        opacity?: number;
-    }
-    interface GradientStopEvent {
-        sender: GradientStop;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Group extends kendo.drawing.Element {
-
-
-        options: GroupOptions;
-
-        children: any;
-
-        constructor(options?: GroupOptions);
-
-
-        append(element: kendo.drawing.Element): void;
-        clear(): void;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        insert(position: number, element: kendo.drawing.Element): void;
-        opacity(): number;
-        opacity(opacity: number): void;
-        remove(element: kendo.drawing.Element): void;
-        removeAt(index: number): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface GroupOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        cursor?: string;
-        opacity?: number;
-        pdf?: kendo.drawing.PDFOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface GroupEvent {
-        sender: Group;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Image extends kendo.drawing.Element {
-
-
-        options: ImageOptions;
-
-
-        constructor(src: string, rect: kendo.geometry.Rect);
-
-
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        opacity(): number;
-        opacity(opacity: number): void;
-        src(): string;
-        src(value: string): void;
-        rect(): kendo.geometry.Rect;
-        rect(value: kendo.geometry.Rect): void;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface ImageOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        cursor?: string;
-        opacity?: number;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface ImageEvent {
-        sender: Image;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Layout extends kendo.drawing.Group {
-
-
-        options: LayoutOptions;
-
-
-        constructor(rect: kendo.geometry.Rect, options?: LayoutOptions);
-
-
-        rect(): kendo.geometry.Rect;
-        rect(rect: kendo.geometry.Rect): void;
-        reflow(): void;
-
-    }
-
-    interface LayoutOptions {
-        name?: string;
-        alignContent?: string;
-        alignItems?: string;
-        justifyContent?: string;
-        lineSpacing?: number;
-        spacing?: number;
-        orientation?: string;
-        wrap?: boolean;
-    }
-    interface LayoutEvent {
-        sender: Layout;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class LinearGradient extends kendo.drawing.Gradient {
-
-
-        options: LinearGradientOptions;
-
-        stops: any;
-
-        constructor(options?: LinearGradientOptions);
-
-
-        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
-        end(): kendo.geometry.Point;
-        end(end: any): void;
-        end(end: kendo.geometry.Point): void;
-        start(): kendo.geometry.Point;
-        start(start: any): void;
-        start(start: kendo.geometry.Point): void;
-        removeStop(stop: kendo.drawing.GradientStop): void;
-
-    }
-
-    interface LinearGradientOptions {
-        name?: string;
-        stops?: any;
-    }
-    interface LinearGradientEvent {
-        sender: LinearGradient;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class MultiPath extends kendo.drawing.Element {
-
-
-        options: MultiPathOptions;
-
-        paths: any;
-
-        constructor(options?: MultiPathOptions);
-
-
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        close(): kendo.drawing.MultiPath;
-        curveTo(controlOut: any, controlIn: any, endPoint: any): kendo.drawing.MultiPath;
-        curveTo(controlOut: any, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
-        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.MultiPath;
-        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: any): kendo.drawing.MultiPath;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.MultiPath;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.MultiPath;
-        fill(color: string, opacity?: number): kendo.drawing.MultiPath;
-        lineTo(x: number, y?: number): kendo.drawing.MultiPath;
-        lineTo(x: any, y?: number): kendo.drawing.MultiPath;
-        lineTo(x: kendo.geometry.Point, y?: number): kendo.drawing.MultiPath;
-        moveTo(x: number, y?: number): kendo.drawing.MultiPath;
-        moveTo(x: any, y?: number): kendo.drawing.MultiPath;
-        moveTo(x: kendo.geometry.Point, y?: number): kendo.drawing.MultiPath;
-        opacity(): number;
-        opacity(opacity: number): void;
-        stroke(color: string, width?: number, opacity?: number): kendo.drawing.MultiPath;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface MultiPathOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        cursor?: string;
-        fill?: kendo.drawing.FillOptions;
-        opacity?: number;
-        stroke?: kendo.drawing.StrokeOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface MultiPathEvent {
-        sender: MultiPath;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class OptionsStore extends kendo.Class {
-
-
-        options: OptionsStoreOptions;
-
-        observer: any;
-
-        constructor(options?: OptionsStoreOptions);
-
-
-        get(field: string): any;
-        set(field: string, value: any): void;
-
-    }
-
-    interface OptionsStoreOptions {
-        name?: string;
-    }
-    interface OptionsStoreEvent {
-        sender: OptionsStore;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    interface PDFOptions  {
-
-
-
-        creator?: string;
-        date?: Date;
-        keywords?: string;
-        landscape?: boolean;
-        margin?: any;
-        paperSize?: any;
-        subject?: string;
-        title?: string;
-
-
-
-
-    }
-
-
-
-    class Path extends kendo.drawing.Element {
-
-
-        options: PathOptions;
-
-        segments: any;
-
-        constructor(options?: PathOptions);
-
-        static fromPoints(points: any): kendo.drawing.Path;
-        static fromRect(rect: kendo.geometry.Rect): kendo.drawing.Path;
-        static parse(svgPath: string, options?: any): kendo.drawing.Path;
-
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        close(): kendo.drawing.Path;
-        curveTo(controlOut: any, controlIn: any, endPoint: any): kendo.drawing.Path;
-        curveTo(controlOut: any, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.Path;
-        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.Path;
-        curveTo(controlOut: any, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.Path;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: any): kendo.drawing.Path;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: any, endPoint: kendo.geometry.Point): kendo.drawing.Path;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: any): kendo.drawing.Path;
-        curveTo(controlOut: kendo.geometry.Point, controlIn: kendo.geometry.Point, endPoint: kendo.geometry.Point): kendo.drawing.Path;
-        fill(color: string, opacity?: number): kendo.drawing.Path;
-        lineTo(x: number, y?: number): kendo.drawing.Path;
-        lineTo(x: any, y?: number): kendo.drawing.Path;
-        lineTo(x: kendo.geometry.Point, y?: number): kendo.drawing.Path;
-        moveTo(x: number, y?: number): kendo.drawing.Path;
-        moveTo(x: any, y?: number): kendo.drawing.Path;
-        moveTo(x: kendo.geometry.Point, y?: number): kendo.drawing.Path;
-        opacity(): number;
-        opacity(opacity: number): void;
-        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Path;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface PathOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        cursor?: string;
-        fill?: kendo.drawing.FillOptions;
-        opacity?: number;
-        stroke?: kendo.drawing.StrokeOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface PathEvent {
-        sender: Path;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class RadialGradient extends kendo.drawing.Gradient {
-
-
-        options: RadialGradientOptions;
-
-        stops: any;
-
-        constructor(options?: RadialGradientOptions);
-
-
-        addStop(offset: number, color: string, opacity: number): kendo.drawing.GradientStop;
-        center(): kendo.geometry.Point;
-        center(center: any): void;
-        center(center: kendo.geometry.Point): void;
-        radius(): number;
-        radius(value: number): void;
-        removeStop(stop: kendo.drawing.GradientStop): void;
-
-    }
-
-    interface RadialGradientOptions {
-        name?: string;
-        center?: any|kendo.geometry.Point;
-        radius?: number;
-        stops?: any;
-    }
-    interface RadialGradientEvent {
-        sender: RadialGradient;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Rect extends kendo.drawing.Element {
-
-
-        options: RectOptions;
-
-
-        constructor(geometry: kendo.geometry.Rect, options?: RectOptions);
-
-
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        geometry(): kendo.geometry.Rect;
-        geometry(value: kendo.geometry.Rect): void;
-        fill(color: string, opacity?: number): kendo.drawing.Rect;
-        opacity(): number;
-        opacity(opacity: number): void;
-        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Rect;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface RectOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        cursor?: string;
-        fill?: kendo.drawing.FillOptions;
-        opacity?: number;
-        stroke?: kendo.drawing.StrokeOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface RectEvent {
-        sender: Rect;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    class Segment extends kendo.Class {
-
-
-        options: SegmentOptions;
-
-
-        constructor(anchor: kendo.geometry.Point, controlIn: kendo.geometry.Point, controlOut: kendo.geometry.Point);
-
-
-        anchor(): kendo.geometry.Point;
-        anchor(value: kendo.geometry.Point): void;
-        controlIn(): kendo.geometry.Point;
-        controlIn(value: kendo.geometry.Point): void;
-        controlOut(): kendo.geometry.Point;
-        controlOut(value: kendo.geometry.Point): void;
-
-    }
-
-    interface SegmentOptions {
-        name?: string;
-    }
-    interface SegmentEvent {
-        sender: Segment;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-    interface StrokeOptions  {
-
-
-
-        color?: string;
-        dashType?: string;
-        lineCap?: string;
-        lineJoin?: string;
-        opacity?: number;
-        width?: number;
-
-
-
-
-    }
-
-
-
-    class Surface extends kendo.Observable {
-
-
-        options: SurfaceOptions;
-
-
-        constructor(options?: SurfaceOptions);
-
-        static create(element: JQuery, options?: any): kendo.drawing.Surface;
-        static create(element: Element, options?: any): kendo.drawing.Surface;
-
-        clear(): void;
-        draw(element: kendo.drawing.Element): void;
-        eventTarget(e: any): kendo.drawing.Element;
-        resize(force?: boolean): void;
-
-    }
-
-    interface SurfaceOptions {
-        name?: string;
-        type?: string;
-        height?: string;
-        width?: string;
-        click?(e: SurfaceClickEvent): void;
-        mouseenter?(e: SurfaceMouseenterEvent): void;
-        mouseleave?(e: SurfaceMouseleaveEvent): void;
-    }
-    interface SurfaceEvent {
-        sender: Surface;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-    interface SurfaceClickEvent extends SurfaceEvent {
-        element?: kendo.drawing.Element;
-        originalEvent?: any;
-    }
-
-    interface SurfaceMouseenterEvent extends SurfaceEvent {
-        element?: kendo.drawing.Element;
-        originalEvent?: any;
-    }
-
-    interface SurfaceMouseleaveEvent extends SurfaceEvent {
-        element?: kendo.drawing.Element;
-        originalEvent?: any;
-    }
-
-
-    class Text extends kendo.drawing.Element {
-
-
-        options: TextOptions;
-
-
-        constructor(content: string, position: kendo.geometry.Point, options?: TextOptions);
-
-
-        bbox(): kendo.geometry.Rect;
-        clip(): kendo.drawing.Path;
-        clip(clip: kendo.drawing.Path): void;
-        clippedBBox(): kendo.geometry.Rect;
-        content(): string;
-        content(value: string): void;
-        fill(color: string, opacity?: number): kendo.drawing.Text;
-        opacity(): number;
-        opacity(opacity: number): void;
-        position(): kendo.geometry.Point;
-        position(value: kendo.geometry.Point): void;
-        stroke(color: string, width?: number, opacity?: number): kendo.drawing.Text;
-        transform(): kendo.geometry.Transformation;
-        transform(transform: kendo.geometry.Transformation): void;
-        visible(): boolean;
-        visible(visible: boolean): void;
-
-    }
-
-    interface TextOptions {
-        name?: string;
-        clip?: kendo.drawing.Path;
-        cursor?: string;
-        fill?: kendo.drawing.FillOptions;
-        font?: string;
-        opacity?: number;
-        stroke?: kendo.drawing.StrokeOptions;
-        transform?: kendo.geometry.Transformation;
-        visible?: boolean;
-    }
-    interface TextEvent {
-        sender: Text;
-        preventDefault: Function;
-        isDefaultPrevented(): boolean;
-    }
-
-
-}
-
-interface HTMLElement {
-    kendoBindingTarget: kendo.data.BindingTarget;
-}
-
-interface JQueryXHR {
-}
-
-interface JQueryEventObject {
-}
-
-interface JQueryPromise<T> {
-}
-
-interface JQuery {
-
-    kendoDraggable(): JQuery;
-    kendoDraggable(options: kendo.ui.DraggableOptions): JQuery;
-
-    kendoDropTarget(): JQuery;
-    kendoDropTarget(options: kendo.ui.DropTargetOptions): JQuery;
-
-    kendoDropTargetArea(): JQuery;
-    kendoDropTargetArea(options: kendo.ui.DropTargetAreaOptions): JQuery;
-
-    data(key: any): any;
-
-    kendoAutoComplete(): JQuery;
-    kendoAutoComplete(options: kendo.ui.AutoCompleteOptions): JQuery;
-    data(key: "kendoAutoComplete"): kendo.ui.AutoComplete;
-
-    kendoBarcode(): JQuery;
-    kendoBarcode(options: kendo.dataviz.ui.BarcodeOptions): JQuery;
-    data(key: "kendoBarcode"): kendo.dataviz.ui.Barcode;
-
-    kendoButton(): JQuery;
-    kendoButton(options: kendo.ui.ButtonOptions): JQuery;
-    data(key: "kendoButton"): kendo.ui.Button;
-
-    kendoCalendar(): JQuery;
-    kendoCalendar(options: kendo.ui.CalendarOptions): JQuery;
-    data(key: "kendoCalendar"): kendo.ui.Calendar;
-
-    kendoChart(): JQuery;
-    kendoChart(options: kendo.dataviz.ui.ChartOptions): JQuery;
-    data(key: "kendoChart"): kendo.dataviz.ui.Chart;
-
-    kendoColorPalette(): JQuery;
-    kendoColorPalette(options: kendo.ui.ColorPaletteOptions): JQuery;
-    data(key: "kendoColorPalette"): kendo.ui.ColorPalette;
-
-    kendoColorPicker(): JQuery;
-    kendoColorPicker(options: kendo.ui.ColorPickerOptions): JQuery;
-    data(key: "kendoColorPicker"): kendo.ui.ColorPicker;
-
-    kendoComboBox(): JQuery;
-    kendoComboBox(options: kendo.ui.ComboBoxOptions): JQuery;
-    data(key: "kendoComboBox"): kendo.ui.ComboBox;
-
-    kendoContextMenu(): JQuery;
-    kendoContextMenu(options: kendo.ui.ContextMenuOptions): JQuery;
-    data(key: "kendoContextMenu"): kendo.ui.ContextMenu;
-
-    kendoDatePicker(): JQuery;
-    kendoDatePicker(options: kendo.ui.DatePickerOptions): JQuery;
-    data(key: "kendoDatePicker"): kendo.ui.DatePicker;
-
-    kendoDateTimePicker(): JQuery;
-    kendoDateTimePicker(options: kendo.ui.DateTimePickerOptions): JQuery;
-    data(key: "kendoDateTimePicker"): kendo.ui.DateTimePicker;
-
-    kendoDiagram(): JQuery;
-    kendoDiagram(options: kendo.dataviz.ui.DiagramOptions): JQuery;
-    data(key: "kendoDiagram"): kendo.dataviz.ui.Diagram;
-
-    kendoDropDownList(): JQuery;
-    kendoDropDownList(options: kendo.ui.DropDownListOptions): JQuery;
-    data(key: "kendoDropDownList"): kendo.ui.DropDownList;
-
-    kendoEditor(): JQuery;
-    kendoEditor(options: kendo.ui.EditorOptions): JQuery;
-    data(key: "kendoEditor"): kendo.ui.Editor;
-
-    kendoFlatColorPicker(): JQuery;
-    kendoFlatColorPicker(options: kendo.ui.FlatColorPickerOptions): JQuery;
-    data(key: "kendoFlatColorPicker"): kendo.ui.FlatColorPicker;
-
-    kendoGantt(): JQuery;
-    kendoGantt(options: kendo.ui.GanttOptions): JQuery;
-    data(key: "kendoGantt"): kendo.ui.Gantt;
-
-    kendoGrid(): JQuery;
-    kendoGrid(options: kendo.ui.GridOptions): JQuery;
-    data(key: "kendoGrid"): kendo.ui.Grid;
-
-    kendoLinearGauge(): JQuery;
-    kendoLinearGauge(options: kendo.dataviz.ui.LinearGaugeOptions): JQuery;
-    data(key: "kendoLinearGauge"): kendo.dataviz.ui.LinearGauge;
-
-    kendoListView(): JQuery;
-    kendoListView(options: kendo.ui.ListViewOptions): JQuery;
-    data(key: "kendoListView"): kendo.ui.ListView;
-
-    kendoMap(): JQuery;
-    kendoMap(options: kendo.dataviz.ui.MapOptions): JQuery;
-    data(key: "kendoMap"): kendo.dataviz.ui.Map;
-
-    kendoMaskedTextBox(): JQuery;
-    kendoMaskedTextBox(options: kendo.ui.MaskedTextBoxOptions): JQuery;
-    data(key: "kendoMaskedTextBox"): kendo.ui.MaskedTextBox;
-
-    kendoMenu(): JQuery;
-    kendoMenu(options: kendo.ui.MenuOptions): JQuery;
-    data(key: "kendoMenu"): kendo.ui.Menu;
-
-    kendoMobileActionSheet(): JQuery;
-    kendoMobileActionSheet(options: kendo.mobile.ui.ActionSheetOptions): JQuery;
-    data(key: "kendoMobileActionSheet"): kendo.mobile.ui.ActionSheet;
-
-    kendoMobileBackButton(): JQuery;
-    kendoMobileBackButton(options: kendo.mobile.ui.BackButtonOptions): JQuery;
-    data(key: "kendoMobileBackButton"): kendo.mobile.ui.BackButton;
-
-    kendoMobileButton(): JQuery;
-    kendoMobileButton(options: kendo.mobile.ui.ButtonOptions): JQuery;
-    data(key: "kendoMobileButton"): kendo.mobile.ui.Button;
-
-    kendoMobileButtonGroup(): JQuery;
-    kendoMobileButtonGroup(options: kendo.mobile.ui.ButtonGroupOptions): JQuery;
-    data(key: "kendoMobileButtonGroup"): kendo.mobile.ui.ButtonGroup;
-
-    kendoMobileCollapsible(): JQuery;
-    kendoMobileCollapsible(options: kendo.mobile.ui.CollapsibleOptions): JQuery;
-    data(key: "kendoMobileCollapsible"): kendo.mobile.ui.Collapsible;
-
-    kendoMobileDetailButton(): JQuery;
-    kendoMobileDetailButton(options: kendo.mobile.ui.DetailButtonOptions): JQuery;
-    data(key: "kendoMobileDetailButton"): kendo.mobile.ui.DetailButton;
-
-    kendoMobileDrawer(): JQuery;
-    kendoMobileDrawer(options: kendo.mobile.ui.DrawerOptions): JQuery;
-    data(key: "kendoMobileDrawer"): kendo.mobile.ui.Drawer;
-
-    kendoMobileLayout(): JQuery;
-    kendoMobileLayout(options: kendo.mobile.ui.LayoutOptions): JQuery;
-    data(key: "kendoMobileLayout"): kendo.mobile.ui.Layout;
-
-    kendoMobileListView(): JQuery;
-    kendoMobileListView(options: kendo.mobile.ui.ListViewOptions): JQuery;
-    data(key: "kendoMobileListView"): kendo.mobile.ui.ListView;
-
-    kendoMobileLoader(): JQuery;
-    kendoMobileLoader(options: kendo.mobile.ui.LoaderOptions): JQuery;
-    data(key: "kendoMobileLoader"): kendo.mobile.ui.Loader;
-
-    kendoMobileModalView(): JQuery;
-    kendoMobileModalView(options: kendo.mobile.ui.ModalViewOptions): JQuery;
-    data(key: "kendoMobileModalView"): kendo.mobile.ui.ModalView;
-
-    kendoMobileNavBar(): JQuery;
-    kendoMobileNavBar(options: kendo.mobile.ui.NavBarOptions): JQuery;
-    data(key: "kendoMobileNavBar"): kendo.mobile.ui.NavBar;
-
-    kendoMobilePane(): JQuery;
-    kendoMobilePane(options: kendo.mobile.ui.PaneOptions): JQuery;
-    data(key: "kendoMobilePane"): kendo.mobile.ui.Pane;
-
-    kendoMobilePopOver(): JQuery;
-    kendoMobilePopOver(options: kendo.mobile.ui.PopOverOptions): JQuery;
-    data(key: "kendoMobilePopOver"): kendo.mobile.ui.PopOver;
-
-    kendoMobileScrollView(): JQuery;
-    kendoMobileScrollView(options: kendo.mobile.ui.ScrollViewOptions): JQuery;
-    data(key: "kendoMobileScrollView"): kendo.mobile.ui.ScrollView;
-
-    kendoMobileScroller(): JQuery;
-    kendoMobileScroller(options: kendo.mobile.ui.ScrollerOptions): JQuery;
-    data(key: "kendoMobileScroller"): kendo.mobile.ui.Scroller;
-
-    kendoMobileSplitView(): JQuery;
-    kendoMobileSplitView(options: kendo.mobile.ui.SplitViewOptions): JQuery;
-    data(key: "kendoMobileSplitView"): kendo.mobile.ui.SplitView;
-
-    kendoMobileSwitch(): JQuery;
-    kendoMobileSwitch(options: kendo.mobile.ui.SwitchOptions): JQuery;
-    data(key: "kendoMobileSwitch"): kendo.mobile.ui.Switch;
-
-    kendoMobileTabStrip(): JQuery;
-    kendoMobileTabStrip(options: kendo.mobile.ui.TabStripOptions): JQuery;
-    data(key: "kendoMobileTabStrip"): kendo.mobile.ui.TabStrip;
-
-    kendoMobileView(): JQuery;
-    kendoMobileView(options: kendo.mobile.ui.ViewOptions): JQuery;
-    data(key: "kendoMobileView"): kendo.mobile.ui.View;
-
-    kendoMultiSelect(): JQuery;
-    kendoMultiSelect(options: kendo.ui.MultiSelectOptions): JQuery;
-    data(key: "kendoMultiSelect"): kendo.ui.MultiSelect;
-
-    kendoNotification(): JQuery;
-    kendoNotification(options: kendo.ui.NotificationOptions): JQuery;
-    data(key: "kendoNotification"): kendo.ui.Notification;
-
-    kendoNumericTextBox(): JQuery;
-    kendoNumericTextBox(options: kendo.ui.NumericTextBoxOptions): JQuery;
-    data(key: "kendoNumericTextBox"): kendo.ui.NumericTextBox;
-
-    kendoPager(): JQuery;
-    kendoPager(options: kendo.ui.PagerOptions): JQuery;
-    data(key: "kendoPager"): kendo.ui.Pager;
-
-    kendoPanelBar(): JQuery;
-    kendoPanelBar(options: kendo.ui.PanelBarOptions): JQuery;
-    data(key: "kendoPanelBar"): kendo.ui.PanelBar;
-
-    kendoPivotConfigurator(): JQuery;
-    kendoPivotConfigurator(options: kendo.ui.PivotConfiguratorOptions): JQuery;
-    data(key: "kendoPivotConfigurator"): kendo.ui.PivotConfigurator;
-
-    kendoPivotGrid(): JQuery;
-    kendoPivotGrid(options: kendo.ui.PivotGridOptions): JQuery;
-    data(key: "kendoPivotGrid"): kendo.ui.PivotGrid;
-
-    kendoPopup(): JQuery;
-    kendoPopup(options: kendo.ui.PopupOptions): JQuery;
-    data(key: "kendoPopup"): kendo.ui.Popup;
-
-    kendoProgressBar(): JQuery;
-    kendoProgressBar(options: kendo.ui.ProgressBarOptions): JQuery;
-    data(key: "kendoProgressBar"): kendo.ui.ProgressBar;
-
-    kendoQRCode(): JQuery;
-    kendoQRCode(options: kendo.dataviz.ui.QRCodeOptions): JQuery;
-    data(key: "kendoQRCode"): kendo.dataviz.ui.QRCode;
-
-    kendoRadialGauge(): JQuery;
-    kendoRadialGauge(options: kendo.dataviz.ui.RadialGaugeOptions): JQuery;
-    data(key: "kendoRadialGauge"): kendo.dataviz.ui.RadialGauge;
-
-    kendoRangeSlider(): JQuery;
-    kendoRangeSlider(options: kendo.ui.RangeSliderOptions): JQuery;
-    data(key: "kendoRangeSlider"): kendo.ui.RangeSlider;
-
-    kendoResponsivePanel(): JQuery;
-    kendoResponsivePanel(options: kendo.ui.ResponsivePanelOptions): JQuery;
-    data(key: "kendoResponsivePanel"): kendo.ui.ResponsivePanel;
-
-    kendoScheduler(): JQuery;
-    kendoScheduler(options: kendo.ui.SchedulerOptions): JQuery;
-    data(key: "kendoScheduler"): kendo.ui.Scheduler;
-
-    kendoSlider(): JQuery;
-    kendoSlider(options: kendo.ui.SliderOptions): JQuery;
-    data(key: "kendoSlider"): kendo.ui.Slider;
-
-    kendoSortable(): JQuery;
-    kendoSortable(options: kendo.ui.SortableOptions): JQuery;
-    data(key: "kendoSortable"): kendo.ui.Sortable;
-
-    kendoSparkline(): JQuery;
-    kendoSparkline(options: kendo.dataviz.ui.SparklineOptions): JQuery;
-    data(key: "kendoSparkline"): kendo.dataviz.ui.Sparkline;
-
-    kendoSplitter(): JQuery;
-    kendoSplitter(options: kendo.ui.SplitterOptions): JQuery;
-    data(key: "kendoSplitter"): kendo.ui.Splitter;
-
-    kendoSpreadsheet(): JQuery;
-    kendoSpreadsheet(options: kendo.ui.SpreadsheetOptions): JQuery;
-    data(key: "kendoSpreadsheet"): kendo.ui.Spreadsheet;
-
-    kendoStockChart(): JQuery;
-    kendoStockChart(options: kendo.dataviz.ui.StockChartOptions): JQuery;
-    data(key: "kendoStockChart"): kendo.dataviz.ui.StockChart;
-
-    kendoTabStrip(): JQuery;
-    kendoTabStrip(options: kendo.ui.TabStripOptions): JQuery;
-    data(key: "kendoTabStrip"): kendo.ui.TabStrip;
-
-    kendoTimePicker(): JQuery;
-    kendoTimePicker(options: kendo.ui.TimePickerOptions): JQuery;
-    data(key: "kendoTimePicker"): kendo.ui.TimePicker;
-
-    kendoToolBar(): JQuery;
-    kendoToolBar(options: kendo.ui.ToolBarOptions): JQuery;
-    data(key: "kendoToolBar"): kendo.ui.ToolBar;
-
-    kendoTooltip(): JQuery;
-    kendoTooltip(options: kendo.ui.TooltipOptions): JQuery;
-    data(key: "kendoTooltip"): kendo.ui.Tooltip;
-
-    kendoTouch(): JQuery;
-    kendoTouch(options: kendo.ui.TouchOptions): JQuery;
-    data(key: "kendoTouch"): kendo.ui.Touch;
-
-    kendoTreeList(): JQuery;
-    kendoTreeList(options: kendo.ui.TreeListOptions): JQuery;
-    data(key: "kendoTreeList"): kendo.ui.TreeList;
-
-    kendoTreeMap(): JQuery;
-    kendoTreeMap(options: kendo.dataviz.ui.TreeMapOptions): JQuery;
-    data(key: "kendoTreeMap"): kendo.dataviz.ui.TreeMap;
-
-    kendoTreeView(): JQuery;
-    kendoTreeView(options: kendo.ui.TreeViewOptions): JQuery;
-    data(key: "kendoTreeView"): kendo.ui.TreeView;
-
-    kendoUpload(): JQuery;
-    kendoUpload(options: kendo.ui.UploadOptions): JQuery;
-    data(key: "kendoUpload"): kendo.ui.Upload;
-
-    kendoValidator(): JQuery;
-    kendoValidator(options: kendo.ui.ValidatorOptions): JQuery;
-    data(key: "kendoValidator"): kendo.ui.Validator;
-
-    kendoWindow(): JQuery;
-    kendoWindow(options: kendo.ui.WindowOptions): JQuery;
-    data(key: "kendoWindow"): kendo.ui.Window;
-
-}
diff --git a/kendo-ui/tsconfig.json b/kendo-ui/tsconfig.json
new file mode 100644
index 0000000000..9321fc4a04
--- /dev/null
+++ b/kendo-ui/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "kendo-ui-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/keyboardjs/index.d.ts b/keyboardjs/index.d.ts
new file mode 100644
index 0000000000..a1249645d4
--- /dev/null
+++ b/keyboardjs/index.d.ts
@@ -0,0 +1,131 @@
+// Type definitions for KeyboardJS v2.2.0
+// Project: https://github.com/RobertWHurst/KeyboardJS
+// Definitions by: Vincent Bortone <https://github.com/vbortone/>,
+//                 David Asmuth <https://github.com/piranha771>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// KeyboardJS is a library for use in the browser (node.js compatible).
+// It Allows developers to easily setup key bindings. Use key combos to setup complex bindings.
+// KeyboardJS also provides contexts. Contexts are great for single page applications.
+// They allow you to scope your bindings to various parts of your application.
+// Out of the box keyboardJS uses a US keyboard locale. If you need support for
+// a different type of keyboard KeyboardJS provides custom locale support so you can create
+// with a locale that better matches your needs.
+
+declare namespace keyboardjs {
+
+    /**
+	 * Information and functions in the current callback.
+	 */
+    interface KeyEvent{
+        preventRepeat(): void;
+    }
+
+    /**
+     * Callback function when a keyCombo is triggered.
+     * @see KeyEvent
+     */
+    interface Callback {
+        /**
+		 * Keyevent
+		 */
+        (e?: KeyEvent): void;
+    }
+
+    // ---------- Key Binding ---------- //
+
+    /**
+     * Binds a keyCombo to specific callback functions.
+     * @param keyCombo String of keys to be pressed to execute callbacks.
+     * @param pressed Callback that gets executed when the keyComboState is 'pressed', can be null.
+     * @param released Callback that gets executed when the keyComboState is 'released'
+     * @param preventRepeatByDefault Whether or not to prevent repeat by default. Defaults to false.
+     */
+    export function bind(keyCombo: string | string[], pressed: Callback, released?: Callback, preventRepeatByDefault?: boolean): void;
+
+    /**
+     * Unbinds a keyCombo completely or only specific pressed & released callback combos.
+     * @param keyCombo String of keys to be pressed to execute callbacks.
+     * @param pressed Callback that gets executed when the keyComboState is 'pressed', can be null.
+     * @param released Callback that gets executed when the keyComboState is 'released', can be null.
+     */
+    export function unbind(keyCombo: string | string[], pressed?: Callback, released?: Callback): void;
+
+    // ---------- Context ---------- //
+
+    /**
+     * Sets the context KeyboardJS operates in. Default is global context.
+     * Bindings in global context will execute in all contexts.
+     * @param identifier The name of the context. If the context doesn't exists, it will be created.
+     * Use 'global' to switch to global context.
+     */
+    export function setContext(identifier: string): void;
+    /**
+     * Executes a Callback without loosing the current context.
+     * @param identifier The name of the context the callback should be in. If the context doesn't exists, it will be created.
+     * @param inContextCallBack The callback function. Will be executed in the given context.
+     */
+    export function withContext(identifier: string, inContextCallBack: () => void): void;
+    /**
+     * Returns the context KeyboardJS currently operates in.
+     */
+    export function getContext(): string;
+
+    // ---------- KeyboardJS Control ---------- //
+
+    /**
+     * The keyboard will no longer trigger bindings.
+     */
+    export function pause(): void;
+    /**
+     * The keyboard will once again trigger bindings.
+     */
+    export function resume(): void;
+    /**
+     * All active bindings will released and unbound.
+     */
+    export function reset(): void;
+
+    // ---------- Virtual Key Press ---------- //
+
+    /**
+     * Triggers a key press. Stays in pressed state until released.
+     * @param keyCombo String of keys to be pressed to execute 'pressed' callbacks.
+     */
+    export function pressKey(keyCombo: string): void
+    /**
+     * Triggers a key release.
+     * @param keyCombo String of keys to be released to execute 'released' callbacks.
+     */
+    export function releaseKey(keyCombo: string): void;
+    /**
+     * Releases all keys.
+     */
+    export function releaseAllKeys(): void;
+
+    // ---------- Attachment ---------- //
+
+    /**
+     * Attaches keyboardJS a specific window and a specific document or form.
+     * @param myWin The window to attach to.
+     * @param myDoc The document or form to attach to.
+     */
+    export function watch(myWin: Window, myDoc: Document | HTMLFormElement): void;
+    /**
+     * Attaches keyboardJS to the current window and a specific document or form.
+     * @param myDoc The document or form to attach to.
+     */
+    export function watch(myDoc: Document | HTMLFormElement): void;
+    /**
+     * Attaches keyboardJS to the current window an document.
+     */
+    export function watch(): void;
+
+    /**
+     * Detaches KeyboardJS from the window and document/element
+     */
+    export function stop(): void;
+}
+    
+export = keyboardjs;
+export as namespace keyboardJS;
diff --git a/keyboardjs/keyboardjs.d.ts b/keyboardjs/keyboardjs.d.ts
deleted file mode 100644
index 820101dd67..0000000000
--- a/keyboardjs/keyboardjs.d.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-// Type definitions for KeyboardJS v2.2.0
-// Project: https://github.com/RobertWHurst/KeyboardJS
-// Definitions by: Vincent Bortone <https://github.com/vbortone/>,
-//                 David Asmuth <https://github.com/piranha771>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// KeyboardJS is a library for use in the browser (node.js compatible).
-// It Allows developers to easily setup key bindings. Use key combos to setup complex bindings.
-// KeyboardJS also provides contexts. Contexts are great for single page applications.
-// They allow you to scope your bindings to various parts of your application.
-// Out of the box keyboardJS uses a US keyboard locale. If you need support for
-// a different type of keyboard KeyboardJS provides custom locale support so you can create
-// with a locale that better matches your needs.
-
-declare namespace keyboardjs {
-
-    /**
-	 * Information and functions in the current callback.
-	 */
-    interface KeyEvent{
-        preventRepeat(): void;
-    }
-
-    /**
-     * Callback function when a keyCombo is triggered.
-     * @see KeyEvent
-     */
-    interface Callback {
-        /**
-		 * Keyevent
-		 */
-        (e?: KeyEvent): void;
-    }
-
-    // ---------- Key Binding ---------- //
-
-    /**
-     * Binds a keyCombo to specific callback functions.
-     * @param keyCombo String of keys to be pressed to execute callbacks.
-     * @param pressed Callback that gets executed when the keyComboState is 'pressed', can be null.
-     * @param released Callback that gets executed when the keyComboState is 'released'
-     * @param preventRepeatByDefault Whether or not to prevent repeat by default. Defaults to false.
-     */
-    export function bind(keyCombo: string | string[], pressed: Callback, released?: Callback, preventRepeatByDefault?: boolean): void;
-
-    /**
-     * Unbinds a keyCombo completely or only specific pressed & released callback combos.
-     * @param keyCombo String of keys to be pressed to execute callbacks.
-     * @param pressed Callback that gets executed when the keyComboState is 'pressed', can be null.
-     * @param released Callback that gets executed when the keyComboState is 'released', can be null.
-     */
-    export function unbind(keyCombo: string | string[], pressed?: Callback, released?: Callback): void;
-
-    // ---------- Context ---------- //
-
-    /**
-     * Sets the context KeyboardJS operates in. Default is global context.
-     * Bindings in global context will execute in all contexts.
-     * @param identifier The name of the context. If the context doesn't exists, it will be created.
-     * Use 'global' to switch to global context.
-     */
-    export function setContext(identifier: string): void;
-    /**
-     * Executes a Callback without loosing the current context.
-     * @param identifier The name of the context the callback should be in. If the context doesn't exists, it will be created.
-     * @param inContextCallBack The callback function. Will be executed in the given context.
-     */
-    export function withContext(identifier: string, inContextCallBack: () => void): void;
-    /**
-     * Returns the context KeyboardJS currently operates in.
-     */
-    export function getContext(): string;
-
-    // ---------- KeyboardJS Control ---------- //
-
-    /**
-     * The keyboard will no longer trigger bindings.
-     */
-    export function pause(): void;
-    /**
-     * The keyboard will once again trigger bindings.
-     */
-    export function resume(): void;
-    /**
-     * All active bindings will released and unbound.
-     */
-    export function reset(): void;
-
-    // ---------- Virtual Key Press ---------- //
-
-    /**
-     * Triggers a key press. Stays in pressed state until released.
-     * @param keyCombo String of keys to be pressed to execute 'pressed' callbacks.
-     */
-    export function pressKey(keyCombo: string): void
-    /**
-     * Triggers a key release.
-     * @param keyCombo String of keys to be released to execute 'released' callbacks.
-     */
-    export function releaseKey(keyCombo: string): void;
-    /**
-     * Releases all keys.
-     */
-    export function releaseAllKeys(): void;
-
-    // ---------- Attachment ---------- //
-
-    /**
-     * Attaches keyboardJS a specific window and a specific document or form.
-     * @param myWin The window to attach to.
-     * @param myDoc The document or form to attach to.
-     */
-    export function watch(myWin: Window, myDoc: Document | HTMLFormElement): void;
-    /**
-     * Attaches keyboardJS to the current window and a specific document or form.
-     * @param myDoc The document or form to attach to.
-     */
-    export function watch(myDoc: Document | HTMLFormElement): void;
-    /**
-     * Attaches keyboardJS to the current window an document.
-     */
-    export function watch(): void;
-
-    /**
-     * Detaches KeyboardJS from the window and document/element
-     */
-    export function stop(): void;
-}
-
-declare module 'keyboardjs' {
-    export = keyboardjs;
-}
diff --git a/keyboardjs/tsconfig.json b/keyboardjs/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/keyboardjs/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/keymaster/keymaster.d.ts b/keymaster/index.d.ts
similarity index 100%
rename from keymaster/keymaster.d.ts
rename to keymaster/index.d.ts
diff --git a/keymaster/keymaster-tests.ts b/keymaster/keymaster-tests.ts
index 4c7cf3c5b7..067f67dc39 100644
--- a/keymaster/keymaster-tests.ts
+++ b/keymaster/keymaster-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="keymaster.d.ts" />
+
 
 // simple key binding without scope
 key('shift+a', function (keyboardEvent: KeyboardEvent, keymasterEvent: KeymasterEvent) {
diff --git a/keymaster/tsconfig.json b/keymaster/tsconfig.json
new file mode 100644
index 0000000000..3eea94f1e2
--- /dev/null
+++ b/keymaster/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "keymaster-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/keypress/keypress.d.ts b/keypress/index.d.ts
similarity index 100%
rename from keypress/keypress.d.ts
rename to keypress/index.d.ts
diff --git a/keypress/keypress-tests.ts b/keypress/keypress-tests.ts
index fbe9124e7a..d5e0ec58ce 100644
--- a/keypress/keypress-tests.ts
+++ b/keypress/keypress-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="keypress.d.ts"/>
-
 namespace KeypressComboTests {
     var listener = new window.keypress.Listener();
 
diff --git a/keypress/tsconfig.json b/keypress/tsconfig.json
new file mode 100644
index 0000000000..f5f622f9b3
--- /dev/null
+++ b/keypress/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "keypress-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/keytar/index.d.ts b/keytar/index.d.ts
new file mode 100644
index 0000000000..12dbd63316
--- /dev/null
+++ b/keytar/index.d.ts
@@ -0,0 +1,59 @@
+// Type definitions for keytar 3.0.0
+// Project: http://atom.github.io/node-keytar/
+// Definitions by: Milan Burda <https://github.com/miniak/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/**
+ * Get the stored password for the service and account.
+ *
+ * @param service The string service name.
+ * @param account The string account name.
+ *
+ * @returns the string password or null on failures.
+ */
+export declare function getPassword(service: string, account: string): string;
+
+/**
+ * Add the password for the service and account to the keychain.
+ *
+ * @param service The string service name.
+ * @param account The string account name.
+ * @param password The string password.
+ *
+ * @returns true on success, false on failure.
+ */
+export declare function addPassword(service: string, account: string, password: string): boolean;
+
+/**
+ * Delete the stored password for the service and account.
+ *
+ * @param service The string service name.
+ * @param account The string account name.
+ *
+ * @returns the string password or null on failures.
+ */
+export declare function deletePassword(service: string, account: string): string;
+
+/**
+ * Replace the password for the service and account in the keychain.
+ *
+ * This is a simple convenience function that internally calls deletePassword(service, account)
+ * followed by addPassword(service, account, password).
+ *
+ * @param service The string service name.
+ * @param account The string account name.
+ * @param password The string password.
+ *
+ * @returns true on success, false on failure.
+ */
+export declare function replacePassword(service: string, account: string, password: string): boolean;
+
+/**
+ * Find a password for the service in the keychain.
+ *
+ * @param service The string service name.
+ *
+ * @returns the string password or null on failures.
+ */
+export declare function findPassword(service: string): string;
diff --git a/keytar/keytar-tests.ts b/keytar/keytar-tests.ts
index 1ad9006c62..91a43ebbe9 100644
--- a/keytar/keytar-tests.ts
+++ b/keytar/keytar-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="keytar.d.ts" />
 
 import keytar = require('keytar');
 
diff --git a/keytar/keytar.d.ts b/keytar/keytar.d.ts
deleted file mode 100644
index 85b444754d..0000000000
--- a/keytar/keytar.d.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-// Type definitions for keytar 3.0.0
-// Project: http://atom.github.io/node-keytar/
-// Definitions by: Milan Burda <https://github.com/miniak/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'keytar' {
-    /**
-     * Get the stored password for the service and account.
-     *
-     * @param service The string service name.
-     * @param account The string account name.
-     *
-     * @returns the string password or null on failures.
-     */
-    export function getPassword(service: string, account: string): string;
-
-    /**
-     * Add the password for the service and account to the keychain.
-     *
-     * @param service The string service name.
-     * @param account The string account name.
-     * @param password The string password.
-     *
-     * @returns true on success, false on failure.
-     */
-    export function addPassword(service: string, account: string, password: string): boolean;
-
-    /**
-     * Delete the stored password for the service and account.
-     *
-     * @param service The string service name.
-     * @param account The string account name.
-     *
-     * @returns the string password or null on failures.
-     */
-    export function deletePassword(service: string, account: string): string;
-
-    /**
-     * Replace the password for the service and account in the keychain.
-     *
-     * This is a simple convenience function that internally calls deletePassword(service, account)
-     * followed by addPassword(service, account, password).
-     *
-     * @param service The string service name.
-     * @param account The string account name.
-     * @param password The string password.
-     *
-     * @returns true on success, false on failure.
-     */
-    export function replacePassword(service: string, account: string, password: string): boolean;
-
-    /**
-     * Find a password for the service in the keychain.
-     *
-     * @param service The string service name.
-     *
-     * @returns the string password or null on failures.
-     */
-    export function findPassword(service: string): string;
-}
diff --git a/keytar/tsconfig.json b/keytar/tsconfig.json
new file mode 100644
index 0000000000..fb9a0175b6
--- /dev/null
+++ b/keytar/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "keytar-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/kii-cloud-sdk/index.d.ts b/kii-cloud-sdk/index.d.ts
new file mode 100644
index 0000000000..970061e8d1
--- /dev/null
+++ b/kii-cloud-sdk/index.d.ts
@@ -0,0 +1,7797 @@
+// Type definitions for Kii Cloud SDK v2.4.3
+// Project: http://en.kii.com/
+// Definitions by: Kii Consortium <http://jp.kii.com/consortium/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace KiiCloud {
+    enum KiiACLAction {
+        KiiACLBucketActionCreateObjects,
+        KiiACLBucketActionQueryObjects,
+        KiiACLBucketActionDropBucket,
+        KiiACLObjectActionRead,
+        KiiACLObjectActionWrite,
+    }
+
+    export enum KiiSite {
+        US,
+        JP,
+        CN,
+        SG,
+        CN3
+    }
+
+    export enum KiiAnalyticsSite {
+        US,
+        JP,
+        CN,
+        SG,
+        CN3
+    }
+
+    enum KiiSocialNetworkName {
+        FACEBOOK = 1,
+        TWITTER = 2,
+        QQ = 3,
+        GOOGLEPLUS = 4,
+        RENREN = 5
+    }
+
+    type KiiSocialConnectOptions = {
+        access_token: string,
+        openID?: string
+    } | {
+        oauth_token: string,
+        oauth_token_secret: string
+    }
+
+    interface KiiSocialAccountInfo {
+        createdAt: number;
+        provider: KiiSocialNetworkName;
+        socialAccountId: string;
+    }
+
+    interface KiiThingFields {
+        /**
+         * thing identifier given by thing vendor.
+         */
+        _vendorThingID: string;
+
+        /**
+         * thing password given by thing vendor.
+         */
+        _password: string;
+
+        /**
+         * thing type given by thing vendor.
+         */
+        _thingType?: string;
+
+        /**
+         * vendor identifier given by thing vendor.
+         */
+        _vendor?: string;
+
+        /**
+         * firmware version given by thing vendor.
+         */
+        _firmwareVersion?: string;
+
+        /**
+         * lot identifier given by thing vendor.
+         */
+        _lot?: string;
+
+        /**
+         * product name given by thing vendor.
+         */
+        _productName?: string;
+
+        /**
+         * arbitrary string field.
+         */
+        _stringField1?: string;
+
+        /**
+         * arbitrary string field.
+         */
+        _stringField2?: string;
+
+        /**
+         * arbitrary string field.
+         */
+        _stringField3?: string;
+
+        /**
+         * arbitrary string field.
+         */
+        _stringField4?: string;
+
+        /**
+         * arbitrary string field.
+         */
+        _stringField5?: string;
+
+        /**
+         * arbitrary number field.
+         */
+        _numberField1?: number;
+
+        /**
+         * arbitrary number field.
+         */
+        _numberField2?: number;
+
+        /**
+         * arbitrary number field.
+         */
+        _numberField3?: number;
+
+        /**
+         * arbitrary number field.
+         */
+        _numberField4?: number;
+
+        /**
+         * arbitrary number field.
+         */
+        _numberField5?: number;
+
+        /**
+         * custom fields.
+         */
+        [name: string]: any;
+    }
+
+    type KiiACLSubject =
+        KiiGroup |
+        KiiUser |
+        KiiAnyAuthenticatedUser |
+        KiiAnonymousUser |
+        KiiThing;
+
+    interface APNSAlert {
+        title: string;
+        body: string;
+        "title-loc-key": string;
+        "title-loc-args": string[];
+        "action-loc-key": string;
+        "loc-key": string;
+        "loc-args": string[];
+        "launch-image": string;
+    }
+
+    interface identityData {
+        emailAddress?: string;
+        phoneNumber?: string;
+        username?: string;
+    }
+
+    interface KiiAccessTokenObject {
+        access_token: string;
+        expires_at: Date;
+    }
+
+    interface KiiGcmInstallationResponse {
+        installationID: string;
+    }
+
+    interface KiiMqttInstallationResponse {
+        installationID: string;
+        installationRegistrationID: string;
+    }
+
+    interface KiiMqttEndpoint {
+        installationID: string;
+        username: string;
+        password: string;
+        mqttTopic: string;
+        host: string;
+        "X-MQTT-TTL": number;
+        portTCP: number;
+        portSSL: number;
+        portWS: number;
+        portWSS: number;
+    }
+
+    /**
+     * The main SDK class
+     */
+    export class Kii {
+        /**
+         * Kii SDK Build Number
+         *
+         * @return current build number of the SDK
+         */
+        static getBuildNumber(): string;
+
+        /**
+         * Kii SDK Version Number
+         *
+         * @return current version number of the SDK
+         */
+        static getSDKVersion(): string;
+
+        /**
+         * Retrieve the current app ID
+         *
+         * @return The current app ID
+         */
+        static getAppID(): string;
+
+        /**
+         * Retrieve the current app key
+         *
+         * @return The current app key
+         */
+        static getAppKey(): string;
+
+        /**
+         * Set the access token lifetime in seconds.
+         *
+         * If you don't call this method or call it with 0, token won't be expired.
+         * Call this method if you like the access token to be expired
+         * after a certain period. Once called, token retrieved
+         * by each future authentication will have the specified lifetime.
+         * Note that, it will not update the lifetime of token received prior
+         * calling this method. Once expired, you have to login again to renew the token.
+         *
+         * @param expiresIn The life time of access token in seconds.
+         *
+         * @throws If specified expiresIn is negative.
+         * @throws If Kii has not been initialized
+         *
+         * @example
+         *     Kii.setAccessTokenExpiration(3600);
+         */
+        static setAccessTokenExpiration(expiresIn: number): void;
+
+        /**
+         * Returns access token lifetime in seconds.
+         *
+         * If access token lifetime has not set explicitly by {@link Kii.setAccessTokenExpiration(expiresIn)}, returns 0.
+         *
+         * @return access token lifetime in seconds.
+         *
+         * @throws If Kii has not been initialized
+         */
+        static getAccessTokenExpiration(): number;
+
+        /**
+         * Initialize the Kii SDK with a specific URL
+         *
+         * Should be the first Kii SDK action your application makes.
+         *
+         * @param appID The application ID found in your Kii developer console
+         * @param appKey The application key found in your Kii developer console
+         * @param site Can be one of the constants KiiSite.US, KiiSite.JP, KiiSite.CN or KiiSite.SG depending on your location.
+         * @param analyticsOption An object used for initializing KiiAnalytics, If not provided or invalid object provided, KiiAnalytics won't be initialized. If provided, it can be empty object or with analyticsOption.deviceId.<br> If provided, but deviceId is not provided, SDK generates a new deviceId and use it when upload events. It can be retrieved by {@link KiiAnalytics.getDeviceId()}. It is recommended to retrieve the deviceId and store it to identify the device properly.
+         *
+         * @example
+         *     // Disable KiiAnalytics
+         *     Kii.initializeWithSite("my-app-id", "my-app-key", KiiSite.JP);
+         *
+         *     // Enable KiiAnalytics with deviceId
+         *     var analyticsOption = { deviceId: "my-device-id" };
+         *     Kii.initializeWithSite("my-app-id", "my-app-key", KiiSite.JP, analyticsOption);
+         *
+         *     // Enable KiiAnalytics without deviceId
+         *     Kii.initializeWithSite("my-app-id", "my-app-key", KiiSite.JP, {});
+         */
+        static initializeWithSite(appID: string, appKey: string, site: KiiSite, analyticsOption?: any): void;
+
+        /**
+         * Initialize the Kii SDK
+         *
+         * Should be the first Kii SDK action your application makes.
+         * Meanwhile, Kii Analytics is initialized.
+         *
+         * @param appID The application ID found in your Kii developer console
+         * @param appKey The application key found in your Kii developer console
+         * @param analyticsOption An object used for initializing KiiAnalytics, If not provided or invalid object provided, KiiAnalytics won't be initialized. If provided, it can be empty object or with analyticsOption.deviceId. <br> If provided, but deviceId is not provided, SDK generates a new deviceId and use it when upload events. It can be retrieved by {@link KiiAnalytics.getDeviceId()}. It is recommended to retrieve the deviceId and store it to identify the device properly.
+         *
+         * @example
+         *     // Disable KiiAnalytics
+         *     Kii.initialize("my-app-id", "my-app-key");
+         *
+         *     // Enable KiiAnalytics with deviceId
+         *     var analyticsOption = { deviceId: "my-device-id" };
+         *     Kii.initialize("my-app-id", "my-app-key", analyticsOption);
+         *
+         *     // Enable KiiAnalytics without deviceId
+         *     Kii.initialize("my-app-id", "my-app-key", {});
+         */
+        static initialize(appID: string, appKey: string, analyticsOption?: any): void;
+
+        /**
+         * Creates a reference to a bucket for this app
+         *
+         *     <br><br>The bucket will be created/accessed within this app's scope
+         *
+         * @param bucketName The name of the bucket the app should create/access
+         *
+         * @return A working KiiBucket object
+         *
+         * @example
+         *         var bucket = Kii.bucketWithName("myBucket");
+         */
+        static bucketWithName(bucketName: string): KiiBucket;
+
+        /**
+         * Creates a reference to a　encrypted bucket for this app
+         *
+         *     <br><br>The bucket will be created/accessed within this app's scope
+         *
+         * @param bucketName The name of the bucket the app should create/access
+         *
+         * @return A working KiiEncryptedBucket object
+         *
+         * @example
+         *         var bucket = Kii.encryptedBucketWithName("myBucket");
+         */
+        static encryptedBucketWithName(bucketName: string): KiiBucket;
+
+        /**
+         * Creates a reference to a group with the given name
+         *
+         * @param groupName An application-specific group name
+         *
+         * @return A new KiiGroup reference
+         *
+         * @example
+         *         var group = new Kii.groupWithName("myGroup");
+         */
+        static groupWithName(groupName: string): KiiGroup;
+
+        /**
+         * Creates a reference to a group with the given name and a list of default members
+         *
+         * @param groupName An application-specific group name
+         * @param members An array of KiiUser objects to add to the group
+         *
+         * @return A new KiiGroup reference
+         *
+         * @example
+         *         var group = new KiiGroup.groupWithName("myGroup", members);
+         */
+        static groupWithNameAndMembers(groupName: string, members: KiiUser[]): KiiGroup;
+
+        /**
+         * Authenticate as app admin.
+         * <br><br>
+         * <b>This api call must not placed on code which can be accessed by browser.
+         * This api is intended to be used by server side code like Node.js.
+         * If you use this api in code accessible by browser, your application id and application secret could be stolen.
+         * Attacker will be act as appadmin and all the data in your application will be suffered.
+         * </b>
+         *
+         * @param clientId assigned to your application.
+         * @param clientSecret assigned to your application.
+         * @param callbacks The callback methods called when authentication succeeded/failed.
+         *
+         * @return return promise object.
+         *     <ul>
+         *       <li>fulfill callback function: function(adminContext). adminContext is a KiiAppAdminContext instance.</li>
+         *       <li>reject callback function: function(error). error is an Error instance.
+         *         <ul>
+         *           <li>error.message</li>
+         *         </ul>
+         *       </li>
+         *     </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     Kii.authenticateAsAppAdmin("your client id", "your client secret", {
+         *         success: function(adminContext) {
+         *             // adminContext : KiiAppAdminContext instance
+         *             // Operate entities with adminContext.
+         *         },
+         *         failure: function(error, statusCode) {
+         *             // Authentication failed.
+         *         }
+         *     );
+         *
+         *     // example to use Promise
+         *     Kii.authenticateAsAppAdmin("your client id", "your client secret").then(
+         *         function(adminContext) {　// fulfill callback function
+         *             // adminContext : KiiAppAdminContext instance
+         *             // Operate entities with adminContext.
+         *
+         *         },
+         *         function(error) { // reject callback function
+         *             // Authentication failed.
+         *             var errorString = error.message;
+         *         }
+         *     );
+         */
+        static authenticateAsAppAdmin(clientId: string, clientSecret: string, callbacks?: { success(adminContext: KiiAppAdminContext): any; failure(error: string, statusCode: number): any; }): Promise<KiiAppAdminContext>;
+
+        /**
+         * Instantiate KiiServerCodeEntry with specified entry name.
+         *
+         * @param entryName Name of the entry.
+         *
+         * @return KiiServerCodeEntry instance.
+         *
+         * @throws Thrown when entryName is invalid in the following cases:
+         *     <li>not type of string </li>
+         *     <li>empty string </li>
+         *     <li>invalid string. Valid entryName pattern is "[a-zA-Z][_a-zA-Z0-9]*$".</li>
+         *
+         * @example
+         *         var entry = Kii.serverCodeEntry("main");
+         */
+        static serverCodeEntry(entryName: string): KiiServerCodeEntry;
+
+        /**
+         * Instantiate serverCodeEntryWithVersion with specified entry name and version.
+         *
+         * @param entryName Name of the entry.
+         * @param version Version of the entry.
+         *
+         * @return KiiServerCodeEntry instance.
+         *
+         * @throws Thrown in the following cases: <br>
+         *     <li>entryName or version is not type of string </li>
+         *     <li>entryName or version is empty string </li>
+         *     <li>entryName is invalid string. Valid entryName pattern is "[a-zA-Z][_a-zA-Z0-9]*$".</li>
+         *
+         * @example
+         *         var entry = Kii.serverCodeEntryWithVersion("main", "gulsdf6ful8jvf8uq6fe7vjy6");
+         */
+        static serverCodeEntryWithVersion(entryName: string, version: string): KiiServerCodeEntry;
+
+        /**
+         * Instantiate topic belongs to application.
+         *
+         * @param topicName name of the topic. Must be a not empty string.
+         *
+         * @return topic instance.
+         */
+        static topicWithName(topicName: string): KiiTopic;
+
+        /**
+         * Gets a list of topics in app scope
+         *
+         * @param callbacks An object with callback methods defined
+         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success or fullfill callback of promise. If empty string or no string object is provided, this API regards no paginationKey specified.
+         *
+         * @return return promise object.
+         *     <ul>
+         *       <li>fulfill callback function: function(params). params is Array instance.
+         *         <ul>
+         *           <li>params[0] is array of KiiTopic instances.</li>
+         *           <li>params[1] is string of nextPaginationKey.</li>
+         *         </ul>
+         *       </li>
+         *       <li>reject callback function: function(error). error is an Error instance.
+         *         <ul>
+         *           <li>error.message</li>
+         *         </ul>
+         *       </li>
+         *     </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     Kii.listTopics({
+         *         success: function(topicList, nextPaginationKey) {
+         *             // do something with the result
+         *             for(var i=0; i&lt;topicList.length; i++){
+         *                 var topic = topicList[i];
+         *             }
+         *             if (nextPaginationKey != null) {
+         *                 Kii.listTopics({
+         *                     success: function(topicList, nextPaginationKey) {...},
+         *                     failure: function(anErrorString) {...}
+         *                 }, nextPaginationKey);
+         *             }
+         *         },
+         *         failure: function(anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use promise
+         *     Kii.listTopics().then(
+         *         function(params) {
+         *             var topicList = params[0];
+         *             var nextPaginationKey = params[1];
+         *             // do something with the result
+         *             for(var i=0; i&lt;topicList.length; i++){
+         *                 var topic = topicList[i];
+         *             }
+         *             if (nextPaginationKey != null) {
+         *                 Kii.listTopics(null, nextPaginationKey).then(
+         *                     function(params) {...},
+         *                     function(error) {...}
+         *                 );
+         *             }
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        static listTopics(callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; }, paginationKey?: string): Promise<[KiiTopic[], string]>;
+    }
+
+    /**
+     * Represents a KiiACL object
+     */
+    export class KiiACL {
+        /**
+         * Get the list of active ACLs associated with this object from the server
+         *
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *     <ul>
+         *       <li>fulfill callback function: function(params). params is Array instance.
+         *         <ul>
+         *           <li>params[0] is the KiiACL instance which this method was called on.</li>
+         *           <li>params[1] is array of KiiACLEntry instances.</li>
+         *         </ul>
+         *       </li>
+         *       <li>reject callback function: function(error). error is an Error instance.
+         *         <ul>
+         *           <li>error.target is the KiiACL instance which this method was called on.</li>
+         *           <li>error.message</li>
+         *         </ul>
+         *       </li>
+         *     </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var acl = . . .; // a KiiACL object
+         *     acl.listACLEntries({
+         *     	success: function(theACL, theEntries) {
+         *     		// do something
+         *     	},
+         *
+         *     	failure: function(theACL, anErrorString) {
+         *     		// do something with the error response
+         *     	}
+         *     });
+         *
+         *     // example to use Promise
+         *     var acl = . . .; // a KiiACL object
+         *     acl.listACLEntries().then(
+         *         function(params) { // fulfill callback function
+         *             var theACL = params[0];
+         *             var theEntries = params[1];
+         *             // do something
+         *         },
+         *         function(error) { // reject callback function
+         *             var theACL = error.target;
+         *             var anErrorString = error.message;
+         *         		// do something with the error response
+         *     });
+         */
+        listACLEntries(callbacks?: { success(theACL: KiiACL, theEntries: KiiACLEntry[]): any; failure(theACL: KiiACL, anErrorString: string): any; }): Promise<[KiiACL, KiiACLEntry[]]>;
+
+        /**
+         * Add a KiiACLEntry to the local object, if not already present. This does not explicitly grant any permissions, which should be done through the KiiACLEntry itself. This method simply adds the entry to the local ACL object so it can be saved to the server.
+         *
+         * @param entry The KiiACLEntry to add
+         *
+         * @throws If specified entry is not an instance of KiiACLEntry.
+         *
+         * @example
+         *     var aclEntry = . . .; // a KiiACLEntry object
+         *     var acl = . . .; // a KiiACL object
+         *     acl.putACLEntry(aclEntry);
+         */
+        putACLEntry(entry: KiiACLEntry): void;
+
+        /**
+         * Remove a KiiACLEntry to the local object. This does not explicitly revoke any permissions, which should be done through the KiiACLEntry itself. This method simply removes the entry from the local ACL object and will not be saved to the server.
+         *
+         * @param entry The KiiACLEntry to remove
+         *
+         * @throws If specified entry is not an instance of KiiACLEntry.
+         *
+         * @example
+         *     var aclEntry = . . .; // a KiiACLEntry object
+         *     var acl = . . .; // a KiiACL object
+         *     acl.removeACLEntry(aclEntry);
+         */
+        removeACLEntry(entry: KiiACLEntry): void;
+
+        /**
+         * Save the list of ACLEntry objects associated with this ACL object to the server
+         *
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *     <ul>
+         *       <li>fulfill callback function: function(theSavedACL). theSavedACL is KiiACL instance.</li>
+         *       <li>reject callback function: function(error). error is an Error instance.
+         *         <ul>
+         *           <li>error.target is the KiiACL instance which this method was called on.</li>
+         *           <li>error.message</li>
+         *         </ul>
+         *       </li>
+         *     </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var acl = . . .; // a KiiACL object
+         *     acl.save({
+         *         success: function(theSavedACL) {
+         *             // do something with the saved acl
+         *         },
+         *
+         *         failure: function(theACL, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var acl = . . .; // a KiiACL object
+         *     acl.save().then(
+         *         function(theSavedACL) { // fulfill callback function
+         *             // do something with the saved acl
+         *         },
+         *         function(error) { // reject callback function
+         *             var theACL = error.target;
+         *             var anErrorString = error.message;
+         *             // do something with the error response
+         *     });
+         */
+        save(callbacks?: { success(theSavedACL: KiiACL): any; failure(theACL: KiiACL, anErrorString: string): any; }): Promise<KiiACL>;
+    }
+
+    /**
+     * Represents a KiiACLEntry object
+     */
+    export class KiiACLEntry {
+        /**
+         * The action that is being permitted/restricted. Possible values:
+         * <br><br>
+         * KiiACLAction.KiiACLBucketActionCreateObjects,<br>
+         * KiiACLAction.KiiACLBucketActionQueryObjects,  <br>
+         * KiiACLAction.KiiACLBucketActionDropBucket,<br>
+         * KiiACLAction.KiiACLBucketActionReadObjects,<br>
+         * KiiACLAction.KiiACLObjectActionRead,<br>
+         * KiiACLAction.KiiACLObjectActionWrite,<br>
+         * KiiACLAction.KiiACLSubscribeToTopic,<br>
+         * KiiACLAction.KiiACLSendMessageToTopic
+         *
+         * @param value The action being permitted/restricted
+         *
+         * @throws If the value is not one of the permitted values
+         */
+        setAction(value: KiiACLAction): void;
+
+        /**
+         * Get the action that is being permitted/restricted in this entry
+         *
+         * @return
+         */
+        getAction(): KiiACLAction;
+
+        /**
+         * Set the subject to which the action/grant is being applied
+         *
+         * @param subject instance.
+         *
+         * @throws If the value is not one of the permitted values
+         */
+        setSubject(subject: KiiACLSubject): void;
+
+        /**
+         * Get the subject that is being permitted/restricted in this entry
+         *
+         * @return
+         */
+        getSubject<T extends KiiACLSubject>(): T;
+
+        /**
+         * Set whether or not the action is being permitted to the subject
+         *
+         * @param value true if the action is permitted, false otherwise
+         *
+         * @throws If the value is not a boolean type
+         */
+        setGrant(value: boolean): void;
+
+        /**
+         * Get whether or not the action is being permitted to the subject
+         *
+         * @return
+         */
+        getGrant(): boolean;
+
+        /**
+         * Create a KiiACLEntry object with a subject and action
+         *
+         * The entry will not be applied on the server until the KiiACL object is
+         * explicitly saved. This method simply returns a working KiiACLEntry with
+         * a specified subject and action.
+         *
+         * @param Subject to which the action/grant is being applied
+         * @param action One of the specified KiiACLAction values the
+         *   permissions is being applied to
+         *
+         * @return A KiiACLEntry object with the specified attributes
+         *
+         * @throws If specified subject is invalid.
+         * @throws If the specified action is invalid.
+         */
+        static entryWithSubject(Subject: KiiACLSubject, action: KiiACLAction): KiiACLEntry;
+    }
+
+    /**
+     * The main SDK class
+     */
+    export class KiiAnalytics {
+        /**
+         * Retrieve the current app ID
+         *
+         * @return The current app ID
+         */
+        static getAppID(): string;
+
+        /**
+         * Retrieve the current app key
+         *
+         * @return The current app key
+         */
+        static getAppKey(): string;
+
+        /**
+         * Get the deviceId. If deviceId has not specified while initialization, it returns SDK generated deviceId.It is recommended to retrieve the deviceId and store it to identify the device properly.
+         *
+         * @return deviceId.
+         */
+        static getDeviceId(): string;
+
+        /**
+         * Is the SDK printing logs to the console?
+         *
+         * @return True if printing logs, false otherwise
+         */
+        static isLogging(): boolean;
+
+        /**
+         * Set the logging status of the SDK
+         *
+         *     Helpful for development - we strongly advice you turn off logging for any production code.
+         *
+         * @param True if logs should be printed, false otherwise
+         *
+         * @example
+         *         KiiAnalytics.setLogging(true);
+         */
+        static setLogging(True: boolean): void;
+
+        /**
+         *
+         *
+         * @deprecated Use {@link Kii.initializeWithSite} instead. Initialize the Kii SDK with a specific URL
+         *
+         *   Should be the first Kii SDK action your application makes
+         *
+         * @param appID The application ID found in your Kii developer console
+         * @param appKey The application key found in your Kii developer console
+         * @param site Can be one of the constants KiiAnalyticsSite.US, KiiAnalyticsSite.JP, KiiAnalyticsSite.CN, KiiAnalyticsSite.CN3 or KiiAnalyticsSite.SG depending on your location.
+         * @param deviceid If deviceId is not provided, SDK generates a new deviceId and use it when upload events.deviceId can be retrieved by {@link KiiAnalytics.getDeviceId()}.It is recommended to retrieve the deviceId and store it to identify the device properly.
+         *
+         * @example
+         *     // initialize without deviceId
+         *     Kii.initializeWithSite("my-app-id", "my-app-key", KiiAnalyticsSite.JP);
+         *     // initialize with deviceId
+         *     Kii.initializeWithSite("my-app-id", "my-app-key", KiiAnalyticsSite.JP, "my-device-id");
+         */
+        static initializeWithSite(appID: string, appKey: string, site: KiiAnalyticsSite, deviceid: string): void;
+
+        /**
+         *
+         *
+         * @deprecated Use {@link Kii.initialize} instead. Initialize the KiiAnalytics SDK
+         *
+         *   Should be the first KiiAnalytics SDK action your application makes
+         *
+         * @param appID The application ID found in your Kii developer console
+         * @param appKey The application key found in your Kii developer console
+         * @param deviceid If deviceId is not provided, SDK generates a new deviceId and use it when upload events. deviceId can be retrieved by {@link KiiAnalytics.getDeviceId()}.It is recommended to retrieve the deviceId and store it to identify the device properly.
+         *
+         * @example
+         *     // initialize without deviceId
+         *     Kii.initializeWithSite("my-app-id", "my-app-key", KiiAnalyticsSite.JP);
+         *     // initialize with deviceId
+         *     Kii.initializeWithSite("my-app-id", "my-app-key", KiiAnalyticsSite.JP, "my-device-id");
+         */
+        static initialize(appID: string, appKey: string, deviceid: string): void;
+
+        /**
+         * Utilize the KiiAnalytics logger to track SDK-specific actions
+         *
+         *     Helpful for development - we strongly advice you turn off logging for any production code.
+         *
+         * @param message The message to print to console.log in your browser
+         *
+         * @example
+         *         KiiAnalytics.logger("My message");
+         */
+        static logger(message: string): void;
+
+        /**
+         * Log a single event to be uploaded to KiiAnalytics
+         *
+         * Use this method if you'd like to track an event by name only. If you'd like to track other attributes/dimensions, please use KiiAnalytics.trackEventWithExtras(eventName, parameters)
+         *
+         * @param eventName A string representing the event name for later tracking
+         *
+         * @return return promise object.
+         *     <ul>
+         *       <li>fulfill callback function: function(). No parameters. </li>
+         *       <li>reject callback function: function(error). error is an Error instance.
+         *         <ul>
+         *           <li>error.message</li>
+         *         </ul>
+         *       </li>
+         *     </ul>
+         */
+        static trackEvent(eventName: string): Promise<void>;
+
+        /**
+         * Log a single event to be uploaded to KiiAnalytics
+         *
+         * Use this method if you'd like to track an event by name and add extra information to the event.
+         *
+         * @param eventName A string representing the event name for later tracking
+         * @param extras A dictionary of JSON-encodable key/value pairs to be attached to the event.
+         *   Key must follow the pattern "^[a-zA-Z][a-zA-Z0-9_]{0,63}$".Supported value type is string, number, boolean and array.
+         *   Empty string or empty array will be considered as invalid.Type of array elements must be string, number or boolean.
+         *   If any key/value pair is invalid, it will be ignored and not sent to the KiiCloud.
+         *
+         * @return return promise object.
+         *     <ul>
+         *       <li>fulfill callback function: function(). No parameters. </li>
+         *       <li>reject callback function: function(error). error is an Error instance.
+         *         <ul>
+         *           <li>error.message</li>
+         *         </ul>
+         *       </li>
+         *     </ul>
+         */
+        static trackEventWithExtras(eventName: string, extras: any): Promise<void>;
+
+        /**
+         * Log a single event to be uploaded to KiiAnalytics
+         *
+         * Use this method if you'd like to track an event asynchronously by name and add extra information to the event.
+         *
+         * @param eventName A string representing the event name for later tracking
+         * @param extras A dictionary of JSON-encodable key/value pairs to be attached to the event.
+         *   Key must follow the pattern "^[a-zA-Z][a-zA-Z0-9_]{0,63}$".Supported value type is string, number, boolean and array.
+         *   Empty string or empty array will be considered as invalid.Type of array elements must be string, number or boolean.
+         *   If any key/value pair is invalid, it will be ignored and not sent to the KiiCloud.
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *     <ul>
+         *       <li>fulfill callback function: function(). No parameters. </li>
+         *       <li>reject callback function: function(error). error is an Error instance.
+         *         <ul>
+         *           <li>error.message</li>
+         *         </ul>
+         *       </li>
+         *     </ul>
+         */
+        static trackEventWithExtrasAndCallbacks(eventName: string, extras: any, callbacks?: { success(): any; failure(error: Error): any; }): Promise<void>;
+
+        /**
+         *
+         *
+         * @deprecated Set a custom API endpoint URL
+         *
+         * @param url A string containing the desired endpoint
+         */
+        static setBaseURL(url: string): void;
+
+        /**
+         *
+         *
+         * @deprecated Use {@link Kii.getSDKVersion} instead. Kii Analytics SDK Version Number
+         *
+         * @return current version number of the SDK
+         */
+        static getSDKVersion(): string;
+    }
+
+    /**
+     * Represent an anonymous user for setting the ACL of an object. This will include anyone using the application but have not signed up or authenticated as registered user.
+     *
+     * 	When retrieving ACL from an object, test for this class to determine the subject type.
+     */
+    export class KiiAnonymousUser {
+        /**
+         * Returns the ID of Anonymous user.
+         */
+        getID(): string;
+    }
+
+    /**
+     * Represent any authenticated user for setting the ACL of an object. This will include anyone using the application who has registered and authenticated in the current session.
+     *
+     * 	When retrieving ACL from an object, test for this class to determine the subject type. Example:
+     */
+    export class KiiAnyAuthenticatedUser {
+        /**
+         * Returns the ID of AuthenticatedUser user.
+         */
+        getID(): string;
+    }
+
+    /**
+     * represents the app admin context
+     * <br><br>
+     * <B>This class must not referred from code accessible from browser.
+     * This class is intended to be used by server side code like Node.js.
+     * If you use this class in code accessible by browser, your application client id and client secret could be stolen.
+     * Attacker will be act as application admin and all the data in your application will be suffered.
+     * </B>
+     * Application administrator context. Entities obtained from this class will be manipulated by application admin.
+     */
+    export class KiiAppAdminContext {
+        /**
+         * Creates a reference to a bucket operated by app admin.
+         *     <br><br>The bucket will be created/accessed within this app's scope
+         *
+         * @param bucketName The name of the bucket the app should create/access
+         *
+         * @return A working KiiBucket object
+         *
+         * @example
+         *         Kii.authenticateAsAppAdmin("client-id", "client-secret", {
+         *             success: function(adminContext) {
+         *                 var bucket = adminContext.bucketWithName("myBucket");
+         *                 // KiiBucket operation by app admin is available now.
+         *             },
+         *             failure: function(errorString, errorCode) {
+         *                 // auth failed.
+         *             }
+         *         });
+         */
+        bucketWithName(bucketName: string): KiiBucket;
+
+        /**
+         * Creates a reference to a encrypted bucket operated by app admin.
+         *     <br><br>The bucket will be created/accessed within this app's scope
+         *
+         * @param bucketName The name of the bucket the app should create/access
+         *
+         * @return A working KiiBucket object
+         *
+         * @example
+         *         Kii.authenticateAsAppAdmin("client-id", "client-secret", {
+         *             success: function(adminContext) {
+         *                 var bucket = adminContext.encryptedBucketWithName("myBucket");
+         *                 // KiiBucket operation by app admin is available now.
+         *             },
+         *             failure: function(errorString, errorCode) {
+         *                 // auth failed.
+         *             }
+         *         });
+         */
+        encryptedBucketWithName(bucketName: string): KiiBucket;
+
+        /**
+         * Creates a reference to a group operated by app admin.
+         *     <br><br>
+         *     <b>Note:</b>
+         *     Returned instance from this API can not operate existing KiiGroup.<br>
+         *     If you want to operate existing KiiGroup, please use {@link KiiAppAdminContext#groupWithURI} or {@link KiiAppAdminContext#groupWithID}.
+         *
+         * @param group name.
+         *
+         * @return A working KiiGroup object
+         *
+         * @example
+         *         Kii.authenticateAsAppAdmin("client-id", "client-secret", {
+         *             success: function(adminContext) {
+         *                 var group = adminContext.groupWithName("newGroup");
+         *                 // KiiGroup operation by app admin is available now.
+         *             },
+         *             failure: function(errorString, errorCode) {
+         *                 // auth failed.
+         *             }
+         *         });
+         */
+        groupWithName(group: string): KiiGroup;
+
+        /**
+         * Creates a reference to a user operated by app admin.
+         *
+         * @param user id.
+         *
+         * @return A working KiiUser object
+         *
+         * @example
+         *         Kii.authenticateAsAppAdmin("client-id", "client-secret", {
+         *             success: function(adminContext) {
+         *                 var user = adminContext.userWithID("userid");
+         *                 // KiiUser operation by app admin is available now.
+         *             },
+         *             failure: function(errorString, errorCode) {
+         *                 // auth failed.
+         *             }
+         *         });
+         */
+        userWithID(user: string): KiiUser;
+
+        /**
+         * Creates a reference to an object operated by app admin using object`s URI.
+         *
+         * @param object URI.
+         *
+         * @return A working KiiObject instance
+         *
+         * @throws If the URI is null, empty or does not have correct format.
+         */
+        objectWithURI(object: string): KiiObject;
+
+        /**
+         * Creates a reference to a group operated by app admin using group's ID.
+         *     <br><br>
+         *     <b>Note:</b>
+         *     Returned instance from this API can operate existing KiiGroup.<br>
+         *     If you want to create a new KiiGroup, please use {@link KiiAppAdminContext#groupWithName}.
+         *
+         * @param group ID.
+         *
+         * @return A working KiiGroup object
+         *
+         * @throws Thrown if passed groupID is null or empty.
+         *
+         * @example
+         *         Kii.authenticateAsAppAdmin("client-id", "client-secret", {
+         *             success: function(adminContext) {
+         *                 var groupID = "0123456789abcdefghijklmno";
+         *                 var group = adminContext.groupWithID(groupID);
+         *                 // KiiGroup operation by app admin is available now.
+         *             },
+         *             failure: function(errorString, errorCode) {
+         *                 // auth failed.
+         *             }
+         *         });
+         */
+        groupWithID(group: string): KiiGroup;
+
+        /**
+         * Register new group own by specified user on Kii Cloud with specified ID.
+         * This method can be used only by app admin.
+         *
+         * <br><br>If the group that has specified id already exists, registration will be failed.
+         *
+         * @param groupID ID of the KiiGroup
+         * @param groupName Name of the KiiGroup
+         * @param user id of owner
+         * @param members An array of KiiUser objects to add to the group
+         * @param callbacks
+         *
+         * @return return promise object.
+         *       <ul>
+         *         <li>fulfill callback function: function(theSavedGroup). theSavedGroup is KiiGroup instance.</li>
+         *         <li>reject callback function: function(error). error is an Error instance.
+         *           <ul>
+         *             <li>error.target is the KiiGroup instance which this method was called on.</li>
+         *             <li>error.message</li>
+         *             <li>error.addMembersArray is array of KiiUser to be added as memebers of this group.</li>
+         *             <li>error.removeMembersArray is array of KiiUser to be removed from the memebers list of this group.</li>
+         *           </ul>
+         *         </li>
+         *       </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     Kii.authenticateAsAppAdmin("client-id", "client-secret", {
+         *         success: function(adminContext) {
+         *             var members = [];
+         *             members.push(KiiUser.userWithID("Member User Id"));
+         *             adminContext.registerGroupWithOwnerAndID("Group ID", "Group Name", "Owner User ID", members, {
+         *                 success: function(theSavedGroup) {
+         *                     // do something with the saved group
+         *                 },
+         *                 failure: function(theGroup, anErrorString, addMembersArray, removeMembersArray) {
+         *                     // do something with the error response
+         *                 }
+         *             });
+         *         },
+         *         failure: function(errorString, errorCode) {
+         *             // auth failed.
+         *         }
+         *     });
+         *     // example to use Promise
+         *     Kii.authenticateAsAppAdmin("client-id", "client-secret").then(
+         *         function(adminContext) {
+         *             var members = [];
+         *             members.push(KiiUser.userWithID("Member User Id"));
+         *             return adminContext.registerGroupWithOwnerAndID("Group ID", "Group Name", "Owner User ID", members);
+         *         }
+         *     ).then(
+         *         function(group) {
+         *             // do something with the saved group
+         *         }
+         *     );
+         */
+        registerGroupWithOwnerAndID(groupID: string, groupName: string, user: string, members: KiiUser[], callbacks?: { success(adminContext: KiiAppAdminContext): any; failure(theGroup: KiiGroup, anErrorString: string, addMembersArray: KiiUser[], removeMembersArray: KiiUser[]): any; }): Promise<KiiAppAdminContext>;
+
+        /**
+         * Creates a reference to a group operated by app admin using group's URI.
+         *     <br><br>
+         *     <b>Note:</b>
+         *     Returned instance from this API can operate existing KiiGroup.<br>
+         *     If you want to create a new KiiGroup, please use {@link KiiAppAdminContext#groupWithName}.
+         *
+         * @param group URI.
+         *
+         * @return A working KiiGroup object
+         *
+         * @throws Thrown if the URI is null, empty or does not have correct format.
+         *
+         * @example
+         *         Kii.authenticateAsAppAdmin("client-id", "client-secret", {
+         *             success: function(adminContext) {
+         *                 var groupUri = ...; // KiiGroup's URI
+         *                 var group = adminContext.groupWithURI(groupUri);
+         *                 // KiiGroup operation by app admin is available now.
+         *             },
+         *             failure: function(errorString, errorCode) {
+         *                 // auth failed.
+         *             }
+         *         });
+         */
+        groupWithURI(group: string): KiiGroup;
+
+        /**
+         * Find registered KiiUser with the email.<br>
+         * If there are no user registers with the specified email or if there are but not verified email yet,
+         * callbacks.failure or reject callback of promise will be called.<br>
+         * If the email is null or empty, callbacks.failure or reject callback of promise will be callded.
+         * <br><br>
+         * <b>Note:</b>
+         * <ul>
+         * <li>If "Expose Full User Data To Others" is enabled in the application console, the response will contain full of the user data.</li>
+         * <li>Otherwise, the response will only contain "userID", "loginName" and "displayName" field values if exist.</li>
+         * </ul>
+         *
+         * @param email The email to find KiiUser who owns it.<br>
+         *   Don't add prefix of "EMAIL:" described in REST API documentation. SDK will take care of it.
+         * @param callbacks An object with callback methods defined.
+         *   This argument is mandatory and can't be omitted.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is Array instance.
+         *       <ul>
+         *         <li>params[0] is a KiiAppAdminContext instance which this method was called on.</li>
+         *         <li>params[1] is a found KiiUser instance.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is a KiiAppAdminContext instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     Kii.authenticateAsAppAdmin("client-id", "client-secret", {
+         *         success: function(adminContext) {
+         *             adminContext.findUserByEmail("user_to_find@example.com", {
+         *                 success: function(adminContext, theMatchedUser) {
+         *                     // Do something with the found user
+         *                 },
+         *                 failure: function(adminContext, anErrorString) {
+         *                     // Do something with the error response
+         *                 }
+         *             });
+         *         },
+         *         failure: function(errorString, errorCode) {
+         *             // Auth failed.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     Kii.authenticateAsAppAdmin("client-id", "client-secret").then(
+         *         function(adminContext) {
+         *             adminContext.findUserByEmail("user_to_find@example.com").then(
+         *                 function(params) { // fullfill callback function
+         *                     var adminContext = params[0];
+         *                     var theMatchedUser = params[1];
+         *                     // Do something with the found user
+         *                 },
+         *                 function(error) { // reject callback function
+         *                     var adminContext = error.target;
+         *                     var anErrorString = error.message;
+         *                     // Do something with the error response
+         *                 }
+         *             );
+         *         },
+         *         function(error) {
+         *           // Auth failed.
+         *         }
+         *     );
+         */
+        findUserByEmail(email: string, callbacks?: { success(adminContext: KiiAppAdminContext, theMatchedUser: KiiUser): any; failure(adminContext: KiiAppAdminContext, anErrorString: string): any; }): Promise<[KiiAppAdminContext, KiiUser]>;
+
+        /**
+         * Find registered KiiUser with the phone.<br>
+         * If there are no user registers with the specified phone or if there are but not verified phone yet,
+         * callbacks.failure or reject callback of promise will be called.<br>
+         * If the phone is null or empty, callbacks.failure or reject callback of promise will be called.
+         * <br><br>
+         * <b>Note:</b>
+         * <ul>
+         * <li>If "Expose Full User Data To Others" is enabled in the application console, the response will contain full of the user data.</li>
+         * <li>Otherwise, the response will only contain "userID", "loginName" and "displayName" field values if exist.</li>
+         * </ul>
+         *
+         * @param phone The phone number to find KiiUser who owns it.<br>
+         *   Don't add prefix of "PHONE:" described in REST API documentation. SDK will take care of it.
+         * @param callbacks An object with callback methods defined.
+         *   This argument is mandatory and can't be omitted.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is Array instance.
+         *       <ul>
+         *         <li>params[0] is a KiiAppAdminContext instance which this method was called on.</li>
+         *         <li>params[1] is a found KiiUser instance.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is a KiiAppAdminContext instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     Kii.authenticateAsAppAdmin("client-id", "client-secret", {
+         *         success: function(adminContext) {
+         *             adminContext.findUserByPhone("phone_number_to_find", {
+         *                 success: function(adminContext, theMatchedUser) {
+         *                     // Do something with the found user
+         *                 },
+         *                 failure: function(adminContext, anErrorString) {
+         *                     // Do something with the error response
+         *                 }
+         *             });
+         *         },
+         *         failure: function(errorString, errorCode) {
+         *             // Auth failed.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     Kii.authenticateAsAppAdmin("client-id", "client-secret").then(
+         *         function(adminContext) {
+         *             adminContext.findUserByPhone("phone_number_to_find").then(
+         *                 function(params) { // fullfill callback function
+         *                     var adminContext = params[0];
+         *                     var theMatchedUser = params[1];
+         *                     // Do something with the found user
+         *                 },
+         *                 function(error) { // reject callback function
+         *                     var adminContext = error.target;
+         *                     var anErrorString = error.message;
+         *                     // Do something with the error response
+         *                 }
+         *             );
+         *         },
+         *         function(error) {
+         *           // Auth failed.
+         *         }
+         *     );
+         */
+        findUserByPhone(phone: string, callbacks?: { success(adminContext: KiiAppAdminContext, theMatchedUser: KiiUser): any; failure(adminContext: KiiAppAdminContext, anErrorString: string): any; }): Promise<[KiiAppAdminContext, KiiUser]>;
+
+        /**
+         * Find registered KiiUser with the user name.<br>
+         * If there are no user registers with the specified user name, callbacks.failure or reject callback of promise will be called.<br>
+         * If the user name is null or empty, callbacks.failure or reject callback of promise will be called.
+         * <br><br>
+         * <b>Note:</b>
+         * <ul>
+         * <li>If "Expose Full User Data To Others" is enabled in the application console, the response will contain full of the user data.</li>
+         * <li>Otherwise, the response will only contain "userID", "loginName" and "displayName" field values if exist.</li>
+         * </ul>
+         *
+         * @param username The user name to find KiiUser who owns it.<br>
+         *   Don't add prefix of "LOGIN_NAME:" described in REST API documentation. SDK will take care of it.
+         * @param callbacks An object with callback methods defined.
+         *   This argument is mandatory and can't be omitted.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is Array instance.
+         *       <ul>
+         *         <li>params[0] is a KiiAppAdminContext instance which this method was called on.</li>
+         *         <li>params[1] is a found KiiUser instance.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is a KiiAppAdminContext instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     Kii.authenticateAsAppAdmin("client-id", "client-secret", {
+         *         success: function(adminContext) {
+         *             adminContext.findUserByUsername("user_name_to_find", {
+         *                 success: function(adminContext, theMatchedUser) {
+         *                     // Do something with the found user
+         *                 },
+         *                 failure: function(adminContext, anErrorString) {
+         *                     // Do something with the error response
+         *                 }
+         *             });
+         *         },
+         *         failure: function(errorString, errorCode) {
+         *             // Auth failed.
+         *         }
+         *     });
+         *     // example to use Promise
+         *     Kii.authenticateAsAppAdmin("client-id", "client-secret").then(
+         *         function(adminContext) {
+         *             adminContext.findUserByUsername("user_name_to_find").then(
+         *                 function(params) { // fullfill callback function
+         *                     var adminContext = params[0];
+         *                     var theMatchedUser = params[1];
+         *                     // Do something with the found user
+         *                 },
+         *                 function(error) { // reject callback function
+         *                     var adminContext = error.target;
+         *                     var anErrorString = error.message;
+         *                     // Do something with the error response
+         *                 }
+         *             );
+         *         },
+         *         function(error) {
+         *           // Auth failed.
+         *         }
+         *     );
+         */
+        findUserByUsername(username: string, callbacks?: { success(adminContext: KiiAppAdminContext, theMatchedUser: KiiUser): any; failure(adminContext: KiiAppAdminContext, anErrorString: string): any; }): Promise<[KiiAppAdminContext, KiiUser]>;
+
+        /**
+         * Register thing by app admin.
+         * Method interface is same as {@link KiiThing#register()}.
+         * Please refer to KiiThing document for details.
+         *
+         * @param fields of the thing to be registered. Please refer to {@link KiiThing#register()} for the details of fields.
+         * @param callbacks object holds callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(thing). thing is KiiThing instance with adminToken.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // Assume you already have adminContext instance.
+         *     adminContext.registerThing(
+         *         {
+         *             _vendorThingID: "thing-XXXX-YYYY-ZZZZZ",
+         *             _password: "thing-password",
+         *             _thingType: "thermometer",
+         *             yourCustomObj: // Arbitrary key can be used.
+         *             { // Object, Array, Number, String can be used. Should be compatible with JSON.
+         *                 yourCustomKey1: "value",
+         *                 yourCustomKey2: 100
+         *             }
+         *         },
+         *         {
+         *             success: function(thing) {
+         *                 // Register Thing succeeded.
+         *                 // Operation using thing instance in the parameter
+         *                 // is authored by app admin.
+         *             },
+         *             failure: function(error) {
+         *                 // Handle error.
+         *             }
+         *         }
+         *     );
+         *
+         *     // example to use Promise
+         *     // Assume you already have adminContext instance.
+         *     adminContext.registerThing(
+         *         {
+         *             _vendorThingID: "thing-XXXX-YYYY-ZZZZZ",
+         *             _password: "thing-password",
+         *             _thingType: "thermometer",
+         *             yourCustomObj: // Arbitrary key can be used.
+         *             { // Object, Array, Number, String can be used. Should be compatible with JSON.
+         *                 yourCustomKey1: "value",
+         *                 yourCustomKey2: 100
+         *             }
+         *         }
+         *     ).then(
+         *         function(thing) {
+         *             // Register Thing succeeded.
+         *             // Operation using thing instance in the parameter
+         *             // is authored by app admin.
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        registerThing(fields: KiiThingFields, callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
+
+        /**
+         * Creates a reference to a thing operated by app admin.
+         *
+         * @param thing id.
+         *
+         * @return A working KiiThing object
+         *
+         * @example
+         *         // Assume you already have adminContext instance.
+         *         adminContext.thingWithID(thingID);
+         */
+        thingWithID(thing: string): KiiThing;
+
+        /**
+         * Register user/group as owner of specified thing by app admin.
+         *
+         * @param thingID The ID of thing
+         * @param owner instnce of KiiUser/KiiGroup to be registered as owner.
+         * @param callbacks object holds callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is an Array instance.
+         *       <ul>
+         *         <li>params[0] is a KiiUser/KiiGroup instance.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // assume thing/group is already registered.
+         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
+         *     // example to use Promise
+         *     // Assume you already have adminContext instance.
+         *     adminContext.registerOwnerWithThingID("th.xxxx-yyyy-zzzz", group, {
+         *         success: function(group) {
+         *             // Register owner succeeded.
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     // assume thing/group is already registered.
+         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
+         *     // example to use Promise
+         *     // Assume you already have adminContext instance.
+         *     adminContext.registerOwnerWithThingID("th.xxxx-yyyy-zzzz", group).then(
+         *         function(params) {
+         *             // Register owner succeeded.
+         *             var group = params[0];
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        registerOwnerWithThingID<T extends KiiUser | KiiGroup>(thingID: string, owner: T, callbacks?: { success(group: T): any; failure(error: Error): any; }): Promise<T>;
+
+        /**
+         * Register user/group as owner of specified thing by app admin.
+         *
+         * @param vendorThingID The vendor thing ID of thing
+         * @param owner instance of KiiUser/KiiGroupd to be registered as owner.
+         * @param callbacks object holds callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is an Array instance.
+         *       <ul>
+         *         <li>params[0] is a KiiUser/KiiGroup instance.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // assume thing/group is already registered.
+         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
+         *     // example to use Promise
+         *     // Assume you already have adminContext instance.
+         *     adminContext.registerOwnerWithVendorThingID("xxxx-yyyy-zzzz", group, {
+         *         success: function(group) {
+         *             // Register owner succeeded.
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     // assume thing/group is already registered.
+         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
+         *     // example to use Promise
+         *     // Assume you already have adminContext instance.
+         *     adminContext.registerOwnerWithVendorThingID("xxxx-yyyy-zzzz", group).then(
+         *         function(group) {
+         *             // Register owner succeeded.
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        registerOwnerWithVendorThingID<T extends KiiUser | KiiGroup>(vendorThingID: string, owner: T, callbacks?: { success(group: T): any; failure(error: Error): any; }): Promise<T>;
+
+        /**
+         * Load thing with vendor thing ID by app admin.
+         * Method interface is same as {@link KiiThing#loadWithVendorThingID()}.
+         * Please refer to KiiThing document for details.
+         *
+         * @param vendorThingID registered vendor thing id.
+         * @param callbacks object holds callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(thing). thing is KiiThing instance with adminToken.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // Assume you already have adminContext instance.
+         *     adminContext.loadThingWithVendorThingID("thing-xxxx-yyyy",{
+         *         success: function(thing) {
+         *             // Load succeeded.
+         *             // Operation using thing instance in the parameter
+         *             // is authored by app admin.
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     // Assume you already have adminContext instance.
+         *     adminContext.loadThingWithVendorThingID("thing-xxxx-yyyy").then(
+         *         function(thing) {
+         *             // Load succeeded.
+         *             // Operation using thing instance in the parameter
+         *             // is authored by app admin.
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        loadThingWithVendorThingID(vendorThingID: string, callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
+
+        /**
+         * Load thing with thing ID by app admin.
+         * Method interface is same as {@link KiiThing#loadWithThingID()}.
+         * Please refer to KiiThing document for details.
+         *
+         * @param thingID registered thing id.
+         * @param callbacks object holds callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(thing). thing is KiiThing instance with adminToken.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // Assume you already have adminContext instance.
+         *     adminContext.loadThingWithThingID("thing-xxxx-yyyy",{
+         *         success: function(thing) {
+         *             // Load succeeded.
+         *             // Operation using thing instance in the parameter
+         *             // is authored by app admin.
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     // Assume you already have adminContext instance.
+         *     adminContext.loadThingWithThingID("thing-xxxx-yyyy").then(
+         *         function(thing) {
+         *             // Load succeeded.
+         *             // Operation using thing instance in the parameter
+         *             // is authored by app admin.
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        loadThingWithThingID(thingID: string, callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
+
+        /**
+         * Creates a reference to a topic operated by app admin
+         *
+         * @param topicName name of the topic. Must be a not empty string.
+         *
+         * @return topic instance.
+         */
+        topicWithName(topicName: string): KiiTopic;
+
+        /**
+         * Gets a list of topics in app scope
+         *
+         * @param callbacks An object with callback methods defined
+         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success. If empty string or no string object is provided, this API regards no paginationKey specified.
+         *
+         * @return return promise object.
+         *     <ul>
+         *       <li>fulfill callback function: function(params). params is Array instance.
+         *         <ul>
+         *           <li>params[0] is array of KiiTopic instances.</li>
+         *           <li>params[1] is string of nextPaginationKey.</li>
+         *         </ul>
+         *       </li>
+         *       <li>reject callback function: function(error). error is an Error instance.
+         *         <ul>
+         *           <li>error.target is a KiiAppAdminContext instance which this method was called on.</li>
+         *           <li>error.message</li>
+         *         </ul>
+         *       </li>
+         *     </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // Assume you already have adminContext instance.
+         *     adminContext.listTopics({
+         *         success: function(topicList, nextPaginationKey) {
+         *             // do something with the result
+         *             for(var i=0; i&lt;topicList.length; i++){
+         *                 var topic = topicList[i];
+         *             }
+         *             if (nextPaginationKey != null) {
+         *                 Kii.listTopics({
+         *                     success: function(topicList, nextPaginationKey) {...},
+         *                     failure: function(anErrorString) {...}
+         *                 }, nextPaginationKey);
+         *             }
+         *         },
+         *         failure: function(anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     // Assume you already have adminContext instance.
+         *     adminContext.listTopics().then(
+         *         function(params) {
+         *             var topicList = params[0];
+         *             var nextPaginationKey = params[1];
+         *             // do something with the result
+         *             for(var i=0; i&lt;topicList.length; i++){
+         *                 var topic = topicList[i];
+         *             }
+         *             if (nextPaginationKey != null) {
+         *                 adminContext.listTopics(null, nextPaginationKey).then(
+         *                     function(params) {...},
+         *                     function(error) {...}
+         *                 );
+         *             }
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        listTopics(callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; }, paginationKey?: string): Promise<[KiiTopic[], string]>;
+    }
+
+    /**
+     * Represents a KiiBucket object
+     */
+    export class KiiBucket {
+        /**
+         * The name of this bucket
+         *
+         * @return
+         */
+        getBucketName(): string;
+
+        /**
+         * Create a KiiObject within the current bucket
+         *
+         * <br><br>The object will not be created on the server until the KiiObject is explicitly saved. This method simply returns an empty working KiiObject.
+         *
+         * @return An empty KiiObject with no specific type
+         *
+         * @example
+         *     var bucket = . . .; // a KiiBucket
+         *     var object = bucket.createObject();
+         */
+        createObject(): KiiObject;
+
+        /**
+         * Create a KiiObject within the current bucket, with type
+         *
+         * <br><br>The object will not be created on the server until the KiiObject is explicitly saved. This method simply returns an empty working KiiObject with a specified type. The type allows for better indexing and improved query results. It is recommended to use this method - but for lazy creation, the createObject method is also available.
+         *
+         * @param type A string representing the desired object type
+         *
+         * @return An empty KiiObject with specified type
+         *
+         * @example
+         *     var bucket = . . .; // a KiiBucket
+         *     var object = bucket.createObjectWithType("scores");
+         */
+        createObjectWithType(type: string): KiiObject;
+
+        /**
+         * Create a KiiObject within the current bucket, specifying its ID.
+         *
+         * <br><br> If the object has not exist on KiiCloud, {@link KiiObject#saveAllFields(callback)}
+         *   will create new Object which has ID specified in the argument.
+         *   If the object exist in KiiCloud, references the existing object which has
+         *   specified ID. use {@link KiiObject#refresh(callback)} to retrieve the contents of
+         *   KiiObject.
+         *
+         * @param objectID ID of the obeject you want to instantiate.
+         *
+         * @return KiiObject instance.
+         *
+         * @throws objectID is not acceptable.
+         *      Refer to {@link KiiObject.isValidObjectID(string)} for details of acceptable string.
+         *
+         * @example
+         *      var bucket = . . .; // KiiBucket
+         *      var object = bucket.createObjectWithID('__OBJECT_ID_');
+         */
+        createObjectWithID(objectID: string): KiiObject;
+
+        /**
+         * Get the ACL handle for this bucket
+         *
+         * <br><br>Any KiiACLEntry objects added or revoked from this ACL object will be appended to/removed from the server on ACL save.
+         *
+         * @return A KiiACL object associated with this KiiObject
+         *
+         * @example
+         *     	var bucket = . . .; // a KiiBucket
+         *     	var acl = bucket.acl();
+         */
+        acl(): KiiACL;
+
+        /**
+         * Perform a query on the given bucket
+         *
+         * <br><br>The query will be executed against the server, returning a result set.
+         *
+         * @param query An object with callback methods defined
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is Array instance.
+         *       <ul>
+         *         <li>params[0] is a performed KiiQuery instance.</li>
+         *         <li>params[1] is resultSet Array instance. Could be KiiObject, KiiGroup, KiiUser, etc.</li>
+         *         <li>params[2] is a KiiQuery instance for next query. If there are no more results to be retrieved, it will be null.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiBucket instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var bucket = . . .; // a KiiBucket
+         *     var queryObject = . . .; // a KiiQuery
+         *
+         *     // define the callbacks (stored in a variable for reusability)
+         *     var queryCallbacks = {
+         *         success: function(queryPerformed, resultSet, nextQuery) {
+         *             // do something with the results
+         *             for(var i=0; i&lt;resultSet.length; i++) {
+         *                 // do something with the object
+         *                 // resultSet[i]; // could be KiiObject, KiiGroup, KiiUser, etc
+         *             }
+         *
+         *             // if there are more results to be retrieved
+         *             if(nextQuery != null) {
+         *
+         *                 // get them and repeat recursively until no results remain
+         *                 bucket.executeQuery(nextQuery, queryCallbacks);
+         *             }
+         *         },
+         *
+         *         failure: function(bucket, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     };
+         *     bucket.executeQuery(queryObject, queryCallbacks);
+         *
+         *     // example to use Promise
+         *     var bucket = . . .; // a KiiBucket
+         *     var queryObject = . . .; // a KiiQuery
+         *     bucket.executeQuery(queryObject).then(
+         *         function(params) {
+         *             var queryPerformed = params[0];
+         *             var resultSet = params[1];
+         *             var nextQuery = params[2];
+         *             // do something with the results
+         *             for(var i=0; i&lt;resultSet.length; i++) {
+         *                 // do something with the object
+         *                 // resultSet[i]; // could be KiiObject, KiiGroup, KiiUser, etc
+         *             }
+         *
+         *             // if there are more results to be retrieved
+         *             if(nextQuery != null) {
+         *
+         *                 // get them and repeat recursively until no results remain
+         *                 bucket.executeQuery(nextQuery).then(
+         *                     function(params) {
+         *                         // next query success
+         *                     },
+         *                     function(error) {
+         *                         // next query failed, please handle the error
+         *                     }
+         *                 );
+         *             }
+         *
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        executeQuery<T>(query: KiiQuery, callbacks?: { success(queryPerformed: KiiQuery, resultSet: T[], nextQuery: KiiQuery): any; failure(bucket: KiiBucket, anErrorString: string): any; }): Promise<[KiiQuery, T[], KiiQuery]>;
+
+        /**
+         * Execute count aggregation of specified query on current bucket.
+         * Query that passed as nextQuery in success callback of {@link #executeQuery}, is not
+         * supported, callbacks.failure will be fired in this case.
+         *
+         * @param query to be executed. If null, the operation will be same as {@link #count}.
+         * @param callbacks An object with callback methods defined.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is Array instance.
+         *       <ul>
+         *         <li>params[0] is a KiiBucket instance which this method was called on.</li>
+         *         <li>params[1] is a KiiQuery instance.</li>
+         *         <li>params[2] is an integer count result. </li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiBucket instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var bucket = . . .; // a KiiBucket
+         *     var queryObject = . . .; // a KiiQuery
+         *
+         *     // define the callbacks
+         *     var callbacks = {
+         *         success: function(bucket, query, count) {
+         *             // do something with the results
+         *         },
+         *
+         *         failure: function(bucket, errorString) {
+         *             // error happened.
+         *         }
+         *     };
+         *
+         *     bucket.countWithQuery(queryObject, callbacks);
+         *
+         *     // example to use Promise
+         *     var bucket = . . .; // a KiiBucket
+         *     var queryObject = . . .; // a KiiQuery
+         *
+         *     bucket.countWithQuery(queryObject, callbacks).then(
+         *         function(params) {
+         *             var bucket = params[0];
+         *             var query = params[1];
+         *             var count = params[2];
+         *             // do something with the results
+         *         },
+         *         function(error) {
+         *             var bucket = error.target;
+         *             var errorString = error.message;
+         *             // error happened.
+         *         }
+         *     );
+         */
+        countWithQuery(query: KiiQuery, callbacks?: { success(bucket: KiiBucket, query: KiiQuery, count: number): any; failure(bucket: KiiBucket, errorString: string): any; }): Promise<[KiiBucket, KiiQuery, number]>;
+
+        /**
+         * Execute count aggregation of all clause query on current bucket.
+         *
+         * @param callbacks An object with callback methods defined.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is Array instance.
+         *       <ul>
+         *         <li>params[0] is a KiiBucket instance which this method was called on.</li>
+         *         <li>params[1] is a KiiQuery instance.</li>
+         *         <li>params[2] is an integer count result. </li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiBucket instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var bucket = . . .; // a KiiBucket
+         *     // define the callbacks
+         *     var callbacks = {
+         *         success: function(bucket, query, count) {
+         *             // do something with the results
+         *         },
+         *
+         *         failure: function(bucket, errorString) {
+         *             // error happened.
+         *         }
+         *     };
+         *
+         *     bucket.count(callbacks);
+         *
+         *     // example to use Promise
+         *     var bucket = . . .; // a KiiBucket
+         *     var queryObject = . . .; // a KiiQuery
+         *
+         *     bucket.count().then(
+         *         function(params) {
+         *             var bucket = params[0];
+         *             var count = params[2];
+         *             // do something with the results
+         *         },
+         *         function(error) {
+         *             var bucket = error.target;
+         *             var errorString = error.message;
+         *             // error happened.
+         *         }
+         *     );
+         */
+        count(callbacks?: { success(bucket: KiiBucket, query: KiiQuery, count: number): any; failure(bucket: KiiBucket, errorString: string): any; }): Promise<[KiiBucket, KiiQuery, number]>;
+
+        /**
+         * Delete the given bucket from the server
+         *
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(deletedBucket). deletedBucket is KiiBucket instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiBucket instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var bucket = . . .; // a KiiBucket
+         *     bucket.delete({
+         *         success: function(deletedBucket) {
+         *             // do something with the result
+         *         },
+         *
+         *         failure: function(bucketToDelete, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var bucket = . . .; // a KiiBucket
+         *     bucket.delete({
+         *         success: function(deletedBucket) {
+         *             // do something with the result
+         *         },
+         *
+         *         failure: function(bucketToDelete, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     }).then(
+         *         function(deletedBucket) {
+         *           // do something with the result
+         *         },
+         *         function(error) {
+         *           // do something with the error response
+         *         }
+         *     );
+         */
+        delete(callbacks?: { success(deletedBucket: KiiBucket): any; failure(bucketToDelete: KiiBucket, anErrorString: string): any; }): Promise<KiiBucket>;
+    }
+
+    /**
+     * Represents a KiiClause expression object
+     */
+    export class KiiClause {
+        /**
+         * Create a KiiClause with the AND operator concatenating multiple KiiClause objects
+         *
+         * @param A variable-length list of KiiClause objects to concatenate
+         *
+         * @example
+         *     KiiClause clause = KiiClause.and(clause1, clause2, clause3, . . .)
+         */
+        static and(...A: KiiClause[]): KiiClause;
+
+        /**
+         * Create a KiiClause with the OR operator concatenating multiple KiiClause objects
+         *
+         * @param A variable-length list of KiiClause objects to concatenate
+         *
+         * @example
+         *     KiiClause clause = KiiClause.or(clause1, clause2, clause3, . . .)
+         */
+        static or(...A: KiiClause[]): KiiClause;
+
+        /**
+         * Create an expression of the form (key == value)
+         *
+         * @param key The key to compare
+         * @param value the value to compare
+         */
+        static equals(key: string, value: any): KiiClause;
+
+        /**
+         * Create an expression of the form (key != value)
+         *
+         * @param key The key to compare
+         * @param value the value to compare
+         */
+        static notEquals(key: string, value: any): KiiClause;
+
+        /**
+         * Create an expression of the form (key > value)
+         *
+         * @param key The key to compare
+         * @param value the value to compare
+         */
+        static greaterThan(key: string, value: any): KiiClause;
+
+        /**
+         * Create an expression of the form (key >= value)
+         *
+         * @param key The key to compare
+         * @param value the value to compare
+         */
+        static greaterThanOrEqual(key: string, value: any): KiiClause;
+
+        /**
+         * Create an expression of the form (key < value)
+         *
+         * @param key The key to compare
+         * @param value the value to compare
+         */
+        static lessThan(key: string, value: any): KiiClause;
+
+        /**
+         * Create an expression of the form (key <= value)
+         *
+         * @param key The key to compare
+         * @param value the value to compare
+         */
+        static lessThanOrEqual(key: string, value: any): KiiClause;
+
+        /**
+         * Create an expression of the form (key in values)
+         *
+         * @param key The key to compare
+         * @param values to compare
+         */
+        static inClause(key: string, values: any[]): KiiClause;
+
+        /**
+         * Create an expression of the form (key STARTS WITH value)
+         *
+         * @param key The key to compare
+         * @param value the value to compare
+         */
+        static startsWith(key: string, value: any): KiiClause;
+
+        /**
+         * Create a clause of geo distance. This clause inquires objects in the specified circle.
+         *
+         * @param key Name of the key to inquire, which holds geo point.
+         * @param center Geo point which specify center of the circle.
+         * @param radius Radius of the circle. unit is meter. value should be in range of ]0, 20000000]
+         * @param putDistanceInto Used for retrieve distance from the center from the query result.Must match the pattern "^[a-zA-Z_][a-zA-Z0-9_]*$".
+         *   If the specified value is null, query result will not contain the distance.
+         *   <b>Note:</b> You can get the results in ascending order of distances from center. To do so, build the orderBy field  by
+         *   "_calculated.{specified value of putDistanceInto}" and pass it in {@link KiiQuery#sortByAsc}. Note that, descending order
+         *   of distances is not supported. The unit of distance is meter.
+         *
+         * @return KiiClaluse reference.
+         *
+         * @throws <li> Specified key is not a string or an empty string.</li>
+         *             <li>center is not an object of KiiGeoPoint.</li>
+         *             <li>putDistanceInto is not a string or an empty string.</li>
+         *
+         * @example
+         *             var putDistanceInto = "distanceFromCurrentLoc";
+         *             var currentLoc = ..; // current location
+         *             var clause = KiiClause.geoDistance("location", currentLoc, 4000, putDistanceInto);
+         *             var query = KiiQuery.queryWithClause(clause);
+         *             // Sort by distances by ascending order.(Optional, use only if you intend to retrieve the distances in a ascending order).
+         *             var orderByKey = "_calculated." + putDistanceInto;
+         *             query.sortByAsc(orderByKey);
+         *             // Define the callbacks
+         *             var bucket = Kii.bucketWithName("MyBucket");
+         *             var queryCallback = {
+         *                 success: function(queryPerformed, resultSet, nextQuery) {
+         *                     // check the first object from resultSet.
+         *                     var object = resultSet[0];
+         *                     var point = object.get("location");
+         *                     var distanceToMyLocation = object.get("_calculated")[putDistanceInto];
+         *                 },
+         *                 failure: function(queryPerformed, anErrorString) {
+         *                     // do something with the error response
+         *                 }
+         *             };
+         *             bucket.executeQuery(query, queryCallback);
+         */
+        static geoDistance(key: string, center: KiiGeoPoint, radius: number, putDistanceInto: string): KiiClause;
+
+        /**
+         * Create a clause of geo box. This clause inquires objects in the specified rectangle.
+         *     Rectangle would be placed parallel to the equator with specified coordinates of the corner.
+         *
+         * @param key Key to inquire which holds geo point.
+         * @param northEast North-Eest corner of the rectangle.
+         * @param southWest South-Wast corner of the rectangle.
+         *
+         * @return KiiClause reference.
+         *
+         * @throws <li> Specified key is not a string or is an empty string.</li>
+         *             <li>northEast or southWest is not a reference of KiiGeoPoint.</li>
+         */
+        static geoBox(key: string, northEast: KiiGeoPoint, southWest: KiiGeoPoint): KiiClause;
+    }
+
+    /**
+     * Represents Geo Point.
+     */
+    export class KiiGeoPoint {
+        /**
+         * Return the latitide of this point.
+         */
+        getLatitude(): number;
+
+        /**
+         * Return the longitude of this point.
+         */
+        getLongitude(): number;
+
+        /**
+         * Create a geo point with the given latitude and longitude.
+         *
+         * @param latitude Latitude of the point in degrees. Valid if the value is greater than -90 degrees and less than +90 degrees.
+         * @param longitude Longitude of the point in degrees. Valid if the value is greater than -180 degrees and less than +180 degrees.
+         *
+         * @return A new reference of KiiGeoPoint.
+         *
+         * @throws Specified latitude or longitude is invalid.
+         *
+         * @example
+         *         var point = KiiGeoPoint.geoPoint(35.07, 139.02);
+         */
+        static geoPoint(latitude: number, longitude: number): KiiGeoPoint;
+    }
+
+    /**
+     * Represents a KiiGroup object
+     */
+    export class KiiGroup {
+        /**
+         *
+         *
+         * @deprecated Use {@link KiiGroup.getId} instead.
+         *   Get the UUID of the given group, assigned by the server
+         *
+         * @return
+         */
+        getUUID(): string;
+
+        /**
+         * Get the ID of the current KiiGroup instance.
+         *
+         * @return Id of the group or null if the group has not saved to cloud.
+         */
+        getID(): string;
+
+        /**
+         * The name of this group
+         *
+         * @return
+         */
+        getName(): string;
+
+        /**
+         * Returns the owner of this group if this group holds the information of owner.
+         *
+         * Group will holds the information of owner when "saving group on cloud" or "retrieving group info/owner from cloud".
+         * The cache will not be shared among the different instances of KiiGroup.
+         * <UL>
+         * <LI>This API will not access to server.
+         * To update the group owner information on cloud, please call {@link KiiGroup#refresh} or {@link KiiGroup#getOwner}.
+         * </LI>
+         * <LI>This API does not return all the properties of the owner.
+         * To get all owner properties, {@link KiiUser#refresh} is necessary.</LI>
+         * </UL>
+         *
+         * @return KiiUser who owns this group, undefined if this group doesn't hold the information of owner yet.
+         *
+         * @see KiiGroup#getOwner
+         */
+        getCachedOwner(): KiiUser;
+
+        /**
+         * Get a specifically formatted string referencing the group
+         *
+         * <br><br>The group must exist in the cloud (have a valid UUID).
+         *
+         * @return A URI string based on the current group. null if a URI couldn't be generated.
+         *
+         * @example
+         *     var group = . . .; // a KiiGroup
+         *     var uri = group.objectURI();
+         */
+        objectURI(): string;
+
+        /**
+         * Register new group own by current user on Kii Cloud with specified ID.
+         *
+         * <br><br>If the group that has specified id already exists, registration will be failed.
+         *
+         * @param groupID ID of the KiiGroup
+         * @param groupName Name of the KiiGroup
+         * @param members An array of KiiUser objects to add to the group
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *       <ul>
+         *         <li>fulfill callback function: function(theSavedGroup). theSavedGroup is KiiGroup instance.</li>
+         *         <li>reject callback function: function(error). error is an Error instance.
+         *           <ul>
+         *             <li>error.target is the KiiGroup instance which this method was called on.</li>
+         *             <li>error.message</li>
+         *             <li>error.addMembersArray is array of KiiUser to be added as memebers of this group.</li>
+         *             <li>error.removeMembersArray is array of KiiUser to be removed from the memebers list of this group.</li>
+         *           </ul>
+         *         </li>
+         *       </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var members = [];
+         *     members.push(KiiUser.userWithID("Member User Id"));
+         *     KiiGroup.registerGroupWithID("Group ID", "Group Name", members, {
+         *         success: function(theSavedGroup) {
+         *             // do something with the saved group
+         *         },
+         *         failure: function(theGroup, anErrorString, addMembersArray, removeMembersArray) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var members = [];
+         *     members.push(KiiUser.userWithID("Member User Id"));
+         *     KiiGroup.registerGroupWithID("Group ID", "Group Name", members).then(
+         *         function(theSavedGroup) {
+         *             // do something with the saved group
+         *         },
+         *         function(error) {
+         *             var theGroup = error.target;
+         *             var anErrorString = error.message;
+         *             var addMembersArray = error.addMembersArray;
+         *             // do something with the error response
+         *     });
+         */
+        static registerGroupWithID(groupID: string, groupName: string, members: KiiUser[], callbacks?: { success(theSavedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string, addMembersArray: KiiUser[], removeMembersArray: KiiUser[]): any; }): Promise<KiiGroup>;
+
+        /**
+         * Creates a reference to a bucket for this group
+         *
+         * <br><br>The bucket will be created/accessed within this group's scope
+         *
+         * @param bucketName The name of the bucket the user should create/access
+         *
+         * @return A working KiiBucket object
+         *
+         * @example
+         *     var group = . . .; // a KiiGroup
+         *     var bucket = group.bucketWithName("myBucket");
+         */
+        bucketWithName(bucketName: string): KiiBucket;
+
+        /**
+         * Creates a reference to a encrypted bucket for this group
+         *
+         * <br><br>The bucket will be created/accessed within this group's scope
+         *
+         * @param bucketName The name of the bucket the user should create/access
+         *
+         * @return A working KiiEncryptedBucket object
+         *
+         * @example
+         *     var group = . . .; // a KiiGroup
+         *     var bucket = group.encryptedBucketWithName("myBucket");
+         */
+        encryptedBucketWithName(bucketName: string): KiiBucket;
+
+        /**
+         * Adds a user to the given group
+         *
+         * <br><br>This method will NOT access the server immediately. You must call save to add the user on the server. This allows multiple users to be added/removed before calling save.
+         *
+         * @param member The user to be added to the group
+         *
+         * @example
+         *     var user = . . .; // a KiiUser
+         *     var group = . . .; // a KiiGroup
+         *     group.addUser(user);
+         *     group.save(callbacks);
+         */
+        addUser(member: KiiUser): void;
+
+        /**
+         * Removes a user from the given group
+         *
+         * <br><br>This method will NOT access the server immediately. You must call save to remove the user on the server. This allows multiple users to be added/removed before calling save.
+         *
+         * @param member The user to be added to the group
+         *
+         * @example
+         *     var user = . . .; // a KiiUser
+         *     var group = . . .; // a KiiGroup
+         *     group.removeUser(user);
+         *     group.save(callbacks);
+         */
+        removeUser(member: KiiUser): void;
+
+        /**
+         * Gets a list of all current members of a group
+         *
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is Array instance.
+         *       <ul>
+         *         <li>params[0] is a KiiGroup instance which this method was called on.</li>
+         *         <li>params[1] is array of memeber KiiUser instances.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiGroup instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var group = . . .; // a KiiGroup
+         *     group.getMemberList({
+         *         success: function(theGroup, memberList) {
+         *             // do something with the result
+         *             for(var i=0; i&lt;memberList.length; i++){
+         *                 var u = memberList[i]; // a KiiUser within the group
+         *             }
+         *         },
+         *
+         *         failure: function(theGroup, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var group = . . .; // a KiiGroup
+         *     group.getMemberList().then(
+         *         function(params) {
+         *             var theGroup = params[0];
+         *             var memberlist = params[1];
+         *             // do something with the result
+         *             for(var i=0; i&lt;memberList.length; i++){
+         *                 var u = memberList[i]; // a KiiUser within the group
+         *             }
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        getMemberList(callbacks?: { success(theGroup: KiiGroup, memberList: KiiUser[]): any; failure(theGroup: KiiGroup, anErrorString: string): any; }): Promise<[KiiGroup, KiiUser[]]>;
+
+        /**
+         * Updates the group name on the server
+         *
+         * @param newName A String of the desired group name
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theRenamedGroup). theRenamedGroup is KiiGroup instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiGroup instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var group = . . .; // a KiiGroup
+         *     group.changeGroupName("myNewName", {
+         *         success: function(theRenamedGroup) {
+         *             // do something with the group
+         *         },
+         *
+         *         failure: function(theGroup, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var group = . . .; // a KiiGroup
+         *     group.changeGroupName("myNewName").then(
+         *         function(theRenamedGroup) {
+         *             // do something with the group
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        changeGroupName(newName: string, callbacks?: { success(theRenamedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string): any; }): Promise<KiiGroup>;
+
+        /**
+         * Saves the latest group values to the server
+         *
+         * <br><br>If the group does not yet exist, it will be created. If the group already exists, the members that have changed will be updated accordingly. If the group already exists and there is no updates of members, it will allways succeed but does not execute update. To change the name of group, use {@link #changeGroupName}.
+         *
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *       <ul>
+         *         <li>fulfill callback function: function(theSavedGroup). theSavedGroup is KiiGroup instance.</li>
+         *         <li>reject callback function: function(error). error is an Error instance.
+         *           <ul>
+         *             <li>error.target is the KiiGroup instance which this method was called on.</li>
+         *             <li>error.message</li>
+         *             <li>error.addMembersArray is array of KiiUser to be added as memebers of this group.</li>
+         *             <li>error.removeMembersArray is array of KiiUser to be removed from the memebers list of this group.</li>
+         *           </ul>
+         *         </li>
+         *       </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var group = . . .; // a KiiGroup
+         *     group.save({
+         *         success: function(theSavedGroup) {
+         *             // do something with the saved group
+         *         },
+         *
+         *         failure: function(theGroup, anErrorString, addMembersArray, removeMembersArray) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var group = . . .; // a KiiGroup
+         *     group.save().then(
+         *         function(theSavedGroup) {
+         *             // do something with the saved group
+         *         },
+         *         function(error) {
+         *             var theGroup = error.target;
+         *             var anErrorString = error.message;
+         *             var addMembersArray = error.addMembersArray;
+         *             var removeMembersArray = error.removeMembersArray;
+         *             // do something with the error response
+         *     });
+         */
+        save(callbacks?: { success(theSavedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string, addMembersArray: KiiUser[], removeMembersArray: KiiUser[]): any; }): Promise<KiiGroup>;
+
+        /**
+         * Saves the latest group values to the server with specified owner.
+         * This method can be used only by the group owner or app admin.
+         *
+         * <br><br>If the group does not yet exist, it will be created. If the group already exists, the members and owner that have changed will be updated accordingly. If the group already exists and there is no updates of members and owner, it will allways succeed but does not execute update. To change the name of group, use {@link #changeGroupName}.
+         *
+         * @param user id of owner
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *       <ul>
+         *         <li>fulfill callback function: function(theSavedGroup). theSavedGroup is KiiGroup instance.</li>
+         *         <li>reject callback function: function(error). error is an Error instance.
+         *           <ul>
+         *             <li>error.target is the KiiGroup instance which this method was called on.</li>
+         *             <li>error.message</li>
+         *             <li>error.addMembersArray is array of KiiUser to be added as memebers of this group.</li>
+         *             <li>error.removeMembersArray is array of KiiUser to be removed from the memebers list of this group.</li>
+         *           </ul>
+         *         </li>
+         *       </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var group = . . .; // a KiiGroup
+         *     group.saveWithOwner("UserID of owner", {
+         *         success: function(theSavedGroup) {
+         *             // do something with the saved group
+         *         },
+         *
+         *         failure: function(theGroup, anErrorString, addMembersArray, removeMembersArray) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var group = . . .; // a KiiGroup
+         *     group.saveWithOwner("UserID of owner").then(
+         *         function(theSavedGroup) {
+         *             // do something with the saved group
+         *         },
+         *         function(error) {
+         *             var theGroup = error.target;
+         *             var anErrorString = error.message;
+         *             var addMembersArray = error.addMembersArray;
+         *             var removeMembersArray = error.removeMembersArray;
+         *             // do something with the error response
+         *     });
+         */
+        saveWithOwner(user: string, callbacks?: { success(theSavedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string, addMembersArray: KiiUser[], removeMembersArray: KiiUser[]): any; }): Promise<KiiGroup>;
+
+        /**
+         * Updates the local group's data with the group data on the server
+         *
+         * <br><br>The group must exist on the server. Local data will be overwritten.
+         *
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theRefreshedGroup). theRefreshedGroup is KiiGroup instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiGroup instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var group = . . .; // a KiiGroup
+         *     group.refresh({
+         *         success: function(theRefreshedGroup) {
+         *             // do something with the refreshed group
+         *         },
+         *
+         *         failure: function(theGroup, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var group = . . .; // a KiiGroup
+         *     group.refresh().then(
+         *         function(theRefreshedGroup) {
+         *             // do something with the refreshed group
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        refresh(callbacks?: { success(theRefreshedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string): any; }): Promise<KiiGroup>;
+
+        /**
+         * Delete the group from the server
+         *
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theDeletedGroup). theDeletedGroup is KiiGroup instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiGroup instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var group = . . .; // a KiiGroup
+         *     group.delete({
+         *         success: function(theDeletedGroup) {
+         *             // do something
+         *         },
+         *
+         *         failure: function(theGroup, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var group = . . .; // a KiiGroup
+         *     group.delete({
+         *         success: function(theDeletedGroup) {
+         *         },
+         *
+         *         failure: function(theGroup, anErrorString) {
+         *         }
+         *     }).then(
+         *         function(theDeletedGroup) {
+         *             // do something
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        delete(callbacks?: { success(theDeletedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string): any; }): Promise<KiiGroup>;
+
+        /**
+         * Gets the owner of the associated group
+         *
+         * This API does not return all the properties of the owner.
+         * To get all owner properties, {@link KiiUser#refresh} is necessary.
+         *
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is Array instance.
+         *       <ul>
+         *         <li>params[0] is the KiiGroup instance which this method was called on.</li>
+         *         <li>params[1] is an group owner KiiUser instances.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiGroup instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var group = . . .; // a KiiGroup
+         *     group.getOwner({
+         *         success: function(theGroup, theOwner) {
+         *             // do something
+         *         },
+         *         failure: function(theGroup, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var group = . . .; // a KiiGroup
+         *     group.getOwner().then(
+         *         function(params) {
+         *             // do something
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        getOwner(callbacks?: { success(theGroup: KiiGroup, theOwner: KiiUser): any; failure(theGroup: KiiGroup, anErrorString: string): any; }): Promise<[KiiGroup, KiiUser]>;
+
+        /**
+         * Creates a reference to a group with the given name
+         * <br><br>
+         * <b>Note:</b>
+         * Returned instance from this API can not operate existing KiiGroup.<br>
+         * If you want to operate existing KiiGroup, please use {@link KiiGroup.groupWithURI}.
+         *
+         * @param groupName An application-specific group name
+         *
+         * @return A new KiiGroup reference
+         *
+         * @example
+         *     var group = new KiiGroup.groupWithName("myGroup");
+         */
+        static groupWithName(groupName: string): KiiGroup;
+
+        /**
+         * Creates a reference to a group with the given name and a list of default members
+         * <br><br>
+         * <b>Note:</b>
+         * Returned instance from this API can not operate existing KiiGroup.<br>
+         * If you want to operate existing KiiGroup, please use {@link KiiGroup.groupWithURI}.
+         *
+         * @param groupName An application-specific group name
+         * @param members An array of KiiUser objects to add to the group
+         *
+         * @return A new KiiGroup reference
+         *
+         * @example
+         *     var group = new KiiGroup.groupWithName("myGroup", members);
+         */
+        static groupWithNameAndMembers(groupName: string, members: KiiUser[]): KiiGroup;
+
+        /**
+         * Instantiate KiiGroup that refers to existing group which has specified ID.
+         * You have to specify the ID of existing KiiGroup. Unlike KiiObject,
+         * you can not assign ID in the client side.<br>
+         * <b>NOTE</b>: This API does not access to the server.
+         * After instantiation, call {@link KiiGroup#refresh} to fetch the properties.
+         *
+         * @param groupId ID of the KiiGroup to instantiate.
+         *
+         * @return instance of KiiGroup.
+         *
+         * @throws when passed groupID is empty or null.
+         *
+         * @example
+         *     var group = new KiiUser.groupWithID("__GROUP_ID__");
+         */
+        static groupWithID(groupId: string): KiiGroup;
+
+        /**
+         * Generate a new KiiGroup based on a given URI
+         * <br><br>
+         * <b>Note:</b>
+         * Returned instance from this API can operate existing KiiGroup.<br>
+         * If you want to create a new KiiGroup, please use {@link KiiGroup.groupWithName}.
+         *
+         * @param uri The URI of the group to be represented
+         *
+         * @return A new KiiGroup with its parameters filled in from the URI
+         *
+         * @throws If the URI given is invalid
+         *
+         * @example
+         *     var group = new KiiGroup.groupWithURI("kiicloud://myuri");
+         */
+        static groupWithURI(uri: string): KiiGroup;
+
+        /**
+         * Instantiate topic belongs to this group.
+         *
+         * @param topicName name of the topic. Must be a not empty string.
+         *
+         * @return topic instance.
+         */
+        topicWithName(topicName: string): KiiTopic;
+
+        /**
+         * Gets a list of topics in this group scope
+         *
+         * @param callbacks An object with callback methods defined
+         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success. If empty string or no string object is provided, this API regards no paginationKey specified.
+         *
+         * @return return promise object.
+         *     <ul>
+         *       <li>fulfill callback function: function(params). params is Array instance.
+         *         <ul>
+         *           <li>params[0] is array of KiiTopic instances.</li>
+         *           <li>params[1] is string of nextPaginationKey.</li>
+         *         </ul>
+         *       </li>
+         *       <li>reject callback function: function(error). error is an Error instance.
+         *         <ul>
+         *           <li>error.target is the KiiGroup instance which this method was called on. </li>
+         *           <li>error.message</li>
+         *         </ul>
+         *       </li>
+         *     </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var group = . . .; // a KiiGroup
+         *     group.listTopics({
+         *         success: function(topicList, nextPaginationKey) {
+         *             // do something with the result
+         *             for(var i=0; i&lt;topicList.length; i++){
+         *                 var topic = topicList[i];
+         *             }
+         *             if (nextPaginationKey != null) {
+         *                 group.listTopics({
+         *                     success: function(topicList, nextPaginationKey) {...},
+         *                     failure: function(anErrorString) {...}
+         *                 }, nextPaginationKey);
+         *             }
+         *         },
+         *         failure: function(anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use promise
+         *     var group = . . .; // a KiiGroup
+         *     group.listTopics().then(
+         *         function(params) {
+         *             var topicList = params[0];
+         *             var nextPaginationKey = params[1];
+         *             // do something with the result
+         *             for(var i=0; i&lt;topicList.length; i++){
+         *                 var topic = topicList[i];
+         *             }
+         *             if (nextPaginationKey != null) {
+         *                 group.listTopics(null, nextPaginationKey).then(
+         *                     function(params) {...},
+         *                     function(error) {...}
+         *                 );
+         *             }
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        listTopics(callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; }, paginationKey?: string): Promise<[KiiTopic[], string]>;
+    }
+
+    /**
+     * Represents a KiiObject object
+     */
+    export class KiiObject {
+        /**
+         * Get the UUID of the given object, assigned by the server
+         *
+         * @return
+         */
+        getUUID(): string;
+
+        /**
+         * Get Id of the object or null if the object ID hasn't been assigned.
+         *
+         * @return
+         */
+        getID(): string;
+
+        /**
+         * Get the server's creation date of this object
+         *
+         * @return
+         */
+        getCreated(): number;
+
+        /**
+         * Get the modified date of the given object, assigned by the server
+         *
+         * @return
+         */
+        getModified(): string;
+
+        /**
+         * Get the application-defined type name of the object
+         *
+         * @return type of this object. null or undefined if none exists
+         */
+        getObjectType(): string;
+
+        /**
+         * Get the body content-type.
+         * It will be updated after the success of {@link KiiObject#uploadBody} and {@link KiiObject#downloadBody}
+         * returns null or undefined when this object doesn't have body content-type information.
+         *
+         * @return content-type of object body
+         */
+        getBodyContentType(): string;
+
+        /**
+         * Sets a key/value pair to a KiiObject
+         *
+         * <br><br>If the key already exists, its value will be written over.
+         * <br><b>NOTE: Before involving floating point value, please consider using integer instead. For example, use percentage, permil, ppm, etc.</br></b>
+         * The reason is:
+         *  <li>Will dramatically improve the performance of bucket query.</li>
+         *  <li>Bucket query does not support the mixed result of integer and floating point.
+         *  ex.) If you use same key for integer and floating point and inquire object with the integer value, objects which has floating point value with the key would not be evaluated in the query. (and vice versa)</li>
+         *
+         * @param key The key to set.
+         *   if null, empty string or string prefixed with '_' is specified, silently ignored and have no effect.
+         *   We don't check if actual type is String or not. If non-string type is specified, it will be encoded as key by JSON.stringify()
+         * @param value The value to be set. Object must be JSON-encodable type (dictionary, array, string, number, boolean)
+         *   We don't check actual type of the value. It will be encoded as value by JSON.stringify()
+         *
+         * @example
+         *     var obj = . . .; // a KiiObject
+         *     obj.set("score", 4298);
+         */
+        set(key: string, value: any): void;
+
+        /**
+         * Gets the value associated with the given key
+         *
+         * @param key The key to retrieve
+         *
+         * @return The object associated with the key. null or undefined if none exists
+         *
+         * @example
+         *     var obj = . . .; // a KiiObject
+         *     var score = obj.get("score");
+         */
+        get<T>(key: string): T;
+
+        /**
+         * Set Geo point to this object with the specified key.
+         *
+         * @param key The key to set.
+         * @param KiiGeoPoint to be tied to the specified key.
+         *
+         * @throws Specified kiiGeoPint is not an instance of KiiGeoPoint.
+         */
+        setGeoPoint(key: string, KiiGeoPoint: KiiGeoPoint): void;
+
+        /**
+         * Gets the geo point associated with the given key.
+         *
+         * @param key The key of the geo point to retrieve.
+         *
+         * @return KiiGeoPoint tied to the key. null if null exists.
+         */
+        getGeoPoint(key: string): KiiGeoPoint;
+
+        /**
+         * Get the ACL handle for this file
+         *
+         * <br><br>Any KiiACLEntry objects added or revoked from this ACL object will be appended to/removed from the server on ACL save.
+         *
+         * @return A KiiACL object associated with this KiiObject
+         *
+         * @example
+         *     	var obj = . . .; // a KiiObject
+         *     	var acl = obj.objectACL();
+         */
+        objectACL(): KiiACL;
+
+        /**
+         * Get a specifically formatted string referencing the object
+         *
+         * <br><br>The object must exist in the cloud (have a valid UUID).
+         *
+         * @return A URI string based on the current object. null if a URI couldn't be generated.
+         *
+         * @example
+         *     var obj = . . .; // a KiiObject
+         *     var uri = obj.objectURI();
+         */
+        objectURI(): string;
+
+        /**
+         * Create or update the KiiObject on KiiCloud.
+         * <br><br>When call this method for the object that has not saved on cloud, will send all fields.
+         * Call this method for the object that has saved on cloud, Update all field of this object.
+         *
+         * @param callbacks An object with callback methods defined
+         *   sucess: function called when save succeeded.<br>
+         *   failure: function called when save failed.
+         * @param overwrite optional, true by default.
+         *   <ul>
+         *   <li><b>If overwrite is true:</b>
+         *   <ul>
+         *   <li>If a KiiObject with the same ID exists in cloud, the local copy will overwrite the remote copy, even if the remote copy is newer. </li>
+         *   </ul>
+         *   <li><b>Otherwise:</b>
+         *   <ul>
+         *   <li>If a KiiObject with the same ID exists in cloud and the remote copy is newer, save will fail.</li>
+         *   </ul>
+         *   </ul>
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theSavedObject). theSavedObject is KiiObject instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiObject instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var obj = . . .; // a KiiObject
+         *     obj.saveAllFields({
+         *         success: function(theSavedObject) {
+         *             // do something with the saved object
+         *         },
+         *
+         *         failure: function(theObject, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var obj = . . .; // a KiiObject
+         *     obj.saveAllFields().then(
+         *         function(theSavedObject) {
+         *             // do something with the saved object
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        saveAllFields(callbacks?: { success(theSavedObject: KiiObject): any; failure(theObject: KiiObject, anErrorString: string): any; }, overwrite?: boolean): Promise<KiiObject>;
+
+        /**
+         * Create or update the KiiObject on KiiCloud.
+         * <br><br>When call this method for the object that has not saved on cloud, will send all fields.
+         * Call this method for the object that has saved on cloud, Update only updated fields.
+         * Do not send fields that has not updated locally. To send all fields regardless of updates, call {@link KiiObject#saveAllFields}.
+         *
+         * @param callbacks An object with callback methods defined
+         *   sucess: function called when save succeeded.<br>
+         *   failure: function called when save failed.
+         * @param overwrite optional, true by default.
+         *   <ul>
+         *   <li><b>If overwrite is true:</b>
+         *   <ul>
+         *   <li>If a KiiObject with the same ID exists in cloud, the local copy will overwrite the remote copy, even if the remote copy is newer. </li>
+         *   </ul>
+         *   <li><b>Otherwise:</b>
+         *   <ul>
+         *   <li>If a KiiObject with the same ID exists in cloud and the remote copy is newer, save will fail.</li>
+         *   </ul>
+         *   </ul>
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theSavedObject). theSavedObject is KiiObject instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiObject instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var obj = . . .; // a KiiObject
+         *     obj.save({
+         *         success: function(theSavedObject) {
+         *             // do something with the saved object
+         *         },
+         *
+         *         failure: function(theObject, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var obj = . . .; // a KiiObject
+         *     obj.save().then(
+         *         function(theSavedObject) {
+         *             // do something with the saved object
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        save(callbacks?: { success(theSavedObject: KiiObject): any; failure(theObject: KiiObject, anErrorString: string): any; }, overwrite?: boolean): Promise<KiiObject>;
+
+        /**
+         * Updates the local object's data with the user data on the server
+         *
+         * <br><br>The object must exist on the server. Local data will be overwritten.
+         *
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theRefreshedObject). theRefreshedObject is KiiObject instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiObject instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var obj = . . .; // a KiiObject
+         *     obj.refresh({
+         *         success: function(theRefreshedObject) {
+         *             // do something with the refreshed object
+         *         },
+         *
+         *         failure: function(theObject, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var obj = . . .; // a KiiObject
+         *     obj.refresh().then(
+         *         function(theRefreshedObject) {
+         *             // do something with the refreshed object
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        refresh(callbacks?: { success(theRefreshedObject: KiiObject): any; failure(theObject: KiiObject, anErrorString: string): any; }): Promise<KiiObject>;
+
+        /**
+         * Delete the object from the server
+         *
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theDeletedObject). theDeletedObject is KiiObject instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiObject instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var obj = . . .; // a KiiObject
+         *     obj.delete({
+         *         success: function(theDeletedObject) {
+         *             // do something
+         *         },
+         *
+         *         failure: function(theObject, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var obj = . . .; // a KiiObject
+         *     obj.delete().then(
+         *         function(theDeletedObject) {
+         *             // do something
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        delete(callbacks?: { success(theDeletedObject: KiiObject): any; failure(theObject: KiiObject, anErrorString: string): any; }): Promise<KiiObject>;
+
+        /**
+         * Generate a new KiiObject based on a given URI
+         *
+         * @param uri The URI of the object to be represented
+         *
+         * @return A new KiiObject with its parameters filled in from the URI
+         *
+         * @throws If the URI is not in the proper format
+         *
+         * @example
+         *     var group = new KiiObject.objectWithURI("kiicloud://myuri");
+         */
+        static objectWithURI(uri: string): KiiObject;
+
+        /**
+         * Move KiiObject body from an object to another object.
+         * <br>
+         * This moving can be allowed under same application, across different scopes
+         * and source/target KiiObject have a read and write permission (READ_EXISTING_OBJECT and WRITE_EXISTING_OBJECT).
+         * <br><br>If target KiiObject has a body, it will be overwritten.
+         *
+         * @param targetObjectUri A KiiObject URI which KiiObject body is moved to.
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is Array instance.
+         *       <ul>
+         *         <li>params[0] is the source KiiObject instance which this method was called on.</li>
+         *         <li>params[1] is the target targetObjectUri String.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the source KiiObject instance which this method was called on.</li>
+         *         <li>error.targetObjectUri is the targetObjectUri String.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var sourceObject = ...; // Source KiiObject
+         *     var targetObject = ...; // Target KiiObject
+         *     var targetObjectUri = targetObject.objectURI();
+         *     sourceObject.moveBody(targetObjectUri, {
+         *         success: function(theSrcObject, theTgtObjectUri) {
+         *             // Do something with the objects
+         *         },
+         *
+         *         failure: function(theSrcObject, theTgtObjectUri, anErrorString) {
+         *             // Do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var sourceObject = ...; // Source KiiObject
+         *     var targetObject = ...; // Target KiiObject
+         *     var targetObjectUri = targetObject.objectURI();
+         *     sourceObject.moveBody(targetObjectUri).then(
+         *         function(params) {
+         *             var theSrcObject = params[0];
+         *             var theTgtObjectUri = params[1];
+         *             // Do something with the objects
+         *         },
+         *         function(error) {
+         *             // Do something with the error response
+         *         }
+         *     );
+         */
+        moveBody(targetObjectUri: string, callbacks?: { success(theSrcObject: KiiObject, theTgtObjectUri: string): any; failure(theSrcObject: KiiObject, theTgtObjectUri: string, anErrorString: string): any; }): Promise<[KiiObject, string]>;
+
+        /**
+         * Upload body data of this object.<br>
+         * If the KiiObject has not saved on the cloud or deleted,
+         * request will be failed.
+         * <br>NOTE: this requires XMLHttpRequest Level 2, FileReader and Blob supports. Do not use it in server code.<br>
+         *
+         * @param srcDataBlob data to be uploaded.
+         *   type is used to determin content-type managed in Kii Cloud.
+         *   If type was not specified in the Blob,
+         *   'application/octet-stream' will be used.
+         * @param callbacks progress: function called on XMLHttpRequest 'progress' event listener.<br>
+         *   sucess: function called when upload succeeded.<br>
+         *   failure: function called when upload failed.
+         *
+         * @return return promise object.
+         *     <br>NOTE: Promise will not handle progress event. Please pass callbacks with progress function to handle progress.
+         *   <ul>
+         *     <li>fulfill callback function: function(theObject). theObject is a KiiObject instance which this method was called on.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiObject instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var myObject = Kii.bucketWithName('myBucket').createObject();
+         *     myObject.save({
+         *         success: function(obj) {
+         *             var srcData = new Blob(['Hello Blob'], {type: 'text/plain'});
+         *             obj.uploadBody(srcData, {
+         *                 progress: function (oEvent) {
+         *                   if (oEvent.lengthComputable) {
+         *                     var percentComplete = oEvent.loaded / oEvent.total;
+         *                     //getting upload progress. You can update progress bar on this function.
+         *                   }
+         *                 },
+         *                 success: function(obj) {
+         *                     // Upload succeeded.
+         *                 },
+         *                 failure: function(obj, anErrorString) {
+         *                     // Handle error.
+         *                 }
+         *             });
+         *         },
+         *         failure: function(obj, error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var myObject = Kii.bucketWithName('myBucket').createObject();
+         *     myObject.save().then(
+         *         function(obj) {
+         *             var srcData = new Blob(['Hello Blob'], {type: 'text/plain'});
+         *             obj.uploadBody(srcData, {
+         *                 progress: function (oEvent) {
+         *                   if (oEvent.lengthComputable) {
+         *                     var percentComplete = oEvent.loaded / oEvent.total;
+         *                     //getting upload progress. You can update progress bar on this function.
+         *                   }
+         *                 }
+         *             }).then(
+         *                 function(obj) { // fullfill callback function
+         *                     // Upload succeeded.
+         *                 },
+         *                 function(error) { // reject callback function
+         *                     // Handle error.
+         *                 }
+         *             );
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        uploadBody(srcDataBlob: Blob, callbacks?: { success(obj: KiiObject): any; failure(obj: KiiObject, anErrorString: string): any; }): Promise<KiiObject>;
+
+        /**
+         * Download body data of this object.<br>
+         * If the KiiObject has not saved on the cloud or deleted
+         * or exist but does not have body object, request will be failed.
+         * <br>NOTE: this requires XMLHttpRequest Level 2, FileReader and Blob supports. Do not use it in server code.<br>
+         *
+         * @param callbacks progress: function called on XMLHttpRequest 'progress' event listener.<br>
+         *   sucess: function called when download succeeded.<br>
+         *   failure: function called when download failed.
+         *
+         * @return return promise object.
+         *     <br>NOTE: Promise will not handle progress event. Please pass callbacks with progress function to handle progress.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is Array instance.
+         *       <ul>
+         *         <li>params[0] is a KiiObject instance which this method was called on.</li>
+         *         <li>params[1] is the returned body blob object.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.</li>
+         *       <ul>
+         *         <li>error.target is the KiiObject instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var myObject = KiiObject.objectWithURI('put existing object uri here');
+         *     myObject.downloadBody({
+         *         progress: function (oEvent) {
+         *           if (oEvent.lengthComputable) {
+         *             var percentComplete = oEvent.loaded / oEvent.total;
+         *             //getting download progress. You can update progress bar on this function.
+         *
+         *           }
+         *         },
+         *         success: function(obj, bodyBlob) {
+         *             // Obtaind body contents as bodyBlob.
+         *             // content-type managed in Kii Cloud can be obtained from type attr.
+         *             // It is same as obj.getBodyContentType();
+         *             var contentType = bodyBlob.type;
+         *         },
+         *         failure: function(obj, anErrorString) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var myObject = KiiObject.objectWithURI('put existing object uri here');
+         *     myObject.downloadBody({
+         *         progress: function (oEvent) {
+         *           if (oEvent.lengthComputable) {
+         *             var percentComplete = oEvent.loaded / oEvent.total;
+         *             //getting download progress. You can update progress bar on this function.
+         *
+         *           }
+         *         }
+         *     ).then(
+         *         function(params) {
+         *             // Obtaind body contents as bodyBlob.
+         *             // content-type managed in Kii Cloud can be obtained from type attr.
+         *             // It is same as obj.getBodyContentType();
+         *             var obj = params[0];
+         *             var bodyBlob = params[1];
+         *             var contentType = bodyBlob.type;
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        downloadBody(callbacks?: { success(obj: KiiObject, bodyBlob: Blob): any; failure(obj: KiiObject, anErrorString: string): any; }): Promise<[KiiObject, Blob]>;
+
+        /**
+         * Publish object body.<br>
+         * Publish object body and obtain public URL links to the body.<br>
+         * It doesn't expires.<br>
+         * If the KiiObject has not saved on the cloud or deleted
+         * or exist but does not have body object, request will be failed.
+         *
+         * @param callbacks sucess: function called when publish succeeded.<br>
+         *   failure: function called when publish failed.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is Array instance.
+         *       <ul>
+         *         <li>params[0] is the KiiObject instance which this method was called on.</li>
+         *         <li>params[1] is the published url string.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiObject instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var myObject = KiiObject.objectWithURI('put existing object uri here');
+         *     myObject.publishBody({
+         *         success: function(obj, publishedUrl) {
+         *             // ex.) You can show publishedUrl in the view.
+         *         },
+         *         failure: function(obj, anErrorString) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var myObject = KiiObject.objectWithURI('put existing object uri here');
+         *     myObject.publishBody().then(
+         *         function(params) {
+         *             // ex.) You can show publishedUrl in the view.
+         *             var obj = params[0];
+         *             var publishedUrl = params[1];
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        publishBody(callbacks?: { success(obj: KiiObject, publishedUrl: string): any; failure(obj: KiiObject, anErrorString: string): any; }): Promise<[KiiObject, string]>;
+
+        /**
+         * Publish object body with expiration date.<br>
+         * Publish object body and obtain public URL links to the body.<br>
+         * Expires at specified date <br>
+         * If the KiiObject has not saved on the cloud or deleted
+         * or exist but does not have body object, request will be failed.
+         *
+         * @param expiresAt expiration date. should specify future date.
+         * @param callbacks sucess: function called when publish succeeded.<br>
+         *   failure: function called when publish failed.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is Array instance.
+         *       <ul>
+         *         <li>params[0] is the KiiObject instance which this method was called on.</li>
+         *         <li>params[1] is the published url string.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiObject instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var myObject = KiiObject.objectWithURI('put existing object uri here');
+         *     var expiresAt = new Date(2014, 11, 24);
+         *     myObject.publishBodyExpiresAt(expiresAt, {
+         *         success: function(obj, publishedUrl) {
+         *             // ex.) You can show publishedUrl in the view.
+         *         },
+         *         failure: function(obj, anErrorString) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var myObject = KiiObject.objectWithURI('put existing object uri here');
+         *     var expiresAt = new Date(2014, 11, 24);
+         *     myObject.publishBodyExpiresAt(expiresAt).then(
+         *         function(params) {
+         *             // ex.) You can show publishedUrl in the view.
+         *             var obj = params[0];
+         *             var publishedUrl = params[1];
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        publishBodyExpiresAt(expiresAt: Date, callbacks?: { success(obj: KiiObject, publishedUrl: string): any; failure(obj: KiiObject, anErrorString: string): any; }): Promise<[KiiObject, string]>;
+
+        /**
+         * Publish object body with expiration duration.<br>
+         * Publish object body and obtain public URL links to the body.<br>
+         * Expires in specified duration<br>
+         * If the KiiObject has not saved on the cloud or deleted
+         * or exist but does not have body object, request will be failed.
+         *
+         * @param expiresIn duration in seconds. greater than 0.
+         * @param callbacks sucess: function called when publish succeeded.<br>
+         *   failure: function called when publish failed.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is Array instance.
+         *       <ul>
+         *         <li>params[0] is the KiiObject instance which this method was called on.</li>
+         *         <li>params[1] is the published url string.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiObject instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var myObject = KiiObject.objectWithURI('put existing object uri here');
+         *     var expiresIn = 60 * 60; // Expires in 1 hour.
+         *     myObject.publishBodyExpiresIn(expiresIn, {
+         *         success: function(obj, publishedUrl) {
+         *             // ex.) You can show publishedUrl in the view.
+         *         },
+         *         failure: function(obj, anErrorString) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var myObject = KiiObject.objectWithURI('put existing object uri here');
+         *     var expiresIn = 60 * 60; // Expires in 1 hour.
+         *     myObject.publishBodyExpiresIn(expiresIn).then(
+         *         function(params) {
+         *             // ex.) You can show publishedUrl in the view.
+         *             var obj = params[0];
+         *             var publishedUrl = params[1];
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        publishBodyExpiresIn(expiresIn: number, callbacks?: { success(obj: KiiObject, publishedUrl: string): any; failure(obj: KiiObject, anErrorString: string): any; }): Promise<[KiiObject, string]>;
+
+        /**
+         * Delete the object body from the server.<br>
+         * If the KiiObject has not saved on the cloud or deleted
+         * or exist but does not have body object, request will be failed.<br>
+         * If succeeded, The object body content type will be nullified.
+         *
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theDeletedObject). theDeletedObject is the KiiObject instance which this method was called on.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiObject instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var obj = . . .; // a KiiObject
+         *     obj.deleteBody({
+         *         success: function(theDeletedObject) {
+         *             // do something
+         *         },
+         *
+         *         failure: function(obj, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var obj = . . .; // a KiiObject
+         *     obj.deleteBody().then(
+         *         function(theDeletedObject) {
+         *             // do something
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        deleteBody(callbacks?: { success(theDeletedObject: KiiObject): any; failure(obj: KiiObject, anErrorString: string): any; }): Promise<KiiObject>;
+
+        /**
+         * Check if given ID is valid for object ID.
+         *  Valid pattern: ^[a-zA-Z0-9-_\\.]{2,100}$
+         *
+         * @param objectID to be checked.
+         *
+         * @return true if given ID is valid, false otherwise.
+         */
+        static isValidObjectID(objectID: string): boolean;
+    }
+
+    /**
+     * Represents a KiiPushInstallation object
+     */
+    export class KiiPushInstallation {
+        /**
+         * Register the id issued by GCM to the Kii cloud for current logged in user.
+         *
+         * @param installationRegistrationID The ID of registration that identifies the installation externally.
+         * @param development Indicates if the installation is for development or production environment.
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(response).
+         *       <ul>
+         *         <li>response.installationID is ID of the installation in the platform.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *
+         */
+        installGcm(installationRegistrationID: string, development: boolean, callbacks?: { success(response: KiiGcmInstallationResponse): any; failure(error: Error): any; }): Promise<KiiGcmInstallationResponse>;
+
+        /**
+         * Register a MQTT installation to the Kii cloud for current logged in user.
+         *
+         * @param development Indicates if the installation is for development or production environment.
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(response).
+         *       <ul>
+         *         <li>response.installationID is ID of the installation in the platform.</li>
+         *         <li>response.installationRegistrationID is ID of registration that identifies the installation externally.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *
+         */
+        installMqtt(development: boolean, callbacks?: { success(response: KiiMqttInstallationResponse): any; failure(error: Error): any; }): Promise<KiiMqttInstallationResponse>;
+
+        /**
+         * Get MQTT endpoint.
+         * If the MQTT endpoint is not ready, this method retries request up to three times.
+         * <br><br>
+         * Note that only MQTT over tls is supported currently.<br>
+         * Don't use portSSL, portWS or portWSS until we support it.
+         *
+         * @param installationID The ID of the installation in the platform.
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(response).
+         *       <ul>
+         *         <li>response.installationID is ID of the installation in the platform.</li>
+         *         <li>response.username is username to use for connecting to the MQTT broker.</li>
+         *         <li>response.password is assword to use for connecting to the MQTT broker.</li>
+         *         <li>response.mqttTopic is topic to subscribe in the MQTT broker.</li>
+         *         <li>response.host is URL of the MQTT broker host to connect.</li>
+         *         <li>response.X-MQTT-TTL is the amount of time in seconds that specifies how long the mqttTopic will be valid, after that the client needs to request new MQTT endpoint info.</li>
+         *         <li>response.portTCP is port to connect using plain TCP.</li>
+         *         <li>response.portSSL is port to connect using SSL/TLS.</li>
+         *         <li>response.portWS is port to connect using plain Websocket.</li>
+         *         <li>response.portWSS is port to connect using SSL/TLS Websocket.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *
+         */
+        getMqttEndpoint(installationID: string, callbacks?: { success(response: KiiMqttEndpoint): any; failure(error: Error): any; }): Promise<KiiMqttEndpoint>;
+
+        /**
+         * Unregister the push settings by the id(issued by push provider) that is used for installation.
+         *
+         * @param installationRegistrationID The ID of registration that identifies the installation externally.
+         * @param deviceType The type of the installation, current implementation only supports "ANDROID" and "MQTT".
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function().</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *
+         */
+        uninstall(installationRegistrationID: string, deviceType: string, callbacks?: { success(): any; failure(error: Error): any; }): Promise<void>;
+
+        /**
+         * Unregister the push settings by the id(issued by KiiCloud) that is used for installation.
+         *
+         * @param installationID The ID of the installation issued by KiiCloud.
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function().</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *
+         */
+        uninstallByInstallationID(installationID: string, callbacks?: { success(): any; failure(error: Error): any; }): Promise<void>;
+    }
+
+    /**
+     * Builder of push message
+     */
+    export class KiiPushMessageBuilder {
+        /**
+         * instantiate builder with push message data.
+         * By default all push channels (gcm, apns, jpush, mqtt) is enabled.
+         * All other properties configured by method of this class won't be set and default
+         * value would be applied.<br>
+         * Details of properties of message and its default value, please refer to
+         * http://documentation.kii.com/rest/#notification_management-leverage__push_to_users__notification-group_scope-send_messages-send_a_push_message_to_the_current_topic
+         *
+         * @param data sent to all push channels (gcm, apns, jpush, mqtt).
+         */
+        constructor(data: any);
+
+        /**
+         * build push message.
+         *
+         * @return push message object. Can be used in {@link KiiTopic#sendMessage()}
+         */
+        build(): any;
+
+        /**
+         * Indicate whether send this message to development environment.
+         * If this method is not called, true will be applied as default.
+         *
+         * @param flag indicate whether send this message to development env.
+         *
+         * @return builder instance.
+         */
+        setSendToDevelopment(flag: boolean): KiiPushMessageBuilder;
+
+        /**
+         * Indicate whether send this message to production environment.
+         * If this method is not called, true will be applied as default.
+         *
+         * @param flag indicate whether send this message to production env.
+         *
+         * @return builder instance.
+         */
+        setSendToProduction(flag: boolean): KiiPushMessageBuilder;
+
+        /**
+         * Enable/ Disable message distribution via GCM.
+         * If this method is not called, true will be applied as default.
+         *
+         * @param enable flag indicate whether distribute this message to GCM subscribers.
+         *
+         * @return builder instance.
+         */
+        enableGcm(enable: boolean): KiiPushMessageBuilder;
+
+        /**
+         * Enable/ Disable message distribution via APNS.
+         * If this method is not called, true will be applied as default.
+         *
+         * @param enable flag indicate whether distribute this message to APNS subscribers.
+         *
+         * @return builder instance.
+         */
+        enableApns(enable: boolean): KiiPushMessageBuilder;
+
+        /**
+         * Enable/ Disable message distribution via JPush.
+         * If this method is not called, true will be applied as default.
+         *
+         * @param enable flag indicate whether distribute this message to JPush subscribers.
+         *
+         * @return builder instance.
+         */
+        enableJpush(enable: boolean): KiiPushMessageBuilder;
+
+        /**
+         * Enable/ Disable message distribution via MQTT.
+         * If this method is not called, true will be applied as default.
+         *
+         * @param enable flag indicate whether distribute this message to MQTT subscribers.
+         *
+         * @return builder instance.
+         */
+        enableMqtt(enable: boolean): KiiPushMessageBuilder;
+
+        /**
+         * Set specific data for GCM subscribers.
+         * If this method is not called, no specific data is not applied
+         * and data passed to the constructor would be sent to subscribers.
+         *
+         * @param data specific data applied to only GCM subscribers.
+         *   Contents should be JSON Object with only one-level of nesting,
+         *   and only strings in values
+         *
+         * @return builder instance.
+         */
+        gcmData(data: { [key: string]: string }): KiiPushMessageBuilder;
+
+        /**
+         * Set collapse_key for GCM subscribers.
+         * If this method is not called, no collapse_key is applied.
+         * For details please refer to GCM document of collapse_key.
+         *
+         * @param collapseKey
+         *
+         * @return builder instance.
+         */
+        gcmCollapseKey(collapseKey: string): KiiPushMessageBuilder;
+
+        /**
+         * Set delay_while_idle for GCM subscribers.
+         * If this method is not called, no delay_while_idle is applied.
+         * For details please refer to GCM document of delay_while_idle.
+         *
+         * @param delayWhileIdle
+         *
+         * @return builder instance.
+         */
+        gcmDelayWhileIdle(delayWhileIdle: boolean): KiiPushMessageBuilder;
+
+        /**
+         * Set time_to_live for GCM subscribers.
+         * If this method is not called, no time_to_live is applied.
+         * For details please refer to GCM document of time_to_live.
+         *
+         * @param timeToLive
+         *
+         * @return builder instance.
+         */
+        gcmTimeToLive(timeToLive: number): KiiPushMessageBuilder;
+
+        /**
+         * Set restricted_package_name for GCM subscribers.
+         * If this method is not called, no restricted_package_name is applied.
+         * For details please refer to GCM document of restricted_package_name.
+         *
+         * @param restrictedPackageName
+         *
+         * @return builder instance.
+         */
+        gcmRestrictedPackageName(restrictedPackageName: string): KiiPushMessageBuilder;
+
+        /**
+         * Set specific data for APNS subscribers.
+         * If this method is not called, no specific data is not applied
+         * and data passed to the constructor would be sent to subscribers.
+         *
+         * @param data specific data applied to only APNS subscribers.
+         *   Contents should be JSON Object with only one-level of nesting,
+         *   and only strings, integers, booleans or doubles in the values.
+         *
+         * @return builder instance.
+         */
+        apnsData(data: { [key: string]: string | number | boolean }): KiiPushMessageBuilder;
+
+        /**
+         * Set alert for APNS subscribers.
+         * If this method is not called, no alert is applied.
+         * For details please refer to APNS document of alert.
+         *
+         * @param alert alert object
+         *
+         * @return builder instance.
+         */
+        apnsAlert(alert: string | APNSAlert): KiiPushMessageBuilder;
+
+        /**
+         * Set sound for APNS subscribers.
+         * If this method is not called, no sound is applied.
+         * For details please refer to APNS document of sound.
+         *
+         * @param sound
+         *
+         * @return builder instance.
+         */
+        apnsSound(sound: string): KiiPushMessageBuilder;
+
+        /**
+         * Set badge for APNS subscribers.
+         * If this method is not called, no badge is applied.
+         * For details please refer to APNS document of badge.
+         *
+         * @param badge
+         *
+         * @return builder instance.
+         */
+        apnsBadge(badge: number): KiiPushMessageBuilder;
+
+        /**
+         * Set content-available for APNS subscribers.
+         * If this method is not called, no content-available is applied.
+         *
+         * @param contentAvailable If 0 or this method is not invoked,
+         *   content-available payload is not delivered.
+         *   Otherwise, content-available=1 payload is delivered.
+         *
+         * @return builder instance.
+         */
+        apnsContentAvailable(contentAvailable: number): KiiPushMessageBuilder;
+
+        /**
+         * Set category for APNS subscribers.
+         * If this method is not called, no category is applied.
+         * For details please refer to APNS document of category.
+         *
+         * @param category
+         *
+         * @return builder instance.
+         */
+        apnsCategory(category: string): KiiPushMessageBuilder;
+
+        /**
+         * Set specific data for JPush subscribers.
+         * If this method is not called, no specific data is not applied
+         * and data passed to the constructor would be sent to subscribers.
+         *
+         * @param data specific data applied to only JPush subscribers.
+         *   Contents should be JSON Object with only one-level of nesting,
+         *   and only strings, integers, booleans or doubles in the values.
+         *
+         * @return builder instance.
+         */
+        jpushData(data: { [name: string]: string | number | boolean }): KiiPushMessageBuilder;
+
+        /**
+         * Set specific data for MQTT subscribers.
+         * If this method is not called, no specific data is not applied
+         * and data passed to the constructor would be sent to subscribers.
+         *
+         * @param data specific data applied to only MQTT subscribers.
+         *   Contents should be JSON Object with only one-level of nesting,
+         *   and only strings in the values.
+         *
+         * @return builder instance.
+         */
+        mqttData(data: { [key: string]: string }): KiiPushMessageBuilder;
+    }
+
+    /**
+     * Represents a KiiPushSubscription.
+     */
+    export class KiiPushSubscription {
+        /**
+         * Subscribe to bucket or topic.
+         *
+         * @param target to be subscribed. KiiBucket or KiiTopic instance.
+         * @param callbacks object contains callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is an Array instance.
+         *       <ul>
+         *         <li>params[0] is a KiiPushSubscription instance.</li>
+         *         <li>params[1] is the KiiTopic instance to subscribe.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is a KiiPushSubscription instance.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var topic = Kii.topicWithName("myAppTopic");
+         *     var user = KiiUser.getCurrentUser();
+         *     user.pushSubscription().subscribe(topic, {
+         *         success: function(subscription, topic) {
+         *             // Succeeded.
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var topic = Kii.topicWithName("myAppTopic");
+         *     var user = KiiUser.getCurrentUser();
+         *     user.pushSubscription().subscribe(topic).then(
+         *         function(params) {
+         *             var subscription = params[0];
+         *             var topic = params[1];
+         *             // Succeeded.
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        subscribe<T extends KiiBucket | KiiTopic>(target: T, callbacks?: { success(subscription: KiiPushSubscription, topic: T): any; failure(error: Error): any; }): Promise<[KiiPushSubscription, T]>;
+
+        /**
+         * Unsubscribe to bucket or topic.
+         *
+         * @param target to be unsubscribed. KiiBucket or KiiTopic instance.
+         * @param callbacks object contains callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is an Array instance.
+         *       <ul>
+         *         <li>params[0] is a KiiPushSubscription instance.</li>
+         *         <li>params[1] is the KiiTopic instance to unsubscribe.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is a KiiPushSubscription instance.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var topic = Kii.topicWithName("myAppTopic");
+         *     var user = KiiUser.getCurrentUser();
+         *     user.pushSubscription().unsubscribe(topic, {
+         *         success: function(subscription, topic) {
+         *             // Succeeded.
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var topic = Kii.topicWithName("myAppTopic");
+         *     var user = KiiUser.getCurrentUser();
+         *     user.pushSubscription().unsubscribe(topic).then(
+         *         function(params) {
+         *             var subscription = params[0];
+         *             var topic = params[1];
+         *             // Succeeded.
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        unsubscribe<T extends KiiBucket | KiiTopic>(target: T, callbacks?: { success(subscription: KiiPushSubscription, topic: T): any; failure(error: Error): any; }): Promise<[KiiPushSubscription, T]>;
+
+        /**
+         * Check subscription of bucket, topic.
+         *
+         * @param target to check subscription. KiiBucket or KiiTopic instance.
+         * @param callbacks object contains callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is an Array instance.
+         *       <ul>
+         *         <li>params[0] is a KiiPushSubscription instance.</li>
+         *         <li>params[1] is the KiiTopic instance to subscribe.</li>
+         *         <li>params[2] is Boolean value. true if subscirbed, otherwise false.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is a KiiPushSubscription instance.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var topic = Kii.topicWithName("myAppTopic");
+         *     var user = KiiUser.getCurrentUser();
+         *     user.pushSubscription().isSubscribed(topic, {
+         *         success: function(subscription, topic, isSubscribed) {
+         *             // Succeeded.
+         *             if (isSubscribed) {
+         *                 // The topic is subscribed by current user.
+         *             } else {
+         *                 // The topic is not subscribed by current user.
+         *             }
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var topic = Kii.topicWithName("myAppTopic");
+         *     var user = KiiUser.getCurrentUser();
+         *     user.pushSubscription().isSubscribed(topic).then(
+         *         function(params) {
+         *             // Succeeded.
+         *             var subscription = params[0];
+         *             var topic = params[1];
+         *             var isSubscribed = params[2];
+         *             if (isSubscribed) {
+         *                 // The topic is subscribed by current user.
+         *             } else {
+         *                 // The topic is not subscribed by current user.
+         *             }
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        isSubscribed<T extends KiiBucket | KiiTopic>(target: T, callbacks?: { success(subscription: KiiPushSubscription, topic: T, isSubscribed: boolean): any; failure(error: Error): any; }): Promise<[KiiPushSubscription, T, boolean]>;
+    }
+
+    /**
+     * Represents a KiiQuery object
+     */
+    export class KiiQuery {
+        /**
+         * Get the limit of the current query
+         *
+         * @return
+         */
+        getLimit(): number;
+
+        /**
+         * Set the limit of the given query
+         *
+         * @param value The desired limit. Must be an integer > 0
+         *
+         * @throws InvalidLimitException
+         */
+        setLimit(value: number): void;
+
+        /**
+         * Create a KiiQuery object based on a KiiClause
+         * <br><br>
+         * By passing null as the ‘clause’ parameter, all objects can be retrieved.
+         *
+         * @param clause The KiiClause to be executed with the query
+         */
+        static queryWithClause(clause: KiiClause): KiiQuery;
+
+        /**
+         * Set the query to sort by a field in descending order
+         *
+         * If a sort has already been set, it will be overwritten.
+         *
+         * @param field The key that should be used to sort
+         */
+        sortByDesc(field: string): void;
+
+        /**
+         * Set the query to sort by a field in ascending order
+         *
+         * If a sort has already been set, it will be overwritten.
+         *
+         * @param field The key that should be used to sort
+         */
+        sortByAsc(field: string): void;
+    }
+
+    /**
+     * Represents a server side code entry in KiiCloud.
+     */
+    export class KiiServerCodeEntry {
+        /**
+         * Execute this server code entry.<br>
+         *  If argument is an empty object or not type of Object, callbacks.failure or reject callback of promise will be called.<br>
+         *
+         * @param argument pass to the entry of script in the cloud.
+         *   If null is specified, no argument pass to the script.
+         * @param callbacks called on completion of execution.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is Array instance.
+         *       <ul>
+         *         <li>params[0] is the KiiServerCodeEntry instance which this method was called on.</li>
+         *         <li>params[1] is the passed argument object.</li>
+         *         <li>params[2] is a KiiServerCodeExecResult instance.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiServerCodeEntry instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *         <li>error.argument is passed argument object. </li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // Instantiate with the endpoint.
+         *     var entry = Kii.serverCodeEntry("main");
+         *
+         *     // Set the custom parameters.
+         *     var arg = {"username":"name_of_my_friend", "password":"password_for_my_friend"};
+         *
+         *     // Example of executing the Server Code
+         *     entry.execute(arg, {
+         *
+         *        success: function(entry, argument, execResult) {
+         *            // do something now that the user is logged in
+         *        },
+         *
+         *        failure: function(entry, argument, execResult, anErrorString) {
+         *            // do something with the error response
+         *        }
+         *     });
+         *
+         *     // example to use Promise
+         *     // Instantiate with the endpoint.
+         *     var entry = Kii.serverCodeEntry("main");
+         *
+         *     // Set the custom parameters.
+         *     var arg = {"username":"name_of_my_friend", "password":"password_for_my_friend"};
+         *
+         *     // Example of executing the Server Code
+         *     entry.execute(arg).then(
+         *         function(params) {
+         *             var entry = params[0];
+         *             var argument = params[1];
+         *             var execResult = params[2];
+         *            // do something
+         *         },
+         *         function(error) {
+         *            // do something with the error response
+         *         }
+         *     );
+         */
+        execute<T>(argument: T, callbacks?: { success(entry: KiiServerCodeEntry, argument: T, execResult: KiiServerCodeExecResult): any; failure(entry: KiiServerCodeEntry, argument: T, execResult: KiiServerCodeExecResult, anErrorString: string): any; }): Promise<[KiiServerCodeEntry, T, KiiServerCodeExecResult]>;
+
+        /**
+         * Get the entryName of this server code entry.
+         *
+         * @return entryName.
+         */
+        getEntryName(): string;
+    }
+
+    /**
+     * Represents a server side code execution result in KiiCloud.
+     */
+    export class KiiServerCodeExecResult {
+        /**
+         * Get calculated number of executed steps.
+         *
+         * @return calculated number of executed steps
+         */
+        getExecutedSteps(): number;
+
+        /**
+         * Get Object returned by server code entry.
+         *
+         * @return returned by server code entry.
+         */
+        getReturnedValue(): any;
+    }
+
+    /**
+     * Represents a KiiSocialConnect object
+     */
+    export class KiiSocialConnect {
+        /**
+         *
+         *
+         * @deprecated You don't have to call this method.
+         *   Set up a reference to one of the supported KiiSocialNetworks.
+         *
+         *   Set up the network. Need to be called before accessing other methods.
+         *   <br><b> Facebook </b>
+         *   <table border="1" cellspacing="0">
+         *   <thead>
+         *   <tr bgcolor="#CCCCFF">
+         *   <th>Argument</th>
+         *   <th>Value Type</th>
+         *   <th>Value</th>
+         *   <th>Note</th>
+         *   </tr>
+         *   </thead>
+         *   <tbody>
+         *   <tr>
+         *   <td>networkName</td>
+         *   <td>Number</td>
+         *   <td>KiiSocialNetworkName.FACEBOOK</td>
+         *   <td>Specify Facebook</td>
+         *   </tr>
+         *   <tr>
+         *   <td>apiKey</td>
+         *   <td>String</td>
+         *   <td>null</td>
+         *   <td>Facebook does not requires this argument.</td>
+         *   </tr>
+         *   <tr>
+         *   <td>apiSecret</td>
+         *   <td>String</td>
+         *   <td>null</td>
+         *   <td>Facebook does not requires this argument.</td>
+         *   </tr>
+         *   <tr>
+         *   <td>extras</td>
+         *   <td>Object</td>
+         *   <td>null</td>
+         *   <td>Facebook does not requires this argument.</td>
+         *   </tr>
+         *   </tbody>
+         *   </table>
+         *
+         *   <br><b> Twitter </b>
+         *   <table border="1" cellspacing="0">
+         *   <thead>
+         *   <tr bgcolor="#CCCCFF">
+         *   <th>Argument</th>
+         *   <th>Value Type</th>
+         *   <th>Value</th>
+         *   <th>Note</th>
+         *   </tr>
+         *   </thead>
+         *   <tbody>
+         *   <tr>
+         *   <td>networkName</td>
+         *   <td>Number</td>
+         *   <td>KiiSocialNetworkName.TWITTER</td>
+         *   <td>Specify Twitter</td>
+         *   </tr>
+         *   <tr>
+         *   <td>apiKey</td>
+         *   <td>String</td>
+         *   <td>null</td>
+         *   <td>Twitter does not requires this argument.</td>
+         *   </tr>
+         *   <tr>
+         *   <td>apiSecret</td>
+         *   <td>String</td>
+         *   <td>null</td>
+         *   <td>Twitter does not requires this argument.</td>
+         *   </tr>
+         *   <tr>
+         *   <td>extras</td>
+         *   <td>Object</td>
+         *   <td>null</td>
+         *   <td>Twitter does not requires this argument.</td>
+         *   </tr>
+         *   </tbody>
+         *   </table>
+         *   <br><b> QQ </b>
+         *   <table border="1" cellspacing="0">
+         *   <thead>
+         *   <tr bgcolor="#CCCCFF">
+         *   <th>Argument</th>
+         *   <th>Value Type</th>
+         *   <th>Value</th>
+         *   <th>Note</th>
+         *   </tr>
+         *   </thead>
+         *   <tbody>
+         *   <tr>
+         *   <td>networkName</td>
+         *   <td>Number</td>
+         *   <td>KiiSocialNetworkName.QQ</td>
+         *   <td>Specify QQ</td>
+         *   </tr>
+         *   <tr>
+         *   <td>apiKey</td>
+         *   <td>String</td>
+         *   <td>null</td>
+         *   <td>QQ does not requires this argument.</td>
+         *   </tr>
+         *   <tr>
+         *   <td>apiSecret</td>
+         *   <td>String</td>
+         *   <td>null</td>
+         *   <td>QQ does not requires this argument.</td>
+         *   </tr>
+         *   <tr>
+         *   <td>extras</td>
+         *   <td>Object</td>
+         *   <td>null</td>
+         *   <td>QQ does not requires this argument.</td>
+         *   </tr>
+         *   </tbody>
+         *   </table>
+         *
+         * @param networkName One of the supported KiiSocialNetworkName values
+         * @param apiKey The SDK key assigned by the social network provider. For details refer to the table above.
+         * @param apiSecret The SDK secret assigned by the social network provider. For details refer to the table above.
+         * @param extras Extra options that should be passed to the SNS. For details refer to the table above.
+         *
+         * @throws For details refer to the table above
+         */
+        static setupNetwork(networkName: KiiSocialNetworkName, apiKey: string, apiSecret: string, extras: any): void;
+
+        /**
+         * Log a user into the social network provided
+         *
+         *  This will initiate the login process for the given network. If user has already linked with the specified social network,
+         *  sign-in with the social network. Otherwise, this will sign-up and create new user authenticated by the specified social network.
+         *  If sign-up successful, the user is cached inside SDK as current user,and accessible via {@link KiiUser.getCurrentUser()}.
+         *  User token and token expiration is also cached and can be get by {@link KiiUser#getAccessTokenObject()}.
+         *  Access token won't be expired unless you set it explicitly by {@link Kii.setAccessTokenExpiration()}.
+         *  The network must already be set up via setupNetwork<br>
+         *  If the opitons is invalid, callbacks.failure or reject callback of promise will be called. <br>
+         *
+         * @param networkName One of the supported KiiSocialNetworkName values
+         * @param options A dictionary of key/values to pass to KiiSocialConnect
+         *
+         *   <br><b> Facebook </b>
+         *   <table border="1" cellspacing="0">
+         *   <thead>
+         *   <tr bgcolor="#CCCCFF">
+         *   <th>Key</th>
+         *   <th>Value type</th>
+         *   <th>Value</th>
+         *   <th>Note</th>
+         *   </tr>
+         *   </thead>
+         *   <tbody>
+         *   <tr>
+         *   <td>access_token</td>
+         *   <td>String</td>
+         *   <td>Access token of Facebook.</td>
+         *   <td>This is mandatory.</td>
+         *   </tr>
+         *   </tbody>
+         *   </table>
+         *
+         *   <br><b> Twitter </b>
+         *   <table border="1" cellspacing="0">
+         *   <thead>
+         *   <tr bgcolor="#CCCCFF">
+         *   <th>Key</th>
+         *   <th>Value type</th>
+         *   <th>Value</th>
+         *   <th>Note</th>
+         *   </tr>
+         *   </thead>
+         *   <tbody>
+         *   <tr>
+         *   <td>oauth_token</td>
+         *   <td>String</td>
+         *   <td>OAuth access token of twitter.</td>
+         *   <td>This is mandatory. </td>
+         *   </tr>
+         *   <tr>
+         *   <td>oauth_token_secret</td>
+         *   <td>String</td>
+         *   <td>OAuth access token secret of twitter.</td>
+         *   <td>This is mandatory.</td>
+         *   </tr>
+         *   </tbody>
+         *   </table>
+         *
+         *   <br><b> Google </b>
+         *   <table border="1" cellspacing="0">
+         *   <thead>
+         *   <tr bgcolor="#CCCCFF">
+         *   <th>Key</th>
+         *   <th>Value type</th>
+         *   <th>Value</th>
+         *   <th>Note</th>
+         *   </tr>
+         *   </thead>
+         *   <tbody>
+         *   <tr>
+         *   <td>access_token</td>
+         *   <td>String</td>
+         *   <td>Access token of Google.</td>
+         *   <td>This is mandatory.</td>
+         *   </tr>
+         *   </tbody>
+         *   </table>
+         *
+         *   <br><b> Renren </b>
+         *   <table border="1" cellspacing="0">
+         *   <thead>
+         *   <tr bgcolor="#CCCCFF">
+         *   <th>Key</th>
+         *   <th>Value type</th>
+         *   <th>Value</th>
+         *   <th>Note</th>
+         *   </tr>
+         *   </thead>
+         *   <tbody>
+         *   <tr>
+         *   <td>access_token</td>
+         *   <td>String</td>
+         *   <td>Access token of Renren.</td>
+         *   <td>This is mandatory.</td>
+         *   </tr>
+         *   </tbody>
+         *   </table>
+         *
+         *   <br><b> QQ </b>
+         *   <table border="1" cellspacing="0">
+         *   <thead>
+         *   <tr bgcolor="#CCCCFF">
+         *   <th>Key</th>
+         *   <th>Value type</th>
+         *   <th>Value</th>
+         *   <th>Note</th>
+         *   </tr>
+         *   </thead>
+         *   <tbody>
+         *   <tr>
+         *   <td>access_token</td>
+         *   <td>String</td>
+         *   <td>Access token of QQ.</td>
+         *   <td>This is mandatory. </td>
+         *   </tr>
+         *   <tr>
+         *   <td>openID</td>
+         *   <td>String</td>
+         *   <td>OpenID of QQ.</td>
+         *   <td>This is mandatory.</td>
+         *   </tr>
+         *   </tbody>
+         *   </table>
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is Array instance.
+         *       <ul>
+         *         <li>params[0] is a logged in KiiUser instance.</li>
+         *         <li>params[1] is the KiiSocialNetworkName used to login.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.message</li>
+         *         <li>error.network is the KiiSocialNetworkName used to login.</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *      // example to use callbacks directly
+         *      // Example of using no option
+         *      KiiSocialConnect.logIn(KiiSocialNetworkName.FACEBOOK, null, {
+         *
+         *          success: function(user, network) {
+         *              // do something now that the user is logged in
+         *          },
+         *
+         *          failure: function(user, network, anErrorString) {
+         *              // do something with the error response
+         *          }
+         *      });
+         *
+         *      // example to use Promise
+         *      KiiSocialConnect.logIn(KiiSocialNetworkName.FACEBOOK, null).then(
+         *          function(params) {
+         *              // do something now that the user is logged in
+         *          },
+         *          function(error) {
+         *              // do something with the error response
+         *          }
+         *      );
+         */
+        static logIn(networkName: KiiSocialNetworkName, options: KiiSocialConnectOptions, callbacks?: { success(user: KiiUser, network: KiiSocialNetworkName): any; failure(user: KiiUser, network: KiiSocialNetworkName, anErrorString: string): any; }): Promise<[KiiUser, KiiSocialNetworkName]>;
+
+        /**
+         * Link the currently logged in user with a social network
+         *
+         *  This will initiate the login process for the given network, which for SSO-enabled services like Facebook, will send the user to the Facebook site for authentication. There must be a currently authenticated KiiUser. Otherwise, you can use the logIn: method to create and log in a KiiUser using a network. The network must already be set up via setupNetwork<br>
+         *  If there is not logged-in user to link with, callbacks.failure or reject callback of promise will be called. <br>
+         *  If the opitons is invalid, callbacks.failure or reject callback of promise will be called. <br>
+         *
+         * @param networkName One of the supported KiiSocialNetworkName values
+         * @param options A dictionary of key/values to pass to KiiSocialConnect
+         *   <br><b> Facebook </b>
+         *   <table border="1" cellspacing="0">
+         *   <thead>
+         *   <tr bgcolor="#CCCCFF">
+         *   <th>Key</th>
+         *   <th>Value type</th>
+         *   <th>Value</th>
+         *   <th>Note</th>
+         *   </tr>
+         *   </thead>
+         *   <tbody>
+         *   <tr>
+         *   <td>access_token</td>
+         *   <td>String</td>
+         *   <td>Access token of Facebook.</td>
+         *   <td>This is mandatory.</td>
+         *   </tr>
+         *   </tbody>
+         *   </table>
+         *
+         *   <br><b> Twitter </b>
+         *   <table border="1" cellspacing="0">
+         *   <thead>
+         *   <tr bgcolor="#CCCCFF">
+         *   <th>Key</th>
+         *   <th>Value type</th>
+         *   <th>Value</th>
+         *   <th>Note</th>
+         *   </tr>
+         *   </thead>
+         *   <tbody>
+         *   <tr>
+         *   <td>oauth_token</td>
+         *   <td>String</td>
+         *   <td>OAuth access token of twitter.</td>
+         *   <td>This is mandatory.</td>
+         *   </tr>
+         *   <tr>
+         *   <td>oauth_token_secret</td>
+         *   <td>String</td>
+         *   <td>OAuth access token secret of twitter.</td>
+         *   <td>This is mandatory.</td>
+         *   </tr>
+         *   </tbody>
+         *   </table>
+         *
+         *   <br><b> Google </b>
+         *   <table border="1" cellspacing="0">
+         *   <thead>
+         *   <tr bgcolor="#CCCCFF">
+         *   <th>Key</th>
+         *   <th>Value type</th>
+         *   <th>Value</th>
+         *   <th>Note</th>
+         *   </tr>
+         *   </thead>
+         *   <tbody>
+         *   <tr>
+         *   <td>access_token</td>
+         *   <td>String</td>
+         *   <td>Access token of Google.</td>
+         *   <td>This is mandatory.</td>
+         *   </tr>
+         *   </tbody>
+         *   </table>
+         *
+         *   <br><b> Renren </b>
+         *   <table border="1" cellspacing="0">
+         *   <thead>
+         *   <tr bgcolor="#CCCCFF">
+         *   <th>Key</th>
+         *   <th>Value type</th>
+         *   <th>Value</th>
+         *   <th>Note</th>
+         *   </tr>
+         *   </thead>
+         *   <tbody>
+         *   <tr>
+         *   <td>access_token</td>
+         *   <td>String</td>
+         *   <td>Access token of Renren.</td>
+         *   <td>This is mandatory.</td>
+         *   </tr>
+         *   </tbody>
+         *   </table>
+         *
+         *   <br><b> QQ </b>
+         *   <table border="1" cellspacing="0">
+         *   <thead>
+         *   <tr bgcolor="#CCCCFF">
+         *   <th>Key</th>
+         *   <th>Value type</th>
+         *   <th>Value</th>
+         *   <th>Note</th>
+         *   </tr>
+         *   </thead>
+         *   <tbody>
+         *   <tr>
+         *   <td>access_token</td>
+         *   <td>String</td>
+         *   <td>Access token of QQ.</td>
+         *   <td>This is mandatory. </td>
+         *   </tr>
+         *   <tr>
+         *   <td>openID</td>
+         *   <td>String</td>
+         *   <td>OpenID of QQ.</td>
+         *   <td>This is mandatory.</td>
+         *   </tr>
+         *   </tbody>
+         *   </table>
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is Array instance.
+         *       <ul>
+         *         <li>params[0] is a linked KiiUser instance.</li>
+         *         <li>params[1] is the KiiSocialNetworkName used to link.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is current logged-in KiiUser instance. If there is not logged-in user, it will be null.</li>
+         *         <li>error.message</li>
+         *         <li>error.network is the KiiSocialNetworkName used to link.</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *      // example to use callbacks directly
+         *      // Example of using no option
+         *      KiiSocialConnect.linkCurrentUserWithNetwork(KiiSocialNetworkName.FACEBOOK, null, {
+         *
+         *          success: function(user, network) {
+         *              // do something now that the user is linked
+         *          },
+         *
+         *          failure: function(user, network, anErrorString) {
+         *              // do something with the error response
+         *          }
+         *      });
+         *
+         *      // example to use Promise
+         *      // Example of using no option
+         *      KiiSocialConnect.linkCurrentUserWithNetwork(KiiSocialNetworkName.FACEBOOK, null).then(
+         *          function(params) {
+         *              // do something now that the user is linked
+         *          },
+         *          function(error) {
+         *              // do something with the error response
+         *          }
+         *      );
+         */
+        static linkCurrentUserWithNetwork(networkName: KiiSocialNetworkName, options: KiiSocialConnectOptions, callbacks?: { success(user: KiiUser, network: KiiSocialNetworkName): any; failure(user: KiiUser, network: KiiSocialNetworkName, anErrorString: string): any; }): Promise<[KiiUser, KiiSocialNetworkName]>;
+
+        /**
+         * Unlink the currently logged in user with a social network
+         *
+         *  The network must already be set up via setupNetwork
+         *
+         * @param networkName One of the supported KiiSocialNetworkName values
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is Array instance.
+         *       <ul>
+         *         <li>params[0] is a unlinked KiiUser instance.</li>
+         *         <li>params[1] is the KiiSocialNetworkName used to unlink.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is current logged-in KiiUser instance. If there is not logged-in user, it will be null.</li>
+         *         <li>error.message</li>
+         *         <li>error.network is the KiiSocialNetworkName used to unlink.</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *
+         *      // example to use callbacks directly
+         *      KiiSocialConnect.unLinkCurrentUserFromNetwork(KiiSocialNetworkName.FACEBOOK, {
+         *
+         *          success: function(user, network) {
+         *              // do something now that the user is unlinked
+         *          },
+         *
+         *          failure: function(user, network, anErrorString) {
+         *              // do something with the error response
+         *          }
+         *      });
+         *
+         *      // example to use Promise
+         *      KiiSocialConnect.unLinkCurrentUserFromNetwork(KiiSocialNetworkName.FACEBOOK).then(
+         *          function(params) {
+         *              // do something now that the user is unlinked
+         *          },
+         *          function(error) {
+         *              // do something with the error response
+         *          }
+         *      );
+         */
+        static unLinkCurrentUserFromNetwork(networkName: KiiSocialNetworkName, callbacks?: { success(user: KiiUser, network: KiiSocialNetworkName): any; failure(user: KiiUser, network: KiiSocialNetworkName, anErrorString: string): any; }): Promise<[KiiUser, KiiSocialNetworkName]>;
+
+        /**
+         * Retrieve the current user's access token from a social network
+         * The network must be set up and linked to the current user. It is recommended you save this to preferences for multi-session use.
+         *
+         * @deprecated Use {@link KiiSocialConnect.getAccessTokenObjectForNetwork} instead.
+         *
+         * @param networkName One of the supported KiiSocialNetworkName values
+         *
+         * @return The current access token, null if unavailable
+         */
+        static getAccessTokenForNetwork(networkName: KiiSocialNetworkName): string;
+
+        /**
+         * Retrieve the current user's access token expiration date from a social network
+         *
+         * The network must be set up and linked to the current user. It is recommended you save this to preferences for multi-session use.
+         *
+         * @deprecated Use {@link KiiSocialConnect.getAccessTokenObjectForNetwork} instead.
+         *
+         * @param networkName One of the supported KiiSocialNetworkName values
+         *
+         * @return The current access token expiration date, null if unavailable
+         */
+        static getAccessTokenExpirationForNetwork(networkName: KiiSocialNetworkName): string;
+
+        /**
+         * Retrieve the current user's access token object from a social network
+         *
+         * The network must be set up and linked to the current user.
+         * It is recommended you save this to preferences for multi-session use.<br><br>
+         * Following parameters can be assigned to object.<br><br>
+         * <b>Facebook</b>
+         * <li>access_token</li>
+         * <li>expires_in</li>
+         * <li>kii_new_user</li>
+         * <br>
+         * <b>Twitter</b>
+         * <li>oauth_token</li>
+         * <li>oauth_token_secret</li>
+         * <li>kii_new_user</li>
+         * <br>
+         * <b>Google</b>
+         * <li>access_token</li>
+         * <li>kii_new_user</li>
+         * <br>
+         * <b>RenRen</b>
+         * <li>access_token</li>
+         * <li>kii_new_user</li>
+         * <br>
+         * <b>QQ</b>
+         * <li>access_token</li>
+         * <li>openID</li>
+         * <li>kii_new_user</li>
+         *
+         * @param networkName One of the supported KiiSocialNetworkName values
+         *
+         * @return tokenObject The current access token object, null if unavailable.
+         */
+        static getAccessTokenObjectForNetwork(networkName: KiiSocialNetworkName): any;
+    }
+
+    /**
+     * Represents a Thing object
+     */
+    export class KiiThing {
+        /**
+         * of this thing.
+         * For details refer to {@link KiiThing.register}
+         */
+        fields: KiiThingFields;
+
+        /**
+         * Get thing ID.
+         *
+         * @return thing id
+         */
+        getThingID(): string;
+
+        /**
+         * Get vendor thing ID.
+         *
+         * @return vendor thing id
+         */
+        getVendorThingID(): string;
+
+        /**
+         * Get access token of this thing.
+         *
+         * @return access token of this thing.
+         */
+        getAccessToken(): string;
+
+        /**
+         * Get created time of this thing.
+         *
+         * @return created time of this thing.
+         */
+        getCreated(): Date;
+
+        /**
+         * Get disabled status of this thing.
+         *
+         * @return true if thing is disabled, false otherwise.
+         */
+        getDisabled(): boolean;
+
+        /**
+         * Register thing in KiiCloud.<br>
+         * This API doesnt require users login Anonymous user can register thing.
+         * <br>
+         * Propertis started with '_' in the fields is reserved by Kii Cloud.<br>
+         * Those properties are indexed in Kii Cloud storage.<br>
+         * Properties not started with '_' is custom properties defined by developer.<br>
+         * Custom properties are not indexed in KiiCloud storage.<br>
+         * Following properties are readonly and ignored on creation/{@link #update} of thing.<br>
+         * '_thingID', '_created', '_accessToken' <br>
+         * Following properties are readonly after creation and will be ignored on {@link #update} of thing.<br>
+         * '_vendorThingID', '_password'<br>
+         * As Property prefixed with '_' is reserved by Kii Cloud,
+         * properties other than ones described in the parameter secion
+         * and '_layoutPosition' are ignored on creation/{@link #update} of thing.<br>
+         * Those ignored properties won't be removed from fields object passed as argument.
+         * However it won't be reflected to fields object property of created/updated Thing.
+         *
+         * @param fields of the thing to be registered.
+         * @param callbacks object holds callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(thing). thing is a KiiThing instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiThing instance.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     KiiThing.register(
+         *         {
+         *             _vendorThingID: "thing-XXXX-YYYY-ZZZZZ",
+         *             _password: "thing-password",
+         *             _thingType: "thermometer",
+         *             yourCustomObj: // Arbitrary key can be used.
+         *             { // Object, Array, Number, String can be used. Should be compatible with JSON.
+         *                 yourCustomKey1: "value",
+         *                 yourCustomKey2: 100
+         *             }
+         *         },
+         *         {
+         *             success: function(thing) {
+         *                 // Register Thing succeeded.
+         *             },
+         *             failure: function(error) {
+         *                 // Handle error.
+         *             }
+         *         }
+         *     );
+         *
+         *     // example to use Promise
+         *     KiiThing.register(
+         *         {
+         *             _vendorThingID: "thing-XXXX-YYYY-ZZZZZ",
+         *             _password: "thing-password",
+         *             _thingType: "thermometer",
+         *             yourCustomObj: // Arbitrary key can be used.
+         *             { // Object, Array, Number, String can be used. Should be compatible with JSON.
+         *                 yourCustomKey1: "value",
+         *                 yourCustomKey2: 100
+         *             }
+         *         }
+         *     ).then(
+         *         function(thing) {
+         *             // Register Thing succeeded.
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        static register(fields: KiiThingFields, callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
+
+        /**
+         * Retrieve the latest thing information from KiiCloud.
+         * <br>This API is authorized by owner of thing.
+         * <br>Need user login who owns this thing before execute this API.
+         * <br>To let users to own thing, please call {@link KiiThing#registerOwner}
+         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
+         * API is authorized by app admin.<br>
+         *
+         * @param callbacks object holds callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(thing). thing is KiiThing instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiThing instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // assume thing is already registered.
+         *     thing.refresh({
+         *         success: function(thing) {
+         *             // Refresh succeeded.
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     // assume thing is already registered.
+         *     thing.refresh().then(
+         *         function(thing) {
+         *             // Refresh succeeded.
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        refresh(callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
+
+        /**
+         * Update registered thing information in Kii Cloud
+         * <br>This API is authorized by owner of thing.
+         * <br>Need user login who owns this thing before execute this API.
+         * <br>To let users to own thing, please call {@link KiiThing#registerOwner}
+         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
+         * API is authorized by app admin.<br>
+         *
+         * @param callbacks object holds callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(thing). thing is a KiiThing instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiThing instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @see KiiThing.register
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // assume thing is already registered.
+         *     thing.fields._stringField1 = "new string value";
+         *     thing.fields.customObject = {
+         *         "customField1" : "abcd",
+         *         "customField2" : 123
+         *     };
+         *     thing.update({
+         *         success: function(thing) {
+         *             // Update succeeded.
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     // assume thing is already registered.
+         *     thing.fields._stringField1 = "new string value";
+         *     thing.fields.customObject = {
+         *         "customField1" : "abcd",
+         *         "customField2" : 123
+         *     };
+         *     thing.update().then(
+         *         function(thing) {
+         *             // Update succeeded.
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        update(callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
+
+        /**
+         * Delete registered thing in Kii Cloud.
+         * <br>This API is authorized by owner of thing.
+         * <br>Need user login who owns this thing before execute this API.
+         * <br>To let users to own thing, please call {@link KiiThing#registerOwner}
+         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
+         * API is authorized by app admin.<br>
+         *
+         * It will delete bucket, topic which belongs to this thing,
+         * entity belongs to the bucket/topic and all ownership information of thing.
+         * This operation can not be reverted. Please carefully use this.
+         *
+         * @param callbacks object holds callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(thing). thing is a KiiThing instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiThing instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // assume thing is already registered.
+         *     thing.deleteThing({
+         *         success: function(thing) {
+         *             // Delete succeeded.
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     // assume thing is already registered.
+         *     thing.deleteThing().then(
+         *         function(thing) {
+         *             // Delete succeeded.
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        deleteThing(callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
+
+        /**
+         * Check if user/ group is owner of the thing.
+         * <br>This API is authorized by owner of thing.
+         * <br>Need user login before execute this API.
+         * <br>To let users to own Thing, please call {@link KiiThing#registerOwner}
+         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
+         * API is authorized by app admin.<br>
+         *
+         * @param owner whether the instance is owner of thing or not.
+         * @param callbacks object holds callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is an Array instance.
+         *       <ul>
+         *         <li>params[0] is the KiiThing instance which this method was called on.</li>
+         *         <li>params[1] is a KiiUser/KiiGroup instance.</li>
+         *         <li>params[2] is Boolean value, true is the user/group is owner of the thing, otherwise false.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiThing instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // assume thing/user is already registered.
+         *     var user = KiiUser.userWithURI("kiicloud://users/xxxyyyy");
+         *     thing.isOwner(user, {
+         *         success: function(thing, user, isOwner) {
+         *             if (isOwner) {
+         *                 // user is owner of the thing.
+         *             } else {
+         *                 // user is not owner of the thing.
+         *             }
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     // assume thing/user is already registered.
+         *     var user = KiiUser.userWithURI("kiicloud://users/xxxyyyy");
+         *     thing.isOwner(user).then(
+         *         function(params) {
+         *             var thing = params[0];
+         *             var user = params[1];
+         *             var isOwner = params[2];
+         *             if (isOwner) {
+         *                 // user is owner of the thing.
+         *             } else {
+         *                 // user is not owner of the thing.
+         *             }
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        isOwner<T extends KiiUser | KiiGroup>(owner: T, callbacks?: { success(thing: KiiThing, user: T, isOwner: boolean): any; failure(error: Error): any; }): Promise<[KiiThing, T, boolean]>;
+
+        /**
+         * Register user/group as owner of this thing.
+         * <br>Need user login before execute this API.
+         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
+         * API is authorized by app admin.<br>
+         *
+         * @param owner to be registered as owner.
+         * @param callbacks object holds callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is an Array instance.
+         *       <ul>
+         *         <li>params[0] is the KiiThing instance which this method was called on.</li>
+         *         <li>params[1] is a KiiUser/KiiGroup instance.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiThing instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // assume thing/group is already registered.
+         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
+         *     thing.registerOwner(group, {
+         *         success: function(thing, group) {
+         *             // Register owner succeeded.
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     // assume thing/group is already registered.
+         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
+         *     thing.registerOwner(group).then(
+         *         function(params) {
+         *             // Register owner succeeded.
+         *             var thing = params[0];
+         *             var group = params[1];
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        registerOwner<T extends KiiUser | KiiGroup>(owner: T, callbacks?: { success(thing: KiiThing, group: T): any; failure(error: Error): any; }): Promise<[KiiThing, T]>;
+
+        /**
+         * Register user/group as owner of specified thing.
+         * <br>Need user login before execute this API.
+         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
+         * API is authorized by app admin.<br>
+         *
+         * @param thingID The ID of thing
+         * @param owner instance of KiiUser/KiiGroup to be registered as owner.
+         * @param callbacks object holds callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is an Array instance.
+         *       <ul>
+         *         <li>params[0] is a KiiUser/KiiGroup instance.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // assume thing/group is already registered.
+         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
+         *     KiiThing.registerOwnerWithThingID("th.xxxx-yyyy-zzzz", group, {
+         *         success: function(group) {
+         *             // Register owner succeeded.
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     // assume thing/group is already registered.
+         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
+         *     KiiThing.registerOwnerWithThingID("th.xxxx-yyyy-zzzz", group).then(
+         *         function(params) {
+         *             // Register owner succeeded.
+         *             var group = params[0];
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        static registerOwnerWithThingID<T extends KiiUser | KiiGroup>(thingID: string, owner: T, callbacks?: { success(group: T): any; failure(error: Error): any; }): Promise<T>;
+
+        /**
+         * Register user/group as owner of specified thing.
+         * <br>Need user login before execute this API.
+         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
+         * API is authorized by app admin.<br>
+         *
+         * @param vendorThingID The vendor thing ID of thing
+         * @param owner instance of KiiUser/KiiGroup to be registered as owner.
+         * @param callbacks object holds callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is an Array instance.
+         *       <ul>
+         *         <li>params[0] is a KiiUser/KiiGroup instance.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // assume thing/group is already registered.
+         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
+         *     KiiThing.registerOwnerWithVendorThingID("xxxx-yyyy-zzzz", group, {
+         *         success: function(group) {
+         *             // Register owner succeeded.
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     // assume thing/group is already registered.
+         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
+         *     KiiThing.registerOwnerWithVendorThingID("xxxx-yyyy-zzzz", group).then(
+         *         function(group) {
+         *             // Register owner succeeded.
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        static registerOwnerWithVendorThingID<T extends KiiUser | KiiGroup>(vendorThingID: string, owner: T, callbacks?: { success(group: T): any; failure(error: Error): any; }): Promise<T>;
+
+        /**
+         * Remove ownership of thing from specified user/group.
+         * <br>This API is authorized by owner of thing.
+         * <br>Need user login who owns this thing before execute this API.
+         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
+         * API is authorized by app admin.<br>
+         *
+         * @param owner to be unregistered.
+         * @param callbacks object holds callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is an Array instance.
+         *       <ul>
+         *         <li>params[0] is the KiiThing instance which this method was called on.</li>
+         *         <li>params[1] is a KiiUser/KiiGroup instance which had ownership of the thing removed.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiThing instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // assume thing/group is already registered.
+         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
+         *     thing.unregisterOwner(group, {
+         *         success: function(thing, group) {
+         *             // Unregister owner succeeded.
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     // assume thing/group is already registered.
+         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
+         *     thing.unregisterOwner(group).then(
+         *         function(params) {
+         *             // Unregister owner succeeded.
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        unregisterOwner<T extends KiiUser | KiiGroup>(owner: T, callbacks?: { success(thing: KiiThing, group: T): any; failure(error: Error): any; }): Promise<[KiiThing, T]>;
+
+        /**
+         * Disable the thing.
+         * <br>This API is authorized by owner of thing.
+         * <br>Need user login who owns this thing before execute this API.
+         * <br>To let users to own Thing, please call {@link KiiThing#registerOwner}
+         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
+         * API is authorized by app admin.<br>
+         *
+         * After succeeded, access token published for thing is disabled.
+         * In a result, only the app administrator and owners of thing can access the thing.
+         * Used when user lost the thing and avoid using by unknown users.
+         * It doesn't throw error when the thing is already disabled.
+         *
+         * @param callbacks object holds callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(thing). thing is a KiiThing instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiThing instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // assume thing is already registered.
+         *     thing.disable({
+         *         success: function(thing) {
+         *             // Disable succeeded.
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     // assume thing is already registered.
+         *     thing.disable().then(
+         *         function(thing) {
+         *             // Disable succeeded.
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        disable(callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
+
+        /**
+         * Enable the thing.
+         * <br>This API is authorized by owner of thing.
+         * <br>Need user login who owns this thing before execute this API.
+         * <br>To let users to own Thing, please call {@link KiiThing#registerOwner}
+         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
+         * API is authorized by app admin.<br>
+         *
+         * After succeeded, If thing is registered with "persistentToken" option,
+         * token should be recovered (Access token which is used before disabling can be available).
+         * Otherwise, it does not recovered.
+         * It doesn't throw error when the thing is already enabled.
+         *
+         * @param callbacks object holds callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(thing). thing is a KiiThing instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiThing instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // assume thing is already registered.
+         *     thing.enable({
+         *         success: function(thing) {
+         *             // Enable succeeded.
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     // assume thing is already registered.
+         *     thing.enable().then(
+         *         function(thing) {
+         *             // Disable succeeded.
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        enable(callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
+
+        /**
+         * Load thing with given vendor thing id.
+         * <br>This API is authorized by owner of thing.
+         * <br>Need user login who owns this thing before execute this API.
+         * <br>To let users to own Thing, please call {@link KiiThing#registerOwner}
+         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
+         * API is authorized by app admin.<br>
+         *
+         * @param vendorThingID registered vendor thing id.
+         * @param callbacks object holds callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(thing). thing is a KiiThing instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     KiiThing.loadWithVendorThingID("thing-xxxx-yyyy",{
+         *         success: function(thing) {
+         *             // Load succeeded.
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     KiiThing.loadWithVendorThingID("thing-xxxx-yyyy").then(
+         *         function(thing) {
+         *             // Load succeeded.
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        static loadWithVendorThingID(vendorThingID: string, callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
+
+        /**
+         * Load thing with thing id given by Kii Cloud.
+         * <br>This API is authorized by owner of thing.
+         * <br>Need user login who owns this thing before execute this API.
+         * <br>To let users to own Thing, please call {@link KiiThing#registerOwner}
+         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
+         * API is authorized by app admin.<br>
+         *
+         * thing id can be obtained by {@link thingID}
+         *
+         * @param thingID registered thing id.
+         * @param callbacks object holds callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(thing). thing is a KiiThing instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     KiiThing.loadWithThingID("thing-xxxx-yyyy",{
+         *         success: function(thing) {
+         *             // Load succeeded.
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     KiiThing.loadWithVendorThingID("thing-xxxx-yyyy").then(
+         *         function(thing) {
+         *             // Load succeeded.
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        static loadWithThingID(thingID: string, callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
+
+        /**
+         * Instantiate bucket belongs to this thing.
+         *
+         * @param bucketName name of the bucket.
+         *
+         * @return bucket instance.
+         */
+        bucketWithName(bucketName: string): KiiBucket;
+
+        /**
+         * Creates a reference to a encrypted bucket for this thing
+         *
+         * <br><br>The bucket will be created/accessed within this thing's scope
+         *
+         * @param bucketName The name of the bucket the user should create/access
+         *
+         * @return A working KiiEncryptedBucket object
+         *
+         * @example
+         *     var thing = . . .; // a KiiThing
+         *     var bucket = thing.encryptedBucketWithName("myBucket");
+         */
+        encryptedBucketWithName(bucketName: string): KiiBucket;
+
+        /**
+         * Instantiate topic belongs to this thing.
+         *
+         * @param topicName name of the topic. Must be a not empty string.
+         *
+         * @return topic instance.
+         */
+        topicWithName(topicName: string): KiiTopic;
+
+        /**
+         * Gets a list of topics in this thing scope
+         *
+         * @param callbacks An object with callback methods defined
+         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success. If empty string or no string object is provided, this API regards no paginationKey specified.
+         *
+         * @return return promise object.
+         *     <ul>
+         *       <li>fulfill callback function: function(params). params is Array instance.
+         *         <ul>
+         *           <li>params[0] is array of KiiTopic instances.</li>
+         *           <li>params[1] is string of nextPaginationKey.</li>
+         *         </ul>
+         *       </li>
+         *       <li>reject callback function: function(error). error is an Error instance.
+         *         <ul>
+         *           <li>error.target is the KiiThing instance which this method was called on. </li>
+         *           <li>error.message</li>
+         *         </ul>
+         *       </li>
+         *     </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var thing = . . .; // a KiiThing
+         *     thing.listTopics({
+         *         success: function(topicList, nextPaginationKey) {
+         *             // do something with the result
+         *             for(var i=0; i&lt;topicList.length; i++){
+         *                 var topic = topicList[i];
+         *             }
+         *             if (nextPaginationKey != null) {
+         *                 thing.listTopics({
+         *                     success: function(topicList, nextPaginationKey) {...},
+         *                     failure: function(anErrorString) {...}
+         *                 }, nextPaginationKey);
+         *             }
+         *         },
+         *         failure: function(anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use promise
+         *     var thing = . . .; // a KiiThing
+         *     thing.listTopics().then(
+         *         function(params) {
+         *             var topicList = params[0];
+         *             var nextPaginationKey = params[1];
+         *             // do something with the result
+         *             for(var i=0; i&lt;topicList.length; i++){
+         *                 var topic = topicList[i];
+         *             }
+         *             if (nextPaginationKey != null) {
+         *                 thing.listTopics(null, nextPaginationKey).then(
+         *                     function(params) {...},
+         *                     function(error) {...}
+         *                 );
+         *             }
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        listTopics(callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; }, paginationKey?: string): Promise<[KiiTopic[], string]>;
+
+        /**
+         * Instantiate push subscription for this thing.
+         *
+         * @return push subscription object.
+         */
+        pushSubscription(): KiiPushSubscription;
+    }
+
+    /**
+     * Represents a Topic object.
+     */
+    export class KiiTopic {
+        /**
+         * get name of this topic
+         *
+         * @return name of this topic.
+         */
+        getName(): string;
+
+        /**
+         * Checks whether the topic already exists or not.
+         *
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(existed). true if the topic exists.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiTopic instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // assume topic is already instantiated.
+         *     topic.exists({
+         *         success: function(existed) {
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     // assume topic is already instantiated.
+         *     topic.exists().then(
+         *         function(existed){
+         *         },
+         *         function(error){
+         *             // Handle error.
+         *         });
+         */
+        exists(callbacks?: { success(existed: boolean): any; failure(error: Error): any; }): Promise<boolean>;
+
+        /**
+         * Save this topic on Kii Cloud.
+         * Note that only app admin can save application scope topic.
+         *
+         * @param callbacks callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theSavedTopic). theSavedTopic is a KiiTopic instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiTopic instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // assume topic is already instantiated.
+         *     topic.save({
+         *         success: function(topic) {
+         *             // Save topic succeeded.
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     // assume topic is already instantiated.
+         *     topic.save().then(
+         *         function(topic) {
+         *             // Save topic succeeded.
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        save(callbacks?: { success(topic: KiiTopic): any; failure(error: Error): any; }): Promise<KiiTopic>;
+
+        /**
+         * Send message to the topic.
+         *
+         * @param message to be sent.
+         * @param callbacks callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is an Array instance.
+         *       <ul>
+         *         <li>params[0] is the KiiTopic instance which this method was called on.</li>
+         *         <li>params[1] is the message object to send.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiTopic instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // assume topic is already instantiated.
+         *     var contents = {
+         *         message : "hello push!"
+         *     };
+         *     var message = new KiiPushMessageBuilder(contents).build();
+         *     topic.sendMessage(message, {
+         *         success: function(topic, message) {
+         *             // Send message succeeded.
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     // assume topic is already instantiated.
+         *     var contents = {
+         *         message : "hello push!"
+         *     };
+         *     var message = new KiiPushMessageBuilder(contents).build();
+         *     topic.sendMessage(message).then(
+         *         function(params) {
+         *             // Send message succeeded.
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        sendMessage<T>(message: T, callbacks?: { success(topic: KiiTopic, message: T): any; failure(error: Error): any; }): Promise<[KiiTopic, T]>;
+
+        /**
+         * Delete the topic.
+         *
+         * @param callbacks callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theDeletedTopic). theDeletedTopic is a KiiTopic instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiTopic instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // assume topic is already instantiated.
+         *     topic.deleteTopic({
+         *         success: function(topic) {
+         *             // Delete topic succeeded.
+         *         },
+         *         failure: function(error) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     // assume topic is already instantiated.
+         *     topic.deleteTopic().then(
+         *         function(topic) {
+         *             // Delete topic succeeded.
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        deleteTopic(callbacks?: { success(topic: KiiTopic): any; failure(error: Error): any; }): Promise<KiiTopic>;
+
+        /**
+         * Get ACL object of this topic.
+         * Access to topic can be configured by adding/removing KiiACLEntry
+         * to/from obtained acl object.
+         *
+         * @return acl object of this topic.
+         */
+        acl(): KiiACL;
+    }
+
+    /**
+     * Represents a KiiUser object
+     */
+    export class KiiUser {
+        /**
+         *
+         *
+         * @deprecated Use {@link KiiUser.getId} instead.
+         *   Get the UUID of the given user, assigned by the server
+         *
+         * @return
+         */
+        getUUID(): string;
+
+        /**
+         * Get the ID of the current KiiUser instance.
+         *
+         * @return Id of the user or null if the user has not saved to cloud.
+         */
+        getID(): string;
+
+        /**
+         * Get the username of the given user
+         *
+         * @return
+         */
+        getUsername(): string;
+
+        /**
+         * Return true if the user is disabled, false when enabled and undefined
+         * when user is not refreshed.
+         * Call {@link KiiUser#refresh()} prior calling this method to get
+         * correct status.
+         */
+        disabled(): void;
+
+        /**
+         * Get the display name associated with this user
+         *
+         * @return
+         */
+        getDisplayName(): string;
+
+        /**
+         * Set the display name associated with this user. Cannot be used for logging a user in; is non-unique
+         *
+         * @param value Must be between 1-50 alphanumeric characters.
+         *
+         * @throws If the displayName is not a valid format
+         */
+        setDisplayName(value: string): void;
+
+        /**
+         * Get whether or not the user is pseudo user.
+         * If this method is not called for current login user, calling
+         * {@link KiiUser#refresh()} method is necessary to get a correct value.
+         *
+         * @return whether this user is pseudo user or not.
+         */
+        isPseudoUser(): boolean;
+
+        /**
+         * Get the email address associated with this user
+         *
+         * @return
+         */
+        getEmailAddress(): string;
+
+        /**
+         * Get the phone number associated with this user
+         *
+         * @return
+         */
+        getPhoneNumber(): string;
+
+        /**
+         * Get the country code associated with this user
+         *
+         * @return
+         */
+        getCountry(): string;
+
+        /**
+         * Set the country code associated with this user
+         *
+         * @param value The country code to set. Must be 2 alphabetic characters. Ex: US, JP, CN
+         *
+         * @throws If the country code is not a valid format
+         */
+        setCountry(value: string): void;
+
+        /**
+         * Get the server's creation date of this user
+         *
+         * @return
+         */
+        getCreated(): string;
+
+        /**
+         *
+         *
+         * @deprecated Get the modified date of the given user, assigned by the server
+         *
+         * @return
+         */
+        getModified(): string;
+
+        /**
+         * Get the status of the user's email verification. This field is assigned by the server
+         *
+         * @return true if the user's email address has been verified by the user, false otherwise.
+         *     Could be undefined if haven't obtained value from server or not allowed to see the value.
+         *     Should be used by current login user to check the email verification status.
+         */
+        getEmailVerified(): boolean;
+
+        /**
+         * Get the status of the user's phone number verification. This field is assigned by the server
+         *
+         * @return true if the user's email address has been verified by the user, false otherwise
+         *     Could be undefined if haven't obtained value from server or not allowed to see the value.
+         *     Should be used by current login user to check the phone verification status.
+         */
+        getPhoneVerified(): boolean;
+
+        /**
+         * Get the social accounts that is linked to this user.
+         * Refresh the user by {@link KiiUser#refresh()} prior call the method.
+         * Otherwise, it returns empty object.
+         *
+         * @return Social network name as key and account info as value.
+         */
+        getLinkedSocialAccounts(): { [name: string]: KiiSocialAccountInfo };
+
+        /**
+         * Get the access token for the user - only available if the user is currently logged in
+         *
+         * @return
+         */
+        getAccessToken(): string;
+
+        /**
+         * Return the access token and token expire time in a object.
+         * <table border=4 width=250>
+         *   <tr>
+         *     <th>Key</th>
+         *     <th>Type</th>
+         *     <th>Value</th>
+         *   </tr>
+         *   <tr>
+         *     <td>"access_token"</td>
+         *     <td>String</td>
+         *     <td>required for accessing KiiCloud</td>
+         *   </tr>
+         *   <tr>
+         *     <td>"expires_at"</td>
+         *     <td>Date</td>
+         *     <td>Access token expiration time, null if the user is not login user.</td>
+         *   </tr>
+         * </table>
+         *
+         * @return Access token and token expires in a object.
+         */
+        getAccessTokenObject(): KiiAccessTokenObject;
+
+        /**
+         * Get a specifically formatted string referencing the user
+         *
+         * <br><br>The user must exist in the cloud (have a valid UUID).
+         *
+         * @return A URI string based on the given user. null if a URI couldn't be generated.
+         *
+         * @example
+         *     var user = . . .; // a KiiUser
+         *     var uri = user.objectURI();
+         */
+        objectURI(): string;
+
+        /**
+         * Sets a key/value pair to a KiiUser
+         *
+         * <br><br>If the key already exists, its value will be written over. If the object is of invalid type, it will return false and a KiiError will be thrown (quietly). Accepted types are any JSON-encodable objects.
+         *
+         * @param key The key to set. The key must not be a system key (created, metadata, modified, type, uuid) or begin with an underscore (_)
+         * @param value The value to be set. Object must be of a JSON-encodable type (Ex: dictionary, array, string, number, etc)
+         *
+         * @example
+         *     var user = . . .; // a KiiUser
+         *     user.set("score", 4298);
+         */
+        set(key: string, value: any): void;
+
+        /**
+         * Gets the value associated with the given key
+         *
+         * @param key The key to retrieve
+         *
+         * @return The object associated with the key. null or undefined if none exists
+         *
+         * @example
+         *     var user = . . .; // a KiiUser
+         *     var score = user.get("score");
+         */
+        get<T>(key: string): T;
+
+        /**
+         * The currently authenticated user
+         *
+         * @return
+         *
+         * @example
+         *         var user = KiiUser.getCurrentUser();
+         */
+        static getCurrentUser(): KiiUser;
+
+        /**
+         * Create a user object to prepare for registration with credentials pre-filled
+         *
+         * <br><br>Creates an pre-filled user object for manipulation. This user will not be authenticated until one of the authentication methods are called on it. It can be treated as any other KiiObject before it is authenticated.
+         *
+         * @param username The user's desired username. Must be between 3 and 64 characters, which can include alphanumeric characters as well as underscores '_', dashes '-' and periods '.'
+         * @param password The user's password. Must be between 4-50 characters, made up of ascii characters excludes control characters.
+         *
+         * @return a working KiiUser object
+         *
+         * @throws If the username is not in the proper format
+         * @throws If the password is not in the proper format
+         *
+         * @example
+         *     var user = KiiUser.userWithUsername("myusername", "mypassword");
+         */
+        static userWithUsername(username: string, password: string): KiiUser;
+
+        /**
+         * Create a user object to prepare for registration with credentials pre-filled
+         *
+         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before it is registered.
+         *
+         * @param phoneNumber The user's phone number
+         * @param password The user's password. Must be at least 4 characters, made up of alphanumeric and/or: @,#,$,%,^,&
+         *
+         * @return a working KiiUser object
+         *
+         * @throws If the password is not in the proper format
+         * @throws If the phone number is not in the proper format
+         *
+         * @example
+         *     var user = KiiUser.userWithPhoneNumber("+874012345678", "mypassword");
+         */
+        static userWithPhoneNumber(phoneNumber: string, password: string): KiiUser;
+
+        /**
+         * Create a user object to prepare for registration with credentials pre-filled
+         *
+         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before it is registered.
+         *
+         * @param phoneNumber The user's phone number
+         * @param username The user's desired username. Must be between 3 and 64 characters, which can include alphanumeric characters as well as underscores '_', dashes '-' and periods '.'
+         * @param password The user's password. Must be at least 4 characters, made up of alphanumeric and/or: @,#,$,%,^,&
+         *
+         * @return a working KiiUser object
+         *
+         * @throws If the username is not in the proper format
+         * @throws If the password is not in the proper format
+         * @throws If the phone number is not in the proper format
+         *
+         * @example
+         *     var user = KiiUser.userWithPhoneNumberAndUsername("+874012345678", "johndoe", "mypassword");
+         */
+        static userWithPhoneNumberAndUsername(phoneNumber: string, username: string, password: string): KiiUser;
+
+        /**
+         * Create a user object to prepare for registration with credentials pre-filled
+         *
+         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before it is registered.
+         *
+         * @param emailAddress The user's email address
+         * @param password The user's password. Must be at least 4 characters, made up of alphanumeric and/or: @,#,$,%,^,&
+         *
+         * @return a working KiiUser object
+         *
+         * @throws If the password is not in the proper format
+         * @throws If the email address is not in the proper format
+         *
+         * @example
+         *     var user = KiiUser.userWithEmailAddress("johndoe@example.com", "mypassword");
+         */
+        static userWithEmailAddress(emailAddress: string, password: string): KiiUser;
+
+        /**
+         * Create a user object to prepare for registration with credentials pre-filled
+         *
+         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before it is registered.
+         *
+         * @param emailAddress The user's email address
+         * @param username The user's desired username. Must be between 3 and 64 characters, which can include alphanumeric characters as well as underscores '_', dashes '-' and periods '.'
+         * @param password The user's password. Must be at least 4 characters, made up of alphanumeric and/or: @,#,$,%,^,&
+         *
+         * @return a working KiiUser object
+         *
+         * @throws If the username is not in the proper format
+         * @throws If the password is not in the proper format
+         * @throws If the phone number is not in the proper format
+         *
+         * @example
+         *     var user = KiiUser.userWithEmailAddressAndUsername("johndoe@example.com", "johndoe", "mypassword");
+         */
+        static userWithEmailAddressAndUsername(emailAddress: string, username: string, password: string): KiiUser;
+
+        /**
+         * Create a user object to prepare for registration with credentials pre-filled
+         *
+         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before it is registered.
+         *
+         * @param emailAddress The user's email address
+         * @param phoneNumber The user's phone number
+         * @param password The user's password. Must be at least 4 characters, made up of alphanumeric and/or: @,#,$,%,^,&
+         *
+         * @return a working KiiUser object
+         *
+         * @throws If the phone number is not in the proper format
+         * @throws If the password is not in the proper format
+         * @throws If the phone number is not in the proper format
+         *
+         * @example
+         *     var user = KiiUser.userWithEmailAddressAndPhoneNumber("johndoe@example.com", "+874012345678", "mypassword");
+         */
+        static userWithEmailAddressAndPhoneNumber(emailAddress: string, phoneNumber: string, password: string): KiiUser;
+
+        /**
+         * Create a user object to prepare for registration with credentials pre-filled
+         *
+         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before it is registered.
+         *
+         * @param emailAddress The user's email address
+         * @param phoneNumber The user's phone number
+         * @param username The user's desired username. Must be between 3 and 64 characters, which can include alphanumeric characters as well as underscores '_', dashes '-' and periods '.'
+         * @param password The user's password. Must be at least 4 characters, made up of alphanumeric and/or: @,#,$,%,^,&
+         *
+         * @return a working KiiUser object
+         *
+         * @throws If the phone number is not in the proper format
+         * @throws If the phone number is not in the proper format
+         * @throws If the username is not in the proper format
+         * @throws If the password is not in the proper format
+         *
+         * @example
+         *     var user = KiiUser.userWithCredentials("johndoe@example.com", "+874012345678", "johndoe", "mypassword");
+         */
+        static userWithCredentials(emailAddress: string, phoneNumber: string, username: string, password: string): KiiUser;
+
+        /**
+         * Instantiate KiiUser that refers to existing user which has specified ID.
+         * You have to specify the ID of existing KiiUser. Unlike KiiObject,
+         * you can not assign ID in the client side.<br>
+         * <b>NOTE</b>: This API does not access to the server.
+         * After instantiation, call {@link KiiUser#refresh} to fetch the properties.
+         *
+         * @param userID ID of the KiiUser to instantiate.
+         *
+         * @return instance of KiiUser.
+         *
+         * @throws when passed userID is empty or null.
+         *
+         * @example
+         *     var user = new KiiUser.userWithID("__USER_ID__");
+         */
+        static userWithID(userID: string): KiiUser;
+
+        /**
+         * Generate a new KiiUser based on a given URI
+         *
+         * @param uri The URI of the object to be represented
+         *
+         * @return A new KiiUser with its parameters filled in from the URI
+         *
+         * @throws If the URI is not in the proper format
+         *
+         * @example
+         *     var user = new KiiUser.userWithURI("kiicloud://myuri");
+         */
+        static userWithURI(uri: string): KiiUser;
+
+        /**
+         * Creates a reference to a bucket for this user
+         *
+         * <br><br>The bucket will be created/accessed within this user's scope
+         *
+         * @param bucketName The name of the bucket the user should create/access
+         *
+         * @return A working KiiBucket object
+         *
+         * @example
+         *     var user = . . .; // a KiiUser
+         *     var bucket = user.bucketWithName("myBucket");
+         */
+        bucketWithName(bucketName: string): KiiBucket;
+
+        /**
+         * Creates a reference to a encrypted bucket for this user
+         *
+         * <br><br>The bucket will be created/accessed within this user's scope
+         *
+         * @param bucketName The name of the bucket the user should create/access
+         *
+         * @return A working KiiEncryptedBucket object
+         *
+         * @example
+         *     var user = . . .; // a KiiUser
+         *     var bucket = user.encryptedBucketWithName("myBucket");
+         */
+        encryptedBucketWithName(bucketName: string): KiiBucket;
+
+        /**
+         * Authenticates a user with the server.
+         * If authentication successful, the user is cached inside SDK as current user,and accessible via
+         * {@link KiiUser.getCurrentUser()}.
+         * User token and token expiration is also cached and can be get by {@link KiiUser#getAccessTokenObject()}.
+         * Access token won't be expired unless you set it explicitly by {@link Kii.setAccessTokenExpiration()}.<br>
+         * If password or userIdentifier is invalid, callbacks.failure or reject callback of promise will be called. <br>
+         *
+         * @param userIdentifier The username, validated email address, or validated phone number of the user to authenticate
+         * @param password The password of the user to authenticate
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theAuthenticatedUser). theAuthenticatedUser is KiiUser instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is a KiiUser instance.If given password or userIdentifier is invalid, it will be null.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     KiiUser.authenticate("myusername", "mypassword", {
+         *         success: function(theAuthenticatedUser) {
+         *             // do something with the authenticated user
+         *         },
+         *
+         *         failure: function(theUser, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     KiiUser.authenticate("myusername", "mypassword").then(
+         *         function(theAuthenticatedUser) {
+         *             // do something with the authenticated user
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        static authenticate(userIdentifier: string, password: string, callbacks?: { success(theAuthenticatedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
+
+        /**
+         * Asynchronously authenticates a user with the server using specified access token.
+         * This method is non-blocking.<br><br>
+         * Specified expiresAt won't be used by SDK. IF login successful,
+         * we set this property so that you can get it later along with token
+         * by {@link KiiUser#getAccessTokenObject()}.<br>
+         * Also, if successful, the user is cached inside SDK as current user
+         * and accessible via {@link KiiUser.getCurrentUser()}.<br>
+         *
+         * Note that, if not specified, token expiration time is not cached
+         * and set to value equivalant to 275760 years.<br>
+         *
+         * If the specified token is expired, authenticataiton will be failed.
+         * Authenticate the user again to renew the token.<br>
+         *
+         * If expiresAt is invalid, callbacks.failure or reject callback of promise will be called. <br>
+         *
+         * @param accessToken A valid access token associated with the desired user
+         * @param callbacks An object with callback methods defined
+         * @param expiresAt Access token expire time that has received by {@link KiiUser#getAccessTokenObject()}. This param is optional and can be omitted.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theAuthenticatedUser). theAuthenticatedUser is KiiUser instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is a KiiUser instance.If expiresAt is invalid, it will be null.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // Assume you stored the object get from KiiUser#getAccessTokenObject()
+         *     // and now accessing by 'tokenObject' var.
+         *     var token = tokenObject["access_token"];
+         *     var expiresAt = tokenObject["expires_at"];
+         *     expireDate.setHours(expireDate.getHours() + 24);
+         *     KiiUser.authenticateWithToken(token, {
+         *         success: function(theAuthenticatedUser) {
+         *             // do something with the authenticated user
+         *         },
+         *
+         *         failure: function(theUser, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     }, expiresAt);
+         *
+         *     // example to use Promise
+         *     // Assume you stored the object get from KiiUser#getAccessTokenObject()
+         *     // and now accessing by 'tokenObject' var.
+         *     var token = tokenObject["access_token"];
+         *     var expiresAt = tokenObject["expires_at"];
+         *     expireDate.setHours(expireDate.getHours() + 24);
+         *     KiiUser.authenticateWithToken(token, null, expiresAt).then(
+         *         function(theAuthenticatedUser) {
+         *             // do something with the authenticated user
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        static authenticateWithToken(accessToken: string, callbacks?: { success(theAuthenticatedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }, expiresAt?: Date): Promise<KiiUser>;
+
+        /**
+         * Registers a user with the server
+         *
+         * <br><br>The user object must have an associated email/password combination.
+         *
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theAuthenticatedUser). theAuthenticatedUser is KiiUser instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is a KiiUser instance.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var user = KiiUser.userWithUsername("myusername", "mypassword");
+         *     user.register({
+         *         success: function(theAuthenticatedUser) {
+         *             // do something with the authenticated user
+         *         },
+         *
+         *         failure: function(theUser, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var user = KiiUser.userWithUsername("myusername", "mypassword");
+         *     user.register().then(
+         *         function(params) {
+         *             // do something with the authenticated user
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        register(callbacks?: { success(theAuthenticatedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
+
+        /**
+         * Registers a user as pseudo user with the server
+         *
+         * @param callbacks An object with callback methods defined.
+         *   This argument is mandatory and can't be ommited.
+         * @param userFields Custom Fields to add to the user. This is optional and can be omitted.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theAuthenticatedUser). theAuthenticatedUser is KiiUser instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var userFields = {"displayName":"yourName", "country":"JP", "age":30};
+         *     KiiUser.registerAsPseudoUser({
+         *         success: function(theAuthenticatedUser) {
+         *             // do something with the authenticated user
+         *         },
+         *
+         *         failure: function(theUser, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     }, userFields);
+         *
+         *     // example to use Promise
+         *     var userFields = {"displayName":"yourName", "country":"JP", "age":30};
+         *     KiiUser.registerAsPseudoUser(null, userFields).then(
+         *         function(theAuthenticatedUser) {
+         *             // do something with the authenticated user
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        static registerAsPseudoUser(callbacks?: { success(theAuthenticatedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }, userFields?: any): Promise<KiiUser>;
+
+        /**
+         * Sets credentials data and custom fields to pseudo user.
+         *
+         * <br><br>This method is exclusive to pseudo user.
+         * <br>password is mandatory and needs to provide at least one of login name, email address or phone number.
+         *
+         * @param identityData
+         * @param password The user's password. Valid pattern is ^[\x20-\x7E]{4,50}$.
+         * @param callbacks An object with callback methods defined.
+         *   This argument is mandatory and can't be ommited.
+         * @param userFields Custom Fields to add to the user. This is optional and can be omitted.
+         * @param removeFields An array of field names to remove from the user custom fields. Default fields are not removed from server.
+         *   This is optional and can be omitted.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(user). user is KiiUser instance which this method was called on.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiUser instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var identityData = { "username": "__USER_NAME_" };
+         *     var userFields = { "displayName":"__DISPLAY_NAME","score":12344300 };
+         *     var removeFields = ["age"];
+         *     user.putIdentity(
+         *         identityData,
+         *         "__PASSWORD__",
+         *         {
+         *             success: function(user) {
+         *               // do something with the updated user.
+         *             },
+         *             failure: function(user, errorString) {
+         *               // check error response.
+         *             }
+         *         },
+         *         userFields,
+         *         removeFields
+         *     );
+         *
+         *     // example to use Promise
+         *     var identityData = { "username": "__USER_NAME_" };
+         *     var userFields = { "displayName":"__DISPLAY_NAME","score":12344300 };
+         *     var removeFields = ["age"];
+         *     user.putIdentity(
+         *         identityData,
+         *         "__PASSWORD__",
+         *         null,
+         *         userFields,
+         *         removeFields
+         *     ).then(
+         *         function(user) {
+         *             // do something with the updated user.
+         *         },
+         *         function(error) {
+         *             // check error response.
+         *         }
+         *     );
+         */
+        putIdentity(identityData: identityData, password: string, callbacks?: { success(user: KiiUser): any; failure(user: KiiUser, errorString: string): any; }, userFields?: any, removeFields?: string[]): Promise<KiiUser>;
+
+        /**
+         * Update user attributes.
+         *
+         *
+         * <br><br>If you want to update identity data of pseudo user, you must use KiiUser.putIdentity instead.
+         *
+         * @param identityData
+         * @param callbacks An object with callback methods defined.
+         *   This argument is mandatory and can't be ommited.
+         * @param userFields Custom Fields to add to the user.
+         * @param removeFields An array of field names to remove from the user custom fields. Default fields are not removed from server.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(user). user is KiiUser instance which this method was called on.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is a KiiUser instance.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var identityData = { "username": "__USER_NAME_" };
+         *     var userFields = { "displayName":"__DISPLAY_NAME","score":12344300 };
+         *     var removeFields = ["age"];
+         *     user.update(
+         *         identityData,
+         *         {
+         *             success: function(user) {
+         *               // do something with the updated user.
+         *             },
+         *             failure: function(user, errorString) {
+         *               // check error response.
+         *             }
+         *         },
+         *         userFields,
+         *         removeFields
+         *     );
+         *
+         *     // example to use Promise
+         *     var identityData = { "username": "__USER_NAME_" };
+         *     var userFields = { "displayName":"__DISPLAY_NAME","score":12344300 };
+         *     var removeFields = ["age"];
+         *     user.update(
+         *         identityData,
+         *         null,
+         *         userFields,
+         *         removeFields
+         *     ).then(
+         *         function(user) {
+         *             // do something with the updated user.
+         *         },
+         *         function(error) {
+         *             // check error response.
+         *         }
+         *     );
+         */
+        update(identityData: identityData, callbacks?: { success(user: KiiUser): any; failure(user: KiiUser, errorString: string): any; }, userFields?: any, removeFields?: string[]): Promise<KiiUser>;
+
+        /**
+         * Update a user's password on the server
+         *
+         * <br><br>Update a user's password with the server. The fromPassword must be equal to the current password associated with the account in order to succeed.
+         *
+         * @param fromPassword The user's current password
+         * @param toPassword The user's desired password. Must be at least 4 characters, made up of alphanumeric and/or: @,#,$,%,^,&
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theUser). theUser is KiiUser instance which this method was called on.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiUser instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var user = Kii.currentUser();
+         *     user.updatePassword("oldpassword", "newpassword", {
+         *         success: function(theUser) {
+         *             // do something
+         *         },
+         *
+         *         failure: function(theUser, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var user = Kii.currentUser();
+         *     user.updatePassword("oldpassword", "newpassword").then(
+         *         function(theUser) {
+         *             // do something
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        updatePassword(fromPassword: string, toPassword: string, callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
+
+        /**
+         * Reset a user's password on the server
+         *
+         * <br><br>Reset a user's password on the server. The user is determined by the specified userIdentifier - which is an email address that has already been associated with an account. Reset instructions will be sent to that identifier.
+         * <br><br><b>Please Note:</b> This will reset the user's access token, so if they are currently logged in - their session will no longer be valid.
+         *
+         * @param userIdentifier The user's email address
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(). No parameter used.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     KiiUser.resetPassword("johndoe@example.com", {
+         *         success: function() {
+         *             // do something
+         *         },
+         *
+         *         failure: function(anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     KiiUser.resetPassword("johndoe@example.com").then(
+         *         function() {
+         *             // do something
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        static resetPassword(userIdentifier: string, callbacks?: { success(): any; failure(anErrorString: string): any; }): Promise<void>;
+
+        /**
+         * Reset the password of user <br>
+         * Reset the password of user specified by given identifier. <br>
+         * This api does not execute login after reset password.
+         *
+         * @param userIdentifier should be valid email address,
+         *   global phone number or user identifier obtained by {@link #getID}.
+         * @param notificationMethod specify the destination of message include link
+         *   of resetting password. must be "EMAIL" or "SMS".
+         *   different type of identifier and destination can be used
+         *   as long as user have verified email, phone.
+         *   (ex. User registers both email and phone. Identifier is email and
+         *   notificationMethod is SMS.)
+         * @param callbacks object includes callback functions.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(). No parameter used.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     KiiUser.resetPasswordWithNotificationMethod("+819001234567", "SMS", {
+         *         success: function() {
+         *             // Operation succeeded.
+         *         },
+         *         failure: function(errString) {
+         *             // Handle error.
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     KiiUser.resetPasswordWithNotificationMethod("+819001234567", "SMS").then(
+         *         function() {
+         *             // Operation succeeded.
+         *         },
+         *         function(error) {
+         *             // Handle error.
+         *         }
+         *     );
+         */
+        static resetPasswordWithNotificationMethod(userIdentifier: string, notificationMethod: string, callbacks?: { success(): any; failure(errString: string): any; }): Promise<void>;
+
+        /**
+         * Verify the current user's phone number
+         * <br><br>This method is used to verify the phone number of user currently
+         * logged in.<br>
+         * Verification code is sent from Kii Cloud when new user is registered with
+         * phone number or user requested to change their phone number in the
+         * application which requires phone verification.<br>
+         * (You can enable/disable phone verification through the console in
+         * developer.kii.com)<br>
+         * After the verification succeeded, new phone number becomes users phone
+         * number and user is able to login with the phone number.<br>
+         * To get the new phone number, please call {@link #refresh()} and call
+         * {@link #getPhoneNumber()}<br>
+         * Before completion of {@link #refresh()}, {@link #getPhoneNumber()} returns
+         * cached phone number. It could be old phone number or undefined.
+         *
+         * @param verificationCode The code which verifies the currently logged in user
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theUser). theUser is KiiUser instance which this method was called on.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiUser instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var user = Kii.currentUser();
+         *     user.verifyPhoneNumber("012345", {
+         *         success: function(theUser) {
+         *             // do something
+         *         },
+         *
+         *         failure: function(theUser, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var user = Kii.currentUser();
+         *     user.verifyPhoneNumber("012345").then(
+         *         function(theUser) {
+         *             // do something
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        verifyPhoneNumber(verificationCode: string, callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
+
+        /**
+         * Resend the email verification code to the user
+         *
+         * <br><br>This method will re-send the email verification to the currently logged in user
+         *
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theUser). theUser is KiiUser instance which this method was called on.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiUser instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var user = Kii.currentUser();
+         *     user.resendEmailVerification({
+         *         success: function(theUser) {
+         *             // do something
+         *         },
+         *
+         *         failure: function(theUser, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var user = Kii.currentUser();
+         *     user.resendEmailVerification().then(
+         *         function(theUser) {
+         *             // do something
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        resendEmailVerification(callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
+
+        /**
+         * Resend the SMS verification code to the user
+         *
+         * <br><br>This method will re-send the SMS verification to the currently logged in user
+         *
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theUser). theUser is KiiUser instance which this method was called on.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiUser instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var user = Kii.currentUser();
+         *     user.resendPhoneNumberVerification({
+         *         success: function(theUser) {
+         *             // do something
+         *         },
+         *
+         *         failure: function(theUser, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var user = Kii.currentUser();
+         *     user.resendPhoneNumberVerification().then(
+         *         function(theUser) {
+         *             // do something
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        resendPhoneNumberVerification(callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
+
+        /**
+         * Retrieve a list of groups which the user is a member of
+         *
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is Array instance.
+         *       <ul>
+         *         <li>params[0] is the KiiUser instance which this method was called on.</li>
+         *         <li>params[1] is array of KiiGroup instances.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiUser instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var user = Kii.currentUser();
+         *     user.memberOfGroups({
+         *         success: function(theUser, groupList) {
+         *             // do something with the results
+         *             for(var i=0; i&lt;groupList.length; i++) {
+         *                 var g = groupList[i]; // a KiiGroup object
+         *             }
+         *         },
+         *
+         *         failure: function(theUser, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var user = Kii.currentUser();
+         *     user.memberOfGroups().then(
+         *         function(params) {
+         *             // do something with the results
+         *             var theUser = params[0];
+         *             var groupList = params[1];
+         *             for(var i=0; i&lt;groupList.length; i++) {
+         *                 var g = groupList[i]; // a KiiGroup object
+         *             }
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        memberOfGroups(callbacks?: { success(theUser: KiiUser, groupList: KiiGroup[]): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<[KiiUser, KiiGroup[]]>;
+
+        /**
+         * Retrieve the groups owned by this user. Group in the groupList
+         * does not contain all the property of group. To get all the
+         * property from cloud, a {@link KiiGroup#refresh(callback)} is necessary.
+         *
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(params). params is Array instance.
+         *       <ul>
+         *         <li>params[0] is the KiiUser instance which this method was called on.</li>
+         *         <li>params[1] is array of KiiGroup instances.</li>
+         *       </ul>
+         *     </li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiUser instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var user = Kii.currentUser();
+         *     user.ownerOfGroups({
+         *         success: function(theUser, groupList) {
+         *             // do something with the results
+         *             for(var i=0; i&lt;groupList.length; i++) {
+         *                 var g = groupList[i]; // a KiiGroup object
+         *             }
+         *         },
+         *
+         *         failure: function(theUser, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var user = Kii.currentUser();
+         *     user.ownerOfGroups().then(
+         *         function(params) {
+         *             // do something with the results
+         *             var theUser = params[0];
+         *             var groupList = params[1];
+         *             for(var i=0; i&lt;groupList.length; i++) {
+         *                 var g = groupList[i]; // a KiiGroup object
+         *             }
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        ownerOfGroups(callbacks?: { success(theUser: KiiUser, groupList: KiiGroup[]): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<[KiiUser, KiiGroup[]]>;
+
+        /**
+         * Updates the user's phone number on the server
+         *
+         * @param newPhoneNumber The new phone number to change to
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theUser). theUser is KiiUser instance which this method was called on.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiUser instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var user = Kii.currentUser();
+         *     user.changePhone('+19415551234', {
+         *         success: function(theUser) {
+         *             // do something on success
+         *         },
+         *
+         *         failure: function(theUser, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var user = Kii.currentUser();
+         *     user.changePhone('+19415551234').then(
+         *         function(theUser) {
+         *             // do something on success
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        changePhone(newPhoneNumber: string, callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
+
+        /**
+         * Updates the user's email address on the server
+         *
+         * @param newEmail The new email address to change to
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theUser). theUser is KiiUser instance which this method was called on.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiUser instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var user = Kii.currentUser();
+         *     user.changeEmail('mynewemail@kii.com', {
+         *         success: function(theUser) {
+         *             // do something on success
+         *         },
+         *
+         *         failure: function(theUser, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var user = Kii.currentUser();
+         *     user.changeEmail('mynewemail@kii.com').then(
+         *         function(theUser) {
+         *             // do something on success
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        changeEmail(newEmail: string, callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
+
+        /**
+         * Saves the latest user values to the server
+         *
+         * <br><br>If the user does not yet exist, it will NOT be created. Otherwise, the fields that have changed will be updated accordingly.
+         *
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theSavedUser). theSavedUser is KiiUser instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiUser instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var user = Kii.getCurrentUser(); // a KiiUser
+         *     user.save({
+         *         success: function(theSavedUser) {
+         *             // do something with the saved user
+         *         },
+         *
+         *         failure: function(theUser, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var user = Kii.getCurrentUser(); // a KiiUser
+         *     user.save().then(
+         *         function(theSavedUser) {
+         *             // do something with the saved user
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        save(callbacks?: { success(theSavedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
+
+        /**
+         * Updates the local user's data with the user data on the server
+         *
+         * <br><br>The user must exist on the server. Local data will be overwritten.
+         *
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theRefreshedUser). theRefreshedUser is KiiUser instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiUser instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var user = Kii.getCurrentUser(); // a KiiUser
+         *     user.refresh({
+         *         success: function(theRefreshedUser) {
+         *             // do something with the refreshed user
+         *         },
+         *
+         *         failure: function(theUser, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var user = Kii.getCurrentUser(); // a KiiUser
+         *     user.refresh().then(
+         *         function(theRefreshedUser) {
+         *             // do something with the refreshed user
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        refresh(callbacks?: { success(theRefreshedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
+
+        /**
+         * Delete the user from the server
+         *
+         * @param callbacks An object with callback methods defined
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theDeletedUser). theDeletedUser is KiiUser instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.target is the KiiUser instance which this method was called on.</li>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var user = Kii.getCurrentUser(); // a KiiUser
+         *     user.delete({
+         *         success: function(theDeletedUser) {
+         *             // do something
+         *         },
+         *
+         *         failure: function(theUser, anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     var user = Kii.getCurrentUser(); // a KiiUser
+         *     user.delete().then(
+         *         function(theDeletedUser) {
+         *             // do something
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        delete(callbacks?: { success(theDeletedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
+
+        /**
+         * Logs the currently logged-in user out of the KiiSDK
+         *
+         * @example
+         *         KiiUser.logOut();
+         */
+        static logOut(): void;
+
+        /**
+         * Checks to see if there is a user authenticated with the SDK
+         *
+         * @example
+         *         if(KiiUser.loggedIn()) {
+         *             // do something
+         *         }
+         */
+        static loggedIn(): boolean;
+
+        /**
+         * Find registered KiiUser with the email.<br>
+         * If there are no user registers with the specified email or if there are but not verified email yet,
+         * callbacks.failure or reject callback of promise will be called.<br>
+         * <br><br>
+         * <b>Note:</b>
+         * <ul>
+         * <li>If "Expose Full User Data To Others" is enabled in the application console, the response will contain full of the user data.</li>
+         * <li>Otherwise, the response will only contain "userID", "loginName" and "displayName" field values if exist.</li>
+         * </ul>
+         *
+         * @param email The email to find KiiUser who owns it.<br>
+         *   Don't add prefix of "EMAIL:" described in REST API documentation. SDK will take care of it.
+         * @param callbacks An object with callback methods defined.
+         *   This argument is mandatory and can't be ommited.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theMatchedUser). theMatchedUser is KiiUser instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     KiiUser.findUserByEmail("user_to_find@example.com", {
+         *         success: function(theMatchedUser) {
+         *             // Do something with the found user
+         *         },
+         *         failure: function(anErrorString) {
+         *             // Do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     KiiUser.findUserByEmail("user_to_find@example.com").then(
+         *         function(theMatchedUser) {
+         *             // Do something with the matched user
+         *         },
+         *         function(error) {
+         *             // Do something with the error response
+         *         }
+         *     );
+         */
+        static findUserByEmail(email: string, callbacks?: { success(theMatchedUser: KiiUser): any; failure(anErrorString: string): any; }): Promise<KiiUser>;
+
+        /**
+         * Find registered KiiUser with the phone.<br>
+         * If there are no user registers with the specified phone or if there are but not verified phone yet,
+         * callbacks.failure or reject callback of promise will be called.
+         * <br><br>
+         * <b>Note:</b>
+         * <ul>
+         * <li>If "Expose Full User Data To Others" is enabled in the application console, the response will contain full of the user data.</li>
+         * <li>Otherwise, the response will only contain "userID", "loginName" and "displayName" field values if exist.</li>
+         * </ul>
+         *
+         * @param phone The phone number to find KiiUser who owns it.<br>
+         *   Don't add prefix of "PHONE:" described in REST API documentation. SDK will take care of it.
+         * @param callbacks An object with callback methods defined.
+         *   This argument is mandatory and can't be ommited.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theMatchedUser). theMatchedUser is KiiUser instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     KiiUser.findUserByPhone("phone_number_to_find", {
+         *         success: function(theMatchedUser) {
+         *             // Do something with the found user
+         *         },
+         *         failure: function(anErrorString) {
+         *             // Do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     KiiUser.findUserByPhone("phone_number_to_find").then(
+         *         function(theMatchedUser) {
+         *             // Do something with the matched user
+         *         },
+         *         function(error) {
+         *             // Do something with the error response
+         *         }
+         *     );
+         */
+        static findUserByPhone(phone: string, callbacks?: { success(theMatchedUser: KiiUser): any; failure(anErrorString: string): any; }): Promise<KiiUser>;
+
+        /**
+         * Find registered KiiUser with the user name.<br>
+         * If there are no user registers with the specified user name, callbacks.failure or reject callback of promise will be called.
+         * <br><br>
+         * <b>Note:</b>
+         * <ul>
+         * <li>If "Expose Full User Data To Others" is enabled in the application console, the response will contain full of the user data.</li>
+         * <li>Otherwise, the response will only contain "userID", "loginName" and "displayName" field values if exist.</li>
+         * </ul>
+         *
+         * @param username The user name to find KiiUser who owns it.<br>
+         *   Don't add prefix of "LOGIN_NAME:" described in REST API documentation. SDK will take care of it.
+         * @param callbacks An object with callback methods defined.
+         *   This argument is mandatory and can't be ommited.
+         *
+         * @return return promise object.
+         *   <ul>
+         *     <li>fulfill callback function: function(theMatchedUser). theMatchedUser is KiiUser instance.</li>
+         *     <li>reject callback function: function(error). error is an Error instance.
+         *       <ul>
+         *         <li>error.message</li>
+         *       </ul>
+         *     </li>
+         *   </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     KiiUser.findUserByUsername("user_name_to_find", {
+         *         success: function(theMatchedUser) {
+         *             // Do something with the found user
+         *         },
+         *         failure: function(anErrorString) {
+         *             // Do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     KiiUser.findUserByUsername("user_name_to_find").then(
+         *         function(theMatchedUser) {
+         *             // Do something with the matched user
+         *         },
+         *         function(error) {
+         *             // Do something with the error response
+         *         }
+         *     );
+         */
+        static findUserByUsername(username: string, callbacks?: { success(theMatchedUser: KiiUser): any; failure(anErrorString: string): any; }): Promise<KiiUser>;
+
+        /**
+         * Instantiate topic belongs to this user.
+         *
+         * @param topicName name of the topic. Must be a not empty string.
+         *
+         * @return topic instance.
+         */
+        topicWithName(topicName: string): KiiTopic;
+
+        /**
+         * Gets a list of topics in this user scope
+         *
+         * @param callbacks An object with callback methods defined
+         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success. If empty string or no string object is provided, this API regards no paginationKey specified.
+         *
+         * @return return promise object.
+         *     <ul>
+         *       <li>fulfill callback function: function(params). params is Array instance.
+         *         <ul>
+         *           <li>params[0] is array of KiiTopic instances.</li>
+         *           <li>params[1] is string of nextPaginationKey.</li>
+         *         </ul>
+         *       </li>
+         *       <li>reject callback function: function(error). error is an Error instance.
+         *         <ul>
+         *           <li>error.target is the KiiUser instance which this method was called on. </li>
+         *           <li>error.message</li>
+         *         </ul>
+         *       </li>
+         *     </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     var user = . . .; // a KiiUser
+         *     user.listTopics({
+         *         success: function(topicList, nextPaginationKey) {
+         *             // do something with the result
+         *             for(var i=0; i&lt;topicList.length; i++){
+         *                 var topic = topicList[i];
+         *             }
+         *             if (nextPaginationKey != null) {
+         *                 user.listTopics({
+         *                     success: function(topicList, nextPaginationKey) {...},
+         *                     failure: function(anErrorString) {...}
+         *                 }, nextPaginationKey);
+         *             }
+         *         },
+         *         failure: function(anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use callbacks directly
+         *     var user = . . .; // a KiiUser
+         *     user.listTopics().then(
+         *         function(params) {
+         *             var topicList = params[0];
+         *             var nextPaginationKey = params[1];
+         *             // do something with the result
+         *             for(var i=0; i&lt;topicList.length; i++){
+         *                 var topic = topicList[i];
+         *             }
+         *             if (nextPaginationKey != null) {
+         *                 user.listTopics(null, nextPaginationKey).then(
+         *                     function(params) {...},
+         *                     function(error) {...}
+         *                 );
+         *             }
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        listTopics(callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; }, paginationKey?: string): Promise<[KiiTopic[], string]>;
+
+        /**
+         * Instantiate push subscription for this user.
+         *
+         * @return push subscription object.
+         */
+        pushSubscription(): KiiPushSubscription;
+
+        /**
+         * Instantiate push installation for this user.
+         *
+         * @return push installation object.
+         */
+        pushInstallation(): KiiPushInstallation;
+    }
+
+    /**
+     * Represents a KiiUser builder
+     */
+    export class KiiUserBuilder {
+        /**
+         * Create a KiiUser builder with identifier.
+         *
+         * <br><br>Create a KiiUser builder. This constructor is received
+         * identifier. The identifier is one of user name, email address or
+         * phone number. This constructor automatically identity What is
+         * identifier and build proper KiiUser object on build method.
+         *
+         * <br><br> Some strings can be accepted as both user name and phone
+         * number. If such string is passed to this constructor as
+         * identifier, then phone number is prior to user name. String of
+         * email address is in different class against user name and phone
+         * number. So Email address is always identified correctly.
+         *
+         * @param identifier The user's user name, email address or phone
+         *   number. Must be string. Must not be null or undefined.
+         * @param password for the user. Must be string. Must not be null or
+         *   undefined.
+         *
+         * @return KiiUser object builder.
+         *
+         * @throws If Identifier is not user name,
+         *     email address or phone number.
+         * @throws If the password is not in the
+         *     proper format
+         */
+        static builderWithIdentifier(identifier: string, password: string): KiiUserBuilder;
+
+        /**
+         * Create KiiUser builder with email address
+         *
+         * <br><br>Create a KiiUser builder with email address.
+         *
+         * @param emailAddress email address.
+         * @param password for the user. Must be string. Must not be null or
+         *   undefined.
+         *
+         * @return KiiUser object builder.
+         *
+         * @throws If the email address is not in the proper format
+         * @throws If the password is not in the
+         *     proper format
+         */
+        static builderWithEmailAddress(emailAddress: string, password: string): KiiUserBuilder;
+
+        /**
+         * Create KiiUser builder with global phone number
+         *
+         * <br><br>Create a KiiUser builder with global phone number.
+         *
+         * @param phoneNumber global phone number.
+         * @param password
+         *
+         * @return KiiUser object builder.
+         *
+         * @throws If the phone number is not in the proper format
+         */
+        static builderWithGlobalPhoneNumber(phoneNumber: string, password: string): KiiUserBuilder;
+
+        /**
+         * Create KiiUser builder with local phone number
+         *
+         * <br><br>Create a KiiUser builder with local phone number.
+         *
+         * @param phoneNumber local phone number.
+         * @param country country code
+         * @param password for the user. Must be string. Must not be null or
+         *   undefined.
+         *
+         * @return KiiUser object builder.
+         *
+         * @throws If the phone number is not in the proper format
+         * @throws If the country code is not a valid format
+         * @throws If the password is not in the
+         *     proper format
+         */
+        static builderWithLocalPhoneNumber(phoneNumber: string, country: string, password: string): KiiUserBuilder;
+
+        /**
+         * Create KiiUser builder with user name
+         *
+         * <br><br>Create a KiiUser builder with user name.
+         *
+         * @param username user name.
+         * @param password for the user. Must be string. Must not be null or
+         *   undefined.
+         *
+         * @return KiiUser object builder.
+         *
+         * @throws If the username is not in the proper format
+         * @throws If the password is not in the
+         *     proper format
+         */
+        static builderWithUsername(username: string, password: string): KiiUserBuilder;
+
+        /**
+         * Set user name.
+         *
+         * <br><br>Set user name. If null or undefined is passed. It is
+         * ignored. Previous user name is remained.
+         *
+         * @param username user name.
+         *
+         * @return this builder object.
+         *
+         * @throws If the username is not in the
+         *     proper format
+         */
+        setUsername(username: string): KiiUserBuilder;
+
+        /**
+         * Set email address.
+         *
+         * <br><br>Set email address. If null or undefined is passed. It is
+         * ignored. Previous email address is remained.
+         *
+         * @param emailAddress email address.
+         *
+         * @return this builder object.
+         *
+         * @throws If the email address is not in the
+         *     proper format
+         */
+        setEmailAddress(emailAddress: string): KiiUserBuilder;
+
+        /**
+         * Set global phone number.
+         *
+         * <br><br>Set global phone number. If null or undefined is
+         * passed. It is ignored. Previous phone number is remained.
+         *
+         * @param phoneNumber global phone number.
+         *
+         * @return this builder object.
+         *
+         * @throws If the phone number is not
+         *     in the proper format
+         */
+        setGlobalPhoneNumber(phoneNumber: string): KiiUserBuilder;
+
+        /**
+         * Set local phone number.
+         *
+         * <br><br>Set local phone number. If null or undefined is
+         * passed. It is ignored. Previous phone number is remained.
+         *
+         * @param phoneNumber local phone number.
+         * @param country country code
+         *
+         * @return this builder object.
+         *
+         * @throws If the phone number is not
+         *     in the proper format
+         * @throws If the country code is not a valid format
+         */
+        setLocalPhoneNumber(phoneNumber: string, country: string): KiiUserBuilder;
+
+        /**
+         * Build KiiUser object.
+         *
+         * <br><br> Build KiiUser object. This method verify set values.
+         *
+         * @return a working KiiUser object.
+         */
+        build(): KiiUser;
+    }
+}
+
+import KiiACLAction = KiiCloud.KiiACLAction;
+import KiiSite = KiiCloud.KiiSite;
+import KiiAnalyticsSite = KiiCloud.KiiAnalyticsSite;
+import KiiSocialNetworkName = KiiCloud.KiiSocialNetworkName;
+import Kii = KiiCloud.Kii;
+import KiiACL = KiiCloud.KiiACL;
+import KiiACLEntry = KiiCloud.KiiACLEntry;
+import KiiAnalytics = KiiCloud.KiiAnalytics;
+import KiiAnonymousUser = KiiCloud.KiiAnonymousUser;
+import KiiAnyAuthenticatedUser = KiiCloud.KiiAnyAuthenticatedUser;
+import KiiAppAdminContext = KiiCloud.KiiAppAdminContext;
+import KiiBucket = KiiCloud.KiiBucket;
+import KiiClause = KiiCloud.KiiClause;
+import KiiGeoPoint = KiiCloud.KiiGeoPoint;
+import KiiGroup = KiiCloud.KiiGroup;
+import KiiObject = KiiCloud.KiiObject;
+import KiiPushInstallation = KiiCloud.KiiPushInstallation;
+import KiiPushMessageBuilder = KiiCloud.KiiPushMessageBuilder;
+import KiiPushSubscription = KiiCloud.KiiPushSubscription;
+import KiiQuery = KiiCloud.KiiQuery;
+import KiiServerCodeEntry = KiiCloud.KiiServerCodeEntry;
+import KiiServerCodeExecResult = KiiCloud.KiiServerCodeExecResult;
+import KiiSocialConnect = KiiCloud.KiiSocialConnect;
+import KiiThing = KiiCloud.KiiThing;
+import KiiTopic = KiiCloud.KiiTopic;
+import KiiUser = KiiCloud.KiiUser;
+import KiiUserBuilder = KiiCloud.KiiUserBuilder;
diff --git a/kii-cloud-sdk/kii-cloud-sdk-tests.ts b/kii-cloud-sdk/kii-cloud-sdk-tests.ts
index ed5bb29666..dcd0736d46 100644
--- a/kii-cloud-sdk/kii-cloud-sdk-tests.ts
+++ b/kii-cloud-sdk/kii-cloud-sdk-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="kii-cloud-sdk.d.ts" />
+
 
 function main() {
     Kii.initializeWithSite("abc", "def", KiiSite.JP);
@@ -21,6 +21,16 @@ function main() {
         .then(function (user: KiiUser) {
         });
 
+    user.pushInstallation().getMqttEndpoint("")
+        .then(function (endpoint: KiiCloud.KiiMqttEndpoint) {
+            endpoint.installationID;
+        });
+
+    var anotherUser: KiiUser = KiiUserBuilder
+        .builderWithIdentifier("id", "password")
+        .setEmailAddress("mail@example.org")
+        .build();
+
     var bucket = Kii.bucketWithName("foo");
     var clause1 = KiiClause.lessThan("x", 1);
     var clause2 = KiiClause.greaterThan("y", 1);
diff --git a/kii-cloud-sdk/kii-cloud-sdk.d.ts b/kii-cloud-sdk/kii-cloud-sdk.d.ts
deleted file mode 100644
index 22dccac706..0000000000
--- a/kii-cloud-sdk/kii-cloud-sdk.d.ts
+++ /dev/null
@@ -1,7460 +0,0 @@
-// Type definitions for Kii Cloud SDK v2.4.0
-// Project: http://en.kii.com/
-// Definitions by: Kii Consortium <http://jp.kii.com/consortium/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace KiiCloud {
-    enum KiiACLAction {
-        KiiACLBucketActionCreateObjects,
-        KiiACLBucketActionQueryObjects,
-        KiiACLBucketActionDropBucket,
-        KiiACLObjectActionRead,
-        KiiACLObjectActionWrite,
-    }
-
-    export enum KiiSite {
-        US,
-        JP,
-        CN,
-        SG,
-        CN3
-    }
-
-    export enum KiiAnalyticsSite {
-        US,
-        JP,
-        CN,
-        SG,
-        CN3
-    }
-
-    enum KiiSocialNetworkName {
-        FACEBOOK = 1,
-        TWITTER = 2,
-        QQ = 3,
-        GOOGLEPLUS = 4,
-        RENREN = 5
-    }
-
-    type KiiSocialConnectOptions = {
-        access_token: string,
-        openID?: string
-    } | {
-        oauth_token: string,
-        oauth_token_secret: string
-    }
-
-    interface KiiSocialAccountInfo {
-        createdAt: number;
-        provider: KiiSocialNetworkName;
-        socialAccountId: string;
-    }
-
-    interface KiiThingFields {
-        /**
-         * thing identifier given by thing vendor.
-         */
-        _vendorThingID: string;
-
-        /**
-         * thing password given by thing vendor.
-         */
-        _password: string;
-
-        /**
-         * thing type given by thing vendor.
-         */
-        _thingType?: string;
-
-        /**
-         * vendor identifier given by thing vendor.
-         */
-        _vendor?: string;
-
-        /**
-         * firmware version given by thing vendor.
-         */
-        _firmwareVersion?: string;
-
-        /**
-         * lot identifier given by thing vendor.
-         */
-        _lot?: string;
-
-        /**
-         * product name given by thing vendor.
-         */
-        _productName?: string;
-
-        /**
-         * arbitrary string field.
-         */
-        _stringField1?: string;
-
-        /**
-         * arbitrary string field.
-         */
-        _stringField2?: string;
-
-        /**
-         * arbitrary string field.
-         */
-        _stringField3?: string;
-
-        /**
-         * arbitrary string field.
-         */
-        _stringField4?: string;
-
-        /**
-         * arbitrary string field.
-         */
-        _stringField5?: string;
-
-        /**
-         * arbitrary number field.
-         */
-        _numberField1?: number;
-
-        /**
-         * arbitrary number field.
-         */
-        _numberField2?: number;
-
-        /**
-         * arbitrary number field.
-         */
-        _numberField3?: number;
-
-        /**
-         * arbitrary number field.
-         */
-        _numberField4?: number;
-
-        /**
-         * arbitrary number field.
-         */
-        _numberField5?: number;
-
-        /**
-         * custom fields.
-         */
-        [name: string]: any;
-    }
-
-    type KiiACLSubject =
-        KiiGroup |
-        KiiUser |
-        KiiAnyAuthenticatedUser |
-        KiiAnonymousUser |
-        KiiThing;
-
-    interface APNSAlert {
-        title: string;
-        body: string;
-        "title-loc-key": string;
-        "title-loc-args": string[];
-        "action-loc-key": string;
-        "loc-key": string;
-        "loc-args": string[];
-        "launch-image": string;
-    }
-
-    interface identityData {
-        emailAddress?: string;
-        phoneNumber?: string;
-        username?: string;
-    }
-
-    /**
-     * The main SDK class
-     */
-    export class Kii {
-        /**
-         * Kii SDK Build Number
-         *
-         * @return current build number of the SDK
-         */
-        static getBuildNumber(): string;
-
-        /**
-         * Kii SDK Version Number
-         *
-         * @return current version number of the SDK
-         */
-        static getSDKVersion(): string;
-
-        /**
-         * Retrieve the current app ID
-         *
-         * @return The current app ID
-         */
-        static getAppID(): string;
-
-        /**
-         * Retrieve the current app key
-         *
-         * @return The current app key
-         */
-        static getAppKey(): string;
-
-        /**
-         * Set the access token lifetime in seconds.
-         *
-         * If you don't call this method or call it with 0, token won't be expired.
-         * Call this method if you like the access token to be expired
-         * after a certain period. Once called, token retrieved
-         * by each future authentication will have the specified lifetime.
-         * Note that, it will not update the lifetime of token received prior
-         * calling this method. Once expired, you have to login again to renew the token.
-         *
-         * @param expiresIn The life time of access token in seconds.
-         *
-         * @throws If specified expiresIn is negative.
-         * @throws If Kii has not been initialized
-         *
-         * @example
-         *     Kii.setAccessTokenExpiration(3600);
-         */
-        static setAccessTokenExpiration(expiresIn: number): void;
-
-        /**
-         * Returns access token lifetime in seconds.
-         *
-         * If access token lifetime has not set explicitly by {@link Kii.setAccessTokenExpiration(expiresIn)}, returns 0.
-         *
-         * @return access token lifetime in seconds.
-         *
-         * @throws If Kii has not been initialized
-         */
-        static getAccessTokenExpiration(): number;
-
-        /**
-         * Initialize the Kii SDK with a specific URL
-         *
-         * Should be the first Kii SDK action your application makes.
-         *
-         * @param appID The application ID found in your Kii developer console
-         * @param appKey The application key found in your Kii developer console
-         * @param site Can be one of the constants KiiSite.US, KiiSite.JP, KiiSite.CN or KiiSite.SG depending on your location.
-         * @param analyticsOption An object used for initializing KiiAnalytics, If not provided or invalid object provided, KiiAnalytics won't be initialized. If provided, it can be empty object or with analyticsOption.deviceId.<br> If provided, but deviceId is not provided, SDK generates a new deviceId and use it when upload events. It can be retrieved by {@link KiiAnalytics.getDeviceId()}. It is recommended to retrieve the deviceId and store it to identify the device properly.
-         *
-         * @example
-         *     // Disable KiiAnalytics
-         *     Kii.initializeWithSite("my-app-id", "my-app-key", KiiSite.JP);
-         *
-         *     // Enable KiiAnalytics with deviceId
-         *     var analyticsOption = { deviceId: "my-device-id" };
-         *     Kii.initializeWithSite("my-app-id", "my-app-key", KiiSite.JP, analyticsOption);
-         *
-         *     // Enable KiiAnalytics without deviceId
-         *     Kii.initializeWithSite("my-app-id", "my-app-key", KiiSite.JP, {});
-         */
-        static initializeWithSite(appID: string, appKey: string, site: KiiSite, analyticsOption?: any): void;
-
-        /**
-         * Initialize the Kii SDK
-         *
-         * Should be the first Kii SDK action your application makes.
-         * Meanwhile, Kii Analytics is initialized.
-         *
-         * @param appID The application ID found in your Kii developer console
-         * @param appKey The application key found in your Kii developer console
-         * @param analyticsOption An object used for initializing KiiAnalytics, If not provided or invalid object provided, KiiAnalytics won't be initialized. If provided, it can be empty object or with analyticsOption.deviceId. <br> If provided, but deviceId is not provided, SDK generates a new deviceId and use it when upload events. It can be retrieved by {@link KiiAnalytics.getDeviceId()}. It is recommended to retrieve the deviceId and store it to identify the device properly.
-         *
-         * @example
-         *     // Disable KiiAnalytics
-         *     Kii.initialize("my-app-id", "my-app-key");
-         *
-         *     // Enable KiiAnalytics with deviceId
-         *     var analyticsOption = { deviceId: "my-device-id" };
-         *     Kii.initialize("my-app-id", "my-app-key", analyticsOption);
-         *
-         *     // Enable KiiAnalytics without deviceId
-         *     Kii.initialize("my-app-id", "my-app-key", {});
-         */
-        static initialize(appID: string, appKey: string, analyticsOption?: any): void;
-
-        /**
-         * Creates a reference to a bucket for this app
-         *
-         *     <br><br>The bucket will be created/accessed within this app's scope
-         *
-         * @param bucketName The name of the bucket the app should create/access
-         *
-         * @return A working KiiBucket object
-         *
-         * @example
-         *         var bucket = Kii.bucketWithName("myBucket");
-         */
-        static bucketWithName(bucketName: string): KiiBucket;
-
-        /**
-         * Creates a reference to a　encrypted bucket for this app
-         *
-         *     <br><br>The bucket will be created/accessed within this app's scope
-         *
-         * @param bucketName The name of the bucket the app should create/access
-         *
-         * @return A working KiiEncryptedBucket object
-         *
-         * @example
-         *         var bucket = Kii.encryptedBucketWithName("myBucket");
-         */
-        static encryptedBucketWithName(bucketName: string): KiiBucket;
-
-        /**
-         * Creates a reference to a group with the given name
-         *
-         * @param groupName An application-specific group name
-         *
-         * @return A new KiiGroup reference
-         *
-         * @example
-         *         var group = new Kii.groupWithName("myGroup");
-         */
-        static groupWithName(groupName: string): KiiGroup;
-
-        /**
-         * Creates a reference to a group with the given name and a list of default members
-         *
-         * @param groupName An application-specific group name
-         * @param members An array of KiiUser objects to add to the group
-         *
-         * @return A new KiiGroup reference
-         *
-         * @example
-         *         var group = new KiiGroup.groupWithName("myGroup", members);
-         */
-        static groupWithNameAndMembers(groupName: string, members: KiiUser[]): KiiGroup;
-
-        /**
-         * Authenticate as app admin.
-         * <br><br>
-         * <b>This api call must not placed on code which can be accessed by browser.
-         * This api is intended to be used by server side code like Node.js.
-         * If you use this api in code accessible by browser, your application id and application secret could be stolen.
-         * Attacker will be act as appadmin and all the data in your application will be suffered.
-         * </b>
-         *
-         * @param clientId assigned to your application.
-         * @param clientSecret assigned to your application.
-         * @param callbacks The callback methods called when authentication succeeded/failed.
-         *
-         * @return return promise object.
-         *     <ul>
-         *       <li>fulfill callback function: function(adminContext). adminContext is a KiiAppAdminContext instance.</li>
-         *       <li>reject callback function: function(error). error is an Error instance.
-         *         <ul>
-         *           <li>error.message</li>
-         *         </ul>
-         *       </li>
-         *     </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     Kii.authenticateAsAppAdmin("your client id", "your client secret", {
-         *         success: function(adminContext) {
-         *             // adminContext : KiiAppAdminContext instance
-         *             // Operate entities with adminContext.
-         *         },
-         *         failure: function(error, statusCode) {
-         *             // Authentication failed.
-         *         }
-         *     );
-         *
-         *     // example to use Promise
-         *     Kii.authenticateAsAppAdmin("your client id", "your client secret").then(
-         *         function(adminContext) {　// fulfill callback function
-         *             // adminContext : KiiAppAdminContext instance
-         *             // Operate entities with adminContext.
-         *
-         *         },
-         *         function(error) { // reject callback function
-         *             // Authentication failed.
-         *             var errorString = error.message;
-         *         }
-         *     );
-         */
-        static authenticateAsAppAdmin(clientId: string, clientSecret: string, callbacks?: { success(adminContext: KiiAppAdminContext): any; failure(error: string, statusCode: number): any; }): Promise<KiiAppAdminContext>;
-
-        /**
-         * Instantiate KiiServerCodeEntry with specified entry name.
-         *
-         * @param entryName Name of the entry.
-         *
-         * @return KiiServerCodeEntry instance.
-         *
-         * @throws Thrown when entryName is invalid in the following cases:
-         *     <li>not type of string </li>
-         *     <li>empty string </li>
-         *     <li>invalid string. Valid entryName pattern is "[a-zA-Z][_a-zA-Z0-9]*$".</li>
-         *
-         * @example
-         *         var entry = Kii.serverCodeEntry("main");
-         */
-        static serverCodeEntry(entryName: string): KiiServerCodeEntry;
-
-        /**
-         * Instantiate serverCodeEntryWithVersion with specified entry name and version.
-         *
-         * @param entryName Name of the entry.
-         * @param version Version of the entry.
-         *
-         * @return KiiServerCodeEntry instance.
-         *
-         * @throws Thrown in the following cases: <br>
-         *     <li>entryName or version is not type of string </li>
-         *     <li>entryName or version is empty string </li>
-         *     <li>entryName is invalid string. Valid entryName pattern is "[a-zA-Z][_a-zA-Z0-9]*$".</li>
-         *
-         * @example
-         *         var entry = Kii.serverCodeEntryWithVersion("main", "gulsdf6ful8jvf8uq6fe7vjy6");
-         */
-        static serverCodeEntryWithVersion(entryName: string, version: string): KiiServerCodeEntry;
-
-        /**
-         * Instantiate topic belongs to application.
-         *
-         * @param topicName name of the topic. Must be a not empty string.
-         *
-         * @return topic instance.
-         */
-        static topicWithName(topicName: string): KiiTopic;
-
-        /**
-         * Gets a list of topics in app scope
-         *
-         * @param callbacks An object with callback methods defined
-         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success or fullfill callback of promise. If empty string or no string object is provided, this API regards no paginationKey specified.
-         *
-         * @return return promise object.
-         *     <ul>
-         *       <li>fulfill callback function: function(params). params is Array instance.
-         *         <ul>
-         *           <li>params[0] is array of KiiTopic instances.</li>
-         *           <li>params[1] is string of nextPaginationKey.</li>
-         *         </ul>
-         *       </li>
-         *       <li>reject callback function: function(error). error is an Error instance.
-         *         <ul>
-         *           <li>error.message</li>
-         *         </ul>
-         *       </li>
-         *     </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     Kii.listTopics({
-         *         success: function(topicList, nextPaginationKey) {
-         *             // do something with the result
-         *             for(var i=0; i&lt;topicList.length; i++){
-         *                 var topic = topicList[i];
-         *             }
-         *             if (nextPaginationKey != null) {
-         *                 Kii.listTopics({
-         *                     success: function(topicList, nextPaginationKey) {...},
-         *                     failure: function(anErrorString) {...}
-         *                 }, nextPaginationKey);
-         *             }
-         *         },
-         *         failure: function(anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use promise
-         *     Kii.listTopics().then(
-         *         function(params) {
-         *             var topicList = params[0];
-         *             var nextPaginationKey = params[1];
-         *             // do something with the result
-         *             for(var i=0; i&lt;topicList.length; i++){
-         *                 var topic = topicList[i];
-         *             }
-         *             if (nextPaginationKey != null) {
-         *                 Kii.listTopics(null, nextPaginationKey).then(
-         *                     function(params) {...},
-         *                     function(error) {...}
-         *                 );
-         *             }
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        static listTopics(callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; }, paginationKey?: string): Promise<[KiiTopic[], string]>;
-    }
-
-    /**
-     * Represents a KiiACL object
-     */
-    export class KiiACL {
-        /**
-         * Get the list of active ACLs associated with this object from the server
-         *
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *     <ul>
-         *       <li>fulfill callback function: function(params). params is Array instance.
-         *         <ul>
-         *           <li>params[0] is the KiiACL instance which this method was called on.</li>
-         *           <li>params[1] is array of KiiACLEntry instances.</li>
-         *         </ul>
-         *       </li>
-         *       <li>reject callback function: function(error). error is an Error instance.
-         *         <ul>
-         *           <li>error.target is the KiiACL instance which this method was called on.</li>
-         *           <li>error.message</li>
-         *         </ul>
-         *       </li>
-         *     </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var acl = . . .; // a KiiACL object
-         *     acl.listACLEntries({
-         *     	success: function(theACL, theEntries) {
-         *     		// do something
-         *     	},
-         *
-         *     	failure: function(theACL, anErrorString) {
-         *     		// do something with the error response
-         *     	}
-         *     });
-         *
-         *     // example to use Promise
-         *     var acl = . . .; // a KiiACL object
-         *     acl.listACLEntries().then(
-         *         function(params) { // fulfill callback function
-         *             var theACL = params[0];
-         *             var theEntries = params[1];
-         *             // do something
-         *         },
-         *         function(error) { // reject callback function
-         *             var theACL = error.target;
-         *             var anErrorString = error.message;
-         *         		// do something with the error response
-         *     });
-         */
-        listACLEntries(callbacks?: { success(theACL: KiiACL, theEntries: KiiACLEntry[]): any; failure(theACL: KiiACL, anErrorString: string): any; }): Promise<[KiiACL, KiiACLEntry[]]>;
-
-        /**
-         * Add a KiiACLEntry to the local object, if not already present. This does not explicitly grant any permissions, which should be done through the KiiACLEntry itself. This method simply adds the entry to the local ACL object so it can be saved to the server.
-         *
-         * @param entry The KiiACLEntry to add
-         *
-         * @throws If specified entry is not an instance of KiiACLEntry.
-         *
-         * @example
-         *     var aclEntry = . . .; // a KiiACLEntry object
-         *     var acl = . . .; // a KiiACL object
-         *     acl.putACLEntry(aclEntry);
-         */
-        putACLEntry(entry: KiiACLEntry): void;
-
-        /**
-         * Remove a KiiACLEntry to the local object. This does not explicitly revoke any permissions, which should be done through the KiiACLEntry itself. This method simply removes the entry from the local ACL object and will not be saved to the server.
-         *
-         * @param entry The KiiACLEntry to remove
-         *
-         * @throws If specified entry is not an instance of KiiACLEntry.
-         *
-         * @example
-         *     var aclEntry = . . .; // a KiiACLEntry object
-         *     var acl = . . .; // a KiiACL object
-         *     acl.removeACLEntry(aclEntry);
-         */
-        removeACLEntry(entry: KiiACLEntry): void;
-
-        /**
-         * Save the list of ACLEntry objects associated with this ACL object to the server
-         *
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *     <ul>
-         *       <li>fulfill callback function: function(theSavedACL). theSavedACL is KiiACL instance.</li>
-         *       <li>reject callback function: function(error). error is an Error instance.
-         *         <ul>
-         *           <li>error.target is the KiiACL instance which this method was called on.</li>
-         *           <li>error.message</li>
-         *         </ul>
-         *       </li>
-         *     </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var acl = . . .; // a KiiACL object
-         *     acl.save({
-         *         success: function(theSavedACL) {
-         *             // do something with the saved acl
-         *         },
-         *
-         *         failure: function(theACL, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var acl = . . .; // a KiiACL object
-         *     acl.save().then(
-         *         function(theSavedACL) { // fulfill callback function
-         *             // do something with the saved acl
-         *         },
-         *         function(error) { // reject callback function
-         *             var theACL = error.target;
-         *             var anErrorString = error.message;
-         *             // do something with the error response
-         *     });
-         */
-        save(callbacks?: { success(theSavedACL: KiiACL): any; failure(theACL: KiiACL, anErrorString: string): any; }): Promise<KiiACL>;
-    }
-
-    /**
-     * Represents a KiiACLEntry object
-     */
-    export class KiiACLEntry {
-        /**
-         * The action that is being permitted/restricted. Possible values:
-         * <br><br>
-         * KiiACLAction.KiiACLBucketActionCreateObjects,<br>
-         * KiiACLAction.KiiACLBucketActionQueryObjects,  <br>
-         * KiiACLAction.KiiACLBucketActionDropBucket,<br>
-         * KiiACLAction.KiiACLObjectActionRead,<br>
-         * KiiACLAction.KiiACLObjectActionWrite,<br>
-         * KiiACLAction.KiiACLSubscribeToTopic,<br>
-         * KiiACLAction.KiiACLSendMessageToTopic
-         *
-         * @param value The action being permitted/restricted
-         *
-         * @throws If the value is not one of the permitted values
-         */
-        setAction(value: KiiACLAction): void;
-
-        /**
-         * Get the action that is being permitted/restricted in this entry
-         *
-         * @return
-         */
-        getAction(): KiiACLAction;
-
-        /**
-         * Set the subject to which the action/grant is being applied
-         *
-         * @param subject instance.
-         *
-         * @throws If the value is not one of the permitted values
-         */
-        setSubject(subject: KiiACLSubject): void;
-
-        /**
-         * Get the subject that is being permitted/restricted in this entry
-         *
-         * @return
-         */
-        getSubject<T extends KiiACLSubject>(): T;
-
-        /**
-         * Set whether or not the action is being permitted to the subject
-         *
-         * @param value true if the action is permitted, false otherwise
-         *
-         * @throws If the value is not a boolean type
-         */
-        setGrant(value: boolean): void;
-
-        /**
-         * Get whether or not the action is being permitted to the subject
-         *
-         * @return
-         */
-        getGrant(): boolean;
-
-        /**
-         * Create a KiiACLEntry object with a subject and action
-         *
-         * The entry will not be applied on the server until the KiiACL object is
-         * explicitly saved. This method simply returns a working KiiACLEntry with
-         * a specified subject and action.
-         *
-         * @param Subject to which the action/grant is being applied
-         * @param action One of the specified KiiACLAction values the
-         *   permissions is being applied to
-         *
-         * @return A KiiACLEntry object with the specified attributes
-         *
-         * @throws If specified subject is invalid.
-         * @throws If the specified action is invalid.
-         */
-        static entryWithSubject(Subject: KiiACLSubject, action: KiiACLAction): KiiACLEntry;
-    }
-
-    /**
-     * The main SDK class
-     */
-    export class KiiAnalytics {
-        /**
-         * Retrieve the current app ID
-         *
-         * @return The current app ID
-         */
-        static getAppID(): string;
-
-        /**
-         * Retrieve the current app key
-         *
-         * @return The current app key
-         */
-        static getAppKey(): string;
-
-        /**
-         * Get the deviceId. If deviceId has not specified while initialization, it returns SDK generated deviceId.It is recommended to retrieve the deviceId and store it to identify the device properly.
-         *
-         * @return deviceId.
-         */
-        static getDeviceId(): string;
-
-        /**
-         * Is the SDK printing logs to the console?
-         *
-         * @return True if printing logs, false otherwise
-         */
-        static isLogging(): boolean;
-
-        /**
-         * Set the logging status of the SDK
-         *
-         *     Helpful for development - we strongly advice you turn off logging for any production code.
-         *
-         * @param True if logs should be printed, false otherwise
-         *
-         * @example
-         *         KiiAnalytics.setLogging(true);
-         */
-        static setLogging(True: boolean): void;
-
-        /**
-         *
-         *
-         * @deprecated Use {@link Kii.initializeWithSite} instead. Initialize the Kii SDK with a specific URL
-         *
-         *   Should be the first Kii SDK action your application makes
-         *
-         * @param appID The application ID found in your Kii developer console
-         * @param appKey The application key found in your Kii developer console
-         * @param site Can be one of the constants KiiAnalyticsSite.US, KiiAnalyticsSite.JP, KiiAnalyticsSite.CN, KiiAnalyticsSite.CN3 or KiiAnalyticsSite.SG depending on your location.
-         * @param deviceid If deviceId is not provided, SDK generates a new deviceId and use it when upload events.deviceId can be retrieved by {@link KiiAnalytics.getDeviceId()}.It is recommended to retrieve the deviceId and store it to identify the device properly.
-         *
-         * @example
-         *     // initialize without deviceId
-         *     Kii.initializeWithSite("my-app-id", "my-app-key", KiiAnalyticsSite.JP);
-         *     // initialize with deviceId
-         *     Kii.initializeWithSite("my-app-id", "my-app-key", KiiAnalyticsSite.JP, "my-device-id");
-         */
-        static initializeWithSite(appID: string, appKey: string, site: KiiAnalyticsSite, deviceid: string): void;
-
-        /**
-         *
-         *
-         * @deprecated Use {@link Kii.initialize} instead. Initialize the KiiAnalytics SDK
-         *
-         *   Should be the first KiiAnalytics SDK action your application makes
-         *
-         * @param appID The application ID found in your Kii developer console
-         * @param appKey The application key found in your Kii developer console
-         * @param deviceid If deviceId is not provided, SDK generates a new deviceId and use it when upload events. deviceId can be retrieved by {@link KiiAnalytics.getDeviceId()}.It is recommended to retrieve the deviceId and store it to identify the device properly.
-         *
-         * @example
-         *     // initialize without deviceId
-         *     Kii.initializeWithSite("my-app-id", "my-app-key", KiiAnalyticsSite.JP);
-         *     // initialize with deviceId
-         *     Kii.initializeWithSite("my-app-id", "my-app-key", KiiAnalyticsSite.JP, "my-device-id");
-         */
-        static initialize(appID: string, appKey: string, deviceid: string): void;
-
-        /**
-         * Utilize the KiiAnalytics logger to track SDK-specific actions
-         *
-         *     Helpful for development - we strongly advice you turn off logging for any production code.
-         *
-         * @param message The message to print to console.log in your browser
-         *
-         * @example
-         *         KiiAnalytics.logger("My message");
-         */
-        static logger(message: string): void;
-
-        /**
-         * Log a single event to be uploaded to KiiAnalytics
-         *
-         * Use this method if you'd like to track an event by name only. If you'd like to track other attributes/dimensions, please use KiiAnalytics.trackEventWithExtras(eventName, parameters)
-         *
-         * @param eventName A string representing the event name for later tracking
-         *
-         * @return return promise object.
-         *     <ul>
-         *       <li>fulfill callback function: function(). No parameters. </li>
-         *       <li>reject callback function: function(error). error is an Error instance.
-         *         <ul>
-         *           <li>error.message</li>
-         *         </ul>
-         *       </li>
-         *     </ul>
-         */
-        static trackEvent(eventName: string): Promise<void>;
-
-        /**
-         * Log a single event to be uploaded to KiiAnalytics
-         *
-         * Use this method if you'd like to track an event by name and add extra information to the event.
-         *
-         * @param eventName A string representing the event name for later tracking
-         * @param extras A dictionary of JSON-encodable key/value pairs to be attached to the event.
-         *   Key must follow the pattern "^[a-zA-Z][a-zA-Z0-9_]{0,63}$".Supported value type is string, number, boolean and array.
-         *   Empty string or empty array will be considered as invalid.Type of array elements must be string, number or boolean.
-         *   If any key/value pair is invalid, it will be ignored and not sent to the KiiCloud.
-         *
-         * @return return promise object.
-         *     <ul>
-         *       <li>fulfill callback function: function(). No parameters. </li>
-         *       <li>reject callback function: function(error). error is an Error instance.
-         *         <ul>
-         *           <li>error.message</li>
-         *         </ul>
-         *       </li>
-         *     </ul>
-         */
-        static trackEventWithExtras(eventName: string, extras: any): Promise<void>;
-
-        /**
-         * Log a single event to be uploaded to KiiAnalytics
-         *
-         * Use this method if you'd like to track an event asynchronously by name and add extra information to the event.
-         *
-         * @param eventName A string representing the event name for later tracking
-         * @param extras A dictionary of JSON-encodable key/value pairs to be attached to the event.
-         *   Key must follow the pattern "^[a-zA-Z][a-zA-Z0-9_]{0,63}$".Supported value type is string, number, boolean and array.
-         *   Empty string or empty array will be considered as invalid.Type of array elements must be string, number or boolean.
-         *   If any key/value pair is invalid, it will be ignored and not sent to the KiiCloud.
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *     <ul>
-         *       <li>fulfill callback function: function(). No parameters. </li>
-         *       <li>reject callback function: function(error). error is an Error instance.
-         *         <ul>
-         *           <li>error.message</li>
-         *         </ul>
-         *       </li>
-         *     </ul>
-         */
-        static trackEventWithExtrasAndCallbacks(eventName: string, extras: any, callbacks?: { success(): any; failure(error: Error): any; }): Promise<void>;
-
-        /**
-         *
-         *
-         * @deprecated Set a custom API endpoint URL
-         *
-         * @param url A string containing the desired endpoint
-         */
-        static setBaseURL(url: string): void;
-
-        /**
-         *
-         *
-         * @deprecated Use {@link Kii.getSDKVersion} instead. Kii Analytics SDK Version Number
-         *
-         * @return current version number of the SDK
-         */
-        static getSDKVersion(): string;
-    }
-
-    /**
-     * Represent an anonymous user for setting the ACL of an object. This will include anyone using the application but have not signed up or authenticated as registered user.
-     *
-     * 	When retrieving ACL from an object, test for this class to determine the subject type.
-     */
-    export class KiiAnonymousUser {
-        /**
-         * Returns the ID of Anonymous user.
-         */
-        getID(): string;
-    }
-
-    /**
-     * Represent any authenticated user for setting the ACL of an object. This will include anyone using the application who has registered and authenticated in the current session.
-     *
-     * 	When retrieving ACL from an object, test for this class to determine the subject type. Example:
-     */
-    export class KiiAnyAuthenticatedUser {
-        /**
-         * Returns the ID of AuthenticatedUser user.
-         */
-        getID(): string;
-    }
-
-    /**
-     * represents the app admin context
-     * <br><br>
-     * <B>This class must not referred from code accessible from browser.
-     * This class is intended to be used by server side code like Node.js.
-     * If you use this class in code accessible by browser, your application client id and client secret could be stolen.
-     * Attacker will be act as application admin and all the data in your application will be suffered.
-     * </B>
-     * Application administrator context. Entities obtained from this class will be manipulated by application admin.
-     */
-    export class KiiAppAdminContext {
-        /**
-         * Creates a reference to a bucket operated by app admin.
-         *     <br><br>The bucket will be created/accessed within this app's scope
-         *
-         * @param bucketName The name of the bucket the app should create/access
-         *
-         * @return A working KiiBucket object
-         *
-         * @example
-         *         Kii.authenticateAsAppAdmin("client-id", "client-secret", {
-         *             success: function(adminContext) {
-         *                 var bucket = adminContext.bucketWithName("myBucket");
-         *                 // KiiBucket operation by app admin is available now.
-         *             },
-         *             failure: function(errorString, errorCode) {
-         *                 // auth failed.
-         *             }
-         *         });
-         */
-        bucketWithName(bucketName: string): KiiBucket;
-
-        /**
-         * Creates a reference to a encrypted bucket operated by app admin.
-         *     <br><br>The bucket will be created/accessed within this app's scope
-         *
-         * @param bucketName The name of the bucket the app should create/access
-         *
-         * @return A working KiiBucket object
-         *
-         * @example
-         *         Kii.authenticateAsAppAdmin("client-id", "client-secret", {
-         *             success: function(adminContext) {
-         *                 var bucket = adminContext.encryptedBucketWithName("myBucket");
-         *                 // KiiBucket operation by app admin is available now.
-         *             },
-         *             failure: function(errorString, errorCode) {
-         *                 // auth failed.
-         *             }
-         *         });
-         */
-        encryptedBucketWithName(bucketName: string): KiiBucket;
-
-        /**
-         * Creates a reference to a group operated by app admin.
-         *     <br><br>
-         *     <b>Note:</b>
-         *     Returned instance from this API can not operate existing KiiGroup.<br>
-         *     If you want to operate existing KiiGroup, please use {@link KiiAppAdminContext#groupWithURI} or {@link KiiAppAdminContext#groupWithID}.
-         *
-         * @param group name.
-         *
-         * @return A working KiiGroup object
-         *
-         * @example
-         *         Kii.authenticateAsAppAdmin("client-id", "client-secret", {
-         *             success: function(adminContext) {
-         *                 var group = adminContext.groupWithName("newGroup");
-         *                 // KiiGroup operation by app admin is available now.
-         *             },
-         *             failure: function(errorString, errorCode) {
-         *                 // auth failed.
-         *             }
-         *         });
-         */
-        groupWithName(group: string): KiiGroup;
-
-        /**
-         * Creates a reference to a user operated by app admin.
-         *
-         * @param user id.
-         *
-         * @return A working KiiUser object
-         *
-         * @example
-         *         Kii.authenticateAsAppAdmin("client-id", "client-secret", {
-         *             success: function(adminContext) {
-         *                 var user = adminContext.userWithID("userid");
-         *                 // KiiUser operation by app admin is available now.
-         *             },
-         *             failure: function(errorString, errorCode) {
-         *                 // auth failed.
-         *             }
-         *         });
-         */
-        userWithID(user: string): KiiUser;
-
-        /**
-         * Creates a reference to an object operated by app admin using object`s URI.
-         *
-         * @param object URI.
-         *
-         * @return A working KiiObject instance
-         *
-         * @throws If the URI is null, empty or does not have correct format.
-         */
-        objectWithURI(object: string): KiiObject;
-
-        /**
-         * Creates a reference to a group operated by app admin using group's ID.
-         *     <br><br>
-         *     <b>Note:</b>
-         *     Returned instance from this API can operate existing KiiGroup.<br>
-         *     If you want to create a new KiiGroup, please use {@link KiiAppAdminContext#groupWithName}.
-         *
-         * @param group ID.
-         *
-         * @return A working KiiGroup object
-         *
-         * @throws Thrown if passed groupID is null or empty.
-         *
-         * @example
-         *         Kii.authenticateAsAppAdmin("client-id", "client-secret", {
-         *             success: function(adminContext) {
-         *                 var groupID = "0123456789abcdefghijklmno";
-         *                 var group = adminContext.groupWithID(groupID);
-         *                 // KiiGroup operation by app admin is available now.
-         *             },
-         *             failure: function(errorString, errorCode) {
-         *                 // auth failed.
-         *             }
-         *         });
-         */
-        groupWithID(group: string): KiiGroup;
-
-        /**
-         * Register new group own by specified user on Kii Cloud with specified ID.
-         * This method can be used only by app admin.
-         *
-         * <br><br>If the group that has specified id already exists, registration will be failed.
-         *
-         * @param groupID ID of the KiiGroup
-         * @param groupName Name of the KiiGroup
-         * @param user id of owner
-         * @param members An array of KiiUser objects to add to the group
-         * @param callbacks
-         *
-         * @return return promise object.
-         *       <ul>
-         *         <li>fulfill callback function: function(theSavedGroup). theSavedGroup is KiiGroup instance.</li>
-         *         <li>reject callback function: function(error). error is an Error instance.
-         *           <ul>
-         *             <li>error.target is the KiiGroup instance which this method was called on.</li>
-         *             <li>error.message</li>
-         *             <li>error.addMembersArray is array of KiiUser to be added as memebers of this group.</li>
-         *             <li>error.removeMembersArray is array of KiiUser to be removed from the memebers list of this group.</li>
-         *           </ul>
-         *         </li>
-         *       </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     Kii.authenticateAsAppAdmin("client-id", "client-secret", {
-         *         success: function(adminContext) {
-         *             var members = [];
-         *             members.push(KiiUser.userWithID("Member User Id"));
-         *             adminContext.registerGroupWithOwnerAndID("Group ID", "Group Name", "Owner User ID", members, {
-         *                 success: function(theSavedGroup) {
-         *                     // do something with the saved group
-         *                 },
-         *                 failure: function(theGroup, anErrorString, addMembersArray, removeMembersArray) {
-         *                     // do something with the error response
-         *                 }
-         *             });
-         *         },
-         *         failure: function(errorString, errorCode) {
-         *             // auth failed.
-         *         }
-         *     });
-         *     // example to use Promise
-         *     Kii.authenticateAsAppAdmin("client-id", "client-secret").then(
-         *         function(adminContext) {
-         *             var members = [];
-         *             members.push(KiiUser.userWithID("Member User Id"));
-         *             return adminContext.registerGroupWithOwnerAndID("Group ID", "Group Name", "Owner User ID", members);
-         *         }
-         *     ).then(
-         *         function(group) {
-         *             // do something with the saved group
-         *         }
-         *     );
-         */
-        registerGroupWithOwnerAndID(groupID: string, groupName: string, user: string, members: KiiUser[], callbacks?: { success(adminContext: KiiAppAdminContext): any; failure(theGroup: KiiGroup, anErrorString: string, addMembersArray: KiiUser[], removeMembersArray: KiiUser[]): any; }): Promise<KiiAppAdminContext>;
-
-        /**
-         * Creates a reference to a group operated by app admin using group's URI.
-         *     <br><br>
-         *     <b>Note:</b>
-         *     Returned instance from this API can operate existing KiiGroup.<br>
-         *     If you want to create a new KiiGroup, please use {@link KiiAppAdminContext#groupWithName}.
-         *
-         * @param group URI.
-         *
-         * @return A working KiiGroup object
-         *
-         * @throws Thrown if the URI is null, empty or does not have correct format.
-         *
-         * @example
-         *         Kii.authenticateAsAppAdmin("client-id", "client-secret", {
-         *             success: function(adminContext) {
-         *                 var groupUri = ...; // KiiGroup's URI
-         *                 var group = adminContext.groupWithURI(groupUri);
-         *                 // KiiGroup operation by app admin is available now.
-         *             },
-         *             failure: function(errorString, errorCode) {
-         *                 // auth failed.
-         *             }
-         *         });
-         */
-        groupWithURI(group: string): KiiGroup;
-
-        /**
-         * Find registered KiiUser with the email.<br>
-         * If there are no user registers with the specified email or if there are but not verified email yet,
-         * callbacks.failure or reject callback of promise will be called.<br>
-         * If the email is null or empty, callbacks.failure or reject callback of promise will be callded.
-         * <br><br>
-         * <b>Note:</b>
-         * <ul>
-         * <li>If "Expose Full User Data To Others" is enabled in the application console, the response will contain full of the user data.</li>
-         * <li>Otherwise, the response will only contain "userID", "loginName" and "displayName" field values if exist.</li>
-         * </ul>
-         *
-         * @param email The email to find KiiUser who owns it.<br>
-         *   Don't add prefix of "EMAIL:" described in REST API documentation. SDK will take care of it.
-         * @param callbacks An object with callback methods defined.
-         *   This argument is mandatory and can't be omitted.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is Array instance.
-         *       <ul>
-         *         <li>params[0] is a KiiAppAdminContext instance which this method was called on.</li>
-         *         <li>params[1] is a found KiiUser instance.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is a KiiAppAdminContext instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     Kii.authenticateAsAppAdmin("client-id", "client-secret", {
-         *         success: function(adminContext) {
-         *             adminContext.findUserByEmail("user_to_find@example.com", {
-         *                 success: function(adminContext, theMatchedUser) {
-         *                     // Do something with the found user
-         *                 },
-         *                 failure: function(adminContext, anErrorString) {
-         *                     // Do something with the error response
-         *                 }
-         *             });
-         *         },
-         *         failure: function(errorString, errorCode) {
-         *             // Auth failed.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     Kii.authenticateAsAppAdmin("client-id", "client-secret").then(
-         *         function(adminContext) {
-         *             adminContext.findUserByEmail("user_to_find@example.com").then(
-         *                 function(params) { // fullfill callback function
-         *                     var adminContext = params[0];
-         *                     var theMatchedUser = params[1];
-         *                     // Do something with the found user
-         *                 },
-         *                 function(error) { // reject callback function
-         *                     var adminContext = error.target;
-         *                     var anErrorString = error.message;
-         *                     // Do something with the error response
-         *                 }
-         *             );
-         *         },
-         *         function(error) {
-         *           // Auth failed.
-         *         }
-         *     );
-         */
-        findUserByEmail(email: string, callbacks?: { success(adminContext: KiiAppAdminContext, theMatchedUser: KiiUser): any; failure(adminContext: KiiAppAdminContext, anErrorString: string): any; }): Promise<[KiiAppAdminContext, KiiUser]>;
-
-        /**
-         * Find registered KiiUser with the phone.<br>
-         * If there are no user registers with the specified phone or if there are but not verified phone yet,
-         * callbacks.failure or reject callback of promise will be called.<br>
-         * If the phone is null or empty, callbacks.failure or reject callback of promise will be called.
-         * <br><br>
-         * <b>Note:</b>
-         * <ul>
-         * <li>If "Expose Full User Data To Others" is enabled in the application console, the response will contain full of the user data.</li>
-         * <li>Otherwise, the response will only contain "userID", "loginName" and "displayName" field values if exist.</li>
-         * </ul>
-         *
-         * @param phone The phone number to find KiiUser who owns it.<br>
-         *   Don't add prefix of "PHONE:" described in REST API documentation. SDK will take care of it.
-         * @param callbacks An object with callback methods defined.
-         *   This argument is mandatory and can't be omitted.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is Array instance.
-         *       <ul>
-         *         <li>params[0] is a KiiAppAdminContext instance which this method was called on.</li>
-         *         <li>params[1] is a found KiiUser instance.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is a KiiAppAdminContext instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     Kii.authenticateAsAppAdmin("client-id", "client-secret", {
-         *         success: function(adminContext) {
-         *             adminContext.findUserByPhone("phone_number_to_find", {
-         *                 success: function(adminContext, theMatchedUser) {
-         *                     // Do something with the found user
-         *                 },
-         *                 failure: function(adminContext, anErrorString) {
-         *                     // Do something with the error response
-         *                 }
-         *             });
-         *         },
-         *         failure: function(errorString, errorCode) {
-         *             // Auth failed.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     Kii.authenticateAsAppAdmin("client-id", "client-secret").then(
-         *         function(adminContext) {
-         *             adminContext.findUserByPhone("phone_number_to_find").then(
-         *                 function(params) { // fullfill callback function
-         *                     var adminContext = params[0];
-         *                     var theMatchedUser = params[1];
-         *                     // Do something with the found user
-         *                 },
-         *                 function(error) { // reject callback function
-         *                     var adminContext = error.target;
-         *                     var anErrorString = error.message;
-         *                     // Do something with the error response
-         *                 }
-         *             );
-         *         },
-         *         function(error) {
-         *           // Auth failed.
-         *         }
-         *     );
-         */
-        findUserByPhone(phone: string, callbacks?: { success(adminContext: KiiAppAdminContext, theMatchedUser: KiiUser): any; failure(adminContext: KiiAppAdminContext, anErrorString: string): any; }): Promise<[KiiAppAdminContext, KiiUser]>;
-
-        /**
-         * Find registered KiiUser with the user name.<br>
-         * If there are no user registers with the specified user name, callbacks.failure or reject callback of promise will be called.<br>
-         * If the user name is null or empty, callbacks.failure or reject callback of promise will be called.
-         * <br><br>
-         * <b>Note:</b>
-         * <ul>
-         * <li>If "Expose Full User Data To Others" is enabled in the application console, the response will contain full of the user data.</li>
-         * <li>Otherwise, the response will only contain "userID", "loginName" and "displayName" field values if exist.</li>
-         * </ul>
-         *
-         * @param username The user name to find KiiUser who owns it.<br>
-         *   Don't add prefix of "LOGIN_NAME:" described in REST API documentation. SDK will take care of it.
-         * @param callbacks An object with callback methods defined.
-         *   This argument is mandatory and can't be omitted.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is Array instance.
-         *       <ul>
-         *         <li>params[0] is a KiiAppAdminContext instance which this method was called on.</li>
-         *         <li>params[1] is a found KiiUser instance.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is a KiiAppAdminContext instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     Kii.authenticateAsAppAdmin("client-id", "client-secret", {
-         *         success: function(adminContext) {
-         *             adminContext.findUserByUsername("user_name_to_find", {
-         *                 success: function(adminContext, theMatchedUser) {
-         *                     // Do something with the found user
-         *                 },
-         *                 failure: function(adminContext, anErrorString) {
-         *                     // Do something with the error response
-         *                 }
-         *             });
-         *         },
-         *         failure: function(errorString, errorCode) {
-         *             // Auth failed.
-         *         }
-         *     });
-         *     // example to use Promise
-         *     Kii.authenticateAsAppAdmin("client-id", "client-secret").then(
-         *         function(adminContext) {
-         *             adminContext.findUserByUsername("user_name_to_find").then(
-         *                 function(params) { // fullfill callback function
-         *                     var adminContext = params[0];
-         *                     var theMatchedUser = params[1];
-         *                     // Do something with the found user
-         *                 },
-         *                 function(error) { // reject callback function
-         *                     var adminContext = error.target;
-         *                     var anErrorString = error.message;
-         *                     // Do something with the error response
-         *                 }
-         *             );
-         *         },
-         *         function(error) {
-         *           // Auth failed.
-         *         }
-         *     );
-         */
-        findUserByUsername(username: string, callbacks?: { success(adminContext: KiiAppAdminContext, theMatchedUser: KiiUser): any; failure(adminContext: KiiAppAdminContext, anErrorString: string): any; }): Promise<[KiiAppAdminContext, KiiUser]>;
-
-        /**
-         * Register thing by app admin.
-         * Method interface is same as {@link KiiThing#register()}.
-         * Please refer to KiiThing document for details.
-         *
-         * @param fields of the thing to be registered. Please refer to {@link KiiThing#register()} for the details of fields.
-         * @param callbacks object holds callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(thing). thing is KiiThing instance with adminToken.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     // Assume you already have adminContext instance.
-         *     adminContext.registerThing(
-         *         {
-         *             _vendorThingID: "thing-XXXX-YYYY-ZZZZZ",
-         *             _password: "thing-password",
-         *             _thingType: "thermometer",
-         *             yourCustomObj: // Arbitrary key can be used.
-         *             { // Object, Array, Number, String can be used. Should be compatible with JSON.
-         *                 yourCustomKey1: "value",
-         *                 yourCustomKey2: 100
-         *             }
-         *         },
-         *         {
-         *             success: function(thing) {
-         *                 // Register Thing succeeded.
-         *                 // Operation using thing instance in the parameter
-         *                 // is authored by app admin.
-         *             },
-         *             failure: function(error) {
-         *                 // Handle error.
-         *             }
-         *         }
-         *     );
-         *
-         *     // example to use Promise
-         *     // Assume you already have adminContext instance.
-         *     adminContext.registerThing(
-         *         {
-         *             _vendorThingID: "thing-XXXX-YYYY-ZZZZZ",
-         *             _password: "thing-password",
-         *             _thingType: "thermometer",
-         *             yourCustomObj: // Arbitrary key can be used.
-         *             { // Object, Array, Number, String can be used. Should be compatible with JSON.
-         *                 yourCustomKey1: "value",
-         *                 yourCustomKey2: 100
-         *             }
-         *         }
-         *     ).then(
-         *         function(thing) {
-         *             // Register Thing succeeded.
-         *             // Operation using thing instance in the parameter
-         *             // is authored by app admin.
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        registerThing(fields: KiiThingFields, callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
-
-        /**
-         * Creates a reference to a thing operated by app admin.
-         *
-         * @param thing id.
-         *
-         * @return A working KiiThing object
-         *
-         * @example
-         *         // Assume you already have adminContext instance.
-         *         adminContext.thingWithID(thingID);
-         */
-        thingWithID(thing: string): KiiThing;
-
-        /**
-         * Register user/group as owner of specified thing by app admin.
-         *
-         * @param thingID The ID of thing
-         * @param owner instnce of KiiUser/KiiGroup to be registered as owner.
-         * @param callbacks object holds callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is an Array instance.
-         *       <ul>
-         *         <li>params[0] is a KiiUser/KiiGroup instance.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     // assume thing/group is already registered.
-         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
-         *     // example to use Promise
-         *     // Assume you already have adminContext instance.
-         *     adminContext.registerOwnerWithThingID("th.xxxx-yyyy-zzzz", group, {
-         *         success: function(group) {
-         *             // Register owner succeeded.
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     // assume thing/group is already registered.
-         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
-         *     // example to use Promise
-         *     // Assume you already have adminContext instance.
-         *     adminContext.registerOwnerWithThingID("th.xxxx-yyyy-zzzz", group).then(
-         *         function(params) {
-         *             // Register owner succeeded.
-         *             var group = params[0];
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        registerOwnerWithThingID<T extends KiiUser | KiiGroup>(thingID: string, owner: T, callbacks?: { success(group: T): any; failure(error: Error): any; }): Promise<T>;
-
-        /**
-         * Register user/group as owner of specified thing by app admin.
-         *
-         * @param vendorThingID The vendor thing ID of thing
-         * @param owner instance of KiiUser/KiiGroupd to be registered as owner.
-         * @param callbacks object holds callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is an Array instance.
-         *       <ul>
-         *         <li>params[0] is a KiiUser/KiiGroup instance.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     // assume thing/group is already registered.
-         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
-         *     // example to use Promise
-         *     // Assume you already have adminContext instance.
-         *     adminContext.registerOwnerWithVendorThingID("xxxx-yyyy-zzzz", group, {
-         *         success: function(group) {
-         *             // Register owner succeeded.
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     // assume thing/group is already registered.
-         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
-         *     // example to use Promise
-         *     // Assume you already have adminContext instance.
-         *     adminContext.registerOwnerWithVendorThingID("xxxx-yyyy-zzzz", group).then(
-         *         function(group) {
-         *             // Register owner succeeded.
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        registerOwnerWithVendorThingID<T extends KiiUser | KiiGroup>(vendorThingID: string, owner: T, callbacks?: { success(group: T): any; failure(error: Error): any; }): Promise<T>;
-
-        /**
-         * Load thing with vendor thing ID by app admin.
-         * Method interface is same as {@link KiiThing#loadWithVendorThingID()}.
-         * Please refer to KiiThing document for details.
-         *
-         * @param vendorThingID registered vendor thing id.
-         * @param callbacks object holds callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(thing). thing is KiiThing instance with adminToken.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     // Assume you already have adminContext instance.
-         *     adminContext.loadThingWithVendorThingID("thing-xxxx-yyyy",{
-         *         success: function(thing) {
-         *             // Load succeeded.
-         *             // Operation using thing instance in the parameter
-         *             // is authored by app admin.
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     // Assume you already have adminContext instance.
-         *     adminContext.loadThingWithVendorThingID("thing-xxxx-yyyy").then(
-         *         function(thing) {
-         *             // Load succeeded.
-         *             // Operation using thing instance in the parameter
-         *             // is authored by app admin.
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        loadThingWithVendorThingID(vendorThingID: string, callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
-
-        /**
-         * Load thing with thing ID by app admin.
-         * Method interface is same as {@link KiiThing#loadWithThingID()}.
-         * Please refer to KiiThing document for details.
-         *
-         * @param thingID registered thing id.
-         * @param callbacks object holds callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(thing). thing is KiiThing instance with adminToken.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     // Assume you already have adminContext instance.
-         *     adminContext.loadThingWithThingID("thing-xxxx-yyyy",{
-         *         success: function(thing) {
-         *             // Load succeeded.
-         *             // Operation using thing instance in the parameter
-         *             // is authored by app admin.
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     // Assume you already have adminContext instance.
-         *     adminContext.loadThingWithThingID("thing-xxxx-yyyy").then(
-         *         function(thing) {
-         *             // Load succeeded.
-         *             // Operation using thing instance in the parameter
-         *             // is authored by app admin.
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        loadThingWithThingID(thingID: string, callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
-
-        /**
-         * Creates a reference to a topic operated by app admin
-         *
-         * @param topicName name of the topic. Must be a not empty string.
-         *
-         * @return topic instance.
-         */
-        topicWithName(topicName: string): KiiTopic;
-
-        /**
-         * Gets a list of topics in app scope
-         *
-         * @param callbacks An object with callback methods defined
-         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success. If empty string or no string object is provided, this API regards no paginationKey specified.
-         *
-         * @return return promise object.
-         *     <ul>
-         *       <li>fulfill callback function: function(params). params is Array instance.
-         *         <ul>
-         *           <li>params[0] is array of KiiTopic instances.</li>
-         *           <li>params[1] is string of nextPaginationKey.</li>
-         *         </ul>
-         *       </li>
-         *       <li>reject callback function: function(error). error is an Error instance.
-         *         <ul>
-         *           <li>error.target is a KiiAppAdminContext instance which this method was called on.</li>
-         *           <li>error.message</li>
-         *         </ul>
-         *       </li>
-         *     </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     // Assume you already have adminContext instance.
-         *     adminContext.listTopics({
-         *         success: function(topicList, nextPaginationKey) {
-         *             // do something with the result
-         *             for(var i=0; i&lt;topicList.length; i++){
-         *                 var topic = topicList[i];
-         *             }
-         *             if (nextPaginationKey != null) {
-         *                 Kii.listTopics({
-         *                     success: function(topicList, nextPaginationKey) {...},
-         *                     failure: function(anErrorString) {...}
-         *                 }, nextPaginationKey);
-         *             }
-         *         },
-         *         failure: function(anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     // Assume you already have adminContext instance.
-         *     adminContext.listTopics().then(
-         *         function(params) {
-         *             var topicList = params[0];
-         *             var nextPaginationKey = params[1];
-         *             // do something with the result
-         *             for(var i=0; i&lt;topicList.length; i++){
-         *                 var topic = topicList[i];
-         *             }
-         *             if (nextPaginationKey != null) {
-         *                 adminContext.listTopics(null, nextPaginationKey).then(
-         *                     function(params) {...},
-         *                     function(error) {...}
-         *                 );
-         *             }
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        listTopics(callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; }, paginationKey?: string): Promise<[KiiTopic[], string]>;
-    }
-
-    /**
-     * Represents a KiiBucket object
-     */
-    export class KiiBucket {
-        /**
-         * The name of this bucket
-         *
-         * @return
-         */
-        getBucketName(): string;
-
-        /**
-         * Create a KiiObject within the current bucket
-         *
-         * <br><br>The object will not be created on the server until the KiiObject is explicitly saved. This method simply returns an empty working KiiObject.
-         *
-         * @return An empty KiiObject with no specific type
-         *
-         * @example
-         *     var bucket = . . .; // a KiiBucket
-         *     var object = bucket.createObject();
-         */
-        createObject(): KiiObject;
-
-        /**
-         * Create a KiiObject within the current bucket, with type
-         *
-         * <br><br>The object will not be created on the server until the KiiObject is explicitly saved. This method simply returns an empty working KiiObject with a specified type. The type allows for better indexing and improved query results. It is recommended to use this method - but for lazy creation, the createObject method is also available.
-         *
-         * @param type A string representing the desired object type
-         *
-         * @return An empty KiiObject with specified type
-         *
-         * @example
-         *     var bucket = . . .; // a KiiBucket
-         *     var object = bucket.createObjectWithType("scores");
-         */
-        createObjectWithType(type: string): KiiObject;
-
-        /**
-         * Create a KiiObject within the current bucket, specifying its ID.
-         *
-         * <br><br> If the object has not exist on KiiCloud, {@link KiiObject#saveAllFields(callback)}
-         *   will create new Object which has ID specified in the argument.
-         *   If the object exist in KiiCloud, references the existing object which has
-         *   specified ID. use {@link KiiObject#refresh(callback)} to retrieve the contents of
-         *   KiiObject.
-         *
-         * @param objectID ID of the obeject you want to instantiate.
-         *
-         * @return KiiObject instance.
-         *
-         * @throws objectID is not acceptable.
-         *      Refer to {@link KiiObject.isValidObjectID(string)} for details of acceptable string.
-         *
-         * @example
-         *      var bucket = . . .; // KiiBucket
-         *      var object = bucket.createObjectWithID('__OBJECT_ID_');
-         */
-        createObjectWithID(objectID: string): KiiObject;
-
-        /**
-         * Get the ACL handle for this bucket
-         *
-         * <br><br>Any KiiACLEntry objects added or revoked from this ACL object will be appended to/removed from the server on ACL save.
-         *
-         * @return A KiiACL object associated with this KiiObject
-         *
-         * @example
-         *     	var bucket = . . .; // a KiiBucket
-         *     	var acl = bucket.acl();
-         */
-        acl(): KiiACL;
-
-        /**
-         * Perform a query on the given bucket
-         *
-         * <br><br>The query will be executed against the server, returning a result set.
-         *
-         * @param query An object with callback methods defined
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is Array instance.
-         *       <ul>
-         *         <li>params[0] is a performed KiiQuery instance.</li>
-         *         <li>params[1] is resultSet Array instance. Could be KiiObject, KiiGroup, KiiUser, etc.</li>
-         *         <li>params[2] is a KiiQuery instance for next query. If there are no more results to be retrieved, it will be null.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiBucket instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var bucket = . . .; // a KiiBucket
-         *     var queryObject = . . .; // a KiiQuery
-         *
-         *     // define the callbacks (stored in a variable for reusability)
-         *     var queryCallbacks = {
-         *         success: function(queryPerformed, resultSet, nextQuery) {
-         *             // do something with the results
-         *             for(var i=0; i&lt;resultSet.length; i++) {
-         *                 // do something with the object
-         *                 // resultSet[i]; // could be KiiObject, KiiGroup, KiiUser, etc
-         *             }
-         *
-         *             // if there are more results to be retrieved
-         *             if(nextQuery != null) {
-         *
-         *                 // get them and repeat recursively until no results remain
-         *                 bucket.executeQuery(nextQuery, queryCallbacks);
-         *             }
-         *         },
-         *
-         *         failure: function(bucket, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     };
-         *     bucket.executeQuery(queryObject, queryCallbacks);
-         *
-         *     // example to use Promise
-         *     var bucket = . . .; // a KiiBucket
-         *     var queryObject = . . .; // a KiiQuery
-         *     bucket.executeQuery(queryObject).then(
-         *         function(params) {
-         *             var queryPerformed = params[0];
-         *             var resultSet = params[1];
-         *             var nextQuery = params[2];
-         *             // do something with the results
-         *             for(var i=0; i&lt;resultSet.length; i++) {
-         *                 // do something with the object
-         *                 // resultSet[i]; // could be KiiObject, KiiGroup, KiiUser, etc
-         *             }
-         *
-         *             // if there are more results to be retrieved
-         *             if(nextQuery != null) {
-         *
-         *                 // get them and repeat recursively until no results remain
-         *                 bucket.executeQuery(nextQuery).then(
-         *                     function(params) {
-         *                         // next query success
-         *                     },
-         *                     function(error) {
-         *                         // next query failed, please handle the error
-         *                     }
-         *                 );
-         *             }
-         *
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        executeQuery<T>(query: KiiQuery, callbacks?: { success(queryPerformed: KiiQuery, resultSet: T[], nextQuery: KiiQuery): any; failure(bucket: KiiBucket, anErrorString: string): any; }): Promise<[KiiQuery, T[], KiiQuery]>;
-
-        /**
-         * Execute count aggregation of specified query on current bucket.
-         * Query that passed as nextQuery in success callback of {@link #executeQuery}, is not
-         * supported, callbacks.failure will be fired in this case.
-         *
-         * @param query to be executed. If null, the operation will be same as {@link #count}.
-         * @param callbacks An object with callback methods defined.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is Array instance.
-         *       <ul>
-         *         <li>params[0] is a KiiBucket instance which this method was called on.</li>
-         *         <li>params[1] is a KiiQuery instance.</li>
-         *         <li>params[2] is an integer count result. </li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiBucket instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var bucket = . . .; // a KiiBucket
-         *     var queryObject = . . .; // a KiiQuery
-         *
-         *     // define the callbacks
-         *     var callbacks = {
-         *         success: function(bucket, query, count) {
-         *             // do something with the results
-         *         },
-         *
-         *         failure: function(bucket, errorString) {
-         *             // error happened.
-         *         }
-         *     };
-         *
-         *     bucket.countWithQuery(queryObject, callbacks);
-         *
-         *     // example to use Promise
-         *     var bucket = . . .; // a KiiBucket
-         *     var queryObject = . . .; // a KiiQuery
-         *
-         *     bucket.countWithQuery(queryObject, callbacks).then(
-         *         function(params) {
-         *             var bucket = params[0];
-         *             var query = params[1];
-         *             var count = params[2];
-         *             // do something with the results
-         *         },
-         *         function(error) {
-         *             var bucket = error.target;
-         *             var errorString = error.message;
-         *             // error happened.
-         *         }
-         *     );
-         */
-        countWithQuery(query: KiiQuery, callbacks?: { success(bucket: KiiBucket, query: KiiQuery, count: number): any; failure(bucket: KiiBucket, errorString: string): any; }): Promise<[KiiBucket, KiiQuery, number]>;
-
-        /**
-         * Execute count aggregation of all clause query on current bucket.
-         *
-         * @param callbacks An object with callback methods defined.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is Array instance.
-         *       <ul>
-         *         <li>params[0] is a KiiBucket instance which this method was called on.</li>
-         *         <li>params[1] is a KiiQuery instance.</li>
-         *         <li>params[2] is an integer count result. </li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiBucket instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var bucket = . . .; // a KiiBucket
-         *     // define the callbacks
-         *     var callbacks = {
-         *         success: function(bucket, query, count) {
-         *             // do something with the results
-         *         },
-         *
-         *         failure: function(bucket, errorString) {
-         *             // error happened.
-         *         }
-         *     };
-         *
-         *     bucket.count(callbacks);
-         *
-         *     // example to use Promise
-         *     var bucket = . . .; // a KiiBucket
-         *     var queryObject = . . .; // a KiiQuery
-         *
-         *     bucket.count().then(
-         *         function(params) {
-         *             var bucket = params[0];
-         *             var count = params[2];
-         *             // do something with the results
-         *         },
-         *         function(error) {
-         *             var bucket = error.target;
-         *             var errorString = error.message;
-         *             // error happened.
-         *         }
-         *     );
-         */
-        count(callbacks?: { success(bucket: KiiBucket, query: KiiQuery, count: number): any; failure(bucket: KiiBucket, errorString: string): any; }): Promise<[KiiBucket, KiiQuery, number]>;
-
-        /**
-         * Delete the given bucket from the server
-         *
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(deletedBucket). deletedBucket is KiiBucket instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiBucket instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var bucket = . . .; // a KiiBucket
-         *     bucket['delete']({
-         *         success: function(deletedBucket) {
-         *             // do something with the result
-         *         },
-         *
-         *         failure: function(bucketToDelete, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var bucket = . . .; // a KiiBucket
-         *     bucket['delete']({
-         *         success: function(deletedBucket) {
-         *             // do something with the result
-         *         },
-         *
-         *         failure: function(bucketToDelete, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     }).then(
-         *         function(deletedBucket) {
-         *           // do something with the result
-         *         },
-         *         function(error) {
-         *           // do something with the error response
-         *         }
-         *     );
-         */
-        delete(callbacks?: { success(deletedBucket: KiiBucket): any; failure(bucketToDelete: KiiBucket, anErrorString: string): any; }): Promise<KiiBucket>;
-    }
-
-    /**
-     * Represents a KiiClause expression object
-     */
-    export class KiiClause {
-        /**
-         * Create a KiiClause with the AND operator concatenating multiple KiiClause objects
-         *
-         * @param A variable-length list of KiiClause objects to concatenate
-         *
-         * @example
-         *     KiiClause clause = KiiClause.and(clause1, clause2, clause3, . . .)
-         */
-        static and(...A: KiiClause[]): KiiClause;
-
-        /**
-         * Create a KiiClause with the OR operator concatenating multiple KiiClause objects
-         *
-         * @param A variable-length list of KiiClause objects to concatenate
-         *
-         * @example
-         *     KiiClause clause = KiiClause.or(clause1, clause2, clause3, . . .)
-         */
-        static or(...A: KiiClause[]): KiiClause;
-
-        /**
-         * Create an expression of the form (key == value)
-         *
-         * @param key The key to compare
-         * @param value the value to compare
-         */
-        static equals(key: string, value: any): KiiClause;
-
-        /**
-         * Create an expression of the form (key != value)
-         *
-         * @param key The key to compare
-         * @param value the value to compare
-         */
-        static notEquals(key: string, value: any): KiiClause;
-
-        /**
-         * Create an expression of the form (key > value)
-         *
-         * @param key The key to compare
-         * @param value the value to compare
-         */
-        static greaterThan(key: string, value: any): KiiClause;
-
-        /**
-         * Create an expression of the form (key >= value)
-         *
-         * @param key The key to compare
-         * @param value the value to compare
-         */
-        static greaterThanOrEqual(key: string, value: any): KiiClause;
-
-        /**
-         * Create an expression of the form (key < value)
-         *
-         * @param key The key to compare
-         * @param value the value to compare
-         */
-        static lessThan(key: string, value: any): KiiClause;
-
-        /**
-         * Create an expression of the form (key <= value)
-         *
-         * @param key The key to compare
-         * @param value the value to compare
-         */
-        static lessThanOrEqual(key: string, value: any): KiiClause;
-
-        /**
-         * Create an expression of the form (key in values)
-         *
-         * @param key The key to compare
-         * @param values to compare
-         */
-        static inClause(key: string, values: any[]): KiiClause;
-
-        /**
-         * Create an expression of the form (key STARTS WITH value)
-         *
-         * @param key The key to compare
-         * @param value the value to compare
-         */
-        static startsWith(key: string, value: any): KiiClause;
-
-        /**
-         * Create a clause of geo distance. This clause inquires objects in the specified circle.
-         *
-         * @param key Name of the key to inquire, which holds geo point.
-         * @param center Geo point which specify center of the circle.
-         * @param radius Radius of the circle. unit is meter. value should be in range of ]0, 20000000]
-         * @param putDistanceInto Used for retrieve distance from the center from the query result.Must match the pattern "^[a-zA-Z_][a-zA-Z0-9_]*$".
-         *   If the specified value is null, query result will not contain the distance.
-         *   <b>Note:</b> You can get the results in ascending order of distances from center. To do so, build the orderBy field  by
-         *   "_calculated.{specified value of putDistanceInto}" and pass it in {@link KiiQuery#sortByAsc}. Note that, descending order
-         *   of distances is not supported. The unit of distance is meter.
-         *
-         * @return KiiClaluse reference.
-         *
-         * @throws <li> Specified key is not a string or an empty string.</li>
-         *             <li>center is not an object of KiiGeoPoint.</li>
-         *             <li>putDistanceInto is not a string or an empty string.</li>
-         *
-         * @example
-         *             var putDistanceInto = "distanceFromCurrentLoc";
-         *             var currentLoc = ..; // current location
-         *             var clause = KiiClause.geoDistance("location", currentLoc, 4000, putDistanceInto);
-         *             var query = KiiQuery.queryWithClause(clause);
-         *             // Sort by distances by ascending order.(Optional, use only if you intend to retrieve the distances in a ascending order).
-         *             var orderByKey = "_calculated." + putDistanceInto;
-         *             query.sortByAsc(orderByKey);
-         *             // Define the callbacks
-         *             var bucket = Kii.bucketWithName("MyBucket");
-         *             var queryCallback = {
-         *                 success: function(queryPerformed, resultSet, nextQuery) {
-         *                     // check the first object from resultSet.
-         *                     var object = resultSet[0];
-         *                     var point = object.get("location");
-         *                     var distanceToMyLocation = object.get("_calculated")[putDistanceInto];
-         *                 },
-         *                 failure: function(queryPerformed, anErrorString) {
-         *                     // do something with the error response
-         *                 }
-         *             };
-         *             bucket.executeQuery(query, queryCallback);
-         */
-        static geoDistance(key: string, center: KiiGeoPoint, radius: number, putDistanceInto: string): KiiClause;
-
-        /**
-         * Create a clause of geo box. This clause inquires objects in the specified rectangle.
-         *     Rectangle would be placed parallel to the equator with specified coordinates of the corner.
-         *
-         * @param key Key to inquire which holds geo point.
-         * @param northEast North-Eest corner of the rectangle.
-         * @param southWest South-Wast corner of the rectangle.
-         *
-         * @return KiiClause reference.
-         *
-         * @throws <li> Specified key is not a string or is an empty string.</li>
-         *             <li>northEast or southWest is not a reference of KiiGeoPoint.</li>
-         */
-        static geoBox(key: string, northEast: KiiGeoPoint, southWest: KiiGeoPoint): KiiClause;
-    }
-
-    /**
-     * Represents Geo Point.
-     */
-    export class KiiGeoPoint {
-        /**
-         * Return the latitide of this point.
-         */
-        getLatitude(): number;
-
-        /**
-         * Return the longitude of this point.
-         */
-        getLongitude(): number;
-
-        /**
-         * Create a geo point with the given latitude and longitude.
-         *
-         * @param latitude Latitude of the point in degrees. Valid if the value is greater than -90 degrees and less than +90 degrees.
-         * @param longitude Longitude of the point in degrees. Valid if the value is greater than -180 degrees and less than +180 degrees.
-         *
-         * @return A new reference of KiiGeoPoint.
-         *
-         * @throws Specified latitude or longitude is invalid.
-         *
-         * @example
-         *         var point = KiiGeoPoint.geoPoint(35.07, 139.02);
-         */
-        static geoPoint(latitude: number, longitude: number): KiiGeoPoint;
-    }
-
-    /**
-     * Represents a KiiGroup object
-     */
-    export class KiiGroup {
-        /**
-         *
-         *
-         * @deprecated Use {@link KiiGroup.getId} instead.
-         *   Get the UUID of the given group, assigned by the server
-         *
-         * @return
-         */
-        getUUID(): string;
-
-        /**
-         * Get the ID of the current KiiGroup instance.
-         *
-         * @return Id of the group or null if the group has not saved to cloud.
-         */
-        getID(): string;
-
-        /**
-         * The name of this group
-         *
-         * @return
-         */
-        getName(): string;
-
-        /**
-         * Returns the owner of this group if this group holds the information of owner.
-         *
-         * Group will holds the information of owner when "saving group on cloud" or "retrieving group info/owner from cloud".
-         * The cache will not be shared among the different instances of KiiGroup.
-         * <UL>
-         * <LI>This API will not access to server.
-         * To update the group owner information on cloud, please call {@link KiiGroup#refresh} or {@link KiiGroup#getOwner}.
-         * </LI>
-         * <LI>This API does not return all the properties of the owner.
-         * To get all owner properties, {@link KiiUser#refresh} is necessary.</LI>
-         * </UL>
-         *
-         * @return KiiUser who owns this group, undefined if this group doesn't hold the information of owner yet.
-         *
-         * @see KiiGroup#getOwner
-         */
-        getCachedOwner(): KiiUser;
-
-        /**
-         * Get a specifically formatted string referencing the group
-         *
-         * <br><br>The group must exist in the cloud (have a valid UUID).
-         *
-         * @return A URI string based on the current group. null if a URI couldn't be generated.
-         *
-         * @example
-         *     var group = . . .; // a KiiGroup
-         *     var uri = group.objectURI();
-         */
-        objectURI(): string;
-
-        /**
-         * Register new group own by current user on Kii Cloud with specified ID.
-         *
-         * <br><br>If the group that has specified id already exists, registration will be failed.
-         *
-         * @param groupID ID of the KiiGroup
-         * @param groupName Name of the KiiGroup
-         * @param members An array of KiiUser objects to add to the group
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *       <ul>
-         *         <li>fulfill callback function: function(theSavedGroup). theSavedGroup is KiiGroup instance.</li>
-         *         <li>reject callback function: function(error). error is an Error instance.
-         *           <ul>
-         *             <li>error.target is the KiiGroup instance which this method was called on.</li>
-         *             <li>error.message</li>
-         *             <li>error.addMembersArray is array of KiiUser to be added as memebers of this group.</li>
-         *             <li>error.removeMembersArray is array of KiiUser to be removed from the memebers list of this group.</li>
-         *           </ul>
-         *         </li>
-         *       </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var members = [];
-         *     members.push(KiiUser.userWithID("Member User Id"));
-         *     KiiGroup.registerGroupWithID("Group ID", "Group Name", members, {
-         *         success: function(theSavedGroup) {
-         *             // do something with the saved group
-         *         },
-         *         failure: function(theGroup, anErrorString, addMembersArray, removeMembersArray) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var members = [];
-         *     members.push(KiiUser.userWithID("Member User Id"));
-         *     KiiGroup.registerGroupWithID("Group ID", "Group Name", members).then(
-         *         function(theSavedGroup) {
-         *             // do something with the saved group
-         *         },
-         *         function(error) {
-         *             var theGroup = error.target;
-         *             var anErrorString = error.message;
-         *             var addMembersArray = error.addMembersArray;
-         *             // do something with the error response
-         *     });
-         */
-        static registerGroupWithID(groupID: string, groupName: string, members: KiiUser[], callbacks?: { success(theSavedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string, addMembersArray: KiiUser[], removeMembersArray: KiiUser[]): any; }): Promise<KiiGroup>;
-
-        /**
-         * Creates a reference to a bucket for this group
-         *
-         * <br><br>The bucket will be created/accessed within this group's scope
-         *
-         * @param bucketName The name of the bucket the user should create/access
-         *
-         * @return A working KiiBucket object
-         *
-         * @example
-         *     var group = . . .; // a KiiGroup
-         *     var bucket = group.bucketWithName("myBucket");
-         */
-        bucketWithName(bucketName: string): KiiBucket;
-
-        /**
-         * Creates a reference to a encrypted bucket for this group
-         *
-         * <br><br>The bucket will be created/accessed within this group's scope
-         *
-         * @param bucketName The name of the bucket the user should create/access
-         *
-         * @return A working KiiEncryptedBucket object
-         *
-         * @example
-         *     var group = . . .; // a KiiGroup
-         *     var bucket = group.encryptedBucketWithName("myBucket");
-         */
-        encryptedBucketWithName(bucketName: string): KiiBucket;
-
-        /**
-         * Adds a user to the given group
-         *
-         * <br><br>This method will NOT access the server immediately. You must call save to add the user on the server. This allows multiple users to be added/removed before calling save.
-         *
-         * @param member The user to be added to the group
-         *
-         * @example
-         *     var user = . . .; // a KiiUser
-         *     var group = . . .; // a KiiGroup
-         *     group.addUser(user);
-         *     group.save(callbacks);
-         */
-        addUser(member: KiiUser): void;
-
-        /**
-         * Removes a user from the given group
-         *
-         * <br><br>This method will NOT access the server immediately. You must call save to remove the user on the server. This allows multiple users to be added/removed before calling save.
-         *
-         * @param member The user to be added to the group
-         *
-         * @example
-         *     var user = . . .; // a KiiUser
-         *     var group = . . .; // a KiiGroup
-         *     group.removeUser(user);
-         *     group.save(callbacks);
-         */
-        removeUser(member: KiiUser): void;
-
-        /**
-         * Gets a list of all current members of a group
-         *
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is Array instance.
-         *       <ul>
-         *         <li>params[0] is a KiiGroup instance which this method was called on.</li>
-         *         <li>params[1] is array of memeber KiiUser instances.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiACL instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var group = . . .; // a KiiGroup
-         *     group.getMemberList({
-         *         success: function(theGroup, memberList) {
-         *             // do something with the result
-         *             for(var i=0; i&lt;memberList.length; i++){
-         *                 var u = memberList[i]; // a KiiUser within the group
-         *             }
-         *         },
-         *
-         *         failure: function(theGroup, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var group = . . .; // a KiiGroup
-         *     group.getMemberList().then(
-         *         function(params) {
-         *             var theGroup = params[0];
-         *             var memberlist = params[1];
-         *             // do something with the result
-         *             for(var i=0; i&lt;memberList.length; i++){
-         *                 var u = memberList[i]; // a KiiUser within the group
-         *             }
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        getMemberList(callbacks?: { success(theGroup: KiiGroup, memberList: KiiUser[]): any; failure(theGroup: KiiGroup, anErrorString: string): any; }): Promise<[KiiGroup, KiiUser[]]>;
-
-        /**
-         * Updates the group name on the server
-         *
-         * @param newName A String of the desired group name
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theRenamedGroup). theRenamedGroup is KiiGroup instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiGroup instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var group = . . .; // a KiiGroup
-         *     group.changeGroupName("myNewName", {
-         *         success: function(theRenamedGroup) {
-         *             // do something with the group
-         *         },
-         *
-         *         failure: function(theGroup, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var group = . . .; // a KiiGroup
-         *     group.changeGroupName("myNewName").then(
-         *         function(theRenamedGroup) {
-         *             // do something with the group
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        changeGroupName(newName: string, callbacks?: { success(theRenamedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string): any; }): Promise<KiiGroup>;
-
-        /**
-         * Saves the latest group values to the server
-         *
-         * <br><br>If the group does not yet exist, it will be created. If the group already exists, the members that have changed will be updated accordingly. If the group already exists and there is no updates of members, it will allways succeed but does not execute update. To change the name of group, use {@link #changeGroupName}.
-         *
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *       <ul>
-         *         <li>fulfill callback function: function(theSavedGroup). theSavedGroup is KiiGroup instance.</li>
-         *         <li>reject callback function: function(error). error is an Error instance.
-         *           <ul>
-         *             <li>error.target is the KiiGroup instance which this method was called on.</li>
-         *             <li>error.message</li>
-         *             <li>error.addMembersArray is array of KiiUser to be added as memebers of this group.</li>
-         *             <li>error.removeMembersArray is array of KiiUser to be removed from the memebers list of this group.</li>
-         *           </ul>
-         *         </li>
-         *       </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var group = . . .; // a KiiGroup
-         *     group.save({
-         *         success: function(theSavedGroup) {
-         *             // do something with the saved group
-         *         },
-         *
-         *         failure: function(theGroup, anErrorString, addMembersArray, removeMembersArray) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var group = . . .; // a KiiGroup
-         *     group.save({
-         *         success: function(theSavedGroup) {
-         *             // do something with the saved group
-         *         },
-         *
-         *         failure: function(theGroup, anErrorString, addMembersArray, removeMembersArray) {
-         *             // do something with the error response
-         *         }
-         *     }).then(
-         *         function(theSavedGroup) {
-         *             // do something with the saved group
-         *         },
-         *         function(error) {
-         *             var theGroup = error.target;
-         *             var anErrorString = error.message;
-         *             var addMembersArray = error.addMembersArray;
-         *             var removeMembersArray = error.removeMembersArray;
-         *             // do something with the error response
-         *     });
-         */
-        save(callbacks?: { success(theSavedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string, addMembersArray: KiiUser[], removeMembersArray: KiiUser[]): any; }): Promise<KiiGroup>;
-
-        /**
-         * Saves the latest group values to the server with specified owner.
-         * This method can be used only by the group owner or app admin.
-         *
-         * <br><br>If the group does not yet exist, it will be created. If the group already exists, the members and owner that have changed will be updated accordingly. If the group already exists and there is no updates of members and owner, it will allways succeed but does not execute update. To change the name of group, use {@link #changeGroupName}.
-         *
-         * @param user id of owner
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *       <ul>
-         *         <li>fulfill callback function: function(theSavedGroup). theSavedGroup is KiiGroup instance.</li>
-         *         <li>reject callback function: function(error). error is an Error instance.
-         *           <ul>
-         *             <li>error.target is the KiiGroup instance which this method was called on.</li>
-         *             <li>error.message</li>
-         *             <li>error.addMembersArray is array of KiiUser to be added as memebers of this group.</li>
-         *             <li>error.removeMembersArray is array of KiiUser to be removed from the memebers list of this group.</li>
-         *           </ul>
-         *         </li>
-         *       </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var group = . . .; // a KiiGroup
-         *     group.saveWithOwner("UserID of owner", {
-         *         success: function(theSavedGroup) {
-         *             // do something with the saved group
-         *         },
-         *
-         *         failure: function(theGroup, anErrorString, addMembersArray, removeMembersArray) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var group = . . .; // a KiiGroup
-         *     group.saveWithOwner("UserID of owner", {
-         *         success: function(theSavedGroup) {
-         *             // do something with the saved group
-         *         },
-         *
-         *         failure: function(theGroup, anErrorString, addMembersArray, removeMembersArray) {
-         *             // do something with the error response
-         *         }
-         *     }).then(
-         *         function(theSavedGroup) {
-         *             // do something with the saved group
-         *         },
-         *         function(error) {
-         *             var theGroup = error.target;
-         *             var anErrorString = error.message;
-         *             var addMembersArray = error.addMembersArray;
-         *             var removeMembersArray = error.removeMembersArray;
-         *             // do something with the error response
-         *     });
-         */
-        saveWithOwner(user: string, callbacks?: { success(theSavedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string, addMembersArray: KiiUser[], removeMembersArray: KiiUser[]): any; }): Promise<KiiGroup>;
-
-        /**
-         * Updates the local group's data with the group data on the server
-         *
-         * <br><br>The group must exist on the server. Local data will be overwritten.
-         *
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theRefreshedGroup). theRefreshedGroup is KiiGroup instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiGroup instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var group = . . .; // a KiiGroup
-         *     group.refresh({
-         *         success: function(theRefreshedGroup) {
-         *             // do something with the refreshed group
-         *         },
-         *
-         *         failure: function(theGroup, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var group = . . .; // a KiiGroup
-         *     group.refresh().then(
-         *         function(theRefreshedGroup) {
-         *             // do something with the refreshed group
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        refresh(callbacks?: { success(theRefreshedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string): any; }): Promise<KiiGroup>;
-
-        /**
-         * Delete the group from the server
-         *
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theDeletedGroup). theDeletedGroup is KiiGroup instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiGroup instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var group = . . .; // a KiiGroup
-         *     group['delete']({
-         *         success: function(theDeletedGroup) {
-         *             // do something
-         *         },
-         *
-         *         failure: function(theGroup, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var group = . . .; // a KiiGroup
-         *     group['delete']({
-         *         success: function(theDeletedGroup) {
-         *         },
-         *
-         *         failure: function(theGroup, anErrorString) {
-         *         }
-         *     }).then(
-         *         function(theDeletedGroup) {
-         *             // do something
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        delete(callbacks?: { success(theDeletedGroup: KiiGroup): any; failure(theGroup: KiiGroup, anErrorString: string): any; }): Promise<KiiGroup>;
-
-        /**
-         * Gets the owner of the associated group
-         *
-         * This API does not return all the properties of the owner.
-         * To get all owner properties, {@link KiiUser#refresh} is necessary.
-         *
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is Array instance.
-         *       <ul>
-         *         <li>params[0] is the KiiGroup instance which this method was called on.</li>
-         *         <li>params[1] is an group owner KiiUser instances.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiGroup instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var group = . . .; // a KiiGroup
-         *     group.getOwner({
-         *         success: function(theGroup, theOwner) {
-         *             // do something
-         *         },
-         *         failure: function(theGroup, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var group = . . .; // a KiiGroup
-         *     group.getOwner().then(
-         *         function(params) {
-         *             // do something
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        getOwner(callbacks?: { success(theGroup: KiiGroup, theOwner: KiiUser): any; failure(theGroup: KiiGroup, anErrorString: string): any; }): Promise<[KiiGroup, KiiUser]>;
-
-        /**
-         * Creates a reference to a group with the given name
-         * <br><br>
-         * <b>Note:</b>
-         * Returned instance from this API can not operate existing KiiGroup.<br>
-         * If you want to operate existing KiiGroup, please use {@link KiiGroup.groupWithURI}.
-         *
-         * @param groupName An application-specific group name
-         *
-         * @return A new KiiGroup reference
-         *
-         * @example
-         *     var group = new KiiGroup.groupWithName("myGroup");
-         */
-        static groupWithName(groupName: string): KiiGroup;
-
-        /**
-         * Creates a reference to a group with the given name and a list of default members
-         * <br><br>
-         * <b>Note:</b>
-         * Returned instance from this API can not operate existing KiiGroup.<br>
-         * If you want to operate existing KiiGroup, please use {@link KiiGroup.groupWithURI}.
-         *
-         * @param groupName An application-specific group name
-         * @param members An array of KiiUser objects to add to the group
-         *
-         * @return A new KiiGroup reference
-         *
-         * @example
-         *     var group = new KiiGroup.groupWithName("myGroup", members);
-         */
-        static groupWithNameAndMembers(groupName: string, members: KiiUser[]): KiiGroup;
-
-        /**
-         * Instantiate KiiGroup that refers to existing group which has specified ID.
-         * You have to specify the ID of existing KiiGroup. Unlike KiiObject,
-         * you can not assign ID in the client side.<br>
-         * <b>NOTE</b>: This API does not access to the server.
-         * After instantiation, call {@link KiiGroup#refresh} to fetch the properties.
-         *
-         * @param groupId ID of the KiiGroup to instantiate.
-         *
-         * @return instance of KiiGroup.
-         *
-         * @throws when passed groupID is empty or null.
-         *
-         * @example
-         *     var group = new KiiUser.groupWithID("__GROUP_ID__");
-         */
-        static groupWithID(groupId: string): KiiGroup;
-
-        /**
-         * Generate a new KiiGroup based on a given URI
-         * <br><br>
-         * <b>Note:</b>
-         * Returned instance from this API can operate existing KiiGroup.<br>
-         * If you want to create a new KiiGroup, please use {@link KiiGroup.groupWithName}.
-         *
-         * @param uri The URI of the group to be represented
-         *
-         * @return A new KiiGroup with its parameters filled in from the URI
-         *
-         * @throws If the URI given is invalid
-         *
-         * @example
-         *     var group = new KiiGroup.groupWithURI("kiicloud://myuri");
-         */
-        static groupWithURI(uri: string): KiiGroup;
-
-        /**
-         * Instantiate topic belongs to this group.
-         *
-         * @param topicName name of the topic. Must be a not empty string.
-         *
-         * @return topic instance.
-         */
-        topicWithName(topicName: string): KiiTopic;
-
-        /**
-         * Gets a list of topics in this group scope
-         *
-         * @param callbacks An object with callback methods defined
-         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success. If empty string or no string object is provided, this API regards no paginationKey specified.
-         *
-         * @return return promise object.
-         *     <ul>
-         *       <li>fulfill callback function: function(params). params is Array instance.
-         *         <ul>
-         *           <li>params[0] is array of KiiTopic instances.</li>
-         *           <li>params[1] is string of nextPaginationKey.</li>
-         *         </ul>
-         *       </li>
-         *       <li>reject callback function: function(error). error is an Error instance.
-         *         <ul>
-         *           <li>error.target is the KiiGroup instance which this method was called on. </li>
-         *           <li>error.message</li>
-         *         </ul>
-         *       </li>
-         *     </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var group = . . .; // a KiiGroup
-         *     group.listTopics({
-         *         success: function(topicList, nextPaginationKey) {
-         *             // do something with the result
-         *             for(var i=0; i&lt;topicList.length; i++){
-         *                 var topic = topicList[i];
-         *             }
-         *             if (nextPaginationKey != null) {
-         *                 group.listTopics({
-         *                     success: function(topicList, nextPaginationKey) {...},
-         *                     failure: function(anErrorString) {...}
-         *                 }, nextPaginationKey);
-         *             }
-         *         },
-         *         failure: function(anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use promise
-         *     var group = . . .; // a KiiGroup
-         *     group.listTopics().then(
-         *         function(params) {
-         *             var topicList = params[0];
-         *             var nextPaginationKey = params[1];
-         *             // do something with the result
-         *             for(var i=0; i&lt;topicList.length; i++){
-         *                 var topic = topicList[i];
-         *             }
-         *             if (nextPaginationKey != null) {
-         *                 group.listTopics(null, nextPaginationKey).then(
-         *                     function(params) {...},
-         *                     function(error) {...}
-         *                 );
-         *             }
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        listTopics(callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; }, paginationKey?: string): Promise<[KiiTopic[], string]>;
-    }
-
-    /**
-     * Represents a KiiObject object
-     */
-    export class KiiObject {
-        /**
-         * Get the UUID of the given object, assigned by the server
-         *
-         * @return
-         */
-        getUUID(): string;
-
-        /**
-         * Get the server's creation date of this object
-         *
-         * @return
-         */
-        getCreated(): number;
-
-        /**
-         * Get the modified date of the given object, assigned by the server
-         *
-         * @return
-         */
-        getModified(): string;
-
-        /**
-         * Get the application-defined type name of the object
-         *
-         * @return type of this object. null or undefined if none exists
-         */
-        getObjectType(): string;
-
-        /**
-         * Get the body content-type.
-         * It will be updated after the success of {@link KiiObject#uploadBody} and {@link KiiObject#downloadBody}
-         * returns null or undefined when this object doesn't have body content-type information.
-         *
-         * @return content-type of object body
-         */
-        getBodyContentType(): string;
-
-        /**
-         * Sets a key/value pair to a KiiObject
-         *
-         * <br><br>If the key already exists, its value will be written over.
-         * <br><b>NOTE: Before involving floating point value, please consider using integer instead. For example, use percentage, permil, ppm, etc.</br></b>
-         * The reason is:
-         *  <li>Will dramatically improve the performance of bucket query.</li>
-         *  <li>Bucket query does not support the mixed result of integer and floating point.
-         *  ex.) If you use same key for integer and floating point and inquire object with the integer value, objects which has floating point value with the key would not be evaluated in the query. (and vice versa)</li>
-         *
-         * @param key The key to set.
-         *   if null, empty string or string prefixed with '_' is specified, silently ignored and have no effect.
-         *   We don't check if actual type is String or not. If non-string type is specified, it will be encoded as key by JSON.stringify()
-         * @param value The value to be set. Object must be JSON-encodable type (dictionary, array, string, number, boolean)
-         *   We don't check actual type of the value. It will be encoded as value by JSON.stringify()
-         *
-         * @example
-         *     var obj = . . .; // a KiiObject
-         *     obj.set("score", 4298);
-         */
-        set(key: string, value: any): void;
-
-        /**
-         * Gets the value associated with the given key
-         *
-         * @param key The key to retrieve
-         *
-         * @return The object associated with the key. null or undefined if none exists
-         *
-         * @example
-         *     var obj = . . .; // a KiiObject
-         *     var score = obj.get("score");
-         */
-        get<T>(key: string): T;
-
-        /**
-         * Set Geo point to this object with the specified key.
-         *
-         * @param key The key to set.
-         * @param KiiGeoPoint to be tied to the specified key.
-         *
-         * @throws Specified kiiGeoPint is not an instance of KiiGeoPoint.
-         */
-        setGeoPoint(key: string, KiiGeoPoint: KiiGeoPoint): void;
-
-        /**
-         * Gets the geo point associated with the given key.
-         *
-         * @param key The key of the geo point to retrieve.
-         *
-         * @return KiiGeoPoint tied to the key. null if null exists.
-         */
-        getGeoPoint(key: string): KiiGeoPoint;
-
-        /**
-         * Get the ACL handle for this file
-         *
-         * <br><br>Any KiiACLEntry objects added or revoked from this ACL object will be appended to/removed from the server on ACL save.
-         *
-         * @return A KiiACL object associated with this KiiObject
-         *
-         * @example
-         *     	var obj = . . .; // a KiiObject
-         *     	var acl = obj.objectACL();
-         */
-        objectACL(): KiiACL;
-
-        /**
-         * Get a specifically formatted string referencing the object
-         *
-         * <br><br>The object must exist in the cloud (have a valid UUID).
-         *
-         * @return A URI string based on the current object. null if a URI couldn't be generated.
-         *
-         * @example
-         *     var obj = . . .; // a KiiObject
-         *     var uri = obj.objectURI();
-         */
-        objectURI(): string;
-
-        /**
-         * Create or update the KiiObject on KiiCloud.
-         * <br><br>When call this method for the object that has not saved on cloud, will send all fields.
-         * Call this method for the object that has saved on cloud, Update all field of this object.
-         *
-         * @param callbacks An object with callback methods defined
-         *   sucess: function called when save succeeded.<br>
-         *   failure: function called when save failed.
-         * @param overwrite optional, true by default.
-         *   <ul>
-         *   <li><b>If overwrite is true:</b>
-         *   <ul>
-         *   <li>If a KiiObject with the same ID exists in cloud, the local copy will overwrite the remote copy, even if the remote copy is newer. </li>
-         *   </ul>
-         *   <li><b>Otherwise:</b>
-         *   <ul>
-         *   <li>If a KiiObject with the same ID exists in cloud and the remote copy is newer, save will fail.</li>
-         *   </ul>
-         *   </ul>
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theSavedObject). theSavedObject is KiiObject instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiObject instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var obj = . . .; // a KiiObject
-         *     obj.saveAllFields({
-         *         success: function(theSavedObject) {
-         *             // do something with the saved object
-         *         },
-         *
-         *         failure: function(theObject, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var obj = . . .; // a KiiObject
-         *     obj.saveAllFields().then(
-         *         function(theSavedObject) {
-         *             // do something with the saved object
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        saveAllFields(callbacks?: { success(theSavedObject: KiiObject): any; failure(theObject: KiiObject, anErrorString: string): any; }, overwrite?: boolean): Promise<KiiObject>;
-
-        /**
-         * Create or update the KiiObject on KiiCloud.
-         * <br><br>When call this method for the object that has not saved on cloud, will send all fields.
-         * Call this method for the object that has saved on cloud, Update only updated fields.
-         * Do not send fields that has not updated locally. To send all fields regardless of updates, call {@link KiiObject#saveAllFields}.
-         *
-         * @param callbacks An object with callback methods defined
-         *   sucess: function called when save succeeded.<br>
-         *   failure: function called when save failed.
-         * @param overwrite optional, true by default.
-         *   <ul>
-         *   <li><b>If overwrite is true:</b>
-         *   <ul>
-         *   <li>If a KiiObject with the same ID exists in cloud, the local copy will overwrite the remote copy, even if the remote copy is newer. </li>
-         *   </ul>
-         *   <li><b>Otherwise:</b>
-         *   <ul>
-         *   <li>If a KiiObject with the same ID exists in cloud and the remote copy is newer, save will fail.</li>
-         *   </ul>
-         *   </ul>
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theSavedObject). theSavedObject is KiiObject instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiObject instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var obj = . . .; // a KiiObject
-         *     obj.save({
-         *         success: function(theSavedObject) {
-         *             // do something with the saved object
-         *         },
-         *
-         *         failure: function(theObject, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var obj = . . .; // a KiiObject
-         *     obj.save().then(
-         *         function(theSavedObject) {
-         *             // do something with the saved object
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        save(callbacks?: { success(theSavedObject: KiiObject): any; failure(theObject: KiiObject, anErrorString: string): any; }, overwrite?: boolean): Promise<KiiObject>;
-
-        /**
-         * Updates the local object's data with the user data on the server
-         *
-         * <br><br>The object must exist on the server. Local data will be overwritten.
-         *
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theRefreshedObject). theRefreshedObject is KiiObject instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiObject instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var obj = . . .; // a KiiObject
-         *     obj.refresh({
-         *         success: function(theRefreshedObject) {
-         *             // do something with the refreshed object
-         *         },
-         *
-         *         failure: function(theObject, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var obj = . . .; // a KiiObject
-         *     obj.refresh().then(
-         *         function(theRefreshedObject) {
-         *             // do something with the refreshed object
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        refresh(callbacks?: { success(theRefreshedObject: KiiObject): any; failure(theObject: KiiObject, anErrorString: string): any; }): Promise<KiiObject>;
-
-        /**
-         * Delete the object from the server
-         *
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theDeletedObject). theDeletedObject is KiiObject instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiObject instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var obj = . . .; // a KiiObject
-         *     obj['delete']({
-         *         success: function(theDeletedObject) {
-         *             // do something
-         *         },
-         *
-         *         failure: function(theObject, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var obj = . . .; // a KiiObject
-         *     obj['delete']().then(
-         *         function(theDeletedObject) {
-         *             // do something
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        delete(callbacks?: { success(theDeletedObject: KiiObject): any; failure(theObject: KiiObject, anErrorString: string): any; }): Promise<KiiObject>;
-
-        /**
-         * Generate a new KiiObject based on a given URI
-         *
-         * @param uri The URI of the object to be represented
-         *
-         * @return A new KiiObject with its parameters filled in from the URI
-         *
-         * @throws If the URI is not in the proper format
-         *
-         * @example
-         *     var group = new KiiObject.objectWithURI("kiicloud://myuri");
-         */
-        static objectWithURI(uri: string): KiiObject;
-
-        /**
-         * Move KiiObject body from an object to another object.
-         * <br>
-         * This moving can be allowed under same application, across different scopes
-         * and source/target KiiObject have a read and write permission (READ_EXISTING_OBJECT and WRITE_EXISTING_OBJECT).
-         * <br><br>If target KiiObject has a body, it will be overwritten.
-         *
-         * @param targetObjectUri A KiiObject URI which KiiObject body is moved to.
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is Array instance.
-         *       <ul>
-         *         <li>params[0] is the source KiiObject instance which this method was called on.</li>
-         *         <li>params[1] is the target targetObjectUri String.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the source KiiObject instance which this method was called on.</li>
-         *         <li>error.targetObjectUri is the targetObjectUri String.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var sourceObject = ...; // Source KiiObject
-         *     var targetObject = ...; // Target KiiObject
-         *     var targetObjectUri = targetObject.objectURI();
-         *     sourceObject.moveBody(targetObjectUri, {
-         *         success: function(theSrcObject, theTgtObjectUri) {
-         *             // Do something with the objects
-         *         },
-         *
-         *         failure: function(theSrcObject, theTgtObjectUri, anErrorString) {
-         *             // Do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var sourceObject = ...; // Source KiiObject
-         *     var targetObject = ...; // Target KiiObject
-         *     var targetObjectUri = targetObject.objectURI();
-         *     sourceObject.moveBody(targetObjectUri).then(
-         *         function(params) {
-         *             var theSrcObject = params[0];
-         *             var theTgtObjectUri = params[1];
-         *             // Do something with the objects
-         *         },
-         *         function(error) {
-         *             // Do something with the error response
-         *         }
-         *     );
-         */
-        moveBody(targetObjectUri: string, callbacks?: { success(theSrcObject: KiiObject, theTgtObjectUri: string): any; failure(theSrcObject: KiiObject, theTgtObjectUri: string, anErrorString: string): any; }): Promise<[KiiObject, string]>;
-
-        /**
-         * Upload body data of this object.<br>
-         * If the KiiObject has not saved on the cloud or deleted,
-         * request will be failed.
-         * <br>NOTE: this requires XMLHttpRequest Level 2, FileReader and Blob supports. Do not use it in server code.<br>
-         *
-         * @param srcDataBlob data to be uploaded.
-         *   type is used to determin content-type managed in Kii Cloud.
-         *   If type was not specified in the Blob,
-         *   'application/octet-stream' will be used.
-         * @param callbacks progress: function called on XMLHttpRequest 'progress' event listener.<br>
-         *   sucess: function called when upload succeeded.<br>
-         *   failure: function called when upload failed.
-         *
-         * @return return promise object.
-         *     <br>NOTE: Promise will not handle progress event. Please pass callbacks with progress function to handle progress.
-         *   <ul>
-         *     <li>fulfill callback function: function(theObject). theObject is a KiiObject instance which this method was called on.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiObject instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var myObject = Kii.bucketWithName('myBucket').createObject();
-         *     myObject.save({
-         *         success: function(obj) {
-         *             var srcData = new Blob(['Hello Blob'], {type: 'text/plain'});
-         *             obj.uploadBody(srcData, {
-         *                 progress: function (oEvent) {
-         *                   if (oEvent.lengthComputable) {
-         *                     var percentComplete = oEvent.loaded / oEvent.total;
-         *                     //getting upload progress. You can update progress bar on this function.
-         *                   }
-         *                 },
-         *                 success: function(obj) {
-         *                     // Upload succeeded.
-         *                 },
-         *                 failure: function(obj, anErrorString) {
-         *                     // Handle error.
-         *                 }
-         *             });
-         *         },
-         *         failure: function(obj, error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var myObject = Kii.bucketWithName('myBucket').createObject();
-         *     myObject.save().then(
-         *         function(obj) {
-         *             var srcData = new Blob(['Hello Blob'], {type: 'text/plain'});
-         *             obj.uploadBody(srcData, {
-         *                 progress: function (oEvent) {
-         *                   if (oEvent.lengthComputable) {
-         *                     var percentComplete = oEvent.loaded / oEvent.total;
-         *                     //getting upload progress. You can update progress bar on this function.
-         *                   }
-         *                 }
-         *             }).then(
-         *                 function(obj) { // fullfill callback function
-         *                     // Upload succeeded.
-         *                 },
-         *                 function(error) { // reject callback function
-         *                     // Handle error.
-         *                 }
-         *             );
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        uploadBody(srcDataBlob: Blob, callbacks?: { success(obj: KiiObject): any; failure(obj: KiiObject, anErrorString: string): any; }): Promise<KiiObject>;
-
-        /**
-         * Download body data of this object.<br>
-         * If the KiiObject has not saved on the cloud or deleted
-         * or exist but does not have body object, request will be failed.
-         * <br>NOTE: this requires XMLHttpRequest Level 2, FileReader and Blob supports. Do not use it in server code.<br>
-         *
-         * @param callbacks progress: function called on XMLHttpRequest 'progress' event listener.<br>
-         *   sucess: function called when download succeeded.<br>
-         *   failure: function called when download failed.
-         *
-         * @return return promise object.
-         *     <br>NOTE: Promise will not handle progress event. Please pass callbacks with progress function to handle progress.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is Array instance.
-         *       <ul>
-         *         <li>params[0] is a KiiObject instance which this method was called on.</li>
-         *         <li>params[1] is the returned body blob object.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.</li>
-         *       <ul>
-         *         <li>error.target is the KiiObject instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var myObject = KiiObject.objectWithURI('put existing object uri here');
-         *     myObject.downloadBody({
-         *         progress: function (oEvent) {
-         *           if (oEvent.lengthComputable) {
-         *             var percentComplete = oEvent.loaded / oEvent.total;
-         *             //getting download progress. You can update progress bar on this function.
-         *
-         *           }
-         *         },
-         *         success: function(obj, bodyBlob) {
-         *             // Obtaind body contents as bodyBlob.
-         *             // content-type managed in Kii Cloud can be obtained from type attr.
-         *             // It is same as obj.getBodyContentType();
-         *             var contentType = bodyBlob.type;
-         *         },
-         *         failure: function(obj, anErrorString) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var myObject = KiiObject.objectWithURI('put existing object uri here');
-         *     myObject.downloadBody({
-         *         progress: function (oEvent) {
-         *           if (oEvent.lengthComputable) {
-         *             var percentComplete = oEvent.loaded / oEvent.total;
-         *             //getting download progress. You can update progress bar on this function.
-         *
-         *           }
-         *         }
-         *     ).then(
-         *         function(params) {
-         *             // Obtaind body contents as bodyBlob.
-         *             // content-type managed in Kii Cloud can be obtained from type attr.
-         *             // It is same as obj.getBodyContentType();
-         *             var obj = param[0];
-         *             var bodyBlob = params[1];
-         *             var contentType = bodyBlob.type;
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        downloadBody(callbacks?: { success(obj: KiiObject, bodyBlob: Blob): any; failure(obj: KiiObject, anErrorString: string): any; }): Promise<[KiiObject, Blob]>;
-
-        /**
-         * Publish object body.<br>
-         * Publish object body and obtain public URL links to the body.<br>
-         * It doesn't expires.<br>
-         * If the KiiObject has not saved on the cloud or deleted
-         * or exist but does not have body object, request will be failed.
-         *
-         * @param callbacks sucess: function called when publish succeeded.<br>
-         *   failure: function called when publish failed.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is Array instance.
-         *       <ul>
-         *         <li>params[0] is the KiiObject instance which this method was called on.</li>
-         *         <li>params[1] is the published url string.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiObject instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var myObject = KiiObject.objectWithURI('put existing object uri here');
-         *     myObject.publishBody({
-         *         success: function(obj, publishedUrl) {
-         *             // ex.) You can show publishedUrl in the view.
-         *         },
-         *         failure: function(obj, anErrorString) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var myObject = KiiObject.objectWithURI('put existing object uri here');
-         *     myObject.publishBody().then(
-         *         function(params) {
-         *             // ex.) You can show publishedUrl in the view.
-         *             var obj = params[0];
-         *             var publishedUrl = params[1];
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        publishBody(callbacks?: { success(obj: KiiObject, publishedUrl: string): any; failure(obj: KiiObject, anErrorString: string): any; }): Promise<[KiiObject, string]>;
-
-        /**
-         * Publish object body with expiration date.<br>
-         * Publish object body and obtain public URL links to the body.<br>
-         * Expires at specified date <br>
-         * If the KiiObject has not saved on the cloud or deleted
-         * or exist but does not have body object, request will be failed.
-         *
-         * @param expiresAt expiration date. should specify future date.
-         * @param callbacks sucess: function called when publish succeeded.<br>
-         *   failure: function called when publish failed.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is Array instance.
-         *       <ul>
-         *         <li>params[0] is the KiiObject instance which this method was called on.</li>
-         *         <li>params[1] is the published url string.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiObject instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var myObject = KiiObject.objectWithURI('put existing object uri here');
-         *     var expiresAt = new Date(2014, 11, 24);
-         *     myObject.publishBodyExpiresAt(expiresAt, {
-         *         success: function(obj, publishedUrl) {
-         *             // ex.) You can show publishedUrl in the view.
-         *         },
-         *         failure: function(obj, anErrorString) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var myObject = KiiObject.objectWithURI('put existing object uri here');
-         *     var expiresAt = new Date(2014, 11, 24);
-         *     myObject.publishBodyExpiresAt(expiresAt).then(
-         *         function(params) {
-         *             // ex.) You can show publishedUrl in the view.
-         *             var obj = params[0];
-         *             var publishedUrl = params[1];
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        publishBodyExpiresAt(expiresAt: Date, callbacks?: { success(obj: KiiObject, publishedUrl: string): any; failure(obj: KiiObject, anErrorString: string): any; }): Promise<[KiiObject, string]>;
-
-        /**
-         * Publish object body with expiration duration.<br>
-         * Publish object body and obtain public URL links to the body.<br>
-         * Expires in specified duration<br>
-         * If the KiiObject has not saved on the cloud or deleted
-         * or exist but does not have body object, request will be failed.
-         *
-         * @param expiresIn duration in seconds. greater than 0.
-         * @param callbacks sucess: function called when publish succeeded.<br>
-         *   failure: function called when publish failed.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is Array instance.
-         *       <ul>
-         *         <li>params[0] is the KiiObject instance which this method was called on.</li>
-         *         <li>params[1] is the published url string.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiObject instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var myObject = KiiObject.objectWithURI('put existing object uri here');
-         *     var expiresIn = 60 * 60; // Expires in 1 hour.
-         *     myObject.publishBodyExpiresIn(expiresIn, {
-         *         success: function(obj, publishedUrl) {
-         *             // ex.) You can show publishedUrl in the view.
-         *         },
-         *         failure: function(obj, anErrorString) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var myObject = KiiObject.objectWithURI('put existing object uri here');
-         *     var expiresIn = 60 * 60; // Expires in 1 hour.
-         *     myObject.publishBodyExpiresIn(expiresIn).then(
-         *         function(params) {
-         *             // ex.) You can show publishedUrl in the view.
-         *             var obj = params[0];
-         *             var publishedUrl = params[1];
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        publishBodyExpiresIn(expiresIn: number, callbacks?: { success(obj: KiiObject, publishedUrl: string): any; failure(obj: KiiObject, anErrorString: string): any; }): Promise<[KiiObject, string]>;
-
-        /**
-         * Delete the object body from the server.<br>
-         * If the KiiObject has not saved on the cloud or deleted
-         * or exist but does not have body object, request will be failed.<br>
-         * If succeeded, The object body content type will be nullified.
-         *
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theDeletedObject). theDeletedObject is the KiiObject instance which this method was called on.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiObject instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var obj = . . .; // a KiiObject
-         *     obj.deleteBody({
-         *         success: function(theDeletedObject) {
-         *             // do something
-         *         },
-         *
-         *         failure: function(obj, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var obj = . . .; // a KiiObject
-         *     obj.deleteBody().then(
-         *         function(theDeletedObject) {
-         *             // do something
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        deleteBody(callbacks?: { success(theDeletedObject: KiiObject): any; failure(obj: KiiObject, anErrorString: string): any; }): Promise<KiiObject>;
-
-        /**
-         * Check if given ID is valid for object ID.
-         *  Valid pattern: ^[a-zA-Z0-9-_\\.]{2,100}$
-         *
-         * @param objectID to be checked.
-         *
-         * @return true if given ID is valid, false otherwise.
-         */
-        static isValidObjectID(objectID: string): boolean;
-    }
-
-    /**
-     * Builder of push message
-     */
-    export class KiiPushMessageBuilder {
-        /**
-         * instantiate builder with push message data.
-         * By default all push channels (gcm, apns, jpush, mqtt) is enabled.
-         * All other properties configured by method of this class won't be set and default
-         * value would be applied.<br>
-         * Details of properties of message and its default value, please refer to
-         * http://documentation.kii.com/rest/#notification_management-leverage__push_to_users__notification-group_scope-send_messages-send_a_push_message_to_the_current_topic
-         *
-         * @param data sent to all push channels (gcm, apns, jpush, mqtt).
-         */
-        constructor(data: any);
-
-        /**
-         * build push message.
-         *
-         * @return push message object. Can be used in {@link KiiTopic#sendMessage()}
-         */
-        build(): any;
-
-        /**
-         * Indicate whether send this message to development environment.
-         * If this method is not called, true will be applied as default.
-         *
-         * @param flag indicate whether send this message to development env.
-         *
-         * @return builder instance.
-         */
-        setSendToDevelopment(flag: boolean): KiiPushMessageBuilder;
-
-        /**
-         * Indicate whether send this message to production environment.
-         * If this method is not called, true will be applied as default.
-         *
-         * @param flag indicate whether send this message to production env.
-         *
-         * @return builder instance.
-         */
-        setSendToProduction(flag: boolean): KiiPushMessageBuilder;
-
-        /**
-         * Enable/ Disable message distribution via GCM.
-         * If this method is not called, true will be applied as default.
-         *
-         * @param enable flag indicate whether distribute this message to GCM subscribers.
-         *
-         * @return builder instance.
-         */
-        enableGcm(enable: boolean): KiiPushMessageBuilder;
-
-        /**
-         * Enable/ Disable message distribution via APNS.
-         * If this method is not called, true will be applied as default.
-         *
-         * @param enable flag indicate whether distribute this message to APNS subscribers.
-         *
-         * @return builder instance.
-         */
-        enableApns(enable: boolean): KiiPushMessageBuilder;
-
-        /**
-         * Enable/ Disable message distribution via JPush.
-         * If this method is not called, true will be applied as default.
-         *
-         * @param enable flag indicate whether distribute this message to JPush subscribers.
-         *
-         * @return builder instance.
-         */
-        enableJpush(enable: boolean): KiiPushMessageBuilder;
-
-        /**
-         * Enable/ Disable message distribution via MQTT.
-         * If this method is not called, true will be applied as default.
-         *
-         * @param enable flag indicate whether distribute this message to MQTT subscribers.
-         *
-         * @return builder instance.
-         */
-        enableMqtt(enable: boolean): KiiPushMessageBuilder;
-
-        /**
-         * Set specific data for GCM subscribers.
-         * If this method is not called, no specific data is not applied
-         * and data passed to the constructor would be sent to subscribers.
-         *
-         * @param data specific data applied to only GCM subscribers.
-         *   Contents should be JSON Object with only one-level of nesting,
-         *   and only strings in values
-         *
-         * @return builder instance.
-         */
-        gcmData(data: { [key: string]: string }): KiiPushMessageBuilder;
-
-        /**
-         * Set collapse_key for GCM subscribers.
-         * If this method is not called, no collapse_key is applied.
-         * For details please refer to GCM document of collapse_key.
-         *
-         * @param collapseKey
-         *
-         * @return builder instance.
-         */
-        gcmCollapseKey(collapseKey: string): KiiPushMessageBuilder;
-
-        /**
-         * Set delay_while_idle for GCM subscribers.
-         * If this method is not called, no delay_while_idle is applied.
-         * For details please refer to GCM document of delay_while_idle.
-         *
-         * @param delayWhileIdle
-         *
-         * @return builder instance.
-         */
-        gcmDelayWhileIdle(delayWhileIdle: boolean): KiiPushMessageBuilder;
-
-        /**
-         * Set time_to_live for GCM subscribers.
-         * If this method is not called, no time_to_live is applied.
-         * For details please refer to GCM document of time_to_live.
-         *
-         * @param timeToLive
-         *
-         * @return builder instance.
-         */
-        gcmTimeToLive(timeToLive: number): KiiPushMessageBuilder;
-
-        /**
-         * Set restricted_package_name for GCM subscribers.
-         * If this method is not called, no restricted_package_name is applied.
-         * For details please refer to GCM document of restricted_package_name.
-         *
-         * @param restrictedPackageName
-         *
-         * @return builder instance.
-         */
-        gcmRestrictedPackageName(restrictedPackageName: string): KiiPushMessageBuilder;
-
-        /**
-         * Set specific data for APNS subscribers.
-         * If this method is not called, no specific data is not applied
-         * and data passed to the constructor would be sent to subscribers.
-         *
-         * @param data specific data applied to only APNS subscribers.
-         *   Contents should be JSON Object with only one-level of nesting,
-         *   and only strings, integers, booleans or doubles in the values.
-         *
-         * @return builder instance.
-         */
-        apnsData(data: { [key: string]: string | number | boolean }): KiiPushMessageBuilder;
-
-        /**
-         * Set alert for APNS subscribers.
-         * If this method is not called, no alert is applied.
-         * For details please refer to APNS document of alert.
-         *
-         * @param alert alert object
-         *
-         * @return builder instance.
-         */
-        apnsAlert(alert: string | APNSAlert): KiiPushMessageBuilder;
-
-        /**
-         * Set sound for APNS subscribers.
-         * If this method is not called, no sound is applied.
-         * For details please refer to APNS document of sound.
-         *
-         * @param sound
-         *
-         * @return builder instance.
-         */
-        apnsSound(sound: string): KiiPushMessageBuilder;
-
-        /**
-         * Set badge for APNS subscribers.
-         * If this method is not called, no badge is applied.
-         * For details please refer to APNS document of badge.
-         *
-         * @param badge
-         *
-         * @return builder instance.
-         */
-        apnsBadge(badge: number): KiiPushMessageBuilder;
-
-        /**
-         * Set content-available for APNS subscribers.
-         * If this method is not called, no content-available is applied.
-         *
-         * @param contentAvailable If 0 or this method is not invoked,
-         *   content-available payload is not delivered.
-         *   Otherwise, content-available=1 payload is delivered.
-         *
-         * @return builder instance.
-         */
-        apnsContentAvailable(contentAvailable: number): KiiPushMessageBuilder;
-
-        /**
-         * Set category for APNS subscribers.
-         * If this method is not called, no category is applied.
-         * For details please refer to APNS document of category.
-         *
-         * @param category
-         *
-         * @return builder instance.
-         */
-        apnsCategory(category: string): KiiPushMessageBuilder;
-
-        /**
-         * Set specific data for JPush subscribers.
-         * If this method is not called, no specific data is not applied
-         * and data passed to the constructor would be sent to subscribers.
-         *
-         * @param data specific data applied to only JPush subscribers.
-         *   Contents should be JSON Object with only one-level of nesting,
-         *   and only strings, integers, booleans or doubles in the values.
-         *
-         * @return builder instance.
-         */
-        jpushData(data: { [name: string]: string | number | boolean }): KiiPushMessageBuilder;
-
-        /**
-         * Set specific data for MQTT subscribers.
-         * If this method is not called, no specific data is not applied
-         * and data passed to the constructor would be sent to subscribers.
-         *
-         * @param data specific data applied to only MQTT subscribers.
-         *   Contents should be JSON Object with only one-level of nesting,
-         *   and only strings in the values.
-         *
-         * @return builder instance.
-         */
-        mqttData(data: { [key: string]: string }): KiiPushMessageBuilder;
-    }
-
-    /**
-     * Represents a KiiPushSubscription.
-     */
-    export class KiiPushSubscription {
-        /**
-         * Subscribe to bucket or topic.
-         *
-         * @param target to be subscribed. KiiBucket or KiiTopic instance.
-         * @param callbacks object contains callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is an Array instance.
-         *       <ul>
-         *         <li>params[0] is a KiiPushSubscription instance.</li>
-         *         <li>params[1] is the KiiTopic instance to subscribe.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is a KiiPushSubscription instance.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var topic = Kii.topicWithName("myAppTopic");
-         *     var user = KiiUser.getCurrentUser();
-         *     user.pushSubscription().subscribe(topic, {
-         *         success: function(subscription, topic) {
-         *             // Succeeded.
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var topic = Kii.topicWithName("myAppTopic");
-         *     var user = KiiUser.getCurrentUser();
-         *     user.pushSubscription().subscribe(topic).then(
-         *         function(params) {
-         *             var subscription = params[0];
-         *             var topic = params[1];
-         *             // Succeeded.
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        subscribe<T extends KiiBucket | KiiTopic>(target: T, callbacks?: { success(subscription: KiiPushSubscription, topic: T): any; failure(error: Error): any; }): Promise<[KiiPushSubscription, T]>;
-
-        /**
-         * Unsubscribe to bucket or topic.
-         *
-         * @param target to be unsubscribed. KiiBucket or KiiTopic instance.
-         * @param callbacks object contains callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is an Array instance.
-         *       <ul>
-         *         <li>params[0] is a KiiPushSubscription instance.</li>
-         *         <li>params[1] is the KiiTopic instance to unsubscribe.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is a KiiPushSubscription instance.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var topic = Kii.topicWithName("myAppTopic");
-         *     var user = KiiUser.getCurrentUser();
-         *     user.pushSubscription().unsubscribe(topic, {
-         *         success: function(subscription, topic) {
-         *             // Succeeded.
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var topic = Kii.topicWithName("myAppTopic");
-         *     var user = KiiUser.getCurrentUser();
-         *     user.pushSubscription().unsubscribe(topic).then(
-         *         function(params) {
-         *             var subscription = params[0];
-         *             var topic = params[1];
-         *             // Succeeded.
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        unsubscribe<T extends KiiBucket | KiiTopic>(target: T, callbacks?: { success(subscription: KiiPushSubscription, topic: T): any; failure(error: Error): any; }): Promise<[KiiPushSubscription, T]>;
-
-        /**
-         * Check subscription of bucket, topic.
-         *
-         * @param target to check subscription. KiiBucket or KiiTopic instance.
-         * @param callbacks object contains callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is an Array instance.
-         *       <ul>
-         *         <li>params[0] is a KiiPushSubscription instance.</li>
-         *         <li>params[1] is the KiiTopic instance to subscribe.</li>
-         *         <li>params[2] is Boolean value. true if subscirbed, otherwise false.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is a KiiPushSubscription instance.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var topic = Kii.topicWithName("myAppTopic");
-         *     var user = KiiUser.getCurrentUser();
-         *     user.pushSubscription().isSubscribed(topic, {
-         *         success: function(subscription, topic, isSubscribed) {
-         *             // Succeeded.
-         *             if (isSubscribed) {
-         *                 // The topic is subscribed by current user.
-         *             } else {
-         *                 // The topic is not subscribed by current user.
-         *             }
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var topic = Kii.topicWithName("myAppTopic");
-         *     var user = KiiUser.getCurrentUser();
-         *     user.pushSubscription().isSubscribed(topic).then(
-         *         function(params) {
-         *             // Succeeded.
-         *             var subscription = params[0];
-         *             var topic = params[1];
-         *             var isSubscribed = params[2];
-         *             if (isSubscribed) {
-         *                 // The topic is subscribed by current user.
-         *             } else {
-         *                 // The topic is not subscribed by current user.
-         *             }
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        isSubscribed<T extends KiiBucket | KiiTopic>(target: T, callbacks?: { success(subscription: KiiPushSubscription, topic: T, isSubscribed: boolean): any; failure(error: Error): any; }): Promise<[KiiPushSubscription, T, boolean]>;
-    }
-
-    /**
-     * Represents a KiiQuery object
-     */
-    export class KiiQuery {
-        /**
-         * Get the limit of the current query
-         *
-         * @return
-         */
-        getLimit(): number;
-
-        /**
-         * Set the limit of the given query
-         *
-         * @param value The desired limit. Must be an integer > 0
-         *
-         * @throws InvalidLimitException
-         */
-        setLimit(value: number): void;
-
-        /**
-         * Create a KiiQuery object based on a KiiClause
-         * <br><br>
-         * By passing null as the ‘clause’ parameter, all objects can be retrieved.
-         *
-         * @param clause The KiiClause to be executed with the query
-         */
-        static queryWithClause(clause: KiiClause): KiiQuery;
-
-        /**
-         * Set the query to sort by a field in descending order
-         *
-         * If a sort has already been set, it will be overwritten.
-         *
-         * @param field The key that should be used to sort
-         */
-        sortByDesc(field: string): void;
-
-        /**
-         * Set the query to sort by a field in ascending order
-         *
-         * If a sort has already been set, it will be overwritten.
-         *
-         * @param field The key that should be used to sort
-         */
-        sortByAsc(field: string): void;
-    }
-
-    /**
-     * Represents a server side code entry in KiiCloud.
-     */
-    export class KiiServerCodeEntry {
-        /**
-         * Execute this server code entry.<br>
-         *  If argument is an empty object or not type of Object, callbacks.failure or reject callback of promise will be called.<br>
-         *
-         * @param argument pass to the entry of script in the cloud.
-         *   If null is specified, no argument pass to the script.
-         * @param callbacks called on completion of execution.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is Array instance.
-         *       <ul>
-         *         <li>params[0] is the KiiServerCodeEntry instance which this method was called on.</li>
-         *         <li>params[1] is the passed argument object.</li>
-         *         <li>params[2] is a KiiServerCodeExecResult instance.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiServerCodeEntry instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *         <li>error.argument is passed argument object. </li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     // Instantiate with the endpoint.
-         *     var entry = Kii.serverCodeEntry("main");
-         *
-         *     // Set the custom parameters.
-         *     var arg = {"username":"name_of_my_friend", "password":"password_for_my_friend"};
-         *
-         *     // Example of executing the Server Code
-         *     entry.execute(arg, {
-         *
-         *        success: function(entry, argument, execResult) {
-         *            // do something now that the user is logged in
-         *        },
-         *
-         *        failure: function(entry, argument, execResult, anErrorString) {
-         *            // do something with the error response
-         *        }
-         *     });
-         *
-         *     // example to use Promise
-         *     // Instantiate with the endpoint.
-         *     var entry = Kii.serverCodeEntry("main");
-         *
-         *     // Set the custom parameters.
-         *     var arg = {"username":"name_of_my_friend", "password":"password_for_my_friend"};
-         *
-         *     // Example of executing the Server Code
-         *     entry.execute(arg).then(
-         *         function(params) {
-         *             var entry = params[0];
-         *             var argument = params[1];
-         *             var execResult = params[2];
-         *            // do something
-         *         },
-         *         function(error) {
-         *            // do something with the error response
-         *         }
-         *     );
-         */
-        execute<T>(argument: T, callbacks?: { success(entry: KiiServerCodeEntry, argument: T, execResult: KiiServerCodeExecResult): any; failure(entry: KiiServerCodeEntry, argument: T, execResult: KiiServerCodeExecResult, anErrorString: string): any; }): Promise<[KiiServerCodeEntry, T, KiiServerCodeExecResult]>;
-
-        /**
-         * Get the entryName of this server code entry.
-         *
-         * @return entryName.
-         */
-        getEntryName(): string;
-    }
-
-    /**
-     * Represents a server side code execution result in KiiCloud.
-     */
-    export class KiiServerCodeExecResult {
-        /**
-         * Get calculated number of executed steps.
-         *
-         * @return calculated number of executed steps
-         */
-        getExecutedSteps(): number;
-
-        /**
-         * Get Object returned by server code entry.
-         *
-         * @return returned by server code entry.
-         */
-        getReturnedValue(): any;
-    }
-
-    /**
-     * Represents a KiiSocialConnect object
-     */
-    export class KiiSocialConnect {
-        /**
-         *
-         *
-         * @deprecated You don't have to call this method.
-         *   Set up a reference to one of the supported KiiSocialNetworks.
-         *
-         *   Set up the network. Need to be called before accessing other methods.
-         *   <br><b> Facebook </b>
-         *   <table border="1" cellspacing="0">
-         *   <thead>
-         *   <tr bgcolor="#CCCCFF">
-         *   <th>Argument</th>
-         *   <th>Value Type</th>
-         *   <th>Value</th>
-         *   <th>Note</th>
-         *   </tr>
-         *   </thead>
-         *   <tbody>
-         *   <tr>
-         *   <td>networkName</td>
-         *   <td>Number</td>
-         *   <td>KiiSocialNetworkName.FACEBOOK</td>
-         *   <td>Specify Facebook</td>
-         *   </tr>
-         *   <tr>
-         *   <td>apiKey</td>
-         *   <td>String</td>
-         *   <td>null</td>
-         *   <td>Facebook does not requires this argument.</td>
-         *   </tr>
-         *   <tr>
-         *   <td>apiSecret</td>
-         *   <td>String</td>
-         *   <td>null</td>
-         *   <td>Facebook does not requires this argument.</td>
-         *   </tr>
-         *   <tr>
-         *   <td>extras</td>
-         *   <td>Object</td>
-         *   <td>null</td>
-         *   <td>Facebook does not requires this argument.</td>
-         *   </tr>
-         *   </tbody>
-         *   </table>
-         *
-         *   <br><b> Twitter </b>
-         *   <table border="1" cellspacing="0">
-         *   <thead>
-         *   <tr bgcolor="#CCCCFF">
-         *   <th>Argument</th>
-         *   <th>Value Type</th>
-         *   <th>Value</th>
-         *   <th>Note</th>
-         *   </tr>
-         *   </thead>
-         *   <tbody>
-         *   <tr>
-         *   <td>networkName</td>
-         *   <td>Number</td>
-         *   <td>KiiSocialNetworkName.TWITTER</td>
-         *   <td>Specify Twitter</td>
-         *   </tr>
-         *   <tr>
-         *   <td>apiKey</td>
-         *   <td>String</td>
-         *   <td>null</td>
-         *   <td>Twitter does not requires this argument.</td>
-         *   </tr>
-         *   <tr>
-         *   <td>apiSecret</td>
-         *   <td>String</td>
-         *   <td>null</td>
-         *   <td>Twitter does not requires this argument.</td>
-         *   </tr>
-         *   <tr>
-         *   <td>extras</td>
-         *   <td>Object</td>
-         *   <td>null</td>
-         *   <td>Twitter does not requires this argument.</td>
-         *   </tr>
-         *   </tbody>
-         *   </table>
-         *   <br><b> QQ </b>
-         *   <table border="1" cellspacing="0">
-         *   <thead>
-         *   <tr bgcolor="#CCCCFF">
-         *   <th>Argument</th>
-         *   <th>Value Type</th>
-         *   <th>Value</th>
-         *   <th>Note</th>
-         *   </tr>
-         *   </thead>
-         *   <tbody>
-         *   <tr>
-         *   <td>networkName</td>
-         *   <td>Number</td>
-         *   <td>KiiSocialNetworkName.QQ</td>
-         *   <td>Specify QQ</td>
-         *   </tr>
-         *   <tr>
-         *   <td>apiKey</td>
-         *   <td>String</td>
-         *   <td>null</td>
-         *   <td>QQ does not requires this argument.</td>
-         *   </tr>
-         *   <tr>
-         *   <td>apiSecret</td>
-         *   <td>String</td>
-         *   <td>null</td>
-         *   <td>QQ does not requires this argument.</td>
-         *   </tr>
-         *   <tr>
-         *   <td>extras</td>
-         *   <td>Object</td>
-         *   <td>null</td>
-         *   <td>QQ does not requires this argument.</td>
-         *   </tr>
-         *   </tbody>
-         *   </table>
-         *
-         * @param networkName One of the supported KiiSocialNetworkName values
-         * @param apiKey The SDK key assigned by the social network provider. For details refer to the table above.
-         * @param apiSecret The SDK secret assigned by the social network provider. For details refer to the table above.
-         * @param extras Extra options that should be passed to the SNS. For details refer to the table above.
-         *
-         * @throws For details refer to the table above
-         */
-        static setupNetwork(networkName: KiiSocialNetworkName, apiKey: string, apiSecret: string, extras: any): void;
-
-        /**
-         * Log a user into the social network provided
-         *
-         *  This will initiate the login process for the given network. If user has already linked with the specified social network,
-         *  sign-in with the social network. Otherwise, this will sign-up and create new user authenticated by the specified social network.
-         *  If sign-up successful, the user is cached inside SDK as current user,and accessible via {@link KiiUser.getCurrentUser()}.
-         *  User token and token expiration is also cached and can be get by {@link KiiUser#getAccessTokenObject()}.
-         *  Access token won't be expired unless you set it explicitly by {@link Kii.setAccessTokenExpiration()}.
-         *  The network must already be set up via setupNetwork<br>
-         *  If the opitons is invalid, callbacks.failure or reject callback of promise will be called. <br>
-         *
-         * @param networkName One of the supported KiiSocialNetworkName values
-         * @param options A dictionary of key/values to pass to KiiSocialConnect
-         *
-         *   <br><b> Facebook </b>
-         *   <table border="1" cellspacing="0">
-         *   <thead>
-         *   <tr bgcolor="#CCCCFF">
-         *   <th>Key</th>
-         *   <th>Value type</th>
-         *   <th>Value</th>
-         *   <th>Note</th>
-         *   </tr>
-         *   </thead>
-         *   <tbody>
-         *   <tr>
-         *   <td>access_token</td>
-         *   <td>String</td>
-         *   <td>Access token of Facebook.</td>
-         *   <td>This is mandatory.</td>
-         *   </tr>
-         *   </tbody>
-         *   </table>
-         *
-         *   <br><b> Twitter </b>
-         *   <table border="1" cellspacing="0">
-         *   <thead>
-         *   <tr bgcolor="#CCCCFF">
-         *   <th>Key</th>
-         *   <th>Value type</th>
-         *   <th>Value</th>
-         *   <th>Note</th>
-         *   </tr>
-         *   </thead>
-         *   <tbody>
-         *   <tr>
-         *   <td>oauth_token</td>
-         *   <td>String</td>
-         *   <td>OAuth access token of twitter.</td>
-         *   <td>This is mandatory. </td>
-         *   </tr>
-         *   <tr>
-         *   <td>oauth_token_secret</td>
-         *   <td>String</td>
-         *   <td>OAuth access token secret of twitter.</td>
-         *   <td>This is mandatory.</td>
-         *   </tr>
-         *   </tbody>
-         *   </table>
-         *
-         *   <br><b> Google </b>
-         *   <table border="1" cellspacing="0">
-         *   <thead>
-         *   <tr bgcolor="#CCCCFF">
-         *   <th>Key</th>
-         *   <th>Value type</th>
-         *   <th>Value</th>
-         *   <th>Note</th>
-         *   </tr>
-         *   </thead>
-         *   <tbody>
-         *   <tr>
-         *   <td>access_token</td>
-         *   <td>String</td>
-         *   <td>Access token of Google.</td>
-         *   <td>This is mandatory.</td>
-         *   </tr>
-         *   </tbody>
-         *   </table>
-         *
-         *   <br><b> Renren </b>
-         *   <table border="1" cellspacing="0">
-         *   <thead>
-         *   <tr bgcolor="#CCCCFF">
-         *   <th>Key</th>
-         *   <th>Value type</th>
-         *   <th>Value</th>
-         *   <th>Note</th>
-         *   </tr>
-         *   </thead>
-         *   <tbody>
-         *   <tr>
-         *   <td>access_token</td>
-         *   <td>String</td>
-         *   <td>Access token of Renren.</td>
-         *   <td>This is mandatory.</td>
-         *   </tr>
-         *   </tbody>
-         *   </table>
-         *
-         *   <br><b> QQ </b>
-         *   <table border="1" cellspacing="0">
-         *   <thead>
-         *   <tr bgcolor="#CCCCFF">
-         *   <th>Key</th>
-         *   <th>Value type</th>
-         *   <th>Value</th>
-         *   <th>Note</th>
-         *   </tr>
-         *   </thead>
-         *   <tbody>
-         *   <tr>
-         *   <td>access_token</td>
-         *   <td>String</td>
-         *   <td>Access token of QQ.</td>
-         *   <td>This is mandatory. </td>
-         *   </tr>
-         *   <tr>
-         *   <td>openID</td>
-         *   <td>String</td>
-         *   <td>OpenID of QQ.</td>
-         *   <td>This is mandatory.</td>
-         *   </tr>
-         *   </tbody>
-         *   </table>
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is Array instance.
-         *       <ul>
-         *         <li>params[0] is a logged in KiiUser instance.</li>
-         *         <li>params[1] is the KiiSocialNetworkName used to login.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.message</li>
-         *         <li>error.network is the KiiSocialNetworkName used to login.</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *      // example to use callbacks directly
-         *      // Example of using no option
-         *      KiiSocialConnect.logIn(KiiSocialNetworkName.FACEBOOK, null, {
-         *
-         *          success: function(user, network) {
-         *              // do something now that the user is logged in
-         *          },
-         *
-         *          failure: function(user, network, anErrorString) {
-         *              // do something with the error response
-         *          }
-         *      });
-         *
-         *      // example to use Promise
-         *      KiiSocialConnect.logIn(KiiSocialNetworkName.FACEBOOK, null).then(
-         *          function(params) {
-         *              // do something now that the user is logged in
-         *          },
-         *          function(error) {
-         *              // do something with the error response
-         *          }
-         *      );
-         */
-        static logIn(networkName: KiiSocialNetworkName, options: KiiSocialConnectOptions, callbacks?: { success(user: KiiUser, network: KiiSocialNetworkName): any; failure(user: KiiUser, network: KiiSocialNetworkName, anErrorString: string): any; }): Promise<[KiiUser, KiiSocialNetworkName]>;
-
-        /**
-         * Link the currently logged in user with a social network
-         *
-         *  This will initiate the login process for the given network, which for SSO-enabled services like Facebook, will send the user to the Facebook site for authentication. There must be a currently authenticated KiiUser. Otherwise, you can use the logIn: method to create and log in a KiiUser using a network. The network must already be set up via setupNetwork<br>
-         *  If there is not logged-in user to link with, callbacks.failure or reject callback of promise will be called. <br>
-         *  If the opitons is invalid, callbacks.failure or reject callback of promise will be called. <br>
-         *
-         * @param networkName One of the supported KiiSocialNetworkName values
-         * @param options A dictionary of key/values to pass to KiiSocialConnect
-         *   <br><b> Facebook </b>
-         *   <table border="1" cellspacing="0">
-         *   <thead>
-         *   <tr bgcolor="#CCCCFF">
-         *   <th>Key</th>
-         *   <th>Value type</th>
-         *   <th>Value</th>
-         *   <th>Note</th>
-         *   </tr>
-         *   </thead>
-         *   <tbody>
-         *   <tr>
-         *   <td>access_token</td>
-         *   <td>String</td>
-         *   <td>Access token of Facebook.</td>
-         *   <td>This is mandatory.</td>
-         *   </tr>
-         *   </tbody>
-         *   </table>
-         *
-         *   <br><b> Twitter </b>
-         *   <table border="1" cellspacing="0">
-         *   <thead>
-         *   <tr bgcolor="#CCCCFF">
-         *   <th>Key</th>
-         *   <th>Value type</th>
-         *   <th>Value</th>
-         *   <th>Note</th>
-         *   </tr>
-         *   </thead>
-         *   <tbody>
-         *   <tr>
-         *   <td>oauth_token</td>
-         *   <td>String</td>
-         *   <td>OAuth access token of twitter.</td>
-         *   <td>This is mandatory.</td>
-         *   </tr>
-         *   <tr>
-         *   <td>oauth_token_secret</td>
-         *   <td>String</td>
-         *   <td>OAuth access token secret of twitter.</td>
-         *   <td>This is mandatory.</td>
-         *   </tr>
-         *   </tbody>
-         *   </table>
-         *
-         *   <br><b> Google </b>
-         *   <table border="1" cellspacing="0">
-         *   <thead>
-         *   <tr bgcolor="#CCCCFF">
-         *   <th>Key</th>
-         *   <th>Value type</th>
-         *   <th>Value</th>
-         *   <th>Note</th>
-         *   </tr>
-         *   </thead>
-         *   <tbody>
-         *   <tr>
-         *   <td>access_token</td>
-         *   <td>String</td>
-         *   <td>Access token of Google.</td>
-         *   <td>This is mandatory.</td>
-         *   </tr>
-         *   </tbody>
-         *   </table>
-         *
-         *   <br><b> Renren </b>
-         *   <table border="1" cellspacing="0">
-         *   <thead>
-         *   <tr bgcolor="#CCCCFF">
-         *   <th>Key</th>
-         *   <th>Value type</th>
-         *   <th>Value</th>
-         *   <th>Note</th>
-         *   </tr>
-         *   </thead>
-         *   <tbody>
-         *   <tr>
-         *   <td>access_token</td>
-         *   <td>String</td>
-         *   <td>Access token of Renren.</td>
-         *   <td>This is mandatory.</td>
-         *   </tr>
-         *   </tbody>
-         *   </table>
-         *
-         *   <br><b> QQ </b>
-         *   <table border="1" cellspacing="0">
-         *   <thead>
-         *   <tr bgcolor="#CCCCFF">
-         *   <th>Key</th>
-         *   <th>Value type</th>
-         *   <th>Value</th>
-         *   <th>Note</th>
-         *   </tr>
-         *   </thead>
-         *   <tbody>
-         *   <tr>
-         *   <td>access_token</td>
-         *   <td>String</td>
-         *   <td>Access token of QQ.</td>
-         *   <td>This is mandatory. </td>
-         *   </tr>
-         *   <tr>
-         *   <td>openID</td>
-         *   <td>String</td>
-         *   <td>OpenID of QQ.</td>
-         *   <td>This is mandatory.</td>
-         *   </tr>
-         *   </tbody>
-         *   </table>
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is Array instance.
-         *       <ul>
-         *         <li>params[0] is a linked KiiUser instance.</li>
-         *         <li>params[1] is the KiiSocialNetworkName used to link.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is current logged-in KiiUser instance. If there is not logged-in user, it will be null.</li>
-         *         <li>error.message</li>
-         *         <li>error.network is the KiiSocialNetworkName used to link.</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *      // example to use callbacks directly
-         *      // Example of using no option
-         *      KiiSocialConnect.linkCurrentUserWithNetwork(KiiSocialNetworkName.FACEBOOK, null, {
-         *
-         *          success: function(user, network) {
-         *              // do something now that the user is linked
-         *          },
-         *
-         *          failure: function(user, network, anErrorString) {
-         *              // do something with the error response
-         *          }
-         *      });
-         *
-         *      // example to use Promise
-         *      // Example of using no option
-         *      KiiSocialConnect.linkCurrentUserWithNetwork(KiiSocialNetworkName.FACEBOOK, null).then(
-         *          function(params) {
-         *              // do something now that the user is linked
-         *          },
-         *          function(error) {
-         *              // do something with the error response
-         *          }
-         *      );
-         */
-        static linkCurrentUserWithNetwork(networkName: KiiSocialNetworkName, options: KiiSocialConnectOptions, callbacks?: { success(user: KiiUser, network: KiiSocialNetworkName): any; failure(user: KiiUser, network: KiiSocialNetworkName, anErrorString: string): any; }): Promise<[KiiUser, KiiSocialNetworkName]>;
-
-        /**
-         * Unlink the currently logged in user with a social network
-         *
-         *  The network must already be set up via setupNetwork
-         *
-         * @param networkName One of the supported KiiSocialNetworkName values
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is Array instance.
-         *       <ul>
-         *         <li>params[0] is a unlinked KiiUser instance.</li>
-         *         <li>params[1] is the KiiSocialNetworkName used to unlink.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is current logged-in KiiUser instance. If there is not logged-in user, it will be null.</li>
-         *         <li>error.message</li>
-         *         <li>error.network is the KiiSocialNetworkName used to unlink.</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *
-         *      // example to use callbacks directly
-         *      KiiSocialConnect.unLinkCurrentUserFromNetwork(KiiSocialNetworkName.FACEBOOK, {
-         *
-         *          success: function(user, network) {
-         *              // do something now that the user is unlinked
-         *          },
-         *
-         *          failure: function(user, network, anErrorString) {
-         *              // do something with the error response
-         *          }
-         *      });
-         *
-         *      // example to use Promise
-         *      KiiSocialConnect.unLinkCurrentUserFromNetwork(KiiSocialNetworkName.FACEBOOK).then(
-         *          function(params) {
-         *              // do something now that the user is unlinked
-         *          },
-         *          function(error) {
-         *              // do something with the error response
-         *          }
-         *      );
-         */
-        static unLinkCurrentUserFromNetwork(networkName: KiiSocialNetworkName, callbacks?: { success(user: KiiUser, network: KiiSocialNetworkName): any; failure(user: KiiUser, network: KiiSocialNetworkName, anErrorString: string): any; }): Promise<[KiiUser, KiiSocialNetworkName]>;
-
-        /**
-         * Retrieve the current user's access token from a social network
-         * The network must be set up and linked to the current user. It is recommended you save this to preferences for multi-session use.
-         *
-         * @deprecated Use {@link KiiSocialConnect.getAccessTokenObjectForNetwork} instead.
-         *
-         * @param networkName One of the supported KiiSocialNetworkName values
-         *
-         * @return The current access token, null if unavailable
-         */
-        static getAccessTokenForNetwork(networkName: KiiSocialNetworkName): string;
-
-        /**
-         * Retrieve the current user's access token expiration date from a social network
-         *
-         * The network must be set up and linked to the current user. It is recommended you save this to preferences for multi-session use.
-         *
-         * @deprecated Use {@link KiiSocialConnect.getAccessTokenObjectForNetwork} instead.
-         *
-         * @param networkName One of the supported KiiSocialNetworkName values
-         *
-         * @return The current access token expiration date, null if unavailable
-         */
-        static getAccessTokenExpirationForNetwork(networkName: KiiSocialNetworkName): string;
-
-        /**
-         * Retrieve the current user's access token object from a social network
-         *
-         * The network must be set up and linked to the current user.
-         * It is recommended you save this to preferences for multi-session use.<br><br>
-         * Following parameters can be assigned to object.<br><br>
-         * <b>Facebook</b>
-         * <li>access_token</li>
-         * <li>expires_in</li>
-         * <li>kii_new_user</li>
-         * <br>
-         * <b>Twitter</b>
-         * <li>oauth_token</li>
-         * <li>oauth_token_secret</li>
-         * <li>kii_new_user</li>
-         * <br>
-         * <b>Google</b>
-         * <li>access_token</li>
-         * <li>kii_new_user</li>
-         * <br>
-         * <b>RenRen</b>
-         * <li>access_token</li>
-         * <li>kii_new_user</li>
-         * <br>
-         * <b>QQ</b>
-         * <li>access_token</li>
-         * <li>openID</li>
-         * <li>kii_new_user</li>
-         *
-         * @param networkName One of the supported KiiSocialNetworkName values
-         *
-         * @return tokenObject The current access token object, null if unavailable.
-         */
-        static getAccessTokenObjectForNetwork(networkName: KiiSocialNetworkName): any;
-    }
-
-    /**
-     * Represents a Thing object
-     */
-    export class KiiThing {
-        /**
-         * of this thing.
-         * For details refer to {@link KiiThing.register}
-         */
-        fields: KiiThingFields;
-
-        /**
-         * Get thing ID.
-         *
-         * @return thing id
-         */
-        getThingID(): string;
-
-        /**
-         * Get vendor thing ID.
-         *
-         * @return vendor thing id
-         */
-        getVendorThingID(): string;
-
-        /**
-         * Get access token of this thing.
-         *
-         * @return access token of this thing.
-         */
-        getAccessToken(): string;
-
-        /**
-         * Get created time of this thing.
-         *
-         * @return created time of this thing.
-         */
-        getCreated(): Date;
-
-        /**
-         * Get disabled status of this thing.
-         *
-         * @return true if thing is disabled, false otherwise.
-         */
-        getDisabled(): boolean;
-
-        /**
-         * Register thing in KiiCloud.<br>
-         * This API doesnt require users login Anonymous user can register thing.
-         * <br>
-         * Propertis started with '_' in the fields is reserved by Kii Cloud.<br>
-         * Those properties are indexed in Kii Cloud storage.<br>
-         * Properties not started with '_' is custom properties defined by developer.<br>
-         * Custom properties are not indexed in KiiCloud storage.<br>
-         * Following properties are readonly and ignored on creation/{@link #update} of thing.<br>
-         * '_thingID', '_created', '_accessToken' <br>
-         * Following properties are readonly after creation and will be ignored on {@link #update} of thing.<br>
-         * '_vendorThingID', '_password'<br>
-         * As Property prefixed with '_' is reserved by Kii Cloud,
-         * properties other than ones described in the parameter secion
-         * and '_layoutPosition' are ignored on creation/{@link #update} of thing.<br>
-         * Those ignored properties won't be removed from fields object passed as argument.
-         * However it won't be reflected to fields object property of created/updated Thing.
-         *
-         * @param fields of the thing to be registered.
-         * @param callbacks object holds callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(thing). thing is a KiiThing instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiThing instance.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     KiiThing.register(
-         *         {
-         *             _vendorThingID: "thing-XXXX-YYYY-ZZZZZ",
-         *             _password: "thing-password",
-         *             _thingType: "thermometer",
-         *             yourCustomObj: // Arbitrary key can be used.
-         *             { // Object, Array, Number, String can be used. Should be compatible with JSON.
-         *                 yourCustomKey1: "value",
-         *                 yourCustomKey2: 100
-         *             }
-         *         },
-         *         {
-         *             success: function(thing) {
-         *                 // Register Thing succeeded.
-         *             },
-         *             failure: function(error) {
-         *                 // Handle error.
-         *             }
-         *         }
-         *     );
-         *
-         *     // example to use Promise
-         *     KiiThing.register(
-         *         {
-         *             _vendorThingID: "thing-XXXX-YYYY-ZZZZZ",
-         *             _password: "thing-password",
-         *             _thingType: "thermometer",
-         *             yourCustomObj: // Arbitrary key can be used.
-         *             { // Object, Array, Number, String can be used. Should be compatible with JSON.
-         *                 yourCustomKey1: "value",
-         *                 yourCustomKey2: 100
-         *             }
-         *         }
-         *     ).then(
-         *         function(thing) {
-         *             // Register Thing succeeded.
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        static register(fields: KiiThingFields, callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
-
-        /**
-         * Retrieve the latest thing information from KiiCloud.
-         * <br>This API is authorized by owner of thing.
-         * <br>Need user login who owns this thing before execute this API.
-         * <br>To let users to own thing, please call {@link KiiThing#registerOwner}
-         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
-         * API is authorized by app admin.<br>
-         *
-         * @param callbacks object holds callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(thing). thing is KiiThing instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiThing instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     // assume thing is already registered.
-         *     thing.refresh({
-         *         success: function(thing) {
-         *             // Refresh succeeded.
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     // assume thing is already registered.
-         *     thing.refresh().then(
-         *         function(thing) {
-         *             // Refresh succeeded.
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        refresh(callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
-
-        /**
-         * Update registered thing information in Kii Cloud
-         * <br>This API is authorized by owner of thing.
-         * <br>Need user login who owns this thing before execute this API.
-         * <br>To let users to own thing, please call {@link KiiThing#registerOwner}
-         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
-         * API is authorized by app admin.<br>
-         *
-         * @param callbacks object holds callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(thing). thing is a KiiThing instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiThing instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @see KiiThing.register
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     // assume thing is already registered.
-         *     thing.fields._stringField1 = "new string value";
-         *     thing.fields.customObject = {
-         *         "customField1" : "abcd",
-         *         "customField2" : 123
-         *     };
-         *     thing.update({
-         *         success: function(thing) {
-         *             // Update succeeded.
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     // assume thing is already registered.
-         *     thing.fields._stringField1 = "new string value";
-         *     thing.fields.customObject = {
-         *         "customField1" : "abcd",
-         *         "customField2" : 123
-         *     };
-         *     thing.update().then(
-         *         function(thing) {
-         *             // Update succeeded.
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        update(callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
-
-        /**
-         * Delete registered thing in Kii Cloud.
-         * <br>This API is authorized by owner of thing.
-         * <br>Need user login who owns this thing before execute this API.
-         * <br>To let users to own thing, please call {@link KiiThing#registerOwner}
-         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
-         * API is authorized by app admin.<br>
-         *
-         * It will delete bucket, topic which belongs to this thing,
-         * entity belongs to the bucket/topic and all ownership information of thing.
-         * This operation can not be reverted. Please carefully use this.
-         *
-         * @param callbacks object holds callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(thing). thing is a KiiThing instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiThing instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     // assume thing is already registered.
-         *     thing.deleteThing({
-         *         success: function(thing) {
-         *             // Delete succeeded.
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     // assume thing is already registered.
-         *     thing.deleteThing().then(
-         *         function(thing) {
-         *             // Delete succeeded.
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        deleteThing(callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
-
-        /**
-         * Check if user/ group is owner of the thing.
-         * <br>This API is authorized by owner of thing.
-         * <br>Need user login before execute this API.
-         * <br>To let users to own Thing, please call {@link KiiThing#registerOwner}
-         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
-         * API is authorized by app admin.<br>
-         *
-         * @param owner whether the instance is owner of thing or not.
-         * @param callbacks object holds callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is an Array instance.
-         *       <ul>
-         *         <li>params[0] is the KiiThing instance which this method was called on.</li>
-         *         <li>params[1] is a KiiUser/KiiGroup instance.</li>
-         *         <li>params[2] is Boolean value, true is the user/group is owner of the thing, otherwise false.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiThing instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     // assume thing/user is already registered.
-         *     var user = KiiUser.userWithURI("kiicloud://users/xxxyyyy");
-         *     thing.isOwner(user, {
-         *         success: function(thing, user, isOwner) {
-         *             if (isOwner) {
-         *                 // user is owner of the thing.
-         *             } else {
-         *                 // user is not owner of the thing.
-         *             }
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     // assume thing/user is already registered.
-         *     var user = KiiUser.userWithURI("kiicloud://users/xxxyyyy");
-         *     thing.isOwner(user).then(
-         *         function(params) {
-         *             var thing = params[0];
-         *             var user = params[1];
-         *             var isOwner = params[2];
-         *             if (isOwner) {
-         *                 // user is owner of the thing.
-         *             } else {
-         *                 // user is not owner of the thing.
-         *             }
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        isOwner<T extends KiiUser | KiiGroup>(owner: T, callbacks?: { success(thing: KiiThing, user: T, isOwner: boolean): any; failure(error: Error): any; }): Promise<[KiiThing, T, boolean]>;
-
-        /**
-         * Register user/group as owner of this thing.
-         * <br>Need user login before execute this API.
-         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
-         * API is authorized by app admin.<br>
-         *
-         * @param owner to be registered as owner.
-         * @param callbacks object holds callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is an Array instance.
-         *       <ul>
-         *         <li>params[0] is the KiiThing instance which this method was called on.</li>
-         *         <li>params[1] is a KiiUser/KiiGroup instance.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiThing instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     // assume thing/group is already registered.
-         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
-         *     thing.registerOwner(group, {
-         *         success: function(thing, group) {
-         *             // Register owner succeeded.
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     // assume thing/group is already registered.
-         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
-         *     thing.registerOwner(group).then(
-         *         function(params) {
-         *             // Register owner succeeded.
-         *             var thing = params[0];
-         *             var group = params[1];
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        registerOwner<T extends KiiUser | KiiGroup>(owner: T, callbacks?: { success(thing: KiiThing, group: T): any; failure(error: Error): any; }): Promise<[KiiThing, T]>;
-
-        /**
-         * Register user/group as owner of specified thing.
-         * <br>Need user login before execute this API.
-         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
-         * API is authorized by app admin.<br>
-         *
-         * @param thingID The ID of thing
-         * @param owner instance of KiiUser/KiiGroup to be registered as owner.
-         * @param callbacks object holds callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is an Array instance.
-         *       <ul>
-         *         <li>params[0] is a KiiUser/KiiGroup instance.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     // assume thing/group is already registered.
-         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
-         *     KiiThing.registerOwnerWithThingID("th.xxxx-yyyy-zzzz", group, {
-         *         success: function(group) {
-         *             // Register owner succeeded.
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     // assume thing/group is already registered.
-         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
-         *     KiiThing.registerOwnerWithThingID("th.xxxx-yyyy-zzzz", group).then(
-         *         function(params) {
-         *             // Register owner succeeded.
-         *             var group = params[0];
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        static registerOwnerWithThingID<T extends KiiUser | KiiGroup>(thingID: string, owner: T, callbacks?: { success(group: T): any; failure(error: Error): any; }): Promise<T>;
-
-        /**
-         * Register user/group as owner of specified thing.
-         * <br>Need user login before execute this API.
-         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
-         * API is authorized by app admin.<br>
-         *
-         * @param vendorThingID The vendor thing ID of thing
-         * @param owner instance of KiiUser/KiiGroup to be registered as owner.
-         * @param callbacks object holds callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is an Array instance.
-         *       <ul>
-         *         <li>params[0] is a KiiUser/KiiGroup instance.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     // assume thing/group is already registered.
-         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
-         *     KiiThing.registerOwnerWithVendorThingID("xxxx-yyyy-zzzz", group, {
-         *         success: function(group) {
-         *             // Register owner succeeded.
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     // assume thing/group is already registered.
-         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
-         *     KiiThing.registerOwnerWithVendorThingID("xxxx-yyyy-zzzz", group).then(
-         *         function(group) {
-         *             // Register owner succeeded.
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        static registerOwnerWithVendorThingID<T extends KiiUser | KiiGroup>(vendorThingID: string, owner: T, callbacks?: { success(group: T): any; failure(error: Error): any; }): Promise<T>;
-
-        /**
-         * Remove ownership of thing from specified user/group.
-         * <br>This API is authorized by owner of thing.
-         * <br>Need user login who owns this thing before execute this API.
-         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
-         * API is authorized by app admin.<br>
-         *
-         * @param owner to be unregistered.
-         * @param callbacks object holds callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is an Array instance.
-         *       <ul>
-         *         <li>params[0] is the KiiThing instance which this method was called on.</li>
-         *         <li>params[1] is a KiiUser/KiiGroup instance which had ownership of the thing removed.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiThing instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     // assume thing/group is already registered.
-         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
-         *     thing.unregisterOwner(group, {
-         *         success: function(thing, group) {
-         *             // Unregister owner succeeded.
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     // assume thing/group is already registered.
-         *     var group = KiiGroup.groupWithURI("kiicloud://groups/xxxyyyy");
-         *     thing.unregisterOwner(group).then(
-         *         function(params) {
-         *             // Unregister owner succeeded.
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        unregisterOwner<T extends KiiUser | KiiGroup>(owner: T, callbacks?: { success(thing: KiiThing, group: T): any; failure(error: Error): any; }): Promise<[KiiThing, T]>;
-
-        /**
-         * Disable the thing.
-         * <br>This API is authorized by owner of thing.
-         * <br>Need user login who owns this thing before execute this API.
-         * <br>To let users to own Thing, please call {@link KiiThing#registerOwner}
-         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
-         * API is authorized by app admin.<br>
-         *
-         * After succeeded, access token published for thing is disabled.
-         * In a result, only the app administrator and owners of thing can access the thing.
-         * Used when user lost the thing and avoid using by unknown users.
-         * It doesn't throw error when the thing is already disabled.
-         *
-         * @param callbacks object holds callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(thing). thing is a KiiThing instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiThing instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     // assume thing is already registered.
-         *     thing.disable({
-         *         success: function(thing) {
-         *             // Disable succeeded.
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     // assume thing is already registered.
-         *     thing.disable().then(
-         *         function(thing) {
-         *             // Disable succeeded.
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        disable(callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
-
-        /**
-         * Enable the thing.
-         * <br>This API is authorized by owner of thing.
-         * <br>Need user login who owns this thing before execute this API.
-         * <br>To let users to own Thing, please call {@link KiiThing#registerOwner}
-         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
-         * API is authorized by app admin.<br>
-         *
-         * After succeeded, If thing is registered with "persistentToken" option,
-         * token should be recovered (Access token which is used before disabling can be available).
-         * Otherwise, it does not recovered.
-         * It doesn't throw error when the thing is already enabled.
-         *
-         * @param callbacks object holds callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(thing). thing is a KiiThing instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiThing instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     // assume thing is already registered.
-         *     thing.enable({
-         *         success: function(thing) {
-         *             // Enable succeeded.
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     // assume thing is already registered.
-         *     thing.enable().then(
-         *         function(thing) {
-         *             // Disable succeeded.
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        enable(callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
-
-        /**
-         * Load thing with given vendor thing id.
-         * <br>This API is authorized by owner of thing.
-         * <br>Need user login who owns this thing before execute this API.
-         * <br>To let users to own Thing, please call {@link KiiThing#registerOwner}
-         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
-         * API is authorized by app admin.<br>
-         *
-         * @param vendorThingID registered vendor thing id.
-         * @param callbacks object holds callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(thing). thing is a KiiThing instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     KiiThing.loadWithVendorThingID("thing-xxxx-yyyy",{
-         *         success: function(thing) {
-         *             // Load succeeded.
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     KiiThing.loadWithVendorThingID("thing-xxxx-yyyy").then(
-         *         function(thing) {
-         *             // Load succeeded.
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        static loadWithVendorThingID(vendorThingID: string, callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
-
-        /**
-         * Load thing with thing id given by Kii Cloud.
-         * <br>This API is authorized by owner of thing.
-         * <br>Need user login who owns this thing before execute this API.
-         * <br>To let users to own Thing, please call {@link KiiThing#registerOwner}
-         * <br>Note: if you obtain thing instance from {@link KiiAppAdminContext},
-         * API is authorized by app admin.<br>
-         *
-         * thing id can be obtained by {@link thingID}
-         *
-         * @param thingID registered thing id.
-         * @param callbacks object holds callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(thing). thing is a KiiThing instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     KiiThing.loadWithThingID("thing-xxxx-yyyy",{
-         *         success: function(thing) {
-         *             // Load succeeded.
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     KiiThing.loadWithVendorThingID("thing-xxxx-yyyy").then(
-         *         function(thing) {
-         *             // Load succeeded.
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        static loadWithThingID(thingID: string, callbacks?: { success(thing: KiiThing): any; failure(error: Error): any; }): Promise<KiiThing>;
-
-        /**
-         * Instantiate bucket belongs to this thing.
-         *
-         * @param bucketName name of the bucket.
-         *
-         * @return bucket instance.
-         */
-        bucketWithName(bucketName: string): KiiBucket;
-
-        /**
-         * Creates a reference to a encrypted bucket for this thing
-         *
-         * <br><br>The bucket will be created/accessed within this thing's scope
-         *
-         * @param bucketName The name of the bucket the user should create/access
-         *
-         * @return A working KiiEncryptedBucket object
-         *
-         * @example
-         *     var thing = . . .; // a KiiThing
-         *     var bucket = thing.encryptedBucketWithName("myBucket");
-         */
-        encryptedBucketWithName(bucketName: string): KiiBucket;
-
-        /**
-         * Instantiate topic belongs to this thing.
-         *
-         * @param topicName name of the topic. Must be a not empty string.
-         *
-         * @return topic instance.
-         */
-        topicWithName(topicName: string): KiiTopic;
-
-        /**
-         * Gets a list of topics in this thing scope
-         *
-         * @param callbacks An object with callback methods defined
-         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success. If empty string or no string object is provided, this API regards no paginationKey specified.
-         *
-         * @return return promise object.
-         *     <ul>
-         *       <li>fulfill callback function: function(params). params is Array instance.
-         *         <ul>
-         *           <li>params[0] is array of KiiTopic instances.</li>
-         *           <li>params[1] is string of nextPaginationKey.</li>
-         *         </ul>
-         *       </li>
-         *       <li>reject callback function: function(error). error is an Error instance.
-         *         <ul>
-         *           <li>error.target is the KiiThing instance which this method was called on. </li>
-         *           <li>error.message</li>
-         *         </ul>
-         *       </li>
-         *     </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var thing = . . .; // a KiiThing
-         *     thing.listTopics({
-         *         success: function(topicList, nextPaginationKey) {
-         *             // do something with the result
-         *             for(var i=0; i&lt;topicList.length; i++){
-         *                 var topic = topicList[i];
-         *             }
-         *             if (nextPaginationKey != null) {
-         *                 thing.listTopics({
-         *                     success: function(topicList, nextPaginationKey) {...},
-         *                     failure: function(anErrorString) {...}
-         *                 }, nextPaginationKey);
-         *             }
-         *         },
-         *         failure: function(anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use promise
-         *     var thing = . . .; // a KiiThing
-         *     thing.listTopics().then(
-         *         function(params) {
-         *             var topicList = params[0];
-         *             var nextPaginationKey = params[1];
-         *             // do something with the result
-         *             for(var i=0; i&lt;topicList.length; i++){
-         *                 var topic = topicList[i];
-         *             }
-         *             if (nextPaginationKey != null) {
-         *                 thing.listTopics(null, nextPaginationKey).then(
-         *                     function(params) {...},
-         *                     function(error) {...}
-         *                 );
-         *             }
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        listTopics(callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; }, paginationKey?: string): Promise<[KiiTopic[], string]>;
-
-        /**
-         * Instantiate push subscription for this thing.
-         *
-         * @return push subscription object.
-         */
-        pushSubscription(): KiiPushSubscription;
-    }
-
-    /**
-     * Represents a Topic object.
-     */
-    export class KiiTopic {
-        /**
-         * get name of this topic
-         *
-         * @return name of this topic.
-         */
-        getName(): string;
-
-        /**
-         * Checks whether the topic already exists or not.
-         *
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(existed). true if the topic exists.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiTopic instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     // assume topic is already instantiated.
-         *     topic.exists({
-         *         success: function(existed) {
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     // assume topic is already instantiated.
-         *     topic.exists().then(
-         *         function(existed){
-         *         },
-         *         function(error){
-         *             // Handle error.
-         *         });
-         */
-        exists(callbacks?: { success(existed: boolean): any; failure(error: Error): any; }): Promise<boolean>;
-
-        /**
-         * Save this topic on Kii Cloud.
-         * Note that only app admin can save application scope topic.
-         *
-         * @param callbacks callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theSavedTopic). theSavedTopic is a KiiTopic instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiTopic instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     // assume topic is already instantiated.
-         *     topic.save({
-         *         success: function(topic) {
-         *             // Save topic succeeded.
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     // assume topic is already instantiated.
-         *     topic.save().then(
-         *         function(topic) {
-         *             // Save topic succeeded.
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        save(callbacks?: { success(topic: KiiTopic): any; failure(error: Error): any; }): Promise<KiiTopic>;
-
-        /**
-         * Send message to the topic.
-         *
-         * @param message to be sent.
-         * @param callbacks callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is an Array instance.
-         *       <ul>
-         *         <li>params[0] is the KiiTopic instance which this method was called on.</li>
-         *         <li>params[1] is the message object to send.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiTopic instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     // assume topic is already instantiated.
-         *     var contents = {
-         *         message : "hello push!"
-         *     };
-         *     var message = new KiiPushMessageBuilder(contents).build();
-         *     topic.sendMessage(message, {
-         *         success: function(topic, message) {
-         *             // Send message succeeded.
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     // assume topic is already instantiated.
-         *     var contents = {
-         *         message : "hello push!"
-         *     };
-         *     var message = new KiiPushMessageBuilder(contents).build();
-         *     topic.sendMessage(message).then(
-         *         function(params) {
-         *             // Send message succeeded.
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        sendMessage<T>(message: T, callbacks?: { success(topic: KiiTopic, message: T): any; failure(error: Error): any; }): Promise<[KiiTopic, T]>;
-
-        /**
-         * Delete the topic.
-         *
-         * @param callbacks callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theDeletedTopic). theDeletedTopic is a KiiTopic instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiTopic instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     // assume topic is already instantiated.
-         *     topic.deleteTopic({
-         *         success: function(topic) {
-         *             // Delete topic succeeded.
-         *         },
-         *         failure: function(error) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     // assume topic is already instantiated.
-         *     topic.deleteTopic().then(
-         *         function(topic) {
-         *             // Delete topic succeeded.
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        deleteTopic(callbacks?: { success(topic: KiiTopic): any; failure(error: Error): any; }): Promise<KiiTopic>;
-
-        /**
-         * Get ACL object of this topic.
-         * Access to topic can be configured by adding/removing KiiACLEntry
-         * to/from obtained acl object.
-         *
-         * @return acl object of this topic.
-         */
-        acl(): KiiACL;
-    }
-
-    /**
-     * Represents a KiiUser object
-     */
-    export class KiiUser {
-        /**
-         *
-         *
-         * @deprecated Use {@link KiiUser.getId} instead.
-         *   Get the UUID of the given user, assigned by the server
-         *
-         * @return
-         */
-        getUUID(): string;
-
-        /**
-         * Get the ID of the current KiiUser instance.
-         *
-         * @return Id of the user or null if the user has not saved to cloud.
-         */
-        getID(): string;
-
-        /**
-         * Get the username of the given user
-         *
-         * @return
-         */
-        getUsername(): string;
-
-        /**
-         * Return true if the user is disabled, false when enabled and undefined
-         * when user is not refreshed.
-         * Call {@link KiiUser#refresh()} prior calling this method to get
-         * correct status.
-         */
-        disabled(): void;
-
-        /**
-         * Get the display name associated with this user
-         *
-         * @return
-         */
-        getDisplayName(): string;
-
-        /**
-         * Set the display name associated with this user. Cannot be used for logging a user in; is non-unique
-         *
-         * @param value Must be between 1-50 alphanumeric characters.
-         *
-         * @throws If the displayName is not a valid format
-         */
-        setDisplayName(value: string): void;
-
-        /**
-         * Get whether or not the user is pseudo user.
-         * If this method is not called for current login user, calling
-         * {@link KiiUser#refresh()} method is necessary to get a correct value.
-         *
-         * @return whether this user is pseudo user or not.
-         */
-        isPseudoUser(): boolean;
-
-        /**
-         * Get the email address associated with this user
-         *
-         * @return
-         */
-        getEmailAddress(): string;
-
-        /**
-         * Get the phone number associated with this user
-         *
-         * @return
-         */
-        getPhoneNumber(): string;
-
-        /**
-         * Get the country code associated with this user
-         *
-         * @return
-         */
-        getCountry(): string;
-
-        /**
-         * Set the country code associated with this user
-         *
-         * @param value The country code to set. Must be 2 alphabetic characters. Ex: US, JP, CN
-         *
-         * @throws If the country code is not a valid format
-         */
-        setCountry(value: string): void;
-
-        /**
-         * Get the server's creation date of this user
-         *
-         * @return
-         */
-        getCreated(): string;
-
-        /**
-         *
-         *
-         * @deprecated Get the modified date of the given user, assigned by the server
-         *
-         * @return
-         */
-        getModified(): string;
-
-        /**
-         * Get the status of the user's email verification. This field is assigned by the server
-         *
-         * @return true if the user's email address has been verified by the user, false otherwise.
-         *     Could be undefined if haven't obtained value from server or not allowed to see the value.
-         *     Should be used by current login user to check the email verification status.
-         */
-        getEmailVerified(): boolean;
-
-        /**
-         * Get the status of the user's phone number verification. This field is assigned by the server
-         *
-         * @return true if the user's email address has been verified by the user, false otherwise
-         *     Could be undefined if haven't obtained value from server or not allowed to see the value.
-         *     Should be used by current login user to check the phone verification status.
-         */
-        getPhoneVerified(): boolean;
-
-        /**
-         * Get the social accounts that is linked to this user.
-         * Refresh the user by {@link KiiUser#refresh()} prior call the method.
-         * Otherwise, it returns empty object.
-         *
-         * @return Social network name as key and account info as value.
-         */
-        getLinkedSocialAccounts(): { [name: string]: KiiSocialAccountInfo };
-
-        /**
-         * Get the access token for the user - only available if the user is currently logged in
-         *
-         * @return
-         */
-        getAccessToken(): string;
-
-        /**
-         * Return the access token and token expire time in a object.
-         * <table border=4 width=250>
-         *   <tr>
-         *     <th>Key</th>
-         *     <th>Type</th>
-         *     <th>Value</th>
-         *   </tr>
-         *   <tr>
-         *     <td>"access_token"</td>
-         *     <td>String</td>
-         *     <td>required for accessing KiiCloud</td>
-         *   </tr>
-         *   <tr>
-         *     <td>"expires_at"</td>
-         *     <td>Date</td>
-         *     <td>Access token expiration time, null if the user is not login user.</td>
-         *   </tr>
-         * </table>
-         *
-         * @return Access token and token expires in a object.
-         */
-        getAccessTokenObject(): { access_token: string, expires_at: Date };
-
-        /**
-         * Get a specifically formatted string referencing the user
-         *
-         * <br><br>The user must exist in the cloud (have a valid UUID).
-         *
-         * @return A URI string based on the given user. null if a URI couldn't be generated.
-         *
-         * @example
-         *     var user = . . .; // a KiiUser
-         *     var uri = user.objectURI();
-         */
-        objectURI(): string;
-
-        /**
-         * Sets a key/value pair to a KiiUser
-         *
-         * <br><br>If the key already exists, its value will be written over. If the object is of invalid type, it will return false and a KiiError will be thrown (quietly). Accepted types are any JSON-encodable objects.
-         *
-         * @param key The key to set. The key must not be a system key (created, metadata, modified, type, uuid) or begin with an underscore (_)
-         * @param value The value to be set. Object must be of a JSON-encodable type (Ex: dictionary, array, string, number, etc)
-         *
-         * @example
-         *     var user = . . .; // a KiiUser
-         *     user.set("score", 4298);
-         */
-        set(key: string, value: any): void;
-
-        /**
-         * Gets the value associated with the given key
-         *
-         * @param key The key to retrieve
-         *
-         * @return The object associated with the key. null or undefined if none exists
-         *
-         * @example
-         *     var user = . . .; // a KiiUser
-         *     var score = user.get("score");
-         */
-        get<T>(key: string): T;
-
-        /**
-         * The currently authenticated user
-         *
-         * @return
-         *
-         * @example
-         *         var user = KiiUser.getCurrentUser();
-         */
-        static getCurrentUser(): KiiUser;
-
-        /**
-         * Create a user object to prepare for registration with credentials pre-filled
-         *
-         * <br><br>Creates an pre-filled user object for manipulation. This user will not be authenticated until one of the authentication methods are called on it. It can be treated as any other KiiObject before it is authenticated.
-         *
-         * @param username The user's desired username. Must be between 3 and 64 characters, which can include alphanumeric characters as well as underscores '_', dashes '-' and periods '.'
-         * @param password The user's password. Must be between 4-50 characters, made up of ascii characters excludes control characters.
-         *
-         * @return a working KiiUser object
-         *
-         * @throws If the username is not in the proper format
-         * @throws If the password is not in the proper format
-         *
-         * @example
-         *     var user = KiiUser.userWithUsername("myusername", "mypassword");
-         */
-        static userWithUsername(username: string, password: string): KiiUser;
-
-        /**
-         * Create a user object to prepare for registration with credentials pre-filled
-         *
-         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before it is registered.
-         *
-         * @param phoneNumber The user's phone number
-         * @param password The user's password. Must be at least 4 characters, made up of alphanumeric and/or: @,#,$,%,^,&
-         *
-         * @return a working KiiUser object
-         *
-         * @throws If the password is not in the proper format
-         * @throws If the phone number is not in the proper format
-         *
-         * @example
-         *     var user = KiiUser.userWithPhoneNumber("+874012345678", "mypassword");
-         */
-        static userWithPhoneNumber(phoneNumber: string, password: string): KiiUser;
-
-        /**
-         * Create a user object to prepare for registration with credentials pre-filled
-         *
-         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before it is registered.
-         *
-         * @param phoneNumber The user's phone number
-         * @param username The user's desired username. Must be between 3 and 64 characters, which can include alphanumeric characters as well as underscores '_', dashes '-' and periods '.'
-         * @param password The user's password. Must be at least 4 characters, made up of alphanumeric and/or: @,#,$,%,^,&
-         *
-         * @return a working KiiUser object
-         *
-         * @throws If the username is not in the proper format
-         * @throws If the password is not in the proper format
-         * @throws If the phone number is not in the proper format
-         *
-         * @example
-         *     var user = KiiUser.userWithPhoneNumberAndUsername("+874012345678", "johndoe", "mypassword");
-         */
-        static userWithPhoneNumberAndUsername(phoneNumber: string, username: string, password: string): KiiUser;
-
-        /**
-         * Create a user object to prepare for registration with credentials pre-filled
-         *
-         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before it is registered.
-         *
-         * @param emailAddress The user's email address
-         * @param password The user's password. Must be at least 4 characters, made up of alphanumeric and/or: @,#,$,%,^,&
-         *
-         * @return a working KiiUser object
-         *
-         * @throws If the password is not in the proper format
-         * @throws If the email address is not in the proper format
-         *
-         * @example
-         *     var user = KiiUser.userWithEmailAddress("johndoe@example.com", "mypassword");
-         */
-        static userWithEmailAddress(emailAddress: string, password: string): KiiUser;
-
-        /**
-         * Create a user object to prepare for registration with credentials pre-filled
-         *
-         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before it is registered.
-         *
-         * @param emailAddress The user's email address
-         * @param username The user's desired username. Must be between 3 and 64 characters, which can include alphanumeric characters as well as underscores '_', dashes '-' and periods '.'
-         * @param password The user's password. Must be at least 4 characters, made up of alphanumeric and/or: @,#,$,%,^,&
-         *
-         * @return a working KiiUser object
-         *
-         * @throws If the username is not in the proper format
-         * @throws If the password is not in the proper format
-         * @throws If the phone number is not in the proper format
-         *
-         * @example
-         *     var user = KiiUser.userWithEmailAddressAndUsername("johndoe@example.com", "johndoe", "mypassword");
-         */
-        static userWithEmailAddressAndUsername(emailAddress: string, username: string, password: string): KiiUser;
-
-        /**
-         * Create a user object to prepare for registration with credentials pre-filled
-         *
-         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before it is registered.
-         *
-         * @param emailAddress The user's email address
-         * @param phoneNumber The user's phone number
-         * @param password The user's password. Must be at least 4 characters, made up of alphanumeric and/or: @,#,$,%,^,&
-         *
-         * @return a working KiiUser object
-         *
-         * @throws If the phone number is not in the proper format
-         * @throws If the password is not in the proper format
-         * @throws If the phone number is not in the proper format
-         *
-         * @example
-         *     var user = KiiUser.userWithEmailAddressAndPhoneNumber("johndoe@example.com", "+874012345678", "mypassword");
-         */
-        static userWithEmailAddressAndPhoneNumber(emailAddress: string, phoneNumber: string, password: string): KiiUser;
-
-        /**
-         * Create a user object to prepare for registration with credentials pre-filled
-         *
-         * <br><br>Creates an pre-filled user object for registration. This user will not be authenticated until the registration method is called on it. It can be treated as any other KiiUser before it is registered.
-         *
-         * @param emailAddress The user's email address
-         * @param phoneNumber The user's phone number
-         * @param username The user's desired username. Must be between 3 and 64 characters, which can include alphanumeric characters as well as underscores '_', dashes '-' and periods '.'
-         * @param password The user's password. Must be at least 4 characters, made up of alphanumeric and/or: @,#,$,%,^,&
-         *
-         * @return a working KiiUser object
-         *
-         * @throws If the phone number is not in the proper format
-         * @throws If the phone number is not in the proper format
-         * @throws If the username is not in the proper format
-         * @throws If the password is not in the proper format
-         *
-         * @example
-         *     var user = KiiUser.userWithCredentials("johndoe@example.com", "+874012345678", "johndoe", "mypassword");
-         */
-        static userWithCredentials(emailAddress: string, phoneNumber: string, username: string, password: string): KiiUser;
-
-        /**
-         * Instantiate KiiUser that refers to existing user which has specified ID.
-         * You have to specify the ID of existing KiiUser. Unlike KiiObject,
-         * you can not assign ID in the client side.<br>
-         * <b>NOTE</b>: This API does not access to the server.
-         * After instantiation, call {@link KiiUser#refresh} to fetch the properties.
-         *
-         * @param userID ID of the KiiUser to instantiate.
-         *
-         * @return instance of KiiUser.
-         *
-         * @throws when passed userID is empty or null.
-         *
-         * @example
-         *     var user = new KiiUser.userWithID("__USER_ID__");
-         */
-        static userWithID(userID: string): KiiUser;
-
-        /**
-         * Generate a new KiiUser based on a given URI
-         *
-         * @param uri The URI of the object to be represented
-         *
-         * @return A new KiiUser with its parameters filled in from the URI
-         *
-         * @throws If the URI is not in the proper format
-         *
-         * @example
-         *     var user = new KiiUser.userWithURI("kiicloud://myuri");
-         */
-        static userWithURI(uri: string): KiiUser;
-
-        /**
-         * Creates a reference to a bucket for this user
-         *
-         * <br><br>The bucket will be created/accessed within this user's scope
-         *
-         * @param bucketName The name of the bucket the user should create/access
-         *
-         * @return A working KiiBucket object
-         *
-         * @example
-         *     var user = . . .; // a KiiUser
-         *     var bucket = user.bucketWithName("myBucket");
-         */
-        bucketWithName(bucketName: string): KiiBucket;
-
-        /**
-         * Creates a reference to a encrypted bucket for this user
-         *
-         * <br><br>The bucket will be created/accessed within this user's scope
-         *
-         * @param bucketName The name of the bucket the user should create/access
-         *
-         * @return A working KiiEncryptedBucket object
-         *
-         * @example
-         *     var user = . . .; // a KiiUser
-         *     var bucket = user.encryptedBucketWithName("myBucket");
-         */
-        encryptedBucketWithName(bucketName: string): KiiBucket;
-
-        /**
-         * Authenticates a user with the server.
-         * If authentication successful, the user is cached inside SDK as current user,and accessible via
-         * {@link KiiUser.getCurrentUser()}.
-         * User token and token expiration is also cached and can be get by {@link KiiUser#getAccessTokenObject()}.
-         * Access token won't be expired unless you set it explicitly by {@link Kii.setAccessTokenExpiration()}.<br>
-         * If password or userIdentifier is invalid, callbacks.failure or reject callback of promise will be called. <br>
-         *
-         * @param userIdentifier The username, validated email address, or validated phone number of the user to authenticate
-         * @param password The password of the user to authenticate
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theAuthenticatedUser). theAuthenticatedUser is KiiUser instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is a KiiUser instance.If given password or userIdentifier is invalid, it will be null.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     KiiUser.authenticate("myusername", "mypassword", {
-         *         success: function(theAuthenticatedUser) {
-         *             // do something with the authenticated user
-         *         },
-         *
-         *         failure: function(theUser, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     KiiUser.authenticate("myusername", "mypassword").then(
-         *         function(theAuthenticatedUser) {
-         *             // do something with the authenticated user
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        static authenticate(userIdentifier: string, password: string, callbacks?: { success(theAuthenticatedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
-
-        /**
-         * Asynchronously authenticates a user with the server using specified access token.
-         * This method is non-blocking.<br><br>
-         * Specified expiresAt won't be used by SDK. IF login successful,
-         * we set this property so that you can get it later along with token
-         * by {@link KiiUser#getAccessTokenObject()}.<br>
-         * Also, if successful, the user is cached inside SDK as current user
-         * and accessible via {@link KiiUser.getCurrentUser()}.<br>
-         *
-         * Note that, if not specified, token expiration time is not cached
-         * and set to value equivalant to 275760 years.<br>
-         *
-         * If the specified token is expired, authenticataiton will be failed.
-         * Authenticate the user again to renew the token.<br>
-         *
-         * If expiresAt is invalid, callbacks.failure or reject callback of promise will be called. <br>
-         *
-         * @param accessToken A valid access token associated with the desired user
-         * @param callbacks An object with callback methods defined
-         * @param expiresAt Access token expire time that has received by {@link KiiUser#getAccessTokenObject()}. This param is optional and can be omitted.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theAuthenticatedUser). theAuthenticatedUser is KiiUser instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is a KiiUser instance.If expiresAt is invalid, it will be null.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     // Assume you stored the object get from KiiUser#getAccessTokenObject()
-         *     // and now accessing by 'tokenObject' var.
-         *     var token = tokenObject["access_token"];
-         *     var expiresAt = tokenObject["expires_at"];
-         *     expireDate.setHours(expireDate.getHours() + 24);
-         *     KiiUser.authenticateWithToken(token, {
-         *         success: function(theAuthenticatedUser) {
-         *             // do something with the authenticated user
-         *         },
-         *
-         *         failure: function(theUser, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     }, expiresAt);
-         *
-         *     // example to use Promise
-         *     // Assume you stored the object get from KiiUser#getAccessTokenObject()
-         *     // and now accessing by 'tokenObject' var.
-         *     var token = tokenObject["access_token"];
-         *     var expiresAt = tokenObject["expires_at"];
-         *     expireDate.setHours(expireDate.getHours() + 24);
-         *     KiiUser.authenticateWithToken(token, null, expiresAt).then(
-         *         function(theAuthenticatedUser) {
-         *             // do something with the authenticated user
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        static authenticateWithToken(accessToken: string, callbacks?: { success(theAuthenticatedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }, expiresAt?: Date): Promise<KiiUser>;
-
-        /**
-         * Registers a user with the server
-         *
-         * <br><br>The user object must have an associated email/password combination.
-         *
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theAuthenticatedUser). theAuthenticatedUser is KiiUser instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is a KiiUser instance.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var user = KiiUser.userWithUsername("myusername", "mypassword");
-         *     user.register({
-         *         success: function(theAuthenticatedUser) {
-         *             // do something with the authenticated user
-         *         },
-         *
-         *         failure: function(theUser, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var user = KiiUser.userWithUsername("myusername", "mypassword");
-         *     user.register().then(
-         *         function(params) {
-         *             // do something with the authenticated user
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        register(callbacks?: { success(theAuthenticatedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
-
-        /**
-         * Registers a user as pseudo user with the server
-         *
-         * @param callbacks An object with callback methods defined.
-         *   This argument is mandatory and can't be ommited.
-         * @param userFields Custom Fields to add to the user. This is optional and can be omitted.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theAuthenticatedUser). theAuthenticatedUser is KiiUser instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var userFields = {"displayName":"yourName", "country":"JP", "age":30};
-         *     KiiUser.registerAsPseudoUser({
-         *         success: function(theAuthenticatedUser) {
-         *             // do something with the authenticated user
-         *         },
-         *
-         *         failure: function(theUser, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     }, userFields);
-         *
-         *     // example to use Promise
-         *     var userFields = {"displayName":"yourName", "country":"JP", "age":30};
-         *     KiiUser.registerAsPseudoUser(null, userFields).then(
-         *         function(theAuthenticatedUser) {
-         *             // do something with the authenticated user
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        static registerAsPseudoUser(callbacks?: { success(theAuthenticatedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }, userFields?: any): Promise<KiiUser>;
-
-        /**
-         * Sets credentials data and custom fields to pseudo user.
-         *
-         * <br><br>This method is exclusive to pseudo user.
-         * <br>password is mandatory and needs to provide at least one of login name, email address or phone number.
-         *
-         * @param identityData
-         * @param password The user's password. Valid pattern is ^[\x20-\x7E]{4,50}$.
-         * @param callbacks An object with callback methods defined.
-         *   This argument is mandatory and can't be ommited.
-         * @param userFields Custom Fields to add to the user. This is optional and can be omitted.
-         * @param removeFields An array of field names to remove from the user custom fields. Default fields are not removed from server.
-         *   This is optional and can be omitted.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(user). user is KiiUser instance which this method was called on.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiUser instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var identityData = { "username": "__USER_NAME_" };
-         *     var userFields = { "displayName":"__DISPLAY_NAME","score":12344300 };
-         *     var removeFields = ["age"];
-         *     user.putIdentity(
-         *         identityData,
-         *         "__PASSWORD__",
-         *         {
-         *             success: function(user) {
-         *               // do something with the updated user.
-         *             },
-         *             failure: function(user, errorString) {
-         *               // check error response.
-         *             }
-         *         },
-         *         userFields,
-         *         removeFields
-         *     );
-         *
-         *     // example to use Promise
-         *     var identityData = { "username": "__USER_NAME_" };
-         *     var userFields = { "displayName":"__DISPLAY_NAME","score":12344300 };
-         *     var removeFields = ["age"];
-         *     user.putIdentity(
-         *         identityData,
-         *         "__PASSWORD__",
-         *         null,
-         *         userFields,
-         *         removeFields
-         *     ).then(
-         *         function(user) {
-         *             // do something with the updated user.
-         *         },
-         *         function(error) {
-         *             // check error response.
-         *         }
-         *     );
-         */
-        putIdentity(identityData: identityData, password: string, callbacks?: { success(user: KiiUser): any; failure(user: KiiUser, errorString: string): any; }, userFields?: any, removeFields?: string[]): Promise<KiiUser>;
-
-        /**
-         * Update user attributes.
-         *
-         *
-         * <br><br>If you want to update identity data of pseudo user, you must use KiiUser.putIdentity instead.
-         *
-         * @param identityData
-         * @param callbacks An object with callback methods defined.
-         *   This argument is mandatory and can't be ommited.
-         * @param userFields Custom Fields to add to the user.
-         * @param removeFields An array of field names to remove from the user custom fields. Default fields are not removed from server.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(user). user is KiiUser instance which this method was called on.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is a KiiUser instance.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var identityData = { "username": "__USER_NAME_" };
-         *     var userFields = { "displayName":"__DISPLAY_NAME","score":12344300 };
-         *     var removeFields = ["age"];
-         *     user.update(
-         *         identityData,
-         *         {
-         *             success: function(user) {
-         *               // do something with the updated user.
-         *             },
-         *             failure: function(user, errorString) {
-         *               // check error response.
-         *             }
-         *         },
-         *         userFields,
-         *         removeFields
-         *     );
-         *
-         *     // example to use Promise
-         *     var identityData = { "username": "__USER_NAME_" };
-         *     var userFields = { "displayName":"__DISPLAY_NAME","score":12344300 };
-         *     var removeFields = ["age"];
-         *     user.update(
-         *         identityData,
-         *         null,
-         *         userFields,
-         *         removeFields
-         *     ).then(
-         *         function(user) {
-         *             // do something with the updated user.
-         *         },
-         *         function(error) {
-         *             // check error response.
-         *         }
-         *     );
-         */
-        update(identityData: identityData, callbacks?: { success(user: KiiUser): any; failure(user: KiiUser, errorString: string): any; }, userFields?: any, removeFields?: string[]): Promise<KiiUser>;
-
-        /**
-         * Update a user's password on the server
-         *
-         * <br><br>Update a user's password with the server. The fromPassword must be equal to the current password associated with the account in order to succeed.
-         *
-         * @param fromPassword The user's current password
-         * @param toPassword The user's desired password. Must be at least 4 characters, made up of alphanumeric and/or: @,#,$,%,^,&
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theUser). theUser is KiiUser instance which this method was called on.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiUser instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var user = Kii.currentUser();
-         *     user.updatePassword("oldpassword", "newpassword", {
-         *         success: function(theUser) {
-         *             // do something
-         *         },
-         *
-         *         failure: function(theUser, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var user = Kii.currentUser();
-         *     user.updatePassword("oldpassword", "newpassword").then(
-         *         function(theUser) {
-         *             // do something
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        updatePassword(fromPassword: string, toPassword: string, callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
-
-        /**
-         * Reset a user's password on the server
-         *
-         * <br><br>Reset a user's password on the server. The user is determined by the specified userIdentifier - which is an email address that has already been associated with an account. Reset instructions will be sent to that identifier.
-         * <br><br><b>Please Note:</b> This will reset the user's access token, so if they are currently logged in - their session will no longer be valid.
-         *
-         * @param userIdentifier The user's email address
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(). No parameter used.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     KiiUser.resetPassword("johndoe@example.com", {
-         *         success: function() {
-         *             // do something
-         *         },
-         *
-         *         failure: function(anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     KiiUser.resetPassword("johndoe@example.com").then(
-         *         function() {
-         *             // do something
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        static resetPassword(userIdentifier: string, callbacks?: { success(): any; failure(anErrorString: string): any; }): Promise<void>;
-
-        /**
-         * Reset the password of user <br>
-         * Reset the password of user specified by given identifier. <br>
-         * This api does not execute login after reset password.
-         *
-         * @param userIdentifier should be valid email address,
-         *   global phone number or user identifier obtained by {@link #getID}.
-         * @param notificationMethod specify the destination of message include link
-         *   of resetting password. must be "EMAIL" or "SMS".
-         *   different type of identifier and destination can be used
-         *   as long as user have verified email, phone.
-         *   (ex. User registers both email and phone. Identifier is email and
-         *   notificationMethod is SMS.)
-         * @param callbacks object includes callback functions.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(). No parameter used.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     KiiUser.resetPasswordWithNotificationMethod("+819001234567", "SMS", {
-         *         success: function() {
-         *             // Operation succeeded.
-         *         },
-         *         failure: function(errString) {
-         *             // Handle error.
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     KiiUser.resetPasswordWithNotificationMethod("+819001234567", "SMS").then(
-         *         function() {
-         *             // Operation succeeded.
-         *         },
-         *         function(error) {
-         *             // Handle error.
-         *         }
-         *     );
-         */
-        static resetPasswordWithNotificationMethod(userIdentifier: string, notificationMethod: string, callbacks?: { success(): any; failure(errString: string): any; }): Promise<void>;
-
-        /**
-         * Verify the current user's phone number
-         * <br><br>This method is used to verify the phone number of user currently
-         * logged in.<br>
-         * Verification code is sent from Kii Cloud when new user is registered with
-         * phone number or user requested to change their phone number in the
-         * application which requires phone verification.<br>
-         * (You can enable/disable phone verification through the console in
-         * developer.kii.com)<br>
-         * After the verification succeeded, new phone number becomes users phone
-         * number and user is able to login with the phone number.<br>
-         * To get the new phone number, please call {@link #refresh()} and call
-         * {@link #getPhoneNumber()}<br>
-         * Before completion of {@link #refresh()}, {@link #getPhoneNumber()} returns
-         * cached phone number. It could be old phone number or undefined.
-         *
-         * @param verificationCode The code which verifies the currently logged in user
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theUser). theUser is KiiUser instance which this method was called on.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiUser instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var user = Kii.currentUser();
-         *     user.verifyPhoneNumber("012345", {
-         *         success: function(theUser) {
-         *             // do something
-         *         },
-         *
-         *         failure: function(theUser, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var user = Kii.currentUser();
-         *     user.verifyPhoneNumber("012345").then(
-         *         function(theUser) {
-         *             // do something
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        verifyPhoneNumber(verificationCode: string, callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
-
-        /**
-         * Resend the email verification code to the user
-         *
-         * <br><br>This method will re-send the email verification to the currently logged in user
-         *
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theUser). theUser is KiiUser instance which this method was called on.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiUser instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var user = Kii.currentUser();
-         *     user.resendEmailVerification({
-         *         success: function(theUser) {
-         *             // do something
-         *         },
-         *
-         *         failure: function(theUser, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var user = Kii.currentUser();
-         *     user.resendEmailVerification().then(
-         *         function(theUser) {
-         *             // do something
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        resendEmailVerification(callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
-
-        /**
-         * Resend the SMS verification code to the user
-         *
-         * <br><br>This method will re-send the SMS verification to the currently logged in user
-         *
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theUser). theUser is KiiUser instance which this method was called on.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiUser instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var user = Kii.currentUser();
-         *     user.resendPhoneNumberVerification({
-         *         success: function(theUser) {
-         *             // do something
-         *         },
-         *
-         *         failure: function(theUser, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var user = Kii.currentUser();
-         *     user.resendPhoneNumberVerification().then(
-         *         function(theUser) {
-         *             // do something
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        resendPhoneNumberVerification(callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
-
-        /**
-         * Retrieve a list of groups which the user is a member of
-         *
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is Array instance.
-         *       <ul>
-         *         <li>params[0] is the KiiUser instance which this method was called on.</li>
-         *         <li>params[1] is array of KiiGroup instances.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiUser instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var user = Kii.currentUser();
-         *     user.memberOfGroups({
-         *         success: function(theUser, groupList) {
-         *             // do something with the results
-         *             for(var i=0; i&lt;groupList.length; i++) {
-         *                 var g = groupList[i]; // a KiiGroup object
-         *             }
-         *         },
-         *
-         *         failure: function(theUser, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var user = Kii.currentUser();
-         *     user.memberOfGroups().then(
-         *         function(params) {
-         *             // do something with the results
-         *             var theUser = params[0];
-         *             var groupList = params[1];
-         *             for(var i=0; i&lt;groupList.length; i++) {
-         *                 var g = groupList[i]; // a KiiGroup object
-         *             }
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        memberOfGroups(callbacks?: { success(theUser: KiiUser, groupList: KiiGroup[]): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<[KiiUser, KiiGroup[]]>;
-
-        /**
-         * Retrieve the groups owned by this user. Group in the groupList
-         * does not contain all the property of group. To get all the
-         * property from cloud, a {@link KiiGroup#refresh(callback)} is necessary.
-         *
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(params). params is Array instance.
-         *       <ul>
-         *         <li>params[0] is the KiiUser instance which this method was called on.</li>
-         *         <li>params[1] is array of KiiGroup instances.</li>
-         *       </ul>
-         *     </li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiUser instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var user = Kii.currentUser();
-         *     user.ownerOfGroups({
-         *         success: function(theUser, groupList) {
-         *             // do something with the results
-         *             for(var i=0; i&lt;groupList.length; i++) {
-         *                 var g = groupList[i]; // a KiiGroup object
-         *             }
-         *         },
-         *
-         *         failure: function(theUser, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var user = Kii.currentUser();
-         *     user.ownerOfGroups().then(
-         *         function(params) {
-         *             // do something with the results
-         *             var theUser = params[0];
-         *             var groupList = params[1];
-         *             for(var i=0; i&lt;groupList.length; i++) {
-         *                 var g = groupList[i]; // a KiiGroup object
-         *             }
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        ownerOfGroups(callbacks?: { success(theUser: KiiUser, groupList: KiiGroup[]): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<[KiiUser, KiiGroup[]]>;
-
-        /**
-         * Updates the user's phone number on the server
-         *
-         * @param newPhoneNumber The new phone number to change to
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theUser). theUser is KiiUser instance which this method was called on.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiUser instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var user = Kii.currentUser();
-         *     user.changePhone('+19415551234', {
-         *         success: function(theUser) {
-         *             // do something on success
-         *         },
-         *
-         *         failure: function(theUser, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var user = Kii.currentUser();
-         *     user.changePhone('+19415551234').then(
-         *         function(theUser) {
-         *             // do something on success
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        changePhone(newPhoneNumber: string, callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
-
-        /**
-         * Updates the user's email address on the server
-         *
-         * @param newEmail The new email address to change to
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theUser). theUser is KiiUser instance which this method was called on.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiUser instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var user = Kii.currentUser();
-         *     user.changeEmail('mynewemail@kii.com', {
-         *         success: function(theUser) {
-         *             // do something on success
-         *         },
-         *
-         *         failure: function(theUser, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var user = Kii.currentUser();
-         *     user.changeEmail('mynewemail@kii.com').then(
-         *         function(theUser) {
-         *             // do something on success
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        changeEmail(newEmail: string, callbacks?: { success(theUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
-
-        /**
-         * Saves the latest user values to the server
-         *
-         * <br><br>If the user does not yet exist, it will NOT be created. Otherwise, the fields that have changed will be updated accordingly.
-         *
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theSavedUser). theSavedUser is KiiUser instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiUser instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var user = Kii.getCurrentUser(); // a KiiUser
-         *     user.save({
-         *         success: function(theSavedUser) {
-         *             // do something with the saved user
-         *         },
-         *
-         *         failure: function(theUser, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var user = Kii.getCurrentUser(); // a KiiUser
-         *     user.save().then(
-         *         function(theSavedUser) {
-         *             // do something with the saved user
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        save(callbacks?: { success(theSavedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
-
-        /**
-         * Updates the local user's data with the user data on the server
-         *
-         * <br><br>The user must exist on the server. Local data will be overwritten.
-         *
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theRefreshedUser). theRefreshedUser is KiiUser instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiUser instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var user = Kii.getCurrentUser(); // a KiiUser
-         *     user.refresh({
-         *         success: function(theRefreshedUser) {
-         *             // do something with the refreshed user
-         *         },
-         *
-         *         failure: function(theUser, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var user = Kii.getCurrentUser(); // a KiiUser
-         *     user.refresh().then(
-         *         function(theRefreshedUser) {
-         *             // do something with the refreshed user
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        refresh(callbacks?: { success(theRefreshedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
-
-        /**
-         * Delete the user from the server
-         *
-         * @param callbacks An object with callback methods defined
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theDeletedUser). theDeletedUser is KiiUser instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.target is the KiiUser instance which this method was called on.</li>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var user = Kii.getCurrentUser(); // a KiiUser
-         *     user['delete']({
-         *         success: function(theDeletedUser) {
-         *             // do something
-         *         },
-         *
-         *         failure: function(theUser, anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     var user = Kii.getCurrentUser(); // a KiiUser
-         *     user['delete']().then(
-         *         function(theDeletedUser) {
-         *             // do something
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        delete(callbacks?: { success(theDeletedUser: KiiUser): any; failure(theUser: KiiUser, anErrorString: string): any; }): Promise<KiiUser>;
-
-        /**
-         * Logs the currently logged-in user out of the KiiSDK
-         *
-         * @example
-         *         KiiUser.logOut();
-         */
-        static logOut(): void;
-
-        /**
-         * Checks to see if there is a user authenticated with the SDK
-         *
-         * @example
-         *         if(KiiUser.loggedIn()) {
-         *             // do something
-         *         }
-         */
-        static loggedIn(): boolean;
-
-        /**
-         * Find registered KiiUser with the email.<br>
-         * If there are no user registers with the specified email or if there are but not verified email yet,
-         * callbacks.failure or reject callback of promise will be called.<br>
-         * <br><br>
-         * <b>Note:</b>
-         * <ul>
-         * <li>If "Expose Full User Data To Others" is enabled in the application console, the response will contain full of the user data.</li>
-         * <li>Otherwise, the response will only contain "userID", "loginName" and "displayName" field values if exist.</li>
-         * </ul>
-         *
-         * @param email The email to find KiiUser who owns it.<br>
-         *   Don't add prefix of "EMAIL:" described in REST API documentation. SDK will take care of it.
-         * @param callbacks An object with callback methods defined.
-         *   This argument is mandatory and can't be ommited.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theMatchedUser). theMatchedUser is KiiUser instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     KiiUser.findUserByEmail("user_to_find@example.com", {
-         *         success: function(theMatchedUser) {
-         *             // Do something with the found user
-         *         },
-         *         failure: function(anErrorString) {
-         *             // Do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     KiiUser.findUserByEmail("user_to_find@example.com").then(
-         *         function(theMatchedUser) {
-         *             // Do something with the matched user
-         *         },
-         *         function(error) {
-         *             // Do something with the error response
-         *         }
-         *     );
-         */
-        static findUserByEmail(email: string, callbacks?: { success(theMatchedUser: KiiUser): any; failure(anErrorString: string): any; }): Promise<KiiUser>;
-
-        /**
-         * Find registered KiiUser with the phone.<br>
-         * If there are no user registers with the specified phone or if there are but not verified phone yet,
-         * callbacks.failure or reject callback of promise will be called.
-         * <br><br>
-         * <b>Note:</b>
-         * <ul>
-         * <li>If "Expose Full User Data To Others" is enabled in the application console, the response will contain full of the user data.</li>
-         * <li>Otherwise, the response will only contain "userID", "loginName" and "displayName" field values if exist.</li>
-         * </ul>
-         *
-         * @param phone The phone number to find KiiUser who owns it.<br>
-         *   Don't add prefix of "PHONE:" described in REST API documentation. SDK will take care of it.
-         * @param callbacks An object with callback methods defined.
-         *   This argument is mandatory and can't be ommited.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theMatchedUser). theMatchedUser is KiiUser instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     KiiUser.findUserByPhone("phone_number_to_find", {
-         *         success: function(theMatchedUser) {
-         *             // Do something with the found user
-         *         },
-         *         failure: function(anErrorString) {
-         *             // Do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     KiiUser.findUserByPhone("phone_number_to_find").then(
-         *         function(theMatchedUser) {
-         *             // Do something with the matched user
-         *         },
-         *         function(error) {
-         *             // Do something with the error response
-         *         }
-         *     );
-         */
-        static findUserByPhone(phone: string, callbacks?: { success(theMatchedUser: KiiUser): any; failure(anErrorString: string): any; }): Promise<KiiUser>;
-
-        /**
-         * Find registered KiiUser with the user name.<br>
-         * If there are no user registers with the specified user name, callbacks.failure or reject callback of promise will be called.
-         * <br><br>
-         * <b>Note:</b>
-         * <ul>
-         * <li>If "Expose Full User Data To Others" is enabled in the application console, the response will contain full of the user data.</li>
-         * <li>Otherwise, the response will only contain "userID", "loginName" and "displayName" field values if exist.</li>
-         * </ul>
-         *
-         * @param username The user name to find KiiUser who owns it.<br>
-         *   Don't add prefix of "LOGIN_NAME:" described in REST API documentation. SDK will take care of it.
-         * @param callbacks An object with callback methods defined.
-         *   This argument is mandatory and can't be ommited.
-         *
-         * @return return promise object.
-         *   <ul>
-         *     <li>fulfill callback function: function(theMatchedUser). theMatchedUser is KiiUser instance.</li>
-         *     <li>reject callback function: function(error). error is an Error instance.
-         *       <ul>
-         *         <li>error.message</li>
-         *       </ul>
-         *     </li>
-         *   </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     KiiUser.findUserByUsername("user_name_to_find", {
-         *         success: function(theMatchedUser) {
-         *             // Do something with the found user
-         *         },
-         *         failure: function(anErrorString) {
-         *             // Do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use Promise
-         *     KiiUser.findUserByUsername("user_name_to_find").then(
-         *         function(theMatchedUser) {
-         *             // Do something with the matched user
-         *         },
-         *         function(error) {
-         *             // Do something with the error response
-         *         }
-         *     );
-         */
-        static findUserByUsername(username: string, callbacks?: { success(theMatchedUser: KiiUser): any; failure(anErrorString: string): any; }): Promise<KiiUser>;
-
-        /**
-         * Instantiate topic belongs to this user.
-         *
-         * @param topicName name of the topic. Must be a not empty string.
-         *
-         * @return topic instance.
-         */
-        topicWithName(topicName: string): KiiTopic;
-
-        /**
-         * Gets a list of topics in this user scope
-         *
-         * @param callbacks An object with callback methods defined
-         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success. If empty string or no string object is provided, this API regards no paginationKey specified.
-         *
-         * @return return promise object.
-         *     <ul>
-         *       <li>fulfill callback function: function(params). params is Array instance.
-         *         <ul>
-         *           <li>params[0] is array of KiiTopic instances.</li>
-         *           <li>params[1] is string of nextPaginationKey.</li>
-         *         </ul>
-         *       </li>
-         *       <li>reject callback function: function(error). error is an Error instance.
-         *         <ul>
-         *           <li>error.target is the KiiUser instance which this method was called on. </li>
-         *           <li>error.message</li>
-         *         </ul>
-         *       </li>
-         *     </ul>
-         *
-         * @example
-         *     // example to use callbacks directly
-         *     var user = . . .; // a KiiUser
-         *     user.listTopics({
-         *         success: function(topicList, nextPaginationKey) {
-         *             // do something with the result
-         *             for(var i=0; i&lt;topicList.length; i++){
-         *                 var topic = topicList[i];
-         *             }
-         *             if (nextPaginationKey != null) {
-         *                 user.listTopics({
-         *                     success: function(topicList, nextPaginationKey) {...},
-         *                     failure: function(anErrorString) {...}
-         *                 }, nextPaginationKey);
-         *             }
-         *         },
-         *         failure: function(anErrorString) {
-         *             // do something with the error response
-         *         }
-         *     });
-         *
-         *     // example to use callbacks directly
-         *     var user = . . .; // a KiiUser
-         *     user.listTopics().then(
-         *         function(params) {
-         *             var topicList = params[0];
-         *             var nextPaginationKey = params[1];
-         *             // do something with the result
-         *             for(var i=0; i&lt;topicList.length; i++){
-         *                 var topic = topicList[i];
-         *             }
-         *             if (nextPaginationKey != null) {
-         *                 user.listTopics(null, nextPaginationKey).then(
-         *                     function(params) {...},
-         *                     function(error) {...}
-         *                 );
-         *             }
-         *         },
-         *         function(error) {
-         *             // do something with the error response
-         *         }
-         *     );
-         */
-        listTopics(callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; }, paginationKey?: string): Promise<[KiiTopic[], string]>;
-
-        /**
-         * Instantiate push subscription for this user.
-         *
-         * @return push subscription object.
-         */
-        pushSubscription(): KiiPushSubscription;
-    }
-}
-
-import KiiACLAction = KiiCloud.KiiACLAction;
-import KiiSite = KiiCloud.KiiSite;
-import KiiAnalyticsSite = KiiCloud.KiiAnalyticsSite;
-import KiiSocialNetworkName = KiiCloud.KiiSocialNetworkName;
-import Kii = KiiCloud.Kii;
-import KiiACL = KiiCloud.KiiACL;
-import KiiACLEntry = KiiCloud.KiiACLEntry;
-import KiiAnalytics = KiiCloud.KiiAnalytics;
-import KiiAnonymousUser = KiiCloud.KiiAnonymousUser;
-import KiiAnyAuthenticatedUser = KiiCloud.KiiAnyAuthenticatedUser;
-import KiiAppAdminContext = KiiCloud.KiiAppAdminContext;
-import KiiBucket = KiiCloud.KiiBucket;
-import KiiClause = KiiCloud.KiiClause;
-import KiiGeoPoint = KiiCloud.KiiGeoPoint;
-import KiiGroup = KiiCloud.KiiGroup;
-import KiiObject = KiiCloud.KiiObject;
-import KiiPushMessageBuilder = KiiCloud.KiiPushMessageBuilder;
-import KiiPushSubscription = KiiCloud.KiiPushSubscription;
-import KiiQuery = KiiCloud.KiiQuery;
-import KiiServerCodeEntry = KiiCloud.KiiServerCodeEntry;
-import KiiServerCodeExecResult = KiiCloud.KiiServerCodeExecResult;
-import KiiSocialConnect = KiiCloud.KiiSocialConnect;
-import KiiThing = KiiCloud.KiiThing;
-import KiiTopic = KiiCloud.KiiTopic;
-import KiiUser = KiiCloud.KiiUser;
diff --git a/kii-cloud-sdk/tsconfig.json b/kii-cloud-sdk/tsconfig.json
new file mode 100644
index 0000000000..31793b1579
--- /dev/null
+++ b/kii-cloud-sdk/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "kii-cloud-sdk-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/kineticjs/kineticjs.d.ts b/kineticjs/index.d.ts
similarity index 100%
rename from kineticjs/kineticjs.d.ts
rename to kineticjs/index.d.ts
diff --git a/kineticjs/kineticjs-tests.ts b/kineticjs/kineticjs-tests.ts
index 5b0077c433..4176067eb3 100644
--- a/kineticjs/kineticjs-tests.ts
+++ b/kineticjs/kineticjs-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="kineticjs.d.ts"/>
-
 // http://www.html5canvastutorials.com/kineticjs/html5-canvas-kineticjs-rect-tutorial/
 namespace RectTutorial {
     var stage = new Kinetic.Stage({
diff --git a/kineticjs/tsconfig.json b/kineticjs/tsconfig.json
new file mode 100644
index 0000000000..06ab872753
--- /dev/null
+++ b/kineticjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "kineticjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/knex/index.d.ts b/knex/index.d.ts
new file mode 100644
index 0000000000..261f13e89d
--- /dev/null
+++ b/knex/index.d.ts
@@ -0,0 +1,497 @@
+// Type definitions for Knex.js
+// Project: https://github.com/tgriesser/knex
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// <reference types="bluebird" />
+/// <reference types="node" />
+
+
+// import Promise = require("bluebird");
+import * as events from "events";
+
+type Callback = Function;
+type Client = Function;
+type Value = string | number | boolean | Date;
+type ColumnName = string | Knex.Raw | Knex.QueryBuilder;
+
+interface Knex extends Knex.QueryInterface {
+    (tableName?: string): Knex.QueryBuilder;
+    VERSION: string;
+    __knex__: string;
+
+    raw: Knex.RawBuilder;
+    transaction: <R>(transactionScope: ((trx: Knex.Transaction) => void)) => Promise<any>;
+    destroy(callback: Function): void;
+    destroy(): Promise<void>;
+
+    schema: Knex.SchemaBuilder;
+
+    client: any;
+    migrate: any;
+    seed: any;
+    fn: any;
+}
+
+declare function Knex(config: Knex.Config): Knex;
+
+declare namespace Knex {
+    //
+    // QueryInterface
+    //
+
+    interface QueryInterface {
+        select: Select;
+        as: As;
+        columns: Select;
+        column: Select;
+        from: Table;
+        into: Table;
+        table: Table;
+        distinct: Distinct;
+
+        // Joins
+        join: Join;
+        joinRaw: JoinRaw;
+        innerJoin: Join;
+        leftJoin: Join;
+        leftOuterJoin: Join;
+        rightJoin: Join;
+        rightOuterJoin: Join;
+        outerJoin: Join;
+        fullOuterJoin: Join;
+        crossJoin: Join;
+
+        // Wheres
+        where: Where;
+        andWhere: Where;
+        orWhere: Where;
+        whereRaw: WhereRaw;
+        whereWrapped: WhereWrapped;
+        havingWrapped: WhereWrapped;
+        orWhereRaw: WhereRaw;
+        whereExists: WhereExists;
+        orWhereExists: WhereExists;
+        whereNotExists: WhereExists;
+        orWhereNotExists: WhereExists;
+        whereIn: WhereIn;
+        orWhereIn: WhereIn;
+        whereNotIn: WhereIn;
+        orWhereNotIn: WhereIn;
+        whereNull: WhereNull;
+        orWhereNull: WhereNull;
+        whereNotNull: WhereNull;
+        orWhereNotNull: WhereNull;
+        whereBetween: WhereBetween;
+        whereNotBetween: WhereBetween;
+        orWhereBetween: WhereBetween;
+        orWhereNotBetween: WhereBetween;
+
+        // Group by
+        groupBy: GroupBy;
+        groupByRaw: RawQueryBuilder;
+
+        // Order by
+        orderBy: OrderBy;
+        orderByRaw: RawQueryBuilder;
+
+        // Union
+        union: Union;
+        unionAll(callback: Function): QueryBuilder;
+
+        // Having
+        having: Having;
+        havingRaw: RawQueryBuilder;
+        orHaving: Having;
+        orHavingRaw: RawQueryBuilder;
+
+        // Paging
+        offset(offset: number): QueryBuilder;
+        limit(limit: number): QueryBuilder;
+
+        // Aggregation
+        count(columnName?: string): QueryBuilder;
+        min(columnName: string): QueryBuilder;
+        max(columnName: string): QueryBuilder;
+        sum(columnName: string): QueryBuilder;
+        avg(columnName: string): QueryBuilder;
+        increment(columnName: string, amount?: number): QueryBuilder;
+        decrement(columnName: string, amount?: number): QueryBuilder;
+
+        // Others
+        first(...columns: string[]): QueryBuilder;
+
+        debug(enabled?: boolean): QueryBuilder;
+        pluck(column: string): QueryBuilder;
+
+        insert(data: any, returning?: string | string[]): QueryBuilder;
+        update(data: any, returning?: string | string[]): QueryBuilder;
+        update(columnName: string, value: Value, returning?: string | string[]): QueryBuilder;
+        returning(column: string): QueryBuilder;
+
+        del(returning?: string | string[]): QueryBuilder;
+        delete(returning?: string | string[]): QueryBuilder;
+        truncate(): QueryBuilder;
+
+        transacting(trx: Transaction): QueryBuilder;
+        connection(connection: any): QueryBuilder;
+
+        clone(): QueryBuilder;
+    }
+
+    interface As {
+        (columnName: string): QueryBuilder;
+    }
+
+    interface Select extends ColumnNameQueryBuilder {
+    }
+
+    interface Table {
+        (tableName: string): QueryBuilder;
+        (callback: Function): QueryBuilder;
+    }
+
+    interface Distinct extends ColumnNameQueryBuilder {
+    }
+
+    interface Join {
+        (raw: Raw): QueryBuilder;
+        (tableName: string, callback: Function): QueryBuilder;
+        (tableName: string, column1: string, column2: string): QueryBuilder;
+        (tableName: string, column1: string, raw: Raw): QueryBuilder;
+        (tableName: string, column1: string, operator: string, column2: string): QueryBuilder;
+    }
+
+    interface JoinRaw {
+        (tableName: string, binding?: Value): QueryBuilder;
+    }
+
+    interface Where extends WhereRaw, WhereWrapped, WhereNull {
+        (object: Object): QueryBuilder;
+        (columnName: string, value: Value): QueryBuilder;
+        (columnName: string, operator: string, value: Value): QueryBuilder;
+        (columnName: string, operator: string, query: QueryBuilder): QueryBuilder;
+    }
+
+    interface WhereRaw extends RawQueryBuilder {
+        (condition: boolean): QueryBuilder;
+    }
+
+    interface WhereWrapped {
+        (callback: Function): QueryBuilder;
+    }
+
+    interface WhereNull {
+        (columnName: string): QueryBuilder;
+    }
+
+    interface WhereIn {
+        (columnName: string, values: Value[]): QueryBuilder;
+        (columnName: string, callback: Function): QueryBuilder;
+        (columnName: string, query: QueryBuilder): QueryBuilder;
+    }
+
+    interface WhereBetween {
+        (columnName: string, range: [Value, Value]): QueryBuilder;
+    }
+
+    interface WhereExists {
+        (callback: Function): QueryBuilder;
+        (query: QueryBuilder): QueryBuilder;
+    }
+
+    interface WhereNull {
+        (columnName: string): QueryBuilder;
+    }
+
+    interface WhereIn {
+        (columnName: string, values: Value[]): QueryBuilder;
+    }
+
+    interface GroupBy extends RawQueryBuilder, ColumnNameQueryBuilder {
+    }
+
+    interface OrderBy {
+        (columnName: string, direction?: string): QueryBuilder;
+    }
+
+    interface Union {
+        (callback: Function, wrap?: boolean): QueryBuilder;
+        (callbacks: Function[], wrap?: boolean): QueryBuilder;
+        (...callbacks: Function[]): QueryBuilder;
+        // (...callbacks: Function[], wrap?: boolean): QueryInterface;
+    }
+
+    interface Having extends RawQueryBuilder, WhereWrapped {
+        (tableName: string, column1: string, operator: string, column2: string): QueryBuilder;
+    }
+
+    // commons
+
+    interface ColumnNameQueryBuilder {
+        (...columnNames: ColumnName[]): QueryBuilder;
+        (columnNames: ColumnName[]): QueryBuilder;
+    }
+
+    interface RawQueryBuilder {
+        (sql: string, ...bindings: Value[]): QueryBuilder;
+        (sql: string, bindings: Value[]): QueryBuilder;
+        (raw: Raw): QueryBuilder;
+    }
+
+    // Raw
+
+    interface Raw extends events.EventEmitter, ChainableInterface {
+        wrap(before: string, after: string): Raw;
+    }
+
+    interface RawBuilder {
+        (value: Value): Raw;
+        (sql: string, ...bindings: Value[]): Raw;
+        (sql: string, bindings: Value[]): Raw;
+    }
+
+    //
+    // QueryBuilder
+    //
+
+    interface QueryBuilder extends QueryInterface, ChainableInterface {
+        or: QueryBuilder;
+        and: QueryBuilder;
+
+        //TODO: Promise?
+        columnInfo(column?: string): Promise<ColumnInfo>;
+
+        forUpdate(): QueryBuilder;
+        forShare(): QueryBuilder;
+
+        toSQL(): Sql;
+
+        on(event: string, callback: Function): QueryBuilder;
+    }
+
+    interface Sql {
+        method: string;
+        options: any;
+        bindings: Value[];
+        sql: string;
+    }
+
+    //
+    // Chainable interface
+    //
+
+    interface ChainableInterface extends Promise<any> {
+        toQuery(): string;
+        options(options: any): QueryBuilder;
+        stream(options?: any, callback?: (builder: QueryBuilder) => any): QueryBuilder;
+        stream(callback?: (builder: QueryBuilder) => any): QueryBuilder;
+        pipe(writable: any): QueryBuilder;
+        exec(callback: Function): QueryBuilder;
+    }
+
+    interface Transaction extends QueryBuilder {
+        commit: any;
+        rollback: any;
+    }
+
+    //
+    // Schema builder
+    //
+
+    interface SchemaBuilder {
+        createTable(tableName: string, callback: (tableBuilder: CreateTableBuilder) => any): Promise<void>;
+        renameTable(oldTableName: string, newTableName: string): Promise<void>;
+        dropTable(tableName: string): Promise<void>;
+        hasTable(tableName: string): Promise<boolean>;
+        hasColumn(tableName: string, columnName: string): Promise<boolean>;
+        table(tableName: string, callback: (tableBuilder: AlterTableBuilder) => any): Promise<void>;
+        dropTableIfExists(tableName: string): Promise<void>;
+        raw(statement: string): SchemaBuilder;
+    }
+
+    interface TableBuilder {
+        increments(columnName?: string): ColumnBuilder;
+        dropColumn(columnName: string): TableBuilder;
+        dropColumns(...columnNames: string[]): TableBuilder;
+        renameColumn(from: string, to: string): ColumnBuilder;
+        integer(columnName: string): ColumnBuilder;
+        bigInteger(columnName: string): ColumnBuilder;
+        text(columnName: string, textType?: string): ColumnBuilder;
+        string(columnName: string, length?: number): ColumnBuilder;
+        float(columnName: string, precision?: number, scale?: number): ColumnBuilder;
+        decimal(columnName: string, precision?: number, scale?: number): ColumnBuilder;
+        boolean(columnName: string): ColumnBuilder;
+        date(columnName: string): ColumnBuilder;
+        dateTime(columnName: string): ColumnBuilder;
+        time(columnName: string): ColumnBuilder;
+        timestamp(columnName: string): ColumnBuilder;
+        timestamps(): ColumnBuilder;
+        binary(columnName: string): ColumnBuilder;
+        enum(columnName: string, values: Value[]): ColumnBuilder;
+        enu(columnName: string, values: Value[]): ColumnBuilder;
+        json(columnName: string): ColumnBuilder;
+        uuid(columnName: string): ColumnBuilder;
+        comment(val: string): TableBuilder;
+        specificType(columnName: string, type: string): ColumnBuilder;
+        primary(columnNames: string[]): TableBuilder;
+        index(columnNames: string[], indexName?: string, indexType?: string): TableBuilder;
+        unique(columnNames: string[], indexName?: string): TableBuilder;
+        foreign(column: string): ForeignConstraintBuilder;
+        foreign(columns: string[]): MultikeyForeignConstraintBuilder;
+    }
+
+    interface CreateTableBuilder extends TableBuilder {
+    }
+
+    interface MySqlTableBuilder extends CreateTableBuilder {
+        engine(val: string): CreateTableBuilder;
+        charset(val: string): CreateTableBuilder;
+        collate(val: string): CreateTableBuilder;
+    }
+
+    interface AlterTableBuilder extends TableBuilder {
+    }
+
+    interface MySqlAlterTableBuilder extends AlterTableBuilder {
+    }
+
+    interface ColumnBuilder {
+        index(indexName?: string): ColumnBuilder;
+        primary(): ColumnBuilder;
+        unique(): ColumnBuilder;
+        references(columnName: string): ReferencingColumnBuilder;
+        onDelete(command: string): ColumnBuilder;
+        onUpdate(command: string): ColumnBuilder;
+        defaultTo(value: Value): ColumnBuilder;
+        unsigned(): ColumnBuilder;
+        notNullable(): ColumnBuilder;
+        nullable(): ColumnBuilder;
+        comment(value: string): ColumnBuilder;
+    }
+
+    interface ForeignConstraintBuilder {
+        references(columnName: string): ReferencingColumnBuilder;
+    }
+
+    interface MultikeyForeignConstraintBuilder {
+        references(columnNames: string[]): ReferencingColumnBuilder;
+    }
+
+    interface PostgreSqlColumnBuilder extends ColumnBuilder {
+        index(indexName?: string, indexType?: string): ColumnBuilder;
+    }
+
+    interface ReferencingColumnBuilder {
+        inTable(tableName: string): ColumnBuilder;
+    }
+
+    interface AlterColumnBuilder extends ColumnBuilder {
+    }
+
+    interface MySqlAlterColumnBuilder extends AlterColumnBuilder {
+        first(): AlterColumnBuilder;
+        after(columnName: string): AlterColumnBuilder;
+    }
+
+    //
+    // Configurations
+    //
+
+    interface ColumnInfo {
+        defaultValue: Value;
+        type: string;
+        maxLength: number;
+        nullable: boolean;
+    }
+
+    interface Config {
+        debug?: boolean;
+        client?: string;
+        dialect?: string;
+        connection?: string | ConnectionConfig | MariaSqlConnectionConfig |
+        Sqlite3ConnectionConfig | SocketConnectionConfig;
+        pool?: PoolConfig;
+        migrations?: MigrationConfig;
+    }
+
+    interface ConnectionConfig {
+        host: string;
+        user: string;
+        password: string;
+        database: string;
+        debug?: boolean;
+    }
+
+    // Config object for mariasql: https://github.com/mscdex/node-mariasql#client-methods
+    interface MariaSqlConnectionConfig {
+        user?: string;
+        password?: string;
+        host?: string;
+        port?: number;
+        unixSocket?: string;
+        protocol?: string;
+        db?: string;
+        keepQueries?: boolean;
+        multiStatements?: boolean;
+        connTimeout?: number;
+        pingInterval?: number;
+        secureAuth?: boolean;
+        compress?: boolean;
+        ssl?: boolean | MariaSslConfiguration;
+        local_infile?: boolean;
+        read_default_file?: string;
+        read_default_group?: string;
+        charset?: string;
+        streamHWM?: number;
+    }
+
+    interface MariaSslConfiguration {
+        key?: string;
+        cert?: string;
+        ca?: string;
+        capath?: string;
+        cipher?: string;
+        rejectUnauthorized?: boolean;
+    }
+
+    /** Used with SQLite3 adapter */
+    interface Sqlite3ConnectionConfig {
+        filename: string;
+        debug?: boolean;
+    }
+
+    interface SocketConnectionConfig {
+        socketPath: string;
+        user: string;
+        password: string;
+        database: string;
+        debug?: boolean;
+    }
+
+    interface PoolConfig {
+        name?: string;
+        create?: Function;
+        afterCreate?: Function;
+        destroy?: Function;
+        beforeDestroy?: Function;
+        min?: number;
+        max?: number;
+        refreshIdle?: boolean;
+        idleTimeoutMillis?: number;
+        reapIntervalMillis?: number;
+        returnToHead?: boolean;
+        priorityRange?: number;
+        validate?: Function;
+        log?: boolean;
+    }
+
+    interface MigrationConfig {
+        database?: string;
+        directory?: string;
+        extension?: string;
+        tableName?: string;
+    }
+}
+
+export = Knex;
diff --git a/knex/knex-tests.ts b/knex/knex-tests.ts
index e983ec1084..7cbe469fb9 100644
--- a/knex/knex-tests.ts
+++ b/knex/knex-tests.ts
@@ -1,7 +1,6 @@
-/// <reference path='knex.d.ts' />
-/// <reference path='../lodash/lodash-3.10.d.ts' />
 import Knex = require('knex');
 import _ = require('lodash');
+
 'use strict';
 // Initializing the Library
 var knex = Knex({
@@ -307,7 +306,7 @@ knex('accounts').where('userid', '=', 1).decrement('balance', 5);
 
 knex('accounts').truncate();
 
-knex.table('users').pluck('id').then(function(ids) {
+knex.table('users').first('id').then(function(ids) {
   console.log(ids);
 });
 
@@ -457,7 +456,7 @@ knex.select('name').from('users')
   .limit(10)
   .offset(x)
   .then(function(rows: any) {
-    return _.pluck(rows, 'name');
+    return _.map(rows, 'name');
   })
   .then(function(names: any) {
     return knex.select('id').from('nicknames').whereIn('nickname', names);
@@ -536,7 +535,7 @@ knex.select('name').from('users')
   .offset(x)
   .exec(function(err: any, rows: any[]) {
     if (err) return console.error(err);
-    knex.select('id').from('nicknames').whereIn('nickname', _.pluck(rows, 'name'))
+    knex.select('id').from('nicknames').whereIn('nickname', _.map(rows, 'name') as any)
       .exec(function(err: any, rows: any[]) {
         if (err) return console.error(err);
         console.log(rows);
diff --git a/knex/knex.d.ts b/knex/knex.d.ts
deleted file mode 100644
index 52740662c8..0000000000
--- a/knex/knex.d.ts
+++ /dev/null
@@ -1,498 +0,0 @@
-// Type definitions for Knex.js
-// Project: https://github.com/tgriesser/knex
-// Definitions by: Qubo <https://github.com/tkQubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// <reference path="../bluebird/bluebird.d.ts" />
-/// <reference path="../node/node.d.ts" />
-
-declare module "knex" {
-  // import Promise = require("bluebird");
-  import * as events from "events";
-
-  type Callback = Function;
-  type Client = Function;
-  type Value = string|number|boolean|Date;
-  type ColumnName = string|Knex.Raw|Knex.QueryBuilder;
-
-  interface Knex extends Knex.QueryInterface {
-    (tableName?: string): Knex.QueryBuilder;
-    VERSION: string;
-    __knex__: string;
-
-    raw: Knex.RawBuilder;
-    transaction: <R>(transactionScope: ((trx: Knex.Transaction) => void)) => Promise<any>;
-    destroy(callback: Function): void;
-    destroy(): Promise<void>;
-
-    schema: Knex.SchemaBuilder;
-
-    client: any;
-    migrate: any;
-    seed: any;
-    fn: any;
-  }
-
-  function Knex(config: Knex.Config) : Knex;
-
-  namespace Knex {
-    //
-    // QueryInterface
-    //
-
-    interface QueryInterface {
-      select: Select;
-      as: As;
-      columns: Select;
-      column: Select;
-      from: Table;
-      into: Table;
-      table: Table;
-      distinct: Distinct;
-
-      // Joins
-      join: Join;
-      joinRaw: JoinRaw;
-      innerJoin: Join;
-      leftJoin: Join;
-      leftOuterJoin: Join;
-      rightJoin: Join;
-      rightOuterJoin: Join;
-      outerJoin: Join;
-      fullOuterJoin: Join;
-      crossJoin: Join;
-
-      // Wheres
-      where: Where;
-      andWhere: Where;
-      orWhere: Where;
-      whereRaw: WhereRaw;
-      whereWrapped: WhereWrapped;
-      havingWrapped: WhereWrapped;
-      orWhereRaw: WhereRaw;
-      whereExists: WhereExists;
-      orWhereExists: WhereExists;
-      whereNotExists: WhereExists;
-      orWhereNotExists: WhereExists;
-      whereIn: WhereIn;
-      orWhereIn: WhereIn;
-      whereNotIn: WhereIn;
-      orWhereNotIn: WhereIn;
-      whereNull: WhereNull;
-      orWhereNull: WhereNull;
-      whereNotNull: WhereNull;
-      orWhereNotNull: WhereNull;
-      whereBetween: WhereBetween;
-      whereNotBetween: WhereBetween;
-      orWhereBetween: WhereBetween;
-      orWhereNotBetween: WhereBetween;
-
-      // Group by
-      groupBy: GroupBy;
-      groupByRaw: RawQueryBuilder;
-
-      // Order by
-      orderBy: OrderBy;
-      orderByRaw: RawQueryBuilder;
-
-      // Union
-      union: Union;
-      unionAll(callback: Function): QueryBuilder;
-
-      // Having
-      having: Having;
-      havingRaw: RawQueryBuilder;
-      orHaving: Having;
-      orHavingRaw: RawQueryBuilder;
-
-      // Paging
-      offset(offset: number): QueryBuilder;
-      limit(limit: number): QueryBuilder;
-
-      // Aggregation
-      count(columnName?: string): QueryBuilder;
-      min(columnName: string): QueryBuilder;
-      max(columnName: string): QueryBuilder;
-      sum(columnName: string): QueryBuilder;
-      avg(columnName: string): QueryBuilder;
-      increment(columnName: string, amount?: number): QueryBuilder;
-      decrement(columnName: string, amount?: number): QueryBuilder;
-
-      // Others
-      first(...columns: string[]): QueryBuilder;
-
-      debug(enabled?: boolean): QueryBuilder;
-      pluck(column: string): QueryBuilder;
-
-      insert(data: any, returning?: string | string[]): QueryBuilder;
-      update(data: any, returning?: string | string[]): QueryBuilder;
-      update(columnName: string, value: Value, returning?: string | string[]): QueryBuilder;
-      returning(column: string): QueryBuilder;
-
-      del(returning?: string | string[]): QueryBuilder;
-      delete(returning?: string | string[]): QueryBuilder;
-      truncate(): QueryBuilder;
-
-      transacting(trx: Transaction): QueryBuilder;
-      connection(connection: any): QueryBuilder;
-
-      clone(): QueryBuilder;
-    }
-
-    interface As {
-      (columnName: string): QueryBuilder;
-    }
-
-    interface Select extends ColumnNameQueryBuilder {
-    }
-
-    interface Table {
-      (tableName: string): QueryBuilder;
-      (callback: Function): QueryBuilder;
-    }
-
-    interface Distinct extends ColumnNameQueryBuilder {
-    }
-
-    interface Join {
-      (raw: Raw): QueryBuilder;
-      (tableName: string, callback: Function): QueryBuilder;
-      (tableName: string, column1: string, column2: string): QueryBuilder;
-      (tableName: string, column1: string, raw: Raw): QueryBuilder;
-      (tableName: string, column1: string, operator: string, column2: string): QueryBuilder;
-    }
-
-    interface JoinRaw {
-      (tableName: string, binding?: Value): QueryBuilder;
-    }
-
-    interface Where extends WhereRaw, WhereWrapped, WhereNull {
-      (object: Object): QueryBuilder;
-      (columnName: string, value: Value): QueryBuilder;
-      (columnName: string, operator: string, value: Value): QueryBuilder;
-      (columnName: string, operator: string, query: QueryBuilder): QueryBuilder;
-    }
-
-    interface WhereRaw extends RawQueryBuilder {
-      (condition: boolean): QueryBuilder;
-    }
-
-    interface WhereWrapped {
-      (callback: Function): QueryBuilder;
-    }
-
-    interface WhereNull {
-      (columnName: string): QueryBuilder;
-    }
-
-    interface WhereIn {
-      (columnName: string, values: Value[]): QueryBuilder;
-      (columnName: string, callback: Function): QueryBuilder;
-      (columnName: string, query: QueryBuilder): QueryBuilder;
-    }
-
-    interface WhereBetween {
-      (columnName: string, range: [Value, Value]): QueryBuilder;
-    }
-
-    interface WhereExists {
-      (callback: Function): QueryBuilder;
-      (query: QueryBuilder): QueryBuilder;
-    }
-
-    interface WhereNull {
-      (columnName: string): QueryBuilder;
-    }
-
-    interface WhereIn {
-      (columnName: string, values: Value[]): QueryBuilder;
-    }
-
-    interface GroupBy extends RawQueryBuilder, ColumnNameQueryBuilder {
-    }
-
-    interface OrderBy {
-      (columnName: string, direction?: string): QueryBuilder;
-    }
-
-    interface Union {
-      (callback: Function, wrap?: boolean): QueryBuilder;
-      (callbacks: Function[], wrap?: boolean): QueryBuilder;
-      (...callbacks: Function[]): QueryBuilder;
-      // (...callbacks: Function[], wrap?: boolean): QueryInterface;
-    }
-
-    interface Having extends RawQueryBuilder, WhereWrapped {
-      (tableName: string, column1: string, operator: string, column2: string): QueryBuilder;
-    }
-
-    // commons
-
-    interface ColumnNameQueryBuilder {
-      (...columnNames: ColumnName[]): QueryBuilder;
-      (columnNames: ColumnName[]): QueryBuilder;
-    }
-
-    interface RawQueryBuilder {
-      (sql: string, ...bindings: Value[]): QueryBuilder;
-      (sql: string, bindings: Value[]): QueryBuilder;
-      (raw: Raw): QueryBuilder;
-    }
-
-    // Raw
-
-    interface Raw extends events.EventEmitter, ChainableInterface {
-      wrap(before: string, after: string): Raw;
-    }
-
-    interface RawBuilder {
-      (value: Value): Raw;
-      (sql: string, ...bindings: Value[]): Raw;
-      (sql: string, bindings: Value[]): Raw;
-    }
-
-    //
-    // QueryBuilder
-    //
-
-    interface QueryBuilder extends QueryInterface, ChainableInterface {
-      or: QueryBuilder;
-      and: QueryBuilder;
-
-      //TODO: Promise?
-      columnInfo(column?: string): Promise<ColumnInfo>;
-
-      forUpdate(): QueryBuilder;
-      forShare(): QueryBuilder;
-
-      toSQL(): Sql;
-
-      on(event: string, callback: Function): QueryBuilder;
-    }
-
-    interface Sql {
-      method: string;
-      options: any;
-      bindings: Value[];
-      sql: string;
-    }
-
-    //
-    // Chainable interface
-    //
-
-    interface ChainableInterface extends Promise<any> {
-      toQuery(): string;
-      options(options: any): QueryBuilder;
-      stream(options?: any, callback?: (builder: QueryBuilder) => any): QueryBuilder;
-      stream(callback?: (builder: QueryBuilder) => any): QueryBuilder;
-      pipe(writable: any): QueryBuilder;
-      exec(callback: Function): QueryBuilder;
-    }
-
-    interface Transaction extends QueryBuilder {
-      commit: any;
-      rollback: any;
-    }
-
-    //
-    // Schema builder
-    //
-
-    interface SchemaBuilder {
-      createTable(tableName: string, callback: (tableBuilder: CreateTableBuilder) => any): Promise<void>;
-      renameTable(oldTableName: string, newTableName: string): Promise<void>;
-      dropTable(tableName: string): Promise<void>;
-      hasTable(tableName: string): Promise<boolean>;
-      hasColumn(tableName: string, columnName: string): Promise<boolean>;
-      table(tableName: string, callback: (tableBuilder: AlterTableBuilder) => any): Promise<void>;
-      dropTableIfExists(tableName: string): Promise<void>;
-      raw(statement: string): SchemaBuilder;
-    }
-
-    interface TableBuilder {
-      increments(columnName?: string): ColumnBuilder;
-      dropColumn(columnName: string): TableBuilder;
-      dropColumns(...columnNames: string[]): TableBuilder;
-      renameColumn(from: string, to: string): ColumnBuilder;
-      integer(columnName: string): ColumnBuilder;
-      bigInteger(columnName: string): ColumnBuilder;
-      text(columnName: string, textType?: string): ColumnBuilder;
-      string(columnName: string, length?: number): ColumnBuilder;
-      float(columnName: string, precision?: number, scale?: number): ColumnBuilder;
-      decimal(columnName: string, precision?: number, scale?: number): ColumnBuilder;
-      boolean(columnName: string): ColumnBuilder;
-      date(columnName: string): ColumnBuilder;
-      dateTime(columnName: string): ColumnBuilder;
-      time(columnName: string): ColumnBuilder;
-      timestamp(columnName: string): ColumnBuilder;
-      timestamps(): ColumnBuilder;
-      binary(columnName: string): ColumnBuilder;
-      enum(columnName: string, values: Value[]): ColumnBuilder;
-      enu(columnName: string, values: Value[]): ColumnBuilder;
-      json(columnName: string): ColumnBuilder;
-      uuid(columnName: string): ColumnBuilder;
-      comment(val: string): TableBuilder;
-      specificType(columnName: string, type: string): ColumnBuilder;
-      primary(columnNames: string[]) : TableBuilder;
-      index(columnNames: string[], indexName?: string, indexType?: string) : TableBuilder;
-      unique(columnNames: string[], indexName?: string) : TableBuilder;
-      foreign(column: string): ForeignConstraintBuilder;
-      foreign(columns: string[]): MultikeyForeignConstraintBuilder;
-    }
-
-    interface CreateTableBuilder extends TableBuilder {
-    }
-
-    interface MySqlTableBuilder extends CreateTableBuilder {
-      engine(val: string): CreateTableBuilder;
-      charset(val: string): CreateTableBuilder;
-      collate(val: string): CreateTableBuilder;
-    }
-
-    interface AlterTableBuilder extends TableBuilder {
-    }
-
-    interface MySqlAlterTableBuilder extends AlterTableBuilder {
-    }
-
-    interface ColumnBuilder {
-      index(indexName?: string): ColumnBuilder;
-      primary(): ColumnBuilder;
-      unique(): ColumnBuilder;
-      references(columnName: string): ReferencingColumnBuilder;
-      onDelete(command: string): ColumnBuilder;
-      onUpdate(command: string): ColumnBuilder;
-      defaultTo(value: Value): ColumnBuilder;
-      unsigned(): ColumnBuilder;
-      notNullable(): ColumnBuilder;
-      nullable(): ColumnBuilder;
-      comment(value: string): ColumnBuilder;
-    }
-    
-    interface ForeignConstraintBuilder {
-        references(columnName: string): ReferencingColumnBuilder;
-    }
-    
-    interface MultikeyForeignConstraintBuilder {
-        references(columnNames: string[]): ReferencingColumnBuilder;
-    }
-    
-    interface PostgreSqlColumnBuilder extends ColumnBuilder {
-      index(indexName?: string, indexType?: string): ColumnBuilder;
-    }
-
-    interface ReferencingColumnBuilder {
-      inTable(tableName: string): ColumnBuilder;
-    }
-
-    interface AlterColumnBuilder extends ColumnBuilder {
-    }
-
-    interface MySqlAlterColumnBuilder extends AlterColumnBuilder {
-      first(): AlterColumnBuilder;
-      after(columnName: string): AlterColumnBuilder;
-    }
-
-    //
-    // Configurations
-    //
-
-    interface ColumnInfo {
-      defaultValue: Value;
-      type: string;
-      maxLength: number;
-      nullable: boolean;
-    }
-
-    interface Config {
-      debug?: boolean;
-      client?: string;
-      dialect?: string;
-      connection?: string|ConnectionConfig|MariaSqlConnectionConfig|
-        Sqlite3ConnectionConfig|SocketConnectionConfig;
-      pool?: PoolConfig;
-      migrations?: MigrationConfig;
-    }
-
-    interface ConnectionConfig {
-      host: string;
-      user: string;
-      password: string;
-      database: string;
-      debug?: boolean;
-    }
-
-    // Config object for mariasql: https://github.com/mscdex/node-mariasql#client-methods
-    interface MariaSqlConnectionConfig {
-      user?: string;
-      password?: string;
-      host?: string;
-      port?: number;
-      unixSocket?: string;
-      protocol?: string;
-      db?: string;
-      keepQueries?: boolean;
-      multiStatements?: boolean;
-      connTimeout?: number;
-      pingInterval?: number;
-      secureAuth?: boolean;
-      compress?: boolean;
-      ssl?: boolean|MariaSslConfiguration;
-      local_infile?: boolean;
-      read_default_file?: string;
-      read_default_group?: string;
-      charset?: string;
-      streamHWM?: number;
-    }
-
-    interface MariaSslConfiguration {
-      key?: string;
-      cert?: string;
-      ca?: string;
-      capath?: string;
-      cipher?: string;
-      rejectUnauthorized?: boolean;
-    }
-
-    /** Used with SQLite3 adapter */
-    interface Sqlite3ConnectionConfig {
-      filename: string;
-      debug?: boolean;
-    }
-
-    interface SocketConnectionConfig {
-      socketPath: string;
-      user: string;
-      password: string;
-      database: string;
-      debug?: boolean;
-    }
-
-    interface PoolConfig {
-      name?: string;
-      create?: Function;
-      afterCreate?: Function;
-      destroy?: Function;
-      beforeDestroy?: Function;
-      min?: number;
-      max?: number;
-      refreshIdle?: boolean;
-      idleTimeoutMillis?: number;
-      reapIntervalMillis?: number;
-      returnToHead?: boolean;
-      priorityRange?: number;
-      validate?: Function;
-      log?: boolean;
-    }
-
-    interface MigrationConfig {
-      database?: string;
-      directory?: string;
-      extension?: string;
-      tableName?: string;
-    }
-  }
-
-  export = Knex;
-}
diff --git a/knex/tsconfig.json b/knex/tsconfig.json
new file mode 100644
index 0000000000..64151692ae
--- /dev/null
+++ b/knex/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "knex-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/knockback/index.d.ts b/knockback/index.d.ts
new file mode 100644
index 0000000000..69f5501d29
--- /dev/null
+++ b/knockback/index.d.ts
@@ -0,0 +1,225 @@
+// Type definitions for Knockback.js
+// Project: http://kmalakoff.github.io/knockback/
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="knockout" />
+/// <reference types="backbone" />
+
+declare namespace Knockback {
+    interface EventWatcherOptions {
+        emitter: (newEmitter) => void;
+        update: (newValue) => void;
+        event_selector: string;
+        key?: string;
+    }
+
+    interface FactoryOptions {
+        factories: any;
+    }
+
+    interface StoreOptions {
+        creator: any;
+        path: string;
+        store: Store;
+        factory: Factory;
+    }
+
+    class Destroyable {
+        destroy();
+    }
+
+    class ViewModel extends Destroyable {
+        constructor (model?: Backbone.Model, options?: ViewModelOptions, viewModel?: ViewModel);
+        shareOptions(): ViewModelOptions;
+        extend(source: any);
+        model(): Backbone.Model;
+    }
+
+    class EventWatcher extends Destroyable {
+        static useOptionsOrCreate(options, emitter: KnockoutObservable<any>, obj: Backbone.Model, callback_options: any);
+
+        emitter(): Backbone.Model;
+        emitter(newEmitter: Backbone.Model);
+        registerCallbacks(obj: any, callback_info: any);
+        releaseCallbacks(obj: any);
+    }
+
+    class Factory {
+        static useOptionsOrCreate(options: FactoryOptions, obj: any, owner_path: string);
+
+        constructor (parent_factory: any);
+        hasPath(path: string): boolean;
+        addPathMapping(path: string, create_info);
+        addPathMappings(factories: any, owner_path: string);
+        hasPathMappings(factories: any, owner_path: string): boolean;
+        creatorForPath(obj: any, path: string);
+    }
+
+    class Store extends Destroyable {
+        static useOptionsOrCreate(options: StoreOptions, obj: any, observable: KnockoutObservable<any>);
+
+        constructor (model:Backbone.Model, options: StoreOptions);
+        clear();
+        register(obj: Backbone.Model, observable: KnockoutObservable<any>, options: StoreOptions);
+        findOrCreate(obj: Backbone.Model, options: StoreOptions);
+    }
+
+    class DefaultObservable extends Destroyable {
+        constructor (targetObservable: KnockoutObservable<any>, defaultValue: any);
+        setToDefault();
+    }
+
+    class FormattedObservable extends Destroyable {
+        constructor (format: string, args: any[]);
+        constructor (format: KnockoutObservable<any>, args: any[]);
+    }
+
+    interface LocalizedObservable {
+        constructor (value: any, options: any, vm: any);
+        destroy();
+        resetToCurrent();
+        observedValue(value: any);
+    }
+
+    class TriggeredObservable extends Destroyable {
+        constructor (emitter: Backbone.ModelBase, event: string);
+        emitter(): Backbone.ModelBase;
+        emitter(newEmitter: Backbone.ModelBase);
+    }
+
+    class Statistics {
+        constructor ();
+        clear();
+        addModelEvent(event: string);
+        modelEventsStatsString();
+        register(key: string, obj: any);
+        unregister(key: string, obj: any);
+        registeredCount(type: any): number;
+        registeredStatsString(success_message: string): string;
+    }
+
+    interface OptionsBase {
+        path?: string;               // the path to the value (used to create related observables from the factory).
+        store?: Store;               // a store used to cache and share view models.
+        factory?: Factory;           // a factory used to create view models.
+        options?: any;               // a set of options merge into these options using _.defaults. Useful for extending options when deriving classes rather than merging them by hand.
+    }
+
+    interface ViewModelOptions extends OptionsBase {
+        internals?: string[];       // an array of atttributes that should be scoped with an underscore, eg. name -> _name
+        requires?: string[];        // an array of atttributes that will have kb.Observables created even if they do not exist on the Backbone.Model. Useful for binding Views that require specific observables to exist
+        keys?: string[];            // restricts the keys used on a model. Useful for reducing the number of kb.Observables created from a limited set of Backbone.Model attributes
+        if(objOrArray: any);        // an array is supplied, excludes keys to exclude on the view model; for example, if you want to provide a custom implementation. If an Object, it provides options to the kb.Observable constructor.
+        path?: string;              // the path to the value (used to create related observables from the factory).
+        factories?: any;            // a map of dot-deliminated paths; for example {'models.name': kb.ViewModel} to either constructors or create functions. Signature: {'some.path': function(object, options)}
+    }
+
+    interface CollectionOptions extends OptionsBase {
+        models_only?: boolean;         // flag for skipping the creation of view models. The collection observable will be populated with (possibly sorted) models.
+        view_model?: any;           // (Constructor) — the view model constructor used for models in the collection. Signature: constructor(model, options)
+        create?: any;               // a function used to create a view model for models in the collection. Signature: create(model, options)
+        factories?: any;            // a map of dot-deliminated paths; for example 'models.owner': kb.ViewModel to either constructors or create functions. Signature: 'some.path': function(object, options)
+        comparator?: any;           //a function that is used to sort an object. Signature: function(model_a, model_b) returns negative value for ascending, 0 for equal, and positive for descending
+        sort_attribute?: string;    // the name of an attribute. Default: resort on all changes to a model.
+        filters?: any;              // filters can be individual ids (observable or simple) or arrays of ids, functions, or arrays of functions.
+    }
+
+    interface CollectionObservable extends KnockoutObservableArray<any> {
+        collection(colleciton: Backbone.Collection<Backbone.Model>);
+        collection(): Backbone.Collection<Backbone.Model>;
+        destroy();
+        shareOptions():  CollectionOptions;
+        filters(id: any) : Backbone.Model;
+        filters(ids: any[]): CollectionObservable;
+        filters(iterator: (element: Backbone.Model) => boolean): CollectionObservable;
+        comparator(comparatorFunction: any);
+        sortAttribute(attr: string);
+        viewModelByModel(model: Backbone.Model): ViewModel;
+        hasViewModels(): boolean;
+    }
+
+    interface Utils {
+        wrappedObservable(obj: any): any;
+        wrappedObservable(obj: any, value: any);
+        wrappedObject(obj: any): any;
+        wrappedObject(obj: any, value: any);
+        wrappedModel(obj: any): any;
+        wrappedModel(obj: any, value: any);
+        wrappedStore(obj: any): any;
+        wrappedStore(obj: any, value: any);
+        wrappedFactory(obj: any): any;
+        wrappedFactory(obj: any, value: any);
+        wrappedEventWatcher(obj: any): any;
+        wrappedEventWatcher(obj: any, value: any);
+        wrappedDestroy(obj: any);
+        valueType(observable: KnockoutObservable<any>): any;
+        pathJoin(path1: string, path2: string): string;
+        optionsPathJoin(options: any, path: string): any;
+        inferCreator(value: any, factory: Factory, path: string, owner: any, key: string);
+        createFromDefaultCreator(obj: any, options?: any);
+        hasModelSignature(obj: any): boolean;
+        hasCollectionSignature(obj: any): boolean;
+    }
+
+    interface Static extends Utils {
+    	ViewModel;
+    	CollectionObservable;
+        collectionObservable(model?: Backbone.Collection<Backbone.Model>, options?: CollectionOptions): CollectionObservable;
+    	/** Base class for observing model attributes. */
+    	observable(
+			/** the model to observe (can be null) */
+			model: Backbone.Model,
+			/** the create options. String is a single attribute name, Array is an array of attribute names. */
+				options: IObservableOptions,
+			/** the viewModel */
+			vm?: ViewModel): KnockoutObservable<any>;
+        observable(
+			/** the model to observe (can be null) */
+        	model: Backbone.Model,
+    		/** the create options. String is a single attribute name, Array is an array of attribute names. */
+        	options_attributeName: string,
+			/** the viewModel */
+			vm?: ViewModel): KnockoutObservable<any>;
+        viewModel(model?: Backbone.Model, options?: any): KnockoutObservable<any>;
+        defaultObservable(targetObservable: KnockoutObservable<any>, defaultValue: any): KnockoutObservable<any>;
+        formattedObservable(format: string, args: any[]): KnockoutObservable<any>;
+        formattedObservable(format: KnockoutObservable<any>, args: any[]): KnockoutObservable<any>;
+        localizedObservable(data: any, options: any): KnockoutObservable<any>;
+        release(object: any, pre_release?: () => void );
+        releaseKeys(object: any);
+        releaseOnNodeRemove(viewmodel: ViewModel, node: Element);
+        renderTemplate(template: string, viewModel: ViewModel, options: any);
+        renderAutoReleasedTemplate(template: string, viewModel: ViewModel, options: any);
+        applyBindings(viewModel: ViewModel, node?: Element);
+    }
+
+	/** parameter of ko.observable constructor
+	Options Hash: (option):
+	key (String) — the name of the attribute.
+	read (Function) — a function used to provide transform the attribute value before passing it to the caller. Signature: read()
+	write (Function) — a function used to provide transform the value before passing it to the model set function. Signature: write(value)
+	args (Array) — arguments to pass to the read and write functions (they can be ko.observables). Can be useful for passing arguments to a locale manager.
+	localizer (Constructor) — a concrete kb.LocalizedObservable constructor for localization.
+	default (Data|ko.observable) — the default value. Can be a value, string or ko.observable.
+	path (String) — the path to the value (used to create related observables from the factory).
+	store (kb.Store) — a store used to cache and share view models.
+	factory (kb.Factory) — a factory used to create view models.
+	options (Object) — a set of options merge into these options using _.defaults. Useful for extending options when deriving classes rather than merging them by hand.
+	*/
+    interface IObservableOptions {
+    	key: string;
+    	read?: () => any;
+    	write?: (value: any) => void;
+    	args?: KnockoutObservable<any>[];
+    	localizer?: LocalizedObservable;
+    	default?: any;
+    	path?: string;
+    	store?: any;
+    	factory?: any;
+    	options?: any;
+    }
+
+}
+
+declare var kb: Knockback.Static;
diff --git a/knockback/knockback.d.ts b/knockback/knockback.d.ts
deleted file mode 100644
index 5392e838ba..0000000000
--- a/knockback/knockback.d.ts
+++ /dev/null
@@ -1,225 +0,0 @@
-// Type definitions for Knockback.js
-// Project: http://kmalakoff.github.io/knockback/
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../backbone/backbone.d.ts" />
-/// <reference path="../knockout/knockout.d.ts" />
-
-declare namespace Knockback {
-    interface EventWatcherOptions {
-        emitter: (newEmitter) => void;
-        update: (newValue) => void;
-        event_selector: string;
-        key?: string;
-    }
-
-    interface FactoryOptions {
-        factories: any;
-    }
-
-    interface StoreOptions {
-        creator: any;
-        path: string;
-        store: Store;
-        factory: Factory;
-    }
-
-    class Destroyable {
-        destroy();
-    }
-
-    class ViewModel extends Destroyable {
-        constructor (model?: Backbone.Model, options?: ViewModelOptions, viewModel?: ViewModel);
-        shareOptions(): ViewModelOptions;
-        extend(source: any);
-        model(): Backbone.Model;
-    }
-
-    class EventWatcher extends Destroyable {
-        static useOptionsOrCreate(options, emitter: KnockoutObservable<any>, obj: Backbone.Model, callback_options: any);
-
-        emitter(): Backbone.Model;
-        emitter(newEmitter: Backbone.Model);
-        registerCallbacks(obj: any, callback_info: any);
-        releaseCallbacks(obj: any);
-    }
-
-    class Factory {
-        static useOptionsOrCreate(options: FactoryOptions, obj: any, owner_path: string);
-
-        constructor (parent_factory: any);
-        hasPath(path: string): boolean;
-        addPathMapping(path: string, create_info);
-        addPathMappings(factories: any, owner_path: string);
-        hasPathMappings(factories: any, owner_path: string): boolean;
-        creatorForPath(obj: any, path: string);
-    }
-
-    class Store extends Destroyable {
-        static useOptionsOrCreate(options: StoreOptions, obj: any, observable: KnockoutObservable<any>);
-
-        constructor (model:Backbone.Model, options: StoreOptions);
-        clear();
-        register(obj: Backbone.Model, observable: KnockoutObservable<any>, options: StoreOptions);
-        findOrCreate(obj: Backbone.Model, options: StoreOptions);
-    }
-
-    class DefaultObservable extends Destroyable {
-        constructor (targetObservable: KnockoutObservable<any>, defaultValue: any);
-        setToDefault();
-    }
-
-    class FormattedObservable extends Destroyable {
-        constructor (format: string, args: any[]);
-        constructor (format: KnockoutObservable<any>, args: any[]);
-    }
-
-    interface LocalizedObservable {
-        constructor (value: any, options: any, vm: any);
-        destroy();
-        resetToCurrent();
-        observedValue(value: any);
-    }
-
-    class TriggeredObservable extends Destroyable {
-        constructor (emitter: Backbone.ModelBase, event: string);
-        emitter(): Backbone.ModelBase;
-        emitter(newEmitter: Backbone.ModelBase);
-    }
-
-    class Statistics {
-        constructor ();
-        clear();
-        addModelEvent(event: string);
-        modelEventsStatsString();
-        register(key: string, obj: any);
-        unregister(key: string, obj: any);
-        registeredCount(type: any): number;
-        registeredStatsString(success_message: string): string;
-    }
-
-    interface OptionsBase {
-        path?: string;               // the path to the value (used to create related observables from the factory).
-        store?: Store;               // a store used to cache and share view models.
-        factory?: Factory;           // a factory used to create view models.
-        options?: any;               // a set of options merge into these options using _.defaults. Useful for extending options when deriving classes rather than merging them by hand.
-    }
-
-    interface ViewModelOptions extends OptionsBase {
-        internals?: string[];       // an array of atttributes that should be scoped with an underscore, eg. name -> _name
-        requires?: string[];        // an array of atttributes that will have kb.Observables created even if they do not exist on the Backbone.Model. Useful for binding Views that require specific observables to exist
-        keys?: string[];            // restricts the keys used on a model. Useful for reducing the number of kb.Observables created from a limited set of Backbone.Model attributes
-        if(objOrArray: any);        // an array is supplied, excludes keys to exclude on the view model; for example, if you want to provide a custom implementation. If an Object, it provides options to the kb.Observable constructor.
-        path?: string;              // the path to the value (used to create related observables from the factory).
-        factories?: any;            // a map of dot-deliminated paths; for example {'models.name': kb.ViewModel} to either constructors or create functions. Signature: {'some.path': function(object, options)}
-    }
-
-    interface CollectionOptions extends OptionsBase {
-        models_only?: boolean;         // flag for skipping the creation of view models. The collection observable will be populated with (possibly sorted) models.
-        view_model?: any;           // (Constructor) — the view model constructor used for models in the collection. Signature: constructor(model, options)
-        create?: any;               // a function used to create a view model for models in the collection. Signature: create(model, options)
-        factories?: any;            // a map of dot-deliminated paths; for example 'models.owner': kb.ViewModel to either constructors or create functions. Signature: 'some.path': function(object, options)
-        comparator?: any;           //a function that is used to sort an object. Signature: function(model_a, model_b) returns negative value for ascending, 0 for equal, and positive for descending
-        sort_attribute?: string;    // the name of an attribute. Default: resort on all changes to a model.
-        filters?: any;              // filters can be individual ids (observable or simple) or arrays of ids, functions, or arrays of functions.
-    }
-
-    interface CollectionObservable extends KnockoutObservableArray<any> {
-        collection(colleciton: Backbone.Collection<Backbone.Model>);
-        collection(): Backbone.Collection<Backbone.Model>;
-        destroy();
-        shareOptions():  CollectionOptions;
-        filters(id: any) : Backbone.Model;
-        filters(ids: any[]): CollectionObservable;
-        filters(iterator: (element: Backbone.Model) => boolean): CollectionObservable;
-        comparator(comparatorFunction: any);
-        sortAttribute(attr: string);
-        viewModelByModel(model: Backbone.Model): ViewModel;
-        hasViewModels(): boolean;
-    }
-
-    interface Utils {
-        wrappedObservable(obj: any): any;
-        wrappedObservable(obj: any, value: any);
-        wrappedObject(obj: any): any;
-        wrappedObject(obj: any, value: any);
-        wrappedModel(obj: any): any;
-        wrappedModel(obj: any, value: any);
-        wrappedStore(obj: any): any;
-        wrappedStore(obj: any, value: any);
-        wrappedFactory(obj: any): any;
-        wrappedFactory(obj: any, value: any);
-        wrappedEventWatcher(obj: any): any;
-        wrappedEventWatcher(obj: any, value: any);
-        wrappedDestroy(obj: any);
-        valueType(observable: KnockoutObservable<any>): any;
-        pathJoin(path1: string, path2: string): string;
-        optionsPathJoin(options: any, path: string): any;
-        inferCreator(value: any, factory: Factory, path: string, owner: any, key: string);
-        createFromDefaultCreator(obj: any, options?: any);
-        hasModelSignature(obj: any): boolean;
-        hasCollectionSignature(obj: any): boolean;
-    }
-
-    interface Static extends Utils {
-    	ViewModel;
-    	CollectionObservable;
-        collectionObservable(model?: Backbone.Collection<Backbone.Model>, options?: CollectionOptions): CollectionObservable;
-    	/** Base class for observing model attributes. */
-    	observable(
-			/** the model to observe (can be null) */
-			model: Backbone.Model,
-			/** the create options. String is a single attribute name, Array is an array of attribute names. */
-				options: IObservableOptions,
-			/** the viewModel */
-			vm?: ViewModel): KnockoutObservable<any>;
-        observable(
-			/** the model to observe (can be null) */
-        	model: Backbone.Model,
-    		/** the create options. String is a single attribute name, Array is an array of attribute names. */
-        	options_attributeName: string,
-			/** the viewModel */
-			vm?: ViewModel): KnockoutObservable<any>;
-        viewModel(model?: Backbone.Model, options?: any): KnockoutObservable<any>;
-        defaultObservable(targetObservable: KnockoutObservable<any>, defaultValue: any): KnockoutObservable<any>;
-        formattedObservable(format: string, args: any[]): KnockoutObservable<any>;
-        formattedObservable(format: KnockoutObservable<any>, args: any[]): KnockoutObservable<any>;
-        localizedObservable(data: any, options: any): KnockoutObservable<any>;
-        release(object: any, pre_release?: () => void );
-        releaseKeys(object: any);
-        releaseOnNodeRemove(viewmodel: ViewModel, node: Element);
-        renderTemplate(template: string, viewModel: ViewModel, options: any);
-        renderAutoReleasedTemplate(template: string, viewModel: ViewModel, options: any);
-        applyBindings(viewModel: ViewModel, node?: Element);
-    }
-
-	/** parameter of ko.observable constructor
-	Options Hash: (option):
-	key (String) — the name of the attribute.
-	read (Function) — a function used to provide transform the attribute value before passing it to the caller. Signature: read()
-	write (Function) — a function used to provide transform the value before passing it to the model set function. Signature: write(value)
-	args (Array) — arguments to pass to the read and write functions (they can be ko.observables). Can be useful for passing arguments to a locale manager.
-	localizer (Constructor) — a concrete kb.LocalizedObservable constructor for localization.
-	default (Data|ko.observable) — the default value. Can be a value, string or ko.observable.
-	path (String) — the path to the value (used to create related observables from the factory).
-	store (kb.Store) — a store used to cache and share view models.
-	factory (kb.Factory) — a factory used to create view models.
-	options (Object) — a set of options merge into these options using _.defaults. Useful for extending options when deriving classes rather than merging them by hand.
-	*/
-    interface IObservableOptions {
-    	key: string;
-    	read?: () => any;
-    	write?: (value: any) => void;
-    	args?: KnockoutObservable<any>[];
-    	localizer?: LocalizedObservable;
-    	default?: any;
-    	path?: string;
-    	store?: any;
-    	factory?: any;
-    	options?: any;
-    }
-
-}
-
-declare var kb: Knockback.Static;
diff --git a/knockback/knockback.d.ts.tscparams b/knockback/knockback.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/knockback/knockback.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/knockback/tsconfig.json b/knockback/tsconfig.json
new file mode 100644
index 0000000000..af6755830c
--- /dev/null
+++ b/knockback/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/knockout-amd-helpers/index.d.ts b/knockout-amd-helpers/index.d.ts
new file mode 100644
index 0000000000..d12c8d9a8f
--- /dev/null
+++ b/knockout-amd-helpers/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for knockout-amd-helpers
+// Project: https://github.com/rniemeyer/knockout-amd-helpers
+// Definitions by: David Sichau <https://github.com/DavidSichau>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="knockout" />
+
+
+interface KnockoutAMDModule {
+    baseDir: string;
+    initializer: string;
+    disposeMethod: string;
+    templateProperty: string;
+}
+
+interface KnockoutAMDTemplate {
+    defaultPath: string;
+    defaultSuffix: string;
+    defaultRequireTextPluginName: string;
+}
+
+interface KnockoutBindingHandlers {
+    module: KnockoutAMDModule;
+}
+interface KnockoutStatic {
+
+    amdTemplateEngine: KnockoutAMDTemplate
+}
+
+declare module "knockout-amd-helpers" {
+    export = ko;
+}
+
+declare var ko: KnockoutStatic;
diff --git a/knockout.amd.helpers/knockout-amd-helpers-tests.ts b/knockout-amd-helpers/knockout-amd-helpers-tests.ts
similarity index 92%
rename from knockout.amd.helpers/knockout-amd-helpers-tests.ts
rename to knockout-amd-helpers/knockout-amd-helpers-tests.ts
index c5d1b62e03..d2773dee12 100644
--- a/knockout.amd.helpers/knockout-amd-helpers-tests.ts
+++ b/knockout-amd-helpers/knockout-amd-helpers-tests.ts
@@ -1,7 +1,7 @@
 // Tests for knockout.projections.d.ts
 
-/// <reference path="../knockout/knockout.d.ts" />
-/// <reference path="knockout-amd-helpers.d.ts" />
+/// <reference types="knockout" />
+
 
 //The baseDir is used in building the path to use in the require statement. If your modules live in the modules directory, then you can specify it globally here.
 ko.bindingHandlers.module.baseDir = "blub";
diff --git a/knockout-amd-helpers/tsconfig.json b/knockout-amd-helpers/tsconfig.json
new file mode 100644
index 0000000000..0cc9360b5d
--- /dev/null
+++ b/knockout-amd-helpers/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "knockout-amd-helpers-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/knockout-paging/index.d.ts b/knockout-paging/index.d.ts
new file mode 100644
index 0000000000..5c1491039b
--- /dev/null
+++ b/knockout-paging/index.d.ts
@@ -0,0 +1,67 @@
+// Type definitions for knockout-paging
+// Project: https://github.com/ErikSchierboom/knockout-paging
+// Definitions by: Erik Schierboom <https://github.com/ErikSchierboom>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="knockout" />
+
+interface KnockoutStatic {
+    paging: KnockoutPagingOptions;
+	pagedObservableArray<T>(initialValue?: T[], options?: KnockoutPagedOptions): KnockoutPagedObservableArray<T>;
+}
+
+interface KnockoutPagingOptions {
+    defaults: KnockoutPagingDefaultOptions;
+    generators: { 
+    	[name: string]: KnockoutPageGenerator; 
+		'sliding': KnockoutSlidingPageGenerator
+    }
+}
+
+interface KnockoutPagingDefaultOptions {
+    pageNumber: number;
+    pageSize: number;
+}
+
+interface KnockoutPagedObservableArray<T> extends KnockoutObservableArray<T> {
+    pageSize: KnockoutObservable<number>;
+    pageNumber: KnockoutObservable<number>;
+
+    pageItems: KnockoutComputed<T[]>;
+    pageCount: KnockoutComputed<number>;
+    itemCount: KnockoutComputed<number>;
+    firstItemOnPage: KnockoutComputed<number>;
+    lastItemOnPage: KnockoutComputed<number>;
+    hasPreviousPage: KnockoutComputed<boolean>;
+    hasNextPage: KnockoutComputed<boolean>;
+    isFirstPage: KnockoutComputed<boolean>;
+    isLastPage: KnockoutComputed<boolean>;
+    pages: KnockoutComputed<number[]>;
+
+    toNextPage(): void;
+    toPreviousPage(): void;
+    toLastPage(): void;
+    toFirstPage(): void;
+}
+
+interface KnockoutPagedOptions {
+    pageSize?: number;
+    pageNumber?: number;
+    pageGenerator?: string;
+}
+
+interface KnockoutObservableArray<T> {
+    extend(requestedExtenders: { 'paged': any; }): KnockoutPagedObservableArray<T>;
+}
+
+interface KnockoutPageGenerator {
+	generate<T>(pagedObservable: KnockoutPagedObservableArray<T>): number[];
+}
+
+interface KnockoutSlidingPageGenerator extends KnockoutPageGenerator {
+	windowSize: KnockoutObservable<number>;
+}
+
+interface KnockoutExtenders {
+    paged(target: KnockoutObservableArray<any>, options: KnockoutPagedOptions): KnockoutObservableArray<any>;
+}
\ No newline at end of file
diff --git a/knockout-paging/knockout-paging-tests.ts b/knockout-paging/knockout-paging-tests.ts
index eae5490bb0..ddf015613b 100644
--- a/knockout-paging/knockout-paging-tests.ts
+++ b/knockout-paging/knockout-paging-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="knockout-paging.d.ts" />
+
 
 // Different option formats
 var emptyOptions      = {};
diff --git a/knockout-paging/knockout-paging.d.ts b/knockout-paging/knockout-paging.d.ts
deleted file mode 100644
index eb2919882d..0000000000
--- a/knockout-paging/knockout-paging.d.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-// Type definitions for knockout-paging
-// Project: https://github.com/ErikSchierboom/knockout-paging
-// Definitions by: Erik Schierboom <https://github.com/ErikSchierboom>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../knockout/knockout.d.ts" />
-
-interface KnockoutStatic {
-    paging: KnockoutPagingOptions;
-	pagedObservableArray<T>(initialValue?: T[], options?: KnockoutPagedOptions): KnockoutPagedObservableArray<T>;
-}
-
-interface KnockoutPagingOptions {
-    defaults: KnockoutPagingDefaultOptions;
-    generators: { 
-    	[name: string]: KnockoutPageGenerator; 
-		'sliding': KnockoutSlidingPageGenerator
-    }
-}
-
-interface KnockoutPagingDefaultOptions {
-    pageNumber: number;
-    pageSize: number;
-}
-
-interface KnockoutPagedObservableArray<T> extends KnockoutObservableArray<T> {
-    pageSize: KnockoutObservable<number>;
-    pageNumber: KnockoutObservable<number>;
-
-    pageItems: KnockoutComputed<T[]>;
-    pageCount: KnockoutComputed<number>;
-    itemCount: KnockoutComputed<number>;
-    firstItemOnPage: KnockoutComputed<number>;
-    lastItemOnPage: KnockoutComputed<number>;
-    hasPreviousPage: KnockoutComputed<boolean>;
-    hasNextPage: KnockoutComputed<boolean>;
-    isFirstPage: KnockoutComputed<boolean>;
-    isLastPage: KnockoutComputed<boolean>;
-    pages: KnockoutComputed<number[]>;
-
-    toNextPage(): void;
-    toPreviousPage(): void;
-    toLastPage(): void;
-    toFirstPage(): void;
-}
-
-interface KnockoutPagedOptions {
-    pageSize?: number;
-    pageNumber?: number;
-    pageGenerator?: string;
-}
-
-interface KnockoutObservableArray<T> {
-    extend(requestedExtenders: { 'paged': any; }): KnockoutPagedObservableArray<T>;
-}
-
-interface KnockoutPageGenerator {
-	generate<T>(pagedObservable: KnockoutPagedObservableArray<T>): number[];
-}
-
-interface KnockoutSlidingPageGenerator extends KnockoutPageGenerator {
-	windowSize: KnockoutObservable<number>;
-}
-
-interface KnockoutExtenders {
-    paged(target: KnockoutObservableArray<any>, options: KnockoutPagedOptions): KnockoutObservableArray<any>;
-}
\ No newline at end of file
diff --git a/knockout-paging/tsconfig.json b/knockout-paging/tsconfig.json
new file mode 100644
index 0000000000..95e2fe0ab3
--- /dev/null
+++ b/knockout-paging/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "knockout-paging-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/knockout-pre-rendered/index.d.ts b/knockout-pre-rendered/index.d.ts
new file mode 100644
index 0000000000..bdff174ac2
--- /dev/null
+++ b/knockout-pre-rendered/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for knockout-pre-rendered
+// Project: https://github.com/ErikSchierboom/knockout-pre-rendered
+// Definitions by: Erik Schierboom <https://github.com/ErikSchierboom>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="knockout" />
+
+interface KnockoutBindingHandlers {
+    init: KnockoutBindingHandler;
+    foreachInit: KnockoutBindingHandler;
+}
\ No newline at end of file
diff --git a/knockout-pre-rendered/knockout-pre-rendered-tests.ts b/knockout-pre-rendered/knockout-pre-rendered-tests.ts
index f3a011e95e..c1e7092425 100644
--- a/knockout-pre-rendered/knockout-pre-rendered-tests.ts
+++ b/knockout-pre-rendered/knockout-pre-rendered-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="knockout-pre-rendered.d.ts" />
+
 
 function initBindingHandler() {
     ko.bindingHandlers.init = {
diff --git a/knockout-pre-rendered/knockout-pre-rendered.d.ts b/knockout-pre-rendered/knockout-pre-rendered.d.ts
deleted file mode 100644
index 72ebb45ea2..0000000000
--- a/knockout-pre-rendered/knockout-pre-rendered.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Type definitions for knockout-pre-rendered
-// Project: https://github.com/ErikSchierboom/knockout-pre-rendered
-// Definitions by: Erik Schierboom <https://github.com/ErikSchierboom>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../knockout/knockout.d.ts" />
-
-interface KnockoutBindingHandlers {
-    init: KnockoutBindingHandler;
-    foreachInit: KnockoutBindingHandler;
-}
\ No newline at end of file
diff --git a/knockout-pre-rendered/tsconfig.json b/knockout-pre-rendered/tsconfig.json
new file mode 100644
index 0000000000..36c985c2d6
--- /dev/null
+++ b/knockout-pre-rendered/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "knockout-pre-rendered-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/knockout-secure-binding/index.d.ts b/knockout-secure-binding/index.d.ts
new file mode 100644
index 0000000000..84a432738b
--- /dev/null
+++ b/knockout-secure-binding/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for knockout-secure-binding
+// Project: https://github.com/brianmhunt/knockout-secure-binding
+// Definitions by: Pine Mizune <https://github.com/pine613>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="knockout" />
+
+interface KnockoutSecureBindingOptions {
+    attribute?: string;
+    globals?: any;
+    bindings?: KnockoutBindingHandlers;
+    noVirtualElements?: boolean;
+}
+
+interface KnockoutSecureBindingProvider extends KnockoutBindingProvider {
+    new (options?: KnockoutSecureBindingOptions): KnockoutBindingProvider;
+}
+
+interface KnockoutStatic {
+    secureBindingsProvider: {
+        new (options?: KnockoutSecureBindingOptions): KnockoutBindingProvider;
+    };
+}
+
+declare module "knockout-secure-binding" {
+    var klass: {
+        new (options?: KnockoutSecureBindingOptions): KnockoutBindingProvider;
+    };
+
+    export = klass;
+}
\ No newline at end of file
diff --git a/knockout-secure-binding/knockout-secure-binding-tests.ts b/knockout-secure-binding/knockout-secure-binding-tests.ts
index d75a818283..aa9cd1e97e 100644
--- a/knockout-secure-binding/knockout-secure-binding-tests.ts
+++ b/knockout-secure-binding/knockout-secure-binding-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="knockout-secure-binding.d.ts" />
+
 
 // knockout-secure-binding
 // The MIT License(MIT)
diff --git a/knockout-secure-binding/knockout-secure-binding.d.ts b/knockout-secure-binding/knockout-secure-binding.d.ts
deleted file mode 100644
index fa3bca7f79..0000000000
--- a/knockout-secure-binding/knockout-secure-binding.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-// Type definitions for knockout-secure-binding
-// Project: https://github.com/brianmhunt/knockout-secure-binding
-// Definitions by: Pine Mizune <https://github.com/pine613>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../knockout/knockout.d.ts" />
-
-interface KnockoutSecureBindingOptions {
-    attribute?: string;
-    globals?: any;
-    bindings?: KnockoutBindingHandlers;
-    noVirtualElements?: boolean;
-}
-
-interface KnockoutSecureBindingProvider extends KnockoutBindingProvider {
-    new (options?: KnockoutSecureBindingOptions): KnockoutBindingProvider;
-}
-
-interface KnockoutStatic {
-    secureBindingsProvider: {
-        new (options?: KnockoutSecureBindingOptions): KnockoutBindingProvider;
-    };
-}
-
-declare module "knockout-secure-binding" {
-    var klass: {
-        new (options?: KnockoutSecureBindingOptions): KnockoutBindingProvider;
-    };
-
-    export = klass;
-}
\ No newline at end of file
diff --git a/knockout-secure-binding/tsconfig.json b/knockout-secure-binding/tsconfig.json
new file mode 100644
index 0000000000..20d23f99f5
--- /dev/null
+++ b/knockout-secure-binding/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "knockout-secure-binding-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/knockout-transformations/index.d.ts b/knockout-transformations/index.d.ts
new file mode 100644
index 0000000000..958eb99fb6
--- /dev/null
+++ b/knockout-transformations/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for knockout-transformations 2.0.0
+// Project: https://github.com/One-com/knockout-transformations
+// Definitions by: John Reilly <https://github.com/johnnyreilly>, Wim Looman <https://github.com/Nemo157>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="knockout" />
+
+declare namespace KnockoutTransformations {
+    interface Mapping<T, TResult> {
+        (value: T): TResult;
+    }
+    interface MappingOption<T, TResult> {
+        mapping: Mapping<T, TResult>;
+        disposeItem?: (item: TResult) => void;
+    }
+    interface MappingWithDisposeCallbackOption<T, TResult> {
+        mappingWithDisposeCallback: (value: T) => {
+            mappedValue: TResult;
+            dispose: () => void;
+        };
+    }
+}
+
+interface KnockoutObservableArrayFunctions<T> {
+    map<TResult>(mapping: KnockoutTransformations.Mapping<T, TResult>): KnockoutObservableArray<TResult>;
+    map<TResult>(mapping: KnockoutTransformations.MappingOption<T, TResult>): KnockoutObservableArray<TResult>;
+    map<TResult>(mapping: KnockoutTransformations.MappingWithDisposeCallbackOption<T, TResult>): KnockoutObservableArray<TResult>;
+
+    filter(predicate: (value: T) => boolean): KnockoutObservableArray<T>;
+    sortBy(sorter: (value: T, descending: (sorter: any) => any) => any): KnockoutObservableArray<T>;
+    indexBy(indexer: (value: T) => string): KnockoutObservable<{ [index: string]: T[] }>;
+    indexBy(indexer: (value: T) => string[]): KnockoutObservable<{ [index: string]: T[] }>;
+    indexBy(indexer: (value: T) => any): KnockoutObservable<any>;
+    uniqueIndexBy(indexer: (value: T) => string): KnockoutObservable<{ [index: string]: T }>;
+}
diff --git a/knockout-transformations/knockout-transformations-tests.ts b/knockout-transformations/knockout-transformations-tests.ts
index 5f132858c9..c8e93fc20e 100644
--- a/knockout-transformations/knockout-transformations-tests.ts
+++ b/knockout-transformations/knockout-transformations-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../knockout/knockout.d.ts" />
-/// <reference path="knockout-transformations.d.ts" />
+/// <reference types="knockout" />
+
 
 // Test map
 var sourceItems: KnockoutObservableArray<number> = ko.observableArray([1, 2, 3, 4, 5]);
diff --git a/knockout-transformations/knockout-transformations.d.ts b/knockout-transformations/knockout-transformations.d.ts
deleted file mode 100644
index 695cf337d5..0000000000
--- a/knockout-transformations/knockout-transformations.d.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// Type definitions for knockout-transformations 2.0.0
-// Project: https://github.com/One-com/knockout-transformations
-// Definitions by: John Reilly <https://github.com/johnnyreilly>, Wim Looman <https://github.com/Nemo157>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../knockout/knockout.d.ts" />
-
-declare namespace KnockoutTransformations {
-    interface Mapping<T, TResult> {
-        (value: T): TResult;
-    }
-    interface MappingOption<T, TResult> {
-        mapping: Mapping<T, TResult>;
-        disposeItem?: (item: TResult) => void;
-    }
-    interface MappingWithDisposeCallbackOption<T, TResult> {
-        mappingWithDisposeCallback: (value: T) => {
-            mappedValue: TResult;
-            dispose: () => void;
-        };
-    }
-}
-
-interface KnockoutObservableArrayFunctions<T> {
-    map<TResult>(mapping: KnockoutTransformations.Mapping<T, TResult>): KnockoutObservableArray<TResult>;
-    map<TResult>(mapping: KnockoutTransformations.MappingOption<T, TResult>): KnockoutObservableArray<TResult>;
-    map<TResult>(mapping: KnockoutTransformations.MappingWithDisposeCallbackOption<T, TResult>): KnockoutObservableArray<TResult>;
-
-    filter(predicate: (value: T) => boolean): KnockoutObservableArray<T>;
-    sortBy(sorter: (value: T, descending: (sorter: any) => any) => any): KnockoutObservableArray<T>;
-    indexBy(indexer: (value: T) => string): KnockoutObservable<{ [index: string]: T[] }>;
-    indexBy(indexer: (value: T) => string[]): KnockoutObservable<{ [index: string]: T[] }>;
-    indexBy(indexer: (value: T) => any): KnockoutObservable<any>;
-    uniqueIndexBy(indexer: (value: T) => string): KnockoutObservable<{ [index: string]: T }>;
-}
diff --git a/knockout-transformations/tsconfig.json b/knockout-transformations/tsconfig.json
new file mode 100644
index 0000000000..a295e7edf8
--- /dev/null
+++ b/knockout-transformations/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "knockout-transformations-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/knockout.amd.helpers/knockout-amd-helpers.d.ts b/knockout.amd.helpers/knockout-amd-helpers.d.ts
deleted file mode 100644
index 80ae89ce6f..0000000000
--- a/knockout.amd.helpers/knockout-amd-helpers.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// Type definitions for knockout-amd-helpers
-// Project: https://github.com/rniemeyer/knockout-amd-helpers
-// Definitions by: David Sichau <https://github.com/DavidSichau>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../knockout/knockout.d.ts" />
-
-
-interface KnockoutAMDModule {
-    baseDir: string;
-    initializer: string;
-    disposeMethod: string;
-    templateProperty: string;
-}
-
-interface KnockoutAMDTemplate {
-    defaultPath: string;
-    defaultSuffix: string;
-    defaultRequireTextPluginName: string;
-}
-
-interface KnockoutBindingHandlers {
-    module: KnockoutAMDModule;
-}
-interface KnockoutStatic {
-
-    amdTemplateEngine: KnockoutAMDTemplate
-}
-
-declare module "knockout-amd-helpers" {
-    export = ko;
-}
-
-declare var ko: KnockoutStatic;
diff --git a/knockout.deferred.updates/index.d.ts b/knockout.deferred.updates/index.d.ts
new file mode 100644
index 0000000000..1a3f080282
--- /dev/null
+++ b/knockout.deferred.updates/index.d.ts
@@ -0,0 +1,46 @@
+// Type definitions for Knockout Deferred Updates
+// Project: https://github.com/mbest/knockout-deferred-updates
+// Definitions by: Sebastián Galiano <https://github.com/sgaliano/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="knockout" />
+
+interface KnockoutDeferredTasks {
+    processImmediate(evaluator: Function, object?: any, args?: any[]): any;
+    processDelayed(evaluator: Function, distinct?: boolean, options?: any[]): boolean;
+    makeProcessedCallback(evaluator: Function): void;
+}
+
+// Knockout global
+interface KnockoutStatic {
+    tasks: KnockoutDeferredTasks;
+    processAllDeferredBindingUpdates(): void;
+    processAllDeferredUpdates(): void;
+    evaluateAsynchronously(evaluator: Function, timeout?: any): number;
+    ignoreDependencies(callback: Function, callbackTarget: any, callbackArgs?: any[]);
+}
+
+// Observables
+interface KnockoutSubscribableFunctions<T> {
+    deferUpdates: boolean;
+}
+
+// Computed
+interface KnockoutComputedStatic {
+    deferUpdates: boolean;
+}
+
+interface KnockoutSubscription {
+    deferUpdates: boolean;
+}
+
+// Utils
+interface KnockoutUtils {
+    objectForEach(obj: any, action: Function): void;
+    objectMap(source: any, mapping: Function): any;
+}
+
+// Deferred extender
+interface KnockoutExtenders {
+    deferred(target: any, value: boolean): any;
+}
\ No newline at end of file
diff --git a/knockout.deferred.updates/knockout.deferred.updates-tests.ts b/knockout.deferred.updates/knockout.deferred.updates-tests.ts
index 060ff3984a..b1ae21cfc9 100644
--- a/knockout.deferred.updates/knockout.deferred.updates-tests.ts
+++ b/knockout.deferred.updates/knockout.deferred.updates-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="knockout.deferred.updates.d.ts" />
+
 
 // Turn *off* deferred updates for computed observables and subscriptions
 ko.computed.deferUpdates = false;
diff --git a/knockout.deferred.updates/knockout.deferred.updates-tests.ts.tscparams b/knockout.deferred.updates/knockout.deferred.updates-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/knockout.deferred.updates/knockout.deferred.updates-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/knockout.deferred.updates/knockout.deferred.updates.d.ts b/knockout.deferred.updates/knockout.deferred.updates.d.ts
deleted file mode 100644
index d3c5d7b40d..0000000000
--- a/knockout.deferred.updates/knockout.deferred.updates.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// Type definitions for Knockout Deferred Updates
-// Project: https://github.com/mbest/knockout-deferred-updates
-// Definitions by: Sebastián Galiano <https://github.com/sgaliano/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../knockout/knockout.d.ts" />
-
-interface KnockoutDeferredTasks {
-    processImmediate(evaluator: Function, object?: any, args?: any[]): any;
-    processDelayed(evaluator: Function, distinct?: boolean, options?: any[]): boolean;
-    makeProcessedCallback(evaluator: Function): void;
-}
-
-// Knockout global
-interface KnockoutStatic {
-    tasks: KnockoutDeferredTasks;
-    processAllDeferredBindingUpdates(): void;
-    processAllDeferredUpdates(): void;
-    evaluateAsynchronously(evaluator: Function, timeout?: any): number;
-    ignoreDependencies(callback: Function, callbackTarget: any, callbackArgs?: any[]);
-}
-
-// Observables
-interface KnockoutSubscribableFunctions<T> {
-    deferUpdates: boolean;
-}
-
-// Computed
-interface KnockoutComputedStatic {
-    deferUpdates: boolean;
-}
-
-interface KnockoutSubscription {
-    deferUpdates: boolean;
-}
-
-// Utils
-interface KnockoutUtils {
-    objectForEach(obj: any, action: Function): void;
-    objectMap(source: any, mapping: Function): any;
-}
-
-// Deferred extender
-interface KnockoutExtenders {
-    deferred(target: any, value: boolean): any;
-}
\ No newline at end of file
diff --git a/knockout.deferred.updates/knockout.deferred.updates.d.ts.tscparams b/knockout.deferred.updates/knockout.deferred.updates.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/knockout.deferred.updates/knockout.deferred.updates.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/knockout.deferred.updates/tsconfig.json b/knockout.deferred.updates/tsconfig.json
new file mode 100644
index 0000000000..5d38fc0000
--- /dev/null
+++ b/knockout.deferred.updates/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "knockout.deferred.updates-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/knockout.editables/index.d.ts b/knockout.editables/index.d.ts
new file mode 100644
index 0000000000..54913e16e4
--- /dev/null
+++ b/knockout.editables/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for knockout-editables 0.9
+// Project: http://romanych.github.com/ko.editables/
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="knockout" />
+
+// bestowed by ko.editable(target)
+interface KnockoutEditable {
+    addEditable(target: any): any;
+    beginEdit(): void;
+    commit(): void;
+    rollback(): void;
+    hasChanges(): boolean;
+}
+
+interface KnockoutEditableStatic {
+    (viewModel: any, autoInit?: boolean): void;
+    beginEdit(scope: string): void;
+    commit(scope: string): void;
+    rollback(scope: string): void;
+    hasChanges(scope: string): boolean;
+
+    // INTERNAL
+    //getHasChangesFlag(scope: string): any;
+    //enable(object: any, scope: string); void;
+}
+
+// extend ko global
+interface KnockoutStatic {
+    editable: KnockoutEditableStatic;
+}
diff --git a/knockout.editables/ko.editables.d.ts b/knockout.editables/ko.editables.d.ts
deleted file mode 100644
index f13f5eece0..0000000000
--- a/knockout.editables/ko.editables.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// Type definitions for knockout-editables 0.9
-// Project: http://romanych.github.com/ko.editables/
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../knockout/knockout.d.ts" />
-
-// bestowed by ko.editable(target)
-interface KnockoutEditable {
-    addEditable(target: any): any;
-    beginEdit(): void;
-    commit(): void;
-    rollback(): void;
-    hasChanges(): boolean;
-}
-
-interface KnockoutEditableStatic {
-    (viewModel: any, autoInit?: boolean): void;
-    beginEdit(scope: string): void;
-    commit(scope: string): void;
-    rollback(scope: string): void;
-    hasChanges(scope: string): boolean;
-
-    // INTERNAL
-    //getHasChangesFlag(scope: string): any;
-    //enable(object: any, scope: string); void;
-}
-
-// extend ko global
-interface KnockoutStatic {
-    editable: KnockoutEditableStatic;
-}
diff --git a/knockout.editables/tsconfig.json b/knockout.editables/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/knockout.editables/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/knockout.es5/index.d.ts b/knockout.es5/index.d.ts
new file mode 100644
index 0000000000..8a663dc597
--- /dev/null
+++ b/knockout.es5/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for Knockout-ES5
+// Project: https://github.com/SteveSanderson/knockout-es5
+// Definitions by: Sebastián Galiano <https://github.com/sgaliano/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="knockout" />
+
+interface KnockoutStatic {
+    track(obj: any, propertyNames?: Array<string>): any;
+    untrack(obj: any, propertyNames?: Array<string>): any;
+    defineProperty(obj: any, propertyName: string, evaluator: Function): any;
+    defineProperty(obj: any, propertyName: string, options: KnockoutDefinePropertyOptions): any;
+    getObservable(obj: any, propertyName: string): KnockoutObservable<any>;
+    valueHasMutated(obj: any, propertyName: string): void;
+}
+
+interface KnockoutDefinePropertyOptions {
+	get(): any;
+	set?(value: any): void;
+}
+
+interface Array<T> {
+	remove(item: T): T[];
+	removeAll(items: T[]): T[];
+	removeAll(): T[];
+
+	destroy(item: T): void;
+	destroyAll(items: T[]): void;
+	destroyAll(): void;
+}
diff --git a/knockout.es5/knockout.es5-tests.ts b/knockout.es5/knockout.es5-tests.ts
index 4177d303b0..a40d48630e 100644
--- a/knockout.es5/knockout.es5-tests.ts
+++ b/knockout.es5/knockout.es5-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="knockout.es5.d.ts" />
+
 
 var empty = {},
     obj = { a: 'string', b: 123, c: true, d: empty },
diff --git a/knockout.es5/knockout.es5.d.ts b/knockout.es5/knockout.es5.d.ts
deleted file mode 100644
index 06309059ef..0000000000
--- a/knockout.es5/knockout.es5.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Type definitions for Knockout-ES5
-// Project: https://github.com/SteveSanderson/knockout-es5
-// Definitions by: Sebastián Galiano <https://github.com/sgaliano/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../knockout/knockout.d.ts" />
-
-interface KnockoutStatic {
-    track(obj: any, propertyNames?: Array<string>): any;
-    untrack(obj: any, propertyNames?: Array<string>): any;
-    defineProperty(obj: any, propertyName: string, evaluator: Function): any;
-    defineProperty(obj: any, propertyName: string, options: KnockoutDefinePropertyOptions): any;
-    getObservable(obj: any, propertyName: string): KnockoutObservable<any>;
-    valueHasMutated(obj: any, propertyName: string): void;
-}
-
-interface KnockoutDefinePropertyOptions {
-	get(): any;
-	set?(value: any): void;
-}
-
-interface Array<T> {
-	remove(item: T): T[];
-	removeAll(items: T[]): T[];
-	removeAll(): T[];
-
-	destroy(item: T): void;
-	destroyAll(items: T[]): void;
-	destroyAll(): void;
-}
diff --git a/knockout.es5/tsconfig.json b/knockout.es5/tsconfig.json
new file mode 100644
index 0000000000..ab71b2a487
--- /dev/null
+++ b/knockout.es5/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "knockout.es5-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/knockout.kogrid/index.d.ts b/knockout.kogrid/index.d.ts
new file mode 100644
index 0000000000..fa93eef84f
--- /dev/null
+++ b/knockout.kogrid/index.d.ts
@@ -0,0 +1,193 @@
+// Type definitions for ko-grid
+// Project: http://knockout-contrib.github.io/KoGrid/
+// Definitions by: huer12 <https://github.com/huer12/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// These are very definitely preliminary. Please feel free to improve.
+
+/// <reference types="knockout" />
+
+declare namespace kg {
+    export interface DomUtilityService {
+        UpdateGridLayout(grid: Grid<any>): void;
+        BuildStyles(grid: Grid<any>): void;
+    }
+
+    var domUtilityService: DomUtilityService;
+
+    export interface Row<EntityType> {
+        selected: KnockoutObservable<boolean>;
+        entity: EntityType;
+    }
+
+    export interface RowFactory<EntityType> {
+        rowCache: Row<EntityType>[];
+    }
+
+    export interface SelectionService<EntityType>  {
+        setSelection(row: Row<EntityType>, selected: boolean): void;
+        multi: boolean;
+        lastClickedRow: Row<EntityType>;
+    }
+
+    export interface Grid<EntityType> {
+        configureColumnWidths(): void;
+        rowFactory: RowFactory<EntityType>;
+        config: GridOptions<EntityType>;
+        $$selectionPhase: boolean;
+        selectionService: SelectionService<EntityType>;
+    }
+
+    export interface Plugin<EntityType> {
+        onGridInit(grid: Grid<EntityType>): void;
+    }
+
+    export interface GridOptions<EntityType> {
+        /** Callback for when you want to validate something after selection. */
+        afterSelectionChange?(row: Row<EntityType>): void;
+
+        /** Callback if you want to inspect something before selection,
+        return false if you want to cancel the selection. return true otherwise.
+        If you need to wait for an async call to proceed with selection you can
+        use rowItem.changeSelection(event) method after returning false initially.
+        Note: when shift+ Selecting multiple items in the grid this will only get called
+        once and the rowItem will be an array of items that are queued to be selected. */
+        beforeSelectionChange?: Function;
+
+        /** definitions of columns as an array [], if not defined columns are auto-generated. See github wiki for more details. */
+        columnDefs?: ColumnDef[];
+
+        /** Column width of columns in grid. */
+        columnWidth?: number;
+
+        /** Data being displayed in the grid. Each item in the array is mapped to a row being displayed. */
+        data?: KnockoutObservableArray<EntityType>;
+
+        /** Row selection check boxes appear as the first column. */
+        displaySelectionCheckbox: boolean;
+
+        /** Enable or disable resizing of columns */
+        enableColumnResize?: boolean;
+
+        /** Enables the server-side paging feature */
+        enablePaging?: boolean;
+
+        /** Enable column pinning */
+        enablePinning?: boolean;
+
+        /** Enable drag and drop row reordering. Only works in HTML5 compliant browsers. */
+        enableRowReordering?: boolean;
+
+        /** To be able to have selectable rows in grid. */
+        enableRowSelection?: boolean;
+
+        /** Enables or disables sorting in grid. */
+        enableSorting?: boolean;
+
+        /** filterOptions -
+        filterText: The text bound to the built-in search box.
+        useExternalFilter: Bypass internal filtering if you want to roll your own filtering mechanism but want to use builtin search box.
+        */
+        filterOptions?: FilterOptions;
+
+        /** Defining the height of the footer in pixels. */
+        footerRowHeight?: number;
+
+        /** Show or hide the footer alltogether the footer is enabled by default */
+        footerVisible?: boolean;
+
+        /** Initial fields to group data by. Array of field names, not displayName. */
+        groups?: string[];
+
+        /** The height of the header row in pixels. */
+        headerRowHeight?: number;
+
+        /** Define a header row template for further customization. See github wiki for more details. */
+        headerRowTemplate?: any;
+
+        /** Enables the use of jquery UI reaggable/droppable plugin. requires jqueryUI to work if enabled.
+        Useful if you want drag + drop but your users insist on crappy browsers. */
+        jqueryUIDraggable?: boolean;
+
+        /** Enable the use jqueryUIThemes */
+        jqueryUITheme?: boolean;
+
+        /** Prevent unselections when in single selection mode. */
+        keepLastSelected?: boolean;
+
+        /** Maintains the column widths while resizing.
+        Defaults to true when using *'s or undefined widths. Can be ovverriden by setting to false. */
+        maintainColumnRatios?: any;
+
+        /** Set this to false if you only want one item selected at a time */
+        multiSelect?: boolean;
+
+        /**  pagingOptions - */
+        pagingOptions?: PagingOptions;
+
+        /** Array of plugin functions to register in ng-grid */
+        plugins?: Plugin<EntityType>[];
+
+        /** Row height of rows in grid. */
+        rowHeight?: number;
+
+        /** Define a row template to customize output. See github wiki for more details. */
+        rowTemplate?: any;
+
+        /** all of the items selected in the grid. In single select mode there will only be one item in the array. */
+        selectedItems?: KnockoutObservableArray<any>;
+
+        /** Disable row selections by clicking on the row and only when the checkbox is clicked. */
+        selectWithCheckboxOnly?: boolean;
+
+        /** Enables menu to choose which columns to display and group by.
+        If both showColumnMenu and showFilter are false the menu button will not display.*/
+        showColumnMenu?: boolean;
+
+        /** Enables display of the filterbox in the column menu.
+        If both showColumnMenu and showFilter are false the menu button will not display.*/
+        showFilter?: boolean;
+
+        /** Show the dropzone for drag and drop grouping */
+        showGroupPanel?: boolean;
+
+        /** Define a sortInfo object to specify a default sorting state.
+        You can also observe this variable to utilize server-side sorting (see useExternalSorting).
+        Syntax is sortinfo: { fields: ['fieldName1',' fieldName2'], direction: 'ASC'/'asc' || 'desc'/'DESC'}*/
+        sortInfo?: any;
+
+        /** Set the tab index of the Vieport. */
+        tabIndex?: number;
+
+        /** Prevents the internal sorting from executing.
+        The sortInfo object will be updated with the sorting information so you can handle sorting (see sortInfo)*/
+        useExternalSorting?: boolean;
+    }
+
+    export interface ColumnDef {
+        /** The string name of the property in your data model you want that column to represent. Can also be a property path on your data model. 'foo.bar.myField', 'Name.First', etc.. */
+        field: string;
+
+        /** Sets the pretty display name of the column. default is the field given */
+        displayName?: string;
+
+        /** Sets the width of the column. Can be a fixed width in pixels as an int (42), string px('42px'), percentage string ('42%'), weighted asterisks (width divided by total number of *'s is all column definition widths) See github wiki for more details. */
+        width?: string;
+    }
+
+    export interface FilterOptions {
+        filterText?: string;
+        useExternalFilter?: boolean;
+    }
+
+    export interface PagingOptions {
+        /**  pageSizes: list of available page sizes.  */
+        pageSizes?: number[];
+        /** pageSize: currently selected page size.  */
+        pageSize?: number;
+        /** totalServerItems: Total items are on the server.  */
+        totalServerItems?: number;
+        /** currentPage: the uhm... current page. */
+        currentPage?: number;
+    }
+}
diff --git a/knockout.kogrid/knockout.kogrid-tests.ts b/knockout.kogrid/knockout.kogrid-tests.ts
index c51ddd78d1..8abe83d36d 100644
--- a/knockout.kogrid/knockout.kogrid-tests.ts
+++ b/knockout.kogrid/knockout.kogrid-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../knockout/knockout.d.ts" />
-/// <reference path="ko-grid.d.ts" />
+/// <reference types="knockout" />
+
 
 namespace KoGridTests
 {
diff --git a/knockout.kogrid/ko-grid.d.ts b/knockout.kogrid/ko-grid.d.ts
deleted file mode 100644
index cc10fa4d9e..0000000000
--- a/knockout.kogrid/ko-grid.d.ts
+++ /dev/null
@@ -1,193 +0,0 @@
-// Type definitions for ko-grid
-// Project: http://knockout-contrib.github.io/KoGrid/
-// Definitions by: huer12 <https://github.com/huer12/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// These are very definitely preliminary. Please feel free to improve.
-
-/// <reference path="../knockout/knockout.d.ts" />
-
-declare namespace kg {
-    export interface DomUtilityService {
-        UpdateGridLayout(grid: Grid<any>): void;
-        BuildStyles(grid: Grid<any>): void;
-    }
-
-    var domUtilityService: DomUtilityService;
-
-    export interface Row<EntityType> {
-        selected: KnockoutObservable<boolean>;
-        entity: EntityType;
-    }
-
-    export interface RowFactory<EntityType> {
-        rowCache: Row<EntityType>[];
-    }
-
-    export interface SelectionService<EntityType>  {
-        setSelection(row: Row<EntityType>, selected: boolean): void;
-        multi: boolean;
-        lastClickedRow: Row<EntityType>;
-    }
-
-    export interface Grid<EntityType> {
-        configureColumnWidths(): void;
-        rowFactory: RowFactory<EntityType>;
-        config: GridOptions<EntityType>;
-        $$selectionPhase: boolean;
-        selectionService: SelectionService<EntityType>;
-    }
-
-    export interface Plugin<EntityType> {
-        onGridInit(grid: Grid<EntityType>): void;
-    }
-
-    export interface GridOptions<EntityType> {
-        /** Callback for when you want to validate something after selection. */
-        afterSelectionChange?(row: Row<EntityType>): void;
-
-        /** Callback if you want to inspect something before selection,
-        return false if you want to cancel the selection. return true otherwise.
-        If you need to wait for an async call to proceed with selection you can
-        use rowItem.changeSelection(event) method after returning false initially.
-        Note: when shift+ Selecting multiple items in the grid this will only get called
-        once and the rowItem will be an array of items that are queued to be selected. */
-        beforeSelectionChange?: Function;
-
-        /** definitions of columns as an array [], if not defined columns are auto-generated. See github wiki for more details. */
-        columnDefs?: ColumnDef[];
-
-        /** Column width of columns in grid. */
-        columnWidth?: number;
-
-        /** Data being displayed in the grid. Each item in the array is mapped to a row being displayed. */
-        data?: KnockoutObservableArray<EntityType>;
-
-        /** Row selection check boxes appear as the first column. */
-        displaySelectionCheckbox: boolean;
-
-        /** Enable or disable resizing of columns */
-        enableColumnResize?: boolean;
-
-        /** Enables the server-side paging feature */
-        enablePaging?: boolean;
-
-        /** Enable column pinning */
-        enablePinning?: boolean;
-
-        /** Enable drag and drop row reordering. Only works in HTML5 compliant browsers. */
-        enableRowReordering?: boolean;
-
-        /** To be able to have selectable rows in grid. */
-        enableRowSelection?: boolean;
-
-        /** Enables or disables sorting in grid. */
-        enableSorting?: boolean;
-
-        /** filterOptions -
-        filterText: The text bound to the built-in search box.
-        useExternalFilter: Bypass internal filtering if you want to roll your own filtering mechanism but want to use builtin search box.
-        */
-        filterOptions?: FilterOptions;
-
-        /** Defining the height of the footer in pixels. */
-        footerRowHeight?: number;
-
-        /** Show or hide the footer alltogether the footer is enabled by default */
-        footerVisible?: boolean;
-
-        /** Initial fields to group data by. Array of field names, not displayName. */
-        groups?: string[];
-
-        /** The height of the header row in pixels. */
-        headerRowHeight?: number;
-
-        /** Define a header row template for further customization. See github wiki for more details. */
-        headerRowTemplate?: any;
-
-        /** Enables the use of jquery UI reaggable/droppable plugin. requires jqueryUI to work if enabled.
-        Useful if you want drag + drop but your users insist on crappy browsers. */
-        jqueryUIDraggable?: boolean;
-
-        /** Enable the use jqueryUIThemes */
-        jqueryUITheme?: boolean;
-
-        /** Prevent unselections when in single selection mode. */
-        keepLastSelected?: boolean;
-
-        /** Maintains the column widths while resizing.
-        Defaults to true when using *'s or undefined widths. Can be ovverriden by setting to false. */
-        maintainColumnRatios?: any;
-
-        /** Set this to false if you only want one item selected at a time */
-        multiSelect?: boolean;
-
-        /**  pagingOptions - */
-        pagingOptions?: PagingOptions;
-
-        /** Array of plugin functions to register in ng-grid */
-        plugins?: Plugin<EntityType>[];
-
-        /** Row height of rows in grid. */
-        rowHeight?: number;
-
-        /** Define a row template to customize output. See github wiki for more details. */
-        rowTemplate?: any;
-
-        /** all of the items selected in the grid. In single select mode there will only be one item in the array. */
-        selectedItems?: KnockoutObservableArray<any>;
-
-        /** Disable row selections by clicking on the row and only when the checkbox is clicked. */
-        selectWithCheckboxOnly?: boolean;
-
-        /** Enables menu to choose which columns to display and group by.
-        If both showColumnMenu and showFilter are false the menu button will not display.*/
-        showColumnMenu?: boolean;
-
-        /** Enables display of the filterbox in the column menu.
-        If both showColumnMenu and showFilter are false the menu button will not display.*/
-        showFilter?: boolean;
-
-        /** Show the dropzone for drag and drop grouping */
-        showGroupPanel?: boolean;
-
-        /** Define a sortInfo object to specify a default sorting state.
-        You can also observe this variable to utilize server-side sorting (see useExternalSorting).
-        Syntax is sortinfo: { fields: ['fieldName1',' fieldName2'], direction: 'ASC'/'asc' || 'desc'/'DESC'}*/
-        sortInfo?: any;
-
-        /** Set the tab index of the Vieport. */
-        tabIndex?: number;
-
-        /** Prevents the internal sorting from executing.
-        The sortInfo object will be updated with the sorting information so you can handle sorting (see sortInfo)*/
-        useExternalSorting?: boolean;
-    }
-
-    export interface ColumnDef {
-        /** The string name of the property in your data model you want that column to represent. Can also be a property path on your data model. 'foo.bar.myField', 'Name.First', etc.. */
-        field: string;
-
-        /** Sets the pretty display name of the column. default is the field given */
-        displayName?: string;
-
-        /** Sets the width of the column. Can be a fixed width in pixels as an int (42), string px('42px'), percentage string ('42%'), weighted asterisks (width divided by total number of *'s is all column definition widths) See github wiki for more details. */
-        width?: string;
-    }
-
-    export interface FilterOptions {
-        filterText?: string;
-        useExternalFilter?: boolean;
-    }
-
-    export interface PagingOptions {
-        /**  pageSizes: list of available page sizes.  */
-        pageSizes?: number[];
-        /** pageSize: currently selected page size.  */
-        pageSize?: number;
-        /** totalServerItems: Total items are on the server.  */
-        totalServerItems?: number;
-        /** currentPage: the uhm... current page. */
-        currentPage?: number;
-    }
-}
diff --git a/knockout.kogrid/tsconfig.json b/knockout.kogrid/tsconfig.json
new file mode 100644
index 0000000000..1a3488e12d
--- /dev/null
+++ b/knockout.kogrid/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "knockout.kogrid-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/knockout.mapper/index.d.ts b/knockout.mapper/index.d.ts
new file mode 100644
index 0000000000..747a3d1f4a
--- /dev/null
+++ b/knockout.mapper/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for Knockout.Mapper 
+// Project: https://github.com/LucasLorentz/knockout.mapper
+// Definitions by: Brandon Meyer <https://github.com/BMeyerKC>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="knockout" />
+
+interface KnockoutMapper {
+    fromJS(value: any, options?: any, target?: any, wrap?: boolean): any;
+    toJS(value: any, options?: any): any;
+}
+
+interface KnockoutStatic {
+    mapper: KnockoutMapper;
+}
diff --git a/knockout.mapper/knockout.mapper.d.ts b/knockout.mapper/knockout.mapper.d.ts
deleted file mode 100644
index 3836b36fc6..0000000000
--- a/knockout.mapper/knockout.mapper.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Type definitions for Knockout.Mapper 
-// Project: https://github.com/LucasLorentz/knockout.mapper
-// Definitions by: Brandon Meyer <https://github.com/BMeyerKC>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../knockout/knockout.d.ts" />
-
-interface KnockoutMapper {
-    fromJS(value: any, options?: any, target?: any, wrap?: boolean): any;
-    toJS(value: any, options?: any): any;
-}
-
-interface KnockoutStatic {
-    mapper: KnockoutMapper;
-}
diff --git a/knockout.mapper/tsconfig.json b/knockout.mapper/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/knockout.mapper/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/knockout.mapping/index.d.ts b/knockout.mapping/index.d.ts
new file mode 100644
index 0000000000..94c243767f
--- /dev/null
+++ b/knockout.mapping/index.d.ts
@@ -0,0 +1,70 @@
+// Type definitions for Knockout.Mapping 2.0
+// Project: https://github.com/SteveSanderson/knockout.mapping
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="knockout" />
+
+export as namespace mapping;
+
+declare var self: KnockoutMapping;
+export = self;
+
+declare global {
+    interface KnockoutMappingCreateOptions {
+        data: any;
+        parent: any;
+    }
+
+    interface KnockoutMappingUpdateOptions {
+        data: any;
+        parent: any;
+        target: any;
+        observable?: KnockoutObservable<any>;
+    }
+
+    interface KnockoutMappingOptions {
+        ignore?: string[];
+        include?: string[];
+        copy?: string[];
+        mappedProperties?: string[];
+        deferEvaluation?: boolean;
+        create?: (options: KnockoutMappingCreateOptions) => void;
+        update?: (options: KnockoutMappingUpdateOptions) => void;
+        key?: (data: any) => any;
+    }
+
+    interface KnockoutMapping {
+        isMapped(viewModel: any): boolean;
+        fromJS(jsObject: any): any;
+        fromJS(jsObject: any, targetOrOptions: any): any;
+        fromJS(jsObject: any, inputOptions: any, target: any): any;
+        fromJSON(jsonString: string): any;
+        fromJSON(jsonString: string, targetOrOptions: any): any;
+        fromJSON(jsonString: string, inputOptions: any, target: any): any;
+        toJS(rootObject: any, options?: KnockoutMappingOptions): any;
+        toJSON(rootObject: any, options?: KnockoutMappingOptions): any;
+        defaultOptions(): KnockoutMappingOptions;
+        resetDefaultOptions(): void;
+        getType(x: any): any;
+        visitModel(rootObject: any, callback: Function, options?: { visitedObjects?: any; parentName?: string; ignore?: string[]; copy?: string[]; include?: string[]; }): any;
+    }
+
+    interface KnockoutObservableArrayFunctions<T> {
+        mappedCreate(item: T): T;
+
+        mappedRemove(item: T): T[];
+        mappedRemove(removeFunction: (item: T) => boolean): T[];
+        mappedRemoveAll(items: T[]): T[];
+        mappedRemoveAll(): T[];
+
+        mappedDestroy(item: T): void;
+        mappedDestroy(destroyFunction: (item: T) => boolean): void;
+        mappedDestroyAll(items: T[]): void;
+        mappedDestroyAll(): void;
+    }
+
+    interface KnockoutStatic {
+        mapping: KnockoutMapping;
+    }
+}
diff --git a/knockout.mapping/knockout.mapping-tests.ts b/knockout.mapping/knockout.mapping-tests.ts
index bac7aac006..7b1a9aca8d 100644
--- a/knockout.mapping/knockout.mapping-tests.ts
+++ b/knockout.mapping/knockout.mapping-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="knockout.mapping.d.ts" />
-/// <reference path="../knockout/knockout.d.ts" />
+
+/// <reference types="knockout" />
 
 var inputJSON = '{ name: "foo" }';
 var inputData = { name: 'foo' };
diff --git a/knockout.mapping/knockout.mapping.d.ts b/knockout.mapping/knockout.mapping.d.ts
deleted file mode 100644
index fcb8680170..0000000000
--- a/knockout.mapping/knockout.mapping.d.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-// Type definitions for Knockout.Mapping 2.0
-// Project: https://github.com/SteveSanderson/knockout.mapping
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../knockout/knockout.d.ts" />
-
-interface KnockoutMappingCreateOptions {
-    data: any;
-    parent: any;
-}
-
-interface KnockoutMappingUpdateOptions {
-    data: any;
-    parent: any;
-    target: any;
-    observable?: KnockoutObservable<any>;
-}
-
-interface KnockoutMappingOptions {
-    ignore?: string[];
-    include?: string[];
-    copy?: string[];
-    mappedProperties?: string[];
-    deferEvaluation?: boolean;
-    create?: (options: KnockoutMappingCreateOptions) => void;
-    update?: (options: KnockoutMappingUpdateOptions) => void;
-    key?: (data: any) => any;
-}
-
-interface KnockoutMapping {
-    isMapped(viewModel: any): boolean;
-    fromJS(jsObject: any): any;
-    fromJS(jsObject: any, targetOrOptions: any): any;
-    fromJS(jsObject: any, inputOptions: any, target: any): any;
-    fromJSON(jsonString: string): any;
-    fromJSON(jsonString: string, targetOrOptions: any): any;
-    fromJSON(jsonString: string, inputOptions: any, target: any): any;
-    toJS(rootObject: any, options?: KnockoutMappingOptions): any;
-    toJSON(rootObject: any, options?: KnockoutMappingOptions): any;
-    defaultOptions(): KnockoutMappingOptions;
-    resetDefaultOptions(): void;
-    getType(x: any): any;
-    visitModel(rootObject: any, callback: Function, options?: { visitedObjects?: any; parentName?: string; ignore?: string[]; copy?: string[]; include?: string[]; }): any;
-}
-
-interface KnockoutObservableArrayFunctions<T> {
-    mappedCreate(item: T): T;
-
-    mappedRemove(item: T): T[];
-    mappedRemove(removeFunction: (item: T) => boolean): T[];
-    mappedRemoveAll(items: T[]): T[];
-    mappedRemoveAll(): T[];
-
-    mappedDestroy(item: T): void;
-    mappedDestroy(destroyFunction: (item: T) => boolean): void;
-    mappedDestroyAll(items: T[]): void;
-    mappedDestroyAll(): void;
-}
-
-interface KnockoutStatic {
-    mapping: KnockoutMapping;
-}
-
-declare module "knockout.mapping" {
-    export = mapping;
-}
-declare var mapping: KnockoutMapping;
diff --git a/knockout.mapping/tsconfig.json b/knockout.mapping/tsconfig.json
new file mode 100644
index 0000000000..263878c5b1
--- /dev/null
+++ b/knockout.mapping/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "knockout.mapping-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/knockout.postbox/index.d.ts b/knockout.postbox/index.d.ts
new file mode 100644
index 0000000000..56afa3a2b6
--- /dev/null
+++ b/knockout.postbox/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for knockout-postbox
+// Project: https://github.com/rniemeyer/knockout-postbox
+// Definitions by: Judah Gabriel Himango <https://debuggerdotbreak.wordpress.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="knockout" />
+
+interface KnockoutPostBox {
+    subscribe<T>(topic: string, handler: (value: T) => void , target?: any): KnockoutSubscription;
+    publish<T>(topic: string, value?: T): void;
+    defaultComparer<T>(newValue: T, oldValue: T): boolean;
+    serializer: (object: any) => string;
+    reset(): void;
+}
+
+interface KnockoutObservable<T> {
+    subscribeTo(topic: string, useLastPublishedValueToInitialize?: boolean, transform?: (val: any) => T): KnockoutObservable<T>;
+    unsubscribeFrom(topic: string): KnockoutObservable<T>;
+    publishOn(topic: string, skipInitialPublish?: boolean, equalityComparer?: (newValue: T, oldValue: T) => boolean): KnockoutObservable<T>;
+    stopPublishingOn(topic: string): KnockoutObservable<T>;
+    syncWith(topic: string, initializeWithLatestValue?: boolean, skipInitialPublish?: boolean, equalityComparer?: (newValue: T, oldValue: T) => boolean): KnockoutObservable<T>;
+}
+
+interface KnockoutObservableArray<T> {
+	subscribeTo(topic: string, useLastPublishedValueToInitialize?: boolean, transform?: (val: any) => any /* T */): KnockoutObservableArray<T>;
+	unsubscribeFrom(topic: string): KnockoutObservableArray<T>;
+	publishOn(topic: string, skipInitialPublish?: boolean, equalityComparer?: (newValue: any /* T */, oldValue: any /* T */) => boolean): KnockoutObservableArray<T>;
+	stopPublishingOn(topic: string): KnockoutObservableArray<T>;
+	syncWith(topic: string, initializeWithLatestValue?: boolean, skipInitialPublish?: boolean, equalityComparer?: (newValue: any /* T */, oldValue: any /* T */) => boolean): KnockoutObservableArray<T>;
+}
+
+interface KnockoutStatic {
+    postbox: KnockoutPostBox;
+}
diff --git a/knockout.postbox/knockout-postbox.d.ts b/knockout.postbox/knockout-postbox.d.ts
deleted file mode 100644
index 5e2430d1e4..0000000000
--- a/knockout.postbox/knockout-postbox.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// Type definitions for knockout-postbox
-// Project: https://github.com/rniemeyer/knockout-postbox
-// Definitions by: Judah Gabriel Himango <https://debuggerdotbreak.wordpress.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../knockout/knockout.d.ts" />
-
-interface KnockoutPostBox {
-    subscribe<T>(topic: string, handler: (value: T) => void , target?: any): KnockoutSubscription;
-    publish<T>(topic: string, value?: T): void;
-    defaultComparer<T>(newValue: T, oldValue: T): boolean;
-    serializer: (object: any) => string;
-    reset(): void;
-}
-
-interface KnockoutObservable<T> {
-    subscribeTo(topic: string, useLastPublishedValueToInitialize?: boolean, transform?: (val: any) => T): KnockoutObservable<T>;
-    unsubscribeFrom(topic: string): KnockoutObservable<T>;
-    publishOn(topic: string, skipInitialPublish?: boolean, equalityComparer?: (newValue: T, oldValue: T) => boolean): KnockoutObservable<T>;
-    stopPublishingOn(topic: string): KnockoutObservable<T>;
-    syncWith(topic: string, initializeWithLatestValue?: boolean, skipInitialPublish?: boolean, equalityComparer?: (newValue: T, oldValue: T) => boolean): KnockoutObservable<T>;
-}
-
-interface KnockoutObservableArray<T> {
-	subscribeTo(topic: string, useLastPublishedValueToInitialize?: boolean, transform?: (val: any) => any /* T */): KnockoutObservableArray<T>;
-	unsubscribeFrom(topic: string): KnockoutObservableArray<T>;
-	publishOn(topic: string, skipInitialPublish?: boolean, equalityComparer?: (newValue: any /* T */, oldValue: any /* T */) => boolean): KnockoutObservableArray<T>;
-	stopPublishingOn(topic: string): KnockoutObservableArray<T>;
-	syncWith(topic: string, initializeWithLatestValue?: boolean, skipInitialPublish?: boolean, equalityComparer?: (newValue: any /* T */, oldValue: any /* T */) => boolean): KnockoutObservableArray<T>;
-}
-
-interface KnockoutStatic {
-    postbox: KnockoutPostBox;
-}
diff --git a/knockout.postbox/tsconfig.json b/knockout.postbox/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/knockout.postbox/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/knockout.projections/index.d.ts b/knockout.projections/index.d.ts
new file mode 100644
index 0000000000..aae8b55f57
--- /dev/null
+++ b/knockout.projections/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for knockout-projections 1.0.0
+// Project: https://github.com/stevesanderson/knockout-projections
+// Definitions by: John Reilly <https://github.com/johnnyreilly>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="knockout" />
+
+interface KnockoutMappedObservableArray<T> extends KnockoutObservableArray<T>, KnockoutSubscription {
+}
+
+interface KnockoutObservableArrayFunctions<T> {
+    map<TResult>(mappingOptions: {
+        mappingWithDisposeCallback: (value: T) => {
+            mappedValue: TResult;
+            dispose: () => void;
+        };
+    }): KnockoutMappedObservableArray<TResult>;
+    map<TResult>(mappingOptions: {
+        mapping: (value: T) => TResult;
+        disposeItem?: (mappedItem: TResult) => void;
+    }): KnockoutMappedObservableArray<TResult>;
+    map<TResult>(mappingOptions: (value: T) => TResult): KnockoutMappedObservableArray<TResult>;
+    
+    filter(predicate: (value: T) => boolean): KnockoutMappedObservableArray<T>;
+}
diff --git a/knockout.projections/knockout.projections-tests.ts b/knockout.projections/knockout.projections-tests.ts
index 138d369465..c0899c81ee 100644
--- a/knockout.projections/knockout.projections-tests.ts
+++ b/knockout.projections/knockout.projections-tests.ts
@@ -1,7 +1,7 @@
 // Tests for knockout.projections.d.ts
 
-/// <reference path="../knockout/knockout.d.ts" />
-/// <reference path="knockout.projections.d.ts" />
+/// <reference types="knockout" />
+
 
 // Test map
 var sourceItems = ko.observableArray([1, 2, 3, 4, 5]);
diff --git a/knockout.projections/knockout.projections.d.ts b/knockout.projections/knockout.projections.d.ts
deleted file mode 100644
index d9a48ec022..0000000000
--- a/knockout.projections/knockout.projections.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-// Type definitions for knockout-projections 1.0.0
-// Project: https://github.com/stevesanderson/knockout-projections
-// Definitions by: John Reilly <https://github.com/johnnyreilly>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../knockout/knockout.d.ts" />
-
-interface KnockoutMappedObservableArray<T> extends KnockoutObservableArray<T>, KnockoutSubscription {
-}
-
-interface KnockoutObservableArrayFunctions<T> {
-    map<TResult>(mappingOptions: {
-        mappingWithDisposeCallback: (value: T) => {
-            mappedValue: TResult;
-            dispose: () => void;
-        };
-    }): KnockoutMappedObservableArray<TResult>;
-    map<TResult>(mappingOptions: {
-        mapping: (value: T) => TResult;
-        disposeItem?: (mappedItem: TResult) => void;
-    }): KnockoutMappedObservableArray<TResult>;
-    map<TResult>(mappingOptions: (value: T) => TResult): KnockoutMappedObservableArray<TResult>;
-    
-    filter(predicate: (value: T) => boolean): KnockoutMappedObservableArray<T>;
-}
diff --git a/knockout.projections/tsconfig.json b/knockout.projections/tsconfig.json
new file mode 100644
index 0000000000..c6db4562fb
--- /dev/null
+++ b/knockout.projections/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "knockout.projections-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/knockout.punches/index.d.ts b/knockout.punches/index.d.ts
new file mode 100644
index 0000000000..a7dc70e84d
--- /dev/null
+++ b/knockout.punches/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for knockout.punches 0.5.1
+// Project: https://github.com/mbest/knockout.punches
+// Definitions by: Stephen Lautier <https://github.com/johnnyreilly>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="knockout" />
+
+interface KnockoutPunchesStatic {
+	enableAll(): void;
+}
+
+interface KnockoutStatic {
+	punches: KnockoutPunchesStatic;
+}
+
+declare module "knockout.punches" {
+	export = punches;
+}
+
+declare var punches: KnockoutPunchesStatic;
\ No newline at end of file
diff --git a/knockout.punches/knockout.punches-tests.ts b/knockout.punches/knockout.punches-tests.ts
index bd5d53a5c5..8b387272ac 100644
--- a/knockout.punches/knockout.punches-tests.ts
+++ b/knockout.punches/knockout.punches-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../knockout.punches/knockout.punches.d.ts" />
+/// <reference types="knockout.punches" />
 
 
 function test_enable() {
diff --git a/knockout.punches/knockout.punches.d.ts b/knockout.punches/knockout.punches.d.ts
deleted file mode 100644
index 82c741ab45..0000000000
--- a/knockout.punches/knockout.punches.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Type definitions for knockout.punches 0.5.1
-// Project: https://github.com/mbest/knockout.punches
-// Definitions by: Stephen Lautier <https://github.com/johnnyreilly>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../knockout/knockout.d.ts" />
-
-interface KnockoutPunchesStatic {
-	enableAll(): void;
-}
-
-interface KnockoutStatic {
-	punches: KnockoutPunchesStatic;
-}
-
-declare module "knockout.punches" {
-	export = punches;
-}
-
-declare var punches: KnockoutPunchesStatic;
\ No newline at end of file
diff --git a/knockout.punches/tsconfig.json b/knockout.punches/tsconfig.json
new file mode 100644
index 0000000000..a44d247540
--- /dev/null
+++ b/knockout.punches/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "knockout.punches-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/knockout.rx/index.d.ts b/knockout.rx/index.d.ts
new file mode 100644
index 0000000000..82a5473f1c
--- /dev/null
+++ b/knockout.rx/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for knockout.rx 1.0
+// Project: https://github.com/Igorbek/knockout.rx
+// Definitions by: Igor Oleinikov <https://github.com/Igorbek>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="knockout"/>
+/// <reference types="rx"/>
+
+interface KnockoutSubscribableFunctions<T> {
+	toObservable(event?: string): Rx.Observable<T>;
+	toObservable<TEvent>(event: string): Rx.Observable<TEvent>;
+}
+
+interface KnockoutObservableFunctions<T> {
+	toObservableWithReplyLatest(): Rx.Observable<T>;
+	toSubject(): Rx.ISubject<T>;
+}
+
+interface KnockoutComputedFunctions<T> {
+	toObservableWithReplyLatest(): Rx.Observable<T>;
+}
+
+declare namespace Rx {
+	interface Observable<T> {
+		toKoSubscribable(): KnockoutSubscribable<T>;
+		toKoObservable(initialValue?: T): KnockoutObservable<T>;
+	}
+
+	interface Subject<T> {
+		toKoObservable(initialValue?: T): KnockoutObservable<T>;
+	}
+}
diff --git a/knockout.rx/knockout.rx-tests.ts b/knockout.rx/knockout.rx-tests.ts
index 21a0a52484..3c34f54433 100644
--- a/knockout.rx/knockout.rx-tests.ts
+++ b/knockout.rx/knockout.rx-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="knockout.rx.d.ts"/>
-
 var ax: Rx.Observable<number>;
 
 var ao = ax.toKoObservable();
diff --git a/knockout.rx/knockout.rx.d.ts b/knockout.rx/knockout.rx.d.ts
deleted file mode 100644
index 659f7eb2ab..0000000000
--- a/knockout.rx/knockout.rx.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// Type definitions for knockout.rx 1.0
-// Project: https://github.com/Igorbek/knockout.rx
-// Definitions by: Igor Oleinikov <https://github.com/Igorbek>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../knockout/knockout.d.ts"/>
-/// <reference path="../rx/rx.d.ts"/>
-
-interface KnockoutSubscribableFunctions<T> {
-	toObservable(event?: string): Rx.Observable<T>;
-	toObservable<TEvent>(event: string): Rx.Observable<TEvent>;
-}
-
-interface KnockoutObservableFunctions<T> {
-	toObservableWithReplyLatest(): Rx.Observable<T>;
-	toSubject(): Rx.ISubject<T>;
-}
-
-interface KnockoutComputedFunctions<T> {
-	toObservableWithReplyLatest(): Rx.Observable<T>;
-}
-
-declare namespace Rx {
-	interface Observable<T> {
-		toKoSubscribable(): KnockoutSubscribable<T>;
-		toKoObservable(initialValue?: T): KnockoutObservable<T>;
-	}
-
-	interface Subject<T> {
-		toKoObservable(initialValue?: T): KnockoutObservable<T>;
-	}
-}
diff --git a/knockout.rx/tsconfig.json b/knockout.rx/tsconfig.json
new file mode 100644
index 0000000000..f369f3daa7
--- /dev/null
+++ b/knockout.rx/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "knockout.rx-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/knockout.validation/index.d.ts b/knockout.validation/index.d.ts
new file mode 100644
index 0000000000..f3f830ab4c
--- /dev/null
+++ b/knockout.validation/index.d.ts
@@ -0,0 +1,160 @@
+// Type definitions for Knockout Validation
+// Project: https://github.com/ericmbarnard/Knockout-Validation
+// Definitions by: Dan Ludwig <https://github.com/danludwig>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="knockout" />
+
+interface KnockoutValidationGroupingOptions {
+    deep?: boolean;
+    observable?: boolean;
+}
+
+interface KnockoutValidationConfiguration {
+    registerExtenders?: boolean;
+    messagesOnModified?: boolean;
+    messageTemplate?: string;
+    insertMessages?: boolean;
+    parseInputAttributes?: boolean;
+    writeInputAttributes?: boolean;
+    decorateInputElement?: boolean;
+    errorClass?: string;
+    errorElementClass?: string;
+    errorMessageClass?: string;
+    grouping?: KnockoutValidationGroupingOptions;
+}
+
+interface KnockoutValidationUtils {
+    isArray(o: any): boolean;
+    isObject(o: any): boolean;
+    values(o: any): any[];
+    getValue(o: any): any;
+    hasAttribute(node: Element, attr: string): boolean;
+    isValidatable(o: any): boolean;
+    insertAfter(node: Element, newNode: Element): void;
+    newId(): number;
+    getConfigOptions(element: Element): KnockoutValidationConfiguration;
+    setDomData(node: Element, data: KnockoutValidationConfiguration): void;
+    getDomData(node: Element): KnockoutValidationConfiguration;
+    contextFor(node: Element): KnockoutValidationConfiguration;
+    isEmptyVal(val: any): boolean;
+}
+
+interface KnockoutValidationAsyncCallbackArgs {
+    isValid: boolean;
+    message: string;
+}
+
+interface KnockoutValidationAsyncCallback {
+    (result: boolean): void;
+    (result: KnockoutValidationAsyncCallbackArgs): void;
+}
+
+interface KnockoutValidationRuleBase
+{
+    message: string;
+}
+
+interface KnockoutValidationRuleDefinition extends KnockoutValidationRuleBase {
+    validator(value: any, params: any): boolean;
+}
+
+interface KnockoutValidationAsyncRuleDefinition extends KnockoutValidationRuleBase {
+    async: boolean;
+    validator(value: any, params: any, callback: KnockoutValidationAsyncCallback): void;
+}
+
+interface KnockoutValidationAnonymousRuleDefinition {
+    validation: KnockoutValidationRuleDefinition;
+}
+
+interface KnockoutValidationRuleDefinitions {
+    date: KnockoutValidationRuleDefinition;
+    dateISO: KnockoutValidationRuleDefinition;
+    digit: KnockoutValidationRuleDefinition;
+    email: KnockoutValidationRuleDefinition;
+    equal: KnockoutValidationRuleDefinition;
+    max: KnockoutValidationRuleDefinition;
+    maxLength: KnockoutValidationRuleDefinition;
+    min: KnockoutValidationRuleDefinition;
+    minLength: KnockoutValidationRuleDefinition;
+    notEqual: KnockoutValidationRuleDefinition;
+    number: KnockoutValidationRuleDefinition;
+    pattern: KnockoutValidationRuleDefinition;
+    phoneUS: KnockoutValidationRuleDefinition;
+    required: KnockoutValidationRuleDefinition;
+    step: KnockoutValidationRuleDefinition;
+    unique: KnockoutValidationRuleDefinition;
+}
+
+interface KnockoutValidationRule {
+    rule: string;
+    params: any;
+    message?: string;
+    condition?: () => boolean;
+}
+
+interface KnockoutValidationErrors {
+    (): string[];
+    showAllMessages(): void;
+    showAllMessages(show: boolean): void;
+}
+
+interface KnockoutValidationGroup {
+    errors?: KnockoutValidationErrors;
+    isValid?: () => boolean;
+    isAnyMessageShown?: () => boolean;
+}
+
+interface KnockoutValidationLocalizationDictionary {
+    [key: string]: string;
+}
+
+interface KnockoutValidationStatic {
+    init(options?: KnockoutValidationConfiguration, force?: boolean): void;
+    reset(): void;
+
+    group(obj: any, options?: any): KnockoutValidationErrors;
+
+    formatMessage(message: string, params: string): string;
+
+    addRule<T>(observable: KnockoutObservable<T>, rule: KnockoutValidationRule): KnockoutObservable<T>;
+
+    addAnonymousRule(observable: KnockoutObservable<any>, ruleObj: KnockoutValidationAnonymousRuleDefinition): void;
+
+    insertValidationMessage(element: Element): Element;
+    parseInputValidationAttributes(element: Element, valueAccessor: () => KnockoutObservable<any>): void;
+
+    rules: KnockoutValidationRuleDefinitions;
+
+    addExtender(ruleName: string): void;
+    registerExtenders(): void;
+    utils: KnockoutValidationUtils;
+
+    localize(msgTranslations: KnockoutValidationLocalizationDictionary): void;
+    defineLocale(newLocale: string, msgTranslations: KnockoutValidationLocalizationDictionary): KnockoutValidationLocalizationDictionary;
+    locale(newLocale: string): string;
+    validateObservable(observable: KnockoutObservable<any>): boolean;
+}
+
+interface KnockoutStatic {
+    validation: KnockoutValidationStatic;
+    validatedObservable<T>(initialValue?: T): KnockoutObservable<T>;
+    applyBindingsWithValidation(viewModel: any, rootNode?: any, options?: KnockoutValidationConfiguration): void;
+}
+
+interface KnockoutSubscribableFunctions<T> {
+    isValid: KnockoutComputed<boolean>;
+    isValidating: KnockoutObservable<boolean>;
+    rules: KnockoutObservableArray<KnockoutValidationRule>;
+    isModified: KnockoutObservable<boolean>;
+    error: KnockoutComputed<string>;
+    setError(error: string): void;
+    clearError(): void;
+}
+
+declare module "knockout.validation" {
+	export = validation;
+}
+
+declare var validation: KnockoutValidationStatic 
diff --git a/knockout.validation/knockout.validation.d.ts b/knockout.validation/knockout.validation.d.ts
deleted file mode 100644
index a308a60f02..0000000000
--- a/knockout.validation/knockout.validation.d.ts
+++ /dev/null
@@ -1,154 +0,0 @@
-// Type definitions for Knockout Validation
-// Project: https://github.com/ericmbarnard/Knockout-Validation
-// Definitions by: Dan Ludwig <https://github.com/danludwig>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../knockout/knockout.d.ts" />
-
-interface KnockoutValidationGroupingOptions {
-    deep?: boolean;
-    observable?: boolean;
-}
-
-interface KnockoutValidationConfiguration {
-    registerExtenders?: boolean;
-    messagesOnModified?: boolean;
-    messageTemplate?: string;
-    insertMessages?: boolean;
-    parseInputAttributes?: boolean;
-    writeInputAttributes?: boolean;
-    decorateInputElement?: boolean;
-    errorClass?: string;
-    errorElementClass?: string;
-    errorMessageClass?: string;
-    grouping?: KnockoutValidationGroupingOptions;
-}
-
-interface KnockoutValidationUtils {
-    isArray(o: any): boolean;
-    isObject(o: any): boolean;
-    values(o: any): any[];
-    getValue(o: any): any;
-    hasAttribute(node: Element, attr: string): boolean;
-    isValidatable(o: any): boolean;
-    insertAfter(node: Element, newNode: Element): void;
-    newId(): number;
-    getConfigOptions(element: Element): KnockoutValidationConfiguration;
-    setDomData(node: Element, data: KnockoutValidationConfiguration): void;
-    getDomData(node: Element): KnockoutValidationConfiguration;
-    contextFor(node: Element): KnockoutValidationConfiguration;
-    isEmptyVal(val: any): boolean;
-}
-
-interface KnockoutValidationAsyncCallbackArgs {
-    isValid: boolean;
-    message: string;
-}
-
-interface KnockoutValidationAsyncCallback {
-    (result: boolean): void;
-    (result: KnockoutValidationAsyncCallbackArgs): void;
-}
-
-interface KnockoutValidationRuleBase
-{
-    message: string;
-}
-
-interface KnockoutValidationRuleDefinition extends KnockoutValidationRuleBase {
-    validator(value: any, params: any): boolean;
-}
-
-interface KnockoutValidationAsyncRuleDefinition extends KnockoutValidationRuleBase {
-    async: boolean;
-    validator(value: any, params: any, callback: KnockoutValidationAsyncCallback): void;
-}
-
-interface KnockoutValidationAnonymousRuleDefinition {
-    validation: KnockoutValidationRuleDefinition;
-}
-
-interface KnockoutValidationRuleDefinitions {
-    date: KnockoutValidationRuleDefinition;
-    dateISO: KnockoutValidationRuleDefinition;
-    digit: KnockoutValidationRuleDefinition;
-    email: KnockoutValidationRuleDefinition;
-    equal: KnockoutValidationRuleDefinition;
-    max: KnockoutValidationRuleDefinition;
-    maxLength: KnockoutValidationRuleDefinition;
-    min: KnockoutValidationRuleDefinition;
-    minLength: KnockoutValidationRuleDefinition;
-    notEqual: KnockoutValidationRuleDefinition;
-    number: KnockoutValidationRuleDefinition;
-    pattern: KnockoutValidationRuleDefinition;
-    phoneUS: KnockoutValidationRuleDefinition;
-    required: KnockoutValidationRuleDefinition;
-    step: KnockoutValidationRuleDefinition;
-    unique: KnockoutValidationRuleDefinition;
-}
-
-interface KnockoutValidationRule {
-    rule: string;
-    params: any;
-    message?: string;
-    condition?: () => boolean;
-}
-
-interface KnockoutValidationErrors {
-    (): string[];
-    showAllMessages(): void;
-    showAllMessages(show: boolean): void;
-}
-
-interface KnockoutValidationGroup {
-    errors?: KnockoutValidationErrors;
-    isValid?: () => boolean;
-    isAnyMessageShown?: () => boolean;
-}
-
-interface KnockoutValidationStatic {
-    init(options?: KnockoutValidationConfiguration, force?: boolean): void;
-    reset(): void;
-
-    group(obj: any, options?: any): KnockoutValidationErrors;
-
-    formatMessage(message: string, params: string): string;
-
-    addRule<T>(observable: KnockoutObservable<T>, rule: KnockoutValidationRule): KnockoutObservable<T>;
-
-    addAnonymousRule(observable: KnockoutObservable<any>, ruleObj: KnockoutValidationAnonymousRuleDefinition): void;
-
-    insertValidationMessage(element: Element): Element;
-    parseInputValidationAttributes(element: Element, valueAccessor: () => KnockoutObservable<any>): void;
-
-    rules: KnockoutValidationRuleDefinitions;
-
-    addExtender(ruleName: string): void;
-    registerExtenders(): void;
-    utils: KnockoutValidationUtils;
-
-    localize(msgTranslations: any): void;
-    validateObservable(observable: KnockoutObservable<any>): boolean;
-}
-
-interface KnockoutStatic {
-    validation: KnockoutValidationStatic;
-    validatedObservable<T>(initialValue?: T): KnockoutObservable<T>;
-    applyBindingsWithValidation(viewModel: any, rootNode?: any, options?: KnockoutValidationConfiguration): void;
-}
-
-interface KnockoutSubscribableFunctions<T> {
-    isValid: KnockoutComputed<boolean>;
-    isValidating: KnockoutObservable<boolean>;
-    rules: KnockoutObservableArray<KnockoutValidationRule>;
-    isModified: KnockoutObservable<boolean>;
-    error: KnockoutComputed<string>;
-    setError(error: string): void;
-    clearError(): void;
-}
-
-declare module "knockout.validation" {
-	export = validation;
-}
-
-declare var validation: KnockoutValidationStatic 
diff --git a/knockout.validation/tsconfig.json b/knockout.validation/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/knockout.validation/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/knockout.viewmodel/index.d.ts b/knockout.viewmodel/index.d.ts
new file mode 100644
index 0000000000..e018ed7338
--- /dev/null
+++ b/knockout.viewmodel/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for Knockout Viewmodel 1.1.3
+// Project: http://coderenaissance.github.com/knockout.viewmodel/
+// Definitions by: Oisin Grehan <https://github.com/oising>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="knockout" />
+
+interface KnockoutViewModelStatic {
+    toModel(viewmodel: any): any;
+    fromModel(model: any, options?: any): any;
+    updateFromModel(viewmodel: any, model: any): any;
+    
+    // INTERNAL flag: enable logging of conversions
+    // logs will be written to console
+    logging: boolean;
+}
+
+// Extend ko global
+interface KnockoutStatic {
+    viewmodel: KnockoutViewModelStatic;
+}
\ No newline at end of file
diff --git a/knockout.viewmodel/knockout.viewmodel.d.ts b/knockout.viewmodel/knockout.viewmodel.d.ts
deleted file mode 100644
index 220bedf842..0000000000
--- a/knockout.viewmodel/knockout.viewmodel.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Type definitions for Knockout Viewmodel 1.1.3
-// Project: http://coderenaissance.github.com/knockout.viewmodel/
-// Definitions by: Oisin Grehan <https://github.com/oising>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../knockout/knockout.d.ts" />
-
-interface KnockoutViewModelStatic {
-    toModel(viewmodel: any): any;
-    fromModel(model: any, options?: any): any;
-    updateFromModel(viewmodel: any, model: any);
-    
-    // INTERNAL flag: enable logging of conversions
-    // logs will be written to console
-    logging: boolean;
-}
-
-// Extend ko global
-interface KnockoutStatic {
-    viewmodel: KnockoutViewModelStatic;
-}
\ No newline at end of file
diff --git a/knockout.viewmodel/knockout.viewmodel.d.ts.tscparams b/knockout.viewmodel/knockout.viewmodel.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/knockout.viewmodel/knockout.viewmodel.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/knockout.viewmodel/tsconfig.json b/knockout.viewmodel/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/knockout.viewmodel/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/knockout/all-tests.ts b/knockout/all-tests.ts
index 3fe7a471f1..1890561ac8 100644
--- a/knockout/all-tests.ts
+++ b/knockout/all-tests.ts
@@ -1,2 +1,3 @@
+/// <reference path="tests/index.d.ts" />
 /// <reference path="tests/knockout-tests.ts" />
 /// <reference path="tests/knockout-templatingBehaviors-tests.ts" />
diff --git a/knockout/all-tests.ts.tscparams b/knockout/all-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/knockout/all-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/knockout/index.d.ts b/knockout/index.d.ts
new file mode 100644
index 0000000000..962a776333
--- /dev/null
+++ b/knockout/index.d.ts
@@ -0,0 +1,641 @@
+// Type definitions for Knockout v3.2.0
+// Project: http://knockoutjs.com
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Igor Oleinikov <https://github.com/Igorbek/>, Clément Bourgeois <https://github.com/moonpyk/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface KnockoutSubscribableFunctions<T> {
+    [key: string]: KnockoutBindingHandler;
+
+	notifySubscribers(valueToWrite?: T, event?: string): void;
+}
+
+interface KnockoutComputedFunctions<T> {
+    [key: string]: KnockoutBindingHandler;
+}
+
+interface KnockoutObservableFunctions<T> {
+    [key: string]: KnockoutBindingHandler;
+
+	equalityComparer(a: any, b: any): boolean;
+}
+
+interface KnockoutObservableArrayFunctions<T> {
+    // General Array functions
+    indexOf(searchElement: T, fromIndex?: number): number;
+    slice(start: number, end?: number): T[];
+    splice(start: number): T[];
+    splice(start: number, deleteCount: number, ...items: T[]): T[];
+    pop(): T;
+    push(...items: T[]): void;
+    shift(): T;
+    unshift(...items: T[]): number;
+    reverse(): KnockoutObservableArray<T>;
+    sort(): KnockoutObservableArray<T>;
+    sort(compareFunction: (left: T, right: T) => number): KnockoutObservableArray<T>;
+
+    // Ko specific
+    [key: string]: KnockoutBindingHandler;
+
+    replace(oldItem: T, newItem: T): void;
+
+    remove(item: T): T[];
+    remove(removeFunction: (item: T) => boolean): T[];
+    removeAll(items: T[]): T[];
+    removeAll(): T[];
+
+    destroy(item: T): void;
+    destroy(destroyFunction: (item: T) => boolean): void;
+    destroyAll(items: T[]): void;
+    destroyAll(): void;
+}
+
+interface KnockoutSubscribableStatic {
+    fn: KnockoutSubscribableFunctions<any>;
+
+    new <T>(): KnockoutSubscribable<T>;
+}
+
+interface KnockoutSubscription {
+	dispose(): void;
+}
+
+interface KnockoutSubscribable<T> extends KnockoutSubscribableFunctions<T> {
+	subscribe(callback: (newValue: T) => void, target?: any, event?: string): KnockoutSubscription;
+	subscribe<TEvent>(callback: (newValue: TEvent) => void, target: any, event: string): KnockoutSubscription;
+	extend(requestedExtenders: { [key: string]: any; }): KnockoutSubscribable<T>;
+	getSubscriptionsCount(): number;
+}
+
+interface KnockoutComputedStatic {
+    fn: KnockoutComputedFunctions<any>;
+
+    <T>(): KnockoutComputed<T>;
+    <T>(func: () => T, context?: any, options?: any): KnockoutComputed<T>;
+    <T>(def: KnockoutComputedDefine<T>, context?: any): KnockoutComputed<T>;
+}
+
+interface KnockoutComputed<T> extends KnockoutObservable<T>, KnockoutComputedFunctions<T> {
+	fn: KnockoutComputedFunctions<any>;
+
+	dispose(): void;
+	isActive(): boolean;
+	getDependenciesCount(): number;
+    extend(requestedExtenders: { [key: string]: any; }): KnockoutComputed<T>;
+}
+
+interface KnockoutObservableArrayStatic {
+    fn: KnockoutObservableArrayFunctions<any>;
+
+    <T>(value?: T[]): KnockoutObservableArray<T>;
+}
+
+interface KnockoutObservableArray<T> extends KnockoutObservable<T[]>, KnockoutObservableArrayFunctions<T> {
+    extend(requestedExtenders: { [key: string]: any; }): KnockoutObservableArray<T>;
+}
+
+interface KnockoutObservableStatic {
+    fn: KnockoutObservableFunctions<any>;
+
+    <T>(value?: T): KnockoutObservable<T>;
+}
+
+interface KnockoutObservable<T> extends KnockoutSubscribable<T>, KnockoutObservableFunctions<T> {
+	(): T;
+	(value: T): void;
+
+	peek(): T;
+	valueHasMutated?:{(): void;};
+	valueWillMutate?:{(): void;};
+    extend(requestedExtenders: { [key: string]: any; }): KnockoutObservable<T>;
+}
+
+interface KnockoutComputedDefine<T> {
+	read(): T;
+	write? (value: T): void;
+	disposeWhenNodeIsRemoved?: Node;
+	disposeWhen? (): boolean;
+	owner?: any;
+	deferEvaluation?: boolean;
+	pure?: boolean;
+}
+
+interface KnockoutBindingContext {
+    $parent: any;
+    $parents: any[];
+    $root: any;
+    $data: any;
+    $rawData: any | KnockoutObservable<any>;
+    $index?: KnockoutObservable<number>;
+    $parentContext?: KnockoutBindingContext;
+    $component: any;
+    $componentTemplateNodes: Node[];
+
+    extend(properties: any): any;
+    createChildContext(dataItemOrAccessor: any, dataItemAlias?: any, extendCallback?: Function): any;
+}
+
+interface KnockoutAllBindingsAccessor {
+    (): any;
+    get(name: string): any;
+    has(name: string): boolean;
+}
+
+interface KnockoutBindingHandler {
+    after?: Array<string>;
+    init?: (element: any, valueAccessor: () => any, allBindingsAccessor?: KnockoutAllBindingsAccessor, viewModel?: any, bindingContext?: KnockoutBindingContext) => void | { controlsDescendantBindings: boolean; };
+    update?: (element: any, valueAccessor: () => any, allBindingsAccessor?: KnockoutAllBindingsAccessor, viewModel?: any, bindingContext?: KnockoutBindingContext) => void;
+    options?: any;
+    preprocess?: (value: string, name: string, addBindingCallback?: (name: string, value: string) => void) => string;
+}
+
+interface KnockoutBindingHandlers {
+    [bindingHandler: string]: KnockoutBindingHandler;
+
+    // Controlling text and appearance
+    visible: KnockoutBindingHandler;
+    text: KnockoutBindingHandler;
+    html: KnockoutBindingHandler;
+    css: KnockoutBindingHandler;
+    style: KnockoutBindingHandler;
+    attr: KnockoutBindingHandler;
+
+    // Control Flow
+    foreach: KnockoutBindingHandler;
+    if: KnockoutBindingHandler;
+    ifnot: KnockoutBindingHandler;
+    with: KnockoutBindingHandler;
+
+    // Working with form fields
+    click: KnockoutBindingHandler;
+    event: KnockoutBindingHandler;
+    submit: KnockoutBindingHandler;
+    enable: KnockoutBindingHandler;
+    disable: KnockoutBindingHandler;
+    value: KnockoutBindingHandler;
+    textInput: KnockoutBindingHandler;
+    hasfocus: KnockoutBindingHandler;
+    checked: KnockoutBindingHandler;
+    options: KnockoutBindingHandler;
+    selectedOptions: KnockoutBindingHandler;
+    uniqueName: KnockoutBindingHandler;
+
+    // Rendering templates
+	template: KnockoutBindingHandler;
+
+	// Components (new for v3.2)
+	component: KnockoutBindingHandler;
+}
+
+interface KnockoutMemoization {
+    memoize(callback: () => string): string;
+    unmemoize(memoId: string, callbackParams: any[]): boolean;
+    unmemoizeDomNodeAndDescendants(domNode: any, extraCallbackParamsArray: any[]): boolean;
+    parseMemoText(memoText: string): string;
+}
+
+interface KnockoutVirtualElement {}
+
+interface KnockoutVirtualElements {
+    allowedBindings: { [bindingName: string]: boolean; };
+    emptyNode(node: KnockoutVirtualElement ): void;
+    firstChild(node: KnockoutVirtualElement ): KnockoutVirtualElement;
+    insertAfter( container: KnockoutVirtualElement, nodeToInsert: Node, insertAfter: Node ): void;
+    nextSibling(node: KnockoutVirtualElement): Node;
+    prepend(node: KnockoutVirtualElement, toInsert: Node ): void;
+    setDomNodeChildren(node: KnockoutVirtualElement, newChildren: { length: number;[index: number]: Node; } ): void;
+    childNodes(node: KnockoutVirtualElement ): Node[];
+}
+
+interface KnockoutExtenders {
+    throttle(target: any, timeout: number): KnockoutComputed<any>;
+	notify(target: any, notifyWhen: string): any;
+
+	rateLimit(target: any, timeout: number): any;
+	rateLimit(target: any, options: { timeout: number; method?: string; }): any;
+
+	trackArrayChanges(target: any): any;
+}
+
+//
+// NOTE TO MAINTAINERS AND CONTRIBUTORS : pay attention to only include symbols that are
+// publicly exported in the minified version of ko, without that you can give the false
+// impression that some functions will be available in production builds.
+//
+interface KnockoutUtils {
+    //////////////////////////////////
+    // utils.domData.js
+    //////////////////////////////////
+
+    domData: {
+        get (node: Element, key: string): any;
+
+        set (node: Element, key: string, value: any): void;
+
+        getAll(node: Element, createIfNotFound: boolean): any;
+
+        clear(node: Element): boolean;
+    };
+
+    //////////////////////////////////
+    // utils.domNodeDisposal.js
+    //////////////////////////////////
+
+    domNodeDisposal: {
+        addDisposeCallback(node: Element, callback: Function): void;
+
+        removeDisposeCallback(node: Element, callback: Function): void;
+
+        cleanNode(node: Node): Element;
+
+        removeNode(node: Node): void;
+    };
+
+    addOrRemoveItem<T>(array: T[] | KnockoutObservable<T>, value: T, included: T): void;
+
+    arrayFilter<T>(array: T[], predicate: (item: T) => boolean): T[];
+
+    arrayFirst<T>(array: T[], predicate: (item: T) => boolean, predicateOwner?: any): T;
+
+    arrayForEach<T>(array: T[], action: (item: T, index: number) => void): void;
+
+    arrayGetDistinctValues<T>(array: T[]): T[];
+
+    arrayIndexOf<T>(array: T[], item: T): number;
+
+    arrayMap<T, U>(array: T[], mapping: (item: T) => U): U[];
+
+    arrayPushAll<T>(array: T[] | KnockoutObservableArray<T>, valuesToPush: T[]): T[];
+
+    arrayRemoveItem(array: any[], itemToRemove: any): void;
+
+    compareArrays<T>(a: T[], b: T[]): Array<KnockoutArrayChange<T>>;
+
+    extend(target: Object, source: Object): Object;
+
+    fieldsIncludedWithJsonPost: any[];
+
+    getFormFields(form: any, fieldName: string): any[];
+
+    objectForEach(obj: any, action: (key: any, value: any) => void): void;
+
+    parseHtmlFragment(html: string): any[];
+
+    parseJson(jsonString: string): any;
+
+    postJson(urlOrForm: any, data: any, options: any): void;
+
+    peekObservable<T>(value: KnockoutObservable<T>): T;
+
+    range(min: any, max: any): any;
+
+    registerEventHandler(element: any, eventType: any, handler: Function): void;
+
+    setHtml(node: Element, html: () => string): void;
+
+    setHtml(node: Element, html: string): void;
+
+    setTextContent(element: any, textContent: string | KnockoutObservable<string>): void;
+
+    stringifyJson(data: any, replacer?: Function, space?: string): string;
+
+    toggleDomNodeCssClass(node: any, className: string, shouldHaveClass: boolean): void;
+
+    triggerEvent(element: any, eventType: any): void;
+
+    unwrapObservable<T>(value: KnockoutObservable<T> | T): T;
+
+    // NOT PART OF THE MINIFIED API SURFACE (ONLY IN knockout-{version}.debug.js) https://github.com/SteveSanderson/knockout/issues/670
+    // forceRefresh(node: any): void;
+    // ieVersion: number;
+    // isIe6: boolean;
+    // isIe7: boolean;
+    // jQueryHtmlParse(html: string): any[];
+    // makeArray(arrayLikeObject: any): any[];
+    // moveCleanedNodesToContainerElement(nodes: any[]): HTMLElement;
+    // replaceDomNodes(nodeToReplaceOrNodeArray: any, newNodesArray: any[]): void;
+    // setDomNodeChildren(domNode: any, childNodes: any[]): void;
+    // setElementName(element: any, name: string): void;
+    // setOptionNodeSelectionState(optionNode: any, isSelected: boolean): void;
+    // simpleHtmlParse(html: string): any[];
+    // stringStartsWith(str: string, startsWith: string): boolean;
+    // stringTokenize(str: string, delimiter: string): string[];
+    // stringTrim(str: string): string;
+    // tagNameLower(element: any): string;
+}
+
+interface KnockoutArrayChange<T> {
+    status: string;
+    value: T;
+    index: number;
+    moved?: number;
+}
+
+//////////////////////////////////
+// templateSources.js
+//////////////////////////////////
+
+interface KnockoutTemplateSourcesDomElement {
+    text(): any;
+    text(value: any): void;
+
+    data(key: string): any;
+    data(key: string, value: any): any;
+}
+
+interface KnockoutTemplateAnonymous extends KnockoutTemplateSourcesDomElement {
+	nodes(): any;
+	nodes(value: any): void;
+}
+
+interface KnockoutTemplateSources {
+
+    domElement: {
+	    prototype: KnockoutTemplateSourcesDomElement
+	    new (element: Element): KnockoutTemplateSourcesDomElement
+    };
+
+    anonymousTemplate: {
+		prototype: KnockoutTemplateAnonymous;
+		new (element: Element): KnockoutTemplateAnonymous;
+    };
+}
+
+//////////////////////////////////
+// nativeTemplateEngine.js
+//////////////////////////////////
+
+interface KnockoutNativeTemplateEngine {
+
+    renderTemplateSource(templateSource: Object, bindingContext?: KnockoutBindingContext, options?: Object): any[];
+}
+
+//////////////////////////////////
+// templateEngine.js
+//////////////////////////////////
+
+interface KnockoutTemplateEngine extends KnockoutNativeTemplateEngine {
+
+    createJavaScriptEvaluatorBlock(script: string): string;
+
+    makeTemplateSource(template: any, templateDocument?: Document): any;
+
+    renderTemplate(template: any, bindingContext: KnockoutBindingContext, options: Object, templateDocument: Document): any;
+
+    isTemplateRewritten(template: any, templateDocument: Document): boolean;
+
+    rewriteTemplate(template: any, rewriterCallback: Function, templateDocument: Document): void;
+}
+
+/////////////////////////////////
+
+interface KnockoutStatic {
+    utils: KnockoutUtils;
+    memoization: KnockoutMemoization;
+
+	bindingHandlers: KnockoutBindingHandlers;
+	getBindingHandler(handler: string): KnockoutBindingHandler;
+
+    virtualElements: KnockoutVirtualElements;
+    extenders: KnockoutExtenders;
+
+    applyBindings(viewModelOrBindingContext?: any, rootNode?: any): void;
+	applyBindingsToDescendants(viewModelOrBindingContext: any, rootNode: any): void;
+	applyBindingAccessorsToNode(node: Node, bindings: (bindingContext: KnockoutBindingContext, node: Node) => {}, bindingContext: KnockoutBindingContext): void;
+	applyBindingAccessorsToNode(node: Node, bindings: {}, bindingContext: KnockoutBindingContext): void;
+	applyBindingAccessorsToNode(node: Node, bindings: (bindingContext: KnockoutBindingContext, node: Node) => {}, viewModel: any): void;
+	applyBindingAccessorsToNode(node: Node, bindings: {}, viewModel: any): void;
+    applyBindingsToNode(node: Node, bindings: any, viewModelOrBindingContext?: any): any;
+
+    subscribable: KnockoutSubscribableStatic;
+    observable: KnockoutObservableStatic;
+
+	computed: KnockoutComputedStatic;
+	pureComputed<T>(evaluatorFunction: () => T, context?: any): KnockoutComputed<T>;
+	pureComputed<T>(options: KnockoutComputedDefine<T>, context?: any): KnockoutComputed<T>;
+
+    observableArray: KnockoutObservableArrayStatic;
+
+    contextFor(node: any): any;
+    isSubscribable(instance: any): instance is KnockoutSubscribable<any>;
+    toJSON(viewModel: any, replacer?: Function, space?: any): string;
+    toJS(viewModel: any): any;
+    isObservable(instance: any): instance is KnockoutObservable<any>;
+    isWriteableObservable(instance: any): instance is KnockoutObservable<any>;
+    isComputed(instance: any): instance is KnockoutComputed<any>;
+    dataFor(node: any): any;
+    removeNode(node: Element): void;
+    cleanNode(node: Element): Element;
+    renderTemplate(template: Function, viewModel: any, options?: any, target?: any, renderMode?: any): any;
+    renderTemplate(template: string, viewModel: any, options?: any, target?: any, renderMode?: any): any;
+	unwrap<T>(value: KnockoutObservable<T> | T): T;
+
+	computedContext: KnockoutComputedContext;
+
+    //////////////////////////////////
+    // templateSources.js
+    //////////////////////////////////
+
+    templateSources: KnockoutTemplateSources;
+
+    //////////////////////////////////
+    // templateEngine.js
+    //////////////////////////////////
+
+    templateEngine: {
+
+        prototype: KnockoutTemplateEngine;
+
+        new (): KnockoutTemplateEngine;
+    };
+
+    //////////////////////////////////
+    // templateRewriting.js
+    //////////////////////////////////
+
+    templateRewriting: {
+
+        ensureTemplateIsRewritten(template: Node, templateEngine: KnockoutTemplateEngine, templateDocument: Document): any;
+        ensureTemplateIsRewritten(template: string, templateEngine: KnockoutTemplateEngine, templateDocument: Document): any;
+
+        memoizeBindingAttributeSyntax(htmlString: string, templateEngine: KnockoutTemplateEngine): any;
+
+        applyMemoizedBindingsToNextSibling(bindings: any, nodeName: string): string;
+    };
+
+    //////////////////////////////////
+    // nativeTemplateEngine.js
+    //////////////////////////////////
+
+    nativeTemplateEngine: {
+
+        prototype: KnockoutNativeTemplateEngine;
+
+        new (): KnockoutNativeTemplateEngine;
+
+        instance: KnockoutNativeTemplateEngine;
+    };
+
+    //////////////////////////////////
+    // jqueryTmplTemplateEngine.js
+    //////////////////////////////////
+
+    jqueryTmplTemplateEngine: {
+
+        prototype: KnockoutTemplateEngine;
+
+        renderTemplateSource(templateSource: Object, bindingContext: KnockoutBindingContext, options: Object): Node[];
+
+        createJavaScriptEvaluatorBlock(script: string): string;
+
+        addTemplate(templateName: string, templateMarkup: string): void;
+    };
+
+    //////////////////////////////////
+    // templating.js
+    //////////////////////////////////
+
+    setTemplateEngine(templateEngine: KnockoutNativeTemplateEngine): void;
+
+    renderTemplate(template: Function, dataOrBindingContext: KnockoutBindingContext, options: Object, targetNodeOrNodeArray: Node, renderMode: string): any;
+    renderTemplate(template: any, dataOrBindingContext: KnockoutBindingContext, options: Object, targetNodeOrNodeArray: Node, renderMode: string): any;
+    renderTemplate(template: Function, dataOrBindingContext: any, options: Object, targetNodeOrNodeArray: Node, renderMode: string): any;
+    renderTemplate(template: any, dataOrBindingContext: any, options: Object, targetNodeOrNodeArray: Node, renderMode: string): any;
+    renderTemplate(template: Function, dataOrBindingContext: KnockoutBindingContext, options: Object, targetNodeOrNodeArray: Node[], renderMode: string): any;
+    renderTemplate(template: any, dataOrBindingContext: KnockoutBindingContext, options: Object, targetNodeOrNodeArray: Node[], renderMode: string): any;
+    renderTemplate(template: Function, dataOrBindingContext: any, options: Object, targetNodeOrNodeArray: Node[], renderMode: string): any;
+    renderTemplate(template: any, dataOrBindingContext: any, options: Object, targetNodeOrNodeArray: Node[], renderMode: string): any;
+
+    renderTemplateForEach(template: Function, arrayOrObservableArray: any[], options: Object, targetNode: Node, parentBindingContext: KnockoutBindingContext): any;
+    renderTemplateForEach(template: any, arrayOrObservableArray: any[], options: Object, targetNode: Node, parentBindingContext: KnockoutBindingContext): any;
+    renderTemplateForEach(template: Function, arrayOrObservableArray: KnockoutObservable<any>, options: Object, targetNode: Node, parentBindingContext: KnockoutBindingContext): any;
+    renderTemplateForEach(template: any, arrayOrObservableArray: KnockoutObservable<any>, options: Object, targetNode: Node, parentBindingContext: KnockoutBindingContext): any;
+
+    expressionRewriting: {
+        bindingRewriteValidators: any;
+        parseObjectLiteral: { (objectLiteralString: string): any[] }
+    };
+
+    /////////////////////////////////
+
+	bindingProvider: {
+		instance: KnockoutBindingProvider;
+		new (): KnockoutBindingProvider;
+	}
+
+    /////////////////////////////////
+    // selectExtensions.js
+    /////////////////////////////////
+
+    selectExtensions: {
+
+        readValue(element: HTMLElement): any;
+
+        writeValue(element: HTMLElement, value: any): void;
+    };
+
+    components: KnockoutComponents;
+    
+    /////////////////////////////////
+    // options.js
+    /////////////////////////////////
+    
+    options: {
+        deferUpdates: boolean,
+        
+        useOnlyNativeEvents: boolean
+    }
+}
+
+interface KnockoutBindingProvider {
+	nodeHasBindings(node: Node): boolean;
+	getBindings(node: Node, bindingContext: KnockoutBindingContext): {};
+	getBindingAccessors?(node: Node, bindingContext: KnockoutBindingContext): { [key: string]: string; };
+}
+
+interface KnockoutComputedContext {
+	getDependenciesCount(): number;
+	isInitial: () => boolean;
+	isSleeping: boolean;
+}
+
+//
+// refactored types into a namespace to reduce global pollution
+// and used Union Types to simplify overloads (requires TypeScript 1.4)
+//
+declare namespace KnockoutComponentTypes {
+
+    interface Config {
+        viewModel?: ViewModelFunction | ViewModelSharedInstance | ViewModelFactoryFunction | AMDModule;
+        template: string | Node[]| DocumentFragment | TemplateElement | AMDModule;
+        synchronous?: boolean;
+    }
+
+    interface ComponentConfig {
+        viewModel?: ViewModelFunction | ViewModelSharedInstance | ViewModelFactoryFunction | AMDModule;
+        template: any;
+        createViewModel?: any;
+    }
+
+    interface EmptyConfig {
+    }
+
+    // common AMD type
+    interface AMDModule {
+        require: string;
+    }
+
+    // viewmodel types
+    interface ViewModelFunction {
+        (params?: any): any;
+    }
+
+    interface ViewModelSharedInstance {
+        instance: any;
+    }
+
+    interface ViewModelFactoryFunction {
+        createViewModel: (params?: any, componentInfo?: ComponentInfo) => any;
+    }
+
+    interface ComponentInfo {
+        element: Node;
+        templateNodes: Node[];
+    }
+
+    interface TemplateElement {
+        element: string | Node;
+    }
+
+    interface Loader {
+        getConfig? (componentName: string, callback: (result: ComponentConfig) => void): void;
+        loadComponent? (componentName: string, config: ComponentConfig, callback: (result: Definition) => void): void;
+        loadTemplate? (componentName: string, templateConfig: any, callback: (result: Node[]) => void): void;
+        loadViewModel? (componentName: string, viewModelConfig: any, callback: (result: any) => void): void;
+        suppressLoaderExceptions?: boolean;
+    }
+
+    interface Definition {
+        template: Node[];
+        createViewModel? (params: any, options: { element: Node; }): any;
+    }
+}
+
+interface KnockoutComponents {
+    // overloads for register method:
+    register(componentName: string, config: KnockoutComponentTypes.Config | KnockoutComponentTypes.EmptyConfig): void;
+
+    isRegistered(componentName: string): boolean;
+    unregister(componentName: string): void;
+    get(componentName: string, callback: (definition: KnockoutComponentTypes.Definition) => void): void;
+    clearCachedDefinition(componentName: string): void
+    defaultLoader: KnockoutComponentTypes.Loader;
+    loaders: KnockoutComponentTypes.Loader[];
+    getComponentNameForNode(node: Node): string;
+}
+
+declare var ko: KnockoutStatic;
+
+declare module "knockout" {
+	export = ko;
+}
diff --git a/knockout/knockout.d.ts b/knockout/knockout.d.ts
deleted file mode 100644
index d50965022f..0000000000
--- a/knockout/knockout.d.ts
+++ /dev/null
@@ -1,631 +0,0 @@
-// Type definitions for Knockout v3.2.0
-// Project: http://knockoutjs.com
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Igor Oleinikov <https://github.com/Igorbek/>, Clément Bourgeois <https://github.com/moonpyk/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-interface KnockoutSubscribableFunctions<T> {
-    [key: string]: KnockoutBindingHandler;
-
-	notifySubscribers(valueToWrite?: T, event?: string): void;
-}
-
-interface KnockoutComputedFunctions<T> {
-    [key: string]: KnockoutBindingHandler;
-}
-
-interface KnockoutObservableFunctions<T> {
-    [key: string]: KnockoutBindingHandler;
-
-	equalityComparer(a: any, b: any): boolean;
-}
-
-interface KnockoutObservableArrayFunctions<T> {
-    // General Array functions
-    indexOf(searchElement: T, fromIndex?: number): number;
-    slice(start: number, end?: number): T[];
-    splice(start: number): T[];
-    splice(start: number, deleteCount: number, ...items: T[]): T[];
-    pop(): T;
-    push(...items: T[]): void;
-    shift(): T;
-    unshift(...items: T[]): number;
-    reverse(): KnockoutObservableArray<T>;
-    sort(): KnockoutObservableArray<T>;
-    sort(compareFunction: (left: T, right: T) => number): KnockoutObservableArray<T>;
-
-    // Ko specific
-    [key: string]: KnockoutBindingHandler;
-
-    replace(oldItem: T, newItem: T): void;
-
-    remove(item: T): T[];
-    remove(removeFunction: (item: T) => boolean): T[];
-    removeAll(items: T[]): T[];
-    removeAll(): T[];
-
-    destroy(item: T): void;
-    destroy(destroyFunction: (item: T) => boolean): void;
-    destroyAll(items: T[]): void;
-    destroyAll(): void;
-}
-
-interface KnockoutSubscribableStatic {
-    fn: KnockoutSubscribableFunctions<any>;
-
-    new <T>(): KnockoutSubscribable<T>;
-}
-
-interface KnockoutSubscription {
-	dispose(): void;
-}
-
-interface KnockoutSubscribable<T> extends KnockoutSubscribableFunctions<T> {
-	subscribe(callback: (newValue: T) => void, target?: any, event?: string): KnockoutSubscription;
-	subscribe<TEvent>(callback: (newValue: TEvent) => void, target: any, event: string): KnockoutSubscription;
-	extend(requestedExtenders: { [key: string]: any; }): KnockoutSubscribable<T>;
-	getSubscriptionsCount(): number;
-}
-
-interface KnockoutComputedStatic {
-    fn: KnockoutComputedFunctions<any>;
-
-    <T>(): KnockoutComputed<T>;
-    <T>(func: () => T, context?: any, options?: any): KnockoutComputed<T>;
-    <T>(def: KnockoutComputedDefine<T>, context?: any): KnockoutComputed<T>;
-}
-
-interface KnockoutComputed<T> extends KnockoutObservable<T>, KnockoutComputedFunctions<T> {
-	fn: KnockoutComputedFunctions<any>;
-
-	dispose(): void;
-	isActive(): boolean;
-	getDependenciesCount(): number;
-    extend(requestedExtenders: { [key: string]: any; }): KnockoutComputed<T>;
-}
-
-interface KnockoutObservableArrayStatic {
-    fn: KnockoutObservableArrayFunctions<any>;
-
-    <T>(value?: T[]): KnockoutObservableArray<T>;
-}
-
-interface KnockoutObservableArray<T> extends KnockoutObservable<T[]>, KnockoutObservableArrayFunctions<T> {
-    extend(requestedExtenders: { [key: string]: any; }): KnockoutObservableArray<T>;
-}
-
-interface KnockoutObservableStatic {
-    fn: KnockoutObservableFunctions<any>;
-
-    <T>(value?: T): KnockoutObservable<T>;
-}
-
-interface KnockoutObservable<T> extends KnockoutSubscribable<T>, KnockoutObservableFunctions<T> {
-	(): T;
-	(value: T): void;
-
-	peek(): T;
-	valueHasMutated?:{(): void;};
-	valueWillMutate?:{(): void;};
-    extend(requestedExtenders: { [key: string]: any; }): KnockoutObservable<T>;
-}
-
-interface KnockoutComputedDefine<T> {
-	read(): T;
-	write? (value: T): void;
-	disposeWhenNodeIsRemoved?: Node;
-	disposeWhen? (): boolean;
-	owner?: any;
-	deferEvaluation?: boolean;
-	pure?: boolean;
-}
-
-interface KnockoutBindingContext {
-    $parent: any;
-    $parents: any[];
-    $root: any;
-    $data: any;
-    $rawData: any | KnockoutObservable<any>;
-    $index?: KnockoutObservable<number>;
-    $parentContext?: KnockoutBindingContext;
-    $component: any;
-    $componentTemplateNodes: Node[];
-
-    extend(properties: any): any;
-    createChildContext(dataItemOrAccessor: any, dataItemAlias?: any, extendCallback?: Function): any;
-}
-
-interface KnockoutAllBindingsAccessor {
-    (): any;
-    get(name: string): any;
-    has(name: string): boolean;
-}
-
-interface KnockoutBindingHandler {
-    after?: Array<string>;
-    init?: (element: any, valueAccessor: () => any, allBindingsAccessor?: KnockoutAllBindingsAccessor, viewModel?: any, bindingContext?: KnockoutBindingContext) => void | { controlsDescendantBindings: boolean; };
-    update?: (element: any, valueAccessor: () => any, allBindingsAccessor?: KnockoutAllBindingsAccessor, viewModel?: any, bindingContext?: KnockoutBindingContext) => void;
-    options?: any;
-    preprocess?: (value: string, name: string, addBindingCallback?: (name: string, value: string) => void) => string;
-}
-
-interface KnockoutBindingHandlers {
-    [bindingHandler: string]: KnockoutBindingHandler;
-
-    // Controlling text and appearance
-    visible: KnockoutBindingHandler;
-    text: KnockoutBindingHandler;
-    html: KnockoutBindingHandler;
-    css: KnockoutBindingHandler;
-    style: KnockoutBindingHandler;
-    attr: KnockoutBindingHandler;
-
-    // Control Flow
-    foreach: KnockoutBindingHandler;
-    if: KnockoutBindingHandler;
-    ifnot: KnockoutBindingHandler;
-    with: KnockoutBindingHandler;
-
-    // Working with form fields
-    click: KnockoutBindingHandler;
-    event: KnockoutBindingHandler;
-    submit: KnockoutBindingHandler;
-    enable: KnockoutBindingHandler;
-    disable: KnockoutBindingHandler;
-    value: KnockoutBindingHandler;
-    textInput: KnockoutBindingHandler;
-    hasfocus: KnockoutBindingHandler;
-    checked: KnockoutBindingHandler;
-    options: KnockoutBindingHandler;
-    selectedOptions: KnockoutBindingHandler;
-    uniqueName: KnockoutBindingHandler;
-
-    // Rendering templates
-	template: KnockoutBindingHandler;
-
-	// Components (new for v3.2)
-	component: KnockoutBindingHandler;
-}
-
-interface KnockoutMemoization {
-    memoize(callback: () => string): string;
-    unmemoize(memoId: string, callbackParams: any[]): boolean;
-    unmemoizeDomNodeAndDescendants(domNode: any, extraCallbackParamsArray: any[]): boolean;
-    parseMemoText(memoText: string): string;
-}
-
-interface KnockoutVirtualElement {}
-
-interface KnockoutVirtualElements {
-    allowedBindings: { [bindingName: string]: boolean; };
-    emptyNode(node: KnockoutVirtualElement ): void;
-    firstChild(node: KnockoutVirtualElement ): KnockoutVirtualElement;
-    insertAfter( container: KnockoutVirtualElement, nodeToInsert: Node, insertAfter: Node ): void;
-    nextSibling(node: KnockoutVirtualElement): Node;
-    prepend(node: KnockoutVirtualElement, toInsert: Node ): void;
-    setDomNodeChildren(node: KnockoutVirtualElement, newChildren: { length: number;[index: number]: Node; } ): void;
-    childNodes(node: KnockoutVirtualElement ): Node[];
-}
-
-interface KnockoutExtenders {
-    throttle(target: any, timeout: number): KnockoutComputed<any>;
-	notify(target: any, notifyWhen: string): any;
-
-	rateLimit(target: any, timeout: number): any;
-	rateLimit(target: any, options: { timeout: number; method?: string; }): any;
-
-	trackArrayChanges(target: any): any;
-}
-
-//
-// NOTE TO MAINTAINERS AND CONTRIBUTORS : pay attention to only include symbols that are
-// publicly exported in the minified version of ko, without that you can give the false
-// impression that some functions will be available in production builds.
-//
-interface KnockoutUtils {
-    //////////////////////////////////
-    // utils.domData.js
-    //////////////////////////////////
-
-    domData: {
-        get (node: Element, key: string): any;
-
-        set (node: Element, key: string, value: any): void;
-
-        getAll(node: Element, createIfNotFound: boolean): any;
-
-        clear(node: Element): boolean;
-    };
-
-    //////////////////////////////////
-    // utils.domNodeDisposal.js
-    //////////////////////////////////
-
-    domNodeDisposal: {
-        addDisposeCallback(node: Element, callback: Function): void;
-
-        removeDisposeCallback(node: Element, callback: Function): void;
-
-        cleanNode(node: Node): Element;
-
-        removeNode(node: Node): void;
-    };
-
-    addOrRemoveItem<T>(array: T[] | KnockoutObservable<T>, value: T, included: T): void;
-
-    arrayFilter<T>(array: T[], predicate: (item: T) => boolean): T[];
-
-    arrayFirst<T>(array: T[], predicate: (item: T) => boolean, predicateOwner?: any): T;
-
-    arrayForEach<T>(array: T[], action: (item: T, index: number) => void): void;
-
-    arrayGetDistinctValues<T>(array: T[]): T[];
-
-    arrayIndexOf<T>(array: T[], item: T): number;
-
-    arrayMap<T, U>(array: T[], mapping: (item: T) => U): U[];
-
-    arrayPushAll<T>(array: T[] | KnockoutObservableArray<T>, valuesToPush: T[]): T[];
-
-    arrayRemoveItem(array: any[], itemToRemove: any): void;
-
-    compareArrays<T>(a: T[], b: T[]): Array<KnockoutArrayChange<T>>;
-
-    extend(target: Object, source: Object): Object;
-
-    fieldsIncludedWithJsonPost: any[];
-
-    getFormFields(form: any, fieldName: string): any[];
-
-    objectForEach(obj: any, action: (key: any, value: any) => void): void;
-
-    parseHtmlFragment(html: string): any[];
-
-    parseJson(jsonString: string): any;
-
-    postJson(urlOrForm: any, data: any, options: any): void;
-
-    peekObservable<T>(value: KnockoutObservable<T>): T;
-
-    range(min: any, max: any): any;
-
-    registerEventHandler(element: any, eventType: any, handler: Function): void;
-
-    setHtml(node: Element, html: () => string): void;
-
-    setHtml(node: Element, html: string): void;
-
-    setTextContent(element: any, textContent: string | KnockoutObservable<string>): void;
-
-    stringifyJson(data: any, replacer?: Function, space?: string): string;
-
-    toggleDomNodeCssClass(node: any, className: string, shouldHaveClass: boolean): void;
-
-    triggerEvent(element: any, eventType: any): void;
-
-    unwrapObservable<T>(value: KnockoutObservable<T> | T): T;
-
-    // NOT PART OF THE MINIFIED API SURFACE (ONLY IN knockout-{version}.debug.js) https://github.com/SteveSanderson/knockout/issues/670
-    // forceRefresh(node: any): void;
-    // ieVersion: number;
-    // isIe6: boolean;
-    // isIe7: boolean;
-    // jQueryHtmlParse(html: string): any[];
-    // makeArray(arrayLikeObject: any): any[];
-    // moveCleanedNodesToContainerElement(nodes: any[]): HTMLElement;
-    // replaceDomNodes(nodeToReplaceOrNodeArray: any, newNodesArray: any[]): void;
-    // setDomNodeChildren(domNode: any, childNodes: any[]): void;
-    // setElementName(element: any, name: string): void;
-    // setOptionNodeSelectionState(optionNode: any, isSelected: boolean): void;
-    // simpleHtmlParse(html: string): any[];
-    // stringStartsWith(str: string, startsWith: string): boolean;
-    // stringTokenize(str: string, delimiter: string): string[];
-    // stringTrim(str: string): string;
-    // tagNameLower(element: any): string;
-}
-
-interface KnockoutArrayChange<T> {
-    status: string;
-    value: T;
-    index: number;
-    moved?: number;
-}
-
-//////////////////////////////////
-// templateSources.js
-//////////////////////////////////
-
-interface KnockoutTemplateSourcesDomElement {
-    text(): any;
-    text(value: any): void;
-
-    data(key: string): any;
-    data(key: string, value: any): any;
-}
-
-interface KnockoutTemplateAnonymous extends KnockoutTemplateSourcesDomElement {
-	nodes(): any;
-	nodes(value: any): void;
-}
-
-interface KnockoutTemplateSources {
-
-    domElement: {
-	    prototype: KnockoutTemplateSourcesDomElement
-	    new (element: Element): KnockoutTemplateSourcesDomElement
-    };
-
-    anonymousTemplate: {
-		prototype: KnockoutTemplateAnonymous;
-		new (element: Element): KnockoutTemplateAnonymous;
-    };
-}
-
-//////////////////////////////////
-// nativeTemplateEngine.js
-//////////////////////////////////
-
-interface KnockoutNativeTemplateEngine {
-
-    renderTemplateSource(templateSource: Object, bindingContext?: KnockoutBindingContext, options?: Object): any[];
-}
-
-//////////////////////////////////
-// templateEngine.js
-//////////////////////////////////
-
-interface KnockoutTemplateEngine extends KnockoutNativeTemplateEngine {
-
-    createJavaScriptEvaluatorBlock(script: string): string;
-
-    makeTemplateSource(template: any, templateDocument?: Document): any;
-
-    renderTemplate(template: any, bindingContext: KnockoutBindingContext, options: Object, templateDocument: Document): any;
-
-    isTemplateRewritten(template: any, templateDocument: Document): boolean;
-
-    rewriteTemplate(template: any, rewriterCallback: Function, templateDocument: Document): void;
-}
-
-/////////////////////////////////
-
-interface KnockoutStatic {
-    utils: KnockoutUtils;
-    memoization: KnockoutMemoization;
-
-	bindingHandlers: KnockoutBindingHandlers;
-	getBindingHandler(handler: string): KnockoutBindingHandler;
-
-    virtualElements: KnockoutVirtualElements;
-    extenders: KnockoutExtenders;
-
-    applyBindings(viewModelOrBindingContext?: any, rootNode?: any): void;
-	applyBindingsToDescendants(viewModelOrBindingContext: any, rootNode: any): void;
-	applyBindingAccessorsToNode(node: Node, bindings: (bindingContext: KnockoutBindingContext, node: Node) => {}, bindingContext: KnockoutBindingContext): void;
-	applyBindingAccessorsToNode(node: Node, bindings: {}, bindingContext: KnockoutBindingContext): void;
-	applyBindingAccessorsToNode(node: Node, bindings: (bindingContext: KnockoutBindingContext, node: Node) => {}, viewModel: any): void;
-	applyBindingAccessorsToNode(node: Node, bindings: {}, viewModel: any): void;
-    applyBindingsToNode(node: Node, bindings: any, viewModelOrBindingContext?: any): any;
-
-    subscribable: KnockoutSubscribableStatic;
-    observable: KnockoutObservableStatic;
-
-	computed: KnockoutComputedStatic;
-	pureComputed<T>(evaluatorFunction: () => T, context?: any): KnockoutComputed<T>;
-	pureComputed<T>(options: KnockoutComputedDefine<T>, context?: any): KnockoutComputed<T>;
-
-    observableArray: KnockoutObservableArrayStatic;
-
-    contextFor(node: any): any;
-    isSubscribable(instance: any): instance is KnockoutSubscribable<any>;
-    toJSON(viewModel: any, replacer?: Function, space?: any): string;
-    toJS(viewModel: any): any;
-    isObservable(instance: any): instance is KnockoutObservable<any>;
-    isWriteableObservable(instance: any): instance is KnockoutObservable<any>;
-    isComputed(instance: any): instance is KnockoutComputed<any>;
-    dataFor(node: any): any;
-    removeNode(node: Element): void;
-    cleanNode(node: Element): Element;
-    renderTemplate(template: Function, viewModel: any, options?: any, target?: any, renderMode?: any): any;
-    renderTemplate(template: string, viewModel: any, options?: any, target?: any, renderMode?: any): any;
-	unwrap<T>(value: KnockoutObservable<T> | T): T;
-
-	computedContext: KnockoutComputedContext;
-
-    //////////////////////////////////
-    // templateSources.js
-    //////////////////////////////////
-
-    templateSources: KnockoutTemplateSources;
-
-    //////////////////////////////////
-    // templateEngine.js
-    //////////////////////////////////
-
-    templateEngine: {
-
-        prototype: KnockoutTemplateEngine;
-
-        new (): KnockoutTemplateEngine;
-    };
-
-    //////////////////////////////////
-    // templateRewriting.js
-    //////////////////////////////////
-
-    templateRewriting: {
-
-        ensureTemplateIsRewritten(template: Node, templateEngine: KnockoutTemplateEngine, templateDocument: Document): any;
-        ensureTemplateIsRewritten(template: string, templateEngine: KnockoutTemplateEngine, templateDocument: Document): any;
-
-        memoizeBindingAttributeSyntax(htmlString: string, templateEngine: KnockoutTemplateEngine): any;
-
-        applyMemoizedBindingsToNextSibling(bindings: any, nodeName: string): string;
-    };
-
-    //////////////////////////////////
-    // nativeTemplateEngine.js
-    //////////////////////////////////
-
-    nativeTemplateEngine: {
-
-        prototype: KnockoutNativeTemplateEngine;
-
-        new (): KnockoutNativeTemplateEngine;
-
-        instance: KnockoutNativeTemplateEngine;
-    };
-
-    //////////////////////////////////
-    // jqueryTmplTemplateEngine.js
-    //////////////////////////////////
-
-    jqueryTmplTemplateEngine: {
-
-        prototype: KnockoutTemplateEngine;
-
-        renderTemplateSource(templateSource: Object, bindingContext: KnockoutBindingContext, options: Object): Node[];
-
-        createJavaScriptEvaluatorBlock(script: string): string;
-
-        addTemplate(templateName: string, templateMarkup: string): void;
-    };
-
-    //////////////////////////////////
-    // templating.js
-    //////////////////////////////////
-
-    setTemplateEngine(templateEngine: KnockoutNativeTemplateEngine): void;
-
-    renderTemplate(template: Function, dataOrBindingContext: KnockoutBindingContext, options: Object, targetNodeOrNodeArray: Node, renderMode: string): any;
-    renderTemplate(template: any, dataOrBindingContext: KnockoutBindingContext, options: Object, targetNodeOrNodeArray: Node, renderMode: string): any;
-    renderTemplate(template: Function, dataOrBindingContext: any, options: Object, targetNodeOrNodeArray: Node, renderMode: string): any;
-    renderTemplate(template: any, dataOrBindingContext: any, options: Object, targetNodeOrNodeArray: Node, renderMode: string): any;
-    renderTemplate(template: Function, dataOrBindingContext: KnockoutBindingContext, options: Object, targetNodeOrNodeArray: Node[], renderMode: string): any;
-    renderTemplate(template: any, dataOrBindingContext: KnockoutBindingContext, options: Object, targetNodeOrNodeArray: Node[], renderMode: string): any;
-    renderTemplate(template: Function, dataOrBindingContext: any, options: Object, targetNodeOrNodeArray: Node[], renderMode: string): any;
-    renderTemplate(template: any, dataOrBindingContext: any, options: Object, targetNodeOrNodeArray: Node[], renderMode: string): any;
-
-    renderTemplateForEach(template: Function, arrayOrObservableArray: any[], options: Object, targetNode: Node, parentBindingContext: KnockoutBindingContext): any;
-    renderTemplateForEach(template: any, arrayOrObservableArray: any[], options: Object, targetNode: Node, parentBindingContext: KnockoutBindingContext): any;
-    renderTemplateForEach(template: Function, arrayOrObservableArray: KnockoutObservable<any>, options: Object, targetNode: Node, parentBindingContext: KnockoutBindingContext): any;
-    renderTemplateForEach(template: any, arrayOrObservableArray: KnockoutObservable<any>, options: Object, targetNode: Node, parentBindingContext: KnockoutBindingContext): any;
-
-    expressionRewriting: {
-        bindingRewriteValidators: any;
-        parseObjectLiteral: { (objectLiteralString: string): any[] }
-    };
-
-    /////////////////////////////////
-
-	bindingProvider: {
-		instance: KnockoutBindingProvider;
-		new (): KnockoutBindingProvider;
-	}
-
-    /////////////////////////////////
-    // selectExtensions.js
-    /////////////////////////////////
-
-    selectExtensions: {
-
-        readValue(element: HTMLElement): any;
-
-        writeValue(element: HTMLElement, value: any): void;
-    };
-
-    components: KnockoutComponents;
-}
-
-interface KnockoutBindingProvider {
-	nodeHasBindings(node: Node): boolean;
-	getBindings(node: Node, bindingContext: KnockoutBindingContext): {};
-	getBindingAccessors?(node: Node, bindingContext: KnockoutBindingContext): { [key: string]: string; };
-}
-
-interface KnockoutComputedContext {
-	getDependenciesCount(): number;
-	isInitial: () => boolean;
-	isSleeping: boolean;
-}
-
-//
-// refactored types into a namespace to reduce global pollution
-// and used Union Types to simplify overloads (requires TypeScript 1.4)
-//
-declare namespace KnockoutComponentTypes {
-
-    interface Config {
-        viewModel?: ViewModelFunction | ViewModelSharedInstance | ViewModelFactoryFunction | AMDModule;
-        template: string | Node[]| DocumentFragment | TemplateElement | AMDModule;
-        synchronous?: boolean;
-    }
-
-    interface ComponentConfig {
-        viewModel?: ViewModelFunction | ViewModelSharedInstance | ViewModelFactoryFunction | AMDModule;
-        template: any;
-        createViewModel?: any;
-    }
-
-    interface EmptyConfig {
-    }
-
-    // common AMD type
-    interface AMDModule {
-        require: string;
-    }
-
-    // viewmodel types
-    interface ViewModelFunction {
-        (params?: any): any;
-    }
-
-    interface ViewModelSharedInstance {
-        instance: any;
-    }
-
-    interface ViewModelFactoryFunction {
-        createViewModel: (params?: any, componentInfo?: ComponentInfo) => any;
-    }
-
-    interface ComponentInfo {
-        element: Node;
-        templateNodes: Node[];
-    }
-
-    interface TemplateElement {
-        element: string | Node;
-    }
-
-    interface Loader {
-        getConfig? (componentName: string, callback: (result: ComponentConfig) => void): void;
-        loadComponent? (componentName: string, config: ComponentConfig, callback: (result: Definition) => void): void;
-        loadTemplate? (componentName: string, templateConfig: any, callback: (result: Node[]) => void): void;
-        loadViewModel? (componentName: string, viewModelConfig: any, callback: (result: any) => void): void;
-        suppressLoaderExceptions?: boolean;
-    }
-
-    interface Definition {
-        template: Node[];
-        createViewModel? (params: any, options: { element: Node; }): any;
-    }
-}
-
-interface KnockoutComponents {
-    // overloads for register method:
-    register(componentName: string, config: KnockoutComponentTypes.Config | KnockoutComponentTypes.EmptyConfig): void;
-
-    isRegistered(componentName: string): boolean;
-    unregister(componentName: string): void;
-    get(componentName: string, callback: (definition: KnockoutComponentTypes.Definition) => void): void;
-    clearCachedDefinition(componentName: string): void
-    defaultLoader: KnockoutComponentTypes.Loader;
-    loaders: KnockoutComponentTypes.Loader[];
-    getComponentNameForNode(node: Node): string;
-}
-
-declare var ko: KnockoutStatic;
-
-declare module "knockout" {
-	export = ko;
-}
diff --git a/knockout/knockoutamd-tests.ts b/knockout/knockoutamd-tests.ts
index c874c6208b..8bfb23059f 100644
--- a/knockout/knockoutamd-tests.ts
+++ b/knockout/knockoutamd-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./knockout.d.ts" />
+
 
 import ko = require("knockout");
 
diff --git a/knockout/tests/jasmine.extensions.d.ts b/knockout/tests/index.d.ts
similarity index 100%
rename from knockout/tests/jasmine.extensions.d.ts
rename to knockout/tests/index.d.ts
diff --git a/knockout/tests/knockout-templatingBehaviors-tests.ts b/knockout/tests/knockout-templatingBehaviors-tests.ts
index cd86465b23..58ddfcf3bd 100644
--- a/knockout/tests/knockout-templatingBehaviors-tests.ts
+++ b/knockout/tests/knockout-templatingBehaviors-tests.ts
@@ -1,7 +1,5 @@
-/// <reference path="../../jasmine/jasmine.d.ts" />
-/// <reference path="jasmine.extensions.d.ts" />
-/// <reference path="../knockout.d.ts" />
-/// <reference path="../../knockout.mapping/knockout.mapping.d.ts" />
+/// <reference types="jasmine" />
+/// <reference types="knockout.mapping" />
 
 var dummyTemplateEngine = function (templates?) {
     var inMemoryTemplates = templates || {};
diff --git a/knockout/tests/knockout-templatingBehaviors-tests.ts.tscparams b/knockout/tests/knockout-templatingBehaviors-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/knockout/tests/knockout-templatingBehaviors-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/knockout/tests/knockout-tests.ts b/knockout/tests/knockout-tests.ts
index e9334a7534..7ee50990c0 100644
--- a/knockout/tests/knockout-tests.ts
+++ b/knockout/tests/knockout-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../knockout.d.ts" />
-/// <reference path="../../knockout.mapping/knockout.mapping.d.ts" />
+
+/// <reference types="knockout.mapping" />
 
 declare var $;
 
@@ -571,7 +571,7 @@ function test_misc() {
     });
 	
 	this.observableFactory = function(): KnockoutObservable<number>{
-	    if (true) {
+	    if (!!true) {
 			return ko.computed({
 				read:function(){ 
 					return 3; 
diff --git a/knockout/tests/knockout-tests.ts.tscparams b/knockout/tests/knockout-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/knockout/tests/knockout-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/knockout/tsconfig.json b/knockout/tsconfig.json
new file mode 100644
index 0000000000..b1b3470233
--- /dev/null
+++ b/knockout/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "all-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/knockstrap/index.d.ts b/knockstrap/index.d.ts
new file mode 100644
index 0000000000..4895ef22da
--- /dev/null
+++ b/knockstrap/index.d.ts
@@ -0,0 +1,163 @@
+// Type definitions for Knockstrap
+// Project: http://faulknercs.github.io/Knockstrap/
+// Definitions by: Adam Pluciński <https://github.com/adaskothebeast>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="jquery" /> 
+///<reference types="bootstrap" /> 
+///<reference types="knockout" /> 
+
+interface KnockoutUtils {
+    uniqueId(prefix: string): string;
+    unwrapProperties(wrappedProperies: any): any;
+}
+
+interface KnockoutTemplateSources {
+    stringTemplate: {
+        prototype: KnockstrapStringTemplate;
+        new (template: string): KnockstrapStringTemplate;
+    };
+}
+
+interface KnockstrapStringTemplate extends KnockoutTemplateSourcesDomElement {
+    templateName: string;
+}
+
+interface KnockoutStatic {
+    stringTemplateEngine: {
+        prototype: KnockstrapStringTemplateEngine;
+        new (): KnockstrapStringTemplateEngine;
+        instance: KnockstrapStringTemplateEngine;
+    }
+}
+
+interface KnockstrapStringTemplateEngine extends KnockoutNativeTemplateEngine {
+    allowTemplateRewriting: boolean;
+    makeTemplateSource(template: string): KnockstrapStringTemplate;
+    addTemplate(name: string, template: any): void;
+    removeTemplate(name: string): void;
+    isTemplateExist(name: string): boolean;
+    getTemplate(name: string): any;
+}
+
+interface KnockoutBindingHandlers {
+    alert: AlertKnockoutBindingHandler;
+    carousel: CarouselKnockoutBindingHandler;
+    checkbox: KnockoutBindingHandler;
+    modal: ModalKnockoutBindingHandler;
+    popover: PopoverKnockoutBindingHandler;
+    progress: ProgressKnockoutBindingHandler;
+    radio: KnockoutBindingHandler;
+    toggle: KnockoutBindingHandler;
+    tooltip: KnockoutBindingHandler;
+}
+
+interface KnockoutControlsDescendantBindings {
+    controlsDescendantBindings: boolean;
+}
+
+interface AlertKnockoutBindingHandler extends KnockoutBindingHandler {
+    init? (element: any,
+        valueAccessor: () => any,
+        allBindingsAccessor: KnockoutAllBindingsAccessor,
+        viewModel: any,
+        bindingContext: KnockoutBindingContext): KnockoutControlsDescendantBindings;
+}
+
+interface CarouselKnockoutBindingHandler extends KnockoutBindingHandler {
+    init? (element: any,
+        valueAccessor: () => any,
+        allBindingsAccessor: KnockoutAllBindingsAccessor,
+        viewModel: any,
+        bindingContext: KnockoutBindingContext): KnockoutControlsDescendantBindings;
+    defaults: KnockstrapCarouselDefaults;
+}
+
+interface KnockstrapCarouselDefaults {
+    css: string;
+    controlsTemplate: KnockstrapCarouselDefaultsControlsTemplate;
+    indicatorsTemplate: KnockstrapCarouselDefaultsIndicatorsTemplate;
+    itemTemplate: KnockstrapCarouselDefaultsItemTemplate;
+}
+
+interface KnockstrapDefaultsTemplateBase {
+    name: string;
+    templateEngine: KnockstrapStringTemplateEngine;
+}
+
+interface KnockstrapCarouselDefaultsControlsTemplate extends KnockstrapDefaultsTemplateBase {
+    dataConverter(value: any): KnockstrapCarouselDefaultsIdDataConverted;
+
+}
+
+interface KnockstrapCarouselDefaultsIdDataConverted {
+    id: KnockoutComputed<string>;
+}
+
+interface KnockstrapCarouselDefaultsIndicatorsTemplate extends KnockstrapDefaultsTemplateBase {
+    dataConverter(value: any): KnockstrapCarouselDefaultsIdItemsDataConverted;
+}
+
+interface KnockstrapCarouselDefaultsIdItemsDataConverted extends KnockstrapCarouselDefaultsIdDataConverted {
+    items: any;
+}
+
+interface KnockstrapCarouselDefaultsItemTemplate extends KnockstrapDefaultsTemplateBase {
+    converter(value: any): any;
+}
+
+interface ModalKnockoutBindingHandler extends KnockoutBindingHandler {
+    init? (element: any,
+        valueAccessor: () => any,
+        allBindingsAccessor: KnockoutAllBindingsAccessor,
+        viewModel: any,
+        bindingContext: KnockoutBindingContext): KnockoutControlsDescendantBindings;
+    defaults: KnockstrapModalDefaults;
+}
+
+interface KnockstrapModalDefaults {
+    css: string;
+    attributes: KnockstrapModalDefaultsAttributes;
+    headerTemplate: KnockstrapDefaultsTemplateBase;
+    bodyTemplate: KnockstrapDefaultsTemplateBase;
+    footerTemplate: KnockstrapModalDefaultsFooterTemplate;
+}
+
+interface KnockstrapModalDefaultsAttributes {
+    role: string;
+}
+
+interface KnockstrapModalDefaultsFooterTemplate extends KnockstrapDefaultsTemplateBase {
+    data: KnockstrapModalDefaultsFooterData;
+}
+
+interface KnockstrapModalDefaultsFooterData {
+    closeLabel: string;
+    primaryLabel: string;
+}
+
+interface PopoverKnockoutBindingHandler extends KnockoutBindingHandler {
+    init? (element: any,
+        valueAccessor: () => any,
+        allBindingsAccessor: KnockoutAllBindingsAccessor,
+        viewModel: any,
+        bindingContext: KnockoutBindingContext): KnockoutControlsDescendantBindings;
+}
+
+interface ProgressKnockoutBindingHandler extends KnockoutBindingHandler {
+    init? (element: any,
+        valueAccessor: () => any,
+        allBindingsAccessor: KnockoutAllBindingsAccessor,
+        viewModel: any,
+        bindingContext: KnockoutBindingContext): KnockoutControlsDescendantBindings;
+    defaults: KnockstrapProgressDefaults;
+}
+
+interface KnockstrapProgressDefaults {
+    css: string;
+    text: string;
+    textHidden: boolean;
+    striped: boolean;
+    type: string;
+    animated: boolean;
+}
\ No newline at end of file
diff --git a/knockstrap/knockstrap-tests.ts b/knockstrap/knockstrap-tests.ts
index cdc3af29d1..2033252de2 100644
--- a/knockstrap/knockstrap-tests.ts
+++ b/knockstrap/knockstrap-tests.ts
@@ -1,7 +1,7 @@
-///<reference path="../jquery/jquery.d.ts" />
-///<reference path="../bootstrap/bootstrap.d.ts" />
-///<reference path="../knockout/knockout.d.ts" />
-/// <reference path="knockstrap.d.ts" />
+///<reference types="jquery" />
+///<reference types="bootstrap" />
+///<reference types="knockout" />
+
 
 
 // test unique id
diff --git a/knockstrap/knockstrap.d.ts b/knockstrap/knockstrap.d.ts
deleted file mode 100644
index 6e986783f3..0000000000
--- a/knockstrap/knockstrap.d.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-// Type definitions for Knockstrap
-// Project: http://faulknercs.github.io/Knockstrap/
-// Definitions by: Adam Pluciński <https://github.com/adaskothebeast>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../jquery/jquery.d.ts" /> 
-///<reference path="../bootstrap/bootstrap.d.ts" /> 
-///<reference path="../knockout/knockout.d.ts" /> 
-
-interface KnockoutUtils {
-    uniqueId(prefix: string): string;
-    unwrapProperties(wrappedProperies: any): any;
-}
-
-interface KnockoutTemplateSources {
-    stringTemplate: {
-        prototype: KnockstrapStringTemplate;
-        new (template: string): KnockstrapStringTemplate;
-    };
-}
-
-interface KnockstrapStringTemplate extends KnockoutTemplateSourcesDomElement {
-    templateName: string;
-}
-
-interface KnockoutStatic {
-    stringTemplateEngine: {
-        prototype: KnockstrapStringTemplateEngine;
-        new (): KnockstrapStringTemplateEngine;
-        instance: KnockstrapStringTemplateEngine;
-    }
-}
-
-interface KnockstrapStringTemplateEngine extends KnockoutNativeTemplateEngine {
-    allowTemplateRewriting: boolean;
-    makeTemplateSource(template: string): KnockstrapStringTemplate;
-    addTemplate(name: string, template: any): void;
-    removeTemplate(name: string): void;
-    isTemplateExist(name: string): boolean;
-    getTemplate(name: string): any;
-}
-
-interface KnockoutBindingHandlers {
-    alert: AlertKnockoutBindingHandler;
-    carousel: CarouselKnockoutBindingHandler;
-    checkbox: KnockoutBindingHandler;
-    modal: ModalKnockoutBindingHandler;
-    popover: PopoverKnockoutBindingHandler;
-    progress: ProgressKnockoutBindingHandler;
-    radio: KnockoutBindingHandler;
-    toggle: KnockoutBindingHandler;
-    tooltip: KnockoutBindingHandler;
-}
-
-interface KnockoutControlsDescendantBindings {
-    controlsDescendantBindings: boolean;
-}
-
-interface AlertKnockoutBindingHandler extends KnockoutBindingHandler {
-    init? (element: any,
-        valueAccessor: () => any,
-        allBindingsAccessor: KnockoutAllBindingsAccessor,
-        viewModel: any,
-        bindingContext: KnockoutBindingContext): KnockoutControlsDescendantBindings;
-}
-
-interface CarouselKnockoutBindingHandler extends KnockoutBindingHandler {
-    init? (element: any,
-        valueAccessor: () => any,
-        allBindingsAccessor: KnockoutAllBindingsAccessor,
-        viewModel: any,
-        bindingContext: KnockoutBindingContext): KnockoutControlsDescendantBindings;
-    defaults: KnockstrapCarouselDefaults;
-}
-
-interface KnockstrapCarouselDefaults {
-    css: string;
-    controlsTemplate: KnockstrapCarouselDefaultsControlsTemplate;
-    indicatorsTemplate: KnockstrapCarouselDefaultsIndicatorsTemplate;
-    itemTemplate: KnockstrapCarouselDefaultsItemTemplate;
-}
-
-interface KnockstrapDefaultsTemplateBase {
-    name: string;
-    templateEngine: KnockstrapStringTemplateEngine;
-}
-
-interface KnockstrapCarouselDefaultsControlsTemplate extends KnockstrapDefaultsTemplateBase {
-    dataConverter(value: any): KnockstrapCarouselDefaultsIdDataConverted;
-
-}
-
-interface KnockstrapCarouselDefaultsIdDataConverted {
-    id: KnockoutComputed<string>;
-}
-
-interface KnockstrapCarouselDefaultsIndicatorsTemplate extends KnockstrapDefaultsTemplateBase {
-    dataConverter(value: any): KnockstrapCarouselDefaultsIdItemsDataConverted;
-}
-
-interface KnockstrapCarouselDefaultsIdItemsDataConverted extends KnockstrapCarouselDefaultsIdDataConverted {
-    items: any;
-}
-
-interface KnockstrapCarouselDefaultsItemTemplate extends KnockstrapDefaultsTemplateBase {
-    converter(value: any): any;
-}
-
-interface ModalKnockoutBindingHandler extends KnockoutBindingHandler {
-    init? (element: any,
-        valueAccessor: () => any,
-        allBindingsAccessor: KnockoutAllBindingsAccessor,
-        viewModel: any,
-        bindingContext: KnockoutBindingContext): KnockoutControlsDescendantBindings;
-    defaults: KnockstrapModalDefaults;
-}
-
-interface KnockstrapModalDefaults {
-    css: string;
-    attributes: KnockstrapModalDefaultsAttributes;
-    headerTemplate: KnockstrapDefaultsTemplateBase;
-    bodyTemplate: KnockstrapDefaultsTemplateBase;
-    footerTemplate: KnockstrapModalDefaultsFooterTemplate;
-}
-
-interface KnockstrapModalDefaultsAttributes {
-    role: string;
-}
-
-interface KnockstrapModalDefaultsFooterTemplate extends KnockstrapDefaultsTemplateBase {
-    data: KnockstrapModalDefaultsFooterData;
-}
-
-interface KnockstrapModalDefaultsFooterData {
-    closeLabel: string;
-    primaryLabel: string;
-}
-
-interface PopoverKnockoutBindingHandler extends KnockoutBindingHandler {
-    init? (element: any,
-        valueAccessor: () => any,
-        allBindingsAccessor: KnockoutAllBindingsAccessor,
-        viewModel: any,
-        bindingContext: KnockoutBindingContext): KnockoutControlsDescendantBindings;
-}
-
-interface ProgressKnockoutBindingHandler extends KnockoutBindingHandler {
-    init? (element: any,
-        valueAccessor: () => any,
-        allBindingsAccessor: KnockoutAllBindingsAccessor,
-        viewModel: any,
-        bindingContext: KnockoutBindingContext): KnockoutControlsDescendantBindings;
-    defaults: KnockstrapProgressDefaults;
-}
-
-interface KnockstrapProgressDefaults {
-    css: string;
-    text: string;
-    textHidden: boolean;
-    striped: boolean;
-    type: string;
-    animated: boolean;
-}
\ No newline at end of file
diff --git a/knockstrap/tsconfig.json b/knockstrap/tsconfig.json
new file mode 100644
index 0000000000..7765f115ea
--- /dev/null
+++ b/knockstrap/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "knockstrap-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ko.plus/index.d.ts b/ko.plus/index.d.ts
new file mode 100644
index 0000000000..1fa17236b3
--- /dev/null
+++ b/ko.plus/index.d.ts
@@ -0,0 +1,157 @@
+// Type definitions for ko.plus v0.0.24
+// Project: https://github.com/stevegreatrex/ko.plus
+// Definitions by: Howard Richards <https://github.com/conficient>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+/// <reference types="knockout" />
+
+/**
+ *
+ * Extensions to KO to provide a command, editable and sortable patterns
+ * - available at http://www.nuget.org/packages/ko.plus/
+ *
+ * (requires TypeScript version 1.4 or higher)
+ *
+ * Version 1.0 - initial commit
+ *
+ * Version 1.1 - fixed bug - makeEditable is now a function on .editable
+ *               also refactored how the Editable classes inherit to simplify
+ *
+ * Version 1.2 - amended callback on commmand.fail() method - accepts response,
+ *               status and message values
+ */
+
+//
+// Add methods to the 'ko' Knockout object
+//
+interface KnockoutStatic {
+    // create a command - two overloads
+    command: (param: Function | KoPlus.CommandOptions) => KoPlus.Command;
+
+    editable: KoPlus.EditableStatic;
+    editableArray: KoPlus.EditableArrayStatic;
+}
+
+//#region Sortable type extensions
+
+//
+// extends the KnockoutObservableArray to add sorting methods
+// see https://github.com/stevegreatrex/ko.plus#properties-and-functions
+//
+interface KnockoutObservableArray<T> {
+    sortKey: KnockoutObservable<string>;
+
+    sortDescending: KnockoutObservable<boolean>;
+
+    setSourceKey: (key: string) => void;
+}
+
+//#endregion
+
+//
+// declare new binding handlers in ko.plus
+//
+interface KnockoutBindingHandlers {
+    loadingWhen: KnockoutBindingHandler;
+
+    command: KnockoutBindingHandler;
+
+    sortBy: KnockoutBindingHandler;
+}
+
+//
+// namespace for ko.plus types
+//
+declare namespace KoPlus {
+
+    //#region Command types
+
+    //
+    // the Command interface - returned by ko.command(..)
+    //
+    export interface Command {
+        // execute the command
+        (): void;
+
+        //
+        // properties: https://github.com/stevegreatrex/ko.plus#properties
+        //
+        isRunning: KnockoutObservable<boolean>;
+
+        canExecute: KnockoutComputed<boolean>;
+
+        failed: KnockoutObservable<boolean>;
+
+        completed: KnockoutObservable<boolean>;
+
+        //
+        // functions
+        // see https://github.com/stevegreatrex/ko.plus#functions
+        //
+        done: (callback: (data: any) => void) => Command;
+
+        fail: (callback: (response: any, status?: string, statusText?:string) => void) => Command;
+
+        always: (callback: Function) => Command;
+
+        then: (resolve: Function, reject: Function) => Command;
+    }
+
+    //
+    // options when defining a command using the option method
+    // see https://github.com/stevegreatrex/ko.plus#options
+    //
+    export interface CommandOptions {
+        // [required] sets the command action method
+        action: Function;
+
+        // [optional] function to determine if command can be executed
+        canExecute?: () => boolean;
+
+        // [optional] context to use in the command
+        context?: any;
+    }
+
+    //#endregion
+
+    //#region Editable types
+
+    export interface EditableStatic extends KnockoutObservableStatic {
+        <T>(value?: T): Editable<T>;
+
+        makeEditable(target: any): void;
+    }
+
+    export interface EditableArrayStatic extends KnockoutObservableArrayStatic {
+        <T>(value?: Array<T>): EditableArray<T>;
+
+        makeEditable(target: any): void; //>
+    }
+
+    //
+    // defines common editable functions and isEditing property
+    // (used by both editable and editableArray
+    //
+    export interface EditableFunctions {
+        isEditing: KnockoutObservable<boolean>;
+        beginEdit(): void;
+        endEdit(): void;
+        cancelEdit(): void;
+        rollback(): void;
+    }
+
+    //
+    // extend the standard KnockoutObservable to add editable functions
+    //
+    export interface Editable<T> extends KnockoutObservable<T>, EditableFunctions {
+    }
+
+    //
+    // extend the standard KnockoutObservableArray to add editable functions
+    //
+    export interface EditableArray<T> extends KnockoutObservableArray<T>, EditableFunctions {
+    }
+
+    //#endregion
+}
diff --git a/ko.plus/ko.plus-tests.ts b/ko.plus/ko.plus-tests.ts
index 56b90f38ab..cbb86d3122 100644
--- a/ko.plus/ko.plus-tests.ts
+++ b/ko.plus/ko.plus-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="ko.plus.d.ts" />
-/// <reference path="../knockout/knockout.d.ts" />
+
+/// <reference types="knockout" />
 
 // Tests for ko.plus.d.ts
 // Project: https://github.com/stevegreatrex/ko.plus
diff --git a/ko.plus/ko.plus.d.ts b/ko.plus/ko.plus.d.ts
deleted file mode 100644
index 05e86691be..0000000000
--- a/ko.plus/ko.plus.d.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-// Type definitions for ko.plus v0.0.24
-// Project: https://github.com/stevegreatrex/ko.plus
-// Definitions by: Howard Richards <https://github.com/conficient>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../knockout/knockout.d.ts" />
-
-/**
- *
- * Extensions to KO to provide a command, editable and sortable patterns
- * - available at http://www.nuget.org/packages/ko.plus/
- *
- * (requires TypeScript version 1.4 or higher)
- *
- * Version 1.0 - initial commit
- *
- * Version 1.1 - fixed bug - makeEditable is now a function on .editable
- *               also refactored how the Editable classes inherit to simplify
- *
- * Version 1.2 - amended callback on commmand.fail() method - accepts response,
- *               status and message values
- */
-
-//
-// Add methods to the 'ko' Knockout object
-//
-interface KnockoutStatic {
-    // create a command - two overloads
-    command: (param: Function | KoPlus.CommandOptions) => KoPlus.Command;
-
-    editable: KoPlus.EditableStatic;
-    editableArray: KoPlus.EditableArrayStatic;
-}
-
-//#region Sortable type extensions
-
-//
-// extends the KnockoutObservableArray to add sorting methods
-// see https://github.com/stevegreatrex/ko.plus#properties-and-functions
-//
-interface KnockoutObservableArray<T> {
-    sortKey: KnockoutObservable<string>;
-
-    sortDescending: KnockoutObservable<boolean>;
-
-    setSourceKey: (key: string) => void;
-}
-
-//#endregion
-
-//
-// declare new binding handlers in ko.plus
-//
-interface KnockoutBindingHandlers {
-    loadingWhen: KnockoutBindingHandler;
-
-    command: KnockoutBindingHandler;
-
-    sortBy: KnockoutBindingHandler;
-}
-
-//
-// namespace for ko.plus types
-//
-declare namespace KoPlus {
-
-    //#region Command types
-
-    //
-    // the Command interface - returned by ko.command(..)
-    //
-    export interface Command {
-        // execute the command
-        (): void;
-
-        //
-        // properties: https://github.com/stevegreatrex/ko.plus#properties
-        //
-        isRunning: KnockoutObservable<boolean>;
-
-        canExecute: KnockoutComputed<boolean>;
-
-        failed: KnockoutObservable<boolean>;
-
-        completed: KnockoutObservable<boolean>;
-
-        //
-        // functions
-        // see https://github.com/stevegreatrex/ko.plus#functions
-        //
-        done: (callback: (data: any) => void) => Command;
-
-        fail: (callback: (response: any, status?: string, statusText?:string) => void) => Command;
-
-        always: (callback: Function) => Command;
-
-        then: (resolve: Function, reject: Function) => Command;
-    }
-
-    //
-    // options when defining a command using the option method
-    // see https://github.com/stevegreatrex/ko.plus#options
-    //
-    export interface CommandOptions {
-        // [required] sets the command action method
-        action: Function;
-
-        // [optional] function to determine if command can be executed
-        canExecute?: () => boolean;
-
-        // [optional] context to use in the command
-        context?: any;
-    }
-
-    //#endregion
-
-    //#region Editable types
-
-    export interface EditableStatic extends KnockoutObservableStatic {
-        <T>(value?: T): Editable<T>;
-
-        makeEditable(target: any): void;
-    }
-
-    export interface EditableArrayStatic extends KnockoutObservableArrayStatic {
-        <T>(value?: Array<T>): EditableArray<T>;
-
-        makeEditable(target: any): void; //>
-    }
-
-    //
-    // defines common editable functions and isEditing property
-    // (used by both editable and editableArray
-    //
-    export interface EditableFunctions {
-        isEditing: KnockoutObservable<boolean>;
-        beginEdit(): void;
-        endEdit(): void;
-        cancelEdit(): void;
-        rollback(): void;
-    }
-
-    //
-    // extend the standard KnockoutObservable to add editable functions
-    //
-    export interface Editable<T> extends KnockoutObservable<T>, EditableFunctions {
-    }
-
-    //
-    // extend the standard KnockoutObservableArray to add editable functions
-    //
-    export interface EditableArray<T> extends KnockoutObservableArray<T>, EditableFunctions {
-    }
-
-    //#endregion
-}
diff --git a/ko.plus/tsconfig.json b/ko.plus/tsconfig.json
new file mode 100644
index 0000000000..a0c775216b
--- /dev/null
+++ b/ko.plus/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ko.plus-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/koa-bodyparser/index.d.ts b/koa-bodyparser/index.d.ts
new file mode 100644
index 0000000000..dc17939ead
--- /dev/null
+++ b/koa-bodyparser/index.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for koa-bodyparser v3.x
+// Project: https://github.com/koajs/bodyparser
+// Definitions by: Jerry Chin <https://github.com/hellopao/>
+// Definitions: https://github.com/hellopao/DefinitelyTyped
+
+/* =================== USAGE ===================
+
+    import bodyParser = require("koa-bodyparser");
+    var Koa = require('koa');
+
+    var app = new Koa();
+    app.use(bodyParser());
+
+ =============================================== */
+
+
+import * as Koa from "koa";
+
+declare function bodyParser(opts?: {
+    /**
+     * requested encoding. Default is utf-8 by co-body
+     */
+    encode?: string;
+
+    /**
+     * limit of the urlencoded body. If the body ends up being larger than this limit
+     * a 413 error code is returned. Default is 56kb
+     */
+    formLimit?: string;
+
+    /**
+     * limit of the json body. Default is 1mb
+     */
+    jsonLimit?: string;
+
+    /**
+     * when set to true, JSON parser will only accept arrays and objects. Default is true
+     */
+    strict?: boolean;
+
+    /**
+     * custom json request detect function. Default is null
+     */
+    detectJSON?: (ctx: Koa.Context) => boolean;
+
+    /**
+     * support extend types
+     */
+    extendTypes?: {
+        json?: string[];
+        form?: string[];
+    }
+
+    /**
+     * support custom error handle
+     */
+    onerror?: (err: Error, ctx: Koa.Context) => void;
+}): { (ctx: Koa.Context, next?: () => any): any };
+
+declare namespace bodyParser { }
+export = bodyParser;
diff --git a/koa-bodyparser/koa-bodyparser-tests.ts b/koa-bodyparser/koa-bodyparser-tests.ts
index 12b5932e94..03eb72e1bf 100644
--- a/koa-bodyparser/koa-bodyparser-tests.ts
+++ b/koa-bodyparser/koa-bodyparser-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="../koa/koa.d.ts" />
-/// <reference path="koa-bodyparser.d.ts" />
-
 import * as Koa from "koa";
 import bodyParser = require("koa-bodyparser");
 
diff --git a/koa-bodyparser/koa-bodyparser.d.ts b/koa-bodyparser/koa-bodyparser.d.ts
deleted file mode 100644
index 4168832199..0000000000
--- a/koa-bodyparser/koa-bodyparser.d.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-// Type definitions for koa-bodyparser v3.x
-// Project: https://github.com/koajs/bodyparser
-// Definitions by: Jerry Chin <https://github.com/hellopao/>
-// Definitions: https://github.com/hellopao/DefinitelyTyped
-
-/* =================== USAGE ===================
-
-    import bodyParser = require("koa-bodyparser");
-    var Koa = require('koa');
-
-    var app = new Koa();
-    app.use(bodyParser());
-
- =============================================== */
-
-/// <reference path="../koa/koa.d.ts" />
-
-declare module "koa-bodyparser" {
-
-    import * as Koa from "koa";
-
-    function bodyParser(opts?: {
-        /**
-         * requested encoding. Default is utf-8 by co-body
-         */
-        encode?: string;
-
-        /**
-         * limit of the urlencoded body. If the body ends up being larger than this limit
-         * a 413 error code is returned. Default is 56kb
-         */
-        formLimit?: string;
-
-        /**
-         * limit of the json body. Default is 1mb
-         */
-        jsonLimit?: string;
-
-        /**
-         * when set to true, JSON parser will only accept arrays and objects. Default is true
-         */
-        strict?: boolean;
-
-        /**
-         * custom json request detect function. Default is null
-         */
-        detectJSON?: (ctx: Koa.Context) => boolean;
-
-        /**
-         * support extend types
-         */
-        extendTypes?: {
-            json?: string[];
-            form?: string[];
-        }
-
-        /**
-         * support custom error handle
-         */
-        onerror?: (err: Error, ctx: Koa.Context) => void;
-    }): { (ctx: Koa.Context, next?: () => any): any };
-
-    export = bodyParser;
-}
diff --git a/koa-bodyparser/tsconfig.json b/koa-bodyparser/tsconfig.json
new file mode 100644
index 0000000000..3c79c64be6
--- /dev/null
+++ b/koa-bodyparser/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "koa-bodyparser-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/koa-compose/index.d.ts b/koa-compose/index.d.ts
new file mode 100644
index 0000000000..c27bc3f328
--- /dev/null
+++ b/koa-compose/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for koa v3.0.0
+// Project: https://github.com/koajs/compose
+// Definitions by: jKey Lu <https://github.com/jkeylu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function compose(middleware: compose.Middleware[]): compose.ComposedMiddleware;
+
+declare namespace compose {
+    interface Middleware {
+        (context: any, next?: () => Promise<void>): Promise<any>;
+    }
+
+    interface ComposedMiddleware {
+        (context: any): Promise<void>;
+    }
+}
+
+export = compose;
diff --git a/koa-compose/koa-compose-2.3.1-tests.ts b/koa-compose/koa-compose-2.3.1-tests.ts
index 72a4e08bc2..3eb2db890a 100644
--- a/koa-compose/koa-compose-2.3.1-tests.ts
+++ b/koa-compose/koa-compose-2.3.1-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="koa-compose-2.3.1.d.ts" />
+
 
 import compose = require('koa-compose');
 
diff --git a/koa-compose/koa-compose-2.3.1.d.ts b/koa-compose/koa-compose-2.3.1.d.ts
index 9d94f1a2dd..be6c16498d 100644
--- a/koa-compose/koa-compose-2.3.1.d.ts
+++ b/koa-compose/koa-compose-2.3.1.d.ts
@@ -3,18 +3,17 @@
 // Definitions by: jKey Lu <https://github.com/jkeylu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "koa-compose" {
-    function compose(middleware: compose.Middleware[]): compose.ComposedMiddleware;
 
-    namespace compose {
-        interface Middleware {
-            (next?: void): IterableIterator<any>;
-        }
+declare function compose(middleware: compose.Middleware[]): compose.ComposedMiddleware;
 
-        interface ComposedMiddleware {
-            (): IterableIterator<any>;
-        }
+declare namespace compose {
+    interface Middleware {
+        (next?: void): IterableIterator<any>;
     }
 
-    export = compose;
+    interface ComposedMiddleware {
+        (): IterableIterator<any>;
+    }
 }
+
+export = compose;
diff --git a/koa-compose/koa-compose-tests.ts b/koa-compose/koa-compose-tests.ts
index 122817929a..e5046b6413 100644
--- a/koa-compose/koa-compose-tests.ts
+++ b/koa-compose/koa-compose-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="koa-compose.d.ts" />
 
 import compose = require('koa-compose');
 
diff --git a/koa-compose/koa-compose.d.ts b/koa-compose/koa-compose.d.ts
deleted file mode 100644
index dcf0565e80..0000000000
--- a/koa-compose/koa-compose.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Type definitions for koa v3.0.0
-// Project: https://github.com/koajs/compose
-// Definitions by: jKey Lu <https://github.com/jkeylu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "koa-compose" {
-    function compose(middleware: compose.Middleware[]): compose.ComposedMiddleware;
-
-    namespace compose {
-        interface Middleware {
-            (context: any, next?: () => Promise<void>): Promise<any>;
-        }
-
-        interface ComposedMiddleware {
-            (context: any): Promise<void>;
-        }
-    }
-
-    export = compose;
-}
diff --git a/koa-compose/tsconfig.json b/koa-compose/tsconfig.json
new file mode 100644
index 0000000000..9593a5bed6
--- /dev/null
+++ b/koa-compose/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "koa-compose-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/koa-favicon/index.d.ts b/koa-favicon/index.d.ts
new file mode 100644
index 0000000000..64ddf7be7a
--- /dev/null
+++ b/koa-favicon/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for koa-favicon v2.x
+// Project: https://github.com/koajs/favicon
+// Definitions by: Jerry Chin <https://github.com/hellopao/>
+// Definitions: https://github.com/hellopao/DefinitelyTyped
+
+/* =================== USAGE ===================
+
+    import favicon = require("koa-favicon");
+    var Koa = require('koa');
+
+    var app = new Koa();
+    app.use(favicon(__dirname + '/public/favicon.ico'));
+
+ =============================================== */
+
+
+import * as Koa from "koa";
+
+/**
+ * Returns a middleware serving the favicon found on the given path.
+ */
+declare function favicon(path: string, options?: {
+
+    /**
+     * cache-control max-age directive in ms, defaulting to 1 day.
+     */
+    maxage?: number;
+
+}): { (ctx: Koa.Context, next?: () => any): any };
+
+export = favicon;
diff --git a/koa-favicon/koa-favicon-tests.ts b/koa-favicon/koa-favicon-tests.ts
index 5f2e0ac3f0..72dfdb5aaa 100644
--- a/koa-favicon/koa-favicon-tests.ts
+++ b/koa-favicon/koa-favicon-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="../koa/koa.d.ts" />
-/// <reference path="koa-favicon.d.ts" />
-
 import * as Koa from "koa";
 import favicon = require("koa-favicon");
 
diff --git a/koa-favicon/koa-favicon.d.ts b/koa-favicon/koa-favicon.d.ts
deleted file mode 100644
index 618683fc76..0000000000
--- a/koa-favicon/koa-favicon.d.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// Type definitions for koa-favicon v2.x
-// Project: https://github.com/koajs/favicon
-// Definitions by: Jerry Chin <https://github.com/hellopao/>
-// Definitions: https://github.com/hellopao/DefinitelyTyped
-
-/* =================== USAGE ===================
-
-    import favicon = require("koa-favicon");
-    var Koa = require('koa');
-
-    var app = new Koa();
-    app.use(favicon(__dirname + '/public/favicon.ico'));
-
- =============================================== */
-
-/// <reference path="../koa/koa.d.ts" />
-
-declare module "koa-favicon" {
-
-    import * as Koa from "koa";
-
-    /**
-     * Returns a middleware serving the favicon found on the given path.
-     */
-    function favicon(path: string, options?: {
-
-        /**
-         * cache-control max-age directive in ms, defaulting to 1 day.
-         */
-        maxage?: number;
-
-    }): { (ctx: Koa.Context, next?: () => any): any };
-
-    export = favicon;
-}
diff --git a/koa-favicon/tsconfig.json b/koa-favicon/tsconfig.json
new file mode 100644
index 0000000000..2de954802c
--- /dev/null
+++ b/koa-favicon/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "koa-favicon-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/koa-json/index.d.ts b/koa-json/index.d.ts
new file mode 100644
index 0000000000..16269804df
--- /dev/null
+++ b/koa-json/index.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for koa-json v2.x
+// Project: https://github.com/koajs/json
+// Definitions by: Alex Friedman <https://github.com/brooklyndev/>
+// Definitions: https://github.com/brooklyndev/DefinitelyTyped
+
+/* =================== USAGE ===================
+
+    import * as Koa from 'koa';
+    import * as json from 'koa-json';
+    
+    const app = new Koa();
+    app.use(json());
+
+ =============================================== */
+
+import * as Koa from "koa";
+
+declare function json(opts?: {
+
+    /** 
+     * default to pretty response [true]
+    */
+    pretty?: boolean,
+
+    /**
+     * optional query-string param for pretty responses [none]
+     */
+    param?: string,
+
+    /**
+     * JSON spaces [2]
+     */
+    spaces?: number
+}): { (ctx: Koa.Context, next?: () => any): any };
+declare namespace json { }
+export = json;
diff --git a/koa-json/koa-json-tests.ts b/koa-json/koa-json-tests.ts
new file mode 100644
index 0000000000..deb3aa8e0d
--- /dev/null
+++ b/koa-json/koa-json-tests.ts
@@ -0,0 +1,12 @@
+import * as Koa from "koa";
+import * as json from 'koa-json';
+
+const app = new Koa();
+
+app.use(json({
+    pretty: false,
+    param: 'pretty',
+    spaces: 2
+}));
+
+app.listen(80)
\ No newline at end of file
diff --git a/koa-json/tsconfig.json b/koa-json/tsconfig.json
new file mode 100644
index 0000000000..de3852aec9
--- /dev/null
+++ b/koa-json/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "koa-json-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/koa-mount/index.d.ts b/koa-mount/index.d.ts
new file mode 100644
index 0000000000..9c79156406
--- /dev/null
+++ b/koa-mount/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for koa-mount v2.0.0
+// Project: https://github.com/koajs/mount
+// Definitions by: AmirSaber Sharifi <https://github.com/amirsaber>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+import * as Koa from "koa";
+
+interface Function { (ctx: Koa.Context, next?: () => any): any }
+
+declare function mount(app: Function): Function;
+
+declare function mount(app: Koa): Function;
+
+declare function mount(prefix: string, app: Function): Function;
+
+declare function mount(prefix: string, app: Koa): Function;
+
+export = mount;
+
diff --git a/koa-mount/koa-mount-tests.ts b/koa-mount/koa-mount-tests.ts
new file mode 100644
index 0000000000..e3cc831971
--- /dev/null
+++ b/koa-mount/koa-mount-tests.ts
@@ -0,0 +1,26 @@
+
+
+
+import * as Koa from "koa";
+import mount = require("koa-mount");
+
+const a = new Koa();
+
+a.use((next) => {
+    this.body = "Hello";
+})
+
+const b = new Koa();
+
+b.use((next) => {
+    this.body = "World";
+});
+
+const app = new Koa();
+
+app.use(mount("/hello", a));
+app.use(mount("/world", b));
+
+app.listen(3000);
+console.log("listening on port 3000");
+
diff --git a/koa-mount/tsconfig.json b/koa-mount/tsconfig.json
new file mode 100644
index 0000000000..1eefe441ac
--- /dev/null
+++ b/koa-mount/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "koa-mount-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/koa-router/index.d.ts b/koa-router/index.d.ts
new file mode 100644
index 0000000000..4226a1197c
--- /dev/null
+++ b/koa-router/index.d.ts
@@ -0,0 +1,253 @@
+// Type definitions for koa-router v7.x
+// Project: https://github.com/alexmingoia/koa-router/
+// Definitions by: Jerry Chin <https://github.com/hellopao/>
+// Definitions: https://github.com/hellopao/DefinitelyTyped
+
+/* =================== USAGE ===================
+
+    import * as Router from "koa-router";
+    var router = new Router();
+
+ =============================================== */
+
+
+import * as Koa from "koa";
+
+declare module Layer {
+
+    export interface ILayerOptions {
+        name: string;
+        sensitive?: boolean;
+        strict?: boolean;
+    }
+
+}
+
+declare module Router {
+
+    export interface IRouterOptions {
+        /**
+         * Router prefixes 
+         */
+        prefix?: string;
+        /**
+         * HTTP verbs
+         */
+        methods?: string[];
+        routerPath?: string;
+        sensitive?: boolean;
+    }
+
+    export interface IRouterContext extends Koa.Context {
+        /**
+         * url params
+         */
+        params: any;
+    }
+
+    export interface IMiddleware {
+        (ctx: Router.IRouterContext, next?: () => any): any;
+    }
+
+    export interface IRouterAllowedMethodsOptions {
+        /**
+         * throw error instead of setting status and header
+         */
+        throw?: boolean;
+        /**
+         * throw the returned value in place of the default NotImplemented error
+         */
+        notImplemented?: () => any;
+        /**
+         * throw the returned value in place of the default MethodNotAllowed error
+         */
+        methodNotAllowed?: () => any;
+    }
+
+}
+
+declare class Layer {
+
+    opts: Layer.ILayerOptions;
+    name: string;
+    methods: string[];
+    paramNames: string[];
+    stack: Router.IMiddleware[];
+    regexp: RegExp;
+    path: string;
+
+    constructor(path: string, methods: string[], middleware: Router.IMiddleware, opts?: Layer.ILayerOptions);
+    constructor(path: string, methods: string[], middleware: Array<Router.IMiddleware>, opts?: Layer.ILayerOptions);
+    constructor(path: RegExp, methods: string[], middleware: Router.IMiddleware, opts?: Layer.ILayerOptions);
+    constructor(path: RegExp, methods: string[], middleware: Array<Router.IMiddleware>, opts?: Layer.ILayerOptions);
+
+    /**
+     * Returns whether request `path` matches route.
+     */
+    match(path: string): boolean;
+
+    /**
+     * Returns map of URL parameters for given `path` and `paramNames`.
+     */
+    params(path: string, captures: string[], existingParams?: Object): Object;
+
+    /**
+     * Returns array of regexp url path captures.
+     */
+    captures(path: string): string[];
+
+    /**
+     * Generate URL for route using given `params`.
+     */
+    url(params: Object): string;
+
+    /**
+     * Run validations on route named parameters.
+     */
+    param(param: string, fn: Router.IMiddleware): Layer;
+
+    /**
+     * Prefix route path.
+     */
+    setPrefix(prefix: string): Layer;
+}
+
+declare class Router {
+
+    params: Object;
+
+    stack: Array<Layer>;
+
+    /**
+     * Create a new router.
+     */
+    constructor(opt?: Router.IRouterOptions);
+
+    /**
+     * Use given middleware.
+     *
+     * Middleware run in the order they are defined by `.use()`. They are invoked
+     * sequentially, requests start at the first middleware and work their way
+     * "down" the middleware stack.
+     */
+    use(...middleware: Array<Router.IMiddleware>): Router;
+    use(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+
+    /**
+     * HTTP get method
+     */
+    get(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
+    get(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+
+    /**
+     * HTTP post method
+     */
+    post(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
+    post(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+
+    /**
+     * HTTP put method
+     */
+    put(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
+    put(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+
+    /**
+     * HTTP delete method
+     */
+    delete(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
+    delete(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+
+    /**
+     * Alias for `router.delete()` because delete is a reserved word
+     */
+    del(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
+    del(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+
+    /**
+     * HTTP head method
+     */
+    head(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
+    head(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+
+    /**
+     * HTTP options method
+     */
+    options(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
+    options(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+
+    /**
+     * HTTP path method
+     */
+    patch(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
+    patch(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+
+    /**
+     * Register route with all methods.
+     */
+    all(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
+    all(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+
+    /**
+     * Set the path prefix for a Router instance that was already initialized.
+     */
+    prefix(prefix: string): Router;
+
+    /**
+     * Returns router middleware which dispatches a route matching the request.
+     */
+    routes(): Router.IMiddleware;
+
+    /**
+     * Returns router middleware which dispatches a route matching the request.
+     */
+    middlewares(): Router.IMiddleware;
+
+    /**
+     * Returns separate middleware for responding to `OPTIONS` requests with
+     * an `Allow` header containing the allowed methods, as well as responding
+     * with `405 Method Not Allowed` and `501 Not Implemented` as appropriate.
+     */
+    allowedMethods(options?: Router.IRouterAllowedMethodsOptions): Router.IMiddleware;
+
+    /**
+     * Redirect `source` to `destination` URL with optional 30x status `code`.
+     * 
+     * Both `source` and `destination` can be route names.
+     */
+    redirect(source: string, destination: string, code?: number): Router;
+
+    /**
+     * Create and register a route.
+     */
+    register(path: string, methods: string[], middleware: Router.IMiddleware, opts?: Object): Layer;
+
+    /**
+     * Lookup route with given `name`.
+     */
+    route(name: string): Layer;
+    route(name: string): boolean;
+
+    /**
+     * Generate URL for route. Takes either map of named `params` or series of
+     * arguments (for regular expression routes)
+     */
+    url(name: string, params: Object): string;
+    url(name: string, params: Object): Error;
+
+    /**
+     * Match given `path` and return corresponding routes.
+     */
+    match(name: string, method: string): Object;
+
+    /**
+     * Run middleware for named route parameters. Useful for auto-loading or validation.
+     */
+    param(param: string, middleware: Router.IMiddleware): Router;
+
+    /**
+     * Generate URL from url pattern and given `params`.
+     */
+    static url(path: string, params: Object): string;
+}
+
+export = Router;
diff --git a/koa-router/koa-router-tests.ts b/koa-router/koa-router-tests.ts
index deaa7e083d..3b805a5306 100644
--- a/koa-router/koa-router-tests.ts
+++ b/koa-router/koa-router-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="../koa/koa.d.ts" />
-/// <reference path="koa-router.d.ts" />
-
 import * as Koa from "koa";
 import * as Router from "koa-router";
 
diff --git a/koa-router/koa-router.d.ts b/koa-router/koa-router.d.ts
deleted file mode 100644
index d289657c84..0000000000
--- a/koa-router/koa-router.d.ts
+++ /dev/null
@@ -1,257 +0,0 @@
-// Type definitions for koa-router v7.x
-// Project: https://github.com/alexmingoia/koa-router/
-// Definitions by: Jerry Chin <https://github.com/hellopao/>
-// Definitions: https://github.com/hellopao/DefinitelyTyped
-
-/* =================== USAGE ===================
-
-    import * as Router from "koa-router";
-    var router = new Router();
-
- =============================================== */
-
-/// <reference path="../koa/koa.d.ts" />
-
-declare module "koa-router" {
-
-    import * as Koa from "koa";
-
-    module Layer {
-
-        export interface ILayerOptions {
-            name: string;
-            sensitive?: boolean;
-            strict?: boolean;
-        }
-
-    }
-
-    module Router {
-
-        export interface IRouterOptions {
-            /**
-             * Router prefixes 
-             */
-            prefix?: string;
-            /**
-             * HTTP verbs
-             */
-            methods?: string[];
-            routerPath?: string;
-            sensitive?: boolean;
-        }
-
-        export interface IRouterContext extends Koa.Context {
-            /**
-             * url params
-             */
-            params: any;
-        }
-
-        export interface IMiddleware {
-            (ctx: Router.IRouterContext, next?: () => any): any;
-        }
-
-        export interface IRouterAllowedMethodsOptions {
-            /**
-             * throw error instead of setting status and header
-             */
-            throw?: boolean;
-            /**
-             * throw the returned value in place of the default NotImplemented error
-             */
-            notImplemented?: () => any;
-            /**
-             * throw the returned value in place of the default MethodNotAllowed error
-             */
-            methodNotAllowed?: () => any;
-        }
-
-    }
-
-    class Layer {
-
-        opts: Layer.ILayerOptions;
-        name: string;
-        methods: string[];
-        paramNames: string[];
-        stack: Router.IMiddleware[];
-        regexp: RegExp;
-        path: string;
-
-        constructor(path: string, methods: string[], middleware: Router.IMiddleware, opts?: Layer.ILayerOptions);
-        constructor(path: string, methods: string[], middleware: Array<Router.IMiddleware>, opts?: Layer.ILayerOptions);
-        constructor(path: RegExp, methods: string[], middleware: Router.IMiddleware, opts?: Layer.ILayerOptions);
-        constructor(path: RegExp, methods: string[], middleware: Array<Router.IMiddleware>, opts?: Layer.ILayerOptions);
-
-        /**
-         * Returns whether request `path` matches route.
-         */
-        match(path: string): boolean;
-
-        /**
-         * Returns map of URL parameters for given `path` and `paramNames`.
-         */
-        params(path: string, captures: string[], existingParams?: Object): Object;
-
-        /**
-         * Returns array of regexp url path captures.
-         */
-        captures(path: string): string[];
-
-        /**
-         * Generate URL for route using given `params`.
-         */
-        url(params: Object): string;
-
-        /**
-         * Run validations on route named parameters.
-         */
-        param(param: string, fn: Router.IMiddleware): Layer;
-
-        /**
-         * Prefix route path.
-         */
-        setPrefix(prefix: string): Layer;
-    }
-
-    class Router {
-
-        params: Object;
-
-        stack: Array<Layer>;
-
-        /**
-         * Create a new router.
-         */
-        constructor(opt?: Router.IRouterOptions);
-
-        /**
-         * Use given middleware.
-         *
-         * Middleware run in the order they are defined by `.use()`. They are invoked
-         * sequentially, requests start at the first middleware and work their way
-         * "down" the middleware stack.
-         */
-        use(...middleware: Array<Router.IMiddleware>): Router;
-        use(path: string, ...middleware: Array<Router.IMiddleware>): Router;
-
-        /**
-         * HTTP get method
-         */
-        get(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        get(path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        
-        /**
-         * HTTP post method
-         */
-        post(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        post(path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        
-        /**
-         * HTTP put method
-         */
-        put(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        put(path: string, ...middleware: Array<Router.IMiddleware>): Router;
-
-        /**
-         * HTTP delete method
-         */
-        delete(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        delete(path: string, ...middleware: Array<Router.IMiddleware>): Router;
-
-        /**
-         * Alias for `router.delete()` because delete is a reserved word
-         */
-        del(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        del(path: string, ...middleware: Array<Router.IMiddleware>): Router;
-
-        /**
-         * HTTP head method
-         */
-        head(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        head(path: string, ...middleware: Array<Router.IMiddleware>): Router;
-
-        /**
-         * HTTP options method
-         */
-        options(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        options(path: string, ...middleware: Array<Router.IMiddleware>): Router;
-
-        /**
-         * HTTP path method
-         */
-        patch(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        patch(path: string, ...middleware: Array<Router.IMiddleware>): Router;
-
-        /**
-         * Register route with all methods.
-         */
-        all(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        all(path: string, ...middleware: Array<Router.IMiddleware>): Router;
-
-        /**
-         * Set the path prefix for a Router instance that was already initialized.
-         */
-        prefix(prefix: string): Router;
-
-        /**
-         * Returns router middleware which dispatches a route matching the request.
-         */
-        routes(): Router.IMiddleware;
-
-        /**
-         * Returns router middleware which dispatches a route matching the request.
-         */
-        middlewares(): Router.IMiddleware;
-
-        /**
-         * Returns separate middleware for responding to `OPTIONS` requests with
-         * an `Allow` header containing the allowed methods, as well as responding
-         * with `405 Method Not Allowed` and `501 Not Implemented` as appropriate.
-         */
-        allowedMethods(options?: Router.IRouterAllowedMethodsOptions): Router.IMiddleware;
-
-        /**
-         * Redirect `source` to `destination` URL with optional 30x status `code`.
-         * 
-         * Both `source` and `destination` can be route names.
-         */
-        redirect(source: string, destination: string, code?: number): Router;
-
-        /**
-         * Create and register a route.
-         */
-        register(path: string, methods: string[], middleware: Router.IMiddleware, opts?: Object): Layer;
-
-        /**
-         * Lookup route with given `name`.
-         */
-        route(name: string): Layer;
-        route(name: string): boolean;
-
-        /**
-         * Generate URL for route. Takes either map of named `params` or series of
-         * arguments (for regular expression routes)
-         */
-        url(name: string, params: Object): string;
-        url(name: string, params: Object): Error;
-
-        /**
-         * Match given `path` and return corresponding routes.
-         */
-        match(name: string, method: string): Object;
-
-        /**
-         * Run middleware for named route parameters. Useful for auto-loading or validation.
-         */
-        param(param: string, middleware: Router.IMiddleware): Router;
-
-        /**
-         * Generate URL from url pattern and given `params`.
-         */
-        static url(path: string, params: Object): string;
-    }
-
-    export = Router;
-}
diff --git a/koa-router/tsconfig.json b/koa-router/tsconfig.json
new file mode 100644
index 0000000000..464596086c
--- /dev/null
+++ b/koa-router/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "koa-router-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/koa-static/index.d.ts b/koa-static/index.d.ts
new file mode 100644
index 0000000000..800f4593b2
--- /dev/null
+++ b/koa-static/index.d.ts
@@ -0,0 +1,47 @@
+// Type definitions for koa-static v2.x
+// Project: https://github.com/koajs/static
+// Definitions by: Jerry Chin <https://github.com/hellopao/>
+// Definitions: https://github.com/hellopao/DefinitelyTyped
+
+/* =================== USAGE ===================
+
+    import serve = require("koa-static");
+    var Koa = require('koa');
+
+    var app = new Koa();
+    app.use(serve("."));
+
+ =============================================== */
+
+
+import * as Koa from "koa";
+
+declare function serve(root: string, opts?: {
+
+    /**
+     * Default file name, defaults to 'index.html'
+     */
+    index?: boolean | string;
+
+    /**
+     * If true, serves after return next(),allowing any downstream middleware to respond first.
+     */
+    defer?: boolean;
+
+    /**
+     * Browser cache max-age in milliseconds. defaults to 0
+     */
+    maxage?: number;
+
+    /**
+     * Allow transfer of hidden files. defaults to false
+     */
+    hidden?: boolean;
+
+    /**
+     * Try to serve the gzipped version of a file automatically when gzip is supported by a client and if the requested file with .gz extension exists. defaults to true.
+     */
+    gzip?: boolean;
+}): { (ctx: Koa.Context, next?: () => any): any };
+
+export = serve;
diff --git a/koa-static/koa-static-tests.ts b/koa-static/koa-static-tests.ts
index bc77286fee..2bd7d41cde 100644
--- a/koa-static/koa-static-tests.ts
+++ b/koa-static/koa-static-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="../koa/koa.d.ts" />
-/// <reference path="koa-static.d.ts" />
-
 import * as Koa from "koa";
 import serve = require("koa-static");
 
diff --git a/koa-static/koa-static.d.ts b/koa-static/koa-static.d.ts
deleted file mode 100644
index 4b95eca3be..0000000000
--- a/koa-static/koa-static.d.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-// Type definitions for koa-static v2.x
-// Project: https://github.com/koajs/static
-// Definitions by: Jerry Chin <https://github.com/hellopao/>
-// Definitions: https://github.com/hellopao/DefinitelyTyped
-
-/* =================== USAGE ===================
-
-    import serve = require("koa-static");
-    var Koa = require('koa');
-
-    var app = new Koa();
-    app.use(serve("."));
-
- =============================================== */
-
-/// <reference path="../koa/koa.d.ts" />
-
-declare module "koa-static" {
-
-    import * as Koa from "koa";
-
-    function serve(root: string, opts?: {
-        
-        /**
-         * Default file name, defaults to 'index.html'
-         */
-        index?: boolean | string;
-        
-        /**
-         * If true, serves after return next(),allowing any downstream middleware to respond first.
-         */
-        defer?: boolean;
-        
-        /**
-         * Browser cache max-age in milliseconds. defaults to 0
-         */
-        maxage?: number;
-        
-        /**
-         * Allow transfer of hidden files. defaults to false
-         */
-        hidden?: boolean;
-        
-        /**
-         * Try to serve the gzipped version of a file automatically when gzip is supported by a client and if the requested file with .gz extension exists. defaults to true.
-         */
-        gzip?: boolean;
-    }): { (ctx: Koa.Context, next?: () => any): any };
-
-    export = serve;
-}
diff --git a/koa-static/tsconfig.json b/koa-static/tsconfig.json
new file mode 100644
index 0000000000..9e43cd4566
--- /dev/null
+++ b/koa-static/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "koa-static-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/koa/index.d.ts b/koa/index.d.ts
new file mode 100644
index 0000000000..cf31f64e56
--- /dev/null
+++ b/koa/index.d.ts
@@ -0,0 +1,140 @@
+// Type definitions for Koa 2.x
+// Project: http://koajs.com
+// Definitions by: DavidCai1993 <https://github.com/DavidCai1993>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* =================== USAGE ===================
+
+    import * as Koa from "koa"
+    const app = new Koa()
+
+    async function (ctx: Koa.Context, next: Function) {
+      // ...
+    }
+
+ =============================================== */
+/// <reference types="node" />
+
+
+import { EventEmitter } from "events";
+import * as http from "http";
+import * as net from "net";
+
+declare namespace Koa {
+    export interface Context extends Request, Response {
+        body?: any;
+        request?: Request;
+        response?: Response;
+        originalUrl?: string;
+        state?: any;
+        name?: string;
+        cookies?: any;
+        writable?: Boolean;
+        respond?: Boolean;
+        app?: Koa;
+        req?: http.IncomingMessage;
+        res?: http.ServerResponse;
+        onerror(err: any): void;
+        toJSON(): any;
+        inspect(): any;
+        throw(code?: any, message?: any): void;
+        assert(): void;
+    }
+
+    export interface Request {
+        _querycache?: string;
+        app?: Koa;
+        req?: http.IncomingMessage;
+        res?: http.ServerResponse;
+        response?: Response;
+        ctx?: Context;
+        headers?: any;
+        header?: any;
+        method?: string;
+        length?: any;
+        url?: string;
+        origin?: string;
+        originalUrl?: string;
+        href?: string;
+        path?: string;
+        querystring?: string;
+        query?: any;
+        search?: string;
+        idempotent?: Boolean;
+        socket?: net.Socket;
+        protocol?: string;
+        host?: string;
+        hostname?: string;
+        fresh?: Boolean;
+        stale?: Boolean;
+        charset?: string;
+        secure?: Boolean;
+        ips?: Array<string>;
+        ip?: string;
+        subdomains?: Array<string>;
+        accept?: any;
+        type?: string;
+        accepts?: () => any;
+        acceptsEncodings?: () => any;
+        acceptsCharsets?: () => any;
+        acceptsLanguages?: () => any;
+        is?: (types: any) => any;
+        toJSON?: () => any;
+        inspect?: () => any;
+        get?: (field: string) => string;
+    }
+
+    export interface Response {
+        _body?: any;
+        _explicitStatus?: Boolean;
+        app?: Koa;
+        res?: http.ServerResponse;
+        req?: http.IncomingMessage;
+        ctx?: Context;
+        request?: Request;
+        socket?: net.Socket;
+        header?: any;
+        headers?: any;
+        status?: number;
+        message?: string;
+        type?: string;
+        body?: any;
+        length?: any;
+        headerSent?: Boolean;
+        lastModified?: Date;
+        etag?: string;
+        writable?: Boolean;
+        is?: (types: any) => any;
+        redirect?: (url: string, alt: string) => void;
+        attachment?: (filename?: string) => void;
+        vary?: (field: string) => void;
+        get?: (field: string) => string;
+        set?: (field: any, val: any) => void;
+        remove?: (field: string) => void;
+        append?: (field: string, val: any) => void;
+        toJSON?: () => any;
+        inspect?: () => any;
+    }
+}
+
+declare class Koa extends EventEmitter {
+    keys: Array<string>;
+    subdomainOffset: number;
+    proxy: Boolean;
+    server: http.Server;
+    env: string;
+    context: Koa.Context;
+    request: Koa.Request;
+    response: Koa.Response;
+    silent: Boolean;
+    constructor();
+    use(middleware: (ctx: Koa.Context, next: Function) => any): Koa;
+    callback(): (req: http.IncomingMessage, res: http.ServerResponse) => void;
+    listen(port: number, callback?: Function): http.Server;
+    toJSON(): any;
+    inspect(): any;
+    onerror(err: any): void;
+}
+
+declare namespace Koa { }
+export = Koa;
diff --git a/koa/koa-1.1.2-tests.ts b/koa/koa-1.1.2-tests.ts
index da65e5a5da..f9d908a47c 100644
--- a/koa/koa-1.1.2-tests.ts
+++ b/koa/koa-1.1.2-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="koa-1.1.2.d.ts" />
+
 
 import * as Koa from 'koa';
 var app = new Koa();
diff --git a/koa/koa-1.1.2.d.ts b/koa/koa-1.1.2.d.ts
index 35ad65c74f..25361cf4d7 100644
--- a/koa/koa-1.1.2.d.ts
+++ b/koa/koa-1.1.2.d.ts
@@ -1,615 +1,592 @@
-// Type definitions for koa v1.1.2
-// Project: https://github.com/koajs/koa
-// Definitions by: jKey Lu <https://github.com/jkeylu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/* =================== USAGE ===================
 
-    import * as Koa from 'koa;
-    var app = new Koa();
 
- =============================================== */
+import * as net from 'net';
+import * as http from 'http';
+import * as events from 'events';
+import * as Cookies from 'cookies';
 
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../cookies/cookies.d.ts" />
-
-declare namespace Koa {
-
-    // These open interfaces may be extended in an application-specific manner via declaration merging.
-    // See for example method-override.d.ts (https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/method-override/method-override.d.ts)
-    export interface Request { }
-    export interface Response { }
-    export interface Application { }
+interface IRequest extends Koa.Request {
+    /**
+     * Return request header.
+     *
+     * @readonly
+     */
+    header: any;
+    /**
+     * Return request header, alias as request.header
+     *
+     * @readonly
+     */
+    headers: any;
+    /**
+     * Get/Set request URL.
+     */
+    url: string;
+    /**
+     * Get origin of URL.
+     */
+    origin: string;
+    /**
+     * Get full request URL.
+     *
+     * @readonly
+     */
+    href: string;
+    /**
+     * Get/Set request method.
+     */
+    method: string;
+    /**
+     * Get request pathname.
+     * Set pathname, retaining the query-string when present.
+     */
+    path: string;
+    /**
+     * Get parsed query-string.
+     * Set query-string as an object.
+     */
+    query: any;
+    /**
+     * Get/Set query string.
+     */
+    querystring: string;
+    /**
+     * Get the search string. Same as the querystring except it includes the leading ?.
+     * Set the search string. Same as response.querystring= but included for ubiquity.
+     */
+    search: string;
+    /**
+     * Parse the "Host" header field host and support X-Forwarded-Host when a proxy is enabled.
+     *
+     * @readonly
+     */
+    host: string;
+    /**
+     * Parse the "Host" header field hostname and support X-Forwarded-Host when a proxy is enabled.
+     *
+     * @readonly
+     */
+    hostname: string;
+    /**
+     * Check if the request is fresh, aka
+     * Last-Modified and/or the ETag
+     * still match.
+     *
+     * @readonly
+     */
+    fresh: boolean;
+    /**
+     * Check if the request is stale, aka
+     * "Last-Modified" and / or the "ETag" for the
+     * resource has changed.
+     *
+     * @readonly
+     */
+    stale: boolean;
+    /**
+     * Check if the request is idempotent.
+     *
+     * @readonly
+     */
+    idempotent: boolean;
+    /**
+     * Return the request socket.
+     *
+     * @readonly
+     */
+    socket: net.Socket;
+    /**
+     * Return the protocol string "http" or "https"
+     * when requested with TLS. When the proxy setting
+     * is enabled the "X-Forwarded-Proto" header
+     * field will be trusted. If you're running behind
+     * a reverse proxy that supplies https for you this
+     * may be enabled.
+     *
+     * @readonly
+     */
+    protocol: string;
+    /**
+     * Short-hand for:
+     *
+     *    this.protocol == 'https'
+     *
+     * @readonly
+     */
+    secure: boolean;
+    /**
+     * Return the remote address, or when
+     * `app.proxy` is `true` return
+     * the upstream addr.
+     *
+     * @readonly
+     */
+    ip: string;
+    /**
+     * When `app.proxy` is `true`, parse
+     * the "X-Forwarded-For" ip address list.
+     *
+     * For example if the value were "client, proxy1, proxy2"
+     * you would receive the array `["client", "proxy1", "proxy2"]`
+     * where "proxy2" is the furthest down-stream.
+     *
+     * @readonly
+     */
+    ips: string[];
+    /**
+     * Return subdomains as an array.
+     *
+     * Subdomains are the dot-separated parts of the host before the main domain of
+     * the app. By default, the domain of the app is assumed to be the last two
+     * parts of the host. This can be changed by setting `app.subdomainOffset`.
+     *
+     * For example, if the domain is "tobi.ferrets.example.com":
+     * If `app.subdomainOffset` is not set, this.subdomains is `["ferrets", "tobi"]`.
+     * If `app.subdomainOffset` is 3, this.subdomains is `["tobi"]`.
+     *
+     * @readonly
+     */
+    subdomains: string[];
+    /**
+     * Check if the given `type(s)` is acceptable, returning
+     * the best match when true, otherwise `undefined`, in which
+     * case you should respond with 406 "Not Acceptable".
+     *
+     * The `type` value may be a single mime type string
+     * such as "application/json", the extension name
+     * such as "json" or an array `["json", "html", "text/plain"]`. When a list
+     * or array is given the _best_ match, if any is returned.
+     *
+     * Examples:
+     *
+     *     // Accept: text/html
+     *     this.accepts('html');
+     *     // => "html"
+     *
+     *     // Accept: text/*, application/json
+     *     this.accepts('html');
+     *     // => "html"
+     *     this.accepts('text/html');
+     *     // => "text/html"
+     *     this.accepts('json', 'text');
+     *     // => "json"
+     *     this.accepts('application/json');
+     *     // => "application/json"
+     *
+     *     // Accept: text/*, application/json
+     *     this.accepts('image/png');
+     *     this.accepts('png');
+     *     // => undefined
+     *
+     *     // Accept: text/*;q=.5, application/json
+     *     this.accepts(['html', 'json']);
+     *     this.accepts('html', 'json');
+     *     // => "json"
+     */
+    accepts(...types: string[]): string | boolean | string[];
+    accepts(types: string[]): string | boolean | string[];
+    /**
+     * Return accepted encodings or best fit based on `encodings`.
+     *
+     * Given `Accept-Encoding: gzip, deflate`
+     * an array sorted by quality is returned:
+     *
+     *     ['gzip', 'deflate']
+     */
+    acceptsEncodings(...encodings: string[]): string | string[];
+    acceptsEncodings(encodings: string[]): string | string[];
+    /**
+     * Return accepted charsets or best fit based on `charsets`.
+     *
+     * Given `Accept-Charset: utf-8, iso-8859-1;q=0.2, utf-7;q=0.5`
+     * an array sorted by quality is returned:
+     *
+     *     ['utf-8', 'utf-7', 'iso-8859-1']
+     */
+    acceptsCharsets(...charsets: string[]): string | string[];
+    acceptsCharsets(charsets: string[]): string | string[];
+    /**
+     * Return accepted languages or best fit based on `langs`.
+     *
+     * Given `Accept-Language: en;q=0.8, es, pt`
+     * an array sorted by quality is returned:
+     *
+     *     ['es', 'pt', 'en']
+     */
+    acceptsLanguages(...langs: string[]): string | string[];
+    acceptsLanguages(langs: string[]): string | string[];
+    /**
+     * Check if the incoming request contains the "Content-Type"
+     * header field, and it contains any of the give mime `type`s.
+     * If there is no request body, `null` is returned.
+     * If there is no content type, `false` is returned.
+     * Otherwise, it returns the first `type` that matches.
+     *
+     * Examples:
+     *
+     *     // With Content-Type: text/html; charset=utf-8
+     *     this.is('html'); // => 'html'
+     *     this.is('text/html'); // => 'text/html'
+     *     this.is('text/*', 'application/json'); // => 'text/html'
+     *
+     *     // When Content-Type is application/json
+     *     this.is('json', 'urlencoded'); // => 'json'
+     *     this.is('application/json'); // => 'application/json'
+     *     this.is('html', 'application/*'); // => 'application/json'
+     *
+     *     this.is('html'); // => false
+     */
+    is(type: string): string | boolean;
+    is(types: string[]): string | boolean;
+    /**
+     * Return request header.
+     *
+     * The `Referrer` header field is special-cased,
+     * both `Referrer` and `Referer` are interchangeable.
+     *
+     * Examples:
+     *
+     *     this.get('Content-Type');
+     *     // => "text/plain"
+     *
+     *     this.get('content-type');
+     *     // => "text/plain"
+     *
+     *     this.get('Something');
+     *     // => undefined
+     */
+    get(field: string): string;
 }
 
-declare module "koa" {
-    import * as net from 'net';
-    import * as http from 'http';
-    import * as events from 'events';
-    import * as Cookies from 'cookies';
-
-    interface IRequest extends Koa.Request {
-            /**
-             * Return request header.
-             *
-             * @readonly
-             */
-            header: any;
-            /**
-             * Return request header, alias as request.header
-             *
-             * @readonly
-             */
-            headers: any;
-            /**
-             * Get/Set request URL.
-             */
-            url: string;
-            /**
-             * Get origin of URL.
-             */
-            origin: string;
-            /**
-             * Get full request URL.
-             *
-             * @readonly
-             */
-            href: string;
-            /**
-             * Get/Set request method.
-             */
-            method: string;
-            /**
-             * Get request pathname.
-             * Set pathname, retaining the query-string when present.
-             */
-            path: string;
-            /**
-             * Get parsed query-string.
-             * Set query-string as an object.
-             */
-            query: any;
-            /**
-             * Get/Set query string.
-             */
-            querystring: string;
-            /**
-             * Get the search string. Same as the querystring except it includes the leading ?.
-             * Set the search string. Same as response.querystring= but included for ubiquity.
-             */
-            search: string;
-            /**
-             * Parse the "Host" header field host and support X-Forwarded-Host when a proxy is enabled.
-             *
-             * @readonly
-             */
-            host: string;
-            /**
-             * Parse the "Host" header field hostname and support X-Forwarded-Host when a proxy is enabled.
-             *
-             * @readonly
-             */
-            hostname: string;
-            /**
-             * Check if the request is fresh, aka
-             * Last-Modified and/or the ETag
-             * still match.
-             *
-             * @readonly
-             */
-            fresh: boolean;
-            /**
-             * Check if the request is stale, aka
-             * "Last-Modified" and / or the "ETag" for the
-             * resource has changed.
-             *
-             * @readonly
-             */
-            stale: boolean;
-            /**
-             * Check if the request is idempotent.
-             *
-             * @readonly
-             */
-            idempotent: boolean;
-            /**
-             * Return the request socket.
-             *
-             * @readonly
-             */
-            socket: net.Socket;
-            /**
-             * Return the protocol string "http" or "https"
-             * when requested with TLS. When the proxy setting
-             * is enabled the "X-Forwarded-Proto" header
-             * field will be trusted. If you're running behind
-             * a reverse proxy that supplies https for you this
-             * may be enabled.
-             *
-             * @readonly
-             */
-            protocol: string;
-            /**
-             * Short-hand for:
-             *
-             *    this.protocol == 'https'
-             *
-             * @readonly
-             */
-            secure: boolean;
-            /**
-             * Return the remote address, or when
-             * `app.proxy` is `true` return
-             * the upstream addr.
-             *
-             * @readonly
-             */
-            ip: string;
-            /**
-             * When `app.proxy` is `true`, parse
-             * the "X-Forwarded-For" ip address list.
-             *
-             * For example if the value were "client, proxy1, proxy2"
-             * you would receive the array `["client", "proxy1", "proxy2"]`
-             * where "proxy2" is the furthest down-stream.
-             *
-             * @readonly
-             */
-            ips: string[];
-            /**
-             * Return subdomains as an array.
-             *
-             * Subdomains are the dot-separated parts of the host before the main domain of
-             * the app. By default, the domain of the app is assumed to be the last two
-             * parts of the host. This can be changed by setting `app.subdomainOffset`.
-             *
-             * For example, if the domain is "tobi.ferrets.example.com":
-             * If `app.subdomainOffset` is not set, this.subdomains is `["ferrets", "tobi"]`.
-             * If `app.subdomainOffset` is 3, this.subdomains is `["tobi"]`.
-             *
-             * @readonly
-             */
-            subdomains: string[];
-            /**
-             * Check if the given `type(s)` is acceptable, returning
-             * the best match when true, otherwise `undefined`, in which
-             * case you should respond with 406 "Not Acceptable".
-             *
-             * The `type` value may be a single mime type string
-             * such as "application/json", the extension name
-             * such as "json" or an array `["json", "html", "text/plain"]`. When a list
-             * or array is given the _best_ match, if any is returned.
-             *
-             * Examples:
-             *
-             *     // Accept: text/html
-             *     this.accepts('html');
-             *     // => "html"
-             *
-             *     // Accept: text/*, application/json
-             *     this.accepts('html');
-             *     // => "html"
-             *     this.accepts('text/html');
-             *     // => "text/html"
-             *     this.accepts('json', 'text');
-             *     // => "json"
-             *     this.accepts('application/json');
-             *     // => "application/json"
-             *
-             *     // Accept: text/*, application/json
-             *     this.accepts('image/png');
-             *     this.accepts('png');
-             *     // => undefined
-             *
-             *     // Accept: text/*;q=.5, application/json
-             *     this.accepts(['html', 'json']);
-             *     this.accepts('html', 'json');
-             *     // => "json"
-             */
-            accepts(...types: string[]): string|boolean|string[];
-            accepts(types: string[]): string|boolean|string[];
-            /**
-             * Return accepted encodings or best fit based on `encodings`.
-             *
-             * Given `Accept-Encoding: gzip, deflate`
-             * an array sorted by quality is returned:
-             *
-             *     ['gzip', 'deflate']
-             */
-            acceptsEncodings(...encodings: string[]): string|string[];
-            acceptsEncodings(encodings: string[]): string|string[];
-            /**
-             * Return accepted charsets or best fit based on `charsets`.
-             *
-             * Given `Accept-Charset: utf-8, iso-8859-1;q=0.2, utf-7;q=0.5`
-             * an array sorted by quality is returned:
-             *
-             *     ['utf-8', 'utf-7', 'iso-8859-1']
-             */
-            acceptsCharsets(...charsets: string[]): string|string[];
-            acceptsCharsets(charsets: string[]): string|string[];
-            /**
-             * Return accepted languages or best fit based on `langs`.
-             *
-             * Given `Accept-Language: en;q=0.8, es, pt`
-             * an array sorted by quality is returned:
-             *
-             *     ['es', 'pt', 'en']
-             */
-            acceptsLanguages(...langs: string[]): string|string[];
-            acceptsLanguages(langs: string[]): string|string[];
-            /**
-             * Check if the incoming request contains the "Content-Type"
-             * header field, and it contains any of the give mime `type`s.
-             * If there is no request body, `null` is returned.
-             * If there is no content type, `false` is returned.
-             * Otherwise, it returns the first `type` that matches.
-             *
-             * Examples:
-             *
-             *     // With Content-Type: text/html; charset=utf-8
-             *     this.is('html'); // => 'html'
-             *     this.is('text/html'); // => 'text/html'
-             *     this.is('text/*', 'application/json'); // => 'text/html'
-             *
-             *     // When Content-Type is application/json
-             *     this.is('json', 'urlencoded'); // => 'json'
-             *     this.is('application/json'); // => 'application/json'
-             *     this.is('html', 'application/*'); // => 'application/json'
-             *
-             *     this.is('html'); // => false
-             */
-            is(type: string): string|boolean;
-            is(types: string[]): string|boolean;
-            /**
-             * Return request header.
-             *
-             * The `Referrer` header field is special-cased,
-             * both `Referrer` and `Referer` are interchangeable.
-             *
-             * Examples:
-             *
-             *     this.get('Content-Type');
-             *     // => "text/plain"
-             *
-             *     this.get('content-type');
-             *     // => "text/plain"
-             *
-             *     this.get('Something');
-             *     // => undefined
-             */
-            get(field: string): string;
-    }
-
-    interface IResponse extends Koa.Response{
-            /**
-             * Get/Set response status code.
-             */
-            status: number;
-            /**
-             * Get/Set response status message
-             */
-            message: string;
-            /**
-             * Get/Set response body.
-             */
-            body: any;
-            /**
-             * Return parsed response Content-Length when present.
-             * Set Content-Length field to `n`.
-             */
-            length: number;
-            /**
-             * Check if a header has been written to the socket.
-             *
-             * @readonly
-             */
-            headerSent: boolean;
-            /**
-             * Vary on `field`.
-             */
-            vary(field: string): void;
-            /**
-             * Perform a 302 redirect to `url`.
-             *
-             * The string "back" is special-cased
-             * to provide Referrer support, when Referrer
-             * is not present `alt` or "/" is used.
-             *
-             * Examples:
-             *
-             *    this.redirect('back');
-             *    this.redirect('back', '/index.html');
-             *    this.redirect('/login');
-             *    this.redirect('http://google.com');
-             */
-            redirect(url: string): void;
-            redirect(url: string, alt: string): void;
-            /**
-             * Set Content-Disposition header to "attachment" with optional `filename`.
-             */
-            attachment(filename: string): void;
-            /**
-             * Return the response mime type void of
-             * parameters such as "charset".
-             *
-             * Set Content-Type response header with `type` through `mime.lookup()`
-             * when it does not contain a charset.
-             *
-             * Examples:
-             *
-             *     this.type = '.html';
-             *     this.type = 'html';
-             *     this.type = 'json';
-             *     this.type = 'application/json';
-             *     this.type = 'png';
-             */
-            type: string;
-            /**
-             * Get the Last-Modified date in Date form, if it exists.
-             * Set the Last-Modified date using a string or a Date.
-             *
-             *     this.response.lastModified = new Date();
-             *     this.response.lastModified = '2013-09-13';
-             */
-            lastModified: Date;
-            /**
-             * Get the ETag of a response.
-             * Set the ETag of a response.
-             * This will normalize the quotes if necessary.
-             *
-             *     this.response.etag = 'md5hashsum';
-             *     this.response.etag = '"md5hashsum"';
-             *     this.response.etag = 'W/"123456789"';
-             */
-            etag: string;
-            /**
-             * Set header `field` to `val`, or pass
-             * an object of header fields.
-             *
-             * Examples:
-             *
-             *    this.set('Foo', ['bar', 'baz']);
-             *    this.set('Accept', 'application/json');
-             *    this.set({ Accept: 'text/plain', 'X-API-Key': 'tobi' });
-             */
-            set(field: any): void;
-            set(field: string, val: string): void;
-            set(field: string, val: any[]): void;
-            /**
-             * Append additional header `field` with value `val`.
-             *
-             * Examples:
-             *
-             *    this.append('Link', ['<http://localhost/>', '<http://localhost:3000/>']);
-             *    this.append('Set-Cookie', 'foo=bar; Path=/; HttpOnly');
-             *    this.append('Warning', '199 Miscellaneous warning');
-             */
-            append(field: string, val: string): void;
-            append(field: string, val: any[]): void;
-            /**
-             * Remove header `field`.
-             */
-            remove(field: string): void;
-            /**
-             * Checks if the request is writable.
-             * Tests for the existence of the socket
-             * as node sometimes does not set it.
-             *
-             * @readonly
-             * @private
-             */
-            writable: boolean;
-    }
-
-    namespace koa {
-        interface BaseRequest extends IRequest {
-            /**
-             * Get the charset when present or undefined.
-             *
-             * @readonly
-             */
-            charset: string;
-            /**
-             * Return parsed Content-Length when present.
-             *
-             * @readonly
-             */
-            length: number;
-            /**
-             * Return the request mime type void of
-             * parameters such as "charset".
-             *
-             * @readonly
-             */
-            type: string;
-            /**
-             * Inspect implementation.
-             */
-            inspect(): any;
-            /**
-             * Return JSON representation.
-             */
-            toJSON(): any;
-        }
-
-        interface BaseResponse extends IResponse {
-            /**
-             * Return the request socket.
-             *
-             * @readonly
-             */
-            socket: net.Socket;
-            /**
-             * Return response header.
-             *
-             * @readonly
-             */
-            header: any;
-            /**
-             * Return response header, alias as response.header
-             */
-            headers: any;
-            /**
-             * Check whether the response is one of the listed types.
-             * Pretty much the same as `this.request.is()`.
-             */
-            is(type: string): string|boolean;
-            is(types: string[]): string|boolean;
-            /**
-             * Return response header.
-             *
-             * Examples:
-             *
-             *     this.get('Content-Type');
-             *     // => "text/plain"
-             *
-             *     this.get('content-type');
-             *     // => "text/plain"
-             */
-            get(field: string): string;
-            /**
-             * Inspect implementation.
-             */
-            inspect(): any;
-            /**
-             * Return JSON representation.
-             */
-            toJSON(): any;
-        }
-
-        interface BaseContext extends IRequest, IResponse {
-            /**
-             * util.inspect() implementation, which
-             * just returns the JSON output.
-             */
-            inspect(): any;
-            /**
-             * Return JSON representation.
-             *
-             * Here we explicitly invoke .toJSON() on each
-             * object, as iteration will otherwise fail due
-             * to the getters and cause utilities such as
-             * clone() to fail.
-             */
-            toJSON(): any;
-            /**
-             * Similar to .throw(), adds assertion.
-             *
-             *    this.assert(this.user, 401, 'Please login!');
-             *
-             * See: https://github.com/jshttp/http-assert
-             */
-            assert(test: any, status: number, message: string): void;
-            /**
-             * Throw an error with `msg` and optional `status`
-             * defaulting to 500. Note that these are user-level
-             * errors, and the message may be exposed to the client.
-             *
-             *    this.throw(403)
-             *    this.throw('name required', 400)
-             *    this.throw(400, 'name required')
-             *    this.throw('something exploded')
-             *    this.throw(new Error('invalid'), 400);
-             *    this.throw(400, new Error('invalid'));
-             *
-             * See: https://github.com/jshttp/http-errors
-             */
-            throw(...args: any[]): void;
-            /**
-             * Default error handling.
-             *
-             * @private
-             */
-            onerror(err: Error): void;
-        }
-
-        interface Request extends BaseRequest {
-            app: Application;
-            ctx: Context;
-            response: Response;
-            req: http.IncomingMessage;
-            res: http.ServerResponse;
-        }
-
-        interface Response extends BaseResponse {
-            app: Application;
-            ctx: Context;
-            request: Request;
-            req: http.IncomingMessage;
-            res: http.ServerResponse;
-        }
-
-        interface Context extends BaseContext {
-            request: Request;
-            response: Response;
-            app: Application;
-            req: http.IncomingMessage;
-            res: http.ServerResponse;
-            originalUrl: string;
-            cookies: Cookies.ICookies;
-            accept: any;
-            state: any;
-        }
-
-        interface Application extends events.EventEmitter , Koa.Application{
-            env: string;
-            subdomainOffset: number;
-            middleware: any[];
-            proxy: boolean;
-            context: BaseContext;
-            request: BaseRequest;
-            response: BaseResponse;
-            /**
-             * Shorthand for:
-             *
-             *    http.createServer(app.callback()).listen(...)
-             */
-            listen(port: number, hostname?: string, backlog?: number, callback?: Function): http.Server;
-            listen(port: number, hostname?: string, callback?: Function): http.Server;
-            listen(path: string, callback?: Function): http.Server;
-            listen(handle: any, listeningListener?: Function): http.Server;
-            listen(): http.Server;
-            /**
-             * Return JSON representation.
-             * We only bother showing settings.
-             */
-            inspect(): any;
-            /**
-             * Return JSON representation.
-             * We only bother showing settings.
-             */
-            toJSON(): any;
-            /**
-             * Use the given middleware `fn`.
-             */
-            use(fn: Function): Application;
-            /**
-             * Return a request handler callback
-             * for node's native http server.
-             */
-            callback(): (req: http.IncomingMessage, res: http.ServerResponse) => void;
-            /**
-             * Initialize a new context.
-             *
-             * @private
-             */
-            createContext(req: http.IncomingMessage, res: http.ServerResponse): Context;
-            /**
-             * Default error handler.
-             *
-             * @private
-             */
-            onerror(err: Error): void;
-        }
-    }
-
-    interface KoaStatic {
-        new (): koa.Application;
-        (): koa.Application;
-    }
-
-    var koa: KoaStatic;
-
-    export = koa;
+interface IResponse extends Koa.Response {
+    /**
+     * Get/Set response status code.
+     */
+    status: number;
+    /**
+     * Get/Set response status message
+     */
+    message: string;
+    /**
+     * Get/Set response body.
+     */
+    body: any;
+    /**
+     * Return parsed response Content-Length when present.
+     * Set Content-Length field to `n`.
+     */
+    length: number;
+    /**
+     * Check if a header has been written to the socket.
+     *
+     * @readonly
+     */
+    headerSent: boolean;
+    /**
+     * Vary on `field`.
+     */
+    vary(field: string): void;
+    /**
+     * Perform a 302 redirect to `url`.
+     *
+     * The string "back" is special-cased
+     * to provide Referrer support, when Referrer
+     * is not present `alt` or "/" is used.
+     *
+     * Examples:
+     *
+     *    this.redirect('back');
+     *    this.redirect('back', '/index.html');
+     *    this.redirect('/login');
+     *    this.redirect('http://google.com');
+     */
+    redirect(url: string): void;
+    redirect(url: string, alt: string): void;
+    /**
+     * Set Content-Disposition header to "attachment" with optional `filename`.
+     */
+    attachment(filename: string): void;
+    /**
+     * Return the response mime type void of
+     * parameters such as "charset".
+     *
+     * Set Content-Type response header with `type` through `mime.lookup()`
+     * when it does not contain a charset.
+     *
+     * Examples:
+     *
+     *     this.type = '.html';
+     *     this.type = 'html';
+     *     this.type = 'json';
+     *     this.type = 'application/json';
+     *     this.type = 'png';
+     */
+    type: string;
+    /**
+     * Get the Last-Modified date in Date form, if it exists.
+     * Set the Last-Modified date using a string or a Date.
+     *
+     *     this.response.lastModified = new Date();
+     *     this.response.lastModified = '2013-09-13';
+     */
+    lastModified: Date;
+    /**
+     * Get the ETag of a response.
+     * Set the ETag of a response.
+     * This will normalize the quotes if necessary.
+     *
+     *     this.response.etag = 'md5hashsum';
+     *     this.response.etag = '"md5hashsum"';
+     *     this.response.etag = 'W/"123456789"';
+     */
+    etag: string;
+    /**
+     * Set header `field` to `val`, or pass
+     * an object of header fields.
+     *
+     * Examples:
+     *
+     *    this.set('Foo', ['bar', 'baz']);
+     *    this.set('Accept', 'application/json');
+     *    this.set({ Accept: 'text/plain', 'X-API-Key': 'tobi' });
+     */
+    set(field: any): void;
+    set(field: string, val: string): void;
+    set(field: string, val: any[]): void;
+    /**
+     * Append additional header `field` with value `val`.
+     *
+     * Examples:
+     *
+     *    this.append('Link', ['<http://localhost/>', '<http://localhost:3000/>']);
+     *    this.append('Set-Cookie', 'foo=bar; Path=/; HttpOnly');
+     *    this.append('Warning', '199 Miscellaneous warning');
+     */
+    append(field: string, val: string): void;
+    append(field: string, val: any[]): void;
+    /**
+     * Remove header `field`.
+     */
+    remove(field: string): void;
+    /**
+     * Checks if the request is writable.
+     * Tests for the existence of the socket
+     * as node sometimes does not set it.
+     *
+     * @readonly
+     * @private
+     */
+    writable: boolean;
 }
+
+declare namespace koa {
+    interface BaseRequest extends IRequest {
+        /**
+         * Get the charset when present or undefined.
+         *
+         * @readonly
+         */
+        charset: string;
+        /**
+         * Return parsed Content-Length when present.
+         *
+         * @readonly
+         */
+        length: number;
+        /**
+         * Return the request mime type void of
+         * parameters such as "charset".
+         *
+         * @readonly
+         */
+        type: string;
+        /**
+         * Inspect implementation.
+         */
+        inspect(): any;
+        /**
+         * Return JSON representation.
+         */
+        toJSON(): any;
+    }
+
+    interface BaseResponse extends IResponse {
+        /**
+         * Return the request socket.
+         *
+         * @readonly
+         */
+        socket: net.Socket;
+        /**
+         * Return response header.
+         *
+         * @readonly
+         */
+        header: any;
+        /**
+         * Return response header, alias as response.header
+         */
+        headers: any;
+        /**
+         * Check whether the response is one of the listed types.
+         * Pretty much the same as `this.request.is()`.
+         */
+        is(type: string): string | boolean;
+        is(types: string[]): string | boolean;
+        /**
+         * Return response header.
+         *
+         * Examples:
+         *
+         *     this.get('Content-Type');
+         *     // => "text/plain"
+         *
+         *     this.get('content-type');
+         *     // => "text/plain"
+         */
+        get(field: string): string;
+        /**
+         * Inspect implementation.
+         */
+        inspect(): any;
+        /**
+         * Return JSON representation.
+         */
+        toJSON(): any;
+    }
+
+    interface BaseContext extends IRequest, IResponse {
+        /**
+         * util.inspect() implementation, which
+         * just returns the JSON output.
+         */
+        inspect(): any;
+        /**
+         * Return JSON representation.
+         *
+         * Here we explicitly invoke .toJSON() on each
+         * object, as iteration will otherwise fail due
+         * to the getters and cause utilities such as
+         * clone() to fail.
+         */
+        toJSON(): any;
+        /**
+         * Similar to .throw(), adds assertion.
+         *
+         *    this.assert(this.user, 401, 'Please login!');
+         *
+         * See: https://github.com/jshttp/http-assert
+         */
+        assert(test: any, status: number, message: string): void;
+        /**
+         * Throw an error with `msg` and optional `status`
+         * defaulting to 500. Note that these are user-level
+         * errors, and the message may be exposed to the client.
+         *
+         *    this.throw(403)
+         *    this.throw('name required', 400)
+         *    this.throw(400, 'name required')
+         *    this.throw('something exploded')
+         *    this.throw(new Error('invalid'), 400);
+         *    this.throw(400, new Error('invalid'));
+         *
+         * See: https://github.com/jshttp/http-errors
+         */
+        throw(...args: any[]): void;
+        /**
+         * Default error handling.
+         *
+         * @private
+         */
+        onerror(err: Error): void;
+    }
+
+    interface Request extends BaseRequest {
+        app: Application;
+        ctx: Context;
+        response: Response;
+        req: http.IncomingMessage;
+        res: http.ServerResponse;
+    }
+
+    interface Response extends BaseResponse {
+        app: Application;
+        ctx: Context;
+        request: Request;
+        req: http.IncomingMessage;
+        res: http.ServerResponse;
+    }
+
+    interface Context extends BaseContext {
+        request: Request;
+        response: Response;
+        app: Application;
+        req: http.IncomingMessage;
+        res: http.ServerResponse;
+        originalUrl: string;
+        cookies: Cookies.ICookies;
+        accept: any;
+        state: any;
+    }
+
+    interface Application extends events.EventEmitter, Koa.Application {
+        env: string;
+        subdomainOffset: number;
+        middleware: any[];
+        proxy: boolean;
+        context: BaseContext;
+        request: BaseRequest;
+        response: BaseResponse;
+        /**
+         * Shorthand for:
+         *
+         *    http.createServer(app.callback()).listen(...)
+         */
+        listen(port: number, hostname?: string, backlog?: number, callback?: Function): http.Server;
+        listen(port: number, hostname?: string, callback?: Function): http.Server;
+        listen(path: string, callback?: Function): http.Server;
+        listen(handle: any, listeningListener?: Function): http.Server;
+        listen(): http.Server;
+        /**
+         * Return JSON representation.
+         * We only bother showing settings.
+         */
+        inspect(): any;
+        /**
+         * Return JSON representation.
+         * We only bother showing settings.
+         */
+        toJSON(): any;
+        /**
+         * Use the given middleware `fn`.
+         */
+        use(fn: Function): Application;
+        /**
+         * Return a request handler callback
+         * for node's native http server.
+         */
+        callback(): (req: http.IncomingMessage, res: http.ServerResponse) => void;
+        /**
+         * Initialize a new context.
+         *
+         * @private
+         */
+        createContext(req: http.IncomingMessage, res: http.ServerResponse): Context;
+        /**
+         * Default error handler.
+         *
+         * @private
+         */
+        onerror(err: Error): void;
+    }
+}
+
+interface KoaStatic {
+    new (): koa.Application;
+    (): koa.Application;
+}
+
+declare var koa: KoaStatic;
+
+export = koa;
diff --git a/koa/koa-tests.ts b/koa/koa-tests.ts
index e984364973..115f9444c9 100644
--- a/koa/koa-tests.ts
+++ b/koa/koa-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="koa.d.ts" />
+
 import * as Koa from "koa";
 
 const app = new Koa();
diff --git a/koa/koa.d.ts b/koa/koa.d.ts
deleted file mode 100644
index 922b243511..0000000000
--- a/koa/koa.d.ts
+++ /dev/null
@@ -1,141 +0,0 @@
-// Type definitions for Koa 2.x
-// Project: http://koajs.com
-// Definitions by: DavidCai1993 <https://github.com/DavidCai1993>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/* =================== USAGE ===================
-
-    import * as Koa from "koa"
-    const app = new Koa()
-
-    async function (ctx: Koa.Context, next: Function) {
-      // ...
-    }
-
- =============================================== */
-/// <reference path="../node/node.d.ts" />
-
-declare module "koa" {
-  import { EventEmitter } from "events";
-  import * as http from "http";
-  import * as net from "net";
-
-  namespace Koa {
-    export interface Context extends Request, Response {
-        body?: any;
-        request?: Request;
-        response?: Response;
-        originalUrl?: string;
-        state?: any;
-        name?: string;
-        cookies?: any;
-        writable?: Boolean;
-        respond?: Boolean;
-        app?: Koa;
-        req?: http.IncomingMessage;
-        res?: http.ServerResponse;
-        onerror(err: any): void;
-        toJSON(): any;
-        inspect(): any;
-        throw(code?: any, message?: any): void;
-        assert(): void;
-    }
-
-    export interface Request {
-        _querycache?: string;
-        app?: Koa;
-        req?: http.IncomingMessage;
-        res?: http.ServerResponse;
-        response?: Response;
-        ctx?: Context;
-        headers?: any;
-        header?: any;
-        method?: string;
-        length?: any;
-        url?: string;
-        origin?: string;
-        originalUrl?: string;
-        href?: string;
-        path?: string;
-        querystring?: string;
-        query?: any;
-        search?: string;
-        idempotent?: Boolean;
-        socket?: net.Socket;
-        protocol?: string;
-        host?: string;
-        hostname?: string;
-        fresh?: Boolean;
-        stale?: Boolean;
-        charset?: string;
-        secure?: Boolean;
-        ips?: Array<string>;
-        ip?: string;
-        subdomains?: Array<string>;
-        accept?: any;
-        type?: string;
-        accepts?: () => any;
-        acceptsEncodings?: () => any;
-        acceptsCharsets?: () => any;
-        acceptsLanguages?: () => any;
-        is?: (types: any) => any;
-        toJSON?: () => any;
-        inspect?: () => any;
-        get?: (field: string) => string;
-    }
-
-    export interface Response {
-        _body?: any;
-        _explicitStatus?: Boolean;
-        app?: Koa;
-        res?: http.ServerResponse;
-        req?: http.IncomingMessage;
-        ctx?: Context;
-        request?: Request;
-        socket?: net.Socket;
-        header?: any;
-        headers?: any;
-        status?: number;
-        message?: string;
-        type?: string;
-        body?: any;
-        length?: any;
-        headerSent?: Boolean;
-        lastModified?: Date;
-        etag?: string;
-        writable?: Boolean;
-        is?: (types: any) => any;
-        redirect?: (url: string, alt: string) => void;
-        attachment?: (filename?: string) => void;
-        vary?: (field: string) => void;
-        get?: (field: string) => string;
-        set?: (field: any, val: any) => void;
-        remove?: (field: string) => void;
-        append?: (field: string, val: any) => void;
-        toJSON?: () => any;
-        inspect?: () => any;
-    }
-  }
-
-  class Koa extends EventEmitter {
-      keys: Array<string>;
-      subdomainOffset: number;
-      proxy: Boolean;
-      server: http.Server;
-      env: string;
-      context: Koa.Context;
-      request: Koa.Request;
-      response: Koa.Response;
-      silent: Boolean;
-      constructor();
-      use(middleware: (ctx: Koa.Context, next: Function) => any): Koa;
-      callback(): (req: http.IncomingMessage, res: http.ServerResponse) => void;
-      listen(port: number, callback?: Function): http.Server;
-      toJSON(): any;
-      inspect(): any;
-      onerror(err: any): void;
-  }
-
-  namespace Koa {}
-  export = Koa;
-}
diff --git a/koa/tsconfig.json b/koa/tsconfig.json
new file mode 100644
index 0000000000..8bff9f2abf
--- /dev/null
+++ b/koa/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "koa-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/kolite/index.d.ts b/kolite/index.d.ts
new file mode 100644
index 0000000000..0a620aa363
--- /dev/null
+++ b/kolite/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for KoLite 1.1
+// Project: https://github.com/CodeSeven/kolite
+// Definitions by: Boris Yankov <https://github.com/borisyankov>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="knockout.activity.d.ts" />
+/// <reference path="knockout.command.d.ts" />
+/// <reference path="knockout.dirtyFlag.d.ts" />
diff --git a/kolite/knockout.activity.d.ts b/kolite/knockout.activity.d.ts
index c5d876f630..128260b5ca 100644
--- a/kolite/knockout.activity.d.ts
+++ b/kolite/knockout.activity.d.ts
@@ -4,8 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../knockout/knockout.d.ts" />
+/// <reference types="jquery" />
+/// <reference types="knockout" />
 
 
 // Activity /////////////////////////////////////////////
diff --git a/kolite/knockout.command.d.ts b/kolite/knockout.command.d.ts
index baf75b2cd5..ff509dbd16 100644
--- a/kolite/knockout.command.d.ts
+++ b/kolite/knockout.command.d.ts
@@ -4,8 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../knockout/knockout.d.ts" />
+/// <reference types="jquery" />
+/// <reference types="knockout" />
 
 
 // Command /////////////////////////////////////////////
diff --git a/kolite/knockout.dirtyFlag.d.ts b/kolite/knockout.dirtyFlag.d.ts
index a28386d689..1c63ce8b7d 100644
--- a/kolite/knockout.dirtyFlag.d.ts
+++ b/kolite/knockout.dirtyFlag.d.ts
@@ -4,8 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../knockout/knockout.d.ts" />
+/// <reference types="jquery" />
+/// <reference types="knockout" />
 
 // DirtyFlag /////////////////////////////////////////////
 
diff --git a/kolite/kolite-tests.ts b/kolite/kolite-tests.ts
index a7b6d08f01..4b2b662bdc 100644
--- a/kolite/kolite-tests.ts
+++ b/kolite/kolite-tests.ts
@@ -1,6 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../knockout/knockout.d.ts" />
-/// <reference path="kolite.d.ts" />
+/// <reference types="jquery" />
+/// <reference types="knockout" />
 
 function test_asyncCommand() {
     var saveCmd = ko.asyncCommand({
@@ -115,7 +114,7 @@ function test_full() {
             };
             return self;
         };
-    })(ko);
+    })(ko as any);
     (function (ko) {
         ko.utils.wrapAccessor = function (accessor) {
             return function () {
@@ -176,7 +175,7 @@ function test_full() {
                 ko.bindingHandlers.enable.update(element, canExecute, allBindingsAccessor, viewModel);
             }
         };
-    })(ko);
+    })(ko as any);
 
     var my: any = {};
     my.TwitterService = function () {
diff --git a/kolite/kolite-tests.ts.tscparams b/kolite/kolite-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/kolite/kolite-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/kolite/kolite.d.ts b/kolite/kolite.d.ts
deleted file mode 100644
index bcbdc3690a..0000000000
--- a/kolite/kolite.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for KoLite 1.1
-// Project: https://github.com/CodeSeven/kolite
-// Definitions by: Boris Yankov <https://github.com/borisyankov>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="knockout.activity.d.ts" />
-/// <reference path="knockout.command.d.ts" />
-/// <reference path="knockout.dirtyFlag.d.ts" />
diff --git a/kolite/kolite.d.ts.tscparams b/kolite/kolite.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/kolite/kolite.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/kolite/tsconfig.json b/kolite/tsconfig.json
new file mode 100644
index 0000000000..e37c133c9b
--- /dev/null
+++ b/kolite/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "kolite-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/konami.js/konami.d.ts b/konami.js/index.d.ts
similarity index 100%
rename from konami.js/konami.d.ts
rename to konami.js/index.d.ts
diff --git a/konami.js/konami-tests.ts b/konami.js/konami-tests.ts
index 05dff67b6e..516d06c54f 100644
--- a/konami.js/konami-tests.ts
+++ b/konami.js/konami-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./konami.d.ts" />
+
 
 let urlEasteEgg = new Konami("www.example.com");
 
diff --git a/konami.js/tsconfig.json b/konami.js/tsconfig.json
new file mode 100644
index 0000000000..7a297c79ef
--- /dev/null
+++ b/konami.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "konami-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/kue/index.d.ts b/kue/index.d.ts
new file mode 100644
index 0000000000..bf22ed54c2
--- /dev/null
+++ b/kue/index.d.ts
@@ -0,0 +1,144 @@
+// Type definitions for kue 0.9.x
+// Project: https://github.com/Automattic/kue
+// Definitions by: Nicholas Penree <http://github.com/drudge>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import events = require('events');
+import express = require('express');
+export import redis = require('redis');
+
+export declare class Queue extends events.EventEmitter {
+    name: string;
+    id: string;
+    promoter: any;
+    workers: Worker[];
+    shuttingDown: boolean;
+    client: redis.RedisClient;
+    testMode: TestMode;
+
+    static singleton: Queue;
+
+    constructor(options: Object);
+    create(type: string, data: Object): Job;
+    createJob(type: string, data: Object): Job;
+    promote(ms?: number): void;
+    setupTimer(): void;
+    checkJobPromotion(ms: number): void;
+    checkActiveJobTtl(ttlOptions: Object): void;
+    watchStuckJobs(ms: number): void;
+    setting(name: string, fn: Function): Queue;
+    process(type: string, n?: number, fn?: Function): void;
+    shutdown(timeout: number, type: string, fn: Function): Queue;
+    types(fn: Function): Queue;
+    state(string: string, fn: Function): Queue;
+    workTime(fn: Function): Queue;
+    cardByType(type: string, state: string, fn: Function): Queue;
+    card(state: string, fn: Function): Queue;
+    complete(fn: Function): Queue;
+    failed(fn: Function): Queue;
+    inactive(fn: Function): Queue;
+    active(fn: Function): Queue;
+    delayed(fn: Function): Queue;
+    completeCount(type: string, fn: Function): Queue;
+    failedCount(type: string, fn: Function): Queue;
+    inactiveCount(type: string, fn: Function): Queue;
+    activeCount(type: string, fn: Function): Queue;
+    delayedCount(type: string, fn: Function): Queue;
+}
+
+interface Priorities {
+    low: number;
+    normal: number;
+    medium: number;
+    high: number;
+    critical: number;
+}
+
+export declare class Job extends events.EventEmitter {
+    public id: number;
+    public type: string;
+    public data: any;
+    public client: redis.RedisClient;
+    private _max_attempts;
+
+    static priorities: Priorities;
+    static disableSearch: boolean;
+    static jobEvents: boolean;
+    static get(id: number, fn: Function): void;
+    static remove(id: number, fn?: Function): void;
+    static removeBadJob(id: number): void;
+    static log(id: number, fn: Function): void;
+    static range(from: number, to: number, order: string, fn: Function): void;
+    static rangeByState(state: string, from: number, to: number, order: string, fn: Function): void;
+    static rangeByType(type: string, state: string, from: number, to: number, order: string, fn: Function): void;
+
+    constructor(type: string, data?: any);
+    toJSON(): Object;
+    log(str: string): Job;
+    set(key: string, val: string, fn?: Function): Job;
+    get(key: string, fn?: Function): Job;
+    progress(complete: number, total: number, data?: any): Job;
+    delay(ms: number | Date): Job;
+    removeOnComplete(param: any): void;
+    backoff(param: any): void;
+    ttl(param: any): void;
+    private _getBackoffImpl(): void;
+    priority(level: string | number): Job;
+    attempt(fn: Function): Job;
+    reattempt(attempt: number, fn?: Function): void;
+    attempts(n: number): Job;
+    searchKeys(keys: string[] | string): Job;
+    remove(fn?: Function): Job;
+    state(state: string, fn?: Function): Job;
+    error(err: Error): Job;
+    complete(fn?: Function): Job;
+    failed(fn?: Function): Job;
+    inactive(fn?: Function): Job;
+    active(fn?: Function): Job;
+    delayed(fn?: Function): Job;
+    save(fn?: Function): Job;
+    update(fn?: Function): Job;
+    subscribe(fn?: Function): Job;
+}
+
+declare class Worker extends events.EventEmitter {
+    queue: Queue;
+    type: string;
+    client: redis.RedisClient;
+    job: Job;
+
+    constructor(queue: Queue, type: string);
+    start(fn: Function): Worker;
+    error(err: Error, job: Job): Worker;
+    failed(job: Job, theErr: Object, fn?: Function): Worker;
+    process(job: Job, fn: Function): Worker;
+    private zpop(key: string, fn: Function): void;
+    private getJob(fn: Function): void;
+    idle(): Worker;
+    shutdown(timeout: number, fn: Function): void;
+    emitJobEvent(event: Object, job: Job, arg1: any, arg2: any): void;
+    resume(): boolean;
+}
+
+interface Redis {
+    configureFactory(options: Object, queue: Queue): void;
+    createClient(): redis.RedisClient;
+    createClientFactory(options: Object): redis.RedisClient;
+    client(): redis.RedisClient;
+    pubsubClient(): redis.RedisClient;
+    reset(): void;
+}
+
+interface TestMode {
+    jobs: Job[];
+    enter(): void;
+    exit(): void;
+    clear(): void;
+}
+
+export declare var app: express.Application;
+export declare var workers: Worker[];
+
+export declare function createQueue(options?: Object): Queue;
diff --git a/kue/kue-tests.ts b/kue/kue-tests.ts
index 0a990ee7b1..a66dc4384c 100644
--- a/kue/kue-tests.ts
+++ b/kue/kue-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../node/node.d.ts" />
-/// <reference path="kue.d.ts" />
+/// <reference types="node" />
 
 import kue = require('kue');
 
diff --git a/kue/kue.d.ts b/kue/kue.d.ts
deleted file mode 100644
index 653f3992aa..0000000000
--- a/kue/kue.d.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-// Type definitions for kue 0.9.x
-// Project: https://github.com/Automattic/kue
-// Definitions by: Nicholas Penree <http://github.com/drudge>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../redis/redis.d.ts" />
-/// <reference path="../express/express.d.ts" />
-
-declare module "kue" {
-  import events = require('events');
-  import express = require('express');
-  import redis = require('redis');
-
-  export class Queue extends events.EventEmitter {
-    name: string;
-    id: string;
-    promoter: any;
-    workers: Worker[];
-    shuttingDown: boolean;
-    client: redis.RedisClient;
-    testMode: TestMode;
-
-    static singleton: Queue;
-
-    constructor(options: Object);
-    create(type: string, data: Object): Job;
-    createJob(type: string, data: Object): Job;
-    promote(ms?: number): void;
-    setupTimer(): void;
-    checkJobPromotion(ms: number): void;
-    checkActiveJobTtl(ttlOptions: Object): void;
-    watchStuckJobs(ms: number): void;
-    setting(name: string, fn: Function): Queue;
-    process(type: string, n?: number, fn?: Function): void;
-    shutdown(timeout: number, type: string, fn: Function): Queue;
-    types(fn: Function): Queue;
-    state(string: string, fn: Function): Queue;
-    workTime(fn: Function): Queue;
-    cardByType(type: string, state: string, fn: Function): Queue;
-    card(state: string, fn: Function): Queue;
-    complete(fn: Function): Queue;
-    failed(fn: Function): Queue;
-    inactive(fn: Function): Queue;
-    active(fn: Function): Queue;
-    delayed(fn: Function): Queue;
-    completeCount(type: string, fn: Function): Queue;
-    failedCount(type: string, fn: Function): Queue;
-    inactiveCount(type: string, fn: Function): Queue;
-    activeCount(type: string, fn: Function): Queue;
-    delayedCount(type: string, fn: Function): Queue;
-  }
-
-  interface Priorities {
-    low: number;
-    normal: number;
-    medium: number;
-    high: number;
-    critical: number;
-  }
-
-  export class Job extends events.EventEmitter {
-    public id: number;
-    public type: string;
-    public data: any;
-    public client: redis.RedisClient;
-    private _max_attempts;
-
-    static priorities: Priorities;
-    static disableSearch: boolean;
-    static jobEvents: boolean;
-    static get(id: number, fn: Function): void;
-    static remove(id: number, fn?: Function): void;
-    static removeBadJob(id: number): void;
-    static log(id: number, fn: Function): void;
-    static range(from: number, to: number, order: string, fn: Function): void;
-    static rangeByState(state: string, from: number, to: number, order: string, fn: Function): void;
-    static rangeByType(type: string, state: string, from: number, to: number, order: string, fn: Function): void;
-
-    constructor(type: string, data?: any);
-    toJSON(): Object;
-    log(str: string): Job;
-    set(key: string, val: string, fn?: Function): Job;
-    get(key: string, fn?: Function): Job;
-    progress(complete: number, total: number, data?: any): Job;
-    delay(ms:number|Date): Job;
-    removeOnComplete(param: any): void;
-    backoff(param: any): void;
-    ttl(param: any): void;
-    private _getBackoffImpl(): void;
-    priority(level: string|number): Job;
-    attempt(fn: Function): Job;
-    reattempt(attempt: number, fn?: Function): void;
-    attempts(n: number): Job;
-    searchKeys(keys: string[]|string): Job;
-    remove(fn?: Function): Job;
-    state(state: string, fn?: Function): Job;
-    error(err: Error): Job;
-    complete(fn?: Function): Job;
-    failed(fn?: Function): Job;
-    inactive(fn?: Function): Job;
-    active(fn?: Function): Job;
-    delayed(fn?: Function): Job;
-    save(fn?: Function): Job;
-    update(fn?: Function): Job;
-    subscribe(fn?: Function): Job;
-  }
-
-  class Worker extends events.EventEmitter {
-    queue: Queue;
-    type: string;
-    client: redis.RedisClient;
-    job: Job;
-
-    constructor(queue: Queue, type: string);
-    start(fn: Function): Worker;
-    error(err: Error, job: Job): Worker;
-    failed(job: Job, theErr: Object, fn?: Function): Worker;
-    process(job: Job, fn: Function): Worker;
-    private zpop(key: string, fn: Function): void;
-    private getJob(fn: Function): void;
-    idle(): Worker;
-    shutdown(timeout: number, fn: Function): void;
-    emitJobEvent(event: Object, job: Job, arg1: any, arg2: any): void;
-    resume(): boolean;
-  }
-
-  interface Redis {
-    configureFactory(options: Object, queue: Queue): void;
-    createClient(): redis.RedisClient;
-    createClientFactory(options: Object): redis.RedisClient;
-    client(): redis.RedisClient;
-    pubsubClient(): redis.RedisClient;
-    reset(): void;
-  }
-
-  interface TestMode {
-    jobs: Job[];
-    enter(): void;
-    exit(): void;
-    clear(): void;
-  }
-
-  export var app: express.Application;
-  export var redis: Redis;
-  export var workers: Worker[];
-
-  export function createQueue(options?: Object): Queue;
-}
\ No newline at end of file
diff --git a/kue/tsconfig.json b/kue/tsconfig.json
new file mode 100644
index 0000000000..b06be254df
--- /dev/null
+++ b/kue/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "kue-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/kuromoji/index.d.ts b/kuromoji/index.d.ts
new file mode 100644
index 0000000000..d5ccd8aeb6
--- /dev/null
+++ b/kuromoji/index.d.ts
@@ -0,0 +1,160 @@
+// Type definitions for kuromoji.js
+// Project: https://github.com/takuyaa/kuromoji.js
+// Definitions by: MIZUSHIMA Junki <https://github.com/mzsm>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="doublearray" />
+
+declare namespace kuromoji {
+
+    // dict/ConnectionCosts.js
+    interface ConnectionCosts {
+        buffer: Int16Array;
+        put(forward_id: number, backward_id: number, cost: number): void;
+        get(forward_id: number, backward_id: number): number;
+        loadConnectionCosts(connection_costs_buffer: Int16Array): void;
+    }
+
+    // dict/DynamicDictionaries.js
+    interface DynamicDictionaries {
+        trie: doublearray.DoubleArray;
+        token_info_dictionary: TokenInfoDictionary;
+        connection_costs: ConnectionCosts;
+        unknown_dictionary: UnknownDictionary;
+        loadTrie(base_buffer: Int32Array, check_buffer: Int32Array): DynamicDictionaries;
+    }
+
+    // dict/TokenInfoDictionary.js
+    interface TokenInfoDictionary {
+        buildDictionary(entries: any[][]): {[word_id: number]: string};
+        put(left_id: number, right_id: number, word_cost: number, surface_form: string, feature: string): number;
+        addMapping(source: number, target: number): void;
+        targetMapToBuffer(): Uint8Array;
+        loadDictionary(array_buffer: Uint8Array): TokenInfoDictionary;
+        loadPosVector(array_buffer: Uint8Array): TokenInfoDictionary;
+        loadTargetMap(array_buffer: Uint8Array): TokenInfoDictionary;
+        getFeatures(token_info_id_str: string): string;
+    }
+
+    // dict/UnknownDictionary.js
+    interface UnknownDictionary extends TokenInfoDictionary {
+    }
+
+    // util/ByteBuffer.js
+    interface ByteBuffer {
+        buffer: Uint8Array;
+        position: number;
+        size(): number;
+        reallocate(): void;
+        shrink(): Uint8Array;
+        put(b: number): void;
+        get(index: number): number;
+        putShort(num: number): void;
+        getShort(index: number): number;
+        putInt(num: number): void;
+        getInt(index: number): number;
+        readInt(): number;
+        putString(str: string): void;
+        getString(index: number): string;
+    }
+
+    // util/DictionaryBuilder.js
+    interface DictionaryBuilder {
+        tid_entries: string[];
+        unk_entries: string[];
+        addTokenInfoDictionary(text: string): DictionaryBuilder;
+        costMatrix(matrix_text: string): DictionaryBuilder;
+        charDef(char_text: string): DictionaryBuilder;
+        unkDef(text: string): DictionaryBuilder;
+        build(): DynamicDictionaries;
+        buildTokenInfoDictionary(): {trie: doublearray.DoubleArray; token_info_dictionary: TokenInfoDictionary};
+        buildUnknownDictionary(): UnknownDictionary;
+        buildConnectionCosts(): ConnectionCosts;
+        buildDoubleArray(): doublearray.DoubleArray;
+    }
+
+    // util/IpadicFormatter.js
+    interface Formatter<T> {
+        formatEntry(word_id: number, position: number, type: string, features: string[]): T;
+        formatUnknownEntry(word_id: number, position: number, type: string, features: string[]): T;
+    }
+    interface IpadicFormatter extends Formatter<IpadicFeatures> {
+    }
+    export interface IpadicFeatures {
+        word_id: number;
+        word_type: string;
+        word_position: number;
+        surface_form: string;
+        pos: string;
+        pos_detail_1: string;
+        pos_detail_2: string;
+        pos_detail_3: string;
+        conjugated_type: string;
+        conjugated_form: string;
+        basic_form: string;
+        reading?: string;
+        pronunciation?: string;
+    }
+
+    // viterbi/ViterbiBuilder.js
+    interface ViterbiBuilder {
+        trie: doublearray.DoubleArray;
+        token_info_dictionary: TokenInfoDictionary;
+        unknown_dictionary: UnknownDictionary;
+        build(sentence_str: string): ViterbiLattice;
+    }
+
+    // viterbi/ViterbiLattice.js
+    interface ViterbiLattice {
+        append(node: ViterbiNode): void;
+        appendEos(): void;
+    }
+
+    // viterbi/ViterbiNode.js
+    interface ViterbiNode {
+        name: string;
+        cost: number;
+        start_pos: number;
+        length: number;
+        left_id: number;
+        right_id: number;
+        prev: ViterbiNode;
+        surface_form: string;
+        shortest_cost: number;
+        type: string;
+    }
+
+    // viterbi/ViterbiSearcher.js
+    interface ViterbiSearcher {
+        connection_costs: ConnectionCosts;
+        search(lattice: ViterbiLattice): ViterbiNode[];
+        forward(lattice: ViterbiLattice): ViterbiLattice;
+        backward(lattice: ViterbiLattice): ViterbiNode[];
+    }
+
+    // Tokenizer.js
+    interface TokenizerStatic {
+        splitByPunctuation(input: string): string[];
+    }
+    interface Tokenizer<T> {
+        token_info_dictionary: TokenInfoDictionary;
+        unknown_dictionary: UnknownDictionary;
+        viterbi_builder: ViterbiBuilder;
+        viterbi_searcher: ViterbiSearcher;
+        formatter: Formatter<T>;
+        tokenize(text: string): T[];
+        getLattice(text: string): ViterbiLattice;
+    }
+
+    // TokenizerBuilder.js
+    interface TokenizerBuilder<T> {
+        build(callback: (err: Error, tokenizer: Tokenizer<T>) => void): void;
+    }
+    interface TokenizerBuilderOption {
+        dicPath?: string;
+    }
+
+    // kuromoji.js
+    export function builder(option: TokenizerBuilderOption): TokenizerBuilder<IpadicFeatures>;
+    export function dictionaryBuilder(): DictionaryBuilder;
+}
diff --git a/kuromoji/kuromoji-tests.ts b/kuromoji/kuromoji-tests.ts
index 0355a6501e..7b0cd21b62 100644
--- a/kuromoji/kuromoji-tests.ts
+++ b/kuromoji/kuromoji-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="kuromoji.d.ts" />
+
 
 // From https://github.com/takuyaa/kuromoji.js/blob/master/README.md#usage
 kuromoji.builder({ dicPath: "/url/to/dictionary/dir/" }).build(function (err, tokenizer) {
diff --git a/kuromoji/kuromoji.d.ts b/kuromoji/kuromoji.d.ts
deleted file mode 100644
index fa6e860bc9..0000000000
--- a/kuromoji/kuromoji.d.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-// Type definitions for kuromoji.js
-// Project: https://github.com/takuyaa/kuromoji.js
-// Definitions by: MIZUSHIMA Junki <https://github.com/mzsm>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../doublearray/doublearray.d.ts" />
-
-declare namespace kuromoji {
-
-    // dict/ConnectionCosts.js
-    interface ConnectionCosts {
-        buffer: Int16Array;
-        put(forward_id: number, backward_id: number, cost: number): void;
-        get(forward_id: number, backward_id: number): number;
-        loadConnectionCosts(connection_costs_buffer: Int16Array): void;
-    }
-
-    // dict/DynamicDictionaries.js
-    interface DynamicDictionaries {
-        trie: doublearray.DoubleArray;
-        token_info_dictionary: TokenInfoDictionary;
-        connection_costs: ConnectionCosts;
-        unknown_dictionary: UnknownDictionary;
-        loadTrie(base_buffer: Int32Array, check_buffer: Int32Array): DynamicDictionaries;
-    }
-
-    // dict/TokenInfoDictionary.js
-    interface TokenInfoDictionary {
-        buildDictionary(entries: any[][]): {[word_id: number]: string};
-        put(left_id: number, right_id: number, word_cost: number, surface_form: string, feature: string): number;
-        addMapping(source: number, target: number): void;
-        targetMapToBuffer(): Uint8Array;
-        loadDictionary(array_buffer: Uint8Array): TokenInfoDictionary;
-        loadPosVector(array_buffer: Uint8Array): TokenInfoDictionary;
-        loadTargetMap(array_buffer: Uint8Array): TokenInfoDictionary;
-        getFeatures(token_info_id_str: string): string;
-    }
-
-    // dict/UnknownDictionary.js
-    interface UnknownDictionary extends TokenInfoDictionary {
-    }
-
-    // util/ByteBuffer.js
-    interface ByteBuffer {
-        buffer: Uint8Array;
-        position: number;
-        size(): number;
-        reallocate(): void;
-        shrink(): Uint8Array;
-        put(b: number): void;
-        get(index: number): number;
-        putShort(num: number): void;
-        getShort(index: number): number;
-        putInt(num: number): void;
-        getInt(index: number): number;
-        readInt(): number;
-        putString(str: string): void;
-        getString(index: number): string;
-    }
-
-    // util/DictionaryBuilder.js
-    interface DictionaryBuilder {
-        tid_entries: string[];
-        unk_entries: string[];
-        addTokenInfoDictionary(text: string): DictionaryBuilder;
-        costMatrix(matrix_text: string): DictionaryBuilder;
-        charDef(char_text: string): DictionaryBuilder;
-        unkDef(text: string): DictionaryBuilder;
-        build(): DynamicDictionaries;
-        buildTokenInfoDictionary(): {trie: doublearray.DoubleArray; token_info_dictionary: TokenInfoDictionary};
-        buildUnknownDictionary(): UnknownDictionary;
-        buildConnectionCosts(): ConnectionCosts;
-        buildDoubleArray(): doublearray.DoubleArray;
-    }
-
-    // util/IpadicFormatter.js
-    interface Formatter<T> {
-        formatEntry(word_id: number, position: number, type: string, features: string[]): T;
-        formatUnknownEntry(word_id: number, position: number, type: string, features: string[]): T;
-    }
-    interface IpadicFormatter extends Formatter<IpadicFeatures> {
-    }
-    export interface IpadicFeatures {
-        word_id: number;
-        word_type: string;
-        word_position: number;
-        surface_form: string;
-        pos: string;
-        pos_detail_1: string;
-        pos_detail_2: string;
-        pos_detail_3: string;
-        conjugated_type: string;
-        conjugated_form: string;
-        basic_form: string;
-        reading?: string;
-        pronunciation?: string;
-    }
-
-    // viterbi/ViterbiBuilder.js
-    interface ViterbiBuilder {
-        trie: doublearray.DoubleArray;
-        token_info_dictionary: TokenInfoDictionary;
-        unknown_dictionary: UnknownDictionary;
-        build(sentence_str: string): ViterbiLattice;
-    }
-
-    // viterbi/ViterbiLattice.js
-    interface ViterbiLattice {
-        append(node: ViterbiNode): void;
-        appendEos(): void;
-    }
-
-    // viterbi/ViterbiNode.js
-    interface ViterbiNode {
-        name: string;
-        cost: number;
-        start_pos: number;
-        length: number;
-        left_id: number;
-        right_id: number;
-        prev: ViterbiNode;
-        surface_form: string;
-        shortest_cost: number;
-        type: string;
-    }
-
-    // viterbi/ViterbiSearcher.js
-    interface ViterbiSearcher {
-        connection_costs: ConnectionCosts;
-        search(lattice: ViterbiLattice): ViterbiNode[];
-        forward(lattice: ViterbiLattice): ViterbiLattice;
-        backward(lattice: ViterbiLattice): ViterbiNode[];
-    }
-
-    // Tokenizer.js
-    interface TokenizerStatic {
-        splitByPunctuation(input: string): string[];
-    }
-    interface Tokenizer<T> {
-        token_info_dictionary: TokenInfoDictionary;
-        unknown_dictionary: UnknownDictionary;
-        viterbi_builder: ViterbiBuilder;
-        viterbi_searcher: ViterbiSearcher;
-        formatter: Formatter<T>;
-        tokenize(text: string): T[];
-        getLattice(text: string): ViterbiLattice;
-    }
-
-    // TokenizerBuilder.js
-    interface TokenizerBuilder<T> {
-        build(callback: (err: Error, tokenizer: Tokenizer<T>) => void): void;
-    }
-    interface TokenizerBuilderOption {
-        dicPath?: string;
-    }
-
-    // kuromoji.js
-    export function builder(option: TokenizerBuilderOption): TokenizerBuilder<IpadicFeatures>;
-    export function dictionaryBuilder(): DictionaryBuilder;
-}
diff --git a/kuromoji/tsconfig.json b/kuromoji/tsconfig.json
new file mode 100644
index 0000000000..71c55fe10b
--- /dev/null
+++ b/kuromoji/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "kuromoji-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ladda/index.d.ts b/ladda/index.d.ts
new file mode 100644
index 0000000000..b4b5944810
--- /dev/null
+++ b/ladda/index.d.ts
@@ -0,0 +1,67 @@
+// Type definitions for Ladda 0.9.4
+// Project: https://github.com/hakimel/Ladda
+// Definitions by: Danil Flores <https://github.com/dflor003/>, Michael Lee <https://github.com/leemicw>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface ILaddaButton {
+    start(): ILaddaButton;
+    startAfter(delay: number): ILaddaButton
+    stop(): ILaddaButton;
+    toggle(): ILaddaButton;
+    setProgress(progress: number): ILaddaButton;
+    enable(): ILaddaButton;
+    disable(): ILaddaButton;
+    isLoading(): boolean;
+    remove(): void;
+}
+
+interface ILaddaOptions {
+    timeout?: number;
+    callback?: (instance: ILaddaButton) => void;
+}
+
+interface ILadda {
+    bind(target: HTMLElement, options?: ILaddaOptions): void;
+    bind(cssSelector: string, options?: ILaddaOptions): void;
+
+    create(button: Element): ILaddaButton;
+
+    stopAll(): void;
+}
+
+declare var Ladda: ILadda;
+
+declare module "ladda" {
+    export = Ladda;
+}
+
+
+interface JQuery {
+    /**
+    * Creates a new instance of ladda for the selected button
+    */
+    ladda(): JQuery;
+
+    /**
+    * The action controls or checks the state of the ladda button.  
+    * Possible actions are 'start', 'stop', 'toggle', 'stopAll'
+    * Possible check 'isLoading'
+    */
+    ladda(action: string): JQuery;
+
+    /**
+    * When the action is 'setProgress' you can pass a number between
+    * 0 and 1 for the options to represent the progress.  For example .5 would be 50%
+    * When the action is 'bind' you can pass an object with a property
+    * called timeout with the timeout value in milliseconds. 
+    * For example { timeout: 2000 }
+    */
+    ladda(action: string, options: any): JQuery;
+}
+
+
+interface JQueryStatic {
+    ladda(action: string): JQuery;
+}
diff --git a/ladda/ladda-tests.ts b/ladda/ladda-tests.ts
index efbc0f350b..15a263f437 100644
--- a/ladda/ladda-tests.ts
+++ b/ladda/ladda-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="ladda.d.ts" />
+
 
 // Automatically trigger the loading animation on click
 Ladda.bind('input[type=submit]');
diff --git a/ladda/ladda.d.ts b/ladda/ladda.d.ts
deleted file mode 100644
index bf12862098..0000000000
--- a/ladda/ladda.d.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-// Type definitions for Ladda 0.9.4
-// Project: https://github.com/hakimel/Ladda
-// Definitions by: Danil Flores <https://github.com/dflor003/>, Michael Lee <https://github.com/leemicw>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface ILaddaButton {
-    start(): ILaddaButton;
-    startAfter(delay: number): ILaddaButton
-    stop(): ILaddaButton;
-    toggle(): ILaddaButton;
-    setProgress(progress: number): ILaddaButton;
-    enable(): ILaddaButton;
-    disable(): ILaddaButton;
-    isLoading(): boolean;
-    remove(): void;
-}
-
-interface ILaddaOptions {
-    timeout?: number;
-    callback?: (instance: ILaddaButton) => void;
-}
-
-interface ILadda {
-    bind(target: HTMLElement, options?: ILaddaOptions): void;
-    bind(cssSelector: string, options?: ILaddaOptions): void;
-
-    create(button: Element): ILaddaButton;
-
-    stopAll(): void;
-}
-
-declare var Ladda: ILadda;
-
-declare module "ladda" {
-    export = Ladda;
-}
-
-
-interface JQuery {
-    /**
-    * Creates a new instance of ladda for the selected button
-    */
-    ladda(): JQuery;
-
-    /**
-    * The action controls or checks the state of the ladda button.  
-    * Possible actions are 'start', 'stop', 'toggle', 'stopAll'
-    * Possible check 'isLoading'
-    */
-    ladda(action: string): JQuery;
-
-    /**
-    * When the action is 'setProgress' you can pass a number between
-    * 0 and 1 for the options to represent the progress.  For example .5 would be 50%
-    * When the action is 'bind' you can pass an object with a property
-    * called timeout with the timeout value in milliseconds. 
-    * For example { timeout: 2000 }
-    */
-    ladda(action: string, options: any): JQuery;
-}
-
-
-interface JQueryStatic {
-    ladda(action: string): JQuery;
-}
diff --git a/ladda/tsconfig.json b/ladda/tsconfig.json
new file mode 100644
index 0000000000..b1fe150f89
--- /dev/null
+++ b/ladda/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ladda-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/later/later.d.ts b/later/index.d.ts
similarity index 100%
rename from later/later.d.ts
rename to later/index.d.ts
diff --git a/later/later-tests.ts b/later/later-tests.ts
index 6bf2646107..d77dbf1d56 100644
--- a/later/later-tests.ts
+++ b/later/later-tests.ts
@@ -1,7 +1,4 @@
-/// <reference path="./later.d.ts"/>
-
-
-namespace LaterTest_DefineSchedule {
+namespace LaterTest_DefineSchedule {
 
     // define a new schedule
     var textSched = later.parse.text('at 10:15am every weekday');
diff --git a/later/tsconfig.json b/later/tsconfig.json
new file mode 100644
index 0000000000..d0a7b7eaab
--- /dev/null
+++ b/later/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "later-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/latinize/index.d.ts b/latinize/index.d.ts
new file mode 100644
index 0000000000..f1cfffeb85
--- /dev/null
+++ b/latinize/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for latinize 0.2.0
+// Project: https://github.com/dundalek/latinize
+// Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace LatinizeModule {
+    export interface Latinize {
+        (str: string): string;
+        characters: { [char: string]: string };
+    }
+}
+
+
+declare var latinize: LatinizeModule.Latinize;
+export = latinize;
+export as namespace latinize;
diff --git a/latinize/latinize-tests.ts b/latinize/latinize-tests.ts
new file mode 100644
index 0000000000..58357c6787
--- /dev/null
+++ b/latinize/latinize-tests.ts
@@ -0,0 +1,7 @@
+
+
+import latinize = require('latinize');
+
+latinize('ỆᶍǍᶆṔƚÉ áéíóúýčďěňřšťžů'); // => 'ExAmPlE aeiouycdenrstzu'
+
+latinize.characters['Ω'] = 'O';
diff --git a/latinize/tsconfig.json b/latinize/tsconfig.json
new file mode 100644
index 0000000000..fc74daf601
--- /dev/null
+++ b/latinize/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "latinize-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/lazy.js/lazy.js.d.ts b/lazy.js/index.d.ts
similarity index 100%
rename from lazy.js/lazy.js.d.ts
rename to lazy.js/index.d.ts
diff --git a/lazy.js/lazy.js-tests.ts b/lazy.js/lazy.js-tests.ts
index 57d1ef37e8..71220616c4 100644
--- a/lazy.js/lazy.js-tests.ts
+++ b/lazy.js/lazy.js-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="lazy.js.d.ts" />
+
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
diff --git a/lazy.js/tsconfig.json b/lazy.js/tsconfig.json
new file mode 100644
index 0000000000..f84e2ad27f
--- /dev/null
+++ b/lazy.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "lazy.js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/lazypipe/index.d.ts b/lazypipe/index.d.ts
new file mode 100644
index 0000000000..0325bc5e90
--- /dev/null
+++ b/lazypipe/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for lazypipe
+// Project: https://github.com/OverZealous/lazypipe
+// Definitions by: Thomas Corbière <https://github.com/tomc974>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+interface IPipelineBuilder {
+    /**
+     * Returns a stream where all the internal steps are processed sequentially
+     * and the final result is passed on.
+     */
+    (): NodeJS.ReadWriteStream;
+
+    /**
+     * Creates a new lazy pipeline with all the previous steps, and the new step added to the end.
+     * @param fn A stream creation function to call when the pipeline is created later.
+     * @param args Any remaining arguments are saved and passed into fn when the pipeline is created.
+     */
+    pipe(fn: Function, ...args: any[]): IPipelineBuilder;
+}
+
+/**
+ * Initializes a lazypipe.
+ */
+declare function lazypipe(): IPipelineBuilder;
+export = lazypipe;
diff --git a/lazypipe/lazypipe-tests.ts b/lazypipe/lazypipe-tests.ts
index cd3d3a7fba..4fa129690d 100644
--- a/lazypipe/lazypipe-tests.ts
+++ b/lazypipe/lazypipe-tests.ts
@@ -1,8 +1,3 @@
-/// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="../gulp-minify-html/gulp-minify-html.d.ts" />
-/// <reference path="../gulp-size/gulp-size.d.ts" />
-/// <reference path="./lazypipe.d.ts" />
-
 import * as gulp from "gulp";
 import minifyHtml = require("gulp-minify-html");
 import size = require("gulp-size");
diff --git a/lazypipe/lazypipe.d.ts b/lazypipe/lazypipe.d.ts
deleted file mode 100644
index 1a38e7de6b..0000000000
--- a/lazypipe/lazypipe.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-// Type definitions for lazypipe
-// Project: https://github.com/OverZealous/lazypipe
-// Definitions by: Thomas Corbière <https://github.com/tomc974>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare module "lazypipe"
-{
-    interface IPipelineBuilder
-    {
-        /**
-         * Returns a stream where all the internal steps are processed sequentially
-         * and the final result is passed on.
-         */
-        (): NodeJS.ReadWriteStream;
-
-        /**
-         * Creates a new lazy pipeline with all the previous steps, and the new step added to the end.
-         * @param fn A stream creation function to call when the pipeline is created later.
-         * @param args Any remaining arguments are saved and passed into fn when the pipeline is created.
-         */
-        pipe(fn: Function, ...args: any[]): IPipelineBuilder;
-    }
-
-    /**
-     * Initializes a lazypipe.
-     */
-    function lazypipe(): IPipelineBuilder;
-    export = lazypipe;
-}
diff --git a/lazypipe/tsconfig.json b/lazypipe/tsconfig.json
new file mode 100644
index 0000000000..918c42d674
--- /dev/null
+++ b/lazypipe/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "lazypipe-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/leaflet-curve/index.d.ts b/leaflet-curve/index.d.ts
new file mode 100644
index 0000000000..b15f701f81
--- /dev/null
+++ b/leaflet-curve/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for leaflet-curve 0.0.1
+// Project: https://github.com/onikiienko/Leaflet.curve
+// Definitions by: Onikiienko <https://github.com/onikiienko>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="leaflet" />
+
+declare namespace L {
+	/**
+	 * Drawing Bezier curves and other complex shapes.
+	 */
+	function  curve(path: any[], options?: L.PathOptions): Path;
+}
diff --git a/leaflet-curve/leaflet-curve-tests.ts b/leaflet-curve/leaflet-curve-tests.ts
index 2c5bb6b8f1..243a3d620a 100644
--- a/leaflet-curve/leaflet-curve-tests.ts
+++ b/leaflet-curve/leaflet-curve-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../leaflet/leaflet.d.ts" />
-/// <reference path="leaflet-curve.d.ts" />
+/// <reference types="leaflet" />
+
 
 
 var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
diff --git a/leaflet-curve/leaflet-curve.d.ts b/leaflet-curve/leaflet-curve.d.ts
deleted file mode 100644
index 32358c08ac..0000000000
--- a/leaflet-curve/leaflet-curve.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Type definitions for leaflet-curve 0.0.1
-// Project: https://github.com/onikiienko/Leaflet.curve
-// Definitions by: Onikiienko <https://github.com/onikiienko>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../leaflet/leaflet.d.ts" />
-
-declare namespace L {
-	/**
-	 * Drawing Bezier curves and other complex shapes.
-	 */
-	function  curve(path: any[], options?: L.PathOptions): Path;
-}
diff --git a/leaflet-curve/tsconfig.json b/leaflet-curve/tsconfig.json
new file mode 100644
index 0000000000..db10d3023d
--- /dev/null
+++ b/leaflet-curve/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "leaflet-curve-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/leaflet-draw/index.d.ts b/leaflet-draw/index.d.ts
new file mode 100644
index 0000000000..269215eef1
--- /dev/null
+++ b/leaflet-draw/index.d.ts
@@ -0,0 +1,333 @@
+// Type definitions for leaflet-draw 0.2.4
+// Project: https://github.com/Leaflet/Leaflet.draw
+// Definitions by: Matt Guest <https://github.com/matt-guest>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="leaflet" />
+
+declare namespace L {
+	export interface MapOptions {
+		drawControl?: boolean;
+	}
+
+	export interface ControlStatic {
+		Draw: Control.DrawStatic;
+	}
+
+	namespace Control {
+
+		export interface DrawStatic {
+			new (options?: IDrawConstructorOptions): Draw;
+		}
+
+		export interface IDrawConstructorOptions {
+
+			/**
+			 * The initial position of the control (one of the map corners).
+			 *
+			 * Default value: 'topleft'
+			 */
+			position?: string;
+
+			/**
+			 * The options used to configure the draw toolbar.
+			 *
+			 * Default value: {}
+			 */
+			draw?: DrawOptions;
+
+			/**
+			 * 	The options used to configure the edit toolbar.
+			 *
+			 *  Default value: false
+			 */
+			edit: EditOptions;
+
+		}
+
+		export interface DrawOptions {
+
+			/**
+			 * Polyline draw handler options. Set to false to disable handler.
+			 *
+			 *  Default value: {}
+			 */
+			polyline?: DrawOptions.PolylineOptions;
+
+			/**
+			 * Polygon draw handler options. Set to false to disable handler.
+			 *
+			 *  Default value: {}
+			 */
+			polygon?: DrawOptions.PolygonOptions;
+
+			/**
+			 * Rectangle draw handler options. Set to false to disable handler.
+			 *
+			 *  Default value: {}
+			 */
+			rectangle?: DrawOptions.RectangleOptions;
+
+			/**
+			 * Circle draw handler options. Set to false to disable handler.
+			 *
+			 *  Default value: {}
+			 */
+			circle?: DrawOptions.CircleOptions;
+
+			/**
+			 * Marker draw handler options. Set to false to disable handler.
+			 *
+			 *  Default value: {}
+			 */
+			marker?: DrawOptions.MarkerOptions;
+		}
+
+		export interface EditOptions {
+
+			/**
+			 * This is the FeatureGroup that stores all editable shapes.
+			 * THIS IS REQUIRED FOR THE EDIT TOOLBAR TO WORK
+			 *
+			 * Default value: null
+			 */
+			featureGroup: FeatureGroup<ILayer>;
+
+			/**
+			 * Edit handler options. Set to false to disable handler.
+			 *
+			 * Default value: null
+			 */
+			edit?: DrawOptions.EditHandlerOptions;
+
+			/**
+			 * Delete handler options. Set to false to disable handler.
+			 *
+			 * Default value: null
+			 */
+			remove?: DrawOptions.DeleteHandlerOptions;
+		}
+
+		export interface Draw extends IControl {
+
+		}
+	}
+
+
+	namespace DrawOptions {
+
+		export interface PolylineOptions {
+
+			/**
+			 * Determines if line segments can cross.
+			 *
+			 * Default value: true
+			 */
+			allowIntersection?: boolean;
+
+			/**
+			 * Configuration options for the error that displays if an intersection is detected.
+			 *
+			 * Default value: See code
+			 */
+			drawError?: any;
+
+			/**
+			 * Distance in pixels between each guide dash.
+			 *
+			 * Default value: 20
+			 */
+			guidelineDistance?: number;
+
+			/**
+			 * The options used when drawing the polyline/polygon on the map.
+			 *
+			 * Default value: See code
+			 */
+			shapeOptions?: L.PolylineOptions;
+
+			/**
+			 * Determines which measurement system (metric or imperial) is used.
+			 *
+			 * Default value: true
+			 */
+			metric?: boolean;
+
+			/**
+			 * 	This should be a high number to ensure that you can draw over all other layers on the map.
+			 *
+			 * Default value: 2000
+			 */
+			zIndexOffset?: number;
+
+			/**
+			 * Determines if the draw tool remains enabled after drawing a shape.
+			 *
+			 * Default value: false
+			 */
+			repeatMode?: boolean;
+		}
+
+		export interface PolygonOptions extends PolylineOptions {
+
+			/**
+			 * Show the area of the drawn polygon in m², ha or km².
+			 * The area is only approximate and become less accurate the larger the polygon is.
+			 *
+			 * Default value: false
+			 */
+			showArea?: boolean;
+		}
+
+		export interface RectangleOptions {
+
+			/**
+			 * The options used when drawing the rectangle on the map.
+			 *
+			 * Default value: See code
+			 */
+			shapeOptions?: L.PathOptions;
+
+			/**
+			 * Determines if the draw tool remains enabled after drawing a shape.
+			 *
+			 * Default value: false
+			 */
+			repeatMode?: boolean;
+		}
+
+		export interface CircleOptions {
+
+			/**
+			 * The options used when drawing the circle on the map.
+			 *
+			 * Default value: See code
+			 */
+			shapeOptions?: L.PathOptions;
+
+			/**
+			 * Determines if the draw tool remains enabled after drawing a shape.
+			 *
+			 * Default value: false
+			 */
+			repeatMode?: boolean;
+		}
+
+		export interface MarkerOptions {
+
+			/**
+			 * TThe icon displayed when drawing a marker.
+			 *
+			 * Default value: L.Icon.Default()
+			 */
+			icon?: L.Icon;
+
+			/**
+			 * This should be a high number to ensure that you can draw over all other layers on the map.
+			 *
+			 * Default value: 2000
+			 */
+			zIndexOffset?: number;
+
+			/**
+			 * Determines if the draw tool remains enabled after drawing a shape.
+			 *
+			 * Default value: false
+			 */
+			repeatMode?: boolean;
+		}
+
+		export interface EditHandlerOptions {
+			/**
+			 * The path options for how the layers will look while in edit mode.
+			 * If this is set to null the editable path options will not be set.
+			 *
+			 * Default value: See code
+			 */
+			selectedPathOptions?: L.PathOptions;
+		}
+
+		export interface DeleteHandlerOptions {
+		}
+
+	}
+
+	namespace DrawEvents {
+
+		export interface Created {
+
+			/**
+			 * Layer that was just created.
+			 */
+			layer: ILayer;
+
+			/**
+			 * The type of layer this is. One of: polyline, polygon, rectangle, circle, marker.
+			 */
+			layerType: string;
+		}
+
+		export interface Edited {
+
+			/**
+			 * List of all layers just edited on the map.
+			 */
+			layers: LayerGroup<ILayer>;
+		}
+
+		/**
+		 * Triggered when layers have been removed (and saved) from the FeatureGroup.
+		 */
+		export interface Deleted {
+
+			/**
+			 * List of all layers just removed from the map.
+			 */
+			layers: LayerGroup<ILayer>;
+		}
+
+		export interface DrawStart {
+
+			/**
+			 * The type of layer this is. One of: polyline, polygon, rectangle, circle, marker
+			 */
+			layerType: string;
+		}
+
+		export interface DrawStop {
+
+			/**
+			 * The type of layer this is. One of: polyline, polygon, rectangle, circle, marker
+			 */
+			layerType: string;
+		}
+
+        export interface EditStart {
+			/**
+			 * The type of edit this is. One of: edit
+			 */
+			handler: string;
+		}
+
+		export interface EditStop {
+			/**
+			 * The type of edit this is. One of: edit
+			 */
+			handler: string;
+		}
+
+		export interface DeleteStart {
+			/**
+			 * The type of edit this is. One of: remove
+			 */
+			handler: string;
+		}
+
+		export interface DeleteStop {
+			/**
+			 * The type of edit this is. One of: remove
+			 */
+			handler: string;
+		}
+	}
+}
diff --git a/leaflet-draw/leaflet-draw-tests.ts b/leaflet-draw/leaflet-draw-tests.ts
index 9a1ed09306..f148908917 100644
--- a/leaflet-draw/leaflet-draw-tests.ts
+++ b/leaflet-draw/leaflet-draw-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../leaflet/leaflet.d.ts" />
-/// <reference path="leaflet-draw.d.ts" />
+/// <reference types="leaflet" />
+
 
 
 var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
diff --git a/leaflet-draw/leaflet-draw.d.ts b/leaflet-draw/leaflet-draw.d.ts
deleted file mode 100644
index 253d6c3a11..0000000000
--- a/leaflet-draw/leaflet-draw.d.ts
+++ /dev/null
@@ -1,333 +0,0 @@
-// Type definitions for leaflet-draw 0.2.4
-// Project: https://github.com/Leaflet/Leaflet.draw
-// Definitions by: Matt Guest <https://github.com/matt-guest>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../leaflet/leaflet.d.ts" />
-
-declare namespace L {
-	export interface MapOptions {
-		drawControl?: boolean;
-	}
-
-	export interface ControlStatic {
-		Draw: Control.DrawStatic;
-	}
-
-	namespace Control {
-
-		export interface DrawStatic {
-			new (options?: IDrawConstructorOptions): Draw;
-		}
-
-		export interface IDrawConstructorOptions {
-
-			/**
-			 * The initial position of the control (one of the map corners).
-			 *
-			 * Default value: 'topleft'
-			 */
-			position?: string;
-
-			/**
-			 * The options used to configure the draw toolbar.
-			 *
-			 * Default value: {}
-			 */
-			draw?: DrawOptions;
-
-			/**
-			 * 	The options used to configure the edit toolbar.
-			 *
-			 *  Default value: false
-			 */
-			edit: EditOptions;
-
-		}
-
-		export interface DrawOptions {
-
-			/**
-			 * Polyline draw handler options. Set to false to disable handler.
-			 *
-			 *  Default value: {}
-			 */
-			polyline?: DrawOptions.PolylineOptions;
-
-			/**
-			 * Polygon draw handler options. Set to false to disable handler.
-			 *
-			 *  Default value: {}
-			 */
-			polygon?: DrawOptions.PolygonOptions;
-
-			/**
-			 * Rectangle draw handler options. Set to false to disable handler.
-			 *
-			 *  Default value: {}
-			 */
-			rectangle?: DrawOptions.RectangleOptions;
-
-			/**
-			 * Circle draw handler options. Set to false to disable handler.
-			 *
-			 *  Default value: {}
-			 */
-			circle?: DrawOptions.CircleOptions;
-
-			/**
-			 * Marker draw handler options. Set to false to disable handler.
-			 *
-			 *  Default value: {}
-			 */
-			marker?: DrawOptions.MarkerOptions;
-		}
-
-		export interface EditOptions {
-
-			/**
-			 * This is the FeatureGroup that stores all editable shapes.
-			 * THIS IS REQUIRED FOR THE EDIT TOOLBAR TO WORK
-			 *
-			 * Default value: null
-			 */
-			featureGroup: FeatureGroup<ILayer>;
-
-			/**
-			 * Edit handler options. Set to false to disable handler.
-			 *
-			 * Default value: null
-			 */
-			edit?: DrawOptions.EditHandlerOptions;
-
-			/**
-			 * Delete handler options. Set to false to disable handler.
-			 *
-			 * Default value: null
-			 */
-			remove?: DrawOptions.DeleteHandlerOptions;
-		}
-
-		export interface Draw extends IControl {
-
-		}
-	}
-
-
-	namespace DrawOptions {
-
-		export interface PolylineOptions {
-
-			/**
-			 * Determines if line segments can cross.
-			 *
-			 * Default value: true
-			 */
-			allowIntersection?: boolean;
-
-			/**
-			 * Configuration options for the error that displays if an intersection is detected.
-			 *
-			 * Default value: See code
-			 */
-			drawError?: any;
-
-			/**
-			 * Distance in pixels between each guide dash.
-			 *
-			 * Default value: 20
-			 */
-			guidelineDistance?: number;
-
-			/**
-			 * The options used when drawing the polyline/polygon on the map.
-			 *
-			 * Default value: See code
-			 */
-			shapeOptions?: L.PolylineOptions;
-
-			/**
-			 * Determines which measurement system (metric or imperial) is used.
-			 *
-			 * Default value: true
-			 */
-			metric?: boolean;
-
-			/**
-			 * 	This should be a high number to ensure that you can draw over all other layers on the map.
-			 *
-			 * Default value: 2000
-			 */
-			zIndexOffset?: number;
-
-			/**
-			 * Determines if the draw tool remains enabled after drawing a shape.
-			 *
-			 * Default value: false
-			 */
-			repeatMode?: boolean;
-		}
-
-		export interface PolygonOptions extends PolylineOptions {
-
-			/**
-			 * Show the area of the drawn polygon in m², ha or km².
-			 * The area is only approximate and become less accurate the larger the polygon is.
-			 *
-			 * Default value: false
-			 */
-			showArea?: boolean;
-		}
-
-		export interface RectangleOptions {
-
-			/**
-			 * The options used when drawing the rectangle on the map.
-			 *
-			 * Default value: See code
-			 */
-			shapeOptions?: L.PathOptions;
-
-			/**
-			 * Determines if the draw tool remains enabled after drawing a shape.
-			 *
-			 * Default value: false
-			 */
-			repeatMode?: boolean;
-		}
-
-		export interface CircleOptions {
-
-			/**
-			 * The options used when drawing the circle on the map.
-			 *
-			 * Default value: See code
-			 */
-			shapeOptions?: L.PathOptions;
-
-			/**
-			 * Determines if the draw tool remains enabled after drawing a shape.
-			 *
-			 * Default value: false
-			 */
-			repeatMode?: boolean;
-		}
-
-		export interface MarkerOptions {
-
-			/**
-			 * TThe icon displayed when drawing a marker.
-			 *
-			 * Default value: L.Icon.Default()
-			 */
-			icon?: L.Icon;
-
-			/**
-			 * This should be a high number to ensure that you can draw over all other layers on the map.
-			 *
-			 * Default value: 2000
-			 */
-			zIndexOffset?: number;
-
-			/**
-			 * Determines if the draw tool remains enabled after drawing a shape.
-			 *
-			 * Default value: false
-			 */
-			repeatMode?: boolean;
-		}
-
-		export interface EditHandlerOptions {
-			/**
-			 * The path options for how the layers will look while in edit mode.
-			 * If this is set to null the editable path options will not be set.
-			 *
-			 * Default value: See code
-			 */
-			selectedPathOptions?: L.PathOptions;
-		}
-
-		export interface DeleteHandlerOptions {
-		}
-
-	}
-
-	namespace DrawEvents {
-
-		export interface Created {
-
-			/**
-			 * Layer that was just created.
-			 */
-			layer: ILayer;
-
-			/**
-			 * The type of layer this is. One of: polyline, polygon, rectangle, circle, marker.
-			 */
-			layerType: string;
-		}
-
-		export interface Edited {
-
-			/**
-			 * List of all layers just edited on the map.
-			 */
-			layers: LayerGroup<ILayer>;
-		}
-
-		/**
-		 * Triggered when layers have been removed (and saved) from the FeatureGroup.
-		 */
-		export interface Deleted {
-
-			/**
-			 * List of all layers just removed from the map.
-			 */
-			layers: LayerGroup<ILayer>;
-		}
-
-		export interface DrawStart {
-
-			/**
-			 * The type of layer this is. One of: polyline, polygon, rectangle, circle, marker
-			 */
-			layerType: string;
-		}
-
-		export interface DrawStop {
-
-			/**
-			 * The type of layer this is. One of: polyline, polygon, rectangle, circle, marker
-			 */
-			layerType: string;
-		}
-
-        export interface EditStart {
-			/**
-			 * The type of edit this is. One of: edit
-			 */
-			handler: string;
-		}
-
-		export interface EditStop {
-			/**
-			 * The type of edit this is. One of: edit
-			 */
-			handler: string;
-		}
-
-		export interface DeleteStart {
-			/**
-			 * The type of edit this is. One of: remove
-			 */
-			handler: string;
-		}
-
-		export interface DeleteStop {
-			/**
-			 * The type of edit this is. One of: remove
-			 */
-			handler: string;
-		}
-	}
-}
diff --git a/leaflet-draw/tsconfig.json b/leaflet-draw/tsconfig.json
new file mode 100644
index 0000000000..6299fbc0b1
--- /dev/null
+++ b/leaflet-draw/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "leaflet-draw-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/leaflet-editable/index.d.ts b/leaflet-editable/index.d.ts
new file mode 100644
index 0000000000..3d8c84d93f
--- /dev/null
+++ b/leaflet-editable/index.d.ts
@@ -0,0 +1,258 @@
+// Type definitions for Leaflet.Editable 0.7
+// Project: https://github.com/yohanboniface/Leaflet.Editable
+// Definitions by: Dominic Alie <https://github.com/dalie>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="leaflet" />
+
+declare namespace L {
+    /**
+     * Make geometries editable in Leaflet.
+     *
+     * This is not a plug and play UI, and will not. This is a minimal, lightweight, and fully extendable API to
+     * control editing of geometries. So you can easily build your own UI with your own needs and choices.
+     */
+    export interface EditableStatic {
+        new (map: Map, options: EditOptions): Editable;
+    }
+
+    /**
+     * Options to pass to L.Editable when instanciating.
+     */
+    export interface EditOptions {
+        /**
+         * Class to be used when creating a new Polyline.
+         */
+        polylineClass?: Object;
+
+        /**
+         * Class to be used when creating a new Polygon.
+         */
+        polygonClass?: Object;
+
+        /**
+         * Class to be used when creating a new Marker.
+         */
+        markerClass?: Object;
+
+        /**
+         * CSS class to be added to the map container while drawing.
+         */
+        drawingCSSClass?: string;
+
+        /**
+         * Layer used to store edit tools (vertex, line guide…).
+         */
+        editLayer?: L.LayerGroup<L.ILayer>;
+
+        /**
+         * Default layer used to store drawn features (marker, polyline…).
+         */
+        featuresLayer?: L.LayerGroup<L.Polyline|L.Polygon|L.Marker>;
+
+        /**
+         * Class to be used as vertex, for path editing.
+         */
+        vertexMarkerClass?: Object;
+
+        /**
+         * Class to be used as middle vertex, pulled by the user to create a new point in the middle of a path.
+         */
+        middleMarkerClass?: Object;
+
+        /**
+         * Class to be used as Polyline editor.
+         */
+        polylineEditorClass?: Object;
+
+        /**
+         * Class to be used as Polygon editor.
+         */
+        polygonEditorClass?: Object;
+
+        /**
+         * Class to be used as Marker editor.
+         */
+        markerEditorClass?: Object;
+
+        /**
+         * Options to be passed to the line guides.
+         */
+        lineGuideOptions?: Object;
+
+        /**
+         * Set this to true if you don't want middle markers.
+         */
+        skipMiddleMarkers?: boolean;
+    }
+
+    /**
+     * Make geometries editable in Leaflet.
+     *
+     * This is not a plug and play UI, and will not. This is a minimal, lightweight, and fully extendable API to
+     * control editing of geometries. So you can easily build your own UI with your own needs and choices.
+     */
+    export interface Editable extends Mixin.LeafletMixinEvents {
+        /**
+         * Options to pass to L.Editable when instanciating.
+         */
+        options: EditOptions;
+
+        currentPolygon: Polyline|Polygon|Marker;
+
+        /**
+         * Start drawing a polyline. If latlng is given, a first point will be added. In any case, continuing on user
+         * click. If options is given, it will be passed to the polyline class constructor.
+         */
+        startPolyline(latLng?: LatLng, options?: L.PolylineOptions): L.Polyline;
+
+        /**
+         * Start drawing a polygon. If latlng is given, a first point will be added. In any case, continuing on user
+         * click. If options is given, it will be passed to the polygon class constructor.
+         */
+        startPolygon(latLng?: LatLng, options?: L.PolylineOptions): L.Polygon;
+
+        /**
+         * Start adding a marker. If latlng is given, the marker will be shown first at this point. In any case, it
+         * will follow the user mouse, and will have a final latlng on next click (or touch). If options is given,
+         * it will be passed to the marker class constructor.
+         */
+        startMarker(latLng?: LatLng, options?: L.MarkerOptions): L.Marker;
+
+        /**
+         * When you need to stop any ongoing drawing, without needing to know which editor is active.
+         */
+        stopDrawing(): void;
+    }
+
+    export var Editable: EditableStatic;
+
+    /**
+     * EditableMixin is included to L.Polyline, L.Polygon and L.Marker. It adds the following methods to them.
+     *
+     * When editing is enabled, the editor is accessible on the instance with the editor property.
+     */
+    export interface EditableMixin {
+        /**
+         * Enable editing, by creating an editor if not existing, and then calling enable on it.
+         */
+        enableEdit(): any;
+
+        /**
+         * Disable editing, also remove the editor property reference.
+         */
+        disableEdit(): void;
+
+        /**
+         * Enable or disable editing, according to current status.
+         */
+        toggleEdit(): void;
+
+        /**
+         * Return true if current instance has an editor attached, and this editor is enabled.
+         */
+        editEnabled(): boolean;
+    }
+
+    export interface Map {
+        /**
+         * Whether to create a L.Editable instance at map init or not.
+         */
+        editable: boolean;
+
+        /**
+         * Options to pass to L.Editable when instanciating.
+         */
+        editOptions: EditOptions;
+
+        /**
+         * L.Editable plugin instance.
+         */
+        editTools: Editable;
+    }
+
+    export interface Polyline extends EditableMixin {
+    }
+
+    namespace Map {
+        export interface MapOptions {
+            /**
+             * Whether to create a L.Editable instance at map init or not.
+             */
+            editable?: boolean;
+
+            /**
+             * Options to pass to L.Editable when instanciating.
+             */
+            editOptions?: EditOptions;
+        }
+    }
+
+    /**
+     * When editing a feature (marker, polyline…), an editor is attached to it. This editor basically knows
+     * how to handle the edition.
+     */
+    export interface BaseEditor {
+        /**
+         * Set up the drawing tools for the feature to be editable.
+         */
+        enable(): MarkerEditor|PolylineEditor|PolygonEditor;
+
+        /**
+         * Remove editing tools.
+         */
+        disable(): MarkerEditor|PolylineEditor|PolygonEditor;
+    }
+
+    /**
+     * Inherit from L.Editable.BaseEditor.
+     * Inherited by L.Editable.PolylineEditor and L.Editable.PolygonEditor.
+     */
+    export interface PathEditor extends BaseEditor {
+        /**
+         * Rebuild edit elements (vertex, middlemarker, etc.).
+         */
+        reset(): void;
+    }
+
+    /**
+     * Inherit from L.Editable.PathEditor.
+     */
+    export interface PolylineEditor extends PathEditor {
+        /**
+         * Set up drawing tools to continue the line forward.
+         */
+        continueForward(): void;
+
+        /**
+         * Set up drawing tools to continue the line backward.
+         */
+        continueBackward(): void;
+    }
+
+    /**
+     * Inherit from L.Editable.PathEditor.
+     */
+    export interface PolygonEditor extends PathEditor {
+        /**
+         * Set up drawing tools for creating a new hole on the polygon. If the latlng param is given, a first
+         * point is created.
+         */
+        newHole(latlng: LatLng): void;
+    }
+
+    /**
+     * Inherit from L.Editable.BaseEditor.
+     */
+    export interface MarkerEditor extends BaseEditor {
+    }
+
+    export interface Marker extends EditableMixin, MarkerEditor {
+    }
+
+    export interface Polyline extends EditableMixin, PolylineEditor {
+    }
+
+    export interface Polygon extends EditableMixin, PolygonEditor {
+    }
+}
diff --git a/leaflet-editable/leaflet-editable-tests.ts b/leaflet-editable/leaflet-editable-tests.ts
index fa904f6713..b8ff8744db 100644
--- a/leaflet-editable/leaflet-editable-tests.ts
+++ b/leaflet-editable/leaflet-editable-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="leaflet-editable.d.ts" />
+
 
 var map: L.Map = L.map('div', {
     editable: true,
diff --git a/leaflet-editable/leaflet-editable.d.ts b/leaflet-editable/leaflet-editable.d.ts
deleted file mode 100644
index 0d7b2bcc0f..0000000000
--- a/leaflet-editable/leaflet-editable.d.ts
+++ /dev/null
@@ -1,258 +0,0 @@
-// Type definitions for Leaflet.Editable 0.7
-// Project: https://github.com/yohanboniface/Leaflet.Editable
-// Definitions by: Dominic Alie <https://github.com/dalie>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../leaflet/leaflet.d.ts" />
-
-declare namespace L {
-    /**
-     * Make geometries editable in Leaflet.
-     *
-     * This is not a plug and play UI, and will not. This is a minimal, lightweight, and fully extendable API to
-     * control editing of geometries. So you can easily build your own UI with your own needs and choices.
-     */
-    export interface EditableStatic {
-        new (map: Map, options: EditOptions): Editable;
-    }
-
-    /**
-     * Options to pass to L.Editable when instanciating.
-     */
-    export interface EditOptions {
-        /**
-         * Class to be used when creating a new Polyline.
-         */
-        polylineClass?: Object;
-
-        /**
-         * Class to be used when creating a new Polygon.
-         */
-        polygonClass?: Object;
-
-        /**
-         * Class to be used when creating a new Marker.
-         */
-        markerClass?: Object;
-
-        /**
-         * CSS class to be added to the map container while drawing.
-         */
-        drawingCSSClass?: string;
-
-        /**
-         * Layer used to store edit tools (vertex, line guide…).
-         */
-        editLayer?: L.LayerGroup<L.ILayer>;
-
-        /**
-         * Default layer used to store drawn features (marker, polyline…).
-         */
-        featuresLayer?: L.LayerGroup<L.Polyline|L.Polygon|L.Marker>;
-
-        /**
-         * Class to be used as vertex, for path editing.
-         */
-        vertexMarkerClass?: Object;
-
-        /**
-         * Class to be used as middle vertex, pulled by the user to create a new point in the middle of a path.
-         */
-        middleMarkerClass?: Object;
-
-        /**
-         * Class to be used as Polyline editor.
-         */
-        polylineEditorClass?: Object;
-
-        /**
-         * Class to be used as Polygon editor.
-         */
-        polygonEditorClass?: Object;
-
-        /**
-         * Class to be used as Marker editor.
-         */
-        markerEditorClass?: Object;
-
-        /**
-         * Options to be passed to the line guides.
-         */
-        lineGuideOptions?: Object;
-
-        /**
-         * Set this to true if you don't want middle markers.
-         */
-        skipMiddleMarkers?: boolean;
-    }
-
-    /**
-     * Make geometries editable in Leaflet.
-     *
-     * This is not a plug and play UI, and will not. This is a minimal, lightweight, and fully extendable API to
-     * control editing of geometries. So you can easily build your own UI with your own needs and choices.
-     */
-    export interface Editable extends Mixin.LeafletMixinEvents {
-        /**
-         * Options to pass to L.Editable when instanciating.
-         */
-        options: EditOptions;
-
-        currentPolygon: Polyline|Polygon|Marker;
-
-        /**
-         * Start drawing a polyline. If latlng is given, a first point will be added. In any case, continuing on user
-         * click. If options is given, it will be passed to the polyline class constructor.
-         */
-        startPolyline(latLng?: LatLng, options?: L.PolylineOptions): L.Polyline;
-
-        /**
-         * Start drawing a polygon. If latlng is given, a first point will be added. In any case, continuing on user
-         * click. If options is given, it will be passed to the polygon class constructor.
-         */
-        startPolygon(latLng?: LatLng, options?: L.PolylineOptions): L.Polygon;
-
-        /**
-         * Start adding a marker. If latlng is given, the marker will be shown first at this point. In any case, it
-         * will follow the user mouse, and will have a final latlng on next click (or touch). If options is given,
-         * it will be passed to the marker class constructor.
-         */
-        startMarker(latLng?: LatLng, options?: L.MarkerOptions): L.Marker;
-
-        /**
-         * When you need to stop any ongoing drawing, without needing to know which editor is active.
-         */
-        stopDrawing(): void;
-    }
-
-    export var Editable: EditableStatic;
-
-    /**
-     * EditableMixin is included to L.Polyline, L.Polygon and L.Marker. It adds the following methods to them.
-     *
-     * When editing is enabled, the editor is accessible on the instance with the editor property.
-     */
-    export interface EditableMixin {
-        /**
-         * Enable editing, by creating an editor if not existing, and then calling enable on it.
-         */
-        enableEdit(): any;
-
-        /**
-         * Disable editing, also remove the editor property reference.
-         */
-        disableEdit(): void;
-
-        /**
-         * Enable or disable editing, according to current status.
-         */
-        toggleEdit(): void;
-
-        /**
-         * Return true if current instance has an editor attached, and this editor is enabled.
-         */
-        editEnabled(): boolean;
-    }
-
-    export interface Map {
-        /**
-         * Whether to create a L.Editable instance at map init or not.
-         */
-        editable: boolean;
-
-        /**
-         * Options to pass to L.Editable when instanciating.
-         */
-        editOptions: EditOptions;
-
-        /**
-         * L.Editable plugin instance.
-         */
-        editTools: Editable;
-    }
-
-    export interface Polyline extends EditableMixin {
-    }
-
-    namespace Map {
-        export interface MapOptions {
-            /**
-             * Whether to create a L.Editable instance at map init or not.
-             */
-            editable?: boolean;
-
-            /**
-             * Options to pass to L.Editable when instanciating.
-             */
-            editOptions?: EditOptions;
-        }
-    }
-
-    /**
-     * When editing a feature (marker, polyline…), an editor is attached to it. This editor basically knows
-     * how to handle the edition.
-     */
-    export interface BaseEditor {
-        /**
-         * Set up the drawing tools for the feature to be editable.
-         */
-        enable(): MarkerEditor|PolylineEditor|PolygonEditor;
-
-        /**
-         * Remove editing tools.
-         */
-        disable(): MarkerEditor|PolylineEditor|PolygonEditor;
-    }
-
-    /**
-     * Inherit from L.Editable.BaseEditor.
-     * Inherited by L.Editable.PolylineEditor and L.Editable.PolygonEditor.
-     */
-    export interface PathEditor extends BaseEditor {
-        /**
-         * Rebuild edit elements (vertex, middlemarker, etc.).
-         */
-        reset(): void;
-    }
-
-    /**
-     * Inherit from L.Editable.PathEditor.
-     */
-    export interface PolylineEditor extends PathEditor {
-        /**
-         * Set up drawing tools to continue the line forward.
-         */
-        continueForward(): void;
-
-        /**
-         * Set up drawing tools to continue the line backward.
-         */
-        continueBackward(): void;
-    }
-
-    /**
-     * Inherit from L.Editable.PathEditor.
-     */
-    export interface PolygonEditor extends PathEditor {
-        /**
-         * Set up drawing tools for creating a new hole on the polygon. If the latlng param is given, a first
-         * point is created.
-         */
-        newHole(latlng: LatLng): void;
-    }
-
-    /**
-     * Inherit from L.Editable.BaseEditor.
-     */
-    export interface MarkerEditor extends BaseEditor {
-    }
-
-    export interface Marker extends EditableMixin, MarkerEditor {
-    }
-
-    export interface Polyline extends EditableMixin, PolylineEditor {
-    }
-
-    export interface Polygon extends EditableMixin, PolygonEditor {
-    }
-}
diff --git a/leaflet-editable/tsconfig.json b/leaflet-editable/tsconfig.json
new file mode 100644
index 0000000000..1d25748534
--- /dev/null
+++ b/leaflet-editable/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "leaflet-editable-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/leaflet-label/index.d.ts b/leaflet-label/index.d.ts
new file mode 100644
index 0000000000..08be437e7a
--- /dev/null
+++ b/leaflet-label/index.d.ts
@@ -0,0 +1,81 @@
+// Type definitions for Leaflet.label v0.2.1
+// Project: https://github.com/Leaflet/Leaflet.label
+// Definitions by: Wim Looman <https://github.com/Nemo157>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="leaflet" />
+
+declare namespace L {
+    export interface IconOptions {
+        labelAnchor?: Point;
+    }
+
+    export interface PathOptions {
+        labelAnchor?: Point;
+    }
+
+	export interface CircleMarkerOptions {
+		labelAnchor?: Point;
+	}
+
+	export interface Marker {
+		showLabel(): Marker;
+		hideLabel(): Marker;
+		setLabelNoHide(noHide: boolean): void;
+		bindLabel(content: string, options?: LabelOptions): Marker;
+		unbindLabel(): Marker;
+		updateLabelContent(content: string): void;
+		getLabel(): Label;
+		setOpacity(opacity: number, labelHasSemiTransparency: boolean): void;
+	}
+
+	export interface CircleMarker {
+		showLabel(): CircleMarker;
+		hideLabel(): CircleMarker;
+		setLabelNoHide(noHide: boolean): void;
+		bindLabel(content: string, options?: LabelOptions): CircleMarker;
+		unbindLabel(): CircleMarker;
+		updateLabelContent(content: string): void;
+		getLabel(): Label;
+	}
+
+	export interface FeatureGroup<T extends ILayer> {
+		clearLayers(): FeatureGroup<T>;
+		bindLabel(content: string, options?: LabelOptions): FeatureGroup<T>;
+		unbindLabel(): FeatureGroup<T>;
+		updateLabelContent(content: string): FeatureGroup<T>;
+	}
+
+	export interface Path {
+		bindLabel(content: string, options?: LabelOptions): Path;
+		unbindLabel(): Path;
+		updateLabelContent(content: string): void;
+	}
+
+	export interface LabelOptions {
+		className?: string;
+		clickable?: boolean;
+		direction?: string; // 'left' | 'right' | 'auto';
+		pane?: string;
+		noHide?: boolean;
+		offset?: Point;
+		opacity?: number;
+		zoomAnimation?: boolean;
+	}
+
+	export interface LabelStatic extends ClassStatic {
+		new(options?: LabelOptions): Label;
+	}
+
+	export var Label: LabelStatic;
+
+	export interface Label extends IEventPowered<Label> {
+		onAdd(map: Map): void;
+		onRemove(map: Map): void;
+		setLatLng(latlng: LatLng): Label;
+		setContent(content: string): Label;
+		close(): void;
+		updateZIndex(zIndex: number): void;
+		setOpacity(opacity: number): void;
+	}
+}
diff --git a/leaflet-label/leaflet-label-tests.ts b/leaflet-label/leaflet-label-tests.ts
index 57a2feb45b..bdfee67e62 100644
--- a/leaflet-label/leaflet-label-tests.ts
+++ b/leaflet-label/leaflet-label-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="leaflet-label.d.ts" />
+
 
 var map: L.Map;
 var label: L.Label;
diff --git a/leaflet-label/leaflet-label.d.ts b/leaflet-label/leaflet-label.d.ts
deleted file mode 100644
index 009ded17f8..0000000000
--- a/leaflet-label/leaflet-label.d.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-// Type definitions for Leaflet.label v0.2.1
-// Project: https://github.com/Leaflet/Leaflet.label
-// Definitions by: Wim Looman <https://github.com/Nemo157>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../leaflet/leaflet.d.ts" />
-
-declare namespace L {
-    export interface IconOptions {
-        labelAnchor?: Point;
-    }
-
-    export interface PathOptions {
-        labelAnchor?: Point;
-    }
-
-	export interface CircleMarkerOptions {
-		labelAnchor?: Point;
-	}
-
-	export interface Marker {
-		showLabel(): Marker;
-		hideLabel(): Marker;
-		setLabelNoHide(noHide: boolean): void;
-		bindLabel(content: string, options?: LabelOptions): Marker;
-		unbindLabel(): Marker;
-		updateLabelContent(content: string): void;
-		getLabel(): Label;
-		setOpacity(opacity: number, labelHasSemiTransparency: boolean): void;
-	}
-
-	export interface CircleMarker {
-		showLabel(): CircleMarker;
-		hideLabel(): CircleMarker;
-		setLabelNoHide(noHide: boolean): void;
-		bindLabel(content: string, options?: LabelOptions): CircleMarker;
-		unbindLabel(): CircleMarker;
-		updateLabelContent(content: string): void;
-		getLabel(): Label;
-	}
-
-	export interface FeatureGroup<T extends ILayer> {
-		clearLayers(): FeatureGroup<T>;
-		bindLabel(content: string, options?: LabelOptions): FeatureGroup<T>;
-		unbindLabel(): FeatureGroup<T>;
-		updateLabelContent(content: string): FeatureGroup<T>;
-	}
-
-	export interface Path {
-		bindLabel(content: string, options?: LabelOptions): Path;
-		unbindLabel(): Path;
-		updateLabelContent(content: string): void;
-	}
-
-	export interface LabelOptions {
-		className?: string;
-		clickable?: boolean;
-		direction?: string; // 'left' | 'right' | 'auto';
-		pane?: string;
-		noHide?: boolean;
-		offset?: Point;
-		opacity?: number;
-		zoomAnimation?: boolean;
-	}
-
-	export interface LabelStatic extends ClassStatic {
-		new(options?: LabelOptions): Label;
-	}
-
-	export var Label: LabelStatic;
-
-	export interface Label extends IEventPowered<Label> {
-		onAdd(map: Map): void;
-		onRemove(map: Map): void;
-		setLatLng(latlng: LatLng): Label;
-		setContent(content: string): Label;
-		close(): void;
-		updateZIndex(zIndex: number): void;
-		setOpacity(opacity: number): void;
-	}
-}
diff --git a/leaflet-label/tsconfig.json b/leaflet-label/tsconfig.json
new file mode 100644
index 0000000000..85f6ccaacf
--- /dev/null
+++ b/leaflet-label/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "leaflet-label-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/leaflet-markercluster/index.d.ts b/leaflet-markercluster/index.d.ts
new file mode 100644
index 0000000000..6730ae5235
--- /dev/null
+++ b/leaflet-markercluster/index.d.ts
@@ -0,0 +1,125 @@
+// Type definitions for Leaflet.markercluster v0.4.0
+// Project: https://github.com/Leaflet/Leaflet.markercluster
+// Definitions by: Robert Imig <https://github.com/rimig>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="leaflet" />
+
+declare namespace L {
+    export interface MarkerClusterGroupOptions {
+
+      /*
+      * When you mouse over a cluster it shows the bounds of its markers.
+      */
+      showCoverageOnHover?: boolean;
+
+      /*
+      * When you click a cluster we zoom to its bounds.
+      */
+      zoomToBoundsOnClick?: boolean;
+
+      /*
+      * When you click a cluster at the bottom zoom level we spiderfy it
+      * so you can see all of its markers.
+      */
+      spiderfyOnMaxZoom?: boolean;
+
+      /*
+      * Clusters and markers too far from the viewport are removed from the map
+      * for performance.
+      */
+      removeOutsideVisibleBounds?: boolean;
+
+      /*
+      * Smoothly split / merge cluster children when zooming and spiderfying.
+      * If L.DomUtil.TRANSITION is false, this option has no effect (no animation is possible).
+      */
+      animate?: boolean;
+
+      /*
+      * If set to true (and animate option is also true) then adding individual markers to the
+      * MarkerClusterGroup after it has been added to the map will add the marker and animate it
+      * into the cluster. Defaults to false as this gives better performance when bulk adding markers.
+      * addLayers does not support this, only addLayer with individual Markers.
+      */
+      animateAddingMarkers?: boolean;
+
+      /*
+      * If set, at this zoom level and below markers will not be clustered. This defaults to disabled.
+      */
+      disableClusteringAtZoom?: number;
+
+      /*
+      * The maximum radius that a cluster will cover from the central marker (in pixels). Default 80.
+      * Decreasing will make more, smaller clusters.
+      */
+      maxClusterRadius?: number;
+
+      /*
+      * Options to pass when creating the L.Polygon(points, options) to show the bounds of a cluster.
+      * Defaults to empty
+      */
+      polygonOptions?: PolylineOptions;
+
+      /*
+      * If set to true, overrides the icon for all added markers to make them appear as a 1 size cluster.
+      */
+      singleMarkerMode?: boolean;
+
+      /*
+      * Allows you to specify PolylineOptions to style spider legs.
+      * By default, they are { weight: 1.5, color: '#222', opacity: 0.5 }.
+      */
+      spiderLegPolylineOptions?: PolylineOptions;
+
+      /*
+      * Increase from 1 to increase the distance away from the center that spiderfied markers are placed.
+      * Use if you are using big marker icons (Default: 1).
+      */
+      spiderfyDistanceMultiplier?: number;
+
+      /*
+      * Function used to create the cluster icon
+      */
+      iconCreateFunction?: any;
+    }
+
+    export class MarkerClusterGroup extends FeatureGroup<ILayer> {
+      initialize(): void;
+      initialize(options: MarkerClusterGroupOptions): void;
+
+      /*
+      * Bulk methods for adding and removing markers and should be favoured over the
+      * single versions when doing bulk addition/removal of markers.
+      */
+      addLayers(layers:ILayer[]):MarkerClusterGroup;
+      removeLayers(layers:ILayer[]):MarkerClusterGroup;
+
+      clearLayers():MarkerClusterGroup;
+
+      /*
+      * If you have a marker in your MarkerClusterGroup and you want to get the visible
+      * parent of it
+      */
+      getVisibleParent(marker: Marker): Marker;
+
+      /*
+      * If you have customized the clusters icon to use some data from the contained markers,
+      * and later that data changes, use this method to force a refresh of the cluster icons.
+      */
+      refreshClusters():MarkerClusterGroup;
+      refreshClusters(layerGroup:LayerGroup<ILayer>):MarkerClusterGroup;
+      refreshClusters(marker: Marker):MarkerClusterGroup;
+      refreshClusters(markers: Marker[]):MarkerClusterGroup;
+
+      /*
+      * Returns the total number of markers contained within that cluster.
+      */
+      getChildCount(): number;
+
+      /*
+      * Returns the array of total markers contained within that cluster.
+      */
+      getAllChildMarkers(): Marker[];
+    }
+}
diff --git a/leaflet-markercluster/leaflet-markercluster-tests.ts b/leaflet-markercluster/leaflet-markercluster-tests.ts
index 8c1a4721c9..e579db5309 100644
--- a/leaflet-markercluster/leaflet-markercluster-tests.ts
+++ b/leaflet-markercluster/leaflet-markercluster-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="leaflet-markercluster.d.ts" />
+
 
 var map: L.Map;
 var markerClusterGroup: L.MarkerClusterGroup;
diff --git a/leaflet-markercluster/leaflet-markercluster.d.ts b/leaflet-markercluster/leaflet-markercluster.d.ts
deleted file mode 100644
index c9a3140fda..0000000000
--- a/leaflet-markercluster/leaflet-markercluster.d.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-// Type definitions for Leaflet.markercluster v0.4.0
-// Project: https://github.com/Leaflet/Leaflet.markercluster
-// Definitions by: Robert Imig <https://github.com/rimig>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../leaflet/leaflet.d.ts" />
-
-declare namespace L {
-    export interface MarkerClusterGroupOptions {
-
-      /*
-      * When you mouse over a cluster it shows the bounds of its markers.
-      */
-      showCoverageOnHover?: boolean;
-
-      /*
-      * When you click a cluster we zoom to its bounds.
-      */
-      zoomToBoundsOnClick?: boolean;
-
-      /*
-      * When you click a cluster at the bottom zoom level we spiderfy it
-      * so you can see all of its markers.
-      */
-      spiderfyOnMaxZoom?: boolean;
-
-      /*
-      * Clusters and markers too far from the viewport are removed from the map
-      * for performance.
-      */
-      removeOutsideVisibleBounds?: boolean;
-
-      /*
-      * Smoothly split / merge cluster children when zooming and spiderfying.
-      * If L.DomUtil.TRANSITION is false, this option has no effect (no animation is possible).
-      */
-      animate?: boolean;
-
-      /*
-      * If set to true (and animate option is also true) then adding individual markers to the
-      * MarkerClusterGroup after it has been added to the map will add the marker and animate it
-      * into the cluster. Defaults to false as this gives better performance when bulk adding markers.
-      * addLayers does not support this, only addLayer with individual Markers.
-      */
-      animateAddingMarkers?: boolean;
-
-      /*
-      * If set, at this zoom level and below markers will not be clustered. This defaults to disabled.
-      */
-      disableClusteringAtZoom?: number;
-
-      /*
-      * The maximum radius that a cluster will cover from the central marker (in pixels). Default 80.
-      * Decreasing will make more, smaller clusters.
-      */
-      maxClusterRadius?: number;
-
-      /*
-      * Options to pass when creating the L.Polygon(points, options) to show the bounds of a cluster.
-      * Defaults to empty
-      */
-      polygonOptions?: PolylineOptions;
-
-      /*
-      * If set to true, overrides the icon for all added markers to make them appear as a 1 size cluster.
-      */
-      singleMarkerMode?: boolean;
-
-      /*
-      * Allows you to specify PolylineOptions to style spider legs.
-      * By default, they are { weight: 1.5, color: '#222', opacity: 0.5 }.
-      */
-      spiderLegPolylineOptions?: PolylineOptions;
-
-      /*
-      * Increase from 1 to increase the distance away from the center that spiderfied markers are placed.
-      * Use if you are using big marker icons (Default: 1).
-      */
-      spiderfyDistanceMultiplier?: number;
-
-      /*
-      * Function used to create the cluster icon
-      */
-      iconCreateFunction?: any;
-    }
-
-    export class MarkerClusterGroup extends FeatureGroup<ILayer> {
-      initialize(): void;
-      initialize(options: MarkerClusterGroupOptions): void;
-
-      /*
-      * Bulk methods for adding and removing markers and should be favoured over the
-      * single versions when doing bulk addition/removal of markers.
-      */
-      addLayers(layers:ILayer[]):MarkerClusterGroup;
-      removeLayers(layers:ILayer[]):MarkerClusterGroup;
-
-      clearLayers():MarkerClusterGroup;
-
-      /*
-      * If you have a marker in your MarkerClusterGroup and you want to get the visible
-      * parent of it
-      */
-      getVisibleParent(marker: Marker): Marker;
-
-      /*
-      * If you have customized the clusters icon to use some data from the contained markers,
-      * and later that data changes, use this method to force a refresh of the cluster icons.
-      */
-      refreshClusters():MarkerClusterGroup;
-      refreshClusters(layerGroup:LayerGroup<ILayer>):MarkerClusterGroup;
-      refreshClusters(marker: Marker):MarkerClusterGroup;
-      refreshClusters(markers: Marker[]):MarkerClusterGroup;
-
-      /*
-      * Returns the total number of markers contained within that cluster.
-      */
-      getChildCount(): number;
-
-      /*
-      * Returns the array of total markers contained within that cluster.
-      */
-      getAllChildMarkers(): Marker[];
-    }
-}
diff --git a/leaflet-markercluster/tsconfig.json b/leaflet-markercluster/tsconfig.json
new file mode 100644
index 0000000000..ef35f5e697
--- /dev/null
+++ b/leaflet-markercluster/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "leaflet-markercluster-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/leaflet.awesome-markers/index.d.ts b/leaflet.awesome-markers/index.d.ts
new file mode 100644
index 0000000000..1c2762f672
--- /dev/null
+++ b/leaflet.awesome-markers/index.d.ts
@@ -0,0 +1,68 @@
+// Type definitions for Leaflet.awesome-markers plugin v2.0
+// Project: https://github.com/lvoogdt/Leaflet.awesome-markers
+// Definitions by: Egor Komarov <https://github.com/Odrin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="leaflet" />
+
+declare module L {
+    module AwesomeMarkers {
+        var version: string;
+
+        function icon(options: AwesomeMarkers.IconOptions): AwesomeMarkers.Icon;
+
+        interface IconStatic extends L.IconStatic {
+            /**
+              * Creates an icon instance with the given options.
+              */
+            new (options: IconOptions): Icon;
+
+            Default: {
+                /**
+                  * Creates a default icon instance with the given options.
+                  */
+                new (options?: IconOptions): Icon.Default;
+
+                imagePath: string;
+            };
+        }
+
+        interface Icon extends L.Icon {
+            options: AwesomeMarkers.IconOptions;
+        }
+
+        interface IconOptions extends L.IconOptions {
+            /**
+            * Name of the icon. See glyphicons or font-awesome.
+            */
+            icon?: string;
+
+            /**
+            * Select de icon library. 'fa' for font-awesome or 'glyphicon' for bootstrap 3.
+            */
+            prefix?: 'fa' | 'glyphicon';
+
+            /**
+            * Color of the marker
+            */
+            markerColor?: 'red' | 'darkred' | 'orange' | 'green' | 'darkgreen' | 'blue' | 'purple' | 'darkpuple' | 'cadetblue';
+
+            /**
+            * Color of the icon. 'white', 'black' or css code (hex, rgba etc).
+            */
+            iconColor?: 'white' | 'black' | string;
+
+            /**
+            * Make the icon spin. true or false. Font-awesome required
+            */
+            spin?: boolean;
+
+            /**
+            * Additional classes in the created tag
+            */
+            extraClasses?: string;
+        }
+
+        var Icon: AwesomeMarkers.IconStatic;
+    }
+}
diff --git a/leaflet.awesome-markers/leaflet.awesome-markers-tests.ts b/leaflet.awesome-markers/leaflet.awesome-markers-tests.ts
index 2ac33184be..7fe7a82753 100644
--- a/leaflet.awesome-markers/leaflet.awesome-markers-tests.ts
+++ b/leaflet.awesome-markers/leaflet.awesome-markers-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="leaflet.awesome-markers.d.ts" />
+
 
 var map: L.Map;
 
diff --git a/leaflet.awesome-markers/leaflet.awesome-markers.d.ts b/leaflet.awesome-markers/leaflet.awesome-markers.d.ts
deleted file mode 100644
index 6fa754ad8d..0000000000
--- a/leaflet.awesome-markers/leaflet.awesome-markers.d.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-// Type definitions for Leaflet.awesome-markers plugin v2.0
-// Project: https://github.com/lvoogdt/Leaflet.awesome-markers
-// Definitions by: Egor Komarov <https://github.com/Odrin>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../leaflet/leaflet.d.ts" />
-
-declare module L {
-    module AwesomeMarkers {
-        var version: string;
-
-        function icon(options: AwesomeMarkers.IconOptions): AwesomeMarkers.Icon;
-
-        interface IconStatic extends L.IconStatic {
-            /**
-              * Creates an icon instance with the given options.
-              */
-            new (options: IconOptions): Icon;
-
-            Default: {
-                /**
-                  * Creates a default icon instance with the given options.
-                  */
-                new (options?: IconOptions): Icon.Default;
-
-                imagePath: string;
-            };
-        }
-
-        interface Icon extends L.Icon {
-            options: AwesomeMarkers.IconOptions;
-        }
-
-        interface IconOptions extends L.IconOptions {
-            /**
-            * Name of the icon. See glyphicons or font-awesome.
-            */
-            icon?: string;
-
-            /**
-            * Select de icon library. 'fa' for font-awesome or 'glyphicon' for bootstrap 3.
-            */
-            prefix?: 'fa' | 'glyphicon';
-
-            /**
-            * Color of the marker
-            */
-            markerColor?: 'red' | 'darkred' | 'orange' | 'green' | 'darkgreen' | 'blue' | 'purple' | 'darkpuple' | 'cadetblue';
-
-            /**
-            * Color of the icon. 'white', 'black' or css code (hex, rgba etc).
-            */
-            iconColor?: 'white' | 'black' | string;
-
-            /**
-            * Make the icon spin. true or false. Font-awesome required
-            */
-            spin?: boolean;
-
-            /**
-            * Additional classes in the created tag
-            */
-            extraClasses?: string;
-        }
-
-        var Icon: AwesomeMarkers.IconStatic;
-    }
-}
diff --git a/leaflet.awesome-markers/tsconfig.json b/leaflet.awesome-markers/tsconfig.json
new file mode 100644
index 0000000000..08b4796ef5
--- /dev/null
+++ b/leaflet.awesome-markers/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "leaflet.awesome-markers-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/leaflet.fullscreen/index.d.ts b/leaflet.fullscreen/index.d.ts
new file mode 100644
index 0000000000..67af1d6770
--- /dev/null
+++ b/leaflet.fullscreen/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for Leaflet.fullscreen v1.3.0
+// Project: https://github.com/brunob/leaflet.fullscreen
+// Definitions by: William Comartin <https://github.com/wcomartin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="leaflet" />
+
+declare namespace L {
+
+  namespace Control {
+
+    export interface Fullscreen extends L.Control {}
+
+    export interface FullscreenOptions {
+      content?: string,
+      position?: string,
+  		title?: string,
+  		titleCancel?: string,
+  		forceSeparateButton?: boolean,
+  		forcePseudoFullscreen?: boolean
+    }
+  }
+
+  namespace control {
+
+      /**
+        * Creates a fullscreen control.
+        */
+      export function fullscreen(options?: Control.FullscreenOptions): L.Control.Fullscreen;
+
+  }
+}
diff --git a/leaflet.fullscreen/leaflet.fullscreen-tests.ts b/leaflet.fullscreen/leaflet.fullscreen-tests.ts
index d74a19dcbd..80b1440c2f 100644
--- a/leaflet.fullscreen/leaflet.fullscreen-tests.ts
+++ b/leaflet.fullscreen/leaflet.fullscreen-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="leaflet.fullscreen.d.ts" />
+
 
 var map: L.Map;
 
diff --git a/leaflet.fullscreen/leaflet.fullscreen.d.ts b/leaflet.fullscreen/leaflet.fullscreen.d.ts
deleted file mode 100644
index b8be6604dc..0000000000
--- a/leaflet.fullscreen/leaflet.fullscreen.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// Type definitions for Leaflet.fullscreen v1.3.0
-// Project: https://github.com/brunob/leaflet.fullscreen
-// Definitions by: William Comartin <https://github.com/wcomartin>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../leaflet/leaflet.d.ts" />
-
-declare namespace L {
-
-  namespace Control {
-
-    export interface Fullscreen extends L.Control {}
-
-    export interface FullscreenOptions {
-      content?: string,
-      position?: string,
-  		title?: string,
-  		titleCancel?: string,
-  		forceSeparateButton?: boolean,
-  		forcePseudoFullscreen?: boolean
-    }
-  }
-
-  namespace control {
-
-      /**
-        * Creates a fullscreen control.
-        */
-      export function fullscreen(options?: Control.FullscreenOptions): L.Control.Fullscreen;
-
-  }
-}
diff --git a/leaflet.fullscreen/tsconfig.json b/leaflet.fullscreen/tsconfig.json
new file mode 100644
index 0000000000..5ba55ebdb5
--- /dev/null
+++ b/leaflet.fullscreen/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "leaflet.fullscreen-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/leaflet/index.d.ts b/leaflet/index.d.ts
new file mode 100644
index 0000000000..37abb90fb1
--- /dev/null
+++ b/leaflet/index.d.ts
@@ -0,0 +1,4361 @@
+// Type definitions for Leaflet.js 0.7.3
+// Project: https://github.com/Leaflet/Leaflet
+// Definitions by: Vladimir Zotov <https://github.com/rgripper>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace L {
+    type LatLngExpression = LatLng | number[] | ({ lat: number; lng: number })
+    type LatLngBoundsExpression = LatLngBounds | LatLngExpression[];
+}
+
+declare namespace L {
+
+    export interface AttributionOptions {
+
+        /**
+          * The position of the control (one of the map corners). See control positions.
+          * Default value: 'bottomright'.
+          */
+        position?: string;
+
+        /**
+          * The HTML text shown before the attributions. Pass false to disable.
+          * Default value: 'Powered by Leaflet'.
+          */
+        prefix?: string;
+
+    }
+}
+
+declare namespace L {
+
+    /**
+        * Creates a Bounds object from two coordinates (usually top-left and bottom-right
+        * corners).
+        */
+    export function bounds(topLeft: Point, bottomRight: Point): Bounds;
+
+    /**
+        * Creates a Bounds object defined by the points it contains.
+        */
+    export function bounds(points: Point[]): Bounds;
+
+
+    export interface BoundsStatic {
+        /**
+          * Creates a Bounds object from two coordinates (usually top-left and bottom-right
+          * corners).
+          */
+        new(topLeft: Point, bottomRight: Point): Bounds;
+
+        /**
+          * Creates a Bounds object defined by the points it contains.
+          */
+        new(points: Point[]): Bounds;
+    }
+    export var Bounds: BoundsStatic;
+
+    export interface Bounds {
+        /**
+          * Extends the bounds to contain the given point.
+          */
+        extend(point: Point): void;
+
+        /**
+          * Returns the center point of the bounds.
+          */
+        getCenter(): Point;
+
+        /**
+          * Returns true if the rectangle contains the given one.
+          */
+        contains(otherBounds: Bounds): boolean;
+
+        /**
+          * Returns true if the rectangle contains the given point.
+          */
+        contains(point: Point): boolean;
+
+        /**
+          * Returns true if the rectangle intersects the given bounds.
+          */
+        intersects(otherBounds: Bounds): boolean;
+
+        /**
+          * Returns true if the bounds are properly initialized.
+          */
+        isValid(): boolean;
+
+        /**
+          * Returns the size of the given bounds.
+          */
+        getSize(): Point;
+
+        /**
+          * The top left corner of the rectangle.
+          */
+        min: Point;
+
+        /**
+          * The bottom right corner of the rectangle.
+          */
+        max: Point;
+    }
+}
+
+declare namespace L {
+
+    namespace Browser {
+
+        /**
+          * true for all Internet Explorer versions.
+          */
+        export var ie: boolean;
+
+        /**
+          * true for Internet Explorer 6.
+          */
+        export var ie6: boolean;
+
+        /**
+          * true for Internet Explorer 6.
+          */
+        export var ie7: boolean;
+
+        /**
+          * true for webkit-based browsers like Chrome and Safari (including mobile
+          * versions).
+          */
+        export var webkit: boolean;
+
+        /**
+          * true for webkit-based browsers that support CSS 3D transformations.
+          */
+        export var webkit3d: boolean;
+
+        /**
+          * true for Android mobile browser.
+          */
+        export var android: boolean;
+
+        /**
+          * true for old Android stock browsers (2 and 3).
+          */
+        export var android23: boolean;
+
+        /**
+          * true for modern mobile browsers (including iOS Safari and different Android
+          * browsers).
+          */
+        export var mobile: boolean;
+
+        /**
+          * true for mobile webkit-based browsers.
+          */
+        export var mobileWebkit: boolean;
+
+        /**
+          * true for mobile Opera.
+          */
+        export var mobileOpera: boolean;
+
+        /**
+          * true for all browsers on touch devices.
+          */
+        export var touch: boolean;
+
+        /**
+          * true for browsers with Microsoft touch model (e.g. IE10).
+          */
+        export var msTouch: boolean;
+
+        /**
+          * true for devices with Retina screens.
+          */
+        export var retina: boolean;
+
+    }
+}
+
+
+declare namespace L {
+
+    /**
+      * Instantiates a circle object given a geographical point, a radius in meters
+      * and optionally an options object.
+      */
+    function circle(latlng: LatLngExpression, radius: number, options?: PathOptions): Circle;
+
+    export interface CircleStatic extends ClassStatic {
+        /**
+          * Instantiates a circle object given a geographical point, a radius in meters
+          * and optionally an options object.
+          */
+        new(latlng: LatLngExpression, radius: number, options?: PathOptions): Circle;
+    }
+    export var Circle: CircleStatic;
+
+    export interface Circle extends Path {
+        /**
+          * Returns the current geographical position of the circle.
+          */
+        getLatLng(): LatLng;
+
+        /**
+          * Returns the current radius of a circle. Units are in meters.
+          */
+        getRadius(): number;
+
+        /**
+          * Sets the position of a circle to a new location.
+          */
+        setLatLng(latlng: LatLngExpression): Circle;
+
+        /**
+          * Sets the radius of a circle. Units are in meters.
+          */
+        setRadius(radius: number): Circle;
+
+        /**
+          * Returns a GeoJSON representation of the circle (GeoJSON Point Feature).
+          */
+        toGeoJSON(): any;
+
+    }
+}
+
+declare namespace L {
+
+    /**
+      * Instantiates a circle marker given a geographical point and optionally
+      * an options object. The default radius is 10 and can be altered by passing a
+      * "radius" member in the path options object.
+      */
+    function circleMarker(latlng: LatLngExpression, options?: PathOptions): CircleMarker;
+
+
+    export interface CircleMarkerStatic extends ClassStatic {
+        /**
+          * Instantiates a circle marker given a geographical point and optionally
+          * an options object. The default radius is 10 and can be altered by passing a
+          * "radius" member in the path options object.
+          */
+        new(latlng: LatLngExpression, options?: PathOptions): CircleMarker;
+    }
+    export var CircleMarker: CircleMarkerStatic;
+
+    export interface CircleMarker extends Circle {
+        /**
+          * Sets the position of a circle marker to a new location.
+          */
+        setLatLng(latlng: LatLngExpression): CircleMarker;
+
+        /**
+          * Sets the radius of a circle marker. Units are in pixels.
+          */
+        setRadius(radius: number): CircleMarker;
+
+        /**
+          * Returns a GeoJSON representation of the circle marker (GeoJSON Point Feature).
+          */
+        toGeoJSON(): any;
+    }
+}
+
+declare namespace L {
+    export interface ClassExtendOptions {
+        /**
+          * Your class's constructor function, meaning that it gets called when you do 'new MyClass(...)'.
+          */
+        initialize?: Function;
+
+        /**
+          * options is a special property that unlike other objects that you pass
+          * to extend will be merged with the parent one instead of overriding it
+          * completely, which makes managing configuration of objects and default
+          * values convenient.
+          */
+        options?: any;
+
+        /**
+          * includes is a special class property that merges all specified objects
+          * into the class (such objects are called mixins). A good example of this
+          * is L.Mixin.Events that event-related methods like on, off and fire
+          * to the class.
+          */
+        includes?: any;
+
+        /**
+          * statics is just a convenience property that injects specified object
+          * properties as the static properties of the class, useful for defining
+          * constants.
+          */
+        static?: any;
+
+        [prop: string]: any;
+    }
+
+    export interface ClassStatic {
+        /**
+          * You use L.Class.extend to define new classes, but you can use the
+          * same method on any class to inherit from it.
+          */
+        extend(options: ClassExtendOptions): any;
+        extend<Options, NewClass>(options: ClassExtendOptions): { new(options?: Options): NewClass };
+
+        /**
+          * You can also use the following shortcut when you just need to make
+          * one additional method call.
+          */
+        addInitHook(methodName: string, ...args: any[]): void;
+    }
+
+
+    /**
+      * L.Class powers the OOP facilities of Leaflet and is used to create
+      * almost all of the Leaflet classes documented.
+      */
+    namespace Class {
+        /**
+          * You use L.Class.extend to define new classes, but you can use the
+          * same method on any class to inherit from it.
+          */
+        function extend(options: ClassExtendOptions): any;
+    }
+
+}
+
+declare namespace L {
+    export interface ControlStatic extends ClassStatic {
+        /**
+          * Creates a control with the given options.
+          */
+        new(options?: ControlOptions): Control;
+
+        Zoom: Control.ZoomStatic;
+        Attribution: Control.AttributionStatic;
+        Layers: Control.LayersStatic;
+        Scale: Control.ScaleStatic;
+    }
+    export var Control: ControlStatic;
+
+    export interface Control extends IControl {
+        /**
+          * Sets the position of the control. See control positions.
+          */
+        setPosition(position: string): Control;
+
+        /**
+          * Returns the current position of the control.
+          */
+        getPosition(): string;
+
+        /**
+          * Adds the control to the map.
+          */
+        addTo(map: Map): Control;
+
+        /**
+          * Removes the control from the map.
+          */
+        removeFrom(map: Map): Control;
+
+        /**
+          * Returns the HTML container of the control.
+          */
+        getContainer(): HTMLElement;
+
+        // IControl members
+
+        /**
+          * Should contain code that creates all the neccessary DOM elements for the
+          * control, adds listeners on relevant map events, and returns the element
+          * containing the control. Called on map.addControl(control) or control.addTo(map).
+          */
+        onAdd(map: Map): HTMLElement;
+
+        /**
+          * Optional, should contain all clean up code (e.g. removes control's event
+          * listeners). Called on map.removeControl(control) or control.removeFrom(map).
+          * The control's DOM container is removed automatically.
+          */
+        onRemove(map: Map): void;
+    }
+
+    namespace Control {
+        export interface ZoomStatic extends ClassStatic {
+            /**
+              * Creates a zoom control.
+              */
+            new (options?: ZoomOptions): Zoom;
+        }
+
+        export interface Zoom extends L.Control {
+        }
+
+        export interface ZoomOptions {
+            /**
+              * The position of the control (one of the map corners).
+              * Can be 'topleft', 'topright', 'bottomleft', or 'bottomright'.
+              *
+              * Default value: 'topright'.
+              */
+            position?: string; // 'topleft' | 'topright' | 'bottomleft' | 'bottomright'
+
+            /**
+             * The text set on the zoom in button.
+             *
+             * Default value: '+'
+             */
+            zoomInText?: string;
+
+            /**
+             * The text set on the zoom out button.
+             *
+             * Default value: '-'
+             */
+            zoomOutText?: string;
+
+            /**
+             * The title set on the zoom in button.
+             *
+             * Default value: 'Zoom in'
+             */
+            zoomInTitle?: string;
+
+            /**
+             * The title set on the zoom out button.
+             *
+             * Default value: 'Zoom out'
+             */
+            zoomOutTitle?: string;
+        }
+
+        export interface AttributionStatic extends ClassStatic {
+            /**
+              * Creates an attribution control.
+              */
+            new(options?: AttributionOptions): Attribution;
+        }
+
+        export interface Attribution extends L.Control {
+            /**
+              * Sets the text before the attributions.
+              */
+            setPrefix(prefix: string): Attribution;
+
+            /**
+              * Adds an attribution text (e.g. 'Vector data &copy; CloudMade').
+              */
+            addAttribution(text: string): Attribution;
+
+            /**
+              * Removes an attribution text.
+              */
+            removeAttribution(text: string): Attribution;
+
+        }
+
+        export interface LayersStatic extends ClassStatic {
+            /**
+              * Creates an attribution control with the given layers. Base layers will be
+              * switched with radio buttons, while overlays will be switched with checkboxes.
+              */
+            new(baseLayers?: any, overlays?: any, options?: LayersOptions): Layers;
+        }
+
+        export interface Layers extends L.Control, IEventPowered<Layers> {
+            /**
+              * Adds a base layer (radio button entry) with the given name to the control.
+              */
+            addBaseLayer(layer: ILayer, name: string): Layers;
+
+            /**
+              * Adds an overlay (checkbox entry) with the given name to the control.
+              */
+            addOverlay(layer: ILayer, name: string): Layers;
+
+            /**
+              * Remove the given layer from the control.
+              */
+            removeLayer(layer: ILayer): Layers;
+
+            ////////////////
+            ////////////////
+            addEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): Layers;
+            addOneTimeEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): Layers;
+            removeEventListener(type: string, fn?: (e: LeafletEvent) => void, context?: any): Layers;
+            hasEventListeners(type: string): boolean;
+            fireEvent(type: string, data?: any): Layers;
+            on(type: string, fn: (e: LeafletEvent) => void, context?: any): Layers;
+            once(type: string, fn: (e: LeafletEvent) => void, context?: any): Layers;
+            off(type: string, fn?: (e: LeafletEvent) => void, context?: any): Layers;
+            fire(type: string, data?: any): Layers;
+            addEventListener(eventMap: any, context?: any): Layers;
+            removeEventListener(eventMap?: any, context?: any): Layers;
+            clearAllEventListeners(): Layers;
+            on(eventMap: any, context?: any): Layers;
+            off(eventMap?: any, context?: any): Layers;
+        }
+
+        export interface ScaleStatic extends ClassStatic {
+            /**
+              * Creates an scale control with the given options.
+              */
+            new(options?: ScaleOptions): Scale;
+        }
+
+        export interface Scale extends L.Control {
+        }
+    }
+
+    export interface control {
+        /**
+          * Creates a control with the given options.
+          */
+        (options?: ControlOptions): Control;
+    }
+
+    export namespace control {
+
+        /**
+          * Creates a zoom control.
+          */
+        export function zoom(options?: Control.ZoomOptions): L.Control.Zoom;
+
+        /**
+          * Creates an attribution control.
+          */
+        export function attribution(options?: AttributionOptions): L.Control.Attribution;
+
+        /**
+            * Creates an attribution control with the given layers. Base layers will be
+            * switched with radio buttons, while overlays will be switched with checkboxes.
+            */
+        export function layers(baseLayers?: any, overlays?: any, options?: LayersOptions): L.Control.Layers;
+
+        /**
+          * Creates an scale control with the given options.
+          */
+        export function scale(options?: ScaleOptions): L.Control.Scale;
+    }
+}
+
+declare namespace L {
+
+    export interface ControlOptions {
+
+        /**
+          * The initial position of the control (one of the map corners). See control
+          * positions.
+          * Default value: 'topright'.
+          */
+        position?: string;
+
+    }
+}
+
+declare namespace L {
+
+    namespace CRS {
+
+        /**
+          * The most common CRS for online maps, used by almost all free and commercial
+          * tile providers. Uses Spherical Mercator projection. Set in by default in
+          * Map's crs option.
+          */
+        export var EPSG3857: ICRS;
+
+        /**
+          * A common CRS among GIS enthusiasts. Uses simple Equirectangular projection.
+          */
+        export var EPSG4326: ICRS;
+
+        /**
+          * Rarely used by some commercial tile providers. Uses Elliptical Mercator
+          * projection.
+          */
+        export var EPSG3395: ICRS;
+
+        /**
+          * A simple CRS that maps longitude and latitude into x and y directly. May be
+          * used for maps of flat surfaces (e.g. game maps). Note that the y axis should
+          * still be inverted (going from bottom to top).
+          */
+        export var Simple: ICRS;
+
+    }
+}
+
+declare namespace L {
+
+    /**
+      * Creates a div icon instance with the given options.
+      */
+    function divIcon(options: DivIconOptions): DivIcon;
+
+    export interface DivIconStatic extends ClassStatic {
+        /**
+          * Creates a div icon instance with the given options.
+          */
+        new(options: DivIconOptions): DivIcon;
+    }
+    export var DivIcon: DivIconStatic;
+
+    export interface DivIcon extends Icon {
+    }
+}
+
+declare namespace L {
+
+    export interface DivIconOptions {
+
+        /**
+          * Size of the icon in pixels. Can be also set through CSS.
+          */
+        iconSize?: Point;
+
+        /**
+          * The coordinates of the "tip" of the icon (relative to its top left corner).
+          * The icon will be aligned so that this point is at the marker's geographical
+          * location. Centered by default if size is specified, also can be set in CSS
+          * with negative margins.
+          */
+        iconAnchor?: Point;
+
+        /**
+          * A custom class name to assign to the icon.
+          *
+          * Default value: 'leaflet-div-icon'.
+          */
+        className?: string;
+
+        /**
+          * A custom HTML code to put inside the div element.
+          *
+          * Default value: ''.
+          */
+        html?: string;
+
+    }
+}
+
+declare namespace L {
+
+    export interface DomEvent {
+
+        /**
+          * Adds a listener fn to the element's DOM event of the specified type. this keyword
+          * inside the listener will point to context, or to the element if not specified.
+          */
+        addListener(el: HTMLElement, type: string, fn: (e: Event) => void, context?: any): DomEvent;
+        on(el: HTMLElement, type: string, fn: (e: Event) => void, context?: any): DomEvent;
+
+        /**
+          * Removes an event listener from the element.
+          */
+        removeListener(el: HTMLElement, type: string, fn: (e: Event) => void, context?: any): DomEvent;
+        off(el: HTMLElement, type: string, fn: (e: Event) => void, context?: any): DomEvent;
+
+        /**
+          * Stop the given event from propagation to parent elements. Used inside the
+          * listener functions:
+          * L.DomEvent.addListener(div, 'click', function
+          * (e) {
+          * L.DomEvent.stopPropagation(e);
+          * });
+          */
+        stopPropagation(e: Event): DomEvent;
+
+        /**
+          * Prevents the default action of the event from happening (such as following
+          * a link in the href of the a element, or doing a POST request with page reload
+          * when form is submitted). Use it inside listener functions.
+          */
+        preventDefault(e: Event): DomEvent;
+
+        /**
+          * Does stopPropagation and preventDefault at the same time.
+          */
+        stop(e: Event): DomEvent;
+
+        /**
+          * Adds stopPropagation to the element's 'click', 'doubleclick', 'mousedown'
+          * and 'touchstart' events.
+          */
+        disableClickPropagation(el: HTMLElement): DomEvent;
+
+        /**
+          * Gets normalized mouse position from a DOM event relative to the container
+          * or to the whole page if not specified.
+          */
+        getMousePosition(e: Event, container?: HTMLElement): Point;
+
+        /**
+          * Gets normalized wheel delta from a mousewheel DOM event.
+          */
+        getWheelDelta(e: Event): number;
+
+    }
+
+    export var DomEvent: DomEvent;
+}
+
+declare namespace L {
+
+    namespace DomUtil {
+
+        /**
+          * Returns an element with the given id if a string was passed, or just returns
+          * the element if it was passed directly.
+          */
+        export function get(id: string): HTMLElement;
+
+        /**
+          * Returns the value for a certain style attribute on an element, including
+          * computed values or values set through CSS.
+          */
+        export function getStyle(el: HTMLElement, style: string): string;
+
+        /**
+          * Returns the offset to the viewport for the requested element.
+          */
+        export function getViewportOffset(el: HTMLElement): Point;
+
+        /**
+          * Creates an element with tagName, sets the className, and optionally appends
+          * it to container element.
+          */
+        export function create(tagName: string, className: string, container?: HTMLElement): HTMLElement;
+
+        /**
+          * Makes sure text cannot be selected, for example during dragging.
+          */
+        export function disableTextSelection(): void;
+
+        /**
+          * Makes text selection possible again.
+          */
+        export function enableTextSelection(): void;
+
+        /**
+          * Returns true if the element class attribute contains name.
+          */
+        export function hasClass(el: HTMLElement, name: string): boolean;
+
+        /**
+          * Adds name to the element's class attribute.
+          */
+        export function addClass(el: HTMLElement, name: string): void;
+
+        /**
+          * Removes name from the element's class attribute.
+          */
+        export function removeClass(el: HTMLElement, name: string): void;
+
+        /**
+          * Set the opacity of an element (including old IE support). Value must be from
+          * 0 to 1.
+          */
+        export function setOpacity(el: HTMLElement, value: number): void;
+
+        /**
+          * Goes through the array of style names and returns the first name that is a valid
+          * style name for an element. If no such name is found, it returns false. Useful
+          * for vendor-prefixed styles like transform.
+          */
+        export function testProp(props: string[]): any;
+
+        /**
+          * Returns a CSS transform string to move an element by the offset provided in
+          * the given point. Uses 3D translate on WebKit for hardware-accelerated transforms
+          * and 2D on other browsers.
+          */
+        export function getTranslateString(point: Point): string;
+
+        /**
+          * Returns a CSS transform string to scale an element (with the given scale origin).
+          */
+        export function getScaleString(scale: number, origin: Point): string;
+
+        /**
+          * Sets the position of an element to coordinates specified by point, using
+          * CSS translate or top/left positioning depending on the browser (used by
+          * Leaflet internally to position its layers). Forces top/left positioning
+          * if disable3D is true.
+          */
+        export function setPosition(el: HTMLElement, point: Point, disable3D?: boolean): void;
+
+        /**
+          * Returns the coordinates of an element previously positioned with setPosition.
+          */
+        export function getPosition(el: HTMLElement): Point;
+
+        /**
+          * Vendor-prefixed transition style name (e.g. 'webkitTransition' for WebKit).
+          */
+        export var TRANSITION: string;
+
+        /**
+          * Vendor-prefixed transform style name.
+          */
+        export var TRANSFORM: string;
+
+    }
+}
+
+declare namespace L {
+    export interface DraggableStatic extends ClassStatic {
+        /**
+          * Creates a Draggable object for moving the given element when you start dragging
+          * the dragHandle element (equals the element itself by default).
+          */
+        new(element: HTMLElement, dragHandle?: HTMLElement): Draggable;
+    }
+    export var Draggable: DraggableStatic;
+
+
+    export interface Draggable extends IEventPowered<Draggable> {
+        /**
+          * Enables the dragging ability.
+          */
+        enable(): void;
+
+        /**
+          * Disables the dragging ability.
+          */
+        disable(): void;
+
+        ////////////////
+        ////////////////
+        addEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): Draggable;
+        addOneTimeEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): Draggable;
+        removeEventListener(type: string, fn?: (e: LeafletEvent) => void, context?: any): Draggable;
+        hasEventListeners(type: string): boolean;
+        fireEvent(type: string, data?: any): Draggable;
+        on(type: string, fn: (e: LeafletEvent) => void, context?: any): Draggable;
+        once(type: string, fn: (e: LeafletEvent) => void, context?: any): Draggable;
+        off(type: string, fn?: (e: LeafletEvent) => void, context?: any): Draggable;
+        fire(type: string, data?: any): Draggable;
+        addEventListener(eventMap: any, context?: any): Draggable;
+        removeEventListener(eventMap?: any, context?: any): Draggable;
+        clearAllEventListeners(): Draggable;
+        on(eventMap: any, context?: any): Draggable;
+        off(eventMap?: any, context?: any): Draggable;
+    }
+}
+
+
+
+declare namespace L {
+
+    /**
+      * Create a layer group, optionally given an initial set of layers.
+      */
+    function featureGroup<T extends ILayer>(layers?: T[]): FeatureGroup<T>;
+
+
+    export interface FeatureGroupStatic extends ClassStatic {
+        /**
+          * Create a layer group, optionally given an initial set of layers.
+          */
+        new<T extends ILayer>(layers?: T[]): FeatureGroup<T>;
+    }
+    export var FeatureGroup: FeatureGroupStatic;
+
+    export interface FeatureGroup<T extends ILayer> extends LayerGroup<T>, ILayer, IEventPowered<FeatureGroup<T>> {
+        /**
+          * Binds a popup with a particular HTML content to a click on any layer from the
+          * group that has a bindPopup method.
+          */
+        bindPopup(htmlContent: string, options?: PopupOptions): FeatureGroup<T>;
+
+        /**
+          * Returns the LatLngBounds of the Feature Group (created from bounds and coordinates
+          * of its children).
+          */
+        getBounds(): LatLngBounds;
+
+        /**
+          * Sets the given path options to each layer of the group that has a setStyle method.
+          */
+        setStyle(style: PathOptions): FeatureGroup<T>;
+
+        /**
+          * Brings the layer group to the top of all other layers.
+          */
+        bringToFront(): FeatureGroup<T>;
+
+        /**
+          * Brings the layer group to the bottom of all other layers.
+          */
+        bringToBack(): FeatureGroup<T>;
+
+        ////////////
+        ////////////
+        /**
+          * Should contain code that creates DOM elements for the overlay, adds them
+          * to map panes where they should belong and puts listeners on relevant map events.
+          * Called on map.addLayer(layer).
+          */
+        onAdd(map: Map): void;
+
+        /**
+          * Should contain all clean up code that removes the overlay's elements from
+          * the DOM and removes listeners previously added in onAdd. Called on map.removeLayer(layer).
+          */
+        onRemove(map: Map): void;
+
+        ////////////////
+        ////////////////
+        addEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): FeatureGroup<T>;
+        addOneTimeEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): FeatureGroup<T>;
+        removeEventListener(type: string, fn?: (e: LeafletEvent) => void, context?: any): FeatureGroup<T>;
+        hasEventListeners(type: string): boolean;
+        fireEvent(type: string, data?: any): FeatureGroup<T>;
+        on(type: string, fn: (e: LeafletEvent) => void, context?: any): FeatureGroup<T>;
+        once(type: string, fn: (e: LeafletEvent) => void, context?: any): FeatureGroup<T>;
+        off(type: string, fn?: (e: LeafletEvent) => void, context?: any): FeatureGroup<T>;
+        fire(type: string, data?: any): FeatureGroup<T>;
+        addEventListener(eventMap: any, context?: any): FeatureGroup<T>;
+        removeEventListener(eventMap?: any, context?: any): FeatureGroup<T>;
+        clearAllEventListeners(): FeatureGroup<T>;
+        on(eventMap: any, context?: any): FeatureGroup<T>;
+        off(eventMap?: any, context?: any): FeatureGroup<T>;
+    }
+}
+
+declare namespace L {
+
+    /**
+      * Creates a GeoJSON layer. Optionally accepts an object in GeoJSON format
+      * to display on the map (you can alternatively add it later with addData method)
+      * and an options object.
+      */
+    function geoJson(geojson?: any, options?: GeoJSONOptions): GeoJSON;
+
+    export interface GeoJSONStatic extends ClassStatic {
+        /**
+          * Creates a GeoJSON layer. Optionally accepts an object in GeoJSON format
+          * to display on the map (you can alternatively add it later with addData method)
+          * and an options object.
+          */
+        new(geojson?: any, options?: GeoJSONOptions): GeoJSON;
+
+        /**
+          * Creates a layer from a given GeoJSON feature.
+          */
+        geometryToLayer(featureData: GeoJSON, pointToLayer?: (featureData: any, latlng: LatLng) => ILayer): ILayer;
+
+        /**
+          * Creates a LatLng object from an array of 2 numbers (latitude, longitude)
+          * used in GeoJSON for points. If reverse is set to true, the numbers will be interpreted
+          * as (longitude, latitude).
+          */
+        coordsToLatLng(coords: number[], reverse?: boolean): LatLng;
+
+        /**
+          * Creates a multidimensional array of LatLng objects from a GeoJSON coordinates
+          * array. levelsDeep specifies the nesting level (0 is for an array of points,
+          * 1 for an array of arrays of points, etc., 0 by default). If reverse is set to
+          * true, the numbers will be interpreted as (longitude, latitude).
+          */
+        coordsToLatLngs(coords: any[], levelsDeep?: number, reverse?: boolean): any[];
+    }
+    export var GeoJSON: GeoJSONStatic;
+
+    export interface GeoJSON extends FeatureGroup<ILayer> {
+        /**
+          * Adds a GeoJSON object to the layer.
+          */
+        addData(data: any): boolean;
+
+        /**
+          * Changes styles of GeoJSON vector layers with the given style function.
+          */
+        setStyle(style: (featureData: any) => any): GeoJSON;
+
+        /**
+          * Changes styles of GeoJSON vector layers with the given style options.
+          */
+        setStyle(style: PathOptions): GeoJSON;
+
+        /**
+          * Resets the the given vector layer's style to the original GeoJSON style,
+          * useful for resetting style after hover events.
+          */
+        resetStyle(layer: Path): GeoJSON;
+    }
+}
+
+declare namespace L {
+    export interface GeoJSONOptions {
+        /**
+          * Function that will be used for creating layers for GeoJSON points (if not
+          * specified, simple markers will be created).
+          */
+        pointToLayer?: (featureData: any, latlng: LatLng) => ILayer;
+
+        /**
+          * Function that will be used to get style options for vector layers created
+          * for GeoJSON features.
+          */
+        style?: (featureData: any) => any;
+
+        /**
+          * Function that will be called on each created feature layer. Useful for attaching
+          * events and popups to features.
+          */
+        onEachFeature?: (featureData: any, layer: ILayer) => void;
+
+        /**
+          * Function that will be used to decide whether to show a feature or not.
+          */
+        filter?: (featureData: any, layer: ILayer) => boolean;
+
+        /**
+          * Function that will be used for converting GeoJSON coordinates to LatLng points
+          * (if not specified, coords will be assumed to be WGS84 � standard[longitude, latitude]
+          * values in degrees).
+          */
+        coordsToLatLng?: (coords: any[]) => LatLng[];
+    }
+}
+
+
+
+
+declare namespace L {
+
+    /**
+      * Creates an icon instance with the given options.
+      */
+    function icon(options: IconOptions): Icon;
+
+    export interface IconStatic extends ClassStatic {
+        /**
+          * Creates an icon instance with the given options.
+          */
+        new(options: IconOptions): Icon;
+
+        Default: {
+            /**
+              * Creates a default icon instance with the given options.
+              */
+            new(options?: IconOptions): Icon.Default;
+
+            imagePath: string;
+        };
+    }
+    export var Icon: IconStatic;
+
+    export interface Icon {
+    }
+
+    namespace Icon {
+        /**
+          * L.Icon.Default extends L.Icon and is the blue icon Leaflet uses
+          * for markers by default.
+          */
+        export interface Default extends Icon {
+        }
+    }
+}
+
+declare namespace L {
+
+    export interface IconOptions {
+
+        /**
+          * (required) The URL to the icon image (absolute or relative to your script
+          * path).
+          */
+        iconUrl?: string;
+
+        /**
+          * The URL to a retina sized version of the icon image (absolute or relative to
+          * your script path). Used for Retina screen devices.
+          */
+        iconRetinaUrl?: string;
+
+        /**
+          * Size of the icon image in pixels.
+          */
+        iconSize?: Point|[number, number];
+
+        /**
+          * The coordinates of the "tip" of the icon (relative to its top left corner).
+          * The icon will be aligned so that this point is at the marker's geographical
+          * location. Centered by default if size is specified, also can be set in CSS
+          * with negative margins.
+          */
+        iconAnchor?: Point|[number, number];
+
+        /**
+          * The URL to the icon shadow image. If not specified, no shadow image will be
+          * created.
+          */
+        shadowUrl?: string;
+
+        /**
+          * The URL to the retina sized version of the icon shadow image. If not specified,
+          * no shadow image will be created. Used for Retina screen devices.
+          */
+        shadowRetinaUrl?: string;
+
+        /**
+          * Size of the shadow image in pixels.
+          */
+        shadowSize?: Point|[number, number];
+
+        /**
+          * The coordinates of the "tip" of the shadow (relative to its top left corner)
+          * (the same as iconAnchor if not specified).
+          */
+        shadowAnchor?: Point|[number, number];
+
+        /**
+          * The coordinates of the point from which popups will "open", relative to the
+          * icon anchor.
+          */
+        popupAnchor?: Point|[number, number];
+
+        /**
+          * A custom class name to assign to both icon and shadow images. Empty by default.
+          */
+        className?: string;
+    }
+}
+
+declare namespace L {
+
+    export interface IControl {
+
+        /**
+          * Should contain code that creates all the neccessary DOM elements for the
+          * control, adds listeners on relevant map events, and returns the element
+          * containing the control. Called on map.addControl(control) or control.addTo(map).
+          */
+        onAdd(map: Map): HTMLElement;
+
+        /**
+          * Optional, should contain all clean up code (e.g. removes control's event
+          * listeners). Called on map.removeControl(control) or control.removeFrom(map).
+          * The control's DOM container is removed automatically.
+          */
+        onRemove(map: Map): void;
+    }
+}
+
+declare namespace L {
+
+    export interface ICRS {
+
+        /**
+          * Projection that this CRS uses.
+          */
+        projection: IProjection;
+
+        /**
+          * Transformation that this CRS uses to turn projected coordinates into screen
+          * coordinates for a particular tile service.
+          */
+        transformation: Transformation;
+
+        /**
+          * Standard code name of the CRS passed into WMS services (e.g. 'EPSG:3857').
+          */
+        code: string;
+
+        /**
+          * Projects geographical coordinates on a given zoom into pixel coordinates.
+          */
+        latLngToPoint(latlng: LatLng, zoom: number): Point;
+
+        /**
+          * The inverse of latLngToPoint. Projects pixel coordinates on a given zoom
+          * into geographical coordinates.
+          */
+        pointToLatLng(point: Point, zoom: number): LatLng;
+
+        /**
+          * Projects geographical coordinates into coordinates in units accepted
+          * for this CRS (e.g. meters for EPSG:3857, for passing it to WMS services).
+          */
+        project(latlng: LatLng): Point;
+
+        /**
+          * Returns the scale used when transforming projected coordinates into pixel
+          * coordinates for a particular zoom. For example, it returns 256 * 2^zoom for
+          * Mercator-based CRS.
+          */
+        scale(zoom: number): number;
+
+        /**
+          * Returns the size of the world in pixels for a particular zoom.
+          */
+        getSize(zoom: number): Point;
+
+    }
+}
+
+declare namespace L {
+
+    export interface IEventPowered<T> {
+
+        /**
+          * Adds a listener function (fn) to a particular event type of the object. You
+          * can optionally specify the context of the listener (object the this keyword
+          * will point to). You can also pass several space-separated types (e.g. 'click
+          * dblclick').
+          */
+        addEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): T;
+
+        /**
+          * The same as above except the listener will only get fired once and then removed.
+          */
+        addOneTimeEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): T;
+        /**
+          * Adds a set of type/listener pairs, e.g. {click: onClick, mousemove: onMouseMove}
+          */
+        addEventListener(eventMap: any, context?: any): T;
+
+        /**
+          * Removes a previously added listener function. If no function is specified,
+          * it will remove all the listeners of that particular event from the object.
+          */
+        removeEventListener(type: string, fn?: (e: LeafletEvent) => void, context?: any): T;
+
+        /**
+          * Removes a set of type/listener pairs.
+          */
+        removeEventListener(eventMap?: any, context?: any): T;
+
+        /**
+          * Returns true if a particular event type has some listeners attached to it.
+          */
+        hasEventListeners(type: string): boolean;
+
+        /**
+          * Fires an event of the specified type. You can optionally provide an data object
+          * — the first argument of the listener function will contain its properties.
+          */
+        fireEvent(type: string, data?: any): T;
+
+        /**
+          * Removes all listeners to all events on the object.
+          */
+        clearAllEventListeners(): T;
+
+        /**
+          * Alias to addEventListener.
+          */
+        on(type: string, fn: (e: LeafletEvent) => void, context?: any): T;
+
+        /**
+          * Alias to addEventListener.
+          */
+        on(eventMap: any, context?: any): T;
+
+        /**
+          * Alias to addOneTimeEventListener.
+          */
+        once(type: string, fn: (e: LeafletEvent) => void, context?: any): T;
+
+        /**
+          * Alias to removeEventListener.
+          */
+        off(type: string, fn?: (e: LeafletEvent) => void, context?: any): T;
+
+        /**
+          * Alias to removeEventListener.
+          */
+        off(eventMap?: any, context?: any): T;
+
+        /**
+          * Alias to fireEvent.
+          */
+        fire(type: string, data?: any): T;
+    }
+}
+
+declare namespace L {
+
+    export interface IHandler {
+
+        /**
+          * Enables the handler.
+          */
+        enable(): void;
+
+        /**
+          * Disables the handler.
+          */
+        disable(): void;
+
+        /**
+          * Returns true if the handler is enabled.
+          */
+        enabled(): boolean;
+    }
+
+    export interface Handler {
+        initialize(map: Map): void;
+    }
+}
+
+declare namespace L {
+
+    export interface ILayer {
+
+        /**
+          * Should contain code that creates DOM elements for the overlay, adds them
+          * to map panes where they should belong and puts listeners on relevant map events.
+          * Called on map.addLayer(layer).
+          */
+        onAdd(map: Map): void;
+
+        /**
+          * Should contain all clean up code that removes the overlay's elements from
+          * the DOM and removes listeners previously added in onAdd. Called on map.removeLayer(layer).
+          */
+        onRemove(map: Map): void;
+    }
+}
+
+declare namespace L {
+    namespace Mixin {
+        export interface LeafletMixinEvents extends IEventPowered<LeafletMixinEvents> {
+        }
+
+        export var Events: LeafletMixinEvents;
+    }
+}
+
+declare namespace L {
+
+    /**
+      * Instantiates an image overlay object given the URL of the image and the geographical
+      * bounds it is tied to.
+      */
+    function imageOverlay(imageUrl: string, bounds: LatLngBounds, options?: ImageOverlayOptions): ImageOverlay;
+
+    export interface ImageOverlayStatic extends ClassStatic {
+        /**
+          * Instantiates an image overlay object given the URL of the image and the geographical
+          * bounds it is tied to.
+          */
+        new(imageUrl: string, bounds: LatLngBounds, options?: ImageOverlayOptions): ImageOverlay;
+    }
+    export var ImageOverlay: ImageOverlayStatic;
+
+    export interface ImageOverlay extends ILayer {
+        /**
+          * Adds the overlay to the map.
+          */
+        addTo(map: Map): ImageOverlay;
+
+        /**
+          * Sets the opacity of the overlay.
+          */
+        setOpacity(opacity: number): ImageOverlay;
+
+        /**
+          * Changes the URL of the image.
+          */
+        setUrl(imageUrl: string): ImageOverlay;
+
+        /**
+          * Brings the layer to the top of all overlays.
+          */
+        bringToFront(): ImageOverlay;
+
+        /**
+          * Brings the layer to the bottom of all overlays.
+          */
+        bringToBack(): ImageOverlay;
+
+        ////////////
+        ////////////
+        /**
+          * Should contain code that creates DOM elements for the overlay, adds them
+          * to map panes where they should belong and puts listeners on relevant map events.
+          * Called on map.addLayer(layer).
+          */
+        onAdd(map: Map): void;
+
+        /**
+          * Should contain all clean up code that removes the overlay's elements from
+          * the DOM and removes listeners previously added in onAdd. Called on map.removeLayer(layer).
+          */
+        onRemove(map: Map): void;
+    }
+}
+
+declare namespace L {
+
+    export interface ImageOverlayOptions {
+
+        /**
+          * The opacity of the image overlay.
+          */
+        opacity?: number;
+    }
+}
+
+declare namespace L {
+
+    export interface IProjection {
+
+        /**
+          * Projects geographical coordinates into a 2D point.
+          */
+        project(latlng: LatLng): Point;
+
+        /**
+          * The inverse of project. Projects a 2D point into geographical location.
+          */
+        unproject(point: Point): LatLng;
+    }
+}
+
+declare namespace L {
+
+    /**
+    * A constant that represents the Leaflet version in use.
+    */
+    export var version: string;
+
+    /**
+    * This method restores the L global variale to the original value it had
+    * before Leaflet inclusion, and returns the real Leaflet namespace.
+    */
+    export function noConflict(): typeof L;
+}
+
+declare namespace L {
+    /**
+      * Creates an object representing a geographical point with the given latitude
+      * and longitude.
+      */
+    function latLng(latitude: number, longitude: number): LatLng;
+
+    /**
+      * Creates an object representing a geographical point with the given latitude
+      * and longitude.
+      */
+    function latLng(coords: LatLngExpression): LatLng;
+
+    export interface LatLngStatic {
+        /**
+          * Creates an object representing a geographical point with the given latitude
+          * and longitude.
+          */
+        new(latitude: number, longitude: number): LatLng;
+
+        /**
+          * Creates an object representing a geographical point with the given latitude
+          * and longitude.
+          */
+        new(coords: LatLngExpression): LatLng;
+
+        /**
+          * A multiplier for converting degrees into radians.
+          *
+          * Value: Math.PI / 180.
+          */
+        DEG_TO_RAD: number;
+
+        /**
+          * A multiplier for converting radians into degrees.
+          *
+          * Value: 180 / Math.PI.
+          */
+        RAD_TO_DEG: number;
+
+        /**
+          * Max margin of error for the equality check.
+          *
+          * Value: 1.0E-9.
+          */
+        MAX_MARGIN: number;
+    }
+    export var LatLng: LatLngStatic;
+
+    export interface LatLng {
+        /**
+          * Returns the distance (in meters) to the given LatLng calculated using the
+          * Haversine formula. See description on wikipedia
+          */
+        distanceTo(otherLatlng: LatLngExpression): number;
+
+        /**
+          * Returns true if the given LatLng point is at the same position (within a small
+          * margin of error).
+          */
+        equals(otherLatlng: LatLngExpression): boolean;
+
+        /**
+          * Returns a string representation of the point (for debugging purposes).
+          */
+        toString(): string;
+
+        /**
+          * Returns a new LatLng object with the longitude wrapped around left and right
+          * boundaries (-180 to 180 by default).
+          */
+        wrap(left: number, right: number): LatLng;
+
+        /**
+          * Latitude in degrees.
+          */
+        lat: number;
+
+        /**
+          * Longitude in degrees.
+          */
+        lng: number;
+    }
+}
+
+declare namespace L {
+
+    /**
+      * Creates a LatLngBounds object by defining south-west and north-east corners
+      * of the rectangle.
+      */
+    function latLngBounds(southWest: LatLngExpression, northEast: LatLngExpression): LatLngBounds;
+
+    /**
+      * Creates a LatLngBounds object defined by the geographical points it contains.
+      * Very useful for zooming the map to fit a particular set of locations with fitBounds.
+      */
+    function latLngBounds(latlngs: LatLngBoundsExpression): LatLngBounds;
+
+    export interface LatLngBoundsStatic {
+        /**
+          * Creates a LatLngBounds object by defining south-west and north-east corners
+          * of the rectangle.
+          */
+        new(southWest: LatLngExpression, northEast: LatLngExpression): LatLngBounds;
+
+        /**
+          * Creates a LatLngBounds object defined by the geographical points it contains.
+          * Very useful for zooming the map to fit a particular set of locations with fitBounds.
+          */
+        new(latlngs: LatLngBoundsExpression): LatLngBounds;
+    }
+    export var LatLngBounds: LatLngBoundsStatic;
+
+    export interface LatLngBounds {
+        /**
+          * Extends the bounds to contain the given point.
+          */
+        extend(latlng: LatLngExpression): LatLngBounds;
+
+        /**
+          * Extends the bounds to contain the given bounds.
+          */
+        extend(latlng: LatLngBoundsExpression): LatLngBounds;
+
+        /**
+          * Returns the south-west point of the bounds.
+          */
+        getSouthWest(): LatLng;
+
+        /**
+          * Returns the north-east point of the bounds.
+          */
+        getNorthEast(): LatLng;
+
+        /**
+          * Returns the north-west point of the bounds.
+          */
+        getNorthWest(): LatLng;
+
+        /**
+          * Returns the south-east point of the bounds.
+          */
+        getSouthEast(): LatLng;
+
+      	/**
+          * Returns the west longitude in degrees of the bounds.
+          */
+	getWest(): number;
+
+        /**
+          * Returns the east longitude in degrees of the bounds.
+          */
+	getEast(): number;
+
+        /**
+          * Returns the north latitude in degrees of the bounds.
+          */
+	getNorth(): number;
+
+        /**
+          * Returns the south latitude in degrees of the bounds.
+          */
+	getSouth(): number;
+
+        /**
+          * Returns the center point of the bounds.
+          */
+        getCenter(): LatLng;
+
+        /**
+          * Returns true if the rectangle contains the given one.
+          */
+        contains(otherBounds: LatLngBoundsExpression): boolean;
+
+        /**
+          * Returns true if the rectangle contains the given point.
+          */
+        contains(latlng: LatLngExpression): boolean;
+
+        /**
+          * Returns true if the rectangle intersects the given bounds.
+          */
+        intersects(otherBounds: LatLngBoundsExpression): boolean;
+
+        /**
+          * Returns true if the rectangle is equivalent (within a small margin of error)
+          * to the given bounds.
+          */
+        equals(otherBounds: LatLngBoundsExpression): boolean;
+
+        /**
+          * Returns a string with bounding box coordinates in a 'southwest_lng,southwest_lat,northeast_lng,northeast_lat'
+          * format. Useful for sending requests to web services that return geo data.
+          */
+        toBBoxString(): string;
+
+        /**
+          * Returns bigger bounds created by extending the current bounds by a given
+          * percentage in each direction.
+          */
+        pad(bufferRatio: number): LatLngBounds;
+
+        /**
+          * Returns true if the bounds are properly initialized.
+          */
+        isValid(): boolean;
+
+    }
+}
+
+declare namespace L {
+
+    /**
+      * Create a layer group, optionally given an initial set of layers.
+      */
+    function layerGroup<T extends ILayer>(layers?: T[]): LayerGroup<T>;
+
+
+    export interface LayerGroupStatic extends ClassStatic {
+        /**
+          * Create a layer group, optionally given an initial set of layers.
+          */
+        new<T extends ILayer>(layers?: T[]): LayerGroup<T>;
+    }
+    export var LayerGroup: LayerGroupStatic;
+
+    export interface LayerGroup<T extends ILayer> extends ILayer {
+        /**
+          * Adds the group of layers to the map.
+          */
+        addTo(map: Map): LayerGroup<T>;
+
+        /**
+          * Adds a given layer to the group.
+          */
+        addLayer(layer: T): LayerGroup<T>;
+
+        /**
+          * Removes a given layer from the group.
+          */
+        removeLayer(layer: T): LayerGroup<T>;
+
+        /**
+          * Removes a given layer of the given id from the group.
+          */
+        removeLayer(id: string): LayerGroup<T>;
+
+        /**
+          * Returns true if the given layer is currently added to the group.
+          */
+        hasLayer(layer: T): boolean;
+
+        /**
+          * Returns the layer with the given id.
+          */
+        getLayer(id: string): T;
+
+        /**
+          * Returns an array of all the layers added to the group.
+          */
+        getLayers(): T[];
+
+        /**
+          * Removes all the layers from the group.
+          */
+        clearLayers(): LayerGroup<T>;
+
+        /**
+          * Iterates over the layers of the group, optionally specifying context of
+          * the iterator function.
+          */
+        eachLayer(fn: (layer: T) => void, context?: any): LayerGroup<T>;
+
+        /**
+          * Returns a GeoJSON representation of the layer group (GeoJSON FeatureCollection).
+          */
+        toGeoJSON(): any;
+
+        ////////////
+        ////////////
+        /**
+          * Should contain code that creates DOM elements for the overlay, adds them
+          * to map panes where they should belong and puts listeners on relevant map events.
+          * Called on map.addLayer(layer).
+          */
+        onAdd(map: Map): void;
+
+        /**
+          * Should contain all clean up code that removes the overlay's elements from
+          * the DOM and removes listeners previously added in onAdd. Called on map.removeLayer(layer).
+          */
+        onRemove(map: Map): void;
+    }
+}
+
+
+declare namespace L {
+
+    export interface LayersOptions {
+
+        /**
+          * The position of the control (one of the map corners). See control positions.
+          *
+          * Default value: 'topright'.
+          */
+        position?: string;
+
+        /**
+          * If true, the control will be collapsed into an icon and expanded on mouse hover
+          * or touch.
+          *
+          * Default value: true.
+          */
+        collapsed?: boolean;
+
+        /**
+          * If true, the control will assign zIndexes in increasing order to all of its
+          * layers so that the order is preserved when switching them on/off.
+          *
+          * Default value: true.
+          */
+        autoZIndex?: boolean;
+
+    }
+}
+
+declare namespace L {
+
+    export interface LeafletErrorEvent extends LeafletEvent {
+
+        /**
+          * Error message.
+          */
+        message: string;
+
+        /**
+          * Error code (if applicable).
+          */
+        code: number;
+    }
+}
+
+declare namespace L {
+
+    export interface LeafletEvent {
+
+        /**
+          * The event type (e.g. 'click').
+          */
+        type: string;
+
+        /**
+          * The object that fired the event.
+          */
+        target: any;
+    }
+}
+
+declare namespace L {
+
+    export interface LeafletGeoJSONEvent extends LeafletEvent {
+
+        /**
+          * The layer for the GeoJSON feature that is being added to the map.
+          */
+        layer: ILayer;
+
+        /**
+          * GeoJSON properties of the feature.
+          */
+        properties: any;
+
+        /**
+          * GeoJSON geometry type of the feature.
+          */
+        geometryType: string;
+
+        /**
+          * GeoJSON ID of the feature (if present).
+          */
+        id: string;
+    }
+}
+
+declare namespace L {
+
+    export interface LeafletLayerEvent extends LeafletEvent {
+
+        /**
+          * The layer that was added or removed.
+          */
+        layer: ILayer;
+    }
+}
+
+declare namespace L {
+
+    export interface LeafletLayersControlEvent extends LeafletEvent {
+
+        /**
+          * The layer that was added or removed.
+          */
+        layer: ILayer;
+
+        /**
+          * The name of the layer that was added or removed.
+          */
+        name: string;
+    }
+}
+
+declare namespace L {
+
+    export interface LeafletLocationEvent extends LeafletEvent {
+
+        /**
+          * Detected geographical location of the user.
+          */
+        latlng: LatLng;
+
+        /**
+          * Geographical bounds of the area user is located in (with respect to the accuracy
+          * of location).
+          */
+        bounds: LatLngBounds;
+
+        /**
+          * Accuracy of location in meters.
+          */
+        accuracy: number;
+
+        /**
+          * Height of the position above the WGS84 ellipsoid in meters.
+          */
+        altitude: number;
+
+        /**
+          * Accuracy of altitude in meters.
+          */
+        altitudeAccuracy: number;
+
+        /**
+          * The direction of travel in degrees counting clockwise from true North.
+          */
+        heading: number;
+
+        /**
+          * Current velocity in meters per second.
+          */
+        speed: number;
+
+        /**
+          * The time when the position was acquired.
+          */
+        timestamp: number;
+
+    }
+}
+
+declare namespace L {
+
+    export interface LeafletMouseEvent extends LeafletEvent {
+
+        /**
+          * The geographical point where the mouse event occured.
+          */
+        latlng: LatLng;
+
+        /**
+          * Pixel coordinates of the point where the mouse event occured relative to
+          * the map layer.
+          */
+        layerPoint: Point;
+
+        /**
+          * Pixel coordinates of the point where the mouse event occured relative to
+          * the map сontainer.
+          */
+        containerPoint: Point;
+
+        /**
+          * The original DOM mouse event fired by the browser.
+          */
+        originalEvent: MouseEvent;
+    }
+}
+
+declare namespace L {
+
+    export interface LeafletPopupEvent extends LeafletEvent {
+
+        /**
+          * The popup that was opened or closed.
+          */
+        popup: Popup;
+    }
+}
+
+declare namespace L {
+
+    export interface LeafletDragEndEvent extends LeafletEvent {
+
+        /**
+          * The distance in pixels the draggable element was moved by.
+          */
+        distance: number;
+    }
+}
+
+declare namespace L {
+
+    export interface LeafletResizeEvent extends LeafletEvent {
+
+        /**
+          * The old size before resize event.
+          */
+        oldSize: Point;
+
+        /**
+          * The new size after the resize event.
+          */
+        newSize: Point;
+    }
+}
+
+declare namespace L {
+
+    export interface LeafletTileEvent extends LeafletEvent {
+
+        /**
+          * The tile element (image).
+          */
+        tile: HTMLElement;
+
+        /**
+          * The source URL of the tile.
+          */
+        url: string;
+    }
+}
+
+declare namespace L {
+
+    namespace LineUtil {
+
+        /**
+          * Dramatically reduces the number of points in a polyline while retaining
+          * its shape and returns a new array of simplified points. Used for a huge performance
+          * boost when processing/displaying Leaflet polylines for each zoom level
+          * and also reducing visual noise. tolerance affects the amount of simplification
+          * (lesser value means higher quality but slower and with more points). Also
+          * released as a separated micro-library Simplify.js.
+          */
+        export function simplify(points: Point[], tolerance: number): Point[];
+
+        /**
+          * Returns the distance between point p and segment p1 to p2.
+          */
+        export function pointToSegmentDistance(p: Point, p1: Point, p2: Point): number;
+
+        /**
+          * Returns the closest point from a point p on a segment p1 to p2.
+          */
+        export function closestPointOnSegment(p: Point, p1: Point, p2: Point): Point;
+
+        /**
+          * Clips the segment a to b by rectangular bounds. Used by Leaflet to only show 
+          * polyline points that are on the screen or near, increasing performance. Returns
+          * either false or a length-2 array of clipped points.
+          */
+        export function clipSegment(a: Point, b: Point, bounds: Bounds): Point[] | boolean;
+
+    }
+}
+
+declare namespace L {
+
+    export interface LocateOptions {
+
+        /**
+          * If true, starts continous watching of location changes (instead of detecting
+          * it once) using W3C watchPosition method. You can later stop watching using
+          * map.stopLocate() method.
+          *
+          * Default value: false.
+          */
+        watch?: boolean;
+
+        /**
+          * If true, automatically sets the map view to the user location with respect
+          * to detection accuracy, or to world view if geolocation failed.
+          *
+          * Default value: false.
+          */
+        setView?: boolean;
+
+        /**
+          * The maximum zoom for automatic view setting when using `setView` option.
+          *
+          * Default value: Infinity.
+          */
+        maxZoom?: number;
+
+        /**
+          * Number of millisecond to wait for a response from geolocation before firing
+          * a locationerror event.
+          *
+          * Default value: 10000.
+          */
+        timeout?: number;
+
+        /**
+          * Maximum age of detected location. If less than this amount of milliseconds
+          * passed since last geolocation response, locate will return a cached location.
+          *
+          * Default value: 0.
+          */
+        maximumAge?: number;
+
+        /**
+          * Enables high accuracy, see description in the W3C spec.
+          *
+          * Default value: false.
+          */
+        enableHighAccuracy?: boolean;
+    }
+}
+
+declare namespace L {
+
+    /**
+      * Instantiates a map object given a div element and optionally an
+      * object literal with map options described below.
+      */
+    function map(id: HTMLElement, options?: Map.MapOptions): Map;
+
+    /**
+      * Instantiates a map object given a div element id and optionally an
+      * object literal with map options described below.
+      */
+    function map(id: string, options?: Map.MapOptions): Map;
+
+
+    export interface MapStatic extends ClassStatic {
+        /**
+          * Instantiates a map object given a div element and optionally an
+          * object literal with map options described below.
+          *
+          * @constructor
+          */
+        new(id: HTMLElement, options?: Map.MapOptions): Map;
+
+        /**
+          * Instantiates a map object given a div element id and optionally an
+          * object literal with map options described below.
+          *
+          * @constructor
+          */
+        new(id: string, options?: Map.MapOptions): Map;
+    }
+    export var Map: MapStatic;
+
+    export interface Map extends IEventPowered<Map> {
+        // Methods for Modifying Map State
+
+        /**
+          * Sets the view of the map (geographical center and zoom) with the given
+          * animation options.
+          */
+        setView(center: LatLngExpression, zoom?: number, options?: Map.ZoomPanOptions): Map;
+
+        /**
+          * Sets the zoom of the map.
+          */
+        setZoom(zoom: number, options?: Map.ZoomPanOptions): Map;
+
+        /**
+          * Increases the zoom of the map by delta (1 by default).
+          */
+        zoomIn(delta?: number, options?: Map.ZoomPanOptions): Map;
+
+        /**
+          * Decreases the zoom of the map by delta (1 by default).
+          */
+        zoomOut(delta?: number, options?: Map.ZoomPanOptions): Map;
+
+        /**
+          * Zooms the map while keeping a specified point on the map stationary
+          * (e.g. used internally for scroll zoom and double-click zoom).
+          */
+        setZoomAround(latlng: LatLngExpression, zoom: number, options?: Map.ZoomPanOptions): Map;
+
+        /**
+          * Sets a map view that contains the given geographical bounds with the maximum
+          * zoom level possible.
+          */
+        fitBounds(bounds: LatLngBounds, options?: Map.FitBoundsOptions): Map;
+
+        /**
+          * Sets a map view that mostly contains the whole world with the maximum zoom
+          * level possible.
+          */
+        fitWorld(options?: Map.FitBoundsOptions): Map;
+
+        /**
+          * Pans the map to a given center. Makes an animated pan if new center is not more
+          * than one screen away from the current one.
+          */
+        panTo(latlng: LatLngExpression, options?: PanOptions): Map;
+
+        /**
+          * Pans the map to the closest view that would lie inside the given bounds (if
+          * it's not already).
+          */
+        panInsideBounds(bounds: LatLngBounds): Map;
+
+        /**
+          * Pans the map by a given number of pixels (animated).
+          */
+        panBy(point: Point, options?: PanOptions): Map;
+
+        /**
+          * Checks if the map container size changed and updates the map if so — call it
+          * after you've changed the map size dynamically, also animating pan by default.
+          * If options.pan is false, panning will not occur.
+          */
+        invalidateSize(options: Map.ZoomPanOptions): Map;
+
+        /**
+          * Checks if the map container size changed and updates the map if so — call it
+          * after you've changed the map size dynamically, also animating pan by default.
+          */
+        invalidateSize(animate: boolean): Map;
+
+        /**
+          * Restricts the map view to the given bounds (see map maxBounds option),
+          * passing the given animation options through to `setView`, if required.
+          */
+        setMaxBounds(bounds: LatLngBounds, options?: Map.ZoomPanOptions): Map;
+
+        /**
+          * Tries to locate the user using Geolocation API, firing locationfound event
+          * with location data on success or locationerror event on failure, and optionally
+          * sets the map view to the user location with respect to detection accuracy
+          * (or to the world view if geolocation failed). See Locate options for more
+          * details.
+          */
+        locate(options?: LocateOptions): Map;
+
+        /**
+          * Stops watching location previously initiated by map.locate({watch: true})
+          * and aborts resetting the map view if map.locate was called with {setView: true}.
+          */
+        stopLocate(): Map;
+
+        /**
+          * Destroys the map and clears all related event listeners.
+          */
+        remove(): Map;
+
+        // Methods for Getting Map State
+
+        /**
+          * Returns the geographical center of the map view.
+          */
+        getCenter(): LatLng;
+
+        /**
+          * Returns the current zoom of the map view.
+          */
+        getZoom(): number;
+
+        /**
+          * Returns the minimum zoom level of the map.
+          */
+        getMinZoom(): number;
+
+        /**
+          * Returns the maximum zoom level of the map.
+          */
+        getMaxZoom(): number;
+
+        /**
+          * Returns the LatLngBounds of the current map view.
+          */
+        getBounds(): LatLngBounds;
+
+        /**
+          * Returns the maximum zoom level on which the given bounds fit to the map view
+          * in its entirety. If inside (optional) is set to true, the method instead returns
+          * the minimum zoom level on which the map view fits into the given bounds in its
+          * entirety.
+          */
+        getBoundsZoom(bounds: LatLngBounds, inside?: boolean): number;
+
+        /**
+          * Returns the current size of the map container.
+          */
+        getSize(): Point;
+
+        /**
+          * Returns the bounds of the current map view in projected pixel coordinates
+          * (sometimes useful in layer and overlay implementations).
+          */
+        getPixelBounds(): Bounds;
+
+        /**
+          * Returns the projected pixel coordinates of the top left point of the map layer
+          * (useful in custom layer and overlay implementations).
+          */
+        getPixelOrigin(): Point;
+
+        // Methods for Layers and Controls
+
+        /**
+          * Adds the given layer to the map. If optional insertAtTheBottom is set to true,
+          * the layer is inserted under all others (useful when switching base tile layers).
+          */
+        addLayer(layer: ILayer, insertAtTheBottom?: boolean): Map;
+
+        /**
+          * Removes the given layer from the map.
+          */
+        removeLayer(layer: ILayer): Map;
+
+        /**
+          * Returns true if the given layer is currently added to the map.
+          */
+        hasLayer(layer: ILayer): boolean;
+
+        /**
+          * Opens the specified popup while closing the previously opened (to make sure
+          * only one is opened at one time for usability).
+          */
+        openPopup(popup: Popup): Map;
+
+        /**
+          * Creates a popup with the specified options and opens it in the given point
+          * on a map.
+          */
+        openPopup(html: string, latlng: LatLngExpression, options?: PopupOptions): Map;
+
+        /**
+          * Creates a popup with the specified options and opens it in the given point
+          * on a map.
+          */
+        openPopup(el: HTMLElement, latlng: LatLngExpression, options?: PopupOptions): Map;
+
+        /**
+          * Closes the popup previously opened with openPopup (or the given one).
+          */
+        closePopup(popup?: Popup): Map;
+
+        /**
+          * Adds the given control to the map.
+          */
+        addControl(control: IControl): Map;
+
+        /**
+          * Removes the given control from the map.
+          */
+        removeControl(control: IControl): Map;
+
+        // Conversion Methods
+
+        /**
+          * Returns the map layer point that corresponds to the given geographical coordinates
+          * (useful for placing overlays on the map).
+          */
+        latLngToLayerPoint(latlng: LatLngExpression): Point;
+
+        /**
+          * Returns the geographical coordinates of a given map layer point.
+          */
+        layerPointToLatLng(point: Point): LatLng;
+
+        /**
+          * Converts the point relative to the map container to a point relative to the
+          * map layer.
+          */
+        containerPointToLayerPoint(point: Point): Point;
+
+        /**
+          * Converts the point relative to the map layer to a point relative to the map
+          * container.
+          */
+        layerPointToContainerPoint(point: Point): Point;
+
+        /**
+          * Returns the map container point that corresponds to the given geographical
+          * coordinates.
+          */
+        latLngToContainerPoint(latlng: LatLngExpression): Point;
+
+        /**
+          * Returns the geographical coordinates of a given map container point.
+          */
+        containerPointToLatLng(point: Point): LatLng;
+
+        /**
+          * Projects the given geographical coordinates to absolute pixel coordinates
+          * for the given zoom level (current zoom level by default).
+          */
+        project(latlng: LatLngExpression, zoom?: number): Point;
+
+        /**
+          * Projects the given absolute pixel coordinates to geographical coordinates
+          * for the given zoom level (current zoom level by default).
+          */
+        unproject(point: Point, zoom?: number): LatLng;
+
+        /**
+          * Returns the pixel coordinates of a mouse click (relative to the top left corner
+          * of the map) given its event object.
+          */
+        mouseEventToContainerPoint(event: LeafletMouseEvent): Point;
+
+        /**
+          * Returns the pixel coordinates of a mouse click relative to the map layer given
+          * its event object.
+          */
+        mouseEventToLayerPoint(event: LeafletMouseEvent): Point;
+
+        /**
+          * Returns the geographical coordinates of the point the mouse clicked on given
+          * the click's event object.
+          */
+        mouseEventToLatLng(event: LeafletMouseEvent): LatLng;
+
+        // Other Methods
+
+        /**
+          * Returns the container element of the map.
+          */
+        getContainer(): HTMLElement;
+
+        /**
+          * Returns an object with different map panes (to render overlays in).
+          */
+        getPanes(): MapPanes;
+
+        // REVIEW: Should we make it more flexible declaring parameter 'fn' as Function?
+        /**
+          * Runs the given callback when the map gets initialized with a place and zoom,
+          * or immediately if it happened already, optionally passing a function context.
+          */
+        whenReady(fn: (map: Map) => void, context?: any): Map;
+
+        // Properties
+
+        /**
+          * Map dragging handler (by both mouse and touch).
+          */
+        dragging: IHandler;
+
+        /**
+          * Touch zoom handler.
+          */
+        touchZoom: IHandler;
+
+        /**
+          * Double click zoom handler.
+          */
+        doubleClickZoom: IHandler;
+
+        /**
+          * Scroll wheel zoom handler.
+          */
+        scrollWheelZoom: IHandler;
+
+        /**
+          * Box (shift-drag with mouse) zoom handler.
+          */
+        boxZoom: IHandler;
+
+        /**
+          * Keyboard navigation handler.
+          */
+        keyboard: IHandler;
+
+        /**
+          * Mobile touch hacks (quick tap and touch hold) handler.
+          */
+        tap: IHandler;
+
+        /**
+          * Zoom control.
+          */
+        zoomControl: Control.Zoom;
+
+        /**
+          * Attribution control.
+          */
+        attributionControl: Control.Attribution;
+
+        /**
+          * Map state options
+          */
+        options: Map.MapOptions;
+
+        /**
+          * Iterates over the layers of the map, optionally specifying context
+		  * of the iterator function.
+          */
+        eachLayer(fn: (layer: ILayer) => void, context?: any): Map;
+
+        ////////////////
+        ////////////////
+        addEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): Map;
+        addOneTimeEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): Map;
+        removeEventListener(type: string, fn?: (e: LeafletEvent) => void, context?: any): Map;
+        hasEventListeners(type: string): boolean;
+        fireEvent(type: string, data?: any): Map;
+        on(type: string, fn: (e: LeafletEvent) => void, context?: any): Map;
+        once(type: string, fn: (e: LeafletEvent) => void, context?: any): Map;
+        off(type: string, fn?: (e: LeafletEvent) => void, context?: any): Map;
+        fire(type: string, data?: any): Map;addEventListener(eventMap: any, context?: any): Map;
+        removeEventListener(eventMap?: any, context?: any): Map;
+        clearAllEventListeners(): Map;
+        on(eventMap: any, context?: any): Map;
+        off(eventMap?: any, context?: any): Map;
+    }
+}
+
+declare namespace L.Map {
+
+    export interface MapOptions {
+
+        // Map State Options
+
+        /**
+          * Initial geographical center of the map.
+          */
+        center?: LatLng;
+
+        /**
+          * Initial map zoom.
+          */
+        zoom?: number;
+
+        /**
+          * Layers that will be added to the map initially.
+          */
+        layers?: ILayer[];
+
+        /**
+          * Minimum zoom level of the map. Overrides any minZoom set on map layers.
+          */
+        minZoom?: number;
+
+        /**
+          * Maximum zoom level of the map. This overrides any maxZoom set on map layers.
+          */
+        maxZoom?: number;
+
+        /**
+          * When this option is set, the map restricts the view to the given geographical
+          * bounds, bouncing the user back when he tries to pan outside the view, and also
+          * not allowing to zoom out to a view that's larger than the given bounds (depending
+          * on the map size). To set the restriction dynamically, use setMaxBounds method
+          */
+        maxBounds?: LatLngBounds;
+
+        /**
+          * Coordinate Reference System to use. Don't change this if you're not sure
+          * what it means.
+          *
+          * Default value: L.CRS.EPSG3857.
+          */
+        crs?: ICRS;
+
+        // Interaction Options
+
+        /**
+          * Whether the map be draggable with mouse/touch or not.
+          *
+          * Default value: true.
+          */
+        dragging?: boolean;
+
+        /**
+          * Whether the map can be zoomed by touch-dragging with two fingers.
+          *
+          * Default value: true.
+          */
+        touchZoom?: boolean;
+
+        /**
+          * Whether the map can be zoomed by using the mouse wheel.
+          * If passed 'center', it will zoom to the center of the view regardless of
+          * where the mouse was.
+          *
+          * Default value: true.
+          */
+        scrollWheelZoom?: boolean;
+
+        /**
+          * Whether the map can be zoomed in by double clicking on it and zoomed out
+          * by double clicking while holding shift.
+          * If passed 'center', double-click zoom will zoom to the center of the view
+          * regardless of where the mouse was.
+          *
+          * Default value: true.
+          */
+        doubleClickZoom?: boolean;
+
+        /**
+          * Whether the map can be zoomed to a rectangular area specified by dragging
+          * the mouse while pressing shift.
+          *
+          * Default value: true.
+          */
+        boxZoom?: boolean;
+
+        /**
+          * Enables mobile hacks for supporting instant taps (fixing 200ms click delay
+          * on iOS/Android) and touch holds (fired as contextmenu events).
+          *
+          * Default value: true.
+          */
+        tap?: boolean;
+
+        /**
+          * The max number of pixels a user can shift his finger during touch for it
+          * to be considered a valid tap.
+          *
+          * Default value: 15.
+          */
+        tapTolerance?: number;
+
+        /**
+          * Whether the map automatically handles browser window resize to update itself.
+          *
+          * Default value: true.
+          */
+        trackResize?: boolean;
+
+        /**
+          * With this option enabled, the map tracks when you pan to another "copy" of
+          * the world and seamlessly jumps to the original one so that all overlays like
+          * markers and vector layers are still visible.
+          *
+          * Default value: false.
+          */
+        worldCopyJump?: boolean;
+
+        /**
+          * Set it to false if you don't want popups to close when user clicks the map.
+          *
+          * Default value: true.
+          */
+        closePopupOnClick?: boolean;
+
+        // Keyboard Navigation Options
+
+        /**
+          * Makes the map focusable and allows users to navigate the map with keyboard
+          * arrows and +/- keys.
+          *
+          * Default value: true.
+          */
+        keyboard?: boolean;
+
+        /**
+          * Amount of pixels to pan when pressing an arrow key.
+          *
+          * Default value: 80.
+          */
+        keyboardPanOffset?: number;
+
+        /**
+          * Number of zoom levels to change when pressing + or - key.
+          *
+          * Default value: 1.
+          */
+        keyboardZoomOffset?: number;
+
+        // Panning Inertia Options
+
+        /**
+          * If enabled, panning of the map will have an inertia effect where the map builds
+          * momentum while dragging and continues moving in the same direction for some
+          * time. Feels especially nice on touch devices.
+          *
+          * Default value: true.
+          */
+        inertia?: boolean;
+
+        /**
+          * The rate with which the inertial movement slows down, in pixels/second2.
+          *
+          * Default value: 3000.
+          */
+        inertiaDeceleration?: number;
+
+        /**
+          * Max speed of the inertial movement, in pixels/second.
+          *
+          * Default value: 1500.
+          */
+        inertiaMaxSpeed?: number;
+
+        /**
+          * Amount of milliseconds that should pass between stopping the movement and
+          * releasing the mouse or touch to prevent inertial movement.
+          *
+          * Default value: 32 for touch devices and 14 for the rest.
+          */
+        inertiaThreshold?: number;
+
+        // Control options
+
+        /**
+          * Whether the zoom control is added to the map by default.
+          *
+          * Default value: true.
+          */
+        zoomControl?: boolean;
+
+        /**
+          * Whether the attribution control is added to the map by default.
+          *
+          * Default value: true.
+          */
+        attributionControl?: boolean;
+
+        // Animation options
+
+        /**
+          * Whether the tile fade animation is enabled. By default it's enabled in all
+          * browsers that support CSS3 Transitions except Android.
+          */
+        fadeAnimation?: boolean;
+
+        /**
+          * Whether the tile zoom animation is enabled. By default it's enabled in all
+          * browsers that support CSS3 Transitions except Android.
+          */
+        zoomAnimation?: boolean;
+
+        /**
+          * Won't animate zoom if the zoom difference exceeds this value.
+          *
+          * Default value: 4.
+          */
+        zoomAnimationThreshold?: number;
+
+        /**
+          * Whether markers animate their zoom with the zoom animation, if disabled
+          * they will disappear for the length of the animation. By default it's enabled
+          * in all browsers that support CSS3 Transitions except Android.
+          */
+        markerZoomAnimation?: boolean;
+
+        /**
+         * Set it to false if you don't want the map to zoom beyond min/max zoom
+         * and then bounce back when pinch-zooming.
+         *
+         * Default value: true.
+         */
+        bounceAtZoomLimits?: boolean;
+    }
+
+    export interface ZoomOptions {
+        /**
+          * If not specified, zoom animation will happen if the zoom origin is inside the current view.
+          * If true, the map will attempt animating zoom disregarding where zoom origin is.
+          * Setting false will make it always reset the view completely without animation.
+          */
+        animate?: boolean;
+    }
+
+    export interface ZoomPanOptions {
+
+        /**
+          * If true, the map view will be completely reset (without any animations).
+          *
+          * Default value: false.
+          */
+        reset?: boolean;
+
+        /**
+          * Sets the options for the panning (without the zoom change) if it occurs.
+          */
+        pan?: PanOptions;
+
+        /**
+          * Sets the options for the zoom change if it occurs.
+          */
+        zoom?: ZoomOptions;
+
+        /**
+          * An equivalent of passing animate to both zoom and pan options (see below).
+          */
+        animate?: boolean;
+
+        /**
+         * If true, it will delay moveend event so that it doesn't happen many times in a row.
+         */
+        debounceMoveend?: boolean;
+    }
+
+    export interface FitBoundsOptions extends ZoomPanOptions {
+
+        /**
+          * Sets the amount of padding in the top left corner of a map container that
+          * shouldn't be accounted for when setting the view to fit bounds. Useful if
+          * you have some control overlays on the map like a sidebar and you don't
+          * want them to obscure objects you're zooming to.
+          *
+          * Default value: [0, 0].
+          */
+        paddingTopLeft?: Point;
+
+        /**
+          * The same for bottom right corner of the map.
+          *
+          * Default value: [0, 0].
+          */
+        paddingBottomRight?: Point;
+
+        /**
+          * Equivalent of setting both top left and bottom right padding to the same value.
+          *
+          * Default value: [0, 0].
+          */
+        padding?: Point;
+
+        /**
+          * The maximum possible zoom to use.
+          *
+          * Default value: null
+          */
+        maxZoom?: number;
+    }
+}
+
+declare namespace L {
+
+    export interface MapPanes {
+
+        /**
+          * Pane that contains all other map panes.
+          */
+        mapPane: HTMLElement;
+
+        /**
+          * Pane for tile layers.
+          */
+        tilePane: HTMLElement;
+
+        /**
+          * Pane that contains all the panes except tile pane.
+          */
+        objectsPane: HTMLElement;
+
+        /**
+          * Pane for overlay shadows (e.g. marker shadows).
+          */
+        shadowPane: HTMLElement;
+
+        /**
+          * Pane for overlays like polylines and polygons.
+          */
+        overlayPane: HTMLElement;
+
+        /**
+          * Pane for marker icons.
+          */
+        markerPane: HTMLElement;
+
+        /**
+          * Pane for popups.
+          */
+        popupPane: HTMLElement;
+    }
+}
+
+declare namespace L {
+
+    /**
+      * Instantiates a Marker object given a geographical point and optionally
+      * an options object.
+      */
+    function marker(latlng: LatLngExpression, options?: MarkerOptions): Marker;
+
+    var Marker: {
+        /**
+          * Instantiates a Marker object given a geographical point and optionally
+          * an options object.
+          */
+        new(latlng: LatLngExpression, options?: MarkerOptions): Marker;
+    };
+
+    export interface Marker extends ILayer, IEventPowered<Marker> {
+        /**
+          * Adds the marker to the map.
+          */
+        addTo(map: Map): Marker;
+
+        /**
+          * Returns the current geographical position of the marker.
+          */
+        getLatLng(): LatLng;
+
+        /**
+          * Changes the marker position to the given point.
+          */
+        setLatLng(latlng: LatLngExpression): Marker;
+
+        /**
+          * Changes the marker icon.
+          */
+        setIcon(icon: Icon): Marker;
+
+        /**
+          * Changes the zIndex offset of the marker.
+          */
+        setZIndexOffset(offset: number): Marker;
+
+        /**
+          * Changes the opacity of the marker.
+          */
+        setOpacity(opacity: number): Marker;
+
+        /**
+          * Updates the marker position, useful if coordinates of its latLng object
+          * were changed directly.
+          */
+        update(): Marker;
+
+        /**
+          * Binds a popup with a particular HTML content to a click on this marker. You
+          * can also open the bound popup with the Marker openPopup method.
+          */
+        bindPopup(html: string, options?: PopupOptions): Marker;
+
+        /**
+          * Binds a popup with a particular HTML content to a click on this marker. You
+          * can also open the bound popup with the Marker openPopup method.
+          */
+        bindPopup(el: HTMLElement, options?: PopupOptions): Marker;
+
+        /**
+          * Binds a popup with a particular HTML content to a click on this marker. You
+          * can also open the bound popup with the Marker openPopup method.
+          */
+        bindPopup(popup: Popup, options?: PopupOptions): Marker;
+
+        /**
+          * Unbinds the popup previously bound to the marker with bindPopup.
+          */
+        unbindPopup(): Marker;
+
+        /**
+          * Opens the popup previously bound by the bindPopup method.
+          */
+        openPopup(): Marker;
+
+        /**
+         * Returns the popup previously bound by the bindPopup method.
+         */
+        getPopup(): Popup;
+
+        /**
+          * Closes the bound popup of the marker if it's opened.
+          */
+        closePopup(): Marker;
+
+        /**
+          * Toggles the popup previously bound by the bindPopup method.
+          */
+        togglePopup(): Marker;
+
+        /**
+          * Sets an HTML content of the popup of this marker.
+          */
+        setPopupContent(html: string, options?: PopupOptions): Marker;
+
+        /**
+          * Sets an HTML content of the popup of this marker.
+          */
+        setPopupContent(el: HTMLElement, options?: PopupOptions): Marker;
+
+        /**
+          * Returns a GeoJSON representation of the marker (GeoJSON Point Feature).
+          */
+        toGeoJSON(): any;
+
+        /**
+          * Marker dragging handler (by both mouse and touch).
+          */
+        dragging: IHandler;
+
+        ////////////
+        ////////////
+        /**
+          * Should contain code that creates DOM elements for the overlay, adds them
+          * to map panes where they should belong and puts listeners on relevant map events.
+          * Called on map.addLayer(layer).
+          */
+        onAdd(map: Map): void;
+
+        /**
+          * Should contain all clean up code that removes the overlay's elements from
+          * the DOM and removes listeners previously added in onAdd. Called on map.removeLayer(layer).
+          */
+        onRemove(map: Map): void;
+
+        ////////////////
+        ////////////////
+        addEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): Marker;
+        addOneTimeEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): Marker;
+        removeEventListener(type: string, fn?: (e: LeafletEvent) => void, context?: any): Marker;
+        hasEventListeners(type: string): boolean;
+        fireEvent(type: string, data?: any): Marker;
+        on(type: string, fn: (e: LeafletEvent) => void, context?: any): Marker;
+        once(type: string, fn: (e: LeafletEvent) => void, context?: any): Marker;
+        off(type: string, fn?: (e: LeafletEvent) => void, context?: any): Marker;
+        fire(type: string, data?: any): Marker;
+        addEventListener(eventMap: any, context?: any): Marker;
+        removeEventListener(eventMap?: any, context?: any): Marker;
+        clearAllEventListeners(): Marker;
+        on(eventMap: any, context?: any): Marker;
+        off(eventMap?: any, context?: any): Marker;
+    }
+}
+
+declare namespace L {
+
+    export interface MarkerOptions {
+
+        /**
+          * Icon class to use for rendering the marker. See Icon documentation for details
+          * on how to customize the marker icon.
+          *
+          * Default value: new L.Icon.Default().
+          */
+        icon?: Icon;
+
+        /**
+          * If false, the marker will not emit mouse events and will act as a part of the
+          * underlying map.
+          *
+          * Default value: true.
+          */
+        clickable?: boolean;
+
+        /**
+          * Whether the marker is draggable with mouse/touch or not.
+          *
+          * Default value: false.
+          */
+        draggable?: boolean;
+
+        /**
+          * Whether the marker can be tabbed to with a keyboard and clicked by pressing enter.
+          *
+          * Default value: true.
+          */
+        keyboard?: boolean;
+
+        /**
+          * Text for the browser tooltip that appear on marker hover (no tooltip by default).
+          *
+          * Default value: ''.
+          */
+        title?: string;
+
+        /**
+          * Text for the alt attribute of the icon image (useful for accessibility).
+          *
+          * Default value: ''.
+          */
+        alt?: string;
+
+        /**
+          * By default, marker images zIndex is set automatically based on its latitude.
+          * You this option if you want to put the marker on top of all others (or below),
+          * specifying a high value like 1000 (or high negative value, respectively).
+          *
+          * Default value: 0.
+          */
+        zIndexOffset?: number;
+
+        /**
+          * The opacity of the marker.
+          *
+          * Default value: 1.0.
+          */
+        opacity?: number;
+
+        /**
+          * If true, the marker will get on top of others when you hover the mouse over it.
+          *
+          * Default value: false.
+          */
+        riseOnHover?: boolean;
+
+        /**
+          * The z-index offset used for the riseOnHover feature.
+          *
+          * Default value: 250.
+          */
+        riseOffset?: number;
+    }
+}
+
+declare namespace L {
+
+    /**
+      * Instantiates a multi-polyline object given an array of latlngs arrays (one
+      * for each individual polygon) and optionally an options object (the same
+      * as for MultiPolyline).
+      */
+    function multiPolygon(latlngs: LatLng[][], options?: PolylineOptions): MultiPolygon;
+
+    export interface MultiPolygonStatic extends ClassStatic {
+        /**
+          * Instantiates a multi-polyline object given an array of latlngs arrays (one
+          * for each individual polygon) and optionally an options object (the same
+          * as for MultiPolyline).
+          */
+        new(latlngs: LatLng[][], options?: PolylineOptions): MultiPolygon;
+    }
+    export var MultiPolygon: MultiPolygonStatic;
+
+    export interface MultiPolygon extends FeatureGroup<Polygon> {
+        /**
+          * Replace all polygons and their paths with the given array of arrays
+          * of geographical points.
+          */
+        setLatLngs(latlngs: LatLng[][]): MultiPolygon;
+
+        /**
+          * Returns an array of arrays of geographical points in each polygon.
+          */
+        getLatLngs(): LatLng[][];
+
+        /**
+         * Opens the popup previously bound by bindPopup.
+         */
+        openPopup(): MultiPolygon;
+
+        /**
+          * Returns a GeoJSON representation of the multipolygon (GeoJSON MultiPolygon Feature).
+          */
+        toGeoJSON(): any;
+    }
+}
+
+declare namespace L {
+
+    /**
+      * Instantiates a multi-polyline object given an array of arrays of geographical
+      * points (one for each individual polyline) and optionally an options object.
+      */
+    function multiPolyline(latlngs: LatLng[][], options?: PolylineOptions): MultiPolyline;
+
+    export interface MultiPolylineStatic extends ClassStatic {
+        /**
+          * Instantiates a multi-polyline object given an array of arrays of geographical
+          * points (one for each individual polyline) and optionally an options object.
+          */
+        new(latlngs: LatLng[][], options?: PolylineOptions): MultiPolyline;
+    }
+    export var MultiPolyline: MultiPolylineStatic;
+
+    export interface MultiPolyline extends FeatureGroup<Polyline> {
+        /**
+          * Replace all polygons and their paths with the given array of arrays
+          * of geographical points.
+          */
+        setLatLngs(latlngs: LatLng[][]): MultiPolyline;
+
+        /**
+          * Returns an array of arrays of geographical points in each polygon.
+          */
+        getLatLngs(): LatLng[][];
+
+        /**
+         * Opens the popup previously bound by bindPopup.
+         */
+        openPopup(): MultiPolyline;
+
+        /**
+          * Returns a GeoJSON representation of the multipolyline (GeoJSON MultiLineString Feature).
+          */
+        toGeoJSON(): any;
+    }
+}
+
+declare namespace L {
+
+    export interface PanOptions {
+
+        /**
+          * If true, panning will always be animated if possible. If false, it will not
+          * animate panning, either resetting the map view if panning more than a screen
+          * away, or just setting a new offset for the map pane (except for `panBy`
+          * which always does the latter).
+          */
+        animate?: boolean;
+
+        /**
+          * Duration of animated panning.
+          *
+          * Default value: 0.25.
+          */
+        duration?: number;
+
+        /**
+          * The curvature factor of panning animation easing (third parameter of the Cubic
+          * Bezier curve). 1.0 means linear animation, the less the more bowed the curve.
+          *
+          * Default value: 0.25.
+          */
+        easeLinearity?: number;
+
+        /**
+          * If true, panning won't fire movestart event on start (used internally for panning inertia).
+          *
+          * Default value: false.
+          */
+        noMoveStart?: boolean;
+    }
+}
+
+declare namespace L {
+
+    export interface Path extends ILayer, IEventPowered<Path> {
+
+        /**
+          * Adds the layer to the map.
+          */
+        addTo(map: Map): Path;
+
+        /**
+          * Binds a popup with a particular HTML content to a click on this path.
+          */
+        bindPopup(html: string, options?: PopupOptions): Path;
+
+        /**
+          * Binds a popup with a particular HTML content to a click on this path.
+          */
+        bindPopup(el: HTMLElement, options?: PopupOptions): Path;
+
+        /**
+          * Binds a popup with a particular HTML content to a click on this path.
+          */
+        bindPopup(popup: Popup, options?: PopupOptions): Path;
+
+        /**
+          * Unbinds the popup previously bound to the path with bindPopup.
+          */
+        unbindPopup(): Path;
+
+        /**
+          * Opens the popup previously bound by the bindPopup method in the given point,
+          * or in one of the path's points if not specified.
+          */
+        openPopup(latlng?: LatLngExpression): Path;
+
+        /**
+          * Closes the path's bound popup if it is opened.
+          */
+        closePopup(): Path;
+
+        /**
+          * Changes the appearance of a Path based on the options in the Path options object.
+          */
+        setStyle(object: PathOptions): Path;
+
+        /**
+          * Returns the LatLngBounds of the path.
+          */
+        getBounds(): LatLngBounds;
+
+        /**
+          * Brings the layer to the top of all path layers.
+          */
+        bringToFront(): Path;
+
+        /**
+          * Brings the layer to the bottom of all path layers.
+          */
+        bringToBack(): Path;
+
+        /**
+          * Redraws the layer. Sometimes useful after you changed the coordinates that
+          * the path uses.
+          */
+        redraw(): Path;
+        ////////////
+        ////////////
+        /**
+          * Should contain code that creates DOM elements for the overlay, adds them
+          * to map panes where they should belong and puts listeners on relevant map events.
+          * Called on map.addLayer(layer).
+          */
+        onAdd(map: Map): void;
+
+        /**
+          * Should contain all clean up code that removes the overlay's elements from
+          * the DOM and removes listeners previously added in onAdd. Called on map.removeLayer(layer).
+          */
+        onRemove(map: Map): void;
+
+        ////////////////
+        ////////////////
+        addEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): Path;
+        addOneTimeEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): Path;
+        removeEventListener(type: string, fn?: (e: LeafletEvent) => void, context?: any): Path;
+        hasEventListeners(type: string): boolean;
+        fireEvent(type: string, data?: any): Path;
+        on(type: string, fn: (e: LeafletEvent) => void, context?: any): Path;
+        once(type: string, fn: (e: LeafletEvent) => void, context?: any): Path;
+        off(type: string, fn?: (e: LeafletEvent) => void, context?: any): Path;
+        fire(type: string, data?: any): Path;
+        addEventListener(eventMap: any, context?: any): Path;
+        removeEventListener(eventMap?: any, context?: any): Path;
+        clearAllEventListeners(): Path;
+        on(eventMap: any, context?: any): Path;
+        off(eventMap?: any, context?: any): Path;
+    }
+
+    export namespace Path {
+        /**
+          * True if SVG is used for vector rendering (true for most modern browsers).
+          */
+        export var SVG: boolean;
+
+        /**
+          * True if VML is used for vector rendering (IE 6-8).
+          */
+        export var VML: boolean;
+
+        /**
+          * True if Canvas is used for vector rendering (Android 2). You can also force
+          * this by setting global variable L_PREFER_CANVAS to true before the Leaflet
+          * include on your page — sometimes it can increase performance dramatically
+          * when rendering thousands of circle markers, but currently suffers from
+          * a bug that causes removing such layers to be extremely slow.
+          */
+        export var CANVAS: boolean;
+
+        /**
+          * How much to extend the clip area around the map view (relative to its size,
+          * e.g. 0.5 is half the screen in each direction). Smaller values mean that you
+          * will see clipped ends of paths while you're dragging the map, and bigger values
+          * decrease drawing performance.
+          */
+        export var CLIP_PADDING: number;
+    }
+}
+
+declare namespace L {
+
+    export interface PathOptions {
+
+        /**
+          * Whether to draw stroke along the path. Set it to false to disable borders on
+          * polygons or circles.
+          *
+          * Default value: true.
+          */
+        stroke?: boolean;
+
+        /**
+          * Stroke color.
+          *
+          * Default value: '#03f'.
+          */
+        color?: string;
+
+        /**
+          * Stroke width in pixels.
+          *
+          * Default value: 5.
+          */
+        weight?: number;
+
+        /**
+          * Stroke opacity.
+          *
+          * Default value: 0.5.
+          */
+        opacity?: number;
+
+        /**
+          * Whether to fill the path with color. Set it to false to disable filling on polygons
+          * or circles.
+          */
+        fill?: boolean;
+
+        /**
+          * Fill color.
+          *
+          * Default value: same as color.
+          */
+        fillColor?: string;
+
+        /**
+          * Fill opacity.
+          *
+          * Default value: 0.2.
+          */
+        fillOpacity?: number;
+
+        /**
+          * A string that defines the stroke dash pattern. Doesn't work on canvas-powered
+          * layers (e.g. Android 2).
+          */
+        dashArray?: string;
+
+        /**
+          * A string that defines shape to be used at the end of the stroke.
+          *
+          * Default: null.
+          */
+        lineCap?: string;
+
+        /**
+          * A string that defines shape to be used at the corners of the stroke.
+          *
+          * Default: null.
+          */
+        lineJoin?: string;
+
+        /**
+          * If false, the vector will not emit mouse events and will act as a part of the
+          * underlying map.
+          *
+          * Default value: true.
+          */
+        clickable?: boolean;
+
+        /**
+          * Sets the pointer-events attribute on the path if SVG backend is used.
+          */
+        pointerEvents?: string;
+
+        /**
+          * Custom class name set on an element.
+          *
+          * Default value: ''.
+          */
+        className?: string;
+
+	/**
+	 * Sets the radius of a circle marker. 
+	 */
+	radius?: number;
+
+    }
+}
+
+declare namespace L {
+
+    /**
+      * Creates a Point object with the given x and y coordinates. If optional round
+      * is set to true, rounds the x and y values.
+      */
+    function point(x: number, y: number, round?: boolean): Point;
+
+    export interface PointStatic {
+        /**
+          * Creates a Point object with the given x and y coordinates. If optional round
+          * is set to true, rounds the x and y values.
+          */
+        new(x: number, y: number, round?: boolean): Point;
+    }
+    export var Point: PointStatic;
+
+    export interface Point {
+        /**
+          * Returns the result of addition of the current and the given points.
+          */
+        add(otherPoint: Point): Point;
+
+        /**
+          * Returns the result of subtraction of the given point from the current.
+          */
+        subtract(otherPoint: Point): Point;
+
+        /**
+          * Returns the result of multiplication of the current point by the given number.
+          */
+        multiplyBy(number: number): Point;
+
+        /**
+          * Returns the result of division of the current point by the given number. If
+          * optional round is set to true, returns a rounded result.
+          */
+        divideBy(number: number, round?: boolean): Point;
+
+        /**
+          * Returns the distance between the current and the given points.
+          */
+        distanceTo(otherPoint: Point): number;
+
+        /**
+          * Returns a copy of the current point.
+          */
+        clone(): Point;
+
+        /**
+          * Returns a copy of the current point with rounded coordinates.
+          */
+        round(): Point;
+
+        /**
+          * Returns true if the given point has the same coordinates.
+          */
+        equals(otherPoint: Point): boolean;
+
+        /**
+          * Returns a string representation of the point for debugging purposes.
+          */
+        toString(): string;
+
+        /**
+          * The x coordinate.
+          */
+        x: number;
+
+        /**
+          * The y coordinate.
+          */
+        y: number;
+    }
+}
+
+declare namespace L {
+
+    /**
+      * Instantiates a polygon object given an array of geographical points and
+      * optionally an options object (the same as for Polyline). You can also create
+      * a polygon with holes by passing an array of arrays of latlngs, with the first
+      * latlngs array representing the exterior ring while the remaining represent
+      * the holes inside.
+      */
+    function polygon(latlngs: LatLngBoundsExpression, options?: PolylineOptions): Polygon;
+
+
+    export interface PolygonStatic extends ClassStatic {
+        /**
+          * Instantiates a polygon object given an array of geographical points and
+          * optionally an options object (the same as for Polyline). You can also create
+          * a polygon with holes by passing an array of arrays of latlngs, with the first
+          * latlngs array representing the exterior ring while the remaining represent
+          * the holes inside.
+          */
+        new(latlngs: LatLngBoundsExpression, options?: PolylineOptions): Polygon;
+    }
+    export var Polygon: PolygonStatic;
+
+    export interface Polygon extends Polyline {
+    }
+}
+
+declare namespace L {
+
+    /**
+      * Instantiates a polyline object given an array of geographical points and
+      * optionally an options object.
+      */
+    function polyline(latlngs: LatLngBoundsExpression, options?: PolylineOptions): Polyline;
+
+    export interface PolylineStatic extends ClassStatic {
+        /**
+          * Instantiates a polyline object given an array of geographical points and
+          * optionally an options object.
+          */
+        new(latlngs: LatLngBoundsExpression, options?: PolylineOptions): Polyline;
+    }
+    export var Polyline: PolylineStatic;
+
+    export interface Polyline extends Path {
+        /**
+          * Adds a given point to the polyline.
+          */
+        addLatLng(latlng: LatLngExpression): Polyline;
+
+        /**
+          * Replaces all the points in the polyline with the given array of geographical
+          * points.
+          */
+        setLatLngs(latlngs: LatLngBoundsExpression): Polyline;
+
+        /**
+          * Returns an array of the points in the path.
+          */
+        getLatLngs(): LatLng[];
+
+        /**
+          * Allows adding, removing or replacing points in the polyline. Syntax is the
+          * same as in Array#splice. Returns the array of removed points (if any).
+          */
+        spliceLatLngs(index: number, pointsToRemove: number, ...latlngs: LatLng[]): LatLng[];
+
+        /**
+          * Returns the LatLngBounds of the polyline.
+          */
+        getBounds(): LatLngBounds;
+
+        /**
+          * Returns a GeoJSON representation of the polyline (GeoJSON LineString Feature).
+          */
+        toGeoJSON(): any;
+    }
+}
+
+declare namespace L {
+
+    export interface PolylineOptions extends PathOptions {
+
+        /**
+          * How much to simplify the polyline on each zoom level. More means better performance
+          * and smoother look, and less means more accurate representation.
+          *
+          * Default value: 1.0.
+          */
+        smoothFactor?: number;
+
+        /**
+          * Disabled polyline clipping.
+          *
+          * Default value: false.
+          */
+        noClip?: boolean;
+    }
+}
+
+declare namespace L {
+
+    namespace PolyUtil {
+
+        /**
+          * Clips the polygon geometry defined by the given points by rectangular bounds.
+          * Used by Leaflet to only show polygon points that are on the screen or near,
+          * increasing performance. Note that polygon points needs different algorithm
+          * for clipping than polyline, so there's a seperate method for it.
+          */
+        export function clipPolygon(points: Point[], bounds: Bounds): Point[];
+    }
+}
+
+declare namespace L {
+
+    /**
+      * Instantiates a Popup object given an optional options object that describes
+      * its appearance and location and an optional object that is used to tag the
+      * popup with a reference to the source object to which it refers.
+      */
+    function popup(options?: PopupOptions, source?: any): Popup;
+
+    export interface PopupStatic extends ClassStatic {
+        /**
+          * Instantiates a Popup object given an optional options object that describes
+          * its appearance and location and an optional object that is used to tag the
+          * popup with a reference to the source object to which it refers.
+          */
+        new(options?: PopupOptions, source?: any): Popup;
+    }
+    export var Popup: PopupStatic;
+
+    export interface Popup extends ILayer {
+        /**
+          * Adds the popup to the map.
+          */
+        addTo(map: Map): Popup;
+
+        /**
+          * Adds the popup to the map and closes the previous one. The same as map.openPopup(popup).
+          */
+        openOn(map: Map): Popup;
+
+        /**
+          * Sets the geographical point where the popup will open.
+          */
+        setLatLng(latlng: LatLngExpression): Popup;
+
+        /**
+          * Returns the geographical point of popup.
+          */
+        getLatLng(): LatLng;
+
+        /**
+          * Sets the HTML content of the popup.
+          */
+        setContent(html: string): Popup;
+
+        /**
+          * Sets the HTML content of the popup.
+          */
+        setContent(el: HTMLElement): Popup;
+
+        /**
+          * Returns the content of the popup.
+          */
+        getContent(): HTMLElement;
+        //getContent(): string;
+
+        ////////////
+        ////////////
+        /**
+          * Should contain code that creates DOM elements for the overlay, adds them
+          * to map panes where they should belong and puts listeners on relevant map events.
+          * Called on map.addLayer(layer).
+          */
+        onAdd(map: Map): void;
+
+        /**
+          * Should contain all clean up code that removes the overlay's elements from
+          * the DOM and removes listeners previously added in onAdd. Called on map.removeLayer(layer).
+          */
+        onRemove(map: Map): void;
+
+        /**
+          * Updates the popup content, layout and position. Useful for updating the popup after
+          * something inside changed, e.g. image loaded.
+          */
+        update(): Popup;
+    }
+}
+
+declare namespace L {
+
+    export interface PopupOptions {
+
+        /**
+          * Max width of the popup.
+          *
+          * Default value: 300.
+          */
+        maxWidth?: number;
+
+        /**
+          * Min width of the popup.
+          *
+          * Default value: 50.
+          */
+        minWidth?: number;
+
+        /**
+          * If set, creates a scrollable container of the given height inside a popup
+          * if its content exceeds it.
+          */
+        maxHeight?: number;
+
+        /**
+          * Set it to false if you don't want the map to do panning animation to fit the opened
+          * popup.
+          *
+          * Default value: true.
+          */
+        autoPan?: boolean;
+
+        /**
+          * Set it to true if you want to prevent users from panning the popup off of the screen while it is open.
+          */
+        keepInView?: boolean;
+
+        /**
+          * Controls the presense of a close button in the popup.
+          *
+          * Default value: true.
+          */
+        closeButton?: boolean;
+
+        /**
+          * The offset of the popup position. Useful to control the anchor of the popup
+          * when opening it on some overlays.
+          *
+          * Default value: new Point(0, 6).
+          */
+        offset?: Point;
+
+        /**
+          * The margin between the popup and the top left corner of the map view after
+          * autopanning was performed.
+          *
+          * Default value: null.
+          */
+        autoPanPaddingTopLeft?: Point;
+
+        /**
+          * The margin between the popup and the bottom right corner of the map view after
+          * autopanning was performed.
+          *
+          * Default value: null.
+          */
+        autoPanPaddingBottomRight?: Point;
+
+        /**
+          * The margin between the popup and the edges of the map view after autopanning
+          * was performed.
+          *
+          * Default value: new Point(5, 5).
+          */
+        autoPanPadding?: Point;
+
+        /**
+          * Whether to animate the popup on zoom. Disable it if you have problems with
+          * Flash content inside popups.
+          *
+          * Default value: true.
+          */
+        zoomAnimation?: boolean;
+
+        /**
+          * Set it to false if you want to override the default behavior of the popup
+          * closing when user clicks the map (set globally by the Map closePopupOnClick
+          * option).
+          */
+        closeOnClick?: boolean;
+
+        /**
+          * A custom class name to assign to the popup.
+          */
+        className?: string;
+    }
+}
+
+declare namespace L {
+
+    export interface PosAnimationStatic extends ClassStatic {
+        /**
+          * Creates a PosAnimation object.
+          */
+        new(): PosAnimation;
+    }
+    export var PosAnimation: PosAnimationStatic;
+
+    export interface PosAnimation extends IEventPowered<PosAnimation> {
+        /**
+          * Run an animation of a given element to a new position, optionally setting
+          * duration in seconds (0.25 by default) and easing linearity factor (3rd argument
+          * of the cubic bezier curve, 0.5 by default)
+          */
+        run(element: HTMLElement, newPos: Point, duration?: number, easeLinearity?: number): PosAnimation;
+
+        ////////////////
+        ////////////////
+        addEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): PosAnimation;
+        addOneTimeEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): PosAnimation;
+        removeEventListener(type: string, fn?: (e: LeafletEvent) => void, context?: any): PosAnimation;
+        hasEventListeners(type: string): boolean;
+        fireEvent(type: string, data?: any): PosAnimation;
+        on(type: string, fn: (e: LeafletEvent) => void, context?: any): PosAnimation;
+        once(type: string, fn: (e: LeafletEvent) => void, context?: any): PosAnimation;
+        off(type: string, fn?: (e: LeafletEvent) => void, context?: any): PosAnimation;
+        fire(type: string, data?: any): PosAnimation;
+        addEventListener(eventMap: any, context?: any): PosAnimation;
+        removeEventListener(eventMap?: any, context?: any): PosAnimation;
+        clearAllEventListeners(): PosAnimation;
+        on(eventMap: any, context?: any): PosAnimation;
+        off(eventMap?: any, context?: any): PosAnimation;
+    }
+}
+
+declare namespace L {
+
+    namespace Projection {
+
+        /**
+          * Spherical Mercator projection — the most common projection for online maps,
+          * used by almost all free and commercial tile providers. Assumes that Earth
+          * is a sphere. Used by the EPSG:3857 CRS.
+          */
+        export var SphericalMercator: IProjection;
+
+        /**
+          * Elliptical Mercator projection — more complex than Spherical Mercator.
+          * Takes into account that Earth is a geoid, not a perfect sphere. Used by the
+          * EPSG:3395 CRS.
+          */
+        export var Mercator: IProjection;
+
+        /**
+          * Equirectangular, or Plate Carree projection — the most simple projection,
+          * mostly used by GIS enthusiasts. Directly maps x as longitude, and y as latitude.
+          * Also suitable for flat worlds, e.g. game maps. Used by the EPSG:3395 and Simple
+          * CRS.
+          */
+        export var LonLat: IProjection;
+    }
+}
+
+declare namespace L {
+
+    /**
+      * Instantiates a rectangle object with the given geographical bounds and
+      * optionally an options object.
+      */
+    function rectangle(bounds: LatLngBounds, options?: PathOptions): Rectangle;
+
+    export interface RectangleStatic extends ClassStatic {
+        /**
+          * Instantiates a rectangle object with the given geographical bounds and
+          * optionally an options object.
+          */
+        new(bounds: LatLngBounds, options?: PathOptions): Rectangle;
+    }
+    export var Rectangle: RectangleStatic;
+
+    export interface Rectangle extends Polygon {
+        /**
+          * Redraws the rectangle with the passed bounds.
+          */
+        setBounds(bounds: LatLngBounds): Rectangle;
+    }
+}
+
+
+declare namespace L {
+
+    export interface ScaleOptions {
+
+        /**
+          * The position of the control (one of the map corners). See control positions.
+          * Default value: 'bottomleft'.
+          */
+        position?: string;
+
+        /**
+          * Maximum width of the control in pixels. The width is set dynamically to show
+          * round values (e.g. 100, 200, 500).
+          * Default value: 100.
+          */
+        maxWidth?: number;
+
+        /**
+          * Whether to show the metric scale line (m/km).
+          * Default value: true.
+          */
+        metric?: boolean;
+
+        /**
+          * Whether to show the imperial scale line (mi/ft).
+          * Default value: true.
+          */
+        imperial?: boolean;
+
+        /**
+          * If true, the control is updated on moveend, otherwise it's always up-to-date
+          * (updated on move).
+          * Default value: false.
+          */
+        updateWhenIdle?: boolean;
+    }
+}
+
+declare namespace L {
+
+    export interface TileLayerStatic extends ClassStatic {
+        /**
+          * Instantiates a tile layer object given a URL template and optionally an options
+          * object.
+          */
+        new(urlTemplate: string, options?: TileLayerOptions): TileLayer;
+
+        WMS: {
+            /**
+              * Instantiates a WMS tile layer object given a base URL of the WMS service and
+              * a WMS parameters/options object.
+              */
+            new(baseUrl: string, options: WMSOptions): TileLayer.WMS;
+        };
+
+        Canvas: {
+            /**
+              * Instantiates a Canvas tile layer object given an options object (optionally).
+              */
+            new(options?: TileLayerOptions): TileLayer.Canvas;
+        };
+    }
+    export var TileLayer: TileLayerStatic;
+
+    export interface TileLayer extends ILayer, IEventPowered<TileLayer> {
+        /**
+          * Adds the layer to the map.
+          */
+        addTo(map: Map): TileLayer;
+
+        /**
+          * Brings the tile layer to the top of all tile layers.
+          */
+        bringToFront(): TileLayer;
+
+        /**
+          * Brings the tile layer to the bottom of all tile layers.
+          */
+        bringToBack(): TileLayer;
+
+        /**
+          * Changes the opacity of the tile layer.
+          */
+        setOpacity(opacity: number): TileLayer;
+
+        /**
+          * Sets the zIndex of the tile layer.
+          */
+        setZIndex(zIndex: number): TileLayer;
+
+        /**
+          * Causes the layer to clear all the tiles and request them again.
+          */
+        redraw(): TileLayer;
+
+        /**
+          * Updates the layer's URL template and redraws it.
+          */
+        setUrl(urlTemplate: string): TileLayer;
+
+        /**
+          * Returns the HTML element that contains the tiles for this layer.
+          */
+        getContainer(): HTMLElement;
+
+        ////////////
+        ////////////
+        /**
+          * Should contain code that creates DOM elements for the overlay, adds them
+          * to map panes where they should belong and puts listeners on relevant map events.
+          * Called on map.addLayer(layer).
+          */
+        onAdd(map: Map): void;
+
+        /**
+          * Should contain all clean up code that removes the overlay's elements from
+          * the DOM and removes listeners previously added in onAdd. Called on map.removeLayer(layer).
+          */
+        onRemove(map: Map): void;
+
+        ////////////////
+        ////////////////
+        addEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): TileLayer;
+        addOneTimeEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): TileLayer;
+        removeEventListener(type: string, fn?: (e: LeafletEvent) => void, context?: any): TileLayer;
+        hasEventListeners(type: string): boolean;
+        fireEvent(type: string, data?: any): TileLayer;
+        on(type: string, fn: (e: LeafletEvent) => void, context?: any): TileLayer;
+        once(type: string, fn: (e: LeafletEvent) => void, context?: any): TileLayer;
+        off(type: string, fn?: (e: LeafletEvent) => void, context?: any): TileLayer;
+        fire(type: string, data?: any): TileLayer;
+        addEventListener(eventMap: any, context?: any): TileLayer;
+        removeEventListener(eventMap?: any, context?: any): TileLayer;
+        clearAllEventListeners(): TileLayer;
+        on(eventMap: any, context?: any): TileLayer;
+        off(eventMap?: any, context?: any): TileLayer;
+    }
+
+    namespace TileLayer {
+        export interface WMS extends TileLayer {
+            /**
+              * Merges an object with the new parameters and re-requests tiles on the current
+              * screen (unless noRedraw was set to true).
+              */
+            setParams(params: WMS, noRedraw?: boolean): WMS;
+        }
+
+        export interface Canvas extends TileLayer {
+            /**
+              * You need to define this method after creating the instance to draw tiles;
+              * canvas is the actual canvas tile on which you can draw, tilePoint represents
+              * the tile numbers, and zoom is the current zoom.
+              */
+            drawTile(canvas: HTMLCanvasElement, tilePoint: Point, zoom: number): Canvas;
+
+            /**
+              * Calling redraw will cause the drawTile method to be called for all tiles.
+              * May be used for updating dynamic content drawn on the Canvas
+              */
+            redraw(): Canvas;
+        }
+    }
+
+    export interface TileLayerFactory {
+
+        /**
+          * Instantiates a tile layer object given a URL template and optionally an options
+          * object.
+          */
+        (urlTemplate: string, options?: TileLayerOptions): TileLayer;
+
+        /**
+          * Instantiates a WMS tile layer object given a base URL of the WMS service and
+          * a WMS parameters/options object.
+          */
+        wms(baseUrl: string, options: WMSOptions): L.TileLayer.WMS;
+
+        /**
+          * Instantiates a Canvas tile layer object given an options object (optionally).
+          */
+        canvas(options?: TileLayerOptions): L.TileLayer.Canvas;
+    }
+
+    export var tileLayer: TileLayerFactory;
+}
+
+declare namespace L {
+
+    export interface TileLayerOptions {
+
+        /**
+          * Minimum zoom number.
+          *
+          * Default value: 0.
+          */
+        minZoom?: number;
+
+        /**
+          * Maximum zoom number.
+          *
+          * Default value: 18.
+          */
+        maxZoom?: number;
+
+        /**
+          * Maximum zoom number the tiles source has available. If it is specified,
+          * the tiles on all zoom levels higher than maxNativeZoom will be loaded from
+          * maxZoom level and auto-scaled.
+          *
+          * Default value: null.
+          */
+        maxNativeZoom?: number;
+
+        /**
+          * Tile size (width and height in pixels, assuming tiles are square).
+          *
+          * Default value: 256.
+          */
+        tileSize?: number;
+
+        /**
+          * Subdomains of the tile service. Can be passed in the form of one string (where
+          * each letter is a subdomain name) or an array of strings.
+          *
+          * Default value: 'abc'.
+          */
+        subdomains?: string[];
+
+        /**
+          * URL to the tile image to show in place of the tile that failed to load.
+          *
+          * Default value: ''.
+          */
+        errorTileUrl?: string;
+
+        /**
+          * e.g. "© CloudMade" — the string used by the attribution control, describes
+          * the layer data.
+          *
+          * Default value: ''.
+          */
+        attribution?: string;
+
+        /**
+          * If true, inverses Y axis numbering for tiles (turn this on for TMS services).
+          *
+          * Default value: false.
+          */
+        tms?: boolean;
+
+        /**
+          * If set to true, the tile coordinates won't be wrapped by world width (-180
+          * to 180 longitude) or clamped to lie within world height (-90 to 90). Use this
+          * if you use Leaflet for maps that don't reflect the real world (e.g. game, indoor
+          * or photo maps).
+          *
+          * Default value: false.
+          */
+        continuousWorld?: boolean;
+
+        /**
+          * If set to true, the tiles just won't load outside the world width (-180 to 180
+          * longitude) instead of repeating.
+          *
+          * Default value: false.
+          */
+        noWrap?: boolean;
+
+        /**
+          * The zoom number used in tile URLs will be offset with this value.
+          *
+          * Default value: 0.
+          */
+        zoomOffset?: number;
+
+        /**
+          * If set to true, the zoom number used in tile URLs will be reversed (maxZoom
+          * - zoom instead of zoom)
+          *
+          * Default value: false.
+          */
+        zoomReverse?: boolean;
+
+        /**
+          * The opacity of the tile layer.
+          *
+          * Default value: 1.0.
+          */
+        opacity?: number;
+
+        /**
+          * The explicit zIndex of the tile layer. Not set by default.
+          */
+        zIndex?: number;
+
+        /**
+          * If true, all the tiles that are not visible after panning are removed (for
+          * better performance). true by default on mobile WebKit, otherwise false.
+          */
+        unloadInvisibleTiles?: boolean;
+
+        /**
+          * If false, new tiles are loaded during panning, otherwise only after it (for
+          * better performance). true by default on mobile WebKit, otherwise false.
+          */
+        updateWhenIdle?: boolean;
+
+        /**
+          * If true and user is on a retina display, it will request four tiles of half the
+          * specified size and a bigger zoom level in place of one to utilize the high resolution.
+          *
+          * Default value: false.
+          */
+        detectRetina?: boolean;
+
+        /**
+          * If true, all the tiles that are not visible after panning are placed in a reuse
+          * queue from which they will be fetched when new tiles become visible (as opposed
+          * to dynamically creating new ones). This will in theory keep memory usage
+          * low and eliminate the need for reserving new memory whenever a new tile is
+          * needed.
+          *
+          * Default value: false.
+          */
+        reuseTiles?: boolean;
+
+        /**
+          * When this option is set, the TileLayer only loads tiles that are in the given geographical bounds.
+          */
+        bounds?: LatLngBounds;
+
+        /**
+          * Custom keys may be specified in TileLayerOptions so they can be used in a provided URL template.
+          */
+        [additionalKeys: string]: any;
+    }
+}
+
+declare namespace L {
+    export interface TransformationStatic {
+        /**
+          * Creates a transformation object with the given coefficients.
+          */
+        new(a: number, b: number, c: number, d: number): Transformation;
+    }
+    export var Transformation: TransformationStatic;
+
+    export interface Transformation {
+        /**
+          * Returns a transformed point, optionally multiplied by the given scale.
+          * Only accepts real L.Point instances, not arrays.
+          */
+        transform(point: Point, scale?: number): Point;
+
+        /**
+          * Returns the reverse transformation of the given point, optionally divided
+          * by the given scale. Only accepts real L.Point instances, not arrays.
+          */
+        untransform(point: Point, scale?: number): Point;
+    }
+}
+
+declare namespace L {
+
+    namespace Util {
+
+        /**
+          * Merges the properties of the src object (or multiple objects) into dest object
+          * and returns the latter. Has an L.extend shortcut.
+          */
+        export function extend(dest: any, ...sources: any[]): any;
+
+        /**
+          * Returns a function which executes function fn with the given scope obj (so
+          * that this keyword refers to obj inside the function code). Has an L.bind shortcut.
+          */
+        export function bind<T extends Function>(fn: T, obj: any): T;
+
+        /**
+          * Applies a unique key to the object and returns that key. Has an L.stamp shortcut.
+          */
+        export function stamp(obj: any): string;
+
+        /**
+          * Returns a wrapper around the function fn that makes sure it's called not more
+          * often than a certain time interval time, but as fast as possible otherwise
+          * (for example, it is used for checking and requesting new tiles while dragging
+          * the map), optionally passing the scope (context) in which the function will
+          * be called.
+          */
+        export function limitExecByInterval<T extends Function>(fn: T, time: number, context?: any): T;
+
+        /**
+          * Returns a function which always returns false.
+          */
+        export function falseFn(): () => boolean;
+
+        /**
+          * Returns the number num rounded to digits decimals.
+          */
+        export function formatNum(num: number, digits: number): number;
+
+        /**
+          * Trims and splits the string on whitespace and returns the array of parts.
+          */
+        export function splitWords(str: string): string[];
+
+        /**
+          * Merges the given properties to the options of the obj object, returning the
+          * resulting options. See Class options. Has an L.setOptions shortcut.
+          */
+        export function setOptions(obj: any, options: any): any;
+
+        /**
+          * Converts an object into a parameter URL string, e.g. {a: "foo", b: "bar"}
+          * translates to '?a=foo&b=bar'.
+          */
+        export function getParamString(obj: any): string;
+
+        /**
+          * Simple templating facility, creates a string by applying the values of the
+          * data object of a form {a: 'foo', b: 'bar', …} to a template string of the form
+          * 'Hello {a}, {b}' — in this example you will get 'Hello foo, bar'.
+          */
+        export function template(str: string, data: any): string;
+
+        /**
+          * Returns true if the given object is an array.
+          */
+        export function isArray(obj: any): boolean;
+
+        /**
+          * Trims the whitespace from both ends of the string and returns the result.
+          */
+        export function trim(str: string): string;
+
+        /**
+          * Data URI string containing a base64-encoded empty GIF image. Used as a hack
+          * to free memory from unused images on WebKit-powered mobile devices (by setting
+          * image src to this string).
+          */
+        export var emptyImageUrl: string;
+    }
+}
+
+
+declare namespace L {
+
+    export interface WMSOptions {
+
+        /**
+          * (required) Comma-separated list of WMS layers to show.
+          *
+          * Default value: ''.
+          */
+        layers?: string;
+
+        /**
+          * Comma-separated list of WMS styles.
+          *
+          * Default value: 'image/jpeg'.
+          */
+        styles?: string;
+
+        /**
+          * WMS image format (use 'image/png' for layers with transparency).
+          *
+          * Default value: false.
+          */
+        format?: string;
+
+        /**
+          * If true, the WMS service will return images with transparency.
+          *
+          * Default value: '1.1.1'.
+          */
+        transparent?: boolean;
+
+        /**
+          * Version of the WMS service to use.
+          */
+        version?: string;
+
+    }
+}
+
+/**
+  * Forces Leaflet to use the Canvas back-end (if available) for vector layers
+  * instead of SVG. This can increase performance considerably in some cases
+  * (e.g. many thousands of circle markers on the map).
+  */
+declare var L_PREFER_CANVAS: boolean;
+
+/**
+  * Forces Leaflet to not use touch events even if it detects them.
+  */
+declare var L_NO_TOUCH: boolean;
+
+/**
+  * Forces Leaflet to not use hardware-accelerated CSS 3D transforms for positioning
+  * (which may cause glitches in some rare environments) even if they're supported.
+  */
+declare var L_DISABLE_3D: boolean;
+
+declare module "leaflet" {
+	export = L;
+}
+
+// vim: et ts=4 sw=4
diff --git a/leaflet/leaflet-tests.ts b/leaflet/leaflet-tests.ts
index b0568b216a..2e616bacd2 100644
--- a/leaflet/leaflet-tests.ts
+++ b/leaflet/leaflet-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="leaflet.d.ts" />
+
 
 // initialize the map on the "map" div with a given center and zoom
 
diff --git a/leaflet/leaflet.d.ts b/leaflet/leaflet.d.ts
deleted file mode 100644
index 6c487c3ebe..0000000000
--- a/leaflet/leaflet.d.ts
+++ /dev/null
@@ -1,4356 +0,0 @@
-// Type definitions for Leaflet.js 0.7.3
-// Project: https://github.com/Leaflet/Leaflet
-// Definitions by: Vladimir Zotov <https://github.com/rgripper>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace L {
-    type LatLngExpression = LatLng | number[] | ({ lat: number; lng: number })
-    type LatLngBoundsExpression = LatLngBounds | LatLngExpression[];
-}
-
-declare namespace L {
-
-    export interface AttributionOptions {
-
-        /**
-          * The position of the control (one of the map corners). See control positions.
-          * Default value: 'bottomright'.
-          */
-        position?: string;
-
-        /**
-          * The HTML text shown before the attributions. Pass false to disable.
-          * Default value: 'Powered by Leaflet'.
-          */
-        prefix?: string;
-
-    }
-}
-
-declare namespace L {
-
-    /**
-        * Creates a Bounds object from two coordinates (usually top-left and bottom-right
-        * corners).
-        */
-    export function bounds(topLeft: Point, bottomRight: Point): Bounds;
-
-    /**
-        * Creates a Bounds object defined by the points it contains.
-        */
-    export function bounds(points: Point[]): Bounds;
-
-
-    export interface BoundsStatic {
-        /**
-          * Creates a Bounds object from two coordinates (usually top-left and bottom-right
-          * corners).
-          */
-        new(topLeft: Point, bottomRight: Point): Bounds;
-
-        /**
-          * Creates a Bounds object defined by the points it contains.
-          */
-        new(points: Point[]): Bounds;
-    }
-    export var Bounds: BoundsStatic;
-
-    export interface Bounds {
-        /**
-          * Extends the bounds to contain the given point.
-          */
-        extend(point: Point): void;
-
-        /**
-          * Returns the center point of the bounds.
-          */
-        getCenter(): Point;
-
-        /**
-          * Returns true if the rectangle contains the given one.
-          */
-        contains(otherBounds: Bounds): boolean;
-
-        /**
-          * Returns true if the rectangle contains the given point.
-          */
-        contains(point: Point): boolean;
-
-        /**
-          * Returns true if the rectangle intersects the given bounds.
-          */
-        intersects(otherBounds: Bounds): boolean;
-
-        /**
-          * Returns true if the bounds are properly initialized.
-          */
-        isValid(): boolean;
-
-        /**
-          * Returns the size of the given bounds.
-          */
-        getSize(): Point;
-
-        /**
-          * The top left corner of the rectangle.
-          */
-        min: Point;
-
-        /**
-          * The bottom right corner of the rectangle.
-          */
-        max: Point;
-    }
-}
-
-declare namespace L {
-
-    namespace Browser {
-
-        /**
-          * true for all Internet Explorer versions.
-          */
-        export var ie: boolean;
-
-        /**
-          * true for Internet Explorer 6.
-          */
-        export var ie6: boolean;
-
-        /**
-          * true for Internet Explorer 6.
-          */
-        export var ie7: boolean;
-
-        /**
-          * true for webkit-based browsers like Chrome and Safari (including mobile
-          * versions).
-          */
-        export var webkit: boolean;
-
-        /**
-          * true for webkit-based browsers that support CSS 3D transformations.
-          */
-        export var webkit3d: boolean;
-
-        /**
-          * true for Android mobile browser.
-          */
-        export var android: boolean;
-
-        /**
-          * true for old Android stock browsers (2 and 3).
-          */
-        export var android23: boolean;
-
-        /**
-          * true for modern mobile browsers (including iOS Safari and different Android
-          * browsers).
-          */
-        export var mobile: boolean;
-
-        /**
-          * true for mobile webkit-based browsers.
-          */
-        export var mobileWebkit: boolean;
-
-        /**
-          * true for mobile Opera.
-          */
-        export var mobileOpera: boolean;
-
-        /**
-          * true for all browsers on touch devices.
-          */
-        export var touch: boolean;
-
-        /**
-          * true for browsers with Microsoft touch model (e.g. IE10).
-          */
-        export var msTouch: boolean;
-
-        /**
-          * true for devices with Retina screens.
-          */
-        export var retina: boolean;
-
-    }
-}
-
-
-declare namespace L {
-
-    /**
-      * Instantiates a circle object given a geographical point, a radius in meters
-      * and optionally an options object.
-      */
-    function circle(latlng: LatLngExpression, radius: number, options?: PathOptions): Circle;
-
-    export interface CircleStatic extends ClassStatic {
-        /**
-          * Instantiates a circle object given a geographical point, a radius in meters
-          * and optionally an options object.
-          */
-        new(latlng: LatLngExpression, radius: number, options?: PathOptions): Circle;
-    }
-    export var Circle: CircleStatic;
-
-    export interface Circle extends Path {
-        /**
-          * Returns the current geographical position of the circle.
-          */
-        getLatLng(): LatLng;
-
-        /**
-          * Returns the current radius of a circle. Units are in meters.
-          */
-        getRadius(): number;
-
-        /**
-          * Sets the position of a circle to a new location.
-          */
-        setLatLng(latlng: LatLngExpression): Circle;
-
-        /**
-          * Sets the radius of a circle. Units are in meters.
-          */
-        setRadius(radius: number): Circle;
-
-        /**
-          * Returns a GeoJSON representation of the circle (GeoJSON Point Feature).
-          */
-        toGeoJSON(): any;
-
-    }
-}
-
-declare namespace L {
-
-    /**
-      * Instantiates a circle marker given a geographical point and optionally
-      * an options object. The default radius is 10 and can be altered by passing a
-      * "radius" member in the path options object.
-      */
-    function circleMarker(latlng: LatLngExpression, options?: PathOptions): CircleMarker;
-
-
-    export interface CircleMarkerStatic extends ClassStatic {
-        /**
-          * Instantiates a circle marker given a geographical point and optionally
-          * an options object. The default radius is 10 and can be altered by passing a
-          * "radius" member in the path options object.
-          */
-        new(latlng: LatLngExpression, options?: PathOptions): CircleMarker;
-    }
-    export var CircleMarker: CircleMarkerStatic;
-
-    export interface CircleMarker extends Circle {
-        /**
-          * Sets the position of a circle marker to a new location.
-          */
-        setLatLng(latlng: LatLngExpression): CircleMarker;
-
-        /**
-          * Sets the radius of a circle marker. Units are in pixels.
-          */
-        setRadius(radius: number): CircleMarker;
-
-        /**
-          * Returns a GeoJSON representation of the circle marker (GeoJSON Point Feature).
-          */
-        toGeoJSON(): any;
-    }
-}
-
-declare namespace L {
-    export interface ClassExtendOptions {
-        /**
-          * Your class's constructor function, meaning that it gets called when you do 'new MyClass(...)'.
-          */
-        initialize?: Function;
-
-        /**
-          * options is a special property that unlike other objects that you pass
-          * to extend will be merged with the parent one instead of overriding it
-          * completely, which makes managing configuration of objects and default
-          * values convenient.
-          */
-        options?: any;
-
-        /**
-          * includes is a special class property that merges all specified objects
-          * into the class (such objects are called mixins). A good example of this
-          * is L.Mixin.Events that event-related methods like on, off and fire
-          * to the class.
-          */
-        includes?: any;
-
-        /**
-          * statics is just a convenience property that injects specified object
-          * properties as the static properties of the class, useful for defining
-          * constants.
-          */
-        static?: any;
-
-        [prop: string]: any;
-    }
-
-    export interface ClassStatic {
-        /**
-          * You use L.Class.extend to define new classes, but you can use the
-          * same method on any class to inherit from it.
-          */
-        extend(options: ClassExtendOptions): any;
-        extend<Options, NewClass>(options: ClassExtendOptions): { new(options?: Options): NewClass };
-
-        /**
-          * You can also use the following shortcut when you just need to make
-          * one additional method call.
-          */
-        addInitHook(methodName: string, ...args: any[]): void;
-    }
-
-
-    /**
-      * L.Class powers the OOP facilities of Leaflet and is used to create
-      * almost all of the Leaflet classes documented.
-      */
-    namespace Class {
-        /**
-          * You use L.Class.extend to define new classes, but you can use the
-          * same method on any class to inherit from it.
-          */
-        function extend(options: ClassExtendOptions): any;
-    }
-
-}
-
-declare namespace L {
-    export interface ControlStatic extends ClassStatic {
-        /**
-          * Creates a control with the given options.
-          */
-        new(options?: ControlOptions): Control;
-
-        Zoom: Control.ZoomStatic;
-        Attribution: Control.AttributionStatic;
-        Layers: Control.LayersStatic;
-        Scale: Control.ScaleStatic;
-    }
-    export var Control: ControlStatic;
-
-    export interface Control extends IControl {
-        /**
-          * Sets the position of the control. See control positions.
-          */
-        setPosition(position: string): Control;
-
-        /**
-          * Returns the current position of the control.
-          */
-        getPosition(): string;
-
-        /**
-          * Adds the control to the map.
-          */
-        addTo(map: Map): Control;
-
-        /**
-          * Removes the control from the map.
-          */
-        removeFrom(map: Map): Control;
-
-        /**
-          * Returns the HTML container of the control.
-          */
-        getContainer(): HTMLElement;
-
-        // IControl members
-
-        /**
-          * Should contain code that creates all the neccessary DOM elements for the
-          * control, adds listeners on relevant map events, and returns the element
-          * containing the control. Called on map.addControl(control) or control.addTo(map).
-          */
-        onAdd(map: Map): HTMLElement;
-
-        /**
-          * Optional, should contain all clean up code (e.g. removes control's event
-          * listeners). Called on map.removeControl(control) or control.removeFrom(map).
-          * The control's DOM container is removed automatically.
-          */
-        onRemove(map: Map): void;
-    }
-
-    namespace Control {
-        export interface ZoomStatic extends ClassStatic {
-            /**
-              * Creates a zoom control.
-              */
-            new (options?: ZoomOptions): Zoom;
-        }
-
-        export interface Zoom extends L.Control {
-        }
-
-        export interface ZoomOptions {
-            /**
-              * The position of the control (one of the map corners).
-              * Can be 'topleft', 'topright', 'bottomleft', or 'bottomright'.
-              *
-              * Default value: 'topright'.
-              */
-            position?: string; // 'topleft' | 'topright' | 'bottomleft' | 'bottomright'
-
-            /**
-             * The text set on the zoom in button.
-             *
-             * Default value: '+'
-             */
-            zoomInText?: string;
-
-            /**
-             * The text set on the zoom out button.
-             *
-             * Default value: '-'
-             */
-            zoomOutText?: string;
-
-            /**
-             * The title set on the zoom in button.
-             *
-             * Default value: 'Zoom in'
-             */
-            zoomInTitle?: string;
-
-            /**
-             * The title set on the zoom out button.
-             *
-             * Default value: 'Zoom out'
-             */
-            zoomOutTitle?: string;
-        }
-
-        export interface AttributionStatic extends ClassStatic {
-            /**
-              * Creates an attribution control.
-              */
-            new(options?: AttributionOptions): Attribution;
-        }
-
-        export interface Attribution extends L.Control {
-            /**
-              * Sets the text before the attributions.
-              */
-            setPrefix(prefix: string): Attribution;
-
-            /**
-              * Adds an attribution text (e.g. 'Vector data &copy; CloudMade').
-              */
-            addAttribution(text: string): Attribution;
-
-            /**
-              * Removes an attribution text.
-              */
-            removeAttribution(text: string): Attribution;
-
-        }
-
-        export interface LayersStatic extends ClassStatic {
-            /**
-              * Creates an attribution control with the given layers. Base layers will be
-              * switched with radio buttons, while overlays will be switched with checkboxes.
-              */
-            new(baseLayers?: any, overlays?: any, options?: LayersOptions): Layers;
-        }
-
-        export interface Layers extends L.Control, IEventPowered<Layers> {
-            /**
-              * Adds a base layer (radio button entry) with the given name to the control.
-              */
-            addBaseLayer(layer: ILayer, name: string): Layers;
-
-            /**
-              * Adds an overlay (checkbox entry) with the given name to the control.
-              */
-            addOverlay(layer: ILayer, name: string): Layers;
-
-            /**
-              * Remove the given layer from the control.
-              */
-            removeLayer(layer: ILayer): Layers;
-
-            ////////////////
-            ////////////////
-            addEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): Layers;
-            addOneTimeEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): Layers;
-            removeEventListener(type: string, fn?: (e: LeafletEvent) => void, context?: any): Layers;
-            hasEventListeners(type: string): boolean;
-            fireEvent(type: string, data?: any): Layers;
-            on(type: string, fn: (e: LeafletEvent) => void, context?: any): Layers;
-            once(type: string, fn: (e: LeafletEvent) => void, context?: any): Layers;
-            off(type: string, fn?: (e: LeafletEvent) => void, context?: any): Layers;
-            fire(type: string, data?: any): Layers;
-            addEventListener(eventMap: any, context?: any): Layers;
-            removeEventListener(eventMap?: any, context?: any): Layers;
-            clearAllEventListeners(): Layers;
-            on(eventMap: any, context?: any): Layers;
-            off(eventMap?: any, context?: any): Layers;
-        }
-
-        export interface ScaleStatic extends ClassStatic {
-            /**
-              * Creates an scale control with the given options.
-              */
-            new(options?: ScaleOptions): Scale;
-        }
-
-        export interface Scale extends L.Control {
-        }
-    }
-
-    export interface control {
-        /**
-          * Creates a control with the given options.
-          */
-        (options?: ControlOptions): Control;
-    }
-
-    export namespace control {
-
-        /**
-          * Creates a zoom control.
-          */
-        export function zoom(options?: Control.ZoomOptions): L.Control.Zoom;
-
-        /**
-          * Creates an attribution control.
-          */
-        export function attribution(options?: AttributionOptions): L.Control.Attribution;
-
-        /**
-            * Creates an attribution control with the given layers. Base layers will be
-            * switched with radio buttons, while overlays will be switched with checkboxes.
-            */
-        export function layers(baseLayers?: any, overlays?: any, options?: LayersOptions): L.Control.Layers;
-
-        /**
-          * Creates an scale control with the given options.
-          */
-        export function scale(options?: ScaleOptions): L.Control.Scale;
-    }
-}
-
-declare namespace L {
-
-    export interface ControlOptions {
-
-        /**
-          * The initial position of the control (one of the map corners). See control
-          * positions.
-          * Default value: 'topright'.
-          */
-        position?: string;
-
-    }
-}
-
-declare namespace L {
-
-    namespace CRS {
-
-        /**
-          * The most common CRS for online maps, used by almost all free and commercial
-          * tile providers. Uses Spherical Mercator projection. Set in by default in
-          * Map's crs option.
-          */
-        export var EPSG3857: ICRS;
-
-        /**
-          * A common CRS among GIS enthusiasts. Uses simple Equirectangular projection.
-          */
-        export var EPSG4326: ICRS;
-
-        /**
-          * Rarely used by some commercial tile providers. Uses Elliptical Mercator
-          * projection.
-          */
-        export var EPSG3395: ICRS;
-
-        /**
-          * A simple CRS that maps longitude and latitude into x and y directly. May be
-          * used for maps of flat surfaces (e.g. game maps). Note that the y axis should
-          * still be inverted (going from bottom to top).
-          */
-        export var Simple: ICRS;
-
-    }
-}
-
-declare namespace L {
-
-    /**
-      * Creates a div icon instance with the given options.
-      */
-    function divIcon(options: DivIconOptions): DivIcon;
-
-    export interface DivIconStatic extends ClassStatic {
-        /**
-          * Creates a div icon instance with the given options.
-          */
-        new(options: DivIconOptions): DivIcon;
-    }
-    export var DivIcon: DivIconStatic;
-
-    export interface DivIcon extends Icon {
-    }
-}
-
-declare namespace L {
-
-    export interface DivIconOptions {
-
-        /**
-          * Size of the icon in pixels. Can be also set through CSS.
-          */
-        iconSize?: Point;
-
-        /**
-          * The coordinates of the "tip" of the icon (relative to its top left corner).
-          * The icon will be aligned so that this point is at the marker's geographical
-          * location. Centered by default if size is specified, also can be set in CSS
-          * with negative margins.
-          */
-        iconAnchor?: Point;
-
-        /**
-          * A custom class name to assign to the icon.
-          *
-          * Default value: 'leaflet-div-icon'.
-          */
-        className?: string;
-
-        /**
-          * A custom HTML code to put inside the div element.
-          *
-          * Default value: ''.
-          */
-        html?: string;
-
-    }
-}
-
-declare namespace L {
-
-    export interface DomEvent {
-
-        /**
-          * Adds a listener fn to the element's DOM event of the specified type. this keyword
-          * inside the listener will point to context, or to the element if not specified.
-          */
-        addListener(el: HTMLElement, type: string, fn: (e: Event) => void, context?: any): DomEvent;
-        on(el: HTMLElement, type: string, fn: (e: Event) => void, context?: any): DomEvent;
-
-        /**
-          * Removes an event listener from the element.
-          */
-        removeListener(el: HTMLElement, type: string, fn: (e: Event) => void, context?: any): DomEvent;
-        off(el: HTMLElement, type: string, fn: (e: Event) => void, context?: any): DomEvent;
-
-        /**
-          * Stop the given event from propagation to parent elements. Used inside the
-          * listener functions:
-          * L.DomEvent.addListener(div, 'click', function
-          * (e) {
-          * L.DomEvent.stopPropagation(e);
-          * });
-          */
-        stopPropagation(e: Event): DomEvent;
-
-        /**
-          * Prevents the default action of the event from happening (such as following
-          * a link in the href of the a element, or doing a POST request with page reload
-          * when form is submitted). Use it inside listener functions.
-          */
-        preventDefault(e: Event): DomEvent;
-
-        /**
-          * Does stopPropagation and preventDefault at the same time.
-          */
-        stop(e: Event): DomEvent;
-
-        /**
-          * Adds stopPropagation to the element's 'click', 'doubleclick', 'mousedown'
-          * and 'touchstart' events.
-          */
-        disableClickPropagation(el: HTMLElement): DomEvent;
-
-        /**
-          * Gets normalized mouse position from a DOM event relative to the container
-          * or to the whole page if not specified.
-          */
-        getMousePosition(e: Event, container?: HTMLElement): Point;
-
-        /**
-          * Gets normalized wheel delta from a mousewheel DOM event.
-          */
-        getWheelDelta(e: Event): number;
-
-    }
-
-    export var DomEvent: DomEvent;
-}
-
-declare namespace L {
-
-    namespace DomUtil {
-
-        /**
-          * Returns an element with the given id if a string was passed, or just returns
-          * the element if it was passed directly.
-          */
-        export function get(id: string): HTMLElement;
-
-        /**
-          * Returns the value for a certain style attribute on an element, including
-          * computed values or values set through CSS.
-          */
-        export function getStyle(el: HTMLElement, style: string): string;
-
-        /**
-          * Returns the offset to the viewport for the requested element.
-          */
-        export function getViewportOffset(el: HTMLElement): Point;
-
-        /**
-          * Creates an element with tagName, sets the className, and optionally appends
-          * it to container element.
-          */
-        export function create(tagName: string, className: string, container?: HTMLElement): HTMLElement;
-
-        /**
-          * Makes sure text cannot be selected, for example during dragging.
-          */
-        export function disableTextSelection(): void;
-
-        /**
-          * Makes text selection possible again.
-          */
-        export function enableTextSelection(): void;
-
-        /**
-          * Returns true if the element class attribute contains name.
-          */
-        export function hasClass(el: HTMLElement, name: string): boolean;
-
-        /**
-          * Adds name to the element's class attribute.
-          */
-        export function addClass(el: HTMLElement, name: string): void;
-
-        /**
-          * Removes name from the element's class attribute.
-          */
-        export function removeClass(el: HTMLElement, name: string): void;
-
-        /**
-          * Set the opacity of an element (including old IE support). Value must be from
-          * 0 to 1.
-          */
-        export function setOpacity(el: HTMLElement, value: number): void;
-
-        /**
-          * Goes through the array of style names and returns the first name that is a valid
-          * style name for an element. If no such name is found, it returns false. Useful
-          * for vendor-prefixed styles like transform.
-          */
-        export function testProp(props: string[]): any;
-
-        /**
-          * Returns a CSS transform string to move an element by the offset provided in
-          * the given point. Uses 3D translate on WebKit for hardware-accelerated transforms
-          * and 2D on other browsers.
-          */
-        export function getTranslateString(point: Point): string;
-
-        /**
-          * Returns a CSS transform string to scale an element (with the given scale origin).
-          */
-        export function getScaleString(scale: number, origin: Point): string;
-
-        /**
-          * Sets the position of an element to coordinates specified by point, using
-          * CSS translate or top/left positioning depending on the browser (used by
-          * Leaflet internally to position its layers). Forces top/left positioning
-          * if disable3D is true.
-          */
-        export function setPosition(el: HTMLElement, point: Point, disable3D?: boolean): void;
-
-        /**
-          * Returns the coordinates of an element previously positioned with setPosition.
-          */
-        export function getPosition(el: HTMLElement): Point;
-
-        /**
-          * Vendor-prefixed transition style name (e.g. 'webkitTransition' for WebKit).
-          */
-        export var TRANSITION: string;
-
-        /**
-          * Vendor-prefixed transform style name.
-          */
-        export var TRANSFORM: string;
-
-    }
-}
-
-declare namespace L {
-    export interface DraggableStatic extends ClassStatic {
-        /**
-          * Creates a Draggable object for moving the given element when you start dragging
-          * the dragHandle element (equals the element itself by default).
-          */
-        new(element: HTMLElement, dragHandle?: HTMLElement): Draggable;
-    }
-    export var Draggable: DraggableStatic;
-
-
-    export interface Draggable extends IEventPowered<Draggable> {
-        /**
-          * Enables the dragging ability.
-          */
-        enable(): void;
-
-        /**
-          * Disables the dragging ability.
-          */
-        disable(): void;
-
-        ////////////////
-        ////////////////
-        addEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): Draggable;
-        addOneTimeEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): Draggable;
-        removeEventListener(type: string, fn?: (e: LeafletEvent) => void, context?: any): Draggable;
-        hasEventListeners(type: string): boolean;
-        fireEvent(type: string, data?: any): Draggable;
-        on(type: string, fn: (e: LeafletEvent) => void, context?: any): Draggable;
-        once(type: string, fn: (e: LeafletEvent) => void, context?: any): Draggable;
-        off(type: string, fn?: (e: LeafletEvent) => void, context?: any): Draggable;
-        fire(type: string, data?: any): Draggable;
-        addEventListener(eventMap: any, context?: any): Draggable;
-        removeEventListener(eventMap?: any, context?: any): Draggable;
-        clearAllEventListeners(): Draggable;
-        on(eventMap: any, context?: any): Draggable;
-        off(eventMap?: any, context?: any): Draggable;
-    }
-}
-
-
-
-declare namespace L {
-
-    /**
-      * Create a layer group, optionally given an initial set of layers.
-      */
-    function featureGroup<T extends ILayer>(layers?: T[]): FeatureGroup<T>;
-
-
-    export interface FeatureGroupStatic extends ClassStatic {
-        /**
-          * Create a layer group, optionally given an initial set of layers.
-          */
-        new<T extends ILayer>(layers?: T[]): FeatureGroup<T>;
-    }
-    export var FeatureGroup: FeatureGroupStatic;
-
-    export interface FeatureGroup<T extends ILayer> extends LayerGroup<T>, ILayer, IEventPowered<FeatureGroup<T>> {
-        /**
-          * Binds a popup with a particular HTML content to a click on any layer from the
-          * group that has a bindPopup method.
-          */
-        bindPopup(htmlContent: string, options?: PopupOptions): FeatureGroup<T>;
-
-        /**
-          * Returns the LatLngBounds of the Feature Group (created from bounds and coordinates
-          * of its children).
-          */
-        getBounds(): LatLngBounds;
-
-        /**
-          * Sets the given path options to each layer of the group that has a setStyle method.
-          */
-        setStyle(style: PathOptions): FeatureGroup<T>;
-
-        /**
-          * Brings the layer group to the top of all other layers.
-          */
-        bringToFront(): FeatureGroup<T>;
-
-        /**
-          * Brings the layer group to the bottom of all other layers.
-          */
-        bringToBack(): FeatureGroup<T>;
-
-        ////////////
-        ////////////
-        /**
-          * Should contain code that creates DOM elements for the overlay, adds them
-          * to map panes where they should belong and puts listeners on relevant map events.
-          * Called on map.addLayer(layer).
-          */
-        onAdd(map: Map): void;
-
-        /**
-          * Should contain all clean up code that removes the overlay's elements from
-          * the DOM and removes listeners previously added in onAdd. Called on map.removeLayer(layer).
-          */
-        onRemove(map: Map): void;
-
-        ////////////////
-        ////////////////
-        addEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): FeatureGroup<T>;
-        addOneTimeEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): FeatureGroup<T>;
-        removeEventListener(type: string, fn?: (e: LeafletEvent) => void, context?: any): FeatureGroup<T>;
-        hasEventListeners(type: string): boolean;
-        fireEvent(type: string, data?: any): FeatureGroup<T>;
-        on(type: string, fn: (e: LeafletEvent) => void, context?: any): FeatureGroup<T>;
-        once(type: string, fn: (e: LeafletEvent) => void, context?: any): FeatureGroup<T>;
-        off(type: string, fn?: (e: LeafletEvent) => void, context?: any): FeatureGroup<T>;
-        fire(type: string, data?: any): FeatureGroup<T>;
-        addEventListener(eventMap: any, context?: any): FeatureGroup<T>;
-        removeEventListener(eventMap?: any, context?: any): FeatureGroup<T>;
-        clearAllEventListeners(): FeatureGroup<T>;
-        on(eventMap: any, context?: any): FeatureGroup<T>;
-        off(eventMap?: any, context?: any): FeatureGroup<T>;
-    }
-}
-
-declare namespace L {
-
-    /**
-      * Creates a GeoJSON layer. Optionally accepts an object in GeoJSON format
-      * to display on the map (you can alternatively add it later with addData method)
-      * and an options object.
-      */
-    function geoJson(geojson?: any, options?: GeoJSONOptions): GeoJSON;
-
-    export interface GeoJSONStatic extends ClassStatic {
-        /**
-          * Creates a GeoJSON layer. Optionally accepts an object in GeoJSON format
-          * to display on the map (you can alternatively add it later with addData method)
-          * and an options object.
-          */
-        new(geojson?: any, options?: GeoJSONOptions): GeoJSON;
-
-        /**
-          * Creates a layer from a given GeoJSON feature.
-          */
-        geometryToLayer(featureData: GeoJSON, pointToLayer?: (featureData: any, latlng: LatLng) => ILayer): ILayer;
-
-        /**
-          * Creates a LatLng object from an array of 2 numbers (latitude, longitude)
-          * used in GeoJSON for points. If reverse is set to true, the numbers will be interpreted
-          * as (longitude, latitude).
-          */
-        coordsToLatLng(coords: number[], reverse?: boolean): LatLng;
-
-        /**
-          * Creates a multidimensional array of LatLng objects from a GeoJSON coordinates
-          * array. levelsDeep specifies the nesting level (0 is for an array of points,
-          * 1 for an array of arrays of points, etc., 0 by default). If reverse is set to
-          * true, the numbers will be interpreted as (longitude, latitude).
-          */
-        coordsToLatLngs(coords: any[], levelsDeep?: number, reverse?: boolean): any[];
-    }
-    export var GeoJSON: GeoJSONStatic;
-
-    export interface GeoJSON extends FeatureGroup<ILayer> {
-        /**
-          * Adds a GeoJSON object to the layer.
-          */
-        addData(data: any): boolean;
-
-        /**
-          * Changes styles of GeoJSON vector layers with the given style function.
-          */
-        setStyle(style: (featureData: any) => any): GeoJSON;
-
-        /**
-          * Changes styles of GeoJSON vector layers with the given style options.
-          */
-        setStyle(style: PathOptions): GeoJSON;
-
-        /**
-          * Resets the the given vector layer's style to the original GeoJSON style,
-          * useful for resetting style after hover events.
-          */
-        resetStyle(layer: Path): GeoJSON;
-    }
-}
-
-declare namespace L {
-    export interface GeoJSONOptions {
-        /**
-          * Function that will be used for creating layers for GeoJSON points (if not
-          * specified, simple markers will be created).
-          */
-        pointToLayer?: (featureData: any, latlng: LatLng) => ILayer;
-
-        /**
-          * Function that will be used to get style options for vector layers created
-          * for GeoJSON features.
-          */
-        style?: (featureData: any) => any;
-
-        /**
-          * Function that will be called on each created feature layer. Useful for attaching
-          * events and popups to features.
-          */
-        onEachFeature?: (featureData: any, layer: ILayer) => void;
-
-        /**
-          * Function that will be used to decide whether to show a feature or not.
-          */
-        filter?: (featureData: any, layer: ILayer) => boolean;
-
-        /**
-          * Function that will be used for converting GeoJSON coordinates to LatLng points
-          * (if not specified, coords will be assumed to be WGS84 � standard[longitude, latitude]
-          * values in degrees).
-          */
-        coordsToLatLng?: (coords: any[]) => LatLng[];
-    }
-}
-
-
-
-
-declare namespace L {
-
-    /**
-      * Creates an icon instance with the given options.
-      */
-    function icon(options: IconOptions): Icon;
-
-    export interface IconStatic extends ClassStatic {
-        /**
-          * Creates an icon instance with the given options.
-          */
-        new(options: IconOptions): Icon;
-
-        Default: {
-            /**
-              * Creates a default icon instance with the given options.
-              */
-            new(options?: IconOptions): Icon.Default;
-
-            imagePath: string;
-        };
-    }
-    export var Icon: IconStatic;
-
-    export interface Icon {
-    }
-
-    namespace Icon {
-        /**
-          * L.Icon.Default extends L.Icon and is the blue icon Leaflet uses
-          * for markers by default.
-          */
-        export interface Default extends Icon {
-        }
-    }
-}
-
-declare namespace L {
-
-    export interface IconOptions {
-
-        /**
-          * (required) The URL to the icon image (absolute or relative to your script
-          * path).
-          */
-        iconUrl?: string;
-
-        /**
-          * The URL to a retina sized version of the icon image (absolute or relative to
-          * your script path). Used for Retina screen devices.
-          */
-        iconRetinaUrl?: string;
-
-        /**
-          * Size of the icon image in pixels.
-          */
-        iconSize?: Point|[number, number];
-
-        /**
-          * The coordinates of the "tip" of the icon (relative to its top left corner).
-          * The icon will be aligned so that this point is at the marker's geographical
-          * location. Centered by default if size is specified, also can be set in CSS
-          * with negative margins.
-          */
-        iconAnchor?: Point|[number, number];
-
-        /**
-          * The URL to the icon shadow image. If not specified, no shadow image will be
-          * created.
-          */
-        shadowUrl?: string;
-
-        /**
-          * The URL to the retina sized version of the icon shadow image. If not specified,
-          * no shadow image will be created. Used for Retina screen devices.
-          */
-        shadowRetinaUrl?: string;
-
-        /**
-          * Size of the shadow image in pixels.
-          */
-        shadowSize?: Point|[number, number];
-
-        /**
-          * The coordinates of the "tip" of the shadow (relative to its top left corner)
-          * (the same as iconAnchor if not specified).
-          */
-        shadowAnchor?: Point|[number, number];
-
-        /**
-          * The coordinates of the point from which popups will "open", relative to the
-          * icon anchor.
-          */
-        popupAnchor?: Point|[number, number];
-
-        /**
-          * A custom class name to assign to both icon and shadow images. Empty by default.
-          */
-        className?: string;
-    }
-}
-
-declare namespace L {
-
-    export interface IControl {
-
-        /**
-          * Should contain code that creates all the neccessary DOM elements for the
-          * control, adds listeners on relevant map events, and returns the element
-          * containing the control. Called on map.addControl(control) or control.addTo(map).
-          */
-        onAdd(map: Map): HTMLElement;
-
-        /**
-          * Optional, should contain all clean up code (e.g. removes control's event
-          * listeners). Called on map.removeControl(control) or control.removeFrom(map).
-          * The control's DOM container is removed automatically.
-          */
-        onRemove(map: Map): void;
-    }
-}
-
-declare namespace L {
-
-    export interface ICRS {
-
-        /**
-          * Projection that this CRS uses.
-          */
-        projection: IProjection;
-
-        /**
-          * Transformation that this CRS uses to turn projected coordinates into screen
-          * coordinates for a particular tile service.
-          */
-        transformation: Transformation;
-
-        /**
-          * Standard code name of the CRS passed into WMS services (e.g. 'EPSG:3857').
-          */
-        code: string;
-
-        /**
-          * Projects geographical coordinates on a given zoom into pixel coordinates.
-          */
-        latLngToPoint(latlng: LatLng, zoom: number): Point;
-
-        /**
-          * The inverse of latLngToPoint. Projects pixel coordinates on a given zoom
-          * into geographical coordinates.
-          */
-        pointToLatLng(point: Point, zoom: number): LatLng;
-
-        /**
-          * Projects geographical coordinates into coordinates in units accepted
-          * for this CRS (e.g. meters for EPSG:3857, for passing it to WMS services).
-          */
-        project(latlng: LatLng): Point;
-
-        /**
-          * Returns the scale used when transforming projected coordinates into pixel
-          * coordinates for a particular zoom. For example, it returns 256 * 2^zoom for
-          * Mercator-based CRS.
-          */
-        scale(zoom: number): number;
-
-        /**
-          * Returns the size of the world in pixels for a particular zoom.
-          */
-        getSize(zoom: number): Point;
-
-    }
-}
-
-declare namespace L {
-
-    export interface IEventPowered<T> {
-
-        /**
-          * Adds a listener function (fn) to a particular event type of the object. You
-          * can optionally specify the context of the listener (object the this keyword
-          * will point to). You can also pass several space-separated types (e.g. 'click
-          * dblclick').
-          */
-        addEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): T;
-
-        /**
-          * The same as above except the listener will only get fired once and then removed.
-          */
-        addOneTimeEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): T;
-        /**
-          * Adds a set of type/listener pairs, e.g. {click: onClick, mousemove: onMouseMove}
-          */
-        addEventListener(eventMap: any, context?: any): T;
-
-        /**
-          * Removes a previously added listener function. If no function is specified,
-          * it will remove all the listeners of that particular event from the object.
-          */
-        removeEventListener(type: string, fn?: (e: LeafletEvent) => void, context?: any): T;
-
-        /**
-          * Removes a set of type/listener pairs.
-          */
-        removeEventListener(eventMap?: any, context?: any): T;
-
-        /**
-          * Returns true if a particular event type has some listeners attached to it.
-          */
-        hasEventListeners(type: string): boolean;
-
-        /**
-          * Fires an event of the specified type. You can optionally provide an data object
-          * — the first argument of the listener function will contain its properties.
-          */
-        fireEvent(type: string, data?: any): T;
-
-        /**
-          * Removes all listeners to all events on the object.
-          */
-        clearAllEventListeners(): T;
-
-        /**
-          * Alias to addEventListener.
-          */
-        on(type: string, fn: (e: LeafletEvent) => void, context?: any): T;
-
-        /**
-          * Alias to addEventListener.
-          */
-        on(eventMap: any, context?: any): T;
-
-        /**
-          * Alias to addOneTimeEventListener.
-          */
-        once(type: string, fn: (e: LeafletEvent) => void, context?: any): T;
-
-        /**
-          * Alias to removeEventListener.
-          */
-        off(type: string, fn?: (e: LeafletEvent) => void, context?: any): T;
-
-        /**
-          * Alias to removeEventListener.
-          */
-        off(eventMap?: any, context?: any): T;
-
-        /**
-          * Alias to fireEvent.
-          */
-        fire(type: string, data?: any): T;
-    }
-}
-
-declare namespace L {
-
-    export interface IHandler {
-
-        /**
-          * Enables the handler.
-          */
-        enable(): void;
-
-        /**
-          * Disables the handler.
-          */
-        disable(): void;
-
-        /**
-          * Returns true if the handler is enabled.
-          */
-        enabled(): boolean;
-    }
-
-    export interface Handler {
-        initialize(map: Map): void;
-    }
-}
-
-declare namespace L {
-
-    export interface ILayer {
-
-        /**
-          * Should contain code that creates DOM elements for the overlay, adds them
-          * to map panes where they should belong and puts listeners on relevant map events.
-          * Called on map.addLayer(layer).
-          */
-        onAdd(map: Map): void;
-
-        /**
-          * Should contain all clean up code that removes the overlay's elements from
-          * the DOM and removes listeners previously added in onAdd. Called on map.removeLayer(layer).
-          */
-        onRemove(map: Map): void;
-    }
-}
-
-declare namespace L {
-    namespace Mixin {
-        export interface LeafletMixinEvents extends IEventPowered<LeafletMixinEvents> {
-        }
-
-        export var Events: LeafletMixinEvents;
-    }
-}
-
-declare namespace L {
-
-    /**
-      * Instantiates an image overlay object given the URL of the image and the geographical
-      * bounds it is tied to.
-      */
-    function imageOverlay(imageUrl: string, bounds: LatLngBounds, options?: ImageOverlayOptions): ImageOverlay;
-
-    export interface ImageOverlayStatic extends ClassStatic {
-        /**
-          * Instantiates an image overlay object given the URL of the image and the geographical
-          * bounds it is tied to.
-          */
-        new(imageUrl: string, bounds: LatLngBounds, options?: ImageOverlayOptions): ImageOverlay;
-    }
-    export var ImageOverlay: ImageOverlayStatic;
-
-    export interface ImageOverlay extends ILayer {
-        /**
-          * Adds the overlay to the map.
-          */
-        addTo(map: Map): ImageOverlay;
-
-        /**
-          * Sets the opacity of the overlay.
-          */
-        setOpacity(opacity: number): ImageOverlay;
-
-        /**
-          * Changes the URL of the image.
-          */
-        setUrl(imageUrl: string): ImageOverlay;
-
-        /**
-          * Brings the layer to the top of all overlays.
-          */
-        bringToFront(): ImageOverlay;
-
-        /**
-          * Brings the layer to the bottom of all overlays.
-          */
-        bringToBack(): ImageOverlay;
-
-        ////////////
-        ////////////
-        /**
-          * Should contain code that creates DOM elements for the overlay, adds them
-          * to map panes where they should belong and puts listeners on relevant map events.
-          * Called on map.addLayer(layer).
-          */
-        onAdd(map: Map): void;
-
-        /**
-          * Should contain all clean up code that removes the overlay's elements from
-          * the DOM and removes listeners previously added in onAdd. Called on map.removeLayer(layer).
-          */
-        onRemove(map: Map): void;
-    }
-}
-
-declare namespace L {
-
-    export interface ImageOverlayOptions {
-
-        /**
-          * The opacity of the image overlay.
-          */
-        opacity?: number;
-    }
-}
-
-declare namespace L {
-
-    export interface IProjection {
-
-        /**
-          * Projects geographical coordinates into a 2D point.
-          */
-        project(latlng: LatLng): Point;
-
-        /**
-          * The inverse of project. Projects a 2D point into geographical location.
-          */
-        unproject(point: Point): LatLng;
-    }
-}
-
-declare namespace L {
-
-    /**
-    * A constant that represents the Leaflet version in use.
-    */
-    export var version: string;
-
-    /**
-    * This method restores the L global variale to the original value it had
-    * before Leaflet inclusion, and returns the real Leaflet namespace.
-    */
-    export function noConflict(): typeof L;
-}
-
-declare namespace L {
-    /**
-      * Creates an object representing a geographical point with the given latitude
-      * and longitude.
-      */
-    function latLng(latitude: number, longitude: number): LatLng;
-
-    /**
-      * Creates an object representing a geographical point with the given latitude
-      * and longitude.
-      */
-    function latLng(coords: LatLngExpression): LatLng;
-
-    export interface LatLngStatic {
-        /**
-          * Creates an object representing a geographical point with the given latitude
-          * and longitude.
-          */
-        new(latitude: number, longitude: number): LatLng;
-
-        /**
-          * Creates an object representing a geographical point with the given latitude
-          * and longitude.
-          */
-        new(coords: LatLngExpression): LatLng;
-
-        /**
-          * A multiplier for converting degrees into radians.
-          *
-          * Value: Math.PI / 180.
-          */
-        DEG_TO_RAD: number;
-
-        /**
-          * A multiplier for converting radians into degrees.
-          *
-          * Value: 180 / Math.PI.
-          */
-        RAD_TO_DEG: number;
-
-        /**
-          * Max margin of error for the equality check.
-          *
-          * Value: 1.0E-9.
-          */
-        MAX_MARGIN: number;
-    }
-    export var LatLng: LatLngStatic;
-
-    export interface LatLng {
-        /**
-          * Returns the distance (in meters) to the given LatLng calculated using the
-          * Haversine formula. See description on wikipedia
-          */
-        distanceTo(otherLatlng: LatLngExpression): number;
-
-        /**
-          * Returns true if the given LatLng point is at the same position (within a small
-          * margin of error).
-          */
-        equals(otherLatlng: LatLngExpression): boolean;
-
-        /**
-          * Returns a string representation of the point (for debugging purposes).
-          */
-        toString(): string;
-
-        /**
-          * Returns a new LatLng object with the longitude wrapped around left and right
-          * boundaries (-180 to 180 by default).
-          */
-        wrap(left: number, right: number): LatLng;
-
-        /**
-          * Latitude in degrees.
-          */
-        lat: number;
-
-        /**
-          * Longitude in degrees.
-          */
-        lng: number;
-    }
-}
-
-declare namespace L {
-
-    /**
-      * Creates a LatLngBounds object by defining south-west and north-east corners
-      * of the rectangle.
-      */
-    function latLngBounds(southWest: LatLngExpression, northEast: LatLngExpression): LatLngBounds;
-
-    /**
-      * Creates a LatLngBounds object defined by the geographical points it contains.
-      * Very useful for zooming the map to fit a particular set of locations with fitBounds.
-      */
-    function latLngBounds(latlngs: LatLngBoundsExpression): LatLngBounds;
-
-    export interface LatLngBoundsStatic {
-        /**
-          * Creates a LatLngBounds object by defining south-west and north-east corners
-          * of the rectangle.
-          */
-        new(southWest: LatLngExpression, northEast: LatLngExpression): LatLngBounds;
-
-        /**
-          * Creates a LatLngBounds object defined by the geographical points it contains.
-          * Very useful for zooming the map to fit a particular set of locations with fitBounds.
-          */
-        new(latlngs: LatLngBoundsExpression): LatLngBounds;
-    }
-    export var LatLngBounds: LatLngBoundsStatic;
-
-    export interface LatLngBounds {
-        /**
-          * Extends the bounds to contain the given point.
-          */
-        extend(latlng: LatLngExpression): LatLngBounds;
-
-        /**
-          * Extends the bounds to contain the given bounds.
-          */
-        extend(latlng: LatLngBoundsExpression): LatLngBounds;
-
-        /**
-          * Returns the south-west point of the bounds.
-          */
-        getSouthWest(): LatLng;
-
-        /**
-          * Returns the north-east point of the bounds.
-          */
-        getNorthEast(): LatLng;
-
-        /**
-          * Returns the north-west point of the bounds.
-          */
-        getNorthWest(): LatLng;
-
-        /**
-          * Returns the south-east point of the bounds.
-          */
-        getSouthEast(): LatLng;
-
-      	/**
-          * Returns the west longitude in degrees of the bounds.
-          */
-	getWest(): number;
-
-        /**
-          * Returns the east longitude in degrees of the bounds.
-          */
-	getEast(): number;
-
-        /**
-          * Returns the north latitude in degrees of the bounds.
-          */
-	getNorth(): number;
-
-        /**
-          * Returns the south latitude in degrees of the bounds.
-          */
-	getSouth(): number;
-
-        /**
-          * Returns the center point of the bounds.
-          */
-        getCenter(): LatLng;
-
-        /**
-          * Returns true if the rectangle contains the given one.
-          */
-        contains(otherBounds: LatLngBoundsExpression): boolean;
-
-        /**
-          * Returns true if the rectangle contains the given point.
-          */
-        contains(latlng: LatLngExpression): boolean;
-
-        /**
-          * Returns true if the rectangle intersects the given bounds.
-          */
-        intersects(otherBounds: LatLngBoundsExpression): boolean;
-
-        /**
-          * Returns true if the rectangle is equivalent (within a small margin of error)
-          * to the given bounds.
-          */
-        equals(otherBounds: LatLngBoundsExpression): boolean;
-
-        /**
-          * Returns a string with bounding box coordinates in a 'southwest_lng,southwest_lat,northeast_lng,northeast_lat'
-          * format. Useful for sending requests to web services that return geo data.
-          */
-        toBBoxString(): string;
-
-        /**
-          * Returns bigger bounds created by extending the current bounds by a given
-          * percentage in each direction.
-          */
-        pad(bufferRatio: number): LatLngBounds;
-
-        /**
-          * Returns true if the bounds are properly initialized.
-          */
-        isValid(): boolean;
-
-    }
-}
-
-declare namespace L {
-
-    /**
-      * Create a layer group, optionally given an initial set of layers.
-      */
-    function layerGroup<T extends ILayer>(layers?: T[]): LayerGroup<T>;
-
-
-    export interface LayerGroupStatic extends ClassStatic {
-        /**
-          * Create a layer group, optionally given an initial set of layers.
-          */
-        new<T extends ILayer>(layers?: T[]): LayerGroup<T>;
-    }
-    export var LayerGroup: LayerGroupStatic;
-
-    export interface LayerGroup<T extends ILayer> extends ILayer {
-        /**
-          * Adds the group of layers to the map.
-          */
-        addTo(map: Map): LayerGroup<T>;
-
-        /**
-          * Adds a given layer to the group.
-          */
-        addLayer(layer: T): LayerGroup<T>;
-
-        /**
-          * Removes a given layer from the group.
-          */
-        removeLayer(layer: T): LayerGroup<T>;
-
-        /**
-          * Removes a given layer of the given id from the group.
-          */
-        removeLayer(id: string): LayerGroup<T>;
-
-        /**
-          * Returns true if the given layer is currently added to the group.
-          */
-        hasLayer(layer: T): boolean;
-
-        /**
-          * Returns the layer with the given id.
-          */
-        getLayer(id: string): T;
-
-        /**
-          * Returns an array of all the layers added to the group.
-          */
-        getLayers(): T[];
-
-        /**
-          * Removes all the layers from the group.
-          */
-        clearLayers(): LayerGroup<T>;
-
-        /**
-          * Iterates over the layers of the group, optionally specifying context of
-          * the iterator function.
-          */
-        eachLayer(fn: (layer: T) => void, context?: any): LayerGroup<T>;
-
-        /**
-          * Returns a GeoJSON representation of the layer group (GeoJSON FeatureCollection).
-          */
-        toGeoJSON(): any;
-
-        ////////////
-        ////////////
-        /**
-          * Should contain code that creates DOM elements for the overlay, adds them
-          * to map panes where they should belong and puts listeners on relevant map events.
-          * Called on map.addLayer(layer).
-          */
-        onAdd(map: Map): void;
-
-        /**
-          * Should contain all clean up code that removes the overlay's elements from
-          * the DOM and removes listeners previously added in onAdd. Called on map.removeLayer(layer).
-          */
-        onRemove(map: Map): void;
-    }
-}
-
-
-declare namespace L {
-
-    export interface LayersOptions {
-
-        /**
-          * The position of the control (one of the map corners). See control positions.
-          *
-          * Default value: 'topright'.
-          */
-        position?: string;
-
-        /**
-          * If true, the control will be collapsed into an icon and expanded on mouse hover
-          * or touch.
-          *
-          * Default value: true.
-          */
-        collapsed?: boolean;
-
-        /**
-          * If true, the control will assign zIndexes in increasing order to all of its
-          * layers so that the order is preserved when switching them on/off.
-          *
-          * Default value: true.
-          */
-        autoZIndex?: boolean;
-
-    }
-}
-
-declare namespace L {
-
-    export interface LeafletErrorEvent extends LeafletEvent {
-
-        /**
-          * Error message.
-          */
-        message: string;
-
-        /**
-          * Error code (if applicable).
-          */
-        code: number;
-    }
-}
-
-declare namespace L {
-
-    export interface LeafletEvent {
-
-        /**
-          * The event type (e.g. 'click').
-          */
-        type: string;
-
-        /**
-          * The object that fired the event.
-          */
-        target: any;
-    }
-}
-
-declare namespace L {
-
-    export interface LeafletGeoJSONEvent extends LeafletEvent {
-
-        /**
-          * The layer for the GeoJSON feature that is being added to the map.
-          */
-        layer: ILayer;
-
-        /**
-          * GeoJSON properties of the feature.
-          */
-        properties: any;
-
-        /**
-          * GeoJSON geometry type of the feature.
-          */
-        geometryType: string;
-
-        /**
-          * GeoJSON ID of the feature (if present).
-          */
-        id: string;
-    }
-}
-
-declare namespace L {
-
-    export interface LeafletLayerEvent extends LeafletEvent {
-
-        /**
-          * The layer that was added or removed.
-          */
-        layer: ILayer;
-    }
-}
-
-declare namespace L {
-
-    export interface LeafletLayersControlEvent extends LeafletEvent {
-
-        /**
-          * The layer that was added or removed.
-          */
-        layer: ILayer;
-
-        /**
-          * The name of the layer that was added or removed.
-          */
-        name: string;
-    }
-}
-
-declare namespace L {
-
-    export interface LeafletLocationEvent extends LeafletEvent {
-
-        /**
-          * Detected geographical location of the user.
-          */
-        latlng: LatLng;
-
-        /**
-          * Geographical bounds of the area user is located in (with respect to the accuracy
-          * of location).
-          */
-        bounds: LatLngBounds;
-
-        /**
-          * Accuracy of location in meters.
-          */
-        accuracy: number;
-
-        /**
-          * Height of the position above the WGS84 ellipsoid in meters.
-          */
-        altitude: number;
-
-        /**
-          * Accuracy of altitude in meters.
-          */
-        altitudeAccuracy: number;
-
-        /**
-          * The direction of travel in degrees counting clockwise from true North.
-          */
-        heading: number;
-
-        /**
-          * Current velocity in meters per second.
-          */
-        speed: number;
-
-        /**
-          * The time when the position was acquired.
-          */
-        timestamp: number;
-
-    }
-}
-
-declare namespace L {
-
-    export interface LeafletMouseEvent extends LeafletEvent {
-
-        /**
-          * The geographical point where the mouse event occured.
-          */
-        latlng: LatLng;
-
-        /**
-          * Pixel coordinates of the point where the mouse event occured relative to
-          * the map layer.
-          */
-        layerPoint: Point;
-
-        /**
-          * Pixel coordinates of the point where the mouse event occured relative to
-          * the map сontainer.
-          */
-        containerPoint: Point;
-
-        /**
-          * The original DOM mouse event fired by the browser.
-          */
-        originalEvent: MouseEvent;
-    }
-}
-
-declare namespace L {
-
-    export interface LeafletPopupEvent extends LeafletEvent {
-
-        /**
-          * The popup that was opened or closed.
-          */
-        popup: Popup;
-    }
-}
-
-declare namespace L {
-
-    export interface LeafletDragEndEvent extends LeafletEvent {
-
-        /**
-          * The distance in pixels the draggable element was moved by.
-          */
-        distance: number;
-    }
-}
-
-declare namespace L {
-
-    export interface LeafletResizeEvent extends LeafletEvent {
-
-        /**
-          * The old size before resize event.
-          */
-        oldSize: Point;
-
-        /**
-          * The new size after the resize event.
-          */
-        newSize: Point;
-    }
-}
-
-declare namespace L {
-
-    export interface LeafletTileEvent extends LeafletEvent {
-
-        /**
-          * The tile element (image).
-          */
-        tile: HTMLElement;
-
-        /**
-          * The source URL of the tile.
-          */
-        url: string;
-    }
-}
-
-declare namespace L {
-
-    namespace LineUtil {
-
-        /**
-          * Dramatically reduces the number of points in a polyline while retaining
-          * its shape and returns a new array of simplified points. Used for a huge performance
-          * boost when processing/displaying Leaflet polylines for each zoom level
-          * and also reducing visual noise. tolerance affects the amount of simplification
-          * (lesser value means higher quality but slower and with more points). Also
-          * released as a separated micro-library Simplify.js.
-          */
-        export function simplify(points: Point[], tolerance: number): Point[];
-
-        /**
-          * Returns the distance between point p and segment p1 to p2.
-          */
-        export function pointToSegmentDistance(p: Point, p1: Point, p2: Point): number;
-
-        /**
-          * Returns the closest point from a point p on a segment p1 to p2.
-          */
-        export function closestPointOnSegment(p: Point, p1: Point, p2: Point): Point;
-
-        /**
-          * Clips the segment a to b by rectangular bounds. Used by Leaflet to only show 
-          * polyline points that are on the screen or near, increasing performance. Returns
-          * either false or a length-2 array of clipped points.
-          */
-        export function clipSegment(a: Point, b: Point, bounds: Bounds): Point[] | boolean;
-
-    }
-}
-
-declare namespace L {
-
-    export interface LocateOptions {
-
-        /**
-          * If true, starts continous watching of location changes (instead of detecting
-          * it once) using W3C watchPosition method. You can later stop watching using
-          * map.stopLocate() method.
-          *
-          * Default value: false.
-          */
-        watch?: boolean;
-
-        /**
-          * If true, automatically sets the map view to the user location with respect
-          * to detection accuracy, or to world view if geolocation failed.
-          *
-          * Default value: false.
-          */
-        setView?: boolean;
-
-        /**
-          * The maximum zoom for automatic view setting when using `setView` option.
-          *
-          * Default value: Infinity.
-          */
-        maxZoom?: number;
-
-        /**
-          * Number of millisecond to wait for a response from geolocation before firing
-          * a locationerror event.
-          *
-          * Default value: 10000.
-          */
-        timeout?: number;
-
-        /**
-          * Maximum age of detected location. If less than this amount of milliseconds
-          * passed since last geolocation response, locate will return a cached location.
-          *
-          * Default value: 0.
-          */
-        maximumAge?: number;
-
-        /**
-          * Enables high accuracy, see description in the W3C spec.
-          *
-          * Default value: false.
-          */
-        enableHighAccuracy?: boolean;
-    }
-}
-
-declare namespace L {
-
-    /**
-      * Instantiates a map object given a div element and optionally an
-      * object literal with map options described below.
-      */
-    function map(id: HTMLElement, options?: Map.MapOptions): Map;
-
-    /**
-      * Instantiates a map object given a div element id and optionally an
-      * object literal with map options described below.
-      */
-    function map(id: string, options?: Map.MapOptions): Map;
-
-
-    export interface MapStatic extends ClassStatic {
-        /**
-          * Instantiates a map object given a div element and optionally an
-          * object literal with map options described below.
-          *
-          * @constructor
-          */
-        new(id: HTMLElement, options?: Map.MapOptions): Map;
-
-        /**
-          * Instantiates a map object given a div element id and optionally an
-          * object literal with map options described below.
-          *
-          * @constructor
-          */
-        new(id: string, options?: Map.MapOptions): Map;
-    }
-    export var Map: MapStatic;
-
-    export interface Map extends IEventPowered<Map> {
-        // Methods for Modifying Map State
-
-        /**
-          * Sets the view of the map (geographical center and zoom) with the given
-          * animation options.
-          */
-        setView(center: LatLngExpression, zoom?: number, options?: Map.ZoomPanOptions): Map;
-
-        /**
-          * Sets the zoom of the map.
-          */
-        setZoom(zoom: number, options?: Map.ZoomPanOptions): Map;
-
-        /**
-          * Increases the zoom of the map by delta (1 by default).
-          */
-        zoomIn(delta?: number, options?: Map.ZoomPanOptions): Map;
-
-        /**
-          * Decreases the zoom of the map by delta (1 by default).
-          */
-        zoomOut(delta?: number, options?: Map.ZoomPanOptions): Map;
-
-        /**
-          * Zooms the map while keeping a specified point on the map stationary
-          * (e.g. used internally for scroll zoom and double-click zoom).
-          */
-        setZoomAround(latlng: LatLngExpression, zoom: number, options?: Map.ZoomPanOptions): Map;
-
-        /**
-          * Sets a map view that contains the given geographical bounds with the maximum
-          * zoom level possible.
-          */
-        fitBounds(bounds: LatLngBounds, options?: Map.FitBoundsOptions): Map;
-
-        /**
-          * Sets a map view that mostly contains the whole world with the maximum zoom
-          * level possible.
-          */
-        fitWorld(options?: Map.FitBoundsOptions): Map;
-
-        /**
-          * Pans the map to a given center. Makes an animated pan if new center is not more
-          * than one screen away from the current one.
-          */
-        panTo(latlng: LatLngExpression, options?: PanOptions): Map;
-
-        /**
-          * Pans the map to the closest view that would lie inside the given bounds (if
-          * it's not already).
-          */
-        panInsideBounds(bounds: LatLngBounds): Map;
-
-        /**
-          * Pans the map by a given number of pixels (animated).
-          */
-        panBy(point: Point, options?: PanOptions): Map;
-
-        /**
-          * Checks if the map container size changed and updates the map if so — call it
-          * after you've changed the map size dynamically, also animating pan by default.
-          * If options.pan is false, panning will not occur.
-          */
-        invalidateSize(options: Map.ZoomPanOptions): Map;
-
-        /**
-          * Checks if the map container size changed and updates the map if so — call it
-          * after you've changed the map size dynamically, also animating pan by default.
-          */
-        invalidateSize(animate: boolean): Map;
-
-        /**
-          * Restricts the map view to the given bounds (see map maxBounds option),
-          * passing the given animation options through to `setView`, if required.
-          */
-        setMaxBounds(bounds: LatLngBounds, options?: Map.ZoomPanOptions): Map;
-
-        /**
-          * Tries to locate the user using Geolocation API, firing locationfound event
-          * with location data on success or locationerror event on failure, and optionally
-          * sets the map view to the user location with respect to detection accuracy
-          * (or to the world view if geolocation failed). See Locate options for more
-          * details.
-          */
-        locate(options?: LocateOptions): Map;
-
-        /**
-          * Stops watching location previously initiated by map.locate({watch: true})
-          * and aborts resetting the map view if map.locate was called with {setView: true}.
-          */
-        stopLocate(): Map;
-
-        /**
-          * Destroys the map and clears all related event listeners.
-          */
-        remove(): Map;
-
-        // Methods for Getting Map State
-
-        /**
-          * Returns the geographical center of the map view.
-          */
-        getCenter(): LatLng;
-
-        /**
-          * Returns the current zoom of the map view.
-          */
-        getZoom(): number;
-
-        /**
-          * Returns the minimum zoom level of the map.
-          */
-        getMinZoom(): number;
-
-        /**
-          * Returns the maximum zoom level of the map.
-          */
-        getMaxZoom(): number;
-
-        /**
-          * Returns the LatLngBounds of the current map view.
-          */
-        getBounds(): LatLngBounds;
-
-        /**
-          * Returns the maximum zoom level on which the given bounds fit to the map view
-          * in its entirety. If inside (optional) is set to true, the method instead returns
-          * the minimum zoom level on which the map view fits into the given bounds in its
-          * entirety.
-          */
-        getBoundsZoom(bounds: LatLngBounds, inside?: boolean): number;
-
-        /**
-          * Returns the current size of the map container.
-          */
-        getSize(): Point;
-
-        /**
-          * Returns the bounds of the current map view in projected pixel coordinates
-          * (sometimes useful in layer and overlay implementations).
-          */
-        getPixelBounds(): Bounds;
-
-        /**
-          * Returns the projected pixel coordinates of the top left point of the map layer
-          * (useful in custom layer and overlay implementations).
-          */
-        getPixelOrigin(): Point;
-
-        // Methods for Layers and Controls
-
-        /**
-          * Adds the given layer to the map. If optional insertAtTheBottom is set to true,
-          * the layer is inserted under all others (useful when switching base tile layers).
-          */
-        addLayer(layer: ILayer, insertAtTheBottom?: boolean): Map;
-
-        /**
-          * Removes the given layer from the map.
-          */
-        removeLayer(layer: ILayer): Map;
-
-        /**
-          * Returns true if the given layer is currently added to the map.
-          */
-        hasLayer(layer: ILayer): boolean;
-
-        /**
-          * Opens the specified popup while closing the previously opened (to make sure
-          * only one is opened at one time for usability).
-          */
-        openPopup(popup: Popup): Map;
-
-        /**
-          * Creates a popup with the specified options and opens it in the given point
-          * on a map.
-          */
-        openPopup(html: string, latlng: LatLngExpression, options?: PopupOptions): Map;
-
-        /**
-          * Creates a popup with the specified options and opens it in the given point
-          * on a map.
-          */
-        openPopup(el: HTMLElement, latlng: LatLngExpression, options?: PopupOptions): Map;
-
-        /**
-          * Closes the popup previously opened with openPopup (or the given one).
-          */
-        closePopup(popup?: Popup): Map;
-
-        /**
-          * Adds the given control to the map.
-          */
-        addControl(control: IControl): Map;
-
-        /**
-          * Removes the given control from the map.
-          */
-        removeControl(control: IControl): Map;
-
-        // Conversion Methods
-
-        /**
-          * Returns the map layer point that corresponds to the given geographical coordinates
-          * (useful for placing overlays on the map).
-          */
-        latLngToLayerPoint(latlng: LatLngExpression): Point;
-
-        /**
-          * Returns the geographical coordinates of a given map layer point.
-          */
-        layerPointToLatLng(point: Point): LatLng;
-
-        /**
-          * Converts the point relative to the map container to a point relative to the
-          * map layer.
-          */
-        containerPointToLayerPoint(point: Point): Point;
-
-        /**
-          * Converts the point relative to the map layer to a point relative to the map
-          * container.
-          */
-        layerPointToContainerPoint(point: Point): Point;
-
-        /**
-          * Returns the map container point that corresponds to the given geographical
-          * coordinates.
-          */
-        latLngToContainerPoint(latlng: LatLngExpression): Point;
-
-        /**
-          * Returns the geographical coordinates of a given map container point.
-          */
-        containerPointToLatLng(point: Point): LatLng;
-
-        /**
-          * Projects the given geographical coordinates to absolute pixel coordinates
-          * for the given zoom level (current zoom level by default).
-          */
-        project(latlng: LatLngExpression, zoom?: number): Point;
-
-        /**
-          * Projects the given absolute pixel coordinates to geographical coordinates
-          * for the given zoom level (current zoom level by default).
-          */
-        unproject(point: Point, zoom?: number): LatLng;
-
-        /**
-          * Returns the pixel coordinates of a mouse click (relative to the top left corner
-          * of the map) given its event object.
-          */
-        mouseEventToContainerPoint(event: LeafletMouseEvent): Point;
-
-        /**
-          * Returns the pixel coordinates of a mouse click relative to the map layer given
-          * its event object.
-          */
-        mouseEventToLayerPoint(event: LeafletMouseEvent): Point;
-
-        /**
-          * Returns the geographical coordinates of the point the mouse clicked on given
-          * the click's event object.
-          */
-        mouseEventToLatLng(event: LeafletMouseEvent): LatLng;
-
-        // Other Methods
-
-        /**
-          * Returns the container element of the map.
-          */
-        getContainer(): HTMLElement;
-
-        /**
-          * Returns an object with different map panes (to render overlays in).
-          */
-        getPanes(): MapPanes;
-
-        // REVIEW: Should we make it more flexible declaring parameter 'fn' as Function?
-        /**
-          * Runs the given callback when the map gets initialized with a place and zoom,
-          * or immediately if it happened already, optionally passing a function context.
-          */
-        whenReady(fn: (map: Map) => void, context?: any): Map;
-
-        // Properties
-
-        /**
-          * Map dragging handler (by both mouse and touch).
-          */
-        dragging: IHandler;
-
-        /**
-          * Touch zoom handler.
-          */
-        touchZoom: IHandler;
-
-        /**
-          * Double click zoom handler.
-          */
-        doubleClickZoom: IHandler;
-
-        /**
-          * Scroll wheel zoom handler.
-          */
-        scrollWheelZoom: IHandler;
-
-        /**
-          * Box (shift-drag with mouse) zoom handler.
-          */
-        boxZoom: IHandler;
-
-        /**
-          * Keyboard navigation handler.
-          */
-        keyboard: IHandler;
-
-        /**
-          * Mobile touch hacks (quick tap and touch hold) handler.
-          */
-        tap: IHandler;
-
-        /**
-          * Zoom control.
-          */
-        zoomControl: Control.Zoom;
-
-        /**
-          * Attribution control.
-          */
-        attributionControl: Control.Attribution;
-
-        /**
-          * Map state options
-          */
-        options: Map.MapOptions;
-
-        /**
-          * Iterates over the layers of the map, optionally specifying context
-		  * of the iterator function.
-          */
-        eachLayer(fn: (layer: ILayer) => void, context?: any): Map;
-
-        ////////////////
-        ////////////////
-        addEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): Map;
-        addOneTimeEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): Map;
-        removeEventListener(type: string, fn?: (e: LeafletEvent) => void, context?: any): Map;
-        hasEventListeners(type: string): boolean;
-        fireEvent(type: string, data?: any): Map;
-        on(type: string, fn: (e: LeafletEvent) => void, context?: any): Map;
-        once(type: string, fn: (e: LeafletEvent) => void, context?: any): Map;
-        off(type: string, fn?: (e: LeafletEvent) => void, context?: any): Map;
-        fire(type: string, data?: any): Map;addEventListener(eventMap: any, context?: any): Map;
-        removeEventListener(eventMap?: any, context?: any): Map;
-        clearAllEventListeners(): Map;
-        on(eventMap: any, context?: any): Map;
-        off(eventMap?: any, context?: any): Map;
-    }
-}
-
-declare namespace L.Map {
-
-    export interface MapOptions {
-
-        // Map State Options
-
-        /**
-          * Initial geographical center of the map.
-          */
-        center?: LatLng;
-
-        /**
-          * Initial map zoom.
-          */
-        zoom?: number;
-
-        /**
-          * Layers that will be added to the map initially.
-          */
-        layers?: ILayer[];
-
-        /**
-          * Minimum zoom level of the map. Overrides any minZoom set on map layers.
-          */
-        minZoom?: number;
-
-        /**
-          * Maximum zoom level of the map. This overrides any maxZoom set on map layers.
-          */
-        maxZoom?: number;
-
-        /**
-          * When this option is set, the map restricts the view to the given geographical
-          * bounds, bouncing the user back when he tries to pan outside the view, and also
-          * not allowing to zoom out to a view that's larger than the given bounds (depending
-          * on the map size). To set the restriction dynamically, use setMaxBounds method
-          */
-        maxBounds?: LatLngBounds;
-
-        /**
-          * Coordinate Reference System to use. Don't change this if you're not sure
-          * what it means.
-          *
-          * Default value: L.CRS.EPSG3857.
-          */
-        crs?: ICRS;
-
-        // Interaction Options
-
-        /**
-          * Whether the map be draggable with mouse/touch or not.
-          *
-          * Default value: true.
-          */
-        dragging?: boolean;
-
-        /**
-          * Whether the map can be zoomed by touch-dragging with two fingers.
-          *
-          * Default value: true.
-          */
-        touchZoom?: boolean;
-
-        /**
-          * Whether the map can be zoomed by using the mouse wheel.
-          * If passed 'center', it will zoom to the center of the view regardless of
-          * where the mouse was.
-          *
-          * Default value: true.
-          */
-        scrollWheelZoom?: boolean;
-
-        /**
-          * Whether the map can be zoomed in by double clicking on it and zoomed out
-          * by double clicking while holding shift.
-          * If passed 'center', double-click zoom will zoom to the center of the view
-          * regardless of where the mouse was.
-          *
-          * Default value: true.
-          */
-        doubleClickZoom?: boolean;
-
-        /**
-          * Whether the map can be zoomed to a rectangular area specified by dragging
-          * the mouse while pressing shift.
-          *
-          * Default value: true.
-          */
-        boxZoom?: boolean;
-
-        /**
-          * Enables mobile hacks for supporting instant taps (fixing 200ms click delay
-          * on iOS/Android) and touch holds (fired as contextmenu events).
-          *
-          * Default value: true.
-          */
-        tap?: boolean;
-
-        /**
-          * The max number of pixels a user can shift his finger during touch for it
-          * to be considered a valid tap.
-          *
-          * Default value: 15.
-          */
-        tapTolerance?: number;
-
-        /**
-          * Whether the map automatically handles browser window resize to update itself.
-          *
-          * Default value: true.
-          */
-        trackResize?: boolean;
-
-        /**
-          * With this option enabled, the map tracks when you pan to another "copy" of
-          * the world and seamlessly jumps to the original one so that all overlays like
-          * markers and vector layers are still visible.
-          *
-          * Default value: false.
-          */
-        worldCopyJump?: boolean;
-
-        /**
-          * Set it to false if you don't want popups to close when user clicks the map.
-          *
-          * Default value: true.
-          */
-        closePopupOnClick?: boolean;
-
-        // Keyboard Navigation Options
-
-        /**
-          * Makes the map focusable and allows users to navigate the map with keyboard
-          * arrows and +/- keys.
-          *
-          * Default value: true.
-          */
-        keyboard?: boolean;
-
-        /**
-          * Amount of pixels to pan when pressing an arrow key.
-          *
-          * Default value: 80.
-          */
-        keyboardPanOffset?: number;
-
-        /**
-          * Number of zoom levels to change when pressing + or - key.
-          *
-          * Default value: 1.
-          */
-        keyboardZoomOffset?: number;
-
-        // Panning Inertia Options
-
-        /**
-          * If enabled, panning of the map will have an inertia effect where the map builds
-          * momentum while dragging and continues moving in the same direction for some
-          * time. Feels especially nice on touch devices.
-          *
-          * Default value: true.
-          */
-        inertia?: boolean;
-
-        /**
-          * The rate with which the inertial movement slows down, in pixels/second2.
-          *
-          * Default value: 3000.
-          */
-        inertiaDeceleration?: number;
-
-        /**
-          * Max speed of the inertial movement, in pixels/second.
-          *
-          * Default value: 1500.
-          */
-        inertiaMaxSpeed?: number;
-
-        /**
-          * Amount of milliseconds that should pass between stopping the movement and
-          * releasing the mouse or touch to prevent inertial movement.
-          *
-          * Default value: 32 for touch devices and 14 for the rest.
-          */
-        inertiaThreshold?: number;
-
-        // Control options
-
-        /**
-          * Whether the zoom control is added to the map by default.
-          *
-          * Default value: true.
-          */
-        zoomControl?: boolean;
-
-        /**
-          * Whether the attribution control is added to the map by default.
-          *
-          * Default value: true.
-          */
-        attributionControl?: boolean;
-
-        // Animation options
-
-        /**
-          * Whether the tile fade animation is enabled. By default it's enabled in all
-          * browsers that support CSS3 Transitions except Android.
-          */
-        fadeAnimation?: boolean;
-
-        /**
-          * Whether the tile zoom animation is enabled. By default it's enabled in all
-          * browsers that support CSS3 Transitions except Android.
-          */
-        zoomAnimation?: boolean;
-
-        /**
-          * Won't animate zoom if the zoom difference exceeds this value.
-          *
-          * Default value: 4.
-          */
-        zoomAnimationThreshold?: number;
-
-        /**
-          * Whether markers animate their zoom with the zoom animation, if disabled
-          * they will disappear for the length of the animation. By default it's enabled
-          * in all browsers that support CSS3 Transitions except Android.
-          */
-        markerZoomAnimation?: boolean;
-
-        /**
-         * Set it to false if you don't want the map to zoom beyond min/max zoom
-         * and then bounce back when pinch-zooming.
-         *
-         * Default value: true.
-         */
-        bounceAtZoomLimits?: boolean;
-    }
-
-    export interface ZoomOptions {
-        /**
-          * If not specified, zoom animation will happen if the zoom origin is inside the current view.
-          * If true, the map will attempt animating zoom disregarding where zoom origin is.
-          * Setting false will make it always reset the view completely without animation.
-          */
-        animate?: boolean;
-    }
-
-    export interface ZoomPanOptions {
-
-        /**
-          * If true, the map view will be completely reset (without any animations).
-          *
-          * Default value: false.
-          */
-        reset?: boolean;
-
-        /**
-          * Sets the options for the panning (without the zoom change) if it occurs.
-          */
-        pan?: PanOptions;
-
-        /**
-          * Sets the options for the zoom change if it occurs.
-          */
-        zoom?: ZoomOptions;
-
-        /**
-          * An equivalent of passing animate to both zoom and pan options (see below).
-          */
-        animate?: boolean;
-
-        /**
-         * If true, it will delay moveend event so that it doesn't happen many times in a row.
-         */
-        debounceMoveend?: boolean;
-    }
-
-    export interface FitBoundsOptions extends ZoomPanOptions {
-
-        /**
-          * Sets the amount of padding in the top left corner of a map container that
-          * shouldn't be accounted for when setting the view to fit bounds. Useful if
-          * you have some control overlays on the map like a sidebar and you don't
-          * want them to obscure objects you're zooming to.
-          *
-          * Default value: [0, 0].
-          */
-        paddingTopLeft?: Point;
-
-        /**
-          * The same for bottom right corner of the map.
-          *
-          * Default value: [0, 0].
-          */
-        paddingBottomRight?: Point;
-
-        /**
-          * Equivalent of setting both top left and bottom right padding to the same value.
-          *
-          * Default value: [0, 0].
-          */
-        padding?: Point;
-
-        /**
-          * The maximum possible zoom to use.
-          *
-          * Default value: null
-          */
-        maxZoom?: number;
-    }
-}
-
-declare namespace L {
-
-    export interface MapPanes {
-
-        /**
-          * Pane that contains all other map panes.
-          */
-        mapPane: HTMLElement;
-
-        /**
-          * Pane for tile layers.
-          */
-        tilePane: HTMLElement;
-
-        /**
-          * Pane that contains all the panes except tile pane.
-          */
-        objectsPane: HTMLElement;
-
-        /**
-          * Pane for overlay shadows (e.g. marker shadows).
-          */
-        shadowPane: HTMLElement;
-
-        /**
-          * Pane for overlays like polylines and polygons.
-          */
-        overlayPane: HTMLElement;
-
-        /**
-          * Pane for marker icons.
-          */
-        markerPane: HTMLElement;
-
-        /**
-          * Pane for popups.
-          */
-        popupPane: HTMLElement;
-    }
-}
-
-declare namespace L {
-
-    /**
-      * Instantiates a Marker object given a geographical point and optionally
-      * an options object.
-      */
-    function marker(latlng: LatLngExpression, options?: MarkerOptions): Marker;
-
-    var Marker: {
-        /**
-          * Instantiates a Marker object given a geographical point and optionally
-          * an options object.
-          */
-        new(latlng: LatLngExpression, options?: MarkerOptions): Marker;
-    };
-
-    export interface Marker extends ILayer, IEventPowered<Marker> {
-        /**
-          * Adds the marker to the map.
-          */
-        addTo(map: Map): Marker;
-
-        /**
-          * Returns the current geographical position of the marker.
-          */
-        getLatLng(): LatLng;
-
-        /**
-          * Changes the marker position to the given point.
-          */
-        setLatLng(latlng: LatLngExpression): Marker;
-
-        /**
-          * Changes the marker icon.
-          */
-        setIcon(icon: Icon): Marker;
-
-        /**
-          * Changes the zIndex offset of the marker.
-          */
-        setZIndexOffset(offset: number): Marker;
-
-        /**
-          * Changes the opacity of the marker.
-          */
-        setOpacity(opacity: number): Marker;
-
-        /**
-          * Updates the marker position, useful if coordinates of its latLng object
-          * were changed directly.
-          */
-        update(): Marker;
-
-        /**
-          * Binds a popup with a particular HTML content to a click on this marker. You
-          * can also open the bound popup with the Marker openPopup method.
-          */
-        bindPopup(html: string, options?: PopupOptions): Marker;
-
-        /**
-          * Binds a popup with a particular HTML content to a click on this marker. You
-          * can also open the bound popup with the Marker openPopup method.
-          */
-        bindPopup(el: HTMLElement, options?: PopupOptions): Marker;
-
-        /**
-          * Binds a popup with a particular HTML content to a click on this marker. You
-          * can also open the bound popup with the Marker openPopup method.
-          */
-        bindPopup(popup: Popup, options?: PopupOptions): Marker;
-
-        /**
-          * Unbinds the popup previously bound to the marker with bindPopup.
-          */
-        unbindPopup(): Marker;
-
-        /**
-          * Opens the popup previously bound by the bindPopup method.
-          */
-        openPopup(): Marker;
-
-        /**
-         * Returns the popup previously bound by the bindPopup method.
-         */
-        getPopup(): Popup;
-
-        /**
-          * Closes the bound popup of the marker if it's opened.
-          */
-        closePopup(): Marker;
-
-        /**
-          * Toggles the popup previously bound by the bindPopup method.
-          */
-        togglePopup(): Marker;
-
-        /**
-          * Sets an HTML content of the popup of this marker.
-          */
-        setPopupContent(html: string, options?: PopupOptions): Marker;
-
-        /**
-          * Sets an HTML content of the popup of this marker.
-          */
-        setPopupContent(el: HTMLElement, options?: PopupOptions): Marker;
-
-        /**
-          * Returns a GeoJSON representation of the marker (GeoJSON Point Feature).
-          */
-        toGeoJSON(): any;
-
-        /**
-          * Marker dragging handler (by both mouse and touch).
-          */
-        dragging: IHandler;
-
-        ////////////
-        ////////////
-        /**
-          * Should contain code that creates DOM elements for the overlay, adds them
-          * to map panes where they should belong and puts listeners on relevant map events.
-          * Called on map.addLayer(layer).
-          */
-        onAdd(map: Map): void;
-
-        /**
-          * Should contain all clean up code that removes the overlay's elements from
-          * the DOM and removes listeners previously added in onAdd. Called on map.removeLayer(layer).
-          */
-        onRemove(map: Map): void;
-
-        ////////////////
-        ////////////////
-        addEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): Marker;
-        addOneTimeEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): Marker;
-        removeEventListener(type: string, fn?: (e: LeafletEvent) => void, context?: any): Marker;
-        hasEventListeners(type: string): boolean;
-        fireEvent(type: string, data?: any): Marker;
-        on(type: string, fn: (e: LeafletEvent) => void, context?: any): Marker;
-        once(type: string, fn: (e: LeafletEvent) => void, context?: any): Marker;
-        off(type: string, fn?: (e: LeafletEvent) => void, context?: any): Marker;
-        fire(type: string, data?: any): Marker;
-        addEventListener(eventMap: any, context?: any): Marker;
-        removeEventListener(eventMap?: any, context?: any): Marker;
-        clearAllEventListeners(): Marker;
-        on(eventMap: any, context?: any): Marker;
-        off(eventMap?: any, context?: any): Marker;
-    }
-}
-
-declare namespace L {
-
-    export interface MarkerOptions {
-
-        /**
-          * Icon class to use for rendering the marker. See Icon documentation for details
-          * on how to customize the marker icon.
-          *
-          * Default value: new L.Icon.Default().
-          */
-        icon?: Icon;
-
-        /**
-          * If false, the marker will not emit mouse events and will act as a part of the
-          * underlying map.
-          *
-          * Default value: true.
-          */
-        clickable?: boolean;
-
-        /**
-          * Whether the marker is draggable with mouse/touch or not.
-          *
-          * Default value: false.
-          */
-        draggable?: boolean;
-
-        /**
-          * Whether the marker can be tabbed to with a keyboard and clicked by pressing enter.
-          *
-          * Default value: true.
-          */
-        keyboard?: boolean;
-
-        /**
-          * Text for the browser tooltip that appear on marker hover (no tooltip by default).
-          *
-          * Default value: ''.
-          */
-        title?: string;
-
-        /**
-          * Text for the alt attribute of the icon image (useful for accessibility).
-          *
-          * Default value: ''.
-          */
-        alt?: string;
-
-        /**
-          * By default, marker images zIndex is set automatically based on its latitude.
-          * You this option if you want to put the marker on top of all others (or below),
-          * specifying a high value like 1000 (or high negative value, respectively).
-          *
-          * Default value: 0.
-          */
-        zIndexOffset?: number;
-
-        /**
-          * The opacity of the marker.
-          *
-          * Default value: 1.0.
-          */
-        opacity?: number;
-
-        /**
-          * If true, the marker will get on top of others when you hover the mouse over it.
-          *
-          * Default value: false.
-          */
-        riseOnHover?: boolean;
-
-        /**
-          * The z-index offset used for the riseOnHover feature.
-          *
-          * Default value: 250.
-          */
-        riseOffset?: number;
-    }
-}
-
-declare namespace L {
-
-    /**
-      * Instantiates a multi-polyline object given an array of latlngs arrays (one
-      * for each individual polygon) and optionally an options object (the same
-      * as for MultiPolyline).
-      */
-    function multiPolygon(latlngs: LatLng[][], options?: PolylineOptions): MultiPolygon;
-
-    export interface MultiPolygonStatic extends ClassStatic {
-        /**
-          * Instantiates a multi-polyline object given an array of latlngs arrays (one
-          * for each individual polygon) and optionally an options object (the same
-          * as for MultiPolyline).
-          */
-        new(latlngs: LatLng[][], options?: PolylineOptions): MultiPolygon;
-    }
-    export var MultiPolygon: MultiPolygonStatic;
-
-    export interface MultiPolygon extends FeatureGroup<Polygon> {
-        /**
-          * Replace all polygons and their paths with the given array of arrays
-          * of geographical points.
-          */
-        setLatLngs(latlngs: LatLng[][]): MultiPolygon;
-
-        /**
-          * Returns an array of arrays of geographical points in each polygon.
-          */
-        getLatLngs(): LatLng[][];
-
-        /**
-         * Opens the popup previously bound by bindPopup.
-         */
-        openPopup(): MultiPolygon;
-
-        /**
-          * Returns a GeoJSON representation of the multipolygon (GeoJSON MultiPolygon Feature).
-          */
-        toGeoJSON(): any;
-    }
-}
-
-declare namespace L {
-
-    /**
-      * Instantiates a multi-polyline object given an array of arrays of geographical
-      * points (one for each individual polyline) and optionally an options object.
-      */
-    function multiPolyline(latlngs: LatLng[][], options?: PolylineOptions): MultiPolyline;
-
-    export interface MultiPolylineStatic extends ClassStatic {
-        /**
-          * Instantiates a multi-polyline object given an array of arrays of geographical
-          * points (one for each individual polyline) and optionally an options object.
-          */
-        new(latlngs: LatLng[][], options?: PolylineOptions): MultiPolyline;
-    }
-    export var MultiPolyline: MultiPolylineStatic;
-
-    export interface MultiPolyline extends FeatureGroup<Polyline> {
-        /**
-          * Replace all polygons and their paths with the given array of arrays
-          * of geographical points.
-          */
-        setLatLngs(latlngs: LatLng[][]): MultiPolyline;
-
-        /**
-          * Returns an array of arrays of geographical points in each polygon.
-          */
-        getLatLngs(): LatLng[][];
-
-        /**
-         * Opens the popup previously bound by bindPopup.
-         */
-        openPopup(): MultiPolyline;
-
-        /**
-          * Returns a GeoJSON representation of the multipolyline (GeoJSON MultiLineString Feature).
-          */
-        toGeoJSON(): any;
-    }
-}
-
-declare namespace L {
-
-    export interface PanOptions {
-
-        /**
-          * If true, panning will always be animated if possible. If false, it will not
-          * animate panning, either resetting the map view if panning more than a screen
-          * away, or just setting a new offset for the map pane (except for `panBy`
-          * which always does the latter).
-          */
-        animate?: boolean;
-
-        /**
-          * Duration of animated panning.
-          *
-          * Default value: 0.25.
-          */
-        duration?: number;
-
-        /**
-          * The curvature factor of panning animation easing (third parameter of the Cubic
-          * Bezier curve). 1.0 means linear animation, the less the more bowed the curve.
-          *
-          * Default value: 0.25.
-          */
-        easeLinearity?: number;
-
-        /**
-          * If true, panning won't fire movestart event on start (used internally for panning inertia).
-          *
-          * Default value: false.
-          */
-        noMoveStart?: boolean;
-    }
-}
-
-declare namespace L {
-
-    export interface Path extends ILayer, IEventPowered<Path> {
-
-        /**
-          * Adds the layer to the map.
-          */
-        addTo(map: Map): Path;
-
-        /**
-          * Binds a popup with a particular HTML content to a click on this path.
-          */
-        bindPopup(html: string, options?: PopupOptions): Path;
-
-        /**
-          * Binds a popup with a particular HTML content to a click on this path.
-          */
-        bindPopup(el: HTMLElement, options?: PopupOptions): Path;
-
-        /**
-          * Binds a popup with a particular HTML content to a click on this path.
-          */
-        bindPopup(popup: Popup, options?: PopupOptions): Path;
-
-        /**
-          * Unbinds the popup previously bound to the path with bindPopup.
-          */
-        unbindPopup(): Path;
-
-        /**
-          * Opens the popup previously bound by the bindPopup method in the given point,
-          * or in one of the path's points if not specified.
-          */
-        openPopup(latlng?: LatLngExpression): Path;
-
-        /**
-          * Closes the path's bound popup if it is opened.
-          */
-        closePopup(): Path;
-
-        /**
-          * Changes the appearance of a Path based on the options in the Path options object.
-          */
-        setStyle(object: PathOptions): Path;
-
-        /**
-          * Returns the LatLngBounds of the path.
-          */
-        getBounds(): LatLngBounds;
-
-        /**
-          * Brings the layer to the top of all path layers.
-          */
-        bringToFront(): Path;
-
-        /**
-          * Brings the layer to the bottom of all path layers.
-          */
-        bringToBack(): Path;
-
-        /**
-          * Redraws the layer. Sometimes useful after you changed the coordinates that
-          * the path uses.
-          */
-        redraw(): Path;
-        ////////////
-        ////////////
-        /**
-          * Should contain code that creates DOM elements for the overlay, adds them
-          * to map panes where they should belong and puts listeners on relevant map events.
-          * Called on map.addLayer(layer).
-          */
-        onAdd(map: Map): void;
-
-        /**
-          * Should contain all clean up code that removes the overlay's elements from
-          * the DOM and removes listeners previously added in onAdd. Called on map.removeLayer(layer).
-          */
-        onRemove(map: Map): void;
-
-        ////////////////
-        ////////////////
-        addEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): Path;
-        addOneTimeEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): Path;
-        removeEventListener(type: string, fn?: (e: LeafletEvent) => void, context?: any): Path;
-        hasEventListeners(type: string): boolean;
-        fireEvent(type: string, data?: any): Path;
-        on(type: string, fn: (e: LeafletEvent) => void, context?: any): Path;
-        once(type: string, fn: (e: LeafletEvent) => void, context?: any): Path;
-        off(type: string, fn?: (e: LeafletEvent) => void, context?: any): Path;
-        fire(type: string, data?: any): Path;
-        addEventListener(eventMap: any, context?: any): Path;
-        removeEventListener(eventMap?: any, context?: any): Path;
-        clearAllEventListeners(): Path;
-        on(eventMap: any, context?: any): Path;
-        off(eventMap?: any, context?: any): Path;
-    }
-
-    export namespace Path {
-        /**
-          * True if SVG is used for vector rendering (true for most modern browsers).
-          */
-        export var SVG: boolean;
-
-        /**
-          * True if VML is used for vector rendering (IE 6-8).
-          */
-        export var VML: boolean;
-
-        /**
-          * True if Canvas is used for vector rendering (Android 2). You can also force
-          * this by setting global variable L_PREFER_CANVAS to true before the Leaflet
-          * include on your page — sometimes it can increase performance dramatically
-          * when rendering thousands of circle markers, but currently suffers from
-          * a bug that causes removing such layers to be extremely slow.
-          */
-        export var CANVAS: boolean;
-
-        /**
-          * How much to extend the clip area around the map view (relative to its size,
-          * e.g. 0.5 is half the screen in each direction). Smaller values mean that you
-          * will see clipped ends of paths while you're dragging the map, and bigger values
-          * decrease drawing performance.
-          */
-        export var CLIP_PADDING: number;
-    }
-}
-
-declare namespace L {
-
-    export interface PathOptions {
-
-        /**
-          * Whether to draw stroke along the path. Set it to false to disable borders on
-          * polygons or circles.
-          *
-          * Default value: true.
-          */
-        stroke?: boolean;
-
-        /**
-          * Stroke color.
-          *
-          * Default value: '#03f'.
-          */
-        color?: string;
-
-        /**
-          * Stroke width in pixels.
-          *
-          * Default value: 5.
-          */
-        weight?: number;
-
-        /**
-          * Stroke opacity.
-          *
-          * Default value: 0.5.
-          */
-        opacity?: number;
-
-        /**
-          * Whether to fill the path with color. Set it to false to disable filling on polygons
-          * or circles.
-          */
-        fill?: boolean;
-
-        /**
-          * Fill color.
-          *
-          * Default value: same as color.
-          */
-        fillColor?: string;
-
-        /**
-          * Fill opacity.
-          *
-          * Default value: 0.2.
-          */
-        fillOpacity?: number;
-
-        /**
-          * A string that defines the stroke dash pattern. Doesn't work on canvas-powered
-          * layers (e.g. Android 2).
-          */
-        dashArray?: string;
-
-        /**
-          * A string that defines shape to be used at the end of the stroke.
-          *
-          * Default: null.
-          */
-        lineCap?: string;
-
-        /**
-          * A string that defines shape to be used at the corners of the stroke.
-          *
-          * Default: null.
-          */
-        lineJoin?: string;
-
-        /**
-          * If false, the vector will not emit mouse events and will act as a part of the
-          * underlying map.
-          *
-          * Default value: true.
-          */
-        clickable?: boolean;
-
-        /**
-          * Sets the pointer-events attribute on the path if SVG backend is used.
-          */
-        pointerEvents?: string;
-
-        /**
-          * Custom class name set on an element.
-          *
-          * Default value: ''.
-          */
-        className?: string;
-
-    }
-}
-
-declare namespace L {
-
-    /**
-      * Creates a Point object with the given x and y coordinates. If optional round
-      * is set to true, rounds the x and y values.
-      */
-    function point(x: number, y: number, round?: boolean): Point;
-
-    export interface PointStatic {
-        /**
-          * Creates a Point object with the given x and y coordinates. If optional round
-          * is set to true, rounds the x and y values.
-          */
-        new(x: number, y: number, round?: boolean): Point;
-    }
-    export var Point: PointStatic;
-
-    export interface Point {
-        /**
-          * Returns the result of addition of the current and the given points.
-          */
-        add(otherPoint: Point): Point;
-
-        /**
-          * Returns the result of subtraction of the given point from the current.
-          */
-        subtract(otherPoint: Point): Point;
-
-        /**
-          * Returns the result of multiplication of the current point by the given number.
-          */
-        multiplyBy(number: number): Point;
-
-        /**
-          * Returns the result of division of the current point by the given number. If
-          * optional round is set to true, returns a rounded result.
-          */
-        divideBy(number: number, round?: boolean): Point;
-
-        /**
-          * Returns the distance between the current and the given points.
-          */
-        distanceTo(otherPoint: Point): number;
-
-        /**
-          * Returns a copy of the current point.
-          */
-        clone(): Point;
-
-        /**
-          * Returns a copy of the current point with rounded coordinates.
-          */
-        round(): Point;
-
-        /**
-          * Returns true if the given point has the same coordinates.
-          */
-        equals(otherPoint: Point): boolean;
-
-        /**
-          * Returns a string representation of the point for debugging purposes.
-          */
-        toString(): string;
-
-        /**
-          * The x coordinate.
-          */
-        x: number;
-
-        /**
-          * The y coordinate.
-          */
-        y: number;
-    }
-}
-
-declare namespace L {
-
-    /**
-      * Instantiates a polygon object given an array of geographical points and
-      * optionally an options object (the same as for Polyline). You can also create
-      * a polygon with holes by passing an array of arrays of latlngs, with the first
-      * latlngs array representing the exterior ring while the remaining represent
-      * the holes inside.
-      */
-    function polygon(latlngs: LatLngBoundsExpression, options?: PolylineOptions): Polygon;
-
-
-    export interface PolygonStatic extends ClassStatic {
-        /**
-          * Instantiates a polygon object given an array of geographical points and
-          * optionally an options object (the same as for Polyline). You can also create
-          * a polygon with holes by passing an array of arrays of latlngs, with the first
-          * latlngs array representing the exterior ring while the remaining represent
-          * the holes inside.
-          */
-        new(latlngs: LatLngBoundsExpression, options?: PolylineOptions): Polygon;
-    }
-    export var Polygon: PolygonStatic;
-
-    export interface Polygon extends Polyline {
-    }
-}
-
-declare namespace L {
-
-    /**
-      * Instantiates a polyline object given an array of geographical points and
-      * optionally an options object.
-      */
-    function polyline(latlngs: LatLngBoundsExpression, options?: PolylineOptions): Polyline;
-
-    export interface PolylineStatic extends ClassStatic {
-        /**
-          * Instantiates a polyline object given an array of geographical points and
-          * optionally an options object.
-          */
-        new(latlngs: LatLngBoundsExpression, options?: PolylineOptions): Polyline;
-    }
-    export var Polyline: PolylineStatic;
-
-    export interface Polyline extends Path {
-        /**
-          * Adds a given point to the polyline.
-          */
-        addLatLng(latlng: LatLngExpression): Polyline;
-
-        /**
-          * Replaces all the points in the polyline with the given array of geographical
-          * points.
-          */
-        setLatLngs(latlngs: LatLngBoundsExpression): Polyline;
-
-        /**
-          * Returns an array of the points in the path.
-          */
-        getLatLngs(): LatLng[];
-
-        /**
-          * Allows adding, removing or replacing points in the polyline. Syntax is the
-          * same as in Array#splice. Returns the array of removed points (if any).
-          */
-        spliceLatLngs(index: number, pointsToRemove: number, ...latlngs: LatLng[]): LatLng[];
-
-        /**
-          * Returns the LatLngBounds of the polyline.
-          */
-        getBounds(): LatLngBounds;
-
-        /**
-          * Returns a GeoJSON representation of the polyline (GeoJSON LineString Feature).
-          */
-        toGeoJSON(): any;
-    }
-}
-
-declare namespace L {
-
-    export interface PolylineOptions extends PathOptions {
-
-        /**
-          * How much to simplify the polyline on each zoom level. More means better performance
-          * and smoother look, and less means more accurate representation.
-          *
-          * Default value: 1.0.
-          */
-        smoothFactor?: number;
-
-        /**
-          * Disabled polyline clipping.
-          *
-          * Default value: false.
-          */
-        noClip?: boolean;
-    }
-}
-
-declare namespace L {
-
-    namespace PolyUtil {
-
-        /**
-          * Clips the polygon geometry defined by the given points by rectangular bounds.
-          * Used by Leaflet to only show polygon points that are on the screen or near,
-          * increasing performance. Note that polygon points needs different algorithm
-          * for clipping than polyline, so there's a seperate method for it.
-          */
-        export function clipPolygon(points: Point[], bounds: Bounds): Point[];
-    }
-}
-
-declare namespace L {
-
-    /**
-      * Instantiates a Popup object given an optional options object that describes
-      * its appearance and location and an optional object that is used to tag the
-      * popup with a reference to the source object to which it refers.
-      */
-    function popup(options?: PopupOptions, source?: any): Popup;
-
-    export interface PopupStatic extends ClassStatic {
-        /**
-          * Instantiates a Popup object given an optional options object that describes
-          * its appearance and location and an optional object that is used to tag the
-          * popup with a reference to the source object to which it refers.
-          */
-        new(options?: PopupOptions, source?: any): Popup;
-    }
-    export var Popup: PopupStatic;
-
-    export interface Popup extends ILayer {
-        /**
-          * Adds the popup to the map.
-          */
-        addTo(map: Map): Popup;
-
-        /**
-          * Adds the popup to the map and closes the previous one. The same as map.openPopup(popup).
-          */
-        openOn(map: Map): Popup;
-
-        /**
-          * Sets the geographical point where the popup will open.
-          */
-        setLatLng(latlng: LatLngExpression): Popup;
-
-        /**
-          * Returns the geographical point of popup.
-          */
-        getLatLng(): LatLng;
-
-        /**
-          * Sets the HTML content of the popup.
-          */
-        setContent(html: string): Popup;
-
-        /**
-          * Sets the HTML content of the popup.
-          */
-        setContent(el: HTMLElement): Popup;
-
-        /**
-          * Returns the content of the popup.
-          */
-        getContent(): HTMLElement;
-        //getContent(): string;
-
-        ////////////
-        ////////////
-        /**
-          * Should contain code that creates DOM elements for the overlay, adds them
-          * to map panes where they should belong and puts listeners on relevant map events.
-          * Called on map.addLayer(layer).
-          */
-        onAdd(map: Map): void;
-
-        /**
-          * Should contain all clean up code that removes the overlay's elements from
-          * the DOM and removes listeners previously added in onAdd. Called on map.removeLayer(layer).
-          */
-        onRemove(map: Map): void;
-
-        /**
-          * Updates the popup content, layout and position. Useful for updating the popup after
-          * something inside changed, e.g. image loaded.
-          */
-        update(): Popup;
-    }
-}
-
-declare namespace L {
-
-    export interface PopupOptions {
-
-        /**
-          * Max width of the popup.
-          *
-          * Default value: 300.
-          */
-        maxWidth?: number;
-
-        /**
-          * Min width of the popup.
-          *
-          * Default value: 50.
-          */
-        minWidth?: number;
-
-        /**
-          * If set, creates a scrollable container of the given height inside a popup
-          * if its content exceeds it.
-          */
-        maxHeight?: number;
-
-        /**
-          * Set it to false if you don't want the map to do panning animation to fit the opened
-          * popup.
-          *
-          * Default value: true.
-          */
-        autoPan?: boolean;
-
-        /**
-          * Set it to true if you want to prevent users from panning the popup off of the screen while it is open.
-          */
-        keepInView?: boolean;
-
-        /**
-          * Controls the presense of a close button in the popup.
-          *
-          * Default value: true.
-          */
-        closeButton?: boolean;
-
-        /**
-          * The offset of the popup position. Useful to control the anchor of the popup
-          * when opening it on some overlays.
-          *
-          * Default value: new Point(0, 6).
-          */
-        offset?: Point;
-
-        /**
-          * The margin between the popup and the top left corner of the map view after
-          * autopanning was performed.
-          *
-          * Default value: null.
-          */
-        autoPanPaddingTopLeft?: Point;
-
-        /**
-          * The margin between the popup and the bottom right corner of the map view after
-          * autopanning was performed.
-          *
-          * Default value: null.
-          */
-        autoPanPaddingBottomRight?: Point;
-
-        /**
-          * The margin between the popup and the edges of the map view after autopanning
-          * was performed.
-          *
-          * Default value: new Point(5, 5).
-          */
-        autoPanPadding?: Point;
-
-        /**
-          * Whether to animate the popup on zoom. Disable it if you have problems with
-          * Flash content inside popups.
-          *
-          * Default value: true.
-          */
-        zoomAnimation?: boolean;
-
-        /**
-          * Set it to false if you want to override the default behavior of the popup
-          * closing when user clicks the map (set globally by the Map closePopupOnClick
-          * option).
-          */
-        closeOnClick?: boolean;
-
-        /**
-          * A custom class name to assign to the popup.
-          */
-        className?: string;
-    }
-}
-
-declare namespace L {
-
-    export interface PosAnimationStatic extends ClassStatic {
-        /**
-          * Creates a PosAnimation object.
-          */
-        new(): PosAnimation;
-    }
-    export var PosAnimation: PosAnimationStatic;
-
-    export interface PosAnimation extends IEventPowered<PosAnimation> {
-        /**
-          * Run an animation of a given element to a new position, optionally setting
-          * duration in seconds (0.25 by default) and easing linearity factor (3rd argument
-          * of the cubic bezier curve, 0.5 by default)
-          */
-        run(element: HTMLElement, newPos: Point, duration?: number, easeLinearity?: number): PosAnimation;
-
-        ////////////////
-        ////////////////
-        addEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): PosAnimation;
-        addOneTimeEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): PosAnimation;
-        removeEventListener(type: string, fn?: (e: LeafletEvent) => void, context?: any): PosAnimation;
-        hasEventListeners(type: string): boolean;
-        fireEvent(type: string, data?: any): PosAnimation;
-        on(type: string, fn: (e: LeafletEvent) => void, context?: any): PosAnimation;
-        once(type: string, fn: (e: LeafletEvent) => void, context?: any): PosAnimation;
-        off(type: string, fn?: (e: LeafletEvent) => void, context?: any): PosAnimation;
-        fire(type: string, data?: any): PosAnimation;
-        addEventListener(eventMap: any, context?: any): PosAnimation;
-        removeEventListener(eventMap?: any, context?: any): PosAnimation;
-        clearAllEventListeners(): PosAnimation;
-        on(eventMap: any, context?: any): PosAnimation;
-        off(eventMap?: any, context?: any): PosAnimation;
-    }
-}
-
-declare namespace L {
-
-    namespace Projection {
-
-        /**
-          * Spherical Mercator projection — the most common projection for online maps,
-          * used by almost all free and commercial tile providers. Assumes that Earth
-          * is a sphere. Used by the EPSG:3857 CRS.
-          */
-        export var SphericalMercator: IProjection;
-
-        /**
-          * Elliptical Mercator projection — more complex than Spherical Mercator.
-          * Takes into account that Earth is a geoid, not a perfect sphere. Used by the
-          * EPSG:3395 CRS.
-          */
-        export var Mercator: IProjection;
-
-        /**
-          * Equirectangular, or Plate Carree projection — the most simple projection,
-          * mostly used by GIS enthusiasts. Directly maps x as longitude, and y as latitude.
-          * Also suitable for flat worlds, e.g. game maps. Used by the EPSG:3395 and Simple
-          * CRS.
-          */
-        export var LonLat: IProjection;
-    }
-}
-
-declare namespace L {
-
-    /**
-      * Instantiates a rectangle object with the given geographical bounds and
-      * optionally an options object.
-      */
-    function rectangle(bounds: LatLngBounds, options?: PathOptions): Rectangle;
-
-    export interface RectangleStatic extends ClassStatic {
-        /**
-          * Instantiates a rectangle object with the given geographical bounds and
-          * optionally an options object.
-          */
-        new(bounds: LatLngBounds, options?: PathOptions): Rectangle;
-    }
-    export var Rectangle: RectangleStatic;
-
-    export interface Rectangle extends Polygon {
-        /**
-          * Redraws the rectangle with the passed bounds.
-          */
-        setBounds(bounds: LatLngBounds): Rectangle;
-    }
-}
-
-
-declare namespace L {
-
-    export interface ScaleOptions {
-
-        /**
-          * The position of the control (one of the map corners). See control positions.
-          * Default value: 'bottomleft'.
-          */
-        position?: string;
-
-        /**
-          * Maximum width of the control in pixels. The width is set dynamically to show
-          * round values (e.g. 100, 200, 500).
-          * Default value: 100.
-          */
-        maxWidth?: number;
-
-        /**
-          * Whether to show the metric scale line (m/km).
-          * Default value: true.
-          */
-        metric?: boolean;
-
-        /**
-          * Whether to show the imperial scale line (mi/ft).
-          * Default value: true.
-          */
-        imperial?: boolean;
-
-        /**
-          * If true, the control is updated on moveend, otherwise it's always up-to-date
-          * (updated on move).
-          * Default value: false.
-          */
-        updateWhenIdle?: boolean;
-    }
-}
-
-declare namespace L {
-
-    export interface TileLayerStatic extends ClassStatic {
-        /**
-          * Instantiates a tile layer object given a URL template and optionally an options
-          * object.
-          */
-        new(urlTemplate: string, options?: TileLayerOptions): TileLayer;
-
-        WMS: {
-            /**
-              * Instantiates a WMS tile layer object given a base URL of the WMS service and
-              * a WMS parameters/options object.
-              */
-            new(baseUrl: string, options: WMSOptions): TileLayer.WMS;
-        };
-
-        Canvas: {
-            /**
-              * Instantiates a Canvas tile layer object given an options object (optionally).
-              */
-            new(options?: TileLayerOptions): TileLayer.Canvas;
-        };
-    }
-    export var TileLayer: TileLayerStatic;
-
-    export interface TileLayer extends ILayer, IEventPowered<TileLayer> {
-        /**
-          * Adds the layer to the map.
-          */
-        addTo(map: Map): TileLayer;
-
-        /**
-          * Brings the tile layer to the top of all tile layers.
-          */
-        bringToFront(): TileLayer;
-
-        /**
-          * Brings the tile layer to the bottom of all tile layers.
-          */
-        bringToBack(): TileLayer;
-
-        /**
-          * Changes the opacity of the tile layer.
-          */
-        setOpacity(opacity: number): TileLayer;
-
-        /**
-          * Sets the zIndex of the tile layer.
-          */
-        setZIndex(zIndex: number): TileLayer;
-
-        /**
-          * Causes the layer to clear all the tiles and request them again.
-          */
-        redraw(): TileLayer;
-
-        /**
-          * Updates the layer's URL template and redraws it.
-          */
-        setUrl(urlTemplate: string): TileLayer;
-
-        /**
-          * Returns the HTML element that contains the tiles for this layer.
-          */
-        getContainer(): HTMLElement;
-
-        ////////////
-        ////////////
-        /**
-          * Should contain code that creates DOM elements for the overlay, adds them
-          * to map panes where they should belong and puts listeners on relevant map events.
-          * Called on map.addLayer(layer).
-          */
-        onAdd(map: Map): void;
-
-        /**
-          * Should contain all clean up code that removes the overlay's elements from
-          * the DOM and removes listeners previously added in onAdd. Called on map.removeLayer(layer).
-          */
-        onRemove(map: Map): void;
-
-        ////////////////
-        ////////////////
-        addEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): TileLayer;
-        addOneTimeEventListener(type: string, fn: (e: LeafletEvent) => void, context?: any): TileLayer;
-        removeEventListener(type: string, fn?: (e: LeafletEvent) => void, context?: any): TileLayer;
-        hasEventListeners(type: string): boolean;
-        fireEvent(type: string, data?: any): TileLayer;
-        on(type: string, fn: (e: LeafletEvent) => void, context?: any): TileLayer;
-        once(type: string, fn: (e: LeafletEvent) => void, context?: any): TileLayer;
-        off(type: string, fn?: (e: LeafletEvent) => void, context?: any): TileLayer;
-        fire(type: string, data?: any): TileLayer;
-        addEventListener(eventMap: any, context?: any): TileLayer;
-        removeEventListener(eventMap?: any, context?: any): TileLayer;
-        clearAllEventListeners(): TileLayer;
-        on(eventMap: any, context?: any): TileLayer;
-        off(eventMap?: any, context?: any): TileLayer;
-    }
-
-    namespace TileLayer {
-        export interface WMS extends TileLayer {
-            /**
-              * Merges an object with the new parameters and re-requests tiles on the current
-              * screen (unless noRedraw was set to true).
-              */
-            setParams(params: WMS, noRedraw?: boolean): WMS;
-        }
-
-        export interface Canvas extends TileLayer {
-            /**
-              * You need to define this method after creating the instance to draw tiles;
-              * canvas is the actual canvas tile on which you can draw, tilePoint represents
-              * the tile numbers, and zoom is the current zoom.
-              */
-            drawTile(canvas: HTMLCanvasElement, tilePoint: Point, zoom: number): Canvas;
-
-            /**
-              * Calling redraw will cause the drawTile method to be called for all tiles.
-              * May be used for updating dynamic content drawn on the Canvas
-              */
-            redraw(): Canvas;
-        }
-    }
-
-    export interface TileLayerFactory {
-
-        /**
-          * Instantiates a tile layer object given a URL template and optionally an options
-          * object.
-          */
-        (urlTemplate: string, options?: TileLayerOptions): TileLayer;
-
-        /**
-          * Instantiates a WMS tile layer object given a base URL of the WMS service and
-          * a WMS parameters/options object.
-          */
-        wms(baseUrl: string, options: WMSOptions): L.TileLayer.WMS;
-
-        /**
-          * Instantiates a Canvas tile layer object given an options object (optionally).
-          */
-        canvas(options?: TileLayerOptions): L.TileLayer.Canvas;
-    }
-
-    export var tileLayer: TileLayerFactory;
-}
-
-declare namespace L {
-
-    export interface TileLayerOptions {
-
-        /**
-          * Minimum zoom number.
-          *
-          * Default value: 0.
-          */
-        minZoom?: number;
-
-        /**
-          * Maximum zoom number.
-          *
-          * Default value: 18.
-          */
-        maxZoom?: number;
-
-        /**
-          * Maximum zoom number the tiles source has available. If it is specified,
-          * the tiles on all zoom levels higher than maxNativeZoom will be loaded from
-          * maxZoom level and auto-scaled.
-          *
-          * Default value: null.
-          */
-        maxNativeZoom?: number;
-
-        /**
-          * Tile size (width and height in pixels, assuming tiles are square).
-          *
-          * Default value: 256.
-          */
-        tileSize?: number;
-
-        /**
-          * Subdomains of the tile service. Can be passed in the form of one string (where
-          * each letter is a subdomain name) or an array of strings.
-          *
-          * Default value: 'abc'.
-          */
-        subdomains?: string[];
-
-        /**
-          * URL to the tile image to show in place of the tile that failed to load.
-          *
-          * Default value: ''.
-          */
-        errorTileUrl?: string;
-
-        /**
-          * e.g. "© CloudMade" — the string used by the attribution control, describes
-          * the layer data.
-          *
-          * Default value: ''.
-          */
-        attribution?: string;
-
-        /**
-          * If true, inverses Y axis numbering for tiles (turn this on for TMS services).
-          *
-          * Default value: false.
-          */
-        tms?: boolean;
-
-        /**
-          * If set to true, the tile coordinates won't be wrapped by world width (-180
-          * to 180 longitude) or clamped to lie within world height (-90 to 90). Use this
-          * if you use Leaflet for maps that don't reflect the real world (e.g. game, indoor
-          * or photo maps).
-          *
-          * Default value: false.
-          */
-        continuousWorld?: boolean;
-
-        /**
-          * If set to true, the tiles just won't load outside the world width (-180 to 180
-          * longitude) instead of repeating.
-          *
-          * Default value: false.
-          */
-        noWrap?: boolean;
-
-        /**
-          * The zoom number used in tile URLs will be offset with this value.
-          *
-          * Default value: 0.
-          */
-        zoomOffset?: number;
-
-        /**
-          * If set to true, the zoom number used in tile URLs will be reversed (maxZoom
-          * - zoom instead of zoom)
-          *
-          * Default value: false.
-          */
-        zoomReverse?: boolean;
-
-        /**
-          * The opacity of the tile layer.
-          *
-          * Default value: 1.0.
-          */
-        opacity?: number;
-
-        /**
-          * The explicit zIndex of the tile layer. Not set by default.
-          */
-        zIndex?: number;
-
-        /**
-          * If true, all the tiles that are not visible after panning are removed (for
-          * better performance). true by default on mobile WebKit, otherwise false.
-          */
-        unloadInvisibleTiles?: boolean;
-
-        /**
-          * If false, new tiles are loaded during panning, otherwise only after it (for
-          * better performance). true by default on mobile WebKit, otherwise false.
-          */
-        updateWhenIdle?: boolean;
-
-        /**
-          * If true and user is on a retina display, it will request four tiles of half the
-          * specified size and a bigger zoom level in place of one to utilize the high resolution.
-          *
-          * Default value: false.
-          */
-        detectRetina?: boolean;
-
-        /**
-          * If true, all the tiles that are not visible after panning are placed in a reuse
-          * queue from which they will be fetched when new tiles become visible (as opposed
-          * to dynamically creating new ones). This will in theory keep memory usage
-          * low and eliminate the need for reserving new memory whenever a new tile is
-          * needed.
-          *
-          * Default value: false.
-          */
-        reuseTiles?: boolean;
-
-        /**
-          * When this option is set, the TileLayer only loads tiles that are in the given geographical bounds.
-          */
-        bounds?: LatLngBounds;
-
-        /**
-          * Custom keys may be specified in TileLayerOptions so they can be used in a provided URL template.
-          */
-        [additionalKeys: string]: any;
-    }
-}
-
-declare namespace L {
-    export interface TransformationStatic {
-        /**
-          * Creates a transformation object with the given coefficients.
-          */
-        new(a: number, b: number, c: number, d: number): Transformation;
-    }
-    export var Transformation: TransformationStatic;
-
-    export interface Transformation {
-        /**
-          * Returns a transformed point, optionally multiplied by the given scale.
-          * Only accepts real L.Point instances, not arrays.
-          */
-        transform(point: Point, scale?: number): Point;
-
-        /**
-          * Returns the reverse transformation of the given point, optionally divided
-          * by the given scale. Only accepts real L.Point instances, not arrays.
-          */
-        untransform(point: Point, scale?: number): Point;
-    }
-}
-
-declare namespace L {
-
-    namespace Util {
-
-        /**
-          * Merges the properties of the src object (or multiple objects) into dest object
-          * and returns the latter. Has an L.extend shortcut.
-          */
-        export function extend(dest: any, ...sources: any[]): any;
-
-        /**
-          * Returns a function which executes function fn with the given scope obj (so
-          * that this keyword refers to obj inside the function code). Has an L.bind shortcut.
-          */
-        export function bind<T extends Function>(fn: T, obj: any): T;
-
-        /**
-          * Applies a unique key to the object and returns that key. Has an L.stamp shortcut.
-          */
-        export function stamp(obj: any): string;
-
-        /**
-          * Returns a wrapper around the function fn that makes sure it's called not more
-          * often than a certain time interval time, but as fast as possible otherwise
-          * (for example, it is used for checking and requesting new tiles while dragging
-          * the map), optionally passing the scope (context) in which the function will
-          * be called.
-          */
-        export function limitExecByInterval<T extends Function>(fn: T, time: number, context?: any): T;
-
-        /**
-          * Returns a function which always returns false.
-          */
-        export function falseFn(): () => boolean;
-
-        /**
-          * Returns the number num rounded to digits decimals.
-          */
-        export function formatNum(num: number, digits: number): number;
-
-        /**
-          * Trims and splits the string on whitespace and returns the array of parts.
-          */
-        export function splitWords(str: string): string[];
-
-        /**
-          * Merges the given properties to the options of the obj object, returning the
-          * resulting options. See Class options. Has an L.setOptions shortcut.
-          */
-        export function setOptions(obj: any, options: any): any;
-
-        /**
-          * Converts an object into a parameter URL string, e.g. {a: "foo", b: "bar"}
-          * translates to '?a=foo&b=bar'.
-          */
-        export function getParamString(obj: any): string;
-
-        /**
-          * Simple templating facility, creates a string by applying the values of the
-          * data object of a form {a: 'foo', b: 'bar', …} to a template string of the form
-          * 'Hello {a}, {b}' — in this example you will get 'Hello foo, bar'.
-          */
-        export function template(str: string, data: any): string;
-
-        /**
-          * Returns true if the given object is an array.
-          */
-        export function isArray(obj: any): boolean;
-
-        /**
-          * Trims the whitespace from both ends of the string and returns the result.
-          */
-        export function trim(str: string): string;
-
-        /**
-          * Data URI string containing a base64-encoded empty GIF image. Used as a hack
-          * to free memory from unused images on WebKit-powered mobile devices (by setting
-          * image src to this string).
-          */
-        export var emptyImageUrl: string;
-    }
-}
-
-
-declare namespace L {
-
-    export interface WMSOptions {
-
-        /**
-          * (required) Comma-separated list of WMS layers to show.
-          *
-          * Default value: ''.
-          */
-        layers?: string;
-
-        /**
-          * Comma-separated list of WMS styles.
-          *
-          * Default value: 'image/jpeg'.
-          */
-        styles?: string;
-
-        /**
-          * WMS image format (use 'image/png' for layers with transparency).
-          *
-          * Default value: false.
-          */
-        format?: string;
-
-        /**
-          * If true, the WMS service will return images with transparency.
-          *
-          * Default value: '1.1.1'.
-          */
-        transparent?: boolean;
-
-        /**
-          * Version of the WMS service to use.
-          */
-        version?: string;
-
-    }
-}
-
-/**
-  * Forces Leaflet to use the Canvas back-end (if available) for vector layers
-  * instead of SVG. This can increase performance considerably in some cases
-  * (e.g. many thousands of circle markers on the map).
-  */
-declare var L_PREFER_CANVAS: boolean;
-
-/**
-  * Forces Leaflet to not use touch events even if it detects them.
-  */
-declare var L_NO_TOUCH: boolean;
-
-/**
-  * Forces Leaflet to not use hardware-accelerated CSS 3D transforms for positioning
-  * (which may cause glitches in some rare environments) even if they're supported.
-  */
-declare var L_DISABLE_3D: boolean;
-
-declare module "leaflet" {
-	export = L;
-}
-
-// vim: et ts=4 sw=4
diff --git a/leaflet/tsconfig.json b/leaflet/tsconfig.json
new file mode 100644
index 0000000000..072b0ee2cc
--- /dev/null
+++ b/leaflet/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "leaflet-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/leapmotionTS/LeapMotionTS-tests.ts b/leapmotionTS/LeapMotionTS-tests.ts
index ac392941ef..50f9f895c0 100644
--- a/leapmotionTS/LeapMotionTS-tests.ts
+++ b/leapmotionTS/LeapMotionTS-tests.ts
@@ -1,4 +1,4 @@
-import Leap = require('./LeapMotionTS');
+import Leap = require('LeapMotionTS');
 
 var controller: Leap.Controller = new Leap.Controller();
 controller.addEventListener(Leap.LeapEvent.LEAPMOTION_FRAME, (event: Leap.LeapEvent) => {
diff --git a/leapmotionTS/LeapMotionTS.d.ts b/leapmotionTS/index.d.ts
similarity index 100%
rename from leapmotionTS/LeapMotionTS.d.ts
rename to leapmotionTS/index.d.ts
diff --git a/leapmotionTS/tsconfig.json b/leapmotionTS/tsconfig.json
new file mode 100644
index 0000000000..677b41e957
--- /dev/null
+++ b/leapmotionTS/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "leapmotionTS-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/less-middleware/index.d.ts b/less-middleware/index.d.ts
new file mode 100644
index 0000000000..5d9b7e301d
--- /dev/null
+++ b/less-middleware/index.d.ts
@@ -0,0 +1,107 @@
+// Type definitions for less-middleware 2.0.1
+// Project: https://github.com/emberfeather/less.js-middleware
+// Definitions by: Federico Bond <https://github.com/federicobond/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* =================== USAGE ===================
+
+    import lessMiddleware = require('less-middleware');
+    app.use(lessMiddleware(source, options));
+
+ =============================================== */
+
+
+
+
+import express = require('express');
+
+/**
+ * Middleware created to allow processing of Less files for Connect JS framework
+ * and by extension the Express JS framework
+ */
+declare function lessMiddleware(source: string, options?: {
+    /**
+    * Show more verbose logging?
+    */
+    debug?: boolean;
+
+    /**
+    * Destination directory to output the compiled .css files.
+    */
+    dest?: string;
+
+    /**
+     * Always re-compile less files on each request.
+     */
+    force?: boolean;
+
+    /**
+     * Only recompile once after each server restart.
+     * Useful for reducing disk i/o on production.
+     */
+    once?: boolean;
+
+    /**
+     * Common root of the source and destination.
+     * It is prepended to both the source and destination before being used.
+     */
+    pathRoot?: string;
+
+    /**
+     * Object containing functions relevant to preprocessing data.
+     */
+    postprocess?: {
+
+        /**
+         * Function that modifies the compiled css output before being stored.
+         */
+        css?(css: string, req: express.Request): string;
+    };
+
+    /**
+     * Object containing functions relevant to preprocessing data.
+     */
+    preprocess?: {
+
+        /**
+         * Function that modifies the raw less output before being parsed and compiled.
+         */
+        less?(css: string, req: express.Request): string;
+
+        /**
+         * Function that modifies the less pathname before being loaded from the filesystem.
+         */
+        path?(pathname: string, req: express.Request): string;
+
+        /**
+         * Function that modifies the import paths used by the less parser per request.
+         */
+        importPaths?(paths: string[], req: express.Request): string[];
+    };
+
+    /**
+     * Options for the less render.
+     */
+    render?: {
+
+        compress?: string;
+        yuicompress?: boolean;
+        paths?: string[];
+    };
+
+    /**
+     * Function that is in charge of storing the css in the filesystem.
+     */
+    storeCss?(pathname: string, css: string, req: express.Request, next: Function): void;
+
+    /**
+     * Path to a JSON file that will be used to cache less data across server restarts.
+     * This can greatly speed up initial load time after a server restart - if the less
+     * files haven't changed and the css files still exist, specifying this option will
+     * mean that the less files don't need to be recompiled after a server restart.  
+     */
+    cacheFile?: string;
+
+}): express.RequestHandler;
+
+export = lessMiddleware;
diff --git a/less-middleware/less-middleware-tests.ts b/less-middleware/less-middleware-tests.ts
index 0a84203b60..e453df6c69 100644
--- a/less-middleware/less-middleware-tests.ts
+++ b/less-middleware/less-middleware-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="less-middleware.d.ts" />
 
 import express = require('express');
 import lessMiddleware = require('less-middleware');
diff --git a/less-middleware/less-middleware.d.ts b/less-middleware/less-middleware.d.ts
deleted file mode 100644
index f9d12a6f19..0000000000
--- a/less-middleware/less-middleware.d.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-// Type definitions for less-middleware 2.0.1
-// Project: https://github.com/emberfeather/less.js-middleware
-// Definitions by: Federico Bond <https://github.com/federicobond/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/* =================== USAGE ===================
-
-    import lessMiddleware = require('less-middleware');
-    app.use(lessMiddleware(source, options));
-
- =============================================== */
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "less-middleware" {
-    import express = require('express');
-
-    /**
-     * Middleware created to allow processing of Less files for Connect JS framework
-     * and by extension the Express JS framework
-     */
-    function lessMiddleware(source: string, options?: {
-        /**
-        * Show more verbose logging?
-        */
-        debug?: boolean;
-
-        /**
-        * Destination directory to output the compiled .css files.
-        */
-        dest?: string;
-
-        /**
-         * Always re-compile less files on each request.
-         */
-        force?: boolean;
-
-        /**
-         * Only recompile once after each server restart.
-         * Useful for reducing disk i/o on production.
-         */
-        once?: boolean;
-
-        /**
-         * Common root of the source and destination.
-         * It is prepended to both the source and destination before being used.
-         */
-        pathRoot?: string;
-
-        /**
-         * Object containing functions relevant to preprocessing data.
-         */
-        postprocess?: {
-
-          /**
-           * Function that modifies the compiled css output before being stored.
-           */
-          css?(css: string, req: express.Request): string;
-        };
-
-        /**
-         * Object containing functions relevant to preprocessing data.
-         */
-        preprocess?: {
-
-            /**
-             * Function that modifies the raw less output before being parsed and compiled.
-             */
-            less?(css: string, req: express.Request): string;
-
-            /**
-             * Function that modifies the less pathname before being loaded from the filesystem.
-             */
-            path?(pathname: string, req: express.Request): string;
-
-            /**
-             * Function that modifies the import paths used by the less parser per request.
-             */
-            importPaths?(paths: string[], req: express.Request): string[];
-        };
-
-        /**
-         * Options for the less render.
-         */
-        render?: {
-
-            compress?: string;
-            yuicompress?: boolean;
-            paths?: string[];
-        };
-
-        /**
-         * Function that is in charge of storing the css in the filesystem.
-         */
-        storeCss?(pathname: string, css: string, req: express.Request, next: Function): void;
-
-        /**
-         * Path to a JSON file that will be used to cache less data across server restarts.
-         * This can greatly speed up initial load time after a server restart - if the less
-         * files haven't changed and the css files still exist, specifying this option will
-         * mean that the less files don't need to be recompiled after a server restart.  
-         */
-        cacheFile?: string;
-
-    }): express.RequestHandler;
-
-    export = lessMiddleware;
-}
diff --git a/less-middleware/tsconfig.json b/less-middleware/tsconfig.json
new file mode 100644
index 0000000000..1444c3e1f0
--- /dev/null
+++ b/less-middleware/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "less-middleware-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/less/less.d.ts b/less/index.d.ts
similarity index 100%
rename from less/less.d.ts
rename to less/index.d.ts
diff --git a/less/less-tests.ts b/less/less-tests.ts
index b6326b4a4d..fcd09767a8 100644
--- a/less/less-tests.ts
+++ b/less/less-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="less.d.ts" />
+
 
 import less = require("less");
 
diff --git a/less/tsconfig.json b/less/tsconfig.json
new file mode 100644
index 0000000000..df27ec5f7d
--- /dev/null
+++ b/less/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "less-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/lestate/index.d.ts b/lestate/index.d.ts
new file mode 100644
index 0000000000..c606b93c36
--- /dev/null
+++ b/lestate/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for LeState v0.1.3
+// Project: https://github.com/LeTools/LeState
+// Definitions by: Hadrian Oliveira <https://github.com/thelambdaparty/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare let LeState : {
+    createState: (props?: {
+        initialState: {};
+    }) => {
+        set(newValue: {}): [{
+            id: number;
+            state: {};
+        }];
+        get(): any;
+        insert(newValue: {}): void;
+        getDescription(): {};
+        createListener({ id, selector, force }: {
+            id: number;
+            selector: (state :any) => {};
+            force?: boolean;
+        }): void;
+    };
+};
+
+export = LeState;
diff --git a/lestate/lestate-tests.ts b/lestate/lestate-tests.ts
index 9a007c68d2..3c2b074d2d 100644
--- a/lestate/lestate-tests.ts
+++ b/lestate/lestate-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="./lestate.d.ts"/>
-
+import LeState = require("lestate");
 let State = LeState.createState()
 
 State.set({
diff --git a/lestate/lestate.d.ts b/lestate/lestate.d.ts
deleted file mode 100644
index f03a4249a2..0000000000
--- a/lestate/lestate.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// Type definitions for LeState v0.1.3
-// Project: https://github.com/LeTools/LeState
-// Definitions by: Hadrian Oliveira <https://github.com/thelambdaparty/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare let LeState : {
-    createState: (props?: {
-        initialState: {};
-    }) => {
-        set(newValue: {}): [{
-            id: number;
-            state: {};
-        }];
-        get(): any;
-        insert(newValue: {}): void;
-        getDescription(): {};
-        createListener({ id, selector, force }: {
-            id: number;
-            selector: (state :any) => {};
-            force?: boolean;
-        }): void;
-    };
-};
-
-declare module "lestate" {
-    export default LeState;
-}
diff --git a/lestate/tsconfig.json b/lestate/tsconfig.json
new file mode 100644
index 0000000000..b994063889
--- /dev/null
+++ b/lestate/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "lestate-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/level-sublevel/index.d.ts b/level-sublevel/index.d.ts
new file mode 100644
index 0000000000..f6a8f30943
--- /dev/null
+++ b/level-sublevel/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for level-sublevel
+// Project: https://github.com/dominictarr/level-sublevel
+// Definitions by: Bas Pennings <https://github.com/basp/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="levelup" />
+
+interface Hook {
+	(ch: any, add: (op: Batch|boolean) => void): void;
+}
+
+interface Batch {
+	prefix?: Sublevel;
+}
+
+interface Sublevel extends LevelUp {
+	sublevel(key: string): Sublevel;
+	pre(hook: Hook): Function;
+}
+
+declare module "level-sublevel" {
+	function sublevel(levelup: LevelUp): Sublevel;
+	export = sublevel;		
+}
\ No newline at end of file
diff --git a/level-sublevel/level-sublevel-tests.ts b/level-sublevel/level-sublevel-tests.ts
index 9887dd70c1..2bab6c8237 100644
--- a/level-sublevel/level-sublevel-tests.ts
+++ b/level-sublevel/level-sublevel-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="level-sublevel.d.ts" />
+
 
 import levelup = require('levelup');
 import sublevel = require('level-sublevel');
diff --git a/level-sublevel/level-sublevel.d.ts b/level-sublevel/level-sublevel.d.ts
deleted file mode 100644
index 5046a8c320..0000000000
--- a/level-sublevel/level-sublevel.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Type definitions for level-sublevel
-// Project: https://github.com/dominictarr/level-sublevel
-// Definitions by: Bas Pennings <https://github.com/basp/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../levelup/levelup.d.ts" />
-
-interface Hook {
-	(ch: any, add: (op: Batch|boolean) => void): void;
-}
-
-interface Batch {
-	prefix?: Sublevel;
-}
-
-interface Sublevel extends LevelUp {
-	sublevel(key: string): Sublevel;
-	pre(hook: Hook): Function;
-}
-
-declare module "level-sublevel" {
-	function sublevel(levelup: LevelUp): Sublevel;
-	export = sublevel;		
-}
\ No newline at end of file
diff --git a/level-sublevel/tsconfig.json b/level-sublevel/tsconfig.json
new file mode 100644
index 0000000000..d19f8a9c97
--- /dev/null
+++ b/level-sublevel/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "level-sublevel-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/levelup/levelup.d.ts b/levelup/index.d.ts
similarity index 100%
rename from levelup/levelup.d.ts
rename to levelup/index.d.ts
diff --git a/levelup/levelup-tests.ts b/levelup/levelup-tests.ts
index d88f48cf37..4349c2864c 100644
--- a/levelup/levelup-tests.ts
+++ b/levelup/levelup-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="levelup.d.ts" />
+
 
 import levelup = require("levelup");
 
@@ -46,10 +46,10 @@ db.batch()
 var open:boolean = db.isOpen();
 var closed:boolean = db.isClosed(); 
 db.createReadStream()
-    .on('data', function (data) {
+    .on('data', function (data: any) {
       console.log(data.key, '=', data.value)
     })
-    .on('error', function (err) {
+    .on('error', function (err: any) {
       console.log('Oh my!', err)
     })
     .on('close', function () {
diff --git a/levelup/levelup-tests.ts.tscparams b/levelup/levelup-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/levelup/levelup-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/levelup/tsconfig.json b/levelup/tsconfig.json
new file mode 100644
index 0000000000..f9cb162b32
--- /dev/null
+++ b/levelup/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "levelup-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/libxmljs/index.d.ts b/libxmljs/index.d.ts
new file mode 100644
index 0000000000..bc33a4eec1
--- /dev/null
+++ b/libxmljs/index.d.ts
@@ -0,0 +1,114 @@
+// Type definitions for Libxmljs v0.14.2
+// Project: https://github.com/polotek/libxmljs
+// Definitions by: François de Campredon <https://github.com/fdecampredon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+
+import events = require('events');
+
+export declare function parseXml(source: string): XMLDocument;
+export declare function parseHtml(source: string): HTMLDocument;
+export declare function parseXmlString(source: string): XMLDocument;
+export declare function parseHtmlString(source: string): HTMLDocument;
+
+
+export declare class XMLDocument {
+    constructor(version: number, encoding: string);
+    child(idx: number): Element;
+    childNodes(): Element[];
+    errors(): SyntaxError[];
+    encoding(): string;
+    encoding(enc: string): void;
+    find(xpath: string): Element[];
+    get(xpath: string): Element;
+    node(name: string, content: string): Element;
+    root(): Element;
+    toString(): string;
+    validate(xsdDoc: XMLDocument): boolean;
+    validationErrors: XmlError[];
+    version(): Number;
+}
+
+export declare class HTMLDocument extends XMLDocument {
+
+}
+
+
+export declare class Element {
+    constructor(doc: XMLDocument, name: string, content?: string);
+    name(): string;
+    name(newName: string): void;
+    text(): string;
+    attr(name: string): Attribute;
+    attr(attr: Attribute): void;
+    attr(attrObject: { [key: string]: string; }): void;
+    attrs(): Attribute[];
+    parent(): Element;
+    doc(): XMLDocument;
+    child(idx: number): Element;
+    childNodes(): Element[];
+    addChild(child: Element): Element;
+    nextSibling(): Element;
+    nextElement(): Element;
+    addNextSibling(siblingNode: Element): Element;
+    prevSibling(): Element;
+    prevElement(): Element;
+    addPrevSibling(siblingNode: Element): Element;
+    find(xpath: string): Element[];
+    find(xpath: string, ns_uri: string): Element[];
+    find(xpath: string, namespaces: { [key: string]: string; }): Element[];
+    get(xpath: string): Element;
+    get(xpath: string, ns_uri: string): Element;
+    get(xpath: string, ns_uri: { [key: string]: string; }): Element;
+    defineNamespace(href: string): Namespace;
+    defineNamespace(prefix: string, href: string): Namespace;
+    namespace(): Namespace;
+    namespace(ns: Namespace): void;
+    namespace(href: string): void;
+    namespace(prefix: string, href: string): void;
+    remove(): void;
+    path(): string;
+    type(): string;
+}
+
+
+export declare class Attribute {
+    constructor(node: Element, name: string, value: string);
+    constructor(node: Element, name: string, value: string, ns: Namespace);
+    name(): string;
+    namespace(): Namespace;
+    namespace(ns: Namespace): Namespace;
+    nextSibling(): Attribute;
+    node(): Element;
+    prevSibling(): Attribute;
+    remove(): void;
+    value(): string;
+}
+
+export declare class Namespace {
+    constructor(node: Element, prefix: string, href: string);
+    href(): string;
+    prefix(): string;
+}
+
+export declare class SaxParser extends events.EventEmitter {
+    parseString(source: string): boolean;
+}
+
+
+export declare class SaxPushParser extends events.EventEmitter {
+    push(source: string): boolean;
+}
+
+export interface XmlError {
+    domain: number;
+    code: number;
+    message: string;
+    level: number;
+    file?: string;
+    column: number;
+    line: number;
+}
diff --git a/libxmljs/libxmljs-tests.ts b/libxmljs/libxmljs-tests.ts
index fbc8628185..87d634aab4 100644
--- a/libxmljs/libxmljs-tests.ts
+++ b/libxmljs/libxmljs-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="..\node\node.d.ts" />
-/// <reference path="libxmljs.d.ts" />
+
 
 var libxmljs = require("libxmljs");
 var xml =  '<?xml version="1.0" encoding="UTF-8"?>' +
diff --git a/libxmljs/libxmljs.d.ts b/libxmljs/libxmljs.d.ts
deleted file mode 100644
index 8cd4720b32..0000000000
--- a/libxmljs/libxmljs.d.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-// Type definitions for Libxmljs v0.14.2
-// Project: https://github.com/polotek/libxmljs
-// Definitions by: François de Campredon <https://github.com/fdecampredon>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare module "libxmljs" {
-
-    import events = require('events');
-
-    export function parseXml(source:string):XMLDocument;
-    export function parseHtml(source:string):HTMLDocument;
-    export function parseXmlString(source:string):XMLDocument;
-    export function parseHtmlString(source:string):HTMLDocument;
- 
- 
-    export class XMLDocument {
-        constructor(version:number, encoding:string);
-        child(idx:number):Element;
-        childNodes():Element[];
-        errors():SyntaxError[];
-        encoding():string;
-        encoding(enc:string):void;
-        find(xpath:string):Element[];
-        get(xpath:string):Element;
-        node(name:string, content:string):Element;
-        root():Element;
-        toString():string;
-        validate(xsdDoc:XMLDocument): boolean;
-        validationErrors: XmlError[];
-        version():Number;
-    }
- 
-    export class HTMLDocument extends XMLDocument {
- 
-    }
- 
- 
-    export class Element {
-        constructor(doc:XMLDocument, name:string, content?:string);
-        name():string;
-        name(newName:string):void;
-        text():string;
-        attr(name:string):Attribute;
-        attr(attr:Attribute):void;
-        attr(attrObject:{[key:string]:string;}):void;
-        attrs():Attribute[];
-        parent():Element;
-        doc():XMLDocument;
-        child(idx:number):Element;
-        childNodes():Element[];
-        addChild(child:Element):Element;
-        nextSibling():Element;
-        nextElement():Element;
-        addNextSibling(siblingNode:Element):Element;
-        prevSibling():Element;
-        prevElement():Element;
-        addPrevSibling(siblingNode:Element):Element;
-        find(xpath:string):Element[];
-        find(xpath:string, ns_uri:string):Element[];
-        find(xpath:string, namespaces:{[key:string]:string;}):Element[];
-        get(xpath:string):Element;
-        get(xpath:string, ns_uri:string):Element;
-        get(xpath:string, ns_uri:{[key:string]:string;}):Element;
-        defineNamespace(href:string):Namespace;
-        defineNamespace(prefix:string, href:string):Namespace;
-        namespace():Namespace;
-        namespace(ns:Namespace):void;
-        namespace(href:string):void;
-        namespace(prefix:string, href:string):void;
-        remove():void;
-        path():string;
-        type():string;
-    }
- 
- 
-    export class Attribute {
-        constructor(node:Element, name:string, value:string);
-        constructor(node:Element, name:string, value:string, ns:Namespace);
-        name():string;
-        namespace():Namespace;
-        namespace(ns:Namespace):Namespace;
-        nextSibling():Attribute;
-        node():Element;
-        prevSibling():Attribute;
-        remove():void;
-        value():string;
-    }
- 
-    export class Namespace {
-        constructor(node:Element, prefix:string, href:string);
-        href():string;
-        prefix():string;
-    }
- 
-    export class SaxParser extends events.EventEmitter {
-        parseString(source:string):boolean;
-    }
- 
- 
-    export class SaxPushParser extends events.EventEmitter {
-        push(source:string):boolean;
-    }
-
-    export interface XmlError {
-        domain: number;
-        code: number;
-        message: string;
-        level: number;
-        file?: string;
-        column: number;
-        line: number;
-    }
-}
diff --git a/libxmljs/tsconfig.json b/libxmljs/tsconfig.json
new file mode 100644
index 0000000000..96ebabd477
--- /dev/null
+++ b/libxmljs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "libxmljs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/lime-js/lime-js.d.ts b/lime-js/index.d.ts
similarity index 100%
rename from lime-js/lime-js.d.ts
rename to lime-js/index.d.ts
diff --git a/lime-js/lime-js-tests.ts b/lime-js/lime-js-tests.ts
index aa73444b17..c81b3db1da 100644
--- a/lime-js/lime-js-tests.ts
+++ b/lime-js/lime-js-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./lime-js.d.ts" />
+
 
 var transport = new Lime.WebSocketTransport(true);
 var clientChannel = new Lime.ClientChannel(transport, true, true);
diff --git a/lime-js/tsconfig.json b/lime-js/tsconfig.json
new file mode 100644
index 0000000000..26ec4b9ced
--- /dev/null
+++ b/lime-js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "lime-js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/line-reader/line-reader.d.ts b/line-reader/index.d.ts
similarity index 100%
rename from line-reader/line-reader.d.ts
rename to line-reader/index.d.ts
diff --git a/line-reader/line-reader-tests.ts b/line-reader/line-reader-tests.ts
index 4d6ce42466..c128f02c84 100644
--- a/line-reader/line-reader-tests.ts
+++ b/line-reader/line-reader-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="line-reader.d.ts" />
+
 
 import lineReader = require('line-reader');
 
diff --git a/line-reader/tsconfig.json b/line-reader/tsconfig.json
new file mode 100644
index 0000000000..25c83051ad
--- /dev/null
+++ b/line-reader/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "line-reader-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/linq/linq.d.ts b/linq/index.d.ts
similarity index 100%
rename from linq/linq.d.ts
rename to linq/index.d.ts
diff --git a/linq/linq-tests.ts b/linq/linq-tests.ts
index fb9c3f3d6e..34265c6893 100644
--- a/linq/linq-tests.ts
+++ b/linq/linq-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path='../jasmine/jasmine.d.ts'/>
-/// <reference path='linq.d.ts'/>
-// <reference path="c:/linq.js" /> tests were run from VisualStudio + Resharper7
+/// <reference types="jasmine"/>
 
 describe("Linq.js tests", function () {
     it("Projection and Filtering Methods", function () {
diff --git a/linq/linq-tests.ts.tscparams b/linq/linq-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/linq/linq-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/linq/linq.d.ts.tscparams b/linq/linq.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/linq/linq.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/linq/linq.jquery.d.ts b/linq/linq.jquery.d.ts
index 1c96a01eb6..2a4a1b089a 100644
--- a/linq/linq.jquery.d.ts
+++ b/linq/linq.jquery.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: neuecc <http://www.codeplex.com/site/users/view/neuecc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../jquery/jquery.d.ts"/>
+/// <reference types="jquery"/>
 /// <reference path="linq.d.ts"/>
 
 declare namespace linqjs {
diff --git a/linq/linq.jquery.d.ts.tscparams b/linq/linq.jquery.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/linq/linq.jquery.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/linq/tsconfig.json b/linq/tsconfig.json
new file mode 100644
index 0000000000..5e1fa03a4b
--- /dev/null
+++ b/linq/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "linq-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/linqsharp/index.d.ts b/linqsharp/index.d.ts
new file mode 100644
index 0000000000..742698ed86
--- /dev/null
+++ b/linqsharp/index.d.ts
@@ -0,0 +1,498 @@
+// Type definitions for linqsharp
+// Project: https://www.npmjs.com/package/linqsharp
+// Definitions by: Bruno Leonardo Michels <https://github.com/brunolm>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// JSDoc: Extracted and adapted from .NET source code.
+
+/**
+ * LinqSharp module defines a helper class with
+ * .NET's Linq methods.
+ *
+ * @module linqsharp
+ */
+
+export declare namespace LinqSharp {
+    /**
+     * Defines methods to support the comparison of objects for equality.
+     *
+     * {T} The type of objects to compare.
+     */
+    export interface IEqualityComparer<T> {
+        Equals(x: T, y: T): boolean;
+        GetHashCode(obj: T): number;
+    }
+
+    /**
+     * Represents a collection of objects that have a common key.
+     *
+     * {TKey} The type of the key.
+     * {T} The type of the values.
+     */
+    export interface IGrouping<TKey, T> {
+        Key: TKey;
+        Elements: T[];
+    }
+
+    /**
+     * Gets the HashCode of the object.
+     *
+     * @param e Object to compute hash.
+     * @returns A computed HashCode for the object.
+     */
+    export function GetHashCode(e: any): any;
+
+    /**
+     * Transforms a object into a string replacing circular
+     * references by reference tokens.
+     *
+     * @param obj Object to convert to string.
+     * @returns String representation of the object.
+     */
+    export function StringifyNonCircular(obj: any): string;
+}
+
+/**
+ * Wrapper class for an array that provides Linq functionallity.
+ *
+ * @class Linq<T>
+ */
+declare class Linq<T> {
+    /** {T[]} Internal array reference. */
+    private a: T[];
+
+    /**
+     * Creates a new instance holding an array of <T>.
+     * @constructor
+     *
+     * @param {Array} a Array.
+     */
+    constructor(a?: T[]);
+
+    /**
+     * Applies an accumulator function over a sequence.
+     *
+     * @param func An accumulator function to be
+     * invoked on each element.
+     * @param {T} [initialValue] The initial accumulator value.
+     *
+     * @throws Error if array is empty.
+     *
+     * @returns {T} The final accumulator value.
+     */
+    Aggregate<TResult>(func: (previous: T, next: T) => TResult, initialValue?: T): T;
+
+    /**
+     * Determines whether all elements of a sequence satisfy a condition.
+     *
+     * @param predicate A function to test each element for a condition.
+     *
+     * @returns true if every element of the source sequence passes the test in the specified
+     * predicate, or if the sequence is empty; otherwise, false.
+     */
+    All(predicate: (value: T) => boolean): boolean;
+
+    /**
+     * Determines whether a sequence contains any elements.
+     *
+     * @param [predicate] A function to test each element for a condition.
+     *
+     * @returns true if any elements in the source sequence pass the test in the specified predicate;
+     * otherwise, false. If no predicate is specified return true if the source sequence contains any elements;
+     * otherwise, false.
+     */
+    Any(predicate?: (value: T) => boolean): boolean;
+
+    /**
+     * Computes the average of a sequence of {number} values.
+     *
+     * @param [selector] A transform function to apply to each element.
+     *
+     * @returns The average of the sequence of values.
+     */
+    Average(selector?: (value: T) => number): number;
+
+    /**
+     * Concatenates two sequences.
+     *
+     * @param array The sequence to concatenate to the first sequence.
+     *
+     * @returns An array that contains the concatenated elements of the two input sequences.
+     */
+    Concat(array: T[]): Linq<T>;
+
+    /**
+     * Determines whether a sequence contains a specified element by using a specified comparer.
+     *
+     * @param value The value to locate in the sequence.
+     * @param [comparer] An IEqualityComparer<T> to compare values.
+     *
+     * @returns true if the source sequence contains an element that has the specified value;
+     * otherwise, false.
+     */
+    Contains(value: T, comparer?: LinqSharp.IEqualityComparer<T>): boolean;
+
+    /**
+     * Returns a number that represents how many elements in the specified sequence satisfy a condition.
+     *
+     * @param [selector] A function to test each element for a condition.
+     *
+     * @returns A number that represents how many elements in the sequence satisfy the condition
+     * in the predicate function.
+     */
+    Count(selector?: (value: T) => boolean): number;
+
+    /**
+     * Returns distinct elements from a sequence by using a specified IEqualityComparer<T>
+     * to compare values.
+     *
+     * @param [comparer] An IEqualityComparer<T> to compare values.
+     *
+     * @returns An array that contains distinct elements from the source sequence.
+     */
+    Distinct(comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
+
+    /**
+     * Returns distinct elements from a sequence by using a specified IEqualityComparer<T>
+     * to compare values.
+     *
+     * @param selector A function to test each element for a condition.
+     * @param [comparer] An IEqualityComparer<T> to compare values.
+     *
+     * @returns An array that contains distinct elements from the source sequence.
+     */
+    DistinctBy<U>(selector: (e: T) => U, comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
+
+    /**
+     * Returns the element at a specified index in a sequence.
+     *
+     * @param index The zero-based index of the element to retrieve.
+     *
+     * @throws index is less than 0 or greater than or equal to the number of elements in source.
+     *
+     * @returns The element at the specified position in the source sequence.
+     */
+    ElementAt(index: number): T;
+
+    /**
+     * Returns the element at a specified index in a sequence or a default value if
+     * the index is out of range.
+     *
+     * @param index The zero-based index of the element to retrieve.
+     * @param defaultValue A default value if no element is found.
+     *
+     * @returns defaultValue if the index is outside the bounds of the source sequence;
+     * otherwise, the element at the specified position in the source sequence.
+     */
+    ElementAtOrDefault(index: number, defaultValue: T): T;
+
+    /**
+     * Produces the set difference of two sequences by using the specified IEqualityComparer<T>
+     * to compare values.
+     *
+     * @param except An array whose elements that also occur in the first sequence will cause
+     * those elements to be removed from the returned sequence.
+     * @param [comparer] An IEqualityComparer<T> to compare values.
+     *
+     * @returns A sequence that contains the set difference of the elements of two sequences.
+     */
+    Except(except: T[], comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
+
+    /**
+     * Returns the first element in a sequence that satisfies a specified condition.
+     *
+     * @param [selector] A function to test each element for a condition.
+     *
+     * @throws No element satisfies the condition in predicate.-or-The source sequence is empty.
+     *
+     * @returns The first element in the sequence that passes the test in the specified predicate function.
+     */
+    First(selector?: (e: T) => boolean): T;
+
+    /**
+     * Returns the first element of the sequence that satisfies a condition or a default
+     * value if no such element is found.
+     *
+     * @param [selector] A function to test each element for a condition.
+     * @param [defaultValue] A default value to return if no element is found.
+     *
+     * @returns defaultValue if source is empty or if no element passes the test specified by predicate;
+     * otherwise, the first element in source that passes the test specified by predicate.
+     */
+    FirstOrDefault(selector?: (e: T) => boolean, defaultValue?: T): T;
+
+    /**
+     * Performs the specified action on each element of the array.
+     *
+     * @param callback The function delegate to perform on each element of the array.
+     */
+    ForEach(callback: (e: T, index: number) => any): void;
+
+    /**
+     * Groups the elements of a sequence according to a specified key selector function.
+     *
+     * @param keySelector A function to extract the key for each element.
+     * @param [elementSelector] A function to create a result value from each group.
+     * @param [comparer] An IEqualityComparer<TKey> to compare keys with.
+     *
+     * @returns A collection of elements of type TResult where each element represents a projection
+     * over a group and its key.
+     */
+    GroupBy<TKey, TElement>(keySelector: (e: T) => TKey, elementSelector?: (e: T) => TElement, comparer?: LinqSharp.IEqualityComparer<TKey>): Linq<any>;
+
+    /**
+     * Searches for the specified object and returns the zero-based index of the first
+     * occurrence within the entire array.
+     *
+     * @param e The object to locate in the array.
+     * @param [comparer] An IEqualityComparer<T> to compare elements with.
+     *
+     * @returns The zero-based index of the first occurrence of item within the entire array, if found;
+     * otherwise, –1.
+     */
+    IndexOf(e: T, comparer?: LinqSharp.IEqualityComparer<T>): number;
+
+    /**
+     * Produces the set intersection of two sequences by using the specified IEqualityComparer<T>
+     * to compare values.
+     *
+     * @param array An array whose distinct elements that also appear in the first sequence will be returned.
+     * @param [comparer] An IEqualityComparer<T> to compare values.
+     *
+     * @returns A sequence that contains the elements that form the set intersection of two sequences.
+     */
+    Intersect(array: T[], comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
+
+    /**
+     * Correlates the elements of two sequences based on matching keys. A specified IEqualityComparer<T> is used to compare keys.
+     *
+     * @param array The sequence to join to the first sequence.
+     * @param outerKeySelector A function to extract the join key from each element of the first sequence.
+     * @param innerKeySelector A function to extract the join key from each element of the second sequence.
+     * @param resultSelector A function to create a result element from two matching elements.
+     * @param [comparer] An IEqualityComparer<T> to hash and compare keys.
+     *
+     * @returns An array that has elements of type TResult that are obtained by performing an inner join on two sequences.
+     */
+    Join<TInner, TKey, TResult>(array: TInner[], outerKeySelector: (e: T) => TKey, innerKeySelector: (e: TInner) => TKey, resultSelector: (outer: T, inner: TInner) => TResult, comparer?: LinqSharp.IEqualityComparer<TKey>): Linq<TResult>;
+
+    /**
+     * Returns the last element of a sequence that satisfies a specified condition.
+     *
+     * @param [predicate] A function to test each element for a condition.
+     *
+     * @throws No element satisfies the condition in predicate.-or-The source sequence is empty.
+     *
+     * @returns The last element in the sequence that passes the test in the specified predicate function.
+     */
+    Last(predicate?: (e: T) => boolean): T;
+
+    /**
+     * Returns the last element of a sequence that satisfies a condition or a default
+     * value if no such element is found.
+     *
+     * @param [predicate] A function to test each element for a condition.
+     * @param [defaultValue] A default value to return if no element is found.
+     *
+     * @returns defaultValue if the sequence is empty or if no elements pass the test in
+     * the predicate function; otherwise, the last element that passes the test in the
+     * predicate function.
+     */
+    LastOrDefault(predicate?: (e: T) => boolean, defaultValue?: T): T;
+
+    /**
+     * Returns the maximum value in a sequence of System.Double values.
+     *
+     * @param [selector] A transform function to apply to each element.
+     *
+     * @returns The maximum value in the sequence.
+     */
+    Max(): T;
+    Max<TResult>(selector?: (e: T) => TResult): TResult;
+
+    /**
+     * Returns the minimum value in a sequence of System.Int64 values.
+     *
+     * @param [selector] A transform function to apply to each element.
+     *
+     * @returns The minimum value in the sequence.
+     */
+    Min(): T;
+    Min<TResult>(selector?: (e: T) => TResult): TResult;
+
+    /**
+     * Sorts the elements of a sequence in ascending order according to a key.
+     *
+     * @param keySelector A function to extract a key from an element.
+     * @param [comparer] An IEqualityComparer<T> to compare values.
+     *
+     * @returns An array whose elements are sorted according to a key.
+     */
+    OrderBy<TKey>(keySelector: (e: T) => TKey, comparer?: (a: TKey, b: TKey) => number): Linq<T>;
+
+    /**
+     * Sorts the elements of a sequence in descending order according to a key.
+     *
+     * @param keySelector A function to extract a key from an element.
+     * @param [comparer] An IEqualityComparer<T> to compare values.
+     *
+     * @returns An array whose elements are sorted in descending order according to a key.
+     */
+    OrderByDescending<TKey>(keySelector: (e: T) => TKey, comparer?: (a: TKey, b: TKey) => number): Linq<T>;
+
+    /**
+     * Inverts the order of the elements in a sequence.
+     *
+     * @returns A sequence whose elements correspond to those of the input sequence in reverse order.
+     */
+    Reverse(): Linq<T>;
+
+    /**
+     * Projects each element of a sequence into a new form.
+     *
+     * @param selector A transform function to apply to each element.
+     *
+     * @returns An array whose elements are the result of invoking the transform function on each element of source.
+     */
+    Select<TResult>(selector: (e: T, i?: number) => TResult): Linq<TResult>;
+
+    /**
+     * Projects each element of a sequence to an array flattens the resulting sequences into one sequence,
+     * and invokes a result selector function on each element therein.
+     *
+     * @param selector A transform function to apply to each element of the input sequence.
+     * @param [resultSelector] A transform function to apply to each element of the intermediate sequence.
+     *
+     * @returns An array whose elements are the result of invoking the one-to-many transform function
+     * selector on each element of source and then mapping each of those sequence elements and
+     * their corresponding source element to a result element.
+     */
+    SelectMany<TResult>(selector: (e: T) => T[], resultSelector?: (e: T) => TResult): Linq<TResult>;
+
+    /**
+     * Determines whether two sequences are equal by comparing their elements by using
+     * a specified IEqualityComparer<T>.
+     *
+     * @param second An array to compare to the first sequence.
+     * @param [comparer] An equality comparer to compare values.
+     *
+     * @returns true if the two source sequences are of equal length and their corresponding
+     * elements compare equal according to comparer; otherwise, false.
+     */
+    SequenceEqual(second: T[], comparer?: (a: T, b: T) => boolean): boolean;
+
+    /**
+     * Returns the only element of a sequence that satisfies a specified condition,
+     * and throws an exception if more than one such element exists.
+     *
+     * @param [predicate] A function to test an element for a condition.
+     *
+     * @returns The single element of the input sequence that satisfies a condition.
+     */
+    Single(predicate?: (e: T) => boolean): T;
+
+    /**
+     * Returns the only element of a sequence that satisfies a specified condition or
+     * a default value if no such element exists; this method throws an exception if
+     * more than one element satisfies the condition.
+     *
+     * @param [predicate] A function to test an element for a condition.
+     * @param [defaultValue] A default value if no element is found.
+     *
+     * @returns The single element of the input sequence that satisfies the condition,
+     * or defaultValue if no such element is found.
+     */
+    SingleOrDefault(predicate?: (e: T) => boolean, defaultValue?: T): T;
+
+    /**
+     * Bypasses a specified number of elements in a sequence and then returns the remaining
+     * elements.
+     *
+     * @param count The number of elements to skip before returning the remaining elements.
+     *
+     * @returns An array that contains the elements that occur
+     * after the specified index in the input sequence.
+     */
+    Skip(count: number): Linq<T>;
+
+    /**
+     * Bypasses elements in a sequence as long as a specified condition is true and
+     * then returns the remaining elements.
+     *
+     * @param predicate A function to test an element for a condition.
+     *
+     * @returns An array that contains the elements from the
+     * input sequence starting at the first element in the linear series that does not
+     * pass the test specified by predicate.
+     */
+    SkipWhile(predicate: (e: T) => boolean): Linq<T>;
+
+    /**
+     * Computes the sum of a sequence values.
+     *
+     * @param [selector] A transform function to apply to each element.
+     *
+     * @returns The sum of the values in the sequence.
+     */
+    Sum(selector?: (value: T) => number): number;
+
+    /**
+     * Returns a specified number of contiguous elements from the start of a sequence.
+     *
+     * @param count The number of elements to skip before returning the remaining elements.
+     *
+     * @returns An array that contains the specified number of elements from the start
+     * of the input sequence.
+     */
+    Take(count: number): Linq<T>;
+
+    /**
+     * Returns elements from a sequence as long as a specified condition is true.
+     *
+     * @param predicate A function to test an element for a condition.
+     *
+     * @returns An array that contains the elements from the
+     * input sequence that occur before the element at which the test no longer passes.
+     */
+    TakeWhile(predicate: (e: T) => boolean): Linq<T>;
+
+    /**
+     * Produces the set union of two sequences by using a specified IEqualityComparer<T>.
+     *
+     * @param second An array whose distinct elements form the second set for the union.
+     * @param [comparer] An equality comparer to compare values.
+     *
+     * @returns An array that contains the elements from both
+     * input sequences, excluding duplicates.
+     */
+    Union(second: T[], comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
+
+    /**
+     * Filters a sequence of values based on a predicate.
+     *
+     * @param selector A transform function to apply to each element.
+     *
+     * @returns  An array that contains elements from the input sequence
+     * that satisfy the condition.
+     */
+    Where(selector: (value: T) => boolean): Linq<T>;
+
+    /**
+     * Applies a specified function to the corresponding elements of two sequences,
+     * producing a sequence of the results.
+     *
+     * @param array The second sequence to merge.
+     * @param resultSelector A function that specifies how to merge the elements from the two sequences.
+     *
+     * @returns An array that contains merged elements of two input sequences.
+     */
+    Zip<TInner, TResult>(array: TInner[], resultSelector: (o: T, i: TInner) => TResult): Linq<TResult>;
+
+    /**
+     * Retrieves the internal array.
+     *
+     * @returns Internal array.
+     */
+    ToArray(): T[];
+}
+export default Linq;
diff --git a/linqsharp/linqsharp-tests.ts b/linqsharp/linqsharp-tests.ts
index ec6b1c725f..1fda5716b8 100644
--- a/linqsharp/linqsharp-tests.ts
+++ b/linqsharp/linqsharp-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./linqsharp.d.ts" />
 
 import Linq, { LinqSharp } from "linqsharp";
 
diff --git a/linqsharp/linqsharp.d.ts b/linqsharp/linqsharp.d.ts
deleted file mode 100644
index 5076701bdc..0000000000
--- a/linqsharp/linqsharp.d.ts
+++ /dev/null
@@ -1,500 +0,0 @@
-// Type definitions for linqsharp
-// Project: https://www.npmjs.com/package/linqsharp
-// Definitions by: Bruno Leonardo Michels <https://github.com/brunolm>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// JSDoc: Extracted and adapted from .NET source code.
-
-/**
- * LinqSharp module defines a helper class with
- * .NET's Linq methods.
- *
- * @module linqsharp
- */
-declare module "linqsharp"
-{
-    export namespace LinqSharp {
-        /**
-         * Defines methods to support the comparison of objects for equality.
-         *
-         * {T} The type of objects to compare.
-         */
-        export interface IEqualityComparer<T> {
-            Equals(x: T, y: T): boolean;
-            GetHashCode(obj: T): number;
-        }
-
-        /**
-         * Represents a collection of objects that have a common key.
-         *
-         * {TKey} The type of the key.
-         * {T} The type of the values.
-         */
-        export interface IGrouping<TKey, T> {
-            Key: TKey;
-            Elements: T[];
-        }
-
-        /**
-         * Gets the HashCode of the object.
-         *
-         * @param e Object to compute hash.
-         * @returns A computed HashCode for the object.
-         */
-        export function GetHashCode(e: any): any;
-
-        /**
-         * Transforms a object into a string replacing circular
-         * references by reference tokens.
-         *
-         * @param obj Object to convert to string.
-         * @returns String representation of the object.
-         */
-        export function StringifyNonCircular(obj: any): string;
-    }
-
-    /**
-     * Wrapper class for an array that provides Linq functionallity.
-     *
-     * @class Linq<T>
-     */
-    class Linq<T> {
-        /** {T[]} Internal array reference. */
-        private a: T[];
-
-        /**
-         * Creates a new instance holding an array of <T>.
-         * @constructor
-         *
-         * @param {Array} a Array.
-         */
-        constructor(a?: T[]);
-
-        /**
-         * Applies an accumulator function over a sequence.
-         *
-         * @param func An accumulator function to be
-         * invoked on each element.
-         * @param {T} [initialValue] The initial accumulator value.
-         *
-         * @throws Error if array is empty.
-         *
-         * @returns {T} The final accumulator value.
-         */
-        Aggregate<TResult>(func: (previous: T, next: T) => TResult, initialValue?: T): T;
-
-        /**
-         * Determines whether all elements of a sequence satisfy a condition.
-         *
-         * @param predicate A function to test each element for a condition.
-         *
-         * @returns true if every element of the source sequence passes the test in the specified
-         * predicate, or if the sequence is empty; otherwise, false.
-         */
-        All(predicate: (value: T) => boolean): boolean;
-
-        /**
-         * Determines whether a sequence contains any elements.
-         *
-         * @param [predicate] A function to test each element for a condition.
-         *
-         * @returns true if any elements in the source sequence pass the test in the specified predicate;
-         * otherwise, false. If no predicate is specified return true if the source sequence contains any elements;
-         * otherwise, false.
-         */
-        Any(predicate?: (value: T) => boolean): boolean;
-
-        /**
-         * Computes the average of a sequence of {number} values.
-         *
-         * @param [selector] A transform function to apply to each element.
-         *
-         * @returns The average of the sequence of values.
-         */
-        Average(selector?: (value: T) => number): number;
-
-        /**
-         * Concatenates two sequences.
-         *
-         * @param array The sequence to concatenate to the first sequence.
-         *
-         * @returns An array that contains the concatenated elements of the two input sequences.
-         */
-        Concat(array: T[]): Linq<T>;
-
-        /**
-         * Determines whether a sequence contains a specified element by using a specified comparer.
-         *
-         * @param value The value to locate in the sequence.
-         * @param [comparer] An IEqualityComparer<T> to compare values.
-         *
-         * @returns true if the source sequence contains an element that has the specified value;
-         * otherwise, false.
-         */
-        Contains(value: T, comparer?: LinqSharp.IEqualityComparer<T>): boolean;
-
-        /**
-         * Returns a number that represents how many elements in the specified sequence satisfy a condition.
-         *
-         * @param [selector] A function to test each element for a condition.
-         *
-         * @returns A number that represents how many elements in the sequence satisfy the condition
-         * in the predicate function.
-         */
-        Count(selector?: (value: T) => boolean): number;
-
-        /**
-         * Returns distinct elements from a sequence by using a specified IEqualityComparer<T>
-         * to compare values.
-         *
-         * @param [comparer] An IEqualityComparer<T> to compare values.
-         *
-         * @returns An array that contains distinct elements from the source sequence.
-         */
-        Distinct(comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
-
-        /**
-         * Returns distinct elements from a sequence by using a specified IEqualityComparer<T>
-         * to compare values.
-         *
-         * @param selector A function to test each element for a condition.
-         * @param [comparer] An IEqualityComparer<T> to compare values.
-         *
-         * @returns An array that contains distinct elements from the source sequence.
-         */
-        DistinctBy<U>(selector: (e: T) => U, comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
-
-        /**
-         * Returns the element at a specified index in a sequence.
-         *
-         * @param index The zero-based index of the element to retrieve.
-         *
-         * @throws index is less than 0 or greater than or equal to the number of elements in source.
-         *
-         * @returns The element at the specified position in the source sequence.
-         */
-        ElementAt(index: number): T;
-
-        /**
-         * Returns the element at a specified index in a sequence or a default value if
-         * the index is out of range.
-         *
-         * @param index The zero-based index of the element to retrieve.
-         * @param defaultValue A default value if no element is found.
-         *
-         * @returns defaultValue if the index is outside the bounds of the source sequence;
-         * otherwise, the element at the specified position in the source sequence.
-         */
-        ElementAtOrDefault(index: number, defaultValue: T): T;
-
-        /**
-         * Produces the set difference of two sequences by using the specified IEqualityComparer<T>
-         * to compare values.
-         *
-         * @param except An array whose elements that also occur in the first sequence will cause
-         * those elements to be removed from the returned sequence.
-         * @param [comparer] An IEqualityComparer<T> to compare values.
-         *
-         * @returns A sequence that contains the set difference of the elements of two sequences.
-         */
-        Except(except: T[], comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
-
-        /**
-         * Returns the first element in a sequence that satisfies a specified condition.
-         *
-         * @param [selector] A function to test each element for a condition.
-         *
-         * @throws No element satisfies the condition in predicate.-or-The source sequence is empty.
-         *
-         * @returns The first element in the sequence that passes the test in the specified predicate function.
-         */
-        First(selector?: (e: T) => boolean): T;
-
-        /**
-         * Returns the first element of the sequence that satisfies a condition or a default
-         * value if no such element is found.
-         *
-         * @param [selector] A function to test each element for a condition.
-         * @param [defaultValue] A default value to return if no element is found.
-         *
-         * @returns defaultValue if source is empty or if no element passes the test specified by predicate;
-         * otherwise, the first element in source that passes the test specified by predicate.
-         */
-        FirstOrDefault(selector?: (e: T) => boolean, defaultValue?: T): T;
-
-        /**
-         * Performs the specified action on each element of the array.
-         *
-         * @param callback The function delegate to perform on each element of the array.
-         */
-        ForEach(callback: (e: T, index: number) => any): void;
-
-        /**
-         * Groups the elements of a sequence according to a specified key selector function.
-         *
-         * @param keySelector A function to extract the key for each element.
-         * @param [elementSelector] A function to create a result value from each group.
-         * @param [comparer] An IEqualityComparer<TKey> to compare keys with.
-         *
-         * @returns A collection of elements of type TResult where each element represents a projection
-         * over a group and its key.
-         */
-        GroupBy<TKey, TElement>(keySelector: (e: T) => TKey, elementSelector?: (e: T) => TElement, comparer?: LinqSharp.IEqualityComparer<TKey>): Linq<any>;
-
-        /**
-         * Searches for the specified object and returns the zero-based index of the first
-         * occurrence within the entire array.
-         *
-         * @param e The object to locate in the array.
-         * @param [comparer] An IEqualityComparer<T> to compare elements with.
-         *
-         * @returns The zero-based index of the first occurrence of item within the entire array, if found;
-         * otherwise, –1.
-         */
-        IndexOf(e: T, comparer?: LinqSharp.IEqualityComparer<T>): number;
-
-        /**
-         * Produces the set intersection of two sequences by using the specified IEqualityComparer<T>
-         * to compare values.
-         *
-         * @param array An array whose distinct elements that also appear in the first sequence will be returned.
-         * @param [comparer] An IEqualityComparer<T> to compare values.
-         *
-         * @returns A sequence that contains the elements that form the set intersection of two sequences.
-         */
-        Intersect(array: T[], comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
-
-        /**
-         * Correlates the elements of two sequences based on matching keys. A specified IEqualityComparer<T> is used to compare keys.
-         *
-         * @param array The sequence to join to the first sequence.
-         * @param outerKeySelector A function to extract the join key from each element of the first sequence.
-         * @param innerKeySelector A function to extract the join key from each element of the second sequence.
-         * @param resultSelector A function to create a result element from two matching elements.
-         * @param [comparer] An IEqualityComparer<T> to hash and compare keys.
-         *
-         * @returns An array that has elements of type TResult that are obtained by performing an inner join on two sequences.
-         */
-        Join<TInner, TKey, TResult>(array: TInner[], outerKeySelector: (e: T) => TKey, innerKeySelector: (e: TInner) => TKey, resultSelector: (outer: T, inner: TInner) => TResult, comparer?: LinqSharp.IEqualityComparer<TKey>): Linq<TResult>;
-
-        /**
-         * Returns the last element of a sequence that satisfies a specified condition.
-         *
-         * @param [predicate] A function to test each element for a condition.
-         *
-         * @throws No element satisfies the condition in predicate.-or-The source sequence is empty.
-         *
-         * @returns The last element in the sequence that passes the test in the specified predicate function.
-         */
-        Last(predicate?: (e: T) => boolean): T;
-
-        /**
-         * Returns the last element of a sequence that satisfies a condition or a default
-         * value if no such element is found.
-         *
-         * @param [predicate] A function to test each element for a condition.
-         * @param [defaultValue] A default value to return if no element is found.
-         *
-         * @returns defaultValue if the sequence is empty or if no elements pass the test in
-         * the predicate function; otherwise, the last element that passes the test in the
-         * predicate function.
-         */
-        LastOrDefault(predicate?: (e: T) => boolean, defaultValue?: T): T;
-
-        /**
-         * Returns the maximum value in a sequence of System.Double values.
-         *
-         * @param [selector] A transform function to apply to each element.
-         *
-         * @returns The maximum value in the sequence.
-         */
-        Max(): T;
-        Max<TResult>(selector?: (e: T) => TResult): TResult;
-
-        /**
-         * Returns the minimum value in a sequence of System.Int64 values.
-         *
-         * @param [selector] A transform function to apply to each element.
-         *
-         * @returns The minimum value in the sequence.
-         */
-        Min(): T;
-        Min<TResult>(selector?: (e: T) => TResult): TResult;
-
-        /**
-         * Sorts the elements of a sequence in ascending order according to a key.
-         *
-         * @param keySelector A function to extract a key from an element.
-         * @param [comparer] An IEqualityComparer<T> to compare values.
-         *
-         * @returns An array whose elements are sorted according to a key.
-         */
-        OrderBy<TKey>(keySelector: (e: T) => TKey, comparer?: (a: TKey, b: TKey) => number): Linq<T>;
-
-        /**
-         * Sorts the elements of a sequence in descending order according to a key.
-         *
-         * @param keySelector A function to extract a key from an element.
-         * @param [comparer] An IEqualityComparer<T> to compare values.
-         *
-         * @returns An array whose elements are sorted in descending order according to a key.
-         */
-        OrderByDescending<TKey>(keySelector: (e: T) => TKey, comparer?: (a: TKey, b: TKey) => number): Linq<T>;
-
-        /**
-         * Inverts the order of the elements in a sequence.
-         *
-         * @returns A sequence whose elements correspond to those of the input sequence in reverse order.
-         */
-        Reverse(): Linq<T>;
-
-        /**
-         * Projects each element of a sequence into a new form.
-         *
-         * @param selector A transform function to apply to each element.
-         *
-         * @returns An array whose elements are the result of invoking the transform function on each element of source.
-         */
-        Select<TResult>(selector: (e: T, i?: number) => TResult): Linq<TResult>;
-
-        /**
-         * Projects each element of a sequence to an array flattens the resulting sequences into one sequence,
-         * and invokes a result selector function on each element therein.
-         *
-         * @param selector A transform function to apply to each element of the input sequence.
-         * @param [resultSelector] A transform function to apply to each element of the intermediate sequence.
-         *
-         * @returns An array whose elements are the result of invoking the one-to-many transform function
-         * selector on each element of source and then mapping each of those sequence elements and
-         * their corresponding source element to a result element.
-         */
-        SelectMany<TResult>(selector: (e: T) => T[], resultSelector?: (e: T) => TResult): Linq<TResult>;
-
-        /**
-         * Determines whether two sequences are equal by comparing their elements by using
-         * a specified IEqualityComparer<T>.
-         *
-         * @param second An array to compare to the first sequence.
-         * @param [comparer] An equality comparer to compare values.
-         *
-         * @returns true if the two source sequences are of equal length and their corresponding
-         * elements compare equal according to comparer; otherwise, false.
-         */
-        SequenceEqual(second: T[], comparer?: (a: T, b: T) => boolean): boolean;
-
-        /**
-         * Returns the only element of a sequence that satisfies a specified condition,
-         * and throws an exception if more than one such element exists.
-         *
-         * @param [predicate] A function to test an element for a condition.
-         *
-         * @returns The single element of the input sequence that satisfies a condition.
-         */
-        Single(predicate?: (e: T) => boolean): T;
-
-        /**
-         * Returns the only element of a sequence that satisfies a specified condition or
-         * a default value if no such element exists; this method throws an exception if
-         * more than one element satisfies the condition.
-         *
-         * @param [predicate] A function to test an element for a condition.
-         * @param [defaultValue] A default value if no element is found.
-         *
-         * @returns The single element of the input sequence that satisfies the condition,
-         * or defaultValue if no such element is found.
-         */
-        SingleOrDefault(predicate?: (e: T) => boolean, defaultValue?: T): T;
-
-        /**
-         * Bypasses a specified number of elements in a sequence and then returns the remaining
-         * elements.
-         *
-         * @param count The number of elements to skip before returning the remaining elements.
-         *
-         * @returns An array that contains the elements that occur
-         * after the specified index in the input sequence.
-         */
-        Skip(count: number): Linq<T>;
-
-        /**
-         * Bypasses elements in a sequence as long as a specified condition is true and
-         * then returns the remaining elements.
-         *
-         * @param predicate A function to test an element for a condition.
-         *
-         * @returns An array that contains the elements from the
-         * input sequence starting at the first element in the linear series that does not
-         * pass the test specified by predicate.
-         */
-        SkipWhile(predicate: (e: T) => boolean): Linq<T>;
-
-        /**
-         * Computes the sum of a sequence values.
-         *
-         * @param [selector] A transform function to apply to each element.
-         *
-         * @returns The sum of the values in the sequence.
-         */
-        Sum(selector?: (value: T) => number): number;
-
-        /**
-         * Returns a specified number of contiguous elements from the start of a sequence.
-         *
-         * @param count The number of elements to skip before returning the remaining elements.
-         *
-         * @returns An array that contains the specified number of elements from the start
-         * of the input sequence.
-         */
-        Take(count: number): Linq<T>;
-
-        /**
-         * Returns elements from a sequence as long as a specified condition is true.
-         *
-         * @param predicate A function to test an element for a condition.
-         *
-         * @returns An array that contains the elements from the
-         * input sequence that occur before the element at which the test no longer passes.
-         */
-        TakeWhile(predicate: (e: T) => boolean): Linq<T>;
-
-        /**
-         * Produces the set union of two sequences by using a specified IEqualityComparer<T>.
-         *
-         * @param second An array whose distinct elements form the second set for the union.
-         * @param [comparer] An equality comparer to compare values.
-         *
-         * @returns An array that contains the elements from both
-         * input sequences, excluding duplicates.
-         */
-        Union(second: T[], comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
-
-        /**
-         * Filters a sequence of values based on a predicate.
-         *
-         * @param selector A transform function to apply to each element.
-         *
-         * @returns  An array that contains elements from the input sequence
-         * that satisfy the condition.
-         */
-        Where(selector: (value: T) => boolean): Linq<T>;
-
-        /**
-         * Applies a specified function to the corresponding elements of two sequences,
-         * producing a sequence of the results.
-         *
-         * @param array The second sequence to merge.
-         * @param resultSelector A function that specifies how to merge the elements from the two sequences.
-         *
-         * @returns An array that contains merged elements of two input sequences.
-         */
-        Zip<TInner, TResult>(array: TInner[], resultSelector: (o: T, i: TInner) => TResult): Linq<TResult>;
-
-        /**
-         * Retrieves the internal array.
-         *
-         * @returns Internal array.
-         */
-        ToArray(): T[];
-    }
-    export default Linq;
-}
diff --git a/linqsharp/tsconfig.json b/linqsharp/tsconfig.json
new file mode 100644
index 0000000000..28eb7e5873
--- /dev/null
+++ b/linqsharp/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "linqsharp-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/lls/index.d.ts b/lls/index.d.ts
new file mode 100644
index 0000000000..6b6b80df8c
--- /dev/null
+++ b/lls/index.d.ts
@@ -0,0 +1,126 @@
+// Type definitions for LargeLocalStorage v0.1.3
+// Project: https://github.com/tantaman/LargeLocalStorage
+// Definitions by: Borislav Zhivkov <https://github.com/borislavjivkov>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace LargeLocalStorageInterfaces {
+    interface LargeLocalStorageService {
+        new(options: Options): LargeLocalStorageService;
+
+        initialized: Promise<number>;
+
+        /**
+         * Gets all of the attachments for a document.
+         */
+        getAllAttachments(docKey?: string): Promise<Entry[]>;
+
+        /**
+         * Gets all attachments URLs for a document.
+         */
+        getAllAttachmentURLs(docKey?: string): Promise<Entry[]>;
+
+        /**
+         * Get the attachment identified by attachKey
+         */
+        getAttachment(attachKey: string): Promise<any>;
+
+        /**
+         * Get the attachment identified by docKey and attachKey
+         */
+        getAttachment(docKey: string, attachKey: string): Promise<any>;
+
+        /**
+         * Get the URL for a given attachment.
+         */
+        getAttachmentURL(attachKey: string): Promise<string>;
+
+        /**
+         * Get the URL for a given attachment.
+         */
+        getAttachmentURL(docKey: string, attachKey: string): Promise<string>;
+
+        /**
+         * Returns the actual capacity of the storage or -1 if it is unknown.
+         */
+        getCapacity(): number;
+
+        /**
+         * Get the contents of a document identified by docKey
+         */
+        getContents(docKey: string): Promise<any>;
+
+        /**
+         * List all attachments under a given key. List all documents if no key is provided.
+         */
+        ls(docKey?: string): Promise<string[]>;
+
+        /**
+         * Whether or not LLS is ready to store data. The initialized property can be used to await initialization.
+         */
+        ready(): boolean;
+
+        /**
+         * Revoke the attachment URL as required by the underlying storage system.
+         */
+        revokeAttachmentURL(url: string): void;
+
+        /**
+         * Remove the specified document and all of its attachments.
+         */
+        rm(docKey?: string): Promise<any>;
+
+        /**
+         * Remove an attachment from a document.
+         */
+        rmAttachment(docKey: string, attachKey: string): Promise<void>;
+
+        /**
+         * Set an attachment for a given document. Identified by attachKey.
+         */
+        setAttachment(attachKey: string, attachment: any): Promise<void>;
+
+        /**
+         * Set an attachment for a given document. Identified by docKey and attachKey.
+         */
+        setAttachment(docKey: string, attachKey: string, attachment: any): Promise<void>;
+
+        /**
+         * Set the contents identified by docKey to data. The document will be created if it does not exist.
+         */
+        setContents(docKey: string, data: any): Promise<void>;
+    }
+
+    interface Options {
+        /**
+         * Desired capacity in bytes.
+         */
+        size: number;
+
+        /**
+         * Optional name for your LLS database. Defaults to lls. This is the name given to the underlying IndexedDB or WebSQL DB or FSAPI Folder. LLS's with different names are independent.
+         */
+        name?: string;
+
+        /**
+         * Force LLS to use a specific storage implementation: 'IndexedDB' or 'WebSQL' or 'FilesystemAPI'.
+         */
+        forceProvider?: string;
+    }
+
+    interface Entry {
+        data: any;
+        docKey: string;
+        attachKey: string;
+        url: string;
+    }
+
+    interface Promise<T> {
+        then<U>(onFulfilled?: (value: T) => U | Promise<U>, onRejected?: (error: any) => U | Promise<U>): Promise<U>;
+        then<U>(onFulfilled?: (value: T) => U | Promise<U>, onRejected?: (error: any) => void): Promise<U>;
+        catch<U>(onRejected?: (error: any) => U | Promise<U>): Promise<U>;
+    }
+}
+
+declare var LargeLocalStorage: LargeLocalStorageInterfaces.LargeLocalStorageService;
+export = LargeLocalStorage;
+export as namespace LargeLocalStorage;
diff --git a/lls/lls-tests.ts b/lls/lls-tests.ts
index 72031daf78..f231fcfbd6 100644
--- a/lls/lls-tests.ts
+++ b/lls/lls-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="lls.d.ts" />
+
 
 import LargeLocalStorage = require('lls');
 
diff --git a/lls/lls.d.ts b/lls/lls.d.ts
deleted file mode 100644
index ee7091209b..0000000000
--- a/lls/lls.d.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-// Type definitions for LargeLocalStorage v0.1.3
-// Project: https://github.com/tantaman/LargeLocalStorage
-// Definitions by: Borislav Zhivkov <https://github.com/borislavjivkov>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace LargeLocalStorageInterfaces {
-    interface LargeLocalStorageService {
-        new(options: Options): LargeLocalStorageService;
-
-        initialized: Promise<number>;
-
-        /**
-         * Gets all of the attachments for a document.
-         */
-        getAllAttachments(docKey?: string): Promise<Entry[]>;
-
-        /**
-         * Gets all attachments URLs for a document.
-         */
-        getAllAttachmentURLs(docKey?: string): Promise<Entry[]>;
-
-        /**
-         * Get the attachment identified by attachKey
-         */
-        getAttachment(attachKey: string): Promise<any>;
-
-        /**
-         * Get the attachment identified by docKey and attachKey
-         */
-        getAttachment(docKey: string, attachKey: string): Promise<any>;
-
-        /**
-         * Get the URL for a given attachment.
-         */
-        getAttachmentURL(attachKey: string): Promise<string>;
-
-        /**
-         * Get the URL for a given attachment.
-         */
-        getAttachmentURL(docKey: string, attachKey: string): Promise<string>;
-
-        /**
-         * Returns the actual capacity of the storage or -1 if it is unknown.
-         */
-        getCapacity(): number;
-
-        /**
-         * Get the contents of a document identified by docKey
-         */
-        getContents(docKey: string): Promise<any>;
-
-        /**
-         * List all attachments under a given key. List all documents if no key is provided.
-         */
-        ls(docKey?: string): Promise<string[]>;
-
-        /**
-         * Whether or not LLS is ready to store data. The initialized property can be used to await initialization.
-         */
-        ready(): boolean;
-
-        /**
-         * Revoke the attachment URL as required by the underlying storage system.
-         */
-        revokeAttachmentURL(url: string): void;
-
-        /**
-         * Remove the specified document and all of its attachments.
-         */
-        rm(docKey?: string): Promise<any>;
-
-        /**
-         * Remove an attachment from a document.
-         */
-        rmAttachment(docKey: string, attachKey: string): Promise<void>;
-
-        /**
-         * Set an attachment for a given document. Identified by attachKey.
-         */
-        setAttachment(attachKey: string, attachment: any): Promise<void>;
-
-        /**
-         * Set an attachment for a given document. Identified by docKey and attachKey.
-         */
-        setAttachment(docKey: string, attachKey: string, attachment: any): Promise<void>;
-
-        /**
-         * Set the contents identified by docKey to data. The document will be created if it does not exist.
-         */
-        setContents(docKey: string, data: any): Promise<void>;
-    }
-
-    interface Options {
-        /**
-         * Desired capacity in bytes.
-         */
-        size: number;
-
-        /**
-         * Optional name for your LLS database. Defaults to lls. This is the name given to the underlying IndexedDB or WebSQL DB or FSAPI Folder. LLS's with different names are independent.
-         */
-        name?: string;
-
-        /**
-         * Force LLS to use a specific storage implementation: 'IndexedDB' or 'WebSQL' or 'FilesystemAPI'.
-         */
-        forceProvider?: string;
-    }
-
-    interface Entry {
-        data: any;
-        docKey: string;
-        attachKey: string;
-        url: string;
-    }
-
-    interface Promise<T> {
-        then<U>(onFulfilled?: (value: T) => U | Promise<U>, onRejected?: (error: any) => U | Promise<U>): Promise<U>;
-        then<U>(onFulfilled?: (value: T) => U | Promise<U>, onRejected?: (error: any) => void): Promise<U>;
-        catch<U>(onRejected?: (error: any) => U | Promise<U>): Promise<U>;
-    }
-}
-
-declare module "lls" {
-    var LargeLocalStorage: LargeLocalStorageInterfaces.LargeLocalStorageService;
-    export = LargeLocalStorage;
-}
diff --git a/lls/tsconfig.json b/lls/tsconfig.json
new file mode 100644
index 0000000000..4e3f0da9be
--- /dev/null
+++ b/lls/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "lls-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/lobibox/lobibox.d.ts b/lobibox/index.d.ts
similarity index 100%
rename from lobibox/lobibox.d.ts
rename to lobibox/index.d.ts
diff --git a/lobibox/lobibox-tests.ts b/lobibox/lobibox-tests.ts
index 78637114a1..783bb2f8b9 100644
--- a/lobibox/lobibox-tests.ts
+++ b/lobibox/lobibox-tests.ts
@@ -1,8 +1,7 @@
 /**
  * Created by itboy on 11/22/2015.
  */
-    ///<reference path="lobibox.d.ts"/>
-    ///<reference path="../jquery/jquery.d.ts"/>
+///<reference types="jquery"/>
 
 
     //Run test : LobiboxTest.test() after window load event
diff --git a/lobibox/tsconfig.json b/lobibox/tsconfig.json
new file mode 100644
index 0000000000..c7c19d4184
--- /dev/null
+++ b/lobibox/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "lobibox-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/localForage/localForage.d.ts b/localForage/index.d.ts
similarity index 100%
rename from localForage/localForage.d.ts
rename to localForage/index.d.ts
diff --git a/localForage/localForage-tests.ts b/localForage/localForage-tests.ts
index 6f162e8c4b..a4abe394b7 100644
--- a/localForage/localForage-tests.ts
+++ b/localForage/localForage-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="localForage.d.ts" />
+
 
 declare var localForage: LocalForage;
 
diff --git a/localForage/tsconfig.json b/localForage/tsconfig.json
new file mode 100644
index 0000000000..663546a65d
--- /dev/null
+++ b/localForage/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "localForage-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/lockfile/index.d.ts b/lockfile/index.d.ts
new file mode 100644
index 0000000000..367d4a45c3
--- /dev/null
+++ b/lockfile/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for lockfile v0.4.2
+// Project: https://github.com/isaacs/lockfile
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export interface Options {
+    wait?: number;
+    stale?: number;
+    retries?: number;
+    retryWait?: number;
+}
+
+export declare function lock(path: string, opts: Options, callback: (err: Error) => void): void;
+export declare function lock(path: string, callback: (err: Error) => void): void;
+export declare function lockSync(path: string, opts: Options): void;
+
+export declare function unlock(path: string, callback: (err: Error) => void): void;
+export declare function unlockSync(path: string): void;
+
+export declare function check(path: string, opts: Options, callback: (err: Error, isLocked: boolean) => void): void;
+export declare function check(path: string, callback: (err: Error, isLocked: boolean) => void): void;
+export declare function checkSync(path: string, opts: Options): boolean;
diff --git a/lockfile/lockfile-tests.ts b/lockfile/lockfile-tests.ts
index 9ebb956dae..c9ea734852 100644
--- a/lockfile/lockfile-tests.ts
+++ b/lockfile/lockfile-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="lockfile.d.ts" />
 
 import lockfile = require('lockfile');
 
diff --git a/lockfile/lockfile.d.ts b/lockfile/lockfile.d.ts
deleted file mode 100644
index c6084a8433..0000000000
--- a/lockfile/lockfile.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Type definitions for lockfile v0.4.2
-// Project: https://github.com/isaacs/lockfile
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'lockfile' {
-	export interface Options {
-		wait?: number;
-		stale?: number;
-		retries?: number;
-		retryWait?: number;
-	}
-
-	export function lock(path: string, opts: Options, callback: (err: Error) => void): void;
-	export function lock(path: string, callback: (err: Error) => void): void;
-	export function lockSync(path: string, opts: Options):void;
-
-	export function unlock(path: string, callback: (err: Error) => void): void;
-	export function unlockSync(path: string):void;
-
-	export function check(path: string, opts: Options, callback: (err: Error, isLocked: boolean) => void): void;
-	export function check(path: string, callback: (err: Error, isLocked: boolean) => void): void;
-	export function checkSync(path: string, opts: Options): boolean;
-}
diff --git a/lockfile/tsconfig.json b/lockfile/tsconfig.json
new file mode 100644
index 0000000000..b651ad6651
--- /dev/null
+++ b/lockfile/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "lockfile-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/lodash-decorators/index.d.ts b/lodash-decorators/index.d.ts
new file mode 100644
index 0000000000..0e0b8d9e3c
--- /dev/null
+++ b/lodash-decorators/index.d.ts
@@ -0,0 +1,271 @@
+// Type definitions for lodash-decorators 1.0.5
+// Project: https://github.com/steelsojka/lodash-decorators
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="lodash" />
+
+declare module "lodash-decorators" {
+    // Originally copied from ../node_modules/typescript/lib/lib.es6.d.ts
+    export interface ClassDecorator {
+        <TFunction extends Function>(target: TFunction): TFunction|void;
+    }
+    export interface PropertyDecorator {
+        (target: Object, propertyKey: string | symbol): void;
+    }
+    export interface MethodDecorator {
+        <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T> | void;
+    }
+    export interface ParameterDecorator {
+        (target: Object, propertyKey: string | symbol, parameterIndex: number): void;
+    }
+
+    export interface TypedMethodDecorator<TFunction extends Function> {
+        (target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<TFunction>): TypedPropertyDescriptor<TFunction> | void;
+    }
+
+    export interface MethodDecoratorWithAccessor extends MethodDecorator, Accessor<MethodDecorator> {
+    }
+
+    export interface Accessor<T> {
+        set: T;
+        get: T;
+        proto: T;
+    }
+
+    export interface DebounceDecorator {
+        (wait: number, options?: _.DebounceSettings): MethodDecorator;
+    }
+    export interface ThrottleDecorator {
+        (wait: number, options?: _.ThrottleSettings): MethodDecorator;
+    }
+    export interface MemoizeDecorator {
+        (resolver?: Function): MethodDecorator;
+    }
+    export interface AfterDecorator {
+        (n: number): MethodDecorator;
+    }
+    export interface BeforeDecorator {
+        (n: number): MethodDecorator;
+    }
+    export interface AryDecorator {
+        (n: number): MethodDecorator;
+    }
+    export interface CurryDecorator {
+        (arity?: number): MethodDecorator;
+    }
+    export interface CurryRightDecorator {
+        (arity?: number): MethodDecorator;
+    }
+    export interface RestParamDecorator {
+        (start?: number): MethodDecorator;
+    }
+    export interface PartialDecorator {
+        (func: Function|string, ...args: any[]): MethodDecorator;
+    }
+    export interface WrapDecorator {
+        (wrapper: ((func: Function, ...args: any[]) => any)|string): MethodDecorator;
+    }
+    export interface ComposeDecorator {
+        (...funcs: (Function|string)[]): MethodDecorator;
+    }
+    export interface DelayDecorator {
+        (wait: number, ...args: any[]): MethodDecorator;
+    }
+    export interface DeferDecorator {
+        (...args: any[]): MethodDecorator;
+    }
+    export interface BindDecorator {
+        (): TypedMethodDecorator<(<R>() => R)>;
+        <T1>(param1?: T1):
+            TypedMethodDecorator<(<R>(param1: T1) => R)>;
+        <T1, T2>(param1?: T1, param2?: T2):
+            TypedMethodDecorator<(<R>(param1: T1, param2: T2) => R)>;
+        <T1, T2, T3>(param1?: T1, param2?: T2, param3?: T3):
+            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3) => R)>;
+        <T1, T2, T3, T4>(param1?: T1, param2?: T2, param3?: T3, param4?: T4):
+            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3, param4: T4) => R)>;
+        <T1, T2, T3, T4, T5>(param1?: T1, param2?: T2, param3?: T3, param4?: T4, param5?: T5):
+            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3, param4: T4, param5: T5) => R)>;
+        <T1, T2, T3, T4, T5, T6>(param1?: T1, param2?: T2, param3?: T3, param4?: T4, param5?: T5, param6?: T6):
+            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3, param4: T4, param5: T5, param6: T6) => R)>;
+    }
+    export interface BindAllDecorator {
+        (...methodNames: string[]): ClassDecorator;
+    }
+    export interface ModArgsDecorator {
+        (...transforms: Function[]): MethodDecorator;
+    }
+
+    export const debounce: DebounceDecorator & Accessor<DebounceDecorator>;
+    export const Debounce: DebounceDecorator & Accessor<DebounceDecorator>;
+
+    export const throttle: ThrottleDecorator & Accessor<ThrottleDecorator>;
+    export const Throttle: ThrottleDecorator & Accessor<ThrottleDecorator>;
+
+    export const memoize: MemoizeDecorator & Accessor<MemoizeDecorator>;
+    export const Memoize: MemoizeDecorator & Accessor<MemoizeDecorator>;
+
+    export const after: AfterDecorator & Accessor<AfterDecorator>;
+    export const After: AfterDecorator & Accessor<AfterDecorator>;
+
+    export const before: BeforeDecorator & Accessor<BeforeDecorator>;
+    export const Before: BeforeDecorator & Accessor<BeforeDecorator>;
+
+    export const ary: AryDecorator & Accessor<AryDecorator>;
+    export const Ary: AryDecorator & Accessor<AryDecorator>;
+
+    export const curry: CurryDecorator & Accessor<CurryDecorator>;
+    export const Curry: CurryDecorator & Accessor<CurryDecorator>;
+
+    export const curryRight: CurryRightDecorator & Accessor<CurryRightDecorator>;
+    export const CurryRight: CurryRightDecorator & Accessor<CurryRightDecorator>;
+
+    export const restParam: RestParamDecorator & Accessor<RestParamDecorator>;
+    export const RestParam: RestParamDecorator & Accessor<RestParamDecorator>;
+
+    export const partial: PartialDecorator & Accessor<PartialDecorator>;
+    export const Partial: PartialDecorator & Accessor<PartialDecorator>;
+
+    export const partialRight: PartialDecorator & Accessor<PartialDecorator>;
+    export const PartialRight: PartialDecorator & Accessor<PartialDecorator>;
+
+    export const wrap: WrapDecorator & Accessor<WrapDecorator>;
+    export const Wrap: WrapDecorator & Accessor<WrapDecorator>;
+
+    export const compose: ComposeDecorator & Accessor<ComposeDecorator>;
+    export const Compose: ComposeDecorator & Accessor<ComposeDecorator>;
+
+    export const flow: ComposeDecorator & Accessor<ComposeDecorator>;
+    export const Flow: ComposeDecorator & Accessor<ComposeDecorator>;
+
+    export const flowRight: ComposeDecorator & Accessor<ComposeDecorator>;
+    export const FlowRight: ComposeDecorator & Accessor<ComposeDecorator>;
+
+    export const backflow: ComposeDecorator & Accessor<ComposeDecorator>;
+    export const Backflow: ComposeDecorator & Accessor<ComposeDecorator>;
+
+    export const delay: DelayDecorator & Accessor<DelayDecorator>;
+    export const Delay: DelayDecorator & Accessor<DelayDecorator>;
+
+    export const defer: DeferDecorator & Accessor<DeferDecorator>;
+    export const Defer: DeferDecorator & Accessor<DeferDecorator>;
+
+    export const bind: BindDecorator & Accessor<BindDecorator>;
+    export const Bind: BindDecorator & Accessor<BindDecorator>;
+
+    export const bindAll: BindAllDecorator;
+    export const BindAll: BindAllDecorator;
+
+    export const modArgs: ModArgsDecorator & Accessor<ModArgsDecorator>;
+    export const ModArgs: ModArgsDecorator & Accessor<ModArgsDecorator>;
+
+    export const once: MethodDecoratorWithAccessor;
+    export const Once: MethodDecoratorWithAccessor;
+
+    export const spread: MethodDecoratorWithAccessor;
+    export const Spread: MethodDecoratorWithAccessor;
+
+    export const rearg: MethodDecoratorWithAccessor;
+    export const Rearg: MethodDecoratorWithAccessor;
+
+    export const negate: MethodDecoratorWithAccessor;
+    export const Negate: MethodDecoratorWithAccessor;
+
+    export const tap: MethodDecoratorWithAccessor;
+    export const Tap: MethodDecoratorWithAccessor;
+}
+
+declare module "lodash-decorators/extensions" {
+    // Originally copied from ../node_modules/typescript/lib/lib.es6.d.ts
+    export interface ClassDecorator {
+        <TFunction extends Function>(target: TFunction): TFunction|void;
+    }
+    export interface PropertyDecorator {
+        (target: Object, propertyKey: string | symbol): void;
+    }
+    export interface MethodDecorator {
+        <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T> | void;
+    }
+    export interface ParameterDecorator {
+        (target: Object, propertyKey: string | symbol, parameterIndex: number): void;
+    }
+
+    export interface DeprecatedDecorator extends MethodDecorator, ClassDecorator {
+        methodAction(fn: Function & { name: string }): void;
+    }
+
+    export const deprecated: DeprecatedDecorator;
+    export const Deprecated: DeprecatedDecorator;
+
+    export const writable: (writable?: boolean) => MethodDecorator;
+    export const Writable: (writable?: boolean) => MethodDecorator;
+
+    export const configurable: (configurable?: boolean) => MethodDecorator;
+    export const Configurable: (configurable?: boolean) => MethodDecorator;
+
+    export const returnsArg: (index?: number) => MethodDecorator;
+    export const ReturnsArg: (index?: number) => MethodDecorator;
+
+    export const enumerable: (enumerable?: boolean) => MethodDecorator;
+    export const Enumerable: (enumerable?: boolean) => MethodDecorator;
+
+    export const nonenumerable: MethodDecorator;
+    export const Nonenumerable: MethodDecorator;
+
+    export const nonconfigurable: MethodDecorator;
+    export const Nonconfigurable: MethodDecorator;
+
+    export const readonly: MethodDecorator;
+    export const Readonly: MethodDecorator;
+}
+
+declare module "lodash-decorators/validate" {
+    // Originally copied from ../node_modules/typescript/lib/lib.es6.d.ts
+    export interface ClassDecorator {
+        <TFunction extends Function>(target: TFunction): TFunction|void;
+    }
+    export interface PropertyDecorator {
+        (target: Object, propertyKey: string | symbol): void;
+    }
+    export interface MethodDecorator {
+        <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T> | void;
+    }
+    export interface ParameterDecorator {
+        (target: Object, propertyKey: string | symbol, parameterIndex: number): void;
+    }
+
+    export interface TypedMethodDecorator<TFunction extends Function> {
+        (target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<TFunction>): TypedPropertyDescriptor<TFunction> | void;
+    }
+
+    export interface Predicate<T> {
+        (t: T): boolean;
+    }
+    type Predicates<T> = Predicate<T>|Predicate<T>[];
+
+    export interface ValidateDecorator {
+        <T1>(p1: Predicates<T1>):
+            TypedMethodDecorator<(<R>(param1: T1) => R)>;
+        <T1, T2>(p1: Predicates<T1>, p2?: Predicates<T2>):
+            TypedMethodDecorator<(<R>(param1: T1, param2: T2) => R)>;
+        <T1, T2, T3>(p1: Predicates<T1>, p2?: Predicates<T2>, p3?: Predicates<T3>):
+            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3) => R)>;
+        <T1, T2, T3, T4>(p1: Predicates<T1>, p2?: Predicates<T2>, p3?: Predicates<T3>, p4?: Predicates<T4>):
+            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3, param4: T4) => R)>;
+        <T1, T2, T3, T4, T5>(p1: Predicates<T1>, p2?: Predicates<T2>, p3?: Predicates<T3>, p4?: Predicates<T4>, p5?: Predicates<T5>):
+            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3, param4: T4, param5: T5) => R)>;
+        <T1, T2, T3, T4, T5, T6>(p1: Predicates<T1>, p2?: Predicates<T2>, p3?: Predicates<T3>, p4?: Predicates<T4>, p5?: Predicates<T5>, p6?: Predicates<T6>):
+            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3, param4: T4, param5: T5, param6: T6) => R)>;
+    }
+
+    export interface ValidateReturnDecorator {
+        <R>(p1: Predicates<R>): TypedMethodDecorator<((...args: any[]) => R)>;
+    }
+
+    export const validate: ValidateDecorator;
+    export const Validate: ValidateDecorator;
+
+    export const validateReturn: ValidateReturnDecorator;
+    export const ValidateReturn: ValidateReturnDecorator;
+}
diff --git a/lodash-decorators/lodash-decorators-tests.ts b/lodash-decorators/lodash-decorators-tests.ts
index 1ab2cad550..e22d6911f3 100644
--- a/lodash-decorators/lodash-decorators-tests.ts
+++ b/lodash-decorators/lodash-decorators-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="lodash-decorators.d.ts" />
-/// <reference path='../lodash/lodash-3.10.d.ts' />
-
 //
 // With Arguments
 //
diff --git a/lodash-decorators/lodash-decorators.d.ts b/lodash-decorators/lodash-decorators.d.ts
deleted file mode 100644
index c1f7e4cbd7..0000000000
--- a/lodash-decorators/lodash-decorators.d.ts
+++ /dev/null
@@ -1,272 +0,0 @@
-// Type definitions for lodash-decorators 1.0.5
-// Project: https://github.com/steelsojka/lodash-decorators
-// Definitions by: Qubo <https://github.com/tkqubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path='../lodash/lodash-3.10.d.ts' />
-
-
-declare module "lodash-decorators" {
-    // Originally copied from ../node_modules/typescript/lib/lib.es6.d.ts
-    export interface ClassDecorator {
-        <TFunction extends Function>(target: TFunction): TFunction|void;
-    }
-    export interface PropertyDecorator {
-        (target: Object, propertyKey: string | symbol): void;
-    }
-    export interface MethodDecorator {
-        <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T> | void;
-    }
-    export interface ParameterDecorator {
-        (target: Object, propertyKey: string | symbol, parameterIndex: number): void;
-    }
-
-    export interface TypedMethodDecorator<TFunction extends Function> {
-        (target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<TFunction>): TypedPropertyDescriptor<TFunction> | void;
-    }
-
-    export interface MethodDecoratorWithAccessor extends MethodDecorator, Accessor<MethodDecorator> {
-    }
-
-    export interface Accessor<T> {
-        set: T;
-        get: T;
-        proto: T;
-    }
-
-    export interface DebounceDecorator {
-        (wait: number, options?: _.DebounceSettings): MethodDecorator;
-    }
-    export interface ThrottleDecorator {
-        (wait: number, options?: _.ThrottleSettings): MethodDecorator;
-    }
-    export interface MemoizeDecorator {
-        (resolver?: Function): MethodDecorator;
-    }
-    export interface AfterDecorator {
-        (n: number): MethodDecorator;
-    }
-    export interface BeforeDecorator {
-        (n: number): MethodDecorator;
-    }
-    export interface AryDecorator {
-        (n: number): MethodDecorator;
-    }
-    export interface CurryDecorator {
-        (arity?: number): MethodDecorator;
-    }
-    export interface CurryRightDecorator {
-        (arity?: number): MethodDecorator;
-    }
-    export interface RestParamDecorator {
-        (start?: number): MethodDecorator;
-    }
-    export interface PartialDecorator {
-        (func: Function|string, ...args: any[]): MethodDecorator;
-    }
-    export interface WrapDecorator {
-        (wrapper: ((func: Function, ...args: any[]) => any)|string): MethodDecorator;
-    }
-    export interface ComposeDecorator {
-        (...funcs: (Function|string)[]): MethodDecorator;
-    }
-    export interface DelayDecorator {
-        (wait: number, ...args: any[]): MethodDecorator;
-    }
-    export interface DeferDecorator {
-        (...args: any[]): MethodDecorator;
-    }
-    export interface BindDecorator {
-        (): TypedMethodDecorator<(<R>() => R)>;
-        <T1>(param1?: T1):
-            TypedMethodDecorator<(<R>(param1: T1) => R)>;
-        <T1, T2>(param1?: T1, param2?: T2):
-            TypedMethodDecorator<(<R>(param1: T1, param2: T2) => R)>;
-        <T1, T2, T3>(param1?: T1, param2?: T2, param3?: T3):
-            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3) => R)>;
-        <T1, T2, T3, T4>(param1?: T1, param2?: T2, param3?: T3, param4?: T4):
-            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3, param4: T4) => R)>;
-        <T1, T2, T3, T4, T5>(param1?: T1, param2?: T2, param3?: T3, param4?: T4, param5?: T5):
-            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3, param4: T4, param5: T5) => R)>;
-        <T1, T2, T3, T4, T5, T6>(param1?: T1, param2?: T2, param3?: T3, param4?: T4, param5?: T5, param6?: T6):
-            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3, param4: T4, param5: T5, param6: T6) => R)>;
-    }
-    export interface BindAllDecorator {
-        (...methodNames: string[]): ClassDecorator;
-    }
-    export interface ModArgsDecorator {
-        (...transforms: Function[]): MethodDecorator;
-    }
-
-    export const debounce: DebounceDecorator & Accessor<DebounceDecorator>;
-    export const Debounce: DebounceDecorator & Accessor<DebounceDecorator>;
-
-    export const throttle: ThrottleDecorator & Accessor<ThrottleDecorator>;
-    export const Throttle: ThrottleDecorator & Accessor<ThrottleDecorator>;
-
-    export const memoize: MemoizeDecorator & Accessor<MemoizeDecorator>;
-    export const Memoize: MemoizeDecorator & Accessor<MemoizeDecorator>;
-
-    export const after: AfterDecorator & Accessor<AfterDecorator>;
-    export const After: AfterDecorator & Accessor<AfterDecorator>;
-
-    export const before: BeforeDecorator & Accessor<BeforeDecorator>;
-    export const Before: BeforeDecorator & Accessor<BeforeDecorator>;
-
-    export const ary: AryDecorator & Accessor<AryDecorator>;
-    export const Ary: AryDecorator & Accessor<AryDecorator>;
-
-    export const curry: CurryDecorator & Accessor<CurryDecorator>;
-    export const Curry: CurryDecorator & Accessor<CurryDecorator>;
-
-    export const curryRight: CurryRightDecorator & Accessor<CurryRightDecorator>;
-    export const CurryRight: CurryRightDecorator & Accessor<CurryRightDecorator>;
-
-    export const restParam: RestParamDecorator & Accessor<RestParamDecorator>;
-    export const RestParam: RestParamDecorator & Accessor<RestParamDecorator>;
-
-    export const partial: PartialDecorator & Accessor<PartialDecorator>;
-    export const Partial: PartialDecorator & Accessor<PartialDecorator>;
-
-    export const partialRight: PartialDecorator & Accessor<PartialDecorator>;
-    export const PartialRight: PartialDecorator & Accessor<PartialDecorator>;
-
-    export const wrap: WrapDecorator & Accessor<WrapDecorator>;
-    export const Wrap: WrapDecorator & Accessor<WrapDecorator>;
-
-    export const compose: ComposeDecorator & Accessor<ComposeDecorator>;
-    export const Compose: ComposeDecorator & Accessor<ComposeDecorator>;
-
-    export const flow: ComposeDecorator & Accessor<ComposeDecorator>;
-    export const Flow: ComposeDecorator & Accessor<ComposeDecorator>;
-
-    export const flowRight: ComposeDecorator & Accessor<ComposeDecorator>;
-    export const FlowRight: ComposeDecorator & Accessor<ComposeDecorator>;
-
-    export const backflow: ComposeDecorator & Accessor<ComposeDecorator>;
-    export const Backflow: ComposeDecorator & Accessor<ComposeDecorator>;
-
-    export const delay: DelayDecorator & Accessor<DelayDecorator>;
-    export const Delay: DelayDecorator & Accessor<DelayDecorator>;
-
-    export const defer: DeferDecorator & Accessor<DeferDecorator>;
-    export const Defer: DeferDecorator & Accessor<DeferDecorator>;
-
-    export const bind: BindDecorator & Accessor<BindDecorator>;
-    export const Bind: BindDecorator & Accessor<BindDecorator>;
-
-    export const bindAll: BindAllDecorator;
-    export const BindAll: BindAllDecorator;
-
-    export const modArgs: ModArgsDecorator & Accessor<ModArgsDecorator>;
-    export const ModArgs: ModArgsDecorator & Accessor<ModArgsDecorator>;
-
-    export const once: MethodDecoratorWithAccessor;
-    export const Once: MethodDecoratorWithAccessor;
-
-    export const spread: MethodDecoratorWithAccessor;
-    export const Spread: MethodDecoratorWithAccessor;
-
-    export const rearg: MethodDecoratorWithAccessor;
-    export const Rearg: MethodDecoratorWithAccessor;
-
-    export const negate: MethodDecoratorWithAccessor;
-    export const Negate: MethodDecoratorWithAccessor;
-
-    export const tap: MethodDecoratorWithAccessor;
-    export const Tap: MethodDecoratorWithAccessor;
-}
-
-declare module "lodash-decorators/extensions" {
-    // Originally copied from ../node_modules/typescript/lib/lib.es6.d.ts
-    export interface ClassDecorator {
-        <TFunction extends Function>(target: TFunction): TFunction|void;
-    }
-    export interface PropertyDecorator {
-        (target: Object, propertyKey: string | symbol): void;
-    }
-    export interface MethodDecorator {
-        <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T> | void;
-    }
-    export interface ParameterDecorator {
-        (target: Object, propertyKey: string | symbol, parameterIndex: number): void;
-    }
-
-    export interface DeprecatedDecorator extends MethodDecorator, ClassDecorator {
-        methodAction(fn: Function & { name: string }): void;
-    }
-
-    export const deprecated: DeprecatedDecorator;
-    export const Deprecated: DeprecatedDecorator;
-
-    export const writable: (writable?: boolean) => MethodDecorator;
-    export const Writable: (writable?: boolean) => MethodDecorator;
-
-    export const configurable: (configurable?: boolean) => MethodDecorator;
-    export const Configurable: (configurable?: boolean) => MethodDecorator;
-
-    export const returnsArg: (index?: number) => MethodDecorator;
-    export const ReturnsArg: (index?: number) => MethodDecorator;
-
-    export const enumerable: (enumerable?: boolean) => MethodDecorator;
-    export const Enumerable: (enumerable?: boolean) => MethodDecorator;
-
-    export const nonenumerable: MethodDecorator;
-    export const Nonenumerable: MethodDecorator;
-
-    export const nonconfigurable: MethodDecorator;
-    export const Nonconfigurable: MethodDecorator;
-
-    export const readonly: MethodDecorator;
-    export const Readonly: MethodDecorator;
-}
-
-declare module "lodash-decorators/validate" {
-    // Originally copied from ../node_modules/typescript/lib/lib.es6.d.ts
-    export interface ClassDecorator {
-        <TFunction extends Function>(target: TFunction): TFunction|void;
-    }
-    export interface PropertyDecorator {
-        (target: Object, propertyKey: string | symbol): void;
-    }
-    export interface MethodDecorator {
-        <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T> | void;
-    }
-    export interface ParameterDecorator {
-        (target: Object, propertyKey: string | symbol, parameterIndex: number): void;
-    }
-
-    export interface TypedMethodDecorator<TFunction extends Function> {
-        (target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<TFunction>): TypedPropertyDescriptor<TFunction> | void;
-    }
-
-    export interface Predicate<T> {
-        (t: T): boolean;
-    }
-    type Predicates<T> = Predicate<T>|Predicate<T>[];
-
-    export interface ValidateDecorator {
-        <T1>(p1: Predicates<T1>):
-            TypedMethodDecorator<(<R>(param1: T1) => R)>;
-        <T1, T2>(p1: Predicates<T1>, p2?: Predicates<T2>):
-            TypedMethodDecorator<(<R>(param1: T1, param2: T2) => R)>;
-        <T1, T2, T3>(p1: Predicates<T1>, p2?: Predicates<T2>, p3?: Predicates<T3>):
-            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3) => R)>;
-        <T1, T2, T3, T4>(p1: Predicates<T1>, p2?: Predicates<T2>, p3?: Predicates<T3>, p4?: Predicates<T4>):
-            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3, param4: T4) => R)>;
-        <T1, T2, T3, T4, T5>(p1: Predicates<T1>, p2?: Predicates<T2>, p3?: Predicates<T3>, p4?: Predicates<T4>, p5?: Predicates<T5>):
-            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3, param4: T4, param5: T5) => R)>;
-        <T1, T2, T3, T4, T5, T6>(p1: Predicates<T1>, p2?: Predicates<T2>, p3?: Predicates<T3>, p4?: Predicates<T4>, p5?: Predicates<T5>, p6?: Predicates<T6>):
-            TypedMethodDecorator<(<R>(param1: T1, param2: T2, param3: T3, param4: T4, param5: T5, param6: T6) => R)>;
-    }
-
-    export interface ValidateReturnDecorator {
-        <R>(p1: Predicates<R>): TypedMethodDecorator<((...args: any[]) => R)>;
-    }
-
-    export const validate: ValidateDecorator;
-    export const Validate: ValidateDecorator;
-
-    export const validateReturn: ValidateReturnDecorator;
-    export const ValidateReturn: ValidateReturnDecorator;
-}
diff --git a/lodash-decorators/tsconfig.json b/lodash-decorators/tsconfig.json
new file mode 100644
index 0000000000..e12742a64f
--- /dev/null
+++ b/lodash-decorators/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "experimentalDecorators": true,
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "lodash-decorators-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/lodash/index.d.ts b/lodash/index.d.ts
new file mode 100644
index 0000000000..0e506e9597
--- /dev/null
+++ b/lodash/index.d.ts
@@ -0,0 +1,18972 @@
+// Type definitions for Lo-Dash
+// Project: http://lodash.com/
+// Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/**
+### 4.0.0 Changelog (https://github.com/lodash/lodash/wiki/Changelog)
+
+#### TODO:
+removed:
+- [x] Removed _.support
+- [x] Removed _.findWhere in favor of _.find with iteratee shorthand
+- [x] Removed _.where in favor of _.filter with iteratee shorthand
+- [x] Removed _.pluck in favor of _.map with iteratee shorthand
+
+renamed:
+- [x] Renamed _.first to _.head
+- [x] Renamed _.indexBy to _.keyBy
+- [x] Renamed _.invoke to _.invokeMap
+- [x] Renamed _.overArgs to _.overArgs
+- [x] Renamed _.padLeft & _.padRight to _.padStart & _.padEnd
+- [x] Renamed _.pairs to _.toPairs
+- [x] Renamed _.rest to _.tail
+- [x] Renamed _.restParam to _.rest
+- [x] Renamed _.sortByOrder to _.orderBy
+- [x] Renamed _.trimLeft & _.trimRight to _.trimStart & _.trimEnd
+- [x] Renamed _.trunc to _.truncate
+
+split:
+- [x] Split _.indexOf & _.lastIndexOf into _.sortedIndexOf & _.sortedLastIndexOf
+- [x] Split _.max & _.min into _.maxBy & _.minBy
+- [x] Split _.omit & _.pick into _.omitBy & _.pickBy
+- [x] Split _.sample into _.sampleSize
+- [x] Split _.sortedIndex into _.sortedIndexBy
+- [x] Split _.sortedLastIndex into _.sortedLastIndexBy
+- [x] Split _.uniq into _.sortedUniq, _.sortedUniqBy, & _.uniqBy
+
+changes:
+- [x] Absorbed _.sortByAll into _.sortBy
+- [x] Changed the category of _.at to “Object”
+- [x] Changed the category of _.bindAll to “Utility”
+- [x] Made _.capitalize uppercase the first character & lowercase the rest
+- [x] Made _.functions return only own method names
+
+
+added 23 array methods:
+- [x] _.concat
+- [x] _.differenceBy
+- [x] _.differenceWith
+- [x] _.flatMap
+- [x] _.fromPairs
+- [x] _.intersectionBy
+- [x] _.intersectionWith
+- [x] _.join
+- [x] _.pullAll
+- [x] _.pullAllBy
+- [x] _.reverse
+- [x] _.sortedIndexBy
+- [x] _.sortedIndexOf
+- [x] _.sortedLastIndexBy
+- [x] _.sortedLastIndexOf
+- [x] _.sortedUniq
+- [x] _.sortedUniqBy
+- [x] _.unionBy
+- [x] _.unionWith
+- [x] _.uniqBy
+- [x] _.uniqWith
+- [x] _.xorBy
+- [x] _.xorWith
+
+added 18 lang methods:
+- [x] _.cloneDeepWith
+- [x] _.cloneWith
+- [x] _.eq
+- [x] _.isArrayLike
+- [x] _.isArrayLikeObject
+- [x] _.isEqualWith
+- [x] _.isInteger
+- [x] _.isLength
+- [x] _.isMatchWith
+- [x] _.isNil
+- [x] _.isObjectLike
+- [x] _.isSafeInteger
+- [x] _.isSymbol
+- [x] _.toInteger
+- [x] _.toLength
+- [x] _.toNumber
+- [x] _.toSafeInteger
+- [x] _.toString
+
+added 13 object methods:
+- [x] _.assignIn
+- [x] _.assignInWith
+- [x] _.assignWith
+- [x] _.functionsIn
+- [x] _.hasIn
+- [x] _.mergeWith
+- [x] _.omitBy
+- [x] _.pickBy
+
+
+added 8 string methods:
+- [x] _.lowerCase
+- [x] _.lowerFirst
+- [x] _.upperCase
+- [x] _.upperFirst
+- [x] _.toLower
+- [x] _.toUpper
+
+added 8 utility methods:
+- [x] _.toPath
+
+added 4 math methods:
+- [x] _.maxBy
+- [x] _.mean
+- [x] _.minBy
+- [x] _.sumBy
+
+added 2 function methods:
+- [x] _.flip
+- [x] _.unary
+
+added 2 number methods:
+- [x] _.clamp
+- [x] _.subtract
+
+added collection method:
+- [x] _.sampleSize
+
+Added 3 aliases
+
+- [x] _.first as an alias of _.head
+
+Removed 17 aliases
+- [x] Removed aliase _.all
+- [x] Removed aliase _.any
+- [x] Removed aliase _.backflow
+- [x] Removed aliase _.callback
+- [x] Removed aliase _.collect
+- [x] Removed aliase _.compose
+- [x] Removed aliase _.contains
+- [x] Removed aliase _.detect
+- [x] Removed aliase _.foldl
+- [x] Removed aliase _.foldr
+- [x] Removed aliase _.include
+- [x] Removed aliase _.inject
+- [x] Removed aliase _.methods
+- [x] Removed aliase _.object
+- [x] Removed aliase _.run
+- [x] Removed aliase _.select
+- [x] Removed aliase _.unique
+
+Other changes
+- [x] Added support for array buffers to _.isEqual
+- [x] Added support for converting iterators to _.toArray
+- [x] Added support for deep paths to _.zipObject
+- [x] Changed UMD to export to window or self when available regardless of other exports
+- [x] Ensured debounce cancel clears args & thisArg references
+- [x] Ensured _.add, _.subtract, & _.sum don’t skip NaN values
+- [x] Ensured _.clone treats generators like functions
+- [x] Ensured _.clone produces clones with the source’s [[Prototype]]
+- [x] Ensured _.defaults assigns properties that shadow Object.prototype
+- [x] Ensured _.defaultsDeep doesn’t merge a string into an array
+- [x] Ensured _.defaultsDeep & _.merge don’t modify sources
+- [x] Ensured _.defaultsDeep works with circular references
+- [x] Ensured _.keys skips “length” on strict mode arguments objects in Safari 9
+- [x] Ensured _.merge doesn’t convert strings to arrays
+- [x] Ensured _.merge merges plain-objects onto non plain-objects
+- [x] Ensured _#plant resets iterator data of cloned sequences
+- [x] Ensured _.random swaps min & max if min is greater than max
+- [x] Ensured _.range preserves the sign of start of -0
+- [x] Ensured _.reduce & _.reduceRight use getIteratee in their array branch
+- [x] Fixed rounding issue with the precision param of _.floor
+
+** LATER **
+Misc:
+- [ ] Made _.forEach, _.forIn, _.forOwn, & _.times implicitly end a chain sequence
+- [ ] Removed thisArg params from most methods
+- [ ] Made “By” methods provide a single param to iteratees
+- [ ] Made _.words chainable by default
+- [ ] Removed isDeep params from _.clone & _.flatten
+- [ ] Removed _.bindAll support for binding all methods when no names are provided
+- [ ] Removed func-first param signature from _.before & _.after
+- [ ] _.extend as an alias of _.assignIn
+- [ ] _.extendWith as an alias of _.assignInWith
+- [ ] Added clear method to _.memoize.Cache
+- [ ] Added flush method to debounced & throttled functions
+- [ ] Added support for ES6 maps, sets, & symbols to _.clone, _.isEqual, & _.toArray
+- [ ] Enabled _.flow & _.flowRight to accept an array of functions
+- [ ] Ensured “Collection” methods treat functions as objects
+- [ ] Ensured _.assign, _.defaults, & _.merge coerce object values to objects
+- [ ] Ensured _.bindKey bound functions call object[key] when called with the new operator
+- [ ] Ensured _.isFunction returns true for generator functions
+- [ ] Ensured _.merge assigns typed arrays directly
+- [ ] Made _(...) an iterator & iterable
+- [ ] Made _.drop, _.take, & right forms coerce n of undefined to 0
+
+Methods:
+- [ ] _.concat
+- [ ] _.differenceBy
+- [ ] _.differenceWith
+- [ ] _.flatMap
+- [ ] _.fromPairs
+- [ ] _.intersectionBy
+- [ ] _.intersectionWith
+- [ ] _.join
+- [ ] _.pullAll
+- [ ] _.pullAllBy
+- [ ] _.reverse
+- [ ] _.sortedLastIndexOf
+- [ ] _.unionBy
+- [ ] _.unionWith
+- [ ] _.uniqWith
+- [ ] _.xorBy
+- [ ] _.xorWith
+- [ ] _.toString
+
+- [ ] _.invoke
+- [ ] _.setWith
+- [ ] _.toPairs
+- [ ] _.toPairsIn
+- [ ] _.unset
+
+- [ ] _.replace
+- [ ] _.split
+
+- [ ] _.cond
+- [ ] _.conforms
+- [ ] _.nthArg
+- [ ] _.over
+- [ ] _.overEvery
+- [ ] _.overSome
+- [ ] _.rangeRight
+
+- [ ] _.next
+*/
+
+declare var _: _.LoDashStatic;
+
+declare module _ {
+    interface LoDashStatic {
+        /**
+        * Creates a lodash object which wraps the given value to enable intuitive method chaining.
+        *
+        * In addition to Lo-Dash methods, wrappers also have the following Array methods:
+        * concat, join, pop, push, reverse, shift, slice, sort, splice, and unshift
+        *
+        * Chaining is supported in custom builds as long as the value method is implicitly or
+        * explicitly included in the build.
+        *
+        * The chainable wrapper functions are:
+        * after, assign, bind, bindAll, bindKey, chain, chunk, compact, compose, concat, countBy,
+        * createCallback, curry, debounce, defaults, defer, delay, difference, filter, flatten,
+        * forEach, forEachRight, forIn, forInRight, forOwn, forOwnRight, functions, groupBy,
+        * keyBy, initial, intersection, invert, invoke, keys, map, max, memoize, merge, min,
+        * object, omit, once, pairs, partial, partialRight, pick, pluck, pull, push, range, reject,
+        * remove, rest, reverse, sample, shuffle, slice, sort, sortBy, splice, tap, throttle, times,
+        * toArray, transform, union, uniq, unset, unshift, unzip, values, where, without, wrap, and zip
+        *
+        * The non-chainable wrapper functions are:
+        * clone, cloneDeep, contains, escape, every, find, findIndex, findKey, findLast,
+        * findLastIndex, findLastKey, has, identity, indexOf, isArguments, isArray, isBoolean,
+        * isDate, isElement, isEmpty, isEqual, isFinite, isFunction, isNaN, isNull, isNumber,
+        * isObject, isPlainObject, isRegExp, isString, isUndefined, join, lastIndexOf, mixin,
+        * noConflict, parseInt, pop, random, reduce, reduceRight, result, shift, size, some,
+        * sortedIndex, runInContext, template, unescape, uniqueId, and value
+        *
+        * The wrapper functions first and last return wrapped values when n is provided, otherwise
+        * they return unwrapped values.
+        *
+        * Explicit chaining can be enabled by using the _.chain method.
+        **/
+        (value: number): LoDashImplicitWrapper<number>;
+        (value: string): LoDashImplicitStringWrapper;
+        (value: boolean): LoDashImplicitWrapper<boolean>;
+        (value: Array<number>): LoDashImplicitNumberArrayWrapper;
+        <T>(value: Array<T>): LoDashImplicitArrayWrapper<T>;
+        <T extends {}>(value: T): LoDashImplicitObjectWrapper<T>;
+        (value: any): LoDashImplicitWrapper<any>;
+
+        /**
+        * The semantic version number.
+        **/
+        VERSION: string;
+
+        /**
+        * By default, the template delimiters used by Lo-Dash are similar to those in embedded Ruby
+        * (ERB). Change the following template settings to use alternative delimiters.
+        **/
+        templateSettings: TemplateSettings;
+    }
+
+    /**
+    * By default, the template delimiters used by Lo-Dash are similar to those in embedded Ruby
+    * (ERB). Change the following template settings to use alternative delimiters.
+    **/
+    interface TemplateSettings {
+        /**
+        * The "escape" delimiter.
+        **/
+        escape?: RegExp;
+
+        /**
+        * The "evaluate" delimiter.
+        **/
+        evaluate?: RegExp;
+
+        /**
+        * An object to import into the template as local variables.
+        **/
+        imports?: Dictionary<any>;
+
+        /**
+        * The "interpolate" delimiter.
+        **/
+        interpolate?: RegExp;
+
+        /**
+        * Used to reference the data object in the template text.
+        **/
+        variable?: string;
+    }
+
+    /**
+     * Creates a cache object to store key/value pairs.
+     */
+    interface MapCache {
+        /**
+         * Removes `key` and its value from the cache.
+         * @param key The key of the value to remove.
+         * @return Returns `true` if the entry was removed successfully, else `false`.
+         */
+        delete(key: string): boolean;
+
+        /**
+         * Gets the cached value for `key`.
+         * @param key The key of the value to get.
+         * @return Returns the cached value.
+         */
+        get(key: string): any;
+
+        /**
+         * Checks if a cached value for `key` exists.
+         * @param key The key of the entry to check.
+         * @return Returns `true` if an entry for `key` exists, else `false`.
+         */
+        has(key: string): boolean;
+
+        /**
+         * Sets `value` to `key` of the cache.
+         * @param key The key of the value to cache.
+         * @param value The value to cache.
+         * @return Returns the cache object.
+         */
+        set(key: string, value: any): _.Dictionary<any>;
+    }
+
+    interface LoDashWrapperBase<T, TWrapper> { }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> extends LoDashWrapperBase<T, TWrapper> { }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> extends LoDashWrapperBase<T, TWrapper> { }
+
+    interface LoDashImplicitWrapper<T> extends LoDashImplicitWrapperBase<T, LoDashImplicitWrapper<T>> { }
+
+    interface LoDashExplicitWrapper<T> extends LoDashExplicitWrapperBase<T, LoDashExplicitWrapper<T>> { }
+
+    interface LoDashImplicitStringWrapper extends LoDashImplicitWrapper<string> { }
+
+    interface LoDashExplicitStringWrapper extends LoDashExplicitWrapper<string> { }
+
+    interface LoDashImplicitObjectWrapper<T> extends LoDashImplicitWrapperBase<T, LoDashImplicitObjectWrapper<T>> { }
+
+    interface LoDashExplicitObjectWrapper<T> extends LoDashExplicitWrapperBase<T, LoDashExplicitObjectWrapper<T>> { }
+
+    interface LoDashImplicitArrayWrapper<T> extends LoDashImplicitWrapperBase<T[], LoDashImplicitArrayWrapper<T>> {
+        pop(): T;
+        push(...items: T[]): LoDashImplicitArrayWrapper<T>;
+        shift(): T;
+        sort(compareFn?: (a: T, b: T) => number): LoDashImplicitArrayWrapper<T>;
+        splice(start: number): LoDashImplicitArrayWrapper<T>;
+        splice(start: number, deleteCount: number, ...items: any[]): LoDashImplicitArrayWrapper<T>;
+        unshift(...items: T[]): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> extends LoDashExplicitWrapperBase<T[], LoDashExplicitArrayWrapper<T>> { }
+
+    interface LoDashImplicitNumberArrayWrapper extends LoDashImplicitArrayWrapper<number> { }
+
+    interface LoDashExplicitNumberArrayWrapper extends LoDashExplicitArrayWrapper<number> { }
+
+    /*********
+     * Array *
+     *********/
+
+    //_.chunk
+    interface LoDashStatic {
+        /**
+         * Creates an array of elements split into groups the length of size. If collection can’t be split evenly, the
+         * final chunk will be the remaining elements.
+         *
+         * @param array The array to process.
+         * @param size The length of each chunk.
+         * @return Returns the new array containing chunks.
+         */
+        chunk<T>(
+            array: List<T>,
+            size?: number
+        ): T[][];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.chunk
+         */
+        chunk(size?: number): LoDashImplicitArrayWrapper<T[]>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.chunk
+         */
+        chunk<TResult>(size?: number): LoDashImplicitArrayWrapper<TResult[]>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.chunk
+         */
+        chunk(size?: number): LoDashExplicitArrayWrapper<T[]>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.chunk
+         */
+        chunk<TResult>(size?: number): LoDashExplicitArrayWrapper<TResult[]>;
+    }
+
+    //_.compact
+    interface LoDashStatic {
+        /**
+         * Creates an array with all falsey values removed. The values false, null, 0, "", undefined, and NaN are
+         * falsey.
+         *
+         * @param array The array to compact.
+         * @return (Array) Returns the new array of filtered values.
+         */
+        compact<T>(array?: List<T>): T[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.compact
+         */
+        compact(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.compact
+         */
+        compact<TResult>(): LoDashImplicitArrayWrapper<TResult>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.compact
+         */
+        compact(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.compact
+         */
+        compact<TResult>(): LoDashExplicitArrayWrapper<TResult>;
+    }
+
+    //_.concat DUMMY
+    interface LoDashStatic {
+        /**
+         * Creates a new array concatenating `array` with any additional arrays
+         * and/or values.
+         *
+         * @static
+         * @memberOf _
+         * @category Array
+         * @param {Array} array The array to concatenate.
+         * @param {...*} [values] The values to concatenate.
+         * @returns {Array} Returns the new concatenated array.
+         * @example
+         *
+         * var array = [1];
+         * var other = _.concat(array, 2, [3], [[4]]);
+         *
+         * console.log(other);
+         * // => [1, 2, 3, [4]]
+         *
+         * console.log(array);
+         * // => [1]
+         */
+         concat<T>(...values: (T[]|List<T>)[]) : T[];
+    }
+
+    //_.difference
+    interface LoDashStatic {
+        /**
+         * Creates an array of unique array values not included in the other provided arrays using SameValueZero for
+         * equality comparisons.
+         *
+         * @param array The array to inspect.
+         * @param values The arrays of values to exclude.
+         * @return Returns the new array of filtered values.
+         */
+        difference<T>(
+            array: T[]|List<T>,
+            ...values: Array<T[]|List<T>>
+        ): T[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.difference
+         */
+        difference(...values: (T[]|List<T>)[]): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.difference
+         */
+        difference<TValue>(...values: (TValue[]|List<TValue>)[]): LoDashImplicitArrayWrapper<TValue>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.difference
+         */
+        difference(...values: (T[]|List<T>)[]): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.difference
+         */
+        difference<TValue>(...values: (TValue[]|List<TValue>)[]): LoDashExplicitArrayWrapper<TValue>;
+    }
+
+    //_.differenceBy
+    interface LoDashStatic {
+        /**
+         * This method is like _.difference except that it accepts iteratee which is invoked for each element of array
+         * and values to generate the criterion by which uniqueness is computed. The iteratee is invoked with one
+         * argument: (value).
+         *
+         * @param array The array to inspect.
+         * @param values The values to exclude.
+         * @param iteratee The iteratee invoked per element.
+         * @returns Returns the new array of filtered values.
+         */
+        differenceBy<T>(
+            array: T[]|List<T>,
+            values?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): T[];
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            array: T[]|List<T>,
+            values?: T[]|List<T>,
+            iteratee?: W
+        ): T[];
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            array: T[]|List<T>,
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): T[];
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            array: T[]|List<T>,
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            iteratee?: W
+        ): T[];
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            array: T[]|List<T>,
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): T[];
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            array: T[]|List<T>,
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            iteratee?: W
+        ): T[];
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            array: T[]|List<T>,
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            values4?: T[]|List<T>,
+            iteratee?: W
+        ): T[];
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            array: T[]|List<T>,
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            values4?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): T[];
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            array: T[]|List<T>,
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            values4?: T[]|List<T>,
+            values5?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): T[];
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            array: T[]|List<T>,
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            values4?: T[]|List<T>,
+            values5?: T[]|List<T>,
+            iteratee?: W
+        ): T[];
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            array: T[]|List<T>,
+            ...values: any[]
+        ): T[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            values?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            values?: T[]|List<T>,
+            iteratee?: W
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            iteratee?: W
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            iteratee?: W
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            values4?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            values4?: T[]|List<T>,
+            iteratee?: W
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            values4?: T[]|List<T>,
+            values5?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            values4?: T[]|List<T>,
+            values5?: T[]|List<T>,
+            iteratee?: W
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            ...values: any[]
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            values?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            values?: T[]|List<T>,
+            iteratee?: W
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            iteratee?: W
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            iteratee?: W
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            values4?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            values4?: T[]|List<T>,
+            iteratee?: W
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            values4?: T[]|List<T>,
+            values5?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            values4?: T[]|List<T>,
+            values5?: T[]|List<T>,
+            iteratee?: W
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            ...values: any[]
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            values?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            values?: T[]|List<T>,
+            iteratee?: W
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            iteratee?: W
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            iteratee?: W
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            values4?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            values4?: T[]|List<T>,
+            iteratee?: W
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            values4?: T[]|List<T>,
+            values5?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            values4?: T[]|List<T>,
+            values5?: T[]|List<T>,
+            iteratee?: W
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            ...values: any[]
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            values?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            values?: T[]|List<T>,
+            iteratee?: W
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            iteratee?: W
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            iteratee?: W
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            values4?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            values4?: T[]|List<T>,
+            iteratee?: W
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            values4?: T[]|List<T>,
+            values5?: T[]|List<T>,
+            iteratee?: ((value: T) => any)|string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T, W extends Object>(
+            values1?: T[]|List<T>,
+            values2?: T[]|List<T>,
+            values3?: T[]|List<T>,
+            values4?: T[]|List<T>,
+            values5?: T[]|List<T>,
+            iteratee?: W
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.differenceBy
+         */
+        differenceBy<T>(
+            ...values: any[]
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.differenceWith DUMMY
+    interface LoDashStatic {
+        /**
+         * Creates an array of unique `array` values not included in the other
+         * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+         * for equality comparisons.
+         *
+         * @static
+         * @memberOf _
+         * @category Array
+         * @param {Array} array The array to inspect.
+         * @param {...Array} [values] The values to exclude.
+         * @returns {Array} Returns the new array of filtered values.
+         * @example
+         *
+         * _.difference([3, 2, 1], [4, 2]);
+         * // => [3, 1]
+         */
+        differenceWith(
+            array: any[]|List<any>,
+            ...values: any[]
+        ): any[];
+    }
+
+    //_.drop
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array with n elements dropped from the beginning.
+         *
+         * @param array The array to query.
+         * @param n The number of elements to drop.
+         * @return Returns the slice of array.
+         */
+        drop<T>(array: T[]|List<T>, n?: number): T[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.drop
+         */
+        drop(n?: number): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.drop
+         */
+        drop<T>(n?: number): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.drop
+         */
+        drop(n?: number): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.drop
+         */
+        drop<T>(n?: number): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.dropRight
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array with n elements dropped from the end.
+         *
+         * @param array The array to query.
+         * @param n The number of elements to drop.
+         * @return Returns the slice of array.
+         */
+        dropRight<T>(
+            array: List<T>,
+            n?: number
+        ): T[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.dropRight
+         */
+        dropRight(n?: number): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.dropRight
+         */
+        dropRight<TResult>(n?: number): LoDashImplicitArrayWrapper<TResult>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.dropRight
+         */
+        dropRight(n?: number): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.dropRight
+         */
+        dropRight<TResult>(n?: number): LoDashExplicitArrayWrapper<TResult>;
+    }
+
+    //_.dropRightWhile
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
+         * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * match the properties of the given object, else false.
+         *
+         * @param array The array to query.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the slice of array.
+         */
+        dropRightWhile<TValue>(
+            array: List<TValue>,
+            predicate?: ListIterator<TValue, boolean>
+        ): TValue[];
+
+        /**
+         * @see _.dropRightWhile
+         */
+        dropRightWhile<TValue>(
+            array: List<TValue>,
+            predicate?: string
+        ): TValue[];
+
+        /**
+         * @see _.dropRightWhile
+         */
+        dropRightWhile<TWhere, TValue>(
+            array: List<TValue>,
+            predicate?: TWhere
+        ): TValue[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.dropRightWhile
+         */
+        dropRightWhile(
+            predicate?: ListIterator<T, boolean>
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.dropRightWhile
+         */
+        dropRightWhile(
+            predicate?: string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.dropRightWhile
+         */
+        dropRightWhile<TWhere>(
+            predicate?: TWhere
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.dropRightWhile
+         */
+        dropRightWhile<TValue>(
+            predicate?: ListIterator<TValue, boolean>
+        ): LoDashImplicitArrayWrapper<TValue>;
+
+        /**
+         * @see _.dropRightWhile
+         */
+        dropRightWhile<TValue>(
+            predicate?: string
+        ): LoDashImplicitArrayWrapper<TValue>;
+
+        /**
+         * @see _.dropRightWhile
+         */
+        dropRightWhile<TWhere, TValue>(
+            predicate?: TWhere
+        ): LoDashImplicitArrayWrapper<TValue>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.dropRightWhile
+         */
+        dropRightWhile(
+            predicate?: ListIterator<T, boolean>
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.dropRightWhile
+         */
+        dropRightWhile(
+            predicate?: string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.dropRightWhile
+         */
+        dropRightWhile<TWhere>(
+            predicate?: TWhere
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.dropRightWhile
+         */
+        dropRightWhile<TValue>(
+            predicate?: ListIterator<TValue, boolean>
+        ): LoDashExplicitArrayWrapper<TValue>;
+
+        /**
+         * @see _.dropRightWhile
+         */
+        dropRightWhile<TValue>(
+            predicate?: string
+        ): LoDashExplicitArrayWrapper<TValue>;
+
+        /**
+         * @see _.dropRightWhile
+         */
+        dropRightWhile<TWhere, TValue>(
+            predicate?: TWhere
+        ): LoDashExplicitArrayWrapper<TValue>;
+    }
+
+    //_.dropWhile
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array excluding elements dropped from the beginning. Elements are dropped until predicate
+         * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param array The array to query.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the slice of array.
+         */
+        dropWhile<TValue>(
+            array: List<TValue>,
+            predicate?: ListIterator<TValue, boolean>
+        ): TValue[];
+
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile<TValue>(
+            array: List<TValue>,
+            predicate?: string
+        ): TValue[];
+
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile<TWhere, TValue>(
+            array: List<TValue>,
+            predicate?: TWhere
+        ): TValue[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile(
+            predicate?: ListIterator<T, boolean>
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile(
+            predicate?: string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile<TWhere>(
+            predicate?: TWhere
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile<TValue>(
+            predicate?: ListIterator<TValue, boolean>
+        ): LoDashImplicitArrayWrapper<TValue>;
+
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile<TValue>(
+            predicate?: string
+        ): LoDashImplicitArrayWrapper<TValue>;
+
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile<TWhere, TValue>(
+            predicate?: TWhere
+        ): LoDashImplicitArrayWrapper<TValue>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile(
+            predicate?: ListIterator<T, boolean>
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile(
+            predicate?: string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile<TWhere>(
+            predicate?: TWhere
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile<TValue>(
+            predicate?: ListIterator<TValue, boolean>
+        ): LoDashExplicitArrayWrapper<TValue>;
+
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile<TValue>(
+            predicate?: string
+        ): LoDashExplicitArrayWrapper<TValue>;
+
+        /**
+         * @see _.dropWhile
+         */
+        dropWhile<TWhere, TValue>(
+            predicate?: TWhere
+        ): LoDashExplicitArrayWrapper<TValue>;
+    }
+
+    //_.fill
+    interface LoDashStatic {
+        /**
+         * Fills elements of array with value from start up to, but not including, end.
+         *
+         * Note: This method mutates array.
+         *
+         * @param array The array to fill.
+         * @param value The value to fill array with.
+         * @param start The start position.
+         * @param end The end position.
+         * @return Returns array.
+         */
+        fill<T>(
+            array: any[],
+            value: T,
+            start?: number,
+            end?: number
+        ): T[];
+
+        /**
+         * @see _.fill
+         */
+        fill<T>(
+            array: List<any>,
+            value: T,
+            start?: number,
+            end?: number
+        ): List<T>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.fill
+         */
+        fill<T>(
+            value: T,
+            start?: number,
+            end?: number
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.fill
+         */
+        fill<T>(
+            value: T,
+            start?: number,
+            end?: number
+        ): LoDashImplicitObjectWrapper<List<T>>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.fill
+         */
+        fill<T>(
+            value: T,
+            start?: number,
+            end?: number
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.fill
+         */
+        fill<T>(
+            value: T,
+            start?: number,
+            end?: number
+        ): LoDashExplicitObjectWrapper<List<T>>;
+    }
+
+    //_.findIndex
+    interface LoDashStatic {
+        /**
+         * This method is like _.find except that it returns the index of the first element predicate returns truthy
+         * for instead of the element itself.
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param array The array to search.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the index of the found element, else -1.
+         */
+        findIndex<T>(
+            array: List<T>,
+            predicate?: ListIterator<T, boolean>
+        ): number;
+
+        /**
+         * @see _.findIndex
+         */
+        findIndex<T>(
+            array: List<T>,
+            predicate?: string
+        ): number;
+
+        /**
+         * @see _.findIndex
+         */
+        findIndex<W, T>(
+            array: List<T>,
+            predicate?: W
+        ): number;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.findIndex
+         */
+        findIndex(
+            predicate?: ListIterator<T, boolean>
+        ): number;
+
+        /**
+         * @see _.findIndex
+         */
+        findIndex(
+            predicate?: string
+        ): number;
+
+        /**
+         * @see _.findIndex
+         */
+        findIndex<W>(
+            predicate?: W
+        ): number;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.findIndex
+         */
+        findIndex<TResult>(
+            predicate?: ListIterator<TResult, boolean>
+        ): number;
+
+        /**
+         * @see _.findIndex
+         */
+        findIndex(
+            predicate?: string
+        ): number;
+
+        /**
+         * @see _.findIndex
+         */
+        findIndex<W>(
+            predicate?: W
+        ): number;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.findIndex
+         */
+        findIndex(
+            predicate?: ListIterator<T, boolean>
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.findIndex
+         */
+        findIndex(
+            predicate?: string
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.findIndex
+         */
+        findIndex<W>(
+            predicate?: W
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.findIndex
+         */
+        findIndex<TResult>(
+            predicate?: ListIterator<TResult, boolean>
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.findIndex
+         */
+        findIndex(
+            predicate?: string
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.findIndex
+         */
+        findIndex<W>(
+            predicate?: W
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    //_.findLastIndex
+    interface LoDashStatic {
+        /**
+         * This method is like _.findIndex except that it iterates over elements of collection from right to left.
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param array The array to search.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The function invoked per iteration.
+         * @return Returns the index of the found element, else -1.
+         */
+        findLastIndex<T>(
+            array: List<T>,
+            predicate?: ListIterator<T, boolean>
+        ): number;
+
+        /**
+         * @see _.findLastIndex
+         */
+        findLastIndex<T>(
+            array: List<T>,
+            predicate?: string
+        ): number;
+
+        /**
+         * @see _.findLastIndex
+         */
+        findLastIndex<W, T>(
+            array: List<T>,
+            predicate?: W
+        ): number;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.findLastIndex
+         */
+        findLastIndex(
+            predicate?: ListIterator<T, boolean>
+        ): number;
+
+        /**
+         * @see _.findLastIndex
+         */
+        findLastIndex(
+            predicate?: string
+        ): number;
+
+        /**
+         * @see _.findLastIndex
+         */
+        findLastIndex<W>(
+            predicate?: W
+        ): number;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.findLastIndex
+         */
+        findLastIndex<TResult>(
+            predicate?: ListIterator<TResult, boolean>
+        ): number;
+
+        /**
+         * @see _.findLastIndex
+         */
+        findLastIndex(
+            predicate?: string
+        ): number;
+
+        /**
+         * @see _.findLastIndex
+         */
+        findLastIndex<W>(
+            predicate?: W
+        ): number;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.findLastIndex
+         */
+        findLastIndex(
+            predicate?: ListIterator<T, boolean>
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.findLastIndex
+         */
+        findLastIndex(
+            predicate?: string
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.findLastIndex
+         */
+        findLastIndex<W>(
+            predicate?: W
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.findLastIndex
+         */
+        findLastIndex<TResult>(
+            predicate?: ListIterator<TResult, boolean>
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.findLastIndex
+         */
+        findLastIndex(
+            predicate?: string
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.findLastIndex
+         */
+        findLastIndex<W>(
+            predicate?: W
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    //_.first
+    interface LoDashStatic {
+        /**
+         * @see _.head
+         */
+        first<T>(array: List<T>): T;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.head
+         */
+        first(): string;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.head
+         */
+        first(): T;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.head
+         */
+        first<T>(): T;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.head
+         */
+        first(): LoDashExplicitWrapper<string>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.head
+         */
+        first<T>(): T;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.head
+         */
+        first<T>(): T;
+    }
+
+    interface RecursiveArray<T> extends Array<T|RecursiveArray<T>> {}
+    interface ListOfRecursiveArraysOrValues<T> extends List<T|RecursiveArray<T>> {}
+
+    //_.flatten
+    interface LoDashStatic {
+        /**
+         * Flattens a nested array. If isDeep is true the array is recursively flattened, otherwise it’s only
+         * flattened a single level.
+         *
+         * @param array The array to flatten.
+         * @param isDeep Specify a deep flatten.
+         * @return Returns the new flattened array.
+         */
+        flatten<T>(array: ListOfRecursiveArraysOrValues<T>, isDeep: boolean): T[];
+
+        /**
+         * @see _.flatten
+         */
+        flatten<T>(array: List<T|T[]>): T[];
+
+        /**
+         * @see _.flatten
+         */
+        flatten<T>(array: ListOfRecursiveArraysOrValues<T>): RecursiveArray<T>;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.flatten
+         */
+        flatten(): LoDashImplicitArrayWrapper<string>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.flatten
+         */
+        flatten<TResult>(isDeep?: boolean): LoDashImplicitArrayWrapper<TResult>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.flatten
+         */
+        flatten<TResult>(isDeep?: boolean): LoDashImplicitArrayWrapper<TResult>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.flatten
+         */
+        flatten(): LoDashExplicitArrayWrapper<string>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.flatten
+         */
+        flatten<TResult>(isDeep?: boolean): LoDashExplicitArrayWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.flatten
+         */
+        flatten<TResult>(isDeep?: boolean): LoDashExplicitArrayWrapper<TResult>;
+    }
+
+    //_.flattenDeep
+    interface LoDashStatic {
+        /**
+         * Recursively flattens a nested array.
+         *
+         * @param array The array to recursively flatten.
+         * @return Returns the new flattened array.
+         */
+        flattenDeep<T>(array: ListOfRecursiveArraysOrValues<T>): T[];
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.flattenDeep
+         */
+        flattenDeep(): LoDashImplicitArrayWrapper<string>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.flattenDeep
+         */
+        flattenDeep<T>(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.flattenDeep
+         */
+        flattenDeep<T>(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.flattenDeep
+         */
+        flattenDeep(): LoDashExplicitArrayWrapper<string>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.flattenDeep
+         */
+        flattenDeep<T>(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.flattenDeep
+         */
+        flattenDeep<T>(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.fromPairs DUMMY
+    interface LoDashStatic {
+        /**
+         * The inverse of `_.toPairs`; this method returns an object composed
+         * from key-value `pairs`.
+         *
+         * @static
+         * @memberOf _
+         * @category Array
+         * @param {Array} pairs The key-value pairs.
+         * @returns {Object} Returns the new object.
+         * @example
+         *
+         * _.fromPairs([['fred', 30], ['barney', 40]]);
+         * // => { 'fred': 30, 'barney': 40 }
+         */
+        fromPairs(
+            array: any[]|List<any>
+        ): Dictionary<any>;
+    }
+
+    //_.fromPairs DUMMY
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.fromPairs
+         */
+        fromPairs(): LoDashImplicitObjectWrapper<any>;
+    }
+
+    //_.fromPairs DUMMY
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.fromPairs
+         */
+        fromPairs(): LoDashExplicitObjectWrapper<any>;
+    }
+
+    //_.head
+    interface LoDashStatic {
+        /**
+         * Gets the first element of array.
+         *
+         * @alias _.first
+         *
+         * @param array The array to query.
+         * @return Returns the first element of array.
+         */
+        head<T>(array: List<T>): T;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.head
+         */
+        head(): string;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.head
+         */
+        head(): T;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.head
+         */
+        head<T>(): T;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.head
+         */
+        head(): LoDashExplicitWrapper<string>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.head
+         */
+        head<T>(): T;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.head
+         */
+        head<T>(): T;
+    }
+
+    //_.indexOf
+    interface LoDashStatic {
+        /**
+         * Gets the index at which the first occurrence of `value` is found in `array`
+         * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+         * for equality comparisons. If `fromIndex` is negative, it's used as the offset
+         * from the end of `array`. If `array` is sorted providing `true` for `fromIndex`
+         * performs a faster binary search.
+         *
+         * @static
+         * @memberOf _
+         * @category Array
+         * @param {Array} array The array to search.
+         * @param {*} value The value to search for.
+         * @param {number} [fromIndex=0] The index to search from.
+         * @returns {number} Returns the index of the matched value, else `-1`.
+         * @example
+         *
+         * _.indexOf([1, 2, 1, 2], 2);
+         * // => 1
+         *
+         * // using `fromIndex`
+         * _.indexOf([1, 2, 1, 2], 2, 2);
+         * // => 3
+         */
+        indexOf<T>(
+            array: List<T>,
+            value: T,
+            fromIndex?: boolean|number
+        ): number;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.indexOf
+         */
+        indexOf(
+            value: T,
+            fromIndex?: boolean|number
+        ): number;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.indexOf
+         */
+        indexOf<TValue>(
+            value: TValue,
+            fromIndex?: boolean|number
+        ): number;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.indexOf
+         */
+        indexOf(
+            value: T,
+            fromIndex?: boolean|number
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.indexOf
+         */
+        indexOf<TValue>(
+            value: TValue,
+            fromIndex?: boolean|number
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    //_.intersectionBy DUMMY
+    interface LoDashStatic {
+        /**
+         * This method is like `_.intersection` except that it accepts `iteratee`
+         * which is invoked for each element of each `arrays` to generate the criterion
+         * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+         *
+         * @static
+         * @memberOf _
+         * @category Array
+         * @param {...Array} [arrays] The arrays to inspect.
+         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
+         * @returns {Array} Returns the new array of shared values.
+         * @example
+         *
+         * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+         * // => [2.1]
+         *
+         * // using the `_.property` iteratee shorthand
+         * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+         * // => [{ 'x': 1 }]
+         */
+        intersectionBy(
+            array: any[]|List<any>,
+            ...values: any[]
+        ): any[];
+    }
+
+    //_.intersectionWith DUMMY
+    interface LoDashStatic {
+        /**
+         * This method is like `_.intersection` except that it accepts `comparator`
+         * which is invoked to compare elements of `arrays`. The comparator is invoked
+         * with two arguments: (arrVal, othVal).
+         *
+         * @static
+         * @memberOf _
+         * @category Array
+         * @param {...Array} [arrays] The arrays to inspect.
+         * @param {Function} [comparator] The comparator invoked per element.
+         * @returns {Array} Returns the new array of shared values.
+         * @example
+         *
+         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+         * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+         *
+         * _.intersectionWith(objects, others, _.isEqual);
+         * // => [{ 'x': 1, 'y': 2 }]
+         */
+        intersectionWith(
+            array: any[]|List<any>,
+            ...values: any[]
+        ): any[];
+    }
+
+    //_.join
+    interface LoDashStatic {
+        /**
+         * Converts all elements in `array` into a string separated by `separator`.
+         *
+         * @param array The array to convert.
+         * @param separator The element separator.
+         * @returns Returns the joined string.
+         */
+        join(
+            array: List<any>,
+            separator?: string
+        ): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.join
+         */
+        join(separator?: string): string;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.join
+         */
+        join(separator?: string): string;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.join
+         */
+        join(separator?: string): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.join
+         */
+        join(separator?: string): LoDashExplicitWrapper<string>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.join
+         */
+        join(separator?: string): LoDashExplicitWrapper<string>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.join
+         */
+        join(separator?: string): LoDashExplicitWrapper<string>;
+    }
+
+    //_.pullAll DUMMY
+    interface LoDashStatic {
+        /**
+         * This method is like `_.pull` except that it accepts an array of values to remove.
+         *
+         * **Note:** Unlike `_.difference`, this method mutates `array`.
+         *
+         * @static
+         * @memberOf _
+         * @category Array
+         * @param {Array} array The array to modify.
+         * @param {Array} values The values to remove.
+         * @returns {Array} Returns `array`.
+         * @example
+         *
+         * var array = [1, 2, 3, 1, 2, 3];
+         *
+         * _.pull(array, [2, 3]);
+         * console.log(array);
+         * // => [1, 1]
+         */
+        pullAll(
+            array: any[]|List<any>,
+            ...values: any[]
+        ): any[];
+    }
+
+    //_.pullAllBy DUMMY
+    interface LoDashStatic {
+        /**
+         * This method is like `_.pullAll` except that it accepts `iteratee` which is
+         * invoked for each element of `array` and `values` to to generate the criterion
+         * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+         *
+         * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+         *
+         * @static
+         * @memberOf _
+         * @category Array
+         * @param {Array} array The array to modify.
+         * @param {Array} values The values to remove.
+         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
+         * @returns {Array} Returns `array`.
+         * @example
+         *
+         * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+         *
+         * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+         * console.log(array);
+         * // => [{ 'x': 2 }]
+         */
+        pullAllBy(
+            array: any[]|List<any>,
+            ...values: any[]
+        ): any[];
+    }
+
+    //_.reverse DUMMY
+    interface LoDashStatic {
+        /**
+         * Reverses `array` so that the first element becomes the last, the second
+         * element becomes the second to last, and so on.
+         *
+         * **Note:** This method mutates `array` and is based on
+         * [`Array#reverse`](https://mdn.io/Array/reverse).
+         *
+         * @memberOf _
+         * @category Array
+         * @returns {Array} Returns `array`.
+         * @example
+         *
+         * var array = [1, 2, 3];
+         *
+         * _.reverse(array);
+         * // => [3, 2, 1]
+         *
+         * console.log(array);
+         * // => [3, 2, 1]
+         */
+        reverse(
+            array: any[]|List<any>,
+            ...values: any[]
+        ): any[];
+    }
+
+    //_.sortedIndexOf
+    interface LoDashStatic {
+        /**
+         * This method is like `_.indexOf` except that it performs a binary
+         * search on a sorted `array`.
+         *
+         * @static
+         * @memberOf _
+         * @category Array
+         * @param {Array} array The array to search.
+         * @param {*} value The value to search for.
+         * @returns {number} Returns the index of the matched value, else `-1`.
+         * @example
+         *
+         * _.sortedIndexOf([1, 1, 2, 2], 2);
+         * // => 2
+         */
+        sortedIndexOf<T>(
+            array: List<T>,
+            value: T
+        ): number;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.sortedIndexOf
+         */
+        sortedIndexOf(
+            value: T
+        ): number;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.sortedIndexOf
+         */
+        sortedIndexOf<TValue>(
+            value: TValue
+        ): number;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.sortedIndexOf
+         */
+        sortedIndexOf(
+            value: T
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.sortedIndexOf
+         */
+        sortedIndexOf<TValue>(
+            value: TValue
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    //_.initial
+    interface LoDashStatic {
+        /**
+         * Gets all but the last element of array.
+         *
+         * @param array The array to query.
+         * @return Returns the slice of array.
+         */
+        initial<T>(array: List<T>): T[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.initial
+         */
+        initial(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.initial
+         */
+        initial<T>(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.initial
+         */
+        initial(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.initial
+         */
+        initial<T>(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.intersection
+    interface LoDashStatic {
+        /**
+         * Creates an array of unique values that are included in all of the provided arrays using SameValueZero for
+         * equality comparisons.
+         *
+         * @param arrays The arrays to inspect.
+         * @return Returns the new array of shared values.
+         */
+        intersection<T>(...arrays: (T[]|List<T>)[]): T[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.intersection
+         */
+        intersection<TResult>(...arrays: (TResult[]|List<TResult>)[]): LoDashImplicitArrayWrapper<TResult>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.intersection
+         */
+        intersection<TResult>(...arrays: (TResult[]|List<TResult>)[]): LoDashImplicitArrayWrapper<TResult>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.intersection
+         */
+        intersection<TResult>(...arrays: (TResult[]|List<TResult>)[]): LoDashExplicitArrayWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.intersection
+         */
+        intersection<TResult>(...arrays: (TResult[]|List<TResult>)[]): LoDashExplicitArrayWrapper<TResult>;
+    }
+
+    //_.last
+    interface LoDashStatic {
+        /**
+         * Gets the last element of array.
+         *
+         * @param array The array to query.
+         * @return Returns the last element of array.
+         */
+        last<T>(array: List<T>): T;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.last
+         */
+        last(): string;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.last
+         */
+        last(): T;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.last
+         */
+        last<T>(): T;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.last
+         */
+        last(): LoDashExplicitWrapper<string>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.last
+         */
+        last<T>(): T;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.last
+         */
+        last<T>(): T;
+    }
+
+    //_.lastIndexOf
+    interface LoDashStatic {
+        /**
+         * This method is like _.indexOf except that it iterates over elements of array from right to left.
+         *
+         * @param array The array to search.
+         * @param value The value to search for.
+         * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
+         * @return Returns the index of the matched value, else -1.
+         */
+        lastIndexOf<T>(
+            array: List<T>,
+            value: T,
+            fromIndex?: boolean|number
+        ): number;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.lastIndexOf
+         */
+        lastIndexOf(
+            value: T,
+            fromIndex?: boolean|number
+        ): number;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.lastIndexOf
+         */
+        lastIndexOf<TResult>(
+            value: TResult,
+            fromIndex?: boolean|number
+        ): number;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.lastIndexOf
+         */
+        lastIndexOf(
+            value: T,
+            fromIndex?: boolean|number
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.lastIndexOf
+         */
+        lastIndexOf<TResult>(
+            value: TResult,
+            fromIndex?: boolean|number
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    //_.pull
+    interface LoDashStatic {
+        /**
+         * Removes all provided values from array using SameValueZero for equality comparisons.
+         *
+         * Note: Unlike _.without, this method mutates array.
+         *
+         * @param array The array to modify.
+         * @param values The values to remove.
+         * @return Returns array.
+         */
+        pull<T>(
+            array: T[],
+            ...values: T[]
+        ): T[];
+
+        /**
+         * @see _.pull
+         */
+        pull<T>(
+            array: List<T>,
+            ...values: T[]
+        ): List<T>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.pull
+         */
+        pull(...values: T[]): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.pull
+         */
+        pull<TValue>(...values: TValue[]): LoDashImplicitObjectWrapper<List<TValue>>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.pull
+         */
+        pull(...values: T[]): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.pull
+         */
+        pull<TValue>(...values: TValue[]): LoDashExplicitObjectWrapper<List<TValue>>;
+    }
+
+    //_.pullAt
+    interface LoDashStatic {
+        /**
+         * Removes elements from array corresponding to the given indexes and returns an array of the removed elements.
+         * Indexes may be specified as an array of indexes or as individual arguments.
+         *
+         * Note: Unlike _.at, this method mutates array.
+         *
+         * @param array The array to modify.
+         * @param indexes The indexes of elements to remove, specified as individual indexes or arrays of indexes.
+         * @return Returns the new array of removed elements.
+         */
+        pullAt<T>(
+            array: List<T>,
+            ...indexes: (number|number[])[]
+        ): T[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.pullAt
+         */
+        pullAt(...indexes: (number|number[])[]): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.pullAt
+         */
+        pullAt<T>(...indexes: (number|number[])[]): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.pullAt
+         */
+        pullAt(...indexes: (number|number[])[]): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.pullAt
+         */
+        pullAt<T>(...indexes: (number|number[])[]): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.remove
+    interface LoDashStatic {
+        /**
+         * Removes all elements from array that predicate returns truthy for and returns an array of the removed
+         * elements. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * Note: Unlike _.filter, this method mutates array.
+         *
+         * @param array The array to modify.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the new array of removed elements.
+         */
+        remove<T>(
+            array: List<T>,
+            predicate?: ListIterator<T, boolean>
+        ): T[];
+
+        /**
+         * @see _.remove
+         */
+        remove<T>(
+            array: List<T>,
+            predicate?: string
+        ): T[];
+
+        /**
+         * @see _.remove
+         */
+        remove<W, T>(
+            array: List<T>,
+            predicate?: W
+        ): T[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.remove
+         */
+        remove(
+            predicate?: ListIterator<T, boolean>
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.remove
+         */
+        remove(
+            predicate?: string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.remove
+         */
+        remove<W>(
+            predicate?: W
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.remove
+         */
+        remove<TResult>(
+            predicate?: ListIterator<TResult, boolean>
+        ): LoDashImplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.remove
+         */
+        remove<TResult>(
+            predicate?: string
+        ): LoDashImplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.remove
+         */
+        remove<W, TResult>(
+            predicate?: W
+        ): LoDashImplicitArrayWrapper<TResult>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.remove
+         */
+        remove(
+            predicate?: ListIterator<T, boolean>
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.remove
+         */
+        remove(
+            predicate?: string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.remove
+         */
+        remove<W>(
+            predicate?: W
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.remove
+         */
+        remove<TResult>(
+            predicate?: ListIterator<TResult, boolean>
+        ): LoDashExplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.remove
+         */
+        remove<TResult>(
+            predicate?: string
+        ): LoDashExplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.remove
+         */
+        remove<W, TResult>(
+            predicate?: W
+        ): LoDashExplicitArrayWrapper<TResult>;
+    }
+
+    //_.tail
+    interface LoDashStatic {
+        /**
+         * Gets all but the first element of array.
+         *
+         * @alias _.tail
+         *
+         * @param array The array to query.
+         * @return Returns the slice of array.
+         */
+        tail<T>(array: List<T>): T[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.tail
+         */
+        tail(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.tail
+         */
+        tail<T>(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.tail
+         */
+        tail(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.tail
+         */
+        tail<T>(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.slice
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array from start up to, but not including, end.
+         *
+         * @param array The array to slice.
+         * @param start The start position.
+         * @param end The end position.
+         * @return Returns the slice of array.
+         */
+        slice<T>(
+            array: T[],
+            start?: number,
+            end?: number
+        ): T[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.slice
+         */
+        slice(
+            start?: number,
+            end?: number
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.slice
+         */
+        slice(
+            start?: number,
+            end?: number
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.sortedIndex
+    interface LoDashStatic {
+        /**
+         * Uses a binary search to determine the lowest index at which `value` should
+         * be inserted into `array` in order to maintain its sort order.
+         *
+         * @static
+         * @memberOf _
+         * @category Array
+         * @param {Array} array The sorted array to inspect.
+         * @param {*} value The value to evaluate.
+         * @returns {number} Returns the index at which `value` should be inserted into `array`.
+         * @example
+         *
+         * _.sortedIndex([30, 50], 40);
+         * // => 1
+         *
+         * _.sortedIndex([4, 5], 4);
+         * // => 0
+         */
+        sortedIndex<T, TSort>(
+            array: List<T>,
+            value: T
+        ): number;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<T>(
+            array: List<T>,
+            value: T
+        ): number;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<T>(
+            array: List<T>,
+            value: T
+        ): number;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<W, T>(
+            array: List<T>,
+            value: T
+        ): number;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<T>(
+            array: List<T>,
+            value: T
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<TSort>(
+            value: string
+        ): number;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<TSort>(
+            value: T
+        ): number;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex(
+            value: T
+        ): number;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<T, TSort>(
+            value: T
+        ): number;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<T>(
+            value: T
+        ): number;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<W, T>(
+            value: T
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<TSort>(
+            value: string
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<TSort>(
+            value: T
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex(
+            value: T
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<W>(
+            value: T
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<T, TSort>(
+            value: T
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<T>(
+            value: T
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedIndex
+         */
+        sortedIndex<W, T>(
+            value: T
+        ): LoDashExplicitWrapper<number>;
+
+
+    }
+
+    //_.sortedIndexBy
+    interface LoDashStatic {
+        /**
+         * This method is like `_.sortedIndex` except that it accepts `iteratee`
+         * which is invoked for `value` and each element of `array` to compute their
+         * sort ranking. The iteratee is invoked with one argument: (value).
+         *
+         * @static
+         * @memberOf _
+         * @category Array
+         * @param {Array} array The sorted array to inspect.
+         * @param {*} value The value to evaluate.
+         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
+         * @returns {number} Returns the index at which `value` should be inserted into `array`.
+         * @example
+         *
+         * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
+         *
+         * _.sortedIndexBy(['thirty', 'fifty'], 'forty', _.propertyOf(dict));
+         * // => 1
+         *
+         * // using the `_.property` iteratee shorthand
+         * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
+         * // => 0
+         */
+        sortedIndexBy<T, TSort>(
+            array: List<T>,
+            value: T,
+            iteratee: (x: T) => TSort
+        ): number;
+
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy<T>(
+            array: List<T>,
+            value: T,
+            iteratee: (x: T) => any
+        ): number;
+
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy<T>(
+            array: List<T>,
+            value: T,
+            iteratee: string
+        ): number;
+
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy<W, T>(
+            array: List<T>,
+            value: T,
+            iteratee: W
+        ): number;
+
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy<T>(
+            array: List<T>,
+            value: T,
+            iteratee: Object
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy<TSort>(
+            value: string,
+            iteratee: (x: string) => TSort
+        ): number;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy<TSort>(
+            value: T,
+            iteratee: (x: T) => TSort
+        ): number;
+
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy(
+            value: T,
+            iteratee: string
+        ): number;
+
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy<W>(
+            value: T,
+            iteratee: W
+        ): number;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy<T, TSort>(
+            value: T,
+            iteratee: (x: T) => TSort
+        ): number;
+
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy<T>(
+            value: T,
+            iteratee: (x: T) => any
+        ): number;
+
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy<T>(
+            value: T,
+            iteratee: string
+        ): number;
+
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy<W, T>(
+            value: T,
+            iteratee: W
+        ): number;
+
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy<T>(
+            value: T,
+            iteratee: Object
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy<TSort>(
+            value: string,
+            iteratee: (x: string) => TSort
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy<TSort>(
+            value: T,
+            iteratee: (x: T) => TSort
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy(
+            value: T,
+            iteratee: string
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy<W>(
+            value: T,
+            iteratee: W
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy<T, TSort>(
+            value: T,
+            iteratee: (x: T) => TSort
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy<T>(
+            value: T,
+            iteratee: (x: T) => any
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy<T>(
+            value: T,
+            iteratee: string
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy<W, T>(
+            value: T,
+            iteratee: W
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedIndexBy
+         */
+        sortedIndexBy<T>(
+            value: T,
+            iteratee: Object
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    //_.sortedLastIndex
+    interface LoDashStatic {
+        /**
+         * This method is like `_.sortedIndex` except that it returns the highest
+         * index at which `value` should be inserted into `array` in order to
+         * maintain its sort order.
+         *
+         * @static
+         * @memberOf _
+         * @category Array
+         * @param {Array} array The sorted array to inspect.
+         * @param {*} value The value to evaluate.
+         * @returns {number} Returns the index at which `value` should be inserted into `array`.
+         * @example
+         *
+         * _.sortedLastIndex([4, 5], 4);
+         * // => 1
+         */
+        sortedLastIndex<T, TSort>(
+            array: List<T>,
+            value: T
+        ): number;
+
+        /**
+         * @see _.sortedLastIndex
+         */
+        sortedLastIndex<T>(
+            array: List<T>,
+            value: T
+        ): number;
+
+        /**
+         * @see _.sortedLastIndex
+         */
+        sortedLastIndex<T>(
+            array: List<T>,
+            value: T
+        ): number;
+
+        /**
+         * @see _.sortedLastIndex
+         */
+        sortedLastIndex<W, T>(
+            array: List<T>,
+            value: T
+        ): number;
+
+        /**
+         * @see _.sortedLastIndex
+         */
+        sortedLastIndex<T>(
+            array: List<T>,
+            value: T
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.sortedLastIndex
+         */
+        sortedLastIndex<TSort>(
+            value: string
+        ): number;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.sortedLastIndex
+         */
+        sortedLastIndex<TSort>(
+            value: T
+        ): number;
+
+        /**
+         * @see _.sortedLastIndex
+         */
+        sortedLastIndex(
+            value: T
+        ): number;
+
+        /**
+         * @see _.sortedLastIndex
+         */
+        sortedLastIndex<W>(
+            value: T
+        ): number;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.sortedLastIndex
+         */
+        sortedLastIndex<T, TSort>(
+            value: T
+        ): number;
+
+        /**
+         * @see _.sortedLastIndex
+         */
+        sortedLastIndex<T>(
+            value: T
+        ): number;
+
+        /**
+         * @see _.sortedLastIndex
+         */
+        sortedLastIndex<W, T>(
+            value: T
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.sortedLastIndex
+         */
+        sortedLastIndex<TSort>(
+            value: string
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.sortedLastIndex
+         */
+        sortedLastIndex<TSort>(
+            value: T
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedLastIndex
+         */
+        sortedLastIndex(
+            value: T
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.sortedLastIndex
+         */
+        sortedLastIndex<T, TSort>(
+            value: T
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedLastIndex
+         */
+        sortedLastIndex<T>(
+            value: T
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedLastIndex
+         */
+        sortedLastIndex<W, T>(
+            value: T
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    //_.sortedLastIndexBy
+    interface LoDashStatic {
+        /**
+         * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
+         * which is invoked for `value` and each element of `array` to compute their
+         * sort ranking. The iteratee is invoked with one argument: (value).
+         *
+         * @static
+         * @memberOf _
+         * @category Array
+         * @param {Array} array The sorted array to inspect.
+         * @param {*} value The value to evaluate.
+         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
+         * @returns {number} Returns the index at which `value` should be inserted into `array`.
+         * @example
+         *
+         * // using the `_.property` iteratee shorthand
+         * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
+         * // => 1
+         */
+        sortedLastIndexBy<T, TSort>(
+            array: List<T>,
+            value: T,
+            iteratee: (x: T) => TSort
+        ): number;
+
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy<T>(
+            array: List<T>,
+            value: T,
+            iteratee: (x: T) => any
+        ): number;
+
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy<T>(
+            array: List<T>,
+            value: T,
+            iteratee: string
+        ): number;
+
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy<W, T>(
+            array: List<T>,
+            value: T,
+            iteratee: W
+        ): number;
+
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy<T>(
+            array: List<T>,
+            value: T,
+            iteratee: Object
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy<TSort>(
+            value: string,
+            iteratee: (x: string) => TSort
+        ): number;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy<TSort>(
+            value: T,
+            iteratee: (x: T) => TSort
+        ): number;
+
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy(
+            value: T,
+            iteratee: string
+        ): number;
+
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy<W>(
+            value: T,
+            iteratee: W
+        ): number;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy<T, TSort>(
+            value: T,
+            iteratee: (x: T) => TSort
+        ): number;
+
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy<T>(
+            value: T,
+            iteratee: (x: T) => any
+        ): number;
+
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy<T>(
+            value: T,
+            iteratee: string
+        ): number;
+
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy<W, T>(
+            value: T,
+            iteratee: W
+        ): number;
+
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy<T>(
+            value: T,
+            iteratee: Object
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy<TSort>(
+            value: string,
+            iteratee: (x: string) => TSort
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy<TSort>(
+            value: T,
+            iteratee: (x: T) => TSort
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy(
+            value: T,
+            iteratee: string
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy<W>(
+            value: T,
+            iteratee: W
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy<T, TSort>(
+            value: T,
+            iteratee: (x: T) => TSort
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy<T>(
+            value: T,
+            iteratee: (x: T) => any
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy<T>(
+            value: T,
+            iteratee: string
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy<W, T>(
+            value: T,
+            iteratee: W
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sortedLastIndexBy
+         */
+        sortedLastIndexBy<T>(
+            value: T,
+            iteratee: Object
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    //_.sortedLastIndexOf DUMMY
+    interface LoDashStatic {
+        /**
+         * This method is like `_.lastIndexOf` except that it performs a binary
+         * search on a sorted `array`.
+         *
+         * @static
+         * @memberOf _
+         * @category Array
+         * @param {Array} array The array to search.
+         * @param {*} value The value to search for.
+         * @returns {number} Returns the index of the matched value, else `-1`.
+         * @example
+         *
+         * _.sortedLastIndexOf([1, 1, 2, 2], 2);
+         * // => 3
+         */
+        sortedLastIndexOf(
+            array: any[]|List<any>,
+            ...values: any[]
+        ): any[];
+    }
+
+    //_.tail
+    interface LoDashStatic {
+        /**
+         * @see _.rest
+         */
+        tail<T>(array: List<T>): T[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.rest
+         */
+        tail(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.rest
+         */
+        tail<T>(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.rest
+         */
+        tail(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.rest
+         */
+        tail<T>(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.take
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array with n elements taken from the beginning.
+         *
+         * @param array The array to query.
+         * @param n The number of elements to take.
+         * @return Returns the slice of array.
+         */
+        take<T>(
+            array: List<T>,
+            n?: number
+        ): T[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.take
+         */
+        take(n?: number): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.take
+         */
+        take<TResult>(n?: number): LoDashImplicitArrayWrapper<TResult>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.take
+         */
+        take(n?: number): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.take
+         */
+        take<TResult>(n?: number): LoDashExplicitArrayWrapper<TResult>;
+    }
+
+    //_.takeRight
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array with n elements taken from the end.
+         *
+         * @param array The array to query.
+         * @param n The number of elements to take.
+         * @return Returns the slice of array.
+         */
+        takeRight<T>(
+            array: List<T>,
+            n?: number
+        ): T[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.takeRight
+         */
+        takeRight(n?: number): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.takeRight
+         */
+        takeRight<TResult>(n?: number): LoDashImplicitArrayWrapper<TResult>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.takeRight
+         */
+        takeRight(n?: number): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.takeRight
+         */
+        takeRight<TResult>(n?: number): LoDashExplicitArrayWrapper<TResult>;
+    }
+
+    //_.takeRightWhile
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
+         * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param array The array to query.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the slice of array.
+         */
+        takeRightWhile<TValue>(
+            array: List<TValue>,
+            predicate?: ListIterator<TValue, boolean>
+        ): TValue[];
+
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile<TValue>(
+            array: List<TValue>,
+            predicate?: string
+        ): TValue[];
+
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile<TWhere, TValue>(
+            array: List<TValue>,
+            predicate?: TWhere
+        ): TValue[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile(
+            predicate?: ListIterator<T, boolean>
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile(
+            predicate?: string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile<TWhere>(
+            predicate?: TWhere
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile<TValue>(
+            predicate?: ListIterator<TValue, boolean>
+        ): LoDashImplicitArrayWrapper<TValue>;
+
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile<TValue>(
+            predicate?: string
+        ): LoDashImplicitArrayWrapper<TValue>;
+
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile<TWhere, TValue>(
+            predicate?: TWhere
+        ): LoDashImplicitArrayWrapper<TValue>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile(
+            predicate?: ListIterator<T, boolean>
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile(
+            predicate?: string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile<TWhere>(
+            predicate?: TWhere
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile<TValue>(
+            predicate?: ListIterator<TValue, boolean>
+        ): LoDashExplicitArrayWrapper<TValue>;
+
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile<TValue>(
+            predicate?: string
+        ): LoDashExplicitArrayWrapper<TValue>;
+
+        /**
+         * @see _.takeRightWhile
+         */
+        takeRightWhile<TWhere, TValue>(
+            predicate?: TWhere
+        ): LoDashExplicitArrayWrapper<TValue>;
+    }
+
+    //_.takeWhile
+    interface LoDashStatic {
+        /**
+         * Creates a slice of array with elements taken from the beginning. Elements are taken until predicate returns
+         * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param array The array to query.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the slice of array.
+         */
+        takeWhile<TValue>(
+            array: List<TValue>,
+            predicate?: ListIterator<TValue, boolean>
+        ): TValue[];
+
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile<TValue>(
+            array: List<TValue>,
+            predicate?: string
+        ): TValue[];
+
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile<TWhere, TValue>(
+            array: List<TValue>,
+            predicate?: TWhere
+        ): TValue[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile(
+            predicate?: ListIterator<T, boolean>
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile(
+            predicate?: string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile<TWhere>(
+            predicate?: TWhere
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile<TValue>(
+            predicate?: ListIterator<TValue, boolean>
+        ): LoDashImplicitArrayWrapper<TValue>;
+
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile<TValue>(
+            predicate?: string
+        ): LoDashImplicitArrayWrapper<TValue>;
+
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile<TWhere, TValue>(
+            predicate?: TWhere
+        ): LoDashImplicitArrayWrapper<TValue>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile(
+            predicate?: ListIterator<T, boolean>
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile(
+            predicate?: string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile<TWhere>(
+            predicate?: TWhere
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile<TValue>(
+            predicate?: ListIterator<TValue, boolean>
+        ): LoDashExplicitArrayWrapper<TValue>;
+
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile<TValue>(
+            predicate?: string
+        ): LoDashExplicitArrayWrapper<TValue>;
+
+        /**
+         * @see _.takeWhile
+         */
+        takeWhile<TWhere, TValue>(
+            predicate?: TWhere
+        ): LoDashExplicitArrayWrapper<TValue>;
+    }
+
+    //_.union
+    interface LoDashStatic {
+        /**
+         * Creates an array of unique values, in order, from all of the provided arrays using SameValueZero for
+         * equality comparisons.
+         *
+         * @param arrays The arrays to inspect.
+         * @return Returns the new array of combined values.
+         */
+        union<T>(...arrays: List<T>[]): T[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.union
+         */
+        union(...arrays: List<T>[]): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.union
+         */
+        union<T>(...arrays: List<T>[]): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.union
+         */
+        union<T>(...arrays: List<T>[]): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.union
+         */
+        union(...arrays: List<T>[]): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.union
+         */
+        union<T>(...arrays: List<T>[]): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.union
+         */
+        union<T>(...arrays: List<T>[]): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.unionBy
+    interface LoDashStatic {
+        /**
+         * This method is like `_.union` except that it accepts `iteratee` which is
+         * invoked for each element of each `arrays` to generate the criterion by which
+         * uniqueness is computed. The iteratee is invoked with one argument: (value).
+         *
+         * @param arrays The arrays to inspect.
+         * @param iteratee The iteratee invoked per element.
+         * @return Returns the new array of combined values.
+         */
+        unionBy<T>(
+            arrays: T[]|List<T>,
+            iteratee?: (value: T) => any
+        ): T[];
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            arrays: T[]|List<T>,
+            iteratee?: W
+        ): T[];
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays1: T[]|List<T>,
+            arrays2: T[]|List<T>,
+            iteratee?: (value: T) => any
+        ): T[];
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            arrays1: T[]|List<T>,
+            arrays2: T[]|List<T>,
+            iteratee?: W
+        ): T[];
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays1: T[]|List<T>,
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            iteratee?: (value: T) => any
+        ): T[];
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            arrays1: T[]|List<T>,
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            iteratee?: W
+        ): T[];
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays1: T[]|List<T>,
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            arrays4: T[]|List<T>,
+            iteratee?: (value: T) => any
+        ): T[];
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            arrays1: T[]|List<T>,
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            arrays4: T[]|List<T>,
+            iteratee?: W
+        ): T[];
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays1: T[]|List<T>,
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            arrays4: T[]|List<T>,
+            arrays5: T[]|List<T>,
+            iteratee?: (value: T) => any
+        ): T[];
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            arrays1: T[]|List<T>,
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            arrays4: T[]|List<T>,
+            arrays5: T[]|List<T>,
+            iteratee?: W
+        ): T[];
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays: T[]|List<T>,
+            ...iteratee: any[]
+        ): T[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            iteratee?: (value: T) => any
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            iteratee?: W
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays2: T[]|List<T>,
+            iteratee?: (value: T) => any
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            arrays2: T[]|List<T>,
+            iteratee?: W
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            iteratee?: (value: T) => any
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            iteratee?: W
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            arrays4: T[]|List<T>,
+            iteratee?: (value: T) => any
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            arrays4: T[]|List<T>,
+            iteratee?: W
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            arrays4: T[]|List<T>,
+            arrays5: T[]|List<T>,
+            iteratee?: (value: T) => any
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            arrays4: T[]|List<T>,
+            arrays5: T[]|List<T>,
+            iteratee?: W
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            ...iteratee: any[]
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            iteratee?: (value: T) => any
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            iteratee?: W
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays2: T[]|List<T>,
+            iteratee?: (value: T) => any
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            arrays2: T[]|List<T>,
+            iteratee?: W
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            iteratee?: (value: T) => any
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            iteratee?: W
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            arrays4: T[]|List<T>,
+            iteratee?: (value: T) => any
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            arrays4: T[]|List<T>,
+            iteratee?: W
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            arrays4: T[]|List<T>,
+            arrays5: T[]|List<T>,
+            iteratee?: (value: T) => any
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            arrays4: T[]|List<T>,
+            arrays5: T[]|List<T>,
+            iteratee?: W
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            ...iteratee: any[]
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            iteratee?: (value: T) => any
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            iteratee?: W
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays2: T[]|List<T>,
+            iteratee?: (value: T) => any
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            arrays2: T[]|List<T>,
+            iteratee?: W
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            iteratee?: (value: T) => any
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            iteratee?: W
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            arrays4: T[]|List<T>,
+            iteratee?: (value: T) => any
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            arrays4: T[]|List<T>,
+            iteratee?: W
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            arrays4: T[]|List<T>,
+            arrays5: T[]|List<T>,
+            iteratee?: (value: T) => any
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            arrays4: T[]|List<T>,
+            arrays5: T[]|List<T>,
+            iteratee?: W
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            ...iteratee: any[]
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            iteratee?: (value: T) => any
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            iteratee?: W
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays2: T[]|List<T>,
+            iteratee?: (value: T) => any
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            arrays2: T[]|List<T>,
+            iteratee?: W
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            iteratee?: (value: T) => any
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            iteratee?: W
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            arrays4: T[]|List<T>,
+            iteratee?: (value: T) => any
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            arrays4: T[]|List<T>,
+            iteratee?: W
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            arrays4: T[]|List<T>,
+            arrays5: T[]|List<T>,
+            iteratee?: (value: T) => any
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T, W extends Object>(
+            arrays2: T[]|List<T>,
+            arrays3: T[]|List<T>,
+            arrays4: T[]|List<T>,
+            arrays5: T[]|List<T>,
+            iteratee?: W
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.unionBy
+         */
+        unionBy<T>(
+            ...iteratee: any[]
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.uniq
+    interface LoDashStatic {
+        /**
+         * Creates a duplicate-free version of an array, using
+         * [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+         * for equality comparisons, in which only the first occurrence of each element
+         * is kept.
+         *
+         * @static
+         * @memberOf _
+         * @category Array
+         * @param {Array} array The array to inspect.
+         * @returns {Array} Returns the new duplicate free array.
+         * @example
+         *
+         * _.uniq([2, 1, 2]);
+         * // => [2, 1]
+         */
+        uniq<T>(
+            array: List<T>
+        ): T[];
+
+        /**
+         * @see _.uniq
+         */
+        uniq<T, TSort>(
+            array: List<T>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.uniq
+         */
+        uniq<TSort>(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.uniq
+         */
+        uniq<TSort>(): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.uniq
+         */
+        uniq(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        uniq<T>(): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.uniq
+         */
+        uniq<T, TSort>(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.uniq
+         */
+        uniq<TSort>(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.uniq
+         */
+        uniq<TSort>(): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.uniq
+         */
+        uniq(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.uniq
+         */
+        uniq<T>(): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.uniq
+         */
+        uniq<T, TSort>(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.uniqBy
+    interface LoDashStatic {
+        /**
+         * This method is like `_.uniq` except that it accepts `iteratee` which is
+         * invoked for each element in `array` to generate the criterion by which
+         * uniqueness is computed. The iteratee is invoked with one argument: (value).
+         *
+         * @static
+         * @memberOf _
+         * @category Array
+         * @param {Array} array The array to inspect.
+         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
+         * @returns {Array} Returns the new duplicate free array.
+         * @example
+         *
+         * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
+         * // => [2.1, 1.2]
+         *
+         * // using the `_.property` iteratee shorthand
+         * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
+         * // => [{ 'x': 1 }, { 'x': 2 }]
+         */
+        uniqBy<T>(
+            array: List<T>,
+            iteratee: ListIterator<T, any>
+        ): T[];
+
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<T, TSort>(
+            array: List<T>,
+            iteratee: ListIterator<T, TSort>
+        ): T[];
+
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<T>(
+            array: List<T>,
+            iteratee: string
+        ): T[];
+
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<T>(
+            array: List<T>,
+            iteratee: Object
+        ): T[];
+
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<TWhere extends {}, T>(
+            array: List<T>,
+            iteratee: TWhere
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<TSort>(
+            iteratee: ListIterator<T, TSort>
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<TSort>(
+            iteratee: ListIterator<T, TSort>
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy(
+            iteratee: string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<TWhere extends {}>(
+            iteratee: TWhere
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<T>(
+            iteratee: ListIterator<T, any>
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<T, TSort>(
+            iteratee: ListIterator<T, TSort>
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<T>(
+            iteratee: string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<T>(
+            iteratee: Object
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<TWhere extends {}, T>(
+            iteratee: TWhere
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<TSort>(
+            iteratee: ListIterator<T, TSort>
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<TSort>(
+            iteratee: ListIterator<T, TSort>
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy(
+            iteratee: string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<TWhere extends {}>(
+            iteratee: TWhere
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<T>(
+            iteratee: ListIterator<T, any>
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<T, TSort>(
+            iteratee: ListIterator<T, TSort>
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<T>(
+            iteratee: string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<T>(
+            iteratee: Object
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.uniqBy
+         */
+        uniqBy<TWhere extends {}, T>(
+            iteratee: TWhere
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.sortedUniq
+    interface LoDashStatic {
+        /**
+         * This method is like `_.uniq` except that it's designed and optimized
+         * for sorted arrays.
+         *
+         * @static
+         * @memberOf _
+         * @category Array
+         * @param {Array} array The array to inspect.
+         * @returns {Array} Returns the new duplicate free array.
+         * @example
+         *
+         * _.sortedUniq([1, 1, 2]);
+         * // => [1, 2]
+         */
+        sortedUniq<T>(
+            array: List<T>
+        ): T[];
+
+        /**
+         * @see _.sortedUniq
+         */
+        sortedUniq<T, TSort>(
+            array: List<T>
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.sortedUniq
+         */
+        sortedUniq<TSort>(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.sortedUniq
+         */
+        sortedUniq<TSort>(): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortedUniq
+         */
+        sortedUniq(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        sortedUniq<T>(): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortedUniq
+         */
+        sortedUniq<T, TSort>(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.sortedUniq
+         */
+        sortedUniq<TSort>(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.sortedUniq
+         */
+        sortedUniq<TSort>(): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortedUniq
+         */
+        sortedUniq(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.sortedUniq
+         */
+        sortedUniq<T>(): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortedUniq
+         */
+        sortedUniq<T, TSort>(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.sortedUniqBy
+    interface LoDashStatic {
+        /**
+         * This method is like `_.uniqBy` except that it's designed and optimized
+         * for sorted arrays.
+         *
+         * @static
+         * @memberOf _
+         * @category Array
+         * @param {Array} array The array to inspect.
+         * @param {Function} [iteratee] The iteratee invoked per element.
+         * @returns {Array} Returns the new duplicate free array.
+         * @example
+         *
+         * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
+         * // => [1.1, 2.2]
+         */
+        sortedUniqBy<T>(
+            array: List<T>,
+            iteratee: ListIterator<T, any>
+        ): T[];
+
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<T, TSort>(
+            array: List<T>,
+            iteratee: ListIterator<T, TSort>
+        ): T[];
+
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<T>(
+            array: List<T>,
+            iteratee: string
+        ): T[];
+
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<T>(
+            array: List<T>,
+            iteratee: Object
+        ): T[];
+
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<TWhere extends {}, T>(
+            array: List<T>,
+            iteratee: TWhere
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<TSort>(
+            iteratee: ListIterator<T, TSort>
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<TSort>(
+            iteratee: ListIterator<T, TSort>
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy(
+            iteratee: string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<TWhere extends {}>(
+            iteratee: TWhere
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<T>(
+            iteratee: ListIterator<T, any>
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<T, TSort>(
+            iteratee: ListIterator<T, TSort>
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<T>(
+            iteratee: string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<T>(
+            iteratee: Object
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<TWhere extends {}, T>(
+            iteratee: TWhere
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<TSort>(
+            iteratee: ListIterator<T, TSort>
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<TSort>(
+            iteratee: ListIterator<T, TSort>
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy(
+            iteratee: string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<TWhere extends {}>(
+            iteratee: TWhere
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<T>(
+            iteratee: ListIterator<T, any>
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<T, TSort>(
+            iteratee: ListIterator<T, TSort>
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<T>(
+            iteratee: string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<T>(
+            iteratee: Object
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortedUniqBy
+         */
+        sortedUniqBy<TWhere extends {}, T>(
+            iteratee: TWhere
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.unionWith DUMMY
+    interface LoDashStatic {
+        /**
+         * This method is like `_.union` except that it accepts `comparator` which
+         * is invoked to compare elements of `arrays`. The comparator is invoked
+         * with two arguments: (arrVal, othVal).
+         *
+         * @static
+         * @memberOf _
+         * @category Array
+         * @param {...Array} [arrays] The arrays to inspect.
+         * @param {Function} [comparator] The comparator invoked per element.
+         * @returns {Array} Returns the new array of combined values.
+         * @example
+         *
+         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+         * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+         *
+         * _.unionWith(objects, others, _.isEqual);
+         * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+         */
+        unionWith(
+            array: any[]|List<any>,
+            ...values: any[]
+        ): any[];
+    }
+
+    //_.uniqWith DUMMY
+    interface LoDashStatic {
+        /**
+         * This method is like `_.uniq` except that it accepts `comparator` which
+         * is invoked to compare elements of `array`. The comparator is invoked with
+         * two arguments: (arrVal, othVal).
+         *
+         * @static
+         * @memberOf _
+         * @category Array
+         * @param {Array} array The array to inspect.
+         * @param {Function} [comparator] The comparator invoked per element.
+         * @returns {Array} Returns the new duplicate free array.
+         * @example
+         *
+         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 },  { 'x': 1, 'y': 2 }];
+         *
+         * _.uniqWith(objects, _.isEqual);
+         * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }]
+         */
+        uniqWith(
+            array: any[]|List<any>,
+            ...values: any[]
+        ): any[];
+    }
+
+    //_.unzip
+    interface LoDashStatic {
+        /**
+         * This method is like _.zip except that it accepts an array of grouped elements and creates an array
+         * regrouping the elements to their pre-zip configuration.
+         *
+         * @param array The array of grouped elements to process.
+         * @return Returns the new array of regrouped elements.
+         */
+        unzip<T>(array: List<List<T>>): T[][];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.unzip
+         */
+        unzip<T>(): LoDashImplicitArrayWrapper<T[]>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.unzip
+         */
+        unzip<T>(): LoDashImplicitArrayWrapper<T[]>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.unzip
+         */
+        unzip<T>(): LoDashExplicitArrayWrapper<T[]>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.unzip
+         */
+        unzip<T>(): LoDashExplicitArrayWrapper<T[]>;
+    }
+
+    //_.unzipWith
+    interface LoDashStatic {
+        /**
+         * This method is like _.unzip except that it accepts an iteratee to specify how regrouped values should be
+         * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
+         * group).
+         *
+         * @param array The array of grouped elements to process.
+         * @param iteratee The function to combine regrouped values.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns the new array of regrouped elements.
+         */
+        unzipWith<TArray, TResult>(
+            array: List<List<TArray>>,
+            iteratee?: MemoIterator<TArray, TResult>
+        ): TResult[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.unzipWith
+         */
+        unzipWith<TArr, TResult>(
+            iteratee?: MemoIterator<TArr, TResult>
+        ): LoDashImplicitArrayWrapper<TResult>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.unzipWith
+         */
+        unzipWith<TArr, TResult>(
+            iteratee?: MemoIterator<TArr, TResult>
+        ): LoDashImplicitArrayWrapper<TResult>;
+    }
+
+    //_.without
+    interface LoDashStatic {
+        /**
+         * Creates an array excluding all provided values using SameValueZero for equality comparisons.
+         *
+         * @param array The array to filter.
+         * @param values The values to exclude.
+         * @return Returns the new array of filtered values.
+         */
+        without<T>(
+            array: List<T>,
+            ...values: T[]
+        ): T[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.without
+         */
+        without(...values: T[]): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.without
+         */
+        without<T>(...values: T[]): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.without
+         */
+        without(...values: T[]): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.without
+         */
+        without<T>(...values: T[]): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.xor
+    interface LoDashStatic {
+        /**
+         * Creates an array of unique values that is the symmetric difference of the provided arrays.
+         *
+         * @param arrays The arrays to inspect.
+         * @return Returns the new array of values.
+         */
+        xor<T>(...arrays: List<T>[]): T[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.xor
+         */
+        xor(...arrays: List<T>[]): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.xor
+         */
+        xor<T>(...arrays: List<T>[]): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.xor
+         */
+        xor(...arrays: List<T>[]): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.xor
+         */
+        xor<T>(...arrays: List<T>[]): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.xorBy DUMMY
+    interface LoDashStatic {
+        /**
+         * This method is like `_.xor` except that it accepts `iteratee` which is
+         * invoked for each element of each `arrays` to generate the criterion by which
+         * uniqueness is computed. The iteratee is invoked with one argument: (value).
+         *
+         * @static
+         * @memberOf _
+         * @category Array
+         * @param {...Array} [arrays] The arrays to inspect.
+         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
+         * @returns {Array} Returns the new array of values.
+         * @example
+         *
+         * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+         * // => [1.2, 4.3]
+         *
+         * // using the `_.property` iteratee shorthand
+         * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+         * // => [{ 'x': 2 }]
+         */
+        xorBy(
+            array: any[]|List<any>,
+            ...values: any[]
+        ): any[];
+    }
+
+    //_.xorWith DUMMY
+    interface LoDashStatic {
+        /**
+         * This method is like `_.xor` except that it accepts `comparator` which is
+         * invoked to compare elements of `arrays`. The comparator is invoked with
+         * two arguments: (arrVal, othVal).
+         *
+         * @static
+         * @memberOf _
+         * @category Array
+         * @param {...Array} [arrays] The arrays to inspect.
+         * @param {Function} [comparator] The comparator invoked per element.
+         * @returns {Array} Returns the new array of values.
+         * @example
+         *
+         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+         * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+         *
+         * _.xorWith(objects, others, _.isEqual);
+         * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+         */
+        xorWith(
+            array: any[]|List<any>,
+            ...values: any[]
+        ): any[];
+    }
+
+    //_.zip
+    interface LoDashStatic {
+        /**
+         * Creates an array of grouped elements, the first of which contains the first elements of the given arrays,
+         * the second of which contains the second elements of the given arrays, and so on.
+         *
+         * @param arrays The arrays to process.
+         * @return Returns the new array of grouped elements.
+         */
+        zip<T>(...arrays: List<T>[]): T[][];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.zip
+         */
+        zip<T>(...arrays: List<T>[]): _.LoDashImplicitArrayWrapper<T[]>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.zip
+         */
+        zip<T>(...arrays: List<T>[]): _.LoDashImplicitArrayWrapper<T[]>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.zip
+         */
+        zip<T>(...arrays: List<T>[]): _.LoDashExplicitArrayWrapper<T[]>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.zip
+         */
+        zip<T>(...arrays: List<T>[]): _.LoDashExplicitArrayWrapper<T[]>;
+    }
+
+    //_.zipObject
+    interface LoDashStatic {
+        /**
+         * The inverse of _.pairs; this method returns an object composed from arrays of property names and values.
+         * Provide either a single two dimensional array, e.g. [[key1, value1], [key2, value2]] or two arrays, one of
+         * property names and one of corresponding values.
+         *
+         * @param props The property names.
+         * @param values The property values.
+         * @return Returns the new object.
+         */
+        zipObject<TValues, TResult extends {}>(
+            props: List<StringRepresentable>|List<List<any>>,
+            values?: List<TValues>
+        ): TResult;
+
+        /**
+         * @see _.zipObject
+         */
+        zipObject<TResult extends {}>(
+            props: List<StringRepresentable>|List<List<any>>,
+            values?: List<any>
+        ): TResult;
+
+        /**
+         * @see _.zipObject
+         */
+        zipObject(
+            props: List<StringRepresentable>|List<List<any>>,
+            values?: List<any>
+        ): _.Dictionary<any>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.zipObject
+         */
+        zipObject<TValues, TResult extends {}>(
+            values?: List<TValues>
+        ): _.LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.zipObject
+         */
+        zipObject<TResult extends {}>(
+            values?: List<any>
+        ): _.LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.zipObject
+         */
+        zipObject(
+            values?: List<any>
+        ): _.LoDashImplicitObjectWrapper<_.Dictionary<any>>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.zipObject
+         */
+        zipObject<TValues, TResult extends {}>(
+            values?: List<TValues>
+        ): _.LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.zipObject
+         */
+        zipObject<TResult extends {}>(
+            values?: List<any>
+        ): _.LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.zipObject
+         */
+        zipObject(
+            values?: List<any>
+        ): _.LoDashImplicitObjectWrapper<_.Dictionary<any>>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.zipObject
+         */
+        zipObject<TValues, TResult extends {}>(
+            values?: List<TValues>
+        ): _.LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.zipObject
+         */
+        zipObject<TResult extends {}>(
+            values?: List<any>
+        ): _.LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.zipObject
+         */
+        zipObject(
+            values?: List<any>
+        ): _.LoDashExplicitObjectWrapper<_.Dictionary<any>>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.zipObject
+         */
+        zipObject<TValues, TResult extends {}>(
+            values?: List<TValues>
+        ): _.LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.zipObject
+         */
+        zipObject<TResult extends {}>(
+            values?: List<any>
+        ): _.LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.zipObject
+         */
+        zipObject(
+            values?: List<any>
+        ): _.LoDashExplicitObjectWrapper<_.Dictionary<any>>;
+    }
+
+    //_.zipWith
+    interface LoDashStatic {
+        /**
+         * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
+         * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
+         * group).
+         * @param {...Array} [arrays] The arrays to process.
+         * @param {Function} [iteratee] The function to combine grouped values.
+         * @param {*} [thisArg] The `this` binding of `iteratee`.
+         * @return Returns the new array of grouped elements.
+         */
+        zipWith<TResult>(...args: any[]): TResult[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.zipWith
+         */
+        zipWith<TResult>(...args: any[]): LoDashImplicitArrayWrapper<TResult>;
+    }
+
+    /*********
+     * Chain *
+     *********/
+
+    //_.chain
+    interface LoDashStatic {
+        /**
+         * Creates a lodash object that wraps value with explicit method chaining enabled.
+         *
+         * @param value The value to wrap.
+         * @return Returns the new lodash wrapper instance.
+         */
+        chain(value: number): LoDashExplicitWrapper<number>;
+        chain(value: string): LoDashExplicitWrapper<string>;
+        chain(value: boolean): LoDashExplicitWrapper<boolean>;
+        chain<T>(value: T[]): LoDashExplicitArrayWrapper<T>;
+        chain<T extends {}>(value: T): LoDashExplicitObjectWrapper<T>;
+        chain(value: any): LoDashExplicitWrapper<any>;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.chain
+         */
+        chain(): LoDashExplicitWrapper<T>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.chain
+         */
+        chain(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.chain
+         */
+        chain(): LoDashExplicitObjectWrapper<T>;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.chain
+         */
+        chain(): TWrapper;
+    }
+
+    //_.tap
+    interface LoDashStatic {
+        /**
+         * This method invokes interceptor and returns value. The interceptor is bound to thisArg and invoked with one
+         * argument; (value). The purpose of this method is to "tap into" a method chain in order to perform operations
+         * on intermediate results within the chain.
+         *
+         * @param value The value to provide to interceptor.
+         * @param interceptor The function to invoke.
+         * @parem thisArg The this binding of interceptor.
+         * @return Returns value.
+         **/
+        tap<T>(
+            value: T,
+            interceptor: (value: T) => void
+        ): T;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.tap
+         */
+        tap(
+            interceptor: (value: T) => void
+        ): TWrapper;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.tap
+         */
+        tap(
+            interceptor: (value: T) => void
+        ): TWrapper;
+    }
+
+    //_.thru
+    interface LoDashStatic {
+        /**
+         * This method is like _.tap except that it returns the result of interceptor.
+         *
+         * @param value The value to provide to interceptor.
+         * @param interceptor The function to invoke.
+         * @param thisArg The this binding of interceptor.
+         * @return Returns the result of interceptor.
+         */
+        thru<T, TResult>(
+            value: T,
+            interceptor: (value: T) => TResult
+        ): TResult;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.thru
+         */
+        thru<TResult extends number>(
+            interceptor: (value: T) => TResult): LoDashImplicitWrapper<TResult>;
+
+        /**
+         * @see _.thru
+         */
+        thru<TResult extends string>(
+            interceptor: (value: T) => TResult): LoDashImplicitWrapper<TResult>;
+
+        /**
+         * @see _.thru
+         */
+        thru<TResult extends boolean>(
+            interceptor: (value: T) => TResult): LoDashImplicitWrapper<TResult>;
+
+        /**
+         * @see _.thru
+         */
+        thru<TResult extends {}>(
+            interceptor: (value: T) => TResult): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.thru
+         */
+        thru<TResult>(
+            interceptor: (value: T) => TResult[]): LoDashImplicitArrayWrapper<TResult>;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.thru
+         */
+        thru<TResult extends number>(
+            interceptor: (value: T) => TResult
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+         * @see _.thru
+         */
+        thru<TResult extends string>(
+            interceptor: (value: T) => TResult
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+         * @see _.thru
+         */
+        thru<TResult extends boolean>(
+            interceptor: (value: T) => TResult
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+         * @see _.thru
+         */
+        thru<TResult extends {}>(
+            interceptor: (value: T) => TResult
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.thru
+         */
+        thru<TResult>(
+            interceptor: (value: T) => TResult[]
+        ): LoDashExplicitArrayWrapper<TResult>;
+    }
+
+    //_.prototype.commit
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * Executes the chained sequence and returns the wrapped result.
+         *
+         * @return Returns the new lodash wrapper instance.
+         */
+        commit(): TWrapper;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.commit
+         */
+        commit(): TWrapper;
+    }
+
+    //_.prototype.concat
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * Creates a new array joining a wrapped array with any additional arrays and/or values.
+         *
+         * @param items
+         * @return Returns the new concatenated array.
+         */
+        concat<TItem>(...items: Array<TItem|Array<TItem>>): LoDashImplicitArrayWrapper<TItem>;
+
+        /**
+         * @see _.concat
+         */
+        concat(...items: Array<T|Array<T>>): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.concat
+         */
+        concat<TItem>(...items: Array<TItem|Array<TItem>>): LoDashExplicitArrayWrapper<TItem>;
+
+        /**
+         * @see _.concat
+         */
+        concat(...items: Array<T|Array<T>>): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.prototype.plant
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * Creates a clone of the chained sequence planting value as the wrapped value.
+         * @param value The value to plant as the wrapped value.
+         * @return Returns the new lodash wrapper instance.
+         */
+        plant(value: number): LoDashImplicitWrapper<number>;
+
+        /**
+         * @see _.plant
+         */
+        plant(value: string): LoDashImplicitStringWrapper;
+
+        /**
+         * @see _.plant
+         */
+        plant(value: boolean): LoDashImplicitWrapper<boolean>;
+
+        /**
+         * @see _.plant
+         */
+        plant(value: number[]): LoDashImplicitNumberArrayWrapper;
+
+        /**
+         * @see _.plant
+         */
+        plant<T>(value: T[]): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.plant
+         */
+        plant<T extends {}>(value: T): LoDashImplicitObjectWrapper<T>;
+
+        /**
+         * @see _.plant
+         */
+        plant(value: any): LoDashImplicitWrapper<any>;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.plant
+         */
+        plant(value: number): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.plant
+         */
+        plant(value: string): LoDashExplicitStringWrapper;
+
+        /**
+         * @see _.plant
+         */
+        plant(value: boolean): LoDashExplicitWrapper<boolean>;
+
+        /**
+         * @see _.plant
+         */
+        plant(value: number[]): LoDashExplicitNumberArrayWrapper;
+
+        /**
+         * @see _.plant
+         */
+        plant<T>(value: T[]): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.plant
+         */
+        plant<T extends {}>(value: T): LoDashExplicitObjectWrapper<T>;
+
+        /**
+         * @see _.plant
+         */
+        plant(value: any): LoDashExplicitWrapper<any>;
+    }
+
+    //_.prototype.reverse
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * Reverses the wrapped array so the first element becomes the last, the second element becomes the second to
+         * last, and so on.
+         *
+         * Note: This method mutates the wrapped array.
+         *
+         * @return Returns the new reversed lodash wrapper instance.
+         */
+        reverse(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.reverse
+         */
+        reverse(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.prototype.toJSON
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * @see _.value
+         */
+        toJSON(): T;
+    }
+
+    //_.prototype.toString
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * Produces the result of coercing the unwrapped value to a string.
+         *
+         * @return Returns the coerced string value.
+         */
+        toString(): string;
+    }
+
+    //_.prototype.value
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * Executes the chained sequence to extract the unwrapped value.
+         *
+         * @alias _.toJSON, _.valueOf
+         *
+         * @return Returns the resolved unwrapped value.
+         */
+        value(): T;
+    }
+
+    //_.valueOf
+    interface LoDashWrapperBase<T, TWrapper> {
+        /**
+         * @see _.value
+         */
+        valueOf(): T;
+    }
+
+    /**************
+     * Collection *
+     **************/
+
+    //_.at
+    interface LoDashStatic {
+        /**
+         * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+         * specified as individual arguments or as arrays of keys.
+         *
+         * @param collection The collection to iterate over.
+         * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+         * @return Returns the new array of picked elements.
+         */
+        at<T>(
+            collection: List<T>|Dictionary<T>,
+            ...props: (number|string|(number|string)[])[]
+        ): T[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.at
+         */
+        at(...props: (number|string|(number|string)[])[]): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.at
+         */
+        at<T>(...props: (number|string|(number|string)[])[]): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.at
+         */
+        at(...props: (number|string|(number|string)[])[]): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.at
+         */
+        at<T>(...props: (number|string|(number|string)[])[]): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.countBy
+    interface LoDashStatic {
+        /**
+         * Creates an object composed of keys generated from the results of running each element of collection through
+         * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
+         * iteratee is bound to thisArg and invoked with three arguments:
+         * (value, index|key, collection).
+         *
+         * If a property name is provided for iteratee the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param collection The collection to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns the composed aggregate object.
+         */
+        countBy<T>(
+            collection: List<T>,
+            iteratee?: ListIterator<T, any>
+        ): Dictionary<number>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy<T>(
+            collection: Dictionary<T>,
+            iteratee?: DictionaryIterator<T, any>
+        ): Dictionary<number>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy<T>(
+            collection: NumericDictionary<T>,
+            iteratee?: NumericDictionaryIterator<T, any>
+        ): Dictionary<number>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy<T>(
+            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
+            iteratee?: string
+        ): Dictionary<number>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy<W, T>(
+            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
+            iteratee?: W
+        ): Dictionary<number>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy<T>(
+            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
+            iteratee?: Object
+        ): Dictionary<number>;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.countBy
+         */
+        countBy(
+            iteratee?: ListIterator<T, any>
+        ): LoDashImplicitObjectWrapper<Dictionary<number>>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.countBy
+         */
+        countBy(
+            iteratee?: ListIterator<T, any>
+        ): LoDashImplicitObjectWrapper<Dictionary<number>>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy(
+            iteratee?: string
+        ): LoDashImplicitObjectWrapper<Dictionary<number>>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy<W>(
+            iteratee?: W
+        ): LoDashImplicitObjectWrapper<Dictionary<number>>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.countBy
+         */
+        countBy<T>(
+            iteratee?: ListIterator<T, any>|DictionaryIterator<T, any>|NumericDictionaryIterator<T, any>
+        ): LoDashImplicitObjectWrapper<Dictionary<number>>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy(
+            iteratee?: string
+        ): LoDashImplicitObjectWrapper<Dictionary<number>>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy<W>(
+            iteratee?: W
+        ): LoDashImplicitObjectWrapper<Dictionary<number>>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.countBy
+         */
+        countBy(
+            iteratee?: ListIterator<T, any>
+        ): LoDashExplicitObjectWrapper<Dictionary<number>>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.countBy
+         */
+        countBy(
+            iteratee?: ListIterator<T, any>
+        ): LoDashExplicitObjectWrapper<Dictionary<number>>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy(
+            iteratee?: string
+        ): LoDashExplicitObjectWrapper<Dictionary<number>>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy<W>(
+            iteratee?: W
+        ): LoDashExplicitObjectWrapper<Dictionary<number>>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.countBy
+         */
+        countBy<T>(
+            iteratee?: ListIterator<T, any>|DictionaryIterator<T, any>|NumericDictionaryIterator<T, any>
+        ): LoDashExplicitObjectWrapper<Dictionary<number>>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy(
+            iteratee?: string
+        ): LoDashExplicitObjectWrapper<Dictionary<number>>;
+
+        /**
+         * @see _.countBy
+         */
+        countBy<W>(
+            iteratee?: W
+        ): LoDashExplicitObjectWrapper<Dictionary<number>>;
+    }
+
+    //_.each
+    interface LoDashStatic {
+        /**
+         * @see _.forEach
+         */
+        each<T>(
+            collection: T[],
+            iteratee?: ListIterator<T, any>
+        ): T[];
+
+        /**
+         * @see _.forEach
+         */
+        each<T>(
+            collection: List<T>,
+            iteratee?: ListIterator<T, any>
+        ): List<T>;
+
+        /**
+         * @see _.forEach
+         */
+        each<T>(
+            collection: Dictionary<T>,
+            iteratee?: DictionaryIterator<T, any>
+        ): Dictionary<T>;
+
+        /**
+         * @see _.forEach
+         */
+        each<T extends {}>(
+            collection: T,
+            iteratee?: ObjectIterator<any, any>
+        ): T;
+
+        /**
+         * @see _.forEach
+         */
+        each<T extends {}, TValue>(
+            collection: T,
+            iteratee?: ObjectIterator<TValue, any>
+        ): T;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.forEach
+         */
+        each(
+            iteratee: ListIterator<string, any>
+        ): LoDashImplicitWrapper<string>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.forEach
+         */
+        each(
+            iteratee: ListIterator<T, any>
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.forEach
+         */
+        each<TValue>(
+            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
+        ): LoDashImplicitObjectWrapper<T>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.forEach
+         */
+        each(
+            iteratee: ListIterator<string, any>
+        ): LoDashExplicitWrapper<string>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.forEach
+         */
+        each(
+            iteratee: ListIterator<T, any>
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.forEach
+         */
+        each<TValue>(
+            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
+        ): LoDashExplicitObjectWrapper<T>;
+    }
+
+    //_.eachRight
+    interface LoDashStatic {
+        /**
+         * @see _.forEachRight
+         */
+        eachRight<T>(
+            collection: T[],
+            iteratee?: ListIterator<T, any>
+        ): T[];
+
+        /**
+         * @see _.forEachRight
+         */
+        eachRight<T>(
+            collection: List<T>,
+            iteratee?: ListIterator<T, any>
+        ): List<T>;
+
+        /**
+         * @see _.forEachRight
+         */
+        eachRight<T>(
+            collection: Dictionary<T>,
+            iteratee?: DictionaryIterator<T, any>
+        ): Dictionary<T>;
+
+        /**
+         * @see _.forEachRight
+         */
+        eachRight<T extends {}>(
+            collection: T,
+            iteratee?: ObjectIterator<any, any>
+        ): T;
+
+        /**
+         * @see _.forEachRight
+         */
+        eachRight<T extends {}, TValue>(
+            collection: T,
+            iteratee?: ObjectIterator<TValue, any>
+        ): T;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.forEachRight
+         */
+        eachRight(
+            iteratee: ListIterator<string, any>
+        ): LoDashImplicitWrapper<string>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.forEachRight
+         */
+        eachRight(
+            iteratee: ListIterator<T, any>
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.forEachRight
+         */
+        eachRight<TValue>(
+            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
+        ): LoDashImplicitObjectWrapper<T>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.forEachRight
+         */
+        eachRight(
+            iteratee: ListIterator<string, any>
+        ): LoDashExplicitWrapper<string>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.forEachRight
+         */
+        eachRight(
+            iteratee: ListIterator<T, any>
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.forEachRight
+         */
+        eachRight<TValue>(
+            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
+        ): LoDashExplicitObjectWrapper<T>;
+    }
+
+    //_.every
+    interface LoDashStatic {
+        /**
+         * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
+         * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
+         *
+         * @param collection The collection to iterate over.
+         * @param predicate The function invoked per iteration.
+         * @return Returns true if all elements pass the predicate check, else false.
+         */
+        every<T>(
+            collection: List<T>,
+            predicate?: ListIterator<T, boolean>
+        ): boolean;
+
+        /**
+         * @see _.every
+         */
+        every<T>(
+            collection: Dictionary<T>,
+            predicate?: DictionaryIterator<T, boolean>
+        ): boolean;
+
+        /**
+         * @see _.every
+         */
+        every<T>(
+            collection: NumericDictionary<T>,
+            predicate?: NumericDictionaryIterator<T, boolean>
+        ): boolean;
+
+        /**
+         * @see _.every
+         */
+        every<T>(
+            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
+            predicate?: string|any[]
+        ): boolean;
+
+        /**
+         * @see _.every
+         */
+        every<TObject extends {}, T>(
+            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
+            predicate?: TObject
+        ): boolean;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.every
+         */
+        every(
+            predicate?: ListIterator<T, boolean>|NumericDictionaryIterator<T, boolean>
+        ): boolean;
+
+        /**
+         * @see _.every
+         */
+        every(
+            predicate?: string|any[]
+        ): boolean;
+
+        /**
+         * @see _.every
+         */
+        every<TObject extends {}>(
+            predicate?: TObject
+        ): boolean;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.every
+         */
+        every<TResult>(
+            predicate?: ListIterator<TResult, boolean>|DictionaryIterator<TResult, boolean>|NumericDictionaryIterator<T, boolean>
+        ): boolean;
+
+        /**
+         * @see _.every
+         */
+        every(
+            predicate?: string|any[]
+        ): boolean;
+
+        /**
+         * @see _.every
+         */
+        every<TObject extends {}>(
+            predicate?: TObject
+        ): boolean;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.every
+         */
+        every(
+            predicate?: ListIterator<T, boolean>|NumericDictionaryIterator<T, boolean>
+        ): LoDashExplicitWrapper<boolean>;
+
+        /**
+         * @see _.every
+         */
+        every(
+            predicate?: string|any[]
+        ): LoDashExplicitWrapper<boolean>;
+
+        /**
+         * @see _.every
+         */
+        every<TObject extends {}>(
+            predicate?: TObject
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.every
+         */
+        every<TResult>(
+            predicate?: ListIterator<TResult, boolean>|DictionaryIterator<TResult, boolean>|NumericDictionaryIterator<T, boolean>
+        ): LoDashExplicitWrapper<boolean>;
+
+        /**
+         * @see _.every
+         */
+        every(
+            predicate?: string|any[]
+        ): LoDashExplicitWrapper<boolean>;
+
+        /**
+         * @see _.every
+         */
+        every<TObject extends {}>(
+            predicate?: TObject
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.filter
+    interface LoDashStatic {
+        /**
+         * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
+         * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param collection The collection to iterate over.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the new filtered array.
+         */
+        filter<T>(
+            collection: List<T>,
+            predicate?: ListIterator<T, boolean>
+        ): T[];
+
+        /**
+         * @see _.filter
+         */
+        filter<T>(
+            collection: Dictionary<T>,
+            predicate?: DictionaryIterator<T, boolean>
+        ): T[];
+
+        /**
+         * @see _.filter
+         */
+        filter(
+            collection: string,
+            predicate?: StringIterator<boolean>
+        ): string[];
+
+        /**
+         * @see _.filter
+         */
+        filter<T>(
+            collection: List<T>|Dictionary<T>,
+            predicate: string
+        ): T[];
+
+        /**
+         * @see _.filter
+         */
+        filter<W extends {}, T>(
+            collection: List<T>|Dictionary<T>,
+            predicate: W
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.filter
+         */
+        filter(
+            predicate?: StringIterator<boolean>
+        ): LoDashImplicitArrayWrapper<string>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.filter
+         */
+        filter(
+            predicate: ListIterator<T, boolean>
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.filter
+         */
+        filter(
+            predicate: string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.filter
+         */
+        filter<W>(predicate: W): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.filter
+         */
+        filter<T>(
+            predicate: ListIterator<T, boolean>|DictionaryIterator<T, boolean>
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.filter
+         */
+        filter<T>(
+            predicate: string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.filter
+         */
+        filter<W, T>(predicate: W): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.filter
+         */
+        filter(
+            predicate?: StringIterator<boolean>
+        ): LoDashExplicitArrayWrapper<string>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.filter
+         */
+        filter(
+            predicate: ListIterator<T, boolean>
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.filter
+         */
+        filter(
+            predicate: string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.filter
+         */
+        filter<W>(predicate: W): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.filter
+         */
+        filter<T>(
+            predicate: ListIterator<T, boolean>|DictionaryIterator<T, boolean>
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.filter
+         */
+        filter<T>(
+            predicate: string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.filter
+         */
+        filter<W, T>(predicate: W): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.find
+    interface LoDashStatic {
+        /**
+         * Iterates over elements of collection, returning the first element predicate returns truthy for.
+         * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param collection The collection to search.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the matched element, else undefined.
+         */
+        find<T>(
+            collection: List<T>,
+            predicate?: ListIterator<T, boolean>
+        ): T;
+
+        /**
+         * @see _.find
+         */
+        find<T>(
+            collection: Dictionary<T>,
+            predicate?: DictionaryIterator<T, boolean>
+        ): T;
+
+        /**
+         * @see _.find
+         */
+        find<T>(
+            collection: List<T>|Dictionary<T>,
+            predicate?: string
+        ): T;
+
+        /**
+         * @see _.find
+         */
+        find<TObject extends {}, T>(
+            collection: List<T>|Dictionary<T>,
+            predicate?: TObject
+        ): T;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.find
+         */
+        find(
+            predicate?: ListIterator<T, boolean>
+        ): T;
+
+        /**
+         * @see _.find
+         */
+        find(
+            predicate?: string
+        ): T;
+
+        /**
+         * @see _.find
+         */
+        find<TObject extends {}>(
+            predicate?: TObject
+        ): T;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.find
+         */
+        find<TResult>(
+            predicate?: ListIterator<TResult, boolean>|DictionaryIterator<TResult, boolean>
+        ): TResult;
+
+        /**
+         * @see _.find
+         */
+        find<TResult>(
+            predicate?: string
+        ): TResult;
+
+        /**
+         * @see _.find
+         */
+        find<TObject extends {}, TResult>(
+            predicate?: TObject
+        ): TResult;
+    }
+
+    //_.findLast
+    interface LoDashStatic {
+        /**
+        * This method is like _.find except that it iterates over elements of a collection from
+        * right to left.
+        * @param collection Searches for a value in this list.
+        * @param callback The function called per iteration.
+        * @param thisArg The this binding of callback.
+        * @return The found element, else undefined.
+        **/
+        findLast<T>(
+            collection: Array<T>,
+            callback: ListIterator<T, boolean>): T;
+
+        /**
+        * @see _.find
+        **/
+        findLast<T>(
+            collection: List<T>,
+            callback: ListIterator<T, boolean>): T;
+
+        /**
+        * @see _.find
+        **/
+        findLast<T>(
+            collection: Dictionary<T>,
+            callback: DictionaryIterator<T, boolean>): T;
+
+        /**
+        * @see _.find
+        * @param _.pluck style callback
+        **/
+        findLast<W, T>(
+            collection: Array<T>,
+            whereValue: W): T;
+
+        /**
+        * @see _.find
+        * @param _.pluck style callback
+        **/
+        findLast<W, T>(
+            collection: List<T>,
+            whereValue: W): T;
+
+        /**
+        * @see _.find
+        * @param _.pluck style callback
+        **/
+        findLast<W, T>(
+            collection: Dictionary<T>,
+            whereValue: W): T;
+
+        /**
+        * @see _.find
+        * @param _.where style callback
+        **/
+        findLast<T>(
+            collection: Array<T>,
+            pluckValue: string): T;
+
+        /**
+        * @see _.find
+        * @param _.where style callback
+        **/
+        findLast<T>(
+            collection: List<T>,
+            pluckValue: string): T;
+
+        /**
+        * @see _.find
+        * @param _.where style callback
+        **/
+        findLast<T>(
+            collection: Dictionary<T>,
+            pluckValue: string): T;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+        * @see _.findLast
+        */
+        findLast(
+            callback: ListIterator<T, boolean>): T;
+        /**
+        * @see _.findLast
+        * @param _.where style callback
+        */
+        findLast<W>(
+            whereValue: W): T;
+
+        /**
+        * @see _.findLast
+        * @param _.where style callback
+        */
+        findLast(
+            pluckValue: string): T;
+    }
+
+    //_.flatMap
+    interface LoDashStatic {
+        /**
+         * Creates an array of flattened values by running each element in collection through iteratee
+         * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
+         * (value, index|key, collection).
+         *
+         * @param collection The collection to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @return Returns the new flattened array.
+         */
+        flatMap<T, TResult>(
+            collection: List<T>,
+            iteratee?: ListIterator<T, TResult|TResult[]>
+        ): TResult[];
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TResult>(
+            collection: List<any>,
+            iteratee?: ListIterator<any, TResult|TResult[]>
+        ): TResult[];
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<T, TResult>(
+            collection: Dictionary<T>,
+            iteratee?: DictionaryIterator<T, TResult|TResult[]>
+        ): TResult[];
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TResult>(
+            collection: Dictionary<any>,
+            iteratee?: DictionaryIterator<any, TResult|TResult[]>
+        ): TResult[];
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<T, TResult>(
+            collection: NumericDictionary<T>,
+            iteratee?: NumericDictionaryIterator<T, TResult|TResult[]>
+        ): TResult[];
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TResult>(
+            collection: NumericDictionary<any>,
+            iteratee?: NumericDictionaryIterator<any, TResult|TResult[]>
+        ): TResult[];
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TObject extends Object, TResult>(
+            collection: TObject,
+            iteratee?: ObjectIterator<any, TResult|TResult[]>
+        ): TResult[];
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TResult>(
+            collection: Object,
+            iteratee?: ObjectIterator<any, TResult|TResult[]>
+        ): TResult[];
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TWhere extends Object, TObject extends Object>(
+            collection: TObject,
+            iteratee: TWhere
+        ): boolean[];
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TObject extends Object, TResult>(
+            collection: TObject,
+            iteratee: Object|string
+        ): TResult[];
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TObject extends Object>(
+            collection: TObject,
+            iteratee: [string, any]
+        ): boolean[];
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TResult>(
+            collection: string
+        ): string[];
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TResult>(
+            collection: Object,
+            iteratee?: Object|string
+        ): TResult[];
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TResult>(
+            iteratee: ListIterator<string, TResult|TResult[]>
+        ): LoDashImplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap(): LoDashImplicitArrayWrapper<string>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TResult>(
+            iteratee: ListIterator<T, TResult|TResult[]>|string
+        ): LoDashImplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TWhere extends Object>(
+            iteratee: TWhere
+        ): LoDashImplicitArrayWrapper<boolean>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap(
+            iteratee: [string, any]
+        ): LoDashImplicitArrayWrapper<boolean>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TResult>(): LoDashImplicitArrayWrapper<TResult>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.flatMap
+         */
+        flatMap<T, TResult>(
+            iteratee: ListIterator<T, TResult|TResult[]>|DictionaryIterator<T, TResult|TResult[]>|NumericDictionaryIterator<T, TResult|TResult[]>
+        ): LoDashImplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TResult>(
+            iteratee: ObjectIterator<any, TResult|TResult[]>|string
+        ): LoDashImplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TWhere extends Object>(
+            iteratee: TWhere
+        ): LoDashImplicitArrayWrapper<boolean>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap(
+            iteratee: [string, any]
+        ): LoDashImplicitArrayWrapper<boolean>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TResult>(): LoDashImplicitArrayWrapper<TResult>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TResult>(
+            iteratee: ListIterator<string, TResult|TResult[]>
+        ): LoDashExplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap(): LoDashExplicitArrayWrapper<string>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TResult>(
+            iteratee: ListIterator<T, TResult|TResult[]>|string
+        ): LoDashExplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TWhere extends Object>(
+            iteratee: TWhere
+        ): LoDashExplicitArrayWrapper<boolean>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap(
+            iteratee: [string, any]
+        ): LoDashExplicitArrayWrapper<boolean>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TResult>(): LoDashExplicitArrayWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.flatMap
+         */
+        flatMap<T, TResult>(
+            iteratee: ListIterator<T, TResult|TResult[]>|DictionaryIterator<T, TResult|TResult[]>|NumericDictionaryIterator<T, TResult|TResult[]>
+        ): LoDashExplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TResult>(
+            iteratee: ObjectIterator<any, TResult|TResult[]>|string
+        ): LoDashExplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TWhere extends Object>(
+            iteratee: TWhere
+        ): LoDashExplicitArrayWrapper<boolean>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap(
+            iteratee: [string, any]
+        ): LoDashExplicitArrayWrapper<boolean>;
+
+        /**
+         * @see _.flatMap
+         */
+        flatMap<TResult>(): LoDashExplicitArrayWrapper<TResult>;
+    }
+
+    //_.forEach
+    interface LoDashStatic {
+        /**
+         * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+         * and invoked with three arguments:
+         * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+         *
+         * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+         * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+         *
+         * @alias _.each
+         *
+         * @param collection The collection to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         */
+        forEach<T>(
+            collection: T[],
+            iteratee?: ListIterator<T, any>
+        ): T[];
+
+        /**
+         * @see _.forEach
+         */
+        forEach<T>(
+            collection: List<T>,
+            iteratee?: ListIterator<T, any>
+        ): List<T>;
+
+        /**
+         * @see _.forEach
+         */
+        forEach<T>(
+            collection: Dictionary<T>,
+            iteratee?: DictionaryIterator<T, any>
+        ): Dictionary<T>;
+
+        /**
+         * @see _.forEach
+         */
+        forEach<T extends {}>(
+            collection: T,
+            iteratee?: ObjectIterator<any, any>
+        ): T;
+
+        /**
+         * @see _.forEach
+         */
+        forEach<T extends {}, TValue>(
+            collection: T,
+            iteratee?: ObjectIterator<TValue, any>
+        ): T;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.forEach
+         */
+        forEach(
+            iteratee: ListIterator<string, any>
+        ): LoDashImplicitWrapper<string>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.forEach
+         */
+        forEach(
+            iteratee: ListIterator<T, any>
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.forEach
+         */
+        forEach<TValue>(
+            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
+        ): LoDashImplicitObjectWrapper<T>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.forEach
+         */
+        forEach(
+            iteratee: ListIterator<string, any>
+        ): LoDashExplicitWrapper<string>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.forEach
+         */
+        forEach(
+            iteratee: ListIterator<T, any>
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.forEach
+         */
+        forEach<TValue>(
+            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
+        ): LoDashExplicitObjectWrapper<T>;
+    }
+
+    //_.forEachRight
+    interface LoDashStatic {
+        /**
+         * This method is like _.forEach except that it iterates over elements of collection from right to left.
+         *
+         * @alias _.eachRight
+         *
+         * @param collection The collection to iterate over.
+         * @param iteratee The function called per iteration.
+         * @param thisArg The this binding of callback.
+         */
+        forEachRight<T>(
+            collection: T[],
+            iteratee?: ListIterator<T, any>
+        ): T[];
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<T>(
+            collection: List<T>,
+            iteratee?: ListIterator<T, any>
+        ): List<T>;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<T>(
+            collection: Dictionary<T>,
+            iteratee?: DictionaryIterator<T, any>
+        ): Dictionary<T>;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<T extends {}>(
+            collection: T,
+            iteratee?: ObjectIterator<any, any>
+        ): T;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<T extends {}, TValue>(
+            collection: T,
+            iteratee?: ObjectIterator<TValue, any>
+        ): T;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight(
+            iteratee: ListIterator<string, any>
+        ): LoDashImplicitWrapper<string>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight(
+            iteratee: ListIterator<T, any>
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<TValue>(
+            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
+        ): LoDashImplicitObjectWrapper<T>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight(
+            iteratee: ListIterator<string, any>
+        ): LoDashExplicitWrapper<string>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight(
+            iteratee: ListIterator<T, any>
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<TValue>(
+            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
+        ): LoDashExplicitObjectWrapper<T>;
+    }
+
+    //_.groupBy
+    interface LoDashStatic {
+        /**
+         * Creates an object composed of keys generated from the results of running each element of collection through
+         * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
+         * key. The iteratee is bound to thisArg and invoked with three arguments:
+         * (value, index|key, collection).
+         *
+         * If a property name is provided for iteratee the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param collection The collection to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns the composed aggregate object.
+         */
+        groupBy<T, TKey>(
+            collection: List<T>,
+            iteratee?: ListIterator<T, TKey>
+        ): Dictionary<T[]>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            collection: List<any>,
+            iteratee?: ListIterator<T, any>
+        ): Dictionary<T[]>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T, TKey>(
+            collection: Dictionary<T>,
+            iteratee?: DictionaryIterator<T, TKey>
+        ): Dictionary<T[]>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            collection: Dictionary<any>,
+            iteratee?: DictionaryIterator<T, any>
+        ): Dictionary<T[]>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T, TValue>(
+            collection: List<T>|Dictionary<T>,
+            iteratee?: string
+        ): Dictionary<T[]>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            collection: List<T>|Dictionary<T>,
+            iteratee?: string
+        ): Dictionary<T[]>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<TWhere, T>(
+            collection: List<T>|Dictionary<T>,
+            iteratee?: TWhere
+        ): Dictionary<T[]>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            collection: List<T>|Dictionary<T>,
+            iteratee?: Object
+        ): Dictionary<T[]>;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.groupBy
+         */
+        groupBy<TKey>(
+            iteratee?: ListIterator<T, TKey>
+        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.groupBy
+         */
+        groupBy<TKey>(
+            iteratee?: ListIterator<T, TKey>
+        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<TValue>(
+            iteratee?: string
+        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<TWhere>(
+            iteratee?: TWhere
+        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T, TKey>(
+            iteratee?: ListIterator<T, TKey>|DictionaryIterator<T, TKey>
+        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            iteratee?: ListIterator<T, any>|DictionaryIterator<T, any>
+        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T, TValue>(
+            iteratee?: string
+        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            iteratee?: string
+        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<TWhere, T>(
+            iteratee?: TWhere
+        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            iteratee?: Object
+        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.groupBy
+         */
+        groupBy<TKey>(
+            iteratee?: ListIterator<T, TKey>
+        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.groupBy
+         */
+        groupBy<TKey>(
+            iteratee?: ListIterator<T, TKey>
+        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<TValue>(
+            iteratee?: string
+        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<TWhere>(
+            iteratee?: TWhere
+        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T, TKey>(
+            iteratee?: ListIterator<T, TKey>|DictionaryIterator<T, TKey>
+        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            iteratee?: ListIterator<T, any>|DictionaryIterator<T, any>
+        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T, TValue>(
+            iteratee?: string
+        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            iteratee?: string
+        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<TWhere, T>(
+            iteratee?: TWhere
+        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
+
+        /**
+         * @see _.groupBy
+         */
+        groupBy<T>(
+            iteratee?: Object
+        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
+    }
+
+    //_.includes
+    interface LoDashStatic {
+        /**
+         * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
+         * it’s used as the offset from the end of collection.
+         *
+         * @param collection The collection to search.
+         * @param target The value to search for.
+         * @param fromIndex The index to search from.
+         * @return True if the target element is found, else false.
+         */
+        includes<T>(
+            collection: List<T>|Dictionary<T>,
+            target: T,
+            fromIndex?: number
+        ): boolean;
+
+        /**
+         * @see _.includes
+         */
+        includes(
+            collection: string,
+            target: string,
+            fromIndex?: number
+        ): boolean;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.includes
+         */
+        includes(
+            target: T,
+            fromIndex?: number
+        ): boolean;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.includes
+         */
+        includes<TValue>(
+            target: TValue,
+            fromIndex?: number
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.includes
+         */
+        includes(
+            target: string,
+            fromIndex?: number
+        ): boolean;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.includes
+         */
+        includes(
+            target: T,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.includes
+         */
+        includes<TValue>(
+            target: TValue,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.includes
+         */
+        includes(
+            target: string,
+            fromIndex?: number
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.keyBy
+    interface LoDashStatic {
+        /**
+         * Creates an object composed of keys generated from the results of running each element of collection through
+         * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
+         * iteratee function is bound to thisArg and invoked with three arguments:
+         * (value, index|key, collection).
+         *
+         * If a property name is provided for iteratee the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param collection The collection to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns the composed aggregate object.
+         */
+        keyBy<T>(
+            collection: List<T>,
+            iteratee?: ListIterator<T, any>
+        ): Dictionary<T>;
+
+        /**
+         * @see _.keyBy
+         */
+        keyBy<T>(
+            collection: NumericDictionary<T>,
+            iteratee?: NumericDictionaryIterator<T, any>
+        ): Dictionary<T>;
+
+        /**
+         * @see _.keyBy
+         */
+        keyBy<T>(
+            collection: Dictionary<T>,
+            iteratee?: DictionaryIterator<T, any>
+        ): Dictionary<T>;
+
+        /**
+         * @see _.keyBy
+         */
+        keyBy<T>(
+            collection: List<T>|NumericDictionary<T>|Dictionary<T>,
+            iteratee?: string
+        ): Dictionary<T>;
+
+        /**
+         * @see _.keyBy
+         */
+        keyBy<W extends Object, T>(
+            collection: List<T>|NumericDictionary<T>|Dictionary<T>,
+            iteratee?: W
+        ): Dictionary<T>;
+
+        /**
+         * @see _.keyBy
+         */
+        keyBy<T>(
+            collection: List<T>|NumericDictionary<T>|Dictionary<T>,
+            iteratee?: Object
+        ): Dictionary<T>;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.keyBy
+         */
+        keyBy(
+            iteratee?: ListIterator<T, any>
+        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.keyBy
+         */
+        keyBy(
+            iteratee?: ListIterator<T, any>
+        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.keyBy
+         */
+        keyBy(
+            iteratee?: string
+        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.keyBy
+         */
+        keyBy<W extends Object>(
+            iteratee?: W
+        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.keyBy
+         */
+        keyBy<T>(
+            iteratee?: ListIterator<T, any>|NumericDictionaryIterator<T, any>|DictionaryIterator<T, any>
+        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.keyBy
+         */
+        keyBy<T>(
+            iteratee?: string
+        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.keyBy
+         */
+        keyBy<W extends Object, T>(
+            iteratee?: W
+        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.keyBy
+         */
+        keyBy<T>(
+            iteratee?: Object
+        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.keyBy
+         */
+        keyBy(
+            iteratee?: ListIterator<T, any>
+        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.keyBy
+         */
+        keyBy(
+            iteratee?: ListIterator<T, any>
+        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.keyBy
+         */
+        keyBy(
+            iteratee?: string
+        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.keyBy
+         */
+        keyBy<W extends Object>(
+            iteratee?: W
+        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.keyBy
+         */
+        keyBy<T>(
+            iteratee?: ListIterator<T, any>|NumericDictionaryIterator<T, any>|DictionaryIterator<T, any>
+        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.keyBy
+         */
+        keyBy<T>(
+            iteratee?: string
+        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.keyBy
+         */
+        keyBy<W extends Object, T>(
+            iteratee?: W
+        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.keyBy
+         */
+        keyBy<T>(
+            iteratee?: Object
+        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
+    }
+
+    //_.invoke
+    interface LoDashStatic {
+        /**
+        * Invokes the method at path of object.
+        * @param object The object to query.
+        * @param path The path of the method to invoke.
+        * @param args The arguments to invoke the method with.
+        **/
+        invoke<TObject extends Object, TResult>(
+            object: TObject,
+            path: StringRepresentable|StringRepresentable[],
+            ...args: any[]): TResult;
+
+        /**
+        * @see _.invoke
+        **/
+        invoke<TValue, TResult>(
+            object: Dictionary<TValue>|TValue[],
+            path: StringRepresentable|StringRepresentable[],
+            ...args: any[]): TResult;
+
+        /**
+        * @see _.invoke
+        **/
+        invoke<TResult>(
+            object: any,
+            path: StringRepresentable|StringRepresentable[],
+            ...args: any[]): TResult;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+        * @see _.invoke
+        **/
+        invoke<TResult>(
+            path: StringRepresentable|StringRepresentable[],
+            ...args: any[]): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+        * @see _.invoke
+        **/
+        invoke<TResult>(
+            path: StringRepresentable|StringRepresentable[],
+            ...args: any[]): TResult;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+        * @see _.invoke
+        **/
+        invoke<TResult>(
+            path: StringRepresentable|StringRepresentable[],
+            ...args: any[]): TResult;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+        * @see _.invoke
+        **/
+        invoke<TResult>(
+            path: StringRepresentable|StringRepresentable[],
+            ...args: any[]): TResult;
+    }
+
+    //_.invokeMap
+    interface LoDashStatic {
+        /**
+        * Invokes the method named by methodName on each element in the collection returning
+        * an array of the results of each invoked method. Additional arguments will be provided
+        * to each invoked method. If methodName is a function it will be invoked for, and this
+        * bound to, each element in the collection.
+        * @param collection The collection to iterate over.
+        * @param methodName The name of the method to invoke.
+        * @param args Arguments to invoke the method with.
+        **/
+        invokeMap<TValue extends {}, TResult>(
+            collection: TValue[],
+            methodName: string,
+            ...args: any[]): TResult[];
+
+        /**
+        * @see _.invokeMap
+        **/
+        invokeMap<TValue extends {}, TResult>(
+            collection: Dictionary<TValue>,
+            methodName: string,
+            ...args: any[]): TResult[];
+
+        /**
+        * @see _.invokeMap
+        **/
+        invokeMap<TResult>(
+            collection: {}[],
+            methodName: string,
+            ...args: any[]): TResult[];
+
+        /**
+        * @see _.invokeMap
+        **/
+        invokeMap<TResult>(
+            collection: Dictionary<{}>,
+            methodName: string,
+            ...args: any[]): TResult[];
+
+        /**
+        * @see _.invokeMap
+        **/
+        invokeMap<TValue extends {}, TResult>(
+            collection: TValue[],
+            method: (...args: any[]) => TResult,
+            ...args: any[]): TResult[];
+
+        /**
+        * @see _.invokeMap
+        **/
+        invokeMap<TValue extends {}, TResult>(
+            collection: Dictionary<TValue>,
+            method: (...args: any[]) => TResult,
+            ...args: any[]): TResult[];
+
+        /**
+        * @see _.invokeMap
+        **/
+        invokeMap<TResult>(
+            collection: {}[],
+            method: (...args: any[]) => TResult,
+            ...args: any[]): TResult[];
+
+        /**
+        * @see _.invokeMap
+        **/
+        invokeMap<TResult>(
+            collection: Dictionary<{}>,
+            method: (...args: any[]) => TResult,
+            ...args: any[]): TResult[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+        * @see _.invokeMap
+        **/
+        invokeMap<TResult>(
+            methodName: string,
+            ...args: any[]): LoDashImplicitArrayWrapper<TResult>;
+
+        /**
+        * @see _.invokeMap
+        **/
+        invokeMap<TResult>(
+            method: (...args: any[]) => TResult,
+            ...args: any[]): LoDashImplicitArrayWrapper<TResult>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+        * @see _.invokeMap
+        **/
+        invokeMap<TResult>(
+            methodName: string,
+            ...args: any[]): LoDashImplicitArrayWrapper<TResult>;
+
+        /**
+        * @see _.invokeMap
+        **/
+        invokeMap<TResult>(
+            method: (...args: any[]) => TResult,
+            ...args: any[]): LoDashImplicitArrayWrapper<TResult>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+        * @see _.invokeMap
+        **/
+        invokeMap<TResult>(
+            methodName: string,
+            ...args: any[]): LoDashExplicitArrayWrapper<TResult>;
+
+        /**
+        * @see _.invokeMap
+        **/
+        invokeMap<TResult>(
+            method: (...args: any[]) => TResult,
+            ...args: any[]): LoDashExplicitArrayWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+        * @see _.invokeMap
+        **/
+        invokeMap<TResult>(
+            methodName: string,
+            ...args: any[]): LoDashExplicitArrayWrapper<TResult>;
+
+        /**
+        * @see _.invokeMap
+        **/
+        invokeMap<TResult>(
+            method: (...args: any[]) => TResult,
+            ...args: any[]): LoDashExplicitArrayWrapper<TResult>;
+    }
+
+    //_.map
+    interface LoDashStatic {
+        /**
+         * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+         * thisArg and invoked with three arguments: (value, index|key, collection).
+         *
+         * If a property name is provided for iteratee the created _.property style callback returns the property value
+         * of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+         * _.reject, and _.some.
+         *
+         * The guarded methods are:
+         * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+         * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+         * sample, some, sum, uniq, and words
+         *
+         * @param collection The collection to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns the new mapped array.
+         */
+        map<T, TResult>(
+            collection: List<T>,
+            iteratee?: ListIterator<T, TResult>
+        ): TResult[];
+
+        /**
+         * @see _.map
+         */
+        map<T extends {}, TResult>(
+            collection: Dictionary<T>,
+            iteratee?: DictionaryIterator<T, TResult>
+        ): TResult[];
+
+        map<T extends {}, TResult>(
+            collection: NumericDictionary<T>,
+            iteratee?: NumericDictionaryIterator<T, TResult>
+        ): TResult[];
+
+        /**
+         * @see _.map
+         */
+        map<T, TResult>(
+            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
+            iteratee?: string
+        ): TResult[];
+
+        /**
+         * @see _.map
+         */
+        map<T, TObject extends {}>(
+            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
+            iteratee?: TObject
+        ): boolean[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.map
+         */
+        map<TResult>(
+            iteratee?: ListIterator<T, TResult>
+        ): LoDashImplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.map
+         */
+        map<TResult>(
+            iteratee?: string
+        ): LoDashImplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.map
+         */
+        map<TObject extends {}>(
+            iteratee?: TObject
+        ): LoDashImplicitArrayWrapper<boolean>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.map
+         */
+        map<TValue, TResult>(
+            iteratee?: ListIterator<TValue, TResult>|DictionaryIterator<TValue, TResult>
+        ): LoDashImplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.map
+         */
+        map<TValue, TResult>(
+            iteratee?: string
+        ): LoDashImplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.map
+         */
+        map<TObject extends {}>(
+            iteratee?: TObject
+        ): LoDashImplicitArrayWrapper<boolean>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.map
+         */
+        map<TResult>(
+            iteratee?: ListIterator<T, TResult>
+        ): LoDashExplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.map
+         */
+        map<TResult>(
+            iteratee?: string
+        ): LoDashExplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.map
+         */
+        map<TObject extends {}>(
+            iteratee?: TObject
+        ): LoDashExplicitArrayWrapper<boolean>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.map
+         */
+        map<TValue, TResult>(
+            iteratee?: ListIterator<TValue, TResult>|DictionaryIterator<TValue, TResult>
+        ): LoDashExplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.map
+         */
+        map<TValue, TResult>(
+            iteratee?: string
+        ): LoDashExplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.map
+         */
+        map<TObject extends {}>(
+            iteratee?: TObject
+        ): LoDashExplicitArrayWrapper<boolean>;
+    }
+
+    //_.partition
+    interface LoDashStatic {
+        /**
+        * Creates an array of elements split into two groups, the first of which contains elements predicate returns truthy for,
+        * while the second of which contains elements predicate returns falsey for.
+        * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+        *
+        * If a property name is provided for predicate the created _.property style callback
+        * returns the property value of the given element.
+        *
+        * If a value is also provided for thisArg the created _.matchesProperty style callback
+        * returns true for elements that have a matching property value, else false.
+        *
+        * If an object is provided for predicate the created _.matches style callback returns
+        * true for elements that have the properties of the given object, else false.
+        *
+        * @param collection The collection to iterate over.
+        * @param callback The function called per iteration.
+        * @param thisArg The this binding of predicate.
+        * @return Returns the array of grouped elements.
+        **/
+        partition<T>(
+            collection: List<T>,
+            callback: ListIterator<T, boolean>): T[][];
+
+        /**
+         * @see _.partition
+         **/
+        partition<T>(
+            collection: Dictionary<T>,
+            callback: DictionaryIterator<T, boolean>): T[][];
+
+        /**
+         * @see _.partition
+         **/
+        partition<W, T>(
+            collection: List<T>,
+            whereValue: W): T[][];
+
+        /**
+         * @see _.partition
+         **/
+        partition<W, T>(
+            collection: Dictionary<T>,
+            whereValue: W): T[][];
+
+        /**
+         * @see _.partition
+         **/
+        partition<T>(
+            collection: List<T>,
+            path: string,
+            srcValue: any): T[][];
+
+        /**
+         * @see _.partition
+         **/
+        partition<T>(
+            collection: Dictionary<T>,
+            path: string,
+            srcValue: any): T[][];
+
+        /**
+         * @see _.partition
+         **/
+        partition<T>(
+            collection: List<T>,
+            pluckValue: string): T[][];
+
+        /**
+         * @see _.partition
+         **/
+        partition<T>(
+            collection: Dictionary<T>,
+            pluckValue: string): T[][];
+    }
+
+    interface LoDashImplicitStringWrapper {
+        /**
+         * @see _.partition
+         */
+        partition(
+            callback: ListIterator<string, boolean>): LoDashImplicitArrayWrapper<string[]>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.partition
+         */
+        partition(
+            callback: ListIterator<T, boolean>): LoDashImplicitArrayWrapper<T[]>;
+        /**
+         * @see _.partition
+         */
+        partition<W>(
+            whereValue: W): LoDashImplicitArrayWrapper<T[]>;
+        /**
+         * @see _.partition
+         */
+        partition(
+            path: string,
+            srcValue: any): LoDashImplicitArrayWrapper<T[]>;
+        /**
+         * @see _.partition
+         */
+        partition(
+            pluckValue: string): LoDashImplicitArrayWrapper<T[]>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.partition
+         */
+        partition<TResult>(
+            callback: ListIterator<TResult, boolean>): LoDashImplicitArrayWrapper<TResult[]>;
+
+        /**
+         * @see _.partition
+         */
+        partition<TResult>(
+            callback: DictionaryIterator<TResult, boolean>): LoDashImplicitArrayWrapper<TResult[]>;
+
+        /**
+         * @see _.partition
+         */
+        partition<W, TResult>(
+            whereValue: W): LoDashImplicitArrayWrapper<TResult[]>;
+
+        /**
+         * @see _.partition
+         */
+        partition<TResult>(
+            path: string,
+            srcValue: any): LoDashImplicitArrayWrapper<TResult[]>;
+
+        /**
+         * @see _.partition
+         */
+        partition<TResult>(
+            pluckValue: string): LoDashImplicitArrayWrapper<TResult[]>;
+    }
+
+    //_.reduce
+    interface LoDashStatic {
+        /**
+        * Reduces a collection to a value which is the accumulated result of running each
+        * element in the collection through the callback, where each successive callback execution
+        * consumes the return value of the previous execution. If accumulator is not provided the
+        * first element of the collection will be used as the initial accumulator value. The callback
+        * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
+        * @param collection The collection to iterate over.
+        * @param callback The function called per iteration.
+        * @param accumulator Initial value of the accumulator.
+        * @param thisArg The this binding of callback.
+        * @return Returns the accumulated value.
+        **/
+        reduce<T, TResult>(
+            collection: Array<T>,
+            callback: MemoIterator<T, TResult>,
+            accumulator: TResult): TResult;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            collection: List<T>,
+            callback: MemoIterator<T, TResult>,
+            accumulator: TResult): TResult;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            collection: Dictionary<T>,
+            callback: MemoIterator<T, TResult>,
+            accumulator: TResult): TResult;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            collection: NumericDictionary<T>,
+            callback: MemoIterator<T, TResult>,
+            accumulator: TResult): TResult;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            collection: Array<T>,
+            callback: MemoIterator<T, TResult>): TResult;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            collection: List<T>,
+            callback: MemoIterator<T, TResult>): TResult;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            collection: Dictionary<T>,
+            callback: MemoIterator<T, TResult>): TResult;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<T, TResult>(
+            collection: NumericDictionary<T>,
+            callback: MemoIterator<T, TResult>): TResult;
+
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+         /**
+        * @see _.reduce
+        **/
+        reduce<TResult>(
+            callback: MemoIterator<T, TResult>,
+            accumulator: TResult): TResult;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<TResult>(
+            callback: MemoIterator<T, TResult>): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+         /**
+        * @see _.reduce
+        **/
+        reduce<TValue, TResult>(
+            callback: MemoIterator<TValue, TResult>,
+            accumulator: TResult): TResult;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<TValue, TResult>(
+            callback: MemoIterator<TValue, TResult>): TResult;
+    }
+
+    //_.reduceRight
+    interface LoDashStatic {
+        /**
+        * This method is like _.reduce except that it iterates over elements of a collection from
+        * right to left.
+        * @param collection The collection to iterate over.
+        * @param callback The function called per iteration.
+        * @param accumulator Initial value of the accumulator.
+        * @param thisArg The this binding of callback.
+        * @return The accumulated value.
+        **/
+        reduceRight<T, TResult>(
+            collection: Array<T>,
+            callback: MemoIterator<T, TResult>,
+            accumulator: TResult): TResult;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            collection: List<T>,
+            callback: MemoIterator<T, TResult>,
+            accumulator: TResult): TResult;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            collection: Dictionary<T>,
+            callback: MemoIterator<T, TResult>,
+            accumulator: TResult): TResult;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            collection: Array<T>,
+            callback: MemoIterator<T, TResult>): TResult;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            collection: List<T>,
+            callback: MemoIterator<T, TResult>): TResult;
+
+        /**
+        * @see _.reduceRight
+        **/
+        reduceRight<T, TResult>(
+            collection: Dictionary<T>,
+            callback: MemoIterator<T, TResult>): TResult;
+    }
+
+    //_.reject
+    interface LoDashStatic {
+        /**
+         * The opposite of _.filter; this method returns the elements of collection that predicate does not return
+         * truthy for.
+         *
+         * @param collection The collection to iterate over.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the new filtered array.
+         */
+        reject<T>(
+            collection: List<T>,
+            predicate?: ListIterator<T, boolean>
+        ): T[];
+
+        /**
+         * @see _.reject
+         */
+        reject<T>(
+            collection: Dictionary<T>,
+            predicate?: DictionaryIterator<T, boolean>
+        ): T[];
+
+        /**
+         * @see _.reject
+         */
+        reject(
+            collection: string,
+            predicate?: StringIterator<boolean>
+        ): string[];
+
+        /**
+         * @see _.reject
+         */
+        reject<T>(
+            collection: List<T>|Dictionary<T>,
+            predicate: string
+        ): T[];
+
+        /**
+         * @see _.reject
+         */
+        reject<W extends {}, T>(
+            collection: List<T>|Dictionary<T>,
+            predicate: W
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.reject
+         */
+        reject(
+            predicate?: StringIterator<boolean>
+        ): LoDashImplicitArrayWrapper<string>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.reject
+         */
+        reject(
+            predicate: ListIterator<T, boolean>
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.reject
+         */
+        reject(
+            predicate: string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.reject
+         */
+        reject<W>(predicate: W): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.reject
+         */
+        reject<T>(
+            predicate: ListIterator<T, boolean>|DictionaryIterator<T, boolean>
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.reject
+         */
+        reject<T>(
+            predicate: string
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.reject
+         */
+        reject<W, T>(predicate: W): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.reject
+         */
+        reject(
+            predicate?: StringIterator<boolean>
+        ): LoDashExplicitArrayWrapper<string>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.reject
+         */
+        reject(
+            predicate: ListIterator<T, boolean>
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.reject
+         */
+        reject(
+            predicate: string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.reject
+         */
+        reject<W>(predicate: W): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.reject
+         */
+        reject<T>(
+            predicate: ListIterator<T, boolean>|DictionaryIterator<T, boolean>
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.reject
+         */
+        reject<T>(
+            predicate: string
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.reject
+         */
+        reject<W, T>(predicate: W): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.sample
+    interface LoDashStatic {
+        /**
+         * Gets a random element from collection.
+         *
+         * @param collection The collection to sample.
+         * @return Returns the random element.
+         */
+        sample<T>(
+            collection: List<T>|Dictionary<T>|NumericDictionary<T>
+        ): T;
+
+        /**
+         * @see _.sample
+         */
+        sample<O extends Object, T>(
+            collection: O
+        ): T;
+
+        /**
+         * @see _.sample
+         */
+        sample<T>(
+            collection: Object
+        ): T;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.sample
+         */
+        sample(): string;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.sample
+         */
+        sample(): T;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.sample
+         */
+        sample<T>(): T;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.sample
+         */
+        sample(): LoDashExplicitWrapper<string>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.sample
+         */
+        sample<TWrapper>(): TWrapper;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.sample
+         */
+        sample<TWrapper>(): TWrapper;
+    }
+
+    //_.sampleSize
+    interface LoDashStatic {
+        /**
+         * Gets n random elements at unique keys from collection up to the size of collection.
+         *
+         * @param collection The collection to sample.
+         * @param n The number of elements to sample.
+         * @return Returns the random elements.
+         */
+        sampleSize<T>(
+            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
+            n?: number
+        ): T[];
+
+        /**
+         * @see _.sampleSize
+         */
+        sampleSize<O extends Object, T>(
+            collection: O,
+            n?: number
+        ): T[];
+
+        /**
+         * @see _.sampleSize
+         */
+        sampleSize<T>(
+            collection: Object,
+            n?: number
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.sampleSize
+         */
+        sampleSize(
+            n?: number
+        ): LoDashImplicitArrayWrapper<string>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.sampleSize
+         */
+        sampleSize(
+            n?: number
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.sampleSize
+         */
+        sampleSize<T>(
+            n?: number
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.sampleSize
+         */
+        sampleSize(
+            n?: number
+        ): LoDashExplicitArrayWrapper<string>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.sampleSize
+         */
+        sampleSize(
+            n?: number
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.sampleSize
+         */
+        sampleSize<T>(
+            n?: number
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.shuffle
+    interface LoDashStatic {
+        /**
+         * Creates an array of shuffled values, using a version of the Fisher-Yates shuffle.
+         *
+         * @param collection The collection to shuffle.
+         * @return Returns the new shuffled array.
+         */
+        shuffle<T>(collection: List<T>|Dictionary<T>): T[];
+
+        /**
+         * @see _.shuffle
+         */
+        shuffle(collection: string): string[];
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.shuffle
+         */
+        shuffle(): LoDashImplicitArrayWrapper<string>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.shuffle
+         */
+        shuffle(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.shuffle
+         */
+        shuffle<T>(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.shuffle
+         */
+        shuffle(): LoDashExplicitArrayWrapper<string>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.shuffle
+         */
+        shuffle(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.shuffle
+         */
+        shuffle<T>(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.size
+    interface LoDashStatic {
+        /**
+         * Gets the size of collection by returning its length for array-like values or the number of own enumerable
+         * properties for objects.
+         *
+         * @param collection The collection to inspect.
+         * @return Returns the size of collection.
+         */
+        size<T>(collection: List<T>|Dictionary<T>): number;
+
+        /**
+         * @see _.size
+         */
+        size(collection: string): number;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.size
+         */
+        size(): number;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.size
+         */
+        size(): number;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.size
+         */
+        size(): number;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.size
+         */
+        size(): LoDashExplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.size
+         */
+        size(): LoDashExplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.size
+         */
+        size(): LoDashExplicitWrapper<number>;
+    }
+
+    //_.some
+    interface LoDashStatic {
+        /**
+         * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
+         * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
+         *
+         * @param collection The collection to iterate over.
+         * @param predicate The function invoked per iteration.
+         * @return Returns true if any element passes the predicate check, else false.
+         */
+        some<T>(
+            collection: List<T>,
+            predicate?: ListIterator<T, boolean>
+        ): boolean;
+
+        /**
+         * @see _.some
+         */
+        some<T>(
+            collection: Dictionary<T>,
+            predicate?: DictionaryIterator<T, boolean>
+        ): boolean;
+
+        /**
+         * @see _.some
+         */
+        some<T>(
+            collection: NumericDictionary<T>,
+            predicate?: NumericDictionaryIterator<T, boolean>
+        ): boolean;
+
+        /**
+         * @see _.some
+         */
+        some(
+            collection: Object,
+            predicate?: ObjectIterator<any, boolean>
+        ): boolean;
+
+        /**
+         * @see _.some
+         */
+        some<T>(
+            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
+            predicate?: string|[string, any]
+        ): boolean;
+
+
+        /**
+         * @see _.some
+         */
+        some(
+            collection: Object,
+            predicate?: string|[string, any]
+        ): boolean;
+
+        /**
+         * @see _.some
+         */
+        some<TObject extends {}, T>(
+            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
+            predicate?: TObject
+        ): boolean;
+
+        /**
+         * @see _.some
+         */
+        some<T>(
+            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
+            predicate?: Object
+        ): boolean;
+
+        /**
+         * @see _.some
+         */
+        some<TObject extends {}>(
+            collection: Object,
+            predicate?: TObject
+        ): boolean;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.some
+         */
+        some(
+            predicate?: ListIterator<T, boolean>|NumericDictionaryIterator<T, boolean>
+        ): boolean;
+
+        /**
+         * @see _.some
+         */
+        some(
+            predicate?: string|[string, any]
+        ): boolean;
+
+        /**
+         * @see _.some
+         */
+        some<TObject extends {}>(
+            predicate?: TObject
+        ): boolean;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.some
+         */
+        some<TResult>(
+            predicate?: ListIterator<TResult, boolean>|DictionaryIterator<TResult, boolean>|NumericDictionaryIterator<T, boolean>|ObjectIterator<any, boolean>
+        ): boolean;
+
+        /**
+         * @see _.some
+         */
+        some(
+            predicate?: string|[string, any]
+        ): boolean;
+
+        /**
+         * @see _.some
+         */
+        some<TObject extends {}>(
+            predicate?: TObject
+        ): boolean;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.some
+         */
+        some(
+            predicate?: ListIterator<T, boolean>|NumericDictionaryIterator<T, boolean>
+        ): LoDashExplicitWrapper<boolean>;
+
+        /**
+         * @see _.some
+         */
+        some(
+            predicate?: string|[string, any]
+        ): LoDashExplicitWrapper<boolean>;
+
+        /**
+         * @see _.some
+         */
+        some<TObject extends {}>(
+            predicate?: TObject
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.some
+         */
+        some<TResult>(
+            predicate?: ListIterator<TResult, boolean>|DictionaryIterator<TResult, boolean>|NumericDictionaryIterator<T, boolean>|ObjectIterator<any, boolean>
+        ): LoDashExplicitWrapper<boolean>;
+
+        /**
+         * @see _.some
+         */
+        some(
+            predicate?: string|[string, any]
+        ): LoDashExplicitWrapper<boolean>;
+
+        /**
+         * @see _.some
+         */
+        some<TObject extends {}>(
+            predicate?: TObject
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.sortBy
+    interface LoDashStatic {
+        /**
+         * Creates an array of elements, sorted in ascending order by the results of
+         * running each element in a collection through each iteratee. This method
+         * performs a stable sort, that is, it preserves the original sort order of
+         * equal elements. The iteratees are invoked with one argument: (value).
+         *
+         * @static
+         * @memberOf _
+         * @category Collection
+         * @param {Array|Object} collection The collection to iterate over.
+         * @param {...(Function|Function[]|Object|Object[]|string|string[])} [iteratees=[_.identity]]
+         *  The iteratees to sort by, specified individually or in arrays.
+         * @returns {Array} Returns the new sorted array.
+         * @example
+         *
+         * var users = [
+         *   { 'user': 'fred',   'age': 48 },
+         *   { 'user': 'barney', 'age': 36 },
+         *   { 'user': 'fred',   'age': 42 },
+         *   { 'user': 'barney', 'age': 34 }
+         * ];
+         *
+         * _.sortBy(users, function(o) { return o.user; });
+         * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+         *
+         * _.sortBy(users, ['user', 'age']);
+         * // => objects for [['barney', 34], ['barney', 36], ['fred', 42], ['fred', 48]]
+         *
+         * _.sortBy(users, 'user', function(o) {
+         *   return Math.floor(o.age / 10);
+         * });
+         * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+         */
+        sortBy<T, TSort>(
+            collection: List<T>,
+            iteratee?: ListIterator<T, TSort>
+        ): T[];
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy<T, TSort>(
+            collection: Dictionary<T>,
+            iteratee?: DictionaryIterator<T, TSort>
+        ): T[];
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy<T>(
+            collection: List<T>|Dictionary<T>,
+            iteratee: string
+        ): T[];
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy<W extends {}, T>(
+            collection: List<T>|Dictionary<T>,
+            whereValue: W
+        ): T[];
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy<T>(
+            collection: List<T>|Dictionary<T>
+        ): T[];
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy<T>(
+            collection: (Array<T>|List<T>),
+            iteratees: (ListIterator<T, any>|string|Object)[]): T[];
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy<T>(
+            collection: (Array<T>|List<T>),
+            ...iteratees: (ListIterator<T, boolean>|Object|string)[]): T[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.sortBy
+         */
+        sortBy<TSort>(
+            iteratee?: ListIterator<T, TSort>
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy(iteratee: string): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy<W extends {}>(whereValue: W): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy(): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy(...iteratees: (ListIterator<T, boolean>|Object|string)[]): LoDashImplicitArrayWrapper<T>;
+
+        /**
+        * @see _.sortBy
+        **/
+        sortBy(iteratees: (ListIterator<T, any>|string|Object)[]): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.sortBy
+         */
+        sortBy<T, TSort>(
+            iteratee?: ListIterator<T, TSort>|DictionaryIterator<T, TSort>
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy<T>(iteratee: string): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy<W extends {}, T>(whereValue: W): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy<T>(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.sortBy
+         */
+        sortBy<TSort>(
+            iteratee?: ListIterator<T, TSort>
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy(iteratee: string): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy<W extends {}>(whereValue: W): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.sortBy
+         */
+        sortBy<T, TSort>(
+            iteratee?: ListIterator<T, TSort>|DictionaryIterator<T, TSort>
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy<T>(iteratee: string): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy<W extends {}, T>(whereValue: W): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.sortBy
+         */
+        sortBy<T>(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.orderBy
+    interface LoDashStatic {
+        /**
+         * This method is like `_.sortBy` except that it allows specifying the sort
+         * orders of the iteratees to sort by. If `orders` is unspecified, all values
+         * are sorted in ascending order. Otherwise, specify an order of "desc" for
+         * descending or "asc" for ascending sort order of corresponding values.
+         *
+         * @static
+         * @memberOf _
+         * @category Collection
+         * @param {Array|Object} collection The collection to iterate over.
+         * @param {Function[]|Object[]|string[]} [iteratees=[_.identity]] The iteratees to sort by.
+         * @param {string[]} [orders] The sort orders of `iteratees`.
+         * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
+         * @returns {Array} Returns the new sorted array.
+         * @example
+         *
+         * var users = [
+         *   { 'user': 'fred',   'age': 48 },
+         *   { 'user': 'barney', 'age': 34 },
+         *   { 'user': 'fred',   'age': 42 },
+         *   { 'user': 'barney', 'age': 36 }
+         * ];
+         *
+         * // sort by `user` in ascending order and by `age` in descending order
+         * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
+         * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+         */
+        orderBy<W extends Object, T>(
+            collection: List<T>,
+            iteratees: ListIterator<T, any>|string|W|(ListIterator<T, any>|string|W)[],
+            orders?: boolean|string|(boolean|string)[]
+        ): T[];
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            collection: List<T>,
+            iteratees: ListIterator<T, any>|string|Object|(ListIterator<T, any>|string|Object)[],
+            orders?: boolean|string|(boolean|string)[]
+        ): T[];
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<W extends Object, T>(
+            collection: NumericDictionary<T>,
+            iteratees: NumericDictionaryIterator<T, any>|string|W|(NumericDictionaryIterator<T, any>|string|W)[],
+            orders?: boolean|string|(boolean|string)[]
+        ): T[];
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            collection: NumericDictionary<T>,
+            iteratees: NumericDictionaryIterator<T, any>|string|Object|(NumericDictionaryIterator<T, any>|string|Object)[],
+            orders?: boolean|string|(boolean|string)[]
+        ): T[];
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<W extends Object, T>(
+            collection: Dictionary<T>,
+            iteratees: DictionaryIterator<T, any>|string|W|(DictionaryIterator<T, any>|string|W)[],
+            orders?: boolean|string|(boolean|string)[]
+        ): T[];
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            collection: Dictionary<T>,
+            iteratees: DictionaryIterator<T, any>|string|Object|(DictionaryIterator<T, any>|string|Object)[],
+            orders?: boolean|string|(boolean|string)[]
+        ): T[];
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.orderBy
+         */
+        orderBy(
+            iteratees: ListIterator<T, any>|string|(ListIterator<T, any>|string)[],
+            orders?: boolean|string|(boolean|string)[]
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.orderBy
+         */
+        orderBy<W extends Object>(
+            iteratees: ListIterator<T, any>|string|W|(ListIterator<T, any>|string|W)[],
+            orders?: boolean|string|(boolean|string)[]
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.orderBy
+         */
+        orderBy<W extends Object, T>(
+            iteratees: ListIterator<T, any>|string|W|(ListIterator<T, any>|string|W)[],
+            orders?: boolean|string|(boolean|string)[]
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            iteratees: ListIterator<T, any>|string|Object|(ListIterator<T, any>|string|Object)[],
+            orders?: boolean|string|(boolean|string)[]
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<W extends Object, T>(
+            iteratees: NumericDictionaryIterator<T, any>|string|W|(NumericDictionaryIterator<T, any>|string|W)[],
+            orders?: boolean|string|(boolean|string)[]
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            iteratees: NumericDictionaryIterator<T, any>|string|Object|(NumericDictionaryIterator<T, any>|string|Object)[],
+            orders?: boolean|string|(boolean|string)[]
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<W extends Object, T>(
+            iteratees: DictionaryIterator<T, any>|string|W|(DictionaryIterator<T, any>|string|W)[],
+            orders?: boolean|string|(boolean|string)[]
+        ): LoDashImplicitArrayWrapper<T>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            iteratees: DictionaryIterator<T, any>|string|Object|(DictionaryIterator<T, any>|string|Object)[],
+            orders?: boolean|string|(boolean|string)[]
+        ): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.orderBy
+         */
+        orderBy(
+            iteratees: ListIterator<T, any>|string|(ListIterator<T, any>|string)[],
+            orders?: boolean|string|(boolean|string)[]
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.orderBy
+         */
+        orderBy<W extends Object>(
+            iteratees: ListIterator<T, any>|string|W|(ListIterator<T, any>|string|W)[],
+            orders?: boolean|string|(boolean|string)[]
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.orderBy
+         */
+        orderBy<W extends Object, T>(
+            iteratees: ListIterator<T, any>|string|W|(ListIterator<T, any>|string|W)[],
+            orders?: boolean|string|(boolean|string)[]
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            iteratees: ListIterator<T, any>|string|Object|(ListIterator<T, any>|string|Object)[],
+            orders?: boolean|string|(boolean|string)[]
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<W extends Object, T>(
+            iteratees: NumericDictionaryIterator<T, any>|string|W|(NumericDictionaryIterator<T, any>|string|W)[],
+            orders?: boolean|string|(boolean|string)[]
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            iteratees: NumericDictionaryIterator<T, any>|string|Object|(NumericDictionaryIterator<T, any>|string|Object)[],
+            orders?: boolean|string|(boolean|string)[]
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<W extends Object, T>(
+            iteratees: DictionaryIterator<T, any>|string|W|(DictionaryIterator<T, any>|string|W)[],
+            orders?: boolean|string|(boolean|string)[]
+        ): LoDashExplicitArrayWrapper<T>;
+
+        /**
+         * @see _.orderBy
+         */
+        orderBy<T>(
+            iteratees: DictionaryIterator<T, any>|string|Object|(DictionaryIterator<T, any>|string|Object)[],
+            orders?: boolean|string|(boolean|string)[]
+        ): LoDashExplicitArrayWrapper<T>;
+    }
+
+    /********
+     * Date *
+     ********/
+
+    //_.now
+    interface LoDashStatic {
+        /**
+         * Gets the number of milliseconds that have elapsed since the Unix epoch (1 January 1970 00:00:00 UTC).
+         *
+         * @return The number of milliseconds.
+         */
+        now(): number;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.now
+         */
+        now(): number;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.now
+         */
+        now(): LoDashExplicitWrapper<number>;
+    }
+
+    /*************
+     * Functions *
+     *************/
+
+    //_.after
+    interface LoDashStatic {
+        /**
+         * The opposite of _.before; this method creates a function that invokes func once it’s called n or more times.
+         *
+         * @param n The number of calls before func is invoked.
+         * @param func The function to restrict.
+         * @return Returns the new restricted function.
+         */
+        after<TFunc extends Function>(
+            n: number,
+            func: TFunc
+        ): TFunc;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+        * @see _.after
+        **/
+        after<TFunc extends Function>(func: TFunc): LoDashImplicitObjectWrapper<TFunc>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.after
+         **/
+        after<TFunc extends Function>(func: TFunc): LoDashExplicitObjectWrapper<TFunc>;
+    }
+
+    //_.ary
+    interface LoDashStatic {
+        /**
+         * Creates a function that accepts up to n arguments ignoring any additional arguments.
+         *
+         * @param func The function to cap arguments for.
+         * @param n The arity cap.
+         * @returns Returns the new function.
+         */
+        ary<TResult extends Function>(
+            func: Function,
+            n?: number
+        ): TResult;
+
+        ary<T extends Function, TResult extends Function>(
+            func: T,
+            n?: number
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.ary
+         */
+        ary<TResult extends Function>(n?: number): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.ary
+         */
+        ary<TResult extends Function>(n?: number): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.before
+    interface LoDashStatic {
+        /**
+         * Creates a function that invokes func, with the this binding and arguments of the created function, while
+         * it’s called less than n times. Subsequent calls to the created function return the result of the last func
+         * invocation.
+         *
+         * @param n The number of calls at which func is no longer invoked.
+         * @param func The function to restrict.
+         * @return Returns the new restricted function.
+         */
+        before<TFunc extends Function>(
+            n: number,
+            func: TFunc
+        ): TFunc;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.before
+         **/
+        before<TFunc extends Function>(func: TFunc): LoDashImplicitObjectWrapper<TFunc>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.before
+         **/
+        before<TFunc extends Function>(func: TFunc): LoDashExplicitObjectWrapper<TFunc>;
+    }
+
+    //_.bind
+    interface FunctionBind {
+        placeholder: any;
+
+        <T extends Function, TResult extends Function>(
+            func: T,
+            thisArg: any,
+            ...partials: any[]
+        ): TResult;
+
+        <TResult extends Function>(
+            func: Function,
+            thisArg: any,
+            ...partials: any[]
+        ): TResult;
+    }
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that invokes func with the this binding of thisArg and prepends any additional _.bind
+         * arguments to those provided to the bound function.
+         *
+         * The _.bind.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder for
+         * partially applied arguments.
+         *
+         * Note: Unlike native Function#bind this method does not set the "length" property of bound functions.
+         *
+         * @param func The function to bind.
+         * @param thisArg The this binding of func.
+         * @param partials The arguments to be partially applied.
+         * @return Returns the new bound function.
+         */
+        bind: FunctionBind;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.bind
+         */
+        bind<TResult extends Function>(
+            thisArg: any,
+            ...partials: any[]
+        ): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.bind
+         */
+        bind<TResult extends Function>(
+            thisArg: any,
+            ...partials: any[]
+        ): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.bindAll
+    interface LoDashStatic {
+        /**
+         * Binds methods of an object to the object itself, overwriting the existing method. Method names may be
+         * specified as individual arguments or as arrays of method names. If no method names are provided all
+         * enumerable function properties, own and inherited, of object are bound.
+         *
+         * Note: This method does not set the "length" property of bound functions.
+         *
+         * @param object The object to bind and assign the bound methods to.
+         * @param methodNames The object method names to bind, specified as individual method names or arrays of
+         * method names.
+         * @return Returns object.
+         */
+        bindAll<T>(
+            object: T,
+            ...methodNames: (string|string[])[]
+        ): T;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.bindAll
+         */
+        bindAll(...methodNames: (string|string[])[]): LoDashImplicitObjectWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.bindAll
+         */
+        bindAll(...methodNames: (string|string[])[]): LoDashExplicitObjectWrapper<T>;
+    }
+
+    //_.bindKey
+    interface FunctionBindKey {
+        placeholder: any;
+
+        <T extends Object, TResult extends Function>(
+            object: T,
+            key: any,
+            ...partials: any[]
+        ): TResult;
+
+        <TResult extends Function>(
+            object: Object,
+            key: any,
+            ...partials: any[]
+        ): TResult;
+    }
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that invokes the method at object[key] and prepends any additional _.bindKey arguments
+         * to those provided to the bound function.
+         *
+         * This method differs from _.bind by allowing bound functions to reference methods that may be redefined
+         * or don’t yet exist. See Peter Michaux’s article for more details.
+         *
+         * The _.bindKey.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder
+         * for partially applied arguments.
+         *
+         * @param object The object the method belongs to.
+         * @param key The key of the method.
+         * @param partials The arguments to be partially applied.
+         * @return Returns the new bound function.
+         */
+        bindKey: FunctionBindKey;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.bindKey
+         */
+        bindKey<TResult extends Function>(
+            key: any,
+            ...partials: any[]
+        ): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.bindKey
+         */
+        bindKey<TResult extends Function>(
+            key: any,
+            ...partials: any[]
+        ): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.createCallback
+    interface LoDashStatic {
+        /**
+        * Produces a callback bound to an optional thisArg. If func is a property name the created
+        * callback will return the property value for a given element. If func is an object the created
+        * callback will return true for elements that contain the equivalent object properties,
+        * otherwise it will return false.
+        * @param func The value to convert to a callback.
+        * @param thisArg The this binding of the created callback.
+        * @param argCount The number of arguments the callback accepts.
+        * @return A callback function.
+        **/
+        createCallback(
+            func: string,
+            argCount?: number): () => any;
+
+        /**
+        * @see _.createCallback
+        **/
+        createCallback(
+            func: Dictionary<any>,
+            argCount?: number): () => boolean;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+        * @see _.createCallback
+        **/
+        createCallback(
+            argCount?: number): LoDashImplicitObjectWrapper<() => any>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+        * @see _.createCallback
+        **/
+        createCallback(
+            argCount?: number): LoDashImplicitObjectWrapper<() => any>;
+    }
+
+    //_.curry
+    interface LoDashStatic {
+        /**
+         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+         * @param func The function to curry.
+         * @return Returns the new curried function.
+         */
+        curry<T1, R>(func: (t1: T1) => R):
+            CurriedFunction1<T1, R>;
+        /**
+         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+         * @param func The function to curry.
+         * @return Returns the new curried function.
+         */
+        curry<T1, T2, R>(func: (t1: T1, t2: T2) => R):
+            CurriedFunction2<T1, T2, R>;
+        /**
+         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+         * @param func The function to curry.
+         * @return Returns the new curried function.
+         */
+        curry<T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R):
+            CurriedFunction3<T1, T2, T3, R>;
+        /**
+         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+         * @param func The function to curry.
+         * @return Returns the new curried function.
+         */
+        curry<T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R):
+            CurriedFunction4<T1, T2, T3, T4, R>;
+        /**
+         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+         * @param func The function to curry.
+         * @return Returns the new curried function.
+         */
+        curry<T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R):
+            CurriedFunction5<T1, T2, T3, T4, T5, R>;
+        /**
+         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+         * @param func The function to curry.
+         * @param arity The arity of func.
+         * @return Returns the new curried function.
+         */
+        curry<TResult extends Function>(
+          func: Function,
+          arity?: number): TResult;
+    }
+
+    interface CurriedFunction1<T1, R> {
+        (): CurriedFunction1<T1, R>;
+        (t1: T1): R;
+    }
+
+    interface CurriedFunction2<T1, T2, R> {
+        (): CurriedFunction2<T1, T2, R>;
+        (t1: T1): CurriedFunction1<T2, R>;
+        (t1: T1, t2: T2): R;
+    }
+
+    interface CurriedFunction3<T1, T2, T3, R> {
+        (): CurriedFunction3<T1, T2, T3, R>;
+        (t1: T1): CurriedFunction2<T2, T3, R>;
+        (t1: T1, t2: T2): CurriedFunction1<T3, R>;
+        (t1: T1, t2: T2, t3: T3): R;
+    }
+
+    interface CurriedFunction4<T1, T2, T3, T4, R> {
+        (): CurriedFunction4<T1, T2, T3, T4, R>;
+        (t1: T1): CurriedFunction3<T2, T3, T4, R>;
+        (t1: T1, t2: T2): CurriedFunction2<T3, T4, R>;
+        (t1: T1, t2: T2, t3: T3): CurriedFunction1<T4, R>;
+        (t1: T1, t2: T2, t3: T3, t4: T4): R;
+    }
+
+    interface CurriedFunction5<T1, T2, T3, T4, T5, R> {
+        (): CurriedFunction5<T1, T2, T3, T4, T5, R>;
+        (t1: T1): CurriedFunction4<T2, T3, T4, T5, R>;
+        (t1: T1, t2: T2): CurriedFunction3<T3, T4, T5, R>;
+        (t1: T1, t2: T2, t3: T3): CurriedFunction2<T4, T5, R>;
+        (t1: T1, t2: T2, t3: T3, t4: T4): CurriedFunction1<T5, R>;
+        (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5): R;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+        * @see _.curry
+        **/
+        curry<TResult extends Function>(arity?: number): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    //_.curryRight
+    interface LoDashStatic {
+        /**
+         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+         * instead of _.partial.
+         * @param func The function to curry.
+         * @return Returns the new curried function.
+         */
+        curryRight<T1, R>(func: (t1: T1) => R):
+            CurriedFunction1<T1, R>;
+        /**
+         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+         * instead of _.partial.
+         * @param func The function to curry.
+         * @return Returns the new curried function.
+         */
+        curryRight<T1, T2, R>(func: (t1: T1, t2: T2) => R):
+            CurriedFunction2<T2, T1, R>;
+        /**
+         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+         * instead of _.partial.
+         * @param func The function to curry.
+         * @return Returns the new curried function.
+         */
+        curryRight<T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R):
+            CurriedFunction3<T3, T2, T1, R>;
+        /**
+         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+         * instead of _.partial.
+         * @param func The function to curry.
+         * @return Returns the new curried function.
+         */
+        curryRight<T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R):
+            CurriedFunction4<T4, T3, T2, T1, R>;
+        /**
+         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+         * instead of _.partial.
+         * @param func The function to curry.
+         * @return Returns the new curried function.
+         */
+        curryRight<T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R):
+            CurriedFunction5<T5, T4, T3, T2, T1, R>;
+        /**
+         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+         * instead of _.partial.
+         * @param func The function to curry.
+         * @param arity The arity of func.
+         * @return Returns the new curried function.
+         */
+        curryRight<TResult extends Function>(
+          func: Function,
+          arity?: number): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.curryRight
+         **/
+        curryRight<TResult extends Function>(arity?: number): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    //_.debounce
+    interface DebounceSettings {
+        /**
+         * Specify invoking on the leading edge of the timeout.
+         */
+        leading?: boolean;
+
+        /**
+         * The maximum time func is allowed to be delayed before it’s invoked.
+         */
+        maxWait?: number;
+
+        /**
+         * Specify invoking on the trailing edge of the timeout.
+         */
+        trailing?: boolean;
+    }
+
+    interface LoDashStatic {
+        /**
+         * Creates a debounced function that delays invoking func until after wait milliseconds have elapsed since
+         * the last time the debounced function was invoked. The debounced function comes with a cancel method to
+         * cancel delayed invocations. Provide an options object to indicate that func should be invoked on the
+         * leading and/or trailing edge of the wait timeout. Subsequent calls to the debounced function return the
+         * result of the last func invocation.
+         *
+         * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only
+         * if the the debounced function is invoked more than once during the wait timeout.
+         *
+         * See David Corbacho’s article for details over the differences between _.debounce and _.throttle.
+         *
+         * @param func The function to debounce.
+         * @param wait The number of milliseconds to delay.
+         * @param options The options object.
+         * @param options.leading Specify invoking on the leading edge of the timeout.
+         * @param options.maxWait The maximum time func is allowed to be delayed before it’s invoked.
+         * @param options.trailing Specify invoking on the trailing edge of the timeout.
+         * @return Returns the new debounced function.
+         */
+        debounce<T extends Function>(
+            func: T,
+            wait?: number,
+            options?: DebounceSettings
+        ): T & Cancelable;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.debounce
+         */
+        debounce(
+            wait?: number,
+            options?: DebounceSettings
+        ): LoDashImplicitObjectWrapper<T & Cancelable>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.debounce
+         */
+        debounce(
+            wait?: number,
+            options?: DebounceSettings
+        ): LoDashExplicitObjectWrapper<T & Cancelable>;
+    }
+
+    //_.defer
+    interface LoDashStatic {
+        /**
+         * Defers invoking the func until the current call stack has cleared. Any additional arguments are provided to
+         * func when it’s invoked.
+         *
+         * @param func The function to defer.
+         * @param args The arguments to invoke the function with.
+         * @return Returns the timer id.
+         */
+        defer<T extends Function>(
+            func: T,
+            ...args: any[]
+        ): number;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.defer
+         */
+        defer(...args: any[]): LoDashImplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.defer
+         */
+        defer(...args: any[]): LoDashExplicitWrapper<number>;
+    }
+
+    //_.delay
+    interface LoDashStatic {
+        /**
+         * Invokes func after wait milliseconds. Any additional arguments are provided to func when it’s invoked.
+         *
+         * @param func The function to delay.
+         * @param wait The number of milliseconds to delay invocation.
+         * @param args The arguments to invoke the function with.
+         * @return Returns the timer id.
+         */
+        delay<T extends Function>(
+            func: T,
+            wait: number,
+            ...args: any[]
+        ): number;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.delay
+         */
+        delay(
+            wait: number,
+            ...args: any[]
+        ): LoDashImplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.delay
+         */
+        delay(
+            wait: number,
+            ...args: any[]
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that invokes `func` with arguments reversed.
+         *
+         * @static
+         * @memberOf _
+         * @category Function
+         * @param {Function} func The function to flip arguments for.
+         * @returns {Function} Returns the new function.
+         * @example
+         *
+         * var flipped = _.flip(function() {
+         *   return _.toArray(arguments);
+         * });
+         *
+         * flipped('a', 'b', 'c', 'd');
+         * // => ['d', 'c', 'b', 'a']
+         */
+        flip<T extends Function>(func: T): T;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.flip
+         */
+        flip(): LoDashImplicitObjectWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.flip
+         */
+        flip(): LoDashExplicitObjectWrapper<T>;
+    }
+
+    //_.flow
+    interface LoDashStatic {
+        /**
+         * Creates a function that returns the result of invoking the provided functions with the this binding of the
+         * created function, where each successive invocation is supplied the return value of the previous.
+         *
+         * @param funcs Functions to invoke.
+         * @return Returns the new function.
+         */
+        flow<TResult extends Function>(...funcs: Function[]): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.flow
+         */
+        flow<TResult extends Function>(...funcs: Function[]): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.flow
+         */
+        flow<TResult extends Function>(...funcs: Function[]): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.flowRight
+    interface LoDashStatic {
+        /**
+         * This method is like _.flow except that it creates a function that invokes the provided functions from right
+         * to left.
+         *
+         * @param funcs Functions to invoke.
+         * @return Returns the new function.
+         */
+        flowRight<TResult extends Function>(...funcs: Function[]): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.flowRight
+         */
+        flowRight<TResult extends Function>(...funcs: Function[]): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.flowRight
+         */
+        flowRight<TResult extends Function>(...funcs: Function[]): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+
+    //_.memoize
+    interface MemoizedFunction extends Function {
+        cache: MapCache;
+    }
+
+    interface LoDashStatic {
+        /**
+         * Creates a function that memoizes the result of func. If resolver is provided it determines the cache key for
+         * storing the result based on the arguments provided to the memoized function. By default, the first argument
+         * provided to the memoized function is coerced to a string and used as the cache key. The func is invoked with
+         * the this binding of the memoized function.
+         *
+         * @param func The function to have its output memoized.
+         * @param resolver The function to resolve the cache key.
+         * @return Returns the new memoizing function.
+         */
+        memoize: {
+            <T extends Function>(func: T, resolver?: Function): T & MemoizedFunction;
+            Cache: MapCache;
+        }
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.memoize
+         */
+        memoize(resolver?: Function): LoDashImplicitObjectWrapper<T & MemoizedFunction>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.memoize
+         */
+        memoize(resolver?: Function): LoDashExplicitObjectWrapper<T & MemoizedFunction>;
+    }
+
+    //_.overArgs (was _.modArgs)
+    interface LoDashStatic {
+        /**
+         * Creates a function that runs each argument through a corresponding transform function.
+         *
+         * @param func The function to wrap.
+         * @param transforms The functions to transform arguments, specified as individual functions or arrays
+         * of functions.
+         * @return Returns the new function.
+         */
+        overArgs<T extends Function, TResult extends Function>(
+            func: T,
+            ...transforms: Function[]
+        ): TResult;
+
+        /**
+         * @see _.overArgs
+         */
+        overArgs<T extends Function, TResult extends Function>(
+            func: T,
+            transforms: Function[]
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.overArgs
+         */
+        overArgs<TResult extends Function>(...transforms: Function[]): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.overArgs
+         */
+        overArgs<TResult extends Function>(transforms: Function[]): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.overArgs
+         */
+        overArgs<TResult extends Function>(...transforms: Function[]): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.overArgs
+         */
+        overArgs<TResult extends Function>(transforms: Function[]): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.negate
+    interface LoDashStatic {
+        /**
+         * Creates a function that negates the result of the predicate func. The func predicate is invoked with
+         * the this binding and arguments of the created function.
+         *
+         * @param predicate The predicate to negate.
+         * @return Returns the new function.
+         */
+        negate<T extends Function>(predicate: T): (...args: any[]) => boolean;
+
+        /**
+         * @see _.negate
+         */
+        negate<T extends Function, TResult extends Function>(predicate: T): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.negate
+         */
+        negate(): LoDashImplicitObjectWrapper<(...args: any[]) => boolean>;
+
+        /**
+         * @see _.negate
+         */
+        negate<TResult extends Function>(): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.negate
+         */
+        negate(): LoDashExplicitObjectWrapper<(...args: any[]) => boolean>;
+
+        /**
+         * @see _.negate
+         */
+        negate<TResult extends Function>(): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.once
+    interface LoDashStatic {
+        /**
+         * Creates a function that is restricted to invoking func once. Repeat calls to the function return the value
+         * of the first call. The func is invoked with the this binding and arguments of the created function.
+         *
+         * @param func The function to restrict.
+         * @return Returns the new restricted function.
+         */
+        once<T extends Function>(func: T): T;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.once
+         */
+        once(): LoDashImplicitObjectWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.once
+         */
+        once(): LoDashExplicitObjectWrapper<T>;
+    }
+
+    //_.partial
+    interface LoDashStatic {
+        /**
+        * Creates a function that, when called, invokes func with any additional partial arguments
+        * prepended to those provided to the new function. This method is similar to _.bind except
+        * it does not alter the this binding.
+        * @param func The function to partially apply arguments to.
+        * @param args Arguments to be partially applied.
+        * @return The new partially applied function.
+        **/
+        partial: Partial;
+    }
+
+    type PH = LoDashStatic;
+
+    interface Function0<R> {
+        (): R;
+    }
+    interface Function1<T1, R> {
+        (t1: T1): R;
+    }
+    interface Function2<T1, T2, R> {
+        (t1: T1, t2: T2): R;
+    }
+    interface Function3<T1, T2, T3, R> {
+        (t1: T1, t2: T2, t3: T3): R;
+    }
+    interface Function4<T1, T2, T3, T4, R> {
+        (t1: T1, t2: T2, t3: T3, t4: T4): R;
+    }
+
+    interface Partial {
+        // arity 0
+        <R>(func: Function0<R>): Function0<R>;
+        // arity 1
+        <T1, R>(func: Function1<T1, R>): Function1<T1, R>;
+        <T1, R>(func: Function1<T1, R>, arg1: T1): Function0<R>;
+        // arity 2
+        <T1, T2, R>(func: Function2<T1, T2, R>):                      Function2<T1, T2, R>;
+        <T1, T2, R>(func: Function2<T1, T2, R>, arg1: T1):            Function1<    T2, R>;
+        <T1, T2, R>(func: Function2<T1, T2, R>, plc1: PH, arg2: T2):  Function1<T1,     R>;
+        <T1, T2, R>(func: Function2<T1, T2, R>, arg1: T1, arg2: T2):  Function0<        R>;
+        // arity 3
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>):                                Function3<T1, T2, T3, R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1):                      Function2<    T2, T3, R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, plc1: PH, arg2: T2):            Function2<T1,     T3, R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, arg2: T2):            Function1<        T3, R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, plc1: PH, plc2: PH, arg3: T3):  Function2<T1, T2,     R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, plc2: PH, arg3: T3):  Function1<    T2,     R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, plc1: PH, arg2: T2, arg3: T3):  Function1<T1,         R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, arg2: T2, arg3: T3):  Function0<            R>;
+        // arity 4
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>):                                          Function4<T1, T2, T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1):                                Function3<    T2, T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, arg2: T2):                      Function3<T1,     T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2):                      Function2<        T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, plc2: PH, arg3: T3):            Function3<T1, T2,     T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, arg3: T3):            Function2<    T2,     T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, arg2: T2, arg3: T3):            Function2<T1,         T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3):            Function1<            T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, plc2: PH, plc3: PH, arg4: T4):  Function3<T1, T2, T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  Function2<    T2, T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, arg2: T2, plc3: PH, arg4: T4):  Function2<T1,     T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  Function1<        T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, plc2: PH, arg3: T3, arg4: T4):  Function2<T1, T2,         R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  Function1<    T2,         R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, arg2: T2, arg3: T3, arg4: T4):  Function1<T1,             R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  Function0<                R>;
+        // catch-all
+        (func: Function, ...args: any[]): Function;
+    }
+
+    //_.partialRight
+    interface LoDashStatic {
+        /**
+        * This method is like _.partial except that partial arguments are appended to those provided
+        * to the new function.
+        * @param func The function to partially apply arguments to.
+        * @param args Arguments to be partially applied.
+        * @return The new partially applied function.
+        **/
+        partialRight: PartialRight
+    }
+
+    interface PartialRight {
+        // arity 0
+        <R>(func: Function0<R>): Function0<R>;
+        // arity 1
+        <T1, R>(func: Function1<T1, R>): Function1<T1, R>;
+        <T1, R>(func: Function1<T1, R>, arg1: T1): Function0<R>;
+        // arity 2
+        <T1, T2, R>(func: Function2<T1, T2, R>):                      Function2<T1, T2, R>;
+        <T1, T2, R>(func: Function2<T1, T2, R>, arg1: T1, plc2: PH):  Function1<    T2, R>;
+        <T1, T2, R>(func: Function2<T1, T2, R>,           arg2: T2):  Function1<T1,     R>;
+        <T1, T2, R>(func: Function2<T1, T2, R>, arg1: T1, arg2: T2):  Function0<        R>;
+        // arity 3
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>):                                Function3<T1, T2, T3, R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, plc2: PH, plc3: PH):  Function2<    T2, T3, R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>,           arg2: T2, plc3: PH):  Function2<T1,     T3, R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, arg2: T2, plc3: PH):  Function1<        T3, R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>,                     arg3: T3):  Function2<T1, T2,     R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, plc2: PH, arg3: T3):  Function1<    T2,     R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>,           arg2: T2, arg3: T3):  Function1<T1,         R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, arg2: T2, arg3: T3):  Function0<            R>;
+        // arity 4
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>):                                          Function4<T1, T2, T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, plc3: PH, plc4: PH):  Function3<    T2, T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, plc3: PH, plc4: PH):  Function3<T1,     T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, plc3: PH, plc4: PH):  Function2<        T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,                     arg3: T3, plc4: PH):  Function3<T1, T2,     T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, arg3: T3, plc4: PH):  Function2<    T2,     T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, arg3: T3, plc4: PH):  Function2<T1,         T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3, plc4: PH):  Function1<            T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,                               arg4: T4):  Function3<T1, T2, T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  Function2<    T2, T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, plc3: PH, arg4: T4):  Function2<T1,     T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  Function1<        T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,                     arg3: T3, arg4: T4):  Function2<T1, T2,         R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  Function1<    T2,         R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, arg3: T3, arg4: T4):  Function1<T1,             R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  Function0<                R>;
+        // catch-all
+        (func: Function, ...args: any[]): Function;
+    }
+
+    //_.rearg
+    interface LoDashStatic {
+        /**
+         * Creates a function that invokes func with arguments arranged according to the specified indexes where the
+         * argument value at the first index is provided as the first argument, the argument value at the second index
+         * is provided as the second argument, and so on.
+         * @param func The function to rearrange arguments for.
+         * @param indexes The arranged argument indexes, specified as individual indexes or arrays of indexes.
+         * @return Returns the new function.
+         */
+        rearg<TResult extends Function>(func: Function, indexes: number[]): TResult;
+
+        /**
+         * @see _.rearg
+         */
+        rearg<TResult extends Function>(func: Function, ...indexes: number[]): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.rearg
+         */
+        rearg<TResult extends Function>(indexes: number[]): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.rearg
+         */
+        rearg<TResult extends Function>(...indexes: number[]): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    //_.rest
+    interface LoDashStatic {
+        /**
+         * Creates a function that invokes func with the this binding of the created function and arguments from start
+         * and beyond provided as an array.
+         *
+         * Note: This method is based on the rest parameter.
+         *
+         * @param func The function to apply a rest parameter to.
+         * @param start The start position of the rest parameter.
+         * @return Returns the new function.
+         */
+        rest<TResult extends Function>(
+            func: Function,
+            start?: number
+        ): TResult;
+
+        /**
+         * @see _.rest
+         */
+        rest<TResult extends Function, TFunc extends Function>(
+            func: TFunc,
+            start?: number
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.rest
+         */
+        rest<TResult extends Function>(start?: number): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.rest
+         */
+        rest<TResult extends Function>(start?: number): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.spread
+    interface LoDashStatic {
+        /**
+         * Creates a function that invokes func with the this binding of the created function and an array of arguments
+         * much like Function#apply.
+         *
+         * Note: This method is based on the spread operator.
+         *
+         * @param func The function to spread arguments over.
+         * @return Returns the new function.
+         */
+        spread<F extends Function, T extends Function>(func: F): T;
+
+        /**
+         * @see _.spread
+         */
+        spread<T extends Function>(func: Function): T;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.spread
+         */
+        spread<T extends Function>(): LoDashImplicitObjectWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.spread
+         */
+        spread<T extends Function>(): LoDashExplicitObjectWrapper<T>;
+    }
+
+    //_.throttle
+    interface ThrottleSettings {
+        /**
+         * If you'd like to disable the leading-edge call, pass this as false.
+         */
+        leading?: boolean;
+
+        /**
+         * If you'd like to disable the execution on the trailing-edge, pass false.
+         */
+        trailing?: boolean;
+    }
+
+    interface LoDashStatic {
+        /**
+         * Creates a throttled function that only invokes func at most once per every wait milliseconds. The throttled
+         * function comes with a cancel method to cancel delayed invocations. Provide an options object to indicate
+         * that func should be invoked on the leading and/or trailing edge of the wait timeout. Subsequent calls to
+         * the throttled function return the result of the last func call.
+         *
+         * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only if
+         * the the throttled function is invoked more than once during the wait timeout.
+         *
+         * @param func The function to throttle.
+         * @param wait The number of milliseconds to throttle invocations to.
+         * @param options The options object.
+         * @param options.leading Specify invoking on the leading edge of the timeout.
+         * @param options.trailing Specify invoking on the trailing edge of the timeout.
+         * @return Returns the new throttled function.
+         */
+        throttle<T extends Function>(
+            func: T,
+            wait?: number,
+            options?: ThrottleSettings
+        ): T & Cancelable;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.throttle
+         */
+        throttle(
+            wait?: number,
+            options?: ThrottleSettings
+        ): LoDashImplicitObjectWrapper<T & Cancelable>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.throttle
+         */
+        throttle(
+            wait?: number,
+            options?: ThrottleSettings
+        ): LoDashExplicitObjectWrapper<T & Cancelable>;
+    }
+
+    //_.unary
+    interface LoDashStatic {
+        /**
+         * Creates a function that accepts up to one argument, ignoring any
+         * additional arguments.
+         *
+         * @static
+         * @memberOf _
+         * @category Function
+         * @param {Function} func The function to cap arguments for.
+         * @returns {Function} Returns the new function.
+         * @example
+         *
+         * _.map(['6', '8', '10'], _.unary(parseInt));
+         * // => [6, 8, 10]
+         */
+        unary<T extends Function>(func: T): T;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.unary
+         */
+        unary(): LoDashImplicitObjectWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.unary
+         */
+        unary(): LoDashExplicitObjectWrapper<T>;
+    }
+
+    //_.wrap
+    interface LoDashStatic {
+        /**
+         * Creates a function that provides value to the wrapper function as its first argument. Any additional
+         * arguments provided to the function are appended to those provided to the wrapper function. The wrapper is
+         * invoked with the this binding of the created function.
+         *
+         * @param value The value to wrap.
+         * @param wrapper The wrapper function.
+         * @return Returns the new function.
+         */
+        wrap<V, W extends Function, R extends Function>(
+            value: V,
+            wrapper: W
+        ): R;
+
+        /**
+         * @see _.wrap
+         */
+        wrap<V, R extends Function>(
+            value: V,
+            wrapper: Function
+        ): R;
+
+        /**
+         * @see _.wrap
+         */
+        wrap<R extends Function>(
+            value: any,
+            wrapper: Function
+        ): R;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.wrap
+         */
+        wrap<W extends Function, R extends Function>(wrapper: W): LoDashImplicitObjectWrapper<R>;
+
+        /**
+         * @see _.wrap
+         */
+        wrap<R extends Function>(wrapper: Function): LoDashImplicitObjectWrapper<R>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.wrap
+         */
+        wrap<W extends Function, R extends Function>(wrapper: W): LoDashImplicitObjectWrapper<R>;
+
+        /**
+         * @see _.wrap
+         */
+        wrap<R extends Function>(wrapper: Function): LoDashImplicitObjectWrapper<R>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.wrap
+         */
+        wrap<W extends Function, R extends Function>(wrapper: W): LoDashImplicitObjectWrapper<R>;
+
+        /**
+         * @see _.wrap
+         */
+        wrap<R extends Function>(wrapper: Function): LoDashImplicitObjectWrapper<R>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.wrap
+         */
+        wrap<W extends Function, R extends Function>(wrapper: W): LoDashExplicitObjectWrapper<R>;
+
+        /**
+         * @see _.wrap
+         */
+        wrap<R extends Function>(wrapper: Function): LoDashExplicitObjectWrapper<R>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.wrap
+         */
+        wrap<W extends Function, R extends Function>(wrapper: W): LoDashExplicitObjectWrapper<R>;
+
+        /**
+         * @see _.wrap
+         */
+        wrap<R extends Function>(wrapper: Function): LoDashExplicitObjectWrapper<R>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.wrap
+         */
+        wrap<W extends Function, R extends Function>(wrapper: W): LoDashExplicitObjectWrapper<R>;
+
+        /**
+         * @see _.wrap
+         */
+        wrap<R extends Function>(wrapper: Function): LoDashExplicitObjectWrapper<R>;
+    }
+
+    /********
+     * Lang *
+     ********/
+
+    //_.castArray
+    interface LoDashStatic {
+        /**
+         * Casts value as an array if it’s not one.
+         *
+         * @param value The value to inspect.
+         * @return Returns the cast array.
+         */
+        castArray<T>(value: T): T[];
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.castArray
+         */
+        castArray(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.castArray
+         */
+        castArray(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.castArray
+         */
+        castArray(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.castArray
+         */
+        castArray(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.castArray
+         */
+        castArray(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.castArray
+         */
+        castArray(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.clone
+    interface LoDashStatic {
+        /**
+         * Creates a shallow clone of value.
+         *
+         * Note: This method is loosely based on the structured clone algorithm and supports cloning arrays,
+         * array buffers, booleans, date objects, maps, numbers, Object objects, regexes, sets, strings, symbols,
+         * and typed arrays. The own enumerable properties of arguments objects are cloned as plain objects. An empty
+         * object is returned for uncloneable values such as error objects, functions, DOM nodes, and WeakMaps.
+         *
+         * @param value The value to clone.
+         * @return Returns the cloned value.
+         */
+        clone<T>(value: T): T;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.clone
+         */
+        clone(): T;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+
+        /**
+         * @see _.clone
+         */
+        clone(): T[];
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.clone
+         */
+        clone(): T;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.clone
+         */
+        clone(): LoDashExplicitWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+
+        /**
+         * @see _.clone
+         */
+        clone(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.clone
+         */
+        clone(): LoDashExplicitObjectWrapper<T>;
+    }
+
+    //_.cloneDeep
+    interface LoDashStatic {
+        /**
+         * This method is like _.clone except that it recursively clones value.
+         *
+         * @param value The value to recursively clone.
+         * @return Returns the deep cloned value.
+         */
+        cloneDeep<T>(value: T): T;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.cloneDeep
+         */
+        cloneDeep(): T;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.cloneDeep
+         */
+        cloneDeep(): T[];
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.cloneDeep
+         */
+        cloneDeep(): T;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.cloneDeep
+         */
+        cloneDeep(): LoDashExplicitWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.cloneDeep
+         */
+        cloneDeep(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.cloneDeep
+         */
+        cloneDeep(): LoDashExplicitObjectWrapper<T>;
+    }
+
+    //_.cloneDeepWith
+    interface CloneDeepWithCustomizer<TValue, TResult> {
+        (value: TValue): TResult;
+    }
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.cloneWith except that it recursively clones value.
+         *
+         * @param value The value to recursively clone.
+         * @param customizer The function to customize cloning.
+         * @return Returns the deep cloned value.
+         */
+        cloneDeepWith<TResult>(
+            value: any,
+            customizer?: CloneDeepWithCustomizer<any, TResult>
+        ): TResult;
+
+        /**
+         * @see _.clonDeepeWith
+         */
+        cloneDeepWith<T, TResult>(
+            value: T,
+            customizer?: CloneDeepWithCustomizer<T, TResult>
+        ): TResult;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.cloneDeepWith
+         */
+        cloneDeepWith<TResult>(
+            customizer?: CloneDeepWithCustomizer<T, TResult>
+        ): TResult;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.cloneDeepWith
+         */
+        cloneDeepWith<TResult>(
+            customizer?: CloneDeepWithCustomizer<T[], TResult>
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.cloneDeepWith
+         */
+        cloneDeepWith<TResult>(
+            customizer?: CloneDeepWithCustomizer<T, TResult>
+        ): TResult;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.cloneDeepWith
+         */
+        cloneDeepWith<TResult extends (number|string|boolean)>(
+            customizer?: CloneDeepWithCustomizer<T, TResult>
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+         * @see _.cloneDeepWith
+         */
+        cloneDeepWith<TResult>(
+            customizer?: CloneDeepWithCustomizer<T, TResult[]>
+        ): LoDashExplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.cloneDeepWith
+         */
+        cloneDeepWith<TResult extends Object>(
+            customizer?: CloneDeepWithCustomizer<T, TResult>
+        ): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.cloneDeepWith
+         */
+        cloneDeepWith<TResult extends (number|string|boolean)>(
+            customizer?: CloneDeepWithCustomizer<T[], TResult>
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+         * @see _.cloneDeepWith
+         */
+        cloneDeepWith<TResult>(
+            customizer?: CloneDeepWithCustomizer<T[], TResult[]>
+        ): LoDashExplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.cloneDeepWith
+         */
+        cloneDeepWith<TResult extends Object>(
+            customizer?: CloneDeepWithCustomizer<T[], TResult>
+        ): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.cloneDeepWith
+         */
+        cloneDeepWith<TResult extends (number|string|boolean)>(
+            customizer?: CloneDeepWithCustomizer<T, TResult>
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+         * @see _.cloneDeepWith
+         */
+        cloneDeepWith<TResult>(
+            customizer?: CloneDeepWithCustomizer<T, TResult[]>
+        ): LoDashExplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.cloneDeepWith
+         */
+        cloneDeepWith<TResult extends Object>(
+            customizer?: CloneDeepWithCustomizer<T, TResult>
+        ): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.cloneWith
+    interface CloneWithCustomizer<TValue, TResult> {
+        (value: TValue): TResult;
+    }
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.clone except that it accepts customizer which is invoked to produce the cloned value.
+         * If customizer returns undefined cloning is handled by the method instead.
+         *
+         * @param value The value to clone.
+         * @param customizer The function to customize cloning.
+         * @return Returns the cloned value.
+         */
+        cloneWith<TResult>(
+            value: any,
+            customizer?: CloneWithCustomizer<any, TResult>
+        ): TResult;
+
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith<T, TResult>(
+            value: T,
+            customizer?: CloneWithCustomizer<T, TResult>
+        ): TResult;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith<TResult>(
+            customizer?: CloneWithCustomizer<T, TResult>
+        ): TResult;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith<TResult>(
+            customizer?: CloneWithCustomizer<T[], TResult>
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith<TResult>(
+            customizer?: CloneWithCustomizer<T, TResult>
+        ): TResult;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith<TResult extends (number|string|boolean)>(
+            customizer?: CloneWithCustomizer<T, TResult>
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith<TResult>(
+            customizer?: CloneWithCustomizer<T, TResult[]>
+        ): LoDashExplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith<TResult extends Object>(
+            customizer?: CloneWithCustomizer<T, TResult>
+        ): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith<TResult extends (number|string|boolean)>(
+            customizer?: CloneWithCustomizer<T[], TResult>
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith<TResult>(
+            customizer?: CloneWithCustomizer<T[], TResult[]>
+        ): LoDashExplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith<TResult extends Object>(
+            customizer?: CloneWithCustomizer<T[], TResult>
+        ): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith<TResult extends (number|string|boolean)>(
+            customizer?: CloneWithCustomizer<T, TResult>
+        ): LoDashExplicitWrapper<TResult>;
+
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith<TResult>(
+            customizer?: CloneWithCustomizer<T, TResult[]>
+        ): LoDashExplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.cloneWith
+         */
+        cloneWith<TResult extends Object>(
+            customizer?: CloneWithCustomizer<T, TResult>
+        ): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.eq
+    interface LoDashStatic {
+        /**
+         * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+         * comparison between two values to determine if they are equivalent.
+         *
+         * @static
+         * @memberOf _
+         * @category Lang
+         * @param {*} value The value to compare.
+         * @param {*} other The other value to compare.
+         * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
+         * @example
+         *
+         * var object = { 'user': 'fred' };
+         * var other = { 'user': 'fred' };
+         *
+         * _.eq(object, object);
+         * // => true
+         *
+         * _.eq(object, other);
+         * // => false
+         *
+         * _.eq('a', 'a');
+         * // => true
+         *
+         * _.eq('a', Object('a'));
+         * // => false
+         *
+         * _.eq(NaN, NaN);
+         * // => true
+         */
+        eq(
+            value: any,
+            other: any
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isEqual
+         */
+        eq(
+            other: any
+        ): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isEqual
+         */
+        eq(
+            other: any
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.gt
+    interface LoDashStatic {
+        /**
+         * Checks if value is greater than other.
+         *
+         * @param value The value to compare.
+         * @param other The other value to compare.
+         * @return Returns true if value is greater than other, else false.
+         */
+        gt(
+            value: any,
+            other: any
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.gt
+         */
+        gt(other: any): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.gt
+         */
+        gt(other: any): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.gte
+    interface LoDashStatic {
+        /**
+         * Checks if value is greater than or equal to other.
+         *
+         * @param value The value to compare.
+         * @param other The other value to compare.
+         * @return Returns true if value is greater than or equal to other, else false.
+         */
+        gte(
+            value: any,
+            other: any
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.gte
+         */
+        gte(other: any): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.gte
+         */
+        gte(other: any): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isArguments
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as an arguments object.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isArguments(value?: any): value is IArguments;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isArguments
+         */
+        isArguments(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isArguments
+         */
+        isArguments(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isArray
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as an Array object.
+         * @param value The value to check.
+         *
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isArray<T>(value?: any): value is T[];
+    }
+
+    interface LoDashImplicitWrapperBase<T,TWrapper> {
+        /**
+         * @see _.isArray
+         */
+        isArray(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T,TWrapper> {
+        /**
+         * @see _.isArray
+         */
+        isArray(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isArrayBuffer
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as an ArrayBuffer object.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isArrayBuffer(value?: any): value is ArrayBuffer;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isArrayBuffer
+         */
+        isArrayBuffer(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isArrayBuffer
+         */
+        isArrayBuffer(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isArrayLike
+    interface LoDashStatic {
+        /**
+         * Checks if `value` is array-like. A value is considered array-like if it's
+         * not a function and has a `value.length` that's an integer greater than or
+         * equal to `0` and less than or equal to `Number.MAX_SAFE_INTEGER`.
+         *
+         * @static
+         * @memberOf _
+         * @type Function
+         * @category Lang
+         * @param {*} value The value to check.
+         * @returns {boolean} Returns `true` if `value` is array-like, else `false`.
+         * @example
+         *
+         * _.isArrayLike([1, 2, 3]);
+         * // => true
+         *
+         * _.isArrayLike(document.body.children);
+         * // => true
+         *
+         * _.isArrayLike('abc');
+         * // => true
+         *
+         * _.isArrayLike(_.noop);
+         * // => false
+         */
+        isArrayLike<T>(value?: any): value is T[];
+    }
+
+    interface LoDashImplicitWrapperBase<T,TWrapper> {
+        /**
+         * @see _.isArrayLike
+         */
+        isArrayLike(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T,TWrapper> {
+        /**
+         * @see _.isArrayLike
+         */
+        isArrayLike(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isArrayLikeObject
+    interface LoDashStatic {
+        /**
+         * This method is like `_.isArrayLike` except that it also checks if `value`
+         * is an object.
+         *
+         * @static
+         * @memberOf _
+         * @type Function
+         * @category Lang
+         * @param {*} value The value to check.
+         * @returns {boolean} Returns `true` if `value` is an array-like object, else `false`.
+         * @example
+         *
+         * _.isArrayLikeObject([1, 2, 3]);
+         * // => true
+         *
+         * _.isArrayLikeObject(document.body.children);
+         * // => true
+         *
+         * _.isArrayLikeObject('abc');
+         * // => false
+         *
+         * _.isArrayLikeObject(_.noop);
+         * // => false
+         */
+        isArrayLikeObject<T>(value?: any): value is T[];
+    }
+
+    interface LoDashImplicitWrapperBase<T,TWrapper> {
+        /**
+         * @see _.isArrayLikeObject
+         */
+        isArrayLikeObject(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T,TWrapper> {
+        /**
+         * @see _.isArrayLikeObject
+         */
+        isArrayLikeObject(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isBoolean
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a boolean primitive or object.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isBoolean(value?: any): value is boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isBoolean
+         */
+        isBoolean(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isBoolean
+         */
+        isBoolean(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isBuffer
+    interface LoDashStatic {
+        /**
+         * Checks if value is a buffer.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is a buffer, else false.
+         */
+        isBuffer(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isBuffer
+         */
+        isBuffer(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isBuffer
+         */
+        isBuffer(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isDate
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a Date object.
+         * @param value The value to check.
+         *
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isDate(value?: any): value is Date;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isDate
+         */
+        isDate(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isDate
+         */
+        isDate(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isElement
+    interface LoDashStatic {
+        /**
+         * Checks if value is a DOM element.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is a DOM element, else false.
+         */
+        isElement(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isElement
+         */
+        isElement(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isElement
+         */
+        isElement(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isEmpty
+    interface LoDashStatic {
+        /**
+         * Checks if value is empty. A value is considered empty unless it’s an arguments object, array, string, or
+         * jQuery-like collection with a length greater than 0 or an object with own enumerable properties.
+         *
+         * @param value The value to inspect.
+         * @return Returns true if value is empty, else false.
+         */
+        isEmpty(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isEmpty
+         */
+        isEmpty(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isEmpty
+         */
+        isEmpty(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isEqual
+    interface LoDashStatic {
+        /**
+         * Performs a deep comparison between two values to determine if they are
+         * equivalent.
+         *
+         * **Note:** This method supports comparing arrays, array buffers, booleans,
+         * date objects, error objects, maps, numbers, `Object` objects, regexes,
+         * sets, strings, symbols, and typed arrays. `Object` objects are compared
+         * by their own, not inherited, enumerable properties. Functions and DOM
+         * nodes are **not** supported.
+         *
+         * @static
+         * @memberOf _
+         * @category Lang
+         * @param {*} value The value to compare.
+         * @param {*} other The other value to compare.
+         * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
+         * @example
+         *
+         * var object = { 'user': 'fred' };
+         * var other = { 'user': 'fred' };
+         *
+         * _.isEqual(object, other);
+         * // => true
+         *
+         * object === other;
+         * // => false
+         */
+        isEqual(
+            value: any,
+            other: any
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isEqual
+         */
+        isEqual(
+            other: any
+        ): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isEqual
+         */
+        isEqual(
+            other: any
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    // _.isEqualWith
+    interface IsEqualCustomizer {
+        (value: any, other: any, indexOrKey?: number|string): boolean;
+    }
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.isEqual` except that it accepts `customizer` which is
+         * invoked to compare values. If `customizer` returns `undefined` comparisons are
+         * handled by the method instead. The `customizer` is invoked with up to seven arguments:
+         * (objValue, othValue [, index|key, object, other, stack]).
+         *
+         * @static
+         * @memberOf _
+         * @category Lang
+         * @param {*} value The value to compare.
+         * @param {*} other The other value to compare.
+         * @param {Function} [customizer] The function to customize comparisons.
+         * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
+         * @example
+         *
+         * function isGreeting(value) {
+         *   return /^h(?:i|ello)$/.test(value);
+         * }
+         *
+         * function customizer(objValue, othValue) {
+         *   if (isGreeting(objValue) && isGreeting(othValue)) {
+         *     return true;
+         *   }
+         * }
+         *
+         * var array = ['hello', 'goodbye'];
+         * var other = ['hi', 'goodbye'];
+         *
+         * _.isEqualWith(array, other, customizer);
+         * // => true
+         */
+        isEqualWith(
+            value: any,
+            other: any,
+            customizer: IsEqualCustomizer
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isEqualWith
+         */
+        isEqualWith(
+            other: any,
+            customizer: IsEqualCustomizer
+        ): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isEqualWith
+         */
+        isEqualWith(
+            other: any,
+            customizer: IsEqualCustomizer
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isError
+    interface LoDashStatic {
+        /**
+         * Checks if value is an Error, EvalError, RangeError, ReferenceError, SyntaxError, TypeError, or URIError
+         * object.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is an error object, else false.
+         */
+        isError(value: any): value is Error;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isError
+         */
+        isError(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isError
+         */
+        isError(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isFinite
+    interface LoDashStatic {
+        /**
+         * Checks if value is a finite primitive number.
+         *
+         * Note: This method is based on Number.isFinite.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is a finite number, else false.
+         */
+        isFinite(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isFinite
+         */
+        isFinite(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isFinite
+         */
+        isFinite(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isFunction
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a Function object.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isFunction(value?: any): value is Function;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isFunction
+         */
+        isFunction(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isFunction
+         */
+        isFunction(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isInteger
+    interface LoDashStatic {
+        /**
+         * Checks if `value` is an integer.
+         *
+         * **Note:** This method is based on [`Number.isInteger`](https://mdn.io/Number/isInteger).
+         *
+         * @static
+         * @memberOf _
+         * @category Lang
+         * @param {*} value The value to check.
+         * @returns {boolean} Returns `true` if `value` is an integer, else `false`.
+         * @example
+         *
+         * _.isInteger(3);
+         * // => true
+         *
+         * _.isInteger(Number.MIN_VALUE);
+         * // => false
+         *
+         * _.isInteger(Infinity);
+         * // => false
+         *
+         * _.isInteger('3');
+         * // => false
+         */
+        isInteger(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isInteger
+         */
+        isInteger(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isInteger
+         */
+        isInteger(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isLength
+    interface LoDashStatic {
+        /**
+         * Checks if `value` is a valid array-like length.
+         *
+         * **Note:** This function is loosely based on [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).
+         *
+         * @static
+         * @memberOf _
+         * @category Lang
+         * @param {*} value The value to check.
+         * @returns {boolean} Returns `true` if `value` is a valid length, else `false`.
+         * @example
+         *
+         * _.isLength(3);
+         * // => true
+         *
+         * _.isLength(Number.MIN_VALUE);
+         * // => false
+         *
+         * _.isLength(Infinity);
+         * // => false
+         *
+         * _.isLength('3');
+         * // => false
+         */
+        isLength(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isLength
+         */
+        isLength(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isLength
+         */
+        isLength(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isMap
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a Map object.
+         *
+         * @param value The value to check.
+         * @returns Returns true if value is correctly classified, else false.
+         */
+        isMap<K, V>(value?: any): value is Map<K, V>;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isMap
+         */
+        isMap(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isMap
+         */
+        isMap(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isMatch
+    interface isMatchCustomizer {
+        (value: any, other: any, indexOrKey?: number|string): boolean;
+    }
+
+    interface LoDashStatic {
+        /**
+         * Performs a deep comparison between `object` and `source` to determine if
+         * `object` contains equivalent property values.
+         *
+         * **Note:** This method supports comparing the same values as `_.isEqual`.
+         *
+         * @static
+         * @memberOf _
+         * @category Lang
+         * @param {Object} object The object to inspect.
+         * @param {Object} source The object of property values to match.
+         * @returns {boolean} Returns `true` if `object` is a match, else `false`.
+         * @example
+         *
+         * var object = { 'user': 'fred', 'age': 40 };
+         *
+         * _.isMatch(object, { 'age': 40 });
+         * // => true
+         *
+         * _.isMatch(object, { 'age': 36 });
+         * // => false
+         */
+        isMatch(object: Object, source: Object): boolean;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.isMatch
+         */
+        isMatch(source: Object): boolean;
+    }
+
+    //_.isMatchWith
+    interface isMatchWithCustomizer {
+        (value: any, other: any, indexOrKey?: number|string): boolean;
+    }
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.isMatch` except that it accepts `customizer` which
+         * is invoked to compare values. If `customizer` returns `undefined` comparisons
+         * are handled by the method instead. The `customizer` is invoked with three
+         * arguments: (objValue, srcValue, index|key, object, source).
+         *
+         * @static
+         * @memberOf _
+         * @category Lang
+         * @param {Object} object The object to inspect.
+         * @param {Object} source The object of property values to match.
+         * @param {Function} [customizer] The function to customize comparisons.
+         * @returns {boolean} Returns `true` if `object` is a match, else `false`.
+         * @example
+         *
+         * function isGreeting(value) {
+         *   return /^h(?:i|ello)$/.test(value);
+         * }
+         *
+         * function customizer(objValue, srcValue) {
+         *   if (isGreeting(objValue) && isGreeting(srcValue)) {
+         *     return true;
+         *   }
+         * }
+         *
+         * var object = { 'greeting': 'hello' };
+         * var source = { 'greeting': 'hi' };
+         *
+         * _.isMatchWith(object, source, customizer);
+         * // => true
+         */
+        isMatchWith(object: Object, source: Object, customizer: isMatchWithCustomizer): boolean;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.isMatchWith
+         */
+        isMatchWith(source: Object, customizer: isMatchWithCustomizer): boolean;
+    }
+
+    //_.isNaN
+    interface LoDashStatic {
+        /**
+         * Checks if value is NaN.
+         *
+         * Note: This method is not the same as isNaN which returns true for undefined and other non-numeric values.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is NaN, else false.
+         */
+        isNaN(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isNaN
+         */
+        isNaN(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isNaN
+         */
+        isNaN(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isNative
+    interface LoDashStatic {
+        /**
+         * Checks if value is a native function.
+         * @param value The value to check.
+         *
+         * @retrun Returns true if value is a native function, else false.
+         */
+        isNative(value: any): value is Function;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isNative
+         */
+        isNative(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isNative
+         */
+        isNative(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isNil
+    interface LoDashStatic {
+        /**
+         * Checks if `value` is `null` or `undefined`.
+         *
+         * @static
+         * @memberOf _
+         * @category Lang
+         * @param {*} value The value to check.
+         * @returns {boolean} Returns `true` if `value` is nullish, else `false`.
+         * @example
+         *
+         * _.isNil(null);
+         * // => true
+         *
+         * _.isNil(void 0);
+         * // => true
+         *
+         * _.isNil(NaN);
+         * // => false
+         */
+        isNil(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isNil
+         */
+        isNil(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isNil
+         */
+        isNil(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isNull
+    interface LoDashStatic {
+        /**
+         * Checks if value is null.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is null, else false.
+         */
+        isNull(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isNull
+         */
+        isNull(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isNull
+         */
+        isNull(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isNumber
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a Number primitive or object.
+         *
+         * Note: To exclude Infinity, -Infinity, and NaN, which are classified as numbers, use the _.isFinite method.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isNumber(value?: any): value is number;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isNumber
+         */
+        isNumber(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isNumber
+         */
+        isNumber(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isObject
+    interface LoDashStatic {
+        /**
+         * Checks if value is the language type of Object. (e.g. arrays, functions, objects, regexes, new Number(0),
+         * and new String(''))
+         *
+         * @param value The value to check.
+         * @return Returns true if value is an object, else false.
+         */
+        isObject(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isObject
+         */
+        isObject(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isObject
+         */
+        isObject(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isObjectLike
+    interface LoDashStatic {
+        /**
+         * Checks if `value` is object-like. A value is object-like if it's not `null`
+         * and has a `typeof` result of "object".
+         *
+         * @static
+         * @memberOf _
+         * @category Lang
+         * @param {*} value The value to check.
+         * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
+         * @example
+         *
+         * _.isObjectLike({});
+         * // => true
+         *
+         * _.isObjectLike([1, 2, 3]);
+         * // => true
+         *
+         * _.isObjectLike(_.noop);
+         * // => false
+         *
+         * _.isObjectLike(null);
+         * // => false
+         */
+        isObjectLike(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isObjectLike
+         */
+        isObjectLike(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isObjectLike
+         */
+        isObjectLike(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isPlainObject
+    interface LoDashStatic {
+        /**
+         * Checks if value is a plain object, that is, an object created by the Object constructor or one with a
+         * [[Prototype]] of null.
+         *
+         * Note: This method assumes objects created by the Object constructor have no inherited enumerable properties.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is a plain object, else false.
+         */
+        isPlainObject(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isPlainObject
+         */
+        isPlainObject(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isPlainObject
+         */
+        isPlainObject(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isRegExp
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a RegExp object.
+         * @param value The value to check.
+         *
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isRegExp(value?: any): value is RegExp;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isRegExp
+         */
+        isRegExp(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isRegExp
+         */
+        isRegExp(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isSafeInteger
+    interface LoDashStatic {
+        /**
+         * Checks if `value` is a safe integer. An integer is safe if it's an IEEE-754
+         * double precision number which isn't the result of a rounded unsafe integer.
+         *
+         * **Note:** This method is based on [`Number.isSafeInteger`](https://mdn.io/Number/isSafeInteger).
+         *
+         * @static
+         * @memberOf _
+         * @category Lang
+         * @param {*} value The value to check.
+         * @returns {boolean} Returns `true` if `value` is a safe integer, else `false`.
+         * @example
+         *
+         * _.isSafeInteger(3);
+         * // => true
+         *
+         * _.isSafeInteger(Number.MIN_VALUE);
+         * // => false
+         *
+         * _.isSafeInteger(Infinity);
+         * // => false
+         *
+         * _.isSafeInteger('3');
+         * // => false
+         */
+        isSafeInteger(value: any): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isSafeInteger
+         */
+        isSafeInteger(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isSafeInteger
+         */
+        isSafeInteger(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isSet
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a Set object.
+         *
+         * @param value The value to check.
+         * @returns Returns true if value is correctly classified, else false.
+         */
+        isSet<T>(value?: any): value is Set<T>;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isSet
+         */
+        isSet(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isSet
+         */
+        isSet(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isString
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a String primitive or object.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isString(value?: any): value is string;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isString
+         */
+        isString(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isString
+         */
+        isString(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isSymbol
+    interface LoDashStatic {
+        /**
+         * Checks if `value` is classified as a `Symbol` primitive or object.
+         *
+         * @static
+         * @memberOf _
+         * @category Lang
+         * @param {*} value The value to check.
+         * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.
+         * @example
+         *
+         * _.isSymbol(Symbol.iterator);
+         * // => true
+         *
+         * _.isSymbol('abc');
+         * // => false
+         */
+        isSymbol(value: any): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isSymbol
+         */
+        isSymbol(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isSymbol
+         */
+        isSymbol(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isTypedArray
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a typed array.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is correctly classified, else false.
+         */
+        isTypedArray(value: any): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isTypedArray
+         */
+        isTypedArray(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isTypedArray
+         */
+        isTypedArray(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isUndefined
+    interface LoDashStatic {
+        /**
+         * Checks if value is undefined.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is undefined, else false.
+         */
+        isUndefined(value: any): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isUndefined
+         */
+        isUndefined(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * see _.isUndefined
+         */
+        isUndefined(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isWeakMap
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a WeakMap object.
+         *
+         * @param value The value to check.
+         * @returns Returns true if value is correctly classified, else false.
+         */
+        isWeakMap<K, V>(value?: any): value is WeakMap<K, V>;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isSet
+         */
+        isWeakMap(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isSet
+         */
+        isWeakMap(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.isWeakSet
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a WeakSet object.
+         *
+         * @param value The value to check.
+         * @returns Returns true if value is correctly classified, else false.
+         */
+        isWeakSet<T>(value?: any): value is WeakSet<T>;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isWeakSet
+         */
+        isWeakSet(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isWeakSet
+         */
+        isWeakSet(): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.lt
+    interface LoDashStatic {
+        /**
+         * Checks if value is less than other.
+         *
+         * @param value The value to compare.
+         * @param other The other value to compare.
+         * @return Returns true if value is less than other, else false.
+         */
+        lt(
+            value: any,
+            other: any
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.lt
+         */
+        lt(other: any): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.lt
+         */
+        lt(other: any): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.lte
+    interface LoDashStatic {
+        /**
+         * Checks if value is less than or equal to other.
+         *
+         * @param value The value to compare.
+         * @param other The other value to compare.
+         * @return Returns true if value is less than or equal to other, else false.
+         */
+        lte(
+            value: any,
+            other: any
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.lte
+         */
+        lte(other: any): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.lte
+         */
+        lte(other: any): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.toArray
+    interface LoDashStatic {
+        /**
+         * Converts value to an array.
+         *
+         * @param value The value to convert.
+         * @return Returns the converted array.
+         */
+        toArray<T>(value: List<T>|Dictionary<T>|NumericDictionary<T>): T[];
+
+        /**
+         * @see _.toArray
+         */
+        toArray<TValue, TResult>(value: TValue): TResult[];
+
+        /**
+         * @see _.toArray
+         */
+        toArray<TResult>(value?: any): TResult[];
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.toArray
+         */
+        toArray<TResult>(): LoDashImplicitArrayWrapper<TResult>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.toArray
+         */
+        toArray(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.toArray
+         */
+        toArray<TResult>(): LoDashImplicitArrayWrapper<TResult>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.toArray
+         */
+        toArray<TResult>(): LoDashExplicitArrayWrapper<TResult>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.toArray
+         */
+        toArray(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.toArray
+         */
+        toArray<TResult>(): LoDashExplicitArrayWrapper<TResult>;
+    }
+
+    //_.toPlainObject
+    interface LoDashStatic {
+        /**
+         * Converts value to a plain object flattening inherited enumerable properties of value to own properties
+         * of the plain object.
+         *
+         * @param value The value to convert.
+         * @return Returns the converted plain object.
+         */
+        toPlainObject<TResult extends {}>(value?: any): TResult;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.toPlainObject
+         */
+        toPlainObject<TResult extends {}>(): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    //_.toInteger
+    interface LoDashStatic {
+        /**
+         * Converts `value` to an integer.
+         *
+         * **Note:** This function is loosely based on [`ToInteger`](http://www.ecma-international.org/ecma-262/6.0/#sec-tointeger).
+         *
+         * @static
+         * @memberOf _
+         * @category Lang
+         * @param {*} value The value to convert.
+         * @returns {number} Returns the converted integer.
+         * @example
+         *
+         * _.toInteger(3);
+         * // => 3
+         *
+         * _.toInteger(Number.MIN_VALUE);
+         * // => 0
+         *
+         * _.toInteger(Infinity);
+         * // => 1.7976931348623157e+308
+         *
+         * _.toInteger('3');
+         * // => 3
+         */
+        toInteger(value: any): number;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.toInteger
+         */
+        toInteger(): LoDashImplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.toInteger
+         */
+        toInteger(): LoDashExplicitWrapper<number>;
+    }
+
+    //_.toLength
+    interface LoDashStatic {
+        /**
+         * Converts `value` to an integer suitable for use as the length of an
+         * array-like object.
+         *
+         * **Note:** This method is based on [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).
+         *
+         * @static
+         * @memberOf _
+         * @category Lang
+         * @param {*} value The value to convert.
+         * @return {number} Returns the converted integer.
+         * @example
+         *
+         * _.toLength(3);
+         * // => 3
+         *
+         * _.toLength(Number.MIN_VALUE);
+         * // => 0
+         *
+         * _.toLength(Infinity);
+         * // => 4294967295
+         *
+         * _.toLength('3');
+         * // => 3
+         */
+        toLength(value: any): number;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.toLength
+         */
+        toLength(): LoDashImplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.toLength
+         */
+        toLength(): LoDashExplicitWrapper<number>;
+    }
+
+    //_.toNumber
+    interface LoDashStatic {
+        /**
+         * Converts `value` to a number.
+         *
+         * @static
+         * @memberOf _
+         * @category Lang
+         * @param {*} value The value to process.
+         * @returns {number} Returns the number.
+         * @example
+         *
+         * _.toNumber(3);
+         * // => 3
+         *
+         * _.toNumber(Number.MIN_VALUE);
+         * // => 5e-324
+         *
+         * _.toNumber(Infinity);
+         * // => Infinity
+         *
+         * _.toNumber('3');
+         * // => 3
+         */
+        toNumber(value: any): number;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.toNumber
+         */
+        toNumber(): LoDashImplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.toNumber
+         */
+        toNumber(): LoDashExplicitWrapper<number>;
+    }
+
+    //_.toSafeInteger
+    interface LoDashStatic {
+        /**
+         * Converts `value` to a safe integer. A safe integer can be compared and
+         * represented correctly.
+         *
+         * @static
+         * @memberOf _
+         * @category Lang
+         * @param {*} value The value to convert.
+         * @returns {number} Returns the converted integer.
+         * @example
+         *
+         * _.toSafeInteger(3);
+         * // => 3
+         *
+         * _.toSafeInteger(Number.MIN_VALUE);
+         * // => 0
+         *
+         * _.toSafeInteger(Infinity);
+         * // => 9007199254740991
+         *
+         * _.toSafeInteger('3');
+         * // => 3
+         */
+        toSafeInteger(value: any): number;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.toSafeInteger
+         */
+        toSafeInteger(): LoDashImplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.toSafeInteger
+         */
+        toSafeInteger(): LoDashExplicitWrapper<number>;
+    }
+
+    //_.toString DUMMY
+    interface LoDashStatic {
+        /**
+         * Converts `value` to a string if it's not one. An empty string is returned
+         * for `null` and `undefined` values. The sign of `-0` is preserved.
+         *
+         * @static
+         * @memberOf _
+         * @category Lang
+         * @param {*} value The value to process.
+         * @returns {string} Returns the string.
+         * @example
+         *
+         * _.toString(null);
+         * // => ''
+         *
+         * _.toString(-0);
+         * // => '-0'
+         *
+         * _.toString([1, 2, 3]);
+         * // => '1,2,3'
+         */
+        toString(value: any): string;
+    }
+
+    /********
+     * Math *
+     ********/
+
+    //_.add
+    interface LoDashStatic {
+        /**
+         * Adds two numbers.
+         *
+         * @param augend The first number to add.
+         * @param addend The second number to add.
+         * @return Returns the sum.
+         */
+        add(
+            augend: number,
+            addend: number
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.add
+         */
+        add(addend: number): number;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.add
+         */
+        add(addend: number): LoDashExplicitWrapper<number>;
+    }
+
+    //_.ceil
+    interface LoDashStatic {
+        /**
+         * Calculates n rounded up to precision.
+         *
+         * @param n The number to round up.
+         * @param precision The precision to round up to.
+         * @return Returns the rounded up number.
+         */
+        ceil(
+            n: number,
+            precision?: number
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.ceil
+         */
+        ceil(precision?: number): number;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.ceil
+         */
+        ceil(precision?: number): LoDashExplicitWrapper<number>;
+    }
+
+    //_.floor
+    interface LoDashStatic {
+        /**
+         * Calculates n rounded down to precision.
+         *
+         * @param n The number to round down.
+         * @param precision The precision to round down to.
+         * @return Returns the rounded down number.
+         */
+        floor(
+            n: number,
+            precision?: number
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.floor
+         */
+        floor(precision?: number): number;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.floor
+         */
+        floor(precision?: number): LoDashExplicitWrapper<number>;
+    }
+
+    //_.max
+    interface LoDashStatic {
+         /**
+          * Computes the maximum value of `array`. If `array` is empty or falsey
+          * `undefined` is returned.
+          *
+          * @static
+          * @memberOf _
+          * @category Math
+          * @param {Array} array The array to iterate over.
+          * @returns {*} Returns the maximum value.
+          */
+        max<T>(
+            collection: List<T>
+        ): T;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.max
+         */
+        max(): T;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.max
+         */
+        max<T>(): T;
+    }
+
+    //_.maxBy
+    interface LoDashStatic {
+        /**
+         * This method is like `_.max` except that it accepts `iteratee` which is
+         * invoked for each element in `array` to generate the criterion by which
+         * the value is ranked. The iteratee is invoked with one argument: (value).
+         *
+         * @static
+         * @memberOf _
+         * @category Math
+         * @param {Array} array The array to iterate over.
+         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
+         * @returns {*} Returns the maximum value.
+         * @example
+         *
+         * var objects = [{ 'n': 1 }, { 'n': 2 }];
+         *
+         * _.maxBy(objects, function(o) { return o.a; });
+         * // => { 'n': 2 }
+         *
+         * // using the `_.property` iteratee shorthand
+         * _.maxBy(objects, 'n');
+         * // => { 'n': 2 }
+         */
+        maxBy<T>(
+            collection: List<T>,
+            iteratee?: ListIterator<T, any>
+        ): T;
+
+        /**
+         * @see _.maxBy
+         */
+        maxBy<T>(
+            collection: Dictionary<T>,
+            iteratee?: DictionaryIterator<T, any>
+        ): T;
+
+        /**
+         * @see _.maxBy
+         */
+        maxBy<T>(
+            collection: List<T>|Dictionary<T>,
+            iteratee?: string
+        ): T;
+
+        /**
+         * @see _.maxBy
+         */
+        maxBy<TObject extends {}, T>(
+            collection: List<T>|Dictionary<T>,
+            whereValue?: TObject
+        ): T;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.maxBy
+         */
+        maxBy(
+            iteratee?: ListIterator<T, any>
+        ): T;
+
+        /**
+         * @see _.maxBy
+         */
+        maxBy(
+            iteratee?: string
+        ): T;
+
+        /**
+         * @see _.maxBy
+         */
+        maxBy<TObject extends {}>(
+            whereValue?: TObject
+        ): T;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.maxBy
+         */
+        maxBy<T>(
+            iteratee?: ListIterator<T, any>|DictionaryIterator<T, any>
+        ): T;
+
+        /**
+         * @see _.maxBy
+         */
+        maxBy<T>(
+            iteratee?: string
+        ): T;
+
+        /**
+         * @see _.maxBy
+         */
+        maxBy<TObject extends {}, T>(
+            whereValue?: TObject
+        ): T;
+    }
+
+    //_.mean
+    interface LoDashStatic {
+        /**
+         * Computes the mean of the values in `array`.
+         *
+         * @static
+         * @memberOf _
+         * @category Math
+         * @param {Array} array The array to iterate over.
+         * @returns {number} Returns the mean.
+         * @example
+         *
+         * _.mean([4, 2, 8, 6]);
+         * // => 5
+         */
+        mean<T>(
+            collection: List<T>
+        ): number;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.mean
+         */
+        mean<T>(): number;
+
+        /**
+         * @see _.mean
+         */
+        mean(): number;
+    }
+
+    //_.min
+    interface LoDashStatic {
+        /**
+         * Computes the minimum value of `array`. If `array` is empty or falsey
+         * `undefined` is returned.
+         *
+         * @static
+         * @memberOf _
+         * @category Math
+         * @param {Array} array The array to iterate over.
+         * @returns {*} Returns the minimum value.
+         */
+        min<T>(
+            collection: List<T>
+        ): T;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.min
+         */
+        min(): T;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.min
+         */
+        min<T>(): T;
+    }
+
+    //_.minBy
+    interface LoDashStatic {
+        /**
+         * This method is like `_.min` except that it accepts `iteratee` which is
+         * invoked for each element in `array` to generate the criterion by which
+         * the value is ranked. The iteratee is invoked with one argument: (value).
+         *
+         * @static
+         * @memberOf _
+         * @category Math
+         * @param {Array} array The array to iterate over.
+         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
+         * @returns {*} Returns the minimum value.
+         * @example
+         *
+         * var objects = [{ 'n': 1 }, { 'n': 2 }];
+         *
+         * _.minBy(objects, function(o) { return o.a; });
+         * // => { 'n': 1 }
+         *
+         * // using the `_.property` iteratee shorthand
+         * _.minBy(objects, 'n');
+         * // => { 'n': 1 }
+         */
+        minBy<T>(
+            collection: List<T>,
+            iteratee?: ListIterator<T, any>
+        ): T;
+
+        /**
+         * @see _.minBy
+         */
+        minBy<T>(
+            collection: Dictionary<T>,
+            iteratee?: DictionaryIterator<T, any>
+        ): T;
+
+        /**
+         * @see _.minBy
+         */
+        minBy<T>(
+            collection: List<T>|Dictionary<T>,
+            iteratee?: string
+        ): T;
+
+        /**
+         * @see _.minBy
+         */
+        minBy<TObject extends {}, T>(
+            collection: List<T>|Dictionary<T>,
+            whereValue?: TObject
+        ): T;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.minBy
+         */
+        minBy(
+            iteratee?: ListIterator<T, any>
+        ): T;
+
+        /**
+         * @see _.minBy
+         */
+        minBy(
+            iteratee?: string
+        ): T;
+
+        /**
+         * @see _.minBy
+         */
+        minBy<TObject extends {}>(
+            whereValue?: TObject
+        ): T;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.minBy
+         */
+        minBy<T>(
+            iteratee?: ListIterator<T, any>|DictionaryIterator<T, any>
+        ): T;
+
+        /**
+         * @see _.minBy
+         */
+        minBy<T>(
+            iteratee?: string
+        ): T;
+
+        /**
+         * @see _.minBy
+         */
+        minBy<TObject extends {}, T>(
+            whereValue?: TObject
+        ): T;
+    }
+
+    //_.round
+    interface LoDashStatic {
+        /**
+         * Calculates n rounded to precision.
+         *
+         * @param n The number to round.
+         * @param precision The precision to round to.
+         * @return Returns the rounded number.
+         */
+        round(
+            n: number,
+            precision?: number
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.round
+         */
+        round(precision?: number): number;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.round
+         */
+        round(precision?: number): LoDashExplicitWrapper<number>;
+    }
+
+    //_.sum
+    interface LoDashStatic {
+        /**
+         * Computes the sum of the values in `array`.
+         *
+         * @static
+         * @memberOf _
+         * @category Math
+         * @param {Array} array The array to iterate over.
+         * @returns {number} Returns the sum.
+         * @example
+         *
+         * _.sum([4, 2, 8, 6]);
+         * // => 20
+         */
+        sum<T>(collection: List<T>): number;
+
+        /**
+         * @see _.sum
+         */
+        sum(collection: List<number>|Dictionary<number>): number;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.sum
+         */
+        sum(): number;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.sum
+         **/
+        sum<TValue>(): number;
+
+        /**
+         * @see _.sum
+         */
+        sum(): number;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.sum
+         */
+        sum(): LoDashExplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.sum
+         */
+        sum<TValue>(): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sum
+         */
+        sum(): LoDashExplicitWrapper<number>;
+    }
+
+    //_.sumBy
+    interface LoDashStatic {
+        /**
+         * This method is like `_.sum` except that it accepts `iteratee` which is
+         * invoked for each element in `array` to generate the value to be summed.
+         * The iteratee is invoked with one argument: (value).
+         *
+         * @static
+         * @memberOf _
+         * @category Math
+         * @param {Array} array The array to iterate over.
+         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
+         * @returns {number} Returns the sum.
+         * @example
+         *
+         * var objects = [{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }];
+         *
+         * _.sumBy(objects, function(o) { return o.n; });
+         * // => 20
+         *
+         * // using the `_.property` iteratee shorthand
+         * _.sumBy(objects, 'n');
+         * // => 20
+         */
+        sumBy<T>(
+            collection: List<T>,
+            iteratee: ListIterator<T, number>
+        ): number;
+
+        /**
+         * @see _.sumBy
+         **/
+        sumBy<T>(
+            collection: Dictionary<T>,
+            iteratee: DictionaryIterator<T, number>
+        ): number;
+
+        /**
+         * @see _.sumBy
+         */
+        sumBy<T>(
+            collection: List<number>|Dictionary<number>,
+            iteratee: string
+        ): number;
+
+        /**
+         * @see _.sumBy
+         */
+        sumBy<T>(collection: List<T>|Dictionary<T>): number;
+
+        /**
+         * @see _.sumBy
+         */
+        sumBy(collection: List<number>|Dictionary<number>): number;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.sumBy
+         */
+        sumBy(
+            iteratee: ListIterator<T, number>
+        ): number;
+
+        /**
+         * @see _.sumBy
+         */
+        sumBy(iteratee: string): number;
+
+        /**
+         * @see _.sumBy
+         */
+        sumBy(): number;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.sumBy
+         **/
+        sumBy<TValue>(
+            iteratee: ListIterator<TValue, number>|DictionaryIterator<TValue, number>
+        ): number;
+
+        /**
+         * @see _.sumBy
+         */
+        sumBy(iteratee: string): number;
+
+        /**
+         * @see _.sumBy
+         */
+        sumBy(): number;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.sumBy
+         */
+        sumBy(
+            iteratee: ListIterator<T, number>
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sumBy
+         */
+        sumBy(iteratee: string): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sumBy
+         */
+        sumBy(): LoDashExplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.sumBy
+         */
+        sumBy<TValue>(
+            iteratee: ListIterator<TValue, number>|DictionaryIterator<TValue, number>
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sumBy
+         */
+        sumBy(iteratee: string): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.sumBy
+         */
+        sumBy(): LoDashExplicitWrapper<number>;
+    }
+
+    /**********
+     * Number *
+     **********/
+
+    //_.subtract
+    interface LoDashStatic {
+        /**
+         * Subtract two numbers.
+         *
+         * @static
+         * @memberOf _
+         * @category Math
+         * @param {number} minuend The first number in a subtraction.
+         * @param {number} subtrahend The second number in a subtraction.
+         * @returns {number} Returns the difference.
+         * @example
+         *
+         * _.subtract(6, 4);
+         * // => 2
+         */
+        subtract(
+            minuend: number,
+            subtrahend: number
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.subtract
+         */
+        subtract(
+            subtrahend: number
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.subtract
+         */
+        subtract(
+            subtrahend: number
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    //_.clamp
+    interface LoDashStatic {
+        /**
+         * Clamps `number` within the inclusive `lower` and `upper` bounds.
+         *
+         * @static
+         * @memberOf _
+         * @category Number
+         * @param {number} number The number to clamp.
+         * @param {number} [lower] The lower bound.
+         * @param {number} upper The upper bound.
+         * @returns {number} Returns the clamped number.
+         * @example
+         *
+         * _.clamp(-10, -5, 5);
+         * // => -5
+         *
+         * _.clamp(10, -5, 5);
+         * // => 5
+         */
+        clamp(
+            number: number,
+            lower: number,
+            upper: number
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.clamp
+         */
+        clamp(
+            lower: number,
+            upper: number
+        ): number;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.clamp
+         */
+        clamp(
+            lower: number,
+            upper: number
+        ): LoDashExplicitWrapper<number>;
+    }
+
+    //_.inRange
+    interface LoDashStatic {
+        /**
+         * Checks if n is between start and up to but not including, end. If end is not specified it’s set to start
+         * with start then set to 0.
+         *
+         * @param n The number to check.
+         * @param start The start of the range.
+         * @param end The end of the range.
+         * @return Returns true if n is in the range, else false.
+         */
+        inRange(
+            n: number,
+            start: number,
+            end: number
+        ): boolean;
+
+
+        /**
+         * @see _.inRange
+         */
+        inRange(
+            n: number,
+            end: number
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.inRange
+         */
+        inRange(
+            start: number,
+            end: number
+        ): boolean;
+
+        /**
+         * @see _.inRange
+         */
+        inRange(end: number): boolean;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.inRange
+         */
+        inRange(
+            start: number,
+            end: number
+        ): LoDashExplicitWrapper<boolean>;
+
+        /**
+         * @see _.inRange
+         */
+        inRange(end: number): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.random
+    interface LoDashStatic {
+        /**
+         * Produces a random number between min and max (inclusive). If only one argument is provided a number between
+         * 0 and the given number is returned. If floating is true, or either min or max are floats, a floating-point
+         * number is returned instead of an integer.
+         *
+         * @param min The minimum possible value.
+         * @param max The maximum possible value.
+         * @param floating Specify returning a floating-point number.
+         * @return Returns the random number.
+         */
+        random(
+            min?: number,
+            max?: number,
+            floating?: boolean
+        ): number;
+
+        /**
+         * @see _.random
+         */
+        random(
+            min?: number,
+            floating?: boolean
+        ): number;
+
+        /**
+         * @see _.random
+         */
+        random(floating?: boolean): number;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.random
+         */
+        random(
+            max?: number,
+            floating?: boolean
+        ): number;
+
+        /**
+         * @see _.random
+         */
+        random(floating?: boolean): number;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.random
+         */
+        random(
+            max?: number,
+            floating?: boolean
+        ): LoDashExplicitWrapper<number>;
+
+        /**
+         * @see _.random
+         */
+        random(floating?: boolean): LoDashExplicitWrapper<number>;
+    }
+
+    /**********
+     * Object *
+     **********/
+
+    //_.assign
+    interface LoDashStatic {
+        /**
+         * Assigns own enumerable properties of source objects to the destination
+         * object. Source objects are applied from left to right. Subsequent sources
+         * overwrite property assignments of previous sources.
+         *
+         * **Note:** This method mutates `object` and is loosely based on
+         * [`Object.assign`](https://mdn.io/Object/assign).
+         *
+         * @static
+         * @memberOf _
+         * @category Object
+         * @param {Object} object The destination object.
+         * @param {...Object} [sources] The source objects.
+         * @returns {Object} Returns `object`.
+         * @example
+         *
+         * function Foo() {
+         *   this.c = 3;
+         * }
+         *
+         * function Bar() {
+         *   this.e = 5;
+         * }
+         *
+         * Foo.prototype.d = 4;
+         * Bar.prototype.f = 6;
+         *
+         * _.assign({ 'a': 1 }, new Foo, new Bar);
+         * // => { 'a': 1, 'c': 3, 'e': 5 }
+         */
+        assign<TObject extends {}, TSource extends {}, TResult extends {}>(
+            object: TObject,
+            source: TSource
+        ): TResult;
+
+        /**
+         * @see assign
+         */
+        assign<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2
+        ): TResult;
+
+        /**
+         * @see assign
+         */
+        assign<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): TResult;
+
+        /**
+         * @see assign
+         */
+        assign<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {},
+            TResult extends {}>
+        (
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
+        ): TResult;
+
+        /**
+         * @see _.assign
+         */
+        assign<TObject extends {}>(object: TObject): TObject;
+
+        /**
+         * @see _.assign
+         */
+        assign<TObject extends {}, TResult extends {}>(
+            object: TObject, ...otherArgs: any[]
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.assign
+         */
+        assign<TSource extends {}, TResult extends {}>(
+            source: TSource
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assign
+         */
+        assign<TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assign
+         */
+        assign<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assign
+         */
+        assign<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.assign
+         */
+        assign(): LoDashImplicitObjectWrapper<T>;
+
+        /**
+         * @see _.assign
+         */
+        assign<TResult extends {}>(...otherArgs: any[]): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.assign
+         */
+        assign<TSource extends {}, TResult extends {}>(
+            source: TSource
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assign
+         */
+        assign<TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assign
+         */
+        assign<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assign
+         */
+        assign<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.assign
+         */
+        assign(): LoDashExplicitObjectWrapper<T>;
+
+        /**
+         * @see _.assign
+         */
+        assign<TResult extends {}>(...otherArgs: any[]): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.assignWith
+    interface AssignCustomizer {
+        (objectValue: any, sourceValue: any, key?: string, object?: {}, source?: {}): any;
+    }
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.assign` except that it accepts `customizer` which
+         * is invoked to produce the assigned values. If `customizer` returns `undefined`
+         * assignment is handled by the method instead. The `customizer` is invoked
+         * with five arguments: (objValue, srcValue, key, object, source).
+         *
+         * **Note:** This method mutates `object`.
+         *
+         * @static
+         * @memberOf _
+         * @category Object
+         * @param {Object} object The destination object.
+         * @param {...Object} sources The source objects.
+         * @param {Function} [customizer] The function to customize assigned values.
+         * @returns {Object} Returns `object`.
+         * @example
+         *
+         * function customizer(objValue, srcValue) {
+         *   return _.isUndefined(objValue) ? srcValue : objValue;
+         * }
+         *
+         * var defaults = _.partialRight(_.assignWith, customizer);
+         *
+         * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+         * // => { 'a': 1, 'b': 2 }
+         */
+        assignWith<TObject extends {}, TSource extends {}, TResult extends {}>(
+            object: TObject,
+            source: TSource,
+            customizer: AssignCustomizer
+        ): TResult;
+
+        /**
+         * @see assignWith
+         */
+        assignWith<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            customizer: AssignCustomizer
+        ): TResult;
+
+        /**
+         * @see assignWith
+         */
+        assignWith<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer: AssignCustomizer
+        ): TResult;
+
+        /**
+         * @see assignWith
+         */
+        assignWith<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {},
+            TResult extends {}>
+        (
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4,
+            customizer: AssignCustomizer
+        ): TResult;
+
+        /**
+         * @see _.assignWith
+         */
+        assignWith<TObject extends {}>(object: TObject): TObject;
+
+        /**
+         * @see _.assignWith
+         */
+        assignWith<TObject extends {}, TResult extends {}>(
+            object: TObject, ...otherArgs: any[]
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.assignWith
+         */
+        assignWith<TSource extends {}, TResult extends {}>(
+            source: TSource,
+            customizer: AssignCustomizer
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assignWith
+         */
+        assignWith<TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            customizer: AssignCustomizer
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assignWith
+         */
+        assignWith<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer: AssignCustomizer
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assignWith
+         */
+        assignWith<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4,
+            customizer: AssignCustomizer
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.assignWith
+         */
+        assignWith(): LoDashImplicitObjectWrapper<T>;
+
+        /**
+         * @see _.assignWith
+         */
+        assignWith<TResult extends {}>(...otherArgs: any[]): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.assignWith
+         */
+        assignWith<TSource extends {}, TResult extends {}>(
+            source: TSource,
+            customizer: AssignCustomizer
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assignWith
+         */
+        assignWith<TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            customizer: AssignCustomizer
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assignWith
+         */
+        assignWith<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer: AssignCustomizer
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assignWith
+         */
+        assignWith<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4,
+            customizer: AssignCustomizer
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.assignWith
+         */
+        assignWith(): LoDashExplicitObjectWrapper<T>;
+
+        /**
+         * @see _.assignWith
+         */
+        assignWith<TResult extends {}>(...otherArgs: any[]): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.assignIn
+    interface LoDashStatic {
+        /**
+         * This method is like `_.assign` except that it iterates over own and
+         * inherited source properties.
+         *
+         * **Note:** This method mutates `object`.
+         *
+         * @static
+         * @memberOf _
+         * @alias extend
+         * @category Object
+         * @param {Object} object The destination object.
+         * @param {...Object} [sources] The source objects.
+         * @returns {Object} Returns `object`.
+         * @example
+         *
+         * function Foo() {
+         *   this.b = 2;
+         * }
+         *
+         * function Bar() {
+         *   this.d = 4;
+         * }
+         *
+         * Foo.prototype.c = 3;
+         * Bar.prototype.e = 5;
+         *
+         * _.assignIn({ 'a': 1 }, new Foo, new Bar);
+         * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
+         */
+        assignIn<TObject extends {}, TSource extends {}, TResult extends {}>(
+            object: TObject,
+            source: TSource
+        ): TResult;
+
+        /**
+         * @see assignIn
+         */
+        assignIn<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2
+        ): TResult;
+
+        /**
+         * @see assignIn
+         */
+        assignIn<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): TResult;
+
+        /**
+         * @see assignIn
+         */
+        assignIn<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {},
+            TResult extends {}>
+        (
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
+        ): TResult;
+
+        /**
+         * @see _.assignIn
+         */
+        assignIn<TObject extends {}>(object: TObject): TObject;
+
+        /**
+         * @see _.assignIn
+         */
+        assignIn<TObject extends {}, TResult extends {}>(
+            object: TObject, ...otherArgs: any[]
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.assignIn
+         */
+        assignIn<TSource extends {}, TResult extends {}>(
+            source: TSource
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assignIn
+         */
+        assignIn<TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assignIn
+         */
+        assignIn<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assignIn
+         */
+        assignIn<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.assignIn
+         */
+        assignIn(): LoDashImplicitObjectWrapper<T>;
+
+        /**
+         * @see _.assignIn
+         */
+        assignIn<TResult extends {}>(...otherArgs: any[]): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.assignIn
+         */
+        assignIn<TSource extends {}, TResult extends {}>(
+            source: TSource
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assignIn
+         */
+        assignIn<TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assignIn
+         */
+        assignIn<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assignIn
+         */
+        assignIn<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.assignIn
+         */
+        assignIn(): LoDashExplicitObjectWrapper<T>;
+
+        /**
+         * @see _.assignIn
+         */
+        assignIn<TResult extends {}>(...otherArgs: any[]): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.assignInWith
+    interface AssignCustomizer {
+        (objectValue: any, sourceValue: any, key?: string, object?: {}, source?: {}): any;
+    }
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.assignIn` except that it accepts `customizer` which
+         * is invoked to produce the assigned values. If `customizer` returns `undefined`
+         * assignment is handled by the method instead. The `customizer` is invoked
+         * with five arguments: (objValue, srcValue, key, object, source).
+         *
+         * **Note:** This method mutates `object`.
+         *
+         * @static
+         * @memberOf _
+         * @alias extendWith
+         * @category Object
+         * @param {Object} object The destination object.
+         * @param {...Object} sources The source objects.
+         * @param {Function} [customizer] The function to customize assigned values.
+         * @returns {Object} Returns `object`.
+         * @example
+         *
+         * function customizer(objValue, srcValue) {
+         *   return _.isUndefined(objValue) ? srcValue : objValue;
+         * }
+         *
+         * var defaults = _.partialRight(_.assignInWith, customizer);
+         *
+         * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+         * // => { 'a': 1, 'b': 2 }
+         */
+        assignInWith<TObject extends {}, TSource extends {}, TResult extends {}>(
+            object: TObject,
+            source: TSource,
+            customizer: AssignCustomizer
+        ): TResult;
+
+        /**
+         * @see assignInWith
+         */
+        assignInWith<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            customizer: AssignCustomizer
+        ): TResult;
+
+        /**
+         * @see assignInWith
+         */
+        assignInWith<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer: AssignCustomizer
+        ): TResult;
+
+        /**
+         * @see assignInWith
+         */
+        assignInWith<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {},
+            TResult extends {}>
+        (
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4,
+            customizer: AssignCustomizer
+        ): TResult;
+
+        /**
+         * @see _.assignInWith
+         */
+        assignInWith<TObject extends {}>(object: TObject): TObject;
+
+        /**
+         * @see _.assignInWith
+         */
+        assignInWith<TObject extends {}, TResult extends {}>(
+            object: TObject, ...otherArgs: any[]
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.assignInWith
+         */
+        assignInWith<TSource extends {}, TResult extends {}>(
+            source: TSource,
+            customizer: AssignCustomizer
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assignInWith
+         */
+        assignInWith<TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            customizer: AssignCustomizer
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assignInWith
+         */
+        assignInWith<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer: AssignCustomizer
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assignInWith
+         */
+        assignInWith<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4,
+            customizer: AssignCustomizer
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.assignInWith
+         */
+        assignInWith(): LoDashImplicitObjectWrapper<T>;
+
+        /**
+         * @see _.assignInWith
+         */
+        assignInWith<TResult extends {}>(...otherArgs: any[]): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.assignInWith
+         */
+        assignInWith<TSource extends {}, TResult extends {}>(
+            source: TSource,
+            customizer: AssignCustomizer
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assignInWith
+         */
+        assignInWith<TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            customizer: AssignCustomizer
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assignInWith
+         */
+        assignInWith<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer: AssignCustomizer
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assignInWith
+         */
+        assignInWith<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4,
+            customizer: AssignCustomizer
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.assignInWith
+         */
+        assignInWith(): LoDashExplicitObjectWrapper<T>;
+
+        /**
+         * @see _.assignInWith
+         */
+        assignInWith<TResult extends {}>(...otherArgs: any[]): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.create
+    interface LoDashStatic {
+        /**
+         * Creates an object that inherits from the given prototype object. If a properties object is provided its own
+         * enumerable properties are assigned to the created object.
+         *
+         * @param prototype The object to inherit from.
+         * @param properties The properties to assign to the object.
+         * @return Returns the new object.
+         */
+        create<T extends Object, U extends Object>(
+            prototype: T,
+            properties?: U
+        ): T & U;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.create
+         */
+        create<U extends Object>(properties?: U): LoDashImplicitObjectWrapper<T & U>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.create
+         */
+        create<U extends Object>(properties?: U): LoDashExplicitObjectWrapper<T & U>;
+    }
+
+    //_.defaults
+    interface LoDashStatic {
+        /**
+         * Assigns own enumerable properties of source object(s) to the destination object for all destination
+         * properties that resolve to undefined. Once a property is set, additional values of the same property are
+         * ignored.
+         *
+         * Note: This method mutates object.
+         *
+         * @param object The destination object.
+         * @param sources The source objects.
+         * @return The destination object.
+         */
+        defaults<Obj extends {}, TResult extends {}>(
+            object: Obj,
+            ...sources: {}[]
+        ): TResult;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<Obj extends {}, S1 extends {}, TResult extends {}>(
+            object: Obj,
+            source1: S1,
+            ...sources: {}[]
+        ): TResult;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<Obj extends {}, S1 extends {}, S2 extends {}, TResult extends {}>(
+            object: Obj,
+            source1: S1,
+            source2: S2,
+            ...sources: {}[]
+        ): TResult;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<Obj extends {}, S1 extends {}, S2 extends {}, S3 extends {}, TResult extends {}>(
+            object: Obj,
+            source1: S1,
+            source2: S2,
+            source3: S3,
+            ...sources: {}[]
+        ): TResult;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<Obj extends {}, S1 extends {}, S2 extends {}, S3 extends {}, S4 extends {}, TResult extends {}>(
+            object: Obj,
+            source1: S1,
+            source2: S2,
+            source3: S3,
+            source4: S4,
+            ...sources: {}[]
+        ): TResult;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<TResult extends {}>(
+            object: {},
+            ...sources: {}[]
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.defaults
+         */
+        defaults<S1 extends {}, TResult extends {}>(
+            source1: S1,
+            ...sources: {}[]
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<S1 extends {}, S2 extends {}, TResult extends {}>(
+            source1: S1,
+            source2: S2,
+            ...sources: {}[]
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<S1 extends {}, S2 extends {}, S3 extends {}, TResult extends {}>(
+            source1: S1,
+            source2: S2,
+            source3: S3,
+            ...sources: {}[]
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<S1 extends {}, S2 extends {}, S3 extends {}, S4 extends {}, TResult extends {}>(
+            source1: S1,
+            source2: S2,
+            source3: S3,
+            source4: S4,
+            ...sources: {}[]
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.defaults
+         */
+        defaults(): LoDashImplicitObjectWrapper<T>;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<TResult>(...sources: {}[]): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.defaults
+         */
+        defaults<S1 extends {}, TResult extends {}>(
+            source1: S1,
+            ...sources: {}[]
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<S1 extends {}, S2 extends {}, TResult extends {}>(
+            source1: S1,
+            source2: S2,
+            ...sources: {}[]
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<S1 extends {}, S2 extends {}, S3 extends {}, TResult extends {}>(
+            source1: S1,
+            source2: S2,
+            source3: S3,
+            ...sources: {}[]
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<S1 extends {}, S2 extends {}, S3 extends {}, S4 extends {}, TResult extends {}>(
+            source1: S1,
+            source2: S2,
+            source3: S3,
+            source4: S4,
+            ...sources: {}[]
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.defaults
+         */
+        defaults(): LoDashExplicitObjectWrapper<T>;
+
+        /**
+         * @see _.defaults
+         */
+        defaults<TResult>(...sources: {}[]): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.defaultsDeep
+    interface LoDashStatic {
+        /**
+         * This method is like _.defaults except that it recursively assigns default properties.
+         * @param object The destination object.
+         * @param sources The source objects.
+         * @return Returns object.
+         **/
+        defaultsDeep<T, TResult>(
+            object: T,
+            ...sources: any[]): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.defaultsDeep
+         **/
+        defaultsDeep<TResult>(...sources: any[]): LoDashImplicitObjectWrapper<TResult>
+    }
+
+    //_.extend
+    interface LoDashStatic {
+        /**
+         * @see assign
+         */
+        extend<TObject extends {}, TSource extends {}, TResult extends {}>(
+            object: TObject,
+            source: TSource,
+            customizer?: AssignCustomizer
+        ): TResult;
+
+        /**
+         * @see assign
+         */
+        extend<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            customizer?: AssignCustomizer
+        ): TResult;
+
+        /**
+         * @see assign
+         */
+        extend<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer?: AssignCustomizer
+        ): TResult;
+
+        /**
+         * @see assign
+         */
+        extend<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {},
+            TResult extends {}>
+            (
+                object: TObject,
+                source1: TSource1,
+                source2: TSource2,
+                source3: TSource3,
+                source4: TSource4,
+                customizer?: AssignCustomizer
+            ): TResult;
+
+        /**
+         * @see _.assign
+         */
+        extend<TObject extends {}>(object: TObject): TObject;
+
+        /**
+         * @see _.assign
+         */
+        extend<TObject extends {}, TResult extends {}>(
+            object: TObject, ...otherArgs: any[]
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.assign
+         */
+        extend<TSource extends {}, TResult extends {}>(
+            source: TSource,
+            customizer?: AssignCustomizer
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assign
+         */
+        extend<TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            customizer?: AssignCustomizer
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assign
+         */
+        extend<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer?: AssignCustomizer
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assign
+         */
+        extend<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4,
+            customizer?: AssignCustomizer
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.assign
+         */
+        extend(): LoDashImplicitObjectWrapper<T>;
+
+        /**
+         * @see _.assign
+         */
+        extend<TResult extends {}>(...otherArgs: any[]): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.assign
+         */
+        extend<TSource extends {}, TResult extends {}>(
+            source: TSource,
+            customizer?: AssignCustomizer
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assign
+         */
+        extend<TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            customizer?: AssignCustomizer
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assign
+         */
+        extend<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer?: AssignCustomizer
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see assign
+         */
+        extend<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {}, TResult extends {}>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4,
+            customizer?: AssignCustomizer
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.assign
+         */
+        extend(): LoDashExplicitObjectWrapper<T>;
+
+        /**
+         * @see _.assign
+         */
+        extend<TResult extends {}>(...otherArgs: any[]): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.findKey
+    interface LoDashStatic {
+        /**
+         * This method is like _.find except that it returns the key of the first element predicate returns truthy for
+         * instead of the element itself.
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param object The object to search.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the key of the matched element, else undefined.
+         */
+        findKey<TValues, TObject>(
+            object: TObject,
+            predicate?: DictionaryIterator<TValues, boolean>
+        ): string;
+
+        /**
+         * @see _.findKey
+         */
+        findKey<TObject>(
+            object: TObject,
+            predicate?: ObjectIterator<any, boolean>
+        ): string;
+
+        /**
+         * @see _.findKey
+         */
+        findKey<TObject>(
+            object: TObject,
+            predicate?: string
+        ): string;
+
+        /**
+         * @see _.findKey
+         */
+        findKey<TWhere extends Dictionary<any>, TObject>(
+            object: TObject,
+            predicate?: TWhere
+        ): string;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.findKey
+         */
+        findKey<TValues>(
+            predicate?: DictionaryIterator<TValues, boolean>
+        ): string;
+
+        /**
+         * @see _.findKey
+         */
+        findKey(
+            predicate?: ObjectIterator<any, boolean>
+        ): string;
+
+        /**
+         * @see _.findKey
+         */
+        findKey(
+            predicate?: string
+        ): string;
+
+        /**
+         * @see _.findKey
+         */
+        findKey<TWhere extends Dictionary<any>>(
+            predicate?: TWhere
+        ): string;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.findKey
+         */
+        findKey<TValues>(
+            predicate?: DictionaryIterator<TValues, boolean>
+        ): LoDashExplicitWrapper<string>;
+
+        /**
+         * @see _.findKey
+         */
+        findKey(
+            predicate?: ObjectIterator<any, boolean>
+        ): LoDashExplicitWrapper<string>;
+
+        /**
+         * @see _.findKey
+         */
+        findKey(
+            predicate?: string
+        ): LoDashExplicitWrapper<string>;
+
+        /**
+         * @see _.findKey
+         */
+        findKey<TWhere extends Dictionary<any>>(
+            predicate?: TWhere
+        ): LoDashExplicitWrapper<string>;
+    }
+
+    //_.findLastKey
+    interface LoDashStatic {
+        /**
+         * This method is like _.findKey except that it iterates over elements of a collection in the opposite order.
+         *
+         * If a property name is provided for predicate the created _.property style callback returns the property
+         * value of the given element.
+         *
+         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+         * elements that have a matching property value, else false.
+         *
+         * If an object is provided for predicate the created _.matches style callback returns true for elements that
+         * have the properties of the given object, else false.
+         *
+         * @param object The object to search.
+         * @param predicate The function invoked per iteration.
+         * @param thisArg The this binding of predicate.
+         * @return Returns the key of the matched element, else undefined.
+         */
+        findLastKey<TValues, TObject>(
+            object: TObject,
+            predicate?: DictionaryIterator<TValues, boolean>
+        ): string;
+
+        /**
+         * @see _.findLastKey
+         */
+        findLastKey<TObject>(
+            object: TObject,
+            predicate?: ObjectIterator<any, boolean>
+        ): string;
+
+        /**
+         * @see _.findLastKey
+         */
+        findLastKey<TObject>(
+            object: TObject,
+            predicate?: string
+        ): string;
+
+        /**
+         * @see _.findLastKey
+         */
+        findLastKey<TWhere extends Dictionary<any>, TObject>(
+            object: TObject,
+            predicate?: TWhere
+        ): string;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.findLastKey
+         */
+        findLastKey<TValues>(
+            predicate?: DictionaryIterator<TValues, boolean>
+        ): string;
+
+        /**
+         * @see _.findLastKey
+         */
+        findLastKey(
+            predicate?: ObjectIterator<any, boolean>
+        ): string;
+
+        /**
+         * @see _.findLastKey
+         */
+        findLastKey(
+            predicate?: string
+        ): string;
+
+        /**
+         * @see _.findLastKey
+         */
+        findLastKey<TWhere extends Dictionary<any>>(
+            predicate?: TWhere
+        ): string;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.findLastKey
+         */
+        findLastKey<TValues>(
+            predicate?: DictionaryIterator<TValues, boolean>
+        ): LoDashExplicitWrapper<string>;
+
+        /**
+         * @see _.findLastKey
+         */
+        findLastKey(
+            predicate?: ObjectIterator<any, boolean>
+        ): LoDashExplicitWrapper<string>;
+
+        /**
+         * @see _.findLastKey
+         */
+        findLastKey(
+            predicate?: string
+        ): LoDashExplicitWrapper<string>;
+
+        /**
+         * @see _.findLastKey
+         */
+        findLastKey<TWhere extends Dictionary<any>>(
+            predicate?: TWhere
+        ): LoDashExplicitWrapper<string>;
+    }
+
+    //_.forIn
+    interface LoDashStatic {
+        /**
+         * Iterates over own and inherited enumerable properties of an object invoking iteratee for each property. The
+         * iteratee is bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may
+         * exit iteration early by explicitly returning false.
+         *
+         * @param object The object to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns object.
+         */
+        forIn<T>(
+            object: Dictionary<T>,
+            iteratee?: DictionaryIterator<T, any>
+        ): Dictionary<T>;
+
+        /**
+         * @see _.forIn
+         */
+        forIn<T extends {}>(
+            object: T,
+            iteratee?: ObjectIterator<any, any>
+        ): T;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.forIn
+         */
+        forIn<TValue>(
+            iteratee?: DictionaryIterator<TValue, any>
+        ): _.LoDashImplicitObjectWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.forIn
+         */
+        forIn<TValue>(
+            iteratee?: DictionaryIterator<TValue, any>
+        ): _.LoDashExplicitObjectWrapper<T>;
+    }
+
+    //_.forInRight
+    interface LoDashStatic {
+        /**
+         * This method is like _.forIn except that it iterates over properties of object in the opposite order.
+         *
+         * @param object The object to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns object.
+         */
+        forInRight<T>(
+            object: Dictionary<T>,
+            iteratee?: DictionaryIterator<T, any>
+        ): Dictionary<T>;
+
+        /**
+         * @see _.forInRight
+         */
+        forInRight<T extends {}>(
+            object: T,
+            iteratee?: ObjectIterator<any, any>
+        ): T;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.forInRight
+         */
+        forInRight<TValue>(
+            iteratee?: DictionaryIterator<TValue, any>
+        ): _.LoDashImplicitObjectWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.forInRight
+         */
+        forInRight<TValue>(
+            iteratee?: DictionaryIterator<TValue, any>
+        ): _.LoDashExplicitObjectWrapper<T>;
+    }
+
+    //_.forOwn
+    interface LoDashStatic {
+        /**
+         * Iterates over own enumerable properties of an object invoking iteratee for each property. The iteratee is
+         * bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may exit
+         * iteration early by explicitly returning false.
+         *
+         * @param object The object to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns object.
+         */
+        forOwn<T>(
+            object: Dictionary<T>,
+            iteratee?: DictionaryIterator<T, any>
+        ): Dictionary<T>;
+
+        /**
+         * @see _.forOwn
+         */
+        forOwn<T extends {}>(
+            object: T,
+            iteratee?: ObjectIterator<any, any>
+        ): T;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.forOwn
+         */
+        forOwn<TValue>(
+            iteratee?: DictionaryIterator<TValue, any>
+        ): _.LoDashImplicitObjectWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.forOwn
+         */
+        forOwn<TValue>(
+            iteratee?: DictionaryIterator<TValue, any>
+        ): _.LoDashExplicitObjectWrapper<T>;
+    }
+
+    //_.forOwnRight
+    interface LoDashStatic {
+        /**
+         * This method is like _.forOwn except that it iterates over properties of object in the opposite order.
+         *
+         * @param object The object to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns object.
+         */
+        forOwnRight<T>(
+            object: Dictionary<T>,
+            iteratee?: DictionaryIterator<T, any>
+        ): Dictionary<T>;
+
+        /**
+         * @see _.forOwnRight
+         */
+        forOwnRight<T extends {}>(
+            object: T,
+            iteratee?: ObjectIterator<any, any>
+        ): T;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.forOwnRight
+         */
+        forOwnRight<TValue>(
+            iteratee?: DictionaryIterator<TValue, any>
+        ): _.LoDashImplicitObjectWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.forOwnRight
+         */
+        forOwnRight<TValue>(
+            iteratee?: DictionaryIterator<TValue, any>
+        ): _.LoDashExplicitObjectWrapper<T>;
+    }
+
+    //_.functions
+    interface LoDashStatic {
+        /**
+         * Creates an array of function property names from own enumerable properties
+         * of `object`.
+         *
+         * @static
+         * @memberOf _
+         * @category Object
+         * @param {Object} object The object to inspect.
+         * @returns {Array} Returns the new array of property names.
+         * @example
+         *
+         * function Foo() {
+         *   this.a = _.constant('a');
+         *   this.b = _.constant('b');
+         * }
+         *
+         * Foo.prototype.c = _.constant('c');
+         *
+         * _.functions(new Foo);
+         * // => ['a', 'b']
+         */
+        functions<T extends {}>(object: any): string[];
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.functions
+         */
+        functions(): _.LoDashImplicitArrayWrapper<string>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.functions
+         */
+        functions(): _.LoDashExplicitArrayWrapper<string>;
+    }
+
+    //_.functionsIn
+    interface LoDashStatic {
+        /**
+         * Creates an array of function property names from own and inherited
+         * enumerable properties of `object`.
+         *
+         * @static
+         * @memberOf _
+         * @category Object
+         * @param {Object} object The object to inspect.
+         * @returns {Array} Returns the new array of property names.
+         * @example
+         *
+         * function Foo() {
+         *   this.a = _.constant('a');
+         *   this.b = _.constant('b');
+         * }
+         *
+         * Foo.prototype.c = _.constant('c');
+         *
+         * _.functionsIn(new Foo);
+         * // => ['a', 'b', 'c']
+         */
+        functionsIn<T extends {}>(object: any): string[];
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.functionsIn
+         */
+        functionsIn(): _.LoDashImplicitArrayWrapper<string>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.functionsIn
+         */
+        functionsIn(): _.LoDashExplicitArrayWrapper<string>;
+    }
+
+    //_.get
+    interface LoDashStatic {
+        /**
+         * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+         * in its place.
+         *
+         * @param object The object to query.
+         * @param path The path of the property to get.
+         * @param defaultValue The value returned if the resolved value is undefined.
+         * @return Returns the resolved value.
+         */
+        get<TObject, TResult>(
+            object: TObject,
+            path: StringRepresentable|StringRepresentable[],
+            defaultValue?: TResult
+        ): TResult;
+
+        /**
+         * @see _.get
+         */
+        get<TResult>(
+            object: any,
+            path: StringRepresentable|StringRepresentable[],
+            defaultValue?: TResult
+        ): TResult;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.get
+         */
+        get<TResult>(
+            path: StringRepresentable|StringRepresentable[],
+            defaultValue?: TResult
+        ): TResult;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.get
+         */
+        get<TResult>(
+            path: StringRepresentable|StringRepresentable[],
+            defaultValue?: TResult
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.get
+         */
+        get<TResult>(
+            path: StringRepresentable|StringRepresentable[],
+            defaultValue?: TResult
+        ): TResult;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.get
+         */
+        get<TResultWrapper>(
+            path: StringRepresentable|StringRepresentable[],
+            defaultValue?: any
+        ): TResultWrapper;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.get
+         */
+        get<TResultWrapper>(
+            path: StringRepresentable|StringRepresentable[],
+            defaultValue?: any
+        ): TResultWrapper;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.get
+         */
+        get<TResultWrapper>(
+            path: StringRepresentable|StringRepresentable[],
+            defaultValue?: any
+        ): TResultWrapper;
+    }
+
+    //_.has
+    interface LoDashStatic {
+        /**
+         * Checks if `path` is a direct property of `object`.
+         *
+         * @static
+         * @memberOf _
+         * @category Object
+         * @param {Object} object The object to query.
+         * @param {Array|string} path The path to check.
+         * @returns {boolean} Returns `true` if `path` exists, else `false`.
+         * @example
+         *
+         * var object = { 'a': { 'b': { 'c': 3 } } };
+         * var other = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
+         *
+         * _.has(object, 'a');
+         * // => true
+         *
+         * _.has(object, 'a.b.c');
+         * // => true
+         *
+         * _.has(object, ['a', 'b', 'c']);
+         * // => true
+         *
+         * _.has(other, 'a');
+         * // => false
+         */
+        has<T extends {}>(
+            object: T,
+            path: StringRepresentable|StringRepresentable[]
+        ): boolean;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.has
+         */
+        has(path: StringRepresentable|StringRepresentable[]): boolean;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.has
+         */
+        has(path: StringRepresentable|StringRepresentable[]): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.hasIn
+    interface LoDashStatic {
+        /**
+         * Checks if `path` is a direct or inherited property of `object`.
+         *
+         * @static
+         * @memberOf _
+         * @category Object
+         * @param {Object} object The object to query.
+         * @param {Array|string} path The path to check.
+         * @returns {boolean} Returns `true` if `path` exists, else `false`.
+         * @example
+         *
+         * var object = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
+         *
+         * _.hasIn(object, 'a');
+         * // => true
+         *
+         * _.hasIn(object, 'a.b.c');
+         * // => true
+         *
+         * _.hasIn(object, ['a', 'b', 'c']);
+         * // => true
+         *
+         * _.hasIn(object, 'b');
+         * // => false
+         */
+        hasIn<T extends {}>(
+            object: T,
+            path: StringRepresentable|StringRepresentable[]
+        ): boolean;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.hasIn
+         */
+        hasIn(path: StringRepresentable|StringRepresentable[]): boolean;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.hasIn
+         */
+        hasIn(path: StringRepresentable|StringRepresentable[]): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.invert
+    interface LoDashStatic {
+        /**
+         * Creates an object composed of the inverted keys and values of object. If object contains duplicate values,
+         * subsequent values overwrite property assignments of previous values unless multiValue is true.
+         *
+         * @param object The object to invert.
+         * @param multiValue Allow multiple values per key.
+         * @return Returns the new inverted object.
+         */
+        invert<T extends {}, TResult extends {}>(
+            object: T,
+            multiValue?: boolean
+        ): TResult;
+
+        /**
+         * @see _.invert
+         */
+        invert<TResult extends {}>(
+            object: Object,
+            multiValue?: boolean
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.invert
+         */
+        invert<TResult extends {}>(multiValue?: boolean): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.invert
+         */
+        invert<TResult extends {}>(multiValue?: boolean): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.inverBy
+    interface InvertByIterator<T> {
+        (value: T): any;
+    }
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.invert except that the inverted object is generated from the results of running each
+         * element of object through iteratee. The corresponding inverted value of each inverted key is an array of
+         * keys responsible for generating the inverted value. The iteratee is invoked with one argument: (value).
+         *
+         * @param object The object to invert.
+         * @param interatee The iteratee invoked per element.
+         * @return Returns the new inverted object.
+         */
+        invertBy(
+            object: Object,
+            interatee?: InvertByIterator<any>|string
+        ): Dictionary<string[]>;
+
+        /**
+         * @see _.invertBy
+         */
+        invertBy<T>(
+            object: _.Dictionary<T>|_.NumericDictionary<T>,
+            interatee?: InvertByIterator<T>|string
+        ): Dictionary<string[]>;
+
+        /**
+         * @see _.invertBy
+         */
+        invertBy<W>(
+            object: Object,
+            interatee?: W
+        ): Dictionary<string[]>;
+
+        /**
+         * @see _.invertBy
+         */
+        invertBy<T, W>(
+            object: _.Dictionary<T>,
+            interatee?: W
+        ): Dictionary<string[]>;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.invertBy
+         */
+        invertBy(
+            interatee?: InvertByIterator<any>
+        ): LoDashImplicitObjectWrapper<Dictionary<string[]>>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.invertBy
+         */
+        invertBy(
+            interatee?: InvertByIterator<T>|string
+        ): LoDashImplicitObjectWrapper<Dictionary<string[]>>;
+
+        /**
+         * @see _.invertBy
+         */
+        invertBy<W>(
+            interatee?: W
+        ): LoDashImplicitObjectWrapper<Dictionary<string[]>>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.invertBy
+         */
+        invertBy(
+            interatee?: InvertByIterator<any>|string
+        ): LoDashImplicitObjectWrapper<Dictionary<string[]>>;
+
+        /**
+         * @see _.invertBy
+         */
+        invertBy<W>(
+            interatee?: W
+        ): LoDashImplicitObjectWrapper<Dictionary<string[]>>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.invertBy
+         */
+        invertBy(
+            interatee?: InvertByIterator<any>
+        ): LoDashExplicitObjectWrapper<Dictionary<string[]>>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.invertBy
+         */
+        invertBy(
+            interatee?: InvertByIterator<T>|string
+        ): LoDashExplicitObjectWrapper<Dictionary<string[]>>;
+
+        /**
+         * @see _.invertBy
+         */
+        invertBy<W>(
+            interatee?: W
+        ): LoDashExplicitObjectWrapper<Dictionary<string[]>>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.invertBy
+         */
+        invertBy(
+            interatee?: InvertByIterator<any>|string
+        ): LoDashExplicitObjectWrapper<Dictionary<string[]>>;
+
+        /**
+         * @see _.invertBy
+         */
+        invertBy<W>(
+            interatee?: W
+        ): LoDashExplicitObjectWrapper<Dictionary<string[]>>;
+    }
+
+    //_.keys
+    interface LoDashStatic {
+        /**
+         * Creates an array of the own enumerable property names of object.
+         *
+         * Note: Non-object values are coerced to objects. See the ES spec for more details.
+         *
+         * @param object The object to query.
+         * @return Returns the array of property names.
+         */
+        keys(object?: any): string[];
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.keys
+         */
+        keys(): LoDashImplicitArrayWrapper<string>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.keys
+         */
+        keys(): LoDashExplicitArrayWrapper<string>;
+    }
+
+    //_.keysIn
+    interface LoDashStatic {
+        /**
+         * Creates an array of the own and inherited enumerable property names of object.
+         *
+         * Note: Non-object values are coerced to objects.
+         *
+         * @param object The object to query.
+         * @return An array of property names.
+         */
+        keysIn(object?: any): string[];
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.keysIn
+         */
+        keysIn(): LoDashImplicitArrayWrapper<string>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.keysIn
+         */
+        keysIn(): LoDashExplicitArrayWrapper<string>;
+    }
+
+    //_.mapKeys
+    interface LoDashStatic {
+        /**
+         * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
+         * by running each own enumerable property of object through iteratee.
+         *
+         * @param object The object to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns the new mapped object.
+         */
+        mapKeys<T, TKey>(
+            object: List<T>,
+            iteratee?: ListIterator<T, TKey>
+        ): Dictionary<T>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<T, TKey>(
+            object: Dictionary<T>,
+            iteratee?: DictionaryIterator<T, TKey>
+        ): Dictionary<T>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<T, TObject extends {}>(
+            object: List<T>|Dictionary<T>,
+            iteratee?: TObject
+        ): Dictionary<T>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<T>(
+            object: List<T>|Dictionary<T>,
+            iteratee?: string
+        ): Dictionary<T>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<TKey>(
+            iteratee?: ListIterator<T, TKey>
+        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<TObject extends {}>(
+            iteratee?: TObject
+        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys(
+            iteratee?: string
+        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<TResult, TKey>(
+            iteratee?: ListIterator<TResult, TKey>|DictionaryIterator<TResult, TKey>
+        ): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<TResult, TObject extends {}>(
+            iteratee?: TObject
+        ): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<TResult>(
+            iteratee?: string
+        ): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<TKey>(
+            iteratee?: ListIterator<T, TKey>
+        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<TObject extends {}>(
+            iteratee?: TObject
+        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys(
+            iteratee?: string
+        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<TResult, TKey>(
+            iteratee?: ListIterator<TResult, TKey>|DictionaryIterator<TResult, TKey>
+        ): LoDashExplicitObjectWrapper<Dictionary<TResult>>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<TResult, TObject extends {}>(
+            iteratee?: TObject
+        ): LoDashExplicitObjectWrapper<Dictionary<TResult>>;
+
+        /**
+         * @see _.mapKeys
+         */
+        mapKeys<TResult>(
+            iteratee?: string
+        ): LoDashExplicitObjectWrapper<Dictionary<TResult>>;
+    }
+
+    //_.mapValues
+    interface LoDashStatic {
+        /**
+        * Creates an object with the same keys as object and values generated by running each own
+        * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+        * and invoked with three arguments: (value, key, object).
+        *
+        * If a property name is provided iteratee the created "_.property" style callback returns
+        * the property value of the given element.
+        *
+        * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+        * true for elements that have a matching property value, else false;.
+        *
+        * If an object is provided for iteratee the created "_.matches" style callback returns true
+        * for elements that have the properties of the given object, else false.
+        *
+        * @param {Object} object The object to iterate over.
+        * @param {Function|Object|string} [iteratee=_.identity]  The function invoked per iteration.
+        * @param {Object} [thisArg] The `this` binding of `iteratee`.
+        * @return {Object} Returns the new mapped object.
+        */
+        mapValues<T, TResult>(obj: Dictionary<T>, callback: ObjectIterator<T, TResult>): Dictionary<TResult>;
+        mapValues<T>(obj: Dictionary<T>, where: Dictionary<T>): Dictionary<boolean>;
+        mapValues<T, TMapped>(obj: T, pluck: string): TMapped;
+        mapValues<T>(obj: T, callback: ObjectIterator<any, any>): T;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.mapValues
+         * TValue is the type of the property values of T.
+         * TResult is the type output by the ObjectIterator function
+         */
+        mapValues<TValue, TResult>(callback: ObjectIterator<TValue, TResult>): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
+
+        /**
+         * @see _.mapValues
+         * TResult is the type of the property specified by pluck.
+         * T should be a Dictionary<Dictionary<TResult>>
+         */
+        mapValues<TResult>(pluck: string): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
+
+        /**
+         * @see _.mapValues
+         * TResult is the type of the properties of each object in the values of T
+         * T should be a Dictionary<Dictionary<TResult>>
+         */
+        mapValues<TResult>(where: Dictionary<TResult>): LoDashImplicitArrayWrapper<boolean>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.mapValues
+         * TValue is the type of the property values of T.
+         * TResult is the type output by the ObjectIterator function
+         */
+        mapValues<TValue, TResult>(callback: ObjectIterator<TValue, TResult>): LoDashExplicitObjectWrapper<Dictionary<TResult>>;
+
+        /**
+         * @see _.mapValues
+         * TResult is the type of the property specified by pluck.
+         * T should be a Dictionary<Dictionary<TResult>>
+         */
+        mapValues<TResult>(pluck: string): LoDashExplicitObjectWrapper<Dictionary<TResult>>;
+
+        /**
+         * @see _.mapValues
+         * TResult is the type of the properties of each object in the values of T
+         * T should be a Dictionary<Dictionary<TResult>>
+         */
+        mapValues<TResult>(where: Dictionary<TResult>): LoDashExplicitObjectWrapper<boolean>;
+    }
+
+    //_.merge
+    interface LoDashStatic {
+        /**
+         * Recursively merges own and inherited enumerable properties of source
+         * objects into the destination object, skipping source properties that resolve
+         * to `undefined`. Array and plain object properties are merged recursively.
+         * Other objects and value types are overridden by assignment. Source objects
+         * are applied from left to right. Subsequent sources overwrite property
+         * assignments of previous sources.
+         *
+         * **Note:** This method mutates `object`.
+         *
+         * @static
+         * @memberOf _
+         * @category Object
+         * @param {Object} object The destination object.
+         * @param {...Object} [sources] The source objects.
+         * @returns {Object} Returns `object`.
+         * @example
+         *
+         * var users = {
+         *   'data': [{ 'user': 'barney' }, { 'user': 'fred' }]
+         * };
+         *
+         * var ages = {
+         *   'data': [{ 'age': 36 }, { 'age': 40 }]
+         * };
+         *
+         * _.merge(users, ages);
+         * // => { 'data': [{ 'user': 'barney', 'age': 36 }, { 'user': 'fred', 'age': 40 }] }
+         */
+        merge<TObject, TSource>(
+            object: TObject,
+            source: TSource
+        ): TObject & TSource;
+
+        /**
+         * @see _.merge
+         */
+        merge<TObject, TSource1, TSource2>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2
+        ): TObject & TSource1 & TSource2;
+
+        /**
+         * @see _.merge
+         */
+        merge<TObject, TSource1, TSource2, TSource3>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): TObject & TSource1 & TSource2 & TSource3;
+
+        /**
+         * @see _.merge
+         */
+        merge<TObject, TSource1, TSource2, TSource3, TSource4>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
+        ): TObject & TSource1 & TSource2 & TSource3 & TSource4;
+
+        /**
+         * @see _.merge
+         */
+        merge<TResult>(
+            object: any,
+            ...otherArgs: any[]
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.merge
+         */
+        merge<TSource>(
+            source: TSource
+        ): LoDashImplicitObjectWrapper<T & TSource>;
+
+        /**
+         * @see _.merge
+         */
+        merge<TSource1, TSource2>(
+            source1: TSource1,
+            source2: TSource2
+        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2>;
+
+        /**
+         * @see _.merge
+         */
+        merge<TSource1, TSource2, TSource3>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3>;
+
+        /**
+         * @see _.merge
+         */
+        merge<TSource1, TSource2, TSource3, TSource4>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
+        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3 & TSource4>;
+
+        /**
+         * @see _.merge
+         */
+        merge<TResult>(
+            ...otherArgs: any[]
+        ): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.merge
+         */
+        merge<TSource>(
+            source: TSource
+        ): LoDashExplicitObjectWrapper<T & TSource>;
+
+        /**
+         * @see _.merge
+         */
+        merge<TSource1, TSource2>(
+            source1: TSource1,
+            source2: TSource2
+        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2>;
+
+        /**
+         * @see _.merge
+         */
+        merge<TSource1, TSource2, TSource3>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3
+        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2 & TSource3>;
+
+        /**
+         * @see _.merge
+         */
+        merge<TSource1, TSource2, TSource3, TSource4>(
+        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2 & TSource3 & TSource4>;
+
+        /**
+         * @see _.merge
+         */
+        merge<TResult>(
+            ...otherArgs: any[]
+        ): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.mergeWith
+    interface MergeWithCustomizer {
+        (value: any, srcValue: any, key?: string, object?: Object, source?: Object): any;
+    }
+
+    interface LoDashStatic {
+        /**
+         * This method is like `_.merge` except that it accepts `customizer` which
+         * is invoked to produce the merged values of the destination and source
+         * properties. If `customizer` returns `undefined` merging is handled by the
+         * method instead. The `customizer` is invoked with seven arguments:
+         * (objValue, srcValue, key, object, source, stack).
+         *
+         * @static
+         * @memberOf _
+         * @category Object
+         * @param {Object} object The destination object.
+         * @param {...Object} sources The source objects.
+         * @param {Function} customizer The function to customize assigned values.
+         * @returns {Object} Returns `object`.
+         * @example
+         *
+         * function customizer(objValue, srcValue) {
+         *   if (_.isArray(objValue)) {
+         *     return objValue.concat(srcValue);
+         *   }
+         * }
+         *
+         * var object = {
+         *   'fruits': ['apple'],
+         *   'vegetables': ['beet']
+         * };
+         *
+         * var other = {
+         *   'fruits': ['banana'],
+         *   'vegetables': ['carrot']
+         * };
+         *
+         * _.merge(object, other, customizer);
+         * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
+         */
+        mergeWith<TObject, TSource>(
+            object: TObject,
+            source: TSource,
+            customizer: MergeWithCustomizer
+        ): TObject & TSource;
+
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith<TObject, TSource1, TSource2>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            customizer: MergeWithCustomizer
+        ): TObject & TSource1 & TSource2;
+
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith<TObject, TSource1, TSource2, TSource3>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer: MergeWithCustomizer
+        ): TObject & TSource1 & TSource2 & TSource3;
+
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith<TObject, TSource1, TSource2, TSource3, TSource4>(
+            object: TObject,
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4,
+            customizer: MergeWithCustomizer
+        ): TObject & TSource1 & TSource2 & TSource3 & TSource4;
+
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith<TResult>(
+            object: any,
+            ...otherArgs: any[]
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith<TSource>(
+            source: TSource,
+            customizer: MergeWithCustomizer
+        ): LoDashImplicitObjectWrapper<T & TSource>;
+
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith<TSource1, TSource2>(
+            source1: TSource1,
+            source2: TSource2,
+            customizer: MergeWithCustomizer
+        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2>;
+
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith<TSource1, TSource2, TSource3>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer: MergeWithCustomizer
+        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3>;
+
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith<TSource1, TSource2, TSource3, TSource4>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4,
+            customizer: MergeWithCustomizer
+        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3 & TSource4>;
+
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith<TResult>(
+            ...otherArgs: any[]
+        ): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    //_.omit
+    interface LoDashStatic {
+        /**
+         * The opposite of `_.pick`; this method creates an object composed of the
+         * own and inherited enumerable properties of `object` that are not omitted.
+         *
+         * @static
+         * @memberOf _
+         * @category Object
+         * @param {Object} object The source object.
+         * @param {...(string|string[])} [props] The property names to omit, specified
+         *  individually or in arrays..
+         * @returns {Object} Returns the new object.
+         * @example
+         *
+         * var object = { 'a': 1, 'b': '2', 'c': 3 };
+         *
+         * _.omit(object, ['a', 'c']);
+         * // => { 'b': '2' }
+         */
+
+        omit<TResult extends {}, T extends {}>(
+            object: T,
+            ...predicate: (StringRepresentable|StringRepresentable[])[]
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+
+        /**
+         * @see _.omit
+         */
+        omit<TResult extends {}>(
+            ...predicate: (StringRepresentable|StringRepresentable[])[]
+        ): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+
+        /**
+         * @see _.omit
+         */
+        omit<TResult extends {}>(
+            ...predicate: (StringRepresentable|StringRepresentable[])[]
+        ): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.omitBy
+    interface LoDashStatic {
+        /**
+         * The opposite of `_.pickBy`; this method creates an object composed of the
+         * own and inherited enumerable properties of `object` that `predicate`
+         * doesn't return truthy for.
+         *
+         * @static
+         * @memberOf _
+         * @category Object
+         * @param {Object} object The source object.
+         * @param {Function|Object|string} [predicate=_.identity] The function invoked per property.
+         * @returns {Object} Returns the new object.
+         * @example
+         *
+         * var object = { 'a': 1, 'b': '2', 'c': 3 };
+         *
+         * _.omitBy(object, _.isNumber);
+         * // => { 'b': '2' }
+         */
+        omitBy<TResult extends {}, T extends {}>(
+            object: T,
+            predicate: ObjectIterator<any, boolean>
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.omitBy
+         */
+        omitBy<TResult extends {}>(
+            predicate: ObjectIterator<any, boolean>
+        ): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.omitBy
+         */
+        omitBy<TResult extends {}>(
+            predicate: ObjectIterator<any, boolean>
+        ): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.pick
+    interface LoDashStatic {
+        /**
+         * Creates an object composed of the picked `object` properties.
+         *
+         * @static
+         * @memberOf _
+         * @category Object
+         * @param {Object} object The source object.
+         * @param {...(string|string[])} [props] The property names to pick, specified
+         *  individually or in arrays.
+         * @returns {Object} Returns the new object.
+         * @example
+         *
+         * var object = { 'a': 1, 'b': '2', 'c': 3 };
+         *
+         * _.pick(object, ['a', 'c']);
+         * // => { 'a': 1, 'c': 3 }
+         */
+        pick<TResult extends {}, T extends {}>(
+            object: T,
+            ...predicate: (StringRepresentable|StringRepresentable[])[]
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.pick
+         */
+        pick<TResult extends {}>(
+            ...predicate: (StringRepresentable|StringRepresentable[])[]
+        ): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.pick
+         */
+        pick<TResult extends {}>(
+            ...predicate: (StringRepresentable|StringRepresentable[])[]
+        ): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.pickBy
+    interface LoDashStatic {
+        /**
+         * Creates an object composed of the `object` properties `predicate` returns
+         * truthy for. The predicate is invoked with one argument: (value).
+         *
+         * @static
+         * @memberOf _
+         * @category Object
+         * @param {Object} object The source object.
+         * @param {Function|Object|string} [predicate=_.identity] The function invoked per property.
+         * @returns {Object} Returns the new object.
+         * @example
+         *
+         * var object = { 'a': 1, 'b': '2', 'c': 3 };
+         *
+         * _.pickBy(object, _.isNumber);
+         * // => { 'a': 1, 'c': 3 }
+         */
+        pickBy<TResult extends {}, T extends {}>(
+            object: T,
+            predicate?: ObjectIterator<any, boolean>
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.pickBy
+         */
+        pickBy<TResult extends {}>(
+            predicate?: ObjectIterator<any, boolean>
+        ): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.pickBy
+         */
+        pickBy<TResult extends {}>(
+            predicate?: ObjectIterator<any, boolean>
+        ): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.result
+    interface LoDashStatic {
+        /**
+         * This method is like _.get except that if the resolved value is a function it’s invoked with the this binding
+         * of its parent object and its result is returned.
+         *
+         * @param object The object to query.
+         * @param path The path of the property to resolve.
+         * @param defaultValue The value returned if the resolved value is undefined.
+         * @return Returns the resolved value.
+         */
+        result<TObject, TResult>(
+            object: TObject,
+            path: StringRepresentable|StringRepresentable[],
+            defaultValue?: TResult|((...args: any[]) => TResult)
+        ): TResult;
+
+        /**
+         * @see _.result
+         */
+        result<TResult>(
+            object: any,
+            path: StringRepresentable|StringRepresentable[],
+            defaultValue?: TResult|((...args: any[]) => TResult)
+        ): TResult;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.result
+         */
+        result<TResult>(
+            path: StringRepresentable|StringRepresentable[],
+            defaultValue?: TResult|((...args: any[]) => TResult)
+        ): TResult;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.result
+         */
+        result<TResult>(
+            path: StringRepresentable|StringRepresentable[],
+            defaultValue?: TResult|((...args: any[]) => TResult)
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.result
+         */
+        result<TResult>(
+            path: StringRepresentable|StringRepresentable[],
+            defaultValue?: TResult|((...args: any[]) => TResult)
+        ): TResult;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.result
+         */
+        result<TResultWrapper>(
+            path: StringRepresentable|StringRepresentable[],
+            defaultValue?: any
+        ): TResultWrapper;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.result
+         */
+        result<TResultWrapper>(
+            path: StringRepresentable|StringRepresentable[],
+            defaultValue?: any
+        ): TResultWrapper;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.result
+         */
+        result<TResultWrapper>(
+            path: StringRepresentable|StringRepresentable[],
+            defaultValue?: any
+        ): TResultWrapper;
+    }
+
+    //_.set
+    interface LoDashStatic {
+        /**
+         * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+         * missing index properties while objects are created for all other missing properties. Use _.setWith to
+         * customize path creation.
+         *
+         * @param object The object to modify.
+         * @param path The path of the property to set.
+         * @param value The value to set.
+         * @return Returns object.
+         */
+        set<TResult>(
+            object: Object,
+            path: StringRepresentable|StringRepresentable[],
+            value: any
+        ): TResult;
+
+        /**
+         * @see _.set
+         */
+        set<V, TResult>(
+            object: Object,
+            path: StringRepresentable|StringRepresentable[],
+            value: V
+        ): TResult;
+
+        /**
+         * @see _.set
+         */
+        set<O, V, TResult>(
+            object: O,
+            path: StringRepresentable|StringRepresentable[],
+            value: V
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.set
+         */
+        set<TResult>(
+            path: StringRepresentable|StringRepresentable[],
+            value: any
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.set
+         */
+        set<V, TResult>(
+            path: StringRepresentable|StringRepresentable[],
+            value: V
+        ): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.set
+         */
+        set<TResult>(
+            path: StringRepresentable|StringRepresentable[],
+            value: any
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.set
+         */
+        set<V, TResult>(
+            path: StringRepresentable|StringRepresentable[],
+            value: V
+        ): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.setWith
+    interface SetWithCustomizer<T> {
+        (nsValue: any, key: string, nsObject: T): any;
+    }
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
+         * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
+         * invoked with three arguments: (nsValue, key, nsObject).
+         *
+         * @param object The object to modify.
+         * @param path The path of the property to set.
+         * @param value The value to set.
+         * @parem customizer The function to customize assigned values.
+         * @return Returns object.
+         */
+        setWith<TResult>(
+            object: Object,
+            path: StringRepresentable|StringRepresentable[],
+            value: any,
+            customizer?: SetWithCustomizer<Object>
+        ): TResult;
+
+        /**
+         * @see _.setWith
+         */
+        setWith<V, TResult>(
+            object: Object,
+            path: StringRepresentable|StringRepresentable[],
+            value: V,
+            customizer?: SetWithCustomizer<Object>
+        ): TResult;
+
+        /**
+         * @see _.setWith
+         */
+        setWith<O, V, TResult>(
+            object: O,
+            path: StringRepresentable|StringRepresentable[],
+            value: V,
+            customizer?: SetWithCustomizer<O>
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.setWith
+         */
+        setWith<TResult>(
+            path: StringRepresentable|StringRepresentable[],
+            value: any,
+            customizer?: SetWithCustomizer<T>
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.setWith
+         */
+        setWith<V, TResult>(
+            path: StringRepresentable|StringRepresentable[],
+            value: V,
+            customizer?: SetWithCustomizer<T>
+        ): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.setWith
+         */
+        setWith<TResult>(
+            path: StringRepresentable|StringRepresentable[],
+            value: any,
+            customizer?: SetWithCustomizer<T>
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.setWith
+         */
+        setWith<V, TResult>(
+            path: StringRepresentable|StringRepresentable[],
+            value: V,
+            customizer?: SetWithCustomizer<T>
+        ): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.toPairs
+    interface LoDashStatic {
+        /**
+         * Creates an array of own enumerable key-value pairs for object.
+         *
+         * @param object The object to query.
+         * @return Returns the new array of key-value pairs.
+         */
+        toPairs<T extends {}>(object?: T): any[][];
+
+        toPairs<T extends {}, TResult>(object?: T): TResult[][];
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.toPairs
+         */
+        toPairs<TResult>(): LoDashImplicitArrayWrapper<TResult[]>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.toPairs
+         */
+        toPairs<TResult>(): LoDashExplicitArrayWrapper<TResult[]>;
+    }
+
+    //_.toPairsIn
+    interface LoDashStatic {
+        /**
+         * Creates an array of own and inherited enumerable key-value pairs for object.
+         *
+         * @param object The object to query.
+         * @return Returns the new array of key-value pairs.
+         */
+        toPairsIn<T extends {}>(object?: T): any[][];
+
+        toPairsIn<T extends {}, TResult>(object?: T): TResult[][];
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.toPairsIn
+         */
+        toPairsIn<TResult>(): LoDashImplicitArrayWrapper<TResult[]>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.toPairsIn
+         */
+        toPairsIn<TResult>(): LoDashExplicitArrayWrapper<TResult[]>;
+    }
+
+    //_.transform
+    interface LoDashStatic {
+        /**
+         * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
+         * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
+         * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
+         * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
+         *
+         * @param object The object to iterate over.
+         * @param iteratee The function invoked per iteration.
+         * @param accumulator The custom accumulator value.
+         * @param thisArg The this binding of iteratee.
+         * @return Returns the accumulated value.
+         */
+        transform<T, TResult>(
+            object: T[],
+            iteratee?: MemoVoidArrayIterator<T, TResult[]>,
+            accumulator?: TResult[]
+        ): TResult[];
+
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            object: T[],
+            iteratee?: MemoVoidArrayIterator<T, Dictionary<TResult>>,
+            accumulator?: Dictionary<TResult>
+        ): Dictionary<TResult>;
+
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            object: Dictionary<T>,
+            iteratee?: MemoVoidDictionaryIterator<T, Dictionary<TResult>>,
+            accumulator?: Dictionary<TResult>
+        ): Dictionary<TResult>;
+
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            object: Dictionary<T>,
+            iteratee?: MemoVoidDictionaryIterator<T, TResult[]>,
+            accumulator?: TResult[]
+        ): TResult[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.transform
+         */
+        transform<TResult>(
+            iteratee?: MemoVoidArrayIterator<T, TResult[]>,
+            accumulator?: TResult[]
+        ): LoDashImplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.transform
+         */
+        transform<TResult>(
+            iteratee?: MemoVoidArrayIterator<T, Dictionary<TResult>>,
+            accumulator?: Dictionary<TResult>
+        ): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            iteratee?: MemoVoidDictionaryIterator<T, Dictionary<TResult>>,
+            accumulator?: Dictionary<TResult>
+        ): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
+
+        /**
+         * @see _.transform
+         */
+        transform<T, TResult>(
+            iteratee?: MemoVoidDictionaryIterator<T, TResult[]>,
+            accumulator?: TResult[]
+        ): LoDashImplicitArrayWrapper<TResult>;
+    }
+
+    //_.unset
+    interface LoDashStatic {
+        /**
+         * Removes the property at path of object.
+         *
+         * Note: This method mutates object.
+         *
+         * @param object The object to modify.
+         * @param path The path of the property to unset.
+         * @return Returns true if the property is deleted, else false.
+         */
+        unset<T>(
+            object: T,
+            path: StringRepresentable|StringRepresentable[]
+        ): boolean;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.unset
+         */
+        unset(path: StringRepresentable|StringRepresentable[]): LoDashImplicitWrapper<boolean>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.unset
+         */
+        unset(path: StringRepresentable|StringRepresentable[]): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.update
+    interface LoDashStatic {
+        /**
+         * This method is like _.set except that accepts updater to produce the value to set. Use _.updateWith to
+         * customize path creation. The updater is invoked with one argument: (value).
+         *
+         * @param object The object to modify.
+         * @param path The path of the property to set.
+         * @param updater The function to produce the updated value.
+         * @return Returns object.
+         */
+        update<TResult>(
+            object: Object,
+            path: StringRepresentable|StringRepresentable[],
+            updater: Function
+        ): TResult;
+
+        /**
+         * @see _.update
+         */
+        update<U extends Function, TResult>(
+            object: Object,
+            path: StringRepresentable|StringRepresentable[],
+            updater: U
+        ): TResult;
+
+        /**
+         * @see _.update
+         */
+        update<O extends {}, TResult>(
+            object: O,
+            path: StringRepresentable|StringRepresentable[],
+            updater: Function
+        ): TResult;
+
+        /**
+         * @see _.update
+         */
+        update<O, U extends Function, TResult>(
+            object: O,
+            path: StringRepresentable|StringRepresentable[],
+            updater: U
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.update
+         */
+        update<TResult>(
+            path: StringRepresentable|StringRepresentable[],
+            updater: any
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.update
+         */
+        update<U extends Function, TResult>(
+            path: StringRepresentable|StringRepresentable[],
+            updater: U
+        ): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.update
+         */
+        update<TResult>(
+            path: StringRepresentable|StringRepresentable[],
+            updater: any
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.update
+         */
+        update<U extends Function, TResult>(
+            path: StringRepresentable|StringRepresentable[],
+            updater: U
+        ): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.values
+    interface LoDashStatic {
+        /**
+         * Creates an array of the own enumerable property values of object.
+         *
+         * @param object The object to query.
+         * @return Returns an array of property values.
+         */
+        values<T>(object?: any): T[];
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.values
+         */
+        values<T>(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.values
+         */
+        values<T>(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    //_.valuesIn
+    interface LoDashStatic {
+        /**
+         * Creates an array of the own and inherited enumerable property values of object.
+         *
+         * @param object The object to query.
+         * @return Returns the array of property values.
+         */
+        valuesIn<T>(object?: any): T[];
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.valuesIn
+         */
+        valuesIn<T>(): LoDashImplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.valuesIn
+         */
+        valuesIn<T>(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    /**********
+     * String *
+     **********/
+
+    //_.camelCase
+    interface LoDashStatic {
+        /**
+         * Converts string to camel case.
+         *
+         * @param string The string to convert.
+         * @return Returns the camel cased string.
+         */
+        camelCase(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.camelCase
+         */
+        camelCase(): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.camelCase
+         */
+        camelCase(): LoDashExplicitWrapper<string>;
+    }
+
+    //_.capitalize
+    interface LoDashStatic {
+        /**
+         * Converts the first character of string to upper case and the remaining to lower case.
+         *
+         * @param string The string to capitalize.
+         * @return Returns the capitalized string.
+         */
+        capitalize(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.capitalize
+         */
+        capitalize(): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.capitalize
+         */
+        capitalize(): LoDashExplicitWrapper<string>;
+    }
+
+    //_.deburr
+    interface LoDashStatic {
+        /**
+         * Deburrs string by converting latin-1 supplementary letters to basic latin letters and removing combining
+         * diacritical marks.
+         *
+         * @param string The string to deburr.
+         * @return Returns the deburred string.
+         */
+        deburr(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.deburr
+         */
+        deburr(): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.deburr
+         */
+        deburr(): LoDashExplicitWrapper<string>;
+    }
+
+    //_.endsWith
+    interface LoDashStatic {
+        /**
+         * Checks if string ends with the given target string.
+         *
+         * @param string The string to search.
+         * @param target The string to search for.
+         * @param position The position to search from.
+         * @return Returns true if string ends with target, else false.
+         */
+        endsWith(
+            string?: string,
+            target?: string,
+            position?: number
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.endsWith
+         */
+        endsWith(
+            target?: string,
+            position?: number
+        ): boolean;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.endsWith
+         */
+        endsWith(
+            target?: string,
+            position?: number
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    // _.escape
+    interface LoDashStatic {
+        /**
+         * Converts the characters "&", "<", ">", '"', "'", and "`" in string to their corresponding HTML entities.
+         *
+         * Note: No other characters are escaped. To escape additional characters use a third-party library like he.
+         *
+         * hough the ">" character is escaped for symmetry, characters like ">" and "/" don’t need escaping in HTML
+         * and have no special meaning unless they're part of a tag or unquoted attribute value. See Mathias Bynens’s
+         * article (under "semi-related fun fact") for more details.
+         *
+         * Backticks are escaped because in IE < 9, they can break out of attribute values or HTML comments. See #59,
+         * #102, #108, and #133 of the HTML5 Security Cheatsheet for more details.
+         *
+         * When working with HTML you should always quote attribute values to reduce XSS vectors.
+         *
+         * @param string The string to escape.
+         * @return Returns the escaped string.
+         */
+        escape(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.escape
+         */
+        escape(): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.escape
+         */
+        escape(): LoDashExplicitWrapper<string>;
+    }
+
+    // _.escapeRegExp
+    interface LoDashStatic {
+        /**
+         * Escapes the RegExp special characters "^", "$", "\", ".", "*", "+", "?", "(", ")", "[", "]",
+         * "{", "}", and "|" in string.
+         *
+         * @param string The string to escape.
+         * @return Returns the escaped string.
+         */
+        escapeRegExp(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.escapeRegExp
+         */
+        escapeRegExp(): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.escapeRegExp
+         */
+        escapeRegExp(): LoDashExplicitWrapper<string>;
+    }
+
+    //_.kebabCase
+    interface LoDashStatic {
+        /**
+         * Converts string to kebab case.
+         *
+         * @param string The string to convert.
+         * @return Returns the kebab cased string.
+         */
+        kebabCase(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.kebabCase
+         */
+        kebabCase(): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.kebabCase
+         */
+        kebabCase(): LoDashExplicitWrapper<string>;
+    }
+
+    //_.lowerCase
+    interface LoDashStatic {
+        /**
+         * Converts `string`, as space separated words, to lower case.
+         *
+         * @param string The string to convert.
+         * @return Returns the lower cased string.
+         */
+        lowerCase(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.lowerCase
+         */
+        lowerCase(): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.lowerCase
+         */
+        lowerCase(): LoDashExplicitWrapper<string>;
+    }
+
+    //_.lowerFirst
+    interface LoDashStatic {
+        /**
+         * Converts the first character of `string` to lower case.
+         *
+         * @param string The string to convert.
+         * @return Returns the converted string.
+         */
+        lowerFirst(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.lowerFirst
+         */
+        lowerFirst(): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.lowerFirst
+         */
+        lowerFirst(): LoDashExplicitWrapper<string>;
+    }
+
+    //_.pad
+    interface LoDashStatic {
+        /**
+         * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
+         * they can’t be evenly divided by length.
+         *
+         * @param string The string to pad.
+         * @param length The padding length.
+         * @param chars The string used as padding.
+         * @return Returns the padded string.
+         */
+        pad(
+            string?: string,
+            length?: number,
+            chars?: string
+        ): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.pad
+         */
+        pad(
+            length?: number,
+            chars?: string
+        ): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.pad
+         */
+        pad(
+            length?: number,
+            chars?: string
+        ): LoDashExplicitWrapper<string>;
+    }
+
+    //_.padEnd
+    interface LoDashStatic {
+        /**
+         * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
+         * length.
+         *
+         * @param string The string to pad.
+         * @param length The padding length.
+         * @param chars The string used as padding.
+         * @return Returns the padded string.
+         */
+        padEnd(
+            string?: string,
+            length?: number,
+            chars?: string
+        ): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.padEnd
+         */
+        padEnd(
+            length?: number,
+            chars?: string
+        ): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.padEnd
+         */
+        padEnd(
+            length?: number,
+            chars?: string
+        ): LoDashExplicitWrapper<string>;
+    }
+
+    //_.padStart
+    interface LoDashStatic {
+        /**
+         * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
+         * length.
+         *
+         * @param string The string to pad.
+         * @param length The padding length.
+         * @param chars The string used as padding.
+         * @return Returns the padded string.
+         */
+        padStart(
+            string?: string,
+            length?: number,
+            chars?: string
+        ): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.padStart
+         */
+        padStart(
+            length?: number,
+            chars?: string
+        ): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.padStart
+         */
+        padStart(
+            length?: number,
+            chars?: string
+        ): LoDashExplicitWrapper<string>;
+    }
+
+    //_.parseInt
+    interface LoDashStatic {
+        /**
+         * Converts string to an integer of the specified radix. If radix is undefined or 0, a radix of 10 is used
+         * unless value is a hexadecimal, in which case a radix of 16 is used.
+         *
+         * Note: This method aligns with the ES5 implementation of parseInt.
+         *
+         * @param string The string to convert.
+         * @param radix The radix to interpret value by.
+         * @return Returns the converted integer.
+         */
+        parseInt(
+            string: string,
+            radix?: number
+        ): number;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.parseInt
+         */
+        parseInt(radix?: number): number;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.parseInt
+         */
+        parseInt(radix?: number): LoDashExplicitWrapper<number>;
+    }
+
+    //_.repeat
+    interface LoDashStatic {
+        /**
+         * Repeats the given string n times.
+         *
+         * @param string The string to repeat.
+         * @param n The number of times to repeat the string.
+         * @return Returns the repeated string.
+         */
+        repeat(
+            string?: string,
+            n?: number
+        ): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.repeat
+         */
+        repeat(n?: number): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.repeat
+         */
+        repeat(n?: number): LoDashExplicitWrapper<string>;
+    }
+
+    //_.replace
+    interface LoDashStatic {
+        /**
+         * Replaces matches for pattern in string with replacement.
+         *
+         * Note: This method is based on String#replace.
+         *
+         * @param string
+         * @param pattern
+         * @param replacement
+         * @return Returns the modified string.
+         */
+        replace(
+            string: string,
+            pattern: RegExp|string,
+            replacement: Function|string
+        ): string;
+
+        /**
+         * @see _.replace
+         */
+        replace(
+            pattern?: RegExp|string,
+            replacement?: Function|string
+        ): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.replace
+         */
+        replace(
+            pattern?: RegExp|string,
+            replacement?: Function|string
+        ): string;
+
+        /**
+         * @see _.replace
+         */
+        replace(
+            replacement?: Function|string
+        ): string;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.replace
+         */
+        replace(
+            pattern?: RegExp|string,
+            replacement?: Function|string
+        ): string;
+
+        /**
+         * @see _.replace
+         */
+        replace(
+            replacement?: Function|string
+        ): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.replace
+         */
+        replace(
+            pattern?: RegExp|string,
+            replacement?: Function|string
+        ): LoDashExplicitWrapper<string>;
+
+        /**
+         * @see _.replace
+         */
+        replace(
+            replacement?: Function|string
+        ): LoDashExplicitWrapper<string>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.replace
+         */
+        replace(
+            pattern?: RegExp|string,
+            replacement?: Function|string
+        ): LoDashExplicitWrapper<string>;
+
+        /**
+         * @see _.replace
+         */
+        replace(
+            replacement?: Function|string
+        ): LoDashExplicitWrapper<string>;
+    }
+
+    //_.snakeCase
+    interface LoDashStatic {
+        /**
+         * Converts string to snake case.
+         *
+         * @param string The string to convert.
+         * @return Returns the snake cased string.
+         */
+        snakeCase(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.snakeCase
+         */
+        snakeCase(): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.snakeCase
+         */
+        snakeCase(): LoDashExplicitWrapper<string>;
+    }
+
+    //_.split
+    interface LoDashStatic {
+        /**
+         * Splits string by separator.
+         *
+         * Note: This method is based on String#split.
+         *
+         * @param string
+         * @param separator
+         * @param limit
+         * @return Returns the new array of string segments.
+         */
+        split(
+            string: string,
+            separator?: RegExp|string,
+            limit?: number
+        ): string[];
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.split
+         */
+        split(
+            separator?: RegExp|string,
+            limit?: number
+        ): LoDashImplicitArrayWrapper<string>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.split
+         */
+        split(
+            separator?: RegExp|string,
+            limit?: number
+        ): LoDashExplicitArrayWrapper<string>;
+    }
+
+    //_.startCase
+    interface LoDashStatic {
+        /**
+         * Converts string to start case.
+         *
+         * @param string The string to convert.
+         * @return Returns the start cased string.
+         */
+        startCase(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.startCase
+         */
+        startCase(): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.startCase
+         */
+        startCase(): LoDashExplicitWrapper<string>;
+    }
+
+    //_.startsWith
+    interface LoDashStatic {
+        /**
+         * Checks if string starts with the given target string.
+         *
+         * @param string The string to search.
+         * @param target The string to search for.
+         * @param position The position to search from.
+         * @return Returns true if string starts with target, else false.
+         */
+        startsWith(
+            string?: string,
+            target?: string,
+            position?: number
+        ): boolean;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.startsWith
+         */
+        startsWith(
+            target?: string,
+            position?: number
+        ): boolean;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.startsWith
+         */
+        startsWith(
+            target?: string,
+            position?: number
+        ): LoDashExplicitWrapper<boolean>;
+    }
+
+    //_.template
+    interface TemplateOptions extends TemplateSettings {
+        /**
+         * The sourceURL of the template's compiled source.
+         */
+        sourceURL?: string;
+    }
+
+    interface TemplateExecutor {
+        (data?: Object): string;
+        source: string;
+    }
+
+    interface LoDashStatic {
+        /**
+         * Creates a compiled template function that can interpolate data properties in "interpolate" delimiters,
+         * HTML-escape interpolated data properties in "escape" delimiters, and execute JavaScript in "evaluate"
+         * delimiters. Data properties may be accessed as free variables in the template. If a setting object is
+         * provided it takes precedence over _.templateSettings values.
+         *
+         * Note: In the development build _.template utilizes
+         * [sourceURLs](http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/#toc-sourceurl) for easier
+         * debugging.
+         *
+         * For more information on precompiling templates see
+         * [lodash's custom builds documentation](https://lodash.com/custom-builds).
+         *
+         * For more information on Chrome extension sandboxes see
+         * [Chrome's extensions documentation](https://developer.chrome.com/extensions/sandboxingEval).
+         *
+         * @param string The template string.
+         * @param options The options object.
+         * @param options.escape The HTML "escape" delimiter.
+         * @param options.evaluate The "evaluate" delimiter.
+         * @param options.imports An object to import into the template as free variables.
+         * @param options.interpolate The "interpolate" delimiter.
+         * @param options.sourceURL The sourceURL of the template's compiled source.
+         * @param options.variable The data object variable name.
+         * @return Returns the compiled template function.
+         */
+        template(
+            string: string,
+            options?: TemplateOptions
+        ): TemplateExecutor;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.template
+         */
+        template(options?: TemplateOptions): TemplateExecutor;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.template
+         */
+        template(options?: TemplateOptions): LoDashExplicitObjectWrapper<TemplateExecutor>;
+    }
+
+    //_.toLower
+    interface LoDashStatic {
+        /**
+         * Converts `string`, as a whole, to lower case.
+         *
+         * @param string The string to convert.
+         * @return Returns the lower cased string.
+         */
+        toLower(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.toLower
+         */
+        toLower(): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.toLower
+         */
+        toLower(): LoDashExplicitWrapper<string>;
+    }
+
+    //_.toUpper
+    interface LoDashStatic {
+        /**
+         * Converts `string`, as a whole, to upper case.
+         *
+         * @param string The string to convert.
+         * @return Returns the upper cased string.
+         */
+        toUpper(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.toUpper
+         */
+        toUpper(): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.toUpper
+         */
+        toUpper(): LoDashExplicitWrapper<string>;
+    }
+
+    //_.trim
+    interface LoDashStatic {
+        /**
+         * Removes leading and trailing whitespace or specified characters from string.
+         *
+         * @param string The string to trim.
+         * @param chars The characters to trim.
+         * @return Returns the trimmed string.
+         */
+        trim(
+            string?: string,
+            chars?: string
+        ): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.trim
+         */
+        trim(chars?: string): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.trim
+         */
+        trim(chars?: string): LoDashExplicitWrapper<string>;
+    }
+
+    //_.trimEnd
+    interface LoDashStatic {
+        /**
+         * Removes trailing whitespace or specified characters from string.
+         *
+         * @param string The string to trim.
+         * @param chars The characters to trim.
+         * @return Returns the trimmed string.
+         */
+        trimEnd(
+            string?: string,
+            chars?: string
+        ): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.trimEnd
+         */
+        trimEnd(chars?: string): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.trimEnd
+         */
+        trimEnd(chars?: string): LoDashExplicitWrapper<string>;
+    }
+
+    //_.trimStart
+    interface LoDashStatic {
+        /**
+         * Removes leading whitespace or specified characters from string.
+         *
+         * @param string The string to trim.
+         * @param chars The characters to trim.
+         * @return Returns the trimmed string.
+         */
+        trimStart(
+            string?: string,
+            chars?: string
+        ): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.trimStart
+         */
+        trimStart(chars?: string): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.trimStart
+         */
+        trimStart(chars?: string): LoDashExplicitWrapper<string>;
+    }
+
+    //_.truncate
+    interface TruncateOptions {
+        /** The maximum string length. */
+        length?: number;
+        /** The string to indicate text is omitted. */
+        omission?: string;
+        /** The separator pattern to truncate to. */
+        separator?: string|RegExp;
+    }
+
+    interface LoDashStatic {
+        /**
+         * Truncates string if it’s longer than the given maximum string length. The last characters of the truncated
+         * string are replaced with the omission string which defaults to "…".
+         *
+         * @param string The string to truncate.
+         * @param options The options object or maximum string length.
+         * @return Returns the truncated string.
+         */
+        truncate(
+            string?: string,
+            options?: TruncateOptions
+        ): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.truncate
+         */
+        truncate(options?: TruncateOptions): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.truncate
+         */
+        truncate(options?: TruncateOptions): LoDashExplicitWrapper<string>;
+    }
+
+    //_.unescape
+    interface LoDashStatic {
+        /**
+         * The inverse of _.escape; this method converts the HTML entities &amp;, &lt;, &gt;, &quot;, &#39;, and &#96;
+         * in string to their corresponding characters.
+         *
+         * Note: No other HTML entities are unescaped. To unescape additional HTML entities use a third-party library
+         * like he.
+         *
+         * @param string The string to unescape.
+         * @return Returns the unescaped string.
+         */
+        unescape(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.unescape
+         */
+        unescape(): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.unescape
+         */
+        unescape(): LoDashExplicitWrapper<string>;
+    }
+
+    //_.upperCase
+    interface LoDashStatic {
+        /**
+         * Converts `string`, as space separated words, to upper case.
+         *
+         * @param string The string to convert.
+         * @return Returns the upper cased string.
+         */
+        upperCase(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.upperCase
+         */
+        upperCase(): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.upperCase
+         */
+        upperCase(): LoDashExplicitWrapper<string>;
+    }
+
+    //_.upperFirst
+    interface LoDashStatic {
+        /**
+         * Converts the first character of `string` to upper case.
+         *
+         * @param string The string to convert.
+         * @return Returns the converted string.
+         */
+        upperFirst(string?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.upperFirst
+         */
+        upperFirst(): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.upperFirst
+         */
+        upperFirst(): LoDashExplicitWrapper<string>;
+    }
+
+    //_.words
+    interface LoDashStatic {
+        /**
+         * Splits `string` into an array of its words.
+         *
+         * @param string The string to inspect.
+         * @param pattern The pattern to match words.
+         * @return Returns the words of `string`.
+         */
+        words(
+            string?: string,
+            pattern?: string|RegExp
+        ): string[];
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.words
+         */
+        words(pattern?: string|RegExp): string[];
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.words
+         */
+        words(pattern?: string|RegExp): LoDashExplicitArrayWrapper<string>;
+    }
+
+    /***********
+     * Utility *
+     ***********/
+
+    //_.attempt
+    interface LoDashStatic {
+        /**
+         * Attempts to invoke func, returning either the result or the caught error object. Any additional arguments
+         * are provided to func when it’s invoked.
+         *
+         * @param func The function to attempt.
+         * @return Returns the func result or error object.
+         */
+        attempt<TResult>(func: (...args: any[]) => TResult, ...args: any[]): TResult|Error;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.attempt
+         */
+        attempt<TResult>(...args: any[]): TResult|Error;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.attempt
+         */
+        attempt<TResult>(...args: any[]): LoDashExplicitObjectWrapper<TResult|Error>;
+    }
+
+    //_.constant
+    interface LoDashStatic {
+        /**
+         * Creates a function that returns value.
+         *
+         * @param value The value to return from the new function.
+         * @return Returns the new function.
+         */
+        constant<T>(value: T): () => T;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.constant
+         */
+        constant<TResult>(): LoDashImplicitObjectWrapper<() => TResult>;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.constant
+         */
+        constant<TResult>(): LoDashExplicitObjectWrapper<() => TResult>;
+    }
+
+    //_.identity
+    interface LoDashStatic {
+        /**
+         * This method returns the first argument provided to it.
+         *
+         * @param value Any value.
+         * @return Returns value.
+         */
+        identity<T>(value?: T): T;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.identity
+         */
+        identity(): T;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.identity
+         */
+        identity(): T[];
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.identity
+         */
+        identity(): T;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.identity
+         */
+        identity(): LoDashExplicitWrapper<T>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.identity
+         */
+        identity(): LoDashExplicitArrayWrapper<T>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.identity
+         */
+        identity(): LoDashExplicitObjectWrapper<T>;
+    }
+
+    //_.iteratee
+    interface LoDashStatic {
+        /**
+         * Creates a function that invokes `func` with the arguments of the created
+         * function. If `func` is a property name the created callback returns the
+         * property value for a given element. If `func` is an object the created
+         * callback returns `true` for elements that contain the equivalent object properties, otherwise it returns `false`.
+         *
+         * @static
+         * @memberOf _
+         * @category Util
+         * @param {*} [func=_.identity] The value to convert to a callback.
+         * @returns {Function} Returns the callback.
+         * @example
+         *
+         * var users = [
+         *   { 'user': 'barney', 'age': 36 },
+         *   { 'user': 'fred',   'age': 40 }
+         * ];
+         *
+         * // create custom iteratee shorthands
+         * _.iteratee = _.wrap(_.iteratee, function(callback, func) {
+         *   var p = /^(\S+)\s*([<>])\s*(\S+)$/.exec(func);
+         *   return !p ? callback(func) : function(object) {
+         *     return (p[2] == '>' ? object[p[1]] > p[3] : object[p[1]] < p[3]);
+         *   };
+         * });
+         *
+         * _.filter(users, 'age > 36');
+         * // => [{ 'user': 'fred', 'age': 40 }]
+         */
+        iteratee<TResult>(
+            func: Function
+        ): (...args: any[]) => TResult;
+
+        /**
+         * @see _.iteratee
+         */
+        iteratee<TResult>(
+            func: string
+        ): (object: any) => TResult;
+
+        /**
+         * @see _.iteratee
+         */
+        iteratee(
+            func: Object
+        ): (object: any) => boolean;
+
+        /**
+         * @see _.iteratee
+         */
+        iteratee<TResult>(): (value: TResult) => TResult;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.iteratee
+         */
+        iteratee<TResult>(): LoDashImplicitObjectWrapper<(object: any) => TResult>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.iteratee
+         */
+        iteratee(): LoDashImplicitObjectWrapper<(object: any) => boolean>;
+
+        /**
+         * @see _.iteratee
+         */
+        iteratee<TResult>(): LoDashImplicitObjectWrapper<(...args: any[]) => TResult>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.iteratee
+         */
+        iteratee<TResult>(): LoDashExplicitObjectWrapper<(object: any) => TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.iteratee
+         */
+        iteratee(): LoDashExplicitObjectWrapper<(object: any) => boolean>;
+
+        /**
+         * @see _.iteratee
+         */
+        iteratee<TResult>(): LoDashExplicitObjectWrapper<(...args: any[]) => TResult>;
+    }
+
+    //_.matches
+    interface LoDashStatic {
+        /**
+         * Creates a function that performs a deep comparison between a given object and source, returning true if the
+         * given object has equivalent property values, else false.
+         *
+         * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+         * strings. Objects are compared by their own, not inherited, enumerable properties. For comparing a single own
+         * or inherited property value see _.matchesProperty.
+         *
+         * @param source The object of property values to match.
+         * @return Returns the new function.
+         */
+        matches<T>(source: T): (value: any) => boolean;
+
+        /**
+         * @see _.matches
+         */
+        matches<T, V>(source: T): (value: V) => boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.matches
+         */
+        matches<V>(): LoDashImplicitObjectWrapper<(value: V) => boolean>;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.matches
+         */
+        matches<V>(): LoDashExplicitObjectWrapper<(value: V) => boolean>;
+    }
+
+    //_.matchesProperty
+    interface LoDashStatic {
+        /**
+         * Creates a function that compares the property value of path on a given object to value.
+         *
+         * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+         * strings. Objects are compared by their own, not inherited, enumerable properties.
+         *
+         * @param path The path of the property to get.
+         * @param srcValue The value to match.
+         * @return Returns the new function.
+         */
+        matchesProperty<T>(
+            path: StringRepresentable|StringRepresentable[],
+            srcValue: T
+        ): (value: any) => boolean;
+
+        /**
+         * @see _.matchesProperty
+         */
+        matchesProperty<T, V>(
+            path: StringRepresentable|StringRepresentable[],
+            srcValue: T
+        ): (value: V) => boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.matchesProperty
+         */
+        matchesProperty<SrcValue>(
+            srcValue: SrcValue
+        ): LoDashImplicitObjectWrapper<(value: any) => boolean>;
+
+        /**
+         * @see _.matchesProperty
+         */
+        matchesProperty<SrcValue, Value>(
+            srcValue: SrcValue
+        ): LoDashImplicitObjectWrapper<(value: Value) => boolean>;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.matchesProperty
+         */
+        matchesProperty<SrcValue>(
+            srcValue: SrcValue
+        ): LoDashExplicitObjectWrapper<(value: any) => boolean>;
+
+        /**
+         * @see _.matchesProperty
+         */
+        matchesProperty<SrcValue, Value>(
+            srcValue: SrcValue
+        ): LoDashExplicitObjectWrapper<(value: Value) => boolean>;
+    }
+
+    //_.method
+    interface LoDashStatic {
+        /**
+         * Creates a function that invokes the method at path on a given object. Any additional arguments are provided
+         * to the invoked method.
+         *
+         * @param path The path of the method to invoke.
+         * @param args The arguments to invoke the method with.
+         * @return Returns the new function.
+         */
+        method<TObject, TResult>(
+            path: string|StringRepresentable[],
+            ...args: any[]
+        ): (object: TObject) => TResult;
+
+        /**
+         * @see _.method
+         */
+        method<TResult>(
+            path: string|StringRepresentable[],
+            ...args: any[]
+        ): (object: any) => TResult;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.method
+         */
+        method<TObject, TResult>(...args: any[]): LoDashImplicitObjectWrapper<(object: TObject) => TResult>;
+
+        /**
+         * @see _.method
+         */
+        method<TResult>(...args: any[]): LoDashImplicitObjectWrapper<(object: any) => TResult>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.method
+         */
+        method<TObject, TResult>(...args: any[]): LoDashImplicitObjectWrapper<(object: TObject) => TResult>;
+
+        /**
+         * @see _.method
+         */
+        method<TResult>(...args: any[]): LoDashImplicitObjectWrapper<(object: any) => TResult>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.method
+         */
+        method<TObject, TResult>(...args: any[]): LoDashExplicitObjectWrapper<(object: TObject) => TResult>;
+
+        /**
+         * @see _.method
+         */
+        method<TResult>(...args: any[]): LoDashExplicitObjectWrapper<(object: any) => TResult>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.method
+         */
+        method<TObject, TResult>(...args: any[]): LoDashExplicitObjectWrapper<(object: TObject) => TResult>;
+
+        /**
+         * @see _.method
+         */
+        method<TResult>(...args: any[]): LoDashExplicitObjectWrapper<(object: any) => TResult>;
+    }
+
+    //_.methodOf
+    interface LoDashStatic {
+        /**
+         * The opposite of _.method; this method creates a function that invokes the method at a given path on object.
+         * Any additional arguments are provided to the invoked method.
+         *
+         * @param object The object to query.
+         * @param args The arguments to invoke the method with.
+         * @return Returns the new function.
+         */
+        methodOf<TObject extends {}, TResult>(
+            object: TObject,
+            ...args: any[]
+        ): (path: StringRepresentable|StringRepresentable[]) => TResult;
+
+        /**
+         * @see _.methodOf
+         */
+        methodOf<TResult>(
+            object: {},
+            ...args: any[]
+        ): (path: StringRepresentable|StringRepresentable[]) => TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.methodOf
+         */
+        methodOf<TResult>(
+            ...args: any[]
+        ): LoDashImplicitObjectWrapper<(path: StringRepresentable|StringRepresentable[]) => TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.methodOf
+         */
+        methodOf<TResult>(
+            ...args: any[]
+        ): LoDashExplicitObjectWrapper<(path: StringRepresentable|StringRepresentable[]) => TResult>;
+    }
+
+    //_.mixin
+    interface MixinOptions {
+        chain?: boolean;
+    }
+
+    interface LoDashStatic {
+        /**
+         * Adds all own enumerable function properties of a source object to the destination object. If object is a
+         * function then methods are added to its prototype as well.
+         *
+         * Note: Use _.runInContext to create a pristine lodash function to avoid conflicts caused by modifying
+         * the original.
+         *
+         * @param object The destination object.
+         * @param source The object of functions to add.
+         * @param options The options object.
+         * @param options.chain Specify whether the functions added are chainable.
+         * @return Returns object.
+         */
+        mixin<TResult, TObject>(
+            object: TObject,
+            source: Dictionary<Function>,
+            options?: MixinOptions
+        ): TResult;
+
+        /**
+         * @see _.mixin
+         */
+        mixin<TResult>(
+            source: Dictionary<Function>,
+            options?: MixinOptions
+        ): TResult;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.mixin
+         */
+        mixin<TResult>(
+            source: Dictionary<Function>,
+            options?: MixinOptions
+        ): LoDashImplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.mixin
+         */
+        mixin<TResult>(
+            options?: MixinOptions
+        ): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.mixin
+         */
+        mixin<TResult>(
+            source: Dictionary<Function>,
+            options?: MixinOptions
+        ): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+         * @see _.mixin
+         */
+        mixin<TResult>(
+            options?: MixinOptions
+        ): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.noConflict
+    interface LoDashStatic {
+        /**
+         * Reverts the _ variable to its previous value and returns a reference to the lodash function.
+         *
+         * @return Returns the lodash function.
+         */
+        noConflict(): typeof _;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.noConflict
+         */
+        noConflict(): typeof _;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.noConflict
+         */
+        noConflict(): LoDashExplicitObjectWrapper<typeof _>;
+    }
+
+    //_.noop
+    interface LoDashStatic {
+        /**
+         * A no-operation function that returns undefined regardless of the arguments it receives.
+         *
+         * @return undefined
+         */
+        noop(...args: any[]): void;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.noop
+         */
+        noop(...args: any[]): void;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.noop
+         */
+        noop(...args: any[]): _.LoDashExplicitWrapper<void>;
+    }
+
+    //_.nthArg
+    interface LoDashStatic {
+        /**
+         * Creates a function that returns its nth argument.
+         *
+         * @param n The index of the argument to return.
+         * @return Returns the new function.
+         */
+        nthArg<TResult extends Function>(n?: number): TResult;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.nthArg
+         */
+        nthArg<TResult extends Function>(): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.nthArg
+         */
+        nthArg<TResult extends Function>(): LoDashExplicitObjectWrapper<TResult>;
+    }
+
+    //_.over
+    interface LoDashStatic {
+        /**
+         * Creates a function that invokes iteratees with the arguments provided to the created function and returns
+         * their results.
+         *
+         * @param iteratees The iteratees to invoke.
+         * @return Returns the new function.
+         */
+        over<TResult>(...iteratees: (Function|Function[])[]): (...args: any[]) => TResult[];
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.over
+         */
+        over<TResult>(...iteratees: (Function|Function[])[]): LoDashImplicitObjectWrapper<(...args: any[]) => TResult[]>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.over
+         */
+        over<TResult>(...iteratees: (Function|Function[])[]): LoDashImplicitObjectWrapper<(...args: any[]) => TResult[]>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.over
+         */
+        over<TResult>(...iteratees: (Function|Function[])[]): LoDashExplicitObjectWrapper<(...args: any[]) => TResult[]>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.over
+         */
+        over<TResult>(...iteratees: (Function|Function[])[]): LoDashExplicitObjectWrapper<(...args: any[]) => TResult[]>;
+    }
+
+    //_.overEvery
+    interface LoDashStatic {
+        /**
+         * Creates a function that checks if all of the predicates return truthy when invoked with the arguments
+         * provided to the created function.
+         *
+         * @param predicates The predicates to check.
+         * @return Returns the new function.
+         */
+        overEvery(...predicates: (Function|Function[])[]): (...args: any[]) => boolean;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.overEvery
+         */
+        overEvery(...predicates: (Function|Function[])[]): LoDashImplicitObjectWrapper<(...args: any[]) => boolean>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.overEvery
+         */
+        overEvery(...predicates: (Function|Function[])[]): LoDashImplicitObjectWrapper<(...args: any[]) => boolean>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.overEvery
+         */
+        overEvery(...predicates: (Function|Function[])[]): LoDashExplicitObjectWrapper<(...args: any[]) => boolean>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.overEvery
+         */
+        overEvery(...predicates: (Function|Function[])[]): LoDashExplicitObjectWrapper<(...args: any[]) => boolean>;
+    }
+
+    //_.overSome
+    interface LoDashStatic {
+        /**
+         * Creates a function that checks if any of the predicates return truthy when invoked with the arguments
+         * provided to the created function.
+         *
+         * @param predicates The predicates to check.
+         * @return Returns the new function.
+         */
+        overSome(...predicates: (Function|Function[])[]): (...args: any[]) => boolean;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.overSome
+         */
+        overSome(...predicates: (Function|Function[])[]): LoDashImplicitObjectWrapper<(...args: any[]) => boolean>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.overSome
+         */
+        overSome(...predicates: (Function|Function[])[]): LoDashImplicitObjectWrapper<(...args: any[]) => boolean>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.overSome
+         */
+        overSome(...predicates: (Function|Function[])[]): LoDashExplicitObjectWrapper<(...args: any[]) => boolean>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.overSome
+         */
+        overSome(...predicates: (Function|Function[])[]): LoDashExplicitObjectWrapper<(...args: any[]) => boolean>;
+    }
+
+    //_.property
+    interface LoDashStatic {
+        /**
+         * Creates a function that returns the property value at path on a given object.
+         *
+         * @param path The path of the property to get.
+         * @return Returns the new function.
+         */
+        property<TObj, TResult>(path: StringRepresentable|StringRepresentable[]): (obj: TObj) => TResult;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.property
+         */
+        property<TObj, TResult>(): LoDashImplicitObjectWrapper<(obj: TObj) => TResult>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.property
+         */
+        property<TObj, TResult>(): LoDashImplicitObjectWrapper<(obj: TObj) => TResult>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.property
+         */
+        property<TObj, TResult>(): LoDashExplicitObjectWrapper<(obj: TObj) => TResult>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.property
+         */
+        property<TObj, TResult>(): LoDashExplicitObjectWrapper<(obj: TObj) => TResult>;
+    }
+
+    //_.propertyOf
+    interface LoDashStatic {
+        /**
+         * The opposite of _.property; this method creates a function that returns the property value at a given path
+         * on object.
+         *
+         * @param object The object to query.
+         * @return Returns the new function.
+         */
+        propertyOf<T extends {}>(object: T): (path: string|string[]) => any;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.propertyOf
+         */
+        propertyOf(): LoDashImplicitObjectWrapper<(path: string|string[]) => any>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.propertyOf
+         */
+        propertyOf(): LoDashExplicitObjectWrapper<(path: string|string[]) => any>;
+    }
+
+    //_.range
+    interface LoDashStatic {
+        /**
+         * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
+         * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
+         * range is created unless a negative step is specified.
+         *
+         * @param start The start of the range.
+         * @param end The end of the range.
+         * @param step The value to increment or decrement by.
+         * @return Returns a new range array.
+         */
+        range(
+            start: number,
+            end: number,
+            step?: number
+        ): number[];
+
+        /**
+         * @see _.range
+         */
+        range(
+            end: number,
+            step?: number
+        ): number[];
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.range
+         */
+        range(
+            end?: number,
+            step?: number
+        ): LoDashImplicitArrayWrapper<number>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.range
+         */
+        range(
+            end?: number,
+            step?: number
+        ): LoDashExplicitArrayWrapper<number>;
+    }
+
+    //_.rangeRight
+    interface LoDashStatic {
+        /**
+         * This method is like `_.range` except that it populates values in
+         * descending order.
+         *
+         * @static
+         * @memberOf _
+         * @category Util
+         * @param {number} [start=0] The start of the range.
+         * @param {number} end The end of the range.
+         * @param {number} [step=1] The value to increment or decrement by.
+         * @returns {Array} Returns the new array of numbers.
+         * @example
+         *
+         * _.rangeRight(4);
+         * // => [3, 2, 1, 0]
+         *
+         * _.rangeRight(-4);
+         * // => [-3, -2, -1, 0]
+         *
+         * _.rangeRight(1, 5);
+         * // => [4, 3, 2, 1]
+         *
+         * _.rangeRight(0, 20, 5);
+         * // => [15, 10, 5, 0]
+         *
+         * _.rangeRight(0, -4, -1);
+         * // => [-3, -2, -1, 0]
+         *
+         * _.rangeRight(1, 4, 0);
+         * // => [1, 1, 1]
+         *
+         * _.rangeRight(0);
+         * // => []
+         */
+        rangeRight(
+            start: number,
+            end: number,
+            step?: number
+        ): number[];
+
+        /**
+         * @see _.rangeRight
+         */
+        rangeRight(
+            end: number,
+            step?: number
+        ): number[];
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.rangeRight
+         */
+        rangeRight(
+            end?: number,
+            step?: number
+        ): LoDashImplicitArrayWrapper<number>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.rangeRight
+         */
+        rangeRight(
+            end?: number,
+            step?: number
+        ): LoDashExplicitArrayWrapper<number>;
+    }
+
+    //_.runInContext
+    interface LoDashStatic {
+        /**
+         * Create a new pristine lodash function using the given context object.
+         *
+         * @param context The context object.
+         * @return Returns a new lodash function.
+         */
+        runInContext(context?: Object): typeof _;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.runInContext
+         */
+        runInContext(): typeof _;
+    }
+
+    //_.times
+    interface LoDashStatic {
+        /**
+         * Invokes the iteratee function n times, returning an array of the results of each invocation. The iteratee
+         * is invoked with one argument; (index).
+         *
+         * @param n The number of times to invoke iteratee.
+         * @param iteratee The function invoked per iteration.
+         * @return Returns the array of results.
+         */
+        times<TResult>(
+            n: number,
+            iteratee: (num: number) => TResult
+        ): TResult[];
+
+        /**
+         * @see _.times
+         */
+        times(n: number): number[];
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.times
+         */
+        times<TResult>(
+            iteratee: (num: number) => TResult
+        ): TResult[];
+
+        /**
+         * @see _.times
+         */
+        times(): number[];
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.times
+         */
+        times<TResult>(
+            iteratee: (num: number) => TResult
+        ): LoDashExplicitArrayWrapper<TResult>;
+
+        /**
+         * @see _.times
+         */
+        times(): LoDashExplicitArrayWrapper<number>;
+    }
+
+    //_.toPath
+    interface LoDashStatic {
+        /**
+         * Converts `value` to a property path array.
+         *
+         * @static
+         * @memberOf _
+         * @category Util
+         * @param {*} value The value to convert.
+         * @returns {Array} Returns the new property path array.
+         * @example
+         *
+         * _.toPath('a.b.c');
+         * // => ['a', 'b', 'c']
+         *
+         * _.toPath('a[0].b.c');
+         * // => ['a', '0', 'b', 'c']
+         *
+         * var path = ['a', 'b', 'c'],
+         *     newPath = _.toPath(path);
+         *
+         * console.log(newPath);
+         * // => ['a', 'b', 'c']
+         *
+         * console.log(path === newPath);
+         * // => false
+         */
+        toPath(value: any): string[];
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.toPath
+         */
+        toPath(): LoDashImplicitWrapper<string[]>;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.toPath
+         */
+        toPath(): LoDashExplicitWrapper<string[]>;
+    }
+
+    //_.uniqueId
+    interface LoDashStatic {
+        /**
+         * Generates a unique ID. If prefix is provided the ID is appended to it.
+         *
+         * @param prefix The value to prefix the ID with.
+         * @return Returns the unique ID.
+         */
+        uniqueId(prefix?: string): string;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.uniqueId
+         */
+        uniqueId(): string;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.uniqueId
+         */
+        uniqueId(): LoDashExplicitWrapper<string>;
+    }
+
+    interface ListIterator<T, TResult> {
+        (value: T, index: number, collection: List<T>): TResult;
+    }
+
+    interface DictionaryIterator<T, TResult> {
+        (value: T, key?: string, collection?: Dictionary<T>): TResult;
+    }
+
+    interface NumericDictionaryIterator<T, TResult> {
+        (value: T, key?: number, collection?: Dictionary<T>): TResult;
+    }
+
+    interface ObjectIterator<T, TResult> {
+        (element: T, key?: string, collection?: any): TResult;
+    }
+
+    interface StringIterator<TResult> {
+        (char: string, index?: number, string?: string): TResult;
+    }
+
+    interface MemoVoidIterator<T, TResult> {
+        (prev: TResult, curr: T, indexOrKey?: any, list?: T[]): void;
+    }
+    interface MemoIterator<T, TResult> {
+        (prev: TResult, curr: T, indexOrKey?: any, list?: T[]): TResult;
+    }
+
+    interface MemoVoidArrayIterator<T, TResult> {
+        (acc: TResult, curr: T, index?: number, arr?: T[]): void;
+    }
+    interface MemoVoidDictionaryIterator<T, TResult> {
+        (acc: TResult, curr: T, key?: string, dict?: Dictionary<T>): void;
+    }
+
+    //interface Collection<T> {}
+
+    // Common interface between Arrays and jQuery objects
+    interface List<T> {
+        [index: number]: T;
+        length: number;
+    }
+
+    interface Dictionary<T> {
+        [index: string]: T;
+    }
+
+    interface NumericDictionary<T> {
+        [index: number]: T;
+    }
+
+    interface StringRepresentable {
+        toString(): string;
+    }
+
+    interface Cancelable {
+        cancel(): void;
+    }
+}
+
+declare module "lodash" {
+    export = _;
+}
+
+// Backward compatibility with --target es5
+interface Set<T> {}
+interface Map<K, V> {}
+interface WeakSet<T> {}
+interface WeakMap<K, V> {}
diff --git a/lodash/lodash-3.10-tests.ts b/lodash/lodash-3.10-tests.ts
index 0a2debfa00..585ac34145 100644
--- a/lodash/lodash-3.10-tests.ts
+++ b/lodash/lodash-3.10-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path='../lodash/lodash-3.10.d.ts' />
+/// <reference types="lodash-3.10" />
 
 declare var $: any, jQuery: any;
 
diff --git a/lodash/lodash-tests.ts b/lodash/lodash-tests.ts
index 7931acb2b2..113e6689de 100644
--- a/lodash/lodash-tests.ts
+++ b/lodash/lodash-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="lodash.d.ts" />
+
 
 declare var $: any, jQuery: any;
 
@@ -527,16 +527,12 @@ namespace TestDropRightWhile {
 
         result = _.dropRightWhile<TResult>(array);
         result = _.dropRightWhile<TResult>(array, predicateFn);
-        result = _.dropRightWhile<TResult>(array, predicateFn, any);
         result = _.dropRightWhile<TResult>(array, '');
-        result = _.dropRightWhile<TResult>(array, '', any);
         result = _.dropRightWhile<{a: number;}, TResult>(array, {a: 42});
 
         result = _.dropRightWhile<TResult>(list);
         result = _.dropRightWhile<TResult>(list, predicateFn);
-        result = _.dropRightWhile<TResult>(list, predicateFn, any);
         result = _.dropRightWhile<TResult>(list, '');
-        result = _.dropRightWhile<TResult>(list, '', any);
         result = _.dropRightWhile<{a: number;}, TResult>(list, {a: 42});
     }
 
@@ -545,16 +541,12 @@ namespace TestDropRightWhile {
 
         result = _(array).dropRightWhile();
         result = _(array).dropRightWhile(predicateFn);
-        result = _(array).dropRightWhile(predicateFn, any);
         result = _(array).dropRightWhile('');
-        result = _(array).dropRightWhile('', any);
         result = _(array).dropRightWhile<{a: number;}>({a: 42});
 
         result = _(list).dropRightWhile<TResult>();
         result = _(list).dropRightWhile<TResult>(predicateFn);
-        result = _(list).dropRightWhile<TResult>(predicateFn, any);
         result = _(list).dropRightWhile<TResult>('');
-        result = _(list).dropRightWhile<TResult>('', any);
         result = _(list).dropRightWhile<{a: number;}, TResult>({a: 42});
     }
 
@@ -563,16 +555,12 @@ namespace TestDropRightWhile {
 
         result = _(array).chain().dropRightWhile();
         result = _(array).chain().dropRightWhile(predicateFn);
-        result = _(array).chain().dropRightWhile(predicateFn, any);
         result = _(array).chain().dropRightWhile('');
-        result = _(array).chain().dropRightWhile('', any);
         result = _(array).chain().dropRightWhile<{a: number;}>({a: 42});
 
         result = _(list).chain().dropRightWhile<TResult>();
         result = _(list).chain().dropRightWhile<TResult>(predicateFn);
-        result = _(list).chain().dropRightWhile<TResult>(predicateFn, any);
         result = _(list).chain().dropRightWhile<TResult>('');
-        result = _(list).chain().dropRightWhile<TResult>('', any);
         result = _(list).chain().dropRightWhile<{a: number;}, TResult>({a: 42});
     }
 }
@@ -588,16 +576,12 @@ namespace TestDropWhile {
 
         result = _.dropWhile<TResult>(array);
         result = _.dropWhile<TResult>(array, predicateFn);
-        result = _.dropWhile<TResult>(array, predicateFn, any);
         result = _.dropWhile<TResult>(array, '');
-        result = _.dropWhile<TResult>(array, '', any);
         result = _.dropWhile<{a: number;}, TResult>(array, {a: 42});
 
         result = _.dropWhile<TResult>(list);
         result = _.dropWhile<TResult>(list, predicateFn);
-        result = _.dropWhile<TResult>(list, predicateFn, any);
         result = _.dropWhile<TResult>(list, '');
-        result = _.dropWhile<TResult>(list, '', any);
         result = _.dropWhile<{a: number;}, TResult>(list, {a: 42});
     }
 
@@ -606,16 +590,12 @@ namespace TestDropWhile {
 
         result = _(array).dropWhile();
         result = _(array).dropWhile(predicateFn);
-        result = _(array).dropWhile(predicateFn, any);
         result = _(array).dropWhile('');
-        result = _(array).dropWhile('', any);
         result = _(array).dropWhile<{a: number;}>({a: 42});
 
         result = _(list).dropWhile<TResult>();
         result = _(list).dropWhile<TResult>(predicateFn);
-        result = _(list).dropWhile<TResult>(predicateFn, any);
         result = _(list).dropWhile<TResult>('');
-        result = _(list).dropWhile<TResult>('', any);
         result = _(list).dropWhile<{a: number;}, TResult>({a: 42});
     }
 
@@ -624,16 +604,12 @@ namespace TestDropWhile {
 
         result = _(array).chain().dropWhile();
         result = _(array).chain().dropWhile(predicateFn);
-        result = _(array).chain().dropWhile(predicateFn, any);
         result = _(array).chain().dropWhile('');
-        result = _(array).chain().dropWhile('', any);
         result = _(array).chain().dropWhile<{a: number;}>({a: 42});
 
         result = _(list).chain().dropWhile<TResult>();
         result = _(list).chain().dropWhile<TResult>(predicateFn);
-        result = _(list).chain().dropWhile<TResult>(predicateFn, any);
         result = _(list).chain().dropWhile<TResult>('');
-        result = _(list).chain().dropWhile<TResult>('', any);
         result = _(list).chain().dropWhile<{a: number;}, TResult>({a: 42});
     }
 }
@@ -703,30 +679,22 @@ namespace TestFindIndex {
 
         result = _.findIndex<TResult>(array);
         result = _.findIndex<TResult>(array, predicateFn);
-        result = _.findIndex<TResult>(array, predicateFn, any);
         result = _.findIndex<TResult>(array, '');
-        result = _.findIndex<TResult>(array, '', any);
         result = _.findIndex<{a: number}, TResult>(array, {a: 42});
 
         result = _.findIndex<TResult>(list);
         result = _.findIndex<TResult>(list, predicateFn);
-        result = _.findIndex<TResult>(list, predicateFn, any);
         result = _.findIndex<TResult>(list, '');
-        result = _.findIndex<TResult>(list, '', any);
         result = _.findIndex<{a: number}, TResult>(list, {a: 42});
 
         result = _<TResult>(array).findIndex();
         result = _<TResult>(array).findIndex(predicateFn);
-        result = _<TResult>(array).findIndex(predicateFn, any);
         result = _<TResult>(array).findIndex('');
-        result = _<TResult>(array).findIndex('', any);
         result = _<TResult>(array).findIndex<{a: number}>({a: 42});
 
         result = _(list).findIndex();
         result = _(list).findIndex<TResult>(predicateFn);
-        result = _(list).findIndex<TResult>(predicateFn, any);
         result = _(list).findIndex('');
-        result = _(list).findIndex('', any);
         result = _(list).findIndex<{a: number}>({a: 42});
     }
 
@@ -735,16 +703,12 @@ namespace TestFindIndex {
 
         result = _<TResult>(array).chain().findIndex();
         result = _<TResult>(array).chain().findIndex(predicateFn);
-        result = _<TResult>(array).chain().findIndex(predicateFn, any);
         result = _<TResult>(array).chain().findIndex('');
-        result = _<TResult>(array).chain().findIndex('', any);
         result = _<TResult>(array).chain().findIndex<{a: number}>({a: 42});
 
         result = _(list).chain().findIndex();
         result = _(list).chain().findIndex<TResult>(predicateFn);
-        result = _(list).chain().findIndex<TResult>(predicateFn, any);
         result = _(list).chain().findIndex('');
-        result = _(list).chain().findIndex('', any);
         result = _(list).chain().findIndex<{a: number}>({a: 42});
     }
 }
@@ -761,30 +725,22 @@ namespace TestFindLastIndex {
 
         result = _.findLastIndex<TResult>(array);
         result = _.findLastIndex<TResult>(array, predicateFn);
-        result = _.findLastIndex<TResult>(array, predicateFn, any);
         result = _.findLastIndex<TResult>(array, '');
-        result = _.findLastIndex<TResult>(array, '', any);
         result = _.findLastIndex<{a: number}, TResult>(array, {a: 42});
 
         result = _.findLastIndex<TResult>(list);
         result = _.findLastIndex<TResult>(list, predicateFn);
-        result = _.findLastIndex<TResult>(list, predicateFn, any);
         result = _.findLastIndex<TResult>(list, '');
-        result = _.findLastIndex<TResult>(list, '', any);
         result = _.findLastIndex<{a: number}, TResult>(list, {a: 42});
 
         result = _<TResult>(array).findLastIndex();
         result = _<TResult>(array).findLastIndex(predicateFn);
-        result = _<TResult>(array).findLastIndex(predicateFn, any);
         result = _<TResult>(array).findLastIndex('');
-        result = _<TResult>(array).findLastIndex('', any);
         result = _<TResult>(array).findLastIndex<{a: number}>({a: 42});
 
         result = _(list).findLastIndex();
         result = _(list).findLastIndex<TResult>(predicateFn);
-        result = _(list).findLastIndex<TResult>(predicateFn, any);
         result = _(list).findLastIndex('');
-        result = _(list).findLastIndex('', any);
         result = _(list).findLastIndex<{a: number}>({a: 42});
     }
 
@@ -793,16 +749,12 @@ namespace TestFindLastIndex {
 
         result = _<TResult>(array).chain().findLastIndex();
         result = _<TResult>(array).chain().findLastIndex(predicateFn);
-        result = _<TResult>(array).chain().findLastIndex(predicateFn, any);
         result = _<TResult>(array).chain().findLastIndex('');
-        result = _<TResult>(array).chain().findLastIndex('', any);
         result = _<TResult>(array).chain().findLastIndex<{a: number}>({a: 42});
 
         result = _(list).chain().findLastIndex();
         result = _(list).chain().findLastIndex<TResult>(predicateFn);
-        result = _(list).chain().findLastIndex<TResult>(predicateFn, any);
         result = _(list).chain().findLastIndex('');
-        result = _(list).chain().findLastIndex('', any);
         result = _(list).chain().findLastIndex<{a: number}>({a: 42});
     }
 }
@@ -1019,6 +971,24 @@ namespace TestFlattenDeep {
     }
 }
 
+// _.fromPairs
+namespace TestFromPairs {
+    let array: string[][];
+    let result: _.Dictionary<any>;
+
+    {
+        result = _.fromPairs(array);
+    }
+
+    {
+        result = _(array).fromPairs().value();
+    }
+
+    {
+        result = _.chain(array).fromPairs().value();
+    }
+}
+
 // _.head
 namespace TestHead {
     let array: TResult[];
@@ -1412,16 +1382,12 @@ namespace TestRemove {
 
         result = _.remove<TResult>(array);
         result = _.remove<TResult>(array, predicateFn);
-        result = _.remove<TResult>(array, predicateFn, any);
         result = _.remove<TResult>(array, '');
-        result = _.remove<TResult>(array, '', any);
         result = _.remove<{a: number}, TResult>(array, {a: 42});
 
         result = _.remove<TResult>(list);
         result = _.remove<TResult>(list, predicateFn);
-        result = _.remove<TResult>(list, predicateFn, any);
         result = _.remove<TResult>(list, '');
-        result = _.remove<TResult>(list, '', any);
         result = _.remove<{a: number}, TResult>(list, {a: 42});
     }
 
@@ -1430,16 +1396,12 @@ namespace TestRemove {
 
         result = _<TResult>(array).remove();
         result = _<TResult>(array).remove(predicateFn);
-        result = _<TResult>(array).remove(predicateFn, any);
         result = _<TResult>(array).remove('');
-        result = _<TResult>(array).remove('', any);
         result = _<TResult>(array).remove<{a: number}>({a: 42});
 
         result = _(list).remove<TResult>();
         result = _(list).remove<TResult>(predicateFn);
-        result = _(list).remove<TResult>(predicateFn, any);
         result = _(list).remove<TResult>('');
-        result = _(list).remove<TResult>('', any);
         result = _(list).remove<{a: number}, TResult>({a: 42});
     }
 
@@ -1448,16 +1410,12 @@ namespace TestRemove {
 
         result = _<TResult>(array).chain().remove();
         result = _<TResult>(array).chain().remove(predicateFn);
-        result = _<TResult>(array).chain().remove(predicateFn, any);
         result = _<TResult>(array).chain().remove('');
-        result = _<TResult>(array).chain().remove('', any);
         result = _<TResult>(array).chain().remove<{a: number}>({a: 42});
 
         result = _(list).chain().remove<TResult>();
         result = _(list).chain().remove<TResult>(predicateFn);
-        result = _(list).chain().remove<TResult>(predicateFn, any);
         result = _(list).chain().remove<TResult>('');
-        result = _(list).chain().remove<TResult>('', any);
         result = _(list).chain().remove<{a: number}, TResult>({a: 42});
     }
 }
@@ -1834,16 +1792,12 @@ namespace TestTakeRightWhile {
 
         result = _.takeRightWhile<TResult>(array);
         result = _.takeRightWhile<TResult>(array, predicateFn);
-        result = _.takeRightWhile<TResult>(array, predicateFn, any);
         result = _.takeRightWhile<TResult>(array, '');
-        result = _.takeRightWhile<TResult>(array, '', any);
         result = _.takeRightWhile<{a: number;}, TResult>(array, {a: 42});
 
         result = _.takeRightWhile<TResult>(list);
         result = _.takeRightWhile<TResult>(list, predicateFn);
-        result = _.takeRightWhile<TResult>(list, predicateFn, any);
         result = _.takeRightWhile<TResult>(list, '');
-        result = _.takeRightWhile<TResult>(list, '', any);
         result = _.takeRightWhile<{a: number;}, TResult>(list, {a: 42});
     }
 
@@ -1852,16 +1806,12 @@ namespace TestTakeRightWhile {
 
         result = _(array).takeRightWhile();
         result = _(array).takeRightWhile(predicateFn);
-        result = _(array).takeRightWhile(predicateFn, any);
         result = _(array).takeRightWhile('');
-        result = _(array).takeRightWhile('', any);
         result = _(array).takeRightWhile<{a: number;}>({a: 42});
 
         result = _(list).takeRightWhile<TResult>();
         result = _(list).takeRightWhile<TResult>(predicateFn);
-        result = _(list).takeRightWhile<TResult>(predicateFn, any);
         result = _(list).takeRightWhile<TResult>('');
-        result = _(list).takeRightWhile<TResult>('', any);
         result = _(list).takeRightWhile<{a: number;}, TResult>({a: 42});
     }
 
@@ -1870,16 +1820,12 @@ namespace TestTakeRightWhile {
 
         result = _(array).chain().takeRightWhile();
         result = _(array).chain().takeRightWhile(predicateFn);
-        result = _(array).chain().takeRightWhile(predicateFn, any);
         result = _(array).chain().takeRightWhile('');
-        result = _(array).chain().takeRightWhile('', any);
         result = _(array).chain().takeRightWhile<{a: number;}>({a: 42});
 
         result = _(list).chain().takeRightWhile<TResult>();
         result = _(list).chain().takeRightWhile<TResult>(predicateFn);
-        result = _(list).chain().takeRightWhile<TResult>(predicateFn, any);
         result = _(list).chain().takeRightWhile<TResult>('');
-        result = _(list).chain().takeRightWhile<TResult>('', any);
         result = _(list).chain().takeRightWhile<{a: number;}, TResult>({a: 42});
     }
 }
@@ -1895,16 +1841,12 @@ namespace TestTakeWhile {
 
         result = _.takeWhile<TResult>(array);
         result = _.takeWhile<TResult>(array, predicateFn);
-        result = _.takeWhile<TResult>(array, predicateFn, any);
         result = _.takeWhile<TResult>(array, '');
-        result = _.takeWhile<TResult>(array, '', any);
         result = _.takeWhile<{a: number;}, TResult>(array, {a: 42});
 
         result = _.takeWhile<TResult>(list);
         result = _.takeWhile<TResult>(list, predicateFn);
-        result = _.takeWhile<TResult>(list, predicateFn, any);
         result = _.takeWhile<TResult>(list, '');
-        result = _.takeWhile<TResult>(list, '', any);
         result = _.takeWhile<{a: number;}, TResult>(list, {a: 42});
     }
 
@@ -1913,16 +1855,12 @@ namespace TestTakeWhile {
 
         result = _(array).takeWhile();
         result = _(array).takeWhile(predicateFn);
-        result = _(array).takeWhile(predicateFn, any);
         result = _(array).takeWhile('');
-        result = _(array).takeWhile('', any);
         result = _(array).takeWhile<{a: number;}>({a: 42});
 
         result = _(list).takeWhile<TResult>();
         result = _(list).takeWhile<TResult>(predicateFn);
-        result = _(list).takeWhile<TResult>(predicateFn, any);
         result = _(list).takeWhile<TResult>('');
-        result = _(list).takeWhile<TResult>('', any);
         result = _(list).takeWhile<{a: number;}, TResult>({a: 42});
     }
 
@@ -1931,16 +1869,12 @@ namespace TestTakeWhile {
 
         result = _(array).chain().takeWhile();
         result = _(array).chain().takeWhile(predicateFn);
-        result = _(array).chain().takeWhile(predicateFn, any);
         result = _(array).chain().takeWhile('');
-        result = _(array).chain().takeWhile('', any);
         result = _(array).chain().takeWhile<{a: number;}>({a: 42});
 
         result = _(list).chain().takeWhile<TResult>();
         result = _(list).chain().takeWhile<TResult>(predicateFn);
-        result = _(list).chain().takeWhile<TResult>(predicateFn, any);
         result = _(list).chain().takeWhile<TResult>('');
-        result = _(list).chain().takeWhile<TResult>('', any);
         result = _(list).chain().takeWhile<{a: number;}, TResult>({a: 42});
     }
 }
@@ -2443,14 +2377,10 @@ namespace TestUnzip {
     let result: TResult[];
     result = _.unzipWith<number, TResult>(testUnzipWithArray);
     result = _.unzipWith<number, TResult>(testUnzipWithArray, testUnzipWithIterator);
-    result = _.unzipWith<number, TResult>(testUnzipWithArray, testUnzipWithIterator, any);
     result = _.unzipWith<number, TResult>(testUnzipWithList);
     result = _.unzipWith<number, TResult>(testUnzipWithList, testUnzipWithIterator);
-    result = _.unzipWith<number, TResult>(testUnzipWithList, testUnzipWithIterator, any);
     result = _(testUnzipWithArray).unzipWith<number, TResult>(testUnzipWithIterator).value();
-    result = _(testUnzipWithArray).unzipWith<number, TResult>(testUnzipWithIterator, any).value();
     result = _(testUnzipWithList).unzipWith<number, TResult>(testUnzipWithIterator).value();
-    result = _(testUnzipWithList).unzipWith<number, TResult>(testUnzipWithIterator, any).value();
 }
 
 // _.without
@@ -2717,14 +2647,12 @@ interface TestZipWithFn {
 var testZipWithFn: TestZipWithFn;
 result = <number[]>_.zipWith<number>([1, 2]);
 result = <number[]>_.zipWith<number>([1, 2], testZipWithFn);
-result = <number[]>_.zipWith<number>([1, 2], testZipWithFn, any);
-result = <number[]>_.zipWith<number>([1, 2], [1, 2], testZipWithFn, any);
-result = <number[]>_.zipWith<number>([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], [1, 2], testZipWithFn, any);
+result = <number[]>_.zipWith<number>([1, 2], [1, 2], testZipWithFn);
+result = <number[]>_.zipWith<number>([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], [1, 2], testZipWithFn);
 result = <number[]>_([1, 2]).zipWith<number>().value();
 result = <number[]>_([1, 2]).zipWith<number>(testZipWithFn).value();
-result = <number[]>_([1, 2]).zipWith<number>(testZipWithFn, any).value();
-result = <number[]>_([1, 2]).zipWith<number>([1, 2], testZipWithFn, any).value();
-result = <number[]>_([1, 2]).zipWith<number>([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], testZipWithFn, any).value();
+result = <number[]>_([1, 2]).zipWith<number>([1, 2], testZipWithFn).value();
+result = <number[]>_([1, 2]).zipWith<number>([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], testZipWithFn).value();
 
 /*********
  * Chain *
@@ -2778,7 +2706,6 @@ namespace TestTap {
         let result: string;
 
         _.tap('', interceptor);
-        _.tap('', interceptor, any);
     }
 
     {
@@ -2786,7 +2713,6 @@ namespace TestTap {
         let result: _.LoDashImplicitArrayWrapper<string>;
 
         _.tap([''], interceptor);
-        _.tap([''], interceptor, any);
     }
 
     {
@@ -2794,18 +2720,15 @@ namespace TestTap {
         let result: _.LoDashImplicitObjectWrapper<{a: string}>;
 
         _.tap({a: ''}, interceptor);
-        _.tap({a: ''}, interceptor, any);
     }
 
     {
         let interceptor: (value: string) => void;
         let result: _.LoDashImplicitWrapper<string>;
 
-        _.chain('').tap(interceptor, any);
-        _.chain('').tap(interceptor, any);
+        _.chain('').tap(interceptor);
 
         _('').tap(interceptor);
-        _('').tap(interceptor, any);
     }
 
     {
@@ -2813,10 +2736,8 @@ namespace TestTap {
         let result: _.LoDashImplicitArrayWrapper<string>;
 
         _.chain(['']).tap(interceptor);
-        _.chain(['']).tap(interceptor, any);
 
         _(['']).tap(interceptor);
-        _(['']).tap(interceptor, any);
     }
 
     {
@@ -2824,21 +2745,17 @@ namespace TestTap {
         let result: _.LoDashImplicitObjectWrapper<{a: string}>;
 
         _.chain({a: ''}).tap(interceptor);
-        _.chain({a: ''}).tap(interceptor, any);
 
         _({a: ''}).tap(interceptor);
-        _({a: ''}).tap(interceptor, any);
     }
 
     {
         let interceptor: (value: string) => void;
         let result: _.LoDashExplicitWrapper<string>;
 
-        _.chain('').tap(interceptor, any);
-        _.chain('').tap(interceptor, any);
+        _.chain('').tap(interceptor);
 
         _('').chain().tap(interceptor);
-        _('').chain().tap(interceptor, any);
     }
 
     {
@@ -2846,10 +2763,8 @@ namespace TestTap {
         let result: _.LoDashExplicitArrayWrapper<string>;
 
         _.chain(['']).tap(interceptor);
-        _.chain(['']).tap(interceptor, any);
 
         _(['']).chain().tap(interceptor);
-        _(['']).chain().tap(interceptor, any);
     }
 
     {
@@ -2857,10 +2772,8 @@ namespace TestTap {
         let result: _.LoDashExplicitObjectWrapper<{a: string}>;
 
         _.chain({a: ''}).tap(interceptor);
-        _.chain({a: ''}).tap(interceptor, any);
 
         _({a: ''}).chain().tap(interceptor);
-        _({a: ''}).chain().tap(interceptor, any);
     }
 }
 
@@ -2875,7 +2788,6 @@ namespace TestThru {
         let result: number;
 
         result = _.thru<number, number>(1, interceptor);
-        result = _.thru<number, number>(1, interceptor, any);
     }
 
     {
@@ -2883,7 +2795,6 @@ namespace TestThru {
         let result: _.LoDashImplicitWrapper<number>;
 
         result = _(1).thru<number>(interceptor);
-        result = _(1).thru<number>(interceptor, any);
     }
 
     {
@@ -2891,7 +2802,6 @@ namespace TestThru {
         let result: _.LoDashImplicitWrapper<string>;
 
         result = _('').thru<string>(interceptor);
-        result = _('').thru<string>(interceptor, any);
     }
 
     {
@@ -2899,7 +2809,6 @@ namespace TestThru {
         let result: _.LoDashImplicitWrapper<boolean>;
 
         result = _(true).thru<boolean>(interceptor);
-        result = _(true).thru<boolean>(interceptor, any);
     }
 
     {
@@ -2907,7 +2816,6 @@ namespace TestThru {
         let result: _.LoDashImplicitObjectWrapper<{a: string}>;
 
         result = _({a: ''}).thru<{a: string}>(interceptor);
-        result = _({a: ''}).thru<{a: string}>(interceptor, any);
     }
 
     {
@@ -2915,7 +2823,6 @@ namespace TestThru {
         let result: _.LoDashImplicitArrayWrapper<number>;
 
         result = _([1, 2, 3]).thru<number>(interceptor);
-        result = _([1, 2, 3]).thru<number>(interceptor, any);
     }
 
     {
@@ -2923,7 +2830,6 @@ namespace TestThru {
         let result: _.LoDashExplicitWrapper<number>;
 
         result = _(1).chain().thru<number>(interceptor);
-        result = _(1).chain().thru<number>(interceptor, any);
     }
 
     {
@@ -2931,7 +2837,6 @@ namespace TestThru {
         let result: _.LoDashExplicitWrapper<string>;
 
         result = _('').chain().thru<string>(interceptor);
-        result = _('').chain().thru<string>(interceptor, any);
     }
 
     {
@@ -2939,7 +2844,6 @@ namespace TestThru {
         let result: _.LoDashExplicitWrapper<boolean>;
 
         result = _(true).chain().thru<boolean>(interceptor);
-        result = _(true).chain().thru<boolean>(interceptor, any);
     }
 
     {
@@ -2947,7 +2851,6 @@ namespace TestThru {
         let result: _.LoDashExplicitObjectWrapper<{a: string}>;
 
         result = _({a: ''}).chain().thru<{a: string}>(interceptor);
-        result = _({a: ''}).chain().thru<{a: string}>(interceptor, any);
     }
 
     {
@@ -2955,7 +2858,6 @@ namespace TestThru {
         let result: _.LoDashExplicitArrayWrapper<number>;
 
         result = _([1, 2, 3]).chain().thru<number>(interceptor);
-        result = _([1, 2, 3]).chain().thru<number>(interceptor, any);
     }
 }
 
@@ -3134,12 +3036,12 @@ namespace TestPlant {
 namespace TestReverse {
     {
         let result: _.LoDashImplicitArrayWrapper<number>;
-        result: _([42]).reverse();
+        result = _([42]).reverse();
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<number>;
-        result: _([42]).chain().reverse();
+        result = _([42]).chain().reverse();
     }
 }
 
@@ -3326,37 +3228,28 @@ namespace TestCountBy {
 
         result = _.countBy<string>('');
         result = _.countBy<string>('', stringIterator);
-        result = _.countBy<string>('', stringIterator, any);
 
         result = _.countBy<TResult>(array);
         result = _.countBy<TResult>(array, listIterator);
-        result = _.countBy<TResult>(array, listIterator, any);
         result = _.countBy<TResult>(array, '');
-        result = _.countBy<TResult>(array, '', any);
         result = _.countBy<{a: number}, TResult>(array, {a: 42});
         result = _.countBy<TResult>(array, {a: 42});
 
         result = _.countBy<TResult>(list);
         result = _.countBy<TResult>(list, listIterator);
-        result = _.countBy<TResult>(list, listIterator, any);
         result = _.countBy<TResult>(list, '');
-        result = _.countBy<TResult>(list, '', any);
         result = _.countBy<{a: number}, TResult>(list, {a: 42});
         result = _.countBy<TResult>(list, {a: 42});
 
         result = _.countBy<TResult>(dictionary);
         result = _.countBy<TResult>(dictionary, dictionaryIterator);
-        result = _.countBy<TResult>(dictionary, dictionaryIterator, any);
         result = _.countBy<TResult>(dictionary, '');
-        result = _.countBy<TResult>(dictionary, '', any);
         result = _.countBy<{a: number}, TResult>(dictionary, {a: 42});
         result = _.countBy<TResult>(dictionary, {a: 42});
 
         result = _.countBy<TResult>(numericDictionary);
         result = _.countBy<TResult>(numericDictionary, numericDictionaryIterator);
-        result = _.countBy<TResult>(numericDictionary, numericDictionaryIterator, any);
         result = _.countBy<TResult>(numericDictionary, '');
-        result = _.countBy<TResult>(numericDictionary, '', any);
         result = _.countBy<{a: number}, TResult>(numericDictionary, {a: 42});
         result = _.countBy<TResult>(numericDictionary, {a: 42});
     }
@@ -3366,37 +3259,28 @@ namespace TestCountBy {
 
         result = _('').countBy();
         result = _('').countBy(stringIterator);
-        result = _('').countBy(stringIterator, any);
 
         result = _(array).countBy();
         result = _(array).countBy(listIterator);
-        result = _(array).countBy(listIterator, any);
         result = _(array).countBy('');
-        result = _(array).countBy('', any);
         result = _(array).countBy<{a: number}>({a: 42});
         result = _(array).countBy({a: 42});
 
         result = _(list).countBy();
         result = _(list).countBy<TResult>(listIterator);
-        result = _(list).countBy<TResult>(listIterator, any);
         result = _(list).countBy('');
-        result = _(list).countBy('', any);
         result = _(list).countBy<{a: number}>({a: 42});
         result = _(list).countBy({a: 42});
 
         result = _(dictionary).countBy();
         result = _(dictionary).countBy<TResult>(dictionaryIterator);
-        result = _(dictionary).countBy<TResult>(dictionaryIterator, any);
         result = _(dictionary).countBy('');
-        result = _(dictionary).countBy('', any);
         result = _(dictionary).countBy<{a: number}>({a: 42});
         result = _(dictionary).countBy({a: 42});
 
         result = _(numericDictionary).countBy();
         result = _(numericDictionary).countBy<TResult>(numericDictionaryIterator);
-        result = _(numericDictionary).countBy<TResult>(numericDictionaryIterator, any);
         result = _(numericDictionary).countBy('');
-        result = _(numericDictionary).countBy('', any);
         result = _(numericDictionary).countBy<{a: number}>({a: 42});
         result = _(numericDictionary).countBy({a: 42});
     }
@@ -3406,37 +3290,28 @@ namespace TestCountBy {
 
         result = _('').chain().countBy();
         result = _('').chain().countBy(stringIterator);
-        result = _('').chain().countBy(stringIterator, any);
 
         result = _(array).chain().countBy();
         result = _(array).chain().countBy(listIterator);
-        result = _(array).chain().countBy(listIterator, any);
         result = _(array).chain().countBy('');
-        result = _(array).chain().countBy('', any);
         result = _(array).chain().countBy<{a: number}>({a: 42});
         result = _(array).chain().countBy({a: 42});
 
         result = _(list).chain().countBy();
         result = _(list).chain().countBy<TResult>(listIterator);
-        result = _(list).chain().countBy<TResult>(listIterator, any);
         result = _(list).chain().countBy('');
-        result = _(list).chain().countBy('', any);
         result = _(list).chain().countBy<{a: number}>({a: 42});
         result = _(list).chain().countBy({a: 42});
 
         result = _(dictionary).chain().countBy();
         result = _(dictionary).chain().countBy<TResult>(dictionaryIterator);
-        result = _(dictionary).chain().countBy<TResult>(dictionaryIterator, any);
         result = _(dictionary).chain().countBy('');
-        result = _(dictionary).chain().countBy('', any);
         result = _(dictionary).chain().countBy<{a: number}>({a: 42});
         result = _(dictionary).chain().countBy({a: 42});
 
         result = _(numericDictionary).chain().countBy();
         result = _(numericDictionary).chain().countBy<TResult>(numericDictionaryIterator);
-        result = _(numericDictionary).chain().countBy<TResult>(numericDictionaryIterator, any);
         result = _(numericDictionary).chain().countBy('');
-        result = _(numericDictionary).chain().countBy('', any);
         result = _(numericDictionary).chain().countBy<{a: number}>({a: 42});
         result = _(numericDictionary).chain().countBy({a: 42});
     }
@@ -3456,84 +3331,72 @@ namespace TestEach {
         let result: string;
 
         _.each('', stringIterator);
-        _.each('', stringIterator, any);
     }
 
     {
         let result: TResult[];
 
         _.each<TResult>(array, listIterator);
-        _.each<TResult>(array, listIterator, any);
     }
 
     {
         let result: _.List<TResult>;
 
         _.each<TResult>(list, listIterator);
-        _.each<TResult>(list, listIterator, any);
     }
 
     {
         let result: _.Dictionary<TResult>;
 
         _.each<TResult>(dictionary, dictionaryIterator);
-        _.each<TResult>(dictionary, dictionaryIterator, any);
     }
 
     {
         let result: _.LoDashImplicitWrapper<string>;
 
         _('').each(stringIterator);
-        _('').each(stringIterator, any);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<TResult>;
 
         _(array).each(listIterator);
-        _(array).each(listIterator, any);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<_.List<TResult>>;
 
         _(list).each<TResult>(listIterator);
-        _(list).each<TResult>(listIterator, any);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<TResult>>;
 
         _(dictionary).each<TResult>(dictionaryIterator);
-        _(dictionary).each<TResult>(dictionaryIterator, any);
     }
 
     {
         let result: _.LoDashExplicitWrapper<string>;
 
         _('').chain().each(stringIterator);
-        _('').chain().each(stringIterator, any);
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<TResult>;
 
         _(array).chain().each(listIterator);
-        _(array).chain().each(listIterator, any);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.List<TResult>>;
 
         _(list).chain().each<TResult>(listIterator);
-        _(list).chain().each<TResult>(listIterator, any);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<TResult>>;
 
         _(dictionary).chain().each<TResult>(dictionaryIterator);
-        _(dictionary).chain().each<TResult>(dictionaryIterator, any);
     }
 }
 
@@ -3551,84 +3414,72 @@ namespace TestEachRight {
         let result: string;
 
         _.eachRight('', stringIterator);
-        _.eachRight('', stringIterator, any);
     }
 
     {
         let result: TResult[];
 
         _.eachRight<TResult>(array, listIterator);
-        _.eachRight<TResult>(array, listIterator, any);
     }
 
     {
         let result: _.List<TResult>;
 
         _.eachRight<TResult>(list, listIterator);
-        _.eachRight<TResult>(list, listIterator, any);
     }
 
     {
         let result: _.Dictionary<TResult>;
 
         _.eachRight<TResult>(dictionary, dictionaryIterator);
-        _.eachRight<TResult>(dictionary, dictionaryIterator, any);
     }
 
     {
         let result: _.LoDashImplicitWrapper<string>;
 
         _('').eachRight(stringIterator);
-        _('').eachRight(stringIterator, any);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<TResult>;
 
         _(array).eachRight(listIterator);
-        _(array).eachRight(listIterator, any);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<_.List<TResult>>;
 
         _(list).eachRight<TResult>(listIterator);
-        _(list).eachRight<TResult>(listIterator, any);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<TResult>>;
 
         _(dictionary).eachRight<TResult>(dictionaryIterator);
-        _(dictionary).eachRight<TResult>(dictionaryIterator, any);
     }
 
     {
         let result: _.LoDashExplicitWrapper<string>;
 
         _('').chain().eachRight(stringIterator);
-        _('').chain().eachRight(stringIterator, any);
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<TResult>;
 
         _(array).chain().eachRight(listIterator);
-        _(array).chain().eachRight(listIterator, any);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.List<TResult>>;
 
         _(list).chain().eachRight<TResult>(listIterator);
-        _(list).chain().eachRight<TResult>(listIterator, any);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<TResult>>;
 
         _(dictionary).chain().eachRight<TResult>(dictionaryIterator);
-        _(dictionary).chain().eachRight<TResult>(dictionaryIterator, any);
     }
 }
 
@@ -3740,28 +3591,21 @@ namespace TestFilter {
         let result: string[];
 
         result = _.filter('', stringIterator);
-        result = _.filter('', stringIterator, any);
     }
 
     {
         let result: TResult[];
 
         result = _.filter<TResult>(array, listIterator);
-        result = _.filter<TResult>(array, listIterator, any);
         result = _.filter<TResult>(array, '');
-        result = _.filter<TResult>(array, '', any);
         result = _.filter<{a: number}, TResult>(array, {a: 42});
 
         result = _.filter<TResult>(list, listIterator);
-        result = _.filter<TResult>(list, listIterator, any);
         result = _.filter<TResult>(list, '');
-        result = _.filter<TResult>(list, '', any);
         result = _.filter<{a: number}, TResult>(list, {a: 42});
 
         result = _.filter<TResult>(dictionary, dictionaryIterator);
-        result = _.filter<TResult>(dictionary, dictionaryIterator, any);
         result = _.filter<TResult>(dictionary, '');
-        result = _.filter<TResult>(dictionary, '', any);
         result = _.filter<{a: number}, TResult>(dictionary, {a: 42});
     }
 
@@ -3769,28 +3613,21 @@ namespace TestFilter {
         let result: _.LoDashImplicitArrayWrapper<string>;
 
         result = _('').filter(stringIterator);
-        result = _('').filter(stringIterator, any);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<TResult>;
 
         result = _(array).filter(listIterator);
-        result = _(array).filter(listIterator, any);
         result = _(array).filter('');
-        result = _(array).filter('', any);
         result = _(array).filter<{a: number}>({a: 42});
 
         result = _(list).filter<TResult>(listIterator);
-        result = _(list).filter<TResult>(listIterator, any);
         result = _(list).filter<TResult>('');
-        result = _(list).filter<TResult>('', any);
         result = _(list).filter<{a: number}, TResult>({a: 42});
 
         result = _(dictionary).filter<TResult>(dictionaryIterator);
-        result = _(dictionary).filter<TResult>(dictionaryIterator, any);
         result = _(dictionary).filter<TResult>('');
-        result = _(dictionary).filter<TResult>('', any);
         result = _(dictionary).filter<{a: number}, TResult>({a: 42});
     }
 
@@ -3798,28 +3635,21 @@ namespace TestFilter {
         let result: _.LoDashExplicitArrayWrapper<string>;
 
         result = _('').chain().filter(stringIterator);
-        result = _('').chain().filter(stringIterator, any);
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<TResult>;
 
         result = _(array).chain().filter(listIterator);
-        result = _(array).chain().filter(listIterator, any);
         result = _(array).chain().filter('');
-        result = _(array).chain().filter('', any);
         result = _(array).chain().filter<{a: number}>({a: 42});
 
         result = _(list).chain().filter<TResult>(listIterator);
-        result = _(list).chain().filter<TResult>(listIterator, any);
         result = _(list).chain().filter<TResult>('');
-        result = _(list).chain().filter<TResult>('', any);
         result = _(list).chain().filter<{a: number}, TResult>({a: 42});
 
         result = _(dictionary).chain().filter<TResult>(dictionaryIterator);
-        result = _(dictionary).chain().filter<TResult>(dictionaryIterator, any);
         result = _(dictionary).chain().filter<TResult>('');
-        result = _(dictionary).chain().filter<TResult>('', any);
         result = _(dictionary).chain().filter<{a: number}, TResult>({a: 42});
     }
 }
@@ -3837,37 +3667,31 @@ namespace TestFind {
 
     result = _.find<TResult>(array);
     result = _.find<TResult>(array, listIterator);
-    result = _.find<TResult>(array, listIterator, any);
     result = _.find<TResult>(array, '');
     result = _.find<{a: number}, TResult>(array, {a: 42});
 
     result = _.find<TResult>(list);
     result = _.find<TResult>(list, listIterator);
-    result = _.find<TResult>(list, listIterator, any);
     result = _.find<TResult>(list, '');
     result = _.find<{a: number}, TResult>(list, {a: 42});
 
     result = _.find<TResult>(dictionary);
     result = _.find<TResult>(dictionary, dictionaryIterator);
-    result = _.find<TResult>(dictionary, dictionaryIterator, any);
     result = _.find<TResult>(dictionary, '');
     result = _.find<{a: number}, TResult>(dictionary, {a: 42});
 
     result = _(array).find();
     result = _(array).find(listIterator);
-    result = _(array).find(listIterator, any);
     result = _(array).find('');
     result = _(array).find<{a: number}>({a: 42});
 
     result = _(list).find<TResult>();
     result = _(list).find<TResult>(listIterator);
-    result = _(list).find<TResult>(listIterator, any);
     result = _(list).find<TResult>('');
     result = _(list).find<{a: number}, TResult>({a: 42});
 
     result = _(dictionary).find<TResult>();
     result = _(dictionary).find<TResult>(dictionaryIterator);
-    result = _(dictionary).find<TResult>(dictionaryIterator, any);
     result = _(dictionary).find<TResult>('');
     result = _(dictionary).find<{a: number}, TResult>({a: 42});
 }
@@ -4089,84 +3913,72 @@ namespace TestForEach {
         let result: string;
 
         _.forEach('', stringIterator);
-        _.forEach('', stringIterator, any);
     }
 
     {
         let result: TResult[];
 
         _.forEach<TResult>(array, listIterator);
-        _.forEach<TResult>(array, listIterator, any);
     }
 
     {
         let result: _.List<TResult>;
 
         _.forEach<TResult>(list, listIterator);
-        _.forEach<TResult>(list, listIterator, any);
     }
 
     {
         let result: _.Dictionary<TResult>;
 
         _.forEach<TResult>(dictionary, dictionaryIterator);
-        _.forEach<TResult>(dictionary, dictionaryIterator, any);
     }
 
     {
         let result: _.LoDashImplicitWrapper<string>;
 
         _('').forEach(stringIterator);
-        _('').forEach(stringIterator, any);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<TResult>;
 
         _(array).forEach(listIterator);
-        _(array).forEach(listIterator, any);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<_.List<TResult>>;
 
         _(list).forEach<TResult>(listIterator);
-        _(list).forEach<TResult>(listIterator, any);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<TResult>>;
 
         _(dictionary).forEach<TResult>(dictionaryIterator);
-        _(dictionary).forEach<TResult>(dictionaryIterator, any);
     }
 
     {
         let result: _.LoDashExplicitWrapper<string>;
 
         _('').chain().forEach(stringIterator);
-        _('').chain().forEach(stringIterator, any);
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<TResult>;
 
         _(array).chain().forEach(listIterator);
-        _(array).chain().forEach(listIterator, any);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.List<TResult>>;
 
         _(list).chain().forEach<TResult>(listIterator);
-        _(list).chain().forEach<TResult>(listIterator, any);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<TResult>>;
 
         _(dictionary).chain().forEach<TResult>(dictionaryIterator);
-        _(dictionary).chain().forEach<TResult>(dictionaryIterator, any);
     }
 }
 
@@ -4184,84 +3996,72 @@ namespace TestForEachRight {
         let result: string;
 
         _.forEachRight('', stringIterator);
-        _.forEachRight('', stringIterator, any);
     }
 
     {
         let result: TResult[];
 
         _.forEachRight<TResult>(array, listIterator);
-        _.forEachRight<TResult>(array, listIterator, any);
     }
 
     {
         let result: _.List<TResult>;
 
         _.forEachRight<TResult>(list, listIterator);
-        _.forEachRight<TResult>(list, listIterator, any);
     }
 
     {
         let result: _.Dictionary<TResult>;
 
         _.forEachRight<TResult>(dictionary, dictionaryIterator);
-        _.forEachRight<TResult>(dictionary, dictionaryIterator, any);
     }
 
     {
         let result: _.LoDashImplicitWrapper<string>;
 
         _('').forEachRight(stringIterator);
-        _('').forEachRight(stringIterator, any);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<TResult>;
 
         _(array).forEachRight(listIterator);
-        _(array).forEachRight(listIterator, any);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<_.List<TResult>>;
 
         _(list).forEachRight<TResult>(listIterator);
-        _(list).forEachRight<TResult>(listIterator, any);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<TResult>>;
 
         _(dictionary).forEachRight<TResult>(dictionaryIterator);
-        _(dictionary).forEachRight<TResult>(dictionaryIterator, any);
     }
 
     {
         let result: _.LoDashExplicitWrapper<string>;
 
         _('').chain().forEachRight(stringIterator);
-        _('').chain().forEachRight(stringIterator, any);
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<TResult>;
 
         _(array).chain().forEachRight(listIterator);
-        _(array).chain().forEachRight(listIterator, any);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.List<TResult>>;
 
         _(list).chain().forEachRight<TResult>(listIterator);
-        _(list).chain().forEachRight<TResult>(listIterator, any);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<TResult>>;
 
         _(dictionary).chain().forEachRight<TResult>(dictionaryIterator);
-        _(dictionary).chain().forEachRight<TResult>(dictionaryIterator, any);
     }
 }
 
@@ -4282,9 +4082,7 @@ namespace TestGroupBy {
 
         result = _.groupBy<string>('');
         result = _.groupBy<string>('', stringIterator);
-        result = _.groupBy<string>('', stringIterator, any);
         result = _.groupBy<string, number>('', stringIterator);
-        result = _.groupBy<string, number>('', stringIterator, any);
     }
 
     {
@@ -4292,38 +4090,29 @@ namespace TestGroupBy {
 
         result = _.groupBy<SampleType>(array);
         result = _.groupBy<SampleType>(array, listIterator);
-        result = _.groupBy<SampleType>(array, listIterator, any);
         result = _.groupBy<SampleType>(array, '');
-        result = _.groupBy<SampleType>(array, '', any);
         result = _.groupBy<SampleType>(array, {a: 42});
 
         result = _.groupBy<SampleType, number>(array, listIterator);
-        result = _.groupBy<SampleType, number>(array, listIterator, any);
-        result = _.groupBy<SampleType, boolean>(array, '', true);
+        result = _.groupBy<SampleType, boolean>(array, '');
         result = _.groupBy<{a: number}, SampleType>(array, {a: 42});
 
         result = _.groupBy<SampleType>(list);
         result = _.groupBy<SampleType>(list, listIterator);
-        result = _.groupBy<SampleType>(list, listIterator, any);
         result = _.groupBy<SampleType>(list, '');
-        result = _.groupBy<SampleType>(list, '', any);
         result = _.groupBy<SampleType>(list, {a: 42});
 
         result = _.groupBy<SampleType, number>(list, listIterator);
-        result = _.groupBy<SampleType, number>(list, listIterator, any);
-        result = _.groupBy<SampleType, boolean>(list, '', true);
+        result = _.groupBy<SampleType, boolean>(list, '');
         result = _.groupBy<{a: number}, SampleType>(list, {a: 42});
 
         result = _.groupBy<SampleType>(dictionary);
         result = _.groupBy<SampleType>(dictionary, dictionaryIterator);
-        result = _.groupBy<SampleType>(dictionary, dictionaryIterator, any);
         result = _.groupBy<SampleType>(dictionary, '');
-        result = _.groupBy<SampleType>(dictionary, '', any);
         result = _.groupBy<SampleType>(dictionary, {a: 42});
 
         result = _.groupBy<SampleType, number>(dictionary, dictionaryIterator);
-        result = _.groupBy<SampleType, number>(dictionary, dictionaryIterator, any);
-        result = _.groupBy<SampleType, boolean>(dictionary, '', true);
+        result = _.groupBy<SampleType, boolean>(dictionary, '');
         result = _.groupBy<{a: number}, SampleType>(dictionary, {a: 42});
     }
 
@@ -4332,7 +4121,6 @@ namespace TestGroupBy {
 
         result = _('').groupBy();
         result = _('').groupBy<number>(stringIterator);
-        result = _('').groupBy<number>(stringIterator, any);
     }
 
     {
@@ -4340,33 +4128,26 @@ namespace TestGroupBy {
 
         result = _(array).groupBy();
         result = _(array).groupBy<number>(listIterator);
-        result = _(array).groupBy<number>(listIterator, any);
         result = _(array).groupBy('');
-        result = _(array).groupBy<boolean>('', true);
+        result = _(array).groupBy<boolean>('');
         result = _(array).groupBy<{a: number}>({a: 42});
 
         result = _(list).groupBy<SampleType>();
         result = _(list).groupBy<SampleType>(listIterator);
-        result = _(list).groupBy<SampleType>(listIterator, any);
         result = _(list).groupBy<SampleType>('');
-        result = _(list).groupBy<SampleType>('', any);
         result = _(list).groupBy<SampleType>({a: 42});
 
         result = _(list).groupBy<SampleType, number>(listIterator);
-        result = _(list).groupBy<SampleType, number>(listIterator, any);
-        result = _(list).groupBy<SampleType, boolean>('', true);
+        result = _(list).groupBy<SampleType, boolean>('');
         result = _(list).groupBy<{a: number}, SampleType>({a: 42});
 
         result = _(dictionary).groupBy<SampleType>();
         result = _(dictionary).groupBy<SampleType>(dictionaryIterator);
-        result = _(dictionary).groupBy<SampleType>(dictionaryIterator, any);
         result = _(dictionary).groupBy<SampleType>('');
-        result = _(dictionary).groupBy<SampleType>('', any);
         result = _(dictionary).groupBy<SampleType>({a: 42});
 
         result = _(dictionary).groupBy<SampleType, number>(dictionaryIterator);
-        result = _(dictionary).groupBy<SampleType, number>(dictionaryIterator, any);
-        result = _(dictionary).groupBy<SampleType, boolean>('', true);
+        result = _(dictionary).groupBy<SampleType, boolean>('');
         result = _(dictionary).groupBy<{a: number}, SampleType>({a: 42});
     }
 
@@ -4375,7 +4156,6 @@ namespace TestGroupBy {
 
         result = _('').chain().groupBy();
         result = _('').chain().groupBy<number>(stringIterator);
-        result = _('').chain().groupBy<number>(stringIterator, any);
     }
 
     {
@@ -4383,33 +4163,26 @@ namespace TestGroupBy {
 
         result = _(array).chain().groupBy();
         result = _(array).chain().groupBy<number>(listIterator);
-        result = _(array).chain().groupBy<number>(listIterator, any);
         result = _(array).chain().groupBy('');
-        result = _(array).chain().groupBy<boolean>('', true);
+        result = _(array).chain().groupBy<boolean>('');
         result = _(array).chain().groupBy<{a: number}>({a: 42});
 
         result = _(list).chain().groupBy<SampleType>();
         result = _(list).chain().groupBy<SampleType>(listIterator);
-        result = _(list).chain().groupBy<SampleType>(listIterator, any);
         result = _(list).chain().groupBy<SampleType>('');
-        result = _(list).chain().groupBy<SampleType>('', any);
         result = _(list).chain().groupBy<SampleType>({a: 42});
 
         result = _(list).chain().groupBy<SampleType, number>(listIterator);
-        result = _(list).chain().groupBy<SampleType, number>(listIterator, any);
-        result = _(list).chain().groupBy<SampleType, boolean>('', true);
+        result = _(list).chain().groupBy<SampleType, boolean>('');
         result = _(list).chain().groupBy<{a: number}, SampleType>({a: 42});
 
         result = _(dictionary).chain().groupBy<SampleType>();
         result = _(dictionary).chain().groupBy<SampleType>(dictionaryIterator);
-        result = _(dictionary).chain().groupBy<SampleType>(dictionaryIterator, any);
         result = _(dictionary).chain().groupBy<SampleType>('');
-        result = _(dictionary).chain().groupBy<SampleType>('', any);
         result = _(dictionary).chain().groupBy<SampleType>({a: 42});
 
         result = _(dictionary).chain().groupBy<SampleType, number>(dictionaryIterator);
-        result = _(dictionary).chain().groupBy<SampleType, number>(dictionaryIterator, any);
-        result = _(dictionary).chain().groupBy<SampleType, boolean>('', true);
+        result = _(dictionary).chain().groupBy<SampleType, boolean>('');
         result = _(dictionary).chain().groupBy<{a: number}, SampleType>({a: 42});
     }
 }
@@ -4479,7 +4252,6 @@ namespace TestKeyBy {
 
         result = _.keyBy<string>('abcd');
         result = _.keyBy<string>('abcd', stringIterator);
-        result = _.keyBy<string>('abcd', stringIterator, any);
     }
 
     {
@@ -4487,33 +4259,25 @@ namespace TestKeyBy {
 
         result = _.keyBy<SampleObject>(array);
         result = _.keyBy<SampleObject>(array, listIterator);
-        result = _.keyBy<SampleObject>(array, listIterator, any);
         result = _.keyBy<SampleObject>(array, 'a');
-        result = _.keyBy<SampleObject>(array, 'a', any);
         result = _.keyBy<{a: number}, SampleObject>(array, {a: 42});
         result = _.keyBy<SampleObject>(array, {a: 42});
 
         result = _.keyBy<SampleObject>(list);
         result = _.keyBy<SampleObject>(list, listIterator);
-        result = _.keyBy<SampleObject>(list, listIterator, any);
         result = _.keyBy<SampleObject>(list, 'a');
-        result = _.keyBy<SampleObject>(list, 'a', any);
         result = _.keyBy<{a: number}, SampleObject>(list, {a: 42});
         result = _.keyBy<SampleObject>(list, {a: 42});
 
         result = _.keyBy<SampleObject>(numericDictionary);
         result = _.keyBy<SampleObject>(numericDictionary, numericDictionaryIterator);
-        result = _.keyBy<SampleObject>(numericDictionary, numericDictionaryIterator, any);
         result = _.keyBy<SampleObject>(numericDictionary, 'a');
-        result = _.keyBy<SampleObject>(numericDictionary, 'a', any);
         result = _.keyBy<{a: number}, SampleObject>(numericDictionary, {a: 42});
         result = _.keyBy<SampleObject>(numericDictionary, {a: 42});
 
         result = _.keyBy<SampleObject>(dictionary);
         result = _.keyBy<SampleObject>(dictionary, dictionaryIterator);
-        result = _.keyBy<SampleObject>(dictionary, dictionaryIterator, any);
         result = _.keyBy<SampleObject>(dictionary, 'a');
-        result = _.keyBy<SampleObject>(dictionary, 'a', any);
         result = _.keyBy<{a: number}, SampleObject>(dictionary, {a: 42});
         result = _.keyBy<SampleObject>(dictionary, {a: 42});
     }
@@ -4523,7 +4287,6 @@ namespace TestKeyBy {
 
         result = _('abcd').keyBy();
         result = _('abcd').keyBy(stringIterator);
-        result = _('abcd').keyBy(stringIterator, any);
     }
 
     {
@@ -4531,32 +4294,24 @@ namespace TestKeyBy {
 
         result = _(array).keyBy();
         result = _(array).keyBy(listIterator);
-        result = _(array).keyBy(listIterator, any);
         result = _(array).keyBy('a');
-        result = _(array).keyBy('a', any);
         result = _(array).keyBy<{a: number}>({a: 42});
 
         result = _(list).keyBy<SampleObject>();
         result = _(list).keyBy<SampleObject>(listIterator);
-        result = _(list).keyBy<SampleObject>(listIterator, any);
         result = _(list).keyBy<SampleObject>('a');
-        result = _(list).keyBy<SampleObject>('a', any);
         result = _(list).keyBy<{a: number}, SampleObject>({a: 42});
         result = _(list).keyBy<SampleObject>({a: 42});
 
         result = _(numericDictionary).keyBy<SampleObject>();
         result = _(numericDictionary).keyBy<SampleObject>(numericDictionaryIterator);
-        result = _(numericDictionary).keyBy<SampleObject>(numericDictionaryIterator, any);
         result = _(numericDictionary).keyBy<SampleObject>('a');
-        result = _(numericDictionary).keyBy<SampleObject>('a', any);
         result = _(numericDictionary).keyBy<{a: number}, SampleObject>({a: 42});
         result = _(numericDictionary).keyBy<SampleObject>({a: 42});
 
         result = _(dictionary).keyBy<SampleObject>();
         result = _(dictionary).keyBy<SampleObject>(dictionaryIterator);
-        result = _(dictionary).keyBy<SampleObject>(dictionaryIterator, any);
         result = _(dictionary).keyBy<SampleObject>('a');
-        result = _(dictionary).keyBy<SampleObject>('a', any);
         result = _(dictionary).keyBy<{a: number}, SampleObject>({a: 42});
         result = _(dictionary).keyBy<SampleObject>({a: 42});
     }
@@ -4566,7 +4321,6 @@ namespace TestKeyBy {
 
         result = _('abcd').chain().keyBy();
         result = _('abcd').chain().keyBy(stringIterator);
-        result = _('abcd').chain().keyBy(stringIterator, any);
     }
 
     {
@@ -4574,32 +4328,24 @@ namespace TestKeyBy {
 
         result = _(array).chain().keyBy();
         result = _(array).chain().keyBy(listIterator);
-        result = _(array).chain().keyBy(listIterator, any);
         result = _(array).chain().keyBy('a');
-        result = _(array).chain().keyBy('a', any);
         result = _(array).chain().keyBy<{a: number}>({a: 42});
 
         result = _(list).chain().keyBy<SampleObject>();
         result = _(list).chain().keyBy<SampleObject>(listIterator);
-        result = _(list).chain().keyBy<SampleObject>(listIterator, any);
         result = _(list).chain().keyBy<SampleObject>('a');
-        result = _(list).chain().keyBy<SampleObject>('a', any);
         result = _(list).chain().keyBy<{a: number}, SampleObject>({a: 42});
         result = _(list).chain().keyBy<SampleObject>({a: 42});
 
         result = _(numericDictionary).chain().keyBy<SampleObject>();
         result = _(numericDictionary).chain().keyBy<SampleObject>(numericDictionaryIterator);
-        result = _(numericDictionary).chain().keyBy<SampleObject>(numericDictionaryIterator, any);
         result = _(numericDictionary).chain().keyBy<SampleObject>('a');
-        result = _(numericDictionary).chain().keyBy<SampleObject>('a', any);
         result = _(numericDictionary).chain().keyBy<{a: number}, SampleObject>({a: 42});
         result = _(numericDictionary).chain().keyBy<SampleObject>({a: 42});
 
         result = _(dictionary).chain().keyBy<SampleObject>();
         result = _(dictionary).chain().keyBy<SampleObject>(dictionaryIterator);
-        result = _(dictionary).chain().keyBy<SampleObject>(dictionaryIterator, any);
         result = _(dictionary).chain().keyBy<SampleObject>('a');
-        result = _(dictionary).chain().keyBy<SampleObject>('a', any);
         result = _(dictionary).chain().keyBy<{a: number}, SampleObject>({a: 42});
         result = _(dictionary).chain().keyBy<SampleObject>({a: 42});
     }
@@ -4749,17 +4495,14 @@ namespace TestMap {
 
         result = _.map<number, TResult>(array);
         result = _.map<number, TResult>(array, listIterator);
-        result = _.map<number, TResult>(array, listIterator, any);
         result = _.map<number, TResult>(array, '');
 
         result = _.map<number, TResult>(list);
         result = _.map<number, TResult>(list, listIterator);
-        result = _.map<number, TResult>(list, listIterator, any);
         result = _.map<number, TResult>(list, '');
 
         result = _.map<number, TResult>(dictionary);
         result = _.map<number, TResult>(dictionary, dictionaryIterator);
-        result = _.map<number, TResult>(dictionary, dictionaryIterator, any);
         result = _.map<number, TResult>(dictionary, '');
     }
 
@@ -4776,17 +4519,14 @@ namespace TestMap {
 
         result = _<number>(array).map<TResult>();
         result = _<number>(array).map<TResult>(listIterator);
-        result = _<number>(array).map<TResult>(listIterator, any);
         result = _<number>(array).map<TResult>('');
 
         result = _(list).map<number, TResult>();
         result = _(list).map<number, TResult>(listIterator);
-        result = _(list).map<number, TResult>(listIterator, any);
         result = _(list).map<number, TResult>('');
 
         result = _(dictionary).map<number, TResult>();
         result = _(dictionary).map<number, TResult>(dictionaryIterator);
-        result = _(dictionary).map<number, TResult>(dictionaryIterator, any);
         result = _(dictionary).map<number, TResult>('');
     }
 
@@ -4803,17 +4543,14 @@ namespace TestMap {
 
         result = _<number>(array).chain().map<TResult>();
         result = _<number>(array).chain().map<TResult>(listIterator);
-        result = _<number>(array).chain().map<TResult>(listIterator, any);
         result = _<number>(array).chain().map<TResult>('');
 
         result = _(list).chain().map<number, TResult>();
         result = _(list).chain().map<number, TResult>(listIterator);
-        result = _(list).chain().map<number, TResult>(listIterator, any);
         result = _(list).chain().map<number, TResult>('');
 
         result = _(dictionary).chain().map<number, TResult>();
         result = _(dictionary).chain().map<number, TResult>(dictionaryIterator);
-        result = _(dictionary).chain().map<number, TResult>(dictionaryIterator, any);
         result = _(dictionary).chain().map<number, TResult>('');
     }
 
@@ -4939,7 +4676,7 @@ result = <number>_([1, 2, 3]).reduce<number>(function (sum: number, num: number)
 result = <ABC>_({ 'a': 1, 'b': 2, 'c': 3 }).reduce<number, ABC>(function (r: ABC, num: number, key: string) {
     r[key] = num * 3;
     return r;
-}, {});
+}, <ABC> {});
 
 result = <number[]>_.reduceRight([[0, 1], [2, 3], [4, 5]], function (a: number[], b: number[]) { return a.concat(b); }, <number[]>[]);
 
@@ -4957,28 +4694,21 @@ namespace TestReject {
         let result: string[];
 
         result = _.reject('', stringIterator);
-        result = _.reject('', stringIterator, any);
     }
 
     {
         let result: TResult[];
 
         result = _.reject<TResult>(array, listIterator);
-        result = _.reject<TResult>(array, listIterator, any);
         result = _.reject<TResult>(array, '');
-        result = _.reject<TResult>(array, '', any);
         result = _.reject<{a: number}, TResult>(array, {a: 42});
 
         result = _.reject<TResult>(list, listIterator);
-        result = _.reject<TResult>(list, listIterator, any);
         result = _.reject<TResult>(list, '');
-        result = _.reject<TResult>(list, '', any);
         result = _.reject<{a: number}, TResult>(list, {a: 42});
 
         result = _.reject<TResult>(dictionary, dictionaryIterator);
-        result = _.reject<TResult>(dictionary, dictionaryIterator, any);
         result = _.reject<TResult>(dictionary, '');
-        result = _.reject<TResult>(dictionary, '', any);
         result = _.reject<{a: number}, TResult>(dictionary, {a: 42});
     }
 
@@ -4986,28 +4716,21 @@ namespace TestReject {
         let result: _.LoDashImplicitArrayWrapper<string>;
 
         result = _('').reject(stringIterator);
-        result = _('').reject(stringIterator, any);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<TResult>;
 
         result = _(array).reject(listIterator);
-        result = _(array).reject(listIterator, any);
         result = _(array).reject('');
-        result = _(array).reject('', any);
         result = _(array).reject<{a: number}>({a: 42});
 
         result = _(list).reject<TResult>(listIterator);
-        result = _(list).reject<TResult>(listIterator, any);
         result = _(list).reject<TResult>('');
-        result = _(list).reject<TResult>('', any);
         result = _(list).reject<{a: number}, TResult>({a: 42});
 
         result = _(dictionary).reject<TResult>(dictionaryIterator);
-        result = _(dictionary).reject<TResult>(dictionaryIterator, any);
         result = _(dictionary).reject<TResult>('');
-        result = _(dictionary).reject<TResult>('', any);
         result = _(dictionary).reject<{a: number}, TResult>({a: 42});
     }
 
@@ -5015,28 +4738,21 @@ namespace TestReject {
         let result: _.LoDashExplicitArrayWrapper<string>;
 
         result = _('').chain().reject(stringIterator);
-        result = _('').chain().reject(stringIterator, any);
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<TResult>;
 
         result = _(array).chain().reject(listIterator);
-        result = _(array).chain().reject(listIterator, any);
         result = _(array).chain().reject('');
-        result = _(array).chain().reject('', any);
         result = _(array).chain().reject<{a: number}>({a: 42});
 
         result = _(list).chain().reject<TResult>(listIterator);
-        result = _(list).chain().reject<TResult>(listIterator, any);
         result = _(list).chain().reject<TResult>('');
-        result = _(list).chain().reject<TResult>('', any);
         result = _(list).chain().reject<{a: number}, TResult>({a: 42});
 
         result = _(dictionary).chain().reject<TResult>(dictionaryIterator);
-        result = _(dictionary).chain().reject<TResult>(dictionaryIterator, any);
         result = _(dictionary).chain().reject<TResult>('');
-        result = _(dictionary).chain().reject<TResult>('', any);
         result = _(dictionary).chain().reject<{a: number}, TResult>({a: 42});
     }
 }
@@ -8970,7 +8686,6 @@ namespace TestExtend {
 
         result = _.extend<Obj, S1, Obj & S1>(obj, s1);
         result = _.extend<Obj, S1, Obj & S1>(obj, s1, customizer);
-        result = _.extend<Obj, S1, Obj & S1>(obj, s1, customizer, any);
     }
 
     {
@@ -8978,7 +8693,6 @@ namespace TestExtend {
 
         result = _.extend<Obj, S1, S2, Obj & S1 & S2>(obj, s1, s2);
         result = _.extend<Obj, S1, S2, Obj & S1 & S2>(obj, s1, s2, customizer);
-        result = _.extend<Obj, S1, S2, Obj & S1 & S2>(obj, s1, s2, customizer, any);
     }
 
     {
@@ -8986,7 +8700,6 @@ namespace TestExtend {
 
         result = _.extend<Obj, S1, S2, S3, Obj & S1 & S2 & S3>(obj, s1, s2, s3);
         result = _.extend<Obj, S1, S2, S3, Obj & S1 & S2 & S3>(obj, s1, s2, s3, customizer);
-        result = _.extend<Obj, S1, S2, S3, Obj & S1 & S2 & S3>(obj, s1, s2, s3, customizer, any);
     }
 
     {
@@ -8994,7 +8707,6 @@ namespace TestExtend {
 
         result = _.extend<Obj, S1, S2, S3, S4, Obj & S1 & S2 & S3 & S4>(obj, s1, s2, s3, s4);
         result = _.extend<Obj, S1, S2, S3, S4, Obj & S1 & S2 & S3 & S4>(obj, s1, s2, s3, s4, customizer);
-        result = _.extend<Obj, S1, S2, S3, S4, Obj & S1 & S2 & S3 & S4>(obj, s1, s2, s3, s4, customizer, any);
     }
 
     {
@@ -9002,7 +8714,6 @@ namespace TestExtend {
 
         result = _.extend<Obj, Obj & S1 & S2 & S3 & S4 & S5>(obj, s1, s2, s3, s4, s5);
         result = _.extend<Obj, Obj & S1 & S2 & S3 & S4 & S5>(obj, s1, s2, s3, s4, s5, customizer);
-        result = _.extend<Obj, Obj & S1 & S2 & S3 & S4 & S5>(obj, s1, s2, s3, s4, s5, customizer, any);
     }
 
     {
@@ -9016,7 +8727,6 @@ namespace TestExtend {
 
         result = _(obj).extend<S1, Obj & S1>(s1);
         result = _(obj).extend<S1, Obj & S1>(s1, customizer);
-        result = _(obj).extend<S1, Obj & S1>(s1, customizer, any);
     }
 
     {
@@ -9024,7 +8734,6 @@ namespace TestExtend {
 
         result = _(obj).extend<S1, S2, Obj & S1 & S2>(s1, s2);
         result = _(obj).extend<S1, S2, Obj & S1 & S2>(s1, s2, customizer);
-        result = _(obj).extend<S1, S2, Obj & S1 & S2>(s1, s2, customizer, any);
     }
 
     {
@@ -9032,7 +8741,6 @@ namespace TestExtend {
 
         result = _(obj).extend<S1, S2, S3, Obj & S1 & S2 & S3>(s1, s2, s3);
         result = _(obj).extend<S1, S2, S3, Obj & S1 & S2 & S3>(s1, s2, s3, customizer);
-        result = _(obj).extend<S1, S2, S3, Obj & S1 & S2 & S3>(s1, s2, s3, customizer, any);
     }
 
     {
@@ -9040,7 +8748,6 @@ namespace TestExtend {
 
         result = _(obj).extend<S1, S2, S3, S4, Obj & S1 & S2 & S3 & S4>(s1, s2, s3, s4);
         result = _(obj).extend<S1, S2, S3, S4, Obj & S1 & S2 & S3 & S4>(s1, s2, s3, s4, customizer);
-        result = _(obj).extend<S1, S2, S3, S4, Obj & S1 & S2 & S3 & S4>(s1, s2, s3, s4, customizer, any);
     }
 
     {
@@ -9048,7 +8755,6 @@ namespace TestExtend {
 
         result = _(obj).extend<Obj & S1 & S2 & S3 & S4 & S5>(s1, s2, s3, s4, s5);
         result = _(obj).extend<Obj & S1 & S2 & S3 & S4 & S5>(s1, s2, s3, s4, s5, customizer);
-        result = _(obj).extend<Obj & S1 & S2 & S3 & S4 & S5>(s1, s2, s3, s4, s5, customizer, any);
     }
 
     {
@@ -9062,7 +8768,6 @@ namespace TestExtend {
 
         result = _(obj).chain().extend<S1, Obj & S1>(s1);
         result = _(obj).chain().extend<S1, Obj & S1>(s1, customizer);
-        result = _(obj).chain().extend<S1, Obj & S1>(s1, customizer, any);
     }
 
     {
@@ -9070,7 +8775,6 @@ namespace TestExtend {
 
         result = _(obj).chain().extend<S1, S2, Obj & S1 & S2>(s1, s2);
         result = _(obj).chain().extend<S1, S2, Obj & S1 & S2>(s1, s2, customizer);
-        result = _(obj).chain().extend<S1, S2, Obj & S1 & S2>(s1, s2, customizer, any);
     }
 
     {
@@ -9078,7 +8782,6 @@ namespace TestExtend {
 
         result = _(obj).chain().extend<S1, S2, S3, Obj & S1 & S2 & S3>(s1, s2, s3);
         result = _(obj).chain().extend<S1, S2, S3, Obj & S1 & S2 & S3>(s1, s2, s3, customizer);
-        result = _(obj).chain().extend<S1, S2, S3, Obj & S1 & S2 & S3>(s1, s2, s3, customizer, any);
     }
 
     {
@@ -9086,7 +8789,6 @@ namespace TestExtend {
 
         result = _(obj).chain().extend<S1, S2, S3, S4, Obj & S1 & S2 & S3 & S4>(s1, s2, s3, s4);
         result = _(obj).chain().extend<S1, S2, S3, S4, Obj & S1 & S2 & S3 & S4>(s1, s2, s3, s4, customizer);
-        result = _(obj).chain().extend<S1, S2, S3, S4, Obj & S1 & S2 & S3 & S4>(s1, s2, s3, s4, customizer, any);
     }
 
     {
@@ -9094,7 +8796,6 @@ namespace TestExtend {
 
         result = _(obj).chain().extend<Obj & S1 & S2 & S3 & S4 & S5>(s1, s2, s3, s4, s5);
         result = _(obj).chain().extend<Obj & S1 & S2 & S3 & S4 & S5>(s1, s2, s3, s4, s5, customizer);
-        result = _(obj).chain().extend<Obj & S1 & S2 & S3 & S4 & S5>(s1, s2, s3, s4, s5, customizer, any);
     }
 }
 
@@ -9107,22 +8808,18 @@ namespace TestFindKey {
         result = _.findKey<{a: string;}>({a: ''});
 
         result = _.findKey<{a: string;}>({a: ''}, predicateFn);
-        result = _.findKey<{a: string;}>({a: ''}, predicateFn, any);
 
 
         result = _.findKey<{a: string;}>({a: ''}, '');
-        result = _.findKey<{a: string;}>({a: ''}, '', any);
 
         result = _.findKey<{a: number;}, {a: string;}>({a: ''}, {a: 42});
 
         result = _<{a: string;}>({a: ''}).findKey();
 
         result = _<{a: string;}>({a: ''}).findKey(predicateFn);
-        result = _<{a: string;}>({a: ''}).findKey(predicateFn, any);
 
 
         result = _<{a: string;}>({a: ''}).findKey('');
-        result = _<{a: string;}>({a: ''}).findKey('', any);
 
         result = _<{a: string;}>({a: ''}).findKey<{a: number;}>({a: 42});
     }
@@ -9132,10 +8829,8 @@ namespace TestFindKey {
         let result: string;
 
         result = _.findKey<string, {a: string;}>({a: ''}, predicateFn);
-        result = _.findKey<string, {a: string;}>({a: ''}, predicateFn, any);
 
         result = _<{a: string;}>({a: ''}).findKey<string>(predicateFn);
-        result = _<{a: string;}>({a: ''}).findKey<string>(predicateFn, any);
     }
 
     {
@@ -9145,11 +8840,9 @@ namespace TestFindKey {
         result = _<{a: string;}>({a: ''}).chain().findKey();
 
         result = _<{a: string;}>({a: ''}).chain().findKey(predicateFn);
-        result = _<{a: string;}>({a: ''}).chain().findKey(predicateFn, any);
 
 
         result = _<{a: string;}>({a: ''}).chain().findKey('');
-        result = _<{a: string;}>({a: ''}).chain().findKey('', any);
 
         result = _<{a: string;}>({a: ''}).chain().findKey<{a: number;}>({a: 42});
     }
@@ -9159,7 +8852,6 @@ namespace TestFindKey {
         let result: _.LoDashExplicitWrapper<string>;
 
         result = _<{a: string;}>({a: ''}).chain().findKey<string>(predicateFn);
-        result = _<{a: string;}>({a: ''}).chain().findKey<string>(predicateFn, any);
     }
 }
 
@@ -9172,22 +8864,18 @@ namespace TestFindLastKey {
         result = _.findLastKey<{a: string;}>({a: ''});
 
         result = _.findLastKey<{a: string;}>({a: ''}, predicateFn);
-        result = _.findLastKey<{a: string;}>({a: ''}, predicateFn, any);
 
 
         result = _.findLastKey<{a: string;}>({a: ''}, '');
-        result = _.findLastKey<{a: string;}>({a: ''}, '', any);
 
         result = _.findLastKey<{a: number;}, {a: string;}>({a: ''}, {a: 42});
 
         result = _<{a: string;}>({a: ''}).findLastKey();
 
         result = _<{a: string;}>({a: ''}).findLastKey(predicateFn);
-        result = _<{a: string;}>({a: ''}).findLastKey(predicateFn, any);
 
 
         result = _<{a: string;}>({a: ''}).findLastKey('');
-        result = _<{a: string;}>({a: ''}).findLastKey('', any);
 
         result = _<{a: string;}>({a: ''}).findLastKey<{a: number;}>({a: 42});
     }
@@ -9197,10 +8885,8 @@ namespace TestFindLastKey {
         let result: string;
 
         result = _.findLastKey<string, {a: string;}>({a: ''}, predicateFn);
-        result = _.findLastKey<string, {a: string;}>({a: ''}, predicateFn, any);
 
         result = _<{a: string;}>({a: ''}).findLastKey<string>(predicateFn);
-        result = _<{a: string;}>({a: ''}).findLastKey<string>(predicateFn, any);
     }
 
     {
@@ -9210,11 +8896,9 @@ namespace TestFindLastKey {
         result = _<{a: string;}>({a: ''}).chain().findLastKey();
 
         result = _<{a: string;}>({a: ''}).chain().findLastKey(predicateFn);
-        result = _<{a: string;}>({a: ''}).chain().findLastKey(predicateFn, any);
 
 
         result = _<{a: string;}>({a: ''}).chain().findLastKey('');
-        result = _<{a: string;}>({a: ''}).chain().findLastKey('', any);
 
         result = _<{a: string;}>({a: ''}).chain().findLastKey<{a: number;}>({a: 42});
     }
@@ -9224,7 +8908,6 @@ namespace TestFindLastKey {
         let result: _.LoDashExplicitWrapper<string>;
 
         result = _<{a: string;}>({a: ''}).chain().findLastKey<string>(predicateFn);
-        result = _<{a: string;}>({a: ''}).chain().findLastKey<string>(predicateFn, any);
     }
 }
 
@@ -9243,7 +8926,6 @@ namespace TestForIn {
 
         result = _.forIn<number>(dictionary);
         result = _.forIn<number>(dictionary, dictionaryIterator);
-        result = _.forIn<number>(dictionary, dictionaryIterator, any);
     }
 
     {
@@ -9251,7 +8933,6 @@ namespace TestForIn {
 
         result = _.forIn<SampleObject>(object);
         result = _.forIn<SampleObject>(object, objectIterator);
-        result = _.forIn<SampleObject>(object, objectIterator, any);
     }
 
     {
@@ -9259,7 +8940,6 @@ namespace TestForIn {
 
         result = _(dictionary).forIn<number>();
         result = _(dictionary).forIn<number>(dictionaryIterator);
-        result = _(dictionary).forIn<number>(dictionaryIterator, any);
     }
 
     {
@@ -9267,7 +8947,6 @@ namespace TestForIn {
 
         result = _(dictionary).chain().forIn<number>();
         result = _(dictionary).chain().forIn<number>(dictionaryIterator);
-        result = _(dictionary).chain().forIn<number>(dictionaryIterator, any);
     }
 }
 
@@ -9286,7 +8965,6 @@ namespace TestForInRight {
 
         result = _.forInRight<number>(dictionary);
         result = _.forInRight<number>(dictionary, dictionaryIterator);
-        result = _.forInRight<number>(dictionary, dictionaryIterator, any);
     }
 
     {
@@ -9294,7 +8972,6 @@ namespace TestForInRight {
 
         result = _.forInRight<SampleObject>(object);
         result = _.forInRight<SampleObject>(object, objectIterator);
-        result = _.forInRight<SampleObject>(object, objectIterator, any);
     }
 
     {
@@ -9302,7 +8979,6 @@ namespace TestForInRight {
 
         result = _(dictionary).forInRight<number>();
         result = _(dictionary).forInRight<number>(dictionaryIterator);
-        result = _(dictionary).forInRight<number>(dictionaryIterator, any);
     }
 
     {
@@ -9310,7 +8986,6 @@ namespace TestForInRight {
 
         result = _(dictionary).chain().forInRight<number>();
         result = _(dictionary).chain().forInRight<number>(dictionaryIterator);
-        result = _(dictionary).chain().forInRight<number>(dictionaryIterator, any);
     }
 }
 
@@ -9329,7 +9004,6 @@ namespace TestForOwn {
 
         result = _.forOwn<number>(dictionary);
         result = _.forOwn<number>(dictionary, dictionaryIterator);
-        result = _.forOwn<number>(dictionary, dictionaryIterator, any);
     }
 
     {
@@ -9337,7 +9011,6 @@ namespace TestForOwn {
 
         result = _.forOwn<SampleObject>(object);
         result = _.forOwn<SampleObject>(object, objectIterator);
-        result = _.forOwn<SampleObject>(object, objectIterator, any);
     }
 
     {
@@ -9345,7 +9018,6 @@ namespace TestForOwn {
 
         result = _(dictionary).forOwn<number>();
         result = _(dictionary).forOwn<number>(dictionaryIterator);
-        result = _(dictionary).forOwn<number>(dictionaryIterator, any);
     }
 
     {
@@ -9353,7 +9025,6 @@ namespace TestForOwn {
 
         result = _(dictionary).chain().forOwn<number>();
         result = _(dictionary).chain().forOwn<number>(dictionaryIterator);
-        result = _(dictionary).chain().forOwn<number>(dictionaryIterator, any);
     }
 }
 
@@ -9372,7 +9043,6 @@ namespace TestForOwnRight {
 
         result = _.forOwnRight<number>(dictionary);
         result = _.forOwnRight<number>(dictionary, dictionaryIterator);
-        result = _.forOwnRight<number>(dictionary, dictionaryIterator, any);
     }
 
     {
@@ -9380,7 +9050,6 @@ namespace TestForOwnRight {
 
         result = _.forOwnRight<SampleObject>(object);
         result = _.forOwnRight<SampleObject>(object, objectIterator);
-        result = _.forOwnRight<SampleObject>(object, objectIterator, any);
     }
 
     {
@@ -9388,7 +9057,6 @@ namespace TestForOwnRight {
 
         result = _(dictionary).forOwnRight<number>();
         result = _(dictionary).forOwnRight<number>(dictionaryIterator);
-        result = _(dictionary).forOwnRight<number>(dictionaryIterator, any);
     }
 
     {
@@ -9396,7 +9064,6 @@ namespace TestForOwnRight {
 
         result = _(dictionary).chain().forOwnRight<number>();
         result = _(dictionary).chain().forOwnRight<number>(dictionaryIterator);
-        result = _(dictionary).chain().forOwnRight<number>(dictionaryIterator, any);
     }
 }
 
@@ -9779,23 +9446,17 @@ namespace TestMapKeys {
 
         result = _.mapKeys<TResult, string>(array);
         result = _.mapKeys<TResult, string>(array, listIterator);
-        result = _.mapKeys<TResult, string>(array, listIterator, any);
         result = _.mapKeys<TResult>(array, '');
-        result = _.mapKeys<TResult>(array, '', any);
         result = _.mapKeys<TResult, {}>(array, {});
 
         result = _.mapKeys<TResult, string>(list);
         result = _.mapKeys<TResult, string>(list, listIterator);
-        result = _.mapKeys<TResult, string>(list, listIterator, any);
         result = _.mapKeys<TResult>(list, '');
-        result = _.mapKeys<TResult>(list, '', any);
         result = _.mapKeys<TResult, {}>(list, {});
 
         result = _.mapKeys<TResult, string>(dictionary);
         result = _.mapKeys<TResult, string>(dictionary, dictionaryIterator);
-        result = _.mapKeys<TResult, string>(dictionary, dictionaryIterator, any);
         result = _.mapKeys<TResult>(dictionary, '');
-        result = _.mapKeys<TResult>(dictionary, '', any);
         result = _.mapKeys<TResult, {}>(dictionary, {});
     }
 
@@ -9804,23 +9465,17 @@ namespace TestMapKeys {
 
         result = _(array).mapKeys<string>();
         result = _(array).mapKeys<string>(listIterator);
-        result = _(array).mapKeys<string>(listIterator, any);
         result = _(array).mapKeys('');
-        result = _(array).mapKeys('', any);
         result = _(array).mapKeys<{}>({});
 
         result = _(list).mapKeys<TResult, string>();
         result = _(list).mapKeys<TResult, string>(listIterator);
-        result = _(list).mapKeys<TResult, string>(listIterator, any);
         result = _(list).mapKeys<TResult>('');
-        result = _(list).mapKeys<TResult>('', any);
         result = _(list).mapKeys<TResult, {}>({});
 
         result = _(dictionary).mapKeys<TResult, string>();
         result = _(dictionary).mapKeys<TResult, string>(dictionaryIterator);
-        result = _(dictionary).mapKeys<TResult, string>(dictionaryIterator, any);
         result = _(dictionary).mapKeys<TResult>('');
-        result = _(dictionary).mapKeys<TResult>('', any);
         result = _(dictionary).mapKeys<TResult, {}>({});
     }
 
@@ -9829,23 +9484,17 @@ namespace TestMapKeys {
 
         result = _(array).chain().mapKeys<string>();
         result = _(array).chain().mapKeys<string>(listIterator);
-        result = _(array).chain().mapKeys<string>(listIterator, any);
         result = _(array).chain().mapKeys('');
-        result = _(array).chain().mapKeys('', any);
         result = _(array).chain().mapKeys<{}>({});
 
         result = _(list).chain().mapKeys<TResult, string>();
         result = _(list).chain().mapKeys<TResult, string>(listIterator);
-        result = _(list).chain().mapKeys<TResult, string>(listIterator, any);
         result = _(list).chain().mapKeys<TResult>('');
-        result = _(list).chain().mapKeys<TResult>('', any);
         result = _(list).chain().mapKeys<TResult, {}>({});
 
         result = _(dictionary).chain().mapKeys<TResult, string>();
         result = _(dictionary).chain().mapKeys<TResult, string>(dictionaryIterator);
-        result = _(dictionary).chain().mapKeys<TResult, string>(dictionaryIterator, any);
         result = _(dictionary).chain().mapKeys<TResult>('');
-        result = _(dictionary).chain().mapKeys<TResult>('', any);
         result = _(dictionary).chain().mapKeys<TResult, {}>({});
     }
 }
@@ -10388,12 +10037,10 @@ namespace TestTransform {
         result = _.transform<number, TResult>(array);
         result = _.transform<number, TResult>(array, iterator);
         result = _.transform<number, TResult>(array, iterator, accumulator);
-        result = _.transform<number, TResult>(array, iterator, accumulator, any);
 
         result = _<number>(array).transform<TResult>().value();
         result = _<number>(array).transform<TResult>(iterator).value();
         result = _<number>(array).transform<TResult>(iterator, accumulator).value();
-        result = _<number>(array).transform<TResult>(iterator, accumulator, any).value();
     }
 
     {
@@ -10403,11 +10050,9 @@ namespace TestTransform {
 
         result = _.transform<number, TResult>(array, iterator);
         result = _.transform<number, TResult>(array, iterator, accumulator);
-        result = _.transform<number, TResult>(array, iterator, accumulator, any);
 
         result = _<number>(array).transform<TResult>(iterator).value();
         result = _<number>(array).transform<TResult>(iterator, accumulator).value();
-        result = _<number>(array).transform<TResult>(iterator, accumulator, any).value();
     }
 
     {
@@ -10418,12 +10063,10 @@ namespace TestTransform {
         result = _.transform<number, TResult>(dictionary);
         result = _.transform<number, TResult>(dictionary, iterator);
         result = _.transform<number, TResult>(dictionary, iterator, accumulator);
-        result = _.transform<number, TResult>(dictionary, iterator, accumulator, any);
 
         result = _(dictionary).transform<number, TResult>().value();
         result = _(dictionary).transform<number, TResult>(iterator).value();
         result = _(dictionary).transform<number, TResult>(iterator, accumulator).value();
-        result = _(dictionary).transform<number, TResult>(iterator, accumulator, any).value();
     }
 
     {
@@ -10433,11 +10076,9 @@ namespace TestTransform {
 
         result = _.transform<number, TResult>(dictionary, iterator);
         result = _.transform<number, TResult>(dictionary, iterator, accumulator);
-        result = _.transform<number, TResult>(dictionary, iterator, accumulator, any);
 
         result = _(dictionary).transform<number, TResult>(iterator).value();
         result = _(dictionary).transform<number, TResult>(iterator, accumulator).value();
-        result = _(dictionary).transform<number, TResult>(iterator, accumulator, any).value();
     }
 }
 
@@ -11207,77 +10848,77 @@ namespace TestAttempt {
 namespace TestConstant {
     {
         let result: () => number;
-        result: _.constant<number>(42);
+        result = _.constant<number>(42);
     }
 
     {
         let result: () => string;
-        result: _.constant<string>('a');
+        result = _.constant<string>('a');
     }
 
     {
         let result: () => boolean;
-        result: _.constant<boolean>(true);
+        result = _.constant<boolean>(true);
     }
 
     {
         let result: () => string[];
-        result: _.constant<string[]>(['a']);
+        result = _.constant<string[]>(['a']);
     }
 
     {
         let result: () => {a: string};
-        result: _.constant<{a: string}>({a: 'a'});
+        result = _.constant<{a: string}>({a: 'a'});
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<() => number>;
-        result: _(42).constant<number>();
+        result = _(42).constant<number>();
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<() => string>;
-        result: _('a').constant<string>();
+        result = _('a').constant<string>();
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<() => boolean>;
-        result: _(true).constant<boolean>();
+        result = _(true).constant<boolean>();
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<() => string[]>;
-        result: _(['a']).constant<string[]>();
+        result = _(['a']).constant<string[]>();
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<() => {a: string}>;
-        result: _({a: 'a'}).constant<{a: string}>();
+        result = _({a: 'a'}).constant<{a: string}>();
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<() => number>;
-        result: _(42).chain().constant<number>();
+        result = _(42).chain().constant<number>();
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<() => string>;
-        result: _('a').chain().constant<string>();
+        result = _('a').chain().constant<string>();
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<() => boolean>;
-        result: _(true).chain().constant<boolean>();
+        result = _(true).chain().constant<boolean>();
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<() => string[]>;
-        result: _(['a']).chain().constant<string[]>();
+        result = _(['a']).chain().constant<string[]>();
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<() => {a: string}>;
-        result: _({a: 'a'}).chain().constant<{a: string}>();
+        result = _({a: 'a'}).chain().constant<{a: string}>();
     }
 }
 
@@ -11329,63 +10970,54 @@ namespace TestIteratee {
         let result: (...args: any[]) => TResult;
 
         result = _.iteratee<TResult>(Function);
-        result = _.iteratee<TResult>(Function, any);
     }
 
     {
         let result: (object: any) => TResult;
 
         result = _.iteratee<TResult>('');
-        result = _.iteratee<TResult>('', any);
     }
 
     {
         let result: (object: any) => boolean;
 
         result = _.iteratee({});
-        result = _.iteratee({}, any);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<(...args: any[]) => TResult>;
 
         result = _(Function).iteratee<TResult>();
-        result = _(Function).iteratee<TResult>(any);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<(object: any) => TResult>;
 
         result = _('').iteratee<TResult>();
-        result = _('').iteratee<TResult>(any);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<(object: any) => boolean>;
 
         result = _({}).iteratee();
-        result = _({}).iteratee(any);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<(...args: any[]) => TResult>;
 
         result = _(Function).chain().iteratee<TResult>();
-        result = _(Function).chain().iteratee<TResult>(any);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<(object: any) => TResult>;
 
         result = _('').chain().iteratee<TResult>();
-        result = _('').chain().iteratee<TResult>(any);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<(object: any) => boolean>;
 
         result = _({}).chain().iteratee();
-        result = _({}).chain().iteratee(any);
     }
 }
 
@@ -11462,7 +11094,6 @@ namespace TestMethod {
         let result: (object: any) => {a: string};
 
         result = _.method<{a: string}>('a.0');
-        result = _.method<{a: string}>('a.0', any);
         result = _.method<{a: string}>('a.0', any, any);
         result = _.method<{a: string}>('a.0', any, any, any);
 
@@ -11476,7 +11107,6 @@ namespace TestMethod {
         let result: (object: {a: string}) => {b: string};
 
         result = _.method<{a: string}, {b: string}>('a.0');
-        result = _.method<{a: string}, {b: string}>('a.0', any);
         result = _.method<{a: string}, {b: string}>('a.0', any, any);
         result = _.method<{a: string}, {b: string}>('a.0', any, any, any);
 
diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts
deleted file mode 100644
index bd996b9638..0000000000
--- a/lodash/lodash.d.ts
+++ /dev/null
@@ -1,19265 +0,0 @@
-// Type definitions for Lo-Dash
-// Project: http://lodash.com/
-// Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/**
-### 4.0.0 Changelog (https://github.com/lodash/lodash/wiki/Changelog)
-
-#### TODO:
-removed:
-- [x] Removed _.support
-- [x] Removed _.findWhere in favor of _.find with iteratee shorthand
-- [x] Removed _.where in favor of _.filter with iteratee shorthand
-- [x] Removed _.pluck in favor of _.map with iteratee shorthand
-
-renamed:
-- [x] Renamed _.first to _.head
-- [x] Renamed _.indexBy to _.keyBy
-- [x] Renamed _.invoke to _.invokeMap
-- [x] Renamed _.overArgs to _.overArgs
-- [x] Renamed _.padLeft & _.padRight to _.padStart & _.padEnd
-- [x] Renamed _.pairs to _.toPairs
-- [x] Renamed _.rest to _.tail
-- [x] Renamed _.restParam to _.rest
-- [x] Renamed _.sortByOrder to _.orderBy
-- [x] Renamed _.trimLeft & _.trimRight to _.trimStart & _.trimEnd
-- [x] Renamed _.trunc to _.truncate
-
-split:
-- [x] Split _.indexOf & _.lastIndexOf into _.sortedIndexOf & _.sortedLastIndexOf
-- [x] Split _.max & _.min into _.maxBy & _.minBy
-- [x] Split _.omit & _.pick into _.omitBy & _.pickBy
-- [x] Split _.sample into _.sampleSize
-- [x] Split _.sortedIndex into _.sortedIndexBy
-- [x] Split _.sortedLastIndex into _.sortedLastIndexBy
-- [x] Split _.uniq into _.sortedUniq, _.sortedUniqBy, & _.uniqBy
-
-changes:
-- [x] Absorbed _.sortByAll into _.sortBy
-- [x] Changed the category of _.at to “Object”
-- [x] Changed the category of _.bindAll to “Utility”
-- [x] Made _.capitalize uppercase the first character & lowercase the rest
-- [x] Made _.functions return only own method names
-
-
-added 23 array methods:
-- [x] _.concat
-- [x] _.differenceBy
-- [x] _.differenceWith
-- [x] _.flatMap
-- [x] _.fromPairs
-- [x] _.intersectionBy
-- [x] _.intersectionWith
-- [x] _.join
-- [x] _.pullAll
-- [x] _.pullAllBy
-- [x] _.reverse
-- [x] _.sortedIndexBy
-- [x] _.sortedIndexOf
-- [x] _.sortedLastIndexBy
-- [x] _.sortedLastIndexOf
-- [x] _.sortedUniq
-- [x] _.sortedUniqBy
-- [x] _.unionBy
-- [x] _.unionWith
-- [x] _.uniqBy
-- [x] _.uniqWith
-- [x] _.xorBy
-- [x] _.xorWith
-
-added 18 lang methods:
-- [x] _.cloneDeepWith
-- [x] _.cloneWith
-- [x] _.eq
-- [x] _.isArrayLike
-- [x] _.isArrayLikeObject
-- [x] _.isEqualWith
-- [x] _.isInteger
-- [x] _.isLength
-- [x] _.isMatchWith
-- [x] _.isNil
-- [x] _.isObjectLike
-- [x] _.isSafeInteger
-- [x] _.isSymbol
-- [x] _.toInteger
-- [x] _.toLength
-- [x] _.toNumber
-- [x] _.toSafeInteger
-- [x] _.toString
-
-added 13 object methods:
-- [x] _.assignIn
-- [x] _.assignInWith
-- [x] _.assignWith
-- [x] _.functionsIn
-- [x] _.hasIn
-- [x] _.mergeWith
-- [x] _.omitBy
-- [x] _.pickBy
-
-
-added 8 string methods:
-- [x] _.lowerCase
-- [x] _.lowerFirst
-- [x] _.upperCase
-- [x] _.upperFirst
-- [x] _.toLower
-- [x] _.toUpper
-
-added 8 utility methods:
-- [x] _.toPath
-
-added 4 math methods:
-- [x] _.maxBy
-- [x] _.mean
-- [x] _.minBy
-- [x] _.sumBy
-
-added 2 function methods:
-- [x] _.flip
-- [x] _.unary
-
-added 2 number methods:
-- [x] _.clamp
-- [x] _.subtract
-
-added collection method:
-- [x] _.sampleSize
-
-Added 3 aliases
-
-- [x] _.first as an alias of _.head
-
-Removed 17 aliases
-- [x] Removed aliase _.all
-- [x] Removed aliase _.any
-- [x] Removed aliase _.backflow
-- [x] Removed aliase _.callback
-- [x] Removed aliase _.collect
-- [x] Removed aliase _.compose
-- [x] Removed aliase _.contains
-- [x] Removed aliase _.detect
-- [x] Removed aliase _.foldl
-- [x] Removed aliase _.foldr
-- [x] Removed aliase _.include
-- [x] Removed aliase _.inject
-- [x] Removed aliase _.methods
-- [x] Removed aliase _.object
-- [x] Removed aliase _.run
-- [x] Removed aliase _.select
-- [x] Removed aliase _.unique
-
-Other changes
-- [x] Added support for array buffers to _.isEqual
-- [x] Added support for converting iterators to _.toArray
-- [x] Added support for deep paths to _.zipObject
-- [x] Changed UMD to export to window or self when available regardless of other exports
-- [x] Ensured debounce cancel clears args & thisArg references
-- [x] Ensured _.add, _.subtract, & _.sum don’t skip NaN values
-- [x] Ensured _.clone treats generators like functions
-- [x] Ensured _.clone produces clones with the source’s [[Prototype]]
-- [x] Ensured _.defaults assigns properties that shadow Object.prototype
-- [x] Ensured _.defaultsDeep doesn’t merge a string into an array
-- [x] Ensured _.defaultsDeep & _.merge don’t modify sources
-- [x] Ensured _.defaultsDeep works with circular references
-- [x] Ensured _.keys skips “length” on strict mode arguments objects in Safari 9
-- [x] Ensured _.merge doesn’t convert strings to arrays
-- [x] Ensured _.merge merges plain-objects onto non plain-objects
-- [x] Ensured _#plant resets iterator data of cloned sequences
-- [x] Ensured _.random swaps min & max if min is greater than max
-- [x] Ensured _.range preserves the sign of start of -0
-- [x] Ensured _.reduce & _.reduceRight use getIteratee in their array branch
-- [x] Fixed rounding issue with the precision param of _.floor
-
-** LATER **
-Misc:
-- [ ] Made _.forEach, _.forIn, _.forOwn, & _.times implicitly end a chain sequence
-- [ ] Removed thisArg params from most methods
-- [ ] Made “By” methods provide a single param to iteratees
-- [ ] Made _.words chainable by default
-- [ ] Removed isDeep params from _.clone & _.flatten
-- [ ] Removed _.bindAll support for binding all methods when no names are provided
-- [ ] Removed func-first param signature from _.before & _.after
-- [ ] _.extend as an alias of _.assignIn
-- [ ] _.extendWith as an alias of _.assignInWith
-- [ ] Added clear method to _.memoize.Cache
-- [ ] Added flush method to debounced & throttled functions
-- [ ] Added support for ES6 maps, sets, & symbols to _.clone, _.isEqual, & _.toArray
-- [ ] Enabled _.flow & _.flowRight to accept an array of functions
-- [ ] Ensured “Collection” methods treat functions as objects
-- [ ] Ensured _.assign, _.defaults, & _.merge coerce object values to objects
-- [ ] Ensured _.bindKey bound functions call object[key] when called with the new operator
-- [ ] Ensured _.isFunction returns true for generator functions
-- [ ] Ensured _.merge assigns typed arrays directly
-- [ ] Made _(...) an iterator & iterable
-- [ ] Made _.drop, _.take, & right forms coerce n of undefined to 0
-
-Methods:
-- [ ] _.concat
-- [ ] _.differenceBy
-- [ ] _.differenceWith
-- [ ] _.flatMap
-- [ ] _.fromPairs
-- [ ] _.intersectionBy
-- [ ] _.intersectionWith
-- [ ] _.join
-- [ ] _.pullAll
-- [ ] _.pullAllBy
-- [ ] _.reverse
-- [ ] _.sortedLastIndexOf
-- [ ] _.unionBy
-- [ ] _.unionWith
-- [ ] _.uniqWith
-- [ ] _.xorBy
-- [ ] _.xorWith
-- [ ] _.toString
-
-- [ ] _.invoke
-- [ ] _.setWith
-- [ ] _.toPairs
-- [ ] _.toPairsIn
-- [ ] _.unset
-
-- [ ] _.replace
-- [ ] _.split
-
-- [ ] _.cond
-- [ ] _.conforms
-- [ ] _.nthArg
-- [ ] _.over
-- [ ] _.overEvery
-- [ ] _.overSome
-- [ ] _.rangeRight
-
-- [ ] _.next
-*/
-
-declare var _: _.LoDashStatic;
-
-declare module _ {
-    interface LoDashStatic {
-        /**
-        * Creates a lodash object which wraps the given value to enable intuitive method chaining.
-        *
-        * In addition to Lo-Dash methods, wrappers also have the following Array methods:
-        * concat, join, pop, push, reverse, shift, slice, sort, splice, and unshift
-        *
-        * Chaining is supported in custom builds as long as the value method is implicitly or
-        * explicitly included in the build.
-        *
-        * The chainable wrapper functions are:
-        * after, assign, bind, bindAll, bindKey, chain, chunk, compact, compose, concat, countBy,
-        * createCallback, curry, debounce, defaults, defer, delay, difference, filter, flatten,
-        * forEach, forEachRight, forIn, forInRight, forOwn, forOwnRight, functions, groupBy,
-        * keyBy, initial, intersection, invert, invoke, keys, map, max, memoize, merge, min,
-        * object, omit, once, pairs, partial, partialRight, pick, pluck, pull, push, range, reject,
-        * remove, rest, reverse, sample, shuffle, slice, sort, sortBy, splice, tap, throttle, times,
-        * toArray, transform, union, uniq, unset, unshift, unzip, values, where, without, wrap, and zip
-        *
-        * The non-chainable wrapper functions are:
-        * clone, cloneDeep, contains, escape, every, find, findIndex, findKey, findLast,
-        * findLastIndex, findLastKey, has, identity, indexOf, isArguments, isArray, isBoolean,
-        * isDate, isElement, isEmpty, isEqual, isFinite, isFunction, isNaN, isNull, isNumber,
-        * isObject, isPlainObject, isRegExp, isString, isUndefined, join, lastIndexOf, mixin,
-        * noConflict, parseInt, pop, random, reduce, reduceRight, result, shift, size, some,
-        * sortedIndex, runInContext, template, unescape, uniqueId, and value
-        *
-        * The wrapper functions first and last return wrapped values when n is provided, otherwise
-        * they return unwrapped values.
-        *
-        * Explicit chaining can be enabled by using the _.chain method.
-        **/
-        (value: number): LoDashImplicitWrapper<number>;
-        (value: string): LoDashImplicitStringWrapper;
-        (value: boolean): LoDashImplicitWrapper<boolean>;
-        (value: Array<number>): LoDashImplicitNumberArrayWrapper;
-        <T>(value: Array<T>): LoDashImplicitArrayWrapper<T>;
-        <T extends {}>(value: T): LoDashImplicitObjectWrapper<T>;
-        (value: any): LoDashImplicitWrapper<any>;
-
-        /**
-        * The semantic version number.
-        **/
-        VERSION: string;
-
-        /**
-        * By default, the template delimiters used by Lo-Dash are similar to those in embedded Ruby
-        * (ERB). Change the following template settings to use alternative delimiters.
-        **/
-        templateSettings: TemplateSettings;
-    }
-
-    /**
-    * By default, the template delimiters used by Lo-Dash are similar to those in embedded Ruby
-    * (ERB). Change the following template settings to use alternative delimiters.
-    **/
-    interface TemplateSettings {
-        /**
-        * The "escape" delimiter.
-        **/
-        escape?: RegExp;
-
-        /**
-        * The "evaluate" delimiter.
-        **/
-        evaluate?: RegExp;
-
-        /**
-        * An object to import into the template as local variables.
-        **/
-        imports?: Dictionary<any>;
-
-        /**
-        * The "interpolate" delimiter.
-        **/
-        interpolate?: RegExp;
-
-        /**
-        * Used to reference the data object in the template text.
-        **/
-        variable?: string;
-    }
-
-    /**
-     * Creates a cache object to store key/value pairs.
-     */
-    interface MapCache {
-        /**
-         * Removes `key` and its value from the cache.
-         * @param key The key of the value to remove.
-         * @return Returns `true` if the entry was removed successfully, else `false`.
-         */
-        delete(key: string): boolean;
-
-        /**
-         * Gets the cached value for `key`.
-         * @param key The key of the value to get.
-         * @return Returns the cached value.
-         */
-        get(key: string): any;
-
-        /**
-         * Checks if a cached value for `key` exists.
-         * @param key The key of the entry to check.
-         * @return Returns `true` if an entry for `key` exists, else `false`.
-         */
-        has(key: string): boolean;
-
-        /**
-         * Sets `value` to `key` of the cache.
-         * @param key The key of the value to cache.
-         * @param value The value to cache.
-         * @return Returns the cache object.
-         */
-        set(key: string, value: any): _.Dictionary<any>;
-    }
-
-    interface LoDashWrapperBase<T, TWrapper> { }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> extends LoDashWrapperBase<T, TWrapper> { }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> extends LoDashWrapperBase<T, TWrapper> { }
-
-    interface LoDashImplicitWrapper<T> extends LoDashImplicitWrapperBase<T, LoDashImplicitWrapper<T>> { }
-
-    interface LoDashExplicitWrapper<T> extends LoDashExplicitWrapperBase<T, LoDashExplicitWrapper<T>> { }
-
-    interface LoDashImplicitStringWrapper extends LoDashImplicitWrapper<string> { }
-
-    interface LoDashExplicitStringWrapper extends LoDashExplicitWrapper<string> { }
-
-    interface LoDashImplicitObjectWrapper<T> extends LoDashImplicitWrapperBase<T, LoDashImplicitObjectWrapper<T>> { }
-
-    interface LoDashExplicitObjectWrapper<T> extends LoDashExplicitWrapperBase<T, LoDashExplicitObjectWrapper<T>> { }
-
-    interface LoDashImplicitArrayWrapper<T> extends LoDashImplicitWrapperBase<T[], LoDashImplicitArrayWrapper<T>> {
-        pop(): T;
-        push(...items: T[]): LoDashImplicitArrayWrapper<T>;
-        shift(): T;
-        sort(compareFn?: (a: T, b: T) => number): LoDashImplicitArrayWrapper<T>;
-        splice(start: number): LoDashImplicitArrayWrapper<T>;
-        splice(start: number, deleteCount: number, ...items: any[]): LoDashImplicitArrayWrapper<T>;
-        unshift(...items: T[]): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> extends LoDashExplicitWrapperBase<T[], LoDashExplicitArrayWrapper<T>> { }
-
-    interface LoDashImplicitNumberArrayWrapper extends LoDashImplicitArrayWrapper<number> { }
-
-    interface LoDashExplicitNumberArrayWrapper extends LoDashExplicitArrayWrapper<number> { }
-
-    /*********
-     * Array *
-     *********/
-
-    //_.chunk
-    interface LoDashStatic {
-        /**
-         * Creates an array of elements split into groups the length of size. If collection can’t be split evenly, the
-         * final chunk will be the remaining elements.
-         *
-         * @param array The array to process.
-         * @param size The length of each chunk.
-         * @return Returns the new array containing chunks.
-         */
-        chunk<T>(
-            array: List<T>,
-            size?: number
-        ): T[][];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.chunk
-         */
-        chunk(size?: number): LoDashImplicitArrayWrapper<T[]>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.chunk
-         */
-        chunk<TResult>(size?: number): LoDashImplicitArrayWrapper<TResult[]>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.chunk
-         */
-        chunk(size?: number): LoDashExplicitArrayWrapper<T[]>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.chunk
-         */
-        chunk<TResult>(size?: number): LoDashExplicitArrayWrapper<TResult[]>;
-    }
-
-    //_.compact
-    interface LoDashStatic {
-        /**
-         * Creates an array with all falsey values removed. The values false, null, 0, "", undefined, and NaN are
-         * falsey.
-         *
-         * @param array The array to compact.
-         * @return (Array) Returns the new array of filtered values.
-         */
-        compact<T>(array?: List<T>): T[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.compact
-         */
-        compact(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.compact
-         */
-        compact<TResult>(): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.compact
-         */
-        compact(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.compact
-         */
-        compact<TResult>(): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    //_.concat DUMMY
-    interface LoDashStatic {
-        /**
-         * Creates a new array concatenating `array` with any additional arrays
-         * and/or values.
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {Array} array The array to concatenate.
-         * @param {...*} [values] The values to concatenate.
-         * @returns {Array} Returns the new concatenated array.
-         * @example
-         *
-         * var array = [1];
-         * var other = _.concat(array, 2, [3], [[4]]);
-         *
-         * console.log(other);
-         * // => [1, 2, 3, [4]]
-         *
-         * console.log(array);
-         * // => [1]
-         */
-         concat<T>(...values: (T[]|List<T>)[]) : T[];
-    }
-
-    //_.difference
-    interface LoDashStatic {
-        /**
-         * Creates an array of unique array values not included in the other provided arrays using SameValueZero for
-         * equality comparisons.
-         *
-         * @param array The array to inspect.
-         * @param values The arrays of values to exclude.
-         * @return Returns the new array of filtered values.
-         */
-        difference<T>(
-            array: T[]|List<T>,
-            ...values: Array<T[]|List<T>>
-        ): T[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.difference
-         */
-        difference(...values: (T[]|List<T>)[]): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.difference
-         */
-        difference<TValue>(...values: (TValue[]|List<TValue>)[]): LoDashImplicitArrayWrapper<TValue>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.difference
-         */
-        difference(...values: (T[]|List<T>)[]): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.difference
-         */
-        difference<TValue>(...values: (TValue[]|List<TValue>)[]): LoDashExplicitArrayWrapper<TValue>;
-    }
-
-    //_.differenceBy
-    interface LoDashStatic {
-        /**
-         * This method is like _.difference except that it accepts iteratee which is invoked for each element of array
-         * and values to generate the criterion by which uniqueness is computed. The iteratee is invoked with one
-         * argument: (value).
-         *
-         * @param array The array to inspect.
-         * @param values The values to exclude.
-         * @param iteratee The iteratee invoked per element.
-         * @returns Returns the new array of filtered values.
-         */
-        differenceBy<T>(
-            array: T[]|List<T>,
-            values?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): T[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            array: T[]|List<T>,
-            values?: T[]|List<T>,
-            iteratee?: W
-        ): T[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            array: T[]|List<T>,
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): T[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            array: T[]|List<T>,
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            iteratee?: W
-        ): T[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            array: T[]|List<T>,
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): T[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            array: T[]|List<T>,
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            iteratee?: W
-        ): T[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            array: T[]|List<T>,
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            values4?: T[]|List<T>,
-            iteratee?: W
-        ): T[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            array: T[]|List<T>,
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            values4?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): T[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            array: T[]|List<T>,
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            values4?: T[]|List<T>,
-            values5?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): T[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            array: T[]|List<T>,
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            values4?: T[]|List<T>,
-            values5?: T[]|List<T>,
-            iteratee?: W
-        ): T[];
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            array: T[]|List<T>,
-            ...values: any[]
-        ): T[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values?: T[]|List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            values4?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            values4?: T[]|List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            values4?: T[]|List<T>,
-            values5?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            values4?: T[]|List<T>,
-            values5?: T[]|List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            ...values: any[]
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values?: T[]|List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            values4?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            values4?: T[]|List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            values4?: T[]|List<T>,
-            values5?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            values4?: T[]|List<T>,
-            values5?: T[]|List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            ...values: any[]
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values?: T[]|List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            values4?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            values4?: T[]|List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            values4?: T[]|List<T>,
-            values5?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            values4?: T[]|List<T>,
-            values5?: T[]|List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            ...values: any[]
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values?: T[]|List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            values4?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            values4?: T[]|List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            values4?: T[]|List<T>,
-            values5?: T[]|List<T>,
-            iteratee?: ((value: T) => any)|string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T, W extends Object>(
-            values1?: T[]|List<T>,
-            values2?: T[]|List<T>,
-            values3?: T[]|List<T>,
-            values4?: T[]|List<T>,
-            values5?: T[]|List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.differenceBy
-         */
-        differenceBy<T>(
-            ...values: any[]
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.differenceWith DUMMY
-    interface LoDashStatic {
-        /**
-         * Creates an array of unique `array` values not included in the other
-         * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-         * for equality comparisons.
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {Array} array The array to inspect.
-         * @param {...Array} [values] The values to exclude.
-         * @returns {Array} Returns the new array of filtered values.
-         * @example
-         *
-         * _.difference([3, 2, 1], [4, 2]);
-         * // => [3, 1]
-         */
-        differenceWith(
-            array: any[]|List<any>,
-            ...values: any[]
-        ): any[];
-    }
-
-    //_.drop
-    interface LoDashStatic {
-        /**
-         * Creates a slice of array with n elements dropped from the beginning.
-         *
-         * @param array The array to query.
-         * @param n The number of elements to drop.
-         * @return Returns the slice of array.
-         */
-        drop<T>(array: T[]|List<T>, n?: number): T[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.drop
-         */
-        drop(n?: number): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.drop
-         */
-        drop<T>(n?: number): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.drop
-         */
-        drop(n?: number): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.drop
-         */
-        drop<T>(n?: number): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.dropRight
-    interface LoDashStatic {
-        /**
-         * Creates a slice of array with n elements dropped from the end.
-         *
-         * @param array The array to query.
-         * @param n The number of elements to drop.
-         * @return Returns the slice of array.
-         */
-        dropRight<T>(
-            array: List<T>,
-            n?: number
-        ): T[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.dropRight
-         */
-        dropRight(n?: number): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.dropRight
-         */
-        dropRight<TResult>(n?: number): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.dropRight
-         */
-        dropRight(n?: number): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.dropRight
-         */
-        dropRight<TResult>(n?: number): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    //_.dropRightWhile
-    interface LoDashStatic {
-        /**
-         * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
-         * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-         *
-         * If a property name is provided for predicate the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for predicate the created _.matches style callback returns true for elements that
-         * match the properties of the given object, else false.
-         *
-         * @param array The array to query.
-         * @param predicate The function invoked per iteration.
-         * @param thisArg The this binding of predicate.
-         * @return Returns the slice of array.
-         */
-        dropRightWhile<TValue>(
-            array: List<TValue>,
-            predicate?: ListIterator<TValue, boolean>,
-            thisArg?: any
-        ): TValue[];
-
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile<TValue>(
-            array: List<TValue>,
-            predicate?: string,
-            thisArg?: any
-        ): TValue[];
-
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile<TWhere, TValue>(
-            array: List<TValue>,
-            predicate?: TWhere
-        ): TValue[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile(
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile<TWhere>(
-            predicate?: TWhere
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile<TValue>(
-            predicate?: ListIterator<TValue, boolean>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile<TValue>(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile<TWhere, TValue>(
-            predicate?: TWhere
-        ): LoDashImplicitArrayWrapper<TValue>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile(
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile<TWhere>(
-            predicate?: TWhere
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile<TValue>(
-            predicate?: ListIterator<TValue, boolean>,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile<TValue>(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.dropRightWhile
-         */
-        dropRightWhile<TWhere, TValue>(
-            predicate?: TWhere
-        ): LoDashExplicitArrayWrapper<TValue>;
-    }
-
-    //_.dropWhile
-    interface LoDashStatic {
-        /**
-         * Creates a slice of array excluding elements dropped from the beginning. Elements are dropped until predicate
-         * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-         *
-         * If a property name is provided for predicate the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for predicate the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param array The array to query.
-         * @param predicate The function invoked per iteration.
-         * @param thisArg The this binding of predicate.
-         * @return Returns the slice of array.
-         */
-        dropWhile<TValue>(
-            array: List<TValue>,
-            predicate?: ListIterator<TValue, boolean>,
-            thisArg?: any
-        ): TValue[];
-
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile<TValue>(
-            array: List<TValue>,
-            predicate?: string,
-            thisArg?: any
-        ): TValue[];
-
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile<TWhere, TValue>(
-            array: List<TValue>,
-            predicate?: TWhere
-        ): TValue[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile(
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile<TWhere>(
-            predicate?: TWhere
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile<TValue>(
-            predicate?: ListIterator<TValue, boolean>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile<TValue>(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile<TWhere, TValue>(
-            predicate?: TWhere
-        ): LoDashImplicitArrayWrapper<TValue>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile(
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile<TWhere>(
-            predicate?: TWhere
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile<TValue>(
-            predicate?: ListIterator<TValue, boolean>,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile<TValue>(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.dropWhile
-         */
-        dropWhile<TWhere, TValue>(
-            predicate?: TWhere
-        ): LoDashExplicitArrayWrapper<TValue>;
-    }
-
-    //_.fill
-    interface LoDashStatic {
-        /**
-         * Fills elements of array with value from start up to, but not including, end.
-         *
-         * Note: This method mutates array.
-         *
-         * @param array The array to fill.
-         * @param value The value to fill array with.
-         * @param start The start position.
-         * @param end The end position.
-         * @return Returns array.
-         */
-        fill<T>(
-            array: any[],
-            value: T,
-            start?: number,
-            end?: number
-        ): T[];
-
-        /**
-         * @see _.fill
-         */
-        fill<T>(
-            array: List<any>,
-            value: T,
-            start?: number,
-            end?: number
-        ): List<T>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.fill
-         */
-        fill<T>(
-            value: T,
-            start?: number,
-            end?: number
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.fill
-         */
-        fill<T>(
-            value: T,
-            start?: number,
-            end?: number
-        ): LoDashImplicitObjectWrapper<List<T>>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.fill
-         */
-        fill<T>(
-            value: T,
-            start?: number,
-            end?: number
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.fill
-         */
-        fill<T>(
-            value: T,
-            start?: number,
-            end?: number
-        ): LoDashExplicitObjectWrapper<List<T>>;
-    }
-
-    //_.findIndex
-    interface LoDashStatic {
-        /**
-         * This method is like _.find except that it returns the index of the first element predicate returns truthy
-         * for instead of the element itself.
-         *
-         * If a property name is provided for predicate the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for predicate the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param array The array to search.
-         * @param predicate The function invoked per iteration.
-         * @param thisArg The this binding of predicate.
-         * @return Returns the index of the found element, else -1.
-         */
-        findIndex<T>(
-            array: List<T>,
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): number;
-
-        /**
-         * @see _.findIndex
-         */
-        findIndex<T>(
-            array: List<T>,
-            predicate?: string,
-            thisArg?: any
-        ): number;
-
-        /**
-         * @see _.findIndex
-         */
-        findIndex<W, T>(
-            array: List<T>,
-            predicate?: W
-        ): number;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.findIndex
-         */
-        findIndex(
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): number;
-
-        /**
-         * @see _.findIndex
-         */
-        findIndex(
-            predicate?: string,
-            thisArg?: any
-        ): number;
-
-        /**
-         * @see _.findIndex
-         */
-        findIndex<W>(
-            predicate?: W
-        ): number;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.findIndex
-         */
-        findIndex<TResult>(
-            predicate?: ListIterator<TResult, boolean>,
-            thisArg?: any
-        ): number;
-
-        /**
-         * @see _.findIndex
-         */
-        findIndex(
-            predicate?: string,
-            thisArg?: any
-        ): number;
-
-        /**
-         * @see _.findIndex
-         */
-        findIndex<W>(
-            predicate?: W
-        ): number;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.findIndex
-         */
-        findIndex(
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.findIndex
-         */
-        findIndex(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.findIndex
-         */
-        findIndex<W>(
-            predicate?: W
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.findIndex
-         */
-        findIndex<TResult>(
-            predicate?: ListIterator<TResult, boolean>,
-            thisArg?: any
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.findIndex
-         */
-        findIndex(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.findIndex
-         */
-        findIndex<W>(
-            predicate?: W
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    //_.findLastIndex
-    interface LoDashStatic {
-        /**
-         * This method is like _.findIndex except that it iterates over elements of collection from right to left.
-         *
-         * If a property name is provided for predicate the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for predicate the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param array The array to search.
-         * @param predicate The function invoked per iteration.
-         * @param thisArg The function invoked per iteration.
-         * @return Returns the index of the found element, else -1.
-         */
-        findLastIndex<T>(
-            array: List<T>,
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): number;
-
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex<T>(
-            array: List<T>,
-            predicate?: string,
-            thisArg?: any
-        ): number;
-
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex<W, T>(
-            array: List<T>,
-            predicate?: W
-        ): number;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex(
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): number;
-
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex(
-            predicate?: string,
-            thisArg?: any
-        ): number;
-
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex<W>(
-            predicate?: W
-        ): number;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex<TResult>(
-            predicate?: ListIterator<TResult, boolean>,
-            thisArg?: any
-        ): number;
-
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex(
-            predicate?: string,
-            thisArg?: any
-        ): number;
-
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex<W>(
-            predicate?: W
-        ): number;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex(
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex<W>(
-            predicate?: W
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex<TResult>(
-            predicate?: ListIterator<TResult, boolean>,
-            thisArg?: any
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.findLastIndex
-         */
-        findLastIndex<W>(
-            predicate?: W
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    //_.first
-    interface LoDashStatic {
-        /**
-         * @see _.head
-         */
-        first<T>(array: List<T>): T;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.head
-         */
-        first(): string;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.head
-         */
-        first(): T;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.head
-         */
-        first<T>(): T;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.head
-         */
-        first(): LoDashExplicitWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.head
-         */
-        first<T>(): T;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.head
-         */
-        first<T>(): T;
-    }
-
-    interface RecursiveArray<T> extends Array<T|RecursiveArray<T>> {}
-    interface ListOfRecursiveArraysOrValues<T> extends List<T|RecursiveArray<T>> {}
-
-    //_.flatten
-    interface LoDashStatic {
-        /**
-         * Flattens a nested array. If isDeep is true the array is recursively flattened, otherwise it’s only
-         * flattened a single level.
-         *
-         * @param array The array to flatten.
-         * @param isDeep Specify a deep flatten.
-         * @return Returns the new flattened array.
-         */
-        flatten<T>(array: ListOfRecursiveArraysOrValues<T>, isDeep: boolean): T[];
-
-        /**
-         * @see _.flatten
-         */
-        flatten<T>(array: List<T|T[]>): T[];
-
-        /**
-         * @see _.flatten
-         */
-        flatten<T>(array: ListOfRecursiveArraysOrValues<T>): RecursiveArray<T>;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.flatten
-         */
-        flatten(): LoDashImplicitArrayWrapper<string>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.flatten
-         */
-        flatten<TResult>(isDeep?: boolean): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.flatten
-         */
-        flatten<TResult>(isDeep?: boolean): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.flatten
-         */
-        flatten(): LoDashExplicitArrayWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.flatten
-         */
-        flatten<TResult>(isDeep?: boolean): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.flatten
-         */
-        flatten<TResult>(isDeep?: boolean): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    //_.flattenDeep
-    interface LoDashStatic {
-        /**
-         * Recursively flattens a nested array.
-         *
-         * @param array The array to recursively flatten.
-         * @return Returns the new flattened array.
-         */
-        flattenDeep<T>(array: ListOfRecursiveArraysOrValues<T>): T[];
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.flattenDeep
-         */
-        flattenDeep(): LoDashImplicitArrayWrapper<string>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.flattenDeep
-         */
-        flattenDeep<T>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.flattenDeep
-         */
-        flattenDeep<T>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.flattenDeep
-         */
-        flattenDeep(): LoDashExplicitArrayWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.flattenDeep
-         */
-        flattenDeep<T>(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.flattenDeep
-         */
-        flattenDeep<T>(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.fromPairs DUMMY
-    interface LoDashStatic {
-        /**
-         * The inverse of `_.toPairs`; this method returns an object composed
-         * from key-value `pairs`.
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {Array} pairs The key-value pairs.
-         * @returns {Object} Returns the new object.
-         * @example
-         *
-         * _.fromPairs([['fred', 30], ['barney', 40]]);
-         * // => { 'fred': 30, 'barney': 40 }
-         */
-        fromPairs(
-            array: any[]|List<any>
-        ): any[];
-    }
-
-    //_.head
-    interface LoDashStatic {
-        /**
-         * Gets the first element of array.
-         *
-         * @alias _.first
-         *
-         * @param array The array to query.
-         * @return Returns the first element of array.
-         */
-        head<T>(array: List<T>): T;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.head
-         */
-        head(): string;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.head
-         */
-        head(): T;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.head
-         */
-        head<T>(): T;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.head
-         */
-        head(): LoDashExplicitWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.head
-         */
-        head<T>(): T;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.head
-         */
-        head<T>(): T;
-    }
-
-    //_.indexOf
-    interface LoDashStatic {
-        /**
-         * Gets the index at which the first occurrence of `value` is found in `array`
-         * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-         * for equality comparisons. If `fromIndex` is negative, it's used as the offset
-         * from the end of `array`. If `array` is sorted providing `true` for `fromIndex`
-         * performs a faster binary search.
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {Array} array The array to search.
-         * @param {*} value The value to search for.
-         * @param {number} [fromIndex=0] The index to search from.
-         * @returns {number} Returns the index of the matched value, else `-1`.
-         * @example
-         *
-         * _.indexOf([1, 2, 1, 2], 2);
-         * // => 1
-         *
-         * // using `fromIndex`
-         * _.indexOf([1, 2, 1, 2], 2, 2);
-         * // => 3
-         */
-        indexOf<T>(
-            array: List<T>,
-            value: T,
-            fromIndex?: boolean|number
-        ): number;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.indexOf
-         */
-        indexOf(
-            value: T,
-            fromIndex?: boolean|number
-        ): number;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.indexOf
-         */
-        indexOf<TValue>(
-            value: TValue,
-            fromIndex?: boolean|number
-        ): number;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.indexOf
-         */
-        indexOf(
-            value: T,
-            fromIndex?: boolean|number
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.indexOf
-         */
-        indexOf<TValue>(
-            value: TValue,
-            fromIndex?: boolean|number
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    //_.intersectionBy DUMMY
-    interface LoDashStatic {
-        /**
-         * This method is like `_.intersection` except that it accepts `iteratee`
-         * which is invoked for each element of each `arrays` to generate the criterion
-         * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {...Array} [arrays] The arrays to inspect.
-         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
-         * @returns {Array} Returns the new array of shared values.
-         * @example
-         *
-         * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-         * // => [2.1]
-         *
-         * // using the `_.property` iteratee shorthand
-         * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-         * // => [{ 'x': 1 }]
-         */
-        intersectionBy(
-            array: any[]|List<any>,
-            ...values: any[]
-        ): any[];
-    }
-
-    //_.intersectionWith DUMMY
-    interface LoDashStatic {
-        /**
-         * This method is like `_.intersection` except that it accepts `comparator`
-         * which is invoked to compare elements of `arrays`. The comparator is invoked
-         * with two arguments: (arrVal, othVal).
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {...Array} [arrays] The arrays to inspect.
-         * @param {Function} [comparator] The comparator invoked per element.
-         * @returns {Array} Returns the new array of shared values.
-         * @example
-         *
-         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-         * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-         *
-         * _.intersectionWith(objects, others, _.isEqual);
-         * // => [{ 'x': 1, 'y': 2 }]
-         */
-        intersectionWith(
-            array: any[]|List<any>,
-            ...values: any[]
-        ): any[];
-    }
-
-    //_.join
-    interface LoDashStatic {
-        /**
-         * Converts all elements in `array` into a string separated by `separator`.
-         *
-         * @param array The array to convert.
-         * @param separator The element separator.
-         * @returns Returns the joined string.
-         */
-        join(
-            array: List<any>,
-            separator?: string
-        ): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.join
-         */
-        join(separator?: string): string;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.join
-         */
-        join(separator?: string): string;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.join
-         */
-        join(separator?: string): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.join
-         */
-        join(separator?: string): LoDashExplicitWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.join
-         */
-        join(separator?: string): LoDashExplicitWrapper<string>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.join
-         */
-        join(separator?: string): LoDashExplicitWrapper<string>;
-    }
-
-    //_.pullAll DUMMY
-    interface LoDashStatic {
-        /**
-         * This method is like `_.pull` except that it accepts an array of values to remove.
-         *
-         * **Note:** Unlike `_.difference`, this method mutates `array`.
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {Array} array The array to modify.
-         * @param {Array} values The values to remove.
-         * @returns {Array} Returns `array`.
-         * @example
-         *
-         * var array = [1, 2, 3, 1, 2, 3];
-         *
-         * _.pull(array, [2, 3]);
-         * console.log(array);
-         * // => [1, 1]
-         */
-        pullAll(
-            array: any[]|List<any>,
-            ...values: any[]
-        ): any[];
-    }
-
-    //_.pullAllBy DUMMY
-    interface LoDashStatic {
-        /**
-         * This method is like `_.pullAll` except that it accepts `iteratee` which is
-         * invoked for each element of `array` and `values` to to generate the criterion
-         * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-         *
-         * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {Array} array The array to modify.
-         * @param {Array} values The values to remove.
-         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
-         * @returns {Array} Returns `array`.
-         * @example
-         *
-         * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-         *
-         * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-         * console.log(array);
-         * // => [{ 'x': 2 }]
-         */
-        pullAllBy(
-            array: any[]|List<any>,
-            ...values: any[]
-        ): any[];
-    }
-
-    //_.reverse DUMMY
-    interface LoDashStatic {
-        /**
-         * Reverses `array` so that the first element becomes the last, the second
-         * element becomes the second to last, and so on.
-         *
-         * **Note:** This method mutates `array` and is based on
-         * [`Array#reverse`](https://mdn.io/Array/reverse).
-         *
-         * @memberOf _
-         * @category Array
-         * @returns {Array} Returns `array`.
-         * @example
-         *
-         * var array = [1, 2, 3];
-         *
-         * _.reverse(array);
-         * // => [3, 2, 1]
-         *
-         * console.log(array);
-         * // => [3, 2, 1]
-         */
-        reverse(
-            array: any[]|List<any>,
-            ...values: any[]
-        ): any[];
-    }
-
-    //_.sortedIndexOf
-    interface LoDashStatic {
-        /**
-         * This method is like `_.indexOf` except that it performs a binary
-         * search on a sorted `array`.
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {Array} array The array to search.
-         * @param {*} value The value to search for.
-         * @returns {number} Returns the index of the matched value, else `-1`.
-         * @example
-         *
-         * _.sortedIndexOf([1, 1, 2, 2], 2);
-         * // => 2
-         */
-        sortedIndexOf<T>(
-            array: List<T>,
-            value: T
-        ): number;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.sortedIndexOf
-         */
-        sortedIndexOf(
-            value: T
-        ): number;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.sortedIndexOf
-         */
-        sortedIndexOf<TValue>(
-            value: TValue
-        ): number;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.sortedIndexOf
-         */
-        sortedIndexOf(
-            value: T
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.sortedIndexOf
-         */
-        sortedIndexOf<TValue>(
-            value: TValue
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    //_.initial
-    interface LoDashStatic {
-        /**
-         * Gets all but the last element of array.
-         *
-         * @param array The array to query.
-         * @return Returns the slice of array.
-         */
-        initial<T>(array: List<T>): T[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.initial
-         */
-        initial(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.initial
-         */
-        initial<T>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.initial
-         */
-        initial(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.initial
-         */
-        initial<T>(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.intersection
-    interface LoDashStatic {
-        /**
-         * Creates an array of unique values that are included in all of the provided arrays using SameValueZero for
-         * equality comparisons.
-         *
-         * @param arrays The arrays to inspect.
-         * @return Returns the new array of shared values.
-         */
-        intersection<T>(...arrays: (T[]|List<T>)[]): T[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.intersection
-         */
-        intersection<TResult>(...arrays: (TResult[]|List<TResult>)[]): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.intersection
-         */
-        intersection<TResult>(...arrays: (TResult[]|List<TResult>)[]): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.intersection
-         */
-        intersection<TResult>(...arrays: (TResult[]|List<TResult>)[]): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.intersection
-         */
-        intersection<TResult>(...arrays: (TResult[]|List<TResult>)[]): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    //_.last
-    interface LoDashStatic {
-        /**
-         * Gets the last element of array.
-         *
-         * @param array The array to query.
-         * @return Returns the last element of array.
-         */
-        last<T>(array: List<T>): T;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.last
-         */
-        last(): string;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.last
-         */
-        last(): T;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.last
-         */
-        last<T>(): T;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.last
-         */
-        last(): LoDashExplicitWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.last
-         */
-        last<T>(): T;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.last
-         */
-        last<T>(): T;
-    }
-
-    //_.lastIndexOf
-    interface LoDashStatic {
-        /**
-         * This method is like _.indexOf except that it iterates over elements of array from right to left.
-         *
-         * @param array The array to search.
-         * @param value The value to search for.
-         * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
-         * @return Returns the index of the matched value, else -1.
-         */
-        lastIndexOf<T>(
-            array: List<T>,
-            value: T,
-            fromIndex?: boolean|number
-        ): number;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.lastIndexOf
-         */
-        lastIndexOf(
-            value: T,
-            fromIndex?: boolean|number
-        ): number;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.lastIndexOf
-         */
-        lastIndexOf<TResult>(
-            value: TResult,
-            fromIndex?: boolean|number
-        ): number;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.lastIndexOf
-         */
-        lastIndexOf(
-            value: T,
-            fromIndex?: boolean|number
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.lastIndexOf
-         */
-        lastIndexOf<TResult>(
-            value: TResult,
-            fromIndex?: boolean|number
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    //_.pull
-    interface LoDashStatic {
-        /**
-         * Removes all provided values from array using SameValueZero for equality comparisons.
-         *
-         * Note: Unlike _.without, this method mutates array.
-         *
-         * @param array The array to modify.
-         * @param values The values to remove.
-         * @return Returns array.
-         */
-        pull<T>(
-            array: T[],
-            ...values: T[]
-        ): T[];
-
-        /**
-         * @see _.pull
-         */
-        pull<T>(
-            array: List<T>,
-            ...values: T[]
-        ): List<T>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.pull
-         */
-        pull(...values: T[]): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.pull
-         */
-        pull<TValue>(...values: TValue[]): LoDashImplicitObjectWrapper<List<TValue>>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.pull
-         */
-        pull(...values: T[]): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.pull
-         */
-        pull<TValue>(...values: TValue[]): LoDashExplicitObjectWrapper<List<TValue>>;
-    }
-
-    //_.pullAt
-    interface LoDashStatic {
-        /**
-         * Removes elements from array corresponding to the given indexes and returns an array of the removed elements.
-         * Indexes may be specified as an array of indexes or as individual arguments.
-         *
-         * Note: Unlike _.at, this method mutates array.
-         *
-         * @param array The array to modify.
-         * @param indexes The indexes of elements to remove, specified as individual indexes or arrays of indexes.
-         * @return Returns the new array of removed elements.
-         */
-        pullAt<T>(
-            array: List<T>,
-            ...indexes: (number|number[])[]
-        ): T[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.pullAt
-         */
-        pullAt(...indexes: (number|number[])[]): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.pullAt
-         */
-        pullAt<T>(...indexes: (number|number[])[]): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.pullAt
-         */
-        pullAt(...indexes: (number|number[])[]): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.pullAt
-         */
-        pullAt<T>(...indexes: (number|number[])[]): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.remove
-    interface LoDashStatic {
-        /**
-         * Removes all elements from array that predicate returns truthy for and returns an array of the removed
-         * elements. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-         *
-         * If a property name is provided for predicate the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for predicate the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * Note: Unlike _.filter, this method mutates array.
-         *
-         * @param array The array to modify.
-         * @param predicate The function invoked per iteration.
-         * @param thisArg The this binding of predicate.
-         * @return Returns the new array of removed elements.
-         */
-        remove<T>(
-            array: List<T>,
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): T[];
-
-        /**
-         * @see _.remove
-         */
-        remove<T>(
-            array: List<T>,
-            predicate?: string,
-            thisArg?: any
-        ): T[];
-
-        /**
-         * @see _.remove
-         */
-        remove<W, T>(
-            array: List<T>,
-            predicate?: W
-        ): T[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.remove
-         */
-        remove(
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.remove
-         */
-        remove(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.remove
-         */
-        remove<W>(
-            predicate?: W
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.remove
-         */
-        remove<TResult>(
-            predicate?: ListIterator<TResult, boolean>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.remove
-         */
-        remove<TResult>(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.remove
-         */
-        remove<W, TResult>(
-            predicate?: W
-        ): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.remove
-         */
-        remove(
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.remove
-         */
-        remove(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.remove
-         */
-        remove<W>(
-            predicate?: W
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.remove
-         */
-        remove<TResult>(
-            predicate?: ListIterator<TResult, boolean>,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.remove
-         */
-        remove<TResult>(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.remove
-         */
-        remove<W, TResult>(
-            predicate?: W
-        ): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    //_.tail
-    interface LoDashStatic {
-        /**
-         * Gets all but the first element of array.
-         *
-         * @alias _.tail
-         *
-         * @param array The array to query.
-         * @return Returns the slice of array.
-         */
-        tail<T>(array: List<T>): T[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.tail
-         */
-        tail(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.tail
-         */
-        tail<T>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.tail
-         */
-        tail(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.tail
-         */
-        tail<T>(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.slice
-    interface LoDashStatic {
-        /**
-         * Creates a slice of array from start up to, but not including, end.
-         *
-         * @param array The array to slice.
-         * @param start The start position.
-         * @param end The end position.
-         * @return Returns the slice of array.
-         */
-        slice<T>(
-            array: T[],
-            start?: number,
-            end?: number
-        ): T[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.slice
-         */
-        slice(
-            start?: number,
-            end?: number
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.slice
-         */
-        slice(
-            start?: number,
-            end?: number
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.sortedIndex
-    interface LoDashStatic {
-        /**
-         * Uses a binary search to determine the lowest index at which `value` should
-         * be inserted into `array` in order to maintain its sort order.
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {Array} array The sorted array to inspect.
-         * @param {*} value The value to evaluate.
-         * @returns {number} Returns the index at which `value` should be inserted into `array`.
-         * @example
-         *
-         * _.sortedIndex([30, 50], 40);
-         * // => 1
-         *
-         * _.sortedIndex([4, 5], 4);
-         * // => 0
-         */
-        sortedIndex<T, TSort>(
-            array: List<T>,
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<T>(
-            array: List<T>,
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<T>(
-            array: List<T>,
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<W, T>(
-            array: List<T>,
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<T>(
-            array: List<T>,
-            value: T
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<TSort>(
-            value: string
-        ): number;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<TSort>(
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex(
-            value: T
-        ): number;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<T, TSort>(
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<T>(
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<W, T>(
-            value: T
-        ): number;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<TSort>(
-            value: string
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<TSort>(
-            value: T
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex(
-            value: T
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<W>(
-            value: T
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<T, TSort>(
-            value: T
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<T>(
-            value: T
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<W, T>(
-            value: T
-        ): LoDashExplicitWrapper<number>;
-
-
-    }
-
-    //_.sortedIndexBy
-    interface LoDashStatic {
-        /**
-         * This method is like `_.sortedIndex` except that it accepts `iteratee`
-         * which is invoked for `value` and each element of `array` to compute their
-         * sort ranking. The iteratee is invoked with one argument: (value).
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {Array} array The sorted array to inspect.
-         * @param {*} value The value to evaluate.
-         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
-         * @returns {number} Returns the index at which `value` should be inserted into `array`.
-         * @example
-         *
-         * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
-         *
-         * _.sortedIndexBy(['thirty', 'fifty'], 'forty', _.propertyOf(dict));
-         * // => 1
-         *
-         * // using the `_.property` iteratee shorthand
-         * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
-         * // => 0
-         */
-        sortedIndexBy<T, TSort>(
-            array: List<T>,
-            value: T,
-            iteratee: (x: T) => TSort
-        ): number;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<T>(
-            array: List<T>,
-            value: T,
-            iteratee: (x: T) => any
-        ): number;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<T>(
-            array: List<T>,
-            value: T,
-            iteratee: string
-        ): number;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<W, T>(
-            array: List<T>,
-            value: T,
-            iteratee: W
-        ): number;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<T>(
-            array: List<T>,
-            value: T,
-            iteratee: Object
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<TSort>(
-            value: string,
-            iteratee: (x: string) => TSort
-        ): number;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<TSort>(
-            value: T,
-            iteratee: (x: T) => TSort
-        ): number;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy(
-            value: T,
-            iteratee: string
-        ): number;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<W>(
-            value: T,
-            iteratee: W
-        ): number;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<T, TSort>(
-            value: T,
-            iteratee: (x: T) => TSort
-        ): number;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<T>(
-            value: T,
-            iteratee: (x: T) => any
-        ): number;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<T>(
-            value: T,
-            iteratee: string
-        ): number;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<W, T>(
-            value: T,
-            iteratee: W
-        ): number;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<T>(
-            value: T,
-            iteratee: Object
-        ): number;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<TSort>(
-            value: string,
-            iteratee: (x: string) => TSort
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<TSort>(
-            value: T,
-            iteratee: (x: T) => TSort
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy(
-            value: T,
-            iteratee: string
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<W>(
-            value: T,
-            iteratee: W
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<T, TSort>(
-            value: T,
-            iteratee: (x: T) => TSort
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<T>(
-            value: T,
-            iteratee: (x: T) => any
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<T>(
-            value: T,
-            iteratee: string
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<W, T>(
-            value: T,
-            iteratee: W
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedIndexBy
-         */
-        sortedIndexBy<T>(
-            value: T,
-            iteratee: Object
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    //_.sortedLastIndex
-    interface LoDashStatic {
-        /**
-         * This method is like `_.sortedIndex` except that it returns the highest
-         * index at which `value` should be inserted into `array` in order to
-         * maintain its sort order.
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {Array} array The sorted array to inspect.
-         * @param {*} value The value to evaluate.
-         * @returns {number} Returns the index at which `value` should be inserted into `array`.
-         * @example
-         *
-         * _.sortedLastIndex([4, 5], 4);
-         * // => 1
-         */
-        sortedLastIndex<T, TSort>(
-            array: List<T>,
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<T>(
-            array: List<T>,
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<T>(
-            array: List<T>,
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<W, T>(
-            array: List<T>,
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<T>(
-            array: List<T>,
-            value: T
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<TSort>(
-            value: string
-        ): number;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<TSort>(
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex(
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<W>(
-            value: T
-        ): number;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<T, TSort>(
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<T>(
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<W, T>(
-            value: T
-        ): number;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<TSort>(
-            value: string
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<TSort>(
-            value: T
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex(
-            value: T
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<T, TSort>(
-            value: T
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<T>(
-            value: T
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<W, T>(
-            value: T
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    //_.sortedLastIndexBy
-    interface LoDashStatic {
-        /**
-         * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
-         * which is invoked for `value` and each element of `array` to compute their
-         * sort ranking. The iteratee is invoked with one argument: (value).
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {Array} array The sorted array to inspect.
-         * @param {*} value The value to evaluate.
-         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
-         * @returns {number} Returns the index at which `value` should be inserted into `array`.
-         * @example
-         *
-         * // using the `_.property` iteratee shorthand
-         * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
-         * // => 1
-         */
-        sortedLastIndexBy<T, TSort>(
-            array: List<T>,
-            value: T,
-            iteratee: (x: T) => TSort
-        ): number;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<T>(
-            array: List<T>,
-            value: T,
-            iteratee: (x: T) => any
-        ): number;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<T>(
-            array: List<T>,
-            value: T,
-            iteratee: string
-        ): number;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<W, T>(
-            array: List<T>,
-            value: T,
-            iteratee: W
-        ): number;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<T>(
-            array: List<T>,
-            value: T,
-            iteratee: Object
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<TSort>(
-            value: string,
-            iteratee: (x: string) => TSort
-        ): number;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<TSort>(
-            value: T,
-            iteratee: (x: T) => TSort
-        ): number;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy(
-            value: T,
-            iteratee: string
-        ): number;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<W>(
-            value: T,
-            iteratee: W
-        ): number;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<T, TSort>(
-            value: T,
-            iteratee: (x: T) => TSort
-        ): number;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<T>(
-            value: T,
-            iteratee: (x: T) => any
-        ): number;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<T>(
-            value: T,
-            iteratee: string
-        ): number;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<W, T>(
-            value: T,
-            iteratee: W
-        ): number;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<T>(
-            value: T,
-            iteratee: Object
-        ): number;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<TSort>(
-            value: string,
-            iteratee: (x: string) => TSort
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<TSort>(
-            value: T,
-            iteratee: (x: T) => TSort
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy(
-            value: T,
-            iteratee: string
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<W>(
-            value: T,
-            iteratee: W
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<T, TSort>(
-            value: T,
-            iteratee: (x: T) => TSort
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<T>(
-            value: T,
-            iteratee: (x: T) => any
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<T>(
-            value: T,
-            iteratee: string
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<W, T>(
-            value: T,
-            iteratee: W
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedLastIndexBy
-         */
-        sortedLastIndexBy<T>(
-            value: T,
-            iteratee: Object
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    //_.sortedLastIndexOf DUMMY
-    interface LoDashStatic {
-        /**
-         * This method is like `_.lastIndexOf` except that it performs a binary
-         * search on a sorted `array`.
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {Array} array The array to search.
-         * @param {*} value The value to search for.
-         * @returns {number} Returns the index of the matched value, else `-1`.
-         * @example
-         *
-         * _.sortedLastIndexOf([1, 1, 2, 2], 2);
-         * // => 3
-         */
-        sortedLastIndexOf(
-            array: any[]|List<any>,
-            ...values: any[]
-        ): any[];
-    }
-
-    //_.tail
-    interface LoDashStatic {
-        /**
-         * @see _.rest
-         */
-        tail<T>(array: List<T>): T[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.rest
-         */
-        tail(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.rest
-         */
-        tail<T>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.rest
-         */
-        tail(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.rest
-         */
-        tail<T>(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.take
-    interface LoDashStatic {
-        /**
-         * Creates a slice of array with n elements taken from the beginning.
-         *
-         * @param array The array to query.
-         * @param n The number of elements to take.
-         * @return Returns the slice of array.
-         */
-        take<T>(
-            array: List<T>,
-            n?: number
-        ): T[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.take
-         */
-        take(n?: number): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.take
-         */
-        take<TResult>(n?: number): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.take
-         */
-        take(n?: number): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.take
-         */
-        take<TResult>(n?: number): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    //_.takeRight
-    interface LoDashStatic {
-        /**
-         * Creates a slice of array with n elements taken from the end.
-         *
-         * @param array The array to query.
-         * @param n The number of elements to take.
-         * @return Returns the slice of array.
-         */
-        takeRight<T>(
-            array: List<T>,
-            n?: number
-        ): T[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.takeRight
-         */
-        takeRight(n?: number): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.takeRight
-         */
-        takeRight<TResult>(n?: number): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.takeRight
-         */
-        takeRight(n?: number): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.takeRight
-         */
-        takeRight<TResult>(n?: number): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    //_.takeRightWhile
-    interface LoDashStatic {
-        /**
-         * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
-         * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-         *
-         * If a property name is provided for predicate the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for predicate the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param array The array to query.
-         * @param predicate The function invoked per iteration.
-         * @param thisArg The this binding of predicate.
-         * @return Returns the slice of array.
-         */
-        takeRightWhile<TValue>(
-            array: List<TValue>,
-            predicate?: ListIterator<TValue, boolean>,
-            thisArg?: any
-        ): TValue[];
-
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile<TValue>(
-            array: List<TValue>,
-            predicate?: string,
-            thisArg?: any
-        ): TValue[];
-
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile<TWhere, TValue>(
-            array: List<TValue>,
-            predicate?: TWhere
-        ): TValue[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile(
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile<TWhere>(
-            predicate?: TWhere
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile<TValue>(
-            predicate?: ListIterator<TValue, boolean>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile<TValue>(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile<TWhere, TValue>(
-            predicate?: TWhere
-        ): LoDashImplicitArrayWrapper<TValue>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile(
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile<TWhere>(
-            predicate?: TWhere
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile<TValue>(
-            predicate?: ListIterator<TValue, boolean>,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile<TValue>(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.takeRightWhile
-         */
-        takeRightWhile<TWhere, TValue>(
-            predicate?: TWhere
-        ): LoDashExplicitArrayWrapper<TValue>;
-    }
-
-    //_.takeWhile
-    interface LoDashStatic {
-        /**
-         * Creates a slice of array with elements taken from the beginning. Elements are taken until predicate returns
-         * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-         *
-         * If a property name is provided for predicate the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for predicate the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param array The array to query.
-         * @param predicate The function invoked per iteration.
-         * @param thisArg The this binding of predicate.
-         * @return Returns the slice of array.
-         */
-        takeWhile<TValue>(
-            array: List<TValue>,
-            predicate?: ListIterator<TValue, boolean>,
-            thisArg?: any
-        ): TValue[];
-
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile<TValue>(
-            array: List<TValue>,
-            predicate?: string,
-            thisArg?: any
-        ): TValue[];
-
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile<TWhere, TValue>(
-            array: List<TValue>,
-            predicate?: TWhere
-        ): TValue[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile(
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile<TWhere>(
-            predicate?: TWhere
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile<TValue>(
-            predicate?: ListIterator<TValue, boolean>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile<TValue>(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile<TWhere, TValue>(
-            predicate?: TWhere
-        ): LoDashImplicitArrayWrapper<TValue>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile(
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile<TWhere>(
-            predicate?: TWhere
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile<TValue>(
-            predicate?: ListIterator<TValue, boolean>,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile<TValue>(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<TValue>;
-
-        /**
-         * @see _.takeWhile
-         */
-        takeWhile<TWhere, TValue>(
-            predicate?: TWhere
-        ): LoDashExplicitArrayWrapper<TValue>;
-    }
-
-    //_.union
-    interface LoDashStatic {
-        /**
-         * Creates an array of unique values, in order, from all of the provided arrays using SameValueZero for
-         * equality comparisons.
-         *
-         * @param arrays The arrays to inspect.
-         * @return Returns the new array of combined values.
-         */
-        union<T>(...arrays: List<T>[]): T[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.union
-         */
-        union(...arrays: List<T>[]): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.union
-         */
-        union<T>(...arrays: List<T>[]): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.union
-         */
-        union<T>(...arrays: List<T>[]): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.union
-         */
-        union(...arrays: List<T>[]): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.union
-         */
-        union<T>(...arrays: List<T>[]): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.union
-         */
-        union<T>(...arrays: List<T>[]): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.unionBy
-    interface LoDashStatic {
-        /**
-         * This method is like `_.union` except that it accepts `iteratee` which is
-         * invoked for each element of each `arrays` to generate the criterion by which
-         * uniqueness is computed. The iteratee is invoked with one argument: (value).
-         *
-         * @param arrays The arrays to inspect.
-         * @param iteratee The iteratee invoked per element.
-         * @return Returns the new array of combined values.
-         */
-        unionBy<T>(
-            arrays: T[]|List<T>,
-            iteratee?: (value: T) => any
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays: T[]|List<T>,
-            iteratee?: W
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays1: T[]|List<T>,
-            arrays2: T[]|List<T>,
-            iteratee?: (value: T) => any
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays1: T[]|List<T>,
-            arrays2: T[]|List<T>,
-            iteratee?: W
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays1: T[]|List<T>,
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            iteratee?: (value: T) => any
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays1: T[]|List<T>,
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            iteratee?: W
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays1: T[]|List<T>,
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            arrays4: T[]|List<T>,
-            iteratee?: (value: T) => any
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays1: T[]|List<T>,
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            arrays4: T[]|List<T>,
-            iteratee?: W
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays1: T[]|List<T>,
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            arrays4: T[]|List<T>,
-            arrays5: T[]|List<T>,
-            iteratee?: (value: T) => any
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays1: T[]|List<T>,
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            arrays4: T[]|List<T>,
-            arrays5: T[]|List<T>,
-            iteratee?: W
-        ): T[];
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays: T[]|List<T>,
-            ...iteratee: any[]
-        ): T[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            iteratee?: (value: T) => any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: T[]|List<T>,
-            iteratee?: (value: T) => any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: T[]|List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            iteratee?: (value: T) => any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            arrays4: T[]|List<T>,
-            iteratee?: (value: T) => any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            arrays4: T[]|List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            arrays4: T[]|List<T>,
-            arrays5: T[]|List<T>,
-            iteratee?: (value: T) => any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            arrays4: T[]|List<T>,
-            arrays5: T[]|List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            ...iteratee: any[]
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            iteratee?: (value: T) => any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: T[]|List<T>,
-            iteratee?: (value: T) => any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: T[]|List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            iteratee?: (value: T) => any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            arrays4: T[]|List<T>,
-            iteratee?: (value: T) => any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            arrays4: T[]|List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            arrays4: T[]|List<T>,
-            arrays5: T[]|List<T>,
-            iteratee?: (value: T) => any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            arrays4: T[]|List<T>,
-            arrays5: T[]|List<T>,
-            iteratee?: W
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            ...iteratee: any[]
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            iteratee?: (value: T) => any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: T[]|List<T>,
-            iteratee?: (value: T) => any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: T[]|List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            iteratee?: (value: T) => any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            arrays4: T[]|List<T>,
-            iteratee?: (value: T) => any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            arrays4: T[]|List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            arrays4: T[]|List<T>,
-            arrays5: T[]|List<T>,
-            iteratee?: (value: T) => any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            arrays4: T[]|List<T>,
-            arrays5: T[]|List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            ...iteratee: any[]
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            iteratee?: (value: T) => any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: T[]|List<T>,
-            iteratee?: (value: T) => any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: T[]|List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            iteratee?: (value: T) => any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            arrays4: T[]|List<T>,
-            iteratee?: (value: T) => any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            arrays4: T[]|List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            arrays4: T[]|List<T>,
-            arrays5: T[]|List<T>,
-            iteratee?: (value: T) => any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T, W extends Object>(
-            arrays2: T[]|List<T>,
-            arrays3: T[]|List<T>,
-            arrays4: T[]|List<T>,
-            arrays5: T[]|List<T>,
-            iteratee?: W
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.unionBy
-         */
-        unionBy<T>(
-            ...iteratee: any[]
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.uniq
-    interface LoDashStatic {
-        /**
-         * Creates a duplicate-free version of an array, using
-         * [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-         * for equality comparisons, in which only the first occurrence of each element
-         * is kept.
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {Array} array The array to inspect.
-         * @returns {Array} Returns the new duplicate free array.
-         * @example
-         *
-         * _.uniq([2, 1, 2]);
-         * // => [2, 1]
-         */
-        uniq<T>(
-            array: List<T>
-        ): T[];
-
-        /**
-         * @see _.uniq
-         */
-        uniq<T, TSort>(
-            array: List<T>
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.uniq
-         */
-        uniq<TSort>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.uniq
-         */
-        uniq<TSort>(): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniq
-         */
-        uniq(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        uniq<T>(): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniq
-         */
-        uniq<T, TSort>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.uniq
-         */
-        uniq<TSort>(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.uniq
-         */
-        uniq<TSort>(): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniq
-         */
-        uniq(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.uniq
-         */
-        uniq<T>(): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniq
-         */
-        uniq<T, TSort>(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.uniqBy
-    interface LoDashStatic {
-        /**
-         * This method is like `_.uniq` except that it accepts `iteratee` which is
-         * invoked for each element in `array` to generate the criterion by which
-         * uniqueness is computed. The iteratee is invoked with one argument: (value).
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {Array} array The array to inspect.
-         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
-         * @returns {Array} Returns the new duplicate free array.
-         * @example
-         *
-         * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
-         * // => [2.1, 1.2]
-         *
-         * // using the `_.property` iteratee shorthand
-         * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
-         * // => [{ 'x': 1 }, { 'x': 2 }]
-         */
-        uniqBy<T>(
-            array: List<T>,
-            iteratee: ListIterator<T, any>
-        ): T[];
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T, TSort>(
-            array: List<T>,
-            iteratee: ListIterator<T, TSort>
-        ): T[];
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T>(
-            array: List<T>,
-            iteratee: string
-        ): T[];
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T>(
-            array: List<T>,
-            iteratee: Object
-        ): T[];
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<TWhere extends {}, T>(
-            array: List<T>,
-            iteratee: TWhere
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy(
-            iteratee: string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<TWhere extends {}>(
-            iteratee: TWhere
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T>(
-            iteratee: ListIterator<T, any>
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T, TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T>(
-            iteratee: string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T>(
-            iteratee: Object
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<TWhere extends {}, T>(
-            iteratee: TWhere
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy(
-            iteratee: string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<TWhere extends {}>(
-            iteratee: TWhere
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T>(
-            iteratee: ListIterator<T, any>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T, TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T>(
-            iteratee: string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<T>(
-            iteratee: Object
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.uniqBy
-         */
-        uniqBy<TWhere extends {}, T>(
-            iteratee: TWhere
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.sortedUniq
-    interface LoDashStatic {
-        /**
-         * This method is like `_.uniq` except that it's designed and optimized
-         * for sorted arrays.
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {Array} array The array to inspect.
-         * @returns {Array} Returns the new duplicate free array.
-         * @example
-         *
-         * _.sortedUniq([1, 1, 2]);
-         * // => [1, 2]
-         */
-        sortedUniq<T>(
-            array: List<T>
-        ): T[];
-
-        /**
-         * @see _.sortedUniq
-         */
-        sortedUniq<T, TSort>(
-            array: List<T>
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.sortedUniq
-         */
-        sortedUniq<TSort>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.sortedUniq
-         */
-        sortedUniq<TSort>(): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniq
-         */
-        sortedUniq(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        sortedUniq<T>(): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniq
-         */
-        sortedUniq<T, TSort>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.sortedUniq
-         */
-        sortedUniq<TSort>(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.sortedUniq
-         */
-        sortedUniq<TSort>(): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniq
-         */
-        sortedUniq(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.sortedUniq
-         */
-        sortedUniq<T>(): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniq
-         */
-        sortedUniq<T, TSort>(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.sortedUniqBy
-    interface LoDashStatic {
-        /**
-         * This method is like `_.uniqBy` except that it's designed and optimized
-         * for sorted arrays.
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {Array} array The array to inspect.
-         * @param {Function} [iteratee] The iteratee invoked per element.
-         * @returns {Array} Returns the new duplicate free array.
-         * @example
-         *
-         * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
-         * // => [1.1, 2.2]
-         */
-        sortedUniqBy<T>(
-            array: List<T>,
-            iteratee: ListIterator<T, any>
-        ): T[];
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T, TSort>(
-            array: List<T>,
-            iteratee: ListIterator<T, TSort>
-        ): T[];
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T>(
-            array: List<T>,
-            iteratee: string
-        ): T[];
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T>(
-            array: List<T>,
-            iteratee: Object
-        ): T[];
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<TWhere extends {}, T>(
-            array: List<T>,
-            iteratee: TWhere
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy(
-            iteratee: string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<TWhere extends {}>(
-            iteratee: TWhere
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T>(
-            iteratee: ListIterator<T, any>
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T, TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T>(
-            iteratee: string
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T>(
-            iteratee: Object
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<TWhere extends {}, T>(
-            iteratee: TWhere
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy(
-            iteratee: string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<TWhere extends {}>(
-            iteratee: TWhere
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T>(
-            iteratee: ListIterator<T, any>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T, TSort>(
-            iteratee: ListIterator<T, TSort>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T>(
-            iteratee: string
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<T>(
-            iteratee: Object
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortedUniqBy
-         */
-        sortedUniqBy<TWhere extends {}, T>(
-            iteratee: TWhere
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.unionWith DUMMY
-    interface LoDashStatic {
-        /**
-         * This method is like `_.union` except that it accepts `comparator` which
-         * is invoked to compare elements of `arrays`. The comparator is invoked
-         * with two arguments: (arrVal, othVal).
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {...Array} [arrays] The arrays to inspect.
-         * @param {Function} [comparator] The comparator invoked per element.
-         * @returns {Array} Returns the new array of combined values.
-         * @example
-         *
-         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-         * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-         *
-         * _.unionWith(objects, others, _.isEqual);
-         * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-         */
-        unionWith(
-            array: any[]|List<any>,
-            ...values: any[]
-        ): any[];
-    }
-
-    //_.uniqWith DUMMY
-    interface LoDashStatic {
-        /**
-         * This method is like `_.uniq` except that it accepts `comparator` which
-         * is invoked to compare elements of `array`. The comparator is invoked with
-         * two arguments: (arrVal, othVal).
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {Array} array The array to inspect.
-         * @param {Function} [comparator] The comparator invoked per element.
-         * @returns {Array} Returns the new duplicate free array.
-         * @example
-         *
-         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 },  { 'x': 1, 'y': 2 }];
-         *
-         * _.uniqWith(objects, _.isEqual);
-         * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }]
-         */
-        uniqWith(
-            array: any[]|List<any>,
-            ...values: any[]
-        ): any[];
-    }
-
-    //_.unzip
-    interface LoDashStatic {
-        /**
-         * This method is like _.zip except that it accepts an array of grouped elements and creates an array
-         * regrouping the elements to their pre-zip configuration.
-         *
-         * @param array The array of grouped elements to process.
-         * @return Returns the new array of regrouped elements.
-         */
-        unzip<T>(array: List<List<T>>): T[][];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.unzip
-         */
-        unzip<T>(): LoDashImplicitArrayWrapper<T[]>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.unzip
-         */
-        unzip<T>(): LoDashImplicitArrayWrapper<T[]>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.unzip
-         */
-        unzip<T>(): LoDashExplicitArrayWrapper<T[]>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.unzip
-         */
-        unzip<T>(): LoDashExplicitArrayWrapper<T[]>;
-    }
-
-    //_.unzipWith
-    interface LoDashStatic {
-        /**
-         * This method is like _.unzip except that it accepts an iteratee to specify how regrouped values should be
-         * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
-         * group).
-         *
-         * @param array The array of grouped elements to process.
-         * @param iteratee The function to combine regrouped values.
-         * @param thisArg The this binding of iteratee.
-         * @return Returns the new array of regrouped elements.
-         */
-        unzipWith<TArray, TResult>(
-            array: List<List<TArray>>,
-            iteratee?: MemoIterator<TArray, TResult>,
-            thisArg?: any
-        ): TResult[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.unzipWith
-         */
-        unzipWith<TArr, TResult>(
-            iteratee?: MemoIterator<TArr, TResult>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.unzipWith
-         */
-        unzipWith<TArr, TResult>(
-            iteratee?: MemoIterator<TArr, TResult>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    //_.without
-    interface LoDashStatic {
-        /**
-         * Creates an array excluding all provided values using SameValueZero for equality comparisons.
-         *
-         * @param array The array to filter.
-         * @param values The values to exclude.
-         * @return Returns the new array of filtered values.
-         */
-        without<T>(
-            array: List<T>,
-            ...values: T[]
-        ): T[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.without
-         */
-        without(...values: T[]): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.without
-         */
-        without<T>(...values: T[]): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.without
-         */
-        without(...values: T[]): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.without
-         */
-        without<T>(...values: T[]): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.xor
-    interface LoDashStatic {
-        /**
-         * Creates an array of unique values that is the symmetric difference of the provided arrays.
-         *
-         * @param arrays The arrays to inspect.
-         * @return Returns the new array of values.
-         */
-        xor<T>(...arrays: List<T>[]): T[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.xor
-         */
-        xor(...arrays: List<T>[]): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.xor
-         */
-        xor<T>(...arrays: List<T>[]): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.xor
-         */
-        xor(...arrays: List<T>[]): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.xor
-         */
-        xor<T>(...arrays: List<T>[]): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.xorBy DUMMY
-    interface LoDashStatic {
-        /**
-         * This method is like `_.xor` except that it accepts `iteratee` which is
-         * invoked for each element of each `arrays` to generate the criterion by which
-         * uniqueness is computed. The iteratee is invoked with one argument: (value).
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {...Array} [arrays] The arrays to inspect.
-         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
-         * @returns {Array} Returns the new array of values.
-         * @example
-         *
-         * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-         * // => [1.2, 4.3]
-         *
-         * // using the `_.property` iteratee shorthand
-         * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-         * // => [{ 'x': 2 }]
-         */
-        xorBy(
-            array: any[]|List<any>,
-            ...values: any[]
-        ): any[];
-    }
-
-    //_.xorWith DUMMY
-    interface LoDashStatic {
-        /**
-         * This method is like `_.xor` except that it accepts `comparator` which is
-         * invoked to compare elements of `arrays`. The comparator is invoked with
-         * two arguments: (arrVal, othVal).
-         *
-         * @static
-         * @memberOf _
-         * @category Array
-         * @param {...Array} [arrays] The arrays to inspect.
-         * @param {Function} [comparator] The comparator invoked per element.
-         * @returns {Array} Returns the new array of values.
-         * @example
-         *
-         * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-         * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-         *
-         * _.xorWith(objects, others, _.isEqual);
-         * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-         */
-        xorWith(
-            array: any[]|List<any>,
-            ...values: any[]
-        ): any[];
-    }
-
-    //_.zip
-    interface LoDashStatic {
-        /**
-         * Creates an array of grouped elements, the first of which contains the first elements of the given arrays,
-         * the second of which contains the second elements of the given arrays, and so on.
-         *
-         * @param arrays The arrays to process.
-         * @return Returns the new array of grouped elements.
-         */
-        zip<T>(...arrays: List<T>[]): T[][];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.zip
-         */
-        zip<T>(...arrays: List<T>[]): _.LoDashImplicitArrayWrapper<T[]>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.zip
-         */
-        zip<T>(...arrays: List<T>[]): _.LoDashImplicitArrayWrapper<T[]>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.zip
-         */
-        zip<T>(...arrays: List<T>[]): _.LoDashExplicitArrayWrapper<T[]>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.zip
-         */
-        zip<T>(...arrays: List<T>[]): _.LoDashExplicitArrayWrapper<T[]>;
-    }
-
-    //_.zipObject
-    interface LoDashStatic {
-        /**
-         * The inverse of _.pairs; this method returns an object composed from arrays of property names and values.
-         * Provide either a single two dimensional array, e.g. [[key1, value1], [key2, value2]] or two arrays, one of
-         * property names and one of corresponding values.
-         *
-         * @param props The property names.
-         * @param values The property values.
-         * @return Returns the new object.
-         */
-        zipObject<TValues, TResult extends {}>(
-            props: List<StringRepresentable>|List<List<any>>,
-            values?: List<TValues>
-        ): TResult;
-
-        /**
-         * @see _.zipObject
-         */
-        zipObject<TResult extends {}>(
-            props: List<StringRepresentable>|List<List<any>>,
-            values?: List<any>
-        ): TResult;
-
-        /**
-         * @see _.zipObject
-         */
-        zipObject(
-            props: List<StringRepresentable>|List<List<any>>,
-            values?: List<any>
-        ): _.Dictionary<any>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.zipObject
-         */
-        zipObject<TValues, TResult extends {}>(
-            values?: List<TValues>
-        ): _.LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.zipObject
-         */
-        zipObject<TResult extends {}>(
-            values?: List<any>
-        ): _.LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.zipObject
-         */
-        zipObject(
-            values?: List<any>
-        ): _.LoDashImplicitObjectWrapper<_.Dictionary<any>>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.zipObject
-         */
-        zipObject<TValues, TResult extends {}>(
-            values?: List<TValues>
-        ): _.LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.zipObject
-         */
-        zipObject<TResult extends {}>(
-            values?: List<any>
-        ): _.LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.zipObject
-         */
-        zipObject(
-            values?: List<any>
-        ): _.LoDashImplicitObjectWrapper<_.Dictionary<any>>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.zipObject
-         */
-        zipObject<TValues, TResult extends {}>(
-            values?: List<TValues>
-        ): _.LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.zipObject
-         */
-        zipObject<TResult extends {}>(
-            values?: List<any>
-        ): _.LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.zipObject
-         */
-        zipObject(
-            values?: List<any>
-        ): _.LoDashExplicitObjectWrapper<_.Dictionary<any>>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.zipObject
-         */
-        zipObject<TValues, TResult extends {}>(
-            values?: List<TValues>
-        ): _.LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.zipObject
-         */
-        zipObject<TResult extends {}>(
-            values?: List<any>
-        ): _.LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.zipObject
-         */
-        zipObject(
-            values?: List<any>
-        ): _.LoDashExplicitObjectWrapper<_.Dictionary<any>>;
-    }
-
-    //_.zipWith
-    interface LoDashStatic {
-        /**
-         * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
-         * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
-         * group).
-         * @param {...Array} [arrays] The arrays to process.
-         * @param {Function} [iteratee] The function to combine grouped values.
-         * @param {*} [thisArg] The `this` binding of `iteratee`.
-         * @return Returns the new array of grouped elements.
-         */
-        zipWith<TResult>(...args: any[]): TResult[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.zipWith
-         */
-        zipWith<TResult>(...args: any[]): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    /*********
-     * Chain *
-     *********/
-
-    //_.chain
-    interface LoDashStatic {
-        /**
-         * Creates a lodash object that wraps value with explicit method chaining enabled.
-         *
-         * @param value The value to wrap.
-         * @return Returns the new lodash wrapper instance.
-         */
-        chain(value: number): LoDashExplicitWrapper<number>;
-        chain(value: string): LoDashExplicitWrapper<string>;
-        chain(value: boolean): LoDashExplicitWrapper<boolean>;
-        chain<T>(value: T[]): LoDashExplicitArrayWrapper<T>;
-        chain<T extends {}>(value: T): LoDashExplicitObjectWrapper<T>;
-        chain(value: any): LoDashExplicitWrapper<any>;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.chain
-         */
-        chain(): LoDashExplicitWrapper<T>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.chain
-         */
-        chain(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.chain
-         */
-        chain(): LoDashExplicitObjectWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.chain
-         */
-        chain(): TWrapper;
-    }
-
-    //_.tap
-    interface LoDashStatic {
-        /**
-         * This method invokes interceptor and returns value. The interceptor is bound to thisArg and invoked with one
-         * argument; (value). The purpose of this method is to "tap into" a method chain in order to perform operations
-         * on intermediate results within the chain.
-         *
-         * @param value The value to provide to interceptor.
-         * @param interceptor The function to invoke.
-         * @parem thisArg The this binding of interceptor.
-         * @return Returns value.
-         **/
-        tap<T>(
-            value: T,
-            interceptor: (value: T) => void,
-            thisArg?: any
-        ): T;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.tap
-         */
-        tap(
-            interceptor: (value: T) => void,
-            thisArg?: any
-        ): TWrapper;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.tap
-         */
-        tap(
-            interceptor: (value: T) => void,
-            thisArg?: any
-        ): TWrapper;
-    }
-
-    //_.thru
-    interface LoDashStatic {
-        /**
-         * This method is like _.tap except that it returns the result of interceptor.
-         *
-         * @param value The value to provide to interceptor.
-         * @param interceptor The function to invoke.
-         * @param thisArg The this binding of interceptor.
-         * @return Returns the result of interceptor.
-         */
-        thru<T, TResult>(
-            value: T,
-            interceptor: (value: T) => TResult,
-            thisArg?: any
-        ): TResult;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.thru
-         */
-        thru<TResult extends number>(
-            interceptor: (value: T) => TResult,
-            thisArg?: any): LoDashImplicitWrapper<TResult>;
-
-        /**
-         * @see _.thru
-         */
-        thru<TResult extends string>(
-            interceptor: (value: T) => TResult,
-            thisArg?: any): LoDashImplicitWrapper<TResult>;
-
-        /**
-         * @see _.thru
-         */
-        thru<TResult extends boolean>(
-            interceptor: (value: T) => TResult,
-            thisArg?: any): LoDashImplicitWrapper<TResult>;
-
-        /**
-         * @see _.thru
-         */
-        thru<TResult extends {}>(
-            interceptor: (value: T) => TResult,
-            thisArg?: any): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.thru
-         */
-        thru<TResult>(
-            interceptor: (value: T) => TResult[],
-            thisArg?: any): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.thru
-         */
-        thru<TResult extends number>(
-            interceptor: (value: T) => TResult,
-            thisArg?: any
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-         * @see _.thru
-         */
-        thru<TResult extends string>(
-            interceptor: (value: T) => TResult,
-            thisArg?: any
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-         * @see _.thru
-         */
-        thru<TResult extends boolean>(
-            interceptor: (value: T) => TResult,
-            thisArg?: any
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-         * @see _.thru
-         */
-        thru<TResult extends {}>(
-            interceptor: (value: T) => TResult,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.thru
-         */
-        thru<TResult>(
-            interceptor: (value: T) => TResult[],
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    //_.prototype.commit
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * Executes the chained sequence and returns the wrapped result.
-         *
-         * @return Returns the new lodash wrapper instance.
-         */
-        commit(): TWrapper;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.commit
-         */
-        commit(): TWrapper;
-    }
-
-    //_.prototype.concat
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * Creates a new array joining a wrapped array with any additional arrays and/or values.
-         *
-         * @param items
-         * @return Returns the new concatenated array.
-         */
-        concat<TItem>(...items: Array<TItem|Array<TItem>>): LoDashImplicitArrayWrapper<TItem>;
-
-        /**
-         * @see _.concat
-         */
-        concat(...items: Array<T|Array<T>>): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.concat
-         */
-        concat<TItem>(...items: Array<TItem|Array<TItem>>): LoDashExplicitArrayWrapper<TItem>;
-
-        /**
-         * @see _.concat
-         */
-        concat(...items: Array<T|Array<T>>): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.prototype.plant
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * Creates a clone of the chained sequence planting value as the wrapped value.
-         * @param value The value to plant as the wrapped value.
-         * @return Returns the new lodash wrapper instance.
-         */
-        plant(value: number): LoDashImplicitWrapper<number>;
-
-        /**
-         * @see _.plant
-         */
-        plant(value: string): LoDashImplicitStringWrapper;
-
-        /**
-         * @see _.plant
-         */
-        plant(value: boolean): LoDashImplicitWrapper<boolean>;
-
-        /**
-         * @see _.plant
-         */
-        plant(value: number[]): LoDashImplicitNumberArrayWrapper;
-
-        /**
-         * @see _.plant
-         */
-        plant<T>(value: T[]): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.plant
-         */
-        plant<T extends {}>(value: T): LoDashImplicitObjectWrapper<T>;
-
-        /**
-         * @see _.plant
-         */
-        plant(value: any): LoDashImplicitWrapper<any>;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.plant
-         */
-        plant(value: number): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.plant
-         */
-        plant(value: string): LoDashExplicitStringWrapper;
-
-        /**
-         * @see _.plant
-         */
-        plant(value: boolean): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.plant
-         */
-        plant(value: number[]): LoDashExplicitNumberArrayWrapper;
-
-        /**
-         * @see _.plant
-         */
-        plant<T>(value: T[]): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.plant
-         */
-        plant<T extends {}>(value: T): LoDashExplicitObjectWrapper<T>;
-
-        /**
-         * @see _.plant
-         */
-        plant(value: any): LoDashExplicitWrapper<any>;
-    }
-
-    //_.prototype.reverse
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * Reverses the wrapped array so the first element becomes the last, the second element becomes the second to
-         * last, and so on.
-         *
-         * Note: This method mutates the wrapped array.
-         *
-         * @return Returns the new reversed lodash wrapper instance.
-         */
-        reverse(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.reverse
-         */
-        reverse(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.prototype.toJSON
-    interface LoDashWrapperBase<T, TWrapper> {
-        /**
-         * @see _.value
-         */
-        toJSON(): T;
-    }
-
-    //_.prototype.toString
-    interface LoDashWrapperBase<T, TWrapper> {
-        /**
-         * Produces the result of coercing the unwrapped value to a string.
-         *
-         * @return Returns the coerced string value.
-         */
-        toString(): string;
-    }
-
-    //_.prototype.value
-    interface LoDashWrapperBase<T, TWrapper> {
-        /**
-         * Executes the chained sequence to extract the unwrapped value.
-         *
-         * @alias _.toJSON, _.valueOf
-         *
-         * @return Returns the resolved unwrapped value.
-         */
-        value(): T;
-    }
-
-    //_.valueOf
-    interface LoDashWrapperBase<T, TWrapper> {
-        /**
-         * @see _.value
-         */
-        valueOf(): T;
-    }
-
-    /**************
-     * Collection *
-     **************/
-
-    //_.at
-    interface LoDashStatic {
-        /**
-         * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-         * specified as individual arguments or as arrays of keys.
-         *
-         * @param collection The collection to iterate over.
-         * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-         * @return Returns the new array of picked elements.
-         */
-        at<T>(
-            collection: List<T>|Dictionary<T>,
-            ...props: (number|string|(number|string)[])[]
-        ): T[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.at
-         */
-        at(...props: (number|string|(number|string)[])[]): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.at
-         */
-        at<T>(...props: (number|string|(number|string)[])[]): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.at
-         */
-        at(...props: (number|string|(number|string)[])[]): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.at
-         */
-        at<T>(...props: (number|string|(number|string)[])[]): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.countBy
-    interface LoDashStatic {
-        /**
-         * Creates an object composed of keys generated from the results of running each element of collection through
-         * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
-         * iteratee is bound to thisArg and invoked with three arguments:
-         * (value, index|key, collection).
-         *
-         * If a property name is provided for iteratee the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param collection The collection to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @param thisArg The this binding of iteratee.
-         * @return Returns the composed aggregate object.
-         */
-        countBy<T>(
-            collection: List<T>,
-            iteratee?: ListIterator<T, any>,
-            thisArg?: any
-        ): Dictionary<number>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            collection: Dictionary<T>,
-            iteratee?: DictionaryIterator<T, any>,
-            thisArg?: any
-        ): Dictionary<number>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            collection: NumericDictionary<T>,
-            iteratee?: NumericDictionaryIterator<T, any>,
-            thisArg?: any
-        ): Dictionary<number>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
-            iteratee?: string,
-            thisArg?: any
-        ): Dictionary<number>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<W, T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
-            iteratee?: W
-        ): Dictionary<number>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
-            iteratee?: Object
-        ): Dictionary<number>;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.countBy
-         */
-        countBy(
-            iteratee?: ListIterator<T, any>,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<Dictionary<number>>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.countBy
-         */
-        countBy(
-            iteratee?: ListIterator<T, any>,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy(
-            iteratee?: string,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<W>(
-            iteratee?: W
-        ): LoDashImplicitObjectWrapper<Dictionary<number>>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            iteratee?: ListIterator<T, any>|DictionaryIterator<T, any>|NumericDictionaryIterator<T, any>,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy(
-            iteratee?: string,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<W>(
-            iteratee?: W
-        ): LoDashImplicitObjectWrapper<Dictionary<number>>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.countBy
-         */
-        countBy(
-            iteratee?: ListIterator<T, any>,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<Dictionary<number>>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.countBy
-         */
-        countBy(
-            iteratee?: ListIterator<T, any>,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy(
-            iteratee?: string,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<W>(
-            iteratee?: W
-        ): LoDashExplicitObjectWrapper<Dictionary<number>>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            iteratee?: ListIterator<T, any>|DictionaryIterator<T, any>|NumericDictionaryIterator<T, any>,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy(
-            iteratee?: string,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<W>(
-            iteratee?: W
-        ): LoDashExplicitObjectWrapper<Dictionary<number>>;
-    }
-
-    //_.each
-    interface LoDashStatic {
-        /**
-         * @see _.forEach
-         */
-        each<T>(
-            collection: T[],
-            iteratee?: ListIterator<T, any>,
-            thisArg?: any
-        ): T[];
-
-        /**
-         * @see _.forEach
-         */
-        each<T>(
-            collection: List<T>,
-            iteratee?: ListIterator<T, any>,
-            thisArg?: any
-        ): List<T>;
-
-        /**
-         * @see _.forEach
-         */
-        each<T>(
-            collection: Dictionary<T>,
-            iteratee?: DictionaryIterator<T, any>,
-            thisArg?: any
-        ): Dictionary<T>;
-
-        /**
-         * @see _.forEach
-         */
-        each<T extends {}>(
-            collection: T,
-            iteratee?: ObjectIterator<any, any>,
-            thisArgs?: any
-        ): T;
-
-        /**
-         * @see _.forEach
-         */
-        each<T extends {}, TValue>(
-            collection: T,
-            iteratee?: ObjectIterator<TValue, any>,
-            thisArgs?: any
-        ): T;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.forEach
-         */
-        each(
-            iteratee: ListIterator<string, any>,
-            thisArg?: any
-        ): LoDashImplicitWrapper<string>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.forEach
-         */
-        each(
-            iteratee: ListIterator<T, any>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.forEach
-         */
-        each<TValue>(
-            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.forEach
-         */
-        each(
-            iteratee: ListIterator<string, any>,
-            thisArg?: any
-        ): LoDashExplicitWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.forEach
-         */
-        each(
-            iteratee: ListIterator<T, any>,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.forEach
-         */
-        each<TValue>(
-            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<T>;
-    }
-
-    //_.eachRight
-    interface LoDashStatic {
-        /**
-         * @see _.forEachRight
-         */
-        eachRight<T>(
-            collection: T[],
-            iteratee?: ListIterator<T, any>,
-            thisArg?: any
-        ): T[];
-
-        /**
-         * @see _.forEachRight
-         */
-        eachRight<T>(
-            collection: List<T>,
-            iteratee?: ListIterator<T, any>,
-            thisArg?: any
-        ): List<T>;
-
-        /**
-         * @see _.forEachRight
-         */
-        eachRight<T>(
-            collection: Dictionary<T>,
-            iteratee?: DictionaryIterator<T, any>,
-            thisArg?: any
-        ): Dictionary<T>;
-
-        /**
-         * @see _.forEachRight
-         */
-        eachRight<T extends {}>(
-            collection: T,
-            iteratee?: ObjectIterator<any, any>,
-            thisArgs?: any
-        ): T;
-
-        /**
-         * @see _.forEachRight
-         */
-        eachRight<T extends {}, TValue>(
-            collection: T,
-            iteratee?: ObjectIterator<TValue, any>,
-            thisArgs?: any
-        ): T;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.forEachRight
-         */
-        eachRight(
-            iteratee: ListIterator<string, any>,
-            thisArg?: any
-        ): LoDashImplicitWrapper<string>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.forEachRight
-         */
-        eachRight(
-            iteratee: ListIterator<T, any>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.forEachRight
-         */
-        eachRight<TValue>(
-            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.forEachRight
-         */
-        eachRight(
-            iteratee: ListIterator<string, any>,
-            thisArg?: any
-        ): LoDashExplicitWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.forEachRight
-         */
-        eachRight(
-            iteratee: ListIterator<T, any>,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.forEachRight
-         */
-        eachRight<TValue>(
-            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<T>;
-    }
-
-    //_.every
-    interface LoDashStatic {
-        /**
-         * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
-         * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
-         *
-         * @param collection The collection to iterate over.
-         * @param predicate The function invoked per iteration.
-         * @return Returns true if all elements pass the predicate check, else false.
-         */
-        every<T>(
-            collection: List<T>,
-            predicate?: ListIterator<T, boolean>
-        ): boolean;
-
-        /**
-         * @see _.every
-         */
-        every<T>(
-            collection: Dictionary<T>,
-            predicate?: DictionaryIterator<T, boolean>
-        ): boolean;
-
-        /**
-         * @see _.every
-         */
-        every<T>(
-            collection: NumericDictionary<T>,
-            predicate?: NumericDictionaryIterator<T, boolean>
-        ): boolean;
-
-        /**
-         * @see _.every
-         */
-        every<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
-            predicate?: string|any[]
-        ): boolean;
-
-        /**
-         * @see _.every
-         */
-        every<TObject extends {}, T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
-            predicate?: TObject
-        ): boolean;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.every
-         */
-        every(
-            predicate?: ListIterator<T, boolean>|NumericDictionaryIterator<T, boolean>
-        ): boolean;
-
-        /**
-         * @see _.every
-         */
-        every(
-            predicate?: string|any[]
-        ): boolean;
-
-        /**
-         * @see _.every
-         */
-        every<TObject extends {}>(
-            predicate?: TObject
-        ): boolean;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.every
-         */
-        every<TResult>(
-            predicate?: ListIterator<TResult, boolean>|DictionaryIterator<TResult, boolean>|NumericDictionaryIterator<T, boolean>
-        ): boolean;
-
-        /**
-         * @see _.every
-         */
-        every(
-            predicate?: string|any[]
-        ): boolean;
-
-        /**
-         * @see _.every
-         */
-        every<TObject extends {}>(
-            predicate?: TObject
-        ): boolean;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.every
-         */
-        every(
-            predicate?: ListIterator<T, boolean>|NumericDictionaryIterator<T, boolean>
-        ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.every
-         */
-        every(
-            predicate?: string|any[]
-        ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.every
-         */
-        every<TObject extends {}>(
-            predicate?: TObject
-        ): LoDashExplicitWrapper<boolean>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.every
-         */
-        every<TResult>(
-            predicate?: ListIterator<TResult, boolean>|DictionaryIterator<TResult, boolean>|NumericDictionaryIterator<T, boolean>
-        ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.every
-         */
-        every(
-            predicate?: string|any[]
-        ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.every
-         */
-        every<TObject extends {}>(
-            predicate?: TObject
-        ): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.filter
-    interface LoDashStatic {
-        /**
-         * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
-         * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-         *
-         * If a property name is provided for predicate the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for predicate the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param collection The collection to iterate over.
-         * @param predicate The function invoked per iteration.
-         * @param thisArg The this binding of predicate.
-         * @return Returns the new filtered array.
-         */
-        filter<T>(
-            collection: List<T>,
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): T[];
-
-        /**
-         * @see _.filter
-         */
-        filter<T>(
-            collection: Dictionary<T>,
-            predicate?: DictionaryIterator<T, boolean>,
-            thisArg?: any
-        ): T[];
-
-        /**
-         * @see _.filter
-         */
-        filter(
-            collection: string,
-            predicate?: StringIterator<boolean>,
-            thisArg?: any
-        ): string[];
-
-        /**
-         * @see _.filter
-         */
-        filter<T>(
-            collection: List<T>|Dictionary<T>,
-            predicate: string,
-            thisArg?: any
-        ): T[];
-
-        /**
-         * @see _.filter
-         */
-        filter<W extends {}, T>(
-            collection: List<T>|Dictionary<T>,
-            predicate: W
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.filter
-         */
-        filter(
-            predicate?: StringIterator<boolean>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<string>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.filter
-         */
-        filter(
-            predicate: ListIterator<T, boolean>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.filter
-         */
-        filter(
-            predicate: string,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.filter
-         */
-        filter<W>(predicate: W): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.filter
-         */
-        filter<T>(
-            predicate: ListIterator<T, boolean>|DictionaryIterator<T, boolean>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.filter
-         */
-        filter<T>(
-            predicate: string,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.filter
-         */
-        filter<W, T>(predicate: W): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.filter
-         */
-        filter(
-            predicate?: StringIterator<boolean>,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.filter
-         */
-        filter(
-            predicate: ListIterator<T, boolean>,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.filter
-         */
-        filter(
-            predicate: string,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.filter
-         */
-        filter<W>(predicate: W): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.filter
-         */
-        filter<T>(
-            predicate: ListIterator<T, boolean>|DictionaryIterator<T, boolean>,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.filter
-         */
-        filter<T>(
-            predicate: string,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.filter
-         */
-        filter<W, T>(predicate: W): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.find
-    interface LoDashStatic {
-        /**
-         * Iterates over elements of collection, returning the first element predicate returns truthy for.
-         * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-         *
-         * If a property name is provided for predicate the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for predicate the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param collection The collection to search.
-         * @param predicate The function invoked per iteration.
-         * @param thisArg The this binding of predicate.
-         * @return Returns the matched element, else undefined.
-         */
-        find<T>(
-            collection: List<T>,
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): T;
-
-        /**
-         * @see _.find
-         */
-        find<T>(
-            collection: Dictionary<T>,
-            predicate?: DictionaryIterator<T, boolean>,
-            thisArg?: any
-        ): T;
-
-        /**
-         * @see _.find
-         */
-        find<T>(
-            collection: List<T>|Dictionary<T>,
-            predicate?: string,
-            thisArg?: any
-        ): T;
-
-        /**
-         * @see _.find
-         */
-        find<TObject extends {}, T>(
-            collection: List<T>|Dictionary<T>,
-            predicate?: TObject
-        ): T;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.find
-         */
-        find(
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): T;
-
-        /**
-         * @see _.find
-         */
-        find(
-            predicate?: string,
-            thisArg?: any
-        ): T;
-
-        /**
-         * @see _.find
-         */
-        find<TObject extends {}>(
-            predicate?: TObject
-        ): T;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.find
-         */
-        find<TResult>(
-            predicate?: ListIterator<TResult, boolean>|DictionaryIterator<TResult, boolean>,
-            thisArg?: any
-        ): TResult;
-
-        /**
-         * @see _.find
-         */
-        find<TResult>(
-            predicate?: string,
-            thisArg?: any
-        ): TResult;
-
-        /**
-         * @see _.find
-         */
-        find<TObject extends {}, TResult>(
-            predicate?: TObject
-        ): TResult;
-    }
-
-    //_.findLast
-    interface LoDashStatic {
-        /**
-        * This method is like _.find except that it iterates over elements of a collection from
-        * right to left.
-        * @param collection Searches for a value in this list.
-        * @param callback The function called per iteration.
-        * @param thisArg The this binding of callback.
-        * @return The found element, else undefined.
-        **/
-        findLast<T>(
-            collection: Array<T>,
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): T;
-
-        /**
-        * @see _.find
-        **/
-        findLast<T>(
-            collection: List<T>,
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): T;
-
-        /**
-        * @see _.find
-        **/
-        findLast<T>(
-            collection: Dictionary<T>,
-            callback: DictionaryIterator<T, boolean>,
-            thisArg?: any): T;
-
-        /**
-        * @see _.find
-        * @param _.pluck style callback
-        **/
-        findLast<W, T>(
-            collection: Array<T>,
-            whereValue: W): T;
-
-        /**
-        * @see _.find
-        * @param _.pluck style callback
-        **/
-        findLast<W, T>(
-            collection: List<T>,
-            whereValue: W): T;
-
-        /**
-        * @see _.find
-        * @param _.pluck style callback
-        **/
-        findLast<W, T>(
-            collection: Dictionary<T>,
-            whereValue: W): T;
-
-        /**
-        * @see _.find
-        * @param _.where style callback
-        **/
-        findLast<T>(
-            collection: Array<T>,
-            pluckValue: string): T;
-
-        /**
-        * @see _.find
-        * @param _.where style callback
-        **/
-        findLast<T>(
-            collection: List<T>,
-            pluckValue: string): T;
-
-        /**
-        * @see _.find
-        * @param _.where style callback
-        **/
-        findLast<T>(
-            collection: Dictionary<T>,
-            pluckValue: string): T;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-        * @see _.findLast
-        */
-        findLast(
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): T;
-        /**
-        * @see _.findLast
-        * @param _.where style callback
-        */
-        findLast<W>(
-            whereValue: W): T;
-
-        /**
-        * @see _.findLast
-        * @param _.where style callback
-        */
-        findLast(
-            pluckValue: string): T;
-    }
-
-    //_.flatMap
-    interface LoDashStatic {
-        /**
-         * Creates an array of flattened values by running each element in collection through iteratee
-         * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
-         * (value, index|key, collection).
-         *
-         * @param collection The collection to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @return Returns the new flattened array.
-         */
-        flatMap<T, TResult>(
-            collection: List<T>,
-            iteratee?: ListIterator<T, TResult|TResult[]>
-        ): TResult[];
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TResult>(
-            collection: List<any>,
-            iteratee?: ListIterator<any, TResult|TResult[]>
-        ): TResult[];
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T, TResult>(
-            collection: Dictionary<T>,
-            iteratee?: DictionaryIterator<T, TResult|TResult[]>
-        ): TResult[];
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TResult>(
-            collection: Dictionary<any>,
-            iteratee?: DictionaryIterator<any, TResult|TResult[]>
-        ): TResult[];
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T, TResult>(
-            collection: NumericDictionary<T>,
-            iteratee?: NumericDictionaryIterator<T, TResult|TResult[]>
-        ): TResult[];
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TResult>(
-            collection: NumericDictionary<any>,
-            iteratee?: NumericDictionaryIterator<any, TResult|TResult[]>
-        ): TResult[];
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TObject extends Object, TResult>(
-            collection: TObject,
-            iteratee?: ObjectIterator<any, TResult|TResult[]>
-        ): TResult[];
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TResult>(
-            collection: Object,
-            iteratee?: ObjectIterator<any, TResult|TResult[]>
-        ): TResult[];
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TWhere extends Object, TObject extends Object>(
-            collection: TObject,
-            iteratee: TWhere
-        ): boolean[];
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TObject extends Object, TResult>(
-            collection: TObject,
-            iteratee: Object|string
-        ): TResult[];
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TObject extends Object>(
-            collection: TObject,
-            iteratee: [string, any]
-        ): boolean[];
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TResult>(
-            collection: string
-        ): string[];
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TResult>(
-            collection: Object,
-            iteratee?: Object|string
-        ): TResult[];
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TResult>(
-            iteratee: ListIterator<string, TResult|TResult[]>
-        ): LoDashImplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap(): LoDashImplicitArrayWrapper<string>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TResult>(
-            iteratee: ListIterator<T, TResult|TResult[]>|string
-        ): LoDashImplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TWhere extends Object>(
-            iteratee: TWhere
-        ): LoDashImplicitArrayWrapper<boolean>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap(
-            iteratee: [string, any]
-        ): LoDashImplicitArrayWrapper<boolean>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TResult>(): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T, TResult>(
-            iteratee: ListIterator<T, TResult|TResult[]>|DictionaryIterator<T, TResult|TResult[]>|NumericDictionaryIterator<T, TResult|TResult[]>
-        ): LoDashImplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TResult>(
-            iteratee: ObjectIterator<any, TResult|TResult[]>|string
-        ): LoDashImplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TWhere extends Object>(
-            iteratee: TWhere
-        ): LoDashImplicitArrayWrapper<boolean>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap(
-            iteratee: [string, any]
-        ): LoDashImplicitArrayWrapper<boolean>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TResult>(): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TResult>(
-            iteratee: ListIterator<string, TResult|TResult[]>
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap(): LoDashExplicitArrayWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TResult>(
-            iteratee: ListIterator<T, TResult|TResult[]>|string
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TWhere extends Object>(
-            iteratee: TWhere
-        ): LoDashExplicitArrayWrapper<boolean>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap(
-            iteratee: [string, any]
-        ): LoDashExplicitArrayWrapper<boolean>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TResult>(): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T, TResult>(
-            iteratee: ListIterator<T, TResult|TResult[]>|DictionaryIterator<T, TResult|TResult[]>|NumericDictionaryIterator<T, TResult|TResult[]>
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TResult>(
-            iteratee: ObjectIterator<any, TResult|TResult[]>|string
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TWhere extends Object>(
-            iteratee: TWhere
-        ): LoDashExplicitArrayWrapper<boolean>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap(
-            iteratee: [string, any]
-        ): LoDashExplicitArrayWrapper<boolean>;
-
-        /**
-         * @see _.flatMap
-         */
-        flatMap<TResult>(): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    //_.forEach
-    interface LoDashStatic {
-        /**
-         * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-         * and invoked with three arguments:
-         * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-         *
-         * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-         * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-         *
-         * @alias _.each
-         *
-         * @param collection The collection to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @param thisArg The this binding of iteratee.
-         */
-        forEach<T>(
-            collection: T[],
-            iteratee?: ListIterator<T, any>,
-            thisArg?: any
-        ): T[];
-
-        /**
-         * @see _.forEach
-         */
-        forEach<T>(
-            collection: List<T>,
-            iteratee?: ListIterator<T, any>,
-            thisArg?: any
-        ): List<T>;
-
-        /**
-         * @see _.forEach
-         */
-        forEach<T>(
-            collection: Dictionary<T>,
-            iteratee?: DictionaryIterator<T, any>,
-            thisArg?: any
-        ): Dictionary<T>;
-
-        /**
-         * @see _.forEach
-         */
-        forEach<T extends {}>(
-            collection: T,
-            iteratee?: ObjectIterator<any, any>,
-            thisArgs?: any
-        ): T;
-
-        /**
-         * @see _.forEach
-         */
-        forEach<T extends {}, TValue>(
-            collection: T,
-            iteratee?: ObjectIterator<TValue, any>,
-            thisArgs?: any
-        ): T;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.forEach
-         */
-        forEach(
-            iteratee: ListIterator<string, any>,
-            thisArg?: any
-        ): LoDashImplicitWrapper<string>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.forEach
-         */
-        forEach(
-            iteratee: ListIterator<T, any>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.forEach
-         */
-        forEach<TValue>(
-            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.forEach
-         */
-        forEach(
-            iteratee: ListIterator<string, any>,
-            thisArg?: any
-        ): LoDashExplicitWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.forEach
-         */
-        forEach(
-            iteratee: ListIterator<T, any>,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.forEach
-         */
-        forEach<TValue>(
-            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<T>;
-    }
-
-    //_.forEachRight
-    interface LoDashStatic {
-        /**
-         * This method is like _.forEach except that it iterates over elements of collection from right to left.
-         *
-         * @alias _.eachRight
-         *
-         * @param collection The collection to iterate over.
-         * @param iteratee The function called per iteration.
-         * @param thisArg The this binding of callback.
-         */
-        forEachRight<T>(
-            collection: T[],
-            iteratee?: ListIterator<T, any>,
-            thisArg?: any
-        ): T[];
-
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight<T>(
-            collection: List<T>,
-            iteratee?: ListIterator<T, any>,
-            thisArg?: any
-        ): List<T>;
-
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight<T>(
-            collection: Dictionary<T>,
-            iteratee?: DictionaryIterator<T, any>,
-            thisArg?: any
-        ): Dictionary<T>;
-
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight<T extends {}>(
-            collection: T,
-            iteratee?: ObjectIterator<any, any>,
-            thisArgs?: any
-        ): T;
-
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight<T extends {}, TValue>(
-            collection: T,
-            iteratee?: ObjectIterator<TValue, any>,
-            thisArgs?: any
-        ): T;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight(
-            iteratee: ListIterator<string, any>,
-            thisArg?: any
-        ): LoDashImplicitWrapper<string>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight(
-            iteratee: ListIterator<T, any>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight<TValue>(
-            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight(
-            iteratee: ListIterator<string, any>,
-            thisArg?: any
-        ): LoDashExplicitWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight(
-            iteratee: ListIterator<T, any>,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.forEachRight
-         */
-        forEachRight<TValue>(
-            iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<T>;
-    }
-
-    //_.groupBy
-    interface LoDashStatic {
-        /**
-         * Creates an object composed of keys generated from the results of running each element of collection through
-         * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
-         * key. The iteratee is bound to thisArg and invoked with three arguments:
-         * (value, index|key, collection).
-         *
-         * If a property name is provided for iteratee the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param collection The collection to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @param thisArg The this binding of iteratee.
-         * @return Returns the composed aggregate object.
-         */
-        groupBy<T, TKey>(
-            collection: List<T>,
-            iteratee?: ListIterator<T, TKey>,
-            thisArg?: any
-        ): Dictionary<T[]>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            collection: List<any>,
-            iteratee?: ListIterator<T, any>,
-            thisArg?: any
-        ): Dictionary<T[]>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T, TKey>(
-            collection: Dictionary<T>,
-            iteratee?: DictionaryIterator<T, TKey>,
-            thisArg?: any
-        ): Dictionary<T[]>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            collection: Dictionary<any>,
-            iteratee?: DictionaryIterator<T, any>,
-            thisArg?: any
-        ): Dictionary<T[]>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T, TValue>(
-            collection: List<T>|Dictionary<T>,
-            iteratee?: string,
-            thisArg?: TValue
-        ): Dictionary<T[]>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            collection: List<T>|Dictionary<T>,
-            iteratee?: string,
-            thisArg?: any
-        ): Dictionary<T[]>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<TWhere, T>(
-            collection: List<T>|Dictionary<T>,
-            iteratee?: TWhere
-        ): Dictionary<T[]>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            collection: List<T>|Dictionary<T>,
-            iteratee?: Object
-        ): Dictionary<T[]>;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.groupBy
-         */
-        groupBy<TKey>(
-            iteratee?: ListIterator<T, TKey>,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.groupBy
-         */
-        groupBy<TKey>(
-            iteratee?: ListIterator<T, TKey>,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<TValue>(
-            iteratee?: string,
-            thisArg?: TValue
-        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<TWhere>(
-            iteratee?: TWhere
-        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T, TKey>(
-            iteratee?: ListIterator<T, TKey>|DictionaryIterator<T, TKey>,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            iteratee?: ListIterator<T, any>|DictionaryIterator<T, any>,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T, TValue>(
-            iteratee?: string,
-            thisArg?: TValue
-        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            iteratee?: string,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<TWhere, T>(
-            iteratee?: TWhere
-        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            iteratee?: Object
-        ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.groupBy
-         */
-        groupBy<TKey>(
-            iteratee?: ListIterator<T, TKey>,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.groupBy
-         */
-        groupBy<TKey>(
-            iteratee?: ListIterator<T, TKey>,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<TValue>(
-            iteratee?: string,
-            thisArg?: TValue
-        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<TWhere>(
-            iteratee?: TWhere
-        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T, TKey>(
-            iteratee?: ListIterator<T, TKey>|DictionaryIterator<T, TKey>,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            iteratee?: ListIterator<T, any>|DictionaryIterator<T, any>,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T, TValue>(
-            iteratee?: string,
-            thisArg?: TValue
-        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            iteratee?: string,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<TWhere, T>(
-            iteratee?: TWhere
-        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            iteratee?: Object
-        ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
-    }
-
-    //_.includes
-    interface LoDashStatic {
-        /**
-         * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
-         * it’s used as the offset from the end of collection.
-         *
-         * @param collection The collection to search.
-         * @param target The value to search for.
-         * @param fromIndex The index to search from.
-         * @return True if the target element is found, else false.
-         */
-        includes<T>(
-            collection: List<T>|Dictionary<T>,
-            target: T,
-            fromIndex?: number
-        ): boolean;
-
-        /**
-         * @see _.includes
-         */
-        includes(
-            collection: string,
-            target: string,
-            fromIndex?: number
-        ): boolean;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.includes
-         */
-        includes(
-            target: T,
-            fromIndex?: number
-        ): boolean;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.includes
-         */
-        includes<TValue>(
-            target: TValue,
-            fromIndex?: number
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.includes
-         */
-        includes(
-            target: string,
-            fromIndex?: number
-        ): boolean;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.includes
-         */
-        includes(
-            target: T,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<boolean>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.includes
-         */
-        includes<TValue>(
-            target: TValue,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<boolean>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.includes
-         */
-        includes(
-            target: string,
-            fromIndex?: number
-        ): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.keyBy
-    interface LoDashStatic {
-        /**
-         * Creates an object composed of keys generated from the results of running each element of collection through
-         * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
-         * iteratee function is bound to thisArg and invoked with three arguments:
-         * (value, index|key, collection).
-         *
-         * If a property name is provided for iteratee the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param collection The collection to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @param thisArg The this binding of iteratee.
-         * @return Returns the composed aggregate object.
-         */
-        keyBy<T>(
-            collection: List<T>,
-            iteratee?: ListIterator<T, any>,
-            thisArg?: any
-        ): Dictionary<T>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            collection: NumericDictionary<T>,
-            iteratee?: NumericDictionaryIterator<T, any>,
-            thisArg?: any
-        ): Dictionary<T>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            collection: Dictionary<T>,
-            iteratee?: DictionaryIterator<T, any>,
-            thisArg?: any
-        ): Dictionary<T>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            collection: List<T>|NumericDictionary<T>|Dictionary<T>,
-            iteratee?: string,
-            thisArg?: any
-        ): Dictionary<T>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<W extends Object, T>(
-            collection: List<T>|NumericDictionary<T>|Dictionary<T>,
-            iteratee?: W
-        ): Dictionary<T>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            collection: List<T>|NumericDictionary<T>|Dictionary<T>,
-            iteratee?: Object
-        ): Dictionary<T>;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.keyBy
-         */
-        keyBy(
-            iteratee?: ListIterator<T, any>,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.keyBy
-         */
-        keyBy(
-            iteratee?: ListIterator<T, any>,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy(
-            iteratee?: string,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<W extends Object>(
-            iteratee?: W
-        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            iteratee?: ListIterator<T, any>|NumericDictionaryIterator<T, any>|DictionaryIterator<T, any>,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            iteratee?: string,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<W extends Object, T>(
-            iteratee?: W
-        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            iteratee?: Object
-        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.keyBy
-         */
-        keyBy(
-            iteratee?: ListIterator<T, any>,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.keyBy
-         */
-        keyBy(
-            iteratee?: ListIterator<T, any>,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy(
-            iteratee?: string,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<W extends Object>(
-            iteratee?: W
-        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            iteratee?: ListIterator<T, any>|NumericDictionaryIterator<T, any>|DictionaryIterator<T, any>,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            iteratee?: string,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<W extends Object, T>(
-            iteratee?: W
-        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            iteratee?: Object
-        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
-    }
-
-    //_.invoke
-    interface LoDashStatic {
-        /**
-        * Invokes the method at path of object.
-        * @param object The object to query.
-        * @param path The path of the method to invoke.
-        * @param args The arguments to invoke the method with.
-        **/
-        invoke<TObject extends Object, TResult>(
-            object: TObject,
-            path: StringRepresentable|StringRepresentable[],
-            ...args: any[]): TResult;
-
-        /**
-        * @see _.invoke
-        **/
-        invoke<TValue, TResult>(
-            object: Dictionary<TValue>|TValue[],
-            path: StringRepresentable|StringRepresentable[],
-            ...args: any[]): TResult;
-
-        /**
-        * @see _.invoke
-        **/
-        invoke<TResult>(
-            object: any,
-            path: StringRepresentable|StringRepresentable[],
-            ...args: any[]): TResult;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-        * @see _.invoke
-        **/
-        invoke<TResult>(
-            path: StringRepresentable|StringRepresentable[],
-            ...args: any[]): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-        * @see _.invoke
-        **/
-        invoke<TResult>(
-            path: StringRepresentable|StringRepresentable[],
-            ...args: any[]): TResult;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-        * @see _.invoke
-        **/
-        invoke<TResult>(
-            path: StringRepresentable|StringRepresentable[],
-            ...args: any[]): TResult;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-        * @see _.invoke
-        **/
-        invoke<TResult>(
-            path: StringRepresentable|StringRepresentable[],
-            ...args: any[]): TResult;
-    }
-
-    //_.invokeMap
-    interface LoDashStatic {
-        /**
-        * Invokes the method named by methodName on each element in the collection returning
-        * an array of the results of each invoked method. Additional arguments will be provided
-        * to each invoked method. If methodName is a function it will be invoked for, and this
-        * bound to, each element in the collection.
-        * @param collection The collection to iterate over.
-        * @param methodName The name of the method to invoke.
-        * @param args Arguments to invoke the method with.
-        **/
-        invokeMap<TValue extends {}, TResult>(
-            collection: TValue[],
-            methodName: string,
-            ...args: any[]): TResult[];
-
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TValue extends {}, TResult>(
-            collection: Dictionary<TValue>,
-            methodName: string,
-            ...args: any[]): TResult[];
-
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TResult>(
-            collection: {}[],
-            methodName: string,
-            ...args: any[]): TResult[];
-
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TResult>(
-            collection: Dictionary<{}>,
-            methodName: string,
-            ...args: any[]): TResult[];
-
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TValue extends {}, TResult>(
-            collection: TValue[],
-            method: (...args: any[]) => TResult,
-            ...args: any[]): TResult[];
-
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TValue extends {}, TResult>(
-            collection: Dictionary<TValue>,
-            method: (...args: any[]) => TResult,
-            ...args: any[]): TResult[];
-
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TResult>(
-            collection: {}[],
-            method: (...args: any[]) => TResult,
-            ...args: any[]): TResult[];
-
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TResult>(
-            collection: Dictionary<{}>,
-            method: (...args: any[]) => TResult,
-            ...args: any[]): TResult[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TResult>(
-            methodName: string,
-            ...args: any[]): LoDashImplicitArrayWrapper<TResult>;
-
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TResult>(
-            method: (...args: any[]) => TResult,
-            ...args: any[]): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TResult>(
-            methodName: string,
-            ...args: any[]): LoDashImplicitArrayWrapper<TResult>;
-
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TResult>(
-            method: (...args: any[]) => TResult,
-            ...args: any[]): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TResult>(
-            methodName: string,
-            ...args: any[]): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TResult>(
-            method: (...args: any[]) => TResult,
-            ...args: any[]): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TResult>(
-            methodName: string,
-            ...args: any[]): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-        * @see _.invokeMap
-        **/
-        invokeMap<TResult>(
-            method: (...args: any[]) => TResult,
-            ...args: any[]): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    //_.map
-    interface LoDashStatic {
-        /**
-         * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-         * thisArg and invoked with three arguments: (value, index|key, collection).
-         *
-         * If a property name is provided for iteratee the created _.property style callback returns the property value
-         * of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-         * _.reject, and _.some.
-         *
-         * The guarded methods are:
-         * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-         * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-         * sample, some, sum, uniq, and words
-         *
-         * @param collection The collection to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @param thisArg The this binding of iteratee.
-         * @return Returns the new mapped array.
-         */
-        map<T, TResult>(
-            collection: List<T>,
-            iteratee?: ListIterator<T, TResult>,
-            thisArg?: any
-        ): TResult[];
-
-        /**
-         * @see _.map
-         */
-        map<T extends {}, TResult>(
-            collection: Dictionary<T>,
-            iteratee?: DictionaryIterator<T, TResult>,
-            thisArg?: any
-        ): TResult[];
-
-        map<T extends {}, TResult>(
-            collection: NumericDictionary<T>,
-            iteratee?: NumericDictionaryIterator<T, TResult>,
-            thisArg?: any
-        ): TResult[];
-
-        /**
-         * @see _.map
-         */
-        map<T, TResult>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
-            iteratee?: string
-        ): TResult[];
-
-        /**
-         * @see _.map
-         */
-        map<T, TObject extends {}>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
-            iteratee?: TObject
-        ): boolean[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.map
-         */
-        map<TResult>(
-            iteratee?: ListIterator<T, TResult>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.map
-         */
-        map<TResult>(
-            iteratee?: string
-        ): LoDashImplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.map
-         */
-        map<TObject extends {}>(
-            iteratee?: TObject
-        ): LoDashImplicitArrayWrapper<boolean>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.map
-         */
-        map<TValue, TResult>(
-            iteratee?: ListIterator<TValue, TResult>|DictionaryIterator<TValue, TResult>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.map
-         */
-        map<TValue, TResult>(
-            iteratee?: string
-        ): LoDashImplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.map
-         */
-        map<TObject extends {}>(
-            iteratee?: TObject
-        ): LoDashImplicitArrayWrapper<boolean>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.map
-         */
-        map<TResult>(
-            iteratee?: ListIterator<T, TResult>,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.map
-         */
-        map<TResult>(
-            iteratee?: string
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.map
-         */
-        map<TObject extends {}>(
-            iteratee?: TObject
-        ): LoDashExplicitArrayWrapper<boolean>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.map
-         */
-        map<TValue, TResult>(
-            iteratee?: ListIterator<TValue, TResult>|DictionaryIterator<TValue, TResult>,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.map
-         */
-        map<TValue, TResult>(
-            iteratee?: string
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.map
-         */
-        map<TObject extends {}>(
-            iteratee?: TObject
-        ): LoDashExplicitArrayWrapper<boolean>;
-    }
-
-    //_.partition
-    interface LoDashStatic {
-        /**
-        * Creates an array of elements split into two groups, the first of which contains elements predicate returns truthy for,
-        * while the second of which contains elements predicate returns falsey for.
-        * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-        *
-        * If a property name is provided for predicate the created _.property style callback
-        * returns the property value of the given element.
-        *
-        * If a value is also provided for thisArg the created _.matchesProperty style callback
-        * returns true for elements that have a matching property value, else false.
-        *
-        * If an object is provided for predicate the created _.matches style callback returns
-        * true for elements that have the properties of the given object, else false.
-        *
-        * @param collection The collection to iterate over.
-        * @param callback The function called per iteration.
-        * @param thisArg The this binding of predicate.
-        * @return Returns the array of grouped elements.
-        **/
-        partition<T>(
-            collection: List<T>,
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): T[][];
-
-        /**
-         * @see _.partition
-         **/
-        partition<T>(
-            collection: Dictionary<T>,
-            callback: DictionaryIterator<T, boolean>,
-            thisArg?: any): T[][];
-
-        /**
-         * @see _.partition
-         **/
-        partition<W, T>(
-            collection: List<T>,
-            whereValue: W): T[][];
-
-        /**
-         * @see _.partition
-         **/
-        partition<W, T>(
-            collection: Dictionary<T>,
-            whereValue: W): T[][];
-
-        /**
-         * @see _.partition
-         **/
-        partition<T>(
-            collection: List<T>,
-            path: string,
-            srcValue: any): T[][];
-
-        /**
-         * @see _.partition
-         **/
-        partition<T>(
-            collection: Dictionary<T>,
-            path: string,
-            srcValue: any): T[][];
-
-        /**
-         * @see _.partition
-         **/
-        partition<T>(
-            collection: List<T>,
-            pluckValue: string): T[][];
-
-        /**
-         * @see _.partition
-         **/
-        partition<T>(
-            collection: Dictionary<T>,
-            pluckValue: string): T[][];
-    }
-
-    interface LoDashImplicitStringWrapper {
-        /**
-         * @see _.partition
-         */
-        partition(
-            callback: ListIterator<string, boolean>,
-            thisArg?: any): LoDashImplicitArrayWrapper<string[]>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.partition
-         */
-        partition(
-            callback: ListIterator<T, boolean>,
-            thisArg?: any): LoDashImplicitArrayWrapper<T[]>;
-        /**
-         * @see _.partition
-         */
-        partition<W>(
-            whereValue: W): LoDashImplicitArrayWrapper<T[]>;
-        /**
-         * @see _.partition
-         */
-        partition(
-            path: string,
-            srcValue: any): LoDashImplicitArrayWrapper<T[]>;
-        /**
-         * @see _.partition
-         */
-        partition(
-            pluckValue: string): LoDashImplicitArrayWrapper<T[]>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.partition
-         */
-        partition<TResult>(
-            callback: ListIterator<TResult, boolean>,
-            thisArg?: any): LoDashImplicitArrayWrapper<TResult[]>;
-
-        /**
-         * @see _.partition
-         */
-        partition<TResult>(
-            callback: DictionaryIterator<TResult, boolean>,
-            thisArg?: any): LoDashImplicitArrayWrapper<TResult[]>;
-
-        /**
-         * @see _.partition
-         */
-        partition<W, TResult>(
-            whereValue: W): LoDashImplicitArrayWrapper<TResult[]>;
-
-        /**
-         * @see _.partition
-         */
-        partition<TResult>(
-            path: string,
-            srcValue: any): LoDashImplicitArrayWrapper<TResult[]>;
-
-        /**
-         * @see _.partition
-         */
-        partition<TResult>(
-            pluckValue: string): LoDashImplicitArrayWrapper<TResult[]>;
-    }
-
-    //_.reduce
-    interface LoDashStatic {
-        /**
-        * Reduces a collection to a value which is the accumulated result of running each
-        * element in the collection through the callback, where each successive callback execution
-        * consumes the return value of the previous execution. If accumulator is not provided the
-        * first element of the collection will be used as the initial accumulator value. The callback
-        * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
-        * @param collection The collection to iterate over.
-        * @param callback The function called per iteration.
-        * @param accumulator Initial value of the accumulator.
-        * @param thisArg The this binding of callback.
-        * @return Returns the accumulated value.
-        **/
-        reduce<T, TResult>(
-            collection: Array<T>,
-            callback: MemoIterator<T, TResult>,
-            accumulator: TResult,
-            thisArg?: any): TResult;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            collection: List<T>,
-            callback: MemoIterator<T, TResult>,
-            accumulator: TResult,
-            thisArg?: any): TResult;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            collection: Dictionary<T>,
-            callback: MemoIterator<T, TResult>,
-            accumulator: TResult,
-            thisArg?: any): TResult;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            collection: NumericDictionary<T>,
-            callback: MemoIterator<T, TResult>,
-            accumulator: TResult,
-            thisArg?: any): TResult;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            collection: Array<T>,
-            callback: MemoIterator<T, TResult>,
-            thisArg?: any): TResult;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            collection: List<T>,
-            callback: MemoIterator<T, TResult>,
-            thisArg?: any): TResult;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            collection: Dictionary<T>,
-            callback: MemoIterator<T, TResult>,
-            thisArg?: any): TResult;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            collection: NumericDictionary<T>,
-            callback: MemoIterator<T, TResult>,
-            thisArg?: any): TResult;
-
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-         /**
-        * @see _.reduce
-        **/
-        reduce<TResult>(
-            callback: MemoIterator<T, TResult>,
-            accumulator: TResult,
-            thisArg?: any): TResult;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<TResult>(
-            callback: MemoIterator<T, TResult>,
-            thisArg?: any): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-         /**
-        * @see _.reduce
-        **/
-        reduce<TValue, TResult>(
-            callback: MemoIterator<TValue, TResult>,
-            accumulator: TResult,
-            thisArg?: any): TResult;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<TValue, TResult>(
-            callback: MemoIterator<TValue, TResult>,
-            thisArg?: any): TResult;
-    }
-
-    //_.reduceRight
-    interface LoDashStatic {
-        /**
-        * This method is like _.reduce except that it iterates over elements of a collection from
-        * right to left.
-        * @param collection The collection to iterate over.
-        * @param callback The function called per iteration.
-        * @param accumulator Initial value of the accumulator.
-        * @param thisArg The this binding of callback.
-        * @return The accumulated value.
-        **/
-        reduceRight<T, TResult>(
-            collection: Array<T>,
-            callback: MemoIterator<T, TResult>,
-            accumulator: TResult,
-            thisArg?: any): TResult;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            collection: List<T>,
-            callback: MemoIterator<T, TResult>,
-            accumulator: TResult,
-            thisArg?: any): TResult;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            collection: Dictionary<T>,
-            callback: MemoIterator<T, TResult>,
-            accumulator: TResult,
-            thisArg?: any): TResult;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            collection: Array<T>,
-            callback: MemoIterator<T, TResult>,
-            thisArg?: any): TResult;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            collection: List<T>,
-            callback: MemoIterator<T, TResult>,
-            thisArg?: any): TResult;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            collection: Dictionary<T>,
-            callback: MemoIterator<T, TResult>,
-            thisArg?: any): TResult;
-    }
-
-    //_.reject
-    interface LoDashStatic {
-        /**
-         * The opposite of _.filter; this method returns the elements of collection that predicate does not return
-         * truthy for.
-         *
-         * @param collection The collection to iterate over.
-         * @param predicate The function invoked per iteration.
-         * @param thisArg The this binding of predicate.
-         * @return Returns the new filtered array.
-         */
-        reject<T>(
-            collection: List<T>,
-            predicate?: ListIterator<T, boolean>,
-            thisArg?: any
-        ): T[];
-
-        /**
-         * @see _.reject
-         */
-        reject<T>(
-            collection: Dictionary<T>,
-            predicate?: DictionaryIterator<T, boolean>,
-            thisArg?: any
-        ): T[];
-
-        /**
-         * @see _.reject
-         */
-        reject(
-            collection: string,
-            predicate?: StringIterator<boolean>,
-            thisArg?: any
-        ): string[];
-
-        /**
-         * @see _.reject
-         */
-        reject<T>(
-            collection: List<T>|Dictionary<T>,
-            predicate: string,
-            thisArg?: any
-        ): T[];
-
-        /**
-         * @see _.reject
-         */
-        reject<W extends {}, T>(
-            collection: List<T>|Dictionary<T>,
-            predicate: W
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.reject
-         */
-        reject(
-            predicate?: StringIterator<boolean>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<string>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.reject
-         */
-        reject(
-            predicate: ListIterator<T, boolean>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.reject
-         */
-        reject(
-            predicate: string,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.reject
-         */
-        reject<W>(predicate: W): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.reject
-         */
-        reject<T>(
-            predicate: ListIterator<T, boolean>|DictionaryIterator<T, boolean>,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.reject
-         */
-        reject<T>(
-            predicate: string,
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.reject
-         */
-        reject<W, T>(predicate: W): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.reject
-         */
-        reject(
-            predicate?: StringIterator<boolean>,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.reject
-         */
-        reject(
-            predicate: ListIterator<T, boolean>,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.reject
-         */
-        reject(
-            predicate: string,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.reject
-         */
-        reject<W>(predicate: W): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.reject
-         */
-        reject<T>(
-            predicate: ListIterator<T, boolean>|DictionaryIterator<T, boolean>,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.reject
-         */
-        reject<T>(
-            predicate: string,
-            thisArg?: any
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.reject
-         */
-        reject<W, T>(predicate: W): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.sample
-    interface LoDashStatic {
-        /**
-         * Gets a random element from collection.
-         *
-         * @param collection The collection to sample.
-         * @return Returns the random element.
-         */
-        sample<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>
-        ): T;
-
-        /**
-         * @see _.sample
-         */
-        sample<O extends Object, T>(
-            collection: O
-        ): T;
-
-        /**
-         * @see _.sample
-         */
-        sample<T>(
-            collection: Object
-        ): T;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.sample
-         */
-        sample(): string;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.sample
-         */
-        sample(): T;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.sample
-         */
-        sample<T>(): T;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.sample
-         */
-        sample(): LoDashExplicitWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.sample
-         */
-        sample<TWrapper>(): TWrapper;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.sample
-         */
-        sample<TWrapper>(): TWrapper;
-    }
-
-    //_.sampleSize
-    interface LoDashStatic {
-        /**
-         * Gets n random elements at unique keys from collection up to the size of collection.
-         *
-         * @param collection The collection to sample.
-         * @param n The number of elements to sample.
-         * @return Returns the random elements.
-         */
-        sampleSize<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
-            n?: number
-        ): T[];
-
-        /**
-         * @see _.sampleSize
-         */
-        sampleSize<O extends Object, T>(
-            collection: O,
-            n?: number
-        ): T[];
-
-        /**
-         * @see _.sampleSize
-         */
-        sampleSize<T>(
-            collection: Object,
-            n?: number
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.sampleSize
-         */
-        sampleSize(
-            n?: number
-        ): LoDashImplicitArrayWrapper<string>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.sampleSize
-         */
-        sampleSize(
-            n?: number
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.sampleSize
-         */
-        sampleSize<T>(
-            n?: number
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.sampleSize
-         */
-        sampleSize(
-            n?: number
-        ): LoDashExplicitArrayWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.sampleSize
-         */
-        sampleSize(
-            n?: number
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.sampleSize
-         */
-        sampleSize<T>(
-            n?: number
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.shuffle
-    interface LoDashStatic {
-        /**
-         * Creates an array of shuffled values, using a version of the Fisher-Yates shuffle.
-         *
-         * @param collection The collection to shuffle.
-         * @return Returns the new shuffled array.
-         */
-        shuffle<T>(collection: List<T>|Dictionary<T>): T[];
-
-        /**
-         * @see _.shuffle
-         */
-        shuffle(collection: string): string[];
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.shuffle
-         */
-        shuffle(): LoDashImplicitArrayWrapper<string>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.shuffle
-         */
-        shuffle(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.shuffle
-         */
-        shuffle<T>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.shuffle
-         */
-        shuffle(): LoDashExplicitArrayWrapper<string>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.shuffle
-         */
-        shuffle(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.shuffle
-         */
-        shuffle<T>(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.size
-    interface LoDashStatic {
-        /**
-         * Gets the size of collection by returning its length for array-like values or the number of own enumerable
-         * properties for objects.
-         *
-         * @param collection The collection to inspect.
-         * @return Returns the size of collection.
-         */
-        size<T>(collection: List<T>|Dictionary<T>): number;
-
-        /**
-         * @see _.size
-         */
-        size(collection: string): number;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.size
-         */
-        size(): number;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.size
-         */
-        size(): number;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.size
-         */
-        size(): number;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.size
-         */
-        size(): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.size
-         */
-        size(): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.size
-         */
-        size(): LoDashExplicitWrapper<number>;
-    }
-
-    //_.some
-    interface LoDashStatic {
-        /**
-         * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
-         * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
-         *
-         * @param collection The collection to iterate over.
-         * @param predicate The function invoked per iteration.
-         * @return Returns true if any element passes the predicate check, else false.
-         */
-        some<T>(
-            collection: List<T>,
-            predicate?: ListIterator<T, boolean>
-        ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some<T>(
-            collection: Dictionary<T>,
-            predicate?: DictionaryIterator<T, boolean>
-        ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some<T>(
-            collection: NumericDictionary<T>,
-            predicate?: NumericDictionaryIterator<T, boolean>
-        ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some(
-            collection: Object,
-            predicate?: ObjectIterator<any, boolean>
-        ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
-            predicate?: string|[string, any]
-        ): boolean;
-
-
-        /**
-         * @see _.some
-         */
-        some(
-            collection: Object,
-            predicate?: string|[string, any]
-        ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some<TObject extends {}, T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
-            predicate?: TObject
-        ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
-            predicate?: Object
-        ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some<TObject extends {}>(
-            collection: Object,
-            predicate?: TObject
-        ): boolean;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.some
-         */
-        some(
-            predicate?: ListIterator<T, boolean>|NumericDictionaryIterator<T, boolean>
-        ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some(
-            predicate?: string|[string, any]
-        ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some<TObject extends {}>(
-            predicate?: TObject
-        ): boolean;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.some
-         */
-        some<TResult>(
-            predicate?: ListIterator<TResult, boolean>|DictionaryIterator<TResult, boolean>|NumericDictionaryIterator<T, boolean>|ObjectIterator<any, boolean>
-        ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some(
-            predicate?: string|[string, any]
-        ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some<TObject extends {}>(
-            predicate?: TObject
-        ): boolean;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.some
-         */
-        some(
-            predicate?: ListIterator<T, boolean>|NumericDictionaryIterator<T, boolean>
-        ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.some
-         */
-        some(
-            predicate?: string|[string, any]
-        ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.some
-         */
-        some<TObject extends {}>(
-            predicate?: TObject
-        ): LoDashExplicitWrapper<boolean>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.some
-         */
-        some<TResult>(
-            predicate?: ListIterator<TResult, boolean>|DictionaryIterator<TResult, boolean>|NumericDictionaryIterator<T, boolean>|ObjectIterator<any, boolean>
-        ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.some
-         */
-        some(
-            predicate?: string|[string, any]
-        ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.some
-         */
-        some<TObject extends {}>(
-            predicate?: TObject
-        ): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.sortBy
-    interface LoDashStatic {
-        /**
-         * Creates an array of elements, sorted in ascending order by the results of
-         * running each element in a collection through each iteratee. This method
-         * performs a stable sort, that is, it preserves the original sort order of
-         * equal elements. The iteratees are invoked with one argument: (value).
-         *
-         * @static
-         * @memberOf _
-         * @category Collection
-         * @param {Array|Object} collection The collection to iterate over.
-         * @param {...(Function|Function[]|Object|Object[]|string|string[])} [iteratees=[_.identity]]
-         *  The iteratees to sort by, specified individually or in arrays.
-         * @returns {Array} Returns the new sorted array.
-         * @example
-         *
-         * var users = [
-         *   { 'user': 'fred',   'age': 48 },
-         *   { 'user': 'barney', 'age': 36 },
-         *   { 'user': 'fred',   'age': 42 },
-         *   { 'user': 'barney', 'age': 34 }
-         * ];
-         *
-         * _.sortBy(users, function(o) { return o.user; });
-         * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-         *
-         * _.sortBy(users, ['user', 'age']);
-         * // => objects for [['barney', 34], ['barney', 36], ['fred', 42], ['fred', 48]]
-         *
-         * _.sortBy(users, 'user', function(o) {
-         *   return Math.floor(o.age / 10);
-         * });
-         * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-         */
-        sortBy<T, TSort>(
-            collection: List<T>,
-            iteratee?: ListIterator<T, TSort>
-        ): T[];
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T, TSort>(
-            collection: Dictionary<T>,
-            iteratee?: DictionaryIterator<T, TSort>
-        ): T[];
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T>(
-            collection: List<T>|Dictionary<T>,
-            iteratee: string
-        ): T[];
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<W extends {}, T>(
-            collection: List<T>|Dictionary<T>,
-            whereValue: W
-        ): T[];
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T>(
-            collection: List<T>|Dictionary<T>
-        ): T[];
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T>(
-            collection: (Array<T>|List<T>),
-            iteratees: (ListIterator<T, any>|string|Object)[]): T[];
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T>(
-            collection: (Array<T>|List<T>),
-            ...iteratees: (ListIterator<T, boolean>|Object|string)[]): T[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.sortBy
-         */
-        sortBy<TSort>(
-            iteratee?: ListIterator<T, TSort>
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy(iteratee: string): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<W extends {}>(whereValue: W): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy(): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy(...iteratees: (ListIterator<T, boolean>|Object|string)[]): LoDashImplicitArrayWrapper<T>;
-
-        /**
-        * @see _.sortBy
-        **/
-        sortBy(iteratees: (ListIterator<T, any>|string|Object)[]): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T, TSort>(
-            iteratee?: ListIterator<T, TSort>|DictionaryIterator<T, TSort>
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T>(iteratee: string): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<W extends {}, T>(whereValue: W): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.sortBy
-         */
-        sortBy<TSort>(
-            iteratee?: ListIterator<T, TSort>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy(iteratee: string): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<W extends {}>(whereValue: W): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T, TSort>(
-            iteratee?: ListIterator<T, TSort>|DictionaryIterator<T, TSort>
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T>(iteratee: string): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<W extends {}, T>(whereValue: W): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.sortBy
-         */
-        sortBy<T>(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.orderBy
-    interface LoDashStatic {
-        /**
-         * This method is like `_.sortBy` except that it allows specifying the sort
-         * orders of the iteratees to sort by. If `orders` is unspecified, all values
-         * are sorted in ascending order. Otherwise, specify an order of "desc" for
-         * descending or "asc" for ascending sort order of corresponding values.
-         *
-         * @static
-         * @memberOf _
-         * @category Collection
-         * @param {Array|Object} collection The collection to iterate over.
-         * @param {Function[]|Object[]|string[]} [iteratees=[_.identity]] The iteratees to sort by.
-         * @param {string[]} [orders] The sort orders of `iteratees`.
-         * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
-         * @returns {Array} Returns the new sorted array.
-         * @example
-         *
-         * var users = [
-         *   { 'user': 'fred',   'age': 48 },
-         *   { 'user': 'barney', 'age': 34 },
-         *   { 'user': 'fred',   'age': 42 },
-         *   { 'user': 'barney', 'age': 36 }
-         * ];
-         *
-         * // sort by `user` in ascending order and by `age` in descending order
-         * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
-         * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-         */
-        orderBy<W extends Object, T>(
-            collection: List<T>,
-            iteratees: ListIterator<T, any>|string|W|(ListIterator<T, any>|string|W)[],
-            orders?: boolean|string|(boolean|string)[]
-        ): T[];
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            collection: List<T>,
-            iteratees: ListIterator<T, any>|string|Object|(ListIterator<T, any>|string|Object)[],
-            orders?: boolean|string|(boolean|string)[]
-        ): T[];
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<W extends Object, T>(
-            collection: NumericDictionary<T>,
-            iteratees: NumericDictionaryIterator<T, any>|string|W|(NumericDictionaryIterator<T, any>|string|W)[],
-            orders?: boolean|string|(boolean|string)[]
-        ): T[];
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            collection: NumericDictionary<T>,
-            iteratees: NumericDictionaryIterator<T, any>|string|Object|(NumericDictionaryIterator<T, any>|string|Object)[],
-            orders?: boolean|string|(boolean|string)[]
-        ): T[];
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<W extends Object, T>(
-            collection: Dictionary<T>,
-            iteratees: DictionaryIterator<T, any>|string|W|(DictionaryIterator<T, any>|string|W)[],
-            orders?: boolean|string|(boolean|string)[]
-        ): T[];
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            collection: Dictionary<T>,
-            iteratees: DictionaryIterator<T, any>|string|Object|(DictionaryIterator<T, any>|string|Object)[],
-            orders?: boolean|string|(boolean|string)[]
-        ): T[];
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.orderBy
-         */
-        orderBy(
-            iteratees: ListIterator<T, any>|string|(ListIterator<T, any>|string)[],
-            orders?: boolean|string|(boolean|string)[]
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.orderBy
-         */
-        orderBy<W extends Object>(
-            iteratees: ListIterator<T, any>|string|W|(ListIterator<T, any>|string|W)[],
-            orders?: boolean|string|(boolean|string)[]
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.orderBy
-         */
-        orderBy<W extends Object, T>(
-            iteratees: ListIterator<T, any>|string|W|(ListIterator<T, any>|string|W)[],
-            orders?: boolean|string|(boolean|string)[]
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            iteratees: ListIterator<T, any>|string|Object|(ListIterator<T, any>|string|Object)[],
-            orders?: boolean|string|(boolean|string)[]
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<W extends Object, T>(
-            iteratees: NumericDictionaryIterator<T, any>|string|W|(NumericDictionaryIterator<T, any>|string|W)[],
-            orders?: boolean|string|(boolean|string)[]
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            iteratees: NumericDictionaryIterator<T, any>|string|Object|(NumericDictionaryIterator<T, any>|string|Object)[],
-            orders?: boolean|string|(boolean|string)[]
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<W extends Object, T>(
-            iteratees: DictionaryIterator<T, any>|string|W|(DictionaryIterator<T, any>|string|W)[],
-            orders?: boolean|string|(boolean|string)[]
-        ): LoDashImplicitArrayWrapper<T>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            iteratees: DictionaryIterator<T, any>|string|Object|(DictionaryIterator<T, any>|string|Object)[],
-            orders?: boolean|string|(boolean|string)[]
-        ): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.orderBy
-         */
-        orderBy(
-            iteratees: ListIterator<T, any>|string|(ListIterator<T, any>|string)[],
-            orders?: boolean|string|(boolean|string)[]
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.orderBy
-         */
-        orderBy<W extends Object>(
-            iteratees: ListIterator<T, any>|string|W|(ListIterator<T, any>|string|W)[],
-            orders?: boolean|string|(boolean|string)[]
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.orderBy
-         */
-        orderBy<W extends Object, T>(
-            iteratees: ListIterator<T, any>|string|W|(ListIterator<T, any>|string|W)[],
-            orders?: boolean|string|(boolean|string)[]
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            iteratees: ListIterator<T, any>|string|Object|(ListIterator<T, any>|string|Object)[],
-            orders?: boolean|string|(boolean|string)[]
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<W extends Object, T>(
-            iteratees: NumericDictionaryIterator<T, any>|string|W|(NumericDictionaryIterator<T, any>|string|W)[],
-            orders?: boolean|string|(boolean|string)[]
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            iteratees: NumericDictionaryIterator<T, any>|string|Object|(NumericDictionaryIterator<T, any>|string|Object)[],
-            orders?: boolean|string|(boolean|string)[]
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<W extends Object, T>(
-            iteratees: DictionaryIterator<T, any>|string|W|(DictionaryIterator<T, any>|string|W)[],
-            orders?: boolean|string|(boolean|string)[]
-        ): LoDashExplicitArrayWrapper<T>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            iteratees: DictionaryIterator<T, any>|string|Object|(DictionaryIterator<T, any>|string|Object)[],
-            orders?: boolean|string|(boolean|string)[]
-        ): LoDashExplicitArrayWrapper<T>;
-    }
-
-    /********
-     * Date *
-     ********/
-
-    //_.now
-    interface LoDashStatic {
-        /**
-         * Gets the number of milliseconds that have elapsed since the Unix epoch (1 January 1970 00:00:00 UTC).
-         *
-         * @return The number of milliseconds.
-         */
-        now(): number;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.now
-         */
-        now(): number;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.now
-         */
-        now(): LoDashExplicitWrapper<number>;
-    }
-
-    /*************
-     * Functions *
-     *************/
-
-    //_.after
-    interface LoDashStatic {
-        /**
-         * The opposite of _.before; this method creates a function that invokes func once it’s called n or more times.
-         *
-         * @param n The number of calls before func is invoked.
-         * @param func The function to restrict.
-         * @return Returns the new restricted function.
-         */
-        after<TFunc extends Function>(
-            n: number,
-            func: TFunc
-        ): TFunc;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-        * @see _.after
-        **/
-        after<TFunc extends Function>(func: TFunc): LoDashImplicitObjectWrapper<TFunc>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.after
-         **/
-        after<TFunc extends Function>(func: TFunc): LoDashExplicitObjectWrapper<TFunc>;
-    }
-
-    //_.ary
-    interface LoDashStatic {
-        /**
-         * Creates a function that accepts up to n arguments ignoring any additional arguments.
-         *
-         * @param func The function to cap arguments for.
-         * @param n The arity cap.
-         * @returns Returns the new function.
-         */
-        ary<TResult extends Function>(
-            func: Function,
-            n?: number
-        ): TResult;
-
-        ary<T extends Function, TResult extends Function>(
-            func: T,
-            n?: number
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.ary
-         */
-        ary<TResult extends Function>(n?: number): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.ary
-         */
-        ary<TResult extends Function>(n?: number): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.before
-    interface LoDashStatic {
-        /**
-         * Creates a function that invokes func, with the this binding and arguments of the created function, while
-         * it’s called less than n times. Subsequent calls to the created function return the result of the last func
-         * invocation.
-         *
-         * @param n The number of calls at which func is no longer invoked.
-         * @param func The function to restrict.
-         * @return Returns the new restricted function.
-         */
-        before<TFunc extends Function>(
-            n: number,
-            func: TFunc
-        ): TFunc;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.before
-         **/
-        before<TFunc extends Function>(func: TFunc): LoDashImplicitObjectWrapper<TFunc>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.before
-         **/
-        before<TFunc extends Function>(func: TFunc): LoDashExplicitObjectWrapper<TFunc>;
-    }
-
-    //_.bind
-    interface FunctionBind {
-        placeholder: any;
-
-        <T extends Function, TResult extends Function>(
-            func: T,
-            thisArg: any,
-            ...partials: any[]
-        ): TResult;
-
-        <TResult extends Function>(
-            func: Function,
-            thisArg: any,
-            ...partials: any[]
-        ): TResult;
-    }
-
-    interface LoDashStatic {
-        /**
-         * Creates a function that invokes func with the this binding of thisArg and prepends any additional _.bind
-         * arguments to those provided to the bound function.
-         *
-         * The _.bind.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder for
-         * partially applied arguments.
-         *
-         * Note: Unlike native Function#bind this method does not set the "length" property of bound functions.
-         *
-         * @param func The function to bind.
-         * @param thisArg The this binding of func.
-         * @param partials The arguments to be partially applied.
-         * @return Returns the new bound function.
-         */
-        bind: FunctionBind;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.bind
-         */
-        bind<TResult extends Function>(
-            thisArg: any,
-            ...partials: any[]
-        ): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.bind
-         */
-        bind<TResult extends Function>(
-            thisArg: any,
-            ...partials: any[]
-        ): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.bindAll
-    interface LoDashStatic {
-        /**
-         * Binds methods of an object to the object itself, overwriting the existing method. Method names may be
-         * specified as individual arguments or as arrays of method names. If no method names are provided all
-         * enumerable function properties, own and inherited, of object are bound.
-         *
-         * Note: This method does not set the "length" property of bound functions.
-         *
-         * @param object The object to bind and assign the bound methods to.
-         * @param methodNames The object method names to bind, specified as individual method names or arrays of
-         * method names.
-         * @return Returns object.
-         */
-        bindAll<T>(
-            object: T,
-            ...methodNames: (string|string[])[]
-        ): T;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.bindAll
-         */
-        bindAll(...methodNames: (string|string[])[]): LoDashImplicitObjectWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.bindAll
-         */
-        bindAll(...methodNames: (string|string[])[]): LoDashExplicitObjectWrapper<T>;
-    }
-
-    //_.bindKey
-    interface FunctionBindKey {
-        placeholder: any;
-
-        <T extends Object, TResult extends Function>(
-            object: T,
-            key: any,
-            ...partials: any[]
-        ): TResult;
-
-        <TResult extends Function>(
-            object: Object,
-            key: any,
-            ...partials: any[]
-        ): TResult;
-    }
-
-    interface LoDashStatic {
-        /**
-         * Creates a function that invokes the method at object[key] and prepends any additional _.bindKey arguments
-         * to those provided to the bound function.
-         *
-         * This method differs from _.bind by allowing bound functions to reference methods that may be redefined
-         * or don’t yet exist. See Peter Michaux’s article for more details.
-         *
-         * The _.bindKey.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder
-         * for partially applied arguments.
-         *
-         * @param object The object the method belongs to.
-         * @param key The key of the method.
-         * @param partials The arguments to be partially applied.
-         * @return Returns the new bound function.
-         */
-        bindKey: FunctionBindKey;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.bindKey
-         */
-        bindKey<TResult extends Function>(
-            key: any,
-            ...partials: any[]
-        ): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.bindKey
-         */
-        bindKey<TResult extends Function>(
-            key: any,
-            ...partials: any[]
-        ): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.createCallback
-    interface LoDashStatic {
-        /**
-        * Produces a callback bound to an optional thisArg. If func is a property name the created
-        * callback will return the property value for a given element. If func is an object the created
-        * callback will return true for elements that contain the equivalent object properties,
-        * otherwise it will return false.
-        * @param func The value to convert to a callback.
-        * @param thisArg The this binding of the created callback.
-        * @param argCount The number of arguments the callback accepts.
-        * @return A callback function.
-        **/
-        createCallback(
-            func: string,
-            thisArg?: any,
-            argCount?: number): () => any;
-
-        /**
-        * @see _.createCallback
-        **/
-        createCallback(
-            func: Dictionary<any>,
-            thisArg?: any,
-            argCount?: number): () => boolean;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-        * @see _.createCallback
-        **/
-        createCallback(
-            thisArg?: any,
-            argCount?: number): LoDashImplicitObjectWrapper<() => any>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-        * @see _.createCallback
-        **/
-        createCallback(
-            thisArg?: any,
-            argCount?: number): LoDashImplicitObjectWrapper<() => any>;
-    }
-
-    //_.curry
-    interface LoDashStatic {
-        /**
-         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-         * @param func The function to curry.
-         * @return Returns the new curried function.
-         */
-        curry<T1, R>(func: (t1: T1) => R):
-            CurriedFunction1<T1, R>;
-        /**
-         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-         * @param func The function to curry.
-         * @return Returns the new curried function.
-         */
-        curry<T1, T2, R>(func: (t1: T1, t2: T2) => R):
-            CurriedFunction2<T1, T2, R>;
-        /**
-         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-         * @param func The function to curry.
-         * @return Returns the new curried function.
-         */
-        curry<T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R):
-            CurriedFunction3<T1, T2, T3, R>;
-        /**
-         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-         * @param func The function to curry.
-         * @return Returns the new curried function.
-         */
-        curry<T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R):
-            CurriedFunction4<T1, T2, T3, T4, R>;
-        /**
-         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-         * @param func The function to curry.
-         * @return Returns the new curried function.
-         */
-        curry<T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R):
-            CurriedFunction5<T1, T2, T3, T4, T5, R>;
-        /**
-         * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-         * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-         * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-         * @param func The function to curry.
-         * @param arity The arity of func.
-         * @return Returns the new curried function.
-         */
-        curry<TResult extends Function>(
-          func: Function,
-          arity?: number): TResult;
-    }
-
-    interface CurriedFunction1<T1, R> {
-        (): CurriedFunction1<T1, R>;
-        (t1: T1): R;
-    }
-
-    interface CurriedFunction2<T1, T2, R> {
-        (): CurriedFunction2<T1, T2, R>;
-        (t1: T1): CurriedFunction1<T2, R>;
-        (t1: T1, t2: T2): R;
-    }
-
-    interface CurriedFunction3<T1, T2, T3, R> {
-        (): CurriedFunction3<T1, T2, T3, R>;
-        (t1: T1): CurriedFunction2<T2, T3, R>;
-        (t1: T1, t2: T2): CurriedFunction1<T3, R>;
-        (t1: T1, t2: T2, t3: T3): R;
-    }
-
-    interface CurriedFunction4<T1, T2, T3, T4, R> {
-        (): CurriedFunction4<T1, T2, T3, T4, R>;
-        (t1: T1): CurriedFunction3<T2, T3, T4, R>;
-        (t1: T1, t2: T2): CurriedFunction2<T3, T4, R>;
-        (t1: T1, t2: T2, t3: T3): CurriedFunction1<T4, R>;
-        (t1: T1, t2: T2, t3: T3, t4: T4): R;
-    }
-
-    interface CurriedFunction5<T1, T2, T3, T4, T5, R> {
-        (): CurriedFunction5<T1, T2, T3, T4, T5, R>;
-        (t1: T1): CurriedFunction4<T2, T3, T4, T5, R>;
-        (t1: T1, t2: T2): CurriedFunction3<T3, T4, T5, R>;
-        (t1: T1, t2: T2, t3: T3): CurriedFunction2<T4, T5, R>;
-        (t1: T1, t2: T2, t3: T3, t4: T4): CurriedFunction1<T5, R>;
-        (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5): R;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-        * @see _.curry
-        **/
-        curry<TResult extends Function>(arity?: number): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    //_.curryRight
-    interface LoDashStatic {
-        /**
-         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-         * instead of _.partial.
-         * @param func The function to curry.
-         * @return Returns the new curried function.
-         */
-        curryRight<T1, R>(func: (t1: T1) => R):
-            CurriedFunction1<T1, R>;
-        /**
-         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-         * instead of _.partial.
-         * @param func The function to curry.
-         * @return Returns the new curried function.
-         */
-        curryRight<T1, T2, R>(func: (t1: T1, t2: T2) => R):
-            CurriedFunction2<T2, T1, R>;
-        /**
-         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-         * instead of _.partial.
-         * @param func The function to curry.
-         * @return Returns the new curried function.
-         */
-        curryRight<T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R):
-            CurriedFunction3<T3, T2, T1, R>;
-        /**
-         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-         * instead of _.partial.
-         * @param func The function to curry.
-         * @return Returns the new curried function.
-         */
-        curryRight<T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R):
-            CurriedFunction4<T4, T3, T2, T1, R>;
-        /**
-         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-         * instead of _.partial.
-         * @param func The function to curry.
-         * @return Returns the new curried function.
-         */
-        curryRight<T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R):
-            CurriedFunction5<T5, T4, T3, T2, T1, R>;
-        /**
-         * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-         * instead of _.partial.
-         * @param func The function to curry.
-         * @param arity The arity of func.
-         * @return Returns the new curried function.
-         */
-        curryRight<TResult extends Function>(
-          func: Function,
-          arity?: number): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.curryRight
-         **/
-        curryRight<TResult extends Function>(arity?: number): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    //_.debounce
-    interface DebounceSettings {
-        /**
-         * Specify invoking on the leading edge of the timeout.
-         */
-        leading?: boolean;
-
-        /**
-         * The maximum time func is allowed to be delayed before it’s invoked.
-         */
-        maxWait?: number;
-
-        /**
-         * Specify invoking on the trailing edge of the timeout.
-         */
-        trailing?: boolean;
-    }
-
-    interface LoDashStatic {
-        /**
-         * Creates a debounced function that delays invoking func until after wait milliseconds have elapsed since
-         * the last time the debounced function was invoked. The debounced function comes with a cancel method to
-         * cancel delayed invocations. Provide an options object to indicate that func should be invoked on the
-         * leading and/or trailing edge of the wait timeout. Subsequent calls to the debounced function return the
-         * result of the last func invocation.
-         *
-         * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only
-         * if the the debounced function is invoked more than once during the wait timeout.
-         *
-         * See David Corbacho’s article for details over the differences between _.debounce and _.throttle.
-         *
-         * @param func The function to debounce.
-         * @param wait The number of milliseconds to delay.
-         * @param options The options object.
-         * @param options.leading Specify invoking on the leading edge of the timeout.
-         * @param options.maxWait The maximum time func is allowed to be delayed before it’s invoked.
-         * @param options.trailing Specify invoking on the trailing edge of the timeout.
-         * @return Returns the new debounced function.
-         */
-        debounce<T extends Function>(
-            func: T,
-            wait?: number,
-            options?: DebounceSettings
-        ): T & Cancelable;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.debounce
-         */
-        debounce(
-            wait?: number,
-            options?: DebounceSettings
-        ): LoDashImplicitObjectWrapper<T & Cancelable>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.debounce
-         */
-        debounce(
-            wait?: number,
-            options?: DebounceSettings
-        ): LoDashExplicitObjectWrapper<T & Cancelable>;
-    }
-
-    //_.defer
-    interface LoDashStatic {
-        /**
-         * Defers invoking the func until the current call stack has cleared. Any additional arguments are provided to
-         * func when it’s invoked.
-         *
-         * @param func The function to defer.
-         * @param args The arguments to invoke the function with.
-         * @return Returns the timer id.
-         */
-        defer<T extends Function>(
-            func: T,
-            ...args: any[]
-        ): number;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.defer
-         */
-        defer(...args: any[]): LoDashImplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.defer
-         */
-        defer(...args: any[]): LoDashExplicitWrapper<number>;
-    }
-
-    //_.delay
-    interface LoDashStatic {
-        /**
-         * Invokes func after wait milliseconds. Any additional arguments are provided to func when it’s invoked.
-         *
-         * @param func The function to delay.
-         * @param wait The number of milliseconds to delay invocation.
-         * @param args The arguments to invoke the function with.
-         * @return Returns the timer id.
-         */
-        delay<T extends Function>(
-            func: T,
-            wait: number,
-            ...args: any[]
-        ): number;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.delay
-         */
-        delay(
-            wait: number,
-            ...args: any[]
-        ): LoDashImplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.delay
-         */
-        delay(
-            wait: number,
-            ...args: any[]
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashStatic {
-        /**
-         * Creates a function that invokes `func` with arguments reversed.
-         *
-         * @static
-         * @memberOf _
-         * @category Function
-         * @param {Function} func The function to flip arguments for.
-         * @returns {Function} Returns the new function.
-         * @example
-         *
-         * var flipped = _.flip(function() {
-         *   return _.toArray(arguments);
-         * });
-         *
-         * flipped('a', 'b', 'c', 'd');
-         * // => ['d', 'c', 'b', 'a']
-         */
-        flip<T extends Function>(func: T): T;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.flip
-         */
-        flip(): LoDashImplicitObjectWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.flip
-         */
-        flip(): LoDashExplicitObjectWrapper<T>;
-    }
-
-    //_.flow
-    interface LoDashStatic {
-        /**
-         * Creates a function that returns the result of invoking the provided functions with the this binding of the
-         * created function, where each successive invocation is supplied the return value of the previous.
-         *
-         * @param funcs Functions to invoke.
-         * @return Returns the new function.
-         */
-        flow<TResult extends Function>(...funcs: Function[]): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.flow
-         */
-        flow<TResult extends Function>(...funcs: Function[]): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.flow
-         */
-        flow<TResult extends Function>(...funcs: Function[]): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.flowRight
-    interface LoDashStatic {
-        /**
-         * This method is like _.flow except that it creates a function that invokes the provided functions from right
-         * to left.
-         *
-         * @param funcs Functions to invoke.
-         * @return Returns the new function.
-         */
-        flowRight<TResult extends Function>(...funcs: Function[]): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.flowRight
-         */
-        flowRight<TResult extends Function>(...funcs: Function[]): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.flowRight
-         */
-        flowRight<TResult extends Function>(...funcs: Function[]): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-
-    //_.memoize
-    interface MemoizedFunction extends Function {
-        cache: MapCache;
-    }
-
-    interface LoDashStatic {
-        /**
-         * Creates a function that memoizes the result of func. If resolver is provided it determines the cache key for
-         * storing the result based on the arguments provided to the memoized function. By default, the first argument
-         * provided to the memoized function is coerced to a string and used as the cache key. The func is invoked with
-         * the this binding of the memoized function.
-         *
-         * @param func The function to have its output memoized.
-         * @param resolver The function to resolve the cache key.
-         * @return Returns the new memoizing function.
-         */
-        memoize: {
-            <T extends Function>(func: T, resolver?: Function): T & MemoizedFunction;
-            Cache: MapCache;
-        }
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.memoize
-         */
-        memoize(resolver?: Function): LoDashImplicitObjectWrapper<T & MemoizedFunction>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.memoize
-         */
-        memoize(resolver?: Function): LoDashExplicitObjectWrapper<T & MemoizedFunction>;
-    }
-
-    //_.overArgs (was _.modArgs)
-    interface LoDashStatic {
-        /**
-         * Creates a function that runs each argument through a corresponding transform function.
-         *
-         * @param func The function to wrap.
-         * @param transforms The functions to transform arguments, specified as individual functions or arrays
-         * of functions.
-         * @return Returns the new function.
-         */
-        overArgs<T extends Function, TResult extends Function>(
-            func: T,
-            ...transforms: Function[]
-        ): TResult;
-
-        /**
-         * @see _.overArgs
-         */
-        overArgs<T extends Function, TResult extends Function>(
-            func: T,
-            transforms: Function[]
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.overArgs
-         */
-        overArgs<TResult extends Function>(...transforms: Function[]): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.overArgs
-         */
-        overArgs<TResult extends Function>(transforms: Function[]): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.overArgs
-         */
-        overArgs<TResult extends Function>(...transforms: Function[]): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.overArgs
-         */
-        overArgs<TResult extends Function>(transforms: Function[]): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.negate
-    interface LoDashStatic {
-        /**
-         * Creates a function that negates the result of the predicate func. The func predicate is invoked with
-         * the this binding and arguments of the created function.
-         *
-         * @param predicate The predicate to negate.
-         * @return Returns the new function.
-         */
-        negate<T extends Function>(predicate: T): (...args: any[]) => boolean;
-
-        /**
-         * @see _.negate
-         */
-        negate<T extends Function, TResult extends Function>(predicate: T): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.negate
-         */
-        negate(): LoDashImplicitObjectWrapper<(...args: any[]) => boolean>;
-
-        /**
-         * @see _.negate
-         */
-        negate<TResult extends Function>(): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.negate
-         */
-        negate(): LoDashExplicitObjectWrapper<(...args: any[]) => boolean>;
-
-        /**
-         * @see _.negate
-         */
-        negate<TResult extends Function>(): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.once
-    interface LoDashStatic {
-        /**
-         * Creates a function that is restricted to invoking func once. Repeat calls to the function return the value
-         * of the first call. The func is invoked with the this binding and arguments of the created function.
-         *
-         * @param func The function to restrict.
-         * @return Returns the new restricted function.
-         */
-        once<T extends Function>(func: T): T;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.once
-         */
-        once(): LoDashImplicitObjectWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.once
-         */
-        once(): LoDashExplicitObjectWrapper<T>;
-    }
-
-    //_.partial
-    interface LoDashStatic {
-        /**
-        * Creates a function that, when called, invokes func with any additional partial arguments
-        * prepended to those provided to the new function. This method is similar to _.bind except
-        * it does not alter the this binding.
-        * @param func The function to partially apply arguments to.
-        * @param args Arguments to be partially applied.
-        * @return The new partially applied function.
-        **/
-        partial: Partial;
-    }
-
-    type PH = LoDashStatic;
-
-    interface Function0<R> {
-        (): R;
-    }
-    interface Function1<T1, R> {
-        (t1: T1): R;
-    }
-    interface Function2<T1, T2, R> {
-        (t1: T1, t2: T2): R;
-    }
-    interface Function3<T1, T2, T3, R> {
-        (t1: T1, t2: T2, t3: T3): R;
-    }
-    interface Function4<T1, T2, T3, T4, R> {
-        (t1: T1, t2: T2, t3: T3, t4: T4): R;
-    }
-
-    interface Partial {
-        // arity 0
-        <R>(func: Function0<R>): Function0<R>;
-        // arity 1
-        <T1, R>(func: Function1<T1, R>): Function1<T1, R>;
-        <T1, R>(func: Function1<T1, R>, arg1: T1): Function0<R>;
-        // arity 2
-        <T1, T2, R>(func: Function2<T1, T2, R>):                      Function2<T1, T2, R>;
-        <T1, T2, R>(func: Function2<T1, T2, R>, arg1: T1):            Function1<    T2, R>;
-        <T1, T2, R>(func: Function2<T1, T2, R>, plc1: PH, arg2: T2):  Function1<T1,     R>;
-        <T1, T2, R>(func: Function2<T1, T2, R>, arg1: T1, arg2: T2):  Function0<        R>;
-        // arity 3
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>):                                Function3<T1, T2, T3, R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1):                      Function2<    T2, T3, R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, plc1: PH, arg2: T2):            Function2<T1,     T3, R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, arg2: T2):            Function1<        T3, R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, plc1: PH, plc2: PH, arg3: T3):  Function2<T1, T2,     R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, plc2: PH, arg3: T3):  Function1<    T2,     R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, plc1: PH, arg2: T2, arg3: T3):  Function1<T1,         R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, arg2: T2, arg3: T3):  Function0<            R>;
-        // arity 4
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>):                                          Function4<T1, T2, T3, T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1):                                Function3<    T2, T3, T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, arg2: T2):                      Function3<T1,     T3, T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2):                      Function2<        T3, T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, plc2: PH, arg3: T3):            Function3<T1, T2,     T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, arg3: T3):            Function2<    T2,     T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, arg2: T2, arg3: T3):            Function2<T1,         T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3):            Function1<            T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, plc2: PH, plc3: PH, arg4: T4):  Function3<T1, T2, T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  Function2<    T2, T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, arg2: T2, plc3: PH, arg4: T4):  Function2<T1,     T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  Function1<        T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, plc2: PH, arg3: T3, arg4: T4):  Function2<T1, T2,         R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  Function1<    T2,         R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, arg2: T2, arg3: T3, arg4: T4):  Function1<T1,             R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  Function0<                R>;
-        // catch-all
-        (func: Function, ...args: any[]): Function;
-    }
-
-    //_.partialRight
-    interface LoDashStatic {
-        /**
-        * This method is like _.partial except that partial arguments are appended to those provided
-        * to the new function.
-        * @param func The function to partially apply arguments to.
-        * @param args Arguments to be partially applied.
-        * @return The new partially applied function.
-        **/
-        partialRight: PartialRight
-    }
-
-    interface PartialRight {
-        // arity 0
-        <R>(func: Function0<R>): Function0<R>;
-        // arity 1
-        <T1, R>(func: Function1<T1, R>): Function1<T1, R>;
-        <T1, R>(func: Function1<T1, R>, arg1: T1): Function0<R>;
-        // arity 2
-        <T1, T2, R>(func: Function2<T1, T2, R>):                      Function2<T1, T2, R>;
-        <T1, T2, R>(func: Function2<T1, T2, R>, arg1: T1, plc2: PH):  Function1<    T2, R>;
-        <T1, T2, R>(func: Function2<T1, T2, R>,           arg2: T2):  Function1<T1,     R>;
-        <T1, T2, R>(func: Function2<T1, T2, R>, arg1: T1, arg2: T2):  Function0<        R>;
-        // arity 3
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>):                                Function3<T1, T2, T3, R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, plc2: PH, plc3: PH):  Function2<    T2, T3, R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>,           arg2: T2, plc3: PH):  Function2<T1,     T3, R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, arg2: T2, plc3: PH):  Function1<        T3, R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>,                     arg3: T3):  Function2<T1, T2,     R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, plc2: PH, arg3: T3):  Function1<    T2,     R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>,           arg2: T2, arg3: T3):  Function1<T1,         R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, arg2: T2, arg3: T3):  Function0<            R>;
-        // arity 4
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>):                                          Function4<T1, T2, T3, T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, plc3: PH, plc4: PH):  Function3<    T2, T3, T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, plc3: PH, plc4: PH):  Function3<T1,     T3, T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, plc3: PH, plc4: PH):  Function2<        T3, T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,                     arg3: T3, plc4: PH):  Function3<T1, T2,     T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, arg3: T3, plc4: PH):  Function2<    T2,     T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, arg3: T3, plc4: PH):  Function2<T1,         T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3, plc4: PH):  Function1<            T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,                               arg4: T4):  Function3<T1, T2, T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  Function2<    T2, T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, plc3: PH, arg4: T4):  Function2<T1,     T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  Function1<        T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,                     arg3: T3, arg4: T4):  Function2<T1, T2,         R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  Function1<    T2,         R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, arg3: T3, arg4: T4):  Function1<T1,             R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  Function0<                R>;
-        // catch-all
-        (func: Function, ...args: any[]): Function;
-    }
-
-    //_.rearg
-    interface LoDashStatic {
-        /**
-         * Creates a function that invokes func with arguments arranged according to the specified indexes where the
-         * argument value at the first index is provided as the first argument, the argument value at the second index
-         * is provided as the second argument, and so on.
-         * @param func The function to rearrange arguments for.
-         * @param indexes The arranged argument indexes, specified as individual indexes or arrays of indexes.
-         * @return Returns the new function.
-         */
-        rearg<TResult extends Function>(func: Function, indexes: number[]): TResult;
-
-        /**
-         * @see _.rearg
-         */
-        rearg<TResult extends Function>(func: Function, ...indexes: number[]): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.rearg
-         */
-        rearg<TResult extends Function>(indexes: number[]): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.rearg
-         */
-        rearg<TResult extends Function>(...indexes: number[]): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    //_.rest
-    interface LoDashStatic {
-        /**
-         * Creates a function that invokes func with the this binding of the created function and arguments from start
-         * and beyond provided as an array.
-         *
-         * Note: This method is based on the rest parameter.
-         *
-         * @param func The function to apply a rest parameter to.
-         * @param start The start position of the rest parameter.
-         * @return Returns the new function.
-         */
-        rest<TResult extends Function>(
-            func: Function,
-            start?: number
-        ): TResult;
-
-        /**
-         * @see _.rest
-         */
-        rest<TResult extends Function, TFunc extends Function>(
-            func: TFunc,
-            start?: number
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.rest
-         */
-        rest<TResult extends Function>(start?: number): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.rest
-         */
-        rest<TResult extends Function>(start?: number): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.spread
-    interface LoDashStatic {
-        /**
-         * Creates a function that invokes func with the this binding of the created function and an array of arguments
-         * much like Function#apply.
-         *
-         * Note: This method is based on the spread operator.
-         *
-         * @param func The function to spread arguments over.
-         * @return Returns the new function.
-         */
-        spread<F extends Function, T extends Function>(func: F): T;
-
-        /**
-         * @see _.spread
-         */
-        spread<T extends Function>(func: Function): T;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.spread
-         */
-        spread<T extends Function>(): LoDashImplicitObjectWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.spread
-         */
-        spread<T extends Function>(): LoDashExplicitObjectWrapper<T>;
-    }
-
-    //_.throttle
-    interface ThrottleSettings {
-        /**
-         * If you'd like to disable the leading-edge call, pass this as false.
-         */
-        leading?: boolean;
-
-        /**
-         * If you'd like to disable the execution on the trailing-edge, pass false.
-         */
-        trailing?: boolean;
-    }
-
-    interface LoDashStatic {
-        /**
-         * Creates a throttled function that only invokes func at most once per every wait milliseconds. The throttled
-         * function comes with a cancel method to cancel delayed invocations. Provide an options object to indicate
-         * that func should be invoked on the leading and/or trailing edge of the wait timeout. Subsequent calls to
-         * the throttled function return the result of the last func call.
-         *
-         * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only if
-         * the the throttled function is invoked more than once during the wait timeout.
-         *
-         * @param func The function to throttle.
-         * @param wait The number of milliseconds to throttle invocations to.
-         * @param options The options object.
-         * @param options.leading Specify invoking on the leading edge of the timeout.
-         * @param options.trailing Specify invoking on the trailing edge of the timeout.
-         * @return Returns the new throttled function.
-         */
-        throttle<T extends Function>(
-            func: T,
-            wait?: number,
-            options?: ThrottleSettings
-        ): T & Cancelable;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.throttle
-         */
-        throttle(
-            wait?: number,
-            options?: ThrottleSettings
-        ): LoDashImplicitObjectWrapper<T & Cancelable>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.throttle
-         */
-        throttle(
-            wait?: number,
-            options?: ThrottleSettings
-        ): LoDashExplicitObjectWrapper<T & Cancelable>;
-    }
-
-    //_.unary
-    interface LoDashStatic {
-        /**
-         * Creates a function that accepts up to one argument, ignoring any
-         * additional arguments.
-         *
-         * @static
-         * @memberOf _
-         * @category Function
-         * @param {Function} func The function to cap arguments for.
-         * @returns {Function} Returns the new function.
-         * @example
-         *
-         * _.map(['6', '8', '10'], _.unary(parseInt));
-         * // => [6, 8, 10]
-         */
-        unary<T extends Function>(func: T): T;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.unary
-         */
-        unary(): LoDashImplicitObjectWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.unary
-         */
-        unary(): LoDashExplicitObjectWrapper<T>;
-    }
-
-    //_.wrap
-    interface LoDashStatic {
-        /**
-         * Creates a function that provides value to the wrapper function as its first argument. Any additional
-         * arguments provided to the function are appended to those provided to the wrapper function. The wrapper is
-         * invoked with the this binding of the created function.
-         *
-         * @param value The value to wrap.
-         * @param wrapper The wrapper function.
-         * @return Returns the new function.
-         */
-        wrap<V, W extends Function, R extends Function>(
-            value: V,
-            wrapper: W
-        ): R;
-
-        /**
-         * @see _.wrap
-         */
-        wrap<V, R extends Function>(
-            value: V,
-            wrapper: Function
-        ): R;
-
-        /**
-         * @see _.wrap
-         */
-        wrap<R extends Function>(
-            value: any,
-            wrapper: Function
-        ): R;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.wrap
-         */
-        wrap<W extends Function, R extends Function>(wrapper: W): LoDashImplicitObjectWrapper<R>;
-
-        /**
-         * @see _.wrap
-         */
-        wrap<R extends Function>(wrapper: Function): LoDashImplicitObjectWrapper<R>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.wrap
-         */
-        wrap<W extends Function, R extends Function>(wrapper: W): LoDashImplicitObjectWrapper<R>;
-
-        /**
-         * @see _.wrap
-         */
-        wrap<R extends Function>(wrapper: Function): LoDashImplicitObjectWrapper<R>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.wrap
-         */
-        wrap<W extends Function, R extends Function>(wrapper: W): LoDashImplicitObjectWrapper<R>;
-
-        /**
-         * @see _.wrap
-         */
-        wrap<R extends Function>(wrapper: Function): LoDashImplicitObjectWrapper<R>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.wrap
-         */
-        wrap<W extends Function, R extends Function>(wrapper: W): LoDashExplicitObjectWrapper<R>;
-
-        /**
-         * @see _.wrap
-         */
-        wrap<R extends Function>(wrapper: Function): LoDashExplicitObjectWrapper<R>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.wrap
-         */
-        wrap<W extends Function, R extends Function>(wrapper: W): LoDashExplicitObjectWrapper<R>;
-
-        /**
-         * @see _.wrap
-         */
-        wrap<R extends Function>(wrapper: Function): LoDashExplicitObjectWrapper<R>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.wrap
-         */
-        wrap<W extends Function, R extends Function>(wrapper: W): LoDashExplicitObjectWrapper<R>;
-
-        /**
-         * @see _.wrap
-         */
-        wrap<R extends Function>(wrapper: Function): LoDashExplicitObjectWrapper<R>;
-    }
-
-    /********
-     * Lang *
-     ********/
-
-    //_.castArray
-    interface LoDashStatic {
-        /**
-         * Casts value as an array if it’s not one.
-         *
-         * @param value The value to inspect.
-         * @return Returns the cast array.
-         */
-        castArray<T>(value: T): T[];
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.castArray
-         */
-        castArray(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.castArray
-         */
-        castArray(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.castArray
-         */
-        castArray(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.castArray
-         */
-        castArray(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.castArray
-         */
-        castArray(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.castArray
-         */
-        castArray(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.clone
-    interface LoDashStatic {
-        /**
-         * Creates a shallow clone of value.
-         *
-         * Note: This method is loosely based on the structured clone algorithm and supports cloning arrays,
-         * array buffers, booleans, date objects, maps, numbers, Object objects, regexes, sets, strings, symbols,
-         * and typed arrays. The own enumerable properties of arguments objects are cloned as plain objects. An empty
-         * object is returned for uncloneable values such as error objects, functions, DOM nodes, and WeakMaps.
-         *
-         * @param value The value to clone.
-         * @return Returns the cloned value.
-         */
-        clone<T>(value: T): T;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.clone
-         */
-        clone(): T;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-
-        /**
-         * @see _.clone
-         */
-        clone(): T[];
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.clone
-         */
-        clone(): T;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.clone
-         */
-        clone(): LoDashExplicitWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-
-        /**
-         * @see _.clone
-         */
-        clone(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.clone
-         */
-        clone(): LoDashExplicitObjectWrapper<T>;
-    }
-
-    //_.cloneDeep
-    interface LoDashStatic {
-        /**
-         * This method is like _.clone except that it recursively clones value.
-         *
-         * @param value The value to recursively clone.
-         * @return Returns the deep cloned value.
-         */
-        cloneDeep<T>(value: T): T;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.cloneDeep
-         */
-        cloneDeep(): T;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.cloneDeep
-         */
-        cloneDeep(): T[];
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.cloneDeep
-         */
-        cloneDeep(): T;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.cloneDeep
-         */
-        cloneDeep(): LoDashExplicitWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.cloneDeep
-         */
-        cloneDeep(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.cloneDeep
-         */
-        cloneDeep(): LoDashExplicitObjectWrapper<T>;
-    }
-
-    //_.cloneDeepWith
-    interface CloneDeepWithCustomizer<TValue, TResult> {
-        (value: TValue): TResult;
-    }
-
-    interface LoDashStatic {
-        /**
-         * This method is like _.cloneWith except that it recursively clones value.
-         *
-         * @param value The value to recursively clone.
-         * @param customizer The function to customize cloning.
-         * @return Returns the deep cloned value.
-         */
-        cloneDeepWith<TResult>(
-            value: any,
-            customizer?: CloneDeepWithCustomizer<any, TResult>
-        ): TResult;
-
-        /**
-         * @see _.clonDeepeWith
-         */
-        cloneDeepWith<T, TResult>(
-            value: T,
-            customizer?: CloneDeepWithCustomizer<T, TResult>
-        ): TResult;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith<TResult>(
-            customizer?: CloneDeepWithCustomizer<T, TResult>
-        ): TResult;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith<TResult>(
-            customizer?: CloneDeepWithCustomizer<T[], TResult>
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith<TResult>(
-            customizer?: CloneDeepWithCustomizer<T, TResult>
-        ): TResult;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith<TResult extends (number|string|boolean)>(
-            customizer?: CloneDeepWithCustomizer<T, TResult>
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith<TResult>(
-            customizer?: CloneDeepWithCustomizer<T, TResult[]>
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith<TResult extends Object>(
-            customizer?: CloneDeepWithCustomizer<T, TResult>
-        ): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith<TResult extends (number|string|boolean)>(
-            customizer?: CloneDeepWithCustomizer<T[], TResult>
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith<TResult>(
-            customizer?: CloneDeepWithCustomizer<T[], TResult[]>
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith<TResult extends Object>(
-            customizer?: CloneDeepWithCustomizer<T[], TResult>
-        ): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith<TResult extends (number|string|boolean)>(
-            customizer?: CloneDeepWithCustomizer<T, TResult>
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith<TResult>(
-            customizer?: CloneDeepWithCustomizer<T, TResult[]>
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.cloneDeepWith
-         */
-        cloneDeepWith<TResult extends Object>(
-            customizer?: CloneDeepWithCustomizer<T, TResult>
-        ): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.cloneWith
-    interface CloneWithCustomizer<TValue, TResult> {
-        (value: TValue): TResult;
-    }
-
-    interface LoDashStatic {
-        /**
-         * This method is like _.clone except that it accepts customizer which is invoked to produce the cloned value.
-         * If customizer returns undefined cloning is handled by the method instead.
-         *
-         * @param value The value to clone.
-         * @param customizer The function to customize cloning.
-         * @return Returns the cloned value.
-         */
-        cloneWith<TResult>(
-            value: any,
-            customizer?: CloneWithCustomizer<any, TResult>
-        ): TResult;
-
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<T, TResult>(
-            value: T,
-            customizer?: CloneWithCustomizer<T, TResult>
-        ): TResult;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult>(
-            customizer?: CloneWithCustomizer<T, TResult>
-        ): TResult;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult>(
-            customizer?: CloneWithCustomizer<T[], TResult>
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult>(
-            customizer?: CloneWithCustomizer<T, TResult>
-        ): TResult;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult extends (number|string|boolean)>(
-            customizer?: CloneWithCustomizer<T, TResult>
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult>(
-            customizer?: CloneWithCustomizer<T, TResult[]>
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult extends Object>(
-            customizer?: CloneWithCustomizer<T, TResult>
-        ): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult extends (number|string|boolean)>(
-            customizer?: CloneWithCustomizer<T[], TResult>
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult>(
-            customizer?: CloneWithCustomizer<T[], TResult[]>
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult extends Object>(
-            customizer?: CloneWithCustomizer<T[], TResult>
-        ): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult extends (number|string|boolean)>(
-            customizer?: CloneWithCustomizer<T, TResult>
-        ): LoDashExplicitWrapper<TResult>;
-
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult>(
-            customizer?: CloneWithCustomizer<T, TResult[]>
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.cloneWith
-         */
-        cloneWith<TResult extends Object>(
-            customizer?: CloneWithCustomizer<T, TResult>
-        ): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.eq
-    interface LoDashStatic {
-        /**
-         * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-         * comparison between two values to determine if they are equivalent.
-         *
-         * @static
-         * @memberOf _
-         * @category Lang
-         * @param {*} value The value to compare.
-         * @param {*} other The other value to compare.
-         * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
-         * @example
-         *
-         * var object = { 'user': 'fred' };
-         * var other = { 'user': 'fred' };
-         *
-         * _.eq(object, object);
-         * // => true
-         *
-         * _.eq(object, other);
-         * // => false
-         *
-         * _.eq('a', 'a');
-         * // => true
-         *
-         * _.eq('a', Object('a'));
-         * // => false
-         *
-         * _.eq(NaN, NaN);
-         * // => true
-         */
-        eq(
-            value: any,
-            other: any
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isEqual
-         */
-        eq(
-            other: any
-        ): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isEqual
-         */
-        eq(
-            other: any
-        ): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.gt
-    interface LoDashStatic {
-        /**
-         * Checks if value is greater than other.
-         *
-         * @param value The value to compare.
-         * @param other The other value to compare.
-         * @return Returns true if value is greater than other, else false.
-         */
-        gt(
-            value: any,
-            other: any
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.gt
-         */
-        gt(other: any): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.gt
-         */
-        gt(other: any): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.gte
-    interface LoDashStatic {
-        /**
-         * Checks if value is greater than or equal to other.
-         *
-         * @param value The value to compare.
-         * @param other The other value to compare.
-         * @return Returns true if value is greater than or equal to other, else false.
-         */
-        gte(
-            value: any,
-            other: any
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.gte
-         */
-        gte(other: any): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.gte
-         */
-        gte(other: any): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isArguments
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as an arguments object.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is correctly classified, else false.
-         */
-        isArguments(value?: any): value is IArguments;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isArguments
-         */
-        isArguments(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isArguments
-         */
-        isArguments(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isArray
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as an Array object.
-         * @param value The value to check.
-         *
-         * @return Returns true if value is correctly classified, else false.
-         */
-        isArray<T>(value?: any): value is T[];
-    }
-
-    interface LoDashImplicitWrapperBase<T,TWrapper> {
-        /**
-         * @see _.isArray
-         */
-        isArray(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T,TWrapper> {
-        /**
-         * @see _.isArray
-         */
-        isArray(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isArrayBuffer
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as an ArrayBuffer object.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is correctly classified, else false.
-         */
-        isArrayBuffer(value?: any): value is ArrayBuffer;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isArrayBuffer
-         */
-        isArrayBuffer(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isArrayBuffer
-         */
-        isArrayBuffer(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isArrayLike
-    interface LoDashStatic {
-        /**
-         * Checks if `value` is array-like. A value is considered array-like if it's
-         * not a function and has a `value.length` that's an integer greater than or
-         * equal to `0` and less than or equal to `Number.MAX_SAFE_INTEGER`.
-         *
-         * @static
-         * @memberOf _
-         * @type Function
-         * @category Lang
-         * @param {*} value The value to check.
-         * @returns {boolean} Returns `true` if `value` is array-like, else `false`.
-         * @example
-         *
-         * _.isArrayLike([1, 2, 3]);
-         * // => true
-         *
-         * _.isArrayLike(document.body.children);
-         * // => true
-         *
-         * _.isArrayLike('abc');
-         * // => true
-         *
-         * _.isArrayLike(_.noop);
-         * // => false
-         */
-        isArrayLike<T>(value?: any): value is T[];
-    }
-
-    interface LoDashImplicitWrapperBase<T,TWrapper> {
-        /**
-         * @see _.isArrayLike
-         */
-        isArrayLike(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T,TWrapper> {
-        /**
-         * @see _.isArrayLike
-         */
-        isArrayLike(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isArrayLikeObject
-    interface LoDashStatic {
-        /**
-         * This method is like `_.isArrayLike` except that it also checks if `value`
-         * is an object.
-         *
-         * @static
-         * @memberOf _
-         * @type Function
-         * @category Lang
-         * @param {*} value The value to check.
-         * @returns {boolean} Returns `true` if `value` is an array-like object, else `false`.
-         * @example
-         *
-         * _.isArrayLikeObject([1, 2, 3]);
-         * // => true
-         *
-         * _.isArrayLikeObject(document.body.children);
-         * // => true
-         *
-         * _.isArrayLikeObject('abc');
-         * // => false
-         *
-         * _.isArrayLikeObject(_.noop);
-         * // => false
-         */
-        isArrayLikeObject<T>(value?: any): value is T[];
-    }
-
-    interface LoDashImplicitWrapperBase<T,TWrapper> {
-        /**
-         * @see _.isArrayLikeObject
-         */
-        isArrayLikeObject(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T,TWrapper> {
-        /**
-         * @see _.isArrayLikeObject
-         */
-        isArrayLikeObject(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isBoolean
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as a boolean primitive or object.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is correctly classified, else false.
-         */
-        isBoolean(value?: any): value is boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isBoolean
-         */
-        isBoolean(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isBoolean
-         */
-        isBoolean(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isBuffer
-    interface LoDashStatic {
-        /**
-         * Checks if value is a buffer.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is a buffer, else false.
-         */
-        isBuffer(value?: any): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isBuffer
-         */
-        isBuffer(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isBuffer
-         */
-        isBuffer(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isDate
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as a Date object.
-         * @param value The value to check.
-         *
-         * @return Returns true if value is correctly classified, else false.
-         */
-        isDate(value?: any): value is Date;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isDate
-         */
-        isDate(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isDate
-         */
-        isDate(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isElement
-    interface LoDashStatic {
-        /**
-         * Checks if value is a DOM element.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is a DOM element, else false.
-         */
-        isElement(value?: any): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isElement
-         */
-        isElement(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isElement
-         */
-        isElement(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isEmpty
-    interface LoDashStatic {
-        /**
-         * Checks if value is empty. A value is considered empty unless it’s an arguments object, array, string, or
-         * jQuery-like collection with a length greater than 0 or an object with own enumerable properties.
-         *
-         * @param value The value to inspect.
-         * @return Returns true if value is empty, else false.
-         */
-        isEmpty(value?: any): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isEmpty
-         */
-        isEmpty(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isEmpty
-         */
-        isEmpty(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isEqual
-    interface LoDashStatic {
-        /**
-         * Performs a deep comparison between two values to determine if they are
-         * equivalent.
-         *
-         * **Note:** This method supports comparing arrays, array buffers, booleans,
-         * date objects, error objects, maps, numbers, `Object` objects, regexes,
-         * sets, strings, symbols, and typed arrays. `Object` objects are compared
-         * by their own, not inherited, enumerable properties. Functions and DOM
-         * nodes are **not** supported.
-         *
-         * @static
-         * @memberOf _
-         * @category Lang
-         * @param {*} value The value to compare.
-         * @param {*} other The other value to compare.
-         * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
-         * @example
-         *
-         * var object = { 'user': 'fred' };
-         * var other = { 'user': 'fred' };
-         *
-         * _.isEqual(object, other);
-         * // => true
-         *
-         * object === other;
-         * // => false
-         */
-        isEqual(
-            value: any,
-            other: any
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isEqual
-         */
-        isEqual(
-            other: any
-        ): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isEqual
-         */
-        isEqual(
-            other: any
-        ): LoDashExplicitWrapper<boolean>;
-    }
-
-    // _.isEqualWith
-    interface IsEqualCustomizer {
-        (value: any, other: any, indexOrKey?: number|string): boolean;
-    }
-
-    interface LoDashStatic {
-        /**
-         * This method is like `_.isEqual` except that it accepts `customizer` which is
-         * invoked to compare values. If `customizer` returns `undefined` comparisons are
-         * handled by the method instead. The `customizer` is invoked with up to seven arguments:
-         * (objValue, othValue [, index|key, object, other, stack]).
-         *
-         * @static
-         * @memberOf _
-         * @category Lang
-         * @param {*} value The value to compare.
-         * @param {*} other The other value to compare.
-         * @param {Function} [customizer] The function to customize comparisons.
-         * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
-         * @example
-         *
-         * function isGreeting(value) {
-         *   return /^h(?:i|ello)$/.test(value);
-         * }
-         *
-         * function customizer(objValue, othValue) {
-         *   if (isGreeting(objValue) && isGreeting(othValue)) {
-         *     return true;
-         *   }
-         * }
-         *
-         * var array = ['hello', 'goodbye'];
-         * var other = ['hi', 'goodbye'];
-         *
-         * _.isEqualWith(array, other, customizer);
-         * // => true
-         */
-        isEqualWith(
-            value: any,
-            other: any,
-            customizer: IsEqualCustomizer
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isEqualWith
-         */
-        isEqualWith(
-            other: any,
-            customizer: IsEqualCustomizer
-        ): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isEqualWith
-         */
-        isEqualWith(
-            other: any,
-            customizer: IsEqualCustomizer
-        ): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isError
-    interface LoDashStatic {
-        /**
-         * Checks if value is an Error, EvalError, RangeError, ReferenceError, SyntaxError, TypeError, or URIError
-         * object.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is an error object, else false.
-         */
-        isError(value: any): value is Error;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isError
-         */
-        isError(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isError
-         */
-        isError(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isFinite
-    interface LoDashStatic {
-        /**
-         * Checks if value is a finite primitive number.
-         *
-         * Note: This method is based on Number.isFinite.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is a finite number, else false.
-         */
-        isFinite(value?: any): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isFinite
-         */
-        isFinite(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isFinite
-         */
-        isFinite(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isFunction
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as a Function object.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is correctly classified, else false.
-         */
-        isFunction(value?: any): value is Function;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isFunction
-         */
-        isFunction(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isFunction
-         */
-        isFunction(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isInteger
-    interface LoDashStatic {
-        /**
-         * Checks if `value` is an integer.
-         *
-         * **Note:** This method is based on [`Number.isInteger`](https://mdn.io/Number/isInteger).
-         *
-         * @static
-         * @memberOf _
-         * @category Lang
-         * @param {*} value The value to check.
-         * @returns {boolean} Returns `true` if `value` is an integer, else `false`.
-         * @example
-         *
-         * _.isInteger(3);
-         * // => true
-         *
-         * _.isInteger(Number.MIN_VALUE);
-         * // => false
-         *
-         * _.isInteger(Infinity);
-         * // => false
-         *
-         * _.isInteger('3');
-         * // => false
-         */
-        isInteger(value?: any): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isInteger
-         */
-        isInteger(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isInteger
-         */
-        isInteger(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isLength
-    interface LoDashStatic {
-        /**
-         * Checks if `value` is a valid array-like length.
-         *
-         * **Note:** This function is loosely based on [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).
-         *
-         * @static
-         * @memberOf _
-         * @category Lang
-         * @param {*} value The value to check.
-         * @returns {boolean} Returns `true` if `value` is a valid length, else `false`.
-         * @example
-         *
-         * _.isLength(3);
-         * // => true
-         *
-         * _.isLength(Number.MIN_VALUE);
-         * // => false
-         *
-         * _.isLength(Infinity);
-         * // => false
-         *
-         * _.isLength('3');
-         * // => false
-         */
-        isLength(value?: any): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isLength
-         */
-        isLength(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isLength
-         */
-        isLength(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isMap
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as a Map object.
-         *
-         * @param value The value to check.
-         * @returns Returns true if value is correctly classified, else false.
-         */
-        isMap<K, V>(value?: any): value is Map<K, V>;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isMap
-         */
-        isMap(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isMap
-         */
-        isMap(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isMatch
-    interface isMatchCustomizer {
-        (value: any, other: any, indexOrKey?: number|string): boolean;
-    }
-
-    interface LoDashStatic {
-        /**
-         * Performs a deep comparison between `object` and `source` to determine if
-         * `object` contains equivalent property values.
-         *
-         * **Note:** This method supports comparing the same values as `_.isEqual`.
-         *
-         * @static
-         * @memberOf _
-         * @category Lang
-         * @param {Object} object The object to inspect.
-         * @param {Object} source The object of property values to match.
-         * @returns {boolean} Returns `true` if `object` is a match, else `false`.
-         * @example
-         *
-         * var object = { 'user': 'fred', 'age': 40 };
-         *
-         * _.isMatch(object, { 'age': 40 });
-         * // => true
-         *
-         * _.isMatch(object, { 'age': 36 });
-         * // => false
-         */
-        isMatch(object: Object, source: Object): boolean;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.isMatch
-         */
-        isMatch(source: Object): boolean;
-    }
-
-    //_.isMatchWith
-    interface isMatchWithCustomizer {
-        (value: any, other: any, indexOrKey?: number|string): boolean;
-    }
-
-    interface LoDashStatic {
-        /**
-         * This method is like `_.isMatch` except that it accepts `customizer` which
-         * is invoked to compare values. If `customizer` returns `undefined` comparisons
-         * are handled by the method instead. The `customizer` is invoked with three
-         * arguments: (objValue, srcValue, index|key, object, source).
-         *
-         * @static
-         * @memberOf _
-         * @category Lang
-         * @param {Object} object The object to inspect.
-         * @param {Object} source The object of property values to match.
-         * @param {Function} [customizer] The function to customize comparisons.
-         * @returns {boolean} Returns `true` if `object` is a match, else `false`.
-         * @example
-         *
-         * function isGreeting(value) {
-         *   return /^h(?:i|ello)$/.test(value);
-         * }
-         *
-         * function customizer(objValue, srcValue) {
-         *   if (isGreeting(objValue) && isGreeting(srcValue)) {
-         *     return true;
-         *   }
-         * }
-         *
-         * var object = { 'greeting': 'hello' };
-         * var source = { 'greeting': 'hi' };
-         *
-         * _.isMatchWith(object, source, customizer);
-         * // => true
-         */
-        isMatchWith(object: Object, source: Object, customizer: isMatchWithCustomizer): boolean;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.isMatchWith
-         */
-        isMatchWith(source: Object, customizer: isMatchWithCustomizer): boolean;
-    }
-
-    //_.isNaN
-    interface LoDashStatic {
-        /**
-         * Checks if value is NaN.
-         *
-         * Note: This method is not the same as isNaN which returns true for undefined and other non-numeric values.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is NaN, else false.
-         */
-        isNaN(value?: any): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isNaN
-         */
-        isNaN(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isNaN
-         */
-        isNaN(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isNative
-    interface LoDashStatic {
-        /**
-         * Checks if value is a native function.
-         * @param value The value to check.
-         *
-         * @retrun Returns true if value is a native function, else false.
-         */
-        isNative(value: any): value is Function;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isNative
-         */
-        isNative(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isNative
-         */
-        isNative(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isNil
-    interface LoDashStatic {
-        /**
-         * Checks if `value` is `null` or `undefined`.
-         *
-         * @static
-         * @memberOf _
-         * @category Lang
-         * @param {*} value The value to check.
-         * @returns {boolean} Returns `true` if `value` is nullish, else `false`.
-         * @example
-         *
-         * _.isNil(null);
-         * // => true
-         *
-         * _.isNil(void 0);
-         * // => true
-         *
-         * _.isNil(NaN);
-         * // => false
-         */
-        isNil(value?: any): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isNil
-         */
-        isNil(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isNil
-         */
-        isNil(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isNull
-    interface LoDashStatic {
-        /**
-         * Checks if value is null.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is null, else false.
-         */
-        isNull(value?: any): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isNull
-         */
-        isNull(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isNull
-         */
-        isNull(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isNumber
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as a Number primitive or object.
-         *
-         * Note: To exclude Infinity, -Infinity, and NaN, which are classified as numbers, use the _.isFinite method.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is correctly classified, else false.
-         */
-        isNumber(value?: any): value is number;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isNumber
-         */
-        isNumber(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isNumber
-         */
-        isNumber(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isObject
-    interface LoDashStatic {
-        /**
-         * Checks if value is the language type of Object. (e.g. arrays, functions, objects, regexes, new Number(0),
-         * and new String(''))
-         *
-         * @param value The value to check.
-         * @return Returns true if value is an object, else false.
-         */
-        isObject(value?: any): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isObject
-         */
-        isObject(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isObject
-         */
-        isObject(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isObjectLike
-    interface LoDashStatic {
-        /**
-         * Checks if `value` is object-like. A value is object-like if it's not `null`
-         * and has a `typeof` result of "object".
-         *
-         * @static
-         * @memberOf _
-         * @category Lang
-         * @param {*} value The value to check.
-         * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
-         * @example
-         *
-         * _.isObjectLike({});
-         * // => true
-         *
-         * _.isObjectLike([1, 2, 3]);
-         * // => true
-         *
-         * _.isObjectLike(_.noop);
-         * // => false
-         *
-         * _.isObjectLike(null);
-         * // => false
-         */
-        isObjectLike(value?: any): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isObjectLike
-         */
-        isObjectLike(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isObjectLike
-         */
-        isObjectLike(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isPlainObject
-    interface LoDashStatic {
-        /**
-         * Checks if value is a plain object, that is, an object created by the Object constructor or one with a
-         * [[Prototype]] of null.
-         *
-         * Note: This method assumes objects created by the Object constructor have no inherited enumerable properties.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is a plain object, else false.
-         */
-        isPlainObject(value?: any): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isPlainObject
-         */
-        isPlainObject(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isPlainObject
-         */
-        isPlainObject(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isRegExp
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as a RegExp object.
-         * @param value The value to check.
-         *
-         * @return Returns true if value is correctly classified, else false.
-         */
-        isRegExp(value?: any): value is RegExp;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isRegExp
-         */
-        isRegExp(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isRegExp
-         */
-        isRegExp(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isSafeInteger
-    interface LoDashStatic {
-        /**
-         * Checks if `value` is a safe integer. An integer is safe if it's an IEEE-754
-         * double precision number which isn't the result of a rounded unsafe integer.
-         *
-         * **Note:** This method is based on [`Number.isSafeInteger`](https://mdn.io/Number/isSafeInteger).
-         *
-         * @static
-         * @memberOf _
-         * @category Lang
-         * @param {*} value The value to check.
-         * @returns {boolean} Returns `true` if `value` is a safe integer, else `false`.
-         * @example
-         *
-         * _.isSafeInteger(3);
-         * // => true
-         *
-         * _.isSafeInteger(Number.MIN_VALUE);
-         * // => false
-         *
-         * _.isSafeInteger(Infinity);
-         * // => false
-         *
-         * _.isSafeInteger('3');
-         * // => false
-         */
-        isSafeInteger(value: any): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isSafeInteger
-         */
-        isSafeInteger(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isSafeInteger
-         */
-        isSafeInteger(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isSet
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as a Set object.
-         *
-         * @param value The value to check.
-         * @returns Returns true if value is correctly classified, else false.
-         */
-        isSet<T>(value?: any): value is Set<T>;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isSet
-         */
-        isSet(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isSet
-         */
-        isSet(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isString
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as a String primitive or object.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is correctly classified, else false.
-         */
-        isString(value?: any): value is string;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isString
-         */
-        isString(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isString
-         */
-        isString(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isSymbol
-    interface LoDashStatic {
-        /**
-         * Checks if `value` is classified as a `Symbol` primitive or object.
-         *
-         * @static
-         * @memberOf _
-         * @category Lang
-         * @param {*} value The value to check.
-         * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.
-         * @example
-         *
-         * _.isSymbol(Symbol.iterator);
-         * // => true
-         *
-         * _.isSymbol('abc');
-         * // => false
-         */
-        isSymbol(value: any): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isSymbol
-         */
-        isSymbol(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isSymbol
-         */
-        isSymbol(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isTypedArray
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as a typed array.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is correctly classified, else false.
-         */
-        isTypedArray(value: any): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isTypedArray
-         */
-        isTypedArray(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isTypedArray
-         */
-        isTypedArray(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isUndefined
-    interface LoDashStatic {
-        /**
-         * Checks if value is undefined.
-         *
-         * @param value The value to check.
-         * @return Returns true if value is undefined, else false.
-         */
-        isUndefined(value: any): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isUndefined
-         */
-        isUndefined(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * see _.isUndefined
-         */
-        isUndefined(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isWeakMap
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as a WeakMap object.
-         *
-         * @param value The value to check.
-         * @returns Returns true if value is correctly classified, else false.
-         */
-        isWeakMap<K, V>(value?: any): value is WeakMap<K, V>;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isSet
-         */
-        isWeakMap(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isSet
-         */
-        isWeakMap(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.isWeakSet
-    interface LoDashStatic {
-        /**
-         * Checks if value is classified as a WeakSet object.
-         *
-         * @param value The value to check.
-         * @returns Returns true if value is correctly classified, else false.
-         */
-        isWeakSet<T>(value?: any): value is WeakSet<T>;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isWeakSet
-         */
-        isWeakSet(): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.isWeakSet
-         */
-        isWeakSet(): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.lt
-    interface LoDashStatic {
-        /**
-         * Checks if value is less than other.
-         *
-         * @param value The value to compare.
-         * @param other The other value to compare.
-         * @return Returns true if value is less than other, else false.
-         */
-        lt(
-            value: any,
-            other: any
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.lt
-         */
-        lt(other: any): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.lt
-         */
-        lt(other: any): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.lte
-    interface LoDashStatic {
-        /**
-         * Checks if value is less than or equal to other.
-         *
-         * @param value The value to compare.
-         * @param other The other value to compare.
-         * @return Returns true if value is less than or equal to other, else false.
-         */
-        lte(
-            value: any,
-            other: any
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.lte
-         */
-        lte(other: any): boolean;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.lte
-         */
-        lte(other: any): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.toArray
-    interface LoDashStatic {
-        /**
-         * Converts value to an array.
-         *
-         * @param value The value to convert.
-         * @return Returns the converted array.
-         */
-        toArray<T>(value: List<T>|Dictionary<T>|NumericDictionary<T>): T[];
-
-        /**
-         * @see _.toArray
-         */
-        toArray<TValue, TResult>(value: TValue): TResult[];
-
-        /**
-         * @see _.toArray
-         */
-        toArray<TResult>(value?: any): TResult[];
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.toArray
-         */
-        toArray<TResult>(): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.toArray
-         */
-        toArray(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.toArray
-         */
-        toArray<TResult>(): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.toArray
-         */
-        toArray<TResult>(): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.toArray
-         */
-        toArray(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.toArray
-         */
-        toArray<TResult>(): LoDashExplicitArrayWrapper<TResult>;
-    }
-
-    //_.toPlainObject
-    interface LoDashStatic {
-        /**
-         * Converts value to a plain object flattening inherited enumerable properties of value to own properties
-         * of the plain object.
-         *
-         * @param value The value to convert.
-         * @return Returns the converted plain object.
-         */
-        toPlainObject<TResult extends {}>(value?: any): TResult;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.toPlainObject
-         */
-        toPlainObject<TResult extends {}>(): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    //_.toInteger
-    interface LoDashStatic {
-        /**
-         * Converts `value` to an integer.
-         *
-         * **Note:** This function is loosely based on [`ToInteger`](http://www.ecma-international.org/ecma-262/6.0/#sec-tointeger).
-         *
-         * @static
-         * @memberOf _
-         * @category Lang
-         * @param {*} value The value to convert.
-         * @returns {number} Returns the converted integer.
-         * @example
-         *
-         * _.toInteger(3);
-         * // => 3
-         *
-         * _.toInteger(Number.MIN_VALUE);
-         * // => 0
-         *
-         * _.toInteger(Infinity);
-         * // => 1.7976931348623157e+308
-         *
-         * _.toInteger('3');
-         * // => 3
-         */
-        toInteger(value: any): number;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.toInteger
-         */
-        toInteger(): LoDashImplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.toInteger
-         */
-        toInteger(): LoDashExplicitWrapper<number>;
-    }
-
-    //_.toLength
-    interface LoDashStatic {
-        /**
-         * Converts `value` to an integer suitable for use as the length of an
-         * array-like object.
-         *
-         * **Note:** This method is based on [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).
-         *
-         * @static
-         * @memberOf _
-         * @category Lang
-         * @param {*} value The value to convert.
-         * @return {number} Returns the converted integer.
-         * @example
-         *
-         * _.toLength(3);
-         * // => 3
-         *
-         * _.toLength(Number.MIN_VALUE);
-         * // => 0
-         *
-         * _.toLength(Infinity);
-         * // => 4294967295
-         *
-         * _.toLength('3');
-         * // => 3
-         */
-        toLength(value: any): number;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.toLength
-         */
-        toLength(): LoDashImplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.toLength
-         */
-        toLength(): LoDashExplicitWrapper<number>;
-    }
-
-    //_.toNumber
-    interface LoDashStatic {
-        /**
-         * Converts `value` to a number.
-         *
-         * @static
-         * @memberOf _
-         * @category Lang
-         * @param {*} value The value to process.
-         * @returns {number} Returns the number.
-         * @example
-         *
-         * _.toNumber(3);
-         * // => 3
-         *
-         * _.toNumber(Number.MIN_VALUE);
-         * // => 5e-324
-         *
-         * _.toNumber(Infinity);
-         * // => Infinity
-         *
-         * _.toNumber('3');
-         * // => 3
-         */
-        toNumber(value: any): number;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.toNumber
-         */
-        toNumber(): LoDashImplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.toNumber
-         */
-        toNumber(): LoDashExplicitWrapper<number>;
-    }
-
-    //_.toSafeInteger
-    interface LoDashStatic {
-        /**
-         * Converts `value` to a safe integer. A safe integer can be compared and
-         * represented correctly.
-         *
-         * @static
-         * @memberOf _
-         * @category Lang
-         * @param {*} value The value to convert.
-         * @returns {number} Returns the converted integer.
-         * @example
-         *
-         * _.toSafeInteger(3);
-         * // => 3
-         *
-         * _.toSafeInteger(Number.MIN_VALUE);
-         * // => 0
-         *
-         * _.toSafeInteger(Infinity);
-         * // => 9007199254740991
-         *
-         * _.toSafeInteger('3');
-         * // => 3
-         */
-        toSafeInteger(value: any): number;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.toSafeInteger
-         */
-        toSafeInteger(): LoDashImplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.toSafeInteger
-         */
-        toSafeInteger(): LoDashExplicitWrapper<number>;
-    }
-
-    //_.toString DUMMY
-    interface LoDashStatic {
-        /**
-         * Converts `value` to a string if it's not one. An empty string is returned
-         * for `null` and `undefined` values. The sign of `-0` is preserved.
-         *
-         * @static
-         * @memberOf _
-         * @category Lang
-         * @param {*} value The value to process.
-         * @returns {string} Returns the string.
-         * @example
-         *
-         * _.toString(null);
-         * // => ''
-         *
-         * _.toString(-0);
-         * // => '-0'
-         *
-         * _.toString([1, 2, 3]);
-         * // => '1,2,3'
-         */
-        toString(value: any): string;
-    }
-
-    /********
-     * Math *
-     ********/
-
-    //_.add
-    interface LoDashStatic {
-        /**
-         * Adds two numbers.
-         *
-         * @param augend The first number to add.
-         * @param addend The second number to add.
-         * @return Returns the sum.
-         */
-        add(
-            augend: number,
-            addend: number
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.add
-         */
-        add(addend: number): number;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.add
-         */
-        add(addend: number): LoDashExplicitWrapper<number>;
-    }
-
-    //_.ceil
-    interface LoDashStatic {
-        /**
-         * Calculates n rounded up to precision.
-         *
-         * @param n The number to round up.
-         * @param precision The precision to round up to.
-         * @return Returns the rounded up number.
-         */
-        ceil(
-            n: number,
-            precision?: number
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.ceil
-         */
-        ceil(precision?: number): number;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.ceil
-         */
-        ceil(precision?: number): LoDashExplicitWrapper<number>;
-    }
-
-    //_.floor
-    interface LoDashStatic {
-        /**
-         * Calculates n rounded down to precision.
-         *
-         * @param n The number to round down.
-         * @param precision The precision to round down to.
-         * @return Returns the rounded down number.
-         */
-        floor(
-            n: number,
-            precision?: number
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.floor
-         */
-        floor(precision?: number): number;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.floor
-         */
-        floor(precision?: number): LoDashExplicitWrapper<number>;
-    }
-
-    //_.max
-    interface LoDashStatic {
-         /**
-          * Computes the maximum value of `array`. If `array` is empty or falsey
-          * `undefined` is returned.
-          *
-          * @static
-          * @memberOf _
-          * @category Math
-          * @param {Array} array The array to iterate over.
-          * @returns {*} Returns the maximum value.
-          */
-        max<T>(
-            collection: List<T>
-        ): T;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.max
-         */
-        max(): T;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.max
-         */
-        max<T>(): T;
-    }
-
-    //_.maxBy
-    interface LoDashStatic {
-        /**
-         * This method is like `_.max` except that it accepts `iteratee` which is
-         * invoked for each element in `array` to generate the criterion by which
-         * the value is ranked. The iteratee is invoked with one argument: (value).
-         *
-         * @static
-         * @memberOf _
-         * @category Math
-         * @param {Array} array The array to iterate over.
-         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
-         * @returns {*} Returns the maximum value.
-         * @example
-         *
-         * var objects = [{ 'n': 1 }, { 'n': 2 }];
-         *
-         * _.maxBy(objects, function(o) { return o.a; });
-         * // => { 'n': 2 }
-         *
-         * // using the `_.property` iteratee shorthand
-         * _.maxBy(objects, 'n');
-         * // => { 'n': 2 }
-         */
-        maxBy<T>(
-            collection: List<T>,
-            iteratee?: ListIterator<T, any>
-        ): T;
-
-        /**
-         * @see _.maxBy
-         */
-        maxBy<T>(
-            collection: Dictionary<T>,
-            iteratee?: DictionaryIterator<T, any>
-        ): T;
-
-        /**
-         * @see _.maxBy
-         */
-        maxBy<T>(
-            collection: List<T>|Dictionary<T>,
-            iteratee?: string
-        ): T;
-
-        /**
-         * @see _.maxBy
-         */
-        maxBy<TObject extends {}, T>(
-            collection: List<T>|Dictionary<T>,
-            whereValue?: TObject
-        ): T;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.maxBy
-         */
-        maxBy(
-            iteratee?: ListIterator<T, any>
-        ): T;
-
-        /**
-         * @see _.maxBy
-         */
-        maxBy(
-            iteratee?: string
-        ): T;
-
-        /**
-         * @see _.maxBy
-         */
-        maxBy<TObject extends {}>(
-            whereValue?: TObject
-        ): T;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.maxBy
-         */
-        maxBy<T>(
-            iteratee?: ListIterator<T, any>|DictionaryIterator<T, any>,
-            thisArg?: any
-        ): T;
-
-        /**
-         * @see _.maxBy
-         */
-        maxBy<T>(
-            iteratee?: string,
-            thisArg?: any
-        ): T;
-
-        /**
-         * @see _.maxBy
-         */
-        maxBy<TObject extends {}, T>(
-            whereValue?: TObject
-        ): T;
-    }
-
-    //_.mean
-    interface LoDashStatic {
-        /**
-         * Computes the mean of the values in `array`.
-         *
-         * @static
-         * @memberOf _
-         * @category Math
-         * @param {Array} array The array to iterate over.
-         * @returns {number} Returns the mean.
-         * @example
-         *
-         * _.mean([4, 2, 8, 6]);
-         * // => 5
-         */
-        mean<T>(
-            collection: List<T>
-        ): number;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.mean
-         */
-        mean<T>(): number;
-
-        /**
-         * @see _.mean
-         */
-        mean(): number;
-    }
-
-    //_.min
-    interface LoDashStatic {
-        /**
-         * Computes the minimum value of `array`. If `array` is empty or falsey
-         * `undefined` is returned.
-         *
-         * @static
-         * @memberOf _
-         * @category Math
-         * @param {Array} array The array to iterate over.
-         * @returns {*} Returns the minimum value.
-         */
-        min<T>(
-            collection: List<T>
-        ): T;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.min
-         */
-        min(): T;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.min
-         */
-        min<T>(): T;
-    }
-
-    //_.minBy
-    interface LoDashStatic {
-        /**
-         * This method is like `_.min` except that it accepts `iteratee` which is
-         * invoked for each element in `array` to generate the criterion by which
-         * the value is ranked. The iteratee is invoked with one argument: (value).
-         *
-         * @static
-         * @memberOf _
-         * @category Math
-         * @param {Array} array The array to iterate over.
-         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
-         * @returns {*} Returns the minimum value.
-         * @example
-         *
-         * var objects = [{ 'n': 1 }, { 'n': 2 }];
-         *
-         * _.minBy(objects, function(o) { return o.a; });
-         * // => { 'n': 1 }
-         *
-         * // using the `_.property` iteratee shorthand
-         * _.minBy(objects, 'n');
-         * // => { 'n': 1 }
-         */
-        minBy<T>(
-            collection: List<T>,
-            iteratee?: ListIterator<T, any>
-        ): T;
-
-        /**
-         * @see _.minBy
-         */
-        minBy<T>(
-            collection: Dictionary<T>,
-            iteratee?: DictionaryIterator<T, any>
-        ): T;
-
-        /**
-         * @see _.minBy
-         */
-        minBy<T>(
-            collection: List<T>|Dictionary<T>,
-            iteratee?: string
-        ): T;
-
-        /**
-         * @see _.minBy
-         */
-        minBy<TObject extends {}, T>(
-            collection: List<T>|Dictionary<T>,
-            whereValue?: TObject
-        ): T;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.minBy
-         */
-        minBy(
-            iteratee?: ListIterator<T, any>
-        ): T;
-
-        /**
-         * @see _.minBy
-         */
-        minBy(
-            iteratee?: string
-        ): T;
-
-        /**
-         * @see _.minBy
-         */
-        minBy<TObject extends {}>(
-            whereValue?: TObject
-        ): T;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.minBy
-         */
-        minBy<T>(
-            iteratee?: ListIterator<T, any>|DictionaryIterator<T, any>,
-            thisArg?: any
-        ): T;
-
-        /**
-         * @see _.minBy
-         */
-        minBy<T>(
-            iteratee?: string,
-            thisArg?: any
-        ): T;
-
-        /**
-         * @see _.minBy
-         */
-        minBy<TObject extends {}, T>(
-            whereValue?: TObject
-        ): T;
-    }
-
-    //_.round
-    interface LoDashStatic {
-        /**
-         * Calculates n rounded to precision.
-         *
-         * @param n The number to round.
-         * @param precision The precision to round to.
-         * @return Returns the rounded number.
-         */
-        round(
-            n: number,
-            precision?: number
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.round
-         */
-        round(precision?: number): number;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.round
-         */
-        round(precision?: number): LoDashExplicitWrapper<number>;
-    }
-
-    //_.sum
-    interface LoDashStatic {
-        /**
-         * Computes the sum of the values in `array`.
-         *
-         * @static
-         * @memberOf _
-         * @category Math
-         * @param {Array} array The array to iterate over.
-         * @returns {number} Returns the sum.
-         * @example
-         *
-         * _.sum([4, 2, 8, 6]);
-         * // => 20
-         */
-        sum<T>(collection: List<T>): number;
-
-        /**
-         * @see _.sum
-         */
-        sum(collection: List<number>|Dictionary<number>): number;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.sum
-         */
-        sum(): number;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.sum
-         **/
-        sum<TValue>(): number;
-
-        /**
-         * @see _.sum
-         */
-        sum(): number;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.sum
-         */
-        sum(): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.sum
-         */
-        sum<TValue>(): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sum
-         */
-        sum(): LoDashExplicitWrapper<number>;
-    }
-
-    //_.sumBy
-    interface LoDashStatic {
-        /**
-         * This method is like `_.sum` except that it accepts `iteratee` which is
-         * invoked for each element in `array` to generate the value to be summed.
-         * The iteratee is invoked with one argument: (value).
-         *
-         * @static
-         * @memberOf _
-         * @category Math
-         * @param {Array} array The array to iterate over.
-         * @param {Function|Object|string} [iteratee=_.identity] The iteratee invoked per element.
-         * @returns {number} Returns the sum.
-         * @example
-         *
-         * var objects = [{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }];
-         *
-         * _.sumBy(objects, function(o) { return o.n; });
-         * // => 20
-         *
-         * // using the `_.property` iteratee shorthand
-         * _.sumBy(objects, 'n');
-         * // => 20
-         */
-        sumBy<T>(
-            collection: List<T>,
-            iteratee: ListIterator<T, number>
-        ): number;
-
-        /**
-         * @see _.sumBy
-         **/
-        sumBy<T>(
-            collection: Dictionary<T>,
-            iteratee: DictionaryIterator<T, number>
-        ): number;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy<T>(
-            collection: List<number>|Dictionary<number>,
-            iteratee: string
-        ): number;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy<T>(collection: List<T>|Dictionary<T>): number;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy(collection: List<number>|Dictionary<number>): number;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.sumBy
-         */
-        sumBy(
-            iteratee: ListIterator<T, number>
-        ): number;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy(iteratee: string): number;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy(): number;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.sumBy
-         **/
-        sumBy<TValue>(
-            iteratee: ListIterator<TValue, number>|DictionaryIterator<TValue, number>
-        ): number;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy(iteratee: string): number;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy(): number;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.sumBy
-         */
-        sumBy(
-            iteratee: ListIterator<T, number>
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy(iteratee: string): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy(): LoDashExplicitWrapper<number>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.sumBy
-         */
-        sumBy<TValue>(
-            iteratee: ListIterator<TValue, number>|DictionaryIterator<TValue, number>
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy(iteratee: string): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sumBy
-         */
-        sumBy(): LoDashExplicitWrapper<number>;
-    }
-
-    /**********
-     * Number *
-     **********/
-
-    //_.subtract
-    interface LoDashStatic {
-        /**
-         * Subtract two numbers.
-         *
-         * @static
-         * @memberOf _
-         * @category Math
-         * @param {number} minuend The first number in a subtraction.
-         * @param {number} subtrahend The second number in a subtraction.
-         * @returns {number} Returns the difference.
-         * @example
-         *
-         * _.subtract(6, 4);
-         * // => 2
-         */
-        subtract(
-            minuend: number,
-            subtrahend: number
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.subtract
-         */
-        subtract(
-            subtrahend: number
-        ): number;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.subtract
-         */
-        subtract(
-            subtrahend: number
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    //_.clamp
-    interface LoDashStatic {
-        /**
-         * Clamps `number` within the inclusive `lower` and `upper` bounds.
-         *
-         * @static
-         * @memberOf _
-         * @category Number
-         * @param {number} number The number to clamp.
-         * @param {number} [lower] The lower bound.
-         * @param {number} upper The upper bound.
-         * @returns {number} Returns the clamped number.
-         * @example
-         *
-         * _.clamp(-10, -5, 5);
-         * // => -5
-         *
-         * _.clamp(10, -5, 5);
-         * // => 5
-         */
-        clamp(
-            number: number,
-            lower: number,
-            upper: number
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.clamp
-         */
-        clamp(
-            lower: number,
-            upper: number
-        ): number;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.clamp
-         */
-        clamp(
-            lower: number,
-            upper: number
-        ): LoDashExplicitWrapper<number>;
-    }
-
-    //_.inRange
-    interface LoDashStatic {
-        /**
-         * Checks if n is between start and up to but not including, end. If end is not specified it’s set to start
-         * with start then set to 0.
-         *
-         * @param n The number to check.
-         * @param start The start of the range.
-         * @param end The end of the range.
-         * @return Returns true if n is in the range, else false.
-         */
-        inRange(
-            n: number,
-            start: number,
-            end: number
-        ): boolean;
-
-
-        /**
-         * @see _.inRange
-         */
-        inRange(
-            n: number,
-            end: number
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.inRange
-         */
-        inRange(
-            start: number,
-            end: number
-        ): boolean;
-
-        /**
-         * @see _.inRange
-         */
-        inRange(end: number): boolean;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.inRange
-         */
-        inRange(
-            start: number,
-            end: number
-        ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.inRange
-         */
-        inRange(end: number): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.random
-    interface LoDashStatic {
-        /**
-         * Produces a random number between min and max (inclusive). If only one argument is provided a number between
-         * 0 and the given number is returned. If floating is true, or either min or max are floats, a floating-point
-         * number is returned instead of an integer.
-         *
-         * @param min The minimum possible value.
-         * @param max The maximum possible value.
-         * @param floating Specify returning a floating-point number.
-         * @return Returns the random number.
-         */
-        random(
-            min?: number,
-            max?: number,
-            floating?: boolean
-        ): number;
-
-        /**
-         * @see _.random
-         */
-        random(
-            min?: number,
-            floating?: boolean
-        ): number;
-
-        /**
-         * @see _.random
-         */
-        random(floating?: boolean): number;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.random
-         */
-        random(
-            max?: number,
-            floating?: boolean
-        ): number;
-
-        /**
-         * @see _.random
-         */
-        random(floating?: boolean): number;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.random
-         */
-        random(
-            max?: number,
-            floating?: boolean
-        ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.random
-         */
-        random(floating?: boolean): LoDashExplicitWrapper<number>;
-    }
-
-    /**********
-     * Object *
-     **********/
-
-    //_.assign
-    interface LoDashStatic {
-        /**
-         * Assigns own enumerable properties of source objects to the destination
-         * object. Source objects are applied from left to right. Subsequent sources
-         * overwrite property assignments of previous sources.
-         *
-         * **Note:** This method mutates `object` and is loosely based on
-         * [`Object.assign`](https://mdn.io/Object/assign).
-         *
-         * @static
-         * @memberOf _
-         * @category Object
-         * @param {Object} object The destination object.
-         * @param {...Object} [sources] The source objects.
-         * @returns {Object} Returns `object`.
-         * @example
-         *
-         * function Foo() {
-         *   this.c = 3;
-         * }
-         *
-         * function Bar() {
-         *   this.e = 5;
-         * }
-         *
-         * Foo.prototype.d = 4;
-         * Bar.prototype.f = 6;
-         *
-         * _.assign({ 'a': 1 }, new Foo, new Bar);
-         * // => { 'a': 1, 'c': 3, 'e': 5 }
-         */
-        assign<TObject extends {}, TSource extends {}, TResult extends {}>(
-            object: TObject,
-            source: TSource
-        ): TResult;
-
-        /**
-         * @see assign
-         */
-        assign<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2
-        ): TResult;
-
-        /**
-         * @see assign
-         */
-        assign<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): TResult;
-
-        /**
-         * @see assign
-         */
-        assign<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {},
-            TResult extends {}>
-        (
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): TResult;
-
-        /**
-         * @see _.assign
-         */
-        assign<TObject extends {}>(object: TObject): TObject;
-
-        /**
-         * @see _.assign
-         */
-        assign<TObject extends {}, TResult extends {}>(
-            object: TObject, ...otherArgs: any[]
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.assign
-         */
-        assign<TSource extends {}, TResult extends {}>(
-            source: TSource
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assign
-         */
-        assign<TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assign
-         */
-        assign<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assign
-         */
-        assign<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.assign
-         */
-        assign(): LoDashImplicitObjectWrapper<T>;
-
-        /**
-         * @see _.assign
-         */
-        assign<TResult extends {}>(...otherArgs: any[]): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.assign
-         */
-        assign<TSource extends {}, TResult extends {}>(
-            source: TSource
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assign
-         */
-        assign<TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assign
-         */
-        assign<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assign
-         */
-        assign<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.assign
-         */
-        assign(): LoDashExplicitObjectWrapper<T>;
-
-        /**
-         * @see _.assign
-         */
-        assign<TResult extends {}>(...otherArgs: any[]): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.assignWith
-    interface AssignCustomizer {
-        (objectValue: any, sourceValue: any, key?: string, object?: {}, source?: {}): any;
-    }
-
-    interface LoDashStatic {
-        /**
-         * This method is like `_.assign` except that it accepts `customizer` which
-         * is invoked to produce the assigned values. If `customizer` returns `undefined`
-         * assignment is handled by the method instead. The `customizer` is invoked
-         * with five arguments: (objValue, srcValue, key, object, source).
-         *
-         * **Note:** This method mutates `object`.
-         *
-         * @static
-         * @memberOf _
-         * @category Object
-         * @param {Object} object The destination object.
-         * @param {...Object} sources The source objects.
-         * @param {Function} [customizer] The function to customize assigned values.
-         * @returns {Object} Returns `object`.
-         * @example
-         *
-         * function customizer(objValue, srcValue) {
-         *   return _.isUndefined(objValue) ? srcValue : objValue;
-         * }
-         *
-         * var defaults = _.partialRight(_.assignWith, customizer);
-         *
-         * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-         * // => { 'a': 1, 'b': 2 }
-         */
-        assignWith<TObject extends {}, TSource extends {}, TResult extends {}>(
-            object: TObject,
-            source: TSource,
-            customizer: AssignCustomizer
-        ): TResult;
-
-        /**
-         * @see assignWith
-         */
-        assignWith<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            customizer: AssignCustomizer
-        ): TResult;
-
-        /**
-         * @see assignWith
-         */
-        assignWith<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            customizer: AssignCustomizer
-        ): TResult;
-
-        /**
-         * @see assignWith
-         */
-        assignWith<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {},
-            TResult extends {}>
-        (
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4,
-            customizer: AssignCustomizer
-        ): TResult;
-
-        /**
-         * @see _.assignWith
-         */
-        assignWith<TObject extends {}>(object: TObject): TObject;
-
-        /**
-         * @see _.assignWith
-         */
-        assignWith<TObject extends {}, TResult extends {}>(
-            object: TObject, ...otherArgs: any[]
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.assignWith
-         */
-        assignWith<TSource extends {}, TResult extends {}>(
-            source: TSource,
-            customizer: AssignCustomizer
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assignWith
-         */
-        assignWith<TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            customizer: AssignCustomizer
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assignWith
-         */
-        assignWith<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            customizer: AssignCustomizer
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assignWith
-         */
-        assignWith<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4,
-            customizer: AssignCustomizer
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.assignWith
-         */
-        assignWith(): LoDashImplicitObjectWrapper<T>;
-
-        /**
-         * @see _.assignWith
-         */
-        assignWith<TResult extends {}>(...otherArgs: any[]): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.assignWith
-         */
-        assignWith<TSource extends {}, TResult extends {}>(
-            source: TSource,
-            customizer: AssignCustomizer
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assignWith
-         */
-        assignWith<TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            customizer: AssignCustomizer
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assignWith
-         */
-        assignWith<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            customizer: AssignCustomizer
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assignWith
-         */
-        assignWith<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4,
-            customizer: AssignCustomizer
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.assignWith
-         */
-        assignWith(): LoDashExplicitObjectWrapper<T>;
-
-        /**
-         * @see _.assignWith
-         */
-        assignWith<TResult extends {}>(...otherArgs: any[]): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.assignIn
-    interface LoDashStatic {
-        /**
-         * This method is like `_.assign` except that it iterates over own and
-         * inherited source properties.
-         *
-         * **Note:** This method mutates `object`.
-         *
-         * @static
-         * @memberOf _
-         * @alias extend
-         * @category Object
-         * @param {Object} object The destination object.
-         * @param {...Object} [sources] The source objects.
-         * @returns {Object} Returns `object`.
-         * @example
-         *
-         * function Foo() {
-         *   this.b = 2;
-         * }
-         *
-         * function Bar() {
-         *   this.d = 4;
-         * }
-         *
-         * Foo.prototype.c = 3;
-         * Bar.prototype.e = 5;
-         *
-         * _.assignIn({ 'a': 1 }, new Foo, new Bar);
-         * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
-         */
-        assignIn<TObject extends {}, TSource extends {}, TResult extends {}>(
-            object: TObject,
-            source: TSource
-        ): TResult;
-
-        /**
-         * @see assignIn
-         */
-        assignIn<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2
-        ): TResult;
-
-        /**
-         * @see assignIn
-         */
-        assignIn<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): TResult;
-
-        /**
-         * @see assignIn
-         */
-        assignIn<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {},
-            TResult extends {}>
-        (
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): TResult;
-
-        /**
-         * @see _.assignIn
-         */
-        assignIn<TObject extends {}>(object: TObject): TObject;
-
-        /**
-         * @see _.assignIn
-         */
-        assignIn<TObject extends {}, TResult extends {}>(
-            object: TObject, ...otherArgs: any[]
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.assignIn
-         */
-        assignIn<TSource extends {}, TResult extends {}>(
-            source: TSource
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assignIn
-         */
-        assignIn<TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assignIn
-         */
-        assignIn<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assignIn
-         */
-        assignIn<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.assignIn
-         */
-        assignIn(): LoDashImplicitObjectWrapper<T>;
-
-        /**
-         * @see _.assignIn
-         */
-        assignIn<TResult extends {}>(...otherArgs: any[]): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.assignIn
-         */
-        assignIn<TSource extends {}, TResult extends {}>(
-            source: TSource
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assignIn
-         */
-        assignIn<TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assignIn
-         */
-        assignIn<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assignIn
-         */
-        assignIn<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.assignIn
-         */
-        assignIn(): LoDashExplicitObjectWrapper<T>;
-
-        /**
-         * @see _.assignIn
-         */
-        assignIn<TResult extends {}>(...otherArgs: any[]): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.assignInWith
-    interface AssignCustomizer {
-        (objectValue: any, sourceValue: any, key?: string, object?: {}, source?: {}): any;
-    }
-
-    interface LoDashStatic {
-        /**
-         * This method is like `_.assignIn` except that it accepts `customizer` which
-         * is invoked to produce the assigned values. If `customizer` returns `undefined`
-         * assignment is handled by the method instead. The `customizer` is invoked
-         * with five arguments: (objValue, srcValue, key, object, source).
-         *
-         * **Note:** This method mutates `object`.
-         *
-         * @static
-         * @memberOf _
-         * @alias extendWith
-         * @category Object
-         * @param {Object} object The destination object.
-         * @param {...Object} sources The source objects.
-         * @param {Function} [customizer] The function to customize assigned values.
-         * @returns {Object} Returns `object`.
-         * @example
-         *
-         * function customizer(objValue, srcValue) {
-         *   return _.isUndefined(objValue) ? srcValue : objValue;
-         * }
-         *
-         * var defaults = _.partialRight(_.assignInWith, customizer);
-         *
-         * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-         * // => { 'a': 1, 'b': 2 }
-         */
-        assignInWith<TObject extends {}, TSource extends {}, TResult extends {}>(
-            object: TObject,
-            source: TSource,
-            customizer: AssignCustomizer
-        ): TResult;
-
-        /**
-         * @see assignInWith
-         */
-        assignInWith<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            customizer: AssignCustomizer
-        ): TResult;
-
-        /**
-         * @see assignInWith
-         */
-        assignInWith<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            customizer: AssignCustomizer
-        ): TResult;
-
-        /**
-         * @see assignInWith
-         */
-        assignInWith<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {},
-            TResult extends {}>
-        (
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4,
-            customizer: AssignCustomizer
-        ): TResult;
-
-        /**
-         * @see _.assignInWith
-         */
-        assignInWith<TObject extends {}>(object: TObject): TObject;
-
-        /**
-         * @see _.assignInWith
-         */
-        assignInWith<TObject extends {}, TResult extends {}>(
-            object: TObject, ...otherArgs: any[]
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.assignInWith
-         */
-        assignInWith<TSource extends {}, TResult extends {}>(
-            source: TSource,
-            customizer: AssignCustomizer
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assignInWith
-         */
-        assignInWith<TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            customizer: AssignCustomizer
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assignInWith
-         */
-        assignInWith<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            customizer: AssignCustomizer
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assignInWith
-         */
-        assignInWith<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4,
-            customizer: AssignCustomizer
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.assignInWith
-         */
-        assignInWith(): LoDashImplicitObjectWrapper<T>;
-
-        /**
-         * @see _.assignInWith
-         */
-        assignInWith<TResult extends {}>(...otherArgs: any[]): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.assignInWith
-         */
-        assignInWith<TSource extends {}, TResult extends {}>(
-            source: TSource,
-            customizer: AssignCustomizer
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assignInWith
-         */
-        assignInWith<TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            customizer: AssignCustomizer
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assignInWith
-         */
-        assignInWith<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            customizer: AssignCustomizer
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assignInWith
-         */
-        assignInWith<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4,
-            customizer: AssignCustomizer
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.assignInWith
-         */
-        assignInWith(): LoDashExplicitObjectWrapper<T>;
-
-        /**
-         * @see _.assignInWith
-         */
-        assignInWith<TResult extends {}>(...otherArgs: any[]): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.create
-    interface LoDashStatic {
-        /**
-         * Creates an object that inherits from the given prototype object. If a properties object is provided its own
-         * enumerable properties are assigned to the created object.
-         *
-         * @param prototype The object to inherit from.
-         * @param properties The properties to assign to the object.
-         * @return Returns the new object.
-         */
-        create<T extends Object, U extends Object>(
-            prototype: T,
-            properties?: U
-        ): T & U;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.create
-         */
-        create<U extends Object>(properties?: U): LoDashImplicitObjectWrapper<T & U>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.create
-         */
-        create<U extends Object>(properties?: U): LoDashExplicitObjectWrapper<T & U>;
-    }
-
-    //_.defaults
-    interface LoDashStatic {
-        /**
-         * Assigns own enumerable properties of source object(s) to the destination object for all destination
-         * properties that resolve to undefined. Once a property is set, additional values of the same property are
-         * ignored.
-         *
-         * Note: This method mutates object.
-         *
-         * @param object The destination object.
-         * @param sources The source objects.
-         * @return The destination object.
-         */
-        defaults<Obj extends {}, TResult extends {}>(
-            object: Obj,
-            ...sources: {}[]
-        ): TResult;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<Obj extends {}, S1 extends {}, TResult extends {}>(
-            object: Obj,
-            source1: S1,
-            ...sources: {}[]
-        ): TResult;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<Obj extends {}, S1 extends {}, S2 extends {}, TResult extends {}>(
-            object: Obj,
-            source1: S1,
-            source2: S2,
-            ...sources: {}[]
-        ): TResult;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<Obj extends {}, S1 extends {}, S2 extends {}, S3 extends {}, TResult extends {}>(
-            object: Obj,
-            source1: S1,
-            source2: S2,
-            source3: S3,
-            ...sources: {}[]
-        ): TResult;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<Obj extends {}, S1 extends {}, S2 extends {}, S3 extends {}, S4 extends {}, TResult extends {}>(
-            object: Obj,
-            source1: S1,
-            source2: S2,
-            source3: S3,
-            source4: S4,
-            ...sources: {}[]
-        ): TResult;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<TResult extends {}>(
-            object: {},
-            ...sources: {}[]
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.defaults
-         */
-        defaults<S1 extends {}, TResult extends {}>(
-            source1: S1,
-            ...sources: {}[]
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<S1 extends {}, S2 extends {}, TResult extends {}>(
-            source1: S1,
-            source2: S2,
-            ...sources: {}[]
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<S1 extends {}, S2 extends {}, S3 extends {}, TResult extends {}>(
-            source1: S1,
-            source2: S2,
-            source3: S3,
-            ...sources: {}[]
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<S1 extends {}, S2 extends {}, S3 extends {}, S4 extends {}, TResult extends {}>(
-            source1: S1,
-            source2: S2,
-            source3: S3,
-            source4: S4,
-            ...sources: {}[]
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.defaults
-         */
-        defaults(): LoDashImplicitObjectWrapper<T>;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<TResult>(...sources: {}[]): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.defaults
-         */
-        defaults<S1 extends {}, TResult extends {}>(
-            source1: S1,
-            ...sources: {}[]
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<S1 extends {}, S2 extends {}, TResult extends {}>(
-            source1: S1,
-            source2: S2,
-            ...sources: {}[]
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<S1 extends {}, S2 extends {}, S3 extends {}, TResult extends {}>(
-            source1: S1,
-            source2: S2,
-            source3: S3,
-            ...sources: {}[]
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<S1 extends {}, S2 extends {}, S3 extends {}, S4 extends {}, TResult extends {}>(
-            source1: S1,
-            source2: S2,
-            source3: S3,
-            source4: S4,
-            ...sources: {}[]
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.defaults
-         */
-        defaults(): LoDashExplicitObjectWrapper<T>;
-
-        /**
-         * @see _.defaults
-         */
-        defaults<TResult>(...sources: {}[]): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.defaultsDeep
-    interface LoDashStatic {
-        /**
-         * This method is like _.defaults except that it recursively assigns default properties.
-         * @param object The destination object.
-         * @param sources The source objects.
-         * @return Returns object.
-         **/
-        defaultsDeep<T, TResult>(
-            object: T,
-            ...sources: any[]): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.defaultsDeep
-         **/
-        defaultsDeep<TResult>(...sources: any[]): LoDashImplicitObjectWrapper<TResult>
-    }
-
-    //_.extend
-    interface LoDashStatic {
-        /**
-         * @see assign
-         */
-        extend<TObject extends {}, TSource extends {}, TResult extends {}>(
-            object: TObject,
-            source: TSource,
-            customizer?: AssignCustomizer,
-            thisArg?: any
-        ): TResult;
-
-        /**
-         * @see assign
-         */
-        extend<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            customizer?: AssignCustomizer,
-            thisArg?: any
-        ): TResult;
-
-        /**
-         * @see assign
-         */
-        extend<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            customizer?: AssignCustomizer,
-            thisArg?: any
-        ): TResult;
-
-        /**
-         * @see assign
-         */
-        extend<TObject extends {}, TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {},
-            TResult extends {}>
-            (
-                object: TObject,
-                source1: TSource1,
-                source2: TSource2,
-                source3: TSource3,
-                source4: TSource4,
-                customizer?: AssignCustomizer,
-                thisArg?: any
-            ): TResult;
-
-        /**
-         * @see _.assign
-         */
-        extend<TObject extends {}>(object: TObject): TObject;
-
-        /**
-         * @see _.assign
-         */
-        extend<TObject extends {}, TResult extends {}>(
-            object: TObject, ...otherArgs: any[]
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.assign
-         */
-        extend<TSource extends {}, TResult extends {}>(
-            source: TSource,
-            customizer?: AssignCustomizer,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assign
-         */
-        extend<TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            customizer?: AssignCustomizer,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assign
-         */
-        extend<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            customizer?: AssignCustomizer,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assign
-         */
-        extend<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4,
-            customizer?: AssignCustomizer,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.assign
-         */
-        extend(): LoDashImplicitObjectWrapper<T>;
-
-        /**
-         * @see _.assign
-         */
-        extend<TResult extends {}>(...otherArgs: any[]): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.assign
-         */
-        extend<TSource extends {}, TResult extends {}>(
-            source: TSource,
-            customizer?: AssignCustomizer,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assign
-         */
-        extend<TSource1 extends {}, TSource2 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            customizer?: AssignCustomizer,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assign
-         */
-        extend<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            customizer?: AssignCustomizer,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see assign
-         */
-        extend<TSource1 extends {}, TSource2 extends {}, TSource3 extends {}, TSource4 extends {}, TResult extends {}>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4,
-            customizer?: AssignCustomizer,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.assign
-         */
-        extend(): LoDashExplicitObjectWrapper<T>;
-
-        /**
-         * @see _.assign
-         */
-        extend<TResult extends {}>(...otherArgs: any[]): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.findKey
-    interface LoDashStatic {
-        /**
-         * This method is like _.find except that it returns the key of the first element predicate returns truthy for
-         * instead of the element itself.
-         *
-         * If a property name is provided for predicate the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for predicate the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param object The object to search.
-         * @param predicate The function invoked per iteration.
-         * @param thisArg The this binding of predicate.
-         * @return Returns the key of the matched element, else undefined.
-         */
-        findKey<TValues, TObject>(
-            object: TObject,
-            predicate?: DictionaryIterator<TValues, boolean>,
-            thisArg?: any
-        ): string;
-
-        /**
-         * @see _.findKey
-         */
-        findKey<TObject>(
-            object: TObject,
-            predicate?: ObjectIterator<any, boolean>,
-            thisArg?: any
-        ): string;
-
-        /**
-         * @see _.findKey
-         */
-        findKey<TObject>(
-            object: TObject,
-            predicate?: string,
-            thisArg?: any
-        ): string;
-
-        /**
-         * @see _.findKey
-         */
-        findKey<TWhere extends Dictionary<any>, TObject>(
-            object: TObject,
-            predicate?: TWhere
-        ): string;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.findKey
-         */
-        findKey<TValues>(
-            predicate?: DictionaryIterator<TValues, boolean>,
-            thisArg?: any
-        ): string;
-
-        /**
-         * @see _.findKey
-         */
-        findKey(
-            predicate?: ObjectIterator<any, boolean>,
-            thisArg?: any
-        ): string;
-
-        /**
-         * @see _.findKey
-         */
-        findKey(
-            predicate?: string,
-            thisArg?: any
-        ): string;
-
-        /**
-         * @see _.findKey
-         */
-        findKey<TWhere extends Dictionary<any>>(
-            predicate?: TWhere
-        ): string;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.findKey
-         */
-        findKey<TValues>(
-            predicate?: DictionaryIterator<TValues, boolean>,
-            thisArg?: any
-        ): LoDashExplicitWrapper<string>;
-
-        /**
-         * @see _.findKey
-         */
-        findKey(
-            predicate?: ObjectIterator<any, boolean>,
-            thisArg?: any
-        ): LoDashExplicitWrapper<string>;
-
-        /**
-         * @see _.findKey
-         */
-        findKey(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashExplicitWrapper<string>;
-
-        /**
-         * @see _.findKey
-         */
-        findKey<TWhere extends Dictionary<any>>(
-            predicate?: TWhere
-        ): LoDashExplicitWrapper<string>;
-    }
-
-    //_.findLastKey
-    interface LoDashStatic {
-        /**
-         * This method is like _.findKey except that it iterates over elements of a collection in the opposite order.
-         *
-         * If a property name is provided for predicate the created _.property style callback returns the property
-         * value of the given element.
-         *
-         * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-         * elements that have a matching property value, else false.
-         *
-         * If an object is provided for predicate the created _.matches style callback returns true for elements that
-         * have the properties of the given object, else false.
-         *
-         * @param object The object to search.
-         * @param predicate The function invoked per iteration.
-         * @param thisArg The this binding of predicate.
-         * @return Returns the key of the matched element, else undefined.
-         */
-        findLastKey<TValues, TObject>(
-            object: TObject,
-            predicate?: DictionaryIterator<TValues, boolean>,
-            thisArg?: any
-        ): string;
-
-        /**
-         * @see _.findLastKey
-         */
-        findLastKey<TObject>(
-            object: TObject,
-            predicate?: ObjectIterator<any, boolean>,
-            thisArg?: any
-        ): string;
-
-        /**
-         * @see _.findLastKey
-         */
-        findLastKey<TObject>(
-            object: TObject,
-            predicate?: string,
-            thisArg?: any
-        ): string;
-
-        /**
-         * @see _.findLastKey
-         */
-        findLastKey<TWhere extends Dictionary<any>, TObject>(
-            object: TObject,
-            predicate?: TWhere
-        ): string;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.findLastKey
-         */
-        findLastKey<TValues>(
-            predicate?: DictionaryIterator<TValues, boolean>,
-            thisArg?: any
-        ): string;
-
-        /**
-         * @see _.findLastKey
-         */
-        findLastKey(
-            predicate?: ObjectIterator<any, boolean>,
-            thisArg?: any
-        ): string;
-
-        /**
-         * @see _.findLastKey
-         */
-        findLastKey(
-            predicate?: string,
-            thisArg?: any
-        ): string;
-
-        /**
-         * @see _.findLastKey
-         */
-        findLastKey<TWhere extends Dictionary<any>>(
-            predicate?: TWhere
-        ): string;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.findLastKey
-         */
-        findLastKey<TValues>(
-            predicate?: DictionaryIterator<TValues, boolean>,
-            thisArg?: any
-        ): LoDashExplicitWrapper<string>;
-
-        /**
-         * @see _.findLastKey
-         */
-        findLastKey(
-            predicate?: ObjectIterator<any, boolean>,
-            thisArg?: any
-        ): LoDashExplicitWrapper<string>;
-
-        /**
-         * @see _.findLastKey
-         */
-        findLastKey(
-            predicate?: string,
-            thisArg?: any
-        ): LoDashExplicitWrapper<string>;
-
-        /**
-         * @see _.findLastKey
-         */
-        findLastKey<TWhere extends Dictionary<any>>(
-            predicate?: TWhere
-        ): LoDashExplicitWrapper<string>;
-    }
-
-    //_.forIn
-    interface LoDashStatic {
-        /**
-         * Iterates over own and inherited enumerable properties of an object invoking iteratee for each property. The
-         * iteratee is bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may
-         * exit iteration early by explicitly returning false.
-         *
-         * @param object The object to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @param thisArg The this binding of iteratee.
-         * @return Returns object.
-         */
-        forIn<T>(
-            object: Dictionary<T>,
-            iteratee?: DictionaryIterator<T, any>,
-            thisArg?: any
-        ): Dictionary<T>;
-
-        /**
-         * @see _.forIn
-         */
-        forIn<T extends {}>(
-            object: T,
-            iteratee?: ObjectIterator<any, any>,
-            thisArg?: any
-        ): T;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.forIn
-         */
-        forIn<TValue>(
-            iteratee?: DictionaryIterator<TValue, any>,
-            thisArg?: any
-        ): _.LoDashImplicitObjectWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.forIn
-         */
-        forIn<TValue>(
-            iteratee?: DictionaryIterator<TValue, any>,
-            thisArg?: any
-        ): _.LoDashExplicitObjectWrapper<T>;
-    }
-
-    //_.forInRight
-    interface LoDashStatic {
-        /**
-         * This method is like _.forIn except that it iterates over properties of object in the opposite order.
-         *
-         * @param object The object to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @param thisArg The this binding of iteratee.
-         * @return Returns object.
-         */
-        forInRight<T>(
-            object: Dictionary<T>,
-            iteratee?: DictionaryIterator<T, any>,
-            thisArg?: any
-        ): Dictionary<T>;
-
-        /**
-         * @see _.forInRight
-         */
-        forInRight<T extends {}>(
-            object: T,
-            iteratee?: ObjectIterator<any, any>,
-            thisArg?: any
-        ): T;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.forInRight
-         */
-        forInRight<TValue>(
-            iteratee?: DictionaryIterator<TValue, any>,
-            thisArg?: any
-        ): _.LoDashImplicitObjectWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.forInRight
-         */
-        forInRight<TValue>(
-            iteratee?: DictionaryIterator<TValue, any>,
-            thisArg?: any
-        ): _.LoDashExplicitObjectWrapper<T>;
-    }
-
-    //_.forOwn
-    interface LoDashStatic {
-        /**
-         * Iterates over own enumerable properties of an object invoking iteratee for each property. The iteratee is
-         * bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may exit
-         * iteration early by explicitly returning false.
-         *
-         * @param object The object to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @param thisArg The this binding of iteratee.
-         * @return Returns object.
-         */
-        forOwn<T>(
-            object: Dictionary<T>,
-            iteratee?: DictionaryIterator<T, any>,
-            thisArg?: any
-        ): Dictionary<T>;
-
-        /**
-         * @see _.forOwn
-         */
-        forOwn<T extends {}>(
-            object: T,
-            iteratee?: ObjectIterator<any, any>,
-            thisArg?: any
-        ): T;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.forOwn
-         */
-        forOwn<TValue>(
-            iteratee?: DictionaryIterator<TValue, any>,
-            thisArg?: any
-        ): _.LoDashImplicitObjectWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.forOwn
-         */
-        forOwn<TValue>(
-            iteratee?: DictionaryIterator<TValue, any>,
-            thisArg?: any
-        ): _.LoDashExplicitObjectWrapper<T>;
-    }
-
-    //_.forOwnRight
-    interface LoDashStatic {
-        /**
-         * This method is like _.forOwn except that it iterates over properties of object in the opposite order.
-         *
-         * @param object The object to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @param thisArg The this binding of iteratee.
-         * @return Returns object.
-         */
-        forOwnRight<T>(
-            object: Dictionary<T>,
-            iteratee?: DictionaryIterator<T, any>,
-            thisArg?: any
-        ): Dictionary<T>;
-
-        /**
-         * @see _.forOwnRight
-         */
-        forOwnRight<T extends {}>(
-            object: T,
-            iteratee?: ObjectIterator<any, any>,
-            thisArg?: any
-        ): T;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.forOwnRight
-         */
-        forOwnRight<TValue>(
-            iteratee?: DictionaryIterator<TValue, any>,
-            thisArg?: any
-        ): _.LoDashImplicitObjectWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.forOwnRight
-         */
-        forOwnRight<TValue>(
-            iteratee?: DictionaryIterator<TValue, any>,
-            thisArg?: any
-        ): _.LoDashExplicitObjectWrapper<T>;
-    }
-
-    //_.functions
-    interface LoDashStatic {
-        /**
-         * Creates an array of function property names from own enumerable properties
-         * of `object`.
-         *
-         * @static
-         * @memberOf _
-         * @category Object
-         * @param {Object} object The object to inspect.
-         * @returns {Array} Returns the new array of property names.
-         * @example
-         *
-         * function Foo() {
-         *   this.a = _.constant('a');
-         *   this.b = _.constant('b');
-         * }
-         *
-         * Foo.prototype.c = _.constant('c');
-         *
-         * _.functions(new Foo);
-         * // => ['a', 'b']
-         */
-        functions<T extends {}>(object: any): string[];
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.functions
-         */
-        functions(): _.LoDashImplicitArrayWrapper<string>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.functions
-         */
-        functions(): _.LoDashExplicitArrayWrapper<string>;
-    }
-
-    //_.functionsIn
-    interface LoDashStatic {
-        /**
-         * Creates an array of function property names from own and inherited
-         * enumerable properties of `object`.
-         *
-         * @static
-         * @memberOf _
-         * @category Object
-         * @param {Object} object The object to inspect.
-         * @returns {Array} Returns the new array of property names.
-         * @example
-         *
-         * function Foo() {
-         *   this.a = _.constant('a');
-         *   this.b = _.constant('b');
-         * }
-         *
-         * Foo.prototype.c = _.constant('c');
-         *
-         * _.functionsIn(new Foo);
-         * // => ['a', 'b', 'c']
-         */
-        functionsIn<T extends {}>(object: any): string[];
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.functionsIn
-         */
-        functionsIn(): _.LoDashImplicitArrayWrapper<string>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.functionsIn
-         */
-        functionsIn(): _.LoDashExplicitArrayWrapper<string>;
-    }
-
-    //_.get
-    interface LoDashStatic {
-        /**
-         * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-         * in its place.
-         *
-         * @param object The object to query.
-         * @param path The path of the property to get.
-         * @param defaultValue The value returned if the resolved value is undefined.
-         * @return Returns the resolved value.
-         */
-        get<TObject, TResult>(
-            object: TObject,
-            path: StringRepresentable|StringRepresentable[],
-            defaultValue?: TResult
-        ): TResult;
-
-        /**
-         * @see _.get
-         */
-        get<TResult>(
-            object: any,
-            path: StringRepresentable|StringRepresentable[],
-            defaultValue?: TResult
-        ): TResult;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.get
-         */
-        get<TResult>(
-            path: StringRepresentable|StringRepresentable[],
-            defaultValue?: TResult
-        ): TResult;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.get
-         */
-        get<TResult>(
-            path: StringRepresentable|StringRepresentable[],
-            defaultValue?: TResult
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.get
-         */
-        get<TResult>(
-            path: StringRepresentable|StringRepresentable[],
-            defaultValue?: TResult
-        ): TResult;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.get
-         */
-        get<TResultWrapper>(
-            path: StringRepresentable|StringRepresentable[],
-            defaultValue?: any
-        ): TResultWrapper;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.get
-         */
-        get<TResultWrapper>(
-            path: StringRepresentable|StringRepresentable[],
-            defaultValue?: any
-        ): TResultWrapper;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.get
-         */
-        get<TResultWrapper>(
-            path: StringRepresentable|StringRepresentable[],
-            defaultValue?: any
-        ): TResultWrapper;
-    }
-
-    //_.has
-    interface LoDashStatic {
-        /**
-         * Checks if `path` is a direct property of `object`.
-         *
-         * @static
-         * @memberOf _
-         * @category Object
-         * @param {Object} object The object to query.
-         * @param {Array|string} path The path to check.
-         * @returns {boolean} Returns `true` if `path` exists, else `false`.
-         * @example
-         *
-         * var object = { 'a': { 'b': { 'c': 3 } } };
-         * var other = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
-         *
-         * _.has(object, 'a');
-         * // => true
-         *
-         * _.has(object, 'a.b.c');
-         * // => true
-         *
-         * _.has(object, ['a', 'b', 'c']);
-         * // => true
-         *
-         * _.has(other, 'a');
-         * // => false
-         */
-        has<T extends {}>(
-            object: T,
-            path: StringRepresentable|StringRepresentable[]
-        ): boolean;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.has
-         */
-        has(path: StringRepresentable|StringRepresentable[]): boolean;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.has
-         */
-        has(path: StringRepresentable|StringRepresentable[]): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.hasIn
-    interface LoDashStatic {
-        /**
-         * Checks if `path` is a direct or inherited property of `object`.
-         *
-         * @static
-         * @memberOf _
-         * @category Object
-         * @param {Object} object The object to query.
-         * @param {Array|string} path The path to check.
-         * @returns {boolean} Returns `true` if `path` exists, else `false`.
-         * @example
-         *
-         * var object = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
-         *
-         * _.hasIn(object, 'a');
-         * // => true
-         *
-         * _.hasIn(object, 'a.b.c');
-         * // => true
-         *
-         * _.hasIn(object, ['a', 'b', 'c']);
-         * // => true
-         *
-         * _.hasIn(object, 'b');
-         * // => false
-         */
-        hasIn<T extends {}>(
-            object: T,
-            path: StringRepresentable|StringRepresentable[]
-        ): boolean;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.hasIn
-         */
-        hasIn(path: StringRepresentable|StringRepresentable[]): boolean;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.hasIn
-         */
-        hasIn(path: StringRepresentable|StringRepresentable[]): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.invert
-    interface LoDashStatic {
-        /**
-         * Creates an object composed of the inverted keys and values of object. If object contains duplicate values,
-         * subsequent values overwrite property assignments of previous values unless multiValue is true.
-         *
-         * @param object The object to invert.
-         * @param multiValue Allow multiple values per key.
-         * @return Returns the new inverted object.
-         */
-        invert<T extends {}, TResult extends {}>(
-            object: T,
-            multiValue?: boolean
-        ): TResult;
-
-        /**
-         * @see _.invert
-         */
-        invert<TResult extends {}>(
-            object: Object,
-            multiValue?: boolean
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.invert
-         */
-        invert<TResult extends {}>(multiValue?: boolean): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.invert
-         */
-        invert<TResult extends {}>(multiValue?: boolean): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.inverBy
-    interface InvertByIterator<T> {
-        (value: T): any;
-    }
-
-    interface LoDashStatic {
-        /**
-         * This method is like _.invert except that the inverted object is generated from the results of running each
-         * element of object through iteratee. The corresponding inverted value of each inverted key is an array of
-         * keys responsible for generating the inverted value. The iteratee is invoked with one argument: (value).
-         *
-         * @param object The object to invert.
-         * @param interatee The iteratee invoked per element.
-         * @return Returns the new inverted object.
-         */
-        invertBy(
-            object: Object,
-            interatee?: InvertByIterator<any>|string
-        ): Dictionary<string[]>;
-
-        /**
-         * @see _.invertBy
-         */
-        invertBy<T>(
-            object: _.Dictionary<T>|_.NumericDictionary<T>,
-            interatee?: InvertByIterator<T>|string
-        ): Dictionary<string[]>;
-
-        /**
-         * @see _.invertBy
-         */
-        invertBy<W>(
-            object: Object,
-            interatee?: W
-        ): Dictionary<string[]>;
-
-        /**
-         * @see _.invertBy
-         */
-        invertBy<T, W>(
-            object: _.Dictionary<T>,
-            interatee?: W
-        ): Dictionary<string[]>;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.invertBy
-         */
-        invertBy(
-            interatee?: InvertByIterator<any>
-        ): LoDashImplicitObjectWrapper<Dictionary<string[]>>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.invertBy
-         */
-        invertBy(
-            interatee?: InvertByIterator<T>|string
-        ): LoDashImplicitObjectWrapper<Dictionary<string[]>>;
-
-        /**
-         * @see _.invertBy
-         */
-        invertBy<W>(
-            interatee?: W
-        ): LoDashImplicitObjectWrapper<Dictionary<string[]>>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.invertBy
-         */
-        invertBy(
-            interatee?: InvertByIterator<any>|string
-        ): LoDashImplicitObjectWrapper<Dictionary<string[]>>;
-
-        /**
-         * @see _.invertBy
-         */
-        invertBy<W>(
-            interatee?: W
-        ): LoDashImplicitObjectWrapper<Dictionary<string[]>>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.invertBy
-         */
-        invertBy(
-            interatee?: InvertByIterator<any>
-        ): LoDashExplicitObjectWrapper<Dictionary<string[]>>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.invertBy
-         */
-        invertBy(
-            interatee?: InvertByIterator<T>|string
-        ): LoDashExplicitObjectWrapper<Dictionary<string[]>>;
-
-        /**
-         * @see _.invertBy
-         */
-        invertBy<W>(
-            interatee?: W
-        ): LoDashExplicitObjectWrapper<Dictionary<string[]>>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.invertBy
-         */
-        invertBy(
-            interatee?: InvertByIterator<any>|string
-        ): LoDashExplicitObjectWrapper<Dictionary<string[]>>;
-
-        /**
-         * @see _.invertBy
-         */
-        invertBy<W>(
-            interatee?: W
-        ): LoDashExplicitObjectWrapper<Dictionary<string[]>>;
-    }
-
-    //_.keys
-    interface LoDashStatic {
-        /**
-         * Creates an array of the own enumerable property names of object.
-         *
-         * Note: Non-object values are coerced to objects. See the ES spec for more details.
-         *
-         * @param object The object to query.
-         * @return Returns the array of property names.
-         */
-        keys(object?: any): string[];
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.keys
-         */
-        keys(): LoDashImplicitArrayWrapper<string>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.keys
-         */
-        keys(): LoDashExplicitArrayWrapper<string>;
-    }
-
-    //_.keysIn
-    interface LoDashStatic {
-        /**
-         * Creates an array of the own and inherited enumerable property names of object.
-         *
-         * Note: Non-object values are coerced to objects.
-         *
-         * @param object The object to query.
-         * @return An array of property names.
-         */
-        keysIn(object?: any): string[];
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.keysIn
-         */
-        keysIn(): LoDashImplicitArrayWrapper<string>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.keysIn
-         */
-        keysIn(): LoDashExplicitArrayWrapper<string>;
-    }
-
-    //_.mapKeys
-    interface LoDashStatic {
-        /**
-         * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
-         * by running each own enumerable property of object through iteratee.
-         *
-         * @param object The object to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @param thisArg The this binding of iteratee.
-         * @return Returns the new mapped object.
-         */
-        mapKeys<T, TKey>(
-            object: List<T>,
-            iteratee?: ListIterator<T, TKey>,
-            thisArg?: any
-        ): Dictionary<T>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<T, TKey>(
-            object: Dictionary<T>,
-            iteratee?: DictionaryIterator<T, TKey>,
-            thisArg?: any
-        ): Dictionary<T>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<T, TObject extends {}>(
-            object: List<T>|Dictionary<T>,
-            iteratee?: TObject
-        ): Dictionary<T>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<T>(
-            object: List<T>|Dictionary<T>,
-            iteratee?: string,
-            thisArg?: any
-        ): Dictionary<T>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<TKey>(
-            iteratee?: ListIterator<T, TKey>,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<TObject extends {}>(
-            iteratee?: TObject
-        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys(
-            iteratee?: string,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<Dictionary<T>>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<TResult, TKey>(
-            iteratee?: ListIterator<TResult, TKey>|DictionaryIterator<TResult, TKey>,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<TResult, TObject extends {}>(
-            iteratee?: TObject
-        ): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<TResult>(
-            iteratee?: string,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<TKey>(
-            iteratee?: ListIterator<T, TKey>,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<TObject extends {}>(
-            iteratee?: TObject
-        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys(
-            iteratee?: string,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<Dictionary<T>>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<TResult, TKey>(
-            iteratee?: ListIterator<TResult, TKey>|DictionaryIterator<TResult, TKey>,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<Dictionary<TResult>>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<TResult, TObject extends {}>(
-            iteratee?: TObject
-        ): LoDashExplicitObjectWrapper<Dictionary<TResult>>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys<TResult>(
-            iteratee?: string,
-            thisArg?: any
-        ): LoDashExplicitObjectWrapper<Dictionary<TResult>>;
-    }
-
-    //_.mapValues
-    interface LoDashStatic {
-        /**
-        * Creates an object with the same keys as object and values generated by running each own
-        * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-        * and invoked with three arguments: (value, key, object).
-        *
-        * If a property name is provided iteratee the created "_.property" style callback returns
-        * the property value of the given element.
-        *
-        * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-        * true for elements that have a matching property value, else false;.
-        *
-        * If an object is provided for iteratee the created "_.matches" style callback returns true
-        * for elements that have the properties of the given object, else false.
-        *
-        * @param {Object} object The object to iterate over.
-        * @param {Function|Object|string} [iteratee=_.identity]  The function invoked per iteration.
-        * @param {Object} [thisArg] The `this` binding of `iteratee`.
-        * @return {Object} Returns the new mapped object.
-        */
-        mapValues<T, TResult>(obj: Dictionary<T>, callback: ObjectIterator<T, TResult>, thisArg?: any): Dictionary<TResult>;
-        mapValues<T>(obj: Dictionary<T>, where: Dictionary<T>): Dictionary<boolean>;
-        mapValues<T, TMapped>(obj: T, pluck: string): TMapped;
-        mapValues<T>(obj: T, callback: ObjectIterator<any, any>, thisArg?: any): T;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.mapValues
-         * TValue is the type of the property values of T.
-         * TResult is the type output by the ObjectIterator function
-         */
-        mapValues<TValue, TResult>(callback: ObjectIterator<TValue, TResult>, thisArg?: any): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
-
-        /**
-         * @see _.mapValues
-         * TResult is the type of the property specified by pluck.
-         * T should be a Dictionary<Dictionary<TResult>>
-         */
-        mapValues<TResult>(pluck: string): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
-
-        /**
-         * @see _.mapValues
-         * TResult is the type of the properties on the object specified by pluck.
-         * T should be a Dictionary<Dictionary<Dictionary<TResult>>>
-         */
-        mapValues<TResult>(pluck: string, where: Dictionary<TResult>): LoDashImplicitArrayWrapper<Dictionary<boolean>>;
-
-        /**
-         * @see _.mapValues
-         * TResult is the type of the properties of each object in the values of T
-         * T should be a Dictionary<Dictionary<TResult>>
-         */
-        mapValues<TResult>(where: Dictionary<TResult>): LoDashImplicitArrayWrapper<boolean>;
-    }
-
-    //_.merge
-    interface LoDashStatic {
-        /**
-         * Recursively merges own and inherited enumerable properties of source
-         * objects into the destination object, skipping source properties that resolve
-         * to `undefined`. Array and plain object properties are merged recursively.
-         * Other objects and value types are overridden by assignment. Source objects
-         * are applied from left to right. Subsequent sources overwrite property
-         * assignments of previous sources.
-         *
-         * **Note:** This method mutates `object`.
-         *
-         * @static
-         * @memberOf _
-         * @category Object
-         * @param {Object} object The destination object.
-         * @param {...Object} [sources] The source objects.
-         * @returns {Object} Returns `object`.
-         * @example
-         *
-         * var users = {
-         *   'data': [{ 'user': 'barney' }, { 'user': 'fred' }]
-         * };
-         *
-         * var ages = {
-         *   'data': [{ 'age': 36 }, { 'age': 40 }]
-         * };
-         *
-         * _.merge(users, ages);
-         * // => { 'data': [{ 'user': 'barney', 'age': 36 }, { 'user': 'fred', 'age': 40 }] }
-         */
-        merge<TObject, TSource>(
-            object: TObject,
-            source: TSource
-        ): TObject & TSource;
-
-        /**
-         * @see _.merge
-         */
-        merge<TObject, TSource1, TSource2>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2
-        ): TObject & TSource1 & TSource2;
-
-        /**
-         * @see _.merge
-         */
-        merge<TObject, TSource1, TSource2, TSource3>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): TObject & TSource1 & TSource2 & TSource3;
-
-        /**
-         * @see _.merge
-         */
-        merge<TObject, TSource1, TSource2, TSource3, TSource4>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): TObject & TSource1 & TSource2 & TSource3 & TSource4;
-
-        /**
-         * @see _.merge
-         */
-        merge<TResult>(
-            object: any,
-            ...otherArgs: any[]
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.merge
-         */
-        merge<TSource>(
-            source: TSource
-        ): LoDashImplicitObjectWrapper<T & TSource>;
-
-        /**
-         * @see _.merge
-         */
-        merge<TSource1, TSource2>(
-            source1: TSource1,
-            source2: TSource2
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2>;
-
-        /**
-         * @see _.merge
-         */
-        merge<TSource1, TSource2, TSource3>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3>;
-
-        /**
-         * @see _.merge
-         */
-        merge<TSource1, TSource2, TSource3, TSource4>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3 & TSource4>;
-
-        /**
-         * @see _.merge
-         */
-        merge<TResult>(
-            ...otherArgs: any[]
-        ): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.merge
-         */
-        merge<TSource>(
-            source: TSource
-        ): LoDashExplicitObjectWrapper<T & TSource>;
-
-        /**
-         * @see _.merge
-         */
-        merge<TSource1, TSource2>(
-            source1: TSource1,
-            source2: TSource2
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2>;
-
-        /**
-         * @see _.merge
-         */
-        merge<TSource1, TSource2, TSource3>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2 & TSource3>;
-
-        /**
-         * @see _.merge
-         */
-        merge<TSource1, TSource2, TSource3, TSource4>(
-        ): LoDashExplicitObjectWrapper<T & TSource1 & TSource2 & TSource3 & TSource4>;
-
-        /**
-         * @see _.merge
-         */
-        merge<TResult>(
-            ...otherArgs: any[]
-        ): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.mergeWith
-    interface MergeWithCustomizer {
-        (value: any, srcValue: any, key?: string, object?: Object, source?: Object): any;
-    }
-
-    interface LoDashStatic {
-        /**
-         * This method is like `_.merge` except that it accepts `customizer` which
-         * is invoked to produce the merged values of the destination and source
-         * properties. If `customizer` returns `undefined` merging is handled by the
-         * method instead. The `customizer` is invoked with seven arguments:
-         * (objValue, srcValue, key, object, source, stack).
-         *
-         * @static
-         * @memberOf _
-         * @category Object
-         * @param {Object} object The destination object.
-         * @param {...Object} sources The source objects.
-         * @param {Function} customizer The function to customize assigned values.
-         * @returns {Object} Returns `object`.
-         * @example
-         *
-         * function customizer(objValue, srcValue) {
-         *   if (_.isArray(objValue)) {
-         *     return objValue.concat(srcValue);
-         *   }
-         * }
-         *
-         * var object = {
-         *   'fruits': ['apple'],
-         *   'vegetables': ['beet']
-         * };
-         *
-         * var other = {
-         *   'fruits': ['banana'],
-         *   'vegetables': ['carrot']
-         * };
-         *
-         * _.merge(object, other, customizer);
-         * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
-         */
-        mergeWith<TObject, TSource>(
-            object: TObject,
-            source: TSource,
-            customizer: MergeWithCustomizer
-        ): TObject & TSource;
-
-        /**
-         * @see _.mergeWith
-         */
-        mergeWith<TObject, TSource1, TSource2>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            customizer: MergeWithCustomizer
-        ): TObject & TSource1 & TSource2;
-
-        /**
-         * @see _.mergeWith
-         */
-        mergeWith<TObject, TSource1, TSource2, TSource3>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            customizer: MergeWithCustomizer
-        ): TObject & TSource1 & TSource2 & TSource3;
-
-        /**
-         * @see _.mergeWith
-         */
-        mergeWith<TObject, TSource1, TSource2, TSource3, TSource4>(
-            object: TObject,
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4,
-            customizer: MergeWithCustomizer
-        ): TObject & TSource1 & TSource2 & TSource3 & TSource4;
-
-        /**
-         * @see _.mergeWith
-         */
-        mergeWith<TResult>(
-            object: any,
-            ...otherArgs: any[]
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.mergeWith
-         */
-        mergeWith<TSource>(
-            source: TSource,
-            customizer: MergeWithCustomizer
-        ): LoDashImplicitObjectWrapper<T & TSource>;
-
-        /**
-         * @see _.mergeWith
-         */
-        mergeWith<TSource1, TSource2>(
-            source1: TSource1,
-            source2: TSource2,
-            customizer: MergeWithCustomizer
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2>;
-
-        /**
-         * @see _.mergeWith
-         */
-        mergeWith<TSource1, TSource2, TSource3>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            customizer: MergeWithCustomizer
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3>;
-
-        /**
-         * @see _.mergeWith
-         */
-        mergeWith<TSource1, TSource2, TSource3, TSource4>(
-            source1: TSource1,
-            source2: TSource2,
-            source3: TSource3,
-            source4: TSource4,
-            customizer: MergeWithCustomizer
-        ): LoDashImplicitObjectWrapper<T & TSource1 & TSource2 & TSource3 & TSource4>;
-
-        /**
-         * @see _.mergeWith
-         */
-        mergeWith<TResult>(
-            ...otherArgs: any[]
-        ): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    //_.omit
-    interface LoDashStatic {
-        /**
-         * The opposite of `_.pick`; this method creates an object composed of the
-         * own and inherited enumerable properties of `object` that are not omitted.
-         *
-         * @static
-         * @memberOf _
-         * @category Object
-         * @param {Object} object The source object.
-         * @param {...(string|string[])} [props] The property names to omit, specified
-         *  individually or in arrays..
-         * @returns {Object} Returns the new object.
-         * @example
-         *
-         * var object = { 'a': 1, 'b': '2', 'c': 3 };
-         *
-         * _.omit(object, ['a', 'c']);
-         * // => { 'b': '2' }
-         */
-
-        omit<TResult extends {}, T extends {}>(
-            object: T,
-            ...predicate: (StringRepresentable|StringRepresentable[])[]
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-
-        /**
-         * @see _.omit
-         */
-        omit<TResult extends {}>(
-            ...predicate: (StringRepresentable|StringRepresentable[])[]
-        ): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-
-        /**
-         * @see _.omit
-         */
-        omit<TResult extends {}>(
-            ...predicate: (StringRepresentable|StringRepresentable[])[]
-        ): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.omitBy
-    interface LoDashStatic {
-        /**
-         * The opposite of `_.pickBy`; this method creates an object composed of the
-         * own and inherited enumerable properties of `object` that `predicate`
-         * doesn't return truthy for.
-         *
-         * @static
-         * @memberOf _
-         * @category Object
-         * @param {Object} object The source object.
-         * @param {Function|Object|string} [predicate=_.identity] The function invoked per property.
-         * @returns {Object} Returns the new object.
-         * @example
-         *
-         * var object = { 'a': 1, 'b': '2', 'c': 3 };
-         *
-         * _.omitBy(object, _.isNumber);
-         * // => { 'b': '2' }
-         */
-        omitBy<TResult extends {}, T extends {}>(
-            object: T,
-            predicate: ObjectIterator<any, boolean>
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.omitBy
-         */
-        omitBy<TResult extends {}>(
-            predicate: ObjectIterator<any, boolean>
-        ): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.omitBy
-         */
-        omitBy<TResult extends {}>(
-            predicate: ObjectIterator<any, boolean>
-        ): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.pick
-    interface LoDashStatic {
-        /**
-         * Creates an object composed of the picked `object` properties.
-         *
-         * @static
-         * @memberOf _
-         * @category Object
-         * @param {Object} object The source object.
-         * @param {...(string|string[])} [props] The property names to pick, specified
-         *  individually or in arrays.
-         * @returns {Object} Returns the new object.
-         * @example
-         *
-         * var object = { 'a': 1, 'b': '2', 'c': 3 };
-         *
-         * _.pick(object, ['a', 'c']);
-         * // => { 'a': 1, 'c': 3 }
-         */
-        pick<TResult extends {}, T extends {}>(
-            object: T,
-            ...predicate: (StringRepresentable|StringRepresentable[])[]
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.pick
-         */
-        pick<TResult extends {}>(
-            ...predicate: (StringRepresentable|StringRepresentable[])[]
-        ): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.pick
-         */
-        pick<TResult extends {}>(
-            ...predicate: (StringRepresentable|StringRepresentable[])[]
-        ): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.pickBy
-    interface LoDashStatic {
-        /**
-         * Creates an object composed of the `object` properties `predicate` returns
-         * truthy for. The predicate is invoked with one argument: (value).
-         *
-         * @static
-         * @memberOf _
-         * @category Object
-         * @param {Object} object The source object.
-         * @param {Function|Object|string} [predicate=_.identity] The function invoked per property.
-         * @returns {Object} Returns the new object.
-         * @example
-         *
-         * var object = { 'a': 1, 'b': '2', 'c': 3 };
-         *
-         * _.pickBy(object, _.isNumber);
-         * // => { 'a': 1, 'c': 3 }
-         */
-        pickBy<TResult extends {}, T extends {}>(
-            object: T,
-            predicate: ObjectIterator<any, boolean>
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.pickBy
-         */
-        pickBy<TResult extends {}>(
-            predicate: ObjectIterator<any, boolean>
-        ): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.pickBy
-         */
-        pickBy<TResult extends {}>(
-            predicate: ObjectIterator<any, boolean>
-        ): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.result
-    interface LoDashStatic {
-        /**
-         * This method is like _.get except that if the resolved value is a function it’s invoked with the this binding
-         * of its parent object and its result is returned.
-         *
-         * @param object The object to query.
-         * @param path The path of the property to resolve.
-         * @param defaultValue The value returned if the resolved value is undefined.
-         * @return Returns the resolved value.
-         */
-        result<TObject, TResult>(
-            object: TObject,
-            path: StringRepresentable|StringRepresentable[],
-            defaultValue?: TResult|((...args: any[]) => TResult)
-        ): TResult;
-
-        /**
-         * @see _.result
-         */
-        result<TResult>(
-            object: any,
-            path: StringRepresentable|StringRepresentable[],
-            defaultValue?: TResult|((...args: any[]) => TResult)
-        ): TResult;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.result
-         */
-        result<TResult>(
-            path: StringRepresentable|StringRepresentable[],
-            defaultValue?: TResult|((...args: any[]) => TResult)
-        ): TResult;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.result
-         */
-        result<TResult>(
-            path: StringRepresentable|StringRepresentable[],
-            defaultValue?: TResult|((...args: any[]) => TResult)
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.result
-         */
-        result<TResult>(
-            path: StringRepresentable|StringRepresentable[],
-            defaultValue?: TResult|((...args: any[]) => TResult)
-        ): TResult;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.result
-         */
-        result<TResultWrapper>(
-            path: StringRepresentable|StringRepresentable[],
-            defaultValue?: any
-        ): TResultWrapper;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.result
-         */
-        result<TResultWrapper>(
-            path: StringRepresentable|StringRepresentable[],
-            defaultValue?: any
-        ): TResultWrapper;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.result
-         */
-        result<TResultWrapper>(
-            path: StringRepresentable|StringRepresentable[],
-            defaultValue?: any
-        ): TResultWrapper;
-    }
-
-    //_.set
-    interface LoDashStatic {
-        /**
-         * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-         * missing index properties while objects are created for all other missing properties. Use _.setWith to
-         * customize path creation.
-         *
-         * @param object The object to modify.
-         * @param path The path of the property to set.
-         * @param value The value to set.
-         * @return Returns object.
-         */
-        set<TResult>(
-            object: Object,
-            path: StringRepresentable|StringRepresentable[],
-            value: any
-        ): TResult;
-
-        /**
-         * @see _.set
-         */
-        set<V, TResult>(
-            object: Object,
-            path: StringRepresentable|StringRepresentable[],
-            value: V
-        ): TResult;
-
-        /**
-         * @see _.set
-         */
-        set<O, V, TResult>(
-            object: O,
-            path: StringRepresentable|StringRepresentable[],
-            value: V
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.set
-         */
-        set<TResult>(
-            path: StringRepresentable|StringRepresentable[],
-            value: any
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.set
-         */
-        set<V, TResult>(
-            path: StringRepresentable|StringRepresentable[],
-            value: V
-        ): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.set
-         */
-        set<TResult>(
-            path: StringRepresentable|StringRepresentable[],
-            value: any
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.set
-         */
-        set<V, TResult>(
-            path: StringRepresentable|StringRepresentable[],
-            value: V
-        ): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.setWith
-    interface SetWithCustomizer<T> {
-        (nsValue: any, key: string, nsObject: T): any;
-    }
-
-    interface LoDashStatic {
-        /**
-         * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
-         * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
-         * invoked with three arguments: (nsValue, key, nsObject).
-         *
-         * @param object The object to modify.
-         * @param path The path of the property to set.
-         * @param value The value to set.
-         * @parem customizer The function to customize assigned values.
-         * @return Returns object.
-         */
-        setWith<TResult>(
-            object: Object,
-            path: StringRepresentable|StringRepresentable[],
-            value: any,
-            customizer?: SetWithCustomizer<Object>
-        ): TResult;
-
-        /**
-         * @see _.setWith
-         */
-        setWith<V, TResult>(
-            object: Object,
-            path: StringRepresentable|StringRepresentable[],
-            value: V,
-            customizer?: SetWithCustomizer<Object>
-        ): TResult;
-
-        /**
-         * @see _.setWith
-         */
-        setWith<O, V, TResult>(
-            object: O,
-            path: StringRepresentable|StringRepresentable[],
-            value: V,
-            customizer?: SetWithCustomizer<O>
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.setWith
-         */
-        setWith<TResult>(
-            path: StringRepresentable|StringRepresentable[],
-            value: any,
-            customizer?: SetWithCustomizer<T>
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.setWith
-         */
-        setWith<V, TResult>(
-            path: StringRepresentable|StringRepresentable[],
-            value: V,
-            customizer?: SetWithCustomizer<T>
-        ): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.setWith
-         */
-        setWith<TResult>(
-            path: StringRepresentable|StringRepresentable[],
-            value: any,
-            customizer?: SetWithCustomizer<T>
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.setWith
-         */
-        setWith<V, TResult>(
-            path: StringRepresentable|StringRepresentable[],
-            value: V,
-            customizer?: SetWithCustomizer<T>
-        ): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.toPairs
-    interface LoDashStatic {
-        /**
-         * Creates an array of own enumerable key-value pairs for object.
-         *
-         * @param object The object to query.
-         * @return Returns the new array of key-value pairs.
-         */
-        toPairs<T extends {}>(object?: T): any[][];
-
-        toPairs<T extends {}, TResult>(object?: T): TResult[][];
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.toPairs
-         */
-        toPairs<TResult>(): LoDashImplicitArrayWrapper<TResult[]>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.toPairs
-         */
-        toPairs<TResult>(): LoDashExplicitArrayWrapper<TResult[]>;
-    }
-
-    //_.toPairsIn
-    interface LoDashStatic {
-        /**
-         * Creates an array of own and inherited enumerable key-value pairs for object.
-         *
-         * @param object The object to query.
-         * @return Returns the new array of key-value pairs.
-         */
-        toPairsIn<T extends {}>(object?: T): any[][];
-
-        toPairsIn<T extends {}, TResult>(object?: T): TResult[][];
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.toPairsIn
-         */
-        toPairsIn<TResult>(): LoDashImplicitArrayWrapper<TResult[]>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.toPairsIn
-         */
-        toPairsIn<TResult>(): LoDashExplicitArrayWrapper<TResult[]>;
-    }
-
-    //_.transform
-    interface LoDashStatic {
-        /**
-         * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
-         * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
-         * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
-         * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
-         *
-         * @param object The object to iterate over.
-         * @param iteratee The function invoked per iteration.
-         * @param accumulator The custom accumulator value.
-         * @param thisArg The this binding of iteratee.
-         * @return Returns the accumulated value.
-         */
-        transform<T, TResult>(
-            object: T[],
-            iteratee?: MemoVoidArrayIterator<T, TResult[]>,
-            accumulator?: TResult[],
-            thisArg?: any
-        ): TResult[];
-
-        /**
-         * @see _.transform
-         */
-        transform<T, TResult>(
-            object: T[],
-            iteratee?: MemoVoidArrayIterator<T, Dictionary<TResult>>,
-            accumulator?: Dictionary<TResult>,
-            thisArg?: any
-        ): Dictionary<TResult>;
-
-        /**
-         * @see _.transform
-         */
-        transform<T, TResult>(
-            object: Dictionary<T>,
-            iteratee?: MemoVoidDictionaryIterator<T, Dictionary<TResult>>,
-            accumulator?: Dictionary<TResult>,
-            thisArg?: any
-        ): Dictionary<TResult>;
-
-        /**
-         * @see _.transform
-         */
-        transform<T, TResult>(
-            object: Dictionary<T>,
-            iteratee?: MemoVoidDictionaryIterator<T, TResult[]>,
-            accumulator?: TResult[],
-            thisArg?: any
-        ): TResult[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.transform
-         */
-        transform<TResult>(
-            iteratee?: MemoVoidArrayIterator<T, TResult[]>,
-            accumulator?: TResult[],
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.transform
-         */
-        transform<TResult>(
-            iteratee?: MemoVoidArrayIterator<T, Dictionary<TResult>>,
-            accumulator?: Dictionary<TResult>,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.transform
-         */
-        transform<T, TResult>(
-            iteratee?: MemoVoidDictionaryIterator<T, Dictionary<TResult>>,
-            accumulator?: Dictionary<TResult>,
-            thisArg?: any
-        ): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
-
-        /**
-         * @see _.transform
-         */
-        transform<T, TResult>(
-            iteratee?: MemoVoidDictionaryIterator<T, TResult[]>,
-            accumulator?: TResult[],
-            thisArg?: any
-        ): LoDashImplicitArrayWrapper<TResult>;
-    }
-
-    //_.unset
-    interface LoDashStatic {
-        /**
-         * Removes the property at path of object.
-         *
-         * Note: This method mutates object.
-         *
-         * @param object The object to modify.
-         * @param path The path of the property to unset.
-         * @return Returns true if the property is deleted, else false.
-         */
-        unset<T>(
-            object: T,
-            path: StringRepresentable|StringRepresentable[]
-        ): boolean;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.unset
-         */
-        unset(path: StringRepresentable|StringRepresentable[]): LoDashImplicitWrapper<boolean>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.unset
-         */
-        unset(path: StringRepresentable|StringRepresentable[]): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.update
-    interface LoDashStatic {
-        /**
-         * This method is like _.set except that accepts updater to produce the value to set. Use _.updateWith to
-         * customize path creation. The updater is invoked with one argument: (value).
-         *
-         * @param object The object to modify.
-         * @param path The path of the property to set.
-         * @param updater The function to produce the updated value.
-         * @return Returns object.
-         */
-        update<TResult>(
-            object: Object,
-            path: StringRepresentable|StringRepresentable[],
-            updater: Function
-        ): TResult;
-
-        /**
-         * @see _.update
-         */
-        update<U extends Function, TResult>(
-            object: Object,
-            path: StringRepresentable|StringRepresentable[],
-            updater: U
-        ): TResult;
-
-        /**
-         * @see _.update
-         */
-        update<O extends {}, TResult>(
-            object: O,
-            path: StringRepresentable|StringRepresentable[],
-            updater: Function
-        ): TResult;
-
-        /**
-         * @see _.update
-         */
-        update<O, U extends Function, TResult>(
-            object: O,
-            path: StringRepresentable|StringRepresentable[],
-            updater: U
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.update
-         */
-        update<TResult>(
-            path: StringRepresentable|StringRepresentable[],
-            updater: any
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.update
-         */
-        update<U extends Function, TResult>(
-            path: StringRepresentable|StringRepresentable[],
-            updater: U
-        ): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.update
-         */
-        update<TResult>(
-            path: StringRepresentable|StringRepresentable[],
-            updater: any
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.update
-         */
-        update<U extends Function, TResult>(
-            path: StringRepresentable|StringRepresentable[],
-            updater: U
-        ): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.values
-    interface LoDashStatic {
-        /**
-         * Creates an array of the own enumerable property values of object.
-         *
-         * @param object The object to query.
-         * @return Returns an array of property values.
-         */
-        values<T>(object?: any): T[];
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.values
-         */
-        values<T>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.values
-         */
-        values<T>(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    //_.valuesIn
-    interface LoDashStatic {
-        /**
-         * Creates an array of the own and inherited enumerable property values of object.
-         *
-         * @param object The object to query.
-         * @return Returns the array of property values.
-         */
-        valuesIn<T>(object?: any): T[];
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.valuesIn
-         */
-        valuesIn<T>(): LoDashImplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.valuesIn
-         */
-        valuesIn<T>(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    /**********
-     * String *
-     **********/
-
-    //_.camelCase
-    interface LoDashStatic {
-        /**
-         * Converts string to camel case.
-         *
-         * @param string The string to convert.
-         * @return Returns the camel cased string.
-         */
-        camelCase(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.camelCase
-         */
-        camelCase(): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.camelCase
-         */
-        camelCase(): LoDashExplicitWrapper<string>;
-    }
-
-    //_.capitalize
-    interface LoDashStatic {
-        /**
-         * Converts the first character of string to upper case and the remaining to lower case.
-         *
-         * @param string The string to capitalize.
-         * @return Returns the capitalized string.
-         */
-        capitalize(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.capitalize
-         */
-        capitalize(): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.capitalize
-         */
-        capitalize(): LoDashExplicitWrapper<string>;
-    }
-
-    //_.deburr
-    interface LoDashStatic {
-        /**
-         * Deburrs string by converting latin-1 supplementary letters to basic latin letters and removing combining
-         * diacritical marks.
-         *
-         * @param string The string to deburr.
-         * @return Returns the deburred string.
-         */
-        deburr(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.deburr
-         */
-        deburr(): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.deburr
-         */
-        deburr(): LoDashExplicitWrapper<string>;
-    }
-
-    //_.endsWith
-    interface LoDashStatic {
-        /**
-         * Checks if string ends with the given target string.
-         *
-         * @param string The string to search.
-         * @param target The string to search for.
-         * @param position The position to search from.
-         * @return Returns true if string ends with target, else false.
-         */
-        endsWith(
-            string?: string,
-            target?: string,
-            position?: number
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.endsWith
-         */
-        endsWith(
-            target?: string,
-            position?: number
-        ): boolean;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.endsWith
-         */
-        endsWith(
-            target?: string,
-            position?: number
-        ): LoDashExplicitWrapper<boolean>;
-    }
-
-    // _.escape
-    interface LoDashStatic {
-        /**
-         * Converts the characters "&", "<", ">", '"', "'", and "`" in string to their corresponding HTML entities.
-         *
-         * Note: No other characters are escaped. To escape additional characters use a third-party library like he.
-         *
-         * hough the ">" character is escaped for symmetry, characters like ">" and "/" don’t need escaping in HTML
-         * and have no special meaning unless they're part of a tag or unquoted attribute value. See Mathias Bynens’s
-         * article (under "semi-related fun fact") for more details.
-         *
-         * Backticks are escaped because in IE < 9, they can break out of attribute values or HTML comments. See #59,
-         * #102, #108, and #133 of the HTML5 Security Cheatsheet for more details.
-         *
-         * When working with HTML you should always quote attribute values to reduce XSS vectors.
-         *
-         * @param string The string to escape.
-         * @return Returns the escaped string.
-         */
-        escape(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.escape
-         */
-        escape(): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.escape
-         */
-        escape(): LoDashExplicitWrapper<string>;
-    }
-
-    // _.escapeRegExp
-    interface LoDashStatic {
-        /**
-         * Escapes the RegExp special characters "^", "$", "\", ".", "*", "+", "?", "(", ")", "[", "]",
-         * "{", "}", and "|" in string.
-         *
-         * @param string The string to escape.
-         * @return Returns the escaped string.
-         */
-        escapeRegExp(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.escapeRegExp
-         */
-        escapeRegExp(): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.escapeRegExp
-         */
-        escapeRegExp(): LoDashExplicitWrapper<string>;
-    }
-
-    //_.kebabCase
-    interface LoDashStatic {
-        /**
-         * Converts string to kebab case.
-         *
-         * @param string The string to convert.
-         * @return Returns the kebab cased string.
-         */
-        kebabCase(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.kebabCase
-         */
-        kebabCase(): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.kebabCase
-         */
-        kebabCase(): LoDashExplicitWrapper<string>;
-    }
-
-    //_.lowerCase
-    interface LoDashStatic {
-        /**
-         * Converts `string`, as space separated words, to lower case.
-         *
-         * @param string The string to convert.
-         * @return Returns the lower cased string.
-         */
-        lowerCase(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.lowerCase
-         */
-        lowerCase(): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.lowerCase
-         */
-        lowerCase(): LoDashExplicitWrapper<string>;
-    }
-
-    //_.lowerFirst
-    interface LoDashStatic {
-        /**
-         * Converts the first character of `string` to lower case.
-         *
-         * @param string The string to convert.
-         * @return Returns the converted string.
-         */
-        lowerFirst(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.lowerFirst
-         */
-        lowerFirst(): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.lowerFirst
-         */
-        lowerFirst(): LoDashExplicitWrapper<string>;
-    }
-
-    //_.pad
-    interface LoDashStatic {
-        /**
-         * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
-         * they can’t be evenly divided by length.
-         *
-         * @param string The string to pad.
-         * @param length The padding length.
-         * @param chars The string used as padding.
-         * @return Returns the padded string.
-         */
-        pad(
-            string?: string,
-            length?: number,
-            chars?: string
-        ): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.pad
-         */
-        pad(
-            length?: number,
-            chars?: string
-        ): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.pad
-         */
-        pad(
-            length?: number,
-            chars?: string
-        ): LoDashExplicitWrapper<string>;
-    }
-
-    //_.padEnd
-    interface LoDashStatic {
-        /**
-         * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
-         * length.
-         *
-         * @param string The string to pad.
-         * @param length The padding length.
-         * @param chars The string used as padding.
-         * @return Returns the padded string.
-         */
-        padEnd(
-            string?: string,
-            length?: number,
-            chars?: string
-        ): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.padEnd
-         */
-        padEnd(
-            length?: number,
-            chars?: string
-        ): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.padEnd
-         */
-        padEnd(
-            length?: number,
-            chars?: string
-        ): LoDashExplicitWrapper<string>;
-    }
-
-    //_.padStart
-    interface LoDashStatic {
-        /**
-         * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
-         * length.
-         *
-         * @param string The string to pad.
-         * @param length The padding length.
-         * @param chars The string used as padding.
-         * @return Returns the padded string.
-         */
-        padStart(
-            string?: string,
-            length?: number,
-            chars?: string
-        ): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.padStart
-         */
-        padStart(
-            length?: number,
-            chars?: string
-        ): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.padStart
-         */
-        padStart(
-            length?: number,
-            chars?: string
-        ): LoDashExplicitWrapper<string>;
-    }
-
-    //_.parseInt
-    interface LoDashStatic {
-        /**
-         * Converts string to an integer of the specified radix. If radix is undefined or 0, a radix of 10 is used
-         * unless value is a hexadecimal, in which case a radix of 16 is used.
-         *
-         * Note: This method aligns with the ES5 implementation of parseInt.
-         *
-         * @param string The string to convert.
-         * @param radix The radix to interpret value by.
-         * @return Returns the converted integer.
-         */
-        parseInt(
-            string: string,
-            radix?: number
-        ): number;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.parseInt
-         */
-        parseInt(radix?: number): number;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.parseInt
-         */
-        parseInt(radix?: number): LoDashExplicitWrapper<number>;
-    }
-
-    //_.repeat
-    interface LoDashStatic {
-        /**
-         * Repeats the given string n times.
-         *
-         * @param string The string to repeat.
-         * @param n The number of times to repeat the string.
-         * @return Returns the repeated string.
-         */
-        repeat(
-            string?: string,
-            n?: number
-        ): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.repeat
-         */
-        repeat(n?: number): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.repeat
-         */
-        repeat(n?: number): LoDashExplicitWrapper<string>;
-    }
-
-    //_.replace
-    interface LoDashStatic {
-        /**
-         * Replaces matches for pattern in string with replacement.
-         *
-         * Note: This method is based on String#replace.
-         *
-         * @param string
-         * @param pattern
-         * @param replacement
-         * @return Returns the modified string.
-         */
-        replace(
-            string: string,
-            pattern: RegExp|string,
-            replacement: Function|string
-        ): string;
-
-        /**
-         * @see _.replace
-         */
-        replace(
-            pattern?: RegExp|string,
-            replacement?: Function|string
-        ): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.replace
-         */
-        replace(
-            pattern?: RegExp|string,
-            replacement?: Function|string
-        ): string;
-
-        /**
-         * @see _.replace
-         */
-        replace(
-            replacement?: Function|string
-        ): string;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.replace
-         */
-        replace(
-            pattern?: RegExp|string,
-            replacement?: Function|string
-        ): string;
-
-        /**
-         * @see _.replace
-         */
-        replace(
-            replacement?: Function|string
-        ): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.replace
-         */
-        replace(
-            pattern?: RegExp|string,
-            replacement?: Function|string
-        ): LoDashExplicitWrapper<string>;
-
-        /**
-         * @see _.replace
-         */
-        replace(
-            replacement?: Function|string
-        ): LoDashExplicitWrapper<string>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.replace
-         */
-        replace(
-            pattern?: RegExp|string,
-            replacement?: Function|string
-        ): LoDashExplicitWrapper<string>;
-
-        /**
-         * @see _.replace
-         */
-        replace(
-            replacement?: Function|string
-        ): LoDashExplicitWrapper<string>;
-    }
-
-    //_.snakeCase
-    interface LoDashStatic {
-        /**
-         * Converts string to snake case.
-         *
-         * @param string The string to convert.
-         * @return Returns the snake cased string.
-         */
-        snakeCase(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.snakeCase
-         */
-        snakeCase(): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.snakeCase
-         */
-        snakeCase(): LoDashExplicitWrapper<string>;
-    }
-
-    //_.split
-    interface LoDashStatic {
-        /**
-         * Splits string by separator.
-         *
-         * Note: This method is based on String#split.
-         *
-         * @param string
-         * @param separator
-         * @param limit
-         * @return Returns the new array of string segments.
-         */
-        split(
-            string: string,
-            separator?: RegExp|string,
-            limit?: number
-        ): string[];
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.split
-         */
-        split(
-            separator?: RegExp|string,
-            limit?: number
-        ): LoDashImplicitArrayWrapper<string>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.split
-         */
-        split(
-            separator?: RegExp|string,
-            limit?: number
-        ): LoDashExplicitArrayWrapper<string>;
-    }
-
-    //_.startCase
-    interface LoDashStatic {
-        /**
-         * Converts string to start case.
-         *
-         * @param string The string to convert.
-         * @return Returns the start cased string.
-         */
-        startCase(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.startCase
-         */
-        startCase(): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.startCase
-         */
-        startCase(): LoDashExplicitWrapper<string>;
-    }
-
-    //_.startsWith
-    interface LoDashStatic {
-        /**
-         * Checks if string starts with the given target string.
-         *
-         * @param string The string to search.
-         * @param target The string to search for.
-         * @param position The position to search from.
-         * @return Returns true if string starts with target, else false.
-         */
-        startsWith(
-            string?: string,
-            target?: string,
-            position?: number
-        ): boolean;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.startsWith
-         */
-        startsWith(
-            target?: string,
-            position?: number
-        ): boolean;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.startsWith
-         */
-        startsWith(
-            target?: string,
-            position?: number
-        ): LoDashExplicitWrapper<boolean>;
-    }
-
-    //_.template
-    interface TemplateOptions extends TemplateSettings {
-        /**
-         * The sourceURL of the template's compiled source.
-         */
-        sourceURL?: string;
-    }
-
-    interface TemplateExecutor {
-        (data?: Object): string;
-        source: string;
-    }
-
-    interface LoDashStatic {
-        /**
-         * Creates a compiled template function that can interpolate data properties in "interpolate" delimiters,
-         * HTML-escape interpolated data properties in "escape" delimiters, and execute JavaScript in "evaluate"
-         * delimiters. Data properties may be accessed as free variables in the template. If a setting object is
-         * provided it takes precedence over _.templateSettings values.
-         *
-         * Note: In the development build _.template utilizes
-         * [sourceURLs](http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/#toc-sourceurl) for easier
-         * debugging.
-         *
-         * For more information on precompiling templates see
-         * [lodash's custom builds documentation](https://lodash.com/custom-builds).
-         *
-         * For more information on Chrome extension sandboxes see
-         * [Chrome's extensions documentation](https://developer.chrome.com/extensions/sandboxingEval).
-         *
-         * @param string The template string.
-         * @param options The options object.
-         * @param options.escape The HTML "escape" delimiter.
-         * @param options.evaluate The "evaluate" delimiter.
-         * @param options.imports An object to import into the template as free variables.
-         * @param options.interpolate The "interpolate" delimiter.
-         * @param options.sourceURL The sourceURL of the template's compiled source.
-         * @param options.variable The data object variable name.
-         * @return Returns the compiled template function.
-         */
-        template(
-            string: string,
-            options?: TemplateOptions
-        ): TemplateExecutor;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.template
-         */
-        template(options?: TemplateOptions): TemplateExecutor;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.template
-         */
-        template(options?: TemplateOptions): LoDashExplicitObjectWrapper<TemplateExecutor>;
-    }
-
-    //_.toLower
-    interface LoDashStatic {
-        /**
-         * Converts `string`, as a whole, to lower case.
-         *
-         * @param string The string to convert.
-         * @return Returns the lower cased string.
-         */
-        toLower(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.toLower
-         */
-        toLower(): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.toLower
-         */
-        toLower(): LoDashExplicitWrapper<string>;
-    }
-
-    //_.toUpper
-    interface LoDashStatic {
-        /**
-         * Converts `string`, as a whole, to upper case.
-         *
-         * @param string The string to convert.
-         * @return Returns the upper cased string.
-         */
-        toUpper(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.toUpper
-         */
-        toUpper(): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.toUpper
-         */
-        toUpper(): LoDashExplicitWrapper<string>;
-    }
-
-    //_.trim
-    interface LoDashStatic {
-        /**
-         * Removes leading and trailing whitespace or specified characters from string.
-         *
-         * @param string The string to trim.
-         * @param chars The characters to trim.
-         * @return Returns the trimmed string.
-         */
-        trim(
-            string?: string,
-            chars?: string
-        ): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.trim
-         */
-        trim(chars?: string): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.trim
-         */
-        trim(chars?: string): LoDashExplicitWrapper<string>;
-    }
-
-    //_.trimEnd
-    interface LoDashStatic {
-        /**
-         * Removes trailing whitespace or specified characters from string.
-         *
-         * @param string The string to trim.
-         * @param chars The characters to trim.
-         * @return Returns the trimmed string.
-         */
-        trimEnd(
-            string?: string,
-            chars?: string
-        ): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.trimEnd
-         */
-        trimEnd(chars?: string): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.trimEnd
-         */
-        trimEnd(chars?: string): LoDashExplicitWrapper<string>;
-    }
-
-    //_.trimStart
-    interface LoDashStatic {
-        /**
-         * Removes leading whitespace or specified characters from string.
-         *
-         * @param string The string to trim.
-         * @param chars The characters to trim.
-         * @return Returns the trimmed string.
-         */
-        trimStart(
-            string?: string,
-            chars?: string
-        ): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.trimStart
-         */
-        trimStart(chars?: string): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.trimStart
-         */
-        trimStart(chars?: string): LoDashExplicitWrapper<string>;
-    }
-
-    //_.truncate
-    interface TruncateOptions {
-        /** The maximum string length. */
-        length?: number;
-        /** The string to indicate text is omitted. */
-        omission?: string;
-        /** The separator pattern to truncate to. */
-        separator?: string|RegExp;
-    }
-
-    interface LoDashStatic {
-        /**
-         * Truncates string if it’s longer than the given maximum string length. The last characters of the truncated
-         * string are replaced with the omission string which defaults to "…".
-         *
-         * @param string The string to truncate.
-         * @param options The options object or maximum string length.
-         * @return Returns the truncated string.
-         */
-        truncate(
-            string?: string,
-            options?: TruncateOptions
-        ): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.truncate
-         */
-        truncate(options?: TruncateOptions): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.truncate
-         */
-        truncate(options?: TruncateOptions): LoDashExplicitWrapper<string>;
-    }
-
-    //_.unescape
-    interface LoDashStatic {
-        /**
-         * The inverse of _.escape; this method converts the HTML entities &amp;, &lt;, &gt;, &quot;, &#39;, and &#96;
-         * in string to their corresponding characters.
-         *
-         * Note: No other HTML entities are unescaped. To unescape additional HTML entities use a third-party library
-         * like he.
-         *
-         * @param string The string to unescape.
-         * @return Returns the unescaped string.
-         */
-        unescape(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.unescape
-         */
-        unescape(): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.unescape
-         */
-        unescape(): LoDashExplicitWrapper<string>;
-    }
-
-    //_.upperCase
-    interface LoDashStatic {
-        /**
-         * Converts `string`, as space separated words, to upper case.
-         *
-         * @param string The string to convert.
-         * @return Returns the upper cased string.
-         */
-        upperCase(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.upperCase
-         */
-        upperCase(): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.upperCase
-         */
-        upperCase(): LoDashExplicitWrapper<string>;
-    }
-
-    //_.upperFirst
-    interface LoDashStatic {
-        /**
-         * Converts the first character of `string` to upper case.
-         *
-         * @param string The string to convert.
-         * @return Returns the converted string.
-         */
-        upperFirst(string?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.upperFirst
-         */
-        upperFirst(): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.upperFirst
-         */
-        upperFirst(): LoDashExplicitWrapper<string>;
-    }
-
-    //_.words
-    interface LoDashStatic {
-        /**
-         * Splits `string` into an array of its words.
-         *
-         * @param string The string to inspect.
-         * @param pattern The pattern to match words.
-         * @return Returns the words of `string`.
-         */
-        words(
-            string?: string,
-            pattern?: string|RegExp
-        ): string[];
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.words
-         */
-        words(pattern?: string|RegExp): string[];
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.words
-         */
-        words(pattern?: string|RegExp): LoDashExplicitArrayWrapper<string>;
-    }
-
-    /***********
-     * Utility *
-     ***********/
-
-    //_.attempt
-    interface LoDashStatic {
-        /**
-         * Attempts to invoke func, returning either the result or the caught error object. Any additional arguments
-         * are provided to func when it’s invoked.
-         *
-         * @param func The function to attempt.
-         * @return Returns the func result or error object.
-         */
-        attempt<TResult>(func: (...args: any[]) => TResult, ...args: any[]): TResult|Error;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.attempt
-         */
-        attempt<TResult>(...args: any[]): TResult|Error;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.attempt
-         */
-        attempt<TResult>(...args: any[]): LoDashExplicitObjectWrapper<TResult|Error>;
-    }
-
-    //_.constant
-    interface LoDashStatic {
-        /**
-         * Creates a function that returns value.
-         *
-         * @param value The value to return from the new function.
-         * @return Returns the new function.
-         */
-        constant<T>(value: T): () => T;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.constant
-         */
-        constant<TResult>(): LoDashImplicitObjectWrapper<() => TResult>;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.constant
-         */
-        constant<TResult>(): LoDashExplicitObjectWrapper<() => TResult>;
-    }
-
-    //_.identity
-    interface LoDashStatic {
-        /**
-         * This method returns the first argument provided to it.
-         *
-         * @param value Any value.
-         * @return Returns value.
-         */
-        identity<T>(value?: T): T;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.identity
-         */
-        identity(): T;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.identity
-         */
-        identity(): T[];
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.identity
-         */
-        identity(): T;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.identity
-         */
-        identity(): LoDashExplicitWrapper<T>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.identity
-         */
-        identity(): LoDashExplicitArrayWrapper<T>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.identity
-         */
-        identity(): LoDashExplicitObjectWrapper<T>;
-    }
-
-    //_.iteratee
-    interface LoDashStatic {
-        /**
-         * Creates a function that invokes `func` with the arguments of the created
-         * function. If `func` is a property name the created callback returns the
-         * property value for a given element. If `func` is an object the created
-         * callback returns `true` for elements that contain the equivalent object properties, otherwise it returns `false`.
-         *
-         * @static
-         * @memberOf _
-         * @category Util
-         * @param {*} [func=_.identity] The value to convert to a callback.
-         * @returns {Function} Returns the callback.
-         * @example
-         *
-         * var users = [
-         *   { 'user': 'barney', 'age': 36 },
-         *   { 'user': 'fred',   'age': 40 }
-         * ];
-         *
-         * // create custom iteratee shorthands
-         * _.iteratee = _.wrap(_.iteratee, function(callback, func) {
-         *   var p = /^(\S+)\s*([<>])\s*(\S+)$/.exec(func);
-         *   return !p ? callback(func) : function(object) {
-         *     return (p[2] == '>' ? object[p[1]] > p[3] : object[p[1]] < p[3]);
-         *   };
-         * });
-         *
-         * _.filter(users, 'age > 36');
-         * // => [{ 'user': 'fred', 'age': 40 }]
-         */
-        iteratee<TResult>(
-            func: Function,
-            thisArg?: any
-        ): (...args: any[]) => TResult;
-
-        /**
-         * @see _.iteratee
-         */
-        iteratee<TResult>(
-            func: string,
-            thisArg?: any
-        ): (object: any) => TResult;
-
-        /**
-         * @see _.iteratee
-         */
-        iteratee(
-            func: Object,
-            thisArg?: any
-        ): (object: any) => boolean;
-
-        /**
-         * @see _.iteratee
-         */
-        iteratee<TResult>(): (value: TResult) => TResult;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.iteratee
-         */
-        iteratee<TResult>(thisArg?: any): LoDashImplicitObjectWrapper<(object: any) => TResult>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.iteratee
-         */
-        iteratee(thisArg?: any): LoDashImplicitObjectWrapper<(object: any) => boolean>;
-
-        /**
-         * @see _.iteratee
-         */
-        iteratee<TResult>(thisArg?: any): LoDashImplicitObjectWrapper<(...args: any[]) => TResult>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.iteratee
-         */
-        iteratee<TResult>(thisArg?: any): LoDashExplicitObjectWrapper<(object: any) => TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.iteratee
-         */
-        iteratee(thisArg?: any): LoDashExplicitObjectWrapper<(object: any) => boolean>;
-
-        /**
-         * @see _.iteratee
-         */
-        iteratee<TResult>(thisArg?: any): LoDashExplicitObjectWrapper<(...args: any[]) => TResult>;
-    }
-
-    //_.matches
-    interface LoDashStatic {
-        /**
-         * Creates a function that performs a deep comparison between a given object and source, returning true if the
-         * given object has equivalent property values, else false.
-         *
-         * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-         * strings. Objects are compared by their own, not inherited, enumerable properties. For comparing a single own
-         * or inherited property value see _.matchesProperty.
-         *
-         * @param source The object of property values to match.
-         * @return Returns the new function.
-         */
-        matches<T>(source: T): (value: any) => boolean;
-
-        /**
-         * @see _.matches
-         */
-        matches<T, V>(source: T): (value: V) => boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.matches
-         */
-        matches<V>(): LoDashImplicitObjectWrapper<(value: V) => boolean>;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.matches
-         */
-        matches<V>(): LoDashExplicitObjectWrapper<(value: V) => boolean>;
-    }
-
-    //_.matchesProperty
-    interface LoDashStatic {
-        /**
-         * Creates a function that compares the property value of path on a given object to value.
-         *
-         * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-         * strings. Objects are compared by their own, not inherited, enumerable properties.
-         *
-         * @param path The path of the property to get.
-         * @param srcValue The value to match.
-         * @return Returns the new function.
-         */
-        matchesProperty<T>(
-            path: StringRepresentable|StringRepresentable[],
-            srcValue: T
-        ): (value: any) => boolean;
-
-        /**
-         * @see _.matchesProperty
-         */
-        matchesProperty<T, V>(
-            path: StringRepresentable|StringRepresentable[],
-            srcValue: T
-        ): (value: V) => boolean;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.matchesProperty
-         */
-        matchesProperty<SrcValue>(
-            srcValue: SrcValue
-        ): LoDashImplicitObjectWrapper<(value: any) => boolean>;
-
-        /**
-         * @see _.matchesProperty
-         */
-        matchesProperty<SrcValue, Value>(
-            srcValue: SrcValue
-        ): LoDashImplicitObjectWrapper<(value: Value) => boolean>;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.matchesProperty
-         */
-        matchesProperty<SrcValue>(
-            srcValue: SrcValue
-        ): LoDashExplicitObjectWrapper<(value: any) => boolean>;
-
-        /**
-         * @see _.matchesProperty
-         */
-        matchesProperty<SrcValue, Value>(
-            srcValue: SrcValue
-        ): LoDashExplicitObjectWrapper<(value: Value) => boolean>;
-    }
-
-    //_.method
-    interface LoDashStatic {
-        /**
-         * Creates a function that invokes the method at path on a given object. Any additional arguments are provided
-         * to the invoked method.
-         *
-         * @param path The path of the method to invoke.
-         * @param args The arguments to invoke the method with.
-         * @return Returns the new function.
-         */
-        method<TObject, TResult>(
-            path: string|StringRepresentable[],
-            ...args: any[]
-        ): (object: TObject) => TResult;
-
-        /**
-         * @see _.method
-         */
-        method<TResult>(
-            path: string|StringRepresentable[],
-            ...args: any[]
-        ): (object: any) => TResult;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.method
-         */
-        method<TObject, TResult>(...args: any[]): LoDashImplicitObjectWrapper<(object: TObject) => TResult>;
-
-        /**
-         * @see _.method
-         */
-        method<TResult>(...args: any[]): LoDashImplicitObjectWrapper<(object: any) => TResult>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.method
-         */
-        method<TObject, TResult>(...args: any[]): LoDashImplicitObjectWrapper<(object: TObject) => TResult>;
-
-        /**
-         * @see _.method
-         */
-        method<TResult>(...args: any[]): LoDashImplicitObjectWrapper<(object: any) => TResult>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.method
-         */
-        method<TObject, TResult>(...args: any[]): LoDashExplicitObjectWrapper<(object: TObject) => TResult>;
-
-        /**
-         * @see _.method
-         */
-        method<TResult>(...args: any[]): LoDashExplicitObjectWrapper<(object: any) => TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.method
-         */
-        method<TObject, TResult>(...args: any[]): LoDashExplicitObjectWrapper<(object: TObject) => TResult>;
-
-        /**
-         * @see _.method
-         */
-        method<TResult>(...args: any[]): LoDashExplicitObjectWrapper<(object: any) => TResult>;
-    }
-
-    //_.methodOf
-    interface LoDashStatic {
-        /**
-         * The opposite of _.method; this method creates a function that invokes the method at a given path on object.
-         * Any additional arguments are provided to the invoked method.
-         *
-         * @param object The object to query.
-         * @param args The arguments to invoke the method with.
-         * @return Returns the new function.
-         */
-        methodOf<TObject extends {}, TResult>(
-            object: TObject,
-            ...args: any[]
-        ): (path: StringRepresentable|StringRepresentable[]) => TResult;
-
-        /**
-         * @see _.methodOf
-         */
-        methodOf<TResult>(
-            object: {},
-            ...args: any[]
-        ): (path: StringRepresentable|StringRepresentable[]) => TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.methodOf
-         */
-        methodOf<TResult>(
-            ...args: any[]
-        ): LoDashImplicitObjectWrapper<(path: StringRepresentable|StringRepresentable[]) => TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.methodOf
-         */
-        methodOf<TResult>(
-            ...args: any[]
-        ): LoDashExplicitObjectWrapper<(path: StringRepresentable|StringRepresentable[]) => TResult>;
-    }
-
-    //_.mixin
-    interface MixinOptions {
-        chain?: boolean;
-    }
-
-    interface LoDashStatic {
-        /**
-         * Adds all own enumerable function properties of a source object to the destination object. If object is a
-         * function then methods are added to its prototype as well.
-         *
-         * Note: Use _.runInContext to create a pristine lodash function to avoid conflicts caused by modifying
-         * the original.
-         *
-         * @param object The destination object.
-         * @param source The object of functions to add.
-         * @param options The options object.
-         * @param options.chain Specify whether the functions added are chainable.
-         * @return Returns object.
-         */
-        mixin<TResult, TObject>(
-            object: TObject,
-            source: Dictionary<Function>,
-            options?: MixinOptions
-        ): TResult;
-
-        /**
-         * @see _.mixin
-         */
-        mixin<TResult>(
-            source: Dictionary<Function>,
-            options?: MixinOptions
-        ): TResult;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.mixin
-         */
-        mixin<TResult>(
-            source: Dictionary<Function>,
-            options?: MixinOptions
-        ): LoDashImplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.mixin
-         */
-        mixin<TResult>(
-            options?: MixinOptions
-        ): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.mixin
-         */
-        mixin<TResult>(
-            source: Dictionary<Function>,
-            options?: MixinOptions
-        ): LoDashExplicitObjectWrapper<TResult>;
-
-        /**
-         * @see _.mixin
-         */
-        mixin<TResult>(
-            options?: MixinOptions
-        ): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.noConflict
-    interface LoDashStatic {
-        /**
-         * Reverts the _ variable to its previous value and returns a reference to the lodash function.
-         *
-         * @return Returns the lodash function.
-         */
-        noConflict(): typeof _;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.noConflict
-         */
-        noConflict(): typeof _;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.noConflict
-         */
-        noConflict(): LoDashExplicitObjectWrapper<typeof _>;
-    }
-
-    //_.noop
-    interface LoDashStatic {
-        /**
-         * A no-operation function that returns undefined regardless of the arguments it receives.
-         *
-         * @return undefined
-         */
-        noop(...args: any[]): void;
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.noop
-         */
-        noop(...args: any[]): void;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.noop
-         */
-        noop(...args: any[]): _.LoDashExplicitWrapper<void>;
-    }
-
-    //_.nthArg
-    interface LoDashStatic {
-        /**
-         * Creates a function that returns its nth argument.
-         *
-         * @param n The index of the argument to return.
-         * @return Returns the new function.
-         */
-        nthArg<TResult extends Function>(n?: number): TResult;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.nthArg
-         */
-        nthArg<TResult extends Function>(): LoDashImplicitObjectWrapper<TResult>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.nthArg
-         */
-        nthArg<TResult extends Function>(): LoDashExplicitObjectWrapper<TResult>;
-    }
-
-    //_.over
-    interface LoDashStatic {
-        /**
-         * Creates a function that invokes iteratees with the arguments provided to the created function and returns
-         * their results.
-         *
-         * @param iteratees The iteratees to invoke.
-         * @return Returns the new function.
-         */
-        over<TResult>(...iteratees: (Function|Function[])[]): (...args: any[]) => TResult[];
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.over
-         */
-        over<TResult>(...iteratees: (Function|Function[])[]): LoDashImplicitObjectWrapper<(...args: any[]) => TResult[]>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.over
-         */
-        over<TResult>(...iteratees: (Function|Function[])[]): LoDashImplicitObjectWrapper<(...args: any[]) => TResult[]>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.over
-         */
-        over<TResult>(...iteratees: (Function|Function[])[]): LoDashExplicitObjectWrapper<(...args: any[]) => TResult[]>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.over
-         */
-        over<TResult>(...iteratees: (Function|Function[])[]): LoDashExplicitObjectWrapper<(...args: any[]) => TResult[]>;
-    }
-
-    //_.overEvery
-    interface LoDashStatic {
-        /**
-         * Creates a function that checks if all of the predicates return truthy when invoked with the arguments
-         * provided to the created function.
-         *
-         * @param predicates The predicates to check.
-         * @return Returns the new function.
-         */
-        overEvery(...predicates: (Function|Function[])[]): (...args: any[]) => boolean;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.overEvery
-         */
-        overEvery(...predicates: (Function|Function[])[]): LoDashImplicitObjectWrapper<(...args: any[]) => boolean>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.overEvery
-         */
-        overEvery(...predicates: (Function|Function[])[]): LoDashImplicitObjectWrapper<(...args: any[]) => boolean>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.overEvery
-         */
-        overEvery(...predicates: (Function|Function[])[]): LoDashExplicitObjectWrapper<(...args: any[]) => boolean>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.overEvery
-         */
-        overEvery(...predicates: (Function|Function[])[]): LoDashExplicitObjectWrapper<(...args: any[]) => boolean>;
-    }
-
-    //_.overSome
-    interface LoDashStatic {
-        /**
-         * Creates a function that checks if any of the predicates return truthy when invoked with the arguments
-         * provided to the created function.
-         *
-         * @param predicates The predicates to check.
-         * @return Returns the new function.
-         */
-        overSome(...predicates: (Function|Function[])[]): (...args: any[]) => boolean;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.overSome
-         */
-        overSome(...predicates: (Function|Function[])[]): LoDashImplicitObjectWrapper<(...args: any[]) => boolean>;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.overSome
-         */
-        overSome(...predicates: (Function|Function[])[]): LoDashImplicitObjectWrapper<(...args: any[]) => boolean>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.overSome
-         */
-        overSome(...predicates: (Function|Function[])[]): LoDashExplicitObjectWrapper<(...args: any[]) => boolean>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.overSome
-         */
-        overSome(...predicates: (Function|Function[])[]): LoDashExplicitObjectWrapper<(...args: any[]) => boolean>;
-    }
-
-    //_.property
-    interface LoDashStatic {
-        /**
-         * Creates a function that returns the property value at path on a given object.
-         *
-         * @param path The path of the property to get.
-         * @return Returns the new function.
-         */
-        property<TObj, TResult>(path: StringRepresentable|StringRepresentable[]): (obj: TObj) => TResult;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.property
-         */
-        property<TObj, TResult>(): LoDashImplicitObjectWrapper<(obj: TObj) => TResult>;
-    }
-
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.property
-         */
-        property<TObj, TResult>(): LoDashImplicitObjectWrapper<(obj: TObj) => TResult>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.property
-         */
-        property<TObj, TResult>(): LoDashExplicitObjectWrapper<(obj: TObj) => TResult>;
-    }
-
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.property
-         */
-        property<TObj, TResult>(): LoDashExplicitObjectWrapper<(obj: TObj) => TResult>;
-    }
-
-    //_.propertyOf
-    interface LoDashStatic {
-        /**
-         * The opposite of _.property; this method creates a function that returns the property value at a given path
-         * on object.
-         *
-         * @param object The object to query.
-         * @return Returns the new function.
-         */
-        propertyOf<T extends {}>(object: T): (path: string|string[]) => any;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.propertyOf
-         */
-        propertyOf(): LoDashImplicitObjectWrapper<(path: string|string[]) => any>;
-    }
-
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.propertyOf
-         */
-        propertyOf(): LoDashExplicitObjectWrapper<(path: string|string[]) => any>;
-    }
-
-    //_.range
-    interface LoDashStatic {
-        /**
-         * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
-         * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
-         * range is created unless a negative step is specified.
-         *
-         * @param start The start of the range.
-         * @param end The end of the range.
-         * @param step The value to increment or decrement by.
-         * @return Returns a new range array.
-         */
-        range(
-            start: number,
-            end: number,
-            step?: number
-        ): number[];
-
-        /**
-         * @see _.range
-         */
-        range(
-            end: number,
-            step?: number
-        ): number[];
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.range
-         */
-        range(
-            end?: number,
-            step?: number
-        ): LoDashImplicitArrayWrapper<number>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.range
-         */
-        range(
-            end?: number,
-            step?: number
-        ): LoDashExplicitArrayWrapper<number>;
-    }
-
-    //_.rangeRight
-    interface LoDashStatic {
-        /**
-         * This method is like `_.range` except that it populates values in
-         * descending order.
-         *
-         * @static
-         * @memberOf _
-         * @category Util
-         * @param {number} [start=0] The start of the range.
-         * @param {number} end The end of the range.
-         * @param {number} [step=1] The value to increment or decrement by.
-         * @returns {Array} Returns the new array of numbers.
-         * @example
-         *
-         * _.rangeRight(4);
-         * // => [3, 2, 1, 0]
-         *
-         * _.rangeRight(-4);
-         * // => [-3, -2, -1, 0]
-         *
-         * _.rangeRight(1, 5);
-         * // => [4, 3, 2, 1]
-         *
-         * _.rangeRight(0, 20, 5);
-         * // => [15, 10, 5, 0]
-         *
-         * _.rangeRight(0, -4, -1);
-         * // => [-3, -2, -1, 0]
-         *
-         * _.rangeRight(1, 4, 0);
-         * // => [1, 1, 1]
-         *
-         * _.rangeRight(0);
-         * // => []
-         */
-        rangeRight(
-            start: number,
-            end: number,
-            step?: number
-        ): number[];
-
-        /**
-         * @see _.rangeRight
-         */
-        rangeRight(
-            end: number,
-            step?: number
-        ): number[];
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.rangeRight
-         */
-        rangeRight(
-            end?: number,
-            step?: number
-        ): LoDashImplicitArrayWrapper<number>;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.rangeRight
-         */
-        rangeRight(
-            end?: number,
-            step?: number
-        ): LoDashExplicitArrayWrapper<number>;
-    }
-
-    //_.runInContext
-    interface LoDashStatic {
-        /**
-         * Create a new pristine lodash function using the given context object.
-         *
-         * @param context The context object.
-         * @return Returns a new lodash function.
-         */
-        runInContext(context?: Object): typeof _;
-    }
-
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.runInContext
-         */
-        runInContext(): typeof _;
-    }
-
-    //_.times
-    interface LoDashStatic {
-        /**
-         * Invokes the iteratee function n times, returning an array of the results of each invocation. The iteratee
-         * is invoked with one argument; (index).
-         *
-         * @param n The number of times to invoke iteratee.
-         * @param iteratee The function invoked per iteration.
-         * @return Returns the array of results.
-         */
-        times<TResult>(
-            n: number,
-            iteratee: (num: number) => TResult
-        ): TResult[];
-
-        /**
-         * @see _.times
-         */
-        times(n: number): number[];
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.times
-         */
-        times<TResult>(
-            iteratee: (num: number) => TResult
-        ): TResult[];
-
-        /**
-         * @see _.times
-         */
-        times(): number[];
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.times
-         */
-        times<TResult>(
-            iteratee: (num: number) => TResult
-        ): LoDashExplicitArrayWrapper<TResult>;
-
-        /**
-         * @see _.times
-         */
-        times(): LoDashExplicitArrayWrapper<number>;
-    }
-
-    //_.toPath
-    interface LoDashStatic {
-        /**
-         * Converts `value` to a property path array.
-         *
-         * @static
-         * @memberOf _
-         * @category Util
-         * @param {*} value The value to convert.
-         * @returns {Array} Returns the new property path array.
-         * @example
-         *
-         * _.toPath('a.b.c');
-         * // => ['a', 'b', 'c']
-         *
-         * _.toPath('a[0].b.c');
-         * // => ['a', '0', 'b', 'c']
-         *
-         * var path = ['a', 'b', 'c'],
-         *     newPath = _.toPath(path);
-         *
-         * console.log(newPath);
-         * // => ['a', 'b', 'c']
-         *
-         * console.log(path === newPath);
-         * // => false
-         */
-        toPath(value: any): string[];
-    }
-
-    interface LoDashImplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.toPath
-         */
-        toPath(): LoDashImplicitWrapper<string[]>;
-    }
-
-    interface LoDashExplicitWrapperBase<T, TWrapper> {
-        /**
-         * @see _.toPath
-         */
-        toPath(): LoDashExplicitWrapper<string[]>;
-    }
-
-    //_.uniqueId
-    interface LoDashStatic {
-        /**
-         * Generates a unique ID. If prefix is provided the ID is appended to it.
-         *
-         * @param prefix The value to prefix the ID with.
-         * @return Returns the unique ID.
-         */
-        uniqueId(prefix?: string): string;
-    }
-
-    interface LoDashImplicitWrapper<T> {
-        /**
-         * @see _.uniqueId
-         */
-        uniqueId(): string;
-    }
-
-    interface LoDashExplicitWrapper<T> {
-        /**
-         * @see _.uniqueId
-         */
-        uniqueId(): LoDashExplicitWrapper<string>;
-    }
-
-    interface ListIterator<T, TResult> {
-        (value: T, index: number, collection: List<T>): TResult;
-    }
-
-    interface DictionaryIterator<T, TResult> {
-        (value: T, key?: string, collection?: Dictionary<T>): TResult;
-    }
-
-    interface NumericDictionaryIterator<T, TResult> {
-        (value: T, key?: number, collection?: Dictionary<T>): TResult;
-    }
-
-    interface ObjectIterator<T, TResult> {
-        (element: T, key?: string, collection?: any): TResult;
-    }
-
-    interface StringIterator<TResult> {
-        (char: string, index?: number, string?: string): TResult;
-    }
-
-    interface MemoVoidIterator<T, TResult> {
-        (prev: TResult, curr: T, indexOrKey?: any, list?: T[]): void;
-    }
-    interface MemoIterator<T, TResult> {
-        (prev: TResult, curr: T, indexOrKey?: any, list?: T[]): TResult;
-    }
-
-    interface MemoVoidArrayIterator<T, TResult> {
-        (acc: TResult, curr: T, index?: number, arr?: T[]): void;
-    }
-    interface MemoVoidDictionaryIterator<T, TResult> {
-        (acc: TResult, curr: T, key?: string, dict?: Dictionary<T>): void;
-    }
-
-    //interface Collection<T> {}
-
-    // Common interface between Arrays and jQuery objects
-    interface List<T> {
-        [index: number]: T;
-        length: number;
-    }
-
-    interface Dictionary<T> {
-        [index: string]: T;
-    }
-
-    interface NumericDictionary<T> {
-        [index: number]: T;
-    }
-
-    interface StringRepresentable {
-        toString(): string;
-    }
-
-    interface Cancelable {
-        cancel(): void;
-    }
-}
-
-declare module "lodash" {
-    export = _;
-}
-
-// Backward compatibility with --target es5
-interface Set<T> {}
-interface Map<K, V> {}
-interface WeakSet<T> {}
-interface WeakMap<K, V> {}
diff --git a/lodash/tsconfig.json b/lodash/tsconfig.json
new file mode 100644
index 0000000000..c4bf902b49
--- /dev/null
+++ b/lodash/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "lodash-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/log4javascript/index.d.ts b/log4javascript/index.d.ts
new file mode 100644
index 0000000000..460e17c91f
--- /dev/null
+++ b/log4javascript/index.d.ts
@@ -0,0 +1,1098 @@
+// Type definitions for log4javascript v1.4.10
+// Project: http://log4javascript.org/
+// Definitions by: Markus Wagner <https://github.com/Ritzlgrmft/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace log4javascript {
+
+	// #region log4javascript static properties/methods
+
+	/**
+	 * Returns a logger with the specified name, creating it if a logger with that name does not already exist.
+	 * If no name is specified, a logger is returned with name [anonymous], and subsequent calls to getLogger()
+	 * (with no logger name specified) will return this same logger object.
+	 * Note that the names [anonymous], [default], [null] and root are reserved for the anonymous logger, default logger,
+	 * null logger and root logger respectively.
+	 */
+	export function getLogger(loggerName?: string): Logger;
+
+	/**
+	 * Convenience method that returns the default logger. The default logger has a single appender: a PopUpAppender with the default
+	 * layout, width and height, and with focusPopUp set to false and lazyInit, useOldPopUp and complainAboutPopUpBlocking all set to true.
+	 */
+	export function getDefaultLogger(): Logger;
+
+	/**
+	 * Returns an empty logger with no appenders. Useful for disabling all logging.
+	 */
+	export function getNullLogger(): Logger;
+
+	/**
+	 * Returns the root logger from which all other loggers derive.
+	 */
+	export function getRootLogger(): Logger;
+
+	/**
+	 * Resets the all loggers to their default level.
+	 */
+	export function resetConfiguration(): void;
+
+	/**
+	 * Enables or disables all logging, depending on enabled.
+	 */
+	export function setEnabled(enabled: boolean): void;
+
+	/**
+	 * Returns true or false depending on whether logging is enabled.
+	 */
+	export function isEnabled(): boolean;
+
+	/**
+	 * Adds a function to be called when an event of the type specified occurs in log4javascript.
+	 * Supported event types are load (occurs once the page has loaded) and error.
+	 */
+	export function addEventListener(eventType: string, listener: { (sender: any, eventType: string, eventArgs: any): void; }): void;
+
+	/**
+	 * Removes the event listener function supplied for the event of the type specified.
+	 */
+	export function removeEventListener(eventType: string, listener: { (sender: any, eventType: string, eventArgs: any): void; }): void;
+
+	/**
+	 * Raises an event of type eventType on the log4javascript object. Each of the listeners for this type of event
+	 * (registered via addEventListener) is called and passed eventArgs as the third parameter.
+	 */
+	export function dispatchEvent(eventType: string, eventArgs: any): void;
+
+	/**
+	 * Used internally to specify the types of events that the log4javascript object can raise.
+	 */
+	export function setEventTypes(eventTypes: string[]): void;
+
+	/**
+	 * Enables or disables displaying of error stack traces, depending on show. By default, stack traces are not displayed.
+	 * (Only works in Firefox)
+	 */
+	export function setShowStackTraces(show: boolean): void;
+
+	/**
+	 * This evaluates the given expression in the log4javascript scope, thus allowing scripts to access internal
+	 * log4javascript variables and functions. This was written for the purposes of automated testing but could be used by
+	 * custom extensions to log4javascript.
+	 */
+	export function evalInScope(expr: string): any;
+
+	// #endregion
+
+	// #region Levels
+
+	/**
+	 * Levels are available as static properties of the log4javascript.Level object.
+	 */
+	export enum Level { ALL, TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF }
+
+	// #endregion
+
+	// #region Loggers
+
+	/**
+	 * It is possible to have multiple loggers in log4javascript. For example, you may wish to have a logger for debugging purposes
+	 * that logs messages to a pop-up window and a separate logger that reports any client-side application errors to the server via Ajax.
+	 * From version 1.4, log4javascript has hierarchical loggers, implemented in the same way as log4j. In summary, you specify a
+	 * logger's parent logger by means of a dot between the parent logger name and the child logger name. Therefore the logger
+	 * tim.app.security inherits from tim.app, which in turn inherits from tim which, finally, inherits from the root logger.
+	 * What inheritance means for a logger is that in the absence of a threshold level set specifically on the logger it inherits
+	 * its level from its parent; also, a logger inherits all its parent's appenders (this is known as appender additivity in log4j.
+	 * This behaviour can be enabled or disabled via setAdditivity(). See below). In the above example, if the root logger has a
+	 * level of DEBUG and one appender, each of the loggers tim.app.security, tim.app and tim would inherit the root level's appender.
+	 * If, say, tim.app's threshold level was set to WARN, tim's effective level would remain at DEBUG (inherited from the root logger)
+	 * while tim.app.security's effective level would be WARN, inherited from tim.app. The important thing to note is that appenders
+	 * accumulate down the logger hierarchy while levels are simply inherited from the nearest ancestor with a threshold level set.
+	 * For a detailed explanation of the logger hierarchy, see the log4j manual.
+	 */
+	export class Logger {
+		/**
+		 * Adds the given appender.
+		 */
+		addAppender(appender: Appender): void;
+
+		/**
+		 * Removes the given appender.
+		 */
+		removeAppender(appender: Appender): void;
+
+		/**
+		 * Clears all appenders for the current logger.
+		 */
+		removeAllAppenders(): void;
+
+		/**
+		 * Sets the level. Log messages of a lower level than level will not be logged. Default value is DEBUG.
+		 */
+		setLevel(level: Level): void;
+
+		/**
+		 * Returns the level explicitly set for this logger or null if none has been set.
+		 */
+		getLevel(): Level;
+
+		/**
+		 * Returns the level at which the logger is operating. This is either the level explicitly set on the logger or, if no level
+		 * has been set, the effective level of the logger's parent.
+		 */
+		getEffectiveLevel(): Level;
+
+		/**
+		 * Sets whether appender additivity is enabled (the default) or disabled. If set to false, this particular logger will not
+		 * inherit any appenders form its ancestors. Any descendant of this logger, however, will inherit from its ancestors as
+		 * normal, unless its own additivity is explicitly set to false.
+		 * Default value is true.
+		 */
+		setAdditivity(additivity: boolean): void;
+
+		/**
+		 * Returns whether additivity is enabled for this logger.
+		 */
+		getAdditivity(): boolean;
+
+		/**
+		 * Generic logging method used by wrapper methods such as debug, error etc.
+		 */
+		log(level: Level, params: any[]): void;
+
+		/**
+		 * Logs one or more messages and optionally an error at level TRACE.
+		 */
+		trace(...messages: any[]): void;
+
+		/**
+		 * Logs one or more messages and optionally an error at level DEBUG.
+		 */
+		debug(...messages: any[]): void;
+
+		/**
+		 * Logs one or more messages and optionally an error at level INFO.
+		 */
+		info(...messages: any[]): void;
+
+		/**
+		 * Logs one or more messages and optionally an error at level WARN.
+		 */
+		warn(...messages: any[]): void;
+
+		/**
+		 * Logs one or more messages and optionally an error at level ERROR.
+		 */
+		error(...messages: any[]): void;
+
+		/**
+		 * Logs one or more messages and optionally an error at level FATAL.
+		 */
+		fatal(...messages: any[]): void;
+
+		/**
+		 * Returns whether the logger is enabled for the specified level.
+		 */
+		isEnabledFor(level: Level, exception: Error): boolean;
+
+		/**
+		 * Returns whether the logger is enabled for TRACE messages.
+		 */
+		isTraceEnabled(): boolean;
+
+		/**
+		 * Returns whether the logger is enabled for DEBUG messages.
+		 */
+		isDebugEnabled(): boolean;
+
+		/**
+		 * Returns whether the logger is enabled for INFO messages.
+		 */
+		isInfoEnabled(): boolean;
+
+		/**
+		 * Returns whether the logger is enabled for WARN messages.
+		 */
+		isWarnEnabled(): boolean;
+
+		/**
+		 * Returns whether the logger is enabled for ERROR messages.
+		 */
+		isErrorEnabled(): boolean;
+
+		/**
+		 * Returns whether the logger is enabled for FATAL messages.
+		 */
+		isFatalEnabled(): boolean;
+
+		/**
+		 * Starts a new group of log messages. In appenders that support grouping (currently PopUpAppender and InPageAppender),
+		 * a group appears as an expandable section in the console, labelled with the name specified. Specifying initiallyExpanded
+		 * determines whether the group starts off expanded (the default is true). Groups may be nested.
+		 */
+		group(name: string, initiallyExpanded?: boolean): void;
+
+		/**
+		 * Ends the current group. If there is no group then this function has no effect.
+		 */
+		groupEnd(): void;
+
+		/**
+		 * Starts a timer with name name. When the timer is ended with a call to timeEnd using the same name, the amount of time
+		 * that has elapsed in milliseconds since the timer was started is logged at level level. If not level is supplied, the level
+		 * defaults to INFO.
+		 */
+		time(name: string, level?: Level): void;
+
+		/**
+		 * Ends the timer with name name and logs the time elapsed.
+		 */
+		timeEnd(name: string): void;
+
+		/**
+		 * Asserts the given expression is true or evaluates to true. If so, nothing is logged. If not, an error is logged at the ERROR level.
+		 */
+		assert(expr: any): void;
+
+		name: string;
+	}
+
+	// #endregion
+
+	// #region Appenders
+
+	/**
+	 * Logging event.
+	 */
+	export class LoggingEvent {
+		logger: Logger;
+		timeStamp: Date;
+		timeStampInMilliseconds: number;
+		timeStampInSeconds: number;
+		milliseconds: number;
+		level: Level;
+		messages: any[];
+		exception: Error;
+
+		constructor(logger: Logger, timeStamp: Date, level: Level, messages: string[], exception?: Error);
+
+		getThrowableStrRep: () => string;
+		getCombinedMessages: () => string;
+		toString: () => string;
+	}
+
+	/**
+	 * There are methods common to all appenders, as listed below.
+	 */
+	export class Appender {
+
+		/**
+		 * Checks the logging event's level is at least as severe as the appender's threshold and calls the appender's append method if so.
+		 * This method should not in general be used directly or overridden.
+		 */
+		doAppend(loggingEvent: LoggingEvent): void;
+
+		/**
+		 * Appender-specific method to append a log message. Every appender object should implement this method.
+		 */
+		append(loggingEvent: LoggingEvent): void;
+
+		/**
+		 * Sets the appender's layout.
+		 */
+		setLayout(layout: Layout): void;
+
+		/**
+		 * Returns the appender's layout.
+		 */
+		getLayout(): Layout;
+
+		/**
+		 * Sets the appender's threshold. Log messages of level less severe than this threshold will not be logged.
+		 */
+		setThreshold(level: Level): void;
+
+		/**
+		 * Returns the appender's threshold.
+		 */
+		getThreshold(): Level;
+
+		/**
+		 * Returns a string representation of the appender. Every appender object should implement this method.
+		 */
+		toString(): string;
+
+	}
+
+	/**
+	 * Displays a log message as a JavaScript alert.
+	 */
+	export class AlertAppender extends Appender {
+		/**
+		 * Constructor
+		 */
+		constructor();
+	}
+
+	/**
+	 * A flexible appender that asynchronously sends log messages to a server via HTTP.
+	 * The default configuration is to send each log message as a separate HTTP post request to the server using an
+	 * HttpPostDataLayout, without waiting for a response before sending any subsequent requests.
+	 */
+	export class AjaxAppender extends Appender {
+		/**
+		 * Constructor
+		 * @param url The URL to which log messages should be sent. Note that this is subject to the usual Ajax restrictions:
+		 * the URL should be in the same domain as that of the page making the request.
+		 * @param withCredentials Specifies whether cookies should be sent with each request.
+		 */
+		constructor(url: string, withCredentials?: boolean);
+
+		/**
+		 * Whether to send all remaining unsent log messages to the server when the page unloads.
+		 * Since version 1.4.3, the default value is false. Previously the default was true.
+		 */
+		setSendAllOnUnload(sendAllOnUnload: boolean): void;
+
+		/**
+		 * Returns whether all remaining unsent log messages are sent to the server when the page unloads.
+		 */
+		isSendAllOnUnload(): boolean;
+
+		/**
+		 * Sets the post variable name whose value will the formatted log message(s) for each request.
+		 * Default value is data.
+		 */
+		setPostVarName(postVarName: string): void;
+
+		/**
+		 * Returns the post variable name whose value will the formatted log message(s) for each request.
+		 */
+		getPostVarName(): string;
+
+		/**
+		 * Whether to send log messages to the server at regular, timed intervals.
+		 * Default value is false.
+		 */
+		setTimed(timed: boolean): void;
+
+		/**
+		 * Returns whether log messages are sent to the server at regular, timed intervals.
+		 */
+		isTimed(): boolean;
+
+		/**
+		 * Sets whether to wait for a response from a previous HTTP request from this appender before sending the next log
+		 * message / batch of messages.
+		 * Default value is false.
+		 */
+		setWaitForResponse(waitForResponse: boolean): void;
+
+		/**
+		 * Returns whether the appender waits for a response from a previous HTTP request from this appender before sending the next
+		 * log message / batch of messages.
+		 */
+		isWaitForResponse(): boolean;
+
+		/**
+		 * Sets the number of log messages to send in each request. If not specified, defaults to 1.
+		 */
+		setBatchSize(batchSize: number): void;
+
+		/**
+		 * Returns the number of log messages sent in each request. See above for more details.
+		 */
+		getBatchSize(): number;
+
+		/**
+		 * Sets the length of time in milliseconds between each sending of queued log messages.
+		 */
+		setTimerInterval(timerInterval: number): void;
+
+		/**
+		 * Returns the length of time in milliseconds between each sending of queued log messages. See above for more details.
+		 */
+		getTimerInterval(): number;
+
+		/**
+		 * Sets the function that is called whenever a successful request is made, called at the point at which the response is
+		 * received. This feature can be used to confirm whether a request has been successful and act accordingly.
+		 * A single parameter, xmlHttp, is passed to the callback function. This is the XMLHttpRequest object that performed the
+		 * request.
+		 */
+		setRequestSuccessCallback(requestSuccessCallback: { (xmlHttp: XMLHttpRequest): void; }): void;
+
+		/**
+		 * Sets the function that is called whenever any kind of failure occurs in the appender, including browser deficiencies or
+		 * configuration errors (e.g. supplying a non-existent URL to the appender). This feature can be used to handle
+		 * AjaxAppender-specific errors.
+		 * A single parameter, message, is passed to the callback function. This is the error-specific message that caused the failure.
+		 */
+		setFailCallback(failCallback: { (message: string): void; }): void;
+
+		/**
+		 * Sets the session id sent to the server each time a request is made.
+		 */
+		setSessionId(sessionId: string): void;
+
+		/**
+		 * Returns the session id sent to the server each time a request is made.
+		 */
+		getSessionId(): string;
+
+		/**
+		 * Adds an HTTP header that is sent with each request.
+		 */
+		addHeader(name: string, value: string): void;
+
+		/**
+		 * Returns an array of the additional headers that are sent with each HTTP request. Each array item is an object with
+		 * properties name and value.
+		 */
+		getHeaders(): Array<{ name: string; value: string; }>;
+
+		/**
+		 * Sends all log messages in the queue. If log messages are batched then only completed batches are sent.
+		 */
+		sendAll(): void;
+	}
+
+	/**
+	 * Logs messages to a pop-up console window (note: you will need to disable pop-up blockers to use it). The pop-up displays a
+	 * list of all log messages.
+	 */
+	export class PopUpAppender extends Appender {
+		/**
+		 * Constructor
+		 * @param lazyInit Set this to true to open the pop-up only when the first log message reaches the appender. Otherwise, the
+		 * pop-up window opens as soon as the appender is created. If not specified, defaults to false.
+		 * @param initiallyMinimized Whether the console window should start off hidden / minimized. If not specified, defaults to false.
+		 * @param useDocumentWrite Specifies how the console window is created. By default, the console window is created dynamically
+		 * using document's write method. This has the advantage of keeping all the code in one single JavaScript file. However,
+		 * if your page sets document.domain then the browser prevents script access to a window unless it too has the same value
+		 * set for document.domain. To get round this issue, you can set useDocumentWrite to false and log4javascript will instead
+		 * use the external HTML file console.html (or console_uncompressed.html if you're using an uncompressed version of
+		 * log4javascript.js), which must be placed in the same directory as your log4javascript.js file.
+		 * Note that if useDocumentWrite is set to true, the old pop-up window will always be closed and a new one created whenever
+		 * the page is refreshed, even if setUseOldPopUp(true) has been called.
+		 * In general it's simpler to use the document.write method, so unless your page needs to set document.domain,
+		 * useDocumentWrite should be set to true.
+		 * If not specified, defaults to true.
+		 * @param width The outer width in pixels of the pop-up window. If not specified, defaults to 600.
+		 * @param height The outer height in pixels of the pop-up window. If not specified, defaults to 400.
+		 */
+		constructor(lazyInit?: boolean, initiallyMinimized?: boolean, useDocumentWrite?: boolean, width?: number, height?: number);
+
+		/**
+		 * Returns whether the console window starts off hidden / minimized.
+		 */
+		isInitiallyMinimized(): boolean;
+
+		/**
+		 * Sets whether the console window should start off hidden / minimized.
+		 */
+		setInitiallyMinimized(initiallyMinimized: boolean): void;
+
+		/**
+		 * Returns whether the pop-up window is focussed (i.e. brought it to the front) when a new log message is added. Default value is false.
+		 */
+		isFocusPopUp(): boolean;
+
+		/**
+		 * Sets whether to focus the pop-up window (i.e. bring it to the front) when a new log message is added.
+		 */
+		setFocusPopUp(focusPopUp: boolean): void;
+
+		/**
+		 * Returns whether the same pop-up window is used if the main page is reloaded. If set to true, when the page is reloaded a
+		 * line is drawn in the pop-up and subsequent log messages are added to the same pop-up. Otherwise, a new pop-up window is
+		 * created that replaces the original pop-up. If not specified, defaults to true.
+		 */
+		isUseOldPopUp(): boolean;
+
+		/**
+		 * Sets whether to use the same pop-up window if the main page is reloaded. See isUseOldPopUp above for details.
+		 */
+		setUseOldPopUp(useOldPopUp: boolean): void;
+
+		/**
+		 * Returns whether an alert is shown to the user when the pop-up window cannot be created as a result of a pop-up blocker.
+		 * Default value is true.
+		 */
+		isComplainAboutPopUpBlocking(): boolean;
+
+		/**
+		 * Sets whether to announce to show an alert to the user when the pop-up window cannot be created as a result of a pop-up blocker.
+		 */
+		setComplainAboutPopUpBlocking(complainAboutPopUpBlocking: boolean): void;
+
+		/**
+		 * Returns whether new log messages are displayed at the top of the pop-up window. Default value is false (i.e. log messages
+		 * are appended to the bottom of the window).
+		 */
+		isNewestMessageAtTop(): boolean;
+
+		/**
+		 * Sets whether to display new log messages at the top inside the pop-up window.
+		 */
+		setNewestMessageAtTop(newestMessageAtTop: boolean): void;
+
+		/**
+		 * Returns whether the pop-up window scrolls to display the latest log message when a new message is logged. Default value is true.
+		 */
+		isScrollToLatestMessage(): boolean;
+
+		/**
+		 * Sets whether to scroll the pop-up window to display the latest log message when a new message is logged.
+		 */
+		setScrollToLatestMessage(scrollToLatestMessage: boolean): void;
+
+		/**
+		 * Returns whether the pop-up window reopens automatically after being closed when a new log message is logged. Default value is false.
+		 */
+		isReopenWhenClosed(): boolean;
+
+		/**
+		 * Sets whether to reopen the pop-up window automatically after being closed when a new log message is logged.
+		 */
+		setReopenWhenClosed(reopenWhenClosed: boolean): void;
+
+		/**
+		 * Returns the outer width in pixels of the pop-up window.
+		 */
+		getWidth(): number;
+
+		/**
+		 * Sets the outer width in pixels of the pop-up window.
+		 */
+		setWidth(width: number): void;
+
+		/**
+		 * Returns the outer height in pixels of the pop-up window.
+		 */
+		getHeight(): number;
+
+		/**
+		 * Sets the outer height in pixels of the pop-up window.
+		 */
+		setHeight(height: number): void;
+
+		/**
+		 * Returns the largest number of log messages that are displayed and stored by the the console. Once reached, a new log
+		 * message wil cause the oldest message to be discarded. Default value is null, which means no limit is applied.
+		 */
+		getMaxMessages(): number;
+
+		/**
+		 * Sets the largest number of messages displayed and stored by the console window. Set this to null to make this number unlimited.
+		 */
+		setMaxMessages(maxMessages: number): void;
+
+		/**
+		 * Returns whether the console includes a command line. Default value is true.
+		 */
+		isShowCommandLine(): boolean;
+
+		/**
+		 * Sets whether the console includes a command line.
+		 */
+		setShowCommandLine(showCommandLine: boolean): void;
+
+		/**
+		 * Returns the number of levels to expand when an object value is logged to the console. Each property of an object above
+		 * this threshold will be expanded if it is itself an object or array, otherwise its string representation will be displayed.
+		 * Default value is 1 (i.e. the properties of the object logged will be displayed in their string representation but not expanded).
+		 */
+		getCommandLineObjectExpansionDepth(): number;
+
+		/**
+		 * Sets the number of levels to expand when an object value is logged to the console.
+		 */
+		setCommandLineObjectExpansionDepth(expansionDepth: number): void;
+
+		/**
+		 * Returns a reference to the window in which commands typed into the command line are currently being executed.
+		 */
+		getCommandWindow(): Window;
+
+		/**
+		 * Sets the window in which commands typed into the command line are executed.
+		 */
+		setCommandWindow(commandWindow: Window): void;
+
+		/**
+		 * Returns the layout used to format the output for commands typed into the command line. The default value is a
+		 * PatternLayout with pattern string %m
+		 */
+		getCommandLayout(): Layout;
+
+		/**
+		 * Sets the layout used to format the output for commands typed into the command line.
+		 */
+		setCommandLayout(commandLayout: Layout): void;
+
+		/**
+		 * Clears all messages from the console window.
+		 */
+		clear(): void;
+
+		/**
+		 * Closes the pop-up window.
+		 */
+		close(): void;
+
+		/**
+		 * Opens the pop-up window, if not already open.
+		 */
+		show(): void;
+
+		/**
+		 * Closes the pop-up window.
+		 */
+		hide(): void;
+
+		/**
+		 * Brings the console window to the top and gives it the focus.
+		 */
+		focus(): void;
+
+		/**
+		 * Brings the console window to the top and gives the focus to the command line.
+		 */
+		focusCommandLine(): void;
+
+		/**
+		 * Brings the console window to the top and gives the focus to the search box.
+		 */
+		focusSearch(): void;
+
+		/**
+		 * Evaluates the expression and appends the result to the console.
+		 */
+		evalCommandAndAppend(expr: string): void;
+
+		/**
+		 * Adds a function with the name specified to the list of functions available on the command line. This feature may be used
+		 * to add custom functions to the command line.
+		 */
+		addCommandLineFunction(functionName: string,
+			commandLineFunction: { (appender: Appender, args: any, returnValue: { appendResult: boolean; isError: boolean; }): any; }): void;
+	}
+
+	/**
+	 * Logs messages to a console window in the page. The console is identical to that used by the PopUpAppender, except for the
+	 * absence of a 'Close' button.
+	 */
+	export class InPageAppender extends Appender {
+		/**
+		 * Constructor
+		 * @param container The container element for the console window. This should be an HTML element.
+		 * @param lazyInit Set this to true to create the console only when the first log message reaches the appender. Otherwise,
+		 * the console is initialized as soon as the appender is created. If not specified, defaults to true.
+		 * @param initiallyMinimized Whether the console window should start off hidden / minimized. If not specified, defaults to false
+		 * @param useDocumentWrite Specifies how the console window is created. By default, the console window is created dynamically
+		 * using document's write method. This has the advantage of keeping all the code in one single JavaScript file. However,
+		 * if your page sets document.domain then the browser prevents script access to a window unless it too has the same value
+		 * set for document.domain. To get round this issue, you can set useDocumentWrite to false and log4javascript will instead
+		 * use the external HTML file console.html (or console_uncompressed.html if you're using an uncompressed version of
+		 * log4javascript.js), which must be placed in the same directory as your log4javascript.js file.
+		 * In general it's simpler to use the document.write method, so unless your page needs to set document.domain,
+		 * useDocumentWrite should be set to true.
+		 * If not specified, defaults to true.
+		 * @param width The width of the console window. Any valid CSS length may be used. If not specified, defaults to 100%.
+		 * @param height The height of the console window. Any valid CSS length may be used. If not specified, defaults to 250px.
+		 */
+		constructor(container: HTMLElement, lazyInit?: boolean, initiallyMinimized?: boolean,
+			useDocumentWrite?: boolean, width?: number, height?: number);
+
+		/**
+		 * Sets a CSS style property on the HTML element containing the console iframe.
+		 */
+		addCssProperty(name: string, value: string): void;
+
+		/**
+		 * Returns whether the console window is currently visible.
+		 */
+		isVisible(): boolean;
+
+		/**
+		 * Returns whether the console window starts off hidden / minimized.
+		 */
+		isInitiallyMinimized(): boolean;
+
+		/**
+		 * Sets whether the console window should start off hidden / minimized.
+		 */
+		setInitiallyMinimized(initiallyMinimized: boolean): void;
+
+		/**
+		 * Returns whether new log messages are displayed at the top of the pop-up window. Default value is false (i.e. log messages
+		 * are appended to the bottom of the window).
+		 */
+		isNewestMessageAtTop(): boolean;
+
+		/**
+		 * Sets whether to display new log messages at the top inside the pop-up window.
+		 */
+		setNewestMessageAtTop(newestMessageAtTop: boolean): void;
+
+		/**
+		 * Returns whether the pop-up window scrolls to display the latest log message when a new message is logged. Default value is true.
+		 */
+		isScrollToLatestMessage(): boolean;
+
+		/**
+		 * Sets whether to scroll the pop-up window to display the latest log message when a new message is logged.
+		 */
+		setScrollToLatestMessage(scrollToLatestMessage: boolean): void;
+
+		/**
+		 * Returns the outer width of the console window.
+		 */
+		getWidth(): number;
+
+		/**
+		 * Sets the outer width of the console window. Any valid CSS length may be used.
+		 */
+		setWidth(width: number): void;
+
+		/**
+		 * Returns the outer height of the console window.
+		 */
+		getHeight(): number;
+
+		/**
+		 * Sets the outer height of the console window. Any valid CSS length may be used.
+		 */
+		setHeight(height: number): void;
+
+		/**
+		 * Returns the largest number of messages displayed and stored by the console window.
+		 */
+		getMaxMessages(): number;
+
+		/**
+		 * Sets the largest number of messages displayed and stored by the console window. Set this to null to make this number unlimited.
+		 */
+		setMaxMessages(maxMessages: number): void;
+
+		/**
+		 * Returns whether the console includes a command line. Default value is true.
+		 */
+		isShowCommandLine(): boolean;
+
+		/**
+		 * Sets whether the console includes a command line.
+		 */
+		setShowCommandLine(showCommandLine: boolean): void;
+
+		/**
+		 * Returns the number of levels to expand when an object value is logged to the console. Each property of an object above
+		 * this threshold will be expanded if it is itself an object or array, otherwise its string representation will be displayed.
+		 * Default value is 1 (i.e. the properties of the object logged will be displayed in their string representation but not expanded).
+		 */
+		getCommandLineObjectExpansionDepth(): number;
+
+		/**
+		 * Sets the number of levels to expand when an object value is logged to the console.
+		 */
+		setCommandLineObjectExpansionDepth(expansionDepth: number): void;
+
+		/**
+		 * Returns a reference to the window in which commands typed into the command line are currently being executed.
+		 */
+		getCommandWindow(): Window;
+
+		/**
+		 * Sets the window in which commands typed into the command line are executed.
+		 */
+		setCommandWindow(commandWindow: Window): void;
+
+		/**
+		 * Returns the layout used to format the output for commands typed into the command line. The default value is a
+		 * PatternLayout with pattern string %m
+		 */
+		getCommandLayout(): Layout;
+
+		/**
+		 * Sets the layout used to format the output for commands typed into the command line.
+		 */
+		setCommandLayout(commandLayout: Layout): void;
+
+		/**
+		 * Clears all messages from the console window.
+		 */
+		clear(): void;
+
+		/**
+		 * Closes the pop-up window.
+		 */
+		close(): void;
+
+		/**
+		 * Shows / unhides the console window.
+		 */
+		show(): void;
+
+		/**
+		 * Hides / minimizes the console window.
+		 */
+		hide(): void;
+
+		/**
+		 * Brings the console window to the top and gives it the focus.
+		 */
+		focus(): void;
+
+		/**
+		 * Brings the console window to the top and gives the focus to the command line.
+		 */
+		focusCommandLine(): void;
+
+		/**
+		 * Brings the console window to the top and gives the focus to the search box.
+		 */
+		focusSearch(): void;
+
+		/**
+		 * Evaluates the expression and appends the result to the console.
+		 */
+		evalCommandAndAppend(expr: string): void;
+
+		/**
+		 * Adds a function with the name specified to the list of functions available on the command line. This feature may be used
+		 * to add custom functions to the command line.
+		 */
+		addCommandLineFunction(functionName: string,
+			commandLineFunction: { (appender: Appender, args: any, returnValue: { appendResult: boolean; isError: boolean; }): any; }): void;
+	}
+
+	/**
+	 * Writes log messages to the browser's built-in console, if present. This only works currently in Safari, Opera and Firefox
+	 * with the excellent Firebug extension installed.
+	 */
+	export class BrowserConsoleAppender extends Appender {
+		/**
+		 * Constructor
+		 */
+		constructor();
+	}
+
+	//#endregion
+
+	// #region Layouts
+
+	/**
+	 * There are a few methods common to all layouts.
+	 */
+	export class Layout {
+		/**
+		 * Formats the log message. You should override this method in your own layouts.
+		 */
+		format(loggingEvent: LoggingEvent): string;
+
+		/**
+		 * Returns whether the layout ignores an error object in a logging event passed to its format method.
+		 */
+		ignoresThrowable(): boolean;
+
+		/**
+		 * Returns the content type of the output of the layout.
+		 */
+		getContentType(): string;
+
+		/**
+		 * Returns whether the layout's output is suitable for batching. JsonLayout and XmlLayout are the only built-in layouts that
+		 * return true for this method.
+		 */
+		allowBatching(): boolean;
+
+		/**
+		 * Used internally by log4javascript in constructing formatted output for some layouts.
+		 */
+		getDataValues(loggingEvent: LoggingEvent): Array<any>;
+
+		/**
+		 * This method is used to change the default keys used to create formatted name-value pairs for the properties of a log
+		 * message, for layouts that do this. These layouts are JsonLayout and HttpPostDataLayout.
+		 * @param loggerKey Parameter to use for the log message's logger name. Default is logger.
+		 * @param timeStampKey Parameter to use for the log message's timestamp. Default is timestamp.
+		 * @param levelKey Parameter to use for the log message's level. Default is level.
+		 * @param messageKey Parameter to use for the message itself. Default is message.
+		 * @param exceptionKey Parameter to use for the log message's error (exception). Default is exception.
+		 * @param urlKey Parameter to use for the current page URL. Default is url.
+		 */
+		setKeys(loggerKey: string, timeStampKey: string, levelKey: string, messageKey: string, exceptionKey: string, urlKey: string): void;
+
+		/**
+		 * Some layouts (JsonLayout, HttpPostDataLayout, PatternLayout and XmlLayout) allow you to set custom fields (e.g. a session
+		 * id to send to the server) to the formatted output. Use this method to set a custom field. If there is already a custom
+		 * field with the specified name, its value will be updated with value.
+		 * @param name Name of the custom property you wish to be included in the formmtted output.
+		 * @param value Value of the custom property you wish to be included in the formatted output.
+		 */
+		setCustomField(name: string, value: string): string;
+
+		/**
+		 * Returns whether the layout has any custom fields.
+		 */
+		hasCustomFields(): boolean;
+
+		formatWithException(loggingEvent: LoggingEvent): string;
+	}
+
+	/**
+	 * The most basic layout. NullLayout's format() methods performs no formatting at all and simply returns the message logged.
+	 */
+	export class NullLayout extends Layout {
+		/**
+		 * Constructor
+		 */
+		constructor();
+	}
+
+	/**
+	 * Provides basic formatting. SimpleLayout consists of the level of the log statement, followed by " - " and then the log message
+	 * itself. For example, "DEBUG - Hello world".
+	 */
+	export class SimpleLayout extends Layout {
+		/**
+		 * Constructor
+		 */
+		constructor();
+	}
+
+	/**
+	 * Provides a flexible way of formatting a log message by means of a conversion pattern string. The behaviour of this layout is a
+	 * full implementation of PatternLayout in log4j, with the exception of the set of conversion characters - log4javascript's is
+	 * necessarily a subset of that of log4j with a few additions of its own, since many of the conversion characters in log4j only
+	 * make sense in the context of Java.
+	 * The conversion pattern consists of literal text interspersed with special strings starting with a % symbol called conversion
+	 * specifiers. A conversion specifier consists of the % symbol, a conversion character (possible characters are listed below) and
+	 * format modifiers. For full documentation of the conversion pattern, see log4j's documentation.
+	 */
+	export class PatternLayout extends Layout {
+		/**
+		 * Built-in conversion pattern, equivalent to %r %p %c - %m%n.
+		 */
+		static TTCC_CONVERSION_PATTERN: string;
+
+		/**
+		 * Built-in conversion pattern, equivalent to %m%n.
+		 */
+		static DEFAULT_CONVERSION_PATTERN: string;
+
+		/**
+		 * Built-in date format (and also the default), equivalent to yyyy-MM-dd HH:mm:ss,SSS.
+		 */
+		static ISO8601_DATEFORMAT: string;
+
+		/**
+		 * Built-in date format, equivalent to dd MMM YYYY HH:mm:ss,SSS.
+		 */
+		static DATETIME_DATEFORMAT: string;
+
+		/**
+		 * Built-in date format, equivalent to HH:mm:ss,SSS.
+		 */
+		static ABSOLUTETIME_DATEFORMAT: string;
+
+		/**
+		 * Constructor
+		 * @param pattern The conversion pattern string to use.
+		 */
+		constructor(pattern: string);
+	}
+
+	/**
+	 * Based on log4j's XmlLayout, this layout formats a log message as a fragment of XML.
+	 */
+	export class XmlLayout extends Layout {
+		/**
+		 * Constructor
+		 * @param combineMessages Whether or not to format multiple log messages as a combined single <log4javascript:message>
+		 * element composed of each individual message separated by line breaks or to include a <log4javascript:message> element for
+		 * each message inside one <log4javascript:messages> element. If not specified, defaults to true.
+		 */
+		constructor(combineMessages?: boolean);
+	}
+
+	/**
+	 * Formats a logging event into JavaScript Object Notation (JSON). JSON is a subset of JavaScript's object literal syntax,
+	 * meaning that log messages formatted with this layout can be interpreted directly by JavaScript and converted into objects.
+	 * See json.org for more details about JSON.
+	 */
+	export class JsonLayout extends Layout {
+		/**
+		 * Constructor
+		 * @param readable Whether or not to format each log message with line breaks and tabs. If not specified, defaults to false.
+		 * @param combineMessages Whether or not to format multiple log messages as a combined single message property composed of
+		 * each individual message separated by line breaks or to format multiple messages as an array. If not specified, defaults to true.
+		 */
+		constructor(readable?: boolean, combineMessages?: boolean);
+
+		/**
+		 * Returns whether or not to each log message is formatted with line breaks and tabs.
+		 */
+		isReadable(): boolean;
+	}
+
+	/**
+	 * Formats the log message as a simple URL-encoded string from which a simple server-side script may extract parameters such as
+	 * the log message, severity and timestamp. This is the default layout for AjaxAppender.
+	 */
+	export class HttpPostDataLayout extends Layout {
+		/**
+		 * Constructor
+		 */
+		constructor();
+	}
+
+	// #endregion
+
+	// #region log4javascript error handling
+
+	/**
+	 * log4javascript has a single rudimentary logger-like object of its own to handle messages generated by log4javascript itself.
+	 * This logger is called logLog and is accessed via log4javascript.logLog.
+	 */
+	export namespace logLog {
+
+		/**
+		 * Sets whether logLog is in quiet mode or not. In quiet mode, no messages sent to logLog have any visible effect. By default,
+		 * quiet mode is switched off.
+		 * @param quietMode Whether to turn quiet mode on or off.
+		 */
+		export function setQuietMode(quietMode: boolean): void;
+
+		/**
+		 * Sets how many errors logLog will display alerts for. By default, only the first error encountered generates an alert to the
+		 * user. If you turn all errors on by supplying true to this method then all errors will generate alerts.
+		 * @param showAllErrors Whether to show all errors or just the first.
+		 */
+		export function setAlertAllErrors(alertAllErrors: boolean): void;
+
+		/**
+		 * Logs a debugging message to an in-memory list.
+		 */
+		export function debug(message: string, exception?: Error): void;
+
+		/**
+		 * Displays an alert of all debugging messages.
+		 */
+		export function displayDebug(): void;
+
+		/**
+		 * Currently has no effect.
+		 */
+		export function warn(message: string, exception?: Error): void;
+
+		/**
+		 * Generates an alert to the user if and only if the error is the first one encountered and setAlertAllErrors(true) has not been called.
+		 */
+		export function error(message: string, exception?: Error): void;
+
+	}
+
+	// #endregion
+}
diff --git a/log4javascript/log4javascript-tests.ts b/log4javascript/log4javascript-tests.ts
index c3b77c5b69..4b25122aa2 100644
--- a/log4javascript/log4javascript-tests.ts
+++ b/log4javascript/log4javascript-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./log4javascript.d.ts" />
+
 
 function aSimpleLoggingMessageString() {
 	var log = log4javascript.getDefaultLogger();
diff --git a/log4javascript/log4javascript.d.ts b/log4javascript/log4javascript.d.ts
deleted file mode 100644
index 1307053fad..0000000000
--- a/log4javascript/log4javascript.d.ts
+++ /dev/null
@@ -1,1096 +0,0 @@
-// Type definitions for log4javascript v1.4.10
-// Project: http://log4javascript.org/
-// Definitions by: Markus Wagner <https://github.com/Ritzlgrmft/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace log4javascript {
-
-	// #region log4javascript static properties/methods
-
-	/**
-	 * Returns a logger with the specified name, creating it if a logger with that name does not already exist.
-	 * If no name is specified, a logger is returned with name [anonymous], and subsequent calls to getLogger()
-	 * (with no logger name specified) will return this same logger object.
-	 * Note that the names [anonymous], [default], [null] and root are reserved for the anonymous logger, default logger,
-	 * null logger and root logger respectively.
-	 */
-	export function getLogger(loggerName?: string): Logger;
-
-	/**
-	 * Convenience method that returns the default logger. The default logger has a single appender: a PopUpAppender with the default
-	 * layout, width and height, and with focusPopUp set to false and lazyInit, useOldPopUp and complainAboutPopUpBlocking all set to true.
-	 */
-	export function getDefaultLogger(): Logger;
-
-	/**
-	 * Returns an empty logger with no appenders. Useful for disabling all logging.
-	 */
-	export function getNullLogger(): Logger;
-
-	/**
-	 * Returns the root logger from which all other loggers derive.
-	 */
-	export function getRootLogger(): Logger;
-
-	/**
-	 * Resets the all loggers to their default level.
-	 */
-	export function resetConfiguration(): void;
-
-	/**
-	 * Enables or disables all logging, depending on enabled.
-	 */
-	export function setEnabled(enabled: boolean): void;
-
-	/**
-	 * Returns true or false depending on whether logging is enabled.
-	 */
-	export function isEnabled(): boolean;
-
-	/**
-	 * Adds a function to be called when an event of the type specified occurs in log4javascript.
-	 * Supported event types are load (occurs once the page has loaded) and error.
-	 */
-	export function addEventListener(eventType: string, listener: { (sender: any, eventType: string, eventArgs: any): void; }): void;
-
-	/**
-	 * Removes the event listener function supplied for the event of the type specified.
-	 */
-	export function removeEventListener(eventType: string, listener: { (sender: any, eventType: string, eventArgs: any): void; }): void;
-
-	/**
-	 * Raises an event of type eventType on the log4javascript object. Each of the listeners for this type of event
-	 * (registered via addEventListener) is called and passed eventArgs as the third parameter.
-	 */
-	export function dispatchEvent(eventType: string, eventArgs: any): void;
-
-	/**
-	 * Used internally to specify the types of events that the log4javascript object can raise.
-	 */
-	export function setEventTypes(eventTypes: string[]): void;
-
-	/**
-	 * Enables or disables displaying of error stack traces, depending on show. By default, stack traces are not displayed.
-	 * (Only works in Firefox)
-	 */
-	export function setShowStackTraces(show: boolean): void;
-
-	/**
-	 * This evaluates the given expression in the log4javascript scope, thus allowing scripts to access internal
-	 * log4javascript variables and functions. This was written for the purposes of automated testing but could be used by
-	 * custom extensions to log4javascript.
-	 */
-	export function evalInScope(expr: string): any;
-
-	// #endregion
-
-	// #region Levels
-
-	/**
-	 * Levels are available as static properties of the log4javascript.Level object.
-	 */
-	export enum Level { ALL, TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF }
-
-	// #endregion
-
-	// #region Loggers
-
-	/**
-	 * It is possible to have multiple loggers in log4javascript. For example, you may wish to have a logger for debugging purposes
-	 * that logs messages to a pop-up window and a separate logger that reports any client-side application errors to the server via Ajax.
-	 * From version 1.4, log4javascript has hierarchical loggers, implemented in the same way as log4j. In summary, you specify a
-	 * logger's parent logger by means of a dot between the parent logger name and the child logger name. Therefore the logger
-	 * tim.app.security inherits from tim.app, which in turn inherits from tim which, finally, inherits from the root logger.
-	 * What inheritance means for a logger is that in the absence of a threshold level set specifically on the logger it inherits
-	 * its level from its parent; also, a logger inherits all its parent's appenders (this is known as appender additivity in log4j.
-	 * This behaviour can be enabled or disabled via setAdditivity(). See below). In the above example, if the root logger has a
-	 * level of DEBUG and one appender, each of the loggers tim.app.security, tim.app and tim would inherit the root level's appender.
-	 * If, say, tim.app's threshold level was set to WARN, tim's effective level would remain at DEBUG (inherited from the root logger)
-	 * while tim.app.security's effective level would be WARN, inherited from tim.app. The important thing to note is that appenders
-	 * accumulate down the logger hierarchy while levels are simply inherited from the nearest ancestor with a threshold level set.
-	 * For a detailed explanation of the logger hierarchy, see the log4j manual.
-	 */
-	export class Logger {
-		/**
-		 * Adds the given appender.
-		 */
-		addAppender(appender: Appender): void;
-
-		/**
-		 * Removes the given appender.
-		 */
-		removeAppender(appender: Appender): void;
-
-		/**
-		 * Clears all appenders for the current logger.
-		 */
-		removeAllAppenders(): void;
-
-		/**
-		 * Sets the level. Log messages of a lower level than level will not be logged. Default value is DEBUG.
-		 */
-		setLevel(level: Level): void;
-
-		/**
-		 * Returns the level explicitly set for this logger or null if none has been set.
-		 */
-		getLevel(): Level;
-
-		/**
-		 * Returns the level at which the logger is operating. This is either the level explicitly set on the logger or, if no level
-		 * has been set, the effective level of the logger's parent.
-		 */
-		getEffectiveLevel(): Level;
-
-		/**
-		 * Sets whether appender additivity is enabled (the default) or disabled. If set to false, this particular logger will not
-		 * inherit any appenders form its ancestors. Any descendant of this logger, however, will inherit from its ancestors as
-		 * normal, unless its own additivity is explicitly set to false.
-		 * Default value is true.
-		 */
-		setAdditivity(additivity: boolean): void;
-
-		/**
-		 * Returns whether additivity is enabled for this logger.
-		 */
-		getAdditivity(): boolean;
-
-		/**
-		 * Generic logging method used by wrapper methods such as debug, error etc.
-		 */
-		log(level: Level, params: any[]): void;
-
-		/**
-		 * Logs one or more messages and optionally an error at level TRACE.
-		 */
-		trace(...messages: any[]): void;
-
-		/**
-		 * Logs one or more messages and optionally an error at level DEBUG.
-		 */
-		debug(...messages: any[]): void;
-
-		/**
-		 * Logs one or more messages and optionally an error at level INFO.
-		 */
-		info(...messages: any[]): void;
-
-		/**
-		 * Logs one or more messages and optionally an error at level WARN.
-		 */
-		warn(...messages: any[]): void;
-
-		/**
-		 * Logs one or more messages and optionally an error at level ERROR.
-		 */
-		error(...messages: any[]): void;
-
-		/**
-		 * Logs one or more messages and optionally an error at level FATAL.
-		 */
-		fatal(...messages: any[]): void;
-
-		/**
-		 * Returns whether the logger is enabled for the specified level.
-		 */
-		isEnabledFor(level: Level, exception: Error): boolean;
-
-		/**
-		 * Returns whether the logger is enabled for TRACE messages.
-		 */
-		isTraceEnabled(): boolean;
-
-		/**
-		 * Returns whether the logger is enabled for DEBUG messages.
-		 */
-		isDebugEnabled(): boolean;
-
-		/**
-		 * Returns whether the logger is enabled for INFO messages.
-		 */
-		isInfoEnabled(): boolean;
-
-		/**
-		 * Returns whether the logger is enabled for WARN messages.
-		 */
-		isWarnEnabled(): boolean;
-
-		/**
-		 * Returns whether the logger is enabled for ERROR messages.
-		 */
-		isErrorEnabled(): boolean;
-
-		/**
-		 * Returns whether the logger is enabled for FATAL messages.
-		 */
-		isFatalEnabled(): boolean;
-
-		/**
-		 * Starts a new group of log messages. In appenders that support grouping (currently PopUpAppender and InPageAppender),
-		 * a group appears as an expandable section in the console, labelled with the name specified. Specifying initiallyExpanded
-		 * determines whether the group starts off expanded (the default is true). Groups may be nested.
-		 */
-		group(name: string, initiallyExpanded?: boolean): void;
-
-		/**
-		 * Ends the current group. If there is no group then this function has no effect.
-		 */
-		groupEnd(): void;
-
-		/**
-		 * Starts a timer with name name. When the timer is ended with a call to timeEnd using the same name, the amount of time
-		 * that has elapsed in milliseconds since the timer was started is logged at level level. If not level is supplied, the level
-		 * defaults to INFO.
-		 */
-		time(name: string, level?: Level): void;
-
-		/**
-		 * Ends the timer with name name and logs the time elapsed.
-		 */
-		timeEnd(name: string): void;
-
-		/**
-		 * Asserts the given expression is true or evaluates to true. If so, nothing is logged. If not, an error is logged at the ERROR level.
-		 */
-		assert(expr: any): void;
-
-		name: string;
-	}
-
-	// #endregion
-
-	// #region Appenders
-
-	/**
-	 * Logging event.
-	 */
-	export class LoggingEvent {
-		logger: Logger;
-		timeStamp: Date;
-		timeStampInMilliseconds: number;
-		timeStampInSeconds: number;
-		milliseconds: number;
-		level: Level;
-		messages: any[];
-		exception: Error;
-
-		getThrowableStrRep: () => string;
-		getCombinedMessages: () => string;
-		toString: () => string;
-	}
-
-	/**
-	 * There are methods common to all appenders, as listed below.
-	 */
-	export class Appender {
-
-		/**
-		 * Checks the logging event's level is at least as severe as the appender's threshold and calls the appender's append method if so.
-		 * This method should not in general be used directly or overridden.
-		 */
-		doAppend(loggingEvent: LoggingEvent): void;
-
-		/**
-		 * Appender-specific method to append a log message. Every appender object should implement this method.
-		 */
-		append(loggingEvent: LoggingEvent): void;
-
-		/**
-		 * Sets the appender's layout.
-		 */
-		setLayout(layout: Layout): void;
-
-		/**
-		 * Returns the appender's layout.
-		 */
-		getLayout(): Layout;
-
-		/**
-		 * Sets the appender's threshold. Log messages of level less severe than this threshold will not be logged.
-		 */
-		setThreshold(level: Level): void;
-
-		/**
-		 * Returns the appender's threshold.
-		 */
-		getThreshold(): Level;
-
-		/**
-		 * Returns a string representation of the appender. Every appender object should implement this method.
-		 */
-		toString(): string;
-
-	}
-
-	/**
-	 * Displays a log message as a JavaScript alert.
-	 */
-	export class AlertAppender extends Appender {
-		/**
-		 * Constructor
-		 */
-		constructor();
-	}
-
-	/**
-	 * A flexible appender that asynchronously sends log messages to a server via HTTP.
-	 * The default configuration is to send each log message as a separate HTTP post request to the server using an
-	 * HttpPostDataLayout, without waiting for a response before sending any subsequent requests.
-	 */
-	export class AjaxAppender extends Appender {
-		/**
-		 * Constructor
-		 * @param url The URL to which log messages should be sent. Note that this is subject to the usual Ajax restrictions:
-		 * the URL should be in the same domain as that of the page making the request.
-		 * @param withCredentials Specifies whether cookies should be sent with each request.
-		 */
-		constructor(url: string, withCredentials?: boolean);
-
-		/**
-		 * Whether to send all remaining unsent log messages to the server when the page unloads.
-		 * Since version 1.4.3, the default value is false. Previously the default was true.
-		 */
-		setSendAllOnUnload(sendAllOnUnload: boolean): void;
-
-		/**
-		 * Returns whether all remaining unsent log messages are sent to the server when the page unloads.
-		 */
-		isSendAllOnUnload(): boolean;
-
-		/**
-		 * Sets the post variable name whose value will the formatted log message(s) for each request.
-		 * Default value is data.
-		 */
-		setPostVarName(postVarName: string): void;
-
-		/**
-		 * Returns the post variable name whose value will the formatted log message(s) for each request.
-		 */
-		getPostVarName(): string;
-
-		/**
-		 * Whether to send log messages to the server at regular, timed intervals.
-		 * Default value is false.
-		 */
-		setTimed(timed: boolean): void;
-
-		/**
-		 * Returns whether log messages are sent to the server at regular, timed intervals.
-		 */
-		isTimed(): boolean;
-
-		/**
-		 * Sets whether to wait for a response from a previous HTTP request from this appender before sending the next log
-		 * message / batch of messages.
-		 * Default value is false.
-		 */
-		setWaitForResponse(waitForResponse: boolean): void;
-
-		/**
-		 * Returns whether the appender waits for a response from a previous HTTP request from this appender before sending the next
-		 * log message / batch of messages.
-		 */
-		isWaitForResponse(): boolean;
-
-		/**
-		 * Sets the number of log messages to send in each request. If not specified, defaults to 1.
-		 */
-		setBatchSize(batchSize: number): void;
-
-		/**
-		 * Returns the number of log messages sent in each request. See above for more details.
-		 */
-		getBatchSize(): number;
-
-		/**
-		 * Sets the length of time in milliseconds between each sending of queued log messages.
-		 */
-		setTimerInterval(timerInterval: number): void;
-
-		/**
-		 * Returns the length of time in milliseconds between each sending of queued log messages. See above for more details.
-		 */
-		getTimerInterval(): number;
-
-		/**
-		 * Sets the function that is called whenever a successful request is made, called at the point at which the response is
-		 * received. This feature can be used to confirm whether a request has been successful and act accordingly.
-		 * A single parameter, xmlHttp, is passed to the callback function. This is the XMLHttpRequest object that performed the
-		 * request.
-		 */
-		setRequestSuccessCallback(requestSuccessCallback: { (xmlHttp: XMLHttpRequest): void; }): void;
-
-		/**
-		 * Sets the function that is called whenever any kind of failure occurs in the appender, including browser deficiencies or
-		 * configuration errors (e.g. supplying a non-existent URL to the appender). This feature can be used to handle
-		 * AjaxAppender-specific errors.
-		 * A single parameter, message, is passed to the callback function. This is the error-specific message that caused the failure.
-		 */
-		setFailCallback(failCallback: { (message: string): void; }): void;
-
-		/**
-		 * Sets the session id sent to the server each time a request is made.
-		 */
-		setSessionId(sessionId: string): void;
-
-		/**
-		 * Returns the session id sent to the server each time a request is made.
-		 */
-		getSessionId(): string;
-
-		/**
-		 * Adds an HTTP header that is sent with each request.
-		 */
-		addHeader(name: string, value: string): void;
-
-		/**
-		 * Returns an array of the additional headers that are sent with each HTTP request. Each array item is an object with
-		 * properties name and value.
-		 */
-		getHeaders(): Array<{ name: string; value: string; }>;
-
-		/**
-		 * Sends all log messages in the queue. If log messages are batched then only completed batches are sent.
-		 */
-		sendAll(): void;
-	}
-
-	/**
-	 * Logs messages to a pop-up console window (note: you will need to disable pop-up blockers to use it). The pop-up displays a
-	 * list of all log messages.
-	 */
-	export class PopUpAppender extends Appender {
-		/**
-		 * Constructor
-		 * @param lazyInit Set this to true to open the pop-up only when the first log message reaches the appender. Otherwise, the
-		 * pop-up window opens as soon as the appender is created. If not specified, defaults to false.
-		 * @param initiallyMinimized Whether the console window should start off hidden / minimized. If not specified, defaults to false.
-		 * @param useDocumentWrite Specifies how the console window is created. By default, the console window is created dynamically
-		 * using document's write method. This has the advantage of keeping all the code in one single JavaScript file. However,
-		 * if your page sets document.domain then the browser prevents script access to a window unless it too has the same value
-		 * set for document.domain. To get round this issue, you can set useDocumentWrite to false and log4javascript will instead
-		 * use the external HTML file console.html (or console_uncompressed.html if you're using an uncompressed version of
-		 * log4javascript.js), which must be placed in the same directory as your log4javascript.js file.
-		 * Note that if useDocumentWrite is set to true, the old pop-up window will always be closed and a new one created whenever
-		 * the page is refreshed, even if setUseOldPopUp(true) has been called.
-		 * In general it's simpler to use the document.write method, so unless your page needs to set document.domain,
-		 * useDocumentWrite should be set to true.
-		 * If not specified, defaults to true.
-		 * @param width The outer width in pixels of the pop-up window. If not specified, defaults to 600.
-		 * @param height The outer height in pixels of the pop-up window. If not specified, defaults to 400.
-		 */
-		constructor(lazyInit?: boolean, initiallyMinimized?: boolean, useDocumentWrite?: boolean, width?: number, height?: number);
-
-		/**
-		 * Returns whether the console window starts off hidden / minimized.
-		 */
-		isInitiallyMinimized(): boolean;
-
-		/**
-		 * Sets whether the console window should start off hidden / minimized.
-		 */
-		setInitiallyMinimized(initiallyMinimized: boolean): void;
-
-		/**
-		 * Returns whether the pop-up window is focussed (i.e. brought it to the front) when a new log message is added. Default value is false.
-		 */
-		isFocusPopUp(): boolean;
-
-		/**
-		 * Sets whether to focus the pop-up window (i.e. bring it to the front) when a new log message is added.
-		 */
-		setFocusPopUp(focusPopUp: boolean): void;
-
-		/**
-		 * Returns whether the same pop-up window is used if the main page is reloaded. If set to true, when the page is reloaded a
-		 * line is drawn in the pop-up and subsequent log messages are added to the same pop-up. Otherwise, a new pop-up window is
-		 * created that replaces the original pop-up. If not specified, defaults to true.
-		 */
-		isUseOldPopUp(): boolean;
-
-		/**
-		 * Sets whether to use the same pop-up window if the main page is reloaded. See isUseOldPopUp above for details.
-		 */
-		setUseOldPopUp(useOldPopUp: boolean): void;
-
-		/**
-		 * Returns whether an alert is shown to the user when the pop-up window cannot be created as a result of a pop-up blocker.
-		 * Default value is true.
-		 */
-		isComplainAboutPopUpBlocking(): boolean;
-
-		/**
-		 * Sets whether to announce to show an alert to the user when the pop-up window cannot be created as a result of a pop-up blocker.
-		 */
-		setComplainAboutPopUpBlocking(complainAboutPopUpBlocking: boolean): void;
-
-		/**
-		 * Returns whether new log messages are displayed at the top of the pop-up window. Default value is false (i.e. log messages
-		 * are appended to the bottom of the window).
-		 */
-		isNewestMessageAtTop(): boolean;
-
-		/**
-		 * Sets whether to display new log messages at the top inside the pop-up window.
-		 */
-		setNewestMessageAtTop(newestMessageAtTop: boolean): void;
-
-		/**
-		 * Returns whether the pop-up window scrolls to display the latest log message when a new message is logged. Default value is true.
-		 */
-		isScrollToLatestMessage(): boolean;
-
-		/**
-		 * Sets whether to scroll the pop-up window to display the latest log message when a new message is logged.
-		 */
-		setScrollToLatestMessage(scrollToLatestMessage: boolean): void;
-
-		/**
-		 * Returns whether the pop-up window reopens automatically after being closed when a new log message is logged. Default value is false.
-		 */
-		isReopenWhenClosed(): boolean;
-
-		/**
-		 * Sets whether to reopen the pop-up window automatically after being closed when a new log message is logged.
-		 */
-		setReopenWhenClosed(reopenWhenClosed: boolean): void;
-
-		/**
-		 * Returns the outer width in pixels of the pop-up window.
-		 */
-		getWidth(): number;
-
-		/**
-		 * Sets the outer width in pixels of the pop-up window.
-		 */
-		setWidth(width: number): void;
-
-		/**
-		 * Returns the outer height in pixels of the pop-up window.
-		 */
-		getHeight(): number;
-
-		/**
-		 * Sets the outer height in pixels of the pop-up window.
-		 */
-		setHeight(height: number): void;
-
-		/**
-		 * Returns the largest number of log messages that are displayed and stored by the the console. Once reached, a new log
-		 * message wil cause the oldest message to be discarded. Default value is null, which means no limit is applied.
-		 */
-		getMaxMessages(): number;
-
-		/**
-		 * Sets the largest number of messages displayed and stored by the console window. Set this to null to make this number unlimited.
-		 */
-		setMaxMessages(maxMessages: number): void;
-
-		/**
-		 * Returns whether the console includes a command line. Default value is true.
-		 */
-		isShowCommandLine(): boolean;
-
-		/**
-		 * Sets whether the console includes a command line.
-		 */
-		setShowCommandLine(showCommandLine: boolean): void;
-
-		/**
-		 * Returns the number of levels to expand when an object value is logged to the console. Each property of an object above
-		 * this threshold will be expanded if it is itself an object or array, otherwise its string representation will be displayed.
-		 * Default value is 1 (i.e. the properties of the object logged will be displayed in their string representation but not expanded).
-		 */
-		getCommandLineObjectExpansionDepth(): number;
-
-		/**
-		 * Sets the number of levels to expand when an object value is logged to the console.
-		 */
-		setCommandLineObjectExpansionDepth(expansionDepth: number): void;
-
-		/**
-		 * Returns a reference to the window in which commands typed into the command line are currently being executed.
-		 */
-		getCommandWindow(): Window;
-
-		/**
-		 * Sets the window in which commands typed into the command line are executed.
-		 */
-		setCommandWindow(commandWindow: Window): void;
-
-		/**
-		 * Returns the layout used to format the output for commands typed into the command line. The default value is a
-		 * PatternLayout with pattern string %m
-		 */
-		getCommandLayout(): Layout;
-
-		/**
-		 * Sets the layout used to format the output for commands typed into the command line.
-		 */
-		setCommandLayout(commandLayout: Layout): void;
-
-		/**
-		 * Clears all messages from the console window.
-		 */
-		clear(): void;
-
-		/**
-		 * Closes the pop-up window.
-		 */
-		close(): void;
-
-		/**
-		 * Opens the pop-up window, if not already open.
-		 */
-		show(): void;
-
-		/**
-		 * Closes the pop-up window.
-		 */
-		hide(): void;
-
-		/**
-		 * Brings the console window to the top and gives it the focus.
-		 */
-		focus(): void;
-
-		/**
-		 * Brings the console window to the top and gives the focus to the command line.
-		 */
-		focusCommandLine(): void;
-
-		/**
-		 * Brings the console window to the top and gives the focus to the search box.
-		 */
-		focusSearch(): void;
-
-		/**
-		 * Evaluates the expression and appends the result to the console.
-		 */
-		evalCommandAndAppend(expr: string): void;
-
-		/**
-		 * Adds a function with the name specified to the list of functions available on the command line. This feature may be used
-		 * to add custom functions to the command line.
-		 */
-		addCommandLineFunction(functionName: string,
-			commandLineFunction: { (appender: Appender, args: any, returnValue: { appendResult: boolean; isError: boolean; }): any; }): void;
-	}
-
-	/**
-	 * Logs messages to a console window in the page. The console is identical to that used by the PopUpAppender, except for the
-	 * absence of a 'Close' button.
-	 */
-	export class InPageAppender extends Appender {
-		/**
-		 * Constructor
-		 * @param container The container element for the console window. This should be an HTML element.
-		 * @param lazyInit Set this to true to create the console only when the first log message reaches the appender. Otherwise,
-		 * the console is initialized as soon as the appender is created. If not specified, defaults to true.
-		 * @param initiallyMinimized Whether the console window should start off hidden / minimized. If not specified, defaults to false
-		 * @param useDocumentWrite Specifies how the console window is created. By default, the console window is created dynamically
-		 * using document's write method. This has the advantage of keeping all the code in one single JavaScript file. However,
-		 * if your page sets document.domain then the browser prevents script access to a window unless it too has the same value
-		 * set for document.domain. To get round this issue, you can set useDocumentWrite to false and log4javascript will instead
-		 * use the external HTML file console.html (or console_uncompressed.html if you're using an uncompressed version of
-		 * log4javascript.js), which must be placed in the same directory as your log4javascript.js file.
-		 * In general it's simpler to use the document.write method, so unless your page needs to set document.domain,
-		 * useDocumentWrite should be set to true.
-		 * If not specified, defaults to true.
-		 * @param width The width of the console window. Any valid CSS length may be used. If not specified, defaults to 100%.
-		 * @param height The height of the console window. Any valid CSS length may be used. If not specified, defaults to 250px.
-		 */
-		constructor(container: HTMLElement, lazyInit?: boolean, initiallyMinimized?: boolean,
-			useDocumentWrite?: boolean, width?: number, height?: number);
-
-		/**
-		 * Sets a CSS style property on the HTML element containing the console iframe.
-		 */
-		addCssProperty(name: string, value: string): void;
-
-		/**
-		 * Returns whether the console window is currently visible.
-		 */
-		isVisible(): boolean;
-
-		/**
-		 * Returns whether the console window starts off hidden / minimized.
-		 */
-		isInitiallyMinimized(): boolean;
-
-		/**
-		 * Sets whether the console window should start off hidden / minimized.
-		 */
-		setInitiallyMinimized(initiallyMinimized: boolean): void;
-
-		/**
-		 * Returns whether new log messages are displayed at the top of the pop-up window. Default value is false (i.e. log messages
-		 * are appended to the bottom of the window).
-		 */
-		isNewestMessageAtTop(): boolean;
-
-		/**
-		 * Sets whether to display new log messages at the top inside the pop-up window.
-		 */
-		setNewestMessageAtTop(newestMessageAtTop: boolean): void;
-
-		/**
-		 * Returns whether the pop-up window scrolls to display the latest log message when a new message is logged. Default value is true.
-		 */
-		isScrollToLatestMessage(): boolean;
-
-		/**
-		 * Sets whether to scroll the pop-up window to display the latest log message when a new message is logged.
-		 */
-		setScrollToLatestMessage(scrollToLatestMessage: boolean): void;
-
-		/**
-		 * Returns the outer width of the console window.
-		 */
-		getWidth(): number;
-
-		/**
-		 * Sets the outer width of the console window. Any valid CSS length may be used.
-		 */
-		setWidth(width: number): void;
-
-		/**
-		 * Returns the outer height of the console window.
-		 */
-		getHeight(): number;
-
-		/**
-		 * Sets the outer height of the console window. Any valid CSS length may be used.
-		 */
-		setHeight(height: number): void;
-
-		/**
-		 * Returns the largest number of messages displayed and stored by the console window.
-		 */
-		getMaxMessages(): number;
-
-		/**
-		 * Sets the largest number of messages displayed and stored by the console window. Set this to null to make this number unlimited.
-		 */
-		setMaxMessages(maxMessages: number): void;
-
-		/**
-		 * Returns whether the console includes a command line. Default value is true.
-		 */
-		isShowCommandLine(): boolean;
-
-		/**
-		 * Sets whether the console includes a command line.
-		 */
-		setShowCommandLine(showCommandLine: boolean): void;
-
-		/**
-		 * Returns the number of levels to expand when an object value is logged to the console. Each property of an object above
-		 * this threshold will be expanded if it is itself an object or array, otherwise its string representation will be displayed.
-		 * Default value is 1 (i.e. the properties of the object logged will be displayed in their string representation but not expanded).
-		 */
-		getCommandLineObjectExpansionDepth(): number;
-
-		/**
-		 * Sets the number of levels to expand when an object value is logged to the console.
-		 */
-		setCommandLineObjectExpansionDepth(expansionDepth: number): void;
-
-		/**
-		 * Returns a reference to the window in which commands typed into the command line are currently being executed.
-		 */
-		getCommandWindow(): Window;
-
-		/**
-		 * Sets the window in which commands typed into the command line are executed.
-		 */
-		setCommandWindow(commandWindow: Window): void;
-
-		/**
-		 * Returns the layout used to format the output for commands typed into the command line. The default value is a
-		 * PatternLayout with pattern string %m
-		 */
-		getCommandLayout(): Layout;
-
-		/**
-		 * Sets the layout used to format the output for commands typed into the command line.
-		 */
-		setCommandLayout(commandLayout: Layout): void;
-
-		/**
-		 * Clears all messages from the console window.
-		 */
-		clear(): void;
-
-		/**
-		 * Closes the pop-up window.
-		 */
-		close(): void;
-
-		/**
-		 * Shows / unhides the console window.
-		 */
-		show(): void;
-
-		/**
-		 * Hides / minimizes the console window.
-		 */
-		hide(): void;
-
-		/**
-		 * Brings the console window to the top and gives it the focus.
-		 */
-		focus(): void;
-
-		/**
-		 * Brings the console window to the top and gives the focus to the command line.
-		 */
-		focusCommandLine(): void;
-
-		/**
-		 * Brings the console window to the top and gives the focus to the search box.
-		 */
-		focusSearch(): void;
-
-		/**
-		 * Evaluates the expression and appends the result to the console.
-		 */
-		evalCommandAndAppend(expr: string): void;
-
-		/**
-		 * Adds a function with the name specified to the list of functions available on the command line. This feature may be used
-		 * to add custom functions to the command line.
-		 */
-		addCommandLineFunction(functionName: string,
-			commandLineFunction: { (appender: Appender, args: any, returnValue: { appendResult: boolean; isError: boolean; }): any; }): void;
-	}
-
-	/**
-	 * Writes log messages to the browser's built-in console, if present. This only works currently in Safari, Opera and Firefox
-	 * with the excellent Firebug extension installed.
-	 */
-	export class BrowserConsoleAppender extends Appender {
-		/**
-		 * Constructor
-		 */
-		constructor();
-	}
-
-	//#endregion
-
-	// #region Layouts
-
-	/**
-	 * There are a few methods common to all layouts.
-	 */
-	export class Layout {
-		/**
-		 * Formats the log message. You should override this method in your own layouts.
-		 */
-		format(loggingEvent: LoggingEvent): string;
-
-		/**
-		 * Returns whether the layout ignores an error object in a logging event passed to its format method.
-		 */
-		ignoresThrowable(): boolean;
-
-		/**
-		 * Returns the content type of the output of the layout.
-		 */
-		getContentType(): string;
-
-		/**
-		 * Returns whether the layout's output is suitable for batching. JsonLayout and XmlLayout are the only built-in layouts that
-		 * return true for this method.
-		 */
-		allowBatching(): boolean;
-
-		/**
-		 * Used internally by log4javascript in constructing formatted output for some layouts.
-		 */
-		getDataValues(loggingEvent: LoggingEvent): Array<any>;
-
-		/**
-		 * This method is used to change the default keys used to create formatted name-value pairs for the properties of a log
-		 * message, for layouts that do this. These layouts are JsonLayout and HttpPostDataLayout.
-		 * @param loggerKey Parameter to use for the log message's logger name. Default is logger.
-		 * @param timeStampKey Parameter to use for the log message's timestamp. Default is timestamp.
-		 * @param levelKey Parameter to use for the log message's level. Default is level.
-		 * @param messageKey Parameter to use for the message itself. Default is message.
-		 * @param exceptionKey Parameter to use for the log message's error (exception). Default is exception.
-		 * @param urlKey Parameter to use for the current page URL. Default is url.
-		 */
-		setKeys(loggerKey: string, timeStampKey: string, levelKey: string, messageKey: string, exceptionKey: string, urlKey: string): void;
-
-		/**
-		 * Some layouts (JsonLayout, HttpPostDataLayout, PatternLayout and XmlLayout) allow you to set custom fields (e.g. a session
-		 * id to send to the server) to the formatted output. Use this method to set a custom field. If there is already a custom
-		 * field with the specified name, its value will be updated with value.
-		 * @param name Name of the custom property you wish to be included in the formmtted output.
-		 * @param value Value of the custom property you wish to be included in the formatted output.
-		 */
-		setCustomField(name: string, value: string): string;
-
-		/**
-		 * Returns whether the layout has any custom fields.
-		 */
-		hasCustomFields(): boolean;
-
-		formatWithException(loggingEvent: LoggingEvent): string;
-	}
-
-	/**
-	 * The most basic layout. NullLayout's format() methods performs no formatting at all and simply returns the message logged.
-	 */
-	export class NullLayout extends Layout {
-		/**
-		 * Constructor
-		 */
-		constructor();
-	}
-
-	/**
-	 * Provides basic formatting. SimpleLayout consists of the level of the log statement, followed by " - " and then the log message
-	 * itself. For example, "DEBUG - Hello world".
-	 */
-	export class SimpleLayout extends Layout {
-		/**
-		 * Constructor
-		 */
-		constructor();
-	}
-
-	/**
-	 * Provides a flexible way of formatting a log message by means of a conversion pattern string. The behaviour of this layout is a
-	 * full implementation of PatternLayout in log4j, with the exception of the set of conversion characters - log4javascript's is
-	 * necessarily a subset of that of log4j with a few additions of its own, since many of the conversion characters in log4j only
-	 * make sense in the context of Java.
-	 * The conversion pattern consists of literal text interspersed with special strings starting with a % symbol called conversion
-	 * specifiers. A conversion specifier consists of the % symbol, a conversion character (possible characters are listed below) and
-	 * format modifiers. For full documentation of the conversion pattern, see log4j's documentation.
-	 */
-	export class PatternLayout extends Layout {
-		/**
-		 * Built-in conversion pattern, equivalent to %r %p %c - %m%n.
-		 */
-		static TTCC_CONVERSION_PATTERN: string;
-
-		/**
-		 * Built-in conversion pattern, equivalent to %m%n.
-		 */
-		static DEFAULT_CONVERSION_PATTERN: string;
-
-		/**
-		 * Built-in date format (and also the default), equivalent to yyyy-MM-dd HH:mm:ss,SSS.
-		 */
-		static ISO8601_DATEFORMAT: string;
-
-		/**
-		 * Built-in date format, equivalent to dd MMM YYYY HH:mm:ss,SSS.
-		 */
-		static DATETIME_DATEFORMAT: string;
-
-		/**
-		 * Built-in date format, equivalent to HH:mm:ss,SSS.
-		 */
-		static ABSOLUTETIME_DATEFORMAT: string;
-
-		/**
-		 * Constructor
-		 * @param pattern The conversion pattern string to use.
-		 */
-		constructor(pattern: string);
-	}
-
-	/**
-	 * Based on log4j's XmlLayout, this layout formats a log message as a fragment of XML.
-	 */
-	export class XmlLayout extends Layout {
-		/**
-		 * Constructor
-		 * @param combineMessages Whether or not to format multiple log messages as a combined single <log4javascript:message>
-		 * element composed of each individual message separated by line breaks or to include a <log4javascript:message> element for
-		 * each message inside one <log4javascript:messages> element. If not specified, defaults to true.
-		 */
-		constructor(combineMessages?: boolean);
-	}
-
-	/**
-	 * Formats a logging event into JavaScript Object Notation (JSON). JSON is a subset of JavaScript's object literal syntax,
-	 * meaning that log messages formatted with this layout can be interpreted directly by JavaScript and converted into objects.
-	 * See json.org for more details about JSON.
-	 */
-	export class JsonLayout extends Layout {
-		/**
-		 * Constructor
-		 * @param readable Whether or not to format each log message with line breaks and tabs. If not specified, defaults to false.
-		 * @param combineMessages Whether or not to format multiple log messages as a combined single message property composed of
-		 * each individual message separated by line breaks or to format multiple messages as an array. If not specified, defaults to true.
-		 */
-		constructor(readable?: boolean, combineMessages?: boolean);
-
-		/**
-		 * Returns whether or not to each log message is formatted with line breaks and tabs.
-		 */
-		isReadable(): boolean;
-	}
-
-	/**
-	 * Formats the log message as a simple URL-encoded string from which a simple server-side script may extract parameters such as
-	 * the log message, severity and timestamp. This is the default layout for AjaxAppender.
-	 */
-	export class HttpPostDataLayout extends Layout {
-		/**
-		 * Constructor
-		 */
-		constructor();
-	}
-
-	// #endregion
-
-	// #region log4javascript error handling
-
-	/**
-	 * log4javascript has a single rudimentary logger-like object of its own to handle messages generated by log4javascript itself.
-	 * This logger is called logLog and is accessed via log4javascript.logLog.
-	 */
-	export namespace logLog {
-
-		/**
-		 * Sets whether logLog is in quiet mode or not. In quiet mode, no messages sent to logLog have any visible effect. By default,
-		 * quiet mode is switched off.
-		 * @param quietMode Whether to turn quiet mode on or off.
-		 */
-		export function setQuietMode(quietMode: boolean): void;
-
-		/**
-		 * Sets how many errors logLog will display alerts for. By default, only the first error encountered generates an alert to the
-		 * user. If you turn all errors on by supplying true to this method then all errors will generate alerts.
-		 * @param showAllErrors Whether to show all errors or just the first.
-		 */
-		export function setAlertAllErrors(alertAllErrors: boolean): void;
-
-		/**
-		 * Logs a debugging message to an in-memory list.
-		 */
-		export function debug(message: string, exception?: Error): void;
-
-		/**
-		 * Displays an alert of all debugging messages.
-		 */
-		export function displayDebug(): void;
-
-		/**
-		 * Currently has no effect.
-		 */
-		export function warn(message: string, exception?: Error): void;
-
-		/**
-		 * Generates an alert to the user if and only if the error is the first one encountered and setAlertAllErrors(true) has not been called.
-		 */
-		export function error(message: string, exception?: Error): void;
-
-	}
-
-	// #endregion
-}
diff --git a/log4javascript/tsconfig.json b/log4javascript/tsconfig.json
new file mode 100644
index 0000000000..6e42bc3d56
--- /dev/null
+++ b/log4javascript/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "log4javascript-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/log4js/index.d.ts b/log4js/index.d.ts
new file mode 100644
index 0000000000..9d9a3e9734
--- /dev/null
+++ b/log4js/index.d.ts
@@ -0,0 +1,254 @@
+// Type definitions for log4js
+// Project: https://github.com/nomiddlename/log4js-node
+// Definitions by: Kentaro Okuno <http://github.com/armorik83>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+
+import express = require('express');
+
+/**
+ * Replaces the console
+ * @param logger
+ * @returns void
+ */
+export declare function replaceConsole(logger?: Logger): void;
+
+/**
+ * Restores the console
+ * @returns void
+ */
+export declare function restoreConsole(): void;
+
+/**
+ * Get a logger instance. Instance is cached on categoryName level.
+ *
+ * @param   {String} [categoryName] name of category to log to.
+ * @returns {Logger} instance of logger for the category
+ * @static
+ */
+export declare function getLogger(categoryName?: string): Logger;
+export declare function getBufferedLogger(categoryName?: string): Logger;
+
+/**
+ * Has a logger instance cached on categoryName.
+ *
+ * @param   {String} [categoryName] name of category to log to.
+ * @returns {boolean} contains logger for the category
+ * @static
+ */
+export declare function hasLogger(categoryName: string): boolean;
+
+/**
+ * Get the default logger instance.
+ *
+ * @returns {Logger} instance of default logger
+ * @static
+ */
+export declare function getDefaultLogger(): Logger;
+
+/**
+ * args are appender, then zero or more categories
+ *
+ * @param   {*[]} appenders
+ * @returns {void}
+ * @static
+ */
+export declare function addAppender(...appenders: any[]): void;
+
+/**
+ * Claer configured appenders
+ *
+ * @returns {void}
+ * @static
+ */
+export declare function clearAppenders(): void;
+
+/**
+ * Shutdown all log appenders. This will first disable all writing to appenders
+ * and then call the shutdown function each appender.
+ *
+ * @params  {Function} cb - The callback to be invoked once all appenders have
+ *  shutdown. If an error occurs, the callback will be given the error object
+ *  as the first argument.
+ * @returns {void}
+ */
+export declare function shutdown(cb: Function): void;
+
+export declare function configure(filename: string, options?: any): void;
+export declare function configure(config: IConfig, options?: any): void;
+
+export declare function setGlobalLogLevel(level: string): void;
+export declare function setGlobalLogLevel(level: Level): void;
+
+
+/**
+ * Create logger for connect middleware.
+ *
+ *
+ * @returns {express.Handler} Instance of middleware.
+ * @static
+ */
+export declare function connectLogger(logger: Logger, options: { format?: string; level?: string; nolog?: any; }): express.Handler;
+export declare function connectLogger(logger: Logger, options: { format?: string; level?: Level; nolog?: any; }): express.Handler;
+
+
+export declare var appenders: any;
+export declare var levels: {
+    ALL: Level;
+    TRACE: Level;
+    DEBUG: Level;
+    INFO: Level;
+    WARN: Level;
+    ERROR: Level;
+    FATAL: Level;
+    OFF: Level;
+
+    toLevel(level: string, defaultLevel?: Level): Level;
+    toLevel(level: Level, defaultLevel?: Level): Level;
+};
+
+export interface Logger {
+    setLevel(level: string): void;
+    setLevel(level: Level): void;
+
+    isLevelEnabled(level: Level): boolean;
+    isTraceEnabled(): boolean;
+    isDebugEnabled(): boolean;
+    isInfoEnabled(): boolean;
+    isWarnEnabled(): boolean;
+    isErrorEnabled(): boolean;
+    isFatalEnabled(): boolean;
+
+    trace(message: string, ...args: any[]): void;
+    debug(message: string, ...args: any[]): void;
+    info(message: string, ...args: any[]): void;
+    warn(message: string, ...args: any[]): void;
+    error(message: string, ...args: any[]): void;
+    fatal(message: string, ...args: any[]): void;
+}
+
+export interface Level {
+    isEqualTo(other: string): boolean;
+    isEqualTo(otherLevel: Level): boolean;
+    isLessThanOrEqualTo(other: string): boolean;
+    isLessThanOrEqualTo(otherLevel: Level): boolean;
+    isGreaterThanOrEqualTo(other: string): boolean;
+    isGreaterThanOrEqualTo(otherLevel: Level): boolean;
+}
+
+export interface IConfig {
+    appenders: AppenderConfig[];
+    levels?: { [category: string]: string };
+    replaceConsole?: boolean;
+}
+
+export interface AppenderConfigBase {
+    type: string;
+    category?: string;
+}
+
+export interface ConsoleAppenderConfig extends AppenderConfigBase { }
+
+export interface FileAppenderConfig extends AppenderConfigBase {
+    filename: string;
+}
+export interface DateFileAppenderConfig extends FileAppenderConfig {
+    /**
+     * The following strings are recognised in the pattern:
+     *  - yyyy : the full year, use yy for just the last two digits
+     *  - MM   : the month
+     *  - dd   : the day of the month
+     *  - hh   : the hour of the day (24-hour clock)
+     *  - mm   : the minute of the hour
+     *  - ss   : seconds
+     *  - SSS  : milliseconds (although I'm not sure you'd want to roll your logs every millisecond)
+     *  - O    : timezone (capital letter o)
+     */
+    pattern: string;
+    alwaysIncludePattern: boolean;
+}
+
+export interface SmtpAppenderConfig extends AppenderConfigBase {
+    /** Comma separated list of email recipients */
+    recipients: string;
+
+    /** Sender of all emails (defaults to transport user) */
+    sender: string;
+
+    /** Subject of all email messages (defaults to first event's message)*/
+    subject: string;
+
+    /**
+     * The time in seconds between sending attempts (defaults to 0).
+     * All events are buffered and sent in one email during this time.
+     * If 0 then every event sends an email
+     */
+    sendInterval: number;
+
+    SMTP: {
+        host: string;
+        secure: boolean;
+        port: number;
+        auth: {
+            user: string;
+            pass: string;
+        }
+    }
+}
+
+export interface HookIoAppenderConfig extends FileAppenderConfig {
+    maxLogSize: number;
+    backup: number;
+    pollInterval: number;
+}
+
+export interface GelfAppenderConfig extends AppenderConfigBase {
+    host: string;
+    hostname: string;
+    port: string;
+    facility: string;
+}
+
+export interface MultiprocessAppenderConfig extends AppenderConfigBase {
+    mode: string;
+    loggerPort: number;
+    loggerHost: string;
+    facility: string;
+    appender?: AppenderConfig;
+}
+
+export interface LogglyAppenderConfig extends AppenderConfigBase {
+    /** Loggly customer token - https://www.loggly.com/docs/api-sending-data/ */
+    token: string;
+
+    /** Loggly customer subdomain (use 'abc' for abc.loggly.com) */
+    subdomain: string;
+
+    /** an array of strings to help segment your data & narrow down search results in Loggly */
+    tags: string[];
+
+    /** Enable JSON logging by setting to 'true' */
+    json: boolean;
+}
+
+export interface ClusteredAppenderConfig extends AppenderConfigBase {
+    appenders?: AppenderConfig[];
+}
+
+type CoreAppenderConfig = ConsoleAppenderConfig
+    | FileAppenderConfig
+    | DateFileAppenderConfig
+    | SmtpAppenderConfig
+    | HookIoAppenderConfig
+    | GelfAppenderConfig
+    | MultiprocessAppenderConfig
+    | LogglyAppenderConfig
+    | ClusteredAppenderConfig
+
+interface CustomAppenderConfig extends AppenderConfigBase {
+    [prop: string]: any;
+}
+
+type AppenderConfig = CoreAppenderConfig | CustomAppenderConfig;
diff --git a/log4js/log4js-tests.ts b/log4js/log4js-tests.ts
index 4fefc1caab..444f786dc3 100644
--- a/log4js/log4js-tests.ts
+++ b/log4js/log4js-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./log4js.d.ts" />
-/// <reference path="../express/express.d.ts" />
 
 import log4js = require('log4js');
 
diff --git a/log4js/log4js.d.ts b/log4js/log4js.d.ts
deleted file mode 100644
index c79fd60818..0000000000
--- a/log4js/log4js.d.ts
+++ /dev/null
@@ -1,255 +0,0 @@
-// Type definitions for log4js
-// Project: https://github.com/nomiddlename/log4js-node
-// Definitions by: Kentaro Okuno <http://github.com/armorik83>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "log4js" {
-  import express = require('express');
-
-  /**
-   * Replaces the console
-   * @param logger
-   * @returns void
-   */
-  export function replaceConsole(logger?: Logger): void;
-
-  /**
-   * Restores the console
-   * @returns void
-   */
-  export function restoreConsole(): void;
-
-  /**
-   * Get a logger instance. Instance is cached on categoryName level.
-   *
-   * @param   {String} [categoryName] name of category to log to.
-   * @returns {Logger} instance of logger for the category
-   * @static
-   */
-  export function getLogger(categoryName?: string): Logger;
-  export function getBufferedLogger(categoryName?: string): Logger;
-
-  /**
-   * Has a logger instance cached on categoryName.
-   *
-   * @param   {String} [categoryName] name of category to log to.
-   * @returns {boolean} contains logger for the category
-   * @static
-   */
-  export function hasLogger(categoryName: string): boolean;
-
-  /**
-   * Get the default logger instance.
-   *
-   * @returns {Logger} instance of default logger
-   * @static
-   */
-  export function getDefaultLogger(): Logger;
-
-  /**
-   * args are appender, then zero or more categories
-   *
-   * @param   {*[]} appenders
-   * @returns {void}
-   * @static
-   */
-  export function addAppender(...appenders: any[]): void;
-
-  /**
-   * Claer configured appenders
-   *
-   * @returns {void}
-   * @static
-   */
-  export function clearAppenders(): void;
-
-  /**
-   * Shutdown all log appenders. This will first disable all writing to appenders
-   * and then call the shutdown function each appender.
-   *
-   * @params  {Function} cb - The callback to be invoked once all appenders have
-   *  shutdown. If an error occurs, the callback will be given the error object
-   *  as the first argument.
-   * @returns {void}
-   */
-  export function shutdown(cb: Function): void;
-
-  export function configure(filename: string, options?: any): void;
-  export function configure(config: IConfig, options?: any): void;
-
-  export function setGlobalLogLevel(level: string): void;
-  export function setGlobalLogLevel(level: Level): void;
-
-
-  /**
-   * Create logger for connect middleware.
-   *
-   *
-   * @returns {express.Handler} Instance of middleware.
-   * @static
-   */
-  export function connectLogger(logger: Logger, options: { format?: string; level?: string; nolog?: any; }): express.Handler;
-  export function connectLogger(logger: Logger, options: { format?: string; level?: Level; nolog?: any; }): express.Handler;
-
-
-  export var appenders: any;
-  export var levels: {
-    ALL: Level;
-    TRACE: Level;
-    DEBUG: Level;
-    INFO: Level;
-    WARN: Level;
-    ERROR: Level;
-    FATAL: Level;
-    OFF: Level;
-
-    toLevel(level: string, defaultLevel?: Level): Level;
-    toLevel(level: Level, defaultLevel?: Level): Level;
-  };
-
-  export interface Logger {
-    setLevel(level: string): void;
-    setLevel(level: Level): void;
-
-    isLevelEnabled(level: Level): boolean;
-    isTraceEnabled(): boolean;
-    isDebugEnabled(): boolean;
-    isInfoEnabled(): boolean;
-    isWarnEnabled(): boolean;
-    isErrorEnabled(): boolean;
-    isFatalEnabled(): boolean;
-
-    trace(message: string, ...args: any[]): void;
-    debug(message: string, ...args: any[]): void;
-    info(message: string, ...args: any[]): void;
-    warn(message: string, ...args: any[]): void;
-    error(message: string, ...args: any[]): void;
-    fatal(message: string, ...args: any[]): void;
-  }
-
-  export interface Level {
-    isEqualTo(other: string): boolean;
-    isEqualTo(otherLevel: Level): boolean;
-    isLessThanOrEqualTo(other: string): boolean;
-    isLessThanOrEqualTo(otherLevel: Level): boolean;
-    isGreaterThanOrEqualTo(other: string): boolean;
-    isGreaterThanOrEqualTo(otherLevel: Level): boolean;
-  }
-
-  export interface IConfig {
-    appenders: AppenderConfig[];
-    levels?: { [category: string]: string };
-    replaceConsole?: boolean;
-  }
-
-  export interface AppenderConfigBase {
-    type: string;
-    category?: string;
-  }
-
-  export interface ConsoleAppenderConfig extends AppenderConfigBase {}
-
-  export interface FileAppenderConfig extends AppenderConfigBase {
-    filename: string;
-  }
-  export interface DateFileAppenderConfig extends FileAppenderConfig {
-    /**
-     * The following strings are recognised in the pattern:
-     *  - yyyy : the full year, use yy for just the last two digits
-     *  - MM   : the month
-     *  - dd   : the day of the month
-     *  - hh   : the hour of the day (24-hour clock)
-     *  - mm   : the minute of the hour
-     *  - ss   : seconds
-     *  - SSS  : milliseconds (although I'm not sure you'd want to roll your logs every millisecond)
-     *  - O    : timezone (capital letter o)
-     */
-    pattern: string;
-    alwaysIncludePattern: boolean;
-  }
-
-  export interface SmtpAppenderConfig extends AppenderConfigBase {
-    /** Comma separated list of email recipients */
-    recipients: string;
-
-    /** Sender of all emails (defaults to transport user) */
-    sender: string;
-
-    /** Subject of all email messages (defaults to first event's message)*/
-    subject: string;
-
-    /**
-     * The time in seconds between sending attempts (defaults to 0).
-     * All events are buffered and sent in one email during this time.
-     * If 0 then every event sends an email
-     */
-    sendInterval: number;
-
-    SMTP: {
-      host: string;
-      secure: boolean;
-      port: number;
-      auth: {
-          user: string;
-          pass: string;
-      }
-    }
-  }
-
-  export interface HookIoAppenderConfig extends FileAppenderConfig {
-    maxLogSize: number;
-    backup: number;
-    pollInterval: number;
-  }
-
-  export interface GelfAppenderConfig extends AppenderConfigBase {
-    host: string;
-    hostname: string;
-    port: string;
-    facility: string;
-  }
-
-  export interface MultiprocessAppenderConfig extends AppenderConfigBase {
-    mode: string;
-    loggerPort: number;
-    loggerHost: string;
-    facility: string;
-    appender?: AppenderConfig;
-  }
-
-  export interface LogglyAppenderConfig extends AppenderConfigBase {
-    /** Loggly customer token - https://www.loggly.com/docs/api-sending-data/ */
-    token: string;
-
-    /** Loggly customer subdomain (use 'abc' for abc.loggly.com) */
-    subdomain: string;
-
-    /** an array of strings to help segment your data & narrow down search results in Loggly */
-    tags: string[];
-
-    /** Enable JSON logging by setting to 'true' */
-    json: boolean;
-  }
-
-  export interface ClusteredAppenderConfig extends AppenderConfigBase {
-    appenders?: AppenderConfig[];
-  }
-
-  type CoreAppenderConfig = ConsoleAppenderConfig
-                          | FileAppenderConfig
-                          | DateFileAppenderConfig
-                          | SmtpAppenderConfig
-                          | HookIoAppenderConfig
-                          | GelfAppenderConfig
-                          | MultiprocessAppenderConfig
-                          | LogglyAppenderConfig
-                          | ClusteredAppenderConfig
-
-  interface CustomAppenderConfig extends AppenderConfigBase {
-    [prop: string]: any;
-  }
-
-  type AppenderConfig = CoreAppenderConfig | CustomAppenderConfig;
-}
diff --git a/log4js/tsconfig.json b/log4js/tsconfig.json
new file mode 100644
index 0000000000..0d755e769f
--- /dev/null
+++ b/log4js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "log4js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/logg/logg.d.ts b/logg/index.d.ts
similarity index 100%
rename from logg/logg.d.ts
rename to logg/index.d.ts
diff --git a/logg/logg-tests.ts b/logg/logg-tests.ts
index 3569d3caa3..c41f823034 100644
--- a/logg/logg-tests.ts
+++ b/logg/logg-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="logg.d.ts"/>
-
 import logging = require("logg");
 
 var logger = logging.getLogger('my.class');
diff --git a/logg/tsconfig.json b/logg/tsconfig.json
new file mode 100644
index 0000000000..9dba57137f
--- /dev/null
+++ b/logg/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "logg-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/loggly/index.d.ts b/loggly/index.d.ts
new file mode 100644
index 0000000000..2c44a2d6f0
--- /dev/null
+++ b/loggly/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for loggly 1.0.8
+// Project: https://github.com/nodejitsu/node-loggly
+// Definitions by: Ray Martone <https://github.com/rmartone>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface LogglyOptions {
+    token: string;
+    subdomain: string;
+    tags?: string[];
+    json?: boolean;
+    host?: string;
+    auth?: {
+        username: string;
+        password: string;
+    }
+}
+
+export interface Loggly {
+    log(message: any, tags?: string[], callback?: (err: any, results: any) => void): void;
+    log(message: any, callback?: (err: any, results: any) => void): void;
+}
+
+export function createClient(options: LogglyOptions): Loggly;
diff --git a/loggly/loggly-tests.ts b/loggly/loggly-tests.ts
index bf022999fb..b621aef18e 100644
--- a/loggly/loggly-tests.ts
+++ b/loggly/loggly-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path='./loggly.d.ts' />
 import loggly  = require("loggly");
 
 var options: loggly.LogglyOptions  = {
diff --git a/loggly/loggly.d.ts b/loggly/loggly.d.ts
deleted file mode 100644
index e2e6c4d14c..0000000000
--- a/loggly/loggly.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-// Type definitions for loggly 1.0.8
-// Project: https://github.com/nodejitsu/node-loggly
-// Definitions by: Ray Martone <https://github.com/rmartone>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-declare module "loggly" {
-
-    interface LogglyOptions {
-        token: string;
-        subdomain: string;
-        tags?: string[];
-        json?: boolean;
-        host?: string;
-        auth?: {
-            username: string;
-            password: string;
-        }
-    }
-
-    interface Loggly {
-        log(message: any, tags?: string[], callback?: (err: any, results: any) => void): void;
-        log(message: any, callback?: (err: any, results: any) => void): void;
-    }
-
-    function createClient(options: LogglyOptions): Loggly;
-}
diff --git a/loggly/tsconfig.json b/loggly/tsconfig.json
new file mode 100644
index 0000000000..1e0f4168d5
--- /dev/null
+++ b/loggly/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "loggly-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/loglevel/index.d.ts b/loglevel/index.d.ts
new file mode 100644
index 0000000000..7ccbe89c33
--- /dev/null
+++ b/loglevel/index.d.ts
@@ -0,0 +1,182 @@
+// Type definitions for loglevel 1.4.0
+// Project: https://github.com/pimterry/loglevel
+// Definitions by: Stefan Profanter <https://github.com/Pro/>, Florian Wagner <https://github.com/flqw/>, Gabor Szmetanko <https://github.com/szmeti/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Log levels
+ */
+declare const enum LogLevel {
+    TRACE = 0,
+    DEBUG = 1,
+    INFO = 2,
+    WARN = 3,
+    ERROR = 4,
+    SILENT = 5
+}
+
+interface LoggingMethod {
+
+    (...message : any[]):void;
+
+}
+
+interface MethodFactory {
+
+    (methodName : string, level : LogLevel, loggerName : string):LoggingMethod;
+
+}
+
+interface Log {
+
+    /**
+     * Plugin API entry point. This will be called for each enabled method each time the level is set 
+     * (including initially), and should return a MethodFactory to be used for the given log method, at the given level, 
+     * for a logger with the given name. If you'd like to retain all the reliability and features of loglevel, it's 
+     * recommended that this wraps the initially provided value of log.methodFactory
+     */
+    methodFactory:MethodFactory;
+
+    /**
+     * Output trace message to console.
+     * This will also include a full stack trace
+     *
+     * @param msg any data to log to the console
+     */
+    trace(...msg : any[]):void;
+
+    /**
+     * Output debug message to console including appropriate icons
+     *
+     * @param msg any data to log to the console
+     */
+    debug(...msg : any[]):void;
+
+    /**
+     * Output info message to console including appropriate icons
+     *
+     * @param msg any data to log to the console
+     */
+    info(...msg : any[]):void;
+
+    /**
+     * Output warn message to console including appropriate icons
+     *
+     * @param msg any data to log to the console
+     */
+    warn(...msg : any[]):void;
+
+    /**
+     * Output error message to console including appropriate icons
+     *
+     * @param msg any data to log to the console
+     */
+    error(...msg : any[]):void;
+
+
+    /**
+     * This disables all logging below the given level, so that after a log.setLevel("warn") call log.warn("something")
+     * or log.error("something") will output messages, but log.info("something") will not.
+     *
+     * @param level 0=trace to 5=silent
+     * @param persist Where possible the log level will be persisted. LocalStorage will be used if available, falling
+     *     back to cookies if not. If neither is available in the current environment (i.e. in Node), or if you pass
+     *     false as the optional 'persist' second argument, persistence will be skipped.
+     */
+    setLevel(level : LogLevel, persist? : boolean):void;
+
+
+    /**
+     * This disables all logging below the given level, so that after a log.setLevel("warn") call log.warn("something")
+     * or log.error("something") will output messages, but log.info("something") will not.
+     *
+     * @param level as a string, like 'error' (case-insensitive)
+     * @param persist Where possible the log level will be persisted. LocalStorage will be used if available, falling
+     *     back to cookies if not. If neither is available in the current environment (i.e. in Node), or if you pass
+     *     false as the optional 'persist' second argument, persistence will be skipped.
+     */
+    setLevel(level : string, persist? : boolean):void;
+
+
+    /**
+     * This disables all logging below the given level, so that after a log.setLevel("warn") call log.warn("something")
+     * or log.error("something") will output messages, but log.info("something") will not.
+     *
+     * @param level as the value from the enum
+     * @param persist Where possible the log level will be persisted. LocalStorage will be used if available, falling
+     *     back to cookies if not. If neither is available in the current environment (i.e. in Node), or if you pass
+     *     false as the optional 'persist' second argument, persistence will be skipped.
+     */
+    setLevel(level : LogLevel, persist? : boolean):void;
+
+    /**
+     * If you're using another JavaScript library that exposes a 'log' global, you can run into conflicts with loglevel.
+     * Similarly to jQuery, you can solve this by putting loglevel into no-conflict mode immediately after it is loaded
+     * onto the page. This resets to 'log' global to its value before loglevel was loaded (typically undefined), and
+     * returns the loglevel object, which you can then bind to another name yourself.
+     */
+    noConflict():any;
+
+    /**
+     * Returns the current logging level, as a value from the enum.
+     * It's very unlikely you'll need to use this for normal application logging; it's provided partly to help plugin
+     * development, and partly to let you optimize logging code as below, where debug data is only generated if the
+     * level is set such that it'll actually be logged. This probably doesn't affect you, unless you've run profiling
+     * on your code and you have hard numbers telling you that your log data generation is a real performance problem.
+     */
+    getLevel():LogLevel;
+
+    /**
+     * This sets the current log level only if one has not been persisted and can’t be loaded. This is useful when
+     * initializing scripts; if a developer or user has previously called setLevel(), this won’t alter their settings.
+     * For example, your application might set the log level to error in a production environment, but when debugging
+     * an issue, you might call setLevel("trace") on the console to see all the logs. If that error setting was set
+     * using setDefaultLevel(), it will still say as trace on subsequent page loads and refreshes instead of resetting
+     * to error.
+     *
+     * The level argument takes is the same values that you might pass to setLevel(). Levels set using
+     * setDefaultLevel() never persist to subsequent page loads.
+     *
+     * @param level as the value from the enum
+     */
+    setDefaultLevel(level : LogLevel):void;
+
+    /**
+     * This gets you a new logger object that works exactly like the root log object, but can have its level and
+     * logging methods set independently. All loggers must have a name (which is a non-empty string). Calling
+     * getLogger() multiple times with the same name will return an identical logger object.
+     * In large applications, it can be incredibly useful to turn logging on and off for particular modules as you are
+     * working with them. Using the getLogger() method lets you create a separate logger for each part of your
+     * application with its own logging level. Likewise, for small, independent modules, using a named logger instead
+     * of the default root logger allows developers using your module to selectively turn on deep, trace-level logging
+     * when trying to debug problems, while logging only errors or silencing logging altogether under normal
+     * circumstances.
+     * @param name The name of the produced logger
+     */
+    getLogger(name : String):Log;
+
+    /**
+     * This enables all log messages, and is equivalent to log.setLevel("trace").
+     *
+     * @param persist Where possible the log level will be persisted. LocalStorage will be used if available, falling
+     *     back to cookies if not. If neither is available in the current environment (i.e. in Node), or if you pass
+     *     false as the optional 'persist' second argument, persistence will be skipped.
+     */
+    enableAll(persist? : boolean):void;
+
+    /**
+     * This disables all log messages, and is equivalent to log.setLevel("silent").
+     *
+     * @param persist Where possible the log level will be persisted. LocalStorage will be used if available, falling
+     *     back to cookies if not. If neither is available in the current environment (i.e. in Node), or if you pass
+     *     false as the optional 'persist' second argument, persistence will be skipped.
+     */
+    disableAll(persist? : boolean):void;
+
+}
+
+declare var log : Log;
+
+declare module "loglevel" {
+    export = log;
+}
diff --git a/loglevel/loglevel-tests.ts b/loglevel/loglevel-tests.ts
index ab19939569..c5bd30b59c 100644
--- a/loglevel/loglevel-tests.ts
+++ b/loglevel/loglevel-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="loglevel.d.ts" />
+
 
 log.trace("Trace message");
 log.debug("Debug message");
@@ -16,6 +16,11 @@ log.setLevel("error", false);
 log.setLevel(LogLevel.WARN);
 log.setLevel(LogLevel.WARN, false);
 
+log.enableAll(false);
+log.enableAll();
+log.disableAll(true);
+log.disableAll();
+
 var logLevel = log.getLevel();
 
 var testLogger = log.getLogger("TestLogger");
@@ -26,3 +31,8 @@ testLogger.warn("logging test");
 var logging = log.noConflict();
 
 logging.error("still pretty easy");
+
+log.methodFactory = function(methodName: string, level: LogLevel, loggerName :string) {
+    return function(...messages: any[]) {
+    };
+};
\ No newline at end of file
diff --git a/loglevel/loglevel.d.ts b/loglevel/loglevel.d.ts
deleted file mode 100644
index 0d8352c652..0000000000
--- a/loglevel/loglevel.d.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-// Type definitions for loglevel 1.4.0
-// Project: https://github.com/pimterry/loglevel
-// Definitions by: Stefan Profanter <https://github.com/Pro/>, Florian Wagner <https://github.com/flqw/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/**
- * Log levels
- */
-declare const enum LogLevel {
-    TRACE = 0,
-    DEBUG = 1,
-    INFO = 2,
-    WARN = 3,
-    ERROR = 4,
-    SILENT = 5
-}
-
-interface Log {
-
-    /**
-     * Output trace message to console.
-     * This will also include a full stack trace
-     *
-     * @param msg any data to log to the console
-     */
-    trace(...msg : any[]):void;
-
-    /**
-     * Output debug message to console including appropriate icons
-     *
-     * @param msg any data to log to the console
-     */
-    debug(...msg : any[]):void;
-
-    /**
-     * Output info message to console including appropriate icons
-     *
-     * @param msg any data to log to the console
-     */
-    info(...msg : any[]):void;
-
-    /**
-     * Output warn message to console including appropriate icons
-     *
-     * @param msg any data to log to the console
-     */
-    warn(...msg : any[]):void;
-
-    /**
-     * Output error message to console including appropriate icons
-     *
-     * @param msg any data to log to the console
-     */
-    error(...msg : any[]):void;
-
-
-    /**
-     * This disables all logging below the given level, so that after a log.setLevel("warn") call log.warn("something")
-     * or log.error("something") will output messages, but log.info("something") will not.
-     *
-     * @param level 0=trace to 5=silent
-     * @param persist Where possible the log level will be persisted. LocalStorage will be used if available, falling
-     *     back to cookies if not. If neither is available in the current environment (i.e. in Node), or if you pass
-     *     false as the optional 'persist' second argument, persistence will be skipped.
-     */
-    setLevel(level : LogLevel, persist? : boolean):void;
-
-
-    /**
-     * This disables all logging below the given level, so that after a log.setLevel("warn") call log.warn("something")
-     * or log.error("something") will output messages, but log.info("something") will not.
-     *
-     * @param level as a string, like 'error' (case-insensitive)
-     * @param persist Where possible the log level will be persisted. LocalStorage will be used if available, falling
-     *     back to cookies if not. If neither is available in the current environment (i.e. in Node), or if you pass
-     *     false as the optional 'persist' second argument, persistence will be skipped.
-     */
-    setLevel(level : string, persist? : boolean):void;
-
-
-    /**
-     * This disables all logging below the given level, so that after a log.setLevel("warn") call log.warn("something")
-     * or log.error("something") will output messages, but log.info("something") will not.
-     *
-     * @param level as the value from the enum
-     * @param persist Where possible the log level will be persisted. LocalStorage will be used if available, falling
-     *     back to cookies if not. If neither is available in the current environment (i.e. in Node), or if you pass
-     *     false as the optional 'persist' second argument, persistence will be skipped.
-     */
-    setLevel(level : LogLevel, persist? : boolean):void;
-
-    /**
-     * If you're using another JavaScript library that exposes a 'log' global, you can run into conflicts with loglevel.
-     * Similarly to jQuery, you can solve this by putting loglevel into no-conflict mode immediately after it is loaded
-     * onto the page. This resets to 'log' global to its value before loglevel was loaded (typically undefined), and
-     * returns the loglevel object, which you can then bind to another name yourself.
-     */
-    noConflict():any;
-
-    /**
-     * Returns the current logging level, as a value from the enum.
-     * It's very unlikely you'll need to use this for normal application logging; it's provided partly to help plugin
-     * development, and partly to let you optimize logging code as below, where debug data is only generated if the
-     * level is set such that it'll actually be logged. This probably doesn't affect you, unless you've run profiling
-     * on your code and you have hard numbers telling you that your log data generation is a real performance problem.
-     */
-    getLevel():LogLevel;
-
-    /**
-     * This sets the current log level only if one has not been persisted and can’t be loaded. This is useful when
-     * initializing scripts; if a developer or user has previously called setLevel(), this won’t alter their settings.
-     * For example, your application might set the log level to error in a production environment, but when debugging
-     * an issue, you might call setLevel("trace") on the console to see all the logs. If that error setting was set
-     * using setDefaultLevel(), it will still say as trace on subsequent page loads and refreshes instead of resetting
-     * to error.
-     *
-     * The level argument takes is the same values that you might pass to setLevel(). Levels set using
-     * setDefaultLevel() never persist to subsequent page loads.
-     *
-     * @param level as the value from the enum
-     */
-    setDefaultLevel(level : LogLevel):void;
-
-    /**
-     * This gets you a new logger object that works exactly like the root log object, but can have its level and
-     * logging methods set independently. All loggers must have a name (which is a non-empty string). Calling
-     * getLogger() multiple times with the same name will return an identical logger object.
-     * In large applications, it can be incredibly useful to turn logging on and off for particular modules as you are
-     * working with them. Using the getLogger() method lets you create a separate logger for each part of your
-     * application with its own logging level. Likewise, for small, independent modules, using a named logger instead
-     * of the default root logger allows developers using your module to selectively turn on deep, trace-level logging
-     * when trying to debug problems, while logging only errors or silencing logging altogether under normal
-     * circumstances.
-     * @param name The name of the produced logger
-     */
-    getLogger(name : String):Log;
-
-}
-
-declare var log : Log;
-
-declare module "loglevel" {
-    export = log;
-}
diff --git a/loglevel/tsconfig.json b/loglevel/tsconfig.json
new file mode 100644
index 0000000000..89f8255626
--- /dev/null
+++ b/loglevel/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "loglevel-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/logrotate-stream/index.d.ts b/logrotate-stream/index.d.ts
new file mode 100644
index 0000000000..51169b8316
--- /dev/null
+++ b/logrotate-stream/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for logrotate-stream 0.2.5
+// Project: https://github.com/dstokes/logrotate-stream
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import stream = require("stream");
+
+// wrapper to be able to use "export =" while also exporting the Options interface
+declare namespace logrotateStream {
+
+    /**
+     * Options object for the exported function.
+     */
+    export interface Options {
+        /**
+         * The file log file to write data to.
+         */
+        file: string;
+        /**
+         * The max file size of a log before rotation occurs. Supports 1024, 1k, 1m, 1g
+         */
+        size: string;
+        /**
+         * The number of rotated log files to keep (including the primary log file). Additional logs are deleted no rotation.
+         */
+        keep: number;
+        /**
+         * Optionally compress rotated files with gzip.
+         */
+        compress?: boolean;
+    }
+
+}
+
+/**
+ * Create a rotating log stream.
+ * @returns a writable stream to a rotating log file
+ */
+declare function logrotateStream(opts: logrotateStream.Options): stream.Writable;
+
+
+export = logrotateStream;
diff --git a/logrotate-stream/logrotate-stream-tests.ts b/logrotate-stream/logrotate-stream-tests.ts
index da17d89c75..5e9ffe7db8 100644
--- a/logrotate-stream/logrotate-stream-tests.ts
+++ b/logrotate-stream/logrotate-stream-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="logrotate-stream.d.ts" />
 
 import stream = require("stream");
 import rotateStream = require("logrotate-stream");
diff --git a/logrotate-stream/logrotate-stream.d.ts b/logrotate-stream/logrotate-stream.d.ts
deleted file mode 100644
index 85acf5887c..0000000000
--- a/logrotate-stream/logrotate-stream.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// Type definitions for logrotate-stream 0.2.5
-// Project: https://github.com/dstokes/logrotate-stream
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-declare module "logrotate-stream" {
-	import stream = require("stream");
-
-	// wrapper to be able to use "export =" while also exporting the Options interface
-	namespace logrotateStream {
-
-		/**
-		 * Options object for the exported function.
-		 */
-		export interface Options {
-			/**
-			 * The file log file to write data to.
-			 */
-			file: string;
-			/**
-			 * The max file size of a log before rotation occurs. Supports 1024, 1k, 1m, 1g
-			 */
-			size: string;
-			/**
-			 * The number of rotated log files to keep (including the primary log file). Additional logs are deleted no rotation.
-			 */
-			keep: number;
-			/**
-			 * Optionally compress rotated files with gzip.
-			 */
-			compress?: boolean;
-		}
-
-	}
-
-	/**
-	 * Create a rotating log stream.
-	 * @returns a writable stream to a rotating log file
-	 */
-	function logrotateStream(opts: logrotateStream.Options): stream.Writable;
-
-
-	export = logrotateStream;
-}
-
diff --git a/logrotate-stream/tsconfig.json b/logrotate-stream/tsconfig.json
new file mode 100644
index 0000000000..5c222d171d
--- /dev/null
+++ b/logrotate-stream/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "logrotate-stream-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/lokijs/lokijs.d.ts b/lokijs/index.d.ts
similarity index 100%
rename from lokijs/lokijs.d.ts
rename to lokijs/index.d.ts
diff --git a/lokijs/lokijs-tests.ts b/lokijs/lokijs-tests.ts
index 7459793947..435a061852 100644
--- a/lokijs/lokijs-tests.ts
+++ b/lokijs/lokijs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="lokijs.d.ts" />
+
 
 import Loki = require("lokijs");
 
diff --git a/lokijs/tsconfig.json b/lokijs/tsconfig.json
new file mode 100644
index 0000000000..b749ad61d1
--- /dev/null
+++ b/lokijs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "lokijs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/lolex/index.d.ts b/lolex/index.d.ts
new file mode 100644
index 0000000000..27052b54a5
--- /dev/null
+++ b/lolex/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for lolex 1.2.1
+// Project: https://github.com/sinonjs/lolex
+// Definitions by: Wim Looman <https://github.com/Nemo157>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export interface Clock {
+    setTimeout(callback: () => any, timeout: number): number;
+    setInterval(callback: () => any, timeout: number): number;
+    setImmediate(callback: () => any): number;
+
+    clearTimeout(id: number): void;
+    clearInterval(id: number): void;
+    clearImmediate(id: number): void;
+
+    tick(ms: number): void;
+    uninstall(): void;
+}
+
+export declare function createClock(now?: number): Clock;
+
+export declare function install(now?: number, toFake?: string[]): Clock;
+export declare function install(context?: any, now?: number, toFake?: string[]): Clock;
diff --git a/lolex/lolex-tests.ts b/lolex/lolex-tests.ts
index 10500211c8..8f2c96a1c7 100644
--- a/lolex/lolex-tests.ts
+++ b/lolex/lolex-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./lolex.d.ts" />
 
 import lolex = require("lolex");
 
diff --git a/lolex/lolex.d.ts b/lolex/lolex.d.ts
deleted file mode 100644
index 84e65a6016..0000000000
--- a/lolex/lolex.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Type definitions for lolex 1.2.1
-// Project: https://github.com/sinonjs/lolex
-// Definitions by: Wim Looman <https://github.com/Nemo157>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'lolex' {
-	export interface Clock {
-		setTimeout(callback: () => any, timeout: number): number;
-		setInterval(callback: () => any, timeout: number): number;
-		setImmediate(callback: () => any): number;
-
-		clearTimeout(id: number): void;
-		clearInterval(id: number): void;
-		clearImmediate(id: number): void;
-
-		tick(ms: number): void;
-		uninstall(): void;
-	}
-
-	export function createClock(now?: number): Clock;
-
-	export function install(now?: number, toFake?: string[]): Clock;
-	export function install(context?: any, now?: number, toFake?: string[]): Clock;
-}
diff --git a/lolex/tsconfig.json b/lolex/tsconfig.json
new file mode 100644
index 0000000000..373a813cc1
--- /dev/null
+++ b/lolex/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "lolex-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/long/index.d.ts b/long/index.d.ts
new file mode 100644
index 0000000000..b73d7f00f6
--- /dev/null
+++ b/long/index.d.ts
@@ -0,0 +1,353 @@
+// Type definitions for long.js 3.0.2
+// Project: https://github.com/dcodeIO/long.js
+// Definitions by: Peter Kooijmans <https://github.com/peterkooijmans/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Definitions by: Denis Cappellin <http://github.com/cappellin>
+
+declare class Long
+{
+    /**
+     * Constructs a 64 bit two's-complement integer, given its low and high 32 bit values as signed integers. See the from* functions below for more convenient ways of constructing Longs.
+     */
+    constructor( low: number, high?: number, unsigned?: boolean );
+
+    /**
+     * Maximum unsigned value.
+     */
+    static MAX_UNSIGNED_VALUE: Long;
+
+    /**
+     * Maximum signed value.
+     */
+    static MAX_VALUE: Long;
+
+    /**
+     * Minimum signed value.
+     */
+    static MIN_VALUE: Long;
+
+    /**
+     * Signed negative one.
+     */
+    static NEG_ONE: Long;
+
+    /**
+     * Signed one.
+     */
+    static ONE: Long;
+
+    /**
+     * Unsigned one.
+     */
+    static UONE: Long;
+
+    /**
+     * Unsigned zero.
+     */
+    static UZERO: Long;
+
+    /**
+     * Signed zero
+     */
+    static ZERO: Long;
+
+    /**
+     * The high 32 bits as a signed value.
+     */
+    high: number;
+
+    /**
+     * The low 32 bits as a signed value.
+     */
+    low: number;
+
+    /**
+     * Whether unsigned or not.
+     */
+    unsigned: boolean;
+
+    /**
+     * Returns a Long representing the 64 bit integer that comes by concatenating the given low and high bits. Each is assumed to use 32 bits.
+     */
+    static fromBits( lowBits:number, highBits:number, unsigned?:boolean ): Long;
+
+    /**
+     * Returns a Long representing the given 32 bit integer value.
+     */
+    static fromInt( value: number, unsigned?: boolean ): Long;
+
+    /**
+     * Returns a Long representing the given value, provided that it is a finite number. Otherwise, zero is returned.
+     */
+    static fromNumber( value: number, unsigned?: boolean ): Long;
+
+    /**
+     * Returns a Long representation of the given string, written using the specified radix.
+     */
+    static fromString( str: string, unsigned?: boolean | number, radix?: number ): Long;
+
+    /**
+     * Tests if the specified object is a Long.
+     */
+    static isLong( obj: any ): boolean;
+
+    /**
+     * Converts the specified value to a Long.
+     */
+    static fromValue( val: Long | number | string | {low: number, high: number, unsigned: boolean} ): Long;
+
+    /**
+     * Returns the sum of this and the specified Long.
+     */
+    add( addend: number | Long | string ): Long;
+
+    /**
+     * Returns the bitwise AND of this Long and the specified.
+     */
+    and( other: Long | number | string ): Long;
+
+    /**
+     * Compares this Long's value with the specified's.
+     */
+    compare( other: Long | number | string ): number;
+
+    /**
+     * Compares this Long's value with the specified's.
+     */
+    comp( other: Long | number | string ): number;
+
+    /**
+     * Returns this Long divided by the specified.
+     */
+    divide( divisor: Long | number | string ): Long;
+
+    /**
+     * Returns this Long divided by the specified.
+     */
+    div( divisor: Long | number | string ): Long;
+
+    /**
+     * Tests if this Long's value equals the specified's.
+     */
+    equals( other: Long | number | string ): boolean;
+
+    /**
+     * Tests if this Long's value equals the specified's.
+     */
+    eq( other: Long | number | string ): boolean;
+
+    /**
+     * Gets the high 32 bits as a signed integer.
+     */
+    getHighBits(): number;
+
+    /**
+     * Gets the high 32 bits as an unsigned integer.
+     */
+    getHighBitsUnsigned(): number;
+
+    /**
+     * Gets the low 32 bits as a signed integer.
+     */
+    getLowBits(): number;
+
+    /**
+     * Gets the low 32 bits as an unsigned integer.
+     */
+    getLowBitsUnsigned(): number;
+
+    /**
+     * Gets the number of bits needed to represent the absolute value of this Long.
+     */
+    getNumBitsAbs(): number;
+
+    /**
+     * Tests if this Long's value is greater than the specified's.
+     */
+    greaterThan( other: Long | number | string ): boolean;
+
+    /**
+     * Tests if this Long's value is greater than the specified's.
+     */
+    gt( other: Long | number | string ): boolean;
+
+    /**
+     * Tests if this Long's value is greater than or equal the specified's.
+     */
+    greaterThanOrEqual( other: Long | number | string ): boolean;
+
+    /**
+     * Tests if this Long's value is greater than or equal the specified's.
+     */
+    gte( other: Long | number | string ): boolean;
+
+    /**
+     * Tests if this Long's value is even.
+     */
+    isEven(): boolean;
+
+    /**
+     * Tests if this Long's value is negative.
+     */
+    isNegative(): boolean;
+
+    /**
+     * Tests if this Long's value is odd.
+     */
+    isOdd(): boolean;
+
+    /**
+     * Tests if this Long's value is positive.
+     */
+    isPositive(): boolean;
+
+    /**
+     * Tests if this Long's value equals zero.
+     */
+    isZero(): boolean;
+
+    /**
+     * Tests if this Long's value is less than the specified's.
+     */
+    lessThan( other: Long | number | string ): boolean;
+
+    /**
+     * Tests if this Long's value is less than the specified's.
+     */
+    lt( other: Long | number | string ): boolean;
+
+    /**
+     * Tests if this Long's value is less than or equal the specified's.
+     */
+    lessThanOrEqual( other: Long | number | string ): boolean;
+
+    /**
+     * Tests if this Long's value is less than or equal the specified's.
+     */
+    lte( other: Long | number | string ): boolean;
+
+    /**
+     * Returns this Long modulo the specified.
+     */
+    modulo( other: Long | number | string ): Long;
+
+    /**
+     * Returns this Long modulo the specified.
+     */
+    mod( other: Long | number | string ): Long;
+
+    /**
+     * Returns the product of this and the specified Long.
+     */
+    multiply( multiplier: Long | number | string ): Long;
+
+    /**
+     * Returns the product of this and the specified Long.
+     */
+    mul( multiplier: Long | number | string ): Long;
+
+    /**
+     * Negates this Long's value.
+     */
+    negate(): Long;
+
+    /**
+     * Negates this Long's value.
+     */
+    neg(): Long;
+
+    /**
+     * Returns the bitwise NOT of this Long.
+     */
+    not(): Long;
+
+    /**
+     * Tests if this Long's value differs from the specified's.
+     */
+    notEquals( other: Long | number | string ): boolean;
+
+    /**
+     * Tests if this Long's value differs from the specified's.
+     */
+    neq( other: Long | number | string ): boolean;
+
+    /**
+     * Returns the bitwise OR of this Long and the specified.
+     */
+    or( other: Long | number | string ): Long;
+
+    /**
+     * Returns this Long with bits shifted to the left by the given amount.
+     */
+    shiftLeft( numBits: number | Long ): Long;
+
+    /**
+     * Returns this Long with bits shifted to the left by the given amount.
+     */
+    shl( numBits: number | Long ): Long;
+
+    /**
+     * Returns this Long with bits arithmetically shifted to the right by the given amount.
+     */
+    shiftRight( numBits: number | Long ): Long;
+
+    /**
+     * Returns this Long with bits arithmetically shifted to the right by the given amount.
+     */
+    shr( numBits: number | Long ): Long;
+
+    /**
+     * Returns this Long with bits logically shifted to the right by the given amount.
+     */
+    shiftRightUnsigned( numBits: number | Long ): Long;
+
+    /**
+     * Returns this Long with bits logically shifted to the right by the given amount.
+     */
+    shru( numBits: number | Long ): Long;
+
+    /**
+     * Returns the difference of this and the specified Long.
+     */
+    subtract( subtrahend: number | Long | string ): Long;
+
+    /**
+     * Returns the difference of this and the specified Long.
+     */
+    sub( subtrahend: number | Long |string ): Long;
+
+    /**
+     * Converts the Long to a 32 bit integer, assuming it is a 32 bit integer.
+     */
+    toInt(): number;
+
+    /**
+     * Converts the Long to a the nearest floating-point representation of this value (double, 53 bit mantissa).
+     */
+    toNumber(): number;
+
+    /**
+     * Converts this Long to signed.
+     */
+    toSigned(): Long;
+
+    /**
+     * Converts the Long to a string written in the specified radix.
+     */
+    toString( radix?: number ): string;
+
+    /**
+     * Converts this Long to unsigned.
+     */
+    toUnsigned(): Long;
+
+    /**
+     * Returns the bitwise XOR of this Long and the given one.
+     */
+    xor( other: Long | number | string ): Long;
+}
+
+declare namespace Long {}
+export = Long;
+export as namespace Long;
+ 
\ No newline at end of file
diff --git a/long/long-tests.ts b/long/long-tests.ts
index 928cc94530..c54c83d4d6 100644
--- a/long/long-tests.ts
+++ b/long/long-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="long.d.ts" />
+
 
 import Long = require("long");
 
diff --git a/long/long.d.ts b/long/long.d.ts
deleted file mode 100644
index 514eb5677a..0000000000
--- a/long/long.d.ts
+++ /dev/null
@@ -1,353 +0,0 @@
-// Type definitions for long.js 3.0.2
-// Project: https://github.com/dcodeIO/long.js
-// Definitions by: Peter Kooijmans <https://github.com/peterkooijmans/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Definitions by: Denis Cappellin <http://github.com/cappellin>
-
-declare class Long
-{
-    /**
-     * Constructs a 64 bit two's-complement integer, given its low and high 32 bit values as signed integers. See the from* functions below for more convenient ways of constructing Longs.
-     */
-    constructor( low: number, high?: number, unsigned?: boolean );
-
-    /**
-     * Maximum unsigned value.
-     */
-    static MAX_UNSIGNED_VALUE: Long;
-
-    /**
-     * Maximum signed value.
-     */
-    static MAX_VALUE: Long;
-
-    /**
-     * Minimum signed value.
-     */
-    static MIN_VALUE: Long;
-
-    /**
-     * Signed negative one.
-     */
-    static NEG_ONE: Long;
-
-    /**
-     * Signed one.
-     */
-    static ONE: Long;
-
-    /**
-     * Unsigned one.
-     */
-    static UONE: Long;
-
-    /**
-     * Unsigned zero.
-     */
-    static UZERO: Long;
-
-    /**
-     * Signed zero
-     */
-    static ZERO: Long;
-
-    /**
-     * The high 32 bits as a signed value.
-     */
-    high: number;
-
-    /**
-     * The low 32 bits as a signed value.
-     */
-    low: number;
-
-    /**
-     * Whether unsigned or not.
-     */
-    unsigned: boolean;
-
-    /**
-     * Returns a Long representing the 64 bit integer that comes by concatenating the given low and high bits. Each is assumed to use 32 bits.
-     */
-    static fromBits( lowBits:number, highBits:number, unsigned?:boolean ): Long;
-
-    /**
-     * Returns a Long representing the given 32 bit integer value.
-     */
-    static fromInt( value: number, unsigned?: boolean ): Long;
-
-    /**
-     * Returns a Long representing the given value, provided that it is a finite number. Otherwise, zero is returned.
-     */
-    static fromNumber( value: number, unsigned?: boolean ): Long;
-
-    /**
-     * Returns a Long representation of the given string, written using the specified radix.
-     */
-    static fromString( str: string, unsigned?: boolean | number, radix?: number ): Long;
-
-    /**
-     * Tests if the specified object is a Long.
-     */
-    static isLong( obj: any ): boolean;
-
-    /**
-     * Converts the specified value to a Long.
-     */
-    static fromValue( val: Long | number | string | {low: number, high: number, unsigned: boolean} ): Long;
-
-    /**
-     * Returns the sum of this and the specified Long.
-     */
-    add( addend: number | Long | string ): Long;
-
-    /**
-     * Returns the bitwise AND of this Long and the specified.
-     */
-    and( other: Long | number | string ): Long;
-
-    /**
-     * Compares this Long's value with the specified's.
-     */
-    compare( other: Long | number | string ): number;
-
-    /**
-     * Compares this Long's value with the specified's.
-     */
-    comp( other: Long | number | string ): number;
-
-    /**
-     * Returns this Long divided by the specified.
-     */
-    divide( divisor: Long | number | string ): Long;
-
-    /**
-     * Returns this Long divided by the specified.
-     */
-    div( divisor: Long | number | string ): Long;
-
-    /**
-     * Tests if this Long's value equals the specified's.
-     */
-    equals( other: Long | number | string ): boolean;
-
-    /**
-     * Tests if this Long's value equals the specified's.
-     */
-    eq( other: Long | number | string ): boolean;
-
-    /**
-     * Gets the high 32 bits as a signed integer.
-     */
-    getHighBits(): number;
-
-    /**
-     * Gets the high 32 bits as an unsigned integer.
-     */
-    getHighBitsUnsigned(): number;
-
-    /**
-     * Gets the low 32 bits as a signed integer.
-     */
-    getLowBits(): number;
-
-    /**
-     * Gets the low 32 bits as an unsigned integer.
-     */
-    getLowBitsUnsigned(): number;
-
-    /**
-     * Gets the number of bits needed to represent the absolute value of this Long.
-     */
-    getNumBitsAbs(): number;
-
-    /**
-     * Tests if this Long's value is greater than the specified's.
-     */
-    greaterThan( other: Long | number | string ): boolean;
-
-    /**
-     * Tests if this Long's value is greater than the specified's.
-     */
-    gt( other: Long | number | string ): boolean;
-
-    /**
-     * Tests if this Long's value is greater than or equal the specified's.
-     */
-    greaterThanOrEqual( other: Long | number | string ): boolean;
-
-    /**
-     * Tests if this Long's value is greater than or equal the specified's.
-     */
-    gte( other: Long | number | string ): boolean;
-
-    /**
-     * Tests if this Long's value is even.
-     */
-    isEven(): boolean;
-
-    /**
-     * Tests if this Long's value is negative.
-     */
-    isNegative(): boolean;
-
-    /**
-     * Tests if this Long's value is odd.
-     */
-    isOdd(): boolean;
-
-    /**
-     * Tests if this Long's value is positive.
-     */
-    isPositive(): boolean;
-
-    /**
-     * Tests if this Long's value equals zero.
-     */
-    isZero(): boolean;
-
-    /**
-     * Tests if this Long's value is less than the specified's.
-     */
-    lessThan( other: Long | number | string ): boolean;
-
-    /**
-     * Tests if this Long's value is less than the specified's.
-     */
-    lt( other: Long | number | string ): boolean;
-
-    /**
-     * Tests if this Long's value is less than or equal the specified's.
-     */
-    lessThanOrEqual( other: Long | number | string ): boolean;
-
-    /**
-     * Tests if this Long's value is less than or equal the specified's.
-     */
-    lte( other: Long | number | string ): boolean;
-
-    /**
-     * Returns this Long modulo the specified.
-     */
-    modulo( other: Long | number | string ): Long;
-
-    /**
-     * Returns this Long modulo the specified.
-     */
-    mod( other: Long | number | string ): Long;
-
-    /**
-     * Returns the product of this and the specified Long.
-     */
-    multiply( multiplier: Long | number | string ): Long;
-
-    /**
-     * Returns the product of this and the specified Long.
-     */
-    mul( multiplier: Long | number | string ): Long;
-
-    /**
-     * Negates this Long's value.
-     */
-    negate(): Long;
-
-    /**
-     * Negates this Long's value.
-     */
-    neg(): Long;
-
-    /**
-     * Returns the bitwise NOT of this Long.
-     */
-    not(): Long;
-
-    /**
-     * Tests if this Long's value differs from the specified's.
-     */
-    notEquals( other: Long | number | string ): boolean;
-
-    /**
-     * Tests if this Long's value differs from the specified's.
-     */
-    neq( other: Long | number | string ): boolean;
-
-    /**
-     * Returns the bitwise OR of this Long and the specified.
-     */
-    or( other: Long | number | string ): Long;
-
-    /**
-     * Returns this Long with bits shifted to the left by the given amount.
-     */
-    shiftLeft( numBits: number | Long ): Long;
-
-    /**
-     * Returns this Long with bits shifted to the left by the given amount.
-     */
-    shl( numBits: number | Long ): Long;
-
-    /**
-     * Returns this Long with bits arithmetically shifted to the right by the given amount.
-     */
-    shiftRight( numBits: number | Long ): Long;
-
-    /**
-     * Returns this Long with bits arithmetically shifted to the right by the given amount.
-     */
-    shr( numBits: number | Long ): Long;
-
-    /**
-     * Returns this Long with bits logically shifted to the right by the given amount.
-     */
-    shiftRightUnsigned( numBits: number | Long ): Long;
-
-    /**
-     * Returns this Long with bits logically shifted to the right by the given amount.
-     */
-    shru( numBits: number | Long ): Long;
-
-    /**
-     * Returns the difference of this and the specified Long.
-     */
-    subtract( subtrahend: number | Long | string ): Long;
-
-    /**
-     * Returns the difference of this and the specified Long.
-     */
-    sub( subtrahend: number | Long |string ): Long;
-
-    /**
-     * Converts the Long to a 32 bit integer, assuming it is a 32 bit integer.
-     */
-    toInt(): number;
-
-    /**
-     * Converts the Long to a the nearest floating-point representation of this value (double, 53 bit mantissa).
-     */
-    toNumber(): number;
-
-    /**
-     * Converts this Long to signed.
-     */
-    toSigned(): Long;
-
-    /**
-     * Converts the Long to a string written in the specified radix.
-     */
-    toString( radix?: number ): string;
-
-    /**
-     * Converts this Long to unsigned.
-     */
-    toUnsigned(): Long;
-
-    /**
-     * Returns the bitwise XOR of this Long and the given one.
-     */
-    xor( other: Long | number | string ): Long;
-}
-
-declare module 'long' {
-    namespace Long {}
-    export = Long;
-}
diff --git a/long/tsconfig.json b/long/tsconfig.json
new file mode 100644
index 0000000000..5827db3acb
--- /dev/null
+++ b/long/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "long-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/lory.js/lory.js.d.ts b/lory.js/index.d.ts
similarity index 100%
rename from lory.js/lory.js.d.ts
rename to lory.js/index.d.ts
diff --git a/lory.js/lory.js-tests.ts b/lory.js/lory.js-tests.ts
index 4247dcecab..f67c724e6e 100644
--- a/lory.js/lory.js-tests.ts
+++ b/lory.js/lory.js-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./lory.js.d.ts" />
+
 
 (function() {
     var elm = document.querySelector('.js-foo');
diff --git a/lory.js/tsconfig.json b/lory.js/tsconfig.json
new file mode 100644
index 0000000000..a3c4df27d5
--- /dev/null
+++ b/lory.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "lory.js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/lovefield/index.d.ts b/lovefield/index.d.ts
new file mode 100644
index 0000000000..5e9b7061e7
--- /dev/null
+++ b/lovefield/index.d.ts
@@ -0,0 +1,232 @@
+// Type definitions for Lovefield v2.0.62
+// Project: http://google.github.io/lovefield/
+// Definitions by: freshp86 <https://github.com/freshp86>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace lf {
+  export enum Order { ASC, DESC }
+
+  export enum Type {
+    ARRAY_BUFFER,
+    BOOLEAN,
+    DATE_TIME,
+    INTEGER,
+    NUMBER,
+    OBJECT,
+    STRING
+  }
+
+  export enum ConstraintAction {
+    RESTRICT,
+    CASCADE
+  }
+
+  export enum ConstraintTiming {
+    IMMEDIATE,
+    DEFERRABLE
+  }
+
+  export interface Binder {
+    getIndex(): number
+  }
+
+  export interface Predicate {}
+  export interface Row {}
+  type ValueLiteral = string|number|boolean|Date;
+
+  export interface PredicateProvider {
+    eq(operand: ValueLiteral|schema.Column|Binder): Predicate
+    neq(operand: ValueLiteral|schema.Column|Binder): Predicate
+    lt(operand: ValueLiteral|schema.Column|Binder): Predicate
+    lte(operand: ValueLiteral|schema.Column|Binder): Predicate
+    gt(operand: ValueLiteral|schema.Column|Binder): Predicate
+    gte(operand: ValueLiteral|schema.Column|Binder): Predicate
+    match(operand: RegExp|Binder): Predicate
+    between(from: ValueLiteral|Binder, to: ValueLiteral|Binder): Predicate
+    in(values: Binder|Array<ValueLiteral>): Predicate
+    isNull(): Predicate
+    isNotNull(): Predicate
+  }
+
+  function bind(index: number): Binder;
+
+  export interface Transaction {
+    attach(query: query.Builder): Promise<Array<Object>>
+    begin(scope: Array<schema.Table>): Promise<void>
+    commit(): Promise<void>
+    exec(queries: Array<query.Builder>): Promise<Array<Array<Object>>>
+    rollback(): Promise<void>
+  }
+
+  export enum TransactionType { READ_ONLY, READ_WRITE }
+
+  export interface Database {
+    close(): void
+    createTransaction(type?: TransactionType): Transaction
+    delete(): query.Delete
+    export(): Promise<Object>
+    getSchema(): schema.Database
+    import(data: Object): Promise<void>
+    insertOrReplace(): query.Insert
+    insert(): query.Insert
+    observe(query: query.Select, callback: Function): void
+    select(...columns: schema.Column[]): query.Select
+    unobserve(query: query.Select, callback: Function): void
+    update(table: schema.Table): query.Update
+  }
+
+  namespace query {
+    export interface Builder {
+      bind(...values: any[]): Builder
+      exec(): Promise<Array<Object>>
+      explain(): string
+      toSql(): string
+    }
+
+    export interface Delete extends Builder {
+      from(table: schema.Table): Delete
+      where(predicate: Predicate): Delete
+    }
+
+    export interface Insert extends Builder {
+      into(table: schema.Table): Insert
+      values(rows: Array<Row>|Binder|Array<Binder>): Insert
+    }
+
+    export interface Select extends Builder {
+      from(...tables: schema.Table[]): Select
+      groupBy(...columns: schema.Column[]): Select
+      innerJoin(table: schema.Table, predicate: Predicate): Select
+      leftOuterJoin(table: schema.Table, predicate: Predicate): Select
+      limit(numberOfRows: Binder|number): Select
+      orderBy(column: schema.Column, order?: Order): Select
+      skip(numberOfRows: Binder|number): Select
+      where(predicate: Predicate): Select
+    }
+
+    export interface Update extends Builder {
+      set(column: schema.Column, value: any): Update
+      where(predicate: Predicate): Update
+    }
+
+  }  // module query
+
+
+  namespace raw {
+    export interface BackStore {
+      getRawDBInstance(): any
+      getRawTransaction(): any
+      dropTable(tableName: string): Promise<void>
+      addTableColumn(
+          tableName: string, columnName: string,
+          defaultValue: string|boolean|number|Date|ArrayBuffer): Promise<void>
+      dropTableColumn(tableName: string, columnName:string): Promise<void>
+      renameTableColumn(
+          tableName: string, oldColumnName: string,
+          newColumnName:string) : Promise<void>
+      createRow(payload: Object): Row
+      getVersion(): number
+      dump(): Array<Object>
+    }
+  }  // module raw
+
+
+  namespace schema {
+    export enum DataStoreType {
+      FIREBASE,
+      INDEXED_DB,
+      LOCAL_STORAGE,
+      MEMORY,
+      WEB_SQL
+    }
+
+    export interface DatabasePragma {
+      enableBundledMode: boolean
+    }
+
+    export interface Database {
+      name(): string
+      pragma(): DatabasePragma
+      tables(): Array<schema.Table>
+      table(tableName: string): schema.Table
+      version(): number
+    }
+
+    export interface Column extends PredicateProvider {
+      as(name: string): Column
+      getName(): string
+      getNormalizedName(): string
+    }
+
+    export interface Table {
+      as(name: string): Table
+      createRow(value: Object): Row
+      getName(): string
+    }
+
+    export interface ConnectOptions {
+      onUpgrade?: (rawDb: raw.BackStore) => Promise<void>
+      storeType?: DataStoreType
+      webSqlDbSize?: number
+      // TODO(dpapad): firebase?
+    }
+
+    export interface Builder {
+      connect(options: ConnectOptions): Promise<lf.Database>
+      createTable(tableName: string): TableBuilder
+      getSchema(): Database
+      setPragma(pragma: DatabasePragma): void
+    }
+
+    export interface IndexedColumn {
+      autoIncrement: boolean
+      name: string
+      order: Order
+    }
+
+    type RawForeignKeySpec = {
+      local: string
+      ref: string
+      action: lf.ConstraintAction
+      timing: lf.ConstraintAction
+    }
+
+    export interface TableBuilder {
+      addColumn(name: string, type: lf.Type): TableBuilder
+      addForeignKey(name: string, spec: RawForeignKeySpec): TableBuilder
+      addIndex(
+          name: string, columns: Array<string>|Array<IndexedColumn>,
+          unique?: boolean, order?: Order): TableBuilder
+      addNullable(columns: Array<string>): TableBuilder
+      addPrimaryKey(
+          columns: Array<string>|Array<IndexedColumn>,
+          autoInc?: boolean): TableBuilder
+      addUnique(name: string, columns: Array<string>): TableBuilder
+    }
+
+    function create(dbName: string, dbVersion: number): Builder
+  }  // module schema
+
+
+  namespace op {
+    function and(...args: Predicate[]): Predicate;
+    function not(operand: Predicate): Predicate;
+    function or(...args: Predicate[]): Predicate;
+  }  // module op
+
+
+  namespace fn {
+    function avg(column: schema.Column): schema.Column
+    function count(column?: schema.Column): schema.Column
+    function distinct(column: schema.Column): schema.Column
+    function geomean(column: schema.Column): schema.Column
+    function max(column: schema.Column): schema.Column
+    function min(column: schema.Column): schema.Column
+    function stddev(column: schema.Column): schema.Column
+    function sum(column: schema.Column): schema.Column
+  }  // module fn
+
+}  // module lf
+
+export = lf;
+export as namespace lf;
diff --git a/lovefield/lovefield-tests.ts b/lovefield/lovefield-tests.ts
index b9bc73a82c..11b67cab03 100644
--- a/lovefield/lovefield-tests.ts
+++ b/lovefield/lovefield-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="./lovefield.d.ts"/>
-
+import lf = require("lovefield");
 function main(): void {
   var schemaBuilder: lf.schema.Builder = lf.schema.create('todo', 1);
 
diff --git a/lovefield/lovefield.d.ts b/lovefield/lovefield.d.ts
deleted file mode 100644
index 1b28dae739..0000000000
--- a/lovefield/lovefield.d.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-// Type definitions for Lovefield v2.0.62
-// Project: http://google.github.io/lovefield/
-// Definitions by: freshp86 <https://github.com/freshp86>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace lf {
-  export enum Order { ASC, DESC }
-
-  export enum Type {
-    ARRAY_BUFFER,
-    BOOLEAN,
-    DATE_TIME,
-    INTEGER,
-    NUMBER,
-    OBJECT,
-    STRING
-  }
-
-  export enum ConstraintAction {
-    RESTRICT,
-    CASCADE
-  }
-
-  export enum ConstraintTiming {
-    IMMEDIATE,
-    DEFERRABLE
-  }
-
-  export interface Binder {
-    getIndex(): number
-  }
-
-  export interface Predicate {}
-  export interface Row {}
-  type ValueLiteral = string|number|boolean|Date;
-
-  export interface PredicateProvider {
-    eq(operand: ValueLiteral|schema.Column|Binder): Predicate
-    neq(operand: ValueLiteral|schema.Column|Binder): Predicate
-    lt(operand: ValueLiteral|schema.Column|Binder): Predicate
-    lte(operand: ValueLiteral|schema.Column|Binder): Predicate
-    gt(operand: ValueLiteral|schema.Column|Binder): Predicate
-    gte(operand: ValueLiteral|schema.Column|Binder): Predicate
-    match(operand: RegExp|Binder): Predicate
-    between(from: ValueLiteral|Binder, to: ValueLiteral|Binder): Predicate
-    in(values: Binder|Array<ValueLiteral>): Predicate
-    isNull(): Predicate
-    isNotNull(): Predicate
-  }
-
-  function bind(index: number): Binder;
-
-  export interface Transaction {
-    attach(query: query.Builder): Promise<Array<Object>>
-    begin(scope: Array<schema.Table>): Promise<void>
-    commit(): Promise<void>
-    exec(queries: Array<query.Builder>): Promise<Array<Array<Object>>>
-    rollback(): Promise<void>
-  }
-
-  export enum TransactionType { READ_ONLY, READ_WRITE }
-
-  export interface Database {
-    close(): void
-    createTransaction(type?: TransactionType): Transaction
-    delete(): query.Delete
-    export(): Promise<Object>
-    getSchema(): schema.Database
-    import(data: Object): Promise<void>
-    insertOrReplace(): query.Insert
-    insert(): query.Insert
-    observe(query: query.Select, callback: Function): void
-    select(...columns: schema.Column[]): query.Select
-    unobserve(query: query.Select, callback: Function): void
-    update(table: schema.Table): query.Update
-  }
-
-  namespace query {
-    export interface Builder {
-      bind(...values: any[]): Builder
-      exec(): Promise<Array<Object>>
-      explain(): string
-      toSql(): string
-    }
-
-    export interface Delete extends Builder {
-      from(table: schema.Table): Delete
-      where(predicate: Predicate): Delete
-    }
-
-    export interface Insert extends Builder {
-      into(table: schema.Table): Insert
-      values(rows: Array<Row>|Binder|Array<Binder>): Insert
-    }
-
-    export interface Select extends Builder {
-      from(...tables: schema.Table[]): Select
-      groupBy(...columns: schema.Column[]): Select
-      innerJoin(table: schema.Table, predicate: Predicate): Select
-      leftOuterJoin(table: schema.Table, predicate: Predicate): Select
-      limit(numberOfRows: Binder|number): Select
-      orderBy(column: schema.Column, order?: Order): Select
-      skip(numberOfRows: Binder|number): Select
-      where(predicate: Predicate): Select
-    }
-
-    export interface Update extends Builder {
-      set(column: schema.Column, value: any): Update
-      where(predicate: Predicate): Update
-    }
-
-  }  // module query
-
-
-  namespace raw {
-    export interface BackStore {
-      getRawDBInstance(): any
-      getRawTransaction(): any
-      dropTable(tableName: string): Promise<void>
-      addTableColumn(
-          tableName: string, columnName: string,
-          defaultValue: string|boolean|number|Date|ArrayBuffer): Promise<void>
-      dropTableColumn(tableName: string, columnName:string): Promise<void>
-      renameTableColumn(
-          tableName: string, oldColumnName: string,
-          newColumnName:string) : Promise<void>
-      createRow(payload: Object): Row
-      getVersion(): number
-      dump(): Array<Object>
-    }
-  }  // module raw
-
-
-  namespace schema {
-    export enum DataStoreType {
-      FIREBASE,
-      INDEXED_DB,
-      LOCAL_STORAGE,
-      MEMORY,
-      WEB_SQL
-    }
-
-    export interface DatabasePragma {
-      enableBundledMode: boolean
-    }
-
-    export interface Database {
-      name(): string
-      pragma(): DatabasePragma
-      tables(): Array<schema.Table>
-      table(tableName: string): schema.Table
-      version(): number
-    }
-
-    export interface Column extends PredicateProvider {
-      as(name: string): Column
-      getName(): string
-      getNormalizedName(): string
-    }
-
-    export interface Table {
-      as(name: string): Table
-      createRow(value: Object): Row
-      getName(): string
-    }
-
-    export interface ConnectOptions {
-      onUpgrade?: (rawDb: raw.BackStore) => Promise<void>
-      storeType?: DataStoreType
-      webSqlDbSize?: number
-      // TODO(dpapad): firebase?
-    }
-
-    export interface Builder {
-      connect(options: ConnectOptions): Promise<lf.Database>
-      createTable(tableName: string): TableBuilder
-      getSchema(): Database
-      setPragma(pragma: DatabasePragma): void
-    }
-
-    export interface IndexedColumn {
-      autoIncrement: boolean
-      name: string
-      order: Order
-    }
-
-    type RawForeignKeySpec = {
-      local: string
-      ref: string
-      action: lf.ConstraintAction
-      timing: lf.ConstraintAction
-    }
-
-    export interface TableBuilder {
-      addColumn(name: string, type: lf.Type): TableBuilder
-      addForeignKey(name: string, spec: RawForeignKeySpec): TableBuilder
-      addIndex(
-          name: string, columns: Array<string>|Array<IndexedColumn>,
-          unique?: boolean, order?: Order): TableBuilder
-      addNullable(columns: Array<string>): TableBuilder
-      addPrimaryKey(
-          columns: Array<string>|Array<IndexedColumn>,
-          autoInc?: boolean): TableBuilder
-      addUnique(name: string, columns: Array<string>): TableBuilder
-    }
-
-    function create(dbName: string, dbVersion: number): Builder
-  }  // module schema
-
-
-  namespace op {
-    function and(...args: Predicate[]): Predicate;
-    function not(operand: Predicate): Predicate;
-    function or(...args: Predicate[]): Predicate;
-  }  // module op
-
-
-  namespace fn {
-    function avg(column: schema.Column): schema.Column
-    function count(column?: schema.Column): schema.Column
-    function distinct(column: schema.Column): schema.Column
-    function geomean(column: schema.Column): schema.Column
-    function max(column: schema.Column): schema.Column
-    function min(column: schema.Column): schema.Column
-    function stddev(column: schema.Column): schema.Column
-    function sum(column: schema.Column): schema.Column
-  }  // module fn
-
-}  // module lf
-
-declare module 'lf' {
-  export = lf;
-}
diff --git a/lovefield/tsconfig.json b/lovefield/tsconfig.json
new file mode 100644
index 0000000000..461a3d6c9e
--- /dev/null
+++ b/lovefield/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "lovefield-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/lower-case-first/index.d.ts b/lower-case-first/index.d.ts
new file mode 100644
index 0000000000..1ceb7f1ea9
--- /dev/null
+++ b/lower-case-first/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for lower-case-first
+// Project: https://github.com/blakeembrey/lower-case-first
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function lowerCaseFirst(string: string, locale?: string): string;
+export = lowerCaseFirst;
diff --git a/lower-case-first/lower-case-first-tests.ts b/lower-case-first/lower-case-first-tests.ts
index dc21393c3a..0e280f27a4 100644
--- a/lower-case-first/lower-case-first-tests.ts
+++ b/lower-case-first/lower-case-first-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="lower-case-first.d.ts" />
 
 import lowerCaseFirst = require('lower-case-first');
 
diff --git a/lower-case-first/lower-case-first.d.ts b/lower-case-first/lower-case-first.d.ts
deleted file mode 100644
index 586be8f5e8..0000000000
--- a/lower-case-first/lower-case-first.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for lower-case-first
-// Project: https://github.com/blakeembrey/lower-case-first
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "lower-case-first" {
-	function lowerCaseFirst(string: string, locale?: string): string;
-	export = lowerCaseFirst;
-}
\ No newline at end of file
diff --git a/lower-case-first/tsconfig.json b/lower-case-first/tsconfig.json
new file mode 100644
index 0000000000..6e73e34d0b
--- /dev/null
+++ b/lower-case-first/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "lower-case-first-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/lower-case/index.d.ts b/lower-case/index.d.ts
new file mode 100644
index 0000000000..7c210bfc7d
--- /dev/null
+++ b/lower-case/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for lower-case
+// Project: https://github.com/blakeembrey/lower-case
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function lowerCase(string: any, locale?: string): string;
+export = lowerCase;
diff --git a/lower-case/lower-case-tests.ts b/lower-case/lower-case-tests.ts
index 70e7a427cf..a29e107d1b 100644
--- a/lower-case/lower-case-tests.ts
+++ b/lower-case/lower-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="lower-case.d.ts" />
 
 import lowerCase = require('lower-case');
 
diff --git a/lower-case/lower-case.d.ts b/lower-case/lower-case.d.ts
deleted file mode 100644
index ee1bb16538..0000000000
--- a/lower-case/lower-case.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for lower-case
-// Project: https://github.com/blakeembrey/lower-case
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "lower-case" {
-	function lowerCase(string: any, locale?: string): string;
-	export = lowerCase;
-}
\ No newline at end of file
diff --git a/lower-case/tsconfig.json b/lower-case/tsconfig.json
new file mode 100644
index 0000000000..7d3d11ced7
--- /dev/null
+++ b/lower-case/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "lower-case-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/lru-cache/index.d.ts b/lru-cache/index.d.ts
new file mode 100644
index 0000000000..c65a7af875
--- /dev/null
+++ b/lru-cache/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for lru-cache v2.5.0
+// Project: https://github.com/isaacs/node-lru-cache
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function LRU<T>(opts: LRU.Options<T>): LRU.Cache<T>;
+declare function LRU<T>(max: number): LRU.Cache<T>;
+
+declare namespace LRU {
+    interface Options<T> {
+        max?: number;
+        maxAge?: number;
+        length?: (value: T) => number;
+        dispose?: (key: string, value: T) => void;
+        stale?: boolean;
+    }
+
+    interface Cache<T> {
+        set(key: string, value: T): void;
+        get(key: string): T;
+        peek(key: string): T;
+        has(key: string): boolean
+        del(key: string): void;
+        reset(): void;
+        forEach(iter: (value: T, key: string, cache: Cache<T>) => void, thisp?: any): void;
+
+        keys(): string[];
+        values(): T[];
+    }
+}
+
+export = LRU;
diff --git a/lru-cache/lru-cache-tests.ts b/lru-cache/lru-cache-tests.ts
index 9121ca7914..f26bdd6653 100644
--- a/lru-cache/lru-cache-tests.ts
+++ b/lru-cache/lru-cache-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="lru-cache.d.ts" />
 
 import lru = require('lru-cache');
 
diff --git a/lru-cache/lru-cache.d.ts b/lru-cache/lru-cache.d.ts
deleted file mode 100644
index 25b9b8cf52..0000000000
--- a/lru-cache/lru-cache.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// Type definitions for lru-cache v2.5.0
-// Project: https://github.com/isaacs/node-lru-cache
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'lru-cache' {
-	function LRU<T>(opts: LRU.Options<T>): LRU.Cache<T>;
-	function LRU<T>(max: number): LRU.Cache<T>;
-
-	namespace LRU {
-		interface Options<T> {
-			max?: number;
-			maxAge?: number;
-			length?: (value: T) => number;
-			dispose?: (key: string, value: T) => void;
-			stale?: boolean;
-		}
-
-		interface Cache<T> {
-			set(key: string, value: T): void;
-			get(key: string): T;
-			peek(key: string): T;
-			has(key: string): boolean
-			del(key: string): void;
-			reset(): void;
-			forEach(iter: (value: T, key: string, cache: Cache<T>) => void, thisp?: any): void;
-
-			keys(): string[];
-			values(): T[];
-		}
-	}
-
-	export = LRU;
-}
diff --git a/lru-cache/tsconfig.json b/lru-cache/tsconfig.json
new file mode 100644
index 0000000000..66510bb95c
--- /dev/null
+++ b/lru-cache/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "lru-cache-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/lscache/lscache.d.ts b/lscache/index.d.ts
similarity index 100%
rename from lscache/lscache.d.ts
rename to lscache/index.d.ts
diff --git a/lscache/lscache-tests.ts b/lscache/lscache-tests.ts
index 103cb6c8c9..d3a8782b95 100644
--- a/lscache/lscache-tests.ts
+++ b/lscache/lscache-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="lscache.d.ts" />
+
 
 // Copied examples directly from lscache github site with slight modifications
 
diff --git a/lscache/tsconfig.json b/lscache/tsconfig.json
new file mode 100644
index 0000000000..886f9499b6
--- /dev/null
+++ b/lscache/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "lscache-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/luaparse/index.d.ts b/luaparse/index.d.ts
new file mode 100644
index 0000000000..06e7d8a468
--- /dev/null
+++ b/luaparse/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for luaparse
+// Project: https://github.com/oxyc/luaparse
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export declare function parse(code: string, options?: Object): Object;
diff --git a/luaparse/luaparse-tests.ts b/luaparse/luaparse-tests.ts
index af10d12d64..82ebe7e5ee 100644
--- a/luaparse/luaparse-tests.ts
+++ b/luaparse/luaparse-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="luaparse.d.ts" />
 
 import luaparse = require('luaparse');
 
diff --git a/luaparse/luaparse.d.ts b/luaparse/luaparse.d.ts
deleted file mode 100644
index b0e78962bb..0000000000
--- a/luaparse/luaparse.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Type definitions for luaparse
-// Project: https://github.com/oxyc/luaparse
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "luaparse" {
-	export function parse(code: string, options?: Object): Object;
-}
diff --git a/luaparse/tsconfig.json b/luaparse/tsconfig.json
new file mode 100644
index 0000000000..7ba565ed6c
--- /dev/null
+++ b/luaparse/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "luaparse-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/lunr/lunr.d.ts b/lunr/index.d.ts
similarity index 100%
rename from lunr/lunr.d.ts
rename to lunr/index.d.ts
diff --git a/lunr/lunr-tests.ts b/lunr/lunr-tests.ts
index 949a53e87e..65557ef96a 100644
--- a/lunr/lunr-tests.ts
+++ b/lunr/lunr-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="lunr.d.ts" />
+
 
 /**
  * Basic test, from http://lunrjs.com/
diff --git a/lunr/tsconfig.json b/lunr/tsconfig.json
new file mode 100644
index 0000000000..2fc0996863
--- /dev/null
+++ b/lunr/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "lunr-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/lwip/index.d.ts b/lwip/index.d.ts
new file mode 100644
index 0000000000..6ea0a776d8
--- /dev/null
+++ b/lwip/index.d.ts
@@ -0,0 +1,1005 @@
+// Type definitions for Light-weight image processor 0.0.8
+// Project: https://github.com/EyalAr/lwip
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export type ColorObject = { r: number, g: number, b: number, a?: number };
+export type Color = string | [number, number, number, number] | ColorObject;
+
+export interface ImageCallback {
+    (err: any, image: Image): void;
+}
+
+export interface BufferCallback {
+    (err: any, buffer: Buffer): void;
+}
+
+/**
+ * Open an image
+ * @param source The path to the image on disk.
+ */
+export function open(source: string, callback: ImageCallback): void;
+
+/**
+ * Open an image
+ * @param source The path to the image on disk.
+ * @param type Optional type of the image. If omitted, the type will be inferred from the file extension. Type must be a string of the image type (i.e. "jpg").
+ */
+export function open(source: string, type: string, callback: ImageCallback): void;
+
+/**
+ * Open an image
+ * @param source The path to the image on disk or an image buffer.
+ * @param type Type of the image. If source is an encoded image buffer, type must be a string of the image type (i.e. "jpg"). If source is a raw pixels buffer type must be an object with type.width and type.height properties. 
+ */
+export function open(source: Buffer, type: string | { width: number, height: number }, callback: ImageCallback): any;
+
+/**
+ * Create a new image
+ * @param width The width of the new image.
+ * @param height The height of the new image.
+ */
+export function create(width: number, height: number, callback: ImageCallback): void;
+
+/**
+ * Create a new image
+ * @param width The width of the new image.
+ * @param height The height of the new image.
+ * @param color Optional Color of the canvas.
+ */
+export function create(width: number, height: number, color: Color, callback: ImageCallback): void;
+
+export type JpegBufferParams = {
+    quality?: number;
+};
+
+export type PngBufferParams = {
+    compression?: string;
+    interlaced?: boolean;
+    transparency?: boolean | string;
+};
+
+export type GifBufferParams = {
+    colors?: number;
+    interlaced?: boolean;
+    transparency?: boolean | string;
+    threshold: number;
+}
+
+export interface Image {
+    // Image operations
+
+    /**
+     * Resize
+     * @param Width in pixels.
+     */
+    resize(width: number, callback: ImageCallback): void;
+
+    /**
+     * Resize
+     * @param Width in pixels.
+     * @param Interpolation method.
+     */
+    resize(width: number, inter: string, callback: ImageCallback): void;
+
+    /**
+     * Resize
+     * @param Width in pixels.
+     * @param Height in pixels.
+     */
+    resize(width: number, height: number, callback: ImageCallback): void;
+
+    /**
+     * Resize
+     * @param Width in pixels.
+     * @param Height in pixels.
+     * @param Interpolation method.
+     */
+    resize(width: number, height: number, inter: string, callback: ImageCallback): void;
+
+    /**
+     * Scale
+     * @param wRatio Width scale ratio.
+     */
+    scale(wRatio: number, callback: ImageCallback): void;
+
+    /**
+     * Scale
+     * @param wRatio Width scale ratio.
+     * @param inter Interpolation method.
+     */
+    scale(wRatio: number, inter: string, callback: ImageCallback): void;
+
+    /**
+     * Scale
+     * @param wRatio Width scale ratio.
+     * @param hRatio Height scale ratio.
+     */
+    scale(wRatio: number, hRatio: number, callback: ImageCallback): void;
+
+    /**
+     * Scale
+     * @param wRatio Width scale ratio.
+     * @param hRatio Height scale ratio.
+     * @param inter Interpolation method.
+     */
+    scale(wRatio: number, hRatio: number, inter: string, callback: ImageCallback): void;
+
+    /**
+     * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     */
+    contain(width: number, height: number, callback: ImageCallback): void;
+
+    /**
+     * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     * @param color Color of the canvas.
+     */
+    contain(width: number, height: number, color: Color, callback: ImageCallback): void;
+
+    /**
+     * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     * @param inter Interpolation method.
+     */
+    contain(width: number, height: number, inter: string, callback: ImageCallback): void;
+
+    /**
+     * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     * @param color Color of the canvas.
+     * @param inter Interpolation method.
+     */
+    contain(width: number, height: number, color: Color, inter: string, callback: ImageCallback): void;
+
+    /**
+     * Cover a canvas with the image. The image will be resized to the smallest possible size such that both its dimensions are bigger than the canvas's dimensions. Margins of the image exceeding the canvas will be discarded.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     */
+    cover(width: number, height: number, callback: ImageCallback): void;
+
+    /**
+     * Cover a canvas with the image. The image will be resized to the smallest possible size such that both its dimensions are bigger than the canvas's dimensions. Margins of the image exceeding the canvas will be discarded.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     * @param inter Interpolation method.
+     */
+    cover(width: number, height: number, inter: string, callback: ImageCallback): void;
+
+    /**
+     * Rotate
+     * @param degs Clockwise rotation degrees.
+     */
+    rotate(degs: number, callback: ImageCallback): void;
+
+    /**
+     * Rotate
+     * @param degs Clockwise rotation degrees.
+     * @param color Color of the canvas.
+     */
+    rotate(degs: number, color: Color, callback: ImageCallback): void;
+
+    /**
+     * Crop with rectangle coordinates
+     */
+    crop(left: number, top: number, right: number, bottom: number, callback: ImageCallback): void;
+
+    /**
+     * Crop a rectangle from center
+     * @param width Width of the rectangle to crop from the center of the image.
+     * @param height Height of the rectangle to crop from the center of the image.
+     */
+    crop(width: number, height: number, callback: ImageCallback): void;
+
+    /**
+     * Gaussian blur.
+     * @param sigma Standard deviation of the Gaussian filter.
+     */
+    blur(sigma: number, callback: ImageCallback): void;
+
+    /**
+     * Inverse diffusion shapren.
+     * @param amplitude Sharpening amplitude.
+     */
+    sharpen(amplitude: number, callback: ImageCallback): void;
+
+    /**
+     * Mirror an image along the 'x' axis, 'y' axis or both.
+     * @param axes 'x', 'y' or 'xy' (case sensitive).
+     */
+    mirror(axes: string, callback: ImageCallback): void;
+
+    /**
+     * Alias of mirror. Mirror an image along the 'x' axis, 'y' axis or both.
+     * @param axes 'x', 'y' or 'xy' (case sensitive).
+     */
+    flip(axes: string, callback: ImageCallback): void;
+
+    /**
+     * Add a colored border to the image.
+     * @param width Border width in pixels.
+     */
+    border(width: number, callback: ImageCallback): void;
+
+    /**
+     * Add a colored border to the image.
+     * @param width Border width in pixels.
+     * @param color Color of the border.
+     */
+    border(width: number, color: Color, callback: ImageCallback): void;
+
+    /**
+     * Pad image edges with colored pixels.
+     * @param left Number of pixels to add to left edge.
+     * @param top Number of pixels to add to top edge.
+     * @param right Number of pixels to add to right edge.
+     * @param bottom Number of pixels to add to bottom edge.
+     */
+    pad(left: number, top: number, right: number, bottom: number, callback: ImageCallback): void;
+
+    /**
+     * Pad image edges with colored pixels.
+     * @param left Number of pixels to add to left edge.
+     * @param top Number of pixels to add to top edge.
+     * @param right Number of pixels to add to right edge.
+     * @param bottom Number of pixels to add to bottom edge.
+     * @param color Color of the padding.
+     */
+    pad(left: number, top: number, right: number, bottom: number, color: Color, callback: ImageCallback): void;
+
+    /**
+     * Adjust image saturation.
+     * 
+     * Examples:
+     * 1. image.saturate(0, ...) will have no effect on the image.
+     * 2. image.saturate(0.5, ...) will increase the saturation by 50%.
+     * 3. image.saturate(-1, ...) will decrease the saturation by 100%, effectively desaturating the image.
+     * 
+     * @param delta By how much to increase / decrease the saturation.
+     */
+    saturate(delta: number, callback: ImageCallback): void;
+
+    /**
+     * Adjust image lightness.
+     * 
+     * Examples:
+     * 1. image.lighten(0, ...) will have no effect on the image.
+     * 2. image.lighten(0.5, ...) will increase the lightness by 50%.
+     * 3. image.lighten(-1, ...) will decrease the lightness by 100%, effectively making the image black.
+     * 
+     * @param delta By how much to increase / decrease the lightness.
+     */
+    lighten(delta: number, callback: ImageCallback): void;
+
+    /**
+     * Adjust image lightness. Equivalent to image.lighten(-delta, callback).
+     * @param delta By how much to increase / decrease the lightness.
+     */
+    darken(delta: number, callback: ImageCallback): void;
+
+    /**
+     * Adjust image hue.
+     * 
+     * Examples:
+     * 1. image.hue(0, ...) will have no effect on the image.
+     * 2. image.hue(100, ...) will shift pixels' hue by 100 degrees.
+     * 
+     * Note: The hue is shifted in a circular manner in the range [0,360] for each pixel individually.
+     * 
+     * @param shift By how many degrees to shift each pixel's hue.
+     */
+    hue(shift: number, callback: ImageCallback): void;
+
+    /**
+     * Adjust image transperancy.
+     * 
+     * Examples:
+     * 1. image.fade(0, ...) will have no effect on the image.
+     * 2. image.fade(0.5, ...) will increase the transparency by 50%.
+     * 3. image.fade(1, ...) will make the image completely transparent.
+     * 
+     * Note: The transparency is adjusted independently for each pixel.
+     * 
+     * @param delta By how much to increase / decrease the transperancy.
+     */
+    fade(delta: number, callback: ImageCallback): void;
+
+    /**
+     * Make image completely opaque.
+     */
+    opacity(callback: ImageCallback): void;
+
+    /**
+     * Paste an image on top of this image.
+     * 
+     * Notes:
+     * 1. If the pasted image exceeds the bounds of the base image, an exception is thrown.
+     * 2. img is pasted in the state it was at the time image.paste( ... ) was called, eventhough callback is called asynchronously.
+     * 3. For transparent images, alpha blending is done according to the equations described here.
+     * 4. Extra caution is required when using this method in batch mode, as the images may change by the time this operation is called.
+     * 
+     * @param left Coordinates of the left corner of the pasted image.
+     * @param top Coordinates of the top corner of the pasted image.
+     * @param img The image to paste.
+     */
+    paste(left: number, top: number, img: Image, callback: ImageCallback): void;
+
+    /**
+     * Set the color of a pixel.
+     * 
+     * Notes:
+     * 1. If the coordinates exceed the bounds of the image, an exception is thrown.
+     * 2. Extra caution is required when using this method in batch mode, as the dimensions of the image may change by the time this operation is called.
+     * 
+     * @param left Coordinates of the pixel from the left corner of the image.
+     * @param top Coordinates of the pixel from the top corner of the image.
+     * @param color Color of the pixel to set.
+     */
+    setPixel(left: number, top: number, color: Color, callback: ImageCallback): void;
+
+    /**
+     * Set the metadata in an image. This is currently only supported for PNG files. Sets a tEXt chunk with the key lwip_data and comment as the given string. If called with a null parameter, removes existing metadata from the image, if present.
+     * @param metadata A string of arbitrary length, or null.
+     */
+    setMetaData(metadata: string): void;
+
+    // Getters
+
+    /**
+     * Return the image's width in pixels.
+     */
+    width(): number;
+
+    /**
+     * Return the image's height in pixels.
+     */
+    height(): number;
+
+    /**
+     * Return the color of the pixel at the (left, top) coordinate.
+     */
+    getPixel(left: number, top: number): ColorObject;
+
+    /**
+     * Clone the image into a new image object.
+     * 
+     * Note: The image is cloned to the state it was at the time image.clone( ... ) was called, eventhough callback is called asynchronously.
+     */
+    clone(callback: ImageCallback): void;
+
+    /**
+     * Copy an area of the image into a new image object.
+     * 
+     * Note: The sub-image is extracted from the original image in the state it was at the time image.extract( ... ) was called, eventhough callback is called asynchronously.
+     */
+    extract(left: number, top: number, right: number, bottom: number, callback: ImageCallback): void;
+
+    /**
+     * Get encoded binary image data as a NodeJS Buffer.
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     */
+    toBuffer(format: "jpg", callback: BufferCallback): void;
+
+    /**
+     * Get encoded binary image data as a NodeJS Buffer.
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    toBuffer(format: "jpg", params: JpegBufferParams, callback: BufferCallback): void;
+
+    /**
+     * Get encoded binary image data as a NodeJS Buffer.
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     */
+    toBuffer(format: "png", callback: BufferCallback): void;
+
+    /**
+     * Get encoded binary image data as a NodeJS Buffer.
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    toBuffer(format: "png", params: PngBufferParams, callback: BufferCallback): void;
+
+    /**
+     * Get encoded binary image data as a NodeJS Buffer.
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     */
+    toBuffer(format: "gif", callback: BufferCallback): void;
+
+    /**
+     * Get encoded binary image data as a NodeJS Buffer.
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    toBuffer(format: "gif", params: GifBufferParams, callback: BufferCallback): void;
+
+    /**
+     * Get encoded binary image data as a NodeJS Buffer.
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     */
+    toBuffer(format: string, callback: BufferCallback): void;
+
+    /**
+     * Get encoded binary image data as a NodeJS Buffer.
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    toBuffer(format: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: BufferCallback): void;
+
+    /**
+     * Write encoded binary image data directly to a file.
+     * 
+     * @param path Path of file to write.
+     */
+    writeFile(path: string, callback: ImageCallback): void;
+
+    /**
+     * Write encoded binary image data directly to a file.
+     * 
+     * @param path Path of file to write.
+     * @param params Format-specific parameters.
+     */
+    writeFile(path: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: ImageCallback): void;
+
+    /**
+     * Write encoded binary image data directly to a file.
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     */
+    writeFile(path: string, format: "jpg", callback: ImageCallback): void;
+
+    /**
+     * Write encoded binary image data directly to a file.
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    writeFile(path: string, format: "jpg", params: JpegBufferParams, callback: ImageCallback): void;
+
+    /**
+     * Write encoded binary image data directly to a file.
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     */
+    writeFile(path: string, format: "png", callback: ImageCallback): void;
+
+    /**
+     * Write encoded binary image data directly to a file.
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    writeFile(path: string, format: "png", params: PngBufferParams, callback: ImageCallback): void;
+
+    /**
+     * Write encoded binary image data directly to a file.
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     */
+    writeFile(path: string, format: "gif", callback: ImageCallback): void;
+
+    /**
+     * Write encoded binary image data directly to a file.
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    writeFile(path: string, format: "gif", params: GifBufferParams, callback: ImageCallback): void;
+
+    /**
+     * Write encoded binary image data directly to a file.
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     */
+    writeFile(path: string, format: string, callback: ImageCallback): void;
+
+    /**
+     * Write encoded binary image data directly to a file.
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    writeFile(path: string, format: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: ImageCallback): void;
+
+    /**
+     * Get the textual metadata from an image. This is currently only supported for tEXt chunks in PNG images, and will get the first tEXt chunk found with the key lwip_data. If none is found, returns null.
+     */
+    getMetaData<T>(): T;
+
+    // Obtaining a batch object
+
+    /**
+     * Obtain a batch object from the image
+     */
+    batch(): Batch;
+}
+
+export interface Batch {
+    // Using a batch object
+
+    /**
+     * Resize
+     * @param Width in pixels.
+     */
+    resize(width: number): Batch;
+
+    /**
+     * Resize
+     * @param Width in pixels.
+     * @param Interpolation method.
+     */
+    resize(width: number, inter: string): Batch;
+
+    /**
+     * Resize
+     * @param Width in pixels.
+     * @param Height in pixels.
+     */
+    resize(width: number, height: number): Batch;
+
+    /**
+     * Resize
+     * @param Width in pixels.
+     * @param Height in pixels.
+     * @param Interpolation method.
+     */
+    resize(width: number, height: number, inter: string): Batch;
+
+    /**
+     * Scale
+     * @param wRatio Width scale ratio.
+     */
+    scale(wRatio: number): Batch;
+
+    /**
+     * Scale
+     * @param wRatio Width scale ratio.
+     * @param inter Interpolation method.
+     */
+    scale(wRatio: number, inter: string): Batch;
+
+    /**
+     * Scale
+     * @param wRatio Width scale ratio.
+     * @param hRatio Height scale ratio.
+     */
+    scale(wRatio: number, hRatio: number): Batch;
+
+    /**
+     * Scale
+     * @param wRatio Width scale ratio.
+     * @param hRatio Height scale ratio.
+     * @param inter Interpolation method.
+     */
+    scale(wRatio: number, hRatio: number, inter: string): Batch;
+
+    /**
+     * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     */
+    contain(width: number, height: number): Batch;
+
+    /**
+     * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     * @param color Color of the canvas.
+     */
+    contain(width: number, height: number, color: Color): Batch;
+
+    /**
+     * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     * @param inter Interpolation method.
+     */
+    contain(width: number, height: number, inter: string): Batch;
+
+    /**
+     * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     * @param color Color of the canvas.
+     * @param inter Interpolation method.
+     */
+    contain(width: number, height: number, color: Color, inter: string): Batch;
+
+    /**
+     * Cover a canvas with the image. The image will be resized to the smallest possible size such that both its dimensions are bigger than the canvas's dimensions. Margins of the image exceeding the canvas will be discarded.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     */
+    cover(width: number, height: number): Batch;
+
+    /**
+     * Cover a canvas with the image. The image will be resized to the smallest possible size such that both its dimensions are bigger than the canvas's dimensions. Margins of the image exceeding the canvas will be discarded.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     * @param inter Interpolation method.
+     */
+    cover(width: number, height: number, inter: string): Batch;
+
+    /**
+     * Rotate
+     * @param degs Clockwise rotation degrees.
+     */
+    rotate(degs: number): Batch;
+
+    /**
+     * Rotate
+     * @param degs Clockwise rotation degrees.
+     * @param color Color of the canvas.
+     */
+    rotate(degs: number, color: Color): Batch;
+
+    /**
+     * Crop with rectangle coordinates
+     */
+    crop(left: number, top: number, right: number, bottom: number): Batch;
+
+    /**
+     * Crop a rectangle from center
+     * @param width Width of the rectangle to crop from the center of the image.
+     * @param height Height of the rectangle to crop from the center of the image.
+     */
+    crop(width: number, height: number): Batch;
+
+    /**
+     * Gaussian blur.
+     * @param sigma Standard deviation of the Gaussian filter.
+     */
+    blur(sigma: number): Batch;
+
+    /**
+     * Inverse diffusion shapren.
+     * @param amplitude Sharpening amplitude.
+     */
+    sharpen(amplitude: number): Batch;
+
+    /**
+     * Mirror an image along the 'x' axis, 'y' axis or both.
+     * @param axes 'x', 'y' or 'xy' (case sensitive).
+     */
+    mirror(axes: string): Batch;
+
+    /**
+     * Alias of mirror. Mirror an image along the 'x' axis, 'y' axis or both.
+     * @param axes 'x', 'y' or 'xy' (case sensitive).
+     */
+    flip(axes: string): Batch;
+
+    /**
+     * Add a colored border to the image.
+     * @param width Border width in pixels.
+     */
+    border(width: number): Batch;
+
+    /**
+     * Add a colored border to the image.
+     * @param width Border width in pixels.
+     * @param color Color of the border.
+     */
+    border(width: number, color: Color): Batch;
+
+    /**
+     * Pad image edges with colored pixels.
+     * @param left Number of pixels to add to left edge.
+     * @param top Number of pixels to add to top edge.
+     * @param right Number of pixels to add to right edge.
+     * @param bottom Number of pixels to add to bottom edge.
+     */
+    pad(left: number, top: number, right: number, bottom: number): Batch;
+
+    /**
+     * Pad image edges with colored pixels.
+     * @param left Number of pixels to add to left edge.
+     * @param top Number of pixels to add to top edge.
+     * @param right Number of pixels to add to right edge.
+     * @param bottom Number of pixels to add to bottom edge.
+     * @param color Color of the padding.
+     */
+    pad(left: number, top: number, right: number, bottom: number, color: Color): Batch;
+
+    /**
+     * Adjust image saturation.
+     * 
+     * Examples:
+     * 1. image.saturate(0, ...) will have no effect on the image.
+     * 2. image.saturate(0.5, ...) will increase the saturation by 50%.
+     * 3. image.saturate(-1, ...) will decrease the saturation by 100%, effectively desaturating the image.
+     * 
+     * @param delta By how much to increase / decrease the saturation.
+     */
+    saturate(delta: number): Batch;
+
+    /**
+     * Adjust image lightness.
+     * 
+     * Examples:
+     * 1. image.lighten(0, ...) will have no effect on the image.
+     * 2. image.lighten(0.5, ...) will increase the lightness by 50%.
+     * 3. image.lighten(-1, ...) will decrease the lightness by 100%, effectively making the image black.
+     * 
+     * @param delta By how much to increase / decrease the lightness.
+     */
+    lighten(delta: number): Batch;
+
+    /**
+     * Adjust image lightness. Equivalent to image.lighten(-delta, callback).
+     * @param delta By how much to increase / decrease the lightness.
+     */
+    darken(delta: number): Batch;
+
+    /**
+     * Adjust image hue.
+     * 
+     * Examples:
+     * 1. image.hue(0, ...) will have no effect on the image.
+     * 2. image.hue(100, ...) will shift pixels' hue by 100 degrees.
+     * 
+     * Note: The hue is shifted in a circular manner in the range [0,360] for each pixel individually.
+     * 
+     * @param shift By how many degrees to shift each pixel's hue.
+     */
+    hue(shift: number): Batch;
+
+    /**
+     * Adjust image transperancy.
+     * 
+     * Examples:
+     * 1. image.fade(0, ...) will have no effect on the image.
+     * 2. image.fade(0.5, ...) will increase the transparency by 50%.
+     * 3. image.fade(1, ...) will make the image completely transparent.
+     * 
+     * Note: The transparency is adjusted independently for each pixel.
+     * 
+     * @param delta By how much to increase / decrease the transperancy.
+     */
+    fade(delta: number): Batch;
+
+    /**
+     * Make image completely opaque.
+     */
+    opacity(callback: ImageCallback): void;
+
+    /**
+     * Paste an image on top of this image.
+     * 
+     * Notes:
+     * 1. If the pasted image exceeds the bounds of the base image, an exception is thrown.
+     * 2. img is pasted in the state it was at the time image.paste( ... ) was called, eventhough callback is called asynchronously.
+     * 3. For transparent images, alpha blending is done according to the equations described here.
+     * 4. Extra caution is required when using this method in batch mode, as the images may change by the time this operation is called.
+     * 
+     * @param left Coordinates of the left corner of the pasted image.
+     * @param top Coordinates of the top corner of the pasted image.
+     * @param img The image to paste.
+     */
+    paste(left: number, top: number, img: Image): Batch;
+
+    /**
+     * Set the color of a pixel.
+     * 
+     * Notes:
+     * 1. If the coordinates exceed the bounds of the image, an exception is thrown.
+     * 2. Extra caution is required when using this method in batch mode, as the dimensions of the image may change by the time this operation is called.
+     * 
+     * @param left Coordinates of the pixel from the left corner of the image.
+     * @param top Coordinates of the pixel from the top corner of the image.
+     * @param color Color of the pixel to set.
+     */
+    setPixel(left: number, top: number, color: Color): Batch;
+
+    /**
+     * Set the metadata in an image. This is currently only supported for PNG files. Sets a tEXt chunk with the key lwip_data and comment as the given string. If called with a null parameter, removes existing metadata from the image, if present.
+     * @param metadata A string of arbitrary length, or null.
+     */
+    setMetaData(metadata: string): void;
+
+    // Executing a batch
+
+    /**
+     * Execute batch and obtain the manipulated image object
+     */
+    exec(callback: ImageCallback): void;
+
+    /**
+     * Execute batch and obtain a Buffer object
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     */
+    toBuffer(format: "jpg", callback: BufferCallback): void;
+
+    /**
+     * Execute batch and obtain a Buffer object
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    toBuffer(format: "jpg", params: JpegBufferParams, callback: BufferCallback): void;
+
+    /**
+     * Execute batch and obtain a Buffer object
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     */
+    toBuffer(format: "png", callback: BufferCallback): void;
+
+    /**
+     * Execute batch and obtain a Buffer object
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    toBuffer(format: "png", params: PngBufferParams, callback: BufferCallback): void;
+
+    /**
+     * Execute batch and obtain a Buffer object
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     */
+    toBuffer(format: "gif", callback: BufferCallback): void;
+
+    /**
+     * Execute batch and obtain a Buffer object
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    toBuffer(format: "gif", params: GifBufferParams, callback: BufferCallback): void;
+
+    /**
+     * Execute batch and obtain a Buffer object
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     */
+    toBuffer(format: string, callback: BufferCallback): void;
+
+    /**
+     * Execute batch and obtain a Buffer object
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    toBuffer(format: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: BufferCallback): void;
+
+    /**
+     * Execute batch and write to file
+     * 
+     * @param path Path of file to write.
+     */
+    writeFile(path: string, callback: ImageCallback): void;
+
+    /**
+     * Execute batch and write to file
+     * 
+     * @param path Path of file to write.
+     * @param params Format-specific parameters.
+     */
+    writeFile(path: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: ImageCallback): void;
+
+    /**
+     * Execute batch and write to file
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     */
+    writeFile(path: string, format: "jpg", callback: ImageCallback): void;
+
+    /**
+     * Execute batch and write to file
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    writeFile(path: string, format: "jpg", params: JpegBufferParams, callback: ImageCallback): void;
+
+    /**
+     * Execute batch and write to file
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     */
+    writeFile(path: string, format: "png", callback: ImageCallback): void;
+
+    /**
+     * Execute batch and write to file
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    writeFile(path: string, format: "png", params: PngBufferParams, callback: ImageCallback): void;
+
+    /**
+     * Execute batch and write to file
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     */
+    writeFile(path: string, format: "gif", callback: ImageCallback): void;
+
+    /**
+     * Execute batch and write to file
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    writeFile(path: string, format: "gif", params: GifBufferParams, callback: ImageCallback): void;
+
+    /**
+     * Execute batch and write to file
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     */
+    writeFile(path: string, format: string, callback: ImageCallback): void;
+
+    /**
+     * Execute batch and write to file
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    writeFile(path: string, format: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: ImageCallback): void;
+}
diff --git a/lwip/lwip-tests.ts b/lwip/lwip-tests.ts
index 4fca563819..028551d6fa 100644
--- a/lwip/lwip-tests.ts
+++ b/lwip/lwip-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./lwip.d.ts" />
-
 import * as lwip from 'lwip';
 
 lwip.open('lena.jpg', function(err, image) {
diff --git a/lwip/lwip.d.ts b/lwip/lwip.d.ts
deleted file mode 100644
index 0f40c63d25..0000000000
--- a/lwip/lwip.d.ts
+++ /dev/null
@@ -1,1007 +0,0 @@
-// Type definitions for Light-weight image processor 0.0.8
-// Project: https://github.com/EyalAr/lwip
-// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "lwip" {
-	type ColorObject = {r: number, g: number, b: number, a?: number};
-	type Color = string | [number, number, number, number] | ColorObject;
-
-	interface ImageCallback {
-		(err: any, image: Image): void;
-	}
-    
-    interface BufferCallback {
-		(err: any, buffer: Buffer): void;
-	}
-
-	/**
-	 * Open an image
-	 * @param source The path to the image on disk.
-	 */
-	function open(source: string, callback: ImageCallback): void;
-
-	/**
-	 * Open an image
-	 * @param source The path to the image on disk.
-	 * @param type Optional type of the image. If omitted, the type will be inferred from the file extension. Type must be a string of the image type (i.e. "jpg").
-	 */
-	function open(source: string, type: string, callback: ImageCallback): void;
-
-	/**
-	 * Open an image
-	 * @param source The path to the image on disk or an image buffer.
-	 * @param type Type of the image. If source is an encoded image buffer, type must be a string of the image type (i.e. "jpg"). If source is a raw pixels buffer type must be an object with type.width and type.height properties. 
-	 */
-	function open(source: Buffer, type: string | {width: number, height: number}, callback: ImageCallback): any;
-
-	/**
-	 * Create a new image
-	 * @param width The width of the new image.
-	 * @param height The height of the new image.
-	 */
-	function create(width: number, height: number, callback: ImageCallback): void;
-
-	/**
-	 * Create a new image
-	 * @param width The width of the new image.
-	 * @param height The height of the new image.
-	 * @param color Optional Color of the canvas.
-	 */
-	function create(width: number, height: number, color: Color, callback: ImageCallback): void;
-
-	type JpegBufferParams = {
-		quality?: number;
-	};
-
-	type PngBufferParams = {
-		compression?: string;
-		interlaced?: boolean;
-		transparency?: boolean | string;
-	};
-	
-	type GifBufferParams = {
-		colors?: number;
-		interlaced?: boolean;
-		transparency?: boolean | string;
-		threshold: number;
-	}
-
-	interface Image {
-		// Image operations
-
-		/**
-		 * Resize
-		 * @param Width in pixels.
-		 */
-		resize(width: number, callback: ImageCallback): void;
-
-		/**
-		 * Resize
-		 * @param Width in pixels.
-		 * @param Interpolation method.
-		 */
-		resize(width: number, inter: string, callback: ImageCallback): void;
-
-		/**
-		 * Resize
-		 * @param Width in pixels.
-		 * @param Height in pixels.
-		 */
-		resize(width: number, height: number, callback: ImageCallback): void;
-
-		/**
-		 * Resize
-		 * @param Width in pixels.
-		 * @param Height in pixels.
-		 * @param Interpolation method.
-		 */
-		resize(width: number, height: number, inter: string, callback: ImageCallback): void;
-
-		/**
-		 * Scale
-		 * @param wRatio Width scale ratio.
-		 */
-		scale(wRatio: number, callback: ImageCallback): void;
-		
-		/**
-		 * Scale
-		 * @param wRatio Width scale ratio.
-		 * @param inter Interpolation method.
-		 */
-		scale(wRatio: number, inter: string, callback: ImageCallback): void;
-		
-		/**
-		 * Scale
-		 * @param wRatio Width scale ratio.
-		 * @param hRatio Height scale ratio.
-		 */
-		scale(wRatio: number, hRatio: number, callback: ImageCallback): void;
-		
-		/**
-		 * Scale
-		 * @param wRatio Width scale ratio.
-		 * @param hRatio Height scale ratio.
-		 * @param inter Interpolation method.
-		 */
-		scale(wRatio: number, hRatio: number, inter: string, callback: ImageCallback): void;
-		
-		/**
-		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 */
-		contain(width: number, height: number, callback: ImageCallback): void;
-
-		/**
-		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 * @param color Color of the canvas.
-		 */
-		contain(width: number, height: number, color: Color, callback: ImageCallback): void;
-
-		/**
-		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 * @param inter Interpolation method.
-		 */
-		contain(width: number, height: number, inter: string, callback: ImageCallback): void;
-
-		/**
-		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 * @param color Color of the canvas.
-		 * @param inter Interpolation method.
-		 */
-		contain(width: number, height: number, color: Color, inter: string, callback: ImageCallback): void;
-
-		/**
-		 * Cover a canvas with the image. The image will be resized to the smallest possible size such that both its dimensions are bigger than the canvas's dimensions. Margins of the image exceeding the canvas will be discarded.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 */
-		cover(width: number, height: number, callback: ImageCallback): void;
-
-		/**
-		 * Cover a canvas with the image. The image will be resized to the smallest possible size such that both its dimensions are bigger than the canvas's dimensions. Margins of the image exceeding the canvas will be discarded.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 * @param inter Interpolation method.
-		 */
-		cover(width: number, height: number, inter: string, callback: ImageCallback): void;
-
-		/**
-		 * Rotate
-		 * @param degs Clockwise rotation degrees.
-		 */
-		rotate(degs: number, callback: ImageCallback): void;
-
-		/**
-		 * Rotate
-		 * @param degs Clockwise rotation degrees.
-		 * @param color Color of the canvas.
-		 */
-		rotate(degs: number, color: Color, callback: ImageCallback): void;
-
-		/**
-		 * Crop with rectangle coordinates
-		 */
-		crop(left: number, top: number, right: number, bottom: number, callback: ImageCallback): void;
-		
-		/**
-		 * Crop a rectangle from center
-		 * @param width Width of the rectangle to crop from the center of the image.
-		 * @param height Height of the rectangle to crop from the center of the image.
-		 */
-		crop(width: number, height: number, callback: ImageCallback): void;
-
-		/**
-		 * Gaussian blur.
-		 * @param sigma Standard deviation of the Gaussian filter.
-		 */
-		blur(sigma: number, callback: ImageCallback): void;
-
-		/**
-		 * Inverse diffusion shapren.
-		 * @param amplitude Sharpening amplitude.
-		 */
-		sharpen(amplitude: number, callback: ImageCallback): void;
-
-		/**
-		 * Mirror an image along the 'x' axis, 'y' axis or both.
-		 * @param axes 'x', 'y' or 'xy' (case sensitive).
-		 */
-		mirror(axes: string, callback: ImageCallback): void;
-
-		/**
-		 * Alias of mirror. Mirror an image along the 'x' axis, 'y' axis or both.
-		 * @param axes 'x', 'y' or 'xy' (case sensitive).
-		 */
-		flip(axes: string, callback: ImageCallback): void;
-
-		/**
-		 * Add a colored border to the image.
-		 * @param width Border width in pixels.
-		 */
-		border(width: number, callback: ImageCallback): void;
-
-		/**
-		 * Add a colored border to the image.
-		 * @param width Border width in pixels.
-		 * @param color Color of the border.
-		 */
-		border(width: number, color: Color, callback: ImageCallback): void;
-
-		/**
-		 * Pad image edges with colored pixels.
-		 * @param left Number of pixels to add to left edge.
-		 * @param top Number of pixels to add to top edge.
-		 * @param right Number of pixels to add to right edge.
-		 * @param bottom Number of pixels to add to bottom edge.
-		 */
-		pad(left: number, top: number, right: number, bottom: number, callback: ImageCallback): void;
-
-		/**
-		 * Pad image edges with colored pixels.
-		 * @param left Number of pixels to add to left edge.
-		 * @param top Number of pixels to add to top edge.
-		 * @param right Number of pixels to add to right edge.
-		 * @param bottom Number of pixels to add to bottom edge.
-		 * @param color Color of the padding.
-		 */
-		pad(left: number, top: number, right: number, bottom: number, color: Color, callback: ImageCallback): void;
-
-		/**
-		 * Adjust image saturation.
-		 * 
-		 * Examples:
-		 * 1. image.saturate(0, ...) will have no effect on the image.
-		 * 2. image.saturate(0.5, ...) will increase the saturation by 50%.
-		 * 3. image.saturate(-1, ...) will decrease the saturation by 100%, effectively desaturating the image.
-		 * 
-		 * @param delta By how much to increase / decrease the saturation.
-		 */
-		saturate(delta: number, callback: ImageCallback): void;
-
-		/**
-		 * Adjust image lightness.
-		 * 
-		 * Examples:
-		 * 1. image.lighten(0, ...) will have no effect on the image.
-		 * 2. image.lighten(0.5, ...) will increase the lightness by 50%.
-		 * 3. image.lighten(-1, ...) will decrease the lightness by 100%, effectively making the image black.
-		 * 
-		 * @param delta By how much to increase / decrease the lightness.
-		 */
-		lighten(delta: number, callback: ImageCallback): void;
-
-		/**
-		 * Adjust image lightness. Equivalent to image.lighten(-delta, callback).
-		 * @param delta By how much to increase / decrease the lightness.
-		 */
-		darken(delta: number, callback: ImageCallback): void;
-
-		/**
-		 * Adjust image hue.
-		 * 
-		 * Examples:
-		 * 1. image.hue(0, ...) will have no effect on the image.
-		 * 2. image.hue(100, ...) will shift pixels' hue by 100 degrees.
-		 * 
-		 * Note: The hue is shifted in a circular manner in the range [0,360] for each pixel individually.
-		 * 
-		 * @param shift By how many degrees to shift each pixel's hue.
-		 */
-		hue(shift: number, callback: ImageCallback): void;
-
-		/**
-		 * Adjust image transperancy.
-		 * 
-		 * Examples:
-		 * 1. image.fade(0, ...) will have no effect on the image.
-		 * 2. image.fade(0.5, ...) will increase the transparency by 50%.
-		 * 3. image.fade(1, ...) will make the image completely transparent.
-		 * 
-		 * Note: The transparency is adjusted independently for each pixel.
-		 * 
-		 * @param delta By how much to increase / decrease the transperancy.
-		 */
-		fade(delta: number, callback: ImageCallback): void;
-
-		/**
-		 * Make image completely opaque.
-		 */
-		opacity(callback: ImageCallback): void;
-
-		/**
-		 * Paste an image on top of this image.
-		 * 
-		 * Notes:
-		 * 1. If the pasted image exceeds the bounds of the base image, an exception is thrown.
-		 * 2. img is pasted in the state it was at the time image.paste( ... ) was called, eventhough callback is called asynchronously.
-		 * 3. For transparent images, alpha blending is done according to the equations described here.
-		 * 4. Extra caution is required when using this method in batch mode, as the images may change by the time this operation is called.
-		 * 
-		 * @param left Coordinates of the left corner of the pasted image.
-		 * @param top Coordinates of the top corner of the pasted image.
-		 * @param img The image to paste.
-		 */
-		paste(left: number, top: number, img: Image, callback: ImageCallback): void;
-
-		/**
-		 * Set the color of a pixel.
-		 * 
-		 * Notes:
-		 * 1. If the coordinates exceed the bounds of the image, an exception is thrown.
-		 * 2. Extra caution is required when using this method in batch mode, as the dimensions of the image may change by the time this operation is called.
-		 * 
-		 * @param left Coordinates of the pixel from the left corner of the image.
-		 * @param top Coordinates of the pixel from the top corner of the image.
-		 * @param color Color of the pixel to set.
-		 */
-		setPixel(left: number, top: number, color: Color, callback: ImageCallback): void;
-
-		/**
-		 * Set the metadata in an image. This is currently only supported for PNG files. Sets a tEXt chunk with the key lwip_data and comment as the given string. If called with a null parameter, removes existing metadata from the image, if present.
-		 * @param metadata A string of arbitrary length, or null.
-		 */
-		setMetaData(metadata: string): void;
-
-		// Getters
-
-		/**
-		 * Return the image's width in pixels.
-		 */
-		width(): number;
-
-		/**
-		 * Return the image's height in pixels.
-		 */
-		height(): number;
-
-		/**
-		 * Return the color of the pixel at the (left, top) coordinate.
-		 */
-		getPixel(left: number, top: number): ColorObject;
-
-		/**
-		 * Clone the image into a new image object.
-		 * 
-		 * Note: The image is cloned to the state it was at the time image.clone( ... ) was called, eventhough callback is called asynchronously.
-		 */
-		clone(callback: ImageCallback): void;
-
-		/**
-		 * Copy an area of the image into a new image object.
-		 * 
-		 * Note: The sub-image is extracted from the original image in the state it was at the time image.extract( ... ) was called, eventhough callback is called asynchronously.
-		 */
-		extract(left: number, top: number, right: number, bottom: number, callback: ImageCallback): void;
-
-		/**
-		 * Get encoded binary image data as a NodeJS Buffer.
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 */
-		toBuffer(format: "jpg", callback: BufferCallback): void;
-
-		/**
-		 * Get encoded binary image data as a NodeJS Buffer.
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		toBuffer(format: "jpg", params: JpegBufferParams, callback: BufferCallback): void;
-
-		/**
-		 * Get encoded binary image data as a NodeJS Buffer.
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 */
-		toBuffer(format: "png", callback: BufferCallback): void;
-
-		/**
-		 * Get encoded binary image data as a NodeJS Buffer.
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		toBuffer(format: "png", params: PngBufferParams, callback: BufferCallback): void;
-
-		/**
-		 * Get encoded binary image data as a NodeJS Buffer.
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 */
-		toBuffer(format: "gif", callback: BufferCallback): void;
-
-		/**
-		 * Get encoded binary image data as a NodeJS Buffer.
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		toBuffer(format: "gif", params: GifBufferParams, callback: BufferCallback): void;
-
-		/**
-		 * Get encoded binary image data as a NodeJS Buffer.
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 */
-		toBuffer(format: string, callback: BufferCallback): void;
-
-		/**
-		 * Get encoded binary image data as a NodeJS Buffer.
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		toBuffer(format: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: BufferCallback): void;
-
-		/**
-		 * Write encoded binary image data directly to a file.
-		 * 
-		 * @param path Path of file to write.
-		 */
-		writeFile(path: string, callback: ImageCallback): void;
-
-		/**
-		 * Write encoded binary image data directly to a file.
-		 * 
-		 * @param path Path of file to write.
-		 * @param params Format-specific parameters.
-		 */
-		writeFile(path: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: ImageCallback): void;
-
-		/**
-		 * Write encoded binary image data directly to a file.
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 */
-		writeFile(path: string, format: "jpg", callback: ImageCallback): void;
-
-		/**
-		 * Write encoded binary image data directly to a file.
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		writeFile(path: string, format: "jpg", params: JpegBufferParams, callback: ImageCallback): void;
-
-		/**
-		 * Write encoded binary image data directly to a file.
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 */
-		writeFile(path: string, format: "png", callback: ImageCallback): void;
-
-		/**
-		 * Write encoded binary image data directly to a file.
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		writeFile(path: string, format: "png", params: PngBufferParams, callback: ImageCallback): void;
-
-		/**
-		 * Write encoded binary image data directly to a file.
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 */
-		writeFile(path: string, format: "gif", callback: ImageCallback): void;
-
-		/**
-		 * Write encoded binary image data directly to a file.
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		writeFile(path: string, format: "gif", params: GifBufferParams, callback: ImageCallback): void;
-
-		/**
-		 * Write encoded binary image data directly to a file.
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 */
-		writeFile(path: string, format: string, callback: ImageCallback): void;
-
-		/**
-		 * Write encoded binary image data directly to a file.
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		writeFile(path: string, format: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: ImageCallback): void;
-
-		/**
-		 * Get the textual metadata from an image. This is currently only supported for tEXt chunks in PNG images, and will get the first tEXt chunk found with the key lwip_data. If none is found, returns null.
-		 */
-		getMetaData<T>(): T;
-
-		// Obtaining a batch object
-
-		/**
-		 * Obtain a batch object from the image
-		 */
-		batch(): Batch;
-	}
-
-	interface Batch {
-		// Using a batch object
-
-		/**
-		 * Resize
-		 * @param Width in pixels.
-		 */
-		resize(width: number): Batch;
-
-		/**
-		 * Resize
-		 * @param Width in pixels.
-		 * @param Interpolation method.
-		 */
-		resize(width: number, inter: string): Batch;
-
-		/**
-		 * Resize
-		 * @param Width in pixels.
-		 * @param Height in pixels.
-		 */
-		resize(width: number, height: number): Batch;
-
-		/**
-		 * Resize
-		 * @param Width in pixels.
-		 * @param Height in pixels.
-		 * @param Interpolation method.
-		 */
-		resize(width: number, height: number, inter: string): Batch;
-
-		/**
-		 * Scale
-		 * @param wRatio Width scale ratio.
-		 */
-		scale(wRatio: number): Batch;
-		
-		/**
-		 * Scale
-		 * @param wRatio Width scale ratio.
-		 * @param inter Interpolation method.
-		 */
-		scale(wRatio: number, inter: string): Batch;
-		
-		/**
-		 * Scale
-		 * @param wRatio Width scale ratio.
-		 * @param hRatio Height scale ratio.
-		 */
-		scale(wRatio: number, hRatio: number): Batch;
-		
-		/**
-		 * Scale
-		 * @param wRatio Width scale ratio.
-		 * @param hRatio Height scale ratio.
-		 * @param inter Interpolation method.
-		 */
-		scale(wRatio: number, hRatio: number, inter: string): Batch;
-		
-		/**
-		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 */
-		contain(width: number, height: number): Batch;
-
-		/**
-		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 * @param color Color of the canvas.
-		 */
-		contain(width: number, height: number, color: Color): Batch;
-
-		/**
-		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 * @param inter Interpolation method.
-		 */
-		contain(width: number, height: number, inter: string): Batch;
-
-		/**
-		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 * @param color Color of the canvas.
-		 * @param inter Interpolation method.
-		 */
-		contain(width: number, height: number, color: Color, inter: string): Batch;
-
-		/**
-		 * Cover a canvas with the image. The image will be resized to the smallest possible size such that both its dimensions are bigger than the canvas's dimensions. Margins of the image exceeding the canvas will be discarded.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 */
-		cover(width: number, height: number): Batch;
-
-		/**
-		 * Cover a canvas with the image. The image will be resized to the smallest possible size such that both its dimensions are bigger than the canvas's dimensions. Margins of the image exceeding the canvas will be discarded.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 * @param inter Interpolation method.
-		 */
-		cover(width: number, height: number, inter: string): Batch;
-
-		/**
-		 * Rotate
-		 * @param degs Clockwise rotation degrees.
-		 */
-		rotate(degs: number): Batch;
-
-		/**
-		 * Rotate
-		 * @param degs Clockwise rotation degrees.
-		 * @param color Color of the canvas.
-		 */
-		rotate(degs: number, color: Color): Batch;
-
-		/**
-		 * Crop with rectangle coordinates
-		 */
-		crop(left: number, top: number, right: number, bottom: number): Batch;
-		
-		/**
-		 * Crop a rectangle from center
-		 * @param width Width of the rectangle to crop from the center of the image.
-		 * @param height Height of the rectangle to crop from the center of the image.
-		 */
-		crop(width: number, height: number): Batch;
-
-		/**
-		 * Gaussian blur.
-		 * @param sigma Standard deviation of the Gaussian filter.
-		 */
-		blur(sigma: number): Batch;
-
-		/**
-		 * Inverse diffusion shapren.
-		 * @param amplitude Sharpening amplitude.
-		 */
-		sharpen(amplitude: number): Batch;
-
-		/**
-		 * Mirror an image along the 'x' axis, 'y' axis or both.
-		 * @param axes 'x', 'y' or 'xy' (case sensitive).
-		 */
-		mirror(axes: string): Batch;
-
-		/**
-		 * Alias of mirror. Mirror an image along the 'x' axis, 'y' axis or both.
-		 * @param axes 'x', 'y' or 'xy' (case sensitive).
-		 */
-		flip(axes: string): Batch;
-
-		/**
-		 * Add a colored border to the image.
-		 * @param width Border width in pixels.
-		 */
-		border(width: number): Batch;
-
-		/**
-		 * Add a colored border to the image.
-		 * @param width Border width in pixels.
-		 * @param color Color of the border.
-		 */
-		border(width: number, color: Color): Batch;
-
-		/**
-		 * Pad image edges with colored pixels.
-		 * @param left Number of pixels to add to left edge.
-		 * @param top Number of pixels to add to top edge.
-		 * @param right Number of pixels to add to right edge.
-		 * @param bottom Number of pixels to add to bottom edge.
-		 */
-		pad(left: number, top: number, right: number, bottom: number): Batch;
-
-		/**
-		 * Pad image edges with colored pixels.
-		 * @param left Number of pixels to add to left edge.
-		 * @param top Number of pixels to add to top edge.
-		 * @param right Number of pixels to add to right edge.
-		 * @param bottom Number of pixels to add to bottom edge.
-		 * @param color Color of the padding.
-		 */
-		pad(left: number, top: number, right: number, bottom: number, color: Color): Batch;
-
-		/**
-		 * Adjust image saturation.
-		 * 
-		 * Examples:
-		 * 1. image.saturate(0, ...) will have no effect on the image.
-		 * 2. image.saturate(0.5, ...) will increase the saturation by 50%.
-		 * 3. image.saturate(-1, ...) will decrease the saturation by 100%, effectively desaturating the image.
-		 * 
-		 * @param delta By how much to increase / decrease the saturation.
-		 */
-		saturate(delta: number): Batch;
-
-		/**
-		 * Adjust image lightness.
-		 * 
-		 * Examples:
-		 * 1. image.lighten(0, ...) will have no effect on the image.
-		 * 2. image.lighten(0.5, ...) will increase the lightness by 50%.
-		 * 3. image.lighten(-1, ...) will decrease the lightness by 100%, effectively making the image black.
-		 * 
-		 * @param delta By how much to increase / decrease the lightness.
-		 */
-		lighten(delta: number): Batch;
-
-		/**
-		 * Adjust image lightness. Equivalent to image.lighten(-delta, callback).
-		 * @param delta By how much to increase / decrease the lightness.
-		 */
-		darken(delta: number): Batch;
-
-		/**
-		 * Adjust image hue.
-		 * 
-		 * Examples:
-		 * 1. image.hue(0, ...) will have no effect on the image.
-		 * 2. image.hue(100, ...) will shift pixels' hue by 100 degrees.
-		 * 
-		 * Note: The hue is shifted in a circular manner in the range [0,360] for each pixel individually.
-		 * 
-		 * @param shift By how many degrees to shift each pixel's hue.
-		 */
-		hue(shift: number): Batch;
-
-		/**
-		 * Adjust image transperancy.
-		 * 
-		 * Examples:
-		 * 1. image.fade(0, ...) will have no effect on the image.
-		 * 2. image.fade(0.5, ...) will increase the transparency by 50%.
-		 * 3. image.fade(1, ...) will make the image completely transparent.
-		 * 
-		 * Note: The transparency is adjusted independently for each pixel.
-		 * 
-		 * @param delta By how much to increase / decrease the transperancy.
-		 */
-		fade(delta: number): Batch;
-
-		/**
-		 * Make image completely opaque.
-		 */
-		opacity(callback: ImageCallback): void;
-
-		/**
-		 * Paste an image on top of this image.
-		 * 
-		 * Notes:
-		 * 1. If the pasted image exceeds the bounds of the base image, an exception is thrown.
-		 * 2. img is pasted in the state it was at the time image.paste( ... ) was called, eventhough callback is called asynchronously.
-		 * 3. For transparent images, alpha blending is done according to the equations described here.
-		 * 4. Extra caution is required when using this method in batch mode, as the images may change by the time this operation is called.
-		 * 
-		 * @param left Coordinates of the left corner of the pasted image.
-		 * @param top Coordinates of the top corner of the pasted image.
-		 * @param img The image to paste.
-		 */
-		paste(left: number, top: number, img: Image): Batch;
-
-		/**
-		 * Set the color of a pixel.
-		 * 
-		 * Notes:
-		 * 1. If the coordinates exceed the bounds of the image, an exception is thrown.
-		 * 2. Extra caution is required when using this method in batch mode, as the dimensions of the image may change by the time this operation is called.
-		 * 
-		 * @param left Coordinates of the pixel from the left corner of the image.
-		 * @param top Coordinates of the pixel from the top corner of the image.
-		 * @param color Color of the pixel to set.
-		 */
-		setPixel(left: number, top: number, color: Color): Batch;
-
-		/**
-		 * Set the metadata in an image. This is currently only supported for PNG files. Sets a tEXt chunk with the key lwip_data and comment as the given string. If called with a null parameter, removes existing metadata from the image, if present.
-		 * @param metadata A string of arbitrary length, or null.
-		 */
-		setMetaData(metadata: string): void;
-
-		// Executing a batch
-
-		/**
-		 * Execute batch and obtain the manipulated image object
-		 */
-		exec(callback: ImageCallback): void;
-
-		/**
-		 * Execute batch and obtain a Buffer object
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 */
-		toBuffer(format: "jpg", callback: BufferCallback): void;
-
-		/**
-		 * Execute batch and obtain a Buffer object
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		toBuffer(format: "jpg", params: JpegBufferParams, callback: BufferCallback): void;
-
-		/**
-		 * Execute batch and obtain a Buffer object
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 */
-		toBuffer(format: "png", callback: BufferCallback): void;
-
-		/**
-		 * Execute batch and obtain a Buffer object
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		toBuffer(format: "png", params: PngBufferParams, callback: BufferCallback): void;
-
-		/**
-		 * Execute batch and obtain a Buffer object
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 */
-		toBuffer(format: "gif", callback: BufferCallback): void;
-
-		/**
-		 * Execute batch and obtain a Buffer object
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		toBuffer(format: "gif", params: GifBufferParams, callback: BufferCallback): void;
-
-		/**
-		 * Execute batch and obtain a Buffer object
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 */
-		toBuffer(format: string, callback: BufferCallback): void;
-
-		/**
-		 * Execute batch and obtain a Buffer object
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		toBuffer(format: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: BufferCallback): void;
-
-		/**
-		 * Execute batch and write to file
-		 * 
-		 * @param path Path of file to write.
-		 */
-		writeFile(path: string, callback: ImageCallback): void;
-
-		/**
-		 * Execute batch and write to file
-		 * 
-		 * @param path Path of file to write.
-		 * @param params Format-specific parameters.
-		 */
-		writeFile(path: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: ImageCallback): void;
-
-		/**
-		 * Execute batch and write to file
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 */
-		writeFile(path: string, format: "jpg", callback: ImageCallback): void;
-
-		/**
-		 * Execute batch and write to file
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		writeFile(path: string, format: "jpg", params: JpegBufferParams, callback: ImageCallback): void;
-
-		/**
-		 * Execute batch and write to file
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 */
-		writeFile(path: string, format: "png", callback: ImageCallback): void;
-
-		/**
-		 * Execute batch and write to file
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		writeFile(path: string, format: "png", params: PngBufferParams, callback: ImageCallback): void;
-
-		/**
-		 * Execute batch and write to file
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 */
-		writeFile(path: string, format: "gif", callback: ImageCallback): void;
-
-		/**
-		 * Execute batch and write to file
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		writeFile(path: string, format: "gif", params: GifBufferParams, callback: ImageCallback): void;
-
-		/**
-		 * Execute batch and write to file
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 */
-		writeFile(path: string, format: string, callback: ImageCallback): void;
-
-		/**
-		 * Execute batch and write to file
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		writeFile(path: string, format: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: ImageCallback): void;
-	}
-}
diff --git a/lwip/tsconfig.json b/lwip/tsconfig.json
new file mode 100644
index 0000000000..7cd139dc86
--- /dev/null
+++ b/lwip/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "lwip-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/lz-string/lz-string.d.ts b/lz-string/index.d.ts
similarity index 100%
rename from lz-string/lz-string.d.ts
rename to lz-string/index.d.ts
diff --git a/lz-string/lz-string-tests.ts b/lz-string/lz-string-tests.ts
index 48d4616458..e26160f5f4 100644
--- a/lz-string/lz-string-tests.ts
+++ b/lz-string/lz-string-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="lz-string.d.ts" />
+
 
 var input = "Someting to compress";
 var encoded: string;
diff --git a/lz-string/tsconfig.json b/lz-string/tsconfig.json
new file mode 100644
index 0000000000..688a1ffba6
--- /dev/null
+++ b/lz-string/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "lz-string-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mCustomScrollbar/index.d.ts b/mCustomScrollbar/index.d.ts
new file mode 100644
index 0000000000..8be0fda1bd
--- /dev/null
+++ b/mCustomScrollbar/index.d.ts
@@ -0,0 +1,192 @@
+// Type definitions for mCustomScrollbar 2.8.2
+// Project: https://github.com/malihu/malihu-custom-scrollbar-plugin
+// Definitions by: Sarah Williams <https://github.com/flurg>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace MCustomScrollbar {
+    interface CustomScrollbarOptions {
+        /**
+        * Set the width of your content (overwrites CSS width), value in pixels (integer) or percentage (string)
+        */
+        setWidth?: any;
+        /**
+        * Set the height of your content (overwirtes CSS height), value in pixels (integer) or percentage (string)
+        */
+        setHeight?: any;
+        /**
+         * Define content’s scrolling axis (the type of scrollbars added to the element: vertical and/of horizontal).
+         * Available values: "y", "x", "yx". y -vertical, x - horizontal
+         */
+        axis?: string;
+        /**
+        * Always keep scrollbar(s) visible, even when there’s nothing to scroll.
+        * 0 – disable (default)
+        * 1 – keep dragger rail visible
+        * 2 – keep all scrollbar components (dragger, rail, buttons etc.) visible
+        */
+        alwaysShowScrollbar?: number;
+        /**
+        * Enable or disable auto-expanding the scrollbar when cursor is over or dragging the scrollbar.
+        */
+        autoExpandScrollbar?: boolean;
+        /**
+        * Scrolling inertia (easing), value in milliseconds (0 for no scrolling inertia)
+        */
+        scrollInertia?: number;
+        /**
+        * Mouse wheel support, value: true, false
+        */
+        mouseWheel?: boolean;
+        /**
+        * Mouse wheel scrolling pixels amount, value in pixels (integer) or "auto" (script calculates and sets pixels amount according to content length)
+        */
+        mouseWheelPixels?: any;
+        /**
+        * Auto-adjust scrollbar height/width according to content, values: true, false
+        */
+        autoDraggerLength?: boolean;
+        /**
+        * Automatically hide the scrollbar when idle or mouse is not over the content
+        */
+        autoHideScrollbar?: boolean;
+        scrollButtons?: {
+            /**
+             * Enable or disable scroll buttons.
+             */
+            enable?: boolean;
+            /**
+            * Scroll buttons scroll type, values: "continuous" (scroll continuously while pressing the button), "pixels" (scrolls by a fixed number of pixels on each click")
+            */
+            scrollType?: string;
+            /**
+            * Scroll buttons continuous scrolling speed, integer value or "auto" (script calculates and sets the speed according to content length)
+            */
+            scrollSpeed?: number | string;
+            /**
+            * Scroll buttons pixels scrolling amount, value in pixels or "auto"
+            */
+            scrollAmount?: number | string;
+        }
+    advanced?: {
+            /**
+            * Update scrollbars on browser resize (for fluid content blocks and layouts based on percentages), values: true, false. Set to false only when you content has fixed dimensions
+            */
+            updateOnBrowserResize?: boolean;
+            /**
+            * Auto-update scrollbars on content resize (useful when adding/changing content progrmatically), value: true, false. Setting this to true makes the script check for content
+            * length changes (every few milliseconds) and automatically call plugin's update method to adjust the scrollbar accordingly
+            */
+            updateOnContentResize?: boolean;
+            /**
+            * Auto-expanding content's width on horizontal scrollbars, values: true, false. Set to true if you have horizontal scrollbr on content that change on-the-fly. Demo contains
+            * blocks with images and horizontal scrollbars that use this option parameter
+            */
+            autoExpandHorizontalScroll?: boolean;
+            /**
+            * Auto-scrolling on elements that have focus (e.g. scrollbar automatically scrolls to form text fields when the TAB key is pressed), values: true, false
+            */
+            autoScrollOnFocus?: boolean;
+            /**
+            * Normalize mouse wheel delta (-1/1), values: true, false
+            */
+            normalizeMouseWheelDelta?: boolean;
+        }
+    /**
+    * Additional scrolling method by touch-swipe content (for touch enabled devices), value: true, false
+    */
+    contentTouchScroll?: boolean;
+        /**
+        * All of the following callbacks option have examples in the callback demo - http://manos.malihu.gr/tuts/custom-scrollbar-plugin/callbacks_example.html
+        */
+        callbacks?: {
+            /**
+            * User defined callback function, triggered on scroll start event. You can call your own function(s) each time a scroll event begins
+            */
+            onScrollStart?: () => void;
+            /**
+            * User defined callback function, triggered on scroll event. Call your own function(s) each time a scroll event completes
+            */
+            onScroll?: () => void;
+            /**
+            * A function to call when scrolling is completed and content is scrolled all the way to the end (bottom/right)
+            */
+            onTotalScroll?: () => void;
+            /**
+            * A function to call when scrolling is completed and content is scrolled back to the beginning (top/left)
+            */
+            onTotalScrollBack?: () => void;
+            /**
+            * Set an offset for which the onTotalScroll callback is triggered.
+            * Its value is in pixels.
+            */
+            onTotalScrollOffset?: number;
+            /**
+            * Set an offset for which the onTotalScrollBack callback is triggered.
+            * Its value is in pixels
+            */
+            onTotalScrollBackOffset?: number;
+            /**
+            * User defined callback function, triggered while scrolling
+            */
+            whileScrolling?: () => void;
+            /**
+            * Set the behavior of calling onTotalScroll and onTotalScrollBack offsets.
+            * By default, callback offsets will trigger repeatedly while content is scrolling within the offsets.
+            * Set alwaysTriggerOffsets: false when you need to trigger onTotalScroll and onTotalScrollBack callbacks once, each time scroll end or beginning is reached.
+            */
+            alwaysTriggerOffsets?: boolean;
+        }
+    /**
+    * Set a scrollbar ready-to-use theme. See themes demo for all themes - http://manos.malihu.gr/tuts/custom-scrollbar-plugin/scrollbar_themes_demo.html
+    */
+    theme?: string;
+    }
+
+    interface ScrollToParameterOptions {
+        /**
+        * Scroll-to animation speed, value in milliseconds
+        */
+        scrollInertia?: number;
+        /**
+        * Scroll-to animation easing, values: "linear", "easeOut", "easeInOut".
+        */
+        scrollEasing?: string;
+        /**
+        * Scroll scrollbar dragger (instead of content) to a number of pixels, values: true, false
+        */
+        moveDragger?: boolean;
+        /**
+        * Set a timeout for the method (the default timeout is 60 ms in order to work with automatic scrollbar update), value in milliseconds.
+        */
+        timeout?: number;
+        /**
+        * Trigger user defined callback after scroll-to completes, value: true, false
+        */
+        callbacks?: boolean;
+    }
+}
+
+interface JQuery {
+    /**
+    * Calls specified methods on the scrollbar "update", "stop", "disable", "destroy"
+    *
+    * @param method Method name to call on scrollbar e.g. "update", "stop"
+    */
+    mCustomScrollbar(method: string): JQuery;
+    /**
+    * Calls the scrollTo method on the scrollbar
+    *
+    * @param scrollTo Method name as a string "scrollTo"
+    * @param parameter String or pixel integer value to specify where to scroll to e.g. "bottom", "top" or 20
+    * @param options Override default options
+    */
+    mCustomScrollbar(scrollTo: string, parameter: any, options?: MCustomScrollbar.ScrollToParameterOptions): JQuery;
+    /**
+    * Creates a new mCustomScrollbar with the specified or default options
+    *
+    * @param options Override default options
+    */
+    mCustomScrollbar(options?: MCustomScrollbar.CustomScrollbarOptions): JQuery;
+}
diff --git a/mCustomScrollbar/mCustomScrollbar-tests.ts b/mCustomScrollbar/mCustomScrollbar-tests.ts
index 7dcf793564..e2c789abe9 100644
--- a/mCustomScrollbar/mCustomScrollbar-tests.ts
+++ b/mCustomScrollbar/mCustomScrollbar-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="mCustomScrollbar.d.ts" />
+/// <reference types="jquery" />
+
 
 class SimpleTest {
     element: JQuery;
diff --git a/mCustomScrollbar/mCustomScrollbar.d.ts b/mCustomScrollbar/mCustomScrollbar.d.ts
deleted file mode 100644
index 4aad109c66..0000000000
--- a/mCustomScrollbar/mCustomScrollbar.d.ts
+++ /dev/null
@@ -1,192 +0,0 @@
-// Type definitions for mCustomScrollbar 2.8.2
-// Project: https://github.com/malihu/malihu-custom-scrollbar-plugin
-// Definitions by: Sarah Williams <https://github.com/flurg>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace MCustomScrollbar {
-    interface CustomScrollbarOptions {
-        /**
-        * Set the width of your content (overwrites CSS width), value in pixels (integer) or percentage (string)
-        */
-        setWidth?: any;
-        /**
-        * Set the height of your content (overwirtes CSS height), value in pixels (integer) or percentage (string)
-        */
-        setHeight?: any;
-        /**
-         * Define content’s scrolling axis (the type of scrollbars added to the element: vertical and/of horizontal).
-         * Available values: "y", "x", "yx". y -vertical, x - horizontal
-         */
-        axis?: string;
-        /**
-        * Always keep scrollbar(s) visible, even when there’s nothing to scroll.
-        * 0 – disable (default)
-        * 1 – keep dragger rail visible
-        * 2 – keep all scrollbar components (dragger, rail, buttons etc.) visible
-        */
-        alwaysShowScrollbar?: number;
-        /**
-        * Enable or disable auto-expanding the scrollbar when cursor is over or dragging the scrollbar.
-        */
-        autoExpandScrollbar?: boolean;
-        /**
-        * Scrolling inertia (easing), value in milliseconds (0 for no scrolling inertia)
-        */
-        scrollInertia?: number;
-        /**
-        * Mouse wheel support, value: true, false
-        */
-        mouseWheel?: boolean;
-        /**
-        * Mouse wheel scrolling pixels amount, value in pixels (integer) or "auto" (script calculates and sets pixels amount according to content length)
-        */
-        mouseWheelPixels?: any;
-        /**
-        * Auto-adjust scrollbar height/width according to content, values: true, false
-        */
-        autoDraggerLength?: boolean;
-        /**
-        * Automatically hide the scrollbar when idle or mouse is not over the content
-        */
-        autoHideScrollbar?: boolean;
-        scrollButtons?: {
-            /**
-             * Enable or disable scroll buttons.
-             */
-            enable?: boolean;
-            /**
-            * Scroll buttons scroll type, values: "continuous" (scroll continuously while pressing the button), "pixels" (scrolls by a fixed number of pixels on each click")
-            */
-            scrollType?: string;
-            /**
-            * Scroll buttons continuous scrolling speed, integer value or "auto" (script calculates and sets the speed according to content length)
-            */
-            scrollSpeed?: number | string;
-            /**
-            * Scroll buttons pixels scrolling amount, value in pixels or "auto"
-            */
-            scrollAmount?: number | string;
-        }
-    advanced?: {
-            /**
-            * Update scrollbars on browser resize (for fluid content blocks and layouts based on percentages), values: true, false. Set to false only when you content has fixed dimensions
-            */
-            updateOnBrowserResize?: boolean;
-            /**
-            * Auto-update scrollbars on content resize (useful when adding/changing content progrmatically), value: true, false. Setting this to true makes the script check for content
-            * length changes (every few milliseconds) and automatically call plugin's update method to adjust the scrollbar accordingly
-            */
-            updateOnContentResize?: boolean;
-            /**
-            * Auto-expanding content's width on horizontal scrollbars, values: true, false. Set to true if you have horizontal scrollbr on content that change on-the-fly. Demo contains
-            * blocks with images and horizontal scrollbars that use this option parameter
-            */
-            autoExpandHorizontalScroll?: boolean;
-            /**
-            * Auto-scrolling on elements that have focus (e.g. scrollbar automatically scrolls to form text fields when the TAB key is pressed), values: true, false
-            */
-            autoScrollOnFocus?: boolean;
-            /**
-            * Normalize mouse wheel delta (-1/1), values: true, false
-            */
-            normalizeMouseWheelDelta?: boolean;
-        }
-    /**
-    * Additional scrolling method by touch-swipe content (for touch enabled devices), value: true, false
-    */
-    contentTouchScroll?: boolean;
-        /**
-        * All of the following callbacks option have examples in the callback demo - http://manos.malihu.gr/tuts/custom-scrollbar-plugin/callbacks_example.html
-        */
-        callbacks?: {
-            /**
-            * User defined callback function, triggered on scroll start event. You can call your own function(s) each time a scroll event begins
-            */
-            onScrollStart?: () => void;
-            /**
-            * User defined callback function, triggered on scroll event. Call your own function(s) each time a scroll event completes
-            */
-            onScroll?: () => void;
-            /**
-            * A function to call when scrolling is completed and content is scrolled all the way to the end (bottom/right)
-            */
-            onTotalScroll?: () => void;
-            /**
-            * A function to call when scrolling is completed and content is scrolled back to the beginning (top/left)
-            */
-            onTotalScrollBack?: () => void;
-            /**
-            * Set an offset for which the onTotalScroll callback is triggered.
-            * Its value is in pixels.
-            */
-            onTotalScrollOffset?: number;
-            /**
-            * Set an offset for which the onTotalScrollBack callback is triggered.
-            * Its value is in pixels
-            */
-            onTotalScrollBackOffset?: number;
-            /**
-            * User defined callback function, triggered while scrolling
-            */
-            whileScrolling?: () => void;
-            /**
-            * Set the behavior of calling onTotalScroll and onTotalScrollBack offsets.
-            * By default, callback offsets will trigger repeatedly while content is scrolling within the offsets.
-            * Set alwaysTriggerOffsets: false when you need to trigger onTotalScroll and onTotalScrollBack callbacks once, each time scroll end or beginning is reached.
-            */
-            alwaysTriggerOffsets?: boolean;
-        }
-    /**
-    * Set a scrollbar ready-to-use theme. See themes demo for all themes - http://manos.malihu.gr/tuts/custom-scrollbar-plugin/scrollbar_themes_demo.html
-    */
-    theme?: string;
-    }
-
-    interface ScrollToParameterOptions {
-        /**
-        * Scroll-to animation speed, value in milliseconds
-        */
-        scrollInertia?: number;
-        /**
-        * Scroll-to animation easing, values: "linear", "easeOut", "easeInOut".
-        */
-        scrollEasing?: string;
-        /**
-        * Scroll scrollbar dragger (instead of content) to a number of pixels, values: true, false
-        */
-        moveDragger?: boolean;
-        /**
-        * Set a timeout for the method (the default timeout is 60 ms in order to work with automatic scrollbar update), value in milliseconds.
-        */
-        timeout?: number;
-        /**
-        * Trigger user defined callback after scroll-to completes, value: true, false
-        */
-        callbacks?: boolean;
-    }
-}
-
-interface JQuery {
-    /**
-    * Calls specified methods on the scrollbar "update", "stop", "disable", "destroy"
-    *
-    * @param method Method name to call on scrollbar e.g. "update", "stop"
-    */
-    mCustomScrollbar(method: string): JQuery;
-    /**
-    * Calls the scrollTo method on the scrollbar
-    *
-    * @param scrollTo Method name as a string "scrollTo"
-    * @param parameter String or pixel integer value to specify where to scroll to e.g. "bottom", "top" or 20
-    * @param options Override default options
-    */
-    mCustomScrollbar(scrollTo: string, parameter: any, options?: MCustomScrollbar.ScrollToParameterOptions): JQuery;
-    /**
-    * Creates a new mCustomScrollbar with the specified or default options
-    *
-    * @param options Override default options
-    */
-    mCustomScrollbar(options?: MCustomScrollbar.CustomScrollbarOptions): JQuery;
-}
diff --git a/mCustomScrollbar/tsconfig.json b/mCustomScrollbar/tsconfig.json
new file mode 100644
index 0000000000..53bea880b5
--- /dev/null
+++ b/mCustomScrollbar/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mCustomScrollbar-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/magic-number/index.d.ts b/magic-number/index.d.ts
new file mode 100644
index 0000000000..4488c9827e
--- /dev/null
+++ b/magic-number/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for magic-number
+// Project: https://github.com/stpettersens/node-magic-number
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export declare function detectFile(file: string): string;
diff --git a/magic-number/magic-number-tests.ts b/magic-number/magic-number-tests.ts
index ac0b599820..16cb46c526 100644
--- a/magic-number/magic-number-tests.ts
+++ b/magic-number/magic-number-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../node/node.d.ts" />
-/// <reference path="magic-number.d.ts" />
+/// <reference types="node" />
 
 import fs = require('fs');
 import magic = require('magic-number');
diff --git a/magic-number/magic-number.d.ts b/magic-number/magic-number.d.ts
deleted file mode 100644
index 001b47c70b..0000000000
--- a/magic-number/magic-number.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Type definitions for magic-number
-// Project: https://github.com/stpettersens/node-magic-number
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "magic-number" {
-    export function detectFile(file: string): string;
-}
diff --git a/magic-number/tsconfig.json b/magic-number/tsconfig.json
new file mode 100644
index 0000000000..bf7eb3d71f
--- /dev/null
+++ b/magic-number/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "magic-number-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/magicsuggest/index.d.ts b/magicsuggest/index.d.ts
new file mode 100644
index 0000000000..8433900a69
--- /dev/null
+++ b/magicsuggest/index.d.ts
@@ -0,0 +1,467 @@
+// Type definitions for MagicSuggest 2.1.4
+// Project: http://nicolasbize.com/magicsuggest
+// Definitions by: Leonardo Chaia <http://github.com/leonardochaia>
+// Definitions: http://github.com/leonardochaia/DefinitelyTyped
+
+/// <reference types="jquery" />
+interface JQuery {
+    /**
+    * Initialize MagicSuggest on this selector
+    */
+    magicSuggest(configurationObject?: MagicSuggest.Configuration): MagicSuggest.Instance;
+}
+
+declare namespace MagicSuggest {
+    interface Configuration {
+        /**********  CONFIGURATION PROPERTIES ************/
+        /**
+         * Restricts or allows the user to validate typed entries.
+         * Defaults to true.
+         */
+        allowFreeEntries?: boolean;
+
+        /**
+         * Restricts or allows the user to add the same entry more than once
+         * Defaults to false.
+         */
+        allowDuplicates?: boolean;
+
+        /**
+         * Additional config object passed to each $.ajax call
+         */
+        ajaxConfig?: JQueryAjaxSettings;
+
+        /**
+         * If a single suggestion comes out, it is preselected.
+         */
+        autoSelect?: boolean;
+
+        /**
+         * Auto select the first matching item with multiple items shown
+         */
+        selectFirst?: boolean;
+
+        /**
+         * Allow customization of query parameter
+         */
+        queryParam?: string;
+
+        /**
+         * A function triggered just before the ajax request is sent, similar to jQuery
+         */
+        beforeSend?: () => void;
+
+        /**
+         * A custom CSS class to apply to the field's underlying element.
+         */
+        cls?: string;
+
+        /**
+         * JSON Data source used to populate the combo box. 3 options are available here:
+         * No Data Source (default)
+         *    When left null, the combo box will not suggest anything. It can still enable the user to enter
+         *    multiple entries if allowFreeEntries is * set to true (default).
+         * Static Source
+         *    You can pass an array of JSON objects, an array of strings or even a single CSV string as the
+         *    data source.For ex. data: [* {id:0,name:"Paris"}, {id: 1, name: "New York"}]
+         *    You can also pass any json object with the results property containing the json array.
+         * Url
+         *     You can pass the url from which the component will fetch its JSON data.Data will be fetched
+         *     using a POST ajax request that will * include the entered text as 'query' parameter. The results
+         *     fetched from the server can be:
+         *     - an array of JSON objects (ex: [{id:...,name:...},{...}])
+         *     - a string containing an array of JSON objects ready to be parsed (ex: "[{id:...,name:...},{...}]")
+         *     - a JSON object whose data will be contained in the results property
+         *      (ex: {results: [{id:...,name:...},{...}]
+         * Function
+         *     You can pass a function which returns an array of JSON objects  (ex: [{id:...,name:...},{...}])
+         *     The function can return the JSON data or it can use the first argument as function to handle the data.
+         *     Only one (callback function or return value) is needed for the function to succeed.
+         *     See the following example:
+         *     function (response) { var myjson = [{name: 'test', id: 1}]; response(myjson); return myjson; }
+         */
+        data?: any;
+
+        /**
+         * Additional parameters to the ajax call
+         */
+        dataUrlParams?: Object;
+
+        /**
+         * Start the component in a disabled state.
+         */
+        disabled?: boolean;
+
+        /**
+         * Name of JSON object property that defines the disabled behaviour
+         */
+        disabledField?: string;
+
+        /**
+         * Name of JSON object property displayed in the combo list
+         */
+        displayField?: string;
+
+        /**
+         * Set to false if you only want mouse interaction. In that case the combo will
+         * automatically expand on focus.
+         */
+        editable?: boolean;
+
+        /**
+         * Set starting state for combo.
+         */
+        expanded?: boolean;
+
+        /**
+         * Automatically expands combo on focus.
+         */
+        expandOnFocus?: boolean;
+
+        /**
+         * JSON property by which the list should be grouped
+         */
+        groupBy?: string;
+
+        /**
+         * Set to true to hide the trigger on the right
+         */
+        hideTrigger?: boolean;
+
+        /**
+         * Set to true to highlight search input within displayed suggestions
+         */
+        highlight?: boolean;
+
+        /**
+         * A custom ID for this component
+         */
+        id?: string;
+
+        /**
+         * A class that is added to the info message appearing on the top-right part of the component
+         */
+        infoMsgCls?: string;
+
+        /**
+         * Additional parameters passed out to the INPUT tag. Enables usage of AngularJS's custom tags for ex.
+         */
+        inputCfg?: any;
+
+        /**
+         * The class that is applied to show that the field is invalid
+         */
+        invalidCls?: string;
+
+        /**
+         * Set to true to filter data results according to case. Useless if the data is fetched remotely
+         */
+        matchCase?: boolean;
+
+        /**
+         * Once expanded, the combo's height will take as much room as the # of available results.
+         *    In case there are too many results displayed, this will fix the drop down height.
+         */
+        maxDropHeight?: number;
+
+        /**
+         * Defines how long the user free entry can be. Set to null for no limit.
+         */
+        maxEntryLength?: number;
+
+        /**
+         * A function that defines the helper text when the max entry length has been surpassed.
+         */
+        maxEntryRenderer?: (v?: number) => void;
+
+        /**
+         * The maximum number of results displayed in the combo drop down at once.
+         */
+        maxSuggestions?: number;
+
+        /**
+         * The maximum number of items the user can select if multiple selection is allowed.
+         *    Set to null to remove the limit.
+         */
+        maxSelection?: number;
+
+        /**
+         * A function that defines the helper text when the max selection amount has been reached. The function has a single
+         *    parameter which is the number of selected elements.
+         */
+        maxSelectionRenderer?: (v: number) => void;
+
+        /**
+         * The method used by the ajax request.
+         */
+        method?: string;
+
+        /**
+         * The minimum number of characters the user must type before the combo expands and offers suggestions.
+         */
+        minChars?: number;
+
+        /**
+         * A function that defines the helper text when not enough letters are set. The function has a single
+         *    parameter which is the difference between the required amount of letters and the current one.
+         */
+        minCharsRenderer?: (v: number) => void;
+
+        /**
+         * Whether or not sorting / filtering should be done remotely or locally.
+         * Use either 'local' or 'remote'
+         */
+        mode?: string;
+
+        /**
+         * The name used as a form element.
+         */
+        name?: string;
+
+        /**
+         * The text displayed when there are no suggestions.
+         */
+        noSuggestionText?: string;
+
+        /**
+         * The default placeholder text when nothing has been entered
+         */
+        placeholder?: string;
+
+        /**
+         * A function used to define how the items will be presented in the combo
+         */
+        renderer?: (item: any) => void;
+
+        /**
+         * Whether or not this field should be required
+         */
+        required?: boolean;
+
+        /**
+         * Set to true to render selection as a delimited string
+         */
+        resultAsString?: boolean;
+
+        /**
+         * Text delimiter to use in a delimited string.
+         */
+        resultAsStringDelimiter?: string;
+
+        /**
+         * Name of JSON object property that represents the list of suggested objects
+         */
+        resultsField?: string;
+
+        /**
+         * A custom CSS class to add to a selected item
+         */
+        selectionCls?: string;
+
+        /**
+         * An optional element replacement in which the selection is rendered
+         */
+        selectionContainer?: JQuery;
+
+        /**
+         * Where the selected items will be displayed. Only 'right', 'bottom' and 'inner' are valid values
+         */
+        selectionPosition?: string;
+
+        /**
+         * A function used to define how the items will be presented in the tag list
+         */
+        selectionRenderer?: (item: any) => void;
+
+        /**
+         * Set to true to stack the selectioned items when positioned on the bottom
+         *    Requires the selectionPosition to be set to 'bottom'
+         */
+        selectionStacked?: boolean;
+
+        /**
+         * Direction used for sorting. Only 'asc' and 'desc' are valid values
+         */
+        sortDir?: string;
+
+        /**
+         * name of JSON object property for local result sorting.
+         *    Leave null if you do not wish the results to be ordered or if they are already ordered remotely.
+         */
+        sortOrder?: string;
+
+        /**
+         * If set to boolean; suggestions will have to start by user input (and not simply contain it as a substring)
+         */
+        strictSuggest?: boolean;
+
+        /**
+         * Custom style added to the component container.
+         */
+        style?: string;
+
+        /**
+         * If set to boolean; the combo will expand / collapse when clicked upon
+         */
+        toggleOnClick?: boolean;
+
+
+        /**
+         * Amount (in ms) between keyboard registers.
+         */
+        typeDelay?: number;
+
+        /**
+         * If set to boolean; tab won't blur the component but will be registered as the ENTER key
+         */
+        useTabKey?: boolean;
+
+        /**
+         * If set to boolean; using comma will validate the user's choice
+         */
+        useCommaKey?: boolean;
+
+
+        /**
+         * Determines whether or not the results will be displayed with a zebra table style
+         */
+        useZebraStyle?: boolean;
+
+        /**
+         * initial value for the field
+         */
+        value?: any;
+
+        /**
+         * name of JSON object property that represents its underlying value
+         */
+        valueField?: string;
+
+        /**
+         * regular expression to validate the values against
+         */
+        vregex?: any;
+
+        /**
+         * type to validate against
+         */
+        vtype?: any;
+    }
+
+    interface Instance {
+        /**
+         * Add one or multiple json items to the current selection
+         * @param items - json object or array of json objects
+         * @param isSilent - (optional) set to true to suppress 'selectionchange' event from being triggered
+         */
+        addToSelection(objs: Array<any>, isSilent?: boolean): void;
+
+        /**
+         * Clears the current selection
+         * @param isSilent - (optional) set to true to suppress 'selectionchange' event from being triggered
+         */
+        clear(isSilent?: boolean): void;
+
+        /**
+        * Collapse the drop down part of the combo
+        */
+        collapse(): void;
+
+        /**
+         * Set the component in a disabled state.
+         */
+        disable(): void;
+
+        /**
+        * Empties out the combo user text
+        */
+        empty(): void;
+
+        /**
+        * Set the component in a enable state.
+        */
+        enable(): void;
+
+        /**
+         * Retrieve component enabled status
+         * @return {boolean}
+         */
+        isDisabled(): boolean;
+
+        /**
+         * Checks whether the field is valid or not
+         * @return {boolean}
+         */
+        isValid(): boolean;
+
+        /**
+         * Gets the data params for current ajax request
+         */
+        getDataUrlParams(): Object;
+
+        /**
+         * Gets the name given to the form input
+         */
+        getName(): string;
+
+        /**
+         * Retrieve an array of selected json objects
+         * @return {Array}
+         */
+        getSelection(): Array<any>;
+
+        /**
+         * Retrieve the current text entered by the user
+         */
+        getRawValue(): string;
+
+        /**
+         * Retrieve an array of selected values
+         */
+        getValue(): Array<any>;
+
+        /**
+         * Remove one or multiples json items from the current selection
+         * @param items - json object or array of json objects
+         * @param isSilent - (optional) set to true to suppress 'selectionchange' event from being triggered
+         */
+        removeFromSelection(items: any, isSilent: boolean): void;
+
+        /**
+         * Set up some combo data after it has been rendered
+         * @param data
+         */
+        setData(data: any): void;
+
+        /**
+         * Get current data
+         */
+        getData(): any;
+
+        /**
+         * Sets the name for the input field so it can be fetched in the form
+         * @param name
+         */
+        setName(name: string): void;
+
+        /**
+         * Sets the current selection with the JSON items provided
+         * @param items
+         * @param isSilent - (optional)
+         */
+        setSelection(items: Array<any>, isSilet?: boolean): void;
+
+        /**
+         * Sets a value for the combo box. Value must be an array of values with data type matching valueField one.
+         * @param data
+         */
+        setValue(values: Array<any>): void;
+
+        /**
+         * Sets data params for subsequent ajax requests
+         * @param params
+         */
+        setDataUrlParams(params: any): void;
+
+    }
+}
diff --git a/magicsuggest/magicsuggest-tests.ts b/magicsuggest/magicsuggest-tests.ts
index b41cf9f71e..ab76034122 100644
--- a/magicsuggest/magicsuggest-tests.ts
+++ b/magicsuggest/magicsuggest-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="magicsuggest.d.ts"/>
+/// <reference types="jquery"/>
 
 function basicTest() {
     $('#magicSuggest').magicSuggest();
diff --git a/magicsuggest/magicsuggest.d.ts b/magicsuggest/magicsuggest.d.ts
deleted file mode 100644
index f5712f4cab..0000000000
--- a/magicsuggest/magicsuggest.d.ts
+++ /dev/null
@@ -1,467 +0,0 @@
-// Type definitions for MagicSuggest 2.1.4
-// Project: http://nicolasbize.com/magicsuggest
-// Definitions by: Leonardo Chaia <http://github.com/leonardochaia>
-// Definitions: http://github.com/leonardochaia/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-interface JQuery {
-    /**
-    * Initialize MagicSuggest on this selector
-    */
-    magicSuggest(configurationObject?: MagicSuggest.Configuration): MagicSuggest.Instance;
-}
-
-declare namespace MagicSuggest {
-    interface Configuration {
-        /**********  CONFIGURATION PROPERTIES ************/
-        /**
-         * Restricts or allows the user to validate typed entries.
-         * Defaults to true.
-         */
-        allowFreeEntries?: boolean;
-
-        /**
-         * Restricts or allows the user to add the same entry more than once
-         * Defaults to false.
-         */
-        allowDuplicates?: boolean;
-
-        /**
-         * Additional config object passed to each $.ajax call
-         */
-        ajaxConfig?: JQueryAjaxSettings;
-
-        /**
-         * If a single suggestion comes out, it is preselected.
-         */
-        autoSelect?: boolean;
-
-        /**
-         * Auto select the first matching item with multiple items shown
-         */
-        selectFirst?: boolean;
-
-        /**
-         * Allow customization of query parameter
-         */
-        queryParam?: string;
-
-        /**
-         * A function triggered just before the ajax request is sent, similar to jQuery
-         */
-        beforeSend?: () => void;
-
-        /**
-         * A custom CSS class to apply to the field's underlying element.
-         */
-        cls?: string;
-
-        /**
-         * JSON Data source used to populate the combo box. 3 options are available here:
-         * No Data Source (default)
-         *    When left null, the combo box will not suggest anything. It can still enable the user to enter
-         *    multiple entries if allowFreeEntries is * set to true (default).
-         * Static Source
-         *    You can pass an array of JSON objects, an array of strings or even a single CSV string as the
-         *    data source.For ex. data: [* {id:0,name:"Paris"}, {id: 1, name: "New York"}]
-         *    You can also pass any json object with the results property containing the json array.
-         * Url
-         *     You can pass the url from which the component will fetch its JSON data.Data will be fetched
-         *     using a POST ajax request that will * include the entered text as 'query' parameter. The results
-         *     fetched from the server can be:
-         *     - an array of JSON objects (ex: [{id:...,name:...},{...}])
-         *     - a string containing an array of JSON objects ready to be parsed (ex: "[{id:...,name:...},{...}]")
-         *     - a JSON object whose data will be contained in the results property
-         *      (ex: {results: [{id:...,name:...},{...}]
-         * Function
-         *     You can pass a function which returns an array of JSON objects  (ex: [{id:...,name:...},{...}])
-         *     The function can return the JSON data or it can use the first argument as function to handle the data.
-         *     Only one (callback function or return value) is needed for the function to succeed.
-         *     See the following example:
-         *     function (response) { var myjson = [{name: 'test', id: 1}]; response(myjson); return myjson; }
-         */
-        data?: any;
-
-        /**
-         * Additional parameters to the ajax call
-         */
-        dataUrlParams?: Object;
-
-        /**
-         * Start the component in a disabled state.
-         */
-        disabled?: boolean;
-
-        /**
-         * Name of JSON object property that defines the disabled behaviour
-         */
-        disabledField?: string;
-
-        /**
-         * Name of JSON object property displayed in the combo list
-         */
-        displayField?: string;
-
-        /**
-         * Set to false if you only want mouse interaction. In that case the combo will
-         * automatically expand on focus.
-         */
-        editable?: boolean;
-
-        /**
-         * Set starting state for combo.
-         */
-        expanded?: boolean;
-
-        /**
-         * Automatically expands combo on focus.
-         */
-        expandOnFocus?: boolean;
-
-        /**
-         * JSON property by which the list should be grouped
-         */
-        groupBy?: string;
-
-        /**
-         * Set to true to hide the trigger on the right
-         */
-        hideTrigger?: boolean;
-
-        /**
-         * Set to true to highlight search input within displayed suggestions
-         */
-        highlight?: boolean;
-
-        /**
-         * A custom ID for this component
-         */
-        id?: string;
-
-        /**
-         * A class that is added to the info message appearing on the top-right part of the component
-         */
-        infoMsgCls?: string;
-
-        /**
-         * Additional parameters passed out to the INPUT tag. Enables usage of AngularJS's custom tags for ex.
-         */
-        inputCfg?: any;
-
-        /**
-         * The class that is applied to show that the field is invalid
-         */
-        invalidCls?: string;
-
-        /**
-         * Set to true to filter data results according to case. Useless if the data is fetched remotely
-         */
-        matchCase?: boolean;
-
-        /**
-         * Once expanded, the combo's height will take as much room as the # of available results.
-         *    In case there are too many results displayed, this will fix the drop down height.
-         */
-        maxDropHeight?: number;
-
-        /**
-         * Defines how long the user free entry can be. Set to null for no limit.
-         */
-        maxEntryLength?: number;
-
-        /**
-         * A function that defines the helper text when the max entry length has been surpassed.
-         */
-        maxEntryRenderer?: (v?: number) => void;
-
-        /**
-         * The maximum number of results displayed in the combo drop down at once.
-         */
-        maxSuggestions?: number;
-
-        /**
-         * The maximum number of items the user can select if multiple selection is allowed.
-         *    Set to null to remove the limit.
-         */
-        maxSelection?: number;
-
-        /**
-         * A function that defines the helper text when the max selection amount has been reached. The function has a single
-         *    parameter which is the number of selected elements.
-         */
-        maxSelectionRenderer?: (v: number) => void;
-
-        /**
-         * The method used by the ajax request.
-         */
-        method?: string;
-
-        /**
-         * The minimum number of characters the user must type before the combo expands and offers suggestions.
-         */
-        minChars?: number;
-
-        /**
-         * A function that defines the helper text when not enough letters are set. The function has a single
-         *    parameter which is the difference between the required amount of letters and the current one.
-         */
-        minCharsRenderer?: (v: number) => void;
-
-        /**
-         * Whether or not sorting / filtering should be done remotely or locally.
-         * Use either 'local' or 'remote'
-         */
-        mode?: string;
-
-        /**
-         * The name used as a form element.
-         */
-        name?: string;
-
-        /**
-         * The text displayed when there are no suggestions.
-         */
-        noSuggestionText?: string;
-
-        /**
-         * The default placeholder text when nothing has been entered
-         */
-        placeholder?: string;
-
-        /**
-         * A function used to define how the items will be presented in the combo
-         */
-        renderer?: (item: any) => void;
-
-        /**
-         * Whether or not this field should be required
-         */
-        required?: boolean;
-
-        /**
-         * Set to true to render selection as a delimited string
-         */
-        resultAsString?: boolean;
-
-        /**
-         * Text delimiter to use in a delimited string.
-         */
-        resultAsStringDelimiter?: string;
-
-        /**
-         * Name of JSON object property that represents the list of suggested objects
-         */
-        resultsField?: string;
-
-        /**
-         * A custom CSS class to add to a selected item
-         */
-        selectionCls?: string;
-
-        /**
-         * An optional element replacement in which the selection is rendered
-         */
-        selectionContainer?: JQuery;
-
-        /**
-         * Where the selected items will be displayed. Only 'right', 'bottom' and 'inner' are valid values
-         */
-        selectionPosition?: string;
-
-        /**
-         * A function used to define how the items will be presented in the tag list
-         */
-        selectionRenderer?: (item: any) => void;
-
-        /**
-         * Set to true to stack the selectioned items when positioned on the bottom
-         *    Requires the selectionPosition to be set to 'bottom'
-         */
-        selectionStacked?: boolean;
-
-        /**
-         * Direction used for sorting. Only 'asc' and 'desc' are valid values
-         */
-        sortDir?: string;
-
-        /**
-         * name of JSON object property for local result sorting.
-         *    Leave null if you do not wish the results to be ordered or if they are already ordered remotely.
-         */
-        sortOrder?: string;
-
-        /**
-         * If set to boolean; suggestions will have to start by user input (and not simply contain it as a substring)
-         */
-        strictSuggest?: boolean;
-
-        /**
-         * Custom style added to the component container.
-         */
-        style?: string;
-
-        /**
-         * If set to boolean; the combo will expand / collapse when clicked upon
-         */
-        toggleOnClick?: boolean;
-
-
-        /**
-         * Amount (in ms) between keyboard registers.
-         */
-        typeDelay?: number;
-
-        /**
-         * If set to boolean; tab won't blur the component but will be registered as the ENTER key
-         */
-        useTabKey?: boolean;
-
-        /**
-         * If set to boolean; using comma will validate the user's choice
-         */
-        useCommaKey?: boolean;
-
-
-        /**
-         * Determines whether or not the results will be displayed with a zebra table style
-         */
-        useZebraStyle?: boolean;
-
-        /**
-         * initial value for the field
-         */
-        value?: any;
-
-        /**
-         * name of JSON object property that represents its underlying value
-         */
-        valueField?: string;
-
-        /**
-         * regular expression to validate the values against
-         */
-        vregex?: any;
-
-        /**
-         * type to validate against
-         */
-        vtype?: any;
-    }
-
-    interface Instance {
-        /**
-         * Add one or multiple json items to the current selection
-         * @param items - json object or array of json objects
-         * @param isSilent - (optional) set to true to suppress 'selectionchange' event from being triggered
-         */
-        addToSelection(objs: Array<any>, isSilent?: boolean): void;
-
-        /**
-         * Clears the current selection
-         * @param isSilent - (optional) set to true to suppress 'selectionchange' event from being triggered
-         */
-        clear(isSilent?: boolean): void;
-
-        /**
-        * Collapse the drop down part of the combo
-        */
-        collapse(): void;
-
-        /**
-         * Set the component in a disabled state.
-         */
-        disable(): void;
-
-        /**
-        * Empties out the combo user text
-        */
-        empty(): void;
-
-        /**
-        * Set the component in a enable state.
-        */
-        enable(): void;
-
-        /**
-         * Retrieve component enabled status
-         * @return {boolean}
-         */
-        isDisabled(): boolean;
-
-        /**
-         * Checks whether the field is valid or not
-         * @return {boolean}
-         */
-        isValid(): boolean;
-
-        /**
-         * Gets the data params for current ajax request
-         */
-        getDataUrlParams(): Object;
-
-        /**
-         * Gets the name given to the form input
-         */
-        getName(): string;
-
-        /**
-         * Retrieve an array of selected json objects
-         * @return {Array}
-         */
-        getSelection(): Array<any>;
-
-        /**
-         * Retrieve the current text entered by the user
-         */
-        getRawValue(): string;
-
-        /**
-         * Retrieve an array of selected values
-         */
-        getValue(): Array<any>;
-
-        /**
-         * Remove one or multiples json items from the current selection
-         * @param items - json object or array of json objects
-         * @param isSilent - (optional) set to true to suppress 'selectionchange' event from being triggered
-         */
-        removeFromSelection(items: any, isSilent: boolean): void;
-
-        /**
-         * Set up some combo data after it has been rendered
-         * @param data
-         */
-        setData(data: any): void;
-
-        /**
-         * Get current data
-         */
-        getData(): any;
-
-        /**
-         * Sets the name for the input field so it can be fetched in the form
-         * @param name
-         */
-        setName(name: string): void;
-
-        /**
-         * Sets the current selection with the JSON items provided
-         * @param items
-         * @param isSilent - (optional)
-         */
-        setSelection(items: Array<any>, isSilet?: boolean): void;
-
-        /**
-         * Sets a value for the combo box. Value must be an array of values with data type matching valueField one.
-         * @param data
-         */
-        setValue(values: Array<any>): void;
-
-        /**
-         * Sets data params for subsequent ajax requests
-         * @param params
-         */
-        setDataUrlParams(params: any): void;
-
-    }
-}
diff --git a/magicsuggest/tsconfig.json b/magicsuggest/tsconfig.json
new file mode 100644
index 0000000000..a29bd3f86e
--- /dev/null
+++ b/magicsuggest/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "magicsuggest-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mailcheck/index.d.ts b/mailcheck/index.d.ts
new file mode 100644
index 0000000000..e1d60653f3
--- /dev/null
+++ b/mailcheck/index.d.ts
@@ -0,0 +1,80 @@
+// Type definitions for Mailcheck 1.1+
+// Project: https://github.com/mailcheck/mailcheck
+// Definitions by: Paulo Cesar <http://github.com/pocesar>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare var Mailcheck: MailcheckModule.Static;
+
+declare namespace MailcheckModule {
+
+    export interface IDistanceFunction {
+        (s1: string, s2: string): number;
+    }
+
+    export interface ISuggestFunction {
+        (email: string, domains?: string[], topLevelDomains?: string[], distanceFunction?: IDistanceFunction):void;
+    }
+
+    export interface IJQuerySuggested {
+        (element: JQuery, suggested: ISuggestion): void;
+    }
+
+    export interface IJQueryEmpty {
+        (element: JQuery): void;
+    }
+
+    export interface IEmpty {
+        (): void;
+    }
+
+    export interface ISuggested {
+        (suggested: ISuggestion): void;
+    }
+
+    export interface ISplitEmail {
+        topLevelDomain?: string;
+        domain?: string;
+        address?: string;
+    }
+
+    export interface ISuggestion {
+        address: string;
+        domain: string;
+        full: string;
+    }
+
+    export interface IOptions {
+        email: string;
+        domains?: string[];
+        secondLevelDomains?: string[];
+        topLevelDomains?: string[];
+        distanceFunction?: IDistanceFunction;
+        suggested?: ISuggested | IJQuerySuggested;
+        empty?: IEmpty | IJQueryEmpty;
+    }
+
+    export interface Static {
+        defaultDomains: string[];
+        defaultSecondLevelDomains: string[];
+        defaultTopLevelDomains: string[];
+        domainThreshold: number;
+        topLevelThreshold: number;
+        run(opts: IOptions):void;
+        suggest: ISuggestFunction;
+        encodeEmail(email: string): string;
+        splitEmail(email: string): ISplitEmail;
+        sift3Distance(s1: string, s2: string): number;
+        findClosestDomain(domain: string, domains: string[], distanceFunction?: IDistanceFunction, threshold?: number): boolean|string;
+    }
+
+}
+
+interface JQuery {
+    mailcheck(opts: MailcheckModule.IOptions): void;
+}
+
+declare module 'mailcheck' {
+    export = Mailcheck;
+}
diff --git a/mailcheck/mailcheck-tests.ts b/mailcheck/mailcheck-tests.ts
index b3152b1d9d..07fc473893 100644
--- a/mailcheck/mailcheck-tests.ts
+++ b/mailcheck/mailcheck-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="mailcheck.d.ts"/>
+/// <reference types="jquery"/>
 
 import MC = require('mailcheck');
 
diff --git a/mailcheck/mailcheck.d.ts b/mailcheck/mailcheck.d.ts
deleted file mode 100644
index 225fd79bcb..0000000000
--- a/mailcheck/mailcheck.d.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-// Type definitions for Mailcheck 1.1+
-// Project: https://github.com/mailcheck/mailcheck
-// Definitions by: Paulo Cesar <http://github.com/pocesar>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare var Mailcheck: MailcheckModule.Static;
-
-declare namespace MailcheckModule {
-
-    export interface IDistanceFunction {
-        (s1: string, s2: string): number;
-    }
-
-    export interface ISuggestFunction {
-        (email: string, domains?: string[], topLevelDomains?: string[], distanceFunction?: IDistanceFunction):void;
-    }
-
-    export interface IJQuerySuggested {
-        (element: JQuery, suggested: ISuggestion): void;
-    }
-
-    export interface IJQueryEmpty {
-        (element: JQuery): void;
-    }
-
-    export interface IEmpty {
-        (): void;
-    }
-
-    export interface ISuggested {
-        (suggested: ISuggestion): void;
-    }
-
-    export interface ISplitEmail {
-        topLevelDomain?: string;
-        domain?: string;
-        address?: string;
-    }
-
-    export interface ISuggestion {
-        address: string;
-        domain: string;
-        full: string;
-    }
-
-    export interface IOptions {
-        email: string;
-        domains?: string[];
-        secondLevelDomains?: string[];
-        topLevelDomains?: string[];
-        distanceFunction?: IDistanceFunction;
-        suggested?: ISuggested | IJQuerySuggested;
-        empty?: IEmpty | IJQueryEmpty;
-    }
-
-    export interface Static {
-        defaultDomains: string[];
-        defaultSecondLevelDomains: string[];
-        defaultTopLevelDomains: string[];
-        domainThreshold: number;
-        topLevelThreshold: number;
-        run(opts: IOptions):void;
-        suggest: ISuggestFunction;
-        encodeEmail(email: string): string;
-        splitEmail(email: string): ISplitEmail;
-        sift3Distance(s1: string, s2: string): number;
-        findClosestDomain(domain: string, domains: string[], distanceFunction?: IDistanceFunction, threshold?: number): boolean|string;
-    }
-
-}
-
-interface JQuery {
-    mailcheck(opts: MailcheckModule.IOptions): void;
-}
-
-declare module 'mailcheck' {
-    export = Mailcheck;
-}
diff --git a/mailcheck/tsconfig.json b/mailcheck/tsconfig.json
new file mode 100644
index 0000000000..91015fc695
--- /dev/null
+++ b/mailcheck/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mailcheck-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/maildev/index.d.ts b/maildev/index.d.ts
new file mode 100644
index 0000000000..2114f05866
--- /dev/null
+++ b/maildev/index.d.ts
@@ -0,0 +1,155 @@
+// Type definitions for maildev 0.11.0
+// Project: https://github.com/djfarrelly/maildev
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+/**
+ * Interface for {@link MailDev} options.
+ */
+interface MailDevOptions {
+    /**
+     * SMTP host for outgoing emails
+     *
+     * @type {string}
+     */
+    outgoingHost?: string;
+
+    /**
+     * SMTP password for outgoing emails
+     *
+     * @type {string}
+     */
+    outgoingPass?: string;
+
+    /**
+     * SMTP port for outgoing emails.
+     *
+     * @type {number}
+     */
+    outgoingPort?: number;
+
+    /**
+     * SMTP user for outgoing emails
+     *
+     * @type {string}
+     */
+    outgoingUser?: string;
+
+    /**
+     * SMTP port to catch emails.
+     *
+     * @type {number}
+     */
+    smtp?: number;
+}
+
+/**
+ * Interface for mail.
+ */
+interface Mail {
+    /**
+     * Identifier.
+     */
+    id?: string;
+
+    /**
+     * Client.
+     */
+    envelope?: Object;
+}
+
+declare module "maildev" {
+    import fs = require("fs");
+
+    /**
+     * Interface for {@link MailDev}.
+     */
+    class MailDev {
+        /**
+         * Constructor.
+         *
+         * @public
+         * @param {MailDevOptions} options The options.
+         */
+        constructor(options: MailDevOptions);
+
+        /**
+         * Deletes a given email by identifier.
+         *
+         * @public
+         * @param {string}    id        The email identifier.
+         * @param {Function}  callback  The error callback.
+         */
+        deleteEmail(id: string, callback?: (error: Error) => void): void;
+
+        /**
+         * Deletes all email and their attachments.
+         *
+         * @public
+         * @param {Function} callback The error callback.
+         */
+        deleteAllEmail(callback?: (error: Error) => void): void;
+
+        /**
+         * Stops the SMTP server.
+         *
+         * @public
+         * @param {Function} callback The error callback.
+         */
+        end(callback?: (error: Error) => void): void;
+
+        /**
+         * Accepts e-mail identifier, returns email object.
+         *
+         * @public
+         * @param {string}    id        The e-mail identifier.
+         * @param {Function}  callback  The error callback.
+         */
+        getEmail(id: string, callback?: (error: Error) => void): void;
+
+        /**
+         * Returns a readable stream of the raw e-mail.
+         *
+         * @public
+         * @param {string} id The e-mail identifier.
+         */
+        getRawEmail(id: string, callback?: (error: Error, readStream: fs.ReadStream) => void): void;
+
+        /**
+         * Returns array of all e-mail.
+
+         * @public
+         */
+        getAllEmail(done: (error: Error, emails: Array<Object>) => void): void;
+
+        /**
+         * Starts the SMTP server.
+         *
+         * @public
+         * @param {Function} callback The error callback.
+         */
+        listen(callback?: (error: Error) => void): void;
+
+        /**
+         * Event called when a new e-mail is received. Callback receives single mail object.
+         *
+         * @public
+         * @param {string}    eventName The event name.
+         * @param {Function}  email     The email.
+         */
+        on(eventName: string, callback: (email: Object) => void): void;
+
+        /**
+         * Relay the e-mail.
+         *
+         * @param {string} idOrMailObject The identifier or mail object.
+         * @param {Function} done The callback.
+         */
+        relayMail(idOrMailObject: string, done: (error: Error) => void): void;
+    }
+
+    var out: typeof MailDev;
+    export = out;
+}
diff --git a/maildev/maildev-tests.ts b/maildev/maildev-tests.ts
index 62c324c5e2..153cc18f0d 100644
--- a/maildev/maildev-tests.ts
+++ b/maildev/maildev-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="maildev.d.ts"/>
-
 import MailDev = require("maildev")
 
 var options: MailDevOptions = {smtp: 1025};
diff --git a/maildev/maildev.d.ts b/maildev/maildev.d.ts
deleted file mode 100644
index 58da7b38d1..0000000000
--- a/maildev/maildev.d.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-// Type definitions for maildev 0.11.0
-// Project: https://github.com/djfarrelly/maildev
-// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-/**
- * Interface for {@link MailDev} options.
- */
-interface MailDevOptions {
-    /**
-     * SMTP host for outgoing emails
-     *
-     * @type {string}
-     */
-    outgoingHost?: string;
-
-    /**
-     * SMTP password for outgoing emails
-     *
-     * @type {string}
-     */
-    outgoingPass?: string;
-
-    /**
-     * SMTP port for outgoing emails.
-     *
-     * @type {number}
-     */
-    outgoingPort?: number;
-
-    /**
-     * SMTP user for outgoing emails
-     *
-     * @type {string}
-     */
-    outgoingUser?: string;
-
-    /**
-     * SMTP port to catch emails.
-     *
-     * @type {number}
-     */
-    smtp?: number;
-}
-
-/**
- * Interface for mail.
- */
-interface Mail {
-    /**
-     * Identifier.
-     */
-    id?: string;
-
-    /**
-     * Client.
-     */
-    envelope?: Object;
-}
-
-declare module "maildev" {
-    import fs = require("fs");
-
-    /**
-     * Interface for {@link MailDev}.
-     */
-    class MailDev {
-        /**
-         * Constructor.
-         *
-         * @public
-         * @param {MailDevOptions} options The options.
-         */
-        constructor(options: MailDevOptions);
-
-        /**
-         * Deletes a given email by identifier.
-         *
-         * @public
-         * @param {string}    id        The email identifier.
-         * @param {Function}  callback  The error callback.
-         */
-        deleteEmail(id: string, callback?: (error: Error) => void): void;
-
-        /**
-         * Deletes all email and their attachments.
-         *
-         * @public
-         * @param {Function} callback The error callback.
-         */
-        deleteAllEmail(callback?: (error: Error) => void): void;
-
-        /**
-         * Stops the SMTP server.
-         *
-         * @public
-         * @param {Function} callback The error callback.
-         */
-        end(callback?: (error: Error) => void): void;
-
-        /**
-         * Accepts e-mail identifier, returns email object.
-         *
-         * @public
-         * @param {string}    id        The e-mail identifier.
-         * @param {Function}  callback  The error callback.
-         */
-        getEmail(id: string, callback?: (error: Error) => void): void;
-
-        /**
-         * Returns a readable stream of the raw e-mail.
-         *
-         * @public
-         * @param {string} id The e-mail identifier.
-         */
-        getRawEmail(id: string, callback?: (error: Error, readStream: fs.ReadStream) => void): void;
-
-        /**
-         * Returns array of all e-mail.
-
-         * @public
-         */
-        getAllEmail(done: (error: Error, emails: Array<Object>) => void): void;
-
-        /**
-         * Starts the SMTP server.
-         *
-         * @public
-         * @param {Function} callback The error callback.
-         */
-        listen(callback?: (error: Error) => void): void;
-
-        /**
-         * Event called when a new e-mail is received. Callback receives single mail object.
-         *
-         * @public
-         * @param {string}    eventName The event name.
-         * @param {Function}  email     The email.
-         */
-        on(eventName: string, callback: (email: Object) => void): void;
-
-        /**
-         * Relay the e-mail.
-         *
-         * @param {string} idOrMailObject The identifier or mail object.
-         * @param {Function} done The callback.
-         */
-        relayMail(idOrMailObject: string, done: (error: Error) => void): void;
-    }
-
-    var out: typeof MailDev;
-    export = out;
-}
diff --git a/maildev/tsconfig.json b/maildev/tsconfig.json
new file mode 100644
index 0000000000..c1f9c6b100
--- /dev/null
+++ b/maildev/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "maildev-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mailparser/index.d.ts b/mailparser/index.d.ts
new file mode 100644
index 0000000000..6ece4483d2
--- /dev/null
+++ b/mailparser/index.d.ts
@@ -0,0 +1,81 @@
+// Type definitions for mailparser v0.5.2
+// Project: https://www.npmjs.com/package/mailparser
+// Definitions by: Peter Snider <https://github.com/psnider/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import WritableStream = NodeJS.WritableStream;
+import EventEmitter = NodeJS.EventEmitter;
+
+interface Options {
+    debug?: boolean;    // if set to true print all incoming lines to console
+    streamAttachments?: boolean;   // if set to true, stream attachments instead of including them
+    unescapeSMTP?: boolean;   // if set to true replace double dots in the beginning of the file
+    defaultCharset?: string;   // the default charset for text/plain and text/html content, if not set reverts to Latin-1
+    showAttachmentLinks?: boolean;    // if set to true, show inlined attachment links <a href="cid:...">filename</a>
+}
+
+
+interface EmailAddress {
+    address: string;
+    name: string;
+}
+
+
+interface Attachment {
+    contentType: string;
+    fileName: string;
+    contentDisposition: string;    // e.g. 'attachment'
+    contentId: string;   // e.g. '5.1321281380971@localhost'
+    transferEncoding: string;   // e.g. 'base64'
+    length: number;   // length of the attachment in bytes
+    generatedFileName: string;   // e.g. 'image.png'
+    checksum: string;  // the md5 hash of the file, e.g. 'e4cef4c6e26037bcf8166905207ea09b'
+    content: Buffer;   // possibly a SlowBuffer
+}
+
+// emitted with the 'end' event
+interface ParsedMail {
+    headers: any;  // unprocessed headers in the form of - {key: value} - if there were multiple fields with the same key then the value is an array
+    from: EmailAddress[];  // should be only one though)
+    to: EmailAddress[];
+    cc?: EmailAddress[];
+    bcc?: EmailAddress[];
+    subject: string;  // the subject line
+    references?: string[];  // an array of reference message id values (not set if no reference values present)
+    inReplyTo?: string[];  // an array of In-Reply-To message id values (not set if no in-reply-to values present)
+    priority?: string;   // priority of the e-mail, always one of the following: normal (default), high, low
+    text: string;    // text body
+    html: string;    // html body
+    date?: Date; // If date could not be resolved or is not found this field is not set. Check the original date string from headers.date
+    attachments?: Attachment[];
+}
+
+export class MailParser implements WritableStream {
+    constructor(options?: Options);
+    on(event: string, callback: (any: any) => void): this;
+
+    // from WritableStream
+    writable: boolean;
+    write(buffer: Buffer, cb?: Function): boolean;
+    write(str: string, cb?: Function): boolean;
+    write(str: string, encoding?: string, cb?: Function): boolean;
+    end(): void;
+    end(buffer: Buffer, cb?: Function): void;
+    end(str: string, cb?: Function): void;
+    end(str: string, encoding?: string, cb?: Function): void;
+
+    // from EventEmitter
+    static listenerCount(emitter: EventEmitter, event: string): number;
+    addListener(event: string, listener: Function): this;
+    on(event: string, listener: Function): this;
+    once(event: string, listener: Function): this;
+    removeListener(event: string, listener: Function): this;
+    removeAllListeners(event?: string): this;
+    setMaxListeners(n: number): this;
+    getMaxListeners(): number;
+    listeners(event: string): Function[];
+    emit(event: string, ...args: any[]): boolean;
+    listenerCount(type: string): number;
+}
diff --git a/mailparser/mailparser-tests.ts b/mailparser/mailparser-tests.ts
index b7df9adb44..18c84bef95 100644
--- a/mailparser/mailparser-tests.ts
+++ b/mailparser/mailparser-tests.ts
@@ -1,11 +1,7 @@
-/// <reference path="./mailparser.d.ts" />
-
 import mailparser_mod = require("mailparser");
 import MailParser = mailparser_mod.MailParser;
 import ParsedMail = mailparser_mod.ParsedMail;
 
-
-
 var mailparser = new MailParser();
 
 
diff --git a/mailparser/mailparser.d.ts b/mailparser/mailparser.d.ts
deleted file mode 100644
index 94e99308d9..0000000000
--- a/mailparser/mailparser.d.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-// Type definitions for mailparser v0.5.2
-// Project: https://www.npmjs.com/package/mailparser
-// Definitions by: Peter Snider <https://github.com/psnider/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path='../node/node.d.ts' />
-
-
-declare module 'mailparser' {
-    import WritableStream = NodeJS.WritableStream;
-    import EventEmitter = NodeJS.EventEmitter;
-
-    interface Options {
-        debug?: boolean;    // if set to true print all incoming lines to console
-        streamAttachments?: boolean;   // if set to true, stream attachments instead of including them
-        unescapeSMTP?: boolean;   // if set to true replace double dots in the beginning of the file
-        defaultCharset?: string;   // the default charset for text/plain and text/html content, if not set reverts to Latin-1
-        showAttachmentLinks?: boolean;    // if set to true, show inlined attachment links <a href="cid:...">filename</a>
-    }
-    
-    
-    interface EmailAddress {
-        address: string;
-        name: string;
-    }
-    
-    
-    interface Attachment {
-        contentType: string;
-        fileName: string;
-        contentDisposition: string;    // e.g. 'attachment'
-        contentId: string;   // e.g. '5.1321281380971@localhost'
-        transferEncoding: string;   // e.g. 'base64'
-        length: number;   // length of the attachment in bytes
-        generatedFileName: string;   // e.g. 'image.png'
-        checksum: string;  // the md5 hash of the file, e.g. 'e4cef4c6e26037bcf8166905207ea09b'
-        content: Buffer;   // possibly a SlowBuffer
-    }
-    
-    // emitted with the 'end' event
-    interface ParsedMail {
-        headers: any;  // unprocessed headers in the form of - {key: value} - if there were multiple fields with the same key then the value is an array
-        from: EmailAddress[];  // should be only one though)
-        to: EmailAddress[];
-        cc?: EmailAddress[];
-        bcc?: EmailAddress[];
-        subject: string;  // the subject line
-        references?: string[];  // an array of reference message id values (not set if no reference values present)
-        inReplyTo?: string[];  // an array of In-Reply-To message id values (not set if no in-reply-to values present)
-        priority?: string;   // priority of the e-mail, always one of the following: normal (default), high, low
-        text: string;    // text body
-        html: string;    // html body
-        date?: Date; // If date could not be resolved or is not found this field is not set. Check the original date string from headers.date
-        attachments?: Attachment[];
-    }
-    
-
-
-    class MailParser implements WritableStream {
-        constructor(options?: Options);
-        on(event: string, callback: (any: any) => void): this;
-
-        // from WritableStream
-        writable: boolean;
-        write(buffer: Buffer, cb?: Function): boolean;
-        write(str: string, cb?: Function): boolean;
-        write(str: string, encoding?: string, cb?: Function): boolean;
-        end(): void;
-        end(buffer: Buffer, cb?: Function): void;
-        end(str: string, cb?: Function): void;
-        end(str: string, encoding?: string, cb?: Function): void;
-
-        // from EventEmitter
-        static listenerCount(emitter: EventEmitter, event: string): number;
-        addListener(event: string, listener: Function): this;
-        on(event: string, listener: Function): this;
-        once(event: string, listener: Function): this;
-        removeListener(event: string, listener: Function): this;
-        removeAllListeners(event?: string): this;
-        setMaxListeners(n: number): this;
-        getMaxListeners(): number;
-        listeners(event: string): Function[];
-        emit(event: string, ...args: any[]): boolean;
-        listenerCount(type: string): number;
-    }
-}
diff --git a/mailparser/tsconfig.json b/mailparser/tsconfig.json
new file mode 100644
index 0000000000..e91c6b3c6f
--- /dev/null
+++ b/mailparser/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mailparser-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/main-bower-files/index.d.ts b/main-bower-files/index.d.ts
new file mode 100644
index 0000000000..0a00b19b8b
--- /dev/null
+++ b/main-bower-files/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for main-bower-files
+// Project: https://github.com/ck86/main-bower-files
+// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+interface IPaths {
+    bowerDirectory?: string;
+    bowerrc?: string;
+    bowerJson?: string;
+}
+
+interface IFilterFunction {
+    (filepath: string): boolean;
+}
+
+interface IOptions {
+    debugging?: boolean;
+    main?: string | string[] | Object;
+    env?: string;
+    paths?: IPaths | string;
+    checkExistence?: boolean;
+    includeDev?: boolean | string;
+    includeSelf?: boolean;
+    filter?: RegExp | IFilterFunction | string | string[];
+}
+
+declare function mainBowerFiles(options?: IOptions): string[];
+
+export = mainBowerFiles;
diff --git a/main-bower-files/main-bower-files-tests.ts b/main-bower-files/main-bower-files-tests.ts
index 1658b3800b..0ddd04137d 100644
--- a/main-bower-files/main-bower-files-tests.ts
+++ b/main-bower-files/main-bower-files-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="./main-bower-files.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import gulp = require("gulp");
 import mainBowerFiles = require("main-bower-files");
diff --git a/main-bower-files/main-bower-files.d.ts b/main-bower-files/main-bower-files.d.ts
deleted file mode 100644
index 28696f5084..0000000000
--- a/main-bower-files/main-bower-files.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// Type definitions for main-bower-files
-// Project: https://github.com/ck86/main-bower-files
-// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "main-bower-files" {
-
-    interface IPaths {
-        bowerDirectory?: string;
-        bowerrc?: string;
-        bowerJson?: string;
-    }
-
-    interface IFilterFunction {
-        (filepath: string): boolean;
-    }
-
-    interface IOptions {
-        debugging?: boolean;
-        main?: string | string[] | Object;
-        env?: string;
-        paths?: IPaths | string;
-        checkExistence?: boolean;
-        includeDev?: boolean | string;
-        includeSelf?: boolean;
-        filter?: RegExp | IFilterFunction | string | string[];
-    }
-
-    function mainBowerFiles(options?: IOptions): string[];
-
-    export = mainBowerFiles;
-}
diff --git a/main-bower-files/tsconfig.json b/main-bower-files/tsconfig.json
new file mode 100644
index 0000000000..3d4cbbd4b7
--- /dev/null
+++ b/main-bower-files/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "main-bower-files-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/maker.js/makerjs.d.ts b/maker.js/index.d.ts
similarity index 100%
rename from maker.js/makerjs.d.ts
rename to maker.js/index.d.ts
diff --git a/maker.js/makerjs-tests.ts b/maker.js/makerjs-tests.ts
index e314f09669..375e230326 100644
--- a/maker.js/makerjs-tests.ts
+++ b/maker.js/makerjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./makerjs.d.ts" />
+
 
 function test() {
 	
diff --git a/maker.js/tsconfig.json b/maker.js/tsconfig.json
new file mode 100644
index 0000000000..f2708d7985
--- /dev/null
+++ b/maker.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "makerjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mandrill-api/index.d.ts b/mandrill-api/index.d.ts
new file mode 100644
index 0000000000..9fe509317a
--- /dev/null
+++ b/mandrill-api/index.d.ts
@@ -0,0 +1,1181 @@
+// Type definitions for Mandrill API 1.x
+// Project: http://mandrill.com/
+// Definitions by: Paulo Cesar <https://github.com/pocesar/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* =================== USAGE ===================
+
+    import mandrill from 'mandrill-api';
+
+ =============================================== */
+
+/// <reference types="node" />
+
+
+
+export interface ICallback {
+    (json: Object): void;
+}
+
+export interface IErrorCallback {
+    (err: Error): void;
+}
+
+export declare class Mandrill {
+    apikey: string;
+    debug: boolean;
+    templates: Templates;
+    exports: Exports;
+    users: Users;
+    rejects: Rejects;
+    inbound: Inbound;
+    tags: Tags;
+    messages: Messages;
+    whitelists: Whitelists;
+    ips: Ips;
+    internal: Internal;
+    subaccounts: Subaccounts;
+    urls: Urls;
+    webhooks: Webhooks;
+    senders: Senders;
+    metadata: Metadata;
+    onerror: IErrorCallback;
+    constructor(apikey: string, debug?: boolean);
+    call(uri: string, params: any, onresult?: ICallback, onerror?: ICallback): void;
+}
+
+export declare class Templates {
+    constructor(master: Mandrill);
+
+    /**
+     * Add a new template
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} name the name for the new template - must be unique
+     * @option params {String} from_email a default sending address for emails sent using this template
+     * @option params {String} from_name a default from name to be used
+     * @option params {String} subject a default subject line to be used
+     * @option params {String} code the HTML code for the template with mc:edit attributes for the editable elements
+     * @option params {String} text a default text part to be used when sending with this template
+     * @option params {Boolean} publish set to false to add a draft template without publishing
+     * @option params {Array} labels an optional array of up to 10 labels to use for filtering templates
+     *    - labels[] {String} a single label
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Get the information for an existing template
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} name the immutable name of an existing template
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Update the code for an existing template. If null is provided for any fields, the values will remain unchanged.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} name the immutable name of an existing template
+     * @option params {String} from_email the new default sending address
+     * @option params {String} from_name the new default from name
+     * @option params {String} subject the new default subject line
+     * @option params {String} code the new code for the template
+     * @option params {String} text the new default text part to be used
+     * @option params {Boolean} publish set to false to update the draft version of the template without publishing
+     * @option params {Array} labels an optional array of up to 10 labels to use for filtering templates
+     *    - labels[] {String} a single label
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    update(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Publish the content for the template. Any new messages sent using this template will start using the content that was previously in draft.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} name the immutable name of an existing template
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    publish(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Delete a template
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} name the immutable name of an existing template
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Return a list of all the templates available to this user
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} label an optional label to filter the templates
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Return the recent history (hourly stats for the last 30 days) for a template
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} name the name of an existing template
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    timeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Inject content and optionally merge fields into a template, returning the HTML that results
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} template_name the immutable name of a template that exists in the user's account
+     * @option params {Array} template_content an array of template content to render.  Each item in the array should be a struct with two keys - name: the name of the content block to set the content for, and content: the actual content to put into the block
+     *    - template_content[] {Object} the injection of a single piece of content into a single editable region
+     *        - name {String} the name of the mc:edit editable region to inject into
+     *        - content {String} the content to inject
+     * @option params {Array} merge_vars optional merge variables to use for injecting merge field content.  If this is not provided, no merge fields will be replaced.
+     *    - merge_vars[] {Object} a single merge variable
+     *        - name {String} the merge variable's name. Merge variable names are case-insensitive and may not start with _
+     *        - content {String} the merge variable's content
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    render(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+}
+
+export declare class Exports {
+    constructor(master: Mandrill);
+
+    /**
+     * Returns information about an export job. If the export job's state is 'complete',
+     * the returned data will include a URL you can use to fetch the results. Every export
+     * job produces a zip archive, but the format of the archive is distinct for each job
+     * type. The api calls that initiate exports include more details about the output format
+     * for that job type.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id an export job identifier
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Returns a list of your exports.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Begins an export of your rejection blacklist. The blacklist will be exported to a zip archive
+     * containing a single file named rejects.csv that includes the following fields: email,
+     * reason, detail, created_at, expires_at, last_event_at, expires_at.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} notify_email an optional email address to notify when the export job has finished.
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    rejects(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Begins an export of your rejection whitelist. The whitelist will be exported to a zip archive
+     * containing a single file named whitelist.csv that includes the following fields:
+     * email, detail, created_at.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} notify_email an optional email address to notify when the export job has finished.
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    whitelist(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Begins an export of your activity history. The activity will be exported to a zip archive
+     * containing a single file named activity.csv in the same format as you would be able to export
+     * from your account's activity view. It includes the following fields: Date, Email Address,
+     * Sender, Subject, Status, Tags, Opens, Clicks, Bounce Detail. If you have configured any custom
+     * metadata fields, they will be included in the exported data.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} notify_email an optional email address to notify when the export job has finished
+     * @option params {String} date_from start date as a UTC string in YYYY-MM-DD HH:MM:SS format
+     * @option params {String} date_to end date as a UTC string in YYYY-MM-DD HH:MM:SS format
+     * @option params {Array} tags an array of tag names to narrow the export to; will match messages that contain ANY of the tags
+     *      - tags[] {String} a tag name
+     * @option params {Array} senders an array of senders to narrow the export to
+     *      - senders[] {String} a sender address
+     * @option params {Array} states an array of states to narrow the export to; messages with ANY of the states will be included
+     *      - states[] {String} a message state
+     * @option params {Array} api_keys an array of api keys to narrow the export to; messsagse sent with ANY of the keys will be included
+     *      - api_keys[] {String} an API key associated with your account
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    activity(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+}
+
+export declare class Users {
+    constructor(master: Mandrill);
+
+    /**
+     * Return the information about the API-connected user
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Validate an API key and respond to a ping
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    ping(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Validate an API key and respond to a ping (anal JSON parser version)
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    ping2(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Return the senders that have tried to use this account, both verified and unverified
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    senders(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+}
+
+export declare class Rejects {
+    constructor(master: Mandrill);
+
+    /**
+     * Adds an email to your email rejection blacklist. Addresses that you
+     * add manually will never expire and there is no reputation penalty
+     * for removing them from your blacklist. Attempting to blacklist an
+     * address that has been whitelisted will have no effect.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} email an email address to block
+     * @option params {String} comment an optional comment describing the rejection
+     * @option params {String} subaccount an optional unique identifier for the subaccount to limit the blacklist entry
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Retrieves your email rejection blacklist. You can provide an email
+     * address to limit the results. Returns up to 1000 results. By default,
+     * entries that have expired are excluded from the results; set
+     * include_expired to true to include them.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} email an optional email address to search by
+     * @option params {Boolean} include_expired whether to include rejections that have already expired.
+     * @option params {String} subaccount an optional unique identifier for the subaccount to limit the blacklist
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Deletes an email rejection. There is no limit to how many rejections
+     * you can remove from your blacklist, but keep in mind that each deletion
+     * has an affect on your reputation.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} email an email address
+     * @option params {String} subaccount an optional unique identifier for the subaccount to limit the blacklist deletion
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+}
+
+export declare class Inbound {
+    constructor(master: Mandrill);
+
+    /**
+     * List the domains that have been configured for inbound delivery
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    domains(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Add an inbound domain to your account
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} domain a domain name
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    addDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Check the MX settings for an inbound domain. The domain must have already been added with the add-domain call
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} domain an existing inbound domain
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    checkDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Delete an inbound domain from the account. All mail will stop routing for this domain immediately.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} domain an existing inbound domain
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    deleteDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * List the mailbox routes defined for an inbound domain
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} domain the domain to check
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    routes(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Add a new mailbox route to an inbound domain
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} domain an existing inbound domain
+     * @option params {String} pattern the search pattern that the mailbox name should match
+     * @option params {String} url the webhook URL where the inbound messages will be published
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    addRoute(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Update the pattern or webhook of an existing inbound mailbox route. If null is provided for any fields, the values will remain unchanged.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id the unique identifier of an existing mailbox route
+     * @option params {String} pattern the search pattern that the mailbox name should match
+     * @option params {String} url the webhook URL where the inbound messages will be published
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    updateRoute(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Delete an existing inbound mailbox route
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id the unique identifier of an existing route
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    deleteRoute(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Take a raw MIME document destined for a domain with inbound domains set up, and send it to the inbound hook exactly as if it had been sent over SMTP
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} raw_message the full MIME document of an email message
+     * @option params {Array|null} to optionally define the recipients to receive the message - otherwise we'll use the To, Cc, and Bcc headers provided in the document
+     *      - to[] {String} the email address of the recipient
+     * @option params {String} mail_from the address specified in the MAIL FROM stage of the SMTP conversation. Required for the SPF check.
+     * @option params {String} helo the identification provided by the client mta in the MTA state of the SMTP conversation. Required for the SPF check.
+     * @option params {String} client_address the remote MTA's ip address. Optional; required for the SPF check.
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    sendRaw(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+}
+
+export declare class Tags {
+    constructor(master: Mandrill);
+
+    /**
+     * Return all of the user-defined tag information
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Deletes a tag permanently. Deleting a tag removes the tag from any messages
+     * that have been sent, and also deletes the tag's stats. There is no way to
+     * undo this operation, so use it carefully.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} tag a tag name
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Return more detailed information about a single tag, including aggregates of recent stats
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} tag an existing tag name
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Return the recent history (hourly stats for the last 30 days) for a tag
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} tag an existing tag name
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    timeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Return the recent history (hourly stats for the last 30 days) for all tags
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    allTimeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+}
+
+export declare class Messages {
+    constructor(master: Mandrill);
+
+    /**
+     * Send a new transactional message through Mandrill
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {Struct} message the information on the message to send
+     * -html {String} the full HTML content to be sent
+     * -text {String} optional full text content to be sent
+     * -subject {String} the message subject
+     * -from_email {String} the sender email address.
+     * -from_name {String} optional from name to be used
+     * -to {Array} an array of recipient information.
+     *      -to[] {Object} a single recipient's information.
+     *      -email {String} the email address of the recipient
+     *      -name {String} the optional display name to use for the recipient
+     *      -type {String} the header type to use for the recipient, defaults to "to" if not provided
+     * -headers {Object} optional extra headers to add to the message (most headers are allowed)
+     * -important {Boolean} whether or not this message is important, and should be delivered ahead of non-important messages
+     * -track_opens {Boolean} whether or not to turn on open tracking for the message
+     * -track_clicks {Boolean} whether or not to turn on click tracking for the message
+     * -auto_text {Boolean} whether or not to automatically generate a text part for messages that are not given text
+     * -auto_html {Boolean} whether or not to automatically generate an HTML part for messages that are not given HTML
+     * -inline_css {Boolean} whether or not to automatically inline all CSS styles provided in the message HTML - only for HTML documents less than 256KB in size
+     * -url_strip_qs {Boolean} whether or not to strip the query string from URLs when aggregating tracked URL data
+     * -preserve_recipients {Boolean} whether or not to expose all recipients in to "To" header for each email
+     * -view_content_link {Boolean} set to false to remove content logging for sensitive emails
+     * -bcc_address {String} an optional address to receive an exact copy of each recipient's email
+     * -tracking_domain {String} a custom domain to use for tracking opens and clicks instead of mandrillapp.com
+     * -signing_domain {String} a custom domain to use for SPF/DKIM signing instead of mandrill (for "via" or "on behalf of" in email clients)
+     * -return_path_domain {String} a custom domain to use for the messages's return-path
+     * -merge {Boolean} whether to evaluate merge tags in the message. Will automatically be set to true if either merge_vars or global_merge_vars are provided.
+     * -merge_language {String} the merge tag language to use when evaluating merge tags, either mailchimp or handlebars
+     * -global_merge_vars {Array} global merge variables to use for all recipients. You can override these per recipient.
+     *      -global_merge_vars[] {Object} a single global merge variable
+     *      -name {String} the global merge variable's name. Merge variable names are case-insensitive and may not start with _
+     *      -content {Mixed} the global merge variable's content
+     * -merge_vars {Array} per-recipient merge variables, which override global merge variables with the same name.
+     *   -merge_vars[] {Object} per-recipient merge variables
+     *      -rcpt {String} the email address of the recipient that the merge variables should apply to
+     *      -vars {Array} the recipient's merge variables
+     *          -vars[] {Object} a single merge variable
+     *          -name {String} the merge variable's name. Merge variable names are case-insensitive and may not start with _
+     *          -content {Mixed} the merge variable's content
+     * -tags {Array} an array of string to tag the message with.  Stats are accumulated using tags, though we only store the first 100 we see, so this should not be unique or change frequently.  Tags should be 50 characters or less.  Any tags starting with an underscore are reserved for internal use and will cause errors.
+     *      -tags[] {String} a single tag - must not start with an underscore
+     * -subaccount {String} the unique id of a subaccount for this message - must already exist or will fail with an error
+     * -google_analytics_domains {Array} an array of strings indicating for which any matching URLs will automatically have Google Analytics parameters appended to their query string automatically.
+     * -google_analytics_campaign {Array|string} optional string indicating the value to set for the utm_campaign tracking parameter. If this isn't provided the email's from address will be used instead.
+     * -metadata {Array} metadata an associative array of user metadata. Mandrill will store this metadata and make it available for retrieval. In addition, you can select up to 10 metadata fields to index and make searchable using the Mandrill search api.
+     * -recipient_metadata {Array} Per-recipient metadata that will override the global values specified in the metadata parameter.
+     *      -recipient_metadata[] {Object} metadata for a single recipient
+     *          -rcpt {String} the email address of the recipient that the metadata is associated with
+     *          -values {Array} an associated array containing the recipient's unique metadata. If a key exists in both the per-recipient metadata and the global metadata, the per-recipient metadata will be used.
+     * -attachments {Array} an array of supported attachments to add to the message
+     *      -attachments[] {Object} a single supported attachment
+     *          -type {String} the MIME type of the attachment
+     *          -name {String} the file name of the attachment
+     *          -content {String} the content of the attachment as a base64-encoded string
+     * -images {Array} an array of embedded images to add to the message
+     *      -images[] {Object} a single embedded image
+     *          -type {String} the MIME type of the image - must start with "image/"
+     *          -name {String} the Content ID of the image - use <img src="cid:THIS_VALUE"> to reference the image in your HTML content
+     *          -content {String} the content of the image as a base64-encoded string
+     * @option params {Boolean} async enable a background sending mode that is optimized for bulk sending. In async mode, messages/send will immediately return a status of "queued" for every recipient. To handle rejections when sending in async mode, set up a webhook for the 'reject' event. Defaults to false for messages with no more than 10 recipients; messages with more than 10 recipients are always sent asynchronously, regardless of the value of async.
+     * @option params {String} ip_pool the name of the dedicated ip pool that should be used to send the message. If you do not have any dedicated IPs, this parameter has no effect. If you specify a pool that does not exist, your default pool will be used instead.
+     * @option params {String} send_at when this message should be sent as a UTC timestamp in YYYY-MM-DD HH:MM:SS format. If you specify a time in the past, the message will be sent immediately. An additional fee applies for scheduled email, and this feature is only available to accounts with a positive balance.
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    send(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Send a new transactional message through Mandrill using a template
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} template_name the immutable name or slug of a template that exists in the user's account. For backwards-compatibility, the template name may also be used but the immutable slug is preferred.
+     * @option params {Array} template_content an array of template content to send.  Each item in the array should be a struct with two keys - name: the name of the content block to set the content for, and content: the actual content to put into the block
+     * -template_content[] {Object} the injection of a single piece of content into a single editable region
+     *     -name {String} the name of the mc:edit editable region to inject into
+     *     -content {String} the content to inject
+     * @option params {Struct} message the other information on the message to send - same as /messages/send, but without the html content
+     * -html {String} optional full HTML content to be sent if not in template
+     * -text {String} optional full text content to be sent
+     * -subject {String} the message subject
+     * -from_email {String} the sender email address.
+     * -from_name {String} optional from name to be used
+     * -to {Array} an array of recipient information.
+     *      -to[] {Object} a single recipient's information.
+     *         -email {String} the email address of the recipient
+     *         -name {String} the optional display name to use for the recipient
+     *         -type {String} the header type to use for the recipient, defaults to "to" if not provided
+     * -headers {Object} optional extra headers to add to the message (most headers are allowed)
+     * -important {Boolean} whether or not this message is important, and should be delivered ahead of non-important messages
+     * -track_opens {Boolean} whether or not to turn on open tracking for the message
+     * -track_clicks {Boolean} whether or not to turn on click tracking for the message
+     * -auto_text {Boolean} whether or not to automatically generate a text part for messages that are not given text
+     * -auto_html {Boolean} whether or not to automatically generate an HTML part for messages that are not given HTML
+     * -inline_css {Boolean} whether or not to automatically inline all CSS styles provided in the message HTML - only for HTML documents less than 256KB in size
+     * -url_strip_qs {Boolean} whether or not to strip the query string from URLs when aggregating tracked URL data
+     * -preserve_recipients {Boolean} whether or not to expose all recipients in to "To" header for each email
+     * -view_content_link {Boolean} set to false to remove content logging for sensitive emails
+     * -bcc_address {String} an optional address to receive an exact copy of each recipient's email
+     * -tracking_domain {String} a custom domain to use for tracking opens and clicks instead of mandrillapp.com
+     * -signing_domain {String} a custom domain to use for SPF/DKIM signing instead of mandrill (for "via" or "on behalf of" in email clients)
+     * -return_path_domain {String} a custom domain to use for the messages's return-path
+     * -merge {Boolean} whether to evaluate merge tags in the message. Will automatically be set to true if either merge_vars or global_merge_vars are provided.
+     * -merge_language {String} the merge tag language to use when evaluating merge tags, either mailchimp or handlebars
+     * -global_merge_vars {Array} global merge variables to use for all recipients. You can override these per recipient.
+     *      -global_merge_vars[] {Object} a single global merge variable
+     *          -name {String} the global merge variable's name. Merge variable names are case-insensitive and may not start with _
+     *          -content {Mixed} the global merge variable's content
+     * -merge_vars {Array} per-recipient merge variables, which override global merge variables with the same name.
+     *      -merge_vars[] {Object} per-recipient merge variables
+     *          -rcpt {String} the email address of the recipient that the merge variables should apply to
+     *          -vars {Array} the recipient's merge variables
+     *              -vars[] {Object} a single merge variable
+     *                  -name {String} the merge variable's name. Merge variable names are case-insensitive and may not start with _
+     *                  -content {Mixed} the merge variable's content
+     * -tags {Array} an array of string to tag the message with.  Stats are accumulated using tags, though we only store the first 100 we see, so this should not be unique or change frequently.  Tags should be 50 characters or less.  Any tags starting with an underscore are reserved for internal use and will cause errors.
+     *      -tags[] {String} a single tag - must not start with an underscore
+     * -subaccount {String} the unique id of a subaccount for this message - must already exist or will fail with an error
+     * -google_analytics_domains {Array} an array of strings indicating for which any matching URLs will automatically have Google Analytics parameters appended to their query string automatically.
+     * -google_analytics_campaign {Array|string} optional string indicating the value to set for the utm_campaign tracking parameter. If this isn't provided the email's from address will be used instead.
+     * -metadata {Array} metadata an associative array of user metadata. Mandrill will store this metadata and make it available for retrieval. In addition, you can select up to 10 metadata fields to index and make searchable using the Mandrill search api.
+     * -recipient_metadata {Array} Per-recipient metadata that will override the global values specified in the metadata parameter.
+     *       -recipient_metadata[] {Object} metadata for a single recipient
+     *           -rcpt {String} the email address of the recipient that the metadata is associated with
+     *           -values {Array} an associated array containing the recipient's unique metadata. If a key exists in both the per-recipient metadata and the global metadata, the per-recipient metadata will be used.
+     * -attachments {Array} an array of supported attachments to add to the message
+     *      -attachments[] {Object} a single supported attachment
+     *          -type {String} the MIME type of the attachment
+     *          -name {String} the file name of the attachment
+     *          -content {String} the content of the attachment as a base64-encoded string
+     * -images {Array} an array of embedded images to add to the message
+     *      -images[] {Object} a single embedded image
+     *          -type {String} the MIME type of the image - must start with "image/"
+     *          -name {String} the Content ID of the image - use <img src="cid:THIS_VALUE"> to reference the image in your HTML content
+     *          -content {String} the content of the image as a base64-encoded string
+     * @option params {Boolean} async enable a background sending mode that is optimized for bulk sending. In async mode, messages/send will immediately return a status of "queued" for every recipient. To handle rejections when sending in async mode, set up a webhook for the 'reject' event. Defaults to false for messages with no more than 10 recipients; messages with more than 10 recipients are always sent asynchronously, regardless of the value of async.
+     * @option params {String} ip_pool the name of the dedicated ip pool that should be used to send the message. If you do not have any dedicated IPs, this parameter has no effect. If you specify a pool that does not exist, your default pool will be used instead.
+     * @option params {String} send_at when this message should be sent as a UTC timestamp in YYYY-MM-DD HH:MM:SS format. If you specify a time in the past, the message will be sent immediately. An additional fee applies for scheduled email, and this feature is only available to accounts with a positive balance.
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    sendTemplate(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Search recently sent messages and optionally narrow by date range, tags, senders, and API keys. If no date range is specified, results within the last 7 days are returned. This method may be called up to 20 times per minute. If you need the data more often, you can use <a href="/api/docs/messages.html#method=info">/messages/info.json</a> to get the information for a single message, or <a href="http://help.mandrill.com/entries/21738186-Introduction-to-Webhooks">webhooks</a> to push activity to your own application for querying.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} query <a href="http://help.mandrill.com/entries/22211902">search terms</a> to find matching messages
+     * @option params {String} date_from start date
+     * @option params {String} date_to end date
+     * @option params {Array} tags an array of tag names to narrow the search to, will return messages that contain ANY of the tags
+     * @option params {Array} senders an array of sender addresses to narrow the search to, will return messages sent by ANY of the senders
+     * @option params {Array} api_keys an array of API keys to narrow the search to, will return messages sent by ANY of the keys
+     * @option params {Integer} limit the maximum number of results to return, defaults to 100, 1000 is the maximum
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    search(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Search the content of recently sent messages and return the aggregated hourly stats for matching messages
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} query the search terms to find matching messages for
+     * @option params {String} date_from start date
+     * @option params {String} date_to end date
+     * @option params {Array} tags an array of tag names to narrow the search to, will return messages that contain ANY of the tags
+     * @option params {Array} senders an array of sender addresses to narrow the search to, will return messages sent by ANY of the senders
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    searchTimeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Get the information for a single recently sent message
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id the unique id of the message to get - passed as the "_id" field in webhooks, send calls, or search calls
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Get the full content of a recently sent message
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id the unique id of the message to get - passed as the "_id" field in webhooks, send calls, or search calls
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    content(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Parse the full MIME document for an email message, returning the content of the message broken into its constituent pieces
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} raw_message the full MIME document of an email message
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    parse(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Take a raw MIME document for a message, and send it exactly as if it were sent through Mandrill's SMTP servers
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} raw_message the full MIME document of an email message
+     * @option params {String|null} from_email optionally define the sender address - otherwise we'll use the address found in the provided headers
+     * @option params {String|null} from_name optionally define the sender alias
+     * @option params {Array|null} to optionally define the recipients to receive the message - otherwise we'll use the To, Cc, and Bcc headers provided in the document
+     * -to[] {String} the email address of the recipient
+     * @option params {Boolean} async enable a background sending mode that is optimized for bulk sending. In async mode, messages/sendRaw will immediately return a status of "queued" for every recipient. To handle rejections when sending in async mode, set up a webhook for the 'reject' event. Defaults to false for messages with no more than 10 recipients; messages with more than 10 recipients are always sent asynchronously, regardless of the value of async.
+     * @option params {String} ip_pool the name of the dedicated ip pool that should be used to send the message. If you do not have any dedicated IPs, this parameter has no effect. If you specify a pool that does not exist, your default pool will be used instead.
+     * @option params {String} send_at when this message should be sent as a UTC timestamp in YYYY-MM-DD HH:MM:SS format. If you specify a time in the past, the message will be sent immediately.
+     * @option params {String} return_path_domain a custom domain to use for the messages's return-path
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    sendRaw(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Queries your scheduled emails by sender or recipient, or both.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} to an optional recipient address to restrict results to
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    listScheduled(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Cancels a scheduled email.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id a scheduled email id, as returned by any of the messages/send calls or messages/list-scheduled
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    cancelScheduled(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Reschedules a scheduled email.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id a scheduled email id, as returned by any of the messages/send calls or messages/list-scheduled
+     * @option params {String} send_at the new UTC timestamp when the message should sent. Mandrill can't time travel, so if you specify a time in past the message will be sent immediately
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    reschedule(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+}
+
+export declare class Whitelists {
+    constructor(master: Mandrill);
+
+    /**
+     * Adds an email to your email rejection whitelist. If the address is
+     * currently on your blacklist, that blacklist entry will be removed
+     * automatically.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} email an email address to add to the whitelist
+     * @option params {String} comment an optional description of why the email was whitelisted
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Retrieves your email rejection whitelist. You can provide an email
+     * address or search prefix to limit the results. Returns up to 1000 results.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} email an optional email address or prefix to search by
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Removes an email address from the whitelist.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} email the email address to remove from the whitelist
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+}
+
+export declare class Ips {
+    constructor(master: Mandrill);
+
+    /**
+     * Lists your dedicated IPs.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Retrieves information about a single dedicated ip.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} ip a dedicated IP address
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Requests an additional dedicated IP for your account. Accounts may
+     * have one outstanding request at any time, and provisioning requests
+     * are processed within 24 hours.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {Boolean} warmup whether to enable warmup mode for the ip
+     * @option params {String} pool the id of the pool to add the dedicated ip to, or null to use your account's default pool
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    provision(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Begins the warmup process for a dedicated IP. During the warmup process,
+     * Mandrill will gradually increase the percentage of your mail that is sent over
+     * the warming-up IP, over a period of roughly 30 days. The rest of your mail
+     * will be sent over shared IPs or other dedicated IPs in the same pool.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} ip a dedicated ip address
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    startWarmup(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Cancels the warmup process for a dedicated IP.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} ip a dedicated ip address
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    cancelWarmup(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Moves a dedicated IP to a different pool.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} ip a dedicated ip address
+     * @option params {String} pool the name of the new pool to add the dedicated ip to
+     * @option params {Boolean} create_pool whether to create the pool if it does not exist; if false and the pool does not exist, an Unknown_Pool will be thrown.
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    setPool(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Deletes a dedicated IP. This is permanent and cannot be undone.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} ip the dedicated ip to remove from your account
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Lists your dedicated IP pools.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    listPools(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Describes a single dedicated IP pool.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} pool a pool name
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    poolInfo(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Creates a pool and returns it. If a pool already exists with this
+     * name, no action will be performed.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} pool the name of a pool to create
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    createPool(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Deletes a pool. A pool must be empty before you can delete it, and you cannot delete your default pool.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} pool the name of the pool to delete
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    deletePool(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Tests whether a domain name is valid for use as the custom reverse
+     * DNS for a dedicated IP.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} ip a dedicated ip address
+     * @option params {String} domain the domain name to test
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    checkCustomDns(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Configures the custom DNS name for a dedicated IP.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} ip a dedicated ip address
+     * @option params {String} domain a domain name to set as the dedicated IP's custom dns name.
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    setCustomDns(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+}
+
+export declare class Internal {
+    constructor(master: Mandrill);
+}
+
+export declare class Subaccounts {
+    constructor(master: Mandrill);
+
+    /**
+     * Get the list of subaccounts defined for the account, optionally filtered by a prefix
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} q an optional prefix to filter the subaccounts' ids and names
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Add a new subaccount
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id a unique identifier for the subaccount to be used in sending calls
+     * @option params {String} name an optional display name to further identify the subaccount
+     * @option params {String} notes optional extra text to associate with the subaccount
+     * @option params {Integer} custom_quota an optional manual hourly quota for the subaccount. If not specified, Mandrill will manage this based on reputation
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Given the ID of an existing subaccount, return the data about it
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id the unique identifier of the subaccount to query
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Update an existing subaccount
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id the unique identifier of the subaccount to update
+     * @option params {String} name an optional display name to further identify the subaccount
+     * @option params {String} notes optional extra text to associate with the subaccount
+     * @option params {Integer} custom_quota an optional manual hourly quota for the subaccount. If not specified, Mandrill will manage this based on reputation
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    update(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Delete an existing subaccount. Any email related to the subaccount will be saved, but stats will be removed and any future sending calls to this subaccount will fail.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id the unique identifier of the subaccount to delete
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Pause a subaccount's sending. Any future emails delivered to this subaccount will be queued for a maximum of 3 days until the subaccount is resumed.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id the unique identifier of the subaccount to pause
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    pause(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Resume a paused subaccount's sending
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id the unique identifier of the subaccount to resume
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    resume(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+}
+
+export declare class Urls {
+    constructor(master: Mandrill);
+
+    /**
+     * Get the 100 most clicked URLs
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Return the 100 most clicked URLs that match the search query given
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} q a search query
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    search(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Return the recent history (hourly stats for the last 30 days) for a url
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} url an existing URL
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    timeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Get the list of tracking domains set up for this account
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    trackingDomains(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Add a tracking domain to your account
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} domain a domain name
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    addTrackingDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Checks the CNAME settings for a tracking domain. The domain must have been added already with the add-tracking-domain call
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} domain an existing tracking domain name
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    checkTrackingDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+}
+
+export declare class Webhooks {
+    constructor(master: Mandrill);
+
+    /**
+     * Get the list of all webhooks defined on the account
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Add a new webhook
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} url the URL to POST batches of events
+     * @option params {String} description an optional description of the webhook
+     * @option params {Array} events an optional list of events that will be posted to the webhook
+     *    - events[] {String} the individual event to listen for
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Given the ID of an existing webhook, return the data about it
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {Integer} id the unique identifier of a webhook belonging to this account
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Update an existing webhook
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {Integer} id the unique identifier of a webhook belonging to this account
+     * @option params {String} url the URL to POST batches of events
+     * @option params {String} description an optional description of the webhook
+     * @option params {Array} events an optional list of events that will be posted to the webhook
+     *    - events[] {String} the individual event to listen for
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    update(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Delete an existing webhook
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {Integer} id the unique identifier of a webhook belonging to this account
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    delete(params: { id: number }, onsuccess?: ICallback, onerror?: ICallback): void;
+
+}
+
+export declare class Senders {
+    constructor(master: Mandrill);
+
+    /**
+     * Return the senders that have tried to use this account.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Returns the sender domains that have been added to this account.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    domains(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Adds a sender domain to your account. Sender domains are added automatically as you
+     * send, but you can use this call to add them ahead of time.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} domain a domain name
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    addDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Checks the SPF and DKIM settings for a domain. If you haven't already added this domain to your
+     * account, it will be added automatically.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} domain a domain name
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    checkDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Sends a verification email in order to verify ownership of a domain.
+     * Domain verification is an optional step to confirm ownership of a domain. Once a
+     * domain has been verified in a Mandrill account, other accounts may not have their
+     * messages signed by that domain unless they also verify the domain. This prevents
+     * other Mandrill accounts from sending mail signed by your domain.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} domain a domain name at which you can receive email
+     * @option params {String} mailbox a mailbox at the domain where the verification email should be sent
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    verifyDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Return more detailed information about a single sender, including aggregates of recent stats
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} address the email address of the sender
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Return the recent history (hourly stats for the last 30 days) for a sender
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} address the email address of the sender
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    timeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+}
+
+export declare class Metadata {
+    constructor(master: Mandrill);
+    /**
+     * Get the list of custom metadata fields indexed for the account.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+    /**
+     * Add a new custom metadata field to be indexed for the account.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} name a unique identifier for the metadata field
+     * @option params {String} view_template optional Mustache template to control how the metadata is rendered in your activity log
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+    /**
+     * Update an existing custom metadata field.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} name the unique identifier of the metadata field to update
+     * @option params {String} view_template optional Mustache template to control how the metadata is rendered in your activity log
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    update(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+    /**
+     * Delete an existing custom metadata field. Deletion isn't instataneous, and /metadata/list will continue to return the field until the asynchronous deletion process is complete.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} name the unique identifier of the metadata field to update
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+}
diff --git a/mandrill-api/mandrill-api.d.ts b/mandrill-api/mandrill-api.d.ts
deleted file mode 100644
index 7192271952..0000000000
--- a/mandrill-api/mandrill-api.d.ts
+++ /dev/null
@@ -1,1182 +0,0 @@
-// Type definitions for Mandrill API 1.x
-// Project: http://mandrill.com/
-// Definitions by: Paulo Cesar <https://github.com/pocesar/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/* =================== USAGE ===================
-
-    import mandrill from 'mandrill-api';
-
- =============================================== */
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'mandrill-api' {
-
-    export interface ICallback {
-        (json: Object): void;
-    }
-
-    export interface IErrorCallback {
-        (err: Error): void;
-    }
-
-    export class Mandrill {
-        apikey: string;
-        debug: boolean;
-        templates: Templates;
-        exports: Exports;
-        users: Users;
-        rejects: Rejects;
-        inbound: Inbound;
-        tags: Tags;
-        messages: Messages;
-        whitelists: Whitelists;
-        ips: Ips;
-        internal: Internal;
-        subaccounts: Subaccounts;
-        urls: Urls;
-        webhooks: Webhooks;
-        senders: Senders;
-        metadata: Metadata;
-        onerror: IErrorCallback;
-        constructor(apikey: string, debug?: boolean);
-        call(uri: string, params: any, onresult?: ICallback, onerror?: ICallback): void;
-    }
-
-    export class Templates {
-        constructor(master: Mandrill);
-
-        /**
-         * Add a new template
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} name the name for the new template - must be unique
-         * @option params {String} from_email a default sending address for emails sent using this template
-         * @option params {String} from_name a default from name to be used
-         * @option params {String} subject a default subject line to be used
-         * @option params {String} code the HTML code for the template with mc:edit attributes for the editable elements
-         * @option params {String} text a default text part to be used when sending with this template
-         * @option params {Boolean} publish set to false to add a draft template without publishing
-         * @option params {Array} labels an optional array of up to 10 labels to use for filtering templates
-         *    - labels[] {String} a single label
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Get the information for an existing template
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} name the immutable name of an existing template
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Update the code for an existing template. If null is provided for any fields, the values will remain unchanged.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} name the immutable name of an existing template
-         * @option params {String} from_email the new default sending address
-         * @option params {String} from_name the new default from name
-         * @option params {String} subject the new default subject line
-         * @option params {String} code the new code for the template
-         * @option params {String} text the new default text part to be used
-         * @option params {Boolean} publish set to false to update the draft version of the template without publishing
-         * @option params {Array} labels an optional array of up to 10 labels to use for filtering templates
-         *    - labels[] {String} a single label
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        update(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Publish the content for the template. Any new messages sent using this template will start using the content that was previously in draft.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} name the immutable name of an existing template
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        publish(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Delete a template
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} name the immutable name of an existing template
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Return a list of all the templates available to this user
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} label an optional label to filter the templates
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Return the recent history (hourly stats for the last 30 days) for a template
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} name the name of an existing template
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        timeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Inject content and optionally merge fields into a template, returning the HTML that results
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} template_name the immutable name of a template that exists in the user's account
-         * @option params {Array} template_content an array of template content to render.  Each item in the array should be a struct with two keys - name: the name of the content block to set the content for, and content: the actual content to put into the block
-         *    - template_content[] {Object} the injection of a single piece of content into a single editable region
-         *        - name {String} the name of the mc:edit editable region to inject into
-         *        - content {String} the content to inject
-         * @option params {Array} merge_vars optional merge variables to use for injecting merge field content.  If this is not provided, no merge fields will be replaced.
-         *    - merge_vars[] {Object} a single merge variable
-         *        - name {String} the merge variable's name. Merge variable names are case-insensitive and may not start with _
-         *        - content {String} the merge variable's content
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        render(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-    }
-
-    export class Exports {
-        constructor(master: Mandrill);
-
-        /**
-         * Returns information about an export job. If the export job's state is 'complete',
-         * the returned data will include a URL you can use to fetch the results. Every export
-         * job produces a zip archive, but the format of the archive is distinct for each job
-         * type. The api calls that initiate exports include more details about the output format
-         * for that job type.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id an export job identifier
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Returns a list of your exports.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Begins an export of your rejection blacklist. The blacklist will be exported to a zip archive
-         * containing a single file named rejects.csv that includes the following fields: email,
-         * reason, detail, created_at, expires_at, last_event_at, expires_at.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} notify_email an optional email address to notify when the export job has finished.
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        rejects(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Begins an export of your rejection whitelist. The whitelist will be exported to a zip archive
-         * containing a single file named whitelist.csv that includes the following fields:
-         * email, detail, created_at.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} notify_email an optional email address to notify when the export job has finished.
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        whitelist(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Begins an export of your activity history. The activity will be exported to a zip archive
-         * containing a single file named activity.csv in the same format as you would be able to export
-         * from your account's activity view. It includes the following fields: Date, Email Address,
-         * Sender, Subject, Status, Tags, Opens, Clicks, Bounce Detail. If you have configured any custom
-         * metadata fields, they will be included in the exported data.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} notify_email an optional email address to notify when the export job has finished
-         * @option params {String} date_from start date as a UTC string in YYYY-MM-DD HH:MM:SS format
-         * @option params {String} date_to end date as a UTC string in YYYY-MM-DD HH:MM:SS format
-         * @option params {Array} tags an array of tag names to narrow the export to; will match messages that contain ANY of the tags
-         *      - tags[] {String} a tag name
-         * @option params {Array} senders an array of senders to narrow the export to
-         *      - senders[] {String} a sender address
-         * @option params {Array} states an array of states to narrow the export to; messages with ANY of the states will be included
-         *      - states[] {String} a message state
-         * @option params {Array} api_keys an array of api keys to narrow the export to; messsagse sent with ANY of the keys will be included
-         *      - api_keys[] {String} an API key associated with your account
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        activity(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-    }
-
-    export class Users {
-        constructor(master: Mandrill);
-
-        /**
-         * Return the information about the API-connected user
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Validate an API key and respond to a ping
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        ping(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Validate an API key and respond to a ping (anal JSON parser version)
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        ping2(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Return the senders that have tried to use this account, both verified and unverified
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        senders(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-    }
-
-    export class Rejects {
-        constructor(master: Mandrill);
-
-        /**
-         * Adds an email to your email rejection blacklist. Addresses that you
-         * add manually will never expire and there is no reputation penalty
-         * for removing them from your blacklist. Attempting to blacklist an
-         * address that has been whitelisted will have no effect.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} email an email address to block
-         * @option params {String} comment an optional comment describing the rejection
-         * @option params {String} subaccount an optional unique identifier for the subaccount to limit the blacklist entry
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Retrieves your email rejection blacklist. You can provide an email
-         * address to limit the results. Returns up to 1000 results. By default,
-         * entries that have expired are excluded from the results; set
-         * include_expired to true to include them.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} email an optional email address to search by
-         * @option params {Boolean} include_expired whether to include rejections that have already expired.
-         * @option params {String} subaccount an optional unique identifier for the subaccount to limit the blacklist
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Deletes an email rejection. There is no limit to how many rejections
-         * you can remove from your blacklist, but keep in mind that each deletion
-         * has an affect on your reputation.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} email an email address
-         * @option params {String} subaccount an optional unique identifier for the subaccount to limit the blacklist deletion
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-    }
-
-    export class Inbound {
-        constructor(master: Mandrill);
-
-        /**
-         * List the domains that have been configured for inbound delivery
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        domains(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Add an inbound domain to your account
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} domain a domain name
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        addDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Check the MX settings for an inbound domain. The domain must have already been added with the add-domain call
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} domain an existing inbound domain
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        checkDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Delete an inbound domain from the account. All mail will stop routing for this domain immediately.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} domain an existing inbound domain
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        deleteDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * List the mailbox routes defined for an inbound domain
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} domain the domain to check
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        routes(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Add a new mailbox route to an inbound domain
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} domain an existing inbound domain
-         * @option params {String} pattern the search pattern that the mailbox name should match
-         * @option params {String} url the webhook URL where the inbound messages will be published
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        addRoute(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Update the pattern or webhook of an existing inbound mailbox route. If null is provided for any fields, the values will remain unchanged.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id the unique identifier of an existing mailbox route
-         * @option params {String} pattern the search pattern that the mailbox name should match
-         * @option params {String} url the webhook URL where the inbound messages will be published
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        updateRoute(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Delete an existing inbound mailbox route
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id the unique identifier of an existing route
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        deleteRoute(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Take a raw MIME document destined for a domain with inbound domains set up, and send it to the inbound hook exactly as if it had been sent over SMTP
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} raw_message the full MIME document of an email message
-         * @option params {Array|null} to optionally define the recipients to receive the message - otherwise we'll use the To, Cc, and Bcc headers provided in the document
-         *      - to[] {String} the email address of the recipient
-         * @option params {String} mail_from the address specified in the MAIL FROM stage of the SMTP conversation. Required for the SPF check.
-         * @option params {String} helo the identification provided by the client mta in the MTA state of the SMTP conversation. Required for the SPF check.
-         * @option params {String} client_address the remote MTA's ip address. Optional; required for the SPF check.
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        sendRaw(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-    }
-
-    export class Tags {
-        constructor(master: Mandrill);
-
-        /**
-         * Return all of the user-defined tag information
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Deletes a tag permanently. Deleting a tag removes the tag from any messages
-         * that have been sent, and also deletes the tag's stats. There is no way to
-         * undo this operation, so use it carefully.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} tag a tag name
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Return more detailed information about a single tag, including aggregates of recent stats
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} tag an existing tag name
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Return the recent history (hourly stats for the last 30 days) for a tag
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} tag an existing tag name
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        timeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Return the recent history (hourly stats for the last 30 days) for all tags
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        allTimeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-    }
-
-    export class Messages {
-        constructor(master: Mandrill);
-
-        /**
-         * Send a new transactional message through Mandrill
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {Struct} message the information on the message to send
-         * -html {String} the full HTML content to be sent
-         * -text {String} optional full text content to be sent
-         * -subject {String} the message subject
-         * -from_email {String} the sender email address.
-         * -from_name {String} optional from name to be used
-         * -to {Array} an array of recipient information.
-         *      -to[] {Object} a single recipient's information.
-         *      -email {String} the email address of the recipient
-         *      -name {String} the optional display name to use for the recipient
-         *      -type {String} the header type to use for the recipient, defaults to "to" if not provided
-         * -headers {Object} optional extra headers to add to the message (most headers are allowed)
-         * -important {Boolean} whether or not this message is important, and should be delivered ahead of non-important messages
-         * -track_opens {Boolean} whether or not to turn on open tracking for the message
-         * -track_clicks {Boolean} whether or not to turn on click tracking for the message
-         * -auto_text {Boolean} whether or not to automatically generate a text part for messages that are not given text
-         * -auto_html {Boolean} whether or not to automatically generate an HTML part for messages that are not given HTML
-         * -inline_css {Boolean} whether or not to automatically inline all CSS styles provided in the message HTML - only for HTML documents less than 256KB in size
-         * -url_strip_qs {Boolean} whether or not to strip the query string from URLs when aggregating tracked URL data
-         * -preserve_recipients {Boolean} whether or not to expose all recipients in to "To" header for each email
-         * -view_content_link {Boolean} set to false to remove content logging for sensitive emails
-         * -bcc_address {String} an optional address to receive an exact copy of each recipient's email
-         * -tracking_domain {String} a custom domain to use for tracking opens and clicks instead of mandrillapp.com
-         * -signing_domain {String} a custom domain to use for SPF/DKIM signing instead of mandrill (for "via" or "on behalf of" in email clients)
-         * -return_path_domain {String} a custom domain to use for the messages's return-path
-         * -merge {Boolean} whether to evaluate merge tags in the message. Will automatically be set to true if either merge_vars or global_merge_vars are provided.
-         * -merge_language {String} the merge tag language to use when evaluating merge tags, either mailchimp or handlebars
-         * -global_merge_vars {Array} global merge variables to use for all recipients. You can override these per recipient.
-         *      -global_merge_vars[] {Object} a single global merge variable
-         *      -name {String} the global merge variable's name. Merge variable names are case-insensitive and may not start with _
-         *      -content {Mixed} the global merge variable's content
-         * -merge_vars {Array} per-recipient merge variables, which override global merge variables with the same name.
-         *   -merge_vars[] {Object} per-recipient merge variables
-         *      -rcpt {String} the email address of the recipient that the merge variables should apply to
-         *      -vars {Array} the recipient's merge variables
-         *          -vars[] {Object} a single merge variable
-         *          -name {String} the merge variable's name. Merge variable names are case-insensitive and may not start with _
-         *          -content {Mixed} the merge variable's content
-         * -tags {Array} an array of string to tag the message with.  Stats are accumulated using tags, though we only store the first 100 we see, so this should not be unique or change frequently.  Tags should be 50 characters or less.  Any tags starting with an underscore are reserved for internal use and will cause errors.
-         *      -tags[] {String} a single tag - must not start with an underscore
-         * -subaccount {String} the unique id of a subaccount for this message - must already exist or will fail with an error
-         * -google_analytics_domains {Array} an array of strings indicating for which any matching URLs will automatically have Google Analytics parameters appended to their query string automatically.
-         * -google_analytics_campaign {Array|string} optional string indicating the value to set for the utm_campaign tracking parameter. If this isn't provided the email's from address will be used instead.
-         * -metadata {Array} metadata an associative array of user metadata. Mandrill will store this metadata and make it available for retrieval. In addition, you can select up to 10 metadata fields to index and make searchable using the Mandrill search api.
-         * -recipient_metadata {Array} Per-recipient metadata that will override the global values specified in the metadata parameter.
-         *      -recipient_metadata[] {Object} metadata for a single recipient
-         *          -rcpt {String} the email address of the recipient that the metadata is associated with
-         *          -values {Array} an associated array containing the recipient's unique metadata. If a key exists in both the per-recipient metadata and the global metadata, the per-recipient metadata will be used.
-         * -attachments {Array} an array of supported attachments to add to the message
-         *      -attachments[] {Object} a single supported attachment
-         *          -type {String} the MIME type of the attachment
-         *          -name {String} the file name of the attachment
-         *          -content {String} the content of the attachment as a base64-encoded string
-         * -images {Array} an array of embedded images to add to the message
-         *      -images[] {Object} a single embedded image
-         *          -type {String} the MIME type of the image - must start with "image/"
-         *          -name {String} the Content ID of the image - use <img src="cid:THIS_VALUE"> to reference the image in your HTML content
-         *          -content {String} the content of the image as a base64-encoded string
-         * @option params {Boolean} async enable a background sending mode that is optimized for bulk sending. In async mode, messages/send will immediately return a status of "queued" for every recipient. To handle rejections when sending in async mode, set up a webhook for the 'reject' event. Defaults to false for messages with no more than 10 recipients; messages with more than 10 recipients are always sent asynchronously, regardless of the value of async.
-         * @option params {String} ip_pool the name of the dedicated ip pool that should be used to send the message. If you do not have any dedicated IPs, this parameter has no effect. If you specify a pool that does not exist, your default pool will be used instead.
-         * @option params {String} send_at when this message should be sent as a UTC timestamp in YYYY-MM-DD HH:MM:SS format. If you specify a time in the past, the message will be sent immediately. An additional fee applies for scheduled email, and this feature is only available to accounts with a positive balance.
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        send(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Send a new transactional message through Mandrill using a template
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} template_name the immutable name or slug of a template that exists in the user's account. For backwards-compatibility, the template name may also be used but the immutable slug is preferred.
-         * @option params {Array} template_content an array of template content to send.  Each item in the array should be a struct with two keys - name: the name of the content block to set the content for, and content: the actual content to put into the block
-         * -template_content[] {Object} the injection of a single piece of content into a single editable region
-         *     -name {String} the name of the mc:edit editable region to inject into
-         *     -content {String} the content to inject
-         * @option params {Struct} message the other information on the message to send - same as /messages/send, but without the html content
-         * -html {String} optional full HTML content to be sent if not in template
-         * -text {String} optional full text content to be sent
-         * -subject {String} the message subject
-         * -from_email {String} the sender email address.
-         * -from_name {String} optional from name to be used
-         * -to {Array} an array of recipient information.
-         *      -to[] {Object} a single recipient's information.
-         *         -email {String} the email address of the recipient
-         *         -name {String} the optional display name to use for the recipient
-         *         -type {String} the header type to use for the recipient, defaults to "to" if not provided
-         * -headers {Object} optional extra headers to add to the message (most headers are allowed)
-         * -important {Boolean} whether or not this message is important, and should be delivered ahead of non-important messages
-         * -track_opens {Boolean} whether or not to turn on open tracking for the message
-         * -track_clicks {Boolean} whether or not to turn on click tracking for the message
-         * -auto_text {Boolean} whether or not to automatically generate a text part for messages that are not given text
-         * -auto_html {Boolean} whether or not to automatically generate an HTML part for messages that are not given HTML
-         * -inline_css {Boolean} whether or not to automatically inline all CSS styles provided in the message HTML - only for HTML documents less than 256KB in size
-         * -url_strip_qs {Boolean} whether or not to strip the query string from URLs when aggregating tracked URL data
-         * -preserve_recipients {Boolean} whether or not to expose all recipients in to "To" header for each email
-         * -view_content_link {Boolean} set to false to remove content logging for sensitive emails
-         * -bcc_address {String} an optional address to receive an exact copy of each recipient's email
-         * -tracking_domain {String} a custom domain to use for tracking opens and clicks instead of mandrillapp.com
-         * -signing_domain {String} a custom domain to use for SPF/DKIM signing instead of mandrill (for "via" or "on behalf of" in email clients)
-         * -return_path_domain {String} a custom domain to use for the messages's return-path
-         * -merge {Boolean} whether to evaluate merge tags in the message. Will automatically be set to true if either merge_vars or global_merge_vars are provided.
-         * -merge_language {String} the merge tag language to use when evaluating merge tags, either mailchimp or handlebars
-         * -global_merge_vars {Array} global merge variables to use for all recipients. You can override these per recipient.
-         *      -global_merge_vars[] {Object} a single global merge variable
-         *          -name {String} the global merge variable's name. Merge variable names are case-insensitive and may not start with _
-         *          -content {Mixed} the global merge variable's content
-         * -merge_vars {Array} per-recipient merge variables, which override global merge variables with the same name.
-         *      -merge_vars[] {Object} per-recipient merge variables
-         *          -rcpt {String} the email address of the recipient that the merge variables should apply to
-         *          -vars {Array} the recipient's merge variables
-         *              -vars[] {Object} a single merge variable
-         *                  -name {String} the merge variable's name. Merge variable names are case-insensitive and may not start with _
-         *                  -content {Mixed} the merge variable's content
-         * -tags {Array} an array of string to tag the message with.  Stats are accumulated using tags, though we only store the first 100 we see, so this should not be unique or change frequently.  Tags should be 50 characters or less.  Any tags starting with an underscore are reserved for internal use and will cause errors.
-         *      -tags[] {String} a single tag - must not start with an underscore
-         * -subaccount {String} the unique id of a subaccount for this message - must already exist or will fail with an error
-         * -google_analytics_domains {Array} an array of strings indicating for which any matching URLs will automatically have Google Analytics parameters appended to their query string automatically.
-         * -google_analytics_campaign {Array|string} optional string indicating the value to set for the utm_campaign tracking parameter. If this isn't provided the email's from address will be used instead.
-         * -metadata {Array} metadata an associative array of user metadata. Mandrill will store this metadata and make it available for retrieval. In addition, you can select up to 10 metadata fields to index and make searchable using the Mandrill search api.
-         * -recipient_metadata {Array} Per-recipient metadata that will override the global values specified in the metadata parameter.
-         *       -recipient_metadata[] {Object} metadata for a single recipient
-         *           -rcpt {String} the email address of the recipient that the metadata is associated with
-         *           -values {Array} an associated array containing the recipient's unique metadata. If a key exists in both the per-recipient metadata and the global metadata, the per-recipient metadata will be used.
-         * -attachments {Array} an array of supported attachments to add to the message
-         *      -attachments[] {Object} a single supported attachment
-         *          -type {String} the MIME type of the attachment
-         *          -name {String} the file name of the attachment
-         *          -content {String} the content of the attachment as a base64-encoded string
-         * -images {Array} an array of embedded images to add to the message
-         *      -images[] {Object} a single embedded image
-         *          -type {String} the MIME type of the image - must start with "image/"
-         *          -name {String} the Content ID of the image - use <img src="cid:THIS_VALUE"> to reference the image in your HTML content
-         *          -content {String} the content of the image as a base64-encoded string
-         * @option params {Boolean} async enable a background sending mode that is optimized for bulk sending. In async mode, messages/send will immediately return a status of "queued" for every recipient. To handle rejections when sending in async mode, set up a webhook for the 'reject' event. Defaults to false for messages with no more than 10 recipients; messages with more than 10 recipients are always sent asynchronously, regardless of the value of async.
-         * @option params {String} ip_pool the name of the dedicated ip pool that should be used to send the message. If you do not have any dedicated IPs, this parameter has no effect. If you specify a pool that does not exist, your default pool will be used instead.
-         * @option params {String} send_at when this message should be sent as a UTC timestamp in YYYY-MM-DD HH:MM:SS format. If you specify a time in the past, the message will be sent immediately. An additional fee applies for scheduled email, and this feature is only available to accounts with a positive balance.
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        sendTemplate(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Search recently sent messages and optionally narrow by date range, tags, senders, and API keys. If no date range is specified, results within the last 7 days are returned. This method may be called up to 20 times per minute. If you need the data more often, you can use <a href="/api/docs/messages.html#method=info">/messages/info.json</a> to get the information for a single message, or <a href="http://help.mandrill.com/entries/21738186-Introduction-to-Webhooks">webhooks</a> to push activity to your own application for querying.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} query <a href="http://help.mandrill.com/entries/22211902">search terms</a> to find matching messages
-         * @option params {String} date_from start date
-         * @option params {String} date_to end date
-         * @option params {Array} tags an array of tag names to narrow the search to, will return messages that contain ANY of the tags
-         * @option params {Array} senders an array of sender addresses to narrow the search to, will return messages sent by ANY of the senders
-         * @option params {Array} api_keys an array of API keys to narrow the search to, will return messages sent by ANY of the keys
-         * @option params {Integer} limit the maximum number of results to return, defaults to 100, 1000 is the maximum
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        search(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Search the content of recently sent messages and return the aggregated hourly stats for matching messages
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} query the search terms to find matching messages for
-         * @option params {String} date_from start date
-         * @option params {String} date_to end date
-         * @option params {Array} tags an array of tag names to narrow the search to, will return messages that contain ANY of the tags
-         * @option params {Array} senders an array of sender addresses to narrow the search to, will return messages sent by ANY of the senders
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        searchTimeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Get the information for a single recently sent message
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id the unique id of the message to get - passed as the "_id" field in webhooks, send calls, or search calls
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Get the full content of a recently sent message
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id the unique id of the message to get - passed as the "_id" field in webhooks, send calls, or search calls
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        content(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Parse the full MIME document for an email message, returning the content of the message broken into its constituent pieces
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} raw_message the full MIME document of an email message
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        parse(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Take a raw MIME document for a message, and send it exactly as if it were sent through Mandrill's SMTP servers
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} raw_message the full MIME document of an email message
-         * @option params {String|null} from_email optionally define the sender address - otherwise we'll use the address found in the provided headers
-         * @option params {String|null} from_name optionally define the sender alias
-         * @option params {Array|null} to optionally define the recipients to receive the message - otherwise we'll use the To, Cc, and Bcc headers provided in the document
-         * -to[] {String} the email address of the recipient
-         * @option params {Boolean} async enable a background sending mode that is optimized for bulk sending. In async mode, messages/sendRaw will immediately return a status of "queued" for every recipient. To handle rejections when sending in async mode, set up a webhook for the 'reject' event. Defaults to false for messages with no more than 10 recipients; messages with more than 10 recipients are always sent asynchronously, regardless of the value of async.
-         * @option params {String} ip_pool the name of the dedicated ip pool that should be used to send the message. If you do not have any dedicated IPs, this parameter has no effect. If you specify a pool that does not exist, your default pool will be used instead.
-         * @option params {String} send_at when this message should be sent as a UTC timestamp in YYYY-MM-DD HH:MM:SS format. If you specify a time in the past, the message will be sent immediately.
-         * @option params {String} return_path_domain a custom domain to use for the messages's return-path
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        sendRaw(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Queries your scheduled emails by sender or recipient, or both.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} to an optional recipient address to restrict results to
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        listScheduled(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Cancels a scheduled email.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id a scheduled email id, as returned by any of the messages/send calls or messages/list-scheduled
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        cancelScheduled(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Reschedules a scheduled email.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id a scheduled email id, as returned by any of the messages/send calls or messages/list-scheduled
-         * @option params {String} send_at the new UTC timestamp when the message should sent. Mandrill can't time travel, so if you specify a time in past the message will be sent immediately
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        reschedule(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-    }
-
-    export class Whitelists {
-        constructor(master: Mandrill);
-
-        /**
-         * Adds an email to your email rejection whitelist. If the address is
-         * currently on your blacklist, that blacklist entry will be removed
-         * automatically.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} email an email address to add to the whitelist
-         * @option params {String} comment an optional description of why the email was whitelisted
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Retrieves your email rejection whitelist. You can provide an email
-         * address or search prefix to limit the results. Returns up to 1000 results.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} email an optional email address or prefix to search by
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Removes an email address from the whitelist.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} email the email address to remove from the whitelist
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-    }
-
-    export class Ips {
-        constructor(master: Mandrill);
-
-        /**
-         * Lists your dedicated IPs.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Retrieves information about a single dedicated ip.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} ip a dedicated IP address
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Requests an additional dedicated IP for your account. Accounts may
-         * have one outstanding request at any time, and provisioning requests
-         * are processed within 24 hours.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {Boolean} warmup whether to enable warmup mode for the ip
-         * @option params {String} pool the id of the pool to add the dedicated ip to, or null to use your account's default pool
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        provision(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Begins the warmup process for a dedicated IP. During the warmup process,
-         * Mandrill will gradually increase the percentage of your mail that is sent over
-         * the warming-up IP, over a period of roughly 30 days. The rest of your mail
-         * will be sent over shared IPs or other dedicated IPs in the same pool.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} ip a dedicated ip address
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        startWarmup(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Cancels the warmup process for a dedicated IP.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} ip a dedicated ip address
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        cancelWarmup(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Moves a dedicated IP to a different pool.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} ip a dedicated ip address
-         * @option params {String} pool the name of the new pool to add the dedicated ip to
-         * @option params {Boolean} create_pool whether to create the pool if it does not exist; if false and the pool does not exist, an Unknown_Pool will be thrown.
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        setPool(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Deletes a dedicated IP. This is permanent and cannot be undone.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} ip the dedicated ip to remove from your account
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Lists your dedicated IP pools.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        listPools(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Describes a single dedicated IP pool.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} pool a pool name
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        poolInfo(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Creates a pool and returns it. If a pool already exists with this
-         * name, no action will be performed.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} pool the name of a pool to create
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        createPool(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Deletes a pool. A pool must be empty before you can delete it, and you cannot delete your default pool.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} pool the name of the pool to delete
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        deletePool(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Tests whether a domain name is valid for use as the custom reverse
-         * DNS for a dedicated IP.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} ip a dedicated ip address
-         * @option params {String} domain the domain name to test
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        checkCustomDns(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Configures the custom DNS name for a dedicated IP.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} ip a dedicated ip address
-         * @option params {String} domain a domain name to set as the dedicated IP's custom dns name.
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        setCustomDns(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-    }
-
-    export class Internal {
-        constructor(master: Mandrill);
-    }
-
-    export class Subaccounts {
-        constructor(master: Mandrill);
-
-        /**
-         * Get the list of subaccounts defined for the account, optionally filtered by a prefix
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} q an optional prefix to filter the subaccounts' ids and names
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Add a new subaccount
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id a unique identifier for the subaccount to be used in sending calls
-         * @option params {String} name an optional display name to further identify the subaccount
-         * @option params {String} notes optional extra text to associate with the subaccount
-         * @option params {Integer} custom_quota an optional manual hourly quota for the subaccount. If not specified, Mandrill will manage this based on reputation
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Given the ID of an existing subaccount, return the data about it
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id the unique identifier of the subaccount to query
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Update an existing subaccount
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id the unique identifier of the subaccount to update
-         * @option params {String} name an optional display name to further identify the subaccount
-         * @option params {String} notes optional extra text to associate with the subaccount
-         * @option params {Integer} custom_quota an optional manual hourly quota for the subaccount. If not specified, Mandrill will manage this based on reputation
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        update(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Delete an existing subaccount. Any email related to the subaccount will be saved, but stats will be removed and any future sending calls to this subaccount will fail.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id the unique identifier of the subaccount to delete
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Pause a subaccount's sending. Any future emails delivered to this subaccount will be queued for a maximum of 3 days until the subaccount is resumed.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id the unique identifier of the subaccount to pause
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        pause(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Resume a paused subaccount's sending
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id the unique identifier of the subaccount to resume
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        resume(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-    }
-
-    export class Urls {
-        constructor(master: Mandrill);
-
-        /**
-         * Get the 100 most clicked URLs
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Return the 100 most clicked URLs that match the search query given
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} q a search query
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        search(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Return the recent history (hourly stats for the last 30 days) for a url
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} url an existing URL
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        timeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Get the list of tracking domains set up for this account
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        trackingDomains(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Add a tracking domain to your account
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} domain a domain name
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        addTrackingDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Checks the CNAME settings for a tracking domain. The domain must have been added already with the add-tracking-domain call
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} domain an existing tracking domain name
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        checkTrackingDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-    }
-
-    export class Webhooks {
-        constructor(master: Mandrill);
-
-        /**
-         * Get the list of all webhooks defined on the account
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Add a new webhook
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} url the URL to POST batches of events
-         * @option params {String} description an optional description of the webhook
-         * @option params {Array} events an optional list of events that will be posted to the webhook
-         *    - events[] {String} the individual event to listen for
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Given the ID of an existing webhook, return the data about it
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {Integer} id the unique identifier of a webhook belonging to this account
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Update an existing webhook
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {Integer} id the unique identifier of a webhook belonging to this account
-         * @option params {String} url the URL to POST batches of events
-         * @option params {String} description an optional description of the webhook
-         * @option params {Array} events an optional list of events that will be posted to the webhook
-         *    - events[] {String} the individual event to listen for
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        update(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Delete an existing webhook
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {Integer} id the unique identifier of a webhook belonging to this account
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        delete(params: {id: number}, onsuccess?: ICallback, onerror?: ICallback): void;
-
-    }
-
-    export class Senders {
-        constructor(master: Mandrill);
-
-        /**
-         * Return the senders that have tried to use this account.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Returns the sender domains that have been added to this account.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        domains(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Adds a sender domain to your account. Sender domains are added automatically as you
-         * send, but you can use this call to add them ahead of time.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} domain a domain name
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        addDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Checks the SPF and DKIM settings for a domain. If you haven't already added this domain to your
-         * account, it will be added automatically.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} domain a domain name
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        checkDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Sends a verification email in order to verify ownership of a domain.
-         * Domain verification is an optional step to confirm ownership of a domain. Once a
-         * domain has been verified in a Mandrill account, other accounts may not have their
-         * messages signed by that domain unless they also verify the domain. This prevents
-         * other Mandrill accounts from sending mail signed by your domain.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} domain a domain name at which you can receive email
-         * @option params {String} mailbox a mailbox at the domain where the verification email should be sent
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        verifyDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Return more detailed information about a single sender, including aggregates of recent stats
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} address the email address of the sender
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Return the recent history (hourly stats for the last 30 days) for a sender
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} address the email address of the sender
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        timeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-    }
-
-    export class Metadata {
-        constructor(master: Mandrill);
-        /**
-         * Get the list of custom metadata fields indexed for the account.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-        /**
-         * Add a new custom metadata field to be indexed for the account.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} name a unique identifier for the metadata field
-         * @option params {String} view_template optional Mustache template to control how the metadata is rendered in your activity log
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-        /**
-         * Update an existing custom metadata field.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} name the unique identifier of the metadata field to update
-         * @option params {String} view_template optional Mustache template to control how the metadata is rendered in your activity log
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        update(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-        /**
-         * Delete an existing custom metadata field. Deletion isn't instataneous, and /metadata/list will continue to return the field until the asynchronous deletion process is complete.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} name the unique identifier of the metadata field to update
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-    }
-}
\ No newline at end of file
diff --git a/mandrill-api/mandrill-tests.ts b/mandrill-api/mandrill-tests.ts
index bbdaeb71fc..038a39214d 100644
--- a/mandrill-api/mandrill-tests.ts
+++ b/mandrill-api/mandrill-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="mandrill-api.d.ts" />
 
 import mandrill = require('mandrill-api');
 
diff --git a/mandrill-api/tsconfig.json b/mandrill-api/tsconfig.json
new file mode 100644
index 0000000000..68d1ae2dee
--- /dev/null
+++ b/mandrill-api/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mandrill-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mapbox/index.d.ts b/mapbox/index.d.ts
new file mode 100644
index 0000000000..34a12a8215
--- /dev/null
+++ b/mapbox/index.d.ts
@@ -0,0 +1,452 @@
+// Type definitions for Mapbox 1.6.3
+// Project: https://www.mapbox.com/mapbox.js/
+// Definitions by: Maxime Fabre <https://github.com/anahkiasen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="leaflet"/>
+
+//////////////////////////////////////////////////////////////////////
+///////////////////////////// MAP OBJECT /////////////////////////////
+//////////////////////////////////////////////////////////////////////
+
+// Map
+//////////////////////////////////////////////////////////////////////
+
+declare namespace L.mapbox {
+	var accessToken: string;
+
+	/**
+	 * Create and automatically configure a map with layers, markers, and interactivity.
+	 */
+	function map(element: string|Element, id: string, options?: MapOptions): L.mapbox.Map;
+	function map(element: string|Element, tilejson: any, options?: MapOptions): L.mapbox.Map;
+
+	interface MapOptions extends L.Map.MapOptions {
+		featureLayer?  : FeatureLayerOptions;
+		gridLayer?     : any;
+		tileLayer?     : TileLayerOptions;
+		infoControl?   : ControlOptions;
+		legendControl? : ControlOptions;
+		shareControl?  : ShareControlOptions;
+	}
+
+	interface FilterFunction {
+		(feature: any): boolean;
+	}
+
+	interface Map extends L.Map {
+		tileLayer    : L.mapbox.TileLayer;
+		gridLayer    : L.mapbox.GridLayer;
+		featureLayer : L.mapbox.FeatureLayer;
+
+		gridControl   : L.mapbox.GridControl;
+		infoControl   : L.mapbox.InfoControl;
+		legendControl : L.mapbox.LegendControl;
+		shareControl  : L.mapbox.ShareControl;
+
+		getTileJSON(): any;
+
+	}
+
+}
+
+//////////////////////////////////////////////////////////////////////
+/////////////////////////////// LAYERS ///////////////////////////////
+//////////////////////////////////////////////////////////////////////
+
+// TileLayer
+//////////////////////////////////////////////////////////////////////
+
+declare namespace L.mapbox {
+
+	/**
+	 * You can add a tiled layer to your map with L.mapbox.tileLayer(), a simple interface to layers from Mapbox and elsewhere.
+	 */
+	function tileLayer(id: string, options?: TileLayerOptions): L.mapbox.TileLayer;
+	function tileLayer(tilejson: any, options?: TileLayerOptions): L.mapbox.TileLayer;
+
+	interface TileLayerOptions extends L.TileLayerOptions {
+		retinaVersion?: string;
+	}
+
+	interface TileLayer extends L.TileLayer {
+
+		/**
+		 * Returns this layer's TileJSON object which determines its tile source, zoom bounds and other metadata.
+		 */
+		getTileJSON(): any;
+
+		/**
+		 * Set the image format of tiles in this layer. You can use lower-quality tiles in order to load maps faster
+		 */
+		setFormat(format: string): TileLayer;
+
+	}
+
+}
+
+// GridLayer
+//////////////////////////////////////////////////////////////////////
+
+declare namespace L.mapbox {
+
+	/**
+	 * An L.mapbox.gridLayer loads UTFGrid tiles of interactivity into your map, which you can easily access with L.mapbox.gridControl.
+	 */
+	function gridLayer(id: string): L.mapbox.GridLayer;
+	function gridLayer(tilejson: any): L.mapbox.GridLayer;
+
+	interface GridLayer {
+
+		active(): boolean;
+		addTo(map: L.mapbox.Map): any;
+		onAdd(map: L.mapbox.Map): any;
+		onRemove(): any;
+
+		/**
+		 * Bind an event handler to a given event on this L.mapbox.gridLayer instance. GridLayers expose a number of useful events that give you access to UTFGrid data as the user interacts with the map.
+		 */
+		on(event: string, handler: Function, context?: any): any;
+
+		/**
+		 * Returns this layer's TileJSON object which determines its tile source, zoom bounds and other metadata.
+		 */
+		getTileJSON(): any;
+
+		/**
+		 * Load data for a given latitude, longitude point on the map, and call the callback function with that data, if any.
+		 */
+		getData(latlng: L.LatLng, callback: Function): any;
+
+	}
+
+}
+
+// FeatureLayer
+//////////////////////////////////////////////////////////////////////
+
+declare namespace L.mapbox {
+
+	/**
+	 * L.mapbox.featureLayer provides an easy way to integrate GeoJSON from Mapbox and elsewhere into your map.
+	 */
+	function featureLayer(): L.mapbox.FeatureLayer;
+	function featureLayer(id: string, options?: FeatureLayerOptions): L.mapbox.FeatureLayer;
+	function featureLayer(geojson: any, options?: FeatureLayerOptions): L.mapbox.FeatureLayer;
+
+	interface FeatureLayerOptions {
+		filter?    : FilterFunction;
+		sanitizer? : (template: string) => string;
+	}
+
+	interface FeatureLayer extends L.FeatureGroup<L.ILayer> {
+
+		/**
+		 * Load GeoJSON data for this layer from the URL given by url.
+		 */
+		loadURL(url: string): any;
+
+		/**
+		 * Load marker GeoJSON data from a map with the given id on Mapbox.
+		 */
+		loadID(id: string): any;
+
+		/**
+		 * Sets the filter function for this data layer.
+		 */
+		setFilter(filter: FilterFunction): any;
+
+		/**
+		 * Gets the filter function for this data layer.
+		 */
+		getFilter(): FilterFunction;
+
+		/**
+		 * Set the contents of a markers layer: run the provided features through
+		 * the filter function and then through the factory function to create
+		 * elements for the map. If the layer already has features, they are
+		 * replaced with the new features. An empty array will clear the
+		 * layer of all features.
+		 */
+		setGeoJSON(geojson: any): L.mapbox.FeatureLayer;
+
+		/**
+		 * Get the contents of this layer as GeoJSON data.
+		 */
+		getGeoJSON(): any;
+
+	}
+
+}
+
+//////////////////////////////////////////////////////////////////////
+////////////////////////////// GEOCODING /////////////////////////////
+//////////////////////////////////////////////////////////////////////
+
+// Geocoder
+//////////////////////////////////////////////////////////////////////
+
+declare namespace L.mapbox {
+
+	/**
+	 * A low-level interface to geocoding, useful for more complex uses and reverse-geocoding.
+	 */
+	function geocoder(id: string): L.mapbox.Geocoder;
+
+	interface Geocoder {
+
+		getURL(): string;
+		setURL(url: string): any;
+		setID(id: string): any;
+		setTileJSON(tilejson: any): any;
+		queryURL(url: string): string;
+
+		/**
+		 * Queries the geocoder with a query string, and returns its result, if any.
+		 */
+		query(queryString: string, callback: Function): any;
+
+		/**
+		 * Queries the geocoder with a location, and returns its result, if any.
+		 */
+		reverseQuery(location: any, callback: Function): any;
+
+	}
+}
+
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////// CONTROLS ////////////////////////////
+//////////////////////////////////////////////////////////////////////
+
+declare namespace L.mapbox {
+	interface ControlOptions extends L.ControlOptions {
+		sanitizer?: (template: string) => string;
+	}
+}
+
+// InfoControl
+//////////////////////////////////////////////////////////////////////
+
+declare namespace L.mapbox {
+
+	/**
+	 * A map control that shows a toggleable info container. If set, attribution is auto-detected from active layers and added to the info container.
+	 */
+	function infoControl(options?: ControlOptions): InfoControl;
+
+	interface InfoControl extends L.Control {
+
+		onAdd(map: L.mapbox.Map): any;
+		onRemove(map: L.mapbox.Map): any;
+
+		/**
+		 * Adds an info string to infoControl.
+		 */
+		addInfo(info: string): any;
+
+		/**
+		 * Removes an info string from infoControl
+		 */
+		removeInfo(info: string): any;
+
+	}
+
+}
+
+// LegendControl
+//////////////////////////////////////////////////////////////////////
+
+declare namespace L.mapbox {
+
+	/**
+	 * A map control that shows legends added to maps in Mapbox.
+	 * Legends are auto-detected from active layers.
+	 */
+	function legendControl(options?: ControlOptions): LegendControl;
+
+	interface LegendControl extends L.Control {
+
+		onAdd(map: L.mapbox.Map): any;
+
+		/**
+		 * Adds a legend to the legendControl.
+		 */
+		addLegend(legend: string): any;
+
+		/**
+		 * Removes a legend from the legendControl.
+		 */
+		removeLegend(legend: string): any;
+
+	}
+
+}
+
+// GridControl
+//////////////////////////////////////////////////////////////////////
+
+declare namespace L.mapbox {
+
+	/**
+	 * Interaction is what we call interactive parts of maps that are created with
+	 * the powerful tooltips & regions system in TileMill. Under the hood, it's powered by the open UTFGrid specification.
+	 */
+	function gridControl(layer: string, options?: GridControlOptions): GridControl;
+
+	interface GridControlOptions extends ControlOptions {
+		template?    : string;
+		follow?      : boolean;
+		pinnable?    : boolean;
+		touchTeaser? : boolean;
+		location?    : boolean;
+	}
+
+	interface GridControl extends L.Control {
+
+		onAdd(map: L.mapbox.Map): any;
+		onRemove(map: L.mapbox.Map): any;
+
+		/**
+		 * If a tooltip is currently shown by the gridControl, hide and close it.
+		 */
+		hide(): any;
+
+		/**
+		 * Change the Mustache template used to transform the UTFGrid data in the map's interactivity into HTML for display.
+		 */
+		setTemplate(template: string): any;
+
+	}
+
+}
+
+// GeocoderControl
+//////////////////////////////////////////////////////////////////////
+
+declare namespace L.mapbox {
+
+	/**
+	 * Adds geocoder functionality as well as a UI element to a map. This uses the Mapbox Geocoding API.
+	 */
+	function geocoderControl(id: string, options?: GeocoderControlOptions): GeocoderControl;
+
+	interface GeocoderControlOptions extends L.ControlOptions {
+		keepOpen?: boolean;
+	}
+
+	interface GeocoderControl {
+
+		getURL(): string;
+		onAdd(map: L.mapbox.Map): any;
+
+
+		/**
+		 * Set the url used for geocoding.
+		 */
+		setURL(url: string): any;
+
+		/**
+		 * Set the map id used for geocoding.
+		 */
+		setID(id: string): any;
+
+		/**
+		 * Set the TileJSON used for geocoding.
+		 */
+		setTileJSON(tilejson: any): any;
+
+		/**
+		 * Bind a listener to an event emitted by the geocoder control. Supported additional events are
+		 */
+		on(event: string, callback: Function): any;
+
+	}
+
+}
+
+// ShareControl
+//////////////////////////////////////////////////////////////////////
+
+declare namespace L.mapbox {
+
+	/**
+	 * Adds a "Share" button to the map, which can be used to share the map to Twitter or Facebook, or generate HTML for a map embed.
+	 */
+	function shareControl(id: string, options?: ShareControlOptions): ShareControl;
+
+	interface ShareControlOptions extends L.ControlOptions {
+		url?: string;
+	}
+
+	interface ShareControl extends L.Control {
+
+		onAdd(map: L.mapbox.Map): any;
+
+	}
+
+}
+
+//////////////////////////////////////////////////////////////////////
+////////////////////////////// MARKERS ///////////////////////////////
+//////////////////////////////////////////////////////////////////////
+
+declare namespace L.mapbox.marker {
+
+	/**
+	 * A core icon generator used in L.mapbox.marker.style
+	 */
+	function icon(feature: any): L.Icon;
+
+	/**
+	 * An icon generator for use in conjunction with pointToLayer to generate markers from the Mapbox Markers API and support the simplestyle-spec for features.
+	 */
+	function style(feature: any, latlng: any): L.Marker;
+
+}
+
+//////////////////////////////////////////////////////////////////////
+////////////////////////////// SIMPLESTYLE ///////////////////////////
+//////////////////////////////////////////////////////////////////////
+
+declare namespace L.mapbox.simplestyle {
+
+	/**
+	 * Given a GeoJSON Feature with optional simplestyle-spec properties, return an options object formatted to be used as Leaflet Path options.
+	 */
+	function style(feature: any): L.PathOptions;
+
+}
+
+//////////////////////////////////////////////////////////////////////
+/////////////////////////////// UTILITY //////////////////////////////
+//////////////////////////////////////////////////////////////////////
+
+declare namespace L.mapbox {
+
+	/**
+	 * A HTML sanitization function, with the same effect as the default value of the sanitizer option of L.mapbox.featureLayer, L.mapbox.gridControl, and L.mapbox.legendControl.
+	 */
+	function sanitize(text: string): string;
+
+	/**
+	 * A mustache template rendering function, as used by the templating feature provided by L.mapbox.gridControl.
+	 */
+	function template(template: string, data?: any): string;
+
+}
+
+//////////////////////////////////////////////////////////////////////
+///////////////////////////// CONFIGURATION //////////////////////////
+//////////////////////////////////////////////////////////////////////
+
+declare namespace L.mapbox {
+	export class config {
+
+		static FORCE_HTTPS: boolean;
+
+		static HTTP_URLS: string[];
+
+		static HTTPS_URLS: string[];
+
+	}
+}
diff --git a/mapbox/mapbox-tests.ts b/mapbox/mapbox-tests.ts
index 0caebb0422..aaa7dd1c5f 100644
--- a/mapbox/mapbox-tests.ts
+++ b/mapbox/mapbox-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="mapbox.d.ts" />
+
 
 var mapboxTiles = L.tileLayer('https://{s}.tiles.mapbox.com/v3/examples.map-i87786ca/{z}/{x}/{y}.png', {
 	attribution: '<a href="http://www.mapbox.com/about/maps/" target="_blank">Terms &amp; Feedback</a>'
diff --git a/mapbox/mapbox.d.ts b/mapbox/mapbox.d.ts
deleted file mode 100644
index 9d341174ea..0000000000
--- a/mapbox/mapbox.d.ts
+++ /dev/null
@@ -1,452 +0,0 @@
-// Type definitions for Mapbox 1.6.3
-// Project: https://www.mapbox.com/mapbox.js/
-// Definitions by: Maxime Fabre <https://github.com/anahkiasen/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../leaflet/leaflet.d.ts"/>
-
-//////////////////////////////////////////////////////////////////////
-///////////////////////////// MAP OBJECT /////////////////////////////
-//////////////////////////////////////////////////////////////////////
-
-// Map
-//////////////////////////////////////////////////////////////////////
-
-declare namespace L.mapbox {
-	var accessToken: string;
-
-	/**
-	 * Create and automatically configure a map with layers, markers, and interactivity.
-	 */
-	function map(element: string|Element, id: string, options?: MapOptions): L.mapbox.Map;
-	function map(element: string|Element, tilejson: any, options?: MapOptions): L.mapbox.Map;
-
-	interface MapOptions extends L.Map.MapOptions {
-		featureLayer?  : FeatureLayerOptions;
-		gridLayer?     : any;
-		tileLayer?     : TileLayerOptions;
-		infoControl?   : ControlOptions;
-		legendControl? : ControlOptions;
-		shareControl?  : ShareControlOptions;
-	}
-
-	interface FilterFunction {
-		(feature: any): boolean;
-	}
-
-	interface Map extends L.Map {
-		tileLayer    : L.mapbox.TileLayer;
-		gridLayer    : L.mapbox.GridLayer;
-		featureLayer : L.mapbox.FeatureLayer;
-
-		gridControl   : L.mapbox.GridControl;
-		infoControl   : L.mapbox.InfoControl;
-		legendControl : L.mapbox.LegendControl;
-		shareControl  : L.mapbox.ShareControl;
-
-		getTileJSON(): any;
-
-	}
-
-}
-
-//////////////////////////////////////////////////////////////////////
-/////////////////////////////// LAYERS ///////////////////////////////
-//////////////////////////////////////////////////////////////////////
-
-// TileLayer
-//////////////////////////////////////////////////////////////////////
-
-declare namespace L.mapbox {
-
-	/**
-	 * You can add a tiled layer to your map with L.mapbox.tileLayer(), a simple interface to layers from Mapbox and elsewhere.
-	 */
-	function tileLayer(id: string, options?: TileLayerOptions): L.mapbox.TileLayer;
-	function tileLayer(tilejson: any, options?: TileLayerOptions): L.mapbox.TileLayer;
-
-	interface TileLayerOptions extends L.TileLayerOptions {
-		retinaVersion?: string;
-	}
-
-	interface TileLayer extends L.TileLayer {
-
-		/**
-		 * Returns this layer's TileJSON object which determines its tile source, zoom bounds and other metadata.
-		 */
-		getTileJSON(): any;
-
-		/**
-		 * Set the image format of tiles in this layer. You can use lower-quality tiles in order to load maps faster
-		 */
-		setFormat(format: string): TileLayer;
-
-	}
-
-}
-
-// GridLayer
-//////////////////////////////////////////////////////////////////////
-
-declare namespace L.mapbox {
-
-	/**
-	 * An L.mapbox.gridLayer loads UTFGrid tiles of interactivity into your map, which you can easily access with L.mapbox.gridControl.
-	 */
-	function gridLayer(id: string): L.mapbox.GridLayer;
-	function gridLayer(tilejson: any): L.mapbox.GridLayer;
-
-	interface GridLayer {
-
-		active(): boolean;
-		addTo(map: L.mapbox.Map): any;
-		onAdd(map: L.mapbox.Map): any;
-		onRemove(): any;
-
-		/**
-		 * Bind an event handler to a given event on this L.mapbox.gridLayer instance. GridLayers expose a number of useful events that give you access to UTFGrid data as the user interacts with the map.
-		 */
-		on(event: string, handler: Function, context?: any): any;
-
-		/**
-		 * Returns this layer's TileJSON object which determines its tile source, zoom bounds and other metadata.
-		 */
-		getTileJSON(): any;
-
-		/**
-		 * Load data for a given latitude, longitude point on the map, and call the callback function with that data, if any.
-		 */
-		getData(latlng: L.LatLng, callback: Function): any;
-
-	}
-
-}
-
-// FeatureLayer
-//////////////////////////////////////////////////////////////////////
-
-declare namespace L.mapbox {
-
-	/**
-	 * L.mapbox.featureLayer provides an easy way to integrate GeoJSON from Mapbox and elsewhere into your map.
-	 */
-	function featureLayer(): L.mapbox.FeatureLayer;
-	function featureLayer(id: string, options?: FeatureLayerOptions): L.mapbox.FeatureLayer;
-	function featureLayer(geojson: any, options?: FeatureLayerOptions): L.mapbox.FeatureLayer;
-
-	interface FeatureLayerOptions {
-		filter?    : FilterFunction;
-		sanitizer? : (template: string) => string;
-	}
-
-	interface FeatureLayer extends L.FeatureGroup<L.ILayer> {
-
-		/**
-		 * Load GeoJSON data for this layer from the URL given by url.
-		 */
-		loadURL(url: string): any;
-
-		/**
-		 * Load marker GeoJSON data from a map with the given id on Mapbox.
-		 */
-		loadID(id: string): any;
-
-		/**
-		 * Sets the filter function for this data layer.
-		 */
-		setFilter(filter: FilterFunction): any;
-
-		/**
-		 * Gets the filter function for this data layer.
-		 */
-		getFilter(): FilterFunction;
-
-		/**
-		 * Set the contents of a markers layer: run the provided features through
-		 * the filter function and then through the factory function to create
-		 * elements for the map. If the layer already has features, they are
-		 * replaced with the new features. An empty array will clear the
-		 * layer of all features.
-		 */
-		setGeoJSON(geojson: any): L.mapbox.FeatureLayer;
-
-		/**
-		 * Get the contents of this layer as GeoJSON data.
-		 */
-		getGeoJSON(): any;
-
-	}
-
-}
-
-//////////////////////////////////////////////////////////////////////
-////////////////////////////// GEOCODING /////////////////////////////
-//////////////////////////////////////////////////////////////////////
-
-// Geocoder
-//////////////////////////////////////////////////////////////////////
-
-declare namespace L.mapbox {
-
-	/**
-	 * A low-level interface to geocoding, useful for more complex uses and reverse-geocoding.
-	 */
-	function geocoder(id: string): L.mapbox.Geocoder;
-
-	interface Geocoder {
-
-		getURL(): string;
-		setURL(url: string): any;
-		setID(id: string): any;
-		setTileJSON(tilejson: any): any;
-		queryURL(url: string): string;
-
-		/**
-		 * Queries the geocoder with a query string, and returns its result, if any.
-		 */
-		query(queryString: string, callback: Function): any;
-
-		/**
-		 * Queries the geocoder with a location, and returns its result, if any.
-		 */
-		reverseQuery(location: any, callback: Function): any;
-
-	}
-}
-
-//////////////////////////////////////////////////////////////////////
-//////////////////////////////// CONTROLS ////////////////////////////
-//////////////////////////////////////////////////////////////////////
-
-declare namespace L.mapbox {
-	interface ControlOptions extends L.ControlOptions {
-		sanitizer?: (template: string) => string;
-	}
-}
-
-// InfoControl
-//////////////////////////////////////////////////////////////////////
-
-declare namespace L.mapbox {
-
-	/**
-	 * A map control that shows a toggleable info container. If set, attribution is auto-detected from active layers and added to the info container.
-	 */
-	function infoControl(options?: ControlOptions): InfoControl;
-
-	interface InfoControl extends L.Control {
-
-		onAdd(map: L.mapbox.Map): any;
-		onRemove(map: L.mapbox.Map): any;
-
-		/**
-		 * Adds an info string to infoControl.
-		 */
-		addInfo(info: string): any;
-
-		/**
-		 * Removes an info string from infoControl
-		 */
-		removeInfo(info: string): any;
-
-	}
-
-}
-
-// LegendControl
-//////////////////////////////////////////////////////////////////////
-
-declare namespace L.mapbox {
-
-	/**
-	 * A map control that shows legends added to maps in Mapbox.
-	 * Legends are auto-detected from active layers.
-	 */
-	function legendControl(options?: ControlOptions): LegendControl;
-
-	interface LegendControl extends L.Control {
-
-		onAdd(map: L.mapbox.Map): any;
-
-		/**
-		 * Adds a legend to the legendControl.
-		 */
-		addLegend(legend: string): any;
-
-		/**
-		 * Removes a legend from the legendControl.
-		 */
-		removeLegend(legend: string): any;
-
-	}
-
-}
-
-// GridControl
-//////////////////////////////////////////////////////////////////////
-
-declare namespace L.mapbox {
-
-	/**
-	 * Interaction is what we call interactive parts of maps that are created with
-	 * the powerful tooltips & regions system in TileMill. Under the hood, it's powered by the open UTFGrid specification.
-	 */
-	function gridControl(layer: string, options?: GridControlOptions): GridControl;
-
-	interface GridControlOptions extends ControlOptions {
-		template?    : string;
-		follow?      : boolean;
-		pinnable?    : boolean;
-		touchTeaser? : boolean;
-		location?    : boolean;
-	}
-
-	interface GridControl extends L.Control {
-
-		onAdd(map: L.mapbox.Map): any;
-		onRemove(map: L.mapbox.Map): any;
-
-		/**
-		 * If a tooltip is currently shown by the gridControl, hide and close it.
-		 */
-		hide(): any;
-
-		/**
-		 * Change the Mustache template used to transform the UTFGrid data in the map's interactivity into HTML for display.
-		 */
-		setTemplate(template: string): any;
-
-	}
-
-}
-
-// GeocoderControl
-//////////////////////////////////////////////////////////////////////
-
-declare namespace L.mapbox {
-
-	/**
-	 * Adds geocoder functionality as well as a UI element to a map. This uses the Mapbox Geocoding API.
-	 */
-	function geocoderControl(id: string, options?: GeocoderControlOptions): GeocoderControl;
-
-	interface GeocoderControlOptions extends L.ControlOptions {
-		keepOpen?: boolean;
-	}
-
-	interface GeocoderControl {
-
-		getURL(): string;
-		onAdd(map: L.mapbox.Map): any;
-
-
-		/**
-		 * Set the url used for geocoding.
-		 */
-		setURL(url: string): any;
-
-		/**
-		 * Set the map id used for geocoding.
-		 */
-		setID(id: string): any;
-
-		/**
-		 * Set the TileJSON used for geocoding.
-		 */
-		setTileJSON(tilejson: any): any;
-
-		/**
-		 * Bind a listener to an event emitted by the geocoder control. Supported additional events are
-		 */
-		on(event: string, callback: Function): any;
-
-	}
-
-}
-
-// ShareControl
-//////////////////////////////////////////////////////////////////////
-
-declare namespace L.mapbox {
-
-	/**
-	 * Adds a "Share" button to the map, which can be used to share the map to Twitter or Facebook, or generate HTML for a map embed.
-	 */
-	function shareControl(id: string, options?: ShareControlOptions): ShareControl;
-
-	interface ShareControlOptions extends L.ControlOptions {
-		url?: string;
-	}
-
-	interface ShareControl extends L.Control {
-
-		onAdd(map: L.mapbox.Map): any;
-
-	}
-
-}
-
-//////////////////////////////////////////////////////////////////////
-////////////////////////////// MARKERS ///////////////////////////////
-//////////////////////////////////////////////////////////////////////
-
-declare namespace L.mapbox.marker {
-
-	/**
-	 * A core icon generator used in L.mapbox.marker.style
-	 */
-	function icon(feature: any): L.Icon;
-
-	/**
-	 * An icon generator for use in conjunction with pointToLayer to generate markers from the Mapbox Markers API and support the simplestyle-spec for features.
-	 */
-	function style(feature: any, latlng: any): L.Marker;
-
-}
-
-//////////////////////////////////////////////////////////////////////
-////////////////////////////// SIMPLESTYLE ///////////////////////////
-//////////////////////////////////////////////////////////////////////
-
-declare namespace L.mapbox.simplestyle {
-
-	/**
-	 * Given a GeoJSON Feature with optional simplestyle-spec properties, return an options object formatted to be used as Leaflet Path options.
-	 */
-	function style(feature: any): L.PathOptions;
-
-}
-
-//////////////////////////////////////////////////////////////////////
-/////////////////////////////// UTILITY //////////////////////////////
-//////////////////////////////////////////////////////////////////////
-
-declare namespace L.mapbox {
-
-	/**
-	 * A HTML sanitization function, with the same effect as the default value of the sanitizer option of L.mapbox.featureLayer, L.mapbox.gridControl, and L.mapbox.legendControl.
-	 */
-	function sanitize(text: string): string;
-
-	/**
-	 * A mustache template rendering function, as used by the templating feature provided by L.mapbox.gridControl.
-	 */
-	function template(template: string, data?: any): string;
-
-}
-
-//////////////////////////////////////////////////////////////////////
-///////////////////////////// CONFIGURATION //////////////////////////
-//////////////////////////////////////////////////////////////////////
-
-declare namespace L.mapbox {
-	export class config {
-
-		static FORCE_HTTPS: boolean;
-
-		static HTTP_URLS: string[];
-
-		static HTTPS_URLS: string[];
-
-	}
-}
diff --git a/mapbox/tsconfig.json b/mapbox/tsconfig.json
new file mode 100644
index 0000000000..bc78dcbd03
--- /dev/null
+++ b/mapbox/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mapbox-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mapsjs/index.d.ts b/mapsjs/index.d.ts
new file mode 100644
index 0000000000..b66315203d
--- /dev/null
+++ b/mapsjs/index.d.ts
@@ -0,0 +1,2720 @@
+// Type definitions for Mapsjs 9.6.0
+// Project: https://github.com/mapsjs
+// Definitions by: Matthew James Davis <https://github.com/davismj/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Mapsjs 9.6.0 Copyright (c) 2013 ISC. All Rights Reserved.
+*/
+
+
+
+/** 
+ * Clusters a set of points.
+ * @param {object} options An options object which specifies the clustering algorithm.
+ * @returns {object} An array of clustered points.
+ */
+export function clusterPoints(options: {
+    data: {}[];
+    pointKey: string;
+    valueFunction?: (row: any) => number;
+    radiusFunction: (row: any) => number;
+    aggregateFunction?: (srcRow: any, cmpRow: any, aggRow: any) => void;
+    mapUnitsPerPixel: number;
+    marginPixels?: number;
+}): {}[];
+
+/**
+ * An immutable envelope
+ * @class envelope
+ */
+export class envelope {
+    constructor(minX: number, minY: number, maxX: number, maxY: number);
+
+    /**
+     * Gets the minimum x coordinate of the envelope.
+     * @returns {number} The minimum x coordinate. 
+     */
+    getMinX(): number;
+
+	/**
+	 * Gets the minimum y coordinate of the envelope
+	 * @returns {number} The minimum y coordinate.
+	 */
+    getMinY(): number;
+	
+	/** 
+	 * Gets the maximum x coordinate of the envelope
+	 * @returns {number} The maximum x coordinate.
+	 */
+    getMaxX(): number;
+	
+	/**
+	 * Gets the maximum y coordinate of the envelope
+	 * @returns {number} The maximum y coordinate.
+	 */
+    getMaxY(): number;
+	
+	/**
+	 * Creates a new envelope from this as deep copy.
+	 * @returns {envelope} The new cloned envelope.
+	 */
+    clone(): envelope;
+
+    /**
+     * Creates a new envelope from this one plus x and y margins.
+     * @param {number} marginX The x margin.
+     * @param {number} marginY The y margin.
+     * @returns {envelope} A new envelope.
+     */
+    createFromMargins(marginX: number, marginY: number): envelope;
+	
+	/**
+	 * Create a new envelope from this one plus a bleed ratio.
+	 * @param {number} bleed The bleed ratio.
+	 * @returns {envelope} A new envelope.
+	 */
+    createFromBleed(bleed: number): envelope;
+	
+	/**
+	 * Gets the center point of the envelope.
+	 * @returns {point} Center as a point.
+	 */
+    getCenter(): point;
+	
+	/**
+	 * Gets the width of the envelope.
+	 * @returns {number} Width of the envelope.
+	 */
+    getWidth(): number;
+	
+	/**
+	 * Gets height of the envelope.
+	 * @returns {number} Height of the envelope.
+	 */
+    getHeight(): number;
+	
+	/**
+	 * Gets area of the envelope.
+	 * @return {number} Area of the envelope.
+	 */
+    getArea(): number;
+	
+	/**
+	 * Returns the minimum and maximum coordinates of this envelope as an envObject.
+	 * @returns {envObject} Representaton of this envelope as an envObject.
+	 */
+    toObject(): envObject;
+	
+	/**
+	 * Gets upper left coordinate of this envelope.
+	 * @returns {point} A new point.
+	 */
+    getUL(): point;
+	
+	/**
+	 * Gets upper right of this envelope.
+	 * @returns {point} A new point.
+	 */
+    getUR(): point;
+	
+	/**
+	 * Gets lower left of this envelope.
+	 * @returns {point} A new point.
+	 */
+    getLL(): point;
+	
+	/**
+	 * Gets lower right of this envelope.
+	 * @returns {point} A new point.
+	 */
+    getLR(): point;
+	
+	/**
+	 * Gets the aspect of the envelope.
+	 * @returns {number} Width-to-height ratio.
+	 */
+    getAspect(): number;
+	
+	/**
+	 * Equality comparer between this and another envelope.
+	 * @param {envelope} env Envelope to compare.
+	 * @return {boolean} Result of equality comparison.
+	 */
+    equals(env: envelope): boolean;
+	
+	/**
+	 * Method for casting this envelope as a string.
+	 * @returns {string} String of the form 'minX,minY,maxX,maxY'.
+	 */
+    toString(): string;
+	
+	/**
+	 * Create a closed geometry from this envelope.
+     * @returns {geometry} A new closed path geometry.
+	 */
+    toGeometry(): geometry;
+	
+	/**
+	 * Tests whether the given point is contained within this envelope.
+	 * @param {point} pt Point to test.
+	 * @returns {boolean} Result of containment test.
+	 */
+    contains(pt: point): boolean;
+}
+
+/**
+ * Exposes static functions that act on or return envelopes.
+ * @module envelope
+ */
+export module envelope {
+
+	/**
+	 * Creates a new envelope from MapDotNet XML.
+	 * @param {string} xml A MapDotNet XML string of the envelope.
+	 * @returns {envelope} A new envelope 
+	 */
+    export function createFromMdnXml(xml: string): envelope;
+	
+	/**
+	 * Creates new envelope from two corner points.
+	 * @param {point} pt1 Corner point
+	 * @param {point} pt2 Opposite corner point
+	 * @returns {envelope} A new envelope
+	 */
+    export function createFromPoints(pt1: point, pt2: point): envelope;
+	
+	/**
+	 * Creates a new envelope from the x and y coordinates of the center 
+	 * point and x and y margins from the center point.
+	 * @param {number} centerPtX The center x coordinate.
+	 * @param {number} centerPtY The center y coordinate.
+	 * @param {number} marginX The margin from center x coordinate.
+	 * @param {number} marginY The margin from center y coordinate.
+	 * @returns {envelope} A new envelope
+	 */
+	export function createFromCenterAndMargins(centerPtX: number, centerPtY: number, marginX: number, marginY: number): envelope;
+	
+	/**
+	 * Tests whether two given envelopes intersect.
+	 * @param {envelope} env1 First envelope to test.
+	 * @param {envelope} env2 Second envelope to test.
+	 * @returns {boolean} Result of the intersection test.
+	 */
+    export function intersects(env1: envelope, env2: envelope): boolean;
+	
+	/**
+	 * Creates a new envelope from the union of two given envelopes.
+	 * @param {envelope} env1 The first enevelope to unite.
+	 * @param {envelope} env2 The second envelope to unite.
+	 * @returns {envelope} A new envelope.
+	 */
+    export function union(env1: envelope, env2: envelope): envelope;
+}
+
+/**
+ * A general geometry which can represent a point, line, polygon,
+ * mulitpoint, multilinestring
+ * @class geometry
+ */
+export class geometry {
+    constructor(isPath?: boolean, isClosed?: boolean);
+    
+	/**
+	 * Creates a new polygon or polyline form the geometry according to
+	 * whether the geometry is closed.
+	 * @returns {any} A new polyline or polygon geometry.
+	 */
+	factoryPoly(): any;
+	
+	/**
+	 * Creates a deep copy of this geometry.
+	 * @returns {geometry} The new cloned geometry.
+	 */
+    clone(): geometry;
+	
+	/**
+	 * Iterates every vertex in the geometry and passes to the supplied 
+	 * callback. Return true from in the callback will break the iteration.
+	 * @param {function} action Callback with the signature action(setIdx, idx, x, y, set).
+	 */
+    foreachVertex(action: (setIdx: number, idx: number, x: number, y: number, s: number[]) => void): void;
+    
+	/**
+	 * Returns the geometry's bounding box as an envelope.
+	 * @returns {envelope} The bounding box of the geometry as an envelope.
+	 */
+	getBounds(): envelope;
+	
+	/**
+	 * Checks whether or not this geometry is closed.
+	 * @returns {boolean} Result of the path check.
+	 */
+    getIsPath(): boolean;
+	
+	/**
+	 * Checks whether or not this geometry is closed.
+	 * @returns {boolean} Result of the closed check.
+	 */
+    getIsClosed(): boolean;
+	
+	/**
+	 * Gets the number of sets in this geometry.
+	 * @returns {number} Number of sets.
+	 */
+    getSetCount(): number;
+	
+	/**
+	 * Gets a set from this geometry's set collection by index, or, if no 
+	 * index is provided, gets the last set. Note: for polygons, first set
+	 * is primary ring and subsequent ones are holes.
+	 * @param {number} [idx] Index of the set to return.
+	 * @returns {number[]} A set as an array of points in the form [xn,yn].
+	 */
+    getSet(idx: number): number[];
+	
+	/**
+	 * Adds a new set to this geometry's collection of sets.
+	 * @param {number[]} s Set to add as an array of points in the form [xn,yn].
+	 */
+    pushSet(s: number[]): void;
+	
+	/**
+	 * Gets the last set in the geometry's set collection and removes it 
+	 * from the collection.
+	 * @returns {number} Set removed as an array of points in the form [xn,yn].
+	 */
+    popSet(): number[];
+	
+	/**
+	 * Creates SVG path data from this geometry if it is a path.
+	 * @returns {string} String of the SVG path or null the geometry is not a path.
+	 */
+    toSvgPathData(): string;
+	
+	/**
+	 * Adds point to the last set in geometry's set collection. If the
+	 * geometry is empty, a new set is added to the geometry first.
+	 * @param {point} pt The point to add.
+	 * @returns {object} Object of the form {setIdx, idx} where setIdx is
+	 * the 0-based index of the set the point was added to and idx is the
+	 * 0-based index of the point in its set.
+	 */
+    addPointToLastSet(pt: point): { setIdx: number; idx: number; };
+	
+	/**
+	 * Tests the validity of this geometry. An open path geometry is valid
+	 * if it has at least one set with at least two points. A closed 
+	 * geometry is valid if it has at least one set with at least three
+	 * points. A point (non-path) geometry is always valid.
+	 * @returns {geometry} valid geometry is true, otherwise false.
+	 */
+    isValid(): boolean;
+	
+	/**
+	 * Creates a wkt string from this geometry.
+	 * @returns {string} A string of well known text.
+	 */
+    toString(): string;
+    toWkt(): string;
+	
+	/**
+	 * Finds the point in this geometry nearest to the given point.
+	 * @param {point} pt Reference point.
+	 * @returns {object} An object of the form {setIdx, ptIdx, pt, distance}
+	 * where setIdx is the index of the set the point is in, ptIdx is the
+	 * index of the point in the set, pt is the point object, and distance
+	 * is the distance of the point to the reference point in map units.
+	 */
+    findNearestVertex(pt: point): { setIdx: number; ptIdx: number; pt: point; distance: number; };
+    
+	/**
+	 * Finds point along boundary of geometry nearest to the given point
+	 * @param {point} pt Reference point.
+	 * @param {boolean} [close] Flag to indicate whether this geometry
+	 * should be treated as a closed geometry.
+	 * @returns {object} An object of the form {setIdx, ptIdx, pt, distance}
+	 * where setIdx is the index of the set the point is in, ptIdx is the
+	 * index of the point in the set, pt is the point object, and distance
+	 * is the distance of the point to the reference point in map units.
+	 */
+	findNearestSegment(pt: point, close?: boolean): { setIdx: number; ptIdx: number; pt: point; distance: number; };
+    
+	/** 
+	 * Finds coordinates in map units of the midpoint of this geometry. If
+	 * this geometry is an open path, the midpoint is the midpoint of the
+	 * path. If this geometry is a closed path, the midpoint is the centroid
+	 * of the polygon. If a set index is not provided, finds the labeling
+	 * point for the last set in this geometry's set collection.
+	 * @param {number} [idx] Index of set for which to find the labeling point.
+	 * @returns {point} Midpoint of this geometry.
+	 */
+	getLabelingPoint(idx?: number): point;
+	
+	/**
+	 * Tests whether this geometry contains a given point/
+	 * @param {point} pt The reference point.
+	 * @returns {boolean} Result of the containment test.
+	 */
+    contains(pt: point): boolean;
+}
+
+/** 
+ * Exposes static functions that act on or return geometries, including
+ * constructors for specific geometries such as polygon and polyline.
+ * @module geometry 
+ */
+export module geometry {
+    
+	/**
+	 * A polyline object which is an open path geometry with one or more paths.
+     * @class polyline
+     */
+    class polyline extends geometry {
+        constructor(geom: geometry);
+        
+		/**
+		 * Gets the underlying geometry of the polyline.
+		 * @returns {geometry} The polyline's underlying geometry object.
+		 */
+		getGeometry(): geometry;
+		
+		/**
+		 * Creates a new polyline object from a deep copy of the underlying geometry.
+		 * @returns {polyline} Thew new cloned polyline.
+		 */
+        clone(): polyline;
+		
+		/**
+		 * Gets number of lines in this polyline.
+		 * @returns {number} Number of lines.
+		 */
+        getLineCount(): number;
+		
+		/**
+		 * Gets a line from this polyline's liune collection by index, or, 
+		 * if no index is provided, gets the last line.
+		 * @param {number} [idx] Index of the line to return.
+		 * @returns {number[]} A line as an array of points in the form [xn,yn].
+		 */
+        getLine(idx: number): number[];
+		
+		/**
+		 * Adds a new line to this polyline's line collection.
+		 * @param {number[]} s Line to add as an array of points in the form [xn,yn].
+		 */
+        pushLine(s: number[]): void;
+		
+		/**
+		 * Gets the last line in the polyline's set collection and removes it 
+		 * from the collection.
+		 * @returns {number} Line removed as an array of points in the form [xn,yn].
+		 */
+        popLine(): number[];
+		
+		/**
+		 * Calculates distance of a line in a polyline by index according 
+		 * to projected map cooordinates. If no index is provided, uses
+		 * the last line in the polyline's set collection.
+		 * @param {number} [idx] Index of the line for which to compute the distance.
+		 * @returns {number} Length in projected units of the distance of the line.
+		 */
+        getProjectedDistance(idx: number): number;
+		
+		/**
+		 * Calculates distance of a line in a polyline by index according 
+		 * to actual distance. If no index is provided, uses the last line 
+		 * in the polyline's set collection.
+		 * @param {number} [idx] Index of the line for which to compute the distance.
+		 * @returns {number} Distance in meters of the line.
+		 */
+        getActualDistance(idx?: number): number;
+		
+		/**
+		 * Determines whether this polyline intersects a given geometry.
+		 * @param {geometry} geom Geometry to test against.
+		 * @returns {boolean} Result of the intersection test.
+		 */
+        intersects(geom: geometry): boolean;
+    }
+    
+	/**
+	  * A polyline object which is a closed path geometry with one or more paths.
+      * @class polygon
+      */
+    class polygon extends geometry {
+        constructor(geom: geometry);
+		
+		/**
+		 * Gets the underlying geometry of the polygon.
+		 * @returns {geometry} The polygon's underlying geometry object.
+		 */
+        getGeometry(): geometry;
+		
+		/**
+		 * Creates a new polygon object from a deep copy of the underlying geometry.
+		 * @returns {polygon} Thew new cloned polygon.
+		 */
+        clone(): polygon;
+		
+		/**
+		 * Gets number of rings in this polygon.
+		 * @returns {number} Number of rings.
+		 */
+        getRingCount(): number;
+	
+		/**
+		 * Gets a ring from this polygon's set collection by index, or, 
+		 * if no index is provided, gets the last ring.
+		 * @param {number} [idx] Index of the ring to return.
+		 * @returns {number[]} A ring as an array of points in the form [xn,yn].
+		 */
+        getRing(idx: number): number[];
+		
+		/**
+		 * Adds a new ring to this polygon's ring collection.
+		 * @param {number[]} s Ring to add as an array of points in the form [xn,yn].
+		 */
+        pushRing(s: number[]): void;
+		
+		/**
+		 * Gets the last ring in the polygon's ring collection and removes it 
+		 * from the collection.
+		 * @returns {number} Ring removed as an array of points in the form [xn,yn].
+		 */
+        popRing(): number[];
+		
+		/**
+		 * Calculates area of a ring in a polygon by index according 
+		 * to projected map cooordinates. If no index is provided, uses
+		 * the last ring in the polygon's ring collection.
+		 * @param {number} [idx] Index of the ring for which to compute the area.
+		 * @returns {number} Area in square projected units of the ring.
+		 */
+        getProjectedArea(idx: number): number;
+		
+		/**
+		 * Calculates perimeter of a ring in a polygon by index according 
+		 * to projected map cooordinates. If no index is provided, uses
+		 * the last ring in the polygon's ring collection.
+		 * @param {number} [idx] Index of the ring for which to compute the perimeter.
+		 * @returns {number} Length in projected units of the distance of the ring.
+		 */
+        getProjectedPerimeter(idx: number): number;
+		
+		/**
+		 * Calculates area of a ring in a polygon by index according 
+		 * to the actual area. If no index is provided, uses the last ring
+		 * in the polygon's ring collection.
+		 * @param {number} [idx] Index of the ring for which to compute the area.
+		 * @returns {number} Area in square meters of the ring.
+		 */
+        getActualArea(idx?: number): number;
+		
+		/**
+		 * Calculates perimeter of a ring in a polygon by index according 
+		 * to actual distance. If no index is provided, uses the last ring
+		 * in the polygon's ring collection.
+		 * @param {number} [idx] Index of the ring for which to compute the perimeter.
+		 * @returns {number} Length in meters of the perimeter of the ring.
+		 */
+        getActualPerimeter(idx?: number): number;
+		
+		/**
+		 * Determines whether this polygon intersects a given geometry.
+		 * @param {geometry} geom Geometry to test against.
+		 * @returns {boolean} Result of the intersection test.
+		 */
+		intersects(geom: geometry): boolean;
+		
+		/**
+		 * Determines whether this polyline overlaps a given geometry.
+		 * @param {geometry} geom Geometry to test against.
+		 * @returns {boolean} Result of the intersection test.
+		 */
+        overlaps(poly: polygon): boolean;
+
+		/**
+		 * Convert this polygon into an array of OGC compliant polygons where
+		 * the first set is a ring and all subsequent contained sets are holes.
+		 * @returns {polygon[]} An array of OGC polygons.
+		 */
+		toMultiPolygon(): polygon[];
+    }
+}
+
+/**
+ * A style specification for geometry objects.
+ * @class geometryStyle
+ */
+export class geometryStyle {
+    constructor(options?: styleObj);
+	
+	/**
+	 * Gets path outline thickness in pixels.
+	 * @returns {number} Thickness of path outline.
+	 */
+    getOutlineThicknessPix(): number;
+	
+	/**
+	 * Sets path outline thickness in pixels.
+	 * @param {number} t Desired thickness.
+	 */
+    setOutlineThicknessPix(t: number): void;
+	
+	/**
+	 * Gets path outline color as a CSS style string.
+	 * @returns {string} Outline color as a CSS style string.
+	 */
+    getOutlineColor(): string;
+	
+	/**
+	 * Sets path outline color from a CSS style string.
+	 * @param {string} c Outline color as a CSS style string.
+	 */
+    setOutlineColor(c: string): void;
+	
+	/**
+	 * Gets path outline opacity in decimal format.
+	 * @returns {number} Outline opacity.
+	 */
+    getOutlineOpacity(): number;
+	
+	/**
+	 * Set path outline opacity to a decimal between 0 and 1.
+	 * @param {number} o Outline opacity.
+	 */
+    setOutlineOpacity(o: number): void;
+	
+	/**
+	 * Gets fill color as a CSS style string.
+	 * @returns {string} Fill color as a CSS style string.
+	 */
+    getFillColor(): string;
+	
+	/**
+	 * Sets fill color as a CSS style string.
+	 * @param {string} c Fill color as a CSS style string.
+	 */
+    setFillColor(c: string): void;
+	
+	/**
+	 * Gets fill opacity in decimal format.
+	 * @returns {number} Fill opacity.
+	 */
+    getFillOpacity(): number;
+	
+	/**
+	 * Sets fill opacity to a decimal between 0 and 1.
+	 * @param {number} o Fill opacity.
+	 */
+    setFillOpacity(o: number): void;
+    
+	/**
+	 * Gets the dash array as a string.
+	 * @returns {string} Dash array as astring.
+	 */
+	getDashArray(): string;
+    
+	/**
+	 * Sets dash array string from a CSS style string. Defaults to solid
+	 * stroke if no dash array string is provided.
+	 * @param {string} [da] Dash array as a CSS style string.
+	 */
+	setDashArray(da: string): void;
+}
+
+/**
+ * Gets the mapsjs license.
+ * @returns {string} The license.
+ */
+export var license: string;
+
+/**
+ * A simple point class with x and y coordinates.
+ * @class point
+ */
+export class point {
+
+    constructor(x: number, y: number);
+	
+	/**
+	 * Returns the x coordinate.
+	 * @returns {number} The x coordinate.
+	 */
+    getX(): number;
+	
+	/**
+	 * Returns the y coordinate.
+	 * @returns {number} The y coordinate.
+	 */
+    getY(): number;
+	
+	/**
+	 * Returns the x and y coordinates of this point as a pointObject.
+	 * @returns {pointObject} Representaton of this point as an pointObject.
+	 */
+    toProps(): pointObject;
+	
+	/**
+	 * Equality comparer between this point and a given reference point.
+	 * @param {point} pt Reference point.
+	 * @returns {boolean} Result of the equality test.
+	 */
+    equals(pt: point): boolean;
+	
+	/** 
+	 * Creates a point from this point offset by a given x and y distance.
+	 * @param {number} dx The x offset.
+	 * @param {number} dy The y offset.
+	 * @returns {point} The offset point.
+	 */
+    createOffsetBy(dx: number, dy: number): point;
+	
+	/**
+	 * Creates new n-sided polygon around this point.
+	 * @param {number} sides Number of polygon sides.
+	 * @param {number} radius Distance to polygon points.
+	 * @returns {polygon} The generated polygon.
+	 */
+    convertToPoly(side: number, radius: number): geometry.polygon;
+	
+	/**
+	 * Gets the wkt representation of this point.
+	 * @returns {string} The well known text for this point.
+	 */
+    toString(): string;
+	
+	/** 
+	 * Creates a deep copy of this point.
+	 * @returns {point} The new cloned point.
+	 */
+    clone(): point;
+	
+	/**
+	 * Returns this point's bounding box.
+	 * @returns {envelope} The bounding box of the point as an envelope.
+	 */
+    getBounds(): envelope;
+	
+	/**
+	 * Computes distance between this point and a given point in projected
+	 * map units.
+	 * @param {point} pt Point to which to compute distance.
+	 * @returns {number} Distance from this point to the given point in
+	 * projected map units.
+	 */
+    distanceTo(pt: point): number;
+}
+
+/**
+ * Exposes static functions that act on points.
+ * @module point
+ */
+export module point {
+
+    /**
+	 * Computes the distance between two points in coordinate units.
+	 * @param {number} x1 The x coordinate for the first point.
+	 * @param {number} y1 The y coordinate for the first point. 
+	 * @param {number} x2 The x coordinate for the second point. 
+	 * @param {number} y2 The y coordinate for the second point. 
+	 * @returns {number} Distance in coordinate units.
+	 */
+    export function distance(x1: number, y1: number, x2: number, y2: number): number;
+    
+	/**
+	 * Computes the midpoint of two points.
+	 * @param {number} x1 The x coordinate for the first point.
+	 * @param {number} y1 The y coordinate for the first point. 
+	 * @param {number} x2 The x coordinate for the second point. 
+	 * @param {number} y2 The y coordinate for the second point. 
+	 * @return {point} Midpoint point.
+	 */
+	export function midpoint(x1: number, y1: number, x2: number, y2: number): point;
+}
+
+/** 
+ * Exposes static functions related to the Spherical Mercator projection.
+ * @module sphericalMercator 
+ */
+export module sphericalMercator {
+    
+	/**
+	 * Gets the EPSG number for Spherical Mercator.
+	 * @return {number} ESPG number.
+	 */
+	export function getEpsg(): number;
+	
+	/** 
+	 * Gets the minimum zoom level for this projection.
+	 * @returns {number} Minimum zoom level.
+	 */
+    export function getMinZoomLevel(): number;
+	
+	/**
+	 * Sets the minimum zoom level for this projection. Normally this is 
+	 * set to 1.0 and should not be altered.
+	 * @param {number} minZ Desired minimum zoom level.
+	 */
+    export function setMinZoomLevel(minZ: number): void;
+	
+	/**
+	 * Gets the maxmimum zoom level for this projection.
+	 * @returns {number} Maximum zoom level.
+	 */
+    export function getMaxZoomLevel(): number;
+	
+	/**
+	 * Sets the maximum zoom level for this projection. Normally this is 
+	 * set to 20.0 and should not be altered.
+	 * @param {number} maxZ1 Desired maximum zoom level.
+	 */
+    export function setMaxZoomLevel(maxZ: number): void;
+	
+	/**
+	 * Gets the tile height and width in pixels.
+	 * @returns {number} The height and width of the tiles in pixels.
+	 */
+    export function getTileSizePix(): number;
+	
+	/**
+	 * Gets the display DPI, which defaults to 96. Note: The dpi is 
+	 * recomputed on page load complete.
+	 * @returns {number} Dots per inch on display.
+	 */
+    export function getDpi(): number;
+	
+	/**
+	 * Set the display DPI, which defaults to 96. Note: The DPI is 
+	 * recomputed on page load complete.
+	 * @param {number} dpi Dots per inch on display.
+	 */
+    export function setDpi(dpi: number): void;
+	
+	/**
+	 * Return the equitorial radius in meters for this projection.
+	 * @returns {number} Equitorial radius in meters.
+	 */
+    export function getRadius(): number;
+	
+	/**
+	 * Returns equitorial circumference in meters for this projection
+	 * @returns {number} Equitorial circumference in meters.
+	 */
+    export function getCircumference(): number;
+	
+	/**
+	 * Returns half the equitorial circumference in meters for this projection
+	 * @returns {number} Half of the equitorial circumference in meters.
+	 */
+    export function getHalfCircumference(): number;
+	
+	/**
+	 * Get the envelope in map units for a given quadtree node, i.e. tile,
+	 * based on the given x, y, and z quadtree coordinates.
+	 * @param {number} x The x coordinate.
+	 * @param {number} y The y coordinate.
+	 * @param {number} z The z coordinate.
+	 * @returns {envelope} Envelope of the tile in map units.
+	 */
+    export function getQuadTreeNodeToMapEnvelope(x: number, y: number, z: number): envelope;
+    
+	/**
+	 * Gets the envelope in map units of tiles in the quadtree from an 
+	 * evelope in map units and a zoom level.
+	 * @param {envelope} env Envelope for which to find intersecting tiles.
+	 * @param {number} z Zoom level with which to test for intersection.
+	 * @returns {envelope} The envelope in map units of the tiles.
+	 */
+	export function getQuadTreeNodeRangeFromEnvelope(env: envelope, z: number): envelope;
+    
+	/**
+	 * Gets projected map units per pixel for a given zoom level.
+	 * @param {number} zoomLevel Reference zoom level.
+	 * @returns {number} Projection units per pixel.
+	 */
+	export function getProjectionUnitsPerPixel(zoomLevel: number): number;
+    
+	/** 
+	 * Gets the required scale transform to apply to shapes so distance 
+	 * and area computations yield actual Earth-geodesic units instead of 
+	 * projected map units.
+	 * @param {number} mapPtY Reference latitude for the computation.
+	 * @returns {number} Scale transform multiplier.
+	 */
+	export function getActualShapeScaleTransform(mapPtY: number): number;
+    
+	/**
+	 * Gets actual, on-the-ground meters per pixel for a given zoom level 
+	 * and map point in map units.
+	 * @param {point} mapPt Reference location for the computation.
+	 * @param {number} z Reference zoom level.
+	 * @returns {number} Meters per pixel multiplier.
+	 */
+	export function getActualUnitsPerPixel(mapPt: point, zoomLevel: number): number;
+    
+	/**
+	 * Gets the optimal zoom level for a given envelope in map units 
+	 * based on the envelope of visible device area in pixels.
+	 * @param {envelope} envelopeMap Envelope in map units to display.
+	 * @param {envelope} envelopeDevice Envelope in pixels of visible area.
+	 * @returns {number} Optimal zoom level for viewing envelopeMap.
+	 */
+	export function getBestFitZoomLevelByExtents(envelopeMap: envelope, envelopeDevice: envelope): number;
+    
+	/**
+	 * Gets a quad-key from x, y, and z coordinates.
+	 * @param {number} x The x coordinate.
+	 * @param {number} y The y coordinate.
+	 * @param {number} z The z coordinate.
+	 * @returns {string} Quad-key string.
+	 */
+	export function getQuadKeyFromXYZ(x: number, y: number, z: number): string;
+    
+	/**
+	 * Gets x, y, and z coordinates as an object from a given quad-key.
+	 * @param {string} key Reference quad-key.
+	 * @return {object} JavaScript object of the form {x,y,z}.
+	 */
+	export function getXYZFromQuadKey(key: string): { x: number; y: number; z: number; };
+    
+	/**
+	 * Project a point from latitude/longitude to Spherical Mercator.
+	 * @param {point} lonLat Point object in latitude/longitude. 
+	 * @returns {point} The same point in Spherical Mercator.
+	 */
+	export function projectFromLatLon(lonLat: point): point;
+	
+	/**
+	 * Project a point from Spherical Mercator to latitude/longitude.
+	 * @param {point} mapPt Point object in Spherical Mercator.
+	 * @returns {point} The same point in latitude/longitude.
+	 */
+    export function deprojectToLatLon(mapPt: point): point;
+}
+
+/**
+ * A geometry object decorated with a geometry style object
+ * @class styledGeometry
+ */
+export class styledGeometry {
+    constructor(geom: geometry, gStyle?: geometryStyle);
+	
+    /**
+     * Set this styledGeometry's geometry.
+     * @param {geometry} g A new Geometry.
+     */
+    setGeometry(g: geometry): void;
+
+	/**
+	 * Set this styledGeometry's geometryStyle.
+	 * @param {geometryStyle} gs A new styledGeometry.
+	 */
+    setGeometryStyle(gs: geometryStyle): void;
+	
+	/**
+	 * Gets the styledGeometry's underlying geometry object.
+	 * @returns {geometry} The underlying geometry.
+	 */
+    getGeometry(): geometry;
+
+    /**
+     * Gets the styledGeometry's underlying geometryStyle object.
+     * @returns {geometryStyle} The underlying geometry style.
+     */
+    getGeometryStyle(): geometryStyle;
+	
+	/**
+	 * Gets path outline thickness in pixels.
+	 * @returns {number} Thickness in pixels.
+	 */
+    getOutlineThicknessPix(): number;
+	
+	/**
+	 * Sets path outline thickness in pixels.
+	 * @param {number} t Thickness in pixels.
+	 */
+    setOutlineThicknessPix(t: number): void;
+	
+	/**
+	 * Gets path outline color as a CSS style string.
+	 * @returns {string} Outline color as a CSS style string.
+	 */
+    getOutlineColor(): string;
+	
+	/**
+	 * Gets path outline opacity in decimal format.
+	 * @param {number} Outline opacity.
+	 */
+    setOutlineColor(c: string): void;
+	
+	/**
+	 * Gets path outline opacity in decimal format.
+	 * @returns {number} Outline opacity.
+	 */
+    getOutlineOpacity(): number;
+	
+	/**
+	 * Set path outline opacity to a decimal between 0 and 1.
+	 * @param {number} o Outline opacity.
+	 */
+    setOutlineOpacity(o: number): void;
+	
+	/**
+	 * Gets fill color as a CSS style string.
+	 * @returns {string} Fill color as a CSS style string.
+	 */
+    getFillColor(): string;
+	
+	/**
+	 * Sets fill color as a CSS style string.
+	 * @param {string} c Fill color as a CSS style string.
+	 */
+    setFillColor(c: string): void;
+	
+	/**
+	 * Gets fill opacity in decimal format.
+	 * @returns {number} Fill opacity.
+	 */
+    getFillOpacity(): number;
+	
+	/**
+	 * Sets fill opacity to a decimal between 0 and 1.
+	 * @param {number} o Fill opacity.
+	 */
+    setFillOpacity(o: number): void;
+	
+	/**
+	 * Gets the dash array as a string.
+	 * @returns {string} Dash array as astring.
+	 */
+    getDashArray(): string;
+	
+	/**
+	 * Sets dash array string from a CSS style string. Defaults to solid
+	 * stroke if no dash array string is provided.
+	 * @param {string} [da] Dash array as a CSS style string.
+	 */
+    setDashArray(da: string): void;
+	
+	/**
+	 * Gets optional animation function called when SVG node is created.
+	 * @returns {function} Function with the signature animation(pathElement, loopback).
+	 */
+    getAnimation(): (pathElement: HTMLElement, loopback: () => void) => void;
+
+	/**
+	 * You can use the loopback parameter on complete to call itself and 
+	 * create repeating animation.
+	 * @param {function} Function with the signature animation(pathElement, loopback).
+	 */
+    setAnimation(action: (pathElement: HTMLElement, loopback: () => void) => void): void;
+	
+	/**
+	 * Renders this geometry as an SVG path. Note: We attach original
+	 * geometry bounds to svg doc as an expando.
+	 * @param {string} key Identifer to keep track of the SVG DOM element.
+	 * @param {number} mupp Map units per pixel with which to create the SVG element.
+	 * @returns {HTMLElement} A new SVG document root.
+	 */
+    createSvgPathElement(key: string, mapUnitsPerPix: number): HTMLElement;
+	
+	/** 
+	 * Renders this to a canvas context.
+	 * @param {CanvasRenderingContext2D} ctx Canvas context to which to render.
+	 */
+    renderPathToCanvasContext(ctx: CanvasRenderingContext2D): void;
+}
+
+/**
+ * The mapjs version.
+ */
+export var version: string;
+
+/** 
+ * Exposes static functions for working with well known text.
+ * @module wkt 
+ */
+export module wkt {
+    
+	/**
+	 * Parses WKT as a point.
+	 * @param {string} w A WKT string.
+	 * @returns {point} The parsed point.
+	 */
+	export function parsePoint(wkt: string): point;
+	
+	/**
+	 * Parses WKT as a multipoint.
+	 * @param [string} w A WKT string.
+	 * @retuns {geometry} The parsed multipoint geometry.
+	 */
+    export function parseMultiPoint(wkt: string): geometry;
+	
+	/**
+	 * Parses WKT as an open path geometry with a single set.
+	 * @param {string} w A WKT string.
+	 * @returns {geometry} The parsed open path geometry.
+	 */
+    export function parseLineString(wkt: string): geometry;
+	
+	/**
+	 * Parses WKT as an open path geometry with multiple sets.
+	 * @param {string} w A WKT string.
+	 * @returns {geometry} The parsed open path geometry.
+	 */
+    export function parseMultiLineString(wkt: string): geometry;
+	
+	/**
+	 * Parses WKT as a closed path geometry with a single set.
+	 * @param {string} w A WKT string.
+	 * @returns {geometry} The parsed closed path geometry.
+	 */
+    export function parsePolygon(wkt: string): geometry;
+	
+	/**
+	 * Parses WKT as a closed path geometry with multiple sets.
+	 * @param {string} w A WKT string.
+	 * @returns {geometry} The parsed closed path geometry.
+	 */
+	export function parseMultiPolygon(wkt: string): geometry;
+	
+	/**
+	 * Parses WKT as a geometry and determines its type from the string.
+	 * @param {string} w The WKT string.
+	 * @returns {any} The parsed shape, a point, geometry, or an array of
+	 * polygons depending on the WKT.
+	 */
+	export function parse(wkt: string): any;
+
+	/**
+	 * Converts an array of polygons to an OGC compliant multipolygon WKT string.
+	 * @param {polygon[]} polys Set of polygons to parse into WKT.
+	 * @returns {geometry} The OGC compliant WKT for the polygons.
+	 */
+    export function toMultiPolygonString(polys: geometry.polygon[]): string;
+}
+
+/** 
+ * Exposes various tile-related constructors, including layers, descriptors,
+ * and requestors.
+ * @module tile
+ */
+export module tile {
+    
+	/**
+	 * A tile layer is a view on the map containing an array of rectangular content.
+     * @class layer
+     */
+    export class layer {
+        constructor(id: string, useBackdrop?: boolean, maxConcurrentRequests?: number);
+        
+		/**
+		 * @param {number} m - number for margin in pixels
+		 */
+		// setContentExtentsMarginInPixels(m: number): void;
+        
+		/**
+		 * Gets ID associated with this tile layer.
+		 * @returns {string} ID of the layer.
+		 */
+		getId(): string;
+		
+		/**
+		 * Determines whether this tile layer uses a backdrop.
+		 * @returns {boolean} Whether or not the layer uses a backdrop.
+		 */
+        getUseBackdrop(): boolean;
+		
+		/**
+		 * Returns the tile layer's descriptor, which describes how 
+		 * requested content is rendered or styled.
+		 * @returns {object} The tile layer's descriptor.
+		 */
+        getDescriptor(): any;
+		
+		/**
+		 * Sets the tile layer's descriptor, which describes how requested
+		 * content is rendered or styled.
+		 * @param {function} d A descriptor for this tile layer.
+		 */
+        setDescriptor(d: any): void;
+		
+		/**
+		 * Notifies the tile layer to check for changes to its descriptor.
+		 */
+        notifyDescriptorChange(): void;
+		
+		/**
+		 * Returns this tile layer's requestor which defines what kind of 
+		 * content to get and where to get it.
+		 * @returns {requestor} This tile layer's requestor.
+		 */
+        getRequestor(): tile.requestor;
+		
+		/**
+		 * Sets this tile layer's requestor, which defines what kind of
+		 * content to get and where to get it.
+		 * @param {tile.requestor} req A requestor object.
+		 * @param {tile.requestor} [desc] Descriptor object so that both
+		 * can be set in one call and incur only one content change event.
+         */			 
+        setRequestor(req: tile.requestor, desc?: any): void;
+		
+		/**
+		 * Returns this tile layer's renderer if it exists, which defines 
+		 * how geometry data for a quadView is rendered.
+		 * @returns {renderer} The renderer object.
+		 */
+        getRenderer(): tile.renderer;
+		
+		/**
+		 * Sets optional renderer which defines how geometry data for 
+		 * quadView is rendered.
+		 * @param {renderer} r The renderer delegate function with 
+		 * signature renderer(quadview).
+		 */
+        setRenderer(r: any): void;
+		
+		/**
+		 * Notifies the tile layer to check for changes to its renderer.
+		 */
+        notifyRendererChange(): void;
+		
+		/**
+		 * Gets the visibility state of this tile layer.
+		 * @returns {boolean} Whether or not this layer is visible.
+		 */
+        getIsVisible(): boolean;
+		
+		/**
+		 * Sets visibility state of this tile layer.
+		 * @param {boolean} v Whether this layer should be visible or not.
+		 */
+        setIsVisible(v: boolean): void;
+		
+		/**
+		 * Gets the opacity of this tile layer.
+		 * @returns {number} Opacity as a decimal.
+		 */
+        getOpacity(): number;
+		
+		/** 
+		 * Sets opacity of this tile layer.
+		 * @param {number} o Opacity as a decimal.
+		 */
+        setOpacity(o: number): void;
+		
+		/**
+		 * Gets minimum zoom level where this tile layer is visible.
+		 * @returns {number} The minimum zoom level.
+		 */
+        getMinZoomLevel(): number;
+		
+		/** 
+		 * Sets minimum zoom level where this tile layer is visible.
+		 * @param {number} minZ The desired minimum zoom level.
+		 */
+        setMinZoomLevel(minZ: number): void;
+		
+		/**
+		 * Gets maximum zoom level where this tile layer is visible.
+		 * @returns {number} The maximum zoom level.
+		 */
+        getMaxZoomLevel(): number;
+		
+		/**
+		 * Sets maximum zoom level where this tile layer is visible.
+		 * @param {number} maxZ The desired maximum zoom level.
+		 */
+        setMaxZoomLevel(maxZ: number): void;
+		
+		/**
+		 * Sets pixel bleed on quadTiles, which defaults to 1. Setting this 
+		 * to zero for overlay layers with translucent polygon fills is 
+		 * recommended. Bleed overlap can create faint lines at tile 
+		 * boundries when fill is not opaque.
+		 * @param {number} bleed The number of pixels to bleed.
+		 */
+        setTileBleedPix(bleed: number): void;
+		
+		/**
+		 * Sets whether or not to retain and display previous level tile 
+		 * content as you change tile levels to provide a nice zoom level 
+		 * change effect. Once the next level is loaded the old level 
+		 * content is always discarded. This should be set to false if there 
+		 * is translucent content to display. Defaults to true (prior to 
+		 * version 9.0.0001 this value had the same state as useBackdrop.)
+		 * @param {boolean} ret Whether or not to retain interlevel content.
+		 */
+        setRetainInterlevelContent(retain: boolean): void;
+		
+		/**
+		 * Enables or disables the fade in on tile content, which defaults to enabled.
+		 * @param {boolean} fadeIn Whether or not fade in on tile content 
+		 * should be enabled.
+		 */
+        setEnableTileFadeIn(fadeIn: boolean): void;
+		
+		/**
+		 * Sets the default action to take on error.
+		 * @param {function} action Function to execute on error.
+		 */
+        setNotifyErrorAction(action: () => void): void;
+		
+		/** 
+		 * Sets an optional function to be called when the tile loading
+		 * queue for this layer has emptied.
+		 * @param {function} action Callback function.
+		 */
+        setNotifyLoadingQueueHasEmptiedAction(action: () => void): void;
+		
+		/**
+		 * Sets the optional function to be called by this layer's tile 
+		 * loader during processing. The supplied progress function takes 
+		 * tiles loaded and tiles total parameters.
+		 * @param {function} action Callback of the signature action(tileLoaded, tilesTotal).
+		 */
+        setNotifyLoadingQueueProgressAction(action: (tilesLoaded: number, tilesTotal: number) => void): void;
+        
+		/**
+		 * Sets optional request processor for this tile layer. This is 
+		 * an advanced feature allowing developers to tap into tile 
+		 * request pipeline for purposes of customizing requests or manage 
+		 * custom caching. This is also the mechanism used for offline 
+		 * apps with frameworks such as phonegap.
+		 * @param {function} Processor function with signature
+		 * processor(requestor, descriptor, quad, timeoutMs, complete, error)
+		 */
+		setRequestProcessor(processorFunc: (
+            requestor: tile.requestor,
+            descriptor: any,
+            quad: tile.quad,
+            timeoutMs: number,
+            completeAction: (img: HTMLElement) => void,
+            errorAction: (msg: string) => void) => void): void;
+
+		/**
+		 * Instructs the tile loader to populate a specified tile pyramid.
+		 * This is used to fetch content (e.g. bitmap tiles) and preload 
+		 * it into the browser cache.
+		 * @param {envelope} extents Envelope for which to fetch content.
+		 * @param {number} startZoomLevel Minimum zoom level for which to
+		 * fetch content.
+		 * @param {number} endZoomLevel Maximum zoom level for which to 
+		 * fetch content.
+		 */
+        preload(extents: envelope, startZoomLevel: number, endZoomLevel: number): void;
+        
+		/**
+		 * Composes an array of quadtiles with composition information and
+		 * requestor endpoints. This can be used to create static images
+		 * or print-ready versions of this tile layer at arbitrary extents
+		 * (both source and target) For example: If you needed a 5x3 inch 
+		 * 300 dpi output you can specify extents in device units to be
+		 * 1500x900. This function determines the correct zoom level so 
+		 * that the source extents fits in the target extents to the
+		 * nearest integer zoom level.
+		 * @param {envelope} extentsMapUnits Source extents in map units.
+		 * @param {envelope} extentsDeviceUnits Target extents in pixels.
+		 * @returns {object} Composed object in the form 
+		 * {quadCollection, endpointCollection, idxMinX, idxMinY, ulX, ulY }
+		 * where quadCollection is an array of quad objects, endpointCollection
+		 * is an array of REST endpoints from which to obtain the tiled content,
+		 * idxMinX and idxMinY are the minimum x and y tile indicies of the
+		 * collection respectively, and ulX and ulY are the offset in pixels
+		 * of the upper left tile from the upper left target extents.
+		 */
+        compose(extentsMapUnits: envelope, extentsDeviceUnits: envelope): { 
+        	quadCollection: tile.quad[];
+        	endpointCollection: string[];
+        	idxMinX: number;
+        	idxMinY: number;
+        	ulX: number;
+        	ulY: number;
+        };
+
+        /**
+        * Unbind all associations with this tile layer to facilitate garbage collection
+        */
+        dispose(): void;
+    }
+    
+	/**
+	 * A layerOptions object is a method for constructing a tile layer for 
+	 * immediate use, for example by passing it to the jQuery widget or
+	 * in the knockout binding.
+     * @class layerOptions
+     */
+    export class layerOptions {
+        constructor(id: string, options: {
+            useBackdrop?: boolean;
+            maxConcurrentRequests?: number;
+            requestor?: tile.requestor;
+            descriptor?: any;
+            renderer?: tile.renderer;
+            requestProcessor?: any;
+            visible?: boolean;
+            opacity?: number;
+            minZoomLevel?: number;
+            maxZoomLevel?: number;
+            tileBleedPix?: number;
+            retainInterlevelContent?: boolean;
+            enableTileFadeIn?: boolean;
+            notifyErrorAction?: (msg?: string) => void;
+            notifyLoadingQueueHasEmptiedAction?: () => void;
+        });
+		
+		/**
+		 * Returns the underlying tile layer.
+		 * @returns {layer} The underlying tile layer.
+		 */
+        getTileLayer(): tile.layer;
+		
+		/**
+		 * Gets ID associated with the underlying tile layer.
+		 * @returns {string} ID of the layer.
+		 */
+        getId(): string;
+		
+		/**
+		 * Gets this layerOptions object as a JavaScript object.
+		 */
+        getOptions(): any;
+    }
+
+    /**
+	 * The quad class represents a quad tile within three dimensional
+	 * coordinate space.
+	 * @class quad
+	 */
+    export class quad {
+
+    	/**
+		 * Gets the x coodinate of this quad tile.
+		 * @returns {number} The x coordinate of this quad tile.
+		 */
+        getX(): number;
+
+        /** 
+         * Gets the y coordinate of this quad tile.
+         * @returns {number} The y coordinate of this quad tile.
+     	 */
+        getY(): number;
+
+        /**
+         * Gets the z coordinate of this quad tile, or depth.
+         * @returns {number} The z coordinate of this quad tile.
+         */
+        getLevel(): number;
+
+        /**
+         * Gets the envelope in map units which encompasses this quad tile.
+         * @returns {envelope} The encompassing envelope of this quad tile.
+         */
+        getEnvelope(): envelope;
+
+        /**
+         * Gets the string representation of this quad tile as a quad key.
+         * @returns {string} Quad key for this quad tile as a string.
+         */
+        toString(): string;
+
+        /**
+         * Gets the quad key for this quad tile as a string.
+         * @returns {string} Quad key for this quad tile as a string.
+         */
+        getKey(): string;
+
+        /** 
+         * Compares this quad tile with another quad tile and determines
+         * whether or not they are equal.
+         * @param {quad} Quad tile with which to check for equality with this quad tile.
+         * @returns {boolean} Result of the equality test.
+         */
+        equals(q: quad): boolean;
+
+        /**
+         * Generates the quad tile which is a given number of levels above
+         * this tile in the pyramid and in which this quad tile is contained.
+         * @param {number} ancestorsBack Number of levels above this tile the
+         * generated tile should be.
+         * @returns {quad} The generated parent tile.
+         */
+        factoryParent(ancestorsBack: number): quad;
+    }
+    
+	/**
+	 * Exposes static functions for generating and handling quad tiles.
+	 * @module quad 
+	 */
+    export module quad {
+
+    	/**
+    	 * Generates a new quad tile based on a given quad key.
+    	 * @param {string} key The quad key from which to generate the quad tile.
+    	 * @returns The generated quad tile.
+    	 */
+        export function factoryQuadFromKey(key: string): quad;
+    }
+
+    /**
+	 * A tile renderer handles converting JSON vector content loaded from the
+	 * MapDotNet REST feature service into a canvas rendering on a tile.
+     * @class renderer
+	 */
+    export class renderer {
+        constructor(options? : {
+            renderPoint?: (pt: point, context: CanvasRenderingContext2D) => void;
+			renderGeometry?: (shape: geometry, context: CanvasRenderingContext2D) => void;
+            renderBitmap?: (img: HTMLElement, context: CanvasRenderingContext2D, contextSize: number, bleed: number) => void;
+        });
+		
+		/**
+		 * Sets the render point function which takes a point and canvas 
+		 * context and renders the point to the canvas. The points passed 
+		 * in are transformed to pixel units and offset to context origin.
+		 * @param {function} func Function of the form func(shape, context)
+		 * where shape is the point object to be rendered and context is the 
+		 * canvas context on which to render.
+		 */
+        setRenderPoint(func: (pt: point, context: CanvasRenderingContext2D) => void): void ;
+        
+		/**
+		 * Sets render geometry function which takes a geometry and canvas 
+		 * context and renders the geometry to the canvas context. The 
+		 * geometries passed in are transformed to pixel units and offset 
+		 * to the context origin.
+		 * @param {function} func Function with signature func(shape, context)
+		 * where shape is the geometry to render and context is the canvas
+		 * context on which to render.
+		 */
+		setRenderGeometry(func: (shape: geometry, context: CanvasRenderingContext2D) => void): void;
+        
+		/**
+		 * Sets the render bitmap function which takes a bitmap image and
+		 * a canvas context and renders the image to the canvas context.
+		 * @param {function} func Function with the signature 
+		 * func(img, context, contextSize, bleed) where img is the bitmap
+		 * image to render, context is the canvas context on which to 
+		 * render the image, contextSize is the size of the canvas context
+		 * in pixels and bleed is the margin around each tile to bleed.
+		 */
+		setRenderBitmap(func: (img: HTMLElement, context: CanvasRenderingContext2D, contextSize: number, bleed: number) => void): void;
+    }
+	
+	/**
+	 * An auto-ranging density map renderer.
+     * @class rendererDensityMap
+     */
+    export class rendererDensityMap {
+		
+		constructor();
+        
+		/**
+		 * Sets the bleed ratio, which is the sets the percentage of the
+		 * margin around each tile to use in the tile's computation. Note:
+		 * some bleed (i.e., greater than 1) is required since a heat map
+		 * relies on adjacent data.
+		 * @param {number} bleed The desired bleed ratio.
+		 */
+		setBleed(bleed: number): void;
+		
+		/**
+		 * Sets the number of rows and columns of cells to be used for 
+		 * computation within the grid.
+		 * @param {number} gridSize Number of rows and columns used in
+		 * the grid.
+		 */
+        setGridSize(gridSize: number): void;
+		
+		/**
+		 * Sets filter radius corresponding to standard deviations. The
+		 * filter radius is the cutoff point at which adjacent cells no
+		 * longer contribute to a cell's calculation.
+		 * @param {number} filterStdDevRadius Number of standard deviations
+		 * from the mean of a normal distribution to which to give positive 
+		 * weight.
+		 */
+        setFilterStdDevRadius(filterStdDevRadius: number): void;
+		
+		/**
+		 * Sets color ranges from cold to hot for the renderer.
+		 * @param {number[][]} matrix Array of arrrays of numbers, each
+		 * of the form [r,g,b,a], where each array represents a color and
+		 * colors range from cold to hot. Note: Typically, a dozen colors
+		 * is sufficient.
+		 */
+        setColorMatrix(matrix: number[][]): void;
+		
+		/**
+		 * Sets the minimum required cell value for a cell to receive 
+		 * a color. Default minimum value is 0.
+		 * @param {number} mcv The minimum cell value for painting.
+		 */
+        setMinCellValue(min: number): void;
+		
+		/**
+		 * Sets an optional action to perform on each row. This enables 
+		 * processing the values on one or more columns for each row for
+		 * use in the density map computations.
+		 * @param {action} ra Function to call on each row with signature
+		 * action(row). The value returned from the function will is added
+		 * to the cell's value.
+		 */
+        setRowAction(action: (row: any) => number): void;
+		
+		/**
+		 * Tells renderer to re-render density map and recompute ranges. 
+		 * This should be called if the data changes or if, due to extent
+		 * changes, the density changes.
+		 */
+        notifyRecompute(extents?: envelope): void;
+    }
+	
+	/**
+	 * This is a base requestor class.
+     * @class requestor
+	 */
+    export class requestor {
+        
+		constructor();
+		
+		/**
+		 * Gets formatted endpoint using the supplied quadtile and a descriptor.
+		 * @param {quad} quad Quadtile for which to fetch the endpoint.
+		 * @returns {string} The requested URI string.
+		 */
+        getFormattedEndpoint(quad: quad, descriptor: any): string;
+		
+		/**
+		 * Gets data locally if the requestor supports it.
+		 * @param {quad} quad Quadtile for which to fetch the endpoint.
+		 * @returns {string} The requested JSON data.
+		 */
+        getLocalData(quad: quad, descriptor: any): string;
+		
+		/**
+		 * Creates unique sha1 hash from this requestor and the supplied
+		 * descriptor. This is useful in creating a unique key or folder 
+		 * for tile caching. This combined with a tile's quad-key can 
+		 * efficiently and uniquely identify a particular tile.
+		 * @params {descriptor} The descriptor for which to create the hash.
+		 * @returns {string} The generated sha1 hash.
+		 */
+        hash(descriptor: any): string;
+		
+		/**
+		 * Determines whether or not this requestor returns bitmap images.
+		 * @returns {boolean} Whether or not this requestor returns bitmap
+		 * images.
+		 */
+        getIsRestImage(): boolean;
+		
+		/**
+		 * Sets whether this requestor should return bitmap images.
+		 * @param {boolean} flag Whether or not this requestor should return
+		 * bitmap images.
+		 */
+        setIsRestImage(flag: boolean): void;
+		
+		/**
+		 * Determines whether or not this requestor uses an endpoint 
+		 * rather than local data.
+		 * @returns {boolean} Whether or not this requestor gets data from
+		 * an endpoint.
+		 */
+        getUsesEndpoint(): boolean;
+		
+		/**
+		 * Sets whether or not this requestor uses an endpoint rather than
+		 * local data.
+		 * @param {boolean} Whether or not this requestor should get data
+		 * from an endpoint.
+		 */
+        setUsesEndpoint(flag: boolean): void;
+		
+		/**
+		 * Gets format of data returned by REST service.
+		 * @returns {string} Data format returned by the REST service.
+		 */
+        getDataFormat(): string;
+		
+		/**
+		 * Sets format of data that should be returned by REST service.
+		 * @param {string} df Name of the data format the REST service 
+		 * should use.
+		 */
+        setDataFormat(df: string): void;
+		
+		/**
+		 * Returns whether or not caching is enabled for vector-based 
+		 * requestors. 
+		 * @returns {boolean} Whether or not caching is enabled.
+		 */
+        getCacheEnabled(): boolean;
+		
+		/**
+		 * Sets whether or not caching is enabled for vector-beased requestors. 
+		 * @param {boolean} flagce - true (default) if caching is enabled
+		 */
+        setCacheEnabled(flag: boolean): void;
+		
+		/**
+		 * Gets requestor timeout in miliseconds.
+		 * @returns {number} Requestor timeout in miliseconds.
+		 */
+        getTimeoutMs(): number;
+		
+		/**
+		 * Sets requestor timeout in miliseconds.
+		 * @param {number} ms Desired requestor timeout in miliseconds.
+		 */
+        setTimeoutMs(ms: number): void;
+		
+		/** ???
+		 * Gets the additional 
+		 * @returns {object[]}
+		 */
+        getKeyVals(): {}[];
+		
+		/** Set any key/value pairs that are attached to the ajax call (such as username and password)
+		 */
+        setKeyVals(options: {}[]): void;
+		
+		/**
+		 * Gets maximum available zoom level content that can be retrieved 
+		 * from the endpoint this requestor consumes.
+		 * @returns {number} The maximum available zoom level for this requestor.
+		 */
+        getMaxAvailableZoomLevel(): number;
+		
+		/**
+		 * Sets maximum available zoom level content that can be retrieved
+		 * from the endpoint this requestor consumes. Note: This defaults
+		 * to the projection's maximum available zoom level, which is 20
+		 * in spherical mercator.
+		 * @param {number} max The maximum available zoom level for this requestor.
+	     */
+        setMaxAvailableZoomLevel(max: number): void;
+    }
+
+    /**
+	 * A tile requestor for Microsoft Bing maps.
+     * @class requestorBing
+     */
+	export class requestorBing extends requestor {
+        
+		constructor(options?: {
+            dataFormat?: string;
+            timeoutMs?: number;
+            maxAvailableZoomLevel?: number;
+        });
+		
+		/**
+		 * Gets the formatted endpoint uri for Bing maps, e.g. 
+		 * ecn.t{0}.tiles.virtualearth.net/tiles/{1}{2}{3}?g={4}&mkt={5}&shading=hill.
+		 * @returns {string} endpoint to Bing tile server as a formatted string
+	     */
+        getEndpoint(): string;
+		
+		/**
+		 * Gets the protocol for the endpoint, either 'http' or 'https'.
+		 * @returns {string} The endpoint protocol.
+		 */
+        getScheme(): string;
+		
+		/**
+		 * Sets endpoint protocol to either 'http' or 'https'.
+		 * @param {string} s Protocol to use in endpoints.
+		 */
+        setScheme(s: string): void;
+		
+		/**
+		 * Gets Bing tile generation
+		 * @returns {string} the tile generation as an integer
+		 */
+        getGeneration(): string;
+		
+		/**
+		 * Sets Bing tile generation
+		 * @param {string} g - generation as an integer
+		 */
+        setGeneration(g: string): void;
+        
+		/**
+		 * Gets the language code for which the tiles are rendered. The
+		 * default code is 'en-US'.
+		 * @returns {string} The language code for which tiles are rendered.
+		 */
+		getMarket(): string;
+        
+		/**
+		 * Sets language code for which to render tiles. For example,
+		 * 'en-US'.
+		 * @param {string} m Language code for which to render tiles.
+		 */
+		setMarket(m: string): void;
+        
+		/**
+		 * Gets the Bing key associated with this requestor.
+		 * @returns {string} The Bing key for this requestor.
+		 */
+		getBingKey(): string;
+        
+		/**
+		 * Sets Bing key which then calls Microsoft metadata service and
+		 * automatically configures content endpoint.
+		 * @param {string} key Bing key.
+		 */
+		setBingKey(key: string): void;
+    }
+
+    /**
+	 * The bitmap or vector tile requestor using MapDotNet REST services.
+     * @class requestorMDN
+     */
+	export class requestorMDNRest extends requestor {
+        constructor(endpoint: string, options?: {
+            dataFormat?: string;
+            timeoutMs?: number;
+            maxAvailableZoomLevel?: number;
+        });
+        
+		/**
+		 * Gets uri endpoint for the MapDotNet REST service.
+		 * @returns {string} Uri endpoint for the MapDotNet REST service.
+		 */
+		getEndpoint(): string;
+    }
+    
+	/**
+	 * Creates an instance of a descriptor for describing content from a 
+	 * MapDotNet UX REST map service.
+     * @class descriptorMDNRestMap
+     */
+    export class descriptorMDNRestMap {
+        constructor(mapId: string, options?: {
+            version?: string;
+			imageType?: string;
+			bleedRatio?: number;
+			mapCacheOption?: string;
+			mapCacheName?: string;
+			useQuadKeyForMapCacheName?: boolean;
+			backgroundColorStr?: string;
+            layerVisibility?: {};
+            layerOutline?: {};
+            layerFill?: {};
+            layerWhere?: {};
+			tag?: string;
+        });
+
+        /**
+		 * Sets the flag to suspend descriptor change notifications. If 
+		 * set true, all changes to this descriptor will not cause the map
+		 * to redraw. Setting to false will enable redraws and immediately
+		 * force a redraw.
+		 * @param {boolean} flag Whether or not descriptor change notifications
+		 * should be enabled.
+		 */
+		setSuspendDescriptorChangeNotifications(flag: boolean): void;
+		
+		/**
+		 * Gets the map ID.
+		 * @returns {string} The map ID.
+		 */
+        getMapId(): string;
+		
+		/**
+		 * Gets the REST service version.
+		 * @returns {string} The REST service version.
+		 */
+        getVersion(): string;
+		
+		/**
+		 * Sets the REST service version.
+		 * @param {string} v The version number.
+		 */
+        setVersion(v: string): void;
+        
+		/**
+		 * Gets image type associated with this descriptor, either 'png',
+		 * 'png8', or 'jpg'.
+		 * @returns {string} The image type associated with this descriptor.
+		 */
+		getImageType(): string;
+        
+		/**
+		 * Gets image type associated with this descriptor to one of 'png',
+		 * 'png8', or 'jpg'.
+		 * @param {string} t The image type associated which should be
+		 * associated with this descriptor.
+		 */
+		setImageType(t: string): void;
+        
+		/**
+		 * Gets bleed ratio for the layer associated with this descriptor.
+		 * @returns {number} The bleed ratio.
+		 */
+		getBleedRatio(): number;
+        
+		/**
+		 * Sets the bleed ratio. Bleeds greater than 1.0 will fetch content 
+		 * beyond the edge of the tile extents (this is useful for point 
+		 * features).
+		 * @param {number} br The desired bleed ratio, between 1.0 and 2.0.
+		 */
+		setBleedRatio(br: number): void;
+		
+		/**
+		 * Gets the map's cache setting, which is one of 'None', 
+		 * 'ReadOnly', 'ReadWrite', 'ForceWrite', and 'Default.'
+		 * @returns {string} The map's cache setting.
+		 */
+        getMapCacheOption(): string;
+        
+		/**
+		 * Gets the map's cache setting to one of 'None', 
+		 * 'ReadOnly', 'ReadWrite', 'ForceWrite', and 'Default.'
+		 * @param {string} mco The desired cache setting for the map.
+		 */
+		setMapCacheOption(mco: string): void;
+        
+		/**
+		 * Gets the optional map cache name.
+		 * @returns {string} The map cache name.
+		 */
+		getMapCacheName(): string;
+        
+		/**
+		 * Sets the optional map cache name.
+		 * @param {string} mcn The desired map cache name.
+		 */
+		setMapCacheName(mcn: string): void;
+        
+		/**
+		 * Determines whether the map is flagged to use the quadkey as its
+		 * map cache name.
+		 * @returns {boolean} Whether or not the map has been flagged to
+		 * use the quadkey as its map cache name.
+		 */
+		getUseQuadKeyForMapCacheName(): boolean;
+        
+		/**
+		 * Sets the flag that uses the quadkey as its map cache name.
+		 * @param {boolean} flag Whether or not the map should be flagged
+		 * to use the quadkey as its map cache name.
+		 */
+		setUseQuadKeyForMapCacheName(flag: boolean): void;
+        
+		/**
+		 * Gets map image background color.
+		 * @returns {string} CSS style string for the map image background color.
+		 */
+		getBackgroundColorStr(): string;
+        
+		/**
+		 * Sets the map image background color.
+		 * @param {number} a Alpha level.
+		 * @param {number} r Red level.
+		 * @param {number} g Green level.
+		 * @param {number} b Blue level.
+		 */
+		setBackgroundColor(a: number, r: number, g:number, b:number): void;
+        
+		/**
+		 * Checks whether or not the map background is transparent.
+		 * @returns {boolean} Whether or not the map background is transparent.
+		 */
+		getIsBackgroundTransparent(): boolean;
+        
+		/**
+		 * Sets a layer's visibility.
+		 * @param {string} layerId The MapDotNet map layer ID.
+		 * @param {boolean} isVisible Whether or not the layer should be visible.
+		 */
+		setLayerVisibility(layerId: string, isVisible: boolean): void;
+        
+		/**
+		 * Gets a layer's visibility.
+		 * @param {string} layerId The MapDotNet map layer ID.
+		 * @returns {boolean} Whether or not the layer is visible.
+		 */
+		getLayerVisibility(layerId: string): boolean;
+        
+		/**
+		 * Sets a layer's outline color and thickness.
+		 * @param {string} layerId The MapDotNet map layer ID.
+		 * @param {number} a Alpha level.
+		 * @param {number} r Red level.
+		 * @param {number} g Green level.
+		 * @param {number} b Blue level.
+		 * @param {number} thk Outline thickness in pixels.
+		 */
+		setLayerOutline(layerId: string, a: number, r: number, g: number, b: number, thk: number): void;
+        
+		/**
+		 * Gets a layer's outline color and thickness.
+		 * @param {string} layerId The MapDotNet map layer ID.
+		 * @returns {object} JavaScript object of the form {color, thickness}
+		 * where color is the CSS style string of the outline color and 
+		 * thickness is the outline thickness in pixels.
+		 */
+		getLayerOutline(layerId: string): { color: string; thickness: number; };
+        
+		/**
+		 * Sets a layer's fill color.
+		 * @param {string} layerId The MapDotNet map layer ID.
+         * @param {number} a Alpha level.
+         * @param {number} r Red level.
+         * @param {number} g Green level.
+         * @param {number} b Blue level.
+		 */
+		setLayerFill(layerId: string, a: number, r: number, g: number, b: number): void;
+        
+		/**
+		 * Sets a layer's fill color as a SQL expression.
+		 * @param {string} layerId The MapDotNet map layer ID.
+         * @param {string} exp The SQL expression to select a row's fill color.
+         */
+		setLayerFillAsExpression(layerId: string, exp: string): void;
+        
+		/**
+		 * Gets a layer's fill color as a CSS style string or as a SQL expression.
+		 * @param {string} layerId The MapDotNet map layer ID.
+		 * @returns {string} Either the CSS style string or the SQL expression,
+		 * according to how the layer's fill color was set.
+         */
+		getLayerFill(layerId: string): string;
+        
+		/**
+		 * Add or replace the where clause for a layer. The where clause
+		 * is a SQL expression used to filter rows.
+		 * @param {string} layerId The MapDotNet map layer ID.
+         * @param {string} where The desired SQL where expression.
+         * @param {boolean} [merge] Whether to merge the new where clause
+         * with the existing where clause using a SQL AND or to replace
+         * the existing where clause with the new one. Defaults to true (merge).
+		 */
+		setLayerWhere(layerId: string, where: string, merge: boolean): void;
+        
+		/**
+		 * Sets a separator character for the layer where clause expression
+		 * in the query string. This is set to ',' by default, which is 
+		 * consistent with SQL.
+		 * @param {string} sep The desired seperator, which should be a 
+		 * single character.
+		 */
+		setLayerWhereSep(sep: string): void;
+        
+		/**
+		 * Returns the current separator for the layer where clause in the
+		 * query string. 
+		 * @returns {string} The current seperator.
+		 */
+		getLayerWhereSep(): string;
+        
+		/**
+		 * Gets the current layer where clause.
+		 * @param {string} layerId The MapDotNet map layer ID.
+		 * @returns {string} The current where clause. If no where clause
+		 * is in use, this will return an empty string.
+		 */
+		getLayerWhere(layerId: string): string;
+        
+		/**
+		 * Gets a tag which is used to modify the request URIs to avoid 
+		 * browser caching
+		 * @returns {string} The map's tag.
+		 */
+		getTag(): string;
+        
+		/**
+		 * Sets the map's tag, which is used modify request URIs to avoid 
+		 * browser caching.
+		 * @param {string} tag The desired tag.
+		 */
+		setTag(tag: string): void;
+    }
+	
+	/**
+     * Creates an instance of a descriptor for describing content from
+     * a MapDotNet REST feature service.
+     * @class descriptorMDNRestFeature
+     */
+    export class descriptorMDNRestFeature {
+        constructor(mapId: string, layerId: string, options?: {
+            version?: string;
+            bleedRatio?: number;
+            fieldNames?: string[];
+            clipToRenderBounds?: boolean;
+            simplifyEnabled?: boolean;
+        });
+        
+		/**
+		 * Gets the map ID.
+		 * @returns {string} The map ID.
+		 */
+        getMapId(): string;
+        
+		/**
+		 * Gets the layer's ID.
+		 * @returns {string} The layer's ID.
+		 */
+		getLayerId(): string;
+        
+		/**
+		 * Gets the version of the REST service.
+		 * @returns {string} The REST service version.
+		 */
+		getVersion(): string;
+        
+		/**
+		 * Sets the REST service version number.
+		 * @param {string} v The version number to set.
+		 */
+		setVersion(v: string): void;
+        
+		/**
+		 * Gets the bleed ratio.
+		 * @returns {number} The current bleed ratio.
+		 */
+		getBleedRatio(): number;
+        
+		/**
+		 * Sets the bleed ratio. Bleeds greater than 1.0 will fetch content 
+		 * beyond the edge of the tile extents (this is useful for point features).
+		 * @param {number} br The desired bleed ratio, a number between 1.0 and 2.0.
+		 */
+		setBleedRatio(br: number): void;
+        
+		/**
+		 * Gets the optional field names to query. This attribute data may
+		 * be used in dynamic client-side rendering.
+		 * @returns {string[]} An array of field names as strings.
+		 */
+		getFieldNames(): string[];
+        
+		/** 
+		 * Sets the optional field names to query. This attribute data may be used in 
+		 * dynamic client-side rendering.
+		 * @param {string} names - array of strings for each field to query
+		 */
+		setFieldNames(names: string[]): void;
+        
+		/**
+		 * Checks the flag whether to clip geometry fetched at the bounds 
+		 * of the request.
+		 * @returns {boolean} The value of the flag.
+		 */
+		getClipToRenderBounds(): boolean;
+        
+		/**
+		 * Sets the flag whether to clip geometry fetched at the bounds 
+		 * of the request. This can greatly improve performance with large
+		 * complex geometries. Only supported when back-end store is SQL 
+		 * 2008/2012 or PostGIS.
+		 * @param {boolean} flag Whether or not to clip geometries fetched
+		 * at the bounds of the request.
+		 */
+		setClipToRenderBounds(flag: boolean): void;
+		
+		/**
+		 * Checks the flag whether to simplify paths based on the units per
+		 * pixel for the quad tile being requested.
+		 * @returns {boolean} The value of the flag.
+		 */
+        getSimplifyEnabled(): boolean;
+		
+		/**
+		 * Sets the flag whether to simplify paths based on the units per
+		 * pixel for the quad tile being requested.
+		 * @param {boolean} flag Whether or not to simply paths based on 
+		 * the units per pixel.
+		 */
+        setSimplifyEnabled(flag: boolean): void;
+		
+		/**
+		 * Sets the action to perform on descriptor change.
+		 * @param {function} action Function with signature action().
+		 */
+        setNotifyDescriptorChangeAction(action: () => void): void;
+    }
+
+    /**
+	 * This is a generic tile requestor suitable for several third-party
+	 * tile servers. These include open street map, map quest, cloudmade, 
+	 * Nokia, etc.
+	 * @class requestorOpen
+	 */
+    export class requestorOpen extends requestor {
+        constructor(endpoint: string, subdomains: string[], options?: {
+            dataFormat?: string;
+            timeoutMs?: number;
+            maxAvailableZoomLevel?: number;
+        });
+    }
+
+    /**
+	 * This is a requestor for local collections of data. These local collections may 
+	 * originate from inlined code or from datasources other than a MapDotNet REST 
+	 * feature service.
+	 * @class requestorLocal
+	 */
+    export class requestorLocal extends requestor {
+        constructor(options?: {
+            dataFormat?: string;
+            timeoutMs?: number;
+            maxAvailableZoomLevel?: number;
+            data: {}[];
+        });
+		
+		/** 
+		 * Gets the unparsed source data.
+		 * @returns {object} Array of source data objects.
+		 */
+        getSource(): {}[];
+        
+		/**
+		 * Sets source data.
+		 * @param {object} data An array of JavaScript objects to use as
+		 * the requestor source data.
+		 */
+		setSource(data: {}[]): void;
+        
+		/** 
+		 * Returns your source data parsed into theformat { Shapes: [],
+         * Values: [], Bounds: [] } This may be useful for doing client-side 
+         * queries on the local data where all of the WKT has been parsed 
+         * into points and geometry. There is also a bounds collection to 
+         * do a quick spatial check for complex polygons.
+		 * @returns {object} Parsed data object in the form {Shapes, Values, Bounds}.
+		 */
+		getParsedData(): {
+            Shapes: any[];
+            Values: any[];
+            Bounds: envelope[];
+        };
+    }
+    
+	/**
+	 * Local descriptor object for describing source data when the source
+	 * data is fecthed by a local requestor.
+	 * @class descriptorLocal
+     */
+    export class descriptorLocal {
+        constructor(options: {
+            valueFieldNames: string[];
+            geometryFieldName: string;
+            bleedRatio?: number;
+        });
+    }
+}
+
+interface pointObject {
+    x: number;
+    y: number;
+}
+
+interface envObject {
+    
+	/**
+	 * @returns {number} minX as integer
+	 */
+	minX: number;
+    
+	/**
+	 * @returns {number} minY coord as integer
+	 */
+	minY: number;
+    
+	/**
+	 * @returns {number} maxX coord as integer
+	 */
+	maxX: number;
+    
+	/**
+	 * @returns {number} maxY coord as integer
+	 */
+	maxY: number;
+}
+
+interface extentChangeStatsObj {
+
+    centerX: number;
+    centerY: number;
+    centerLat: number;
+    centerLon: number;
+    zoomLevel: number;
+    mapScale: number;
+    mapScaleProjected: number;
+    mapUnitsPerPixel: number;
+    extents: envelope;
+}
+
+interface repositionStatsObj {
+
+    centerX: number;
+    centerY: number;
+    zoomLevel: number;
+    mapUnitsPerPixel: number;
+}
+
+interface beginDigitizeOptions {
+    key?: string;
+    shapeType: string;
+    geometryStyle?: geometryStyle;
+    styledGeometry?: styledGeometry;
+    nodeTapAndHoldAction?: (setIdx: number, idx: number) => boolean;
+    nodeMoveAction?: (x: number, y: number, actionType: string) => any;
+    shapeChangeAction?: () => void;
+    envelopeEndAction?: (env: envelope) => void;
+    circleEndAction?: (circle: geometry.polygon) => void;
+    suppressNodeAdd?: boolean;
+    leavePath?: boolean;
+}
+
+
+interface styleObj {
+    fillColor?: string;
+    fillOpacity?: number;
+    outlineColor?: string;
+    outlineOpacity?: number;
+    outlineThicknessPix?: number
+    dashArray?: string;
+}
+
+interface mapsjsWidget {
+    
+	/**
+	 * Gets the center of the map in spherical mercator. Use 
+	 * sphericalMercator.deprojectToLatLon static function to convert to a lat/lon.
+	 * @return {point} A point map center
+	 */
+	getMapCenter(): point;
+    
+	/**
+	 * Sets the center of the map in spherical mercator. Use
+	 * sphericalMercator.projectFromLatLon static function to convert from a lat/lon.
+	 * @param {point} center The map center as a point
+	 */
+	setMapCenter(center: point): void;
+    
+	/**
+	 * Same as setMapCenter except will animate from current map center to the 
+	 * specified location
+	 * @param {point} center The map center as a point.
+     * @param {number} [durationMs] Duration in miliseconds.
+     * @param {function} [completeAction] Callback to perform on animaton complete.
+	 */
+	setMapCenterAnimate(center: point, durationMs?: number, completeAction?: () => void): void;
+    
+	/**
+	 * Sets the map center to the current geolocation if supported. The map is
+     * animated to the new location.
+     * @param {number} [durationMs] Duration in miliseconds.
+     * @param {function} [completeAction] Callback to perform on animaton complete.
+	 */
+    setMapCenterToGeolocationAnimate(durationMs?: number, completeAction?: () => void): void;
+
+    /**
+    * Offsets the current map center by the specified deltas in pixels. 
+    * @param {number} [dx] offset x in pixels.
+    * @param {number} [dy] offset y in pixels.
+    */
+    offsetMapCenterByPixelDelta(dx: number, dy: number): void;
+
+    /**
+    * Offsets the current map center by the specified deltas in pixels - animated version.
+    * @param {number} [dx] offset x in pixels.
+    * @param {number} [dy] offset y in pixels.
+    * @param {number} [durationMs] animation duration in mS.
+    */
+    offsetMapCenterByPixelDeltaAnimate(dx: number, dy: number, durationMs?: number): void;
+    
+	/**
+	 * Gets the current zoom level.
+	 * @returns {number} The current zoom level.
+	 */
+	getZoomLevel(): number;
+    
+	/**
+	 * Sets the current zoom level.
+	 * @param {number} z1 The desired zoom level.
+	 */
+	setZoomLevel(zl: number): void;
+    
+	/**
+	 * Sets the minimum zoom level for the map.
+	 * @param {number} zl Desired minimum zoom level.
+	 */
+	setMinZoomLevel(zl: number): void;
+    
+	/**
+	 * Sets the maximum zoom level for the map.
+	 * @param {number} z1 The desired maximum zoom level.
+	 */
+	setMaxZoomLevel(zl: number): void;
+    
+	/**
+	 * Animates the map from the current zoom level to the given zoom level.
+	 * @param {number} zl The desired zoom level.
+     * @param {number} [durationMs] The duration in miliseconds.
+     * @param {function} [completeAction] Function to call when the animation
+     * completes with signature completeAction().
+	 */
+	setZoomLevelAnimate(zl: number, durationMs?: number, completeAction?: () => void): void;
+    
+	/**
+	 * Changes the current zoom level.
+	 * @param {number} delta Change to be added to the current zoom level.
+	 */
+	zoomDelta(delta: number): void;
+    
+	/** 
+	 * Animates a change to the current zoom level.
+	 * @param {number} delta Change to be added to the current zoom level.
+	 * @param {number} [durationMs] Duration in miliseconds.
+	 */
+	zoomDeltaAnimate(delta: number, durationMs?: number): void;
+    
+	/**
+	 * Animates parabolically from the current map center and zoom level
+	 * to the given map center and zoom level.
+	 * @param {point} center Desired map center as a point.
+     * @param {number} zl Desired zoom level.
+     * @param {number} [durationMs] Animation duration in miliseconds.
+     * @param {function} [completeAction] Function to call after the animation
+     * completes with signature completeAction().
+	 */
+	flyTo(center: point, zl: number, durationMs?: number, completeAction?: () => void): void;
+    
+	/**
+	 * Gets the current map extents in spherical mercator units.
+	 * @return {envelope} envelope The current map extents.
+	 */
+	getMapExtents(): envelope;
+    
+	/**
+	 * Gets the current map units per pixel.
+	 * @returns {number} Map units (meters) per pixel.
+	 */
+	getMapUnitsPerPixel(): number;
+    
+	/**
+	 * Gets the map extents' width and height in pixels.
+	 * @returns {object} JavaScript object of the form {w, h} where w is
+	 * the current extents' width in pixels and h is the current extents'
+	 * height in pixels.
+	 */
+	getViewExtentsInPix(): { w: number; h: number; };
+    
+	/**
+	 * Gets the current projected map scale. This is the ratio of units on
+	 * the screen to map units depicted.
+	 * @returns {number} Ratio of screen units to map units.
+	 */
+	getProjectedMapScale(): number;
+    
+	/**
+	 * Gets the current actual map scale. This is the ratio of units on 
+	 * the screen to actual units on the earth's surface at the latitude 
+	 * of the current map center.
+	 * @returns {number} The ratio of screen units to actual meters.
+	 */
+	getActualMapScale(): number;
+    
+	/**
+	 * Gets the best fit zoom level based on the supplied map extents for 
+	 * the current display extents in pixels.
+	 * @param {envelope} extentsNew New map extents to fit.
+	 * @returns {number} The zoom level which best fits the extents.
+	 */
+	getBestFitZoomLevelByExtents(extentsNew: envelope): number;
+    
+	/**
+	 * Forces the map to redraw the currently loaded tile and geometry 
+	 * content. You should not have to call this as redraws are automatically
+	 * handled during programatic state changes. This would be for edge cases 
+	 * where the developer is affecting internal state in an undocumented way.
+	 */
+	redraw(): void;
+    
+	/**
+	 * Updates the map to the size of its container. This updates internal 
+	 * parameters for computing map extents and handling the amount of tile 
+	 * content to download. This is handled automatically if the browser 
+	 * window is resized. But if you are sizing the map programatically 
+	 * (e.g. resizable panel or slider) then call this after the parent 
+	 * container has resized.
+	 */
+	resize(): void;
+    
+	/**
+	 * Pushes a supplied tile layer onto the top of the display stack.
+	 * @param {tile.layer} tl The desired tile layer.
+	 */
+	pushTileLayer(tl: tile.layer): void;
+    
+	/**
+	 * Removes a tile layer off the top of the display stack
+	 * @returns {tile.layer} The removed tile layer.
+	 */
+	popTileLayer(): tile.layer;
+
+	/**
+    * Removes a tile layer off the display stack by reference
+    * @param {tile.layer} tl A tile layer to remove.
+    */
+    removeTileLayer(tl: tile.layer): void;
+
+    /**
+    * Removes all tile layers off the display stack
+    */
+    removeAllTileLayers(): void;
+    
+	/**
+	 * Gets the current number of tile layers in the display stack.
+	 * @returns {number} The number of tile layers in the display stack.
+	 */
+	getTileLayerCount(): number;
+    
+	/**
+	 * Gets a tile layer from the display stack by its key.
+	 * @param {string} key The desired tile layer's key.
+	 * @returns {tile.layer} The tile layer associated with the key, or null
+	 * if no tile layer is associated with the key.
+	 */
+	getTileLayer(key: string): tile.layer;
+    
+	/**
+	 * Gets a point in map units from supplied coordinates pixel units 
+	 * with respect to the currently displayed extents.
+	 * @param {number} x The x coordinate in pixels.
+	 * @param {number} y The y coordinate in pixels.
+	 * @returns {point} The generated point in map units.
+	 */
+	computeMapPointFromPixelLocation(x: number, y: number): point;
+    
+	/**
+	 * Flags whether or not map extent changes can occur through gestures 
+	 * like mouse or touch drag, mouse wheel, or pinch zoom.
+	 * @param {boolean} flag Whether or not gestures should affect map 
+	 * extent changes.
+	 */
+	setSuspendMapExtentChangesByGestures(flag: boolean): void;
+    
+	/**
+	 * Sets the z-order of drawn content in relation to the gesture capture 
+	 * panel. The default behavior (false) is to have fixed content and 
+	 * geometry underneath the gesture panel in the DOM. If false, all 
+	 * pointer events are handled by the gesture capture panel and
+	 * optionally parents of the map control. If true, drawn content will
+	 * receive pointer events first and will block gestures to the map. If 
+	 * true, digitizing will not function and polygons will block map 
+	 * navigation. In some scenarios you may want to set this to true if you
+	 * are placing fixed content (such as point features) on the map and 
+	 * need to handle gestures on the placed content. You can call this 
+	 * function at any time to change the order.
+     * @param {boolean} flag Whether or not the fixed content layer should 
+     * reside above the gesture layer.
+	 */
+	setDrawnContentZorderToTop(flag: boolean): void;
+    
+	/**
+	 * Add a fixed element to the content area which resides at a z-level 
+	 * above tiled map content. These elements do not scale with the map
+	 * scale. This is used to place markers or callouts on the map
+	 * @param {HTMLElement} element Any html that can be added to the DOM.
+     * @param {number} mapUnitsX The x coordinate of the insertion point in map units.
+     * @param {number} mapUnitsY The y coordinate of the insertion point in map units.
+     * @param {function} [addAction] Callback function called after the 
+     * DOM element has been placed with signature addAction(element).
+     * @param {object} dragOptions JavaScript object of the form {dragEnabled,
+     * useElementInsteadOfNewGestureOverlay, downAction, moveAction, upAction, 
+     * wheelAction } where dragEnabled flags whether dragging should be
+     * enabled on the element, and downAction, moveAction, upAction, and 
+     * wheelAction are callback functions invoked on mousedown, mousemove,
+     * mouseup, and scroll events respectively.
+	 */
+	addFixedContentElement(
+		element: HTMLElement, 
+		mapUnitsX: number, 
+		mapUnitsY: number, 
+		addAction?: (ele: HTMLElement) => void, 
+		dragOptions?: {
+			dragEnabled: boolean;
+			useElementInsteadOfNewGestureOverlay: boolean;
+			downAction?: (downPoint: point) => any;
+			moveAction?: (movePoint: point) => void;
+			upAction?: (upPoint: point) => void;
+			wheelAction?: (delta: number) => void;
+    	}
+	): void;
+	
+	/**
+	 * Move an existing fixed content element.
+	 * @param {HTMLElement} element The existing DOM element to move.
+	 * @param {number} mapUnitsX The new x coordinate in map units.
+	 * @param {number} mapUnitsY The new y coordinate in map units.
+	 */
+    moveFixedContentElement(element: HTMLElement, mapUnitsX: number, mapUnitsY: number): void;
+    
+	/**
+	 * Removes a fixed content element.
+	 * @param {HTMLElement} element The DOM element to remove. Note: This
+	 * must be the same element added by addFixedContentElement.
+	 */
+	removeFixedContentElement(element: HTMLElement): void;
+    
+	/**
+	 * Add a styled path geometry to the content area which resides at a z-level 
+	 * above tiled map content. The geometry is converted to SVG and added to the 
+	 * content area DOM. If an attempt to add a geometry is made with the same 
+	 * key, the geometry is swapped out. You must remove using removePathGeometry 
+	 * for resource cleanup.
+	 * @param {styleGeometry} styledGeom The styledGeometry to render.
+	 * @param {string} key String used to tie a geometry to its SVG
+     * @param {function} addAction optional function that is called when mapsjs adds an svg element to the DOM representing this styledGeometry.
+     * @param {function} removeAction optional function that is called when mapsjs adds an svg element to the DOM representing this styledGeometry.
+	 * rendering in the DOM.
+	 * @returns {element} The SVG element which was added to the DOM.
+	 */
+    addPathGeometry(
+        styledGeom: styledGeometry,
+        key: string,
+        addAction?: (svg: SVGElement) => void,
+        removeAction?: (svg: SVGElement) => void): SVGElement;
+    
+	/**
+	 * Updates an existing path geometry to reflect a style change.
+	 * @param {geometryStyle} styleNew The new geometryStyle.
+	 * @param {string} key The key of the geometry to receive the new style.
+	 */
+	updatePathGeometryStyle(styleNew: geometryStyle, key: string): void;
+    
+	/**
+	 * Removes a styledGeometry from display.
+	 * @param {string} key The key of the geometry to remove.
+     * @returns {element} The SVG element which was removed from the DOM.
+	 */
+    removePathGeometry(key?: string): SVGElement;
+
+	/**
+	 * Initiates digitization on the map control. This creates a new
+	 * geometry and adds verticies to the geometry accord to mouse
+	 * click locations.
+	 * @param {object} options JavaScript object of the form { key,
+	 * shapeType, geometryStyle, styledGeometry, nodeTapAndHoldAction, nodeMoveAction,
+	 * shapeChangeAction, envelopeEndAction, circleEndAction, supressNodeAdd, leavePath }
+	 * where key is a a string associated with this geometry, shapeType
+	 * is the type of shape this geometry is, one of 'polygon', 'polyline', 'multipoint', 'envelope' or 'circle', 
+     * geometryStyle is a geometryStyle which should be applied
+	 * to the digitized geometry, styledGeometry is an optional styledGeometry for existing paths to edit, set this to enter edit mode,
+     * nodeTapAndHoldAction is a callback invoked
+	 * when any point in the geometry is clicked and held and has the
+	 * signature nodeTapAndHoldAction(setIdx, idx), nodeMoveAction is a
+	 * callback invoked after any node is dragged to a new location and
+	 * has signature nodeMoveAction(x, y, actionType), shapeChangeAction
+	 * is a callback that is invoked after the geometry shape changes and,
+	 * has signature shapeChangeAction(shape), envelopeEndAction is a callback 
+	 * invoked after an envelope is created and has signature envelopeEndAction(envelope), 
+     * circleEndAction is similar to envelopeEndAction but takes a geometry.polygon representing the circle,
+	 * and leavePath is a flag that indicates whether the digitized shape
+	 * should be left on the map after digitization is complete.
+	 */
+    beginDigitize(options: beginDigitizeOptions): void;
+    endDigitize(): void;
+    
+	/**
+	 * Gets a snapshot copy of the currently digitizing path.
+	 * @returns {geometry} The currently digitizing path.
+	 */
+	getDigitizeSnapshot(): geometry;
+    
+	/** 
+	 * Forces additional digitized points to be pushed to a new set of the
+	 * currently digitizing geometry.
+	 */
+	pushSetOnDigitizePath(): void;
+    
+	/**
+	 * Removes the last set from the currently digitizing path.
+	 * @return {number[]} The last set from the currently digitizing path
+	 * in the form [xn,yn]. 
+	 */
+	popSetFromDigitizePath(): number[];
+    
+	/**
+	 * Programmatically delete a node from the currently digitizing path.
+	 * @param {number} setIdx The index of the set from which to remove the node.
+	 * @param {number} nodeIdx The index of the node to remove.
+	 */
+	deleteNodeOnDigitizePath(setIdx: number, nodeIdx: number): void;
+    
+	/**
+	 * Determines whether a shape is currently being digitized.
+	 * @returns {boolean} Whether or not a shape is being digitized.
+	 */
+	isDigitizingEnabled(): boolean;
+    
+	/** 
+	 * Set the function called when the map extents have stopped changing 
+	 * (e.g. after an animated pan or zoom).
+	 * @param {function} action The function to call when the extents
+	 * finish changing with signature action(object) where object is of
+	 * the form { centerX, centerY, centerLat, centerLon, zoomLevel, mapScale,
+	 * mapScaleProjected, mapUnitsPerPixel, extents }.
+	 */
+    setExtentChangeCompleteAction(action: (vals: extentChangeStatsObj) => void): void;
+    
+	/**
+	 * Set the function called when map content (map tiles and fixed elements) are 
+	 * re-positioned in the DOM. This is done automatically as the map is panned 
+	 * beyond existing content and zoomed to a new level requiring content.
+	 * @param {function} action The function to call when the map content
+	 * completes repositioning with signature action(object) where object
+	 * is of the form { centerX, centerY, zoomLevel, mapUnitsPerPixel }.
+	 */
+    setContentRepositionAction(action: (vals: repositionStatsObj) => void): void;
+    
+	/**
+	 * Sets function called when map is clicked or tapped.
+	 * @param {function} action The function to call on mouse click or tap 
+	 * with signature action(point).
+	 */
+	setPointerClickAction(action: (pt: point) => void): void;
+    
+	/** 
+	 * Sets function called when the map pointer hovers over the map.
+	 * @param {function} action The function to call on mouse hover with 
+	 * signature action(point).
+	 */
+	setPointerHoverAction(action: (pt: point) => void): void;
+    
+	/** 
+	* Sets the margin around the map in pixels for extra content fetched so that tile 
+	* rebuilding of the display is minimized. This is an advanced property and does not 
+	* generally need to be adjusted. The default is 128 pixels, or half the width
+	* of a tile. This should be increased for maps which are very large in pixels
+	* or where panning is constant. This should be decreased for very small maps,
+	* such as on mobile devices, or where panning is minimal.
+	* @param {number} cem The content extent margin in pixels.
+	*/
+	setContentExtentsMarginInPixels(cem: number): void;
+
+	/**
+	* Sets the background color of the map using a css color string
+	* @param {number} b- a css color string
+	*/
+	setBackground(b: string): void;
+}
+
+
+interface JQuery {
+
+    rimMap(): JQuery;
+    rimMap(command: any, param?: any, param2?: any, param3?: any, param4?: any, param5?: any): JQuery;
+    getMapsjs(): any;
+}
diff --git a/mapsjs/mapsjs.d.ts b/mapsjs/mapsjs.d.ts
deleted file mode 100644
index 92fdcebf7c..0000000000
--- a/mapsjs/mapsjs.d.ts
+++ /dev/null
@@ -1,2720 +0,0 @@
-// Type definitions for Mapsjs 9.6.0
-// Project: https://github.com/mapsjs
-// Definitions by: Matthew James Davis <https://github.com/davismj/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/**
- * Mapsjs 9.6.0 Copyright (c) 2013 ISC. All Rights Reserved.
-*/
-
-declare module 'mapsjs' {
-
-	/** 
-	 * Clusters a set of points.
-	 * @param {object} options An options object which specifies the clustering algorithm.
-	 * @returns {object} An array of clustered points.
-	 */
-    export function clusterPoints(options: {
-        data: {}[];
-        pointKey: string;
-        valueFunction?: (row: any) => number;
-        radiusFunction: (row: any) => number;
-        aggregateFunction?: (srcRow: any, cmpRow: any, aggRow: any) => void;
-        mapUnitsPerPixel: number;
-        marginPixels?: number;
-    }): {}[];
-
-    /**
-	 * An immutable envelope
-	 * @class envelope
-	 */
-    export class envelope {
-        constructor(minX: number, minY: number, maxX: number, maxY: number);
-
-        /**
-         * Gets the minimum x coordinate of the envelope.
-         * @returns {number} The minimum x coordinate. 
-         */
-        getMinX(): number;
-
-		/**
-		 * Gets the minimum y coordinate of the envelope
-		 * @returns {number} The minimum y coordinate.
-		 */
-        getMinY(): number;
-		
-		/** 
-		 * Gets the maximum x coordinate of the envelope
-		 * @returns {number} The maximum x coordinate.
-		 */
-        getMaxX(): number;
-		
-		/**
-		 * Gets the maximum y coordinate of the envelope
-		 * @returns {number} The maximum y coordinate.
-		 */
-        getMaxY(): number;
-		
-		/**
-		 * Creates a new envelope from this as deep copy.
-		 * @returns {envelope} The new cloned envelope.
-		 */
-        clone(): envelope;
-
-        /**
-         * Creates a new envelope from this one plus x and y margins.
-         * @param {number} marginX The x margin.
-         * @param {number} marginY The y margin.
-         * @returns {envelope} A new envelope.
-         */
-        createFromMargins(marginX: number, marginY: number): envelope;
-		
-		/**
-		 * Create a new envelope from this one plus a bleed ratio.
-		 * @param {number} bleed The bleed ratio.
-		 * @returns {envelope} A new envelope.
-		 */
-        createFromBleed(bleed: number): envelope;
-		
-		/**
-		 * Gets the center point of the envelope.
-		 * @returns {point} Center as a point.
-		 */
-        getCenter(): point;
-		
-		/**
-		 * Gets the width of the envelope.
-		 * @returns {number} Width of the envelope.
-		 */
-        getWidth(): number;
-		
-		/**
-		 * Gets height of the envelope.
-		 * @returns {number} Height of the envelope.
-		 */
-        getHeight(): number;
-		
-		/**
-		 * Gets area of the envelope.
-		 * @return {number} Area of the envelope.
-		 */
-        getArea(): number;
-		
-		/**
-		 * Returns the minimum and maximum coordinates of this envelope as an envObject.
-		 * @returns {envObject} Representaton of this envelope as an envObject.
-		 */
-        toObject(): envObject;
-		
-		/**
-		 * Gets upper left coordinate of this envelope.
-		 * @returns {point} A new point.
-		 */
-        getUL(): point;
-		
-		/**
-		 * Gets upper right of this envelope.
-		 * @returns {point} A new point.
-		 */
-        getUR(): point;
-		
-		/**
-		 * Gets lower left of this envelope.
-		 * @returns {point} A new point.
-		 */
-        getLL(): point;
-		
-		/**
-		 * Gets lower right of this envelope.
-		 * @returns {point} A new point.
-		 */
-        getLR(): point;
-		
-		/**
-		 * Gets the aspect of the envelope.
-		 * @returns {number} Width-to-height ratio.
-		 */
-        getAspect(): number;
-		
-		/**
-		 * Equality comparer between this and another envelope.
-		 * @param {envelope} env Envelope to compare.
-		 * @return {boolean} Result of equality comparison.
-		 */
-        equals(env: envelope): boolean;
-		
-		/**
-		 * Method for casting this envelope as a string.
-		 * @returns {string} String of the form 'minX,minY,maxX,maxY'.
-		 */
-        toString(): string;
-		
-		/**
-		 * Create a closed geometry from this envelope.
-	     * @returns {geometry} A new closed path geometry.
-		 */
-        toGeometry(): geometry;
-		
-		/**
-		 * Tests whether the given point is contained within this envelope.
-		 * @param {point} pt Point to test.
-		 * @returns {boolean} Result of containment test.
-		 */
-        contains(pt: point): boolean;
-    }
-
-    /**
-	 * Exposes static functions that act on or return envelopes.
-	 * @module envelope
-	 */
-    export module envelope {
-	
-		/**
-		 * Creates a new envelope from MapDotNet XML.
-		 * @param {string} xml A MapDotNet XML string of the envelope.
-		 * @returns {envelope} A new envelope 
-		 */
-        export function createFromMdnXml(xml: string): envelope;
-		
-		/**
-		 * Creates new envelope from two corner points.
-		 * @param {point} pt1 Corner point
-		 * @param {point} pt2 Opposite corner point
-		 * @returns {envelope} A new envelope
-		 */
-        export function createFromPoints(pt1: point, pt2: point): envelope;
-		
-		/**
-		 * Creates a new envelope from the x and y coordinates of the center 
-		 * point and x and y margins from the center point.
-		 * @param {number} centerPtX The center x coordinate.
-		 * @param {number} centerPtY The center y coordinate.
-		 * @param {number} marginX The margin from center x coordinate.
-		 * @param {number} marginY The margin from center y coordinate.
-		 * @returns {envelope} A new envelope
-		 */
-		export function createFromCenterAndMargins(centerPtX: number, centerPtY: number, marginX: number, marginY: number): envelope;
-		
-		/**
-		 * Tests whether two given envelopes intersect.
-		 * @param {envelope} env1 First envelope to test.
-		 * @param {envelope} env2 Second envelope to test.
-		 * @returns {boolean} Result of the intersection test.
-		 */
-        export function intersects(env1: envelope, env2: envelope): boolean;
-		
-		/**
-		 * Creates a new envelope from the union of two given envelopes.
-		 * @param {envelope} env1 The first enevelope to unite.
-		 * @param {envelope} env2 The second envelope to unite.
-		 * @returns {envelope} A new envelope.
-		 */
-        export function union(env1: envelope, env2: envelope): envelope;
-    }
-
-    /**
-     * A general geometry which can represent a point, line, polygon,
-     * mulitpoint, multilinestring
-	 * @class geometry
-	 */
-    export class geometry {
-        constructor(isPath?: boolean, isClosed?: boolean);
-        
-		/**
-		 * Creates a new polygon or polyline form the geometry according to
-		 * whether the geometry is closed.
-		 * @returns {any} A new polyline or polygon geometry.
-		 */
-		factoryPoly(): any;
-		
-		/**
-		 * Creates a deep copy of this geometry.
-		 * @returns {geometry} The new cloned geometry.
-		 */
-        clone(): geometry;
-		
-		/**
-		 * Iterates every vertex in the geometry and passes to the supplied 
-		 * callback. Return true from in the callback will break the iteration.
-		 * @param {function} action Callback with the signature action(setIdx, idx, x, y, set).
-		 */
-        foreachVertex(action: (setIdx: number, idx: number, x: number, y: number, s: number[]) => void): void;
-        
-		/**
-		 * Returns the geometry's bounding box as an envelope.
-		 * @returns {envelope} The bounding box of the geometry as an envelope.
-		 */
-		getBounds(): envelope;
-		
-		/**
-		 * Checks whether or not this geometry is closed.
-		 * @returns {boolean} Result of the path check.
-		 */
-        getIsPath(): boolean;
-		
-		/**
-		 * Checks whether or not this geometry is closed.
-		 * @returns {boolean} Result of the closed check.
-		 */
-        getIsClosed(): boolean;
-		
-		/**
-		 * Gets the number of sets in this geometry.
-		 * @returns {number} Number of sets.
-		 */
-        getSetCount(): number;
-		
-		/**
-		 * Gets a set from this geometry's set collection by index, or, if no 
-		 * index is provided, gets the last set. Note: for polygons, first set
-		 * is primary ring and subsequent ones are holes.
-		 * @param {number} [idx] Index of the set to return.
-		 * @returns {number[]} A set as an array of points in the form [xn,yn].
-		 */
-        getSet(idx: number): number[];
-		
-		/**
-		 * Adds a new set to this geometry's collection of sets.
-		 * @param {number[]} s Set to add as an array of points in the form [xn,yn].
-		 */
-        pushSet(s: number[]): void;
-		
-		/**
-		 * Gets the last set in the geometry's set collection and removes it 
-		 * from the collection.
-		 * @returns {number} Set removed as an array of points in the form [xn,yn].
-		 */
-        popSet(): number[];
-		
-		/**
-		 * Creates SVG path data from this geometry if it is a path.
-		 * @returns {string} String of the SVG path or null the geometry is not a path.
-		 */
-        toSvgPathData(): string;
-		
-		/**
-		 * Adds point to the last set in geometry's set collection. If the
-		 * geometry is empty, a new set is added to the geometry first.
-		 * @param {point} pt The point to add.
-		 * @returns {object} Object of the form {setIdx, idx} where setIdx is
-		 * the 0-based index of the set the point was added to and idx is the
-		 * 0-based index of the point in its set.
-		 */
-        addPointToLastSet(pt: point): { setIdx: number; idx: number; };
-		
-		/**
-		 * Tests the validity of this geometry. An open path geometry is valid
-		 * if it has at least one set with at least two points. A closed 
-		 * geometry is valid if it has at least one set with at least three
-		 * points. A point (non-path) geometry is always valid.
-		 * @returns {geometry} valid geometry is true, otherwise false.
-		 */
-        isValid(): boolean;
-		
-		/**
-		 * Creates a wkt string from this geometry.
-		 * @returns {string} A string of well known text.
-		 */
-        toString(): string;
-        toWkt(): string;
-		
-		/**
-		 * Finds the point in this geometry nearest to the given point.
-		 * @param {point} pt Reference point.
-		 * @returns {object} An object of the form {setIdx, ptIdx, pt, distance}
-		 * where setIdx is the index of the set the point is in, ptIdx is the
-		 * index of the point in the set, pt is the point object, and distance
-		 * is the distance of the point to the reference point in map units.
-		 */
-        findNearestVertex(pt: point): { setIdx: number; ptIdx: number; pt: point; distance: number; };
-        
-		/**
-		 * Finds point along boundary of geometry nearest to the given point
-		 * @param {point} pt Reference point.
-		 * @param {boolean} [close] Flag to indicate whether this geometry
-		 * should be treated as a closed geometry.
-		 * @returns {object} An object of the form {setIdx, ptIdx, pt, distance}
-		 * where setIdx is the index of the set the point is in, ptIdx is the
-		 * index of the point in the set, pt is the point object, and distance
-		 * is the distance of the point to the reference point in map units.
-		 */
-		findNearestSegment(pt: point, close?: boolean): { setIdx: number; ptIdx: number; pt: point; distance: number; };
-        
-		/** 
-		 * Finds coordinates in map units of the midpoint of this geometry. If
-		 * this geometry is an open path, the midpoint is the midpoint of the
-		 * path. If this geometry is a closed path, the midpoint is the centroid
-		 * of the polygon. If a set index is not provided, finds the labeling
-		 * point for the last set in this geometry's set collection.
-		 * @param {number} [idx] Index of set for which to find the labeling point.
-		 * @returns {point} Midpoint of this geometry.
-		 */
-		getLabelingPoint(idx?: number): point;
-		
-		/**
-		 * Tests whether this geometry contains a given point/
-		 * @param {point} pt The reference point.
-		 * @returns {boolean} Result of the containment test.
-		 */
-        contains(pt: point): boolean;
-    }
-
-	/** 
-	 * Exposes static functions that act on or return geometries, including
-	 * constructors for specific geometries such as polygon and polyline.
-	 * @module geometry 
-	 */
-    export module geometry {
-        
-		/**
-		 * A polyline object which is an open path geometry with one or more paths.
-	     * @class polyline
-	     */
-        class polyline extends geometry {
-            constructor(geom: geometry);
-            
-			/**
-			 * Gets the underlying geometry of the polyline.
-			 * @returns {geometry} The polyline's underlying geometry object.
-			 */
-			getGeometry(): geometry;
-			
-			/**
-			 * Creates a new polyline object from a deep copy of the underlying geometry.
-			 * @returns {polyline} Thew new cloned polyline.
-			 */
-            clone(): polyline;
-			
-			/**
-			 * Gets number of lines in this polyline.
-			 * @returns {number} Number of lines.
-			 */
-            getLineCount(): number;
-			
-			/**
-			 * Gets a line from this polyline's liune collection by index, or, 
-			 * if no index is provided, gets the last line.
-			 * @param {number} [idx] Index of the line to return.
-			 * @returns {number[]} A line as an array of points in the form [xn,yn].
-			 */
-            getLine(idx: number): number[];
-			
-			/**
-			 * Adds a new line to this polyline's line collection.
-			 * @param {number[]} s Line to add as an array of points in the form [xn,yn].
-			 */
-            pushLine(s: number[]): void;
-			
-			/**
-			 * Gets the last line in the polyline's set collection and removes it 
-			 * from the collection.
-			 * @returns {number} Line removed as an array of points in the form [xn,yn].
-			 */
-            popLine(): number[];
-			
-			/**
-			 * Calculates distance of a line in a polyline by index according 
-			 * to projected map cooordinates. If no index is provided, uses
-			 * the last line in the polyline's set collection.
-			 * @param {number} [idx] Index of the line for which to compute the distance.
-			 * @returns {number} Length in projected units of the distance of the line.
-			 */
-            getProjectedDistance(idx: number): number;
-			
-			/**
-			 * Calculates distance of a line in a polyline by index according 
-			 * to actual distance. If no index is provided, uses the last line 
-			 * in the polyline's set collection.
-			 * @param {number} [idx] Index of the line for which to compute the distance.
-			 * @returns {number} Distance in meters of the line.
-			 */
-            getActualDistance(idx?: number): number;
-			
-			/**
-			 * Determines whether this polyline intersects a given geometry.
-			 * @param {geometry} geom Geometry to test against.
-			 * @returns {boolean} Result of the intersection test.
-			 */
-            intersects(geom: geometry): boolean;
-        }
-        
-		/**
-		  * A polyline object which is a closed path geometry with one or more paths.
-	      * @class polygon
-	      */
-        class polygon extends geometry {
-            constructor(geom: geometry);
-			
-			/**
-			 * Gets the underlying geometry of the polygon.
-			 * @returns {geometry} The polygon's underlying geometry object.
-			 */
-            getGeometry(): geometry;
-			
-			/**
-			 * Creates a new polygon object from a deep copy of the underlying geometry.
-			 * @returns {polygon} Thew new cloned polygon.
-			 */
-            clone(): polygon;
-			
-			/**
-			 * Gets number of rings in this polygon.
-			 * @returns {number} Number of rings.
-			 */
-            getRingCount(): number;
-		
-			/**
-			 * Gets a ring from this polygon's set collection by index, or, 
-			 * if no index is provided, gets the last ring.
-			 * @param {number} [idx] Index of the ring to return.
-			 * @returns {number[]} A ring as an array of points in the form [xn,yn].
-			 */
-            getRing(idx: number): number[];
-			
-			/**
-			 * Adds a new ring to this polygon's ring collection.
-			 * @param {number[]} s Ring to add as an array of points in the form [xn,yn].
-			 */
-            pushRing(s: number[]): void;
-			
-			/**
-			 * Gets the last ring in the polygon's ring collection and removes it 
-			 * from the collection.
-			 * @returns {number} Ring removed as an array of points in the form [xn,yn].
-			 */
-            popRing(): number[];
-			
-			/**
-			 * Calculates area of a ring in a polygon by index according 
-			 * to projected map cooordinates. If no index is provided, uses
-			 * the last ring in the polygon's ring collection.
-			 * @param {number} [idx] Index of the ring for which to compute the area.
-			 * @returns {number} Area in square projected units of the ring.
-			 */
-            getProjectedArea(idx: number): number;
-			
-			/**
-			 * Calculates perimeter of a ring in a polygon by index according 
-			 * to projected map cooordinates. If no index is provided, uses
-			 * the last ring in the polygon's ring collection.
-			 * @param {number} [idx] Index of the ring for which to compute the perimeter.
-			 * @returns {number} Length in projected units of the distance of the ring.
-			 */
-            getProjectedPerimeter(idx: number): number;
-			
-			/**
-			 * Calculates area of a ring in a polygon by index according 
-			 * to the actual area. If no index is provided, uses the last ring
-			 * in the polygon's ring collection.
-			 * @param {number} [idx] Index of the ring for which to compute the area.
-			 * @returns {number} Area in square meters of the ring.
-			 */
-            getActualArea(idx?: number): number;
-			
-			/**
-			 * Calculates perimeter of a ring in a polygon by index according 
-			 * to actual distance. If no index is provided, uses the last ring
-			 * in the polygon's ring collection.
-			 * @param {number} [idx] Index of the ring for which to compute the perimeter.
-			 * @returns {number} Length in meters of the perimeter of the ring.
-			 */
-            getActualPerimeter(idx?: number): number;
-			
-			/**
-			 * Determines whether this polygon intersects a given geometry.
-			 * @param {geometry} geom Geometry to test against.
-			 * @returns {boolean} Result of the intersection test.
-			 */
-			intersects(geom: geometry): boolean;
-			
-			/**
-			 * Determines whether this polyline overlaps a given geometry.
-			 * @param {geometry} geom Geometry to test against.
-			 * @returns {boolean} Result of the intersection test.
-			 */
-            overlaps(poly: polygon): boolean;
-
-			/**
-			 * Convert this polygon into an array of OGC compliant polygons where
-			 * the first set is a ring and all subsequent contained sets are holes.
-			 * @returns {polygon[]} An array of OGC polygons.
-			 */
-			toMultiPolygon(): polygon[];
-        }
-    }
-
-    /**
-	 * A style specification for geometry objects.
-	 * @class geometryStyle
-	 */
-    export class geometryStyle {
-        constructor(options?: styleObj);
-		
-		/**
-		 * Gets path outline thickness in pixels.
-		 * @returns {number} Thickness of path outline.
-		 */
-        getOutlineThicknessPix(): number;
-		
-		/**
-		 * Sets path outline thickness in pixels.
-		 * @param {number} t Desired thickness.
-		 */
-        setOutlineThicknessPix(t: number): void;
-		
-		/**
-		 * Gets path outline color as a CSS style string.
-		 * @returns {string} Outline color as a CSS style string.
-		 */
-        getOutlineColor(): string;
-		
-		/**
-		 * Sets path outline color from a CSS style string.
-		 * @param {string} c Outline color as a CSS style string.
-		 */
-        setOutlineColor(c: string): void;
-		
-		/**
-		 * Gets path outline opacity in decimal format.
-		 * @returns {number} Outline opacity.
-		 */
-        getOutlineOpacity(): number;
-		
-		/**
-		 * Set path outline opacity to a decimal between 0 and 1.
-		 * @param {number} o Outline opacity.
-		 */
-        setOutlineOpacity(o: number): void;
-		
-		/**
-		 * Gets fill color as a CSS style string.
-		 * @returns {string} Fill color as a CSS style string.
-		 */
-        getFillColor(): string;
-		
-		/**
-		 * Sets fill color as a CSS style string.
-		 * @param {string} c Fill color as a CSS style string.
-		 */
-        setFillColor(c: string): void;
-		
-		/**
-		 * Gets fill opacity in decimal format.
-		 * @returns {number} Fill opacity.
-		 */
-        getFillOpacity(): number;
-		
-		/**
-		 * Sets fill opacity to a decimal between 0 and 1.
-		 * @param {number} o Fill opacity.
-		 */
-        setFillOpacity(o: number): void;
-        
-		/**
-		 * Gets the dash array as a string.
-		 * @returns {string} Dash array as astring.
-		 */
-		getDashArray(): string;
-        
-		/**
-		 * Sets dash array string from a CSS style string. Defaults to solid
-		 * stroke if no dash array string is provided.
-		 * @param {string} [da] Dash array as a CSS style string.
-		 */
-		setDashArray(da: string): void;
-    }
-
-    /**
-	 * Gets the mapsjs license.
-	 * @returns {string} The license.
-	 */
-    export var license: string;
-
-    /**
-	 * A simple point class with x and y coordinates.
-	 * @class point
-	 */
-    export class point {
-
-        constructor(x: number, y: number);
-		
-		/**
-		 * Returns the x coordinate.
-		 * @returns {number} The x coordinate.
-		 */
-        getX(): number;
-		
-		/**
-		 * Returns the y coordinate.
-		 * @returns {number} The y coordinate.
-		 */
-        getY(): number;
-		
-		/**
-		 * Returns the x and y coordinates of this point as a pointObject.
-		 * @returns {pointObject} Representaton of this point as an pointObject.
-		 */
-        toProps(): pointObject;
-		
-		/**
-		 * Equality comparer between this point and a given reference point.
-		 * @param {point} pt Reference point.
-		 * @returns {boolean} Result of the equality test.
-		 */
-        equals(pt: point): boolean;
-		
-		/** 
-		 * Creates a point from this point offset by a given x and y distance.
-		 * @param {number} dx The x offset.
-		 * @param {number} dy The y offset.
-		 * @returns {point} The offset point.
-		 */
-        createOffsetBy(dx: number, dy: number): point;
-		
-		/**
-		 * Creates new n-sided polygon around this point.
-		 * @param {number} sides Number of polygon sides.
-		 * @param {number} radius Distance to polygon points.
-		 * @returns {polygon} The generated polygon.
-		 */
-        convertToPoly(side: number, radius: number): geometry.polygon;
-		
-		/**
-		 * Gets the wkt representation of this point.
-		 * @returns {string} The well known text for this point.
-		 */
-        toString(): string;
-		
-		/** 
-		 * Creates a deep copy of this point.
-		 * @returns {point} The new cloned point.
-		 */
-        clone(): point;
-		
-		/**
-		 * Returns this point's bounding box.
-		 * @returns {envelope} The bounding box of the point as an envelope.
-		 */
-        getBounds(): envelope;
-		
-		/**
-		 * Computes distance between this point and a given point in projected
-		 * map units.
-		 * @param {point} pt Point to which to compute distance.
-		 * @returns {number} Distance from this point to the given point in
-		 * projected map units.
-		 */
-        distanceTo(pt: point): number;
-    }
-    
-	/**
-	 * Exposes static functions that act on points.
-	 * @module point
-	 */
-    export module point {
-	
-	    /**
-		 * Computes the distance between two points in coordinate units.
-		 * @param {number} x1 The x coordinate for the first point.
-		 * @param {number} y1 The y coordinate for the first point. 
-		 * @param {number} x2 The x coordinate for the second point. 
-		 * @param {number} y2 The y coordinate for the second point. 
-		 * @returns {number} Distance in coordinate units.
-		 */
-        export function distance(x1: number, y1: number, x2: number, y2: number): number;
-        
-		/**
-		 * Computes the midpoint of two points.
-		 * @param {number} x1 The x coordinate for the first point.
-		 * @param {number} y1 The y coordinate for the first point. 
-		 * @param {number} x2 The x coordinate for the second point. 
-		 * @param {number} y2 The y coordinate for the second point. 
-		 * @return {point} Midpoint point.
-		 */
-		export function midpoint(x1: number, y1: number, x2: number, y2: number): point;
-    }
-    
-	/** 
-	 * Exposes static functions related to the Spherical Mercator projection.
-	 * @module sphericalMercator 
-	 */
-    export module sphericalMercator {
-        
-		/**
-		 * Gets the EPSG number for Spherical Mercator.
-		 * @return {number} ESPG number.
-		 */
-		export function getEpsg(): number;
-		
-		/** 
-		 * Gets the minimum zoom level for this projection.
-		 * @returns {number} Minimum zoom level.
-		 */
-        export function getMinZoomLevel(): number;
-		
-		/**
-		 * Sets the minimum zoom level for this projection. Normally this is 
-		 * set to 1.0 and should not be altered.
-		 * @param {number} minZ Desired minimum zoom level.
-		 */
-        export function setMinZoomLevel(minZ: number): void;
-		
-		/**
-		 * Gets the maxmimum zoom level for this projection.
-		 * @returns {number} Maximum zoom level.
-		 */
-        export function getMaxZoomLevel(): number;
-		
-		/**
-		 * Sets the maximum zoom level for this projection. Normally this is 
-		 * set to 20.0 and should not be altered.
-		 * @param {number} maxZ1 Desired maximum zoom level.
-		 */
-        export function setMaxZoomLevel(maxZ: number): void;
-		
-		/**
-		 * Gets the tile height and width in pixels.
-		 * @returns {number} The height and width of the tiles in pixels.
-		 */
-        export function getTileSizePix(): number;
-		
-		/**
-		 * Gets the display DPI, which defaults to 96. Note: The dpi is 
-		 * recomputed on page load complete.
-		 * @returns {number} Dots per inch on display.
-		 */
-        export function getDpi(): number;
-		
-		/**
-		 * Set the display DPI, which defaults to 96. Note: The DPI is 
-		 * recomputed on page load complete.
-		 * @param {number} dpi Dots per inch on display.
-		 */
-        export function setDpi(dpi: number): void;
-		
-		/**
-		 * Return the equitorial radius in meters for this projection.
-		 * @returns {number} Equitorial radius in meters.
-		 */
-        export function getRadius(): number;
-		
-		/**
-		 * Returns equitorial circumference in meters for this projection
-		 * @returns {number} Equitorial circumference in meters.
-		 */
-        export function getCircumference(): number;
-		
-		/**
-		 * Returns half the equitorial circumference in meters for this projection
-		 * @returns {number} Half of the equitorial circumference in meters.
-		 */
-        export function getHalfCircumference(): number;
-		
-		/**
-		 * Get the envelope in map units for a given quadtree node, i.e. tile,
-		 * based on the given x, y, and z quadtree coordinates.
-		 * @param {number} x The x coordinate.
-		 * @param {number} y The y coordinate.
-		 * @param {number} z The z coordinate.
-		 * @returns {envelope} Envelope of the tile in map units.
-		 */
-        export function getQuadTreeNodeToMapEnvelope(x: number, y: number, z: number): envelope;
-        
-		/**
-		 * Gets the envelope in map units of tiles in the quadtree from an 
-		 * evelope in map units and a zoom level.
-		 * @param {envelope} env Envelope for which to find intersecting tiles.
-		 * @param {number} z Zoom level with which to test for intersection.
-		 * @returns {envelope} The envelope in map units of the tiles.
-		 */
-		export function getQuadTreeNodeRangeFromEnvelope(env: envelope, z: number): envelope;
-        
-		/**
-		 * Gets projected map units per pixel for a given zoom level.
-		 * @param {number} zoomLevel Reference zoom level.
-		 * @returns {number} Projection units per pixel.
-		 */
-		export function getProjectionUnitsPerPixel(zoomLevel: number): number;
-        
-		/** 
-		 * Gets the required scale transform to apply to shapes so distance 
-		 * and area computations yield actual Earth-geodesic units instead of 
-		 * projected map units.
-		 * @param {number} mapPtY Reference latitude for the computation.
-		 * @returns {number} Scale transform multiplier.
-		 */
-		export function getActualShapeScaleTransform(mapPtY: number): number;
-        
-		/**
-		 * Gets actual, on-the-ground meters per pixel for a given zoom level 
-		 * and map point in map units.
-		 * @param {point} mapPt Reference location for the computation.
-		 * @param {number} z Reference zoom level.
-		 * @returns {number} Meters per pixel multiplier.
-		 */
-		export function getActualUnitsPerPixel(mapPt: point, zoomLevel: number): number;
-        
-		/**
-		 * Gets the optimal zoom level for a given envelope in map units 
-		 * based on the envelope of visible device area in pixels.
-		 * @param {envelope} envelopeMap Envelope in map units to display.
-		 * @param {envelope} envelopeDevice Envelope in pixels of visible area.
-		 * @returns {number} Optimal zoom level for viewing envelopeMap.
-		 */
-		export function getBestFitZoomLevelByExtents(envelopeMap: envelope, envelopeDevice: envelope): number;
-        
-		/**
-		 * Gets a quad-key from x, y, and z coordinates.
-		 * @param {number} x The x coordinate.
-		 * @param {number} y The y coordinate.
-		 * @param {number} z The z coordinate.
-		 * @returns {string} Quad-key string.
-		 */
-		export function getQuadKeyFromXYZ(x: number, y: number, z: number): string;
-        
-		/**
-		 * Gets x, y, and z coordinates as an object from a given quad-key.
-		 * @param {string} key Reference quad-key.
-		 * @return {object} JavaScript object of the form {x,y,z}.
-		 */
-		export function getXYZFromQuadKey(key: string): { x: number; y: number; z: number; };
-        
-		/**
-		 * Project a point from latitude/longitude to Spherical Mercator.
-		 * @param {point} lonLat Point object in latitude/longitude. 
-		 * @returns {point} The same point in Spherical Mercator.
-		 */
-		export function projectFromLatLon(lonLat: point): point;
-		
-		/**
-		 * Project a point from Spherical Mercator to latitude/longitude.
-		 * @param {point} mapPt Point object in Spherical Mercator.
-		 * @returns {point} The same point in latitude/longitude.
-		 */
-        export function deprojectToLatLon(mapPt: point): point;
-    }
-
-	/**
-	 * A geometry object decorated with a geometry style object
-	 * @class styledGeometry
-	 */
-    export class styledGeometry {
-        constructor(geom: geometry, gStyle?: geometryStyle);
-		
-        /**
-         * Set this styledGeometry's geometry.
-         * @param {geometry} g A new Geometry.
-         */
-        setGeometry(g: geometry): void;
-
-		/**
-		 * Set this styledGeometry's geometryStyle.
-		 * @param {geometryStyle} gs A new styledGeometry.
-		 */
-        setGeometryStyle(gs: geometryStyle): void;
-		
-		/**
-		 * Gets the styledGeometry's underlying geometry object.
-		 * @returns {geometry} The underlying geometry.
-		 */
-        getGeometry(): geometry;
-
-        /**
-         * Gets the styledGeometry's underlying geometryStyle object.
-         * @returns {geometryStyle} The underlying geometry style.
-         */
-        getGeometryStyle(): geometryStyle;
-		
-		/**
-		 * Gets path outline thickness in pixels.
-		 * @returns {number} Thickness in pixels.
-		 */
-        getOutlineThicknessPix(): number;
-		
-		/**
-		 * Sets path outline thickness in pixels.
-		 * @param {number} t Thickness in pixels.
-		 */
-        setOutlineThicknessPix(t: number): void;
-		
-		/**
-		 * Gets path outline color as a CSS style string.
-		 * @returns {string} Outline color as a CSS style string.
-		 */
-        getOutlineColor(): string;
-		
-		/**
-		 * Gets path outline opacity in decimal format.
-		 * @param {number} Outline opacity.
-		 */
-        setOutlineColor(c: string): void;
-		
-		/**
-		 * Gets path outline opacity in decimal format.
-		 * @returns {number} Outline opacity.
-		 */
-        getOutlineOpacity(): number;
-		
-		/**
-		 * Set path outline opacity to a decimal between 0 and 1.
-		 * @param {number} o Outline opacity.
-		 */
-        setOutlineOpacity(o: number): void;
-		
-		/**
-		 * Gets fill color as a CSS style string.
-		 * @returns {string} Fill color as a CSS style string.
-		 */
-        getFillColor(): string;
-		
-		/**
-		 * Sets fill color as a CSS style string.
-		 * @param {string} c Fill color as a CSS style string.
-		 */
-        setFillColor(c: string): void;
-		
-		/**
-		 * Gets fill opacity in decimal format.
-		 * @returns {number} Fill opacity.
-		 */
-        getFillOpacity(): number;
-		
-		/**
-		 * Sets fill opacity to a decimal between 0 and 1.
-		 * @param {number} o Fill opacity.
-		 */
-        setFillOpacity(o: number): void;
-		
-		/**
-		 * Gets the dash array as a string.
-		 * @returns {string} Dash array as astring.
-		 */
-        getDashArray(): string;
-		
-		/**
-		 * Sets dash array string from a CSS style string. Defaults to solid
-		 * stroke if no dash array string is provided.
-		 * @param {string} [da] Dash array as a CSS style string.
-		 */
-        setDashArray(da: string): void;
-		
-		/**
-		 * Gets optional animation function called when SVG node is created.
-		 * @returns {function} Function with the signature animation(pathElement, loopback).
-		 */
-        getAnimation(): (pathElement: HTMLElement, loopback: () => void) => void;
-
-		/**
-		 * You can use the loopback parameter on complete to call itself and 
-		 * create repeating animation.
-		 * @param {function} Function with the signature animation(pathElement, loopback).
-		 */
-        setAnimation(action: (pathElement: HTMLElement, loopback: () => void) => void): void;
-		
-		/**
-		 * Renders this geometry as an SVG path. Note: We attach original
-		 * geometry bounds to svg doc as an expando.
-		 * @param {string} key Identifer to keep track of the SVG DOM element.
-		 * @param {number} mupp Map units per pixel with which to create the SVG element.
-		 * @returns {HTMLElement} A new SVG document root.
-		 */
-        createSvgPathElement(key: string, mapUnitsPerPix: number): HTMLElement;
-		
-		/** 
-		 * Renders this to a canvas context.
-		 * @param {CanvasRenderingContext2D} ctx Canvas context to which to render.
-		 */
-        renderPathToCanvasContext(ctx: CanvasRenderingContext2D): void;
-    }
-	
-    /**
-	 * The mapjs version.
-	 */
-    export var version: string;
-
-	/** 
-	 * Exposes static functions for working with well known text.
-	 * @module wkt 
-	 */
-    export module wkt {
-        
-		/**
-		 * Parses WKT as a point.
-		 * @param {string} w A WKT string.
-		 * @returns {point} The parsed point.
-		 */
-		export function parsePoint(wkt: string): point;
-		
-		/**
-		 * Parses WKT as a multipoint.
-		 * @param [string} w A WKT string.
-		 * @retuns {geometry} The parsed multipoint geometry.
-		 */
-        export function parseMultiPoint(wkt: string): geometry;
-		
-		/**
-		 * Parses WKT as an open path geometry with a single set.
-		 * @param {string} w A WKT string.
-		 * @returns {geometry} The parsed open path geometry.
-		 */
-        export function parseLineString(wkt: string): geometry;
-		
-		/**
-		 * Parses WKT as an open path geometry with multiple sets.
-		 * @param {string} w A WKT string.
-		 * @returns {geometry} The parsed open path geometry.
-		 */
-        export function parseMultiLineString(wkt: string): geometry;
-		
-		/**
-		 * Parses WKT as a closed path geometry with a single set.
-		 * @param {string} w A WKT string.
-		 * @returns {geometry} The parsed closed path geometry.
-		 */
-        export function parsePolygon(wkt: string): geometry;
-		
-		/**
-		 * Parses WKT as a closed path geometry with multiple sets.
-		 * @param {string} w A WKT string.
-		 * @returns {geometry} The parsed closed path geometry.
-		 */
-		export function parseMultiPolygon(wkt: string): geometry;
-		
-		/**
-		 * Parses WKT as a geometry and determines its type from the string.
-		 * @param {string} w The WKT string.
-		 * @returns {any} The parsed shape, a point, geometry, or an array of
-		 * polygons depending on the WKT.
-		 */
-		export function parse(wkt: string): any;
-
-		/**
-		 * Converts an array of polygons to an OGC compliant multipolygon WKT string.
-		 * @param {polygon[]} polys Set of polygons to parse into WKT.
-		 * @returns {geometry} The OGC compliant WKT for the polygons.
-		 */
-        export function toMultiPolygonString(polys: geometry.polygon[]): string;
-    }
-    
-	/** 
-	 * Exposes various tile-related constructors, including layers, descriptors,
-	 * and requestors.
-	 * @module tile
-	 */
-    export module tile {
-        
-		/**
-		 * A tile layer is a view on the map containing an array of rectangular content.
-	     * @class layer
-	     */
-        export class layer {
-            constructor(id: string, useBackdrop?: boolean, maxConcurrentRequests?: number);
-            
-			/**
-			 * @param {number} m - number for margin in pixels
-			 */
-			// setContentExtentsMarginInPixels(m: number): void;
-            
-			/**
-			 * Gets ID associated with this tile layer.
-			 * @returns {string} ID of the layer.
-			 */
-			getId(): string;
-			
-			/**
-			 * Determines whether this tile layer uses a backdrop.
-			 * @returns {boolean} Whether or not the layer uses a backdrop.
-			 */
-            getUseBackdrop(): boolean;
-			
-			/**
-			 * Returns the tile layer's descriptor, which describes how 
-			 * requested content is rendered or styled.
-			 * @returns {object} The tile layer's descriptor.
-			 */
-            getDescriptor(): any;
-			
-			/**
-			 * Sets the tile layer's descriptor, which describes how requested
-			 * content is rendered or styled.
-			 * @param {function} d A descriptor for this tile layer.
-			 */
-            setDescriptor(d: any): void;
-			
-			/**
-			 * Notifies the tile layer to check for changes to its descriptor.
-			 */
-            notifyDescriptorChange(): void;
-			
-			/**
-			 * Returns this tile layer's requestor which defines what kind of 
-			 * content to get and where to get it.
-			 * @returns {requestor} This tile layer's requestor.
-			 */
-            getRequestor(): tile.requestor;
-			
-			/**
-			 * Sets this tile layer's requestor, which defines what kind of
-			 * content to get and where to get it.
-			 * @param {tile.requestor} req A requestor object.
-			 * @param {tile.requestor} [desc] Descriptor object so that both
-			 * can be set in one call and incur only one content change event.
-             */			 
-            setRequestor(req: tile.requestor, desc?: any): void;
-			
-			/**
-			 * Returns this tile layer's renderer if it exists, which defines 
-			 * how geometry data for a quadView is rendered.
-			 * @returns {renderer} The renderer object.
-			 */
-            getRenderer(): tile.renderer;
-			
-			/**
-			 * Sets optional renderer which defines how geometry data for 
-			 * quadView is rendered.
-			 * @param {renderer} r The renderer delegate function with 
-			 * signature renderer(quadview).
-			 */
-            setRenderer(r: any): void;
-			
-			/**
-			 * Notifies the tile layer to check for changes to its renderer.
-			 */
-            notifyRendererChange(): void;
-			
-			/**
-			 * Gets the visibility state of this tile layer.
-			 * @returns {boolean} Whether or not this layer is visible.
-			 */
-            getIsVisible(): boolean;
-			
-			/**
-			 * Sets visibility state of this tile layer.
-			 * @param {boolean} v Whether this layer should be visible or not.
-			 */
-            setIsVisible(v: boolean): void;
-			
-			/**
-			 * Gets the opacity of this tile layer.
-			 * @returns {number} Opacity as a decimal.
-			 */
-            getOpacity(): number;
-			
-			/** 
-			 * Sets opacity of this tile layer.
-			 * @param {number} o Opacity as a decimal.
-			 */
-            setOpacity(o: number): void;
-			
-			/**
-			 * Gets minimum zoom level where this tile layer is visible.
-			 * @returns {number} The minimum zoom level.
-			 */
-            getMinZoomLevel(): number;
-			
-			/** 
-			 * Sets minimum zoom level where this tile layer is visible.
-			 * @param {number} minZ The desired minimum zoom level.
-			 */
-            setMinZoomLevel(minZ: number): void;
-			
-			/**
-			 * Gets maximum zoom level where this tile layer is visible.
-			 * @returns {number} The maximum zoom level.
-			 */
-            getMaxZoomLevel(): number;
-			
-			/**
-			 * Sets maximum zoom level where this tile layer is visible.
-			 * @param {number} maxZ The desired maximum zoom level.
-			 */
-            setMaxZoomLevel(maxZ: number): void;
-			
-			/**
-			 * Sets pixel bleed on quadTiles, which defaults to 1. Setting this 
-			 * to zero for overlay layers with translucent polygon fills is 
-			 * recommended. Bleed overlap can create faint lines at tile 
-			 * boundries when fill is not opaque.
-			 * @param {number} bleed The number of pixels to bleed.
-			 */
-            setTileBleedPix(bleed: number): void;
-			
-			/**
-			 * Sets whether or not to retain and display previous level tile 
-			 * content as you change tile levels to provide a nice zoom level 
-			 * change effect. Once the next level is loaded the old level 
-			 * content is always discarded. This should be set to false if there 
-			 * is translucent content to display. Defaults to true (prior to 
-			 * version 9.0.0001 this value had the same state as useBackdrop.)
-			 * @param {boolean} ret Whether or not to retain interlevel content.
-			 */
-            setRetainInterlevelContent(retain: boolean): void;
-			
-			/**
-			 * Enables or disables the fade in on tile content, which defaults to enabled.
-			 * @param {boolean} fadeIn Whether or not fade in on tile content 
-			 * should be enabled.
-			 */
-            setEnableTileFadeIn(fadeIn: boolean): void;
-			
-			/**
-			 * Sets the default action to take on error.
-			 * @param {function} action Function to execute on error.
-			 */
-            setNotifyErrorAction(action: () => void): void;
-			
-			/** 
-			 * Sets an optional function to be called when the tile loading
-			 * queue for this layer has emptied.
-			 * @param {function} action Callback function.
-			 */
-            setNotifyLoadingQueueHasEmptiedAction(action: () => void): void;
-			
-			/**
-			 * Sets the optional function to be called by this layer's tile 
-			 * loader during processing. The supplied progress function takes 
-			 * tiles loaded and tiles total parameters.
-			 * @param {function} action Callback of the signature action(tileLoaded, tilesTotal).
-			 */
-            setNotifyLoadingQueueProgressAction(action: (tilesLoaded: number, tilesTotal: number) => void): void;
-            
-			/**
-			 * Sets optional request processor for this tile layer. This is 
-			 * an advanced feature allowing developers to tap into tile 
-			 * request pipeline for purposes of customizing requests or manage 
-			 * custom caching. This is also the mechanism used for offline 
-			 * apps with frameworks such as phonegap.
-			 * @param {function} Processor function with signature
-			 * processor(requestor, descriptor, quad, timeoutMs, complete, error)
-			 */
-			setRequestProcessor(processorFunc: (
-                requestor: tile.requestor,
-                descriptor: any,
-                quad: tile.quad,
-                timeoutMs: number,
-                completeAction: (img: HTMLElement) => void,
-                errorAction: (msg: string) => void) => void): void;
-
-			/**
-			 * Instructs the tile loader to populate a specified tile pyramid.
-			 * This is used to fetch content (e.g. bitmap tiles) and preload 
-			 * it into the browser cache.
-			 * @param {envelope} extents Envelope for which to fetch content.
-			 * @param {number} startZoomLevel Minimum zoom level for which to
-			 * fetch content.
-			 * @param {number} endZoomLevel Maximum zoom level for which to 
-			 * fetch content.
-			 */
-            preload(extents: envelope, startZoomLevel: number, endZoomLevel: number): void;
-            
-			/**
-			 * Composes an array of quadtiles with composition information and
-			 * requestor endpoints. This can be used to create static images
-			 * or print-ready versions of this tile layer at arbitrary extents
-			 * (both source and target) For example: If you needed a 5x3 inch 
-			 * 300 dpi output you can specify extents in device units to be
-			 * 1500x900. This function determines the correct zoom level so 
-			 * that the source extents fits in the target extents to the
-			 * nearest integer zoom level.
-			 * @param {envelope} extentsMapUnits Source extents in map units.
-			 * @param {envelope} extentsDeviceUnits Target extents in pixels.
-			 * @returns {object} Composed object in the form 
-			 * {quadCollection, endpointCollection, idxMinX, idxMinY, ulX, ulY }
-			 * where quadCollection is an array of quad objects, endpointCollection
-			 * is an array of REST endpoints from which to obtain the tiled content,
-			 * idxMinX and idxMinY are the minimum x and y tile indicies of the
-			 * collection respectively, and ulX and ulY are the offset in pixels
-			 * of the upper left tile from the upper left target extents.
-			 */
-            compose(extentsMapUnits: envelope, extentsDeviceUnits: envelope): { 
-            	quadCollection: tile.quad[];
-            	endpointCollection: string[];
-            	idxMinX: number;
-            	idxMinY: number;
-            	ulX: number;
-            	ulY: number;
-            };
-
-            /**
-            * Unbind all associations with this tile layer to facilitate garbage collection
-            */
-            dispose(): void;
-        }
-        
-		/**
-		 * A layerOptions object is a method for constructing a tile layer for 
-		 * immediate use, for example by passing it to the jQuery widget or
-		 * in the knockout binding.
-	     * @class layerOptions
-	     */
-        export class layerOptions {
-            constructor(id: string, options: {
-                useBackdrop?: boolean;
-                maxConcurrentRequests?: number;
-                requestor?: tile.requestor;
-                descriptor?: any;
-                renderer?: tile.renderer;
-                requestProcessor?: any;
-                visible?: boolean;
-                opacity?: number;
-                minZoomLevel?: number;
-                maxZoomLevel?: number;
-                tileBleedPix?: number;
-                retainInterlevelContent?: boolean;
-                enableTileFadeIn?: boolean;
-                notifyErrorAction?: (msg?: string) => void;
-                notifyLoadingQueueHasEmptiedAction?: () => void;
-            });
-			
-			/**
-			 * Returns the underlying tile layer.
-			 * @returns {layer} The underlying tile layer.
-			 */
-            getTileLayer(): tile.layer;
-			
-			/**
-			 * Gets ID associated with the underlying tile layer.
-			 * @returns {string} ID of the layer.
-			 */
-            getId(): string;
-			
-			/**
-			 * Gets this layerOptions object as a JavaScript object.
-			 */
-            getOptions(): any;
-        }
-
-        /**
-    	 * The quad class represents a quad tile within three dimensional
-    	 * coordinate space.
-    	 * @class quad
-		 */
-        export class quad {
-
-        	/**
-    		 * Gets the x coodinate of this quad tile.
-    		 * @returns {number} The x coordinate of this quad tile.
-    		 */
-            getX(): number;
-
-            /** 
-             * Gets the y coordinate of this quad tile.
-             * @returns {number} The y coordinate of this quad tile.
-         	 */
-            getY(): number;
-
-            /**
-             * Gets the z coordinate of this quad tile, or depth.
-             * @returns {number} The z coordinate of this quad tile.
-             */
-            getLevel(): number;
-
-            /**
-             * Gets the envelope in map units which encompasses this quad tile.
-             * @returns {envelope} The encompassing envelope of this quad tile.
-             */
-            getEnvelope(): envelope;
-
-            /**
-             * Gets the string representation of this quad tile as a quad key.
-             * @returns {string} Quad key for this quad tile as a string.
-             */
-            toString(): string;
-
-            /**
-             * Gets the quad key for this quad tile as a string.
-             * @returns {string} Quad key for this quad tile as a string.
-             */
-            getKey(): string;
-
-            /** 
-             * Compares this quad tile with another quad tile and determines
-             * whether or not they are equal.
-             * @param {quad} Quad tile with which to check for equality with this quad tile.
-             * @returns {boolean} Result of the equality test.
-             */
-            equals(q: quad): boolean;
-
-            /**
-             * Generates the quad tile which is a given number of levels above
-             * this tile in the pyramid and in which this quad tile is contained.
-             * @param {number} ancestorsBack Number of levels above this tile the
-             * generated tile should be.
-             * @returns {quad} The generated parent tile.
-             */
-            factoryParent(ancestorsBack: number): quad;
-        }
-        
-		/**
-		 * Exposes static functions for generating and handling quad tiles.
-		 * @module quad 
-		 */
-        export module quad {
-
-        	/**
-        	 * Generates a new quad tile based on a given quad key.
-        	 * @param {string} key The quad key from which to generate the quad tile.
-        	 * @returns The generated quad tile.
-        	 */
-            export function factoryQuadFromKey(key: string): quad;
-        }
-
-        /**
-		 * A tile renderer handles converting JSON vector content loaded from the
-		 * MapDotNet REST feature service into a canvas rendering on a tile.
-	     * @class renderer
-		 */
-        export class renderer {
-            constructor(options? : {
-                renderPoint?: (pt: point, context: CanvasRenderingContext2D) => void;
-				renderGeometry?: (shape: geometry, context: CanvasRenderingContext2D) => void;
-                renderBitmap?: (img: HTMLElement, context: CanvasRenderingContext2D, contextSize: number, bleed: number) => void;
-            });
-			
-			/**
-			 * Sets the render point function which takes a point and canvas 
-			 * context and renders the point to the canvas. The points passed 
-			 * in are transformed to pixel units and offset to context origin.
-			 * @param {function} func Function of the form func(shape, context)
-			 * where shape is the point object to be rendered and context is the 
-			 * canvas context on which to render.
-			 */
-            setRenderPoint(func: (pt: point, context: CanvasRenderingContext2D) => void): void ;
-            
-			/**
-			 * Sets render geometry function which takes a geometry and canvas 
-			 * context and renders the geometry to the canvas context. The 
-			 * geometries passed in are transformed to pixel units and offset 
-			 * to the context origin.
-			 * @param {function} func Function with signature func(shape, context)
-			 * where shape is the geometry to render and context is the canvas
-			 * context on which to render.
-			 */
-			setRenderGeometry(func: (shape: geometry, context: CanvasRenderingContext2D) => void): void;
-            
-			/**
-			 * Sets the render bitmap function which takes a bitmap image and
-			 * a canvas context and renders the image to the canvas context.
-			 * @param {function} func Function with the signature 
-			 * func(img, context, contextSize, bleed) where img is the bitmap
-			 * image to render, context is the canvas context on which to 
-			 * render the image, contextSize is the size of the canvas context
-			 * in pixels and bleed is the margin around each tile to bleed.
-			 */
-			setRenderBitmap(func: (img: HTMLElement, context: CanvasRenderingContext2D, contextSize: number, bleed: number) => void): void;
-        }
-		
-		/**
-		 * An auto-ranging density map renderer.
-	     * @class rendererDensityMap
-	     */
-        export class rendererDensityMap {
-			
-			constructor();
-            
-			/**
-			 * Sets the bleed ratio, which is the sets the percentage of the
-			 * margin around each tile to use in the tile's computation. Note:
-			 * some bleed (i.e., greater than 1) is required since a heat map
-			 * relies on adjacent data.
-			 * @param {number} bleed The desired bleed ratio.
-			 */
-			setBleed(bleed: number): void;
-			
-			/**
-			 * Sets the number of rows and columns of cells to be used for 
-			 * computation within the grid.
-			 * @param {number} gridSize Number of rows and columns used in
-			 * the grid.
-			 */
-            setGridSize(gridSize: number): void;
-			
-			/**
-			 * Sets filter radius corresponding to standard deviations. The
-			 * filter radius is the cutoff point at which adjacent cells no
-			 * longer contribute to a cell's calculation.
-			 * @param {number} filterStdDevRadius Number of standard deviations
-			 * from the mean of a normal distribution to which to give positive 
-			 * weight.
-			 */
-            setFilterStdDevRadius(filterStdDevRadius: number): void;
-			
-			/**
-			 * Sets color ranges from cold to hot for the renderer.
-			 * @param {number[][]} matrix Array of arrrays of numbers, each
-			 * of the form [r,g,b,a], where each array represents a color and
-			 * colors range from cold to hot. Note: Typically, a dozen colors
-			 * is sufficient.
-			 */
-            setColorMatrix(matrix: number[][]): void;
-			
-			/**
-			 * Sets the minimum required cell value for a cell to receive 
-			 * a color. Default minimum value is 0.
-			 * @param {number} mcv The minimum cell value for painting.
-			 */
-            setMinCellValue(min: number): void;
-			
-			/**
-			 * Sets an optional action to perform on each row. This enables 
-			 * processing the values on one or more columns for each row for
-			 * use in the density map computations.
-			 * @param {action} ra Function to call on each row with signature
-			 * action(row). The value returned from the function will is added
-			 * to the cell's value.
-			 */
-            setRowAction(action: (row: any) => number): void;
-			
-			/**
-			 * Tells renderer to re-render density map and recompute ranges. 
-			 * This should be called if the data changes or if, due to extent
-			 * changes, the density changes.
-			 */
-            notifyRecompute(extents?: envelope): void;
-        }
-		
-		/**
-		 * This is a base requestor class.
-	     * @class requestor
-		 */
-        export class requestor {
-            
-			constructor();
-			
-			/**
-			 * Gets formatted endpoint using the supplied quadtile and a descriptor.
-			 * @param {quad} quad Quadtile for which to fetch the endpoint.
-			 * @returns {string} The requested URI string.
-			 */
-            getFormattedEndpoint(quad: quad, descriptor: any): string;
-			
-			/**
-			 * Gets data locally if the requestor supports it.
-			 * @param {quad} quad Quadtile for which to fetch the endpoint.
-			 * @returns {string} The requested JSON data.
-			 */
-            getLocalData(quad: quad, descriptor: any): string;
-			
-			/**
-			 * Creates unique sha1 hash from this requestor and the supplied
-			 * descriptor. This is useful in creating a unique key or folder 
-			 * for tile caching. This combined with a tile's quad-key can 
-			 * efficiently and uniquely identify a particular tile.
-			 * @params {descriptor} The descriptor for which to create the hash.
-			 * @returns {string} The generated sha1 hash.
-			 */
-            hash(descriptor: any): string;
-			
-			/**
-			 * Determines whether or not this requestor returns bitmap images.
-			 * @returns {boolean} Whether or not this requestor returns bitmap
-			 * images.
-			 */
-            getIsRestImage(): boolean;
-			
-			/**
-			 * Sets whether this requestor should return bitmap images.
-			 * @param {boolean} flag Whether or not this requestor should return
-			 * bitmap images.
-			 */
-            setIsRestImage(flag: boolean): void;
-			
-			/**
-			 * Determines whether or not this requestor uses an endpoint 
-			 * rather than local data.
-			 * @returns {boolean} Whether or not this requestor gets data from
-			 * an endpoint.
-			 */
-            getUsesEndpoint(): boolean;
-			
-			/**
-			 * Sets whether or not this requestor uses an endpoint rather than
-			 * local data.
-			 * @param {boolean} Whether or not this requestor should get data
-			 * from an endpoint.
-			 */
-            setUsesEndpoint(flag: boolean): void;
-			
-			/**
-			 * Gets format of data returned by REST service.
-			 * @returns {string} Data format returned by the REST service.
-			 */
-            getDataFormat(): string;
-			
-			/**
-			 * Sets format of data that should be returned by REST service.
-			 * @param {string} df Name of the data format the REST service 
-			 * should use.
-			 */
-            setDataFormat(df: string): void;
-			
-			/**
-			 * Returns whether or not caching is enabled for vector-based 
-			 * requestors. 
-			 * @returns {boolean} Whether or not caching is enabled.
-			 */
-            getCacheEnabled(): boolean;
-			
-			/**
-			 * Sets whether or not caching is enabled for vector-beased requestors. 
-			 * @param {boolean} flagce - true (default) if caching is enabled
-			 */
-            setCacheEnabled(flag: boolean): void;
-			
-			/**
-			 * Gets requestor timeout in miliseconds.
-			 * @returns {number} Requestor timeout in miliseconds.
-			 */
-            getTimeoutMs(): number;
-			
-			/**
-			 * Sets requestor timeout in miliseconds.
-			 * @param {number} ms Desired requestor timeout in miliseconds.
-			 */
-            setTimeoutMs(ms: number): void;
-			
-			/** ???
-			 * Gets the additional 
-			 * @returns {object[]}
-			 */
-            getKeyVals(): {}[];
-			
-			/** Set any key/value pairs that are attached to the ajax call (such as username and password)
-			 */
-            setKeyVals(options: {}[]): void;
-			
-			/**
-			 * Gets maximum available zoom level content that can be retrieved 
-			 * from the endpoint this requestor consumes.
-			 * @returns {number} The maximum available zoom level for this requestor.
-			 */
-            getMaxAvailableZoomLevel(): number;
-			
-			/**
-			 * Sets maximum available zoom level content that can be retrieved
-			 * from the endpoint this requestor consumes. Note: This defaults
-			 * to the projection's maximum available zoom level, which is 20
-			 * in spherical mercator.
-			 * @param {number} max The maximum available zoom level for this requestor.
-		     */
-            setMaxAvailableZoomLevel(max: number): void;
-        }
-
-        /**
-		 * A tile requestor for Microsoft Bing maps.
-	     * @class requestorBing
-         */
-		export class requestorBing extends requestor {
-            
-			constructor(options?: {
-                dataFormat?: string;
-                timeoutMs?: number;
-                maxAvailableZoomLevel?: number;
-            });
-			
-			/**
-			 * Gets the formatted endpoint uri for Bing maps, e.g. 
-			 * ecn.t{0}.tiles.virtualearth.net/tiles/{1}{2}{3}?g={4}&mkt={5}&shading=hill.
-			 * @returns {string} endpoint to Bing tile server as a formatted string
-		     */
-            getEndpoint(): string;
-			
-			/**
-			 * Gets the protocol for the endpoint, either 'http' or 'https'.
-			 * @returns {string} The endpoint protocol.
-			 */
-            getScheme(): string;
-			
-			/**
-			 * Sets endpoint protocol to either 'http' or 'https'.
-			 * @param {string} s Protocol to use in endpoints.
-			 */
-            setScheme(s: string): void;
-			
-			/**
-			 * Gets Bing tile generation
-			 * @returns {string} the tile generation as an integer
-			 */
-            getGeneration(): string;
-			
-			/**
-			 * Sets Bing tile generation
-			 * @param {string} g - generation as an integer
-			 */
-            setGeneration(g: string): void;
-            
-			/**
-			 * Gets the language code for which the tiles are rendered. The
-			 * default code is 'en-US'.
-			 * @returns {string} The language code for which tiles are rendered.
-			 */
-			getMarket(): string;
-            
-			/**
-			 * Sets language code for which to render tiles. For example,
-			 * 'en-US'.
-			 * @param {string} m Language code for which to render tiles.
-			 */
-			setMarket(m: string): void;
-            
-			/**
-			 * Gets the Bing key associated with this requestor.
-			 * @returns {string} The Bing key for this requestor.
-			 */
-			getBingKey(): string;
-            
-			/**
-			 * Sets Bing key which then calls Microsoft metadata service and
-			 * automatically configures content endpoint.
-			 * @param {string} key Bing key.
-			 */
-			setBingKey(key: string): void;
-        }
-
-        /**
-		 * The bitmap or vector tile requestor using MapDotNet REST services.
-	     * @class requestorMDN
-         */
-		export class requestorMDNRest extends requestor {
-            constructor(endpoint: string, options?: {
-                dataFormat?: string;
-                timeoutMs?: number;
-                maxAvailableZoomLevel?: number;
-            });
-            
-			/**
-			 * Gets uri endpoint for the MapDotNet REST service.
-			 * @returns {string} Uri endpoint for the MapDotNet REST service.
-			 */
-			getEndpoint(): string;
-        }
-        
-		/**
-		 * Creates an instance of a descriptor for describing content from a 
-		 * MapDotNet UX REST map service.
-	     * @class descriptorMDNRestMap
-	     */
-        export class descriptorMDNRestMap {
-            constructor(mapId: string, options?: {
-                version?: string;
-				imageType?: string;
-				bleedRatio?: number;
-				mapCacheOption?: string;
-				mapCacheName?: string;
-				useQuadKeyForMapCacheName?: boolean;
-				backgroundColorStr?: string;
-                layerVisibility?: {};
-                layerOutline?: {};
-                layerFill?: {};
-                layerWhere?: {};
-				tag?: string;
-            });
-
-            /**
-			 * Sets the flag to suspend descriptor change notifications. If 
-			 * set true, all changes to this descriptor will not cause the map
-			 * to redraw. Setting to false will enable redraws and immediately
-			 * force a redraw.
-			 * @param {boolean} flag Whether or not descriptor change notifications
-			 * should be enabled.
-			 */
-			setSuspendDescriptorChangeNotifications(flag: boolean): void;
-			
-			/**
-			 * Gets the map ID.
-			 * @returns {string} The map ID.
-			 */
-            getMapId(): string;
-			
-			/**
-			 * Gets the REST service version.
-			 * @returns {string} The REST service version.
-			 */
-            getVersion(): string;
-			
-			/**
-			 * Sets the REST service version.
-			 * @param {string} v The version number.
-			 */
-            setVersion(v: string): void;
-            
-			/**
-			 * Gets image type associated with this descriptor, either 'png',
-			 * 'png8', or 'jpg'.
-			 * @returns {string} The image type associated with this descriptor.
-			 */
-			getImageType(): string;
-            
-			/**
-			 * Gets image type associated with this descriptor to one of 'png',
-			 * 'png8', or 'jpg'.
-			 * @param {string} t The image type associated which should be
-			 * associated with this descriptor.
-			 */
-			setImageType(t: string): void;
-            
-			/**
-			 * Gets bleed ratio for the layer associated with this descriptor.
-			 * @returns {number} The bleed ratio.
-			 */
-			getBleedRatio(): number;
-            
-			/**
-			 * Sets the bleed ratio. Bleeds greater than 1.0 will fetch content 
-			 * beyond the edge of the tile extents (this is useful for point 
-			 * features).
-			 * @param {number} br The desired bleed ratio, between 1.0 and 2.0.
-			 */
-			setBleedRatio(br: number): void;
-			
-			/**
-			 * Gets the map's cache setting, which is one of 'None', 
-			 * 'ReadOnly', 'ReadWrite', 'ForceWrite', and 'Default.'
-			 * @returns {string} The map's cache setting.
-			 */
-            getMapCacheOption(): string;
-            
-			/**
-			 * Gets the map's cache setting to one of 'None', 
-			 * 'ReadOnly', 'ReadWrite', 'ForceWrite', and 'Default.'
-			 * @param {string} mco The desired cache setting for the map.
-			 */
-			setMapCacheOption(mco: string): void;
-            
-			/**
-			 * Gets the optional map cache name.
-			 * @returns {string} The map cache name.
-			 */
-			getMapCacheName(): string;
-            
-			/**
-			 * Sets the optional map cache name.
-			 * @param {string} mcn The desired map cache name.
-			 */
-			setMapCacheName(mcn: string): void;
-            
-			/**
-			 * Determines whether the map is flagged to use the quadkey as its
-			 * map cache name.
-			 * @returns {boolean} Whether or not the map has been flagged to
-			 * use the quadkey as its map cache name.
-			 */
-			getUseQuadKeyForMapCacheName(): boolean;
-            
-			/**
-			 * Sets the flag that uses the quadkey as its map cache name.
-			 * @param {boolean} flag Whether or not the map should be flagged
-			 * to use the quadkey as its map cache name.
-			 */
-			setUseQuadKeyForMapCacheName(flag: boolean): void;
-            
-			/**
-			 * Gets map image background color.
-			 * @returns {string} CSS style string for the map image background color.
-			 */
-			getBackgroundColorStr(): string;
-            
-			/**
-			 * Sets the map image background color.
-			 * @param {number} a Alpha level.
-			 * @param {number} r Red level.
-			 * @param {number} g Green level.
-			 * @param {number} b Blue level.
-			 */
-			setBackgroundColor(a: number, r: number, g:number, b:number): void;
-            
-			/**
-			 * Checks whether or not the map background is transparent.
-			 * @returns {boolean} Whether or not the map background is transparent.
-			 */
-			getIsBackgroundTransparent(): boolean;
-            
-			/**
-			 * Sets a layer's visibility.
-			 * @param {string} layerId The MapDotNet map layer ID.
-			 * @param {boolean} isVisible Whether or not the layer should be visible.
-			 */
-			setLayerVisibility(layerId: string, isVisible: boolean): void;
-            
-			/**
-			 * Gets a layer's visibility.
-			 * @param {string} layerId The MapDotNet map layer ID.
-			 * @returns {boolean} Whether or not the layer is visible.
-			 */
-			getLayerVisibility(layerId: string): boolean;
-            
-			/**
-			 * Sets a layer's outline color and thickness.
-			 * @param {string} layerId The MapDotNet map layer ID.
-			 * @param {number} a Alpha level.
-			 * @param {number} r Red level.
-			 * @param {number} g Green level.
-			 * @param {number} b Blue level.
-			 * @param {number} thk Outline thickness in pixels.
-			 */
-			setLayerOutline(layerId: string, a: number, r: number, g: number, b: number, thk: number): void;
-            
-			/**
-			 * Gets a layer's outline color and thickness.
-			 * @param {string} layerId The MapDotNet map layer ID.
-			 * @returns {object} JavaScript object of the form {color, thickness}
-			 * where color is the CSS style string of the outline color and 
-			 * thickness is the outline thickness in pixels.
-			 */
-			getLayerOutline(layerId: string): { color: string; thickness: number; };
-            
-			/**
-			 * Sets a layer's fill color.
-			 * @param {string} layerId The MapDotNet map layer ID.
-             * @param {number} a Alpha level.
-             * @param {number} r Red level.
-             * @param {number} g Green level.
-             * @param {number} b Blue level.
-			 */
-			setLayerFill(layerId: string, a: number, r: number, g: number, b: number): void;
-            
-			/**
-			 * Sets a layer's fill color as a SQL expression.
-			 * @param {string} layerId The MapDotNet map layer ID.
-             * @param {string} exp The SQL expression to select a row's fill color.
-             */
-			setLayerFillAsExpression(layerId: string, exp: string): void;
-            
-			/**
-			 * Gets a layer's fill color as a CSS style string or as a SQL expression.
-			 * @param {string} layerId The MapDotNet map layer ID.
-			 * @returns {string} Either the CSS style string or the SQL expression,
-			 * according to how the layer's fill color was set.
-             */
-			getLayerFill(layerId: string): string;
-            
-			/**
-			 * Add or replace the where clause for a layer. The where clause
-			 * is a SQL expression used to filter rows.
-			 * @param {string} layerId The MapDotNet map layer ID.
-             * @param {string} where The desired SQL where expression.
-             * @param {boolean} [merge] Whether to merge the new where clause
-             * with the existing where clause using a SQL AND or to replace
-             * the existing where clause with the new one. Defaults to true (merge).
-			 */
-			setLayerWhere(layerId: string, where: string, merge: boolean): void;
-            
-			/**
-			 * Sets a separator character for the layer where clause expression
-			 * in the query string. This is set to ',' by default, which is 
-			 * consistent with SQL.
-			 * @param {string} sep The desired seperator, which should be a 
-			 * single character.
-			 */
-			setLayerWhereSep(sep: string): void;
-            
-			/**
-			 * Returns the current separator for the layer where clause in the
-			 * query string. 
-			 * @returns {string} The current seperator.
-			 */
-			getLayerWhereSep(): string;
-            
-			/**
-			 * Gets the current layer where clause.
-			 * @param {string} layerId The MapDotNet map layer ID.
-			 * @returns {string} The current where clause. If no where clause
-			 * is in use, this will return an empty string.
-			 */
-			getLayerWhere(layerId: string): string;
-            
-			/**
-			 * Gets a tag which is used to modify the request URIs to avoid 
-			 * browser caching
-			 * @returns {string} The map's tag.
-			 */
-			getTag(): string;
-            
-			/**
-			 * Sets the map's tag, which is used modify request URIs to avoid 
-			 * browser caching.
-			 * @param {string} tag The desired tag.
-			 */
-			setTag(tag: string): void;
-        }
-		
-		/**
-	     * Creates an instance of a descriptor for describing content from
-	     * a MapDotNet REST feature service.
-	     * @class descriptorMDNRestFeature
-	     */
-        export class descriptorMDNRestFeature {
-            constructor(mapId: string, layerId: string, options?: {
-                version?: string;
-                bleedRatio?: number;
-                fieldNames?: string[];
-                clipToRenderBounds?: boolean;
-                simplifyEnabled?: boolean;
-            });
-            
-			/**
-			 * Gets the map ID.
-			 * @returns {string} The map ID.
-			 */
-            getMapId(): string;
-            
-			/**
-			 * Gets the layer's ID.
-			 * @returns {string} The layer's ID.
-			 */
-			getLayerId(): string;
-            
-			/**
-			 * Gets the version of the REST service.
-			 * @returns {string} The REST service version.
-			 */
-			getVersion(): string;
-            
-			/**
-			 * Sets the REST service version number.
-			 * @param {string} v The version number to set.
-			 */
-			setVersion(v: string): void;
-            
-			/**
-			 * Gets the bleed ratio.
-			 * @returns {number} The current bleed ratio.
-			 */
-			getBleedRatio(): number;
-            
-			/**
-			 * Sets the bleed ratio. Bleeds greater than 1.0 will fetch content 
-			 * beyond the edge of the tile extents (this is useful for point features).
-			 * @param {number} br The desired bleed ratio, a number between 1.0 and 2.0.
-			 */
-			setBleedRatio(br: number): void;
-            
-			/**
-			 * Gets the optional field names to query. This attribute data may
-			 * be used in dynamic client-side rendering.
-			 * @returns {string[]} An array of field names as strings.
-			 */
-			getFieldNames(): string[];
-            
-			/** 
-			 * Sets the optional field names to query. This attribute data may be used in 
-			 * dynamic client-side rendering.
-			 * @param {string} names - array of strings for each field to query
-			 */
-			setFieldNames(names: string[]): void;
-            
-			/**
-			 * Checks the flag whether to clip geometry fetched at the bounds 
-			 * of the request.
-			 * @returns {boolean} The value of the flag.
-			 */
-			getClipToRenderBounds(): boolean;
-            
-			/**
-			 * Sets the flag whether to clip geometry fetched at the bounds 
-			 * of the request. This can greatly improve performance with large
-			 * complex geometries. Only supported when back-end store is SQL 
-			 * 2008/2012 or PostGIS.
-			 * @param {boolean} flag Whether or not to clip geometries fetched
-			 * at the bounds of the request.
-			 */
-			setClipToRenderBounds(flag: boolean): void;
-			
-			/**
-			 * Checks the flag whether to simplify paths based on the units per
-			 * pixel for the quad tile being requested.
-			 * @returns {boolean} The value of the flag.
-			 */
-            getSimplifyEnabled(): boolean;
-			
-			/**
-			 * Sets the flag whether to simplify paths based on the units per
-			 * pixel for the quad tile being requested.
-			 * @param {boolean} flag Whether or not to simply paths based on 
-			 * the units per pixel.
-			 */
-            setSimplifyEnabled(flag: boolean): void;
-			
-			/**
-			 * Sets the action to perform on descriptor change.
-			 * @param {function} action Function with signature action().
-			 */
-            setNotifyDescriptorChangeAction(action: () => void): void;
-        }
-
-        /**
-		 * This is a generic tile requestor suitable for several third-party
-		 * tile servers. These include open street map, map quest, cloudmade, 
-		 * Nokia, etc.
-		 * @class requestorOpen
-		 */
-        export class requestorOpen extends requestor {
-            constructor(endpoint: string, subdomains: string[], options?: {
-                dataFormat?: string;
-                timeoutMs?: number;
-                maxAvailableZoomLevel?: number;
-            });
-        }
-
-        /**
-		 * This is a requestor for local collections of data. These local collections may 
-		 * originate from inlined code or from datasources other than a MapDotNet REST 
-		 * feature service.
-		 * @class requestorLocal
-		 */
-        export class requestorLocal extends requestor {
-            constructor(options?: {
-                dataFormat?: string;
-                timeoutMs?: number;
-                maxAvailableZoomLevel?: number;
-                data: {}[];
-            });
-			
-			/** 
-			 * Gets the unparsed source data.
-			 * @returns {object} Array of source data objects.
-			 */
-            getSource(): {}[];
-            
-			/**
-			 * Sets source data.
-			 * @param {object} data An array of JavaScript objects to use as
-			 * the requestor source data.
-			 */
-			setSource(data: {}[]): void;
-            
-			/** 
-			 * Returns your source data parsed into theformat { Shapes: [],
-             * Values: [], Bounds: [] } This may be useful for doing client-side 
-             * queries on the local data where all of the WKT has been parsed 
-             * into points and geometry. There is also a bounds collection to 
-             * do a quick spatial check for complex polygons.
-			 * @returns {object} Parsed data object in the form {Shapes, Values, Bounds}.
-			 */
-			getParsedData(): {
-                Shapes: any[];
-                Values: any[];
-                Bounds: envelope[];
-            };
-        }
-        
-		/**
-		 * Local descriptor object for describing source data when the source
-		 * data is fecthed by a local requestor.
-		 * @class descriptorLocal
-	     */
-        export class descriptorLocal {
-            constructor(options: {
-                valueFieldNames: string[];
-                geometryFieldName: string;
-                bleedRatio?: number;
-            });
-        }
-    }
-
-    interface pointObject {
-        x: number;
-        y: number;
-    }
-
-    interface envObject {
-        
-		/**
-		 * @returns {number} minX as integer
-		 */
-		minX: number;
-        
-		/**
-		 * @returns {number} minY coord as integer
-		 */
-		minY: number;
-        
-		/**
-		 * @returns {number} maxX coord as integer
-		 */
-		maxX: number;
-        
-		/**
-		 * @returns {number} maxY coord as integer
-		 */
-		maxY: number;
-    }
-   
-    interface extentChangeStatsObj {
-
-        centerX: number;
-        centerY: number;
-        centerLat: number;
-        centerLon: number;
-        zoomLevel: number;
-        mapScale: number;
-        mapScaleProjected: number;
-        mapUnitsPerPixel: number;
-        extents: envelope;
-    }
-
-    interface repositionStatsObj {
-
-        centerX: number;
-        centerY: number;
-        zoomLevel: number;
-        mapUnitsPerPixel: number;
-    }
-
-    interface beginDigitizeOptions {
-        key?: string;
-        shapeType: string;
-        geometryStyle?: geometryStyle;
-        styledGeometry?: styledGeometry;
-        nodeTapAndHoldAction?: (setIdx: number, idx: number) => boolean;
-        nodeMoveAction?: (x: number, y: number, actionType: string) => any;
-        shapeChangeAction?: () => void;
-        envelopeEndAction?: (env: envelope) => void;
-        circleEndAction?: (circle: geometry.polygon) => void;
-        suppressNodeAdd?: boolean;
-        leavePath?: boolean;
-    }
-
-
-    interface styleObj {
-        fillColor?: string;
-        fillOpacity?: number;
-        outlineColor?: string;
-        outlineOpacity?: number;
-        outlineThicknessPix?: number
-        dashArray?: string;
-    }
-
-    interface mapsjsWidget {
-        
-		/**
-		 * Gets the center of the map in spherical mercator. Use 
-		 * sphericalMercator.deprojectToLatLon static function to convert to a lat/lon.
-		 * @return {point} A point map center
-		 */
-		getMapCenter(): point;
-        
-		/**
-		 * Sets the center of the map in spherical mercator. Use
-		 * sphericalMercator.projectFromLatLon static function to convert from a lat/lon.
-		 * @param {point} center The map center as a point
-		 */
-		setMapCenter(center: point): void;
-        
-		/**
-		 * Same as setMapCenter except will animate from current map center to the 
-		 * specified location
-		 * @param {point} center The map center as a point.
-         * @param {number} [durationMs] Duration in miliseconds.
-         * @param {function} [completeAction] Callback to perform on animaton complete.
-		 */
-		setMapCenterAnimate(center: point, durationMs?: number, completeAction?: () => void): void;
-        
-		/**
-		 * Sets the map center to the current geolocation if supported. The map is
-         * animated to the new location.
-         * @param {number} [durationMs] Duration in miliseconds.
-         * @param {function} [completeAction] Callback to perform on animaton complete.
-		 */
-        setMapCenterToGeolocationAnimate(durationMs?: number, completeAction?: () => void): void;
-
-        /**
-        * Offsets the current map center by the specified deltas in pixels. 
-        * @param {number} [dx] offset x in pixels.
-        * @param {number} [dy] offset y in pixels.
-	    */
-        offsetMapCenterByPixelDelta(dx: number, dy: number): void;
-
-        /**
-        * Offsets the current map center by the specified deltas in pixels - animated version.
-        * @param {number} [dx] offset x in pixels.
-        * @param {number} [dy] offset y in pixels.
-        * @param {number} [durationMs] animation duration in mS.
-        */
-        offsetMapCenterByPixelDeltaAnimate(dx: number, dy: number, durationMs?: number): void;
-        
-		/**
-		 * Gets the current zoom level.
-		 * @returns {number} The current zoom level.
-		 */
-		getZoomLevel(): number;
-        
-		/**
-		 * Sets the current zoom level.
-		 * @param {number} z1 The desired zoom level.
-		 */
-		setZoomLevel(zl: number): void;
-        
-		/**
-		 * Sets the minimum zoom level for the map.
-		 * @param {number} zl Desired minimum zoom level.
-		 */
-		setMinZoomLevel(zl: number): void;
-        
-		/**
-		 * Sets the maximum zoom level for the map.
-		 * @param {number} z1 The desired maximum zoom level.
-		 */
-		setMaxZoomLevel(zl: number): void;
-        
-		/**
-		 * Animates the map from the current zoom level to the given zoom level.
-		 * @param {number} zl The desired zoom level.
-         * @param {number} [durationMs] The duration in miliseconds.
-         * @param {function} [completeAction] Function to call when the animation
-         * completes with signature completeAction().
-		 */
-		setZoomLevelAnimate(zl: number, durationMs?: number, completeAction?: () => void): void;
-        
-		/**
-		 * Changes the current zoom level.
-		 * @param {number} delta Change to be added to the current zoom level.
-		 */
-		zoomDelta(delta: number): void;
-        
-		/** 
-		 * Animates a change to the current zoom level.
-		 * @param {number} delta Change to be added to the current zoom level.
-		 * @param {number} [durationMs] Duration in miliseconds.
-		 */
-		zoomDeltaAnimate(delta: number, durationMs?: number): void;
-        
-		/**
-		 * Animates parabolically from the current map center and zoom level
-		 * to the given map center and zoom level.
-		 * @param {point} center Desired map center as a point.
-         * @param {number} zl Desired zoom level.
-         * @param {number} [durationMs] Animation duration in miliseconds.
-         * @param {function} [completeAction] Function to call after the animation
-         * completes with signature completeAction().
-		 */
-		flyTo(center: point, zl: number, durationMs?: number, completeAction?: () => void): void;
-        
-		/**
-		 * Gets the current map extents in spherical mercator units.
-		 * @return {envelope} envelope The current map extents.
-		 */
-		getMapExtents(): envelope;
-        
-		/**
-		 * Gets the current map units per pixel.
-		 * @returns {number} Map units (meters) per pixel.
-		 */
-		getMapUnitsPerPixel(): number;
-        
-		/**
-		 * Gets the map extents' width and height in pixels.
-		 * @returns {object} JavaScript object of the form {w, h} where w is
-		 * the current extents' width in pixels and h is the current extents'
-		 * height in pixels.
-		 */
-		getViewExtentsInPix(): { w: number; h: number; };
-        
-		/**
-		 * Gets the current projected map scale. This is the ratio of units on
-		 * the screen to map units depicted.
-		 * @returns {number} Ratio of screen units to map units.
-		 */
-		getProjectedMapScale(): number;
-        
-		/**
-		 * Gets the current actual map scale. This is the ratio of units on 
-		 * the screen to actual units on the earth's surface at the latitude 
-		 * of the current map center.
-		 * @returns {number} The ratio of screen units to actual meters.
-		 */
-		getActualMapScale(): number;
-        
-		/**
-		 * Gets the best fit zoom level based on the supplied map extents for 
-		 * the current display extents in pixels.
-		 * @param {envelope} extentsNew New map extents to fit.
-		 * @returns {number} The zoom level which best fits the extents.
-		 */
-		getBestFitZoomLevelByExtents(extentsNew: envelope): number;
-        
-		/**
-		 * Forces the map to redraw the currently loaded tile and geometry 
-		 * content. You should not have to call this as redraws are automatically
-		 * handled during programatic state changes. This would be for edge cases 
-		 * where the developer is affecting internal state in an undocumented way.
-		 */
-		redraw(): void;
-        
-		/**
-		 * Updates the map to the size of its container. This updates internal 
-		 * parameters for computing map extents and handling the amount of tile 
-		 * content to download. This is handled automatically if the browser 
-		 * window is resized. But if you are sizing the map programatically 
-		 * (e.g. resizable panel or slider) then call this after the parent 
-		 * container has resized.
-		 */
-		resize(): void;
-        
-		/**
-		 * Pushes a supplied tile layer onto the top of the display stack.
-		 * @param {tile.layer} tl The desired tile layer.
-		 */
-		pushTileLayer(tl: tile.layer): void;
-        
-		/**
-		 * Removes a tile layer off the top of the display stack
-		 * @returns {tile.layer} The removed tile layer.
-		 */
-		popTileLayer(): tile.layer;
-
-		/**
-        * Removes a tile layer off the display stack by reference
-        * @param {tile.layer} tl A tile layer to remove.
-        */
-        removeTileLayer(tl: tile.layer): void;
-
-        /**
-        * Removes all tile layers off the display stack
-        */
-        removeAllTileLayers(): void;
-        
-		/**
-		 * Gets the current number of tile layers in the display stack.
-		 * @returns {number} The number of tile layers in the display stack.
-		 */
-		getTileLayerCount(): number;
-        
-		/**
-		 * Gets a tile layer from the display stack by its key.
-		 * @param {string} key The desired tile layer's key.
-		 * @returns {tile.layer} The tile layer associated with the key, or null
-		 * if no tile layer is associated with the key.
-		 */
-		getTileLayer(key: string): tile.layer;
-        
-		/**
-		 * Gets a point in map units from supplied coordinates pixel units 
-		 * with respect to the currently displayed extents.
-		 * @param {number} x The x coordinate in pixels.
-		 * @param {number} y The y coordinate in pixels.
-		 * @returns {point} The generated point in map units.
-		 */
-		computeMapPointFromPixelLocation(x: number, y: number): point;
-        
-		/**
-		 * Flags whether or not map extent changes can occur through gestures 
-		 * like mouse or touch drag, mouse wheel, or pinch zoom.
-		 * @param {boolean} flag Whether or not gestures should affect map 
-		 * extent changes.
-		 */
-		setSuspendMapExtentChangesByGestures(flag: boolean): void;
-        
-		/**
-		 * Sets the z-order of drawn content in relation to the gesture capture 
-		 * panel. The default behavior (false) is to have fixed content and 
-		 * geometry underneath the gesture panel in the DOM. If false, all 
-		 * pointer events are handled by the gesture capture panel and
-		 * optionally parents of the map control. If true, drawn content will
-		 * receive pointer events first and will block gestures to the map. If 
-		 * true, digitizing will not function and polygons will block map 
-		 * navigation. In some scenarios you may want to set this to true if you
-		 * are placing fixed content (such as point features) on the map and 
-		 * need to handle gestures on the placed content. You can call this 
-		 * function at any time to change the order.
-         * @param {boolean} flag Whether or not the fixed content layer should 
-         * reside above the gesture layer.
-		 */
-		setDrawnContentZorderToTop(flag: boolean): void;
-        
-		/**
-		 * Add a fixed element to the content area which resides at a z-level 
-		 * above tiled map content. These elements do not scale with the map
-		 * scale. This is used to place markers or callouts on the map
-		 * @param {HTMLElement} element Any html that can be added to the DOM.
-         * @param {number} mapUnitsX The x coordinate of the insertion point in map units.
-         * @param {number} mapUnitsY The y coordinate of the insertion point in map units.
-         * @param {function} [addAction] Callback function called after the 
-         * DOM element has been placed with signature addAction(element).
-         * @param {object} dragOptions JavaScript object of the form {dragEnabled,
-         * useElementInsteadOfNewGestureOverlay, downAction, moveAction, upAction, 
-         * wheelAction } where dragEnabled flags whether dragging should be
-         * enabled on the element, and downAction, moveAction, upAction, and 
-         * wheelAction are callback functions invoked on mousedown, mousemove,
-         * mouseup, and scroll events respectively.
-		 */
-		addFixedContentElement(
-			element: HTMLElement, 
-			mapUnitsX: number, 
-			mapUnitsY: number, 
-			addAction?: (ele: HTMLElement) => void, 
-			dragOptions?: {
-				dragEnabled: boolean;
-				useElementInsteadOfNewGestureOverlay: boolean;
-				downAction?: (downPoint: point) => any;
-				moveAction?: (movePoint: point) => void;
-				upAction?: (upPoint: point) => void;
-				wheelAction?: (delta: number) => void;
-        	}
-    	): void;
-		
-		/**
-		 * Move an existing fixed content element.
-		 * @param {HTMLElement} element The existing DOM element to move.
-		 * @param {number} mapUnitsX The new x coordinate in map units.
-		 * @param {number} mapUnitsY The new y coordinate in map units.
-		 */
-        moveFixedContentElement(element: HTMLElement, mapUnitsX: number, mapUnitsY: number): void;
-        
-		/**
-		 * Removes a fixed content element.
-		 * @param {HTMLElement} element The DOM element to remove. Note: This
-		 * must be the same element added by addFixedContentElement.
-		 */
-		removeFixedContentElement(element: HTMLElement): void;
-        
-		/**
-		 * Add a styled path geometry to the content area which resides at a z-level 
-		 * above tiled map content. The geometry is converted to SVG and added to the 
-		 * content area DOM. If an attempt to add a geometry is made with the same 
-		 * key, the geometry is swapped out. You must remove using removePathGeometry 
-		 * for resource cleanup.
-		 * @param {styleGeometry} styledGeom The styledGeometry to render.
-		 * @param {string} key String used to tie a geometry to its SVG
-         * @param {function} addAction optional function that is called when mapsjs adds an svg element to the DOM representing this styledGeometry.
-         * @param {function} removeAction optional function that is called when mapsjs adds an svg element to the DOM representing this styledGeometry.
-		 * rendering in the DOM.
-		 * @returns {element} The SVG element which was added to the DOM.
-		 */
-        addPathGeometry(
-            styledGeom: styledGeometry,
-            key: string,
-            addAction?: (svg: SVGElement) => void,
-            removeAction?: (svg: SVGElement) => void): SVGElement;
-        
-		/**
-		 * Updates an existing path geometry to reflect a style change.
-		 * @param {geometryStyle} styleNew The new geometryStyle.
-		 * @param {string} key The key of the geometry to receive the new style.
-		 */
-		updatePathGeometryStyle(styleNew: geometryStyle, key: string): void;
-        
-		/**
-		 * Removes a styledGeometry from display.
-		 * @param {string} key The key of the geometry to remove.
-         * @returns {element} The SVG element which was removed from the DOM.
-		 */
-        removePathGeometry(key?: string): SVGElement;
-
-		/**
-		 * Initiates digitization on the map control. This creates a new
-		 * geometry and adds verticies to the geometry accord to mouse
-		 * click locations.
-		 * @param {object} options JavaScript object of the form { key,
-		 * shapeType, geometryStyle, styledGeometry, nodeTapAndHoldAction, nodeMoveAction,
-		 * shapeChangeAction, envelopeEndAction, circleEndAction, supressNodeAdd, leavePath }
-		 * where key is a a string associated with this geometry, shapeType
-		 * is the type of shape this geometry is, one of 'polygon', 'polyline', 'multipoint', 'envelope' or 'circle', 
-         * geometryStyle is a geometryStyle which should be applied
-		 * to the digitized geometry, styledGeometry is an optional styledGeometry for existing paths to edit, set this to enter edit mode,
-         * nodeTapAndHoldAction is a callback invoked
-		 * when any point in the geometry is clicked and held and has the
-		 * signature nodeTapAndHoldAction(setIdx, idx), nodeMoveAction is a
-		 * callback invoked after any node is dragged to a new location and
-		 * has signature nodeMoveAction(x, y, actionType), shapeChangeAction
-		 * is a callback that is invoked after the geometry shape changes and,
-		 * has signature shapeChangeAction(shape), envelopeEndAction is a callback 
-		 * invoked after an envelope is created and has signature envelopeEndAction(envelope), 
-         * circleEndAction is similar to envelopeEndAction but takes a geometry.polygon representing the circle,
-		 * and leavePath is a flag that indicates whether the digitized shape
-		 * should be left on the map after digitization is complete.
-		 */
-        beginDigitize(options: beginDigitizeOptions): void;
-        endDigitize(): void;
-        
-		/**
-		 * Gets a snapshot copy of the currently digitizing path.
-		 * @returns {geometry} The currently digitizing path.
-		 */
-		getDigitizeSnapshot(): geometry;
-        
-		/** 
-		 * Forces additional digitized points to be pushed to a new set of the
-		 * currently digitizing geometry.
-		 */
-		pushSetOnDigitizePath(): void;
-        
-		/**
-		 * Removes the last set from the currently digitizing path.
-		 * @return {number[]} The last set from the currently digitizing path
-		 * in the form [xn,yn]. 
-		 */
-		popSetFromDigitizePath(): number[];
-        
-		/**
-		 * Programmatically delete a node from the currently digitizing path.
-		 * @param {number} setIdx The index of the set from which to remove the node.
-		 * @param {number} nodeIdx The index of the node to remove.
-		 */
-		deleteNodeOnDigitizePath(setIdx: number, nodeIdx: number): void;
-        
-		/**
-		 * Determines whether a shape is currently being digitized.
-		 * @returns {boolean} Whether or not a shape is being digitized.
-		 */
-		isDigitizingEnabled(): boolean;
-        
-		/** 
-		 * Set the function called when the map extents have stopped changing 
-		 * (e.g. after an animated pan or zoom).
-		 * @param {function} action The function to call when the extents
-		 * finish changing with signature action(object) where object is of
-		 * the form { centerX, centerY, centerLat, centerLon, zoomLevel, mapScale,
-		 * mapScaleProjected, mapUnitsPerPixel, extents }.
-		 */
-        setExtentChangeCompleteAction(action: (vals: extentChangeStatsObj) => void): void;
-        
-		/**
-		 * Set the function called when map content (map tiles and fixed elements) are 
-		 * re-positioned in the DOM. This is done automatically as the map is panned 
-		 * beyond existing content and zoomed to a new level requiring content.
-		 * @param {function} action The function to call when the map content
-		 * completes repositioning with signature action(object) where object
-		 * is of the form { centerX, centerY, zoomLevel, mapUnitsPerPixel }.
-		 */
-        setContentRepositionAction(action: (vals: repositionStatsObj) => void): void;
-        
-		/**
-		 * Sets function called when map is clicked or tapped.
-		 * @param {function} action The function to call on mouse click or tap 
-		 * with signature action(point).
-		 */
-		setPointerClickAction(action: (pt: point) => void): void;
-        
-		/** 
-		 * Sets function called when the map pointer hovers over the map.
-		 * @param {function} action The function to call on mouse hover with 
-		 * signature action(point).
-		 */
-		setPointerHoverAction(action: (pt: point) => void): void;
-        
-		/** 
-		* Sets the margin around the map in pixels for extra content fetched so that tile 
-		* rebuilding of the display is minimized. This is an advanced property and does not 
-		* generally need to be adjusted. The default is 128 pixels, or half the width
-		* of a tile. This should be increased for maps which are very large in pixels
-		* or where panning is constant. This should be decreased for very small maps,
-		* such as on mobile devices, or where panning is minimal.
-		* @param {number} cem The content extent margin in pixels.
-		*/
-		setContentExtentsMarginInPixels(cem: number): void;
-
-		/**
-		* Sets the background color of the map using a css color string
-		* @param {number} b- a css color string
-		*/
-		setBackground(b: string): void;
-    }
-}
-
-interface JQuery {
-
-    rimMap(): JQuery;
-    rimMap(command: any, param?: any, param2?: any, param3?: any, param4?: any, param5?: any): JQuery;
-    getMapsjs(): any;
-}
diff --git a/mapsjs/tsconfig.json b/mapsjs/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/mapsjs/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/maquette/index.d.ts b/maquette/index.d.ts
new file mode 100644
index 0000000000..31c18a0bbc
--- /dev/null
+++ b/maquette/index.d.ts
@@ -0,0 +1,379 @@
+// Type definitions for maquette
+// Project: http://maquettejs.org/
+// Definitions by: Johan Gorter <https://github.com/johan-gorter>
+// Definitions: https://github.com/johan-gorter/DefinitelyTyped
+
+  /**
+   * The main object in maquette is the maquette object.
+   * It is either bound to `window.maquette` or it can be obtained using {@link http://browserify.org/|browserify} or {@link http://requirejs.org/|requirejs}.
+   */
+declare namespace maquette {
+
+  // Needed for typescript pre-1.5?
+  interface Touch {
+    clientX: number;
+    clientY: number;
+    identifier: number;
+    pageX: number;
+    pageY: number;
+    screenX: number;
+    screenY: number;
+    target: EventTarget;
+  }
+  interface TouchList {
+    length: number;
+    item(index: number): Touch;
+    [index: number]: Touch;
+  }
+  interface TouchEvent extends UIEvent {
+    altKey: boolean;
+    changedTouches: TouchList;
+    ctrlKey: boolean;
+    metaKey: boolean;
+    shiftKey: boolean;
+    targetTouches: TouchList;
+    touches: TouchList;
+  }
+
+
+  export interface VNodeProperties {
+    enterAnimation?: ((element: Element, properties?: VNodeProperties) => void) | string;
+    exitAnimation?: ((element: Element, removeElement: () => void, properties?: VNodeProperties) => void) | string;
+    updateAnimation?: (element: Element, properties?: VNodeProperties, previousProperties?: VNodeProperties) => void;
+    afterCreate?: (element: Element, projectionOptions: ProjectionOptions, vnodeSelector: string, properties: VNodeProperties,
+      children: VNode[]) => void;
+    afterUpdate?: (element: Element, projectionOptions: ProjectionOptions, vnodeSelector: string, properties: VNodeProperties,
+      children: VNode[]) => void;
+    key?: Object;
+    classes?: {[index:string]: boolean};
+    styles?: {[index:string]: string};
+
+    // From Element
+    ontouchcancel?: (ev?: TouchEvent) => boolean|void;
+    ontouchend?: (ev?: TouchEvent) => boolean|void;
+    ontouchmove?: (ev?: TouchEvent) => boolean|void;
+    ontouchstart?: (ev?: TouchEvent) => boolean|void;
+    // From HTMLFormElement
+    action?: string;
+    encoding?: string;
+    enctype?: string;
+    method?: string;
+    name?: string;
+    target?: string;
+    // From HTMLElement
+    onblur?: (ev?: FocusEvent) => boolean|void;
+    onchange?: (ev?: Event) => boolean|void;
+    onclick?: (ev?: MouseEvent) => boolean|void;
+    ondblclick?: (ev?: MouseEvent) => boolean|void;
+    onfocus?: (ev?: FocusEvent) => boolean|void;
+    oninput?: (ev?: Event) => boolean|void;
+    onkeydown?: (ev?: KeyboardEvent) => boolean|void;
+    onkeypress?: (ev?: KeyboardEvent) => boolean|void;
+    onkeyup?: (ev?: KeyboardEvent) => boolean|void;
+    onload?: (ev?: Event) => boolean|void;
+    onmousedown?: (ev?: MouseEvent) => boolean|void;
+    onmouseenter?: (ev?: MouseEvent) => boolean|void;
+    onmouseleave?: (ev?: MouseEvent) => boolean|void;
+    onmousemove?: (ev?: MouseEvent) => boolean|void;
+    onmouseout?: (ev?: MouseEvent) => boolean|void;
+    onmouseover?: (ev?: MouseEvent) => boolean|void;
+    onmouseup?: (ev?: MouseEvent) => boolean|void;
+    onmousewheel?: (ev?: MouseEvent) => boolean|void;
+    onscroll?: (ev?: UIEvent) => boolean|void;
+    onsubmit?: (ev?: Event) => boolean|void;
+    spellcheck?: boolean;
+    tabIndex?: number;
+    title?: string;
+    accessKey?: string;
+    id?: string;
+    // From HTMLInputElement
+    autocomplete?: string;
+    checked?: boolean;
+    placeholder?: string;
+    readOnly?: boolean;
+    src?: string;
+    value?: string;
+    // From HTMLImageElement
+    alt?: string;
+    srcset?: string;
+
+    // Everything else (uncommon or custom properties and attributes)
+    [index: string]: Object;
+  }
+
+  export interface ProjectionOptions {
+    transitions?: {
+      enter: (element: Element, properties: VNodeProperties, enterAnimation: string) => void;
+      exit: (element: Element, properties: VNodeProperties, exitAnimation: string, removeElement: () => void) => void;
+    }
+  }
+
+  // The following line is not possible in Typescript, hence the workaround in the two lines below
+  // export type VNodeChild = string|VNode|Array<VNodeChild>
+  export interface VNodeChildren extends Array<VNodeChild> {} // A bit of a hack to create a recursive type
+  export type VNodeChild = string|VNode|VNodeChildren;
+
+  export var dom: MaquetteDom;
+
+    /**
+     * Creates a {@link CalculationCache} object, useful for caching {@link VNode} trees.
+     * In practice, caching of {@link VNode} trees is not needed, because achieving 60 frames per second is almost never a problem.
+     * @returns {CalculationCache}
+     */
+  export function createCache<Result>(): CalculationCache<Result>;
+
+    /**
+     * Creates a {@link Mapping} instance that keeps an array of result objects synchronized with an array of source objects.
+     * @param {function} getSourceKey - `function(source)` that must return a key to identify each source object. The result must eather be a string or a number.
+     * @param {function} createResult - `function(source, index)` that must create a new result object from a given source. This function is identical argument of `Array.map`.
+     * @param {function} updateResult - `function(source, target, index)` that updates a result to an updated source.
+     * @returns {Mapping}
+     */
+  export function createMapping<Source, Target>(
+    getSourceKey: (source: Source) => (string|number),
+    createResult: (source: Source, index:number) => Target,
+    updateResult: (source: Source, target: Target, index: number) => void): Mapping<Source, Target>;
+
+    /**
+     * Creates a {@link Projector} instance using the provided projectionOptions.
+     * @param {Object} projectionOptions - Options that influence how the DOM is rendered and updated.
+     * projectionOptions.transitions - A transition strategy to invoke when
+     * enterAnimation and exitAnimation properties are provided as strings.
+     * The module `cssTransitions` in the provided `css-transitions.js` file provides such a strategy.
+     * A transition strategy is not needed when enterAnimation and exitAnimation properties are provided as functions.
+     * @returns {Projector}
+     */
+  export function createProjector(projectionOptions? : ProjectionOptions) : Projector;
+
+    /**
+     * Creates a virtual DOM node, used to render a real DOM later.
+     * The `h` stands for (virtual) hyperscript.
+     *
+     * @param {string} selector - Contains the tagName, id and fixed css classnames in CSS selector format. It is formatted as follows: `tagname.cssclass1.cssclass2#id`.
+     * @param {Object} properties - An object literal containing attributes, properties, event handlers and more be placed on the DOM node.
+     * @param {Array<VNodeChild>} children - An array of virtual DOM nodes and strings to add as child nodes. May contain nested arrays, null or undefined.
+     *
+     * @returns {VNode} A VNode object, used to render a real DOM later.
+     */
+  export function h(selector: string, properties: VNodeProperties, children: Array<VNodeChild>): VNode;
+    /**
+     * Creates a virtual DOM node, used to render a real DOM later.
+     * The `h` stands for (virtual) hyperscript.
+     *
+     * @param {string} selector - Contains the tagName, id and fixed css classnames in CSS selector format. It is formatted as follows: `tagname.cssclass1.cssclass2#id`.
+     * @param {Array<VNodeChild>} children - An array of virtual DOM nodes and strings to add as child nodes. May contain nested arrays, null or undefined.
+     *
+     * @returns {VNode} A VNode object, used to render a real DOM later.
+     */
+  export function h(selector: string, children: Array<VNodeChild>): VNode;
+    /**
+     * Creates a virtual DOM node, used to render a real DOM later.
+     * The `h` stands for (virtual) hyperscript.
+     *
+     * @param {string} selector - Contains the tagName, id and fixed css classnames in CSS selector format. It is formatted as follows: `tagname.cssclass1.cssclass2#id`.
+     * @param {Object} properties - An object literal containing attributes, properties, event handlers and more be placed on the DOM node.
+     *
+     * @returns {VNode} A VNode object, used to render a real DOM later.
+     */
+  export function h(selector: string, properties: VNodeProperties): VNode;
+    /**
+     * Creates a virtual DOM node, used to render a real DOM later.
+     * The `h` stands for (virtual) hyperscript.
+     *
+     * @param {string} selector - Contains the tagName, id and fixed css classnames in CSS selector format. It is formatted as follows: `tagname.cssclass1.cssclass2#id`.
+     *
+     * @returns {VNode} A VNode object, used to render a real DOM later.
+     */
+  export function h(selector: string): VNode;
+
+  /**
+   * A virtual representation of a DOM Node. Maquette assumes that {@link VNode} objects are never modified externally.
+   * Instances of {@link VNode} can be created using {@link module:maquette.h}.
+   */
+  export interface VNode {
+    vnodeSelector: string;
+    properties: VNodeProperties;
+    children: Array<VNode>;
+  }
+
+  // Not used anywhere in the maquette sourcecode, but it is a widely used pattern.
+  export interface Component {
+    renderMaquette() : VNode;
+  }
+
+  /**
+   * A CalculationCache object remembers the previous outcome of a calculation along with the inputs.
+   * On subsequent calls the previous outcome is returned if the inputs are identical.
+   * This object can be used to bypass both rendering and diffing of a virtual DOM subtree.
+   * Instances of {@link CalculationCache} can be created using {@link module:maquette.createCache}.
+   */
+  export interface CalculationCache<Result> {
+        /**
+         * Manually invalidates the cached outcome.
+         */
+    invalidate(): void;
+        /**
+         * If the inputs array matches the inputs array from the previous invocation, this method returns the result of the previous invocation.
+         * Otherwise, the calculation function is invoked and its result is cached and returned.
+         * Objects in the inputs array are compared using ===.
+         * @param {Object[]} inputs - Array of objects that are to be compared using === with the inputs from the previous invocation.
+         * These objects are assumed to be immutable primitive values.
+         * @param {function} calculation - Function that takes zero arguments and returns an object (A {@link VNode} assumably) that can be cached.
+         */
+    result(inputs: Array<Object>, calculation: () => Result):Result;
+  }
+
+  /**
+   * Keeps an array of result objects synchronized with an array of source objects.
+   * Mapping provides a {@link Mapping#map} function that updates the {@link Mapping#results}.
+   * The {@link Mapping#map} function can be called multiple times and the results will get created, removed and updated accordingly.
+   * A {@link Mapping} can be used to keep an array of components (objects with a `renderMaquette` method) synchronized with an array of data.
+   * Instances of {@link Mapping} can be created using {@link module:maquette.createMapping}.
+   */
+  export interface Mapping<Source, Target> {
+        /**
+         * The array of results. These results will be synchronized with the latest array of sources that were provided using {@link Mapping#map}.
+         * @type {Object[]}
+         */
+    results: Array<Target>;
+        /**
+         * Maps a new array of sources and updates {@link Mapping#results}.
+         * @param {Object[]} newSources - The new array of sources.
+         */
+    map(newSources: Array<Source>): void;
+  }
+
+  /**
+   * Contains simple low-level utility functions to manipulate the real DOM. The singleton instance is available under {@link module:maquette.dom}.
+   */
+  export interface MaquetteDom {
+      /**
+       * Appends a new childnode to the DOM which is generated from a {@link VNode}.
+       * This is a low-level method. Users wil typically use a {@link Projector} instead.
+       * @param {Element} parentNode - The parent node for the new childNode.
+       * @param {VNode} vnode - The root of the virtual DOM tree that was created using the {@link module:maquette.h} function. NOTE: {@link VNode} objects may only be rendered once.
+       * @param {Object} projectionOptions - Options to be used to create and update the projection, see {@link module:maquette.createProjector}.
+       * @returns {Projection} The {@link Projection} that was created.
+       */
+    append(parentNode: Element, vnode: VNode, projectionOptions?: ProjectionOptions): Projection;
+      /**
+       * Creates a real DOM tree from a {@link VNode}. The {@link Projection} object returned will contain the resulting DOM Node under the {@link Projection#domNode} property.
+       * This is a low-level method. Users wil typically use a {@link Projector} instead.
+       * @param {VNode} vnode - The root of the virtual DOM tree that was created using the {@link module:maquette.h} function. NOTE: {@link VNode} objects may only be rendered once.
+       * @param {Object} projectionOptions - Options to be used to create and update the projection, see {@link module:maquette.createProjector}.
+       * @returns {Projection} The {@link Projection} which contains the DOM Node that was created.
+       */
+    create(vnode: VNode, projectionOptions?: ProjectionOptions): Projection;
+      /**
+       * Inserts a new DOM node which is generated from a {@link VNode}.
+       * This is a low-level method. Users wil typically use a {@link Projector} instead.
+       * @param {Element} beforeNode - The node that the DOM Node is inserted before.
+       * @param {VNode} vnode - The root of the virtual DOM tree that was created using the {@link module:maquette.h} function. NOTE: {@link VNode} objects may only be rendered once.
+       * @param {Object} projectionOptions - Options to be used to create and update the projection, see {@link module:maquette.createProjector}.
+       * @returns {Projection} The {@link Projection} that was created.
+       */
+    insertBefore(beforeNode: Element, vnode: VNode): Projection;
+      /**
+       * Merges a new DOM node which is generated from a {@link VNode} with an existing DOM Node.
+       * This means that the virtual DOM and real DOM have one overlapping element.
+       * Therefore the selector for the root {VNode} will be ignored, but its properties and children will be applied to the Element provided
+       * This is a low-level method. Users wil typically use a {@link Projector} instead.
+       * @param {Element} domNode - The existing element to adopt as the root of the new virtual DOM. Existing attributes and childnodes are preserved.
+       * @param {VNode} vnode - The root of the virtual DOM tree that was created using the {@link module:maquette.h} function. NOTE: {@link VNode} objects may only be rendered once.
+       * @param {Object} projectionOptions - Options to be used to create and update the projection, see {@link module:maquette.createProjector}.
+       * @returns {Projection} The {@link Projection} that was created.
+       */
+    merge(domNode: Element, vnode: VNode): Projection;
+  }
+
+  /**
+   * Represents a {@link VNode} tree that has been rendered to a real DOM tree.
+   */
+  export interface Projection {
+      /**
+       * Updates the projection with the new virtual DOM tree.
+       * @param {VNode} updatedVnode - The updated virtual DOM tree. Note: The selector for the root of the tree must remain constant.
+       */
+    update(updatedVnode:VNode): void;
+      /**
+       * The DOM node that is used as the root of this {@link Projection}.
+       * @type {Element}
+       */
+    domNode: Element;
+  }
+
+
+  /**
+   * Used to create and update the DOM.
+   * Use {@link Projector#append}, {@link Projector#merge}, {@link Projector#insertBefore} and {@link Projector#replace}
+   * to create the DOM.
+   * The `renderMaquetteFunction` callbacks will be called immediately to create the DOM. Afterwards, these functions
+   * will be called again to update the DOM on the next animation-frame after:
+   *
+   *  - The {@link Projector#scheduleRender} function  was called
+   *  - An event handler (like `onclick`) on a rendered {@link VNode} was called.
+   *
+   * The projector stops when {@link Projector#stop} is called or when an error is thrown during rendering.
+   * It is possible to use `window.onerror` to handle these errors.
+   * Instances of {@link Projector} can be created using {@link module:maquette.createProjector}.
+   */
+  export interface Projector {
+        /**
+         * Appends a new childnode to the DOM using the result from the provided `renderMaquetteFunction`.
+         * The `renderMaquetteFunction` will be invoked again to update the DOM when needed.
+         * @param {Element} parentNode - The parent node for the new childNode.
+         * @param {function} renderMaquetteFunction - Function with zero arguments that returns a {@link VNode} tree.
+         */
+    append(parentNode: Element, renderMaquetteFunction: () => VNode): void;
+        /**
+         * Scans the document for `<script>` tags with `type="text/hyperscript"`.
+         * The content of these scripts are registered as `renderMaquette` functions.
+         * The result of evaluating these functions will be inserted into the DOM after the script.
+         * These scripts can make use of variables that come from the `parameters` parameter.
+         * @param {Element} rootNode - Element to start scanning at, example: `document.body`.
+         * @param {Object} parameters - Variables to expose to the scripts. format: `{var1:value1, var2: value2}`
+         */
+    evaluateHyperscript(rootNode: Element, parameters: {[index: string]: Object}): void;
+        /**
+         * Inserts a new DOM node using the result from the provided `renderMaquetteFunction`.
+         * The `renderMaquetteFunction` will be invoked again to update the DOM when needed.
+         * @param {Element} beforeNode - The node that the DOM Node is inserted before.
+         * @param {function} renderMaquetteFunction - Function with zero arguments that returns a {@link VNode} tree.
+         */
+    insertBefore(beforeNode: Element, renderMaquetteFunction: () => VNode): void;
+        /**
+         * Merges a new DOM node using the result from the provided `renderMaquetteFunction` with an existing DOM Node.
+         * This means that the virtual DOM and real DOM have one overlapping element.
+         * Therefore the selector for the root {VNode} will be ignored, but its properties and children will be applied to the Element provided
+         * The `renderMaquetteFunction` will be invoked again to update the DOM when needed.
+         * @param {Element} domNode - The existing element to adopt as the root of the new virtual DOM. Existing attributes and childnodes are preserved.
+         * @param {function} renderMaquetteFunction - Function with zero arguments that returns a {@link VNode} tree.
+         */
+    merge(domNode: Element, renderMaquetteFunction: () => VNode): void;
+        /**
+         * Replaces an existing DOM node with the result from the provided `renderMaquetteFunction`.
+         * The `renderMaquetteFunction` will be invoked again to update the DOM when needed.
+         * @param {Element} domNode - The DOM node to replace.
+         * @param {function} renderMaquetteFunction - Function with zero arguments that returns a {@link VNode} tree.
+         */
+    replace(domNode: Element, renderMaquetteFunction: () => VNode): void;
+        /**
+         * Resumes the projector. Use this method to resume rendering after stop was called or an error occurred during rendering.
+         */
+    resume(): void;
+        /**
+         * Instructs the projector to re-render to the DOM at the next animation-frame using the registered `renderMaquette` functions.
+         * This method is automatically called for you when event-handlers that are registered in the {@link VNode}s are invoked.
+         * You need to call this method for instance when timeouts expire or AJAX responses arrive.
+         */
+    scheduleRender(): void;
+        /**
+         * Stops the projector. This means that the registered `renderMaquette` functions will not be called anymore.
+         * Note that calling {@link Projector#stop} is not mandatory. A projector is a passive object that will get garbage collected as usual if it is no longer in scope.
+         */
+    stop(): void;
+  }
+}
+
+export = maquette;
+export as namespace maquette;
diff --git a/maquette/maquette-tests.ts b/maquette/maquette-tests.ts
index 9d05b30050..be4b4f33f1 100644
--- a/maquette/maquette-tests.ts
+++ b/maquette/maquette-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="maquette.d.ts" />
+import maquette = require("maquette");
 
 
 // The hello world example from the homepage of maquettejs.org:
diff --git a/maquette/maquette.d.ts b/maquette/maquette.d.ts
deleted file mode 100644
index 7ad5081ed0..0000000000
--- a/maquette/maquette.d.ts
+++ /dev/null
@@ -1,380 +0,0 @@
-// Type definitions for maquette
-// Project: http://maquettejs.org/
-// Definitions by: Johan Gorter <https://github.com/johan-gorter>
-// Definitions: https://github.com/johan-gorter/DefinitelyTyped
-
-  /**
-   * The main object in maquette is the maquette object.
-   * It is either bound to `window.maquette` or it can be obtained using {@link http://browserify.org/|browserify} or {@link http://requirejs.org/|requirejs}.
-   */
-declare namespace maquette {
-
-  // Needed for typescript pre-1.5?
-  interface Touch {
-    clientX: number;
-    clientY: number;
-    identifier: number;
-    pageX: number;
-    pageY: number;
-    screenX: number;
-    screenY: number;
-    target: EventTarget;
-  }
-  interface TouchList {
-    length: number;
-    item(index: number): Touch;
-    [index: number]: Touch;
-  }
-  interface TouchEvent extends UIEvent {
-    altKey: boolean;
-    changedTouches: TouchList;
-    ctrlKey: boolean;
-    metaKey: boolean;
-    shiftKey: boolean;
-    targetTouches: TouchList;
-    touches: TouchList;
-  }
-
-
-  export interface VNodeProperties {
-    enterAnimation?: ((element: Element, properties?: VNodeProperties) => void) | string;
-    exitAnimation?: ((element: Element, removeElement: () => void, properties?: VNodeProperties) => void) | string;
-    updateAnimation?: (element: Element, properties?: VNodeProperties, previousProperties?: VNodeProperties) => void;
-    afterCreate?: (element: Element, projectionOptions: ProjectionOptions, vnodeSelector: string, properties: VNodeProperties,
-      children: VNode[]) => void;
-    afterUpdate?: (element: Element, projectionOptions: ProjectionOptions, vnodeSelector: string, properties: VNodeProperties,
-      children: VNode[]) => void;
-    key?: Object;
-    classes?: {[index:string]: boolean};
-    styles?: {[index:string]: string};
-
-    // From Element
-    ontouchcancel?: (ev?: TouchEvent) => boolean|void;
-    ontouchend?: (ev?: TouchEvent) => boolean|void;
-    ontouchmove?: (ev?: TouchEvent) => boolean|void;
-    ontouchstart?: (ev?: TouchEvent) => boolean|void;
-    // From HTMLFormElement
-    action?: string;
-    encoding?: string;
-    enctype?: string;
-    method?: string;
-    name?: string;
-    target?: string;
-    // From HTMLElement
-    onblur?: (ev?: FocusEvent) => boolean|void;
-    onchange?: (ev?: Event) => boolean|void;
-    onclick?: (ev?: MouseEvent) => boolean|void;
-    ondblclick?: (ev?: MouseEvent) => boolean|void;
-    onfocus?: (ev?: FocusEvent) => boolean|void;
-    oninput?: (ev?: Event) => boolean|void;
-    onkeydown?: (ev?: KeyboardEvent) => boolean|void;
-    onkeypress?: (ev?: KeyboardEvent) => boolean|void;
-    onkeyup?: (ev?: KeyboardEvent) => boolean|void;
-    onload?: (ev?: Event) => boolean|void;
-    onmousedown?: (ev?: MouseEvent) => boolean|void;
-    onmouseenter?: (ev?: MouseEvent) => boolean|void;
-    onmouseleave?: (ev?: MouseEvent) => boolean|void;
-    onmousemove?: (ev?: MouseEvent) => boolean|void;
-    onmouseout?: (ev?: MouseEvent) => boolean|void;
-    onmouseover?: (ev?: MouseEvent) => boolean|void;
-    onmouseup?: (ev?: MouseEvent) => boolean|void;
-    onmousewheel?: (ev?: MouseWheelEvent) => boolean|void;
-    onscroll?: (ev?: UIEvent) => boolean|void;
-    onsubmit?: (ev?: Event) => boolean|void;
-    spellcheck?: boolean;
-    tabIndex?: number;
-    title?: string;
-    accessKey?: string;
-    id?: string;
-    // From HTMLInputElement
-    autocomplete?: string;
-    checked?: boolean;
-    placeholder?: string;
-    readOnly?: boolean;
-    src?: string;
-    value?: string;
-    // From HTMLImageElement
-    alt?: string;
-    srcset?: string;
-
-    // Everything else (uncommon or custom properties and attributes)
-    [index: string]: Object;
-  }
-
-  export interface ProjectionOptions {
-    transitions?: {
-      enter: (element: Element, properties: VNodeProperties, enterAnimation: string) => void;
-      exit: (element: Element, properties: VNodeProperties, exitAnimation: string, removeElement: () => void) => void;
-    }
-  }
-
-  // The following line is not possible in Typescript, hence the workaround in the two lines below
-  // export type VNodeChild = string|VNode|Array<VNodeChild>
-  export interface VNodeChildren extends Array<VNodeChild> {} // A bit of a hack to create a recursive type
-  export type VNodeChild = string|VNode|VNodeChildren;
-
-  export var dom: MaquetteDom;
-
-    /**
-     * Creates a {@link CalculationCache} object, useful for caching {@link VNode} trees.
-     * In practice, caching of {@link VNode} trees is not needed, because achieving 60 frames per second is almost never a problem.
-     * @returns {CalculationCache}
-     */
-  export function createCache<Result>(): CalculationCache<Result>;
-
-    /**
-     * Creates a {@link Mapping} instance that keeps an array of result objects synchronized with an array of source objects.
-     * @param {function} getSourceKey - `function(source)` that must return a key to identify each source object. The result must eather be a string or a number.
-     * @param {function} createResult - `function(source, index)` that must create a new result object from a given source. This function is identical argument of `Array.map`.
-     * @param {function} updateResult - `function(source, target, index)` that updates a result to an updated source.
-     * @returns {Mapping}
-     */
-  export function createMapping<Source, Target>(
-    getSourceKey: (source: Source) => (string|number),
-    createResult: (source: Source, index:number) => Target,
-    updateResult: (source: Source, target: Target, index: number) => void): Mapping<Source, Target>;
-
-    /**
-     * Creates a {@link Projector} instance using the provided projectionOptions.
-     * @param {Object} projectionOptions - Options that influence how the DOM is rendered and updated.
-     * projectionOptions.transitions - A transition strategy to invoke when
-     * enterAnimation and exitAnimation properties are provided as strings.
-     * The module `cssTransitions` in the provided `css-transitions.js` file provides such a strategy.
-     * A transition strategy is not needed when enterAnimation and exitAnimation properties are provided as functions.
-     * @returns {Projector}
-     */
-  export function createProjector(projectionOptions? : ProjectionOptions) : Projector;
-
-    /**
-     * Creates a virtual DOM node, used to render a real DOM later.
-     * The `h` stands for (virtual) hyperscript.
-     *
-     * @param {string} selector - Contains the tagName, id and fixed css classnames in CSS selector format. It is formatted as follows: `tagname.cssclass1.cssclass2#id`.
-     * @param {Object} properties - An object literal containing attributes, properties, event handlers and more be placed on the DOM node.
-     * @param {Array<VNodeChild>} children - An array of virtual DOM nodes and strings to add as child nodes. May contain nested arrays, null or undefined.
-     *
-     * @returns {VNode} A VNode object, used to render a real DOM later.
-     */
-  export function h(selector: string, properties: VNodeProperties, children: Array<VNodeChild>): VNode;
-    /**
-     * Creates a virtual DOM node, used to render a real DOM later.
-     * The `h` stands for (virtual) hyperscript.
-     *
-     * @param {string} selector - Contains the tagName, id and fixed css classnames in CSS selector format. It is formatted as follows: `tagname.cssclass1.cssclass2#id`.
-     * @param {Array<VNodeChild>} children - An array of virtual DOM nodes and strings to add as child nodes. May contain nested arrays, null or undefined.
-     *
-     * @returns {VNode} A VNode object, used to render a real DOM later.
-     */
-  export function h(selector: string, children: Array<VNodeChild>): VNode;
-    /**
-     * Creates a virtual DOM node, used to render a real DOM later.
-     * The `h` stands for (virtual) hyperscript.
-     *
-     * @param {string} selector - Contains the tagName, id and fixed css classnames in CSS selector format. It is formatted as follows: `tagname.cssclass1.cssclass2#id`.
-     * @param {Object} properties - An object literal containing attributes, properties, event handlers and more be placed on the DOM node.
-     *
-     * @returns {VNode} A VNode object, used to render a real DOM later.
-     */
-  export function h(selector: string, properties: VNodeProperties): VNode;
-    /**
-     * Creates a virtual DOM node, used to render a real DOM later.
-     * The `h` stands for (virtual) hyperscript.
-     *
-     * @param {string} selector - Contains the tagName, id and fixed css classnames in CSS selector format. It is formatted as follows: `tagname.cssclass1.cssclass2#id`.
-     *
-     * @returns {VNode} A VNode object, used to render a real DOM later.
-     */
-  export function h(selector: string): VNode;
-
-  /**
-   * A virtual representation of a DOM Node. Maquette assumes that {@link VNode} objects are never modified externally.
-   * Instances of {@link VNode} can be created using {@link module:maquette.h}.
-   */
-  export interface VNode {
-    vnodeSelector: string;
-    properties: VNodeProperties;
-    children: Array<VNode>;
-  }
-
-  // Not used anywhere in the maquette sourcecode, but it is a widely used pattern.
-  export interface Component {
-    renderMaquette() : VNode;
-  }
-
-  /**
-   * A CalculationCache object remembers the previous outcome of a calculation along with the inputs.
-   * On subsequent calls the previous outcome is returned if the inputs are identical.
-   * This object can be used to bypass both rendering and diffing of a virtual DOM subtree.
-   * Instances of {@link CalculationCache} can be created using {@link module:maquette.createCache}.
-   */
-  export interface CalculationCache<Result> {
-        /**
-         * Manually invalidates the cached outcome.
-         */
-    invalidate(): void;
-        /**
-         * If the inputs array matches the inputs array from the previous invocation, this method returns the result of the previous invocation.
-         * Otherwise, the calculation function is invoked and its result is cached and returned.
-         * Objects in the inputs array are compared using ===.
-         * @param {Object[]} inputs - Array of objects that are to be compared using === with the inputs from the previous invocation.
-         * These objects are assumed to be immutable primitive values.
-         * @param {function} calculation - Function that takes zero arguments and returns an object (A {@link VNode} assumably) that can be cached.
-         */
-    result(inputs: Array<Object>, calculation: () => Result):Result;
-  }
-
-  /**
-   * Keeps an array of result objects synchronized with an array of source objects.
-   * Mapping provides a {@link Mapping#map} function that updates the {@link Mapping#results}.
-   * The {@link Mapping#map} function can be called multiple times and the results will get created, removed and updated accordingly.
-   * A {@link Mapping} can be used to keep an array of components (objects with a `renderMaquette` method) synchronized with an array of data.
-   * Instances of {@link Mapping} can be created using {@link module:maquette.createMapping}.
-   */
-  export interface Mapping<Source, Target> {
-        /**
-         * The array of results. These results will be synchronized with the latest array of sources that were provided using {@link Mapping#map}.
-         * @type {Object[]}
-         */
-    results: Array<Target>;
-        /**
-         * Maps a new array of sources and updates {@link Mapping#results}.
-         * @param {Object[]} newSources - The new array of sources.
-         */
-    map(newSources: Array<Source>): void;
-  }
-
-  /**
-   * Contains simple low-level utility functions to manipulate the real DOM. The singleton instance is available under {@link module:maquette.dom}.
-   */
-  export interface MaquetteDom {
-      /**
-       * Appends a new childnode to the DOM which is generated from a {@link VNode}.
-       * This is a low-level method. Users wil typically use a {@link Projector} instead.
-       * @param {Element} parentNode - The parent node for the new childNode.
-       * @param {VNode} vnode - The root of the virtual DOM tree that was created using the {@link module:maquette.h} function. NOTE: {@link VNode} objects may only be rendered once.
-       * @param {Object} projectionOptions - Options to be used to create and update the projection, see {@link module:maquette.createProjector}.
-       * @returns {Projection} The {@link Projection} that was created.
-       */
-    append(parentNode: Element, vnode: VNode, projectionOptions?: ProjectionOptions): Projection;
-      /**
-       * Creates a real DOM tree from a {@link VNode}. The {@link Projection} object returned will contain the resulting DOM Node under the {@link Projection#domNode} property.
-       * This is a low-level method. Users wil typically use a {@link Projector} instead.
-       * @param {VNode} vnode - The root of the virtual DOM tree that was created using the {@link module:maquette.h} function. NOTE: {@link VNode} objects may only be rendered once.
-       * @param {Object} projectionOptions - Options to be used to create and update the projection, see {@link module:maquette.createProjector}.
-       * @returns {Projection} The {@link Projection} which contains the DOM Node that was created.
-       */
-    create(vnode: VNode, projectionOptions?: ProjectionOptions): Projection;
-      /**
-       * Inserts a new DOM node which is generated from a {@link VNode}.
-       * This is a low-level method. Users wil typically use a {@link Projector} instead.
-       * @param {Element} beforeNode - The node that the DOM Node is inserted before.
-       * @param {VNode} vnode - The root of the virtual DOM tree that was created using the {@link module:maquette.h} function. NOTE: {@link VNode} objects may only be rendered once.
-       * @param {Object} projectionOptions - Options to be used to create and update the projection, see {@link module:maquette.createProjector}.
-       * @returns {Projection} The {@link Projection} that was created.
-       */
-    insertBefore(beforeNode: Element, vnode: VNode): Projection;
-      /**
-       * Merges a new DOM node which is generated from a {@link VNode} with an existing DOM Node.
-       * This means that the virtual DOM and real DOM have one overlapping element.
-       * Therefore the selector for the root {VNode} will be ignored, but its properties and children will be applied to the Element provided
-       * This is a low-level method. Users wil typically use a {@link Projector} instead.
-       * @param {Element} domNode - The existing element to adopt as the root of the new virtual DOM. Existing attributes and childnodes are preserved.
-       * @param {VNode} vnode - The root of the virtual DOM tree that was created using the {@link module:maquette.h} function. NOTE: {@link VNode} objects may only be rendered once.
-       * @param {Object} projectionOptions - Options to be used to create and update the projection, see {@link module:maquette.createProjector}.
-       * @returns {Projection} The {@link Projection} that was created.
-       */
-    merge(domNode: Element, vnode: VNode): Projection;
-  }
-
-  /**
-   * Represents a {@link VNode} tree that has been rendered to a real DOM tree.
-   */
-  export interface Projection {
-      /**
-       * Updates the projection with the new virtual DOM tree.
-       * @param {VNode} updatedVnode - The updated virtual DOM tree. Note: The selector for the root of the tree must remain constant.
-       */
-    update(updatedVnode:VNode): void;
-      /**
-       * The DOM node that is used as the root of this {@link Projection}.
-       * @type {Element}
-       */
-    domNode: Element;
-  }
-
-
-  /**
-   * Used to create and update the DOM.
-   * Use {@link Projector#append}, {@link Projector#merge}, {@link Projector#insertBefore} and {@link Projector#replace}
-   * to create the DOM.
-   * The `renderMaquetteFunction` callbacks will be called immediately to create the DOM. Afterwards, these functions
-   * will be called again to update the DOM on the next animation-frame after:
-   *
-   *  - The {@link Projector#scheduleRender} function  was called
-   *  - An event handler (like `onclick`) on a rendered {@link VNode} was called.
-   *
-   * The projector stops when {@link Projector#stop} is called or when an error is thrown during rendering.
-   * It is possible to use `window.onerror` to handle these errors.
-   * Instances of {@link Projector} can be created using {@link module:maquette.createProjector}.
-   */
-  export interface Projector {
-        /**
-         * Appends a new childnode to the DOM using the result from the provided `renderMaquetteFunction`.
-         * The `renderMaquetteFunction` will be invoked again to update the DOM when needed.
-         * @param {Element} parentNode - The parent node for the new childNode.
-         * @param {function} renderMaquetteFunction - Function with zero arguments that returns a {@link VNode} tree.
-         */
-    append(parentNode: Element, renderMaquetteFunction: () => VNode): void;
-        /**
-         * Scans the document for `<script>` tags with `type="text/hyperscript"`.
-         * The content of these scripts are registered as `renderMaquette` functions.
-         * The result of evaluating these functions will be inserted into the DOM after the script.
-         * These scripts can make use of variables that come from the `parameters` parameter.
-         * @param {Element} rootNode - Element to start scanning at, example: `document.body`.
-         * @param {Object} parameters - Variables to expose to the scripts. format: `{var1:value1, var2: value2}`
-         */
-    evaluateHyperscript(rootNode: Element, parameters: {[index: string]: Object}): void;
-        /**
-         * Inserts a new DOM node using the result from the provided `renderMaquetteFunction`.
-         * The `renderMaquetteFunction` will be invoked again to update the DOM when needed.
-         * @param {Element} beforeNode - The node that the DOM Node is inserted before.
-         * @param {function} renderMaquetteFunction - Function with zero arguments that returns a {@link VNode} tree.
-         */
-    insertBefore(beforeNode: Element, renderMaquetteFunction: () => VNode): void;
-        /**
-         * Merges a new DOM node using the result from the provided `renderMaquetteFunction` with an existing DOM Node.
-         * This means that the virtual DOM and real DOM have one overlapping element.
-         * Therefore the selector for the root {VNode} will be ignored, but its properties and children will be applied to the Element provided
-         * The `renderMaquetteFunction` will be invoked again to update the DOM when needed.
-         * @param {Element} domNode - The existing element to adopt as the root of the new virtual DOM. Existing attributes and childnodes are preserved.
-         * @param {function} renderMaquetteFunction - Function with zero arguments that returns a {@link VNode} tree.
-         */
-    merge(domNode: Element, renderMaquetteFunction: () => VNode): void;
-        /**
-         * Replaces an existing DOM node with the result from the provided `renderMaquetteFunction`.
-         * The `renderMaquetteFunction` will be invoked again to update the DOM when needed.
-         * @param {Element} domNode - The DOM node to replace.
-         * @param {function} renderMaquetteFunction - Function with zero arguments that returns a {@link VNode} tree.
-         */
-    replace(domNode: Element, renderMaquetteFunction: () => VNode): void;
-        /**
-         * Resumes the projector. Use this method to resume rendering after stop was called or an error occurred during rendering.
-         */
-    resume(): void;
-        /**
-         * Instructs the projector to re-render to the DOM at the next animation-frame using the registered `renderMaquette` functions.
-         * This method is automatically called for you when event-handlers that are registered in the {@link VNode}s are invoked.
-         * You need to call this method for instance when timeouts expire or AJAX responses arrive.
-         */
-    scheduleRender(): void;
-        /**
-         * Stops the projector. This means that the registered `renderMaquette` functions will not be called anymore.
-         * Note that calling {@link Projector#stop} is not mandatory. A projector is a passive object that will get garbage collected as usual if it is no longer in scope.
-         */
-    stop(): void;
-  }
-}
-
-declare module 'maquette' {
-  export = maquette;
-}
diff --git a/maquette/tsconfig.json b/maquette/tsconfig.json
new file mode 100644
index 0000000000..5a22048f26
--- /dev/null
+++ b/maquette/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "maquette-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mariasql/index.d.ts b/mariasql/index.d.ts
new file mode 100644
index 0000000000..d0a3a5e041
--- /dev/null
+++ b/mariasql/index.d.ts
@@ -0,0 +1,113 @@
+// Type definitions for mariasql v0.1.22
+// Project: https://github.com/mscdex/node-mariasql
+// Definitions by: MichaelBennett <https://github.com/bennett000/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace mariasql {
+    export interface MariaCallBackError {
+        (error:Error):void
+    }
+
+    export interface MariaCallBackResult {
+        (result:MariaResult):void
+    }
+
+    export interface MariaCallBackRow {
+        (result:Array<any>):void
+    }
+
+    export interface MariaCallBackBoolean {
+        (result:boolean):void
+    }
+
+    export interface MariaCallBackObject {
+        (result:Object):void
+    }
+
+    export interface MariaCallBackInfo {
+        (result:MariaInfo):void
+    }
+
+    export interface MariaCallBackVoid {
+        ():void
+    }
+
+    export interface Dictionary {
+        [index: string]: any;
+    }
+
+    export interface MariaInfo {
+        affectedRows: number;
+        insertId: number;
+        numRows: number
+    }
+
+    export interface MariaPreparedQuery {
+        (values:Dictionary):string;
+        (values:Array<any>):string;
+    }
+
+    export interface ClientConfig {
+        host: string;
+        user: string;
+        password: string;
+        db?: string;
+        port?: number;
+        unixSocket?: string;
+        keepQueries?: boolean;
+        multiStatements?: boolean;
+        connTimeout?: number;
+        pingInterval?: number;
+        secureAuth?: boolean;
+        compress?: boolean;
+        ssl?:any;
+        local_infile?: boolean;
+        read_default_group?: string;
+        charset?: string;
+    }
+
+    export interface MariaResult {
+        on(signal:'end', cb:MariaCallBackInfo):MariaResult;
+        on(signal:'error', cb:MariaCallBackError):MariaResult;
+        on(signal:'row', cb:MariaCallBackRow):MariaResult;
+        on(signal:'abort', cb:MariaCallBackVoid):MariaResult;
+        on(signal:string, cb:MariaCallBackVoid):MariaResult;
+        abort():void;
+    }
+
+    export interface MariaQuery {
+        on(signal:'result', cb:MariaCallBackResult):MariaQuery;
+        on(signal:'end', cb:MariaCallBackVoid):MariaQuery;
+        on(signal:'abort', cb:MariaCallBackVoid):MariaQuery;
+        on(signal:'error', cb:MariaCallBackError):MariaQuery;
+        on(signal:string, cb:MariaCallBackVoid):MariaQuery;
+        abort():void;
+    }
+
+    export interface MariaClient {
+        connect(config:ClientConfig):void;
+        end():void;
+        destroy():void;
+        escape(query:string):string;
+        query(q:string, placeHolders?:Dictionary, useArray?:boolean):MariaQuery;
+        query(q:string, placeHolders?:Array<any>, useArray?:boolean):MariaQuery;
+        query(q:string, useArray?:boolean):MariaQuery;
+        prepare(query:string): MariaPreparedQuery;
+        isMariaDB():boolean;
+        on(signal:'error', cb:MariaCallBackError): MariaClient;
+        on(signal:'close', cb:MariaCallBackObject): MariaClient;
+        on(signal:'connect', cb:MariaCallBackVoid): MariaClient;
+        on(signal:string, cb:MariaCallBackVoid): MariaClient;
+        connected: boolean;
+        threadId: string;
+    }
+
+    export interface Client {
+        new ():MariaClient;
+        ():MariaClient;
+        prototype: MariaClient;
+    }
+}
+
+declare var Client:mariasql.Client;
+export = Client;
diff --git a/mariasql/mariasql-tests.ts b/mariasql/mariasql-tests.ts
index c3ab5c848c..f29fc3f2d5 100644
--- a/mariasql/mariasql-tests.ts
+++ b/mariasql/mariasql-tests.ts
@@ -1,14 +1,14 @@
 // These are the examples from the node-mariasql README transposed to TypeScript
 // https://github.com/mscdex/node-mariasql
 
-/// <reference path="./mariasql.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 // Example 1 - SHOW DATABASES
 import util = require('util');
 import Client = require('mariasql');
 
-var c:mariasql.MariaClient = new Client(),
+var c = new Client(),
     inspect = util.inspect;
 
 c.connect({
diff --git a/mariasql/mariasql.d.ts b/mariasql/mariasql.d.ts
deleted file mode 100644
index fd1361910e..0000000000
--- a/mariasql/mariasql.d.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-// Type definitions for mariasql v0.1.22
-// Project: https://github.com/mscdex/node-mariasql
-// Definitions by: MichaelBennett <https://github.com/bennett000/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace mariasql {
-    export interface MariaCallBackError {
-        (error:Error):void
-    }
-
-    export interface MariaCallBackResult {
-        (result:MariaResult):void
-    }
-
-    export interface MariaCallBackRow {
-        (result:Array<any>):void
-    }
-
-    export interface MariaCallBackBoolean {
-        (result:boolean):void
-    }
-
-    export interface MariaCallBackObject {
-        (result:Object):void
-    }
-
-    export interface MariaCallBackInfo {
-        (result:MariaInfo):void
-    }
-
-    export interface MariaCallBackVoid {
-        ():void
-    }
-
-    export interface Dictionary {
-        [index: string]: any;
-    }
-
-    export interface MariaInfo {
-        affectedRows: number;
-        insertId: number;
-        numRows: number
-    }
-
-    export interface MariaPreparedQuery {
-        (values:Dictionary):string;
-        (values:Array<any>):string;
-    }
-
-    export interface ClientConfig {
-        host: string;
-        user: string;
-        password: string;
-        db?: string;
-        port?: number;
-        unixSocket?: string;
-        keepQueries?: boolean;
-        multiStatements?: boolean;
-        connTimeout?: number;
-        pingInterval?: number;
-        secureAuth?: boolean;
-        compress?: boolean;
-        ssl?:any;
-        local_infile?: boolean;
-        read_default_group?: string;
-        charset?: string;
-    }
-
-    export interface MariaResult {
-        on(signal:'end', cb:MariaCallBackInfo):MariaResult;
-        on(signal:'error', cb:MariaCallBackError):MariaResult;
-        on(signal:'row', cb:MariaCallBackRow):MariaResult;
-        on(signal:'abort', cb:MariaCallBackVoid):MariaResult;
-        on(signal:string, cb:MariaCallBackVoid):MariaResult;
-        abort():void;
-    }
-
-    export interface MariaQuery {
-        on(signal:'result', cb:MariaCallBackResult):MariaQuery;
-        on(signal:'end', cb:MariaCallBackVoid):MariaQuery;
-        on(signal:'abort', cb:MariaCallBackVoid):MariaQuery;
-        on(signal:'error', cb:MariaCallBackError):MariaQuery;
-        on(signal:string, cb:MariaCallBackVoid):MariaQuery;
-        abort():void;
-    }
-
-    export interface MariaClient {
-        connect(config:ClientConfig):void;
-        end():void;
-        destroy():void;
-        escape(query:string):string;
-        query(q:string, placeHolders?:Dictionary, useArray?:boolean):MariaQuery;
-        query(q:string, placeHolders?:Array<any>, useArray?:boolean):MariaQuery;
-        query(q:string, useArray?:boolean):MariaQuery;
-        prepare(query:string): MariaPreparedQuery;
-        isMariaDB():boolean;
-        on(signal:'error', cb:MariaCallBackError): MariaClient;
-        on(signal:'close', cb:MariaCallBackObject): MariaClient;
-        on(signal:'connect', cb:MariaCallBackVoid): MariaClient;
-        on(signal:string, cb:MariaCallBackVoid): MariaClient;
-        connected: boolean;
-        threadId: string;
-    }
-
-    export interface Client {
-        new ():MariaClient;
-        ():MariaClient;
-        prototype: MariaClient;
-    }
-}
-
-declare module "mariasql" {
-    var Client:mariasql.Client;
-    export = Client;
-}
diff --git a/mariasql/tsconfig.json b/mariasql/tsconfig.json
new file mode 100644
index 0000000000..11136c566c
--- /dev/null
+++ b/mariasql/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mariasql-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/marionette/marionette.d.ts b/marionette/marionette.d.ts
deleted file mode 100644
index f6276831e4..0000000000
--- a/marionette/marionette.d.ts
+++ /dev/null
@@ -1,1512 +0,0 @@
-// Type definitions for Marionette
-// Project: https://github.com/marionettejs/
-// Definitions by: Zeeshan Hamid <https://github.com/zhamid>, Natan Vivo <https://github.com/nvivo>, Sven Tschui <https://github.com/sventschui>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../backbone/backbone.d.ts" />
-
-// declarations for Backbone.BabySitter and Backbone.Wreqr, different projects but included in MarionetteJS
-declare namespace Backbone {
-
-    // Backbone.BabySitter
-    class ChildViewContainer<TView extends View<Backbone.Model>> {
-
-        constructor(initialViews?: any[]);
-
-        add(view: TView, customIndex?: number): void;
-        findByModel<TModel extends Backbone.Model>(model: TModel): TView;
-        findByModelCid(modelCid: string): TView;
-        findByCustom(index: number): TView;
-        findByIndex(index: number): TView;
-        findByCid(cid: string): TView;
-        remove(view: TView): void;
-        call(method: any): void;
-        apply(method: any, args?: any[]): void;
-
-        //mixins from Collection (copied from Backbone's Collection declaration)
-
-        all(iterator: (element: TView, index: number) => boolean, context?: any): boolean;
-        any(iterator: (element: TView, index: number) => boolean, context?: any): boolean;
-        contains(value: any): boolean;
-        detect(iterator: (item: any) => boolean, context?: any): any;
-        each(iterator: (element: TView, index: number, list?: any) => void, context?: any): any;
-        every(iterator: (element: TView, index: number) => boolean, context?: any): boolean;
-        filter(iterator: (element: TView, index: number) => boolean, context?: any): TView[];
-        find(iterator: (element: TView, index: number) => boolean, context?: any): TView;
-        first(): TView;
-        forEach(iterator: (element: TView, index: number, list?: any) => void, context?: any): void;
-        include(value: any): boolean;
-        initial(): TView;
-        initial(n: number): TView[];
-        invoke(methodName: string, args?: any[]): any;
-        isEmpty(object: any): boolean;
-        last(): TView;
-        last(n: number): TView[];
-        lastIndexOf(element: TView, fromIndex?: number): number;
-        map<U>(iterator: (element: TView, index: number, context?: any) => U, context?: any): U[];
-        pluck(attribute: string): any[];
-        reject(iterator: (element: TView, index: number) => boolean, context?: any): TView[];
-        rest(): TView;
-        rest(n: number): TView[];
-        select(iterator: any, context?: any): any[];
-        some(iterator: (element: TView, index: number) => boolean, context?: any): boolean;
-        toArray(): any[];
-        without(...values: any[]): TView[];
-    }
-
-    // Backbone.Wreqr
-    namespace Wreqr {
-
-        namespace radio {
-
-            function channel(channelName: string): Channel;
-
-        }
-
-        class Channel {
-
-            constructor(channelName: string);
-
-            vent: Backbone.Wreqr.EventAggregator;
-            reqres: Backbone.Wreqr.RequestResponse;
-            commands: Backbone.Wreqr.Commands;
-            channelName: string;
-
-            reset(): Channel;
-            connectEvents(hash: string, context: any): Channel;
-            connectCommands(hash: string, context: any): Channel;
-            connectRequests(hash: string, context: any): Channel;
-
-        }
-
-        class Handlers extends Backbone.Events {
-
-            constructor(options?: any);
-
-            options: any;
-
-            setHandler(name: string, handler: any, context?: any): void;
-            hasHandler(name: string): boolean;
-            getHandler(name: string): Function;
-            removeHandler(name: string): void;
-            removeAllHandlers(): void;
-        }
-
-        class CommandStorage {
-
-            constructor(options?: any);
-
-            getCommands(commandName: string): Commands;
-            addCommand(commandName: string, args: any): void;
-            clearCommands(commandName: string): void;
-        }
-
-        class Commands extends Handlers {
-
-            constructor(options?: any);
-
-            storageType: CommandStorage;
-            execute(name: string, ...args: any[]): void;
-        }
-
-        class RequestResponse extends Handlers {
-
-            constructor(options?: any);
-
-            request(...args: any[]): any;
-        }
-
-        class EventAggregator extends Backbone.Events {
-
-            constructor(options?: any);
-        }
-    }
-}
-
-declare namespace Marionette {
-
-    /**
-     * Retrieve an object's attribute either directly from the object, or
-     * from the object's this.options, with this.options taking precedence.
-     */
-    function getOption(target: any, optionName: string): any;
-
-    /**
-     * Trigger an event and a corresponding method on the target object.
-     * All arguments that are passed to the triggerMethod call are passed along
-     * to both the event and the method, with the exception of the event name not
-     * being passed to the corresponding method.
-     */
-    function triggerMethod(name: string, ...args: any[]): any;
-
-    /**
-     * Invoke triggerMethod on a specific context.
-     * This is useful when it's not clear that the object has triggerMethod defined.
-     */
-    function triggerMethodOn(ctx: any, name: string, ...args: any[]): any;
-
-    /**
-     * Monitor a view's state, and after it has been rendered and shown in the DOM,
-     * trigger a "dom:refresh" event every time it is re-rendered.
-     */
-    function MonitorDOMRefresh(view: Backbone.View<Backbone.Model>): void;
-
-    /**
-     * This method is used to bind a backbone "entity" (collection/model) to methods on a target object.
-     * @param target An object that must have a listenTo method from the EventBinder object.
-     * @param entity The entity (Backbone.Model or Backbone.Collection) to bind the events from.
-     * @param bindings a hash of { "event:name": "eventHandler" } configuration. Multiple handlers can be separated by a space. A function can be supplied instead of a string handler name.
-     */
-    function bindEntityEvents(target: any, entity: any, bindings: any): void;
-
-    /**
-     * This method can be used to unbind callbacks from entities' (collection/model) events. It's the opposite of bindEntityEvents
-     * @param target An object that must have a listenTo method from the EventBinder object.
-     * @param entity The entity (Backbone.Model or Backbone.Collection) to bind the events from.
-     * @param bindings a hash of { "event:name": "eventHandler" } configuration. Multiple handlers can be separated by a space. A function can be supplied instead of a string handler name.
-     */
-    function unbindEntityEvents(target: any, entity: any, bindings: any): void;
-
-    class Callbacks {
-        add(callback: Function, contextOverride: any): void;
-        run(options: any, context: any): void;
-        reset(): void;
-    }
-
-    /**
-     * A base class which other classes can extend from. Object incorporates many
-     * backbone conventions and utilities like initialize and Backbone.Events.
-     */
-    class Object extends Backbone.Events {
-        /**
-         * Initialize is called immediately after the Object has been instantiated,
-         * and is invoked with the same arguments that the constructor received.
-         */
-        initialize(options?: any): void;
-
-        /**
-         * Retrieve an object's attribute either directly from the object, or from
-         * the object's this.options, with this.options taking precedence.
-         * @param optionName the name of the option to retrieve.
-         */
-        getOption(optionName: string): any;
-
-        /**
-         * Objects have a destroy method that unbind the events that are directly
-         * attached to the instance. Invoking the destroy method will trigger a
-         * "before:destroy" event and corresponding onBeforeDestroy method call.
-         * These calls will be passed any arguments destroy was invoked with.
-         * @param args any arguments to pass to the "before:destory" event and call to
-         * onBeforeDestroy.
-         */
-        destroy(...args: any[]): void;
-    }
-
-    /**
-     * A Controller is an object used in the Marionette Router. Controllers are
-     * where you store your Router's callbacks.
-     */
-    class Controller extends Backbone.Events {
-        /**
-         * @param options Options that should be stored in this options. Can be retreived via
-         * getOption.
-         */
-        constructor(options?: any);
-
-        /**
-         * Handles unbinding all of the events that are directly attached to the
-         * controller instance, as well as those that are bound using the
-         * EventBinder from the controller.
-         *
-         * Invoking the destroy method will trigger the "before:destroy" and
-         * "destroy" events and the corresponding onBeforeDestory and onDestroy
-         * method calls. These calls will be passed any arguments destroy was
-         * invoked with.
-         */
-        destroy(...args: any[]): void;
-
-        /**
-         * Retrieve an object's attribute either directly from the object, or from
-         * the object's this.options, with this.options taking precedence.
-         * @param optionName the name of the option to retrieve.
-         */
-        getOption(optionName: string): any;
-
-        triggerMethod(name: string, ...args: any[]): any;
-    }
-
-    interface RegionConstructionOptions {
-        /**
-         * Specifies the element for the region to manage. This may be
-         * a selector string, a raw DOM node reference or a jQuery wrapped
-         * DOM node.
-         */
-        el?: any;
-    }
-
-    interface RegionShowOptions {
-        /**
-         * If you replace the current view with a new view by calling show, by
-         * default it will automatically destroy the previous view. You can
-         * prevent this behavior by setting this option to true.
-         */
-        preventDestroy?: boolean;
-
-        /**
-         * If you re-call show with the same view, by default nothing will happen
-         * because the view is already in the region. You can force the view to be
-         * re-shown by setting this option to true.
-         */
-        forceShow?: boolean;
-
-        /**
-         * Regions that are attached to the document when you execute show are
-         * special in that the views that they show will also become attached
-         * to the document. These regions fire a pair of triggerMethods on all
-         * of the views that are about to be attached � even the nested ones.
-         * This can cause a performance issue if you're rendering hundreds or
-         * thousands of views at once.
-         * If you think these events might be causing some lag in your app, you
-         * can selectively turn them off with the triggerBeforeAttach
-         * and triggerAttach properties.
-         */
-        triggerBeforeAttach?: boolean;
-
-        /**
-         * Regions that are attached to the document when you execute show are
-         * special in that the views that they show will also become attached
-         * to the document. These regions fire a pair of triggerMethods on all
-         * of the views that are about to be attached � even the nested ones.
-         * This can cause a performance issue if you're rendering hundreds or
-         * thousands of views at once.
-         * If you think these events might be causing some lag in your app, you
-         * can selectively turn them off with the triggerBeforeAttach
-         * and triggerAttach properties.
-         */
-        triggerAttach?: boolean;
-    }
-
-    /**
-     * Regions provide consistent methods to manage, show and destroy views in
-     * your applications and layouts. They use a jQuery selector to show your
-     * views in the correct place.
-     */
-    class Region extends Marionette.Object {
-
-        /**
-         * Build an instance of a region by passing in a configuration object and
-         * a default region class to use if none is specified in the config.
-         * The config object should either be a string as a jQuery DOM selector,
-         * a Region class directly, or an object literal that specifies a selector,
-         * a custom regionClass, and any options to be supplied to the region
-         */
-        static buildRegion(regionConfig: any, defaultRegionType: any): Region;
-
-        /**
-         * You can specify an el for the region to manage at the time the region
-         * is instantiated.
-         */
-        constructor(options?: RegionConstructionOptions);
-
-        /**
-         * Contains the element that this region should manage.
-         */
-        el: any;
-
-        /**
-         * Renders and displays the specified view in this region.
-         * @param view the view to display.
-         */
-        show<TModel extends Backbone.Model>(view: Backbone.View<TModel>, options?: RegionShowOptions): void;
-
-        /**
-         * Attaches an existing view to a region, without rendering or showing the view,
-         * and without replacing the HTML content of the region.
-         */
-        attachView<TModel extends Backbone.Model>(view: Backbone.View<TModel>, options?: RegionShowOptions): any;
-
-        /**
-         * Override this method to change how the new view is
-         * appended to the `$el` that the region is managing
-         */
-        attachHtml<TModel extends Backbone.Model>(view: Backbone.View<TModel>): void;
-
-        /**
-         * A region can be reset at any time. This destroys any existing view
-         * being displayed, and deletes the cached el. The next time the region
-         * shows a view, the region's el is queried from the DOM.
-         */
-        reset(): any;
-
-        /**
-         * If you wish to check whether a region has a view, you can use the hasView function. This will return a boolean value depending whether or not the region is showing a view.
-         */
-        hasView(): boolean;
-
-        /**
-         * Empties the current view from the region.
-         */
-        empty(): any;
-
-        /**
-         * @returns view that this region has.
-         */
-        currentView: Backbone.View<Backbone.Model>;
-    }
-
-    interface RegionDefaults {
-        /**
-         * A selector string indicating which element to assign the region two.
-         */
-        selector?: string;
-
-        /**
-         * A selector string, a jQuery object, or an HTML node indicating which element
-         * the region should use.
-         */
-        el?: any;
-
-        /**
-         * A custom region class.
-         */
-        regionClass?: any;
-
-        /**
-         * Ordinarily regions enforce the presence of a backing DOM element. In
-         * some instances it may be desirable to allow regions to be instantiated
-         * and used without an element, such as when regions defined by a parent
-         * LayoutView class are used by only some of its subclasses. In these
-         * instances, the region can be defined with this option set to true,
-         * suppressing the missing element error and causing show calls to the
-         * region to be treated as no-ops.
-         */
-        allowMissingEl?: boolean;
-    }
-
-    /**
-     * Region managers provide a consistent way to manage a number of Marionette.Region
-     * objects within an application. The RegionManager is intended to be used by
-     * other objects, to facilitate the addition, storage, retrieval, and removal of
-     * regions from that object.
-     */
-    class RegionManager extends Controller {
-
-        /**
-         * Constructor.
-         * @param options May contain an optional `regions` option. These regions
-         * are passed directly into addRegions for this instance.
-         */
-        constructor(options?: any);
-
-        /**
-         * Adds one or more regions to this RegionManager instance.
-         * @param regionDefinitions a function returning an object literal with the region definitions. The function will
-         * be called with the RegionManager instance context and all the arguments passed to addRegions.
-         * @param defaults Specifies default options that will be applied to every region added.
-         * @returns an object literal with all the created regions.
-         */
-        addRegions(regionDefinitions: Function, defaults?: RegionDefaults): any;
-
-        /**
-         * Adds one or more regions to this RegionManager instance.
-         * @param regionDefinitions an object literal containing region names as keys and region
-         * definitions as values.
-         * @param defaults Specifies default options that will be applied to every region added.
-         * @returns an object literal with all the created regions.
-         */
-        addRegions(regionDefinitions: { [regionName: string]: any }, defaults?: RegionDefaults): any;
-
-        /**
-         * Adds a region to this RegionManager.
-         * @param name the region name.
-         * @param definition the region definition. This may be a selector, object literal
-         * with various region creation options or an instance of a region object.
-         */
-        addRegion(name: string, definition: any): Region;
-
-        /**
-         * Gets the region with the specified name from this RegionManager.
-         */
-        get(name: string): Region;
-
-        /**
-         * Removes the region with the specified name from this RegionManager.
-         */
-        removeRegion(name: string): void;
-
-        /**
-         * Removes all regions from the RegionManager.
-         */
-        removeRegions(): void;
-
-        /**
-         * Empties all regions from the RegionManager instance.
-         */
-        emptyRegions(): void;
-
-        /**
-         * Destroys the RegionManager instance entierly which both destroys and
-         * removes all regions from the RegionManager instance.
-         */
-        destroy(): void;
-
-        //mixins from Collection (copied from Backbone's Collection declaration)
-
-        /**
-         * Returns true if all of the values in the list pass the predicate truth test.
-         * @alias every
-         */
-        all(iterator: (element: Region, index: number) => boolean, context?: any): boolean;
-
-        /**
-         * Returns true if any of the values in the list pass the predicate truth test. Short-circuits and stops traversing the list if a true element is found.
-         */
-        any(iterator: (element: Region, index: number) => boolean, context?: any): boolean;
-
-        /**
-         * Returns true if the value is present in the list.
-         * @alias include
-         */
-        contains(value: any): boolean;
-
-        /**
-         * Looks through each value in the list, returning the first one that passes a truth test (predicate), or undefined if no value passes the test.The function returns as soon as it finds an acceptable element, and doesn't traverse the entire list.
-         * @alias find
-         */
-        detect(iterator: (item: any) => boolean, context?: any): any;
-
-        /**
-         * Iterates over the regions in this instance, yielding each in turn to an
-         * iterator function. The iterator is bound to the context object, if one
-         * is passed.
-         * @alias forEach
-         */
-        each(iterator: (element: Region, index: number, list?: any) => void, context?: any): void;
-
-        /**
-         * Returns true if all of the values in the list pass the predicate truth test.
-         * @alias all
-         */
-        every(iterator: (element: Region, index: number) => boolean, context?: any): boolean;
-
-        /**
-         * Looks through each Region in the collection, returning an array of all
-         * the values that pass a truth test (predicate).
-         * @alias select
-         */
-        filter(iterator: (element: Region, index: number) => boolean, context?: any): Region[];
-
-        /**
-         * Looks through each Region in this instance, returning the first one that passes a truth test (predicate), or undefined if no value passes the test.The function returns as soon as it finds an acceptable element, and doesn't traverse the entire list.
-         * @alias detect
-         */
-        find(iterator: (element: Region, index: number) => boolean, context?: any): Region;
-
-        /**
-         * Returns the first Region of this RegionManager.
-         */
-        first(): Region;
-
-        /**
-         * Returns the first n Regions of this RegionManager.
-         */
-        first(n: number): Region[];
-
-        /**
-         * Iterates over the regions in this instance, yielding each in turn to an
-         * iterator function. The iterator is bound to the context object, if one
-         * is passed.
-         * @alias each
-         */
-        forEach(iterator: (element: Region, index: number, list?: any) => void, context?: any): void;
-
-        /**
-         * Returns true if the value is present in the list.
-         * @alias contains
-         */
-        include(value: any): boolean;
-
-        /**
-         * Returns everything but the last n Regions of this instance.
-         * @param n if specified determines the number of regions to exclude,
-         * otherwise only the last element is excluded.
-         */
-        initial(n: number): Region[];
-
-        /**
-         * Calls the method named by methodName on each value in the collection. Any extra
-         * arguments passed to invoke will be forwarded on to the method invocation.
-         */
-        invoke(methodName: string, args?: any[]): any;
-
-        /**
-         * Returns true if the RegionManager contains no regions.
-         */
-        isEmpty(object: any): boolean;
-
-        /**
-         * Returns the last element of a collection.
-         */
-        last(): Region;
-
-        /**
-         * Returns the last n elements of the collection.
-         */
-        last(n: number): Region[];
-
-        /**
-         * Returns the index of the last occurrence of element in the collection, or -1 if
-         * element is not present.
-         * @param fromIndex if specified starts the search at the given index.
-         */
-        lastIndexOf(element: Region, fromIndex?: number): number;
-
-        /**
-         * Produces a new array of values by mapping each value in the collection through a
-         * transformation function (iterator).
-         * @alias collect
-         */
-        map(iterator: (element: Region, index: number, context?: any) => any[], context?: any): any[];
-
-        /**
-         * Pluck an attribute from each model in the collection. Equivalent to
-         * calling map and returning a single attribute from the iterator.
-         */
-        pluck(attribute: string): any[];
-
-        /**
-         * Returns the values in the collection without the elements that the truth test
-         * (predicate) passes. The opposite of filter.
-         */
-        reject(iterator: (element: Region, index: number) => boolean, context?: any): Region[];
-
-        /**
-         * Returns the rest of the elements of the collection.
-         * Pass an index to return the values of the array from that index onward. If not
-         * specified the first item in the collection is dropped.
-         * @alias tail, drop
-         */
-        rest(n: number): Region[];
-
-        /**
-         * Looks through each value in the collection, returning an array of all
-         * the values that pass a truth test (predicate).
-         * @alias filter
-         */
-        select(iterator: any, context?: any): Region[];
-
-        /**
-         * Returns true if any of the values in the list pass the predicate truth test. Short-circuits and stops traversing the list if a true element is found.
-         * @alias any
-         */
-        some(iterator: (element: Region, index: number) => boolean, context?: any): boolean;
-
-        /**
-         * Creates an array containing the regions in this instance.
-         */
-        toArray(): Region[];
-
-        /**
-         * Returns an array of all the regions in the RegionManager except the ones specified.
-         */
-        without(...values: any[]): Region[];
-    }
-
-    /**
-     * The TemplateCache provides a cache for retrieving templates from script blocks
-     * in your HTML. This will improve the speed of subsequent calls to get a template.
-     */
-    class TemplateCache {
-        /**
-         * To use the TemplateCache, call the get method on TemplateCache directly. Internally, instances of the TemplateCache class will be created and stored but you do not have to manually create these instances yourself. get will return a compiled template function.
-         */
-        static get(templateId: string): any;
-
-        /**
-         * You can clear one or more, or all items from the cache using the clear
-         * method. Clearing a template from the cache will force it to re-load
-         * from the DOM the next time it is retrieved.
-         * @param  the templateId used for loading / caching of the templates to clear. If none specified, all templates will be cleared from the cache.
-         */
-        static clear(...templateId: string[]): void;
-
-        /**
-         * The default template retrieval is to select the template contents from the
-         * DOM using jQuery. If you wish to change the way this works, you can
-         * override this method on the TemplateCache object.
-         */
-        loadTemplate(templateId: string): any;
-
-        /**
-         * he default template compilation passes the results from loadTemplate to
-         * the compileTemplate function, which returns an underscore.js compiled
-         * template function. When overriding compileTemplate remember that it
-         * must return a function which takes an object of parameters and values
-         * and returns a formatted HTML string.
-         */
-        compileTemplate(rawTemplate: any): any;
-    }
-
-    /**
-     * The Renderer object was extracted from the ItemView rendering process, in
-     * order to create a consistent and re-usable method of rendering a template
-     * with or without data.
-     */
-    class Renderer {
-        /**
-         *  This method returns a string containing the result of applying the
-         * template using the data object as the context.
-         * @param template The template to render. If this is a function this is
-         * treated as a pre-compiled template and does not try to compile it again. This
-         * allows any view that supports a template parameter to specify a pre-compiled
-         * template function as the template setting. The template function does not
-         * have to be any specific template engine. It only needs to be a function
-         * that returns valid HTML as a string from the data parameter passed to
-         * the function.
-         */
-        static render(template: any, data: any): string;
-    }
-
-    /**
-     * This base view provides some common and core functionality for other views
-     * to take advantage of.
-     * Note: The Marionette.View class is not intended to be used directly. It
-     * exists as a base view for other view classes to be extended from, and to
-     * provide a common location for behaviors that are shared across all views.
-     */
-    class View<TModel extends Backbone.Model> extends Backbone.View<TModel> {
-
-        constructor(options?: Backbone.ViewOptions<TModel>);
-
-        /**
-         * Defines behaviors attached to this view.
-         */
-        behaviors: any;
-
-        /**
-         * Defines `triggers` to forward DOM events to view
-         * events. `triggers: {"click .foo": "do:foo"}`
-         */
-        triggers:{[key:string]:any};
-
-        /**
-         * A configuration hash for models. The left side is the event on
-         * the model, and the right side is the name of the
-         * method on the view or a function to handle the event. This property
-         * can also be a function that returns the hash described above.
-         */
-        modelEvents: any;
-
-        /**
-         * A configuration hash for collections. The left side is the event on
-         * the collection, and the right side is the name of the
-         * method on the view or a function to handle the event. This property
-         * can also be a function that returns the hash described above.
-         */
-        collectionEvents: any;
-
-        /**
-         * In several cases you need to access ui elements inside the view to
-         * retrieve their data or manipulate them. For example you have a certain
-         * div element you need to show/hide based on some state, or other ui
-         * element that you wish to set a css class to it. Instead of having
-         * jQuery selectors hanging around in the view's code you can define a
-         * ui hash that contains a mapping between the ui element's name and its
-         * jQuery selector. Afterwards you can simply access it via
-         * this.ui.elementName.
-         */
-        ui: any;
-
-        /**
-         * There may be some cases where you need to change the template that is
-         * used for a view, based on some simple logic such as the value of a
-         * specific attribute in the view's model. To do this, you can provide a
-         * getTemplate function on your views and use this to return the template
-         * that you need.
-         */
-        getTemplate(): any;
-
-
-        /**
-         * Retrieve an object's attribute either directly from the object, or
-         * from the object's this.options, with this.options taking precedence.
-         */
-        getOption<T>(optionName:string): T;
-
-        mixinTemplateHelpers(target?: any): any;
-        configureTriggers(): any;
-
-        /**
-         * View implements a destroy method, which is called by the region managers automatically. As part of the implementation.
-         */
-        destroy(...args: any[]): void;
-
-        /**
-         * In several cases you need to access ui elements inside the view to
-         * retrieve their data or manipulate them. For example you have a certain
-         * div element you need to show/hide based on some state, or other ui
-         * element that you wish to set a css class to it. Instead of having jQuery
-         * selectors hanging around in the view's code you can define a ui hash
-         * that contains a mapping between the ui element's name and its jQuery
-         * selector. Afterwards you can simply access it via this.ui.elementName.
-         * This functionality is provided via the bindUIElements method.
-         * Since View doesn't implement the render method, then if you directly
-         * extend from View you will need to invoke this method from your render
-         * method. In ItemView and CompositeView this is already taken care of.
-         */
-        bindUIElements(): any;
-
-        unbindUIElements(): any;
-
-        triggerMethod(name: string, ...args: any[]): any;
-
-        /**
-         * Called on the view instance when the view has been rendered and
-         * displayed. This event can be used to react to when a view has been
-         * shown via a region. A common use case for the onShow method is to
-         * use it to add children views.
-         */
-        onShow(): void;
-
-        /**
-         * Triggered just after the view has been destroyed.
-         */
-        onDestroy(): void;
-
-        /**
-         * When destroying a view, an onBeforeDestroy method will be called, if
-         * it has been provided, just before the view destroys. It will be passed
-         * any arguments that destroy was invoked with.
-         */
-        onBeforeDestroy(...args: any[]): void;
-
-        /**
-         * Called anytime that showing the view in a Region causes it to be
-         * attached to the document.
-         */
-        onAttach(): void;
-
-        /**
-         * Triggered right before the view is attached to the document.
-         */
-        onBeforeAttach(): void;
-
-        /**
-         * Triggered after the view has been rendered, has been shown in the DOM via a Marionette.Region, and has been re-rendered.
-         * This event / callback is useful for DOM-dependent UI plugins such as jQueryUI or KendoUI.
-         */
-        onDomRefresh(): void;
-
-        /**
-         * Internal properties extended in Marionette.View.
-         */
-        isDestroyed: boolean;
-        supportsRenderLifecycle: boolean;
-        supportsDestroyLifecycle: boolean;
-    }
-
-    /**
-     * An ItemView is a view that represents a single item. That item may be
-     * a Backbone.Model or may be a Backbone.Collection. Whichever it is though,
-     * it will be treated as a single item.
-     */
-    class ItemView<TModel extends Backbone.Model> extends View<TModel> {
-
-        constructor(options?: Backbone.ViewOptions<TModel>);
-
-        /**
-         * Item views will serialize a model or collection, by default, by calling
-         * .toJSON on either the model or collection. If both a model and
-         * collection are attached to an item view, the model will be used as the
-         * data source. The results of the data serialization will be passed to
-         * the template that is rendered.
-         *
-         * If you need custom serialization for your data, you can provide a serializeData
-         * method on your view. It must return a valid JSON object, as if you had
-         * called .toJSON on a model or collection.
-         */
-        serializeData(): any;
-
-        /**
-         * Renders the view. It is unwise to override the render method of any
-         * Marionette view. Instead, you should use the onBeforeRender and
-         * onRender callbacks to layer in additional functionality to the
-         * rendering of your view.
-         */
-        render(): ItemView<TModel>;
-
-        /**
-         * Triggered before an ItemView is rendered.
-         */
-        onBeforeRender(): void;
-
-        /**
-         * Triggered after the view has been rendered. You can implement this in
-         * your view to provide custom code for dealing with the view's el after
-         * it has been rendered.
-         */
-        onRender(): void;
-    }
-
-
-    interface CollectionViewOptions<TModel extends Backbone.Model> extends Backbone.ViewOptions<TModel> {
-
-        /**
-         * By default the CollectionView will maintain a sorted collection's order
-         * in the DOM. This behavior can be disabled by specifying {sort: false}
-         * on initialize.
-         */
-        sort?: boolean;
-
-        /**
-         * This option is useful when you have performance issues when you
-         * resort your CollectionView. Without this option, your CollectionView
-         * will be completely re-rendered, which can be costly if you have a
-         * large number of elements or if your ChildViews are complex. If this
-         * option is activated, when you sort your Collection, there will be no
-         * re-rendering, only the DOM nodes will be reordered. This can be a
-         * problem if your ChildViews use their collection's index in their
-         * rendering. In this case, you cannot use this option as you need to
-         * re-render each ChildView.
-         *
-         * If you combine this option with a filter that changes the views that
-         * are to be displayed, reorderOnSort will be bypassed to render new
-         * children and remove those that are rejected by the filter.
-         */
-        reorderOnSort?: boolean;
-    }
-
-    /**
-     * The CollectionView will loop through all of the models in the specified
-     * collection, render each of them using a specified childView, then append
-     * the results of the child view's el to the collection view's el. By
-     * default the CollectionView will maintain a sorted collection's order in the
-     * DOM. This behavior can be disabled by specifying {sort: false} on
-     * initialize.
-     */
-    class CollectionView<TModel extends Backbone.Model, TView extends View<Backbone.Model>> extends View<TModel> {
-        constructor(options?: CollectionViewOptions<TModel>);
-
-        /**
-         * Specify a childView in your collection view definition. This must be a
-         * Backbone view object definition, not an instance. It can be any
-         * Backbone.View or be derived from Marionette.ItemView
-         */
-        childView: new (...args:any[]) => TView;
-
-        /**
-         * There may be scenarios where you need to pass data from your parent
-         * collection view in to each of the childView instances. To do this,
-         * provide a childViewOptions definition on your collection view as an
-         * object literal. This will be passed to the constructor of your childView
-         * as part of the options.
-         *
-         * You can also specify the childViewOptions as a function, if you need to
-         * calculate the values to return at runtime. The model will be passed
-         * into the function should you need access to it when calculating
-         * childViewOptions. The function must return an object, and the attributes of
-         * the object will be copied to the childView instance's options.
-         */
-        childViewOptions: any;
-
-        /**
-         * You can customize the event prefix for events that are forwarded through
-         * the collection view. To do this, set the childViewEventPrefix on the
-         * collection view.
-         */
-        childViewEventPrefix: string;
-
-        /**
-         * You can specify a childEvents hash or method which allows you to
-         * capture all bubbling childEvents without having to manually set bindings.
-         * The keys of the hash can either be a function or a string that is the
-         * name of a method on the collection view.
-         */
-        childEvents: any;
-
-        /**
-         * When a collection has no children, and you need to render a view other than
-         * the list of childViews, you can specify an emptyView attribute on your collection
-         * view.
-         */
-        emptyView: any;
-
-        /**
-         * Similar to childView and childViewOptions, there is an emptyViewOptions
-         * property that will be passed to the emptyView constructor. It can be
-         * provided as an object literal or as a function. If emptyViewOptions
-         * aren't provided the CollectionView will default to passing the
-         * childViewOptions to the emptyView.
-         */
-        emptyViewOptions: any;
-
-        /**
-         * The CollectionView uses Backbone.BabySitter to store and manage its
-         * child views. This allows you to easily access the views within the
-         * collection view, iterate them, find them by a given indexer such as the
-         * view's model or collection, and more.
-         */
-        children: Backbone.ChildViewContainer<TView>;
-
-        /**
-         * The render method of the collection view is responsible for rendering the
-         * entire collection. It loops through each of the children in the collection
-         * and renders them individually as an childView.
-         */
-        render(): CollectionView<TModel, TView>;
-
-        /**
-         * The addChild method is responsible for rendering the childViews and
-         * adding them to the HTML for the collectionView instance. It is also
-         * responsible for triggering the events per ChildView. In most cases you
-         * should not override this method.
-         */
-        addChild(item: any, ChildView: TView, index: Number): void;
-
-        /** Render the child view */
-        renderChildView(view: TView, index: Number): void;
-
-        /**
-         * When a custom view instance needs to be created for the childView that
-         * represents a child, override the buildChildView method. This method
-         * takes three parameters and returns a view instance to be used as the
-         * child view.
-         */
-        buildChildView(child: any, ItemViewType: any, itemViewOptions: any): TView;
-
-        /**
-         * Remove the child view and destroy it. This function also updates the indices of
-         * later views in the collection in order to keep the children in sync with the collection.
-         */
-        removeChildView(view: TView): TView;
-
-        /**
-         * Determines if the view is empty. If you want to control when the empty
-         * view is rendered, you can override isEmpty.
-         */
-        isEmpty(): boolean;
-
-        /**
-         * If empty, show the empty view
-         */
-        checkEmpty(): void;
-
-        /**
-         * Destroy the child views that this collection view
-         * is holding on to, if any. This returns destroyed children.
-         */
-        destroyChildren(): Backbone.ChildViewContainer<TView>;
-
-        /**
-         * By default the CollectionView will maintain the order of its collection
-         * in the DOM. However on occasions the view may need to re-render to make
-         * this possible, for example if you were to change the comparator on the
-         * collection. By default CollectionView will call render when this happens,
-         * but there are cases where this may not be suitable. For instance when
-         * sorting the children in a CompositeView, you want to only render the
-         * internal collection.
-         */
-        resortView(): void;
-
-        /**
-         * By default the collection view will append the HTML of each ChildView
-         * into the element buffer, and then call jQuery's .append once at the end
-         * to move the HTML into the collection view's el.
-         * You can override this by specifying an attachHtml method in your view
-         * definition.
-         * @param collectionView the instance of the collection view that will receive the HTML.
-         * @param childView the current child view instance.
-         * @param index he index of the model that this childView instance represents,
-         * in the collection that the model came from. This is useful for sorting
-         * a collection and displaying the sorted list in the correct order on the
-         * screen.
-         */
-        attachHtml(collectionView: CollectionView<TModel, TView>, childView: TView, index: number): void;
-
-        /**
-         * The value returned by this method is the ChildView class that will be
-         * instantiated when a Model needs to be initially rendered. This method
-         * also gives you the ability to customize per Model ChildViews.
-         */
-        getChildView<M extends Backbone.Model>(item: M): new (...args:any[]) => TView;
-
-        /**
-         * If you need the emptyView's class chosen dynamically, specify
-         * getEmptyView.
-         */
-        getEmptyView(): any;
-
-        /** Serialize a collection by serializing each of its models. */
-        serializeCollection(): any;
-
-        /**
-         * Attaches the content of a given view.
-        * This method can be overridden to optimize rendering,
-        * or to render in a non standard way.
-        *
-        * For example, using `innerHTML` instead of `$el.html`
-        *
-        * @example
-        * attachElContent: function(html) {
-        *   this.el.innerHTML = html;
-        *   return this;
-        * }
-        */
-        attachElContent(html: string): ItemView<TModel>;
-
-        /**
-         * Reorder DOM after sorting. When your element's rendering
-         * do not use their index, you can pass reorderOnSort: true
-         * to only reorder the DOM after a sort instead of rendering
-         * all the collectionView
-         */
-        reorder(): void;
-
-        /**
-         * Render and show the emptyView. Similar to addChild method
-         * but "add:child" events are not fired, and the event from
-         * emptyView are not forwarded
-         */
-        addEmptyView(child: TModel, EmptyView: new (...args: any[]) => any): void;
-
-        /**
-         * Handle cleanup and other destroying needs for the collection of views
-         */
-        destroy(): CollectionView<TModel, TView>;
-
-        /**
-         * Set up the child view event forwarding. Uses a "childview:"
-         * prefix in front of all forwarded events.
-         * @param view it might be ChildView or EmptyView.
-         */
-        proxyChildEvents(view: any): void;
-
-        /**
-         * Called just prior to rendering the collection view.
-         */
-        onBeforeRender(): void;
-
-        /**
-         * Triggered after the view has been rendered. You can implement this in
-         * your view to provide custom code for dealing with the view's el after
-         * it has been rendered.
-         */
-        onRender(): void;
-
-        /**
-         * This callback function allows you to know when a child / child view
-         * instance is about to be added to the collection view. It provides
-         * access to the view instance for the child that was added.
-         */
-        onBeforeAddChild(childView: TView): void;
-
-        /**
-         * This callback function allows you to know when a child / child view
-         * instance has been added to the collection view. It provides access to
-         * the view instance for the child that was added.
-         */
-        onAddChild(childView: TView): void;
-
-        /**
-         * This callback function allows you to know when a childView instance is
-         * about to be removed from the collectionView. It provides access to the
-         * view instance for the child that was removed.
-         */
-        onBeforeRemoveChild(childView: TView): void;
-
-        /**
-         * This callback function allows you to know when a child / childView
-         * instance has been deleted or removed from the collection.
-         */
-        onRemoveChild(childView: TView): void;
-    }
-
-    /**
-     * A CompositeView extends from CollectionView to be used as a composite view
-     * for scenarios where it should represent both a branch and leaf in a tree
-     * structure, or for scenarios where a collection needs to be rendered within
-     * a wrapper template.
-     */
-    class CompositeView<TModel extends Backbone.Model, TView extends View<Backbone.Model>> extends CollectionView<TModel, TView> {
-
-        constructor(options?: CollectionViewOptions<TModel>);
-
-        /**
-         * Each childView will be rendered using the childView's template. The
-         * CompositeView's template is rendered and the childView's templates are
-         * added to this.
-         */
-        childView: new (...args:any[]) => TView;
-
-        /**
-         * By default the composite view uses the same attachHtml method that the
-         * collection view provides. This means the view will call jQuery's
-         * .append to move the HTML contents from the child view instance in to
-         * the collection view's el.
-         * This is typically not very useful as a composite view will usually render
-         * a container DOM element in which the child views should be placed.
-         * This can be either a string or a function returning a string.
-         */
-        childViewContainer: any;
-
-        /**
-        * Renders the view.
-        */
-        render(): CompositeView<TModel, TView>;
-
-        /**
-         * Invoked before the model has been rendered
-         */
-        onBeforeRenderTemplate(): void;
-
-        /**
-         * Invoked after the model has been rendered.
-         */
-        onRenderTemplate(): void;
-
-        /**
-         * Invoked before the collection of models is rendered
-         */
-        onBeforeRenderCollection(): void;
-
-        /**
-         * Invoked after the collection of models has been rendered
-         */
-        onRenderCollection(): void;
-    }
-
-    interface LayoutViewOptions<TModel extends Backbone.Model> extends Backbone.ViewOptions<TModel> {
-        /**
-         * The LayoutView takes an additional parameter where you can pass the regions as option on creation.
-         */
-        regions?:any;
-
-        /**
-         * This option removes the layoutView from the DOM before destroying the
-         * children preventing repaints as each option is removed. However, it
-         * makes it difficult to do close animations for a child view (false by
-         * default)
-         */
-        destroyImmediate?: boolean;
-    }
-
-    /**
-     * A LayoutView is a hybrid of an ItemView and a collection of Region objects.
-     * They are ideal for rendering application layouts with multiple sub-regions
-     * managed by specified region managers.
-     * A layoutView can also act as a composite-view to aggregate multiple views
-     * and sub-application areas of the screen allowing applications to attach
-     * multiple region managers to dynamically rendered HTML.
-     * You can create complex views by nesting layoutView managers within Regions.
-     */
-    class LayoutView<TModel extends Backbone.Model> extends ItemView<TModel> {
-        /**
-         * If you have the need to replace the Region with a region class of your
-         * own implementation, you can specify an alternate class to use with this
-         * property.
-         */
-        regionClass: any;
-
-        /**
-         * Constructor.
-         * A hash that can contain a regions hash that allows you to specify regions per
-         * LayoutView instance.
-         */
-        constructor(options?: LayoutViewOptions<TModel>);
-
-        /**
-         * Handle destroying regions, and then destroy the view itself.
-         */
-        destroy(): LayoutView<TModel>;
-
-        /**
-         * Regions hash or a method returning the regions hash that maps
-         * regions/selectors to methods on your View.
-         **/
-        regions(): any;
-
-        /** Adds a region to the layout view. */
-        addRegion(name: string, definition: any): Region;
-
-        /**
-         * Add multiple regions as a {name: definition, name2: def2} object literal.
-         */
-        addRegions(regions: any): any;
-
-        /** Returns a region from the layout view */
-        getRegion(name: string): Region;
-
-        /**
-         * Renders the view. It will use the existing region objects the first
-         * time it is called. Subsequent calls will destroy the views that the
-         * regions are showing and then reset the `el` for the regions to the
-         * newly rendered DOM elements.
-         */
-        render(): LayoutView<TModel>;
-
-        /**
-         * Removes the region with the specified name.
-         * @param name the name of the region to remove.
-         */
-        removeRegion(name: string): Region;
-
-        /** Enable easy overriding of the default `RegionManager`
-          * for customized region interactions and business specific
-          * view logic for better control over single regions.
-          */
-        getRegionManager(): RegionManager;
-
-        /**
-         * Show a view into the region specified by `regionName`.
-         */
-        showChildView(regionName: string, view: any, options?: RegionShowOptions): void;
-
-        /**
-         * Get the current view that is shown in the region specified by
-         * `regionName`.
-         */
-        getChildView(regionName: string): Backbone.View<TModel>;
-
-        /**
-         * Returns all regions from the layout view. The results contains an
-         * Object hash that has `string`s as keys and `Region`s as values.
-         */
-        getRegions(): {[key: string]: Region};
-
-        /**
-         * You can customize the event prefix for events that are forwarded through
-         * the layout view with this property.
-         */
-        childViewEventPrefix: string;
-    }
-
-    interface AppRouterOptions extends Backbone.RouterOptions {
-        /**
-         * The appRoutes.
-         */
-        appRoutes?: any;
-
-        /**
-         * The controller to associate with this router.
-         */
-        controller?: any;
-    }
-
-    /**
-     * Reduce the boilerplate code of handling route events and then calling a
-     * single method on another object. Have your routers configured to call
-     * the method on your object, directly.
-     */
-    class AppRouter extends Backbone.Router {
-
-        /**
-         * Configure an AppRouter with appRoutes. The route definition
-         * is passed on to Backbone's standard routing handlers. This means
-         * that you define routes like you normally would. However, instead of
-         * providing a callback method that exists on the router, you provide a
-         * callback method that exists on the controller, which you specify for
-         * the router instance (see below.)
-         */
-        constructor(options?: AppRouterOptions);
-
-        /**
-         * You can specify a controller with the multiple routes at runtime with
-         * this method. However, In this case the current controller of AppRouter
-         * will not change.
-         */
-        processAppRoutes(controller: any, appRoutes: any): void;
-
-        /**
-         * Adds an app route at runtime to this instance. It works the same as the
-         * built-in router.route() call from Backbone's Router, but has all the
-         * same semantics and behavior of the appRoutes configuration.
-         */
-        appRoute(route: string, methodName: string): void;
-    }
-
-    /**
-     * The Backbone.Marionette.Application object is the hub of your composite
-     * application. It organizes, initializes and coordinates the various pieces
-     * of your app. It also provides a starting point for you to call into from
-     * your HTML script block, or directly from your JavaScript files if you
-     * prefer to go that route. The Application is meant to be instantiated
-     * directly, although you can extend it to add your own functionality.
-     */
-    class Application extends Backbone.Events {
-
-        constructor(options?: any);
-
-        /**
-         * The Event Aggregator is available through this property. It is
-         * convenient for passively sharing information between pieces of your
-         * application as events occur.
-         * Note! To access this application channel from other objects within your
-         * app you are encouraged to get a handle of the systems through the
-         * Wreqr API instead of the Application instance itself.
-         */
-        vent: Backbone.Wreqr.EventAggregator;
-
-        /**
-         * Commands are used to make any component tell another component to
-         * perform an action without a direct reference to it.
-         */
-        commands: Backbone.Wreqr.Commands;
-
-        /**
-         * Request Response is a means for any component to request information
-         * from another component without being tightly coupled.
-         */
-        reqres: Backbone.Wreqr.RequestResponse;
-
-        submodules: any;
-
-        /** Command execution, facilitated by Backbone.Wreqr.Commands */
-        execute(...args: any[]): void;
-
-        /** Request/response, facilitated by Backbone.Wreqr.RequestResponse */
-        request(...args: any[]): any;
-
-        /** Deprecated! Initializers, you should use events to manage start-up logic. */
-        addInitializer(initializer: any): void;
-
-        /**
-         * Once you have your application configured, you can kick everything off
-         * by calling this method.
-         * @param options This parameter will be passed to each of your initializer functions, as well as the initialize events. This allows you to provide extra configuration for various parts of your app throughout the initialization sequence.
-         */
-        start(options?: any): void;
-
-        /** Deprecated! nstead of using the Application as the root of your view tree, you should use a Layout View.*/
-        addRegions(regions: any): any;
-
-        /** Deprecated! nstead of using the Application as the root of your view tree, you should use a Layout View.*/
-        emptyRegions(): void;
-
-        /** Deprecated! nstead of using the Application as the root of your view tree, you should use a Layout View.*/
-        removeRegion(region: Region): void;
-
-        /** Deprecated! nstead of using the Application as the root of your view tree, you should use a Layout View.*/
-        getRegion(regionName: string): Region;
-
-        module(moduleNames: any, moduleDefinition: any): Module;
-
-        /**
-         * Called just before the Application starts and before the initializers are executed.
-         */
-        onBeforeStart(options?: any): void;
-
-        /**
-         * Called after the Application has started and after the initializers have been executed.
-         */
-        onStart(options?: any): void;
-    }
-
-    // modules mapped for convenience, but you should probably use TypeScript modules instead
-    class Module extends Backbone.Events {
-
-        constructor(moduleName: string, app: Application);
-
-        submodules: any;
-        triggerMethod(name: string, ...args: any[]): any;
-
-        addInitializer(callback: any): void;
-        addFinalizer(callback: any): void;
-        start(options?: any): void;
-        addDefinition(moduleDefinition: any, customArgs: any): any;
-    }
-
-    /**
-     * A Behavior is an isolated set of DOM / user interactions that can be mixed
-     * into any View or another Behavior. Behaviors allow you to blackbox View
-     * specific interactions into portable logical chunks, keeping your views
-     * simple and your code DRY.
-     */
-    class Behavior extends Marionette.Object {
-        constructor(options?: any, view?: any);
-
-        options: any;
-
-		/**
-         * Behaviors can have their own ui hash, which will be mixed into the ui
-         * hash of its associated View instance. ui elements defined on either the
-         * Behavior or the View will be made available within events and triggers.
-         * They also are attached directly to the Behavior and can be accessed within
-         * Behavior methods as this.ui.
-         */
-        ui: any;
-
-        /**
-         * Any triggers you define on the Behavior will be triggered in response to the appropriate event on the view.
-         */
-        triggers: any;
-
-        /**
-         * modelEvents will respond to the view's model events.
-         */
-        modelEvents: any;
-
-        /**
-         * collectionEvents will respond to the view's collection events.
-         */
-        collectionEvents: any;
-
-        /**
-         * The behaviors key allows a behavior to group multiple behaviors
-         * together.
-         */
-        behaviors: any;
-
-        /**
-         * defaults can be a hash or function to define the default options for
-         * your behavior. The default options will be overridden depending on
-         * what you set as the options per behavior (this works just like a
-         * backbone.model).
-         */
-        defaults: any;
-
-        /**
-         * el is a direct proxy of the view's el
-         */
-        el: any;
-
-        /**
-         * $el is a direct proxy of the view's el cached as a jQuery selector.
-         */
-        $el: JQuery;
-
-        /** A reference to the view instance that the behavior is on. */
-        view: any;
-
-        /**
-         * $ is a direct proxy of the views $ lookup method.
-         */
-        $(selector: any): JQuery;
-    }
-
-    /**
-     * Marionette.Behaviors' is a utility class that takes care of glueing your
-     * behavior instances to their given View. The most important part of this
-     * class is that you MUST override the class level behaviorsLookup method or
-     * set the option behaviorClass for things to work properly.
-     */
-    class Behaviors {
-        /**
-         * This method defines where your behavior classes are stored. Override this to provide another lookup.
-         */
-        static behaviorsLookup(): any;
-
-        /**
-         * This method has a default implementation that is simple to override. It
-         * is responsible for the lookup of single behavior from within the
-         * Behaviors.behaviorsLookup or elsewhere. Note that it should return the type of the
-         * class to instantiate, not an instance of that class.
-         */
-        static getBehaviorClass(options: any, key: string): any;
-    }
-}
-
-declare module 'backbone.marionette' {
-    import Backbone = require('backbone');
-
-    export = Marionette;
-}
diff --git a/marked/marked.d.ts b/marked/index.d.ts
similarity index 100%
rename from marked/marked.d.ts
rename to marked/index.d.ts
diff --git a/marked/marked-tests.ts b/marked/marked-tests.ts
index d92ccb2974..6263b2fff2 100644
--- a/marked/marked-tests.ts
+++ b/marked/marked-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="marked.d.ts" />
+
 
 import * as marked from 'marked';
 
diff --git a/marked/tsconfig.json b/marked/tsconfig.json
new file mode 100644
index 0000000000..b98cbe0d7e
--- /dev/null
+++ b/marked/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "marked-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/markerclustererplus/index.d.ts b/markerclustererplus/index.d.ts
new file mode 100644
index 0000000000..ffc231053b
--- /dev/null
+++ b/markerclustererplus/index.d.ts
@@ -0,0 +1,868 @@
+// Type definitions for MarkerClustererPlus for Google Maps V3 2.1.1
+// Project: http://github.com/mahnunchik/markerclustererplus
+// Definitions by: Mathias Rodriguez <http://github.com/enanox>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="google-maps" />
+
+/**
+ * This class represents the object for values in the <code>styles</code> array passed
+ * to the {@link MarkerClusterer} constructor. The element in this array that is used to
+ * style the cluster icon is determined by calling the <code>calculator</code> function.
+ */
+declare interface ClusterIconStyle {
+    /** The URL of the cluster icon image file. Required. */
+    url: string;
+    /** Height The display height (in pixels) of the cluster icon. Required. */
+    height: number;
+    /** Width The display width (in pixels) of the cluster icon. Required. */
+    width: number;
+    /**
+     * [anchorText] The position (in pixels) from the center of the cluster icon to
+     * where the text label is to be centered and drawn. The format is <code>[yoffset, xoffset]</code>
+     * where <code>yoffset</code> increases as you go down from center and <code>xoffset</code>
+     * increases to the right of center. The default is <code>[0, 0]</code>.
+     */
+    anchorText?: number[];
+    /**
+     * [anchorIcon] The anchor position (in pixels) of the cluster icon. This is the
+     * spot on the cluster icon that is to be aligned with the cluster position. The format is
+     * <code>[yoffset, xoffset]</code> where <code>yoffset</code> increases as you go down and
+     * <code>xoffset</code> increases to the right of the top-left corner of the icon. The default
+     * anchor position is the center of the cluster icon.
+     */
+    anchorIcon?: number[];
+    /** [textColor="black"] The color of the label text shown on the cluster icon. */
+    textColor?: string;
+    /** textSize=11] The size (in pixels) of the label text shown on the cluster icon. */
+    textSize?: number;
+    /**
+     * [textDecoration="none"] The value of the CSS <code>text-decoration</code>
+     * property for the label text shown on the cluster icon.
+     */
+    textDecoration?: string;
+    /** [fontWeight="bold"] The value of the CSS <code>font-weight</code>
+     * property for the label text shown on the cluster icon.
+     */
+    fontWeight?: string;
+    /** 
+     * [fontStyle="normal"] The value of the CSS <code>font-style</code>
+     *  property for the label text shown on the cluster icon.
+     */
+    fontStyle?: string;
+    /**
+     * [fontFamily="Arial,sans-serif"] The value of the CSS <code>font-family</code>
+     *  property for the label text shown on the cluster icon.
+     */
+    fontFamily?: string;
+    /**
+     * [backgroundPosition="0 0"] The position of the cluster icon image
+     * within the image defined by <code>url</code>. The format is <code>"xpos ypos"</code>
+     * (the same format as for the CSS <code>background-position</code> property). You must set
+     * this property appropriately when the image defined by <code>url</code> represents a sprite
+     * containing multiple images. Note that the position <i>must</i> be specified in px units.
+     */
+    backgroundPosition?: string;    
+}
+
+/**
+ * @name ClusterIconInfo
+ * @class This class is an object containing general information about a cluster icon. This is
+ *      the object that a <code>calculator</code> function returns.
+ *
+ * @property {string} text The text of the label to be shown on the cluster icon.
+ * @property {number} index The index plus 1 of the element in the <code>styles</code>
+ *      array to be used to style the cluster icon.
+ * @property {string} title The tooltip to display when the mouse moves over the cluster icon.
+ *      If this value is <code>undefined</code> or <code>""</code>, <code>title</code> is set to the
+ *      value of the <code>title</code> property passed to the MarkerClusterer.
+ */
+
+declare class ClusterIconInfo extends google.maps.OverlayView {
+   text: string;
+   index: number;
+   title: string;
+   /**
+    * A cluster icon.
+    *
+    * @constructor
+    * @extends google.maps.OverlayView
+    * @param {Cluster} cluster The cluster with which the icon is to be associated.
+    * @param {Array} [styles] An array of {@link ClusterIconStyle} defining the cluster icons
+    *       to use for various cluster sizes.
+    * @private
+    */
+   constructor(cluster: Cluster, styles: ClusterIconStyle[]);
+   
+   /**
+    * Adds the icon to the DOM.
+    */
+   onAdd(): void;
+   
+   /**
+    * Removes the icon from the DOM.
+    */
+   onRemove(): void;
+   
+   /**
+    * Draws the icon.
+    */
+   draw(): void;
+   
+   /**
+    * Hides the icon.
+    */
+   hide(): void;
+   
+   /**
+    * Positions and shows the icon.
+    */
+   show(): void;
+   
+   /**
+    * Sets the icon styles to the appropriate element in the styles array.
+    *
+    * @param {ClusterIconInfo} sums The icon label text and styles index.
+    */
+   useStyle(sums: ClusterIconInfo[]): void;
+   
+   /**
+    * Sets the position at which to center the icon.
+    *
+    * @param {google.maps.LatLng} center The latlng to set as the center.
+    */
+   setCenter(center: google.maps.LatLng): void;
+   
+   /**
+    * Creates the cssText style parameter based on the position of the icon.
+    *
+    * @param {google.maps.Point} pos The position of the icon.
+    * @return {string} The CSS style text.
+    */
+   createCss(pos: google.maps.Point): string;
+   
+   /**
+    * Returns the position at which to place the DIV depending on the latlng.
+    *
+    * @param {google.maps.LatLng} latlng The position in latlng.
+    * @return {google.maps.Point} The position in pixels.
+   */
+   getPosFromLatLng_(latLng: google.maps.LatLng): google.maps.Point;
+}
+ 
+interface Cluster {
+   /**
+    * Creates a single cluster that manages a group of proximate markers.
+    * Used internally, do not call this constructor directly.
+    * @constructor
+    * @param {MarkerClusterer} mc The <code>MarkerClusterer</code> object with which this
+    *       cluster is associated.
+    */
+   new (mc: MarkerClusterer): Cluster;
+   
+   /**
+    * Returns the number of markers managed by the cluster. You can call this from
+    * a <code>click</code>, <code>mouseover</code>, or <code>mouseout</code> event handler
+    * for the <code>MarkerClusterer</code> object.
+    *
+    * @return {number} The number of markers in the cluster.
+    */
+   getSize(): number;
+   
+   /**
+    * Returns the array of markers managed by the cluster. You can call this from
+    * a <code>click</code>, <code>mouseover</code>, or <code>mouseout</code> event handler
+    * for the <code>MarkerClusterer</code> object.
+    *
+    * @return {Array} The array of markers in the cluster.
+    */
+   getMarkers(): google.maps.Marker[];
+   
+   /**
+     * Returns the center of the cluster. You can call this from
+     * a <code>click</code>, <code>mouseover</code>, or <code>mouseout</code> event handler
+     * for the <code>MarkerClusterer</code> object.
+     *
+     * @return {google.maps.LatLng} The center of the cluster.
+     */
+   getCenter(): google.maps.LatLng;
+   
+   /**
+     * Returns the map with which the cluster is associated.
+     *
+     * @return {google.maps.Map} The map.
+     * @ignore
+     */
+   getMap(): google.maps.Map;
+   
+   /**
+     * Returns the <code>MarkerClusterer</code> object with which the cluster is associated.
+     *
+     * @return {MarkerClusterer} The associated marker clusterer.
+     * @ignore
+     */
+   getMarkerClusterer(): MarkerClusterer;
+    
+   /**
+     * Returns the bounds of the cluster.
+     *
+     * @return {google.maps.LatLngBounds} the cluster bounds.
+     * @ignore
+     */
+   getBounds(): google.maps.LatLngBounds;
+    
+   /**
+     * Removes the cluster from the map.
+     *
+     * @ignore
+     */
+   remove(): void;
+    
+   /**
+     * Adds a marker to the cluster.
+     *
+     * @param {google.maps.Marker} marker The marker to be added.
+     * @return {boolean} True if the marker was added.
+     * @ignore
+     */
+   addMarker(marker: google.maps.Marker): boolean;
+   
+   /**
+     * Determines if a marker lies within the cluster's bounds.
+     *
+     * @param {google.maps.Marker} marker The marker to check.
+     * @return {boolean} True if the marker lies in the bounds.
+     * @ignore
+     */
+   isMarkerInClusterBounds(marker: google.maps.Marker): boolean;
+   
+   /**
+     * Calculates the extended bounds of the cluster with the grid.
+     */
+   calculateBounds_(): void;
+   
+   /**
+     * Updates the cluster icon.
+     */
+   updateIcon_(): void;
+   
+   /**
+     * Determines if a marker has already been added to the cluster.
+     *
+     * @param {google.maps.Marker} marker The marker to check.
+     * @return {boolean} True if the marker has already been added.
+     */
+   isMarkerAlreadyAdded_(marker: google.maps.Marker): boolean;    
+}
+
+/**
+ * Optional parameter passed to the {@link MarkerClusterer} constructor.
+ */
+interface MarkerClustererOptions {
+   /** [gridSize=60] The grid size of a cluster in pixels. The grid is a square. */
+   gridSize?: number;
+   /** [maxZoom=null] The maximum zoom level at which clustering is enabled or 
+    * <code>null</code> if clustering is to be enabled at all zoom levels.
+    */
+   maxZoom?: number;
+   /**
+    * [zoomOnClick=true] Whether to zoom the map when a cluster marker is
+    * clicked. You may want to set this to <code>false</code> if you have installed a handler
+    * for the <code>click</code> event and it deals with zooming on its own.
+    */
+   zoomOnClick?: boolean;
+   /**
+    * [averageCenter=false] Whether the position of a cluster marker should be
+    * the average position of all markers in the cluster. If set to <code>false</code>, the
+    * cluster marker is positioned at the location of the first marker added to the cluster.
+    */
+   averageCenter?: boolean;
+   /**
+    * [minimumClusterSize=2] The minimum number of markers needed in a cluster
+    * before the markers are hidden and a cluster marker appears.
+    */
+   minimumClusterSize?: number;
+   /**
+    * [ignoreHidden=false] Whether to ignore hidden markers in clusters. You
+    * may want to set this to <code>true</code> to ensure that hidden markers are not included
+    * in the marker count that appears on a cluster marker (this count is the value of the
+    * <code>text</code> property of the result returned by the default <code>calculator</code>).
+    * If set to <code>true</code> and you change the visibility of a marker being clustered, be
+    * sure to also call <code>MarkerClusterer.repaint()</code>.
+    */
+   ignoreHidden?: boolean;
+   /**
+    * [title=""] The tooltip to display when the mouse moves over a cluster
+    * marker. (Alternatively, you can use a custom <code>calculator</code> function to specify a
+    * different tooltip for each cluster marker.)
+    */
+   title?: string;
+   /**
+    * [calculator=MarkerClusterer.CALCULATOR] The function used to determine
+    * the text to be displayed on a cluster marker and the index indicating which style to use
+    * for the cluster marker. The input parameters for the function are (1) the array of markers
+    * represented by a cluster marker and (2) the number of cluster icon styles. It returns a
+    * {@link ClusterIconInfo} object. The default <code>calculator</code> returns a
+    * <code>text</code> property which is the number of markers in the cluster and an
+    * <code>index</code> property which is one higher than the lowest integer such that
+    * <code>10^i</code> exceeds the number of markers in the cluster, or the size of the styles
+    * array, whichever is less. The <code>styles</code> array element used has an index of
+    * <code>index</code> minus 1. For example, the default <code>calculator</code> returns a
+    * <code>text</code> value of <code>"125"</code> and an <code>index</code> of <code>3</code>
+    * for a cluster icon representing 125 markers so the element used in the <code>styles</code>
+    * array is <code>2</code>. A <code>calculator</code> may also return a <code>title</code>
+    * property that contains the text of the tooltip to be used for the cluster marker. If
+    * <code>title</code> is not defined, the tooltip is set to the value of the <code>title</code>
+    * property for the MarkerClusterer.
+    */
+   calculator?: (markers: google.maps.Marker[], clusterIconStylesCount: number) => ClusterIconInfo;
+   /**
+   * [clusterClass="cluster"] The name of the CSS class defining general styles
+   * for the cluster markers. Use this class to define CSS styles that are not set up by the code
+   * that processes the <code>styles</code> array.
+   */
+   clusterClass?: string;
+   /**
+    *[styles] An array of {@link ClusterIconStyle} elements defining the styles
+    * of the cluster markers to be used. The element to be used to style a given cluster marker
+    * is determined by the function defined by the <code>calculator</code> property.
+    * The default is an array of {@link ClusterIconStyle} elements whose properties are derived
+    * from the values for <code>imagePath</code>, <code>imageExtension</code>, and
+    * <code>imageSizes</code>.
+    */
+   styles?: ClusterIconStyle[];
+   /**
+    * [enableRetinaIcons=false] Whether to allow the use of cluster icons that
+    * have sizes that are some multiple (typically double) of their actual display size. Icons such
+    * as these look better when viewed on high-resolution monitors such as Apple's Retina displays.
+    * Note: if this property is <code>true</code>, sprites cannot be used as cluster icons.
+    */
+   enableRetinaIcons?: boolean;
+   /**
+    * [batchSize=MarkerClusterer.BATCH_SIZE] Set this property to the
+    * number of markers to be processed in a single batch when using a browser other than
+    * Internet Explorer (for Internet Explorer, use the batchSizeIE property instead).
+    */
+   batchSize?: number;
+   /** 
+    * [batchSizeIE=MarkerClusterer.BATCH_SIZE_IE] When Internet Explorer is
+    * being used, markers are processed in several batches with a small delay inserted between
+    * each batch in an attempt to avoid Javascript timeout errors. Set this property to the
+    * number of markers to be processed in a single batch; select as high a number as you can
+    * without causing a timeout error in the browser. This number might need to be as low as 100
+    * if 15,000 markers are being managed, for example.
+    */
+   batchSizeIE?: number;
+   /**
+    * [imagePath=MarkerClusterer.IMAGE_PATH]
+    * The full URL of the root name of the group of image files to use for cluster icons.
+    * The complete file name is of the form <code>imagePath</code>n.<code>imageExtension</code>
+    * where n is the image file number (1, 2, etc.).
+    */
+   imagePath?: string;
+   /**
+    * [imageExtension=MarkerClusterer.IMAGE_EXTENSION]
+    * The extension name for the cluster icon image files (e.g., <code>"png"</code> or
+    * <code>"jpg"</code>).
+    */
+   imageExtension?: string;
+   /**
+    * [imageSizes=MarkerClusterer.IMAGE_SIZES]
+    * An array of numbers containing the widths of the group of
+    * <code>imagePath</code>n.<code>imageExtension</code> image files.
+    * (The images are assumed to be square.)
+    */
+   imageSizes?: number[];
+}
+
+interface MarkerClusterer extends google.maps.OverlayView {
+   /**
+     * Creates a MarkerClusterer object with the options specified in {@link MarkerClustererOptions}.
+     * @constructor
+     * @extends google.maps.OverlayView
+     * @param {google.maps.Map} map The Google map to attach to.
+     * @param {Array.<google.maps.Marker>} [opt_markers] The markers to be added to the cluster.
+     * @param {MarkerClustererOptions} [opt_options] The optional parameters.
+     */
+   new (map: google.maps.Map, opt_markers: google.maps.Marker[], opt_options?: MarkerClustererOptions): MarkerClusterer;
+   
+   /**
+     * Implementation of the onAdd interface method.
+     * @ignore
+     */
+   onAdd(): void; 
+   
+   /**
+     * Implementation of the onRemove interface method.
+     * Removes map event listeners and all cluster icons from the DOM.
+     * All managed markers are also put back on the map.
+     * @ignore
+     */
+   onRemove(): void;
+   
+   /**
+     * Implementation of the draw interface method.
+     * @ignore
+     */
+   draw(): void;
+   
+   /**
+     * Sets up the styles object.
+     */
+   setupStyles_(): void;
+   
+   /**
+     *  Fits the map to the bounds of the markers managed by the clusterer.
+     */
+   fitMapToMarkers(): void;
+   
+   /**
+     * Returns the value of the <code>gridSize</code> property.
+     *
+     * @return {number} The grid size.
+     */
+   getGridSize(): number;
+   
+   /**
+     * Sets the value of the <code>gridSize</code> property.
+     *
+     * @param {number} gridSize The grid size.
+     */
+   setGridSize(gridSize: number): void;
+   
+   /**
+     * Returns the value of the <code>minimumClusterSize</code> property.
+     *
+     * @return {number} The minimum cluster size.
+     */
+   getMinimumClusterSize(): number; 
+   
+   /**
+     * Sets the value of the <code>minimumClusterSize</code> property.
+     *
+     * @param {number} minimumClusterSize The minimum cluster size.
+     */
+   setMinimumClusterSize(minimumClusterSize: number): void;
+   
+   /**
+     *  Returns the value of the <code>maxZoom</code> property.
+     *
+     *  @return {number} The maximum zoom level.
+     */
+   getMaxZoom(): number;
+   
+   /**
+     *  Sets the value of the <code>maxZoom</code> property.
+     *
+     *  @param {number} maxZoom The maximum zoom level.
+     */
+   setMaxZoom(maxZoom: number): void; 
+   
+   /**
+     *  Returns the value of the <code>styles</code> property.
+     *
+     *  @return {Array} The array of styles defining the cluster markers to be used.
+     */
+   getStyles(): ClusterIconStyle[];
+   
+   /**
+     *  Sets the value of the <code>styles</code> property.
+     *
+     *  @param {Array.<ClusterIconStyle>} styles The array of styles to use.
+     */
+   setStyles(styles: ClusterIconStyle[]): void;
+   
+   /**
+     * Returns the value of the <code>title</code> property.
+     *
+     * @return {string} The content of the title text.
+     */
+   getTitle(): string;
+   
+   /**
+     *  Sets the value of the <code>title</code> property.
+     *
+     *  @param {string} title The value of the title property.
+     */
+   setTitle(title: string): void;
+   
+   /**
+     * Returns the value of the <code>zoomOnClick</code> property.
+     *
+     * @return {boolean} True if zoomOnClick property is set.
+     */
+   getZoomOnClick(): boolean;
+   
+   /**
+     *  Sets the value of the <code>zoomOnClick</code> property.
+     *
+     *  @param {boolean} zoomOnClick The value of the zoomOnClick property.
+     */
+   setZoomOnClick(zoomOnClick: boolean): void;
+   
+   /**
+     * Returns the value of the <code>averageCenter</code> property.
+     *
+     * @return {boolean} True if averageCenter property is set.
+     */
+   getAverageCenter(): boolean;
+   
+   /**
+     *  Sets the value of the <code>averageCenter</code> property.
+     *
+     *  @param {boolean} averageCenter The value of the averageCenter property.
+     */
+   setAverageCenter(averageCenter: boolean): void;
+   
+   /**
+     * Returns the value of the <code>ignoreHidden</code> property.
+     *
+     * @return {boolean} True if ignoreHidden property is set.
+     */
+   getIgnoreHidden(): boolean; 
+   
+   /**
+     * Sets the value of the <code>ignoreHidden</code> property.
+     *
+     * @param {boolean} ignoreHidden The value of the ignoreHidden property.
+     */
+   setIgnoreHidden(ignoreHidden: boolean): void;
+   
+   /**
+     * Returns the value of the <code>enableRetinaIcons</code> property.
+     *
+     * @return {boolean} True if enableRetinaIcons property is set.
+     */
+   getEnableRetinaIcons(): boolean;
+   
+   /**
+     * Sets the value of the <code>enableRetinaIcons</code> property.
+     *
+     * @param {boolean} enableRetinaIcons The value of the enableRetinaIcons property.
+     */
+   setEnableRetinaIcons(enableRetinaIcons: boolean): void;
+   
+   /**
+     * Returns the value of the <code>imageExtension</code> property.
+     *
+     * @return {string} The value of the imageExtension property.
+     */
+   getImageExtension(): string;
+   
+   /**
+     * Sets the value of the <code>imageExtension</code> property.
+     *
+     * @param {string} imageExtension The value of the imageExtension property.
+     */
+   setImageExtension(imageExtension: string): void;
+   
+   /**
+     * Returns the value of the <code>imagePath</code> property.
+     *
+     * @return {string} The value of the imagePath property.
+     */
+   getImagePath(): string;
+   
+   /**
+    * Sets the value of the <code>imagePath</code> property.
+    *
+    * @param {string} imagePath The value of the imagePath property.
+    */
+   setImagePath(imagePath: string): void;
+   
+   /**
+     * Returns the value of the <code>imageSizes</code> property.
+     *
+     * @return {Array} The value of the imageSizes property.
+     */
+   getImageSizes(): number[];
+   
+   /**
+     * Sets the value of the <code>imageSizes</code> property.
+     *
+     * @param {Array} imageSizes The value of the imageSizes property.
+     */
+   setImageSizes(imageSizes: number[]): void;
+   
+   /**
+     * Returns the value of the <code>calculator</code> property.
+     *
+     * @return {function} the value of the calculator property.
+     */  
+   getCalculator(): Function;  
+   
+   /**
+     * Sets the value of the <code>calculator</code> property.
+     *
+     * @param {function(Array.<google.maps.Marker>, number)} calculator The value
+     *  of the calculator property.
+     */
+   setCalculator(calculator: (marker: google.maps.Marker, value: number) => Function): void;
+   
+   /**
+     * Sets the value of the <code>hideLabel</code> property.
+     *
+     * @param {boolean} printable The value of the hideLabel property.
+     */
+   setHideLabel(printable: boolean): void;
+   
+   /**
+     * Returns the value of the <code>hideLabel</code> property.
+     *
+     * @return {boolean} the value of the hideLabel property.
+     */
+   getHideLabel(): boolean;
+   
+   /**
+     * Returns the value of the <code>batchSizeIE</code> property.
+     *
+     * @return {number} the value of the batchSizeIE property.
+     */
+   getBatchSizeIE(): number;
+    
+   /**
+     * Sets the value of the <code>batchSizeIE</code> property.
+     *
+     * @param {number} batchSizeIE The value of the batchSizeIE property.
+     */
+   setBatchSizeIE(batchSizeIE: number): void;
+   
+   /**
+     * Returns the value of the <code>clusterClass</code> property.
+     *
+     * @return {string} the value of the clusterClass property.
+     */
+   getClusterClass(): string;
+   
+   /**
+     * Sets the value of the <code>clusterClass</code> property.
+     *
+     * @param {string} clusterClass The value of the clusterClass property.
+     */
+   setClusterClass(clusterClass: string): void;  
+   
+   /**
+     * Returns the array of markers managed by the clusterer.
+     *
+     * @return {Array} The array of markers managed by the clusterer.
+     */
+    getMarkers(): google.maps.Marker[];
+    
+   /**
+     * Returns the number of markers managed by the clusterer.
+     *
+     * @return {number} The number of markers.
+     */
+   getTotalMarkers(): number;
+   
+   /**
+     * Returns the current array of clusters formed by the clusterer.
+     *
+     * @return {Array} The array of clusters formed by the clusterer.
+     */
+   getClusters(): Cluster[];
+   
+   /**
+     * Returns the number of clusters formed by the clusterer.
+     *
+     * @return {number} The number of clusters formed by the clusterer.
+     */
+   getTotalClusters(): number;
+   
+   /**
+     * Adds a marker to the clusterer. The clusters are redrawn unless
+     * <code>opt_nodraw</code> is set to <code>true</code>.
+     *
+     * @param {google.maps.Marker} marker The marker to add.
+     * @param {boolean} [opt_nodraw] Set to <code>true</code> to prevent redrawing.
+     */
+   addMarker(marker: google.maps.Marker, opt_nodraw: boolean): void;
+    
+   /**
+     * Adds an array of markers to the clusterer. The clusters are redrawn unless
+     * <code>opt_nodraw</code> is set to <code>true</code>.
+     *
+     * @param {Array.<google.maps.Marker>} markers The markers to add.
+     * @param {boolean} [opt_nodraw] Set to <code>true</code> to prevent redrawing.
+     */
+   addMarkers(markers: google.maps.Marker[], opt_nodraw: boolean): void;
+   
+   /**
+     * Pushes a marker to the clusterer.
+     *
+     * @param {google.maps.Marker} marker The marker to add.
+     */
+   pushMarkerTo_(marker: google.maps.Marker): void;
+   
+   /**
+     * Removes a marker from the cluster and map.  The clusters are redrawn unless
+     * <code>opt_nodraw</code> is set to <code>true</code>. Returns <code>true</code> if the
+     * marker was removed from the clusterer.
+     *
+     * @param {google.maps.Marker} marker The marker to remove.
+     * @param {boolean} [opt_nodraw] Set to <code>true</code> to prevent redrawing.
+     * @param {boolean} [opt_noMapRemove] Set to <code>true</code> to prevent removal from map but still removing from cluster management
+     * @return {boolean} True if the marker was removed from the clusterer.
+     */
+   removeMarker(marker: google.maps.Marker, opt_nodraw: boolean, noMapRemove: boolean): boolean;
+   
+   /**
+     * Removes an array of markers from the cluster and map. The clusters are redrawn unless
+     * <code>opt_nodraw</code> is set to <code>true</code>. Returns <code>true</code> if markers
+     * were removed from the clusterer.
+     *
+     * @param {Array.<google.maps.Marker>} markers The markers to remove.
+     * @param {boolean} [opt_nodraw] Set to <code>true</code> to prevent redrawing.
+     * @param {boolean} [opt_noMapRemove] Set to <code>true</code> to prevent removal from map but still removing from cluster management
+     * @return {boolean} True if markers were removed from the clusterer.
+     */
+   removeMarkers(markers: google.maps.Marker[], opt_nodraw: boolean, opt_noMapRemove: boolean): boolean;
+   
+   /**
+     * Removes a marker and returns true if removed, false if not.
+     *
+     * @param {google.maps.Marker} marker The marker to remove
+     * @param {boolean} removeFromMap set to <code>true</code> to explicitly remove from map as well as cluster manangement
+     * @return {boolean} Whether the marker was removed or not
+     */
+   removeMarker_(marker: google.maps.Marker, removeFromMap: boolean): boolean;
+   
+   /**
+     * Removes all clusters and markers from the map and also removes all markers
+     * managed by the clusterer.
+     */
+   clearMarkers(): void;
+   
+   /**
+     * Recalculates and redraws all the marker clusters from scratch.
+     * Call this after changing any properties.
+     */
+   repaint(): void;
+   
+   /**
+     * Returns the current bounds extended by the grid size.
+     *
+     * @param {google.maps.LatLngBounds} bounds The bounds to extend.
+     * @return {google.maps.LatLngBounds} The extended bounds.
+     * @ignore
+     */
+   getExtendedBounds(bounds: google.maps.LatLngBounds): google.maps.LatLngBounds;
+   
+   /**
+     * Redraws all the clusters.
+     */
+   redraw_(): void;
+   
+   /**
+     * Removes all clusters from the map. The markers are also removed from the map
+     * if <code>opt_hide</code> is set to <code>true</code>.
+     *
+     * @param {boolean} [opt_hide] Set to <code>true</code> to also remove the markers
+     *      from the map.
+     */
+   resetViewport_(opt_hide: boolean): void;
+   
+   /**
+     * Calculates the distance between two latlng locations in km.
+     *
+     * @param {google.maps.LatLng} p1 The first lat lng point.
+     * @param {google.maps.LatLng} p2 The second lat lng point.
+     * @return {number} The distance between the two points in km.
+     * @see http://www.movable-type.co.uk/scripts/latlong.html
+    */
+   distanceBetweenPoints_(p1: google.maps.LatLng, p2: google.maps.LatLng): number;
+   
+   /**
+     * Determines if a marker is contained in a bounds.
+     *
+     * @param {google.maps.Marker} marker The marker to check.
+     * @param {google.maps.LatLngBounds} bounds The bounds to check against.
+     * @return {boolean} True if the marker is in the bounds.
+     */
+   isMarkerInBounds_(marker: google.maps.Marker, bounds: google.maps.LatLngBounds): boolean;
+   
+   /**
+     * Adds a marker to a cluster, or creates a new cluster.
+     *
+     * @param {google.maps.Marker} marker The marker to add.
+     */
+   addToClosestCluster_(marker: google.maps.Marker): void;
+   
+   /**
+     * Creates the clusters. This is done in batches to avoid timeout errors
+     * in some browsers when there is a huge number of markers.
+     *
+     * @param {number} iFirst The index of the first marker in the batch of
+     *      markers to be added to clusters.
+     */
+   createClusters_(iFirst: number): void;
+   
+   /**
+     * Extends an object's prototype by another's.
+     *
+     * @param {Object} obj1 The object to be extended.
+     * @param {Object} obj2 The object to extend with.
+     * @return {Object} The new extended object.
+     * @ignore
+     */
+   extend(obj1: Object, obj2: Object): Object;
+   
+   /**
+     * The default function for determining the label text and style
+     * for a cluster icon.
+     *
+     * @param {Array.<google.maps.Marker>} markers The array of markers represented by the cluster.
+     * @param {number} numStyles The number of marker styles available.
+     * @return {ClusterIconInfo} The information resource for the cluster.
+     * @constant
+     * @ignore
+     */
+   CALCULATOR(markers: google.maps.Marker[], numStyles: number): ClusterIconInfo;
+   
+   /**
+     * The number of markers to process in one batch.
+     *
+     * @type {number}
+     * @constant
+     */
+   BATCH_SIZE: number;
+   
+   /**
+     * The number of markers to process in one batch (IE only).
+     *
+     * @type {number}
+     * @constant
+     */
+   BATCH_SIZE_IE: number;
+   
+   /**
+     * The default root name for the marker cluster images.
+     *
+     * @type {string}
+     * @constant
+     */
+   IMAGE_PATH: string;
+   
+   /**
+     * The default extension name for the marker cluster images.
+     *
+     * @type {string}
+     * @constant
+     */
+   IMAGE_EXTENSION: string;
+   
+   /**
+     * The default array of sizes for the marker cluster images.
+     *
+     * @type {Array.<number>}
+     * @constant
+     */
+   IMAGE_SIZES: number[];
+   
+}
+
+declare var MarkerClusterer: MarkerClusterer;
+ 
+interface String {
+   trim(): string;
+}
diff --git a/markerclustererplus/markerclustererplus-tests.ts b/markerclustererplus/markerclustererplus-tests.ts
index 4c3954ae86..ccdbd72f98 100644
--- a/markerclustererplus/markerclustererplus-tests.ts
+++ b/markerclustererplus/markerclustererplus-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="../googlemaps/google.maps.d.ts" />
-/// <reference path="markerclustererplus.d.ts" />
-
 namespace MarkerClusterApp {
     export function simple_test() {
         var center = new google.maps.LatLng(37.4419, -122.1419);
diff --git a/markerclustererplus/markerclustererplus.d.ts b/markerclustererplus/markerclustererplus.d.ts
deleted file mode 100644
index 00d59c58a4..0000000000
--- a/markerclustererplus/markerclustererplus.d.ts
+++ /dev/null
@@ -1,869 +0,0 @@
-// Type definitions for MarkerClustererPlus for Google Maps V3 2.1.1
-// Project: http://github.com/mahnunchik/markerclustererplus
-// Definitions by: Mathias Rodriguez <http://github.com/enanox>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../googlemaps/google.maps.d.ts" />
-
-/**
- * This class represents the object for values in the <code>styles</code> array passed
- * to the {@link MarkerClusterer} constructor. The element in this array that is used to
- * style the cluster icon is determined by calling the <code>calculator</code> function.
- */
-declare interface ClusterIconStyle {
-    /** The URL of the cluster icon image file. Required. */
-    url: string;
-    /** Height The display height (in pixels) of the cluster icon. Required. */
-    height: number;
-    /** Width The display width (in pixels) of the cluster icon. Required. */
-    width: number;
-    /**
-     * [anchorText] The position (in pixels) from the center of the cluster icon to
-     * where the text label is to be centered and drawn. The format is <code>[yoffset, xoffset]</code>
-     * where <code>yoffset</code> increases as you go down from center and <code>xoffset</code>
-     * increases to the right of center. The default is <code>[0, 0]</code>.
-     */
-    anchorText?: number[];
-    /**
-     * [anchorIcon] The anchor position (in pixels) of the cluster icon. This is the
-     * spot on the cluster icon that is to be aligned with the cluster position. The format is
-     * <code>[yoffset, xoffset]</code> where <code>yoffset</code> increases as you go down and
-     * <code>xoffset</code> increases to the right of the top-left corner of the icon. The default
-     * anchor position is the center of the cluster icon.
-     */
-    anchorIcon?: number[];
-    /** [textColor="black"] The color of the label text shown on the cluster icon. */
-    textColor?: string;
-    /** textSize=11] The size (in pixels) of the label text shown on the cluster icon. */
-    textSize?: number;
-    /**
-     * [textDecoration="none"] The value of the CSS <code>text-decoration</code>
-     * property for the label text shown on the cluster icon.
-     */
-    textDecoration?: string;
-    /** [fontWeight="bold"] The value of the CSS <code>font-weight</code>
-     * property for the label text shown on the cluster icon.
-     */
-    fontWeight?: string;
-    /** 
-     * [fontStyle="normal"] The value of the CSS <code>font-style</code>
-     *  property for the label text shown on the cluster icon.
-     */
-    fontStyle?: string;
-    /**
-     * [fontFamily="Arial,sans-serif"] The value of the CSS <code>font-family</code>
-     *  property for the label text shown on the cluster icon.
-     */
-    fontFamily?: string;
-    /**
-     * [backgroundPosition="0 0"] The position of the cluster icon image
-     * within the image defined by <code>url</code>. The format is <code>"xpos ypos"</code>
-     * (the same format as for the CSS <code>background-position</code> property). You must set
-     * this property appropriately when the image defined by <code>url</code> represents a sprite
-     * containing multiple images. Note that the position <i>must</i> be specified in px units.
-     */
-    backgroundPosition?: string;    
-}
-
-/**
- * @name ClusterIconInfo
- * @class This class is an object containing general information about a cluster icon. This is
- *      the object that a <code>calculator</code> function returns.
- *
- * @property {string} text The text of the label to be shown on the cluster icon.
- * @property {number} index The index plus 1 of the element in the <code>styles</code>
- *      array to be used to style the cluster icon.
- * @property {string} title The tooltip to display when the mouse moves over the cluster icon.
- *      If this value is <code>undefined</code> or <code>""</code>, <code>title</code> is set to the
- *      value of the <code>title</code> property passed to the MarkerClusterer.
- */
-
-declare class ClusterIconInfo extends google.maps.OverlayView {
-   text: string;
-   index: number;
-   title: string;
-   /**
-    * A cluster icon.
-    *
-    * @constructor
-    * @extends google.maps.OverlayView
-    * @param {Cluster} cluster The cluster with which the icon is to be associated.
-    * @param {Array} [styles] An array of {@link ClusterIconStyle} defining the cluster icons
-    *       to use for various cluster sizes.
-    * @private
-    */
-   constructor(cluster: Cluster, styles: ClusterIconStyle[]);
-   
-   /**
-    * Adds the icon to the DOM.
-    */
-   onAdd(): void;
-   
-   /**
-    * Removes the icon from the DOM.
-    */
-   onRemove(): void;
-   
-   /**
-    * Draws the icon.
-    */
-   draw(): void;
-   
-   /**
-    * Hides the icon.
-    */
-   hide(): void;
-   
-   /**
-    * Positions and shows the icon.
-    */
-   show(): void;
-   
-   /**
-    * Sets the icon styles to the appropriate element in the styles array.
-    *
-    * @param {ClusterIconInfo} sums The icon label text and styles index.
-    */
-   useStyle(sums: ClusterIconInfo[]): void;
-   
-   /**
-    * Sets the position at which to center the icon.
-    *
-    * @param {google.maps.LatLng} center The latlng to set as the center.
-    */
-   setCenter(center: google.maps.LatLng): void;
-   
-   /**
-    * Creates the cssText style parameter based on the position of the icon.
-    *
-    * @param {google.maps.Point} pos The position of the icon.
-    * @return {string} The CSS style text.
-    */
-   createCss(pos: google.maps.Point): string;
-   
-   /**
-    * Returns the position at which to place the DIV depending on the latlng.
-    *
-    * @param {google.maps.LatLng} latlng The position in latlng.
-    * @return {google.maps.Point} The position in pixels.
-   */
-   getPosFromLatLng_(latLng: google.maps.LatLng): google.maps.Point;
-}
- 
-interface Cluster {
-   /**
-    * Creates a single cluster that manages a group of proximate markers.
-    * Used internally, do not call this constructor directly.
-    * @constructor
-    * @param {MarkerClusterer} mc The <code>MarkerClusterer</code> object with which this
-    *       cluster is associated.
-    */
-   new (mc: MarkerClusterer): Cluster;
-   
-   /**
-    * Returns the number of markers managed by the cluster. You can call this from
-    * a <code>click</code>, <code>mouseover</code>, or <code>mouseout</code> event handler
-    * for the <code>MarkerClusterer</code> object.
-    *
-    * @return {number} The number of markers in the cluster.
-    */
-   getSize(): number;
-   
-   /**
-    * Returns the array of markers managed by the cluster. You can call this from
-    * a <code>click</code>, <code>mouseover</code>, or <code>mouseout</code> event handler
-    * for the <code>MarkerClusterer</code> object.
-    *
-    * @return {Array} The array of markers in the cluster.
-    */
-   getMarkers(): google.maps.Marker[];
-   
-   /**
-     * Returns the center of the cluster. You can call this from
-     * a <code>click</code>, <code>mouseover</code>, or <code>mouseout</code> event handler
-     * for the <code>MarkerClusterer</code> object.
-     *
-     * @return {google.maps.LatLng} The center of the cluster.
-     */
-   getCenter(): google.maps.LatLng;
-   
-   /**
-     * Returns the map with which the cluster is associated.
-     *
-     * @return {google.maps.Map} The map.
-     * @ignore
-     */
-   getMap(): google.maps.Map;
-   
-   /**
-     * Returns the <code>MarkerClusterer</code> object with which the cluster is associated.
-     *
-     * @return {MarkerClusterer} The associated marker clusterer.
-     * @ignore
-     */
-   getMarkerClusterer(): MarkerClusterer;
-    
-   /**
-     * Returns the bounds of the cluster.
-     *
-     * @return {google.maps.LatLngBounds} the cluster bounds.
-     * @ignore
-     */
-   getBounds(): google.maps.LatLngBounds;
-    
-   /**
-     * Removes the cluster from the map.
-     *
-     * @ignore
-     */
-   remove(): void;
-    
-   /**
-     * Adds a marker to the cluster.
-     *
-     * @param {google.maps.Marker} marker The marker to be added.
-     * @return {boolean} True if the marker was added.
-     * @ignore
-     */
-   addMarker(marker: google.maps.Marker): boolean;
-   
-   /**
-     * Determines if a marker lies within the cluster's bounds.
-     *
-     * @param {google.maps.Marker} marker The marker to check.
-     * @return {boolean} True if the marker lies in the bounds.
-     * @ignore
-     */
-   isMarkerInClusterBounds(marker: google.maps.Marker): boolean;
-   
-   /**
-     * Calculates the extended bounds of the cluster with the grid.
-     */
-   calculateBounds_(): void;
-   
-   /**
-     * Updates the cluster icon.
-     */
-   updateIcon_(): void;
-   
-   /**
-     * Determines if a marker has already been added to the cluster.
-     *
-     * @param {google.maps.Marker} marker The marker to check.
-     * @return {boolean} True if the marker has already been added.
-     */
-   isMarkerAlreadyAdded_(marker: google.maps.Marker): boolean;    
-}
-
-/**
- * Optional parameter passed to the {@link MarkerClusterer} constructor.
- */
-interface MarkerClustererOptions {
-   /** [gridSize=60] The grid size of a cluster in pixels. The grid is a square. */
-   gridSize?: number;
-   /** [maxZoom=null] The maximum zoom level at which clustering is enabled or 
-    * <code>null</code> if clustering is to be enabled at all zoom levels.
-    */
-   maxZoom?: number;
-   /**
-    * [zoomOnClick=true] Whether to zoom the map when a cluster marker is
-    * clicked. You may want to set this to <code>false</code> if you have installed a handler
-    * for the <code>click</code> event and it deals with zooming on its own.
-    */
-   zoomOnClick?: boolean;
-   /**
-    * [averageCenter=false] Whether the position of a cluster marker should be
-    * the average position of all markers in the cluster. If set to <code>false</code>, the
-    * cluster marker is positioned at the location of the first marker added to the cluster.
-    */
-   averageCenter?: boolean;
-   /**
-    * [minimumClusterSize=2] The minimum number of markers needed in a cluster
-    * before the markers are hidden and a cluster marker appears.
-    */
-   minimumClusterSize?: number;
-   /**
-    * [ignoreHidden=false] Whether to ignore hidden markers in clusters. You
-    * may want to set this to <code>true</code> to ensure that hidden markers are not included
-    * in the marker count that appears on a cluster marker (this count is the value of the
-    * <code>text</code> property of the result returned by the default <code>calculator</code>).
-    * If set to <code>true</code> and you change the visibility of a marker being clustered, be
-    * sure to also call <code>MarkerClusterer.repaint()</code>.
-    */
-   ignoreHidden?: boolean;
-   /**
-    * [title=""] The tooltip to display when the mouse moves over a cluster
-    * marker. (Alternatively, you can use a custom <code>calculator</code> function to specify a
-    * different tooltip for each cluster marker.)
-    */
-   title?: string;
-   /**
-    * [calculator=MarkerClusterer.CALCULATOR] The function used to determine
-    * the text to be displayed on a cluster marker and the index indicating which style to use
-    * for the cluster marker. The input parameters for the function are (1) the array of markers
-    * represented by a cluster marker and (2) the number of cluster icon styles. It returns a
-    * {@link ClusterIconInfo} object. The default <code>calculator</code> returns a
-    * <code>text</code> property which is the number of markers in the cluster and an
-    * <code>index</code> property which is one higher than the lowest integer such that
-    * <code>10^i</code> exceeds the number of markers in the cluster, or the size of the styles
-    * array, whichever is less. The <code>styles</code> array element used has an index of
-    * <code>index</code> minus 1. For example, the default <code>calculator</code> returns a
-    * <code>text</code> value of <code>"125"</code> and an <code>index</code> of <code>3</code>
-    * for a cluster icon representing 125 markers so the element used in the <code>styles</code>
-    * array is <code>2</code>. A <code>calculator</code> may also return a <code>title</code>
-    * property that contains the text of the tooltip to be used for the cluster marker. If
-    * <code>title</code> is not defined, the tooltip is set to the value of the <code>title</code>
-    * property for the MarkerClusterer.
-    */
-   calculator?: (markers: google.maps.Marker[], clusterIconStylesCount: number) => ClusterIconInfo;
-   /**
-   * [clusterClass="cluster"] The name of the CSS class defining general styles
-   * for the cluster markers. Use this class to define CSS styles that are not set up by the code
-   * that processes the <code>styles</code> array.
-   */
-   clusterClass?: string;
-   /**
-    *[styles] An array of {@link ClusterIconStyle} elements defining the styles
-    * of the cluster markers to be used. The element to be used to style a given cluster marker
-    * is determined by the function defined by the <code>calculator</code> property.
-    * The default is an array of {@link ClusterIconStyle} elements whose properties are derived
-    * from the values for <code>imagePath</code>, <code>imageExtension</code>, and
-    * <code>imageSizes</code>.
-    */
-   styles?: ClusterIconStyle[];
-   /**
-    * [enableRetinaIcons=false] Whether to allow the use of cluster icons that
-    * have sizes that are some multiple (typically double) of their actual display size. Icons such
-    * as these look better when viewed on high-resolution monitors such as Apple's Retina displays.
-    * Note: if this property is <code>true</code>, sprites cannot be used as cluster icons.
-    */
-   enableRetinaIcons?: boolean;
-   /**
-    * [batchSize=MarkerClusterer.BATCH_SIZE] Set this property to the
-    * number of markers to be processed in a single batch when using a browser other than
-    * Internet Explorer (for Internet Explorer, use the batchSizeIE property instead).
-    */
-   batchSize?: number;
-   /** 
-    * [batchSizeIE=MarkerClusterer.BATCH_SIZE_IE] When Internet Explorer is
-    * being used, markers are processed in several batches with a small delay inserted between
-    * each batch in an attempt to avoid Javascript timeout errors. Set this property to the
-    * number of markers to be processed in a single batch; select as high a number as you can
-    * without causing a timeout error in the browser. This number might need to be as low as 100
-    * if 15,000 markers are being managed, for example.
-    */
-   batchSizeIE?: number;
-   /**
-    * [imagePath=MarkerClusterer.IMAGE_PATH]
-    * The full URL of the root name of the group of image files to use for cluster icons.
-    * The complete file name is of the form <code>imagePath</code>n.<code>imageExtension</code>
-    * where n is the image file number (1, 2, etc.).
-    */
-   imagePath?: string;
-   /**
-    * [imageExtension=MarkerClusterer.IMAGE_EXTENSION]
-    * The extension name for the cluster icon image files (e.g., <code>"png"</code> or
-    * <code>"jpg"</code>).
-    */
-   imageExtension?: string;
-   /**
-    * [imageSizes=MarkerClusterer.IMAGE_SIZES]
-    * An array of numbers containing the widths of the group of
-    * <code>imagePath</code>n.<code>imageExtension</code> image files.
-    * (The images are assumed to be square.)
-    */
-   imageSizes?: number[];
-}
-
-interface MarkerClusterer extends google.maps.OverlayView {
-   /**
-     * Creates a MarkerClusterer object with the options specified in {@link MarkerClustererOptions}.
-     * @constructor
-     * @extends google.maps.OverlayView
-     * @param {google.maps.Map} map The Google map to attach to.
-     * @param {Array.<google.maps.Marker>} [opt_markers] The markers to be added to the cluster.
-     * @param {MarkerClustererOptions} [opt_options] The optional parameters.
-     */
-   new (map: google.maps.Map, opt_markers: google.maps.Marker[], opt_options?: MarkerClustererOptions): MarkerClusterer;
-   
-   /**
-     * Implementation of the onAdd interface method.
-     * @ignore
-     */
-   onAdd(): void; 
-   
-   /**
-     * Implementation of the onRemove interface method.
-     * Removes map event listeners and all cluster icons from the DOM.
-     * All managed markers are also put back on the map.
-     * @ignore
-     */
-   onRemove(): void;
-   
-   /**
-     * Implementation of the draw interface method.
-     * @ignore
-     */
-   draw(): void;
-   
-   /**
-     * Sets up the styles object.
-     */
-   setupStyles_(): void;
-   
-   /**
-     *  Fits the map to the bounds of the markers managed by the clusterer.
-     */
-   fitMapToMarkers(): void;
-   
-   /**
-     * Returns the value of the <code>gridSize</code> property.
-     *
-     * @return {number} The grid size.
-     */
-   getGridSize(): number;
-   
-   /**
-     * Sets the value of the <code>gridSize</code> property.
-     *
-     * @param {number} gridSize The grid size.
-     */
-   setGridSize(gridSize: number): void;
-   
-   /**
-     * Returns the value of the <code>minimumClusterSize</code> property.
-     *
-     * @return {number} The minimum cluster size.
-     */
-   getMinimumClusterSize(): number; 
-   
-   /**
-     * Sets the value of the <code>minimumClusterSize</code> property.
-     *
-     * @param {number} minimumClusterSize The minimum cluster size.
-     */
-   setMinimumClusterSize(minimumClusterSize: number): void;
-   
-   /**
-     *  Returns the value of the <code>maxZoom</code> property.
-     *
-     *  @return {number} The maximum zoom level.
-     */
-   getMaxZoom(): number;
-   
-   /**
-     *  Sets the value of the <code>maxZoom</code> property.
-     *
-     *  @param {number} maxZoom The maximum zoom level.
-     */
-   setMaxZoom(maxZoom: number): void; 
-   
-   /**
-     *  Returns the value of the <code>styles</code> property.
-     *
-     *  @return {Array} The array of styles defining the cluster markers to be used.
-     */
-   getStyles(): ClusterIconStyle[];
-   
-   /**
-     *  Sets the value of the <code>styles</code> property.
-     *
-     *  @param {Array.<ClusterIconStyle>} styles The array of styles to use.
-     */
-   setStyles(styles: ClusterIconStyle[]): void;
-   
-   /**
-     * Returns the value of the <code>title</code> property.
-     *
-     * @return {string} The content of the title text.
-     */
-   getTitle(): string;
-   
-   /**
-     *  Sets the value of the <code>title</code> property.
-     *
-     *  @param {string} title The value of the title property.
-     */
-   setTitle(title: string): void;
-   
-   /**
-     * Returns the value of the <code>zoomOnClick</code> property.
-     *
-     * @return {boolean} True if zoomOnClick property is set.
-     */
-   getZoomOnClick(): boolean;
-   
-   /**
-     *  Sets the value of the <code>zoomOnClick</code> property.
-     *
-     *  @param {boolean} zoomOnClick The value of the zoomOnClick property.
-     */
-   setZoomOnClick(zoomOnClick: boolean): void;
-   
-   /**
-     * Returns the value of the <code>averageCenter</code> property.
-     *
-     * @return {boolean} True if averageCenter property is set.
-     */
-   getAverageCenter(): boolean;
-   
-   /**
-     *  Sets the value of the <code>averageCenter</code> property.
-     *
-     *  @param {boolean} averageCenter The value of the averageCenter property.
-     */
-   setAverageCenter(averageCenter: boolean): void;
-   
-   /**
-     * Returns the value of the <code>ignoreHidden</code> property.
-     *
-     * @return {boolean} True if ignoreHidden property is set.
-     */
-   getIgnoreHidden(): boolean; 
-   
-   /**
-     * Sets the value of the <code>ignoreHidden</code> property.
-     *
-     * @param {boolean} ignoreHidden The value of the ignoreHidden property.
-     */
-   setIgnoreHidden(ignoreHidden: boolean): void;
-   
-   /**
-     * Returns the value of the <code>enableRetinaIcons</code> property.
-     *
-     * @return {boolean} True if enableRetinaIcons property is set.
-     */
-   getEnableRetinaIcons(): boolean;
-   
-   /**
-     * Sets the value of the <code>enableRetinaIcons</code> property.
-     *
-     * @param {boolean} enableRetinaIcons The value of the enableRetinaIcons property.
-     */
-   setEnableRetinaIcons(enableRetinaIcons: boolean): void;
-   
-   /**
-     * Returns the value of the <code>imageExtension</code> property.
-     *
-     * @return {string} The value of the imageExtension property.
-     */
-   getImageExtension(): string;
-   
-   /**
-     * Sets the value of the <code>imageExtension</code> property.
-     *
-     * @param {string} imageExtension The value of the imageExtension property.
-     */
-   setImageExtension(imageExtension: string): void;
-   
-   /**
-     * Returns the value of the <code>imagePath</code> property.
-     *
-     * @return {string} The value of the imagePath property.
-     */
-   getImagePath(): string;
-   
-   /**
-    * Sets the value of the <code>imagePath</code> property.
-    *
-    * @param {string} imagePath The value of the imagePath property.
-    */
-   setImagePath(imagePath: string): void;
-   
-   /**
-     * Returns the value of the <code>imageSizes</code> property.
-     *
-     * @return {Array} The value of the imageSizes property.
-     */
-   getImageSizes(): number[];
-   
-   /**
-     * Sets the value of the <code>imageSizes</code> property.
-     *
-     * @param {Array} imageSizes The value of the imageSizes property.
-     */
-   setImageSizes(imageSizes: number[]): void;
-   
-   /**
-     * Returns the value of the <code>calculator</code> property.
-     *
-     * @return {function} the value of the calculator property.
-     */  
-   getCalculator(): Function;  
-   
-   /**
-     * Sets the value of the <code>calculator</code> property.
-     *
-     * @param {function(Array.<google.maps.Marker>, number)} calculator The value
-     *  of the calculator property.
-     */
-   setCalculator(calculator: (marker: google.maps.Marker, value: number) => Function): void;
-   
-   /**
-     * Sets the value of the <code>hideLabel</code> property.
-     *
-     * @param {boolean} printable The value of the hideLabel property.
-     */
-   setHideLabel(printable: boolean): void;
-   
-   /**
-     * Returns the value of the <code>hideLabel</code> property.
-     *
-     * @return {boolean} the value of the hideLabel property.
-     */
-   getHideLabel(): boolean;
-   
-   /**
-     * Returns the value of the <code>batchSizeIE</code> property.
-     *
-     * @return {number} the value of the batchSizeIE property.
-     */
-   getBatchSizeIE(): number;
-    
-   /**
-     * Sets the value of the <code>batchSizeIE</code> property.
-     *
-     * @param {number} batchSizeIE The value of the batchSizeIE property.
-     */
-   setBatchSizeIE(batchSizeIE: number): void;
-   
-   /**
-     * Returns the value of the <code>clusterClass</code> property.
-     *
-     * @return {string} the value of the clusterClass property.
-     */
-   getClusterClass(): string;
-   
-   /**
-     * Sets the value of the <code>clusterClass</code> property.
-     *
-     * @param {string} clusterClass The value of the clusterClass property.
-     */
-   setClusterClass(clusterClass: string): void;  
-   
-   /**
-     * Returns the array of markers managed by the clusterer.
-     *
-     * @return {Array} The array of markers managed by the clusterer.
-     */
-    getMarkers(): google.maps.Marker[];
-    
-   /**
-     * Returns the number of markers managed by the clusterer.
-     *
-     * @return {number} The number of markers.
-     */
-   getTotalMarkers(): number;
-   
-   /**
-     * Returns the current array of clusters formed by the clusterer.
-     *
-     * @return {Array} The array of clusters formed by the clusterer.
-     */
-   getClusters(): Cluster[];
-   
-   /**
-     * Returns the number of clusters formed by the clusterer.
-     *
-     * @return {number} The number of clusters formed by the clusterer.
-     */
-   getTotalClusters(): number;
-   
-   /**
-     * Adds a marker to the clusterer. The clusters are redrawn unless
-     * <code>opt_nodraw</code> is set to <code>true</code>.
-     *
-     * @param {google.maps.Marker} marker The marker to add.
-     * @param {boolean} [opt_nodraw] Set to <code>true</code> to prevent redrawing.
-     */
-   addMarker(marker: google.maps.Marker, opt_nodraw: boolean): void;
-    
-   /**
-     * Adds an array of markers to the clusterer. The clusters are redrawn unless
-     * <code>opt_nodraw</code> is set to <code>true</code>.
-     *
-     * @param {Array.<google.maps.Marker>} markers The markers to add.
-     * @param {boolean} [opt_nodraw] Set to <code>true</code> to prevent redrawing.
-     */
-   addMarkers(markers: google.maps.Marker[], opt_nodraw: boolean): void;
-   
-   /**
-     * Pushes a marker to the clusterer.
-     *
-     * @param {google.maps.Marker} marker The marker to add.
-     */
-   pushMarkerTo_(marker: google.maps.Marker): void;
-   
-   /**
-     * Removes a marker from the cluster and map.  The clusters are redrawn unless
-     * <code>opt_nodraw</code> is set to <code>true</code>. Returns <code>true</code> if the
-     * marker was removed from the clusterer.
-     *
-     * @param {google.maps.Marker} marker The marker to remove.
-     * @param {boolean} [opt_nodraw] Set to <code>true</code> to prevent redrawing.
-     * @param {boolean} [opt_noMapRemove] Set to <code>true</code> to prevent removal from map but still removing from cluster management
-     * @return {boolean} True if the marker was removed from the clusterer.
-     */
-   removeMarker(marker: google.maps.Marker, opt_nodraw: boolean, noMapRemove: boolean): boolean;
-   
-   /**
-     * Removes an array of markers from the cluster and map. The clusters are redrawn unless
-     * <code>opt_nodraw</code> is set to <code>true</code>. Returns <code>true</code> if markers
-     * were removed from the clusterer.
-     *
-     * @param {Array.<google.maps.Marker>} markers The markers to remove.
-     * @param {boolean} [opt_nodraw] Set to <code>true</code> to prevent redrawing.
-     * @param {boolean} [opt_noMapRemove] Set to <code>true</code> to prevent removal from map but still removing from cluster management
-     * @return {boolean} True if markers were removed from the clusterer.
-     */
-   removeMarkers(markers: google.maps.Marker[], opt_nodraw: boolean, opt_noMapRemove: boolean): boolean;
-   
-   /**
-     * Removes a marker and returns true if removed, false if not.
-     *
-     * @param {google.maps.Marker} marker The marker to remove
-     * @param {boolean} removeFromMap set to <code>true</code> to explicitly remove from map as well as cluster manangement
-     * @return {boolean} Whether the marker was removed or not
-     */
-   removeMarker_(marker: google.maps.Marker, removeFromMap: boolean): boolean;
-   
-   /**
-     * Removes all clusters and markers from the map and also removes all markers
-     * managed by the clusterer.
-     */
-   clearMarkers(): void;
-   
-   /**
-     * Recalculates and redraws all the marker clusters from scratch.
-     * Call this after changing any properties.
-     */
-   repaint(): void;
-   
-   /**
-     * Returns the current bounds extended by the grid size.
-     *
-     * @param {google.maps.LatLngBounds} bounds The bounds to extend.
-     * @return {google.maps.LatLngBounds} The extended bounds.
-     * @ignore
-     */
-   getExtendedBounds(bounds: google.maps.LatLngBounds): google.maps.LatLngBounds;
-   
-   /**
-     * Redraws all the clusters.
-     */
-   redraw_(): void;
-   
-   /**
-     * Removes all clusters from the map. The markers are also removed from the map
-     * if <code>opt_hide</code> is set to <code>true</code>.
-     *
-     * @param {boolean} [opt_hide] Set to <code>true</code> to also remove the markers
-     *      from the map.
-     */
-   resetViewport_(opt_hide: boolean): void;
-   
-   /**
-     * Calculates the distance between two latlng locations in km.
-     *
-     * @param {google.maps.LatLng} p1 The first lat lng point.
-     * @param {google.maps.LatLng} p2 The second lat lng point.
-     * @return {number} The distance between the two points in km.
-     * @see http://www.movable-type.co.uk/scripts/latlong.html
-    */
-   distanceBetweenPoints_(p1: google.maps.LatLng, p2: google.maps.LatLng): number;
-   
-   /**
-     * Determines if a marker is contained in a bounds.
-     *
-     * @param {google.maps.Marker} marker The marker to check.
-     * @param {google.maps.LatLngBounds} bounds The bounds to check against.
-     * @return {boolean} True if the marker is in the bounds.
-     */
-   isMarkerInBounds_(marker: google.maps.Marker, bounds: google.maps.LatLngBounds): boolean;
-   
-   /**
-     * Adds a marker to a cluster, or creates a new cluster.
-     *
-     * @param {google.maps.Marker} marker The marker to add.
-     */
-   addToClosestCluster_(marker: google.maps.Marker): void;
-   
-   /**
-     * Creates the clusters. This is done in batches to avoid timeout errors
-     * in some browsers when there is a huge number of markers.
-     *
-     * @param {number} iFirst The index of the first marker in the batch of
-     *      markers to be added to clusters.
-     */
-   createClusters_(iFirst: number): void;
-   
-   /**
-     * Extends an object's prototype by another's.
-     *
-     * @param {Object} obj1 The object to be extended.
-     * @param {Object} obj2 The object to extend with.
-     * @return {Object} The new extended object.
-     * @ignore
-     */
-   extend(obj1: Object, obj2: Object): Object;
-   
-   /**
-     * The default function for determining the label text and style
-     * for a cluster icon.
-     *
-     * @param {Array.<google.maps.Marker>} markers The array of markers represented by the cluster.
-     * @param {number} numStyles The number of marker styles available.
-     * @return {ClusterIconInfo} The information resource for the cluster.
-     * @constant
-     * @ignore
-     */
-   CALCULATOR(markers: google.maps.Marker[], numStyles: number): ClusterIconInfo;
-   
-   /**
-     * The number of markers to process in one batch.
-     *
-     * @type {number}
-     * @constant
-     */
-   BATCH_SIZE: number;
-   
-   /**
-     * The number of markers to process in one batch (IE only).
-     *
-     * @type {number}
-     * @constant
-     */
-   BATCH_SIZE_IE: number;
-   
-   /**
-     * The default root name for the marker cluster images.
-     *
-     * @type {string}
-     * @constant
-     */
-   IMAGE_PATH: string;
-   
-   /**
-     * The default extension name for the marker cluster images.
-     *
-     * @type {string}
-     * @constant
-     */
-   IMAGE_EXTENSION: string;
-   
-   /**
-     * The default array of sizes for the marker cluster images.
-     *
-     * @type {Array.<number>}
-     * @constant
-     */
-   IMAGE_SIZES: number[];
-   
-}
-
-declare var MarkerClusterer: MarkerClusterer;
- 
-interface String {
-   trim(): string;
-}
diff --git a/markerclustererplus/tsconfig.json b/markerclustererplus/tsconfig.json
new file mode 100644
index 0000000000..4d016ef323
--- /dev/null
+++ b/markerclustererplus/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "markerclustererplus-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/markitup/index.d.ts b/markitup/index.d.ts
new file mode 100644
index 0000000000..b24347454a
--- /dev/null
+++ b/markitup/index.d.ts
@@ -0,0 +1,237 @@
+// Type definitions for markitup 1.x
+// Project: https://github.com/markitup/1.x
+// Definitions by: drillbits <https://github.com/drillbits>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace MarkItUp {
+    interface Options {
+        /**
+         * Apply a specific className to the wrapping Div. Useful to prevent CSS conflicts between instances.
+         */
+        nameSpace?: string;
+
+        /**
+         * Enable/Disable the handle to resize the editor.
+         */
+        resizeHandle?: boolean;
+
+        /**
+         * Display the preview in a popup window with comma-separated list of specs. If empty or false, the preview will be displayed in the built-in iFrame preview.
+         */
+        previewInWindow?: string;
+
+        /**
+         * AutoRefresh the preview iFrame or window when the editor is used.
+         */
+        previewAutoRefresh?: boolean;
+
+        /**
+         * You can set the path of your own parser to preview markup languages other than html. If this property is set, the built-in preview will be overridden by your own preview script.
+         * Use ~/ for markItUp! root.
+         */
+        previewParserPath?: string;
+
+        /**
+         * Name of the var posted with the editor content to the parser defined above.
+         *
+         * default: 'data'
+         */
+        previewParserVar?: string;
+
+        /**
+         * Path to the Html preview template.
+         * Use ~/ for markItUp! root.
+         *
+         * default: '~/templates/preview.html'
+         */
+        previewTemplatePath?: string;
+
+        /**
+         * Parse the content with the javascript parser of your choice before passing it to the preview.
+         *
+         * default: false
+         */
+        previewParser?: boolean;
+
+        /**
+         * Position of the Built-in preview before or after the main textarea.
+         * 'before'|'after'
+         *
+         * default: 'after'
+         */
+        previewPosition?: string;
+
+        /**
+         * Define what to do when Enter key is pressed.
+         */
+        onEnter?: MarkupSet;
+
+        /**
+         * Define what to do when Ctrl+Enter keys are pressed.
+         */
+        onCtrlEnter?: MarkupSet;
+
+        /**
+         * Define what to do when Shift+Enter keys are pressed.
+         */
+        onShiftEnter?: MarkupSet;
+
+        /**
+         * Define what to do when Tab key is pressed. Warning, this key is also used to jump at the end of a new inserted markup.
+         */
+        onTab?: MarkupSet;
+
+        /**
+         * Function to be called before any markup insertion.
+         */
+        beforeInsert?: (h: MarkupSet) => string;
+
+        /**
+         * Function to be called after any markup insertion.
+         */
+        afterInsert?: (h: MarkupSet) => string;
+
+        /**
+         * Note that most of the settings below are used by the engine for all insertion calls ($.markItUp( {} ), onEnter, onShiftEnter, onCtrlEnter, onTab) except exclusive button properties marked by
+         */
+        markupSet?: MarkupSet[];
+    }
+
+    interface MarkupSet {
+        /**
+         * Button name
+         */
+        name?: string;
+
+        /**
+         * Classname to be applied to this very button.
+         */
+        className?: string;
+
+        /**
+         * Shortcut key to be applied to the button. Ctrl+key trigger the action of a button.
+         */
+        key?: string;
+
+        /**
+         * Markup to be added before selection. Accepts functions.
+         */
+        openWith?: string|((h: MarkupSet) => string);
+
+        /**
+         * Markup to be added after selection. Accepts functions.
+         */
+        closeWith?: string|((h: MarkupSet) => string);
+
+        /**
+         * Text to be added in place of the cursor or selection. Accepts functions.
+         */
+        replaceWith?: string|((h: MarkupSet) => string);
+
+        /**
+         * Text to be added before a whole block. Accepts functions.
+         */
+        openBlockWith?: string|((h: MarkupSet) => string);
+
+        /**
+         * Text to be added after a whole block. Accepts functions.
+         */
+        closeBlockWith?: string|((h: MarkupSet) => string);
+
+        /**
+         * Set whether the tags has to be inserted at each line or on the whole selected block.
+         */
+        multiline?: boolean;
+
+        /**
+         * Placeholder text to be inserted if no text is selected by the user.
+         */
+        placeHolder?: string|((h: MarkupSet) => string);
+
+        /**
+         * Function to be called just before a markup insertion. If a global beforeInsert callback is already defined this function is fired just after.
+         */
+        beforeInsert?: (h: MarkupSet) => string;
+
+        /**
+         * Function to be called just after a markup insertion. If a global afterInsert callback is already defined this function is fired before.
+         */
+        afterInsert?: (h: MarkupSet) => string;
+
+        /**
+         * Function to be called before a multiline markup insertion.
+         */
+        beforeMultiInsert?: (h: MarkupSet) => string;
+
+        /**
+         * Function to be called after a multiline markup insertion.
+         */
+        afterMultiInsert?: (h: MarkupSet) => string;
+
+        /**
+         * Open a dropdown menu with another button set.
+         */
+        dropMenu?: MarkupSet[];
+
+        /**
+         * Keep (true) or not (false) the default behaviour of the key.
+         */
+        keepDefault?: boolean;
+
+        /**
+         * Returns the selection.
+         */
+        selection?: string;
+
+        /**
+         * Returns the textarea object.
+         */
+        textarea?: HTMLElement;
+
+        /**
+         * Returns the position of the selection.
+         */
+        caretPosition?: number;
+
+        /**
+         * Returns the position of the scrollbar.
+         */
+        scrollPosition?: number;
+
+        /**
+         * If a multi-line edition is trigged (Ctrl + Shift + click). This property return the number of the line being processed.
+         */
+        line?: number;
+
+        /**
+         * Returns true if the Control key is pressed when the callback is fired.
+         */
+        ctrlKey?: boolean;
+
+        /**
+         * Returns true if the Shift key is pressed when the callback is fired.
+         */
+        shiftKey?: boolean;
+
+        /**
+         * Returns true if the Alt key is pressed when the callback is fired.
+         */
+        altKey?: boolean;
+    }
+
+    interface Static {
+        (): JQuery;
+        (settings: Options): JQuery;
+    }
+}
+
+interface JQueryStatic {
+    markItUp: MarkItUp.Static;
+}
+
+interface JQuery {
+    markItUp(settings?: MarkItUp.Options): JQuery;
+    markItUpRemove(): JQuery;
+}
diff --git a/markitup/markitup-tests.ts b/markitup/markitup-tests.ts
index e5b03ed5af..f8b12d3c00 100644
--- a/markitup/markitup-tests.ts
+++ b/markitup/markitup-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="markitup.d.ts" />
+/// <reference types="jquery" />
+
 
 // https://github.com/markitup/1.x/blob/master/markitup/sets/default/set.js
 var mySettings = {
diff --git a/markitup/markitup.d.ts b/markitup/markitup.d.ts
deleted file mode 100644
index 7299d7c70e..0000000000
--- a/markitup/markitup.d.ts
+++ /dev/null
@@ -1,237 +0,0 @@
-// Type definitions for markitup 1.x
-// Project: https://github.com/markitup/1.x
-// Definitions by: drillbits <https://github.com/drillbits>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace MarkItUp {
-    interface Options {
-        /**
-         * Apply a specific className to the wrapping Div. Useful to prevent CSS conflicts between instances.
-         */
-        nameSpace?: string;
-
-        /**
-         * Enable/Disable the handle to resize the editor.
-         */
-        resizeHandle?: boolean;
-
-        /**
-         * Display the preview in a popup window with comma-separated list of specs. If empty or false, the preview will be displayed in the built-in iFrame preview.
-         */
-        previewInWindow?: string;
-
-        /**
-         * AutoRefresh the preview iFrame or window when the editor is used.
-         */
-        previewAutoRefresh?: boolean;
-
-        /**
-         * You can set the path of your own parser to preview markup languages other than html. If this property is set, the built-in preview will be overridden by your own preview script.
-         * Use ~/ for markItUp! root.
-         */
-        previewParserPath?: string;
-
-        /**
-         * Name of the var posted with the editor content to the parser defined above.
-         *
-         * default: 'data'
-         */
-        previewParserVar?: string;
-
-        /**
-         * Path to the Html preview template.
-         * Use ~/ for markItUp! root.
-         *
-         * default: '~/templates/preview.html'
-         */
-        previewTemplatePath?: string;
-
-        /**
-         * Parse the content with the javascript parser of your choice before passing it to the preview.
-         *
-         * default: false
-         */
-        previewParser?: boolean;
-
-        /**
-         * Position of the Built-in preview before or after the main textarea.
-         * 'before'|'after'
-         *
-         * default: 'after'
-         */
-        previewPosition?: string;
-
-        /**
-         * Define what to do when Enter key is pressed.
-         */
-        onEnter?: MarkupSet;
-
-        /**
-         * Define what to do when Ctrl+Enter keys are pressed.
-         */
-        onCtrlEnter?: MarkupSet;
-
-        /**
-         * Define what to do when Shift+Enter keys are pressed.
-         */
-        onShiftEnter?: MarkupSet;
-
-        /**
-         * Define what to do when Tab key is pressed. Warning, this key is also used to jump at the end of a new inserted markup.
-         */
-        onTab?: MarkupSet;
-
-        /**
-         * Function to be called before any markup insertion.
-         */
-        beforeInsert?: (h: MarkupSet) => string;
-
-        /**
-         * Function to be called after any markup insertion.
-         */
-        afterInsert?: (h: MarkupSet) => string;
-
-        /**
-         * Note that most of the settings below are used by the engine for all insertion calls ($.markItUp( {} ), onEnter, onShiftEnter, onCtrlEnter, onTab) except exclusive button properties marked by
-         */
-        markupSet?: MarkupSet[];
-    }
-
-    interface MarkupSet {
-        /**
-         * Button name
-         */
-        name?: string;
-
-        /**
-         * Classname to be applied to this very button.
-         */
-        className?: string;
-
-        /**
-         * Shortcut key to be applied to the button. Ctrl+key trigger the action of a button.
-         */
-        key?: string;
-
-        /**
-         * Markup to be added before selection. Accepts functions.
-         */
-        openWith?: string|((h: MarkupSet) => string);
-
-        /**
-         * Markup to be added after selection. Accepts functions.
-         */
-        closeWith?: string|((h: MarkupSet) => string);
-
-        /**
-         * Text to be added in place of the cursor or selection. Accepts functions.
-         */
-        replaceWith?: string|((h: MarkupSet) => string);
-
-        /**
-         * Text to be added before a whole block. Accepts functions.
-         */
-        openBlockWith?: string|((h: MarkupSet) => string);
-
-        /**
-         * Text to be added after a whole block. Accepts functions.
-         */
-        closeBlockWith?: string|((h: MarkupSet) => string);
-
-        /**
-         * Set whether the tags has to be inserted at each line or on the whole selected block.
-         */
-        multiline?: boolean;
-
-        /**
-         * Placeholder text to be inserted if no text is selected by the user.
-         */
-        placeHolder?: string|((h: MarkupSet) => string);
-
-        /**
-         * Function to be called just before a markup insertion. If a global beforeInsert callback is already defined this function is fired just after.
-         */
-        beforeInsert?: (h: MarkupSet) => string;
-
-        /**
-         * Function to be called just after a markup insertion. If a global afterInsert callback is already defined this function is fired before.
-         */
-        afterInsert?: (h: MarkupSet) => string;
-
-        /**
-         * Function to be called before a multiline markup insertion.
-         */
-        beforeMultiInsert?: (h: MarkupSet) => string;
-
-        /**
-         * Function to be called after a multiline markup insertion.
-         */
-        afterMultiInsert?: (h: MarkupSet) => string;
-
-        /**
-         * Open a dropdown menu with another button set.
-         */
-        dropMenu?: MarkupSet[];
-
-        /**
-         * Keep (true) or not (false) the default behaviour of the key.
-         */
-        keepDefault?: boolean;
-
-        /**
-         * Returns the selection.
-         */
-        selection?: string;
-
-        /**
-         * Returns the textarea object.
-         */
-        textarea?: HTMLElement;
-
-        /**
-         * Returns the position of the selection.
-         */
-        caretPosition?: number;
-
-        /**
-         * Returns the position of the scrollbar.
-         */
-        scrollPosition?: number;
-
-        /**
-         * If a multi-line edition is trigged (Ctrl + Shift + click). This property return the number of the line being processed.
-         */
-        line?: number;
-
-        /**
-         * Returns true if the Control key is pressed when the callback is fired.
-         */
-        ctrlKey?: boolean;
-
-        /**
-         * Returns true if the Shift key is pressed when the callback is fired.
-         */
-        shiftKey?: boolean;
-
-        /**
-         * Returns true if the Alt key is pressed when the callback is fired.
-         */
-        altKey?: boolean;
-    }
-
-    interface Static {
-        (): JQuery;
-        (settings: Options): JQuery;
-    }
-}
-
-interface JQueryStatic {
-    markItUp: MarkItUp.Static;
-}
-
-interface JQuery {
-    markItUp(settings?: MarkItUp.Options): JQuery;
-    markItUpRemove(): JQuery;
-}
diff --git a/markitup/tsconfig.json b/markitup/tsconfig.json
new file mode 100644
index 0000000000..5ab86c6c8f
--- /dev/null
+++ b/markitup/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "markitup-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/maskedinput/index.d.ts b/maskedinput/index.d.ts
new file mode 100644
index 0000000000..2c596a8486
--- /dev/null
+++ b/maskedinput/index.d.ts
@@ -0,0 +1,55 @@
+// Type definitions for Masked Input plugin for jQuery
+// Project: http://digitalbush.com/projects/masked-input-plugin
+// Definitions by: Lokesh Peta <https://github.com/lokeshpeta/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="jquery" />
+
+interface JQueryMaskedInputOptions {
+    mask?: string;
+    alias?: string;
+    placeholder?: string;
+    repeat?: number;
+    greedy?: boolean;
+    skipOptionalPartCharacter?: string;
+    clearIncomplete?: boolean;
+    clearMaskOnLostFocus?: boolean;
+    autoUnmask?: boolean;
+    showMaskOnFocus?: boolean;
+    showMaskOnHover?: boolean;
+    showToolTip?: boolean;
+    isComplete?: (buffer: any, options: any) => {};
+    numeric?: boolean;
+    radixPoint?: string;
+    rightAlignNumerics?: boolean;
+    oncomplete?: (value?: any) => void;
+    onincomplete?: () => void;
+    oncleared?: () => void;
+    onUnMask?: (maskedValue: any, unmaskedValue: any) => void;
+    onBeforeMask?: (initialValue: any) => void;
+    onKeyValidation?: (result: any) => void;
+    onBeforePaste?: (pastedValue: any) => void;
+}
+
+interface MaskedInputStatic {
+    defaults: MaskedInputDefaults;
+    isValid: (value: string, options: MaskedInputStaticDefaults) => boolean;
+    format: (value: string, options: MaskedInputStaticDefaults) => boolean;
+}
+
+interface MaskedInputStaticDefaults {
+    alias: string;
+}
+
+interface MaskedInputDefaults {
+    aliases: any;
+    definitions: any;
+}
+
+interface JQueryStatic {
+    mask: MaskedInputStatic;
+}
+
+interface JQuery {
+    mask(mask: string, options?: JQueryMaskedInputOptions): JQuery;
+}
diff --git a/maskedinput/maskedinput-tests.ts b/maskedinput/maskedinput-tests.ts
index 8863d4a72c..766eda8f9b 100644
--- a/maskedinput/maskedinput-tests.ts
+++ b/maskedinput/maskedinput-tests.ts
@@ -3,8 +3,7 @@
 // Definitions by: Lokesh Peta <https://github.com/lokeshpeta/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference path="../jquery/jquery.d.ts" />
-///<reference path="maskedinput.d.ts" />
+///<reference types="jquery" />
 
 $("#test").mask("9:000");
 $("#test").mask("9:000", { numeric: true });
diff --git a/maskedinput/maskedinput.d.ts b/maskedinput/maskedinput.d.ts
deleted file mode 100644
index e5d4520366..0000000000
--- a/maskedinput/maskedinput.d.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-// Type definitions for Masked Input plugin for jQuery
-// Project: http://digitalbush.com/projects/masked-input-plugin
-// Definitions by: Lokesh Peta <https://github.com/lokeshpeta/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../jquery/jquery.d.ts" />
-
-interface JQueryMaskedInputOptions {
-    mask?: string;
-    alias?: string;
-    placeholder?: string;
-    repeat?: number;
-    greedy?: boolean;
-    skipOptionalPartCharacter?: string;
-    clearIncomplete?: boolean;
-    clearMaskOnLostFocus?: boolean;
-    autoUnmask?: boolean;
-    showMaskOnFocus?: boolean;
-    showMaskOnHover?: boolean;
-    showToolTip?: boolean;
-    isComplete?: (buffer: any, options: any) => {};
-    numeric?: boolean;
-    radixPoint?: string;
-    rightAlignNumerics?: boolean;
-    oncomplete?: (value?: any) => void;
-    onincomplete?: () => void;
-    oncleared?: () => void;
-    onUnMask?: (maskedValue: any, unmaskedValue: any) => void;
-    onBeforeMask?: (initialValue: any) => void;
-    onKeyValidation?: (result: any) => void;
-    onBeforePaste?: (pastedValue: any) => void;
-}
-
-interface MaskedInputStatic {
-    defaults: MaskedInputDefaults;
-    isValid: (value: string, options: MaskedInputStaticDefaults) => boolean;
-    format: (value: string, options: MaskedInputStaticDefaults) => boolean;
-}
-
-interface MaskedInputStaticDefaults {
-    alias: string;
-}
-
-interface MaskedInputDefaults {
-    aliases: any;
-    definitions: any;
-}
-
-interface JQueryStatic {
-    mask: MaskedInputStatic;
-}
-
-interface JQuery {
-    mask(mask: string, options?: JQueryMaskedInputOptions): JQuery;
-}
diff --git a/maskedinput/tsconfig.json b/maskedinput/tsconfig.json
new file mode 100644
index 0000000000..de9f8cb437
--- /dev/null
+++ b/maskedinput/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "maskedinput-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/material-design-lite/index.d.ts b/material-design-lite/index.d.ts
new file mode 100644
index 0000000000..11b93ea792
--- /dev/null
+++ b/material-design-lite/index.d.ts
@@ -0,0 +1,128 @@
+// Type definitions for material-design-lite v1.1.3
+// Project: https://getmdl.io
+// Definitions by: Brad Zacher <https://github.com/bradzacher/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module MaterialDesignLite {
+    interface ComponentHandler {
+        /**
+         * Searches existing DOM for elements of our component type and upgrades them
+         * if they have not already been upgraded.
+         */
+        upgradeDom() : void;
+        /**
+         * Searches existing DOM for elements of our component type and upgrades them
+         * if they have not already been upgraded.
+         *
+         * @param {string} jsClass the programatic name of the element class we
+         * need to create a new instance of.
+         */
+        upgradeDom(jsClass : string) : void;
+        /**
+         * Searches existing DOM for elements of our component type and upgrades them
+         * if they have not already been upgraded.
+         *
+         * @param {string} jsClass the programatic name of the element class we
+         * need to create a new instance of.
+         * @param {string} cssClass the name of the CSS class elements of this
+         * type will have.
+         */
+        upgradeDom(jsClass : string, cssClass : string) : void;
+
+        /**
+         * Upgrades a specific element rather than all in the DOM.
+         *
+         * @param {!Element} element The element we wish to upgrade.
+         */
+        upgradeElement(element : HTMLElement) : void;
+        /**
+         * Upgrades a specific element rather than all in the DOM.
+         *
+         * @param {!Element} element The element we wish to upgrade.
+         * @param {string} jsClass Optional name of the class we want to upgrade
+         * the element to.
+         */
+        upgradeElement(element : HTMLElement, jsClass : string) : void;
+
+        /**
+         * Upgrades a specific list of elements rather than all in the DOM.
+         *
+         * @param {!Element} elements
+         * The elements we wish to upgrade.
+         */
+        upgradeElements(elements : HTMLElement) : void;
+        /**
+         * Upgrades a specific list of elements rather than all in the DOM.
+         *
+         * @param {!Array<!Element>} elements
+         * The elements we wish to upgrade.
+         */
+        upgradeElements(elements : Array<HTMLElement>) : void;
+        /**
+         * Upgrades a specific list of elements rather than all in the DOM.
+         *
+         * @param {!NodeList} elements
+         * The elements we wish to upgrade.
+         */
+        upgradeElements(elements : NodeList) : void;
+        /**
+         * Upgrades a specific list of elements rather than all in the DOM.
+         *
+         * @param {!HTMLCollection} elements
+         * The elements we wish to upgrade.
+         */
+        upgradeElements(elements : HTMLCollection) : void;
+
+        /**
+         * Upgrades all registered components found in the current DOM. This is
+         * automatically called on window load.
+         */
+        upgradeAllRegistered() : void;
+
+        /**
+         * Allows user to be alerted to any upgrades that are performed for a given
+         * component type
+         *
+         * @param {string} jsClass The class name of the MDL component we wish
+         * to hook into for any upgrades performed.
+         * @param {function(!HTMLElement)} callback The function to call upon an
+         * upgrade. This function should expect 1 parameter - the HTMLElement which
+         * got upgraded.
+         */
+        registerUpgradedCallback(jsClass : string, callback : (element : HTMLElement) => any) : void;
+
+        /**
+         * Registers a class for future use and attempts to upgrade existing DOM.
+         *
+         * @param {componentHandler.ComponentConfigPublic} config the registration configuration
+         */
+        register(config : ComponentConfigPublic) : void;
+
+        /**
+         * Downgrade either a given node, an array of nodes, or a NodeList.
+         *
+         * @param {!Node} nodes The list of nodes.
+         */
+        downgradeElements(nodes : Node) : void;
+        /**
+         * Downgrade either a given node, an array of nodes, or a NodeList.
+         *
+         * @param {!Array<!Node>} nodes The list of nodes.
+         */
+        downgradeElements(nodes : Array<Node>) : void;
+        /**
+         * Downgrade either a given node, an array of nodes, or a NodeList.
+         *
+         * @param {!NodeList} nodes The list of nodes.
+         */
+        downgradeElements(nodes : NodeList) : void;
+    }
+    interface ComponentConfigPublic {
+        constructor(element : HTMLElement) : void;
+        classAsString : string;
+        cssClass : string;
+        widget? : string | boolean;
+    }
+}
+
+declare var componentHandler : MaterialDesignLite.ComponentHandler;
\ No newline at end of file
diff --git a/material-design-lite/material-design-lite-tests.ts b/material-design-lite/material-design-lite-tests.ts
new file mode 100644
index 0000000000..f50994514f
--- /dev/null
+++ b/material-design-lite/material-design-lite-tests.ts
@@ -0,0 +1,38 @@
+// Test file for Google Maps JavaScript API Definition file
+
+
+componentHandler.upgradeDom();
+componentHandler.upgradeDom('MaterialButton');
+componentHandler.upgradeDom('MaterialButton', 'mdl-button');
+
+componentHandler.upgradeElement(document.createElement('div'));
+componentHandler.upgradeElement(document.getElementById('id'));
+componentHandler.upgradeElement(document.getElementsByTagName('button')[0], 'MaterialButton');
+
+componentHandler.upgradeElements(document.getElementsByTagName('div'));
+componentHandler.upgradeElements([document.createElement('div')]);
+componentHandler.upgradeElements(document.querySelectorAll('div.mdl-button'));
+
+componentHandler.upgradeAllRegistered();
+
+componentHandler.registerUpgradedCallback('MaterialButton', function(element : HTMLElement) {});
+
+componentHandler.register({
+    constructor: function(element: HTMLElement) {},
+    classAsString: 'MaterialCheese',
+    cssClass: 'mdl-cheese'
+});
+componentHandler.register({
+    constructor: function(element: HTMLElement) {},
+    classAsString: 'MaterialFoo',
+    cssClass: 'mdl-foo',
+    widget: true
+});
+componentHandler.register({
+    constructor: function(element: HTMLElement) {},
+    classAsString: 'MaterialFoo',
+    cssClass: 'mdl-foo',
+    widget: 'FooBar'
+});
+
+componentHandler.downgradeElements(document.querySelectorAll('div'));
diff --git a/material-design-lite/tsconfig.json b/material-design-lite/tsconfig.json
new file mode 100644
index 0000000000..8559fb31c2
--- /dev/null
+++ b/material-design-lite/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "material-design-lite-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/material-ui/index.d.ts b/material-ui/index.d.ts
new file mode 100644
index 0000000000..00080d39a6
--- /dev/null
+++ b/material-ui/index.d.ts
@@ -0,0 +1,8244 @@
+// Type definitions for material-ui v0.14.4
+// Project: https://github.com/callemall/material-ui
+// Definitions by: Nathan Brown <https://github.com/ngbrown>, Oliver Herrmann <https://github.com/herrmanno>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react" />
+/// <reference types="react-addons-linked-state-mixin" />
+
+declare module "material-ui" {
+    export import AppBar = __MaterialUI.AppBar; // require('material-ui/lib/app-bar');
+    export import AppCanvas = __MaterialUI.AppCanvas; // require('material-ui/lib/app-canvas');
+    export import AutoComplete = __MaterialUI.AutoComplete; // require('material-ui/lib/auto-complete');
+    export import Avatar = __MaterialUI.Avatar; // require('material-ui/lib/avatar');
+    export import Badge = __MaterialUI.Badge; // require('material-ui/lib/badge');
+    export import BeforeAfterWrapper = __MaterialUI.BeforeAfterWrapper; // require('material-ui/lib/before-after-wrapper');
+    export import Card = __MaterialUI.Card.Card; // require('material-ui/lib/card/card');
+    export import CardActions = __MaterialUI.Card.CardActions; // require('material-ui/lib/card/card-actions');
+    export import CardExpandable = __MaterialUI.Card.CardExpandable; // require('material-ui/lib/card/card-expandable');
+    export import CardHeader = __MaterialUI.Card.CardHeader; // require('material-ui/lib/card/card-header');
+    export import CardMedia = __MaterialUI.Card.CardMedia; // require('material-ui/lib/card/card-media');
+    export import CardText = __MaterialUI.Card.CardText; // require('material-ui/lib/card/card-text');
+    export import CardTitle = __MaterialUI.Card.CardTitle; // require('material-ui/lib/card/card-title');
+    export import Checkbox = __MaterialUI.Checkbox; // require('material-ui/lib/checkbox');
+    export import CircularProgress = __MaterialUI.CircularProgress; // require('material-ui/lib/circular-progress');
+    export import ClearFix = __MaterialUI.ClearFix; // require('material-ui/lib/clearfix');
+    export import DatePicker = __MaterialUI.DatePicker.DatePicker; // require('material-ui/lib/date-picker/date-picker');
+    export import DatePickerDialog = __MaterialUI.DatePicker.DatePickerDialog; // require('material-ui/lib/date-picker/date-picker-dialog');
+    export import Dialog = __MaterialUI.Dialog // require('material-ui/lib/dialog');
+    export import Divider = __MaterialUI.Divider // require('material-ui/lib/divider');
+    export import DropDownMenu = __MaterialUI.Menus.DropDownMenu; // require('material-ui/lib/DropDownMenu/DropDownMenu');
+    export import EnhancedButton = __MaterialUI.EnhancedButton; // require('material-ui/lib/enhanced-button');
+    export import FlatButton = __MaterialUI.FlatButton; // require('material-ui/lib/flat-button');
+    export import FloatingActionButton = __MaterialUI.FloatingActionButton; // require('material-ui/lib/floating-action-button');
+    export import FontIcon = __MaterialUI.FontIcon; // require('material-ui/lib/font-icon');
+    export import GridList = __MaterialUI.GridList.GridList; // require('material-ui/lib/gridlist/grid-list');
+    export import GridTile = __MaterialUI.GridList.GridTile; // require('material-ui/lib/gridlist/grid-tile');
+    export import IconButton = __MaterialUI.IconButton; // require('material-ui/lib/icon-button');
+    export import IconMenu = __MaterialUI.Menus.IconMenu; // require('material-ui/lib/menus/icon-menu');
+    export import LeftNav = __MaterialUI.LeftNav; // require('material-ui/lib/left-nav');
+    export import LinearProgress = __MaterialUI.LinearProgress; // require('material-ui/lib/linear-progress');
+    export import List = __MaterialUI.Lists.List; // require('material-ui/lib/lists/list');
+    export import ListDivider = __MaterialUI.Lists.ListDivider; // require('material-ui/lib/lists/list-divider');
+    export import ListItem = __MaterialUI.Lists.ListItem; // require('material-ui/lib/lists/list-item');
+    export import Menu = __MaterialUI.Menus.Menu; // require('material-ui/lib/menus/menu');
+    export import MenuItem = __MaterialUI.Menus.MenuItem; // require('material-ui/lib/menus/menu-item');
+    export import Mixins = __MaterialUI.Mixins; // require('material-ui/lib/mixins');
+    export import Overlay = __MaterialUI.Overlay; // require('material-ui/lib/overlay');
+    export import Paper = __MaterialUI.Paper; // require('material-ui/lib/paper');
+    export import Popover = __MaterialUI.Popover.Popover; // require('material-ui/lib/popover/popover');
+    export import RadioButton = __MaterialUI.RadioButton; // require('material-ui/lib/radio-button');
+    export import RadioButtonGroup = __MaterialUI.RadioButtonGroup; // require('material-ui/lib/radio-button-group');
+    export import RaisedButton = __MaterialUI.RaisedButton; // require('material-ui/lib/raised-button');
+    export import RefreshIndicator = __MaterialUI.RefreshIndicator; // require('material-ui/lib/refresh-indicator');
+    export import Ripples = __MaterialUI.Ripples; // require('material-ui/lib/ripples');
+    export import SelectField = __MaterialUI.SelectField; // require('material-ui/lib/select-field');
+    export import SelectableContainerEnhance = __MaterialUI.Hoc.SelectableContainerEnhance; // require('material-ui/lib/hoc/selectable-enhance');
+    export import Slider = __MaterialUI.Slider; // require('material-ui/lib/slider');
+    export import SvgIcon = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon');
+    export import Styles = __MaterialUI.Styles; // require('material-ui/lib/styles');
+    export import Snackbar = __MaterialUI.Snackbar; // require('material-ui/lib/snackbar');
+    export import Tab = __MaterialUI.Tabs.Tab; // require('material-ui/lib/tabs/tab');
+    export import Tabs = __MaterialUI.Tabs.Tabs; // require('material-ui/lib/tabs/tabs');
+    export import Table = __MaterialUI.Table.Table; // require('material-ui/lib/table/table');
+    export import TableBody = __MaterialUI.Table.TableBody; // require('material-ui/lib/table/table-body');
+    export import TableFooter = __MaterialUI.Table.TableFooter; // require('material-ui/lib/table/table-footer');
+    export import TableHeader = __MaterialUI.Table.TableHeader; // require('material-ui/lib/table/table-header');
+    export import TableHeaderColumn = __MaterialUI.Table.TableHeaderColumn; // require('material-ui/lib/table/table-header-column');
+    export import TableRow = __MaterialUI.Table.TableRow; // require('material-ui/lib/table/table-row');
+    export import TableRowColumn = __MaterialUI.Table.TableRowColumn; // require('material-ui/lib/table/table-row-column');
+    export import Toggle = __MaterialUI.Toggle; // require('material-ui/lib/toggle');
+    export import ThemeWrapper = __MaterialUI.ThemeWrapper; // require('material-ui/lib/theme-wrapper');
+    export import TimePicker = __MaterialUI.TimePicker; // require('material-ui/lib/time-picker');
+    export import TextField = __MaterialUI.TextField; // require('material-ui/lib/text-field');
+    export import Toolbar = __MaterialUI.Toolbar.Toolbar; // require('material-ui/lib/toolbar/toolbar');
+    export import ToolbarGroup = __MaterialUI.Toolbar.ToolbarGroup; // require('material-ui/lib/toolbar/toolbar-group');
+    export import ToolbarSeparator = __MaterialUI.Toolbar.ToolbarSeparator; // require('material-ui/lib/toolbar/toolbar-separator');
+    export import ToolbarTitle = __MaterialUI.Toolbar.ToolbarTitle; // require('material-ui/lib/toolbar/toolbar-title');
+    export import Tooltip = __MaterialUI.Tooltip; // require('material-ui/lib/tooltip');
+    export import Utils = __MaterialUI.Utils; // require('material-ui/lib/utils');
+
+    // svg icons
+    import NavigationMenu = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/menu');
+    import NavigationChevronLeft = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/chevron-left');
+    import NavigationChevronRight = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/chevron-right');
+
+    export const Icons: {
+        NavigationMenu: typeof NavigationMenu,
+        NavigationChevronLeft: typeof NavigationChevronLeft,
+        NavigationChevronRight: typeof NavigationChevronRight,
+    };
+
+    // export type definitions
+    export type TouchTapEvent = __MaterialUI.TouchTapEvent;
+    export type TouchTapEventHandler = __MaterialUI.TouchTapEventHandler;
+    export type DialogAction = __MaterialUI.DialogAction;
+}
+
+declare namespace __MaterialUI {
+    // ReactLink is from "react/addons"
+    interface ReactLink<T> {
+        value: T;
+        requestChange(newValue: T): void;
+    }
+
+    // What's common between React.TouchEvent and React.MouseEvent
+    interface TouchTapEvent extends React.SyntheticEvent {
+        altKey: boolean;
+        ctrlKey: boolean;
+        getModifierState(key: string): boolean;
+        metaKey: boolean;
+        shiftKey: boolean;
+    }
+
+    // What's common between React.TouchEventHandler and React.MouseEventHandler
+    interface TouchTapEventHandler extends React.EventHandler<TouchTapEvent> { }
+
+    interface ThemeWrapperProps extends React.Props<ThemeWrapper> {
+        theme: Styles.MuiTheme;
+    }
+    export class ThemeWrapper extends React.Component<ThemeWrapperProps, {}> {
+    }
+
+    export namespace Styles {
+        interface AutoPrefix {
+            all(styles: React.CSSProperties): React.CSSProperties;
+            set(style: React.CSSProperties, key: string, value: string | number): void;
+            single(key: string): string;
+            singleHyphened(key: string): string;
+        }
+        export var AutoPrefix: AutoPrefix;
+
+        interface Spacing {
+            iconSize?: number;
+
+            desktopGutter?: number;
+            desktopGutterMore?: number;
+            desktopGutterLess?: number;
+            desktopGutterMini?: number;
+            desktopKeylineIncrement?: number;
+            desktopDropDownMenuItemHeight?: number;
+            desktopDropDownMenuFontSize?: number;
+            desktopLeftNavMenuItemHeight?: number;
+            desktopSubheaderHeight?: number;
+            desktopToolbarHeight?: number;
+        }
+        export var Spacing: Spacing;
+
+        interface ThemePalette {
+            primary1Color?: string;
+            primary2Color?: string;
+            primary3Color?: string;
+            accent1Color?: string;
+            accent2Color?: string;
+            accent3Color?: string;
+            textColor?: string;
+            alternateTextColor?: string;
+            canvasColor?: string;
+            borderColor?: string;
+            disabledColor?: string;
+            pickerHeaderColor?: string;
+            clockCircleColor?: string;
+            shadowColor?: string;
+        }
+        interface MuiTheme {
+            isRtl?: boolean;
+            userAgent?: any;
+            zIndex?: zIndex;
+            baseTheme?: RawTheme;
+            rawTheme?: RawTheme;
+            appBar?: {
+                color?: string,
+                textColor?: string,
+                height?: number,
+            };
+            avatar?: {
+                borderColor?: string,
+            }
+            badge?: {
+                color?: string,
+                textColor?: string,
+                primaryColor?: string,
+                primaryTextColor?: string,
+                secondaryColor?: string,
+                secondaryTextColor?: string,
+            },
+            button?: {
+                height?: number,
+                minWidth?: number,
+                iconButtonSize?: number,
+            },
+            cardText?: {
+                textColor?: string,
+            },
+            checkbox?: {
+                boxColor?: string,
+                checkedColor?: string,
+                requiredColor?: string,
+                disabledColor?: string,
+                labelColor?: string,
+                labelDisabledColor?: string,
+            },
+            datePicker?: {
+                color?: string,
+                textColor?: string,
+                calendarTextColor?: string,
+                selectColor?: string,
+                selectTextColor?: string,
+            },
+            dropDownMenu?: {
+                accentColor?: string,
+            },
+            flatButton?: {
+                color?: string,
+                buttonFilterColor?: string,
+                disabledColor?: string,
+                textColor?: string,
+                primaryTextColor?: string,
+                secondaryTextColor?: string,
+            },
+            floatingActionButton?: {
+                buttonSize?: number,
+                miniSize?: number,
+                color?: string,
+                iconColor?: string,
+                secondaryColor?: string,
+                secondaryIconColor?: string,
+                disabledColor?: string,
+                disabledTextColor?: string,
+            },
+            gridTile?: {
+                textColor?: string,
+            },
+            inkBar?: {
+                backgroundColor?: string,
+            },
+            leftNav?: {
+                width?: number,
+                color?: string,
+            },
+            listItem?: {
+                nestedLevelDepth?: number,
+            },
+            menu?: {
+                backgroundColor?: string,
+                containerBackgroundColor?: string,
+            },
+            menuItem?: {
+                dataHeight?: number,
+                height?: number,
+                hoverColor?: string,
+                padding?: number,
+                selectedTextColor?: string,
+            },
+            menuSubheader?: {
+                padding?: number,
+                borderColor?: string,
+                textColor?: string,
+            },
+            paper?: {
+                backgroundColor?: string,
+                zDepthShadows?: string[],
+            },
+            radioButton?: {
+                borderColor?: string,
+                backgroundColor?: string,
+                checkedColor?: string,
+                requiredColor?: string,
+                disabledColor?: string,
+                size?: number,
+                labelColor?: string,
+                labelDisabledColor?: string,
+            },
+            raisedButton?: {
+                color?: string,
+                textColor?: string,
+                primaryColor?: string,
+                primaryTextColor?: string,
+                secondaryColor?: string,
+                secondaryTextColor?: string,
+                disabledColor?: string,
+                disabledTextColor?: string,
+            },
+            refreshIndicator?: {
+                strokeColor?: string,
+                loadingStrokeColor?: string,
+            };
+            slider?: {
+                trackSize?: number,
+                trackColor?: string,
+                trackColorSelected?: string,
+                handleSize?: number,
+                handleSizeDisabled?: number,
+                handleSizeActive?: number,
+                handleColorZero?: string,
+                handleFillColor?: string,
+                selectionColor?: string,
+                rippleColor?: string,
+            },
+            snackbar?: {
+                textColor?: string,
+                backgroundColor?: string,
+                actionColor?: string,
+            },
+            table?: {
+                backgroundColor?: string;
+            };
+            tableHeader?: {
+                borderColor?: string;
+            };
+            tableHeaderColumn?: {
+                textColor?: string;
+                height?: number;
+                spacing?: number;
+            };
+            tableFooter?: {
+                borderColor?: string;
+                textColor?: string;
+            };
+            tableRow?: {
+                hoverColor?: string;
+                stripeColor?: string;
+                selectedColor?: string;
+                textColor?: string;
+                borderColor?: string;
+                height?: number;
+            };
+            tableRowColumn?: {
+                height?: number;
+                spacing?: number;
+            };
+            timePicker?: {
+                color?: string;
+                textColor?: string;
+                accentColor?: string;
+                clockColor?: string;
+                clockCircleColor?: string;
+                headerColor?: string;
+                selectColor?: string;
+                selectTextColor?: string;
+            };
+            toggle?: {
+                thumbOnColor?: string,
+                thumbOffColor?: string,
+                thumbDisabledColor?: string,
+                thumbRequiredColor?: string,
+                trackOnColor?: string,
+                trackOffColor?: string,
+                trackDisabledColor?: string,
+                labelColor?: string,
+                labelDisabledColor?: string
+                trackRequiredColor?: string,
+            },
+            toolbar?: {
+                backgroundColor?: string,
+                height?: number,
+                titleFontSize?: number,
+                iconColor?: string,
+                separatorColor?: string,
+                menuHoverColor?: string,
+            };
+            tabs?: {
+                backgroundColor?: string,
+                textColor?: string,
+                selectedTextColor?: string,
+            };
+            textField?: {
+                textColor?: string;
+                hintColor?: string;
+                floatingLabelColor?: string;
+                disabledTextColor?: string;
+                errorColor?: string;
+                focusColor?: string;
+                backgroundColor?: string;
+                borderColor?: string;
+            };
+        }
+
+        interface zIndex {
+            menu: number;
+            appBar: number;
+            leftNavOverlay: number;
+            leftNav: number;
+            dialogOverlay: number;
+            dialog: number;
+            layer: number;
+            popover: number;
+            snackbar: number;
+            tooltip: number;
+        }
+        export var zIndex: zIndex;
+
+        interface RawTheme {
+            spacing?: Spacing;
+            fontFamily?: string;
+            palette?: ThemePalette;
+            zIndex?: zIndex;
+        }
+        var lightBaseTheme: RawTheme;
+        var darkBaseTheme: RawTheme;
+
+        export function ThemeDecorator(muiTheme: Styles.MuiTheme): <TFunction extends Function>(Component: TFunction) => TFunction;
+
+        export function getMuiTheme(baseTheme: RawTheme, muiTheme ?: MuiTheme): MuiTheme;
+
+        interface ThemeManager {
+            getMuiTheme(baseTheme: RawTheme, muiTheme?: MuiTheme): MuiTheme;
+            modifyRawThemeSpacing(muiTheme: MuiTheme, newSpacing: Spacing): MuiTheme;
+            modifyRawThemePalette(muiTheme: MuiTheme, newPaletteKeys: ThemePalette): MuiTheme;
+            modifyRawThemeFontFamily(muiTheme: MuiTheme, newFontFamily: string): MuiTheme;
+        }
+        export var ThemeManager: ThemeManager;
+
+        interface Transitions {
+            easeOut(duration?: string, property?: string | string[], delay?: string, easeFunction?: string): string;
+            create(duration?: string, property?: string, delay?: string, easeFunction?: string): string;
+            easeOutFunction: string;
+            easeInOutFunction: string;
+        }
+        export var Transitions: Transitions;
+
+        interface Typography {
+            textFullBlack: string;
+            textDarkBlack: string;
+            textLightBlack: string;
+            textMinBlack: string;
+            textFullWhite: string;
+            textDarkWhite: string;
+            textLightWhite: string;
+
+            // font weight
+            fontWeightLight: number;
+            fontWeightNormal: number;
+            fontWeightMedium: number;
+
+            fontStyleButtonFontSize: number;
+        }
+        export var Typography: Typography;
+
+        export var DarkRawTheme: RawTheme;
+        export var LightRawTheme: RawTheme;
+    }
+
+    interface AppBarProps extends React.Props<AppBar> {
+        className?: string;
+        iconClassNameLeft?: string;
+        iconClassNameRight?: string;
+        iconElementLeft?: React.ReactElement<any>;
+        iconElementRight?: React.ReactElement<any>;
+        iconStyleRight?: string;
+        onLeftIconButtonTouchTap?: TouchTapEventHandler;
+        onRightIconButtonTouchTap?: TouchTapEventHandler;
+        onTitleTouchTap?: TouchTapEventHandler;
+        showMenuIconButton?: boolean;
+        style?: React.CSSProperties;
+        title?: React.ReactNode;
+        titleStyle?: React.CSSProperties;
+        zDepth?: number;
+    }
+    export class AppBar extends React.Component<AppBarProps, {}>{
+    }
+
+    interface AppCanvasProps extends React.Props<AppCanvas> {
+    }
+    export class AppCanvas extends React.Component<AppCanvasProps, {}> {
+    }
+
+    interface Origin {
+        horizontal: string; // oneOf(['left', 'middle', 'right'])
+        vertical: string; // oneOf(['top', 'center', 'bottom'])
+    }
+
+    type AutoCompleteDataItem = { text: string, value: React.ReactNode } | string;
+    type AutoCompleteDataSource = { text: string, value: React.ReactNode }[] | string[];
+    interface AutoCompleteProps extends React.Props<AutoComplete> {
+        anchorOrigin?: Origin;
+        animated?: boolean;
+        dataSource?: AutoCompleteDataSource;
+        disableFocusRipple?: boolean;
+        errorStyle?: React.CSSProperties;
+        errorText?: string;
+        filter?: (searchText: string, key: string, item: AutoCompleteDataItem) => boolean;
+        floatingLabelText?: string;
+        fullWidth?: boolean;
+        hintText?: string;
+        listStyle?: React.CSSProperties;
+        menuCloseDelay?: number;
+        menuProps?: any;
+        menuStyle?: React.CSSProperties;
+        onNewRequest?: (chosenRequest: string, index: number) => void;
+        onUpdateInput?: (searchText: string, dataSource: AutoCompleteDataSource) => void;
+        open?: boolean;
+        searchText?: string;
+        /** @deprecated use noFilter instead */
+        showAllItems?: boolean;
+        style?: React.CSSProperties;
+        targetOrigin?: Origin;
+        touchTapCloseDelay?: number;
+        triggerUpdateOnFocus?: boolean;
+        /** @deprecated updateWhenFocused has been renamed to triggerUpdateOnFocus */
+        updateWhenFocused?: boolean;
+    }
+    export class AutoComplete extends React.Component<AutoCompleteProps, {}> {
+        static noFilter: () => boolean;
+        static defaultFilter: (searchText: string, key: string) => boolean;
+        static caseSensitiveFilter: (searchText: string, key: string) => boolean;
+        static caseInsensitiveFilter: (searchText: string, key: string) => boolean;
+        static levenshteinDistanceFilter(distanceLessThan: number): (searchText: string, key: string) => boolean;
+        static fuzzyFilter: (searchText: string, key: string) => boolean;
+        static Item: Menus.MenuItem;
+        static Divider: Divider;
+    }
+
+    interface AvatarProps extends React.Props<Avatar> {
+        backgroundColor?: string;
+        className?: string;
+        color?: string;
+        icon?: React.ReactElement<any>;
+        size?: number;
+        src?: string;
+        style?: React.CSSProperties;
+    }
+    export class Avatar extends React.Component<AvatarProps, {}> {
+    }
+
+    interface BadgeProps extends React.Props<Badge> {
+        badgeContent: React.ReactNode;
+        badgeStyle?: React.CSSProperties;
+        className?: string;
+        primary?: boolean;
+        secondary?: boolean;
+        style?: React.CSSProperties;
+    }
+    export class Badge extends React.Component<BadgeProps, {}> {
+    }
+
+    interface BeforeAfterWrapperProps extends React.Props<BeforeAfterWrapper> {
+        afterElementType?: string;
+        afterStyle?: React.CSSProperties;
+        beforeElementType?: string;
+        beforeStyle?: React.CSSProperties;
+        elementType?: string;
+        style?: React.CSSProperties;
+    }
+    export class BeforeAfterWrapper extends React.Component<BeforeAfterWrapperProps, {}> {
+    }
+
+    // non generally overridden elements of EnhancedButton
+    interface SharedEnhancedButtonProps<T> extends React.Props<T> {
+        centerRipple?: boolean;
+        disableFocusRipple?: boolean;
+        disableKeyboardFocus?: boolean;
+        disableTouchRipple?: boolean;
+        focusRippleColor?: string;
+        focusRippleOpacity?: number;
+        keyboardFocused?: boolean;
+        linkButton?: boolean;
+        onBlur?: React.FocusEventHandler;
+        onFocus?: React.FocusEventHandler;
+        onKeyboardFocus?: (e: React.FocusEvent, isKeyboardFocused: boolean) => void;
+        onKeyDown?: React.KeyboardEventHandler;
+        onKeyUp?: React.KeyboardEventHandler;
+        onTouchTap?: TouchTapEventHandler;
+        style?: React.CSSProperties;
+        tabIndex?: number;
+        touchRippleColor?: string;
+        touchRippleOpacity?: number;
+        type?: string;
+    }
+
+    interface EnhancedButtonProps extends React.HTMLAttributes, SharedEnhancedButtonProps<EnhancedButton> {
+        // container element, <button/>, or <span/>(if disabled link) is the element that get the 'other' properties
+        containerElement?: React.ReactNode | string;
+        disabled?: boolean;
+    }
+    export class EnhancedButton extends React.Component<EnhancedButtonProps, {}> {
+    }
+
+    interface FlatButtonProps extends React.DOMAttributes, SharedEnhancedButtonProps<FlatButton> {
+        // <EnhancedButton/> is the element that get the 'other' properties
+        backgroundColor?: string;
+        disabled?: boolean;
+        hoverColor?: string;
+        href?: string;
+        icon?: React.ReactNode;
+        label?: string;
+        labelPosition?: string; // oneOf(['left', 'right'])
+        labelStyle?: React.CSSProperties;
+        linkButton?: boolean;
+        onKeyboardFocus?: (e: React.FocusEvent, isKeyboardFocused: boolean) => void;
+        onMouseEnter?: React.MouseEventHandler;
+        onMouseLeave?: React.MouseEventHandler;
+        onTouchStart?: React.TouchEventHandler;
+        primary?: boolean;
+        rippleColor?: string;
+        secondary?: boolean;
+        style?: React.CSSProperties;
+    }
+    export class FlatButton extends React.Component<FlatButtonProps, {}> {
+    }
+
+    interface RaisedButtonProps extends SharedEnhancedButtonProps<RaisedButton> {
+        // <EnhancedButton/> is the element that get the 'other' properties
+        backgroundColor?: string;
+        className?: string;
+        disabled?: boolean;
+        disabledBackgroundColor?: string;
+        disabledLabelColor?: string;
+        fullWidth?: boolean;
+        href?: string;
+        icon?: React.ReactNode;
+        label?: string;
+        labelColor?: string;
+        labelPosition?: string; // oneOf(['left', 'right'])
+        labelStyle?: React.CSSProperties;
+        linkButton?: boolean;
+        onMouseDown?: React.MouseEventHandler;
+        onMouseEnter?: React.MouseEventHandler;
+        onMouseLeave?: React.MouseEventHandler;
+        onMouseUp?: React.MouseEventHandler;
+        onTouchEnd?: React.TouchEventHandler;
+        onTouchStart?: React.TouchEventHandler;
+        primary?: boolean;
+        rippleStyle?: React.CSSProperties;
+        secondary?: boolean;
+        style?: React.CSSProperties;
+    }
+    export class RaisedButton extends React.Component<RaisedButtonProps, {}> {
+    }
+
+    interface FloatingActionButtonProps extends React.HTMLAttributes, SharedEnhancedButtonProps<FloatingActionButton> {
+        // <EnhancedButton/> is the element that get the 'other' properties
+        backgroundColor?: string;
+        className?: string;
+        disabled?: boolean;
+        disabledColor?: string;
+        href?: string;
+        iconClassName?: string;
+        iconStyle?: React.CSSProperties;
+        linkButton?: boolean;
+        mini?: boolean;
+        onMouseDown?: React.MouseEventHandler;
+        onMouseEnter?: React.MouseEventHandler;
+        onMouseLeave?: React.MouseEventHandler;
+        onMouseUp?: React.MouseEventHandler;
+        onTouchEnd?: React.TouchEventHandler;
+        onTouchStart?: React.TouchEventHandler;
+        secondary?: boolean;
+        style?: React.CSSProperties;
+        zDepth?: number;
+    }
+    export class FloatingActionButton extends React.Component<FloatingActionButtonProps, {}> {
+    }
+
+    interface IconButtonProps extends React.HTMLAttributes, SharedEnhancedButtonProps<IconButton> {
+        // <EnhancedButton/> is the element that get the 'other' properties
+        className?: string;
+        disabled?: boolean;
+        iconClassName?: string;
+        iconStyle?: React.CSSProperties;
+        onBlur?: React.FocusEventHandler;
+        onFocus?: React.FocusEventHandler;
+        onKeyboardFocus?: (e: React.FocusEvent, isKeyboardFocused: boolean) => void;
+        onMouseEnter?: React.MouseEventHandler;
+        onMouseLeave?: React.MouseEventHandler;
+        style?: React.CSSProperties;
+        tooltip?: string;
+        tooltipPosition?: string;
+        tooltipStyles?: React.CSSProperties;
+        touch?: boolean;
+    }
+    export class IconButton extends React.Component<IconButtonProps, {}> {
+    }
+
+    namespace Card {
+
+        interface CardProps extends React.Props<Card> {
+            actAsExpander?: boolean;
+            expandable?: boolean;
+            initiallyExpanded?: boolean;
+            onExpandChange?: (isExpanded: boolean) => void;
+            showExpandableButton?: boolean;
+            style?: React.CSSProperties;
+        }
+        export class Card extends React.Component<CardProps, {}> {
+        }
+
+        interface CardActionsProps extends React.Props<CardActions> {
+            actAsExpander?: boolean;
+            expandable?: boolean;
+            showExpandableButton?: boolean;
+            style?: React.CSSProperties;
+        }
+        export class CardActions extends React.Component<CardActionsProps, {}> {
+        }
+
+        interface CardExpandableProps extends React.Props<CardExpandable> {
+            expanded?: boolean;
+            onExpanding?: (isExpanded: boolean) => void;
+            style?: React.CSSProperties;
+        }
+        export class CardExpandable extends React.Component<CardExpandableProps, {}> {
+        }
+
+        interface CardHeaderProps extends React.Props<CardHeader> {
+            actAsExpander?: boolean;
+            avatar?: React.ReactNode;
+            expandable?: boolean;
+            showExpandableButton?: boolean;
+            style?: React.CSSProperties;
+            subtitle?: React.ReactNode;
+            subtitleColor?: string;
+            subtitleStyle?: React.CSSProperties;
+            textStyle?: React.CSSProperties;
+            title?: React.ReactNode;
+            titleColor?: string;
+            titleStyle?: React.CSSProperties;
+        }
+        export class CardHeader extends React.Component<CardHeaderProps, {}> {
+        }
+
+        interface CardMediaProps extends React.Props<CardMedia> {
+            actAsExpander?: boolean;
+            expandable?: boolean;
+            mediaStyle?: React.CSSProperties;
+            overlay?: React.ReactNode;
+            overlayContainerStyle?: React.CSSProperties;
+            overlayContentStyle?: React.CSSProperties;
+            overlayStyle?: React.CSSProperties;
+            style?: React.CSSProperties;
+        }
+        export class CardMedia extends React.Component<CardMediaProps, {}> {
+        }
+
+        interface CardTextProps extends React.Props<CardText> {
+            actAsExpander?: boolean;
+            color?: string;
+            expandable?: boolean;
+            style?: React.CSSProperties;
+        }
+        export class CardText extends React.Component<CardTextProps, {}> {
+        }
+
+        interface CardTitleProps extends React.Props<CardTitle> {
+            actAsExpander?: boolean;
+            expandable?: boolean;
+            showExpandableButton?: boolean;
+            style?: React.CSSProperties;
+            subtitle?: React.ReactNode;
+            subtitleColor?: string;
+            subtitleStyle?: React.CSSProperties;
+            title?: React.ReactNode;
+            titleColor?: string;
+            titleStyle?: React.CSSProperties;
+        }
+        export class CardTitle extends React.Component<CardTitleProps, {}> {
+        }
+    }
+
+    namespace DatePicker {
+        interface DatePickerProps extends React.Props<DatePicker> {
+            // <TextField/> is the element that get the 'other' properties
+            DateTimeFormat?: Intl.DateTimeFormat;
+            autoOk?: boolean;
+            container?: string; // oneOf(['dialog', 'inline'])
+            defaultDate?: Date;
+            disableYearSelection?: boolean;
+            disabled?: boolean;
+            firstDayOfWeek?: number;
+            formatDate?: (date: Date) => string;
+            locale?: string;
+            maxDate?: Date;
+            minDate?: Date;
+            mode?: string;
+            onChange?: (e: any, date: Date) => void; // e is always null
+            onDismiss?: () => void;
+            onFocus?: React.FocusEventHandler;
+            onShow?: () => void;
+            onTouchTap?: React.TouchEventHandler;
+            shouldDisableDate?: (day: Date) => boolean;
+            /** @deprecated use noFilter instead */
+            showYearSelector?: boolean;
+            style?: React.CSSProperties;
+            textFieldStyle?: React.CSSProperties;
+            value?: Date;
+            valueLink?: ReactLink<Date>;
+            wordings?: {ok: string, cancel: string};
+
+            // From <TextField />
+            className?: string;
+            defaultValue?: string;
+            errorStyle?: React.CSSProperties;
+            errorText?: React.ReactNode;
+            floatingLabelStyle?: React.CSSProperties;
+            floatingLabelText?: React.ReactNode;
+            fullWidth?: boolean;
+            hintStyle?: React.CSSProperties;
+            hintText?: React.ReactNode;
+            id?: string;
+            inputStyle?: React.CSSProperties;
+            onBlur?: React.FocusEventHandler;
+            onKeyDown?: React.KeyboardEventHandler;
+            rows?: number,
+            rowsMax?: number,
+            type?: string;
+            underlineDisabledStyle?: React.CSSProperties;
+            underlineFocusStyle?: React.CSSProperties;
+            underlineShow?: boolean;
+            underlineStyle?: React.CSSProperties;
+        }
+        export class DatePicker extends React.Component<DatePickerProps, {}> {
+        }
+
+        interface DatePickerDialogProps extends React.Props<DatePickerDialog> {
+            // <Container/> is the element that get the 'other' properties
+            DateTimeFormat?: Intl.DateTimeFormat;
+            autoOk?: boolean;
+            container?: string; // oneOf(['dialog', 'inline'])
+            disableYearSelection?: boolean;
+            firstDayOfWeek?: number;
+            initialDate?: Date;
+            locale?: string;
+            maxDate?: Date;
+            minDate?: Date;
+            mode?: string;
+            onAccept?: (d: Date) => void;
+            onDismiss?: () => void;
+            onShow?: () => void;
+            shouldDisableDate?: (day: Date) => boolean;
+            showYearSelector?: boolean;
+            style?: React.CSSProperties;
+            wordings?: { ok: string, cancel: string };
+        }
+        export class DatePickerDialog extends React.Component<DatePickerDialogProps, {}> {
+        }
+    }
+
+    /** @deprecated use array of components instead */
+    export interface DialogAction {
+        id?: string;
+        onClick?: React.MouseEventHandler;
+        onTouchTap?: TouchTapEventHandler;
+        ref?: string;
+        text: string;
+    }
+    interface DialogProps extends React.DOMAttributes, React.Props<Dialog> {
+        /** @deprecated use a custom `actions` property instead */
+        actionFocus?: string;
+        actions?: Array<DialogAction | React.ReactElement<any>>;
+        actionsContainerClassName?: string;
+        actionsContainerStyle?: React.CSSProperties;
+        autoDetectWindowHeight?: boolean;
+        autoScrollBodyContent?: boolean;
+        bodyClassName?: string;
+        bodyStyle?: React.CSSProperties;
+        className?: string;
+        contentClassName?: string;
+        contentStyle?: React.CSSProperties;
+        modal?: boolean;
+        onRequestClose?: (buttonClicked: boolean) => void;
+        open: boolean;
+        overlayClassName?: string;
+        overlayStyle?: React.CSSProperties;
+        repositionOnUpdate?: boolean;
+        style?: React.CSSProperties;
+        title?: React.ReactNode;
+        titleClassName?: string;
+        titleStyle?: React.CSSProperties;
+        /** @deprecated use the contentStyle instead */
+        width?: string | number;
+    }
+    export class Dialog extends React.Component<DialogProps, {}> {
+    }
+
+    interface DividerProps extends React.Props<Divider> {
+        className?: string;
+        inset?: boolean;
+        style?: React.CSSProperties;
+    }
+    export class Divider extends React.Component<DividerProps, {}>{
+    }
+
+    namespace GridList {
+        interface GridListProps extends React.Props<GridList> {
+            cellHeight?: number;
+            cols?: number;
+            padding?: number;
+            style?: React.CSSProperties;
+        }
+
+        export class GridList extends React.Component<GridListProps, {}>{
+        }
+
+        interface GridTileProps extends React.Props<GridTile> {
+            actionIcon?: React.ReactElement<any>;
+            actionPosition?: string; //"left"|"right"
+            cols?: number;
+            rootClass?: string | React.Component<any, any>;
+            rows?: number;
+            style?: React.CSSProperties;
+            subtitle?: React.ReactNode;
+            title?: React.ReactNode;
+            titleBackground?: string;
+            titlePosition?: string; //"top"|"bottom"
+        }
+
+        export class GridTile extends React.Component<GridTileProps, {}>{
+        }
+    }
+
+    interface FontIconProps extends React.HTMLAttributes, React.Props<FontIcon> {
+        // <span/> is the element that get the 'other' properties
+        color?: string;
+        hoverColor?: string;
+        onMouseEnter?: React.MouseEventHandler;
+        onMouseLeave?: React.MouseEventHandler;
+        style?: React.CSSProperties;
+    }
+    export class FontIcon extends React.Component<FontIconProps, {}> {
+    }
+
+    interface SvgIconProps extends React.SVGAttributes, React.Props<SvgIcon> {
+        // <svg/> is the element that get the 'other' properties
+        color?: string;
+        hoverColor?: string;
+        onMouseEnter?: React.MouseEventHandler;
+        onMouseLeave?: React.MouseEventHandler;
+        style?: React.CSSProperties;
+        viewBox?: string;
+    }
+    export class SvgIcon extends React.Component<SvgIconProps, {}> {
+    }
+
+    interface LeftNavProps extends React.Props<LeftNav> {
+        className?: string;
+        containerClassName?: string;
+        containerStyle?: React.CSSProperties;
+        disableSwipeToOpen?: boolean;
+        docked?: boolean;
+        /** @deprecated use composability instead */
+        header?: React.ReactElement<any>;
+        /** @deprecated It will be removed with menuItems */
+        menuItemClassName?: string;
+        /** @deprecated It will be removed with menuItems */
+        menuItemClassNameLink?: string;
+        /** @deprecated It will be removed with menuItems */
+        menuItemClassNameSubheader?: string;
+        /** @deprecated use composability instead */
+        menuItems?: any[];
+        /** @deprecated It will be removed with menuItems */
+        onChange?: () => void;
+        /** @deprecated use onRequestChange instead */
+        onNavClose?: () => void;
+        /** @deprecated use onRequestChange instead */
+        onNavOpen?: () => void;
+        onRequestChange?: (opening: boolean, reason: string) => void;
+        open?: boolean;
+        openRight?: Boolean;
+        overlayClassName?: string;
+        overlayStyle?: React.CSSProperties;
+        /** @deprecated It will be removed with menuItems */
+        selectedIndex?: number;
+        style?: React.CSSProperties;
+        swipeAreaWidth?: number;
+        width?: number;
+
+    }
+    export class LeftNav extends React.Component<LeftNavProps, {}> {
+        /** @deprecated using methods on left nav has been deprecated */
+        toggle(): void;
+        /** @deprecated using methods on left nav has been deprecated */
+        close(): void;
+        /** @deprecated using methods on left nav has been deprecated */
+        open(): void;
+    }
+
+    namespace Lists {
+        interface ListProps extends React.Props<List> {
+            // <Paper/> is the element that get the 'other' properties
+            insetSubheader?: boolean;
+            style?: React.CSSProperties;
+            subheader?: string;
+            subheaderStyle?: React.CSSProperties;
+            zDepth?: number;
+        }
+        export class List extends React.Component<ListProps, {}> {
+        }
+
+        /** @deprecated Use Divider */
+        interface ListDividerProps extends React.Props<ListDivider> {
+            inset?: boolean;
+        }
+        /** @deprecated Use Divider */
+        export class ListDivider extends React.Component<ListDividerProps, {}> {
+        }
+
+        interface ListItemProps extends React.HTMLAttributes, React.Props<ListItem> {
+            // <EnhancedButton/> is the element that get the 'other' properties
+            autoGenerateNestedIndicator?: boolean;
+            disableKeyboardFocus?: boolean;
+            disabled?: boolean;
+            initiallyOpen?: boolean;
+            innerDivStyle?: React.CSSProperties;
+            insetChildren?: boolean;
+            leftAvatar?: React.ReactElement<any>;
+            leftCheckbox?: React.ReactElement<any>;
+            leftIcon?: React.ReactElement<any>;
+            nestedItems?: React.ReactElement<ListItemProps>[];
+            nestedLevel?: number;
+            nestedListStyle?: React.CSSProperties;
+            onKeyboardFocus?: React.FocusEventHandler;
+            onMouseEnter?: React.MouseEventHandler;
+            onMouseLeave?: React.MouseEventHandler;
+            onNestedListToggle?: (item: ListItem) => void;
+            onTouchStart?: React.TouchEventHandler;
+            onTouchTap?: TouchTapEventHandler;
+            primaryText?: React.ReactNode;
+            primaryTogglesNestedList?: boolean;
+            rightAvatar?: React.ReactElement<any>;
+            rightIcon?: React.ReactElement<any>;
+            rightIconButton?: React.ReactElement<any>;
+            rightToggle?: React.ReactElement<any>;
+            secondaryText?: React.ReactNode;
+            secondaryTextLines?: number; // 1 or 2
+            style?: React.CSSProperties;
+        }
+        export class ListItem extends React.Component<ListItemProps, {}> {
+        }
+    }
+
+    namespace Menus {
+        interface MenuProps extends React.Props<Menu> {
+            // <List/> is the element that get the 'other' properties
+            animated?: boolean;
+            autoWidth?: boolean;
+            desktop?: boolean;
+            initiallyKeyboardFocused?: boolean;
+            listStyle?: React.CSSProperties;
+            maxHeight?: number;
+            multiple?: boolean;
+            onChange?: (e: TouchTapEvent, itemValue: any | any[]) => void;
+            onEscKeyDown?: React.KeyboardEventHandler;
+            onItemTouchTap?: (e: TouchTapEvent, item: MenuItem) => void;
+            onKeyDown?: React.KeyboardEventHandler;
+            openDirection?: string;
+            selectedMenuItemStyle?: React.CSSProperties;
+            style?: React.CSSProperties;
+            value?: any | any[];
+            valueLink?: ReactLink<any | any[]>;
+            width?: string | number;
+            zDepth?: number;
+        }
+        export class Menu extends React.Component<MenuProps, {}>{
+        }
+
+        interface MenuItemProps extends React.HTMLAttributes, React.Props<MenuItem> {
+            // <ListItem/> is the element that get the 'other' properties
+            checked?: boolean;
+            desktop?: boolean;
+            disabled?: boolean;
+            focusState?: string; // 'none', 'focused', or 'keyboard-focused'
+            innerDivStyle?: React.CSSProperties;
+            insetChildren?: boolean;
+            leftIcon?: React.ReactElement<any>;
+            menuItems?: React.ReactNode;
+            onTouchTap?: TouchTapEventHandler;
+            rightIcon?: React.ReactElement<any>;
+            secondaryText?: React.ReactNode;
+            style?: React.CSSProperties;
+            value?: any;
+
+            // useful attributes passed to <ListItem/>
+            primaryText?: React.ReactNode;
+            secondaryTextLines?: number; // 1 or 2
+        }
+        export class MenuItem extends React.Component<MenuItemProps, {}>{
+        }
+
+        interface IconMenuProps extends React.Props<IconMenu> {
+            // <Menu/> is the element that get the 'other' properties
+            anchorOrigin?: Origin;
+            className?: string;
+            closeOnItemTouchTap?: boolean;
+            iconButtonElement: React.ReactElement<IconButtonProps>;
+            iconStyle?: React.CSSProperties;
+            menuStyle?: React.CSSProperties;
+            onItemTouchTap?: (e: TouchTapEvent, item: MenuItem) => void;
+            onKeyboardFocus?: React.FocusEventHandler;
+            onMouseDown?: React.MouseEventHandler;
+            onMouseEnter?: React.MouseEventHandler;
+            onMouseLeave?: React.MouseEventHandler;
+            onMouseUp?: React.MouseEventHandler;
+            onRequestChange?: (opening: boolean, reason: string) => void;
+            onTouchTap?: TouchTapEventHandler;
+            open?: boolean;
+            style?: React.CSSProperties;
+            targetOrigin?: Origin;
+            touchTapCloseDelay?: number;
+
+            // Other properties from <Menu/>
+            autoWidth?: boolean;
+            desktop?: boolean;
+            listStyle?: React.CSSProperties;
+            maxHeight?: number;
+            multiple?: boolean;
+            onChange?: (e: TouchTapEvent, itemValue: any | any[]) => void;
+            onKeyDown?: React.KeyboardEventHandler;
+            openDirection?: string;
+            selectedMenuItemStyle?: React.CSSProperties;
+            value?: any | any[];
+            valueLink?: ReactLink<any | any[]>;
+            width?: string | number;
+        }
+        export class IconMenu extends React.Component<IconMenuProps, {}> {
+        }
+
+        interface DropDownMenuProps extends React.Props<DropDownMenu> {
+            // <div/> is the element that gets the 'other' properties
+            autoWidth?: boolean;
+            className?: string;
+            disabled?: boolean;
+            /** @deprecated use composability instead */
+            displayMember?: string;
+            iconStyle?: any;
+            /** @deprecated use composability instead */
+            labelMember?: string;
+            labelStyle?: any;
+            maxHeight?: number;
+            /** @deprecated use composability instead */
+            menuItems?: any[];
+            menuStyle?: any;
+            onChange?: (e: TouchTapEvent, index: number, menuItemValue: any) => void;
+            openImmediately?: boolean;
+            /** @deprecated use value instead */
+            selectedIndex?: number;
+            style?: any;
+            underlineStyle?: any;
+            value?: any;
+            /** @deprecated It's deprecated by React too. */
+            valueLink?: ReactLink<any>;
+            /** @deprecated use composability instead */
+            valueMember?: string;
+        }
+        export class DropDownMenu extends React.Component<DropDownMenuProps, {}> {
+        }
+    }
+
+    interface OverlayProps extends React.Props<Overlay> {
+        autoLockScrolling?: boolean;
+        show?: boolean;
+        transitionEnabled?: boolean;
+    }
+    export class Overlay extends React.Component<OverlayProps, {}> {
+    }
+
+    interface PaperProps extends React.HTMLAttributes, React.Props<Paper> {
+        circle?: boolean;
+        rounded?: boolean;
+        style?: React.CSSProperties;
+        transitionEnabled?: boolean;
+        zDepth?: number;
+    }
+    export class Paper extends React.Component<PaperProps, {}> {
+    }
+
+    namespace Popover {
+        interface PopoverAnimationProps {
+            open: boolean;
+            style?: React.CSSProperties;
+        }
+
+        interface PopoverProps extends React.Props<Popover> {
+            anchorEl?: React.ReactInstance;
+            anchorOrigin?: Origin;
+            animated?: boolean;
+            animation?: React.ComponentClass<PopoverAnimationProps>;
+            autoCloseWhenOffScreen?: boolean;
+            canAutoPosition?: boolean;
+            className?: string;
+            onRequestClose?: (reason: string) => void;
+            open?: boolean;
+            style?: React.CSSProperties;
+            targetOrigin?: Origin;
+            useLayerForClickAway?: boolean;
+            zDepth?: number;
+        }
+        export class Popover extends React.Component<PopoverProps, {}>{
+        }
+
+        interface PopoverAnimationFromTopProps extends PopoverAnimationProps, React.Props<PopoverAnimationFromTop> {
+            className?: string;
+            targetOrigin?: Origin;
+            zDepth?: number;
+        }
+        export class PopoverAnimationFromTop extends React.Component<PopoverAnimationFromTopProps, {}>{
+        }
+
+        interface PopoverDefaultAnimationProps extends PopoverAnimationProps, React.Props<PopoverDefaultAnimation> {
+            className?: string;
+            targetOrigin?: Origin;
+            zDepth?: number;
+        }
+        export class PopoverDefaultAnimation extends React.Component<PopoverDefaultAnimationProps, {}>{
+        }
+    }
+
+    interface CircularProgressProps extends React.Props<CircularProgress> {
+        color?: string;
+        innerStyle?: React.CSSProperties;
+        max?: number;
+        min?: number;
+        mode?: string;
+        size?: number;
+        style?: React.CSSProperties;
+        value?: number;
+    }
+    export class CircularProgress extends React.Component<CircularProgressProps, {}> {
+    }
+
+    interface LinearProgressProps extends React.Props<LinearProgress> {
+        color?: string;
+        max?: number;
+        min?: number;
+        mode?: string;
+        style?: React.CSSProperties;
+        value?: number;
+    }
+    export class LinearProgress extends React.Component<LinearProgressProps, {}> {
+    }
+
+    interface RefreshIndicatorProps extends React.Props<RefreshIndicator> {
+        color?: string;
+        left: number;
+        loadingColor?: string;
+        percentage?: number;
+        size?: number;
+        status?: string;
+        style?: React.CSSProperties;
+        top: number;
+    }
+    export class RefreshIndicator extends React.Component<RefreshIndicatorProps, {}> {
+    }
+
+    interface SelectFieldProps extends React.Props<SelectField> {
+        // <DropDownMenu/> is the element that get the 'other' properties
+        autoWidth?: boolean;
+        disabled?: boolean;
+        /** @deprecated use composability instead */
+        displayMember?: string;
+        errorStyle?: React.CSSProperties;
+        errorText?: React.ReactNode;
+        floatingLabelStyle?: React.CSSProperties;
+        floatingLabelText?: React.ReactNode;
+        fullWidth?: boolean;
+        hintStyle?: React.CSSProperties;
+        hintText?: React.ReactNode;
+        iconStyle?: React.CSSProperties;
+        /** @deprecated use composability instead */
+        labelMember?: string;
+        labelStyle?: React.CSSProperties;
+        /** @deprecated use composability instead */
+        menuItems?: any[];
+        onBlur?: React.FocusEventHandler;
+        onChange?: (e: TouchTapEvent, index: number, menuItemValue: any) => void;
+        onFocus?: React.FocusEventHandler;
+        selectFieldRoot?: React.CSSProperties;
+        /** @deprecated use value instead */
+        selectedIndex?: number;
+        style?: React.CSSProperties;
+        underlineDisabledStyle?: React.CSSProperties;
+        underlineFocusStyle?: React.CSSProperties;
+        underlineStyle?: React.CSSProperties;
+        value?: any;
+        /** @deprecated It's deprecated by React too. */
+        valueLink?: ReactLink<any>;
+        /** @deprecated use composability instead */
+        valueMember?: string;
+
+        // useful attributes passed to <DropDownMenu/>
+        className?: string;
+        maxHeight?: number;
+        menuStyle?: any;
+        openImmediately?: boolean;
+    }
+    export class SelectField extends React.Component<SelectFieldProps, {}> {
+    }
+
+    interface SliderProps extends React.Props<Slider> {
+        defaultValue?: number;
+        description?: string;
+        disableFocusRipple?: boolean;
+        disabled?: boolean;
+        error?: string;
+        max?: number;
+        min?: number;
+        name?: string;
+        onBlur?: React.FocusEventHandler;
+        onChange?: (e: React.MouseEvent, value: number) => void;
+        onDragStart?: React.MouseEventHandler;
+        onDragStop?: React.MouseEventHandler;
+        onFocus?: React.FocusEventHandler;
+        required?: boolean;
+        step?: number;
+        style?: React.CSSProperties;
+        value?: number;
+    }
+    export class Slider extends React.Component<SliderProps, {}> {
+    }
+
+    // what's not commonly overridden by Checkbox, RadioButton, or Toggle
+    interface CommonEnhancedSwitchProps<T> extends React.HTMLAttributes, React.Props<T> {
+    }
+
+    interface EnhancedSwitchProps extends CommonEnhancedSwitchProps<EnhancedSwitch> {
+        // <input/> is element that get the 'other' properties
+        className?: string;
+        defaultSwitched?: boolean;
+        disableFocusRipple?: boolean;
+        disableTouchRipple?: boolean;
+        disabled?: boolean;
+        iconStyle?: React.CSSProperties;
+        id?: string;
+        inputStyle: React.CSSProperties;
+        inputType: string;
+        label?: string;
+        labelPosition?: string; // oneOf(['left', 'right'])
+        labelStyle?: React.CSSProperties;
+        name?: string;
+        onBlur?: React.FocusEventHandler;
+        onFocus?: React.FocusEventHandler;
+        onMouseDown?: React.MouseEventHandler;
+        onMouseLeave?: React.MouseEventHandler;
+        onMouseUp?: React.MouseEventHandler;
+        onParentShouldUpdate: (isInputChecked: boolean) => void;
+        onSwitch?: (e: React.MouseEvent, isInputChecked: boolean) => void;
+        onTouchEnd?: React.TouchEventHandler;
+        onTouchStart?: React.TouchEventHandler;
+        required?: boolean;
+        rippleColor?: string;
+        rippleStyle?: React.CSSProperties;
+        style?: React.CSSProperties;
+        switchElement: React.ReactElement<any>;
+        switched: boolean;
+        thumbStyle?: React.CSSProperties;
+        trackStyle?: React.CSSProperties;
+        value?: string;
+    }
+    export class EnhancedSwitch extends React.Component<EnhancedSwitchProps, {}> {
+        getValue(): string;
+        isKeyboardFocused(): boolean;
+        isSwitched(): boolean;
+        setSwitched(newSwitchedValue: boolean): void;
+    }
+
+    interface CheckboxProps extends CommonEnhancedSwitchProps<Checkbox> {
+        // <EnhancedSwitch/> is element that get the 'other' properties
+        checked?: boolean;
+        checkedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
+        defaultChecked?: boolean;
+        disabled?: boolean;
+        iconStyle?: React.CSSProperties;
+        labelPosition?: string; // oneOf(['left', 'right'])
+        labelStyle?: React.CSSProperties;
+        onCheck?: (event: React.MouseEvent, checked: boolean) => void;
+        style?: React.CSSProperties;
+        /** @deprecated Use uncheckedIcon instead */
+        unCheckedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
+        uncheckedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
+        valueLink?: ReactLink<boolean>;
+    }
+    export class Checkbox extends React.Component<CheckboxProps, {}> {
+        isChecked(): void;
+        setChecked(newCheckedValue: boolean): void;
+    }
+
+    interface RadioButtonProps extends CommonEnhancedSwitchProps<RadioButton> {
+        // <EnhancedSwitch/> is element that get the 'other' properties
+        checked?: boolean;
+        checkedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
+        disabled?: boolean;
+        iconStyle?: React.CSSProperties;
+        inputStyle?: React.CSSProperties;
+        labelPosition?: string; // oneOf(['left', 'right'])
+        labelStyle?: React.CSSProperties;
+        onCheck?: (e: React.FormEvent, selected: string) => void;
+        style?: React.CSSProperties;
+        uncheckedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
+        value?: string;
+    }
+    export class RadioButton extends React.Component<RadioButtonProps, {}> {
+        isChecked(): boolean;
+        getValue(): string;
+    }
+
+    interface RadioButtonGroupProps extends React.Props<RadioButtonGroup> {
+        className?: string;
+        defaultSelected?: string;
+        labelPosition?: string; // oneOf(['left', 'right'])
+        name: string;
+        onChange?: (e: React.FormEvent, selected: string) => void;
+        style?: React.CSSProperties;
+        valueSelected?: string;
+    }
+    export class RadioButtonGroup extends React.Component<RadioButtonGroupProps, {}> {
+        clearValue(): void;
+        getSelectedValue(): string;
+        setSelectedValue(newSelectionValue: string): void;
+    }
+
+    interface ToggleProps extends CommonEnhancedSwitchProps<Toggle> {
+        // <EnhancedSwitch/> is element that get the 'other' properties
+        defaultToggled?: boolean;
+        disabled?: boolean;
+        elementStyle?: React.CSSProperties;
+        iconStyle?: React.CSSProperties;
+        inputStyle?: React.CSSProperties;
+        labelPosition?: string; // oneOf(['left', 'right'])
+        labelStyle?: React.CSSProperties;
+        onToggle?: (e: React.MouseEvent, isInputChecked: boolean) => void;
+        rippleStyle?: React.CSSProperties;
+        style?: React.CSSProperties;
+        thumbStyle?: React.CSSProperties;
+        toggled?: boolean;
+        trackStyle?: React.CSSProperties;
+        valueLink?: ReactLink<boolean>;
+    }
+    export class Toggle extends React.Component<ToggleProps, {}> {
+        isToggled(): boolean;
+        setToggled(newToggledValue: boolean): void;
+    }
+
+    interface SnackbarProps extends React.Props<Snackbar> {
+        action?: string;
+        autoHideDuration?: number;
+        bodyStyle?: React.CSSProperties;
+        className?: string;
+        message: string;
+        onActionTouchTap?: React.TouchEventHandler;
+        /** @deprecated Use the open property to control the component instead */
+        onDismiss?: () => void; // DEPRECATED
+        onRequestClose: (reason: string) => void;
+        /** @deprecated Use the open property to control the component instead */
+        onShow?: () => void; // DEPRECATED
+        open: boolean;
+        /** @deprecated Use the open property to control the component instead */
+        openOnMount?: boolean; // DEPRECATED
+        style?: React.CSSProperties;
+
+    }
+    export class Snackbar extends React.Component<SnackbarProps, {}> {
+    }
+
+    namespace Table {
+        interface TableProps extends React.Props<Table> {
+            allRowsSelected?: boolean;
+            bodyStyle?: React.CSSProperties;
+            className?: string;
+            fixedFooter?: boolean;
+            fixedHeader?: boolean;
+            footerStyle?: React.CSSProperties;
+            headerStyle?: React.CSSProperties;
+            height?: string;
+            multiSelectable?: boolean;
+            onCellClick?: (row: number, column: number) => void;
+            onCellHover?: (row: number, column: number) => void;
+            onCellHoverExit?: (row: number, column: number) => void;
+            onRowHover?: (row: number) => void;
+            onRowHoverExit?: (row: number) => void;
+            onRowSelection?: (selectedRows: number[] | string) => void;
+            selectable?: boolean;
+            style?: React.CSSProperties;
+            wrapperStyle?: React.CSSProperties;
+        }
+        export class Table extends React.Component<TableProps, {}> {
+        }
+
+        interface TableRowProps extends React.Props<TableRow> {
+            // <tr/> is element that get the 'other' properties
+            className?: string;
+            displayBorder?: boolean;
+            hoverable?: boolean;
+            hovered?: boolean;
+            onCellClick?: (e: React.MouseEvent, row: number, column: number) => void;
+            onCellHover?: (e: React.MouseEvent, row: number, column: number) => void;
+            onCellHoverExit?: (e: React.MouseEvent, row: number, column: number) => void;
+            onRowClick?: (e: React.MouseEvent, row: number) => void;
+            onRowHover?: (e: React.MouseEvent, row: number) => void;
+            onRowHoverExit?: (e: React.MouseEvent, row: number) => void;
+            rowNumber?: number;
+            selectable?: boolean;
+            selected?: boolean;
+            striped?: boolean;
+            style?: React.CSSProperties;
+        }
+        export class TableRow extends React.Component<TableRowProps, {}> {
+        }
+
+        interface TableRowColumnProps extends React.Props<TableRowColumn> {
+            // <td/> is element that get the 'other' properties
+            className?: string;
+            columnNumber?: number;
+            hoverable?: boolean;
+            key?: string;
+            onClick?: (e: React.MouseEvent, column: number) => void;
+            onHover?: (e: React.MouseEvent, column: number) => void;
+            onHoverExit?: (e: React.MouseEvent, column: number) => void;
+            style?: React.CSSProperties;
+
+            // useful attributes passed to <td/>
+            colSpan?: number;
+        }
+        export class TableRowColumn extends React.Component<TableRowColumnProps, {}> {
+        }
+
+        interface TableHeaderProps extends React.Props<TableHeader> {
+            adjustForCheckbox?: boolean;
+            className?: string;
+            displaySelectAll?: boolean;
+            enableSelectAll?: boolean;
+            onSelectAll?: (checked: boolean) => void;
+            selectAllSelected?: boolean;
+            style?: React.CSSProperties;
+        }
+        export class TableHeader extends React.Component<TableHeaderProps, {}> {
+        }
+
+        interface TableHeaderColumnProps extends React.Props<TableHeaderColumn> {
+            // <th/> is element that get the 'other' properties
+            className?: string;
+            columnNumber?: number;
+            key?: string;
+            onClick?: (e: React.MouseEvent, column: number) => void;
+            style?: React.CSSProperties;
+            tooltip?: string;
+            tooltipStyle?: React.CSSProperties;
+
+            // useful attributes passed to <th/>
+            colSpan?: number;
+        }
+        export class TableHeaderColumn extends React.Component<TableHeaderColumnProps, {}> {
+        }
+
+        interface TableBodyProps extends React.Props<TableBody> {
+            allRowsSelected?: boolean;
+            className?: string;
+            deselectOnClickaway?: boolean;
+            displayRowCheckbox?: boolean;
+            multiSelectable?: boolean;
+            onCellClick?: (row: number, column: number) => void;
+            onCellHover?: (row: number, column: number) => void;
+            onCellHoverExit?: (row: number, column: number) => void;
+            onRowHover?: (row: number) => void;
+            onRowHoverExit?: (row: number) => void;
+            onRowSelection?: (selectedRows: number[] | string) => void;
+            preScanRows?: boolean;
+            selectable?: boolean;
+            showRowHover?: boolean;
+            stripedRows?: boolean;
+            style?: React.CSSProperties;
+        }
+        export class TableBody extends React.Component<TableBodyProps, {}> {
+        }
+
+        interface TableFooterProps extends React.Props<TableFooter> {
+            // <tfoot/> is element that get the 'other' properties
+            adjustForCheckbox?: boolean;
+            className?: string;
+            style?: React.CSSProperties;
+        }
+        export class TableFooter extends React.Component<TableFooterProps, {}> {
+        }
+    }
+
+    namespace Tabs {
+        interface TabsProps extends React.Props<Tabs> {
+            className?: string;
+            contentContainerClassName?: string;
+            contentContainerStyle?: React.CSSProperties;
+            initialSelectedIndex?: number;
+            inkBarStyle?: React.CSSProperties;
+            onChange?: (value: any, e: React.FormEvent, tab: Tab) => void;
+            style?: React.CSSProperties;
+            tabItemContainerStyle?: React.CSSProperties;
+            tabTemplate?: React.ComponentClass<any>;
+            value?: any;
+        }
+        export class Tabs extends React.Component<TabsProps, {}> {
+        }
+
+        interface TabProps extends React.Props<Tab> {
+            className?: string;
+            icon?: React.ReactNode;
+            label?: React.ReactNode;
+            onActive?: (tab: Tab) => void;
+            onTouchTap?: (value: any, e: TouchTapEvent, tab: Tab) => void;
+            selected?: boolean;
+            style?: React.CSSProperties;
+            value?: any;
+            width?: string;
+        }
+        export class Tab extends React.Component<TabProps, {}> {
+        }
+    }
+
+    interface TextFieldProps extends React.Props<TextField> {
+        className?: string;
+        defaultValue?: string | number;
+        disabled?: boolean;
+        errorStyle?: React.CSSProperties;
+        errorText?: React.ReactNode;
+        floatingLabelStyle?: React.CSSProperties;
+        floatingLabelText?: React.ReactNode;
+        fullWidth?: boolean;
+        hintStyle?: React.CSSProperties;
+        hintText?: React.ReactNode;
+        id?: string;
+        inputStyle?: React.CSSProperties;
+        multiLine?: boolean;
+        onBlur?: React.FocusEventHandler;
+        onChange?: React.FormEventHandler;
+        onEnterKeyDown?: React.KeyboardEventHandler;
+        onFocus?: React.FocusEventHandler;
+        onKeyDown?: React.KeyboardEventHandler;
+        rows?: number,
+        rowsMax?: number,
+        style?: React.CSSProperties;
+        type?: string;
+        underlineDisabledStyle?: React.CSSProperties;
+        underlineFocusStyle?: React.CSSProperties;
+        underlineShow?: boolean;
+        underlineStyle?: React.CSSProperties;
+        value?: string | number;
+        valueLink?: ReactLink<string | number>;
+    }
+    export class TextField extends React.Component<TextFieldProps, {}> {
+        blur(): void;
+        clearValue(): void;
+        focus(): void;
+        getValue(): string;
+        /** @deprecated Use the errorText property instead. */
+        setErrorText(newErrorText: string): void;
+        /** @deprecated Use the defaultValue or value property instead. */
+        setValue(newValue: string | number): void;
+    }
+
+    interface TimePickerProps extends React.Props<TimePicker> {
+        // <TextField/> is element that get the 'other' properties
+        autoOk?: boolean;
+        defaultTime?: Date;
+        format?: string; // 'ampm' or '24hr'
+        onChange?: (e: any, time: Date) => void;
+        onDismiss?: () => void;
+        onFocus?: React.FocusEventHandler;
+        onShow?: () => void;
+        onTouchTap?: TouchTapEventHandler;
+        pedantic?: boolean;
+        style?: React.CSSProperties;
+        textFieldStyle?: React.CSSProperties;
+
+        // From <TextField />
+        className?: string;
+        defaultValue?: string;
+        errorStyle?: React.CSSProperties;
+        errorText?: React.ReactNode;
+        floatingLabelStyle?: React.CSSProperties;
+        floatingLabelText?: React.ReactNode;
+        fullWidth?: boolean;
+        hintStyle?: React.CSSProperties;
+        hintText?: React.ReactNode;
+        id?: string;
+        inputStyle?: React.CSSProperties;
+        onBlur?: React.FocusEventHandler;
+        onKeyDown?: React.KeyboardEventHandler;
+        rows?: number,
+        rowsMax?: number,
+        type?: string;
+        underlineDisabledStyle?: React.CSSProperties;
+        underlineFocusStyle?: React.CSSProperties;
+        underlineShow?: boolean;
+        underlineStyle?: React.CSSProperties;
+    }
+    export class TimePicker extends React.Component<TimePickerProps, {}> {
+        getTime(): Date;
+        setTime(time: Date): void;
+        openDialog(): void;
+    }
+
+    namespace Toolbar {
+        interface ToolbarProps extends React.Props<Toolbar> {
+            className?: string;
+            noGutter?: boolean;
+            style?: React.CSSProperties;
+        }
+        export class Toolbar extends React.Component<ToolbarProps, {}> {
+        }
+
+        interface ToolbarGroupProps extends React.Props<ToolbarGroup> {
+            className?: string;
+            firstChild?: boolean;
+            float?: string; // oneOf(['left', 'right'])
+            lastChild?: boolean;
+            style?: React.CSSProperties;
+        }
+        export class ToolbarGroup extends React.Component<ToolbarGroupProps, {}> {
+        }
+
+        interface ToolbarSeparatorProps extends React.Props<ToolbarSeparator> {
+            className?: string;
+            style?: React.CSSProperties;
+        }
+        export class ToolbarSeparator extends React.Component<ToolbarSeparatorProps, {}> {
+        }
+
+        interface ToolbarTitleProps extends React.HTMLAttributes, React.Props<ToolbarTitle> {
+            className?: string;
+            style?: React.CSSProperties;
+            text?: string;
+        }
+        export class ToolbarTitle extends React.Component<ToolbarTitleProps, {}> {
+        }
+    }
+
+    namespace Ripples {
+        interface CircleRippleProps extends React.Props<CircleRipple> {
+            color?: string;
+            muiTheme: Styles.MuiTheme;
+            opacity?: number;
+            style?: React.CSSProperties;
+        }
+        export class CircleRipple extends React.Component<CircleRippleProps, {}> {
+        }
+
+        interface FocusRippleProps extends React.Props<FocusRipple> {
+            color?: string;
+            innerStyle?: React.CSSProperties;
+            muiTheme: Styles.MuiTheme;
+            opacity?: number;
+            show?: boolean;
+            style?: React.CSSProperties;
+        }
+        export class FocusRipple extends React.Component<FocusRippleProps, {}> {
+        }
+
+        interface TouchRippleProps extends React.Props<TouchRipple> {
+            centerRipple?: boolean;
+            color?: string;
+            muiTheme: Styles.MuiTheme;
+            opacity?: number;
+            style?: React.CSSProperties;
+        }
+        export class TouchRipple extends React.Component<TouchRippleProps, {}> {
+        }
+    }
+
+    interface ClearFixProps extends React.Props<ClearFix> {
+    }
+    export class ClearFix extends React.Component<ClearFixProps, {}> {
+    }
+
+    interface TooltipProps extends React.Props<Tooltip> {
+        className?: string;
+        horizontalPosition?: string; // oneOf(['left', 'right', 'center'])
+        label: string;
+        show?: boolean;
+        style?: React.CSSProperties;
+        touch?: boolean;
+        verticalPosition?: string; // oneOf(['top', 'bottom'])
+    }
+    export class Tooltip extends React.Component<TooltipProps, {}> {
+    }
+
+    namespace Hoc {
+        interface SelectableProps {
+            onChange?: (e: TouchTapEvent, value: any) => void;
+            selectedItemStyle?: React.CSSProperties;
+            value?: any;
+            valueLink?: { value: any; requestChange: (e: TouchTapEvent, value: any) => void };
+        }
+
+        // union types for higher order components in TypeScript 1.8: https://github.com/Microsoft/TypeScript/issues/4362
+        export function SelectableContainerEnhance<P extends {}>(component: React.ComponentClass<P>): React.ComponentClass<P & SelectableProps>;
+    }
+
+    export namespace Mixins {
+        interface ClickAwayable extends React.Mixin<any, any> {
+        }
+        var ClickAwayable: ClickAwayable;
+
+        interface WindowListenable extends React.Mixin<any, any> {
+        }
+        var WindowListenable: WindowListenable;
+
+        interface StylePropable extends React.Mixin<any, any> {
+        }
+        var StylePropable: StylePropable
+
+        interface StyleResizable extends React.Mixin<any, any> {
+        }
+        var StyleResizable: StyleResizable
+    }
+
+    export namespace Utils {
+        interface ContrastLevel {
+            color: string;
+            range: [number, number];
+        }
+        interface ColorManipulator {
+            contrastRatio(background: string, foreground: string): number;
+            contrastRatioLevel(background: string, foreground: string): ContrastLevel;
+            darken(color: string, amount: string | number): string;
+            fade(color: string, amount: string | number): string;
+            lighten(color: string, amount: string | number): string;
+        }
+        export var ColorManipulator: ColorManipulator;
+
+        interface CssEvent {
+            animationEndEventName(): string;
+            onAnimationEnd(el: Element, callback: () => void): void;
+            onTransitionEnd(el: Element, callback: () => void): void;
+            transitionEndEventName(): string;
+        }
+        export var CssEvent: CssEvent;
+
+        interface Dom {
+            addClass(el: Element, className: string): void;
+            forceRedraw(el: HTMLElement): void;
+            getStyleAttributeAsNumber(el: HTMLElement, attr: string): number;
+            hasClass(el: Element, className: string): boolean;
+            isDescendant(parent: Node, child: Node): boolean;
+            offset(el: Element): { top: number, left: number };
+            removeClass(el: Element, className: string): void;
+            toggleClass(el: Element, className: string): void;
+            withoutTransition(el: HTMLElement, callback: () => void): void;
+        }
+        export var Dom: Dom;
+
+        interface Events {
+            isKeyboard(e: Event): boolean;
+            off(el: Element, type: string, callback: EventListener): void;
+            on(el: Element, type: string, callback: EventListener): void;
+            once(el: Element, type: string, callback: EventListener): void;
+        }
+        export var Events: Events;
+
+        function Extend<T, S1>(base: T, override: S1): (T & S1);
+
+        interface ImmutabilityHelper {
+            merge(base: any, ...args: any[]): any;
+            mergeItem(obj: any, key: any, newValueObject: any): any;
+            push(array: any[], obj: any): any[];
+            shift(array: any[]): any[];
+        }
+        export var ImmutabilityHelper: ImmutabilityHelper;
+
+        interface KeyCode {
+            DOWN: number;
+            ESC: number;
+            ENTER: number;
+            LEFT: number;
+            RIGHT: number;
+            SPACE: number;
+            TAB: number;
+            UP: number;
+        }
+        var KeyCode: KeyCode;
+
+        interface KeyLine {
+            Desktop: {
+                GUTTER: number;
+                GUTTER_LESS: number;
+                INCREMENT: number;
+                MENU_ITEM_HEIGHT: number;
+            };
+
+            getIncrementalDim(dim: number): number;
+        }
+        export var KeyLine: KeyLine;
+
+        interface UniqueId {
+            generate(): string;
+        }
+        export var UniqueId: UniqueId;
+
+        interface Styles {
+            mergeAndPrefix(base: any, ...args: any[]): React.CSSProperties;
+        }
+        export var Styles: Styles;
+    }
+}    // __MaterialUI
+
+declare module 'material-ui/lib/app-bar' {
+    export import AppBar = __MaterialUI.AppBar;
+    export default AppBar;
+}
+
+declare module 'material-ui/lib/auto-complete' {
+    export import AutoComplete = __MaterialUI.AutoComplete;
+    export default AutoComplete;
+}
+
+declare module 'material-ui/lib/app-canvas' {
+    export import AppCanvas = __MaterialUI.AppCanvas;
+    export default AppCanvas;
+}
+
+declare module 'material-ui/lib/avatar' {
+    export import Avatar = __MaterialUI.Avatar;
+    export default Avatar;
+}
+
+declare module "material-ui/lib/badge" {
+    export import Badge = __MaterialUI.Badge;
+    export default Badge;
+}
+
+declare module 'material-ui/lib/before-after-wrapper' {
+    export import BeforeAfterWrapper = __MaterialUI.BeforeAfterWrapper;
+    export default BeforeAfterWrapper;
+}
+
+declare module 'material-ui/lib/card/card' {
+    export import Card = __MaterialUI.Card.Card;
+    export default Card;
+}
+
+declare module 'material-ui/lib/card/card-actions' {
+    export import CardActions = __MaterialUI.Card.CardActions;
+    export default CardActions;
+}
+
+declare module 'material-ui/lib/card/card-expandable' {
+    export import CardExpandable = __MaterialUI.Card.CardExpandable;
+    export default CardExpandable;
+}
+
+declare module 'material-ui/lib/card/card-header' {
+    export import CardHeader = __MaterialUI.Card.CardHeader;
+    export default CardHeader;
+}
+
+declare module 'material-ui/lib/card/card-media' {
+    export import CardMedia = __MaterialUI.Card.CardMedia;
+    export default CardMedia;
+}
+
+declare module 'material-ui/lib/card/card-text' {
+    export import CardText = __MaterialUI.Card.CardText;
+    export default CardText;
+}
+
+declare module 'material-ui/lib/card/card-title' {
+    export import CardTitle = __MaterialUI.Card.CardTitle;
+    export default CardTitle;
+}
+
+declare module 'material-ui/lib/checkbox' {
+    export import Checkbox = __MaterialUI.Checkbox;
+    export default Checkbox;
+}
+
+declare module 'material-ui/lib/circular-progress' {
+    export import CircularProgress = __MaterialUI.CircularProgress;
+    export default CircularProgress;
+}
+
+declare module 'material-ui/lib/clearfix' {
+    export import ClearFix = __MaterialUI.ClearFix;
+    export default ClearFix;
+}
+
+declare module 'material-ui/lib/date-picker/date-picker' {
+    export import DatePicker = __MaterialUI.DatePicker.DatePicker;
+    export default DatePicker;
+}
+
+declare module 'material-ui/lib/date-picker/date-picker-dialog' {
+    export import DatePickerDialog = __MaterialUI.DatePicker.DatePickerDialog;
+    export default DatePickerDialog;
+}
+
+declare module 'material-ui/lib/dialog' {
+    export import Dialog = __MaterialUI.Dialog;
+    export default Dialog;
+}
+
+declare module 'material-ui/lib/drop-down-menu' {
+    export import DropDownMenu = __MaterialUI.Menus.DropDownMenu;
+    export default DropDownMenu;
+}
+
+declare module 'material-ui/lib/DropDownMenu' {
+    export import DropDownMenu = __MaterialUI.Menus.DropDownMenu;
+    export default DropDownMenu;
+}
+
+declare module 'material-ui/lib/DropDownMenu/DropDownMenu' {
+    export import DropDownMenu = __MaterialUI.Menus.DropDownMenu;
+    export default DropDownMenu;
+}
+
+declare module 'material-ui/lib/enhanced-button' {
+    export import EnhancedButton = __MaterialUI.EnhancedButton;
+    export default EnhancedButton;
+}
+
+declare module 'material-ui/lib/flat-button' {
+    export import FlatButton = __MaterialUI.FlatButton;
+    export default FlatButton;
+}
+
+declare module 'material-ui/lib/floating-action-button' {
+    export import FloatingActionButton = __MaterialUI.FloatingActionButton;
+    export default FloatingActionButton;
+}
+
+declare module 'material-ui/lib/font-icon' {
+    export import FontIcon = __MaterialUI.FontIcon;
+    export default FontIcon;
+}
+
+declare module 'material-ui/lib/hoc/selectable-enhance' {
+    export import SelectableContainerEnhance = __MaterialUI.Hoc.SelectableContainerEnhance;
+    export default SelectableContainerEnhance;
+}
+
+declare module 'material-ui/lib/icon-button' {
+    export import IconButton = __MaterialUI.IconButton;
+    export default IconButton;
+}
+
+declare module 'material-ui/lib/left-nav' {
+    export import LeftNav = __MaterialUI.LeftNav;
+    export default LeftNav;
+}
+
+declare module 'material-ui/lib/linear-progress' {
+    export import LinearProgress = __MaterialUI.LinearProgress;
+    export default LinearProgress;
+}
+
+declare module 'material-ui/lib/lists/list' {
+    export import List = __MaterialUI.Lists.List;
+    export default List;
+}
+
+declare module 'material-ui/lib/lists/list-divider' {
+    export import ListDivider = __MaterialUI.Lists.ListDivider;
+    export default ListDivider;
+}
+
+declare module 'material-ui/lib/lists/list-item' {
+    export import ListItem = __MaterialUI.Lists.ListItem;
+    export default ListItem;
+}
+
+declare module 'material-ui/lib/mixins' {
+    export import ClickAwayable = __MaterialUI.Mixins.ClickAwayable; // require('material-ui/lib/mixins/click-awayable');
+    export import WindowListenable = __MaterialUI.Mixins.WindowListenable; // require('material-ui/lib/mixins/window-listenable');
+    export import StylePropable = __MaterialUI.Mixins.StylePropable; // require('material-ui/lib/mixins/style-propable');
+    export import StyleResizable = __MaterialUI.Mixins.StyleResizable; // require('material-ui/lib/mixins/style-resizable');
+}
+
+declare module 'material-ui/lib/mixins/click-awayable' {
+    export import ClickAwayable = __MaterialUI.Mixins.ClickAwayable;
+    export default ClickAwayable;
+}
+
+declare module 'material-ui/lib/mixins/window-listenable' {
+    export import WindowListenable = __MaterialUI.Mixins.WindowListenable;
+    export default WindowListenable;
+}
+
+declare module 'material-ui/lib/mixins/style-propable' {
+    export import StylePropable = __MaterialUI.Mixins.StylePropable;
+    export default StylePropable;
+}
+
+declare module 'material-ui/lib/mixins/style-resizable' {
+    export import StyleResizable = __MaterialUI.Mixins.StyleResizable;
+    export default StyleResizable;
+}
+
+declare module 'material-ui/lib/overlay' {
+    export import Overlay = __MaterialUI.Overlay;
+    export default Overlay;
+}
+
+declare module 'material-ui/lib/paper' {
+    export import Paper = __MaterialUI.Paper;
+    export default Paper;
+}
+
+declare module 'material-ui/lib/popover/popover' {
+    export import Popover = __MaterialUI.Popover.Popover;
+    export default Popover;
+}
+
+declare module 'material-ui/lib/popover/popover-default-animation' {
+    export import PopoverDefaultAnimation = __MaterialUI.Popover.PopoverDefaultAnimation;
+    export default PopoverDefaultAnimation;
+}
+
+declare module 'material-ui/lib/popover/popover-animation-from-top' {
+    export import PopoverAnimationFromTop = __MaterialUI.Popover.PopoverAnimationFromTop;
+    export default PopoverAnimationFromTop;
+}
+
+declare module 'material-ui/lib/radio-button' {
+    export import RadioButton = __MaterialUI.RadioButton;
+    export default RadioButton;
+}
+
+declare module 'material-ui/lib/radio-button-group' {
+    export import RadioButtonGroup = __MaterialUI.RadioButtonGroup;
+    export default RadioButtonGroup;
+}
+
+declare module 'material-ui/lib/raised-button' {
+    export import RaisedButton = __MaterialUI.RaisedButton;
+    export default RaisedButton;
+}
+
+declare module 'material-ui/lib/refresh-indicator' {
+    export import RefreshIndicator = __MaterialUI.RefreshIndicator;
+    export default RefreshIndicator;
+}
+
+declare module 'material-ui/lib/ripples' {
+    export import CircleRipple = __MaterialUI.Ripples.CircleRipple;
+    export import FocusRipple = __MaterialUI.Ripples.FocusRipple;
+    export import TouchRipple = __MaterialUI.Ripples.TouchRipple;
+}
+
+declare module 'material-ui/lib/select-field' {
+    export import SelectField = __MaterialUI.SelectField;
+    export default SelectField;
+}
+
+declare module 'material-ui/lib/slider' {
+    export import Slider = __MaterialUI.Slider;
+    export default Slider;
+}
+
+declare module 'material-ui/lib/svg-icon' {
+    export import SvgIcon = __MaterialUI.SvgIcon;
+    export default SvgIcon;
+}
+
+declare module 'material-ui/lib/svg-icons/action/work' {
+  export import ActionWork = __MaterialUI.SvgIcon;
+  export default ActionWork;
+}
+
+declare module 'material-ui/lib/svg-icons/action/camera-enhance' {
+  export import ActionCameraEnhance = __MaterialUI.SvgIcon;
+  export default ActionCameraEnhance;
+}
+
+declare module 'material-ui/lib/svg-icons/action/flip-to-back' {
+  export import ActionFlipToBack = __MaterialUI.SvgIcon;
+  export default ActionFlipToBack;
+}
+
+declare module 'material-ui/lib/svg-icons/action/feedback' {
+  export import ActionFeedback = __MaterialUI.SvgIcon;
+  export default ActionFeedback;
+}
+
+declare module 'material-ui/lib/svg-icons/action/assignment-turned-in' {
+  export import ActionAssignmentTurnedIn = __MaterialUI.SvgIcon;
+  export default ActionAssignmentTurnedIn;
+}
+
+declare module 'material-ui/lib/svg-icons/action/track-changes' {
+  export import ActionTrackChanges = __MaterialUI.SvgIcon;
+  export default ActionTrackChanges;
+}
+
+declare module 'material-ui/lib/svg-icons/action/view-stream' {
+  export import ActionViewStream = __MaterialUI.SvgIcon;
+  export default ActionViewStream;
+}
+
+declare module 'material-ui/lib/svg-icons/action/open-in-browser' {
+  export import ActionOpenInBrowser = __MaterialUI.SvgIcon;
+  export default ActionOpenInBrowser;
+}
+
+declare module 'material-ui/lib/svg-icons/action/view-headline' {
+  export import ActionViewHeadline = __MaterialUI.SvgIcon;
+  export default ActionViewHeadline;
+}
+
+declare module 'material-ui/lib/svg-icons/action/alarm-add' {
+  export import ActionAlarmAdd = __MaterialUI.SvgIcon;
+  export default ActionAlarmAdd;
+}
+
+declare module 'material-ui/lib/svg-icons/action/history' {
+  export import ActionHistory = __MaterialUI.SvgIcon;
+  export default ActionHistory;
+}
+
+declare module 'material-ui/lib/svg-icons/action/perm-device-information' {
+  export import ActionPermDeviceInformation = __MaterialUI.SvgIcon;
+  export default ActionPermDeviceInformation;
+}
+
+declare module 'material-ui/lib/svg-icons/action/reorder' {
+  export import ActionReorder = __MaterialUI.SvgIcon;
+  export default ActionReorder;
+}
+
+declare module 'material-ui/lib/svg-icons/action/assignment' {
+  export import ActionAssignment = __MaterialUI.SvgIcon;
+  export default ActionAssignment;
+}
+
+declare module 'material-ui/lib/svg-icons/action/shopping-cart' {
+  export import ActionShoppingCart = __MaterialUI.SvgIcon;
+  export default ActionShoppingCart;
+}
+
+declare module 'material-ui/lib/svg-icons/action/face' {
+  export import ActionFace = __MaterialUI.SvgIcon;
+  export default ActionFace;
+}
+
+declare module 'material-ui/lib/svg-icons/action/event' {
+  export import ActionEvent = __MaterialUI.SvgIcon;
+  export default ActionEvent;
+}
+
+declare module 'material-ui/lib/svg-icons/action/view-week' {
+  export import ActionViewWeek = __MaterialUI.SvgIcon;
+  export default ActionViewWeek;
+}
+
+declare module 'material-ui/lib/svg-icons/action/rounded-corner' {
+  export import ActionRoundedCorner = __MaterialUI.SvgIcon;
+  export default ActionRoundedCorner;
+}
+
+declare module 'material-ui/lib/svg-icons/action/view-carousel' {
+  export import ActionViewCarousel = __MaterialUI.SvgIcon;
+  export default ActionViewCarousel;
+}
+
+declare module 'material-ui/lib/svg-icons/action/toll' {
+  export import ActionToll = __MaterialUI.SvgIcon;
+  export default ActionToll;
+}
+
+declare module 'material-ui/lib/svg-icons/action/home' {
+  export import ActionHome = __MaterialUI.SvgIcon;
+  export default ActionHome;
+}
+
+declare module 'material-ui/lib/svg-icons/action/subject' {
+  export import ActionSubject = __MaterialUI.SvgIcon;
+  export default ActionSubject;
+}
+
+declare module 'material-ui/lib/svg-icons/action/lock' {
+  export import ActionLock = __MaterialUI.SvgIcon;
+  export default ActionLock;
+}
+
+declare module 'material-ui/lib/svg-icons/action/visibility-off' {
+  export import ActionVisibilityOff = __MaterialUI.SvgIcon;
+  export default ActionVisibilityOff;
+}
+
+declare module 'material-ui/lib/svg-icons/action/opacity' {
+  export import ActionOpacity = __MaterialUI.SvgIcon;
+  export default ActionOpacity;
+}
+
+declare module 'material-ui/lib/svg-icons/action/dns' {
+  export import ActionDns = __MaterialUI.SvgIcon;
+  export default ActionDns;
+}
+
+declare module 'material-ui/lib/svg-icons/action/open-with' {
+  export import ActionOpenWith = __MaterialUI.SvgIcon;
+  export default ActionOpenWith;
+}
+
+declare module 'material-ui/lib/svg-icons/action/system-update-alt' {
+  export import ActionSystemUpdateAlt = __MaterialUI.SvgIcon;
+  export default ActionSystemUpdateAlt;
+}
+
+declare module 'material-ui/lib/svg-icons/action/picture-in-picture-alt' {
+  export import ActionPictureInPictureAlt = __MaterialUI.SvgIcon;
+  export default ActionPictureInPictureAlt;
+}
+
+declare module 'material-ui/lib/svg-icons/action/bookmark-border' {
+  export import ActionBookmarkBorder = __MaterialUI.SvgIcon;
+  export default ActionBookmarkBorder;
+}
+
+declare module 'material-ui/lib/svg-icons/action/settings' {
+  export import ActionSettings = __MaterialUI.SvgIcon;
+  export default ActionSettings;
+}
+
+declare module 'material-ui/lib/svg-icons/action/dashboard' {
+  export import ActionDashboard = __MaterialUI.SvgIcon;
+  export default ActionDashboard;
+}
+
+declare module 'material-ui/lib/svg-icons/action/done-all' {
+  export import ActionDoneAll = __MaterialUI.SvgIcon;
+  export default ActionDoneAll;
+}
+
+declare module 'material-ui/lib/svg-icons/action/aspect-ratio' {
+  export import ActionAspectRatio = __MaterialUI.SvgIcon;
+  export default ActionAspectRatio;
+}
+
+declare module 'material-ui/lib/svg-icons/action/verified-user' {
+  export import ActionVerifiedUser = __MaterialUI.SvgIcon;
+  export default ActionVerifiedUser;
+}
+
+declare module 'material-ui/lib/svg-icons/action/update' {
+  export import ActionUpdate = __MaterialUI.SvgIcon;
+  export default ActionUpdate;
+}
+
+declare module 'material-ui/lib/svg-icons/action/query-builder' {
+  export import ActionQueryBuilder = __MaterialUI.SvgIcon;
+  export default ActionQueryBuilder;
+}
+
+declare module 'material-ui/lib/svg-icons/action/supervisor-account' {
+  export import ActionSupervisorAccount = __MaterialUI.SvgIcon;
+  export default ActionSupervisorAccount;
+}
+
+declare module 'material-ui/lib/svg-icons/action/polymer' {
+  export import ActionPolymer = __MaterialUI.SvgIcon;
+  export default ActionPolymer;
+}
+
+declare module 'material-ui/lib/svg-icons/action/accessible' {
+  export import ActionAccessible = __MaterialUI.SvgIcon;
+  export default ActionAccessible;
+}
+
+declare module 'material-ui/lib/svg-icons/action/highlight-off' {
+  export import ActionHighlightOff = __MaterialUI.SvgIcon;
+  export default ActionHighlightOff;
+}
+
+declare module 'material-ui/lib/svg-icons/action/power-settings-new' {
+  export import ActionPowerSettingsNew = __MaterialUI.SvgIcon;
+  export default ActionPowerSettingsNew;
+}
+
+declare module 'material-ui/lib/svg-icons/action/chrome-reader-mode' {
+  export import ActionChromeReaderMode = __MaterialUI.SvgIcon;
+  export default ActionChromeReaderMode;
+}
+
+declare module 'material-ui/lib/svg-icons/action/perm-camera-mic' {
+  export import ActionPermCameraMic = __MaterialUI.SvgIcon;
+  export default ActionPermCameraMic;
+}
+
+declare module 'material-ui/lib/svg-icons/action/touch-app' {
+  export import ActionTouchApp = __MaterialUI.SvgIcon;
+  export default ActionTouchApp;
+}
+
+declare module 'material-ui/lib/svg-icons/action/receipt' {
+  export import ActionReceipt = __MaterialUI.SvgIcon;
+  export default ActionReceipt;
+}
+
+declare module 'material-ui/lib/svg-icons/action/assignment-late' {
+  export import ActionAssignmentLate = __MaterialUI.SvgIcon;
+  export default ActionAssignmentLate;
+}
+
+declare module 'material-ui/lib/svg-icons/action/alarm-off' {
+  export import ActionAlarmOff = __MaterialUI.SvgIcon;
+  export default ActionAlarmOff;
+}
+
+declare module 'material-ui/lib/svg-icons/action/toc' {
+  export import ActionToc = __MaterialUI.SvgIcon;
+  export default ActionToc;
+}
+
+declare module 'material-ui/lib/svg-icons/action/settings-bluetooth' {
+  export import ActionSettingsBluetooth = __MaterialUI.SvgIcon;
+  export default ActionSettingsBluetooth;
+}
+
+declare module 'material-ui/lib/svg-icons/action/settings-brightness' {
+  export import ActionSettingsBrightness = __MaterialUI.SvgIcon;
+  export default ActionSettingsBrightness;
+}
+
+declare module 'material-ui/lib/svg-icons/action/donut-small' {
+  export import ActionDonutSmall = __MaterialUI.SvgIcon;
+  export default ActionDonutSmall;
+}
+
+declare module 'material-ui/lib/svg-icons/action/zoom-out' {
+  export import ActionZoomOut = __MaterialUI.SvgIcon;
+  export default ActionZoomOut;
+}
+
+declare module 'material-ui/lib/svg-icons/action/loyalty' {
+  export import ActionLoyalty = __MaterialUI.SvgIcon;
+  export default ActionLoyalty;
+}
+
+declare module 'material-ui/lib/svg-icons/action/search' {
+  export import ActionSearch = __MaterialUI.SvgIcon;
+  export default ActionSearch;
+}
+
+declare module 'material-ui/lib/svg-icons/action/account-balance-wallet' {
+  export import ActionAccountBalanceWallet = __MaterialUI.SvgIcon;
+  export default ActionAccountBalanceWallet;
+}
+
+declare module 'material-ui/lib/svg-icons/action/date-range' {
+  export import ActionDateRange = __MaterialUI.SvgIcon;
+  export default ActionDateRange;
+}
+
+declare module 'material-ui/lib/svg-icons/action/alarm-on' {
+  export import ActionAlarmOn = __MaterialUI.SvgIcon;
+  export default ActionAlarmOn;
+}
+
+declare module 'material-ui/lib/svg-icons/action/view-quilt' {
+  export import ActionViewQuilt = __MaterialUI.SvgIcon;
+  export default ActionViewQuilt;
+}
+
+declare module 'material-ui/lib/svg-icons/action/launch' {
+  export import ActionLaunch = __MaterialUI.SvgIcon;
+  export default ActionLaunch;
+}
+
+declare module 'material-ui/lib/svg-icons/action/visibility' {
+  export import ActionVisibility = __MaterialUI.SvgIcon;
+  export default ActionVisibility;
+}
+
+declare module 'material-ui/lib/svg-icons/action/flight-land' {
+  export import ActionFlightLand = __MaterialUI.SvgIcon;
+  export default ActionFlightLand;
+}
+
+declare module 'material-ui/lib/svg-icons/action/card-travel' {
+  export import ActionCardTravel = __MaterialUI.SvgIcon;
+  export default ActionCardTravel;
+}
+
+declare module 'material-ui/lib/svg-icons/action/get-app' {
+  export import ActionGetApp = __MaterialUI.SvgIcon;
+  export default ActionGetApp;
+}
+
+declare module 'material-ui/lib/svg-icons/action/markunread-mailbox' {
+  export import ActionMarkunreadMailbox = __MaterialUI.SvgIcon;
+  export default ActionMarkunreadMailbox;
+}
+
+declare module 'material-ui/lib/svg-icons/action/view-agenda' {
+  export import ActionViewAgenda = __MaterialUI.SvgIcon;
+  export default ActionViewAgenda;
+}
+
+declare module 'material-ui/lib/svg-icons/action/timeline' {
+  export import ActionTimeline = __MaterialUI.SvgIcon;
+  export default ActionTimeline;
+}
+
+declare module 'material-ui/lib/svg-icons/action/settings-remote' {
+  export import ActionSettingsRemote = __MaterialUI.SvgIcon;
+  export default ActionSettingsRemote;
+}
+
+declare module 'material-ui/lib/svg-icons/action/input' {
+  export import ActionInput = __MaterialUI.SvgIcon;
+  export default ActionInput;
+}
+
+declare module 'material-ui/lib/svg-icons/action/record-voice-over' {
+  export import ActionRecordVoiceOver = __MaterialUI.SvgIcon;
+  export default ActionRecordVoiceOver;
+}
+
+declare module 'material-ui/lib/svg-icons/action/backup' {
+  export import ActionBackup = __MaterialUI.SvgIcon;
+  export default ActionBackup;
+}
+
+declare module 'material-ui/lib/svg-icons/action/language' {
+  export import ActionLanguage = __MaterialUI.SvgIcon;
+  export default ActionLanguage;
+}
+
+declare module 'material-ui/lib/svg-icons/action/play-for-work' {
+  export import ActionPlayForWork = __MaterialUI.SvgIcon;
+  export default ActionPlayForWork;
+}
+
+declare module 'material-ui/lib/svg-icons/action/gif' {
+  export import ActionGif = __MaterialUI.SvgIcon;
+  export default ActionGif;
+}
+
+declare module 'material-ui/lib/svg-icons/action/theaters' {
+  export import ActionTheaters = __MaterialUI.SvgIcon;
+  export default ActionTheaters;
+}
+
+declare module 'material-ui/lib/svg-icons/action/offline-pin' {
+  export import ActionOfflinePin = __MaterialUI.SvgIcon;
+  export default ActionOfflinePin;
+}
+
+declare module 'material-ui/lib/svg-icons/action/assignment-return' {
+  export import ActionAssignmentReturn = __MaterialUI.SvgIcon;
+  export default ActionAssignmentReturn;
+}
+
+declare module 'material-ui/lib/svg-icons/action/print' {
+  export import ActionPrint = __MaterialUI.SvgIcon;
+  export default ActionPrint;
+}
+
+declare module 'material-ui/lib/svg-icons/action/settings-overscan' {
+  export import ActionSettingsOverscan = __MaterialUI.SvgIcon;
+  export default ActionSettingsOverscan;
+}
+
+declare module 'material-ui/lib/svg-icons/action/store' {
+  export import ActionStore = __MaterialUI.SvgIcon;
+  export default ActionStore;
+}
+
+declare module 'material-ui/lib/svg-icons/action/exit-to-app' {
+  export import ActionExitToApp = __MaterialUI.SvgIcon;
+  export default ActionExitToApp;
+}
+
+declare module 'material-ui/lib/svg-icons/action/account-balance' {
+  export import ActionAccountBalance = __MaterialUI.SvgIcon;
+  export default ActionAccountBalance;
+}
+
+declare module 'material-ui/lib/svg-icons/action/grade' {
+  export import ActionGrade = __MaterialUI.SvgIcon;
+  export default ActionGrade;
+}
+
+declare module 'material-ui/lib/svg-icons/action/picture-in-picture' {
+  export import ActionPictureInPicture = __MaterialUI.SvgIcon;
+  export default ActionPictureInPicture;
+}
+
+declare module 'material-ui/lib/svg-icons/action/copyright' {
+  export import ActionCopyright = __MaterialUI.SvgIcon;
+  export default ActionCopyright;
+}
+
+declare module 'material-ui/lib/svg-icons/action/donut-large' {
+  export import ActionDonutLarge = __MaterialUI.SvgIcon;
+  export default ActionDonutLarge;
+}
+
+declare module 'material-ui/lib/svg-icons/action/lock-open' {
+  export import ActionLockOpen = __MaterialUI.SvgIcon;
+  export default ActionLockOpen;
+}
+
+declare module 'material-ui/lib/svg-icons/action/perm-media' {
+  export import ActionPermMedia = __MaterialUI.SvgIcon;
+  export default ActionPermMedia;
+}
+
+declare module 'material-ui/lib/svg-icons/action/all-out' {
+  export import ActionAllOut = __MaterialUI.SvgIcon;
+  export default ActionAllOut;
+}
+
+declare module 'material-ui/lib/svg-icons/action/check-circle' {
+  export import ActionCheckCircle = __MaterialUI.SvgIcon;
+  export default ActionCheckCircle;
+}
+
+declare module 'material-ui/lib/svg-icons/action/swap-vertical-circle' {
+  export import ActionSwapVerticalCircle = __MaterialUI.SvgIcon;
+  export default ActionSwapVerticalCircle;
+}
+
+declare module 'material-ui/lib/svg-icons/action/settings-input-svideo' {
+  export import ActionSettingsInputSvideo = __MaterialUI.SvgIcon;
+  export default ActionSettingsInputSvideo;
+}
+
+declare module 'material-ui/lib/svg-icons/action/watch-later' {
+  export import ActionWatchLater = __MaterialUI.SvgIcon;
+  export default ActionWatchLater;
+}
+
+declare module 'material-ui/lib/svg-icons/action/question-answer' {
+  export import ActionQuestionAnswer = __MaterialUI.SvgIcon;
+  export default ActionQuestionAnswer;
+}
+
+declare module 'material-ui/lib/svg-icons/action/assignment-ind' {
+  export import ActionAssignmentInd = __MaterialUI.SvgIcon;
+  export default ActionAssignmentInd;
+}
+
+declare module 'material-ui/lib/svg-icons/action/code' {
+  export import ActionCode = __MaterialUI.SvgIcon;
+  export default ActionCode;
+}
+
+declare module 'material-ui/lib/svg-icons/action/turned-in-not' {
+  export import ActionTurnedInNot = __MaterialUI.SvgIcon;
+  export default ActionTurnedInNot;
+}
+
+declare module 'material-ui/lib/svg-icons/action/line-weight' {
+  export import ActionLineWeight = __MaterialUI.SvgIcon;
+  export default ActionLineWeight;
+}
+
+declare module 'material-ui/lib/svg-icons/action/restore' {
+  export import ActionRestore = __MaterialUI.SvgIcon;
+  export default ActionRestore;
+}
+
+declare module 'material-ui/lib/svg-icons/action/tab' {
+  export import ActionTab = __MaterialUI.SvgIcon;
+  export default ActionTab;
+}
+
+declare module 'material-ui/lib/svg-icons/action/open-in-new' {
+  export import ActionOpenInNew = __MaterialUI.SvgIcon;
+  export default ActionOpenInNew;
+}
+
+declare module 'material-ui/lib/svg-icons/action/turned-in' {
+  export import ActionTurnedIn = __MaterialUI.SvgIcon;
+  export default ActionTurnedIn;
+}
+
+declare module 'material-ui/lib/svg-icons/action/settings-input-hdmi' {
+  export import ActionSettingsInputHdmi = __MaterialUI.SvgIcon;
+  export default ActionSettingsInputHdmi;
+}
+
+declare module 'material-ui/lib/svg-icons/action/favorite-border' {
+  export import ActionFavoriteBorder = __MaterialUI.SvgIcon;
+  export default ActionFavoriteBorder;
+}
+
+declare module 'material-ui/lib/svg-icons/action/done' {
+  export import ActionDone = __MaterialUI.SvgIcon;
+  export default ActionDone;
+}
+
+declare module 'material-ui/lib/svg-icons/action/payment' {
+  export import ActionPayment = __MaterialUI.SvgIcon;
+  export default ActionPayment;
+}
+
+declare module 'material-ui/lib/svg-icons/action/announcement' {
+  export import ActionAnnouncement = __MaterialUI.SvgIcon;
+  export default ActionAnnouncement;
+}
+
+declare module 'material-ui/lib/svg-icons/action/find-in-page' {
+  export import ActionFindInPage = __MaterialUI.SvgIcon;
+  export default ActionFindInPage;
+}
+
+declare module 'material-ui/lib/svg-icons/action/thumbs-up-down' {
+  export import ActionThumbsUpDown = __MaterialUI.SvgIcon;
+  export default ActionThumbsUpDown;
+}
+
+declare module 'material-ui/lib/svg-icons/action/explore' {
+  export import ActionExplore = __MaterialUI.SvgIcon;
+  export default ActionExplore;
+}
+
+declare module 'material-ui/lib/svg-icons/action/today' {
+  export import ActionToday = __MaterialUI.SvgIcon;
+  export default ActionToday;
+}
+
+declare module 'material-ui/lib/svg-icons/action/settings-power' {
+  export import ActionSettingsPower = __MaterialUI.SvgIcon;
+  export default ActionSettingsPower;
+}
+
+declare module 'material-ui/lib/svg-icons/action/gavel' {
+  export import ActionGavel = __MaterialUI.SvgIcon;
+  export default ActionGavel;
+}
+
+declare module 'material-ui/lib/svg-icons/action/build' {
+  export import ActionBuild = __MaterialUI.SvgIcon;
+  export default ActionBuild;
+}
+
+declare module 'material-ui/lib/svg-icons/action/rowing' {
+  export import ActionRowing = __MaterialUI.SvgIcon;
+  export default ActionRowing;
+}
+
+declare module 'material-ui/lib/svg-icons/action/label' {
+  export import ActionLabel = __MaterialUI.SvgIcon;
+  export default ActionLabel;
+}
+
+declare module 'material-ui/lib/svg-icons/action/card-giftcard' {
+  export import ActionCardGiftcard = __MaterialUI.SvgIcon;
+  export default ActionCardGiftcard;
+}
+
+declare module 'material-ui/lib/svg-icons/action/thumb-up' {
+  export import ActionThumbUp = __MaterialUI.SvgIcon;
+  export default ActionThumbUp;
+}
+
+declare module 'material-ui/lib/svg-icons/action/shopping-basket' {
+  export import ActionShoppingBasket = __MaterialUI.SvgIcon;
+  export default ActionShoppingBasket;
+}
+
+declare module 'material-ui/lib/svg-icons/action/swap-horiz' {
+  export import ActionSwapHoriz = __MaterialUI.SvgIcon;
+  export default ActionSwapHoriz;
+}
+
+declare module 'material-ui/lib/svg-icons/action/help-outline' {
+  export import ActionHelpOutline = __MaterialUI.SvgIcon;
+  export default ActionHelpOutline;
+}
+
+declare module 'material-ui/lib/svg-icons/action/pregnant-woman' {
+  export import ActionPregnantWoman = __MaterialUI.SvgIcon;
+  export default ActionPregnantWoman;
+}
+
+declare module 'material-ui/lib/svg-icons/action/help' {
+  export import ActionHelp = __MaterialUI.SvgIcon;
+  export default ActionHelp;
+}
+
+declare module 'material-ui/lib/svg-icons/action/settings-input-antenna' {
+  export import ActionSettingsInputAntenna = __MaterialUI.SvgIcon;
+  export default ActionSettingsInputAntenna;
+}
+
+declare module 'material-ui/lib/svg-icons/action/find-replace' {
+  export import ActionFindReplace = __MaterialUI.SvgIcon;
+  export default ActionFindReplace;
+}
+
+declare module 'material-ui/lib/svg-icons/action/shop' {
+  export import ActionShop = __MaterialUI.SvgIcon;
+  export default ActionShop;
+}
+
+declare module 'material-ui/lib/svg-icons/action/change-history' {
+  export import ActionChangeHistory = __MaterialUI.SvgIcon;
+  export default ActionChangeHistory;
+}
+
+declare module 'material-ui/lib/svg-icons/action/info' {
+  export import ActionInfo = __MaterialUI.SvgIcon;
+  export default ActionInfo;
+}
+
+declare module 'material-ui/lib/svg-icons/action/trending-down' {
+  export import ActionTrendingDown = __MaterialUI.SvgIcon;
+  export default ActionTrendingDown;
+}
+
+declare module 'material-ui/lib/svg-icons/action/flight-takeoff' {
+  export import ActionFlightTakeoff = __MaterialUI.SvgIcon;
+  export default ActionFlightTakeoff;
+}
+
+declare module 'material-ui/lib/svg-icons/action/alarm' {
+  export import ActionAlarm = __MaterialUI.SvgIcon;
+  export default ActionAlarm;
+}
+
+declare module 'material-ui/lib/svg-icons/action/spellcheck' {
+  export import ActionSpellcheck = __MaterialUI.SvgIcon;
+  export default ActionSpellcheck;
+}
+
+declare module 'material-ui/lib/svg-icons/action/settings-input-component' {
+  export import ActionSettingsInputComponent = __MaterialUI.SvgIcon;
+  export default ActionSettingsInputComponent;
+}
+
+declare module 'material-ui/lib/svg-icons/action/settings-applications' {
+  export import ActionSettingsApplications = __MaterialUI.SvgIcon;
+  export default ActionSettingsApplications;
+}
+
+declare module 'material-ui/lib/svg-icons/action/room' {
+  export import ActionRoom = __MaterialUI.SvgIcon;
+  export default ActionRoom;
+}
+
+declare module 'material-ui/lib/svg-icons/action/book' {
+  export import ActionBook = __MaterialUI.SvgIcon;
+  export default ActionBook;
+}
+
+declare module 'material-ui/lib/svg-icons/action/class' {
+  export import ActionClass = __MaterialUI.SvgIcon;
+  export default ActionClass;
+}
+
+declare module 'material-ui/lib/svg-icons/action/group-work' {
+  export import ActionGroupWork = __MaterialUI.SvgIcon;
+  export default ActionGroupWork;
+}
+
+declare module 'material-ui/lib/svg-icons/action/hourglass-full' {
+  export import ActionHourglassFull = __MaterialUI.SvgIcon;
+  export default ActionHourglassFull;
+}
+
+declare module 'material-ui/lib/svg-icons/action/assessment' {
+  export import ActionAssessment = __MaterialUI.SvgIcon;
+  export default ActionAssessment;
+}
+
+declare module 'material-ui/lib/svg-icons/action/youtube-searched-for' {
+  export import ActionYoutubeSearchedFor = __MaterialUI.SvgIcon;
+  export default ActionYoutubeSearchedFor;
+}
+
+declare module 'material-ui/lib/svg-icons/action/eject' {
+  export import ActionEject = __MaterialUI.SvgIcon;
+  export default ActionEject;
+}
+
+declare module 'material-ui/lib/svg-icons/action/trending-up' {
+  export import ActionTrendingUp = __MaterialUI.SvgIcon;
+  export default ActionTrendingUp;
+}
+
+declare module 'material-ui/lib/svg-icons/action/http' {
+  export import ActionHttp = __MaterialUI.SvgIcon;
+  export default ActionHttp;
+}
+
+declare module 'material-ui/lib/svg-icons/action/stars' {
+  export import ActionStars = __MaterialUI.SvgIcon;
+  export default ActionStars;
+}
+
+declare module 'material-ui/lib/svg-icons/action/autorenew' {
+  export import ActionAutorenew = __MaterialUI.SvgIcon;
+  export default ActionAutorenew;
+}
+
+declare module 'material-ui/lib/svg-icons/action/settings-ethernet' {
+  export import ActionSettingsEthernet = __MaterialUI.SvgIcon;
+  export default ActionSettingsEthernet;
+}
+
+declare module 'material-ui/lib/svg-icons/action/label-outline' {
+  export import ActionLabelOutline = __MaterialUI.SvgIcon;
+  export default ActionLabelOutline;
+}
+
+declare module 'material-ui/lib/svg-icons/action/settings-phone' {
+  export import ActionSettingsPhone = __MaterialUI.SvgIcon;
+  export default ActionSettingsPhone;
+}
+
+declare module 'material-ui/lib/svg-icons/action/info-outline' {
+  export import ActionInfoOutline = __MaterialUI.SvgIcon;
+  export default ActionInfoOutline;
+}
+
+declare module 'material-ui/lib/svg-icons/action/lock-outline' {
+  export import ActionLockOutline = __MaterialUI.SvgIcon;
+  export default ActionLockOutline;
+}
+
+declare module 'material-ui/lib/svg-icons/action/settings-input-composite' {
+  export import ActionSettingsInputComposite = __MaterialUI.SvgIcon;
+  export default ActionSettingsInputComposite;
+}
+
+declare module 'material-ui/lib/svg-icons/action/invert-colors' {
+  export import ActionInvertColors = __MaterialUI.SvgIcon;
+  export default ActionInvertColors;
+}
+
+declare module 'material-ui/lib/svg-icons/action/bookmark' {
+  export import ActionBookmark = __MaterialUI.SvgIcon;
+  export default ActionBookmark;
+}
+
+declare module 'material-ui/lib/svg-icons/action/add-shopping-cart' {
+  export import ActionAddShoppingCart = __MaterialUI.SvgIcon;
+  export default ActionAddShoppingCart;
+}
+
+declare module 'material-ui/lib/svg-icons/action/bug-report' {
+  export import ActionBugReport = __MaterialUI.SvgIcon;
+  export default ActionBugReport;
+}
+
+declare module 'material-ui/lib/svg-icons/action/cached' {
+  export import ActionCached = __MaterialUI.SvgIcon;
+  export default ActionCached;
+}
+
+declare module 'material-ui/lib/svg-icons/action/view-day' {
+  export import ActionViewDay = __MaterialUI.SvgIcon;
+  export default ActionViewDay;
+}
+
+declare module 'material-ui/lib/svg-icons/action/fingerprint' {
+  export import ActionFingerprint = __MaterialUI.SvgIcon;
+  export default ActionFingerprint;
+}
+
+declare module 'material-ui/lib/svg-icons/action/accessibility' {
+  export import ActionAccessibility = __MaterialUI.SvgIcon;
+  export default ActionAccessibility;
+}
+
+declare module 'material-ui/lib/svg-icons/action/perm-data-setting' {
+  export import ActionPermDataSetting = __MaterialUI.SvgIcon;
+  export default ActionPermDataSetting;
+}
+
+declare module 'material-ui/lib/svg-icons/action/settings-backup-restore' {
+  export import ActionSettingsBackupRestore = __MaterialUI.SvgIcon;
+  export default ActionSettingsBackupRestore;
+}
+
+declare module 'material-ui/lib/svg-icons/action/zoom-in' {
+  export import ActionZoomIn = __MaterialUI.SvgIcon;
+  export default ActionZoomIn;
+}
+
+declare module 'material-ui/lib/svg-icons/action/perm-identity' {
+  export import ActionPermIdentity = __MaterialUI.SvgIcon;
+  export default ActionPermIdentity;
+}
+
+declare module 'material-ui/lib/svg-icons/action/favorite' {
+  export import ActionFavorite = __MaterialUI.SvgIcon;
+  export default ActionFavorite;
+}
+
+declare module 'material-ui/lib/svg-icons/action/thumb-down' {
+  export import ActionThumbDown = __MaterialUI.SvgIcon;
+  export default ActionThumbDown;
+}
+
+declare module 'material-ui/lib/svg-icons/action/assignment-returned' {
+  export import ActionAssignmentReturned = __MaterialUI.SvgIcon;
+  export default ActionAssignmentReturned;
+}
+
+declare module 'material-ui/lib/svg-icons/action/account-box' {
+  export import ActionAccountBox = __MaterialUI.SvgIcon;
+  export default ActionAccountBox;
+}
+
+declare module 'material-ui/lib/svg-icons/action/extension' {
+  export import ActionExtension = __MaterialUI.SvgIcon;
+  export default ActionExtension;
+}
+
+declare module 'material-ui/lib/svg-icons/action/pageview' {
+  export import ActionPageview = __MaterialUI.SvgIcon;
+  export default ActionPageview;
+}
+
+declare module 'material-ui/lib/svg-icons/action/https' {
+  export import ActionHttps = __MaterialUI.SvgIcon;
+  export default ActionHttps;
+}
+
+declare module 'material-ui/lib/svg-icons/action/translate' {
+  export import ActionTranslate = __MaterialUI.SvgIcon;
+  export default ActionTranslate;
+}
+
+declare module 'material-ui/lib/svg-icons/action/three-d-rotation' {
+  export import ActionThreeDRotation = __MaterialUI.SvgIcon;
+  export default ActionThreeDRotation;
+}
+
+declare module 'material-ui/lib/svg-icons/action/tab-unselected' {
+  export import ActionTabUnselected = __MaterialUI.SvgIcon;
+  export default ActionTabUnselected;
+}
+
+declare module 'material-ui/lib/svg-icons/action/description' {
+  export import ActionDescription = __MaterialUI.SvgIcon;
+  export default ActionDescription;
+}
+
+declare module 'material-ui/lib/svg-icons/action/note-add' {
+  export import ActionNoteAdd = __MaterialUI.SvgIcon;
+  export default ActionNoteAdd;
+}
+
+declare module 'material-ui/lib/svg-icons/action/perm-scan-wifi' {
+  export import ActionPermScanWifi = __MaterialUI.SvgIcon;
+  export default ActionPermScanWifi;
+}
+
+declare module 'material-ui/lib/svg-icons/action/pets' {
+  export import ActionPets = __MaterialUI.SvgIcon;
+  export default ActionPets;
+}
+
+declare module 'material-ui/lib/svg-icons/action/view-array' {
+  export import ActionViewArray = __MaterialUI.SvgIcon;
+  export default ActionViewArray;
+}
+
+declare module 'material-ui/lib/svg-icons/action/shop-two' {
+  export import ActionShopTwo = __MaterialUI.SvgIcon;
+  export default ActionShopTwo;
+}
+
+declare module 'material-ui/lib/svg-icons/action/line-style' {
+  export import ActionLineStyle = __MaterialUI.SvgIcon;
+  export default ActionLineStyle;
+}
+
+declare module 'material-ui/lib/svg-icons/action/lightbulb-outline' {
+  export import ActionLightbulbOutline = __MaterialUI.SvgIcon;
+  export default ActionLightbulbOutline;
+}
+
+declare module 'material-ui/lib/svg-icons/action/report-problem' {
+  export import ActionReportProblem = __MaterialUI.SvgIcon;
+  export default ActionReportProblem;
+}
+
+declare module 'material-ui/lib/svg-icons/action/swap-vert' {
+  export import ActionSwapVert = __MaterialUI.SvgIcon;
+  export default ActionSwapVert;
+}
+
+declare module 'material-ui/lib/svg-icons/action/list' {
+  export import ActionList = __MaterialUI.SvgIcon;
+  export default ActionList;
+}
+
+declare module 'material-ui/lib/svg-icons/action/settings-voice' {
+  export import ActionSettingsVoice = __MaterialUI.SvgIcon;
+  export default ActionSettingsVoice;
+}
+
+declare module 'material-ui/lib/svg-icons/action/view-list' {
+  export import ActionViewList = __MaterialUI.SvgIcon;
+  export default ActionViewList;
+}
+
+declare module 'material-ui/lib/svg-icons/action/pan-tool' {
+  export import ActionPanTool = __MaterialUI.SvgIcon;
+  export default ActionPanTool;
+}
+
+declare module 'material-ui/lib/svg-icons/action/important-devices' {
+  export import ActionImportantDevices = __MaterialUI.SvgIcon;
+  export default ActionImportantDevices;
+}
+
+declare module 'material-ui/lib/svg-icons/action/redeem' {
+  export import ActionRedeem = __MaterialUI.SvgIcon;
+  export default ActionRedeem;
+}
+
+declare module 'material-ui/lib/svg-icons/action/flip-to-front' {
+  export import ActionFlipToFront = __MaterialUI.SvgIcon;
+  export default ActionFlipToFront;
+}
+
+declare module 'material-ui/lib/svg-icons/action/android' {
+  export import ActionAndroid = __MaterialUI.SvgIcon;
+  export default ActionAndroid;
+}
+
+declare module 'material-ui/lib/svg-icons/action/account-circle' {
+  export import ActionAccountCircle = __MaterialUI.SvgIcon;
+  export default ActionAccountCircle;
+}
+
+declare module 'material-ui/lib/svg-icons/action/event-seat' {
+  export import ActionEventSeat = __MaterialUI.SvgIcon;
+  export default ActionEventSeat;
+}
+
+declare module 'material-ui/lib/svg-icons/action/perm-contact-calendar' {
+  export import ActionPermContactCalendar = __MaterialUI.SvgIcon;
+  export default ActionPermContactCalendar;
+}
+
+declare module 'material-ui/lib/svg-icons/action/perm-phone-msg' {
+  export import ActionPermPhoneMsg = __MaterialUI.SvgIcon;
+  export default ActionPermPhoneMsg;
+}
+
+declare module 'material-ui/lib/svg-icons/action/delete' {
+  export import ActionDelete = __MaterialUI.SvgIcon;
+  export default ActionDelete;
+}
+
+declare module 'material-ui/lib/svg-icons/action/card-membership' {
+  export import ActionCardMembership = __MaterialUI.SvgIcon;
+  export default ActionCardMembership;
+}
+
+declare module 'material-ui/lib/svg-icons/action/hourglass-empty' {
+  export import ActionHourglassEmpty = __MaterialUI.SvgIcon;
+  export default ActionHourglassEmpty;
+}
+
+declare module 'material-ui/lib/svg-icons/action/schedule' {
+  export import ActionSchedule = __MaterialUI.SvgIcon;
+  export default ActionSchedule;
+}
+
+declare module 'material-ui/lib/svg-icons/action/trending-flat' {
+  export import ActionTrendingFlat = __MaterialUI.SvgIcon;
+  export default ActionTrendingFlat;
+}
+
+declare module 'material-ui/lib/svg-icons/action/motorcycle' {
+  export import ActionMotorcycle = __MaterialUI.SvgIcon;
+  export default ActionMotorcycle;
+}
+
+declare module 'material-ui/lib/svg-icons/action/view-column' {
+  export import ActionViewColumn = __MaterialUI.SvgIcon;
+  export default ActionViewColumn;
+}
+
+declare module 'material-ui/lib/svg-icons/action/settings-cell' {
+  export import ActionSettingsCell = __MaterialUI.SvgIcon;
+  export default ActionSettingsCell;
+}
+
+declare module 'material-ui/lib/svg-icons/action/credit-card' {
+  export import ActionCreditCard = __MaterialUI.SvgIcon;
+  export default ActionCreditCard;
+}
+
+declare module 'material-ui/lib/svg-icons/action/view-module' {
+  export import ActionViewModule = __MaterialUI.SvgIcon;
+  export default ActionViewModule;
+}
+
+declare module 'material-ui/lib/svg-icons/action/compare-arrows' {
+  export import ActionCompareArrows = __MaterialUI.SvgIcon;
+  export default ActionCompareArrows;
+}
+
+declare module 'material-ui/lib/svg-icons/action/speaker-notes' {
+  export import ActionSpeakerNotes = __MaterialUI.SvgIcon;
+  export default ActionSpeakerNotes;
+}
+
+declare module 'material-ui/lib/svg-icons/social/person' {
+  export import SocialPerson = __MaterialUI.SvgIcon;
+  export default SocialPerson;
+}
+
+declare module 'material-ui/lib/svg-icons/social/notifications-none' {
+  export import SocialNotificationsNone = __MaterialUI.SvgIcon;
+  export default SocialNotificationsNone;
+}
+
+declare module 'material-ui/lib/svg-icons/social/domain' {
+  export import SocialDomain = __MaterialUI.SvgIcon;
+  export default SocialDomain;
+}
+
+declare module 'material-ui/lib/svg-icons/social/notifications-paused' {
+  export import SocialNotificationsPaused = __MaterialUI.SvgIcon;
+  export default SocialNotificationsPaused;
+}
+
+declare module 'material-ui/lib/svg-icons/social/person-outline' {
+  export import SocialPersonOutline = __MaterialUI.SvgIcon;
+  export default SocialPersonOutline;
+}
+
+declare module 'material-ui/lib/svg-icons/social/plus-one' {
+  export import SocialPlusOne = __MaterialUI.SvgIcon;
+  export default SocialPlusOne;
+}
+
+declare module 'material-ui/lib/svg-icons/social/notifications-active' {
+  export import SocialNotificationsActive = __MaterialUI.SvgIcon;
+  export default SocialNotificationsActive;
+}
+
+declare module 'material-ui/lib/svg-icons/social/share' {
+  export import SocialShare = __MaterialUI.SvgIcon;
+  export default SocialShare;
+}
+
+declare module 'material-ui/lib/svg-icons/social/whatshot' {
+  export import SocialWhatshot = __MaterialUI.SvgIcon;
+  export default SocialWhatshot;
+}
+
+declare module 'material-ui/lib/svg-icons/social/poll' {
+  export import SocialPoll = __MaterialUI.SvgIcon;
+  export default SocialPoll;
+}
+
+declare module 'material-ui/lib/svg-icons/social/pages' {
+  export import SocialPages = __MaterialUI.SvgIcon;
+  export default SocialPages;
+}
+
+declare module 'material-ui/lib/svg-icons/social/notifications-off' {
+  export import SocialNotificationsOff = __MaterialUI.SvgIcon;
+  export default SocialNotificationsOff;
+}
+
+declare module 'material-ui/lib/svg-icons/social/notifications' {
+  export import SocialNotifications = __MaterialUI.SvgIcon;
+  export default SocialNotifications;
+}
+
+declare module 'material-ui/lib/svg-icons/social/school' {
+  export import SocialSchool = __MaterialUI.SvgIcon;
+  export default SocialSchool;
+}
+
+declare module 'material-ui/lib/svg-icons/social/cake' {
+  export import SocialCake = __MaterialUI.SvgIcon;
+  export default SocialCake;
+}
+
+declare module 'material-ui/lib/svg-icons/social/people-outline' {
+  export import SocialPeopleOutline = __MaterialUI.SvgIcon;
+  export default SocialPeopleOutline;
+}
+
+declare module 'material-ui/lib/svg-icons/social/location-city' {
+  export import SocialLocationCity = __MaterialUI.SvgIcon;
+  export default SocialLocationCity;
+}
+
+declare module 'material-ui/lib/svg-icons/social/public' {
+  export import SocialPublic = __MaterialUI.SvgIcon;
+  export default SocialPublic;
+}
+
+declare module 'material-ui/lib/svg-icons/social/mood-bad' {
+  export import SocialMoodBad = __MaterialUI.SvgIcon;
+  export default SocialMoodBad;
+}
+
+declare module 'material-ui/lib/svg-icons/social/people' {
+  export import SocialPeople = __MaterialUI.SvgIcon;
+  export default SocialPeople;
+}
+
+declare module 'material-ui/lib/svg-icons/social/mood' {
+  export import SocialMood = __MaterialUI.SvgIcon;
+  export default SocialMood;
+}
+
+declare module 'material-ui/lib/svg-icons/social/party-mode' {
+  export import SocialPartyMode = __MaterialUI.SvgIcon;
+  export default SocialPartyMode;
+}
+
+declare module 'material-ui/lib/svg-icons/social/group' {
+  export import SocialGroup = __MaterialUI.SvgIcon;
+  export default SocialGroup;
+}
+
+declare module 'material-ui/lib/svg-icons/social/person-add' {
+  export import SocialPersonAdd = __MaterialUI.SvgIcon;
+  export default SocialPersonAdd;
+}
+
+declare module 'material-ui/lib/svg-icons/social/group-add' {
+  export import SocialGroupAdd = __MaterialUI.SvgIcon;
+  export default SocialGroupAdd;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/edit-location' {
+  export import MapsEditLocation = __MaterialUI.SvgIcon;
+  export default MapsEditLocation;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-airport' {
+  export import MapsLocalAirport = __MaterialUI.SvgIcon;
+  export default MapsLocalAirport;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-phone' {
+  export import MapsLocalPhone = __MaterialUI.SvgIcon;
+  export default MapsLocalPhone;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/directions-car' {
+  export import MapsDirectionsCar = __MaterialUI.SvgIcon;
+  export default MapsDirectionsCar;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-drink' {
+  export import MapsLocalDrink = __MaterialUI.SvgIcon;
+  export default MapsLocalDrink;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-gas-station' {
+  export import MapsLocalGasStation = __MaterialUI.SvgIcon;
+  export default MapsLocalGasStation;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/store-mall-directory' {
+  export import MapsStoreMallDirectory = __MaterialUI.SvgIcon;
+  export default MapsStoreMallDirectory;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/add-location' {
+  export import MapsAddLocation = __MaterialUI.SvgIcon;
+  export default MapsAddLocation;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-laundry-service' {
+  export import MapsLocalLaundryService = __MaterialUI.SvgIcon;
+  export default MapsLocalLaundryService;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-hotel' {
+  export import MapsLocalHotel = __MaterialUI.SvgIcon;
+  export default MapsLocalHotel;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-pizza' {
+  export import MapsLocalPizza = __MaterialUI.SvgIcon;
+  export default MapsLocalPizza;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/person-pin-circle' {
+  export import MapsPersonPinCircle = __MaterialUI.SvgIcon;
+  export default MapsPersonPinCircle;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/terrain' {
+  export import MapsTerrain = __MaterialUI.SvgIcon;
+  export default MapsTerrain;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/directions-subway' {
+  export import MapsDirectionsSubway = __MaterialUI.SvgIcon;
+  export default MapsDirectionsSubway;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-bar' {
+  export import MapsLocalBar = __MaterialUI.SvgIcon;
+  export default MapsLocalBar;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-car-wash' {
+  export import MapsLocalCarWash = __MaterialUI.SvgIcon;
+  export default MapsLocalCarWash;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/restaurant-menu' {
+  export import MapsRestaurantMenu = __MaterialUI.SvgIcon;
+  export default MapsRestaurantMenu;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/near-me' {
+  export import MapsNearMe = __MaterialUI.SvgIcon;
+  export default MapsNearMe;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/directions' {
+  export import MapsDirections = __MaterialUI.SvgIcon;
+  export default MapsDirections;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/my-location' {
+  export import MapsMyLocation = __MaterialUI.SvgIcon;
+  export default MapsMyLocation;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-convenience-store' {
+  export import MapsLocalConvenienceStore = __MaterialUI.SvgIcon;
+  export default MapsLocalConvenienceStore;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-offer' {
+  export import MapsLocalOffer = __MaterialUI.SvgIcon;
+  export default MapsLocalOffer;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-florist' {
+  export import MapsLocalFlorist = __MaterialUI.SvgIcon;
+  export default MapsLocalFlorist;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-shipping' {
+  export import MapsLocalShipping = __MaterialUI.SvgIcon;
+  export default MapsLocalShipping;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-taxi' {
+  export import MapsLocalTaxi = __MaterialUI.SvgIcon;
+  export default MapsLocalTaxi;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/directions-walk' {
+  export import MapsDirectionsWalk = __MaterialUI.SvgIcon;
+  export default MapsDirectionsWalk;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-hospital' {
+  export import MapsLocalHospital = __MaterialUI.SvgIcon;
+  export default MapsLocalHospital;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/layers' {
+  export import MapsLayers = __MaterialUI.SvgIcon;
+  export default MapsLayers;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/directions-run' {
+  export import MapsDirectionsRun = __MaterialUI.SvgIcon;
+  export default MapsDirectionsRun;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/rate-review' {
+  export import MapsRateReview = __MaterialUI.SvgIcon;
+  export default MapsRateReview;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-dining' {
+  export import MapsLocalDining = __MaterialUI.SvgIcon;
+  export default MapsLocalDining;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-post-office' {
+  export import MapsLocalPostOffice = __MaterialUI.SvgIcon;
+  export default MapsLocalPostOffice;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/pin-drop' {
+  export import MapsPinDrop = __MaterialUI.SvgIcon;
+  export default MapsPinDrop;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/directions-boat' {
+  export import MapsDirectionsBoat = __MaterialUI.SvgIcon;
+  export default MapsDirectionsBoat;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-see' {
+  export import MapsLocalSee = __MaterialUI.SvgIcon;
+  export default MapsLocalSee;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/map' {
+  export import MapsMap = __MaterialUI.SvgIcon;
+  export default MapsMap;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/flight' {
+  export import MapsFlight = __MaterialUI.SvgIcon;
+  export default MapsFlight;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/person-pin' {
+  export import MapsPersonPin = __MaterialUI.SvgIcon;
+  export default MapsPersonPin;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/satellite' {
+  export import MapsSatellite = __MaterialUI.SvgIcon;
+  export default MapsSatellite;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-printshop' {
+  export import MapsLocalPrintshop = __MaterialUI.SvgIcon;
+  export default MapsLocalPrintshop;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/navigation' {
+  export import MapsNavigation = __MaterialUI.SvgIcon;
+  export default MapsNavigation;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/directions-railway' {
+  export import MapsDirectionsRailway = __MaterialUI.SvgIcon;
+  export default MapsDirectionsRailway;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-atm' {
+  export import MapsLocalAtm = __MaterialUI.SvgIcon;
+  export default MapsLocalAtm;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/directions-transit' {
+  export import MapsDirectionsTransit = __MaterialUI.SvgIcon;
+  export default MapsDirectionsTransit;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-parking' {
+  export import MapsLocalParking = __MaterialUI.SvgIcon;
+  export default MapsLocalParking;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-cafe' {
+  export import MapsLocalCafe = __MaterialUI.SvgIcon;
+  export default MapsLocalCafe;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-mall' {
+  export import MapsLocalMall = __MaterialUI.SvgIcon;
+  export default MapsLocalMall;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/zoom-out-map' {
+  export import MapsZoomOutMap = __MaterialUI.SvgIcon;
+  export default MapsZoomOutMap;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-activity' {
+  export import MapsLocalActivity = __MaterialUI.SvgIcon;
+  export default MapsLocalActivity;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-grocery-store' {
+  export import MapsLocalGroceryStore = __MaterialUI.SvgIcon;
+  export default MapsLocalGroceryStore;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-pharmacy' {
+  export import MapsLocalPharmacy = __MaterialUI.SvgIcon;
+  export default MapsLocalPharmacy;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-movies' {
+  export import MapsLocalMovies = __MaterialUI.SvgIcon;
+  export default MapsLocalMovies;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/place' {
+  export import MapsPlace = __MaterialUI.SvgIcon;
+  export default MapsPlace;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/layers-clear' {
+  export import MapsLayersClear = __MaterialUI.SvgIcon;
+  export default MapsLayersClear;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/hotel' {
+  export import MapsHotel = __MaterialUI.SvgIcon;
+  export default MapsHotel;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/directions-bike' {
+  export import MapsDirectionsBike = __MaterialUI.SvgIcon;
+  export default MapsDirectionsBike;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-library' {
+  export import MapsLocalLibrary = __MaterialUI.SvgIcon;
+  export default MapsLocalLibrary;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/local-play' {
+  export import MapsLocalPlay = __MaterialUI.SvgIcon;
+  export default MapsLocalPlay;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/directions-bus' {
+  export import MapsDirectionsBus = __MaterialUI.SvgIcon;
+  export default MapsDirectionsBus;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/traffic' {
+  export import MapsTraffic = __MaterialUI.SvgIcon;
+  export default MapsTraffic;
+}
+
+declare module 'material-ui/lib/svg-icons/maps/beenhere' {
+  export import MapsBeenhere = __MaterialUI.SvgIcon;
+  export default MapsBeenhere;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/call-received' {
+  export import CommunicationCallReceived = __MaterialUI.SvgIcon;
+  export default CommunicationCallReceived;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/dialpad' {
+  export import CommunicationDialpad = __MaterialUI.SvgIcon;
+  export default CommunicationDialpad;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/forum' {
+  export import CommunicationForum = __MaterialUI.SvgIcon;
+  export default CommunicationForum;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/no-sim' {
+  export import CommunicationNoSim = __MaterialUI.SvgIcon;
+  export default CommunicationNoSim;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/chat' {
+  export import CommunicationChat = __MaterialUI.SvgIcon;
+  export default CommunicationChat;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/stay-primary-landscape' {
+  export import CommunicationStayPrimaryLandscape = __MaterialUI.SvgIcon;
+  export default CommunicationStayPrimaryLandscape;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/phonelink-setup' {
+  export import CommunicationPhonelinkSetup = __MaterialUI.SvgIcon;
+  export default CommunicationPhonelinkSetup;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/ring-volume' {
+  export import CommunicationRingVolume = __MaterialUI.SvgIcon;
+  export default CommunicationRingVolume;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/phonelink-lock' {
+  export import CommunicationPhonelinkLock = __MaterialUI.SvgIcon;
+  export default CommunicationPhonelinkLock;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/contacts' {
+  export import CommunicationContacts = __MaterialUI.SvgIcon;
+  export default CommunicationContacts;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/call-missed' {
+  export import CommunicationCallMissed = __MaterialUI.SvgIcon;
+  export default CommunicationCallMissed;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/contact-mail' {
+  export import CommunicationContactMail = __MaterialUI.SvgIcon;
+  export default CommunicationContactMail;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/portable-wifi-off' {
+  export import CommunicationPortableWifiOff = __MaterialUI.SvgIcon;
+  export default CommunicationPortableWifiOff;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/call-merge' {
+  export import CommunicationCallMerge = __MaterialUI.SvgIcon;
+  export default CommunicationCallMerge;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/tact-mail' {
+  export import CommunicationTactMail = __MaterialUI.SvgIcon;
+  export default CommunicationTactMail;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/stop-screen-share' {
+  export import CommunicationStopScreenShare = __MaterialUI.SvgIcon;
+  export default CommunicationStopScreenShare;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/vpn-key' {
+  export import CommunicationVpnKey = __MaterialUI.SvgIcon;
+  export default CommunicationVpnKey;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/swap-calls' {
+  export import CommunicationSwapCalls = __MaterialUI.SvgIcon;
+  export default CommunicationSwapCalls;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/dialer-sip' {
+  export import CommunicationDialerSip = __MaterialUI.SvgIcon;
+  export default CommunicationDialerSip;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/business' {
+  export import CommunicationBusiness = __MaterialUI.SvgIcon;
+  export default CommunicationBusiness;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/phonelink-erase' {
+  export import CommunicationPhonelinkErase = __MaterialUI.SvgIcon;
+  export default CommunicationPhonelinkErase;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/call' {
+  export import CommunicationCall = __MaterialUI.SvgIcon;
+  export default CommunicationCall;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/screen-share' {
+  export import CommunicationScreenShare = __MaterialUI.SvgIcon;
+  export default CommunicationScreenShare;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/clear-all' {
+  export import CommunicationClearAll = __MaterialUI.SvgIcon;
+  export default CommunicationClearAll;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/chat-bubble-outline' {
+  export import CommunicationChatBubbleOutline = __MaterialUI.SvgIcon;
+  export default CommunicationChatBubbleOutline;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/call-missed-outgoing' {
+  export import CommunicationCallMissedOutgoing = __MaterialUI.SvgIcon;
+  export default CommunicationCallMissedOutgoing;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/stay-primary-portrait' {
+  export import CommunicationStayPrimaryPortrait = __MaterialUI.SvgIcon;
+  export default CommunicationStayPrimaryPortrait;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/stay-current-portrait' {
+  export import CommunicationStayCurrentPortrait = __MaterialUI.SvgIcon;
+  export default CommunicationStayCurrentPortrait;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/voicemail' {
+  export import CommunicationVoicemail = __MaterialUI.SvgIcon;
+  export default CommunicationVoicemail;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/speaker-phone' {
+  export import CommunicationSpeakerPhone = __MaterialUI.SvgIcon;
+  export default CommunicationSpeakerPhone;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/call-split' {
+  export import CommunicationCallSplit = __MaterialUI.SvgIcon;
+  export default CommunicationCallSplit;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/live-help' {
+  export import CommunicationLiveHelp = __MaterialUI.SvgIcon;
+  export default CommunicationLiveHelp;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/call-made' {
+  export import CommunicationCallMade = __MaterialUI.SvgIcon;
+  export default CommunicationCallMade;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/phone' {
+  export import CommunicationPhone = __MaterialUI.SvgIcon;
+  export default CommunicationPhone;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/textsms' {
+  export import CommunicationTextsms = __MaterialUI.SvgIcon;
+  export default CommunicationTextsms;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/message' {
+  export import CommunicationMessage = __MaterialUI.SvgIcon;
+  export default CommunicationMessage;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/import-export' {
+  export import CommunicationImportExport = __MaterialUI.SvgIcon;
+  export default CommunicationImportExport;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/import-contacts' {
+  export import CommunicationImportContacts = __MaterialUI.SvgIcon;
+  export default CommunicationImportContacts;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/phonelink-ring' {
+  export import CommunicationPhonelinkRing = __MaterialUI.SvgIcon;
+  export default CommunicationPhonelinkRing;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/present-to-all' {
+  export import CommunicationPresentToAll = __MaterialUI.SvgIcon;
+  export default CommunicationPresentToAll;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/contact-phone' {
+  export import CommunicationContactPhone = __MaterialUI.SvgIcon;
+  export default CommunicationContactPhone;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/invert-colors-off' {
+  export import CommunicationInvertColorsOff = __MaterialUI.SvgIcon;
+  export default CommunicationInvertColorsOff;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/comment' {
+  export import CommunicationComment = __MaterialUI.SvgIcon;
+  export default CommunicationComment;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/chat-bubble' {
+  export import CommunicationChatBubble = __MaterialUI.SvgIcon;
+  export default CommunicationChatBubble;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/mail-outline' {
+  export import CommunicationMailOutline = __MaterialUI.SvgIcon;
+  export default CommunicationMailOutline;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/location-on' {
+  export import CommunicationLocationOn = __MaterialUI.SvgIcon;
+  export default CommunicationLocationOn;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/stay-current-landscape' {
+  export import CommunicationStayCurrentLandscape = __MaterialUI.SvgIcon;
+  export default CommunicationStayCurrentLandscape;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/location-off' {
+  export import CommunicationLocationOff = __MaterialUI.SvgIcon;
+  export default CommunicationLocationOff;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/email' {
+  export import CommunicationEmail = __MaterialUI.SvgIcon;
+  export default CommunicationEmail;
+}
+
+declare module 'material-ui/lib/svg-icons/communication/call-end' {
+  export import CommunicationCallEnd = __MaterialUI.SvgIcon;
+  export default CommunicationCallEnd;
+}
+
+declare module 'material-ui/lib/svg-icons/toggle/check-box' {
+  export import ToggleCheckBox = __MaterialUI.SvgIcon;
+  export default ToggleCheckBox;
+}
+
+declare module 'material-ui/lib/svg-icons/toggle/star-half' {
+  export import ToggleStarHalf = __MaterialUI.SvgIcon;
+  export default ToggleStarHalf;
+}
+
+declare module 'material-ui/lib/svg-icons/toggle/check-box-outline-blank' {
+  export import ToggleCheckBoxOutlineBlank = __MaterialUI.SvgIcon;
+  export default ToggleCheckBoxOutlineBlank;
+}
+
+declare module 'material-ui/lib/svg-icons/toggle/star' {
+  export import ToggleStar = __MaterialUI.SvgIcon;
+  export default ToggleStar;
+}
+
+declare module 'material-ui/lib/svg-icons/toggle/star-border' {
+  export import ToggleStarBorder = __MaterialUI.SvgIcon;
+  export default ToggleStarBorder;
+}
+
+declare module 'material-ui/lib/svg-icons/toggle/radio-button-unchecked' {
+  export import ToggleRadioButtonUnchecked = __MaterialUI.SvgIcon;
+  export default ToggleRadioButtonUnchecked;
+}
+
+declare module 'material-ui/lib/svg-icons/toggle/indeterminate-check-box' {
+  export import ToggleIndeterminateCheckBox = __MaterialUI.SvgIcon;
+  export default ToggleIndeterminateCheckBox;
+}
+
+declare module 'material-ui/lib/svg-icons/toggle/radio-button-checked' {
+  export import ToggleRadioButtonChecked = __MaterialUI.SvgIcon;
+  export default ToggleRadioButtonChecked;
+}
+
+declare module 'material-ui/lib/svg-icons/index' {
+  export import Index = __MaterialUI.SvgIcon;
+  export default Index;
+}
+
+declare module 'material-ui/lib/svg-icons/index-generator' {
+  export import IndexGenerator = __MaterialUI.SvgIcon;
+  export default IndexGenerator;
+}
+
+declare module 'material-ui/lib/svg-icons/alert/warning' {
+  export import AlertWarning = __MaterialUI.SvgIcon;
+  export default AlertWarning;
+}
+
+declare module 'material-ui/lib/svg-icons/alert/add-alert' {
+  export import AlertAddAlert = __MaterialUI.SvgIcon;
+  export default AlertAddAlert;
+}
+
+declare module 'material-ui/lib/svg-icons/alert/error-outline' {
+  export import AlertErrorOutline = __MaterialUI.SvgIcon;
+  export default AlertErrorOutline;
+}
+
+declare module 'material-ui/lib/svg-icons/alert/error' {
+  export import AlertError = __MaterialUI.SvgIcon;
+  export default AlertError;
+}
+
+declare module 'material-ui/lib/svg-icons/file/file-upload' {
+  export import FileFileUpload = __MaterialUI.SvgIcon;
+  export default FileFileUpload;
+}
+
+declare module 'material-ui/lib/svg-icons/file/cloud-upload' {
+  export import FileCloudUpload = __MaterialUI.SvgIcon;
+  export default FileCloudUpload;
+}
+
+declare module 'material-ui/lib/svg-icons/file/cloud-done' {
+  export import FileCloudDone = __MaterialUI.SvgIcon;
+  export default FileCloudDone;
+}
+
+declare module 'material-ui/lib/svg-icons/file/folder-open' {
+  export import FileFolderOpen = __MaterialUI.SvgIcon;
+  export default FileFolderOpen;
+}
+
+declare module 'material-ui/lib/svg-icons/file/cloud-off' {
+  export import FileCloudOff = __MaterialUI.SvgIcon;
+  export default FileCloudOff;
+}
+
+declare module 'material-ui/lib/svg-icons/file/cloud-queue' {
+  export import FileCloudQueue = __MaterialUI.SvgIcon;
+  export default FileCloudQueue;
+}
+
+declare module 'material-ui/lib/svg-icons/file/folder-shared' {
+  export import FileFolderShared = __MaterialUI.SvgIcon;
+  export default FileFolderShared;
+}
+
+declare module 'material-ui/lib/svg-icons/file/cloud-circle' {
+  export import FileCloudCircle = __MaterialUI.SvgIcon;
+  export default FileCloudCircle;
+}
+
+declare module 'material-ui/lib/svg-icons/file/folder' {
+  export import FileFolder = __MaterialUI.SvgIcon;
+  export default FileFolder;
+}
+
+declare module 'material-ui/lib/svg-icons/file/attachment' {
+  export import FileAttachment = __MaterialUI.SvgIcon;
+  export default FileAttachment;
+}
+
+declare module 'material-ui/lib/svg-icons/file/create-new-folder' {
+  export import FileCreateNewFolder = __MaterialUI.SvgIcon;
+  export default FileCreateNewFolder;
+}
+
+declare module 'material-ui/lib/svg-icons/file/cloud-download' {
+  export import FileCloudDownload = __MaterialUI.SvgIcon;
+  export default FileCloudDownload;
+}
+
+declare module 'material-ui/lib/svg-icons/file/cloud' {
+  export import FileCloud = __MaterialUI.SvgIcon;
+  export default FileCloud;
+}
+
+declare module 'material-ui/lib/svg-icons/file/file-download' {
+  export import FileFileDownload = __MaterialUI.SvgIcon;
+  export default FileFileDownload;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation-arrow-drop-right' {
+  export import NavigationArrowDropRight = __MaterialUI.SvgIcon;
+  export default NavigationArrowDropRight;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/keyboard' {
+  export import HardwareKeyboard = __MaterialUI.SvgIcon;
+  export default HardwareKeyboard;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/toys' {
+  export import HardwareToys = __MaterialUI.SvgIcon;
+  export default HardwareToys;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/dock' {
+  export import HardwareDock = __MaterialUI.SvgIcon;
+  export default HardwareDock;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/headset' {
+  export import HardwareHeadset = __MaterialUI.SvgIcon;
+  export default HardwareHeadset;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/keyboard-voice' {
+  export import HardwareKeyboardVoice = __MaterialUI.SvgIcon;
+  export default HardwareKeyboardVoice;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/phonelink-off' {
+  export import HardwarePhonelinkOff = __MaterialUI.SvgIcon;
+  export default HardwarePhonelinkOff;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/speaker-group' {
+  export import HardwareSpeakerGroup = __MaterialUI.SvgIcon;
+  export default HardwareSpeakerGroup;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/desktop-windows' {
+  export import HardwareDesktopWindows = __MaterialUI.SvgIcon;
+  export default HardwareDesktopWindows;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/laptop-mac' {
+  export import HardwareLaptopMac = __MaterialUI.SvgIcon;
+  export default HardwareLaptopMac;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/keyboard-return' {
+  export import HardwareKeyboardReturn = __MaterialUI.SvgIcon;
+  export default HardwareKeyboardReturn;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/gamepad' {
+  export import HardwareGamepad = __MaterialUI.SvgIcon;
+  export default HardwareGamepad;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/keyboard-arrow-up' {
+  export import HardwareKeyboardArrowUp = __MaterialUI.SvgIcon;
+  export default HardwareKeyboardArrowUp;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/laptop' {
+  export import HardwareLaptop = __MaterialUI.SvgIcon;
+  export default HardwareLaptop;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/phone-iphone' {
+  export import HardwarePhoneIphone = __MaterialUI.SvgIcon;
+  export default HardwarePhoneIphone;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/memory' {
+  export import HardwareMemory = __MaterialUI.SvgIcon;
+  export default HardwareMemory;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/security' {
+  export import HardwareSecurity = __MaterialUI.SvgIcon;
+  export default HardwareSecurity;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/keyboard-capslock' {
+  export import HardwareKeyboardCapslock = __MaterialUI.SvgIcon;
+  export default HardwareKeyboardCapslock;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/sim-card' {
+  export import HardwareSimCard = __MaterialUI.SvgIcon;
+  export default HardwareSimCard;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/devices-other' {
+  export import HardwareDevicesOther = __MaterialUI.SvgIcon;
+  export default HardwareDevicesOther;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/tablet-android' {
+  export import HardwareTabletAndroid = __MaterialUI.SvgIcon;
+  export default HardwareTabletAndroid;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/keyboard-arrow-right' {
+  export import HardwareKeyboardArrowRight = __MaterialUI.SvgIcon;
+  export default HardwareKeyboardArrowRight;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/keyboard-tab' {
+  export import HardwareKeyboardTab = __MaterialUI.SvgIcon;
+  export default HardwareKeyboardTab;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/watch' {
+  export import HardwareWatch = __MaterialUI.SvgIcon;
+  export default HardwareWatch;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/speaker' {
+  export import HardwareSpeaker = __MaterialUI.SvgIcon;
+  export default HardwareSpeaker;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/phonelink' {
+  export import HardwarePhonelink = __MaterialUI.SvgIcon;
+  export default HardwarePhonelink;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/laptop-windows' {
+  export import HardwareLaptopWindows = __MaterialUI.SvgIcon;
+  export default HardwareLaptopWindows;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/tv' {
+  export import HardwareTv = __MaterialUI.SvgIcon;
+  export default HardwareTv;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/headset-mic' {
+  export import HardwareHeadsetMic = __MaterialUI.SvgIcon;
+  export default HardwareHeadsetMic;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/videogame-asset' {
+  export import HardwareVideogameAsset = __MaterialUI.SvgIcon;
+  export default HardwareVideogameAsset;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/keyboard-arrow-down' {
+  export import HardwareKeyboardArrowDown = __MaterialUI.SvgIcon;
+  export default HardwareKeyboardArrowDown;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/keyboard-hide' {
+  export import HardwareKeyboardHide = __MaterialUI.SvgIcon;
+  export default HardwareKeyboardHide;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/scanner' {
+  export import HardwareScanner = __MaterialUI.SvgIcon;
+  export default HardwareScanner;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/laptop-chromebook' {
+  export import HardwareLaptopChromebook = __MaterialUI.SvgIcon;
+  export default HardwareLaptopChromebook;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/tablet-mac' {
+  export import HardwareTabletMac = __MaterialUI.SvgIcon;
+  export default HardwareTabletMac;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/cast' {
+  export import HardwareCast = __MaterialUI.SvgIcon;
+  export default HardwareCast;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/cast-connected' {
+  export import HardwareCastConnected = __MaterialUI.SvgIcon;
+  export default HardwareCastConnected;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/keyboard-arrow-left' {
+  export import HardwareKeyboardArrowLeft = __MaterialUI.SvgIcon;
+  export default HardwareKeyboardArrowLeft;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/phone-android' {
+  export import HardwarePhoneAndroid = __MaterialUI.SvgIcon;
+  export default HardwarePhoneAndroid;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/computer' {
+  export import HardwareComputer = __MaterialUI.SvgIcon;
+  export default HardwareComputer;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/power-input' {
+  export import HardwarePowerInput = __MaterialUI.SvgIcon;
+  export default HardwarePowerInput;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/smartphone' {
+  export import HardwareSmartphone = __MaterialUI.SvgIcon;
+  export default HardwareSmartphone;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/router' {
+  export import HardwareRouter = __MaterialUI.SvgIcon;
+  export default HardwareRouter;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/keyboard-backspace' {
+  export import HardwareKeyboardBackspace = __MaterialUI.SvgIcon;
+  export default HardwareKeyboardBackspace;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/developer-board' {
+  export import HardwareDeveloperBoard = __MaterialUI.SvgIcon;
+  export default HardwareDeveloperBoard;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/device-hub' {
+  export import HardwareDeviceHub = __MaterialUI.SvgIcon;
+  export default HardwareDeviceHub;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/mouse' {
+  export import HardwareMouse = __MaterialUI.SvgIcon;
+  export default HardwareMouse;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/desktop-mac' {
+  export import HardwareDesktopMac = __MaterialUI.SvgIcon;
+  export default HardwareDesktopMac;
+}
+
+declare module 'material-ui/lib/svg-icons/hardware/tablet' {
+  export import HardwareTablet = __MaterialUI.SvgIcon;
+  export default HardwareTablet;
+}
+
+declare module 'material-ui/lib/svg-icons/content/add-box' {
+  export import ContentAddBox = __MaterialUI.SvgIcon;
+  export default ContentAddBox;
+}
+
+declare module 'material-ui/lib/svg-icons/content/filter-list' {
+  export import ContentFilterList = __MaterialUI.SvgIcon;
+  export default ContentFilterList;
+}
+
+declare module 'material-ui/lib/svg-icons/content/save' {
+  export import ContentSave = __MaterialUI.SvgIcon;
+  export default ContentSave;
+}
+
+declare module 'material-ui/lib/svg-icons/content/unarchive' {
+  export import ContentUnarchive = __MaterialUI.SvgIcon;
+  export default ContentUnarchive;
+}
+
+declare module 'material-ui/lib/svg-icons/content/link' {
+  export import ContentLink = __MaterialUI.SvgIcon;
+  export default ContentLink;
+}
+
+declare module 'material-ui/lib/svg-icons/content/sort' {
+  export import ContentSort = __MaterialUI.SvgIcon;
+  export default ContentSort;
+}
+
+declare module 'material-ui/lib/svg-icons/content/text-format' {
+  export import ContentTextFormat = __MaterialUI.SvgIcon;
+  export default ContentTextFormat;
+}
+
+declare module 'material-ui/lib/svg-icons/content/add' {
+  export import ContentAdd = __MaterialUI.SvgIcon;
+  export default ContentAdd;
+}
+
+declare module 'material-ui/lib/svg-icons/content/send' {
+  export import ContentSend = __MaterialUI.SvgIcon;
+  export default ContentSend;
+}
+
+declare module 'material-ui/lib/svg-icons/content/gesture' {
+  export import ContentGesture = __MaterialUI.SvgIcon;
+  export default ContentGesture;
+}
+
+declare module 'material-ui/lib/svg-icons/content/archive' {
+  export import ContentArchive = __MaterialUI.SvgIcon;
+  export default ContentArchive;
+}
+
+declare module 'material-ui/lib/svg-icons/content/weekend' {
+  export import ContentWeekend = __MaterialUI.SvgIcon;
+  export default ContentWeekend;
+}
+
+declare module 'material-ui/lib/svg-icons/content/markunread' {
+  export import ContentMarkunread = __MaterialUI.SvgIcon;
+  export default ContentMarkunread;
+}
+
+declare module 'material-ui/lib/svg-icons/content/create' {
+  export import ContentCreate = __MaterialUI.SvgIcon;
+  export default ContentCreate;
+}
+
+declare module 'material-ui/lib/svg-icons/content/content-cut' {
+  export import ContentContentCut = __MaterialUI.SvgIcon;
+  export default ContentContentCut;
+}
+
+declare module 'material-ui/lib/svg-icons/content/clear' {
+  export import ContentClear = __MaterialUI.SvgIcon;
+  export default ContentClear;
+}
+
+declare module 'material-ui/lib/svg-icons/content/redo' {
+  export import ContentRedo = __MaterialUI.SvgIcon;
+  export default ContentRedo;
+}
+
+declare module 'material-ui/lib/svg-icons/content/block' {
+  export import ContentBlock = __MaterialUI.SvgIcon;
+  export default ContentBlock;
+}
+
+declare module 'material-ui/lib/svg-icons/content/forward' {
+  export import ContentForward = __MaterialUI.SvgIcon;
+  export default ContentForward;
+}
+
+declare module 'material-ui/lib/svg-icons/content/mail' {
+  export import ContentMail = __MaterialUI.SvgIcon;
+  export default ContentMail;
+}
+
+declare module 'material-ui/lib/svg-icons/content/inbox' {
+  export import ContentInbox = __MaterialUI.SvgIcon;
+  export default ContentInbox;
+}
+
+declare module 'material-ui/lib/svg-icons/content/remove-circle' {
+  export import ContentRemoveCircle = __MaterialUI.SvgIcon;
+  export default ContentRemoveCircle;
+}
+
+declare module 'material-ui/lib/svg-icons/content/move-to-inbox' {
+  export import ContentMoveToInbox = __MaterialUI.SvgIcon;
+  export default ContentMoveToInbox;
+}
+
+declare module 'material-ui/lib/svg-icons/content/flag' {
+  export import ContentFlag = __MaterialUI.SvgIcon;
+  export default ContentFlag;
+}
+
+declare module 'material-ui/lib/svg-icons/content/reply-all' {
+  export import ContentReplyAll = __MaterialUI.SvgIcon;
+  export default ContentReplyAll;
+}
+
+declare module 'material-ui/lib/svg-icons/content/remove' {
+  export import ContentRemove = __MaterialUI.SvgIcon;
+  export default ContentRemove;
+}
+
+declare module 'material-ui/lib/svg-icons/content/next-week' {
+  export import ContentNextWeek = __MaterialUI.SvgIcon;
+  export default ContentNextWeek;
+}
+
+declare module 'material-ui/lib/svg-icons/content/undo' {
+  export import ContentUndo = __MaterialUI.SvgIcon;
+  export default ContentUndo;
+}
+
+declare module 'material-ui/lib/svg-icons/content/font-download' {
+  export import ContentFontDownload = __MaterialUI.SvgIcon;
+  export default ContentFontDownload;
+}
+
+declare module 'material-ui/lib/svg-icons/content/remove-circle-outline' {
+  export import ContentRemoveCircleOutline = __MaterialUI.SvgIcon;
+  export default ContentRemoveCircleOutline;
+}
+
+declare module 'material-ui/lib/svg-icons/content/backspace' {
+  export import ContentBackspace = __MaterialUI.SvgIcon;
+  export default ContentBackspace;
+}
+
+declare module 'material-ui/lib/svg-icons/content/reply' {
+  export import ContentReply = __MaterialUI.SvgIcon;
+  export default ContentReply;
+}
+
+declare module 'material-ui/lib/svg-icons/content/report' {
+  export import ContentReport = __MaterialUI.SvgIcon;
+  export default ContentReport;
+}
+
+declare module 'material-ui/lib/svg-icons/content/add-circle' {
+  export import ContentAddCircle = __MaterialUI.SvgIcon;
+  export default ContentAddCircle;
+}
+
+declare module 'material-ui/lib/svg-icons/content/content-copy' {
+  export import ContentContentCopy = __MaterialUI.SvgIcon;
+  export default ContentContentCopy;
+}
+
+declare module 'material-ui/lib/svg-icons/content/content-paste' {
+  export import ContentContentPaste = __MaterialUI.SvgIcon;
+  export default ContentContentPaste;
+}
+
+declare module 'material-ui/lib/svg-icons/content/select-all' {
+  export import ContentSelectAll = __MaterialUI.SvgIcon;
+  export default ContentSelectAll;
+}
+
+declare module 'material-ui/lib/svg-icons/content/add-circle-outline' {
+  export import ContentAddCircleOutline = __MaterialUI.SvgIcon;
+  export default ContentAddCircleOutline;
+}
+
+declare module 'material-ui/lib/svg-icons/content/drafts' {
+  export import ContentDrafts = __MaterialUI.SvgIcon;
+  export default ContentDrafts;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/wrap-text' {
+  export import EditorWrapText = __MaterialUI.SvgIcon;
+  export default EditorWrapText;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-size' {
+  export import EditorFormatSize = __MaterialUI.SvgIcon;
+  export default EditorFormatSize;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/functions' {
+  export import EditorFunctions = __MaterialUI.SvgIcon;
+  export default EditorFunctions;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-bold' {
+  export import EditorFormatBold = __MaterialUI.SvgIcon;
+  export default EditorFormatBold;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-align-center' {
+  export import EditorFormatAlignCenter = __MaterialUI.SvgIcon;
+  export default EditorFormatAlignCenter;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/mode-comment' {
+  export import EditorModeComment = __MaterialUI.SvgIcon;
+  export default EditorModeComment;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/money-off' {
+  export import EditorMoneyOff = __MaterialUI.SvgIcon;
+  export default EditorMoneyOff;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-textdirection-r-to-l' {
+  export import EditorFormatTextdirectionRToL = __MaterialUI.SvgIcon;
+  export default EditorFormatTextdirectionRToL;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/insert-drive-file' {
+  export import EditorInsertDriveFile = __MaterialUI.SvgIcon;
+  export default EditorInsertDriveFile;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/highlight' {
+  export import EditorHighlight = __MaterialUI.SvgIcon;
+  export default EditorHighlight;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-clear' {
+  export import EditorFormatClear = __MaterialUI.SvgIcon;
+  export default EditorFormatClear;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/border-style' {
+  export import EditorBorderStyle = __MaterialUI.SvgIcon;
+  export default EditorBorderStyle;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-shapes' {
+  export import EditorFormatShapes = __MaterialUI.SvgIcon;
+  export default EditorFormatShapes;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-paint' {
+  export import EditorFormatPaint = __MaterialUI.SvgIcon;
+  export default EditorFormatPaint;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/linear-scale' {
+  export import EditorLinearScale = __MaterialUI.SvgIcon;
+  export default EditorLinearScale;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/insert-photo' {
+  export import EditorInsertPhoto = __MaterialUI.SvgIcon;
+  export default EditorInsertPhoto;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/drag-handle' {
+  export import EditorDragHandle = __MaterialUI.SvgIcon;
+  export default EditorDragHandle;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/merge-type' {
+  export import EditorMergeType = __MaterialUI.SvgIcon;
+  export default EditorMergeType;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/attach-money' {
+  export import EditorAttachMoney = __MaterialUI.SvgIcon;
+  export default EditorAttachMoney;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/border-vertical' {
+  export import EditorBorderVertical = __MaterialUI.SvgIcon;
+  export default EditorBorderVertical;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-indent-decrease' {
+  export import EditorFormatIndentDecrease = __MaterialUI.SvgIcon;
+  export default EditorFormatIndentDecrease;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/insert-emoticon' {
+  export import EditorInsertEmoticon = __MaterialUI.SvgIcon;
+  export default EditorInsertEmoticon;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/insert-invitation' {
+  export import EditorInsertInvitation = __MaterialUI.SvgIcon;
+  export default EditorInsertInvitation;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-color-fill' {
+  export import EditorFormatColorFill = __MaterialUI.SvgIcon;
+  export default EditorFormatColorFill;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/mode-edit' {
+  export import EditorModeEdit = __MaterialUI.SvgIcon;
+  export default EditorModeEdit;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/vertical-align-bottom' {
+  export import EditorVerticalAlignBottom = __MaterialUI.SvgIcon;
+  export default EditorVerticalAlignBottom;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-align-justify' {
+  export import EditorFormatAlignJustify = __MaterialUI.SvgIcon;
+  export default EditorFormatAlignJustify;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/attach-file' {
+  export import EditorAttachFile = __MaterialUI.SvgIcon;
+  export default EditorAttachFile;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/space-bar' {
+  export import EditorSpaceBar = __MaterialUI.SvgIcon;
+  export default EditorSpaceBar;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/border-clear' {
+  export import EditorBorderClear = __MaterialUI.SvgIcon;
+  export default EditorBorderClear;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/short-text' {
+  export import EditorShortText = __MaterialUI.SvgIcon;
+  export default EditorShortText;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/insert-link' {
+  export import EditorInsertLink = __MaterialUI.SvgIcon;
+  export default EditorInsertLink;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-list-numbered' {
+  export import EditorFormatListNumbered = __MaterialUI.SvgIcon;
+  export default EditorFormatListNumbered;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-quote' {
+  export import EditorFormatQuote = __MaterialUI.SvgIcon;
+  export default EditorFormatQuote;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/border-left' {
+  export import EditorBorderLeft = __MaterialUI.SvgIcon;
+  export default EditorBorderLeft;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-underlined' {
+  export import EditorFormatUnderlined = __MaterialUI.SvgIcon;
+  export default EditorFormatUnderlined;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/text-fields' {
+  export import EditorTextFields = __MaterialUI.SvgIcon;
+  export default EditorTextFields;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-italic' {
+  export import EditorFormatItalic = __MaterialUI.SvgIcon;
+  export default EditorFormatItalic;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/publish' {
+  export import EditorPublish = __MaterialUI.SvgIcon;
+  export default EditorPublish;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/border-top' {
+  export import EditorBorderTop = __MaterialUI.SvgIcon;
+  export default EditorBorderTop;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-indent-increase' {
+  export import EditorFormatIndentIncrease = __MaterialUI.SvgIcon;
+  export default EditorFormatIndentIncrease;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/border-bottom' {
+  export import EditorBorderBottom = __MaterialUI.SvgIcon;
+  export default EditorBorderBottom;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-align-right' {
+  export import EditorFormatAlignRight = __MaterialUI.SvgIcon;
+  export default EditorFormatAlignRight;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/border-right' {
+  export import EditorBorderRight = __MaterialUI.SvgIcon;
+  export default EditorBorderRight;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/insert-comment' {
+  export import EditorInsertComment = __MaterialUI.SvgIcon;
+  export default EditorInsertComment;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/strikethrough-s' {
+  export import EditorStrikethroughS = __MaterialUI.SvgIcon;
+  export default EditorStrikethroughS;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-strikethrough' {
+  export import EditorFormatStrikethrough = __MaterialUI.SvgIcon;
+  export default EditorFormatStrikethrough;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/insert-chart' {
+  export import EditorInsertChart = __MaterialUI.SvgIcon;
+  export default EditorInsertChart;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-color-reset' {
+  export import EditorFormatColorReset = __MaterialUI.SvgIcon;
+  export default EditorFormatColorReset;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/border-inner' {
+  export import EditorBorderInner = __MaterialUI.SvgIcon;
+  export default EditorBorderInner;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-color-text' {
+  export import EditorFormatColorText = __MaterialUI.SvgIcon;
+  export default EditorFormatColorText;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/border-horizontal' {
+  export import EditorBorderHorizontal = __MaterialUI.SvgIcon;
+  export default EditorBorderHorizontal;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-list-bulleted' {
+  export import EditorFormatListBulleted = __MaterialUI.SvgIcon;
+  export default EditorFormatListBulleted;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/border-outer' {
+  export import EditorBorderOuter = __MaterialUI.SvgIcon;
+  export default EditorBorderOuter;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-align-left' {
+  export import EditorFormatAlignLeft = __MaterialUI.SvgIcon;
+  export default EditorFormatAlignLeft;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/border-color' {
+  export import EditorBorderColor = __MaterialUI.SvgIcon;
+  export default EditorBorderColor;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-textdirection-l-to-r' {
+  export import EditorFormatTextdirectionLToR = __MaterialUI.SvgIcon;
+  export default EditorFormatTextdirectionLToR;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/vertical-align-center' {
+  export import EditorVerticalAlignCenter = __MaterialUI.SvgIcon;
+  export default EditorVerticalAlignCenter;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/vertical-align-top' {
+  export import EditorVerticalAlignTop = __MaterialUI.SvgIcon;
+  export default EditorVerticalAlignTop;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/format-line-spacing' {
+  export import EditorFormatLineSpacing = __MaterialUI.SvgIcon;
+  export default EditorFormatLineSpacing;
+}
+
+declare module 'material-ui/lib/svg-icons/editor/border-all' {
+  export import EditorBorderAll = __MaterialUI.SvgIcon;
+  export default EditorBorderAll;
+}
+
+declare module 'material-ui/lib/svg-icons/device/screen-lock-portrait' {
+  export import DeviceScreenLockPortrait = __MaterialUI.SvgIcon;
+  export default DeviceScreenLockPortrait;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-cellular-off' {
+  export import DeviceSignalCellularOff = __MaterialUI.SvgIcon;
+  export default DeviceSignalCellularOff;
+}
+
+declare module 'material-ui/lib/svg-icons/device/bluetooth-searching' {
+  export import DeviceBluetoothSearching = __MaterialUI.SvgIcon;
+  export default DeviceBluetoothSearching;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-cellular-3-bar' {
+  export import DeviceSignalCellular3Bar = __MaterialUI.SvgIcon;
+  export default DeviceSignalCellular3Bar;
+}
+
+declare module 'material-ui/lib/svg-icons/device/network-cell' {
+  export import DeviceNetworkCell = __MaterialUI.SvgIcon;
+  export default DeviceNetworkCell;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-cellular-no-sim' {
+  export import DeviceSignalCellularNoSim = __MaterialUI.SvgIcon;
+  export default DeviceSignalCellularNoSim;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-wifi-2-bar' {
+  export import DeviceSignalWifi2Bar = __MaterialUI.SvgIcon;
+  export default DeviceSignalWifi2Bar;
+}
+
+declare module 'material-ui/lib/svg-icons/device/devices' {
+  export import DeviceDevices = __MaterialUI.SvgIcon;
+  export default DeviceDevices;
+}
+
+declare module 'material-ui/lib/svg-icons/device/battery-90' {
+  export import DeviceBattery90 = __MaterialUI.SvgIcon;
+  export default DeviceBattery90;
+}
+
+declare module 'material-ui/lib/svg-icons/device/battery-charging-80' {
+  export import DeviceBatteryCharging80 = __MaterialUI.SvgIcon;
+  export default DeviceBatteryCharging80;
+}
+
+declare module 'material-ui/lib/svg-icons/device/location-searching' {
+  export import DeviceLocationSearching = __MaterialUI.SvgIcon;
+  export default DeviceLocationSearching;
+}
+
+declare module 'material-ui/lib/svg-icons/device/wallpaper' {
+  export import DeviceWallpaper = __MaterialUI.SvgIcon;
+  export default DeviceWallpaper;
+}
+
+declare module 'material-ui/lib/svg-icons/device/screen-lock-rotation' {
+  export import DeviceScreenLockRotation = __MaterialUI.SvgIcon;
+  export default DeviceScreenLockRotation;
+}
+
+declare module 'material-ui/lib/svg-icons/device/screen-lock-landscape' {
+  export import DeviceScreenLockLandscape = __MaterialUI.SvgIcon;
+  export default DeviceScreenLockLandscape;
+}
+
+declare module 'material-ui/lib/svg-icons/device/battery-charging-20' {
+  export import DeviceBatteryCharging20 = __MaterialUI.SvgIcon;
+  export default DeviceBatteryCharging20;
+}
+
+declare module 'material-ui/lib/svg-icons/device/usb' {
+  export import DeviceUsb = __MaterialUI.SvgIcon;
+  export default DeviceUsb;
+}
+
+declare module 'material-ui/lib/svg-icons/device/airplanemode-active' {
+  export import DeviceAirplanemodeActive = __MaterialUI.SvgIcon;
+  export default DeviceAirplanemodeActive;
+}
+
+declare module 'material-ui/lib/svg-icons/device/network-wifi' {
+  export import DeviceNetworkWifi = __MaterialUI.SvgIcon;
+  export default DeviceNetworkWifi;
+}
+
+declare module 'material-ui/lib/svg-icons/device/graphic-eq' {
+  export import DeviceGraphicEq = __MaterialUI.SvgIcon;
+  export default DeviceGraphicEq;
+}
+
+declare module 'material-ui/lib/svg-icons/device/bluetooth-connected' {
+  export import DeviceBluetoothConnected = __MaterialUI.SvgIcon;
+  export default DeviceBluetoothConnected;
+}
+
+declare module 'material-ui/lib/svg-icons/device/gps-fixed' {
+  export import DeviceGpsFixed = __MaterialUI.SvgIcon;
+  export default DeviceGpsFixed;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-cellular-connected-no-internet-4-bar' {
+  export import DeviceSignalCellularConnectedNoInternet4Bar = __MaterialUI.SvgIcon;
+  export default DeviceSignalCellularConnectedNoInternet4Bar;
+}
+
+declare module 'material-ui/lib/svg-icons/device/brightness-medium' {
+  export import DeviceBrightnessMedium = __MaterialUI.SvgIcon;
+  export default DeviceBrightnessMedium;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-cellular-connected-no-internet-3-bar' {
+  export import DeviceSignalCellularConnectedNoInternet3Bar = __MaterialUI.SvgIcon;
+  export default DeviceSignalCellularConnectedNoInternet3Bar;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-wifi-3-bar-lock' {
+  export import DeviceSignalWifi3BarLock = __MaterialUI.SvgIcon;
+  export default DeviceSignalWifi3BarLock;
+}
+
+declare module 'material-ui/lib/svg-icons/device/battery-80' {
+  export import DeviceBattery80 = __MaterialUI.SvgIcon;
+  export default DeviceBattery80;
+}
+
+declare module 'material-ui/lib/svg-icons/device/wifi-lock' {
+  export import DeviceWifiLock = __MaterialUI.SvgIcon;
+  export default DeviceWifiLock;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-wifi-2-bar-lock' {
+  export import DeviceSignalWifi2BarLock = __MaterialUI.SvgIcon;
+  export default DeviceSignalWifi2BarLock;
+}
+
+declare module 'material-ui/lib/svg-icons/device/bluetooth' {
+  export import DeviceBluetooth = __MaterialUI.SvgIcon;
+  export default DeviceBluetooth;
+}
+
+declare module 'material-ui/lib/svg-icons/device/access-time' {
+  export import DeviceAccessTime = __MaterialUI.SvgIcon;
+  export default DeviceAccessTime;
+}
+
+declare module 'material-ui/lib/svg-icons/device/battery-charging-30' {
+  export import DeviceBatteryCharging30 = __MaterialUI.SvgIcon;
+  export default DeviceBatteryCharging30;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-wifi-off' {
+  export import DeviceSignalWifiOff = __MaterialUI.SvgIcon;
+  export default DeviceSignalWifiOff;
+}
+
+declare module 'material-ui/lib/svg-icons/device/dvr' {
+  export import DeviceDvr = __MaterialUI.SvgIcon;
+  export default DeviceDvr;
+}
+
+declare module 'material-ui/lib/svg-icons/device/battery-60' {
+  export import DeviceBattery60 = __MaterialUI.SvgIcon;
+  export default DeviceBattery60;
+}
+
+declare module 'material-ui/lib/svg-icons/device/access-alarm' {
+  export import DeviceAccessAlarm = __MaterialUI.SvgIcon;
+  export default DeviceAccessAlarm;
+}
+
+declare module 'material-ui/lib/svg-icons/device/nfc' {
+  export import DeviceNfc = __MaterialUI.SvgIcon;
+  export default DeviceNfc;
+}
+
+declare module 'material-ui/lib/svg-icons/device/data-usage' {
+  export import DeviceDataUsage = __MaterialUI.SvgIcon;
+  export default DeviceDataUsage;
+}
+
+declare module 'material-ui/lib/svg-icons/device/access-alarms' {
+  export import DeviceAccessAlarms = __MaterialUI.SvgIcon;
+  export default DeviceAccessAlarms;
+}
+
+declare module 'material-ui/lib/svg-icons/device/battery-full' {
+  export import DeviceBatteryFull = __MaterialUI.SvgIcon;
+  export default DeviceBatteryFull;
+}
+
+declare module 'material-ui/lib/svg-icons/device/battery-charging-full' {
+  export import DeviceBatteryChargingFull = __MaterialUI.SvgIcon;
+  export default DeviceBatteryChargingFull;
+}
+
+declare module 'material-ui/lib/svg-icons/device/settings-system-daydream' {
+  export import DeviceSettingsSystemDaydream = __MaterialUI.SvgIcon;
+  export default DeviceSettingsSystemDaydream;
+}
+
+declare module 'material-ui/lib/svg-icons/device/battery-std' {
+  export import DeviceBatteryStd = __MaterialUI.SvgIcon;
+  export default DeviceBatteryStd;
+}
+
+declare module 'material-ui/lib/svg-icons/device/battery-unknown' {
+  export import DeviceBatteryUnknown = __MaterialUI.SvgIcon;
+  export default DeviceBatteryUnknown;
+}
+
+declare module 'material-ui/lib/svg-icons/device/add-alarm' {
+  export import DeviceAddAlarm = __MaterialUI.SvgIcon;
+  export default DeviceAddAlarm;
+}
+
+declare module 'material-ui/lib/svg-icons/device/storage' {
+  export import DeviceStorage = __MaterialUI.SvgIcon;
+  export default DeviceStorage;
+}
+
+declare module 'material-ui/lib/svg-icons/device/battery-charging-90' {
+  export import DeviceBatteryCharging90 = __MaterialUI.SvgIcon;
+  export default DeviceBatteryCharging90;
+}
+
+declare module 'material-ui/lib/svg-icons/device/screen-rotation' {
+  export import DeviceScreenRotation = __MaterialUI.SvgIcon;
+  export default DeviceScreenRotation;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-wifi-4-bar' {
+  export import DeviceSignalWifi4Bar = __MaterialUI.SvgIcon;
+  export default DeviceSignalWifi4Bar;
+}
+
+declare module 'material-ui/lib/svg-icons/device/battery-charging-50' {
+  export import DeviceBatteryCharging50 = __MaterialUI.SvgIcon;
+  export default DeviceBatteryCharging50;
+}
+
+declare module 'material-ui/lib/svg-icons/device/battery-30' {
+  export import DeviceBattery30 = __MaterialUI.SvgIcon;
+  export default DeviceBattery30;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-cellular-connected-no-internet-0-bar' {
+  export import DeviceSignalCellularConnectedNoInternet0Bar = __MaterialUI.SvgIcon;
+  export default DeviceSignalCellularConnectedNoInternet0Bar;
+}
+
+declare module 'material-ui/lib/svg-icons/device/battery-alert' {
+  export import DeviceBatteryAlert = __MaterialUI.SvgIcon;
+  export default DeviceBatteryAlert;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-wifi-1-bar' {
+  export import DeviceSignalWifi1Bar = __MaterialUI.SvgIcon;
+  export default DeviceSignalWifi1Bar;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-cellular-4-bar' {
+  export import DeviceSignalCellular4Bar = __MaterialUI.SvgIcon;
+  export default DeviceSignalCellular4Bar;
+}
+
+declare module 'material-ui/lib/svg-icons/device/wifi-tethering' {
+  export import DeviceWifiTethering = __MaterialUI.SvgIcon;
+  export default DeviceWifiTethering;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-wifi-0-bar' {
+  export import DeviceSignalWifi0Bar = __MaterialUI.SvgIcon;
+  export default DeviceSignalWifi0Bar;
+}
+
+declare module 'material-ui/lib/svg-icons/device/brightness-auto' {
+  export import DeviceBrightnessAuto = __MaterialUI.SvgIcon;
+  export default DeviceBrightnessAuto;
+}
+
+declare module 'material-ui/lib/svg-icons/device/location-disabled' {
+  export import DeviceLocationDisabled = __MaterialUI.SvgIcon;
+  export default DeviceLocationDisabled;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-wifi-3-bar' {
+  export import DeviceSignalWifi3Bar = __MaterialUI.SvgIcon;
+  export default DeviceSignalWifi3Bar;
+}
+
+declare module 'material-ui/lib/svg-icons/device/gps-not-fixed' {
+  export import DeviceGpsNotFixed = __MaterialUI.SvgIcon;
+  export default DeviceGpsNotFixed;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-cellular-1-bar' {
+  export import DeviceSignalCellular1Bar = __MaterialUI.SvgIcon;
+  export default DeviceSignalCellular1Bar;
+}
+
+declare module 'material-ui/lib/svg-icons/device/battery-charging-60' {
+  export import DeviceBatteryCharging60 = __MaterialUI.SvgIcon;
+  export default DeviceBatteryCharging60;
+}
+
+declare module 'material-ui/lib/svg-icons/device/gps-off' {
+  export import DeviceGpsOff = __MaterialUI.SvgIcon;
+  export default DeviceGpsOff;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-cellular-null' {
+  export import DeviceSignalCellularNull = __MaterialUI.SvgIcon;
+  export default DeviceSignalCellularNull;
+}
+
+declare module 'material-ui/lib/svg-icons/device/brightness-low' {
+  export import DeviceBrightnessLow = __MaterialUI.SvgIcon;
+  export default DeviceBrightnessLow;
+}
+
+declare module 'material-ui/lib/svg-icons/device/sd-storage' {
+  export import DeviceSdStorage = __MaterialUI.SvgIcon;
+  export default DeviceSdStorage;
+}
+
+declare module 'material-ui/lib/svg-icons/device/airplanemode-inactive' {
+  export import DeviceAirplanemodeInactive = __MaterialUI.SvgIcon;
+  export default DeviceAirplanemodeInactive;
+}
+
+declare module 'material-ui/lib/svg-icons/device/widgets' {
+  export import DeviceWidgets = __MaterialUI.SvgIcon;
+  export default DeviceWidgets;
+}
+
+declare module 'material-ui/lib/svg-icons/device/brightness-high' {
+  export import DeviceBrightnessHigh = __MaterialUI.SvgIcon;
+  export default DeviceBrightnessHigh;
+}
+
+declare module 'material-ui/lib/svg-icons/device/battery-20' {
+  export import DeviceBattery20 = __MaterialUI.SvgIcon;
+  export default DeviceBattery20;
+}
+
+declare module 'material-ui/lib/svg-icons/device/bluetooth-disabled' {
+  export import DeviceBluetoothDisabled = __MaterialUI.SvgIcon;
+  export default DeviceBluetoothDisabled;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-wifi-4-bar-lock' {
+  export import DeviceSignalWifi4BarLock = __MaterialUI.SvgIcon;
+  export default DeviceSignalWifi4BarLock;
+}
+
+declare module 'material-ui/lib/svg-icons/device/developer-mode' {
+  export import DeviceDeveloperMode = __MaterialUI.SvgIcon;
+  export default DeviceDeveloperMode;
+}
+
+declare module 'material-ui/lib/svg-icons/device/battery-50' {
+  export import DeviceBattery50 = __MaterialUI.SvgIcon;
+  export default DeviceBattery50;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-cellular-connected-no-internet-1-bar' {
+  export import DeviceSignalCellularConnectedNoInternet1Bar = __MaterialUI.SvgIcon;
+  export default DeviceSignalCellularConnectedNoInternet1Bar;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-cellular-2-bar' {
+  export import DeviceSignalCellular2Bar = __MaterialUI.SvgIcon;
+  export default DeviceSignalCellular2Bar;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-cellular-connected-no-internet-2-bar' {
+  export import DeviceSignalCellularConnectedNoInternet2Bar = __MaterialUI.SvgIcon;
+  export default DeviceSignalCellularConnectedNoInternet2Bar;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-cellular-0-bar' {
+  export import DeviceSignalCellular0Bar = __MaterialUI.SvgIcon;
+  export default DeviceSignalCellular0Bar;
+}
+
+declare module 'material-ui/lib/svg-icons/device/signal-wifi-1-bar-lock' {
+  export import DeviceSignalWifi1BarLock = __MaterialUI.SvgIcon;
+  export default DeviceSignalWifi1BarLock;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/arrow-forward' {
+  export import NavigationArrowForward = __MaterialUI.SvgIcon;
+  export default NavigationArrowForward;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/unfold-more' {
+  export import NavigationUnfoldMore = __MaterialUI.SvgIcon;
+  export default NavigationUnfoldMore;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/arrow-drop-down' {
+  export import NavigationArrowDropDown = __MaterialUI.SvgIcon;
+  export default NavigationArrowDropDown;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/arrow-back' {
+  export import NavigationArrowBack = __MaterialUI.SvgIcon;
+  export default NavigationArrowBack;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/arrow-downward' {
+  export import NavigationArrowDownward = __MaterialUI.SvgIcon;
+  export default NavigationArrowDownward;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/fullscreen' {
+  export import NavigationFullscreen = __MaterialUI.SvgIcon;
+  export default NavigationFullscreen;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/unfold-less' {
+  export import NavigationUnfoldLess = __MaterialUI.SvgIcon;
+  export default NavigationUnfoldLess;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/chevron-right' {
+  export import NavigationChevronRight = __MaterialUI.SvgIcon;
+  export default NavigationChevronRight;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/arrow-drop-down-circle' {
+  export import NavigationArrowDropDownCircle = __MaterialUI.SvgIcon;
+  export default NavigationArrowDropDownCircle;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/check' {
+  export import NavigationCheck = __MaterialUI.SvgIcon;
+  export default NavigationCheck;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/fullscreen-exit' {
+  export import NavigationFullscreenExit = __MaterialUI.SvgIcon;
+  export default NavigationFullscreenExit;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/chevron-left' {
+  export import NavigationChevronLeft = __MaterialUI.SvgIcon;
+  export default NavigationChevronLeft;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/menu' {
+  export import NavigationMenu = __MaterialUI.SvgIcon;
+  export default NavigationMenu;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/apps' {
+  export import NavigationApps = __MaterialUI.SvgIcon;
+  export default NavigationApps;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/arrow-upward' {
+  export import NavigationArrowUpward = __MaterialUI.SvgIcon;
+  export default NavigationArrowUpward;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/close' {
+  export import NavigationClose = __MaterialUI.SvgIcon;
+  export default NavigationClose;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/more-horiz' {
+  export import NavigationMoreHoriz = __MaterialUI.SvgIcon;
+  export default NavigationMoreHoriz;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/cancel' {
+  export import NavigationCancel = __MaterialUI.SvgIcon;
+  export default NavigationCancel;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/subdirectory-arrow-right' {
+  export import NavigationSubdirectoryArrowRight = __MaterialUI.SvgIcon;
+  export default NavigationSubdirectoryArrowRight;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/expand-more' {
+  export import NavigationExpandMore = __MaterialUI.SvgIcon;
+  export default NavigationExpandMore;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/arrow-drop-up' {
+  export import NavigationArrowDropUp = __MaterialUI.SvgIcon;
+  export default NavigationArrowDropUp;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/subdirectory-arrow-left' {
+  export import NavigationSubdirectoryArrowLeft = __MaterialUI.SvgIcon;
+  export default NavigationSubdirectoryArrowLeft;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/expand-less' {
+  export import NavigationExpandLess = __MaterialUI.SvgIcon;
+  export default NavigationExpandLess;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/refresh' {
+  export import NavigationRefresh = __MaterialUI.SvgIcon;
+  export default NavigationRefresh;
+}
+
+declare module 'material-ui/lib/svg-icons/navigation/more-vert' {
+  export import NavigationMoreVert = __MaterialUI.SvgIcon;
+  export default NavigationMoreVert;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/rv-hookup' {
+  export import NotificationRvHookup = __MaterialUI.SvgIcon;
+  export default NotificationRvHookup;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/no-encryption' {
+  export import NotificationNoEncryption = __MaterialUI.SvgIcon;
+  export default NotificationNoEncryption;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/phone-forwarded' {
+  export import NotificationPhoneForwarded = __MaterialUI.SvgIcon;
+  export default NotificationPhoneForwarded;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/airline-seat-flat-angled' {
+  export import NotificationAirlineSeatFlatAngled = __MaterialUI.SvgIcon;
+  export default NotificationAirlineSeatFlatAngled;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/time-to-leave' {
+  export import NotificationTimeToLeave = __MaterialUI.SvgIcon;
+  export default NotificationTimeToLeave;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/airline-seat-legroom-extra' {
+  export import NotificationAirlineSeatLegroomExtra = __MaterialUI.SvgIcon;
+  export default NotificationAirlineSeatLegroomExtra;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/airline-seat-recline-extra' {
+  export import NotificationAirlineSeatReclineExtra = __MaterialUI.SvgIcon;
+  export default NotificationAirlineSeatReclineExtra;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/airline-seat-individual-suite' {
+  export import NotificationAirlineSeatIndividualSuite = __MaterialUI.SvgIcon;
+  export default NotificationAirlineSeatIndividualSuite;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/vibration' {
+  export import NotificationVibration = __MaterialUI.SvgIcon;
+  export default NotificationVibration;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/sim-card-alert' {
+  export import NotificationSimCardAlert = __MaterialUI.SvgIcon;
+  export default NotificationSimCardAlert;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/sms-failed' {
+  export import NotificationSmsFailed = __MaterialUI.SvgIcon;
+  export default NotificationSmsFailed;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/airline-seat-flat' {
+  export import NotificationAirlineSeatFlat = __MaterialUI.SvgIcon;
+  export default NotificationAirlineSeatFlat;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/do-not-disturb' {
+  export import NotificationDoNotDisturb = __MaterialUI.SvgIcon;
+  export default NotificationDoNotDisturb;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/sync-problem' {
+  export import NotificationSyncProblem = __MaterialUI.SvgIcon;
+  export default NotificationSyncProblem;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/event-available' {
+  export import NotificationEventAvailable = __MaterialUI.SvgIcon;
+  export default NotificationEventAvailable;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/network-check' {
+  export import NotificationNetworkCheck = __MaterialUI.SvgIcon;
+  export default NotificationNetworkCheck;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/sms' {
+  export import NotificationSms = __MaterialUI.SvgIcon;
+  export default NotificationSms;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/disc-full' {
+  export import NotificationDiscFull = __MaterialUI.SvgIcon;
+  export default NotificationDiscFull;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/do-not-disturb-alt' {
+  export import NotificationDoNotDisturbAlt = __MaterialUI.SvgIcon;
+  export default NotificationDoNotDisturbAlt;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/system-update' {
+  export import NotificationSystemUpdate = __MaterialUI.SvgIcon;
+  export default NotificationSystemUpdate;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/phone-bluetooth-speaker' {
+  export import NotificationPhoneBluetoothSpeaker = __MaterialUI.SvgIcon;
+  export default NotificationPhoneBluetoothSpeaker;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/ondemand-video' {
+  export import NotificationOndemandVideo = __MaterialUI.SvgIcon;
+  export default NotificationOndemandVideo;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/power' {
+  export import NotificationPower = __MaterialUI.SvgIcon;
+  export default NotificationPower;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/phone-locked' {
+  export import NotificationPhoneLocked = __MaterialUI.SvgIcon;
+  export default NotificationPhoneLocked;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/sd-card' {
+  export import NotificationSdCard = __MaterialUI.SvgIcon;
+  export default NotificationSdCard;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/event-busy' {
+  export import NotificationEventBusy = __MaterialUI.SvgIcon;
+  export default NotificationEventBusy;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/personal-video' {
+  export import NotificationPersonalVideo = __MaterialUI.SvgIcon;
+  export default NotificationPersonalVideo;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/airline-seat-legroom-normal' {
+  export import NotificationAirlineSeatLegroomNormal = __MaterialUI.SvgIcon;
+  export default NotificationAirlineSeatLegroomNormal;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/phone-in-talk' {
+  export import NotificationPhoneInTalk = __MaterialUI.SvgIcon;
+  export default NotificationPhoneInTalk;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/airline-seat-legroom-reduced' {
+  export import NotificationAirlineSeatLegroomReduced = __MaterialUI.SvgIcon;
+  export default NotificationAirlineSeatLegroomReduced;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/phone-paused' {
+  export import NotificationPhonePaused = __MaterialUI.SvgIcon;
+  export default NotificationPhonePaused;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/sync-disabled' {
+  export import NotificationSyncDisabled = __MaterialUI.SvgIcon;
+  export default NotificationSyncDisabled;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/enhanced-encryption' {
+  export import NotificationEnhancedEncryption = __MaterialUI.SvgIcon;
+  export default NotificationEnhancedEncryption;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/mms' {
+  export import NotificationMms = __MaterialUI.SvgIcon;
+  export default NotificationMms;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/drive-eta' {
+  export import NotificationDriveEta = __MaterialUI.SvgIcon;
+  export default NotificationDriveEta;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/voice-chat' {
+  export import NotificationVoiceChat = __MaterialUI.SvgIcon;
+  export default NotificationVoiceChat;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/wifi' {
+  export import NotificationWifi = __MaterialUI.SvgIcon;
+  export default NotificationWifi;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/airline-seat-recline-normal' {
+  export import NotificationAirlineSeatReclineNormal = __MaterialUI.SvgIcon;
+  export default NotificationAirlineSeatReclineNormal;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/more' {
+  export import NotificationMore = __MaterialUI.SvgIcon;
+  export default NotificationMore;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/vpn-lock' {
+  export import NotificationVpnLock = __MaterialUI.SvgIcon;
+  export default NotificationVpnLock;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/event-note' {
+  export import NotificationEventNote = __MaterialUI.SvgIcon;
+  export default NotificationEventNote;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/confirmation-number' {
+  export import NotificationConfirmationNumber = __MaterialUI.SvgIcon;
+  export default NotificationConfirmationNumber;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/network-locked' {
+  export import NotificationNetworkLocked = __MaterialUI.SvgIcon;
+  export default NotificationNetworkLocked;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/adb' {
+  export import NotificationAdb = __MaterialUI.SvgIcon;
+  export default NotificationAdb;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/bluetooth-audio' {
+  export import NotificationBluetoothAudio = __MaterialUI.SvgIcon;
+  export default NotificationBluetoothAudio;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/wc' {
+  export import NotificationWc = __MaterialUI.SvgIcon;
+  export default NotificationWc;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/tap-and-play' {
+  export import NotificationTapAndPlay = __MaterialUI.SvgIcon;
+  export default NotificationTapAndPlay;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/folder-special' {
+  export import NotificationFolderSpecial = __MaterialUI.SvgIcon;
+  export default NotificationFolderSpecial;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/live-tv' {
+  export import NotificationLiveTv = __MaterialUI.SvgIcon;
+  export default NotificationLiveTv;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/sync' {
+  export import NotificationSync = __MaterialUI.SvgIcon;
+  export default NotificationSync;
+}
+
+declare module 'material-ui/lib/svg-icons/notification/phone-missed' {
+  export import NotificationPhoneMissed = __MaterialUI.SvgIcon;
+  export default NotificationPhoneMissed;
+}
+
+declare module 'material-ui/lib/svg-icons/av/skip-previous' {
+  export import AvSkipPrevious = __MaterialUI.SvgIcon;
+  export default AvSkipPrevious;
+}
+
+declare module 'material-ui/lib/svg-icons/av/volume-off' {
+  export import AvVolumeOff = __MaterialUI.SvgIcon;
+  export default AvVolumeOff;
+}
+
+declare module 'material-ui/lib/svg-icons/av/subscriptions' {
+  export import AvSubscriptions = __MaterialUI.SvgIcon;
+  export default AvSubscriptions;
+}
+
+declare module 'material-ui/lib/svg-icons/av/play-arrow' {
+  export import AvPlayArrow = __MaterialUI.SvgIcon;
+  export default AvPlayArrow;
+}
+
+declare module 'material-ui/lib/svg-icons/av/play-circle-outline' {
+  export import AvPlayCircleOutline = __MaterialUI.SvgIcon;
+  export default AvPlayCircleOutline;
+}
+
+declare module 'material-ui/lib/svg-icons/av/replay-30' {
+  export import AvReplay30 = __MaterialUI.SvgIcon;
+  export default AvReplay30;
+}
+
+declare module 'material-ui/lib/svg-icons/av/videocam' {
+  export import AvVideocam = __MaterialUI.SvgIcon;
+  export default AvVideocam;
+}
+
+declare module 'material-ui/lib/svg-icons/av/replay-5' {
+  export import AvReplay5 = __MaterialUI.SvgIcon;
+  export default AvReplay5;
+}
+
+declare module 'material-ui/lib/svg-icons/av/forward-10' {
+  export import AvForward10 = __MaterialUI.SvgIcon;
+  export default AvForward10;
+}
+
+declare module 'material-ui/lib/svg-icons/av/recent-actors' {
+  export import AvRecentActors = __MaterialUI.SvgIcon;
+  export default AvRecentActors;
+}
+
+declare module 'material-ui/lib/svg-icons/av/replay-10' {
+  export import AvReplay10 = __MaterialUI.SvgIcon;
+  export default AvReplay10;
+}
+
+declare module 'material-ui/lib/svg-icons/av/repeat' {
+  export import AvRepeat = __MaterialUI.SvgIcon;
+  export default AvRepeat;
+}
+
+declare module 'material-ui/lib/svg-icons/av/queue-music' {
+  export import AvQueueMusic = __MaterialUI.SvgIcon;
+  export default AvQueueMusic;
+}
+
+declare module 'material-ui/lib/svg-icons/av/fiber-pin' {
+  export import AvFiberPin = __MaterialUI.SvgIcon;
+  export default AvFiberPin;
+}
+
+declare module 'material-ui/lib/svg-icons/av/new-releases' {
+  export import AvNewReleases = __MaterialUI.SvgIcon;
+  export default AvNewReleases;
+}
+
+declare module 'material-ui/lib/svg-icons/av/fiber-new' {
+  export import AvFiberNew = __MaterialUI.SvgIcon;
+  export default AvFiberNew;
+}
+
+declare module 'material-ui/lib/svg-icons/av/fiber-manual-record' {
+  export import AvFiberManualRecord = __MaterialUI.SvgIcon;
+  export default AvFiberManualRecord;
+}
+
+declare module 'material-ui/lib/svg-icons/av/hearing' {
+  export import AvHearing = __MaterialUI.SvgIcon;
+  export default AvHearing;
+}
+
+declare module 'material-ui/lib/svg-icons/av/loop' {
+  export import AvLoop = __MaterialUI.SvgIcon;
+  export default AvLoop;
+}
+
+declare module 'material-ui/lib/svg-icons/av/volume-up' {
+  export import AvVolumeUp = __MaterialUI.SvgIcon;
+  export default AvVolumeUp;
+}
+
+declare module 'material-ui/lib/svg-icons/av/high-quality' {
+  export import AvHighQuality = __MaterialUI.SvgIcon;
+  export default AvHighQuality;
+}
+
+declare module 'material-ui/lib/svg-icons/av/surround-sound' {
+  export import AvSurroundSound = __MaterialUI.SvgIcon;
+  export default AvSurroundSound;
+}
+
+declare module 'material-ui/lib/svg-icons/av/equalizer' {
+  export import AvEqualizer = __MaterialUI.SvgIcon;
+  export default AvEqualizer;
+}
+
+declare module 'material-ui/lib/svg-icons/av/music-video' {
+  export import AvMusicVideo = __MaterialUI.SvgIcon;
+  export default AvMusicVideo;
+}
+
+declare module 'material-ui/lib/svg-icons/av/shuffle' {
+  export import AvShuffle = __MaterialUI.SvgIcon;
+  export default AvShuffle;
+}
+
+declare module 'material-ui/lib/svg-icons/av/volume-down' {
+  export import AvVolumeDown = __MaterialUI.SvgIcon;
+  export default AvVolumeDown;
+}
+
+declare module 'material-ui/lib/svg-icons/av/radio' {
+  export import AvRadio = __MaterialUI.SvgIcon;
+  export default AvRadio;
+}
+
+declare module 'material-ui/lib/svg-icons/av/web-asset' {
+  export import AvWebAsset = __MaterialUI.SvgIcon;
+  export default AvWebAsset;
+}
+
+declare module 'material-ui/lib/svg-icons/av/replay' {
+  export import AvReplay = __MaterialUI.SvgIcon;
+  export default AvReplay;
+}
+
+declare module 'material-ui/lib/svg-icons/av/queue-play-next' {
+  export import AvQueuePlayNext = __MaterialUI.SvgIcon;
+  export default AvQueuePlayNext;
+}
+
+declare module 'material-ui/lib/svg-icons/av/closed-caption' {
+  export import AvClosedCaption = __MaterialUI.SvgIcon;
+  export default AvClosedCaption;
+}
+
+declare module 'material-ui/lib/svg-icons/av/fiber-dvr' {
+  export import AvFiberDvr = __MaterialUI.SvgIcon;
+  export default AvFiberDvr;
+}
+
+declare module 'material-ui/lib/svg-icons/av/explicit' {
+  export import AvExplicit = __MaterialUI.SvgIcon;
+  export default AvExplicit;
+}
+
+declare module 'material-ui/lib/svg-icons/av/games' {
+  export import AvGames = __MaterialUI.SvgIcon;
+  export default AvGames;
+}
+
+declare module 'material-ui/lib/svg-icons/av/videocam-off' {
+  export import AvVideocamOff = __MaterialUI.SvgIcon;
+  export default AvVideocamOff;
+}
+
+declare module 'material-ui/lib/svg-icons/av/hd' {
+  export import AvHd = __MaterialUI.SvgIcon;
+  export default AvHd;
+}
+
+declare module 'material-ui/lib/svg-icons/av/fast-rewind' {
+  export import AvFastRewind = __MaterialUI.SvgIcon;
+  export default AvFastRewind;
+}
+
+declare module 'material-ui/lib/svg-icons/av/add-to-queue' {
+  export import AvAddToQueue = __MaterialUI.SvgIcon;
+  export default AvAddToQueue;
+}
+
+declare module 'material-ui/lib/svg-icons/av/movie' {
+  export import AvMovie = __MaterialUI.SvgIcon;
+  export default AvMovie;
+}
+
+declare module 'material-ui/lib/svg-icons/av/library-books' {
+  export import AvLibraryBooks = __MaterialUI.SvgIcon;
+  export default AvLibraryBooks;
+}
+
+declare module 'material-ui/lib/svg-icons/av/art-track' {
+  export import AvArtTrack = __MaterialUI.SvgIcon;
+  export default AvArtTrack;
+}
+
+declare module 'material-ui/lib/svg-icons/av/web' {
+  export import AvWeb = __MaterialUI.SvgIcon;
+  export default AvWeb;
+}
+
+declare module 'material-ui/lib/svg-icons/av/play-circle-filled' {
+  export import AvPlayCircleFilled = __MaterialUI.SvgIcon;
+  export default AvPlayCircleFilled;
+}
+
+declare module 'material-ui/lib/svg-icons/av/snooze' {
+  export import AvSnooze = __MaterialUI.SvgIcon;
+  export default AvSnooze;
+}
+
+declare module 'material-ui/lib/svg-icons/av/forward-5' {
+  export import AvForward5 = __MaterialUI.SvgIcon;
+  export default AvForward5;
+}
+
+declare module 'material-ui/lib/svg-icons/av/sort-by-alpha' {
+  export import AvSortByAlpha = __MaterialUI.SvgIcon;
+  export default AvSortByAlpha;
+}
+
+declare module 'material-ui/lib/svg-icons/av/pause-circle-filled' {
+  export import AvPauseCircleFilled = __MaterialUI.SvgIcon;
+  export default AvPauseCircleFilled;
+}
+
+declare module 'material-ui/lib/svg-icons/av/fiber-smart-record' {
+  export import AvFiberSmartRecord = __MaterialUI.SvgIcon;
+  export default AvFiberSmartRecord;
+}
+
+declare module 'material-ui/lib/svg-icons/av/stop' {
+  export import AvStop = __MaterialUI.SvgIcon;
+  export default AvStop;
+}
+
+declare module 'material-ui/lib/svg-icons/av/playlist-play' {
+  export import AvPlaylistPlay = __MaterialUI.SvgIcon;
+  export default AvPlaylistPlay;
+}
+
+declare module 'material-ui/lib/svg-icons/av/library-add' {
+  export import AvLibraryAdd = __MaterialUI.SvgIcon;
+  export default AvLibraryAdd;
+}
+
+declare module 'material-ui/lib/svg-icons/av/volume-mute' {
+  export import AvVolumeMute = __MaterialUI.SvgIcon;
+  export default AvVolumeMute;
+}
+
+declare module 'material-ui/lib/svg-icons/av/skip-next' {
+  export import AvSkipNext = __MaterialUI.SvgIcon;
+  export default AvSkipNext;
+}
+
+declare module 'material-ui/lib/svg-icons/av/forward-30' {
+  export import AvForward30 = __MaterialUI.SvgIcon;
+  export default AvForward30;
+}
+
+declare module 'material-ui/lib/svg-icons/av/playlist-add' {
+  export import AvPlaylistAdd = __MaterialUI.SvgIcon;
+  export default AvPlaylistAdd;
+}
+
+declare module 'material-ui/lib/svg-icons/av/album' {
+  export import AvAlbum = __MaterialUI.SvgIcon;
+  export default AvAlbum;
+}
+
+declare module 'material-ui/lib/svg-icons/av/video-library' {
+  export import AvVideoLibrary = __MaterialUI.SvgIcon;
+  export default AvVideoLibrary;
+}
+
+declare module 'material-ui/lib/svg-icons/av/library-music' {
+  export import AvLibraryMusic = __MaterialUI.SvgIcon;
+  export default AvLibraryMusic;
+}
+
+declare module 'material-ui/lib/svg-icons/av/not-interested' {
+  export import AvNotInterested = __MaterialUI.SvgIcon;
+  export default AvNotInterested;
+}
+
+declare module 'material-ui/lib/svg-icons/av/playlist-add-check' {
+  export import AvPlaylistAddCheck = __MaterialUI.SvgIcon;
+  export default AvPlaylistAddCheck;
+}
+
+declare module 'material-ui/lib/svg-icons/av/mic-none' {
+  export import AvMicNone = __MaterialUI.SvgIcon;
+  export default AvMicNone;
+}
+
+declare module 'material-ui/lib/svg-icons/av/pause' {
+  export import AvPause = __MaterialUI.SvgIcon;
+  export default AvPause;
+}
+
+declare module 'material-ui/lib/svg-icons/av/remove-from-queue' {
+  export import AvRemoveFromQueue = __MaterialUI.SvgIcon;
+  export default AvRemoveFromQueue;
+}
+
+declare module 'material-ui/lib/svg-icons/av/slow-motion-video' {
+  export import AvSlowMotionVideo = __MaterialUI.SvgIcon;
+  export default AvSlowMotionVideo;
+}
+
+declare module 'material-ui/lib/svg-icons/av/subtitles' {
+  export import AvSubtitles = __MaterialUI.SvgIcon;
+  export default AvSubtitles;
+}
+
+declare module 'material-ui/lib/svg-icons/av/mic-off' {
+  export import AvMicOff = __MaterialUI.SvgIcon;
+  export default AvMicOff;
+}
+
+declare module 'material-ui/lib/svg-icons/av/repeat-one' {
+  export import AvRepeatOne = __MaterialUI.SvgIcon;
+  export default AvRepeatOne;
+}
+
+declare module 'material-ui/lib/svg-icons/av/queue' {
+  export import AvQueue = __MaterialUI.SvgIcon;
+  export default AvQueue;
+}
+
+declare module 'material-ui/lib/svg-icons/av/fast-forward' {
+  export import AvFastForward = __MaterialUI.SvgIcon;
+  export default AvFastForward;
+}
+
+declare module 'material-ui/lib/svg-icons/av/mic' {
+  export import AvMic = __MaterialUI.SvgIcon;
+  export default AvMic;
+}
+
+declare module 'material-ui/lib/svg-icons/av/av-timer' {
+  export import AvAvTimer = __MaterialUI.SvgIcon;
+  export default AvAvTimer;
+}
+
+declare module 'material-ui/lib/svg-icons/av/pause-circle-outline' {
+  export import AvPauseCircleOutline = __MaterialUI.SvgIcon;
+  export default AvPauseCircleOutline;
+}
+
+declare module 'material-ui/lib/svg-icons/av/airplay' {
+  export import AvAirplay = __MaterialUI.SvgIcon;
+  export default AvAirplay;
+}
+
+declare module 'material-ui/lib/svg-icons/image/camera-rear' {
+  export import ImageCameraRear = __MaterialUI.SvgIcon;
+  export default ImageCameraRear;
+}
+
+declare module 'material-ui/lib/svg-icons/image/add-a-photo' {
+  export import ImageAddAPhoto = __MaterialUI.SvgIcon;
+  export default ImageAddAPhoto;
+}
+
+declare module 'material-ui/lib/svg-icons/image/portrait' {
+  export import ImagePortrait = __MaterialUI.SvgIcon;
+  export default ImagePortrait;
+}
+
+declare module 'material-ui/lib/svg-icons/image/looks' {
+  export import ImageLooks = __MaterialUI.SvgIcon;
+  export default ImageLooks;
+}
+
+declare module 'material-ui/lib/svg-icons/image/exposure-neg-2' {
+  export import ImageExposureNeg2 = __MaterialUI.SvgIcon;
+  export default ImageExposureNeg2;
+}
+
+declare module 'material-ui/lib/svg-icons/image/wb-cloudy' {
+  export import ImageWbCloudy = __MaterialUI.SvgIcon;
+  export default ImageWbCloudy;
+}
+
+declare module 'material-ui/lib/svg-icons/image/switch-video' {
+  export import ImageSwitchVideo = __MaterialUI.SvgIcon;
+  export default ImageSwitchVideo;
+}
+
+declare module 'material-ui/lib/svg-icons/image/wb-auto' {
+  export import ImageWbAuto = __MaterialUI.SvgIcon;
+  export default ImageWbAuto;
+}
+
+declare module 'material-ui/lib/svg-icons/image/filter-center-focus' {
+  export import ImageFilterCenterFocus = __MaterialUI.SvgIcon;
+  export default ImageFilterCenterFocus;
+}
+
+declare module 'material-ui/lib/svg-icons/image/crop-7-5' {
+  export import ImageCrop75 = __MaterialUI.SvgIcon;
+  export default ImageCrop75;
+}
+
+declare module 'material-ui/lib/svg-icons/image/crop-3-2' {
+  export import ImageCrop32 = __MaterialUI.SvgIcon;
+  export default ImageCrop32;
+}
+
+declare module 'material-ui/lib/svg-icons/image/assistant-photo' {
+  export import ImageAssistantPhoto = __MaterialUI.SvgIcon;
+  export default ImageAssistantPhoto;
+}
+
+declare module 'material-ui/lib/svg-icons/image/looks-one' {
+  export import ImageLooksOne = __MaterialUI.SvgIcon;
+  export default ImageLooksOne;
+}
+
+declare module 'material-ui/lib/svg-icons/image/collections-bookmark' {
+  export import ImageCollectionsBookmark = __MaterialUI.SvgIcon;
+  export default ImageCollectionsBookmark;
+}
+
+declare module 'material-ui/lib/svg-icons/image/image-aspect-ratio' {
+  export import ImageImageAspectRatio = __MaterialUI.SvgIcon;
+  export default ImageImageAspectRatio;
+}
+
+declare module 'material-ui/lib/svg-icons/image/brush' {
+  export import ImageBrush = __MaterialUI.SvgIcon;
+  export default ImageBrush;
+}
+
+declare module 'material-ui/lib/svg-icons/image/linked-camera' {
+  export import ImageLinkedCamera = __MaterialUI.SvgIcon;
+  export default ImageLinkedCamera;
+}
+
+declare module 'material-ui/lib/svg-icons/image/filter-1' {
+  export import ImageFilter1 = __MaterialUI.SvgIcon;
+  export default ImageFilter1;
+}
+
+declare module 'material-ui/lib/svg-icons/image/edit' {
+  export import ImageEdit = __MaterialUI.SvgIcon;
+  export default ImageEdit;
+}
+
+declare module 'material-ui/lib/svg-icons/image/timelapse' {
+  export import ImageTimelapse = __MaterialUI.SvgIcon;
+  export default ImageTimelapse;
+}
+
+declare module 'material-ui/lib/svg-icons/image/nature' {
+  export import ImageNature = __MaterialUI.SvgIcon;
+  export default ImageNature;
+}
+
+declare module 'material-ui/lib/svg-icons/image/monochrome-photos' {
+  export import ImageMonochromePhotos = __MaterialUI.SvgIcon;
+  export default ImageMonochromePhotos;
+}
+
+declare module 'material-ui/lib/svg-icons/image/brightness-6' {
+  export import ImageBrightness6 = __MaterialUI.SvgIcon;
+  export default ImageBrightness6;
+}
+
+declare module 'material-ui/lib/svg-icons/image/music-note' {
+  export import ImageMusicNote = __MaterialUI.SvgIcon;
+  export default ImageMusicNote;
+}
+
+declare module 'material-ui/lib/svg-icons/image/collections' {
+  export import ImageCollections = __MaterialUI.SvgIcon;
+  export default ImageCollections;
+}
+
+declare module 'material-ui/lib/svg-icons/image/wb-sunny' {
+  export import ImageWbSunny = __MaterialUI.SvgIcon;
+  export default ImageWbSunny;
+}
+
+declare module 'material-ui/lib/svg-icons/image/hdr-strong' {
+  export import ImageHdrStrong = __MaterialUI.SvgIcon;
+  export default ImageHdrStrong;
+}
+
+declare module 'material-ui/lib/svg-icons/image/panorama-vertical' {
+  export import ImagePanoramaVertical = __MaterialUI.SvgIcon;
+  export default ImagePanoramaVertical;
+}
+
+declare module 'material-ui/lib/svg-icons/image/navigate-next' {
+  export import ImageNavigateNext = __MaterialUI.SvgIcon;
+  export default ImageNavigateNext;
+}
+
+declare module 'material-ui/lib/svg-icons/image/looks-4' {
+  export import ImageLooks4 = __MaterialUI.SvgIcon;
+  export default ImageLooks4;
+}
+
+declare module 'material-ui/lib/svg-icons/image/filter-4' {
+  export import ImageFilter4 = __MaterialUI.SvgIcon;
+  export default ImageFilter4;
+}
+
+declare module 'material-ui/lib/svg-icons/image/brightness-1' {
+  export import ImageBrightness1 = __MaterialUI.SvgIcon;
+  export default ImageBrightness1;
+}
+
+declare module 'material-ui/lib/svg-icons/image/exposure-plus-1' {
+  export import ImageExposurePlus1 = __MaterialUI.SvgIcon;
+  export default ImageExposurePlus1;
+}
+
+declare module 'material-ui/lib/svg-icons/image/timer-3' {
+  export import ImageTimer3 = __MaterialUI.SvgIcon;
+  export default ImageTimer3;
+}
+
+declare module 'material-ui/lib/svg-icons/image/exposure-zero' {
+  export import ImageExposureZero = __MaterialUI.SvgIcon;
+  export default ImageExposureZero;
+}
+
+declare module 'material-ui/lib/svg-icons/image/blur-linear' {
+  export import ImageBlurLinear = __MaterialUI.SvgIcon;
+  export default ImageBlurLinear;
+}
+
+declare module 'material-ui/lib/svg-icons/image/photo-library' {
+  export import ImagePhotoLibrary = __MaterialUI.SvgIcon;
+  export default ImagePhotoLibrary;
+}
+
+declare module 'material-ui/lib/svg-icons/image/filter-drama' {
+  export import ImageFilterDrama = __MaterialUI.SvgIcon;
+  export default ImageFilterDrama;
+}
+
+declare module 'material-ui/lib/svg-icons/image/dehaze' {
+  export import ImageDehaze = __MaterialUI.SvgIcon;
+  export default ImageDehaze;
+}
+
+declare module 'material-ui/lib/svg-icons/image/control-point-duplicate' {
+  export import ImageControlPointDuplicate = __MaterialUI.SvgIcon;
+  export default ImageControlPointDuplicate;
+}
+
+declare module 'material-ui/lib/svg-icons/image/image' {
+  export import ImageImage = __MaterialUI.SvgIcon;
+  export default ImageImage;
+}
+
+declare module 'material-ui/lib/svg-icons/image/flash-auto' {
+  export import ImageFlashAuto = __MaterialUI.SvgIcon;
+  export default ImageFlashAuto;
+}
+
+declare module 'material-ui/lib/svg-icons/image/rotate-90-degrees-ccw' {
+  export import ImageRotate90DegreesCcw = __MaterialUI.SvgIcon;
+  export default ImageRotate90DegreesCcw;
+}
+
+declare module 'material-ui/lib/svg-icons/image/blur-circular' {
+  export import ImageBlurCircular = __MaterialUI.SvgIcon;
+  export default ImageBlurCircular;
+}
+
+declare module 'material-ui/lib/svg-icons/image/filter-3' {
+  export import ImageFilter3 = __MaterialUI.SvgIcon;
+  export default ImageFilter3;
+}
+
+declare module 'material-ui/lib/svg-icons/image/exposure-plus-2' {
+  export import ImageExposurePlus2 = __MaterialUI.SvgIcon;
+  export default ImageExposurePlus2;
+}
+
+declare module 'material-ui/lib/svg-icons/image/flash-on' {
+  export import ImageFlashOn = __MaterialUI.SvgIcon;
+  export default ImageFlashOn;
+}
+
+declare module 'material-ui/lib/svg-icons/image/view-comfy' {
+  export import ImageViewComfy = __MaterialUI.SvgIcon;
+  export default ImageViewComfy;
+}
+
+declare module 'material-ui/lib/svg-icons/image/colorize' {
+  export import ImageColorize = __MaterialUI.SvgIcon;
+  export default ImageColorize;
+}
+
+declare module 'material-ui/lib/svg-icons/image/brightness-4' {
+  export import ImageBrightness4 = __MaterialUI.SvgIcon;
+  export default ImageBrightness4;
+}
+
+declare module 'material-ui/lib/svg-icons/image/crop-free' {
+  export import ImageCropFree = __MaterialUI.SvgIcon;
+  export default ImageCropFree;
+}
+
+declare module 'material-ui/lib/svg-icons/image/vignette' {
+  export import ImageVignette = __MaterialUI.SvgIcon;
+  export default ImageVignette;
+}
+
+declare module 'material-ui/lib/svg-icons/image/tag-faces' {
+  export import ImageTagFaces = __MaterialUI.SvgIcon;
+  export default ImageTagFaces;
+}
+
+declare module 'material-ui/lib/svg-icons/image/brightness-7' {
+  export import ImageBrightness7 = __MaterialUI.SvgIcon;
+  export default ImageBrightness7;
+}
+
+declare module 'material-ui/lib/svg-icons/image/healing' {
+  export import ImageHealing = __MaterialUI.SvgIcon;
+  export default ImageHealing;
+}
+
+declare module 'material-ui/lib/svg-icons/image/nature-people' {
+  export import ImageNaturePeople = __MaterialUI.SvgIcon;
+  export default ImageNaturePeople;
+}
+
+declare module 'material-ui/lib/svg-icons/image/gradient' {
+  export import ImageGradient = __MaterialUI.SvgIcon;
+  export default ImageGradient;
+}
+
+declare module 'material-ui/lib/svg-icons/image/flash-off' {
+  export import ImageFlashOff = __MaterialUI.SvgIcon;
+  export default ImageFlashOff;
+}
+
+declare module 'material-ui/lib/svg-icons/image/movie-creation' {
+  export import ImageMovieCreation = __MaterialUI.SvgIcon;
+  export default ImageMovieCreation;
+}
+
+declare module 'material-ui/lib/svg-icons/image/leak-add' {
+  export import ImageLeakAdd = __MaterialUI.SvgIcon;
+  export default ImageLeakAdd;
+}
+
+declare module 'material-ui/lib/svg-icons/image/filter-5' {
+  export import ImageFilter5 = __MaterialUI.SvgIcon;
+  export default ImageFilter5;
+}
+
+declare module 'material-ui/lib/svg-icons/image/photo' {
+  export import ImagePhoto = __MaterialUI.SvgIcon;
+  export default ImagePhoto;
+}
+
+declare module 'material-ui/lib/svg-icons/image/color-lens' {
+  export import ImageColorLens = __MaterialUI.SvgIcon;
+  export default ImageColorLens;
+}
+
+declare module 'material-ui/lib/svg-icons/image/broken-image' {
+  export import ImageBrokenImage = __MaterialUI.SvgIcon;
+  export default ImageBrokenImage;
+}
+
+declare module 'material-ui/lib/svg-icons/image/looks-6' {
+  export import ImageLooks6 = __MaterialUI.SvgIcon;
+  export default ImageLooks6;
+}
+
+declare module 'material-ui/lib/svg-icons/image/picture-as-pdf' {
+  export import ImagePictureAsPdf = __MaterialUI.SvgIcon;
+  export default ImagePictureAsPdf;
+}
+
+declare module 'material-ui/lib/svg-icons/image/palette' {
+  export import ImagePalette = __MaterialUI.SvgIcon;
+  export default ImagePalette;
+}
+
+declare module 'material-ui/lib/svg-icons/image/crop-landscape' {
+  export import ImageCropLandscape = __MaterialUI.SvgIcon;
+  export default ImageCropLandscape;
+}
+
+declare module 'material-ui/lib/svg-icons/image/grid-on' {
+  export import ImageGridOn = __MaterialUI.SvgIcon;
+  export default ImageGridOn;
+}
+
+declare module 'material-ui/lib/svg-icons/image/slideshow' {
+  export import ImageSlideshow = __MaterialUI.SvgIcon;
+  export default ImageSlideshow;
+}
+
+declare module 'material-ui/lib/svg-icons/image/brightness-3' {
+  export import ImageBrightness3 = __MaterialUI.SvgIcon;
+  export default ImageBrightness3;
+}
+
+declare module 'material-ui/lib/svg-icons/image/style' {
+  export import ImageStyle = __MaterialUI.SvgIcon;
+  export default ImageStyle;
+}
+
+declare module 'material-ui/lib/svg-icons/image/filter-vintage' {
+  export import ImageFilterVintage = __MaterialUI.SvgIcon;
+  export default ImageFilterVintage;
+}
+
+declare module 'material-ui/lib/svg-icons/image/tune' {
+  export import ImageTune = __MaterialUI.SvgIcon;
+  export default ImageTune;
+}
+
+declare module 'material-ui/lib/svg-icons/image/camera' {
+  export import ImageCamera = __MaterialUI.SvgIcon;
+  export default ImageCamera;
+}
+
+declare module 'material-ui/lib/svg-icons/image/timer' {
+  export import ImageTimer = __MaterialUI.SvgIcon;
+  export default ImageTimer;
+}
+
+declare module 'material-ui/lib/svg-icons/image/landscape' {
+  export import ImageLandscape = __MaterialUI.SvgIcon;
+  export default ImageLandscape;
+}
+
+declare module 'material-ui/lib/svg-icons/image/crop-16-9' {
+  export import ImageCrop169 = __MaterialUI.SvgIcon;
+  export default ImageCrop169;
+}
+
+declare module 'material-ui/lib/svg-icons/image/add-to-photos' {
+  export import ImageAddToPhotos = __MaterialUI.SvgIcon;
+  export default ImageAddToPhotos;
+}
+
+declare module 'material-ui/lib/svg-icons/image/wb-incandescent' {
+  export import ImageWbIncandescent = __MaterialUI.SvgIcon;
+  export default ImageWbIncandescent;
+}
+
+declare module 'material-ui/lib/svg-icons/image/hdr-weak' {
+  export import ImageHdrWeak = __MaterialUI.SvgIcon;
+  export default ImageHdrWeak;
+}
+
+declare module 'material-ui/lib/svg-icons/image/details' {
+  export import ImageDetails = __MaterialUI.SvgIcon;
+  export default ImageDetails;
+}
+
+declare module 'material-ui/lib/svg-icons/image/view-compact' {
+  export import ImageViewCompact = __MaterialUI.SvgIcon;
+  export default ImageViewCompact;
+}
+
+declare module 'material-ui/lib/svg-icons/image/brightness-5' {
+  export import ImageBrightness5 = __MaterialUI.SvgIcon;
+  export default ImageBrightness5;
+}
+
+declare module 'material-ui/lib/svg-icons/image/center-focus-weak' {
+  export import ImageCenterFocusWeak = __MaterialUI.SvgIcon;
+  export default ImageCenterFocusWeak;
+}
+
+declare module 'material-ui/lib/svg-icons/image/adjust' {
+  export import ImageAdjust = __MaterialUI.SvgIcon;
+  export default ImageAdjust;
+}
+
+declare module 'material-ui/lib/svg-icons/image/camera-front' {
+  export import ImageCameraFront = __MaterialUI.SvgIcon;
+  export default ImageCameraFront;
+}
+
+declare module 'material-ui/lib/svg-icons/image/transform' {
+  export import ImageTransform = __MaterialUI.SvgIcon;
+  export default ImageTransform;
+}
+
+declare module 'material-ui/lib/svg-icons/image/filter' {
+  export import ImageFilter = __MaterialUI.SvgIcon;
+  export default ImageFilter;
+}
+
+declare module 'material-ui/lib/svg-icons/image/grain' {
+  export import ImageGrain = __MaterialUI.SvgIcon;
+  export default ImageGrain;
+}
+
+declare module 'material-ui/lib/svg-icons/image/filter-9-plus' {
+  export import ImageFilter9Plus = __MaterialUI.SvgIcon;
+  export default ImageFilter9Plus;
+}
+
+declare module 'material-ui/lib/svg-icons/image/looks-5' {
+  export import ImageLooks5 = __MaterialUI.SvgIcon;
+  export default ImageLooks5;
+}
+
+declare module 'material-ui/lib/svg-icons/image/hdr-on' {
+  export import ImageHdrOn = __MaterialUI.SvgIcon;
+  export default ImageHdrOn;
+}
+
+declare module 'material-ui/lib/svg-icons/image/audiotrack' {
+  export import ImageAudiotrack = __MaterialUI.SvgIcon;
+  export default ImageAudiotrack;
+}
+
+declare module 'material-ui/lib/svg-icons/image/compare' {
+  export import ImageCompare = __MaterialUI.SvgIcon;
+  export default ImageCompare;
+}
+
+declare module 'material-ui/lib/svg-icons/image/crop' {
+  export import ImageCrop = __MaterialUI.SvgIcon;
+  export default ImageCrop;
+}
+
+declare module 'material-ui/lib/svg-icons/image/texture' {
+  export import ImageTexture = __MaterialUI.SvgIcon;
+  export default ImageTexture;
+}
+
+declare module 'material-ui/lib/svg-icons/image/movie-filter' {
+  export import ImageMovieFilter = __MaterialUI.SvgIcon;
+  export default ImageMovieFilter;
+}
+
+declare module 'material-ui/lib/svg-icons/image/exposure' {
+  export import ImageExposure = __MaterialUI.SvgIcon;
+  export default ImageExposure;
+}
+
+declare module 'material-ui/lib/svg-icons/image/filter-b-and-w' {
+  export import ImageFilterBAndW = __MaterialUI.SvgIcon;
+  export default ImageFilterBAndW;
+}
+
+declare module 'material-ui/lib/svg-icons/image/photo-size-select-actual' {
+  export import ImagePhotoSizeSelectActual = __MaterialUI.SvgIcon;
+  export default ImagePhotoSizeSelectActual;
+}
+
+declare module 'material-ui/lib/svg-icons/image/crop-5-4' {
+  export import ImageCrop54 = __MaterialUI.SvgIcon;
+  export default ImageCrop54;
+}
+
+declare module 'material-ui/lib/svg-icons/image/brightness-2' {
+  export import ImageBrightness2 = __MaterialUI.SvgIcon;
+  export default ImageBrightness2;
+}
+
+declare module 'material-ui/lib/svg-icons/image/tonality' {
+  export import ImageTonality = __MaterialUI.SvgIcon;
+  export default ImageTonality;
+}
+
+declare module 'material-ui/lib/svg-icons/image/panorama-wide-angle' {
+  export import ImagePanoramaWideAngle = __MaterialUI.SvgIcon;
+  export default ImagePanoramaWideAngle;
+}
+
+declare module 'material-ui/lib/svg-icons/image/flip' {
+  export import ImageFlip = __MaterialUI.SvgIcon;
+  export default ImageFlip;
+}
+
+declare module 'material-ui/lib/svg-icons/image/filter-9' {
+  export import ImageFilter9 = __MaterialUI.SvgIcon;
+  export default ImageFilter9;
+}
+
+declare module 'material-ui/lib/svg-icons/image/blur-on' {
+  export import ImageBlurOn = __MaterialUI.SvgIcon;
+  export default ImageBlurOn;
+}
+
+declare module 'material-ui/lib/svg-icons/image/assistant' {
+  export import ImageAssistant = __MaterialUI.SvgIcon;
+  export default ImageAssistant;
+}
+
+declare module 'material-ui/lib/svg-icons/image/lens' {
+  export import ImageLens = __MaterialUI.SvgIcon;
+  export default ImageLens;
+}
+
+declare module 'material-ui/lib/svg-icons/image/switch-camera' {
+  export import ImageSwitchCamera = __MaterialUI.SvgIcon;
+  export default ImageSwitchCamera;
+}
+
+declare module 'material-ui/lib/svg-icons/image/photo-filter' {
+  export import ImagePhotoFilter = __MaterialUI.SvgIcon;
+  export default ImagePhotoFilter;
+}
+
+declare module 'material-ui/lib/svg-icons/image/wb-iridescent' {
+  export import ImageWbIridescent = __MaterialUI.SvgIcon;
+  export default ImageWbIridescent;
+}
+
+declare module 'material-ui/lib/svg-icons/image/crop-square' {
+  export import ImageCropSquare = __MaterialUI.SvgIcon;
+  export default ImageCropSquare;
+}
+
+declare module 'material-ui/lib/svg-icons/image/timer-10' {
+  export import ImageTimer10 = __MaterialUI.SvgIcon;
+  export default ImageTimer10;
+}
+
+declare module 'material-ui/lib/svg-icons/image/rotate-right' {
+  export import ImageRotateRight = __MaterialUI.SvgIcon;
+  export default ImageRotateRight;
+}
+
+declare module 'material-ui/lib/svg-icons/image/grid-off' {
+  export import ImageGridOff = __MaterialUI.SvgIcon;
+  export default ImageGridOff;
+}
+
+declare module 'material-ui/lib/svg-icons/image/filter-7' {
+  export import ImageFilter7 = __MaterialUI.SvgIcon;
+  export default ImageFilter7;
+}
+
+declare module 'material-ui/lib/svg-icons/image/loupe' {
+  export import ImageLoupe = __MaterialUI.SvgIcon;
+  export default ImageLoupe;
+}
+
+declare module 'material-ui/lib/svg-icons/image/filter-6' {
+  export import ImageFilter6 = __MaterialUI.SvgIcon;
+  export default ImageFilter6;
+}
+
+declare module 'material-ui/lib/svg-icons/image/filter-tilt-shift' {
+  export import ImageFilterTiltShift = __MaterialUI.SvgIcon;
+  export default ImageFilterTiltShift;
+}
+
+declare module 'material-ui/lib/svg-icons/image/crop-din' {
+  export import ImageCropDin = __MaterialUI.SvgIcon;
+  export default ImageCropDin;
+}
+
+declare module 'material-ui/lib/svg-icons/image/center-focus-strong' {
+  export import ImageCenterFocusStrong = __MaterialUI.SvgIcon;
+  export default ImageCenterFocusStrong;
+}
+
+declare module 'material-ui/lib/svg-icons/image/rotate-left' {
+  export import ImageRotateLeft = __MaterialUI.SvgIcon;
+  export default ImageRotateLeft;
+}
+
+declare module 'material-ui/lib/svg-icons/image/filter-hdr' {
+  export import ImageFilterHdr = __MaterialUI.SvgIcon;
+  export default ImageFilterHdr;
+}
+
+declare module 'material-ui/lib/svg-icons/image/timer-off' {
+  export import ImageTimerOff = __MaterialUI.SvgIcon;
+  export default ImageTimerOff;
+}
+
+declare module 'material-ui/lib/svg-icons/image/straighten' {
+  export import ImageStraighten = __MaterialUI.SvgIcon;
+  export default ImageStraighten;
+}
+
+declare module 'material-ui/lib/svg-icons/image/exposure-neg-1' {
+  export import ImageExposureNeg1 = __MaterialUI.SvgIcon;
+  export default ImageExposureNeg1;
+}
+
+declare module 'material-ui/lib/svg-icons/image/navigate-before' {
+  export import ImageNavigateBefore = __MaterialUI.SvgIcon;
+  export default ImageNavigateBefore;
+}
+
+declare module 'material-ui/lib/svg-icons/image/iso' {
+  export import ImageIso = __MaterialUI.SvgIcon;
+  export default ImageIso;
+}
+
+declare module 'material-ui/lib/svg-icons/image/photo-album' {
+  export import ImagePhotoAlbum = __MaterialUI.SvgIcon;
+  export default ImagePhotoAlbum;
+}
+
+declare module 'material-ui/lib/svg-icons/image/crop-rotate' {
+  export import ImageCropRotate = __MaterialUI.SvgIcon;
+  export default ImageCropRotate;
+}
+
+declare module 'material-ui/lib/svg-icons/image/remove-red-eye' {
+  export import ImageRemoveRedEye = __MaterialUI.SvgIcon;
+  export default ImageRemoveRedEye;
+}
+
+declare module 'material-ui/lib/svg-icons/image/crop-portrait' {
+  export import ImageCropPortrait = __MaterialUI.SvgIcon;
+  export default ImageCropPortrait;
+}
+
+declare module 'material-ui/lib/svg-icons/image/camera-alt' {
+  export import ImageCameraAlt = __MaterialUI.SvgIcon;
+  export default ImageCameraAlt;
+}
+
+declare module 'material-ui/lib/svg-icons/image/control-point' {
+  export import ImageControlPoint = __MaterialUI.SvgIcon;
+  export default ImageControlPoint;
+}
+
+declare module 'material-ui/lib/svg-icons/image/panorama' {
+  export import ImagePanorama = __MaterialUI.SvgIcon;
+  export default ImagePanorama;
+}
+
+declare module 'material-ui/lib/svg-icons/image/panorama-fish-eye' {
+  export import ImagePanoramaFishEye = __MaterialUI.SvgIcon;
+  export default ImagePanoramaFishEye;
+}
+
+declare module 'material-ui/lib/svg-icons/image/filter-8' {
+  export import ImageFilter8 = __MaterialUI.SvgIcon;
+  export default ImageFilter8;
+}
+
+declare module 'material-ui/lib/svg-icons/image/looks-two' {
+  export import ImageLooksTwo = __MaterialUI.SvgIcon;
+  export default ImageLooksTwo;
+}
+
+declare module 'material-ui/lib/svg-icons/image/panorama-horizontal' {
+  export import ImagePanoramaHorizontal = __MaterialUI.SvgIcon;
+  export default ImagePanoramaHorizontal;
+}
+
+declare module 'material-ui/lib/svg-icons/image/looks-3' {
+  export import ImageLooks3 = __MaterialUI.SvgIcon;
+  export default ImageLooks3;
+}
+
+declare module 'material-ui/lib/svg-icons/image/filter-none' {
+  export import ImageFilterNone = __MaterialUI.SvgIcon;
+  export default ImageFilterNone;
+}
+
+declare module 'material-ui/lib/svg-icons/image/photo-size-select-large' {
+  export import ImagePhotoSizeSelectLarge = __MaterialUI.SvgIcon;
+  export default ImagePhotoSizeSelectLarge;
+}
+
+declare module 'material-ui/lib/svg-icons/image/blur-off' {
+  export import ImageBlurOff = __MaterialUI.SvgIcon;
+  export default ImageBlurOff;
+}
+
+declare module 'material-ui/lib/svg-icons/image/camera-roll' {
+  export import ImageCameraRoll = __MaterialUI.SvgIcon;
+  export default ImageCameraRoll;
+}
+
+declare module 'material-ui/lib/svg-icons/image/leak-remove' {
+  export import ImageLeakRemove = __MaterialUI.SvgIcon;
+  export default ImageLeakRemove;
+}
+
+declare module 'material-ui/lib/svg-icons/image/filter-frames' {
+  export import ImageFilterFrames = __MaterialUI.SvgIcon;
+  export default ImageFilterFrames;
+}
+
+declare module 'material-ui/lib/svg-icons/image/flare' {
+  export import ImageFlare = __MaterialUI.SvgIcon;
+  export default ImageFlare;
+}
+
+declare module 'material-ui/lib/svg-icons/image/photo-size-select-small' {
+  export import ImagePhotoSizeSelectSmall = __MaterialUI.SvgIcon;
+  export default ImagePhotoSizeSelectSmall;
+}
+
+declare module 'material-ui/lib/svg-icons/image/photo-camera' {
+  export import ImagePhotoCamera = __MaterialUI.SvgIcon;
+  export default ImagePhotoCamera;
+}
+
+declare module 'material-ui/lib/svg-icons/image/hdr-off' {
+  export import ImageHdrOff = __MaterialUI.SvgIcon;
+  export default ImageHdrOff;
+}
+
+declare module 'material-ui/lib/svg-icons/image/filter-2' {
+  export import ImageFilter2 = __MaterialUI.SvgIcon;
+  export default ImageFilter2;
+}
+
+declare module 'material-ui/lib/svg-icons/image/crop-original' {
+  export import ImageCropOriginal = __MaterialUI.SvgIcon;
+  export default ImageCropOriginal;
+}
+
+declare module 'material-ui/lib/svg-icons/places/kitchen' {
+  export import PlacesKitchen = __MaterialUI.SvgIcon;
+  export default PlacesKitchen;
+}
+
+declare module 'material-ui/lib/svg-icons/places/spa' {
+  export import PlacesSpa = __MaterialUI.SvgIcon;
+  export default PlacesSpa;
+}
+
+declare module 'material-ui/lib/svg-icons/places/all-inclusive' {
+  export import PlacesAllInclusive = __MaterialUI.SvgIcon;
+  export default PlacesAllInclusive;
+}
+
+declare module 'material-ui/lib/svg-icons/places/ac-unit' {
+  export import PlacesAcUnit = __MaterialUI.SvgIcon;
+  export default PlacesAcUnit;
+}
+
+declare module 'material-ui/lib/svg-icons/places/child-care' {
+  export import PlacesChildCare = __MaterialUI.SvgIcon;
+  export default PlacesChildCare;
+}
+
+declare module 'material-ui/lib/svg-icons/places/golf-course' {
+  export import PlacesGolfCourse = __MaterialUI.SvgIcon;
+  export default PlacesGolfCourse;
+}
+
+declare module 'material-ui/lib/svg-icons/places/business-center' {
+  export import PlacesBusinessCenter = __MaterialUI.SvgIcon;
+  export default PlacesBusinessCenter;
+}
+
+declare module 'material-ui/lib/svg-icons/places/free-breakfast' {
+  export import PlacesFreeBreakfast = __MaterialUI.SvgIcon;
+  export default PlacesFreeBreakfast;
+}
+
+declare module 'material-ui/lib/svg-icons/places/fitness-center' {
+  export import PlacesFitnessCenter = __MaterialUI.SvgIcon;
+  export default PlacesFitnessCenter;
+}
+
+declare module 'material-ui/lib/svg-icons/places/pool' {
+  export import PlacesPool = __MaterialUI.SvgIcon;
+  export default PlacesPool;
+}
+
+declare module 'material-ui/lib/svg-icons/places/child-friendly' {
+  export import PlacesChildFriendly = __MaterialUI.SvgIcon;
+  export default PlacesChildFriendly;
+}
+
+declare module 'material-ui/lib/svg-icons/places/casino' {
+  export import PlacesCasino = __MaterialUI.SvgIcon;
+  export default PlacesCasino;
+}
+
+declare module 'material-ui/lib/svg-icons/places/hot-tub' {
+  export import PlacesHotTub = __MaterialUI.SvgIcon;
+  export default PlacesHotTub;
+}
+
+declare module 'material-ui/lib/svg-icons/places/smoke-free' {
+  export import PlacesSmokeFree = __MaterialUI.SvgIcon;
+  export default PlacesSmokeFree;
+}
+
+declare module 'material-ui/lib/svg-icons/places/room-service' {
+  export import PlacesRoomService = __MaterialUI.SvgIcon;
+  export default PlacesRoomService;
+}
+
+declare module 'material-ui/lib/svg-icons/places/smoking-rooms' {
+  export import PlacesSmokingRooms = __MaterialUI.SvgIcon;
+  export default PlacesSmokingRooms;
+}
+
+declare module 'material-ui/lib/svg-icons/places/beach-access' {
+  export import PlacesBeachAccess = __MaterialUI.SvgIcon;
+  export default PlacesBeachAccess;
+}
+
+declare module 'material-ui/lib/svg-icons/places/airport-shuttle' {
+  export import PlacesAirportShuttle = __MaterialUI.SvgIcon;
+  export default PlacesAirportShuttle;
+}
+
+declare module 'material-ui/lib/styles' {
+    export import AutoPrefix = __MaterialUI.Styles.AutoPrefix; // require('material-ui/lib/styles/auto-prefix');
+    export import Colors = __MaterialUI.Styles.Colors; // require('material-ui/lib/styles/colors');
+    export import Spacing = require('material-ui/lib/styles/spacing');
+    export import ThemeManager = __MaterialUI.Styles.ThemeManager; // require('material-ui/lib/styles/theme-manager');
+    export import Transitions = __MaterialUI.Styles.Transitions; // require('material-ui/lib/styles/transitions');
+    export import Typography = __MaterialUI.Styles.Typography; // require('material-ui/lib/styles/typography');
+    export import LightRawTheme = __MaterialUI.Styles.LightRawTheme; // require('material-ui/lib/styles/raw-themes/light-raw-theme'),
+    export import lightBaseTheme = __MaterialUI.Styles.lightBaseTheme;
+    export import DarkRawTheme = __MaterialUI.Styles.DarkRawTheme; // require('material-ui/lib/styles/raw-themes/dark-raw-theme'),
+    export import darkBaseTheme = __MaterialUI.Styles.darkBaseTheme;
+    export import ThemeDecorator = __MaterialUI.Styles.ThemeDecorator; //require('material-ui/lib/styles/theme-decorator');
+    export import ZIndex = __MaterialUI.Styles.zIndex; //require('material-ui/lib/styles/zIndex');
+    export import getMuiTheme = __MaterialUI.Styles.getMuiTheme;
+
+    export default {
+        AutoPrefix,
+        Colors,
+        Spacing,
+        ThemeManager,
+        Transitions,
+        Typography,
+        lightBaseTheme,
+        LightRawTheme,
+        darkBaseTheme,
+        DarkRawTheme,
+        ThemeDecorator,
+        getMuiTheme,
+        ZIndex,
+    };
+}
+
+declare module 'material-ui/lib/styles/auto-prefix' {
+    export import AutoPrefix = __MaterialUI.Styles.AutoPrefix;
+    export default AutoPrefix;
+}
+
+declare module 'material-ui/lib/styles/spacing' {
+    type Spacing = __MaterialUI.Styles.Spacing;
+    var Spacing: Spacing;
+    export default Spacing;
+}
+
+declare module 'material-ui/lib/styles/theme-manager' {
+    export import ThemeManager = __MaterialUI.Styles.ThemeManager;
+    export default ThemeManager;
+}
+
+declare module 'material-ui/lib/styles/transitions' {
+    export import Transitions = __MaterialUI.Styles.Transitions;
+    export default Transitions;
+}
+
+declare module 'material-ui/lib/styles/typography' {
+    export import Typography = __MaterialUI.Styles.Typography;
+    export default Typography;
+}
+
+declare module 'material-ui/lib/styles/raw-themes/light-raw-theme' {
+    export import LightRawTheme = __MaterialUI.Styles.LightRawTheme;
+    export default LightRawTheme;
+}
+
+declare module 'material-ui/lib/styles/raw-themes/dark-raw-theme' {
+    export import DarkRawTheme = __MaterialUI.Styles.DarkRawTheme;
+    export default DarkRawTheme;
+}
+
+declare module 'material-ui/lib/styles/theme-decorator' {
+    export import ThemeDecorator = __MaterialUI.Styles.ThemeDecorator;
+    export default ThemeDecorator;
+}
+
+
+declare module 'material-ui/lib/snackbar' {
+    export import Snackbar = __MaterialUI.Snackbar;
+    export default Snackbar;
+}
+
+declare module 'material-ui/lib/tabs/tab' {
+    export import Tab = __MaterialUI.Tabs.Tab;
+    export default Tab;
+}
+
+declare module 'material-ui/lib/tabs/tabs' {
+    export import Tabs = __MaterialUI.Tabs.Tabs;
+    export default Tabs;
+}
+
+declare module 'material-ui/lib/table/table' {
+    export import Table = __MaterialUI.Table.Table;
+    export default Table;
+}
+
+declare module 'material-ui/lib/table/table-body' {
+    export import TableBody = __MaterialUI.Table.TableBody;
+    export default TableBody;
+}
+
+declare module 'material-ui/lib/table/table-footer' {
+    export import TableFooter = __MaterialUI.Table.TableFooter;
+    export default TableFooter;
+}
+
+declare module 'material-ui/lib/table/table-header' {
+    export import TableHeader = __MaterialUI.Table.TableHeader;
+    export default TableHeader;
+}
+
+declare module 'material-ui/lib/table/table-header-column' {
+    export import TableHeaderColumn = __MaterialUI.Table.TableHeaderColumn;
+    export default TableHeaderColumn;
+}
+
+declare module 'material-ui/lib/table/table-row' {
+    export import TableRow = __MaterialUI.Table.TableRow;
+    export default TableRow;
+}
+
+declare module 'material-ui/lib/table/table-row-column' {
+    export import TableRowColumn = __MaterialUI.Table.TableRowColumn;
+    export default TableRowColumn;
+}
+
+declare module 'material-ui/lib/theme-wrapper' {
+    export import ThemeWrapper = __MaterialUI.ThemeWrapper;
+    export default ThemeWrapper;
+}
+
+declare module 'material-ui/lib/toggle' {
+    export import Toggle = __MaterialUI.Toggle;
+    export default Toggle;
+}
+
+declare module 'material-ui/lib/time-picker' {
+    export import TimePicker = __MaterialUI.TimePicker;
+    export default TimePicker;
+}
+
+declare module 'material-ui/lib/text-field' {
+    export import TextField = __MaterialUI.TextField;
+    export default TextField;
+}
+
+declare module 'material-ui/lib/toolbar/toolbar' {
+    export import Toolbar = __MaterialUI.Toolbar.Toolbar;
+    export default Toolbar;
+}
+
+declare module 'material-ui/lib/toolbar/toolbar-group' {
+    export import ToolbarGroup = __MaterialUI.Toolbar.ToolbarGroup;
+    export default ToolbarGroup;
+}
+
+declare module 'material-ui/lib/toolbar/toolbar-separator' {
+    export import ToolbarSeparator = __MaterialUI.Toolbar.ToolbarSeparator;
+    export default ToolbarSeparator;
+}
+
+declare module 'material-ui/lib/toolbar/toolbar-title' {
+    export import ToolbarTitle = __MaterialUI.Toolbar.ToolbarTitle;
+    export default ToolbarTitle;
+}
+
+declare module 'material-ui/lib/tooltip' {
+    export import Tooltip = __MaterialUI.Tooltip;
+    export default Tooltip;
+}
+
+declare module 'material-ui/lib/utils' {
+    export import ColorManipulator = __MaterialUI.Utils.ColorManipulator; // require('material-ui/lib/utils/color-manipulator');
+    export import CssEvent = __MaterialUI.Utils.CssEvent; // require('material-ui/lib/utils/css-event');
+    export import Dom = __MaterialUI.Utils.Dom; // require('material-ui/lib/utils/dom');
+    export import Events = __MaterialUI.Utils.Events; // require('material-ui/lib/utils/events');
+    export import Extend = __MaterialUI.Utils.Extend; // require('material-ui/lib/utils/extend');
+    export import ImmutabilityHelper = __MaterialUI.Utils.ImmutabilityHelper; // require('material-ui/lib/utils/immutability-helper');
+    export import KeyCode = __MaterialUI.Utils.KeyCode; // require('material-ui/lib/utils/key-code');
+    export import KeyLine = __MaterialUI.Utils.KeyLine; // require('material-ui/lib/utils/key-line');
+    export import UniqueId = __MaterialUI.Utils.UniqueId; // require('material-ui/lib/utils/unique-id');
+    export import Styles = __MaterialUI.Utils.Styles; // require('material-ui/lib/utils/styles');
+}
+
+declare module 'material-ui/lib/utils/color-manipulator' {
+    export import ColorManipulator = __MaterialUI.Utils.ColorManipulator;
+    export default ColorManipulator;
+}
+
+declare module 'material-ui/lib/utils/css-event' {
+    export import CssEvent = __MaterialUI.Utils.CssEvent;
+    export default CssEvent;
+}
+
+declare module 'material-ui/lib/utils/dom' {
+    export import Dom = __MaterialUI.Utils.Dom;
+    export default Dom;
+}
+
+declare module 'material-ui/lib/utils/events' {
+    export import Events = __MaterialUI.Utils.Events;
+    export default Events;
+}
+
+declare module 'material-ui/lib/utils/extend' {
+    export import Extend = __MaterialUI.Utils.Extend;
+    export default Extend;
+}
+
+declare module 'material-ui/lib/utils/immutability-helper' {
+    export import ImmutabilityHelper = __MaterialUI.Utils.ImmutabilityHelper;
+    export default ImmutabilityHelper;
+}
+
+declare module 'material-ui/lib/utils/key-code' {
+    export import KeyCode = __MaterialUI.Utils.KeyCode;
+    export default KeyCode;
+}
+
+declare module 'material-ui/lib/utils/key-line' {
+    export import KeyLine = __MaterialUI.Utils.KeyLine;
+    export default KeyLine;
+}
+
+declare module 'material-ui/lib/utils/unique-id' {
+    export import UniqueId = __MaterialUI.Utils.UniqueId;
+    export default UniqueId;
+}
+
+declare module 'material-ui/lib/utils/styles' {
+    export import Styles = __MaterialUI.Utils.Styles;
+    export default Styles;
+}
+
+declare module "material-ui/lib/menus/icon-menu" {
+    export import IconMenu = __MaterialUI.Menus.IconMenu;
+    export default IconMenu;
+}
+
+declare module "material-ui/lib/menus/menu" {
+    export import Menu = __MaterialUI.Menus.Menu;
+    export default Menu;
+}
+
+declare module "material-ui/lib/menus/menu-item" {
+    export import MenuItem = __MaterialUI.Menus.MenuItem;
+    export default MenuItem;
+}
+
+declare module "material-ui/lib/divider" {
+    export import Divider = __MaterialUI.Divider;
+    export default Divider;
+}
+
+declare module "material-ui/lib/grid-list/grid-list" {
+    export import GridList = __MaterialUI.GridList.GridList;
+    export default GridList;
+}
+
+declare module "material-ui/lib/grid-list/grid-tile" {
+    export import GridTile = __MaterialUI.GridList.GridTile;
+    export default GridTile;
+}
+
+declare module "material-ui/lib/styles/colors" {
+    export import Colors = __MaterialUI.Styles.Colors;
+    export default Colors;
+}
+
+declare module "material-ui/lib/styles/zIndex" {
+    export import zIndex = __MaterialUI.Styles.zIndex;
+    export default zIndex;
+}
+
+declare namespace __MaterialUI.Styles {
+    interface Colors {
+        red50: string;
+        red100: string;
+        red200: string;
+        red300: string;
+        red400: string;
+        red500: string;
+        red600: string;
+        red700: string;
+        red800: string;
+        red900: string;
+        redA100: string;
+        redA200: string;
+        redA400: string;
+        redA700: string;
+
+        pink50: string;
+        pink100: string;
+        pink200: string;
+        pink300: string;
+        pink400: string;
+        pink500: string;
+        pink600: string;
+        pink700: string;
+        pink800: string;
+        pink900: string;
+        pinkA100: string;
+        pinkA200: string;
+        pinkA400: string;
+        pinkA700: string;
+
+        purple50: string;
+        purple100: string;
+        purple200: string;
+        purple300: string;
+        purple400: string;
+        purple500: string;
+        purple600: string;
+        purple700: string;
+        purple800: string;
+        purple900: string;
+        purpleA100: string;
+        purpleA200: string;
+        purpleA400: string;
+        purpleA700: string;
+
+        deepPurple50: string;
+        deepPurple100: string;
+        deepPurple200: string;
+        deepPurple300: string;
+        deepPurple400: string;
+        deepPurple500: string;
+        deepPurple600: string;
+        deepPurple700: string;
+        deepPurple800: string;
+        deepPurple900: string;
+        deepPurpleA100: string;
+        deepPurpleA200: string;
+        deepPurpleA400: string;
+        deepPurpleA700: string;
+
+        indigo50: string;
+        indigo100: string;
+        indigo200: string;
+        indigo300: string;
+        indigo400: string;
+        indigo500: string;
+        indigo600: string;
+        indigo700: string;
+        indigo800: string;
+        indigo900: string;
+        indigoA100: string;
+        indigoA200: string;
+        indigoA400: string;
+        indigoA700: string;
+
+        blue50: string;
+        blue100: string;
+        blue200: string;
+        blue300: string;
+        blue400: string;
+        blue500: string;
+        blue600: string;
+        blue700: string;
+        blue800: string;
+        blue900: string;
+        blueA100: string;
+        blueA200: string;
+        blueA400: string;
+        blueA700: string;
+
+        lightBlue50: string;
+        lightBlue100: string;
+        lightBlue200: string;
+        lightBlue300: string;
+        lightBlue400: string;
+        lightBlue500: string;
+        lightBlue600: string;
+        lightBlue700: string;
+        lightBlue800: string;
+        lightBlue900: string;
+        lightBlueA100: string;
+        lightBlueA200: string;
+        lightBlueA400: string;
+        lightBlueA700: string;
+
+        cyan50: string;
+        cyan100: string;
+        cyan200: string;
+        cyan300: string;
+        cyan400: string;
+        cyan500: string;
+        cyan600: string;
+        cyan700: string;
+        cyan800: string;
+        cyan900: string;
+        cyanA100: string;
+        cyanA200: string;
+        cyanA400: string;
+        cyanA700: string;
+
+        teal50: string;
+        teal100: string;
+        teal200: string;
+        teal300: string;
+        teal400: string;
+        teal500: string;
+        teal600: string;
+        teal700: string;
+        teal800: string;
+        teal900: string;
+        tealA100: string;
+        tealA200: string;
+        tealA400: string;
+        tealA700: string;
+
+        green50: string;
+        green100: string;
+        green200: string;
+        green300: string;
+        green400: string;
+        green500: string;
+        green600: string;
+        green700: string;
+        green800: string;
+        green900: string;
+        greenA100: string;
+        greenA200: string;
+        greenA400: string;
+        greenA700: string;
+
+        lightGreen50: string;
+        lightGreen100: string;
+        lightGreen200: string;
+        lightGreen300: string;
+        lightGreen400: string;
+        lightGreen500: string;
+        lightGreen600: string;
+        lightGreen700: string;
+        lightGreen800: string;
+        lightGreen900: string;
+        lightGreenA100: string;
+        lightGreenA200: string;
+        lightGreenA400: string;
+        lightGreenA700: string;
+
+        lime50: string;
+        lime100: string;
+        lime200: string;
+        lime300: string;
+        lime400: string;
+        lime500: string;
+        lime600: string;
+        lime700: string;
+        lime800: string;
+        lime900: string;
+        limeA100: string;
+        limeA200: string;
+        limeA400: string;
+        limeA700: string;
+
+        yellow50: string;
+        yellow100: string;
+        yellow200: string;
+        yellow300: string;
+        yellow400: string;
+        yellow500: string;
+        yellow600: string;
+        yellow700: string;
+        yellow800: string;
+        yellow900: string;
+        yellowA100: string;
+        yellowA200: string;
+        yellowA400: string;
+        yellowA700: string;
+
+        amber50: string;
+        amber100: string;
+        amber200: string;
+        amber300: string;
+        amber400: string;
+        amber500: string;
+        amber600: string;
+        amber700: string;
+        amber800: string;
+        amber900: string;
+        amberA100: string;
+        amberA200: string;
+        amberA400: string;
+        amberA700: string;
+
+        orange50: string;
+        orange100: string;
+        orange200: string;
+        orange300: string;
+        orange400: string;
+        orange500: string;
+        orange600: string;
+        orange700: string;
+        orange800: string;
+        orange900: string;
+        orangeA100: string;
+        orangeA200: string;
+        orangeA400: string;
+        orangeA700: string;
+
+        deepOrange50: string;
+        deepOrange100: string;
+        deepOrange200: string;
+        deepOrange300: string;
+        deepOrange400: string;
+        deepOrange500: string;
+        deepOrange600: string;
+        deepOrange700: string;
+        deepOrange800: string;
+        deepOrange900: string;
+        deepOrangeA100: string;
+        deepOrangeA200: string;
+        deepOrangeA400: string;
+        deepOrangeA700: string;
+
+        brown50: string;
+        brown100: string;
+        brown200: string;
+        brown300: string;
+        brown400: string;
+        brown500: string;
+        brown600: string;
+        brown700: string;
+        brown800: string;
+        brown900: string;
+
+        blueGrey50: string;
+        blueGrey100: string;
+        blueGrey200: string;
+        blueGrey300: string;
+        blueGrey400: string;
+        blueGrey500: string;
+        blueGrey600: string;
+        blueGrey700: string;
+        blueGrey800: string;
+        blueGrey900: string;
+
+        grey50: string;
+        grey100: string;
+        grey200: string;
+        grey300: string;
+        grey400: string;
+        grey500: string;
+        grey600: string;
+        grey700: string;
+        grey800: string;
+        grey900: string;
+
+        black: string;
+        white: string;
+
+        transparent: string;
+        fullBlack: string;
+        darkBlack: string;
+        lightBlack: string;
+        minBlack: string;
+        faintBlack: string;
+        fullWhite: string;
+        darkWhite: string;
+        lightWhite: string;
+    }
+    export var Colors: Colors;
+}
+
+declare module "material-ui/lib/svg-icons" {
+    export import ActionAccessibility = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/accessibility');
+    export import ActionAccessible = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/accessible');
+    export import ActionAccountBalance = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/account-balance');
+    export import ActionAccountBalanceWallet = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/account-balance-wallet');
+    export import ActionAccountBox = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/account-box');
+    export import ActionAccountCircle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/account-circle');
+    export import ActionAddShoppingCart = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/add-shopping-cart');
+    export import ActionAlarm = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/alarm');
+    export import ActionAlarmAdd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/alarm-add');
+    export import ActionAlarmOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/alarm-off');
+    export import ActionAlarmOn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/alarm-on');
+    export import ActionAllOut = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/all-out');
+    export import ActionAndroid = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/android');
+    export import ActionAnnouncement = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/announcement');
+    export import ActionAspectRatio = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/aspect-ratio');
+    export import ActionAssessment = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/assessment');
+    export import ActionAssignment = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/assignment');
+    export import ActionAssignmentInd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/assignment-ind');
+    export import ActionAssignmentLate = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/assignment-late');
+    export import ActionAssignmentReturn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/assignment-return');
+    export import ActionAssignmentReturned = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/assignment-returned');
+    export import ActionAssignmentTurnedIn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/assignment-turned-in');
+    export import ActionAutorenew = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/autorenew');
+    export import ActionBackup = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/backup');
+    export import ActionBook = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/book');
+    export import ActionBookmark = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/bookmark');
+    export import ActionBookmarkBorder = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/bookmark-border');
+    export import ActionBugReport = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/bug-report');
+    export import ActionBuild = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/build');
+    export import ActionCached = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/cached');
+    export import ActionCameraEnhance = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/camera-enhance');
+    export import ActionCardGiftcard = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/card-giftcard');
+    export import ActionCardMembership = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/card-membership');
+    export import ActionCardTravel = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/card-travel');
+    export import ActionChangeHistory = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/change-history');
+    export import ActionCheckCircle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/check-circle');
+    export import ActionChromeReaderMode = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/chrome-reader-mode');
+    export import ActionClass = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/class');
+    export import ActionCode = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/code');
+    export import ActionCompareArrows = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/compare-arrows');
+    export import ActionCopyright = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/copyright');
+    export import ActionCreditCard = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/credit-card');
+    export import ActionDashboard = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/dashboard');
+    export import ActionDateRange = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/date-range');
+    export import ActionDelete = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/delete');
+    export import ActionDescription = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/description');
+    export import ActionDns = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/dns');
+    export import ActionDone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/done');
+    export import ActionDoneAll = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/done-all');
+    export import ActionDonutLarge = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/donut-large');
+    export import ActionDonutSmall = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/donut-small');
+    export import ActionEject = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/eject');
+    export import ActionEvent = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/event');
+    export import ActionEventSeat = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/event-seat');
+    export import ActionExitToApp = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/exit-to-app');
+    export import ActionExplore = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/explore');
+    export import ActionExtension = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/extension');
+    export import ActionFace = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/face');
+    export import ActionFavorite = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/favorite');
+    export import ActionFavoriteBorder = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/favorite-border');
+    export import ActionFeedback = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/feedback');
+    export import ActionFindInPage = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/find-in-page');
+    export import ActionFindReplace = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/find-replace');
+    export import ActionFingerprint = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/fingerprint');
+    export import ActionFlightLand = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/flight-land');
+    export import ActionFlightTakeoff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/flight-takeoff');
+    export import ActionFlipToBack = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/flip-to-back');
+    export import ActionFlipToFront = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/flip-to-front');
+    export import ActionGavel = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/gavel');
+    export import ActionGetApp = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/get-app');
+    export import ActionGif = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/gif');
+    export import ActionGrade = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/grade');
+    export import ActionGroupWork = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/group-work');
+    export import ActionHelp = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/help');
+    export import ActionHelpOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/help-outline');
+    export import ActionHighlightOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/highlight-off');
+    export import ActionHistory = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/history');
+    export import ActionHome = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/home');
+    export import ActionHourglassEmpty = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/hourglass-empty');
+    export import ActionHourglassFull = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/hourglass-full');
+    export import ActionHttp = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/http');
+    export import ActionHttps = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/https');
+    export import ActionImportantDevices = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/important-devices');
+    export import ActionInfo = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/info');
+    export import ActionInfoOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/info-outline');
+    export import ActionInput = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/input');
+    export import ActionInvertColors = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/invert-colors');
+    export import ActionLabel = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/label');
+    export import ActionLabelOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/label-outline');
+    export import ActionLanguage = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/language');
+    export import ActionLaunch = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/launch');
+    export import ActionLightbulbOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/lightbulb-outline');
+    export import ActionLineStyle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/line-style');
+    export import ActionLineWeight = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/line-weight');
+    export import ActionList = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/list');
+    export import ActionLock = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/lock');
+    export import ActionLockOpen = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/lock-open');
+    export import ActionLockOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/lock-outline');
+    export import ActionLoyalty = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/loyalty');
+    export import ActionMarkunreadMailbox = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/markunread-mailbox');
+    export import ActionMotorcycle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/motorcycle');
+    export import ActionNoteAdd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/note-add');
+    export import ActionOfflinePin = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/offline-pin');
+    export import ActionOpacity = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/opacity');
+    export import ActionOpenInBrowser = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/open-in-browser');
+    export import ActionOpenInNew = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/open-in-new');
+    export import ActionOpenWith = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/open-with');
+    export import ActionPageview = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/pageview');
+    export import ActionPanTool = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/pan-tool');
+    export import ActionPayment = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/payment');
+    export import ActionPermCameraMic = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/perm-camera-mic');
+    export import ActionPermContactCalendar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/perm-contact-calendar');
+    export import ActionPermDataSetting = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/perm-data-setting');
+    export import ActionPermDeviceInformation = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/perm-device-information');
+    export import ActionPermIdentity = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/perm-identity');
+    export import ActionPermMedia = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/perm-media');
+    export import ActionPermPhoneMsg = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/perm-phone-msg');
+    export import ActionPermScanWifi = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/perm-scan-wifi');
+    export import ActionPets = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/pets');
+    export import ActionPictureInPicture = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/picture-in-picture');
+    export import ActionPictureInPictureAlt = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/picture-in-picture-alt');
+    export import ActionPlayForWork = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/play-for-work');
+    export import ActionPolymer = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/polymer');
+    export import ActionPowerSettingsNew = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/power-settings-new');
+    export import ActionPregnantWoman = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/pregnant-woman');
+    export import ActionPrint = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/print');
+    export import ActionQueryBuilder = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/query-builder');
+    export import ActionQuestionAnswer = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/question-answer');
+    export import ActionReceipt = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/receipt');
+    export import ActionRecordVoiceOver = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/record-voice-over');
+    export import ActionRedeem = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/redeem');
+    export import ActionReorder = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/reorder');
+    export import ActionReportProblem = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/report-problem');
+    export import ActionRestore = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/restore');
+    export import ActionRoom = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/room');
+    export import ActionRoundedCorner = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/rounded-corner');
+    export import ActionRowing = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/rowing');
+    export import ActionSchedule = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/schedule');
+    export import ActionSearch = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/search');
+    export import ActionSettings = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings');
+    export import ActionSettingsApplications = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-applications');
+    export import ActionSettingsBackupRestore = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-backup-restore');
+    export import ActionSettingsBluetooth = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-bluetooth');
+    export import ActionSettingsBrightness = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-brightness');
+    export import ActionSettingsCell = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-cell');
+    export import ActionSettingsEthernet = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-ethernet');
+    export import ActionSettingsInputAntenna = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-input-antenna');
+    export import ActionSettingsInputComponent = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-input-component');
+    export import ActionSettingsInputComposite = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-input-composite');
+    export import ActionSettingsInputHdmi = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-input-hdmi');
+    export import ActionSettingsInputSvideo = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-input-svideo');
+    export import ActionSettingsOverscan = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-overscan');
+    export import ActionSettingsPhone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-phone');
+    export import ActionSettingsPower = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-power');
+    export import ActionSettingsRemote = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-remote');
+    export import ActionSettingsVoice = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-voice');
+    export import ActionShop = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/shop');
+    export import ActionShoppingBasket = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/shopping-basket');
+    export import ActionShoppingCart = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/shopping-cart');
+    export import ActionShopTwo = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/shop-two');
+    export import ActionSpeakerNotes = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/speaker-notes');
+    export import ActionSpellcheck = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/spellcheck');
+    export import ActionStars = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/stars');
+    export import ActionStore = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/store');
+    export import ActionSubject = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/subject');
+    export import ActionSupervisorAccount = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/supervisor-account');
+    export import ActionSwapHoriz = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/swap-horiz');
+    export import ActionSwapVert = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/swap-vert');
+    export import ActionSwapVerticalCircle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/swap-vertical-circle');
+    export import ActionSystemUpdateAlt = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/system-update-alt');
+    export import ActionTab = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/tab');
+    export import ActionTabUnselected = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/tab-unselected');
+    export import ActionTheaters = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/theaters');
+    export import ActionThreeDRotation = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/three-d-rotation');
+    export import ActionThumbDown = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/thumb-down');
+    export import ActionThumbsUpDown = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/thumbs-up-down');
+    export import ActionThumbUp = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/thumb-up');
+    export import ActionTimeline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/timeline');
+    export import ActionToc = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/toc');
+    export import ActionToday = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/today');
+    export import ActionToll = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/toll');
+    export import ActionTouchApp = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/touch-app');
+    export import ActionTrackChanges = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/track-changes');
+    export import ActionTranslate = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/translate');
+    export import ActionTrendingDown = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/trending-down');
+    export import ActionTrendingFlat = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/trending-flat');
+    export import ActionTrendingUp = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/trending-up');
+    export import ActionTurnedIn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/turned-in');
+    export import ActionTurnedInNot = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/turned-in-not');
+    export import ActionUpdate = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/update');
+    export import ActionVerifiedUser = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/verified-user');
+    export import ActionViewAgenda = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/view-agenda');
+    export import ActionViewArray = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/view-array');
+    export import ActionViewCarousel = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/view-carousel');
+    export import ActionViewColumn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/view-column');
+    export import ActionViewDay = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/view-day');
+    export import ActionViewHeadline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/view-headline');
+    export import ActionViewList = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/view-list');
+    export import ActionViewModule = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/view-module');
+    export import ActionViewQuilt = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/view-quilt');
+    export import ActionViewStream = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/view-stream');
+    export import ActionViewWeek = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/view-week');
+    export import ActionVisibility = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/visibility');
+    export import ActionVisibilityOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/visibility-off');
+    export import ActionWatchLater = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/watch-later');
+    export import ActionWork = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/work');
+    export import ActionYoutubeSearchedFor = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/youtube-searched-for');
+    export import ActionZoomIn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/zoom-in');
+    export import ActionZoomOut = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/zoom-out');
+    export import AlertAddAlert = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/alert/add-alert');
+    export import AlertError = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/alert/error');
+    export import AlertErrorOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/alert/error-outline');
+    export import AlertWarning = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/alert/warning');
+    export import AvAddToQueue = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/add-to-queue');
+    export import AvAirplay = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/airplay');
+    export import AvAlbum = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/album');
+    export import AvArtTrack = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/art-track');
+    export import AvAvTimer = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/av-timer');
+    export import AvClosedCaption = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/closed-caption');
+    export import AvEqualizer = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/equalizer');
+    export import AvExplicit = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/explicit');
+    export import AvFastForward = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/fast-forward');
+    export import AvFastRewind = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/fast-rewind');
+    export import AvFiberDvr = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/fiber-dvr');
+    export import AvFiberManualRecord = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/fiber-manual-record');
+    export import AvFiberNew = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/fiber-new');
+    export import AvFiberPin = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/fiber-pin');
+    export import AvFiberSmartRecord = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/fiber-smart-record');
+    export import AvForward10 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/forward-10');
+    export import AvForward30 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/forward-30');
+    export import AvForward5 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/forward-5');
+    export import AvGames = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/games');
+    export import AvHd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/hd');
+    export import AvHearing = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/hearing');
+    export import AvHighQuality = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/high-quality');
+    export import AvLibraryAdd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/library-add');
+    export import AvLibraryBooks = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/library-books');
+    export import AvLibraryMusic = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/library-music');
+    export import AvLoop = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/loop');
+    export import AvMic = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/mic');
+    export import AvMicNone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/mic-none');
+    export import AvMicOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/mic-off');
+    export import AvMovie = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/movie');
+    export import AvMusicVideo = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/music-video');
+    export import AvNewReleases = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/new-releases');
+    export import AvNotInterested = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/not-interested');
+    export import AvPause = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/pause');
+    export import AvPauseCircleFilled = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/pause-circle-filled');
+    export import AvPauseCircleOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/pause-circle-outline');
+    export import AvPlayArrow = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/play-arrow');
+    export import AvPlayCircleFilled = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/play-circle-filled');
+    export import AvPlayCircleOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/play-circle-outline');
+    export import AvPlaylistAdd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/playlist-add');
+    export import AvPlaylistAddCheck = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/playlist-add-check');
+    export import AvPlaylistPlay = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/playlist-play');
+    export import AvQueue = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/queue');
+    export import AvQueueMusic = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/queue-music');
+    export import AvQueuePlayNext = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/queue-play-next');
+    export import AvRadio = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/radio');
+    export import AvRecentActors = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/recent-actors');
+    export import AvRemoveFromQueue = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/remove-from-queue');
+    export import AvRepeat = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/repeat');
+    export import AvRepeatOne = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/repeat-one');
+    export import AvReplay = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/replay');
+    export import AvReplay10 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/replay-10');
+    export import AvReplay30 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/replay-30');
+    export import AvReplay5 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/replay-5');
+    export import AvShuffle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/shuffle');
+    export import AvSkipNext = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/skip-next');
+    export import AvSkipPrevious = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/skip-previous');
+    export import AvSlowMotionVideo = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/slow-motion-video');
+    export import AvSnooze = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/snooze');
+    export import AvSortByAlpha = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/sort-by-alpha');
+    export import AvStop = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/stop');
+    export import AvSubscriptions = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/subscriptions');
+    export import AvSubtitles = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/subtitles');
+    export import AvSurroundSound = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/surround-sound');
+    export import AvVideocam = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/videocam');
+    export import AvVideocamOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/videocam-off');
+    export import AvVideoLibrary = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/video-library');
+    export import AvVolumeDown = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/volume-down');
+    export import AvVolumeMute = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/volume-mute');
+    export import AvVolumeOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/volume-off');
+    export import AvVolumeUp = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/volume-up');
+    export import AvWeb = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/web');
+    export import AvWebAsset = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/web-asset');
+    export import CommunicationBusiness = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/business');
+    export import CommunicationCall = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/call');
+    export import CommunicationCallEnd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/call-end');
+    export import CommunicationCallMade = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/call-made');
+    export import CommunicationCallMerge = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/call-merge');
+    export import CommunicationCallMissed = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/call-missed');
+    export import CommunicationCallMissedOutgoing = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/call-missed-outgoing');
+    export import CommunicationCallReceived = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/call-received');
+    export import CommunicationCallSplit = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/call-split');
+    export import CommunicationChat = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/chat');
+    export import CommunicationChatBubble = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/chat-bubble');
+    export import CommunicationChatBubbleOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/chat-bubble-outline');
+    export import CommunicationClearAll = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/clear-all');
+    export import CommunicationComment = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/comment');
+    export import CommunicationContactMail = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/contact-mail');
+    export import CommunicationContactPhone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/contact-phone');
+    export import CommunicationContacts = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/contacts');
+    export import CommunicationDialerSip = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/dialer-sip');
+    export import CommunicationDialpad = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/dialpad');
+    export import CommunicationEmail = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/email');
+    export import CommunicationForum = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/forum');
+    export import CommunicationImportContacts = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/import-contacts');
+    export import CommunicationImportExport = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/import-export');
+    export import CommunicationInvertColorsOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/invert-colors-off');
+    export import CommunicationLiveHelp = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/live-help');
+    export import CommunicationLocationOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/location-off');
+    export import CommunicationLocationOn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/location-on');
+    export import CommunicationMailOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/mail-outline');
+    export import CommunicationMessage = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/message');
+    export import CommunicationNoSim = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/no-sim');
+    export import CommunicationPhone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/phone');
+    export import CommunicationPhonelinkErase = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/phonelink-erase');
+    export import CommunicationPhonelinkLock = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/phonelink-lock');
+    export import CommunicationPhonelinkRing = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/phonelink-ring');
+    export import CommunicationPhonelinkSetup = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/phonelink-setup');
+    export import CommunicationPortableWifiOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/portable-wifi-off');
+    export import CommunicationPresentToAll = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/present-to-all');
+    export import CommunicationRingVolume = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/ring-volume');
+    export import CommunicationScreenShare = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/screen-share');
+    export import CommunicationSpeakerPhone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/speaker-phone');
+    export import CommunicationStayCurrentLandscape = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/stay-current-landscape');
+    export import CommunicationStayCurrentPortrait = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/stay-current-portrait');
+    export import CommunicationStayPrimaryLandscape = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/stay-primary-landscape');
+    export import CommunicationStayPrimaryPortrait = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/stay-primary-portrait');
+    export import CommunicationStopScreenShare = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/stop-screen-share');
+    export import CommunicationSwapCalls = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/swap-calls');
+    export import CommunicationTactMail = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/tact-mail');
+    export import CommunicationTextsms = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/textsms');
+    export import CommunicationVoicemail = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/voicemail');
+    export import CommunicationVpnKey = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/vpn-key');
+    export import ContentAdd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/add');
+    export import ContentAddBox = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/add-box');
+    export import ContentAddCircle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/add-circle');
+    export import ContentAddCircleOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/add-circle-outline');
+    export import ContentArchive = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/archive');
+    export import ContentBackspace = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/backspace');
+    export import ContentBlock = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/block');
+    export import ContentClear = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/clear');
+    export import ContentContentCopy = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/content-copy');
+    export import ContentContentCut = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/content-cut');
+    export import ContentContentPaste = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/content-paste');
+    export import ContentCreate = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/create');
+    export import ContentDrafts = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/drafts');
+    export import ContentFilterList = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/filter-list');
+    export import ContentFlag = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/flag');
+    export import ContentFontDownload = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/font-download');
+    export import ContentForward = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/forward');
+    export import ContentGesture = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/gesture');
+    export import ContentInbox = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/inbox');
+    export import ContentLink = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/link');
+    export import ContentMail = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/mail');
+    export import ContentMarkunread = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/markunread');
+    export import ContentMoveToInbox = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/move-to-inbox');
+    export import ContentNextWeek = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/next-week');
+    export import ContentRedo = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/redo');
+    export import ContentRemove = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/remove');
+    export import ContentRemoveCircle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/remove-circle');
+    export import ContentRemoveCircleOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/remove-circle-outline');
+    export import ContentReply = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/reply');
+    export import ContentReplyAll = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/reply-all');
+    export import ContentReport = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/report');
+    export import ContentSave = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/save');
+    export import ContentSelectAll = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/select-all');
+    export import ContentSend = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/send');
+    export import ContentSort = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/sort');
+    export import ContentTextFormat = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/text-format');
+    export import ContentUnarchive = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/unarchive');
+    export import ContentUndo = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/undo');
+    export import ContentWeekend = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/weekend');
+    export import DeviceAccessAlarm = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/access-alarm');
+    export import DeviceAccessAlarms = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/access-alarms');
+    export import DeviceAccessTime = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/access-time');
+    export import DeviceAddAlarm = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/add-alarm');
+    export import DeviceAirplanemodeActive = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/airplanemode-active');
+    export import DeviceAirplanemodeInactive = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/airplanemode-inactive');
+    export import DeviceBattery20 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-20');
+    export import DeviceBattery30 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-30');
+    export import DeviceBattery50 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-50');
+    export import DeviceBattery60 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-60');
+    export import DeviceBattery80 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-80');
+    export import DeviceBattery90 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-90');
+    export import DeviceBatteryAlert = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-alert');
+    export import DeviceBatteryCharging20 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-charging-20');
+    export import DeviceBatteryCharging30 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-charging-30');
+    export import DeviceBatteryCharging50 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-charging-50');
+    export import DeviceBatteryCharging60 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-charging-60');
+    export import DeviceBatteryCharging80 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-charging-80');
+    export import DeviceBatteryCharging90 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-charging-90');
+    export import DeviceBatteryChargingFull = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-charging-full');
+    export import DeviceBatteryFull = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-full');
+    export import DeviceBatteryStd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-std');
+    export import DeviceBatteryUnknown = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-unknown');
+    export import DeviceBluetooth = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/bluetooth');
+    export import DeviceBluetoothConnected = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/bluetooth-connected');
+    export import DeviceBluetoothDisabled = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/bluetooth-disabled');
+    export import DeviceBluetoothSearching = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/bluetooth-searching');
+    export import DeviceBrightnessAuto = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/brightness-auto');
+    export import DeviceBrightnessHigh = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/brightness-high');
+    export import DeviceBrightnessLow = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/brightness-low');
+    export import DeviceBrightnessMedium = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/brightness-medium');
+    export import DeviceDataUsage = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/data-usage');
+    export import DeviceDeveloperMode = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/developer-mode');
+    export import DeviceDevices = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/devices');
+    export import DeviceDvr = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/dvr');
+    export import DeviceGpsFixed = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/gps-fixed');
+    export import DeviceGpsNotFixed = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/gps-not-fixed');
+    export import DeviceGpsOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/gps-off');
+    export import DeviceGraphicEq = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/graphic-eq');
+    export import DeviceLocationDisabled = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/location-disabled');
+    export import DeviceLocationSearching = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/location-searching');
+    export import DeviceNetworkCell = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/network-cell');
+    export import DeviceNetworkWifi = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/network-wifi');
+    export import DeviceNfc = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/nfc');
+    export import DeviceScreenLockLandscape = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/screen-lock-landscape');
+    export import DeviceScreenLockPortrait = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/screen-lock-portrait');
+    export import DeviceScreenLockRotation = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/screen-lock-rotation');
+    export import DeviceScreenRotation = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/screen-rotation');
+    export import DeviceSdStorage = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/sd-storage');
+    export import DeviceSettingsSystemDaydream = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/settings-system-daydream');
+    export import DeviceSignalCellular0Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-0-bar');
+    export import DeviceSignalCellular1Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-1-bar');
+    export import DeviceSignalCellular2Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-2-bar');
+    export import DeviceSignalCellular3Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-3-bar');
+    export import DeviceSignalCellular4Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-4-bar');
+    export import DeviceSignalCellularConnectedNoInternet0Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-connected-no-internet-0-bar');
+    export import DeviceSignalCellularConnectedNoInternet1Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-connected-no-internet-1-bar');
+    export import DeviceSignalCellularConnectedNoInternet2Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-connected-no-internet-2-bar');
+    export import DeviceSignalCellularConnectedNoInternet3Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-connected-no-internet-3-bar');
+    export import DeviceSignalCellularConnectedNoInternet4Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-connected-no-internet-4-bar');
+    export import DeviceSignalCellularNoSim = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-no-sim');
+    export import DeviceSignalCellularNull = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-null');
+    export import DeviceSignalCellularOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-off');
+    export import DeviceSignalWifi0Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-wifi-0-bar');
+    export import DeviceSignalWifi1Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-wifi-1-bar');
+    export import DeviceSignalWifi1BarLock = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-wifi-1-bar-lock');
+    export import DeviceSignalWifi2Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-wifi-2-bar');
+    export import DeviceSignalWifi2BarLock = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-wifi-2-bar-lock');
+    export import DeviceSignalWifi3Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-wifi-3-bar');
+    export import DeviceSignalWifi3BarLock = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-wifi-3-bar-lock');
+    export import DeviceSignalWifi4Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-wifi-4-bar');
+    export import DeviceSignalWifi4BarLock = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-wifi-4-bar-lock');
+    export import DeviceSignalWifiOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-wifi-off');
+    export import DeviceStorage = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/storage');
+    export import DeviceUsb = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/usb');
+    export import DeviceWallpaper = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/wallpaper');
+    export import DeviceWidgets = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/widgets');
+    export import DeviceWifiLock = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/wifi-lock');
+    export import DeviceWifiTethering = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/wifi-tethering');
+    export import EditorAttachFile = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/attach-file');
+    export import EditorAttachMoney = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/attach-money');
+    export import EditorBorderAll = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-all');
+    export import EditorBorderBottom = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-bottom');
+    export import EditorBorderClear = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-clear');
+    export import EditorBorderColor = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-color');
+    export import EditorBorderHorizontal = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-horizontal');
+    export import EditorBorderInner = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-inner');
+    export import EditorBorderLeft = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-left');
+    export import EditorBorderOuter = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-outer');
+    export import EditorBorderRight = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-right');
+    export import EditorBorderStyle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-style');
+    export import EditorBorderTop = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-top');
+    export import EditorBorderVertical = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-vertical');
+    export import EditorDragHandle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/drag-handle');
+    export import EditorFormatAlignCenter = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-align-center');
+    export import EditorFormatAlignJustify = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-align-justify');
+    export import EditorFormatAlignLeft = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-align-left');
+    export import EditorFormatAlignRight = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-align-right');
+    export import EditorFormatBold = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-bold');
+    export import EditorFormatClear = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-clear');
+    export import EditorFormatColorFill = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-color-fill');
+    export import EditorFormatColorReset = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-color-reset');
+    export import EditorFormatColorText = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-color-text');
+    export import EditorFormatIndentDecrease = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-indent-decrease');
+    export import EditorFormatIndentIncrease = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-indent-increase');
+    export import EditorFormatItalic = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-italic');
+    export import EditorFormatLineSpacing = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-line-spacing');
+    export import EditorFormatListBulleted = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-list-bulleted');
+    export import EditorFormatListNumbered = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-list-numbered');
+    export import EditorFormatPaint = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-paint');
+    export import EditorFormatQuote = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-quote');
+    export import EditorFormatShapes = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-shapes');
+    export import EditorFormatSize = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-size');
+    export import EditorFormatStrikethrough = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-strikethrough');
+    export import EditorFormatTextdirectionLToR = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-textdirection-l-to-r');
+    export import EditorFormatTextdirectionRToL = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-textdirection-r-to-l');
+    export import EditorFormatUnderlined = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-underlined');
+    export import EditorFunctions = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/functions');
+    export import EditorHighlight = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/highlight');
+    export import EditorInsertChart = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/insert-chart');
+    export import EditorInsertComment = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/insert-comment');
+    export import EditorInsertDriveFile = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/insert-drive-file');
+    export import EditorInsertEmoticon = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/insert-emoticon');
+    export import EditorInsertInvitation = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/insert-invitation');
+    export import EditorInsertLink = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/insert-link');
+    export import EditorInsertPhoto = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/insert-photo');
+    export import EditorLinearScale = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/linear-scale');
+    export import EditorMergeType = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/merge-type');
+    export import EditorModeComment = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/mode-comment');
+    export import EditorModeEdit = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/mode-edit');
+    export import EditorMoneyOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/money-off');
+    export import EditorPublish = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/publish');
+    export import EditorShortText = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/short-text');
+    export import EditorSpaceBar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/space-bar');
+    export import EditorStrikethroughS = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/strikethrough-s');
+    export import EditorTextFields = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/text-fields');
+    export import EditorVerticalAlignBottom = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/vertical-align-bottom');
+    export import EditorVerticalAlignCenter = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/vertical-align-center');
+    export import EditorVerticalAlignTop = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/vertical-align-top');
+    export import EditorWrapText = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/wrap-text');
+    export import FileAttachment = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/attachment');
+    export import FileCloud = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/cloud');
+    export import FileCloudCircle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/cloud-circle');
+    export import FileCloudDone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/cloud-done');
+    export import FileCloudDownload = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/cloud-download');
+    export import FileCloudOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/cloud-off');
+    export import FileCloudQueue = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/cloud-queue');
+    export import FileCloudUpload = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/cloud-upload');
+    export import FileCreateNewFolder = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/create-new-folder');
+    export import FileFileDownload = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/file-download');
+    export import FileFileUpload = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/file-upload');
+    export import FileFolder = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/folder');
+    export import FileFolderOpen = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/folder-open');
+    export import FileFolderShared = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/folder-shared');
+    export import HardwareCast = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/cast');
+    export import HardwareCastConnected = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/cast-connected');
+    export import HardwareComputer = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/computer');
+    export import HardwareDesktopMac = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/desktop-mac');
+    export import HardwareDesktopWindows = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/desktop-windows');
+    export import HardwareDeveloperBoard = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/developer-board');
+    export import HardwareDeviceHub = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/device-hub');
+    export import HardwareDevicesOther = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/devices-other');
+    export import HardwareDock = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/dock');
+    export import HardwareGamepad = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/gamepad');
+    export import HardwareHeadset = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/headset');
+    export import HardwareHeadsetMic = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/headset-mic');
+    export import HardwareKeyboard = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/keyboard');
+    export import HardwareKeyboardArrowDown = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/keyboard-arrow-down');
+    export import HardwareKeyboardArrowLeft = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/keyboard-arrow-left');
+    export import HardwareKeyboardArrowRight = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/keyboard-arrow-right');
+    export import HardwareKeyboardArrowUp = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/keyboard-arrow-up');
+    export import HardwareKeyboardBackspace = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/keyboard-backspace');
+    export import HardwareKeyboardCapslock = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/keyboard-capslock');
+    export import HardwareKeyboardHide = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/keyboard-hide');
+    export import HardwareKeyboardReturn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/keyboard-return');
+    export import HardwareKeyboardTab = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/keyboard-tab');
+    export import HardwareKeyboardVoice = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/keyboard-voice');
+    export import HardwareLaptop = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/laptop');
+    export import HardwareLaptopChromebook = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/laptop-chromebook');
+    export import HardwareLaptopMac = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/laptop-mac');
+    export import HardwareLaptopWindows = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/laptop-windows');
+    export import HardwareMemory = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/memory');
+    export import HardwareMouse = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/mouse');
+    export import HardwarePhoneAndroid = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/phone-android');
+    export import HardwarePhoneIphone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/phone-iphone');
+    export import HardwarePhonelink = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/phonelink');
+    export import HardwarePhonelinkOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/phonelink-off');
+    export import HardwarePowerInput = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/power-input');
+    export import HardwareRouter = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/router');
+    export import HardwareScanner = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/scanner');
+    export import HardwareSecurity = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/security');
+    export import HardwareSimCard = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/sim-card');
+    export import HardwareSmartphone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/smartphone');
+    export import HardwareSpeaker = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/speaker');
+    export import HardwareSpeakerGroup = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/speaker-group');
+    export import HardwareTablet = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/tablet');
+    export import HardwareTabletAndroid = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/tablet-android');
+    export import HardwareTabletMac = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/tablet-mac');
+    export import HardwareToys = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/toys');
+    export import HardwareTv = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/tv');
+    export import HardwareVideogameAsset = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/videogame-asset');
+    export import HardwareWatch = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/watch');
+    export import ImageAddAPhoto = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/add-a-photo');
+    export import ImageAddToPhotos = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/add-to-photos');
+    export import ImageAdjust = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/adjust');
+    export import ImageAssistant = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/assistant');
+    export import ImageAssistantPhoto = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/assistant-photo');
+    export import ImageAudiotrack = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/audiotrack');
+    export import ImageBlurCircular = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/blur-circular');
+    export import ImageBlurLinear = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/blur-linear');
+    export import ImageBlurOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/blur-off');
+    export import ImageBlurOn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/blur-on');
+    export import ImageBrightness1 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/brightness-1');
+    export import ImageBrightness2 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/brightness-2');
+    export import ImageBrightness3 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/brightness-3');
+    export import ImageBrightness4 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/brightness-4');
+    export import ImageBrightness5 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/brightness-5');
+    export import ImageBrightness6 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/brightness-6');
+    export import ImageBrightness7 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/brightness-7');
+    export import ImageBrokenImage = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/broken-image');
+    export import ImageBrush = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/brush');
+    export import ImageCamera = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/camera');
+    export import ImageCameraAlt = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/camera-alt');
+    export import ImageCameraFront = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/camera-front');
+    export import ImageCameraRear = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/camera-rear');
+    export import ImageCameraRoll = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/camera-roll');
+    export import ImageCenterFocusStrong = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/center-focus-strong');
+    export import ImageCenterFocusWeak = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/center-focus-weak');
+    export import ImageCollections = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/collections');
+    export import ImageCollectionsBookmark = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/collections-bookmark');
+    export import ImageColorize = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/colorize');
+    export import ImageColorLens = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/color-lens');
+    export import ImageCompare = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/compare');
+    export import ImageControlPoint = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/control-point');
+    export import ImageControlPointDuplicate = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/control-point-duplicate');
+    export import ImageCrop = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop');
+    export import ImageCrop169 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop-16-9');
+    export import ImageCrop32 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop-3-2');
+    export import ImageCrop54 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop-5-4');
+    export import ImageCrop75 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop-7-5');
+    export import ImageCropDin = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop-din');
+    export import ImageCropFree = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop-free');
+    export import ImageCropLandscape = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop-landscape');
+    export import ImageCropOriginal = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop-original');
+    export import ImageCropPortrait = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop-portrait');
+    export import ImageCropRotate = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop-rotate');
+    export import ImageCropSquare = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop-square');
+    export import ImageDehaze = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/dehaze');
+    export import ImageDetails = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/details');
+    export import ImageEdit = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/edit');
+    export import ImageExposure = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/exposure');
+    export import ImageExposureNeg1 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/exposure-neg-1');
+    export import ImageExposureNeg2 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/exposure-neg-2');
+    export import ImageExposurePlus1 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/exposure-plus-1');
+    export import ImageExposurePlus2 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/exposure-plus-2');
+    export import ImageExposureZero = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/exposure-zero');
+    export import ImageFilter = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter');
+    export import ImageFilter1 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-1');
+    export import ImageFilter2 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-2');
+    export import ImageFilter3 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-3');
+    export import ImageFilter4 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-4');
+    export import ImageFilter5 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-5');
+    export import ImageFilter6 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-6');
+    export import ImageFilter7 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-7');
+    export import ImageFilter8 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-8');
+    export import ImageFilter9 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-9');
+    export import ImageFilter9Plus = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-9-plus');
+    export import ImageFilterBAndW = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-b-and-w');
+    export import ImageFilterCenterFocus = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-center-focus');
+    export import ImageFilterDrama = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-drama');
+    export import ImageFilterFrames = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-frames');
+    export import ImageFilterHdr = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-hdr');
+    export import ImageFilterNone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-none');
+    export import ImageFilterTiltShift = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-tilt-shift');
+    export import ImageFilterVintage = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-vintage');
+    export import ImageFlare = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/flare');
+    export import ImageFlashAuto = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/flash-auto');
+    export import ImageFlashOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/flash-off');
+    export import ImageFlashOn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/flash-on');
+    export import ImageFlip = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/flip');
+    export import ImageGradient = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/gradient');
+    export import ImageGrain = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/grain');
+    export import ImageGridOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/grid-off');
+    export import ImageGridOn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/grid-on');
+    export import ImageHdrOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/hdr-off');
+    export import ImageHdrOn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/hdr-on');
+    export import ImageHdrStrong = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/hdr-strong');
+    export import ImageHdrWeak = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/hdr-weak');
+    export import ImageHealing = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/healing');
+    export import ImageImage = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/image');
+    export import ImageImageAspectRatio = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/image-aspect-ratio');
+    export import ImageIso = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/iso');
+    export import ImageLandscape = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/landscape');
+    export import ImageLeakAdd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/leak-add');
+    export import ImageLeakRemove = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/leak-remove');
+    export import ImageLens = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/lens');
+    export import ImageLinkedCamera = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/linked-camera');
+    export import ImageLooks = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/looks');
+    export import ImageLooks3 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/looks-3');
+    export import ImageLooks4 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/looks-4');
+    export import ImageLooks5 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/looks-5');
+    export import ImageLooks6 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/looks-6');
+    export import ImageLooksOne = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/looks-one');
+    export import ImageLooksTwo = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/looks-two');
+    export import ImageLoupe = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/loupe');
+    export import ImageMonochromePhotos = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/monochrome-photos');
+    export import ImageMovieCreation = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/movie-creation');
+    export import ImageMovieFilter = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/movie-filter');
+    export import ImageMusicNote = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/music-note');
+    export import ImageNature = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/nature');
+    export import ImageNaturePeople = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/nature-people');
+    export import ImageNavigateBefore = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/navigate-before');
+    export import ImageNavigateNext = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/navigate-next');
+    export import ImagePalette = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/palette');
+    export import ImagePanorama = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/panorama');
+    export import ImagePanoramaFishEye = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/panorama-fish-eye');
+    export import ImagePanoramaHorizontal = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/panorama-horizontal');
+    export import ImagePanoramaVertical = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/panorama-vertical');
+    export import ImagePanoramaWideAngle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/panorama-wide-angle');
+    export import ImagePhoto = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/photo');
+    export import ImagePhotoAlbum = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/photo-album');
+    export import ImagePhotoCamera = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/photo-camera');
+    export import ImagePhotoFilter = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/photo-filter');
+    export import ImagePhotoLibrary = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/photo-library');
+    export import ImagePhotoSizeSelectActual = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/photo-size-select-actual');
+    export import ImagePhotoSizeSelectLarge = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/photo-size-select-large');
+    export import ImagePhotoSizeSelectSmall = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/photo-size-select-small');
+    export import ImagePictureAsPdf = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/picture-as-pdf');
+    export import ImagePortrait = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/portrait');
+    export import ImageRemoveRedEye = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/remove-red-eye');
+    export import ImageRotate90DegreesCcw = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/rotate-90-degrees-ccw');
+    export import ImageRotateLeft = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/rotate-left');
+    export import ImageRotateRight = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/rotate-right');
+    export import ImageSlideshow = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/slideshow');
+    export import ImageStraighten = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/straighten');
+    export import ImageStyle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/style');
+    export import ImageSwitchCamera = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/switch-camera');
+    export import ImageSwitchVideo = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/switch-video');
+    export import ImageTagFaces = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/tag-faces');
+    export import ImageTexture = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/texture');
+    export import ImageTimelapse = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/timelapse');
+    export import ImageTimer = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/timer');
+    export import ImageTimer10 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/timer-10');
+    export import ImageTimer3 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/timer-3');
+    export import ImageTimerOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/timer-off');
+    export import ImageTonality = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/tonality');
+    export import ImageTransform = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/transform');
+    export import ImageTune = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/tune');
+    export import ImageViewComfy = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/view-comfy');
+    export import ImageViewCompact = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/view-compact');
+    export import ImageVignette = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/vignette');
+    export import ImageWbAuto = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/wb-auto');
+    export import ImageWbCloudy = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/wb-cloudy');
+    export import ImageWbIncandescent = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/wb-incandescent');
+    export import ImageWbIridescent = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/wb-iridescent');
+    export import ImageWbSunny = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/wb-sunny');
+    export import Index = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/index');
+    export import IndexGenerator = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/index-generator');
+    export import MapsAddLocation = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/add-location');
+    export import MapsBeenhere = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/beenhere');
+    export import MapsDirections = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/directions');
+    export import MapsDirectionsBike = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/directions-bike');
+    export import MapsDirectionsBoat = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/directions-boat');
+    export import MapsDirectionsBus = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/directions-bus');
+    export import MapsDirectionsCar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/directions-car');
+    export import MapsDirectionsRailway = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/directions-railway');
+    export import MapsDirectionsRun = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/directions-run');
+    export import MapsDirectionsSubway = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/directions-subway');
+    export import MapsDirectionsTransit = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/directions-transit');
+    export import MapsDirectionsWalk = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/directions-walk');
+    export import MapsEditLocation = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/edit-location');
+    export import MapsFlight = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/flight');
+    export import MapsHotel = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/hotel');
+    export import MapsLayers = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/layers');
+    export import MapsLayersClear = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/layers-clear');
+    export import MapsLocalActivity = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-activity');
+    export import MapsLocalAirport = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-airport');
+    export import MapsLocalAtm = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-atm');
+    export import MapsLocalBar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-bar');
+    export import MapsLocalCafe = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-cafe');
+    export import MapsLocalCarWash = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-car-wash');
+    export import MapsLocalConvenienceStore = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-convenience-store');
+    export import MapsLocalDining = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-dining');
+    export import MapsLocalDrink = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-drink');
+    export import MapsLocalFlorist = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-florist');
+    export import MapsLocalGasStation = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-gas-station');
+    export import MapsLocalGroceryStore = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-grocery-store');
+    export import MapsLocalHospital = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-hospital');
+    export import MapsLocalHotel = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-hotel');
+    export import MapsLocalLaundryService = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-laundry-service');
+    export import MapsLocalLibrary = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-library');
+    export import MapsLocalMall = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-mall');
+    export import MapsLocalMovies = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-movies');
+    export import MapsLocalOffer = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-offer');
+    export import MapsLocalParking = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-parking');
+    export import MapsLocalPharmacy = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-pharmacy');
+    export import MapsLocalPhone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-phone');
+    export import MapsLocalPizza = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-pizza');
+    export import MapsLocalPlay = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-play');
+    export import MapsLocalPostOffice = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-post-office');
+    export import MapsLocalPrintshop = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-printshop');
+    export import MapsLocalSee = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-see');
+    export import MapsLocalShipping = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-shipping');
+    export import MapsLocalTaxi = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-taxi');
+    export import MapsMap = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/map');
+    export import MapsMyLocation = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/my-location');
+    export import MapsNavigation = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/navigation');
+    export import MapsNearMe = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/near-me');
+    export import MapsPersonPin = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/person-pin');
+    export import MapsPersonPinCircle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/person-pin-circle');
+    export import MapsPinDrop = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/pin-drop');
+    export import MapsPlace = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/place');
+    export import MapsRateReview = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/rate-review');
+    export import MapsRestaurantMenu = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/restaurant-menu');
+    export import MapsSatellite = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/satellite');
+    export import MapsStoreMallDirectory = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/store-mall-directory');
+    export import MapsTerrain = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/terrain');
+    export import MapsTraffic = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/traffic');
+    export import MapsZoomOutMap = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/zoom-out-map');
+    export import NavigationApps = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/apps');
+    export import NavigationArrowBack = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/arrow-back');
+    export import NavigationArrowDownward = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/arrow-downward');
+    export import NavigationArrowDropDown = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/arrow-drop-down');
+    export import NavigationArrowDropDownCircle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/arrow-drop-down-circle');
+    export import NavigationArrowDropRight = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation-arrow-drop-right');
+    export import NavigationArrowDropUp = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/arrow-drop-up');
+    export import NavigationArrowForward = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/arrow-forward');
+    export import NavigationArrowUpward = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/arrow-upward');
+    export import NavigationCancel = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/cancel');
+    export import NavigationCheck = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/check');
+    export import NavigationChevronLeft = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/chevron-left');
+    export import NavigationChevronRight = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/chevron-right');
+    export import NavigationClose = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/close');
+    export import NavigationExpandLess = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/expand-less');
+    export import NavigationExpandMore = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/expand-more');
+    export import NavigationFullscreen = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/fullscreen');
+    export import NavigationFullscreenExit = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/fullscreen-exit');
+    export import NavigationMenu = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/menu');
+    export import NavigationMoreHoriz = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/more-horiz');
+    export import NavigationMoreVert = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/more-vert');
+    export import NavigationRefresh = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/refresh');
+    export import NavigationSubdirectoryArrowLeft = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/subdirectory-arrow-left');
+    export import NavigationSubdirectoryArrowRight = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/subdirectory-arrow-right');
+    export import NavigationUnfoldLess = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/unfold-less');
+    export import NavigationUnfoldMore = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/unfold-more');
+    export import NotificationAdb = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/adb');
+    export import NotificationAirlineSeatFlat = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/airline-seat-flat');
+    export import NotificationAirlineSeatFlatAngled = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/airline-seat-flat-angled');
+    export import NotificationAirlineSeatIndividualSuite = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/airline-seat-individual-suite');
+    export import NotificationAirlineSeatLegroomExtra = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/airline-seat-legroom-extra');
+    export import NotificationAirlineSeatLegroomNormal = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/airline-seat-legroom-normal');
+    export import NotificationAirlineSeatLegroomReduced = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/airline-seat-legroom-reduced');
+    export import NotificationAirlineSeatReclineExtra = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/airline-seat-recline-extra');
+    export import NotificationAirlineSeatReclineNormal = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/airline-seat-recline-normal');
+    export import NotificationBluetoothAudio = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/bluetooth-audio');
+    export import NotificationConfirmationNumber = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/confirmation-number');
+    export import NotificationDiscFull = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/disc-full');
+    export import NotificationDoNotDisturb = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/do-not-disturb');
+    export import NotificationDoNotDisturbAlt = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/do-not-disturb-alt');
+    export import NotificationDriveEta = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/drive-eta');
+    export import NotificationEnhancedEncryption = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/enhanced-encryption');
+    export import NotificationEventAvailable = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/event-available');
+    export import NotificationEventBusy = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/event-busy');
+    export import NotificationEventNote = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/event-note');
+    export import NotificationFolderSpecial = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/folder-special');
+    export import NotificationLiveTv = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/live-tv');
+    export import NotificationMms = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/mms');
+    export import NotificationMore = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/more');
+    export import NotificationNetworkCheck = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/network-check');
+    export import NotificationNetworkLocked = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/network-locked');
+    export import NotificationNoEncryption = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/no-encryption');
+    export import NotificationOndemandVideo = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/ondemand-video');
+    export import NotificationPersonalVideo = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/personal-video');
+    export import NotificationPhoneBluetoothSpeaker = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/phone-bluetooth-speaker');
+    export import NotificationPhoneForwarded = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/phone-forwarded');
+    export import NotificationPhoneInTalk = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/phone-in-talk');
+    export import NotificationPhoneLocked = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/phone-locked');
+    export import NotificationPhoneMissed = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/phone-missed');
+    export import NotificationPhonePaused = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/phone-paused');
+    export import NotificationPower = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/power');
+    export import NotificationRvHookup = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/rv-hookup');
+    export import NotificationSdCard = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/sd-card');
+    export import NotificationSimCardAlert = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/sim-card-alert');
+    export import NotificationSms = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/sms');
+    export import NotificationSmsFailed = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/sms-failed');
+    export import NotificationSync = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/sync');
+    export import NotificationSyncDisabled = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/sync-disabled');
+    export import NotificationSyncProblem = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/sync-problem');
+    export import NotificationSystemUpdate = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/system-update');
+    export import NotificationTapAndPlay = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/tap-and-play');
+    export import NotificationTimeToLeave = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/time-to-leave');
+    export import NotificationVibration = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/vibration');
+    export import NotificationVoiceChat = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/voice-chat');
+    export import NotificationVpnLock = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/vpn-lock');
+    export import NotificationWc = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/wc');
+    export import NotificationWifi = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/wifi');
+    export import PlacesAcUnit = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/ac-unit');
+    export import PlacesAirportShuttle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/airport-shuttle');
+    export import PlacesAllInclusive = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/all-inclusive');
+    export import PlacesBeachAccess = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/beach-access');
+    export import PlacesBusinessCenter = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/business-center');
+    export import PlacesCasino = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/casino');
+    export import PlacesChildCare = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/child-care');
+    export import PlacesChildFriendly = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/child-friendly');
+    export import PlacesFitnessCenter = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/fitness-center');
+    export import PlacesFreeBreakfast = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/free-breakfast');
+    export import PlacesGolfCourse = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/golf-course');
+    export import PlacesHotTub = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/hot-tub');
+    export import PlacesKitchen = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/kitchen');
+    export import PlacesPool = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/pool');
+    export import PlacesRoomService = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/room-service');
+    export import PlacesSmokeFree = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/smoke-free');
+    export import PlacesSmokingRooms = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/smoking-rooms');
+    export import PlacesSpa = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/spa');
+    export import SocialCake = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/cake');
+    export import SocialDomain = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/domain');
+    export import SocialGroup = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/group');
+    export import SocialGroupAdd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/group-add');
+    export import SocialLocationCity = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/location-city');
+    export import SocialMood = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/mood');
+    export import SocialMoodBad = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/mood-bad');
+    export import SocialNotifications = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/notifications');
+    export import SocialNotificationsActive = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/notifications-active');
+    export import SocialNotificationsNone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/notifications-none');
+    export import SocialNotificationsOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/notifications-off');
+    export import SocialNotificationsPaused = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/notifications-paused');
+    export import SocialPages = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/pages');
+    export import SocialPartyMode = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/party-mode');
+    export import SocialPeople = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/people');
+    export import SocialPeopleOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/people-outline');
+    export import SocialPerson = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/person');
+    export import SocialPersonAdd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/person-add');
+    export import SocialPersonOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/person-outline');
+    export import SocialPlusOne = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/plus-one');
+    export import SocialPoll = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/poll');
+    export import SocialPublic = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/public');
+    export import SocialSchool = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/school');
+    export import SocialShare = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/share');
+    export import SocialWhatshot = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/whatshot');
+    export import ToggleCheckBox = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/toggle/check-box');
+    export import ToggleCheckBoxOutlineBlank = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/toggle/check-box-outline-blank');
+    export import ToggleIndeterminateCheckBox = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/toggle/indeterminate-check-box');
+    export import ToggleRadioButtonChecked = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/toggle/radio-button-checked');
+    export import ToggleRadioButtonUnchecked = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/toggle/radio-button-unchecked');
+    export import ToggleStar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/toggle/star');
+    export import ToggleStarBorder = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/toggle/star-border');
+    export import ToggleStarHalf = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/toggle/star-half');
+}
diff --git a/material-ui/legacy/material-ui-0.11.1-tests.tsx b/material-ui/legacy/material-ui-0.11.1-tests.tsx
index 7f81cf177b..9d82211bc5 100644
--- a/material-ui/legacy/material-ui-0.11.1-tests.tsx
+++ b/material-ui/legacy/material-ui-0.11.1-tests.tsx
@@ -1,4 +1,4 @@
-///<reference path='../../react/react-0.13.3.d.ts' />
+///<reference types="react-0.13.3" />
 ///<reference path='material-ui-0.11.1.d.ts' />
 
 import * as React from "react/addons";
diff --git a/material-ui/legacy/material-ui-0.11.1.d.ts b/material-ui/legacy/material-ui-0.11.1.d.ts
index 11b0fd5013..8d457b7cf5 100644
--- a/material-ui/legacy/material-ui-0.11.1.d.ts
+++ b/material-ui/legacy/material-ui-0.11.1.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Nathan Brown <https://github.com/ngbrown>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference path='../../react/react-0.13.3.d.ts' />
+///<reference types="react-0.13.3" />
 
 declare module "material-ui" {
     // The reason for exporting the namespace types (__MaterialUI.*) is to also export the type for casting variable.
diff --git a/material-ui/legacy/material-ui-0.12.1-tests.tsx b/material-ui/legacy/material-ui-0.12.1-tests.tsx
index 6792e9f4fd..ad6bc81c37 100644
--- a/material-ui/legacy/material-ui-0.12.1-tests.tsx
+++ b/material-ui/legacy/material-ui-0.12.1-tests.tsx
@@ -1,4 +1,4 @@
-///<reference path='../../react/react-0.13.3.d.ts' />
+///<reference types="react-0.13.3" />
 ///<reference path='material-ui-0.12.1.d.ts' />
 
 import * as React from "react/addons";
diff --git a/material-ui/legacy/material-ui-0.12.1.d.ts b/material-ui/legacy/material-ui-0.12.1.d.ts
index c683a2c795..ee1a306995 100644
--- a/material-ui/legacy/material-ui-0.12.1.d.ts
+++ b/material-ui/legacy/material-ui-0.12.1.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Nathan Brown <https://github.com/ngbrown>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference path='../../react/react-0.13.3.d.ts' />
+///<reference types="react-0.13.3" />
 
 declare module "material-ui" {
     export import AppBar = __MaterialUI.AppBar; // require('material-ui/lib/app-bar');
diff --git a/material-ui/legacy/material-ui-0.13.4-tests.tsx b/material-ui/legacy/material-ui-0.13.4-tests.tsx
index 76a1f0d81c..6a4228e0b0 100644
--- a/material-ui/legacy/material-ui-0.13.4-tests.tsx
+++ b/material-ui/legacy/material-ui-0.13.4-tests.tsx
@@ -1,5 +1,5 @@
-///<reference path='../../react/react.d.ts' />
-///<reference path='../../react/react-addons-linked-state-mixin.d.ts' />
+///<reference types="react" />
+///<reference types="react-addons-linked-state-mixin" />
 ///<reference path='material-ui-0.13.4.d.ts' />
 
 import * as React from "react";
diff --git a/material-ui/legacy/material-ui-0.13.4.d.ts b/material-ui/legacy/material-ui-0.13.4.d.ts
index 46071028f0..d2913c0fe4 100644
--- a/material-ui/legacy/material-ui-0.13.4.d.ts
+++ b/material-ui/legacy/material-ui-0.13.4.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Nathan Brown <https://github.com/ngbrown>, Oliver Herrmann <https://github.com/herrmanno>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference path='../../react/react.d.ts' />
+///<reference types="react" />
 
 declare module "material-ui" {
     export import AppBar = __MaterialUI.AppBar; // require('material-ui/lib/app-bar');
diff --git a/material-ui/material-ui-tests.tsx b/material-ui/material-ui-tests.tsx
index 7d2a0f139b..e0c13ed474 100644
--- a/material-ui/material-ui-tests.tsx
+++ b/material-ui/material-ui-tests.tsx
@@ -1,6 +1,5 @@
-///<reference path='../react/react.d.ts' />
-///<reference path='../react/react-addons-linked-state-mixin.d.ts' />
-///<reference path='material-ui.d.ts' />
+///<reference types="react" />
+///<reference types="react-addons-linked-state-mixin" />
 
 import * as React from "react";
 import * as LinkedStateMixin from "react-addons-linked-state-mixin";
@@ -164,10 +163,10 @@ let muiTheme: MuiTheme = ThemeManager.getMuiTheme({
 let SelectableList = SelectableContainerEnhance(List);
 
 @ThemeDecorator(muiTheme)
-class MaterialUiTests extends React.Component<{}, MaterialUiTestsState> implements React.LinkedStateMixin {
+class MaterialUiTests extends React.Component<{}, MaterialUiTestsState> implements LinkedStateMixin {
 
     // injected with mixin
-    linkState: <T>(key: string) => React.ReactLink<T>;
+    linkState: <T>(key: string) => LinkedStateMixin.ReactLink<T>;
 
     private picker12hr: TimePicker;
     private picker24hr: TimePicker;
diff --git a/material-ui/material-ui-tests.tsx.tscparams b/material-ui/material-ui-tests.tsx.tscparams
deleted file mode 100644
index 855355b85f..0000000000
--- a/material-ui/material-ui-tests.tsx.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---experimentalDecorators
\ No newline at end of file
diff --git a/material-ui/material-ui.d.ts b/material-ui/material-ui.d.ts
deleted file mode 100644
index 36e43a6e78..0000000000
--- a/material-ui/material-ui.d.ts
+++ /dev/null
@@ -1,8245 +0,0 @@
-// Type definitions for material-ui v0.14.4
-// Project: https://github.com/callemall/material-ui
-// Definitions by: Nathan Brown <https://github.com/ngbrown>, Oliver Herrmann <https://github.com/herrmanno>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path='../react/react.d.ts' />
-
-declare module "material-ui" {
-    export import AppBar = __MaterialUI.AppBar; // require('material-ui/lib/app-bar');
-    export import AppCanvas = __MaterialUI.AppCanvas; // require('material-ui/lib/app-canvas');
-    export import AutoComplete = __MaterialUI.AutoComplete; // require('material-ui/lib/auto-complete');
-    export import Avatar = __MaterialUI.Avatar; // require('material-ui/lib/avatar');
-    export import Badge = __MaterialUI.Badge; // require('material-ui/lib/badge');
-    export import BeforeAfterWrapper = __MaterialUI.BeforeAfterWrapper; // require('material-ui/lib/before-after-wrapper');
-    export import Card = __MaterialUI.Card.Card; // require('material-ui/lib/card/card');
-    export import CardActions = __MaterialUI.Card.CardActions; // require('material-ui/lib/card/card-actions');
-    export import CardExpandable = __MaterialUI.Card.CardExpandable; // require('material-ui/lib/card/card-expandable');
-    export import CardHeader = __MaterialUI.Card.CardHeader; // require('material-ui/lib/card/card-header');
-    export import CardMedia = __MaterialUI.Card.CardMedia; // require('material-ui/lib/card/card-media');
-    export import CardText = __MaterialUI.Card.CardText; // require('material-ui/lib/card/card-text');
-    export import CardTitle = __MaterialUI.Card.CardTitle; // require('material-ui/lib/card/card-title');
-    export import Checkbox = __MaterialUI.Checkbox; // require('material-ui/lib/checkbox');
-    export import CircularProgress = __MaterialUI.CircularProgress; // require('material-ui/lib/circular-progress');
-    export import ClearFix = __MaterialUI.ClearFix; // require('material-ui/lib/clearfix');
-    export import DatePicker = __MaterialUI.DatePicker.DatePicker; // require('material-ui/lib/date-picker/date-picker');
-    export import DatePickerDialog = __MaterialUI.DatePicker.DatePickerDialog; // require('material-ui/lib/date-picker/date-picker-dialog');
-    export import Dialog = __MaterialUI.Dialog // require('material-ui/lib/dialog');
-    export import Divider = __MaterialUI.Divider // require('material-ui/lib/divider');
-    export import DropDownMenu = __MaterialUI.Menus.DropDownMenu; // require('material-ui/lib/DropDownMenu/DropDownMenu');
-    export import EnhancedButton = __MaterialUI.EnhancedButton; // require('material-ui/lib/enhanced-button');
-    export import FlatButton = __MaterialUI.FlatButton; // require('material-ui/lib/flat-button');
-    export import FloatingActionButton = __MaterialUI.FloatingActionButton; // require('material-ui/lib/floating-action-button');
-    export import FontIcon = __MaterialUI.FontIcon; // require('material-ui/lib/font-icon');
-    export import GridList = __MaterialUI.GridList.GridList; // require('material-ui/lib/gridlist/grid-list');
-    export import GridTile = __MaterialUI.GridList.GridTile; // require('material-ui/lib/gridlist/grid-tile');
-    export import IconButton = __MaterialUI.IconButton; // require('material-ui/lib/icon-button');
-    export import IconMenu = __MaterialUI.Menus.IconMenu; // require('material-ui/lib/menus/icon-menu');
-    export import LeftNav = __MaterialUI.LeftNav; // require('material-ui/lib/left-nav');
-    export import LinearProgress = __MaterialUI.LinearProgress; // require('material-ui/lib/linear-progress');
-    export import List = __MaterialUI.Lists.List; // require('material-ui/lib/lists/list');
-    export import ListDivider = __MaterialUI.Lists.ListDivider; // require('material-ui/lib/lists/list-divider');
-    export import ListItem = __MaterialUI.Lists.ListItem; // require('material-ui/lib/lists/list-item');
-    export import Menu = __MaterialUI.Menus.Menu; // require('material-ui/lib/menus/menu');
-    export import MenuItem = __MaterialUI.Menus.MenuItem; // require('material-ui/lib/menus/menu-item');
-    export import Mixins = __MaterialUI.Mixins; // require('material-ui/lib/mixins');
-    export import Overlay = __MaterialUI.Overlay; // require('material-ui/lib/overlay');
-    export import Paper = __MaterialUI.Paper; // require('material-ui/lib/paper');
-    export import Popover = __MaterialUI.Popover.Popover; // require('material-ui/lib/popover/popover');
-    export import RadioButton = __MaterialUI.RadioButton; // require('material-ui/lib/radio-button');
-    export import RadioButtonGroup = __MaterialUI.RadioButtonGroup; // require('material-ui/lib/radio-button-group');
-    export import RaisedButton = __MaterialUI.RaisedButton; // require('material-ui/lib/raised-button');
-    export import RefreshIndicator = __MaterialUI.RefreshIndicator; // require('material-ui/lib/refresh-indicator');
-    export import Ripples = __MaterialUI.Ripples; // require('material-ui/lib/ripples');
-    export import SelectField = __MaterialUI.SelectField; // require('material-ui/lib/select-field');
-    export import SelectableContainerEnhance = __MaterialUI.Hoc.SelectableContainerEnhance; // require('material-ui/lib/hoc/selectable-enhance');
-    export import Slider = __MaterialUI.Slider; // require('material-ui/lib/slider');
-    export import SvgIcon = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon');
-    export import Styles = __MaterialUI.Styles; // require('material-ui/lib/styles');
-    export import Snackbar = __MaterialUI.Snackbar; // require('material-ui/lib/snackbar');
-    export import Tab = __MaterialUI.Tabs.Tab; // require('material-ui/lib/tabs/tab');
-    export import Tabs = __MaterialUI.Tabs.Tabs; // require('material-ui/lib/tabs/tabs');
-    export import Table = __MaterialUI.Table.Table; // require('material-ui/lib/table/table');
-    export import TableBody = __MaterialUI.Table.TableBody; // require('material-ui/lib/table/table-body');
-    export import TableFooter = __MaterialUI.Table.TableFooter; // require('material-ui/lib/table/table-footer');
-    export import TableHeader = __MaterialUI.Table.TableHeader; // require('material-ui/lib/table/table-header');
-    export import TableHeaderColumn = __MaterialUI.Table.TableHeaderColumn; // require('material-ui/lib/table/table-header-column');
-    export import TableRow = __MaterialUI.Table.TableRow; // require('material-ui/lib/table/table-row');
-    export import TableRowColumn = __MaterialUI.Table.TableRowColumn; // require('material-ui/lib/table/table-row-column');
-    export import Toggle = __MaterialUI.Toggle; // require('material-ui/lib/toggle');
-    export import ThemeWrapper = __MaterialUI.ThemeWrapper; // require('material-ui/lib/theme-wrapper');
-    export import TimePicker = __MaterialUI.TimePicker; // require('material-ui/lib/time-picker');
-    export import TextField = __MaterialUI.TextField; // require('material-ui/lib/text-field');
-    export import Toolbar = __MaterialUI.Toolbar.Toolbar; // require('material-ui/lib/toolbar/toolbar');
-    export import ToolbarGroup = __MaterialUI.Toolbar.ToolbarGroup; // require('material-ui/lib/toolbar/toolbar-group');
-    export import ToolbarSeparator = __MaterialUI.Toolbar.ToolbarSeparator; // require('material-ui/lib/toolbar/toolbar-separator');
-    export import ToolbarTitle = __MaterialUI.Toolbar.ToolbarTitle; // require('material-ui/lib/toolbar/toolbar-title');
-    export import Tooltip = __MaterialUI.Tooltip; // require('material-ui/lib/tooltip');
-    export import Utils = __MaterialUI.Utils; // require('material-ui/lib/utils');
-
-    // svg icons
-    import NavigationMenu = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/menu');
-    import NavigationChevronLeft = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/chevron-left');
-    import NavigationChevronRight = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/chevron-right');
-
-    export const Icons: {
-        NavigationMenu: NavigationMenu,
-        NavigationChevronLeft: NavigationChevronLeft,
-        NavigationChevronRight: NavigationChevronRight,
-    };
-
-    // export type definitions
-    export type TouchTapEvent = __MaterialUI.TouchTapEvent;
-    export type TouchTapEventHandler = __MaterialUI.TouchTapEventHandler;
-    export type DialogAction = __MaterialUI.DialogAction;
-}
-
-declare namespace __MaterialUI {
-    export import React = __React;
-
-    // ReactLink is from "react/addons"
-    interface ReactLink<T> {
-        value: T;
-        requestChange(newValue: T): void;
-    }
-
-    // What's common between React.TouchEvent and React.MouseEvent
-    interface TouchTapEvent extends React.SyntheticEvent {
-        altKey: boolean;
-        ctrlKey: boolean;
-        getModifierState(key: string): boolean;
-        metaKey: boolean;
-        shiftKey: boolean;
-    }
-
-    // What's common between React.TouchEventHandler and React.MouseEventHandler
-    interface TouchTapEventHandler extends React.EventHandler<TouchTapEvent> { }
-
-    interface ThemeWrapperProps extends React.Props<ThemeWrapper> {
-        theme: Styles.MuiTheme;
-    }
-    export class ThemeWrapper extends React.Component<ThemeWrapperProps, {}> {
-    }
-
-    export namespace Styles {
-        interface AutoPrefix {
-            all(styles: React.CSSProperties): React.CSSProperties;
-            set(style: React.CSSProperties, key: string, value: string | number): void;
-            single(key: string): string;
-            singleHyphened(key: string): string;
-        }
-        export var AutoPrefix: AutoPrefix;
-
-        interface Spacing {
-            iconSize?: number;
-
-            desktopGutter?: number;
-            desktopGutterMore?: number;
-            desktopGutterLess?: number;
-            desktopGutterMini?: number;
-            desktopKeylineIncrement?: number;
-            desktopDropDownMenuItemHeight?: number;
-            desktopDropDownMenuFontSize?: number;
-            desktopLeftNavMenuItemHeight?: number;
-            desktopSubheaderHeight?: number;
-            desktopToolbarHeight?: number;
-        }
-        export var Spacing: Spacing;
-
-        interface ThemePalette {
-            primary1Color?: string;
-            primary2Color?: string;
-            primary3Color?: string;
-            accent1Color?: string;
-            accent2Color?: string;
-            accent3Color?: string;
-            textColor?: string;
-            alternateTextColor?: string;
-            canvasColor?: string;
-            borderColor?: string;
-            disabledColor?: string;
-            pickerHeaderColor?: string;
-            clockCircleColor?: string;
-            shadowColor?: string;
-        }
-        interface MuiTheme {
-            isRtl?: boolean;
-            userAgent?: any;
-            zIndex?: zIndex;
-            baseTheme?: RawTheme;
-            rawTheme?: RawTheme;
-            appBar?: {
-                color?: string,
-                textColor?: string,
-                height?: number,
-            };
-            avatar?: {
-                borderColor?: string,
-            }
-            badge?: {
-                color?: string,
-                textColor?: string,
-                primaryColor?: string,
-                primaryTextColor?: string,
-                secondaryColor?: string,
-                secondaryTextColor?: string,
-            },
-            button?: {
-                height?: number,
-                minWidth?: number,
-                iconButtonSize?: number,
-            },
-            cardText?: {
-                textColor?: string,
-            },
-            checkbox?: {
-                boxColor?: string,
-                checkedColor?: string,
-                requiredColor?: string,
-                disabledColor?: string,
-                labelColor?: string,
-                labelDisabledColor?: string,
-            },
-            datePicker?: {
-                color?: string,
-                textColor?: string,
-                calendarTextColor?: string,
-                selectColor?: string,
-                selectTextColor?: string,
-            },
-            dropDownMenu?: {
-                accentColor?: string,
-            },
-            flatButton?: {
-                color?: string,
-                buttonFilterColor?: string,
-                disabledColor?: string,
-                textColor?: string,
-                primaryTextColor?: string,
-                secondaryTextColor?: string,
-            },
-            floatingActionButton?: {
-                buttonSize?: number,
-                miniSize?: number,
-                color?: string,
-                iconColor?: string,
-                secondaryColor?: string,
-                secondaryIconColor?: string,
-                disabledColor?: string,
-                disabledTextColor?: string,
-            },
-            gridTile?: {
-                textColor?: string,
-            },
-            inkBar?: {
-                backgroundColor?: string,
-            },
-            leftNav?: {
-                width?: number,
-                color?: string,
-            },
-            listItem?: {
-                nestedLevelDepth?: number,
-            },
-            menu?: {
-                backgroundColor?: string,
-                containerBackgroundColor?: string,
-            },
-            menuItem?: {
-                dataHeight?: number,
-                height?: number,
-                hoverColor?: string,
-                padding?: number,
-                selectedTextColor?: string,
-            },
-            menuSubheader?: {
-                padding?: number,
-                borderColor?: string,
-                textColor?: string,
-            },
-            paper?: {
-                backgroundColor?: string,
-                zDepthShadows?: string[],
-            },
-            radioButton?: {
-                borderColor?: string,
-                backgroundColor?: string,
-                checkedColor?: string,
-                requiredColor?: string,
-                disabledColor?: string,
-                size?: number,
-                labelColor?: string,
-                labelDisabledColor?: string,
-            },
-            raisedButton?: {
-                color?: string,
-                textColor?: string,
-                primaryColor?: string,
-                primaryTextColor?: string,
-                secondaryColor?: string,
-                secondaryTextColor?: string,
-                disabledColor?: string,
-                disabledTextColor?: string,
-            },
-            refreshIndicator?: {
-                strokeColor?: string,
-                loadingStrokeColor?: string,
-            };
-            slider?: {
-                trackSize?: number,
-                trackColor?: string,
-                trackColorSelected?: string,
-                handleSize?: number,
-                handleSizeDisabled?: number,
-                handleSizeActive?: number,
-                handleColorZero?: string,
-                handleFillColor?: string,
-                selectionColor?: string,
-                rippleColor?: string,
-            },
-            snackbar?: {
-                textColor?: string,
-                backgroundColor?: string,
-                actionColor?: string,
-            },
-            table?: {
-                backgroundColor?: string;
-            };
-            tableHeader?: {
-                borderColor?: string;
-            };
-            tableHeaderColumn?: {
-                textColor?: string;
-                height?: number;
-                spacing?: number;
-            };
-            tableFooter?: {
-                borderColor?: string;
-                textColor?: string;
-            };
-            tableRow?: {
-                hoverColor?: string;
-                stripeColor?: string;
-                selectedColor?: string;
-                textColor?: string;
-                borderColor?: string;
-                height?: number;
-            };
-            tableRowColumn?: {
-                height?: number;
-                spacing?: number;
-            };
-            timePicker?: {
-                color?: string;
-                textColor?: string;
-                accentColor?: string;
-                clockColor?: string;
-                clockCircleColor?: string;
-                headerColor?: string;
-                selectColor?: string;
-                selectTextColor?: string;
-            };
-            toggle?: {
-                thumbOnColor?: string,
-                thumbOffColor?: string,
-                thumbDisabledColor?: string,
-                thumbRequiredColor?: string,
-                trackOnColor?: string,
-                trackOffColor?: string,
-                trackDisabledColor?: string,
-                labelColor?: string,
-                labelDisabledColor?: string
-                trackRequiredColor?: string,
-            },
-            toolbar?: {
-                backgroundColor?: string,
-                height?: number,
-                titleFontSize?: number,
-                iconColor?: string,
-                separatorColor?: string,
-                menuHoverColor?: string,
-            };
-            tabs?: {
-                backgroundColor?: string,
-                textColor?: string,
-                selectedTextColor?: string,
-            };
-            textField?: {
-                textColor?: string;
-                hintColor?: string;
-                floatingLabelColor?: string;
-                disabledTextColor?: string;
-                errorColor?: string;
-                focusColor?: string;
-                backgroundColor?: string;
-                borderColor?: string;
-            };
-        }
-
-        interface zIndex {
-            menu: number;
-            appBar: number;
-            leftNavOverlay: number;
-            leftNav: number;
-            dialogOverlay: number;
-            dialog: number;
-            layer: number;
-            popover: number;
-            snackbar: number;
-            tooltip: number;
-        }
-        export var zIndex: zIndex;
-
-        interface RawTheme {
-            spacing?: Spacing;
-            fontFamily?: string;
-            palette?: ThemePalette;
-            zIndex?: zIndex;
-        }
-        var lightBaseTheme: RawTheme;
-        var darkBaseTheme: RawTheme;
-
-        export function ThemeDecorator(muiTheme: Styles.MuiTheme): <TFunction extends Function>(Component: TFunction) => TFunction;
-
-        export function getMuiTheme(baseTheme: RawTheme, muiTheme ?: MuiTheme): MuiTheme;
-
-        interface ThemeManager {
-            getMuiTheme(baseTheme: RawTheme, muiTheme?: MuiTheme): MuiTheme;
-            modifyRawThemeSpacing(muiTheme: MuiTheme, newSpacing: Spacing): MuiTheme;
-            modifyRawThemePalette(muiTheme: MuiTheme, newPaletteKeys: ThemePalette): MuiTheme;
-            modifyRawThemeFontFamily(muiTheme: MuiTheme, newFontFamily: string): MuiTheme;
-        }
-        export var ThemeManager: ThemeManager;
-
-        interface Transitions {
-            easeOut(duration?: string, property?: string | string[], delay?: string, easeFunction?: string): string;
-            create(duration?: string, property?: string, delay?: string, easeFunction?: string): string;
-            easeOutFunction: string;
-            easeInOutFunction: string;
-        }
-        export var Transitions: Transitions;
-
-        interface Typography {
-            textFullBlack: string;
-            textDarkBlack: string;
-            textLightBlack: string;
-            textMinBlack: string;
-            textFullWhite: string;
-            textDarkWhite: string;
-            textLightWhite: string;
-
-            // font weight
-            fontWeightLight: number;
-            fontWeightNormal: number;
-            fontWeightMedium: number;
-
-            fontStyleButtonFontSize: number;
-        }
-        export var Typography: Typography;
-
-        export var DarkRawTheme: RawTheme;
-        export var LightRawTheme: RawTheme;
-    }
-
-    interface AppBarProps extends React.Props<AppBar> {
-        className?: string;
-        iconClassNameLeft?: string;
-        iconClassNameRight?: string;
-        iconElementLeft?: React.ReactElement<any>;
-        iconElementRight?: React.ReactElement<any>;
-        iconStyleRight?: string;
-        onLeftIconButtonTouchTap?: TouchTapEventHandler;
-        onRightIconButtonTouchTap?: TouchTapEventHandler;
-        onTitleTouchTap?: TouchTapEventHandler;
-        showMenuIconButton?: boolean;
-        style?: React.CSSProperties;
-        title?: React.ReactNode;
-        titleStyle?: React.CSSProperties;
-        zDepth?: number;
-    }
-    export class AppBar extends React.Component<AppBarProps, {}>{
-    }
-
-    interface AppCanvasProps extends React.Props<AppCanvas> {
-    }
-    export class AppCanvas extends React.Component<AppCanvasProps, {}> {
-    }
-
-    interface Origin {
-        horizontal: string; // oneOf(['left', 'middle', 'right'])
-        vertical: string; // oneOf(['top', 'center', 'bottom'])
-    }
-
-    type AutoCompleteDataItem = { text: string, value: React.ReactNode } | string;
-    type AutoCompleteDataSource = { text: string, value: React.ReactNode }[] | string[];
-    interface AutoCompleteProps extends React.Props<AutoComplete> {
-        anchorOrigin?: Origin;
-        animated?: boolean;
-        dataSource?: AutoCompleteDataSource;
-        disableFocusRipple?: boolean;
-        errorStyle?: React.CSSProperties;
-        errorText?: string;
-        filter?: (searchText: string, key: string, item: AutoCompleteDataItem) => boolean;
-        floatingLabelText?: string;
-        fullWidth?: boolean;
-        hintText?: string;
-        listStyle?: React.CSSProperties;
-        menuCloseDelay?: number;
-        menuProps?: any;
-        menuStyle?: React.CSSProperties;
-        onNewRequest?: (chosenRequest: string, index: number) => void;
-        onUpdateInput?: (searchText: string, dataSource: AutoCompleteDataSource) => void;
-        open?: boolean;
-        searchText?: string;
-        /** @deprecated use noFilter instead */
-        showAllItems?: boolean;
-        style?: React.CSSProperties;
-        targetOrigin?: Origin;
-        touchTapCloseDelay?: number;
-        triggerUpdateOnFocus?: boolean;
-        /** @deprecated updateWhenFocused has been renamed to triggerUpdateOnFocus */
-        updateWhenFocused?: boolean;
-    }
-    export class AutoComplete extends React.Component<AutoCompleteProps, {}> {
-        static noFilter: () => boolean;
-        static defaultFilter: (searchText: string, key: string) => boolean;
-        static caseSensitiveFilter: (searchText: string, key: string) => boolean;
-        static caseInsensitiveFilter: (searchText: string, key: string) => boolean;
-        static levenshteinDistanceFilter(distanceLessThan: number): (searchText: string, key: string) => boolean;
-        static fuzzyFilter: (searchText: string, key: string) => boolean;
-        static Item: Menus.MenuItem;
-        static Divider: Divider;
-    }
-
-    interface AvatarProps extends React.Props<Avatar> {
-        backgroundColor?: string;
-        className?: string;
-        color?: string;
-        icon?: React.ReactElement<any>;
-        size?: number;
-        src?: string;
-        style?: React.CSSProperties;
-    }
-    export class Avatar extends React.Component<AvatarProps, {}> {
-    }
-
-    interface BadgeProps extends React.Props<Badge> {
-        badgeContent: React.ReactNode;
-        badgeStyle?: React.CSSProperties;
-        className?: string;
-        primary?: boolean;
-        secondary?: boolean;
-        style?: React.CSSProperties;
-    }
-    export class Badge extends React.Component<BadgeProps, {}> {
-    }
-
-    interface BeforeAfterWrapperProps extends React.Props<BeforeAfterWrapper> {
-        afterElementType?: string;
-        afterStyle?: React.CSSProperties;
-        beforeElementType?: string;
-        beforeStyle?: React.CSSProperties;
-        elementType?: string;
-        style?: React.CSSProperties;
-    }
-    export class BeforeAfterWrapper extends React.Component<BeforeAfterWrapperProps, {}> {
-    }
-
-    // non generally overridden elements of EnhancedButton
-    interface SharedEnhancedButtonProps<T> extends React.Props<T> {
-        centerRipple?: boolean;
-        disableFocusRipple?: boolean;
-        disableKeyboardFocus?: boolean;
-        disableTouchRipple?: boolean;
-        focusRippleColor?: string;
-        focusRippleOpacity?: number;
-        keyboardFocused?: boolean;
-        linkButton?: boolean;
-        onBlur?: React.FocusEventHandler;
-        onFocus?: React.FocusEventHandler;
-        onKeyboardFocus?: (e: React.FocusEvent, isKeyboardFocused: boolean) => void;
-        onKeyDown?: React.KeyboardEventHandler;
-        onKeyUp?: React.KeyboardEventHandler;
-        onTouchTap?: TouchTapEventHandler;
-        style?: React.CSSProperties;
-        tabIndex?: number;
-        touchRippleColor?: string;
-        touchRippleOpacity?: number;
-        type?: string;
-    }
-
-    interface EnhancedButtonProps extends React.HTMLAttributes, SharedEnhancedButtonProps<EnhancedButton> {
-        // container element, <button/>, or <span/>(if disabled link) is the element that get the 'other' properties
-        containerElement?: React.ReactNode | string;
-        disabled?: boolean;
-    }
-    export class EnhancedButton extends React.Component<EnhancedButtonProps, {}> {
-    }
-
-    interface FlatButtonProps extends SharedEnhancedButtonProps<FlatButton> {
-        // <EnhancedButton/> is the element that get the 'other' properties
-        backgroundColor?: string;
-        disabled?: boolean;
-        hoverColor?: string;
-        href?: string;
-        icon?: React.ReactNode;
-        label?: string;
-        labelPosition?: string; // oneOf(['left', 'right'])
-        labelStyle?: React.CSSProperties;
-        linkButton?: boolean;
-        onKeyboardFocus?: (e: React.FocusEvent, isKeyboardFocused: boolean) => void;
-        onMouseEnter?: React.MouseEventHandler;
-        onMouseLeave?: React.MouseEventHandler;
-        onTouchStart?: React.TouchEventHandler;
-        primary?: boolean;
-        rippleColor?: string;
-        secondary?: boolean;
-        style?: React.CSSProperties;
-    }
-    export class FlatButton extends React.Component<FlatButtonProps, {}> {
-    }
-
-    interface RaisedButtonProps extends SharedEnhancedButtonProps<RaisedButton> {
-        // <EnhancedButton/> is the element that get the 'other' properties
-        backgroundColor?: string;
-        className?: string;
-        disabled?: boolean;
-        disabledBackgroundColor?: string;
-        disabledLabelColor?: string;
-        fullWidth?: boolean;
-        href?: string;
-        icon?: React.ReactNode;
-        label?: string;
-        labelColor?: string;
-        labelPosition?: string; // oneOf(['left', 'right'])
-        labelStyle?: React.CSSProperties;
-        linkButton?: boolean;
-        onMouseDown?: React.MouseEventHandler;
-        onMouseEnter?: React.MouseEventHandler;
-        onMouseLeave?: React.MouseEventHandler;
-        onMouseUp?: React.MouseEventHandler;
-        onTouchEnd?: React.TouchEventHandler;
-        onTouchStart?: React.TouchEventHandler;
-        primary?: boolean;
-        rippleStyle?: React.CSSProperties;
-        secondary?: boolean;
-        style?: React.CSSProperties;
-    }
-    export class RaisedButton extends React.Component<RaisedButtonProps, {}> {
-    }
-
-    interface FloatingActionButtonProps extends React.HTMLAttributes, SharedEnhancedButtonProps<FloatingActionButton> {
-        // <EnhancedButton/> is the element that get the 'other' properties
-        backgroundColor?: string;
-        className?: string;
-        disabled?: boolean;
-        disabledColor?: string;
-        href?: string;
-        iconClassName?: string;
-        iconStyle?: React.CSSProperties;
-        linkButton?: boolean;
-        mini?: boolean;
-        onMouseDown?: React.MouseEventHandler;
-        onMouseEnter?: React.MouseEventHandler;
-        onMouseLeave?: React.MouseEventHandler;
-        onMouseUp?: React.MouseEventHandler;
-        onTouchEnd?: React.TouchEventHandler;
-        onTouchStart?: React.TouchEventHandler;
-        secondary?: boolean;
-        style?: React.CSSProperties;
-        zDepth?: number;
-    }
-    export class FloatingActionButton extends React.Component<FloatingActionButtonProps, {}> {
-    }
-
-    interface IconButtonProps extends React.HTMLAttributes, SharedEnhancedButtonProps<IconButton> {
-        // <EnhancedButton/> is the element that get the 'other' properties
-        className?: string;
-        disabled?: boolean;
-        iconClassName?: string;
-        iconStyle?: React.CSSProperties;
-        onBlur?: React.FocusEventHandler;
-        onFocus?: React.FocusEventHandler;
-        onKeyboardFocus?: (e: React.FocusEvent, isKeyboardFocused: boolean) => void;
-        onMouseEnter?: React.MouseEventHandler;
-        onMouseLeave?: React.MouseEventHandler;
-        style?: React.CSSProperties;
-        tooltip?: string;
-        tooltipPosition?: string;
-        tooltipStyles?: React.CSSProperties;
-        touch?: boolean;
-    }
-    export class IconButton extends React.Component<IconButtonProps, {}> {
-    }
-
-    namespace Card {
-
-        interface CardProps extends React.Props<Card> {
-            actAsExpander?: boolean;
-            expandable?: boolean;
-            initiallyExpanded?: boolean;
-            onExpandChange?: (isExpanded: boolean) => void;
-            showExpandableButton?: boolean;
-            style?: React.CSSProperties;
-        }
-        export class Card extends React.Component<CardProps, {}> {
-        }
-
-        interface CardActionsProps extends React.Props<CardActions> {
-            actAsExpander?: boolean;
-            expandable?: boolean;
-            showExpandableButton?: boolean;
-            style?: React.CSSProperties;
-        }
-        export class CardActions extends React.Component<CardActionsProps, {}> {
-        }
-
-        interface CardExpandableProps extends React.Props<CardExpandable> {
-            expanded?: boolean;
-            onExpanding?: (isExpanded: boolean) => void;
-            style?: React.CSSProperties;
-        }
-        export class CardExpandable extends React.Component<CardExpandableProps, {}> {
-        }
-
-        interface CardHeaderProps extends React.Props<CardHeader> {
-            actAsExpander?: boolean;
-            avatar?: React.ReactNode;
-            expandable?: boolean;
-            showExpandableButton?: boolean;
-            style?: React.CSSProperties;
-            subtitle?: React.ReactNode;
-            subtitleColor?: string;
-            subtitleStyle?: React.CSSProperties;
-            textStyle?: React.CSSProperties;
-            title?: React.ReactNode;
-            titleColor?: string;
-            titleStyle?: React.CSSProperties;
-        }
-        export class CardHeader extends React.Component<CardHeaderProps, {}> {
-        }
-
-        interface CardMediaProps extends React.Props<CardMedia> {
-            actAsExpander?: boolean;
-            expandable?: boolean;
-            mediaStyle?: React.CSSProperties;
-            overlay?: React.ReactNode;
-            overlayContainerStyle?: React.CSSProperties;
-            overlayContentStyle?: React.CSSProperties;
-            overlayStyle?: React.CSSProperties;
-            style?: React.CSSProperties;
-        }
-        export class CardMedia extends React.Component<CardMediaProps, {}> {
-        }
-
-        interface CardTextProps extends React.Props<CardText> {
-            actAsExpander?: boolean;
-            color?: string;
-            expandable?: boolean;
-            style?: React.CSSProperties;
-        }
-        export class CardText extends React.Component<CardTextProps, {}> {
-        }
-
-        interface CardTitleProps extends React.Props<CardTitle> {
-            actAsExpander?: boolean;
-            expandable?: boolean;
-            showExpandableButton?: boolean;
-            style?: React.CSSProperties;
-            subtitle?: React.ReactNode;
-            subtitleColor?: string;
-            subtitleStyle?: React.CSSProperties;
-            title?: React.ReactNode;
-            titleColor?: string;
-            titleStyle?: React.CSSProperties;
-        }
-        export class CardTitle extends React.Component<CardTitleProps, {}> {
-        }
-    }
-
-    namespace DatePicker {
-        interface DatePickerProps extends React.Props<DatePicker> {
-            // <TextField/> is the element that get the 'other' properties
-            DateTimeFormat?: Intl.DateTimeFormat;
-            autoOk?: boolean;
-            container?: string; // oneOf(['dialog', 'inline'])
-            defaultDate?: Date;
-            disableYearSelection?: boolean;
-            disabled?: boolean;
-            firstDayOfWeek?: number;
-            formatDate?: (date: Date) => string;
-            locale?: string;
-            maxDate?: Date;
-            minDate?: Date;
-            mode?: string;
-            onChange?: (e: any, date: Date) => void; // e is always null
-            onDismiss?: () => void;
-            onFocus?: React.FocusEventHandler;
-            onShow?: () => void;
-            onTouchTap?: React.TouchEventHandler;
-            shouldDisableDate?: (day: Date) => boolean;
-            /** @deprecated use noFilter instead */
-            showYearSelector?: boolean;
-            style?: React.CSSProperties;
-            textFieldStyle?: React.CSSProperties;
-            value?: Date;
-            valueLink?: ReactLink<Date>;
-            wordings?: {ok: string, cancel: string};
-
-            // From <TextField />
-            className?: string;
-            defaultValue?: string;
-            errorStyle?: React.CSSProperties;
-            errorText?: React.ReactNode;
-            floatingLabelStyle?: React.CSSProperties;
-            floatingLabelText?: React.ReactNode;
-            fullWidth?: boolean;
-            hintStyle?: React.CSSProperties;
-            hintText?: React.ReactNode;
-            id?: string;
-            inputStyle?: React.CSSProperties;
-            onBlur?: React.FocusEventHandler;
-            onKeyDown?: React.KeyboardEventHandler;
-            rows?: number,
-            rowsMax?: number,
-            type?: string;
-            underlineDisabledStyle?: React.CSSProperties;
-            underlineFocusStyle?: React.CSSProperties;
-            underlineShow?: boolean;
-            underlineStyle?: React.CSSProperties;
-        }
-        export class DatePicker extends React.Component<DatePickerProps, {}> {
-        }
-
-        interface DatePickerDialogProps extends React.Props<DatePickerDialog> {
-            // <Container/> is the element that get the 'other' properties
-            DateTimeFormat?: Intl.DateTimeFormat;
-            autoOk?: boolean;
-            container?: string; // oneOf(['dialog', 'inline'])
-            disableYearSelection?: boolean;
-            firstDayOfWeek?: number;
-            initialDate?: Date;
-            locale?: string;
-            maxDate?: Date;
-            minDate?: Date;
-            mode?: string;
-            onAccept?: (d: Date) => void;
-            onDismiss?: () => void;
-            onShow?: () => void;
-            shouldDisableDate?: (day: Date) => boolean;
-            showYearSelector?: boolean;
-            style?: React.CSSProperties;
-            wordings?: { ok: string, cancel: string };
-        }
-        export class DatePickerDialog extends React.Component<DatePickerDialogProps, {}> {
-        }
-    }
-
-    /** @deprecated use array of components instead */
-    export interface DialogAction {
-        id?: string;
-        onClick?: React.MouseEventHandler;
-        onTouchTap?: TouchTapEventHandler;
-        ref?: string;
-        text: string;
-    }
-    interface DialogProps extends React.Props<Dialog> {
-        /** @deprecated use a custom `actions` property instead */
-        actionFocus?: string;
-        actions?: Array<DialogAction | React.ReactElement<any>>;
-        actionsContainerClassName?: string;
-        actionsContainerStyle?: React.CSSProperties;
-        autoDetectWindowHeight?: boolean;
-        autoScrollBodyContent?: boolean;
-        bodyClassName?: string;
-        bodyStyle?: React.CSSProperties;
-        className?: string;
-        contentClassName?: string;
-        contentStyle?: React.CSSProperties;
-        modal?: boolean;
-        onRequestClose?: (buttonClicked: boolean) => void;
-        open: boolean;
-        overlayClassName?: string;
-        overlayStyle?: React.CSSProperties;
-        repositionOnUpdate?: boolean;
-        style?: React.CSSProperties;
-        title?: React.ReactNode;
-        titleClassName?: string;
-        titleStyle?: React.CSSProperties;
-        /** @deprecated use the contentStyle instead */
-        width?: string | number;
-    }
-    export class Dialog extends React.Component<DialogProps, {}> {
-    }
-
-    interface DividerProps extends React.Props<Divider> {
-        className?: string;
-        inset?: boolean;
-        style?: React.CSSProperties;
-    }
-    export class Divider extends React.Component<DividerProps, {}>{
-    }
-
-    namespace GridList {
-        interface GridListProps extends React.Props<GridList> {
-            cellHeight?: number;
-            cols?: number;
-            padding?: number;
-            style?: React.CSSProperties;
-        }
-
-        export class GridList extends React.Component<GridListProps, {}>{
-        }
-
-        interface GridTileProps extends React.Props<GridTile> {
-            actionIcon?: React.ReactElement<any>;
-            actionPosition?: string; //"left"|"right"
-            cols?: number;
-            rootClass?: string | React.Component<any, any>;
-            rows?: number;
-            style?: React.CSSProperties;
-            subtitle?: React.ReactNode;
-            title?: React.ReactNode;
-            titleBackground?: string;
-            titlePosition?: string; //"top"|"bottom"
-        }
-
-        export class GridTile extends React.Component<GridTileProps, {}>{
-        }
-    }
-
-    interface FontIconProps extends React.HTMLAttributes, React.Props<FontIcon> {
-        // <span/> is the element that get the 'other' properties
-        color?: string;
-        hoverColor?: string;
-        onMouseEnter?: React.MouseEventHandler;
-        onMouseLeave?: React.MouseEventHandler;
-        style?: React.CSSProperties;
-    }
-    export class FontIcon extends React.Component<FontIconProps, {}> {
-    }
-
-    interface SvgIconProps extends React.SVGAttributes, React.Props<SvgIcon> {
-        // <svg/> is the element that get the 'other' properties
-        color?: string;
-        hoverColor?: string;
-        onMouseEnter?: React.MouseEventHandler;
-        onMouseLeave?: React.MouseEventHandler;
-        style?: React.CSSProperties;
-        viewBox?: string;
-    }
-    export class SvgIcon extends React.Component<SvgIconProps, {}> {
-    }
-
-    interface LeftNavProps extends React.Props<LeftNav> {
-        className?: string;
-        containerClassName?: string;
-        containerStyle?: React.CSSProperties;
-        disableSwipeToOpen?: boolean;
-        docked?: boolean;
-        /** @deprecated use composability instead */
-        header?: React.ReactElement<any>;
-        /** @deprecated It will be removed with menuItems */
-        menuItemClassName?: string;
-        /** @deprecated It will be removed with menuItems */
-        menuItemClassNameLink?: string;
-        /** @deprecated It will be removed with menuItems */
-        menuItemClassNameSubheader?: string;
-        /** @deprecated use composability instead */
-        menuItems?: any[];
-        /** @deprecated It will be removed with menuItems */
-        onChange?: () => void;
-        /** @deprecated use onRequestChange instead */
-        onNavClose?: () => void;
-        /** @deprecated use onRequestChange instead */
-        onNavOpen?: () => void;
-        onRequestChange?: (opening: boolean, reason: string) => void;
-        open?: boolean;
-        openRight?: Boolean;
-        overlayClassName?: string;
-        overlayStyle?: React.CSSProperties;
-        /** @deprecated It will be removed with menuItems */
-        selectedIndex?: number;
-        style?: React.CSSProperties;
-        swipeAreaWidth?: number;
-        width?: number;
-
-    }
-    export class LeftNav extends React.Component<LeftNavProps, {}> {
-        /** @deprecated using methods on left nav has been deprecated */
-        toggle(): void;
-        /** @deprecated using methods on left nav has been deprecated */
-        close(): void;
-        /** @deprecated using methods on left nav has been deprecated */
-        open(): void;
-    }
-
-    namespace Lists {
-        interface ListProps extends React.Props<List> {
-            // <Paper/> is the element that get the 'other' properties
-            insetSubheader?: boolean;
-            style?: React.CSSProperties;
-            subheader?: string;
-            subheaderStyle?: React.CSSProperties;
-            zDepth?: number;
-        }
-        export class List extends React.Component<ListProps, {}> {
-        }
-
-        /** @deprecated Use Divider */
-        interface ListDividerProps extends React.Props<ListDivider> {
-            inset?: boolean;
-        }
-        /** @deprecated Use Divider */
-        export class ListDivider extends React.Component<ListDividerProps, {}> {
-        }
-
-        interface ListItemProps extends React.HTMLAttributes, React.Props<ListItem> {
-            // <EnhancedButton/> is the element that get the 'other' properties
-            autoGenerateNestedIndicator?: boolean;
-            disableKeyboardFocus?: boolean;
-            disabled?: boolean;
-            initiallyOpen?: boolean;
-            innerDivStyle?: React.CSSProperties;
-            insetChildren?: boolean;
-            leftAvatar?: React.ReactElement<any>;
-            leftCheckbox?: React.ReactElement<any>;
-            leftIcon?: React.ReactElement<any>;
-            nestedItems?: React.ReactElement<ListItemProps>[];
-            nestedLevel?: number;
-            nestedListStyle?: React.CSSProperties;
-            onKeyboardFocus?: React.FocusEventHandler;
-            onMouseEnter?: React.MouseEventHandler;
-            onMouseLeave?: React.MouseEventHandler;
-            onNestedListToggle?: (item: ListItem) => void;
-            onTouchStart?: React.TouchEventHandler;
-            onTouchTap?: TouchTapEventHandler;
-            primaryText?: React.ReactNode;
-            primaryTogglesNestedList?: boolean;
-            rightAvatar?: React.ReactElement<any>;
-            rightIcon?: React.ReactElement<any>;
-            rightIconButton?: React.ReactElement<any>;
-            rightToggle?: React.ReactElement<any>;
-            secondaryText?: React.ReactNode;
-            secondaryTextLines?: number; // 1 or 2
-            style?: React.CSSProperties;
-        }
-        export class ListItem extends React.Component<ListItemProps, {}> {
-        }
-    }
-
-    namespace Menus {
-        interface MenuProps extends React.Props<Menu> {
-            // <List/> is the element that get the 'other' properties
-            animated?: boolean;
-            autoWidth?: boolean;
-            desktop?: boolean;
-            initiallyKeyboardFocused?: boolean;
-            listStyle?: React.CSSProperties;
-            maxHeight?: number;
-            multiple?: boolean;
-            onChange?: (e: TouchTapEvent, itemValue: any | any[]) => void;
-            onEscKeyDown?: React.KeyboardEventHandler;
-            onItemTouchTap?: (e: TouchTapEvent, item: MenuItem) => void;
-            onKeyDown?: React.KeyboardEventHandler;
-            openDirection?: string;
-            selectedMenuItemStyle?: React.CSSProperties;
-            style?: React.CSSProperties;
-            value?: any | any[];
-            valueLink?: ReactLink<any | any[]>;
-            width?: string | number;
-            zDepth?: number;
-        }
-        export class Menu extends React.Component<MenuProps, {}>{
-        }
-
-        interface MenuItemProps extends React.HTMLAttributes, React.Props<MenuItem> {
-            // <ListItem/> is the element that get the 'other' properties
-            checked?: boolean;
-            desktop?: boolean;
-            disabled?: boolean;
-            focusState?: string; // 'none', 'focused', or 'keyboard-focused'
-            innerDivStyle?: React.CSSProperties;
-            insetChildren?: boolean;
-            leftIcon?: React.ReactElement<any>;
-            menuItems?: React.ReactNode;
-            onTouchTap?: TouchTapEventHandler;
-            rightIcon?: React.ReactElement<any>;
-            secondaryText?: React.ReactNode;
-            style?: React.CSSProperties;
-            value?: any;
-
-            // useful attributes passed to <ListItem/>
-            primaryText?: React.ReactNode;
-            secondaryTextLines?: number; // 1 or 2
-        }
-        export class MenuItem extends React.Component<MenuItemProps, {}>{
-        }
-
-        interface IconMenuProps extends React.Props<IconMenu> {
-            // <Menu/> is the element that get the 'other' properties
-            anchorOrigin?: Origin;
-            className?: string;
-            closeOnItemTouchTap?: boolean;
-            iconButtonElement: React.ReactElement<IconButtonProps>;
-            iconStyle?: React.CSSProperties;
-            menuStyle?: React.CSSProperties;
-            onItemTouchTap?: (e: TouchTapEvent, item: MenuItem) => void;
-            onKeyboardFocus?: React.FocusEventHandler;
-            onMouseDown?: React.MouseEventHandler;
-            onMouseEnter?: React.MouseEventHandler;
-            onMouseLeave?: React.MouseEventHandler;
-            onMouseUp?: React.MouseEventHandler;
-            onRequestChange?: (opening: boolean, reason: string) => void;
-            onTouchTap?: TouchTapEventHandler;
-            open?: boolean;
-            style?: React.CSSProperties;
-            targetOrigin?: Origin;
-            touchTapCloseDelay?: number;
-
-            // Other properties from <Menu/>
-            autoWidth?: boolean;
-            desktop?: boolean;
-            listStyle?: React.CSSProperties;
-            maxHeight?: number;
-            multiple?: boolean;
-            onChange?: (e: TouchTapEvent, itemValue: any | any[]) => void;
-            onKeyDown?: React.KeyboardEventHandler;
-            openDirection?: string;
-            selectedMenuItemStyle?: React.CSSProperties;
-            value?: any | any[];
-            valueLink?: ReactLink<any | any[]>;
-            width?: string | number;
-        }
-        export class IconMenu extends React.Component<IconMenuProps, {}> {
-        }
-
-        interface DropDownMenuProps extends React.Props<DropDownMenu> {
-            // <div/> is the element that gets the 'other' properties
-            autoWidth?: boolean;
-            className?: string;
-            disabled?: boolean;
-            /** @deprecated use composability instead */
-            displayMember?: string;
-            iconStyle?: any;
-            /** @deprecated use composability instead */
-            labelMember?: string;
-            labelStyle?: any;
-            maxHeight?: number;
-            /** @deprecated use composability instead */
-            menuItems?: any[];
-            menuStyle?: any;
-            onChange?: (e: TouchTapEvent, index: number, menuItemValue: any) => void;
-            openImmediately?: boolean;
-            /** @deprecated use value instead */
-            selectedIndex?: number;
-            style?: any;
-            underlineStyle?: any;
-            value?: any;
-            /** @deprecated It's deprecated by React too. */
-            valueLink?: ReactLink<any>;
-            /** @deprecated use composability instead */
-            valueMember?: string;
-        }
-        export class DropDownMenu extends React.Component<DropDownMenuProps, {}> {
-        }
-    }
-
-    interface OverlayProps extends React.Props<Overlay> {
-        autoLockScrolling?: boolean;
-        show?: boolean;
-        transitionEnabled?: boolean;
-    }
-    export class Overlay extends React.Component<OverlayProps, {}> {
-    }
-
-    interface PaperProps extends React.HTMLAttributes, React.Props<Paper> {
-        circle?: boolean;
-        rounded?: boolean;
-        style?: React.CSSProperties;
-        transitionEnabled?: boolean;
-        zDepth?: number;
-    }
-    export class Paper extends React.Component<PaperProps, {}> {
-    }
-
-    namespace Popover {
-        interface PopoverAnimationProps {
-            open: boolean;
-            style?: React.CSSProperties;
-        }
-
-        interface PopoverProps extends React.Props<Popover> {
-            anchorEl?: React.ReactInstance;
-            anchorOrigin?: Origin;
-            animated?: boolean;
-            animation?: React.ComponentClass<PopoverAnimationProps>;
-            autoCloseWhenOffScreen?: boolean;
-            canAutoPosition?: boolean;
-            className?: string;
-            onRequestClose?: (reason: string) => void;
-            open?: boolean;
-            style?: React.CSSProperties;
-            targetOrigin?: Origin;
-            useLayerForClickAway?: boolean;
-            zDepth?: number;
-        }
-        export class Popover extends React.Component<PopoverProps, {}>{
-        }
-
-        interface PopoverAnimationFromTopProps extends PopoverAnimationProps, React.Props<PopoverAnimationFromTop> {
-            className?: string;
-            targetOrigin?: Origin;
-            zDepth?: number;
-        }
-        export class PopoverAnimationFromTop extends React.Component<PopoverAnimationFromTopProps, {}>{
-        }
-
-        interface PopoverDefaultAnimationProps extends PopoverAnimationProps, React.Props<PopoverDefaultAnimation> {
-            className?: string;
-            targetOrigin?: Origin;
-            zDepth?: number;
-        }
-        export class PopoverDefaultAnimation extends React.Component<PopoverDefaultAnimationProps, {}>{
-        }
-    }
-
-    interface CircularProgressProps extends React.Props<CircularProgress> {
-        color?: string;
-        innerStyle?: React.CSSProperties;
-        max?: number;
-        min?: number;
-        mode?: string;
-        size?: number;
-        style?: React.CSSProperties;
-        value?: number;
-    }
-    export class CircularProgress extends React.Component<CircularProgressProps, {}> {
-    }
-
-    interface LinearProgressProps extends React.Props<LinearProgress> {
-        color?: string;
-        max?: number;
-        min?: number;
-        mode?: string;
-        style?: React.CSSProperties;
-        value?: number;
-    }
-    export class LinearProgress extends React.Component<LinearProgressProps, {}> {
-    }
-
-    interface RefreshIndicatorProps extends React.Props<RefreshIndicator> {
-        color?: string;
-        left: number;
-        loadingColor?: string;
-        percentage?: number;
-        size?: number;
-        status?: string;
-        style?: React.CSSProperties;
-        top: number;
-    }
-    export class RefreshIndicator extends React.Component<RefreshIndicatorProps, {}> {
-    }
-
-    interface SelectFieldProps extends React.Props<SelectField> {
-        // <DropDownMenu/> is the element that get the 'other' properties
-        autoWidth?: boolean;
-        disabled?: boolean;
-        /** @deprecated use composability instead */
-        displayMember?: string;
-        errorStyle?: React.CSSProperties;
-        errorText?: React.ReactNode;
-        floatingLabelStyle?: React.CSSProperties;
-        floatingLabelText?: React.ReactNode;
-        fullWidth?: boolean;
-        hintStyle?: React.CSSProperties;
-        hintText?: React.ReactNode;
-        iconStyle?: React.CSSProperties;
-        /** @deprecated use composability instead */
-        labelMember?: string;
-        labelStyle?: React.CSSProperties;
-        /** @deprecated use composability instead */
-        menuItems?: any[];
-        onBlur?: React.FocusEventHandler;
-        onChange?: (e: TouchTapEvent, index: number, menuItemValue: any) => void;
-        onFocus?: React.FocusEventHandler;
-        selectFieldRoot?: React.CSSProperties;
-        /** @deprecated use value instead */
-        selectedIndex?: number;
-        style?: React.CSSProperties;
-        underlineDisabledStyle?: React.CSSProperties;
-        underlineFocusStyle?: React.CSSProperties;
-        underlineStyle?: React.CSSProperties;
-        value?: any;
-        /** @deprecated It's deprecated by React too. */
-        valueLink?: ReactLink<any>;
-        /** @deprecated use composability instead */
-        valueMember?: string;
-
-        // useful attributes passed to <DropDownMenu/>
-        className?: string;
-        maxHeight?: number;
-        menuStyle?: any;
-        openImmediately?: boolean;
-    }
-    export class SelectField extends React.Component<SelectFieldProps, {}> {
-    }
-
-    interface SliderProps extends React.Props<Slider> {
-        defaultValue?: number;
-        description?: string;
-        disableFocusRipple?: boolean;
-        disabled?: boolean;
-        error?: string;
-        max?: number;
-        min?: number;
-        name?: string;
-        onBlur?: React.FocusEventHandler;
-        onChange?: (e: React.MouseEvent, value: number) => void;
-        onDragStart?: React.MouseEventHandler;
-        onDragStop?: React.MouseEventHandler;
-        onFocus?: React.FocusEventHandler;
-        required?: boolean;
-        step?: number;
-        style?: React.CSSProperties;
-        value?: number;
-    }
-    export class Slider extends React.Component<SliderProps, {}> {
-    }
-
-    // what's not commonly overridden by Checkbox, RadioButton, or Toggle
-    interface CommonEnhancedSwitchProps<T> extends React.HTMLAttributes, React.Props<T> {
-    }
-
-    interface EnhancedSwitchProps extends CommonEnhancedSwitchProps<EnhancedSwitch> {
-        // <input/> is element that get the 'other' properties
-        className?: string;
-        defaultSwitched?: boolean;
-        disableFocusRipple?: boolean;
-        disableTouchRipple?: boolean;
-        disabled?: boolean;
-        iconStyle?: React.CSSProperties;
-        id?: string;
-        inputStyle: React.CSSProperties;
-        inputType: string;
-        label?: string;
-        labelPosition?: string; // oneOf(['left', 'right'])
-        labelStyle?: React.CSSProperties;
-        name?: string;
-        onBlur?: React.FocusEventHandler;
-        onFocus?: React.FocusEventHandler;
-        onMouseDown?: React.MouseEventHandler;
-        onMouseLeave?: React.MouseEventHandler;
-        onMouseUp?: React.MouseEventHandler;
-        onParentShouldUpdate: (isInputChecked: boolean) => void;
-        onSwitch?: (e: React.MouseEvent, isInputChecked: boolean) => void;
-        onTouchEnd?: React.TouchEventHandler;
-        onTouchStart?: React.TouchEventHandler;
-        required?: boolean;
-        rippleColor?: string;
-        rippleStyle?: React.CSSProperties;
-        style?: React.CSSProperties;
-        switchElement: React.ReactElement<any>;
-        switched: boolean;
-        thumbStyle?: React.CSSProperties;
-        trackStyle?: React.CSSProperties;
-        value?: string;
-    }
-    export class EnhancedSwitch extends React.Component<EnhancedSwitchProps, {}> {
-        getValue(): string;
-        isKeyboardFocused(): boolean;
-        isSwitched(): boolean;
-        setSwitched(newSwitchedValue: boolean): void;
-    }
-
-    interface CheckboxProps extends CommonEnhancedSwitchProps<Checkbox> {
-        // <EnhancedSwitch/> is element that get the 'other' properties
-        checked?: boolean;
-        checkedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
-        defaultChecked?: boolean;
-        disabled?: boolean;
-        iconStyle?: React.CSSProperties;
-        labelPosition?: string; // oneOf(['left', 'right'])
-        labelStyle?: React.CSSProperties;
-        onCheck?: (event: React.MouseEvent, checked: boolean) => void;
-        style?: React.CSSProperties;
-        /** @deprecated Use uncheckedIcon instead */
-        unCheckedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
-        uncheckedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
-        valueLink?: ReactLink<boolean>;
-    }
-    export class Checkbox extends React.Component<CheckboxProps, {}> {
-        isChecked(): void;
-        setChecked(newCheckedValue: boolean): void;
-    }
-
-    interface RadioButtonProps extends CommonEnhancedSwitchProps<RadioButton> {
-        // <EnhancedSwitch/> is element that get the 'other' properties
-        checked?: boolean;
-        checkedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
-        disabled?: boolean;
-        iconStyle?: React.CSSProperties;
-        inputStyle?: React.CSSProperties;
-        labelPosition?: string; // oneOf(['left', 'right'])
-        labelStyle?: React.CSSProperties;
-        onCheck?: (e: React.FormEvent, selected: string) => void;
-        style?: React.CSSProperties;
-        uncheckedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
-        value?: string;
-    }
-    export class RadioButton extends React.Component<RadioButtonProps, {}> {
-        isChecked(): boolean;
-        getValue(): string;
-    }
-
-    interface RadioButtonGroupProps extends React.Props<RadioButtonGroup> {
-        className?: string;
-        defaultSelected?: string;
-        labelPosition?: string; // oneOf(['left', 'right'])
-        name: string;
-        onChange?: (e: React.FormEvent, selected: string) => void;
-        style?: React.CSSProperties;
-        valueSelected?: string;
-    }
-    export class RadioButtonGroup extends React.Component<RadioButtonGroupProps, {}> {
-        clearValue(): void;
-        getSelectedValue(): string;
-        setSelectedValue(newSelectionValue: string): void;
-    }
-
-    interface ToggleProps extends CommonEnhancedSwitchProps<Toggle> {
-        // <EnhancedSwitch/> is element that get the 'other' properties
-        defaultToggled?: boolean;
-        disabled?: boolean;
-        elementStyle?: React.CSSProperties;
-        iconStyle?: React.CSSProperties;
-        inputStyle?: React.CSSProperties;
-        labelPosition?: string; // oneOf(['left', 'right'])
-        labelStyle?: React.CSSProperties;
-        onToggle?: (e: React.MouseEvent, isInputChecked: boolean) => void;
-        rippleStyle?: React.CSSProperties;
-        style?: React.CSSProperties;
-        thumbStyle?: React.CSSProperties;
-        toggled?: boolean;
-        trackStyle?: React.CSSProperties;
-        valueLink?: ReactLink<boolean>;
-    }
-    export class Toggle extends React.Component<ToggleProps, {}> {
-        isToggled(): boolean;
-        setToggled(newToggledValue: boolean): void;
-    }
-
-    interface SnackbarProps extends React.Props<Snackbar> {
-        action?: string;
-        autoHideDuration?: number;
-        bodyStyle?: React.CSSProperties;
-        className?: string;
-        message: string;
-        onActionTouchTap?: React.TouchEventHandler;
-        /** @deprecated Use the open property to control the component instead */
-        onDismiss?: () => void; // DEPRECATED
-        onRequestClose: (reason: string) => void;
-        /** @deprecated Use the open property to control the component instead */
-        onShow?: () => void; // DEPRECATED
-        open: boolean;
-        /** @deprecated Use the open property to control the component instead */
-        openOnMount?: boolean; // DEPRECATED
-        style?: React.CSSProperties;
-
-    }
-    export class Snackbar extends React.Component<SnackbarProps, {}> {
-    }
-
-    namespace Table {
-        interface TableProps extends React.Props<Table> {
-            allRowsSelected?: boolean;
-            bodyStyle?: React.CSSProperties;
-            className?: string;
-            fixedFooter?: boolean;
-            fixedHeader?: boolean;
-            footerStyle?: React.CSSProperties;
-            headerStyle?: React.CSSProperties;
-            height?: string;
-            multiSelectable?: boolean;
-            onCellClick?: (row: number, column: number) => void;
-            onCellHover?: (row: number, column: number) => void;
-            onCellHoverExit?: (row: number, column: number) => void;
-            onRowHover?: (row: number) => void;
-            onRowHoverExit?: (row: number) => void;
-            onRowSelection?: (selectedRows: number[] | string) => void;
-            selectable?: boolean;
-            style?: React.CSSProperties;
-            wrapperStyle?: React.CSSProperties;
-        }
-        export class Table extends React.Component<TableProps, {}> {
-        }
-
-        interface TableRowProps extends React.Props<TableRow> {
-            // <tr/> is element that get the 'other' properties
-            className?: string;
-            displayBorder?: boolean;
-            hoverable?: boolean;
-            hovered?: boolean;
-            onCellClick?: (e: React.MouseEvent, row: number, column: number) => void;
-            onCellHover?: (e: React.MouseEvent, row: number, column: number) => void;
-            onCellHoverExit?: (e: React.MouseEvent, row: number, column: number) => void;
-            onRowClick?: (e: React.MouseEvent, row: number) => void;
-            onRowHover?: (e: React.MouseEvent, row: number) => void;
-            onRowHoverExit?: (e: React.MouseEvent, row: number) => void;
-            rowNumber?: number;
-            selectable?: boolean;
-            selected?: boolean;
-            striped?: boolean;
-            style?: React.CSSProperties;
-        }
-        export class TableRow extends React.Component<TableRowProps, {}> {
-        }
-
-        interface TableRowColumnProps extends React.Props<TableRowColumn> {
-            // <td/> is element that get the 'other' properties
-            className?: string;
-            columnNumber?: number;
-            hoverable?: boolean;
-            key?: string;
-            onClick?: (e: React.MouseEvent, column: number) => void;
-            onHover?: (e: React.MouseEvent, column: number) => void;
-            onHoverExit?: (e: React.MouseEvent, column: number) => void;
-            style?: React.CSSProperties;
-
-            // useful attributes passed to <td/>
-            colSpan?: number;
-        }
-        export class TableRowColumn extends React.Component<TableRowColumnProps, {}> {
-        }
-
-        interface TableHeaderProps extends React.Props<TableHeader> {
-            adjustForCheckbox?: boolean;
-            className?: string;
-            displaySelectAll?: boolean;
-            enableSelectAll?: boolean;
-            onSelectAll?: (checked: boolean) => void;
-            selectAllSelected?: boolean;
-            style?: React.CSSProperties;
-        }
-        export class TableHeader extends React.Component<TableHeaderProps, {}> {
-        }
-
-        interface TableHeaderColumnProps extends React.Props<TableHeaderColumn> {
-            // <th/> is element that get the 'other' properties
-            className?: string;
-            columnNumber?: number;
-            key?: string;
-            onClick?: (e: React.MouseEvent, column: number) => void;
-            style?: React.CSSProperties;
-            tooltip?: string;
-            tooltipStyle?: React.CSSProperties;
-
-            // useful attributes passed to <th/>
-            colSpan?: number;
-        }
-        export class TableHeaderColumn extends React.Component<TableHeaderColumnProps, {}> {
-        }
-
-        interface TableBodyProps extends React.Props<TableBody> {
-            allRowsSelected?: boolean;
-            className?: string;
-            deselectOnClickaway?: boolean;
-            displayRowCheckbox?: boolean;
-            multiSelectable?: boolean;
-            onCellClick?: (row: number, column: number) => void;
-            onCellHover?: (row: number, column: number) => void;
-            onCellHoverExit?: (row: number, column: number) => void;
-            onRowHover?: (row: number) => void;
-            onRowHoverExit?: (row: number) => void;
-            onRowSelection?: (selectedRows: number[] | string) => void;
-            preScanRows?: boolean;
-            selectable?: boolean;
-            showRowHover?: boolean;
-            stripedRows?: boolean;
-            style?: React.CSSProperties;
-        }
-        export class TableBody extends React.Component<TableBodyProps, {}> {
-        }
-
-        interface TableFooterProps extends React.Props<TableFooter> {
-            // <tfoot/> is element that get the 'other' properties
-            adjustForCheckbox?: boolean;
-            className?: string;
-            style?: React.CSSProperties;
-        }
-        export class TableFooter extends React.Component<TableFooterProps, {}> {
-        }
-    }
-
-    namespace Tabs {
-        interface TabsProps extends React.Props<Tabs> {
-            className?: string;
-            contentContainerClassName?: string;
-            contentContainerStyle?: React.CSSProperties;
-            initialSelectedIndex?: number;
-            inkBarStyle?: React.CSSProperties;
-            onChange?: (value: any, e: React.FormEvent, tab: Tab) => void;
-            style?: React.CSSProperties;
-            tabItemContainerStyle?: React.CSSProperties;
-            tabTemplate?: React.ComponentClass<any>;
-            value?: any;
-        }
-        export class Tabs extends React.Component<TabsProps, {}> {
-        }
-
-        interface TabProps extends React.Props<Tab> {
-            className?: string;
-            icon?: React.ReactNode;
-            label?: React.ReactNode;
-            onActive?: (tab: Tab) => void;
-            onTouchTap?: (value: any, e: TouchTapEvent, tab: Tab) => void;
-            selected?: boolean;
-            style?: React.CSSProperties;
-            value?: any;
-            width?: string;
-        }
-        export class Tab extends React.Component<TabProps, {}> {
-        }
-    }
-
-    interface TextFieldProps extends React.Props<TextField> {
-        className?: string;
-        defaultValue?: string | number;
-        disabled?: boolean;
-        errorStyle?: React.CSSProperties;
-        errorText?: React.ReactNode;
-        floatingLabelStyle?: React.CSSProperties;
-        floatingLabelText?: React.ReactNode;
-        fullWidth?: boolean;
-        hintStyle?: React.CSSProperties;
-        hintText?: React.ReactNode;
-        id?: string;
-        inputStyle?: React.CSSProperties;
-        multiLine?: boolean;
-        onBlur?: React.FocusEventHandler;
-        onChange?: React.FormEventHandler;
-        onEnterKeyDown?: React.KeyboardEventHandler;
-        onFocus?: React.FocusEventHandler;
-        onKeyDown?: React.KeyboardEventHandler;
-        rows?: number,
-        rowsMax?: number,
-        style?: React.CSSProperties;
-        type?: string;
-        underlineDisabledStyle?: React.CSSProperties;
-        underlineFocusStyle?: React.CSSProperties;
-        underlineShow?: boolean;
-        underlineStyle?: React.CSSProperties;
-        value?: string | number;
-        valueLink?: ReactLink<string | number>;
-    }
-    export class TextField extends React.Component<TextFieldProps, {}> {
-        blur(): void;
-        clearValue(): void;
-        focus(): void;
-        getValue(): string;
-        /** @deprecated Use the errorText property instead. */
-        setErrorText(newErrorText: string): void;
-        /** @deprecated Use the defaultValue or value property instead. */
-        setValue(newValue: string | number): void;
-    }
-
-    interface TimePickerProps extends React.Props<TimePicker> {
-        // <TextField/> is element that get the 'other' properties
-        autoOk?: boolean;
-        defaultTime?: Date;
-        format?: string; // 'ampm' or '24hr'
-        onChange?: (e: any, time: Date) => void;
-        onDismiss?: () => void;
-        onFocus?: React.FocusEventHandler;
-        onShow?: () => void;
-        onTouchTap?: TouchTapEventHandler;
-        pedantic?: boolean;
-        style?: React.CSSProperties;
-        textFieldStyle?: React.CSSProperties;
-
-        // From <TextField />
-        className?: string;
-        defaultValue?: string;
-        errorStyle?: React.CSSProperties;
-        errorText?: React.ReactNode;
-        floatingLabelStyle?: React.CSSProperties;
-        floatingLabelText?: React.ReactNode;
-        fullWidth?: boolean;
-        hintStyle?: React.CSSProperties;
-        hintText?: React.ReactNode;
-        id?: string;
-        inputStyle?: React.CSSProperties;
-        onBlur?: React.FocusEventHandler;
-        onKeyDown?: React.KeyboardEventHandler;
-        rows?: number,
-        rowsMax?: number,
-        type?: string;
-        underlineDisabledStyle?: React.CSSProperties;
-        underlineFocusStyle?: React.CSSProperties;
-        underlineShow?: boolean;
-        underlineStyle?: React.CSSProperties;
-    }
-    export class TimePicker extends React.Component<TimePickerProps, {}> {
-        getTime(): Date;
-        setTime(time: Date): void;
-        openDialog(): void;
-    }
-
-    namespace Toolbar {
-        interface ToolbarProps extends React.Props<Toolbar> {
-            className?: string;
-            noGutter?: boolean;
-            style?: React.CSSProperties;
-        }
-        export class Toolbar extends React.Component<ToolbarProps, {}> {
-        }
-
-        interface ToolbarGroupProps extends React.Props<ToolbarGroup> {
-            className?: string;
-            firstChild?: boolean;
-            float?: string; // oneOf(['left', 'right'])
-            lastChild?: boolean;
-            style?: React.CSSProperties;
-        }
-        export class ToolbarGroup extends React.Component<ToolbarGroupProps, {}> {
-        }
-
-        interface ToolbarSeparatorProps extends React.Props<ToolbarSeparator> {
-            className?: string;
-            style?: React.CSSProperties;
-        }
-        export class ToolbarSeparator extends React.Component<ToolbarSeparatorProps, {}> {
-        }
-
-        interface ToolbarTitleProps extends React.HTMLAttributes, React.Props<ToolbarTitle> {
-            className?: string;
-            style?: React.CSSProperties;
-            text?: string;
-        }
-        export class ToolbarTitle extends React.Component<ToolbarTitleProps, {}> {
-        }
-    }
-
-    namespace Ripples {
-        interface CircleRippleProps extends React.Props<CircleRipple> {
-            color?: string;
-            muiTheme: Styles.MuiTheme;
-            opacity?: number;
-            style?: React.CSSProperties;
-        }
-        export class CircleRipple extends React.Component<CircleRippleProps, {}> {
-        }
-
-        interface FocusRippleProps extends React.Props<FocusRipple> {
-            color?: string;
-            innerStyle?: React.CSSProperties;
-            muiTheme: Styles.MuiTheme;
-            opacity?: number;
-            show?: boolean;
-            style?: React.CSSProperties;
-        }
-        export class FocusRipple extends React.Component<FocusRippleProps, {}> {
-        }
-
-        interface TouchRippleProps extends React.Props<TouchRipple> {
-            centerRipple?: boolean;
-            color?: string;
-            muiTheme: Styles.MuiTheme;
-            opacity?: number;
-            style?: React.CSSProperties;
-        }
-        export class TouchRipple extends React.Component<TouchRippleProps, {}> {
-        }
-    }
-
-    interface ClearFixProps extends React.Props<ClearFix> {
-    }
-    export class ClearFix extends React.Component<ClearFixProps, {}> {
-    }
-
-    interface TooltipProps extends React.Props<Tooltip> {
-        className?: string;
-        horizontalPosition?: string; // oneOf(['left', 'right', 'center'])
-        label: string;
-        show?: boolean;
-        style?: React.CSSProperties;
-        touch?: boolean;
-        verticalPosition?: string; // oneOf(['top', 'bottom'])
-    }
-    export class Tooltip extends React.Component<TooltipProps, {}> {
-    }
-
-    namespace Hoc {
-        interface SelectableProps {
-            onChange?: (e: TouchTapEvent, value: any) => void;
-            selectedItemStyle?: React.CSSProperties;
-            value?: any;
-            valueLink?: { value: any; requestChange: (e: TouchTapEvent, value: any) => void };
-        }
-
-        // union types for higher order components in TypeScript 1.8: https://github.com/Microsoft/TypeScript/issues/4362
-        export function SelectableContainerEnhance<P extends {}>(component: React.ComponentClass<P>): React.ComponentClass<P & SelectableProps>;
-    }
-
-    export namespace Mixins {
-        interface ClickAwayable extends React.Mixin<any, any> {
-        }
-        var ClickAwayable: ClickAwayable;
-
-        interface WindowListenable extends React.Mixin<any, any> {
-        }
-        var WindowListenable: WindowListenable;
-
-        interface StylePropable extends React.Mixin<any, any> {
-        }
-        var StylePropable: StylePropable
-
-        interface StyleResizable extends React.Mixin<any, any> {
-        }
-        var StyleResizable: StyleResizable
-    }
-
-    export namespace Utils {
-        interface ContrastLevel {
-            color: string;
-            range: [number, number];
-        }
-        interface ColorManipulator {
-            contrastRatio(background: string, foreground: string): number;
-            contrastRatioLevel(background: string, foreground: string): ContrastLevel;
-            darken(color: string, amount: string | number): string;
-            fade(color: string, amount: string | number): string;
-            lighten(color: string, amount: string | number): string;
-        }
-        export var ColorManipulator: ColorManipulator;
-
-        interface CssEvent {
-            animationEndEventName(): string;
-            onAnimationEnd(el: Element, callback: () => void): void;
-            onTransitionEnd(el: Element, callback: () => void): void;
-            transitionEndEventName(): string;
-        }
-        export var CssEvent: CssEvent;
-
-        interface Dom {
-            addClass(el: Element, className: string): void;
-            forceRedraw(el: HTMLElement): void;
-            getStyleAttributeAsNumber(el: HTMLElement, attr: string): number;
-            hasClass(el: Element, className: string): boolean;
-            isDescendant(parent: Node, child: Node): boolean;
-            offset(el: Element): { top: number, left: number };
-            removeClass(el: Element, className: string): void;
-            toggleClass(el: Element, className: string): void;
-            withoutTransition(el: HTMLElement, callback: () => void): void;
-        }
-        export var Dom: Dom;
-
-        interface Events {
-            isKeyboard(e: Event): boolean;
-            off(el: Element, type: string, callback: EventListener): void;
-            on(el: Element, type: string, callback: EventListener): void;
-            once(el: Element, type: string, callback: EventListener): void;
-        }
-        export var Events: Events;
-
-        function Extend<T, S1>(base: T, override: S1): (T & S1);
-
-        interface ImmutabilityHelper {
-            merge(base: any, ...args: any[]): any;
-            mergeItem(obj: any, key: any, newValueObject: any): any;
-            push(array: any[], obj: any): any[];
-            shift(array: any[]): any[];
-        }
-        export var ImmutabilityHelper: ImmutabilityHelper;
-
-        interface KeyCode {
-            DOWN: number;
-            ESC: number;
-            ENTER: number;
-            LEFT: number;
-            RIGHT: number;
-            SPACE: number;
-            TAB: number;
-            UP: number;
-        }
-        var KeyCode: KeyCode;
-
-        interface KeyLine {
-            Desktop: {
-                GUTTER: number;
-                GUTTER_LESS: number;
-                INCREMENT: number;
-                MENU_ITEM_HEIGHT: number;
-            };
-
-            getIncrementalDim(dim: number): number;
-        }
-        export var KeyLine: KeyLine;
-
-        interface UniqueId {
-            generate(): string;
-        }
-        export var UniqueId: UniqueId;
-
-        interface Styles {
-            mergeAndPrefix(base: any, ...args: any[]): React.CSSProperties;
-        }
-        export var Styles: Styles;
-    }
-}    // __MaterialUI
-
-declare module 'material-ui/lib/app-bar' {
-    export import AppBar = __MaterialUI.AppBar;
-    export default AppBar;
-}
-
-declare module 'material-ui/lib/auto-complete' {
-    export import AutoComplete = __MaterialUI.AutoComplete;
-    export default AutoComplete;
-}
-
-declare module 'material-ui/lib/app-canvas' {
-    export import AppCanvas = __MaterialUI.AppCanvas;
-    export default AppCanvas;
-}
-
-declare module 'material-ui/lib/avatar' {
-    export import Avatar = __MaterialUI.Avatar;
-    export default Avatar;
-}
-
-declare module "material-ui/lib/badge" {
-    export import Badge = __MaterialUI.Badge;
-    export default Badge;
-}
-
-declare module 'material-ui/lib/before-after-wrapper' {
-    export import BeforeAfterWrapper = __MaterialUI.BeforeAfterWrapper;
-    export default BeforeAfterWrapper;
-}
-
-declare module 'material-ui/lib/card/card' {
-    export import Card = __MaterialUI.Card.Card;
-    export default Card;
-}
-
-declare module 'material-ui/lib/card/card-actions' {
-    export import CardActions = __MaterialUI.Card.CardActions;
-    export default CardActions;
-}
-
-declare module 'material-ui/lib/card/card-expandable' {
-    export import CardExpandable = __MaterialUI.Card.CardExpandable;
-    export default CardExpandable;
-}
-
-declare module 'material-ui/lib/card/card-header' {
-    export import CardHeader = __MaterialUI.Card.CardHeader;
-    export default CardHeader;
-}
-
-declare module 'material-ui/lib/card/card-media' {
-    export import CardMedia = __MaterialUI.Card.CardMedia;
-    export default CardMedia;
-}
-
-declare module 'material-ui/lib/card/card-text' {
-    export import CardText = __MaterialUI.Card.CardText;
-    export default CardText;
-}
-
-declare module 'material-ui/lib/card/card-title' {
-    export import CardTitle = __MaterialUI.Card.CardTitle;
-    export default CardTitle;
-}
-
-declare module 'material-ui/lib/checkbox' {
-    export import Checkbox = __MaterialUI.Checkbox;
-    export default Checkbox;
-}
-
-declare module 'material-ui/lib/circular-progress' {
-    export import CircularProgress = __MaterialUI.CircularProgress;
-    export default CircularProgress;
-}
-
-declare module 'material-ui/lib/clearfix' {
-    export import ClearFix = __MaterialUI.ClearFix;
-    export default ClearFix;
-}
-
-declare module 'material-ui/lib/date-picker/date-picker' {
-    export import DatePicker = __MaterialUI.DatePicker.DatePicker;
-    export default DatePicker;
-}
-
-declare module 'material-ui/lib/date-picker/date-picker-dialog' {
-    export import DatePickerDialog = __MaterialUI.DatePicker.DatePickerDialog;
-    export default DatePickerDialog;
-}
-
-declare module 'material-ui/lib/dialog' {
-    export import Dialog = __MaterialUI.Dialog;
-    export default Dialog;
-}
-
-declare module 'material-ui/lib/drop-down-menu' {
-    export import DropDownMenu = __MaterialUI.Menus.DropDownMenu;
-    export default DropDownMenu;
-}
-
-declare module 'material-ui/lib/DropDownMenu' {
-    export import DropDownMenu = __MaterialUI.Menus.DropDownMenu;
-    export default DropDownMenu;
-}
-
-declare module 'material-ui/lib/DropDownMenu/DropDownMenu' {
-    export import DropDownMenu = __MaterialUI.Menus.DropDownMenu;
-    export default DropDownMenu;
-}
-
-declare module 'material-ui/lib/enhanced-button' {
-    export import EnhancedButton = __MaterialUI.EnhancedButton;
-    export default EnhancedButton;
-}
-
-declare module 'material-ui/lib/flat-button' {
-    export import FlatButton = __MaterialUI.FlatButton;
-    export default FlatButton;
-}
-
-declare module 'material-ui/lib/floating-action-button' {
-    export import FloatingActionButton = __MaterialUI.FloatingActionButton;
-    export default FloatingActionButton;
-}
-
-declare module 'material-ui/lib/font-icon' {
-    export import FontIcon = __MaterialUI.FontIcon;
-    export default FontIcon;
-}
-
-declare module 'material-ui/lib/hoc/selectable-enhance' {
-    export import SelectableContainerEnhance = __MaterialUI.Hoc.SelectableContainerEnhance;
-    export default SelectableContainerEnhance;
-}
-
-declare module 'material-ui/lib/icon-button' {
-    export import IconButton = __MaterialUI.IconButton;
-    export default IconButton;
-}
-
-declare module 'material-ui/lib/left-nav' {
-    export import LeftNav = __MaterialUI.LeftNav;
-    export default LeftNav;
-}
-
-declare module 'material-ui/lib/linear-progress' {
-    export import LinearProgress = __MaterialUI.LinearProgress;
-    export default LinearProgress;
-}
-
-declare module 'material-ui/lib/lists/list' {
-    export import List = __MaterialUI.Lists.List;
-    export default List;
-}
-
-declare module 'material-ui/lib/lists/list-divider' {
-    export import ListDivider = __MaterialUI.Lists.ListDivider;
-    export default ListDivider;
-}
-
-declare module 'material-ui/lib/lists/list-item' {
-    export import ListItem = __MaterialUI.Lists.ListItem;
-    export default ListItem;
-}
-
-declare module 'material-ui/lib/mixins' {
-    export import ClickAwayable = __MaterialUI.Mixins.ClickAwayable; // require('material-ui/lib/mixins/click-awayable');
-    export import WindowListenable = __MaterialUI.Mixins.WindowListenable; // require('material-ui/lib/mixins/window-listenable');
-    export import StylePropable = __MaterialUI.Mixins.StylePropable; // require('material-ui/lib/mixins/style-propable');
-    export import StyleResizable = __MaterialUI.Mixins.StyleResizable; // require('material-ui/lib/mixins/style-resizable');
-}
-
-declare module 'material-ui/lib/mixins/click-awayable' {
-    export import ClickAwayable = __MaterialUI.Mixins.ClickAwayable;
-    export default ClickAwayable;
-}
-
-declare module 'material-ui/lib/mixins/window-listenable' {
-    export import WindowListenable = __MaterialUI.Mixins.WindowListenable;
-    export default WindowListenable;
-}
-
-declare module 'material-ui/lib/mixins/style-propable' {
-    export import StylePropable = __MaterialUI.Mixins.StylePropable;
-    export default StylePropable;
-}
-
-declare module 'material-ui/lib/mixins/style-resizable' {
-    export import StyleResizable = __MaterialUI.Mixins.StyleResizable;
-    export default StyleResizable;
-}
-
-declare module 'material-ui/lib/overlay' {
-    export import Overlay = __MaterialUI.Overlay;
-    export default Overlay;
-}
-
-declare module 'material-ui/lib/paper' {
-    export import Paper = __MaterialUI.Paper;
-    export default Paper;
-}
-
-declare module 'material-ui/lib/popover/popover' {
-    export import Popover = __MaterialUI.Popover.Popover;
-    export default Popover;
-}
-
-declare module 'material-ui/lib/popover/popover-default-animation' {
-    export import PopoverDefaultAnimation = __MaterialUI.Popover.PopoverDefaultAnimation;
-    export default PopoverDefaultAnimation;
-}
-
-declare module 'material-ui/lib/popover/popover-animation-from-top' {
-    export import PopoverAnimationFromTop = __MaterialUI.Popover.PopoverAnimationFromTop;
-    export default PopoverAnimationFromTop;
-}
-
-declare module 'material-ui/lib/radio-button' {
-    export import RadioButton = __MaterialUI.RadioButton;
-    export default RadioButton;
-}
-
-declare module 'material-ui/lib/radio-button-group' {
-    export import RadioButtonGroup = __MaterialUI.RadioButtonGroup;
-    export default RadioButtonGroup;
-}
-
-declare module 'material-ui/lib/raised-button' {
-    export import RaisedButton = __MaterialUI.RaisedButton;
-    export default RaisedButton;
-}
-
-declare module 'material-ui/lib/refresh-indicator' {
-    export import RefreshIndicator = __MaterialUI.RefreshIndicator;
-    export default RefreshIndicator;
-}
-
-declare module 'material-ui/lib/ripples' {
-    export import CircleRipple = __MaterialUI.Ripples.CircleRipple;
-    export import FocusRipple = __MaterialUI.Ripples.FocusRipple;
-    export import TouchRipple = __MaterialUI.Ripples.TouchRipple;
-}
-
-declare module 'material-ui/lib/select-field' {
-    export import SelectField = __MaterialUI.SelectField;
-    export default SelectField;
-}
-
-declare module 'material-ui/lib/slider' {
-    export import Slider = __MaterialUI.Slider;
-    export default Slider;
-}
-
-declare module 'material-ui/lib/svg-icon' {
-    export import SvgIcon = __MaterialUI.SvgIcon;
-    export default SvgIcon;
-}
-
-declare module 'material-ui/lib/svg-icons/action/work' {
-  export import ActionWork = __MaterialUI.SvgIcon;
-  export default ActionWork;
-}
-
-declare module 'material-ui/lib/svg-icons/action/camera-enhance' {
-  export import ActionCameraEnhance = __MaterialUI.SvgIcon;
-  export default ActionCameraEnhance;
-}
-
-declare module 'material-ui/lib/svg-icons/action/flip-to-back' {
-  export import ActionFlipToBack = __MaterialUI.SvgIcon;
-  export default ActionFlipToBack;
-}
-
-declare module 'material-ui/lib/svg-icons/action/feedback' {
-  export import ActionFeedback = __MaterialUI.SvgIcon;
-  export default ActionFeedback;
-}
-
-declare module 'material-ui/lib/svg-icons/action/assignment-turned-in' {
-  export import ActionAssignmentTurnedIn = __MaterialUI.SvgIcon;
-  export default ActionAssignmentTurnedIn;
-}
-
-declare module 'material-ui/lib/svg-icons/action/track-changes' {
-  export import ActionTrackChanges = __MaterialUI.SvgIcon;
-  export default ActionTrackChanges;
-}
-
-declare module 'material-ui/lib/svg-icons/action/view-stream' {
-  export import ActionViewStream = __MaterialUI.SvgIcon;
-  export default ActionViewStream;
-}
-
-declare module 'material-ui/lib/svg-icons/action/open-in-browser' {
-  export import ActionOpenInBrowser = __MaterialUI.SvgIcon;
-  export default ActionOpenInBrowser;
-}
-
-declare module 'material-ui/lib/svg-icons/action/view-headline' {
-  export import ActionViewHeadline = __MaterialUI.SvgIcon;
-  export default ActionViewHeadline;
-}
-
-declare module 'material-ui/lib/svg-icons/action/alarm-add' {
-  export import ActionAlarmAdd = __MaterialUI.SvgIcon;
-  export default ActionAlarmAdd;
-}
-
-declare module 'material-ui/lib/svg-icons/action/history' {
-  export import ActionHistory = __MaterialUI.SvgIcon;
-  export default ActionHistory;
-}
-
-declare module 'material-ui/lib/svg-icons/action/perm-device-information' {
-  export import ActionPermDeviceInformation = __MaterialUI.SvgIcon;
-  export default ActionPermDeviceInformation;
-}
-
-declare module 'material-ui/lib/svg-icons/action/reorder' {
-  export import ActionReorder = __MaterialUI.SvgIcon;
-  export default ActionReorder;
-}
-
-declare module 'material-ui/lib/svg-icons/action/assignment' {
-  export import ActionAssignment = __MaterialUI.SvgIcon;
-  export default ActionAssignment;
-}
-
-declare module 'material-ui/lib/svg-icons/action/shopping-cart' {
-  export import ActionShoppingCart = __MaterialUI.SvgIcon;
-  export default ActionShoppingCart;
-}
-
-declare module 'material-ui/lib/svg-icons/action/face' {
-  export import ActionFace = __MaterialUI.SvgIcon;
-  export default ActionFace;
-}
-
-declare module 'material-ui/lib/svg-icons/action/event' {
-  export import ActionEvent = __MaterialUI.SvgIcon;
-  export default ActionEvent;
-}
-
-declare module 'material-ui/lib/svg-icons/action/view-week' {
-  export import ActionViewWeek = __MaterialUI.SvgIcon;
-  export default ActionViewWeek;
-}
-
-declare module 'material-ui/lib/svg-icons/action/rounded-corner' {
-  export import ActionRoundedCorner = __MaterialUI.SvgIcon;
-  export default ActionRoundedCorner;
-}
-
-declare module 'material-ui/lib/svg-icons/action/view-carousel' {
-  export import ActionViewCarousel = __MaterialUI.SvgIcon;
-  export default ActionViewCarousel;
-}
-
-declare module 'material-ui/lib/svg-icons/action/toll' {
-  export import ActionToll = __MaterialUI.SvgIcon;
-  export default ActionToll;
-}
-
-declare module 'material-ui/lib/svg-icons/action/home' {
-  export import ActionHome = __MaterialUI.SvgIcon;
-  export default ActionHome;
-}
-
-declare module 'material-ui/lib/svg-icons/action/subject' {
-  export import ActionSubject = __MaterialUI.SvgIcon;
-  export default ActionSubject;
-}
-
-declare module 'material-ui/lib/svg-icons/action/lock' {
-  export import ActionLock = __MaterialUI.SvgIcon;
-  export default ActionLock;
-}
-
-declare module 'material-ui/lib/svg-icons/action/visibility-off' {
-  export import ActionVisibilityOff = __MaterialUI.SvgIcon;
-  export default ActionVisibilityOff;
-}
-
-declare module 'material-ui/lib/svg-icons/action/opacity' {
-  export import ActionOpacity = __MaterialUI.SvgIcon;
-  export default ActionOpacity;
-}
-
-declare module 'material-ui/lib/svg-icons/action/dns' {
-  export import ActionDns = __MaterialUI.SvgIcon;
-  export default ActionDns;
-}
-
-declare module 'material-ui/lib/svg-icons/action/open-with' {
-  export import ActionOpenWith = __MaterialUI.SvgIcon;
-  export default ActionOpenWith;
-}
-
-declare module 'material-ui/lib/svg-icons/action/system-update-alt' {
-  export import ActionSystemUpdateAlt = __MaterialUI.SvgIcon;
-  export default ActionSystemUpdateAlt;
-}
-
-declare module 'material-ui/lib/svg-icons/action/picture-in-picture-alt' {
-  export import ActionPictureInPictureAlt = __MaterialUI.SvgIcon;
-  export default ActionPictureInPictureAlt;
-}
-
-declare module 'material-ui/lib/svg-icons/action/bookmark-border' {
-  export import ActionBookmarkBorder = __MaterialUI.SvgIcon;
-  export default ActionBookmarkBorder;
-}
-
-declare module 'material-ui/lib/svg-icons/action/settings' {
-  export import ActionSettings = __MaterialUI.SvgIcon;
-  export default ActionSettings;
-}
-
-declare module 'material-ui/lib/svg-icons/action/dashboard' {
-  export import ActionDashboard = __MaterialUI.SvgIcon;
-  export default ActionDashboard;
-}
-
-declare module 'material-ui/lib/svg-icons/action/done-all' {
-  export import ActionDoneAll = __MaterialUI.SvgIcon;
-  export default ActionDoneAll;
-}
-
-declare module 'material-ui/lib/svg-icons/action/aspect-ratio' {
-  export import ActionAspectRatio = __MaterialUI.SvgIcon;
-  export default ActionAspectRatio;
-}
-
-declare module 'material-ui/lib/svg-icons/action/verified-user' {
-  export import ActionVerifiedUser = __MaterialUI.SvgIcon;
-  export default ActionVerifiedUser;
-}
-
-declare module 'material-ui/lib/svg-icons/action/update' {
-  export import ActionUpdate = __MaterialUI.SvgIcon;
-  export default ActionUpdate;
-}
-
-declare module 'material-ui/lib/svg-icons/action/query-builder' {
-  export import ActionQueryBuilder = __MaterialUI.SvgIcon;
-  export default ActionQueryBuilder;
-}
-
-declare module 'material-ui/lib/svg-icons/action/supervisor-account' {
-  export import ActionSupervisorAccount = __MaterialUI.SvgIcon;
-  export default ActionSupervisorAccount;
-}
-
-declare module 'material-ui/lib/svg-icons/action/polymer' {
-  export import ActionPolymer = __MaterialUI.SvgIcon;
-  export default ActionPolymer;
-}
-
-declare module 'material-ui/lib/svg-icons/action/accessible' {
-  export import ActionAccessible = __MaterialUI.SvgIcon;
-  export default ActionAccessible;
-}
-
-declare module 'material-ui/lib/svg-icons/action/highlight-off' {
-  export import ActionHighlightOff = __MaterialUI.SvgIcon;
-  export default ActionHighlightOff;
-}
-
-declare module 'material-ui/lib/svg-icons/action/power-settings-new' {
-  export import ActionPowerSettingsNew = __MaterialUI.SvgIcon;
-  export default ActionPowerSettingsNew;
-}
-
-declare module 'material-ui/lib/svg-icons/action/chrome-reader-mode' {
-  export import ActionChromeReaderMode = __MaterialUI.SvgIcon;
-  export default ActionChromeReaderMode;
-}
-
-declare module 'material-ui/lib/svg-icons/action/perm-camera-mic' {
-  export import ActionPermCameraMic = __MaterialUI.SvgIcon;
-  export default ActionPermCameraMic;
-}
-
-declare module 'material-ui/lib/svg-icons/action/touch-app' {
-  export import ActionTouchApp = __MaterialUI.SvgIcon;
-  export default ActionTouchApp;
-}
-
-declare module 'material-ui/lib/svg-icons/action/receipt' {
-  export import ActionReceipt = __MaterialUI.SvgIcon;
-  export default ActionReceipt;
-}
-
-declare module 'material-ui/lib/svg-icons/action/assignment-late' {
-  export import ActionAssignmentLate = __MaterialUI.SvgIcon;
-  export default ActionAssignmentLate;
-}
-
-declare module 'material-ui/lib/svg-icons/action/alarm-off' {
-  export import ActionAlarmOff = __MaterialUI.SvgIcon;
-  export default ActionAlarmOff;
-}
-
-declare module 'material-ui/lib/svg-icons/action/toc' {
-  export import ActionToc = __MaterialUI.SvgIcon;
-  export default ActionToc;
-}
-
-declare module 'material-ui/lib/svg-icons/action/settings-bluetooth' {
-  export import ActionSettingsBluetooth = __MaterialUI.SvgIcon;
-  export default ActionSettingsBluetooth;
-}
-
-declare module 'material-ui/lib/svg-icons/action/settings-brightness' {
-  export import ActionSettingsBrightness = __MaterialUI.SvgIcon;
-  export default ActionSettingsBrightness;
-}
-
-declare module 'material-ui/lib/svg-icons/action/donut-small' {
-  export import ActionDonutSmall = __MaterialUI.SvgIcon;
-  export default ActionDonutSmall;
-}
-
-declare module 'material-ui/lib/svg-icons/action/zoom-out' {
-  export import ActionZoomOut = __MaterialUI.SvgIcon;
-  export default ActionZoomOut;
-}
-
-declare module 'material-ui/lib/svg-icons/action/loyalty' {
-  export import ActionLoyalty = __MaterialUI.SvgIcon;
-  export default ActionLoyalty;
-}
-
-declare module 'material-ui/lib/svg-icons/action/search' {
-  export import ActionSearch = __MaterialUI.SvgIcon;
-  export default ActionSearch;
-}
-
-declare module 'material-ui/lib/svg-icons/action/account-balance-wallet' {
-  export import ActionAccountBalanceWallet = __MaterialUI.SvgIcon;
-  export default ActionAccountBalanceWallet;
-}
-
-declare module 'material-ui/lib/svg-icons/action/date-range' {
-  export import ActionDateRange = __MaterialUI.SvgIcon;
-  export default ActionDateRange;
-}
-
-declare module 'material-ui/lib/svg-icons/action/alarm-on' {
-  export import ActionAlarmOn = __MaterialUI.SvgIcon;
-  export default ActionAlarmOn;
-}
-
-declare module 'material-ui/lib/svg-icons/action/view-quilt' {
-  export import ActionViewQuilt = __MaterialUI.SvgIcon;
-  export default ActionViewQuilt;
-}
-
-declare module 'material-ui/lib/svg-icons/action/launch' {
-  export import ActionLaunch = __MaterialUI.SvgIcon;
-  export default ActionLaunch;
-}
-
-declare module 'material-ui/lib/svg-icons/action/visibility' {
-  export import ActionVisibility = __MaterialUI.SvgIcon;
-  export default ActionVisibility;
-}
-
-declare module 'material-ui/lib/svg-icons/action/flight-land' {
-  export import ActionFlightLand = __MaterialUI.SvgIcon;
-  export default ActionFlightLand;
-}
-
-declare module 'material-ui/lib/svg-icons/action/card-travel' {
-  export import ActionCardTravel = __MaterialUI.SvgIcon;
-  export default ActionCardTravel;
-}
-
-declare module 'material-ui/lib/svg-icons/action/get-app' {
-  export import ActionGetApp = __MaterialUI.SvgIcon;
-  export default ActionGetApp;
-}
-
-declare module 'material-ui/lib/svg-icons/action/markunread-mailbox' {
-  export import ActionMarkunreadMailbox = __MaterialUI.SvgIcon;
-  export default ActionMarkunreadMailbox;
-}
-
-declare module 'material-ui/lib/svg-icons/action/view-agenda' {
-  export import ActionViewAgenda = __MaterialUI.SvgIcon;
-  export default ActionViewAgenda;
-}
-
-declare module 'material-ui/lib/svg-icons/action/timeline' {
-  export import ActionTimeline = __MaterialUI.SvgIcon;
-  export default ActionTimeline;
-}
-
-declare module 'material-ui/lib/svg-icons/action/settings-remote' {
-  export import ActionSettingsRemote = __MaterialUI.SvgIcon;
-  export default ActionSettingsRemote;
-}
-
-declare module 'material-ui/lib/svg-icons/action/input' {
-  export import ActionInput = __MaterialUI.SvgIcon;
-  export default ActionInput;
-}
-
-declare module 'material-ui/lib/svg-icons/action/record-voice-over' {
-  export import ActionRecordVoiceOver = __MaterialUI.SvgIcon;
-  export default ActionRecordVoiceOver;
-}
-
-declare module 'material-ui/lib/svg-icons/action/backup' {
-  export import ActionBackup = __MaterialUI.SvgIcon;
-  export default ActionBackup;
-}
-
-declare module 'material-ui/lib/svg-icons/action/language' {
-  export import ActionLanguage = __MaterialUI.SvgIcon;
-  export default ActionLanguage;
-}
-
-declare module 'material-ui/lib/svg-icons/action/play-for-work' {
-  export import ActionPlayForWork = __MaterialUI.SvgIcon;
-  export default ActionPlayForWork;
-}
-
-declare module 'material-ui/lib/svg-icons/action/gif' {
-  export import ActionGif = __MaterialUI.SvgIcon;
-  export default ActionGif;
-}
-
-declare module 'material-ui/lib/svg-icons/action/theaters' {
-  export import ActionTheaters = __MaterialUI.SvgIcon;
-  export default ActionTheaters;
-}
-
-declare module 'material-ui/lib/svg-icons/action/offline-pin' {
-  export import ActionOfflinePin = __MaterialUI.SvgIcon;
-  export default ActionOfflinePin;
-}
-
-declare module 'material-ui/lib/svg-icons/action/assignment-return' {
-  export import ActionAssignmentReturn = __MaterialUI.SvgIcon;
-  export default ActionAssignmentReturn;
-}
-
-declare module 'material-ui/lib/svg-icons/action/print' {
-  export import ActionPrint = __MaterialUI.SvgIcon;
-  export default ActionPrint;
-}
-
-declare module 'material-ui/lib/svg-icons/action/settings-overscan' {
-  export import ActionSettingsOverscan = __MaterialUI.SvgIcon;
-  export default ActionSettingsOverscan;
-}
-
-declare module 'material-ui/lib/svg-icons/action/store' {
-  export import ActionStore = __MaterialUI.SvgIcon;
-  export default ActionStore;
-}
-
-declare module 'material-ui/lib/svg-icons/action/exit-to-app' {
-  export import ActionExitToApp = __MaterialUI.SvgIcon;
-  export default ActionExitToApp;
-}
-
-declare module 'material-ui/lib/svg-icons/action/account-balance' {
-  export import ActionAccountBalance = __MaterialUI.SvgIcon;
-  export default ActionAccountBalance;
-}
-
-declare module 'material-ui/lib/svg-icons/action/grade' {
-  export import ActionGrade = __MaterialUI.SvgIcon;
-  export default ActionGrade;
-}
-
-declare module 'material-ui/lib/svg-icons/action/picture-in-picture' {
-  export import ActionPictureInPicture = __MaterialUI.SvgIcon;
-  export default ActionPictureInPicture;
-}
-
-declare module 'material-ui/lib/svg-icons/action/copyright' {
-  export import ActionCopyright = __MaterialUI.SvgIcon;
-  export default ActionCopyright;
-}
-
-declare module 'material-ui/lib/svg-icons/action/donut-large' {
-  export import ActionDonutLarge = __MaterialUI.SvgIcon;
-  export default ActionDonutLarge;
-}
-
-declare module 'material-ui/lib/svg-icons/action/lock-open' {
-  export import ActionLockOpen = __MaterialUI.SvgIcon;
-  export default ActionLockOpen;
-}
-
-declare module 'material-ui/lib/svg-icons/action/perm-media' {
-  export import ActionPermMedia = __MaterialUI.SvgIcon;
-  export default ActionPermMedia;
-}
-
-declare module 'material-ui/lib/svg-icons/action/all-out' {
-  export import ActionAllOut = __MaterialUI.SvgIcon;
-  export default ActionAllOut;
-}
-
-declare module 'material-ui/lib/svg-icons/action/check-circle' {
-  export import ActionCheckCircle = __MaterialUI.SvgIcon;
-  export default ActionCheckCircle;
-}
-
-declare module 'material-ui/lib/svg-icons/action/swap-vertical-circle' {
-  export import ActionSwapVerticalCircle = __MaterialUI.SvgIcon;
-  export default ActionSwapVerticalCircle;
-}
-
-declare module 'material-ui/lib/svg-icons/action/settings-input-svideo' {
-  export import ActionSettingsInputSvideo = __MaterialUI.SvgIcon;
-  export default ActionSettingsInputSvideo;
-}
-
-declare module 'material-ui/lib/svg-icons/action/watch-later' {
-  export import ActionWatchLater = __MaterialUI.SvgIcon;
-  export default ActionWatchLater;
-}
-
-declare module 'material-ui/lib/svg-icons/action/question-answer' {
-  export import ActionQuestionAnswer = __MaterialUI.SvgIcon;
-  export default ActionQuestionAnswer;
-}
-
-declare module 'material-ui/lib/svg-icons/action/assignment-ind' {
-  export import ActionAssignmentInd = __MaterialUI.SvgIcon;
-  export default ActionAssignmentInd;
-}
-
-declare module 'material-ui/lib/svg-icons/action/code' {
-  export import ActionCode = __MaterialUI.SvgIcon;
-  export default ActionCode;
-}
-
-declare module 'material-ui/lib/svg-icons/action/turned-in-not' {
-  export import ActionTurnedInNot = __MaterialUI.SvgIcon;
-  export default ActionTurnedInNot;
-}
-
-declare module 'material-ui/lib/svg-icons/action/line-weight' {
-  export import ActionLineWeight = __MaterialUI.SvgIcon;
-  export default ActionLineWeight;
-}
-
-declare module 'material-ui/lib/svg-icons/action/restore' {
-  export import ActionRestore = __MaterialUI.SvgIcon;
-  export default ActionRestore;
-}
-
-declare module 'material-ui/lib/svg-icons/action/tab' {
-  export import ActionTab = __MaterialUI.SvgIcon;
-  export default ActionTab;
-}
-
-declare module 'material-ui/lib/svg-icons/action/open-in-new' {
-  export import ActionOpenInNew = __MaterialUI.SvgIcon;
-  export default ActionOpenInNew;
-}
-
-declare module 'material-ui/lib/svg-icons/action/turned-in' {
-  export import ActionTurnedIn = __MaterialUI.SvgIcon;
-  export default ActionTurnedIn;
-}
-
-declare module 'material-ui/lib/svg-icons/action/settings-input-hdmi' {
-  export import ActionSettingsInputHdmi = __MaterialUI.SvgIcon;
-  export default ActionSettingsInputHdmi;
-}
-
-declare module 'material-ui/lib/svg-icons/action/favorite-border' {
-  export import ActionFavoriteBorder = __MaterialUI.SvgIcon;
-  export default ActionFavoriteBorder;
-}
-
-declare module 'material-ui/lib/svg-icons/action/done' {
-  export import ActionDone = __MaterialUI.SvgIcon;
-  export default ActionDone;
-}
-
-declare module 'material-ui/lib/svg-icons/action/payment' {
-  export import ActionPayment = __MaterialUI.SvgIcon;
-  export default ActionPayment;
-}
-
-declare module 'material-ui/lib/svg-icons/action/announcement' {
-  export import ActionAnnouncement = __MaterialUI.SvgIcon;
-  export default ActionAnnouncement;
-}
-
-declare module 'material-ui/lib/svg-icons/action/find-in-page' {
-  export import ActionFindInPage = __MaterialUI.SvgIcon;
-  export default ActionFindInPage;
-}
-
-declare module 'material-ui/lib/svg-icons/action/thumbs-up-down' {
-  export import ActionThumbsUpDown = __MaterialUI.SvgIcon;
-  export default ActionThumbsUpDown;
-}
-
-declare module 'material-ui/lib/svg-icons/action/explore' {
-  export import ActionExplore = __MaterialUI.SvgIcon;
-  export default ActionExplore;
-}
-
-declare module 'material-ui/lib/svg-icons/action/today' {
-  export import ActionToday = __MaterialUI.SvgIcon;
-  export default ActionToday;
-}
-
-declare module 'material-ui/lib/svg-icons/action/settings-power' {
-  export import ActionSettingsPower = __MaterialUI.SvgIcon;
-  export default ActionSettingsPower;
-}
-
-declare module 'material-ui/lib/svg-icons/action/gavel' {
-  export import ActionGavel = __MaterialUI.SvgIcon;
-  export default ActionGavel;
-}
-
-declare module 'material-ui/lib/svg-icons/action/build' {
-  export import ActionBuild = __MaterialUI.SvgIcon;
-  export default ActionBuild;
-}
-
-declare module 'material-ui/lib/svg-icons/action/rowing' {
-  export import ActionRowing = __MaterialUI.SvgIcon;
-  export default ActionRowing;
-}
-
-declare module 'material-ui/lib/svg-icons/action/label' {
-  export import ActionLabel = __MaterialUI.SvgIcon;
-  export default ActionLabel;
-}
-
-declare module 'material-ui/lib/svg-icons/action/card-giftcard' {
-  export import ActionCardGiftcard = __MaterialUI.SvgIcon;
-  export default ActionCardGiftcard;
-}
-
-declare module 'material-ui/lib/svg-icons/action/thumb-up' {
-  export import ActionThumbUp = __MaterialUI.SvgIcon;
-  export default ActionThumbUp;
-}
-
-declare module 'material-ui/lib/svg-icons/action/shopping-basket' {
-  export import ActionShoppingBasket = __MaterialUI.SvgIcon;
-  export default ActionShoppingBasket;
-}
-
-declare module 'material-ui/lib/svg-icons/action/swap-horiz' {
-  export import ActionSwapHoriz = __MaterialUI.SvgIcon;
-  export default ActionSwapHoriz;
-}
-
-declare module 'material-ui/lib/svg-icons/action/help-outline' {
-  export import ActionHelpOutline = __MaterialUI.SvgIcon;
-  export default ActionHelpOutline;
-}
-
-declare module 'material-ui/lib/svg-icons/action/pregnant-woman' {
-  export import ActionPregnantWoman = __MaterialUI.SvgIcon;
-  export default ActionPregnantWoman;
-}
-
-declare module 'material-ui/lib/svg-icons/action/help' {
-  export import ActionHelp = __MaterialUI.SvgIcon;
-  export default ActionHelp;
-}
-
-declare module 'material-ui/lib/svg-icons/action/settings-input-antenna' {
-  export import ActionSettingsInputAntenna = __MaterialUI.SvgIcon;
-  export default ActionSettingsInputAntenna;
-}
-
-declare module 'material-ui/lib/svg-icons/action/find-replace' {
-  export import ActionFindReplace = __MaterialUI.SvgIcon;
-  export default ActionFindReplace;
-}
-
-declare module 'material-ui/lib/svg-icons/action/shop' {
-  export import ActionShop = __MaterialUI.SvgIcon;
-  export default ActionShop;
-}
-
-declare module 'material-ui/lib/svg-icons/action/change-history' {
-  export import ActionChangeHistory = __MaterialUI.SvgIcon;
-  export default ActionChangeHistory;
-}
-
-declare module 'material-ui/lib/svg-icons/action/info' {
-  export import ActionInfo = __MaterialUI.SvgIcon;
-  export default ActionInfo;
-}
-
-declare module 'material-ui/lib/svg-icons/action/trending-down' {
-  export import ActionTrendingDown = __MaterialUI.SvgIcon;
-  export default ActionTrendingDown;
-}
-
-declare module 'material-ui/lib/svg-icons/action/flight-takeoff' {
-  export import ActionFlightTakeoff = __MaterialUI.SvgIcon;
-  export default ActionFlightTakeoff;
-}
-
-declare module 'material-ui/lib/svg-icons/action/alarm' {
-  export import ActionAlarm = __MaterialUI.SvgIcon;
-  export default ActionAlarm;
-}
-
-declare module 'material-ui/lib/svg-icons/action/spellcheck' {
-  export import ActionSpellcheck = __MaterialUI.SvgIcon;
-  export default ActionSpellcheck;
-}
-
-declare module 'material-ui/lib/svg-icons/action/settings-input-component' {
-  export import ActionSettingsInputComponent = __MaterialUI.SvgIcon;
-  export default ActionSettingsInputComponent;
-}
-
-declare module 'material-ui/lib/svg-icons/action/settings-applications' {
-  export import ActionSettingsApplications = __MaterialUI.SvgIcon;
-  export default ActionSettingsApplications;
-}
-
-declare module 'material-ui/lib/svg-icons/action/room' {
-  export import ActionRoom = __MaterialUI.SvgIcon;
-  export default ActionRoom;
-}
-
-declare module 'material-ui/lib/svg-icons/action/book' {
-  export import ActionBook = __MaterialUI.SvgIcon;
-  export default ActionBook;
-}
-
-declare module 'material-ui/lib/svg-icons/action/class' {
-  export import ActionClass = __MaterialUI.SvgIcon;
-  export default ActionClass;
-}
-
-declare module 'material-ui/lib/svg-icons/action/group-work' {
-  export import ActionGroupWork = __MaterialUI.SvgIcon;
-  export default ActionGroupWork;
-}
-
-declare module 'material-ui/lib/svg-icons/action/hourglass-full' {
-  export import ActionHourglassFull = __MaterialUI.SvgIcon;
-  export default ActionHourglassFull;
-}
-
-declare module 'material-ui/lib/svg-icons/action/assessment' {
-  export import ActionAssessment = __MaterialUI.SvgIcon;
-  export default ActionAssessment;
-}
-
-declare module 'material-ui/lib/svg-icons/action/youtube-searched-for' {
-  export import ActionYoutubeSearchedFor = __MaterialUI.SvgIcon;
-  export default ActionYoutubeSearchedFor;
-}
-
-declare module 'material-ui/lib/svg-icons/action/eject' {
-  export import ActionEject = __MaterialUI.SvgIcon;
-  export default ActionEject;
-}
-
-declare module 'material-ui/lib/svg-icons/action/trending-up' {
-  export import ActionTrendingUp = __MaterialUI.SvgIcon;
-  export default ActionTrendingUp;
-}
-
-declare module 'material-ui/lib/svg-icons/action/http' {
-  export import ActionHttp = __MaterialUI.SvgIcon;
-  export default ActionHttp;
-}
-
-declare module 'material-ui/lib/svg-icons/action/stars' {
-  export import ActionStars = __MaterialUI.SvgIcon;
-  export default ActionStars;
-}
-
-declare module 'material-ui/lib/svg-icons/action/autorenew' {
-  export import ActionAutorenew = __MaterialUI.SvgIcon;
-  export default ActionAutorenew;
-}
-
-declare module 'material-ui/lib/svg-icons/action/settings-ethernet' {
-  export import ActionSettingsEthernet = __MaterialUI.SvgIcon;
-  export default ActionSettingsEthernet;
-}
-
-declare module 'material-ui/lib/svg-icons/action/label-outline' {
-  export import ActionLabelOutline = __MaterialUI.SvgIcon;
-  export default ActionLabelOutline;
-}
-
-declare module 'material-ui/lib/svg-icons/action/settings-phone' {
-  export import ActionSettingsPhone = __MaterialUI.SvgIcon;
-  export default ActionSettingsPhone;
-}
-
-declare module 'material-ui/lib/svg-icons/action/info-outline' {
-  export import ActionInfoOutline = __MaterialUI.SvgIcon;
-  export default ActionInfoOutline;
-}
-
-declare module 'material-ui/lib/svg-icons/action/lock-outline' {
-  export import ActionLockOutline = __MaterialUI.SvgIcon;
-  export default ActionLockOutline;
-}
-
-declare module 'material-ui/lib/svg-icons/action/settings-input-composite' {
-  export import ActionSettingsInputComposite = __MaterialUI.SvgIcon;
-  export default ActionSettingsInputComposite;
-}
-
-declare module 'material-ui/lib/svg-icons/action/invert-colors' {
-  export import ActionInvertColors = __MaterialUI.SvgIcon;
-  export default ActionInvertColors;
-}
-
-declare module 'material-ui/lib/svg-icons/action/bookmark' {
-  export import ActionBookmark = __MaterialUI.SvgIcon;
-  export default ActionBookmark;
-}
-
-declare module 'material-ui/lib/svg-icons/action/add-shopping-cart' {
-  export import ActionAddShoppingCart = __MaterialUI.SvgIcon;
-  export default ActionAddShoppingCart;
-}
-
-declare module 'material-ui/lib/svg-icons/action/bug-report' {
-  export import ActionBugReport = __MaterialUI.SvgIcon;
-  export default ActionBugReport;
-}
-
-declare module 'material-ui/lib/svg-icons/action/cached' {
-  export import ActionCached = __MaterialUI.SvgIcon;
-  export default ActionCached;
-}
-
-declare module 'material-ui/lib/svg-icons/action/view-day' {
-  export import ActionViewDay = __MaterialUI.SvgIcon;
-  export default ActionViewDay;
-}
-
-declare module 'material-ui/lib/svg-icons/action/fingerprint' {
-  export import ActionFingerprint = __MaterialUI.SvgIcon;
-  export default ActionFingerprint;
-}
-
-declare module 'material-ui/lib/svg-icons/action/accessibility' {
-  export import ActionAccessibility = __MaterialUI.SvgIcon;
-  export default ActionAccessibility;
-}
-
-declare module 'material-ui/lib/svg-icons/action/perm-data-setting' {
-  export import ActionPermDataSetting = __MaterialUI.SvgIcon;
-  export default ActionPermDataSetting;
-}
-
-declare module 'material-ui/lib/svg-icons/action/settings-backup-restore' {
-  export import ActionSettingsBackupRestore = __MaterialUI.SvgIcon;
-  export default ActionSettingsBackupRestore;
-}
-
-declare module 'material-ui/lib/svg-icons/action/zoom-in' {
-  export import ActionZoomIn = __MaterialUI.SvgIcon;
-  export default ActionZoomIn;
-}
-
-declare module 'material-ui/lib/svg-icons/action/perm-identity' {
-  export import ActionPermIdentity = __MaterialUI.SvgIcon;
-  export default ActionPermIdentity;
-}
-
-declare module 'material-ui/lib/svg-icons/action/favorite' {
-  export import ActionFavorite = __MaterialUI.SvgIcon;
-  export default ActionFavorite;
-}
-
-declare module 'material-ui/lib/svg-icons/action/thumb-down' {
-  export import ActionThumbDown = __MaterialUI.SvgIcon;
-  export default ActionThumbDown;
-}
-
-declare module 'material-ui/lib/svg-icons/action/assignment-returned' {
-  export import ActionAssignmentReturned = __MaterialUI.SvgIcon;
-  export default ActionAssignmentReturned;
-}
-
-declare module 'material-ui/lib/svg-icons/action/account-box' {
-  export import ActionAccountBox = __MaterialUI.SvgIcon;
-  export default ActionAccountBox;
-}
-
-declare module 'material-ui/lib/svg-icons/action/extension' {
-  export import ActionExtension = __MaterialUI.SvgIcon;
-  export default ActionExtension;
-}
-
-declare module 'material-ui/lib/svg-icons/action/pageview' {
-  export import ActionPageview = __MaterialUI.SvgIcon;
-  export default ActionPageview;
-}
-
-declare module 'material-ui/lib/svg-icons/action/https' {
-  export import ActionHttps = __MaterialUI.SvgIcon;
-  export default ActionHttps;
-}
-
-declare module 'material-ui/lib/svg-icons/action/translate' {
-  export import ActionTranslate = __MaterialUI.SvgIcon;
-  export default ActionTranslate;
-}
-
-declare module 'material-ui/lib/svg-icons/action/three-d-rotation' {
-  export import ActionThreeDRotation = __MaterialUI.SvgIcon;
-  export default ActionThreeDRotation;
-}
-
-declare module 'material-ui/lib/svg-icons/action/tab-unselected' {
-  export import ActionTabUnselected = __MaterialUI.SvgIcon;
-  export default ActionTabUnselected;
-}
-
-declare module 'material-ui/lib/svg-icons/action/description' {
-  export import ActionDescription = __MaterialUI.SvgIcon;
-  export default ActionDescription;
-}
-
-declare module 'material-ui/lib/svg-icons/action/note-add' {
-  export import ActionNoteAdd = __MaterialUI.SvgIcon;
-  export default ActionNoteAdd;
-}
-
-declare module 'material-ui/lib/svg-icons/action/perm-scan-wifi' {
-  export import ActionPermScanWifi = __MaterialUI.SvgIcon;
-  export default ActionPermScanWifi;
-}
-
-declare module 'material-ui/lib/svg-icons/action/pets' {
-  export import ActionPets = __MaterialUI.SvgIcon;
-  export default ActionPets;
-}
-
-declare module 'material-ui/lib/svg-icons/action/view-array' {
-  export import ActionViewArray = __MaterialUI.SvgIcon;
-  export default ActionViewArray;
-}
-
-declare module 'material-ui/lib/svg-icons/action/shop-two' {
-  export import ActionShopTwo = __MaterialUI.SvgIcon;
-  export default ActionShopTwo;
-}
-
-declare module 'material-ui/lib/svg-icons/action/line-style' {
-  export import ActionLineStyle = __MaterialUI.SvgIcon;
-  export default ActionLineStyle;
-}
-
-declare module 'material-ui/lib/svg-icons/action/lightbulb-outline' {
-  export import ActionLightbulbOutline = __MaterialUI.SvgIcon;
-  export default ActionLightbulbOutline;
-}
-
-declare module 'material-ui/lib/svg-icons/action/report-problem' {
-  export import ActionReportProblem = __MaterialUI.SvgIcon;
-  export default ActionReportProblem;
-}
-
-declare module 'material-ui/lib/svg-icons/action/swap-vert' {
-  export import ActionSwapVert = __MaterialUI.SvgIcon;
-  export default ActionSwapVert;
-}
-
-declare module 'material-ui/lib/svg-icons/action/list' {
-  export import ActionList = __MaterialUI.SvgIcon;
-  export default ActionList;
-}
-
-declare module 'material-ui/lib/svg-icons/action/settings-voice' {
-  export import ActionSettingsVoice = __MaterialUI.SvgIcon;
-  export default ActionSettingsVoice;
-}
-
-declare module 'material-ui/lib/svg-icons/action/view-list' {
-  export import ActionViewList = __MaterialUI.SvgIcon;
-  export default ActionViewList;
-}
-
-declare module 'material-ui/lib/svg-icons/action/pan-tool' {
-  export import ActionPanTool = __MaterialUI.SvgIcon;
-  export default ActionPanTool;
-}
-
-declare module 'material-ui/lib/svg-icons/action/important-devices' {
-  export import ActionImportantDevices = __MaterialUI.SvgIcon;
-  export default ActionImportantDevices;
-}
-
-declare module 'material-ui/lib/svg-icons/action/redeem' {
-  export import ActionRedeem = __MaterialUI.SvgIcon;
-  export default ActionRedeem;
-}
-
-declare module 'material-ui/lib/svg-icons/action/flip-to-front' {
-  export import ActionFlipToFront = __MaterialUI.SvgIcon;
-  export default ActionFlipToFront;
-}
-
-declare module 'material-ui/lib/svg-icons/action/android' {
-  export import ActionAndroid = __MaterialUI.SvgIcon;
-  export default ActionAndroid;
-}
-
-declare module 'material-ui/lib/svg-icons/action/account-circle' {
-  export import ActionAccountCircle = __MaterialUI.SvgIcon;
-  export default ActionAccountCircle;
-}
-
-declare module 'material-ui/lib/svg-icons/action/event-seat' {
-  export import ActionEventSeat = __MaterialUI.SvgIcon;
-  export default ActionEventSeat;
-}
-
-declare module 'material-ui/lib/svg-icons/action/perm-contact-calendar' {
-  export import ActionPermContactCalendar = __MaterialUI.SvgIcon;
-  export default ActionPermContactCalendar;
-}
-
-declare module 'material-ui/lib/svg-icons/action/perm-phone-msg' {
-  export import ActionPermPhoneMsg = __MaterialUI.SvgIcon;
-  export default ActionPermPhoneMsg;
-}
-
-declare module 'material-ui/lib/svg-icons/action/delete' {
-  export import ActionDelete = __MaterialUI.SvgIcon;
-  export default ActionDelete;
-}
-
-declare module 'material-ui/lib/svg-icons/action/card-membership' {
-  export import ActionCardMembership = __MaterialUI.SvgIcon;
-  export default ActionCardMembership;
-}
-
-declare module 'material-ui/lib/svg-icons/action/hourglass-empty' {
-  export import ActionHourglassEmpty = __MaterialUI.SvgIcon;
-  export default ActionHourglassEmpty;
-}
-
-declare module 'material-ui/lib/svg-icons/action/schedule' {
-  export import ActionSchedule = __MaterialUI.SvgIcon;
-  export default ActionSchedule;
-}
-
-declare module 'material-ui/lib/svg-icons/action/trending-flat' {
-  export import ActionTrendingFlat = __MaterialUI.SvgIcon;
-  export default ActionTrendingFlat;
-}
-
-declare module 'material-ui/lib/svg-icons/action/motorcycle' {
-  export import ActionMotorcycle = __MaterialUI.SvgIcon;
-  export default ActionMotorcycle;
-}
-
-declare module 'material-ui/lib/svg-icons/action/view-column' {
-  export import ActionViewColumn = __MaterialUI.SvgIcon;
-  export default ActionViewColumn;
-}
-
-declare module 'material-ui/lib/svg-icons/action/settings-cell' {
-  export import ActionSettingsCell = __MaterialUI.SvgIcon;
-  export default ActionSettingsCell;
-}
-
-declare module 'material-ui/lib/svg-icons/action/credit-card' {
-  export import ActionCreditCard = __MaterialUI.SvgIcon;
-  export default ActionCreditCard;
-}
-
-declare module 'material-ui/lib/svg-icons/action/view-module' {
-  export import ActionViewModule = __MaterialUI.SvgIcon;
-  export default ActionViewModule;
-}
-
-declare module 'material-ui/lib/svg-icons/action/compare-arrows' {
-  export import ActionCompareArrows = __MaterialUI.SvgIcon;
-  export default ActionCompareArrows;
-}
-
-declare module 'material-ui/lib/svg-icons/action/speaker-notes' {
-  export import ActionSpeakerNotes = __MaterialUI.SvgIcon;
-  export default ActionSpeakerNotes;
-}
-
-declare module 'material-ui/lib/svg-icons/social/person' {
-  export import SocialPerson = __MaterialUI.SvgIcon;
-  export default SocialPerson;
-}
-
-declare module 'material-ui/lib/svg-icons/social/notifications-none' {
-  export import SocialNotificationsNone = __MaterialUI.SvgIcon;
-  export default SocialNotificationsNone;
-}
-
-declare module 'material-ui/lib/svg-icons/social/domain' {
-  export import SocialDomain = __MaterialUI.SvgIcon;
-  export default SocialDomain;
-}
-
-declare module 'material-ui/lib/svg-icons/social/notifications-paused' {
-  export import SocialNotificationsPaused = __MaterialUI.SvgIcon;
-  export default SocialNotificationsPaused;
-}
-
-declare module 'material-ui/lib/svg-icons/social/person-outline' {
-  export import SocialPersonOutline = __MaterialUI.SvgIcon;
-  export default SocialPersonOutline;
-}
-
-declare module 'material-ui/lib/svg-icons/social/plus-one' {
-  export import SocialPlusOne = __MaterialUI.SvgIcon;
-  export default SocialPlusOne;
-}
-
-declare module 'material-ui/lib/svg-icons/social/notifications-active' {
-  export import SocialNotificationsActive = __MaterialUI.SvgIcon;
-  export default SocialNotificationsActive;
-}
-
-declare module 'material-ui/lib/svg-icons/social/share' {
-  export import SocialShare = __MaterialUI.SvgIcon;
-  export default SocialShare;
-}
-
-declare module 'material-ui/lib/svg-icons/social/whatshot' {
-  export import SocialWhatshot = __MaterialUI.SvgIcon;
-  export default SocialWhatshot;
-}
-
-declare module 'material-ui/lib/svg-icons/social/poll' {
-  export import SocialPoll = __MaterialUI.SvgIcon;
-  export default SocialPoll;
-}
-
-declare module 'material-ui/lib/svg-icons/social/pages' {
-  export import SocialPages = __MaterialUI.SvgIcon;
-  export default SocialPages;
-}
-
-declare module 'material-ui/lib/svg-icons/social/notifications-off' {
-  export import SocialNotificationsOff = __MaterialUI.SvgIcon;
-  export default SocialNotificationsOff;
-}
-
-declare module 'material-ui/lib/svg-icons/social/notifications' {
-  export import SocialNotifications = __MaterialUI.SvgIcon;
-  export default SocialNotifications;
-}
-
-declare module 'material-ui/lib/svg-icons/social/school' {
-  export import SocialSchool = __MaterialUI.SvgIcon;
-  export default SocialSchool;
-}
-
-declare module 'material-ui/lib/svg-icons/social/cake' {
-  export import SocialCake = __MaterialUI.SvgIcon;
-  export default SocialCake;
-}
-
-declare module 'material-ui/lib/svg-icons/social/people-outline' {
-  export import SocialPeopleOutline = __MaterialUI.SvgIcon;
-  export default SocialPeopleOutline;
-}
-
-declare module 'material-ui/lib/svg-icons/social/location-city' {
-  export import SocialLocationCity = __MaterialUI.SvgIcon;
-  export default SocialLocationCity;
-}
-
-declare module 'material-ui/lib/svg-icons/social/public' {
-  export import SocialPublic = __MaterialUI.SvgIcon;
-  export default SocialPublic;
-}
-
-declare module 'material-ui/lib/svg-icons/social/mood-bad' {
-  export import SocialMoodBad = __MaterialUI.SvgIcon;
-  export default SocialMoodBad;
-}
-
-declare module 'material-ui/lib/svg-icons/social/people' {
-  export import SocialPeople = __MaterialUI.SvgIcon;
-  export default SocialPeople;
-}
-
-declare module 'material-ui/lib/svg-icons/social/mood' {
-  export import SocialMood = __MaterialUI.SvgIcon;
-  export default SocialMood;
-}
-
-declare module 'material-ui/lib/svg-icons/social/party-mode' {
-  export import SocialPartyMode = __MaterialUI.SvgIcon;
-  export default SocialPartyMode;
-}
-
-declare module 'material-ui/lib/svg-icons/social/group' {
-  export import SocialGroup = __MaterialUI.SvgIcon;
-  export default SocialGroup;
-}
-
-declare module 'material-ui/lib/svg-icons/social/person-add' {
-  export import SocialPersonAdd = __MaterialUI.SvgIcon;
-  export default SocialPersonAdd;
-}
-
-declare module 'material-ui/lib/svg-icons/social/group-add' {
-  export import SocialGroupAdd = __MaterialUI.SvgIcon;
-  export default SocialGroupAdd;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/edit-location' {
-  export import MapsEditLocation = __MaterialUI.SvgIcon;
-  export default MapsEditLocation;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-airport' {
-  export import MapsLocalAirport = __MaterialUI.SvgIcon;
-  export default MapsLocalAirport;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-phone' {
-  export import MapsLocalPhone = __MaterialUI.SvgIcon;
-  export default MapsLocalPhone;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/directions-car' {
-  export import MapsDirectionsCar = __MaterialUI.SvgIcon;
-  export default MapsDirectionsCar;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-drink' {
-  export import MapsLocalDrink = __MaterialUI.SvgIcon;
-  export default MapsLocalDrink;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-gas-station' {
-  export import MapsLocalGasStation = __MaterialUI.SvgIcon;
-  export default MapsLocalGasStation;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/store-mall-directory' {
-  export import MapsStoreMallDirectory = __MaterialUI.SvgIcon;
-  export default MapsStoreMallDirectory;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/add-location' {
-  export import MapsAddLocation = __MaterialUI.SvgIcon;
-  export default MapsAddLocation;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-laundry-service' {
-  export import MapsLocalLaundryService = __MaterialUI.SvgIcon;
-  export default MapsLocalLaundryService;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-hotel' {
-  export import MapsLocalHotel = __MaterialUI.SvgIcon;
-  export default MapsLocalHotel;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-pizza' {
-  export import MapsLocalPizza = __MaterialUI.SvgIcon;
-  export default MapsLocalPizza;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/person-pin-circle' {
-  export import MapsPersonPinCircle = __MaterialUI.SvgIcon;
-  export default MapsPersonPinCircle;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/terrain' {
-  export import MapsTerrain = __MaterialUI.SvgIcon;
-  export default MapsTerrain;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/directions-subway' {
-  export import MapsDirectionsSubway = __MaterialUI.SvgIcon;
-  export default MapsDirectionsSubway;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-bar' {
-  export import MapsLocalBar = __MaterialUI.SvgIcon;
-  export default MapsLocalBar;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-car-wash' {
-  export import MapsLocalCarWash = __MaterialUI.SvgIcon;
-  export default MapsLocalCarWash;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/restaurant-menu' {
-  export import MapsRestaurantMenu = __MaterialUI.SvgIcon;
-  export default MapsRestaurantMenu;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/near-me' {
-  export import MapsNearMe = __MaterialUI.SvgIcon;
-  export default MapsNearMe;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/directions' {
-  export import MapsDirections = __MaterialUI.SvgIcon;
-  export default MapsDirections;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/my-location' {
-  export import MapsMyLocation = __MaterialUI.SvgIcon;
-  export default MapsMyLocation;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-convenience-store' {
-  export import MapsLocalConvenienceStore = __MaterialUI.SvgIcon;
-  export default MapsLocalConvenienceStore;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-offer' {
-  export import MapsLocalOffer = __MaterialUI.SvgIcon;
-  export default MapsLocalOffer;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-florist' {
-  export import MapsLocalFlorist = __MaterialUI.SvgIcon;
-  export default MapsLocalFlorist;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-shipping' {
-  export import MapsLocalShipping = __MaterialUI.SvgIcon;
-  export default MapsLocalShipping;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-taxi' {
-  export import MapsLocalTaxi = __MaterialUI.SvgIcon;
-  export default MapsLocalTaxi;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/directions-walk' {
-  export import MapsDirectionsWalk = __MaterialUI.SvgIcon;
-  export default MapsDirectionsWalk;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-hospital' {
-  export import MapsLocalHospital = __MaterialUI.SvgIcon;
-  export default MapsLocalHospital;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/layers' {
-  export import MapsLayers = __MaterialUI.SvgIcon;
-  export default MapsLayers;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/directions-run' {
-  export import MapsDirectionsRun = __MaterialUI.SvgIcon;
-  export default MapsDirectionsRun;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/rate-review' {
-  export import MapsRateReview = __MaterialUI.SvgIcon;
-  export default MapsRateReview;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-dining' {
-  export import MapsLocalDining = __MaterialUI.SvgIcon;
-  export default MapsLocalDining;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-post-office' {
-  export import MapsLocalPostOffice = __MaterialUI.SvgIcon;
-  export default MapsLocalPostOffice;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/pin-drop' {
-  export import MapsPinDrop = __MaterialUI.SvgIcon;
-  export default MapsPinDrop;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/directions-boat' {
-  export import MapsDirectionsBoat = __MaterialUI.SvgIcon;
-  export default MapsDirectionsBoat;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-see' {
-  export import MapsLocalSee = __MaterialUI.SvgIcon;
-  export default MapsLocalSee;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/map' {
-  export import MapsMap = __MaterialUI.SvgIcon;
-  export default MapsMap;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/flight' {
-  export import MapsFlight = __MaterialUI.SvgIcon;
-  export default MapsFlight;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/person-pin' {
-  export import MapsPersonPin = __MaterialUI.SvgIcon;
-  export default MapsPersonPin;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/satellite' {
-  export import MapsSatellite = __MaterialUI.SvgIcon;
-  export default MapsSatellite;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-printshop' {
-  export import MapsLocalPrintshop = __MaterialUI.SvgIcon;
-  export default MapsLocalPrintshop;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/navigation' {
-  export import MapsNavigation = __MaterialUI.SvgIcon;
-  export default MapsNavigation;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/directions-railway' {
-  export import MapsDirectionsRailway = __MaterialUI.SvgIcon;
-  export default MapsDirectionsRailway;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-atm' {
-  export import MapsLocalAtm = __MaterialUI.SvgIcon;
-  export default MapsLocalAtm;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/directions-transit' {
-  export import MapsDirectionsTransit = __MaterialUI.SvgIcon;
-  export default MapsDirectionsTransit;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-parking' {
-  export import MapsLocalParking = __MaterialUI.SvgIcon;
-  export default MapsLocalParking;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-cafe' {
-  export import MapsLocalCafe = __MaterialUI.SvgIcon;
-  export default MapsLocalCafe;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-mall' {
-  export import MapsLocalMall = __MaterialUI.SvgIcon;
-  export default MapsLocalMall;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/zoom-out-map' {
-  export import MapsZoomOutMap = __MaterialUI.SvgIcon;
-  export default MapsZoomOutMap;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-activity' {
-  export import MapsLocalActivity = __MaterialUI.SvgIcon;
-  export default MapsLocalActivity;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-grocery-store' {
-  export import MapsLocalGroceryStore = __MaterialUI.SvgIcon;
-  export default MapsLocalGroceryStore;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-pharmacy' {
-  export import MapsLocalPharmacy = __MaterialUI.SvgIcon;
-  export default MapsLocalPharmacy;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-movies' {
-  export import MapsLocalMovies = __MaterialUI.SvgIcon;
-  export default MapsLocalMovies;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/place' {
-  export import MapsPlace = __MaterialUI.SvgIcon;
-  export default MapsPlace;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/layers-clear' {
-  export import MapsLayersClear = __MaterialUI.SvgIcon;
-  export default MapsLayersClear;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/hotel' {
-  export import MapsHotel = __MaterialUI.SvgIcon;
-  export default MapsHotel;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/directions-bike' {
-  export import MapsDirectionsBike = __MaterialUI.SvgIcon;
-  export default MapsDirectionsBike;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-library' {
-  export import MapsLocalLibrary = __MaterialUI.SvgIcon;
-  export default MapsLocalLibrary;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/local-play' {
-  export import MapsLocalPlay = __MaterialUI.SvgIcon;
-  export default MapsLocalPlay;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/directions-bus' {
-  export import MapsDirectionsBus = __MaterialUI.SvgIcon;
-  export default MapsDirectionsBus;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/traffic' {
-  export import MapsTraffic = __MaterialUI.SvgIcon;
-  export default MapsTraffic;
-}
-
-declare module 'material-ui/lib/svg-icons/maps/beenhere' {
-  export import MapsBeenhere = __MaterialUI.SvgIcon;
-  export default MapsBeenhere;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/call-received' {
-  export import CommunicationCallReceived = __MaterialUI.SvgIcon;
-  export default CommunicationCallReceived;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/dialpad' {
-  export import CommunicationDialpad = __MaterialUI.SvgIcon;
-  export default CommunicationDialpad;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/forum' {
-  export import CommunicationForum = __MaterialUI.SvgIcon;
-  export default CommunicationForum;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/no-sim' {
-  export import CommunicationNoSim = __MaterialUI.SvgIcon;
-  export default CommunicationNoSim;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/chat' {
-  export import CommunicationChat = __MaterialUI.SvgIcon;
-  export default CommunicationChat;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/stay-primary-landscape' {
-  export import CommunicationStayPrimaryLandscape = __MaterialUI.SvgIcon;
-  export default CommunicationStayPrimaryLandscape;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/phonelink-setup' {
-  export import CommunicationPhonelinkSetup = __MaterialUI.SvgIcon;
-  export default CommunicationPhonelinkSetup;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/ring-volume' {
-  export import CommunicationRingVolume = __MaterialUI.SvgIcon;
-  export default CommunicationRingVolume;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/phonelink-lock' {
-  export import CommunicationPhonelinkLock = __MaterialUI.SvgIcon;
-  export default CommunicationPhonelinkLock;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/contacts' {
-  export import CommunicationContacts = __MaterialUI.SvgIcon;
-  export default CommunicationContacts;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/call-missed' {
-  export import CommunicationCallMissed = __MaterialUI.SvgIcon;
-  export default CommunicationCallMissed;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/contact-mail' {
-  export import CommunicationContactMail = __MaterialUI.SvgIcon;
-  export default CommunicationContactMail;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/portable-wifi-off' {
-  export import CommunicationPortableWifiOff = __MaterialUI.SvgIcon;
-  export default CommunicationPortableWifiOff;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/call-merge' {
-  export import CommunicationCallMerge = __MaterialUI.SvgIcon;
-  export default CommunicationCallMerge;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/tact-mail' {
-  export import CommunicationTactMail = __MaterialUI.SvgIcon;
-  export default CommunicationTactMail;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/stop-screen-share' {
-  export import CommunicationStopScreenShare = __MaterialUI.SvgIcon;
-  export default CommunicationStopScreenShare;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/vpn-key' {
-  export import CommunicationVpnKey = __MaterialUI.SvgIcon;
-  export default CommunicationVpnKey;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/swap-calls' {
-  export import CommunicationSwapCalls = __MaterialUI.SvgIcon;
-  export default CommunicationSwapCalls;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/dialer-sip' {
-  export import CommunicationDialerSip = __MaterialUI.SvgIcon;
-  export default CommunicationDialerSip;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/business' {
-  export import CommunicationBusiness = __MaterialUI.SvgIcon;
-  export default CommunicationBusiness;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/phonelink-erase' {
-  export import CommunicationPhonelinkErase = __MaterialUI.SvgIcon;
-  export default CommunicationPhonelinkErase;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/call' {
-  export import CommunicationCall = __MaterialUI.SvgIcon;
-  export default CommunicationCall;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/screen-share' {
-  export import CommunicationScreenShare = __MaterialUI.SvgIcon;
-  export default CommunicationScreenShare;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/clear-all' {
-  export import CommunicationClearAll = __MaterialUI.SvgIcon;
-  export default CommunicationClearAll;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/chat-bubble-outline' {
-  export import CommunicationChatBubbleOutline = __MaterialUI.SvgIcon;
-  export default CommunicationChatBubbleOutline;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/call-missed-outgoing' {
-  export import CommunicationCallMissedOutgoing = __MaterialUI.SvgIcon;
-  export default CommunicationCallMissedOutgoing;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/stay-primary-portrait' {
-  export import CommunicationStayPrimaryPortrait = __MaterialUI.SvgIcon;
-  export default CommunicationStayPrimaryPortrait;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/stay-current-portrait' {
-  export import CommunicationStayCurrentPortrait = __MaterialUI.SvgIcon;
-  export default CommunicationStayCurrentPortrait;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/voicemail' {
-  export import CommunicationVoicemail = __MaterialUI.SvgIcon;
-  export default CommunicationVoicemail;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/speaker-phone' {
-  export import CommunicationSpeakerPhone = __MaterialUI.SvgIcon;
-  export default CommunicationSpeakerPhone;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/call-split' {
-  export import CommunicationCallSplit = __MaterialUI.SvgIcon;
-  export default CommunicationCallSplit;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/live-help' {
-  export import CommunicationLiveHelp = __MaterialUI.SvgIcon;
-  export default CommunicationLiveHelp;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/call-made' {
-  export import CommunicationCallMade = __MaterialUI.SvgIcon;
-  export default CommunicationCallMade;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/phone' {
-  export import CommunicationPhone = __MaterialUI.SvgIcon;
-  export default CommunicationPhone;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/textsms' {
-  export import CommunicationTextsms = __MaterialUI.SvgIcon;
-  export default CommunicationTextsms;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/message' {
-  export import CommunicationMessage = __MaterialUI.SvgIcon;
-  export default CommunicationMessage;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/import-export' {
-  export import CommunicationImportExport = __MaterialUI.SvgIcon;
-  export default CommunicationImportExport;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/import-contacts' {
-  export import CommunicationImportContacts = __MaterialUI.SvgIcon;
-  export default CommunicationImportContacts;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/phonelink-ring' {
-  export import CommunicationPhonelinkRing = __MaterialUI.SvgIcon;
-  export default CommunicationPhonelinkRing;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/present-to-all' {
-  export import CommunicationPresentToAll = __MaterialUI.SvgIcon;
-  export default CommunicationPresentToAll;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/contact-phone' {
-  export import CommunicationContactPhone = __MaterialUI.SvgIcon;
-  export default CommunicationContactPhone;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/invert-colors-off' {
-  export import CommunicationInvertColorsOff = __MaterialUI.SvgIcon;
-  export default CommunicationInvertColorsOff;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/comment' {
-  export import CommunicationComment = __MaterialUI.SvgIcon;
-  export default CommunicationComment;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/chat-bubble' {
-  export import CommunicationChatBubble = __MaterialUI.SvgIcon;
-  export default CommunicationChatBubble;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/mail-outline' {
-  export import CommunicationMailOutline = __MaterialUI.SvgIcon;
-  export default CommunicationMailOutline;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/location-on' {
-  export import CommunicationLocationOn = __MaterialUI.SvgIcon;
-  export default CommunicationLocationOn;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/stay-current-landscape' {
-  export import CommunicationStayCurrentLandscape = __MaterialUI.SvgIcon;
-  export default CommunicationStayCurrentLandscape;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/location-off' {
-  export import CommunicationLocationOff = __MaterialUI.SvgIcon;
-  export default CommunicationLocationOff;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/email' {
-  export import CommunicationEmail = __MaterialUI.SvgIcon;
-  export default CommunicationEmail;
-}
-
-declare module 'material-ui/lib/svg-icons/communication/call-end' {
-  export import CommunicationCallEnd = __MaterialUI.SvgIcon;
-  export default CommunicationCallEnd;
-}
-
-declare module 'material-ui/lib/svg-icons/toggle/check-box' {
-  export import ToggleCheckBox = __MaterialUI.SvgIcon;
-  export default ToggleCheckBox;
-}
-
-declare module 'material-ui/lib/svg-icons/toggle/star-half' {
-  export import ToggleStarHalf = __MaterialUI.SvgIcon;
-  export default ToggleStarHalf;
-}
-
-declare module 'material-ui/lib/svg-icons/toggle/check-box-outline-blank' {
-  export import ToggleCheckBoxOutlineBlank = __MaterialUI.SvgIcon;
-  export default ToggleCheckBoxOutlineBlank;
-}
-
-declare module 'material-ui/lib/svg-icons/toggle/star' {
-  export import ToggleStar = __MaterialUI.SvgIcon;
-  export default ToggleStar;
-}
-
-declare module 'material-ui/lib/svg-icons/toggle/star-border' {
-  export import ToggleStarBorder = __MaterialUI.SvgIcon;
-  export default ToggleStarBorder;
-}
-
-declare module 'material-ui/lib/svg-icons/toggle/radio-button-unchecked' {
-  export import ToggleRadioButtonUnchecked = __MaterialUI.SvgIcon;
-  export default ToggleRadioButtonUnchecked;
-}
-
-declare module 'material-ui/lib/svg-icons/toggle/indeterminate-check-box' {
-  export import ToggleIndeterminateCheckBox = __MaterialUI.SvgIcon;
-  export default ToggleIndeterminateCheckBox;
-}
-
-declare module 'material-ui/lib/svg-icons/toggle/radio-button-checked' {
-  export import ToggleRadioButtonChecked = __MaterialUI.SvgIcon;
-  export default ToggleRadioButtonChecked;
-}
-
-declare module 'material-ui/lib/svg-icons/index' {
-  export import Index = __MaterialUI.SvgIcon;
-  export default Index;
-}
-
-declare module 'material-ui/lib/svg-icons/index-generator' {
-  export import IndexGenerator = __MaterialUI.SvgIcon;
-  export default IndexGenerator;
-}
-
-declare module 'material-ui/lib/svg-icons/alert/warning' {
-  export import AlertWarning = __MaterialUI.SvgIcon;
-  export default AlertWarning;
-}
-
-declare module 'material-ui/lib/svg-icons/alert/add-alert' {
-  export import AlertAddAlert = __MaterialUI.SvgIcon;
-  export default AlertAddAlert;
-}
-
-declare module 'material-ui/lib/svg-icons/alert/error-outline' {
-  export import AlertErrorOutline = __MaterialUI.SvgIcon;
-  export default AlertErrorOutline;
-}
-
-declare module 'material-ui/lib/svg-icons/alert/error' {
-  export import AlertError = __MaterialUI.SvgIcon;
-  export default AlertError;
-}
-
-declare module 'material-ui/lib/svg-icons/file/file-upload' {
-  export import FileFileUpload = __MaterialUI.SvgIcon;
-  export default FileFileUpload;
-}
-
-declare module 'material-ui/lib/svg-icons/file/cloud-upload' {
-  export import FileCloudUpload = __MaterialUI.SvgIcon;
-  export default FileCloudUpload;
-}
-
-declare module 'material-ui/lib/svg-icons/file/cloud-done' {
-  export import FileCloudDone = __MaterialUI.SvgIcon;
-  export default FileCloudDone;
-}
-
-declare module 'material-ui/lib/svg-icons/file/folder-open' {
-  export import FileFolderOpen = __MaterialUI.SvgIcon;
-  export default FileFolderOpen;
-}
-
-declare module 'material-ui/lib/svg-icons/file/cloud-off' {
-  export import FileCloudOff = __MaterialUI.SvgIcon;
-  export default FileCloudOff;
-}
-
-declare module 'material-ui/lib/svg-icons/file/cloud-queue' {
-  export import FileCloudQueue = __MaterialUI.SvgIcon;
-  export default FileCloudQueue;
-}
-
-declare module 'material-ui/lib/svg-icons/file/folder-shared' {
-  export import FileFolderShared = __MaterialUI.SvgIcon;
-  export default FileFolderShared;
-}
-
-declare module 'material-ui/lib/svg-icons/file/cloud-circle' {
-  export import FileCloudCircle = __MaterialUI.SvgIcon;
-  export default FileCloudCircle;
-}
-
-declare module 'material-ui/lib/svg-icons/file/folder' {
-  export import FileFolder = __MaterialUI.SvgIcon;
-  export default FileFolder;
-}
-
-declare module 'material-ui/lib/svg-icons/file/attachment' {
-  export import FileAttachment = __MaterialUI.SvgIcon;
-  export default FileAttachment;
-}
-
-declare module 'material-ui/lib/svg-icons/file/create-new-folder' {
-  export import FileCreateNewFolder = __MaterialUI.SvgIcon;
-  export default FileCreateNewFolder;
-}
-
-declare module 'material-ui/lib/svg-icons/file/cloud-download' {
-  export import FileCloudDownload = __MaterialUI.SvgIcon;
-  export default FileCloudDownload;
-}
-
-declare module 'material-ui/lib/svg-icons/file/cloud' {
-  export import FileCloud = __MaterialUI.SvgIcon;
-  export default FileCloud;
-}
-
-declare module 'material-ui/lib/svg-icons/file/file-download' {
-  export import FileFileDownload = __MaterialUI.SvgIcon;
-  export default FileFileDownload;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation-arrow-drop-right' {
-  export import NavigationArrowDropRight = __MaterialUI.SvgIcon;
-  export default NavigationArrowDropRight;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/keyboard' {
-  export import HardwareKeyboard = __MaterialUI.SvgIcon;
-  export default HardwareKeyboard;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/toys' {
-  export import HardwareToys = __MaterialUI.SvgIcon;
-  export default HardwareToys;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/dock' {
-  export import HardwareDock = __MaterialUI.SvgIcon;
-  export default HardwareDock;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/headset' {
-  export import HardwareHeadset = __MaterialUI.SvgIcon;
-  export default HardwareHeadset;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/keyboard-voice' {
-  export import HardwareKeyboardVoice = __MaterialUI.SvgIcon;
-  export default HardwareKeyboardVoice;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/phonelink-off' {
-  export import HardwarePhonelinkOff = __MaterialUI.SvgIcon;
-  export default HardwarePhonelinkOff;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/speaker-group' {
-  export import HardwareSpeakerGroup = __MaterialUI.SvgIcon;
-  export default HardwareSpeakerGroup;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/desktop-windows' {
-  export import HardwareDesktopWindows = __MaterialUI.SvgIcon;
-  export default HardwareDesktopWindows;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/laptop-mac' {
-  export import HardwareLaptopMac = __MaterialUI.SvgIcon;
-  export default HardwareLaptopMac;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/keyboard-return' {
-  export import HardwareKeyboardReturn = __MaterialUI.SvgIcon;
-  export default HardwareKeyboardReturn;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/gamepad' {
-  export import HardwareGamepad = __MaterialUI.SvgIcon;
-  export default HardwareGamepad;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/keyboard-arrow-up' {
-  export import HardwareKeyboardArrowUp = __MaterialUI.SvgIcon;
-  export default HardwareKeyboardArrowUp;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/laptop' {
-  export import HardwareLaptop = __MaterialUI.SvgIcon;
-  export default HardwareLaptop;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/phone-iphone' {
-  export import HardwarePhoneIphone = __MaterialUI.SvgIcon;
-  export default HardwarePhoneIphone;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/memory' {
-  export import HardwareMemory = __MaterialUI.SvgIcon;
-  export default HardwareMemory;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/security' {
-  export import HardwareSecurity = __MaterialUI.SvgIcon;
-  export default HardwareSecurity;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/keyboard-capslock' {
-  export import HardwareKeyboardCapslock = __MaterialUI.SvgIcon;
-  export default HardwareKeyboardCapslock;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/sim-card' {
-  export import HardwareSimCard = __MaterialUI.SvgIcon;
-  export default HardwareSimCard;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/devices-other' {
-  export import HardwareDevicesOther = __MaterialUI.SvgIcon;
-  export default HardwareDevicesOther;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/tablet-android' {
-  export import HardwareTabletAndroid = __MaterialUI.SvgIcon;
-  export default HardwareTabletAndroid;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/keyboard-arrow-right' {
-  export import HardwareKeyboardArrowRight = __MaterialUI.SvgIcon;
-  export default HardwareKeyboardArrowRight;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/keyboard-tab' {
-  export import HardwareKeyboardTab = __MaterialUI.SvgIcon;
-  export default HardwareKeyboardTab;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/watch' {
-  export import HardwareWatch = __MaterialUI.SvgIcon;
-  export default HardwareWatch;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/speaker' {
-  export import HardwareSpeaker = __MaterialUI.SvgIcon;
-  export default HardwareSpeaker;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/phonelink' {
-  export import HardwarePhonelink = __MaterialUI.SvgIcon;
-  export default HardwarePhonelink;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/laptop-windows' {
-  export import HardwareLaptopWindows = __MaterialUI.SvgIcon;
-  export default HardwareLaptopWindows;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/tv' {
-  export import HardwareTv = __MaterialUI.SvgIcon;
-  export default HardwareTv;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/headset-mic' {
-  export import HardwareHeadsetMic = __MaterialUI.SvgIcon;
-  export default HardwareHeadsetMic;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/videogame-asset' {
-  export import HardwareVideogameAsset = __MaterialUI.SvgIcon;
-  export default HardwareVideogameAsset;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/keyboard-arrow-down' {
-  export import HardwareKeyboardArrowDown = __MaterialUI.SvgIcon;
-  export default HardwareKeyboardArrowDown;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/keyboard-hide' {
-  export import HardwareKeyboardHide = __MaterialUI.SvgIcon;
-  export default HardwareKeyboardHide;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/scanner' {
-  export import HardwareScanner = __MaterialUI.SvgIcon;
-  export default HardwareScanner;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/laptop-chromebook' {
-  export import HardwareLaptopChromebook = __MaterialUI.SvgIcon;
-  export default HardwareLaptopChromebook;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/tablet-mac' {
-  export import HardwareTabletMac = __MaterialUI.SvgIcon;
-  export default HardwareTabletMac;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/cast' {
-  export import HardwareCast = __MaterialUI.SvgIcon;
-  export default HardwareCast;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/cast-connected' {
-  export import HardwareCastConnected = __MaterialUI.SvgIcon;
-  export default HardwareCastConnected;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/keyboard-arrow-left' {
-  export import HardwareKeyboardArrowLeft = __MaterialUI.SvgIcon;
-  export default HardwareKeyboardArrowLeft;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/phone-android' {
-  export import HardwarePhoneAndroid = __MaterialUI.SvgIcon;
-  export default HardwarePhoneAndroid;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/computer' {
-  export import HardwareComputer = __MaterialUI.SvgIcon;
-  export default HardwareComputer;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/power-input' {
-  export import HardwarePowerInput = __MaterialUI.SvgIcon;
-  export default HardwarePowerInput;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/smartphone' {
-  export import HardwareSmartphone = __MaterialUI.SvgIcon;
-  export default HardwareSmartphone;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/router' {
-  export import HardwareRouter = __MaterialUI.SvgIcon;
-  export default HardwareRouter;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/keyboard-backspace' {
-  export import HardwareKeyboardBackspace = __MaterialUI.SvgIcon;
-  export default HardwareKeyboardBackspace;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/developer-board' {
-  export import HardwareDeveloperBoard = __MaterialUI.SvgIcon;
-  export default HardwareDeveloperBoard;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/device-hub' {
-  export import HardwareDeviceHub = __MaterialUI.SvgIcon;
-  export default HardwareDeviceHub;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/mouse' {
-  export import HardwareMouse = __MaterialUI.SvgIcon;
-  export default HardwareMouse;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/desktop-mac' {
-  export import HardwareDesktopMac = __MaterialUI.SvgIcon;
-  export default HardwareDesktopMac;
-}
-
-declare module 'material-ui/lib/svg-icons/hardware/tablet' {
-  export import HardwareTablet = __MaterialUI.SvgIcon;
-  export default HardwareTablet;
-}
-
-declare module 'material-ui/lib/svg-icons/content/add-box' {
-  export import ContentAddBox = __MaterialUI.SvgIcon;
-  export default ContentAddBox;
-}
-
-declare module 'material-ui/lib/svg-icons/content/filter-list' {
-  export import ContentFilterList = __MaterialUI.SvgIcon;
-  export default ContentFilterList;
-}
-
-declare module 'material-ui/lib/svg-icons/content/save' {
-  export import ContentSave = __MaterialUI.SvgIcon;
-  export default ContentSave;
-}
-
-declare module 'material-ui/lib/svg-icons/content/unarchive' {
-  export import ContentUnarchive = __MaterialUI.SvgIcon;
-  export default ContentUnarchive;
-}
-
-declare module 'material-ui/lib/svg-icons/content/link' {
-  export import ContentLink = __MaterialUI.SvgIcon;
-  export default ContentLink;
-}
-
-declare module 'material-ui/lib/svg-icons/content/sort' {
-  export import ContentSort = __MaterialUI.SvgIcon;
-  export default ContentSort;
-}
-
-declare module 'material-ui/lib/svg-icons/content/text-format' {
-  export import ContentTextFormat = __MaterialUI.SvgIcon;
-  export default ContentTextFormat;
-}
-
-declare module 'material-ui/lib/svg-icons/content/add' {
-  export import ContentAdd = __MaterialUI.SvgIcon;
-  export default ContentAdd;
-}
-
-declare module 'material-ui/lib/svg-icons/content/send' {
-  export import ContentSend = __MaterialUI.SvgIcon;
-  export default ContentSend;
-}
-
-declare module 'material-ui/lib/svg-icons/content/gesture' {
-  export import ContentGesture = __MaterialUI.SvgIcon;
-  export default ContentGesture;
-}
-
-declare module 'material-ui/lib/svg-icons/content/archive' {
-  export import ContentArchive = __MaterialUI.SvgIcon;
-  export default ContentArchive;
-}
-
-declare module 'material-ui/lib/svg-icons/content/weekend' {
-  export import ContentWeekend = __MaterialUI.SvgIcon;
-  export default ContentWeekend;
-}
-
-declare module 'material-ui/lib/svg-icons/content/markunread' {
-  export import ContentMarkunread = __MaterialUI.SvgIcon;
-  export default ContentMarkunread;
-}
-
-declare module 'material-ui/lib/svg-icons/content/create' {
-  export import ContentCreate = __MaterialUI.SvgIcon;
-  export default ContentCreate;
-}
-
-declare module 'material-ui/lib/svg-icons/content/content-cut' {
-  export import ContentContentCut = __MaterialUI.SvgIcon;
-  export default ContentContentCut;
-}
-
-declare module 'material-ui/lib/svg-icons/content/clear' {
-  export import ContentClear = __MaterialUI.SvgIcon;
-  export default ContentClear;
-}
-
-declare module 'material-ui/lib/svg-icons/content/redo' {
-  export import ContentRedo = __MaterialUI.SvgIcon;
-  export default ContentRedo;
-}
-
-declare module 'material-ui/lib/svg-icons/content/block' {
-  export import ContentBlock = __MaterialUI.SvgIcon;
-  export default ContentBlock;
-}
-
-declare module 'material-ui/lib/svg-icons/content/forward' {
-  export import ContentForward = __MaterialUI.SvgIcon;
-  export default ContentForward;
-}
-
-declare module 'material-ui/lib/svg-icons/content/mail' {
-  export import ContentMail = __MaterialUI.SvgIcon;
-  export default ContentMail;
-}
-
-declare module 'material-ui/lib/svg-icons/content/inbox' {
-  export import ContentInbox = __MaterialUI.SvgIcon;
-  export default ContentInbox;
-}
-
-declare module 'material-ui/lib/svg-icons/content/remove-circle' {
-  export import ContentRemoveCircle = __MaterialUI.SvgIcon;
-  export default ContentRemoveCircle;
-}
-
-declare module 'material-ui/lib/svg-icons/content/move-to-inbox' {
-  export import ContentMoveToInbox = __MaterialUI.SvgIcon;
-  export default ContentMoveToInbox;
-}
-
-declare module 'material-ui/lib/svg-icons/content/flag' {
-  export import ContentFlag = __MaterialUI.SvgIcon;
-  export default ContentFlag;
-}
-
-declare module 'material-ui/lib/svg-icons/content/reply-all' {
-  export import ContentReplyAll = __MaterialUI.SvgIcon;
-  export default ContentReplyAll;
-}
-
-declare module 'material-ui/lib/svg-icons/content/remove' {
-  export import ContentRemove = __MaterialUI.SvgIcon;
-  export default ContentRemove;
-}
-
-declare module 'material-ui/lib/svg-icons/content/next-week' {
-  export import ContentNextWeek = __MaterialUI.SvgIcon;
-  export default ContentNextWeek;
-}
-
-declare module 'material-ui/lib/svg-icons/content/undo' {
-  export import ContentUndo = __MaterialUI.SvgIcon;
-  export default ContentUndo;
-}
-
-declare module 'material-ui/lib/svg-icons/content/font-download' {
-  export import ContentFontDownload = __MaterialUI.SvgIcon;
-  export default ContentFontDownload;
-}
-
-declare module 'material-ui/lib/svg-icons/content/remove-circle-outline' {
-  export import ContentRemoveCircleOutline = __MaterialUI.SvgIcon;
-  export default ContentRemoveCircleOutline;
-}
-
-declare module 'material-ui/lib/svg-icons/content/backspace' {
-  export import ContentBackspace = __MaterialUI.SvgIcon;
-  export default ContentBackspace;
-}
-
-declare module 'material-ui/lib/svg-icons/content/reply' {
-  export import ContentReply = __MaterialUI.SvgIcon;
-  export default ContentReply;
-}
-
-declare module 'material-ui/lib/svg-icons/content/report' {
-  export import ContentReport = __MaterialUI.SvgIcon;
-  export default ContentReport;
-}
-
-declare module 'material-ui/lib/svg-icons/content/add-circle' {
-  export import ContentAddCircle = __MaterialUI.SvgIcon;
-  export default ContentAddCircle;
-}
-
-declare module 'material-ui/lib/svg-icons/content/content-copy' {
-  export import ContentContentCopy = __MaterialUI.SvgIcon;
-  export default ContentContentCopy;
-}
-
-declare module 'material-ui/lib/svg-icons/content/content-paste' {
-  export import ContentContentPaste = __MaterialUI.SvgIcon;
-  export default ContentContentPaste;
-}
-
-declare module 'material-ui/lib/svg-icons/content/select-all' {
-  export import ContentSelectAll = __MaterialUI.SvgIcon;
-  export default ContentSelectAll;
-}
-
-declare module 'material-ui/lib/svg-icons/content/add-circle-outline' {
-  export import ContentAddCircleOutline = __MaterialUI.SvgIcon;
-  export default ContentAddCircleOutline;
-}
-
-declare module 'material-ui/lib/svg-icons/content/drafts' {
-  export import ContentDrafts = __MaterialUI.SvgIcon;
-  export default ContentDrafts;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/wrap-text' {
-  export import EditorWrapText = __MaterialUI.SvgIcon;
-  export default EditorWrapText;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-size' {
-  export import EditorFormatSize = __MaterialUI.SvgIcon;
-  export default EditorFormatSize;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/functions' {
-  export import EditorFunctions = __MaterialUI.SvgIcon;
-  export default EditorFunctions;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-bold' {
-  export import EditorFormatBold = __MaterialUI.SvgIcon;
-  export default EditorFormatBold;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-align-center' {
-  export import EditorFormatAlignCenter = __MaterialUI.SvgIcon;
-  export default EditorFormatAlignCenter;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/mode-comment' {
-  export import EditorModeComment = __MaterialUI.SvgIcon;
-  export default EditorModeComment;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/money-off' {
-  export import EditorMoneyOff = __MaterialUI.SvgIcon;
-  export default EditorMoneyOff;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-textdirection-r-to-l' {
-  export import EditorFormatTextdirectionRToL = __MaterialUI.SvgIcon;
-  export default EditorFormatTextdirectionRToL;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/insert-drive-file' {
-  export import EditorInsertDriveFile = __MaterialUI.SvgIcon;
-  export default EditorInsertDriveFile;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/highlight' {
-  export import EditorHighlight = __MaterialUI.SvgIcon;
-  export default EditorHighlight;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-clear' {
-  export import EditorFormatClear = __MaterialUI.SvgIcon;
-  export default EditorFormatClear;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/border-style' {
-  export import EditorBorderStyle = __MaterialUI.SvgIcon;
-  export default EditorBorderStyle;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-shapes' {
-  export import EditorFormatShapes = __MaterialUI.SvgIcon;
-  export default EditorFormatShapes;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-paint' {
-  export import EditorFormatPaint = __MaterialUI.SvgIcon;
-  export default EditorFormatPaint;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/linear-scale' {
-  export import EditorLinearScale = __MaterialUI.SvgIcon;
-  export default EditorLinearScale;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/insert-photo' {
-  export import EditorInsertPhoto = __MaterialUI.SvgIcon;
-  export default EditorInsertPhoto;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/drag-handle' {
-  export import EditorDragHandle = __MaterialUI.SvgIcon;
-  export default EditorDragHandle;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/merge-type' {
-  export import EditorMergeType = __MaterialUI.SvgIcon;
-  export default EditorMergeType;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/attach-money' {
-  export import EditorAttachMoney = __MaterialUI.SvgIcon;
-  export default EditorAttachMoney;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/border-vertical' {
-  export import EditorBorderVertical = __MaterialUI.SvgIcon;
-  export default EditorBorderVertical;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-indent-decrease' {
-  export import EditorFormatIndentDecrease = __MaterialUI.SvgIcon;
-  export default EditorFormatIndentDecrease;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/insert-emoticon' {
-  export import EditorInsertEmoticon = __MaterialUI.SvgIcon;
-  export default EditorInsertEmoticon;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/insert-invitation' {
-  export import EditorInsertInvitation = __MaterialUI.SvgIcon;
-  export default EditorInsertInvitation;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-color-fill' {
-  export import EditorFormatColorFill = __MaterialUI.SvgIcon;
-  export default EditorFormatColorFill;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/mode-edit' {
-  export import EditorModeEdit = __MaterialUI.SvgIcon;
-  export default EditorModeEdit;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/vertical-align-bottom' {
-  export import EditorVerticalAlignBottom = __MaterialUI.SvgIcon;
-  export default EditorVerticalAlignBottom;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-align-justify' {
-  export import EditorFormatAlignJustify = __MaterialUI.SvgIcon;
-  export default EditorFormatAlignJustify;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/attach-file' {
-  export import EditorAttachFile = __MaterialUI.SvgIcon;
-  export default EditorAttachFile;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/space-bar' {
-  export import EditorSpaceBar = __MaterialUI.SvgIcon;
-  export default EditorSpaceBar;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/border-clear' {
-  export import EditorBorderClear = __MaterialUI.SvgIcon;
-  export default EditorBorderClear;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/short-text' {
-  export import EditorShortText = __MaterialUI.SvgIcon;
-  export default EditorShortText;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/insert-link' {
-  export import EditorInsertLink = __MaterialUI.SvgIcon;
-  export default EditorInsertLink;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-list-numbered' {
-  export import EditorFormatListNumbered = __MaterialUI.SvgIcon;
-  export default EditorFormatListNumbered;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-quote' {
-  export import EditorFormatQuote = __MaterialUI.SvgIcon;
-  export default EditorFormatQuote;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/border-left' {
-  export import EditorBorderLeft = __MaterialUI.SvgIcon;
-  export default EditorBorderLeft;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-underlined' {
-  export import EditorFormatUnderlined = __MaterialUI.SvgIcon;
-  export default EditorFormatUnderlined;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/text-fields' {
-  export import EditorTextFields = __MaterialUI.SvgIcon;
-  export default EditorTextFields;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-italic' {
-  export import EditorFormatItalic = __MaterialUI.SvgIcon;
-  export default EditorFormatItalic;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/publish' {
-  export import EditorPublish = __MaterialUI.SvgIcon;
-  export default EditorPublish;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/border-top' {
-  export import EditorBorderTop = __MaterialUI.SvgIcon;
-  export default EditorBorderTop;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-indent-increase' {
-  export import EditorFormatIndentIncrease = __MaterialUI.SvgIcon;
-  export default EditorFormatIndentIncrease;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/border-bottom' {
-  export import EditorBorderBottom = __MaterialUI.SvgIcon;
-  export default EditorBorderBottom;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-align-right' {
-  export import EditorFormatAlignRight = __MaterialUI.SvgIcon;
-  export default EditorFormatAlignRight;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/border-right' {
-  export import EditorBorderRight = __MaterialUI.SvgIcon;
-  export default EditorBorderRight;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/insert-comment' {
-  export import EditorInsertComment = __MaterialUI.SvgIcon;
-  export default EditorInsertComment;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/strikethrough-s' {
-  export import EditorStrikethroughS = __MaterialUI.SvgIcon;
-  export default EditorStrikethroughS;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-strikethrough' {
-  export import EditorFormatStrikethrough = __MaterialUI.SvgIcon;
-  export default EditorFormatStrikethrough;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/insert-chart' {
-  export import EditorInsertChart = __MaterialUI.SvgIcon;
-  export default EditorInsertChart;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-color-reset' {
-  export import EditorFormatColorReset = __MaterialUI.SvgIcon;
-  export default EditorFormatColorReset;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/border-inner' {
-  export import EditorBorderInner = __MaterialUI.SvgIcon;
-  export default EditorBorderInner;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-color-text' {
-  export import EditorFormatColorText = __MaterialUI.SvgIcon;
-  export default EditorFormatColorText;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/border-horizontal' {
-  export import EditorBorderHorizontal = __MaterialUI.SvgIcon;
-  export default EditorBorderHorizontal;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-list-bulleted' {
-  export import EditorFormatListBulleted = __MaterialUI.SvgIcon;
-  export default EditorFormatListBulleted;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/border-outer' {
-  export import EditorBorderOuter = __MaterialUI.SvgIcon;
-  export default EditorBorderOuter;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-align-left' {
-  export import EditorFormatAlignLeft = __MaterialUI.SvgIcon;
-  export default EditorFormatAlignLeft;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/border-color' {
-  export import EditorBorderColor = __MaterialUI.SvgIcon;
-  export default EditorBorderColor;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-textdirection-l-to-r' {
-  export import EditorFormatTextdirectionLToR = __MaterialUI.SvgIcon;
-  export default EditorFormatTextdirectionLToR;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/vertical-align-center' {
-  export import EditorVerticalAlignCenter = __MaterialUI.SvgIcon;
-  export default EditorVerticalAlignCenter;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/vertical-align-top' {
-  export import EditorVerticalAlignTop = __MaterialUI.SvgIcon;
-  export default EditorVerticalAlignTop;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/format-line-spacing' {
-  export import EditorFormatLineSpacing = __MaterialUI.SvgIcon;
-  export default EditorFormatLineSpacing;
-}
-
-declare module 'material-ui/lib/svg-icons/editor/border-all' {
-  export import EditorBorderAll = __MaterialUI.SvgIcon;
-  export default EditorBorderAll;
-}
-
-declare module 'material-ui/lib/svg-icons/device/screen-lock-portrait' {
-  export import DeviceScreenLockPortrait = __MaterialUI.SvgIcon;
-  export default DeviceScreenLockPortrait;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-cellular-off' {
-  export import DeviceSignalCellularOff = __MaterialUI.SvgIcon;
-  export default DeviceSignalCellularOff;
-}
-
-declare module 'material-ui/lib/svg-icons/device/bluetooth-searching' {
-  export import DeviceBluetoothSearching = __MaterialUI.SvgIcon;
-  export default DeviceBluetoothSearching;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-cellular-3-bar' {
-  export import DeviceSignalCellular3Bar = __MaterialUI.SvgIcon;
-  export default DeviceSignalCellular3Bar;
-}
-
-declare module 'material-ui/lib/svg-icons/device/network-cell' {
-  export import DeviceNetworkCell = __MaterialUI.SvgIcon;
-  export default DeviceNetworkCell;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-cellular-no-sim' {
-  export import DeviceSignalCellularNoSim = __MaterialUI.SvgIcon;
-  export default DeviceSignalCellularNoSim;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-wifi-2-bar' {
-  export import DeviceSignalWifi2Bar = __MaterialUI.SvgIcon;
-  export default DeviceSignalWifi2Bar;
-}
-
-declare module 'material-ui/lib/svg-icons/device/devices' {
-  export import DeviceDevices = __MaterialUI.SvgIcon;
-  export default DeviceDevices;
-}
-
-declare module 'material-ui/lib/svg-icons/device/battery-90' {
-  export import DeviceBattery90 = __MaterialUI.SvgIcon;
-  export default DeviceBattery90;
-}
-
-declare module 'material-ui/lib/svg-icons/device/battery-charging-80' {
-  export import DeviceBatteryCharging80 = __MaterialUI.SvgIcon;
-  export default DeviceBatteryCharging80;
-}
-
-declare module 'material-ui/lib/svg-icons/device/location-searching' {
-  export import DeviceLocationSearching = __MaterialUI.SvgIcon;
-  export default DeviceLocationSearching;
-}
-
-declare module 'material-ui/lib/svg-icons/device/wallpaper' {
-  export import DeviceWallpaper = __MaterialUI.SvgIcon;
-  export default DeviceWallpaper;
-}
-
-declare module 'material-ui/lib/svg-icons/device/screen-lock-rotation' {
-  export import DeviceScreenLockRotation = __MaterialUI.SvgIcon;
-  export default DeviceScreenLockRotation;
-}
-
-declare module 'material-ui/lib/svg-icons/device/screen-lock-landscape' {
-  export import DeviceScreenLockLandscape = __MaterialUI.SvgIcon;
-  export default DeviceScreenLockLandscape;
-}
-
-declare module 'material-ui/lib/svg-icons/device/battery-charging-20' {
-  export import DeviceBatteryCharging20 = __MaterialUI.SvgIcon;
-  export default DeviceBatteryCharging20;
-}
-
-declare module 'material-ui/lib/svg-icons/device/usb' {
-  export import DeviceUsb = __MaterialUI.SvgIcon;
-  export default DeviceUsb;
-}
-
-declare module 'material-ui/lib/svg-icons/device/airplanemode-active' {
-  export import DeviceAirplanemodeActive = __MaterialUI.SvgIcon;
-  export default DeviceAirplanemodeActive;
-}
-
-declare module 'material-ui/lib/svg-icons/device/network-wifi' {
-  export import DeviceNetworkWifi = __MaterialUI.SvgIcon;
-  export default DeviceNetworkWifi;
-}
-
-declare module 'material-ui/lib/svg-icons/device/graphic-eq' {
-  export import DeviceGraphicEq = __MaterialUI.SvgIcon;
-  export default DeviceGraphicEq;
-}
-
-declare module 'material-ui/lib/svg-icons/device/bluetooth-connected' {
-  export import DeviceBluetoothConnected = __MaterialUI.SvgIcon;
-  export default DeviceBluetoothConnected;
-}
-
-declare module 'material-ui/lib/svg-icons/device/gps-fixed' {
-  export import DeviceGpsFixed = __MaterialUI.SvgIcon;
-  export default DeviceGpsFixed;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-cellular-connected-no-internet-4-bar' {
-  export import DeviceSignalCellularConnectedNoInternet4Bar = __MaterialUI.SvgIcon;
-  export default DeviceSignalCellularConnectedNoInternet4Bar;
-}
-
-declare module 'material-ui/lib/svg-icons/device/brightness-medium' {
-  export import DeviceBrightnessMedium = __MaterialUI.SvgIcon;
-  export default DeviceBrightnessMedium;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-cellular-connected-no-internet-3-bar' {
-  export import DeviceSignalCellularConnectedNoInternet3Bar = __MaterialUI.SvgIcon;
-  export default DeviceSignalCellularConnectedNoInternet3Bar;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-wifi-3-bar-lock' {
-  export import DeviceSignalWifi3BarLock = __MaterialUI.SvgIcon;
-  export default DeviceSignalWifi3BarLock;
-}
-
-declare module 'material-ui/lib/svg-icons/device/battery-80' {
-  export import DeviceBattery80 = __MaterialUI.SvgIcon;
-  export default DeviceBattery80;
-}
-
-declare module 'material-ui/lib/svg-icons/device/wifi-lock' {
-  export import DeviceWifiLock = __MaterialUI.SvgIcon;
-  export default DeviceWifiLock;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-wifi-2-bar-lock' {
-  export import DeviceSignalWifi2BarLock = __MaterialUI.SvgIcon;
-  export default DeviceSignalWifi2BarLock;
-}
-
-declare module 'material-ui/lib/svg-icons/device/bluetooth' {
-  export import DeviceBluetooth = __MaterialUI.SvgIcon;
-  export default DeviceBluetooth;
-}
-
-declare module 'material-ui/lib/svg-icons/device/access-time' {
-  export import DeviceAccessTime = __MaterialUI.SvgIcon;
-  export default DeviceAccessTime;
-}
-
-declare module 'material-ui/lib/svg-icons/device/battery-charging-30' {
-  export import DeviceBatteryCharging30 = __MaterialUI.SvgIcon;
-  export default DeviceBatteryCharging30;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-wifi-off' {
-  export import DeviceSignalWifiOff = __MaterialUI.SvgIcon;
-  export default DeviceSignalWifiOff;
-}
-
-declare module 'material-ui/lib/svg-icons/device/dvr' {
-  export import DeviceDvr = __MaterialUI.SvgIcon;
-  export default DeviceDvr;
-}
-
-declare module 'material-ui/lib/svg-icons/device/battery-60' {
-  export import DeviceBattery60 = __MaterialUI.SvgIcon;
-  export default DeviceBattery60;
-}
-
-declare module 'material-ui/lib/svg-icons/device/access-alarm' {
-  export import DeviceAccessAlarm = __MaterialUI.SvgIcon;
-  export default DeviceAccessAlarm;
-}
-
-declare module 'material-ui/lib/svg-icons/device/nfc' {
-  export import DeviceNfc = __MaterialUI.SvgIcon;
-  export default DeviceNfc;
-}
-
-declare module 'material-ui/lib/svg-icons/device/data-usage' {
-  export import DeviceDataUsage = __MaterialUI.SvgIcon;
-  export default DeviceDataUsage;
-}
-
-declare module 'material-ui/lib/svg-icons/device/access-alarms' {
-  export import DeviceAccessAlarms = __MaterialUI.SvgIcon;
-  export default DeviceAccessAlarms;
-}
-
-declare module 'material-ui/lib/svg-icons/device/battery-full' {
-  export import DeviceBatteryFull = __MaterialUI.SvgIcon;
-  export default DeviceBatteryFull;
-}
-
-declare module 'material-ui/lib/svg-icons/device/battery-charging-full' {
-  export import DeviceBatteryChargingFull = __MaterialUI.SvgIcon;
-  export default DeviceBatteryChargingFull;
-}
-
-declare module 'material-ui/lib/svg-icons/device/settings-system-daydream' {
-  export import DeviceSettingsSystemDaydream = __MaterialUI.SvgIcon;
-  export default DeviceSettingsSystemDaydream;
-}
-
-declare module 'material-ui/lib/svg-icons/device/battery-std' {
-  export import DeviceBatteryStd = __MaterialUI.SvgIcon;
-  export default DeviceBatteryStd;
-}
-
-declare module 'material-ui/lib/svg-icons/device/battery-unknown' {
-  export import DeviceBatteryUnknown = __MaterialUI.SvgIcon;
-  export default DeviceBatteryUnknown;
-}
-
-declare module 'material-ui/lib/svg-icons/device/add-alarm' {
-  export import DeviceAddAlarm = __MaterialUI.SvgIcon;
-  export default DeviceAddAlarm;
-}
-
-declare module 'material-ui/lib/svg-icons/device/storage' {
-  export import DeviceStorage = __MaterialUI.SvgIcon;
-  export default DeviceStorage;
-}
-
-declare module 'material-ui/lib/svg-icons/device/battery-charging-90' {
-  export import DeviceBatteryCharging90 = __MaterialUI.SvgIcon;
-  export default DeviceBatteryCharging90;
-}
-
-declare module 'material-ui/lib/svg-icons/device/screen-rotation' {
-  export import DeviceScreenRotation = __MaterialUI.SvgIcon;
-  export default DeviceScreenRotation;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-wifi-4-bar' {
-  export import DeviceSignalWifi4Bar = __MaterialUI.SvgIcon;
-  export default DeviceSignalWifi4Bar;
-}
-
-declare module 'material-ui/lib/svg-icons/device/battery-charging-50' {
-  export import DeviceBatteryCharging50 = __MaterialUI.SvgIcon;
-  export default DeviceBatteryCharging50;
-}
-
-declare module 'material-ui/lib/svg-icons/device/battery-30' {
-  export import DeviceBattery30 = __MaterialUI.SvgIcon;
-  export default DeviceBattery30;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-cellular-connected-no-internet-0-bar' {
-  export import DeviceSignalCellularConnectedNoInternet0Bar = __MaterialUI.SvgIcon;
-  export default DeviceSignalCellularConnectedNoInternet0Bar;
-}
-
-declare module 'material-ui/lib/svg-icons/device/battery-alert' {
-  export import DeviceBatteryAlert = __MaterialUI.SvgIcon;
-  export default DeviceBatteryAlert;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-wifi-1-bar' {
-  export import DeviceSignalWifi1Bar = __MaterialUI.SvgIcon;
-  export default DeviceSignalWifi1Bar;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-cellular-4-bar' {
-  export import DeviceSignalCellular4Bar = __MaterialUI.SvgIcon;
-  export default DeviceSignalCellular4Bar;
-}
-
-declare module 'material-ui/lib/svg-icons/device/wifi-tethering' {
-  export import DeviceWifiTethering = __MaterialUI.SvgIcon;
-  export default DeviceWifiTethering;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-wifi-0-bar' {
-  export import DeviceSignalWifi0Bar = __MaterialUI.SvgIcon;
-  export default DeviceSignalWifi0Bar;
-}
-
-declare module 'material-ui/lib/svg-icons/device/brightness-auto' {
-  export import DeviceBrightnessAuto = __MaterialUI.SvgIcon;
-  export default DeviceBrightnessAuto;
-}
-
-declare module 'material-ui/lib/svg-icons/device/location-disabled' {
-  export import DeviceLocationDisabled = __MaterialUI.SvgIcon;
-  export default DeviceLocationDisabled;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-wifi-3-bar' {
-  export import DeviceSignalWifi3Bar = __MaterialUI.SvgIcon;
-  export default DeviceSignalWifi3Bar;
-}
-
-declare module 'material-ui/lib/svg-icons/device/gps-not-fixed' {
-  export import DeviceGpsNotFixed = __MaterialUI.SvgIcon;
-  export default DeviceGpsNotFixed;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-cellular-1-bar' {
-  export import DeviceSignalCellular1Bar = __MaterialUI.SvgIcon;
-  export default DeviceSignalCellular1Bar;
-}
-
-declare module 'material-ui/lib/svg-icons/device/battery-charging-60' {
-  export import DeviceBatteryCharging60 = __MaterialUI.SvgIcon;
-  export default DeviceBatteryCharging60;
-}
-
-declare module 'material-ui/lib/svg-icons/device/gps-off' {
-  export import DeviceGpsOff = __MaterialUI.SvgIcon;
-  export default DeviceGpsOff;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-cellular-null' {
-  export import DeviceSignalCellularNull = __MaterialUI.SvgIcon;
-  export default DeviceSignalCellularNull;
-}
-
-declare module 'material-ui/lib/svg-icons/device/brightness-low' {
-  export import DeviceBrightnessLow = __MaterialUI.SvgIcon;
-  export default DeviceBrightnessLow;
-}
-
-declare module 'material-ui/lib/svg-icons/device/sd-storage' {
-  export import DeviceSdStorage = __MaterialUI.SvgIcon;
-  export default DeviceSdStorage;
-}
-
-declare module 'material-ui/lib/svg-icons/device/airplanemode-inactive' {
-  export import DeviceAirplanemodeInactive = __MaterialUI.SvgIcon;
-  export default DeviceAirplanemodeInactive;
-}
-
-declare module 'material-ui/lib/svg-icons/device/widgets' {
-  export import DeviceWidgets = __MaterialUI.SvgIcon;
-  export default DeviceWidgets;
-}
-
-declare module 'material-ui/lib/svg-icons/device/brightness-high' {
-  export import DeviceBrightnessHigh = __MaterialUI.SvgIcon;
-  export default DeviceBrightnessHigh;
-}
-
-declare module 'material-ui/lib/svg-icons/device/battery-20' {
-  export import DeviceBattery20 = __MaterialUI.SvgIcon;
-  export default DeviceBattery20;
-}
-
-declare module 'material-ui/lib/svg-icons/device/bluetooth-disabled' {
-  export import DeviceBluetoothDisabled = __MaterialUI.SvgIcon;
-  export default DeviceBluetoothDisabled;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-wifi-4-bar-lock' {
-  export import DeviceSignalWifi4BarLock = __MaterialUI.SvgIcon;
-  export default DeviceSignalWifi4BarLock;
-}
-
-declare module 'material-ui/lib/svg-icons/device/developer-mode' {
-  export import DeviceDeveloperMode = __MaterialUI.SvgIcon;
-  export default DeviceDeveloperMode;
-}
-
-declare module 'material-ui/lib/svg-icons/device/battery-50' {
-  export import DeviceBattery50 = __MaterialUI.SvgIcon;
-  export default DeviceBattery50;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-cellular-connected-no-internet-1-bar' {
-  export import DeviceSignalCellularConnectedNoInternet1Bar = __MaterialUI.SvgIcon;
-  export default DeviceSignalCellularConnectedNoInternet1Bar;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-cellular-2-bar' {
-  export import DeviceSignalCellular2Bar = __MaterialUI.SvgIcon;
-  export default DeviceSignalCellular2Bar;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-cellular-connected-no-internet-2-bar' {
-  export import DeviceSignalCellularConnectedNoInternet2Bar = __MaterialUI.SvgIcon;
-  export default DeviceSignalCellularConnectedNoInternet2Bar;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-cellular-0-bar' {
-  export import DeviceSignalCellular0Bar = __MaterialUI.SvgIcon;
-  export default DeviceSignalCellular0Bar;
-}
-
-declare module 'material-ui/lib/svg-icons/device/signal-wifi-1-bar-lock' {
-  export import DeviceSignalWifi1BarLock = __MaterialUI.SvgIcon;
-  export default DeviceSignalWifi1BarLock;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/arrow-forward' {
-  export import NavigationArrowForward = __MaterialUI.SvgIcon;
-  export default NavigationArrowForward;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/unfold-more' {
-  export import NavigationUnfoldMore = __MaterialUI.SvgIcon;
-  export default NavigationUnfoldMore;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/arrow-drop-down' {
-  export import NavigationArrowDropDown = __MaterialUI.SvgIcon;
-  export default NavigationArrowDropDown;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/arrow-back' {
-  export import NavigationArrowBack = __MaterialUI.SvgIcon;
-  export default NavigationArrowBack;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/arrow-downward' {
-  export import NavigationArrowDownward = __MaterialUI.SvgIcon;
-  export default NavigationArrowDownward;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/fullscreen' {
-  export import NavigationFullscreen = __MaterialUI.SvgIcon;
-  export default NavigationFullscreen;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/unfold-less' {
-  export import NavigationUnfoldLess = __MaterialUI.SvgIcon;
-  export default NavigationUnfoldLess;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/chevron-right' {
-  export import NavigationChevronRight = __MaterialUI.SvgIcon;
-  export default NavigationChevronRight;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/arrow-drop-down-circle' {
-  export import NavigationArrowDropDownCircle = __MaterialUI.SvgIcon;
-  export default NavigationArrowDropDownCircle;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/check' {
-  export import NavigationCheck = __MaterialUI.SvgIcon;
-  export default NavigationCheck;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/fullscreen-exit' {
-  export import NavigationFullscreenExit = __MaterialUI.SvgIcon;
-  export default NavigationFullscreenExit;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/chevron-left' {
-  export import NavigationChevronLeft = __MaterialUI.SvgIcon;
-  export default NavigationChevronLeft;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/menu' {
-  export import NavigationMenu = __MaterialUI.SvgIcon;
-  export default NavigationMenu;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/apps' {
-  export import NavigationApps = __MaterialUI.SvgIcon;
-  export default NavigationApps;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/arrow-upward' {
-  export import NavigationArrowUpward = __MaterialUI.SvgIcon;
-  export default NavigationArrowUpward;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/close' {
-  export import NavigationClose = __MaterialUI.SvgIcon;
-  export default NavigationClose;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/more-horiz' {
-  export import NavigationMoreHoriz = __MaterialUI.SvgIcon;
-  export default NavigationMoreHoriz;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/cancel' {
-  export import NavigationCancel = __MaterialUI.SvgIcon;
-  export default NavigationCancel;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/subdirectory-arrow-right' {
-  export import NavigationSubdirectoryArrowRight = __MaterialUI.SvgIcon;
-  export default NavigationSubdirectoryArrowRight;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/expand-more' {
-  export import NavigationExpandMore = __MaterialUI.SvgIcon;
-  export default NavigationExpandMore;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/arrow-drop-up' {
-  export import NavigationArrowDropUp = __MaterialUI.SvgIcon;
-  export default NavigationArrowDropUp;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/subdirectory-arrow-left' {
-  export import NavigationSubdirectoryArrowLeft = __MaterialUI.SvgIcon;
-  export default NavigationSubdirectoryArrowLeft;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/expand-less' {
-  export import NavigationExpandLess = __MaterialUI.SvgIcon;
-  export default NavigationExpandLess;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/refresh' {
-  export import NavigationRefresh = __MaterialUI.SvgIcon;
-  export default NavigationRefresh;
-}
-
-declare module 'material-ui/lib/svg-icons/navigation/more-vert' {
-  export import NavigationMoreVert = __MaterialUI.SvgIcon;
-  export default NavigationMoreVert;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/rv-hookup' {
-  export import NotificationRvHookup = __MaterialUI.SvgIcon;
-  export default NotificationRvHookup;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/no-encryption' {
-  export import NotificationNoEncryption = __MaterialUI.SvgIcon;
-  export default NotificationNoEncryption;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/phone-forwarded' {
-  export import NotificationPhoneForwarded = __MaterialUI.SvgIcon;
-  export default NotificationPhoneForwarded;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/airline-seat-flat-angled' {
-  export import NotificationAirlineSeatFlatAngled = __MaterialUI.SvgIcon;
-  export default NotificationAirlineSeatFlatAngled;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/time-to-leave' {
-  export import NotificationTimeToLeave = __MaterialUI.SvgIcon;
-  export default NotificationTimeToLeave;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/airline-seat-legroom-extra' {
-  export import NotificationAirlineSeatLegroomExtra = __MaterialUI.SvgIcon;
-  export default NotificationAirlineSeatLegroomExtra;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/airline-seat-recline-extra' {
-  export import NotificationAirlineSeatReclineExtra = __MaterialUI.SvgIcon;
-  export default NotificationAirlineSeatReclineExtra;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/airline-seat-individual-suite' {
-  export import NotificationAirlineSeatIndividualSuite = __MaterialUI.SvgIcon;
-  export default NotificationAirlineSeatIndividualSuite;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/vibration' {
-  export import NotificationVibration = __MaterialUI.SvgIcon;
-  export default NotificationVibration;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/sim-card-alert' {
-  export import NotificationSimCardAlert = __MaterialUI.SvgIcon;
-  export default NotificationSimCardAlert;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/sms-failed' {
-  export import NotificationSmsFailed = __MaterialUI.SvgIcon;
-  export default NotificationSmsFailed;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/airline-seat-flat' {
-  export import NotificationAirlineSeatFlat = __MaterialUI.SvgIcon;
-  export default NotificationAirlineSeatFlat;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/do-not-disturb' {
-  export import NotificationDoNotDisturb = __MaterialUI.SvgIcon;
-  export default NotificationDoNotDisturb;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/sync-problem' {
-  export import NotificationSyncProblem = __MaterialUI.SvgIcon;
-  export default NotificationSyncProblem;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/event-available' {
-  export import NotificationEventAvailable = __MaterialUI.SvgIcon;
-  export default NotificationEventAvailable;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/network-check' {
-  export import NotificationNetworkCheck = __MaterialUI.SvgIcon;
-  export default NotificationNetworkCheck;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/sms' {
-  export import NotificationSms = __MaterialUI.SvgIcon;
-  export default NotificationSms;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/disc-full' {
-  export import NotificationDiscFull = __MaterialUI.SvgIcon;
-  export default NotificationDiscFull;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/do-not-disturb-alt' {
-  export import NotificationDoNotDisturbAlt = __MaterialUI.SvgIcon;
-  export default NotificationDoNotDisturbAlt;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/system-update' {
-  export import NotificationSystemUpdate = __MaterialUI.SvgIcon;
-  export default NotificationSystemUpdate;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/phone-bluetooth-speaker' {
-  export import NotificationPhoneBluetoothSpeaker = __MaterialUI.SvgIcon;
-  export default NotificationPhoneBluetoothSpeaker;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/ondemand-video' {
-  export import NotificationOndemandVideo = __MaterialUI.SvgIcon;
-  export default NotificationOndemandVideo;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/power' {
-  export import NotificationPower = __MaterialUI.SvgIcon;
-  export default NotificationPower;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/phone-locked' {
-  export import NotificationPhoneLocked = __MaterialUI.SvgIcon;
-  export default NotificationPhoneLocked;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/sd-card' {
-  export import NotificationSdCard = __MaterialUI.SvgIcon;
-  export default NotificationSdCard;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/event-busy' {
-  export import NotificationEventBusy = __MaterialUI.SvgIcon;
-  export default NotificationEventBusy;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/personal-video' {
-  export import NotificationPersonalVideo = __MaterialUI.SvgIcon;
-  export default NotificationPersonalVideo;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/airline-seat-legroom-normal' {
-  export import NotificationAirlineSeatLegroomNormal = __MaterialUI.SvgIcon;
-  export default NotificationAirlineSeatLegroomNormal;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/phone-in-talk' {
-  export import NotificationPhoneInTalk = __MaterialUI.SvgIcon;
-  export default NotificationPhoneInTalk;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/airline-seat-legroom-reduced' {
-  export import NotificationAirlineSeatLegroomReduced = __MaterialUI.SvgIcon;
-  export default NotificationAirlineSeatLegroomReduced;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/phone-paused' {
-  export import NotificationPhonePaused = __MaterialUI.SvgIcon;
-  export default NotificationPhonePaused;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/sync-disabled' {
-  export import NotificationSyncDisabled = __MaterialUI.SvgIcon;
-  export default NotificationSyncDisabled;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/enhanced-encryption' {
-  export import NotificationEnhancedEncryption = __MaterialUI.SvgIcon;
-  export default NotificationEnhancedEncryption;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/mms' {
-  export import NotificationMms = __MaterialUI.SvgIcon;
-  export default NotificationMms;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/drive-eta' {
-  export import NotificationDriveEta = __MaterialUI.SvgIcon;
-  export default NotificationDriveEta;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/voice-chat' {
-  export import NotificationVoiceChat = __MaterialUI.SvgIcon;
-  export default NotificationVoiceChat;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/wifi' {
-  export import NotificationWifi = __MaterialUI.SvgIcon;
-  export default NotificationWifi;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/airline-seat-recline-normal' {
-  export import NotificationAirlineSeatReclineNormal = __MaterialUI.SvgIcon;
-  export default NotificationAirlineSeatReclineNormal;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/more' {
-  export import NotificationMore = __MaterialUI.SvgIcon;
-  export default NotificationMore;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/vpn-lock' {
-  export import NotificationVpnLock = __MaterialUI.SvgIcon;
-  export default NotificationVpnLock;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/event-note' {
-  export import NotificationEventNote = __MaterialUI.SvgIcon;
-  export default NotificationEventNote;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/confirmation-number' {
-  export import NotificationConfirmationNumber = __MaterialUI.SvgIcon;
-  export default NotificationConfirmationNumber;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/network-locked' {
-  export import NotificationNetworkLocked = __MaterialUI.SvgIcon;
-  export default NotificationNetworkLocked;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/adb' {
-  export import NotificationAdb = __MaterialUI.SvgIcon;
-  export default NotificationAdb;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/bluetooth-audio' {
-  export import NotificationBluetoothAudio = __MaterialUI.SvgIcon;
-  export default NotificationBluetoothAudio;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/wc' {
-  export import NotificationWc = __MaterialUI.SvgIcon;
-  export default NotificationWc;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/tap-and-play' {
-  export import NotificationTapAndPlay = __MaterialUI.SvgIcon;
-  export default NotificationTapAndPlay;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/folder-special' {
-  export import NotificationFolderSpecial = __MaterialUI.SvgIcon;
-  export default NotificationFolderSpecial;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/live-tv' {
-  export import NotificationLiveTv = __MaterialUI.SvgIcon;
-  export default NotificationLiveTv;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/sync' {
-  export import NotificationSync = __MaterialUI.SvgIcon;
-  export default NotificationSync;
-}
-
-declare module 'material-ui/lib/svg-icons/notification/phone-missed' {
-  export import NotificationPhoneMissed = __MaterialUI.SvgIcon;
-  export default NotificationPhoneMissed;
-}
-
-declare module 'material-ui/lib/svg-icons/av/skip-previous' {
-  export import AvSkipPrevious = __MaterialUI.SvgIcon;
-  export default AvSkipPrevious;
-}
-
-declare module 'material-ui/lib/svg-icons/av/volume-off' {
-  export import AvVolumeOff = __MaterialUI.SvgIcon;
-  export default AvVolumeOff;
-}
-
-declare module 'material-ui/lib/svg-icons/av/subscriptions' {
-  export import AvSubscriptions = __MaterialUI.SvgIcon;
-  export default AvSubscriptions;
-}
-
-declare module 'material-ui/lib/svg-icons/av/play-arrow' {
-  export import AvPlayArrow = __MaterialUI.SvgIcon;
-  export default AvPlayArrow;
-}
-
-declare module 'material-ui/lib/svg-icons/av/play-circle-outline' {
-  export import AvPlayCircleOutline = __MaterialUI.SvgIcon;
-  export default AvPlayCircleOutline;
-}
-
-declare module 'material-ui/lib/svg-icons/av/replay-30' {
-  export import AvReplay30 = __MaterialUI.SvgIcon;
-  export default AvReplay30;
-}
-
-declare module 'material-ui/lib/svg-icons/av/videocam' {
-  export import AvVideocam = __MaterialUI.SvgIcon;
-  export default AvVideocam;
-}
-
-declare module 'material-ui/lib/svg-icons/av/replay-5' {
-  export import AvReplay5 = __MaterialUI.SvgIcon;
-  export default AvReplay5;
-}
-
-declare module 'material-ui/lib/svg-icons/av/forward-10' {
-  export import AvForward10 = __MaterialUI.SvgIcon;
-  export default AvForward10;
-}
-
-declare module 'material-ui/lib/svg-icons/av/recent-actors' {
-  export import AvRecentActors = __MaterialUI.SvgIcon;
-  export default AvRecentActors;
-}
-
-declare module 'material-ui/lib/svg-icons/av/replay-10' {
-  export import AvReplay10 = __MaterialUI.SvgIcon;
-  export default AvReplay10;
-}
-
-declare module 'material-ui/lib/svg-icons/av/repeat' {
-  export import AvRepeat = __MaterialUI.SvgIcon;
-  export default AvRepeat;
-}
-
-declare module 'material-ui/lib/svg-icons/av/queue-music' {
-  export import AvQueueMusic = __MaterialUI.SvgIcon;
-  export default AvQueueMusic;
-}
-
-declare module 'material-ui/lib/svg-icons/av/fiber-pin' {
-  export import AvFiberPin = __MaterialUI.SvgIcon;
-  export default AvFiberPin;
-}
-
-declare module 'material-ui/lib/svg-icons/av/new-releases' {
-  export import AvNewReleases = __MaterialUI.SvgIcon;
-  export default AvNewReleases;
-}
-
-declare module 'material-ui/lib/svg-icons/av/fiber-new' {
-  export import AvFiberNew = __MaterialUI.SvgIcon;
-  export default AvFiberNew;
-}
-
-declare module 'material-ui/lib/svg-icons/av/fiber-manual-record' {
-  export import AvFiberManualRecord = __MaterialUI.SvgIcon;
-  export default AvFiberManualRecord;
-}
-
-declare module 'material-ui/lib/svg-icons/av/hearing' {
-  export import AvHearing = __MaterialUI.SvgIcon;
-  export default AvHearing;
-}
-
-declare module 'material-ui/lib/svg-icons/av/loop' {
-  export import AvLoop = __MaterialUI.SvgIcon;
-  export default AvLoop;
-}
-
-declare module 'material-ui/lib/svg-icons/av/volume-up' {
-  export import AvVolumeUp = __MaterialUI.SvgIcon;
-  export default AvVolumeUp;
-}
-
-declare module 'material-ui/lib/svg-icons/av/high-quality' {
-  export import AvHighQuality = __MaterialUI.SvgIcon;
-  export default AvHighQuality;
-}
-
-declare module 'material-ui/lib/svg-icons/av/surround-sound' {
-  export import AvSurroundSound = __MaterialUI.SvgIcon;
-  export default AvSurroundSound;
-}
-
-declare module 'material-ui/lib/svg-icons/av/equalizer' {
-  export import AvEqualizer = __MaterialUI.SvgIcon;
-  export default AvEqualizer;
-}
-
-declare module 'material-ui/lib/svg-icons/av/music-video' {
-  export import AvMusicVideo = __MaterialUI.SvgIcon;
-  export default AvMusicVideo;
-}
-
-declare module 'material-ui/lib/svg-icons/av/shuffle' {
-  export import AvShuffle = __MaterialUI.SvgIcon;
-  export default AvShuffle;
-}
-
-declare module 'material-ui/lib/svg-icons/av/volume-down' {
-  export import AvVolumeDown = __MaterialUI.SvgIcon;
-  export default AvVolumeDown;
-}
-
-declare module 'material-ui/lib/svg-icons/av/radio' {
-  export import AvRadio = __MaterialUI.SvgIcon;
-  export default AvRadio;
-}
-
-declare module 'material-ui/lib/svg-icons/av/web-asset' {
-  export import AvWebAsset = __MaterialUI.SvgIcon;
-  export default AvWebAsset;
-}
-
-declare module 'material-ui/lib/svg-icons/av/replay' {
-  export import AvReplay = __MaterialUI.SvgIcon;
-  export default AvReplay;
-}
-
-declare module 'material-ui/lib/svg-icons/av/queue-play-next' {
-  export import AvQueuePlayNext = __MaterialUI.SvgIcon;
-  export default AvQueuePlayNext;
-}
-
-declare module 'material-ui/lib/svg-icons/av/closed-caption' {
-  export import AvClosedCaption = __MaterialUI.SvgIcon;
-  export default AvClosedCaption;
-}
-
-declare module 'material-ui/lib/svg-icons/av/fiber-dvr' {
-  export import AvFiberDvr = __MaterialUI.SvgIcon;
-  export default AvFiberDvr;
-}
-
-declare module 'material-ui/lib/svg-icons/av/explicit' {
-  export import AvExplicit = __MaterialUI.SvgIcon;
-  export default AvExplicit;
-}
-
-declare module 'material-ui/lib/svg-icons/av/games' {
-  export import AvGames = __MaterialUI.SvgIcon;
-  export default AvGames;
-}
-
-declare module 'material-ui/lib/svg-icons/av/videocam-off' {
-  export import AvVideocamOff = __MaterialUI.SvgIcon;
-  export default AvVideocamOff;
-}
-
-declare module 'material-ui/lib/svg-icons/av/hd' {
-  export import AvHd = __MaterialUI.SvgIcon;
-  export default AvHd;
-}
-
-declare module 'material-ui/lib/svg-icons/av/fast-rewind' {
-  export import AvFastRewind = __MaterialUI.SvgIcon;
-  export default AvFastRewind;
-}
-
-declare module 'material-ui/lib/svg-icons/av/add-to-queue' {
-  export import AvAddToQueue = __MaterialUI.SvgIcon;
-  export default AvAddToQueue;
-}
-
-declare module 'material-ui/lib/svg-icons/av/movie' {
-  export import AvMovie = __MaterialUI.SvgIcon;
-  export default AvMovie;
-}
-
-declare module 'material-ui/lib/svg-icons/av/library-books' {
-  export import AvLibraryBooks = __MaterialUI.SvgIcon;
-  export default AvLibraryBooks;
-}
-
-declare module 'material-ui/lib/svg-icons/av/art-track' {
-  export import AvArtTrack = __MaterialUI.SvgIcon;
-  export default AvArtTrack;
-}
-
-declare module 'material-ui/lib/svg-icons/av/web' {
-  export import AvWeb = __MaterialUI.SvgIcon;
-  export default AvWeb;
-}
-
-declare module 'material-ui/lib/svg-icons/av/play-circle-filled' {
-  export import AvPlayCircleFilled = __MaterialUI.SvgIcon;
-  export default AvPlayCircleFilled;
-}
-
-declare module 'material-ui/lib/svg-icons/av/snooze' {
-  export import AvSnooze = __MaterialUI.SvgIcon;
-  export default AvSnooze;
-}
-
-declare module 'material-ui/lib/svg-icons/av/forward-5' {
-  export import AvForward5 = __MaterialUI.SvgIcon;
-  export default AvForward5;
-}
-
-declare module 'material-ui/lib/svg-icons/av/sort-by-alpha' {
-  export import AvSortByAlpha = __MaterialUI.SvgIcon;
-  export default AvSortByAlpha;
-}
-
-declare module 'material-ui/lib/svg-icons/av/pause-circle-filled' {
-  export import AvPauseCircleFilled = __MaterialUI.SvgIcon;
-  export default AvPauseCircleFilled;
-}
-
-declare module 'material-ui/lib/svg-icons/av/fiber-smart-record' {
-  export import AvFiberSmartRecord = __MaterialUI.SvgIcon;
-  export default AvFiberSmartRecord;
-}
-
-declare module 'material-ui/lib/svg-icons/av/stop' {
-  export import AvStop = __MaterialUI.SvgIcon;
-  export default AvStop;
-}
-
-declare module 'material-ui/lib/svg-icons/av/playlist-play' {
-  export import AvPlaylistPlay = __MaterialUI.SvgIcon;
-  export default AvPlaylistPlay;
-}
-
-declare module 'material-ui/lib/svg-icons/av/library-add' {
-  export import AvLibraryAdd = __MaterialUI.SvgIcon;
-  export default AvLibraryAdd;
-}
-
-declare module 'material-ui/lib/svg-icons/av/volume-mute' {
-  export import AvVolumeMute = __MaterialUI.SvgIcon;
-  export default AvVolumeMute;
-}
-
-declare module 'material-ui/lib/svg-icons/av/skip-next' {
-  export import AvSkipNext = __MaterialUI.SvgIcon;
-  export default AvSkipNext;
-}
-
-declare module 'material-ui/lib/svg-icons/av/forward-30' {
-  export import AvForward30 = __MaterialUI.SvgIcon;
-  export default AvForward30;
-}
-
-declare module 'material-ui/lib/svg-icons/av/playlist-add' {
-  export import AvPlaylistAdd = __MaterialUI.SvgIcon;
-  export default AvPlaylistAdd;
-}
-
-declare module 'material-ui/lib/svg-icons/av/album' {
-  export import AvAlbum = __MaterialUI.SvgIcon;
-  export default AvAlbum;
-}
-
-declare module 'material-ui/lib/svg-icons/av/video-library' {
-  export import AvVideoLibrary = __MaterialUI.SvgIcon;
-  export default AvVideoLibrary;
-}
-
-declare module 'material-ui/lib/svg-icons/av/library-music' {
-  export import AvLibraryMusic = __MaterialUI.SvgIcon;
-  export default AvLibraryMusic;
-}
-
-declare module 'material-ui/lib/svg-icons/av/not-interested' {
-  export import AvNotInterested = __MaterialUI.SvgIcon;
-  export default AvNotInterested;
-}
-
-declare module 'material-ui/lib/svg-icons/av/playlist-add-check' {
-  export import AvPlaylistAddCheck = __MaterialUI.SvgIcon;
-  export default AvPlaylistAddCheck;
-}
-
-declare module 'material-ui/lib/svg-icons/av/mic-none' {
-  export import AvMicNone = __MaterialUI.SvgIcon;
-  export default AvMicNone;
-}
-
-declare module 'material-ui/lib/svg-icons/av/pause' {
-  export import AvPause = __MaterialUI.SvgIcon;
-  export default AvPause;
-}
-
-declare module 'material-ui/lib/svg-icons/av/remove-from-queue' {
-  export import AvRemoveFromQueue = __MaterialUI.SvgIcon;
-  export default AvRemoveFromQueue;
-}
-
-declare module 'material-ui/lib/svg-icons/av/slow-motion-video' {
-  export import AvSlowMotionVideo = __MaterialUI.SvgIcon;
-  export default AvSlowMotionVideo;
-}
-
-declare module 'material-ui/lib/svg-icons/av/subtitles' {
-  export import AvSubtitles = __MaterialUI.SvgIcon;
-  export default AvSubtitles;
-}
-
-declare module 'material-ui/lib/svg-icons/av/mic-off' {
-  export import AvMicOff = __MaterialUI.SvgIcon;
-  export default AvMicOff;
-}
-
-declare module 'material-ui/lib/svg-icons/av/repeat-one' {
-  export import AvRepeatOne = __MaterialUI.SvgIcon;
-  export default AvRepeatOne;
-}
-
-declare module 'material-ui/lib/svg-icons/av/queue' {
-  export import AvQueue = __MaterialUI.SvgIcon;
-  export default AvQueue;
-}
-
-declare module 'material-ui/lib/svg-icons/av/fast-forward' {
-  export import AvFastForward = __MaterialUI.SvgIcon;
-  export default AvFastForward;
-}
-
-declare module 'material-ui/lib/svg-icons/av/mic' {
-  export import AvMic = __MaterialUI.SvgIcon;
-  export default AvMic;
-}
-
-declare module 'material-ui/lib/svg-icons/av/av-timer' {
-  export import AvAvTimer = __MaterialUI.SvgIcon;
-  export default AvAvTimer;
-}
-
-declare module 'material-ui/lib/svg-icons/av/pause-circle-outline' {
-  export import AvPauseCircleOutline = __MaterialUI.SvgIcon;
-  export default AvPauseCircleOutline;
-}
-
-declare module 'material-ui/lib/svg-icons/av/airplay' {
-  export import AvAirplay = __MaterialUI.SvgIcon;
-  export default AvAirplay;
-}
-
-declare module 'material-ui/lib/svg-icons/image/camera-rear' {
-  export import ImageCameraRear = __MaterialUI.SvgIcon;
-  export default ImageCameraRear;
-}
-
-declare module 'material-ui/lib/svg-icons/image/add-a-photo' {
-  export import ImageAddAPhoto = __MaterialUI.SvgIcon;
-  export default ImageAddAPhoto;
-}
-
-declare module 'material-ui/lib/svg-icons/image/portrait' {
-  export import ImagePortrait = __MaterialUI.SvgIcon;
-  export default ImagePortrait;
-}
-
-declare module 'material-ui/lib/svg-icons/image/looks' {
-  export import ImageLooks = __MaterialUI.SvgIcon;
-  export default ImageLooks;
-}
-
-declare module 'material-ui/lib/svg-icons/image/exposure-neg-2' {
-  export import ImageExposureNeg2 = __MaterialUI.SvgIcon;
-  export default ImageExposureNeg2;
-}
-
-declare module 'material-ui/lib/svg-icons/image/wb-cloudy' {
-  export import ImageWbCloudy = __MaterialUI.SvgIcon;
-  export default ImageWbCloudy;
-}
-
-declare module 'material-ui/lib/svg-icons/image/switch-video' {
-  export import ImageSwitchVideo = __MaterialUI.SvgIcon;
-  export default ImageSwitchVideo;
-}
-
-declare module 'material-ui/lib/svg-icons/image/wb-auto' {
-  export import ImageWbAuto = __MaterialUI.SvgIcon;
-  export default ImageWbAuto;
-}
-
-declare module 'material-ui/lib/svg-icons/image/filter-center-focus' {
-  export import ImageFilterCenterFocus = __MaterialUI.SvgIcon;
-  export default ImageFilterCenterFocus;
-}
-
-declare module 'material-ui/lib/svg-icons/image/crop-7-5' {
-  export import ImageCrop75 = __MaterialUI.SvgIcon;
-  export default ImageCrop75;
-}
-
-declare module 'material-ui/lib/svg-icons/image/crop-3-2' {
-  export import ImageCrop32 = __MaterialUI.SvgIcon;
-  export default ImageCrop32;
-}
-
-declare module 'material-ui/lib/svg-icons/image/assistant-photo' {
-  export import ImageAssistantPhoto = __MaterialUI.SvgIcon;
-  export default ImageAssistantPhoto;
-}
-
-declare module 'material-ui/lib/svg-icons/image/looks-one' {
-  export import ImageLooksOne = __MaterialUI.SvgIcon;
-  export default ImageLooksOne;
-}
-
-declare module 'material-ui/lib/svg-icons/image/collections-bookmark' {
-  export import ImageCollectionsBookmark = __MaterialUI.SvgIcon;
-  export default ImageCollectionsBookmark;
-}
-
-declare module 'material-ui/lib/svg-icons/image/image-aspect-ratio' {
-  export import ImageImageAspectRatio = __MaterialUI.SvgIcon;
-  export default ImageImageAspectRatio;
-}
-
-declare module 'material-ui/lib/svg-icons/image/brush' {
-  export import ImageBrush = __MaterialUI.SvgIcon;
-  export default ImageBrush;
-}
-
-declare module 'material-ui/lib/svg-icons/image/linked-camera' {
-  export import ImageLinkedCamera = __MaterialUI.SvgIcon;
-  export default ImageLinkedCamera;
-}
-
-declare module 'material-ui/lib/svg-icons/image/filter-1' {
-  export import ImageFilter1 = __MaterialUI.SvgIcon;
-  export default ImageFilter1;
-}
-
-declare module 'material-ui/lib/svg-icons/image/edit' {
-  export import ImageEdit = __MaterialUI.SvgIcon;
-  export default ImageEdit;
-}
-
-declare module 'material-ui/lib/svg-icons/image/timelapse' {
-  export import ImageTimelapse = __MaterialUI.SvgIcon;
-  export default ImageTimelapse;
-}
-
-declare module 'material-ui/lib/svg-icons/image/nature' {
-  export import ImageNature = __MaterialUI.SvgIcon;
-  export default ImageNature;
-}
-
-declare module 'material-ui/lib/svg-icons/image/monochrome-photos' {
-  export import ImageMonochromePhotos = __MaterialUI.SvgIcon;
-  export default ImageMonochromePhotos;
-}
-
-declare module 'material-ui/lib/svg-icons/image/brightness-6' {
-  export import ImageBrightness6 = __MaterialUI.SvgIcon;
-  export default ImageBrightness6;
-}
-
-declare module 'material-ui/lib/svg-icons/image/music-note' {
-  export import ImageMusicNote = __MaterialUI.SvgIcon;
-  export default ImageMusicNote;
-}
-
-declare module 'material-ui/lib/svg-icons/image/collections' {
-  export import ImageCollections = __MaterialUI.SvgIcon;
-  export default ImageCollections;
-}
-
-declare module 'material-ui/lib/svg-icons/image/wb-sunny' {
-  export import ImageWbSunny = __MaterialUI.SvgIcon;
-  export default ImageWbSunny;
-}
-
-declare module 'material-ui/lib/svg-icons/image/hdr-strong' {
-  export import ImageHdrStrong = __MaterialUI.SvgIcon;
-  export default ImageHdrStrong;
-}
-
-declare module 'material-ui/lib/svg-icons/image/panorama-vertical' {
-  export import ImagePanoramaVertical = __MaterialUI.SvgIcon;
-  export default ImagePanoramaVertical;
-}
-
-declare module 'material-ui/lib/svg-icons/image/navigate-next' {
-  export import ImageNavigateNext = __MaterialUI.SvgIcon;
-  export default ImageNavigateNext;
-}
-
-declare module 'material-ui/lib/svg-icons/image/looks-4' {
-  export import ImageLooks4 = __MaterialUI.SvgIcon;
-  export default ImageLooks4;
-}
-
-declare module 'material-ui/lib/svg-icons/image/filter-4' {
-  export import ImageFilter4 = __MaterialUI.SvgIcon;
-  export default ImageFilter4;
-}
-
-declare module 'material-ui/lib/svg-icons/image/brightness-1' {
-  export import ImageBrightness1 = __MaterialUI.SvgIcon;
-  export default ImageBrightness1;
-}
-
-declare module 'material-ui/lib/svg-icons/image/exposure-plus-1' {
-  export import ImageExposurePlus1 = __MaterialUI.SvgIcon;
-  export default ImageExposurePlus1;
-}
-
-declare module 'material-ui/lib/svg-icons/image/timer-3' {
-  export import ImageTimer3 = __MaterialUI.SvgIcon;
-  export default ImageTimer3;
-}
-
-declare module 'material-ui/lib/svg-icons/image/exposure-zero' {
-  export import ImageExposureZero = __MaterialUI.SvgIcon;
-  export default ImageExposureZero;
-}
-
-declare module 'material-ui/lib/svg-icons/image/blur-linear' {
-  export import ImageBlurLinear = __MaterialUI.SvgIcon;
-  export default ImageBlurLinear;
-}
-
-declare module 'material-ui/lib/svg-icons/image/photo-library' {
-  export import ImagePhotoLibrary = __MaterialUI.SvgIcon;
-  export default ImagePhotoLibrary;
-}
-
-declare module 'material-ui/lib/svg-icons/image/filter-drama' {
-  export import ImageFilterDrama = __MaterialUI.SvgIcon;
-  export default ImageFilterDrama;
-}
-
-declare module 'material-ui/lib/svg-icons/image/dehaze' {
-  export import ImageDehaze = __MaterialUI.SvgIcon;
-  export default ImageDehaze;
-}
-
-declare module 'material-ui/lib/svg-icons/image/control-point-duplicate' {
-  export import ImageControlPointDuplicate = __MaterialUI.SvgIcon;
-  export default ImageControlPointDuplicate;
-}
-
-declare module 'material-ui/lib/svg-icons/image/image' {
-  export import ImageImage = __MaterialUI.SvgIcon;
-  export default ImageImage;
-}
-
-declare module 'material-ui/lib/svg-icons/image/flash-auto' {
-  export import ImageFlashAuto = __MaterialUI.SvgIcon;
-  export default ImageFlashAuto;
-}
-
-declare module 'material-ui/lib/svg-icons/image/rotate-90-degrees-ccw' {
-  export import ImageRotate90DegreesCcw = __MaterialUI.SvgIcon;
-  export default ImageRotate90DegreesCcw;
-}
-
-declare module 'material-ui/lib/svg-icons/image/blur-circular' {
-  export import ImageBlurCircular = __MaterialUI.SvgIcon;
-  export default ImageBlurCircular;
-}
-
-declare module 'material-ui/lib/svg-icons/image/filter-3' {
-  export import ImageFilter3 = __MaterialUI.SvgIcon;
-  export default ImageFilter3;
-}
-
-declare module 'material-ui/lib/svg-icons/image/exposure-plus-2' {
-  export import ImageExposurePlus2 = __MaterialUI.SvgIcon;
-  export default ImageExposurePlus2;
-}
-
-declare module 'material-ui/lib/svg-icons/image/flash-on' {
-  export import ImageFlashOn = __MaterialUI.SvgIcon;
-  export default ImageFlashOn;
-}
-
-declare module 'material-ui/lib/svg-icons/image/view-comfy' {
-  export import ImageViewComfy = __MaterialUI.SvgIcon;
-  export default ImageViewComfy;
-}
-
-declare module 'material-ui/lib/svg-icons/image/colorize' {
-  export import ImageColorize = __MaterialUI.SvgIcon;
-  export default ImageColorize;
-}
-
-declare module 'material-ui/lib/svg-icons/image/brightness-4' {
-  export import ImageBrightness4 = __MaterialUI.SvgIcon;
-  export default ImageBrightness4;
-}
-
-declare module 'material-ui/lib/svg-icons/image/crop-free' {
-  export import ImageCropFree = __MaterialUI.SvgIcon;
-  export default ImageCropFree;
-}
-
-declare module 'material-ui/lib/svg-icons/image/vignette' {
-  export import ImageVignette = __MaterialUI.SvgIcon;
-  export default ImageVignette;
-}
-
-declare module 'material-ui/lib/svg-icons/image/tag-faces' {
-  export import ImageTagFaces = __MaterialUI.SvgIcon;
-  export default ImageTagFaces;
-}
-
-declare module 'material-ui/lib/svg-icons/image/brightness-7' {
-  export import ImageBrightness7 = __MaterialUI.SvgIcon;
-  export default ImageBrightness7;
-}
-
-declare module 'material-ui/lib/svg-icons/image/healing' {
-  export import ImageHealing = __MaterialUI.SvgIcon;
-  export default ImageHealing;
-}
-
-declare module 'material-ui/lib/svg-icons/image/nature-people' {
-  export import ImageNaturePeople = __MaterialUI.SvgIcon;
-  export default ImageNaturePeople;
-}
-
-declare module 'material-ui/lib/svg-icons/image/gradient' {
-  export import ImageGradient = __MaterialUI.SvgIcon;
-  export default ImageGradient;
-}
-
-declare module 'material-ui/lib/svg-icons/image/flash-off' {
-  export import ImageFlashOff = __MaterialUI.SvgIcon;
-  export default ImageFlashOff;
-}
-
-declare module 'material-ui/lib/svg-icons/image/movie-creation' {
-  export import ImageMovieCreation = __MaterialUI.SvgIcon;
-  export default ImageMovieCreation;
-}
-
-declare module 'material-ui/lib/svg-icons/image/leak-add' {
-  export import ImageLeakAdd = __MaterialUI.SvgIcon;
-  export default ImageLeakAdd;
-}
-
-declare module 'material-ui/lib/svg-icons/image/filter-5' {
-  export import ImageFilter5 = __MaterialUI.SvgIcon;
-  export default ImageFilter5;
-}
-
-declare module 'material-ui/lib/svg-icons/image/photo' {
-  export import ImagePhoto = __MaterialUI.SvgIcon;
-  export default ImagePhoto;
-}
-
-declare module 'material-ui/lib/svg-icons/image/color-lens' {
-  export import ImageColorLens = __MaterialUI.SvgIcon;
-  export default ImageColorLens;
-}
-
-declare module 'material-ui/lib/svg-icons/image/broken-image' {
-  export import ImageBrokenImage = __MaterialUI.SvgIcon;
-  export default ImageBrokenImage;
-}
-
-declare module 'material-ui/lib/svg-icons/image/looks-6' {
-  export import ImageLooks6 = __MaterialUI.SvgIcon;
-  export default ImageLooks6;
-}
-
-declare module 'material-ui/lib/svg-icons/image/picture-as-pdf' {
-  export import ImagePictureAsPdf = __MaterialUI.SvgIcon;
-  export default ImagePictureAsPdf;
-}
-
-declare module 'material-ui/lib/svg-icons/image/palette' {
-  export import ImagePalette = __MaterialUI.SvgIcon;
-  export default ImagePalette;
-}
-
-declare module 'material-ui/lib/svg-icons/image/crop-landscape' {
-  export import ImageCropLandscape = __MaterialUI.SvgIcon;
-  export default ImageCropLandscape;
-}
-
-declare module 'material-ui/lib/svg-icons/image/grid-on' {
-  export import ImageGridOn = __MaterialUI.SvgIcon;
-  export default ImageGridOn;
-}
-
-declare module 'material-ui/lib/svg-icons/image/slideshow' {
-  export import ImageSlideshow = __MaterialUI.SvgIcon;
-  export default ImageSlideshow;
-}
-
-declare module 'material-ui/lib/svg-icons/image/brightness-3' {
-  export import ImageBrightness3 = __MaterialUI.SvgIcon;
-  export default ImageBrightness3;
-}
-
-declare module 'material-ui/lib/svg-icons/image/style' {
-  export import ImageStyle = __MaterialUI.SvgIcon;
-  export default ImageStyle;
-}
-
-declare module 'material-ui/lib/svg-icons/image/filter-vintage' {
-  export import ImageFilterVintage = __MaterialUI.SvgIcon;
-  export default ImageFilterVintage;
-}
-
-declare module 'material-ui/lib/svg-icons/image/tune' {
-  export import ImageTune = __MaterialUI.SvgIcon;
-  export default ImageTune;
-}
-
-declare module 'material-ui/lib/svg-icons/image/camera' {
-  export import ImageCamera = __MaterialUI.SvgIcon;
-  export default ImageCamera;
-}
-
-declare module 'material-ui/lib/svg-icons/image/timer' {
-  export import ImageTimer = __MaterialUI.SvgIcon;
-  export default ImageTimer;
-}
-
-declare module 'material-ui/lib/svg-icons/image/landscape' {
-  export import ImageLandscape = __MaterialUI.SvgIcon;
-  export default ImageLandscape;
-}
-
-declare module 'material-ui/lib/svg-icons/image/crop-16-9' {
-  export import ImageCrop169 = __MaterialUI.SvgIcon;
-  export default ImageCrop169;
-}
-
-declare module 'material-ui/lib/svg-icons/image/add-to-photos' {
-  export import ImageAddToPhotos = __MaterialUI.SvgIcon;
-  export default ImageAddToPhotos;
-}
-
-declare module 'material-ui/lib/svg-icons/image/wb-incandescent' {
-  export import ImageWbIncandescent = __MaterialUI.SvgIcon;
-  export default ImageWbIncandescent;
-}
-
-declare module 'material-ui/lib/svg-icons/image/hdr-weak' {
-  export import ImageHdrWeak = __MaterialUI.SvgIcon;
-  export default ImageHdrWeak;
-}
-
-declare module 'material-ui/lib/svg-icons/image/details' {
-  export import ImageDetails = __MaterialUI.SvgIcon;
-  export default ImageDetails;
-}
-
-declare module 'material-ui/lib/svg-icons/image/view-compact' {
-  export import ImageViewCompact = __MaterialUI.SvgIcon;
-  export default ImageViewCompact;
-}
-
-declare module 'material-ui/lib/svg-icons/image/brightness-5' {
-  export import ImageBrightness5 = __MaterialUI.SvgIcon;
-  export default ImageBrightness5;
-}
-
-declare module 'material-ui/lib/svg-icons/image/center-focus-weak' {
-  export import ImageCenterFocusWeak = __MaterialUI.SvgIcon;
-  export default ImageCenterFocusWeak;
-}
-
-declare module 'material-ui/lib/svg-icons/image/adjust' {
-  export import ImageAdjust = __MaterialUI.SvgIcon;
-  export default ImageAdjust;
-}
-
-declare module 'material-ui/lib/svg-icons/image/camera-front' {
-  export import ImageCameraFront = __MaterialUI.SvgIcon;
-  export default ImageCameraFront;
-}
-
-declare module 'material-ui/lib/svg-icons/image/transform' {
-  export import ImageTransform = __MaterialUI.SvgIcon;
-  export default ImageTransform;
-}
-
-declare module 'material-ui/lib/svg-icons/image/filter' {
-  export import ImageFilter = __MaterialUI.SvgIcon;
-  export default ImageFilter;
-}
-
-declare module 'material-ui/lib/svg-icons/image/grain' {
-  export import ImageGrain = __MaterialUI.SvgIcon;
-  export default ImageGrain;
-}
-
-declare module 'material-ui/lib/svg-icons/image/filter-9-plus' {
-  export import ImageFilter9Plus = __MaterialUI.SvgIcon;
-  export default ImageFilter9Plus;
-}
-
-declare module 'material-ui/lib/svg-icons/image/looks-5' {
-  export import ImageLooks5 = __MaterialUI.SvgIcon;
-  export default ImageLooks5;
-}
-
-declare module 'material-ui/lib/svg-icons/image/hdr-on' {
-  export import ImageHdrOn = __MaterialUI.SvgIcon;
-  export default ImageHdrOn;
-}
-
-declare module 'material-ui/lib/svg-icons/image/audiotrack' {
-  export import ImageAudiotrack = __MaterialUI.SvgIcon;
-  export default ImageAudiotrack;
-}
-
-declare module 'material-ui/lib/svg-icons/image/compare' {
-  export import ImageCompare = __MaterialUI.SvgIcon;
-  export default ImageCompare;
-}
-
-declare module 'material-ui/lib/svg-icons/image/crop' {
-  export import ImageCrop = __MaterialUI.SvgIcon;
-  export default ImageCrop;
-}
-
-declare module 'material-ui/lib/svg-icons/image/texture' {
-  export import ImageTexture = __MaterialUI.SvgIcon;
-  export default ImageTexture;
-}
-
-declare module 'material-ui/lib/svg-icons/image/movie-filter' {
-  export import ImageMovieFilter = __MaterialUI.SvgIcon;
-  export default ImageMovieFilter;
-}
-
-declare module 'material-ui/lib/svg-icons/image/exposure' {
-  export import ImageExposure = __MaterialUI.SvgIcon;
-  export default ImageExposure;
-}
-
-declare module 'material-ui/lib/svg-icons/image/filter-b-and-w' {
-  export import ImageFilterBAndW = __MaterialUI.SvgIcon;
-  export default ImageFilterBAndW;
-}
-
-declare module 'material-ui/lib/svg-icons/image/photo-size-select-actual' {
-  export import ImagePhotoSizeSelectActual = __MaterialUI.SvgIcon;
-  export default ImagePhotoSizeSelectActual;
-}
-
-declare module 'material-ui/lib/svg-icons/image/crop-5-4' {
-  export import ImageCrop54 = __MaterialUI.SvgIcon;
-  export default ImageCrop54;
-}
-
-declare module 'material-ui/lib/svg-icons/image/brightness-2' {
-  export import ImageBrightness2 = __MaterialUI.SvgIcon;
-  export default ImageBrightness2;
-}
-
-declare module 'material-ui/lib/svg-icons/image/tonality' {
-  export import ImageTonality = __MaterialUI.SvgIcon;
-  export default ImageTonality;
-}
-
-declare module 'material-ui/lib/svg-icons/image/panorama-wide-angle' {
-  export import ImagePanoramaWideAngle = __MaterialUI.SvgIcon;
-  export default ImagePanoramaWideAngle;
-}
-
-declare module 'material-ui/lib/svg-icons/image/flip' {
-  export import ImageFlip = __MaterialUI.SvgIcon;
-  export default ImageFlip;
-}
-
-declare module 'material-ui/lib/svg-icons/image/filter-9' {
-  export import ImageFilter9 = __MaterialUI.SvgIcon;
-  export default ImageFilter9;
-}
-
-declare module 'material-ui/lib/svg-icons/image/blur-on' {
-  export import ImageBlurOn = __MaterialUI.SvgIcon;
-  export default ImageBlurOn;
-}
-
-declare module 'material-ui/lib/svg-icons/image/assistant' {
-  export import ImageAssistant = __MaterialUI.SvgIcon;
-  export default ImageAssistant;
-}
-
-declare module 'material-ui/lib/svg-icons/image/lens' {
-  export import ImageLens = __MaterialUI.SvgIcon;
-  export default ImageLens;
-}
-
-declare module 'material-ui/lib/svg-icons/image/switch-camera' {
-  export import ImageSwitchCamera = __MaterialUI.SvgIcon;
-  export default ImageSwitchCamera;
-}
-
-declare module 'material-ui/lib/svg-icons/image/photo-filter' {
-  export import ImagePhotoFilter = __MaterialUI.SvgIcon;
-  export default ImagePhotoFilter;
-}
-
-declare module 'material-ui/lib/svg-icons/image/wb-iridescent' {
-  export import ImageWbIridescent = __MaterialUI.SvgIcon;
-  export default ImageWbIridescent;
-}
-
-declare module 'material-ui/lib/svg-icons/image/crop-square' {
-  export import ImageCropSquare = __MaterialUI.SvgIcon;
-  export default ImageCropSquare;
-}
-
-declare module 'material-ui/lib/svg-icons/image/timer-10' {
-  export import ImageTimer10 = __MaterialUI.SvgIcon;
-  export default ImageTimer10;
-}
-
-declare module 'material-ui/lib/svg-icons/image/rotate-right' {
-  export import ImageRotateRight = __MaterialUI.SvgIcon;
-  export default ImageRotateRight;
-}
-
-declare module 'material-ui/lib/svg-icons/image/grid-off' {
-  export import ImageGridOff = __MaterialUI.SvgIcon;
-  export default ImageGridOff;
-}
-
-declare module 'material-ui/lib/svg-icons/image/filter-7' {
-  export import ImageFilter7 = __MaterialUI.SvgIcon;
-  export default ImageFilter7;
-}
-
-declare module 'material-ui/lib/svg-icons/image/loupe' {
-  export import ImageLoupe = __MaterialUI.SvgIcon;
-  export default ImageLoupe;
-}
-
-declare module 'material-ui/lib/svg-icons/image/filter-6' {
-  export import ImageFilter6 = __MaterialUI.SvgIcon;
-  export default ImageFilter6;
-}
-
-declare module 'material-ui/lib/svg-icons/image/filter-tilt-shift' {
-  export import ImageFilterTiltShift = __MaterialUI.SvgIcon;
-  export default ImageFilterTiltShift;
-}
-
-declare module 'material-ui/lib/svg-icons/image/crop-din' {
-  export import ImageCropDin = __MaterialUI.SvgIcon;
-  export default ImageCropDin;
-}
-
-declare module 'material-ui/lib/svg-icons/image/center-focus-strong' {
-  export import ImageCenterFocusStrong = __MaterialUI.SvgIcon;
-  export default ImageCenterFocusStrong;
-}
-
-declare module 'material-ui/lib/svg-icons/image/rotate-left' {
-  export import ImageRotateLeft = __MaterialUI.SvgIcon;
-  export default ImageRotateLeft;
-}
-
-declare module 'material-ui/lib/svg-icons/image/filter-hdr' {
-  export import ImageFilterHdr = __MaterialUI.SvgIcon;
-  export default ImageFilterHdr;
-}
-
-declare module 'material-ui/lib/svg-icons/image/timer-off' {
-  export import ImageTimerOff = __MaterialUI.SvgIcon;
-  export default ImageTimerOff;
-}
-
-declare module 'material-ui/lib/svg-icons/image/straighten' {
-  export import ImageStraighten = __MaterialUI.SvgIcon;
-  export default ImageStraighten;
-}
-
-declare module 'material-ui/lib/svg-icons/image/exposure-neg-1' {
-  export import ImageExposureNeg1 = __MaterialUI.SvgIcon;
-  export default ImageExposureNeg1;
-}
-
-declare module 'material-ui/lib/svg-icons/image/navigate-before' {
-  export import ImageNavigateBefore = __MaterialUI.SvgIcon;
-  export default ImageNavigateBefore;
-}
-
-declare module 'material-ui/lib/svg-icons/image/iso' {
-  export import ImageIso = __MaterialUI.SvgIcon;
-  export default ImageIso;
-}
-
-declare module 'material-ui/lib/svg-icons/image/photo-album' {
-  export import ImagePhotoAlbum = __MaterialUI.SvgIcon;
-  export default ImagePhotoAlbum;
-}
-
-declare module 'material-ui/lib/svg-icons/image/crop-rotate' {
-  export import ImageCropRotate = __MaterialUI.SvgIcon;
-  export default ImageCropRotate;
-}
-
-declare module 'material-ui/lib/svg-icons/image/remove-red-eye' {
-  export import ImageRemoveRedEye = __MaterialUI.SvgIcon;
-  export default ImageRemoveRedEye;
-}
-
-declare module 'material-ui/lib/svg-icons/image/crop-portrait' {
-  export import ImageCropPortrait = __MaterialUI.SvgIcon;
-  export default ImageCropPortrait;
-}
-
-declare module 'material-ui/lib/svg-icons/image/camera-alt' {
-  export import ImageCameraAlt = __MaterialUI.SvgIcon;
-  export default ImageCameraAlt;
-}
-
-declare module 'material-ui/lib/svg-icons/image/control-point' {
-  export import ImageControlPoint = __MaterialUI.SvgIcon;
-  export default ImageControlPoint;
-}
-
-declare module 'material-ui/lib/svg-icons/image/panorama' {
-  export import ImagePanorama = __MaterialUI.SvgIcon;
-  export default ImagePanorama;
-}
-
-declare module 'material-ui/lib/svg-icons/image/panorama-fish-eye' {
-  export import ImagePanoramaFishEye = __MaterialUI.SvgIcon;
-  export default ImagePanoramaFishEye;
-}
-
-declare module 'material-ui/lib/svg-icons/image/filter-8' {
-  export import ImageFilter8 = __MaterialUI.SvgIcon;
-  export default ImageFilter8;
-}
-
-declare module 'material-ui/lib/svg-icons/image/looks-two' {
-  export import ImageLooksTwo = __MaterialUI.SvgIcon;
-  export default ImageLooksTwo;
-}
-
-declare module 'material-ui/lib/svg-icons/image/panorama-horizontal' {
-  export import ImagePanoramaHorizontal = __MaterialUI.SvgIcon;
-  export default ImagePanoramaHorizontal;
-}
-
-declare module 'material-ui/lib/svg-icons/image/looks-3' {
-  export import ImageLooks3 = __MaterialUI.SvgIcon;
-  export default ImageLooks3;
-}
-
-declare module 'material-ui/lib/svg-icons/image/filter-none' {
-  export import ImageFilterNone = __MaterialUI.SvgIcon;
-  export default ImageFilterNone;
-}
-
-declare module 'material-ui/lib/svg-icons/image/photo-size-select-large' {
-  export import ImagePhotoSizeSelectLarge = __MaterialUI.SvgIcon;
-  export default ImagePhotoSizeSelectLarge;
-}
-
-declare module 'material-ui/lib/svg-icons/image/blur-off' {
-  export import ImageBlurOff = __MaterialUI.SvgIcon;
-  export default ImageBlurOff;
-}
-
-declare module 'material-ui/lib/svg-icons/image/camera-roll' {
-  export import ImageCameraRoll = __MaterialUI.SvgIcon;
-  export default ImageCameraRoll;
-}
-
-declare module 'material-ui/lib/svg-icons/image/leak-remove' {
-  export import ImageLeakRemove = __MaterialUI.SvgIcon;
-  export default ImageLeakRemove;
-}
-
-declare module 'material-ui/lib/svg-icons/image/filter-frames' {
-  export import ImageFilterFrames = __MaterialUI.SvgIcon;
-  export default ImageFilterFrames;
-}
-
-declare module 'material-ui/lib/svg-icons/image/flare' {
-  export import ImageFlare = __MaterialUI.SvgIcon;
-  export default ImageFlare;
-}
-
-declare module 'material-ui/lib/svg-icons/image/photo-size-select-small' {
-  export import ImagePhotoSizeSelectSmall = __MaterialUI.SvgIcon;
-  export default ImagePhotoSizeSelectSmall;
-}
-
-declare module 'material-ui/lib/svg-icons/image/photo-camera' {
-  export import ImagePhotoCamera = __MaterialUI.SvgIcon;
-  export default ImagePhotoCamera;
-}
-
-declare module 'material-ui/lib/svg-icons/image/hdr-off' {
-  export import ImageHdrOff = __MaterialUI.SvgIcon;
-  export default ImageHdrOff;
-}
-
-declare module 'material-ui/lib/svg-icons/image/filter-2' {
-  export import ImageFilter2 = __MaterialUI.SvgIcon;
-  export default ImageFilter2;
-}
-
-declare module 'material-ui/lib/svg-icons/image/crop-original' {
-  export import ImageCropOriginal = __MaterialUI.SvgIcon;
-  export default ImageCropOriginal;
-}
-
-declare module 'material-ui/lib/svg-icons/places/kitchen' {
-  export import PlacesKitchen = __MaterialUI.SvgIcon;
-  export default PlacesKitchen;
-}
-
-declare module 'material-ui/lib/svg-icons/places/spa' {
-  export import PlacesSpa = __MaterialUI.SvgIcon;
-  export default PlacesSpa;
-}
-
-declare module 'material-ui/lib/svg-icons/places/all-inclusive' {
-  export import PlacesAllInclusive = __MaterialUI.SvgIcon;
-  export default PlacesAllInclusive;
-}
-
-declare module 'material-ui/lib/svg-icons/places/ac-unit' {
-  export import PlacesAcUnit = __MaterialUI.SvgIcon;
-  export default PlacesAcUnit;
-}
-
-declare module 'material-ui/lib/svg-icons/places/child-care' {
-  export import PlacesChildCare = __MaterialUI.SvgIcon;
-  export default PlacesChildCare;
-}
-
-declare module 'material-ui/lib/svg-icons/places/golf-course' {
-  export import PlacesGolfCourse = __MaterialUI.SvgIcon;
-  export default PlacesGolfCourse;
-}
-
-declare module 'material-ui/lib/svg-icons/places/business-center' {
-  export import PlacesBusinessCenter = __MaterialUI.SvgIcon;
-  export default PlacesBusinessCenter;
-}
-
-declare module 'material-ui/lib/svg-icons/places/free-breakfast' {
-  export import PlacesFreeBreakfast = __MaterialUI.SvgIcon;
-  export default PlacesFreeBreakfast;
-}
-
-declare module 'material-ui/lib/svg-icons/places/fitness-center' {
-  export import PlacesFitnessCenter = __MaterialUI.SvgIcon;
-  export default PlacesFitnessCenter;
-}
-
-declare module 'material-ui/lib/svg-icons/places/pool' {
-  export import PlacesPool = __MaterialUI.SvgIcon;
-  export default PlacesPool;
-}
-
-declare module 'material-ui/lib/svg-icons/places/child-friendly' {
-  export import PlacesChildFriendly = __MaterialUI.SvgIcon;
-  export default PlacesChildFriendly;
-}
-
-declare module 'material-ui/lib/svg-icons/places/casino' {
-  export import PlacesCasino = __MaterialUI.SvgIcon;
-  export default PlacesCasino;
-}
-
-declare module 'material-ui/lib/svg-icons/places/hot-tub' {
-  export import PlacesHotTub = __MaterialUI.SvgIcon;
-  export default PlacesHotTub;
-}
-
-declare module 'material-ui/lib/svg-icons/places/smoke-free' {
-  export import PlacesSmokeFree = __MaterialUI.SvgIcon;
-  export default PlacesSmokeFree;
-}
-
-declare module 'material-ui/lib/svg-icons/places/room-service' {
-  export import PlacesRoomService = __MaterialUI.SvgIcon;
-  export default PlacesRoomService;
-}
-
-declare module 'material-ui/lib/svg-icons/places/smoking-rooms' {
-  export import PlacesSmokingRooms = __MaterialUI.SvgIcon;
-  export default PlacesSmokingRooms;
-}
-
-declare module 'material-ui/lib/svg-icons/places/beach-access' {
-  export import PlacesBeachAccess = __MaterialUI.SvgIcon;
-  export default PlacesBeachAccess;
-}
-
-declare module 'material-ui/lib/svg-icons/places/airport-shuttle' {
-  export import PlacesAirportShuttle = __MaterialUI.SvgIcon;
-  export default PlacesAirportShuttle;
-}
-
-declare module 'material-ui/lib/styles' {
-    export import AutoPrefix = __MaterialUI.Styles.AutoPrefix; // require('material-ui/lib/styles/auto-prefix');
-    export import Colors = __MaterialUI.Styles.Colors; // require('material-ui/lib/styles/colors');
-    export import Spacing = require('material-ui/lib/styles/spacing');
-    export import ThemeManager = __MaterialUI.Styles.ThemeManager; // require('material-ui/lib/styles/theme-manager');
-    export import Transitions = __MaterialUI.Styles.Transitions; // require('material-ui/lib/styles/transitions');
-    export import Typography = __MaterialUI.Styles.Typography; // require('material-ui/lib/styles/typography');
-    export import LightRawTheme = __MaterialUI.Styles.LightRawTheme; // require('material-ui/lib/styles/raw-themes/light-raw-theme'),
-    export import lightBaseTheme = __MaterialUI.Styles.lightBaseTheme;
-    export import DarkRawTheme = __MaterialUI.Styles.DarkRawTheme; // require('material-ui/lib/styles/raw-themes/dark-raw-theme'),
-    export import darkBaseTheme = __MaterialUI.Styles.darkBaseTheme;
-    export import ThemeDecorator = __MaterialUI.Styles.ThemeDecorator; //require('material-ui/lib/styles/theme-decorator');
-    export import ZIndex = __MaterialUI.Styles.zIndex; //require('material-ui/lib/styles/zIndex');
-    export import getMuiTheme = __MaterialUI.Styles.getMuiTheme;
-
-    export default {
-        AutoPrefix,
-        Colors,
-        Spacing,
-        ThemeManager,
-        Transitions,
-        Typography,
-        lightBaseTheme,
-        LightRawTheme,
-        darkBaseTheme,
-        DarkRawTheme,
-        ThemeDecorator,
-        getMuiTheme,
-        ZIndex,
-    };
-}
-
-declare module 'material-ui/lib/styles/auto-prefix' {
-    export import AutoPrefix = __MaterialUI.Styles.AutoPrefix;
-    export default AutoPrefix;
-}
-
-declare module 'material-ui/lib/styles/spacing' {
-    type Spacing = __MaterialUI.Styles.Spacing;
-    var Spacing: Spacing;
-    export default Spacing;
-}
-
-declare module 'material-ui/lib/styles/theme-manager' {
-    export import ThemeManager = __MaterialUI.Styles.ThemeManager;
-    export default ThemeManager;
-}
-
-declare module 'material-ui/lib/styles/transitions' {
-    export import Transitions = __MaterialUI.Styles.Transitions;
-    export default Transitions;
-}
-
-declare module 'material-ui/lib/styles/typography' {
-    export import Typography = __MaterialUI.Styles.Typography;
-    export default Typography;
-}
-
-declare module 'material-ui/lib/styles/raw-themes/light-raw-theme' {
-    export import LightRawTheme = __MaterialUI.Styles.LightRawTheme;
-    export default LightRawTheme;
-}
-
-declare module 'material-ui/lib/styles/raw-themes/dark-raw-theme' {
-    export import DarkRawTheme = __MaterialUI.Styles.DarkRawTheme;
-    export default DarkRawTheme;
-}
-
-declare module 'material-ui/lib/styles/theme-decorator' {
-    export import ThemeDecorator = __MaterialUI.Styles.ThemeDecorator;
-    export default ThemeDecorator;
-}
-
-
-declare module 'material-ui/lib/snackbar' {
-    export import Snackbar = __MaterialUI.Snackbar;
-    export default Snackbar;
-}
-
-declare module 'material-ui/lib/tabs/tab' {
-    export import Tab = __MaterialUI.Tabs.Tab;
-    export default Tab;
-}
-
-declare module 'material-ui/lib/tabs/tabs' {
-    export import Tabs = __MaterialUI.Tabs.Tabs;
-    export default Tabs;
-}
-
-declare module 'material-ui/lib/table/table' {
-    export import Table = __MaterialUI.Table.Table;
-    export default Table;
-}
-
-declare module 'material-ui/lib/table/table-body' {
-    export import TableBody = __MaterialUI.Table.TableBody;
-    export default TableBody;
-}
-
-declare module 'material-ui/lib/table/table-footer' {
-    export import TableFooter = __MaterialUI.Table.TableFooter;
-    export default TableFooter;
-}
-
-declare module 'material-ui/lib/table/table-header' {
-    export import TableHeader = __MaterialUI.Table.TableHeader;
-    export default TableHeader;
-}
-
-declare module 'material-ui/lib/table/table-header-column' {
-    export import TableHeaderColumn = __MaterialUI.Table.TableHeaderColumn;
-    export default TableHeaderColumn;
-}
-
-declare module 'material-ui/lib/table/table-row' {
-    export import TableRow = __MaterialUI.Table.TableRow;
-    export default TableRow;
-}
-
-declare module 'material-ui/lib/table/table-row-column' {
-    export import TableRowColumn = __MaterialUI.Table.TableRowColumn;
-    export default TableRowColumn;
-}
-
-declare module 'material-ui/lib/theme-wrapper' {
-    export import ThemeWrapper = __MaterialUI.ThemeWrapper;
-    export default ThemeWrapper;
-}
-
-declare module 'material-ui/lib/toggle' {
-    export import Toggle = __MaterialUI.Toggle;
-    export default Toggle;
-}
-
-declare module 'material-ui/lib/time-picker' {
-    export import TimePicker = __MaterialUI.TimePicker;
-    export default TimePicker;
-}
-
-declare module 'material-ui/lib/text-field' {
-    export import TextField = __MaterialUI.TextField;
-    export default TextField;
-}
-
-declare module 'material-ui/lib/toolbar/toolbar' {
-    export import Toolbar = __MaterialUI.Toolbar.Toolbar;
-    export default Toolbar;
-}
-
-declare module 'material-ui/lib/toolbar/toolbar-group' {
-    export import ToolbarGroup = __MaterialUI.Toolbar.ToolbarGroup;
-    export default ToolbarGroup;
-}
-
-declare module 'material-ui/lib/toolbar/toolbar-separator' {
-    export import ToolbarSeparator = __MaterialUI.Toolbar.ToolbarSeparator;
-    export default ToolbarSeparator;
-}
-
-declare module 'material-ui/lib/toolbar/toolbar-title' {
-    export import ToolbarTitle = __MaterialUI.Toolbar.ToolbarTitle;
-    export default ToolbarTitle;
-}
-
-declare module 'material-ui/lib/tooltip' {
-    export import Tooltip = __MaterialUI.Tooltip;
-    export default Tooltip;
-}
-
-declare module 'material-ui/lib/utils' {
-    export import ColorManipulator = __MaterialUI.Utils.ColorManipulator; // require('material-ui/lib/utils/color-manipulator');
-    export import CssEvent = __MaterialUI.Utils.CssEvent; // require('material-ui/lib/utils/css-event');
-    export import Dom = __MaterialUI.Utils.Dom; // require('material-ui/lib/utils/dom');
-    export import Events = __MaterialUI.Utils.Events; // require('material-ui/lib/utils/events');
-    export import Extend = __MaterialUI.Utils.Extend; // require('material-ui/lib/utils/extend');
-    export import ImmutabilityHelper = __MaterialUI.Utils.ImmutabilityHelper; // require('material-ui/lib/utils/immutability-helper');
-    export import KeyCode = __MaterialUI.Utils.KeyCode; // require('material-ui/lib/utils/key-code');
-    export import KeyLine = __MaterialUI.Utils.KeyLine; // require('material-ui/lib/utils/key-line');
-    export import UniqueId = __MaterialUI.Utils.UniqueId; // require('material-ui/lib/utils/unique-id');
-    export import Styles = __MaterialUI.Utils.Styles; // require('material-ui/lib/utils/styles');
-}
-
-declare module 'material-ui/lib/utils/color-manipulator' {
-    export import ColorManipulator = __MaterialUI.Utils.ColorManipulator;
-    export default ColorManipulator;
-}
-
-declare module 'material-ui/lib/utils/css-event' {
-    export import CssEvent = __MaterialUI.Utils.CssEvent;
-    export default CssEvent;
-}
-
-declare module 'material-ui/lib/utils/dom' {
-    export import Dom = __MaterialUI.Utils.Dom;
-    export default Dom;
-}
-
-declare module 'material-ui/lib/utils/events' {
-    export import Events = __MaterialUI.Utils.Events;
-    export default Events;
-}
-
-declare module 'material-ui/lib/utils/extend' {
-    export import Extend = __MaterialUI.Utils.Extend;
-    export default Extend;
-}
-
-declare module 'material-ui/lib/utils/immutability-helper' {
-    export import ImmutabilityHelper = __MaterialUI.Utils.ImmutabilityHelper;
-    export default ImmutabilityHelper;
-}
-
-declare module 'material-ui/lib/utils/key-code' {
-    export import KeyCode = __MaterialUI.Utils.KeyCode;
-    export default KeyCode;
-}
-
-declare module 'material-ui/lib/utils/key-line' {
-    export import KeyLine = __MaterialUI.Utils.KeyLine;
-    export default KeyLine;
-}
-
-declare module 'material-ui/lib/utils/unique-id' {
-    export import UniqueId = __MaterialUI.Utils.UniqueId;
-    export default UniqueId;
-}
-
-declare module 'material-ui/lib/utils/styles' {
-    export import Styles = __MaterialUI.Utils.Styles;
-    export default Styles;
-}
-
-declare module "material-ui/lib/menus/icon-menu" {
-    export import IconMenu = __MaterialUI.Menus.IconMenu;
-    export default IconMenu;
-}
-
-declare module "material-ui/lib/menus/menu" {
-    export import Menu = __MaterialUI.Menus.Menu;
-    export default Menu;
-}
-
-declare module "material-ui/lib/menus/menu-item" {
-    export import MenuItem = __MaterialUI.Menus.MenuItem;
-    export default MenuItem;
-}
-
-declare module "material-ui/lib/divider" {
-    export import Divider = __MaterialUI.Divider;
-    export default Divider;
-}
-
-declare module "material-ui/lib/grid-list/grid-list" {
-    export import GridList = __MaterialUI.GridList.GridList;
-    export default GridList;
-}
-
-declare module "material-ui/lib/grid-list/grid-tile" {
-    export import GridTile = __MaterialUI.GridList.GridTile;
-    export default GridTile;
-}
-
-declare module "material-ui/lib/styles/colors" {
-    export import Colors = __MaterialUI.Styles.Colors;
-    export default Colors;
-}
-
-declare module "material-ui/lib/styles/zIndex" {
-    export import zIndex = __MaterialUI.Styles.zIndex;
-    export default zIndex;
-}
-
-declare namespace __MaterialUI.Styles {
-    interface Colors {
-        red50: string;
-        red100: string;
-        red200: string;
-        red300: string;
-        red400: string;
-        red500: string;
-        red600: string;
-        red700: string;
-        red800: string;
-        red900: string;
-        redA100: string;
-        redA200: string;
-        redA400: string;
-        redA700: string;
-
-        pink50: string;
-        pink100: string;
-        pink200: string;
-        pink300: string;
-        pink400: string;
-        pink500: string;
-        pink600: string;
-        pink700: string;
-        pink800: string;
-        pink900: string;
-        pinkA100: string;
-        pinkA200: string;
-        pinkA400: string;
-        pinkA700: string;
-
-        purple50: string;
-        purple100: string;
-        purple200: string;
-        purple300: string;
-        purple400: string;
-        purple500: string;
-        purple600: string;
-        purple700: string;
-        purple800: string;
-        purple900: string;
-        purpleA100: string;
-        purpleA200: string;
-        purpleA400: string;
-        purpleA700: string;
-
-        deepPurple50: string;
-        deepPurple100: string;
-        deepPurple200: string;
-        deepPurple300: string;
-        deepPurple400: string;
-        deepPurple500: string;
-        deepPurple600: string;
-        deepPurple700: string;
-        deepPurple800: string;
-        deepPurple900: string;
-        deepPurpleA100: string;
-        deepPurpleA200: string;
-        deepPurpleA400: string;
-        deepPurpleA700: string;
-
-        indigo50: string;
-        indigo100: string;
-        indigo200: string;
-        indigo300: string;
-        indigo400: string;
-        indigo500: string;
-        indigo600: string;
-        indigo700: string;
-        indigo800: string;
-        indigo900: string;
-        indigoA100: string;
-        indigoA200: string;
-        indigoA400: string;
-        indigoA700: string;
-
-        blue50: string;
-        blue100: string;
-        blue200: string;
-        blue300: string;
-        blue400: string;
-        blue500: string;
-        blue600: string;
-        blue700: string;
-        blue800: string;
-        blue900: string;
-        blueA100: string;
-        blueA200: string;
-        blueA400: string;
-        blueA700: string;
-
-        lightBlue50: string;
-        lightBlue100: string;
-        lightBlue200: string;
-        lightBlue300: string;
-        lightBlue400: string;
-        lightBlue500: string;
-        lightBlue600: string;
-        lightBlue700: string;
-        lightBlue800: string;
-        lightBlue900: string;
-        lightBlueA100: string;
-        lightBlueA200: string;
-        lightBlueA400: string;
-        lightBlueA700: string;
-
-        cyan50: string;
-        cyan100: string;
-        cyan200: string;
-        cyan300: string;
-        cyan400: string;
-        cyan500: string;
-        cyan600: string;
-        cyan700: string;
-        cyan800: string;
-        cyan900: string;
-        cyanA100: string;
-        cyanA200: string;
-        cyanA400: string;
-        cyanA700: string;
-
-        teal50: string;
-        teal100: string;
-        teal200: string;
-        teal300: string;
-        teal400: string;
-        teal500: string;
-        teal600: string;
-        teal700: string;
-        teal800: string;
-        teal900: string;
-        tealA100: string;
-        tealA200: string;
-        tealA400: string;
-        tealA700: string;
-
-        green50: string;
-        green100: string;
-        green200: string;
-        green300: string;
-        green400: string;
-        green500: string;
-        green600: string;
-        green700: string;
-        green800: string;
-        green900: string;
-        greenA100: string;
-        greenA200: string;
-        greenA400: string;
-        greenA700: string;
-
-        lightGreen50: string;
-        lightGreen100: string;
-        lightGreen200: string;
-        lightGreen300: string;
-        lightGreen400: string;
-        lightGreen500: string;
-        lightGreen600: string;
-        lightGreen700: string;
-        lightGreen800: string;
-        lightGreen900: string;
-        lightGreenA100: string;
-        lightGreenA200: string;
-        lightGreenA400: string;
-        lightGreenA700: string;
-
-        lime50: string;
-        lime100: string;
-        lime200: string;
-        lime300: string;
-        lime400: string;
-        lime500: string;
-        lime600: string;
-        lime700: string;
-        lime800: string;
-        lime900: string;
-        limeA100: string;
-        limeA200: string;
-        limeA400: string;
-        limeA700: string;
-
-        yellow50: string;
-        yellow100: string;
-        yellow200: string;
-        yellow300: string;
-        yellow400: string;
-        yellow500: string;
-        yellow600: string;
-        yellow700: string;
-        yellow800: string;
-        yellow900: string;
-        yellowA100: string;
-        yellowA200: string;
-        yellowA400: string;
-        yellowA700: string;
-
-        amber50: string;
-        amber100: string;
-        amber200: string;
-        amber300: string;
-        amber400: string;
-        amber500: string;
-        amber600: string;
-        amber700: string;
-        amber800: string;
-        amber900: string;
-        amberA100: string;
-        amberA200: string;
-        amberA400: string;
-        amberA700: string;
-
-        orange50: string;
-        orange100: string;
-        orange200: string;
-        orange300: string;
-        orange400: string;
-        orange500: string;
-        orange600: string;
-        orange700: string;
-        orange800: string;
-        orange900: string;
-        orangeA100: string;
-        orangeA200: string;
-        orangeA400: string;
-        orangeA700: string;
-
-        deepOrange50: string;
-        deepOrange100: string;
-        deepOrange200: string;
-        deepOrange300: string;
-        deepOrange400: string;
-        deepOrange500: string;
-        deepOrange600: string;
-        deepOrange700: string;
-        deepOrange800: string;
-        deepOrange900: string;
-        deepOrangeA100: string;
-        deepOrangeA200: string;
-        deepOrangeA400: string;
-        deepOrangeA700: string;
-
-        brown50: string;
-        brown100: string;
-        brown200: string;
-        brown300: string;
-        brown400: string;
-        brown500: string;
-        brown600: string;
-        brown700: string;
-        brown800: string;
-        brown900: string;
-
-        blueGrey50: string;
-        blueGrey100: string;
-        blueGrey200: string;
-        blueGrey300: string;
-        blueGrey400: string;
-        blueGrey500: string;
-        blueGrey600: string;
-        blueGrey700: string;
-        blueGrey800: string;
-        blueGrey900: string;
-
-        grey50: string;
-        grey100: string;
-        grey200: string;
-        grey300: string;
-        grey400: string;
-        grey500: string;
-        grey600: string;
-        grey700: string;
-        grey800: string;
-        grey900: string;
-
-        black: string;
-        white: string;
-
-        transparent: string;
-        fullBlack: string;
-        darkBlack: string;
-        lightBlack: string;
-        minBlack: string;
-        faintBlack: string;
-        fullWhite: string;
-        darkWhite: string;
-        lightWhite: string;
-    }
-    export var Colors: Colors;
-}
-
-declare module "material-ui/lib/svg-icons" {
-    export import ActionAccessibility = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/accessibility');
-    export import ActionAccessible = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/accessible');
-    export import ActionAccountBalance = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/account-balance');
-    export import ActionAccountBalanceWallet = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/account-balance-wallet');
-    export import ActionAccountBox = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/account-box');
-    export import ActionAccountCircle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/account-circle');
-    export import ActionAddShoppingCart = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/add-shopping-cart');
-    export import ActionAlarm = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/alarm');
-    export import ActionAlarmAdd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/alarm-add');
-    export import ActionAlarmOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/alarm-off');
-    export import ActionAlarmOn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/alarm-on');
-    export import ActionAllOut = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/all-out');
-    export import ActionAndroid = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/android');
-    export import ActionAnnouncement = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/announcement');
-    export import ActionAspectRatio = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/aspect-ratio');
-    export import ActionAssessment = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/assessment');
-    export import ActionAssignment = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/assignment');
-    export import ActionAssignmentInd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/assignment-ind');
-    export import ActionAssignmentLate = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/assignment-late');
-    export import ActionAssignmentReturn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/assignment-return');
-    export import ActionAssignmentReturned = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/assignment-returned');
-    export import ActionAssignmentTurnedIn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/assignment-turned-in');
-    export import ActionAutorenew = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/autorenew');
-    export import ActionBackup = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/backup');
-    export import ActionBook = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/book');
-    export import ActionBookmark = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/bookmark');
-    export import ActionBookmarkBorder = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/bookmark-border');
-    export import ActionBugReport = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/bug-report');
-    export import ActionBuild = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/build');
-    export import ActionCached = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/cached');
-    export import ActionCameraEnhance = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/camera-enhance');
-    export import ActionCardGiftcard = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/card-giftcard');
-    export import ActionCardMembership = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/card-membership');
-    export import ActionCardTravel = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/card-travel');
-    export import ActionChangeHistory = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/change-history');
-    export import ActionCheckCircle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/check-circle');
-    export import ActionChromeReaderMode = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/chrome-reader-mode');
-    export import ActionClass = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/class');
-    export import ActionCode = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/code');
-    export import ActionCompareArrows = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/compare-arrows');
-    export import ActionCopyright = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/copyright');
-    export import ActionCreditCard = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/credit-card');
-    export import ActionDashboard = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/dashboard');
-    export import ActionDateRange = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/date-range');
-    export import ActionDelete = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/delete');
-    export import ActionDescription = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/description');
-    export import ActionDns = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/dns');
-    export import ActionDone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/done');
-    export import ActionDoneAll = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/done-all');
-    export import ActionDonutLarge = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/donut-large');
-    export import ActionDonutSmall = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/donut-small');
-    export import ActionEject = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/eject');
-    export import ActionEvent = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/event');
-    export import ActionEventSeat = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/event-seat');
-    export import ActionExitToApp = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/exit-to-app');
-    export import ActionExplore = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/explore');
-    export import ActionExtension = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/extension');
-    export import ActionFace = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/face');
-    export import ActionFavorite = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/favorite');
-    export import ActionFavoriteBorder = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/favorite-border');
-    export import ActionFeedback = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/feedback');
-    export import ActionFindInPage = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/find-in-page');
-    export import ActionFindReplace = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/find-replace');
-    export import ActionFingerprint = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/fingerprint');
-    export import ActionFlightLand = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/flight-land');
-    export import ActionFlightTakeoff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/flight-takeoff');
-    export import ActionFlipToBack = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/flip-to-back');
-    export import ActionFlipToFront = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/flip-to-front');
-    export import ActionGavel = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/gavel');
-    export import ActionGetApp = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/get-app');
-    export import ActionGif = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/gif');
-    export import ActionGrade = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/grade');
-    export import ActionGroupWork = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/group-work');
-    export import ActionHelp = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/help');
-    export import ActionHelpOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/help-outline');
-    export import ActionHighlightOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/highlight-off');
-    export import ActionHistory = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/history');
-    export import ActionHome = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/home');
-    export import ActionHourglassEmpty = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/hourglass-empty');
-    export import ActionHourglassFull = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/hourglass-full');
-    export import ActionHttp = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/http');
-    export import ActionHttps = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/https');
-    export import ActionImportantDevices = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/important-devices');
-    export import ActionInfo = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/info');
-    export import ActionInfoOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/info-outline');
-    export import ActionInput = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/input');
-    export import ActionInvertColors = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/invert-colors');
-    export import ActionLabel = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/label');
-    export import ActionLabelOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/label-outline');
-    export import ActionLanguage = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/language');
-    export import ActionLaunch = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/launch');
-    export import ActionLightbulbOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/lightbulb-outline');
-    export import ActionLineStyle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/line-style');
-    export import ActionLineWeight = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/line-weight');
-    export import ActionList = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/list');
-    export import ActionLock = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/lock');
-    export import ActionLockOpen = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/lock-open');
-    export import ActionLockOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/lock-outline');
-    export import ActionLoyalty = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/loyalty');
-    export import ActionMarkunreadMailbox = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/markunread-mailbox');
-    export import ActionMotorcycle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/motorcycle');
-    export import ActionNoteAdd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/note-add');
-    export import ActionOfflinePin = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/offline-pin');
-    export import ActionOpacity = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/opacity');
-    export import ActionOpenInBrowser = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/open-in-browser');
-    export import ActionOpenInNew = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/open-in-new');
-    export import ActionOpenWith = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/open-with');
-    export import ActionPageview = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/pageview');
-    export import ActionPanTool = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/pan-tool');
-    export import ActionPayment = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/payment');
-    export import ActionPermCameraMic = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/perm-camera-mic');
-    export import ActionPermContactCalendar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/perm-contact-calendar');
-    export import ActionPermDataSetting = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/perm-data-setting');
-    export import ActionPermDeviceInformation = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/perm-device-information');
-    export import ActionPermIdentity = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/perm-identity');
-    export import ActionPermMedia = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/perm-media');
-    export import ActionPermPhoneMsg = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/perm-phone-msg');
-    export import ActionPermScanWifi = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/perm-scan-wifi');
-    export import ActionPets = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/pets');
-    export import ActionPictureInPicture = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/picture-in-picture');
-    export import ActionPictureInPictureAlt = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/picture-in-picture-alt');
-    export import ActionPlayForWork = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/play-for-work');
-    export import ActionPolymer = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/polymer');
-    export import ActionPowerSettingsNew = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/power-settings-new');
-    export import ActionPregnantWoman = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/pregnant-woman');
-    export import ActionPrint = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/print');
-    export import ActionQueryBuilder = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/query-builder');
-    export import ActionQuestionAnswer = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/question-answer');
-    export import ActionReceipt = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/receipt');
-    export import ActionRecordVoiceOver = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/record-voice-over');
-    export import ActionRedeem = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/redeem');
-    export import ActionReorder = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/reorder');
-    export import ActionReportProblem = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/report-problem');
-    export import ActionRestore = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/restore');
-    export import ActionRoom = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/room');
-    export import ActionRoundedCorner = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/rounded-corner');
-    export import ActionRowing = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/rowing');
-    export import ActionSchedule = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/schedule');
-    export import ActionSearch = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/search');
-    export import ActionSettings = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings');
-    export import ActionSettingsApplications = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-applications');
-    export import ActionSettingsBackupRestore = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-backup-restore');
-    export import ActionSettingsBluetooth = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-bluetooth');
-    export import ActionSettingsBrightness = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-brightness');
-    export import ActionSettingsCell = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-cell');
-    export import ActionSettingsEthernet = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-ethernet');
-    export import ActionSettingsInputAntenna = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-input-antenna');
-    export import ActionSettingsInputComponent = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-input-component');
-    export import ActionSettingsInputComposite = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-input-composite');
-    export import ActionSettingsInputHdmi = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-input-hdmi');
-    export import ActionSettingsInputSvideo = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-input-svideo');
-    export import ActionSettingsOverscan = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-overscan');
-    export import ActionSettingsPhone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-phone');
-    export import ActionSettingsPower = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-power');
-    export import ActionSettingsRemote = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-remote');
-    export import ActionSettingsVoice = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/settings-voice');
-    export import ActionShop = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/shop');
-    export import ActionShoppingBasket = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/shopping-basket');
-    export import ActionShoppingCart = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/shopping-cart');
-    export import ActionShopTwo = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/shop-two');
-    export import ActionSpeakerNotes = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/speaker-notes');
-    export import ActionSpellcheck = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/spellcheck');
-    export import ActionStars = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/stars');
-    export import ActionStore = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/store');
-    export import ActionSubject = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/subject');
-    export import ActionSupervisorAccount = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/supervisor-account');
-    export import ActionSwapHoriz = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/swap-horiz');
-    export import ActionSwapVert = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/swap-vert');
-    export import ActionSwapVerticalCircle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/swap-vertical-circle');
-    export import ActionSystemUpdateAlt = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/system-update-alt');
-    export import ActionTab = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/tab');
-    export import ActionTabUnselected = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/tab-unselected');
-    export import ActionTheaters = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/theaters');
-    export import ActionThreeDRotation = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/three-d-rotation');
-    export import ActionThumbDown = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/thumb-down');
-    export import ActionThumbsUpDown = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/thumbs-up-down');
-    export import ActionThumbUp = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/thumb-up');
-    export import ActionTimeline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/timeline');
-    export import ActionToc = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/toc');
-    export import ActionToday = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/today');
-    export import ActionToll = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/toll');
-    export import ActionTouchApp = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/touch-app');
-    export import ActionTrackChanges = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/track-changes');
-    export import ActionTranslate = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/translate');
-    export import ActionTrendingDown = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/trending-down');
-    export import ActionTrendingFlat = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/trending-flat');
-    export import ActionTrendingUp = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/trending-up');
-    export import ActionTurnedIn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/turned-in');
-    export import ActionTurnedInNot = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/turned-in-not');
-    export import ActionUpdate = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/update');
-    export import ActionVerifiedUser = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/verified-user');
-    export import ActionViewAgenda = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/view-agenda');
-    export import ActionViewArray = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/view-array');
-    export import ActionViewCarousel = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/view-carousel');
-    export import ActionViewColumn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/view-column');
-    export import ActionViewDay = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/view-day');
-    export import ActionViewHeadline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/view-headline');
-    export import ActionViewList = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/view-list');
-    export import ActionViewModule = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/view-module');
-    export import ActionViewQuilt = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/view-quilt');
-    export import ActionViewStream = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/view-stream');
-    export import ActionViewWeek = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/view-week');
-    export import ActionVisibility = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/visibility');
-    export import ActionVisibilityOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/visibility-off');
-    export import ActionWatchLater = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/watch-later');
-    export import ActionWork = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/work');
-    export import ActionYoutubeSearchedFor = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/youtube-searched-for');
-    export import ActionZoomIn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/zoom-in');
-    export import ActionZoomOut = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/action/zoom-out');
-    export import AlertAddAlert = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/alert/add-alert');
-    export import AlertError = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/alert/error');
-    export import AlertErrorOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/alert/error-outline');
-    export import AlertWarning = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/alert/warning');
-    export import AvAddToQueue = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/add-to-queue');
-    export import AvAirplay = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/airplay');
-    export import AvAlbum = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/album');
-    export import AvArtTrack = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/art-track');
-    export import AvAvTimer = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/av-timer');
-    export import AvClosedCaption = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/closed-caption');
-    export import AvEqualizer = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/equalizer');
-    export import AvExplicit = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/explicit');
-    export import AvFastForward = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/fast-forward');
-    export import AvFastRewind = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/fast-rewind');
-    export import AvFiberDvr = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/fiber-dvr');
-    export import AvFiberManualRecord = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/fiber-manual-record');
-    export import AvFiberNew = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/fiber-new');
-    export import AvFiberPin = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/fiber-pin');
-    export import AvFiberSmartRecord = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/fiber-smart-record');
-    export import AvForward10 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/forward-10');
-    export import AvForward30 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/forward-30');
-    export import AvForward5 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/forward-5');
-    export import AvGames = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/games');
-    export import AvHd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/hd');
-    export import AvHearing = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/hearing');
-    export import AvHighQuality = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/high-quality');
-    export import AvLibraryAdd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/library-add');
-    export import AvLibraryBooks = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/library-books');
-    export import AvLibraryMusic = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/library-music');
-    export import AvLoop = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/loop');
-    export import AvMic = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/mic');
-    export import AvMicNone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/mic-none');
-    export import AvMicOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/mic-off');
-    export import AvMovie = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/movie');
-    export import AvMusicVideo = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/music-video');
-    export import AvNewReleases = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/new-releases');
-    export import AvNotInterested = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/not-interested');
-    export import AvPause = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/pause');
-    export import AvPauseCircleFilled = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/pause-circle-filled');
-    export import AvPauseCircleOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/pause-circle-outline');
-    export import AvPlayArrow = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/play-arrow');
-    export import AvPlayCircleFilled = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/play-circle-filled');
-    export import AvPlayCircleOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/play-circle-outline');
-    export import AvPlaylistAdd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/playlist-add');
-    export import AvPlaylistAddCheck = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/playlist-add-check');
-    export import AvPlaylistPlay = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/playlist-play');
-    export import AvQueue = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/queue');
-    export import AvQueueMusic = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/queue-music');
-    export import AvQueuePlayNext = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/queue-play-next');
-    export import AvRadio = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/radio');
-    export import AvRecentActors = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/recent-actors');
-    export import AvRemoveFromQueue = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/remove-from-queue');
-    export import AvRepeat = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/repeat');
-    export import AvRepeatOne = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/repeat-one');
-    export import AvReplay = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/replay');
-    export import AvReplay10 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/replay-10');
-    export import AvReplay30 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/replay-30');
-    export import AvReplay5 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/replay-5');
-    export import AvShuffle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/shuffle');
-    export import AvSkipNext = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/skip-next');
-    export import AvSkipPrevious = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/skip-previous');
-    export import AvSlowMotionVideo = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/slow-motion-video');
-    export import AvSnooze = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/snooze');
-    export import AvSortByAlpha = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/sort-by-alpha');
-    export import AvStop = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/stop');
-    export import AvSubscriptions = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/subscriptions');
-    export import AvSubtitles = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/subtitles');
-    export import AvSurroundSound = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/surround-sound');
-    export import AvVideocam = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/videocam');
-    export import AvVideocamOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/videocam-off');
-    export import AvVideoLibrary = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/video-library');
-    export import AvVolumeDown = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/volume-down');
-    export import AvVolumeMute = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/volume-mute');
-    export import AvVolumeOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/volume-off');
-    export import AvVolumeUp = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/volume-up');
-    export import AvWeb = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/web');
-    export import AvWebAsset = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/av/web-asset');
-    export import CommunicationBusiness = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/business');
-    export import CommunicationCall = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/call');
-    export import CommunicationCallEnd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/call-end');
-    export import CommunicationCallMade = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/call-made');
-    export import CommunicationCallMerge = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/call-merge');
-    export import CommunicationCallMissed = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/call-missed');
-    export import CommunicationCallMissedOutgoing = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/call-missed-outgoing');
-    export import CommunicationCallReceived = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/call-received');
-    export import CommunicationCallSplit = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/call-split');
-    export import CommunicationChat = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/chat');
-    export import CommunicationChatBubble = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/chat-bubble');
-    export import CommunicationChatBubbleOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/chat-bubble-outline');
-    export import CommunicationClearAll = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/clear-all');
-    export import CommunicationComment = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/comment');
-    export import CommunicationContactMail = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/contact-mail');
-    export import CommunicationContactPhone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/contact-phone');
-    export import CommunicationContacts = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/contacts');
-    export import CommunicationDialerSip = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/dialer-sip');
-    export import CommunicationDialpad = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/dialpad');
-    export import CommunicationEmail = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/email');
-    export import CommunicationForum = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/forum');
-    export import CommunicationImportContacts = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/import-contacts');
-    export import CommunicationImportExport = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/import-export');
-    export import CommunicationInvertColorsOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/invert-colors-off');
-    export import CommunicationLiveHelp = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/live-help');
-    export import CommunicationLocationOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/location-off');
-    export import CommunicationLocationOn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/location-on');
-    export import CommunicationMailOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/mail-outline');
-    export import CommunicationMessage = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/message');
-    export import CommunicationNoSim = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/no-sim');
-    export import CommunicationPhone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/phone');
-    export import CommunicationPhonelinkErase = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/phonelink-erase');
-    export import CommunicationPhonelinkLock = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/phonelink-lock');
-    export import CommunicationPhonelinkRing = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/phonelink-ring');
-    export import CommunicationPhonelinkSetup = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/phonelink-setup');
-    export import CommunicationPortableWifiOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/portable-wifi-off');
-    export import CommunicationPresentToAll = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/present-to-all');
-    export import CommunicationRingVolume = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/ring-volume');
-    export import CommunicationScreenShare = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/screen-share');
-    export import CommunicationSpeakerPhone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/speaker-phone');
-    export import CommunicationStayCurrentLandscape = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/stay-current-landscape');
-    export import CommunicationStayCurrentPortrait = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/stay-current-portrait');
-    export import CommunicationStayPrimaryLandscape = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/stay-primary-landscape');
-    export import CommunicationStayPrimaryPortrait = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/stay-primary-portrait');
-    export import CommunicationStopScreenShare = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/stop-screen-share');
-    export import CommunicationSwapCalls = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/swap-calls');
-    export import CommunicationTactMail = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/tact-mail');
-    export import CommunicationTextsms = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/textsms');
-    export import CommunicationVoicemail = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/voicemail');
-    export import CommunicationVpnKey = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/communication/vpn-key');
-    export import ContentAdd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/add');
-    export import ContentAddBox = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/add-box');
-    export import ContentAddCircle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/add-circle');
-    export import ContentAddCircleOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/add-circle-outline');
-    export import ContentArchive = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/archive');
-    export import ContentBackspace = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/backspace');
-    export import ContentBlock = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/block');
-    export import ContentClear = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/clear');
-    export import ContentContentCopy = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/content-copy');
-    export import ContentContentCut = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/content-cut');
-    export import ContentContentPaste = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/content-paste');
-    export import ContentCreate = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/create');
-    export import ContentDrafts = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/drafts');
-    export import ContentFilterList = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/filter-list');
-    export import ContentFlag = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/flag');
-    export import ContentFontDownload = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/font-download');
-    export import ContentForward = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/forward');
-    export import ContentGesture = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/gesture');
-    export import ContentInbox = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/inbox');
-    export import ContentLink = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/link');
-    export import ContentMail = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/mail');
-    export import ContentMarkunread = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/markunread');
-    export import ContentMoveToInbox = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/move-to-inbox');
-    export import ContentNextWeek = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/next-week');
-    export import ContentRedo = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/redo');
-    export import ContentRemove = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/remove');
-    export import ContentRemoveCircle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/remove-circle');
-    export import ContentRemoveCircleOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/remove-circle-outline');
-    export import ContentReply = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/reply');
-    export import ContentReplyAll = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/reply-all');
-    export import ContentReport = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/report');
-    export import ContentSave = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/save');
-    export import ContentSelectAll = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/select-all');
-    export import ContentSend = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/send');
-    export import ContentSort = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/sort');
-    export import ContentTextFormat = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/text-format');
-    export import ContentUnarchive = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/unarchive');
-    export import ContentUndo = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/undo');
-    export import ContentWeekend = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/content/weekend');
-    export import DeviceAccessAlarm = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/access-alarm');
-    export import DeviceAccessAlarms = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/access-alarms');
-    export import DeviceAccessTime = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/access-time');
-    export import DeviceAddAlarm = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/add-alarm');
-    export import DeviceAirplanemodeActive = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/airplanemode-active');
-    export import DeviceAirplanemodeInactive = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/airplanemode-inactive');
-    export import DeviceBattery20 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-20');
-    export import DeviceBattery30 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-30');
-    export import DeviceBattery50 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-50');
-    export import DeviceBattery60 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-60');
-    export import DeviceBattery80 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-80');
-    export import DeviceBattery90 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-90');
-    export import DeviceBatteryAlert = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-alert');
-    export import DeviceBatteryCharging20 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-charging-20');
-    export import DeviceBatteryCharging30 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-charging-30');
-    export import DeviceBatteryCharging50 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-charging-50');
-    export import DeviceBatteryCharging60 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-charging-60');
-    export import DeviceBatteryCharging80 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-charging-80');
-    export import DeviceBatteryCharging90 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-charging-90');
-    export import DeviceBatteryChargingFull = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-charging-full');
-    export import DeviceBatteryFull = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-full');
-    export import DeviceBatteryStd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-std');
-    export import DeviceBatteryUnknown = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/battery-unknown');
-    export import DeviceBluetooth = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/bluetooth');
-    export import DeviceBluetoothConnected = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/bluetooth-connected');
-    export import DeviceBluetoothDisabled = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/bluetooth-disabled');
-    export import DeviceBluetoothSearching = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/bluetooth-searching');
-    export import DeviceBrightnessAuto = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/brightness-auto');
-    export import DeviceBrightnessHigh = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/brightness-high');
-    export import DeviceBrightnessLow = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/brightness-low');
-    export import DeviceBrightnessMedium = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/brightness-medium');
-    export import DeviceDataUsage = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/data-usage');
-    export import DeviceDeveloperMode = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/developer-mode');
-    export import DeviceDevices = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/devices');
-    export import DeviceDvr = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/dvr');
-    export import DeviceGpsFixed = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/gps-fixed');
-    export import DeviceGpsNotFixed = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/gps-not-fixed');
-    export import DeviceGpsOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/gps-off');
-    export import DeviceGraphicEq = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/graphic-eq');
-    export import DeviceLocationDisabled = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/location-disabled');
-    export import DeviceLocationSearching = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/location-searching');
-    export import DeviceNetworkCell = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/network-cell');
-    export import DeviceNetworkWifi = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/network-wifi');
-    export import DeviceNfc = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/nfc');
-    export import DeviceScreenLockLandscape = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/screen-lock-landscape');
-    export import DeviceScreenLockPortrait = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/screen-lock-portrait');
-    export import DeviceScreenLockRotation = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/screen-lock-rotation');
-    export import DeviceScreenRotation = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/screen-rotation');
-    export import DeviceSdStorage = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/sd-storage');
-    export import DeviceSettingsSystemDaydream = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/settings-system-daydream');
-    export import DeviceSignalCellular0Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-0-bar');
-    export import DeviceSignalCellular1Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-1-bar');
-    export import DeviceSignalCellular2Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-2-bar');
-    export import DeviceSignalCellular3Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-3-bar');
-    export import DeviceSignalCellular4Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-4-bar');
-    export import DeviceSignalCellularConnectedNoInternet0Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-connected-no-internet-0-bar');
-    export import DeviceSignalCellularConnectedNoInternet1Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-connected-no-internet-1-bar');
-    export import DeviceSignalCellularConnectedNoInternet2Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-connected-no-internet-2-bar');
-    export import DeviceSignalCellularConnectedNoInternet3Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-connected-no-internet-3-bar');
-    export import DeviceSignalCellularConnectedNoInternet4Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-connected-no-internet-4-bar');
-    export import DeviceSignalCellularNoSim = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-no-sim');
-    export import DeviceSignalCellularNull = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-null');
-    export import DeviceSignalCellularOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-cellular-off');
-    export import DeviceSignalWifi0Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-wifi-0-bar');
-    export import DeviceSignalWifi1Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-wifi-1-bar');
-    export import DeviceSignalWifi1BarLock = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-wifi-1-bar-lock');
-    export import DeviceSignalWifi2Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-wifi-2-bar');
-    export import DeviceSignalWifi2BarLock = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-wifi-2-bar-lock');
-    export import DeviceSignalWifi3Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-wifi-3-bar');
-    export import DeviceSignalWifi3BarLock = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-wifi-3-bar-lock');
-    export import DeviceSignalWifi4Bar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-wifi-4-bar');
-    export import DeviceSignalWifi4BarLock = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-wifi-4-bar-lock');
-    export import DeviceSignalWifiOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/signal-wifi-off');
-    export import DeviceStorage = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/storage');
-    export import DeviceUsb = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/usb');
-    export import DeviceWallpaper = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/wallpaper');
-    export import DeviceWidgets = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/widgets');
-    export import DeviceWifiLock = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/wifi-lock');
-    export import DeviceWifiTethering = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/device/wifi-tethering');
-    export import EditorAttachFile = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/attach-file');
-    export import EditorAttachMoney = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/attach-money');
-    export import EditorBorderAll = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-all');
-    export import EditorBorderBottom = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-bottom');
-    export import EditorBorderClear = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-clear');
-    export import EditorBorderColor = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-color');
-    export import EditorBorderHorizontal = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-horizontal');
-    export import EditorBorderInner = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-inner');
-    export import EditorBorderLeft = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-left');
-    export import EditorBorderOuter = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-outer');
-    export import EditorBorderRight = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-right');
-    export import EditorBorderStyle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-style');
-    export import EditorBorderTop = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-top');
-    export import EditorBorderVertical = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/border-vertical');
-    export import EditorDragHandle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/drag-handle');
-    export import EditorFormatAlignCenter = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-align-center');
-    export import EditorFormatAlignJustify = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-align-justify');
-    export import EditorFormatAlignLeft = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-align-left');
-    export import EditorFormatAlignRight = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-align-right');
-    export import EditorFormatBold = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-bold');
-    export import EditorFormatClear = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-clear');
-    export import EditorFormatColorFill = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-color-fill');
-    export import EditorFormatColorReset = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-color-reset');
-    export import EditorFormatColorText = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-color-text');
-    export import EditorFormatIndentDecrease = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-indent-decrease');
-    export import EditorFormatIndentIncrease = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-indent-increase');
-    export import EditorFormatItalic = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-italic');
-    export import EditorFormatLineSpacing = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-line-spacing');
-    export import EditorFormatListBulleted = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-list-bulleted');
-    export import EditorFormatListNumbered = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-list-numbered');
-    export import EditorFormatPaint = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-paint');
-    export import EditorFormatQuote = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-quote');
-    export import EditorFormatShapes = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-shapes');
-    export import EditorFormatSize = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-size');
-    export import EditorFormatStrikethrough = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-strikethrough');
-    export import EditorFormatTextdirectionLToR = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-textdirection-l-to-r');
-    export import EditorFormatTextdirectionRToL = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-textdirection-r-to-l');
-    export import EditorFormatUnderlined = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/format-underlined');
-    export import EditorFunctions = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/functions');
-    export import EditorHighlight = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/highlight');
-    export import EditorInsertChart = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/insert-chart');
-    export import EditorInsertComment = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/insert-comment');
-    export import EditorInsertDriveFile = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/insert-drive-file');
-    export import EditorInsertEmoticon = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/insert-emoticon');
-    export import EditorInsertInvitation = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/insert-invitation');
-    export import EditorInsertLink = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/insert-link');
-    export import EditorInsertPhoto = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/insert-photo');
-    export import EditorLinearScale = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/linear-scale');
-    export import EditorMergeType = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/merge-type');
-    export import EditorModeComment = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/mode-comment');
-    export import EditorModeEdit = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/mode-edit');
-    export import EditorMoneyOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/money-off');
-    export import EditorPublish = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/publish');
-    export import EditorShortText = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/short-text');
-    export import EditorSpaceBar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/space-bar');
-    export import EditorStrikethroughS = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/strikethrough-s');
-    export import EditorTextFields = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/text-fields');
-    export import EditorVerticalAlignBottom = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/vertical-align-bottom');
-    export import EditorVerticalAlignCenter = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/vertical-align-center');
-    export import EditorVerticalAlignTop = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/vertical-align-top');
-    export import EditorWrapText = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/editor/wrap-text');
-    export import FileAttachment = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/attachment');
-    export import FileCloud = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/cloud');
-    export import FileCloudCircle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/cloud-circle');
-    export import FileCloudDone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/cloud-done');
-    export import FileCloudDownload = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/cloud-download');
-    export import FileCloudOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/cloud-off');
-    export import FileCloudQueue = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/cloud-queue');
-    export import FileCloudUpload = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/cloud-upload');
-    export import FileCreateNewFolder = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/create-new-folder');
-    export import FileFileDownload = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/file-download');
-    export import FileFileUpload = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/file-upload');
-    export import FileFolder = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/folder');
-    export import FileFolderOpen = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/folder-open');
-    export import FileFolderShared = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/file/folder-shared');
-    export import HardwareCast = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/cast');
-    export import HardwareCastConnected = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/cast-connected');
-    export import HardwareComputer = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/computer');
-    export import HardwareDesktopMac = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/desktop-mac');
-    export import HardwareDesktopWindows = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/desktop-windows');
-    export import HardwareDeveloperBoard = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/developer-board');
-    export import HardwareDeviceHub = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/device-hub');
-    export import HardwareDevicesOther = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/devices-other');
-    export import HardwareDock = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/dock');
-    export import HardwareGamepad = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/gamepad');
-    export import HardwareHeadset = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/headset');
-    export import HardwareHeadsetMic = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/headset-mic');
-    export import HardwareKeyboard = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/keyboard');
-    export import HardwareKeyboardArrowDown = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/keyboard-arrow-down');
-    export import HardwareKeyboardArrowLeft = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/keyboard-arrow-left');
-    export import HardwareKeyboardArrowRight = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/keyboard-arrow-right');
-    export import HardwareKeyboardArrowUp = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/keyboard-arrow-up');
-    export import HardwareKeyboardBackspace = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/keyboard-backspace');
-    export import HardwareKeyboardCapslock = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/keyboard-capslock');
-    export import HardwareKeyboardHide = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/keyboard-hide');
-    export import HardwareKeyboardReturn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/keyboard-return');
-    export import HardwareKeyboardTab = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/keyboard-tab');
-    export import HardwareKeyboardVoice = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/keyboard-voice');
-    export import HardwareLaptop = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/laptop');
-    export import HardwareLaptopChromebook = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/laptop-chromebook');
-    export import HardwareLaptopMac = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/laptop-mac');
-    export import HardwareLaptopWindows = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/laptop-windows');
-    export import HardwareMemory = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/memory');
-    export import HardwareMouse = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/mouse');
-    export import HardwarePhoneAndroid = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/phone-android');
-    export import HardwarePhoneIphone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/phone-iphone');
-    export import HardwarePhonelink = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/phonelink');
-    export import HardwarePhonelinkOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/phonelink-off');
-    export import HardwarePowerInput = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/power-input');
-    export import HardwareRouter = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/router');
-    export import HardwareScanner = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/scanner');
-    export import HardwareSecurity = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/security');
-    export import HardwareSimCard = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/sim-card');
-    export import HardwareSmartphone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/smartphone');
-    export import HardwareSpeaker = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/speaker');
-    export import HardwareSpeakerGroup = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/speaker-group');
-    export import HardwareTablet = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/tablet');
-    export import HardwareTabletAndroid = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/tablet-android');
-    export import HardwareTabletMac = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/tablet-mac');
-    export import HardwareToys = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/toys');
-    export import HardwareTv = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/tv');
-    export import HardwareVideogameAsset = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/videogame-asset');
-    export import HardwareWatch = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/hardware/watch');
-    export import ImageAddAPhoto = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/add-a-photo');
-    export import ImageAddToPhotos = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/add-to-photos');
-    export import ImageAdjust = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/adjust');
-    export import ImageAssistant = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/assistant');
-    export import ImageAssistantPhoto = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/assistant-photo');
-    export import ImageAudiotrack = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/audiotrack');
-    export import ImageBlurCircular = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/blur-circular');
-    export import ImageBlurLinear = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/blur-linear');
-    export import ImageBlurOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/blur-off');
-    export import ImageBlurOn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/blur-on');
-    export import ImageBrightness1 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/brightness-1');
-    export import ImageBrightness2 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/brightness-2');
-    export import ImageBrightness3 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/brightness-3');
-    export import ImageBrightness4 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/brightness-4');
-    export import ImageBrightness5 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/brightness-5');
-    export import ImageBrightness6 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/brightness-6');
-    export import ImageBrightness7 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/brightness-7');
-    export import ImageBrokenImage = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/broken-image');
-    export import ImageBrush = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/brush');
-    export import ImageCamera = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/camera');
-    export import ImageCameraAlt = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/camera-alt');
-    export import ImageCameraFront = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/camera-front');
-    export import ImageCameraRear = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/camera-rear');
-    export import ImageCameraRoll = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/camera-roll');
-    export import ImageCenterFocusStrong = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/center-focus-strong');
-    export import ImageCenterFocusWeak = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/center-focus-weak');
-    export import ImageCollections = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/collections');
-    export import ImageCollectionsBookmark = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/collections-bookmark');
-    export import ImageColorize = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/colorize');
-    export import ImageColorLens = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/color-lens');
-    export import ImageCompare = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/compare');
-    export import ImageControlPoint = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/control-point');
-    export import ImageControlPointDuplicate = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/control-point-duplicate');
-    export import ImageCrop = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop');
-    export import ImageCrop169 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop-16-9');
-    export import ImageCrop32 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop-3-2');
-    export import ImageCrop54 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop-5-4');
-    export import ImageCrop75 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop-7-5');
-    export import ImageCropDin = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop-din');
-    export import ImageCropFree = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop-free');
-    export import ImageCropLandscape = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop-landscape');
-    export import ImageCropOriginal = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop-original');
-    export import ImageCropPortrait = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop-portrait');
-    export import ImageCropRotate = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop-rotate');
-    export import ImageCropSquare = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/crop-square');
-    export import ImageDehaze = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/dehaze');
-    export import ImageDetails = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/details');
-    export import ImageEdit = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/edit');
-    export import ImageExposure = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/exposure');
-    export import ImageExposureNeg1 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/exposure-neg-1');
-    export import ImageExposureNeg2 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/exposure-neg-2');
-    export import ImageExposurePlus1 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/exposure-plus-1');
-    export import ImageExposurePlus2 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/exposure-plus-2');
-    export import ImageExposureZero = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/exposure-zero');
-    export import ImageFilter = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter');
-    export import ImageFilter1 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-1');
-    export import ImageFilter2 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-2');
-    export import ImageFilter3 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-3');
-    export import ImageFilter4 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-4');
-    export import ImageFilter5 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-5');
-    export import ImageFilter6 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-6');
-    export import ImageFilter7 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-7');
-    export import ImageFilter8 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-8');
-    export import ImageFilter9 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-9');
-    export import ImageFilter9Plus = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-9-plus');
-    export import ImageFilterBAndW = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-b-and-w');
-    export import ImageFilterCenterFocus = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-center-focus');
-    export import ImageFilterDrama = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-drama');
-    export import ImageFilterFrames = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-frames');
-    export import ImageFilterHdr = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-hdr');
-    export import ImageFilterNone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-none');
-    export import ImageFilterTiltShift = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-tilt-shift');
-    export import ImageFilterVintage = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/filter-vintage');
-    export import ImageFlare = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/flare');
-    export import ImageFlashAuto = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/flash-auto');
-    export import ImageFlashOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/flash-off');
-    export import ImageFlashOn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/flash-on');
-    export import ImageFlip = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/flip');
-    export import ImageGradient = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/gradient');
-    export import ImageGrain = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/grain');
-    export import ImageGridOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/grid-off');
-    export import ImageGridOn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/grid-on');
-    export import ImageHdrOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/hdr-off');
-    export import ImageHdrOn = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/hdr-on');
-    export import ImageHdrStrong = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/hdr-strong');
-    export import ImageHdrWeak = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/hdr-weak');
-    export import ImageHealing = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/healing');
-    export import ImageImage = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/image');
-    export import ImageImageAspectRatio = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/image-aspect-ratio');
-    export import ImageIso = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/iso');
-    export import ImageLandscape = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/landscape');
-    export import ImageLeakAdd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/leak-add');
-    export import ImageLeakRemove = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/leak-remove');
-    export import ImageLens = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/lens');
-    export import ImageLinkedCamera = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/linked-camera');
-    export import ImageLooks = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/looks');
-    export import ImageLooks3 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/looks-3');
-    export import ImageLooks4 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/looks-4');
-    export import ImageLooks5 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/looks-5');
-    export import ImageLooks6 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/looks-6');
-    export import ImageLooksOne = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/looks-one');
-    export import ImageLooksTwo = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/looks-two');
-    export import ImageLoupe = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/loupe');
-    export import ImageMonochromePhotos = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/monochrome-photos');
-    export import ImageMovieCreation = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/movie-creation');
-    export import ImageMovieFilter = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/movie-filter');
-    export import ImageMusicNote = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/music-note');
-    export import ImageNature = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/nature');
-    export import ImageNaturePeople = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/nature-people');
-    export import ImageNavigateBefore = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/navigate-before');
-    export import ImageNavigateNext = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/navigate-next');
-    export import ImagePalette = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/palette');
-    export import ImagePanorama = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/panorama');
-    export import ImagePanoramaFishEye = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/panorama-fish-eye');
-    export import ImagePanoramaHorizontal = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/panorama-horizontal');
-    export import ImagePanoramaVertical = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/panorama-vertical');
-    export import ImagePanoramaWideAngle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/panorama-wide-angle');
-    export import ImagePhoto = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/photo');
-    export import ImagePhotoAlbum = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/photo-album');
-    export import ImagePhotoCamera = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/photo-camera');
-    export import ImagePhotoFilter = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/photo-filter');
-    export import ImagePhotoLibrary = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/photo-library');
-    export import ImagePhotoSizeSelectActual = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/photo-size-select-actual');
-    export import ImagePhotoSizeSelectLarge = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/photo-size-select-large');
-    export import ImagePhotoSizeSelectSmall = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/photo-size-select-small');
-    export import ImagePictureAsPdf = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/picture-as-pdf');
-    export import ImagePortrait = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/portrait');
-    export import ImageRemoveRedEye = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/remove-red-eye');
-    export import ImageRotate90DegreesCcw = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/rotate-90-degrees-ccw');
-    export import ImageRotateLeft = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/rotate-left');
-    export import ImageRotateRight = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/rotate-right');
-    export import ImageSlideshow = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/slideshow');
-    export import ImageStraighten = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/straighten');
-    export import ImageStyle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/style');
-    export import ImageSwitchCamera = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/switch-camera');
-    export import ImageSwitchVideo = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/switch-video');
-    export import ImageTagFaces = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/tag-faces');
-    export import ImageTexture = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/texture');
-    export import ImageTimelapse = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/timelapse');
-    export import ImageTimer = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/timer');
-    export import ImageTimer10 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/timer-10');
-    export import ImageTimer3 = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/timer-3');
-    export import ImageTimerOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/timer-off');
-    export import ImageTonality = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/tonality');
-    export import ImageTransform = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/transform');
-    export import ImageTune = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/tune');
-    export import ImageViewComfy = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/view-comfy');
-    export import ImageViewCompact = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/view-compact');
-    export import ImageVignette = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/vignette');
-    export import ImageWbAuto = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/wb-auto');
-    export import ImageWbCloudy = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/wb-cloudy');
-    export import ImageWbIncandescent = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/wb-incandescent');
-    export import ImageWbIridescent = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/wb-iridescent');
-    export import ImageWbSunny = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/image/wb-sunny');
-    export import Index = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/index');
-    export import IndexGenerator = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/index-generator');
-    export import MapsAddLocation = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/add-location');
-    export import MapsBeenhere = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/beenhere');
-    export import MapsDirections = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/directions');
-    export import MapsDirectionsBike = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/directions-bike');
-    export import MapsDirectionsBoat = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/directions-boat');
-    export import MapsDirectionsBus = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/directions-bus');
-    export import MapsDirectionsCar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/directions-car');
-    export import MapsDirectionsRailway = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/directions-railway');
-    export import MapsDirectionsRun = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/directions-run');
-    export import MapsDirectionsSubway = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/directions-subway');
-    export import MapsDirectionsTransit = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/directions-transit');
-    export import MapsDirectionsWalk = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/directions-walk');
-    export import MapsEditLocation = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/edit-location');
-    export import MapsFlight = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/flight');
-    export import MapsHotel = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/hotel');
-    export import MapsLayers = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/layers');
-    export import MapsLayersClear = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/layers-clear');
-    export import MapsLocalActivity = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-activity');
-    export import MapsLocalAirport = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-airport');
-    export import MapsLocalAtm = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-atm');
-    export import MapsLocalBar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-bar');
-    export import MapsLocalCafe = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-cafe');
-    export import MapsLocalCarWash = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-car-wash');
-    export import MapsLocalConvenienceStore = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-convenience-store');
-    export import MapsLocalDining = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-dining');
-    export import MapsLocalDrink = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-drink');
-    export import MapsLocalFlorist = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-florist');
-    export import MapsLocalGasStation = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-gas-station');
-    export import MapsLocalGroceryStore = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-grocery-store');
-    export import MapsLocalHospital = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-hospital');
-    export import MapsLocalHotel = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-hotel');
-    export import MapsLocalLaundryService = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-laundry-service');
-    export import MapsLocalLibrary = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-library');
-    export import MapsLocalMall = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-mall');
-    export import MapsLocalMovies = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-movies');
-    export import MapsLocalOffer = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-offer');
-    export import MapsLocalParking = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-parking');
-    export import MapsLocalPharmacy = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-pharmacy');
-    export import MapsLocalPhone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-phone');
-    export import MapsLocalPizza = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-pizza');
-    export import MapsLocalPlay = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-play');
-    export import MapsLocalPostOffice = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-post-office');
-    export import MapsLocalPrintshop = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-printshop');
-    export import MapsLocalSee = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-see');
-    export import MapsLocalShipping = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-shipping');
-    export import MapsLocalTaxi = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/local-taxi');
-    export import MapsMap = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/map');
-    export import MapsMyLocation = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/my-location');
-    export import MapsNavigation = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/navigation');
-    export import MapsNearMe = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/near-me');
-    export import MapsPersonPin = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/person-pin');
-    export import MapsPersonPinCircle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/person-pin-circle');
-    export import MapsPinDrop = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/pin-drop');
-    export import MapsPlace = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/place');
-    export import MapsRateReview = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/rate-review');
-    export import MapsRestaurantMenu = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/restaurant-menu');
-    export import MapsSatellite = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/satellite');
-    export import MapsStoreMallDirectory = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/store-mall-directory');
-    export import MapsTerrain = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/terrain');
-    export import MapsTraffic = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/traffic');
-    export import MapsZoomOutMap = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/maps/zoom-out-map');
-    export import NavigationApps = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/apps');
-    export import NavigationArrowBack = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/arrow-back');
-    export import NavigationArrowDownward = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/arrow-downward');
-    export import NavigationArrowDropDown = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/arrow-drop-down');
-    export import NavigationArrowDropDownCircle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/arrow-drop-down-circle');
-    export import NavigationArrowDropRight = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation-arrow-drop-right');
-    export import NavigationArrowDropUp = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/arrow-drop-up');
-    export import NavigationArrowForward = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/arrow-forward');
-    export import NavigationArrowUpward = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/arrow-upward');
-    export import NavigationCancel = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/cancel');
-    export import NavigationCheck = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/check');
-    export import NavigationChevronLeft = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/chevron-left');
-    export import NavigationChevronRight = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/chevron-right');
-    export import NavigationClose = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/close');
-    export import NavigationExpandLess = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/expand-less');
-    export import NavigationExpandMore = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/expand-more');
-    export import NavigationFullscreen = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/fullscreen');
-    export import NavigationFullscreenExit = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/fullscreen-exit');
-    export import NavigationMenu = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/menu');
-    export import NavigationMoreHoriz = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/more-horiz');
-    export import NavigationMoreVert = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/more-vert');
-    export import NavigationRefresh = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/refresh');
-    export import NavigationSubdirectoryArrowLeft = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/subdirectory-arrow-left');
-    export import NavigationSubdirectoryArrowRight = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/subdirectory-arrow-right');
-    export import NavigationUnfoldLess = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/unfold-less');
-    export import NavigationUnfoldMore = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/navigation/unfold-more');
-    export import NotificationAdb = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/adb');
-    export import NotificationAirlineSeatFlat = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/airline-seat-flat');
-    export import NotificationAirlineSeatFlatAngled = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/airline-seat-flat-angled');
-    export import NotificationAirlineSeatIndividualSuite = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/airline-seat-individual-suite');
-    export import NotificationAirlineSeatLegroomExtra = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/airline-seat-legroom-extra');
-    export import NotificationAirlineSeatLegroomNormal = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/airline-seat-legroom-normal');
-    export import NotificationAirlineSeatLegroomReduced = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/airline-seat-legroom-reduced');
-    export import NotificationAirlineSeatReclineExtra = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/airline-seat-recline-extra');
-    export import NotificationAirlineSeatReclineNormal = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/airline-seat-recline-normal');
-    export import NotificationBluetoothAudio = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/bluetooth-audio');
-    export import NotificationConfirmationNumber = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/confirmation-number');
-    export import NotificationDiscFull = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/disc-full');
-    export import NotificationDoNotDisturb = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/do-not-disturb');
-    export import NotificationDoNotDisturbAlt = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/do-not-disturb-alt');
-    export import NotificationDriveEta = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/drive-eta');
-    export import NotificationEnhancedEncryption = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/enhanced-encryption');
-    export import NotificationEventAvailable = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/event-available');
-    export import NotificationEventBusy = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/event-busy');
-    export import NotificationEventNote = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/event-note');
-    export import NotificationFolderSpecial = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/folder-special');
-    export import NotificationLiveTv = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/live-tv');
-    export import NotificationMms = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/mms');
-    export import NotificationMore = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/more');
-    export import NotificationNetworkCheck = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/network-check');
-    export import NotificationNetworkLocked = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/network-locked');
-    export import NotificationNoEncryption = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/no-encryption');
-    export import NotificationOndemandVideo = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/ondemand-video');
-    export import NotificationPersonalVideo = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/personal-video');
-    export import NotificationPhoneBluetoothSpeaker = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/phone-bluetooth-speaker');
-    export import NotificationPhoneForwarded = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/phone-forwarded');
-    export import NotificationPhoneInTalk = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/phone-in-talk');
-    export import NotificationPhoneLocked = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/phone-locked');
-    export import NotificationPhoneMissed = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/phone-missed');
-    export import NotificationPhonePaused = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/phone-paused');
-    export import NotificationPower = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/power');
-    export import NotificationRvHookup = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/rv-hookup');
-    export import NotificationSdCard = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/sd-card');
-    export import NotificationSimCardAlert = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/sim-card-alert');
-    export import NotificationSms = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/sms');
-    export import NotificationSmsFailed = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/sms-failed');
-    export import NotificationSync = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/sync');
-    export import NotificationSyncDisabled = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/sync-disabled');
-    export import NotificationSyncProblem = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/sync-problem');
-    export import NotificationSystemUpdate = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/system-update');
-    export import NotificationTapAndPlay = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/tap-and-play');
-    export import NotificationTimeToLeave = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/time-to-leave');
-    export import NotificationVibration = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/vibration');
-    export import NotificationVoiceChat = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/voice-chat');
-    export import NotificationVpnLock = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/vpn-lock');
-    export import NotificationWc = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/wc');
-    export import NotificationWifi = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/notification/wifi');
-    export import PlacesAcUnit = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/ac-unit');
-    export import PlacesAirportShuttle = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/airport-shuttle');
-    export import PlacesAllInclusive = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/all-inclusive');
-    export import PlacesBeachAccess = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/beach-access');
-    export import PlacesBusinessCenter = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/business-center');
-    export import PlacesCasino = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/casino');
-    export import PlacesChildCare = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/child-care');
-    export import PlacesChildFriendly = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/child-friendly');
-    export import PlacesFitnessCenter = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/fitness-center');
-    export import PlacesFreeBreakfast = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/free-breakfast');
-    export import PlacesGolfCourse = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/golf-course');
-    export import PlacesHotTub = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/hot-tub');
-    export import PlacesKitchen = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/kitchen');
-    export import PlacesPool = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/pool');
-    export import PlacesRoomService = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/room-service');
-    export import PlacesSmokeFree = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/smoke-free');
-    export import PlacesSmokingRooms = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/smoking-rooms');
-    export import PlacesSpa = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/places/spa');
-    export import SocialCake = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/cake');
-    export import SocialDomain = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/domain');
-    export import SocialGroup = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/group');
-    export import SocialGroupAdd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/group-add');
-    export import SocialLocationCity = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/location-city');
-    export import SocialMood = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/mood');
-    export import SocialMoodBad = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/mood-bad');
-    export import SocialNotifications = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/notifications');
-    export import SocialNotificationsActive = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/notifications-active');
-    export import SocialNotificationsNone = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/notifications-none');
-    export import SocialNotificationsOff = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/notifications-off');
-    export import SocialNotificationsPaused = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/notifications-paused');
-    export import SocialPages = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/pages');
-    export import SocialPartyMode = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/party-mode');
-    export import SocialPeople = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/people');
-    export import SocialPeopleOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/people-outline');
-    export import SocialPerson = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/person');
-    export import SocialPersonAdd = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/person-add');
-    export import SocialPersonOutline = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/person-outline');
-    export import SocialPlusOne = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/plus-one');
-    export import SocialPoll = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/poll');
-    export import SocialPublic = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/public');
-    export import SocialSchool = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/school');
-    export import SocialShare = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/share');
-    export import SocialWhatshot = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/social/whatshot');
-    export import ToggleCheckBox = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/toggle/check-box');
-    export import ToggleCheckBoxOutlineBlank = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/toggle/check-box-outline-blank');
-    export import ToggleIndeterminateCheckBox = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/toggle/indeterminate-check-box');
-    export import ToggleRadioButtonChecked = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/toggle/radio-button-checked');
-    export import ToggleRadioButtonUnchecked = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/toggle/radio-button-unchecked');
-    export import ToggleStar = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/toggle/star');
-    export import ToggleStarBorder = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/toggle/star-border');
-    export import ToggleStarHalf = __MaterialUI.SvgIcon; // require('material-ui/lib/svg-icon/toggle/star-half');
-}
diff --git a/material-ui/tsconfig.json b/material-ui/tsconfig.json
new file mode 100644
index 0000000000..c2ac1515bc
--- /dev/null
+++ b/material-ui/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "files": [
+        "index.d.ts",
+        "material-ui-tests.tsx"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "experimentalDecorators": true,
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/materialize-css/index.d.ts b/materialize-css/index.d.ts
new file mode 100644
index 0000000000..da027a2f3e
--- /dev/null
+++ b/materialize-css/index.d.ts
@@ -0,0 +1,473 @@
+// Type definitions for materialize-css v0.97.5
+// Project: http://materializecss.com/
+// Definitions by: Erik Lieben <https://github.com/eriklieben>, Leon Yu <https://github.com/leonyu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+/// <reference types="pickadate" />
+
+declare namespace Materialize {
+
+    /**
+     * The collapsible options
+     */
+    interface CollapsibleOptions {
+        /**
+        * A setting that changes the collapsible behavior to expandable instead of the default accordion style
+        */
+        accordion: boolean;
+    }
+
+    interface TooltipOptions {
+        /**
+        * The delay before the tooltip shows (in milliseconds)
+        */
+        delay:number;
+    }
+
+    /**
+     * The dropdown options
+     */
+    interface DropDownOptions {
+
+        /**
+         * The duration of the transition enter in milliseconds.
+         * Default: 300
+         */
+        inDuration?:number;
+
+        /**
+         * The duration of the transition out in milliseconds.
+         * Default: 225
+         */
+        outDuration?:number;
+
+        // TODO: constrain_width
+        /**
+         * If true, constrainWidth to the size of the dropdown activator.
+         * Default: true
+         */
+        constrain_width?:boolean;
+        /**
+         * If true, the dropdown will open on hover.
+         * Default: false
+         */
+        hover?:boolean;
+
+        /**
+         * This defines the spacing from the aligned edge.
+         * Default: 0
+         */
+        gutter?:number;
+
+        /**
+         * If true, the dropdown will show below the activator.
+         * Default: false
+         */
+        belowOrigin?:boolean;
+
+        /**
+         * Defines the edge the menu is aligned to.
+         * Default: 'left'
+         */
+        alignment?:string;
+    }
+
+    /**
+     * The slider options
+     */
+    interface SliderOptions {
+
+        /**
+         * Set to false to hide slide indicators.
+         * Default: true
+         */
+        indicators?: boolean;
+
+        /**
+         * Set height of slider.
+         * Default: 400
+         */
+        height?: number;
+
+        /**
+         * Set the duration of the transition animation in ms.
+         * Default: 500
+         */
+        transition?: number;
+
+        /**
+         * Set the duration between transitions in ms.
+         * Default: 6000
+         */
+        interval?: number;
+    }
+
+    /**
+     * The carousel options
+     */
+    interface CarouselOptions {
+        /**
+         * Transition time.
+         * Default: 200
+         */
+        time_constant?: number;
+
+        /**
+         * Perspective zoom. If 0, all items are the same size.
+         * Default: -100
+         */
+        dist?: number;
+
+        /**
+         * Set the duration of the transition animation in ms.
+         * Default: 500
+         */
+        shift?: number;
+
+        /**
+         * Set the duration between transitions in ms.
+         * Default: 6000
+         */
+        padding?: number;
+
+        /**
+         * Set the duration between transitions in ms.
+         * Default: 6000
+         */
+        full_width?: number;
+    }
+
+    /**
+     * The lean modal options
+     */
+    interface LeanModalOptions {
+
+        /**
+         * Modal can be dismissed by clicking outside of the modal.
+         * Default: true
+         */
+        dismissible?: boolean;
+
+        /**
+         * Opacity of modal background.
+         * Default. .5
+         */
+        opacity?: number;
+
+        /**
+         * Transition in duration.
+         * Default: 300
+         */
+        in_duration?: number;
+
+        /**
+         * Transition out duration.
+         * Default: 200
+         */
+        out_duration?: number;
+
+        /**
+         * Callback for Modal open.
+         * Default: function() { alert('Ready'); }
+         */
+        ready?: Function;
+
+        /**
+         * Callback for Modal close.
+         * Default: function() { alert('Closed'); }
+         */
+        complete?: Function;
+    }
+
+    /**
+     * The push pin options
+     */
+    interface PushpinOptions {
+
+        /**
+         * The distance in pixels from the top of the page where the element becomes fixed.
+         * Default: 0
+         */
+        top?:number;
+
+        /**
+         * The distance in pixels from the top of the page where the elements stops being fixed.
+         * Default: Infinity
+         */
+        bottom?:number;
+
+        /**
+         * The offset from the top the element will be fixed at.
+         * Default: 0
+         */
+        offset?:number;
+    }
+
+    /**
+     * The scroll spy options
+     */
+    interface ScrollSpyOptions {
+
+        /**
+         * Throttling in miliseconds.
+         * Default: 100
+         */
+        throttle?: number;
+
+        /**
+         * Offset from top.
+         * Default: 0
+         */
+        offsetTop?: number;
+
+        /**
+         * Offset from right.
+         * Default: 0
+         */
+        offsetRight?: number;
+
+        /**
+         * Offset from bottom.
+         * Default: 0
+         */
+        offsetBottom?: number;
+
+        /**
+         * Offset from left.
+         * Default: 0
+         */
+        offsetLeft?: number;
+
+    }
+
+    /**
+     * The slideNav options
+     */
+    interface SideNavOptions {
+        /**
+         * Default: 240
+         */
+        menuWidth?: number;
+
+        /**
+         * The horizontal origin
+         * Default: ' left'
+         */
+        edge?: string;
+
+        /**
+         * Closes side-nav on <a> clicks, useful for Angular/Meteor
+         * Default: false
+         */
+        closeOnClick?: boolean;
+    }
+
+    interface ScrollFireOptions {
+
+        /**
+         * The selector for the element that is being tracked.
+         */
+        selector?: string;
+
+        /**
+         * Offset to use when activating the scroll fire event
+         * If this is 0, the callback will be fired when the selector element is at the very bottom of the user's window.
+         */
+        offset?: number;
+
+        /**
+         * The string function call that you want to make when the user scrolls to the threshold.
+         * It will only be called once.
+         * Example: 'console.log("hello, world!")';
+         */
+        callback?: string;
+    }
+
+        /**
+     * The Materialize object
+     */
+    interface Materialize {
+
+        /**
+        * Displays a toast message on screen
+        *
+        * @name message The message to display on screen
+        * @name displayLength The duration in milliseconds to display the message on screen
+        * @name className The className to use to format the message to display
+        * @name completeCallback Callback function to call when the messages completes/hides.
+        */
+        toast(message:string|JQuery, displayLength:number, className?:string, completeCallback?:Function): void;
+
+        /**
+         * Fires an event when the page is scrolled to a certain area
+         *
+         * @name options optional parameter with scroll fire options
+         */
+        scrollFire(options?:ScrollFireOptions): void;
+
+        /**
+         * A staggered reveal effect for any UL Tag with list items
+         *
+         * @name selector the selector for the list to show in staggered fasion
+         */
+        showStaggeredList(selector:string): void;
+
+        /**
+         * Fade in images. It also animates grayscale and brightness to give it a unique effect.
+         *
+         * @name selector the selector for the image to fade in
+         */
+        fadeInImage(selector:string): void;
+    }
+}
+
+declare var Materialize : Materialize.Materialize;
+
+interface JQuery {
+
+    /**
+     * open Fixed Action Button
+     */
+    openFAB(): void;
+    /**
+     * close Fixed Action Button
+     */
+    closeFAB(): void;
+
+    /**
+     * Select allows user input through specified options.
+     * Initialization
+     */
+    material_select(): void;
+
+    /**
+     * Select allows user input through specified options.
+     * Updating/Destroying Select
+     *
+     * @name method "destroy" destroy the material select
+     */
+    material_select(method: string): void;
+
+    /**
+     * Use a character counter in fields where a character restriction is in place.
+     */
+    characterCounter(): JQuery;
+
+    /**
+     * Collapsibles are accordion elements that expand when clicked on.
+     * They allow you to hide content that is not immediately relevant to the user.
+     *
+     * @name options the collapsible options
+     */
+    collapsible(options?: Materialize.CollapsibleOptions): JQuery;
+
+    /**
+     * Tooltips are small, interactive, textual hints for mainly graphical elements.
+     * When using icons for actions you can use a tooltip to give people clarification on its function.
+     *
+     * @name options the tooltip options or the string "remove" to remove the tooltip function
+     */
+    tooltip(options?: Materialize.TooltipOptions|string): JQuery;
+
+    /**
+     * Add a dropdown list to any button.
+     * Make sure that the data-activates attribute matches the id in the <ul> tag.
+     *
+     * @name options the drop down options
+     */
+    dropdown(options?: Materialize.DropDownOptions): void;
+
+    /**
+     * Material box is a material design implementation of the Lightbox plugin.
+     */
+    materialbox(): JQuery;
+
+    /**
+     * slider is a simple and elegant image carousel.
+     * You can also have captions that will be transitioned on their own depending on their alignment.
+     * You can also have indicators that show up on the bottom of the slider.
+     *
+     * @name options the slider options
+     */
+    slider(options?: Materialize.SliderOptions): JQuery;
+
+    /**
+     * slider is a simple and elegant image carousel.
+     * You can also have captions that will be transitioned on their own depending on their alignment.
+     * You can also have indicators that show up on the bottom of the slider.
+     *
+     * @name method the string "start" to start the animation or "pauze" to pauze the animation
+     */
+    slider(method: string): JQuery;
+
+    /**
+     * Our slider is a simple and elegant image carousel.
+     * You can also have captions that will be transitioned on their own depending on their alignment.
+     * You can also have indicators that show up on the bottom of the slider.
+     *
+     * @name options the slider options or the string "start" to start the animation or "pauze" to pauze the animation
+     */
+    carousel(options?: Materialize.CarouselOptions): JQuery;
+
+    /**
+     * Our slider is a simple and elegant image carousel.
+     * You can also have captions that will be transitioned on their own depending on their alignment.
+     * You can also have indicators that show up on the bottom of the slider.
+     *
+     * @name method the methods to pause, start, move to next and move to previous slide.
+     */
+    carousel(method: string, count: [number]): JQuery;
+
+    /**
+     *  Modal for dialog boxes, confirmation messages, or other content that can be called up.
+     *
+     * @name options the lean modal options
+     */
+    leanModal(options?: Materialize.LeanModalOptions): JQuery;
+
+    /**
+     * Open a modal programatically
+     *
+     * @name options the lean modal options
+     */
+    openModal(options?: Materialize.LeanModalOptions): void;
+
+    /**
+     * Close a modal programatically
+     */
+    closeModal(): void;
+
+    /**
+     * Parallax is an effect where the background content or image in this case, is moved at a different speed than the foreground content while scrolling.
+     */
+    parallax(): JQuery;
+
+    /**
+     * Pushpin is a fixed positioning plugin.
+     *
+     * @name options the push pin options
+     */
+    pushpin(options?: Materialize.PushpinOptions): JQuery;
+
+    /**
+     * Scrollspy is a jQuery plugin that tracks certain elements and which element the user's screen is currently centered on.
+     *
+     * @name options the scroll spy options
+     */
+    scrollSpy(options?: Materialize.ScrollSpyOptions): JQuery;
+
+    /**
+     * A slide out menu. You can add a dropdown to your sidebar by using our collapsible component.
+     *
+     * @params methodOrOptions the slide navigation options or a string with "show" to reveal or "hide" to hide the menu
+     */
+    sideNav(methodOrOptions?: Materialize.SideNavOptions|string): void;
+
+    /**
+     * Programmatically trigger the tab change event
+     *
+     * @name method, the method to call (always "select_tab") and a param containing the id of the tab to open
+     */
+    tabs(method?:string, tab?:string): JQuery;
+}
diff --git a/materialize-css/materialize-css-tests.ts b/materialize-css/materialize-css-tests.ts
index a17e9128ae..ad0453ebb7 100644
--- a/materialize-css/materialize-css-tests.ts
+++ b/materialize-css/materialize-css-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="materialize-css.d.ts" />
+
 
 // Buttons
 
diff --git a/materialize-css/materialize-css.d.ts b/materialize-css/materialize-css.d.ts
deleted file mode 100644
index 3459772c5f..0000000000
--- a/materialize-css/materialize-css.d.ts
+++ /dev/null
@@ -1,473 +0,0 @@
-// Type definitions for materialize-css v0.97.5
-// Project: http://materializecss.com/
-// Definitions by: Erik Lieben <https://github.com/eriklieben>, Leon Yu <https://github.com/leonyu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../pickadate/pickadate.d.ts" />
-
-declare namespace Materialize {
-
-    /**
-     * The collapsible options
-     */
-    interface CollapsibleOptions {
-        /**
-        * A setting that changes the collapsible behavior to expandable instead of the default accordion style
-        */
-        accordion: boolean;
-    }
-
-    interface TooltipOptions {
-        /**
-        * The delay before the tooltip shows (in milliseconds)
-        */
-        delay:number;
-    }
-
-    /**
-     * The dropdown options
-     */
-    interface DropDownOptions {
-
-        /**
-         * The duration of the transition enter in milliseconds.
-         * Default: 300
-         */
-        inDuration?:number;
-
-        /**
-         * The duration of the transition out in milliseconds.
-         * Default: 225
-         */
-        outDuration?:number;
-
-        // TODO: constrain_width
-        /**
-         * If true, constrainWidth to the size of the dropdown activator.
-         * Default: true
-         */
-        constrain_width?:boolean;
-        /**
-         * If true, the dropdown will open on hover.
-         * Default: false
-         */
-        hover?:boolean;
-
-        /**
-         * This defines the spacing from the aligned edge.
-         * Default: 0
-         */
-        gutter?:number;
-
-        /**
-         * If true, the dropdown will show below the activator.
-         * Default: false
-         */
-        belowOrigin?:boolean;
-
-        /**
-         * Defines the edge the menu is aligned to.
-         * Default: 'left'
-         */
-        alignment?:string;
-    }
-
-    /**
-     * The slider options
-     */
-    interface SliderOptions {
-
-        /**
-         * Set to false to hide slide indicators.
-         * Default: true
-         */
-        indicators?: boolean;
-
-        /**
-         * Set height of slider.
-         * Default: 400
-         */
-        height?: number;
-
-        /**
-         * Set the duration of the transition animation in ms.
-         * Default: 500
-         */
-        transition?: number;
-
-        /**
-         * Set the duration between transitions in ms.
-         * Default: 6000
-         */
-        interval?: number;
-    }
-
-    /**
-     * The carousel options
-     */
-    interface CarouselOptions {
-        /**
-         * Transition time.
-         * Default: 200
-         */
-        time_constant?: number;
-
-        /**
-         * Perspective zoom. If 0, all items are the same size.
-         * Default: -100
-         */
-        dist?: number;
-
-        /**
-         * Set the duration of the transition animation in ms.
-         * Default: 500
-         */
-        shift?: number;
-
-        /**
-         * Set the duration between transitions in ms.
-         * Default: 6000
-         */
-        padding?: number;
-
-        /**
-         * Set the duration between transitions in ms.
-         * Default: 6000
-         */
-        full_width?: number;
-    }
-
-    /**
-     * The lean modal options
-     */
-    interface LeanModalOptions {
-
-        /**
-         * Modal can be dismissed by clicking outside of the modal.
-         * Default: true
-         */
-        dismissible?: boolean;
-
-        /**
-         * Opacity of modal background.
-         * Default. .5
-         */
-        opacity?: number;
-
-        /**
-         * Transition in duration.
-         * Default: 300
-         */
-        in_duration?: number;
-
-        /**
-         * Transition out duration.
-         * Default: 200
-         */
-        out_duration?: number;
-
-        /**
-         * Callback for Modal open.
-         * Default: function() { alert('Ready'); }
-         */
-        ready?: Function;
-
-        /**
-         * Callback for Modal close.
-         * Default: function() { alert('Closed'); }
-         */
-        complete?: Function;
-    }
-
-    /**
-     * The push pin options
-     */
-    interface PushpinOptions {
-
-        /**
-         * The distance in pixels from the top of the page where the element becomes fixed.
-         * Default: 0
-         */
-        top?:number;
-
-        /**
-         * The distance in pixels from the top of the page where the elements stops being fixed.
-         * Default: Infinity
-         */
-        bottom?:number;
-
-        /**
-         * The offset from the top the element will be fixed at.
-         * Default: 0
-         */
-        offset?:number;
-    }
-
-    /**
-     * The scroll spy options
-     */
-    interface ScrollSpyOptions {
-
-        /**
-         * Throttling in miliseconds.
-         * Default: 100
-         */
-        throttle?: number;
-
-        /**
-         * Offset from top.
-         * Default: 0
-         */
-        offsetTop?: number;
-
-        /**
-         * Offset from right.
-         * Default: 0
-         */
-        offsetRight?: number;
-
-        /**
-         * Offset from bottom.
-         * Default: 0
-         */
-        offsetBottom?: number;
-
-        /**
-         * Offset from left.
-         * Default: 0
-         */
-        offsetLeft?: number;
-
-    }
-
-    /**
-     * The slideNav options
-     */
-    interface SideNavOptions {
-        /**
-         * Default: 240
-         */
-        menuWidth?: number;
-
-        /**
-         * The horizontal origin
-         * Default: ' left'
-         */
-        edge?: string;
-
-        /**
-         * Closes side-nav on <a> clicks, useful for Angular/Meteor
-         * Default: false
-         */
-        closeOnClick?: boolean;
-    }
-
-    interface ScrollFireOptions {
-
-        /**
-         * The selector for the element that is being tracked.
-         */
-        selector?: string;
-
-        /**
-         * Offset to use when activating the scroll fire event
-         * If this is 0, the callback will be fired when the selector element is at the very bottom of the user's window.
-         */
-        offset?: number;
-
-        /**
-         * The string function call that you want to make when the user scrolls to the threshold.
-         * It will only be called once.
-         * Example: 'console.log("hello, world!")';
-         */
-        callback?: string;
-    }
-
-        /**
-     * The Materialize object
-     */
-    interface Materialize {
-
-        /**
-        * Displays a toast message on screen
-        *
-        * @name message The message to display on screen
-        * @name displayLength The duration in milliseconds to display the message on screen
-        * @name className The className to use to format the message to display
-        * @name completeCallback Callback function to call when the messages completes/hides.
-        */
-        toast(message:string|JQuery, displayLength:number, className?:string, completeCallback?:Function): void;
-
-        /**
-         * Fires an event when the page is scrolled to a certain area
-         *
-         * @name options optional parameter with scroll fire options
-         */
-        scrollFire(options?:ScrollFireOptions): void;
-
-        /**
-         * A staggered reveal effect for any UL Tag with list items
-         *
-         * @name selector the selector for the list to show in staggered fasion
-         */
-        showStaggeredList(selector:string): void;
-
-        /**
-         * Fade in images. It also animates grayscale and brightness to give it a unique effect.
-         *
-         * @name selector the selector for the image to fade in
-         */
-        fadeInImage(selector:string): void;
-    }
-}
-
-declare var Materialize : Materialize.Materialize;
-
-interface JQuery {
-
-    /**
-     * open Fixed Action Button
-     */
-    openFAB(): void;
-    /**
-     * close Fixed Action Button
-     */
-    closeFAB(): void;
-
-    /**
-     * Select allows user input through specified options.
-     * Initialization
-     */
-    material_select(): void;
-
-    /**
-     * Select allows user input through specified options.
-     * Updating/Destroying Select
-     *
-     * @name method "destroy" destroy the material select
-     */
-    material_select(method: string): void;
-
-    /**
-     * Use a character counter in fields where a character restriction is in place.
-     */
-    characterCounter(): JQuery;
-
-    /**
-     * Collapsibles are accordion elements that expand when clicked on.
-     * They allow you to hide content that is not immediately relevant to the user.
-     *
-     * @name options the collapsible options
-     */
-    collapsible(options?: Materialize.CollapsibleOptions): JQuery;
-
-    /**
-     * Tooltips are small, interactive, textual hints for mainly graphical elements.
-     * When using icons for actions you can use a tooltip to give people clarification on its function.
-     *
-     * @name options the tooltip options or the string "remove" to remove the tooltip function
-     */
-    tooltip(options?: Materialize.TooltipOptions|string): JQuery;
-
-    /**
-     * Add a dropdown list to any button.
-     * Make sure that the data-activates attribute matches the id in the <ul> tag.
-     *
-     * @name options the drop down options
-     */
-    dropdown(options?: Materialize.DropDownOptions): void;
-
-    /**
-     * Material box is a material design implementation of the Lightbox plugin.
-     */
-    materialbox(): JQuery;
-
-    /**
-     * slider is a simple and elegant image carousel.
-     * You can also have captions that will be transitioned on their own depending on their alignment.
-     * You can also have indicators that show up on the bottom of the slider.
-     *
-     * @name options the slider options
-     */
-    slider(options?: Materialize.SliderOptions): JQuery;
-
-    /**
-     * slider is a simple and elegant image carousel.
-     * You can also have captions that will be transitioned on their own depending on their alignment.
-     * You can also have indicators that show up on the bottom of the slider.
-     *
-     * @name method the string "start" to start the animation or "pauze" to pauze the animation
-     */
-    slider(method: string): JQuery;
-
-    /**
-     * Our slider is a simple and elegant image carousel.
-     * You can also have captions that will be transitioned on their own depending on their alignment.
-     * You can also have indicators that show up on the bottom of the slider.
-     *
-     * @name options the slider options or the string "start" to start the animation or "pauze" to pauze the animation
-     */
-    carousel(options?: Materialize.CarouselOptions): JQuery;
-
-    /**
-     * Our slider is a simple and elegant image carousel.
-     * You can also have captions that will be transitioned on their own depending on their alignment.
-     * You can also have indicators that show up on the bottom of the slider.
-     *
-     * @name method the methods to pause, start, move to next and move to previous slide.
-     */
-    carousel(method: string, count: [number]): JQuery;
-
-    /**
-     *  Modal for dialog boxes, confirmation messages, or other content that can be called up.
-     *
-     * @name options the lean modal options
-     */
-    leanModal(options?: Materialize.LeanModalOptions): JQuery;
-
-    /**
-     * Open a modal programatically
-     *
-     * @name options the lean modal options
-     */
-    openModal(options?: Materialize.LeanModalOptions): void;
-
-    /**
-     * Close a modal programatically
-     */
-    closeModal(): void;
-
-    /**
-     * Parallax is an effect where the background content or image in this case, is moved at a different speed than the foreground content while scrolling.
-     */
-    parallax(): JQuery;
-
-    /**
-     * Pushpin is a fixed positioning plugin.
-     *
-     * @name options the push pin options
-     */
-    pushpin(options?: Materialize.PushpinOptions): JQuery;
-
-    /**
-     * Scrollspy is a jQuery plugin that tracks certain elements and which element the user's screen is currently centered on.
-     *
-     * @name options the scroll spy options
-     */
-    scrollSpy(options?: Materialize.ScrollSpyOptions): JQuery;
-
-    /**
-     * A slide out menu. You can add a dropdown to your sidebar by using our collapsible component.
-     *
-     * @params methodOrOptions the slide navigation options or a string with "show" to reveal or "hide" to hide the menu
-     */
-    sideNav(methodOrOptions?: Materialize.SideNavOptions|string): void;
-
-    /**
-     * Programmatically trigger the tab change event
-     *
-     * @name method, the method to call (always "select_tab") and a param containing the id of the tab to open
-     */
-    tabs(method?:string, tab?:string): JQuery;
-}
diff --git a/materialize-css/tsconfig.json b/materialize-css/tsconfig.json
new file mode 100644
index 0000000000..60f47f3b2a
--- /dev/null
+++ b/materialize-css/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "materialize-css-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mathjax/mathjax.d.ts b/mathjax/index.d.ts
similarity index 100%
rename from mathjax/mathjax.d.ts
rename to mathjax/index.d.ts
diff --git a/mathjax/mathjax-tests.ts b/mathjax/mathjax-tests.ts
index 482f779894..c5329fb26a 100644
--- a/mathjax/mathjax-tests.ts
+++ b/mathjax/mathjax-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path='mathjax.d.ts' />
 MathJax.Hub.Config({
   config: ["MMLorHTML.js"],
   jax: ["input/TeX","input/MathML","input/AsciiMath","output/HTML-CSS","output/NativeMML"],
diff --git a/mathjax/tsconfig.json b/mathjax/tsconfig.json
new file mode 100644
index 0000000000..028d027efe
--- /dev/null
+++ b/mathjax/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mathjax-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mathjs/mathjs.d.ts b/mathjs/index.d.ts
similarity index 100%
rename from mathjs/mathjs.d.ts
rename to mathjs/index.d.ts
diff --git a/mathjs/mathjs-tests.ts b/mathjs/mathjs-tests.ts
index 0545ca9d0f..c174ca1c95 100644
--- a/mathjs/mathjs-tests.ts
+++ b/mathjs/mathjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="mathjs.d.ts" />
+
 
 
 /*
diff --git a/mathjs/tsconfig.json b/mathjs/tsconfig.json
new file mode 100644
index 0000000000..ee6be15a03
--- /dev/null
+++ b/mathjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mathjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/matter-js/index.d.ts b/matter-js/index.d.ts
new file mode 100644
index 0000000000..b33c40e856
--- /dev/null
+++ b/matter-js/index.d.ts
@@ -0,0 +1,3201 @@
+// Type definitions for Matter.js - 0.9.1
+// Project: https://github.com/liabru/matter-js
+// Definitions by: Ivane Gegia <https://twitter.com/ivanegegia>,
+//                 David Asmuth <https://github.com/piranha771/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = Matter;
+export as namespace Matter;
+
+declare namespace Matter {
+    /**
+    * The `Matter.Axes` module contains methods for creating and manipulating sets of axes.
+    *
+    * @class Axes
+    */
+    export class Axes {
+        /**
+         * Creates a new set of axes from the given vertices.
+         * @method fromVertices
+         * @param {vertices} vertices
+         * @return {axes} A new axes from the given vertices
+         */
+        static fromVertices(vertices: Array<Vector>): Array<Vector>;
+        /**
+         * Rotates a set of axes by the given angle.
+         * @method rotate
+         * @param {axes} axes
+         * @param {number} angle
+         */
+        static rotate(axes: Array<Vector>, angle: number): void;
+    }
+
+    /**
+    * The `Matter.Bodies` module contains factory methods for creating rigid body models
+    * with commonly used body configurations (such as rectangles, circles and other polygons).
+    *
+    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
+    *
+    * @class Bodies
+    */
+    export class Bodies {
+        /**
+         * Creates a new rigid body model with a circle hull.
+         * The options parameter is an object that specifies any properties you wish to override the defaults.
+         * See the properties section of the `Matter.Body` module for detailed information on what you can pass via the `options` object.
+         * @method circle
+         * @param {number} x
+         * @param {number} y
+         * @param {number} radius
+         * @param {object} [options]
+         * @param {number} [maxSides]
+         * @return {body} A new circle body
+         */
+        static circle(x: number, y: number, radius: number, options?: IBodyDefinition, maxSides?: number): Body;
+
+        /**
+         * Creates a new rigid body model with a regular polygon hull with the given number of sides.
+         * The options parameter is an object that specifies any properties you wish to override the defaults.
+         * See the properties section of the `Matter.Body` module for detailed information on what you can pass via the `options` object.
+         * @method polygon
+         * @param {number} x
+         * @param {number} y
+         * @param {number} sides
+         * @param {number} radius
+         * @param {object} [options]
+         * @return {body} A new regular polygon body
+         */
+        static polygon(x: number, y: number, sides: number, radius: number, options?: IBodyDefinition): Body;
+
+        /**
+         * Creates a new rigid body model with a rectangle hull.
+         * The options parameter is an object that specifies any properties you wish to override the defaults.
+         * See the properties section of the `Matter.Body` module for detailed information on what you can pass via the `options` object.
+         * @method rectangle
+         * @param {number} x
+         * @param {number} y
+         * @param {number} width
+         * @param {number} height
+         * @param {object} [options]
+         * @return {body} A new rectangle body
+         */
+        static rectangle(x: number, y: number, width: number, height: number, options?: IBodyDefinition): Body;
+
+        /**
+         * Creates a new rigid body model with a trapezoid hull.
+         * The options parameter is an object that specifies any properties you wish to override the defaults.
+         * See the properties section of the `Matter.Body` module for detailed information on what you can pass via the `options` object.
+         * @method trapezoid
+         * @param {number} x
+         * @param {number} y
+         * @param {number} width
+         * @param {number} height
+         * @param {number} slope
+         * @param {object} [options]
+         * @return {body} A new trapezoid body
+         */
+        static trapezoid(x: number, y: number, width: number, height: number, slope: number, options?: IBodyDefinition): Body;
+        /**
+        * Creates a body using the supplied vertices (or an array containing multiple sets of vertices).
+        * If the vertices are convex, they will pass through as supplied.
+        * Otherwise if the vertices are concave, they will be decomposed if [poly-decomp.js](https://github.com/schteppe/poly-decomp.js) is available.
+        * Note that this process is not guaranteed to support complex sets of vertices (e.g. those with holes may fail).
+        * By default the decomposition will discard collinear edges (to improve performance).
+        * It can also optionally discard any parts that have an area less than `minimumArea`.
+        * If the vertices can not be decomposed, the result will fall back to using the convex hull.
+        * The options parameter is an object that specifies any `Matter.Body` properties you wish to override the defaults.
+        * See the properties section of the `Matter.Body` module for detailed information on what you can pass via the `options` object.
+        * @method fromVertices
+        * @param {number} x
+        * @param {number} y
+        * @param [[vector]] vertexSets
+        * @param {object} [options]
+        * @param {bool} [flagInternal=false]
+        * @param {number} [removeCollinear=0.01]
+        * @param {number} [minimumArea=10]
+        * @return {body}
+        */
+        static fromVertices(x: number, y: number, vertexSets: Array<Array<Vector>>, options?: IBodyDefinition, flagInternal?: boolean, removeCollinear?: number, minimumArea?: number): Body;
+    }
+
+    export interface IBodyDefinition {
+        /**
+         * A `Number` specifying the angle of the body, in radians.
+         *
+        * @property angle
+        * @type number
+        * @default 0
+        */
+        angle?: number;
+        /**
+         * A `Number` that _measures_ the current angular speed of the body after the last `Body.update`. It is read-only and always positive (it's the magnitude of `body.angularVelocity`).
+         *
+        * @readOnly
+        * @property angularSpeed
+        * @type number
+        * @default 0
+        */
+        angularSpeed?: number;
+        /**
+         * A `Number` that _measures_ the current angular velocity of the body after the last `Body.update`. It is read-only.
+         * If you need to modify a body's angular velocity directly, you should apply a torque or simply change the body's `angle` (as the engine uses position-Verlet integration).
+         *
+        * @readOnly
+        * @property angularVelocity
+        * @type number
+        * @default 0
+        */
+        angularVelocity?: number;
+        /**
+         * A `Number` that _measures_ the area of the body's convex hull, calculated at creation by `Body.create`.
+         *
+        * @property area
+        * @type string
+        * @default
+        */
+        area?: number;
+        /**
+         * An array of unique axis vectors (edge normals) used for collision detection.
+         * These are automatically calculated from the given convex hull (`vertices` array) in `Body.create`.
+         * They are constantly updated by `Body.update` during the simulation.
+         *
+        * @property axes
+        * @type vector[]
+        */
+        axes?: Array<Vector>;
+        /**
+         * A `Bounds` object that defines the AABB region for the body.
+         * It is automatically calculated from the given convex hull (`vertices` array) in `Body.create` and constantly updated by `Body.update` during simulation.
+         *
+        * @property bounds
+        * @type bounds
+        */
+        bounds?: Bounds;
+        /**
+         * A `Number` that defines the density of the body, that is its mass per unit area.
+         * If you pass the density via `Body.create` the `mass` property is automatically calculated for you based on the size (area) of the object.
+         * This is generally preferable to simply setting mass and allows for more intuitive definition of materials (e.g. rock has a higher density than wood).
+         *
+        * @property density
+        * @type number
+        * @default 0.001
+        */
+        density?: number;
+        /**
+         * A `Vector` that specifies the force to apply in the current step. It is zeroed after every `Body.update`. See also `Body.applyForce`.
+        *
+        * @property force
+        * @type vector
+        * @default { x: 0, y: 0 }
+        */
+        force?: Vector;
+        /**
+         * A `Number` that defines the friction of the body. The value is always positive and is in the range `(0, 1)`.
+        * A value of `0` means that the body may slide indefinitely.
+        * A value of `1` means the body may come to a stop almost instantly after a force is applied.
+        *
+        * The effects of the value may be non-linear.
+        * High values may be unstable depending on the body.
+        * The engine uses a Coulomb friction model including static and kinetic friction.
+        * Note that collision response is based on _pairs_ of bodies, and that `friction` values are _combined_ with the following formula:
+        *
+        *     Math.min(bodyA.friction, bodyB.friction)
+        *
+        * @property friction
+        * @type number
+        * @default 0.1
+        */
+        friction?: number;
+        /**
+         * A `Number` that defines the air friction of the body (air resistance).
+         * A value of `0` means the body will never slow as it moves through space.
+         * The higher the value, the faster a body slows when moving through space.
+         * The effects of the value are non-linear.
+         *
+        * @property frictionAir
+        * @type number
+        * @default 0.01
+        */
+        frictionAir?: number;
+        /**
+         * An integer `Number` uniquely identifying number generated in `Body.create` by `Common.nextId`.
+         *
+        * @property id
+        * @type number
+        */
+        id?: number;
+        /**
+         * A `Number` that defines the moment of inertia (i.e. second moment of area) of the body.
+         * It is automatically calculated from the given convex hull (`vertices` array) and density in `Body.create`.
+         * If you modify this value, you must also modify the `body.inverseInertia` property (`1 / inertia`).
+         *
+        * @property inertia
+        * @type number
+        */
+        inertia?: number;
+        /**
+         * A `Number` that defines the inverse moment of inertia of the body (`1 / inertia`).
+         * If you modify this value, you must also modify the `body.inertia` property.
+         *
+        * @property inverseInertia
+        * @type number
+        */
+        inverseInertia?: number;
+        /**
+         * A `Number` that defines the inverse mass of the body (`1 / mass`).
+         * If you modify this value, you must also modify the `body.mass` property.
+         *
+        * @property inverseMass
+        * @type number
+        */
+        inverseMass?: number;
+        /**
+         * A flag that indicates whether the body is considered sleeping. A sleeping body acts similar to a static body, except it is only temporary and can be awoken.
+         * If you need to set a body as sleeping, you should use `Sleeping.set` as this requires more than just setting this flag.
+         *
+        * @property isSleeping
+        * @type boolean
+        * @default false
+        */
+        isSleeping?: boolean;
+        /**
+         * A flag that indicates whether a body is considered static. A static body can never change position or angle and is completely fixed.
+         * If you need to set a body as static after its creation, you should use `Body.setStatic` as this requires more than just setting this flag.
+         *
+        * @property isStatic
+        * @type boolean
+        * @default false
+        */
+        isStatic?: boolean;
+        /**
+         * An arbitrary `String` name to help the user identify and manage bodies.
+         *
+        * @property label
+        * @type string
+        * @default "Body"
+        */
+
+        label?: string;
+        /**
+         * A `Number` that defines the mass of the body, although it may be more appropriate to specify the `density` property instead.
+         * If you modify this value, you must also modify the `body.inverseMass` property (`1 / mass`).
+         *
+        * @property mass
+        * @type number
+        */
+        mass?: number;
+        /**
+         * A `Number` that _measures_ the amount of movement a body currently has (a combination of `speed` and `angularSpeed`). It is read-only and always positive.
+        * It is used and updated by the `Matter.Sleeping` module during simulation to decide if a body has come to rest.
+        *
+        * @readOnly
+        * @property motion
+        * @type number
+        * @default 0
+        */
+        motion?: number;
+        /**
+         * A `Vector` that specifies the current world-space position of the body.
+         *
+        * @property position
+        * @type vector
+        * @default { x: 0, y:      */
+        position?: Vector;
+        /**
+         * An `Object` that defines the rendering properties to be consumed by the module `Matter.Render`.
+        *
+        * @property render
+        * @type object
+        */
+        render?: IBodyRenderOptions;
+        /**
+         * A `Number` that defines the restitution (elasticity) of the body. The value is always positive and is in the range `(0, 1)`.
+         * A value of `0` means collisions may be perfectly inelastic and no bouncing may occur.
+         * A value of `0.8` means the body may bounce back with approximately 80% of its kinetic energy.
+         * Note that collision response is based on _pairs_ of bodies, and that `restitution` values are _combined_ with the following formula:
+         *
+        *     Math.max(bodyA.restitution, bodyB.restitution)
+        *
+        * @property restitution
+        * @type number
+        * @default 0
+        */
+        restitution?: number;
+        /**
+         * A `Number` that defines the number of updates in which this body must have near-zero velocity before it is set as sleeping by the `Matter.Sleeping` module (if sleeping is enabled by the engine).
+         *
+        * @property sleepThreshold
+        * @type number
+        * @default 60
+        */
+        sleepThreshold?: number;
+        /**
+         * A `Number` that specifies a tolerance on how far a body is allowed to 'sink' or rotate into other bodies.
+         * Avoid changing this value unless you understand the purpose of `slop` in physics engines.
+         * The default should generally suffice, although very large bodies may require larger values for stable stacking.
+         *
+        * @property slop
+        * @type number
+        * @default 0.05
+        */
+        slop?: number;
+        /**
+         * A `Number` that _measures_ the current speed of the body after the last `Body.update`. It is read-only and always positive (it's the magnitude of `body.velocity`).
+         *
+        * @readOnly
+        * @property speed
+        * @type number
+        * @default 0
+        */
+        speed?: number;
+        /**
+         * A `Number` that allows per-body time scaling, e.g. a force-field where bodies inside are in slow-motion, while others are at full speed.
+        *
+        * @property timeScale
+        * @type number
+        * @default 1
+        */
+        timeScale?: number;
+        /**
+         * A `Number` that specifies the torque (turning force) to apply in the current step. It is zeroed after every `Body.update`.
+        *
+        * @property torque
+        * @type number
+        * @default 0
+        */
+        torque?: number;
+        /**
+         * A `String` denoting the type of object.
+        *
+        * @property type
+        * @type string
+        * @default "body"
+        */
+        type?: string;
+        /**
+         * A `Vector` that _measures_ the current velocity of the body after the last `Body.update`. It is read-only.
+         * If you need to modify a body's velocity directly, you should either apply a force or simply change the body's `position` (as the engine uses position-Verlet integration).
+         *
+        * @readOnly
+        * @property velocity
+        * @type vector
+        * @default { x: 0, y: 0 }
+        */
+        velocity?: Vector;
+        /**
+         * An array of `Vector` objects that specify the convex hull of the rigid body.
+         * These should be provided about the origin `(0, 0)`. E.g.
+         *
+        *     [{ x: 0, y: 0 }, { x: 25, y: 50 }, { x: 50, y: 0 }]
+        *
+        * When passed via `Body.create`, the vertices are translated relative to `body.position` (i.e. world-space, and constantly updated by `Body.update` during simulation).
+        * The `Vector` objects are also augmented with additional properties required for efficient collision detection.
+        *
+        * Other properties such as `inertia` and `bounds` are automatically calculated from the passed vertices (unless provided via `options`).
+        * Concave hulls are not currently supported. The module `Matter.Vertices` contains useful methods for working with vertices.
+        *
+        * @property vertices
+        * @type vector[]
+        */
+        vertices?: Array<Vector>;
+        /**
+         * An array of bodies that make up this body.
+         * The first body in the array must always be a self reference to the current body instance.
+         * All bodies in the `parts` array together form a single rigid compound body.
+         * Parts are allowed to overlap, have gaps or holes or even form concave bodies.
+         * Parts themselves should never be added to a `World`, only the parent body should be.
+         * Use `Body.setParts` when setting parts to ensure correct updates of all properties.
+         *
+        * @property parts
+        * @type body[]
+        */
+        parts?: Array<Body>;
+        /**
+         * A self reference if the body is _not_ a part of another body.
+         * Otherwise this is a reference to the body that this is a part of.
+         * See `body.parts`.
+         *
+        * @property parent
+        * @type body
+        */
+        parent?: Body;
+        /**
+         * A `Number` that defines the static friction of the body (in the Coulomb friction model).
+         * A value of `0` means the body will never 'stick' when it is nearly stationary and only dynamic `friction` is used.
+         * The higher the value (e.g. `10`), the more force it will take to initially get the body moving when nearly stationary.
+         * This value is multiplied with the `friction` property to make it easier to change `friction` and maintain an appropriate amount of static friction.
+         *
+        * @property frictionStatic
+        * @type number
+        * @default 0.5
+        */
+        frictionStatic?: number;
+        /**
+         * An `Object` that specifies the collision filtering properties of this body.
+         *
+        * Collisions between two bodies will obey the following rules:
+        * - If the two bodies have the same non-zero value of `collisionFilter.group`,
+        *   they will always collide if the value is positive, and they will never collide
+        *   if the value is negative.
+        * - If the two bodies have different values of `collisionFilter.group` or if one
+        *   (or both) of the bodies has a value of 0, then the category/mask rules apply as follows:
+        *
+        * Each body belongs to a collision category, given by `collisionFilter.category`. This
+        * value is used as a bit field and the category should have only one bit set, meaning that
+        * the value of this property is a power of two in the range [1, 2^31]. Thus, there are 32
+        * different collision categories available.
+        *
+        * Each body also defines a collision bitmask, given by `collisionFilter.mask` which specifies
+        * the categories it collides with (the value is the bitwise AND value of all these categories).
+        *
+        * Using the category/mask rules, two bodies `A` and `B` collide if each includes the other's
+        * category in its mask, i.e. `(categoryA & maskB) !== 0` and `(categoryB & maskA) !== 0`
+        * are both true.
+        *
+        * @property collisionFilter
+        * @type object
+        */
+        collisionFilter?: ICollisionFilter;
+
+    }
+
+    export interface IBodyRenderOptions {
+
+        /**
+         * A flag that indicates if the body should be rendered.
+         *
+        * @property render.visible
+        * @type boolean
+        * @default true
+        */
+        visible: boolean;
+
+        /**
+         * An `Object` that defines the sprite properties to use when rendering, if any.
+         *
+        * @property render.sprite
+        * @type object
+        */
+        sprite: IBodyRenderOptionsSprite;
+
+        /**
+         * A String that defines the fill style to use when rendering the body (if a sprite is not defined). It is the same as when using a canvas, so it accepts CSS style property values.
+         Default: a random colour
+        */
+        fillStyle: string;
+
+        /**
+         * A Number that defines the line width to use when rendering the body outline (if a sprite is not defined). A value of 0 means no outline will be rendered.
+         Default: 1.5
+        */
+        lineWidth: number;
+
+        /**
+         * A String that defines the stroke style to use when rendering the body outline (if a sprite is not defined). It is the same as when using a canvas, so it accepts CSS style property values.
+         Default: a random colour
+        */
+        strokeStyle: string;
+
+
+		/*
+		 * Sets the opacity. 1.0 is fully opaque. 0.0 is fully translucent
+		 */
+		opacity: number;
+    }
+
+    export interface IBodyRenderOptionsSprite {
+        /**
+         * An `String` that defines the path to the image to use as the sprite texture, if any.
+         *
+        * @property render.sprite.texture
+        * @type string
+        */
+        texture: string;
+
+        /**
+         * A `Number` that defines the scaling in the x-axis for the sprite, if any.
+         *
+        * @property render.sprite.xScale
+        * @type number
+        * @default 1
+        */
+        xScale: number;
+
+        /**
+         * A `Number` that defines the scaling in the y-axis for the sprite, if any.
+         *
+        * @property render.sprite.yScale
+        * @type number
+        * @default 1
+        */
+        yScale: number;
+    }
+
+    /**
+    * The `Matter.Body` module contains methods for creating and manipulating body models.
+    * A `Matter.Body` is a rigid body that can be simulated by a `Matter.Engine`.
+    * Factories for commonly used body configurations (such as rectangles, circles and other polygons) can be found in the module `Matter.Bodies`.
+    *
+    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
+
+    * @class Body
+    */
+    export class Body {
+        /**
+         * Applies a force to a body from a given world-space position, including resulting torque.
+         * @method applyForce
+         * @param {body} body
+         * @param {vector} position
+         * @param {vector} force
+         */
+        static applyForce(body: Body, position: Vector, force: Vector): void;
+
+        /**
+         * Creates a new rigid body model. The options parameter is an object that specifies any properties you wish to override the defaults.
+         * All properties have default values, and many are pre-calculated automatically based on other properties.
+         * See the properties section below for detailed information on what you can pass via the `options` object.
+         * @method create
+         * @param {} options
+         * @return {body} body
+         */
+        static create(options: IBodyDefinition): Body;
+        /**
+         * Rotates a body by a given angle relative to its current angle, without imparting any angular velocity.
+         * @method rotate
+         * @param {body} body
+         * @param {number} rotation
+         */
+        static rotate(body: Body, rotation: number): void;
+        /**
+         * Returns the next unique group index for which bodies will collide.
+         * If `isNonColliding` is `true`, returns the next unique group index for which bodies will _not_ collide.
+         * See `body.collisionFilter` for more information.
+         * @method nextGroup
+         * @param {bool} [isNonColliding=false]
+         * @return {Number} Unique group index
+         */
+        static nextGroup(isNonColliding: boolean): number;
+        /**
+         * Returns the next unique category bitfield (starting after the initial default category `0x0001`).
+         * There are 32 available. See `body.collisionFilter` for more information.
+         * @method nextCategory
+         * @return {Number} Unique category bitfield
+         */
+        static nextCategory(): number;
+        /**
+         * Given a property and a value (or map of), sets the property(s) on the body, using the appropriate setter functions if they exist.
+         * Prefer to use the actual setter functions in performance critical situations.
+         * @method set
+         * @param {body} body
+         * @param {} settings A property name (or map of properties and values) to set on the body.
+         * @param {} value The value to set if `settings` is a single property name.
+         */
+        static set(body: Body, settings: any, value?: any): void;
+        /**
+         * Sets the mass of the body. Inverse mass and density are automatically updated to reflect the change.
+         * @method setMass
+         * @param {body} body
+         * @param {number} mass
+         */
+        static setMass(body: Body, mass: number): void;
+        /**
+         * Sets the density of the body. Mass is automatically updated to reflect the change.
+         * @method setDensity
+         * @param {body} body
+         * @param {number} density
+         */
+        static setDensity(body: Body, density: number): void;
+        /**
+         * Sets the moment of inertia (i.e. second moment of area) of the body of the body.
+         * Inverse inertia is automatically updated to reflect the change. Mass is not changed.
+         * @method setInertia
+         * @param {body} body
+         * @param {number} inertia
+         */
+        static setInertia(body: Body, interna: number): void;
+        /**
+         * Sets the body's vertices and updates body properties accordingly, including inertia, area and mass (with respect to `body.density`).
+         * Vertices will be automatically transformed to be orientated around their centre of mass as the origin.
+         * They are then automatically translated to world space based on `body.position`.
+         *
+        * The `vertices` argument should be passed as an array of `Matter.Vector` points (or a `Matter.Vertices` array).
+        * Vertices must form a convex hull, concave hulls are not supported.
+        *
+        * @method setVertices
+        * @param {body} body
+        * @param {vector[]} vertices
+        */
+        static setVertices(body: Body, vertices: Array<Vector>): void;
+        /**
+         * Sets the parts of the `body` and updates mass, inertia and centroid.
+         * Each part will have its parent set to `body`.
+         * By default the convex hull will be automatically computed and set on `body`, unless `autoHull` is set to `false.`
+         * Note that this method will ensure that the first part in `body.parts` will always be the `body`.
+         * @method setParts
+         * @param {body} body
+         * @param [body] parts
+         * @param {bool} [autoHull=true]
+         */
+        static setParts(body: Body, parts: Body[], autoHull?: boolean): void;
+        /**
+         * Sets the position of the body instantly. Velocity, angle, force etc. are unchanged.
+         * @method setPosition
+         * @param {body} body
+         * @param {vector} position
+         */
+        static setPosition(body: Body, position: Vector): void;
+        /**
+         * Sets the angle of the body instantly. Angular velocity, position, force etc. are unchanged.
+         * @method setAngle
+         * @param {body} body
+         * @param {number} angle
+         */
+        static setAngle(body: Body, angle: number): void;
+        /**
+         * Sets the linear velocity of the body instantly. Position, angle, force etc. are unchanged. See also `Body.applyForce`.
+         * @method setVelocity
+         * @param {body} body
+         * @param {vector} velocity
+         */
+        static setVelocity(body: Body, velocity: Vector): void;
+        /**
+         * Sets the angular velocity of the body instantly. Position, angle, force etc. are unchanged. See also `Body.applyForce`.
+         * @method setAngularVelocity
+         * @param {body} body
+         * @param {number} velocity
+         */
+        static setAngularVelocity(body: Body, velocity: number): void;
+
+
+
+        /**
+         * Sets the body as static, including isStatic flag and setting mass and inertia to Infinity.
+         * @method setStatic
+         * @param {body} body
+         * @param {bool} isStatic
+         */
+        static setStatic(body: Body, isStatic: boolean): void;
+
+        /**
+         * Scales the body, including updating physical properties (mass, area, axes, inertia), from a world-space point (default is body centre).
+         * @method scale
+         * @param {body} body
+         * @param {number} scaleX
+         * @param {number} scaleY
+         * @param {vector} [point]
+         */
+        static scale(body: Body, scaleX: number, scaleY: number, point?: Vector): void;
+
+        /**
+         * Moves a body by a given vector relative to its current position, without imparting any velocity.
+         * @method translate
+         * @param {body} body
+         * @param {vector} translation
+         */
+        static translate(body: Body, translation: Vector): void;
+
+        /**
+         * Performs a simulation step for the given `body`, including updating position and angle using Verlet integration.
+         * @method update
+         * @param {body} body
+         * @param {number} deltaTime
+         * @param {number} timeScale
+         * @param {number} correction
+         */
+        static update(body: Body, deltaTime: number, timeScale: number, correction: number): void;
+
+        /**
+         * A `Number` specifying the angle of the body, in radians.
+         *
+        * @property angle
+        * @type number
+        * @default 0
+        */
+        angle: number;
+        /**
+         * A `Number` that _measures_ the current angular speed of the body after the last `Body.update`. It is read-only and always positive (it's the magnitude of `body.angularVelocity`).
+         *
+        * @readOnly
+        * @property angularSpeed
+        * @type number
+        * @default 0
+        */
+        angularSpeed: number;
+        /**
+         * A `Number` that _measures_ the current angular velocity of the body after the last `Body.update`. It is read-only.
+         * If you need to modify a body's angular velocity directly, you should apply a torque or simply change the body's `angle` (as the engine uses position-Verlet integration).
+         *
+        * @readOnly
+        * @property angularVelocity
+        * @type number
+        * @default 0
+        */
+        angularVelocity: number;
+        /**
+         * A `Number` that _measures_ the area of the body's convex hull, calculated at creation by `Body.create`.
+         *
+        * @property area
+        * @type string
+        * @default
+        */
+        area: number;
+        /**
+         * An array of unique axis vectors (edge normals) used for collision detection.
+         * These are automatically calculated from the given convex hull (`vertices` array) in `Body.create`.
+         * They are constantly updated by `Body.update` during the simulation.
+         *
+        * @property axes
+        * @type vector[]
+        */
+        axes: Array<Vector>;
+        /**
+         * A `Bounds` object that defines the AABB region for the body.
+         * It is automatically calculated from the given convex hull (`vertices` array) in `Body.create` and constantly updated by `Body.update` during simulation.
+         *
+        * @property bounds
+        * @type bounds
+        */
+        bounds: Bounds;
+        /**
+         * A `Number` that defines the density of the body, that is its mass per unit area.
+         * If you pass the density via `Body.create` the `mass` property is automatically calculated for you based on the size (area) of the object.
+         * This is generally preferable to simply setting mass and allows for more intuitive definition of materials (e.g. rock has a higher density than wood).
+         *
+        * @property density
+        * @type number
+        * @default 0.001
+        */
+        density: number;
+        /**
+         * A `Vector` that specifies the force to apply in the current step. It is zeroed after every `Body.update`. See also `Body.applyForce`.
+        *
+        * @property force
+        * @type vector
+        * @default { x: 0, y: 0 }
+        */
+        force: Vector;
+        /**
+         * A `Number` that defines the friction of the body. The value is always positive and is in the range `(0, 1)`.
+        * A value of `0` means that the body may slide indefinitely.
+        * A value of `1` means the body may come to a stop almost instantly after a force is applied.
+        *
+        * The effects of the value may be non-linear.
+        * High values may be unstable depending on the body.
+        * The engine uses a Coulomb friction model including static and kinetic friction.
+        * Note that collision response is based on _pairs_ of bodies, and that `friction` values are _combined_ with the following formula:
+        *
+        *     Math.min(bodyA.friction, bodyB.friction)
+        *
+        * @property friction
+        * @type number
+        * @default 0.1
+        */
+        friction: number;
+        /**
+         * A `Number` that defines the air friction of the body (air resistance).
+         * A value of `0` means the body will never slow as it moves through space.
+         * The higher the value, the faster a body slows when moving through space.
+         * The effects of the value are non-linear.
+         *
+        * @property frictionAir
+        * @type number
+        * @default 0.01
+        */
+        frictionAir: number;
+        /**
+         * An integer `Number` uniquely identifying number generated in `Body.create` by `Common.nextId`.
+         *
+        * @property id
+        * @type number
+        */
+        id: number;
+        /**
+         * A `Number` that defines the moment of inertia (i.e. second moment of area) of the body.
+         * It is automatically calculated from the given convex hull (`vertices` array) and density in `Body.create`.
+         * If you modify this value, you must also modify the `body.inverseInertia` property (`1 / inertia`).
+         *
+        * @property inertia
+        * @type number
+        */
+        inertia: number;
+        /**
+         * A `Number` that defines the inverse moment of inertia of the body (`1 / inertia`).
+         * If you modify this value, you must also modify the `body.inertia` property.
+         *
+        * @property inverseInertia
+        * @type number
+        */
+        inverseInertia: number;
+        /**
+         * A `Number` that defines the inverse mass of the body (`1 / mass`).
+         * If you modify this value, you must also modify the `body.mass` property.
+         *
+        * @property inverseMass
+        * @type number
+        */
+        inverseMass: number;
+        /**
+         * A flag that indicates whether the body is considered sleeping. A sleeping body acts similar to a static body, except it is only temporary and can be awoken.
+         * If you need to set a body as sleeping, you should use `Sleeping.set` as this requires more than just setting this flag.
+         *
+        * @property isSleeping
+        * @type boolean
+        * @default false
+        */
+        isSleeping: boolean;
+        /**
+         * A flag that indicates whether a body is considered static. A static body can never change position or angle and is completely fixed.
+         * If you need to set a body as static after its creation, you should use `Body.setStatic` as this requires more than just setting this flag.
+         *
+        * @property isStatic
+        * @type boolean
+        * @default false
+        */
+        isStatic: boolean;
+        /**
+         * An arbitrary `String` name to help the user identify and manage bodies.
+         *
+        * @property label
+        * @type string
+        * @default "Body"
+        */
+
+        label: string;
+        /**
+         * A `Number` that defines the mass of the body, although it may be more appropriate to specify the `density` property instead.
+         * If you modify this value, you must also modify the `body.inverseMass` property (`1 / mass`).
+         *
+        * @property mass
+        * @type number
+        */
+        mass: number;
+        /**
+         * A `Number` that _measures_ the amount of movement a body currently has (a combination of `speed` and `angularSpeed`). It is read-only and always positive.
+        * It is used and updated by the `Matter.Sleeping` module during simulation to decide if a body has come to rest.
+        *
+        * @readOnly
+        * @property motion
+        * @type number
+        * @default 0
+        */
+        motion: number;
+        /**
+         * A `Vector` that specifies the current world-space position of the body.
+         *
+        * @property position
+        * @type vector
+        * @default { x: 0, y:      */
+        position: Vector;
+        /**
+         * An `Object` that defines the rendering properties to be consumed by the module `Matter.Render`.
+        *
+        * @property render
+        * @type object
+        */
+        render: IBodyRenderOptions;
+        /**
+         * A `Number` that defines the restitution (elasticity) of the body. The value is always positive and is in the range `(0, 1)`.
+         * A value of `0` means collisions may be perfectly inelastic and no bouncing may occur.
+         * A value of `0.8` means the body may bounce back with approximately 80% of its kinetic energy.
+         * Note that collision response is based on _pairs_ of bodies, and that `restitution` values are _combined_ with the following formula:
+         *
+        *     Math.max(bodyA.restitution, bodyB.restitution)
+        *
+        * @property restitution
+        * @type number
+        * @default 0
+        */
+        restitution: number;
+        /**
+         * A `Number` that defines the number of updates in which this body must have near-zero velocity before it is set as sleeping by the `Matter.Sleeping` module (if sleeping is enabled by the engine).
+         *
+        * @property sleepThreshold
+        * @type number
+        * @default 60
+        */
+        sleepThreshold: number;
+        /**
+         * A `Number` that specifies a tolerance on how far a body is allowed to 'sink' or rotate into other bodies.
+         * Avoid changing this value unless you understand the purpose of `slop` in physics engines.
+         * The default should generally suffice, although very large bodies may require larger values for stable stacking.
+         *
+        * @property slop
+        * @type number
+        * @default 0.05
+        */
+        slop: number;
+        /**
+         * A `Number` that _measures_ the current speed of the body after the last `Body.update`. It is read-only and always positive (it's the magnitude of `body.velocity`).
+         *
+        * @readOnly
+        * @property speed
+        * @type number
+        * @default 0
+        */
+        speed: number;
+        /**
+         * A `Number` that allows per-body time scaling, e.g. a force-field where bodies inside are in slow-motion, while others are at full speed.
+        *
+        * @property timeScale
+        * @type number
+        * @default 1
+        */
+        timeScale: number;
+        /**
+         * A `Number` that specifies the torque (turning force) to apply in the current step. It is zeroed after every `Body.update`.
+        *
+        * @property torque
+        * @type number
+        * @default 0
+        */
+        torque: number;
+        /**
+         * A `String` denoting the type of object.
+        *
+        * @property type
+        * @type string
+        * @default "body"
+        */
+        type: string;
+        /**
+         * A `Vector` that _measures_ the current velocity of the body after the last `Body.update`. It is read-only.
+         * If you need to modify a body's velocity directly, you should either apply a force or simply change the body's `position` (as the engine uses position-Verlet integration).
+         *
+        * @readOnly
+        * @property velocity
+        * @type vector
+        * @default { x: 0, y: 0 }
+        */
+        velocity: Vector;
+        /**
+         * An array of `Vector` objects that specify the convex hull of the rigid body.
+         * These should be provided about the origin `(0, 0)`. E.g.
+         *
+        *     [{ x: 0, y: 0 }, { x: 25, y: 50 }, { x: 50, y: 0 }]
+        *
+        * When passed via `Body.create`, the vertices are translated relative to `body.position` (i.e. world-space, and constantly updated by `Body.update` during simulation).
+        * The `Vector` objects are also augmented with additional properties required for efficient collision detection.
+        *
+        * Other properties such as `inertia` and `bounds` are automatically calculated from the passed vertices (unless provided via `options`).
+        * Concave hulls are not currently supported. The module `Matter.Vertices` contains useful methods for working with vertices.
+        *
+        * @property vertices
+        * @type vector[]
+        */
+        vertices: Array<Vector>;
+        /**
+         * An array of bodies that make up this body.
+         * The first body in the array must always be a self reference to the current body instance.
+         * All bodies in the `parts` array together form a single rigid compound body.
+         * Parts are allowed to overlap, have gaps or holes or even form concave bodies.
+         * Parts themselves should never be added to a `World`, only the parent body should be.
+         * Use `Body.setParts` when setting parts to ensure correct updates of all properties.
+         *
+        * @property parts
+        * @type body[]
+        */
+        parts: Array<Body>;
+        /**
+         * A self reference if the body is _not_ a part of another body.
+         * Otherwise this is a reference to the body that this is a part of.
+         * See `body.parts`.
+         *
+        * @property parent
+        * @type body
+        */
+        parent: Body;
+        /**
+         * A `Number` that defines the static friction of the body (in the Coulomb friction model).
+         * A value of `0` means the body will never 'stick' when it is nearly stationary and only dynamic `friction` is used.
+         * The higher the value (e.g. `10`), the more force it will take to initially get the body moving when nearly stationary.
+         * This value is multiplied with the `friction` property to make it easier to change `friction` and maintain an appropriate amount of static friction.
+         *
+        * @property frictionStatic
+        * @type number
+        * @default 0.5
+        */
+        frictionStatic: number;
+        /**
+         * An `Object` that specifies the collision filtering properties of this body.
+         *
+        * Collisions between two bodies will obey the following rules:
+        * - If the two bodies have the same non-zero value of `collisionFilter.group`,
+        *   they will always collide if the value is positive, and they will never collide
+        *   if the value is negative.
+        * - If the two bodies have different values of `collisionFilter.group` or if one
+        *   (or both) of the bodies has a value of 0, then the category/mask rules apply as follows:
+        *
+        * Each body belongs to a collision category, given by `collisionFilter.category`. This
+        * value is used as a bit field and the category should have only one bit set, meaning that
+        * the value of this property is a power of two in the range [1, 2^31]. Thus, there are 32
+        * different collision categories available.
+        *
+        * Each body also defines a collision bitmask, given by `collisionFilter.mask` which specifies
+        * the categories it collides with (the value is the bitwise AND value of all these categories).
+        *
+        * Using the category/mask rules, two bodies `A` and `B` collide if each includes the other's
+        * category in its mask, i.e. `(categoryA & maskB) !== 0` and `(categoryB & maskA) !== 0`
+        * are both true.
+        *
+        * @property collisionFilter
+        * @type object
+        */
+        collisionFilter: ICollisionFilter;
+
+    }
+
+    export interface IBound {
+        min: { x: number, y: number }
+        max: { x: number, y: number }
+    }
+
+    /**
+    * Internal Class, not generally used outside of the engine's internals.
+    * The `Matter.Bounds` module contains methods for creating and manipulating axis-aligned bounding boxes (AABB).
+    *
+    * @class Bounds
+    */
+    export class Bounds {
+
+    }
+
+    export interface ICompositeDefinition {
+        /**
+         * An array of `Body` that are _direct_ children of this composite.
+         * To add or remove bodies you should use `Composite.add` and `Composite.remove` methods rather than directly modifying this property.
+         * If you wish to recursively find all descendants, you should use the `Composite.allBodies` method.
+         *
+        * @property bodies
+        * @type body[]
+        * @default []
+        */
+        bodies?: Array<Body>;
+
+        /**
+         * An array of `Composite` that are _direct_ children of this composite.
+         * To add or remove composites you should use `Composite.add` and `Composite.remove` methods rather than directly modifying this property.
+         * If you wish to recursively find all descendants, you should use the `Composite.allComposites` method.
+         *
+        * @property composites
+        * @type composite[]
+        * @default []
+        */
+        composites?: Array<Composite>;
+
+        /**
+         * An array of `Constraint` that are _direct_ children of this composite.
+         * To add or remove constraints you should use `Composite.add` and `Composite.remove` methods rather than directly modifying this property.
+         * If you wish to recursively find all descendants, you should use the `Composite.allConstraints` method.
+         *
+        * @property constraints
+        * @type constraint[]
+        * @default []
+        */
+        constraints?: Array<Constraint>;
+
+        /**
+         * An integer `Number` uniquely identifying number generated in `Composite.create` by `Common.nextId`.
+         *
+        * @property id
+        * @type number
+        */
+        id?: number;
+
+        /**
+         * A flag that specifies whether the composite has been modified during the current step.
+         * Most `Matter.Composite` methods will automatically set this flag to `true` to inform the engine of changes to be handled.
+         * If you need to change it manually, you should use the `Composite.setModified` method.
+         *
+        * @property isModified
+        * @type boolean
+        * @default false
+        */
+        isModified?: boolean;
+
+        /**
+         * An arbitrary `String` name to help the user identify and manage composites.
+         *
+        * @property label
+        * @type string
+        * @default "Composite"
+        */
+        label?: string;
+
+        /**
+        * The `Composite` that is the parent of this composite. It is automatically managed by the `Matter.Composite` methods.
+        *
+        * @property parent
+        * @type composite
+        * @default null
+        */
+        parent?: Composite;
+
+        /**
+         * A `String` denoting the type of object.
+         *
+        * @property type
+        * @type string
+        * @default "composite"
+        */
+        type?: String;
+    }
+
+    /**
+    * The `Matter.Composite` module contains methods for creating and manipulating composite bodies.
+    * A composite body is a collection of `Matter.Body`, `Matter.Constraint` and other `Matter.Composite`, therefore composites form a tree structure.
+    * It is important to use the functions in this module to modify composites, rather than directly modifying their properties.
+    * Note that the `Matter.World` object is also a type of `Matter.Composite` and as such all composite methods here can also operate on a `Matter.World`.
+    *
+    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
+    *
+    * @class Composite
+    */
+    export class Composite {
+        /**
+         * Generic add function. Adds one or many body(s), constraint(s) or a composite(s) to the given composite.
+         * Triggers `beforeAdd` and `afterAdd` events on the `composite`.
+         * @method add
+         * @param {composite} composite
+         * @param {} object
+         * @return {composite} The original composite with the objects added
+         */
+        static add(composite: Composite, object: Body | Composite | Constraint): Composite;
+
+        /**
+         * Returns all bodies in the given composite, including all bodies in its children, recursively.
+         * @method allBodies
+         * @param {composite} composite
+         * @return {body[]} All the bodies
+         */
+        static allBodies(composite: Composite): Array<Body>;
+
+        /**
+         * Returns all composites in the given composite, including all composites in its children, recursively.
+         * @method allComposites
+         * @param {composite} composite
+         * @return {composite[]} All the composites
+         */
+        static allComposites(composite: Composite): Array<Composite>;
+
+        /**
+         * Returns all constraints in the given composite, including all constraints in its children, recursively.
+         * @method allConstraints
+         * @param {composite} composite
+         * @return {constraint[]} All the constraints
+         */
+        static allConstraints(composite: Composite): Array<Composite>;
+
+        /**
+         * Removes all bodies, constraints and composites from the given composite.
+         * Optionally clearing its children recursively.
+         * @method clear
+         * @param {composite} composite
+         * @param {boolean} keepStatic
+         * @param {boolean} [deep=false]
+         */
+        static clear(composite: Composite, keepStatic: boolean, deep?: boolean): void;
+
+        /**
+         * Creates a new composite. The options parameter is an object that specifies any properties you wish to override the defaults.
+        * See the properites section below for detailed information on what you can pass via the `options` object.
+        * @method create
+        * @param {} [options]
+        * @return {composite} A new composite
+        */
+        static create(options?: ICompositeDefinition): Composite;
+
+        /**
+         * Searches the composite recursively for an object matching the type and id supplied, null if not found.
+         * @method get
+         * @param {composite} composite
+         * @param {number} id
+         * @param {string} type
+         * @return {object} The requested object, if found
+         */
+        static get(composite: Composite, id: number, type: string): Body | Composite | Constraint;
+
+        /**
+         * Moves the given object(s) from compositeA to compositeB (equal to a remove followed by an add).
+         * @method move
+         * @param {compositeA} compositeA
+         * @param {object[]} objects
+         * @param {compositeB} compositeB
+         * @return {composite} Returns compositeA
+         */
+        static move(compositeA: Composite, objects: Array<Body | Composite | Constraint>, compositeB: Composite): Composite;
+
+        /**
+         * Assigns new ids for all objects in the composite, recursively.
+         * @method rebase
+         * @param {composite} composite
+         * @return {composite} Returns composite
+         */
+        static rebase(composite: Composite): Composite;
+
+        /**
+         * Generic remove function. Removes one or many body(s), constraint(s) or a composite(s) to the given composite.
+         * Optionally searching its children recursively.
+         * Triggers `beforeRemove` and `afterRemove` events on the `composite`.
+         * @method remove
+         * @param {composite} composite
+         * @param {} object
+         * @param {boolean} [deep=false]
+         * @return {composite} The original composite with the objects removed
+         */
+        static remove(composite: Composite, object: Body | Composite | Constraint, deep?: boolean): Composite;
+
+
+
+        /**
+         * Sets the composite's `isModified` flag.
+         * If `updateParents` is true, all parents will be set (default: false).
+         * If `updateChildren` is true, all children will be set (default: false).
+         * @method setModified
+         * @param {composite} composite
+         * @param {boolean} isModified
+         * @param {boolean} [updateParents=false]
+         * @param {boolean} [updateChildren=false]
+         */
+        static setModified(composite: Composite, isModified: boolean, updateParents?: boolean, updateChildren?: boolean): void;
+        /**
+         * Translates all children in the composite by a given vector relative to their current positions,
+         * without imparting any velocity.
+         * @method translate
+         * @param {composite} composite
+         * @param {vector} translation
+         * @param {bool} [recursive=true]
+         */
+        static translate(composite: Composite, translation: Vector, recursive?: boolean): void;
+        /**
+         * Rotates all children in the composite by a given angle about the given point, without imparting any angular velocity.
+         * @method rotate
+         * @param {composite} composite
+         * @param {number} rotation
+         * @param {vector} point
+         * @param {bool} [recursive=true]
+         */
+        static rotate(composite: Composite, rotation: number, point: Vector, recursive?: boolean): void;
+        /**
+         * Scales all children in the composite, including updating physical properties (mass, area, axes, inertia), from a world-space point.
+         * @method scale
+         * @param {composite} composite
+         * @param {number} scaleX
+         * @param {number} scaleY
+         * @param {vector} point
+         * @param {bool} [recursive=true]
+         */
+        static scale(composite: Composite, scaleX: number, scaleY: number, point: Vector, recursive?: boolean): void;
+
+
+        /**
+         * An array of `Body` that are _direct_ children of this composite.
+         * To add or remove bodies you should use `Composite.add` and `Composite.remove` methods rather than directly modifying this property.
+         * If you wish to recursively find all descendants, you should use the `Composite.allBodies` method.
+         *
+        * @property bodies
+        * @type body[]
+        * @default []
+        */
+        bodies: Array<Body>;
+
+        /**
+         * An array of `Composite` that are _direct_ children of this composite.
+         * To add or remove composites you should use `Composite.add` and `Composite.remove` methods rather than directly modifying this property.
+         * If you wish to recursively find all descendants, you should use the `Composite.allComposites` method.
+         *
+        * @property composites
+        * @type composite[]
+        * @default []
+        */
+        composites: Array<Composite>;
+
+        /**
+         * An array of `Constraint` that are _direct_ children of this composite.
+         * To add or remove constraints you should use `Composite.add` and `Composite.remove` methods rather than directly modifying this property.
+         * If you wish to recursively find all descendants, you should use the `Composite.allConstraints` method.
+         *
+        * @property constraints
+        * @type constraint[]
+        * @default []
+        */
+        constraints: Array<Constraint>;
+
+        /**
+         * An integer `Number` uniquely identifying number generated in `Composite.create` by `Common.nextId`.
+         *
+        * @property id
+        * @type number
+        */
+        id: number;
+
+        /**
+         * A flag that specifies whether the composite has been modified during the current step.
+        * Most `Matter.Composite` methods will automatically set this flag to `true` to inform the engine of changes to be handled.
+        * If you need to change it manually, you should use the `Composite.setModified` method.
+        *
+        * @property isModified
+        * @type boolean
+        * @default false
+        */
+        isModified: boolean;
+
+        /**
+         * An arbitrary `String` name to help the user identify and manage composites.
+         *
+        * @property label
+        * @type string
+        * @default "Composite"
+        */
+        label: string;
+
+        /**
+         * The `Composite` that is the parent of this composite. It is automatically managed by the `Matter.Composite` methods.
+         *
+        * @property parent
+        * @type composite
+        * @default null
+        */
+        parent: Composite;
+
+        /**
+         * A `String` denoting the type of object.
+         *
+        * @property type
+        * @type string
+        * @default "composite"
+        */
+        type: String;
+
+    }
+
+    /**
+    * The `Matter.Composites` module contains factory methods for creating composite bodies
+    * with commonly used configurations (such as stacks and chains).
+    *
+    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
+    *
+    * @class Composites
+    */
+    export class Composites {
+        /**
+         * Creates a composite with simple car setup of bodies and constraints.
+         * @method car
+         * @param {number} xx
+         * @param {number} yy
+         * @param {number} width
+         * @param {number} height
+         * @param {number} wheelSize
+         * @return {composite} A new composite car body
+         */
+        static car(xx: number, yy: number, width: number, height: number, wheelSize: number): Composite;
+
+        /**
+         * Chains all bodies in the given composite together using constraints.
+         * @method chain
+         * @param {composite} composite
+         * @param {number} xOffsetA
+         * @param {number} yOffsetA
+         * @param {number} xOffsetB
+         * @param {number} yOffsetB
+         * @param {object} options
+         * @return {composite} A new composite containing objects chained together with constraints
+         */
+        static chain(composite: Composite, xOffsetA: number, yOffsetA: number, xOffsetB: number, yOffsetB: number, options: any): Composite;
+
+        /**
+         * Connects bodies in the composite with constraints in a grid pattern, with optional cross braces.
+         * @method mesh
+         * @param {composite} composite
+         * @param {number} columns
+         * @param {number} rows
+         * @param {boolean} crossBrace
+         * @param {object} options
+         * @return {composite} The composite containing objects meshed together with constraints
+         */
+        static mesh(composite: Composite, columns: number, rows: number, crossBrace: boolean, options: any): Composite;
+
+        /**
+         * Creates a composite with a Newton's Cradle setup of bodies and constraints.
+         * @method newtonsCradle
+         * @param {number} xx
+         * @param {number} yy
+         * @param {number} number
+         * @param {number} size
+         * @param {number} length
+         * @return {composite} A new composite newtonsCradle body
+         */
+        newtonsCradle(xx: number, yy: number, _number: number, size: number, length: number): Composite;
+
+        /**
+         * Create a new composite containing bodies created in the callback in a pyramid arrangement.
+        * This function uses the body's bounds to prevent overlaps.
+        * @method pyramid
+        * @param {number} xx
+        * @param {number} yy
+        * @param {number} columns
+        * @param {number} rows
+        * @param {number} columnGap
+        * @param {number} rowGap
+        * @param {function} callback
+        * @return {composite} A new composite containing objects created in the callback
+        */
+        static pyramid(xx: number, yy: number, columns: number, rows: number, columnGap: number, rowGap: number, callback: Function): Composite;
+
+        /**
+         * Creates a simple soft body like object.
+         * @method softBody
+         * @param {number} xx
+         * @param {number} yy
+         * @param {number} columns
+         * @param {number} rows
+         * @param {number} columnGap
+         * @param {number} rowGap
+         * @param {boolean} crossBrace
+         * @param {number} particleRadius
+         * @param {} particleOptions
+         * @param {} constraintOptions
+         * @return {composite} A new composite softBody
+         */
+        static softBody(xx: number, yy: number, columns: number, rows: number, columnGap: number, rowGap: number, crossBrace: boolean, particleRadius: number, particleOptions: any, constraintOptions: any): Composite;
+
+        /**
+         * Create a new composite containing bodies created in the callback in a grid arrangement.
+         * This function uses the body's bounds to prevent overlaps.
+         * @method stack
+         * @param {number} xx
+         * @param {number} yy
+         * @param {number} columns
+         * @param {number} rows
+         * @param {number} columnGap
+         * @param {number} rowGap
+         * @param {function} callback
+         * @return {composite} A new composite containing objects created in the callback
+         */
+        static stack(xx: number, yy: number, columns: number, rows: number, columnGap: number, rowGap: number, callback: Function): Composite;
+    }
+
+    export interface IConstraintDefinition {
+        /**
+         * The first possible `Body` that this constraint is attached to.
+         *
+        * @property bodyA
+        * @type body
+        * @default null
+        */
+        bodyA?: Body;
+
+        /**
+         * The second possible `Body` that this constraint is attached to.
+         *
+        * @property bodyB
+        * @type body
+        * @default null
+        */
+        bodyB?: Body;
+
+        /**
+         * An integer `Number` uniquely identifying number generated in `Composite.create` by `Common.nextId`.
+         *
+        * @property id
+        * @type number
+        */
+        id?: number;
+
+        /**
+         * An arbitrary `String` name to help the user identify and manage bodies.
+         *
+        * @property label
+        * @type string
+        * @default "Constraint"
+        */
+        label?: string;
+
+        /**
+         * A `Number` that specifies the target resting length of the constraint.
+         * It is calculated automatically in `Constraint.create` from initial positions of the `constraint.bodyA` and `constraint.bodyB`.
+         *
+        * @property length
+        * @type number
+        */
+        length?: number;
+
+        /**
+         * A `Vector` that specifies the offset of the constraint from center of the `constraint.bodyA` if defined, otherwise a world-space position.
+         *
+        * @property pointA
+        * @type vector
+        * @default { x: 0, y: 0 }
+        */
+        pointA?: Vector;
+
+        /**
+         * A `Vector` that specifies the offset of the constraint from center of the `constraint.bodyA` if defined, otherwise a world-space position.
+         *
+        * @property pointB
+        * @type vector
+        * @default { x: 0, y: 0 }
+        */
+        pointB?: Vector;
+
+        /**
+         * An `Object` that defines the rendering properties to be consumed by the module `Matter.Render`.
+         *
+        * @property render
+        * @type object
+        */
+        render?: IConstraintRenderDefinition;
+
+        /**
+         * A `Number` that specifies the stiffness of the constraint, i.e. the rate at which it returns to its resting `constraint.length`.
+         * A value of `1` means the constraint should be very stiff.
+         * A value of `0.2` means the constraint acts like a soft spring.
+         *
+        * @property stiffness
+        * @type number
+        * @default 1
+        */
+        stiffness?: number;
+
+        /**
+         * A `String` denoting the type of object.
+         *
+        * @property type
+        * @type string
+        * @default "constraint"
+        */
+        type?: string;
+    }
+
+    export interface IConstraintRenderDefinition {
+        /**
+         * A `Number` that defines the line width to use when rendering the constraint outline.
+         * A value of `0` means no outline will be rendered.
+         *
+        * @property render.lineWidth
+        * @type number
+        * @default 2
+        */
+        lineWidth: number;
+
+        /**
+         * A `String` that defines the stroke style to use when rendering the constraint outline.
+         * It is the same as when using a canvas, so it accepts CSS style property values.
+         *
+        * @property render.strokeStyle
+        * @type string
+        * @default a random colour
+        */
+        strokeStyle: string;
+
+        /**
+         * A flag that indicates if the constraint should be rendered.
+         *
+        * @property render.visible
+        * @type boolean
+        * @default true
+        */
+        visible: boolean;
+    }
+
+
+    /**
+    * The `Matter.Constraint` module contains methods for creating and manipulating constraints.
+    * Constraints are used for specifying that a fixed distance must be maintained between two bodies (or a body and a fixed world-space position).
+    * The stiffness of constraints can be modified to create springs or elastic.
+    *
+    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
+    *
+    * @class Constraint
+    */
+    export class Constraint {
+        /**
+         * Creates a new constraint.
+         * All properties have default values, and many are pre-calculated automatically based on other properties.
+         * See the properties section below for detailed information on what you can pass via the `options` object.
+         * @method create
+         * @param {} options
+         * @return {constraint} constraint
+         */
+        static create(options: IConstraintDefinition): Constraint;
+
+        /**
+         * The first possible `Body` that this constraint is attached to.
+         *
+        * @property bodyA
+        * @type body
+        * @default null
+        */
+        bodyA: Body;
+
+        /**
+         * The second possible `Body` that this constraint is attached to.
+         *
+        * @property bodyB
+        * @type body
+        * @default null
+        */
+        bodyB: Body;
+
+        /**
+         * An integer `Number` uniquely identifying number generated in `Composite.create` by `Common.nextId`.
+         *
+        * @property id
+        * @type number
+        */
+        id: number;
+
+        /**
+         * An arbitrary `String` name to help the user identify and manage bodies.
+         *
+        * @property label
+        * @type string
+        * @default "Constraint"
+        */
+        label: string;
+
+        /**
+         * A `Number` that specifies the target resting length of the constraint.
+         * It is calculated automatically in `Constraint.create` from initial positions of the `constraint.bodyA` and `constraint.bodyB`.
+         *
+        * @property length
+        * @type number
+        */
+        length: number;
+
+        /**
+         * A `Vector` that specifies the offset of the constraint from center of the `constraint.bodyA` if defined, otherwise a world-space position.
+         *
+        * @property pointA
+        * @type vector
+        * @default { x: 0, y: 0 }
+        */
+        pointA: Vector;
+
+        /**
+         * A `Vector` that specifies the offset of the constraint from center of the `constraint.bodyA` if defined, otherwise a world-space position.
+         *
+        * @property pointB
+        * @type vector
+        * @default { x: 0, y: 0 }
+        */
+        pointB: Vector;
+
+        /**
+         * An `Object` that defines the rendering properties to be consumed by the module `Matter.Render`.
+         *
+        * @property render
+        * @type object
+        */
+        render: IConstraintRenderDefinition;
+
+        /**
+         * A `Number` that specifies the stiffness of the constraint, i.e. the rate at which it returns to its resting `constraint.length`.
+         * A value of `1` means the constraint should be very stiff.
+         * A value of `0.2` means the constraint acts like a soft spring.
+         *
+        * @property stiffness
+        * @type number
+        * @default 1
+        */
+        stiffness: number;
+
+        /**
+         * A `String` denoting the type of object.
+         *
+        * @property type
+        * @type string
+        * @default "constraint"
+        */
+        type: string;
+    }
+
+
+
+    export interface IEngineDefinition {
+        /**
+         * An integer `Number` that specifies the number of position iterations to perform each update.
+         * The higher the value, the higher quality the simulation will be at the expense of performance.
+         *
+        * @property positionIterations
+        * @type number
+        * @default 6
+        */
+        positionIterations?: number;
+        /**
+         * An integer `Number` that specifies the number of velocity iterations to perform each update.
+         * The higher the value, the higher quality the simulation will be at the expense of performance.
+         *
+        * @property velocityIterations
+        * @type number
+        * @default 4
+        */
+        velocityIterations?: number;
+        /**
+         * An integer `Number` that specifies the number of constraint iterations to perform each update.
+         * The higher the value, the higher quality the simulation will be at the expense of performance.
+         * The default value of `2` is usually very adequate.
+         *
+        * @property constraintIterations
+        * @type number
+        * @default 2
+        */
+        constraintIterations?: number;
+
+        /**
+         * A flag that specifies whether the engine should allow sleeping via the `Matter.Sleeping` module.
+         * Sleeping can improve stability and performance, but often at the expense of accuracy.
+         *
+        * @property enableSleeping
+        * @type boolean
+        * @default false
+        */
+        enableSleeping?: boolean;
+        /**
+         * An `Object` containing properties regarding the timing systems of the engine.
+        *
+        * @property timing
+        * @type object
+        */
+        timing?: IEngineTimingOptions;
+        /**
+         * An instance of a broadphase controller. The default value is a `Matter.Grid` instance created by `Engine.create`.
+         *
+        * @property broadphase
+        * @type grid
+        * @default a Matter.Grid instance
+        */
+        grid?: Grid;
+        /**
+         * A `World` composite object that will contain all simulated bodies and constraints.
+         *
+        * @property world
+        * @type world
+        * @default a Matter.World instance
+        */
+        world?: World;
+
+    }
+
+    export interface IEngineTimingOptions {
+        /**
+         * A `Number` that specifies the global scaling factor of time for all bodies.
+         * A value of `0` freezes the simulation.
+         * A value of `0.1` gives a slow-motion effect.
+         * A value of `1.2` gives a speed-up effect.
+         *
+        * @property timing.timeScale
+        * @type number
+        * @default 1
+        */
+        timeScale: number;
+
+        /**
+         * A `Number` that specifies the current simulation-time in milliseconds starting from `0`.
+         * It is incremented on every `Engine.update` by the given `delta` argument.
+         *
+        * @property timing.timestamp
+        * @type number
+        * @default 0
+        */
+        timestamp: number;
+    }
+
+    /**
+    * The `Matter.Engine` module contains methods for creating and manipulating engines.
+    * An engine is a controller that manages updating the simulation of the world.
+    * See `Matter.Runner` for an optional game loop utility.
+    *
+    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
+    *
+    * @class Engine
+    */
+    export class Engine {
+        /**
+         * Clears the engine including the world, pairs and broadphase.
+         * @method clear
+         * @param {engine} engine
+         */
+        static clear(engine: Engine): void;
+
+        /**
+         * Creates a new engine. The options parameter is an object that specifies any properties you wish to override the defaults.
+         * All properties have default values, and many are pre-calculated automatically based on other properties.
+         * See the properties section below for detailed information on what you can pass via the `options` object.
+         * @method create
+         * @param {HTMLElement} element
+         * @param {object} [options]
+         * @return {engine} engine
+         */
+        static create(element?: HTMLElement | IEngineDefinition, options?: IEngineDefinition): Engine;
+
+        /**
+         * Merges two engines by keeping the configuration of `engineA` but replacing the world with the one from `engineB`.
+         * @method merge
+         * @param {engine} engineA
+         * @param {engine} engineB
+         */
+        static merge(engineA: Engine, engineB: Engine): void;
+
+
+        /**
+         * Moves the simulation forward in time by `delta` ms.
+         * The `correction` argument is an optional `Number` that specifies the time correction factor to apply to the update.
+         * This can help improve the accuracy of the simulation in cases where `delta` is changing between updates.
+         * The value of `correction` is defined as `delta / lastDelta`, i.e. the percentage change of `delta` over the last step.
+         * Therefore the value is always `1` (no correction) when `delta` constant (or when no correction is desired, which is the default).
+         * See the paper on <a href="http://lonesock.net/article/verlet.html">Time Corrected Verlet</a> for more information.
+         *
+        * Triggers `beforeUpdate` and `afterUpdate` events.
+        * Triggers `collisionStart`, `collisionActive` and `collisionEnd` events.
+        * @method update
+        * @param {engine} engine
+        * @param {number} delta
+        * @param {number} [correction]
+        */
+        static update(engine: Engine, delta: number, correction?: number): Engine;
+
+        /**
+         * An alias for `Runner.run`, see `Matter.Runner` for more information.
+         * @method run
+         * @param {engine} engine
+         */
+        static run(enige: Engine): void;
+
+        /**
+         * An instance of a broadphase controller. The default value is a `Matter.Grid` instance created by `Engine.create`.
+         *
+        * @property broadphase
+        * @type grid
+        * @default a Matter.Grid instance
+        */
+        broadphase: Grid;
+        /**
+         * An integer `Number` that specifies the number of constraint iterations to perform each update.
+         * The higher the value, the higher quality the simulation will be at the expense of performance.
+         * The default value of `2` is usually very adequate.
+         *
+        * @property constraintIterations
+        * @type number
+        * @default 2
+        */
+        constraintIterations: number;
+
+        /**
+         * A flag that specifies whether the engine is running or not.
+         */
+        enabled: boolean;
+
+        /**
+         * A flag that specifies whether the engine should allow sleeping via the `Matter.Sleeping` module.
+         * Sleeping can improve stability and performance, but often at the expense of accuracy.
+         *
+        * @property enableSleeping
+        * @type boolean
+        * @default false
+        */
+        enableSleeping: boolean;
+
+        /**
+         * An integer `Number` that specifies the number of position iterations to perform each update.
+         * The higher the value, the higher quality the simulation will be at the expense of performance.
+         *
+        * @property positionIterations
+        * @type number
+        * @default 6
+        */
+        positionIterations: number;
+
+        /**
+         * An instance of a `Render` controller. The default value is a `Matter.Render` instance created by `Engine.create`.
+         * One may also develop a custom renderer module based on `Matter.Render` and pass an instance of it to `Engine.create` via `options.render`.
+         *
+        * A minimal custom renderer object must define at least three functions: `create`, `clear` and `world` (see `Matter.Render`).
+        * It is also possible to instead pass the _module_ reference via `options.render.controller` and `Engine.create` will instantiate one for you.
+        *
+        * @property render
+        * @type render
+        * @default a Matter.Render instance
+        */
+        render: Render;
+
+        /**
+         * An `Object` containing properties regarding the timing systems of the engine.
+         *
+        * @property timing
+        * @type object
+        */
+        timing: IEngineTimingOptions;
+
+        /**
+         * An integer `Number` that specifies the number of velocity iterations to perform each update.
+         * The higher the value, the higher quality the simulation will be at the expense of performance.
+         *
+        * @property velocityIterations
+        * @type number
+        * @default 4
+        */
+        velocityIterations: number;
+
+        /**
+         * A `World` composite object that will contain all simulated bodies and constraints.
+         *
+        * @property world
+        * @type world
+        * @default a Matter.World instance
+        */
+        world: World;
+    }
+
+
+    export interface IGridDefinition {
+
+    }
+
+    /**
+    * The `Matter.Grid` module contains methods for creating and manipulating collision broadphase grid structures.
+    *
+    * @class Grid
+    */
+    export class Grid {
+        /**
+         * Creates a new grid.
+         * @method create
+         * @param {} options
+         * @return {grid} A new grid
+         */
+        static create(options?: IGridDefinition): Grid;
+
+        /**
+         * Updates the grid.
+         * @method update
+         * @param {grid} grid
+         * @param {body[]} bodies
+         * @param {engine} engine
+         * @param {boolean} forceUpdate
+         */
+        static update(grid: Grid, bodies: Array<Body>, engine: Engine, forceUpdate: boolean): void;
+
+        /**
+         * Clears the grid.
+         * @method clear
+         * @param {grid} grid
+         */
+        static clear(grid: Grid): void;
+
+    }
+
+    export interface IMouseConstraintDefinition {
+        /**
+         * The `Constraint` object that is used to move the body during interaction.
+         *
+        * @property constraint
+        * @type constraint
+        */
+        constraint?: Constraint;
+
+        /**
+        * An `Object` that specifies the collision filter properties.
+        * The collision filter allows the user to define which types of body this mouse constraint can interact with.
+        * See `body.collisionFilter` for more information.
+        *
+        * @property collisionFilter
+        * @type object
+        */
+        collisionFilter?: ICollisionFilter;
+
+        /**
+         * The `Body` that is currently being moved by the user, or `null` if no body.
+         *
+        * @property body
+        * @type body
+        * @default null
+        */
+        body?: Body;
+
+        /**
+         * The `Mouse` instance in use. If not supplied in `MouseConstraint.create`, one will be created.
+         *
+        * @property mouse
+        * @type mouse
+        * @default mouse
+        */
+        mouse?: Mouse;
+
+        /**
+         * A `String` denoting the type of object.
+         *
+        * @property type
+        * @type string
+        * @default "constraint"
+        */
+
+        type?: string;
+    }
+
+    /**
+    * The `Matter.MouseConstraint` module contains methods for creating mouse constraints.
+    * Mouse constraints are used for allowing user interaction, providing the ability to move bodies via the mouse or touch.
+    *
+    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
+    *
+    * @class MouseConstraint
+    */
+    export class MouseConstraint {
+        /**
+         * Creates a new mouse constraint.
+         * All properties have default values, and many are pre-calculated automatically based on other properties.
+         * See the properties section below for detailed information on what you can pass via the `options` object.
+         * @method create
+         * @param {engine} engine
+         * @param {} options
+         * @return {MouseConstraint} A new MouseConstraint
+         */
+        create(engine: Engine, options: IMouseConstraintDefinition): MouseConstraint;
+
+        /**
+         * The `Constraint` object that is used to move the body during interaction.
+         *
+        * @property constraint
+        * @type constraint
+        */
+        constraint: Constraint;
+
+        /**
+        * An `Object` that specifies the collision filter properties.
+        * The collision filter allows the user to define which types of body this mouse constraint can interact with.
+        * See `body.collisionFilter` for more information.
+        *
+        * @property collisionFilter
+        * @type object
+        */
+        collisionFilter: ICollisionFilter;
+
+        /**
+        * The `Body` that is currently being moved by the user, or `null` if no body.
+        *
+        * @property body
+        * @type body
+        * @default null
+        */
+        body: Body;
+
+        /**
+         * The `Mouse` instance in use. If not supplied in `MouseConstraint.create`, one will be created.
+         *
+        * @property mouse
+        * @type mouse
+        * @default mouse
+        */
+        mouse: Mouse;
+
+        /**
+         * A `String` denoting the type of object.
+         *
+        * @property type
+        * @type string
+        * @default "constraint"
+        */
+
+        type: string;
+    }
+
+    export interface IPair {
+        id: number;
+        bodyA: Body;
+        bodyB: Body;
+        contacts: any;
+        activeContacts: any;
+        separation: number;
+        isActive: boolean;
+        timeCreated: number;
+        timeUpdated: number,
+        inverseMass: number;
+        friction: number;
+        frictionStatic: number;
+        restitution: number;
+        slop: number;
+    }
+
+    /**
+    * The `Matter.Query` module contains methods for performing collision queries.
+    *
+    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
+    *
+    * @class Query
+    */
+    export class Query {
+        /**
+         * Casts a ray segment against a set of bodies and returns all collisions, ray width is optional. Intersection points are not provided.
+         * @method ray
+         * @param {body[]} bodies
+         * @param {vector} startPoint
+         * @param {vector} endPoint
+         * @param {number} [rayWidth]
+         * @return {object[]} Collisions
+         */
+        static ray(bodies: Array<Body>, startPoint: Vector, endPoint: Vector, rayWidth?: number): Array<any>;
+
+        /**
+         * Returns all bodies whose bounds are inside (or outside if set) the given set of bounds, from the given set of bodies.
+         * @method region
+         * @param {body[]} bodies
+         * @param {bounds} bounds
+         * @param {bool} [outside=false]
+         * @return {body[]} The bodies matching the query
+         */
+        static region(bodies: Array<Body>, bounds: Bounds, outside?: boolean): Array<Body>;
+
+        /**
+         * Returns all bodies whose vertices contain the given point, from the given set of bodies.
+         * @method point
+         * @param {body[]} bodies
+         * @param {vector} point
+         * @return {body[]} The bodies matching the query
+         */
+        static point(bodies: Array<Body>, point: Vector): Array<Body>;
+    }
+
+    export interface IRenderDefinition {
+        /**
+         * A back-reference to the `Matter.Render` module.
+         *
+        * @property controller
+        * @type render
+        */
+        controller?: any;
+        /**
+         * A reference to the element where the canvas is to be inserted (if `render.canvas` has not been specified)
+        *
+        * @property element
+        * @type HTMLElement
+        * @default null
+        */
+        element?: HTMLElement;
+        /**
+         * The canvas element to render to. If not specified, one will be created if `render.element` has been specified.
+         *
+        * @property canvas
+        * @type HTMLCanvasElement
+        * @default null
+        */
+        canvas?: HTMLCanvasElement;
+
+        /**
+         * The configuration options of the renderer.
+         *
+        * @property options
+        * @type {}
+        */
+        options?: IRendererOptions;
+
+        /**
+         * A `Bounds` object that specifies the drawing view region.
+         * Rendering will be automatically transformed and scaled to fit within the canvas size (`render.options.width` and `render.options.height`).
+         * This allows for creating views that can pan or zoom around the scene.
+         * You must also set `render.options.hasBounds` to `true` to enable bounded rendering.
+         *
+        * @property bounds
+        * @type bounds
+        */
+        bounds?: Bounds;
+
+        /**
+         * The 2d rendering context from the `render.canvas` element.
+         *
+        * @property context
+        * @type CanvasRenderingContext2D
+        */
+        context?: CanvasRenderingContext2D;
+
+        /**
+         * The sprite texture cache.
+         *
+        * @property textures
+        * @type {}
+        */
+        textures?: any;
+
+
+    }
+
+    export interface IRendererOptions {
+        /**
+         * The target width in pixels of the `render.canvas` to be created.
+         *
+        * @property options.width
+        * @type number
+        * @default 800
+        */
+        width?: number;
+
+        /**
+         * The target height in pixels of the `render.canvas` to be created.
+         *
+        * @property options.height
+        * @type number
+        * @default 600
+        */
+        height?: number;
+
+        /**
+         * A flag that specifies if `render.bounds` should be used when rendering.
+         *
+        * @property options.hasBounds
+        * @type boolean
+        * @default false
+        */
+        hasBounds?: boolean;
+
+
+
+
+    }
+
+    /**
+    * The `Matter.Render` module is the default `render.controller` used by a `Matter.Engine`.
+    * This renderer is HTML5 canvas based and supports a number of drawing options including sprites and viewports.
+    *
+    * It is possible develop a custom renderer module based on `Matter.Render` and pass an instance of it to `Engine.create` via `options.render`.
+    * A minimal custom renderer object must define at least three functions: `create`, `clear` and `world` (see `Matter.Render`).
+    *
+    * See also `Matter.RenderPixi` for an alternate WebGL, scene-graph based renderer.
+    *
+    * @class Render
+    */
+    export class Render {
+        /**
+         * Creates a new renderer. The options parameter is an object that specifies any properties you wish to override the defaults.
+         * All properties have default values, and many are pre-calculated automatically based on other properties.
+         * See the properties section below for detailed information on what you can pass via the `options` object.
+         * @method create
+         * @param {object} [options]
+         * @return {render} A new renderer
+         */
+        static create(options: IRenderDefinition): Render;
+        /**
+         * Sets the pixel ratio of the renderer and updates the canvas.
+         * To automatically detect the correct ratio, pass the string `'auto'` for `pixelRatio`.
+         * @method setPixelRatio
+         * @param {render} render
+         * @param {number} pixelRatio
+         */
+        static setPixelRatio(render: Render, pixelRatio: number): void;
+        /**
+         * Renders the given `engine`'s `Matter.World` object.
+         * This is the entry point for all rendering and should be called every time the scene changes.
+         * @method world
+         * @param {engine} engine
+         */
+        static world(engine: Engine): void;
+
+        /**
+        * A back-reference to the `Matter.Render` module.
+        *
+        * @property controller
+        * @type render
+        */
+        controller: any;
+        /**
+         * A reference to the element where the canvas is to be inserted (if `render.canvas` has not been specified)
+        *
+        * @property element
+        * @type HTMLElement
+        * @default null
+        */
+        element: HTMLElement;
+        /**
+         * The canvas element to render to. If not specified, one will be created if `render.element` has been specified.
+         *
+        * @property canvas
+        * @type HTMLCanvasElement
+        * @default null
+        */
+        canvas: HTMLCanvasElement;
+
+        /**
+         * The configuration options of the renderer.
+         *
+        * @property options
+        * @type {}
+        */
+        options: IRendererOptions;
+
+        /**
+         * A `Bounds` object that specifies the drawing view region.
+         * Rendering will be automatically transformed and scaled to fit within the canvas size (`render.options.width` and `render.options.height`).
+         * This allows for creating views that can pan or zoom around the scene.
+         * You must also set `render.options.hasBounds` to `true` to enable bounded rendering.
+         *
+        * @property bounds
+        * @type bounds
+        */
+        bounds: Bounds;
+
+        /**
+         * The 2d rendering context from the `render.canvas` element.
+         *
+        * @property context
+        * @type CanvasRenderingContext2D
+        */
+        context: CanvasRenderingContext2D;
+
+        /**
+         * The sprite texture cache.
+         *
+        * @property textures
+        * @type {}
+        */
+        textures: any;
+    }
+
+
+
+    export interface IRunnerOptions {
+        /**
+         * A `Boolean` that specifies if the runner should use a fixed timestep (otherwise it is variable).
+         * If timing is fixed, then the apparent simulation speed will change depending on the frame rate (but behaviour will be deterministic).
+         * If the timing is variable, then the apparent simulation speed will be constant (approximately, but at the cost of determininism).
+         *
+        * @property isFixed
+        * @type boolean
+        * @default false
+        */
+        isFixed?: boolean;
+
+        /**
+         * A `Number` that specifies the time step between updates in milliseconds.
+         * If `engine.timing.isFixed` is set to `true`, then `delta` is fixed.
+         * If it is `false`, then `delta` can dynamically change to maintain the correct apparent simulation speed.
+         *
+        * @property delta
+        * @type number
+        * @default 1000 / 60
+        */
+        delta?: number;
+    }
+
+    /**
+    * The `Matter.Runner` module is an optional utility which provides a game loop,
+    * that handles updating and rendering a `Matter.Engine` for you within a browser.
+    * It is intended for demo and testing purposes, but may be adequate for simple games.
+    * If you are using your own game loop instead, then you do not need the `Matter.Runner` module.
+    * Instead just call `Engine.update(engine, delta)` in your own loop.
+    * Note that the method `Engine.run` is an alias for `Runner.run`.
+    *
+    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
+    *
+    * @class Runner
+    */
+    export class Runner {
+        /**
+         * Creates a new Runner. The options parameter is an object that specifies any properties you wish to override the defaults.
+         * @method create
+         * @param {} options
+         */
+        static create(options:IRunnerOptions): Runner;
+        /**
+         * Continuously ticks a `Matter.Engine` by calling `Runner.tick` on the `requestAnimationFrame` event.
+         * @method run
+         * @param {engine} engine
+         */
+        static run(runner: Runner, engine: Engine): Runner;
+        /**
+        * Continuously ticks a `Matter.Engine` by calling `Runner.tick` on the `requestAnimationFrame` event.
+        * @method run
+        * @param {engine} engine
+        */
+        static run(engine: Engine): Runner;
+        /**
+         * A game loop utility that updates the engine and renderer by one step (a 'tick').
+         * Features delta smoothing, time correction and fixed or dynamic timing.
+         * Triggers `beforeTick`, `tick` and `afterTick` events on the engine.
+         * Consider just `Engine.update(engine, delta)` if you're using your own loop.
+         * @method tick
+         * @param {runner} runner
+         * @param {engine} engine
+         * @param {number} time
+         */
+        static tick(runner: Runner, engine: Engine, time: number): void;
+        /**
+         * Ends execution of `Runner.run` on the given `runner`, by canceling the animation frame request event loop.
+         * If you wish to only temporarily pause the engine, see `engine.enabled` instead.
+         * @method stop
+         * @param {runner} runner
+         */
+        static stop(runner: Runner): void;
+        /**
+         * Alias for `Runner.run`.
+        * @method start
+        * @param {runner} runner
+        * @param {engine} engine
+        */
+        static start(runner: Runner, engine: Engine): void;
+
+        /**
+         * A flag that specifies whether the runner is running or not.
+         *
+        * @property enabled
+        * @type boolean
+        * @default true
+        */
+        enabled: boolean;
+
+        /**
+         * A `Boolean` that specifies if the runner should use a fixed timestep (otherwise it is variable).
+         * If timing is fixed, then the apparent simulation speed will change depending on the frame rate (but behaviour will be deterministic).
+         * If the timing is variable, then the apparent simulation speed will be constant (approximately, but at the cost of determininism).
+         *
+        * @property isFixed
+        * @type boolean
+        * @default false
+        */
+        isFixed: boolean;
+
+        /**
+         * A `Number` that specifies the time step between updates in milliseconds.
+         * If `engine.timing.isFixed` is set to `true`, then `delta` is fixed.
+         * If it is `false`, then `delta` can dynamically change to maintain the correct apparent simulation speed.
+         *
+        * @property delta
+        * @type number
+        * @default 1000 / 60
+        */
+        delta: number;
+    }
+
+    /**
+    * The `Matter.Sleeping` module contains methods to manage the sleeping state of bodies.
+    *
+    * @class Sleeping
+    */
+    export class Sleeping {
+        static set(body: Body, isSleeping: boolean): void;
+    }
+
+    /**
+    * The `Matter.Svg` module contains methods for converting SVG images into an array of vector points.
+    *
+    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
+    *
+    * @class Svg
+    */
+    export class Svg {
+        /**
+         * Converts an SVG path into an array of vector points.
+         * If the input path forms a concave shape, you must decompose the result into convex parts before use.
+         * See `Bodies.fromVertices` which provides support for this.
+         * Note that this function is not guaranteed to support complex paths (such as those with holes).
+         * @method pathToVertices
+         * @param {SVGPathElement} path
+         * @param {Number} [sampleLength=15]
+         * @return {Vector[]} points
+         */
+        static pathToVertices(path: SVGPathElement, sampleLength: number): Array<Vector>;
+    }
+
+    /**
+    * The `Matter.Vector` module contains methods for creating and manipulating vectors.
+    * Vectors are the basis of all the geometry related operations in the engine.
+    * A `Matter.Vector` object is of the form `{ x: 0, y: 0 }`.
+    *
+    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
+    *
+    * @class Vector
+    */
+    export class Vector {
+
+        x: number;
+        y: number;
+
+        /**
+         * Creates a new vector.
+         * @method create
+         * @param {number} x
+         * @param {number} y
+         * @return {vector} A new vector
+         */
+        static create(x?: number, y?: number): Vector;
+
+        /**
+         * Returns a new vector with `x` and `y` copied from the given `vector`.
+         * @method clone
+         * @param {vector} vector
+         * @return {vector} A new cloned vector
+         */
+        static clone(vector: Vector): Vector;
+
+
+        /**
+         * Returns the cross-product of three vectors.
+         * @method cross3
+         * @param {vector} vectorA
+         * @param {vector} vectorB
+         * @param {vector} vectorC
+         * @return {number} The cross product of the three vectors
+         */
+        static cross3(vectorA: Vector, vectorB: Vector, vectorC: Vector):number;
+
+        /**
+         * Adds the two vectors.
+         * @method add
+         * @param {vector} vectorA
+         * @param {vector} vectorB
+         * @param {vector} [output]
+         * @return {vector} A new vector of vectorA and vectorB added
+         */
+        static add(vectorA: Vector, vectorB: Vector, output?: Vector): Vector;
+
+        /**
+         * Returns the angle in radians between the two vectors relative to the x-axis.
+         * @method angle
+         * @param {vector} vectorA
+         * @param {vector} vectorB
+         * @return {number} The angle in radians
+         */
+        static angle(vectorA: Vector, vectorB: Vector): number;
+
+        /**
+         * Returns the cross-product of two vectors.
+         * @method cross
+         * @param {vector} vectorA
+         * @param {vector} vectorB
+         * @return {number} The cross product of the two vectors
+         */
+        static cross(vectorA: Vector, vectorB: Vector): number;
+
+        /**
+         * Divides a vector and a scalar.
+         * @method div
+         * @param {vector} vector
+         * @param {number} scalar
+         * @return {vector} A new vector divided by scalar
+         */
+        static div(vector: Vector, scalar: number): Vector;
+
+        /**
+         * Returns the dot-product of two vectors.
+         * @method dot
+         * @param {vector} vectorA
+         * @param {vector} vectorB
+         * @return {number} The dot product of the two vectors
+         */
+        static dot(vectorA: Vector, vectorB: Vector): Number;
+
+        /**
+         * Returns the magnitude (length) of a vector.
+         * @method magnitude
+         * @param {vector} vector
+         * @return {number} The magnitude of the vector
+         */
+        static magnitude(vector: Vector): number;
+
+        /**
+         * Returns the magnitude (length) of a vector (therefore saving a `sqrt` operation).
+         * @method magnitudeSquared
+         * @param {vector} vector
+         * @return {number} The squared magnitude of the vector
+         */
+        static magnitudeSquared(vector: Vector): number;
+
+        /**
+         * Multiplies a vector and a scalar.
+         * @method mult
+         * @param {vector} vector
+         * @param {number} scalar
+         * @return {vector} A new vector multiplied by scalar
+         */
+        static mult(vector: Vector, scalar: number): Vector;
+
+        /**
+         * Negates both components of a vector such that it points in the opposite direction.
+         * @method neg
+         * @param {vector} vector
+         * @return {vector} The negated vector
+         */
+        static neg(vector: Vector): Vector;
+
+        /**
+         * Normalises a vector (such that its magnitude is `1`).
+         * @method normalise
+         * @param {vector} vector
+         * @return {vector} A new vector normalised
+         */
+        static normalise(vector: Vector): Vector;
+
+        /**
+         * Returns the perpendicular vector. Set `negate` to true for the perpendicular in the opposite direction.
+         * @method perp
+         * @param {vector} vector
+         * @param {bool} [negate=false]
+         * @return {vector} The perpendicular vector
+         */
+        static perp(vector: Vector, negate?: boolean): Vector;
+
+        /**
+         * Rotates the vector about (0, 0) by specified angle.
+         * @method rotate
+         * @param {vector} vector
+         * @param {number} angle
+         * @return {vector} A new vector rotated about (0, 0)
+         */
+        static rotate(vector: Vector, angle: number): Vector;
+
+        /**
+         * Rotates the vector about a specified point by specified angle.
+         * @method rotateAbout
+         * @param {vector} vector
+         * @param {number} angle
+         * @param {vector} point
+         * @param {vector} [output]
+         * @return {vector} A new vector rotated about the point
+         */
+        static rotateAbout(vector: Vector, angle: number, point: Vector, output?: Vector): Vector;
+
+        /**
+         * Subtracts the two vectors.
+         * @method sub
+         * @param {vector} vectorA
+         * @param {vector} vectorB
+         * @param {vector} [output]
+         * @return {vector} A new vector of vectorA and vectorB subtracted
+         */
+        static sub(vectorA: Vector, vectorB: Vector, optional?: Vector): Vector;
+    }
+
+    /**
+    * The `Matter.Vertices` module contains methods for creating and manipulating sets of vertices.
+    * A set of vertices is an array of `Matter.Vector` with additional indexing properties inserted by `Vertices.create`.
+    * A `Matter.Body` maintains a set of vertices to represent the shape of the object (its convex hull).
+    *
+    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
+    *
+    * @class Vertices
+    */
+    export class Vertices {
+        /**
+         * Returns the average (mean) of the set of vertices.
+         * @method mean
+         * @param {vertices} vertices
+         * @return {vector} The average point
+         */
+        static mean(vertices: Array<Vector>): Array<Vector>;
+
+        /**
+         * Sorts the input vertices into clockwise order in place.
+         * @method clockwiseSort
+         * @param {vertices} vertices
+         * @return {vertices} vertices
+         */
+        static clockwiseSort(vertices: Array<Vector>): Array<Vector>;
+
+        /**
+         * Returns true if the vertices form a convex shape (vertices must be in clockwise order).
+         * @method isConvex
+         * @param {vertices} vertices
+         * @return {bool} `true` if the `vertices` are convex, `false` if not (or `null` if not computable).
+         */
+        static isConvex(vertices: Array<Vector>): boolean;
+
+        /**
+         * Returns the convex hull of the input vertices as a new array of points.
+         * @method hull
+         * @param {vertices} vertices
+         * @return [vertex] vertices
+         */
+        static hull(vertices: Array<Vector>): Array<Vector>;
+
+        /**
+         * Returns the area of the set of vertices.
+         * @method area
+         * @param {vertices} vertices
+         * @param {bool} signed
+         * @return {number} The area
+         */
+        static area(vertices: Array<Vector>, signed: boolean): number;
+
+        /**
+         * Returns the centre (centroid) of the set of vertices.
+         * @method centre
+         * @param {vertices} vertices
+         * @return {vector} The centre point
+         */
+        static centre(vertices: Array<Vector>): Vector;
+
+        /**
+         * Chamfers a set of vertices by giving them rounded corners, returns a new set of vertices.
+         * The radius parameter is a single number or an array to specify the radius for each vertex.
+         * @method chamfer
+         * @param {vertices} vertices
+         * @param {number[]} radius
+         * @param {number} quality
+         * @param {number} qualityMin
+         * @param {number} qualityMax
+         */
+        static chamfer(vertices: Array<Vector>, radius: Array<number>, quality: number, qualityMin: number, qualityMax: number): void;
+
+
+        /**
+         * Returns `true` if the `point` is inside the set of `vertices`.
+         * @method contains
+         * @param {vertices} vertices
+         * @param {vector} point
+         * @return {boolean} True if the vertices contains point, otherwise false
+         */
+        static contains(vertices: Array<Vector>, point: Vector): boolean;
+
+        /**
+         * Creates a new set of `Matter.Body` compatible vertices.
+         * The `points` argument accepts an array of `Matter.Vector` points orientated around the origin `(0, 0)`, for example:
+         *
+        *     [{ x: 0, y: 0 }, { x: 25, y: 50 }, { x: 50, y: 0 }]
+        *
+        * The `Vertices.create` method returns a new array of vertices, which are similar to Matter.Vector objects,
+        * but with some additional references required for efficient collision detection routines.
+        *
+        * Note that the `body` argument is not optional, a `Matter.Body` reference must be provided.
+        *
+        * @method create
+        * @param {vector[]} points
+        * @param {body} body
+        */
+        static create(points: Array<Vector>, body: Body): void;
+
+        /**
+         * Parses a string containing ordered x y pairs separated by spaces (and optionally commas),
+         * into a `Matter.Vertices` object for the given `Matter.Body`.
+         * For parsing SVG paths, see `Svg.pathToVertices`.
+         * @method fromPath
+         * @param {string} path
+         * @param {body} body
+         * @return {vertices} vertices
+         */
+        static fromPath(path: string, body: Body): Array<Vector>;
+
+        /**
+         * Returns the moment of inertia (second moment of area) of the set of vertices given the total mass.
+         * @method inertia
+         * @param {vertices} vertices
+         * @param {number} mass
+         * @return {number} The polygon's moment of inertia
+         */
+        static inertia(vertices: Array<Vector>, mass: number): number;
+
+        /**
+         * Rotates the set of vertices in-place.
+         * @method rotate
+         * @param {vertices} vertices
+         * @param {number} angle
+         * @param {vector} point
+         */
+        static rotate(vertices: Array<Vector>, angle: number, point: Vector): void;
+
+        /**
+         * Scales the vertices from a point (default is centre) in-place.
+         * @method scale
+         * @param {vertices} vertices
+         * @param {number} scaleX
+         * @param {number} scaleY
+         * @param {vector} point
+         */
+        static scale(vertices: Array<Vector>, scaleX: number, scaleY: number, point: Vector): void;
+
+        /**
+         * Translates the set of vertices in-place.
+         * @method translate
+         * @param {vertices} vertices
+         * @param {vector} vector
+         * @param {number} scalar
+         */
+        static translate(vertices: Array<Vector>, vector: Vector, scalar: number): void;
+    }
+
+    interface IWorldDefinition extends ICompositeDefinition {
+        gravity?: Vector;
+        bounds?: Bounds;
+    }
+
+    /**
+    * The `Matter.World` module contains methods for creating and manipulating the world composite.
+    * A `Matter.World` is a `Matter.Composite` body, which is a collection of `Matter.Body`, `Matter.Constraint` and other `Matter.Composite`.
+    * A `Matter.World` has a few additional properties including `gravity` and `bounds`.
+    * It is important to use the functions in the `Matter.Composite` module to modify the world composite, rather than directly modifying its properties.
+    * There are also a few methods here that alias those in `Matter.Composite` for easier readability.
+    *
+    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
+    *
+    * @class World
+    * @extends Composite
+    */
+    export class World {
+        /**
+         * Add objects or arrays of objects of types: Body, Constraint, Composite
+         * @param world
+         * @param body
+         * @returns world
+         */
+        static add(world: World, body: Body | Array<Body> | Composite | Array<Composite> | Constraint | Array<Constraint>): World;
+
+        /**
+         * An alias for Composite.addBody since World is also a Composite
+         * @method addBody
+         * @param {world} world
+         * @param {body} body
+         * @return {world} The original world with the body added
+         */
+        static addBody(world: World, body: Body): World;
+
+        /**
+         * An alias for Composite.add since World is also a Composite
+         * @method addComposite
+         * @param {world} world
+         * @param {composite} composite
+         * @return {world} The original world with the objects from composite added
+         */
+        static addComposite(world: World, composite: Composite): World;
+
+        /**
+         * An alias for Composite.addConstraint since World is also a Composite
+         * @method addConstraint
+         * @param {world} world
+         * @param {constraint} constraint
+         * @return {world} The original world with the constraint added
+         */
+        static addConstraint(world: World, constraint: Constraint): World;
+
+        /**
+         * An alias for Composite.clear since World is also a Composite
+         * @method clear
+         * @param {world} world
+         * @param {boolean} keepStatic
+         */
+        static clear(world: World, keepStatic: boolean): void;
+
+        /**
+         * Creates a new world composite. The options parameter is an object that specifies any properties you wish to override the defaults.
+         * See the properties section below for detailed information on what you can pass via the `options` object.
+         * @method create
+         * @constructor
+         * @param {} options
+         * @return {world} A new world
+         */
+        static create(options: IWorldDefinition): World;
+
+        gravity: Vector;
+        bounds: Bounds;
+
+    }
+
+    export interface ICollisionFilter {
+        category: number;
+        mask: number;
+        group: number;
+    }
+
+    export interface IMousePoint {
+        x: number;
+        y: number;
+    }
+
+    export class Mouse {
+        static create(element: HTMLElement): Mouse;
+        static setElement(mouse: Mouse, element: HTMLElement): void;
+        static clearSourceEvents(mouse: Mouse): void;
+        static setOffset(mouse: Mouse, offset: Vector): void;
+        static setScale(mouse: Mouse, scale: Vector): void;
+
+        element: HTMLElement;
+        absolute: IMousePoint;
+        position: IMousePoint;
+        mousedownPosition: IMousePoint;
+        mouseupPosition: IMousePoint;
+        offset: IMousePoint;
+        scale: IMousePoint;
+        wheelDelta: number;
+        button: number;
+        pixelRatio: number;
+    }
+
+    export interface IEvent<T> {
+        /**
+         * The name of the event
+         */
+        name: string;
+        /**
+         * The source object of the event
+         */
+        source: T;
+    }
+
+    export interface IEventComposite<T> extends IEvent<T> {
+        /**
+         * EventObjects (may be a single body, constraint, composite or a mixed array of these)
+         */
+        object: any;
+    }
+
+    export interface IEventTimestamped<T> extends IEvent<T> {
+        /**
+         * The engine.timing.timestamp of the event
+         */
+        timestamp: number;
+    }
+
+    export interface IEventCollision<T> extends IEventTimestamped<T> {
+        /**
+         * The collision pair
+         */
+        pairs: Array<IPair>;
+    }
+
+
+    export class Events {
+
+        /**
+        * Fired when a body starts sleeping (where `this` is the body).
+        *
+        * @event sleepStart
+        * @this {body} The body that has started sleeping
+        * @param {} event An event object
+        * @param {} event.source The source object of the event
+        * @param {} event.name The name of the event
+        */
+        static on(obj: Body, name: "sleepStart", callback: (e: IEvent<Body>) => void): void;
+        /**
+         * Fired when a body ends sleeping (where `this` is the body).
+         *
+        * @event sleepEnd
+        * @this {body} The body that has ended sleeping
+        * @param {} event An event object
+        * @param {} event.source The source object of the event
+        * @param {} event.name The name of the event
+        */
+        static on(obj: Body, name: "sleepEnd", callback: (e: IEvent<Body>) => void): void;
+
+        /**
+        * Fired when a call to `Composite.add` is made, before objects have been added.
+        *
+        * @event beforeAdd
+        * @param {} event An event object
+        * @param {} event.object The object(s) to be added (may be a single body, constraint, composite or a mixed array of these)
+        * @param {} event.source The source object of the event
+        * @param {} event.name The name of the event
+        */
+        static on(obj: Engine, name: "beforeAdd", callback: (e: IEventComposite<Composite>) => void): void;
+
+        /**
+         * Fired when a call to `Composite.add` is made, after objects have been added.
+        *
+        * @event afterAdd
+        * @param {} event An event object
+        * @param {} event.object The object(s) that have been added (may be a single body, constraint, composite or a mixed array of these)
+        * @param {} event.source The source object of the event
+        * @param {} event.name The name of the event
+        */
+        static on(obj: Engine, name: "afterAdd", callback: (e: IEventComposite<Composite>) => void): void;
+
+        /**
+        * Fired when a call to `Composite.remove` is made, before objects have been removed.
+        *
+        * @event beforeRemove
+        * @param {} event An event object
+        * @param {} event.object The object(s) to be removed (may be a single body, constraint, composite or a mixed array of these)
+        * @param {} event.source The source object of the event
+        * @param {} event.name The name of the event
+        */
+        static on(obj: Engine, name: "beforeRemove", callback: (e: IEventComposite<Composite>) => void): void;
+
+        /**
+        * Fired when a call to `Composite.remove` is made, after objects have been removed.
+        *
+        * @event afterRemove
+        * @param {} event An event object
+        * @param {} event.object The object(s) that have been removed (may be a single body, constraint, composite or a mixed array of these)
+        * @param {} event.source The source object of the event
+        * @param {} event.name The name of the event
+        */
+        static on(obj: Engine, name: "afterRemove", callback: (e: IEventComposite<Composite>) => void): void;
+
+
+        /**
+        * Fired after engine update and all collision events
+        *
+        * @event afterUpdate
+        * @param {} event An event object
+        * @param {number} event.timestamp The engine.timing.timestamp of the event
+        * @param {} event.source The source object of the event
+        * @param {} event.name The name of the event
+        */
+        static on(obj: Engine, name: "afterUpdate", callback: (e: IEventTimestamped<Engine>) => void): void;
+
+        /**
+        * Fired before rendering
+        *
+        * @event beforeRender
+        * @param {} event An event object
+        * @param {number} event.timestamp The engine.timing.timestamp of the event
+        * @param {} event.source The source object of the event
+        * @param {} event.name The name of the event
+        */
+        static on(obj: Engine, name: "beforeRender", callback: (e: IEventTimestamped<Render>) => void): void;
+        /**
+        * Fired after rendering
+        *
+        * @event afterRender
+        * @param {} event An event object
+        * @param {number} event.timestamp The engine.timing.timestamp of the event
+        * @param {} event.source The source object of the event
+        * @param {} event.name The name of the event
+        */
+        static on(obj: Engine, name: "afterRender", callback: (e: IEventTimestamped<Render>) => void): void;
+
+
+        /**
+        * Fired just before an update
+        *
+        * @event beforeUpdate
+        * @param {} event An event object
+        * @param {number} event.timestamp The engine.timing.timestamp of the event
+        * @param {} event.source The source object of the event
+        * @param {} event.name The name of the event
+        */
+        static on(obj: Engine, name: "beforeUpdate", callback: (e: IEventTimestamped<Engine>) => void): void;
+
+        /**
+        * Fired after engine update, provides a list of all pairs that are colliding in the current tick (if any)
+        *
+        * @event collisionActive
+        * @param {} event An event object
+        * @param {} event.pairs List of affected pairs
+        * @param {number} event.timestamp The engine.timing.timestamp of the event
+        * @param {} event.source The source object of the event
+        * @param {} event.name The name of the event
+        */
+        static on(obj: Engine, name: "collisionActive", callback: (e: IEventCollision<Engine>) => void): void;
+
+
+        /**
+        * Fired after engine update, provides a list of all pairs that have ended collision in the current tick (if any)
+        *
+        * @event collisionEnd
+        * @param {} event An event object
+        * @param {} event.pairs List of affected pairs
+        * @param {number} event.timestamp The engine.timing.timestamp of the event
+        * @param {} event.source The source object of the event
+        * @param {} event.name The name of the event
+        */
+        static on(obj: Engine, name: "collisionEnd", callback: (e: IEventCollision<Engine>) => void): void;
+
+        /**
+        * Fired after engine update, provides a list of all pairs that have started to collide in the current tick (if any)
+        *
+        * @event collisionStart
+        * @param {} event An event object
+        * @param {} event.pairs List of affected pairs
+        * @param {number} event.timestamp The engine.timing.timestamp of the event
+        * @param {} event.source The source object of the event
+        * @param {} event.name The name of the event
+        */
+        static on(obj: Engine, name: "collisionStart", callback: (e: IEventCollision<Engine>) => void): void;
+
+        /**
+        * Fired at the start of a tick, before any updates to the engine or timing
+        *
+        * @event beforeTick
+        * @param {} event An event object
+        * @param {number} event.timestamp The engine.timing.timestamp of the event
+        * @param {} event.source The source object of the event
+        * @param {} event.name The name of the event
+        */
+        static on(obj: Engine, name: "beforeTick", callback: (e: IEventTimestamped<Runner>) => void): void;
+
+        /**
+         * Fired after engine timing updated, but just before update
+        *
+        * @event tick
+        * @param {} event An event object
+        * @param {number} event.timestamp The engine.timing.timestamp of the event
+        * @param {} event.source The source object of the event
+        * @param {} event.name The name of the event
+        */
+        static on(obj: Engine, name: "tick", callback: (e: IEventTimestamped<Runner>) => void): void;
+
+        /**
+        * Fired at the end of a tick, after engine update and after rendering
+        *
+        * @event afterTick
+        * @param {} event An event object
+        * @param {number} event.timestamp The engine.timing.timestamp of the event
+        * @param {} event.source The source object of the event
+        * @param {} event.name The name of the event
+        */
+        static on(obj: Engine, name: "afterTick", callback: (e: IEventTimestamped<Runner>) => void): void;
+
+        /**
+        * Fired before rendering
+        *
+        * @event beforeRender
+        * @param {} event An event object
+        * @param {number} event.timestamp The engine.timing.timestamp of the event
+        * @param {} event.source The source object of the event
+        * @param {} event.name The name of the event
+        */
+        static on(obj: Engine, name: "beforeRender", callback: (e: IEventTimestamped<Runner>) => void): void;
+
+        /**
+        * Fired after rendering
+        *
+        * @event afterRender
+        * @param {} event An event object
+        * @param {number} event.timestamp The engine.timing.timestamp of the event
+        * @param {} event.source The source object of the event
+        * @param {} event.name The name of the event
+        */
+        static on(obj: Engine, name: "afterRender", callback: (e: IEventTimestamped<Runner>) => void): void;
+
+        /**
+         * Fired when the mouse is down (or a touch has started) during the last step
+         * @param obj
+         * @param name
+         * @param callback
+         */
+        static on(obj: MouseConstraint, name: "mousedown", callback: (e: any) => void): void;
+
+        /**
+         * Fired when the mouse has moved (or a touch moves) during the last step
+         * @param obj
+         * @param name
+         * @param callback
+         */
+        static on(obj: MouseConstraint, name: "mousemove", callback: (e: any) => void): void;
+
+        /**
+         * Fired when the mouse is up (or a touch has ended) during the last step
+         * @param obj
+         * @param name
+         * @param callback
+         */
+        static on(obj: MouseConstraint, name: "mouseup", callback: (e: any) => void): void;
+
+
+        static on(obj: any, name: string, callback: (e: any) => void): void;
+
+        /**
+         * Removes the given event callback. If no callback, clears all callbacks in eventNames. If no eventNames, clears all events.
+         *
+        * @param obj
+        * @param eventName
+        * @param callback
+        */
+        static off(obj: any, eventName: string, callback: (e: any) => void): void;
+
+        /**
+         * Fires all the callbacks subscribed to the given object's eventName, in the order they subscribed, if any.
+         *
+        * @param object
+        * @param eventNames
+        * @param event
+        */
+        static trigger(object: any, eventNames: string, event: (e: any) => void): void;
+
+    }
+}
diff --git a/matter-js/matter-js-tests.ts b/matter-js/matter-js-tests.ts
index 410a9eceab..d94a1b6bed 100644
--- a/matter-js/matter-js-tests.ts
+++ b/matter-js/matter-js-tests.ts
@@ -1,5 +1,4 @@
-///<reference path="matter-js.d.ts"/>
-
+import Matter = require("matter-js");
 var Engine = Matter.Engine, 
 	World = Matter.World,
 	Body = Matter.Body,
diff --git a/matter-js/matter-js.d.ts b/matter-js/matter-js.d.ts
deleted file mode 100644
index eccd892df5..0000000000
--- a/matter-js/matter-js.d.ts
+++ /dev/null
@@ -1,3202 +0,0 @@
-// Type definitions for Matter.js - 0.9.1
-// Project: https://github.com/liabru/matter-js
-// Definitions by: Ivane Gegia <https://twitter.com/ivanegegia>,
-//                 David Asmuth <https://github.com/piranha771/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'matter-js' {
-    export = Matter;
-}
-
-declare namespace Matter {
-    /**
-    * The `Matter.Axes` module contains methods for creating and manipulating sets of axes.
-    *
-    * @class Axes
-    */
-    export class Axes {
-        /**
-         * Creates a new set of axes from the given vertices.
-         * @method fromVertices
-         * @param {vertices} vertices
-         * @return {axes} A new axes from the given vertices
-         */
-        static fromVertices(vertices: Array<Vector>): Array<Vector>;
-        /**
-         * Rotates a set of axes by the given angle.
-         * @method rotate
-         * @param {axes} axes
-         * @param {number} angle
-         */
-        static rotate(axes: Array<Vector>, angle: number): void;
-    }
-
-    /**
-    * The `Matter.Bodies` module contains factory methods for creating rigid body models
-    * with commonly used body configurations (such as rectangles, circles and other polygons).
-    *
-    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
-    *
-    * @class Bodies
-    */
-    export class Bodies {
-        /**
-         * Creates a new rigid body model with a circle hull.
-         * The options parameter is an object that specifies any properties you wish to override the defaults.
-         * See the properties section of the `Matter.Body` module for detailed information on what you can pass via the `options` object.
-         * @method circle
-         * @param {number} x
-         * @param {number} y
-         * @param {number} radius
-         * @param {object} [options]
-         * @param {number} [maxSides]
-         * @return {body} A new circle body
-         */
-        static circle(x: number, y: number, radius: number, options?: IBodyDefinition, maxSides?: number): Body;
-
-        /**
-         * Creates a new rigid body model with a regular polygon hull with the given number of sides.
-         * The options parameter is an object that specifies any properties you wish to override the defaults.
-         * See the properties section of the `Matter.Body` module for detailed information on what you can pass via the `options` object.
-         * @method polygon
-         * @param {number} x
-         * @param {number} y
-         * @param {number} sides
-         * @param {number} radius
-         * @param {object} [options]
-         * @return {body} A new regular polygon body
-         */
-        static polygon(x: number, y: number, sides: number, radius: number, options?: IBodyDefinition): Body;
-
-        /**
-         * Creates a new rigid body model with a rectangle hull.
-         * The options parameter is an object that specifies any properties you wish to override the defaults.
-         * See the properties section of the `Matter.Body` module for detailed information on what you can pass via the `options` object.
-         * @method rectangle
-         * @param {number} x
-         * @param {number} y
-         * @param {number} width
-         * @param {number} height
-         * @param {object} [options]
-         * @return {body} A new rectangle body
-         */
-        static rectangle(x: number, y: number, width: number, height: number, options?: IBodyDefinition): Body;
-
-        /**
-         * Creates a new rigid body model with a trapezoid hull.
-         * The options parameter is an object that specifies any properties you wish to override the defaults.
-         * See the properties section of the `Matter.Body` module for detailed information on what you can pass via the `options` object.
-         * @method trapezoid
-         * @param {number} x
-         * @param {number} y
-         * @param {number} width
-         * @param {number} height
-         * @param {number} slope
-         * @param {object} [options]
-         * @return {body} A new trapezoid body
-         */
-        static trapezoid(x: number, y: number, width: number, height: number, slope: number, options?: IBodyDefinition): Body;
-        /**
-        * Creates a body using the supplied vertices (or an array containing multiple sets of vertices).
-        * If the vertices are convex, they will pass through as supplied.
-        * Otherwise if the vertices are concave, they will be decomposed if [poly-decomp.js](https://github.com/schteppe/poly-decomp.js) is available.
-        * Note that this process is not guaranteed to support complex sets of vertices (e.g. those with holes may fail).
-        * By default the decomposition will discard collinear edges (to improve performance).
-        * It can also optionally discard any parts that have an area less than `minimumArea`.
-        * If the vertices can not be decomposed, the result will fall back to using the convex hull.
-        * The options parameter is an object that specifies any `Matter.Body` properties you wish to override the defaults.
-        * See the properties section of the `Matter.Body` module for detailed information on what you can pass via the `options` object.
-        * @method fromVertices
-        * @param {number} x
-        * @param {number} y
-        * @param [[vector]] vertexSets
-        * @param {object} [options]
-        * @param {bool} [flagInternal=false]
-        * @param {number} [removeCollinear=0.01]
-        * @param {number} [minimumArea=10]
-        * @return {body}
-        */
-        static fromVertices(x: number, y: number, vertexSets: Array<Array<Vector>>, options?: IBodyDefinition, flagInternal?: boolean, removeCollinear?: number, minimumArea?: number): Body;
-    }
-
-    export interface IBodyDefinition {
-        /**
-         * A `Number` specifying the angle of the body, in radians.
-         *
-        * @property angle
-        * @type number
-        * @default 0
-        */
-        angle?: number;
-        /**
-         * A `Number` that _measures_ the current angular speed of the body after the last `Body.update`. It is read-only and always positive (it's the magnitude of `body.angularVelocity`).
-         *
-        * @readOnly
-        * @property angularSpeed
-        * @type number
-        * @default 0
-        */
-        angularSpeed?: number;
-        /**
-         * A `Number` that _measures_ the current angular velocity of the body after the last `Body.update`. It is read-only.
-         * If you need to modify a body's angular velocity directly, you should apply a torque or simply change the body's `angle` (as the engine uses position-Verlet integration).
-         *
-        * @readOnly
-        * @property angularVelocity
-        * @type number
-        * @default 0
-        */
-        angularVelocity?: number;
-        /**
-         * A `Number` that _measures_ the area of the body's convex hull, calculated at creation by `Body.create`.
-         *
-        * @property area
-        * @type string
-        * @default
-        */
-        area?: number;
-        /**
-         * An array of unique axis vectors (edge normals) used for collision detection.
-         * These are automatically calculated from the given convex hull (`vertices` array) in `Body.create`.
-         * They are constantly updated by `Body.update` during the simulation.
-         *
-        * @property axes
-        * @type vector[]
-        */
-        axes?: Array<Vector>;
-        /**
-         * A `Bounds` object that defines the AABB region for the body.
-         * It is automatically calculated from the given convex hull (`vertices` array) in `Body.create` and constantly updated by `Body.update` during simulation.
-         *
-        * @property bounds
-        * @type bounds
-        */
-        bounds?: Bounds;
-        /**
-         * A `Number` that defines the density of the body, that is its mass per unit area.
-         * If you pass the density via `Body.create` the `mass` property is automatically calculated for you based on the size (area) of the object.
-         * This is generally preferable to simply setting mass and allows for more intuitive definition of materials (e.g. rock has a higher density than wood).
-         *
-        * @property density
-        * @type number
-        * @default 0.001
-        */
-        density?: number;
-        /**
-         * A `Vector` that specifies the force to apply in the current step. It is zeroed after every `Body.update`. See also `Body.applyForce`.
-        *
-        * @property force
-        * @type vector
-        * @default { x: 0, y: 0 }
-        */
-        force?: Vector;
-        /**
-         * A `Number` that defines the friction of the body. The value is always positive and is in the range `(0, 1)`.
-        * A value of `0` means that the body may slide indefinitely.
-        * A value of `1` means the body may come to a stop almost instantly after a force is applied.
-        *
-        * The effects of the value may be non-linear.
-        * High values may be unstable depending on the body.
-        * The engine uses a Coulomb friction model including static and kinetic friction.
-        * Note that collision response is based on _pairs_ of bodies, and that `friction` values are _combined_ with the following formula:
-        *
-        *     Math.min(bodyA.friction, bodyB.friction)
-        *
-        * @property friction
-        * @type number
-        * @default 0.1
-        */
-        friction?: number;
-        /**
-         * A `Number` that defines the air friction of the body (air resistance).
-         * A value of `0` means the body will never slow as it moves through space.
-         * The higher the value, the faster a body slows when moving through space.
-         * The effects of the value are non-linear.
-         *
-        * @property frictionAir
-        * @type number
-        * @default 0.01
-        */
-        frictionAir?: number;
-        /**
-         * An integer `Number` uniquely identifying number generated in `Body.create` by `Common.nextId`.
-         *
-        * @property id
-        * @type number
-        */
-        id?: number;
-        /**
-         * A `Number` that defines the moment of inertia (i.e. second moment of area) of the body.
-         * It is automatically calculated from the given convex hull (`vertices` array) and density in `Body.create`.
-         * If you modify this value, you must also modify the `body.inverseInertia` property (`1 / inertia`).
-         *
-        * @property inertia
-        * @type number
-        */
-        inertia?: number;
-        /**
-         * A `Number` that defines the inverse moment of inertia of the body (`1 / inertia`).
-         * If you modify this value, you must also modify the `body.inertia` property.
-         *
-        * @property inverseInertia
-        * @type number
-        */
-        inverseInertia?: number;
-        /**
-         * A `Number` that defines the inverse mass of the body (`1 / mass`).
-         * If you modify this value, you must also modify the `body.mass` property.
-         *
-        * @property inverseMass
-        * @type number
-        */
-        inverseMass?: number;
-        /**
-         * A flag that indicates whether the body is considered sleeping. A sleeping body acts similar to a static body, except it is only temporary and can be awoken.
-         * If you need to set a body as sleeping, you should use `Sleeping.set` as this requires more than just setting this flag.
-         *
-        * @property isSleeping
-        * @type boolean
-        * @default false
-        */
-        isSleeping?: boolean;
-        /**
-         * A flag that indicates whether a body is considered static. A static body can never change position or angle and is completely fixed.
-         * If you need to set a body as static after its creation, you should use `Body.setStatic` as this requires more than just setting this flag.
-         *
-        * @property isStatic
-        * @type boolean
-        * @default false
-        */
-        isStatic?: boolean;
-        /**
-         * An arbitrary `String` name to help the user identify and manage bodies.
-         *
-        * @property label
-        * @type string
-        * @default "Body"
-        */
-
-        label?: string;
-        /**
-         * A `Number` that defines the mass of the body, although it may be more appropriate to specify the `density` property instead.
-         * If you modify this value, you must also modify the `body.inverseMass` property (`1 / mass`).
-         *
-        * @property mass
-        * @type number
-        */
-        mass?: number;
-        /**
-         * A `Number` that _measures_ the amount of movement a body currently has (a combination of `speed` and `angularSpeed`). It is read-only and always positive.
-        * It is used and updated by the `Matter.Sleeping` module during simulation to decide if a body has come to rest.
-        *
-        * @readOnly
-        * @property motion
-        * @type number
-        * @default 0
-        */
-        motion?: number;
-        /**
-         * A `Vector` that specifies the current world-space position of the body.
-         *
-        * @property position
-        * @type vector
-        * @default { x: 0, y:      */
-        position?: Vector;
-        /**
-         * An `Object` that defines the rendering properties to be consumed by the module `Matter.Render`.
-        *
-        * @property render
-        * @type object
-        */
-        render?: IBodyRenderOptions;
-        /**
-         * A `Number` that defines the restitution (elasticity) of the body. The value is always positive and is in the range `(0, 1)`.
-         * A value of `0` means collisions may be perfectly inelastic and no bouncing may occur.
-         * A value of `0.8` means the body may bounce back with approximately 80% of its kinetic energy.
-         * Note that collision response is based on _pairs_ of bodies, and that `restitution` values are _combined_ with the following formula:
-         *
-        *     Math.max(bodyA.restitution, bodyB.restitution)
-        *
-        * @property restitution
-        * @type number
-        * @default 0
-        */
-        restitution?: number;
-        /**
-         * A `Number` that defines the number of updates in which this body must have near-zero velocity before it is set as sleeping by the `Matter.Sleeping` module (if sleeping is enabled by the engine).
-         *
-        * @property sleepThreshold
-        * @type number
-        * @default 60
-        */
-        sleepThreshold?: number;
-        /**
-         * A `Number` that specifies a tolerance on how far a body is allowed to 'sink' or rotate into other bodies.
-         * Avoid changing this value unless you understand the purpose of `slop` in physics engines.
-         * The default should generally suffice, although very large bodies may require larger values for stable stacking.
-         *
-        * @property slop
-        * @type number
-        * @default 0.05
-        */
-        slop?: number;
-        /**
-         * A `Number` that _measures_ the current speed of the body after the last `Body.update`. It is read-only and always positive (it's the magnitude of `body.velocity`).
-         *
-        * @readOnly
-        * @property speed
-        * @type number
-        * @default 0
-        */
-        speed?: number;
-        /**
-         * A `Number` that allows per-body time scaling, e.g. a force-field where bodies inside are in slow-motion, while others are at full speed.
-        *
-        * @property timeScale
-        * @type number
-        * @default 1
-        */
-        timeScale?: number;
-        /**
-         * A `Number` that specifies the torque (turning force) to apply in the current step. It is zeroed after every `Body.update`.
-        *
-        * @property torque
-        * @type number
-        * @default 0
-        */
-        torque?: number;
-        /**
-         * A `String` denoting the type of object.
-        *
-        * @property type
-        * @type string
-        * @default "body"
-        */
-        type?: string;
-        /**
-         * A `Vector` that _measures_ the current velocity of the body after the last `Body.update`. It is read-only.
-         * If you need to modify a body's velocity directly, you should either apply a force or simply change the body's `position` (as the engine uses position-Verlet integration).
-         *
-        * @readOnly
-        * @property velocity
-        * @type vector
-        * @default { x: 0, y: 0 }
-        */
-        velocity?: Vector;
-        /**
-         * An array of `Vector` objects that specify the convex hull of the rigid body.
-         * These should be provided about the origin `(0, 0)`. E.g.
-         *
-        *     [{ x: 0, y: 0 }, { x: 25, y: 50 }, { x: 50, y: 0 }]
-        *
-        * When passed via `Body.create`, the vertices are translated relative to `body.position` (i.e. world-space, and constantly updated by `Body.update` during simulation).
-        * The `Vector` objects are also augmented with additional properties required for efficient collision detection.
-        *
-        * Other properties such as `inertia` and `bounds` are automatically calculated from the passed vertices (unless provided via `options`).
-        * Concave hulls are not currently supported. The module `Matter.Vertices` contains useful methods for working with vertices.
-        *
-        * @property vertices
-        * @type vector[]
-        */
-        vertices?: Array<Vector>;
-        /**
-         * An array of bodies that make up this body.
-         * The first body in the array must always be a self reference to the current body instance.
-         * All bodies in the `parts` array together form a single rigid compound body.
-         * Parts are allowed to overlap, have gaps or holes or even form concave bodies.
-         * Parts themselves should never be added to a `World`, only the parent body should be.
-         * Use `Body.setParts` when setting parts to ensure correct updates of all properties.
-         *
-        * @property parts
-        * @type body[]
-        */
-        parts?: Array<Body>;
-        /**
-         * A self reference if the body is _not_ a part of another body.
-         * Otherwise this is a reference to the body that this is a part of.
-         * See `body.parts`.
-         *
-        * @property parent
-        * @type body
-        */
-        parent?: Body;
-        /**
-         * A `Number` that defines the static friction of the body (in the Coulomb friction model).
-         * A value of `0` means the body will never 'stick' when it is nearly stationary and only dynamic `friction` is used.
-         * The higher the value (e.g. `10`), the more force it will take to initially get the body moving when nearly stationary.
-         * This value is multiplied with the `friction` property to make it easier to change `friction` and maintain an appropriate amount of static friction.
-         *
-        * @property frictionStatic
-        * @type number
-        * @default 0.5
-        */
-        frictionStatic?: number;
-        /**
-         * An `Object` that specifies the collision filtering properties of this body.
-         *
-        * Collisions between two bodies will obey the following rules:
-        * - If the two bodies have the same non-zero value of `collisionFilter.group`,
-        *   they will always collide if the value is positive, and they will never collide
-        *   if the value is negative.
-        * - If the two bodies have different values of `collisionFilter.group` or if one
-        *   (or both) of the bodies has a value of 0, then the category/mask rules apply as follows:
-        *
-        * Each body belongs to a collision category, given by `collisionFilter.category`. This
-        * value is used as a bit field and the category should have only one bit set, meaning that
-        * the value of this property is a power of two in the range [1, 2^31]. Thus, there are 32
-        * different collision categories available.
-        *
-        * Each body also defines a collision bitmask, given by `collisionFilter.mask` which specifies
-        * the categories it collides with (the value is the bitwise AND value of all these categories).
-        *
-        * Using the category/mask rules, two bodies `A` and `B` collide if each includes the other's
-        * category in its mask, i.e. `(categoryA & maskB) !== 0` and `(categoryB & maskA) !== 0`
-        * are both true.
-        *
-        * @property collisionFilter
-        * @type object
-        */
-        collisionFilter?: ICollisionFilter;
-
-    }
-
-    export interface IBodyRenderOptions {
-
-        /**
-         * A flag that indicates if the body should be rendered.
-         *
-        * @property render.visible
-        * @type boolean
-        * @default true
-        */
-        visible: boolean;
-
-        /**
-         * An `Object` that defines the sprite properties to use when rendering, if any.
-         *
-        * @property render.sprite
-        * @type object
-        */
-        sprite: IBodyRenderOptionsSprite;
-
-        /**
-         * A String that defines the fill style to use when rendering the body (if a sprite is not defined). It is the same as when using a canvas, so it accepts CSS style property values.
-         Default: a random colour
-        */
-        fillStyle: string;
-
-        /**
-         * A Number that defines the line width to use when rendering the body outline (if a sprite is not defined). A value of 0 means no outline will be rendered.
-         Default: 1.5
-        */
-        lineWidth: number;
-
-        /**
-         * A String that defines the stroke style to use when rendering the body outline (if a sprite is not defined). It is the same as when using a canvas, so it accepts CSS style property values.
-         Default: a random colour
-        */
-        strokeStyle: string;
-
-
-		/*
-		 * Sets the opacity. 1.0 is fully opaque. 0.0 is fully translucent
-		 */
-		opacity: number;
-    }
-
-    export interface IBodyRenderOptionsSprite {
-        /**
-         * An `String` that defines the path to the image to use as the sprite texture, if any.
-         *
-        * @property render.sprite.texture
-        * @type string
-        */
-        texture: string;
-
-        /**
-         * A `Number` that defines the scaling in the x-axis for the sprite, if any.
-         *
-        * @property render.sprite.xScale
-        * @type number
-        * @default 1
-        */
-        xScale: number;
-
-        /**
-         * A `Number` that defines the scaling in the y-axis for the sprite, if any.
-         *
-        * @property render.sprite.yScale
-        * @type number
-        * @default 1
-        */
-        yScale: number;
-    }
-
-    /**
-    * The `Matter.Body` module contains methods for creating and manipulating body models.
-    * A `Matter.Body` is a rigid body that can be simulated by a `Matter.Engine`.
-    * Factories for commonly used body configurations (such as rectangles, circles and other polygons) can be found in the module `Matter.Bodies`.
-    *
-    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
-
-    * @class Body
-    */
-    export class Body {
-        /**
-         * Applies a force to a body from a given world-space position, including resulting torque.
-         * @method applyForce
-         * @param {body} body
-         * @param {vector} position
-         * @param {vector} force
-         */
-        static applyForce(body: Body, position: Vector, force: Vector): void;
-
-        /**
-         * Creates a new rigid body model. The options parameter is an object that specifies any properties you wish to override the defaults.
-         * All properties have default values, and many are pre-calculated automatically based on other properties.
-         * See the properties section below for detailed information on what you can pass via the `options` object.
-         * @method create
-         * @param {} options
-         * @return {body} body
-         */
-        static create(options: IBodyDefinition): Body;
-        /**
-         * Rotates a body by a given angle relative to its current angle, without imparting any angular velocity.
-         * @method rotate
-         * @param {body} body
-         * @param {number} rotation
-         */
-        static rotate(body: Body, rotation: number): void;
-        /**
-         * Returns the next unique group index for which bodies will collide.
-         * If `isNonColliding` is `true`, returns the next unique group index for which bodies will _not_ collide.
-         * See `body.collisionFilter` for more information.
-         * @method nextGroup
-         * @param {bool} [isNonColliding=false]
-         * @return {Number} Unique group index
-         */
-        static nextGroup(isNonColliding: boolean): number;
-        /**
-         * Returns the next unique category bitfield (starting after the initial default category `0x0001`).
-         * There are 32 available. See `body.collisionFilter` for more information.
-         * @method nextCategory
-         * @return {Number} Unique category bitfield
-         */
-        static nextCategory(): number;
-        /**
-         * Given a property and a value (or map of), sets the property(s) on the body, using the appropriate setter functions if they exist.
-         * Prefer to use the actual setter functions in performance critical situations.
-         * @method set
-         * @param {body} body
-         * @param {} settings A property name (or map of properties and values) to set on the body.
-         * @param {} value The value to set if `settings` is a single property name.
-         */
-        static set(body: Body, settings: any, value?: any): void;
-        /**
-         * Sets the mass of the body. Inverse mass and density are automatically updated to reflect the change.
-         * @method setMass
-         * @param {body} body
-         * @param {number} mass
-         */
-        static setMass(body: Body, mass: number): void;
-        /**
-         * Sets the density of the body. Mass is automatically updated to reflect the change.
-         * @method setDensity
-         * @param {body} body
-         * @param {number} density
-         */
-        static setDensity(body: Body, density: number): void;
-        /**
-         * Sets the moment of inertia (i.e. second moment of area) of the body of the body.
-         * Inverse inertia is automatically updated to reflect the change. Mass is not changed.
-         * @method setInertia
-         * @param {body} body
-         * @param {number} inertia
-         */
-        static setInertia(body: Body, interna: number): void;
-        /**
-         * Sets the body's vertices and updates body properties accordingly, including inertia, area and mass (with respect to `body.density`).
-         * Vertices will be automatically transformed to be orientated around their centre of mass as the origin.
-         * They are then automatically translated to world space based on `body.position`.
-         *
-        * The `vertices` argument should be passed as an array of `Matter.Vector` points (or a `Matter.Vertices` array).
-        * Vertices must form a convex hull, concave hulls are not supported.
-        *
-        * @method setVertices
-        * @param {body} body
-        * @param {vector[]} vertices
-        */
-        static setVertices(body: Body, vertices: Array<Vector>): void;
-        /**
-         * Sets the parts of the `body` and updates mass, inertia and centroid.
-         * Each part will have its parent set to `body`.
-         * By default the convex hull will be automatically computed and set on `body`, unless `autoHull` is set to `false.`
-         * Note that this method will ensure that the first part in `body.parts` will always be the `body`.
-         * @method setParts
-         * @param {body} body
-         * @param [body] parts
-         * @param {bool} [autoHull=true]
-         */
-        static setParts(body: Body, parts: Body[], autoHull?: boolean): void;
-        /**
-         * Sets the position of the body instantly. Velocity, angle, force etc. are unchanged.
-         * @method setPosition
-         * @param {body} body
-         * @param {vector} position
-         */
-        static setPosition(body: Body, position: Vector): void;
-        /**
-         * Sets the angle of the body instantly. Angular velocity, position, force etc. are unchanged.
-         * @method setAngle
-         * @param {body} body
-         * @param {number} angle
-         */
-        static setAngle(body: Body, angle: number): void;
-        /**
-         * Sets the linear velocity of the body instantly. Position, angle, force etc. are unchanged. See also `Body.applyForce`.
-         * @method setVelocity
-         * @param {body} body
-         * @param {vector} velocity
-         */
-        static setVelocity(body: Body, velocity: Vector): void;
-        /**
-         * Sets the angular velocity of the body instantly. Position, angle, force etc. are unchanged. See also `Body.applyForce`.
-         * @method setAngularVelocity
-         * @param {body} body
-         * @param {number} velocity
-         */
-        static setAngularVelocity(body: Body, velocity: number): void;
-
-
-
-        /**
-         * Sets the body as static, including isStatic flag and setting mass and inertia to Infinity.
-         * @method setStatic
-         * @param {body} body
-         * @param {bool} isStatic
-         */
-        static setStatic(body: Body, isStatic: boolean): void;
-
-        /**
-         * Scales the body, including updating physical properties (mass, area, axes, inertia), from a world-space point (default is body centre).
-         * @method scale
-         * @param {body} body
-         * @param {number} scaleX
-         * @param {number} scaleY
-         * @param {vector} [point]
-         */
-        static scale(body: Body, scaleX: number, scaleY: number, point?: Vector): void;
-
-        /**
-         * Moves a body by a given vector relative to its current position, without imparting any velocity.
-         * @method translate
-         * @param {body} body
-         * @param {vector} translation
-         */
-        static translate(body: Body, translation: Vector): void;
-
-        /**
-         * Performs a simulation step for the given `body`, including updating position and angle using Verlet integration.
-         * @method update
-         * @param {body} body
-         * @param {number} deltaTime
-         * @param {number} timeScale
-         * @param {number} correction
-         */
-        static update(body: Body, deltaTime: number, timeScale: number, correction: number): void;
-
-        /**
-         * A `Number` specifying the angle of the body, in radians.
-         *
-        * @property angle
-        * @type number
-        * @default 0
-        */
-        angle: number;
-        /**
-         * A `Number` that _measures_ the current angular speed of the body after the last `Body.update`. It is read-only and always positive (it's the magnitude of `body.angularVelocity`).
-         *
-        * @readOnly
-        * @property angularSpeed
-        * @type number
-        * @default 0
-        */
-        angularSpeed: number;
-        /**
-         * A `Number` that _measures_ the current angular velocity of the body after the last `Body.update`. It is read-only.
-         * If you need to modify a body's angular velocity directly, you should apply a torque or simply change the body's `angle` (as the engine uses position-Verlet integration).
-         *
-        * @readOnly
-        * @property angularVelocity
-        * @type number
-        * @default 0
-        */
-        angularVelocity: number;
-        /**
-         * A `Number` that _measures_ the area of the body's convex hull, calculated at creation by `Body.create`.
-         *
-        * @property area
-        * @type string
-        * @default
-        */
-        area: number;
-        /**
-         * An array of unique axis vectors (edge normals) used for collision detection.
-         * These are automatically calculated from the given convex hull (`vertices` array) in `Body.create`.
-         * They are constantly updated by `Body.update` during the simulation.
-         *
-        * @property axes
-        * @type vector[]
-        */
-        axes: Array<Vector>;
-        /**
-         * A `Bounds` object that defines the AABB region for the body.
-         * It is automatically calculated from the given convex hull (`vertices` array) in `Body.create` and constantly updated by `Body.update` during simulation.
-         *
-        * @property bounds
-        * @type bounds
-        */
-        bounds: Bounds;
-        /**
-         * A `Number` that defines the density of the body, that is its mass per unit area.
-         * If you pass the density via `Body.create` the `mass` property is automatically calculated for you based on the size (area) of the object.
-         * This is generally preferable to simply setting mass and allows for more intuitive definition of materials (e.g. rock has a higher density than wood).
-         *
-        * @property density
-        * @type number
-        * @default 0.001
-        */
-        density: number;
-        /**
-         * A `Vector` that specifies the force to apply in the current step. It is zeroed after every `Body.update`. See also `Body.applyForce`.
-        *
-        * @property force
-        * @type vector
-        * @default { x: 0, y: 0 }
-        */
-        force: Vector;
-        /**
-         * A `Number` that defines the friction of the body. The value is always positive and is in the range `(0, 1)`.
-        * A value of `0` means that the body may slide indefinitely.
-        * A value of `1` means the body may come to a stop almost instantly after a force is applied.
-        *
-        * The effects of the value may be non-linear.
-        * High values may be unstable depending on the body.
-        * The engine uses a Coulomb friction model including static and kinetic friction.
-        * Note that collision response is based on _pairs_ of bodies, and that `friction` values are _combined_ with the following formula:
-        *
-        *     Math.min(bodyA.friction, bodyB.friction)
-        *
-        * @property friction
-        * @type number
-        * @default 0.1
-        */
-        friction: number;
-        /**
-         * A `Number` that defines the air friction of the body (air resistance).
-         * A value of `0` means the body will never slow as it moves through space.
-         * The higher the value, the faster a body slows when moving through space.
-         * The effects of the value are non-linear.
-         *
-        * @property frictionAir
-        * @type number
-        * @default 0.01
-        */
-        frictionAir: number;
-        /**
-         * An integer `Number` uniquely identifying number generated in `Body.create` by `Common.nextId`.
-         *
-        * @property id
-        * @type number
-        */
-        id: number;
-        /**
-         * A `Number` that defines the moment of inertia (i.e. second moment of area) of the body.
-         * It is automatically calculated from the given convex hull (`vertices` array) and density in `Body.create`.
-         * If you modify this value, you must also modify the `body.inverseInertia` property (`1 / inertia`).
-         *
-        * @property inertia
-        * @type number
-        */
-        inertia: number;
-        /**
-         * A `Number` that defines the inverse moment of inertia of the body (`1 / inertia`).
-         * If you modify this value, you must also modify the `body.inertia` property.
-         *
-        * @property inverseInertia
-        * @type number
-        */
-        inverseInertia: number;
-        /**
-         * A `Number` that defines the inverse mass of the body (`1 / mass`).
-         * If you modify this value, you must also modify the `body.mass` property.
-         *
-        * @property inverseMass
-        * @type number
-        */
-        inverseMass: number;
-        /**
-         * A flag that indicates whether the body is considered sleeping. A sleeping body acts similar to a static body, except it is only temporary and can be awoken.
-         * If you need to set a body as sleeping, you should use `Sleeping.set` as this requires more than just setting this flag.
-         *
-        * @property isSleeping
-        * @type boolean
-        * @default false
-        */
-        isSleeping: boolean;
-        /**
-         * A flag that indicates whether a body is considered static. A static body can never change position or angle and is completely fixed.
-         * If you need to set a body as static after its creation, you should use `Body.setStatic` as this requires more than just setting this flag.
-         *
-        * @property isStatic
-        * @type boolean
-        * @default false
-        */
-        isStatic: boolean;
-        /**
-         * An arbitrary `String` name to help the user identify and manage bodies.
-         *
-        * @property label
-        * @type string
-        * @default "Body"
-        */
-
-        label: string;
-        /**
-         * A `Number` that defines the mass of the body, although it may be more appropriate to specify the `density` property instead.
-         * If you modify this value, you must also modify the `body.inverseMass` property (`1 / mass`).
-         *
-        * @property mass
-        * @type number
-        */
-        mass: number;
-        /**
-         * A `Number` that _measures_ the amount of movement a body currently has (a combination of `speed` and `angularSpeed`). It is read-only and always positive.
-        * It is used and updated by the `Matter.Sleeping` module during simulation to decide if a body has come to rest.
-        *
-        * @readOnly
-        * @property motion
-        * @type number
-        * @default 0
-        */
-        motion: number;
-        /**
-         * A `Vector` that specifies the current world-space position of the body.
-         *
-        * @property position
-        * @type vector
-        * @default { x: 0, y:      */
-        position: Vector;
-        /**
-         * An `Object` that defines the rendering properties to be consumed by the module `Matter.Render`.
-        *
-        * @property render
-        * @type object
-        */
-        render: IBodyRenderOptions;
-        /**
-         * A `Number` that defines the restitution (elasticity) of the body. The value is always positive and is in the range `(0, 1)`.
-         * A value of `0` means collisions may be perfectly inelastic and no bouncing may occur.
-         * A value of `0.8` means the body may bounce back with approximately 80% of its kinetic energy.
-         * Note that collision response is based on _pairs_ of bodies, and that `restitution` values are _combined_ with the following formula:
-         *
-        *     Math.max(bodyA.restitution, bodyB.restitution)
-        *
-        * @property restitution
-        * @type number
-        * @default 0
-        */
-        restitution: number;
-        /**
-         * A `Number` that defines the number of updates in which this body must have near-zero velocity before it is set as sleeping by the `Matter.Sleeping` module (if sleeping is enabled by the engine).
-         *
-        * @property sleepThreshold
-        * @type number
-        * @default 60
-        */
-        sleepThreshold: number;
-        /**
-         * A `Number` that specifies a tolerance on how far a body is allowed to 'sink' or rotate into other bodies.
-         * Avoid changing this value unless you understand the purpose of `slop` in physics engines.
-         * The default should generally suffice, although very large bodies may require larger values for stable stacking.
-         *
-        * @property slop
-        * @type number
-        * @default 0.05
-        */
-        slop: number;
-        /**
-         * A `Number` that _measures_ the current speed of the body after the last `Body.update`. It is read-only and always positive (it's the magnitude of `body.velocity`).
-         *
-        * @readOnly
-        * @property speed
-        * @type number
-        * @default 0
-        */
-        speed: number;
-        /**
-         * A `Number` that allows per-body time scaling, e.g. a force-field where bodies inside are in slow-motion, while others are at full speed.
-        *
-        * @property timeScale
-        * @type number
-        * @default 1
-        */
-        timeScale: number;
-        /**
-         * A `Number` that specifies the torque (turning force) to apply in the current step. It is zeroed after every `Body.update`.
-        *
-        * @property torque
-        * @type number
-        * @default 0
-        */
-        torque: number;
-        /**
-         * A `String` denoting the type of object.
-        *
-        * @property type
-        * @type string
-        * @default "body"
-        */
-        type: string;
-        /**
-         * A `Vector` that _measures_ the current velocity of the body after the last `Body.update`. It is read-only.
-         * If you need to modify a body's velocity directly, you should either apply a force or simply change the body's `position` (as the engine uses position-Verlet integration).
-         *
-        * @readOnly
-        * @property velocity
-        * @type vector
-        * @default { x: 0, y: 0 }
-        */
-        velocity: Vector;
-        /**
-         * An array of `Vector` objects that specify the convex hull of the rigid body.
-         * These should be provided about the origin `(0, 0)`. E.g.
-         *
-        *     [{ x: 0, y: 0 }, { x: 25, y: 50 }, { x: 50, y: 0 }]
-        *
-        * When passed via `Body.create`, the vertices are translated relative to `body.position` (i.e. world-space, and constantly updated by `Body.update` during simulation).
-        * The `Vector` objects are also augmented with additional properties required for efficient collision detection.
-        *
-        * Other properties such as `inertia` and `bounds` are automatically calculated from the passed vertices (unless provided via `options`).
-        * Concave hulls are not currently supported. The module `Matter.Vertices` contains useful methods for working with vertices.
-        *
-        * @property vertices
-        * @type vector[]
-        */
-        vertices: Array<Vector>;
-        /**
-         * An array of bodies that make up this body.
-         * The first body in the array must always be a self reference to the current body instance.
-         * All bodies in the `parts` array together form a single rigid compound body.
-         * Parts are allowed to overlap, have gaps or holes or even form concave bodies.
-         * Parts themselves should never be added to a `World`, only the parent body should be.
-         * Use `Body.setParts` when setting parts to ensure correct updates of all properties.
-         *
-        * @property parts
-        * @type body[]
-        */
-        parts: Array<Body>;
-        /**
-         * A self reference if the body is _not_ a part of another body.
-         * Otherwise this is a reference to the body that this is a part of.
-         * See `body.parts`.
-         *
-        * @property parent
-        * @type body
-        */
-        parent: Body;
-        /**
-         * A `Number` that defines the static friction of the body (in the Coulomb friction model).
-         * A value of `0` means the body will never 'stick' when it is nearly stationary and only dynamic `friction` is used.
-         * The higher the value (e.g. `10`), the more force it will take to initially get the body moving when nearly stationary.
-         * This value is multiplied with the `friction` property to make it easier to change `friction` and maintain an appropriate amount of static friction.
-         *
-        * @property frictionStatic
-        * @type number
-        * @default 0.5
-        */
-        frictionStatic: number;
-        /**
-         * An `Object` that specifies the collision filtering properties of this body.
-         *
-        * Collisions between two bodies will obey the following rules:
-        * - If the two bodies have the same non-zero value of `collisionFilter.group`,
-        *   they will always collide if the value is positive, and they will never collide
-        *   if the value is negative.
-        * - If the two bodies have different values of `collisionFilter.group` or if one
-        *   (or both) of the bodies has a value of 0, then the category/mask rules apply as follows:
-        *
-        * Each body belongs to a collision category, given by `collisionFilter.category`. This
-        * value is used as a bit field and the category should have only one bit set, meaning that
-        * the value of this property is a power of two in the range [1, 2^31]. Thus, there are 32
-        * different collision categories available.
-        *
-        * Each body also defines a collision bitmask, given by `collisionFilter.mask` which specifies
-        * the categories it collides with (the value is the bitwise AND value of all these categories).
-        *
-        * Using the category/mask rules, two bodies `A` and `B` collide if each includes the other's
-        * category in its mask, i.e. `(categoryA & maskB) !== 0` and `(categoryB & maskA) !== 0`
-        * are both true.
-        *
-        * @property collisionFilter
-        * @type object
-        */
-        collisionFilter: ICollisionFilter;
-
-    }
-
-    export interface IBound {
-        min: { x: number, y: number }
-        max: { x: number, y: number }
-    }
-
-    /**
-    * Internal Class, not generally used outside of the engine's internals.
-    * The `Matter.Bounds` module contains methods for creating and manipulating axis-aligned bounding boxes (AABB).
-    *
-    * @class Bounds
-    */
-    export class Bounds {
-
-    }
-
-    export interface ICompositeDefinition {
-        /**
-         * An array of `Body` that are _direct_ children of this composite.
-         * To add or remove bodies you should use `Composite.add` and `Composite.remove` methods rather than directly modifying this property.
-         * If you wish to recursively find all descendants, you should use the `Composite.allBodies` method.
-         *
-        * @property bodies
-        * @type body[]
-        * @default []
-        */
-        bodies?: Array<Body>;
-
-        /**
-         * An array of `Composite` that are _direct_ children of this composite.
-         * To add or remove composites you should use `Composite.add` and `Composite.remove` methods rather than directly modifying this property.
-         * If you wish to recursively find all descendants, you should use the `Composite.allComposites` method.
-         *
-        * @property composites
-        * @type composite[]
-        * @default []
-        */
-        composites?: Array<Composite>;
-
-        /**
-         * An array of `Constraint` that are _direct_ children of this composite.
-         * To add or remove constraints you should use `Composite.add` and `Composite.remove` methods rather than directly modifying this property.
-         * If you wish to recursively find all descendants, you should use the `Composite.allConstraints` method.
-         *
-        * @property constraints
-        * @type constraint[]
-        * @default []
-        */
-        constraints?: Array<Constraint>;
-
-        /**
-         * An integer `Number` uniquely identifying number generated in `Composite.create` by `Common.nextId`.
-         *
-        * @property id
-        * @type number
-        */
-        id?: number;
-
-        /**
-         * A flag that specifies whether the composite has been modified during the current step.
-         * Most `Matter.Composite` methods will automatically set this flag to `true` to inform the engine of changes to be handled.
-         * If you need to change it manually, you should use the `Composite.setModified` method.
-         *
-        * @property isModified
-        * @type boolean
-        * @default false
-        */
-        isModified?: boolean;
-
-        /**
-         * An arbitrary `String` name to help the user identify and manage composites.
-         *
-        * @property label
-        * @type string
-        * @default "Composite"
-        */
-        label?: string;
-
-        /**
-        * The `Composite` that is the parent of this composite. It is automatically managed by the `Matter.Composite` methods.
-        *
-        * @property parent
-        * @type composite
-        * @default null
-        */
-        parent?: Composite;
-
-        /**
-         * A `String` denoting the type of object.
-         *
-        * @property type
-        * @type string
-        * @default "composite"
-        */
-        type?: String;
-    }
-
-    /**
-    * The `Matter.Composite` module contains methods for creating and manipulating composite bodies.
-    * A composite body is a collection of `Matter.Body`, `Matter.Constraint` and other `Matter.Composite`, therefore composites form a tree structure.
-    * It is important to use the functions in this module to modify composites, rather than directly modifying their properties.
-    * Note that the `Matter.World` object is also a type of `Matter.Composite` and as such all composite methods here can also operate on a `Matter.World`.
-    *
-    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
-    *
-    * @class Composite
-    */
-    export class Composite {
-        /**
-         * Generic add function. Adds one or many body(s), constraint(s) or a composite(s) to the given composite.
-         * Triggers `beforeAdd` and `afterAdd` events on the `composite`.
-         * @method add
-         * @param {composite} composite
-         * @param {} object
-         * @return {composite} The original composite with the objects added
-         */
-        static add(composite: Composite, object: Body | Composite | Constraint): Composite;
-
-        /**
-         * Returns all bodies in the given composite, including all bodies in its children, recursively.
-         * @method allBodies
-         * @param {composite} composite
-         * @return {body[]} All the bodies
-         */
-        static allBodies(composite: Composite): Array<Body>;
-
-        /**
-         * Returns all composites in the given composite, including all composites in its children, recursively.
-         * @method allComposites
-         * @param {composite} composite
-         * @return {composite[]} All the composites
-         */
-        static allComposites(composite: Composite): Array<Composite>;
-
-        /**
-         * Returns all constraints in the given composite, including all constraints in its children, recursively.
-         * @method allConstraints
-         * @param {composite} composite
-         * @return {constraint[]} All the constraints
-         */
-        static allConstraints(composite: Composite): Array<Composite>;
-
-        /**
-         * Removes all bodies, constraints and composites from the given composite.
-         * Optionally clearing its children recursively.
-         * @method clear
-         * @param {composite} composite
-         * @param {boolean} keepStatic
-         * @param {boolean} [deep=false]
-         */
-        static clear(composite: Composite, keepStatic: boolean, deep?: boolean): void;
-
-        /**
-         * Creates a new composite. The options parameter is an object that specifies any properties you wish to override the defaults.
-        * See the properites section below for detailed information on what you can pass via the `options` object.
-        * @method create
-        * @param {} [options]
-        * @return {composite} A new composite
-        */
-        static create(options?: ICompositeDefinition): Composite;
-
-        /**
-         * Searches the composite recursively for an object matching the type and id supplied, null if not found.
-         * @method get
-         * @param {composite} composite
-         * @param {number} id
-         * @param {string} type
-         * @return {object} The requested object, if found
-         */
-        static get(composite: Composite, id: number, type: string): Body | Composite | Constraint;
-
-        /**
-         * Moves the given object(s) from compositeA to compositeB (equal to a remove followed by an add).
-         * @method move
-         * @param {compositeA} compositeA
-         * @param {object[]} objects
-         * @param {compositeB} compositeB
-         * @return {composite} Returns compositeA
-         */
-        static move(compositeA: Composite, objects: Array<Body | Composite | Constraint>, compositeB: Composite): Composite;
-
-        /**
-         * Assigns new ids for all objects in the composite, recursively.
-         * @method rebase
-         * @param {composite} composite
-         * @return {composite} Returns composite
-         */
-        static rebase(composite: Composite): Composite;
-
-        /**
-         * Generic remove function. Removes one or many body(s), constraint(s) or a composite(s) to the given composite.
-         * Optionally searching its children recursively.
-         * Triggers `beforeRemove` and `afterRemove` events on the `composite`.
-         * @method remove
-         * @param {composite} composite
-         * @param {} object
-         * @param {boolean} [deep=false]
-         * @return {composite} The original composite with the objects removed
-         */
-        static remove(composite: Composite, object: Body | Composite | Constraint, deep?: boolean): Composite;
-
-
-
-        /**
-         * Sets the composite's `isModified` flag.
-         * If `updateParents` is true, all parents will be set (default: false).
-         * If `updateChildren` is true, all children will be set (default: false).
-         * @method setModified
-         * @param {composite} composite
-         * @param {boolean} isModified
-         * @param {boolean} [updateParents=false]
-         * @param {boolean} [updateChildren=false]
-         */
-        static setModified(composite: Composite, isModified: boolean, updateParents?: boolean, updateChildren?: boolean): void;
-        /**
-         * Translates all children in the composite by a given vector relative to their current positions,
-         * without imparting any velocity.
-         * @method translate
-         * @param {composite} composite
-         * @param {vector} translation
-         * @param {bool} [recursive=true]
-         */
-        static translate(composite: Composite, translation: Vector, recursive?: boolean): void;
-        /**
-         * Rotates all children in the composite by a given angle about the given point, without imparting any angular velocity.
-         * @method rotate
-         * @param {composite} composite
-         * @param {number} rotation
-         * @param {vector} point
-         * @param {bool} [recursive=true]
-         */
-        static rotate(composite: Composite, rotation: number, point: Vector, recursive?: boolean): void;
-        /**
-         * Scales all children in the composite, including updating physical properties (mass, area, axes, inertia), from a world-space point.
-         * @method scale
-         * @param {composite} composite
-         * @param {number} scaleX
-         * @param {number} scaleY
-         * @param {vector} point
-         * @param {bool} [recursive=true]
-         */
-        static scale(composite: Composite, scaleX: number, scaleY: number, point: Vector, recursive?: boolean): void;
-
-
-        /**
-         * An array of `Body` that are _direct_ children of this composite.
-         * To add or remove bodies you should use `Composite.add` and `Composite.remove` methods rather than directly modifying this property.
-         * If you wish to recursively find all descendants, you should use the `Composite.allBodies` method.
-         *
-        * @property bodies
-        * @type body[]
-        * @default []
-        */
-        bodies: Array<Body>;
-
-        /**
-         * An array of `Composite` that are _direct_ children of this composite.
-         * To add or remove composites you should use `Composite.add` and `Composite.remove` methods rather than directly modifying this property.
-         * If you wish to recursively find all descendants, you should use the `Composite.allComposites` method.
-         *
-        * @property composites
-        * @type composite[]
-        * @default []
-        */
-        composites: Array<Composite>;
-
-        /**
-         * An array of `Constraint` that are _direct_ children of this composite.
-         * To add or remove constraints you should use `Composite.add` and `Composite.remove` methods rather than directly modifying this property.
-         * If you wish to recursively find all descendants, you should use the `Composite.allConstraints` method.
-         *
-        * @property constraints
-        * @type constraint[]
-        * @default []
-        */
-        constraints: Array<Constraint>;
-
-        /**
-         * An integer `Number` uniquely identifying number generated in `Composite.create` by `Common.nextId`.
-         *
-        * @property id
-        * @type number
-        */
-        id: number;
-
-        /**
-         * A flag that specifies whether the composite has been modified during the current step.
-        * Most `Matter.Composite` methods will automatically set this flag to `true` to inform the engine of changes to be handled.
-        * If you need to change it manually, you should use the `Composite.setModified` method.
-        *
-        * @property isModified
-        * @type boolean
-        * @default false
-        */
-        isModified: boolean;
-
-        /**
-         * An arbitrary `String` name to help the user identify and manage composites.
-         *
-        * @property label
-        * @type string
-        * @default "Composite"
-        */
-        label: string;
-
-        /**
-         * The `Composite` that is the parent of this composite. It is automatically managed by the `Matter.Composite` methods.
-         *
-        * @property parent
-        * @type composite
-        * @default null
-        */
-        parent: Composite;
-
-        /**
-         * A `String` denoting the type of object.
-         *
-        * @property type
-        * @type string
-        * @default "composite"
-        */
-        type: String;
-
-    }
-
-    /**
-    * The `Matter.Composites` module contains factory methods for creating composite bodies
-    * with commonly used configurations (such as stacks and chains).
-    *
-    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
-    *
-    * @class Composites
-    */
-    export class Composites {
-        /**
-         * Creates a composite with simple car setup of bodies and constraints.
-         * @method car
-         * @param {number} xx
-         * @param {number} yy
-         * @param {number} width
-         * @param {number} height
-         * @param {number} wheelSize
-         * @return {composite} A new composite car body
-         */
-        static car(xx: number, yy: number, width: number, height: number, wheelSize: number): Composite;
-
-        /**
-         * Chains all bodies in the given composite together using constraints.
-         * @method chain
-         * @param {composite} composite
-         * @param {number} xOffsetA
-         * @param {number} yOffsetA
-         * @param {number} xOffsetB
-         * @param {number} yOffsetB
-         * @param {object} options
-         * @return {composite} A new composite containing objects chained together with constraints
-         */
-        static chain(composite: Composite, xOffsetA: number, yOffsetA: number, xOffsetB: number, yOffsetB: number, options: any): Composite;
-
-        /**
-         * Connects bodies in the composite with constraints in a grid pattern, with optional cross braces.
-         * @method mesh
-         * @param {composite} composite
-         * @param {number} columns
-         * @param {number} rows
-         * @param {boolean} crossBrace
-         * @param {object} options
-         * @return {composite} The composite containing objects meshed together with constraints
-         */
-        static mesh(composite: Composite, columns: number, rows: number, crossBrace: boolean, options: any): Composite;
-
-        /**
-         * Creates a composite with a Newton's Cradle setup of bodies and constraints.
-         * @method newtonsCradle
-         * @param {number} xx
-         * @param {number} yy
-         * @param {number} number
-         * @param {number} size
-         * @param {number} length
-         * @return {composite} A new composite newtonsCradle body
-         */
-        newtonsCradle(xx: number, yy: number, _number: number, size: number, length: number): Composite;
-
-        /**
-         * Create a new composite containing bodies created in the callback in a pyramid arrangement.
-        * This function uses the body's bounds to prevent overlaps.
-        * @method pyramid
-        * @param {number} xx
-        * @param {number} yy
-        * @param {number} columns
-        * @param {number} rows
-        * @param {number} columnGap
-        * @param {number} rowGap
-        * @param {function} callback
-        * @return {composite} A new composite containing objects created in the callback
-        */
-        static pyramid(xx: number, yy: number, columns: number, rows: number, columnGap: number, rowGap: number, callback: Function): Composite;
-
-        /**
-         * Creates a simple soft body like object.
-         * @method softBody
-         * @param {number} xx
-         * @param {number} yy
-         * @param {number} columns
-         * @param {number} rows
-         * @param {number} columnGap
-         * @param {number} rowGap
-         * @param {boolean} crossBrace
-         * @param {number} particleRadius
-         * @param {} particleOptions
-         * @param {} constraintOptions
-         * @return {composite} A new composite softBody
-         */
-        static softBody(xx: number, yy: number, columns: number, rows: number, columnGap: number, rowGap: number, crossBrace: boolean, particleRadius: number, particleOptions: any, constraintOptions: any): Composite;
-
-        /**
-         * Create a new composite containing bodies created in the callback in a grid arrangement.
-         * This function uses the body's bounds to prevent overlaps.
-         * @method stack
-         * @param {number} xx
-         * @param {number} yy
-         * @param {number} columns
-         * @param {number} rows
-         * @param {number} columnGap
-         * @param {number} rowGap
-         * @param {function} callback
-         * @return {composite} A new composite containing objects created in the callback
-         */
-        static stack(xx: number, yy: number, columns: number, rows: number, columnGap: number, rowGap: number, callback: Function): Composite;
-    }
-
-    export interface IConstraintDefinition {
-        /**
-         * The first possible `Body` that this constraint is attached to.
-         *
-        * @property bodyA
-        * @type body
-        * @default null
-        */
-        bodyA?: Body;
-
-        /**
-         * The second possible `Body` that this constraint is attached to.
-         *
-        * @property bodyB
-        * @type body
-        * @default null
-        */
-        bodyB?: Body;
-
-        /**
-         * An integer `Number` uniquely identifying number generated in `Composite.create` by `Common.nextId`.
-         *
-        * @property id
-        * @type number
-        */
-        id?: number;
-
-        /**
-         * An arbitrary `String` name to help the user identify and manage bodies.
-         *
-        * @property label
-        * @type string
-        * @default "Constraint"
-        */
-        label?: string;
-
-        /**
-         * A `Number` that specifies the target resting length of the constraint.
-         * It is calculated automatically in `Constraint.create` from initial positions of the `constraint.bodyA` and `constraint.bodyB`.
-         *
-        * @property length
-        * @type number
-        */
-        length?: number;
-
-        /**
-         * A `Vector` that specifies the offset of the constraint from center of the `constraint.bodyA` if defined, otherwise a world-space position.
-         *
-        * @property pointA
-        * @type vector
-        * @default { x: 0, y: 0 }
-        */
-        pointA?: Vector;
-
-        /**
-         * A `Vector` that specifies the offset of the constraint from center of the `constraint.bodyA` if defined, otherwise a world-space position.
-         *
-        * @property pointB
-        * @type vector
-        * @default { x: 0, y: 0 }
-        */
-        pointB?: Vector;
-
-        /**
-         * An `Object` that defines the rendering properties to be consumed by the module `Matter.Render`.
-         *
-        * @property render
-        * @type object
-        */
-        render?: IConstraintRenderDefinition;
-
-        /**
-         * A `Number` that specifies the stiffness of the constraint, i.e. the rate at which it returns to its resting `constraint.length`.
-         * A value of `1` means the constraint should be very stiff.
-         * A value of `0.2` means the constraint acts like a soft spring.
-         *
-        * @property stiffness
-        * @type number
-        * @default 1
-        */
-        stiffness?: number;
-
-        /**
-         * A `String` denoting the type of object.
-         *
-        * @property type
-        * @type string
-        * @default "constraint"
-        */
-        type?: string;
-    }
-
-    export interface IConstraintRenderDefinition {
-        /**
-         * A `Number` that defines the line width to use when rendering the constraint outline.
-         * A value of `0` means no outline will be rendered.
-         *
-        * @property render.lineWidth
-        * @type number
-        * @default 2
-        */
-        lineWidth: number;
-
-        /**
-         * A `String` that defines the stroke style to use when rendering the constraint outline.
-         * It is the same as when using a canvas, so it accepts CSS style property values.
-         *
-        * @property render.strokeStyle
-        * @type string
-        * @default a random colour
-        */
-        strokeStyle: string;
-
-        /**
-         * A flag that indicates if the constraint should be rendered.
-         *
-        * @property render.visible
-        * @type boolean
-        * @default true
-        */
-        visible: boolean;
-    }
-
-
-    /**
-    * The `Matter.Constraint` module contains methods for creating and manipulating constraints.
-    * Constraints are used for specifying that a fixed distance must be maintained between two bodies (or a body and a fixed world-space position).
-    * The stiffness of constraints can be modified to create springs or elastic.
-    *
-    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
-    *
-    * @class Constraint
-    */
-    export class Constraint {
-        /**
-         * Creates a new constraint.
-         * All properties have default values, and many are pre-calculated automatically based on other properties.
-         * See the properties section below for detailed information on what you can pass via the `options` object.
-         * @method create
-         * @param {} options
-         * @return {constraint} constraint
-         */
-        static create(options: IConstraintDefinition): Constraint;
-
-        /**
-         * The first possible `Body` that this constraint is attached to.
-         *
-        * @property bodyA
-        * @type body
-        * @default null
-        */
-        bodyA: Body;
-
-        /**
-         * The second possible `Body` that this constraint is attached to.
-         *
-        * @property bodyB
-        * @type body
-        * @default null
-        */
-        bodyB: Body;
-
-        /**
-         * An integer `Number` uniquely identifying number generated in `Composite.create` by `Common.nextId`.
-         *
-        * @property id
-        * @type number
-        */
-        id: number;
-
-        /**
-         * An arbitrary `String` name to help the user identify and manage bodies.
-         *
-        * @property label
-        * @type string
-        * @default "Constraint"
-        */
-        label: string;
-
-        /**
-         * A `Number` that specifies the target resting length of the constraint.
-         * It is calculated automatically in `Constraint.create` from initial positions of the `constraint.bodyA` and `constraint.bodyB`.
-         *
-        * @property length
-        * @type number
-        */
-        length: number;
-
-        /**
-         * A `Vector` that specifies the offset of the constraint from center of the `constraint.bodyA` if defined, otherwise a world-space position.
-         *
-        * @property pointA
-        * @type vector
-        * @default { x: 0, y: 0 }
-        */
-        pointA: Vector;
-
-        /**
-         * A `Vector` that specifies the offset of the constraint from center of the `constraint.bodyA` if defined, otherwise a world-space position.
-         *
-        * @property pointB
-        * @type vector
-        * @default { x: 0, y: 0 }
-        */
-        pointB: Vector;
-
-        /**
-         * An `Object` that defines the rendering properties to be consumed by the module `Matter.Render`.
-         *
-        * @property render
-        * @type object
-        */
-        render: IConstraintRenderDefinition;
-
-        /**
-         * A `Number` that specifies the stiffness of the constraint, i.e. the rate at which it returns to its resting `constraint.length`.
-         * A value of `1` means the constraint should be very stiff.
-         * A value of `0.2` means the constraint acts like a soft spring.
-         *
-        * @property stiffness
-        * @type number
-        * @default 1
-        */
-        stiffness: number;
-
-        /**
-         * A `String` denoting the type of object.
-         *
-        * @property type
-        * @type string
-        * @default "constraint"
-        */
-        type: string;
-    }
-
-
-
-    export interface IEngineDefinition {
-        /**
-         * An integer `Number` that specifies the number of position iterations to perform each update.
-         * The higher the value, the higher quality the simulation will be at the expense of performance.
-         *
-        * @property positionIterations
-        * @type number
-        * @default 6
-        */
-        positionIterations?: number;
-        /**
-         * An integer `Number` that specifies the number of velocity iterations to perform each update.
-         * The higher the value, the higher quality the simulation will be at the expense of performance.
-         *
-        * @property velocityIterations
-        * @type number
-        * @default 4
-        */
-        velocityIterations?: number;
-        /**
-         * An integer `Number` that specifies the number of constraint iterations to perform each update.
-         * The higher the value, the higher quality the simulation will be at the expense of performance.
-         * The default value of `2` is usually very adequate.
-         *
-        * @property constraintIterations
-        * @type number
-        * @default 2
-        */
-        constraintIterations?: number;
-
-        /**
-         * A flag that specifies whether the engine should allow sleeping via the `Matter.Sleeping` module.
-         * Sleeping can improve stability and performance, but often at the expense of accuracy.
-         *
-        * @property enableSleeping
-        * @type boolean
-        * @default false
-        */
-        enableSleeping?: boolean;
-        /**
-         * An `Object` containing properties regarding the timing systems of the engine.
-        *
-        * @property timing
-        * @type object
-        */
-        timing?: IEngineTimingOptions;
-        /**
-         * An instance of a broadphase controller. The default value is a `Matter.Grid` instance created by `Engine.create`.
-         *
-        * @property broadphase
-        * @type grid
-        * @default a Matter.Grid instance
-        */
-        grid?: Grid;
-        /**
-         * A `World` composite object that will contain all simulated bodies and constraints.
-         *
-        * @property world
-        * @type world
-        * @default a Matter.World instance
-        */
-        world?: World;
-
-    }
-
-    export interface IEngineTimingOptions {
-        /**
-         * A `Number` that specifies the global scaling factor of time for all bodies.
-         * A value of `0` freezes the simulation.
-         * A value of `0.1` gives a slow-motion effect.
-         * A value of `1.2` gives a speed-up effect.
-         *
-        * @property timing.timeScale
-        * @type number
-        * @default 1
-        */
-        timeScale: number;
-
-        /**
-         * A `Number` that specifies the current simulation-time in milliseconds starting from `0`.
-         * It is incremented on every `Engine.update` by the given `delta` argument.
-         *
-        * @property timing.timestamp
-        * @type number
-        * @default 0
-        */
-        timestamp: number;
-    }
-
-    /**
-    * The `Matter.Engine` module contains methods for creating and manipulating engines.
-    * An engine is a controller that manages updating the simulation of the world.
-    * See `Matter.Runner` for an optional game loop utility.
-    *
-    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
-    *
-    * @class Engine
-    */
-    export class Engine {
-        /**
-         * Clears the engine including the world, pairs and broadphase.
-         * @method clear
-         * @param {engine} engine
-         */
-        static clear(engine: Engine): void;
-
-        /**
-         * Creates a new engine. The options parameter is an object that specifies any properties you wish to override the defaults.
-         * All properties have default values, and many are pre-calculated automatically based on other properties.
-         * See the properties section below for detailed information on what you can pass via the `options` object.
-         * @method create
-         * @param {HTMLElement} element
-         * @param {object} [options]
-         * @return {engine} engine
-         */
-        static create(element?: HTMLElement | IEngineDefinition, options?: IEngineDefinition): Engine;
-
-        /**
-         * Merges two engines by keeping the configuration of `engineA` but replacing the world with the one from `engineB`.
-         * @method merge
-         * @param {engine} engineA
-         * @param {engine} engineB
-         */
-        static merge(engineA: Engine, engineB: Engine): void;
-
-
-        /**
-         * Moves the simulation forward in time by `delta` ms.
-         * The `correction` argument is an optional `Number` that specifies the time correction factor to apply to the update.
-         * This can help improve the accuracy of the simulation in cases where `delta` is changing between updates.
-         * The value of `correction` is defined as `delta / lastDelta`, i.e. the percentage change of `delta` over the last step.
-         * Therefore the value is always `1` (no correction) when `delta` constant (or when no correction is desired, which is the default).
-         * See the paper on <a href="http://lonesock.net/article/verlet.html">Time Corrected Verlet</a> for more information.
-         *
-        * Triggers `beforeUpdate` and `afterUpdate` events.
-        * Triggers `collisionStart`, `collisionActive` and `collisionEnd` events.
-        * @method update
-        * @param {engine} engine
-        * @param {number} delta
-        * @param {number} [correction]
-        */
-        static update(engine: Engine, delta: number, correction?: number): Engine;
-
-        /**
-         * An alias for `Runner.run`, see `Matter.Runner` for more information.
-         * @method run
-         * @param {engine} engine
-         */
-        static run(enige: Engine): void;
-
-        /**
-         * An instance of a broadphase controller. The default value is a `Matter.Grid` instance created by `Engine.create`.
-         *
-        * @property broadphase
-        * @type grid
-        * @default a Matter.Grid instance
-        */
-        broadphase: Grid;
-        /**
-         * An integer `Number` that specifies the number of constraint iterations to perform each update.
-         * The higher the value, the higher quality the simulation will be at the expense of performance.
-         * The default value of `2` is usually very adequate.
-         *
-        * @property constraintIterations
-        * @type number
-        * @default 2
-        */
-        constraintIterations: number;
-
-        /**
-         * A flag that specifies whether the engine is running or not.
-         */
-        enabled: boolean;
-
-        /**
-         * A flag that specifies whether the engine should allow sleeping via the `Matter.Sleeping` module.
-         * Sleeping can improve stability and performance, but often at the expense of accuracy.
-         *
-        * @property enableSleeping
-        * @type boolean
-        * @default false
-        */
-        enableSleeping: boolean;
-
-        /**
-         * An integer `Number` that specifies the number of position iterations to perform each update.
-         * The higher the value, the higher quality the simulation will be at the expense of performance.
-         *
-        * @property positionIterations
-        * @type number
-        * @default 6
-        */
-        positionIterations: number;
-
-        /**
-         * An instance of a `Render` controller. The default value is a `Matter.Render` instance created by `Engine.create`.
-         * One may also develop a custom renderer module based on `Matter.Render` and pass an instance of it to `Engine.create` via `options.render`.
-         *
-        * A minimal custom renderer object must define at least three functions: `create`, `clear` and `world` (see `Matter.Render`).
-        * It is also possible to instead pass the _module_ reference via `options.render.controller` and `Engine.create` will instantiate one for you.
-        *
-        * @property render
-        * @type render
-        * @default a Matter.Render instance
-        */
-        render: Render;
-
-        /**
-         * An `Object` containing properties regarding the timing systems of the engine.
-         *
-        * @property timing
-        * @type object
-        */
-        timing: IEngineTimingOptions;
-
-        /**
-         * An integer `Number` that specifies the number of velocity iterations to perform each update.
-         * The higher the value, the higher quality the simulation will be at the expense of performance.
-         *
-        * @property velocityIterations
-        * @type number
-        * @default 4
-        */
-        velocityIterations: number;
-
-        /**
-         * A `World` composite object that will contain all simulated bodies and constraints.
-         *
-        * @property world
-        * @type world
-        * @default a Matter.World instance
-        */
-        world: World;
-    }
-
-
-    export interface IGridDefinition {
-
-    }
-
-    /**
-    * The `Matter.Grid` module contains methods for creating and manipulating collision broadphase grid structures.
-    *
-    * @class Grid
-    */
-    export class Grid {
-        /**
-         * Creates a new grid.
-         * @method create
-         * @param {} options
-         * @return {grid} A new grid
-         */
-        static create(options?: IGridDefinition): Grid;
-
-        /**
-         * Updates the grid.
-         * @method update
-         * @param {grid} grid
-         * @param {body[]} bodies
-         * @param {engine} engine
-         * @param {boolean} forceUpdate
-         */
-        static update(grid: Grid, bodies: Array<Body>, engine: Engine, forceUpdate: boolean): void;
-
-        /**
-         * Clears the grid.
-         * @method clear
-         * @param {grid} grid
-         */
-        static clear(grid: Grid): void;
-
-    }
-
-    export interface IMouseConstraintDefinition {
-        /**
-         * The `Constraint` object that is used to move the body during interaction.
-         *
-        * @property constraint
-        * @type constraint
-        */
-        constraint?: Constraint;
-
-        /**
-        * An `Object` that specifies the collision filter properties.
-        * The collision filter allows the user to define which types of body this mouse constraint can interact with.
-        * See `body.collisionFilter` for more information.
-        *
-        * @property collisionFilter
-        * @type object
-        */
-        collisionFilter?: ICollisionFilter;
-
-        /**
-         * The `Body` that is currently being moved by the user, or `null` if no body.
-         *
-        * @property body
-        * @type body
-        * @default null
-        */
-        body?: Body;
-
-        /**
-         * The `Mouse` instance in use. If not supplied in `MouseConstraint.create`, one will be created.
-         *
-        * @property mouse
-        * @type mouse
-        * @default mouse
-        */
-        mouse?: Mouse;
-
-        /**
-         * A `String` denoting the type of object.
-         *
-        * @property type
-        * @type string
-        * @default "constraint"
-        */
-
-        type?: string;
-    }
-
-    /**
-    * The `Matter.MouseConstraint` module contains methods for creating mouse constraints.
-    * Mouse constraints are used for allowing user interaction, providing the ability to move bodies via the mouse or touch.
-    *
-    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
-    *
-    * @class MouseConstraint
-    */
-    export class MouseConstraint {
-        /**
-         * Creates a new mouse constraint.
-         * All properties have default values, and many are pre-calculated automatically based on other properties.
-         * See the properties section below for detailed information on what you can pass via the `options` object.
-         * @method create
-         * @param {engine} engine
-         * @param {} options
-         * @return {MouseConstraint} A new MouseConstraint
-         */
-        create(engine: Engine, options: IMouseConstraintDefinition): MouseConstraint;
-
-        /**
-         * The `Constraint` object that is used to move the body during interaction.
-         *
-        * @property constraint
-        * @type constraint
-        */
-        constraint: Constraint;
-
-        /**
-        * An `Object` that specifies the collision filter properties.
-        * The collision filter allows the user to define which types of body this mouse constraint can interact with.
-        * See `body.collisionFilter` for more information.
-        *
-        * @property collisionFilter
-        * @type object
-        */
-        collisionFilter: ICollisionFilter;
-
-        /**
-        * The `Body` that is currently being moved by the user, or `null` if no body.
-        *
-        * @property body
-        * @type body
-        * @default null
-        */
-        body: Body;
-
-        /**
-         * The `Mouse` instance in use. If not supplied in `MouseConstraint.create`, one will be created.
-         *
-        * @property mouse
-        * @type mouse
-        * @default mouse
-        */
-        mouse: Mouse;
-
-        /**
-         * A `String` denoting the type of object.
-         *
-        * @property type
-        * @type string
-        * @default "constraint"
-        */
-
-        type: string;
-    }
-
-    export interface IPair {
-        id: number;
-        bodyA: Body;
-        bodyB: Body;
-        contacts: any;
-        activeContacts: any;
-        separation: number;
-        isActive: boolean;
-        timeCreated: number;
-        timeUpdated: number,
-        inverseMass: number;
-        friction: number;
-        frictionStatic: number;
-        restitution: number;
-        slop: number;
-    }
-
-    /**
-    * The `Matter.Query` module contains methods for performing collision queries.
-    *
-    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
-    *
-    * @class Query
-    */
-    export class Query {
-        /**
-         * Casts a ray segment against a set of bodies and returns all collisions, ray width is optional. Intersection points are not provided.
-         * @method ray
-         * @param {body[]} bodies
-         * @param {vector} startPoint
-         * @param {vector} endPoint
-         * @param {number} [rayWidth]
-         * @return {object[]} Collisions
-         */
-        static ray(bodies: Array<Body>, startPoint: Vector, endPoint: Vector, rayWidth?: number): Array<any>;
-
-        /**
-         * Returns all bodies whose bounds are inside (or outside if set) the given set of bounds, from the given set of bodies.
-         * @method region
-         * @param {body[]} bodies
-         * @param {bounds} bounds
-         * @param {bool} [outside=false]
-         * @return {body[]} The bodies matching the query
-         */
-        static region(bodies: Array<Body>, bounds: Bounds, outside?: boolean): Array<Body>;
-
-        /**
-         * Returns all bodies whose vertices contain the given point, from the given set of bodies.
-         * @method point
-         * @param {body[]} bodies
-         * @param {vector} point
-         * @return {body[]} The bodies matching the query
-         */
-        static point(bodies: Array<Body>, point: Vector): Array<Body>;
-    }
-
-    export interface IRenderDefinition {
-        /**
-         * A back-reference to the `Matter.Render` module.
-         *
-        * @property controller
-        * @type render
-        */
-        controller?: any;
-        /**
-         * A reference to the element where the canvas is to be inserted (if `render.canvas` has not been specified)
-        *
-        * @property element
-        * @type HTMLElement
-        * @default null
-        */
-        element?: HTMLElement;
-        /**
-         * The canvas element to render to. If not specified, one will be created if `render.element` has been specified.
-         *
-        * @property canvas
-        * @type HTMLCanvasElement
-        * @default null
-        */
-        canvas?: HTMLCanvasElement;
-
-        /**
-         * The configuration options of the renderer.
-         *
-        * @property options
-        * @type {}
-        */
-        options?: IRendererOptions;
-
-        /**
-         * A `Bounds` object that specifies the drawing view region.
-         * Rendering will be automatically transformed and scaled to fit within the canvas size (`render.options.width` and `render.options.height`).
-         * This allows for creating views that can pan or zoom around the scene.
-         * You must also set `render.options.hasBounds` to `true` to enable bounded rendering.
-         *
-        * @property bounds
-        * @type bounds
-        */
-        bounds?: Bounds;
-
-        /**
-         * The 2d rendering context from the `render.canvas` element.
-         *
-        * @property context
-        * @type CanvasRenderingContext2D
-        */
-        context?: CanvasRenderingContext2D;
-
-        /**
-         * The sprite texture cache.
-         *
-        * @property textures
-        * @type {}
-        */
-        textures?: any;
-
-
-    }
-
-    export interface IRendererOptions {
-        /**
-         * The target width in pixels of the `render.canvas` to be created.
-         *
-        * @property options.width
-        * @type number
-        * @default 800
-        */
-        width?: number;
-
-        /**
-         * The target height in pixels of the `render.canvas` to be created.
-         *
-        * @property options.height
-        * @type number
-        * @default 600
-        */
-        height?: number;
-
-        /**
-         * A flag that specifies if `render.bounds` should be used when rendering.
-         *
-        * @property options.hasBounds
-        * @type boolean
-        * @default false
-        */
-        hasBounds?: boolean;
-
-
-
-
-    }
-
-    /**
-    * The `Matter.Render` module is the default `render.controller` used by a `Matter.Engine`.
-    * This renderer is HTML5 canvas based and supports a number of drawing options including sprites and viewports.
-    *
-    * It is possible develop a custom renderer module based on `Matter.Render` and pass an instance of it to `Engine.create` via `options.render`.
-    * A minimal custom renderer object must define at least three functions: `create`, `clear` and `world` (see `Matter.Render`).
-    *
-    * See also `Matter.RenderPixi` for an alternate WebGL, scene-graph based renderer.
-    *
-    * @class Render
-    */
-    export class Render {
-        /**
-         * Creates a new renderer. The options parameter is an object that specifies any properties you wish to override the defaults.
-         * All properties have default values, and many are pre-calculated automatically based on other properties.
-         * See the properties section below for detailed information on what you can pass via the `options` object.
-         * @method create
-         * @param {object} [options]
-         * @return {render} A new renderer
-         */
-        static create(options: IRenderDefinition): Render;
-        /**
-         * Sets the pixel ratio of the renderer and updates the canvas.
-         * To automatically detect the correct ratio, pass the string `'auto'` for `pixelRatio`.
-         * @method setPixelRatio
-         * @param {render} render
-         * @param {number} pixelRatio
-         */
-        static setPixelRatio(render: Render, pixelRatio: number): void;
-        /**
-         * Renders the given `engine`'s `Matter.World` object.
-         * This is the entry point for all rendering and should be called every time the scene changes.
-         * @method world
-         * @param {engine} engine
-         */
-        static world(engine: Engine): void;
-
-        /**
-        * A back-reference to the `Matter.Render` module.
-        *
-        * @property controller
-        * @type render
-        */
-        controller: any;
-        /**
-         * A reference to the element where the canvas is to be inserted (if `render.canvas` has not been specified)
-        *
-        * @property element
-        * @type HTMLElement
-        * @default null
-        */
-        element: HTMLElement;
-        /**
-         * The canvas element to render to. If not specified, one will be created if `render.element` has been specified.
-         *
-        * @property canvas
-        * @type HTMLCanvasElement
-        * @default null
-        */
-        canvas: HTMLCanvasElement;
-
-        /**
-         * The configuration options of the renderer.
-         *
-        * @property options
-        * @type {}
-        */
-        options: IRendererOptions;
-
-        /**
-         * A `Bounds` object that specifies the drawing view region.
-         * Rendering will be automatically transformed and scaled to fit within the canvas size (`render.options.width` and `render.options.height`).
-         * This allows for creating views that can pan or zoom around the scene.
-         * You must also set `render.options.hasBounds` to `true` to enable bounded rendering.
-         *
-        * @property bounds
-        * @type bounds
-        */
-        bounds: Bounds;
-
-        /**
-         * The 2d rendering context from the `render.canvas` element.
-         *
-        * @property context
-        * @type CanvasRenderingContext2D
-        */
-        context: CanvasRenderingContext2D;
-
-        /**
-         * The sprite texture cache.
-         *
-        * @property textures
-        * @type {}
-        */
-        textures: any;
-    }
-
-
-
-    export interface IRunnerOptions {
-        /**
-         * A `Boolean` that specifies if the runner should use a fixed timestep (otherwise it is variable).
-         * If timing is fixed, then the apparent simulation speed will change depending on the frame rate (but behaviour will be deterministic).
-         * If the timing is variable, then the apparent simulation speed will be constant (approximately, but at the cost of determininism).
-         *
-        * @property isFixed
-        * @type boolean
-        * @default false
-        */
-        isFixed?: boolean;
-
-        /**
-         * A `Number` that specifies the time step between updates in milliseconds.
-         * If `engine.timing.isFixed` is set to `true`, then `delta` is fixed.
-         * If it is `false`, then `delta` can dynamically change to maintain the correct apparent simulation speed.
-         *
-        * @property delta
-        * @type number
-        * @default 1000 / 60
-        */
-        delta?: number;
-    }
-
-    /**
-    * The `Matter.Runner` module is an optional utility which provides a game loop,
-    * that handles updating and rendering a `Matter.Engine` for you within a browser.
-    * It is intended for demo and testing purposes, but may be adequate for simple games.
-    * If you are using your own game loop instead, then you do not need the `Matter.Runner` module.
-    * Instead just call `Engine.update(engine, delta)` in your own loop.
-    * Note that the method `Engine.run` is an alias for `Runner.run`.
-    *
-    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
-    *
-    * @class Runner
-    */
-    export class Runner {
-        /**
-         * Creates a new Runner. The options parameter is an object that specifies any properties you wish to override the defaults.
-         * @method create
-         * @param {} options
-         */
-        static create(options:IRunnerOptions): Runner;
-        /**
-         * Continuously ticks a `Matter.Engine` by calling `Runner.tick` on the `requestAnimationFrame` event.
-         * @method run
-         * @param {engine} engine
-         */
-        static run(runner: Runner, engine: Engine): Runner;
-        /**
-        * Continuously ticks a `Matter.Engine` by calling `Runner.tick` on the `requestAnimationFrame` event.
-        * @method run
-        * @param {engine} engine
-        */
-        static run(engine: Engine): Runner;
-        /**
-         * A game loop utility that updates the engine and renderer by one step (a 'tick').
-         * Features delta smoothing, time correction and fixed or dynamic timing.
-         * Triggers `beforeTick`, `tick` and `afterTick` events on the engine.
-         * Consider just `Engine.update(engine, delta)` if you're using your own loop.
-         * @method tick
-         * @param {runner} runner
-         * @param {engine} engine
-         * @param {number} time
-         */
-        static tick(runner: Runner, engine: Engine, time: number): void;
-        /**
-         * Ends execution of `Runner.run` on the given `runner`, by canceling the animation frame request event loop.
-         * If you wish to only temporarily pause the engine, see `engine.enabled` instead.
-         * @method stop
-         * @param {runner} runner
-         */
-        static stop(runner: Runner): void;
-        /**
-         * Alias for `Runner.run`.
-        * @method start
-        * @param {runner} runner
-        * @param {engine} engine
-        */
-        static start(runner: Runner, engine: Engine): void;
-
-        /**
-         * A flag that specifies whether the runner is running or not.
-         *
-        * @property enabled
-        * @type boolean
-        * @default true
-        */
-        enabled: boolean;
-
-        /**
-         * A `Boolean` that specifies if the runner should use a fixed timestep (otherwise it is variable).
-         * If timing is fixed, then the apparent simulation speed will change depending on the frame rate (but behaviour will be deterministic).
-         * If the timing is variable, then the apparent simulation speed will be constant (approximately, but at the cost of determininism).
-         *
-        * @property isFixed
-        * @type boolean
-        * @default false
-        */
-        isFixed: boolean;
-
-        /**
-         * A `Number` that specifies the time step between updates in milliseconds.
-         * If `engine.timing.isFixed` is set to `true`, then `delta` is fixed.
-         * If it is `false`, then `delta` can dynamically change to maintain the correct apparent simulation speed.
-         *
-        * @property delta
-        * @type number
-        * @default 1000 / 60
-        */
-        delta: number;
-    }
-
-    /**
-    * The `Matter.Sleeping` module contains methods to manage the sleeping state of bodies.
-    *
-    * @class Sleeping
-    */
-    export class Sleeping {
-        static set(body: Body, isSleeping: boolean): void;
-    }
-
-    /**
-    * The `Matter.Svg` module contains methods for converting SVG images into an array of vector points.
-    *
-    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
-    *
-    * @class Svg
-    */
-    export class Svg {
-        /**
-         * Converts an SVG path into an array of vector points.
-         * If the input path forms a concave shape, you must decompose the result into convex parts before use.
-         * See `Bodies.fromVertices` which provides support for this.
-         * Note that this function is not guaranteed to support complex paths (such as those with holes).
-         * @method pathToVertices
-         * @param {SVGPathElement} path
-         * @param {Number} [sampleLength=15]
-         * @return {Vector[]} points
-         */
-        static pathToVertices(path: SVGPathElement, sampleLength: number): Array<Vector>;
-    }
-
-    /**
-    * The `Matter.Vector` module contains methods for creating and manipulating vectors.
-    * Vectors are the basis of all the geometry related operations in the engine.
-    * A `Matter.Vector` object is of the form `{ x: 0, y: 0 }`.
-    *
-    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
-    *
-    * @class Vector
-    */
-    export class Vector {
-
-        x: number;
-        y: number;
-
-        /**
-         * Creates a new vector.
-         * @method create
-         * @param {number} x
-         * @param {number} y
-         * @return {vector} A new vector
-         */
-        static create(x?: number, y?: number): Vector;
-
-        /**
-         * Returns a new vector with `x` and `y` copied from the given `vector`.
-         * @method clone
-         * @param {vector} vector
-         * @return {vector} A new cloned vector
-         */
-        static clone(vector: Vector): Vector;
-
-
-        /**
-         * Returns the cross-product of three vectors.
-         * @method cross3
-         * @param {vector} vectorA
-         * @param {vector} vectorB
-         * @param {vector} vectorC
-         * @return {number} The cross product of the three vectors
-         */
-        static cross3(vectorA: Vector, vectorB: Vector, vectorC: Vector):number;
-
-        /**
-         * Adds the two vectors.
-         * @method add
-         * @param {vector} vectorA
-         * @param {vector} vectorB
-         * @param {vector} [output]
-         * @return {vector} A new vector of vectorA and vectorB added
-         */
-        static add(vectorA: Vector, vectorB: Vector, output?: Vector): Vector;
-
-        /**
-         * Returns the angle in radians between the two vectors relative to the x-axis.
-         * @method angle
-         * @param {vector} vectorA
-         * @param {vector} vectorB
-         * @return {number} The angle in radians
-         */
-        static angle(vectorA: Vector, vectorB: Vector): number;
-
-        /**
-         * Returns the cross-product of two vectors.
-         * @method cross
-         * @param {vector} vectorA
-         * @param {vector} vectorB
-         * @return {number} The cross product of the two vectors
-         */
-        static cross(vectorA: Vector, vectorB: Vector): number;
-
-        /**
-         * Divides a vector and a scalar.
-         * @method div
-         * @param {vector} vector
-         * @param {number} scalar
-         * @return {vector} A new vector divided by scalar
-         */
-        static div(vector: Vector, scalar: number): Vector;
-
-        /**
-         * Returns the dot-product of two vectors.
-         * @method dot
-         * @param {vector} vectorA
-         * @param {vector} vectorB
-         * @return {number} The dot product of the two vectors
-         */
-        static dot(vectorA: Vector, vectorB: Vector): Number;
-
-        /**
-         * Returns the magnitude (length) of a vector.
-         * @method magnitude
-         * @param {vector} vector
-         * @return {number} The magnitude of the vector
-         */
-        static magnitude(vector: Vector): number;
-
-        /**
-         * Returns the magnitude (length) of a vector (therefore saving a `sqrt` operation).
-         * @method magnitudeSquared
-         * @param {vector} vector
-         * @return {number} The squared magnitude of the vector
-         */
-        static magnitudeSquared(vector: Vector): number;
-
-        /**
-         * Multiplies a vector and a scalar.
-         * @method mult
-         * @param {vector} vector
-         * @param {number} scalar
-         * @return {vector} A new vector multiplied by scalar
-         */
-        static mult(vector: Vector, scalar: number): Vector;
-
-        /**
-         * Negates both components of a vector such that it points in the opposite direction.
-         * @method neg
-         * @param {vector} vector
-         * @return {vector} The negated vector
-         */
-        static neg(vector: Vector): Vector;
-
-        /**
-         * Normalises a vector (such that its magnitude is `1`).
-         * @method normalise
-         * @param {vector} vector
-         * @return {vector} A new vector normalised
-         */
-        static normalise(vector: Vector): Vector;
-
-        /**
-         * Returns the perpendicular vector. Set `negate` to true for the perpendicular in the opposite direction.
-         * @method perp
-         * @param {vector} vector
-         * @param {bool} [negate=false]
-         * @return {vector} The perpendicular vector
-         */
-        static perp(vector: Vector, negate?: boolean): Vector;
-
-        /**
-         * Rotates the vector about (0, 0) by specified angle.
-         * @method rotate
-         * @param {vector} vector
-         * @param {number} angle
-         * @return {vector} A new vector rotated about (0, 0)
-         */
-        static rotate(vector: Vector, angle: number): Vector;
-
-        /**
-         * Rotates the vector about a specified point by specified angle.
-         * @method rotateAbout
-         * @param {vector} vector
-         * @param {number} angle
-         * @param {vector} point
-         * @param {vector} [output]
-         * @return {vector} A new vector rotated about the point
-         */
-        static rotateAbout(vector: Vector, angle: number, point: Vector, output?: Vector): Vector;
-
-        /**
-         * Subtracts the two vectors.
-         * @method sub
-         * @param {vector} vectorA
-         * @param {vector} vectorB
-         * @param {vector} [output]
-         * @return {vector} A new vector of vectorA and vectorB subtracted
-         */
-        static sub(vectorA: Vector, vectorB: Vector, optional?: Vector): Vector;
-    }
-
-    /**
-    * The `Matter.Vertices` module contains methods for creating and manipulating sets of vertices.
-    * A set of vertices is an array of `Matter.Vector` with additional indexing properties inserted by `Vertices.create`.
-    * A `Matter.Body` maintains a set of vertices to represent the shape of the object (its convex hull).
-    *
-    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
-    *
-    * @class Vertices
-    */
-    export class Vertices {
-        /**
-         * Returns the average (mean) of the set of vertices.
-         * @method mean
-         * @param {vertices} vertices
-         * @return {vector} The average point
-         */
-        static mean(vertices: Array<Vector>): Array<Vector>;
-
-        /**
-         * Sorts the input vertices into clockwise order in place.
-         * @method clockwiseSort
-         * @param {vertices} vertices
-         * @return {vertices} vertices
-         */
-        static clockwiseSort(vertices: Array<Vector>): Array<Vector>;
-
-        /**
-         * Returns true if the vertices form a convex shape (vertices must be in clockwise order).
-         * @method isConvex
-         * @param {vertices} vertices
-         * @return {bool} `true` if the `vertices` are convex, `false` if not (or `null` if not computable).
-         */
-        static isConvex(vertices: Array<Vector>): boolean;
-
-        /**
-         * Returns the convex hull of the input vertices as a new array of points.
-         * @method hull
-         * @param {vertices} vertices
-         * @return [vertex] vertices
-         */
-        static hull(vertices: Array<Vector>): Array<Vector>;
-
-        /**
-         * Returns the area of the set of vertices.
-         * @method area
-         * @param {vertices} vertices
-         * @param {bool} signed
-         * @return {number} The area
-         */
-        static area(vertices: Array<Vector>, signed: boolean): number;
-
-        /**
-         * Returns the centre (centroid) of the set of vertices.
-         * @method centre
-         * @param {vertices} vertices
-         * @return {vector} The centre point
-         */
-        static centre(vertices: Array<Vector>): Vector;
-
-        /**
-         * Chamfers a set of vertices by giving them rounded corners, returns a new set of vertices.
-         * The radius parameter is a single number or an array to specify the radius for each vertex.
-         * @method chamfer
-         * @param {vertices} vertices
-         * @param {number[]} radius
-         * @param {number} quality
-         * @param {number} qualityMin
-         * @param {number} qualityMax
-         */
-        static chamfer(vertices: Array<Vector>, radius: Array<number>, quality: number, qualityMin: number, qualityMax: number): void;
-
-
-        /**
-         * Returns `true` if the `point` is inside the set of `vertices`.
-         * @method contains
-         * @param {vertices} vertices
-         * @param {vector} point
-         * @return {boolean} True if the vertices contains point, otherwise false
-         */
-        static contains(vertices: Array<Vector>, point: Vector): boolean;
-
-        /**
-         * Creates a new set of `Matter.Body` compatible vertices.
-         * The `points` argument accepts an array of `Matter.Vector` points orientated around the origin `(0, 0)`, for example:
-         *
-        *     [{ x: 0, y: 0 }, { x: 25, y: 50 }, { x: 50, y: 0 }]
-        *
-        * The `Vertices.create` method returns a new array of vertices, which are similar to Matter.Vector objects,
-        * but with some additional references required for efficient collision detection routines.
-        *
-        * Note that the `body` argument is not optional, a `Matter.Body` reference must be provided.
-        *
-        * @method create
-        * @param {vector[]} points
-        * @param {body} body
-        */
-        static create(points: Array<Vector>, body: Body): void;
-
-        /**
-         * Parses a string containing ordered x y pairs separated by spaces (and optionally commas),
-         * into a `Matter.Vertices` object for the given `Matter.Body`.
-         * For parsing SVG paths, see `Svg.pathToVertices`.
-         * @method fromPath
-         * @param {string} path
-         * @param {body} body
-         * @return {vertices} vertices
-         */
-        static fromPath(path: string, body: Body): Array<Vector>;
-
-        /**
-         * Returns the moment of inertia (second moment of area) of the set of vertices given the total mass.
-         * @method inertia
-         * @param {vertices} vertices
-         * @param {number} mass
-         * @return {number} The polygon's moment of inertia
-         */
-        static inertia(vertices: Array<Vector>, mass: number): number;
-
-        /**
-         * Rotates the set of vertices in-place.
-         * @method rotate
-         * @param {vertices} vertices
-         * @param {number} angle
-         * @param {vector} point
-         */
-        static rotate(vertices: Array<Vector>, angle: number, point: Vector): void;
-
-        /**
-         * Scales the vertices from a point (default is centre) in-place.
-         * @method scale
-         * @param {vertices} vertices
-         * @param {number} scaleX
-         * @param {number} scaleY
-         * @param {vector} point
-         */
-        static scale(vertices: Array<Vector>, scaleX: number, scaleY: number, point: Vector): void;
-
-        /**
-         * Translates the set of vertices in-place.
-         * @method translate
-         * @param {vertices} vertices
-         * @param {vector} vector
-         * @param {number} scalar
-         */
-        static translate(vertices: Array<Vector>, vector: Vector, scalar: number): void;
-    }
-
-    interface IWorldDefinition extends ICompositeDefinition {
-        gravity?: Vector;
-        bounds?: Bounds;
-    }
-
-    /**
-    * The `Matter.World` module contains methods for creating and manipulating the world composite.
-    * A `Matter.World` is a `Matter.Composite` body, which is a collection of `Matter.Body`, `Matter.Constraint` and other `Matter.Composite`.
-    * A `Matter.World` has a few additional properties including `gravity` and `bounds`.
-    * It is important to use the functions in the `Matter.Composite` module to modify the world composite, rather than directly modifying its properties.
-    * There are also a few methods here that alias those in `Matter.Composite` for easier readability.
-    *
-    * See the included usage [examples](https://github.com/liabru/matter-js/tree/master/examples).
-    *
-    * @class World
-    * @extends Composite
-    */
-    export class World {
-        /**
-         * Add objects or arrays of objects of types: Body, Constraint, Composite
-         * @param world
-         * @param body
-         * @returns world
-         */
-        static add(world: World, body: Body | Array<Body> | Composite | Array<Composite> | Constraint | Array<Constraint>): World;
-
-        /**
-         * An alias for Composite.addBody since World is also a Composite
-         * @method addBody
-         * @param {world} world
-         * @param {body} body
-         * @return {world} The original world with the body added
-         */
-        static addBody(world: World, body: Body): World;
-
-        /**
-         * An alias for Composite.add since World is also a Composite
-         * @method addComposite
-         * @param {world} world
-         * @param {composite} composite
-         * @return {world} The original world with the objects from composite added
-         */
-        static addComposite(world: World, composite: Composite): World;
-
-        /**
-         * An alias for Composite.addConstraint since World is also a Composite
-         * @method addConstraint
-         * @param {world} world
-         * @param {constraint} constraint
-         * @return {world} The original world with the constraint added
-         */
-        static addConstraint(world: World, constraint: Constraint): World;
-
-        /**
-         * An alias for Composite.clear since World is also a Composite
-         * @method clear
-         * @param {world} world
-         * @param {boolean} keepStatic
-         */
-        static clear(world: World, keepStatic: boolean): void;
-
-        /**
-         * Creates a new world composite. The options parameter is an object that specifies any properties you wish to override the defaults.
-         * See the properties section below for detailed information on what you can pass via the `options` object.
-         * @method create
-         * @constructor
-         * @param {} options
-         * @return {world} A new world
-         */
-        static create(options: IWorldDefinition): World;
-
-        gravity: Vector;
-        bounds: Bounds;
-
-    }
-
-    export interface ICollisionFilter {
-        category: number;
-        mask: number;
-        group: number;
-    }
-
-    export interface IMousePoint {
-        x: number;
-        y: number;
-    }
-
-    export class Mouse {
-        static create(element: HTMLElement): Mouse;
-        static setElement(mouse: Mouse, element: HTMLElement): void;
-        static clearSourceEvents(mouse: Mouse): void;
-        static setOffset(mouse: Mouse, offset: Vector): void;
-        static setScale(mouse: Mouse, scale: Vector): void;
-
-        element: HTMLElement;
-        absolute: IMousePoint;
-        position: IMousePoint;
-        mousedownPosition: IMousePoint;
-        mouseupPosition: IMousePoint;
-        offset: IMousePoint;
-        scale: IMousePoint;
-        wheelDelta: number;
-        button: number;
-        pixelRatio: number;
-    }
-
-    export interface IEvent<T> {
-        /**
-         * The name of the event
-         */
-        name: string;
-        /**
-         * The source object of the event
-         */
-        source: T;
-    }
-
-    export interface IEventComposite<T> extends IEvent<T> {
-        /**
-         * EventObjects (may be a single body, constraint, composite or a mixed array of these)
-         */
-        object: any;
-    }
-
-    export interface IEventTimestamped<T> extends IEvent<T> {
-        /**
-         * The engine.timing.timestamp of the event
-         */
-        timestamp: number;
-    }
-
-    export interface IEventCollision<T> extends IEventTimestamped<T> {
-        /**
-         * The collision pair
-         */
-        pairs: Array<IPair>;
-    }
-
-
-    export class Events {
-
-        /**
-        * Fired when a body starts sleeping (where `this` is the body).
-        *
-        * @event sleepStart
-        * @this {body} The body that has started sleeping
-        * @param {} event An event object
-        * @param {} event.source The source object of the event
-        * @param {} event.name The name of the event
-        */
-        static on(obj: Body, name: "sleepStart", callback: (e: IEvent<Body>) => void): void;
-        /**
-         * Fired when a body ends sleeping (where `this` is the body).
-         *
-        * @event sleepEnd
-        * @this {body} The body that has ended sleeping
-        * @param {} event An event object
-        * @param {} event.source The source object of the event
-        * @param {} event.name The name of the event
-        */
-        static on(obj: Body, name: "sleepEnd", callback: (e: IEvent<Body>) => void): void;
-
-        /**
-        * Fired when a call to `Composite.add` is made, before objects have been added.
-        *
-        * @event beforeAdd
-        * @param {} event An event object
-        * @param {} event.object The object(s) to be added (may be a single body, constraint, composite or a mixed array of these)
-        * @param {} event.source The source object of the event
-        * @param {} event.name The name of the event
-        */
-        static on(obj: Engine, name: "beforeAdd", callback: (e: IEventComposite<Composite>) => void): void;
-
-        /**
-         * Fired when a call to `Composite.add` is made, after objects have been added.
-        *
-        * @event afterAdd
-        * @param {} event An event object
-        * @param {} event.object The object(s) that have been added (may be a single body, constraint, composite or a mixed array of these)
-        * @param {} event.source The source object of the event
-        * @param {} event.name The name of the event
-        */
-        static on(obj: Engine, name: "afterAdd", callback: (e: IEventComposite<Composite>) => void): void;
-
-        /**
-        * Fired when a call to `Composite.remove` is made, before objects have been removed.
-        *
-        * @event beforeRemove
-        * @param {} event An event object
-        * @param {} event.object The object(s) to be removed (may be a single body, constraint, composite or a mixed array of these)
-        * @param {} event.source The source object of the event
-        * @param {} event.name The name of the event
-        */
-        static on(obj: Engine, name: "beforeRemove", callback: (e: IEventComposite<Composite>) => void): void;
-
-        /**
-        * Fired when a call to `Composite.remove` is made, after objects have been removed.
-        *
-        * @event afterRemove
-        * @param {} event An event object
-        * @param {} event.object The object(s) that have been removed (may be a single body, constraint, composite or a mixed array of these)
-        * @param {} event.source The source object of the event
-        * @param {} event.name The name of the event
-        */
-        static on(obj: Engine, name: "afterRemove", callback: (e: IEventComposite<Composite>) => void): void;
-
-
-        /**
-        * Fired after engine update and all collision events
-        *
-        * @event afterUpdate
-        * @param {} event An event object
-        * @param {number} event.timestamp The engine.timing.timestamp of the event
-        * @param {} event.source The source object of the event
-        * @param {} event.name The name of the event
-        */
-        static on(obj: Engine, name: "afterUpdate", callback: (e: IEventTimestamped<Engine>) => void): void;
-
-        /**
-        * Fired before rendering
-        *
-        * @event beforeRender
-        * @param {} event An event object
-        * @param {number} event.timestamp The engine.timing.timestamp of the event
-        * @param {} event.source The source object of the event
-        * @param {} event.name The name of the event
-        */
-        static on(obj: Engine, name: "beforeRender", callback: (e: IEventTimestamped<Render>) => void): void;
-        /**
-        * Fired after rendering
-        *
-        * @event afterRender
-        * @param {} event An event object
-        * @param {number} event.timestamp The engine.timing.timestamp of the event
-        * @param {} event.source The source object of the event
-        * @param {} event.name The name of the event
-        */
-        static on(obj: Engine, name: "afterRender", callback: (e: IEventTimestamped<Render>) => void): void;
-
-
-        /**
-        * Fired just before an update
-        *
-        * @event beforeUpdate
-        * @param {} event An event object
-        * @param {number} event.timestamp The engine.timing.timestamp of the event
-        * @param {} event.source The source object of the event
-        * @param {} event.name The name of the event
-        */
-        static on(obj: Engine, name: "beforeUpdate", callback: (e: IEventTimestamped<Engine>) => void): void;
-
-        /**
-        * Fired after engine update, provides a list of all pairs that are colliding in the current tick (if any)
-        *
-        * @event collisionActive
-        * @param {} event An event object
-        * @param {} event.pairs List of affected pairs
-        * @param {number} event.timestamp The engine.timing.timestamp of the event
-        * @param {} event.source The source object of the event
-        * @param {} event.name The name of the event
-        */
-        static on(obj: Engine, name: "collisionActive", callback: (e: IEventCollision<Engine>) => void): void;
-
-
-        /**
-        * Fired after engine update, provides a list of all pairs that have ended collision in the current tick (if any)
-        *
-        * @event collisionEnd
-        * @param {} event An event object
-        * @param {} event.pairs List of affected pairs
-        * @param {number} event.timestamp The engine.timing.timestamp of the event
-        * @param {} event.source The source object of the event
-        * @param {} event.name The name of the event
-        */
-        static on(obj: Engine, name: "collisionEnd", callback: (e: IEventCollision<Engine>) => void): void;
-
-        /**
-        * Fired after engine update, provides a list of all pairs that have started to collide in the current tick (if any)
-        *
-        * @event collisionStart
-        * @param {} event An event object
-        * @param {} event.pairs List of affected pairs
-        * @param {number} event.timestamp The engine.timing.timestamp of the event
-        * @param {} event.source The source object of the event
-        * @param {} event.name The name of the event
-        */
-        static on(obj: Engine, name: "collisionStart", callback: (e: IEventCollision<Engine>) => void): void;
-
-        /**
-        * Fired at the start of a tick, before any updates to the engine or timing
-        *
-        * @event beforeTick
-        * @param {} event An event object
-        * @param {number} event.timestamp The engine.timing.timestamp of the event
-        * @param {} event.source The source object of the event
-        * @param {} event.name The name of the event
-        */
-        static on(obj: Engine, name: "beforeTick", callback: (e: IEventTimestamped<Runner>) => void): void;
-
-        /**
-         * Fired after engine timing updated, but just before update
-        *
-        * @event tick
-        * @param {} event An event object
-        * @param {number} event.timestamp The engine.timing.timestamp of the event
-        * @param {} event.source The source object of the event
-        * @param {} event.name The name of the event
-        */
-        static on(obj: Engine, name: "tick", callback: (e: IEventTimestamped<Runner>) => void): void;
-
-        /**
-        * Fired at the end of a tick, after engine update and after rendering
-        *
-        * @event afterTick
-        * @param {} event An event object
-        * @param {number} event.timestamp The engine.timing.timestamp of the event
-        * @param {} event.source The source object of the event
-        * @param {} event.name The name of the event
-        */
-        static on(obj: Engine, name: "afterTick", callback: (e: IEventTimestamped<Runner>) => void): void;
-
-        /**
-        * Fired before rendering
-        *
-        * @event beforeRender
-        * @param {} event An event object
-        * @param {number} event.timestamp The engine.timing.timestamp of the event
-        * @param {} event.source The source object of the event
-        * @param {} event.name The name of the event
-        */
-        static on(obj: Engine, name: "beforeRender", callback: (e: IEventTimestamped<Runner>) => void): void;
-
-        /**
-        * Fired after rendering
-        *
-        * @event afterRender
-        * @param {} event An event object
-        * @param {number} event.timestamp The engine.timing.timestamp of the event
-        * @param {} event.source The source object of the event
-        * @param {} event.name The name of the event
-        */
-        static on(obj: Engine, name: "afterRender", callback: (e: IEventTimestamped<Runner>) => void): void;
-
-        /**
-         * Fired when the mouse is down (or a touch has started) during the last step
-         * @param obj
-         * @param name
-         * @param callback
-         */
-        static on(obj: MouseConstraint, name: "mousedown", callback: (e: any) => void): void;
-
-        /**
-         * Fired when the mouse has moved (or a touch moves) during the last step
-         * @param obj
-         * @param name
-         * @param callback
-         */
-        static on(obj: MouseConstraint, name: "mousemove", callback: (e: any) => void): void;
-
-        /**
-         * Fired when the mouse is up (or a touch has ended) during the last step
-         * @param obj
-         * @param name
-         * @param callback
-         */
-        static on(obj: MouseConstraint, name: "mouseup", callback: (e: any) => void): void;
-
-
-        static on(obj: any, name: string, callback: (e: any) => void): void;
-
-        /**
-         * Removes the given event callback. If no callback, clears all callbacks in eventNames. If no eventNames, clears all events.
-         *
-        * @param obj
-        * @param eventName
-        * @param callback
-        */
-        static off(obj: any, eventName: string, callback: (e: any) => void): void;
-
-        /**
-         * Fires all the callbacks subscribed to the given object's eventName, in the order they subscribed, if any.
-         *
-        * @param object
-        * @param eventNames
-        * @param event
-        */
-        static trigger(object: any, eventNames: string, event: (e: any) => void): void;
-
-    }
-}
diff --git a/matter-js/tsconfig.json b/matter-js/tsconfig.json
new file mode 100644
index 0000000000..09ee2e70c6
--- /dev/null
+++ b/matter-js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "matter-js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/md5/md5.d.ts b/md5/index.d.ts
similarity index 100%
rename from md5/md5.d.ts
rename to md5/index.d.ts
diff --git a/md5/md5-tests.ts b/md5/md5-tests.ts
index 360bb4b382..b6ad514246 100644
--- a/md5/md5-tests.ts
+++ b/md5/md5-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="md5.d.ts" />
+
 
 var hash: string;
 hash = CybozuLabs.MD5.calc("abc");
diff --git a/md5/tsconfig.json b/md5/tsconfig.json
new file mode 100644
index 0000000000..3138056769
--- /dev/null
+++ b/md5/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "md5-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mdns/index.d.ts b/mdns/index.d.ts
new file mode 100644
index 0000000000..1e6466895f
--- /dev/null
+++ b/mdns/index.d.ts
@@ -0,0 +1,293 @@
+// Type definitions for node_mdns
+// Project: https://github.com/agnat/node_mdns
+// Definitions by: Stefan Steinhart <https://github.com/reppners>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare namespace MDNS {
+
+    // --- Error ---
+
+    interface DnsSdError extends Error {
+        errorCode?:number;
+    }
+
+    // --- Ads ---
+
+    interface AdvertisementOptions {
+        name?:string;
+        interfaceIndex?:number;
+        networkInterface?:string;
+        txtRecord?:any;
+        host?:any;
+        domain?:any;
+        flags?:any;
+        context?:any;
+    }
+
+    interface AdvertisementCreatable {
+        new(serviceType:ServiceType, port:number, options?:AdvertisementOptions, callback?:(error:DnsSdError, service:Service)=>void):Advertisement;
+    }
+
+    interface Advertisement extends NodeJS.EventEmitter {
+        start():void;
+        stop():void;
+    }
+
+    // --- Browser ---
+
+    interface BrowserOptions {
+        resolverSequence?:Array<(service:Service, next:()=>void)=>boolean>;
+        interfaceIndex?:number;
+        networkInterface?:string;
+        domain?:any;
+        context?:any;
+        flags?:any;
+    }
+
+    interface Browser extends NodeJS.EventEmitter {
+        start():any;
+        stop():any;
+    }
+
+    interface BrowserStatic {
+        new(serviceType:ServiceType, options?:BrowserOptions):Browser;
+        defaultResolverSequence:Array<(service:Service, next:()=>void)=>boolean>
+    }
+
+    // --- Services ---
+
+    interface Service {
+        addresses:Array<string>;
+        flags:number;
+        fullname:string;
+        host:string;
+        interfaceIndex: number;
+        name?:string;
+        networkInterface:string;
+        port:number;
+        replyDomain:string;
+        type:ServiceType;
+    }
+
+    interface ServiceType {
+        new(serviceTypeIdentifier:string):ServiceType;
+        new(name:string, protocol:string, ...subtypes:string[]):ServiceType;
+        new(serviceTypeIdentifier:Array<string>):ServiceType;
+        new(serviceTypeIdentifier:{name:string; protocol:string; subtypes?:Array<string>}):ServiceType;
+        new(serviceType:ServiceType):ServiceType;
+
+        fullyQualified:boolean;
+        name:string;
+        protocol:string;
+        subtypes:Array<string>;
+
+        toString():string;
+        fromString(serviceTypeIdentifier:string):ServiceType;
+
+        toArray():Array<string>;
+        fromArray(serviceTypeIdentifier:Array<string>):ServiceType;
+
+        fromJSON(serviceTypeIdentifier:{name:string; protocol:string; subtypes?:Array<string>}):ServiceType;
+        fromJSON(serviceType:ServiceType):ServiceType;
+    }
+
+    // interface for extending with custom resolvers
+    interface MDNSResolverSequenceTasks {
+
+    }
+
+    interface DefaultResolverSequenceTasks extends MDNSResolverSequenceTasks {
+        DNSServiceResolve(options?:{flags:any}):(service:Service, next:()=>void)=>boolean;
+        DNSServiceGetAddrInfo(options?:any):(service:Service, next:()=>void)=>boolean;
+        getaddrinfo(options?:any):(service:Service, next:()=>void)=>boolean;
+        makeAddressesUnique():(service:Service, next:()=>void)=>boolean;
+        filterAddresses(fn:(address:string, index?:number, addresses?:Array<string>)=>boolean):void;
+        logService():void;
+    }
+
+    // --- Statics & Classes ---
+
+    var Advertisement:AdvertisementCreatable;
+    var Browser:BrowserStatic;
+    var ServiceType:ServiceType;
+    var rst:DefaultResolverSequenceTasks;
+
+    // static functions
+
+    function tcp(name:string, ...subtypes:string[]):ServiceType;
+
+    function udp(name:string, ...subtypes:string[]):ServiceType;
+
+    function makeServiceType(name:string, protocol:string, ...subtypes:string[]):ServiceType;
+
+    function makeServiceType(serviceTypeIdentifier:string):ServiceType;
+
+    function makeServiceType(serviceTypeIdentifier:Array<string>):ServiceType;
+
+    function makeServiceType(serviceTypeIdentifier:{name:string; protocol:string; subtypes?:Array<string>}):ServiceType;
+
+    function makeServiceType(serviceType:ServiceType):ServiceType;
+
+    function createBrowser(serviceType:ServiceType, options?:BrowserOptions):Browser;
+
+    function createAdvertisement(serviceType:ServiceType, port:number, options?:AdvertisementOptions, callback?:(error:DnsSdError, service:Service)=>void):Advertisement;
+
+    function resolve(service:Service, sequence?:Array<(service:Service, next:()=>void)=>boolean>, callback?:(error:DnsSdError, service:Service)=>void):void;
+
+    function browseThemAll(options:BrowserOptions):Browser;
+
+    function loopbackInterface():any;
+
+    // constants
+
+    var isAvahi:boolean;
+
+    // -------------------- -------------------- -------------------- -------------------- -------------------- -------------------- -------------------- -------------------- --------------------
+
+    //Constants from dns_sd.h (C-Code of Bonjour -> see https://developer.apple.com/library/mac/documentation/Networking/Reference/DNSServiceDiscovery_CRef/Reference/reference.html)
+
+    var _DNS_SD_H:number;
+
+    var kDNSServiceMaxDomainName:string;
+    var kDNSServiceMaxServiceName:number;
+    var kDNSServiceOutputFlags:any;
+    var kDNSServiceProperty_DaemonVersion:number;
+
+    var kDNSServiceClass_IN:number;
+
+    var kDNSServiceErr_NoError:number;
+    var kDNSServiceErr_Unknown:number;
+    var kDNSServiceErr_NoSuchName:number;
+    var kDNSServiceErr_NoMemory:number;
+    var kDNSServiceErr_BadParam:number;
+    var kDNSServiceErr_BadReference:number;
+    var kDNSServiceErr_BadState:number;
+    var kDNSServiceErr_BadFlags:number;
+    var kDNSServiceErr_Unsupported:number;
+    var kDNSServiceErr_NotInitialized:number;
+    var kDNSServiceErr_AlreadyRegistered:number;
+    var kDNSServiceErr_NameConflict:number;
+    var kDNSServiceErr_Invalid:number;
+    var kDNSServiceErr_Firewall:number;
+    var kDNSServiceErr_Incompatible:number;
+    var kDNSServiceErr_BadInterfaceIndex:number;
+    var kDNSServiceErr_Refused:number;
+    var kDNSServiceErr_NoSuchRecord:number;
+    var kDNSServiceErr_NoAuth:number;
+    var kDNSServiceErr_NoSuchKey:number;
+    var kDNSServiceErr_NATTraversal:number;
+    var kDNSServiceErr_DoubleNAT:number;
+    var kDNSServiceErr_BadTime:number;
+    var kDNSServiceErr_BadSig:number;
+    var kDNSServiceErr_BadKey:number;
+    var kDNSServiceErr_Transient:number;
+    var kDNSServiceErr_ServiceNotRunning:number;
+    var kDNSServiceErr_NATPortMappingUnsupported:number;
+    var kDNSServiceErr_NATPortMappingDisabled:number;
+    var kDNSServiceErr_NoRouter:number;
+    var kDNSServiceErr_PollingMode:number;
+    var kDNSServiceErr_Timeout:number;
+
+    var kDNSServiceType_A:number;
+    var kDNSServiceType_NS:number;
+    var kDNSServiceType_MD:number;
+    var kDNSServiceType_MF:number;
+    var kDNSServiceType_CNAME:number;
+    var kDNSServiceType_SOA:number;
+    var kDNSServiceType_MB:number;
+    var kDNSServiceType_MG:number;
+    var kDNSServiceType_MR:number;
+    var kDNSServiceType_NULL:number;
+    var kDNSServiceType_WKS:number;
+    var kDNSServiceType_PTR:number;
+    var kDNSServiceType_HINFO:number;
+    var kDNSServiceType_MINFO:number;
+    var kDNSServiceType_MX:number;
+    var kDNSServiceType_TXT:number;
+    var kDNSServiceType_RP:number;
+    var kDNSServiceType_AFSDB:number;
+    var kDNSServiceType_X25:number;
+    var kDNSServiceType_ISDN:number;
+    var kDNSServiceType_RT:number;
+    var kDNSServiceType_NSAP:number;
+    var kDNSServiceType_NSAP_PTR:number;
+    var kDNSServiceType_SIG:number;
+    var kDNSServiceType_KEY:number;
+    var kDNSServiceType_PX:number;
+    var kDNSServiceType_GPOS:number;
+    var kDNSServiceType_AAAA:number;
+    var kDNSServiceType_LOC:number;
+    var kDNSServiceType_NXT:number;
+    var kDNSServiceType_EID:number;
+    var kDNSServiceType_NIMLOC:number;
+    var kDNSServiceType_SRV:number;
+    var kDNSServiceType_ATMA:number;
+    var kDNSServiceType_NAPTR:number;
+    var kDNSServiceType_KX:number;
+    var kDNSServiceType_CERT:number;
+    var kDNSServiceType_A6:number;
+    var kDNSServiceType_DNAME:number;
+    var kDNSServiceType_SINK:number;
+    var kDNSServiceType_OPT:number;
+    var kDNSServiceType_APL:number;
+    var kDNSServiceType_DS:number;
+    var kDNSServiceType_SSHFP:number;
+    var kDNSServiceType_IPSECKEY:number;
+    var kDNSServiceType_RRSIG:number;
+    var kDNSServiceType_NSEC:number;
+    var kDNSServiceType_DNSKEY:number;
+    var kDNSServiceType_DHCID:number;
+    var kDNSServiceType_NSEC3:number;
+    var kDNSServiceType_NSEC3PARAM:number;
+    var kDNSServiceType_HIP:number;
+    var kDNSServiceType_SPF:number;
+    var kDNSServiceType_UINFO:number;
+    var kDNSServiceType_UID:number;
+    var kDNSServiceType_GID:number;
+    var kDNSServiceType_UNSPEC:number;
+    var kDNSServiceType_TKEY:number;
+    var kDNSServiceType_TSIG:number;
+    var kDNSServiceType_IXFR:number;
+    var kDNSServiceType_AXFR:number;
+    var kDNSServiceType_MAILB:number;
+    var kDNSServiceType_MAILA:number;
+    var kDNSServiceType_ANY:number;
+
+    var kDNSServiceFlagsMoreComing:number;
+    var kDNSServiceFlagsAdd:number;
+    var kDNSServiceFlagsDefault:number;
+    var kDNSServiceFlagsNoAutoRename:number;
+    var kDNSServiceFlagsShared:number;
+    var kDNSServiceFlagsUnique:number;
+    var kDNSServiceFlagsBrowseDomains:number;
+    var kDNSServiceFlagsRegistrationDomains:number;
+    var kDNSServiceFlagsLongLivedQuery:number;
+    var kDNSServiceFlagsAllowRemoteQuery:number;
+    var kDNSServiceFlagsForceMulticast:number;
+    var kDNSServiceFlagsKnownUnique:number;
+    var kDNSServiceFlagsReturnIntermediates:number;
+    var kDNSServiceFlagsNonBrowsable:number;
+    var kDNSServiceFlagsShareConnection:number;
+    var kDNSServiceFlagsSuppressUnusable:number;
+    var kDNSServiceFlagsWakeOnResolve:number;
+    var kDNSServiceFlagsBackgroundTrafficClass:number;
+    var kDNSServiceFlagsIncludeAWDL:number;
+    var kDNSServiceFlagsValidate:number;
+    var kDNSServiceFlagsSecure:number;
+    var kDNSServiceFlagsInsecure:number;
+    var kDNSServiceFlagsBogus:number;
+    var kDNSServiceFlagsIndeterminate:number;
+    var kDNSServiceFlagsUnicastResponse:number;
+    var kDNSServiceFlagsValidateOptional:number;
+    var kDNSServiceFlagsWakeOnlyService:number;
+
+    var kDNSServiceProtocol_IPv4:number;
+    var kDNSServiceProtocol_IPv6:number;
+    var kDNSServiceProtocol_UDP:number;
+    var kDNSServiceProtocol_TCP:number;
+}
+
+
+export = MDNS;
\ No newline at end of file
diff --git a/mdns/mdns-tests.ts b/mdns/mdns-tests.ts
index 20a336025c..d934a59a87 100644
--- a/mdns/mdns-tests.ts
+++ b/mdns/mdns-tests.ts
@@ -2,20 +2,20 @@
  * Created by stefansteinhart on 30.01.15.
  */
 
-/// <reference path="mdns.d.ts" />
 
-var mdns = require('mdns')
 
-var ad:MDNS.Advertisement = mdns.createAdvertisement(mdns.tcp('http'), 4321);
+import mdns = require('mdns')
+
+var ad:mdns.Advertisement = mdns.createAdvertisement(mdns.tcp('http'), 4321);
 
 ad.start();
 
 var browser = mdns.createBrowser(mdns.tcp('http'));
 
-browser.on('serviceUp', function(service:MDNS.Service) {
+browser.on('serviceUp', function(service:mdns.Service) {
     console.log("service up: ", service);
 });
-browser.on('serviceDown', function(service:MDNS.Service) {
+browser.on('serviceDown', function(service:mdns.Service) {
     console.log("service down: ", service);
 });
 
@@ -32,7 +32,7 @@ var txt_record = {
     , chunky: true
     , strips: 5
 };
-var ad:MDNS.Advertisement = mdns.createAdvertisement(mdns.tcp('http'), 4321, {txtRecord: txt_record});
+var ad:mdns.Advertisement = mdns.createAdvertisement(mdns.tcp('http'), 4321, {txtRecord: txt_record});
 
 var sequence = [
     mdns.rst.DNSServiceResolve()
@@ -41,7 +41,7 @@ var sequence = [
 
 var browser = mdns.createBrowser(mdns.tcp('http'), {resolverSequence: sequence});
 
-interface HammerTimeService extends MDNS.Service {
+interface HammerTimeService extends mdns.Service {
     hammerTime:Date;
 }
 
@@ -60,7 +60,7 @@ function MCHammer(options:any) {
 var browser = mdns.createBrowser( mdns.tcp('http')
     , { networkInterface: mdns.loopbackInterface()});
 
-var ad:MDNS.Advertisement;
+var ad:mdns.Advertisement;
 
 function createAdvertisement() {
     try {
@@ -72,7 +72,7 @@ function createAdvertisement() {
     }
 }
 
-function handleError(error:MDNS.DnsSdError) {
+function handleError(error:mdns.DnsSdError) {
     switch (error.errorCode) {
         case mdns.kDNSServiceErr_Unknown:
             console.warn(error);
diff --git a/mdns/mdns.d.ts b/mdns/mdns.d.ts
deleted file mode 100644
index d159ee7dba..0000000000
--- a/mdns/mdns.d.ts
+++ /dev/null
@@ -1,295 +0,0 @@
-// Type definitions for node_mdns
-// Project: https://github.com/agnat/node_mdns
-// Definitions by: Stefan Steinhart <https://github.com/reppners>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare namespace MDNS {
-
-    // --- Error ---
-
-    interface DnsSdError extends Error {
-        errorCode?:number;
-    }
-
-    // --- Ads ---
-
-    interface AdvertisementOptions {
-        name?:string;
-        interfaceIndex?:number;
-        networkInterface?:string;
-        txtRecord?:any;
-        host?:any;
-        domain?:any;
-        flags?:any;
-        context?:any;
-    }
-
-    interface AdvertisementCreatable {
-        new(serviceType:ServiceType, port:number, options?:AdvertisementOptions, callback?:(error:DnsSdError, service:Service)=>void):Advertisement;
-    }
-
-    interface Advertisement extends NodeJS.EventEmitter {
-        start():void;
-        stop():void;
-    }
-
-    // --- Browser ---
-
-    interface BrowserOptions {
-        resolverSequence?:Array<(service:Service, next:()=>void)=>boolean>;
-        interfaceIndex?:number;
-        networkInterface?:string;
-        domain?:any;
-        context?:any;
-        flags?:any;
-    }
-
-    interface Browser extends NodeJS.EventEmitter {
-        start():any;
-        stop():any;
-    }
-
-    interface BrowserStatic {
-        new(serviceType:ServiceType, options?:BrowserOptions):Browser;
-        defaultResolverSequence:Array<(service:Service, next:()=>void)=>boolean>
-    }
-
-    // --- Services ---
-
-    interface Service {
-        addresses:Array<string>;
-        flags:number;
-        fullname:string;
-        host:string;
-        interfaceIndex: number;
-        name?:string;
-        networkInterface:string;
-        port:number;
-        replyDomain:string;
-        type:ServiceType;
-    }
-
-    interface ServiceType {
-        new(serviceTypeIdentifier:string):ServiceType;
-        new(name:string, protocol:string, ...subtypes:string[]):ServiceType;
-        new(serviceTypeIdentifier:Array<string>):ServiceType;
-        new(serviceTypeIdentifier:{name:string; protocol:string; subtypes?:Array<string>}):ServiceType;
-        new(serviceType:ServiceType):ServiceType;
-
-        fullyQualified:boolean;
-        name:string;
-        protocol:string;
-        subtypes:Array<string>;
-
-        toString():string;
-        fromString(serviceTypeIdentifier:string):ServiceType;
-
-        toArray():Array<string>;
-        fromArray(serviceTypeIdentifier:Array<string>):ServiceType;
-
-        fromJSON(serviceTypeIdentifier:{name:string; protocol:string; subtypes?:Array<string>}):ServiceType;
-        fromJSON(serviceType:ServiceType):ServiceType;
-    }
-
-    // interface for extending with custom resolvers
-    interface MDNSResolverSequenceTasks {
-
-    }
-
-    interface DefaultResolverSequenceTasks extends MDNSResolverSequenceTasks {
-        DNSServiceResolve(options?:{flags:any}):(service:Service, next:()=>void)=>boolean;
-        DNSServiceGetAddrInfo(options?:any):(service:Service, next:()=>void)=>boolean;
-        getaddrinfo(options?:any):(service:Service, next:()=>void)=>boolean;
-        makeAddressesUnique():(service:Service, next:()=>void)=>boolean;
-        filterAddresses(fn:(address:string, index?:number, addresses?:Array<string>)=>boolean):void;
-        logService():void;
-    }
-
-    // --- Statics & Classes ---
-
-    var Advertisement:AdvertisementCreatable;
-    var Browser:BrowserStatic;
-    var ServiceType:ServiceType;
-    var rst:DefaultResolverSequenceTasks;
-
-    // static functions
-
-    function tcp(name:string, ...subtypes:string[]):ServiceType;
-
-    function udp(name:string, ...subtypes:string[]):ServiceType;
-
-    function makeServiceType(name:string, protocol:string, ...subtypes:string[]):ServiceType;
-
-    function makeServiceType(serviceTypeIdentifier:string):ServiceType;
-
-    function makeServiceType(serviceTypeIdentifier:Array<string>):ServiceType;
-
-    function makeServiceType(serviceTypeIdentifier:{name:string; protocol:string; subtypes?:Array<string>}):ServiceType;
-
-    function makeServiceType(serviceType:ServiceType):ServiceType;
-
-    function createBrowser(serviceType:ServiceType, options?:BrowserOptions):Browser;
-
-    function createAdvertisement(serviceType:ServiceType, port:number, options?:AdvertisementOptions, callback?:(error:DnsSdError, service:Service)=>void):Advertisement;
-
-    function resolve(service:Service, sequence?:Array<(service:Service, next:()=>void)=>boolean>, callback?:(error:DnsSdError, service:Service)=>void):void;
-
-    function browseThemAll(options:BrowserOptions):Browser;
-
-    function loopbackInterface():any;
-
-    // constants
-
-    var isAvahi:boolean;
-
-    // -------------------- -------------------- -------------------- -------------------- -------------------- -------------------- -------------------- -------------------- --------------------
-
-    //Constants from dns_sd.h (C-Code of Bonjour -> see https://developer.apple.com/library/mac/documentation/Networking/Reference/DNSServiceDiscovery_CRef/Reference/reference.html)
-
-    var _DNS_SD_H:number;
-
-    var kDNSServiceMaxDomainName:string;
-    var kDNSServiceMaxServiceName:number;
-    var kDNSServiceOutputFlags:any;
-    var kDNSServiceProperty_DaemonVersion:number;
-
-    var kDNSServiceClass_IN:number;
-
-    var kDNSServiceErr_NoError:number;
-    var kDNSServiceErr_Unknown:number;
-    var kDNSServiceErr_NoSuchName:number;
-    var kDNSServiceErr_NoMemory:number;
-    var kDNSServiceErr_BadParam:number;
-    var kDNSServiceErr_BadReference:number;
-    var kDNSServiceErr_BadState:number;
-    var kDNSServiceErr_BadFlags:number;
-    var kDNSServiceErr_Unsupported:number;
-    var kDNSServiceErr_NotInitialized:number;
-    var kDNSServiceErr_AlreadyRegistered:number;
-    var kDNSServiceErr_NameConflict:number;
-    var kDNSServiceErr_Invalid:number;
-    var kDNSServiceErr_Firewall:number;
-    var kDNSServiceErr_Incompatible:number;
-    var kDNSServiceErr_BadInterfaceIndex:number;
-    var kDNSServiceErr_Refused:number;
-    var kDNSServiceErr_NoSuchRecord:number;
-    var kDNSServiceErr_NoAuth:number;
-    var kDNSServiceErr_NoSuchKey:number;
-    var kDNSServiceErr_NATTraversal:number;
-    var kDNSServiceErr_DoubleNAT:number;
-    var kDNSServiceErr_BadTime:number;
-    var kDNSServiceErr_BadSig:number;
-    var kDNSServiceErr_BadKey:number;
-    var kDNSServiceErr_Transient:number;
-    var kDNSServiceErr_ServiceNotRunning:number;
-    var kDNSServiceErr_NATPortMappingUnsupported:number;
-    var kDNSServiceErr_NATPortMappingDisabled:number;
-    var kDNSServiceErr_NoRouter:number;
-    var kDNSServiceErr_PollingMode:number;
-    var kDNSServiceErr_Timeout:number;
-
-    var kDNSServiceType_A:number;
-    var kDNSServiceType_NS:number;
-    var kDNSServiceType_MD:number;
-    var kDNSServiceType_MF:number;
-    var kDNSServiceType_CNAME:number;
-    var kDNSServiceType_SOA:number;
-    var kDNSServiceType_MB:number;
-    var kDNSServiceType_MG:number;
-    var kDNSServiceType_MR:number;
-    var kDNSServiceType_NULL:number;
-    var kDNSServiceType_WKS:number;
-    var kDNSServiceType_PTR:number;
-    var kDNSServiceType_HINFO:number;
-    var kDNSServiceType_MINFO:number;
-    var kDNSServiceType_MX:number;
-    var kDNSServiceType_TXT:number;
-    var kDNSServiceType_RP:number;
-    var kDNSServiceType_AFSDB:number;
-    var kDNSServiceType_X25:number;
-    var kDNSServiceType_ISDN:number;
-    var kDNSServiceType_RT:number;
-    var kDNSServiceType_NSAP:number;
-    var kDNSServiceType_NSAP_PTR:number;
-    var kDNSServiceType_SIG:number;
-    var kDNSServiceType_KEY:number;
-    var kDNSServiceType_PX:number;
-    var kDNSServiceType_GPOS:number;
-    var kDNSServiceType_AAAA:number;
-    var kDNSServiceType_LOC:number;
-    var kDNSServiceType_NXT:number;
-    var kDNSServiceType_EID:number;
-    var kDNSServiceType_NIMLOC:number;
-    var kDNSServiceType_SRV:number;
-    var kDNSServiceType_ATMA:number;
-    var kDNSServiceType_NAPTR:number;
-    var kDNSServiceType_KX:number;
-    var kDNSServiceType_CERT:number;
-    var kDNSServiceType_A6:number;
-    var kDNSServiceType_DNAME:number;
-    var kDNSServiceType_SINK:number;
-    var kDNSServiceType_OPT:number;
-    var kDNSServiceType_APL:number;
-    var kDNSServiceType_DS:number;
-    var kDNSServiceType_SSHFP:number;
-    var kDNSServiceType_IPSECKEY:number;
-    var kDNSServiceType_RRSIG:number;
-    var kDNSServiceType_NSEC:number;
-    var kDNSServiceType_DNSKEY:number;
-    var kDNSServiceType_DHCID:number;
-    var kDNSServiceType_NSEC3:number;
-    var kDNSServiceType_NSEC3PARAM:number;
-    var kDNSServiceType_HIP:number;
-    var kDNSServiceType_SPF:number;
-    var kDNSServiceType_UINFO:number;
-    var kDNSServiceType_UID:number;
-    var kDNSServiceType_GID:number;
-    var kDNSServiceType_UNSPEC:number;
-    var kDNSServiceType_TKEY:number;
-    var kDNSServiceType_TSIG:number;
-    var kDNSServiceType_IXFR:number;
-    var kDNSServiceType_AXFR:number;
-    var kDNSServiceType_MAILB:number;
-    var kDNSServiceType_MAILA:number;
-    var kDNSServiceType_ANY:number;
-
-    var kDNSServiceFlagsMoreComing:number;
-    var kDNSServiceFlagsAdd:number;
-    var kDNSServiceFlagsDefault:number;
-    var kDNSServiceFlagsNoAutoRename:number;
-    var kDNSServiceFlagsShared:number;
-    var kDNSServiceFlagsUnique:number;
-    var kDNSServiceFlagsBrowseDomains:number;
-    var kDNSServiceFlagsRegistrationDomains:number;
-    var kDNSServiceFlagsLongLivedQuery:number;
-    var kDNSServiceFlagsAllowRemoteQuery:number;
-    var kDNSServiceFlagsForceMulticast:number;
-    var kDNSServiceFlagsKnownUnique:number;
-    var kDNSServiceFlagsReturnIntermediates:number;
-    var kDNSServiceFlagsNonBrowsable:number;
-    var kDNSServiceFlagsShareConnection:number;
-    var kDNSServiceFlagsSuppressUnusable:number;
-    var kDNSServiceFlagsWakeOnResolve:number;
-    var kDNSServiceFlagsBackgroundTrafficClass:number;
-    var kDNSServiceFlagsIncludeAWDL:number;
-    var kDNSServiceFlagsValidate:number;
-    var kDNSServiceFlagsSecure:number;
-    var kDNSServiceFlagsInsecure:number;
-    var kDNSServiceFlagsBogus:number;
-    var kDNSServiceFlagsIndeterminate:number;
-    var kDNSServiceFlagsUnicastResponse:number;
-    var kDNSServiceFlagsValidateOptional:number;
-    var kDNSServiceFlagsWakeOnlyService:number;
-
-    var kDNSServiceProtocol_IPv4:number;
-    var kDNSServiceProtocol_IPv6:number;
-    var kDNSServiceProtocol_UDP:number;
-    var kDNSServiceProtocol_TCP:number;
-}
-
-declare module "mdns" {
-
-    export = MDNS;
-}
diff --git a/mdns/tsconfig.json b/mdns/tsconfig.json
new file mode 100644
index 0000000000..7672a46a97
--- /dev/null
+++ b/mdns/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mdns-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/memory-cache/index.d.ts b/memory-cache/index.d.ts
new file mode 100644
index 0000000000..29c0c21900
--- /dev/null
+++ b/memory-cache/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for memory-cache
+// Project: http://github.com/ptarjan/node-cache
+// Definitions by: Jeff Goddard <https://github.com/jedigo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/memory-cache.d.ts
+
+
+export declare function put(key: any, value: any, time?: number, timeoutCallback?: (key: any) => void): void;
+export declare function get(key: any): any;
+export declare function del(key: any): void;
+export declare function clear(): void;
+
+export declare function size(): number;
+export declare function memsize(): number;
+
+export declare function debug(bool: boolean): void;
+export declare function hits(): number;
+export declare function misses(): number;
+export declare function keys(): any;
diff --git a/memory-cache/memory-cache-tests.ts b/memory-cache/memory-cache-tests.ts
index 14ee55c203..0553287ba7 100644
--- a/memory-cache/memory-cache-tests.ts
+++ b/memory-cache/memory-cache-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="memory-cache.d.ts" />
 
 import memoryCache = require('memory-cache');
 
diff --git a/memory-cache/memory-cache.d.ts b/memory-cache/memory-cache.d.ts
deleted file mode 100644
index 09bcf1fad3..0000000000
--- a/memory-cache/memory-cache.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Type definitions for memory-cache
-// Project: http://github.com/ptarjan/node-cache
-// Definitions by: Jeff Goddard <https://github.com/jedigo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/memory-cache.d.ts
-
-declare module "memory-cache" {
-	export function put(key: any, value: any, time?: number, timeoutCallback?: (key: any) => void): void;
-	export function get(key: any): any;
-	export function del(key: any): void;
-	export function clear(): void;
-
-	export function size(): number;
-	export function memsize(): number;
-
-	export function debug(bool: boolean): void;
-	export function hits(): number;
-	export function misses(): number;
-	export function keys() : any;
-}
diff --git a/memory-cache/tsconfig.json b/memory-cache/tsconfig.json
new file mode 100644
index 0000000000..c51bc3081d
--- /dev/null
+++ b/memory-cache/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "memory-cache-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mendixmodelsdk/index.d.ts b/mendixmodelsdk/index.d.ts
new file mode 100644
index 0000000000..29192f4bc4
--- /dev/null
+++ b/mendixmodelsdk/index.d.ts
@@ -0,0 +1,12718 @@
+// Type definitions for mendixmodelsdk v0.0.1
+// Project: http://www.mendix.com
+// Definitions by: Mendix <https://github.com/mendix>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+
+/// <reference types="mobservable" />
+declare module "mendixmodelsdk" {
+    namespace sdk {
+        namespace internal {
+            /**
+             * The `references` sub module contains all classes that handle/wrap references,
+             * as a special cases of property value/settings.
+             */
+            namespace references {
+                /**
+                 * Abstract base class for both {@link ReferenceByName by-name} and {@link ReferenceById by-id} references
+                 * to elements of type `T`, which are observed.
+                 */
+                class AbstractReference<T extends elements.IAbstractElement> implements properties.IObservable {
+                    owner: elements.AbstractElement;
+                    protected isResolved: boolean;
+                    protected target: Mobservable.IObservableValue<T>;
+                    protected isResolving: boolean;
+                    protected referenceId: string;
+                    /**
+                     * Constructs and returns a new reference instance, that is owned (by a property of) an abstract element.
+                     */
+                    constructor(owner: elements.AbstractElement);
+                    /**
+                     * Registers an observer in the form of a callback with this references and fires that callback
+                     * immediately if the reference is already resolved.
+                     * Used by properties to observe this reference, so that storage and logical updates can be applied.
+                     */
+                    observe(callback: (newValue: T, oldValue: T) => void, fireImmediately?: boolean): common.IVoidCallback;
+                    /**
+                     * Returns the value of the wrapped reference.
+                     */
+                    get(): T;
+                    /**
+                     * Sets the value of the wrapped reference, taking care of resolution and life cycle.
+                     */
+                    set(newValue: T): void;
+                    /**
+                     * Sets only the raw target id, without trying to resolve that.
+                     */
+                    updateWithRawValue(value: string): void;
+                    protected registerRef(): void;
+                    protected unregisterRef(): void;
+                    resolve(): boolean;
+                    dispose(): void;
+                }
+                class ByIdReference<T extends elements.AbstractElement> extends AbstractReference<T> {
+                    set(newValue: T): void;
+                    get(): T;
+                    resolve(): boolean;
+                }
+                class ByNameReference<T extends elements.IAbstractElement> extends AbstractReference<T> {
+                    private targetType;
+                    constructor(owner: elements.AbstractElement, targetType: string);
+                    resolve(): boolean;
+                    /**
+                     * The target does no longer exist, but the stored reference should stay the same.
+                     */
+                    unresolve(): void;
+                    dispose(): void;
+                    qualifiedName(): string;
+                }
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    namespace sdk {
+        namespace internal {
+            /**
+             * The `structures` sub module contains all interfaces and classes related to the **structures** concept.
+             */
+            namespace structures {
+                type IContainer = units.IStructuralUnit | elements.IAbstractElement;
+                type Container = units.StructuralUnit | elements.AbstractElement;
+                /**
+                 * "Something" that contains properties.
+                 * Concrete sub types: MxElement, MxStructuralUnit, MxModelUnit.
+                 * Abstract sub types: MxAbstractElement, MxAbstractUnit.
+                 *
+                 * Each unit in the model is guaranteed to exist only once in memory.
+                 */
+                interface IStructure {
+                    id: string;
+                    typeName: string;
+                    container: IContainer;
+                    isLoaded: boolean;
+                    /**
+                     * Unit that owns/contains this thing.
+                     */
+                    unit: units.IAbstractUnit;
+                    load<T extends IStructure>(callback?: (elem: T) => void): any;
+                    load<T extends IStructure>(): T;
+                    /**
+                     * Renders the structure as plain JSON (without observables magic).
+                     * This is intended for debugging and development convenience.
+                     * Note that the resulting object is not of the interface type corresponding to this structure.
+                     */
+                    toPlainJson(): Object;
+                }
+                class Structure implements IStructure {
+                    id: string;
+                    typeName: string;
+                    container: Container;
+                    /**
+                     * These deltas where created before the create delta of this element was submitted to the server.
+                     * As soon as this happens, the queue is processed and should stay empty.
+                     * Each element is either an delta, or a new child that was added under a specific property.
+                     */
+                    constructor(isCreatingNewInstance: boolean, _model: model.Model, container: Container, json: transport.IStructureJson, isPartial: boolean);
+                    unit: units.IAbstractUnit;
+                    isLoaded: boolean;
+                    /**
+                     * Asserts that the complete element is available, and not just its public part.
+                     */
+                    /**
+                     * Should be called after deserialisation / remote updates, to make sure all references are bound to their actual value.
+                     */
+                    /**
+                     * If the name of a model element changes, this might effect currently broken references-by-name, so let's process those.
+                     */
+                    /**
+                     * Housekeeping: a child of ours was deleted, so let's find the part that contained it and update that part.
+                     */
+                    /**
+                     * This model element is no longer part of the model, and can be cleaned up.
+                     */
+                    /**
+                     * Update an existing (probably partial) interface with real contents received from the server.
+                     */
+                    /**
+                     * Sends the change delta in case a simple property has changed.
+                     */
+                    /**
+                     * Sends the delete in case that we were removed from the model.
+                     */
+                    /**
+                     * Deletes a model from the model.
+                     * This will automatically remove the item from its model parent,
+                     * and update incoming references and send server changes.
+                     */
+                    delete(): void;
+                    /**
+                     * Transforms a IModelElement interface into a ModelElement class.
+                     * (Those are technically already the same, but this function makes sure its properties are available).
+                     *
+                     * - If invoked without callback, it checks whether the properties are available or throw;
+                     * - If invoked with callback, it will fetch the data from the server if needed, and then invoke the callback.
+                     */
+                    load<T extends Structure>(callback?: (elem: T) => void): any;
+                    load<T extends Structure>(): T;
+                    toPlainJson(): Object;
+                }
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    namespace sdk {
+        namespace internal {
+            /**
+             * The `instances` module contains various classes and functions
+             * related to elements, specifically: (abstract) elements.
+             */
+            namespace elements {
+                /**
+                 * Abstract elements are structures that are referable by name.
+                 * Sub types: (I)Element and (I)ModelUnit.
+                 */
+                interface IAbstractElement extends structures.IStructure {
+                    isLoaded: boolean;
+                    qualifiedName: string;
+                    container: structures.IContainer;
+                }
+                /**
+                 * See {@link IAbstractElement}.
+                 */
+                class AbstractElement extends structures.Structure implements IAbstractElement {
+                    constructor(isCreatingNewInstance: boolean, model: model.Model, container: structures.Container, json: transport.IStructureJson, isPartial: boolean);
+                    /**
+                     * Checks whether all properties are available at the moment
+                     *  - if false, a fetch is required to access these properties.
+                     */
+                    isLoaded: boolean;
+                    /**
+                     * Calculates the fully qualified name of this element,
+                     * by visiting all parents that have $isNamespace set to `true`.
+                     */
+                    qualifiedName: string;
+                    /**
+                     * Transforms a IElement interface into a Element class, fetching the containing unit if necessary.
+                     * (Those are technically already the same, but this function makes sure its properties are available.)
+                     *
+                     * - If invoked without callback, it checks whether the properties are available or it will throw;
+                     * - If invoked with callback, it will fetch the data from the server if needed, and then invoke the callback.
+                     */
+                    load<T extends AbstractElement>(callback?: (elem: T) => void): any;
+                    load<T extends AbstractElement>(): T;
+                    /**
+                     * updateElementsContainer recursively sets the unit to which this elements belong
+                     * During deserialization this is not needed, but if used in the SDK, we only can set the unit once
+                     * an element is actually added to the tree (buy pushing / assigning it to some part property)
+                     */
+                    /**
+                     * Adds a back reference, i.e. a reference pointing to us,
+                     * which needs to be informed of changes to this element (including deletion).
+                     */
+                    /**
+                     * Removes the given back reference.
+                     */
+                    delete(): void;
+                }
+                /**
+                 * An element (short for: "model element") lives inside a unit
+                 * and contains (per being an IStructure) property values.
+                 */
+                interface IElement extends IAbstractElement {
+                }
+                class Element extends AbstractElement implements IElement {
+                    container: AbstractElement;
+                    constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+                    unit: units.ModelUnit;
+                    /**
+                     * Checks whether all attributes are available ATM
+                     *  -  if false, a fetch is required to access these properties.
+                     */
+                    isLoaded: boolean;
+                    /**
+                     * Sends the appropriate create delta to the server, and also sends all pending deltas,
+                     * after this element has been assigned to some parent.
+                     */
+                    /**
+                     * Sends the appropriate create delta to the server
+                     * after this element has been moved to a new parent.
+                     */
+                }
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    namespace sdk {
+        namespace internal {
+            /**
+             * The `instances` module contains various classes and functions
+             * which revolve around creating/maintaining/updating actual model contents.
+             */
+            namespace instances {
+                /**
+                 * Generic type alias for `Mobservable.IObservableArray<T>`.
+                 */
+                interface IList<T> extends Mobservable.IObservableArray<T> {
+                }
+                /**
+                 * Base class for enumerations in the meta model.
+                 * Literals of an enumeration are generated as public static constants of the generated sub class
+                 * which are instances of the generated sub class.
+                 */
+                class IEnum {
+                    protected qualifiedTsTypeName: string;
+                    constructor(_name: string);
+                    name: string;
+                    toString(): string;
+                    qualifiedTsLiteralName(): string;
+                }
+                /**
+                 * Given some a (normalised) JSON representation of a unit,
+                 * creates an instance of the corresponding `unit.AbstractUnit` sub class (structural/model)
+                 * and populates that from the JSON.
+                 * Should only be called if this unit was not already in memory.
+                 */
+                function abstractUnitJsonToInstance(model: model.Model, json: transport.IAbstractUnitJson, isPartial: boolean): units.AbstractUnit;
+                /**
+                 * Given some a (normalised) JSON representation of a model element,
+                 * creates an instance of the corresponding `elements.Element`
+                 * and populates that from the JSON.
+                 * Will update existing elements if this element was created before.
+                 */
+                function modelElementJsonToInstance(unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean): elements.Element;
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    namespace sdk {
+        namespace internal {
+            /**
+             * The `units` module contains interfaces and base classes related to the concept of **units**.
+             * For more information on this concept, see the README of this repository, under "About Mendix models".
+             */
+            namespace units {
+                /**
+                 * An abstract unit is a vertex, and usually: a node, in the project tree, i.e. a macro-level construct.
+                 * Examples are: modules, folders, microflows, pages.
+                 * This interface is implemented by {@link AbstractUnit}.
+                 */
+                interface IAbstractUnit extends structures.IStructure {
+                    /**
+                     * The parent unit of this unit.
+                     */
+                    container: IStructuralUnit;
+                    /**
+                     * The name of the property of the parent's type which owns this unit.
+                     */
+                    /**
+                     * The {@link modelstore.IModelStore model store} holding the project/Mendix model this unit abides in.
+                     */
+                    /**
+                     * Whether this unit has been completely loaded and does not consist of the unit's interface
+                     *  (which corresponds to the unit being partial).
+                     */
+                    isLoaded: boolean;
+                    /**
+                     * Whether this unit is currently being loaded.
+                     */
+                    /**
+                     * Registers a callback taking this unit as argument, to be executed after the unit has been mark
+                     * as completely loaded.
+                     */
+                    /**
+                     * Mark this unit as having been loaded.
+                     */
+                    /**
+                     * Mark this unit as being loaded.
+                     */
+                }
+                /**
+                 * Base class for implementations of {@link IAbstractUnit}.
+                 */
+                class AbstractUnit extends structures.Structure implements IAbstractUnit {
+                    container: StructuralUnit;
+                    constructor(isCreatingNewInstance: boolean, model: model.Model, container: StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+                    /**
+                     * Checks whether all attributes are available at this instant;
+                     * if false, a fetch is required to access these properties.
+                     */
+                    isLoaded: boolean;
+                    /**
+                     * Sends the create delta for this unit and all pending deltas.
+                     */
+                }
+                /**
+                 * A structural unit is a node (not a leaf) in the project tree.
+                 * Examples: folders & modules.
+                 */
+                interface IStructuralUnit extends IAbstractUnit {
+                }
+                /**
+                 * Implementation of {@link IStructuralUnit}.
+                 */
+                class StructuralUnit extends AbstractUnit implements IStructuralUnit {
+                    constructor(isCreatingNewInstance: boolean, model: model.Model, container: StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+                    unit: StructuralUnit;
+                }
+                /**
+                 * Model Units
+                 *
+                 * A model unit is a leaf (not a node) in the project tree and the root containing model {@link elements.Element} elements.
+                 * It is both a(n abstract) unit as well as "model element-like" by virtue of being an MxAbstractElement,
+                 * but minus the following features of MxElement:
+                 *  public - a model unit is public by nature
+                 *  container - a model unit is itself the root of the tree of elements it contains
+                 *
+                 * A unit acts as scope to resolve by-id references and keeps a cache of elements it owns.
+                 */
+                interface IModelUnit extends IAbstractUnit, elements.IAbstractElement {
+                    container: IStructuralUnit;
+                    moduleName: string;
+                }
+                interface IElementsCache {
+                    [id: string]: elements.AbstractElement;
+                }
+                /**
+                 * Implementation of {@link IModelUnit}.
+                 */
+                class ModelUnit extends elements.AbstractElement implements IModelUnit {
+                    container: StructuralUnit;
+                    constructor(isCreatingNewInstance: boolean, model: model.Model, container: StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+                    unit: ModelUnit;
+                    isLoaded: boolean;
+                    /**
+                     * Returns the module name of the model unit, which is the first section of the qualified name.
+                     */
+                    moduleName: string;
+                }
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    namespace sdk {
+        namespace internal {
+            /**
+             * The `properties` sub module contains all interfaces and classes
+             * required for handling and wrapping property values/settings.
+             */
+            namespace properties {
+                /**
+                 * Standard interface for an observable object.
+                 */
+                interface IObservable {
+                    observe(listener: any, fire: any): () => void;
+                }
+                /**
+                 * Abstract base wrapper for property values/settings.
+                 * All values/settings of ModelElement-s are wrapped in the appropriate way.
+                 * This is particularly important for reference values which require additional magic.
+                 */
+                class AbstractProperty<T, P extends IObservable> {
+                    protected parent: structures.Structure;
+                    protected name: string;
+                    protected isPublic: boolean;
+                    handle: () => void;
+                    observableValue: P;
+                    /**
+                     * initialValue is default value except parts and GUID-typed primitives.
+                     * (by-id/name references do not have default values.)
+                     */
+                    constructor(parent: structures.Structure, name: string, isPublic: boolean, initialValue: T, ...moreArgs: any[]);
+                    /**
+                     * Initialize should return something that is observable.
+                     * The property will observe this internal structure
+                     * and make sure changes are pushed to the server whenever needed, in its onChange event.
+                     */
+                    initialize(value: T, ...moreConstructorArgs: any[]): P;
+                    fireOnChange(): void;
+                    onChange(...args: any[]): void;
+                    get(): T;
+                    set(newValue: T): void;
+                    updateWithRawValue(value: any): void;
+                    assertLoaded(): void;
+                    resolveReferences(): void;
+                    dispose(): void;
+                }
+                /**
+                 * All primitive types.
+                 * Note: must match exactly with MxPrimitiveTypeEnum!
+                 */
+                enum PrimitiveTypeEnum {
+                    Integer = 0,
+                    String = 1,
+                    Boolean = 2,
+                    Double = 3,
+                    DateTime = 4,
+                    Guid = 5,
+                    Point = 6,
+                    Size = 7,
+                    Color = 8,
+                    Blob = 9,
+                }
+                class PrimitiveProperty<T> extends AbstractProperty<T, Mobservable.IObservableValue<T>> {
+                    private defaultValue;
+                    private primitiveType;
+                    initialize(defaultValue: T, primitiveType: PrimitiveTypeEnum): Mobservable.IObservableValue<T>;
+                    get(): T;
+                    set(newValue: T): void;
+                    updateWithRawValue(value: T): void;
+                    onChange(newValue: T, oldValue: T): void;
+                }
+                /**
+                 * Primitive-typed property values list.
+                 */
+                class PrimitiveListProperty<T> extends AbstractProperty<T[], Mobservable.IObservableArray<T>> {
+                    initialize(initialItems: T[]): Mobservable.IObservableArray<T>;
+                    get(): Mobservable.IObservableArray<T>;
+                    set(newValue: T[]): void;
+                    updateWithRawValue(value: T[]): void;
+                    onChange(change: Mobservable.IArraySplice<T> | Mobservable.IArrayChange<T>): void;
+                    toRawChangeValue(value: T): any;
+                }
+                /**
+                 * A property value that is an enum literal.
+                 */
+                class EnumProperty<T extends instances.IEnum> extends PrimitiveProperty<T> {
+                    private initialValue;
+                    protected enumType: new (key: string) => instances.IEnum;
+                    constructor(parent: structures.Structure, name: string, isPublic: boolean, initialValue: T, enumType: new (key: string) => instances.IEnum);
+                    updateWithRawValue(value: any): void;
+                    onChange(newValue: any, oldValue: any): void;
+                }
+                /**
+                 * A property value that is a list of enum literals.
+                 */
+                class EnumListProperty<T extends instances.IEnum> extends PrimitiveListProperty<T> {
+                    private initialValue;
+                    protected enumType: new (key: string) => instances.IEnum;
+                    constructor(parent: structures.Structure, name: string, isPublic: boolean, initialValue: T[], enumType: new (key: string) => instances.IEnum);
+                    updateWithRawValue(value: any): void;
+                    toRawChangeValue(value: T): any;
+                }
+                /**
+                 * A property value that is a (model) element.
+                 * Will detect when children are moved, added, deleted and sends the appropriate deltas.
+                 */
+                class PartProperty<T extends elements.Element> extends AbstractProperty<T, Mobservable.IObservableValue<T>> {
+                    protected parent: elements.AbstractElement;
+                    private hasDefaultValue;
+                    initialize(value: T, hasDefaultValue: boolean): Mobservable.IObservableValue<T>;
+                    get(): T;
+                    set(newValue: any): void;
+                    updateWithRawValue(value: any): void;
+                    onChange(newValue: elements.Element, oldValue: elements.Element): void;
+                    resolveReferences(): void;
+                    updateElementContainer(unit: units.ModelUnit): void;
+                    dispose(): void;
+                }
+                /**
+                 * A property value that is a list of (model) elements.
+                 * Will detect when children are moved, added, deleted and sends the appropriate deltas.
+                 */
+                class PartListProperty<T extends elements.Element> extends AbstractProperty<T[], Mobservable.IObservableArray<T>> {
+                    parent: elements.AbstractElement;
+                    initialize(initialItems: T[]): Mobservable.IObservableArray<T>;
+                    get(): Mobservable.IObservableArray<T>;
+                    set(newValue: T[]): void;
+                    updateWithRawValue(value: any): void;
+                    onChange(changeData: Mobservable.IArrayChange<T> | Mobservable.IArraySplice<T>): void;
+                    processChildRemoval(element: T): void;
+                    processChildAddition(index: number): void;
+                    resolveReferences(): void;
+                    updateElementContainer(unit: units.ModelUnit): void;
+                    removeChild(child: T): boolean;
+                    dispose(): void;
+                }
+                /**
+                 * Property value that references a (model) element by name.
+                 */
+                class ByNameReferenceProperty<T extends elements.IAbstractElement> extends AbstractProperty<T, references.ByNameReference<T>> {
+                    private targetType;
+                    parent: elements.AbstractElement;
+                    constructor(parent: elements.AbstractElement, name: string, isPublic: boolean, initialValue: T, targetType: string);
+                    initialize(value: T, targetType: string): references.ByNameReference<T>;
+                    get(): T;
+                    set(newValue: T): void;
+                    updateWithRawValue(value: string): void;
+                    resolveReferences(): void;
+                    onChange(newValue: T, oldValue: T): void;
+                    qualifiedName(): string;
+                    dispose(): void;
+                }
+                /**
+                 * Property value that references zero or more (model) elements by name.
+                 *
+                 * The reference list is only used internally, and externally a view of the referencelist that returns the real objects is exposed.
+                 * So, the flow is either:
+                 *  [server] -> [internal ref list (observable)] -> [update view]
+                 * or:
+                 *  [Sdk] -> [view] -- onchange ---> [internal ref list] --- onChange event ---> [send delta's]
+                 *
+                 * For simplicity sake referencesByName should be considered immutable here (TODO: they should be in general?), so that their internal value
+                 * doesn't need to be observed.
+                 */
+                class ByNameReferenceListProperty<T extends elements.IAbstractElement> extends AbstractProperty<T[], Mobservable.IObservableArray<references.ByNameReference<T>>> {
+                    private targetType;
+                    parent: elements.AbstractElement;
+                    private viewList;
+                    private viewListDisposer;
+                    constructor(parent: elements.AbstractElement, name: string, isPublic: boolean, value: T[], targetType: string);
+                    initialize(value: T[]): Mobservable.IObservableArray<references.ByNameReference<T>>;
+                    get(): instances.IList<T>;
+                    set(newElements: T[]): void;
+                    updateWithRawValue(qualifiedNames: string[]): void;
+                    resolveReferences(): void;
+                    qualifiedNames(): string[];
+                    dispose(): void;
+                    supressViewEvents: boolean;
+                    replaceViewItems(newItems: T[]): void;
+                    onChange(changeData: Mobservable.IArrayChange<references.ByNameReference<T>> | Mobservable.IArraySplice<references.ByNameReference<T>>): void;
+                    toRawChangeValue(reference: references.ByNameReference<T>): any;
+                }
+                /**
+                 * Property value that references a (model) element by id.
+                 */
+                class ByIdReferenceProperty<T extends elements.AbstractElement> extends AbstractProperty<T, references.ByIdReference<T>> {
+                    parent: elements.AbstractElement;
+                    initialize(value: T): references.ByIdReference<T>;
+                    get(): T;
+                    set(value: T): void;
+                    updateWithRawValue(value: string): void;
+                    resolveReferences(): void;
+                    onChange(newValue: T, oldValue: T): void;
+                    dispose(): void;
+                }
+                /**
+                 * Property value that is a derived value.
+                 */
+                class DerivedProperty<T> extends AbstractProperty<T, Mobservable.IObservableValue<T>> {
+                    constructor(parent: structures.Structure, name: string, isPublic: boolean, value: T, targetRefType?: string);
+                    initialize(value: any): Mobservable.IObservableValue<any>;
+                    get(): T;
+                    set(value: T): void;
+                    updateWithRawValue(value: any): void;
+                    qualifiedName(): string;
+                    dispose(): void;
+                }
+                /**
+                 * Property value that is a list of derived values.
+                 */
+                class DerivedListProperty<T> extends AbstractProperty<T[], Mobservable.IObservableArray<T>> {
+                    constructor(parent: structures.Structure, name: string, isPublic: boolean, value: T[], targetRefType?: string);
+                    initialize(value: T[]): Mobservable.IObservableArray<T>;
+                    get(): instances.IList<T>;
+                    set(value: T[]): void;
+                    updateWithRawValue(value: any): void;
+                    qualifiedNames(): string[];
+                    dispose(): void;
+                }
+                /**
+                 * Value of a property owned by a structural unit.
+                 */
+                class StructuralChildProperty<T> extends AbstractProperty<T, Mobservable.IObservableValue<T>> {
+                    constructor(parent: units.StructuralUnit, name: string, isPublic: boolean, value: T, targetRefType?: string);
+                    initialize(value: T): Mobservable.IObservableValue<T>;
+                    get(): T;
+                    set(value: T): void;
+                    updateWithRawValue(value: any): void;
+                    dispose(): void;
+                }
+                /**
+                 * Property instance that wraps a list of structural units.
+                 */
+                class StructuralChildListProperty<T> extends AbstractProperty<T[], Mobservable.IObservableArray<T>> {
+                    constructor(parent: units.StructuralUnit, name: string, isPublic: boolean, value: T[], targetRefType?: string);
+                    initialize(value: T[]): Mobservable.IObservableArray<T>;
+                    get(): instances.IList<T>;
+                    set(value: T[]): void;
+                    updateWithRawValue(value: any): void;
+                    dispose(): void;
+                }
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    namespace sdk {
+        namespace internal {
+            /**
+             * Types defined in this `transport` module express JSON serialisation and are shared with the Model API Server.
+             * Some types (points, deltas) are used verbatim through the rest of the SDK.
+             */
+            namespace transport {
+                /**
+                 * The contents of the `MetaData` table (which always contains one row) in the MPR contained in the working copy's MPK.
+                 * This is useful to determine product version and to be able to re-export the MPR as part of an MPK
+                 * that can be read in by the Business Modeler.
+                 */
+                interface IMprMetaData {
+                }
+                /**
+                 * The meta data for a working copy (- not for the MPR).
+                 */
+                interface IWorkingCopyMetaData {
+                    name: string;
+                    description: string;
+                    avatarUrl: string;
+                }
+                /**
+                 * The representation of a working copy.
+                 */
+                interface IWorkingCopy {
+                    id: string;
+                    metaData: IWorkingCopyMetaData;
+                    /**
+                     * OpenIDs of all users that are granted access.
+                     */
+                    members: string[];
+                    /**
+                     * The name of the MPR file within the working copy's MPK, relative to its root.
+                     * This will typically but not necessarily equal `project.mpr`.
+                     */
+                    mprFileName: string;
+                    mprMetaData: IMprMetaData;
+                }
+                /**
+                 * The base interface of any "structure", i.e. either any unit or an element within a model unit.
+                 */
+                interface IStructureJson {
+                    $Type: string;
+                    $ID: string;
+                }
+                /**
+                 * The base serialisation structure of a unit, i.e. either a structural or a model unit.
+                 */
+                interface IAbstractUnitJson extends IStructureJson {
+                    contents: {
+                        [key: string]: any;
+                    };
+                    containerId: string;
+                    containmentName: string;
+                }
+                /**
+                 * The base interface of an (model) element (within a model unit).
+                 * (It extends {@link IStructureJson} with a general map structure to hold arbitrary properties.)
+                 */
+                interface IAbstractElementJson extends IStructureJson {
+                    [key: string]: any;
+                }
+                /**
+                 * The base interface for any delta.
+                 */
+                interface IDelta {
+                    /**
+                     * The type of the delta, which can be one of deltas.deltas.DeltaTypes, as a string.
+                     * This type determines the rest of the JSON serialisation:<br/>
+                     *  "CREATE_ELEMENT" &rarr; ICreateElementDelta,<br/>
+                     *  "UPDATE_PROPERTY_VALUE" &rarr; IUpdatePropertyValueDelta,<br/>
+                     *  "MOVE_ELEMENT" &rarr; IMoveElementDelta,<br/>
+                     *  "DELETE_ELEMENT" &rarr; IDeleteElementDelta,<br/>
+                     *  "CREATE_UNIT" &rarr; ICreateUnitDelta.
+                     */
+                    deltaType: string;
+                    /**
+                     * The ID of the unit (containing an element or property value) to which the delta is to be applied.
+                     */
+                    unitId: string;
+                }
+                /**
+                 * Base interface for deltas acting on/in elements.
+                 */
+                interface IElementDelta extends IDelta {
+                    elementId: string;
+                }
+                /**
+                 * A delta to create an element.
+                 */
+                interface ICreateElementDelta extends IElementDelta {
+                    /**
+                     * The ID of the parent element to create the new element in.
+                     */
+                    parentId: string;
+                    /**
+                     * The name of the property to create the new element on/in.
+                     * This must a property of PART kind with an element type compatible with `elementType`.
+                     */
+                    parentPropertyName: string;
+                    /**
+                     * The qualified name of the type of element to create.
+                     */
+                    elementType: string;
+                }
+                /**
+                 * Information returned from a successful creation of an element.
+                 */
+                interface ICreateElementDeltaResult {
+                    /**
+                     * The index of a listy property to which the element was added,
+                     * or -1 if the property is not listy.
+                     */
+                    additionIndex: number;
+                }
+                /**
+                 * A delta to change the value of a property of an element,
+                 * in a way that's specific by the "_mutator_"" given.
+                 */
+                interface IUpdatePropertyValueDelta extends IElementDelta {
+                    propertyName: string;
+                    mutator: IMutator;
+                }
+                /**
+                 * Base interface for mutators acting on a property's value.
+                 */
+                interface IMutator {
+                    /**
+                     * The type of the mutator, which can be one of deltas.deltas.MutatorTypes, as a string.
+                     * This type determines the rest of the JSON serialisation:<br/>
+                     *  "CHANGE" &rarr; IChangeMutator,<br/>
+                     *  "ADD" &rarr; IAddMutator,<br/>
+                     *  "REMOVE" &rarr; IRemoveMutator,<br/>
+                     *  "MOVE" &rarr; IMoveMutator.<br/>
+                     */
+                    mutatorType: string;
+                }
+                /**
+                 * Sets the value of the whole property (if non-listy),
+                 * or a specific item (if listy - which item is indicated by `updateIndex`) to the given `value`.
+                 */
+                interface IChangeMutator extends IMutator {
+                    value: any;
+                    updateIndex?: number;
+                }
+                /**
+                 * Adds the given `value` to a listy property,
+                 * either at the end if `insertionIndex` is not set,
+                 * or at the indicated index, shifting any and all subsequent items "down".
+                 */
+                interface IAddMutator extends IMutator {
+                    value: any;
+                    insertionIndex?: number;
+                }
+                /**
+                 * Removes the item of a listy property with the given `removalIndex`,
+                 * shifting any and all subsequent items "up".
+                 */
+                interface IRemoveMutator extends IMutator {
+                    removalIndex: number;
+                }
+                /**
+                 * Moves the item of listy property at the given `fromIndex` to the given `toIndex`,
+                 * reshuffling all other items accordingly.
+                 */
+                interface IMoveMutator extends IMutator {
+                    fromIndex: number;
+                    toIndex: number;
+                }
+                /**
+                 * Information returned from a successful update of a property value.
+                 */
+                interface IUpdatePropertyValueDeltaResult {
+                }
+                /**
+                 * A delta to move an element from one parent element to another.
+                 */
+                interface IMoveElementDelta extends IElementDelta {
+                    /**
+                     * The ID of the parent element to move the element indicated by `elementId` to.
+                     */
+                    newParentId: string;
+                    /**
+                     * The name of the property of the new parent element to put the element-to-move in/on.
+                     */
+                    newParentPropertyName: string;
+                    /**
+                     * If the indicated new property is listy, `newIndex` is the index where the element-to-move will end up.
+                     * If not set, the element-to-move will be added at the end.
+                     */
+                    newIndex?: number;
+                }
+                /**
+                 * Information returned from a successful move of an element.
+                 */
+                interface IMoveElementDeltaResult {
+                    /**
+                     * The ID of the parent element the element-to-move was removed from.
+                     */
+                    oldParentId: string;
+                    /**
+                     * The name of the property of the parent element the element-to-move was removed from.
+                     */
+                    oldParentPropertyName: string;
+                    /**
+                     * If the old property is listy, this was the index of the element-to-move within that list,
+                     * or -1 otherwise.
+                     */
+                    oldIndex: number;
+                    /**
+                     * If the new property is listy, this is the index of the moved element within that list,
+                     * or -1 otherwise.
+                     */
+                    newIndex: number;
+                }
+                /**
+                 * A delta to delete an element, including all its contained properties and children.
+                 */
+                interface IDeleteElementDelta extends IElementDelta {
+                }
+                /**
+                 * Information returned from a successful deletion of an element.
+                 */
+                interface IDeleteElementDeltaResult {
+                    /** The ID of the parent element from which the element was removed. */
+                    parentId: string;
+                    /**
+                     * The name of the property that contained the element.
+                     */
+                    propertyName: string;
+                    /**
+                     * The zero-based index at which the element was found,
+                     * if it resided inside a listy property; otherwise: -1.
+                     */
+                    removalIndex: number;
+                }
+                /**
+                 * A delta to create a (structural or model) unit.
+                 */
+                interface ICreateUnitDelta extends IDelta {
+                    /**
+                     * The ID of the containing unit.
+                     * (This relates to the project tree.)
+                     */
+                    containerId: string;
+                    /**
+                     * The name of the property of the containing unit which will contain the unit-to-create.
+                     * (This relates to the project tree.)
+                     */
+                    containmentName: string;
+                    /**
+                     * The qualified name of the type of unit to create.
+                     */
+                    contentType: string;
+                }
+                /**
+                 * Information returned from a successful creation of a unit.
+                 */
+                interface ICreateUnitDeltaResult {
+                }
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    /**
+     * Module containing several often-used interfaces.
+     */
+    namespace common {
+        /**
+         * Representation of a point.
+         */
+        interface IPoint {
+            x: number;
+            y: number;
+        }
+        /**
+         * Representation of a size, e.g. of an entity box.
+         */
+        interface ISize {
+            width: number;
+            height: number;
+        }
+        /**
+         * Representation of an RGB color.
+         */
+        interface IColor {
+            red: number;
+            green: number;
+            blue: number;
+        }
+        /**
+         * Unification of the {@link IPoint} and {@link ISize} types.
+         */
+        interface IDimension extends IPoint, ISize {
+        }
+        /**
+         * Callback interface returning nothing, not even an error.
+         */
+        interface IVoidCallback {
+            (): void;
+        }
+        /**
+         * Callback interface returning an error at most.
+         */
+        interface IErrorCallback {
+            (err: any): void;
+        }
+        /**
+         * Callback interface returning data of some type `T`.
+         */
+        interface ICallback<T> {
+            (data: T): void;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    namespace sdk {
+        /**
+         * The `utils` module contains various utility interfaces and functions.
+         */
+        namespace utils {
+            /**
+             * Generates a random UUID to set the ID of an element or unit to.
+             * There is no intrinsic ID collision detection/avoidance mechanism but it's good enough in practice.
+             */
+            function randomUuid(): any;
+            /**
+             * Flattens an array of arrays of items of type `T`, returning a single array
+             * that consists of the concatenation of the original arrays.
+             * This is especially useful for arrays of arrays of observables since the `lodash`
+             * doesn't handle these correctly.
+             */
+            function flatten<T>(array: T[][]): T[];
+            /**
+             * Combines the given `parts` and returns them as an URL, avoiding duplicate slashes.
+             */
+            function combineUrl(...parts: string[]): string;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Projects`.
+     */
+    namespace projects {
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         */
+        interface IProject extends units.IStructuralUnit {
+            load(): Project;
+            load(callback: (element: Project) => void): any;
+            projectDocuments: instances.IList<IProjectDocument>;
+            modules: instances.IList<IModule>;
+            projectConversion: IProjectConversion;
+            isSystemProject: boolean;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         */
+        class Project extends units.StructuralUnit implements IProject {
+            static typeName: string;
+            projectDocuments: instances.IList<ProjectDocument>;
+            modules: instances.IList<Module>;
+            projectConversion: ProjectConversion;
+            isSystemProject: boolean;
+            constructor(container: units.IStructuralUnit);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         */
+        interface IProjectDocument extends units.IModelUnit {
+            container: IProject;
+            load(): ProjectDocument;
+            load(callback: (element: ProjectDocument) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ProjectDocument extends units.ModelUnit implements IProjectDocument {
+            static typeName: string;
+            container: Project;
+            constructor(container: IProject);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IFolderBase extends units.IStructuralUnit {
+            load(): FolderBase;
+            load(callback: (element: FolderBase) => void): any;
+            folders: instances.IList<IFolder>;
+            documents: instances.IList<IDocument>;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class FolderBase extends units.StructuralUnit implements IFolderBase {
+            static typeName: string;
+            folders: instances.IList<Folder>;
+            documents: instances.IList<Document>;
+            constructor(container: units.IStructuralUnit);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/howto50/Add+documents+to+a+module relevant section in reference guide}
+         */
+        interface IFolder extends IFolderBase {
+            container: IFolderBase;
+            load(): Folder;
+            load(callback: (element: Folder) => void): any;
+            name: string;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/howto50/Add+documents+to+a+module relevant section in reference guide}
+         */
+        class Folder extends FolderBase implements IFolder {
+            static typeName: string;
+            container: FolderBase;
+            name: string;
+            constructor(container: IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Modules relevant section in reference guide}
+         */
+        interface IModule extends IFolderBase {
+            container: IProject;
+            load(): Module;
+            load(callback: (element: Module) => void): any;
+            sortIndex: number;
+            name: string;
+            domainModel: domainmodels.IDomainModel;
+            moduleSecurity: security.IModuleSecurity;
+            fromAppStore: boolean;
+            appStoreGuid: string;
+            appStoreVersionGuid: string;
+            appStoreVersion: string;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Modules relevant section in reference guide}
+         */
+        class Module extends FolderBase implements IModule {
+            static typeName: string;
+            container: Project;
+            sortIndex: number;
+            name: string;
+            domainModel: domainmodels.DomainModel;
+            moduleSecurity: security.ModuleSecurity;
+            fromAppStore: boolean;
+            appStoreGuid: string;
+            appStoreVersionGuid: string;
+            appStoreVersion: string;
+            constructor(container: IProject);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IModuleDocument extends units.IModelUnit {
+            container: IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: FolderBase;
+            constructor(container: IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends IModuleDocument {
+            container: IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends ModuleDocument implements IDocument {
+            static typeName: string;
+            container: FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IOneTimeConversionMarker extends elements.IElement {
+            container: IProjectConversion;
+            load(): OneTimeConversionMarker;
+            load(callback: (element: OneTimeConversionMarker) => void): any;
+        }
+        class OneTimeConversionMarker extends elements.Element implements IOneTimeConversionMarker {
+            static typeName: string;
+            container: ProjectConversion;
+            name: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IProjectConversion extends units.IModelUnit {
+            container: IProject;
+            load(): ProjectConversion;
+            load(callback: (element: ProjectConversion) => void): any;
+        }
+        class ProjectConversion extends units.ModelUnit implements IProjectConversion {
+            static typeName: string;
+            container: Project;
+            markers: instances.IList<OneTimeConversionMarker>;
+            constructor(container: IProject);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class ConversionState extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Start: ConversionState;
+            static SetAppstoreModules: ConversionState;
+            static UpdateAppstoreModules: ConversionState;
+            static SolveModelerErrors: ConversionState;
+            static FixJavaCode: ConversionState;
+            static FixIntegrationJavaCode: ConversionState;
+            static DeployToEclipse: ConversionState;
+            static MigrateJavaLibs: ConversionState;
+            static RemoveUnusedJars: ConversionState;
+            static CopyRuntimeJars: ConversionState;
+            static Finished: ConversionState;
+        }
+        class HashAlgorithmType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static BCrypt: HashAlgorithmType;
+            static SSHA256: HashAlgorithmType;
+            static SSHA: HashAlgorithmType;
+            static SHA256: HashAlgorithmType;
+            static SHA1: HashAlgorithmType;
+            static MD5: HashAlgorithmType;
+        }
+        class SecurityLevel extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static CheckNothing: SecurityLevel;
+            static CheckFormsAndMicroflows: SecurityLevel;
+            static CheckEverything: SecurityLevel;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Microflows`.
+     */
+    namespace microflows {
+        /**
+         * TODO
+         */
+        interface IMicroflowAction extends elements.IElement {
+            container: IActionActivity;
+            load(): MicroflowAction;
+            load(callback: (element: MicroflowAction) => void): any;
+        }
+        /**
+         * TODO
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MicroflowAction extends elements.Element implements IMicroflowAction {
+            static typeName: string;
+            container: ActionActivity;
+            errorHandlingType: ErrorHandlingType;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO: Missing in ref guide ?
+         */
+        interface IAppServiceCallAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): AppServiceCallAction;
+            load(callback: (element: AppServiceCallAction) => void): any;
+        }
+        /**
+         * TODO: Missing in ref guide ?
+         */
+        class AppServiceCallAction extends MicroflowAction implements IAppServiceCallAction {
+            static typeName: string;
+            container: ActionActivity;
+            appServiceAction: appservices.IAppServiceAction;
+            appServiceActionQualifiedName: string;
+            parameterMappings: instances.IList<AppServiceCallParameterMapping>;
+            useVariable: boolean;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO: Missing in ref guide ?
+         */
+        interface IAppServiceCallParameterMapping extends elements.IElement {
+            container: IAppServiceCallAction;
+            load(): AppServiceCallParameterMapping;
+            load(callback: (element: AppServiceCallParameterMapping) => void): any;
+        }
+        /**
+         * TODO: Missing in ref guide ?
+         */
+        class AppServiceCallParameterMapping extends elements.Element implements IAppServiceCallParameterMapping {
+            static typeName: string;
+            container: AppServiceCallAction;
+            parameter: appservices.IAppServiceActionParameter;
+            parameterQualifiedName: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            argument: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Call+Web+Service relevant section in reference guide}
+         */
+        interface IWebServiceCallAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): WebServiceCallAction;
+            load(callback: (element: WebServiceCallAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Call+Web+Service relevant section in reference guide}
+         */
+        class WebServiceCallAction extends MicroflowAction implements IWebServiceCallAction {
+            static typeName: string;
+            container: ActionActivity;
+            importedWebService: webservices.IImportedWebService;
+            importedWebServiceQualifiedName: string;
+            serviceName: string;
+            operationName: string;
+            useRequestTimeOut: boolean;
+            timeOut: number;
+            sendNullValueChoice: NullValueOption;
+            requestHeaderHandling: RequestHandling;
+            requestBodyHandling: RequestHandling;
+            resultHandling: ResultHandling;
+            httpConfiguration: HttpConfiguration;
+            isValidationRequired: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IRequestHandling extends elements.IElement {
+            container: IWebServiceCallAction;
+            load(): RequestHandling;
+            load(callback: (element: RequestHandling) => void): any;
+        }
+        /**
+         * TODO
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class RequestHandling extends elements.Element implements IRequestHandling {
+            static typeName: string;
+            container: WebServiceCallAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        /**
+         * TODO
+         */
+        interface IAdvancedRequestHandling extends IRequestHandling {
+            container: IWebServiceCallAction;
+            load(): AdvancedRequestHandling;
+            load(callback: (element: AdvancedRequestHandling) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class AdvancedRequestHandling extends RequestHandling implements IAdvancedRequestHandling {
+            static typeName: string;
+            container: WebServiceCallAction;
+            parameterMappings: instances.IList<WebServiceOperationAdvancedParameterMapping>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IHttpConfiguration extends elements.IElement {
+            container: IWebServiceCallAction;
+            load(): HttpConfiguration;
+            load(callback: (element: HttpConfiguration) => void): any;
+        }
+        class HttpConfiguration extends elements.Element implements IHttpConfiguration {
+            static typeName: string;
+            container: WebServiceCallAction;
+            overrideLocation: boolean;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            customLocation: string;
+            useAuthentication: boolean;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            httpAuthenticationUserName: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            authenticationPassword: string;
+            headerEntries: instances.IList<HttpHeaderEntry>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IHttpHeaderEntry extends elements.IElement {
+            container: IHttpConfiguration;
+            load(): HttpHeaderEntry;
+            load(callback: (element: HttpHeaderEntry) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class HttpHeaderEntry extends elements.Element implements IHttpHeaderEntry {
+            static typeName: string;
+            container: HttpConfiguration;
+            key: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            value: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IImportMappingCall extends elements.IElement {
+            container: IResultHandling;
+            load(): ImportMappingCall;
+            load(callback: (element: ImportMappingCall) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class ImportMappingCall extends elements.Element implements IImportMappingCall {
+            static typeName: string;
+            container: ResultHandling;
+            mapping: importmappings.IImportMapping;
+            mappingQualifiedName: string;
+            mappingArgumentVariableName: string;
+            range: Range;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Import+XML relevant section in reference guide}
+         */
+        interface IImportXmlAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): ImportXmlAction;
+            load(callback: (element: ImportXmlAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Import+XML relevant section in reference guide}
+         */
+        class ImportXmlAction extends MicroflowAction implements IImportXmlAction {
+            static typeName: string;
+            container: ActionActivity;
+            xmlDocumentVariableName: string;
+            resultHandling: ResultHandling;
+            isValidationRequired: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IResultHandling extends elements.IElement {
+            load(): ResultHandling;
+            load(callback: (element: ResultHandling) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class ResultHandling extends elements.Element implements IResultHandling {
+            static typeName: string;
+            importMappingCall: ImportMappingCall;
+            storeInVariable: boolean;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface ICustomRequestHandling extends IRequestHandling {
+            container: IWebServiceCallAction;
+            load(): CustomRequestHandling;
+            load(callback: (element: CustomRequestHandling) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class CustomRequestHandling extends RequestHandling implements ICustomRequestHandling {
+            static typeName: string;
+            container: WebServiceCallAction;
+            template: StringTemplate;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IMappingRequestHandling extends IRequestHandling {
+            container: IWebServiceCallAction;
+            load(): MappingRequestHandling;
+            load(callback: (element: MappingRequestHandling) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class MappingRequestHandling extends RequestHandling implements IMappingRequestHandling {
+            static typeName: string;
+            container: WebServiceCallAction;
+            mapping: exportmappings.IExportMapping;
+            mappingQualifiedName: string;
+            mappingArgumentVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface ISimpleRequestHandling extends IRequestHandling {
+            container: IWebServiceCallAction;
+            load(): SimpleRequestHandling;
+            load(callback: (element: SimpleRequestHandling) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class SimpleRequestHandling extends RequestHandling implements ISimpleRequestHandling {
+            static typeName: string;
+            container: WebServiceCallAction;
+            parameterMappings: instances.IList<WebServiceOperationSimpleParameterMapping>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Export+XML relevant section in reference guide}
+         */
+        interface IExportXmlAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): ExportXmlAction;
+            load(callback: (element: ExportXmlAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Export+XML relevant section in reference guide}
+         */
+        class ExportXmlAction extends MicroflowAction implements IExportXmlAction {
+            static typeName: string;
+            container: ActionActivity;
+            mapping: exportmappings.IExportMapping;
+            mappingQualifiedName: string;
+            mappingArgumentVariableName: string;
+            outputMethod: OutputMethod;
+            isValidationRequired: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IOutputMethod extends elements.IElement {
+            container: IExportXmlAction;
+            load(): OutputMethod;
+            load(callback: (element: OutputMethod) => void): any;
+        }
+        /**
+         * TODO
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class OutputMethod extends elements.Element implements IOutputMethod {
+            static typeName: string;
+            container: ExportXmlAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        /**
+         * TODO
+         */
+        interface IFileDocumentExport extends IOutputMethod {
+            container: IExportXmlAction;
+            load(): FileDocumentExport;
+            load(callback: (element: FileDocumentExport) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class FileDocumentExport extends OutputMethod implements IFileDocumentExport {
+            static typeName: string;
+            container: ExportXmlAction;
+            targetDocumentVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IVariableExport extends IOutputMethod {
+            container: IExportXmlAction;
+            load(): VariableExport;
+            load(callback: (element: VariableExport) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class VariableExport extends OutputMethod implements IVariableExport {
+            static typeName: string;
+            container: ExportXmlAction;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IWebServiceOperationAdvancedParameterMapping extends elements.IElement {
+            container: IAdvancedRequestHandling;
+            load(): WebServiceOperationAdvancedParameterMapping;
+            load(callback: (element: WebServiceOperationAdvancedParameterMapping) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class WebServiceOperationAdvancedParameterMapping extends elements.Element implements IWebServiceOperationAdvancedParameterMapping {
+            static typeName: string;
+            container: AdvancedRequestHandling;
+            isChecked: boolean;
+            parameterName: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            argument: string;
+            mapping: exportmappings.IExportMapping;
+            mappingQualifiedName: string;
+            mappingArgumentVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IWebServiceOperationSimpleParameterMapping extends elements.IElement {
+            container: ISimpleRequestHandling;
+            load(): WebServiceOperationSimpleParameterMapping;
+            load(callback: (element: WebServiceOperationSimpleParameterMapping) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class WebServiceOperationSimpleParameterMapping extends elements.Element implements IWebServiceOperationSimpleParameterMapping {
+            static typeName: string;
+            container: SimpleRequestHandling;
+            isChecked: boolean;
+            parameterName: string;
+            /**
+             * The value of this property is conceptually of type Mappings$ElementPath.
+             */
+            parameterPath: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            argument: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Close+Form relevant section in reference guide}
+         */
+        interface ICloseFormAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): CloseFormAction;
+            load(callback: (element: CloseFormAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Close+Form relevant section in reference guide}
+         */
+        class CloseFormAction extends MicroflowAction implements ICloseFormAction {
+            static typeName: string;
+            container: ActionActivity;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Download+File relevant section in reference guide}
+         */
+        interface IDownloadFileAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): DownloadFileAction;
+            load(callback: (element: DownloadFileAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Download+File relevant section in reference guide}
+         */
+        class DownloadFileAction extends MicroflowAction implements IDownloadFileAction {
+            static typeName: string;
+            container: ActionActivity;
+            fileDocumentVariableName: string;
+            showFileInBrowser: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDocumentTemplateParameterMapping extends elements.IElement {
+            container: IGenerateDocumentAction;
+            load(): DocumentTemplateParameterMapping;
+            load(callback: (element: DocumentTemplateParameterMapping) => void): any;
+        }
+        class DocumentTemplateParameterMapping extends elements.Element implements IDocumentTemplateParameterMapping {
+            static typeName: string;
+            container: GenerateDocumentAction;
+            widgetName: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            argument: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Generate+Document relevant section in reference guide}
+         */
+        interface IGenerateDocumentAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): GenerateDocumentAction;
+            load(callback: (element: GenerateDocumentAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Generate+Document relevant section in reference guide}
+         */
+        class GenerateDocumentAction extends MicroflowAction implements IGenerateDocumentAction {
+            static typeName: string;
+            container: ActionActivity;
+            parameterMappings: instances.IList<DocumentTemplateParameterMapping>;
+            fileVariableName: string;
+            languageVariableName: string;
+            documentType: TargetDocumentType;
+            languageSetting: LanguageSettingType;
+            documentTemplate: documenttemplates.IDocumentTemplate;
+            documentTemplateQualifiedName: string;
+            overrideTopMargin: boolean;
+            overrideBottomMargin: boolean;
+            overrideLeftMargin: boolean;
+            overrideRightMargin: boolean;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            marginLeftInInch: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            marginRightInInch: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            marginTopInInch: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            marginBottomInInch: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Show+Home+Page TODO: Page does not exist, should be created.}
+         */
+        interface IShowHomePageAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): ShowHomePageAction;
+            load(callback: (element: ShowHomePageAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Show+Home+Page TODO: Page does not exist, should be created.}
+         */
+        class ShowHomePageAction extends MicroflowAction implements IShowHomePageAction {
+            static typeName: string;
+            container: ActionActivity;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Show+Message relevant section in reference guide}
+         */
+        interface IShowMessageAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): ShowMessageAction;
+            load(callback: (element: ShowMessageAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Show+Message relevant section in reference guide}
+         */
+        class ShowMessageAction extends MicroflowAction implements IShowMessageAction {
+            static typeName: string;
+            container: ActionActivity;
+            template: TextTemplate;
+            type: ShowMessageType;
+            blocking: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Show+Page relevant section in reference guide}
+         */
+        interface IShowPageAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): ShowPageAction;
+            load(callback: (element: ShowPageAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Show+Page relevant section in reference guide}
+         */
+        class ShowPageAction extends MicroflowAction implements IShowPageAction {
+            static typeName: string;
+            container: ActionActivity;
+            pageSettings: pages.PageSettings;
+            passedObjectVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Validation+Feedback relevant section in reference guide}
+         */
+        interface IValidationFeedbackAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): ValidationFeedbackAction;
+            load(callback: (element: ValidationFeedbackAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Validation+Feedback relevant section in reference guide}
+         */
+        class ValidationFeedbackAction extends MicroflowAction implements IValidationFeedbackAction {
+            static typeName: string;
+            container: ActionActivity;
+            feedbackTemplate: TextTemplate;
+            objectVariableName: string;
+            /**
+             * See: {@link https://world.mendix.com/display/refguide5/Validation+Feedback See 'Member' section in reference guide}
+             */
+            attribute: domainmodels.IAttribute;
+            attributeQualifiedName: string;
+            /**
+             * See: {@link https://world.mendix.com/display/refguide5/Validation+Feedback See 'Member' section in reference guide}
+             */
+            association: domainmodels.IAssociationBase;
+            associationQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO: Abstract
+         */
+        interface IMicroflowObject extends elements.IElement {
+            container: IMicroflowObjectCollection;
+            load(): MicroflowObject;
+            load(callback: (element: MicroflowObject) => void): any;
+        }
+        /**
+         * TODO: Abstract
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MicroflowObject extends elements.Element implements IMicroflowObject {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            relativeMiddlePoint: common.IPoint;
+            size: common.ISize;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO: abstract element
+         */
+        interface IActivity extends IMicroflowObject {
+            container: IMicroflowObjectCollection;
+            load(): Activity;
+            load(callback: (element: Activity) => void): any;
+        }
+        /**
+         * TODO: abstract element
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Activity extends MicroflowObject implements IActivity {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Activities relevant section in reference guide}
+         */
+        interface IActionActivity extends IActivity {
+            container: IMicroflowObjectCollection;
+            load(): ActionActivity;
+            load(callback: (element: ActionActivity) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Activities relevant section in reference guide}
+         */
+        class ActionActivity extends Activity implements IActionActivity {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            action: MicroflowAction;
+            caption: string;
+            autoGenerateCaption: boolean;
+            backgroundColor: ActionActivityColor;
+            documentation: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Aggregate+List relevant section in reference guide}
+         */
+        interface IAggregateListAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): AggregateListAction;
+            load(callback: (element: AggregateListAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Aggregate+List relevant section in reference guide}
+         */
+        class AggregateListAction extends MicroflowAction implements IAggregateListAction {
+            static typeName: string;
+            container: ActionActivity;
+            inputListVariableName: string;
+            attribute: domainmodels.IAttribute;
+            attributeQualifiedName: string;
+            aggregateFunction: AggregateFunctionEnum;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Annotation relevant section in reference guide}
+         */
+        interface IAnnotation extends IMicroflowObject {
+            container: IMicroflowObjectCollection;
+            load(): Annotation;
+            load(callback: (element: Annotation) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Annotation relevant section in reference guide}
+         */
+        class Annotation extends MicroflowObject implements IAnnotation {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            caption: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO abstract
+         */
+        interface IFlow extends elements.IElement {
+            container: IMicroflowBase;
+            load(): Flow;
+            load(callback: (element: Flow) => void): any;
+        }
+        /**
+         * TODO abstract
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Flow extends elements.Element implements IFlow {
+            static typeName: string;
+            container: MicroflowBase;
+            origin: MicroflowObject;
+            destination: MicroflowObject;
+            originConnectionIndex: number;
+            destinationConnectionIndex: number;
+            originBezierVector: common.ISize;
+            destinationBezierVector: common.ISize;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Annotation+Flow relevant section in reference guide}
+         */
+        interface IAnnotationFlow extends IFlow {
+            container: IMicroflowBase;
+            load(): AnnotationFlow;
+            load(callback: (element: AnnotationFlow) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Annotation+Flow relevant section in reference guide}
+         */
+        class AnnotationFlow extends Flow implements IAnnotationFlow {
+            static typeName: string;
+            container: MicroflowBase;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IRetrieveSource extends elements.IElement {
+            container: IRetrieveAction;
+            load(): RetrieveSource;
+            load(callback: (element: RetrieveSource) => void): any;
+        }
+        /**
+         * TODO
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class RetrieveSource extends elements.Element implements IRetrieveSource {
+            static typeName: string;
+            container: RetrieveAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IAssociationRetrieveSource extends IRetrieveSource {
+            container: IRetrieveAction;
+            load(): AssociationRetrieveSource;
+            load(callback: (element: AssociationRetrieveSource) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class AssociationRetrieveSource extends RetrieveSource implements IAssociationRetrieveSource {
+            static typeName: string;
+            container: RetrieveAction;
+            startVariableName: string;
+            association: domainmodels.IAssociationBase;
+            associationQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IListOperation extends elements.IElement {
+            container: IListOperationAction;
+            load(): ListOperation;
+            load(callback: (element: ListOperation) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ListOperation extends elements.Element implements IListOperation {
+            static typeName: string;
+            container: ListOperationAction;
+            listVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IBinaryListOperation extends IListOperation {
+            container: IListOperationAction;
+            load(): BinaryListOperation;
+            load(callback: (element: BinaryListOperation) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class BinaryListOperation extends ListOperation implements IBinaryListOperation {
+            static typeName: string;
+            container: ListOperationAction;
+            secondListOrObjectName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Break+Event relevant section in reference guide}
+         */
+        interface IBreakEvent extends IMicroflowObject {
+            container: IMicroflowObjectCollection;
+            load(): BreakEvent;
+            load(callback: (element: BreakEvent) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Break+Event relevant section in reference guide}
+         */
+        class BreakEvent extends MicroflowObject implements IBreakEvent {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface ICaseValue extends elements.IElement {
+            container: ISequenceFlow;
+            load(): CaseValue;
+            load(callback: (element: CaseValue) => void): any;
+        }
+        /**
+         * TODO
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class CaseValue extends elements.Element implements ICaseValue {
+            static typeName: string;
+            container: SequenceFlow;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Cast+Object relevant section in reference guide}
+         */
+        interface ICastAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): CastAction;
+            load(callback: (element: CastAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Cast+Object relevant section in reference guide}
+         */
+        class CastAction extends MicroflowAction implements ICastAction {
+            static typeName: string;
+            container: ActionActivity;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IChangeMembersAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): ChangeMembersAction;
+            load(callback: (element: ChangeMembersAction) => void): any;
+        }
+        /**
+         * TODO
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ChangeMembersAction extends MicroflowAction implements IChangeMembersAction {
+            static typeName: string;
+            container: ActionActivity;
+            items: instances.IList<MemberChange>;
+            refreshInClient: boolean;
+            commit: CommitEnum;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Change+Object relevant section in reference guide}
+         */
+        interface IChangeObjectAction extends IChangeMembersAction {
+            container: IActionActivity;
+            load(): ChangeObjectAction;
+            load(callback: (element: ChangeObjectAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Change+Object relevant section in reference guide}
+         */
+        class ChangeObjectAction extends ChangeMembersAction implements IChangeObjectAction {
+            static typeName: string;
+            container: ActionActivity;
+            changeVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IMemberChange extends elements.IElement {
+            container: IChangeMembersAction;
+            load(): MemberChange;
+            load(callback: (element: MemberChange) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class MemberChange extends elements.Element implements IMemberChange {
+            static typeName: string;
+            container: ChangeMembersAction;
+            attribute: domainmodels.IAttribute;
+            attributeQualifiedName: string;
+            association: domainmodels.IAssociationBase;
+            associationQualifiedName: string;
+            type: ChangeActionItemType;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            value: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Change+List relevant section in reference guide}
+         */
+        interface IChangeListAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): ChangeListAction;
+            load(callback: (element: ChangeListAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Change+List relevant section in reference guide}
+         */
+        class ChangeListAction extends MicroflowAction implements IChangeListAction {
+            static typeName: string;
+            container: ActionActivity;
+            changeVariableName: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            value: string;
+            type: ChangeListActionType;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Change+Variable relevant section in reference guide}
+         */
+        interface IChangeVariableAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): ChangeVariableAction;
+            load(callback: (element: ChangeVariableAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Change+Variable relevant section in reference guide}
+         */
+        class ChangeVariableAction extends MicroflowAction implements IChangeVariableAction {
+            static typeName: string;
+            container: ActionActivity;
+            changeVariableName: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            value: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Commit+Object(s) relevant section in reference guide}
+         */
+        interface ICommitAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): CommitAction;
+            load(callback: (element: CommitAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Commit+Object(s) relevant section in reference guide}
+         */
+        class CommitAction extends MicroflowAction implements ICommitAction {
+            static typeName: string;
+            container: ActionActivity;
+            withEvents: boolean;
+            commitVariableName: string;
+            refreshInClient: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO: also described in ImporrtXmlAction and CallWebServiceAction
+         */
+        interface IRange extends elements.IElement {
+            load(): Range;
+            load(callback: (element: Range) => void): any;
+        }
+        /**
+         * TODO: also described in ImporrtXmlAction and CallWebServiceAction
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Range extends elements.Element implements IRange {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        /**
+         * TODO: also described in ImporrtXmlAction and CallWebServiceAction
+         */
+        interface IConstantRange extends IRange {
+            load(): ConstantRange;
+            load(callback: (element: ConstantRange) => void): any;
+        }
+        /**
+         * TODO: also described in ImporrtXmlAction and CallWebServiceAction
+         */
+        class ConstantRange extends Range implements IConstantRange {
+            static typeName: string;
+            singleObject: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IContains extends IBinaryListOperation {
+            container: IListOperationAction;
+            load(): Contains;
+            load(callback: (element: Contains) => void): any;
+        }
+        class Contains extends BinaryListOperation implements IContains {
+            static typeName: string;
+            container: ListOperationAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Continue+Event relevant section in reference guide}
+         */
+        interface IContinueEvent extends IMicroflowObject {
+            container: IMicroflowObjectCollection;
+            load(): ContinueEvent;
+            load(callback: (element: ContinueEvent) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Continue+Event relevant section in reference guide}
+         */
+        class ContinueEvent extends MicroflowObject implements IContinueEvent {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Persistent+Create+Object relevant section in reference guide}
+         */
+        interface IDeprecatedCreateAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): DeprecatedCreateAction;
+            load(callback: (element: DeprecatedCreateAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Persistent+Create+Object relevant section in reference guide}
+         */
+        class DeprecatedCreateAction extends MicroflowAction implements IDeprecatedCreateAction {
+            static typeName: string;
+            container: ActionActivity;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            refreshInClient: boolean;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Create+Object relevant section in reference guide}
+         */
+        interface ICreateObjectAction extends IChangeMembersAction {
+            container: IActionActivity;
+            load(): CreateObjectAction;
+            load(callback: (element: CreateObjectAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Create+Object relevant section in reference guide}
+         */
+        class CreateObjectAction extends ChangeMembersAction implements ICreateObjectAction {
+            static typeName: string;
+            container: ActionActivity;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Create+List relevant section in reference guide}
+         */
+        interface ICreateListAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): CreateListAction;
+            load(callback: (element: CreateListAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Create+List relevant section in reference guide}
+         */
+        class CreateListAction extends MicroflowAction implements ICreateListAction {
+            static typeName: string;
+            container: ActionActivity;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Create+Variable relevant section in reference guide}
+         */
+        interface ICreateVariableAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): CreateVariableAction;
+            load(callback: (element: CreateVariableAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Create+Variable relevant section in reference guide}
+         */
+        class CreateVariableAction extends MicroflowAction implements ICreateVariableAction {
+            static typeName: string;
+            container: ActionActivity;
+            variableName: string;
+            /**
+             * The value of this property is conceptually of type Common$DataType.
+             */
+            variableDataType: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            initialValue: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO: also described in ImporrtXmlAction and CallWebServiceAction
+         */
+        interface ICustomRange extends IRange {
+            load(): CustomRange;
+            load(callback: (element: CustomRange) => void): any;
+        }
+        /**
+         * TODO: also described in ImporrtXmlAction and CallWebServiceAction
+         */
+        class CustomRange extends Range implements ICustomRange {
+            static typeName: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            limitExpression: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            offsetExpression: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IDatabaseRetrieveSource extends IRetrieveSource {
+            container: IRetrieveAction;
+            load(): DatabaseRetrieveSource;
+            load(callback: (element: DatabaseRetrieveSource) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class DatabaseRetrieveSource extends RetrieveSource implements IDatabaseRetrieveSource {
+            static typeName: string;
+            container: RetrieveAction;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            range: Range;
+            /**
+             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
+             */
+            xPathConstraint: string;
+            sortItemList: SortItemList;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Delete+Object(s) relevant section in reference guide}
+         */
+        interface IDeleteAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): DeleteAction;
+            load(callback: (element: DeleteAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Delete+Object(s) relevant section in reference guide}
+         */
+        class DeleteAction extends MicroflowAction implements IDeleteAction {
+            static typeName: string;
+            container: ActionActivity;
+            deleteVariableName: string;
+            refreshInClient: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/End+Event relevant section in reference guide}
+         */
+        interface IEndEvent extends IMicroflowObject {
+            container: IMicroflowObjectCollection;
+            load(): EndEvent;
+            load(callback: (element: EndEvent) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/End+Event relevant section in reference guide}
+         */
+        class EndEvent extends MicroflowObject implements IEndEvent {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            returnValue: string;
+            documentation: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IEnumerationCase extends ICaseValue {
+            container: ISequenceFlow;
+            load(): EnumerationCase;
+            load(callback: (element: EnumerationCase) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class EnumerationCase extends CaseValue implements IEnumerationCase {
+            static typeName: string;
+            container: SequenceFlow;
+            value: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IListEquals extends IBinaryListOperation {
+            container: IListOperationAction;
+            load(): ListEquals;
+            load(callback: (element: ListEquals) => void): any;
+        }
+        class ListEquals extends BinaryListOperation implements IListEquals {
+            static typeName: string;
+            container: ListOperationAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Error+Event relevant section in reference guide}
+         */
+        interface IErrorEvent extends IMicroflowObject {
+            container: IMicroflowObjectCollection;
+            load(): ErrorEvent;
+            load(callback: (element: ErrorEvent) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Error+Event relevant section in reference guide}
+         */
+        class ErrorEvent extends MicroflowObject implements IErrorEvent {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Merge relevant section in reference guide}
+         */
+        interface IExclusiveMerge extends IMicroflowObject {
+            container: IMicroflowObjectCollection;
+            load(): ExclusiveMerge;
+            load(callback: (element: ExclusiveMerge) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Merge relevant section in reference guide}
+         */
+        class ExclusiveMerge extends MicroflowObject implements IExclusiveMerge {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Exclusive+Split relevant section in reference guide}
+         */
+        interface IExclusiveSplit extends IMicroflowObject {
+            container: IMicroflowObjectCollection;
+            load(): ExclusiveSplit;
+            load(callback: (element: ExclusiveSplit) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Exclusive+Split relevant section in reference guide}
+         */
+        class ExclusiveSplit extends MicroflowObject implements IExclusiveSplit {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            splitCondition: SplitCondition;
+            caption: string;
+            errorHandlingType: ErrorHandlingType;
+            documentation: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO : Abstract
+         */
+        interface ISplitCondition extends elements.IElement {
+            container: IExclusiveSplit;
+            load(): SplitCondition;
+            load(callback: (element: SplitCondition) => void): any;
+        }
+        /**
+         * TODO : Abstract
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class SplitCondition extends elements.Element implements ISplitCondition {
+            static typeName: string;
+            container: ExclusiveSplit;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IExpressionSplitCondition extends ISplitCondition {
+            container: IExclusiveSplit;
+            load(): ExpressionSplitCondition;
+            load(callback: (element: ExpressionSplitCondition) => void): any;
+        }
+        class ExpressionSplitCondition extends SplitCondition implements IExpressionSplitCondition {
+            static typeName: string;
+            container: ExclusiveSplit;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            expression: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IInspectAttribute extends IListOperation {
+            container: IListOperationAction;
+            load(): InspectAttribute;
+            load(callback: (element: InspectAttribute) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class InspectAttribute extends ListOperation implements IInspectAttribute {
+            static typeName: string;
+            container: ListOperationAction;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            expression: string;
+            attribute: domainmodels.IAttribute;
+            attributeQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IFilter extends IInspectAttribute {
+            container: IListOperationAction;
+            load(): Filter;
+            load(callback: (element: Filter) => void): any;
+        }
+        class Filter extends InspectAttribute implements IFilter {
+            static typeName: string;
+            container: ListOperationAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IFind extends IInspectAttribute {
+            container: IListOperationAction;
+            load(): Find;
+            load(callback: (element: Find) => void): any;
+        }
+        class Find extends InspectAttribute implements IFind {
+            static typeName: string;
+            container: ListOperationAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IHead extends IListOperation {
+            container: IListOperationAction;
+            load(): Head;
+            load(callback: (element: Head) => void): any;
+        }
+        class Head extends ListOperation implements IHead {
+            static typeName: string;
+            container: ListOperationAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IInheritanceCase extends ICaseValue {
+            container: ISequenceFlow;
+            load(): InheritanceCase;
+            load(callback: (element: InheritanceCase) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class InheritanceCase extends CaseValue implements IInheritanceCase {
+            static typeName: string;
+            container: SequenceFlow;
+            value: domainmodels.IEntity;
+            valueQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Inheritance+Split relevant section in reference guide}
+         */
+        interface IInheritanceSplit extends IMicroflowObject {
+            container: IMicroflowObjectCollection;
+            load(): InheritanceSplit;
+            load(callback: (element: InheritanceSplit) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Inheritance+Split relevant section in reference guide}
+         */
+        class InheritanceSplit extends MicroflowObject implements IInheritanceSplit {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            splitVariableName: string;
+            caption: string;
+            documentation: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IIntersect extends IBinaryListOperation {
+            container: IListOperationAction;
+            load(): Intersect;
+            load(callback: (element: Intersect) => void): any;
+        }
+        class Intersect extends BinaryListOperation implements IIntersect {
+            static typeName: string;
+            container: ListOperationAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Java+Action+Call relevant section in reference guide}
+         */
+        interface IJavaActionCallAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): JavaActionCallAction;
+            load(callback: (element: JavaActionCallAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Java+Action+Call relevant section in reference guide}
+         */
+        class JavaActionCallAction extends MicroflowAction implements IJavaActionCallAction {
+            static typeName: string;
+            container: ActionActivity;
+            javaAction: javaactions.IJavaAction;
+            javaActionQualifiedName: string;
+            parameterMappings: instances.IList<JavaActionParameterMapping>;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IJavaActionParameterMapping extends elements.IElement {
+            container: IJavaActionCallAction;
+            load(): JavaActionParameterMapping;
+            load(callback: (element: JavaActionParameterMapping) => void): any;
+        }
+        class JavaActionParameterMapping extends elements.Element implements IJavaActionParameterMapping {
+            static typeName: string;
+            container: JavaActionCallAction;
+            parameter: javaactions.IJavaActionParameter;
+            parameterQualifiedName: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            argument: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/List+Operation relevant section in reference guide}
+         */
+        interface IListOperationAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): ListOperationAction;
+            load(callback: (element: ListOperationAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/List+Operation relevant section in reference guide}
+         */
+        class ListOperationAction extends MicroflowAction implements IListOperationAction {
+            static typeName: string;
+            container: ActionActivity;
+            operation: ListOperation;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Log+Message relevant section in reference guide}
+         */
+        interface ILogMessageAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): LogMessageAction;
+            load(callback: (element: LogMessageAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Log+Message relevant section in reference guide}
+         */
+        class LogMessageAction extends MicroflowAction implements ILogMessageAction {
+            static typeName: string;
+            container: ActionActivity;
+            level: LogLevel;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            node: string;
+            messageTemplate: StringTemplate;
+            includeLatestStackTrace: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Loop relevant section in reference guide}
+         */
+        interface ILoopedActivity extends IActivity {
+            container: IMicroflowObjectCollection;
+            load(): LoopedActivity;
+            load(callback: (element: LoopedActivity) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Loop relevant section in reference guide}
+         */
+        class LoopedActivity extends Activity implements ILoopedActivity {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            objectCollection: MicroflowObjectCollection;
+            iteratedListVariableName: string;
+            loopVariableName: string;
+            errorHandlingType: ErrorHandlingType;
+            documentation: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO: Abstract
+         */
+        interface IMicroflowBase extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): MicroflowBase;
+            load(callback: (element: MicroflowBase) => void): any;
+            /**
+             * The value of this property is conceptually of type Common$DataType.
+             */
+            returnType: string;
+        }
+        /**
+         * TODO: Abstract
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MicroflowBase extends projects.Document implements IMicroflowBase {
+            static typeName: string;
+            container: projects.FolderBase;
+            objectCollection: MicroflowObjectCollection;
+            flows: instances.IList<Flow>;
+            /**
+             * The value of this property is conceptually of type Common$DataType.
+             */
+            returnType: string;
+            applyEntityAccess: boolean;
+            markAsUsed: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Microflows relevant section in reference guide}
+         */
+        interface IMicroflow extends IMicroflowBase {
+            container: projects.IFolderBase;
+            load(): Microflow;
+            load(callback: (element: Microflow) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Microflows relevant section in reference guide}
+         */
+        class Microflow extends MicroflowBase implements IMicroflow {
+            static typeName: string;
+            container: projects.FolderBase;
+            allowedModuleRoles: instances.IList<security.IModuleRole>;
+            allowedModuleRolesQualifiedNames: string[];
+            allowConcurrentExecution: boolean;
+            concurrenyErrorMessage: texts.Text;
+            concurrencyErrorMicroflow: IMicroflow;
+            concurrencyErrorMicroflowQualifiedName: string;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMicroflowCall extends elements.IElement {
+            container: IMicroflowCallAction;
+            load(): MicroflowCall;
+            load(callback: (element: MicroflowCall) => void): any;
+        }
+        class MicroflowCall extends elements.Element implements IMicroflowCall {
+            static typeName: string;
+            container: MicroflowCallAction;
+            microflow: IMicroflow;
+            microflowQualifiedName: string;
+            parameterMappings: instances.IList<MicroflowCallParameterMapping>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Microflow+Call relevant section in reference guide}
+         */
+        interface IMicroflowCallAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): MicroflowCallAction;
+            load(callback: (element: MicroflowCallAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Microflow+Call relevant section in reference guide}
+         */
+        class MicroflowCallAction extends MicroflowAction implements IMicroflowCallAction {
+            static typeName: string;
+            container: ActionActivity;
+            microflowCall: MicroflowCall;
+            useReturnVariable: boolean;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMicroflowCallParameterMapping extends elements.IElement {
+            container: IMicroflowCall;
+            load(): MicroflowCallParameterMapping;
+            load(callback: (element: MicroflowCallParameterMapping) => void): any;
+        }
+        class MicroflowCallParameterMapping extends elements.Element implements IMicroflowCallParameterMapping {
+            static typeName: string;
+            container: MicroflowCall;
+            parameter: IMicroflowParameter;
+            parameterQualifiedName: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            argument: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO: artificial object
+         */
+        interface IMicroflowObjectCollection extends elements.IElement {
+            load(): MicroflowObjectCollection;
+            load(callback: (element: MicroflowObjectCollection) => void): any;
+        }
+        /**
+         * TODO: artificial object
+         */
+        class MicroflowObjectCollection extends elements.Element implements IMicroflowObjectCollection {
+            static typeName: string;
+            objects: instances.IList<MicroflowObject>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMicroflowParameterBase extends elements.IElement {
+            container: IMicroflowBase;
+            load(): MicroflowParameterBase;
+            load(callback: (element: MicroflowParameterBase) => void): any;
+            name: string;
+            /**
+             * The value of this property is conceptually of type Common$DataType.
+             */
+            type: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MicroflowParameterBase extends elements.Element implements IMicroflowParameterBase {
+            static typeName: string;
+            container: MicroflowBase;
+            name: string;
+            /**
+             * The value of this property is conceptually of type Common$DataType.
+             */
+            type: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Parameter relevant section in reference guide}
+         */
+        interface IMicroflowParameter extends IMicroflowParameterBase {
+            container: IMicroflow;
+            load(): MicroflowParameter;
+            load(callback: (element: MicroflowParameter) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Parameter relevant section in reference guide}
+         */
+        class MicroflowParameter extends MicroflowParameterBase implements IMicroflowParameter {
+            static typeName: string;
+            container: Microflow;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Parameter relevant section in reference guide}
+         */
+        interface IRuleParameter extends IMicroflowParameterBase {
+            container: IRule;
+            load(): RuleParameter;
+            load(callback: (element: RuleParameter) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Parameter relevant section in reference guide}
+         */
+        class RuleParameter extends MicroflowParameterBase implements IRuleParameter {
+            static typeName: string;
+            container: Rule;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMicroflowParameterObject extends IMicroflowObject {
+            container: IMicroflowObjectCollection;
+            load(): MicroflowParameterObject;
+            load(callback: (element: MicroflowParameterObject) => void): any;
+        }
+        class MicroflowParameterObject extends MicroflowObject implements IMicroflowParameterObject {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            name: string;
+            /**
+             * The value of this property is conceptually of type Common$DataType.
+             */
+            type: string;
+            documentation: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface INoCase extends ICaseValue {
+            container: ISequenceFlow;
+            load(): NoCase;
+            load(callback: (element: NoCase) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class NoCase extends CaseValue implements INoCase {
+            static typeName: string;
+            container: SequenceFlow;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Retrieve relevant section in reference guide}
+         */
+        interface IRetrieveAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): RetrieveAction;
+            load(callback: (element: RetrieveAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Retrieve relevant section in reference guide}
+         */
+        class RetrieveAction extends MicroflowAction implements IRetrieveAction {
+            static typeName: string;
+            container: ActionActivity;
+            retrieveSource: RetrieveSource;
+            outputVariableName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Rollback+Object relevant section in reference guide}
+         */
+        interface IRollbackAction extends IMicroflowAction {
+            container: IActionActivity;
+            load(): RollbackAction;
+            load(callback: (element: RollbackAction) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Rollback+Object relevant section in reference guide}
+         */
+        class RollbackAction extends MicroflowAction implements IRollbackAction {
+            static typeName: string;
+            container: ActionActivity;
+            rollbackVariableName: string;
+            refreshInClient: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Rules relevant section in reference guide}
+         */
+        interface IRule extends IMicroflowBase {
+            container: projects.IFolderBase;
+            load(): Rule;
+            load(callback: (element: Rule) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Rules relevant section in reference guide}
+         */
+        class Rule extends MicroflowBase implements IRule {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IRuleCall extends elements.IElement {
+            container: IRuleSplitCondition;
+            load(): RuleCall;
+            load(callback: (element: RuleCall) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class RuleCall extends elements.Element implements IRuleCall {
+            static typeName: string;
+            container: RuleSplitCondition;
+            rule: IRule;
+            ruleQualifiedName: string;
+            parameterMappings: instances.IList<RuleCallParameterMapping>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IRuleCallParameterMapping extends elements.IElement {
+            container: IRuleCall;
+            load(): RuleCallParameterMapping;
+            load(callback: (element: RuleCallParameterMapping) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class RuleCallParameterMapping extends elements.Element implements IRuleCallParameterMapping {
+            static typeName: string;
+            container: RuleCall;
+            parameter: IRuleParameter;
+            parameterQualifiedName: string;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            argument: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IRuleSplitCondition extends ISplitCondition {
+            container: IExclusiveSplit;
+            load(): RuleSplitCondition;
+            load(callback: (element: RuleSplitCondition) => void): any;
+        }
+        class RuleSplitCondition extends SplitCondition implements IRuleSplitCondition {
+            static typeName: string;
+            container: ExclusiveSplit;
+            ruleCall: RuleCall;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Sequence+Flow relevant section in reference guide}
+         */
+        interface ISequenceFlow extends IFlow {
+            container: IMicroflowBase;
+            load(): SequenceFlow;
+            load(callback: (element: SequenceFlow) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Sequence+Flow relevant section in reference guide}
+         */
+        class SequenceFlow extends Flow implements ISequenceFlow {
+            static typeName: string;
+            container: MicroflowBase;
+            caseValue: CaseValue;
+            isErrorHandler: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ISort extends IListOperation {
+            container: IListOperationAction;
+            load(): Sort;
+            load(callback: (element: Sort) => void): any;
+        }
+        class Sort extends ListOperation implements ISort {
+            static typeName: string;
+            container: ListOperationAction;
+            sortItemList: SortItemList;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface ISortItem extends elements.IElement {
+            container: ISortItemList;
+            load(): SortItem;
+            load(callback: (element: SortItem) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class SortItem extends elements.Element implements ISortItem {
+            static typeName: string;
+            container: SortItemList;
+            /**
+             * The value of this property is conceptually of type Paths$AttributePath.
+             */
+            attributePath: string;
+            sortOrder: SortOrderEnum;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface ISortItemList extends elements.IElement {
+            load(): SortItemList;
+            load(callback: (element: SortItemList) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class SortItemList extends elements.Element implements ISortItemList {
+            static typeName: string;
+            items: instances.IList<SortItem>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Start+Event relevant section in reference guide}
+         */
+        interface IStartEvent extends IMicroflowObject {
+            container: IMicroflowObjectCollection;
+            load(): StartEvent;
+            load(callback: (element: StartEvent) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Start+Event relevant section in reference guide}
+         */
+        class StartEvent extends MicroflowObject implements IStartEvent {
+            static typeName: string;
+            container: MicroflowObjectCollection;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ITemplate extends elements.IElement {
+            load(): Template;
+            load(callback: (element: Template) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Template extends elements.Element implements ITemplate {
+            static typeName: string;
+            arguments: instances.IList<TemplateArgument>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface IStringTemplate extends ITemplate {
+            load(): StringTemplate;
+            load(callback: (element: StringTemplate) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class StringTemplate extends Template implements IStringTemplate {
+            static typeName: string;
+            text: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ISubtract extends IBinaryListOperation {
+            container: IListOperationAction;
+            load(): Subtract;
+            load(callback: (element: Subtract) => void): any;
+        }
+        class Subtract extends BinaryListOperation implements ISubtract {
+            static typeName: string;
+            container: ListOperationAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ITail extends IListOperation {
+            container: IListOperationAction;
+            load(): Tail;
+            load(callback: (element: Tail) => void): any;
+        }
+        class Tail extends ListOperation implements ITail {
+            static typeName: string;
+            container: ListOperationAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface ITemplateArgument extends elements.IElement {
+            container: ITemplate;
+            load(): TemplateArgument;
+            load(callback: (element: TemplateArgument) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class TemplateArgument extends elements.Element implements ITemplateArgument {
+            static typeName: string;
+            container: Template;
+            /**
+             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
+             */
+            expression: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * TODO
+         */
+        interface ITextTemplate extends ITemplate {
+            load(): TextTemplate;
+            load(callback: (element: TextTemplate) => void): any;
+        }
+        /**
+         * TODO
+         */
+        class TextTemplate extends Template implements ITextTemplate {
+            static typeName: string;
+            text: texts.Text;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IUnion extends IBinaryListOperation {
+            container: IListOperationAction;
+            load(): Union;
+            load(callback: (element: Union) => void): any;
+        }
+        class Union extends BinaryListOperation implements IUnion {
+            static typeName: string;
+            container: ListOperationAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class NullValueOption extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static SendAsNil: NullValueOption;
+            static LeaveOutElement: NullValueOption;
+        }
+        class LanguageSettingType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static CurrentUser: LanguageSettingType;
+            static ProjectDefault: LanguageSettingType;
+            static Variable: LanguageSettingType;
+        }
+        class TargetDocumentType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static HTML: TargetDocumentType;
+            static PDF: TargetDocumentType;
+            static DOCX: TargetDocumentType;
+            static DOC: TargetDocumentType;
+            static RTF: TargetDocumentType;
+            static ODT: TargetDocumentType;
+        }
+        class ShowMessageType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Information: ShowMessageType;
+            static Warning: ShowMessageType;
+            static Error: ShowMessageType;
+        }
+        class ActionActivityColor extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Default: ActionActivityColor;
+            static Red: ActionActivityColor;
+            static Orange: ActionActivityColor;
+            static Yellow: ActionActivityColor;
+            static Green: ActionActivityColor;
+            static Blue: ActionActivityColor;
+            static Purple: ActionActivityColor;
+            static Gray: ActionActivityColor;
+        }
+        class AggregateFunctionEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Sum: AggregateFunctionEnum;
+            static Average: AggregateFunctionEnum;
+            static Count: AggregateFunctionEnum;
+            static Minimum: AggregateFunctionEnum;
+            static Maximum: AggregateFunctionEnum;
+        }
+        class ChangeActionItemType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Set: ChangeActionItemType;
+            static Add: ChangeActionItemType;
+            static Remove: ChangeActionItemType;
+        }
+        class ChangeListActionType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Set: ChangeListActionType;
+            static Add: ChangeListActionType;
+            static Remove: ChangeListActionType;
+            static Clear: ChangeListActionType;
+        }
+        class CommitEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Yes: CommitEnum;
+            static YesWithoutEvents: CommitEnum;
+            static No: CommitEnum;
+        }
+        class ErrorHandlingType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Rollback: ErrorHandlingType;
+            static Custom: ErrorHandlingType;
+            static CustomWithoutRollBack: ErrorHandlingType;
+            static Continue: ErrorHandlingType;
+        }
+        class LogLevel extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Trace: LogLevel;
+            static Debug: LogLevel;
+            static Info: LogLevel;
+            static Warning: LogLevel;
+            static Error: LogLevel;
+            static Critical: LogLevel;
+        }
+        class SortOrderEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Ascending: SortOrderEnum;
+            static Descending: SortOrderEnum;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `WebServices`.
+     */
+    namespace webservices {
+        interface IDataMember extends elements.IElement {
+            load(): DataMember;
+            load(callback: (element: DataMember) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class DataMember extends elements.Element implements IDataMember {
+            static typeName: string;
+            isLockedByContract: boolean;
+            exposedName: string;
+            isOptionalByContract: boolean;
+            isOptional: boolean;
+            isNillableByContract: boolean;
+            isNillable: boolean;
+            isKey: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataEntityBase extends IDataMember {
+            load(): DataEntityBase;
+            load(callback: (element: DataEntityBase) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class DataEntityBase extends DataMember implements IDataEntityBase {
+            static typeName: string;
+            childMembers: instances.IList<DataMember>;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            exposedItemName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataAssociation extends IDataEntityBase {
+            container: IDataEntityBase;
+            load(): DataAssociation;
+            load(callback: (element: DataAssociation) => void): any;
+        }
+        class DataAssociation extends DataEntityBase implements IDataAssociation {
+            static typeName: string;
+            container: DataEntityBase;
+            associationByContract: appservices.MsdAssociation;
+            association: domainmodels.IAssociationBase;
+            associationQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataAttribute extends IDataMember {
+            container: IDataEntityBase;
+            load(): DataAttribute;
+            load(callback: (element: DataAttribute) => void): any;
+        }
+        class DataAttribute extends DataMember implements IDataAttribute {
+            static typeName: string;
+            container: DataEntityBase;
+            attributeByContract: appservices.MsdAttribute;
+            attribute: domainmodels.IAttribute;
+            attributeQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataEntity extends IDataEntityBase {
+            load(): DataEntity;
+            load(callback: (element: DataEntity) => void): any;
+        }
+        class DataEntity extends DataEntityBase implements IDataEntity {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Imported+Web+Services relevant section in reference guide}
+         */
+        interface IImportedWebService extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): ImportedWebService;
+            load(callback: (element: ImportedWebService) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Imported+Web+Services relevant section in reference guide}
+         */
+        class ImportedWebService extends projects.Document implements IImportedWebService {
+            static typeName: string;
+            container: projects.FolderBase;
+            wsdlDescription: WsdlDescription;
+            wsdlUrl: string;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IOperationInfo extends elements.IElement {
+            container: IServiceInfo;
+            load(): OperationInfo;
+            load(callback: (element: OperationInfo) => void): any;
+        }
+        class OperationInfo extends elements.Element implements IOperationInfo {
+            static typeName: string;
+            container: ServiceInfo;
+            requestHeaderRpcElement: RpcOperationElement;
+            requestBodyRpcElement: RpcOperationElement;
+            responseBodyRpcElement: RpcOperationElement;
+            requestHeaderPartEncoding: PartEncoding;
+            requestBodyPartEncodings: instances.IList<PartEncoding>;
+            name: string;
+            documentation: string;
+            soapAction: string;
+            requestHeaderElementName: string;
+            requestHeaderEncoded: boolean;
+            requestBodyEncoded: boolean;
+            requestBodyElementName: string;
+            responseBodyElementName: string;
+            allowSimpleMappingInheritance: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IPartEncoding extends elements.IElement {
+            container: IOperationInfo;
+            load(): PartEncoding;
+            load(callback: (element: PartEncoding) => void): any;
+        }
+        class PartEncoding extends elements.Element implements IPartEncoding {
+            static typeName: string;
+            container: OperationInfo;
+            partName: string;
+            partXsdType: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IPublishedServiceBase extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): PublishedServiceBase;
+            load(callback: (element: PublishedServiceBase) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class PublishedServiceBase extends projects.Document implements IPublishedServiceBase {
+            static typeName: string;
+            container: projects.FolderBase;
+            versionedServices: instances.IList<VersionedService>;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Published+App+Services relevant section in reference guide}
+         */
+        interface IPublishedAppService extends IPublishedServiceBase {
+            container: projects.IFolderBase;
+            load(): PublishedAppService;
+            load(callback: (element: PublishedAppService) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Published+App+Services relevant section in reference guide}
+         */
+        class PublishedAppService extends PublishedServiceBase implements IPublishedAppService {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IPublishedOperation extends elements.IElement {
+            container: IVersionedService;
+            load(): PublishedOperation;
+            load(callback: (element: PublishedOperation) => void): any;
+        }
+        class PublishedOperation extends elements.Element implements IPublishedOperation {
+            static typeName: string;
+            container: VersionedService;
+            parameters: instances.IList<PublishedParameter>;
+            dataEntity: DataEntity;
+            isLockedByContract: boolean;
+            name: string;
+            image: images.IImage;
+            imageQualifiedName: string;
+            description: string;
+            documentation: string;
+            microflow: microflows.IMicroflow;
+            microflowQualifiedName: string;
+            returnTypeNameByContract: string;
+            returnTypeSpecificationByContract: string;
+            entityExposedNameByContract: string;
+            entityExposedName: string;
+            returnTypeIsOptional: boolean;
+            returnTypeIsNillable: boolean;
+            returnType: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IPublishedParameter extends elements.IElement {
+            container: IPublishedOperation;
+            load(): PublishedParameter;
+            load(callback: (element: PublishedParameter) => void): any;
+        }
+        class PublishedParameter extends elements.Element implements IPublishedParameter {
+            static typeName: string;
+            container: PublishedOperation;
+            parameterByContract: appservices.MsdMicroflowParameter;
+            dataEntity: DataEntity;
+            isLockedByContract: boolean;
+            parameter: microflows.IMicroflowParameter;
+            parameterQualifiedName: string;
+            entityExposedName: string;
+            isOptionalByContract: boolean;
+            isOptional: boolean;
+            isNillable: boolean;
+            entityExposedItemNameByContract: string;
+            entityExposedItemName: string;
+            type: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Published+Web+Services relevant section in reference guide}
+         */
+        interface IPublishedWebService extends IPublishedServiceBase {
+            container: projects.IFolderBase;
+            load(): PublishedWebService;
+            load(callback: (element: PublishedWebService) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Published+Web+Services relevant section in reference guide}
+         */
+        class PublishedWebService extends PublishedServiceBase implements IPublishedWebService {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IRpcMessagePartElement extends elements.IElement {
+            container: IRpcOperationElement;
+            load(): RpcMessagePartElement;
+            load(callback: (element: RpcMessagePartElement) => void): any;
+        }
+        class RpcMessagePartElement extends elements.Element implements IRpcMessagePartElement {
+            static typeName: string;
+            container: RpcOperationElement;
+            partName: string;
+            typeName: string;
+            elementName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IRpcOperationElement extends elements.IElement {
+            container: IOperationInfo;
+            load(): RpcOperationElement;
+            load(callback: (element: RpcOperationElement) => void): any;
+        }
+        class RpcOperationElement extends elements.Element implements IRpcOperationElement {
+            static typeName: string;
+            container: OperationInfo;
+            messagePartElements: instances.IList<RpcMessagePartElement>;
+            name: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IServiceInfo extends elements.IElement {
+            container: IWsdlDescription;
+            load(): ServiceInfo;
+            load(callback: (element: ServiceInfo) => void): any;
+        }
+        class ServiceInfo extends elements.Element implements IServiceInfo {
+            static typeName: string;
+            container: WsdlDescription;
+            operations: instances.IList<OperationInfo>;
+            name: string;
+            documentation: string;
+            portName: string;
+            location: string;
+            soapVersion: SoapVersion;
+            locationConstant: constants.IConstant;
+            locationConstantQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Published+Web+Services relevant section in reference guide}
+         */
+        interface IVersionedService extends elements.IElement {
+            container: IPublishedServiceBase;
+            load(): VersionedService;
+            load(callback: (element: VersionedService) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Published+Web+Services relevant section in reference guide}
+         */
+        class VersionedService extends elements.Element implements IVersionedService {
+            static typeName: string;
+            container: PublishedServiceBase;
+            operations: instances.IList<PublishedOperation>;
+            enumerationsByContract: appservices.MsdEnumerationContainer;
+            documentation: string;
+            targetNamespace: string;
+            headerAuthentication: integration.HeaderAuthentication;
+            isLockedByContract: boolean;
+            headerImportMapping: importmappings.IImportMapping;
+            headerImportMappingQualifiedName: string;
+            headerMicroflow: microflows.IMicroflow;
+            headerMicroflowQualifiedName: string;
+            versionNumber: number;
+            caption: string;
+            description: string;
+            appServiceState: AppServiceState;
+            image: images.IImage;
+            imageQualifiedName: string;
+            validate: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IWsdlDescription extends elements.IElement {
+            load(): WsdlDescription;
+            load(callback: (element: WsdlDescription) => void): any;
+        }
+        class WsdlDescription extends elements.Element implements IWsdlDescription {
+            static typeName: string;
+            wsdlEntries: instances.IList<WsdlEntry>;
+            schemaEntries: instances.IList<xmlschemas.MxXmlSchemaEntry>;
+            services: instances.IList<ServiceInfo>;
+            targetNamespace: string;
+            importsHaveLocations: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IWsdlEntry extends elements.IElement {
+            container: IWsdlDescription;
+            load(): WsdlEntry;
+            load(callback: (element: WsdlEntry) => void): any;
+        }
+        class WsdlEntry extends elements.Element implements IWsdlEntry {
+            static typeName: string;
+            container: WsdlDescription;
+            location: string;
+            contents: string;
+            localizedLocationFormat: string;
+            localizedContentsFormat: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class AppServiceState extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Draft: AppServiceState;
+            static Consumable: AppServiceState;
+            static Deprecated: AppServiceState;
+        }
+        class SoapVersion extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Soap11: SoapVersion;
+            static Soap12: SoapVersion;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import instances = internal.instances;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Integration`.
+     */
+    namespace integration {
+        class AppServiceLocationEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Default: AppServiceLocationEnum;
+            static Constant: AppServiceLocationEnum;
+            static Parameter: AppServiceLocationEnum;
+        }
+        class ElementType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Undefined: ElementType;
+            static Inheritance: ElementType;
+            static Choice: ElementType;
+            static Object: ElementType;
+            static Value: ElementType;
+            static Sequence: ElementType;
+            static All: ElementType;
+        }
+        class HeaderAuthentication extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static None: HeaderAuthentication;
+            static UsernamePassword: HeaderAuthentication;
+            static Custom: HeaderAuthentication;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `XmlSchemas`.
+     */
+    namespace xmlschemas {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/XML+Schemas relevant section in reference guide}
+         */
+        interface IMxXmlSchema extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): MxXmlSchema;
+            load(callback: (element: MxXmlSchema) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/XML+Schemas relevant section in reference guide}
+         */
+        class MxXmlSchema extends projects.Document implements IMxXmlSchema {
+            static typeName: string;
+            container: projects.FolderBase;
+            schemaEntries: instances.IList<MxXmlSchemaEntry>;
+            filePath: string;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMxXmlSchemaEntry extends elements.IElement {
+            load(): MxXmlSchemaEntry;
+            load(callback: (element: MxXmlSchemaEntry) => void): any;
+        }
+        class MxXmlSchemaEntry extends elements.Element implements IMxXmlSchemaEntry {
+            static typeName: string;
+            targetNamespace: string;
+            location: string;
+            contents: string;
+            localizedLocationFormat: string;
+            localizedContentsFormat: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class XmlPrimitiveType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Unknown: XmlPrimitiveType;
+            static Boolean: XmlPrimitiveType;
+            static Date: XmlPrimitiveType;
+            static Time: XmlPrimitiveType;
+            static DateTime: XmlPrimitiveType;
+            static Decimal: XmlPrimitiveType;
+            static Float: XmlPrimitiveType;
+            static Integer: XmlPrimitiveType;
+            static Binary: XmlPrimitiveType;
+            static String: XmlPrimitiveType;
+            static AnyType: XmlPrimitiveType;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `AppServices`.
+     */
+    namespace appservices {
+        interface IAppServiceAction extends elements.IElement {
+            container: IConsumedAppService;
+            load(): AppServiceAction;
+            load(callback: (element: AppServiceAction) => void): any;
+            parameters: instances.IList<IAppServiceActionParameter>;
+            name: string;
+        }
+        class AppServiceAction extends elements.Element implements IAppServiceAction {
+            static typeName: string;
+            container: ConsumedAppService;
+            parameters: instances.IList<AppServiceActionParameter>;
+            microflow: microflows.IMicroflow;
+            microflowQualifiedName: string;
+            returnType: string;
+            returnTypeCanBeEmpty: boolean;
+            name: string;
+            imageString: string;
+            caption: string;
+            description: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IAppServiceActionParameter extends elements.IElement {
+            container: IAppServiceAction;
+            load(): AppServiceActionParameter;
+            load(callback: (element: AppServiceActionParameter) => void): any;
+            name: string;
+        }
+        class AppServiceActionParameter extends elements.Element implements IAppServiceActionParameter {
+            static typeName: string;
+            container: AppServiceAction;
+            name: string;
+            type: string;
+            canBeEmpty: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Consumed+App+Services relevant section in reference guide}
+         */
+        interface IConsumedAppService extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): ConsumedAppService;
+            load(callback: (element: ConsumedAppService) => void): any;
+            actions: instances.IList<IAppServiceAction>;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Consumed+App+Services relevant section in reference guide}
+         */
+        class ConsumedAppService extends projects.Document implements IConsumedAppService {
+            static typeName: string;
+            container: projects.FolderBase;
+            actions: instances.IList<AppServiceAction>;
+            msd: Msd;
+            fromAppStore: boolean;
+            appStoreGuid: string;
+            appStoreVersionGuid: string;
+            appStoreVersion: string;
+            appServiceLocation: integration.AppServiceLocationEnum;
+            locationConstant: constants.IConstant;
+            locationConstantQualifiedName: string;
+            useTimeOut: boolean;
+            timeOut: number;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsd extends elements.IElement {
+            container: IConsumedAppService;
+            load(): Msd;
+            load(callback: (element: Msd) => void): any;
+        }
+        class Msd extends elements.Element implements IMsd {
+            static typeName: string;
+            container: ConsumedAppService;
+            version: MsdVersion;
+            metadata: MsdMetadata;
+            domainModel: MsdDomainModel;
+            enumerations: MsdEnumerationContainer;
+            wsdlDescription: webservices.WsdlDescription;
+            wsdlString: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdAssociation extends elements.IElement {
+            load(): MsdAssociation;
+            load(callback: (element: MsdAssociation) => void): any;
+        }
+        class MsdAssociation extends elements.Element implements IMsdAssociation {
+            static typeName: string;
+            name: string;
+            guid: string;
+            parentEntityName: string;
+            childEntityName: string;
+            associationType: string;
+            associationOwner: string;
+            parentDeleteBehavior: string;
+            childDeleteBehavior: string;
+            associationKind: string;
+            parentX: number;
+            parentY: number;
+            childX: number;
+            childY: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdAttribute extends elements.IElement {
+            load(): MsdAttribute;
+            load(callback: (element: MsdAttribute) => void): any;
+        }
+        class MsdAttribute extends elements.Element implements IMsdAttribute {
+            static typeName: string;
+            name: string;
+            guid: string;
+            attributeType: string;
+            enumerationName: string;
+            defaultValue: string;
+            length: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdDomainModel extends elements.IElement {
+            container: IMsd;
+            load(): MsdDomainModel;
+            load(callback: (element: MsdDomainModel) => void): any;
+        }
+        class MsdDomainModel extends elements.Element implements IMsdDomainModel {
+            static typeName: string;
+            container: Msd;
+            entities: instances.IList<MsdEntity>;
+            associations: instances.IList<MsdAssociation>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdEntity extends elements.IElement {
+            container: IMsdDomainModel;
+            load(): MsdEntity;
+            load(callback: (element: MsdEntity) => void): any;
+        }
+        class MsdEntity extends elements.Element implements IMsdEntity {
+            static typeName: string;
+            container: MsdDomainModel;
+            attributes: instances.IList<MsdAttribute>;
+            name: string;
+            guid: string;
+            generalizationName: string;
+            persistable: boolean;
+            locationX: number;
+            locationY: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdEnumeration extends elements.IElement {
+            container: IMsdEnumerationContainer;
+            load(): MsdEnumeration;
+            load(callback: (element: MsdEnumeration) => void): any;
+        }
+        class MsdEnumeration extends elements.Element implements IMsdEnumeration {
+            static typeName: string;
+            container: MsdEnumerationContainer;
+            values: instances.IList<MsdEnumerationValue>;
+            name: string;
+            guid: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdEnumerationContainer extends elements.IElement {
+            load(): MsdEnumerationContainer;
+            load(callback: (element: MsdEnumerationContainer) => void): any;
+        }
+        class MsdEnumerationContainer extends elements.Element implements IMsdEnumerationContainer {
+            static typeName: string;
+            msdEnumerations: instances.IList<MsdEnumeration>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdEnumerationValue extends elements.IElement {
+            container: IMsdEnumeration;
+            load(): MsdEnumerationValue;
+            load(callback: (element: MsdEnumerationValue) => void): any;
+        }
+        class MsdEnumerationValue extends elements.Element implements IMsdEnumerationValue {
+            static typeName: string;
+            container: MsdEnumeration;
+            translations: instances.IList<MsdText>;
+            name: string;
+            guid: string;
+            base64image: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdMetadata extends elements.IElement {
+            container: IMsd;
+            load(): MsdMetadata;
+            load(callback: (element: MsdMetadata) => void): any;
+        }
+        class MsdMetadata extends elements.Element implements IMsdMetadata {
+            static typeName: string;
+            container: Msd;
+            microflows: instances.IList<MsdMicroflow>;
+            name: string;
+            documentation: string;
+            version: number;
+            publishDateTime: string;
+            serviceGuid: string;
+            versionGuid: string;
+            instanceGuid: string;
+            supportedProtocols: instances.IList<string>;
+            headerAuthentication: string;
+            caption: string;
+            imageBase64: string;
+            description: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdMicroflow extends elements.IElement {
+            container: IMsdMetadata;
+            load(): MsdMicroflow;
+            load(callback: (element: MsdMicroflow) => void): any;
+        }
+        class MsdMicroflow extends elements.Element implements IMsdMicroflow {
+            static typeName: string;
+            container: MsdMetadata;
+            parameters: instances.IList<MsdMicroflowParameter>;
+            name: string;
+            documentation: string;
+            imageBase64: string;
+            description: string;
+            returnType: string;
+            systemEntityType: string;
+            returnTypeSpecification: string;
+            returnTypeCanBeEmpty: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdMicroflowParameter extends elements.IElement {
+            load(): MsdMicroflowParameter;
+            load(callback: (element: MsdMicroflowParameter) => void): any;
+        }
+        class MsdMicroflowParameter extends elements.Element implements IMsdMicroflowParameter {
+            static typeName: string;
+            name: string;
+            type: string;
+            typeSpecification: string;
+            systemEntityType: string;
+            canBeEmpty: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdText extends elements.IElement {
+            container: IMsdEnumerationValue;
+            load(): MsdText;
+            load(callback: (element: MsdText) => void): any;
+        }
+        class MsdText extends elements.Element implements IMsdText {
+            static typeName: string;
+            container: MsdEnumerationValue;
+            languageCode: string;
+            caption: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMsdVersion extends elements.IElement {
+            container: IMsd;
+            load(): MsdVersion;
+            load(callback: (element: MsdVersion) => void): any;
+        }
+        class MsdVersion extends elements.Element implements IMsdVersion {
+            static typeName: string;
+            container: Msd;
+            version: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Mappings`.
+     */
+    namespace mappings {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMappingDocument extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): MappingDocument;
+            load(callback: (element: MappingDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MappingDocument extends projects.Document implements IMappingDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            rootMappingelements: instances.IList<ObjectMappingElement>;
+            mxXmlSchema: xmlschemas.IMxXmlSchema;
+            mxXmlSchemaQualifiedName: string;
+            rootElementName: string;
+            importedWebService: webservices.IImportedWebService;
+            importedWebServiceQualifiedName: string;
+            serviceName: string;
+            operationName: string;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMappingElement extends elements.IElement {
+            load(): MappingElement;
+            load(callback: (element: MappingElement) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MappingElement extends elements.Element implements IMappingElement {
+            static typeName: string;
+            documentation: string;
+            elementType: integration.ElementType;
+            path: string;
+            minOccurs: number;
+            maxOccurs: number;
+            nillable: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMappingMicroflowCall extends elements.IElement {
+            container: IObjectMappingElement;
+            load(): MappingMicroflowCall;
+            load(callback: (element: MappingMicroflowCall) => void): any;
+        }
+        class MappingMicroflowCall extends elements.Element implements IMappingMicroflowCall {
+            static typeName: string;
+            container: ObjectMappingElement;
+            parameterMappings: instances.IList<MappingMicroflowParameter>;
+            microflow: microflows.IMicroflow;
+            microflowQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMappingMicroflowParameter extends elements.IElement {
+            container: IMappingMicroflowCall;
+            load(): MappingMicroflowParameter;
+            load(callback: (element: MappingMicroflowParameter) => void): any;
+        }
+        class MappingMicroflowParameter extends elements.Element implements IMappingMicroflowParameter {
+            static typeName: string;
+            container: MappingMicroflowCall;
+            parameter: microflows.IMicroflowParameter;
+            parameterQualifiedName: string;
+            levelOfParent: number;
+            valueElementPath: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IObjectMappingElement extends IMappingElement {
+            load(): ObjectMappingElement;
+            load(callback: (element: ObjectMappingElement) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ObjectMappingElement extends MappingElement implements IObjectMappingElement {
+            static typeName: string;
+            mappingMicroflowCall: MappingMicroflowCall;
+            children: instances.IList<MappingElement>;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            association: domainmodels.IAssociationBase;
+            associationQualifiedName: string;
+            objectHandling: importmappings.ObjectHandlingEnum;
+            objectHandlingBackup: importmappings.ObjectHandlingBackupEnum;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IValueMappingElement extends IMappingElement {
+            container: IObjectMappingElement;
+            load(): ValueMappingElement;
+            load(callback: (element: ValueMappingElement) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ValueMappingElement extends MappingElement implements IValueMappingElement {
+            static typeName: string;
+            container: ObjectMappingElement;
+            xmlDataType: string;
+            isKey: boolean;
+            isXmlAttribute: boolean;
+            isContent: boolean;
+            attribute: domainmodels.IAttribute;
+            attributeQualifiedName: string;
+            converter: microflows.IMicroflow;
+            converterQualifiedName: string;
+            expectedContentTypes: string;
+            maxLength: number;
+            fractionDigits: number;
+            totalDigits: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `ExportMappings`.
+     */
+    namespace exportmappings {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMappingDocument extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): MappingDocument;
+            load(callback: (element: MappingDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MappingDocument extends projects.Document implements IMappingDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            rootMappingelements: instances.IList<mappings.ObjectMappingElement>;
+            mxXmlSchema: xmlschemas.IMxXmlSchema;
+            mxXmlSchemaQualifiedName: string;
+            rootElementName: string;
+            importedWebService: webservices.IImportedWebService;
+            importedWebServiceQualifiedName: string;
+            serviceName: string;
+            operationName: string;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Domain-to-XML+Mappings relevant section in reference guide}
+         */
+        interface IExportMapping extends mappings.IMappingDocument {
+            container: projects.IFolderBase;
+            load(): ExportMapping;
+            load(callback: (element: ExportMapping) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Domain-to-XML+Mappings relevant section in reference guide}
+         */
+        class ExportMapping extends mappings.MappingDocument implements IExportMapping {
+            static typeName: string;
+            container: projects.FolderBase;
+            parameterName: string;
+            parameterTypeName: string;
+            isHeader: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMappingElement extends elements.IElement {
+            load(): MappingElement;
+            load(callback: (element: MappingElement) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MappingElement extends elements.Element implements IMappingElement {
+            static typeName: string;
+            documentation: string;
+            elementType: integration.ElementType;
+            path: string;
+            minOccurs: number;
+            maxOccurs: number;
+            nillable: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IObjectMappingElement extends mappings.IMappingElement {
+            load(): ObjectMappingElement;
+            load(callback: (element: ObjectMappingElement) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ObjectMappingElement extends mappings.MappingElement implements IObjectMappingElement {
+            static typeName: string;
+            mappingMicroflowCall: mappings.MappingMicroflowCall;
+            children: instances.IList<mappings.MappingElement>;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            association: domainmodels.IAssociationBase;
+            associationQualifiedName: string;
+            objectHandling: importmappings.ObjectHandlingEnum;
+            objectHandlingBackup: importmappings.ObjectHandlingBackupEnum;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IExportObjectMappingElement extends mappings.IObjectMappingElement {
+            load(): ExportObjectMappingElement;
+            load(callback: (element: ExportObjectMappingElement) => void): any;
+        }
+        class ExportObjectMappingElement extends mappings.ObjectMappingElement implements IExportObjectMappingElement {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IValueMappingElement extends mappings.IMappingElement {
+            container: mappings.IObjectMappingElement;
+            load(): ValueMappingElement;
+            load(callback: (element: ValueMappingElement) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ValueMappingElement extends mappings.MappingElement implements IValueMappingElement {
+            static typeName: string;
+            container: mappings.ObjectMappingElement;
+            xmlDataType: string;
+            isKey: boolean;
+            isXmlAttribute: boolean;
+            isContent: boolean;
+            attribute: domainmodels.IAttribute;
+            attributeQualifiedName: string;
+            converter: microflows.IMicroflow;
+            converterQualifiedName: string;
+            expectedContentTypes: string;
+            maxLength: number;
+            fractionDigits: number;
+            totalDigits: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IExportValueMappingElement extends mappings.IValueMappingElement {
+            container: mappings.IObjectMappingElement;
+            load(): ExportValueMappingElement;
+            load(callback: (element: ExportValueMappingElement) => void): any;
+        }
+        class ExportValueMappingElement extends mappings.ValueMappingElement implements IExportValueMappingElement {
+            static typeName: string;
+            container: mappings.ObjectMappingElement;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `ImportMappings`.
+     */
+    namespace importmappings {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMappingDocument extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): MappingDocument;
+            load(callback: (element: MappingDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MappingDocument extends projects.Document implements IMappingDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            rootMappingelements: instances.IList<mappings.ObjectMappingElement>;
+            mxXmlSchema: xmlschemas.IMxXmlSchema;
+            mxXmlSchemaQualifiedName: string;
+            rootElementName: string;
+            importedWebService: webservices.IImportedWebService;
+            importedWebServiceQualifiedName: string;
+            serviceName: string;
+            operationName: string;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/XML-to-domain+Mappings relevant section in reference guide}
+         */
+        interface IImportMapping extends mappings.IMappingDocument {
+            container: projects.IFolderBase;
+            load(): ImportMapping;
+            load(callback: (element: ImportMapping) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/XML-to-domain+Mappings relevant section in reference guide}
+         */
+        class ImportMapping extends mappings.MappingDocument implements IImportMapping {
+            static typeName: string;
+            container: projects.FolderBase;
+            parameterEntity: domainmodels.IEntity;
+            parameterEntityQualifiedName: string;
+            useSubtransactionsForMicroflows: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMappingElement extends elements.IElement {
+            load(): MappingElement;
+            load(callback: (element: MappingElement) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MappingElement extends elements.Element implements IMappingElement {
+            static typeName: string;
+            documentation: string;
+            elementType: integration.ElementType;
+            path: string;
+            minOccurs: number;
+            maxOccurs: number;
+            nillable: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IObjectMappingElement extends mappings.IMappingElement {
+            load(): ObjectMappingElement;
+            load(callback: (element: ObjectMappingElement) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ObjectMappingElement extends mappings.MappingElement implements IObjectMappingElement {
+            static typeName: string;
+            mappingMicroflowCall: mappings.MappingMicroflowCall;
+            children: instances.IList<mappings.MappingElement>;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            association: domainmodels.IAssociationBase;
+            associationQualifiedName: string;
+            objectHandling: ObjectHandlingEnum;
+            objectHandlingBackup: ObjectHandlingBackupEnum;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IImportObjectMappingElement extends mappings.IObjectMappingElement {
+            load(): ImportObjectMappingElement;
+            load(callback: (element: ImportObjectMappingElement) => void): any;
+        }
+        class ImportObjectMappingElement extends mappings.ObjectMappingElement implements IImportObjectMappingElement {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IValueMappingElement extends mappings.IMappingElement {
+            container: mappings.IObjectMappingElement;
+            load(): ValueMappingElement;
+            load(callback: (element: ValueMappingElement) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ValueMappingElement extends mappings.MappingElement implements IValueMappingElement {
+            static typeName: string;
+            container: mappings.ObjectMappingElement;
+            xmlDataType: string;
+            isKey: boolean;
+            isXmlAttribute: boolean;
+            isContent: boolean;
+            attribute: domainmodels.IAttribute;
+            attributeQualifiedName: string;
+            converter: microflows.IMicroflow;
+            converterQualifiedName: string;
+            expectedContentTypes: string;
+            maxLength: number;
+            fractionDigits: number;
+            totalDigits: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IImportValueMappingElement extends mappings.IValueMappingElement {
+            container: mappings.IObjectMappingElement;
+            load(): ImportValueMappingElement;
+            load(callback: (element: ImportValueMappingElement) => void): any;
+        }
+        class ImportValueMappingElement extends mappings.ValueMappingElement implements IImportValueMappingElement {
+            static typeName: string;
+            container: mappings.ObjectMappingElement;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class ObjectHandlingBackupEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Create: ObjectHandlingBackupEnum;
+            static Ignore: ObjectHandlingBackupEnum;
+            static Error: ObjectHandlingBackupEnum;
+        }
+        class ObjectHandlingEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Create: ObjectHandlingEnum;
+            static Find: ObjectHandlingEnum;
+            static Custom: ObjectHandlingEnum;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Rest`.
+     */
+    namespace rest {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IPublishedRestServiceBase extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): PublishedRestServiceBase;
+            load(callback: (element: PublishedRestServiceBase) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class PublishedRestServiceBase extends projects.Document implements IPublishedRestServiceBase {
+            static typeName: string;
+            container: projects.FolderBase;
+            resources: instances.IList<PublishedRestResource>;
+            namespaceName: string;
+            path: string;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IPublishedOdataService extends IPublishedRestServiceBase {
+            container: projects.IFolderBase;
+            load(): PublishedOdataService;
+            load(callback: (element: PublishedOdataService) => void): any;
+        }
+        class PublishedOdataService extends PublishedRestServiceBase implements IPublishedOdataService {
+            static typeName: string;
+            container: projects.FolderBase;
+            allowedRoleIds: instances.IList<security.IModuleRole>;
+            allowedRoleIdsQualifiedNames: string[];
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IPublishedRestResource extends elements.IElement {
+            container: IPublishedRestServiceBase;
+            load(): PublishedRestResource;
+            load(callback: (element: PublishedRestResource) => void): any;
+        }
+        class PublishedRestResource extends elements.Element implements IPublishedRestResource {
+            static typeName: string;
+            container: PublishedRestServiceBase;
+            dataEntity: webservices.DataEntity;
+            path: string;
+            usePaging: boolean;
+            pageSize: number;
+            returnType: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IPublishedRestService extends IPublishedRestServiceBase {
+            container: projects.IFolderBase;
+            load(): PublishedRestService;
+            load(callback: (element: PublishedRestService) => void): any;
+        }
+        class PublishedRestService extends PublishedRestServiceBase implements IPublishedRestService {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Settings`.
+     */
+    namespace settings {
+        interface ICertificate extends elements.IElement {
+            container: IProjectSettings;
+            load(): Certificate;
+            load(callback: (element: Certificate) => void): any;
+        }
+        class Certificate extends elements.Element implements ICertificate {
+            static typeName: string;
+            container: ProjectSettings;
+            type: CertificateType;
+            data: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IConstantValue extends elements.IElement {
+            container: IServerConfiguration;
+            load(): ConstantValue;
+            load(callback: (element: ConstantValue) => void): any;
+        }
+        class ConstantValue extends elements.Element implements IConstantValue {
+            static typeName: string;
+            container: ServerConfiguration;
+            constant: constants.IConstant;
+            constantQualifiedName: string;
+            value: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ICustomSetting extends elements.IElement {
+            container: IServerConfiguration;
+            load(): CustomSetting;
+            load(callback: (element: CustomSetting) => void): any;
+        }
+        class CustomSetting extends elements.Element implements ICustomSetting {
+            static typeName: string;
+            container: ServerConfiguration;
+            name: string;
+            value: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IProjectSettingsPart extends elements.IElement {
+            container: IProjectSettings;
+            load(): ProjectSettingsPart;
+            load(callback: (element: ProjectSettingsPart) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ProjectSettingsPart extends elements.Element implements IProjectSettingsPart {
+            static typeName: string;
+            container: ProjectSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IIntegrationProjectSettingsPart extends IProjectSettingsPart {
+            container: IProjectSettings;
+            load(): IntegrationProjectSettingsPart;
+            load(callback: (element: IntegrationProjectSettingsPart) => void): any;
+        }
+        class IntegrationProjectSettingsPart extends ProjectSettingsPart implements IIntegrationProjectSettingsPart {
+            static typeName: string;
+            container: ProjectSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         */
+        interface IProjectDocument extends units.IModelUnit {
+            container: projects.IProject;
+            load(): ProjectDocument;
+            load(callback: (element: ProjectDocument) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ProjectDocument extends units.ModelUnit implements IProjectDocument {
+            static typeName: string;
+            container: projects.Project;
+            constructor(container: projects.IProject);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project+Settings relevant section in reference guide}
+         */
+        interface IProjectSettings extends projects.IProjectDocument {
+            container: projects.IProject;
+            load(): ProjectSettings;
+            load(callback: (element: ProjectSettings) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project+Settings relevant section in reference guide}
+         */
+        class ProjectSettings extends projects.ProjectDocument implements IProjectSettings {
+            static typeName: string;
+            container: projects.Project;
+            languages: instances.IList<texts.Language>;
+            settingsParts: instances.IList<ProjectSettingsPart>;
+            configurations: instances.IList<ServerConfiguration>;
+            certificates: instances.IList<Certificate>;
+            hashAlgorithm: projects.HashAlgorithmType;
+            roundingMode: RoundingMode;
+            conversionState: projects.ConversionState;
+            skipJarAnalyzerStep: boolean;
+            afterStartupMicroflow: microflows.IMicroflow;
+            afterStartupMicroflowQualifiedName: string;
+            beforeShutdownMicroflow: microflows.IMicroflow;
+            beforeShutdownMicroflowQualifiedName: string;
+            healthCheckMicroflow: microflows.IMicroflow;
+            healthCheckMicroflowQualifiedName: string;
+            defaultLanguageCode: string;
+            firstDayOfWeek: FirstDayOfWeekEnum;
+            defaultTimeZoneCode: string;
+            scheduledEventTimeZoneCode: string;
+            allowUserMultipleSessions: boolean;
+            lowerCaseMicroflowVariables: boolean;
+            constructor(container: projects.IProject);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IServerConfiguration extends elements.IElement {
+            container: IProjectSettings;
+            load(): ServerConfiguration;
+            load(callback: (element: ServerConfiguration) => void): any;
+        }
+        class ServerConfiguration extends elements.Element implements IServerConfiguration {
+            static typeName: string;
+            container: ProjectSettings;
+            customSettings: instances.IList<CustomSetting>;
+            constantValues: instances.IList<ConstantValue>;
+            name: string;
+            applicationRootUrl: string;
+            portOnlyLocal: boolean;
+            adminPortOnlyLocal: boolean;
+            portNumber: number;
+            adminPortNumber: number;
+            maxJavaHeapSize: number;
+            emulateCloudSecurity: boolean;
+            extraJvmParameters: string;
+            databaseType: DatabaseType;
+            databaseUrl: string;
+            databaseName: string;
+            databaseUseIntegratedSecurity: boolean;
+            databaseUserName: string;
+            databasePassword: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class CertificateType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Authority: CertificateType;
+            static Client: CertificateType;
+        }
+        class DatabaseType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Hsqldb: DatabaseType;
+            static SqlServer: DatabaseType;
+            static MySql: DatabaseType;
+            static Oracle: DatabaseType;
+            static PostgreSql: DatabaseType;
+        }
+        class FirstDayOfWeekEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Default: FirstDayOfWeekEnum;
+            static Sunday: FirstDayOfWeekEnum;
+            static Monday: FirstDayOfWeekEnum;
+            static Tuesday: FirstDayOfWeekEnum;
+            static Wednesday: FirstDayOfWeekEnum;
+            static Thursday: FirstDayOfWeekEnum;
+            static Friday: FirstDayOfWeekEnum;
+            static Saturday: FirstDayOfWeekEnum;
+        }
+        class RoundingMode extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static HalfUp: RoundingMode;
+            static HalfEven: RoundingMode;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Pages`.
+     */
+    namespace pages {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
+         */
+        interface IFormBase extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): FormBase;
+            load(callback: (element: FormBase) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class FormBase extends projects.Document implements IFormBase {
+            static typeName: string;
+            container: projects.FolderBase;
+            canvasWidth: number;
+            canvasHeight: number;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Page relevant section in reference guide}
+         */
+        interface IPage extends IFormBase {
+            container: projects.IFolderBase;
+            load(): Page;
+            load(callback: (element: Page) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Page relevant section in reference guide}
+         */
+        class Page extends FormBase implements IPage {
+            static typeName: string;
+            container: projects.FolderBase;
+            layoutCall: LayoutCall;
+            title: texts.Text;
+            class: string;
+            style: string;
+            allowedRoles: instances.IList<security.IModuleRole>;
+            allowedRolesQualifiedNames: string[];
+            popupWidth: number;
+            popupHeight: number;
+            popupResizable: boolean;
+            markAsUsed: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Layout relevant section in reference guide}
+         */
+        interface ILayout extends IFormBase {
+            container: projects.IFolderBase;
+            load(): Layout;
+            load(callback: (element: Layout) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Layout relevant section in reference guide}
+         */
+        class Layout extends FormBase implements ILayout {
+            static typeName: string;
+            container: projects.FolderBase;
+            widget: Widget;
+            layoutCall: LayoutCall;
+            layoutType: LayoutType;
+            mainPlaceholder: ILayoutParameter;
+            mainPlaceholderQualifiedName: string;
+            acceptButtonPlaceholder: ILayoutParameter;
+            acceptButtonPlaceholderQualifiedName: string;
+            cancelButtonPlaceholder: ILayoutParameter;
+            cancelButtonPlaceholderQualifiedName: string;
+            useMainPlaceholderForPopups: boolean;
+            class: string;
+            style: string;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ILayoutCall extends elements.IElement {
+            load(): LayoutCall;
+            load(callback: (element: LayoutCall) => void): any;
+        }
+        class LayoutCall extends elements.Element implements ILayoutCall {
+            static typeName: string;
+            layout: ILayout;
+            layoutQualifiedName: string;
+            arguments: instances.IList<LayoutCallArgument>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ILayoutCallArgument extends elements.IElement {
+            container: ILayoutCall;
+            load(): LayoutCallArgument;
+            load(callback: (element: LayoutCallArgument) => void): any;
+        }
+        class LayoutCallArgument extends elements.Element implements ILayoutCallArgument {
+            static typeName: string;
+            container: LayoutCall;
+            parameterName: string;
+            widget: Widget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ILayoutParameter extends elements.IElement {
+            container: ILayout;
+            load(): LayoutParameter;
+            load(callback: (element: LayoutParameter) => void): any;
+            name: string;
+        }
+        class LayoutParameter extends elements.Element implements ILayoutParameter {
+            static typeName: string;
+            container: Layout;
+            name: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
+         */
+        interface IWidget extends elements.IElement {
+            load(): Widget;
+            load(callback: (element: Widget) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Widget extends elements.Element implements IWidget {
+            static typeName: string;
+            name: string;
+            class: string;
+            style: string;
+            tabIndex: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Placeholder relevant section in reference guide}
+         */
+        interface IPlaceholder extends IWidget {
+            load(): Placeholder;
+            load(callback: (element: Placeholder) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Placeholder relevant section in reference guide}
+         */
+        class Placeholder extends Widget implements IPlaceholder {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IClientAction extends elements.IElement {
+            load(): ClientAction;
+            load(callback: (element: ClientAction) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ClientAction extends elements.Element implements IClientAction {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface INoClientAction extends IClientAction {
+            load(): NoClientAction;
+            load(callback: (element: NoClientAction) => void): any;
+        }
+        class NoClientAction extends ClientAction implements INoClientAction {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IPageClientAction extends IClientAction {
+            load(): PageClientAction;
+            load(callback: (element: PageClientAction) => void): any;
+        }
+        class PageClientAction extends ClientAction implements IPageClientAction {
+            static typeName: string;
+            pageSettings: PageSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMicroflowClientAction extends IClientAction {
+            load(): MicroflowClientAction;
+            load(callback: (element: MicroflowClientAction) => void): any;
+        }
+        class MicroflowClientAction extends ClientAction implements IMicroflowClientAction {
+            static typeName: string;
+            microflowSettings: MicroflowSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Opening+Pages relevant section in reference guide}
+         */
+        interface IPageSettings extends elements.IElement {
+            load(): PageSettings;
+            load(callback: (element: PageSettings) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Opening+Pages relevant section in reference guide}
+         */
+        class PageSettings extends elements.Element implements IPageSettings {
+            static typeName: string;
+            page: IPage;
+            pageQualifiedName: string;
+            formTitle: texts.Text;
+            location: FormLocation;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Starting+Microflows relevant section in reference guide}
+         */
+        interface IMicroflowSettings extends elements.IElement {
+            load(): MicroflowSettings;
+            load(callback: (element: MicroflowSettings) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Starting+Microflows relevant section in reference guide}
+         */
+        class MicroflowSettings extends elements.Element implements IMicroflowSettings {
+            static typeName: string;
+            microflow: microflows.IMicroflow;
+            microflowQualifiedName: string;
+            useAllPages: boolean;
+            progressBar: ProgressBarType;
+            progressMessage: texts.Text;
+            asynchronous: boolean;
+            formValidations: FormValidations;
+            confirmationInfo: ConfirmationInfo;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IConfirmationInfo extends elements.IElement {
+            container: IMicroflowSettings;
+            load(): ConfirmationInfo;
+            load(callback: (element: ConfirmationInfo) => void): any;
+        }
+        class ConfirmationInfo extends elements.Element implements IConfirmationInfo {
+            static typeName: string;
+            container: MicroflowSettings;
+            question: texts.Text;
+            proceedButtonCaption: texts.Text;
+            cancelButtonCaption: texts.Text;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IConditionallyVisibleWidget extends IWidget {
+            load(): ConditionallyVisibleWidget;
+            load(callback: (element: ConditionallyVisibleWidget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ConditionallyVisibleWidget extends Widget implements IConditionallyVisibleWidget {
+            static typeName: string;
+            conditionalVisibilitySettings: ConditionalVisibilitySettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Label relevant section in reference guide}
+         */
+        interface ILabel extends IConditionallyVisibleWidget {
+            load(): Label;
+            load(callback: (element: Label) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Label relevant section in reference guide}
+         */
+        class Label extends ConditionallyVisibleWidget implements ILabel {
+            static typeName: string;
+            caption: texts.Text;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Image relevant section in reference guide}
+         */
+        interface IStaticImageViewer extends IConditionallyVisibleWidget {
+            load(): StaticImageViewer;
+            load(callback: (element: StaticImageViewer) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Image relevant section in reference guide}
+         */
+        class StaticImageViewer extends ConditionallyVisibleWidget implements IStaticImageViewer {
+            static typeName: string;
+            image: images.IImage;
+            imageQualifiedName: string;
+            widthUnit: ImageSizeUnit;
+            heightUnit: ImageSizeUnit;
+            width: number;
+            height: number;
+            clickAction: ClientAction;
+            responsive: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Container relevant section in reference guide}
+         */
+        interface IDivContainer extends IConditionallyVisibleWidget {
+            load(): DivContainer;
+            load(callback: (element: DivContainer) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Container relevant section in reference guide}
+         */
+        class DivContainer extends ConditionallyVisibleWidget implements IDivContainer {
+            static typeName: string;
+            widget: Widget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IVerticalFlow extends IWidget {
+            load(): VerticalFlow;
+            load(callback: (element: VerticalFlow) => void): any;
+        }
+        class VerticalFlow extends Widget implements IVerticalFlow {
+            static typeName: string;
+            widgets: instances.IList<Widget>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IConditionallyEditableWidget extends IConditionallyVisibleWidget {
+            load(): ConditionallyEditableWidget;
+            load(callback: (element: ConditionallyEditableWidget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ConditionallyEditableWidget extends ConditionallyVisibleWidget implements IConditionallyEditableWidget {
+            static typeName: string;
+            conditionalEditabilitySettings: ConditionalEditabilitySettings;
+            editable: EditableEnum;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IInputWidget extends IConditionallyEditableWidget {
+            load(): InputWidget;
+            load(callback: (element: InputWidget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class InputWidget extends ConditionallyEditableWidget implements IInputWidget {
+            static typeName: string;
+            label: texts.Text;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMemberWidget extends IInputWidget {
+            load(): MemberWidget;
+            load(callback: (element: MemberWidget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MemberWidget extends InputWidget implements IMemberWidget {
+            static typeName: string;
+            /**
+             * The value of this property is conceptually of type Paths$AttributePath.
+             */
+            attributePath: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IAttributeWidget extends IMemberWidget {
+            load(): AttributeWidget;
+            load(callback: (element: AttributeWidget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class AttributeWidget extends MemberWidget implements IAttributeWidget {
+            static typeName: string;
+            required: boolean;
+            requiredMessage: texts.Text;
+            onChangeMicroflowSettings: MicroflowSettings;
+            onEnterMicroflowSettings: MicroflowSettings;
+            onLeaveMicroflowSettings: MicroflowSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IAttributeWidgetWithPlaceholder extends IAttributeWidget {
+            load(): AttributeWidgetWithPlaceholder;
+            load(callback: (element: AttributeWidgetWithPlaceholder) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class AttributeWidgetWithPlaceholder extends AttributeWidget implements IAttributeWidgetWithPlaceholder {
+            static typeName: string;
+            placeholder: texts.Text;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ITextWidget extends IAttributeWidgetWithPlaceholder {
+            load(): TextWidget;
+            load(callback: (element: TextWidget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class TextWidget extends AttributeWidgetWithPlaceholder implements ITextWidget {
+            static typeName: string;
+            maxLengthCode: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Text+Box relevant section in reference guide}
+         */
+        interface ITextBox extends ITextWidget {
+            load(): TextBox;
+            load(callback: (element: TextBox) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Text+Box relevant section in reference guide}
+         */
+        class TextBox extends TextWidget implements ITextBox {
+            static typeName: string;
+            inputMask: string;
+            formattingInfo: FormattingInfo;
+            isPasswordBox: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Text+Area relevant section in reference guide}
+         */
+        interface ITextArea extends ITextWidget {
+            load(): TextArea;
+            load(callback: (element: TextArea) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Text+Area relevant section in reference guide}
+         */
+        class TextArea extends TextWidget implements ITextArea {
+            static typeName: string;
+            numberOfLines: number;
+            counterMessage: texts.Text;
+            textTooLongMessage: texts.Text;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Check+Box relevant section in reference guide}
+         */
+        interface ICheckBox extends IAttributeWidget {
+            load(): CheckBox;
+            load(callback: (element: CheckBox) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Check+Box relevant section in reference guide}
+         */
+        class CheckBox extends AttributeWidget implements ICheckBox {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Date+Picker relevant section in reference guide}
+         */
+        interface IDatePicker extends IAttributeWidgetWithPlaceholder {
+            load(): DatePicker;
+            load(callback: (element: DatePicker) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Date+Picker relevant section in reference guide}
+         */
+        class DatePicker extends AttributeWidgetWithPlaceholder implements IDatePicker {
+            static typeName: string;
+            formattingInfo: FormattingInfo;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IFormattingInfo extends elements.IElement {
+            load(): FormattingInfo;
+            load(callback: (element: FormattingInfo) => void): any;
+        }
+        class FormattingInfo extends elements.Element implements IFormattingInfo {
+            static typeName: string;
+            decimalPrecision: number;
+            groupDigits: boolean;
+            enumFormat: EnumFormat;
+            dateFormat: DateFormat;
+            customDateFormat: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IConditionalSettings extends elements.IElement {
+            load(): ConditionalSettings;
+            load(callback: (element: ConditionalSettings) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ConditionalSettings extends elements.Element implements IConditionalSettings {
+            static typeName: string;
+            attribute: domainmodels.IAttribute;
+            attributeQualifiedName: string;
+            conditions: instances.IList<enumerations.Condition>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IConditionalVisibilitySettings extends IConditionalSettings {
+            load(): ConditionalVisibilitySettings;
+            load(callback: (element: ConditionalVisibilitySettings) => void): any;
+        }
+        class ConditionalVisibilitySettings extends ConditionalSettings implements IConditionalVisibilitySettings {
+            static typeName: string;
+            moduleRoles: instances.IList<security.IModuleRole>;
+            moduleRolesQualifiedNames: string[];
+            ignoreSecurity: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IConditionalEditabilitySettings extends IConditionalSettings {
+            container: IConditionallyEditableWidget;
+            load(): ConditionalEditabilitySettings;
+            load(callback: (element: ConditionalEditabilitySettings) => void): any;
+        }
+        class ConditionalEditabilitySettings extends ConditionalSettings implements IConditionalEditabilitySettings {
+            static typeName: string;
+            container: ConditionallyEditableWidget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Table relevant section in reference guide}
+         */
+        interface ITable extends IConditionallyVisibleWidget {
+            load(): Table;
+            load(callback: (element: Table) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Table relevant section in reference guide}
+         */
+        class Table extends ConditionallyVisibleWidget implements ITable {
+            static typeName: string;
+            cells: instances.IList<TableCell>;
+            columns: instances.IList<TableColumn>;
+            widthUnit: UnitEnum;
+            rows: instances.IList<TableRow>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ITableCell extends elements.IElement {
+            container: ITable;
+            load(): TableCell;
+            load(callback: (element: TableCell) => void): any;
+        }
+        class TableCell extends elements.Element implements ITableCell {
+            static typeName: string;
+            container: Table;
+            class: string;
+            style: string;
+            isHeader: boolean;
+            widget: Widget;
+            leftColumnIndex: number;
+            topRowIndex: number;
+            width: number;
+            height: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ITableColumn extends elements.IElement {
+            container: ITable;
+            load(): TableColumn;
+            load(callback: (element: TableColumn) => void): any;
+        }
+        class TableColumn extends elements.Element implements ITableColumn {
+            static typeName: string;
+            container: Table;
+            width: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ITableRow extends elements.IElement {
+            container: ITable;
+            load(): TableRow;
+            load(callback: (element: TableRow) => void): any;
+        }
+        class TableRow extends elements.Element implements ITableRow {
+            static typeName: string;
+            container: Table;
+            class: string;
+            style: string;
+            conditionalVisibilitySettings: ConditionalVisibilitySettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IEntityWidget extends IConditionallyVisibleWidget {
+            load(): EntityWidget;
+            load(callback: (element: EntityWidget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class EntityWidget extends ConditionallyVisibleWidget implements IEntityWidget {
+            static typeName: string;
+            dataSource: DataSource;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+Sources relevant section in reference guide}
+         */
+        interface IDataSource extends elements.IElement {
+            container: IEntityWidget;
+            load(): DataSource;
+            load(callback: (element: DataSource) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+Sources relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class DataSource extends elements.Element implements IDataSource {
+            static typeName: string;
+            container: EntityWidget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IEntityPathSource extends IDataSource {
+            container: IEntityWidget;
+            load(): EntityPathSource;
+            load(callback: (element: EntityPathSource) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class EntityPathSource extends DataSource implements IEntityPathSource {
+            static typeName: string;
+            container: EntityWidget;
+            /**
+             * The value of this property is conceptually of type Paths$EntityPath.
+             */
+            entityPath: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMicroflowSource extends IDataSource {
+            container: IEntityWidget;
+            load(): MicroflowSource;
+            load(callback: (element: MicroflowSource) => void): any;
+        }
+        class MicroflowSource extends DataSource implements IMicroflowSource {
+            static typeName: string;
+            container: EntityWidget;
+            microflowSettings: MicroflowSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IListenTargetWidget extends IEntityWidget {
+            load(): ListenTargetWidget;
+            load(callback: (element: ListenTargetWidget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ListenTargetWidget extends EntityWidget implements IListenTargetWidget {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IAssociationSource extends IEntityPathSource {
+            container: IEntityWidget;
+            load(): AssociationSource;
+            load(callback: (element: AssociationSource) => void): any;
+        }
+        class AssociationSource extends EntityPathSource implements IAssociationSource {
+            static typeName: string;
+            container: EntityWidget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View relevant section in reference guide}
+         */
+        interface IDataView extends IEntityWidget {
+            load(): DataView;
+            load(callback: (element: DataView) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View relevant section in reference guide}
+         */
+        class DataView extends EntityWidget implements IDataView {
+            static typeName: string;
+            widget: Widget;
+            editable: boolean;
+            showControlBar: boolean;
+            closeOnSaveOrCancel: boolean;
+            useSchema: boolean;
+            noEntityMessage: texts.Text;
+            labelWidth: number;
+            controlBar: DataViewControlBar;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IControlBar extends elements.IElement {
+            load(): ControlBar;
+            load(callback: (element: ControlBar) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ControlBar extends elements.Element implements IControlBar {
+            static typeName: string;
+            items: instances.IList<ControlBarItem>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Control+Bar relevant section in reference guide}
+         */
+        interface IDataViewControlBar extends IControlBar {
+            container: IDataView;
+            load(): DataViewControlBar;
+            load(callback: (element: DataViewControlBar) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Control+Bar relevant section in reference guide}
+         */
+        class DataViewControlBar extends ControlBar implements IDataViewControlBar {
+            static typeName: string;
+            container: DataView;
+            closeButton: ControlBarItem;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataViewSource extends IEntityPathSource {
+            container: IEntityWidget;
+            load(): DataViewSource;
+            load(callback: (element: DataViewSource) => void): any;
+        }
+        class DataViewSource extends EntityPathSource implements IDataViewSource {
+            static typeName: string;
+            container: EntityWidget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IListenTargetSource extends IDataSource {
+            container: IEntityWidget;
+            load(): ListenTargetSource;
+            load(callback: (element: ListenTargetSource) => void): any;
+        }
+        class ListenTargetSource extends DataSource implements IListenTargetSource {
+            static typeName: string;
+            container: EntityWidget;
+            listenTarget: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IControlBarItem extends elements.IElement {
+            load(): ControlBarItem;
+            load(callback: (element: ControlBarItem) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ControlBarItem extends elements.Element implements IControlBarItem {
+            static typeName: string;
+            name: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IControlBarButton extends IControlBarItem {
+            load(): ControlBarButton;
+            load(callback: (element: ControlBarButton) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ControlBarButton extends ControlBarItem implements IControlBarButton {
+            static typeName: string;
+            caption: ClientTemplate;
+            tooltip: texts.Text;
+            icon: Icon;
+            class: string;
+            style: string;
+            conditionalVisibilitySettings: ConditionalVisibilitySettings;
+            buttonStyle: ButtonStyle;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataViewControlBarButton extends IControlBarButton {
+            container: IControlBar;
+            load(): DataViewControlBarButton;
+            load(callback: (element: DataViewControlBarButton) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class DataViewControlBarButton extends ControlBarButton implements IDataViewControlBarButton {
+            static typeName: string;
+            container: ControlBar;
+            tabIndex: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Cancel+Button relevant section in reference guide}
+         */
+        interface IDataViewCancelButton extends IDataViewControlBarButton {
+            container: IControlBar;
+            load(): DataViewCancelButton;
+            load(callback: (element: DataViewCancelButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Cancel+Button relevant section in reference guide}
+         */
+        class DataViewCancelButton extends DataViewControlBarButton implements IDataViewCancelButton {
+            static typeName: string;
+            container: ControlBar;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Close+Button relevant section in reference guide}
+         */
+        interface IDataViewCloseButton extends IDataViewControlBarButton {
+            container: IControlBar;
+            load(): DataViewCloseButton;
+            load(callback: (element: DataViewCloseButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Close+Button relevant section in reference guide}
+         */
+        class DataViewCloseButton extends DataViewControlBarButton implements IDataViewCloseButton {
+            static typeName: string;
+            container: ControlBar;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+view+action+button relevant section in reference guide}
+         */
+        interface IDataViewActionButton extends IDataViewControlBarButton {
+            container: IControlBar;
+            load(): DataViewActionButton;
+            load(callback: (element: DataViewActionButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+view+action+button relevant section in reference guide}
+         */
+        class DataViewActionButton extends DataViewControlBarButton implements IDataViewActionButton {
+            static typeName: string;
+            container: ControlBar;
+            action: ClientAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Save+Button relevant section in reference guide}
+         */
+        interface IDataViewSaveButton extends IDataViewControlBarButton {
+            container: IControlBar;
+            load(): DataViewSaveButton;
+            load(callback: (element: DataViewSaveButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Save+Button relevant section in reference guide}
+         */
+        class DataViewSaveButton extends DataViewControlBarButton implements IDataViewSaveButton {
+            static typeName: string;
+            container: ControlBar;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/List+View relevant section in reference guide}
+         */
+        interface IListView extends IListenTargetWidget {
+            load(): ListView;
+            load(callback: (element: ListView) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/List+View relevant section in reference guide}
+         */
+        class ListView extends ListenTargetWidget implements IListView {
+            static typeName: string;
+            widget: Widget;
+            pageSize: number;
+            clickAction: ClientAction;
+            editable: boolean;
+            templates: instances.IList<ListViewTemplate>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IListViewTemplate extends elements.IElement {
+            container: IListView;
+            load(): ListViewTemplate;
+            load(callback: (element: ListViewTemplate) => void): any;
+        }
+        class ListViewTemplate extends elements.Element implements IListViewTemplate {
+            static typeName: string;
+            container: ListView;
+            specialization: domainmodels.IEntity;
+            specializationQualifiedName: string;
+            widget: Widget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IListViewDatabaseSource extends IEntityPathSource {
+            container: IEntityWidget;
+            load(): ListViewDatabaseSource;
+            load(callback: (element: ListViewDatabaseSource) => void): any;
+        }
+        class ListViewDatabaseSource extends EntityPathSource implements IListViewDatabaseSource {
+            static typeName: string;
+            container: EntityWidget;
+            /**
+             * The value of this property is conceptually of type Paths$AttributePath.
+             */
+            searchPaths: instances.IList<string>;
+            sortBar: GridSortBar;
+            /**
+             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
+             */
+            xPathConstraint: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Sort+Bar relevant section in reference guide}
+         */
+        interface IGridSortBar extends elements.IElement {
+            load(): GridSortBar;
+            load(callback: (element: GridSortBar) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Sort+Bar relevant section in reference guide}
+         */
+        class GridSortBar extends elements.Element implements IGridSortBar {
+            static typeName: string;
+            sortItems: instances.IList<GridSortItem>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IGridSortItem extends elements.IElement {
+            container: IGridSortBar;
+            load(): GridSortItem;
+            load(callback: (element: GridSortItem) => void): any;
+        }
+        class GridSortItem extends elements.Element implements IGridSortItem {
+            static typeName: string;
+            container: GridSortBar;
+            /**
+             * The value of this property is conceptually of type Paths$AttributePath.
+             */
+            attributePath: string;
+            sortDirection: SortDirection;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Button+Widgets relevant section in reference guide}
+         */
+        interface IButton extends IConditionallyVisibleWidget {
+            load(): Button;
+            load(callback: (element: Button) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Button+Widgets relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Button extends ConditionallyVisibleWidget implements IButton {
+            static typeName: string;
+            caption: ClientTemplate;
+            tooltip: texts.Text;
+            icon: Icon;
+            renderType: RenderType;
+            buttonStyle: ButtonStyle;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IStaticOrDynamicString extends elements.IElement {
+            container: ILinkButton;
+            load(): StaticOrDynamicString;
+            load(callback: (element: StaticOrDynamicString) => void): any;
+        }
+        class StaticOrDynamicString extends elements.Element implements IStaticOrDynamicString {
+            static typeName: string;
+            container: LinkButton;
+            isDynamic: boolean;
+            value: string;
+            /**
+             * The value of this property is conceptually of type Paths$AttributePath.
+             */
+            attribute: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Back+Button relevant section in reference guide}
+         */
+        interface IBackButton extends IButton {
+            load(): BackButton;
+            load(callback: (element: BackButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Back+Button relevant section in reference guide}
+         */
+        class BackButton extends Button implements IBackButton {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Cancel+Button relevant section in reference guide}
+         */
+        interface ICancelButton extends IButton {
+            load(): CancelButton;
+            load(callback: (element: CancelButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Cancel+Button relevant section in reference guide}
+         */
+        class CancelButton extends Button implements ICancelButton {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Sign+Out+Button relevant section in reference guide}
+         */
+        interface ILogoutButton extends IButton {
+            load(): LogoutButton;
+            load(callback: (element: LogoutButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Sign+Out+Button relevant section in reference guide}
+         */
+        class LogoutButton extends Button implements ILogoutButton {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Action+Button relevant section in reference guide}
+         */
+        interface IActionButton extends IButton {
+            load(): ActionButton;
+            load(callback: (element: ActionButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Action+Button relevant section in reference guide}
+         */
+        class ActionButton extends Button implements IActionButton {
+            static typeName: string;
+            action: ClientAction;
+            disabledDuringAction: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/New+Button relevant section in reference guide}
+         */
+        interface INewButton extends IButton {
+            load(): NewButton;
+            load(callback: (element: NewButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/New+Button relevant section in reference guide}
+         */
+        class NewButton extends Button implements INewButton {
+            static typeName: string;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            pageSettings: PageSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Save+Button relevant section in reference guide}
+         */
+        interface ISaveButton extends IButton {
+            load(): SaveButton;
+            load(callback: (element: SaveButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Save+Button relevant section in reference guide}
+         */
+        class SaveButton extends Button implements ISaveButton {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IClientTemplate extends elements.IElement {
+            load(): ClientTemplate;
+            load(callback: (element: ClientTemplate) => void): any;
+        }
+        class ClientTemplate extends elements.Element implements IClientTemplate {
+            static typeName: string;
+            template: texts.Text;
+            parameters: instances.IList<ClientTemplateParameter>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IClientTemplateParameter extends elements.IElement {
+            container: IClientTemplate;
+            load(): ClientTemplateParameter;
+            load(callback: (element: ClientTemplateParameter) => void): any;
+        }
+        class ClientTemplateParameter extends elements.Element implements IClientTemplateParameter {
+            static typeName: string;
+            container: ClientTemplate;
+            /**
+             * The value of this property is conceptually of type Paths$AttributePath.
+             */
+            attributePath: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IGrid extends IListenTargetWidget {
+            load(): Grid;
+            load(callback: (element: Grid) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Grid extends ListenTargetWidget implements IGrid {
+            static typeName: string;
+            isControlBarVisible: boolean;
+            isPagingEnabled: boolean;
+            selectionMode: GridSelectionMode;
+            selectFirst: boolean;
+            defaultButtonTrigger: ClickTypeType;
+            refreshTime: number;
+            controlBar: GridControlBar;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IColumnGrid extends IGrid {
+            load(): ColumnGrid;
+            load(callback: (element: ColumnGrid) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ColumnGrid extends Grid implements IColumnGrid {
+            static typeName: string;
+            columns: instances.IList<GridColumn>;
+            numberOfRows: number;
+            showEmptyRows: boolean;
+            widthUnit: UnitEnum;
+            tooltipPage: IPage;
+            tooltipPageQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ISearchField extends IControlBarItem {
+            container: IControlBar;
+            load(): SearchField;
+            load(callback: (element: SearchField) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class SearchField extends ControlBarItem implements ISearchField {
+            static typeName: string;
+            container: ControlBar;
+            caption: texts.Text;
+            type: SearchFieldType;
+            defaultValue: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ISingleSearchField extends ISearchField {
+            container: IControlBar;
+            load(): SingleSearchField;
+            load(callback: (element: SingleSearchField) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class SingleSearchField extends SearchField implements ISingleSearchField {
+            static typeName: string;
+            container: ControlBar;
+            /**
+             * The value of this property is conceptually of type Paths$AttributePath.
+             */
+            attributePath: string;
+            operator: SearchFieldOperator;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Comparison+Search+Field relevant section in reference guide}
+         */
+        interface IComparisonSearchField extends ISingleSearchField {
+            container: IControlBar;
+            load(): ComparisonSearchField;
+            load(callback: (element: ComparisonSearchField) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Comparison+Search+Field relevant section in reference guide}
+         */
+        class ComparisonSearchField extends SingleSearchField implements IComparisonSearchField {
+            static typeName: string;
+            container: ControlBar;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IGridBaseSource extends IEntityPathSource {
+            container: IEntityWidget;
+            load(): GridBaseSource;
+            load(callback: (element: GridBaseSource) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class GridBaseSource extends EntityPathSource implements IGridBaseSource {
+            static typeName: string;
+            container: EntityWidget;
+            sortBar: GridSortBar;
+            searchBar: SearchBar;
+            searchBarType: SearchBarTypeEnum;
+            waitForSearch: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IGridDatabaseSource extends IGridBaseSource {
+            container: IEntityWidget;
+            load(): GridDatabaseSource;
+            load(callback: (element: GridDatabaseSource) => void): any;
+        }
+        class GridDatabaseSource extends GridBaseSource implements IGridDatabaseSource {
+            static typeName: string;
+            container: EntityWidget;
+            /**
+             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
+             */
+            xPathConstraint: string;
+            applyContext: boolean;
+            removeAllFromContext: boolean;
+            removeFromContextIds: instances.IList<domainmodels.IEntity>;
+            removeFromContextIdsQualifiedNames: string[];
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+Grid relevant section in reference guide}
+         */
+        interface IDataGrid extends IColumnGrid {
+            load(): DataGrid;
+            load(callback: (element: DataGrid) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+Grid relevant section in reference guide}
+         */
+        class DataGrid extends ColumnGrid implements IDataGrid {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IGridControlBarButton extends IControlBarButton {
+            load(): GridControlBarButton;
+            load(callback: (element: GridControlBarButton) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class GridControlBarButton extends ControlBarButton implements IGridControlBarButton {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Add+Button relevant section in reference guide}
+         */
+        interface IDataGridAddButton extends IGridControlBarButton {
+            container: IControlBar;
+            load(): DataGridAddButton;
+            load(callback: (element: DataGridAddButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Add+Button relevant section in reference guide}
+         */
+        class DataGridAddButton extends GridControlBarButton implements IDataGridAddButton {
+            static typeName: string;
+            container: ControlBar;
+            pageSettings: PageSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Export+To+CSV+Button relevant section in reference guide}
+         */
+        interface IDataGridExportToCSVButton extends IGridControlBarButton {
+            container: IControlBar;
+            load(): DataGridExportToCSVButton;
+            load(callback: (element: DataGridExportToCSVButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Export+To+CSV+Button relevant section in reference guide}
+         */
+        class DataGridExportToCSVButton extends GridControlBarButton implements IDataGridExportToCSVButton {
+            static typeName: string;
+            container: ControlBar;
+            maxNumberOfRows: number;
+            decimalSeparator: string;
+            groupSeparator: string;
+            delimiter: string;
+            generateExcelHint: boolean;
+            useGridDateFormat: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Export+To+Excel+Button relevant section in reference guide}
+         */
+        interface IDataGridExportToExcelButton extends IGridControlBarButton {
+            container: IControlBar;
+            load(): DataGridExportToExcelButton;
+            load(callback: (element: DataGridExportToExcelButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Export+To+Excel+Button relevant section in reference guide}
+         */
+        class DataGridExportToExcelButton extends GridControlBarButton implements IDataGridExportToExcelButton {
+            static typeName: string;
+            container: ControlBar;
+            maxNumberOfRows: number;
+            useExcelDateType: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Remove+Button relevant section in reference guide}
+         */
+        interface IDataGridRemoveButton extends IGridControlBarButton {
+            container: IControlBar;
+            load(): DataGridRemoveButton;
+            load(callback: (element: DataGridRemoveButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Remove+Button relevant section in reference guide}
+         */
+        class DataGridRemoveButton extends GridControlBarButton implements IDataGridRemoveButton {
+            static typeName: string;
+            container: ControlBar;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Drop-Down+Widget relevant section in reference guide}
+         */
+        interface IDropDown extends IAttributeWidget {
+            load(): DropDown;
+            load(callback: (element: DropDown) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Drop-Down+Widget relevant section in reference guide}
+         */
+        class DropDown extends AttributeWidget implements IDropDown {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Drop+Down+Button relevant section in reference guide}
+         */
+        interface IDropDownButton extends IButton {
+            load(): DropDownButton;
+            load(callback: (element: DropDownButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Drop+Down+Button relevant section in reference guide}
+         */
+        class DropDownButton extends Button implements IDropDownButton {
+            static typeName: string;
+            items: instances.IList<DropDownButtonItem>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IActionItem extends elements.IElement {
+            container: IConditionallyVisibleWidget;
+            load(): ActionItem;
+            load(callback: (element: ActionItem) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ActionItem extends elements.Element implements IActionItem {
+            static typeName: string;
+            container: ConditionallyVisibleWidget;
+            action: ClientAction;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDropDownButtonItem extends IActionItem {
+            container: IDropDownButton;
+            load(): DropDownButtonItem;
+            load(callback: (element: DropDownButtonItem) => void): any;
+        }
+        class DropDownButtonItem extends ActionItem implements IDropDownButtonItem {
+            static typeName: string;
+            container: DropDownButton;
+            caption: texts.Text;
+            image: images.IImage;
+            imageQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Drop-down+Search+Field relevant section in reference guide}
+         */
+        interface IDropDownSearchField extends ISingleSearchField {
+            container: IControlBar;
+            load(): DropDownSearchField;
+            load(callback: (element: DropDownSearchField) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Drop-down+Search+Field relevant section in reference guide}
+         */
+        class DropDownSearchField extends SingleSearchField implements IDropDownSearchField {
+            static typeName: string;
+            container: ControlBar;
+            sortBar: GridSortBar;
+            /**
+             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
+             */
+            xPathConstraint: string;
+            allowMultipleSelect: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Image+Viewer relevant section in reference guide}
+         */
+        interface IDynamicImageViewer extends IEntityWidget {
+            load(): DynamicImageViewer;
+            load(callback: (element: DynamicImageViewer) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Image+Viewer relevant section in reference guide}
+         */
+        class DynamicImageViewer extends EntityWidget implements IDynamicImageViewer {
+            static typeName: string;
+            defaultImage: images.IImage;
+            defaultImageQualifiedName: string;
+            widthUnit: ImageSizeUnit;
+            heightUnit: ImageSizeUnit;
+            width: number;
+            height: number;
+            responsive: boolean;
+            showAsThumbnail: boolean;
+            onClickBehavior: OnClickBehavior;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Text relevant section in reference guide}
+         */
+        interface IDynamicText extends IConditionallyVisibleWidget {
+            load(): DynamicText;
+            load(callback: (element: DynamicText) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Text relevant section in reference guide}
+         */
+        class DynamicText extends ConditionallyVisibleWidget implements IDynamicText {
+            static typeName: string;
+            content: ClientTemplate;
+            renderMode: TextRenderMode;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/File+Manager relevant section in reference guide}
+         */
+        interface IFileManager extends IInputWidget {
+            load(): FileManager;
+            load(callback: (element: FileManager) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/File+Manager relevant section in reference guide}
+         */
+        class FileManager extends InputWidget implements IFileManager {
+            static typeName: string;
+            allowedExtensions: string;
+            type: FileManagerType;
+            maxFileSize: number;
+            showFileInBrowser: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IPageForSpecialization extends elements.IElement {
+            container: IGridEditButton;
+            load(): PageForSpecialization;
+            load(callback: (element: PageForSpecialization) => void): any;
+        }
+        class PageForSpecialization extends elements.Element implements IPageForSpecialization {
+            static typeName: string;
+            container: GridEditButton;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            pageSettings: PageSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Image+Property relevant section in reference guide}
+         */
+        interface IIcon extends elements.IElement {
+            load(): Icon;
+            load(callback: (element: Icon) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Image+Property relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Icon extends elements.Element implements IIcon {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IGlyphIcon extends IIcon {
+            load(): GlyphIcon;
+            load(callback: (element: GlyphIcon) => void): any;
+        }
+        class GlyphIcon extends Icon implements IGlyphIcon {
+            static typeName: string;
+            code: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Grid+action+button relevant section in reference guide}
+         */
+        interface IGridActionButton extends IGridControlBarButton {
+            container: IControlBar;
+            load(): GridActionButton;
+            load(callback: (element: GridActionButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Grid+action+button relevant section in reference guide}
+         */
+        class GridActionButton extends GridControlBarButton implements IGridActionButton {
+            static typeName: string;
+            container: ControlBar;
+            action: ClientAction;
+            maintainSelectionAfterMicroflow: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Columns relevant section in reference guide}
+         */
+        interface IGridColumn extends elements.IElement {
+            container: IColumnGrid;
+            load(): GridColumn;
+            load(callback: (element: GridColumn) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Columns relevant section in reference guide}
+         */
+        class GridColumn extends elements.Element implements IGridColumn {
+            static typeName: string;
+            container: ColumnGrid;
+            name: string;
+            caption: texts.Text;
+            /**
+             * The value of this property is conceptually of type Paths$AttributePath.
+             */
+            attributePath: string;
+            formattingInfo: FormattingInfo;
+            showTooltip: boolean;
+            aggregateCaption: texts.Text;
+            aggregateFunction: AggregateFunction;
+            editable: boolean;
+            width: number;
+            class: string;
+            style: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Control+Bar relevant section in reference guide}
+         */
+        interface IGridControlBar extends IControlBar {
+            container: IGrid;
+            load(): GridControlBar;
+            load(callback: (element: GridControlBar) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Control+Bar relevant section in reference guide}
+         */
+        class GridControlBar extends ControlBar implements IGridControlBar {
+            static typeName: string;
+            container: Grid;
+            searchButton: GridSearchButton;
+            defaultButton: ControlBarItem;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Delete+Button relevant section in reference guide}
+         */
+        interface IGridDeleteButton extends IGridControlBarButton {
+            container: IControlBar;
+            load(): GridDeleteButton;
+            load(callback: (element: GridDeleteButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Delete+Button relevant section in reference guide}
+         */
+        class GridDeleteButton extends GridControlBarButton implements IGridDeleteButton {
+            static typeName: string;
+            container: ControlBar;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Deselect+All+Button relevant section in reference guide}
+         */
+        interface IGridDeselectAllButton extends IGridControlBarButton {
+            container: IControlBar;
+            load(): GridDeselectAllButton;
+            load(callback: (element: GridDeselectAllButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Deselect+All+Button relevant section in reference guide}
+         */
+        class GridDeselectAllButton extends GridControlBarButton implements IGridDeselectAllButton {
+            static typeName: string;
+            container: ControlBar;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Edit+Button relevant section in reference guide}
+         */
+        interface IGridEditButton extends IGridControlBarButton {
+            container: IControlBar;
+            load(): GridEditButton;
+            load(callback: (element: GridEditButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Edit+Button relevant section in reference guide}
+         */
+        class GridEditButton extends GridControlBarButton implements IGridEditButton {
+            static typeName: string;
+            container: ControlBar;
+            pageSettings: PageSettings;
+            pagesForSpecializations: instances.IList<PageForSpecialization>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Grid+New+Button relevant section in reference guide}
+         */
+        interface IGridNewButton extends IGridControlBarButton {
+            container: IControlBar;
+            load(): GridNewButton;
+            load(callback: (element: GridNewButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Grid+New+Button relevant section in reference guide}
+         */
+        class GridNewButton extends GridControlBarButton implements IGridNewButton {
+            static typeName: string;
+            container: ControlBar;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            editLocation: NewButtonEditLocation;
+            pageSettings: PageSettings;
+            isPersistent: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Search+Button relevant section in reference guide}
+         */
+        interface IGridSearchButton extends IGridControlBarButton {
+            load(): GridSearchButton;
+            load(callback: (element: GridSearchButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Search+Button relevant section in reference guide}
+         */
+        class GridSearchButton extends GridControlBarButton implements IGridSearchButton {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Select+All+Button relevant section in reference guide}
+         */
+        interface IGridSelectAllButton extends IGridControlBarButton {
+            container: IControlBar;
+            load(): GridSelectAllButton;
+            load(callback: (element: GridSelectAllButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Select+All+Button relevant section in reference guide}
+         */
+        class GridSelectAllButton extends GridControlBarButton implements IGridSelectAllButton {
+            static typeName: string;
+            container: ControlBar;
+            selectionType: SelectionType;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Group+Box relevant section in reference guide}
+         */
+        interface IGroupBox extends IConditionallyVisibleWidget {
+            load(): GroupBox;
+            load(callback: (element: GroupBox) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Group+Box relevant section in reference guide}
+         */
+        class GroupBox extends ConditionallyVisibleWidget implements IGroupBox {
+            static typeName: string;
+            caption: ClientTemplate;
+            collapsible: GroupBoxCollapsible;
+            widget: Widget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Header relevant section in reference guide}
+         */
+        interface IHeader extends IWidget {
+            load(): Header;
+            load(callback: (element: Header) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Header relevant section in reference guide}
+         */
+        class Header extends Widget implements IHeader {
+            static typeName: string;
+            leftWidget: Widget;
+            rightWidget: Widget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ISplitPane extends IWidget {
+            load(): SplitPane;
+            load(callback: (element: SplitPane) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class SplitPane extends Widget implements ISplitPane {
+            static typeName: string;
+            firstWidget: Widget;
+            secondWidget: Widget;
+            animatedResize: boolean;
+            height: number;
+            position: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Horizontal+Split+Pane relevant section in reference guide}
+         */
+        interface IHorizontalSplitPane extends ISplitPane {
+            load(): HorizontalSplitPane;
+            load(callback: (element: HorizontalSplitPane) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Horizontal+Split+Pane relevant section in reference guide}
+         */
+        class HorizontalSplitPane extends SplitPane implements IHorizontalSplitPane {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IImageIcon extends IIcon {
+            load(): ImageIcon;
+            load(callback: (element: ImageIcon) => void): any;
+        }
+        class ImageIcon extends Icon implements IImageIcon {
+            static typeName: string;
+            image: images.IImage;
+            imageQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Image+Uploader relevant section in reference guide}
+         */
+        interface IImageUploader extends IInputWidget {
+            load(): ImageUploader;
+            load(callback: (element: ImageUploader) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Image+Uploader relevant section in reference guide}
+         */
+        class ImageUploader extends InputWidget implements IImageUploader {
+            static typeName: string;
+            allowedExtensions: string;
+            thumbnailSize: common.ISize;
+            maxFileSize: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IImageViewerSource extends IEntityPathSource {
+            container: IEntityWidget;
+            load(): ImageViewerSource;
+            load(callback: (element: ImageViewerSource) => void): any;
+        }
+        class ImageViewerSource extends EntityPathSource implements IImageViewerSource {
+            static typeName: string;
+            container: EntityWidget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IAssociationWidget extends IMemberWidget {
+            load(): AssociationWidget;
+            load(callback: (element: AssociationWidget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class AssociationWidget extends MemberWidget implements IAssociationWidget {
+            static typeName: string;
+            selectorSource: SelectorSource;
+            selectPageSettings: PageSettings;
+            onChangeMicroflowSettings: MicroflowSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Input+Reference+Set+Selector relevant section in reference guide}
+         */
+        interface IInputReferenceSetSelector extends IAssociationWidget {
+            load(): InputReferenceSetSelector;
+            load(callback: (element: InputReferenceSetSelector) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Input+Reference+Set+Selector relevant section in reference guide}
+         */
+        class InputReferenceSetSelector extends AssociationWidget implements IInputReferenceSetSelector {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Layout+Grid relevant section in reference guide}
+         */
+        interface ILayoutGrid extends IConditionallyVisibleWidget {
+            load(): LayoutGrid;
+            load(callback: (element: LayoutGrid) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Layout+Grid relevant section in reference guide}
+         */
+        class LayoutGrid extends ConditionallyVisibleWidget implements ILayoutGrid {
+            static typeName: string;
+            width: ContainerWidth;
+            rows: instances.IList<LayoutGridRow>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ILayoutGridColumn extends elements.IElement {
+            container: ILayoutGridRow;
+            load(): LayoutGridColumn;
+            load(callback: (element: LayoutGridColumn) => void): any;
+        }
+        class LayoutGridColumn extends elements.Element implements ILayoutGridColumn {
+            static typeName: string;
+            container: LayoutGridRow;
+            weight: number;
+            widget: Widget;
+            class: string;
+            style: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ILayoutGridRow extends elements.IElement {
+            container: ILayoutGrid;
+            load(): LayoutGridRow;
+            load(callback: (element: LayoutGridRow) => void): any;
+        }
+        class LayoutGridRow extends elements.Element implements ILayoutGridRow {
+            static typeName: string;
+            container: LayoutGrid;
+            columns: instances.IList<LayoutGridColumn>;
+            conditionalVisibilitySettings: ConditionalVisibilitySettings;
+            class: string;
+            style: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Link+Button relevant section in reference guide}
+         */
+        interface ILinkButton extends IButton {
+            load(): LinkButton;
+            load(callback: (element: LinkButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Link+Button relevant section in reference guide}
+         */
+        class LinkButton extends Button implements ILinkButton {
+            static typeName: string;
+            linkType: LinkType;
+            address: StaticOrDynamicString;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Menu+Widgets relevant section in reference guide}
+         */
+        interface IMenuWidget extends IWidget {
+            load(): MenuWidget;
+            load(callback: (element: MenuWidget) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Menu+Widgets relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MenuWidget extends Widget implements IMenuWidget {
+            static typeName: string;
+            menuSource: MenuSource;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Menu+Bar relevant section in reference guide}
+         */
+        interface IMenuBar extends IMenuWidget {
+            load(): MenuBar;
+            load(callback: (element: MenuBar) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Menu+Bar relevant section in reference guide}
+         */
+        class MenuBar extends MenuWidget implements IMenuBar {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMenuSource extends elements.IElement {
+            container: IMenuWidget;
+            load(): MenuSource;
+            load(callback: (element: MenuSource) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MenuSource extends elements.Element implements IMenuSource {
+            static typeName: string;
+            container: MenuWidget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IMenuDocumentSource extends IMenuSource {
+            container: IMenuWidget;
+            load(): MenuDocumentSource;
+            load(callback: (element: MenuDocumentSource) => void): any;
+        }
+        class MenuDocumentSource extends MenuSource implements IMenuDocumentSource {
+            static typeName: string;
+            container: MenuWidget;
+            menu: menus.IMenuDocument;
+            menuQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Navigation+List relevant section in reference guide}
+         */
+        interface INavigationList extends IConditionallyVisibleWidget {
+            load(): NavigationList;
+            load(callback: (element: NavigationList) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Navigation+List relevant section in reference guide}
+         */
+        class NavigationList extends ConditionallyVisibleWidget implements INavigationList {
+            static typeName: string;
+            items: instances.IList<NavigationListItem>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface INavigationListItem extends IActionItem {
+            container: INavigationList;
+            load(): NavigationListItem;
+            load(callback: (element: NavigationListItem) => void): any;
+        }
+        class NavigationListItem extends ActionItem implements INavigationListItem {
+            static typeName: string;
+            container: NavigationList;
+            widget: Widget;
+            class: string;
+            style: string;
+            conditionalVisibilitySettings: ConditionalVisibilitySettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface INavigationSource extends IMenuSource {
+            container: IMenuWidget;
+            load(): NavigationSource;
+            load(callback: (element: NavigationSource) => void): any;
+        }
+        class NavigationSource extends MenuSource implements INavigationSource {
+            static typeName: string;
+            container: MenuWidget;
+            deviceType: navigation.DeviceType;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Navigation+Tree relevant section in reference guide}
+         */
+        interface INavigationTree extends IMenuWidget {
+            load(): NavigationTree;
+            load(callback: (element: NavigationTree) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Navigation+Tree relevant section in reference guide}
+         */
+        class NavigationTree extends MenuWidget implements INavigationTree {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IOnClickBehavior extends elements.IElement {
+            container: IDynamicImageViewer;
+            load(): OnClickBehavior;
+            load(callback: (element: OnClickBehavior) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class OnClickBehavior extends elements.Element implements IOnClickBehavior {
+            static typeName: string;
+            container: DynamicImageViewer;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IOnClickEnlarge extends IOnClickBehavior {
+            container: IDynamicImageViewer;
+            load(): OnClickEnlarge;
+            load(callback: (element: OnClickEnlarge) => void): any;
+        }
+        class OnClickEnlarge extends OnClickBehavior implements IOnClickEnlarge {
+            static typeName: string;
+            container: DynamicImageViewer;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IOnClickMicroflow extends IOnClickBehavior {
+            container: IDynamicImageViewer;
+            load(): OnClickMicroflow;
+            load(callback: (element: OnClickMicroflow) => void): any;
+        }
+        class OnClickMicroflow extends OnClickBehavior implements IOnClickMicroflow {
+            static typeName: string;
+            container: DynamicImageViewer;
+            microflowSettings: MicroflowSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IOnClickNothing extends IOnClickBehavior {
+            container: IDynamicImageViewer;
+            load(): OnClickNothing;
+            load(callback: (element: OnClickNothing) => void): any;
+        }
+        class OnClickNothing extends OnClickBehavior implements IOnClickNothing {
+            static typeName: string;
+            container: DynamicImageViewer;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Range+Search+Field relevant section in reference guide}
+         */
+        interface IRangeSearchField extends ISearchField {
+            container: IControlBar;
+            load(): RangeSearchField;
+            load(callback: (element: RangeSearchField) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Range+Search+Field relevant section in reference guide}
+         */
+        class RangeSearchField extends SearchField implements IRangeSearchField {
+            static typeName: string;
+            container: ControlBar;
+            /**
+             * The value of this property is conceptually of type Paths$AttributePath.
+             */
+            lowerBound: string;
+            /**
+             * The value of this property is conceptually of type Paths$AttributePath.
+             */
+            upperBound: string;
+            includeLower: boolean;
+            includeUpper: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Reference+Selector relevant section in reference guide}
+         */
+        interface IReferenceSelector extends IAssociationWidget {
+            load(): ReferenceSelector;
+            load(callback: (element: ReferenceSelector) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Reference+Selector relevant section in reference guide}
+         */
+        class ReferenceSelector extends AssociationWidget implements IReferenceSelector {
+            static typeName: string;
+            required: boolean;
+            requiredMessage: texts.Text;
+            renderMode: ReferenceSelectorRenderModeType;
+            gotoPageSettings: PageSettings;
+            formattingInfo: FormattingInfo;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Reference+Set+Selector relevant section in reference guide}
+         */
+        interface IReferenceSetSelector extends IColumnGrid {
+            load(): ReferenceSetSelector;
+            load(callback: (element: ReferenceSetSelector) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Reference+Set+Selector relevant section in reference guide}
+         */
+        class ReferenceSetSelector extends ColumnGrid implements IReferenceSetSelector {
+            static typeName: string;
+            onChangeMicroflowSettings: MicroflowSettings;
+            /**
+             * The value of this property is conceptually of type Paths$EntityPath.
+             */
+            constrainedBy: instances.IList<string>;
+            /**
+             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
+             */
+            xPathConstraint: string;
+            removeAllFromContext: boolean;
+            removeFromContextEntities: instances.IList<domainmodels.IEntity>;
+            removeFromContextEntitiesQualifiedNames: string[];
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IReferenceSetSource extends IGridBaseSource {
+            container: IEntityWidget;
+            load(): ReferenceSetSource;
+            load(callback: (element: ReferenceSetSource) => void): any;
+        }
+        class ReferenceSetSource extends GridBaseSource implements IReferenceSetSource {
+            static typeName: string;
+            container: EntityWidget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Scroll+Container relevant section in reference guide}
+         */
+        interface IScrollContainer extends IWidget {
+            load(): ScrollContainer;
+            load(callback: (element: ScrollContainer) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Scroll+Container relevant section in reference guide}
+         */
+        class ScrollContainer extends Widget implements IScrollContainer {
+            static typeName: string;
+            center: ScrollContainerRegion;
+            left: ScrollContainerRegion;
+            right: ScrollContainerRegion;
+            top: ScrollContainerRegion;
+            bottom: ScrollContainerRegion;
+            layoutMode: LayoutModeType;
+            widthMode: SizeMode;
+            width: number;
+            alignment: AlignmentEnum;
+            scrollBehavior: ScrollBehavior;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IScrollContainerRegion extends elements.IElement {
+            container: IScrollContainer;
+            load(): ScrollContainerRegion;
+            load(callback: (element: ScrollContainerRegion) => void): any;
+        }
+        class ScrollContainerRegion extends elements.Element implements IScrollContainerRegion {
+            static typeName: string;
+            container: ScrollContainer;
+            widget: Widget;
+            sizeMode: SizeMode;
+            size: number;
+            class: string;
+            style: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Search+Bar relevant section in reference guide}
+         */
+        interface ISearchBar extends IControlBar {
+            container: IGridBaseSource;
+            load(): SearchBar;
+            load(callback: (element: SearchBar) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Search+Bar relevant section in reference guide}
+         */
+        class SearchBar extends ControlBar implements ISearchBar {
+            static typeName: string;
+            container: GridBaseSource;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Select+Button relevant section in reference guide}
+         */
+        interface ISelectButton extends IGridControlBarButton {
+            container: IControlBar;
+            load(): SelectButton;
+            load(callback: (element: SelectButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Select+Button relevant section in reference guide}
+         */
+        class SelectButton extends GridControlBarButton implements ISelectButton {
+            static typeName: string;
+            container: ControlBar;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ISelectorSource extends elements.IElement {
+            container: IAssociationWidget;
+            load(): SelectorSource;
+            load(callback: (element: SelectorSource) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class SelectorSource extends elements.Element implements ISelectorSource {
+            static typeName: string;
+            container: AssociationWidget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface ISelectorDatabaseSource extends ISelectorSource {
+            container: IAssociationWidget;
+            load(): SelectorDatabaseSource;
+            load(callback: (element: SelectorDatabaseSource) => void): any;
+        }
+        class SelectorDatabaseSource extends SelectorSource implements ISelectorDatabaseSource {
+            static typeName: string;
+            container: AssociationWidget;
+            sortBar: GridSortBar;
+            /**
+             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
+             */
+            xPathConstraint: string;
+            /**
+             * The value of this property is conceptually of type Paths$EntityPath.
+             */
+            constrainedBy: instances.IList<string>;
+            applyContext: boolean;
+            removeAllFromContext: boolean;
+            removeFromContextEntities: instances.IList<domainmodels.IEntity>;
+            removeFromContextEntitiesQualifiedNames: string[];
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ISelectorMicroflowSource extends ISelectorSource {
+            container: IAssociationWidget;
+            load(): SelectorMicroflowSource;
+            load(callback: (element: SelectorMicroflowSource) => void): any;
+        }
+        class SelectorMicroflowSource extends SelectorSource implements ISelectorMicroflowSource {
+            static typeName: string;
+            container: AssociationWidget;
+            dataSourceMicroflowSettings: MicroflowSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Sidebar+Toggle+Button relevant section in reference guide}
+         */
+        interface ISidebarToggleButton extends IButton {
+            load(): SidebarToggleButton;
+            load(callback: (element: SidebarToggleButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Sidebar+Toggle+Button relevant section in reference guide}
+         */
+        class SidebarToggleButton extends Button implements ISidebarToggleButton {
+            static typeName: string;
+            region: SidebarToggleRegion;
+            mode: SidebarToggleMode;
+            initiallyOpen: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Simple+Menu+Bar relevant section in reference guide}
+         */
+        interface ISimpleMenuBar extends IMenuWidget {
+            load(): SimpleMenuBar;
+            load(callback: (element: SimpleMenuBar) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Simple+Menu+Bar relevant section in reference guide}
+         */
+        class SimpleMenuBar extends MenuWidget implements ISimpleMenuBar {
+            static typeName: string;
+            orientation: SimpleMenuBarOrientation;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Snippet relevant section in reference guide}
+         */
+        interface ISnippet extends IFormBase {
+            container: projects.IFolderBase;
+            load(): Snippet;
+            load(callback: (element: Snippet) => void): any;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Snippet relevant section in reference guide}
+         */
+        class Snippet extends FormBase implements ISnippet {
+            static typeName: string;
+            container: projects.FolderBase;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            widget: Widget;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ISnippetCall extends elements.IElement {
+            container: ISnippetCallWidget;
+            load(): SnippetCall;
+            load(callback: (element: SnippetCall) => void): any;
+        }
+        class SnippetCall extends elements.Element implements ISnippetCall {
+            static typeName: string;
+            container: SnippetCallWidget;
+            snippet: ISnippet;
+            snippetQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Snippet+Call relevant section in reference guide}
+         */
+        interface ISnippetCallWidget extends IWidget {
+            load(): SnippetCallWidget;
+            load(callback: (element: SnippetCallWidget) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Snippet+Call relevant section in reference guide}
+         */
+        class SnippetCallWidget extends Widget implements ISnippetCallWidget {
+            static typeName: string;
+            snippetCall: SnippetCall;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Tab+Container relevant section in reference guide}
+         */
+        interface ITabContainer extends IConditionallyVisibleWidget {
+            load(): TabContainer;
+            load(callback: (element: TabContainer) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Tab+Container relevant section in reference guide}
+         */
+        class TabContainer extends ConditionallyVisibleWidget implements ITabContainer {
+            static typeName: string;
+            tabPages: instances.IList<TabPage>;
+            defaultPage: TabPage;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Tab+Page relevant section in reference guide}
+         */
+        interface ITabPage extends elements.IElement {
+            container: ITabContainer;
+            load(): TabPage;
+            load(callback: (element: TabPage) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Tab+Page relevant section in reference guide}
+         */
+        class TabPage extends elements.Element implements ITabPage {
+            static typeName: string;
+            container: TabContainer;
+            name: string;
+            caption: texts.Text;
+            refreshOnShow: boolean;
+            conditionalVisibilitySettings: ConditionalVisibilitySettings;
+            widget: Widget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Template+Grid relevant section in reference guide}
+         */
+        interface ITemplateGrid extends IGrid {
+            load(): TemplateGrid;
+            load(callback: (element: TemplateGrid) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Template+Grid relevant section in reference guide}
+         */
+        class TemplateGrid extends Grid implements ITemplateGrid {
+            static typeName: string;
+            contents: TemplateGridContents;
+            numberOfRows: number;
+            numberOfColumns: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ITemplateGridContents extends elements.IElement {
+            container: ITemplateGrid;
+            load(): TemplateGridContents;
+            load(callback: (element: TemplateGridContents) => void): any;
+        }
+        class TemplateGridContents extends elements.Element implements ITemplateGridContents {
+            static typeName: string;
+            container: TemplateGrid;
+            widget: Widget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Page+Title relevant section in reference guide}
+         */
+        interface ITitle extends IConditionallyVisibleWidget {
+            load(): Title;
+            load(callback: (element: Title) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Page+Title relevant section in reference guide}
+         */
+        class Title extends ConditionallyVisibleWidget implements ITitle {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Vertical+Split+Pane relevant section in reference guide}
+         */
+        interface IVerticalSplitPane extends ISplitPane {
+            load(): VerticalSplitPane;
+            load(callback: (element: VerticalSplitPane) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Vertical+Split+Pane relevant section in reference guide}
+         */
+        class VerticalSplitPane extends SplitPane implements IVerticalSplitPane {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IProjectSettingsPart extends elements.IElement {
+            container: settings.IProjectSettings;
+            load(): ProjectSettingsPart;
+            load(callback: (element: ProjectSettingsPart) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ProjectSettingsPart extends elements.Element implements IProjectSettingsPart {
+            static typeName: string;
+            container: settings.ProjectSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IWebUIProjectSettingsPart extends settings.IProjectSettingsPart {
+            container: settings.IProjectSettings;
+            load(): WebUIProjectSettingsPart;
+            load(callback: (element: WebUIProjectSettingsPart) => void): any;
+        }
+        class WebUIProjectSettingsPart extends settings.ProjectSettingsPart implements IWebUIProjectSettingsPart {
+            static typeName: string;
+            container: settings.ProjectSettings;
+            theme: string;
+            feedbackWidgetUpdated: boolean;
+            useModernUI: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class FormLocation extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Content: FormLocation;
+            static Popup: FormLocation;
+            static ModalPopup: FormLocation;
+        }
+        class ProgressBarType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static None: ProgressBarType;
+            static NonBlocking: ProgressBarType;
+            static Blocking: ProgressBarType;
+        }
+        class FormValidations extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static None: FormValidations;
+            static Widget: FormValidations;
+            static All: FormValidations;
+        }
+        class EnumFormat extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Text: EnumFormat;
+            static Image: EnumFormat;
+        }
+        class DateFormat extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Date: DateFormat;
+            static Time: DateFormat;
+            static DateTime: DateFormat;
+            static Custom: DateFormat;
+        }
+        class EditableEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Always: EditableEnum;
+            static Never: EditableEnum;
+            static Conditional: EditableEnum;
+        }
+        class UnitEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Weight: UnitEnum;
+            static Pixels: UnitEnum;
+        }
+        class SortDirection extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Ascending: SortDirection;
+            static Descending: SortDirection;
+        }
+        class RenderType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Button: RenderType;
+            static Link: RenderType;
+        }
+        class ButtonStyle extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Default: ButtonStyle;
+            static Inverse: ButtonStyle;
+            static Primary: ButtonStyle;
+            static Info: ButtonStyle;
+            static Success: ButtonStyle;
+            static Warning: ButtonStyle;
+            static Danger: ButtonStyle;
+        }
+        class AggregateFunction extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static None: AggregateFunction;
+            static Average: AggregateFunction;
+            static Maximum: AggregateFunction;
+            static Minimum: AggregateFunction;
+            static Sum: AggregateFunction;
+            static Count: AggregateFunction;
+        }
+        class AlignmentEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Left: AlignmentEnum;
+            static Center: AlignmentEnum;
+            static Right: AlignmentEnum;
+        }
+        class ClickTypeType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Single: ClickTypeType;
+            static Double: ClickTypeType;
+        }
+        class ContainerWidth extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static FullWidth: ContainerWidth;
+            static FixedWidth: ContainerWidth;
+        }
+        class FileManagerType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Upload: FileManagerType;
+            static Download: FileManagerType;
+            static Both: FileManagerType;
+        }
+        class GridSelectionMode extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static None: GridSelectionMode;
+            static Single: GridSelectionMode;
+            static SingleAndMaintain: GridSelectionMode;
+            static Multi: GridSelectionMode;
+            static SimpleMulti: GridSelectionMode;
+        }
+        class GroupBoxCollapsible extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static No: GroupBoxCollapsible;
+            static YesInitiallyExpanded: GroupBoxCollapsible;
+            static YesInitiallyCollapsed: GroupBoxCollapsible;
+        }
+        class ImageSizeUnit extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Auto: ImageSizeUnit;
+            static Pixels: ImageSizeUnit;
+            static Percentage: ImageSizeUnit;
+        }
+        class LayoutModeType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Headline: LayoutModeType;
+            static Sidebar: LayoutModeType;
+        }
+        class LayoutType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Responsive: LayoutType;
+            static Tablet: LayoutType;
+            static Phone: LayoutType;
+            static ModalPopup: LayoutType;
+            static Popup: LayoutType;
+            static Legacy: LayoutType;
+        }
+        class LinkType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Web: LinkType;
+            static Email: LinkType;
+            static Call: LinkType;
+            static Text: LinkType;
+        }
+        class MobileFooterType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static None: MobileFooterType;
+            static MenuBar: MobileFooterType;
+            static Custom: MobileFooterType;
+        }
+        class NewButtonEditLocation extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static InlineAtTop: NewButtonEditLocation;
+            static InlineAtBottom: NewButtonEditLocation;
+            static Form: NewButtonEditLocation;
+        }
+        class ReferenceSelectorRenderModeType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Form: ReferenceSelectorRenderModeType;
+            static DropDown: ReferenceSelectorRenderModeType;
+        }
+        class RenderModeType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Button: RenderModeType;
+            static Link: RenderModeType;
+        }
+        class ScrollBehavior extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static PerRegion: ScrollBehavior;
+            static FullWidget: ScrollBehavior;
+        }
+        class SearchBarTypeEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static None: SearchBarTypeEnum;
+            static FoldableOpen: SearchBarTypeEnum;
+            static FoldableClosed: SearchBarTypeEnum;
+            static AlwaysOpen: SearchBarTypeEnum;
+        }
+        class SearchFieldOperator extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Contains: SearchFieldOperator;
+            static StartsWith: SearchFieldOperator;
+            static Greater: SearchFieldOperator;
+            static GreaterOrEqual: SearchFieldOperator;
+            static Equal: SearchFieldOperator;
+            static NotEqual: SearchFieldOperator;
+            static SmallerOrEqual: SearchFieldOperator;
+            static Smaller: SearchFieldOperator;
+        }
+        class SearchFieldType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Normal: SearchFieldType;
+            static Hidden: SearchFieldType;
+            static ReadOnly: SearchFieldType;
+        }
+        class SelectionType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static SelectPage: SelectionType;
+            static SelectAll: SelectionType;
+        }
+        class SidebarToggleMode extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static PushContentAside: SidebarToggleMode;
+            static SlideOverContent: SidebarToggleMode;
+            static ShrinkContent: SidebarToggleMode;
+        }
+        class SidebarToggleRegion extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Left: SidebarToggleRegion;
+            static Right: SidebarToggleRegion;
+        }
+        class SimpleMenuBarOrientation extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Horizontal: SimpleMenuBarOrientation;
+            static Vertical: SimpleMenuBarOrientation;
+        }
+        class SizeMode extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Auto: SizeMode;
+            static Pixels: SizeMode;
+            static Percentage: SizeMode;
+        }
+        class TableCellRenderModeType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Default: TableCellRenderModeType;
+            static Header: TableCellRenderModeType;
+            static Title: TableCellRenderModeType;
+        }
+        class TextRenderMode extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Text: TextRenderMode;
+            static Paragraph: TextRenderMode;
+            static H1: TextRenderMode;
+            static H2: TextRenderMode;
+            static H3: TextRenderMode;
+            static H4: TextRenderMode;
+            static H5: TextRenderMode;
+            static H6: TextRenderMode;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `CustomWidgets`.
+     */
+    namespace customwidgets {
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
+         */
+        interface IWidget extends elements.IElement {
+            load(): Widget;
+            load(callback: (element: Widget) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Widget extends elements.Element implements IWidget {
+            static typeName: string;
+            name: string;
+            class: string;
+            style: string;
+            tabIndex: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ICustomWidget extends pages.IWidget {
+            load(): CustomWidget;
+            load(callback: (element: CustomWidget) => void): any;
+        }
+        class CustomWidget extends pages.Widget implements ICustomWidget {
+            static typeName: string;
+            type: CustomWidgetType;
+            object: WidgetObject;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ICustomWidgetType extends elements.IElement {
+            container: ICustomWidget;
+            load(): CustomWidgetType;
+            load(callback: (element: CustomWidgetType) => void): any;
+        }
+        class CustomWidgetType extends elements.Element implements ICustomWidgetType {
+            static typeName: string;
+            container: CustomWidget;
+            widgetId: string;
+            needsEntityContext: boolean;
+            name: string;
+            description: string;
+            phoneGapEnabled: boolean;
+            objectType: WidgetObjectType;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IWidgetEnumerationValue extends elements.IElement {
+            container: IWidgetValueType;
+            load(): WidgetEnumerationValue;
+            load(callback: (element: WidgetEnumerationValue) => void): any;
+        }
+        class WidgetEnumerationValue extends elements.Element implements IWidgetEnumerationValue {
+            static typeName: string;
+            container: WidgetValueType;
+            key: string;
+            caption: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IWidgetObject extends elements.IElement {
+            load(): WidgetObject;
+            load(callback: (element: WidgetObject) => void): any;
+        }
+        class WidgetObject extends elements.Element implements IWidgetObject {
+            static typeName: string;
+            type: WidgetObjectType;
+            properties: instances.IList<WidgetProperty>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IWidgetObjectType extends elements.IElement {
+            load(): WidgetObjectType;
+            load(callback: (element: WidgetObjectType) => void): any;
+        }
+        class WidgetObjectType extends elements.Element implements IWidgetObjectType {
+            static typeName: string;
+            propertyTypes: instances.IList<WidgetPropertyType>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IWidgetProperty extends elements.IElement {
+            container: IWidgetObject;
+            load(): WidgetProperty;
+            load(callback: (element: WidgetProperty) => void): any;
+        }
+        class WidgetProperty extends elements.Element implements IWidgetProperty {
+            static typeName: string;
+            container: WidgetObject;
+            type: WidgetPropertyType;
+            value: WidgetValue;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IWidgetPropertyType extends elements.IElement {
+            container: IWidgetObjectType;
+            load(): WidgetPropertyType;
+            load(callback: (element: WidgetPropertyType) => void): any;
+        }
+        class WidgetPropertyType extends elements.Element implements IWidgetPropertyType {
+            static typeName: string;
+            container: WidgetObjectType;
+            key: string;
+            category: string;
+            caption: string;
+            description: string;
+            isDefault: boolean;
+            valueType: WidgetValueType;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IWidgetReturnType extends elements.IElement {
+            container: IWidgetValueType;
+            load(): WidgetReturnType;
+            load(callback: (element: WidgetReturnType) => void): any;
+        }
+        class WidgetReturnType extends elements.Element implements IWidgetReturnType {
+            static typeName: string;
+            container: WidgetValueType;
+            type: WidgetReturnTypeEnum;
+            isList: boolean;
+            entityProperty: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IWidgetTranslation extends elements.IElement {
+            container: IWidgetValueType;
+            load(): WidgetTranslation;
+            load(callback: (element: WidgetTranslation) => void): any;
+        }
+        class WidgetTranslation extends elements.Element implements IWidgetTranslation {
+            static typeName: string;
+            container: WidgetValueType;
+            languageCode: string;
+            text: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IWidgetValue extends elements.IElement {
+            container: IWidgetProperty;
+            load(): WidgetValue;
+            load(callback: (element: WidgetValue) => void): any;
+        }
+        class WidgetValue extends elements.Element implements IWidgetValue {
+            static typeName: string;
+            container: WidgetProperty;
+            type: WidgetValueType;
+            primitiveValue: string;
+            /**
+             * The value of this property is conceptually of type Paths$EntityPath.
+             */
+            entityPath: string;
+            /**
+             * The value of this property is conceptually of type Paths$AttributePath.
+             */
+            attributePath: string;
+            page: pages.IPage;
+            pageQualifiedName: string;
+            microflow: microflows.IMicroflow;
+            microflowQualifiedName: string;
+            image: images.IImage;
+            imageQualifiedName: string;
+            translatableValue: texts.Text;
+            /**
+             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
+             */
+            xPathConstraint: string;
+            objects: instances.IList<WidgetObject>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IWidgetValueType extends elements.IElement {
+            container: IWidgetPropertyType;
+            load(): WidgetValueType;
+            load(callback: (element: WidgetValueType) => void): any;
+        }
+        class WidgetValueType extends elements.Element implements IWidgetValueType {
+            static typeName: string;
+            container: WidgetPropertyType;
+            type: WidgetValueTypeEnum;
+            isList: boolean;
+            entityProperty: string;
+            allowNonPersistableEntities: boolean;
+            isPath: IsPath;
+            pathType: PathType;
+            parameterIsList: boolean;
+            multiline: boolean;
+            defaultValue: string;
+            required: boolean;
+            attributeTypes: instances.IList<CustomWidgetAttributeType>;
+            enumerationValues: instances.IList<WidgetEnumerationValue>;
+            objectType: WidgetObjectType;
+            returnType: WidgetReturnType;
+            translations: instances.IList<WidgetTranslation>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class CustomWidgetAttributeType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static AutoNumber: CustomWidgetAttributeType;
+            static Binary: CustomWidgetAttributeType;
+            static Boolean: CustomWidgetAttributeType;
+            static Currency: CustomWidgetAttributeType;
+            static DateTime: CustomWidgetAttributeType;
+            static Enum: CustomWidgetAttributeType;
+            static Float: CustomWidgetAttributeType;
+            static HashString: CustomWidgetAttributeType;
+            static Integer: CustomWidgetAttributeType;
+            static Long: CustomWidgetAttributeType;
+            static String: CustomWidgetAttributeType;
+            static Decimal: CustomWidgetAttributeType;
+        }
+        class IsPath extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static No: IsPath;
+            static Optional: IsPath;
+            static Yes: IsPath;
+        }
+        class PathType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static None: PathType;
+            static Reference: PathType;
+            static ReferenceSet: PathType;
+        }
+        class WidgetReturnTypeEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Void: WidgetReturnTypeEnum;
+            static Boolean: WidgetReturnTypeEnum;
+            static Integer: WidgetReturnTypeEnum;
+            static Float: WidgetReturnTypeEnum;
+            static DateTime: WidgetReturnTypeEnum;
+            static String: WidgetReturnTypeEnum;
+            static Object: WidgetReturnTypeEnum;
+            static Decimal: WidgetReturnTypeEnum;
+        }
+        class WidgetValueTypeEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Attribute: WidgetValueTypeEnum;
+            static Boolean: WidgetValueTypeEnum;
+            static Entity: WidgetValueTypeEnum;
+            static EntityConstraint: WidgetValueTypeEnum;
+            static Enumeration: WidgetValueTypeEnum;
+            static Form: WidgetValueTypeEnum;
+            static Image: WidgetValueTypeEnum;
+            static Integer: WidgetValueTypeEnum;
+            static Microflow: WidgetValueTypeEnum;
+            static Object: WidgetValueTypeEnum;
+            static String: WidgetValueTypeEnum;
+            static TranslatableString: WidgetValueTypeEnum;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `DocumentTemplates`.
+     */
+    namespace documenttemplates {
+        interface IWidget extends elements.IElement {
+            load(): Widget;
+            load(callback: (element: Widget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Widget extends elements.Element implements IWidget {
+            static typeName: string;
+            name: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IAttributeWidget extends IWidget {
+            load(): AttributeWidget;
+            load(callback: (element: AttributeWidget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class AttributeWidget extends Widget implements IAttributeWidget {
+            static typeName: string;
+            attributePath: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IConditionSettings extends elements.IElement {
+            container: IMxTableRow;
+            load(): ConditionSettings;
+            load(callback: (element: ConditionSettings) => void): any;
+        }
+        class ConditionSettings extends elements.Element implements IConditionSettings {
+            static typeName: string;
+            container: MxTableRow;
+            conditions: instances.IList<enumerations.Condition>;
+            attribute: domainmodels.IAttribute;
+            attributeQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Columns+(document+template) relevant section in reference guide}
+         */
+        interface IDataGridCell extends elements.IElement {
+            container: IDataGridColumn;
+            load(): DataGridCell;
+            load(callback: (element: DataGridCell) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Columns+(document+template) relevant section in reference guide}
+         */
+        class DataGridCell extends elements.Element implements IDataGridCell {
+            static typeName: string;
+            container: DataGridColumn;
+            style: MxStyle;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Columns+(document+template) relevant section in reference guide}
+         */
+        interface IDataGridColumn extends elements.IElement {
+            container: IMxDataGrid;
+            load(): DataGridColumn;
+            load(callback: (element: DataGridColumn) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Columns+(document+template) relevant section in reference guide}
+         */
+        class DataGridColumn extends elements.Element implements IDataGridColumn {
+            static typeName: string;
+            container: MxDataGrid;
+            oddRowsCell: DataGridCell;
+            evenRowsCell: DataGridCell;
+            caption: texts.Text;
+            formattingInfo: pages.FormattingInfo;
+            style: MxStyle;
+            attributePath: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Sort+Bar relevant section in reference guide}
+         */
+        interface IDocGridSortBar extends elements.IElement {
+            container: IMxGrid;
+            load(): DocGridSortBar;
+            load(callback: (element: DocGridSortBar) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Sort+Bar relevant section in reference guide}
+         */
+        class DocGridSortBar extends elements.Element implements IDocGridSortBar {
+            static typeName: string;
+            container: MxGrid;
+            sortItems: instances.IList<DocGridSortItem>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDocGridSortItem extends elements.IElement {
+            container: IDocGridSortBar;
+            load(): DocGridSortItem;
+            load(callback: (element: DocGridSortItem) => void): any;
+        }
+        class DocGridSortItem extends elements.Element implements IDocGridSortItem {
+            static typeName: string;
+            container: DocGridSortBar;
+            attributePath: string;
+            sortOrder: pages.SortDirection;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Document+Templates relevant section in reference guide}
+         */
+        interface IDocumentTemplate extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): DocumentTemplate;
+            load(callback: (element: DocumentTemplate) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Document+Templates relevant section in reference guide}
+         */
+        class DocumentTemplate extends projects.Document implements IDocumentTemplate {
+            static typeName: string;
+            container: projects.FolderBase;
+            toplevels: instances.IList<Widget>;
+            header: MxHeaderDropZone;
+            footer: MxFooterDropZone;
+            style: MxStyle;
+            canvasWidth: number;
+            pageWidth: string;
+            pageHeight: string;
+            pPI: number;
+            marginLeftInInch: number;
+            marginRightInInch: number;
+            marginTopInInch: number;
+            marginBottomInInch: number;
+            showHeaderAndFooterOnFirstPage: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IEntityWidget extends IWidget {
+            load(): EntityWidget;
+            load(callback: (element: EntityWidget) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class EntityWidget extends Widget implements IEntityWidget {
+            static typeName: string;
+            entityPath: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Dynamic+Image+(document+template) relevant section in reference guide}
+         */
+        interface IDynamicImageViewer extends IEntityWidget {
+            load(): DynamicImageViewer;
+            load(callback: (element: DynamicImageViewer) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Dynamic+Image+(document+template) relevant section in reference guide}
+         */
+        class DynamicImageViewer extends EntityWidget implements IDynamicImageViewer {
+            static typeName: string;
+            image: images.IImage;
+            imageQualifiedName: string;
+            useThumbnail: boolean;
+            width: number;
+            height: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMxGrid extends IEntityWidget {
+            load(): MxGrid;
+            load(callback: (element: MxGrid) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MxGrid extends EntityWidget implements IMxGrid {
+            static typeName: string;
+            style: MxStyle;
+            sortBar: DocGridSortBar;
+            cellSpacing: number;
+            cellPadding: number;
+            microflow: microflows.IMicroflow;
+            microflowQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+Grid+(document+template) relevant section in reference guide}
+         */
+        interface IMxDataGrid extends IMxGrid {
+            load(): MxDataGrid;
+            load(callback: (element: MxDataGrid) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+Grid+(document+template) relevant section in reference guide}
+         */
+        class MxDataGrid extends MxGrid implements IMxDataGrid {
+            static typeName: string;
+            columns: instances.IList<DataGridColumn>;
+            weights: instances.IList<number>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+(document+template) relevant section in reference guide}
+         */
+        interface IMxDataView extends IEntityWidget {
+            load(): MxDataView;
+            load(callback: (element: MxDataView) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+(document+template) relevant section in reference guide}
+         */
+        class MxDataView extends EntityWidget implements IMxDataView {
+            static typeName: string;
+            contents: MxDataViewDropZone;
+            microflow: microflows.IMicroflow;
+            microflowQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+(document+template) relevant section in reference guide}
+         */
+        interface IMxDataViewDropZone extends elements.IElement {
+            container: IMxDataView;
+            load(): MxDataViewDropZone;
+            load(callback: (element: MxDataViewDropZone) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+View+(document+template) relevant section in reference guide}
+         */
+        class MxDataViewDropZone extends elements.Element implements IMxDataViewDropZone {
+            static typeName: string;
+            container: MxDataView;
+            widget: Widget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Dynamic+label+(document+template) relevant section in reference guide}
+         */
+        interface IMxDynamicLabel extends IAttributeWidget {
+            load(): MxDynamicLabel;
+            load(callback: (element: MxDynamicLabel) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Dynamic+label+(document+template) relevant section in reference guide}
+         */
+        class MxDynamicLabel extends AttributeWidget implements IMxDynamicLabel {
+            static typeName: string;
+            style: MxStyle;
+            formattingInfo: pages.FormattingInfo;
+            renderXHTML: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Footer+(document+template) relevant section in reference guide}
+         */
+        interface IMxFooterDropZone extends elements.IElement {
+            container: IDocumentTemplate;
+            load(): MxFooterDropZone;
+            load(callback: (element: MxFooterDropZone) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Footer+(document+template) relevant section in reference guide}
+         */
+        class MxFooterDropZone extends elements.Element implements IMxFooterDropZone {
+            static typeName: string;
+            container: DocumentTemplate;
+            widget: Widget;
+            bottomMargin: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Header+(document+template) relevant section in reference guide}
+         */
+        interface IMxHeaderDropZone extends elements.IElement {
+            container: IDocumentTemplate;
+            load(): MxHeaderDropZone;
+            load(callback: (element: MxHeaderDropZone) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Header+(document+template) relevant section in reference guide}
+         */
+        class MxHeaderDropZone extends elements.Element implements IMxHeaderDropZone {
+            static typeName: string;
+            container: DocumentTemplate;
+            widget: Widget;
+            topMargin: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Line+Break+(document+template) relevant section in reference guide}
+         */
+        interface IMxLineBreak extends IWidget {
+            load(): MxLineBreak;
+            load(callback: (element: MxLineBreak) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Line+Break+(document+template) relevant section in reference guide}
+         */
+        class MxLineBreak extends Widget implements IMxLineBreak {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Page+Break+(document+template) relevant section in reference guide}
+         */
+        interface IMxPageBreak extends IWidget {
+            load(): MxPageBreak;
+            load(callback: (element: MxPageBreak) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Page+Break+(document+template) relevant section in reference guide}
+         */
+        class MxPageBreak extends Widget implements IMxPageBreak {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Static+label+(document+template) relevant section in reference guide}
+         */
+        interface IMxStaticLabel extends IWidget {
+            load(): MxStaticLabel;
+            load(callback: (element: MxStaticLabel) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Static+label+(document+template) relevant section in reference guide}
+         */
+        class MxStaticLabel extends Widget implements IMxStaticLabel {
+            static typeName: string;
+            caption: texts.Text;
+            style: MxStyle;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMxStyle extends elements.IElement {
+            load(): MxStyle;
+            load(callback: (element: MxStyle) => void): any;
+        }
+        class MxStyle extends elements.Element implements IMxStyle {
+            static typeName: string;
+            fontFamily: FontFamily;
+            fontSize: number;
+            bold: boolean;
+            italic: boolean;
+            fontColor: string;
+            backgroundColor: string;
+            overrideFontFamily: boolean;
+            overrideFontSize: boolean;
+            overrideBold: boolean;
+            overrideItalic: boolean;
+            overrideFontColor: boolean;
+            overrideBackgroundColor: boolean;
+            textAlign: TextAlign;
+            customStyles: string;
+            borderStyleTop: BorderStyle;
+            borderStyleBottom: BorderStyle;
+            borderStyleLeft: BorderStyle;
+            borderStyleRight: BorderStyle;
+            borderWidthTop: number;
+            borderWidthBottom: number;
+            borderWidthLeft: number;
+            borderWidthRight: number;
+            borderColorTop: string;
+            borderColorBottom: string;
+            borderColorLeft: string;
+            borderColorRight: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Table+(document+template) relevant section in reference guide}
+         */
+        interface IMxTable extends IWidget {
+            load(): MxTable;
+            load(callback: (element: MxTable) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Table+(document+template) relevant section in reference guide}
+         */
+        class MxTable extends Widget implements IMxTable {
+            static typeName: string;
+            rows: instances.IList<MxTableRow>;
+            style: MxStyle;
+            columnWeights: instances.IList<number>;
+            cellSpacing: number;
+            cellPadding: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Cell+(document+template) relevant section in reference guide}
+         */
+        interface IMxTableCell extends elements.IElement {
+            container: IMxTableRow;
+            load(): MxTableCell;
+            load(callback: (element: MxTableCell) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Cell+(document+template) relevant section in reference guide}
+         */
+        class MxTableCell extends elements.Element implements IMxTableCell {
+            static typeName: string;
+            container: MxTableRow;
+            style: MxStyle;
+            widget: Widget;
+            colSpan: number;
+            rowSpan: number;
+            isPartOfSpan: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Row+(document+template) relevant section in reference guide}
+         */
+        interface IMxTableRow extends elements.IElement {
+            container: IMxTable;
+            load(): MxTableRow;
+            load(callback: (element: MxTableRow) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Row+(document+template) relevant section in reference guide}
+         */
+        class MxTableRow extends elements.Element implements IMxTableRow {
+            static typeName: string;
+            container: MxTable;
+            cells: instances.IList<MxTableCell>;
+            conditionSettings: ConditionSettings;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Template+Grid+(document+template) relevant section in reference guide}
+         */
+        interface IMxTemplateGrid extends IMxGrid {
+            load(): MxTemplateGrid;
+            load(callback: (element: MxTemplateGrid) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Template+Grid+(document+template) relevant section in reference guide}
+         */
+        class MxTemplateGrid extends MxGrid implements IMxTemplateGrid {
+            static typeName: string;
+            oddRowsDropZone: MxTemplateGridDropZone;
+            evenRowsDropZone: MxTemplateGridDropZone;
+            numberOfColumns: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Template+Grid+(document+template) relevant section in reference guide}
+         */
+        interface IMxTemplateGridDropZone extends elements.IElement {
+            container: IMxTemplateGrid;
+            load(): MxTemplateGridDropZone;
+            load(callback: (element: MxTemplateGridDropZone) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Template+Grid+(document+template) relevant section in reference guide}
+         */
+        class MxTemplateGridDropZone extends elements.Element implements IMxTemplateGridDropZone {
+            static typeName: string;
+            container: MxTemplateGrid;
+            widget: Widget;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Title+(document+template) relevant section in reference guide}
+         */
+        interface IMxTitle extends IWidget {
+            load(): MxTitle;
+            load(callback: (element: MxTitle) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Title+(document+template) relevant section in reference guide}
+         */
+        class MxTitle extends Widget implements IMxTitle {
+            static typeName: string;
+            caption: texts.Text;
+            style: MxStyle;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Static+Image+(document+template) relevant section in reference guide}
+         */
+        interface IStaticImageViewer extends IWidget {
+            load(): StaticImageViewer;
+            load(callback: (element: StaticImageViewer) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Static+Image+(document+template) relevant section in reference guide}
+         */
+        class StaticImageViewer extends Widget implements IStaticImageViewer {
+            static typeName: string;
+            image: images.IImage;
+            imageQualifiedName: string;
+            width: number;
+            height: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class BorderStyle extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static None: BorderStyle;
+            static Dotted: BorderStyle;
+            static Dashed: BorderStyle;
+            static Solid: BorderStyle;
+        }
+        class FontFamily extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Courier: FontFamily;
+            static Tahoma: FontFamily;
+            static Times: FontFamily;
+            static Helvetica: FontFamily;
+            static Arial: FontFamily;
+        }
+        class TextAlign extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Left: TextAlign;
+            static Right: TextAlign;
+            static Center: TextAlign;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Navigation`.
+     */
+    namespace navigation {
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         */
+        interface IProjectDocument extends units.IModelUnit {
+            container: projects.IProject;
+            load(): ProjectDocument;
+            load(callback: (element: ProjectDocument) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ProjectDocument extends units.ModelUnit implements IProjectDocument {
+            static typeName: string;
+            container: projects.Project;
+            constructor(container: projects.IProject);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Navigation relevant section in reference guide}
+         */
+        interface INavigationDocument extends projects.IProjectDocument {
+            container: projects.IProject;
+            load(): NavigationDocument;
+            load(callback: (element: NavigationDocument) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Navigation relevant section in reference guide}
+         */
+        class NavigationDocument extends projects.ProjectDocument implements INavigationDocument {
+            static typeName: string;
+            container: projects.Project;
+            phoneProfile: NavigationProfile;
+            tabletProfile: NavigationProfile;
+            desktopProfile: NavigationProfile;
+            constructor(container: projects.IProject);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface INavigationProfile extends elements.IElement {
+            container: INavigationDocument;
+            load(): NavigationProfile;
+            load(callback: (element: NavigationProfile) => void): any;
+        }
+        class NavigationProfile extends elements.Element implements INavigationProfile {
+            static typeName: string;
+            container: NavigationDocument;
+            type: DeviceType;
+            enabled: boolean;
+            homePage: HomePage;
+            roleBasedHomePages: instances.IList<RoleBasedHomePage>;
+            applicationTitle: string;
+            menuItemCollection: menus.MenuItemCollection;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IHomePageBase extends elements.IElement {
+            container: INavigationProfile;
+            load(): HomePageBase;
+            load(callback: (element: HomePageBase) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class HomePageBase extends elements.Element implements IHomePageBase {
+            static typeName: string;
+            container: NavigationProfile;
+            page: pages.IPage;
+            pageQualifiedName: string;
+            microflow: microflows.IMicroflow;
+            microflowQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IHomePage extends IHomePageBase {
+            container: INavigationProfile;
+            load(): HomePage;
+            load(callback: (element: HomePage) => void): any;
+        }
+        class HomePage extends HomePageBase implements IHomePage {
+            static typeName: string;
+            container: NavigationProfile;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IRoleBasedHomePage extends IHomePageBase {
+            container: INavigationProfile;
+            load(): RoleBasedHomePage;
+            load(callback: (element: RoleBasedHomePage) => void): any;
+        }
+        class RoleBasedHomePage extends HomePageBase implements IRoleBasedHomePage {
+            static typeName: string;
+            container: NavigationProfile;
+            userRole: security.IUserRole;
+            userRoleQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class DeviceType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Desktop: DeviceType;
+            static Tablet: DeviceType;
+            static Phone: DeviceType;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Reports`.
+     */
+    namespace reports {
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
+         */
+        interface IWidget extends elements.IElement {
+            load(): Widget;
+            load(callback: (element: Widget) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Widget extends elements.Element implements IWidget {
+            static typeName: string;
+            name: string;
+            class: string;
+            style: string;
+            tabIndex: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Report+Widgets relevant section in reference guide}
+         */
+        interface IReportWidget extends pages.IWidget {
+            load(): ReportWidget;
+            load(callback: (element: ReportWidget) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Report+Widgets relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ReportWidget extends pages.Widget implements IReportWidget {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Basic+Reports relevant section in reference guide}
+         */
+        interface IBasicReport extends IReportWidget {
+            load(): BasicReport;
+            load(callback: (element: BasicReport) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Basic+Reports relevant section in reference guide}
+         */
+        class BasicReport extends ReportWidget implements IBasicReport {
+            static typeName: string;
+            dataSet: datasets.IDataSet;
+            dataSetQualifiedName: string;
+            columns: instances.IList<BasicReportColumn>;
+            aggregates: instances.IList<BasicReportAggregate>;
+            showExportButton: boolean;
+            zoomInfo: ReportZoomInfo;
+            isPagingEnabled: boolean;
+            pageSize: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IBasicReportAggregate extends elements.IElement {
+            container: IBasicReport;
+            load(): BasicReportAggregate;
+            load(callback: (element: BasicReportAggregate) => void): any;
+        }
+        class BasicReportAggregate extends elements.Element implements IBasicReportAggregate {
+            static typeName: string;
+            container: BasicReport;
+            caption: texts.Text;
+            aggregateFunction: AggregateFunctionEnum;
+            applicablePerColumn: instances.IList<boolean>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IBasicReportColumn extends elements.IElement {
+            container: IBasicReport;
+            load(): BasicReportColumn;
+            load(callback: (element: BasicReportColumn) => void): any;
+        }
+        class BasicReportColumn extends elements.Element implements IBasicReportColumn {
+            static typeName: string;
+            container: BasicReport;
+            caption: texts.Text;
+            dataSetColumnName: string;
+            width: number;
+            alignment: pages.AlignmentEnum;
+            format: ColumnFormat;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Report+Button relevant section in reference guide}
+         */
+        interface IReportButton extends pages.IWidget {
+            load(): ReportButton;
+            load(callback: (element: ReportButton) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Report+Button relevant section in reference guide}
+         */
+        class ReportButton extends pages.Widget implements IReportButton {
+            static typeName: string;
+            caption: texts.Text;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Report+Chart relevant section in reference guide}
+         */
+        interface IReportChart extends pages.IWidget {
+            load(): ReportChart;
+            load(callback: (element: ReportChart) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Report+Chart relevant section in reference guide}
+         */
+        class ReportChart extends pages.Widget implements IReportChart {
+            static typeName: string;
+            dataSet: datasets.IDataSet;
+            dataSetQualifiedName: string;
+            type: ChartType;
+            seriess: instances.IList<ReportChartSeries>;
+            xAxisCaption: texts.Text;
+            yAxisCaption: texts.Text;
+            xAxisColumn: string;
+            xAxisFormat: ColumnFormat;
+            yAxisPrecision: number;
+            yAxisUseMinMax: boolean;
+            yAxisMinimum: number;
+            yAxisMaximum: number;
+            aspectRatio: AspectRatio;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IReportChartSeries extends elements.IElement {
+            container: IReportChart;
+            load(): ReportChartSeries;
+            load(callback: (element: ReportChartSeries) => void): any;
+        }
+        class ReportChartSeries extends elements.Element implements IReportChartSeries {
+            static typeName: string;
+            container: ReportChart;
+            caption: texts.Text;
+            dataSetColumn: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Date+Range+Field relevant section in reference guide}
+         */
+        interface IReportDateRangeField extends elements.IElement {
+            container: IReportDateRangeSelector;
+            load(): ReportDateRangeField;
+            load(callback: (element: ReportDateRangeField) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Date+Range+Field relevant section in reference guide}
+         */
+        class ReportDateRangeField extends elements.Element implements IReportDateRangeField {
+            static typeName: string;
+            container: ReportDateRangeSelector;
+            caption: texts.Text;
+            type: DateRangeFieldEnum;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IReportParameter extends pages.IWidget {
+            load(): ReportParameter;
+            load(callback: (element: ReportParameter) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ReportParameter extends pages.Widget implements IReportParameter {
+            static typeName: string;
+            parameterName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Date+Range+Selector relevant section in reference guide}
+         */
+        interface IReportDateRangeSelector extends IReportParameter {
+            load(): ReportDateRangeSelector;
+            load(callback: (element: ReportDateRangeSelector) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Date+Range+Selector relevant section in reference guide}
+         */
+        class ReportDateRangeSelector extends ReportParameter implements IReportDateRangeSelector {
+            static typeName: string;
+            fields: instances.IList<ReportDateRangeField>;
+            minYear: number;
+            maxYear: number;
+            fieldsPerRow: number;
+            showFromToRange: boolean;
+            fromCaption: texts.Text;
+            toCaption: texts.Text;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Drop+Down relevant section in reference guide}
+         */
+        interface IReportDropDown extends IReportParameter {
+            load(): ReportDropDown;
+            load(callback: (element: ReportDropDown) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Drop+Down relevant section in reference guide}
+         */
+        class ReportDropDown extends ReportParameter implements IReportDropDown {
+            static typeName: string;
+            attribute: domainmodels.IAttribute;
+            attributeQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Report+Pane relevant section in reference guide}
+         */
+        interface IReportPane extends pages.IWidget {
+            load(): ReportPane;
+            load(callback: (element: ReportPane) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Report+Pane relevant section in reference guide}
+         */
+        class ReportPane extends pages.Widget implements IReportPane {
+            static typeName: string;
+            parameterWidget: pages.Widget;
+            reportWidget: pages.Widget;
+            generateOnLoad: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IReportZoomInfo extends elements.IElement {
+            container: IBasicReport;
+            load(): ReportZoomInfo;
+            load(callback: (element: ReportZoomInfo) => void): any;
+        }
+        class ReportZoomInfo extends elements.Element implements IReportZoomInfo {
+            static typeName: string;
+            container: BasicReport;
+            targetPage: pages.IPage;
+            targetPageQualifiedName: string;
+            mappings: instances.IList<ReportZoomMapping>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IReportZoomMapping extends elements.IElement {
+            container: IReportZoomInfo;
+            load(): ReportZoomMapping;
+            load(callback: (element: ReportZoomMapping) => void): any;
+        }
+        class ReportZoomMapping extends elements.Element implements IReportZoomMapping {
+            static typeName: string;
+            container: ReportZoomInfo;
+            targetParameterName: string;
+            sourceReportColumnName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class AggregateFunctionEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Sum: AggregateFunctionEnum;
+            static Average: AggregateFunctionEnum;
+            static Count: AggregateFunctionEnum;
+            static Minimum: AggregateFunctionEnum;
+            static Maximum: AggregateFunctionEnum;
+        }
+        class ColumnFormat extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Default: ColumnFormat;
+            static MonthName: ColumnFormat;
+            static WeekdayName: ColumnFormat;
+        }
+        class ChartType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static VerticalBars: ChartType;
+            static VerticalBars3D: ChartType;
+            static HorizontalBars: ChartType;
+            static Lines: ChartType;
+            static Area: ChartType;
+        }
+        class AspectRatio extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static SixteenToNine: AspectRatio;
+            static ThreeToTwo: AspectRatio;
+            static FourToThree: AspectRatio;
+            static OneToOne: AspectRatio;
+            static ThreeToFour: AspectRatio;
+            static TwoToThree: AspectRatio;
+            static NineToSixteen: AspectRatio;
+        }
+        class DateRangeFieldEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Year: DateRangeFieldEnum;
+            static Month: DateRangeFieldEnum;
+            static Week: DateRangeFieldEnum;
+            static Period: DateRangeFieldEnum;
+            static Quarter: DateRangeFieldEnum;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Menus`.
+     */
+    namespace menus {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Menu relevant section in reference guide}
+         */
+        interface IMenuDocument extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): MenuDocument;
+            load(callback: (element: MenuDocument) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Menu relevant section in reference guide}
+         */
+        class MenuDocument extends projects.Document implements IMenuDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            itemCollection: MenuItemCollection;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMenuItemContainer extends elements.IElement {
+            load(): MenuItemContainer;
+            load(callback: (element: MenuItemContainer) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class MenuItemContainer extends elements.Element implements IMenuItemContainer {
+            static typeName: string;
+            items: instances.IList<MenuItem>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMenuItemCollection extends IMenuItemContainer {
+            load(): MenuItemCollection;
+            load(callback: (element: MenuItemCollection) => void): any;
+        }
+        class MenuItemCollection extends MenuItemContainer implements IMenuItemCollection {
+            static typeName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Menu+Item relevant section in reference guide}
+         */
+        interface IMenuItem extends IMenuItemContainer {
+            container: IMenuItemContainer;
+            load(): MenuItem;
+            load(callback: (element: MenuItem) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Menu+Item relevant section in reference guide}
+         */
+        class MenuItem extends MenuItemContainer implements IMenuItem {
+            static typeName: string;
+            container: MenuItemContainer;
+            caption: texts.Text;
+            icon: pages.Icon;
+            action: pages.ClientAction;
+            documentation: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `DataSets`.
+     */
+    namespace datasets {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+Sets relevant section in reference guide}
+         */
+        interface IDataSet extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): DataSet;
+            load(callback: (element: DataSet) => void): any;
+            parameters: instances.IList<IDataSetParameter>;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Data+Sets relevant section in reference guide}
+         */
+        class DataSet extends projects.Document implements IDataSet {
+            static typeName: string;
+            container: projects.FolderBase;
+            source: DataSetSource;
+            parameters: instances.IList<DataSetParameter>;
+            dataSetAccess: DataSetAccess;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataSetAccess extends elements.IElement {
+            container: IDataSet;
+            load(): DataSetAccess;
+            load(callback: (element: DataSetAccess) => void): any;
+        }
+        class DataSetAccess extends elements.Element implements IDataSetAccess {
+            static typeName: string;
+            container: DataSet;
+            moduleRoleAccessList: instances.IList<DataSetModuleRoleAccess>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataSetColumn extends elements.IElement {
+            container: IJavaDataSetSource;
+            load(): DataSetColumn;
+            load(callback: (element: DataSetColumn) => void): any;
+        }
+        class DataSetColumn extends elements.Element implements IDataSetColumn {
+            static typeName: string;
+            container: JavaDataSetSource;
+            name: string;
+            type: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataSetConstraintAccess extends elements.IElement {
+            container: IDataSetParameterAccess;
+            load(): DataSetConstraintAccess;
+            load(callback: (element: DataSetConstraintAccess) => void): any;
+        }
+        class DataSetConstraintAccess extends elements.Element implements IDataSetConstraintAccess {
+            static typeName: string;
+            container: DataSetParameterAccess;
+            constraintText: string;
+            enabled: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataSetParameterConstraint extends elements.IElement {
+            container: IDataSetParameter;
+            load(): DataSetParameterConstraint;
+            load(callback: (element: DataSetParameterConstraint) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class DataSetParameterConstraint extends elements.Element implements IDataSetParameterConstraint {
+            static typeName: string;
+            container: DataSetParameter;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDataSetDateTimeConstraint extends IDataSetParameterConstraint {
+            container: IDataSetParameter;
+            load(): DataSetDateTimeConstraint;
+            load(callback: (element: DataSetDateTimeConstraint) => void): any;
+        }
+        class DataSetDateTimeConstraint extends DataSetParameterConstraint implements IDataSetDateTimeConstraint {
+            static typeName: string;
+            container: DataSetParameter;
+            modifier: DateTimeIntervalModifier;
+            length: DateTimeIntervalLength;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataSetModuleRoleAccess extends elements.IElement {
+            container: IDataSetAccess;
+            load(): DataSetModuleRoleAccess;
+            load(callback: (element: DataSetModuleRoleAccess) => void): any;
+        }
+        class DataSetModuleRoleAccess extends elements.Element implements IDataSetModuleRoleAccess {
+            static typeName: string;
+            container: DataSetAccess;
+            parameterAccessList: instances.IList<DataSetParameterAccess>;
+            moduleRole: security.IModuleRole;
+            moduleRoleQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataSetNumericConstraint extends IDataSetParameterConstraint {
+            container: IDataSetParameter;
+            load(): DataSetNumericConstraint;
+            load(callback: (element: DataSetNumericConstraint) => void): any;
+        }
+        class DataSetNumericConstraint extends DataSetParameterConstraint implements IDataSetNumericConstraint {
+            static typeName: string;
+            container: DataSetParameter;
+            begin: string;
+            applyBegin: boolean;
+            end: string;
+            applyEnd: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataSetObjectConstraint extends IDataSetParameterConstraint {
+            container: IDataSetParameter;
+            load(): DataSetObjectConstraint;
+            load(callback: (element: DataSetObjectConstraint) => void): any;
+        }
+        class DataSetObjectConstraint extends DataSetParameterConstraint implements IDataSetObjectConstraint {
+            static typeName: string;
+            container: DataSetParameter;
+            name: string;
+            constraint: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataSetParameter extends elements.IElement {
+            container: IDataSet;
+            load(): DataSetParameter;
+            load(callback: (element: DataSetParameter) => void): any;
+            name: string;
+        }
+        class DataSetParameter extends elements.Element implements IDataSetParameter {
+            static typeName: string;
+            container: DataSet;
+            constraints: instances.IList<DataSetParameterConstraint>;
+            name: string;
+            type: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataSetParameterAccess extends elements.IElement {
+            container: IDataSetModuleRoleAccess;
+            load(): DataSetParameterAccess;
+            load(callback: (element: DataSetParameterAccess) => void): any;
+        }
+        class DataSetParameterAccess extends elements.Element implements IDataSetParameterAccess {
+            static typeName: string;
+            container: DataSetModuleRoleAccess;
+            constraintAccessList: instances.IList<DataSetConstraintAccess>;
+            parameterName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDataSetSource extends elements.IElement {
+            container: IDataSet;
+            load(): DataSetSource;
+            load(callback: (element: DataSetSource) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class DataSetSource extends elements.Element implements IDataSetSource {
+            static typeName: string;
+            container: DataSet;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IJavaDataSetSource extends IDataSetSource {
+            container: IDataSet;
+            load(): JavaDataSetSource;
+            load(callback: (element: JavaDataSetSource) => void): any;
+        }
+        class JavaDataSetSource extends DataSetSource implements IJavaDataSetSource {
+            static typeName: string;
+            container: DataSet;
+            columns: instances.IList<DataSetColumn>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IOqlDataSetSource extends IDataSetSource {
+            container: IDataSet;
+            load(): OqlDataSetSource;
+            load(callback: (element: OqlDataSetSource) => void): any;
+        }
+        class OqlDataSetSource extends DataSetSource implements IOqlDataSetSource {
+            static typeName: string;
+            container: DataSet;
+            query: string;
+            ignoreErrorsInQuery: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class DateTimeIntervalLength extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Day: DateTimeIntervalLength;
+            static Week: DateTimeIntervalLength;
+            static Period: DateTimeIntervalLength;
+            static Month: DateTimeIntervalLength;
+            static Quarter: DateTimeIntervalLength;
+            static Year: DateTimeIntervalLength;
+        }
+        class DateTimeIntervalModifier extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Last: DateTimeIntervalModifier;
+            static This: DateTimeIntervalModifier;
+            static Next: DateTimeIntervalModifier;
+            static Past: DateTimeIntervalModifier;
+            static Future: DateTimeIntervalModifier;
+            static Always: DateTimeIntervalModifier;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Texts`.
+     */
+    namespace texts {
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Translatable+Texts relevant section in reference guide}
+         */
+        interface IText extends elements.IElement {
+            load(): Text;
+            load(callback: (element: Text) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Translatable+Texts relevant section in reference guide}
+         */
+        class Text extends elements.Element implements IText {
+            static typeName: string;
+            translations: instances.IList<Translation>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ITranslation extends elements.IElement {
+            container: IText;
+            load(): Translation;
+            load(callback: (element: Translation) => void): any;
+        }
+        class Translation extends elements.Element implements ITranslation {
+            static typeName: string;
+            container: Text;
+            languageCode: string;
+            text: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project+Settings relevant section in reference guide}
+         */
+        interface ILanguage extends elements.IElement {
+            container: settings.IProjectSettings;
+            load(): Language;
+            load(callback: (element: Language) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project+Settings relevant section in reference guide}
+         */
+        class Language extends elements.Element implements ILanguage {
+            static typeName: string;
+            container: settings.ProjectSettings;
+            code: string;
+            checkCompleteness: boolean;
+            customDateFormat: string;
+            customTimeFormat: string;
+            customDateTimeFormat: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ISystemText extends elements.IElement {
+            container: ISystemTextCollection;
+            load(): SystemText;
+            load(callback: (element: SystemText) => void): any;
+        }
+        class SystemText extends elements.Element implements ISystemText {
+            static typeName: string;
+            container: SystemTextCollection;
+            text: Text;
+            key: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         */
+        interface IProjectDocument extends units.IModelUnit {
+            container: projects.IProject;
+            load(): ProjectDocument;
+            load(callback: (element: ProjectDocument) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ProjectDocument extends units.ModelUnit implements IProjectDocument {
+            static typeName: string;
+            container: projects.Project;
+            constructor(container: projects.IProject);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/System+Texts relevant section in reference guide}
+         */
+        interface ISystemTextCollection extends projects.IProjectDocument {
+            container: projects.IProject;
+            load(): SystemTextCollection;
+            load(callback: (element: SystemTextCollection) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/System+Texts relevant section in reference guide}
+         */
+        class SystemTextCollection extends projects.ProjectDocument implements ISystemTextCollection {
+            static typeName: string;
+            container: projects.Project;
+            systemTexts: instances.IList<SystemText>;
+            constructor(container: projects.IProject);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `JavaActions`.
+     */
+    namespace javaactions {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Java+Actions relevant section in reference guide}
+         */
+        interface IJavaAction extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): JavaAction;
+            load(callback: (element: JavaAction) => void): any;
+            parameters: instances.IList<IJavaActionParameter>;
+            returnType: string;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Java+Actions relevant section in reference guide}
+         */
+        class JavaAction extends projects.Document implements IJavaAction {
+            static typeName: string;
+            container: projects.FolderBase;
+            parameters: instances.IList<JavaActionParameter>;
+            returnType: string;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IJavaActionParameter extends elements.IElement {
+            container: IJavaAction;
+            load(): JavaActionParameter;
+            load(callback: (element: JavaActionParameter) => void): any;
+            name: string;
+            type: string;
+        }
+        class JavaActionParameter extends elements.Element implements IJavaActionParameter {
+            static typeName: string;
+            container: JavaAction;
+            name: string;
+            type: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Constants`.
+     */
+    namespace constants {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Constants relevant section in reference guide}
+         */
+        interface IConstant extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): Constant;
+            load(callback: (element: Constant) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Constants relevant section in reference guide}
+         */
+        class Constant extends projects.Document implements IConstant {
+            static typeName: string;
+            container: projects.FolderBase;
+            dataType: string;
+            defaultValue: string;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `ScheduledEvents`.
+     */
+    namespace scheduledevents {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Scheduled+Events relevant section in reference guide}
+         */
+        interface IScheduledEvent extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): ScheduledEvent;
+            load(callback: (element: ScheduledEvent) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Scheduled+Events relevant section in reference guide}
+         */
+        class ScheduledEvent extends projects.Document implements IScheduledEvent {
+            static typeName: string;
+            container: projects.FolderBase;
+            startDateTime: string;
+            timeZone: TimeZoneEnum;
+            interval: number;
+            intervalType: IntervalType;
+            microflow: microflows.IMicroflow;
+            microflowQualifiedName: string;
+            enabled: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        class IntervalType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Second: IntervalType;
+            static Minute: IntervalType;
+            static Hour: IntervalType;
+            static Day: IntervalType;
+            static Week: IntervalType;
+            static Month: IntervalType;
+            static Year: IntervalType;
+        }
+        class TimeZoneEnum extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static UTC: TimeZoneEnum;
+            static Server: TimeZoneEnum;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `RegularExpressions`.
+     */
+    namespace regularexpressions {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Regular+Expressions relevant section in reference guide}
+         */
+        interface IRegularExpression extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): RegularExpression;
+            load(callback: (element: RegularExpression) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Regular+Expressions relevant section in reference guide}
+         */
+        class RegularExpression extends projects.Document implements IRegularExpression {
+            static typeName: string;
+            container: projects.FolderBase;
+            regEx: string;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Images`.
+     */
+    namespace images {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Images relevant section in reference guide}
+         */
+        interface IImageCollection extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): ImageCollection;
+            load(callback: (element: ImageCollection) => void): any;
+            images: instances.IList<IImage>;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Images relevant section in reference guide}
+         */
+        class ImageCollection extends projects.Document implements IImageCollection {
+            static typeName: string;
+            container: projects.FolderBase;
+            images: instances.IList<Image>;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IImage extends elements.IElement {
+            container: IImageCollection;
+            load(): Image;
+            load(callback: (element: Image) => void): any;
+            name: string;
+        }
+        class Image extends elements.Element implements IImage {
+            static typeName: string;
+            container: ImageCollection;
+            name: string;
+            /**
+             * ?
+             */
+            imageData: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Security`.
+     */
+    namespace security {
+        interface IAccessRuleContainerBase extends elements.IElement {
+            container: IProjectSecurity;
+            load(): AccessRuleContainerBase;
+            load(callback: (element: AccessRuleContainerBase) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class AccessRuleContainerBase extends elements.Element implements IAccessRuleContainerBase {
+            static typeName: string;
+            container: ProjectSecurity;
+            accessRules: instances.IList<domainmodels.AccessRule>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IDemoUser extends elements.IElement {
+            container: IProjectSecurity;
+            load(): DemoUser;
+            load(callback: (element: DemoUser) => void): any;
+        }
+        class DemoUser extends elements.Element implements IDemoUser {
+            static typeName: string;
+            container: ProjectSecurity;
+            userName: string;
+            password: string;
+            entity: domainmodels.IEntity;
+            entityQualifiedName: string;
+            userRoleIds: instances.IList<IUserRole>;
+            userRoleIdsQualifiedNames: string[];
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IFileDocumentAccessRuleContainer extends IAccessRuleContainerBase {
+            container: IProjectSecurity;
+            load(): FileDocumentAccessRuleContainer;
+            load(callback: (element: FileDocumentAccessRuleContainer) => void): any;
+        }
+        class FileDocumentAccessRuleContainer extends AccessRuleContainerBase implements IFileDocumentAccessRuleContainer {
+            static typeName: string;
+            container: ProjectSecurity;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IImageAccessRuleContainer extends IAccessRuleContainerBase {
+            container: IProjectSecurity;
+            load(): ImageAccessRuleContainer;
+            load(callback: (element: ImageAccessRuleContainer) => void): any;
+        }
+        class ImageAccessRuleContainer extends AccessRuleContainerBase implements IImageAccessRuleContainer {
+            static typeName: string;
+            container: ProjectSecurity;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Module+Role relevant section in reference guide}
+         */
+        interface IModuleRole extends elements.IElement {
+            container: IModuleSecurity;
+            load(): ModuleRole;
+            load(callback: (element: ModuleRole) => void): any;
+            name: string;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Module+Role relevant section in reference guide}
+         */
+        class ModuleRole extends elements.Element implements IModuleRole {
+            static typeName: string;
+            container: ModuleSecurity;
+            name: string;
+            description: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Module+Security relevant section in reference guide}
+         */
+        interface IModuleSecurity extends units.IModelUnit {
+            container: projects.IModule;
+            load(): ModuleSecurity;
+            load(callback: (element: ModuleSecurity) => void): any;
+            moduleRoles: instances.IList<IModuleRole>;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Module+Security relevant section in reference guide}
+         */
+        class ModuleSecurity extends units.ModelUnit implements IModuleSecurity {
+            static typeName: string;
+            container: projects.Module;
+            moduleRoles: instances.IList<ModuleRole>;
+            constructor(container: projects.IModule);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IPasswordPolicySettings extends elements.IElement {
+            container: IProjectSecurity;
+            load(): PasswordPolicySettings;
+            load(callback: (element: PasswordPolicySettings) => void): any;
+        }
+        class PasswordPolicySettings extends elements.Element implements IPasswordPolicySettings {
+            static typeName: string;
+            container: ProjectSecurity;
+            minimumLength: number;
+            requireMixedCase: boolean;
+            requireSymbol: boolean;
+            requireDigit: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         */
+        interface IProjectDocument extends units.IModelUnit {
+            container: projects.IProject;
+            load(): ProjectDocument;
+            load(callback: (element: ProjectDocument) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ProjectDocument extends units.ModelUnit implements IProjectDocument {
+            static typeName: string;
+            container: projects.Project;
+            constructor(container: projects.IProject);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project+Security relevant section in reference guide}
+         */
+        interface IProjectSecurity extends projects.IProjectDocument {
+            container: projects.IProject;
+            load(): ProjectSecurity;
+            load(callback: (element: ProjectSecurity) => void): any;
+            userRoles: instances.IList<IUserRole>;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Project+Security relevant section in reference guide}
+         */
+        class ProjectSecurity extends projects.ProjectDocument implements IProjectSecurity {
+            static typeName: string;
+            container: projects.Project;
+            fileDocumentAccess: FileDocumentAccessRuleContainer;
+            imageAccess: ImageAccessRuleContainer;
+            passwordPolicySettings: PasswordPolicySettings;
+            userRoles: instances.IList<UserRole>;
+            demoUsers: instances.IList<DemoUser>;
+            securityLevel: projects.SecurityLevel;
+            checkSecurity: boolean;
+            adminUserName: string;
+            adminPassword: string;
+            adminUserRoleName: string;
+            enableDemoUsers: boolean;
+            enableGuestAccess: boolean;
+            guestUserRoleName: string;
+            signInMicroflow: microflows.IMicroflow;
+            signInMicroflowQualifiedName: string;
+            constructor(container: projects.IProject);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/User+Role relevant section in reference guide}
+         */
+        interface IUserRole extends elements.IElement {
+            container: IProjectSecurity;
+            load(): UserRole;
+            load(callback: (element: UserRole) => void): any;
+            name: string;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/User+Role relevant section in reference guide}
+         */
+        class UserRole extends elements.Element implements IUserRole {
+            static typeName: string;
+            container: ProjectSecurity;
+            guid: string;
+            name: string;
+            description: string;
+            moduleRoleIds: instances.IList<IModuleRole>;
+            moduleRoleIdsQualifiedNames: string[];
+            manageAllRoles: boolean;
+            manageableRoleIds: instances.IList<IUserRole>;
+            manageableRoleIdsQualifiedNames: string[];
+            manageUsersWithoutRoles: boolean;
+            checkSecurity: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `DomainModels`.
+     */
+    namespace domainmodels {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Domain+Model relevant section in reference guide}
+         */
+        interface IDomainModel extends projects.IModuleDocument {
+            container: projects.IModule;
+            load(): DomainModel;
+            load(callback: (element: DomainModel) => void): any;
+            entities: instances.IList<IEntity>;
+            associations: instances.IList<IAssociation>;
+            crossAssociations: instances.IList<ICrossAssociation>;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Domain+Model relevant section in reference guide}
+         */
+        class DomainModel extends projects.ModuleDocument implements IDomainModel {
+            static typeName: string;
+            container: projects.Module;
+            documentation: string;
+            entities: instances.IList<Entity>;
+            annotations: instances.IList<Annotation>;
+            associations: instances.IList<Association>;
+            crossAssociations: instances.IList<CrossAssociation>;
+            constructor(container: projects.IModule);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Entities relevant section in reference guide}
+         */
+        interface IEntity extends elements.IElement {
+            container: IDomainModel;
+            load(): Entity;
+            load(callback: (element: Entity) => void): any;
+            name: string;
+            generalization: IGeneralizationBase;
+            attributes: instances.IList<IAttribute>;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Entities relevant section in reference guide}
+         */
+        class Entity extends elements.Element implements IEntity {
+            static typeName: string;
+            container: DomainModel;
+            name: string;
+            dataStorageGuid: string;
+            location: common.IPoint;
+            documentation: string;
+            generalization: GeneralizationBase;
+            attributes: instances.IList<Attribute>;
+            validationRules: instances.IList<ValidationRule>;
+            eventHandlers: instances.IList<EventHandler>;
+            indexes: instances.IList<Index>;
+            accessRules: instances.IList<AccessRule>;
+            image: images.IImage;
+            imageQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IGeneralizationBase extends elements.IElement {
+            container: IEntity;
+            load(): GeneralizationBase;
+            load(callback: (element: GeneralizationBase) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class GeneralizationBase extends elements.Element implements IGeneralizationBase {
+            static typeName: string;
+            container: Entity;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IGeneralization extends IGeneralizationBase {
+            container: IEntity;
+            load(): Generalization;
+            load(callback: (element: Generalization) => void): any;
+            generalization: IEntity;
+            generalizationQualifiedName: string;
+        }
+        class Generalization extends GeneralizationBase implements IGeneralization {
+            static typeName: string;
+            container: Entity;
+            generalization: IEntity;
+            generalizationQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface INoGeneralization extends IGeneralizationBase {
+            container: IEntity;
+            load(): NoGeneralization;
+            load(callback: (element: NoGeneralization) => void): any;
+            persistable: boolean;
+        }
+        class NoGeneralization extends GeneralizationBase implements INoGeneralization {
+            static typeName: string;
+            container: Entity;
+            hasChangedDate: boolean;
+            hasCreatedDate: boolean;
+            hasOwner: boolean;
+            hasChangedBy: boolean;
+            persistable: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Attributes relevant section in reference guide}
+         */
+        interface IAttribute extends elements.IElement {
+            container: IEntity;
+            load(): Attribute;
+            load(callback: (element: Attribute) => void): any;
+            name: string;
+            type: IAttributeType;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Attributes relevant section in reference guide}
+         */
+        class Attribute extends elements.Element implements IAttribute {
+            static typeName: string;
+            container: Entity;
+            name: string;
+            dataStorageGuid: string;
+            type: AttributeType;
+            documentation: string;
+            value: ValueType;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IValueType extends elements.IElement {
+            container: IAttribute;
+            load(): ValueType;
+            load(callback: (element: ValueType) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ValueType extends elements.Element implements IValueType {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IStoredValue extends IValueType {
+            container: IAttribute;
+            load(): StoredValue;
+            load(callback: (element: StoredValue) => void): any;
+        }
+        class StoredValue extends ValueType implements IStoredValue {
+            static typeName: string;
+            container: Attribute;
+            defaultValue: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ICalculatedValue extends IValueType {
+            container: IAttribute;
+            load(): CalculatedValue;
+            load(callback: (element: CalculatedValue) => void): any;
+        }
+        class CalculatedValue extends ValueType implements ICalculatedValue {
+            static typeName: string;
+            container: Attribute;
+            microflow: microflows.IMicroflow;
+            microflowQualifiedName: string;
+            passEntity: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IAttributeType extends elements.IElement {
+            container: IAttribute;
+            load(): AttributeType;
+            load(callback: (element: AttributeType) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class AttributeType extends elements.Element implements IAttributeType {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IBinaryAttributeType extends IAttributeType {
+            container: IAttribute;
+            load(): BinaryAttributeType;
+            load(callback: (element: BinaryAttributeType) => void): any;
+        }
+        class BinaryAttributeType extends AttributeType implements IBinaryAttributeType {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IBooleanAttributeType extends IAttributeType {
+            container: IAttribute;
+            load(): BooleanAttributeType;
+            load(callback: (element: BooleanAttributeType) => void): any;
+        }
+        class BooleanAttributeType extends AttributeType implements IBooleanAttributeType {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDateTimeAttributeType extends IAttributeType {
+            container: IAttribute;
+            load(): DateTimeAttributeType;
+            load(callback: (element: DateTimeAttributeType) => void): any;
+        }
+        class DateTimeAttributeType extends AttributeType implements IDateTimeAttributeType {
+            static typeName: string;
+            container: Attribute;
+            localizeDate: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IEnumerationAttributeType extends IAttributeType {
+            container: IAttribute;
+            load(): EnumerationAttributeType;
+            load(callback: (element: EnumerationAttributeType) => void): any;
+            enumeration: enumerations.IEnumeration;
+            enumerationQualifiedName: string;
+        }
+        class EnumerationAttributeType extends AttributeType implements IEnumerationAttributeType {
+            static typeName: string;
+            container: Attribute;
+            enumeration: enumerations.IEnumeration;
+            enumerationQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IHashedStringAttributeType extends IAttributeType {
+            container: IAttribute;
+            load(): HashedStringAttributeType;
+            load(callback: (element: HashedStringAttributeType) => void): any;
+        }
+        class HashedStringAttributeType extends AttributeType implements IHashedStringAttributeType {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IStringAttributeType extends IAttributeType {
+            container: IAttribute;
+            load(): StringAttributeType;
+            load(callback: (element: StringAttributeType) => void): any;
+        }
+        class StringAttributeType extends AttributeType implements IStringAttributeType {
+            static typeName: string;
+            container: Attribute;
+            length: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface INumericAttributeTypeBase extends IAttributeType {
+            container: IAttribute;
+            load(): NumericAttributeTypeBase;
+            load(callback: (element: NumericAttributeTypeBase) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class NumericAttributeTypeBase extends AttributeType implements INumericAttributeTypeBase {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDecimalAttributeTypeBase extends INumericAttributeTypeBase {
+            container: IAttribute;
+            load(): DecimalAttributeTypeBase;
+            load(callback: (element: DecimalAttributeTypeBase) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class DecimalAttributeTypeBase extends NumericAttributeTypeBase implements IDecimalAttributeTypeBase {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDecimalAttributeType extends IDecimalAttributeTypeBase {
+            container: IAttribute;
+            load(): DecimalAttributeType;
+            load(callback: (element: DecimalAttributeType) => void): any;
+        }
+        class DecimalAttributeType extends DecimalAttributeTypeBase implements IDecimalAttributeType {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IFloatAttributeTypeBase extends IDecimalAttributeTypeBase {
+            container: IAttribute;
+            load(): FloatAttributeTypeBase;
+            load(callback: (element: FloatAttributeTypeBase) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class FloatAttributeTypeBase extends DecimalAttributeTypeBase implements IFloatAttributeTypeBase {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IFloatAttributeType extends IFloatAttributeTypeBase {
+            container: IAttribute;
+            load(): FloatAttributeType;
+            load(callback: (element: FloatAttributeType) => void): any;
+        }
+        class FloatAttributeType extends FloatAttributeTypeBase implements IFloatAttributeType {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface ICurrencyAttributeType extends IFloatAttributeTypeBase {
+            container: IAttribute;
+            load(): CurrencyAttributeType;
+            load(callback: (element: CurrencyAttributeType) => void): any;
+        }
+        class CurrencyAttributeType extends FloatAttributeTypeBase implements ICurrencyAttributeType {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IIntegerAttributeTypeBase extends INumericAttributeTypeBase {
+            container: IAttribute;
+            load(): IntegerAttributeTypeBase;
+            load(callback: (element: IntegerAttributeTypeBase) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class IntegerAttributeTypeBase extends NumericAttributeTypeBase implements IIntegerAttributeTypeBase {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IIntegerAttributeType extends IIntegerAttributeTypeBase {
+            container: IAttribute;
+            load(): IntegerAttributeType;
+            load(callback: (element: IntegerAttributeType) => void): any;
+        }
+        class IntegerAttributeType extends IntegerAttributeTypeBase implements IIntegerAttributeType {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface ILongAttributeType extends IIntegerAttributeTypeBase {
+            container: IAttribute;
+            load(): LongAttributeType;
+            load(callback: (element: LongAttributeType) => void): any;
+        }
+        class LongAttributeType extends IntegerAttributeTypeBase implements ILongAttributeType {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IAutoNumberAttributeType extends IIntegerAttributeTypeBase {
+            container: IAttribute;
+            load(): AutoNumberAttributeType;
+            load(callback: (element: AutoNumberAttributeType) => void): any;
+        }
+        class AutoNumberAttributeType extends IntegerAttributeTypeBase implements IAutoNumberAttributeType {
+            static typeName: string;
+            container: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Associations TODO: This is whre it belongs, but the word AssociationBase is never used}
+         */
+        interface IAssociationBase extends elements.IElement {
+            container: IDomainModel;
+            load(): AssociationBase;
+            load(callback: (element: AssociationBase) => void): any;
+            name: string;
+            type: AssociationType;
+            owner: AssociationOwner;
+            parent: IEntity;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Associations TODO: This is whre it belongs, but the word AssociationBase is never used}
+         *
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class AssociationBase extends elements.Element implements IAssociationBase {
+            static typeName: string;
+            container: DomainModel;
+            name: string;
+            dataStorageGuid: string;
+            type: AssociationType;
+            owner: AssociationOwner;
+            deleteBehavior: AssociationDeleteBehavior;
+            parent: Entity;
+            documentation: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Associations relevant section in reference guide}
+         */
+        interface IAssociation extends IAssociationBase {
+            container: IDomainModel;
+            load(): Association;
+            load(callback: (element: Association) => void): any;
+            child: IEntity;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Associations relevant section in reference guide}
+         */
+        class Association extends AssociationBase implements IAssociation {
+            static typeName: string;
+            container: DomainModel;
+            child: Entity;
+            parentConnection: common.IPoint;
+            childConnection: common.IPoint;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ICrossAssociation extends IAssociationBase {
+            container: IDomainModel;
+            load(): CrossAssociation;
+            load(callback: (element: CrossAssociation) => void): any;
+            child: IEntity;
+            childQualifiedName: string;
+        }
+        class CrossAssociation extends AssociationBase implements ICrossAssociation {
+            static typeName: string;
+            container: DomainModel;
+            child: IEntity;
+            childQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IAssociationDeleteBehavior extends elements.IElement {
+            container: IAssociationBase;
+            load(): AssociationDeleteBehavior;
+            load(callback: (element: AssociationDeleteBehavior) => void): any;
+        }
+        class AssociationDeleteBehavior extends elements.Element implements IAssociationDeleteBehavior {
+            static typeName: string;
+            container: AssociationBase;
+            parentDeleteBehavior: DeletingBehavior;
+            childDeleteBehavior: DeletingBehavior;
+            parentErrorMessage: texts.Text;
+            childErrorMessage: texts.Text;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Annotations relevant section in reference guide}
+         */
+        interface IAnnotation extends elements.IElement {
+            container: IDomainModel;
+            load(): Annotation;
+            load(callback: (element: Annotation) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Annotations relevant section in reference guide}
+         */
+        class Annotation extends elements.Element implements IAnnotation {
+            static typeName: string;
+            container: DomainModel;
+            caption: string;
+            location: common.IPoint;
+            width: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Access+Rules relevant section in reference guide}
+         */
+        interface IAccessRule extends elements.IElement {
+            load(): AccessRule;
+            load(callback: (element: AccessRule) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Access+Rules relevant section in reference guide}
+         */
+        class AccessRule extends elements.Element implements IAccessRule {
+            static typeName: string;
+            memberAccesses: instances.IList<MemberAccess>;
+            moduleRoles: instances.IList<security.IModuleRole>;
+            moduleRolesQualifiedNames: string[];
+            documentation: string;
+            allowCreate: boolean;
+            allowDelete: boolean;
+            defaultMemberAccessRights: MemberAccessRights;
+            /**
+             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
+             */
+            xPathConstraint: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMemberAccess extends elements.IElement {
+            container: IAccessRule;
+            load(): MemberAccess;
+            load(callback: (element: MemberAccess) => void): any;
+        }
+        class MemberAccess extends elements.Element implements IMemberAccess {
+            static typeName: string;
+            container: AccessRule;
+            attribute: IAttribute;
+            attributeQualifiedName: string;
+            association: IAssociationBase;
+            associationQualifiedName: string;
+            accessRights: MemberAccessRights;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Event+Handlers relevant section in reference guide}
+         */
+        interface IEventHandler extends elements.IElement {
+            container: IEntity;
+            load(): EventHandler;
+            load(callback: (element: EventHandler) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Event+Handlers relevant section in reference guide}
+         */
+        class EventHandler extends elements.Element implements IEventHandler {
+            static typeName: string;
+            container: Entity;
+            moment: ActionMoment;
+            event: EventType;
+            microflow: microflows.IMicroflow;
+            microflowQualifiedName: string;
+            raiseErrorOnFalse: boolean;
+            passEventObject: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Indexes relevant section in reference guide}
+         */
+        interface IIndex extends elements.IElement {
+            container: IEntity;
+            load(): Index;
+            load(callback: (element: Index) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Indexes relevant section in reference guide}
+         */
+        class Index extends elements.Element implements IIndex {
+            static typeName: string;
+            container: Entity;
+            dataStorageGuid: string;
+            attributes: instances.IList<IndexedAttribute>;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IIndexedAttribute extends elements.IElement {
+            container: IIndex;
+            load(): IndexedAttribute;
+            load(callback: (element: IndexedAttribute) => void): any;
+        }
+        class IndexedAttribute extends elements.Element implements IIndexedAttribute {
+            static typeName: string;
+            container: Index;
+            type: IndexedAttributeType;
+            attribute: Attribute;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Validation+Rules relevant section in reference guide}
+         */
+        interface IValidationRule extends elements.IElement {
+            container: IEntity;
+            load(): ValidationRule;
+            load(callback: (element: ValidationRule) => void): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Validation+Rules relevant section in reference guide}
+         */
+        class ValidationRule extends elements.Element implements IValidationRule {
+            static typeName: string;
+            container: Entity;
+            attribute: IAttribute;
+            attributeQualifiedName: string;
+            errorMessage: texts.Text;
+            ruleInfo: RuleInfo;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IRuleInfo extends elements.IElement {
+            container: IValidationRule;
+            load(): RuleInfo;
+            load(callback: (element: RuleInfo) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class RuleInfo extends elements.Element implements IRuleInfo {
+            static typeName: string;
+            container: ValidationRule;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IEqualsToRuleInfo extends IRuleInfo {
+            container: IValidationRule;
+            load(): EqualsToRuleInfo;
+            load(callback: (element: EqualsToRuleInfo) => void): any;
+        }
+        class EqualsToRuleInfo extends RuleInfo implements IEqualsToRuleInfo {
+            static typeName: string;
+            container: ValidationRule;
+            useValue: boolean;
+            equalsToValue: string;
+            equalsToAttribute: IAttribute;
+            equalsToAttributeQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IMaxLengthRuleInfo extends IRuleInfo {
+            container: IValidationRule;
+            load(): MaxLengthRuleInfo;
+            load(callback: (element: MaxLengthRuleInfo) => void): any;
+        }
+        class MaxLengthRuleInfo extends RuleInfo implements IMaxLengthRuleInfo {
+            static typeName: string;
+            container: ValidationRule;
+            maxLength: number;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IRangeRuleInfo extends IRuleInfo {
+            container: IValidationRule;
+            load(): RangeRuleInfo;
+            load(callback: (element: RangeRuleInfo) => void): any;
+        }
+        class RangeRuleInfo extends RuleInfo implements IRangeRuleInfo {
+            static typeName: string;
+            container: ValidationRule;
+            typeOfRange: RangeType;
+            useMinValue: boolean;
+            useMaxValue: boolean;
+            minValue: string;
+            maxValue: string;
+            minAttribute: IAttribute;
+            minAttributeQualifiedName: string;
+            maxAttribute: IAttribute;
+            maxAttributeQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IRegExRuleInfo extends IRuleInfo {
+            container: IValidationRule;
+            load(): RegExRuleInfo;
+            load(callback: (element: RegExRuleInfo) => void): any;
+        }
+        class RegExRuleInfo extends RuleInfo implements IRegExRuleInfo {
+            static typeName: string;
+            container: ValidationRule;
+            regularExpression: regularexpressions.IRegularExpression;
+            regularExpressionQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface IRequiredRuleInfo extends IRuleInfo {
+            container: IValidationRule;
+            load(): RequiredRuleInfo;
+            load(callback: (element: RequiredRuleInfo) => void): any;
+        }
+        class RequiredRuleInfo extends RuleInfo implements IRequiredRuleInfo {
+            static typeName: string;
+            container: ValidationRule;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IUniqueRuleInfo extends IRuleInfo {
+            container: IValidationRule;
+            load(): UniqueRuleInfo;
+            load(callback: (element: UniqueRuleInfo) => void): any;
+        }
+        class UniqueRuleInfo extends RuleInfo implements IUniqueRuleInfo {
+            static typeName: string;
+            container: ValidationRule;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        class AssociationType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Reference: AssociationType;
+            static ReferenceSet: AssociationType;
+        }
+        class AssociationOwner extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Default: AssociationOwner;
+            static Both: AssociationOwner;
+        }
+        class DeletingBehavior extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static DeleteMeAndReferences: DeletingBehavior;
+            static DeleteMeButKeepReferences: DeletingBehavior;
+            static DeleteMeIfNoReferences: DeletingBehavior;
+        }
+        class MemberAccessRights extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static None: MemberAccessRights;
+            static ReadOnly: MemberAccessRights;
+            static ReadWrite: MemberAccessRights;
+        }
+        class ActionMoment extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Before: ActionMoment;
+            static After: ActionMoment;
+        }
+        class EventType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Create: EventType;
+            static Commit: EventType;
+            static Delete: EventType;
+            static RollBack: EventType;
+        }
+        class IndexedAttributeType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static Normal: IndexedAttributeType;
+            static CreatedDate: IndexedAttributeType;
+            static ChangedDate: IndexedAttributeType;
+        }
+        class RangeType extends instances.IEnum {
+            protected qualifiedTsTypeName: string;
+            static GreaterThanOrEqualTo: RangeType;
+            static SmallerThanOrEqualTo: RangeType;
+            static Between: RangeType;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import elements = internal.elements;
+    import instances = internal.instances;
+    import model = internal.model;
+    import transport = internal.transport;
+    import units = internal.units;
+    /**
+     * Interfaces and instance classes for types from the Mendix sub meta model `Enumerations`.
+     */
+    namespace enumerations {
+        interface IModuleDocument extends units.IModelUnit {
+            container: projects.IFolderBase;
+            load(): ModuleDocument;
+            load(callback: (element: ModuleDocument) => void): any;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): Object;
+        }
+        interface IDocument extends projects.IModuleDocument {
+            container: projects.IFolderBase;
+            load(): Document;
+            load(callback: (element: Document) => void): any;
+            name: string;
+        }
+        /**
+         * Warning: this class represents a non-instantiable concept in the meta model,
+         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
+         * but instantiate one of its (effectively concrete) sub classes.
+         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
+         */
+        class Document extends projects.ModuleDocument implements IDocument {
+            static typeName: string;
+            container: projects.FolderBase;
+            name: string;
+            documentation: string;
+            excluded: boolean;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Enumerations relevant section in reference guide}
+         */
+        interface IEnumeration extends projects.IDocument {
+            container: projects.IFolderBase;
+            load(): Enumeration;
+            load(callback: (element: Enumeration) => void): any;
+            values: instances.IList<IEnumerationValue>;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Enumerations relevant section in reference guide}
+         */
+        class Enumeration extends projects.Document implements IEnumeration {
+            static typeName: string;
+            container: projects.FolderBase;
+            values: instances.IList<EnumerationValue>;
+            constructor(container: projects.IFolderBase);
+            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Enumerations relevant section in reference guide}
+         */
+        interface IEnumerationValue extends elements.IElement {
+            container: IEnumeration;
+            load(): EnumerationValue;
+            load(callback: (element: EnumerationValue) => void): any;
+            name: string;
+        }
+        /**
+         * See: {@link https://world.mendix.com/display/refguide5/Enumerations relevant section in reference guide}
+         */
+        class EnumerationValue extends elements.Element implements IEnumerationValue {
+            static typeName: string;
+            container: Enumeration;
+            name: string;
+            caption: texts.Text;
+            image: images.IImage;
+            imageQualifiedName: string;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+        interface ICondition extends elements.IElement {
+            load(): Condition;
+            load(callback: (element: Condition) => void): any;
+        }
+        class Condition extends elements.Element implements ICondition {
+            static typeName: string;
+            attributeValue: string;
+            editableVisible: boolean;
+            constructor();
+            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
+            toPlainJson(): any;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    namespace sdk {
+        namespace internal {
+            namespace model {
+                interface IBaseModel {
+                    allMicroflows(): microflows.IMicroflow[];
+                    allMicroflowBases(): microflows.IMicroflowBase[];
+                    allRules(): microflows.IRule[];
+                    allImportedWebServices(): webservices.IImportedWebService[];
+                    allPublishedAppServices(): webservices.IPublishedAppService[];
+                    allPublishedServiceBases(): webservices.IPublishedServiceBase[];
+                    allPublishedWebServices(): webservices.IPublishedWebService[];
+                    allMxXmlSchemas(): xmlschemas.IMxXmlSchema[];
+                    allConsumedAppServices(): appservices.IConsumedAppService[];
+                    allMappingDocuments(): mappings.IMappingDocument[];
+                    allExportMappings(): exportmappings.IExportMapping[];
+                    allImportMappings(): importmappings.IImportMapping[];
+                    allPublishedOdataServices(): rest.IPublishedOdataService[];
+                    allPublishedRestServices(): rest.IPublishedRestService[];
+                    allPublishedRestServiceBases(): rest.IPublishedRestServiceBase[];
+                    allFormBases(): pages.IFormBase[];
+                    allPages(): pages.IPage[];
+                    allLayouts(): pages.ILayout[];
+                    allSnippets(): pages.ISnippet[];
+                    allDocumentTemplates(): documenttemplates.IDocumentTemplate[];
+                    allNavigationDocuments(): navigation.INavigationDocument[];
+                    allMenuDocuments(): menus.IMenuDocument[];
+                    allDataSets(): datasets.IDataSet[];
+                    allSystemTextCollections(): texts.ISystemTextCollection[];
+                    allJavaActions(): javaactions.IJavaAction[];
+                    allProjects(): projects.IProject[];
+                    allProjectDocuments(): projects.IProjectDocument[];
+                    allFolderBases(): projects.IFolderBase[];
+                    allFolders(): projects.IFolder[];
+                    allModules(): projects.IModule[];
+                    allModuleDocuments(): projects.IModuleDocument[];
+                    allDocuments(): projects.IDocument[];
+                    allProjectConversions(): projects.IProjectConversion[];
+                    allConstants(): constants.IConstant[];
+                    allProjectSettings(): settings.IProjectSettings[];
+                    allScheduledEvents(): scheduledevents.IScheduledEvent[];
+                    allRegularExpressions(): regularexpressions.IRegularExpression[];
+                    allImageCollections(): images.IImageCollection[];
+                    allModuleSecurities(): security.IModuleSecurity[];
+                    allProjectSecurities(): security.IProjectSecurity[];
+                    allDomainModels(): domainmodels.IDomainModel[];
+                    allEnumerations(): enumerations.IEnumeration[];
+                }
+                /**
+                 * Class to find generated model units.
+                 */
+                class BaseModel {
+                    allMicroflows(): microflows.IMicroflow[];
+                    allMicroflowBases(): microflows.IMicroflowBase[];
+                    allRules(): microflows.IRule[];
+                    allImportedWebServices(): webservices.IImportedWebService[];
+                    allPublishedAppServices(): webservices.IPublishedAppService[];
+                    allPublishedServiceBases(): webservices.IPublishedServiceBase[];
+                    allPublishedWebServices(): webservices.IPublishedWebService[];
+                    allMxXmlSchemas(): xmlschemas.IMxXmlSchema[];
+                    allConsumedAppServices(): appservices.IConsumedAppService[];
+                    allMappingDocuments(): mappings.IMappingDocument[];
+                    allExportMappings(): exportmappings.IExportMapping[];
+                    allImportMappings(): importmappings.IImportMapping[];
+                    allPublishedOdataServices(): rest.IPublishedOdataService[];
+                    allPublishedRestServices(): rest.IPublishedRestService[];
+                    allPublishedRestServiceBases(): rest.IPublishedRestServiceBase[];
+                    allFormBases(): pages.IFormBase[];
+                    allPages(): pages.IPage[];
+                    allLayouts(): pages.ILayout[];
+                    allSnippets(): pages.ISnippet[];
+                    allDocumentTemplates(): documenttemplates.IDocumentTemplate[];
+                    allNavigationDocuments(): navigation.INavigationDocument[];
+                    allMenuDocuments(): menus.IMenuDocument[];
+                    allDataSets(): datasets.IDataSet[];
+                    allSystemTextCollections(): texts.ISystemTextCollection[];
+                    allJavaActions(): javaactions.IJavaAction[];
+                    allProjects(): projects.IProject[];
+                    allProjectDocuments(): projects.IProjectDocument[];
+                    allFolderBases(): projects.IFolderBase[];
+                    allFolders(): projects.IFolder[];
+                    allModules(): projects.IModule[];
+                    allModuleDocuments(): projects.IModuleDocument[];
+                    allDocuments(): projects.IDocument[];
+                    allProjectConversions(): projects.IProjectConversion[];
+                    allConstants(): constants.IConstant[];
+                    allProjectSettings(): settings.IProjectSettings[];
+                    allScheduledEvents(): scheduledevents.IScheduledEvent[];
+                    allRegularExpressions(): regularexpressions.IRegularExpression[];
+                    allImageCollections(): images.IImageCollection[];
+                    allModuleSecurities(): security.IModuleSecurity[];
+                    allProjectSecurities(): security.IProjectSecurity[];
+                    allDomainModels(): domainmodels.IDomainModel[];
+                    allEnumerations(): enumerations.IEnumeration[];
+                }
+                interface IByNameReferenceResolver {
+                    findLayoutByQualifiedName(qname: string): pages.ILayout;
+                    findAppServiceActionParameterByQualifiedName(qname: string): appservices.IAppServiceActionParameter;
+                    findImportMappingByQualifiedName(qname: string): importmappings.IImportMapping;
+                    findJavaActionByQualifiedName(qname: string): javaactions.IJavaAction;
+                    findMicroflowByQualifiedName(qname: string): microflows.IMicroflow;
+                    findSnippetByQualifiedName(qname: string): pages.ISnippet;
+                    findMenuDocumentByQualifiedName(qname: string): menus.IMenuDocument;
+                    findRuleParameterByQualifiedName(qname: string): microflows.IRuleParameter;
+                    findLayoutParameterByQualifiedName(qname: string): pages.ILayoutParameter;
+                    findMicroflowParameterByQualifiedName(qname: string): microflows.IMicroflowParameter;
+                    findPageByQualifiedName(qname: string): pages.IPage;
+                    findMxXmlSchemaByQualifiedName(qname: string): xmlschemas.IMxXmlSchema;
+                    findAssociationBaseByQualifiedName(qname: string): domainmodels.IAssociationBase;
+                    findAppServiceActionByQualifiedName(qname: string): appservices.IAppServiceAction;
+                    findExportMappingByQualifiedName(qname: string): exportmappings.IExportMapping;
+                    findUserRoleByQualifiedName(qname: string): security.IUserRole;
+                    findRegularExpressionByQualifiedName(qname: string): regularexpressions.IRegularExpression;
+                    findAttributeByQualifiedName(qname: string): domainmodels.IAttribute;
+                    findEntityByQualifiedName(qname: string): domainmodels.IEntity;
+                    findModuleRoleByQualifiedName(qname: string): security.IModuleRole;
+                    findImportedWebServiceByQualifiedName(qname: string): webservices.IImportedWebService;
+                    findDocumentTemplateByQualifiedName(qname: string): documenttemplates.IDocumentTemplate;
+                    findRuleByQualifiedName(qname: string): microflows.IRule;
+                    findDataSetByQualifiedName(qname: string): datasets.IDataSet;
+                    findConstantByQualifiedName(qname: string): constants.IConstant;
+                    findImageByQualifiedName(qname: string): images.IImage;
+                    findJavaActionParameterByQualifiedName(qname: string): javaactions.IJavaActionParameter;
+                    findEnumerationByQualifiedName(qname: string): enumerations.IEnumeration;
+                }
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    namespace sdk {
+        namespace internal {
+            /**
+             * The `deltas` module does not contain the interfaces for all deltas,
+             * but it does contain (all) objects required for building and handling these.
+             */
+            namespace deltas {
+                const DeltaTypes: {
+                    CREATE_ELEMENT: string;
+                    UPDATE_PROPERTY_VALUE: string;
+                    MOVE_ELEMENT: string;
+                    DELETE_ELEMENT: string;
+                    CREATE_UNIT: string;
+                };
+                const MutatorTypes: {
+                    CHANGE: string;
+                    ADD: string;
+                    REMOVE: string;
+                    MOVE: string;
+                };
+                /**
+                * A POTSO that wraps a delta and success/failure callbacks.
+                */
+                class DeltaRequest {
+                    delta: transport.IDelta;
+                    onSuccess: common.IVoidCallback;
+                    onFailure: common.IErrorCallback;
+                    constructor(delta: transport.IDelta, onSuccess?: common.IVoidCallback, onFailure?: common.IErrorCallback);
+                }
+                /**
+                 * A simple queue implementation for deltas.
+                 */
+                class DeltaQueue {
+                    private model;
+                    private logToConsole;
+                    private delay;
+                    private maxDeltasPerBatch;
+                    private queue;
+                    private pending;
+                    isClosing: boolean;
+                    private closeCallback;
+                    constructor(model: model.Model, logToConsole?: boolean);
+                    /**
+                     * Closes the "connection" with the Model API Server in the sense that
+                     * pending delta requests are processed, and that afterwards the given
+                     * `callback` will be called.
+                     * This function can only be called once.
+                     */
+                    closeConnection(callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
+                    /**
+                     * Pushes the given `delta` on the queue for scheduling/processing.
+                     */
+                    push(delta: DeltaRequest): void;
+                    /**
+                     * Schedules the next delta for processing using JS's event queue/loop.
+                     */
+                    private schedule();
+                    private processNext();
+                }
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    namespace sdk {
+        /**
+         * Internal API of the mendixmodelsdk.
+         *
+         * DISCLAIMER: End-users of the sdk should never instantiate classes in this module, or in submodules of this module.
+         * Anything in this module, or its submodules, can be removed, or have changed signature, between sdk-versions.
+         */
+        namespace internal {
+            /**
+             * The `modelapiclient` module provides typed communication with the Model API Server.
+             */
+            namespace modelapiclient {
+                /**
+                 * The IModelApiClient interface is used for forwarding calls to the underlying Mendix Model API.
+                 * Implementations of this interface serve as fully-typed clients for the Model API Server.
+                 * Default implementation: {@link ModelApiClientImpl}.
+                 * Note that all its methods are asynchronous, with the last two arguments always being a (success) callback and an error callback,
+                 * and we will only explain the "essential" arguments in their documentation.
+                 */
+                interface IModelApiClient {
+                    createWorkingCopy(workingCopyInfo: configuration.ICreateWorkingCopyParameters, callback: common.ICallback<transport.IWorkingCopy>, errorCallback: common.IErrorCallback): any;
+                    /**
+                     * Loads all unit interfaces of the working copy indicated with `workingCopyId` as an array of normalised model JSON.
+                     */
+                    loadUnitInterfaces(workingCopyId: string, callback: common.ICallback<transport.IAbstractUnitJson[]>, errorCallback: common.IErrorCallback): any;
+                    /**
+                     * Retrieves the top-level working copy information/meta data for the working copy with given `workingCopyId`.
+                     */
+                    loadWorkingCopyMetaData(workingCopyId: string, callback: common.ICallback<transport.IWorkingCopy>, errorCallback: common.IErrorCallback): any;
+                    deleteWorkingCopy(workingCopyId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): any;
+                    grantAccess(workingCopyId: string, memberOpenId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): any;
+                    revokeAccess(workingCopyId: string, memberOpenId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): any;
+                    checkAccess(workingCopyId: string, memberOpenId: string, callback: common.ICallback<boolean>, errorCallback: common.IErrorCallback): any;
+                    exportMpk(workingCopyId: string, outFilePath: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): any;
+                    /**
+                     * Retrieves a unit, as normalised model JSON, by working copy and unit ID.
+                     */
+                    fetchUnitById<T extends units.AbstractUnit>(workingCopyId: string, unitId: string, callback: common.ICallback<transport.IAbstractUnitJson>, errorCallback: common.IErrorCallback): any;
+                    /**
+                     * Sends a sequence of deltas on the working copy with the given `workingCopyId` to the Model API Server;
+                     * batched if more than one is passed, as a single delta otherwise.
+                     */
+                    sendDeltas(workingCopyId: string, deltas: transport.IDelta[], callback: common.ICallback<Object>, errorCallback: common.IErrorCallback): any;
+                }
+                class ModelApiClientImpl implements IModelApiClient {
+                    private transportation;
+                    constructor(transportation: transportation.ITransportation);
+                    createWorkingCopy(workingCopyInfo: configuration.ICreateWorkingCopyParameters, callback: common.ICallback<transport.IWorkingCopy>, errorCallback: common.IErrorCallback): void;
+                    loadWorkingCopyMetaData(workingCopyId: string, callback: common.ICallback<transport.IWorkingCopy>, errorCallback: common.IErrorCallback): void;
+                    loadUnitInterfaces(workingCopyId: string, callback: common.ICallback<transport.IAbstractUnitJson[]>, errorCallback: common.IErrorCallback): void;
+                    deleteWorkingCopy(workingCopyId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
+                    grantAccess(workingCopyId: string, memberOpenId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
+                    revokeAccess(workingCopyId: string, memberOpenId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
+                    checkAccess(workingCopyId: string, memberOpenId: string, callback: common.ICallback<boolean>, errorCallback: common.IErrorCallback): void;
+                    exportMpk(workingCopyId: string, outFilePath: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
+                    fetchUnitById<T extends units.AbstractUnit>(workingCopyId: string, unitId: string, callback: common.ICallback<transport.IAbstractUnitJson>, errorCallback: common.IErrorCallback): void;
+                    sendDeltas(workingCopyId: string, deltas: transport.IDelta[], callback: common.ICallback<Object>, errorCallback: common.IErrorCallback): void;
+                }
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    namespace sdk {
+        /**
+         * The `configuration` module allows the Model SDK user to configure
+         * how to communicate with the Model API Server;
+         * in particular w.r.t.: authentication, success/error handling, etc.
+         */
+        namespace configuration {
+            /**
+             * The credentials with which a trusted backend client (such as sprintr) connects to the Model API Server.
+             */
+            interface IBackendCredentials {
+                username: string;
+                password: string;
+                /** The OpenID on behalf which the trusted backend service operates. */
+                openid?: string;
+            }
+            interface ISdkCredentials {
+                username: string;
+                apikey: string;
+            }
+            /**
+             * All the details of the connection that's been set up to the Model API Server.
+             */
+            interface ISdkConfig {
+                credentials?: IBackendCredentials | ISdkCredentials;
+                endPoint?: string;
+                transportation?: internal.transportation.ITransportation;
+                client?: sdk.internal.modelapiclient.IModelApiClient;
+            }
+            interface ICreateWorkingCopyParameters {
+                name: string;
+                description?: string;
+                avatarUrl?: string;
+                /**
+                 * Path to the (template) MPK file.
+                 */
+                template: string;
+            }
+            function assertBackendAccess(config: ISdkConfig): void;
+            function checkWorkingCopyId(workingCopyId: string): void;
+            function checkCallbacks(callback: Function, errorCallback: Function): void;
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import internal = sdk.internal;
+    import model = internal.model;
+    /**
+     * This interface exposes a single Mendix Model.
+     * This interface contains the parts of the {@link Model} that are exposed through the SDK.
+     */
+    interface IModel extends model.IBaseModel, model.IByNameReferenceResolver {
+        /**
+         * Working copy id of the current opened model (read only)
+         */
+        id: string;
+        /**
+         * The actual contents of the model.
+         */
+        root: projects.IProject;
+        /**
+         * The meta data of the model.
+         */
+        metadata: internal.transport.IWorkingCopy;
+        /**
+         * Ends the connection with the Model API client.
+         * Flushes any pending deltas and invokes the callback once complete.
+         * (Errors will be handled through the default modelstore error handler.)
+         */
+        closeConnection(callback: common.IVoidCallback, errorCallback?: common.IErrorCallback): any;
+        /**
+         * Deletes this model from the server, and the (SDK) client.
+         * If you are altering the model before deleting it, make sure to call this method in the callback of {@link closeConnection}.
+         *
+         */
+        deleteWorkingCopy(callback: common.IVoidCallback, errorCallback?: common.IErrorCallback): any;
+        /**
+         * Exports this model as MPK.
+         * If you are altering the model before running an export make sure to call this method in the callback of {@link closeConnection}.
+         */
+        exportMpk(outFilePath: string, callback: common.IVoidCallback, errorCallback?: common.IErrorCallback): any;
+        /**
+         * Given a moduleName, returns a module name
+         * (For modules, their qualified name equals their name)
+         */
+        findModuleByQualifiedName(qname: string): any;
+        /**
+         * Given an id, fetches a complete unit. The result might be returned from the cache.
+         * Use this method if you have just a unit Id, otherwise, unit.fetch() is a simpler alternative.
+         */
+        fetchUnitById<T extends sdk.internal.units.IAbstractUnit>(id: string, callback: common.ICallback<T>, errorCallback?: common.IErrorCallback): any;
+    }
+    namespace sdk {
+        namespace internal {
+            namespace model {
+                interface IUnitsCache {
+                    [id: string]: units.IAbstractUnit;
+                }
+                /**
+                 * Implementation of {@link IModel}.
+                 */
+                class Model extends BaseModel implements IModel {
+                    metadata: transport.IWorkingCopy;
+                    /**
+                     * Map unitId -> unit, containing all units of this model, which could be partial(ly loaded).
+                     */
+                    /**
+                     * Map unitType -> units[], containing all units of this model, per type, but not sorted in any particular order.
+                     * Please extend the type whenever applicable, for convenience of the programmer.
+                     */
+                    constructor(_client: modelapiclient.IModelApiClient, _errorHandler: common.IErrorCallback, _connectionConfig: configuration.ISdkConfig);
+                    closeConnection(callback: common.IVoidCallback, errorCallback?: common.IErrorCallback): void;
+                    /**
+                     * Instantiates a new Model that can communicate with the server for sending and receiving documents.
+                     * Loading a Model will automatically fetches all unit interfaces for this working copy and invokes the (success) callback,
+                     * or calls the errorHandler if this fails.
+                     */
+                    static create(client: modelapiclient.IModelApiClient, workingCopyInfo: configuration.ICreateWorkingCopyParameters, callback: common.ICallback<transport.IWorkingCopy>, errorCallback: common.IErrorCallback): void;
+                    /**
+                     * Instantiates a new working copy that can communicate with the server for sending and receiving documents.
+                     * Reading a working copy will automatically fetch all unit interfaces for this working copy and invoke callback, or call the errorHandler if this fails.
+                     */
+                    static read(client: modelapiclient.IModelApiClient, workingCopyId: string, callback: (model: IModel) => void, errorCallback: common.IErrorCallback, connectionConfig: configuration.ISdkConfig): void;
+                    id: string;
+                    /**
+                     * Returns the structural unit of type "Projects$Project" which is the project's root,
+                     * cast to the appropriate type.
+                     */
+                    root: projects.IProject;
+                    /**
+                     * Registers the given `unit` in the cache(s).
+                     */
+                    /**
+                     * Unregisters the given `unit` from the cache(s).
+                     */
+                    /**
+                     * Fetches a complete unit. The result might be returned from the cache.
+                     */
+                    fetchUnitById<T extends units.IAbstractUnit>(id: string, callback: common.ICallback<T>, errorCallback?: common.IErrorCallback): void;
+                    /**
+                     * Loads all unit interfaces and caches them.
+                     * This function cannot be called twice.
+                     */
+                    /**
+                     * If a reference is broken, it should be registered here, so that it can be restored once model elements are renamed.
+                     */
+                    /**
+                     * If a reference is no longer broken, it should be unregistered here.
+                     */
+                    /**
+                     * If a model element changes its name, broken by-name references should be attempted to resolve.
+                     *
+                     * In the future this might be made smarter and less expensive, once that becomes an issue.
+                     */
+                    /**
+                     * Deletes this working copy from the server, and the (SDK) client.
+                     */
+                    deleteWorkingCopy(callback: common.IVoidCallback, errorCallback?: common.IErrorCallback): void;
+                    exportMpk(outFilePath: string, callback: common.IVoidCallback, errorCallback?: common.IErrorCallback): void;
+                    /**
+                     * Given an object type name and a qualified name, finds the corresponding element (or null if the reference is broken).
+                     * Will always succeed for unbroken references,
+                     * since all objects that are referred by name should be part of the public interface of the model.
+                     *
+                     * Example usage:
+                     * 	`modelStore.resolveName(domainmodels.Attribute.typeName, "Expenses.Expense.Price");`
+                     */
+                    /**
+                     * Resolver methods for references by name
+                     */
+                    /**
+                     * Finds an item in a colleciton
+                     */
+                    findModuleByQualifiedName(name: string): projects.IModule;
+                    findLayoutByQualifiedName(qname: string): pages.ILayout;
+                    findJavaActionByQualifiedName(qname: string): javaactions.IJavaAction;
+                    findMicroflowByQualifiedName(qname: string): microflows.IMicroflow;
+                    findSnippetByQualifiedName(qname: string): pages.ISnippet;
+                    findMenuDocumentByQualifiedName(qname: string): menus.IMenuDocument;
+                    findLayoutParameterByQualifiedName(qname: string): pages.ILayoutParameter;
+                    findMicroflowParameterByQualifiedName(qname: string): microflows.IMicroflowParameter;
+                    findRuleParameterByQualifiedName(qname: string): microflows.IRuleParameter;
+                    findPageByQualifiedName(qname: string): pages.IPage;
+                    findAssociationBaseByQualifiedName(qname: string): domainmodels.IAssociationBase;
+                    findEntityByQualifiedName(qname: string): domainmodels.IEntity;
+                    findAttributeByQualifiedName(qname: string): domainmodels.IAttribute;
+                    findAppServiceActionByQualifiedName(qname: string): appservices.IAppServiceAction;
+                    findAppServiceActionParameterByQualifiedName(qname: string): appservices.IAppServiceActionParameter;
+                    findMxXmlSchemaByQualifiedName(qname: string): xmlschemas.IMxXmlSchema;
+                    findExportMappingByQualifiedName(qname: string): exportmappings.IExportMapping;
+                    findImportMappingByQualifiedName(qname: string): importmappings.IImportMapping;
+                    findUserRoleByQualifiedName(qname: string): security.IUserRole;
+                    findRegularExpressionByQualifiedName(qname: string): regularexpressions.IRegularExpression;
+                    findModuleRoleByQualifiedName(qname: string): security.IModuleRole;
+                    findImportedWebServiceByQualifiedName(qname: string): webservices.IImportedWebService;
+                    findDocumentTemplateByQualifiedName(qname: string): documenttemplates.IDocumentTemplate;
+                    findRuleByQualifiedName(qname: string): microflows.IRule;
+                    findDataSetByQualifiedName(qname: string): datasets.IDataSet;
+                    findConstantByQualifiedName(qname: string): constants.IConstant;
+                    findImageByQualifiedName(qname: string): images.IImage;
+                    findJavaActionParameterByQualifiedName(qname: string): javaactions.IJavaActionParameter;
+                    findEnumerationByQualifiedName(qname: string): enumerations.IEnumeration;
+                }
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    import configuration = sdk.configuration;
+    /**
+     * Client class of the Mendix Model Sdk.
+     * By instantiating this class with appropriate configuration, you can create and read working copies.
+     */
+    class ModelSdkClient {
+        private connectionConfig;
+        private client;
+        constructor(connectionConfig: configuration.ISdkConfig);
+        /**
+         * Create a new working copy on the model server, and reads it for immediate editing.
+         */
+        createWorkingCopy(workingCopyParameters: configuration.ICreateWorkingCopyParameters, callback: common.ICallback<IModel>, errorCallback: common.IErrorCallback): void;
+        /**
+         * Reads a working copy on the model server so it can be edited.
+         */
+        openWorkingCopy(workingCopyId: string, callback: common.ICallback<IModel>, errorCallback: common.IErrorCallback): void;
+        /**
+         * Deletes this working copy from the server, and the (SDK) client.
+         */
+        deleteWorkingCopy(workingCopyId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
+        /**
+         * Grants access to the member specified to his/her OpenID on this working copy.
+         */
+        grantAccess(workingCopyId: string, memberOpenId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
+        /**
+         * Revokes access of the member specified to his/her OpenID on this working copy.
+         */
+        revokeAccess(workingCopyId: string, memberOpenId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
+        /**
+         * Returns whether the member specified to his/her OpenID has (been granted) access to this working copy.
+         */
+        checkAccess(workingCopyId: string, memberOpenId: string, callback: common.ICallback<boolean>, errorCallback: common.IErrorCallback): void;
+        /**
+         * Exports this working copy as MPK.
+         */
+        exportMpk(workingCopyId: string, outFilePath: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
+    }
+}
+declare module "mendixmodelsdk" {
+    namespace sdk {
+        namespace extras {
+            function serializeToJs(unit: internal.units.AbstractUnit): string;
+            /**
+             * Class which allows to serialise a given model part as TypeScript code that constructs that model piece.
+             * Limitations:
+             *  - Can only do elements in one (model) unit.
+             */
+            class JavaScriptSerialiser {
+                private unit;
+                private unitVarName;
+                private creations;
+                private creationsById;
+                private varNames;
+                constructor(unit: internal.units.IAbstractUnit, unitVarName: string);
+                schedule(structure: internal.structures.IStructure): void;
+                source(): string;
+                private creationAsSource(creation);
+                private settingAsSource(varName, setting);
+                private singleValueAsTsExpr(varName, setting, singleValue);
+                private asCreation(structure);
+            }
+        }
+    }
+}
+declare module "mendixmodelsdk" {
+    namespace sdk {
+        namespace internal {
+            /**
+             * The `transportation` module is responsible for performing requests on the (/a) Model API Server.
+             */
+            namespace transportation {
+                /**
+                 * Implementations of this interface are capable of placing a request with the Model API Server over HTTP.
+                 * Default implementation: {@link RestTransportation}.
+                 */
+                interface ITransportation {
+                    /**
+                     * Fire off a HTTP request, with specified method, url, data, and success and failure callbacks.
+                     */
+                    request<T>(method: string, url: string, data: Object, success: common.ICallback<T>, failure: common.IErrorCallback): any;
+                    requestMultipartBinaryFileUpload<T>(method: string, url: string, data: Object, filename: string, success: common.ICallback<T>, failure: common.IErrorCallback): any;
+                    requestFileDownload<T>(method: string, url: string, success: common.ICallback<T>, failure: common.IErrorCallback): any;
+                }
+                /**
+                 * Default implementation of {@link ITransportation} that communicates with the Model API Server over
+                 * HTTP using Restler.
+                 */
+                class RestTransportation implements ITransportation {
+                    private config;
+                    constructor(config: configuration.ISdkConfig);
+                    private sanitizedMethod(method);
+                    private url(urlEndpoint);
+                    private generateStandardOptions();
+                    private handleRequest<T>(request, url, data, success, failure);
+                    request<T>(method: string, url: string, data: Object, success: common.ICallback<T>, failure: common.IErrorCallback): void;
+                    requestMultipartBinaryFileUpload<T>(method: string, url: string, data: Object, filename: string, success: common.ICallback<T>, failure: common.IErrorCallback): void;
+                    requestFileDownload<T>(method: string, url: string, success: common.ICallback<T>, failure: common.IErrorCallback): void;
+                }
+            }
+        }
+    }
+}
+declare var mobservable: IMobservableStatic;
+declare var global: any;
+declare var require: {
+    (id: string): any;
+    resolve(id: string): string;
+    cache: any;
+    extensions: any;
+    main: any;
+};
+declare var module: {
+    exports: any;
+    require(id: string): any;
+    id: string;
+    filename: string;
+    loaded: boolean;
+    parent: any;
+    children: any[];
+};
+
diff --git a/mendixmodelsdk/mendixmodelsdk-tests.ts b/mendixmodelsdk/mendixmodelsdk-tests.ts
index 4598e8ada7..ac550e465e 100644
--- a/mendixmodelsdk/mendixmodelsdk-tests.ts
+++ b/mendixmodelsdk/mendixmodelsdk-tests.ts
@@ -1,8 +1,5 @@
-/// <reference path="./mendixmodelsdk.d.ts"/>
-
 import {domainmodels, IModel, ModelSdkClient} from "mendixmodelsdk";
 
-
 // This doesn't do anything useful, just for testing typings...
 
 const client: ModelSdkClient = new ModelSdkClient({
diff --git a/mendixmodelsdk/mendixmodelsdk.d.ts b/mendixmodelsdk/mendixmodelsdk.d.ts
deleted file mode 100644
index 067cb5da88..0000000000
--- a/mendixmodelsdk/mendixmodelsdk.d.ts
+++ /dev/null
@@ -1,12718 +0,0 @@
-// Type definitions for mendixmodelsdk v0.0.1
-// Project: http://www.mendix.com
-// Definitions by: Mendix <https://github.com/mendix>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/*
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-
-/// <reference path="../mobservable/mobservable.d.ts" />
-declare module "mendixmodelsdk" {
-    namespace sdk {
-        namespace internal {
-            /**
-             * The `references` sub module contains all classes that handle/wrap references,
-             * as a special cases of property value/settings.
-             */
-            namespace references {
-                /**
-                 * Abstract base class for both {@link ReferenceByName by-name} and {@link ReferenceById by-id} references
-                 * to elements of type `T`, which are observed.
-                 */
-                class AbstractReference<T extends elements.IAbstractElement> implements properties.IObservable {
-                    owner: elements.AbstractElement;
-                    protected isResolved: boolean;
-                    protected target: Mobservable.IObservableValue<T>;
-                    protected isResolving: boolean;
-                    protected referenceId: string;
-                    /**
-                     * Constructs and returns a new reference instance, that is owned (by a property of) an abstract element.
-                     */
-                    constructor(owner: elements.AbstractElement);
-                    /**
-                     * Registers an observer in the form of a callback with this references and fires that callback
-                     * immediately if the reference is already resolved.
-                     * Used by properties to observe this reference, so that storage and logical updates can be applied.
-                     */
-                    observe(callback: (newValue: T, oldValue: T) => void, fireImmediately?: boolean): common.IVoidCallback;
-                    /**
-                     * Returns the value of the wrapped reference.
-                     */
-                    get(): T;
-                    /**
-                     * Sets the value of the wrapped reference, taking care of resolution and life cycle.
-                     */
-                    set(newValue: T): void;
-                    /**
-                     * Sets only the raw target id, without trying to resolve that.
-                     */
-                    updateWithRawValue(value: string): void;
-                    protected registerRef(): void;
-                    protected unregisterRef(): void;
-                    resolve(): boolean;
-                    dispose(): void;
-                }
-                class ByIdReference<T extends elements.AbstractElement> extends AbstractReference<T> {
-                    set(newValue: T): void;
-                    get(): T;
-                    resolve(): boolean;
-                }
-                class ByNameReference<T extends elements.IAbstractElement> extends AbstractReference<T> {
-                    private targetType;
-                    constructor(owner: elements.AbstractElement, targetType: string);
-                    resolve(): boolean;
-                    /**
-                     * The target does no longer exist, but the stored reference should stay the same.
-                     */
-                    unresolve(): void;
-                    dispose(): void;
-                    qualifiedName(): string;
-                }
-            }
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    namespace sdk {
-        namespace internal {
-            /**
-             * The `structures` sub module contains all interfaces and classes related to the **structures** concept.
-             */
-            namespace structures {
-                type IContainer = units.IStructuralUnit | elements.IAbstractElement;
-                type Container = units.StructuralUnit | elements.AbstractElement;
-                /**
-                 * "Something" that contains properties.
-                 * Concrete sub types: MxElement, MxStructuralUnit, MxModelUnit.
-                 * Abstract sub types: MxAbstractElement, MxAbstractUnit.
-                 *
-                 * Each unit in the model is guaranteed to exist only once in memory.
-                 */
-                interface IStructure {
-                    id: string;
-                    typeName: string;
-                    container: IContainer;
-                    isLoaded: boolean;
-                    /**
-                     * Unit that owns/contains this thing.
-                     */
-                    unit: units.IAbstractUnit;
-                    load<T extends IStructure>(callback?: (elem: T) => void): any;
-                    load<T extends IStructure>(): T;
-                    /**
-                     * Renders the structure as plain JSON (without observables magic).
-                     * This is intended for debugging and development convenience.
-                     * Note that the resulting object is not of the interface type corresponding to this structure.
-                     */
-                    toPlainJson(): Object;
-                }
-                class Structure implements IStructure {
-                    id: string;
-                    typeName: string;
-                    container: Container;
-                    /**
-                     * These deltas where created before the create delta of this element was submitted to the server.
-                     * As soon as this happens, the queue is processed and should stay empty.
-                     * Each element is either an delta, or a new child that was added under a specific property.
-                     */
-                    constructor(isCreatingNewInstance: boolean, _model: model.Model, container: Container, json: transport.IStructureJson, isPartial: boolean);
-                    unit: units.IAbstractUnit;
-                    isLoaded: boolean;
-                    /**
-                     * Asserts that the complete element is available, and not just its public part.
-                     */
-                    /**
-                     * Should be called after deserialisation / remote updates, to make sure all references are bound to their actual value.
-                     */
-                    /**
-                     * If the name of a model element changes, this might effect currently broken references-by-name, so let's process those.
-                     */
-                    /**
-                     * Housekeeping: a child of ours was deleted, so let's find the part that contained it and update that part.
-                     */
-                    /**
-                     * This model element is no longer part of the model, and can be cleaned up.
-                     */
-                    /**
-                     * Update an existing (probably partial) interface with real contents received from the server.
-                     */
-                    /**
-                     * Sends the change delta in case a simple property has changed.
-                     */
-                    /**
-                     * Sends the delete in case that we were removed from the model.
-                     */
-                    /**
-                     * Deletes a model from the model.
-                     * This will automatically remove the item from its model parent,
-                     * and update incoming references and send server changes.
-                     */
-                    delete(): void;
-                    /**
-                     * Transforms a IModelElement interface into a ModelElement class.
-                     * (Those are technically already the same, but this function makes sure its properties are available).
-                     *
-                     * - If invoked without callback, it checks whether the properties are available or throw;
-                     * - If invoked with callback, it will fetch the data from the server if needed, and then invoke the callback.
-                     */
-                    load<T extends Structure>(callback?: (elem: T) => void): any;
-                    load<T extends Structure>(): T;
-                    toPlainJson(): Object;
-                }
-            }
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    namespace sdk {
-        namespace internal {
-            /**
-             * The `instances` module contains various classes and functions
-             * related to elements, specifically: (abstract) elements.
-             */
-            namespace elements {
-                /**
-                 * Abstract elements are structures that are referable by name.
-                 * Sub types: (I)Element and (I)ModelUnit.
-                 */
-                interface IAbstractElement extends structures.IStructure {
-                    isLoaded: boolean;
-                    qualifiedName: string;
-                    container: structures.IContainer;
-                }
-                /**
-                 * See {@link IAbstractElement}.
-                 */
-                class AbstractElement extends structures.Structure implements IAbstractElement {
-                    constructor(isCreatingNewInstance: boolean, model: model.Model, container: structures.Container, json: transport.IStructureJson, isPartial: boolean);
-                    /**
-                     * Checks whether all properties are available at the moment
-                     *  - if false, a fetch is required to access these properties.
-                     */
-                    isLoaded: boolean;
-                    /**
-                     * Calculates the fully qualified name of this element,
-                     * by visiting all parents that have $isNamespace set to `true`.
-                     */
-                    qualifiedName: string;
-                    /**
-                     * Transforms a IElement interface into a Element class, fetching the containing unit if necessary.
-                     * (Those are technically already the same, but this function makes sure its properties are available.)
-                     *
-                     * - If invoked without callback, it checks whether the properties are available or it will throw;
-                     * - If invoked with callback, it will fetch the data from the server if needed, and then invoke the callback.
-                     */
-                    load<T extends AbstractElement>(callback?: (elem: T) => void): any;
-                    load<T extends AbstractElement>(): T;
-                    /**
-                     * updateElementsContainer recursively sets the unit to which this elements belong
-                     * During deserialization this is not needed, but if used in the SDK, we only can set the unit once
-                     * an element is actually added to the tree (buy pushing / assigning it to some part property)
-                     */
-                    /**
-                     * Adds a back reference, i.e. a reference pointing to us,
-                     * which needs to be informed of changes to this element (including deletion).
-                     */
-                    /**
-                     * Removes the given back reference.
-                     */
-                    delete(): void;
-                }
-                /**
-                 * An element (short for: "model element") lives inside a unit
-                 * and contains (per being an IStructure) property values.
-                 */
-                interface IElement extends IAbstractElement {
-                }
-                class Element extends AbstractElement implements IElement {
-                    container: AbstractElement;
-                    constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-                    unit: units.ModelUnit;
-                    /**
-                     * Checks whether all attributes are available ATM
-                     *  -  if false, a fetch is required to access these properties.
-                     */
-                    isLoaded: boolean;
-                    /**
-                     * Sends the appropriate create delta to the server, and also sends all pending deltas,
-                     * after this element has been assigned to some parent.
-                     */
-                    /**
-                     * Sends the appropriate create delta to the server
-                     * after this element has been moved to a new parent.
-                     */
-                }
-            }
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    namespace sdk {
-        namespace internal {
-            /**
-             * The `instances` module contains various classes and functions
-             * which revolve around creating/maintaining/updating actual model contents.
-             */
-            namespace instances {
-                /**
-                 * Generic type alias for `Mobservable.IObservableArray<T>`.
-                 */
-                interface IList<T> extends Mobservable.IObservableArray<T> {
-                }
-                /**
-                 * Base class for enumerations in the meta model.
-                 * Literals of an enumeration are generated as public static constants of the generated sub class
-                 * which are instances of the generated sub class.
-                 */
-                class IEnum {
-                    protected qualifiedTsTypeName: string;
-                    constructor(_name: string);
-                    name: string;
-                    toString(): string;
-                    qualifiedTsLiteralName(): string;
-                }
-                /**
-                 * Given some a (normalised) JSON representation of a unit,
-                 * creates an instance of the corresponding `unit.AbstractUnit` sub class (structural/model)
-                 * and populates that from the JSON.
-                 * Should only be called if this unit was not already in memory.
-                 */
-                function abstractUnitJsonToInstance(model: model.Model, json: transport.IAbstractUnitJson, isPartial: boolean): units.AbstractUnit;
-                /**
-                 * Given some a (normalised) JSON representation of a model element,
-                 * creates an instance of the corresponding `elements.Element`
-                 * and populates that from the JSON.
-                 * Will update existing elements if this element was created before.
-                 */
-                function modelElementJsonToInstance(unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean): elements.Element;
-            }
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    namespace sdk {
-        namespace internal {
-            /**
-             * The `units` module contains interfaces and base classes related to the concept of **units**.
-             * For more information on this concept, see the README of this repository, under "About Mendix models".
-             */
-            namespace units {
-                /**
-                 * An abstract unit is a vertex, and usually: a node, in the project tree, i.e. a macro-level construct.
-                 * Examples are: modules, folders, microflows, pages.
-                 * This interface is implemented by {@link AbstractUnit}.
-                 */
-                interface IAbstractUnit extends structures.IStructure {
-                    /**
-                     * The parent unit of this unit.
-                     */
-                    container: IStructuralUnit;
-                    /**
-                     * The name of the property of the parent's type which owns this unit.
-                     */
-                    /**
-                     * The {@link modelstore.IModelStore model store} holding the project/Mendix model this unit abides in.
-                     */
-                    /**
-                     * Whether this unit has been completely loaded and does not consist of the unit's interface
-                     *  (which corresponds to the unit being partial).
-                     */
-                    isLoaded: boolean;
-                    /**
-                     * Whether this unit is currently being loaded.
-                     */
-                    /**
-                     * Registers a callback taking this unit as argument, to be executed after the unit has been mark
-                     * as completely loaded.
-                     */
-                    /**
-                     * Mark this unit as having been loaded.
-                     */
-                    /**
-                     * Mark this unit as being loaded.
-                     */
-                }
-                /**
-                 * Base class for implementations of {@link IAbstractUnit}.
-                 */
-                class AbstractUnit extends structures.Structure implements IAbstractUnit {
-                    container: StructuralUnit;
-                    constructor(isCreatingNewInstance: boolean, model: model.Model, container: StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-                    /**
-                     * Checks whether all attributes are available at this instant;
-                     * if false, a fetch is required to access these properties.
-                     */
-                    isLoaded: boolean;
-                    /**
-                     * Sends the create delta for this unit and all pending deltas.
-                     */
-                }
-                /**
-                 * A structural unit is a node (not a leaf) in the project tree.
-                 * Examples: folders & modules.
-                 */
-                interface IStructuralUnit extends IAbstractUnit {
-                }
-                /**
-                 * Implementation of {@link IStructuralUnit}.
-                 */
-                class StructuralUnit extends AbstractUnit implements IStructuralUnit {
-                    constructor(isCreatingNewInstance: boolean, model: model.Model, container: StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-                    unit: StructuralUnit;
-                }
-                /**
-                 * Model Units
-                 *
-                 * A model unit is a leaf (not a node) in the project tree and the root containing model {@link elements.Element} elements.
-                 * It is both a(n abstract) unit as well as "model element-like" by virtue of being an MxAbstractElement,
-                 * but minus the following features of MxElement:
-                 *  public - a model unit is public by nature
-                 *  container - a model unit is itself the root of the tree of elements it contains
-                 *
-                 * A unit acts as scope to resolve by-id references and keeps a cache of elements it owns.
-                 */
-                interface IModelUnit extends IAbstractUnit, elements.IAbstractElement {
-                    container: IStructuralUnit;
-                    moduleName: string;
-                }
-                interface IElementsCache {
-                    [id: string]: elements.AbstractElement;
-                }
-                /**
-                 * Implementation of {@link IModelUnit}.
-                 */
-                class ModelUnit extends elements.AbstractElement implements IModelUnit {
-                    container: StructuralUnit;
-                    constructor(isCreatingNewInstance: boolean, model: model.Model, container: StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-                    unit: ModelUnit;
-                    isLoaded: boolean;
-                    /**
-                     * Returns the module name of the model unit, which is the first section of the qualified name.
-                     */
-                    moduleName: string;
-                }
-            }
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    namespace sdk {
-        namespace internal {
-            /**
-             * The `properties` sub module contains all interfaces and classes
-             * required for handling and wrapping property values/settings.
-             */
-            namespace properties {
-                /**
-                 * Standard interface for an observable object.
-                 */
-                interface IObservable {
-                    observe(listener: any, fire: any): () => void;
-                }
-                /**
-                 * Abstract base wrapper for property values/settings.
-                 * All values/settings of ModelElement-s are wrapped in the appropriate way.
-                 * This is particularly important for reference values which require additional magic.
-                 */
-                class AbstractProperty<T, P extends IObservable> {
-                    protected parent: structures.Structure;
-                    protected name: string;
-                    protected isPublic: boolean;
-                    handle: () => void;
-                    observableValue: P;
-                    /**
-                     * initialValue is default value except parts and GUID-typed primitives.
-                     * (by-id/name references do not have default values.)
-                     */
-                    constructor(parent: structures.Structure, name: string, isPublic: boolean, initialValue: T, ...moreArgs: any[]);
-                    /**
-                     * Initialize should return something that is observable.
-                     * The property will observe this internal structure
-                     * and make sure changes are pushed to the server whenever needed, in its onChange event.
-                     */
-                    initialize(value: T, ...moreConstructorArgs: any[]): P;
-                    fireOnChange(): void;
-                    onChange(...args: any[]): void;
-                    get(): T;
-                    set(newValue: T): void;
-                    updateWithRawValue(value: any): void;
-                    assertLoaded(): void;
-                    resolveReferences(): void;
-                    dispose(): void;
-                }
-                /**
-                 * All primitive types.
-                 * Note: must match exactly with MxPrimitiveTypeEnum!
-                 */
-                enum PrimitiveTypeEnum {
-                    Integer = 0,
-                    String = 1,
-                    Boolean = 2,
-                    Double = 3,
-                    DateTime = 4,
-                    Guid = 5,
-                    Point = 6,
-                    Size = 7,
-                    Color = 8,
-                    Blob = 9,
-                }
-                class PrimitiveProperty<T> extends AbstractProperty<T, Mobservable.IObservableValue<T>> {
-                    private defaultValue;
-                    private primitiveType;
-                    initialize(defaultValue: T, primitiveType: PrimitiveTypeEnum): Mobservable.IObservableValue<T>;
-                    get(): T;
-                    set(newValue: T): void;
-                    updateWithRawValue(value: T): void;
-                    onChange(newValue: T, oldValue: T): void;
-                }
-                /**
-                 * Primitive-typed property values list.
-                 */
-                class PrimitiveListProperty<T> extends AbstractProperty<T[], Mobservable.IObservableArray<T>> {
-                    initialize(initialItems: T[]): Mobservable.IObservableArray<T>;
-                    get(): Mobservable.IObservableArray<T>;
-                    set(newValue: T[]): void;
-                    updateWithRawValue(value: T[]): void;
-                    onChange(change: Mobservable.IArraySplice<T> | Mobservable.IArrayChange<T>): void;
-                    toRawChangeValue(value: T): any;
-                }
-                /**
-                 * A property value that is an enum literal.
-                 */
-                class EnumProperty<T extends instances.IEnum> extends PrimitiveProperty<T> {
-                    private initialValue;
-                    protected enumType: new (key: string) => instances.IEnum;
-                    constructor(parent: structures.Structure, name: string, isPublic: boolean, initialValue: T, enumType: new (key: string) => instances.IEnum);
-                    updateWithRawValue(value: any): void;
-                    onChange(newValue: any, oldValue: any): void;
-                }
-                /**
-                 * A property value that is a list of enum literals.
-                 */
-                class EnumListProperty<T extends instances.IEnum> extends PrimitiveListProperty<T> {
-                    private initialValue;
-                    protected enumType: new (key: string) => instances.IEnum;
-                    constructor(parent: structures.Structure, name: string, isPublic: boolean, initialValue: T[], enumType: new (key: string) => instances.IEnum);
-                    updateWithRawValue(value: any): void;
-                    toRawChangeValue(value: T): any;
-                }
-                /**
-                 * A property value that is a (model) element.
-                 * Will detect when children are moved, added, deleted and sends the appropriate deltas.
-                 */
-                class PartProperty<T extends elements.Element> extends AbstractProperty<T, Mobservable.IObservableValue<T>> {
-                    protected parent: elements.AbstractElement;
-                    private hasDefaultValue;
-                    initialize(value: T, hasDefaultValue: boolean): Mobservable.IObservableValue<T>;
-                    get(): T;
-                    set(newValue: any): void;
-                    updateWithRawValue(value: any): void;
-                    onChange(newValue: elements.Element, oldValue: elements.Element): void;
-                    resolveReferences(): void;
-                    updateElementContainer(unit: units.ModelUnit): void;
-                    dispose(): void;
-                }
-                /**
-                 * A property value that is a list of (model) elements.
-                 * Will detect when children are moved, added, deleted and sends the appropriate deltas.
-                 */
-                class PartListProperty<T extends elements.Element> extends AbstractProperty<T[], Mobservable.IObservableArray<T>> {
-                    parent: elements.AbstractElement;
-                    initialize(initialItems: T[]): Mobservable.IObservableArray<T>;
-                    get(): Mobservable.IObservableArray<T>;
-                    set(newValue: T[]): void;
-                    updateWithRawValue(value: any): void;
-                    onChange(changeData: Mobservable.IArrayChange<T> | Mobservable.IArraySplice<T>): void;
-                    processChildRemoval(element: T): void;
-                    processChildAddition(index: number): void;
-                    resolveReferences(): void;
-                    updateElementContainer(unit: units.ModelUnit): void;
-                    removeChild(child: T): boolean;
-                    dispose(): void;
-                }
-                /**
-                 * Property value that references a (model) element by name.
-                 */
-                class ByNameReferenceProperty<T extends elements.IAbstractElement> extends AbstractProperty<T, references.ByNameReference<T>> {
-                    private targetType;
-                    parent: elements.AbstractElement;
-                    constructor(parent: elements.AbstractElement, name: string, isPublic: boolean, initialValue: T, targetType: string);
-                    initialize(value: T, targetType: string): references.ByNameReference<T>;
-                    get(): T;
-                    set(newValue: T): void;
-                    updateWithRawValue(value: string): void;
-                    resolveReferences(): void;
-                    onChange(newValue: T, oldValue: T): void;
-                    qualifiedName(): string;
-                    dispose(): void;
-                }
-                /**
-                 * Property value that references zero or more (model) elements by name.
-                 *
-                 * The reference list is only used internally, and externally a view of the referencelist that returns the real objects is exposed.
-                 * So, the flow is either:
-                 *  [server] -> [internal ref list (observable)] -> [update view]
-                 * or:
-                 *  [Sdk] -> [view] -- onchange ---> [internal ref list] --- onChange event ---> [send delta's]
-                 *
-                 * For simplicity sake referencesByName should be considered immutable here (TODO: they should be in general?), so that their internal value
-                 * doesn't need to be observed.
-                 */
-                class ByNameReferenceListProperty<T extends elements.IAbstractElement> extends AbstractProperty<T[], Mobservable.IObservableArray<references.ByNameReference<T>>> {
-                    private targetType;
-                    parent: elements.AbstractElement;
-                    private viewList;
-                    private viewListDisposer;
-                    constructor(parent: elements.AbstractElement, name: string, isPublic: boolean, value: T[], targetType: string);
-                    initialize(value: T[]): Mobservable.IObservableArray<references.ByNameReference<T>>;
-                    get(): instances.IList<T>;
-                    set(newElements: T[]): void;
-                    updateWithRawValue(qualifiedNames: string[]): void;
-                    resolveReferences(): void;
-                    qualifiedNames(): string[];
-                    dispose(): void;
-                    supressViewEvents: boolean;
-                    replaceViewItems(newItems: T[]): void;
-                    onChange(changeData: Mobservable.IArrayChange<references.ByNameReference<T>> | Mobservable.IArraySplice<references.ByNameReference<T>>): void;
-                    toRawChangeValue(reference: references.ByNameReference<T>): any;
-                }
-                /**
-                 * Property value that references a (model) element by id.
-                 */
-                class ByIdReferenceProperty<T extends elements.AbstractElement> extends AbstractProperty<T, references.ByIdReference<T>> {
-                    parent: elements.AbstractElement;
-                    initialize(value: T): references.ByIdReference<T>;
-                    get(): T;
-                    set(value: T): void;
-                    updateWithRawValue(value: string): void;
-                    resolveReferences(): void;
-                    onChange(newValue: T, oldValue: T): void;
-                    dispose(): void;
-                }
-                /**
-                 * Property value that is a derived value.
-                 */
-                class DerivedProperty<T> extends AbstractProperty<T, Mobservable.IObservableValue<T>> {
-                    constructor(parent: structures.Structure, name: string, isPublic: boolean, value: T, targetRefType?: string);
-                    initialize(value: any): Mobservable.IObservableValue<any>;
-                    get(): T;
-                    set(value: T): void;
-                    updateWithRawValue(value: any): void;
-                    qualifiedName(): string;
-                    dispose(): void;
-                }
-                /**
-                 * Property value that is a list of derived values.
-                 */
-                class DerivedListProperty<T> extends AbstractProperty<T[], Mobservable.IObservableArray<T>> {
-                    constructor(parent: structures.Structure, name: string, isPublic: boolean, value: T[], targetRefType?: string);
-                    initialize(value: T[]): Mobservable.IObservableArray<T>;
-                    get(): instances.IList<T>;
-                    set(value: T[]): void;
-                    updateWithRawValue(value: any): void;
-                    qualifiedNames(): string[];
-                    dispose(): void;
-                }
-                /**
-                 * Value of a property owned by a structural unit.
-                 */
-                class StructuralChildProperty<T> extends AbstractProperty<T, Mobservable.IObservableValue<T>> {
-                    constructor(parent: units.StructuralUnit, name: string, isPublic: boolean, value: T, targetRefType?: string);
-                    initialize(value: T): Mobservable.IObservableValue<T>;
-                    get(): T;
-                    set(value: T): void;
-                    updateWithRawValue(value: any): void;
-                    dispose(): void;
-                }
-                /**
-                 * Property instance that wraps a list of structural units.
-                 */
-                class StructuralChildListProperty<T> extends AbstractProperty<T[], Mobservable.IObservableArray<T>> {
-                    constructor(parent: units.StructuralUnit, name: string, isPublic: boolean, value: T[], targetRefType?: string);
-                    initialize(value: T[]): Mobservable.IObservableArray<T>;
-                    get(): instances.IList<T>;
-                    set(value: T[]): void;
-                    updateWithRawValue(value: any): void;
-                    dispose(): void;
-                }
-            }
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    namespace sdk {
-        namespace internal {
-            /**
-             * Types defined in this `transport` module express JSON serialisation and are shared with the Model API Server.
-             * Some types (points, deltas) are used verbatim through the rest of the SDK.
-             */
-            namespace transport {
-                /**
-                 * The contents of the `MetaData` table (which always contains one row) in the MPR contained in the working copy's MPK.
-                 * This is useful to determine product version and to be able to re-export the MPR as part of an MPK
-                 * that can be read in by the Business Modeler.
-                 */
-                interface IMprMetaData {
-                }
-                /**
-                 * The meta data for a working copy (- not for the MPR).
-                 */
-                interface IWorkingCopyMetaData {
-                    name: string;
-                    description: string;
-                    avatarUrl: string;
-                }
-                /**
-                 * The representation of a working copy.
-                 */
-                interface IWorkingCopy {
-                    id: string;
-                    metaData: IWorkingCopyMetaData;
-                    /**
-                     * OpenIDs of all users that are granted access.
-                     */
-                    members: string[];
-                    /**
-                     * The name of the MPR file within the working copy's MPK, relative to its root.
-                     * This will typically but not necessarily equal `project.mpr`.
-                     */
-                    mprFileName: string;
-                    mprMetaData: IMprMetaData;
-                }
-                /**
-                 * The base interface of any "structure", i.e. either any unit or an element within a model unit.
-                 */
-                interface IStructureJson {
-                    $Type: string;
-                    $ID: string;
-                }
-                /**
-                 * The base serialisation structure of a unit, i.e. either a structural or a model unit.
-                 */
-                interface IAbstractUnitJson extends IStructureJson {
-                    contents: {
-                        [key: string]: any;
-                    };
-                    containerId: string;
-                    containmentName: string;
-                }
-                /**
-                 * The base interface of an (model) element (within a model unit).
-                 * (It extends {@link IStructureJson} with a general map structure to hold arbitrary properties.)
-                 */
-                interface IAbstractElementJson extends IStructureJson {
-                    [key: string]: any;
-                }
-                /**
-                 * The base interface for any delta.
-                 */
-                interface IDelta {
-                    /**
-                     * The type of the delta, which can be one of deltas.deltas.DeltaTypes, as a string.
-                     * This type determines the rest of the JSON serialisation:<br/>
-                     *  "CREATE_ELEMENT" &rarr; ICreateElementDelta,<br/>
-                     *  "UPDATE_PROPERTY_VALUE" &rarr; IUpdatePropertyValueDelta,<br/>
-                     *  "MOVE_ELEMENT" &rarr; IMoveElementDelta,<br/>
-                     *  "DELETE_ELEMENT" &rarr; IDeleteElementDelta,<br/>
-                     *  "CREATE_UNIT" &rarr; ICreateUnitDelta.
-                     */
-                    deltaType: string;
-                    /**
-                     * The ID of the unit (containing an element or property value) to which the delta is to be applied.
-                     */
-                    unitId: string;
-                }
-                /**
-                 * Base interface for deltas acting on/in elements.
-                 */
-                interface IElementDelta extends IDelta {
-                    elementId: string;
-                }
-                /**
-                 * A delta to create an element.
-                 */
-                interface ICreateElementDelta extends IElementDelta {
-                    /**
-                     * The ID of the parent element to create the new element in.
-                     */
-                    parentId: string;
-                    /**
-                     * The name of the property to create the new element on/in.
-                     * This must a property of PART kind with an element type compatible with `elementType`.
-                     */
-                    parentPropertyName: string;
-                    /**
-                     * The qualified name of the type of element to create.
-                     */
-                    elementType: string;
-                }
-                /**
-                 * Information returned from a successful creation of an element.
-                 */
-                interface ICreateElementDeltaResult {
-                    /**
-                     * The index of a listy property to which the element was added,
-                     * or -1 if the property is not listy.
-                     */
-                    additionIndex: number;
-                }
-                /**
-                 * A delta to change the value of a property of an element,
-                 * in a way that's specific by the "_mutator_"" given.
-                 */
-                interface IUpdatePropertyValueDelta extends IElementDelta {
-                    propertyName: string;
-                    mutator: IMutator;
-                }
-                /**
-                 * Base interface for mutators acting on a property's value.
-                 */
-                interface IMutator {
-                    /**
-                     * The type of the mutator, which can be one of deltas.deltas.MutatorTypes, as a string.
-                     * This type determines the rest of the JSON serialisation:<br/>
-                     *  "CHANGE" &rarr; IChangeMutator,<br/>
-                     *  "ADD" &rarr; IAddMutator,<br/>
-                     *  "REMOVE" &rarr; IRemoveMutator,<br/>
-                     *  "MOVE" &rarr; IMoveMutator.<br/>
-                     */
-                    mutatorType: string;
-                }
-                /**
-                 * Sets the value of the whole property (if non-listy),
-                 * or a specific item (if listy - which item is indicated by `updateIndex`) to the given `value`.
-                 */
-                interface IChangeMutator extends IMutator {
-                    value: any;
-                    updateIndex?: number;
-                }
-                /**
-                 * Adds the given `value` to a listy property,
-                 * either at the end if `insertionIndex` is not set,
-                 * or at the indicated index, shifting any and all subsequent items "down".
-                 */
-                interface IAddMutator extends IMutator {
-                    value: any;
-                    insertionIndex?: number;
-                }
-                /**
-                 * Removes the item of a listy property with the given `removalIndex`,
-                 * shifting any and all subsequent items "up".
-                 */
-                interface IRemoveMutator extends IMutator {
-                    removalIndex: number;
-                }
-                /**
-                 * Moves the item of listy property at the given `fromIndex` to the given `toIndex`,
-                 * reshuffling all other items accordingly.
-                 */
-                interface IMoveMutator extends IMutator {
-                    fromIndex: number;
-                    toIndex: number;
-                }
-                /**
-                 * Information returned from a successful update of a property value.
-                 */
-                interface IUpdatePropertyValueDeltaResult {
-                }
-                /**
-                 * A delta to move an element from one parent element to another.
-                 */
-                interface IMoveElementDelta extends IElementDelta {
-                    /**
-                     * The ID of the parent element to move the element indicated by `elementId` to.
-                     */
-                    newParentId: string;
-                    /**
-                     * The name of the property of the new parent element to put the element-to-move in/on.
-                     */
-                    newParentPropertyName: string;
-                    /**
-                     * If the indicated new property is listy, `newIndex` is the index where the element-to-move will end up.
-                     * If not set, the element-to-move will be added at the end.
-                     */
-                    newIndex?: number;
-                }
-                /**
-                 * Information returned from a successful move of an element.
-                 */
-                interface IMoveElementDeltaResult {
-                    /**
-                     * The ID of the parent element the element-to-move was removed from.
-                     */
-                    oldParentId: string;
-                    /**
-                     * The name of the property of the parent element the element-to-move was removed from.
-                     */
-                    oldParentPropertyName: string;
-                    /**
-                     * If the old property is listy, this was the index of the element-to-move within that list,
-                     * or -1 otherwise.
-                     */
-                    oldIndex: number;
-                    /**
-                     * If the new property is listy, this is the index of the moved element within that list,
-                     * or -1 otherwise.
-                     */
-                    newIndex: number;
-                }
-                /**
-                 * A delta to delete an element, including all its contained properties and children.
-                 */
-                interface IDeleteElementDelta extends IElementDelta {
-                }
-                /**
-                 * Information returned from a successful deletion of an element.
-                 */
-                interface IDeleteElementDeltaResult {
-                    /** The ID of the parent element from which the element was removed. */
-                    parentId: string;
-                    /**
-                     * The name of the property that contained the element.
-                     */
-                    propertyName: string;
-                    /**
-                     * The zero-based index at which the element was found,
-                     * if it resided inside a listy property; otherwise: -1.
-                     */
-                    removalIndex: number;
-                }
-                /**
-                 * A delta to create a (structural or model) unit.
-                 */
-                interface ICreateUnitDelta extends IDelta {
-                    /**
-                     * The ID of the containing unit.
-                     * (This relates to the project tree.)
-                     */
-                    containerId: string;
-                    /**
-                     * The name of the property of the containing unit which will contain the unit-to-create.
-                     * (This relates to the project tree.)
-                     */
-                    containmentName: string;
-                    /**
-                     * The qualified name of the type of unit to create.
-                     */
-                    contentType: string;
-                }
-                /**
-                 * Information returned from a successful creation of a unit.
-                 */
-                interface ICreateUnitDeltaResult {
-                }
-            }
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    /**
-     * Module containing several often-used interfaces.
-     */
-    namespace common {
-        /**
-         * Representation of a point.
-         */
-        interface IPoint {
-            x: number;
-            y: number;
-        }
-        /**
-         * Representation of a size, e.g. of an entity box.
-         */
-        interface ISize {
-            width: number;
-            height: number;
-        }
-        /**
-         * Representation of an RGB color.
-         */
-        interface IColor {
-            red: number;
-            green: number;
-            blue: number;
-        }
-        /**
-         * Unification of the {@link IPoint} and {@link ISize} types.
-         */
-        interface IDimension extends IPoint, ISize {
-        }
-        /**
-         * Callback interface returning nothing, not even an error.
-         */
-        interface IVoidCallback {
-            (): void;
-        }
-        /**
-         * Callback interface returning an error at most.
-         */
-        interface IErrorCallback {
-            (err: any): void;
-        }
-        /**
-         * Callback interface returning data of some type `T`.
-         */
-        interface ICallback<T> {
-            (data: T): void;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    namespace sdk {
-        /**
-         * The `utils` module contains various utility interfaces and functions.
-         */
-        namespace utils {
-            /**
-             * Generates a random UUID to set the ID of an element or unit to.
-             * There is no intrinsic ID collision detection/avoidance mechanism but it's good enough in practice.
-             */
-            function randomUuid(): any;
-            /**
-             * Flattens an array of arrays of items of type `T`, returning a single array
-             * that consists of the concatenation of the original arrays.
-             * This is especially useful for arrays of arrays of observables since the `lodash`
-             * doesn't handle these correctly.
-             */
-            function flatten<T>(array: T[][]): T[];
-            /**
-             * Combines the given `parts` and returns them as an URL, avoiding duplicate slashes.
-             */
-            function combineUrl(...parts: string[]): string;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `Projects`.
-     */
-    namespace projects {
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
-         */
-        interface IProject extends units.IStructuralUnit {
-            load(): Project;
-            load(callback: (element: Project) => void): any;
-            projectDocuments: instances.IList<IProjectDocument>;
-            modules: instances.IList<IModule>;
-            projectConversion: IProjectConversion;
-            isSystemProject: boolean;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
-         */
-        class Project extends units.StructuralUnit implements IProject {
-            static typeName: string;
-            projectDocuments: instances.IList<ProjectDocument>;
-            modules: instances.IList<Module>;
-            projectConversion: ProjectConversion;
-            isSystemProject: boolean;
-            constructor(container: units.IStructuralUnit);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
-         */
-        interface IProjectDocument extends units.IModelUnit {
-            container: IProject;
-            load(): ProjectDocument;
-            load(callback: (element: ProjectDocument) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ProjectDocument extends units.ModelUnit implements IProjectDocument {
-            static typeName: string;
-            container: Project;
-            constructor(container: IProject);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IFolderBase extends units.IStructuralUnit {
-            load(): FolderBase;
-            load(callback: (element: FolderBase) => void): any;
-            folders: instances.IList<IFolder>;
-            documents: instances.IList<IDocument>;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class FolderBase extends units.StructuralUnit implements IFolderBase {
-            static typeName: string;
-            folders: instances.IList<Folder>;
-            documents: instances.IList<Document>;
-            constructor(container: units.IStructuralUnit);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/howto50/Add+documents+to+a+module relevant section in reference guide}
-         */
-        interface IFolder extends IFolderBase {
-            container: IFolderBase;
-            load(): Folder;
-            load(callback: (element: Folder) => void): any;
-            name: string;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/howto50/Add+documents+to+a+module relevant section in reference guide}
-         */
-        class Folder extends FolderBase implements IFolder {
-            static typeName: string;
-            container: FolderBase;
-            name: string;
-            constructor(container: IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Modules relevant section in reference guide}
-         */
-        interface IModule extends IFolderBase {
-            container: IProject;
-            load(): Module;
-            load(callback: (element: Module) => void): any;
-            sortIndex: number;
-            name: string;
-            domainModel: domainmodels.IDomainModel;
-            moduleSecurity: security.IModuleSecurity;
-            fromAppStore: boolean;
-            appStoreGuid: string;
-            appStoreVersionGuid: string;
-            appStoreVersion: string;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Modules relevant section in reference guide}
-         */
-        class Module extends FolderBase implements IModule {
-            static typeName: string;
-            container: Project;
-            sortIndex: number;
-            name: string;
-            domainModel: domainmodels.DomainModel;
-            moduleSecurity: security.ModuleSecurity;
-            fromAppStore: boolean;
-            appStoreGuid: string;
-            appStoreVersionGuid: string;
-            appStoreVersion: string;
-            constructor(container: IProject);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IModuleDocument extends units.IModelUnit {
-            container: IFolderBase;
-            load(): ModuleDocument;
-            load(callback: (element: ModuleDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
-            static typeName: string;
-            container: FolderBase;
-            constructor(container: IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDocument extends IModuleDocument {
-            container: IFolderBase;
-            load(): Document;
-            load(callback: (element: Document) => void): any;
-            name: string;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Document extends ModuleDocument implements IDocument {
-            static typeName: string;
-            container: FolderBase;
-            name: string;
-            documentation: string;
-            excluded: boolean;
-            constructor(container: IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IOneTimeConversionMarker extends elements.IElement {
-            container: IProjectConversion;
-            load(): OneTimeConversionMarker;
-            load(callback: (element: OneTimeConversionMarker) => void): any;
-        }
-        class OneTimeConversionMarker extends elements.Element implements IOneTimeConversionMarker {
-            static typeName: string;
-            container: ProjectConversion;
-            name: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IProjectConversion extends units.IModelUnit {
-            container: IProject;
-            load(): ProjectConversion;
-            load(callback: (element: ProjectConversion) => void): any;
-        }
-        class ProjectConversion extends units.ModelUnit implements IProjectConversion {
-            static typeName: string;
-            container: Project;
-            markers: instances.IList<OneTimeConversionMarker>;
-            constructor(container: IProject);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        class ConversionState extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Start: ConversionState;
-            static SetAppstoreModules: ConversionState;
-            static UpdateAppstoreModules: ConversionState;
-            static SolveModelerErrors: ConversionState;
-            static FixJavaCode: ConversionState;
-            static FixIntegrationJavaCode: ConversionState;
-            static DeployToEclipse: ConversionState;
-            static MigrateJavaLibs: ConversionState;
-            static RemoveUnusedJars: ConversionState;
-            static CopyRuntimeJars: ConversionState;
-            static Finished: ConversionState;
-        }
-        class HashAlgorithmType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static BCrypt: HashAlgorithmType;
-            static SSHA256: HashAlgorithmType;
-            static SSHA: HashAlgorithmType;
-            static SHA256: HashAlgorithmType;
-            static SHA1: HashAlgorithmType;
-            static MD5: HashAlgorithmType;
-        }
-        class SecurityLevel extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static CheckNothing: SecurityLevel;
-            static CheckFormsAndMicroflows: SecurityLevel;
-            static CheckEverything: SecurityLevel;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `Microflows`.
-     */
-    namespace microflows {
-        /**
-         * TODO
-         */
-        interface IMicroflowAction extends elements.IElement {
-            container: IActionActivity;
-            load(): MicroflowAction;
-            load(callback: (element: MicroflowAction) => void): any;
-        }
-        /**
-         * TODO
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class MicroflowAction extends elements.Element implements IMicroflowAction {
-            static typeName: string;
-            container: ActionActivity;
-            errorHandlingType: ErrorHandlingType;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO: Missing in ref guide ?
-         */
-        interface IAppServiceCallAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): AppServiceCallAction;
-            load(callback: (element: AppServiceCallAction) => void): any;
-        }
-        /**
-         * TODO: Missing in ref guide ?
-         */
-        class AppServiceCallAction extends MicroflowAction implements IAppServiceCallAction {
-            static typeName: string;
-            container: ActionActivity;
-            appServiceAction: appservices.IAppServiceAction;
-            appServiceActionQualifiedName: string;
-            parameterMappings: instances.IList<AppServiceCallParameterMapping>;
-            useVariable: boolean;
-            outputVariableName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO: Missing in ref guide ?
-         */
-        interface IAppServiceCallParameterMapping extends elements.IElement {
-            container: IAppServiceCallAction;
-            load(): AppServiceCallParameterMapping;
-            load(callback: (element: AppServiceCallParameterMapping) => void): any;
-        }
-        /**
-         * TODO: Missing in ref guide ?
-         */
-        class AppServiceCallParameterMapping extends elements.Element implements IAppServiceCallParameterMapping {
-            static typeName: string;
-            container: AppServiceCallAction;
-            parameter: appservices.IAppServiceActionParameter;
-            parameterQualifiedName: string;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            argument: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Call+Web+Service relevant section in reference guide}
-         */
-        interface IWebServiceCallAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): WebServiceCallAction;
-            load(callback: (element: WebServiceCallAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Call+Web+Service relevant section in reference guide}
-         */
-        class WebServiceCallAction extends MicroflowAction implements IWebServiceCallAction {
-            static typeName: string;
-            container: ActionActivity;
-            importedWebService: webservices.IImportedWebService;
-            importedWebServiceQualifiedName: string;
-            serviceName: string;
-            operationName: string;
-            useRequestTimeOut: boolean;
-            timeOut: number;
-            sendNullValueChoice: NullValueOption;
-            requestHeaderHandling: RequestHandling;
-            requestBodyHandling: RequestHandling;
-            resultHandling: ResultHandling;
-            httpConfiguration: HttpConfiguration;
-            isValidationRequired: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface IRequestHandling extends elements.IElement {
-            container: IWebServiceCallAction;
-            load(): RequestHandling;
-            load(callback: (element: RequestHandling) => void): any;
-        }
-        /**
-         * TODO
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class RequestHandling extends elements.Element implements IRequestHandling {
-            static typeName: string;
-            container: WebServiceCallAction;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        /**
-         * TODO
-         */
-        interface IAdvancedRequestHandling extends IRequestHandling {
-            container: IWebServiceCallAction;
-            load(): AdvancedRequestHandling;
-            load(callback: (element: AdvancedRequestHandling) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class AdvancedRequestHandling extends RequestHandling implements IAdvancedRequestHandling {
-            static typeName: string;
-            container: WebServiceCallAction;
-            parameterMappings: instances.IList<WebServiceOperationAdvancedParameterMapping>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IHttpConfiguration extends elements.IElement {
-            container: IWebServiceCallAction;
-            load(): HttpConfiguration;
-            load(callback: (element: HttpConfiguration) => void): any;
-        }
-        class HttpConfiguration extends elements.Element implements IHttpConfiguration {
-            static typeName: string;
-            container: WebServiceCallAction;
-            overrideLocation: boolean;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            customLocation: string;
-            useAuthentication: boolean;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            httpAuthenticationUserName: string;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            authenticationPassword: string;
-            headerEntries: instances.IList<HttpHeaderEntry>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface IHttpHeaderEntry extends elements.IElement {
-            container: IHttpConfiguration;
-            load(): HttpHeaderEntry;
-            load(callback: (element: HttpHeaderEntry) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class HttpHeaderEntry extends elements.Element implements IHttpHeaderEntry {
-            static typeName: string;
-            container: HttpConfiguration;
-            key: string;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            value: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface IImportMappingCall extends elements.IElement {
-            container: IResultHandling;
-            load(): ImportMappingCall;
-            load(callback: (element: ImportMappingCall) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class ImportMappingCall extends elements.Element implements IImportMappingCall {
-            static typeName: string;
-            container: ResultHandling;
-            mapping: importmappings.IImportMapping;
-            mappingQualifiedName: string;
-            mappingArgumentVariableName: string;
-            range: Range;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Import+XML relevant section in reference guide}
-         */
-        interface IImportXmlAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): ImportXmlAction;
-            load(callback: (element: ImportXmlAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Import+XML relevant section in reference guide}
-         */
-        class ImportXmlAction extends MicroflowAction implements IImportXmlAction {
-            static typeName: string;
-            container: ActionActivity;
-            xmlDocumentVariableName: string;
-            resultHandling: ResultHandling;
-            isValidationRequired: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface IResultHandling extends elements.IElement {
-            load(): ResultHandling;
-            load(callback: (element: ResultHandling) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class ResultHandling extends elements.Element implements IResultHandling {
-            static typeName: string;
-            importMappingCall: ImportMappingCall;
-            storeInVariable: boolean;
-            outputVariableName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface ICustomRequestHandling extends IRequestHandling {
-            container: IWebServiceCallAction;
-            load(): CustomRequestHandling;
-            load(callback: (element: CustomRequestHandling) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class CustomRequestHandling extends RequestHandling implements ICustomRequestHandling {
-            static typeName: string;
-            container: WebServiceCallAction;
-            template: StringTemplate;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface IMappingRequestHandling extends IRequestHandling {
-            container: IWebServiceCallAction;
-            load(): MappingRequestHandling;
-            load(callback: (element: MappingRequestHandling) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class MappingRequestHandling extends RequestHandling implements IMappingRequestHandling {
-            static typeName: string;
-            container: WebServiceCallAction;
-            mapping: exportmappings.IExportMapping;
-            mappingQualifiedName: string;
-            mappingArgumentVariableName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface ISimpleRequestHandling extends IRequestHandling {
-            container: IWebServiceCallAction;
-            load(): SimpleRequestHandling;
-            load(callback: (element: SimpleRequestHandling) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class SimpleRequestHandling extends RequestHandling implements ISimpleRequestHandling {
-            static typeName: string;
-            container: WebServiceCallAction;
-            parameterMappings: instances.IList<WebServiceOperationSimpleParameterMapping>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Export+XML relevant section in reference guide}
-         */
-        interface IExportXmlAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): ExportXmlAction;
-            load(callback: (element: ExportXmlAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Export+XML relevant section in reference guide}
-         */
-        class ExportXmlAction extends MicroflowAction implements IExportXmlAction {
-            static typeName: string;
-            container: ActionActivity;
-            mapping: exportmappings.IExportMapping;
-            mappingQualifiedName: string;
-            mappingArgumentVariableName: string;
-            outputMethod: OutputMethod;
-            isValidationRequired: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface IOutputMethod extends elements.IElement {
-            container: IExportXmlAction;
-            load(): OutputMethod;
-            load(callback: (element: OutputMethod) => void): any;
-        }
-        /**
-         * TODO
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class OutputMethod extends elements.Element implements IOutputMethod {
-            static typeName: string;
-            container: ExportXmlAction;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        /**
-         * TODO
-         */
-        interface IFileDocumentExport extends IOutputMethod {
-            container: IExportXmlAction;
-            load(): FileDocumentExport;
-            load(callback: (element: FileDocumentExport) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class FileDocumentExport extends OutputMethod implements IFileDocumentExport {
-            static typeName: string;
-            container: ExportXmlAction;
-            targetDocumentVariableName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface IVariableExport extends IOutputMethod {
-            container: IExportXmlAction;
-            load(): VariableExport;
-            load(callback: (element: VariableExport) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class VariableExport extends OutputMethod implements IVariableExport {
-            static typeName: string;
-            container: ExportXmlAction;
-            outputVariableName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface IWebServiceOperationAdvancedParameterMapping extends elements.IElement {
-            container: IAdvancedRequestHandling;
-            load(): WebServiceOperationAdvancedParameterMapping;
-            load(callback: (element: WebServiceOperationAdvancedParameterMapping) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class WebServiceOperationAdvancedParameterMapping extends elements.Element implements IWebServiceOperationAdvancedParameterMapping {
-            static typeName: string;
-            container: AdvancedRequestHandling;
-            isChecked: boolean;
-            parameterName: string;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            argument: string;
-            mapping: exportmappings.IExportMapping;
-            mappingQualifiedName: string;
-            mappingArgumentVariableName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface IWebServiceOperationSimpleParameterMapping extends elements.IElement {
-            container: ISimpleRequestHandling;
-            load(): WebServiceOperationSimpleParameterMapping;
-            load(callback: (element: WebServiceOperationSimpleParameterMapping) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class WebServiceOperationSimpleParameterMapping extends elements.Element implements IWebServiceOperationSimpleParameterMapping {
-            static typeName: string;
-            container: SimpleRequestHandling;
-            isChecked: boolean;
-            parameterName: string;
-            /**
-             * The value of this property is conceptually of type Mappings$ElementPath.
-             */
-            parameterPath: string;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            argument: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Close+Form relevant section in reference guide}
-         */
-        interface ICloseFormAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): CloseFormAction;
-            load(callback: (element: CloseFormAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Close+Form relevant section in reference guide}
-         */
-        class CloseFormAction extends MicroflowAction implements ICloseFormAction {
-            static typeName: string;
-            container: ActionActivity;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Download+File relevant section in reference guide}
-         */
-        interface IDownloadFileAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): DownloadFileAction;
-            load(callback: (element: DownloadFileAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Download+File relevant section in reference guide}
-         */
-        class DownloadFileAction extends MicroflowAction implements IDownloadFileAction {
-            static typeName: string;
-            container: ActionActivity;
-            fileDocumentVariableName: string;
-            showFileInBrowser: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IDocumentTemplateParameterMapping extends elements.IElement {
-            container: IGenerateDocumentAction;
-            load(): DocumentTemplateParameterMapping;
-            load(callback: (element: DocumentTemplateParameterMapping) => void): any;
-        }
-        class DocumentTemplateParameterMapping extends elements.Element implements IDocumentTemplateParameterMapping {
-            static typeName: string;
-            container: GenerateDocumentAction;
-            widgetName: string;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            argument: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Generate+Document relevant section in reference guide}
-         */
-        interface IGenerateDocumentAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): GenerateDocumentAction;
-            load(callback: (element: GenerateDocumentAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Generate+Document relevant section in reference guide}
-         */
-        class GenerateDocumentAction extends MicroflowAction implements IGenerateDocumentAction {
-            static typeName: string;
-            container: ActionActivity;
-            parameterMappings: instances.IList<DocumentTemplateParameterMapping>;
-            fileVariableName: string;
-            languageVariableName: string;
-            documentType: TargetDocumentType;
-            languageSetting: LanguageSettingType;
-            documentTemplate: documenttemplates.IDocumentTemplate;
-            documentTemplateQualifiedName: string;
-            overrideTopMargin: boolean;
-            overrideBottomMargin: boolean;
-            overrideLeftMargin: boolean;
-            overrideRightMargin: boolean;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            marginLeftInInch: string;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            marginRightInInch: string;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            marginTopInInch: string;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            marginBottomInInch: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Show+Home+Page TODO: Page does not exist, should be created.}
-         */
-        interface IShowHomePageAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): ShowHomePageAction;
-            load(callback: (element: ShowHomePageAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Show+Home+Page TODO: Page does not exist, should be created.}
-         */
-        class ShowHomePageAction extends MicroflowAction implements IShowHomePageAction {
-            static typeName: string;
-            container: ActionActivity;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Show+Message relevant section in reference guide}
-         */
-        interface IShowMessageAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): ShowMessageAction;
-            load(callback: (element: ShowMessageAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Show+Message relevant section in reference guide}
-         */
-        class ShowMessageAction extends MicroflowAction implements IShowMessageAction {
-            static typeName: string;
-            container: ActionActivity;
-            template: TextTemplate;
-            type: ShowMessageType;
-            blocking: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Show+Page relevant section in reference guide}
-         */
-        interface IShowPageAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): ShowPageAction;
-            load(callback: (element: ShowPageAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Show+Page relevant section in reference guide}
-         */
-        class ShowPageAction extends MicroflowAction implements IShowPageAction {
-            static typeName: string;
-            container: ActionActivity;
-            pageSettings: pages.PageSettings;
-            passedObjectVariableName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Validation+Feedback relevant section in reference guide}
-         */
-        interface IValidationFeedbackAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): ValidationFeedbackAction;
-            load(callback: (element: ValidationFeedbackAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Validation+Feedback relevant section in reference guide}
-         */
-        class ValidationFeedbackAction extends MicroflowAction implements IValidationFeedbackAction {
-            static typeName: string;
-            container: ActionActivity;
-            feedbackTemplate: TextTemplate;
-            objectVariableName: string;
-            /**
-             * See: {@link https://world.mendix.com/display/refguide5/Validation+Feedback See 'Member' section in reference guide}
-             */
-            attribute: domainmodels.IAttribute;
-            attributeQualifiedName: string;
-            /**
-             * See: {@link https://world.mendix.com/display/refguide5/Validation+Feedback See 'Member' section in reference guide}
-             */
-            association: domainmodels.IAssociationBase;
-            associationQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO: Abstract
-         */
-        interface IMicroflowObject extends elements.IElement {
-            container: IMicroflowObjectCollection;
-            load(): MicroflowObject;
-            load(callback: (element: MicroflowObject) => void): any;
-        }
-        /**
-         * TODO: Abstract
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class MicroflowObject extends elements.Element implements IMicroflowObject {
-            static typeName: string;
-            container: MicroflowObjectCollection;
-            relativeMiddlePoint: common.IPoint;
-            size: common.ISize;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO: abstract element
-         */
-        interface IActivity extends IMicroflowObject {
-            container: IMicroflowObjectCollection;
-            load(): Activity;
-            load(callback: (element: Activity) => void): any;
-        }
-        /**
-         * TODO: abstract element
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Activity extends MicroflowObject implements IActivity {
-            static typeName: string;
-            container: MicroflowObjectCollection;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Activities relevant section in reference guide}
-         */
-        interface IActionActivity extends IActivity {
-            container: IMicroflowObjectCollection;
-            load(): ActionActivity;
-            load(callback: (element: ActionActivity) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Activities relevant section in reference guide}
-         */
-        class ActionActivity extends Activity implements IActionActivity {
-            static typeName: string;
-            container: MicroflowObjectCollection;
-            action: MicroflowAction;
-            caption: string;
-            autoGenerateCaption: boolean;
-            backgroundColor: ActionActivityColor;
-            documentation: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Aggregate+List relevant section in reference guide}
-         */
-        interface IAggregateListAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): AggregateListAction;
-            load(callback: (element: AggregateListAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Aggregate+List relevant section in reference guide}
-         */
-        class AggregateListAction extends MicroflowAction implements IAggregateListAction {
-            static typeName: string;
-            container: ActionActivity;
-            inputListVariableName: string;
-            attribute: domainmodels.IAttribute;
-            attributeQualifiedName: string;
-            aggregateFunction: AggregateFunctionEnum;
-            outputVariableName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Annotation relevant section in reference guide}
-         */
-        interface IAnnotation extends IMicroflowObject {
-            container: IMicroflowObjectCollection;
-            load(): Annotation;
-            load(callback: (element: Annotation) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Annotation relevant section in reference guide}
-         */
-        class Annotation extends MicroflowObject implements IAnnotation {
-            static typeName: string;
-            container: MicroflowObjectCollection;
-            caption: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO abstract
-         */
-        interface IFlow extends elements.IElement {
-            container: IMicroflowBase;
-            load(): Flow;
-            load(callback: (element: Flow) => void): any;
-        }
-        /**
-         * TODO abstract
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Flow extends elements.Element implements IFlow {
-            static typeName: string;
-            container: MicroflowBase;
-            origin: MicroflowObject;
-            destination: MicroflowObject;
-            originConnectionIndex: number;
-            destinationConnectionIndex: number;
-            originBezierVector: common.ISize;
-            destinationBezierVector: common.ISize;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Annotation+Flow relevant section in reference guide}
-         */
-        interface IAnnotationFlow extends IFlow {
-            container: IMicroflowBase;
-            load(): AnnotationFlow;
-            load(callback: (element: AnnotationFlow) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Annotation+Flow relevant section in reference guide}
-         */
-        class AnnotationFlow extends Flow implements IAnnotationFlow {
-            static typeName: string;
-            container: MicroflowBase;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface IRetrieveSource extends elements.IElement {
-            container: IRetrieveAction;
-            load(): RetrieveSource;
-            load(callback: (element: RetrieveSource) => void): any;
-        }
-        /**
-         * TODO
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class RetrieveSource extends elements.Element implements IRetrieveSource {
-            static typeName: string;
-            container: RetrieveAction;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface IAssociationRetrieveSource extends IRetrieveSource {
-            container: IRetrieveAction;
-            load(): AssociationRetrieveSource;
-            load(callback: (element: AssociationRetrieveSource) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class AssociationRetrieveSource extends RetrieveSource implements IAssociationRetrieveSource {
-            static typeName: string;
-            container: RetrieveAction;
-            startVariableName: string;
-            association: domainmodels.IAssociationBase;
-            associationQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IListOperation extends elements.IElement {
-            container: IListOperationAction;
-            load(): ListOperation;
-            load(callback: (element: ListOperation) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ListOperation extends elements.Element implements IListOperation {
-            static typeName: string;
-            container: ListOperationAction;
-            listVariableName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IBinaryListOperation extends IListOperation {
-            container: IListOperationAction;
-            load(): BinaryListOperation;
-            load(callback: (element: BinaryListOperation) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class BinaryListOperation extends ListOperation implements IBinaryListOperation {
-            static typeName: string;
-            container: ListOperationAction;
-            secondListOrObjectName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Break+Event relevant section in reference guide}
-         */
-        interface IBreakEvent extends IMicroflowObject {
-            container: IMicroflowObjectCollection;
-            load(): BreakEvent;
-            load(callback: (element: BreakEvent) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Break+Event relevant section in reference guide}
-         */
-        class BreakEvent extends MicroflowObject implements IBreakEvent {
-            static typeName: string;
-            container: MicroflowObjectCollection;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface ICaseValue extends elements.IElement {
-            container: ISequenceFlow;
-            load(): CaseValue;
-            load(callback: (element: CaseValue) => void): any;
-        }
-        /**
-         * TODO
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class CaseValue extends elements.Element implements ICaseValue {
-            static typeName: string;
-            container: SequenceFlow;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Cast+Object relevant section in reference guide}
-         */
-        interface ICastAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): CastAction;
-            load(callback: (element: CastAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Cast+Object relevant section in reference guide}
-         */
-        class CastAction extends MicroflowAction implements ICastAction {
-            static typeName: string;
-            container: ActionActivity;
-            outputVariableName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface IChangeMembersAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): ChangeMembersAction;
-            load(callback: (element: ChangeMembersAction) => void): any;
-        }
-        /**
-         * TODO
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ChangeMembersAction extends MicroflowAction implements IChangeMembersAction {
-            static typeName: string;
-            container: ActionActivity;
-            items: instances.IList<MemberChange>;
-            refreshInClient: boolean;
-            commit: CommitEnum;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Change+Object relevant section in reference guide}
-         */
-        interface IChangeObjectAction extends IChangeMembersAction {
-            container: IActionActivity;
-            load(): ChangeObjectAction;
-            load(callback: (element: ChangeObjectAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Change+Object relevant section in reference guide}
-         */
-        class ChangeObjectAction extends ChangeMembersAction implements IChangeObjectAction {
-            static typeName: string;
-            container: ActionActivity;
-            changeVariableName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface IMemberChange extends elements.IElement {
-            container: IChangeMembersAction;
-            load(): MemberChange;
-            load(callback: (element: MemberChange) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class MemberChange extends elements.Element implements IMemberChange {
-            static typeName: string;
-            container: ChangeMembersAction;
-            attribute: domainmodels.IAttribute;
-            attributeQualifiedName: string;
-            association: domainmodels.IAssociationBase;
-            associationQualifiedName: string;
-            type: ChangeActionItemType;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            value: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Change+List relevant section in reference guide}
-         */
-        interface IChangeListAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): ChangeListAction;
-            load(callback: (element: ChangeListAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Change+List relevant section in reference guide}
-         */
-        class ChangeListAction extends MicroflowAction implements IChangeListAction {
-            static typeName: string;
-            container: ActionActivity;
-            changeVariableName: string;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            value: string;
-            type: ChangeListActionType;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Change+Variable relevant section in reference guide}
-         */
-        interface IChangeVariableAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): ChangeVariableAction;
-            load(callback: (element: ChangeVariableAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Change+Variable relevant section in reference guide}
-         */
-        class ChangeVariableAction extends MicroflowAction implements IChangeVariableAction {
-            static typeName: string;
-            container: ActionActivity;
-            changeVariableName: string;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            value: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Commit+Object(s) relevant section in reference guide}
-         */
-        interface ICommitAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): CommitAction;
-            load(callback: (element: CommitAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Commit+Object(s) relevant section in reference guide}
-         */
-        class CommitAction extends MicroflowAction implements ICommitAction {
-            static typeName: string;
-            container: ActionActivity;
-            withEvents: boolean;
-            commitVariableName: string;
-            refreshInClient: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO: also described in ImporrtXmlAction and CallWebServiceAction
-         */
-        interface IRange extends elements.IElement {
-            load(): Range;
-            load(callback: (element: Range) => void): any;
-        }
-        /**
-         * TODO: also described in ImporrtXmlAction and CallWebServiceAction
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Range extends elements.Element implements IRange {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        /**
-         * TODO: also described in ImporrtXmlAction and CallWebServiceAction
-         */
-        interface IConstantRange extends IRange {
-            load(): ConstantRange;
-            load(callback: (element: ConstantRange) => void): any;
-        }
-        /**
-         * TODO: also described in ImporrtXmlAction and CallWebServiceAction
-         */
-        class ConstantRange extends Range implements IConstantRange {
-            static typeName: string;
-            singleObject: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IContains extends IBinaryListOperation {
-            container: IListOperationAction;
-            load(): Contains;
-            load(callback: (element: Contains) => void): any;
-        }
-        class Contains extends BinaryListOperation implements IContains {
-            static typeName: string;
-            container: ListOperationAction;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Continue+Event relevant section in reference guide}
-         */
-        interface IContinueEvent extends IMicroflowObject {
-            container: IMicroflowObjectCollection;
-            load(): ContinueEvent;
-            load(callback: (element: ContinueEvent) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Continue+Event relevant section in reference guide}
-         */
-        class ContinueEvent extends MicroflowObject implements IContinueEvent {
-            static typeName: string;
-            container: MicroflowObjectCollection;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Persistent+Create+Object relevant section in reference guide}
-         */
-        interface IDeprecatedCreateAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): DeprecatedCreateAction;
-            load(callback: (element: DeprecatedCreateAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Persistent+Create+Object relevant section in reference guide}
-         */
-        class DeprecatedCreateAction extends MicroflowAction implements IDeprecatedCreateAction {
-            static typeName: string;
-            container: ActionActivity;
-            entity: domainmodels.IEntity;
-            entityQualifiedName: string;
-            refreshInClient: boolean;
-            outputVariableName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Create+Object relevant section in reference guide}
-         */
-        interface ICreateObjectAction extends IChangeMembersAction {
-            container: IActionActivity;
-            load(): CreateObjectAction;
-            load(callback: (element: CreateObjectAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Create+Object relevant section in reference guide}
-         */
-        class CreateObjectAction extends ChangeMembersAction implements ICreateObjectAction {
-            static typeName: string;
-            container: ActionActivity;
-            entity: domainmodels.IEntity;
-            entityQualifiedName: string;
-            outputVariableName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Create+List relevant section in reference guide}
-         */
-        interface ICreateListAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): CreateListAction;
-            load(callback: (element: CreateListAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Create+List relevant section in reference guide}
-         */
-        class CreateListAction extends MicroflowAction implements ICreateListAction {
-            static typeName: string;
-            container: ActionActivity;
-            entity: domainmodels.IEntity;
-            entityQualifiedName: string;
-            outputVariableName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Create+Variable relevant section in reference guide}
-         */
-        interface ICreateVariableAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): CreateVariableAction;
-            load(callback: (element: CreateVariableAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Create+Variable relevant section in reference guide}
-         */
-        class CreateVariableAction extends MicroflowAction implements ICreateVariableAction {
-            static typeName: string;
-            container: ActionActivity;
-            variableName: string;
-            /**
-             * The value of this property is conceptually of type Common$DataType.
-             */
-            variableDataType: string;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            initialValue: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO: also described in ImporrtXmlAction and CallWebServiceAction
-         */
-        interface ICustomRange extends IRange {
-            load(): CustomRange;
-            load(callback: (element: CustomRange) => void): any;
-        }
-        /**
-         * TODO: also described in ImporrtXmlAction and CallWebServiceAction
-         */
-        class CustomRange extends Range implements ICustomRange {
-            static typeName: string;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            limitExpression: string;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            offsetExpression: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface IDatabaseRetrieveSource extends IRetrieveSource {
-            container: IRetrieveAction;
-            load(): DatabaseRetrieveSource;
-            load(callback: (element: DatabaseRetrieveSource) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class DatabaseRetrieveSource extends RetrieveSource implements IDatabaseRetrieveSource {
-            static typeName: string;
-            container: RetrieveAction;
-            entity: domainmodels.IEntity;
-            entityQualifiedName: string;
-            range: Range;
-            /**
-             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
-             */
-            xPathConstraint: string;
-            sortItemList: SortItemList;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Delete+Object(s) relevant section in reference guide}
-         */
-        interface IDeleteAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): DeleteAction;
-            load(callback: (element: DeleteAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Delete+Object(s) relevant section in reference guide}
-         */
-        class DeleteAction extends MicroflowAction implements IDeleteAction {
-            static typeName: string;
-            container: ActionActivity;
-            deleteVariableName: string;
-            refreshInClient: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/End+Event relevant section in reference guide}
-         */
-        interface IEndEvent extends IMicroflowObject {
-            container: IMicroflowObjectCollection;
-            load(): EndEvent;
-            load(callback: (element: EndEvent) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/End+Event relevant section in reference guide}
-         */
-        class EndEvent extends MicroflowObject implements IEndEvent {
-            static typeName: string;
-            container: MicroflowObjectCollection;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            returnValue: string;
-            documentation: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface IEnumerationCase extends ICaseValue {
-            container: ISequenceFlow;
-            load(): EnumerationCase;
-            load(callback: (element: EnumerationCase) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class EnumerationCase extends CaseValue implements IEnumerationCase {
-            static typeName: string;
-            container: SequenceFlow;
-            value: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IListEquals extends IBinaryListOperation {
-            container: IListOperationAction;
-            load(): ListEquals;
-            load(callback: (element: ListEquals) => void): any;
-        }
-        class ListEquals extends BinaryListOperation implements IListEquals {
-            static typeName: string;
-            container: ListOperationAction;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Error+Event relevant section in reference guide}
-         */
-        interface IErrorEvent extends IMicroflowObject {
-            container: IMicroflowObjectCollection;
-            load(): ErrorEvent;
-            load(callback: (element: ErrorEvent) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Error+Event relevant section in reference guide}
-         */
-        class ErrorEvent extends MicroflowObject implements IErrorEvent {
-            static typeName: string;
-            container: MicroflowObjectCollection;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Merge relevant section in reference guide}
-         */
-        interface IExclusiveMerge extends IMicroflowObject {
-            container: IMicroflowObjectCollection;
-            load(): ExclusiveMerge;
-            load(callback: (element: ExclusiveMerge) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Merge relevant section in reference guide}
-         */
-        class ExclusiveMerge extends MicroflowObject implements IExclusiveMerge {
-            static typeName: string;
-            container: MicroflowObjectCollection;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Exclusive+Split relevant section in reference guide}
-         */
-        interface IExclusiveSplit extends IMicroflowObject {
-            container: IMicroflowObjectCollection;
-            load(): ExclusiveSplit;
-            load(callback: (element: ExclusiveSplit) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Exclusive+Split relevant section in reference guide}
-         */
-        class ExclusiveSplit extends MicroflowObject implements IExclusiveSplit {
-            static typeName: string;
-            container: MicroflowObjectCollection;
-            splitCondition: SplitCondition;
-            caption: string;
-            errorHandlingType: ErrorHandlingType;
-            documentation: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO : Abstract
-         */
-        interface ISplitCondition extends elements.IElement {
-            container: IExclusiveSplit;
-            load(): SplitCondition;
-            load(callback: (element: SplitCondition) => void): any;
-        }
-        /**
-         * TODO : Abstract
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class SplitCondition extends elements.Element implements ISplitCondition {
-            static typeName: string;
-            container: ExclusiveSplit;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IExpressionSplitCondition extends ISplitCondition {
-            container: IExclusiveSplit;
-            load(): ExpressionSplitCondition;
-            load(callback: (element: ExpressionSplitCondition) => void): any;
-        }
-        class ExpressionSplitCondition extends SplitCondition implements IExpressionSplitCondition {
-            static typeName: string;
-            container: ExclusiveSplit;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            expression: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IInspectAttribute extends IListOperation {
-            container: IListOperationAction;
-            load(): InspectAttribute;
-            load(callback: (element: InspectAttribute) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class InspectAttribute extends ListOperation implements IInspectAttribute {
-            static typeName: string;
-            container: ListOperationAction;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            expression: string;
-            attribute: domainmodels.IAttribute;
-            attributeQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IFilter extends IInspectAttribute {
-            container: IListOperationAction;
-            load(): Filter;
-            load(callback: (element: Filter) => void): any;
-        }
-        class Filter extends InspectAttribute implements IFilter {
-            static typeName: string;
-            container: ListOperationAction;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IFind extends IInspectAttribute {
-            container: IListOperationAction;
-            load(): Find;
-            load(callback: (element: Find) => void): any;
-        }
-        class Find extends InspectAttribute implements IFind {
-            static typeName: string;
-            container: ListOperationAction;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IHead extends IListOperation {
-            container: IListOperationAction;
-            load(): Head;
-            load(callback: (element: Head) => void): any;
-        }
-        class Head extends ListOperation implements IHead {
-            static typeName: string;
-            container: ListOperationAction;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface IInheritanceCase extends ICaseValue {
-            container: ISequenceFlow;
-            load(): InheritanceCase;
-            load(callback: (element: InheritanceCase) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class InheritanceCase extends CaseValue implements IInheritanceCase {
-            static typeName: string;
-            container: SequenceFlow;
-            value: domainmodels.IEntity;
-            valueQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Inheritance+Split relevant section in reference guide}
-         */
-        interface IInheritanceSplit extends IMicroflowObject {
-            container: IMicroflowObjectCollection;
-            load(): InheritanceSplit;
-            load(callback: (element: InheritanceSplit) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Inheritance+Split relevant section in reference guide}
-         */
-        class InheritanceSplit extends MicroflowObject implements IInheritanceSplit {
-            static typeName: string;
-            container: MicroflowObjectCollection;
-            splitVariableName: string;
-            caption: string;
-            documentation: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IIntersect extends IBinaryListOperation {
-            container: IListOperationAction;
-            load(): Intersect;
-            load(callback: (element: Intersect) => void): any;
-        }
-        class Intersect extends BinaryListOperation implements IIntersect {
-            static typeName: string;
-            container: ListOperationAction;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Java+Action+Call relevant section in reference guide}
-         */
-        interface IJavaActionCallAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): JavaActionCallAction;
-            load(callback: (element: JavaActionCallAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Java+Action+Call relevant section in reference guide}
-         */
-        class JavaActionCallAction extends MicroflowAction implements IJavaActionCallAction {
-            static typeName: string;
-            container: ActionActivity;
-            javaAction: javaactions.IJavaAction;
-            javaActionQualifiedName: string;
-            parameterMappings: instances.IList<JavaActionParameterMapping>;
-            outputVariableName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IJavaActionParameterMapping extends elements.IElement {
-            container: IJavaActionCallAction;
-            load(): JavaActionParameterMapping;
-            load(callback: (element: JavaActionParameterMapping) => void): any;
-        }
-        class JavaActionParameterMapping extends elements.Element implements IJavaActionParameterMapping {
-            static typeName: string;
-            container: JavaActionCallAction;
-            parameter: javaactions.IJavaActionParameter;
-            parameterQualifiedName: string;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            argument: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/List+Operation relevant section in reference guide}
-         */
-        interface IListOperationAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): ListOperationAction;
-            load(callback: (element: ListOperationAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/List+Operation relevant section in reference guide}
-         */
-        class ListOperationAction extends MicroflowAction implements IListOperationAction {
-            static typeName: string;
-            container: ActionActivity;
-            operation: ListOperation;
-            outputVariableName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Log+Message relevant section in reference guide}
-         */
-        interface ILogMessageAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): LogMessageAction;
-            load(callback: (element: LogMessageAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Log+Message relevant section in reference guide}
-         */
-        class LogMessageAction extends MicroflowAction implements ILogMessageAction {
-            static typeName: string;
-            container: ActionActivity;
-            level: LogLevel;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            node: string;
-            messageTemplate: StringTemplate;
-            includeLatestStackTrace: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Loop relevant section in reference guide}
-         */
-        interface ILoopedActivity extends IActivity {
-            container: IMicroflowObjectCollection;
-            load(): LoopedActivity;
-            load(callback: (element: LoopedActivity) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Loop relevant section in reference guide}
-         */
-        class LoopedActivity extends Activity implements ILoopedActivity {
-            static typeName: string;
-            container: MicroflowObjectCollection;
-            objectCollection: MicroflowObjectCollection;
-            iteratedListVariableName: string;
-            loopVariableName: string;
-            errorHandlingType: ErrorHandlingType;
-            documentation: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IModuleDocument extends units.IModelUnit {
-            container: projects.IFolderBase;
-            load(): ModuleDocument;
-            load(callback: (element: ModuleDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDocument extends projects.IModuleDocument {
-            container: projects.IFolderBase;
-            load(): Document;
-            load(callback: (element: Document) => void): any;
-            name: string;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Document extends projects.ModuleDocument implements IDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            name: string;
-            documentation: string;
-            excluded: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO: Abstract
-         */
-        interface IMicroflowBase extends projects.IDocument {
-            container: projects.IFolderBase;
-            load(): MicroflowBase;
-            load(callback: (element: MicroflowBase) => void): any;
-            /**
-             * The value of this property is conceptually of type Common$DataType.
-             */
-            returnType: string;
-        }
-        /**
-         * TODO: Abstract
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class MicroflowBase extends projects.Document implements IMicroflowBase {
-            static typeName: string;
-            container: projects.FolderBase;
-            objectCollection: MicroflowObjectCollection;
-            flows: instances.IList<Flow>;
-            /**
-             * The value of this property is conceptually of type Common$DataType.
-             */
-            returnType: string;
-            applyEntityAccess: boolean;
-            markAsUsed: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Microflows relevant section in reference guide}
-         */
-        interface IMicroflow extends IMicroflowBase {
-            container: projects.IFolderBase;
-            load(): Microflow;
-            load(callback: (element: Microflow) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Microflows relevant section in reference guide}
-         */
-        class Microflow extends MicroflowBase implements IMicroflow {
-            static typeName: string;
-            container: projects.FolderBase;
-            allowedModuleRoles: instances.IList<security.IModuleRole>;
-            allowedModuleRolesQualifiedNames: string[];
-            allowConcurrentExecution: boolean;
-            concurrenyErrorMessage: texts.Text;
-            concurrencyErrorMicroflow: IMicroflow;
-            concurrencyErrorMicroflowQualifiedName: string;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMicroflowCall extends elements.IElement {
-            container: IMicroflowCallAction;
-            load(): MicroflowCall;
-            load(callback: (element: MicroflowCall) => void): any;
-        }
-        class MicroflowCall extends elements.Element implements IMicroflowCall {
-            static typeName: string;
-            container: MicroflowCallAction;
-            microflow: IMicroflow;
-            microflowQualifiedName: string;
-            parameterMappings: instances.IList<MicroflowCallParameterMapping>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Microflow+Call relevant section in reference guide}
-         */
-        interface IMicroflowCallAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): MicroflowCallAction;
-            load(callback: (element: MicroflowCallAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Microflow+Call relevant section in reference guide}
-         */
-        class MicroflowCallAction extends MicroflowAction implements IMicroflowCallAction {
-            static typeName: string;
-            container: ActionActivity;
-            microflowCall: MicroflowCall;
-            useReturnVariable: boolean;
-            outputVariableName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMicroflowCallParameterMapping extends elements.IElement {
-            container: IMicroflowCall;
-            load(): MicroflowCallParameterMapping;
-            load(callback: (element: MicroflowCallParameterMapping) => void): any;
-        }
-        class MicroflowCallParameterMapping extends elements.Element implements IMicroflowCallParameterMapping {
-            static typeName: string;
-            container: MicroflowCall;
-            parameter: IMicroflowParameter;
-            parameterQualifiedName: string;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            argument: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO: artificial object
-         */
-        interface IMicroflowObjectCollection extends elements.IElement {
-            load(): MicroflowObjectCollection;
-            load(callback: (element: MicroflowObjectCollection) => void): any;
-        }
-        /**
-         * TODO: artificial object
-         */
-        class MicroflowObjectCollection extends elements.Element implements IMicroflowObjectCollection {
-            static typeName: string;
-            objects: instances.IList<MicroflowObject>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMicroflowParameterBase extends elements.IElement {
-            container: IMicroflowBase;
-            load(): MicroflowParameterBase;
-            load(callback: (element: MicroflowParameterBase) => void): any;
-            name: string;
-            /**
-             * The value of this property is conceptually of type Common$DataType.
-             */
-            type: string;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class MicroflowParameterBase extends elements.Element implements IMicroflowParameterBase {
-            static typeName: string;
-            container: MicroflowBase;
-            name: string;
-            /**
-             * The value of this property is conceptually of type Common$DataType.
-             */
-            type: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Parameter relevant section in reference guide}
-         */
-        interface IMicroflowParameter extends IMicroflowParameterBase {
-            container: IMicroflow;
-            load(): MicroflowParameter;
-            load(callback: (element: MicroflowParameter) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Parameter relevant section in reference guide}
-         */
-        class MicroflowParameter extends MicroflowParameterBase implements IMicroflowParameter {
-            static typeName: string;
-            container: Microflow;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Parameter relevant section in reference guide}
-         */
-        interface IRuleParameter extends IMicroflowParameterBase {
-            container: IRule;
-            load(): RuleParameter;
-            load(callback: (element: RuleParameter) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Parameter relevant section in reference guide}
-         */
-        class RuleParameter extends MicroflowParameterBase implements IRuleParameter {
-            static typeName: string;
-            container: Rule;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMicroflowParameterObject extends IMicroflowObject {
-            container: IMicroflowObjectCollection;
-            load(): MicroflowParameterObject;
-            load(callback: (element: MicroflowParameterObject) => void): any;
-        }
-        class MicroflowParameterObject extends MicroflowObject implements IMicroflowParameterObject {
-            static typeName: string;
-            container: MicroflowObjectCollection;
-            name: string;
-            /**
-             * The value of this property is conceptually of type Common$DataType.
-             */
-            type: string;
-            documentation: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface INoCase extends ICaseValue {
-            container: ISequenceFlow;
-            load(): NoCase;
-            load(callback: (element: NoCase) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class NoCase extends CaseValue implements INoCase {
-            static typeName: string;
-            container: SequenceFlow;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Retrieve relevant section in reference guide}
-         */
-        interface IRetrieveAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): RetrieveAction;
-            load(callback: (element: RetrieveAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Retrieve relevant section in reference guide}
-         */
-        class RetrieveAction extends MicroflowAction implements IRetrieveAction {
-            static typeName: string;
-            container: ActionActivity;
-            retrieveSource: RetrieveSource;
-            outputVariableName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Rollback+Object relevant section in reference guide}
-         */
-        interface IRollbackAction extends IMicroflowAction {
-            container: IActionActivity;
-            load(): RollbackAction;
-            load(callback: (element: RollbackAction) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Rollback+Object relevant section in reference guide}
-         */
-        class RollbackAction extends MicroflowAction implements IRollbackAction {
-            static typeName: string;
-            container: ActionActivity;
-            rollbackVariableName: string;
-            refreshInClient: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Rules relevant section in reference guide}
-         */
-        interface IRule extends IMicroflowBase {
-            container: projects.IFolderBase;
-            load(): Rule;
-            load(callback: (element: Rule) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Rules relevant section in reference guide}
-         */
-        class Rule extends MicroflowBase implements IRule {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface IRuleCall extends elements.IElement {
-            container: IRuleSplitCondition;
-            load(): RuleCall;
-            load(callback: (element: RuleCall) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class RuleCall extends elements.Element implements IRuleCall {
-            static typeName: string;
-            container: RuleSplitCondition;
-            rule: IRule;
-            ruleQualifiedName: string;
-            parameterMappings: instances.IList<RuleCallParameterMapping>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface IRuleCallParameterMapping extends elements.IElement {
-            container: IRuleCall;
-            load(): RuleCallParameterMapping;
-            load(callback: (element: RuleCallParameterMapping) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class RuleCallParameterMapping extends elements.Element implements IRuleCallParameterMapping {
-            static typeName: string;
-            container: RuleCall;
-            parameter: IRuleParameter;
-            parameterQualifiedName: string;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            argument: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IRuleSplitCondition extends ISplitCondition {
-            container: IExclusiveSplit;
-            load(): RuleSplitCondition;
-            load(callback: (element: RuleSplitCondition) => void): any;
-        }
-        class RuleSplitCondition extends SplitCondition implements IRuleSplitCondition {
-            static typeName: string;
-            container: ExclusiveSplit;
-            ruleCall: RuleCall;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Sequence+Flow relevant section in reference guide}
-         */
-        interface ISequenceFlow extends IFlow {
-            container: IMicroflowBase;
-            load(): SequenceFlow;
-            load(callback: (element: SequenceFlow) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Sequence+Flow relevant section in reference guide}
-         */
-        class SequenceFlow extends Flow implements ISequenceFlow {
-            static typeName: string;
-            container: MicroflowBase;
-            caseValue: CaseValue;
-            isErrorHandler: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ISort extends IListOperation {
-            container: IListOperationAction;
-            load(): Sort;
-            load(callback: (element: Sort) => void): any;
-        }
-        class Sort extends ListOperation implements ISort {
-            static typeName: string;
-            container: ListOperationAction;
-            sortItemList: SortItemList;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface ISortItem extends elements.IElement {
-            container: ISortItemList;
-            load(): SortItem;
-            load(callback: (element: SortItem) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class SortItem extends elements.Element implements ISortItem {
-            static typeName: string;
-            container: SortItemList;
-            /**
-             * The value of this property is conceptually of type Paths$AttributePath.
-             */
-            attributePath: string;
-            sortOrder: SortOrderEnum;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface ISortItemList extends elements.IElement {
-            load(): SortItemList;
-            load(callback: (element: SortItemList) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class SortItemList extends elements.Element implements ISortItemList {
-            static typeName: string;
-            items: instances.IList<SortItem>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Start+Event relevant section in reference guide}
-         */
-        interface IStartEvent extends IMicroflowObject {
-            container: IMicroflowObjectCollection;
-            load(): StartEvent;
-            load(callback: (element: StartEvent) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Start+Event relevant section in reference guide}
-         */
-        class StartEvent extends MicroflowObject implements IStartEvent {
-            static typeName: string;
-            container: MicroflowObjectCollection;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ITemplate extends elements.IElement {
-            load(): Template;
-            load(callback: (element: Template) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Template extends elements.Element implements ITemplate {
-            static typeName: string;
-            arguments: instances.IList<TemplateArgument>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface IStringTemplate extends ITemplate {
-            load(): StringTemplate;
-            load(callback: (element: StringTemplate) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class StringTemplate extends Template implements IStringTemplate {
-            static typeName: string;
-            text: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ISubtract extends IBinaryListOperation {
-            container: IListOperationAction;
-            load(): Subtract;
-            load(callback: (element: Subtract) => void): any;
-        }
-        class Subtract extends BinaryListOperation implements ISubtract {
-            static typeName: string;
-            container: ListOperationAction;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ITail extends IListOperation {
-            container: IListOperationAction;
-            load(): Tail;
-            load(callback: (element: Tail) => void): any;
-        }
-        class Tail extends ListOperation implements ITail {
-            static typeName: string;
-            container: ListOperationAction;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface ITemplateArgument extends elements.IElement {
-            container: ITemplate;
-            load(): TemplateArgument;
-            load(callback: (element: TemplateArgument) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class TemplateArgument extends elements.Element implements ITemplateArgument {
-            static typeName: string;
-            container: Template;
-            /**
-             * The value of this property is conceptually of type MicroflowExpressions$MicroflowExpression.
-             */
-            expression: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * TODO
-         */
-        interface ITextTemplate extends ITemplate {
-            load(): TextTemplate;
-            load(callback: (element: TextTemplate) => void): any;
-        }
-        /**
-         * TODO
-         */
-        class TextTemplate extends Template implements ITextTemplate {
-            static typeName: string;
-            text: texts.Text;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IUnion extends IBinaryListOperation {
-            container: IListOperationAction;
-            load(): Union;
-            load(callback: (element: Union) => void): any;
-        }
-        class Union extends BinaryListOperation implements IUnion {
-            static typeName: string;
-            container: ListOperationAction;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        class NullValueOption extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static SendAsNil: NullValueOption;
-            static LeaveOutElement: NullValueOption;
-        }
-        class LanguageSettingType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static CurrentUser: LanguageSettingType;
-            static ProjectDefault: LanguageSettingType;
-            static Variable: LanguageSettingType;
-        }
-        class TargetDocumentType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static HTML: TargetDocumentType;
-            static PDF: TargetDocumentType;
-            static DOCX: TargetDocumentType;
-            static DOC: TargetDocumentType;
-            static RTF: TargetDocumentType;
-            static ODT: TargetDocumentType;
-        }
-        class ShowMessageType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Information: ShowMessageType;
-            static Warning: ShowMessageType;
-            static Error: ShowMessageType;
-        }
-        class ActionActivityColor extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Default: ActionActivityColor;
-            static Red: ActionActivityColor;
-            static Orange: ActionActivityColor;
-            static Yellow: ActionActivityColor;
-            static Green: ActionActivityColor;
-            static Blue: ActionActivityColor;
-            static Purple: ActionActivityColor;
-            static Gray: ActionActivityColor;
-        }
-        class AggregateFunctionEnum extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Sum: AggregateFunctionEnum;
-            static Average: AggregateFunctionEnum;
-            static Count: AggregateFunctionEnum;
-            static Minimum: AggregateFunctionEnum;
-            static Maximum: AggregateFunctionEnum;
-        }
-        class ChangeActionItemType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Set: ChangeActionItemType;
-            static Add: ChangeActionItemType;
-            static Remove: ChangeActionItemType;
-        }
-        class ChangeListActionType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Set: ChangeListActionType;
-            static Add: ChangeListActionType;
-            static Remove: ChangeListActionType;
-            static Clear: ChangeListActionType;
-        }
-        class CommitEnum extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Yes: CommitEnum;
-            static YesWithoutEvents: CommitEnum;
-            static No: CommitEnum;
-        }
-        class ErrorHandlingType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Rollback: ErrorHandlingType;
-            static Custom: ErrorHandlingType;
-            static CustomWithoutRollBack: ErrorHandlingType;
-            static Continue: ErrorHandlingType;
-        }
-        class LogLevel extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Trace: LogLevel;
-            static Debug: LogLevel;
-            static Info: LogLevel;
-            static Warning: LogLevel;
-            static Error: LogLevel;
-            static Critical: LogLevel;
-        }
-        class SortOrderEnum extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Ascending: SortOrderEnum;
-            static Descending: SortOrderEnum;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `WebServices`.
-     */
-    namespace webservices {
-        interface IDataMember extends elements.IElement {
-            load(): DataMember;
-            load(callback: (element: DataMember) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class DataMember extends elements.Element implements IDataMember {
-            static typeName: string;
-            isLockedByContract: boolean;
-            exposedName: string;
-            isOptionalByContract: boolean;
-            isOptional: boolean;
-            isNillableByContract: boolean;
-            isNillable: boolean;
-            isKey: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IDataEntityBase extends IDataMember {
-            load(): DataEntityBase;
-            load(callback: (element: DataEntityBase) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class DataEntityBase extends DataMember implements IDataEntityBase {
-            static typeName: string;
-            childMembers: instances.IList<DataMember>;
-            entity: domainmodels.IEntity;
-            entityQualifiedName: string;
-            exposedItemName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IDataAssociation extends IDataEntityBase {
-            container: IDataEntityBase;
-            load(): DataAssociation;
-            load(callback: (element: DataAssociation) => void): any;
-        }
-        class DataAssociation extends DataEntityBase implements IDataAssociation {
-            static typeName: string;
-            container: DataEntityBase;
-            associationByContract: appservices.MsdAssociation;
-            association: domainmodels.IAssociationBase;
-            associationQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IDataAttribute extends IDataMember {
-            container: IDataEntityBase;
-            load(): DataAttribute;
-            load(callback: (element: DataAttribute) => void): any;
-        }
-        class DataAttribute extends DataMember implements IDataAttribute {
-            static typeName: string;
-            container: DataEntityBase;
-            attributeByContract: appservices.MsdAttribute;
-            attribute: domainmodels.IAttribute;
-            attributeQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IDataEntity extends IDataEntityBase {
-            load(): DataEntity;
-            load(callback: (element: DataEntity) => void): any;
-        }
-        class DataEntity extends DataEntityBase implements IDataEntity {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IModuleDocument extends units.IModelUnit {
-            container: projects.IFolderBase;
-            load(): ModuleDocument;
-            load(callback: (element: ModuleDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDocument extends projects.IModuleDocument {
-            container: projects.IFolderBase;
-            load(): Document;
-            load(callback: (element: Document) => void): any;
-            name: string;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Document extends projects.ModuleDocument implements IDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            name: string;
-            documentation: string;
-            excluded: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Imported+Web+Services relevant section in reference guide}
-         */
-        interface IImportedWebService extends projects.IDocument {
-            container: projects.IFolderBase;
-            load(): ImportedWebService;
-            load(callback: (element: ImportedWebService) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Imported+Web+Services relevant section in reference guide}
-         */
-        class ImportedWebService extends projects.Document implements IImportedWebService {
-            static typeName: string;
-            container: projects.FolderBase;
-            wsdlDescription: WsdlDescription;
-            wsdlUrl: string;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IOperationInfo extends elements.IElement {
-            container: IServiceInfo;
-            load(): OperationInfo;
-            load(callback: (element: OperationInfo) => void): any;
-        }
-        class OperationInfo extends elements.Element implements IOperationInfo {
-            static typeName: string;
-            container: ServiceInfo;
-            requestHeaderRpcElement: RpcOperationElement;
-            requestBodyRpcElement: RpcOperationElement;
-            responseBodyRpcElement: RpcOperationElement;
-            requestHeaderPartEncoding: PartEncoding;
-            requestBodyPartEncodings: instances.IList<PartEncoding>;
-            name: string;
-            documentation: string;
-            soapAction: string;
-            requestHeaderElementName: string;
-            requestHeaderEncoded: boolean;
-            requestBodyEncoded: boolean;
-            requestBodyElementName: string;
-            responseBodyElementName: string;
-            allowSimpleMappingInheritance: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IPartEncoding extends elements.IElement {
-            container: IOperationInfo;
-            load(): PartEncoding;
-            load(callback: (element: PartEncoding) => void): any;
-        }
-        class PartEncoding extends elements.Element implements IPartEncoding {
-            static typeName: string;
-            container: OperationInfo;
-            partName: string;
-            partXsdType: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IPublishedServiceBase extends projects.IDocument {
-            container: projects.IFolderBase;
-            load(): PublishedServiceBase;
-            load(callback: (element: PublishedServiceBase) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class PublishedServiceBase extends projects.Document implements IPublishedServiceBase {
-            static typeName: string;
-            container: projects.FolderBase;
-            versionedServices: instances.IList<VersionedService>;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Published+App+Services relevant section in reference guide}
-         */
-        interface IPublishedAppService extends IPublishedServiceBase {
-            container: projects.IFolderBase;
-            load(): PublishedAppService;
-            load(callback: (element: PublishedAppService) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Published+App+Services relevant section in reference guide}
-         */
-        class PublishedAppService extends PublishedServiceBase implements IPublishedAppService {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IPublishedOperation extends elements.IElement {
-            container: IVersionedService;
-            load(): PublishedOperation;
-            load(callback: (element: PublishedOperation) => void): any;
-        }
-        class PublishedOperation extends elements.Element implements IPublishedOperation {
-            static typeName: string;
-            container: VersionedService;
-            parameters: instances.IList<PublishedParameter>;
-            dataEntity: DataEntity;
-            isLockedByContract: boolean;
-            name: string;
-            image: images.IImage;
-            imageQualifiedName: string;
-            description: string;
-            documentation: string;
-            microflow: microflows.IMicroflow;
-            microflowQualifiedName: string;
-            returnTypeNameByContract: string;
-            returnTypeSpecificationByContract: string;
-            entityExposedNameByContract: string;
-            entityExposedName: string;
-            returnTypeIsOptional: boolean;
-            returnTypeIsNillable: boolean;
-            returnType: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IPublishedParameter extends elements.IElement {
-            container: IPublishedOperation;
-            load(): PublishedParameter;
-            load(callback: (element: PublishedParameter) => void): any;
-        }
-        class PublishedParameter extends elements.Element implements IPublishedParameter {
-            static typeName: string;
-            container: PublishedOperation;
-            parameterByContract: appservices.MsdMicroflowParameter;
-            dataEntity: DataEntity;
-            isLockedByContract: boolean;
-            parameter: microflows.IMicroflowParameter;
-            parameterQualifiedName: string;
-            entityExposedName: string;
-            isOptionalByContract: boolean;
-            isOptional: boolean;
-            isNillable: boolean;
-            entityExposedItemNameByContract: string;
-            entityExposedItemName: string;
-            type: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Published+Web+Services relevant section in reference guide}
-         */
-        interface IPublishedWebService extends IPublishedServiceBase {
-            container: projects.IFolderBase;
-            load(): PublishedWebService;
-            load(callback: (element: PublishedWebService) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Published+Web+Services relevant section in reference guide}
-         */
-        class PublishedWebService extends PublishedServiceBase implements IPublishedWebService {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IRpcMessagePartElement extends elements.IElement {
-            container: IRpcOperationElement;
-            load(): RpcMessagePartElement;
-            load(callback: (element: RpcMessagePartElement) => void): any;
-        }
-        class RpcMessagePartElement extends elements.Element implements IRpcMessagePartElement {
-            static typeName: string;
-            container: RpcOperationElement;
-            partName: string;
-            typeName: string;
-            elementName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IRpcOperationElement extends elements.IElement {
-            container: IOperationInfo;
-            load(): RpcOperationElement;
-            load(callback: (element: RpcOperationElement) => void): any;
-        }
-        class RpcOperationElement extends elements.Element implements IRpcOperationElement {
-            static typeName: string;
-            container: OperationInfo;
-            messagePartElements: instances.IList<RpcMessagePartElement>;
-            name: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IServiceInfo extends elements.IElement {
-            container: IWsdlDescription;
-            load(): ServiceInfo;
-            load(callback: (element: ServiceInfo) => void): any;
-        }
-        class ServiceInfo extends elements.Element implements IServiceInfo {
-            static typeName: string;
-            container: WsdlDescription;
-            operations: instances.IList<OperationInfo>;
-            name: string;
-            documentation: string;
-            portName: string;
-            location: string;
-            soapVersion: SoapVersion;
-            locationConstant: constants.IConstant;
-            locationConstantQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Published+Web+Services relevant section in reference guide}
-         */
-        interface IVersionedService extends elements.IElement {
-            container: IPublishedServiceBase;
-            load(): VersionedService;
-            load(callback: (element: VersionedService) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Published+Web+Services relevant section in reference guide}
-         */
-        class VersionedService extends elements.Element implements IVersionedService {
-            static typeName: string;
-            container: PublishedServiceBase;
-            operations: instances.IList<PublishedOperation>;
-            enumerationsByContract: appservices.MsdEnumerationContainer;
-            documentation: string;
-            targetNamespace: string;
-            headerAuthentication: integration.HeaderAuthentication;
-            isLockedByContract: boolean;
-            headerImportMapping: importmappings.IImportMapping;
-            headerImportMappingQualifiedName: string;
-            headerMicroflow: microflows.IMicroflow;
-            headerMicroflowQualifiedName: string;
-            versionNumber: number;
-            caption: string;
-            description: string;
-            appServiceState: AppServiceState;
-            image: images.IImage;
-            imageQualifiedName: string;
-            validate: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IWsdlDescription extends elements.IElement {
-            load(): WsdlDescription;
-            load(callback: (element: WsdlDescription) => void): any;
-        }
-        class WsdlDescription extends elements.Element implements IWsdlDescription {
-            static typeName: string;
-            wsdlEntries: instances.IList<WsdlEntry>;
-            schemaEntries: instances.IList<xmlschemas.MxXmlSchemaEntry>;
-            services: instances.IList<ServiceInfo>;
-            targetNamespace: string;
-            importsHaveLocations: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IWsdlEntry extends elements.IElement {
-            container: IWsdlDescription;
-            load(): WsdlEntry;
-            load(callback: (element: WsdlEntry) => void): any;
-        }
-        class WsdlEntry extends elements.Element implements IWsdlEntry {
-            static typeName: string;
-            container: WsdlDescription;
-            location: string;
-            contents: string;
-            localizedLocationFormat: string;
-            localizedContentsFormat: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        class AppServiceState extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Draft: AppServiceState;
-            static Consumable: AppServiceState;
-            static Deprecated: AppServiceState;
-        }
-        class SoapVersion extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Soap11: SoapVersion;
-            static Soap12: SoapVersion;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import instances = internal.instances;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `Integration`.
-     */
-    namespace integration {
-        class AppServiceLocationEnum extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Default: AppServiceLocationEnum;
-            static Constant: AppServiceLocationEnum;
-            static Parameter: AppServiceLocationEnum;
-        }
-        class ElementType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Undefined: ElementType;
-            static Inheritance: ElementType;
-            static Choice: ElementType;
-            static Object: ElementType;
-            static Value: ElementType;
-            static Sequence: ElementType;
-            static All: ElementType;
-        }
-        class HeaderAuthentication extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static None: HeaderAuthentication;
-            static UsernamePassword: HeaderAuthentication;
-            static Custom: HeaderAuthentication;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `XmlSchemas`.
-     */
-    namespace xmlschemas {
-        interface IModuleDocument extends units.IModelUnit {
-            container: projects.IFolderBase;
-            load(): ModuleDocument;
-            load(callback: (element: ModuleDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDocument extends projects.IModuleDocument {
-            container: projects.IFolderBase;
-            load(): Document;
-            load(callback: (element: Document) => void): any;
-            name: string;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Document extends projects.ModuleDocument implements IDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            name: string;
-            documentation: string;
-            excluded: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/XML+Schemas relevant section in reference guide}
-         */
-        interface IMxXmlSchema extends projects.IDocument {
-            container: projects.IFolderBase;
-            load(): MxXmlSchema;
-            load(callback: (element: MxXmlSchema) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/XML+Schemas relevant section in reference guide}
-         */
-        class MxXmlSchema extends projects.Document implements IMxXmlSchema {
-            static typeName: string;
-            container: projects.FolderBase;
-            schemaEntries: instances.IList<MxXmlSchemaEntry>;
-            filePath: string;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMxXmlSchemaEntry extends elements.IElement {
-            load(): MxXmlSchemaEntry;
-            load(callback: (element: MxXmlSchemaEntry) => void): any;
-        }
-        class MxXmlSchemaEntry extends elements.Element implements IMxXmlSchemaEntry {
-            static typeName: string;
-            targetNamespace: string;
-            location: string;
-            contents: string;
-            localizedLocationFormat: string;
-            localizedContentsFormat: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        class XmlPrimitiveType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Unknown: XmlPrimitiveType;
-            static Boolean: XmlPrimitiveType;
-            static Date: XmlPrimitiveType;
-            static Time: XmlPrimitiveType;
-            static DateTime: XmlPrimitiveType;
-            static Decimal: XmlPrimitiveType;
-            static Float: XmlPrimitiveType;
-            static Integer: XmlPrimitiveType;
-            static Binary: XmlPrimitiveType;
-            static String: XmlPrimitiveType;
-            static AnyType: XmlPrimitiveType;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `AppServices`.
-     */
-    namespace appservices {
-        interface IAppServiceAction extends elements.IElement {
-            container: IConsumedAppService;
-            load(): AppServiceAction;
-            load(callback: (element: AppServiceAction) => void): any;
-            parameters: instances.IList<IAppServiceActionParameter>;
-            name: string;
-        }
-        class AppServiceAction extends elements.Element implements IAppServiceAction {
-            static typeName: string;
-            container: ConsumedAppService;
-            parameters: instances.IList<AppServiceActionParameter>;
-            microflow: microflows.IMicroflow;
-            microflowQualifiedName: string;
-            returnType: string;
-            returnTypeCanBeEmpty: boolean;
-            name: string;
-            imageString: string;
-            caption: string;
-            description: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IAppServiceActionParameter extends elements.IElement {
-            container: IAppServiceAction;
-            load(): AppServiceActionParameter;
-            load(callback: (element: AppServiceActionParameter) => void): any;
-            name: string;
-        }
-        class AppServiceActionParameter extends elements.Element implements IAppServiceActionParameter {
-            static typeName: string;
-            container: AppServiceAction;
-            name: string;
-            type: string;
-            canBeEmpty: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IModuleDocument extends units.IModelUnit {
-            container: projects.IFolderBase;
-            load(): ModuleDocument;
-            load(callback: (element: ModuleDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDocument extends projects.IModuleDocument {
-            container: projects.IFolderBase;
-            load(): Document;
-            load(callback: (element: Document) => void): any;
-            name: string;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Document extends projects.ModuleDocument implements IDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            name: string;
-            documentation: string;
-            excluded: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Consumed+App+Services relevant section in reference guide}
-         */
-        interface IConsumedAppService extends projects.IDocument {
-            container: projects.IFolderBase;
-            load(): ConsumedAppService;
-            load(callback: (element: ConsumedAppService) => void): any;
-            actions: instances.IList<IAppServiceAction>;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Consumed+App+Services relevant section in reference guide}
-         */
-        class ConsumedAppService extends projects.Document implements IConsumedAppService {
-            static typeName: string;
-            container: projects.FolderBase;
-            actions: instances.IList<AppServiceAction>;
-            msd: Msd;
-            fromAppStore: boolean;
-            appStoreGuid: string;
-            appStoreVersionGuid: string;
-            appStoreVersion: string;
-            appServiceLocation: integration.AppServiceLocationEnum;
-            locationConstant: constants.IConstant;
-            locationConstantQualifiedName: string;
-            useTimeOut: boolean;
-            timeOut: number;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMsd extends elements.IElement {
-            container: IConsumedAppService;
-            load(): Msd;
-            load(callback: (element: Msd) => void): any;
-        }
-        class Msd extends elements.Element implements IMsd {
-            static typeName: string;
-            container: ConsumedAppService;
-            version: MsdVersion;
-            metadata: MsdMetadata;
-            domainModel: MsdDomainModel;
-            enumerations: MsdEnumerationContainer;
-            wsdlDescription: webservices.WsdlDescription;
-            wsdlString: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMsdAssociation extends elements.IElement {
-            load(): MsdAssociation;
-            load(callback: (element: MsdAssociation) => void): any;
-        }
-        class MsdAssociation extends elements.Element implements IMsdAssociation {
-            static typeName: string;
-            name: string;
-            guid: string;
-            parentEntityName: string;
-            childEntityName: string;
-            associationType: string;
-            associationOwner: string;
-            parentDeleteBehavior: string;
-            childDeleteBehavior: string;
-            associationKind: string;
-            parentX: number;
-            parentY: number;
-            childX: number;
-            childY: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMsdAttribute extends elements.IElement {
-            load(): MsdAttribute;
-            load(callback: (element: MsdAttribute) => void): any;
-        }
-        class MsdAttribute extends elements.Element implements IMsdAttribute {
-            static typeName: string;
-            name: string;
-            guid: string;
-            attributeType: string;
-            enumerationName: string;
-            defaultValue: string;
-            length: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMsdDomainModel extends elements.IElement {
-            container: IMsd;
-            load(): MsdDomainModel;
-            load(callback: (element: MsdDomainModel) => void): any;
-        }
-        class MsdDomainModel extends elements.Element implements IMsdDomainModel {
-            static typeName: string;
-            container: Msd;
-            entities: instances.IList<MsdEntity>;
-            associations: instances.IList<MsdAssociation>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMsdEntity extends elements.IElement {
-            container: IMsdDomainModel;
-            load(): MsdEntity;
-            load(callback: (element: MsdEntity) => void): any;
-        }
-        class MsdEntity extends elements.Element implements IMsdEntity {
-            static typeName: string;
-            container: MsdDomainModel;
-            attributes: instances.IList<MsdAttribute>;
-            name: string;
-            guid: string;
-            generalizationName: string;
-            persistable: boolean;
-            locationX: number;
-            locationY: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMsdEnumeration extends elements.IElement {
-            container: IMsdEnumerationContainer;
-            load(): MsdEnumeration;
-            load(callback: (element: MsdEnumeration) => void): any;
-        }
-        class MsdEnumeration extends elements.Element implements IMsdEnumeration {
-            static typeName: string;
-            container: MsdEnumerationContainer;
-            values: instances.IList<MsdEnumerationValue>;
-            name: string;
-            guid: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMsdEnumerationContainer extends elements.IElement {
-            load(): MsdEnumerationContainer;
-            load(callback: (element: MsdEnumerationContainer) => void): any;
-        }
-        class MsdEnumerationContainer extends elements.Element implements IMsdEnumerationContainer {
-            static typeName: string;
-            msdEnumerations: instances.IList<MsdEnumeration>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMsdEnumerationValue extends elements.IElement {
-            container: IMsdEnumeration;
-            load(): MsdEnumerationValue;
-            load(callback: (element: MsdEnumerationValue) => void): any;
-        }
-        class MsdEnumerationValue extends elements.Element implements IMsdEnumerationValue {
-            static typeName: string;
-            container: MsdEnumeration;
-            translations: instances.IList<MsdText>;
-            name: string;
-            guid: string;
-            base64image: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMsdMetadata extends elements.IElement {
-            container: IMsd;
-            load(): MsdMetadata;
-            load(callback: (element: MsdMetadata) => void): any;
-        }
-        class MsdMetadata extends elements.Element implements IMsdMetadata {
-            static typeName: string;
-            container: Msd;
-            microflows: instances.IList<MsdMicroflow>;
-            name: string;
-            documentation: string;
-            version: number;
-            publishDateTime: string;
-            serviceGuid: string;
-            versionGuid: string;
-            instanceGuid: string;
-            supportedProtocols: instances.IList<string>;
-            headerAuthentication: string;
-            caption: string;
-            imageBase64: string;
-            description: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMsdMicroflow extends elements.IElement {
-            container: IMsdMetadata;
-            load(): MsdMicroflow;
-            load(callback: (element: MsdMicroflow) => void): any;
-        }
-        class MsdMicroflow extends elements.Element implements IMsdMicroflow {
-            static typeName: string;
-            container: MsdMetadata;
-            parameters: instances.IList<MsdMicroflowParameter>;
-            name: string;
-            documentation: string;
-            imageBase64: string;
-            description: string;
-            returnType: string;
-            systemEntityType: string;
-            returnTypeSpecification: string;
-            returnTypeCanBeEmpty: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMsdMicroflowParameter extends elements.IElement {
-            load(): MsdMicroflowParameter;
-            load(callback: (element: MsdMicroflowParameter) => void): any;
-        }
-        class MsdMicroflowParameter extends elements.Element implements IMsdMicroflowParameter {
-            static typeName: string;
-            name: string;
-            type: string;
-            typeSpecification: string;
-            systemEntityType: string;
-            canBeEmpty: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMsdText extends elements.IElement {
-            container: IMsdEnumerationValue;
-            load(): MsdText;
-            load(callback: (element: MsdText) => void): any;
-        }
-        class MsdText extends elements.Element implements IMsdText {
-            static typeName: string;
-            container: MsdEnumerationValue;
-            languageCode: string;
-            caption: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMsdVersion extends elements.IElement {
-            container: IMsd;
-            load(): MsdVersion;
-            load(callback: (element: MsdVersion) => void): any;
-        }
-        class MsdVersion extends elements.Element implements IMsdVersion {
-            static typeName: string;
-            container: Msd;
-            version: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `Mappings`.
-     */
-    namespace mappings {
-        interface IModuleDocument extends units.IModelUnit {
-            container: projects.IFolderBase;
-            load(): ModuleDocument;
-            load(callback: (element: ModuleDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDocument extends projects.IModuleDocument {
-            container: projects.IFolderBase;
-            load(): Document;
-            load(callback: (element: Document) => void): any;
-            name: string;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Document extends projects.ModuleDocument implements IDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            name: string;
-            documentation: string;
-            excluded: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMappingDocument extends projects.IDocument {
-            container: projects.IFolderBase;
-            load(): MappingDocument;
-            load(callback: (element: MappingDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class MappingDocument extends projects.Document implements IMappingDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            rootMappingelements: instances.IList<ObjectMappingElement>;
-            mxXmlSchema: xmlschemas.IMxXmlSchema;
-            mxXmlSchemaQualifiedName: string;
-            rootElementName: string;
-            importedWebService: webservices.IImportedWebService;
-            importedWebServiceQualifiedName: string;
-            serviceName: string;
-            operationName: string;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMappingElement extends elements.IElement {
-            load(): MappingElement;
-            load(callback: (element: MappingElement) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class MappingElement extends elements.Element implements IMappingElement {
-            static typeName: string;
-            documentation: string;
-            elementType: integration.ElementType;
-            path: string;
-            minOccurs: number;
-            maxOccurs: number;
-            nillable: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMappingMicroflowCall extends elements.IElement {
-            container: IObjectMappingElement;
-            load(): MappingMicroflowCall;
-            load(callback: (element: MappingMicroflowCall) => void): any;
-        }
-        class MappingMicroflowCall extends elements.Element implements IMappingMicroflowCall {
-            static typeName: string;
-            container: ObjectMappingElement;
-            parameterMappings: instances.IList<MappingMicroflowParameter>;
-            microflow: microflows.IMicroflow;
-            microflowQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMappingMicroflowParameter extends elements.IElement {
-            container: IMappingMicroflowCall;
-            load(): MappingMicroflowParameter;
-            load(callback: (element: MappingMicroflowParameter) => void): any;
-        }
-        class MappingMicroflowParameter extends elements.Element implements IMappingMicroflowParameter {
-            static typeName: string;
-            container: MappingMicroflowCall;
-            parameter: microflows.IMicroflowParameter;
-            parameterQualifiedName: string;
-            levelOfParent: number;
-            valueElementPath: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IObjectMappingElement extends IMappingElement {
-            load(): ObjectMappingElement;
-            load(callback: (element: ObjectMappingElement) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ObjectMappingElement extends MappingElement implements IObjectMappingElement {
-            static typeName: string;
-            mappingMicroflowCall: MappingMicroflowCall;
-            children: instances.IList<MappingElement>;
-            entity: domainmodels.IEntity;
-            entityQualifiedName: string;
-            association: domainmodels.IAssociationBase;
-            associationQualifiedName: string;
-            objectHandling: importmappings.ObjectHandlingEnum;
-            objectHandlingBackup: importmappings.ObjectHandlingBackupEnum;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IValueMappingElement extends IMappingElement {
-            container: IObjectMappingElement;
-            load(): ValueMappingElement;
-            load(callback: (element: ValueMappingElement) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ValueMappingElement extends MappingElement implements IValueMappingElement {
-            static typeName: string;
-            container: ObjectMappingElement;
-            xmlDataType: string;
-            isKey: boolean;
-            isXmlAttribute: boolean;
-            isContent: boolean;
-            attribute: domainmodels.IAttribute;
-            attributeQualifiedName: string;
-            converter: microflows.IMicroflow;
-            converterQualifiedName: string;
-            expectedContentTypes: string;
-            maxLength: number;
-            fractionDigits: number;
-            totalDigits: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `ExportMappings`.
-     */
-    namespace exportmappings {
-        interface IModuleDocument extends units.IModelUnit {
-            container: projects.IFolderBase;
-            load(): ModuleDocument;
-            load(callback: (element: ModuleDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDocument extends projects.IModuleDocument {
-            container: projects.IFolderBase;
-            load(): Document;
-            load(callback: (element: Document) => void): any;
-            name: string;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Document extends projects.ModuleDocument implements IDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            name: string;
-            documentation: string;
-            excluded: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMappingDocument extends projects.IDocument {
-            container: projects.IFolderBase;
-            load(): MappingDocument;
-            load(callback: (element: MappingDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class MappingDocument extends projects.Document implements IMappingDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            rootMappingelements: instances.IList<mappings.ObjectMappingElement>;
-            mxXmlSchema: xmlschemas.IMxXmlSchema;
-            mxXmlSchemaQualifiedName: string;
-            rootElementName: string;
-            importedWebService: webservices.IImportedWebService;
-            importedWebServiceQualifiedName: string;
-            serviceName: string;
-            operationName: string;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Domain-to-XML+Mappings relevant section in reference guide}
-         */
-        interface IExportMapping extends mappings.IMappingDocument {
-            container: projects.IFolderBase;
-            load(): ExportMapping;
-            load(callback: (element: ExportMapping) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Domain-to-XML+Mappings relevant section in reference guide}
-         */
-        class ExportMapping extends mappings.MappingDocument implements IExportMapping {
-            static typeName: string;
-            container: projects.FolderBase;
-            parameterName: string;
-            parameterTypeName: string;
-            isHeader: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMappingElement extends elements.IElement {
-            load(): MappingElement;
-            load(callback: (element: MappingElement) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class MappingElement extends elements.Element implements IMappingElement {
-            static typeName: string;
-            documentation: string;
-            elementType: integration.ElementType;
-            path: string;
-            minOccurs: number;
-            maxOccurs: number;
-            nillable: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IObjectMappingElement extends mappings.IMappingElement {
-            load(): ObjectMappingElement;
-            load(callback: (element: ObjectMappingElement) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ObjectMappingElement extends mappings.MappingElement implements IObjectMappingElement {
-            static typeName: string;
-            mappingMicroflowCall: mappings.MappingMicroflowCall;
-            children: instances.IList<mappings.MappingElement>;
-            entity: domainmodels.IEntity;
-            entityQualifiedName: string;
-            association: domainmodels.IAssociationBase;
-            associationQualifiedName: string;
-            objectHandling: importmappings.ObjectHandlingEnum;
-            objectHandlingBackup: importmappings.ObjectHandlingBackupEnum;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IExportObjectMappingElement extends mappings.IObjectMappingElement {
-            load(): ExportObjectMappingElement;
-            load(callback: (element: ExportObjectMappingElement) => void): any;
-        }
-        class ExportObjectMappingElement extends mappings.ObjectMappingElement implements IExportObjectMappingElement {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IValueMappingElement extends mappings.IMappingElement {
-            container: mappings.IObjectMappingElement;
-            load(): ValueMappingElement;
-            load(callback: (element: ValueMappingElement) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ValueMappingElement extends mappings.MappingElement implements IValueMappingElement {
-            static typeName: string;
-            container: mappings.ObjectMappingElement;
-            xmlDataType: string;
-            isKey: boolean;
-            isXmlAttribute: boolean;
-            isContent: boolean;
-            attribute: domainmodels.IAttribute;
-            attributeQualifiedName: string;
-            converter: microflows.IMicroflow;
-            converterQualifiedName: string;
-            expectedContentTypes: string;
-            maxLength: number;
-            fractionDigits: number;
-            totalDigits: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IExportValueMappingElement extends mappings.IValueMappingElement {
-            container: mappings.IObjectMappingElement;
-            load(): ExportValueMappingElement;
-            load(callback: (element: ExportValueMappingElement) => void): any;
-        }
-        class ExportValueMappingElement extends mappings.ValueMappingElement implements IExportValueMappingElement {
-            static typeName: string;
-            container: mappings.ObjectMappingElement;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `ImportMappings`.
-     */
-    namespace importmappings {
-        interface IModuleDocument extends units.IModelUnit {
-            container: projects.IFolderBase;
-            load(): ModuleDocument;
-            load(callback: (element: ModuleDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDocument extends projects.IModuleDocument {
-            container: projects.IFolderBase;
-            load(): Document;
-            load(callback: (element: Document) => void): any;
-            name: string;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Document extends projects.ModuleDocument implements IDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            name: string;
-            documentation: string;
-            excluded: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMappingDocument extends projects.IDocument {
-            container: projects.IFolderBase;
-            load(): MappingDocument;
-            load(callback: (element: MappingDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class MappingDocument extends projects.Document implements IMappingDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            rootMappingelements: instances.IList<mappings.ObjectMappingElement>;
-            mxXmlSchema: xmlschemas.IMxXmlSchema;
-            mxXmlSchemaQualifiedName: string;
-            rootElementName: string;
-            importedWebService: webservices.IImportedWebService;
-            importedWebServiceQualifiedName: string;
-            serviceName: string;
-            operationName: string;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/XML-to-domain+Mappings relevant section in reference guide}
-         */
-        interface IImportMapping extends mappings.IMappingDocument {
-            container: projects.IFolderBase;
-            load(): ImportMapping;
-            load(callback: (element: ImportMapping) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/XML-to-domain+Mappings relevant section in reference guide}
-         */
-        class ImportMapping extends mappings.MappingDocument implements IImportMapping {
-            static typeName: string;
-            container: projects.FolderBase;
-            parameterEntity: domainmodels.IEntity;
-            parameterEntityQualifiedName: string;
-            useSubtransactionsForMicroflows: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMappingElement extends elements.IElement {
-            load(): MappingElement;
-            load(callback: (element: MappingElement) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class MappingElement extends elements.Element implements IMappingElement {
-            static typeName: string;
-            documentation: string;
-            elementType: integration.ElementType;
-            path: string;
-            minOccurs: number;
-            maxOccurs: number;
-            nillable: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IObjectMappingElement extends mappings.IMappingElement {
-            load(): ObjectMappingElement;
-            load(callback: (element: ObjectMappingElement) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ObjectMappingElement extends mappings.MappingElement implements IObjectMappingElement {
-            static typeName: string;
-            mappingMicroflowCall: mappings.MappingMicroflowCall;
-            children: instances.IList<mappings.MappingElement>;
-            entity: domainmodels.IEntity;
-            entityQualifiedName: string;
-            association: domainmodels.IAssociationBase;
-            associationQualifiedName: string;
-            objectHandling: ObjectHandlingEnum;
-            objectHandlingBackup: ObjectHandlingBackupEnum;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IImportObjectMappingElement extends mappings.IObjectMappingElement {
-            load(): ImportObjectMappingElement;
-            load(callback: (element: ImportObjectMappingElement) => void): any;
-        }
-        class ImportObjectMappingElement extends mappings.ObjectMappingElement implements IImportObjectMappingElement {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IValueMappingElement extends mappings.IMappingElement {
-            container: mappings.IObjectMappingElement;
-            load(): ValueMappingElement;
-            load(callback: (element: ValueMappingElement) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ValueMappingElement extends mappings.MappingElement implements IValueMappingElement {
-            static typeName: string;
-            container: mappings.ObjectMappingElement;
-            xmlDataType: string;
-            isKey: boolean;
-            isXmlAttribute: boolean;
-            isContent: boolean;
-            attribute: domainmodels.IAttribute;
-            attributeQualifiedName: string;
-            converter: microflows.IMicroflow;
-            converterQualifiedName: string;
-            expectedContentTypes: string;
-            maxLength: number;
-            fractionDigits: number;
-            totalDigits: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IImportValueMappingElement extends mappings.IValueMappingElement {
-            container: mappings.IObjectMappingElement;
-            load(): ImportValueMappingElement;
-            load(callback: (element: ImportValueMappingElement) => void): any;
-        }
-        class ImportValueMappingElement extends mappings.ValueMappingElement implements IImportValueMappingElement {
-            static typeName: string;
-            container: mappings.ObjectMappingElement;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        class ObjectHandlingBackupEnum extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Create: ObjectHandlingBackupEnum;
-            static Ignore: ObjectHandlingBackupEnum;
-            static Error: ObjectHandlingBackupEnum;
-        }
-        class ObjectHandlingEnum extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Create: ObjectHandlingEnum;
-            static Find: ObjectHandlingEnum;
-            static Custom: ObjectHandlingEnum;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `Rest`.
-     */
-    namespace rest {
-        interface IModuleDocument extends units.IModelUnit {
-            container: projects.IFolderBase;
-            load(): ModuleDocument;
-            load(callback: (element: ModuleDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDocument extends projects.IModuleDocument {
-            container: projects.IFolderBase;
-            load(): Document;
-            load(callback: (element: Document) => void): any;
-            name: string;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Document extends projects.ModuleDocument implements IDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            name: string;
-            documentation: string;
-            excluded: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IPublishedRestServiceBase extends projects.IDocument {
-            container: projects.IFolderBase;
-            load(): PublishedRestServiceBase;
-            load(callback: (element: PublishedRestServiceBase) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class PublishedRestServiceBase extends projects.Document implements IPublishedRestServiceBase {
-            static typeName: string;
-            container: projects.FolderBase;
-            resources: instances.IList<PublishedRestResource>;
-            namespaceName: string;
-            path: string;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IPublishedOdataService extends IPublishedRestServiceBase {
-            container: projects.IFolderBase;
-            load(): PublishedOdataService;
-            load(callback: (element: PublishedOdataService) => void): any;
-        }
-        class PublishedOdataService extends PublishedRestServiceBase implements IPublishedOdataService {
-            static typeName: string;
-            container: projects.FolderBase;
-            allowedRoleIds: instances.IList<security.IModuleRole>;
-            allowedRoleIdsQualifiedNames: string[];
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IPublishedRestResource extends elements.IElement {
-            container: IPublishedRestServiceBase;
-            load(): PublishedRestResource;
-            load(callback: (element: PublishedRestResource) => void): any;
-        }
-        class PublishedRestResource extends elements.Element implements IPublishedRestResource {
-            static typeName: string;
-            container: PublishedRestServiceBase;
-            dataEntity: webservices.DataEntity;
-            path: string;
-            usePaging: boolean;
-            pageSize: number;
-            returnType: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IPublishedRestService extends IPublishedRestServiceBase {
-            container: projects.IFolderBase;
-            load(): PublishedRestService;
-            load(callback: (element: PublishedRestService) => void): any;
-        }
-        class PublishedRestService extends PublishedRestServiceBase implements IPublishedRestService {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `Settings`.
-     */
-    namespace settings {
-        interface ICertificate extends elements.IElement {
-            container: IProjectSettings;
-            load(): Certificate;
-            load(callback: (element: Certificate) => void): any;
-        }
-        class Certificate extends elements.Element implements ICertificate {
-            static typeName: string;
-            container: ProjectSettings;
-            type: CertificateType;
-            data: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IConstantValue extends elements.IElement {
-            container: IServerConfiguration;
-            load(): ConstantValue;
-            load(callback: (element: ConstantValue) => void): any;
-        }
-        class ConstantValue extends elements.Element implements IConstantValue {
-            static typeName: string;
-            container: ServerConfiguration;
-            constant: constants.IConstant;
-            constantQualifiedName: string;
-            value: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ICustomSetting extends elements.IElement {
-            container: IServerConfiguration;
-            load(): CustomSetting;
-            load(callback: (element: CustomSetting) => void): any;
-        }
-        class CustomSetting extends elements.Element implements ICustomSetting {
-            static typeName: string;
-            container: ServerConfiguration;
-            name: string;
-            value: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IProjectSettingsPart extends elements.IElement {
-            container: IProjectSettings;
-            load(): ProjectSettingsPart;
-            load(callback: (element: ProjectSettingsPart) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ProjectSettingsPart extends elements.Element implements IProjectSettingsPart {
-            static typeName: string;
-            container: ProjectSettings;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IIntegrationProjectSettingsPart extends IProjectSettingsPart {
-            container: IProjectSettings;
-            load(): IntegrationProjectSettingsPart;
-            load(callback: (element: IntegrationProjectSettingsPart) => void): any;
-        }
-        class IntegrationProjectSettingsPart extends ProjectSettingsPart implements IIntegrationProjectSettingsPart {
-            static typeName: string;
-            container: ProjectSettings;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
-         */
-        interface IProjectDocument extends units.IModelUnit {
-            container: projects.IProject;
-            load(): ProjectDocument;
-            load(callback: (element: ProjectDocument) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ProjectDocument extends units.ModelUnit implements IProjectDocument {
-            static typeName: string;
-            container: projects.Project;
-            constructor(container: projects.IProject);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Project+Settings relevant section in reference guide}
-         */
-        interface IProjectSettings extends projects.IProjectDocument {
-            container: projects.IProject;
-            load(): ProjectSettings;
-            load(callback: (element: ProjectSettings) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Project+Settings relevant section in reference guide}
-         */
-        class ProjectSettings extends projects.ProjectDocument implements IProjectSettings {
-            static typeName: string;
-            container: projects.Project;
-            languages: instances.IList<texts.Language>;
-            settingsParts: instances.IList<ProjectSettingsPart>;
-            configurations: instances.IList<ServerConfiguration>;
-            certificates: instances.IList<Certificate>;
-            hashAlgorithm: projects.HashAlgorithmType;
-            roundingMode: RoundingMode;
-            conversionState: projects.ConversionState;
-            skipJarAnalyzerStep: boolean;
-            afterStartupMicroflow: microflows.IMicroflow;
-            afterStartupMicroflowQualifiedName: string;
-            beforeShutdownMicroflow: microflows.IMicroflow;
-            beforeShutdownMicroflowQualifiedName: string;
-            healthCheckMicroflow: microflows.IMicroflow;
-            healthCheckMicroflowQualifiedName: string;
-            defaultLanguageCode: string;
-            firstDayOfWeek: FirstDayOfWeekEnum;
-            defaultTimeZoneCode: string;
-            scheduledEventTimeZoneCode: string;
-            allowUserMultipleSessions: boolean;
-            lowerCaseMicroflowVariables: boolean;
-            constructor(container: projects.IProject);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IServerConfiguration extends elements.IElement {
-            container: IProjectSettings;
-            load(): ServerConfiguration;
-            load(callback: (element: ServerConfiguration) => void): any;
-        }
-        class ServerConfiguration extends elements.Element implements IServerConfiguration {
-            static typeName: string;
-            container: ProjectSettings;
-            customSettings: instances.IList<CustomSetting>;
-            constantValues: instances.IList<ConstantValue>;
-            name: string;
-            applicationRootUrl: string;
-            portOnlyLocal: boolean;
-            adminPortOnlyLocal: boolean;
-            portNumber: number;
-            adminPortNumber: number;
-            maxJavaHeapSize: number;
-            emulateCloudSecurity: boolean;
-            extraJvmParameters: string;
-            databaseType: DatabaseType;
-            databaseUrl: string;
-            databaseName: string;
-            databaseUseIntegratedSecurity: boolean;
-            databaseUserName: string;
-            databasePassword: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        class CertificateType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Authority: CertificateType;
-            static Client: CertificateType;
-        }
-        class DatabaseType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Hsqldb: DatabaseType;
-            static SqlServer: DatabaseType;
-            static MySql: DatabaseType;
-            static Oracle: DatabaseType;
-            static PostgreSql: DatabaseType;
-        }
-        class FirstDayOfWeekEnum extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Default: FirstDayOfWeekEnum;
-            static Sunday: FirstDayOfWeekEnum;
-            static Monday: FirstDayOfWeekEnum;
-            static Tuesday: FirstDayOfWeekEnum;
-            static Wednesday: FirstDayOfWeekEnum;
-            static Thursday: FirstDayOfWeekEnum;
-            static Friday: FirstDayOfWeekEnum;
-            static Saturday: FirstDayOfWeekEnum;
-        }
-        class RoundingMode extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static HalfUp: RoundingMode;
-            static HalfEven: RoundingMode;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `Pages`.
-     */
-    namespace pages {
-        interface IModuleDocument extends units.IModelUnit {
-            container: projects.IFolderBase;
-            load(): ModuleDocument;
-            load(callback: (element: ModuleDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDocument extends projects.IModuleDocument {
-            container: projects.IFolderBase;
-            load(): Document;
-            load(callback: (element: Document) => void): any;
-            name: string;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Document extends projects.ModuleDocument implements IDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            name: string;
-            documentation: string;
-            excluded: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
-         */
-        interface IFormBase extends projects.IDocument {
-            container: projects.IFolderBase;
-            load(): FormBase;
-            load(callback: (element: FormBase) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class FormBase extends projects.Document implements IFormBase {
-            static typeName: string;
-            container: projects.FolderBase;
-            canvasWidth: number;
-            canvasHeight: number;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Page relevant section in reference guide}
-         */
-        interface IPage extends IFormBase {
-            container: projects.IFolderBase;
-            load(): Page;
-            load(callback: (element: Page) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Page relevant section in reference guide}
-         */
-        class Page extends FormBase implements IPage {
-            static typeName: string;
-            container: projects.FolderBase;
-            layoutCall: LayoutCall;
-            title: texts.Text;
-            class: string;
-            style: string;
-            allowedRoles: instances.IList<security.IModuleRole>;
-            allowedRolesQualifiedNames: string[];
-            popupWidth: number;
-            popupHeight: number;
-            popupResizable: boolean;
-            markAsUsed: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Layout relevant section in reference guide}
-         */
-        interface ILayout extends IFormBase {
-            container: projects.IFolderBase;
-            load(): Layout;
-            load(callback: (element: Layout) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Layout relevant section in reference guide}
-         */
-        class Layout extends FormBase implements ILayout {
-            static typeName: string;
-            container: projects.FolderBase;
-            widget: Widget;
-            layoutCall: LayoutCall;
-            layoutType: LayoutType;
-            mainPlaceholder: ILayoutParameter;
-            mainPlaceholderQualifiedName: string;
-            acceptButtonPlaceholder: ILayoutParameter;
-            acceptButtonPlaceholderQualifiedName: string;
-            cancelButtonPlaceholder: ILayoutParameter;
-            cancelButtonPlaceholderQualifiedName: string;
-            useMainPlaceholderForPopups: boolean;
-            class: string;
-            style: string;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ILayoutCall extends elements.IElement {
-            load(): LayoutCall;
-            load(callback: (element: LayoutCall) => void): any;
-        }
-        class LayoutCall extends elements.Element implements ILayoutCall {
-            static typeName: string;
-            layout: ILayout;
-            layoutQualifiedName: string;
-            arguments: instances.IList<LayoutCallArgument>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ILayoutCallArgument extends elements.IElement {
-            container: ILayoutCall;
-            load(): LayoutCallArgument;
-            load(callback: (element: LayoutCallArgument) => void): any;
-        }
-        class LayoutCallArgument extends elements.Element implements ILayoutCallArgument {
-            static typeName: string;
-            container: LayoutCall;
-            parameterName: string;
-            widget: Widget;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ILayoutParameter extends elements.IElement {
-            container: ILayout;
-            load(): LayoutParameter;
-            load(callback: (element: LayoutParameter) => void): any;
-            name: string;
-        }
-        class LayoutParameter extends elements.Element implements ILayoutParameter {
-            static typeName: string;
-            container: Layout;
-            name: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
-         */
-        interface IWidget extends elements.IElement {
-            load(): Widget;
-            load(callback: (element: Widget) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Widget extends elements.Element implements IWidget {
-            static typeName: string;
-            name: string;
-            class: string;
-            style: string;
-            tabIndex: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Placeholder relevant section in reference guide}
-         */
-        interface IPlaceholder extends IWidget {
-            load(): Placeholder;
-            load(callback: (element: Placeholder) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Placeholder relevant section in reference guide}
-         */
-        class Placeholder extends Widget implements IPlaceholder {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IClientAction extends elements.IElement {
-            load(): ClientAction;
-            load(callback: (element: ClientAction) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ClientAction extends elements.Element implements IClientAction {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface INoClientAction extends IClientAction {
-            load(): NoClientAction;
-            load(callback: (element: NoClientAction) => void): any;
-        }
-        class NoClientAction extends ClientAction implements INoClientAction {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IPageClientAction extends IClientAction {
-            load(): PageClientAction;
-            load(callback: (element: PageClientAction) => void): any;
-        }
-        class PageClientAction extends ClientAction implements IPageClientAction {
-            static typeName: string;
-            pageSettings: PageSettings;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMicroflowClientAction extends IClientAction {
-            load(): MicroflowClientAction;
-            load(callback: (element: MicroflowClientAction) => void): any;
-        }
-        class MicroflowClientAction extends ClientAction implements IMicroflowClientAction {
-            static typeName: string;
-            microflowSettings: MicroflowSettings;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Opening+Pages relevant section in reference guide}
-         */
-        interface IPageSettings extends elements.IElement {
-            load(): PageSettings;
-            load(callback: (element: PageSettings) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Opening+Pages relevant section in reference guide}
-         */
-        class PageSettings extends elements.Element implements IPageSettings {
-            static typeName: string;
-            page: IPage;
-            pageQualifiedName: string;
-            formTitle: texts.Text;
-            location: FormLocation;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Starting+Microflows relevant section in reference guide}
-         */
-        interface IMicroflowSettings extends elements.IElement {
-            load(): MicroflowSettings;
-            load(callback: (element: MicroflowSettings) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Starting+Microflows relevant section in reference guide}
-         */
-        class MicroflowSettings extends elements.Element implements IMicroflowSettings {
-            static typeName: string;
-            microflow: microflows.IMicroflow;
-            microflowQualifiedName: string;
-            useAllPages: boolean;
-            progressBar: ProgressBarType;
-            progressMessage: texts.Text;
-            asynchronous: boolean;
-            formValidations: FormValidations;
-            confirmationInfo: ConfirmationInfo;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IConfirmationInfo extends elements.IElement {
-            container: IMicroflowSettings;
-            load(): ConfirmationInfo;
-            load(callback: (element: ConfirmationInfo) => void): any;
-        }
-        class ConfirmationInfo extends elements.Element implements IConfirmationInfo {
-            static typeName: string;
-            container: MicroflowSettings;
-            question: texts.Text;
-            proceedButtonCaption: texts.Text;
-            cancelButtonCaption: texts.Text;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IConditionallyVisibleWidget extends IWidget {
-            load(): ConditionallyVisibleWidget;
-            load(callback: (element: ConditionallyVisibleWidget) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ConditionallyVisibleWidget extends Widget implements IConditionallyVisibleWidget {
-            static typeName: string;
-            conditionalVisibilitySettings: ConditionalVisibilitySettings;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Label relevant section in reference guide}
-         */
-        interface ILabel extends IConditionallyVisibleWidget {
-            load(): Label;
-            load(callback: (element: Label) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Label relevant section in reference guide}
-         */
-        class Label extends ConditionallyVisibleWidget implements ILabel {
-            static typeName: string;
-            caption: texts.Text;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Image relevant section in reference guide}
-         */
-        interface IStaticImageViewer extends IConditionallyVisibleWidget {
-            load(): StaticImageViewer;
-            load(callback: (element: StaticImageViewer) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Image relevant section in reference guide}
-         */
-        class StaticImageViewer extends ConditionallyVisibleWidget implements IStaticImageViewer {
-            static typeName: string;
-            image: images.IImage;
-            imageQualifiedName: string;
-            widthUnit: ImageSizeUnit;
-            heightUnit: ImageSizeUnit;
-            width: number;
-            height: number;
-            clickAction: ClientAction;
-            responsive: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Container relevant section in reference guide}
-         */
-        interface IDivContainer extends IConditionallyVisibleWidget {
-            load(): DivContainer;
-            load(callback: (element: DivContainer) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Container relevant section in reference guide}
-         */
-        class DivContainer extends ConditionallyVisibleWidget implements IDivContainer {
-            static typeName: string;
-            widget: Widget;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IVerticalFlow extends IWidget {
-            load(): VerticalFlow;
-            load(callback: (element: VerticalFlow) => void): any;
-        }
-        class VerticalFlow extends Widget implements IVerticalFlow {
-            static typeName: string;
-            widgets: instances.IList<Widget>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IConditionallyEditableWidget extends IConditionallyVisibleWidget {
-            load(): ConditionallyEditableWidget;
-            load(callback: (element: ConditionallyEditableWidget) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ConditionallyEditableWidget extends ConditionallyVisibleWidget implements IConditionallyEditableWidget {
-            static typeName: string;
-            conditionalEditabilitySettings: ConditionalEditabilitySettings;
-            editable: EditableEnum;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IInputWidget extends IConditionallyEditableWidget {
-            load(): InputWidget;
-            load(callback: (element: InputWidget) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class InputWidget extends ConditionallyEditableWidget implements IInputWidget {
-            static typeName: string;
-            label: texts.Text;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMemberWidget extends IInputWidget {
-            load(): MemberWidget;
-            load(callback: (element: MemberWidget) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class MemberWidget extends InputWidget implements IMemberWidget {
-            static typeName: string;
-            /**
-             * The value of this property is conceptually of type Paths$AttributePath.
-             */
-            attributePath: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IAttributeWidget extends IMemberWidget {
-            load(): AttributeWidget;
-            load(callback: (element: AttributeWidget) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class AttributeWidget extends MemberWidget implements IAttributeWidget {
-            static typeName: string;
-            required: boolean;
-            requiredMessage: texts.Text;
-            onChangeMicroflowSettings: MicroflowSettings;
-            onEnterMicroflowSettings: MicroflowSettings;
-            onLeaveMicroflowSettings: MicroflowSettings;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IAttributeWidgetWithPlaceholder extends IAttributeWidget {
-            load(): AttributeWidgetWithPlaceholder;
-            load(callback: (element: AttributeWidgetWithPlaceholder) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class AttributeWidgetWithPlaceholder extends AttributeWidget implements IAttributeWidgetWithPlaceholder {
-            static typeName: string;
-            placeholder: texts.Text;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ITextWidget extends IAttributeWidgetWithPlaceholder {
-            load(): TextWidget;
-            load(callback: (element: TextWidget) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class TextWidget extends AttributeWidgetWithPlaceholder implements ITextWidget {
-            static typeName: string;
-            maxLengthCode: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Text+Box relevant section in reference guide}
-         */
-        interface ITextBox extends ITextWidget {
-            load(): TextBox;
-            load(callback: (element: TextBox) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Text+Box relevant section in reference guide}
-         */
-        class TextBox extends TextWidget implements ITextBox {
-            static typeName: string;
-            inputMask: string;
-            formattingInfo: FormattingInfo;
-            isPasswordBox: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Text+Area relevant section in reference guide}
-         */
-        interface ITextArea extends ITextWidget {
-            load(): TextArea;
-            load(callback: (element: TextArea) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Text+Area relevant section in reference guide}
-         */
-        class TextArea extends TextWidget implements ITextArea {
-            static typeName: string;
-            numberOfLines: number;
-            counterMessage: texts.Text;
-            textTooLongMessage: texts.Text;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Check+Box relevant section in reference guide}
-         */
-        interface ICheckBox extends IAttributeWidget {
-            load(): CheckBox;
-            load(callback: (element: CheckBox) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Check+Box relevant section in reference guide}
-         */
-        class CheckBox extends AttributeWidget implements ICheckBox {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Date+Picker relevant section in reference guide}
-         */
-        interface IDatePicker extends IAttributeWidgetWithPlaceholder {
-            load(): DatePicker;
-            load(callback: (element: DatePicker) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Date+Picker relevant section in reference guide}
-         */
-        class DatePicker extends AttributeWidgetWithPlaceholder implements IDatePicker {
-            static typeName: string;
-            formattingInfo: FormattingInfo;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IFormattingInfo extends elements.IElement {
-            load(): FormattingInfo;
-            load(callback: (element: FormattingInfo) => void): any;
-        }
-        class FormattingInfo extends elements.Element implements IFormattingInfo {
-            static typeName: string;
-            decimalPrecision: number;
-            groupDigits: boolean;
-            enumFormat: EnumFormat;
-            dateFormat: DateFormat;
-            customDateFormat: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IConditionalSettings extends elements.IElement {
-            load(): ConditionalSettings;
-            load(callback: (element: ConditionalSettings) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ConditionalSettings extends elements.Element implements IConditionalSettings {
-            static typeName: string;
-            attribute: domainmodels.IAttribute;
-            attributeQualifiedName: string;
-            conditions: instances.IList<enumerations.Condition>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IConditionalVisibilitySettings extends IConditionalSettings {
-            load(): ConditionalVisibilitySettings;
-            load(callback: (element: ConditionalVisibilitySettings) => void): any;
-        }
-        class ConditionalVisibilitySettings extends ConditionalSettings implements IConditionalVisibilitySettings {
-            static typeName: string;
-            moduleRoles: instances.IList<security.IModuleRole>;
-            moduleRolesQualifiedNames: string[];
-            ignoreSecurity: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IConditionalEditabilitySettings extends IConditionalSettings {
-            container: IConditionallyEditableWidget;
-            load(): ConditionalEditabilitySettings;
-            load(callback: (element: ConditionalEditabilitySettings) => void): any;
-        }
-        class ConditionalEditabilitySettings extends ConditionalSettings implements IConditionalEditabilitySettings {
-            static typeName: string;
-            container: ConditionallyEditableWidget;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Table relevant section in reference guide}
-         */
-        interface ITable extends IConditionallyVisibleWidget {
-            load(): Table;
-            load(callback: (element: Table) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Table relevant section in reference guide}
-         */
-        class Table extends ConditionallyVisibleWidget implements ITable {
-            static typeName: string;
-            cells: instances.IList<TableCell>;
-            columns: instances.IList<TableColumn>;
-            widthUnit: UnitEnum;
-            rows: instances.IList<TableRow>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ITableCell extends elements.IElement {
-            container: ITable;
-            load(): TableCell;
-            load(callback: (element: TableCell) => void): any;
-        }
-        class TableCell extends elements.Element implements ITableCell {
-            static typeName: string;
-            container: Table;
-            class: string;
-            style: string;
-            isHeader: boolean;
-            widget: Widget;
-            leftColumnIndex: number;
-            topRowIndex: number;
-            width: number;
-            height: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ITableColumn extends elements.IElement {
-            container: ITable;
-            load(): TableColumn;
-            load(callback: (element: TableColumn) => void): any;
-        }
-        class TableColumn extends elements.Element implements ITableColumn {
-            static typeName: string;
-            container: Table;
-            width: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ITableRow extends elements.IElement {
-            container: ITable;
-            load(): TableRow;
-            load(callback: (element: TableRow) => void): any;
-        }
-        class TableRow extends elements.Element implements ITableRow {
-            static typeName: string;
-            container: Table;
-            class: string;
-            style: string;
-            conditionalVisibilitySettings: ConditionalVisibilitySettings;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IEntityWidget extends IConditionallyVisibleWidget {
-            load(): EntityWidget;
-            load(callback: (element: EntityWidget) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class EntityWidget extends ConditionallyVisibleWidget implements IEntityWidget {
-            static typeName: string;
-            dataSource: DataSource;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+Sources relevant section in reference guide}
-         */
-        interface IDataSource extends elements.IElement {
-            container: IEntityWidget;
-            load(): DataSource;
-            load(callback: (element: DataSource) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+Sources relevant section in reference guide}
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class DataSource extends elements.Element implements IDataSource {
-            static typeName: string;
-            container: EntityWidget;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IEntityPathSource extends IDataSource {
-            container: IEntityWidget;
-            load(): EntityPathSource;
-            load(callback: (element: EntityPathSource) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class EntityPathSource extends DataSource implements IEntityPathSource {
-            static typeName: string;
-            container: EntityWidget;
-            /**
-             * The value of this property is conceptually of type Paths$EntityPath.
-             */
-            entityPath: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMicroflowSource extends IDataSource {
-            container: IEntityWidget;
-            load(): MicroflowSource;
-            load(callback: (element: MicroflowSource) => void): any;
-        }
-        class MicroflowSource extends DataSource implements IMicroflowSource {
-            static typeName: string;
-            container: EntityWidget;
-            microflowSettings: MicroflowSettings;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IListenTargetWidget extends IEntityWidget {
-            load(): ListenTargetWidget;
-            load(callback: (element: ListenTargetWidget) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ListenTargetWidget extends EntityWidget implements IListenTargetWidget {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IAssociationSource extends IEntityPathSource {
-            container: IEntityWidget;
-            load(): AssociationSource;
-            load(callback: (element: AssociationSource) => void): any;
-        }
-        class AssociationSource extends EntityPathSource implements IAssociationSource {
-            static typeName: string;
-            container: EntityWidget;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+View relevant section in reference guide}
-         */
-        interface IDataView extends IEntityWidget {
-            load(): DataView;
-            load(callback: (element: DataView) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+View relevant section in reference guide}
-         */
-        class DataView extends EntityWidget implements IDataView {
-            static typeName: string;
-            widget: Widget;
-            editable: boolean;
-            showControlBar: boolean;
-            closeOnSaveOrCancel: boolean;
-            useSchema: boolean;
-            noEntityMessage: texts.Text;
-            labelWidth: number;
-            controlBar: DataViewControlBar;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IControlBar extends elements.IElement {
-            load(): ControlBar;
-            load(callback: (element: ControlBar) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ControlBar extends elements.Element implements IControlBar {
-            static typeName: string;
-            items: instances.IList<ControlBarItem>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Control+Bar relevant section in reference guide}
-         */
-        interface IDataViewControlBar extends IControlBar {
-            container: IDataView;
-            load(): DataViewControlBar;
-            load(callback: (element: DataViewControlBar) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Control+Bar relevant section in reference guide}
-         */
-        class DataViewControlBar extends ControlBar implements IDataViewControlBar {
-            static typeName: string;
-            container: DataView;
-            closeButton: ControlBarItem;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IDataViewSource extends IEntityPathSource {
-            container: IEntityWidget;
-            load(): DataViewSource;
-            load(callback: (element: DataViewSource) => void): any;
-        }
-        class DataViewSource extends EntityPathSource implements IDataViewSource {
-            static typeName: string;
-            container: EntityWidget;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IListenTargetSource extends IDataSource {
-            container: IEntityWidget;
-            load(): ListenTargetSource;
-            load(callback: (element: ListenTargetSource) => void): any;
-        }
-        class ListenTargetSource extends DataSource implements IListenTargetSource {
-            static typeName: string;
-            container: EntityWidget;
-            listenTarget: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IControlBarItem extends elements.IElement {
-            load(): ControlBarItem;
-            load(callback: (element: ControlBarItem) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ControlBarItem extends elements.Element implements IControlBarItem {
-            static typeName: string;
-            name: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IControlBarButton extends IControlBarItem {
-            load(): ControlBarButton;
-            load(callback: (element: ControlBarButton) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ControlBarButton extends ControlBarItem implements IControlBarButton {
-            static typeName: string;
-            caption: ClientTemplate;
-            tooltip: texts.Text;
-            icon: Icon;
-            class: string;
-            style: string;
-            conditionalVisibilitySettings: ConditionalVisibilitySettings;
-            buttonStyle: ButtonStyle;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IDataViewControlBarButton extends IControlBarButton {
-            container: IControlBar;
-            load(): DataViewControlBarButton;
-            load(callback: (element: DataViewControlBarButton) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class DataViewControlBarButton extends ControlBarButton implements IDataViewControlBarButton {
-            static typeName: string;
-            container: ControlBar;
-            tabIndex: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Cancel+Button relevant section in reference guide}
-         */
-        interface IDataViewCancelButton extends IDataViewControlBarButton {
-            container: IControlBar;
-            load(): DataViewCancelButton;
-            load(callback: (element: DataViewCancelButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Cancel+Button relevant section in reference guide}
-         */
-        class DataViewCancelButton extends DataViewControlBarButton implements IDataViewCancelButton {
-            static typeName: string;
-            container: ControlBar;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Close+Button relevant section in reference guide}
-         */
-        interface IDataViewCloseButton extends IDataViewControlBarButton {
-            container: IControlBar;
-            load(): DataViewCloseButton;
-            load(callback: (element: DataViewCloseButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Close+Button relevant section in reference guide}
-         */
-        class DataViewCloseButton extends DataViewControlBarButton implements IDataViewCloseButton {
-            static typeName: string;
-            container: ControlBar;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+view+action+button relevant section in reference guide}
-         */
-        interface IDataViewActionButton extends IDataViewControlBarButton {
-            container: IControlBar;
-            load(): DataViewActionButton;
-            load(callback: (element: DataViewActionButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+view+action+button relevant section in reference guide}
-         */
-        class DataViewActionButton extends DataViewControlBarButton implements IDataViewActionButton {
-            static typeName: string;
-            container: ControlBar;
-            action: ClientAction;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Save+Button relevant section in reference guide}
-         */
-        interface IDataViewSaveButton extends IDataViewControlBarButton {
-            container: IControlBar;
-            load(): DataViewSaveButton;
-            load(callback: (element: DataViewSaveButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+View+Save+Button relevant section in reference guide}
-         */
-        class DataViewSaveButton extends DataViewControlBarButton implements IDataViewSaveButton {
-            static typeName: string;
-            container: ControlBar;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/List+View relevant section in reference guide}
-         */
-        interface IListView extends IListenTargetWidget {
-            load(): ListView;
-            load(callback: (element: ListView) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/List+View relevant section in reference guide}
-         */
-        class ListView extends ListenTargetWidget implements IListView {
-            static typeName: string;
-            widget: Widget;
-            pageSize: number;
-            clickAction: ClientAction;
-            editable: boolean;
-            templates: instances.IList<ListViewTemplate>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IListViewTemplate extends elements.IElement {
-            container: IListView;
-            load(): ListViewTemplate;
-            load(callback: (element: ListViewTemplate) => void): any;
-        }
-        class ListViewTemplate extends elements.Element implements IListViewTemplate {
-            static typeName: string;
-            container: ListView;
-            specialization: domainmodels.IEntity;
-            specializationQualifiedName: string;
-            widget: Widget;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IListViewDatabaseSource extends IEntityPathSource {
-            container: IEntityWidget;
-            load(): ListViewDatabaseSource;
-            load(callback: (element: ListViewDatabaseSource) => void): any;
-        }
-        class ListViewDatabaseSource extends EntityPathSource implements IListViewDatabaseSource {
-            static typeName: string;
-            container: EntityWidget;
-            /**
-             * The value of this property is conceptually of type Paths$AttributePath.
-             */
-            searchPaths: instances.IList<string>;
-            sortBar: GridSortBar;
-            /**
-             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
-             */
-            xPathConstraint: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Sort+Bar relevant section in reference guide}
-         */
-        interface IGridSortBar extends elements.IElement {
-            load(): GridSortBar;
-            load(callback: (element: GridSortBar) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Sort+Bar relevant section in reference guide}
-         */
-        class GridSortBar extends elements.Element implements IGridSortBar {
-            static typeName: string;
-            sortItems: instances.IList<GridSortItem>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IGridSortItem extends elements.IElement {
-            container: IGridSortBar;
-            load(): GridSortItem;
-            load(callback: (element: GridSortItem) => void): any;
-        }
-        class GridSortItem extends elements.Element implements IGridSortItem {
-            static typeName: string;
-            container: GridSortBar;
-            /**
-             * The value of this property is conceptually of type Paths$AttributePath.
-             */
-            attributePath: string;
-            sortDirection: SortDirection;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Button+Widgets relevant section in reference guide}
-         */
-        interface IButton extends IConditionallyVisibleWidget {
-            load(): Button;
-            load(callback: (element: Button) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Button+Widgets relevant section in reference guide}
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Button extends ConditionallyVisibleWidget implements IButton {
-            static typeName: string;
-            caption: ClientTemplate;
-            tooltip: texts.Text;
-            icon: Icon;
-            renderType: RenderType;
-            buttonStyle: ButtonStyle;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IStaticOrDynamicString extends elements.IElement {
-            container: ILinkButton;
-            load(): StaticOrDynamicString;
-            load(callback: (element: StaticOrDynamicString) => void): any;
-        }
-        class StaticOrDynamicString extends elements.Element implements IStaticOrDynamicString {
-            static typeName: string;
-            container: LinkButton;
-            isDynamic: boolean;
-            value: string;
-            /**
-             * The value of this property is conceptually of type Paths$AttributePath.
-             */
-            attribute: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Back+Button relevant section in reference guide}
-         */
-        interface IBackButton extends IButton {
-            load(): BackButton;
-            load(callback: (element: BackButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Back+Button relevant section in reference guide}
-         */
-        class BackButton extends Button implements IBackButton {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Cancel+Button relevant section in reference guide}
-         */
-        interface ICancelButton extends IButton {
-            load(): CancelButton;
-            load(callback: (element: CancelButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Cancel+Button relevant section in reference guide}
-         */
-        class CancelButton extends Button implements ICancelButton {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Sign+Out+Button relevant section in reference guide}
-         */
-        interface ILogoutButton extends IButton {
-            load(): LogoutButton;
-            load(callback: (element: LogoutButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Sign+Out+Button relevant section in reference guide}
-         */
-        class LogoutButton extends Button implements ILogoutButton {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Action+Button relevant section in reference guide}
-         */
-        interface IActionButton extends IButton {
-            load(): ActionButton;
-            load(callback: (element: ActionButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Action+Button relevant section in reference guide}
-         */
-        class ActionButton extends Button implements IActionButton {
-            static typeName: string;
-            action: ClientAction;
-            disabledDuringAction: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/New+Button relevant section in reference guide}
-         */
-        interface INewButton extends IButton {
-            load(): NewButton;
-            load(callback: (element: NewButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/New+Button relevant section in reference guide}
-         */
-        class NewButton extends Button implements INewButton {
-            static typeName: string;
-            entity: domainmodels.IEntity;
-            entityQualifiedName: string;
-            pageSettings: PageSettings;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Save+Button relevant section in reference guide}
-         */
-        interface ISaveButton extends IButton {
-            load(): SaveButton;
-            load(callback: (element: SaveButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Save+Button relevant section in reference guide}
-         */
-        class SaveButton extends Button implements ISaveButton {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IClientTemplate extends elements.IElement {
-            load(): ClientTemplate;
-            load(callback: (element: ClientTemplate) => void): any;
-        }
-        class ClientTemplate extends elements.Element implements IClientTemplate {
-            static typeName: string;
-            template: texts.Text;
-            parameters: instances.IList<ClientTemplateParameter>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IClientTemplateParameter extends elements.IElement {
-            container: IClientTemplate;
-            load(): ClientTemplateParameter;
-            load(callback: (element: ClientTemplateParameter) => void): any;
-        }
-        class ClientTemplateParameter extends elements.Element implements IClientTemplateParameter {
-            static typeName: string;
-            container: ClientTemplate;
-            /**
-             * The value of this property is conceptually of type Paths$AttributePath.
-             */
-            attributePath: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IGrid extends IListenTargetWidget {
-            load(): Grid;
-            load(callback: (element: Grid) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Grid extends ListenTargetWidget implements IGrid {
-            static typeName: string;
-            isControlBarVisible: boolean;
-            isPagingEnabled: boolean;
-            selectionMode: GridSelectionMode;
-            selectFirst: boolean;
-            defaultButtonTrigger: ClickTypeType;
-            refreshTime: number;
-            controlBar: GridControlBar;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IColumnGrid extends IGrid {
-            load(): ColumnGrid;
-            load(callback: (element: ColumnGrid) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ColumnGrid extends Grid implements IColumnGrid {
-            static typeName: string;
-            columns: instances.IList<GridColumn>;
-            numberOfRows: number;
-            showEmptyRows: boolean;
-            widthUnit: UnitEnum;
-            tooltipPage: IPage;
-            tooltipPageQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ISearchField extends IControlBarItem {
-            container: IControlBar;
-            load(): SearchField;
-            load(callback: (element: SearchField) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class SearchField extends ControlBarItem implements ISearchField {
-            static typeName: string;
-            container: ControlBar;
-            caption: texts.Text;
-            type: SearchFieldType;
-            defaultValue: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ISingleSearchField extends ISearchField {
-            container: IControlBar;
-            load(): SingleSearchField;
-            load(callback: (element: SingleSearchField) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class SingleSearchField extends SearchField implements ISingleSearchField {
-            static typeName: string;
-            container: ControlBar;
-            /**
-             * The value of this property is conceptually of type Paths$AttributePath.
-             */
-            attributePath: string;
-            operator: SearchFieldOperator;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Comparison+Search+Field relevant section in reference guide}
-         */
-        interface IComparisonSearchField extends ISingleSearchField {
-            container: IControlBar;
-            load(): ComparisonSearchField;
-            load(callback: (element: ComparisonSearchField) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Comparison+Search+Field relevant section in reference guide}
-         */
-        class ComparisonSearchField extends SingleSearchField implements IComparisonSearchField {
-            static typeName: string;
-            container: ControlBar;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IGridBaseSource extends IEntityPathSource {
-            container: IEntityWidget;
-            load(): GridBaseSource;
-            load(callback: (element: GridBaseSource) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class GridBaseSource extends EntityPathSource implements IGridBaseSource {
-            static typeName: string;
-            container: EntityWidget;
-            sortBar: GridSortBar;
-            searchBar: SearchBar;
-            searchBarType: SearchBarTypeEnum;
-            waitForSearch: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IGridDatabaseSource extends IGridBaseSource {
-            container: IEntityWidget;
-            load(): GridDatabaseSource;
-            load(callback: (element: GridDatabaseSource) => void): any;
-        }
-        class GridDatabaseSource extends GridBaseSource implements IGridDatabaseSource {
-            static typeName: string;
-            container: EntityWidget;
-            /**
-             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
-             */
-            xPathConstraint: string;
-            applyContext: boolean;
-            removeAllFromContext: boolean;
-            removeFromContextIds: instances.IList<domainmodels.IEntity>;
-            removeFromContextIdsQualifiedNames: string[];
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+Grid relevant section in reference guide}
-         */
-        interface IDataGrid extends IColumnGrid {
-            load(): DataGrid;
-            load(callback: (element: DataGrid) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+Grid relevant section in reference guide}
-         */
-        class DataGrid extends ColumnGrid implements IDataGrid {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IGridControlBarButton extends IControlBarButton {
-            load(): GridControlBarButton;
-            load(callback: (element: GridControlBarButton) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class GridControlBarButton extends ControlBarButton implements IGridControlBarButton {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Add+Button relevant section in reference guide}
-         */
-        interface IDataGridAddButton extends IGridControlBarButton {
-            container: IControlBar;
-            load(): DataGridAddButton;
-            load(callback: (element: DataGridAddButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Add+Button relevant section in reference guide}
-         */
-        class DataGridAddButton extends GridControlBarButton implements IDataGridAddButton {
-            static typeName: string;
-            container: ControlBar;
-            pageSettings: PageSettings;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Export+To+CSV+Button relevant section in reference guide}
-         */
-        interface IDataGridExportToCSVButton extends IGridControlBarButton {
-            container: IControlBar;
-            load(): DataGridExportToCSVButton;
-            load(callback: (element: DataGridExportToCSVButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Export+To+CSV+Button relevant section in reference guide}
-         */
-        class DataGridExportToCSVButton extends GridControlBarButton implements IDataGridExportToCSVButton {
-            static typeName: string;
-            container: ControlBar;
-            maxNumberOfRows: number;
-            decimalSeparator: string;
-            groupSeparator: string;
-            delimiter: string;
-            generateExcelHint: boolean;
-            useGridDateFormat: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Export+To+Excel+Button relevant section in reference guide}
-         */
-        interface IDataGridExportToExcelButton extends IGridControlBarButton {
-            container: IControlBar;
-            load(): DataGridExportToExcelButton;
-            load(callback: (element: DataGridExportToExcelButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Export+To+Excel+Button relevant section in reference guide}
-         */
-        class DataGridExportToExcelButton extends GridControlBarButton implements IDataGridExportToExcelButton {
-            static typeName: string;
-            container: ControlBar;
-            maxNumberOfRows: number;
-            useExcelDateType: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Remove+Button relevant section in reference guide}
-         */
-        interface IDataGridRemoveButton extends IGridControlBarButton {
-            container: IControlBar;
-            load(): DataGridRemoveButton;
-            load(callback: (element: DataGridRemoveButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Remove+Button relevant section in reference guide}
-         */
-        class DataGridRemoveButton extends GridControlBarButton implements IDataGridRemoveButton {
-            static typeName: string;
-            container: ControlBar;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Drop-Down+Widget relevant section in reference guide}
-         */
-        interface IDropDown extends IAttributeWidget {
-            load(): DropDown;
-            load(callback: (element: DropDown) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Drop-Down+Widget relevant section in reference guide}
-         */
-        class DropDown extends AttributeWidget implements IDropDown {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Drop+Down+Button relevant section in reference guide}
-         */
-        interface IDropDownButton extends IButton {
-            load(): DropDownButton;
-            load(callback: (element: DropDownButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Drop+Down+Button relevant section in reference guide}
-         */
-        class DropDownButton extends Button implements IDropDownButton {
-            static typeName: string;
-            items: instances.IList<DropDownButtonItem>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IActionItem extends elements.IElement {
-            container: IConditionallyVisibleWidget;
-            load(): ActionItem;
-            load(callback: (element: ActionItem) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ActionItem extends elements.Element implements IActionItem {
-            static typeName: string;
-            container: ConditionallyVisibleWidget;
-            action: ClientAction;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IDropDownButtonItem extends IActionItem {
-            container: IDropDownButton;
-            load(): DropDownButtonItem;
-            load(callback: (element: DropDownButtonItem) => void): any;
-        }
-        class DropDownButtonItem extends ActionItem implements IDropDownButtonItem {
-            static typeName: string;
-            container: DropDownButton;
-            caption: texts.Text;
-            image: images.IImage;
-            imageQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Drop-down+Search+Field relevant section in reference guide}
-         */
-        interface IDropDownSearchField extends ISingleSearchField {
-            container: IControlBar;
-            load(): DropDownSearchField;
-            load(callback: (element: DropDownSearchField) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Drop-down+Search+Field relevant section in reference guide}
-         */
-        class DropDownSearchField extends SingleSearchField implements IDropDownSearchField {
-            static typeName: string;
-            container: ControlBar;
-            sortBar: GridSortBar;
-            /**
-             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
-             */
-            xPathConstraint: string;
-            allowMultipleSelect: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Image+Viewer relevant section in reference guide}
-         */
-        interface IDynamicImageViewer extends IEntityWidget {
-            load(): DynamicImageViewer;
-            load(callback: (element: DynamicImageViewer) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Image+Viewer relevant section in reference guide}
-         */
-        class DynamicImageViewer extends EntityWidget implements IDynamicImageViewer {
-            static typeName: string;
-            defaultImage: images.IImage;
-            defaultImageQualifiedName: string;
-            widthUnit: ImageSizeUnit;
-            heightUnit: ImageSizeUnit;
-            width: number;
-            height: number;
-            responsive: boolean;
-            showAsThumbnail: boolean;
-            onClickBehavior: OnClickBehavior;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Text relevant section in reference guide}
-         */
-        interface IDynamicText extends IConditionallyVisibleWidget {
-            load(): DynamicText;
-            load(callback: (element: DynamicText) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Text relevant section in reference guide}
-         */
-        class DynamicText extends ConditionallyVisibleWidget implements IDynamicText {
-            static typeName: string;
-            content: ClientTemplate;
-            renderMode: TextRenderMode;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/File+Manager relevant section in reference guide}
-         */
-        interface IFileManager extends IInputWidget {
-            load(): FileManager;
-            load(callback: (element: FileManager) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/File+Manager relevant section in reference guide}
-         */
-        class FileManager extends InputWidget implements IFileManager {
-            static typeName: string;
-            allowedExtensions: string;
-            type: FileManagerType;
-            maxFileSize: number;
-            showFileInBrowser: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IPageForSpecialization extends elements.IElement {
-            container: IGridEditButton;
-            load(): PageForSpecialization;
-            load(callback: (element: PageForSpecialization) => void): any;
-        }
-        class PageForSpecialization extends elements.Element implements IPageForSpecialization {
-            static typeName: string;
-            container: GridEditButton;
-            entity: domainmodels.IEntity;
-            entityQualifiedName: string;
-            pageSettings: PageSettings;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Image+Property relevant section in reference guide}
-         */
-        interface IIcon extends elements.IElement {
-            load(): Icon;
-            load(callback: (element: Icon) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Image+Property relevant section in reference guide}
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Icon extends elements.Element implements IIcon {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IGlyphIcon extends IIcon {
-            load(): GlyphIcon;
-            load(callback: (element: GlyphIcon) => void): any;
-        }
-        class GlyphIcon extends Icon implements IGlyphIcon {
-            static typeName: string;
-            code: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Grid+action+button relevant section in reference guide}
-         */
-        interface IGridActionButton extends IGridControlBarButton {
-            container: IControlBar;
-            load(): GridActionButton;
-            load(callback: (element: GridActionButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Grid+action+button relevant section in reference guide}
-         */
-        class GridActionButton extends GridControlBarButton implements IGridActionButton {
-            static typeName: string;
-            container: ControlBar;
-            action: ClientAction;
-            maintainSelectionAfterMicroflow: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Columns relevant section in reference guide}
-         */
-        interface IGridColumn extends elements.IElement {
-            container: IColumnGrid;
-            load(): GridColumn;
-            load(callback: (element: GridColumn) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Columns relevant section in reference guide}
-         */
-        class GridColumn extends elements.Element implements IGridColumn {
-            static typeName: string;
-            container: ColumnGrid;
-            name: string;
-            caption: texts.Text;
-            /**
-             * The value of this property is conceptually of type Paths$AttributePath.
-             */
-            attributePath: string;
-            formattingInfo: FormattingInfo;
-            showTooltip: boolean;
-            aggregateCaption: texts.Text;
-            aggregateFunction: AggregateFunction;
-            editable: boolean;
-            width: number;
-            class: string;
-            style: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Control+Bar relevant section in reference guide}
-         */
-        interface IGridControlBar extends IControlBar {
-            container: IGrid;
-            load(): GridControlBar;
-            load(callback: (element: GridControlBar) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Control+Bar relevant section in reference guide}
-         */
-        class GridControlBar extends ControlBar implements IGridControlBar {
-            static typeName: string;
-            container: Grid;
-            searchButton: GridSearchButton;
-            defaultButton: ControlBarItem;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Delete+Button relevant section in reference guide}
-         */
-        interface IGridDeleteButton extends IGridControlBarButton {
-            container: IControlBar;
-            load(): GridDeleteButton;
-            load(callback: (element: GridDeleteButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Delete+Button relevant section in reference guide}
-         */
-        class GridDeleteButton extends GridControlBarButton implements IGridDeleteButton {
-            static typeName: string;
-            container: ControlBar;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Deselect+All+Button relevant section in reference guide}
-         */
-        interface IGridDeselectAllButton extends IGridControlBarButton {
-            container: IControlBar;
-            load(): GridDeselectAllButton;
-            load(callback: (element: GridDeselectAllButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Deselect+All+Button relevant section in reference guide}
-         */
-        class GridDeselectAllButton extends GridControlBarButton implements IGridDeselectAllButton {
-            static typeName: string;
-            container: ControlBar;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Edit+Button relevant section in reference guide}
-         */
-        interface IGridEditButton extends IGridControlBarButton {
-            container: IControlBar;
-            load(): GridEditButton;
-            load(callback: (element: GridEditButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Edit+Button relevant section in reference guide}
-         */
-        class GridEditButton extends GridControlBarButton implements IGridEditButton {
-            static typeName: string;
-            container: ControlBar;
-            pageSettings: PageSettings;
-            pagesForSpecializations: instances.IList<PageForSpecialization>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Grid+New+Button relevant section in reference guide}
-         */
-        interface IGridNewButton extends IGridControlBarButton {
-            container: IControlBar;
-            load(): GridNewButton;
-            load(callback: (element: GridNewButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Grid+New+Button relevant section in reference guide}
-         */
-        class GridNewButton extends GridControlBarButton implements IGridNewButton {
-            static typeName: string;
-            container: ControlBar;
-            entity: domainmodels.IEntity;
-            entityQualifiedName: string;
-            editLocation: NewButtonEditLocation;
-            pageSettings: PageSettings;
-            isPersistent: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Search+Button relevant section in reference guide}
-         */
-        interface IGridSearchButton extends IGridControlBarButton {
-            load(): GridSearchButton;
-            load(callback: (element: GridSearchButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Search+Button relevant section in reference guide}
-         */
-        class GridSearchButton extends GridControlBarButton implements IGridSearchButton {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Select+All+Button relevant section in reference guide}
-         */
-        interface IGridSelectAllButton extends IGridControlBarButton {
-            container: IControlBar;
-            load(): GridSelectAllButton;
-            load(callback: (element: GridSelectAllButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Select+All+Button relevant section in reference guide}
-         */
-        class GridSelectAllButton extends GridControlBarButton implements IGridSelectAllButton {
-            static typeName: string;
-            container: ControlBar;
-            selectionType: SelectionType;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Group+Box relevant section in reference guide}
-         */
-        interface IGroupBox extends IConditionallyVisibleWidget {
-            load(): GroupBox;
-            load(callback: (element: GroupBox) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Group+Box relevant section in reference guide}
-         */
-        class GroupBox extends ConditionallyVisibleWidget implements IGroupBox {
-            static typeName: string;
-            caption: ClientTemplate;
-            collapsible: GroupBoxCollapsible;
-            widget: Widget;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Header relevant section in reference guide}
-         */
-        interface IHeader extends IWidget {
-            load(): Header;
-            load(callback: (element: Header) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Header relevant section in reference guide}
-         */
-        class Header extends Widget implements IHeader {
-            static typeName: string;
-            leftWidget: Widget;
-            rightWidget: Widget;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ISplitPane extends IWidget {
-            load(): SplitPane;
-            load(callback: (element: SplitPane) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class SplitPane extends Widget implements ISplitPane {
-            static typeName: string;
-            firstWidget: Widget;
-            secondWidget: Widget;
-            animatedResize: boolean;
-            height: number;
-            position: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Horizontal+Split+Pane relevant section in reference guide}
-         */
-        interface IHorizontalSplitPane extends ISplitPane {
-            load(): HorizontalSplitPane;
-            load(callback: (element: HorizontalSplitPane) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Horizontal+Split+Pane relevant section in reference guide}
-         */
-        class HorizontalSplitPane extends SplitPane implements IHorizontalSplitPane {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IImageIcon extends IIcon {
-            load(): ImageIcon;
-            load(callback: (element: ImageIcon) => void): any;
-        }
-        class ImageIcon extends Icon implements IImageIcon {
-            static typeName: string;
-            image: images.IImage;
-            imageQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Image+Uploader relevant section in reference guide}
-         */
-        interface IImageUploader extends IInputWidget {
-            load(): ImageUploader;
-            load(callback: (element: ImageUploader) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Image+Uploader relevant section in reference guide}
-         */
-        class ImageUploader extends InputWidget implements IImageUploader {
-            static typeName: string;
-            allowedExtensions: string;
-            thumbnailSize: common.ISize;
-            maxFileSize: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IImageViewerSource extends IEntityPathSource {
-            container: IEntityWidget;
-            load(): ImageViewerSource;
-            load(callback: (element: ImageViewerSource) => void): any;
-        }
-        class ImageViewerSource extends EntityPathSource implements IImageViewerSource {
-            static typeName: string;
-            container: EntityWidget;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IAssociationWidget extends IMemberWidget {
-            load(): AssociationWidget;
-            load(callback: (element: AssociationWidget) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class AssociationWidget extends MemberWidget implements IAssociationWidget {
-            static typeName: string;
-            selectorSource: SelectorSource;
-            selectPageSettings: PageSettings;
-            onChangeMicroflowSettings: MicroflowSettings;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Input+Reference+Set+Selector relevant section in reference guide}
-         */
-        interface IInputReferenceSetSelector extends IAssociationWidget {
-            load(): InputReferenceSetSelector;
-            load(callback: (element: InputReferenceSetSelector) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Input+Reference+Set+Selector relevant section in reference guide}
-         */
-        class InputReferenceSetSelector extends AssociationWidget implements IInputReferenceSetSelector {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Layout+Grid relevant section in reference guide}
-         */
-        interface ILayoutGrid extends IConditionallyVisibleWidget {
-            load(): LayoutGrid;
-            load(callback: (element: LayoutGrid) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Layout+Grid relevant section in reference guide}
-         */
-        class LayoutGrid extends ConditionallyVisibleWidget implements ILayoutGrid {
-            static typeName: string;
-            width: ContainerWidth;
-            rows: instances.IList<LayoutGridRow>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ILayoutGridColumn extends elements.IElement {
-            container: ILayoutGridRow;
-            load(): LayoutGridColumn;
-            load(callback: (element: LayoutGridColumn) => void): any;
-        }
-        class LayoutGridColumn extends elements.Element implements ILayoutGridColumn {
-            static typeName: string;
-            container: LayoutGridRow;
-            weight: number;
-            widget: Widget;
-            class: string;
-            style: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ILayoutGridRow extends elements.IElement {
-            container: ILayoutGrid;
-            load(): LayoutGridRow;
-            load(callback: (element: LayoutGridRow) => void): any;
-        }
-        class LayoutGridRow extends elements.Element implements ILayoutGridRow {
-            static typeName: string;
-            container: LayoutGrid;
-            columns: instances.IList<LayoutGridColumn>;
-            conditionalVisibilitySettings: ConditionalVisibilitySettings;
-            class: string;
-            style: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Link+Button relevant section in reference guide}
-         */
-        interface ILinkButton extends IButton {
-            load(): LinkButton;
-            load(callback: (element: LinkButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Link+Button relevant section in reference guide}
-         */
-        class LinkButton extends Button implements ILinkButton {
-            static typeName: string;
-            linkType: LinkType;
-            address: StaticOrDynamicString;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Menu+Widgets relevant section in reference guide}
-         */
-        interface IMenuWidget extends IWidget {
-            load(): MenuWidget;
-            load(callback: (element: MenuWidget) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Menu+Widgets relevant section in reference guide}
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class MenuWidget extends Widget implements IMenuWidget {
-            static typeName: string;
-            menuSource: MenuSource;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Menu+Bar relevant section in reference guide}
-         */
-        interface IMenuBar extends IMenuWidget {
-            load(): MenuBar;
-            load(callback: (element: MenuBar) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Menu+Bar relevant section in reference guide}
-         */
-        class MenuBar extends MenuWidget implements IMenuBar {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMenuSource extends elements.IElement {
-            container: IMenuWidget;
-            load(): MenuSource;
-            load(callback: (element: MenuSource) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class MenuSource extends elements.Element implements IMenuSource {
-            static typeName: string;
-            container: MenuWidget;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IMenuDocumentSource extends IMenuSource {
-            container: IMenuWidget;
-            load(): MenuDocumentSource;
-            load(callback: (element: MenuDocumentSource) => void): any;
-        }
-        class MenuDocumentSource extends MenuSource implements IMenuDocumentSource {
-            static typeName: string;
-            container: MenuWidget;
-            menu: menus.IMenuDocument;
-            menuQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Navigation+List relevant section in reference guide}
-         */
-        interface INavigationList extends IConditionallyVisibleWidget {
-            load(): NavigationList;
-            load(callback: (element: NavigationList) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Navigation+List relevant section in reference guide}
-         */
-        class NavigationList extends ConditionallyVisibleWidget implements INavigationList {
-            static typeName: string;
-            items: instances.IList<NavigationListItem>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface INavigationListItem extends IActionItem {
-            container: INavigationList;
-            load(): NavigationListItem;
-            load(callback: (element: NavigationListItem) => void): any;
-        }
-        class NavigationListItem extends ActionItem implements INavigationListItem {
-            static typeName: string;
-            container: NavigationList;
-            widget: Widget;
-            class: string;
-            style: string;
-            conditionalVisibilitySettings: ConditionalVisibilitySettings;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface INavigationSource extends IMenuSource {
-            container: IMenuWidget;
-            load(): NavigationSource;
-            load(callback: (element: NavigationSource) => void): any;
-        }
-        class NavigationSource extends MenuSource implements INavigationSource {
-            static typeName: string;
-            container: MenuWidget;
-            deviceType: navigation.DeviceType;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Navigation+Tree relevant section in reference guide}
-         */
-        interface INavigationTree extends IMenuWidget {
-            load(): NavigationTree;
-            load(callback: (element: NavigationTree) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Navigation+Tree relevant section in reference guide}
-         */
-        class NavigationTree extends MenuWidget implements INavigationTree {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IOnClickBehavior extends elements.IElement {
-            container: IDynamicImageViewer;
-            load(): OnClickBehavior;
-            load(callback: (element: OnClickBehavior) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class OnClickBehavior extends elements.Element implements IOnClickBehavior {
-            static typeName: string;
-            container: DynamicImageViewer;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IOnClickEnlarge extends IOnClickBehavior {
-            container: IDynamicImageViewer;
-            load(): OnClickEnlarge;
-            load(callback: (element: OnClickEnlarge) => void): any;
-        }
-        class OnClickEnlarge extends OnClickBehavior implements IOnClickEnlarge {
-            static typeName: string;
-            container: DynamicImageViewer;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IOnClickMicroflow extends IOnClickBehavior {
-            container: IDynamicImageViewer;
-            load(): OnClickMicroflow;
-            load(callback: (element: OnClickMicroflow) => void): any;
-        }
-        class OnClickMicroflow extends OnClickBehavior implements IOnClickMicroflow {
-            static typeName: string;
-            container: DynamicImageViewer;
-            microflowSettings: MicroflowSettings;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IOnClickNothing extends IOnClickBehavior {
-            container: IDynamicImageViewer;
-            load(): OnClickNothing;
-            load(callback: (element: OnClickNothing) => void): any;
-        }
-        class OnClickNothing extends OnClickBehavior implements IOnClickNothing {
-            static typeName: string;
-            container: DynamicImageViewer;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Range+Search+Field relevant section in reference guide}
-         */
-        interface IRangeSearchField extends ISearchField {
-            container: IControlBar;
-            load(): RangeSearchField;
-            load(callback: (element: RangeSearchField) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Range+Search+Field relevant section in reference guide}
-         */
-        class RangeSearchField extends SearchField implements IRangeSearchField {
-            static typeName: string;
-            container: ControlBar;
-            /**
-             * The value of this property is conceptually of type Paths$AttributePath.
-             */
-            lowerBound: string;
-            /**
-             * The value of this property is conceptually of type Paths$AttributePath.
-             */
-            upperBound: string;
-            includeLower: boolean;
-            includeUpper: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Reference+Selector relevant section in reference guide}
-         */
-        interface IReferenceSelector extends IAssociationWidget {
-            load(): ReferenceSelector;
-            load(callback: (element: ReferenceSelector) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Reference+Selector relevant section in reference guide}
-         */
-        class ReferenceSelector extends AssociationWidget implements IReferenceSelector {
-            static typeName: string;
-            required: boolean;
-            requiredMessage: texts.Text;
-            renderMode: ReferenceSelectorRenderModeType;
-            gotoPageSettings: PageSettings;
-            formattingInfo: FormattingInfo;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Reference+Set+Selector relevant section in reference guide}
-         */
-        interface IReferenceSetSelector extends IColumnGrid {
-            load(): ReferenceSetSelector;
-            load(callback: (element: ReferenceSetSelector) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Reference+Set+Selector relevant section in reference guide}
-         */
-        class ReferenceSetSelector extends ColumnGrid implements IReferenceSetSelector {
-            static typeName: string;
-            onChangeMicroflowSettings: MicroflowSettings;
-            /**
-             * The value of this property is conceptually of type Paths$EntityPath.
-             */
-            constrainedBy: instances.IList<string>;
-            /**
-             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
-             */
-            xPathConstraint: string;
-            removeAllFromContext: boolean;
-            removeFromContextEntities: instances.IList<domainmodels.IEntity>;
-            removeFromContextEntitiesQualifiedNames: string[];
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IReferenceSetSource extends IGridBaseSource {
-            container: IEntityWidget;
-            load(): ReferenceSetSource;
-            load(callback: (element: ReferenceSetSource) => void): any;
-        }
-        class ReferenceSetSource extends GridBaseSource implements IReferenceSetSource {
-            static typeName: string;
-            container: EntityWidget;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Scroll+Container relevant section in reference guide}
-         */
-        interface IScrollContainer extends IWidget {
-            load(): ScrollContainer;
-            load(callback: (element: ScrollContainer) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Scroll+Container relevant section in reference guide}
-         */
-        class ScrollContainer extends Widget implements IScrollContainer {
-            static typeName: string;
-            center: ScrollContainerRegion;
-            left: ScrollContainerRegion;
-            right: ScrollContainerRegion;
-            top: ScrollContainerRegion;
-            bottom: ScrollContainerRegion;
-            layoutMode: LayoutModeType;
-            widthMode: SizeMode;
-            width: number;
-            alignment: AlignmentEnum;
-            scrollBehavior: ScrollBehavior;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IScrollContainerRegion extends elements.IElement {
-            container: IScrollContainer;
-            load(): ScrollContainerRegion;
-            load(callback: (element: ScrollContainerRegion) => void): any;
-        }
-        class ScrollContainerRegion extends elements.Element implements IScrollContainerRegion {
-            static typeName: string;
-            container: ScrollContainer;
-            widget: Widget;
-            sizeMode: SizeMode;
-            size: number;
-            class: string;
-            style: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Search+Bar relevant section in reference guide}
-         */
-        interface ISearchBar extends IControlBar {
-            container: IGridBaseSource;
-            load(): SearchBar;
-            load(callback: (element: SearchBar) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Search+Bar relevant section in reference guide}
-         */
-        class SearchBar extends ControlBar implements ISearchBar {
-            static typeName: string;
-            container: GridBaseSource;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Select+Button relevant section in reference guide}
-         */
-        interface ISelectButton extends IGridControlBarButton {
-            container: IControlBar;
-            load(): SelectButton;
-            load(callback: (element: SelectButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Select+Button relevant section in reference guide}
-         */
-        class SelectButton extends GridControlBarButton implements ISelectButton {
-            static typeName: string;
-            container: ControlBar;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ISelectorSource extends elements.IElement {
-            container: IAssociationWidget;
-            load(): SelectorSource;
-            load(callback: (element: SelectorSource) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class SelectorSource extends elements.Element implements ISelectorSource {
-            static typeName: string;
-            container: AssociationWidget;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface ISelectorDatabaseSource extends ISelectorSource {
-            container: IAssociationWidget;
-            load(): SelectorDatabaseSource;
-            load(callback: (element: SelectorDatabaseSource) => void): any;
-        }
-        class SelectorDatabaseSource extends SelectorSource implements ISelectorDatabaseSource {
-            static typeName: string;
-            container: AssociationWidget;
-            sortBar: GridSortBar;
-            /**
-             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
-             */
-            xPathConstraint: string;
-            /**
-             * The value of this property is conceptually of type Paths$EntityPath.
-             */
-            constrainedBy: instances.IList<string>;
-            applyContext: boolean;
-            removeAllFromContext: boolean;
-            removeFromContextEntities: instances.IList<domainmodels.IEntity>;
-            removeFromContextEntitiesQualifiedNames: string[];
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ISelectorMicroflowSource extends ISelectorSource {
-            container: IAssociationWidget;
-            load(): SelectorMicroflowSource;
-            load(callback: (element: SelectorMicroflowSource) => void): any;
-        }
-        class SelectorMicroflowSource extends SelectorSource implements ISelectorMicroflowSource {
-            static typeName: string;
-            container: AssociationWidget;
-            dataSourceMicroflowSettings: MicroflowSettings;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Sidebar+Toggle+Button relevant section in reference guide}
-         */
-        interface ISidebarToggleButton extends IButton {
-            load(): SidebarToggleButton;
-            load(callback: (element: SidebarToggleButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Sidebar+Toggle+Button relevant section in reference guide}
-         */
-        class SidebarToggleButton extends Button implements ISidebarToggleButton {
-            static typeName: string;
-            region: SidebarToggleRegion;
-            mode: SidebarToggleMode;
-            initiallyOpen: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Simple+Menu+Bar relevant section in reference guide}
-         */
-        interface ISimpleMenuBar extends IMenuWidget {
-            load(): SimpleMenuBar;
-            load(callback: (element: SimpleMenuBar) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Simple+Menu+Bar relevant section in reference guide}
-         */
-        class SimpleMenuBar extends MenuWidget implements ISimpleMenuBar {
-            static typeName: string;
-            orientation: SimpleMenuBarOrientation;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Snippet relevant section in reference guide}
-         */
-        interface ISnippet extends IFormBase {
-            container: projects.IFolderBase;
-            load(): Snippet;
-            load(callback: (element: Snippet) => void): any;
-            entity: domainmodels.IEntity;
-            entityQualifiedName: string;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Snippet relevant section in reference guide}
-         */
-        class Snippet extends FormBase implements ISnippet {
-            static typeName: string;
-            container: projects.FolderBase;
-            entity: domainmodels.IEntity;
-            entityQualifiedName: string;
-            widget: Widget;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ISnippetCall extends elements.IElement {
-            container: ISnippetCallWidget;
-            load(): SnippetCall;
-            load(callback: (element: SnippetCall) => void): any;
-        }
-        class SnippetCall extends elements.Element implements ISnippetCall {
-            static typeName: string;
-            container: SnippetCallWidget;
-            snippet: ISnippet;
-            snippetQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Snippet+Call relevant section in reference guide}
-         */
-        interface ISnippetCallWidget extends IWidget {
-            load(): SnippetCallWidget;
-            load(callback: (element: SnippetCallWidget) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Snippet+Call relevant section in reference guide}
-         */
-        class SnippetCallWidget extends Widget implements ISnippetCallWidget {
-            static typeName: string;
-            snippetCall: SnippetCall;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Tab+Container relevant section in reference guide}
-         */
-        interface ITabContainer extends IConditionallyVisibleWidget {
-            load(): TabContainer;
-            load(callback: (element: TabContainer) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Tab+Container relevant section in reference guide}
-         */
-        class TabContainer extends ConditionallyVisibleWidget implements ITabContainer {
-            static typeName: string;
-            tabPages: instances.IList<TabPage>;
-            defaultPage: TabPage;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Tab+Page relevant section in reference guide}
-         */
-        interface ITabPage extends elements.IElement {
-            container: ITabContainer;
-            load(): TabPage;
-            load(callback: (element: TabPage) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Tab+Page relevant section in reference guide}
-         */
-        class TabPage extends elements.Element implements ITabPage {
-            static typeName: string;
-            container: TabContainer;
-            name: string;
-            caption: texts.Text;
-            refreshOnShow: boolean;
-            conditionalVisibilitySettings: ConditionalVisibilitySettings;
-            widget: Widget;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Template+Grid relevant section in reference guide}
-         */
-        interface ITemplateGrid extends IGrid {
-            load(): TemplateGrid;
-            load(callback: (element: TemplateGrid) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Template+Grid relevant section in reference guide}
-         */
-        class TemplateGrid extends Grid implements ITemplateGrid {
-            static typeName: string;
-            contents: TemplateGridContents;
-            numberOfRows: number;
-            numberOfColumns: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ITemplateGridContents extends elements.IElement {
-            container: ITemplateGrid;
-            load(): TemplateGridContents;
-            load(callback: (element: TemplateGridContents) => void): any;
-        }
-        class TemplateGridContents extends elements.Element implements ITemplateGridContents {
-            static typeName: string;
-            container: TemplateGrid;
-            widget: Widget;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Page+Title relevant section in reference guide}
-         */
-        interface ITitle extends IConditionallyVisibleWidget {
-            load(): Title;
-            load(callback: (element: Title) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Page+Title relevant section in reference guide}
-         */
-        class Title extends ConditionallyVisibleWidget implements ITitle {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Vertical+Split+Pane relevant section in reference guide}
-         */
-        interface IVerticalSplitPane extends ISplitPane {
-            load(): VerticalSplitPane;
-            load(callback: (element: VerticalSplitPane) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Vertical+Split+Pane relevant section in reference guide}
-         */
-        class VerticalSplitPane extends SplitPane implements IVerticalSplitPane {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IProjectSettingsPart extends elements.IElement {
-            container: settings.IProjectSettings;
-            load(): ProjectSettingsPart;
-            load(callback: (element: ProjectSettingsPart) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ProjectSettingsPart extends elements.Element implements IProjectSettingsPart {
-            static typeName: string;
-            container: settings.ProjectSettings;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IWebUIProjectSettingsPart extends settings.IProjectSettingsPart {
-            container: settings.IProjectSettings;
-            load(): WebUIProjectSettingsPart;
-            load(callback: (element: WebUIProjectSettingsPart) => void): any;
-        }
-        class WebUIProjectSettingsPart extends settings.ProjectSettingsPart implements IWebUIProjectSettingsPart {
-            static typeName: string;
-            container: settings.ProjectSettings;
-            theme: string;
-            feedbackWidgetUpdated: boolean;
-            useModernUI: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        class FormLocation extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Content: FormLocation;
-            static Popup: FormLocation;
-            static ModalPopup: FormLocation;
-        }
-        class ProgressBarType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static None: ProgressBarType;
-            static NonBlocking: ProgressBarType;
-            static Blocking: ProgressBarType;
-        }
-        class FormValidations extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static None: FormValidations;
-            static Widget: FormValidations;
-            static All: FormValidations;
-        }
-        class EnumFormat extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Text: EnumFormat;
-            static Image: EnumFormat;
-        }
-        class DateFormat extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Date: DateFormat;
-            static Time: DateFormat;
-            static DateTime: DateFormat;
-            static Custom: DateFormat;
-        }
-        class EditableEnum extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Always: EditableEnum;
-            static Never: EditableEnum;
-            static Conditional: EditableEnum;
-        }
-        class UnitEnum extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Weight: UnitEnum;
-            static Pixels: UnitEnum;
-        }
-        class SortDirection extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Ascending: SortDirection;
-            static Descending: SortDirection;
-        }
-        class RenderType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Button: RenderType;
-            static Link: RenderType;
-        }
-        class ButtonStyle extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Default: ButtonStyle;
-            static Inverse: ButtonStyle;
-            static Primary: ButtonStyle;
-            static Info: ButtonStyle;
-            static Success: ButtonStyle;
-            static Warning: ButtonStyle;
-            static Danger: ButtonStyle;
-        }
-        class AggregateFunction extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static None: AggregateFunction;
-            static Average: AggregateFunction;
-            static Maximum: AggregateFunction;
-            static Minimum: AggregateFunction;
-            static Sum: AggregateFunction;
-            static Count: AggregateFunction;
-        }
-        class AlignmentEnum extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Left: AlignmentEnum;
-            static Center: AlignmentEnum;
-            static Right: AlignmentEnum;
-        }
-        class ClickTypeType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Single: ClickTypeType;
-            static Double: ClickTypeType;
-        }
-        class ContainerWidth extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static FullWidth: ContainerWidth;
-            static FixedWidth: ContainerWidth;
-        }
-        class FileManagerType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Upload: FileManagerType;
-            static Download: FileManagerType;
-            static Both: FileManagerType;
-        }
-        class GridSelectionMode extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static None: GridSelectionMode;
-            static Single: GridSelectionMode;
-            static SingleAndMaintain: GridSelectionMode;
-            static Multi: GridSelectionMode;
-            static SimpleMulti: GridSelectionMode;
-        }
-        class GroupBoxCollapsible extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static No: GroupBoxCollapsible;
-            static YesInitiallyExpanded: GroupBoxCollapsible;
-            static YesInitiallyCollapsed: GroupBoxCollapsible;
-        }
-        class ImageSizeUnit extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Auto: ImageSizeUnit;
-            static Pixels: ImageSizeUnit;
-            static Percentage: ImageSizeUnit;
-        }
-        class LayoutModeType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Headline: LayoutModeType;
-            static Sidebar: LayoutModeType;
-        }
-        class LayoutType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Responsive: LayoutType;
-            static Tablet: LayoutType;
-            static Phone: LayoutType;
-            static ModalPopup: LayoutType;
-            static Popup: LayoutType;
-            static Legacy: LayoutType;
-        }
-        class LinkType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Web: LinkType;
-            static Email: LinkType;
-            static Call: LinkType;
-            static Text: LinkType;
-        }
-        class MobileFooterType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static None: MobileFooterType;
-            static MenuBar: MobileFooterType;
-            static Custom: MobileFooterType;
-        }
-        class NewButtonEditLocation extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static InlineAtTop: NewButtonEditLocation;
-            static InlineAtBottom: NewButtonEditLocation;
-            static Form: NewButtonEditLocation;
-        }
-        class ReferenceSelectorRenderModeType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Form: ReferenceSelectorRenderModeType;
-            static DropDown: ReferenceSelectorRenderModeType;
-        }
-        class RenderModeType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Button: RenderModeType;
-            static Link: RenderModeType;
-        }
-        class ScrollBehavior extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static PerRegion: ScrollBehavior;
-            static FullWidget: ScrollBehavior;
-        }
-        class SearchBarTypeEnum extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static None: SearchBarTypeEnum;
-            static FoldableOpen: SearchBarTypeEnum;
-            static FoldableClosed: SearchBarTypeEnum;
-            static AlwaysOpen: SearchBarTypeEnum;
-        }
-        class SearchFieldOperator extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Contains: SearchFieldOperator;
-            static StartsWith: SearchFieldOperator;
-            static Greater: SearchFieldOperator;
-            static GreaterOrEqual: SearchFieldOperator;
-            static Equal: SearchFieldOperator;
-            static NotEqual: SearchFieldOperator;
-            static SmallerOrEqual: SearchFieldOperator;
-            static Smaller: SearchFieldOperator;
-        }
-        class SearchFieldType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Normal: SearchFieldType;
-            static Hidden: SearchFieldType;
-            static ReadOnly: SearchFieldType;
-        }
-        class SelectionType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static SelectPage: SelectionType;
-            static SelectAll: SelectionType;
-        }
-        class SidebarToggleMode extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static PushContentAside: SidebarToggleMode;
-            static SlideOverContent: SidebarToggleMode;
-            static ShrinkContent: SidebarToggleMode;
-        }
-        class SidebarToggleRegion extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Left: SidebarToggleRegion;
-            static Right: SidebarToggleRegion;
-        }
-        class SimpleMenuBarOrientation extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Horizontal: SimpleMenuBarOrientation;
-            static Vertical: SimpleMenuBarOrientation;
-        }
-        class SizeMode extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Auto: SizeMode;
-            static Pixels: SizeMode;
-            static Percentage: SizeMode;
-        }
-        class TableCellRenderModeType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Default: TableCellRenderModeType;
-            static Header: TableCellRenderModeType;
-            static Title: TableCellRenderModeType;
-        }
-        class TextRenderMode extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Text: TextRenderMode;
-            static Paragraph: TextRenderMode;
-            static H1: TextRenderMode;
-            static H2: TextRenderMode;
-            static H3: TextRenderMode;
-            static H4: TextRenderMode;
-            static H5: TextRenderMode;
-            static H6: TextRenderMode;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `CustomWidgets`.
-     */
-    namespace customwidgets {
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
-         */
-        interface IWidget extends elements.IElement {
-            load(): Widget;
-            load(callback: (element: Widget) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Widget extends elements.Element implements IWidget {
-            static typeName: string;
-            name: string;
-            class: string;
-            style: string;
-            tabIndex: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ICustomWidget extends pages.IWidget {
-            load(): CustomWidget;
-            load(callback: (element: CustomWidget) => void): any;
-        }
-        class CustomWidget extends pages.Widget implements ICustomWidget {
-            static typeName: string;
-            type: CustomWidgetType;
-            object: WidgetObject;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ICustomWidgetType extends elements.IElement {
-            container: ICustomWidget;
-            load(): CustomWidgetType;
-            load(callback: (element: CustomWidgetType) => void): any;
-        }
-        class CustomWidgetType extends elements.Element implements ICustomWidgetType {
-            static typeName: string;
-            container: CustomWidget;
-            widgetId: string;
-            needsEntityContext: boolean;
-            name: string;
-            description: string;
-            phoneGapEnabled: boolean;
-            objectType: WidgetObjectType;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IWidgetEnumerationValue extends elements.IElement {
-            container: IWidgetValueType;
-            load(): WidgetEnumerationValue;
-            load(callback: (element: WidgetEnumerationValue) => void): any;
-        }
-        class WidgetEnumerationValue extends elements.Element implements IWidgetEnumerationValue {
-            static typeName: string;
-            container: WidgetValueType;
-            key: string;
-            caption: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IWidgetObject extends elements.IElement {
-            load(): WidgetObject;
-            load(callback: (element: WidgetObject) => void): any;
-        }
-        class WidgetObject extends elements.Element implements IWidgetObject {
-            static typeName: string;
-            type: WidgetObjectType;
-            properties: instances.IList<WidgetProperty>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IWidgetObjectType extends elements.IElement {
-            load(): WidgetObjectType;
-            load(callback: (element: WidgetObjectType) => void): any;
-        }
-        class WidgetObjectType extends elements.Element implements IWidgetObjectType {
-            static typeName: string;
-            propertyTypes: instances.IList<WidgetPropertyType>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IWidgetProperty extends elements.IElement {
-            container: IWidgetObject;
-            load(): WidgetProperty;
-            load(callback: (element: WidgetProperty) => void): any;
-        }
-        class WidgetProperty extends elements.Element implements IWidgetProperty {
-            static typeName: string;
-            container: WidgetObject;
-            type: WidgetPropertyType;
-            value: WidgetValue;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IWidgetPropertyType extends elements.IElement {
-            container: IWidgetObjectType;
-            load(): WidgetPropertyType;
-            load(callback: (element: WidgetPropertyType) => void): any;
-        }
-        class WidgetPropertyType extends elements.Element implements IWidgetPropertyType {
-            static typeName: string;
-            container: WidgetObjectType;
-            key: string;
-            category: string;
-            caption: string;
-            description: string;
-            isDefault: boolean;
-            valueType: WidgetValueType;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IWidgetReturnType extends elements.IElement {
-            container: IWidgetValueType;
-            load(): WidgetReturnType;
-            load(callback: (element: WidgetReturnType) => void): any;
-        }
-        class WidgetReturnType extends elements.Element implements IWidgetReturnType {
-            static typeName: string;
-            container: WidgetValueType;
-            type: WidgetReturnTypeEnum;
-            isList: boolean;
-            entityProperty: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IWidgetTranslation extends elements.IElement {
-            container: IWidgetValueType;
-            load(): WidgetTranslation;
-            load(callback: (element: WidgetTranslation) => void): any;
-        }
-        class WidgetTranslation extends elements.Element implements IWidgetTranslation {
-            static typeName: string;
-            container: WidgetValueType;
-            languageCode: string;
-            text: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IWidgetValue extends elements.IElement {
-            container: IWidgetProperty;
-            load(): WidgetValue;
-            load(callback: (element: WidgetValue) => void): any;
-        }
-        class WidgetValue extends elements.Element implements IWidgetValue {
-            static typeName: string;
-            container: WidgetProperty;
-            type: WidgetValueType;
-            primitiveValue: string;
-            /**
-             * The value of this property is conceptually of type Paths$EntityPath.
-             */
-            entityPath: string;
-            /**
-             * The value of this property is conceptually of type Paths$AttributePath.
-             */
-            attributePath: string;
-            page: pages.IPage;
-            pageQualifiedName: string;
-            microflow: microflows.IMicroflow;
-            microflowQualifiedName: string;
-            image: images.IImage;
-            imageQualifiedName: string;
-            translatableValue: texts.Text;
-            /**
-             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
-             */
-            xPathConstraint: string;
-            objects: instances.IList<WidgetObject>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IWidgetValueType extends elements.IElement {
-            container: IWidgetPropertyType;
-            load(): WidgetValueType;
-            load(callback: (element: WidgetValueType) => void): any;
-        }
-        class WidgetValueType extends elements.Element implements IWidgetValueType {
-            static typeName: string;
-            container: WidgetPropertyType;
-            type: WidgetValueTypeEnum;
-            isList: boolean;
-            entityProperty: string;
-            allowNonPersistableEntities: boolean;
-            isPath: IsPath;
-            pathType: PathType;
-            parameterIsList: boolean;
-            multiline: boolean;
-            defaultValue: string;
-            required: boolean;
-            attributeTypes: instances.IList<CustomWidgetAttributeType>;
-            enumerationValues: instances.IList<WidgetEnumerationValue>;
-            objectType: WidgetObjectType;
-            returnType: WidgetReturnType;
-            translations: instances.IList<WidgetTranslation>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        class CustomWidgetAttributeType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static AutoNumber: CustomWidgetAttributeType;
-            static Binary: CustomWidgetAttributeType;
-            static Boolean: CustomWidgetAttributeType;
-            static Currency: CustomWidgetAttributeType;
-            static DateTime: CustomWidgetAttributeType;
-            static Enum: CustomWidgetAttributeType;
-            static Float: CustomWidgetAttributeType;
-            static HashString: CustomWidgetAttributeType;
-            static Integer: CustomWidgetAttributeType;
-            static Long: CustomWidgetAttributeType;
-            static String: CustomWidgetAttributeType;
-            static Decimal: CustomWidgetAttributeType;
-        }
-        class IsPath extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static No: IsPath;
-            static Optional: IsPath;
-            static Yes: IsPath;
-        }
-        class PathType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static None: PathType;
-            static Reference: PathType;
-            static ReferenceSet: PathType;
-        }
-        class WidgetReturnTypeEnum extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Void: WidgetReturnTypeEnum;
-            static Boolean: WidgetReturnTypeEnum;
-            static Integer: WidgetReturnTypeEnum;
-            static Float: WidgetReturnTypeEnum;
-            static DateTime: WidgetReturnTypeEnum;
-            static String: WidgetReturnTypeEnum;
-            static Object: WidgetReturnTypeEnum;
-            static Decimal: WidgetReturnTypeEnum;
-        }
-        class WidgetValueTypeEnum extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Attribute: WidgetValueTypeEnum;
-            static Boolean: WidgetValueTypeEnum;
-            static Entity: WidgetValueTypeEnum;
-            static EntityConstraint: WidgetValueTypeEnum;
-            static Enumeration: WidgetValueTypeEnum;
-            static Form: WidgetValueTypeEnum;
-            static Image: WidgetValueTypeEnum;
-            static Integer: WidgetValueTypeEnum;
-            static Microflow: WidgetValueTypeEnum;
-            static Object: WidgetValueTypeEnum;
-            static String: WidgetValueTypeEnum;
-            static TranslatableString: WidgetValueTypeEnum;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `DocumentTemplates`.
-     */
-    namespace documenttemplates {
-        interface IWidget extends elements.IElement {
-            load(): Widget;
-            load(callback: (element: Widget) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Widget extends elements.Element implements IWidget {
-            static typeName: string;
-            name: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IAttributeWidget extends IWidget {
-            load(): AttributeWidget;
-            load(callback: (element: AttributeWidget) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class AttributeWidget extends Widget implements IAttributeWidget {
-            static typeName: string;
-            attributePath: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IConditionSettings extends elements.IElement {
-            container: IMxTableRow;
-            load(): ConditionSettings;
-            load(callback: (element: ConditionSettings) => void): any;
-        }
-        class ConditionSettings extends elements.Element implements IConditionSettings {
-            static typeName: string;
-            container: MxTableRow;
-            conditions: instances.IList<enumerations.Condition>;
-            attribute: domainmodels.IAttribute;
-            attributeQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Columns+(document+template) relevant section in reference guide}
-         */
-        interface IDataGridCell extends elements.IElement {
-            container: IDataGridColumn;
-            load(): DataGridCell;
-            load(callback: (element: DataGridCell) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Columns+(document+template) relevant section in reference guide}
-         */
-        class DataGridCell extends elements.Element implements IDataGridCell {
-            static typeName: string;
-            container: DataGridColumn;
-            style: MxStyle;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Columns+(document+template) relevant section in reference guide}
-         */
-        interface IDataGridColumn extends elements.IElement {
-            container: IMxDataGrid;
-            load(): DataGridColumn;
-            load(callback: (element: DataGridColumn) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Columns+(document+template) relevant section in reference guide}
-         */
-        class DataGridColumn extends elements.Element implements IDataGridColumn {
-            static typeName: string;
-            container: MxDataGrid;
-            oddRowsCell: DataGridCell;
-            evenRowsCell: DataGridCell;
-            caption: texts.Text;
-            formattingInfo: pages.FormattingInfo;
-            style: MxStyle;
-            attributePath: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Sort+Bar relevant section in reference guide}
-         */
-        interface IDocGridSortBar extends elements.IElement {
-            container: IMxGrid;
-            load(): DocGridSortBar;
-            load(callback: (element: DocGridSortBar) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Sort+Bar relevant section in reference guide}
-         */
-        class DocGridSortBar extends elements.Element implements IDocGridSortBar {
-            static typeName: string;
-            container: MxGrid;
-            sortItems: instances.IList<DocGridSortItem>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IDocGridSortItem extends elements.IElement {
-            container: IDocGridSortBar;
-            load(): DocGridSortItem;
-            load(callback: (element: DocGridSortItem) => void): any;
-        }
-        class DocGridSortItem extends elements.Element implements IDocGridSortItem {
-            static typeName: string;
-            container: DocGridSortBar;
-            attributePath: string;
-            sortOrder: pages.SortDirection;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IModuleDocument extends units.IModelUnit {
-            container: projects.IFolderBase;
-            load(): ModuleDocument;
-            load(callback: (element: ModuleDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDocument extends projects.IModuleDocument {
-            container: projects.IFolderBase;
-            load(): Document;
-            load(callback: (element: Document) => void): any;
-            name: string;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Document extends projects.ModuleDocument implements IDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            name: string;
-            documentation: string;
-            excluded: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Document+Templates relevant section in reference guide}
-         */
-        interface IDocumentTemplate extends projects.IDocument {
-            container: projects.IFolderBase;
-            load(): DocumentTemplate;
-            load(callback: (element: DocumentTemplate) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Document+Templates relevant section in reference guide}
-         */
-        class DocumentTemplate extends projects.Document implements IDocumentTemplate {
-            static typeName: string;
-            container: projects.FolderBase;
-            toplevels: instances.IList<Widget>;
-            header: MxHeaderDropZone;
-            footer: MxFooterDropZone;
-            style: MxStyle;
-            canvasWidth: number;
-            pageWidth: string;
-            pageHeight: string;
-            pPI: number;
-            marginLeftInInch: number;
-            marginRightInInch: number;
-            marginTopInInch: number;
-            marginBottomInInch: number;
-            showHeaderAndFooterOnFirstPage: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IEntityWidget extends IWidget {
-            load(): EntityWidget;
-            load(callback: (element: EntityWidget) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class EntityWidget extends Widget implements IEntityWidget {
-            static typeName: string;
-            entityPath: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Dynamic+Image+(document+template) relevant section in reference guide}
-         */
-        interface IDynamicImageViewer extends IEntityWidget {
-            load(): DynamicImageViewer;
-            load(callback: (element: DynamicImageViewer) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Dynamic+Image+(document+template) relevant section in reference guide}
-         */
-        class DynamicImageViewer extends EntityWidget implements IDynamicImageViewer {
-            static typeName: string;
-            image: images.IImage;
-            imageQualifiedName: string;
-            useThumbnail: boolean;
-            width: number;
-            height: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMxGrid extends IEntityWidget {
-            load(): MxGrid;
-            load(callback: (element: MxGrid) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class MxGrid extends EntityWidget implements IMxGrid {
-            static typeName: string;
-            style: MxStyle;
-            sortBar: DocGridSortBar;
-            cellSpacing: number;
-            cellPadding: number;
-            microflow: microflows.IMicroflow;
-            microflowQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+Grid+(document+template) relevant section in reference guide}
-         */
-        interface IMxDataGrid extends IMxGrid {
-            load(): MxDataGrid;
-            load(callback: (element: MxDataGrid) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+Grid+(document+template) relevant section in reference guide}
-         */
-        class MxDataGrid extends MxGrid implements IMxDataGrid {
-            static typeName: string;
-            columns: instances.IList<DataGridColumn>;
-            weights: instances.IList<number>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+View+(document+template) relevant section in reference guide}
-         */
-        interface IMxDataView extends IEntityWidget {
-            load(): MxDataView;
-            load(callback: (element: MxDataView) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+View+(document+template) relevant section in reference guide}
-         */
-        class MxDataView extends EntityWidget implements IMxDataView {
-            static typeName: string;
-            contents: MxDataViewDropZone;
-            microflow: microflows.IMicroflow;
-            microflowQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+View+(document+template) relevant section in reference guide}
-         */
-        interface IMxDataViewDropZone extends elements.IElement {
-            container: IMxDataView;
-            load(): MxDataViewDropZone;
-            load(callback: (element: MxDataViewDropZone) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+View+(document+template) relevant section in reference guide}
-         */
-        class MxDataViewDropZone extends elements.Element implements IMxDataViewDropZone {
-            static typeName: string;
-            container: MxDataView;
-            widget: Widget;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Dynamic+label+(document+template) relevant section in reference guide}
-         */
-        interface IMxDynamicLabel extends IAttributeWidget {
-            load(): MxDynamicLabel;
-            load(callback: (element: MxDynamicLabel) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Dynamic+label+(document+template) relevant section in reference guide}
-         */
-        class MxDynamicLabel extends AttributeWidget implements IMxDynamicLabel {
-            static typeName: string;
-            style: MxStyle;
-            formattingInfo: pages.FormattingInfo;
-            renderXHTML: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Footer+(document+template) relevant section in reference guide}
-         */
-        interface IMxFooterDropZone extends elements.IElement {
-            container: IDocumentTemplate;
-            load(): MxFooterDropZone;
-            load(callback: (element: MxFooterDropZone) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Footer+(document+template) relevant section in reference guide}
-         */
-        class MxFooterDropZone extends elements.Element implements IMxFooterDropZone {
-            static typeName: string;
-            container: DocumentTemplate;
-            widget: Widget;
-            bottomMargin: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Header+(document+template) relevant section in reference guide}
-         */
-        interface IMxHeaderDropZone extends elements.IElement {
-            container: IDocumentTemplate;
-            load(): MxHeaderDropZone;
-            load(callback: (element: MxHeaderDropZone) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Header+(document+template) relevant section in reference guide}
-         */
-        class MxHeaderDropZone extends elements.Element implements IMxHeaderDropZone {
-            static typeName: string;
-            container: DocumentTemplate;
-            widget: Widget;
-            topMargin: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Line+Break+(document+template) relevant section in reference guide}
-         */
-        interface IMxLineBreak extends IWidget {
-            load(): MxLineBreak;
-            load(callback: (element: MxLineBreak) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Line+Break+(document+template) relevant section in reference guide}
-         */
-        class MxLineBreak extends Widget implements IMxLineBreak {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Page+Break+(document+template) relevant section in reference guide}
-         */
-        interface IMxPageBreak extends IWidget {
-            load(): MxPageBreak;
-            load(callback: (element: MxPageBreak) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Page+Break+(document+template) relevant section in reference guide}
-         */
-        class MxPageBreak extends Widget implements IMxPageBreak {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Static+label+(document+template) relevant section in reference guide}
-         */
-        interface IMxStaticLabel extends IWidget {
-            load(): MxStaticLabel;
-            load(callback: (element: MxStaticLabel) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Static+label+(document+template) relevant section in reference guide}
-         */
-        class MxStaticLabel extends Widget implements IMxStaticLabel {
-            static typeName: string;
-            caption: texts.Text;
-            style: MxStyle;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMxStyle extends elements.IElement {
-            load(): MxStyle;
-            load(callback: (element: MxStyle) => void): any;
-        }
-        class MxStyle extends elements.Element implements IMxStyle {
-            static typeName: string;
-            fontFamily: FontFamily;
-            fontSize: number;
-            bold: boolean;
-            italic: boolean;
-            fontColor: string;
-            backgroundColor: string;
-            overrideFontFamily: boolean;
-            overrideFontSize: boolean;
-            overrideBold: boolean;
-            overrideItalic: boolean;
-            overrideFontColor: boolean;
-            overrideBackgroundColor: boolean;
-            textAlign: TextAlign;
-            customStyles: string;
-            borderStyleTop: BorderStyle;
-            borderStyleBottom: BorderStyle;
-            borderStyleLeft: BorderStyle;
-            borderStyleRight: BorderStyle;
-            borderWidthTop: number;
-            borderWidthBottom: number;
-            borderWidthLeft: number;
-            borderWidthRight: number;
-            borderColorTop: string;
-            borderColorBottom: string;
-            borderColorLeft: string;
-            borderColorRight: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Table+(document+template) relevant section in reference guide}
-         */
-        interface IMxTable extends IWidget {
-            load(): MxTable;
-            load(callback: (element: MxTable) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Table+(document+template) relevant section in reference guide}
-         */
-        class MxTable extends Widget implements IMxTable {
-            static typeName: string;
-            rows: instances.IList<MxTableRow>;
-            style: MxStyle;
-            columnWeights: instances.IList<number>;
-            cellSpacing: number;
-            cellPadding: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Cell+(document+template) relevant section in reference guide}
-         */
-        interface IMxTableCell extends elements.IElement {
-            container: IMxTableRow;
-            load(): MxTableCell;
-            load(callback: (element: MxTableCell) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Cell+(document+template) relevant section in reference guide}
-         */
-        class MxTableCell extends elements.Element implements IMxTableCell {
-            static typeName: string;
-            container: MxTableRow;
-            style: MxStyle;
-            widget: Widget;
-            colSpan: number;
-            rowSpan: number;
-            isPartOfSpan: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Row+(document+template) relevant section in reference guide}
-         */
-        interface IMxTableRow extends elements.IElement {
-            container: IMxTable;
-            load(): MxTableRow;
-            load(callback: (element: MxTableRow) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Row+(document+template) relevant section in reference guide}
-         */
-        class MxTableRow extends elements.Element implements IMxTableRow {
-            static typeName: string;
-            container: MxTable;
-            cells: instances.IList<MxTableCell>;
-            conditionSettings: ConditionSettings;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Template+Grid+(document+template) relevant section in reference guide}
-         */
-        interface IMxTemplateGrid extends IMxGrid {
-            load(): MxTemplateGrid;
-            load(callback: (element: MxTemplateGrid) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Template+Grid+(document+template) relevant section in reference guide}
-         */
-        class MxTemplateGrid extends MxGrid implements IMxTemplateGrid {
-            static typeName: string;
-            oddRowsDropZone: MxTemplateGridDropZone;
-            evenRowsDropZone: MxTemplateGridDropZone;
-            numberOfColumns: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Template+Grid+(document+template) relevant section in reference guide}
-         */
-        interface IMxTemplateGridDropZone extends elements.IElement {
-            container: IMxTemplateGrid;
-            load(): MxTemplateGridDropZone;
-            load(callback: (element: MxTemplateGridDropZone) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Template+Grid+(document+template) relevant section in reference guide}
-         */
-        class MxTemplateGridDropZone extends elements.Element implements IMxTemplateGridDropZone {
-            static typeName: string;
-            container: MxTemplateGrid;
-            widget: Widget;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Title+(document+template) relevant section in reference guide}
-         */
-        interface IMxTitle extends IWidget {
-            load(): MxTitle;
-            load(callback: (element: MxTitle) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Title+(document+template) relevant section in reference guide}
-         */
-        class MxTitle extends Widget implements IMxTitle {
-            static typeName: string;
-            caption: texts.Text;
-            style: MxStyle;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Static+Image+(document+template) relevant section in reference guide}
-         */
-        interface IStaticImageViewer extends IWidget {
-            load(): StaticImageViewer;
-            load(callback: (element: StaticImageViewer) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Static+Image+(document+template) relevant section in reference guide}
-         */
-        class StaticImageViewer extends Widget implements IStaticImageViewer {
-            static typeName: string;
-            image: images.IImage;
-            imageQualifiedName: string;
-            width: number;
-            height: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        class BorderStyle extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static None: BorderStyle;
-            static Dotted: BorderStyle;
-            static Dashed: BorderStyle;
-            static Solid: BorderStyle;
-        }
-        class FontFamily extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Courier: FontFamily;
-            static Tahoma: FontFamily;
-            static Times: FontFamily;
-            static Helvetica: FontFamily;
-            static Arial: FontFamily;
-        }
-        class TextAlign extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Left: TextAlign;
-            static Right: TextAlign;
-            static Center: TextAlign;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `Navigation`.
-     */
-    namespace navigation {
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
-         */
-        interface IProjectDocument extends units.IModelUnit {
-            container: projects.IProject;
-            load(): ProjectDocument;
-            load(callback: (element: ProjectDocument) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ProjectDocument extends units.ModelUnit implements IProjectDocument {
-            static typeName: string;
-            container: projects.Project;
-            constructor(container: projects.IProject);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Navigation relevant section in reference guide}
-         */
-        interface INavigationDocument extends projects.IProjectDocument {
-            container: projects.IProject;
-            load(): NavigationDocument;
-            load(callback: (element: NavigationDocument) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Navigation relevant section in reference guide}
-         */
-        class NavigationDocument extends projects.ProjectDocument implements INavigationDocument {
-            static typeName: string;
-            container: projects.Project;
-            phoneProfile: NavigationProfile;
-            tabletProfile: NavigationProfile;
-            desktopProfile: NavigationProfile;
-            constructor(container: projects.IProject);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface INavigationProfile extends elements.IElement {
-            container: INavigationDocument;
-            load(): NavigationProfile;
-            load(callback: (element: NavigationProfile) => void): any;
-        }
-        class NavigationProfile extends elements.Element implements INavigationProfile {
-            static typeName: string;
-            container: NavigationDocument;
-            type: DeviceType;
-            enabled: boolean;
-            homePage: HomePage;
-            roleBasedHomePages: instances.IList<RoleBasedHomePage>;
-            applicationTitle: string;
-            menuItemCollection: menus.MenuItemCollection;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IHomePageBase extends elements.IElement {
-            container: INavigationProfile;
-            load(): HomePageBase;
-            load(callback: (element: HomePageBase) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class HomePageBase extends elements.Element implements IHomePageBase {
-            static typeName: string;
-            container: NavigationProfile;
-            page: pages.IPage;
-            pageQualifiedName: string;
-            microflow: microflows.IMicroflow;
-            microflowQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IHomePage extends IHomePageBase {
-            container: INavigationProfile;
-            load(): HomePage;
-            load(callback: (element: HomePage) => void): any;
-        }
-        class HomePage extends HomePageBase implements IHomePage {
-            static typeName: string;
-            container: NavigationProfile;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IRoleBasedHomePage extends IHomePageBase {
-            container: INavigationProfile;
-            load(): RoleBasedHomePage;
-            load(callback: (element: RoleBasedHomePage) => void): any;
-        }
-        class RoleBasedHomePage extends HomePageBase implements IRoleBasedHomePage {
-            static typeName: string;
-            container: NavigationProfile;
-            userRole: security.IUserRole;
-            userRoleQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        class DeviceType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Desktop: DeviceType;
-            static Tablet: DeviceType;
-            static Phone: DeviceType;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `Reports`.
-     */
-    namespace reports {
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
-         */
-        interface IWidget extends elements.IElement {
-            load(): Widget;
-            load(callback: (element: Widget) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Pages relevant section in reference guide}
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Widget extends elements.Element implements IWidget {
-            static typeName: string;
-            name: string;
-            class: string;
-            style: string;
-            tabIndex: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Report+Widgets relevant section in reference guide}
-         */
-        interface IReportWidget extends pages.IWidget {
-            load(): ReportWidget;
-            load(callback: (element: ReportWidget) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Report+Widgets relevant section in reference guide}
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ReportWidget extends pages.Widget implements IReportWidget {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Basic+Reports relevant section in reference guide}
-         */
-        interface IBasicReport extends IReportWidget {
-            load(): BasicReport;
-            load(callback: (element: BasicReport) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Basic+Reports relevant section in reference guide}
-         */
-        class BasicReport extends ReportWidget implements IBasicReport {
-            static typeName: string;
-            dataSet: datasets.IDataSet;
-            dataSetQualifiedName: string;
-            columns: instances.IList<BasicReportColumn>;
-            aggregates: instances.IList<BasicReportAggregate>;
-            showExportButton: boolean;
-            zoomInfo: ReportZoomInfo;
-            isPagingEnabled: boolean;
-            pageSize: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IBasicReportAggregate extends elements.IElement {
-            container: IBasicReport;
-            load(): BasicReportAggregate;
-            load(callback: (element: BasicReportAggregate) => void): any;
-        }
-        class BasicReportAggregate extends elements.Element implements IBasicReportAggregate {
-            static typeName: string;
-            container: BasicReport;
-            caption: texts.Text;
-            aggregateFunction: AggregateFunctionEnum;
-            applicablePerColumn: instances.IList<boolean>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IBasicReportColumn extends elements.IElement {
-            container: IBasicReport;
-            load(): BasicReportColumn;
-            load(callback: (element: BasicReportColumn) => void): any;
-        }
-        class BasicReportColumn extends elements.Element implements IBasicReportColumn {
-            static typeName: string;
-            container: BasicReport;
-            caption: texts.Text;
-            dataSetColumnName: string;
-            width: number;
-            alignment: pages.AlignmentEnum;
-            format: ColumnFormat;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Report+Button relevant section in reference guide}
-         */
-        interface IReportButton extends pages.IWidget {
-            load(): ReportButton;
-            load(callback: (element: ReportButton) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Report+Button relevant section in reference guide}
-         */
-        class ReportButton extends pages.Widget implements IReportButton {
-            static typeName: string;
-            caption: texts.Text;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Report+Chart relevant section in reference guide}
-         */
-        interface IReportChart extends pages.IWidget {
-            load(): ReportChart;
-            load(callback: (element: ReportChart) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Report+Chart relevant section in reference guide}
-         */
-        class ReportChart extends pages.Widget implements IReportChart {
-            static typeName: string;
-            dataSet: datasets.IDataSet;
-            dataSetQualifiedName: string;
-            type: ChartType;
-            seriess: instances.IList<ReportChartSeries>;
-            xAxisCaption: texts.Text;
-            yAxisCaption: texts.Text;
-            xAxisColumn: string;
-            xAxisFormat: ColumnFormat;
-            yAxisPrecision: number;
-            yAxisUseMinMax: boolean;
-            yAxisMinimum: number;
-            yAxisMaximum: number;
-            aspectRatio: AspectRatio;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IReportChartSeries extends elements.IElement {
-            container: IReportChart;
-            load(): ReportChartSeries;
-            load(callback: (element: ReportChartSeries) => void): any;
-        }
-        class ReportChartSeries extends elements.Element implements IReportChartSeries {
-            static typeName: string;
-            container: ReportChart;
-            caption: texts.Text;
-            dataSetColumn: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Date+Range+Field relevant section in reference guide}
-         */
-        interface IReportDateRangeField extends elements.IElement {
-            container: IReportDateRangeSelector;
-            load(): ReportDateRangeField;
-            load(callback: (element: ReportDateRangeField) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Date+Range+Field relevant section in reference guide}
-         */
-        class ReportDateRangeField extends elements.Element implements IReportDateRangeField {
-            static typeName: string;
-            container: ReportDateRangeSelector;
-            caption: texts.Text;
-            type: DateRangeFieldEnum;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IReportParameter extends pages.IWidget {
-            load(): ReportParameter;
-            load(callback: (element: ReportParameter) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ReportParameter extends pages.Widget implements IReportParameter {
-            static typeName: string;
-            parameterName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Date+Range+Selector relevant section in reference guide}
-         */
-        interface IReportDateRangeSelector extends IReportParameter {
-            load(): ReportDateRangeSelector;
-            load(callback: (element: ReportDateRangeSelector) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Date+Range+Selector relevant section in reference guide}
-         */
-        class ReportDateRangeSelector extends ReportParameter implements IReportDateRangeSelector {
-            static typeName: string;
-            fields: instances.IList<ReportDateRangeField>;
-            minYear: number;
-            maxYear: number;
-            fieldsPerRow: number;
-            showFromToRange: boolean;
-            fromCaption: texts.Text;
-            toCaption: texts.Text;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Drop+Down relevant section in reference guide}
-         */
-        interface IReportDropDown extends IReportParameter {
-            load(): ReportDropDown;
-            load(callback: (element: ReportDropDown) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Drop+Down relevant section in reference guide}
-         */
-        class ReportDropDown extends ReportParameter implements IReportDropDown {
-            static typeName: string;
-            attribute: domainmodels.IAttribute;
-            attributeQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Report+Pane relevant section in reference guide}
-         */
-        interface IReportPane extends pages.IWidget {
-            load(): ReportPane;
-            load(callback: (element: ReportPane) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Report+Pane relevant section in reference guide}
-         */
-        class ReportPane extends pages.Widget implements IReportPane {
-            static typeName: string;
-            parameterWidget: pages.Widget;
-            reportWidget: pages.Widget;
-            generateOnLoad: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IReportZoomInfo extends elements.IElement {
-            container: IBasicReport;
-            load(): ReportZoomInfo;
-            load(callback: (element: ReportZoomInfo) => void): any;
-        }
-        class ReportZoomInfo extends elements.Element implements IReportZoomInfo {
-            static typeName: string;
-            container: BasicReport;
-            targetPage: pages.IPage;
-            targetPageQualifiedName: string;
-            mappings: instances.IList<ReportZoomMapping>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IReportZoomMapping extends elements.IElement {
-            container: IReportZoomInfo;
-            load(): ReportZoomMapping;
-            load(callback: (element: ReportZoomMapping) => void): any;
-        }
-        class ReportZoomMapping extends elements.Element implements IReportZoomMapping {
-            static typeName: string;
-            container: ReportZoomInfo;
-            targetParameterName: string;
-            sourceReportColumnName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        class AggregateFunctionEnum extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Sum: AggregateFunctionEnum;
-            static Average: AggregateFunctionEnum;
-            static Count: AggregateFunctionEnum;
-            static Minimum: AggregateFunctionEnum;
-            static Maximum: AggregateFunctionEnum;
-        }
-        class ColumnFormat extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Default: ColumnFormat;
-            static MonthName: ColumnFormat;
-            static WeekdayName: ColumnFormat;
-        }
-        class ChartType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static VerticalBars: ChartType;
-            static VerticalBars3D: ChartType;
-            static HorizontalBars: ChartType;
-            static Lines: ChartType;
-            static Area: ChartType;
-        }
-        class AspectRatio extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static SixteenToNine: AspectRatio;
-            static ThreeToTwo: AspectRatio;
-            static FourToThree: AspectRatio;
-            static OneToOne: AspectRatio;
-            static ThreeToFour: AspectRatio;
-            static TwoToThree: AspectRatio;
-            static NineToSixteen: AspectRatio;
-        }
-        class DateRangeFieldEnum extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Year: DateRangeFieldEnum;
-            static Month: DateRangeFieldEnum;
-            static Week: DateRangeFieldEnum;
-            static Period: DateRangeFieldEnum;
-            static Quarter: DateRangeFieldEnum;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `Menus`.
-     */
-    namespace menus {
-        interface IModuleDocument extends units.IModelUnit {
-            container: projects.IFolderBase;
-            load(): ModuleDocument;
-            load(callback: (element: ModuleDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDocument extends projects.IModuleDocument {
-            container: projects.IFolderBase;
-            load(): Document;
-            load(callback: (element: Document) => void): any;
-            name: string;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Document extends projects.ModuleDocument implements IDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            name: string;
-            documentation: string;
-            excluded: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Menu relevant section in reference guide}
-         */
-        interface IMenuDocument extends projects.IDocument {
-            container: projects.IFolderBase;
-            load(): MenuDocument;
-            load(callback: (element: MenuDocument) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Menu relevant section in reference guide}
-         */
-        class MenuDocument extends projects.Document implements IMenuDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            itemCollection: MenuItemCollection;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMenuItemContainer extends elements.IElement {
-            load(): MenuItemContainer;
-            load(callback: (element: MenuItemContainer) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class MenuItemContainer extends elements.Element implements IMenuItemContainer {
-            static typeName: string;
-            items: instances.IList<MenuItem>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMenuItemCollection extends IMenuItemContainer {
-            load(): MenuItemCollection;
-            load(callback: (element: MenuItemCollection) => void): any;
-        }
-        class MenuItemCollection extends MenuItemContainer implements IMenuItemCollection {
-            static typeName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Menu+Item relevant section in reference guide}
-         */
-        interface IMenuItem extends IMenuItemContainer {
-            container: IMenuItemContainer;
-            load(): MenuItem;
-            load(callback: (element: MenuItem) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Menu+Item relevant section in reference guide}
-         */
-        class MenuItem extends MenuItemContainer implements IMenuItem {
-            static typeName: string;
-            container: MenuItemContainer;
-            caption: texts.Text;
-            icon: pages.Icon;
-            action: pages.ClientAction;
-            documentation: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `DataSets`.
-     */
-    namespace datasets {
-        interface IModuleDocument extends units.IModelUnit {
-            container: projects.IFolderBase;
-            load(): ModuleDocument;
-            load(callback: (element: ModuleDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDocument extends projects.IModuleDocument {
-            container: projects.IFolderBase;
-            load(): Document;
-            load(callback: (element: Document) => void): any;
-            name: string;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Document extends projects.ModuleDocument implements IDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            name: string;
-            documentation: string;
-            excluded: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+Sets relevant section in reference guide}
-         */
-        interface IDataSet extends projects.IDocument {
-            container: projects.IFolderBase;
-            load(): DataSet;
-            load(callback: (element: DataSet) => void): any;
-            parameters: instances.IList<IDataSetParameter>;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Data+Sets relevant section in reference guide}
-         */
-        class DataSet extends projects.Document implements IDataSet {
-            static typeName: string;
-            container: projects.FolderBase;
-            source: DataSetSource;
-            parameters: instances.IList<DataSetParameter>;
-            dataSetAccess: DataSetAccess;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IDataSetAccess extends elements.IElement {
-            container: IDataSet;
-            load(): DataSetAccess;
-            load(callback: (element: DataSetAccess) => void): any;
-        }
-        class DataSetAccess extends elements.Element implements IDataSetAccess {
-            static typeName: string;
-            container: DataSet;
-            moduleRoleAccessList: instances.IList<DataSetModuleRoleAccess>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IDataSetColumn extends elements.IElement {
-            container: IJavaDataSetSource;
-            load(): DataSetColumn;
-            load(callback: (element: DataSetColumn) => void): any;
-        }
-        class DataSetColumn extends elements.Element implements IDataSetColumn {
-            static typeName: string;
-            container: JavaDataSetSource;
-            name: string;
-            type: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IDataSetConstraintAccess extends elements.IElement {
-            container: IDataSetParameterAccess;
-            load(): DataSetConstraintAccess;
-            load(callback: (element: DataSetConstraintAccess) => void): any;
-        }
-        class DataSetConstraintAccess extends elements.Element implements IDataSetConstraintAccess {
-            static typeName: string;
-            container: DataSetParameterAccess;
-            constraintText: string;
-            enabled: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IDataSetParameterConstraint extends elements.IElement {
-            container: IDataSetParameter;
-            load(): DataSetParameterConstraint;
-            load(callback: (element: DataSetParameterConstraint) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class DataSetParameterConstraint extends elements.Element implements IDataSetParameterConstraint {
-            static typeName: string;
-            container: DataSetParameter;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDataSetDateTimeConstraint extends IDataSetParameterConstraint {
-            container: IDataSetParameter;
-            load(): DataSetDateTimeConstraint;
-            load(callback: (element: DataSetDateTimeConstraint) => void): any;
-        }
-        class DataSetDateTimeConstraint extends DataSetParameterConstraint implements IDataSetDateTimeConstraint {
-            static typeName: string;
-            container: DataSetParameter;
-            modifier: DateTimeIntervalModifier;
-            length: DateTimeIntervalLength;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IDataSetModuleRoleAccess extends elements.IElement {
-            container: IDataSetAccess;
-            load(): DataSetModuleRoleAccess;
-            load(callback: (element: DataSetModuleRoleAccess) => void): any;
-        }
-        class DataSetModuleRoleAccess extends elements.Element implements IDataSetModuleRoleAccess {
-            static typeName: string;
-            container: DataSetAccess;
-            parameterAccessList: instances.IList<DataSetParameterAccess>;
-            moduleRole: security.IModuleRole;
-            moduleRoleQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IDataSetNumericConstraint extends IDataSetParameterConstraint {
-            container: IDataSetParameter;
-            load(): DataSetNumericConstraint;
-            load(callback: (element: DataSetNumericConstraint) => void): any;
-        }
-        class DataSetNumericConstraint extends DataSetParameterConstraint implements IDataSetNumericConstraint {
-            static typeName: string;
-            container: DataSetParameter;
-            begin: string;
-            applyBegin: boolean;
-            end: string;
-            applyEnd: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IDataSetObjectConstraint extends IDataSetParameterConstraint {
-            container: IDataSetParameter;
-            load(): DataSetObjectConstraint;
-            load(callback: (element: DataSetObjectConstraint) => void): any;
-        }
-        class DataSetObjectConstraint extends DataSetParameterConstraint implements IDataSetObjectConstraint {
-            static typeName: string;
-            container: DataSetParameter;
-            name: string;
-            constraint: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IDataSetParameter extends elements.IElement {
-            container: IDataSet;
-            load(): DataSetParameter;
-            load(callback: (element: DataSetParameter) => void): any;
-            name: string;
-        }
-        class DataSetParameter extends elements.Element implements IDataSetParameter {
-            static typeName: string;
-            container: DataSet;
-            constraints: instances.IList<DataSetParameterConstraint>;
-            name: string;
-            type: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IDataSetParameterAccess extends elements.IElement {
-            container: IDataSetModuleRoleAccess;
-            load(): DataSetParameterAccess;
-            load(callback: (element: DataSetParameterAccess) => void): any;
-        }
-        class DataSetParameterAccess extends elements.Element implements IDataSetParameterAccess {
-            static typeName: string;
-            container: DataSetModuleRoleAccess;
-            constraintAccessList: instances.IList<DataSetConstraintAccess>;
-            parameterName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IDataSetSource extends elements.IElement {
-            container: IDataSet;
-            load(): DataSetSource;
-            load(callback: (element: DataSetSource) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class DataSetSource extends elements.Element implements IDataSetSource {
-            static typeName: string;
-            container: DataSet;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IJavaDataSetSource extends IDataSetSource {
-            container: IDataSet;
-            load(): JavaDataSetSource;
-            load(callback: (element: JavaDataSetSource) => void): any;
-        }
-        class JavaDataSetSource extends DataSetSource implements IJavaDataSetSource {
-            static typeName: string;
-            container: DataSet;
-            columns: instances.IList<DataSetColumn>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IOqlDataSetSource extends IDataSetSource {
-            container: IDataSet;
-            load(): OqlDataSetSource;
-            load(callback: (element: OqlDataSetSource) => void): any;
-        }
-        class OqlDataSetSource extends DataSetSource implements IOqlDataSetSource {
-            static typeName: string;
-            container: DataSet;
-            query: string;
-            ignoreErrorsInQuery: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        class DateTimeIntervalLength extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Day: DateTimeIntervalLength;
-            static Week: DateTimeIntervalLength;
-            static Period: DateTimeIntervalLength;
-            static Month: DateTimeIntervalLength;
-            static Quarter: DateTimeIntervalLength;
-            static Year: DateTimeIntervalLength;
-        }
-        class DateTimeIntervalModifier extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Last: DateTimeIntervalModifier;
-            static This: DateTimeIntervalModifier;
-            static Next: DateTimeIntervalModifier;
-            static Past: DateTimeIntervalModifier;
-            static Future: DateTimeIntervalModifier;
-            static Always: DateTimeIntervalModifier;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `Texts`.
-     */
-    namespace texts {
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Translatable+Texts relevant section in reference guide}
-         */
-        interface IText extends elements.IElement {
-            load(): Text;
-            load(callback: (element: Text) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Translatable+Texts relevant section in reference guide}
-         */
-        class Text extends elements.Element implements IText {
-            static typeName: string;
-            translations: instances.IList<Translation>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ITranslation extends elements.IElement {
-            container: IText;
-            load(): Translation;
-            load(callback: (element: Translation) => void): any;
-        }
-        class Translation extends elements.Element implements ITranslation {
-            static typeName: string;
-            container: Text;
-            languageCode: string;
-            text: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Project+Settings relevant section in reference guide}
-         */
-        interface ILanguage extends elements.IElement {
-            container: settings.IProjectSettings;
-            load(): Language;
-            load(callback: (element: Language) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Project+Settings relevant section in reference guide}
-         */
-        class Language extends elements.Element implements ILanguage {
-            static typeName: string;
-            container: settings.ProjectSettings;
-            code: string;
-            checkCompleteness: boolean;
-            customDateFormat: string;
-            customTimeFormat: string;
-            customDateTimeFormat: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ISystemText extends elements.IElement {
-            container: ISystemTextCollection;
-            load(): SystemText;
-            load(callback: (element: SystemText) => void): any;
-        }
-        class SystemText extends elements.Element implements ISystemText {
-            static typeName: string;
-            container: SystemTextCollection;
-            text: Text;
-            key: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
-         */
-        interface IProjectDocument extends units.IModelUnit {
-            container: projects.IProject;
-            load(): ProjectDocument;
-            load(callback: (element: ProjectDocument) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ProjectDocument extends units.ModelUnit implements IProjectDocument {
-            static typeName: string;
-            container: projects.Project;
-            constructor(container: projects.IProject);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/System+Texts relevant section in reference guide}
-         */
-        interface ISystemTextCollection extends projects.IProjectDocument {
-            container: projects.IProject;
-            load(): SystemTextCollection;
-            load(callback: (element: SystemTextCollection) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/System+Texts relevant section in reference guide}
-         */
-        class SystemTextCollection extends projects.ProjectDocument implements ISystemTextCollection {
-            static typeName: string;
-            container: projects.Project;
-            systemTexts: instances.IList<SystemText>;
-            constructor(container: projects.IProject);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `JavaActions`.
-     */
-    namespace javaactions {
-        interface IModuleDocument extends units.IModelUnit {
-            container: projects.IFolderBase;
-            load(): ModuleDocument;
-            load(callback: (element: ModuleDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDocument extends projects.IModuleDocument {
-            container: projects.IFolderBase;
-            load(): Document;
-            load(callback: (element: Document) => void): any;
-            name: string;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Document extends projects.ModuleDocument implements IDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            name: string;
-            documentation: string;
-            excluded: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Java+Actions relevant section in reference guide}
-         */
-        interface IJavaAction extends projects.IDocument {
-            container: projects.IFolderBase;
-            load(): JavaAction;
-            load(callback: (element: JavaAction) => void): any;
-            parameters: instances.IList<IJavaActionParameter>;
-            returnType: string;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Java+Actions relevant section in reference guide}
-         */
-        class JavaAction extends projects.Document implements IJavaAction {
-            static typeName: string;
-            container: projects.FolderBase;
-            parameters: instances.IList<JavaActionParameter>;
-            returnType: string;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IJavaActionParameter extends elements.IElement {
-            container: IJavaAction;
-            load(): JavaActionParameter;
-            load(callback: (element: JavaActionParameter) => void): any;
-            name: string;
-            type: string;
-        }
-        class JavaActionParameter extends elements.Element implements IJavaActionParameter {
-            static typeName: string;
-            container: JavaAction;
-            name: string;
-            type: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `Constants`.
-     */
-    namespace constants {
-        interface IModuleDocument extends units.IModelUnit {
-            container: projects.IFolderBase;
-            load(): ModuleDocument;
-            load(callback: (element: ModuleDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDocument extends projects.IModuleDocument {
-            container: projects.IFolderBase;
-            load(): Document;
-            load(callback: (element: Document) => void): any;
-            name: string;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Document extends projects.ModuleDocument implements IDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            name: string;
-            documentation: string;
-            excluded: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Constants relevant section in reference guide}
-         */
-        interface IConstant extends projects.IDocument {
-            container: projects.IFolderBase;
-            load(): Constant;
-            load(callback: (element: Constant) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Constants relevant section in reference guide}
-         */
-        class Constant extends projects.Document implements IConstant {
-            static typeName: string;
-            container: projects.FolderBase;
-            dataType: string;
-            defaultValue: string;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import instances = internal.instances;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `ScheduledEvents`.
-     */
-    namespace scheduledevents {
-        interface IModuleDocument extends units.IModelUnit {
-            container: projects.IFolderBase;
-            load(): ModuleDocument;
-            load(callback: (element: ModuleDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDocument extends projects.IModuleDocument {
-            container: projects.IFolderBase;
-            load(): Document;
-            load(callback: (element: Document) => void): any;
-            name: string;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Document extends projects.ModuleDocument implements IDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            name: string;
-            documentation: string;
-            excluded: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Scheduled+Events relevant section in reference guide}
-         */
-        interface IScheduledEvent extends projects.IDocument {
-            container: projects.IFolderBase;
-            load(): ScheduledEvent;
-            load(callback: (element: ScheduledEvent) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Scheduled+Events relevant section in reference guide}
-         */
-        class ScheduledEvent extends projects.Document implements IScheduledEvent {
-            static typeName: string;
-            container: projects.FolderBase;
-            startDateTime: string;
-            timeZone: TimeZoneEnum;
-            interval: number;
-            intervalType: IntervalType;
-            microflow: microflows.IMicroflow;
-            microflowQualifiedName: string;
-            enabled: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        class IntervalType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Second: IntervalType;
-            static Minute: IntervalType;
-            static Hour: IntervalType;
-            static Day: IntervalType;
-            static Week: IntervalType;
-            static Month: IntervalType;
-            static Year: IntervalType;
-        }
-        class TimeZoneEnum extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static UTC: TimeZoneEnum;
-            static Server: TimeZoneEnum;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `RegularExpressions`.
-     */
-    namespace regularexpressions {
-        interface IModuleDocument extends units.IModelUnit {
-            container: projects.IFolderBase;
-            load(): ModuleDocument;
-            load(callback: (element: ModuleDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDocument extends projects.IModuleDocument {
-            container: projects.IFolderBase;
-            load(): Document;
-            load(callback: (element: Document) => void): any;
-            name: string;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Document extends projects.ModuleDocument implements IDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            name: string;
-            documentation: string;
-            excluded: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Regular+Expressions relevant section in reference guide}
-         */
-        interface IRegularExpression extends projects.IDocument {
-            container: projects.IFolderBase;
-            load(): RegularExpression;
-            load(callback: (element: RegularExpression) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Regular+Expressions relevant section in reference guide}
-         */
-        class RegularExpression extends projects.Document implements IRegularExpression {
-            static typeName: string;
-            container: projects.FolderBase;
-            regEx: string;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `Images`.
-     */
-    namespace images {
-        interface IModuleDocument extends units.IModelUnit {
-            container: projects.IFolderBase;
-            load(): ModuleDocument;
-            load(callback: (element: ModuleDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDocument extends projects.IModuleDocument {
-            container: projects.IFolderBase;
-            load(): Document;
-            load(callback: (element: Document) => void): any;
-            name: string;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Document extends projects.ModuleDocument implements IDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            name: string;
-            documentation: string;
-            excluded: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Images relevant section in reference guide}
-         */
-        interface IImageCollection extends projects.IDocument {
-            container: projects.IFolderBase;
-            load(): ImageCollection;
-            load(callback: (element: ImageCollection) => void): any;
-            images: instances.IList<IImage>;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Images relevant section in reference guide}
-         */
-        class ImageCollection extends projects.Document implements IImageCollection {
-            static typeName: string;
-            container: projects.FolderBase;
-            images: instances.IList<Image>;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IImage extends elements.IElement {
-            container: IImageCollection;
-            load(): Image;
-            load(callback: (element: Image) => void): any;
-            name: string;
-        }
-        class Image extends elements.Element implements IImage {
-            static typeName: string;
-            container: ImageCollection;
-            name: string;
-            /**
-             * ?
-             */
-            imageData: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `Security`.
-     */
-    namespace security {
-        interface IAccessRuleContainerBase extends elements.IElement {
-            container: IProjectSecurity;
-            load(): AccessRuleContainerBase;
-            load(callback: (element: AccessRuleContainerBase) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class AccessRuleContainerBase extends elements.Element implements IAccessRuleContainerBase {
-            static typeName: string;
-            container: ProjectSecurity;
-            accessRules: instances.IList<domainmodels.AccessRule>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IDemoUser extends elements.IElement {
-            container: IProjectSecurity;
-            load(): DemoUser;
-            load(callback: (element: DemoUser) => void): any;
-        }
-        class DemoUser extends elements.Element implements IDemoUser {
-            static typeName: string;
-            container: ProjectSecurity;
-            userName: string;
-            password: string;
-            entity: domainmodels.IEntity;
-            entityQualifiedName: string;
-            userRoleIds: instances.IList<IUserRole>;
-            userRoleIdsQualifiedNames: string[];
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IFileDocumentAccessRuleContainer extends IAccessRuleContainerBase {
-            container: IProjectSecurity;
-            load(): FileDocumentAccessRuleContainer;
-            load(callback: (element: FileDocumentAccessRuleContainer) => void): any;
-        }
-        class FileDocumentAccessRuleContainer extends AccessRuleContainerBase implements IFileDocumentAccessRuleContainer {
-            static typeName: string;
-            container: ProjectSecurity;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IImageAccessRuleContainer extends IAccessRuleContainerBase {
-            container: IProjectSecurity;
-            load(): ImageAccessRuleContainer;
-            load(callback: (element: ImageAccessRuleContainer) => void): any;
-        }
-        class ImageAccessRuleContainer extends AccessRuleContainerBase implements IImageAccessRuleContainer {
-            static typeName: string;
-            container: ProjectSecurity;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Module+Role relevant section in reference guide}
-         */
-        interface IModuleRole extends elements.IElement {
-            container: IModuleSecurity;
-            load(): ModuleRole;
-            load(callback: (element: ModuleRole) => void): any;
-            name: string;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Module+Role relevant section in reference guide}
-         */
-        class ModuleRole extends elements.Element implements IModuleRole {
-            static typeName: string;
-            container: ModuleSecurity;
-            name: string;
-            description: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Module+Security relevant section in reference guide}
-         */
-        interface IModuleSecurity extends units.IModelUnit {
-            container: projects.IModule;
-            load(): ModuleSecurity;
-            load(callback: (element: ModuleSecurity) => void): any;
-            moduleRoles: instances.IList<IModuleRole>;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Module+Security relevant section in reference guide}
-         */
-        class ModuleSecurity extends units.ModelUnit implements IModuleSecurity {
-            static typeName: string;
-            container: projects.Module;
-            moduleRoles: instances.IList<ModuleRole>;
-            constructor(container: projects.IModule);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IPasswordPolicySettings extends elements.IElement {
-            container: IProjectSecurity;
-            load(): PasswordPolicySettings;
-            load(callback: (element: PasswordPolicySettings) => void): any;
-        }
-        class PasswordPolicySettings extends elements.Element implements IPasswordPolicySettings {
-            static typeName: string;
-            container: ProjectSecurity;
-            minimumLength: number;
-            requireMixedCase: boolean;
-            requireSymbol: boolean;
-            requireDigit: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
-         */
-        interface IProjectDocument extends units.IModelUnit {
-            container: projects.IProject;
-            load(): ProjectDocument;
-            load(callback: (element: ProjectDocument) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Project relevant section in reference guide}
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ProjectDocument extends units.ModelUnit implements IProjectDocument {
-            static typeName: string;
-            container: projects.Project;
-            constructor(container: projects.IProject);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Project+Security relevant section in reference guide}
-         */
-        interface IProjectSecurity extends projects.IProjectDocument {
-            container: projects.IProject;
-            load(): ProjectSecurity;
-            load(callback: (element: ProjectSecurity) => void): any;
-            userRoles: instances.IList<IUserRole>;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Project+Security relevant section in reference guide}
-         */
-        class ProjectSecurity extends projects.ProjectDocument implements IProjectSecurity {
-            static typeName: string;
-            container: projects.Project;
-            fileDocumentAccess: FileDocumentAccessRuleContainer;
-            imageAccess: ImageAccessRuleContainer;
-            passwordPolicySettings: PasswordPolicySettings;
-            userRoles: instances.IList<UserRole>;
-            demoUsers: instances.IList<DemoUser>;
-            securityLevel: projects.SecurityLevel;
-            checkSecurity: boolean;
-            adminUserName: string;
-            adminPassword: string;
-            adminUserRoleName: string;
-            enableDemoUsers: boolean;
-            enableGuestAccess: boolean;
-            guestUserRoleName: string;
-            signInMicroflow: microflows.IMicroflow;
-            signInMicroflowQualifiedName: string;
-            constructor(container: projects.IProject);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/User+Role relevant section in reference guide}
-         */
-        interface IUserRole extends elements.IElement {
-            container: IProjectSecurity;
-            load(): UserRole;
-            load(callback: (element: UserRole) => void): any;
-            name: string;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/User+Role relevant section in reference guide}
-         */
-        class UserRole extends elements.Element implements IUserRole {
-            static typeName: string;
-            container: ProjectSecurity;
-            guid: string;
-            name: string;
-            description: string;
-            moduleRoleIds: instances.IList<IModuleRole>;
-            moduleRoleIdsQualifiedNames: string[];
-            manageAllRoles: boolean;
-            manageableRoleIds: instances.IList<IUserRole>;
-            manageableRoleIdsQualifiedNames: string[];
-            manageUsersWithoutRoles: boolean;
-            checkSecurity: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `DomainModels`.
-     */
-    namespace domainmodels {
-        interface IModuleDocument extends units.IModelUnit {
-            container: projects.IFolderBase;
-            load(): ModuleDocument;
-            load(callback: (element: ModuleDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Domain+Model relevant section in reference guide}
-         */
-        interface IDomainModel extends projects.IModuleDocument {
-            container: projects.IModule;
-            load(): DomainModel;
-            load(callback: (element: DomainModel) => void): any;
-            entities: instances.IList<IEntity>;
-            associations: instances.IList<IAssociation>;
-            crossAssociations: instances.IList<ICrossAssociation>;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Domain+Model relevant section in reference guide}
-         */
-        class DomainModel extends projects.ModuleDocument implements IDomainModel {
-            static typeName: string;
-            container: projects.Module;
-            documentation: string;
-            entities: instances.IList<Entity>;
-            annotations: instances.IList<Annotation>;
-            associations: instances.IList<Association>;
-            crossAssociations: instances.IList<CrossAssociation>;
-            constructor(container: projects.IModule);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Entities relevant section in reference guide}
-         */
-        interface IEntity extends elements.IElement {
-            container: IDomainModel;
-            load(): Entity;
-            load(callback: (element: Entity) => void): any;
-            name: string;
-            generalization: IGeneralizationBase;
-            attributes: instances.IList<IAttribute>;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Entities relevant section in reference guide}
-         */
-        class Entity extends elements.Element implements IEntity {
-            static typeName: string;
-            container: DomainModel;
-            name: string;
-            dataStorageGuid: string;
-            location: common.IPoint;
-            documentation: string;
-            generalization: GeneralizationBase;
-            attributes: instances.IList<Attribute>;
-            validationRules: instances.IList<ValidationRule>;
-            eventHandlers: instances.IList<EventHandler>;
-            indexes: instances.IList<Index>;
-            accessRules: instances.IList<AccessRule>;
-            image: images.IImage;
-            imageQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IGeneralizationBase extends elements.IElement {
-            container: IEntity;
-            load(): GeneralizationBase;
-            load(callback: (element: GeneralizationBase) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class GeneralizationBase extends elements.Element implements IGeneralizationBase {
-            static typeName: string;
-            container: Entity;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IGeneralization extends IGeneralizationBase {
-            container: IEntity;
-            load(): Generalization;
-            load(callback: (element: Generalization) => void): any;
-            generalization: IEntity;
-            generalizationQualifiedName: string;
-        }
-        class Generalization extends GeneralizationBase implements IGeneralization {
-            static typeName: string;
-            container: Entity;
-            generalization: IEntity;
-            generalizationQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface INoGeneralization extends IGeneralizationBase {
-            container: IEntity;
-            load(): NoGeneralization;
-            load(callback: (element: NoGeneralization) => void): any;
-            persistable: boolean;
-        }
-        class NoGeneralization extends GeneralizationBase implements INoGeneralization {
-            static typeName: string;
-            container: Entity;
-            hasChangedDate: boolean;
-            hasCreatedDate: boolean;
-            hasOwner: boolean;
-            hasChangedBy: boolean;
-            persistable: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Attributes relevant section in reference guide}
-         */
-        interface IAttribute extends elements.IElement {
-            container: IEntity;
-            load(): Attribute;
-            load(callback: (element: Attribute) => void): any;
-            name: string;
-            type: IAttributeType;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Attributes relevant section in reference guide}
-         */
-        class Attribute extends elements.Element implements IAttribute {
-            static typeName: string;
-            container: Entity;
-            name: string;
-            dataStorageGuid: string;
-            type: AttributeType;
-            documentation: string;
-            value: ValueType;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IValueType extends elements.IElement {
-            container: IAttribute;
-            load(): ValueType;
-            load(callback: (element: ValueType) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ValueType extends elements.Element implements IValueType {
-            static typeName: string;
-            container: Attribute;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IStoredValue extends IValueType {
-            container: IAttribute;
-            load(): StoredValue;
-            load(callback: (element: StoredValue) => void): any;
-        }
-        class StoredValue extends ValueType implements IStoredValue {
-            static typeName: string;
-            container: Attribute;
-            defaultValue: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ICalculatedValue extends IValueType {
-            container: IAttribute;
-            load(): CalculatedValue;
-            load(callback: (element: CalculatedValue) => void): any;
-        }
-        class CalculatedValue extends ValueType implements ICalculatedValue {
-            static typeName: string;
-            container: Attribute;
-            microflow: microflows.IMicroflow;
-            microflowQualifiedName: string;
-            passEntity: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IAttributeType extends elements.IElement {
-            container: IAttribute;
-            load(): AttributeType;
-            load(callback: (element: AttributeType) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class AttributeType extends elements.Element implements IAttributeType {
-            static typeName: string;
-            container: Attribute;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IBinaryAttributeType extends IAttributeType {
-            container: IAttribute;
-            load(): BinaryAttributeType;
-            load(callback: (element: BinaryAttributeType) => void): any;
-        }
-        class BinaryAttributeType extends AttributeType implements IBinaryAttributeType {
-            static typeName: string;
-            container: Attribute;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IBooleanAttributeType extends IAttributeType {
-            container: IAttribute;
-            load(): BooleanAttributeType;
-            load(callback: (element: BooleanAttributeType) => void): any;
-        }
-        class BooleanAttributeType extends AttributeType implements IBooleanAttributeType {
-            static typeName: string;
-            container: Attribute;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDateTimeAttributeType extends IAttributeType {
-            container: IAttribute;
-            load(): DateTimeAttributeType;
-            load(callback: (element: DateTimeAttributeType) => void): any;
-        }
-        class DateTimeAttributeType extends AttributeType implements IDateTimeAttributeType {
-            static typeName: string;
-            container: Attribute;
-            localizeDate: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IEnumerationAttributeType extends IAttributeType {
-            container: IAttribute;
-            load(): EnumerationAttributeType;
-            load(callback: (element: EnumerationAttributeType) => void): any;
-            enumeration: enumerations.IEnumeration;
-            enumerationQualifiedName: string;
-        }
-        class EnumerationAttributeType extends AttributeType implements IEnumerationAttributeType {
-            static typeName: string;
-            container: Attribute;
-            enumeration: enumerations.IEnumeration;
-            enumerationQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IHashedStringAttributeType extends IAttributeType {
-            container: IAttribute;
-            load(): HashedStringAttributeType;
-            load(callback: (element: HashedStringAttributeType) => void): any;
-        }
-        class HashedStringAttributeType extends AttributeType implements IHashedStringAttributeType {
-            static typeName: string;
-            container: Attribute;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IStringAttributeType extends IAttributeType {
-            container: IAttribute;
-            load(): StringAttributeType;
-            load(callback: (element: StringAttributeType) => void): any;
-        }
-        class StringAttributeType extends AttributeType implements IStringAttributeType {
-            static typeName: string;
-            container: Attribute;
-            length: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface INumericAttributeTypeBase extends IAttributeType {
-            container: IAttribute;
-            load(): NumericAttributeTypeBase;
-            load(callback: (element: NumericAttributeTypeBase) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class NumericAttributeTypeBase extends AttributeType implements INumericAttributeTypeBase {
-            static typeName: string;
-            container: Attribute;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDecimalAttributeTypeBase extends INumericAttributeTypeBase {
-            container: IAttribute;
-            load(): DecimalAttributeTypeBase;
-            load(callback: (element: DecimalAttributeTypeBase) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class DecimalAttributeTypeBase extends NumericAttributeTypeBase implements IDecimalAttributeTypeBase {
-            static typeName: string;
-            container: Attribute;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDecimalAttributeType extends IDecimalAttributeTypeBase {
-            container: IAttribute;
-            load(): DecimalAttributeType;
-            load(callback: (element: DecimalAttributeType) => void): any;
-        }
-        class DecimalAttributeType extends DecimalAttributeTypeBase implements IDecimalAttributeType {
-            static typeName: string;
-            container: Attribute;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IFloatAttributeTypeBase extends IDecimalAttributeTypeBase {
-            container: IAttribute;
-            load(): FloatAttributeTypeBase;
-            load(callback: (element: FloatAttributeTypeBase) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class FloatAttributeTypeBase extends DecimalAttributeTypeBase implements IFloatAttributeTypeBase {
-            static typeName: string;
-            container: Attribute;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IFloatAttributeType extends IFloatAttributeTypeBase {
-            container: IAttribute;
-            load(): FloatAttributeType;
-            load(callback: (element: FloatAttributeType) => void): any;
-        }
-        class FloatAttributeType extends FloatAttributeTypeBase implements IFloatAttributeType {
-            static typeName: string;
-            container: Attribute;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface ICurrencyAttributeType extends IFloatAttributeTypeBase {
-            container: IAttribute;
-            load(): CurrencyAttributeType;
-            load(callback: (element: CurrencyAttributeType) => void): any;
-        }
-        class CurrencyAttributeType extends FloatAttributeTypeBase implements ICurrencyAttributeType {
-            static typeName: string;
-            container: Attribute;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IIntegerAttributeTypeBase extends INumericAttributeTypeBase {
-            container: IAttribute;
-            load(): IntegerAttributeTypeBase;
-            load(callback: (element: IntegerAttributeTypeBase) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class IntegerAttributeTypeBase extends NumericAttributeTypeBase implements IIntegerAttributeTypeBase {
-            static typeName: string;
-            container: Attribute;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IIntegerAttributeType extends IIntegerAttributeTypeBase {
-            container: IAttribute;
-            load(): IntegerAttributeType;
-            load(callback: (element: IntegerAttributeType) => void): any;
-        }
-        class IntegerAttributeType extends IntegerAttributeTypeBase implements IIntegerAttributeType {
-            static typeName: string;
-            container: Attribute;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface ILongAttributeType extends IIntegerAttributeTypeBase {
-            container: IAttribute;
-            load(): LongAttributeType;
-            load(callback: (element: LongAttributeType) => void): any;
-        }
-        class LongAttributeType extends IntegerAttributeTypeBase implements ILongAttributeType {
-            static typeName: string;
-            container: Attribute;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IAutoNumberAttributeType extends IIntegerAttributeTypeBase {
-            container: IAttribute;
-            load(): AutoNumberAttributeType;
-            load(callback: (element: AutoNumberAttributeType) => void): any;
-        }
-        class AutoNumberAttributeType extends IntegerAttributeTypeBase implements IAutoNumberAttributeType {
-            static typeName: string;
-            container: Attribute;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Associations TODO: This is whre it belongs, but the word AssociationBase is never used}
-         */
-        interface IAssociationBase extends elements.IElement {
-            container: IDomainModel;
-            load(): AssociationBase;
-            load(callback: (element: AssociationBase) => void): any;
-            name: string;
-            type: AssociationType;
-            owner: AssociationOwner;
-            parent: IEntity;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Associations TODO: This is whre it belongs, but the word AssociationBase is never used}
-         *
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class AssociationBase extends elements.Element implements IAssociationBase {
-            static typeName: string;
-            container: DomainModel;
-            name: string;
-            dataStorageGuid: string;
-            type: AssociationType;
-            owner: AssociationOwner;
-            deleteBehavior: AssociationDeleteBehavior;
-            parent: Entity;
-            documentation: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Associations relevant section in reference guide}
-         */
-        interface IAssociation extends IAssociationBase {
-            container: IDomainModel;
-            load(): Association;
-            load(callback: (element: Association) => void): any;
-            child: IEntity;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Associations relevant section in reference guide}
-         */
-        class Association extends AssociationBase implements IAssociation {
-            static typeName: string;
-            container: DomainModel;
-            child: Entity;
-            parentConnection: common.IPoint;
-            childConnection: common.IPoint;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ICrossAssociation extends IAssociationBase {
-            container: IDomainModel;
-            load(): CrossAssociation;
-            load(callback: (element: CrossAssociation) => void): any;
-            child: IEntity;
-            childQualifiedName: string;
-        }
-        class CrossAssociation extends AssociationBase implements ICrossAssociation {
-            static typeName: string;
-            container: DomainModel;
-            child: IEntity;
-            childQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IAssociationDeleteBehavior extends elements.IElement {
-            container: IAssociationBase;
-            load(): AssociationDeleteBehavior;
-            load(callback: (element: AssociationDeleteBehavior) => void): any;
-        }
-        class AssociationDeleteBehavior extends elements.Element implements IAssociationDeleteBehavior {
-            static typeName: string;
-            container: AssociationBase;
-            parentDeleteBehavior: DeletingBehavior;
-            childDeleteBehavior: DeletingBehavior;
-            parentErrorMessage: texts.Text;
-            childErrorMessage: texts.Text;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Annotations relevant section in reference guide}
-         */
-        interface IAnnotation extends elements.IElement {
-            container: IDomainModel;
-            load(): Annotation;
-            load(callback: (element: Annotation) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Annotations relevant section in reference guide}
-         */
-        class Annotation extends elements.Element implements IAnnotation {
-            static typeName: string;
-            container: DomainModel;
-            caption: string;
-            location: common.IPoint;
-            width: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Access+Rules relevant section in reference guide}
-         */
-        interface IAccessRule extends elements.IElement {
-            load(): AccessRule;
-            load(callback: (element: AccessRule) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Access+Rules relevant section in reference guide}
-         */
-        class AccessRule extends elements.Element implements IAccessRule {
-            static typeName: string;
-            memberAccesses: instances.IList<MemberAccess>;
-            moduleRoles: instances.IList<security.IModuleRole>;
-            moduleRolesQualifiedNames: string[];
-            documentation: string;
-            allowCreate: boolean;
-            allowDelete: boolean;
-            defaultMemberAccessRights: MemberAccessRights;
-            /**
-             * The value of this property is conceptually of type XPathConstraints$XPathConstraint.
-             */
-            xPathConstraint: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMemberAccess extends elements.IElement {
-            container: IAccessRule;
-            load(): MemberAccess;
-            load(callback: (element: MemberAccess) => void): any;
-        }
-        class MemberAccess extends elements.Element implements IMemberAccess {
-            static typeName: string;
-            container: AccessRule;
-            attribute: IAttribute;
-            attributeQualifiedName: string;
-            association: IAssociationBase;
-            associationQualifiedName: string;
-            accessRights: MemberAccessRights;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Event+Handlers relevant section in reference guide}
-         */
-        interface IEventHandler extends elements.IElement {
-            container: IEntity;
-            load(): EventHandler;
-            load(callback: (element: EventHandler) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Event+Handlers relevant section in reference guide}
-         */
-        class EventHandler extends elements.Element implements IEventHandler {
-            static typeName: string;
-            container: Entity;
-            moment: ActionMoment;
-            event: EventType;
-            microflow: microflows.IMicroflow;
-            microflowQualifiedName: string;
-            raiseErrorOnFalse: boolean;
-            passEventObject: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Indexes relevant section in reference guide}
-         */
-        interface IIndex extends elements.IElement {
-            container: IEntity;
-            load(): Index;
-            load(callback: (element: Index) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Indexes relevant section in reference guide}
-         */
-        class Index extends elements.Element implements IIndex {
-            static typeName: string;
-            container: Entity;
-            dataStorageGuid: string;
-            attributes: instances.IList<IndexedAttribute>;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IIndexedAttribute extends elements.IElement {
-            container: IIndex;
-            load(): IndexedAttribute;
-            load(callback: (element: IndexedAttribute) => void): any;
-        }
-        class IndexedAttribute extends elements.Element implements IIndexedAttribute {
-            static typeName: string;
-            container: Index;
-            type: IndexedAttributeType;
-            attribute: Attribute;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Validation+Rules relevant section in reference guide}
-         */
-        interface IValidationRule extends elements.IElement {
-            container: IEntity;
-            load(): ValidationRule;
-            load(callback: (element: ValidationRule) => void): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Validation+Rules relevant section in reference guide}
-         */
-        class ValidationRule extends elements.Element implements IValidationRule {
-            static typeName: string;
-            container: Entity;
-            attribute: IAttribute;
-            attributeQualifiedName: string;
-            errorMessage: texts.Text;
-            ruleInfo: RuleInfo;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IRuleInfo extends elements.IElement {
-            container: IValidationRule;
-            load(): RuleInfo;
-            load(callback: (element: RuleInfo) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class RuleInfo extends elements.Element implements IRuleInfo {
-            static typeName: string;
-            container: ValidationRule;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IEqualsToRuleInfo extends IRuleInfo {
-            container: IValidationRule;
-            load(): EqualsToRuleInfo;
-            load(callback: (element: EqualsToRuleInfo) => void): any;
-        }
-        class EqualsToRuleInfo extends RuleInfo implements IEqualsToRuleInfo {
-            static typeName: string;
-            container: ValidationRule;
-            useValue: boolean;
-            equalsToValue: string;
-            equalsToAttribute: IAttribute;
-            equalsToAttributeQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IMaxLengthRuleInfo extends IRuleInfo {
-            container: IValidationRule;
-            load(): MaxLengthRuleInfo;
-            load(callback: (element: MaxLengthRuleInfo) => void): any;
-        }
-        class MaxLengthRuleInfo extends RuleInfo implements IMaxLengthRuleInfo {
-            static typeName: string;
-            container: ValidationRule;
-            maxLength: number;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IRangeRuleInfo extends IRuleInfo {
-            container: IValidationRule;
-            load(): RangeRuleInfo;
-            load(callback: (element: RangeRuleInfo) => void): any;
-        }
-        class RangeRuleInfo extends RuleInfo implements IRangeRuleInfo {
-            static typeName: string;
-            container: ValidationRule;
-            typeOfRange: RangeType;
-            useMinValue: boolean;
-            useMaxValue: boolean;
-            minValue: string;
-            maxValue: string;
-            minAttribute: IAttribute;
-            minAttributeQualifiedName: string;
-            maxAttribute: IAttribute;
-            maxAttributeQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IRegExRuleInfo extends IRuleInfo {
-            container: IValidationRule;
-            load(): RegExRuleInfo;
-            load(callback: (element: RegExRuleInfo) => void): any;
-        }
-        class RegExRuleInfo extends RuleInfo implements IRegExRuleInfo {
-            static typeName: string;
-            container: ValidationRule;
-            regularExpression: regularexpressions.IRegularExpression;
-            regularExpressionQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface IRequiredRuleInfo extends IRuleInfo {
-            container: IValidationRule;
-            load(): RequiredRuleInfo;
-            load(callback: (element: RequiredRuleInfo) => void): any;
-        }
-        class RequiredRuleInfo extends RuleInfo implements IRequiredRuleInfo {
-            static typeName: string;
-            container: ValidationRule;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IUniqueRuleInfo extends IRuleInfo {
-            container: IValidationRule;
-            load(): UniqueRuleInfo;
-            load(callback: (element: UniqueRuleInfo) => void): any;
-        }
-        class UniqueRuleInfo extends RuleInfo implements IUniqueRuleInfo {
-            static typeName: string;
-            container: ValidationRule;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        class AssociationType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Reference: AssociationType;
-            static ReferenceSet: AssociationType;
-        }
-        class AssociationOwner extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Default: AssociationOwner;
-            static Both: AssociationOwner;
-        }
-        class DeletingBehavior extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static DeleteMeAndReferences: DeletingBehavior;
-            static DeleteMeButKeepReferences: DeletingBehavior;
-            static DeleteMeIfNoReferences: DeletingBehavior;
-        }
-        class MemberAccessRights extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static None: MemberAccessRights;
-            static ReadOnly: MemberAccessRights;
-            static ReadWrite: MemberAccessRights;
-        }
-        class ActionMoment extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Before: ActionMoment;
-            static After: ActionMoment;
-        }
-        class EventType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Create: EventType;
-            static Commit: EventType;
-            static Delete: EventType;
-            static RollBack: EventType;
-        }
-        class IndexedAttributeType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static Normal: IndexedAttributeType;
-            static CreatedDate: IndexedAttributeType;
-            static ChangedDate: IndexedAttributeType;
-        }
-        class RangeType extends instances.IEnum {
-            protected qualifiedTsTypeName: string;
-            static GreaterThanOrEqualTo: RangeType;
-            static SmallerThanOrEqualTo: RangeType;
-            static Between: RangeType;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import elements = internal.elements;
-    import instances = internal.instances;
-    import model = internal.model;
-    import transport = internal.transport;
-    import units = internal.units;
-    /**
-     * Interfaces and instance classes for types from the Mendix sub meta model `Enumerations`.
-     */
-    namespace enumerations {
-        interface IModuleDocument extends units.IModelUnit {
-            container: projects.IFolderBase;
-            load(): ModuleDocument;
-            load(callback: (element: ModuleDocument) => void): any;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class ModuleDocument extends units.ModelUnit implements IModuleDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): Object;
-        }
-        interface IDocument extends projects.IModuleDocument {
-            container: projects.IFolderBase;
-            load(): Document;
-            load(callback: (element: Document) => void): any;
-            name: string;
-        }
-        /**
-         * Warning: this class represents a non-instantiable concept in the meta model,
-         * i.e. it is effectively abstract and you should _not_ try to instantiate this class directly,
-         * but instantiate one of its (effectively concrete) sub classes.
-         * Instantiating this class is not impossible, but there's no guarantee the result will be useful.
-         */
-        class Document extends projects.ModuleDocument implements IDocument {
-            static typeName: string;
-            container: projects.FolderBase;
-            name: string;
-            documentation: string;
-            excluded: boolean;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Enumerations relevant section in reference guide}
-         */
-        interface IEnumeration extends projects.IDocument {
-            container: projects.IFolderBase;
-            load(): Enumeration;
-            load(callback: (element: Enumeration) => void): any;
-            values: instances.IList<IEnumerationValue>;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Enumerations relevant section in reference guide}
-         */
-        class Enumeration extends projects.Document implements IEnumeration {
-            static typeName: string;
-            container: projects.FolderBase;
-            values: instances.IList<EnumerationValue>;
-            constructor(container: projects.IFolderBase);
-            constructor(isCreatingNewInstance: boolean, model: model.Model, container: units.StructuralUnit, json: transport.IAbstractUnitJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Enumerations relevant section in reference guide}
-         */
-        interface IEnumerationValue extends elements.IElement {
-            container: IEnumeration;
-            load(): EnumerationValue;
-            load(callback: (element: EnumerationValue) => void): any;
-            name: string;
-        }
-        /**
-         * See: {@link https://world.mendix.com/display/refguide5/Enumerations relevant section in reference guide}
-         */
-        class EnumerationValue extends elements.Element implements IEnumerationValue {
-            static typeName: string;
-            container: Enumeration;
-            name: string;
-            caption: texts.Text;
-            image: images.IImage;
-            imageQualifiedName: string;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-        interface ICondition extends elements.IElement {
-            load(): Condition;
-            load(callback: (element: Condition) => void): any;
-        }
-        class Condition extends elements.Element implements ICondition {
-            static typeName: string;
-            attributeValue: string;
-            editableVisible: boolean;
-            constructor();
-            constructor(isCreatingNewInstance: boolean, unit: units.ModelUnit, container: elements.AbstractElement, json: transport.IAbstractElementJson, isPartial: boolean);
-            toPlainJson(): any;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    namespace sdk {
-        namespace internal {
-            namespace model {
-                interface IBaseModel {
-                    allMicroflows(): microflows.IMicroflow[];
-                    allMicroflowBases(): microflows.IMicroflowBase[];
-                    allRules(): microflows.IRule[];
-                    allImportedWebServices(): webservices.IImportedWebService[];
-                    allPublishedAppServices(): webservices.IPublishedAppService[];
-                    allPublishedServiceBases(): webservices.IPublishedServiceBase[];
-                    allPublishedWebServices(): webservices.IPublishedWebService[];
-                    allMxXmlSchemas(): xmlschemas.IMxXmlSchema[];
-                    allConsumedAppServices(): appservices.IConsumedAppService[];
-                    allMappingDocuments(): mappings.IMappingDocument[];
-                    allExportMappings(): exportmappings.IExportMapping[];
-                    allImportMappings(): importmappings.IImportMapping[];
-                    allPublishedOdataServices(): rest.IPublishedOdataService[];
-                    allPublishedRestServices(): rest.IPublishedRestService[];
-                    allPublishedRestServiceBases(): rest.IPublishedRestServiceBase[];
-                    allFormBases(): pages.IFormBase[];
-                    allPages(): pages.IPage[];
-                    allLayouts(): pages.ILayout[];
-                    allSnippets(): pages.ISnippet[];
-                    allDocumentTemplates(): documenttemplates.IDocumentTemplate[];
-                    allNavigationDocuments(): navigation.INavigationDocument[];
-                    allMenuDocuments(): menus.IMenuDocument[];
-                    allDataSets(): datasets.IDataSet[];
-                    allSystemTextCollections(): texts.ISystemTextCollection[];
-                    allJavaActions(): javaactions.IJavaAction[];
-                    allProjects(): projects.IProject[];
-                    allProjectDocuments(): projects.IProjectDocument[];
-                    allFolderBases(): projects.IFolderBase[];
-                    allFolders(): projects.IFolder[];
-                    allModules(): projects.IModule[];
-                    allModuleDocuments(): projects.IModuleDocument[];
-                    allDocuments(): projects.IDocument[];
-                    allProjectConversions(): projects.IProjectConversion[];
-                    allConstants(): constants.IConstant[];
-                    allProjectSettings(): settings.IProjectSettings[];
-                    allScheduledEvents(): scheduledevents.IScheduledEvent[];
-                    allRegularExpressions(): regularexpressions.IRegularExpression[];
-                    allImageCollections(): images.IImageCollection[];
-                    allModuleSecurities(): security.IModuleSecurity[];
-                    allProjectSecurities(): security.IProjectSecurity[];
-                    allDomainModels(): domainmodels.IDomainModel[];
-                    allEnumerations(): enumerations.IEnumeration[];
-                }
-                /**
-                 * Class to find generated model units.
-                 */
-                class BaseModel {
-                    allMicroflows(): microflows.IMicroflow[];
-                    allMicroflowBases(): microflows.IMicroflowBase[];
-                    allRules(): microflows.IRule[];
-                    allImportedWebServices(): webservices.IImportedWebService[];
-                    allPublishedAppServices(): webservices.IPublishedAppService[];
-                    allPublishedServiceBases(): webservices.IPublishedServiceBase[];
-                    allPublishedWebServices(): webservices.IPublishedWebService[];
-                    allMxXmlSchemas(): xmlschemas.IMxXmlSchema[];
-                    allConsumedAppServices(): appservices.IConsumedAppService[];
-                    allMappingDocuments(): mappings.IMappingDocument[];
-                    allExportMappings(): exportmappings.IExportMapping[];
-                    allImportMappings(): importmappings.IImportMapping[];
-                    allPublishedOdataServices(): rest.IPublishedOdataService[];
-                    allPublishedRestServices(): rest.IPublishedRestService[];
-                    allPublishedRestServiceBases(): rest.IPublishedRestServiceBase[];
-                    allFormBases(): pages.IFormBase[];
-                    allPages(): pages.IPage[];
-                    allLayouts(): pages.ILayout[];
-                    allSnippets(): pages.ISnippet[];
-                    allDocumentTemplates(): documenttemplates.IDocumentTemplate[];
-                    allNavigationDocuments(): navigation.INavigationDocument[];
-                    allMenuDocuments(): menus.IMenuDocument[];
-                    allDataSets(): datasets.IDataSet[];
-                    allSystemTextCollections(): texts.ISystemTextCollection[];
-                    allJavaActions(): javaactions.IJavaAction[];
-                    allProjects(): projects.IProject[];
-                    allProjectDocuments(): projects.IProjectDocument[];
-                    allFolderBases(): projects.IFolderBase[];
-                    allFolders(): projects.IFolder[];
-                    allModules(): projects.IModule[];
-                    allModuleDocuments(): projects.IModuleDocument[];
-                    allDocuments(): projects.IDocument[];
-                    allProjectConversions(): projects.IProjectConversion[];
-                    allConstants(): constants.IConstant[];
-                    allProjectSettings(): settings.IProjectSettings[];
-                    allScheduledEvents(): scheduledevents.IScheduledEvent[];
-                    allRegularExpressions(): regularexpressions.IRegularExpression[];
-                    allImageCollections(): images.IImageCollection[];
-                    allModuleSecurities(): security.IModuleSecurity[];
-                    allProjectSecurities(): security.IProjectSecurity[];
-                    allDomainModels(): domainmodels.IDomainModel[];
-                    allEnumerations(): enumerations.IEnumeration[];
-                }
-                interface IByNameReferenceResolver {
-                    findLayoutByQualifiedName(qname: string): pages.ILayout;
-                    findAppServiceActionParameterByQualifiedName(qname: string): appservices.IAppServiceActionParameter;
-                    findImportMappingByQualifiedName(qname: string): importmappings.IImportMapping;
-                    findJavaActionByQualifiedName(qname: string): javaactions.IJavaAction;
-                    findMicroflowByQualifiedName(qname: string): microflows.IMicroflow;
-                    findSnippetByQualifiedName(qname: string): pages.ISnippet;
-                    findMenuDocumentByQualifiedName(qname: string): menus.IMenuDocument;
-                    findRuleParameterByQualifiedName(qname: string): microflows.IRuleParameter;
-                    findLayoutParameterByQualifiedName(qname: string): pages.ILayoutParameter;
-                    findMicroflowParameterByQualifiedName(qname: string): microflows.IMicroflowParameter;
-                    findPageByQualifiedName(qname: string): pages.IPage;
-                    findMxXmlSchemaByQualifiedName(qname: string): xmlschemas.IMxXmlSchema;
-                    findAssociationBaseByQualifiedName(qname: string): domainmodels.IAssociationBase;
-                    findAppServiceActionByQualifiedName(qname: string): appservices.IAppServiceAction;
-                    findExportMappingByQualifiedName(qname: string): exportmappings.IExportMapping;
-                    findUserRoleByQualifiedName(qname: string): security.IUserRole;
-                    findRegularExpressionByQualifiedName(qname: string): regularexpressions.IRegularExpression;
-                    findAttributeByQualifiedName(qname: string): domainmodels.IAttribute;
-                    findEntityByQualifiedName(qname: string): domainmodels.IEntity;
-                    findModuleRoleByQualifiedName(qname: string): security.IModuleRole;
-                    findImportedWebServiceByQualifiedName(qname: string): webservices.IImportedWebService;
-                    findDocumentTemplateByQualifiedName(qname: string): documenttemplates.IDocumentTemplate;
-                    findRuleByQualifiedName(qname: string): microflows.IRule;
-                    findDataSetByQualifiedName(qname: string): datasets.IDataSet;
-                    findConstantByQualifiedName(qname: string): constants.IConstant;
-                    findImageByQualifiedName(qname: string): images.IImage;
-                    findJavaActionParameterByQualifiedName(qname: string): javaactions.IJavaActionParameter;
-                    findEnumerationByQualifiedName(qname: string): enumerations.IEnumeration;
-                }
-            }
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    namespace sdk {
-        namespace internal {
-            /**
-             * The `deltas` module does not contain the interfaces for all deltas,
-             * but it does contain (all) objects required for building and handling these.
-             */
-            namespace deltas {
-                const DeltaTypes: {
-                    CREATE_ELEMENT: string;
-                    UPDATE_PROPERTY_VALUE: string;
-                    MOVE_ELEMENT: string;
-                    DELETE_ELEMENT: string;
-                    CREATE_UNIT: string;
-                };
-                const MutatorTypes: {
-                    CHANGE: string;
-                    ADD: string;
-                    REMOVE: string;
-                    MOVE: string;
-                };
-                /**
-                * A POTSO that wraps a delta and success/failure callbacks.
-                */
-                class DeltaRequest {
-                    delta: transport.IDelta;
-                    onSuccess: common.IVoidCallback;
-                    onFailure: common.IErrorCallback;
-                    constructor(delta: transport.IDelta, onSuccess?: common.IVoidCallback, onFailure?: common.IErrorCallback);
-                }
-                /**
-                 * A simple queue implementation for deltas.
-                 */
-                class DeltaQueue {
-                    private model;
-                    private logToConsole;
-                    private delay;
-                    private maxDeltasPerBatch;
-                    private queue;
-                    private pending;
-                    isClosing: boolean;
-                    private closeCallback;
-                    constructor(model: model.Model, logToConsole?: boolean);
-                    /**
-                     * Closes the "connection" with the Model API Server in the sense that
-                     * pending delta requests are processed, and that afterwards the given
-                     * `callback` will be called.
-                     * This function can only be called once.
-                     */
-                    closeConnection(callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
-                    /**
-                     * Pushes the given `delta` on the queue for scheduling/processing.
-                     */
-                    push(delta: DeltaRequest): void;
-                    /**
-                     * Schedules the next delta for processing using JS's event queue/loop.
-                     */
-                    private schedule();
-                    private processNext();
-                }
-            }
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    namespace sdk {
-        /**
-         * Internal API of the mendixmodelsdk.
-         *
-         * DISCLAIMER: End-users of the sdk should never instantiate classes in this module, or in submodules of this module.
-         * Anything in this module, or its submodules, can be removed, or have changed signature, between sdk-versions.
-         */
-        namespace internal {
-            /**
-             * The `modelapiclient` module provides typed communication with the Model API Server.
-             */
-            namespace modelapiclient {
-                /**
-                 * The IModelApiClient interface is used for forwarding calls to the underlying Mendix Model API.
-                 * Implementations of this interface serve as fully-typed clients for the Model API Server.
-                 * Default implementation: {@link ModelApiClientImpl}.
-                 * Note that all its methods are asynchronous, with the last two arguments always being a (success) callback and an error callback,
-                 * and we will only explain the "essential" arguments in their documentation.
-                 */
-                interface IModelApiClient {
-                    createWorkingCopy(workingCopyInfo: configuration.ICreateWorkingCopyParameters, callback: common.ICallback<transport.IWorkingCopy>, errorCallback: common.IErrorCallback): any;
-                    /**
-                     * Loads all unit interfaces of the working copy indicated with `workingCopyId` as an array of normalised model JSON.
-                     */
-                    loadUnitInterfaces(workingCopyId: string, callback: common.ICallback<transport.IAbstractUnitJson[]>, errorCallback: common.IErrorCallback): any;
-                    /**
-                     * Retrieves the top-level working copy information/meta data for the working copy with given `workingCopyId`.
-                     */
-                    loadWorkingCopyMetaData(workingCopyId: string, callback: common.ICallback<transport.IWorkingCopy>, errorCallback: common.IErrorCallback): any;
-                    deleteWorkingCopy(workingCopyId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): any;
-                    grantAccess(workingCopyId: string, memberOpenId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): any;
-                    revokeAccess(workingCopyId: string, memberOpenId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): any;
-                    checkAccess(workingCopyId: string, memberOpenId: string, callback: common.ICallback<boolean>, errorCallback: common.IErrorCallback): any;
-                    exportMpk(workingCopyId: string, outFilePath: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): any;
-                    /**
-                     * Retrieves a unit, as normalised model JSON, by working copy and unit ID.
-                     */
-                    fetchUnitById<T extends units.AbstractUnit>(workingCopyId: string, unitId: string, callback: common.ICallback<transport.IAbstractUnitJson>, errorCallback: common.IErrorCallback): any;
-                    /**
-                     * Sends a sequence of deltas on the working copy with the given `workingCopyId` to the Model API Server;
-                     * batched if more than one is passed, as a single delta otherwise.
-                     */
-                    sendDeltas(workingCopyId: string, deltas: transport.IDelta[], callback: common.ICallback<Object>, errorCallback: common.IErrorCallback): any;
-                }
-                class ModelApiClientImpl implements IModelApiClient {
-                    private transportation;
-                    constructor(transportation: transportation.ITransportation);
-                    createWorkingCopy(workingCopyInfo: configuration.ICreateWorkingCopyParameters, callback: common.ICallback<transport.IWorkingCopy>, errorCallback: common.IErrorCallback): void;
-                    loadWorkingCopyMetaData(workingCopyId: string, callback: common.ICallback<transport.IWorkingCopy>, errorCallback: common.IErrorCallback): void;
-                    loadUnitInterfaces(workingCopyId: string, callback: common.ICallback<transport.IAbstractUnitJson[]>, errorCallback: common.IErrorCallback): void;
-                    deleteWorkingCopy(workingCopyId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
-                    grantAccess(workingCopyId: string, memberOpenId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
-                    revokeAccess(workingCopyId: string, memberOpenId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
-                    checkAccess(workingCopyId: string, memberOpenId: string, callback: common.ICallback<boolean>, errorCallback: common.IErrorCallback): void;
-                    exportMpk(workingCopyId: string, outFilePath: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
-                    fetchUnitById<T extends units.AbstractUnit>(workingCopyId: string, unitId: string, callback: common.ICallback<transport.IAbstractUnitJson>, errorCallback: common.IErrorCallback): void;
-                    sendDeltas(workingCopyId: string, deltas: transport.IDelta[], callback: common.ICallback<Object>, errorCallback: common.IErrorCallback): void;
-                }
-            }
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    namespace sdk {
-        /**
-         * The `configuration` module allows the Model SDK user to configure
-         * how to communicate with the Model API Server;
-         * in particular w.r.t.: authentication, success/error handling, etc.
-         */
-        namespace configuration {
-            /**
-             * The credentials with which a trusted backend client (such as sprintr) connects to the Model API Server.
-             */
-            interface IBackendCredentials {
-                username: string;
-                password: string;
-                /** The OpenID on behalf which the trusted backend service operates. */
-                openid?: string;
-            }
-            interface ISdkCredentials {
-                username: string;
-                apikey: string;
-            }
-            /**
-             * All the details of the connection that's been set up to the Model API Server.
-             */
-            interface ISdkConfig {
-                credentials?: IBackendCredentials | ISdkCredentials;
-                endPoint?: string;
-                transportation?: internal.transportation.ITransportation;
-                client?: sdk.internal.modelapiclient.IModelApiClient;
-            }
-            interface ICreateWorkingCopyParameters {
-                name: string;
-                description?: string;
-                avatarUrl?: string;
-                /**
-                 * Path to the (template) MPK file.
-                 */
-                template: string;
-            }
-            function assertBackendAccess(config: ISdkConfig): void;
-            function checkWorkingCopyId(workingCopyId: string): void;
-            function checkCallbacks(callback: Function, errorCallback: Function): void;
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import internal = sdk.internal;
-    import model = internal.model;
-    /**
-     * This interface exposes a single Mendix Model.
-     * This interface contains the parts of the {@link Model} that are exposed through the SDK.
-     */
-    interface IModel extends model.IBaseModel, model.IByNameReferenceResolver {
-        /**
-         * Working copy id of the current opened model (read only)
-         */
-        id: string;
-        /**
-         * The actual contents of the model.
-         */
-        root: projects.IProject;
-        /**
-         * The meta data of the model.
-         */
-        metadata: internal.transport.IWorkingCopy;
-        /**
-         * Ends the connection with the Model API client.
-         * Flushes any pending deltas and invokes the callback once complete.
-         * (Errors will be handled through the default modelstore error handler.)
-         */
-        closeConnection(callback: common.IVoidCallback, errorCallback?: common.IErrorCallback): any;
-        /**
-         * Deletes this model from the server, and the (SDK) client.
-         * If you are altering the model before deleting it, make sure to call this method in the callback of {@link closeConnection}.
-         *
-         */
-        deleteWorkingCopy(callback: common.IVoidCallback, errorCallback?: common.IErrorCallback): any;
-        /**
-         * Exports this model as MPK.
-         * If you are altering the model before running an export make sure to call this method in the callback of {@link closeConnection}.
-         */
-        exportMpk(outFilePath: string, callback: common.IVoidCallback, errorCallback?: common.IErrorCallback): any;
-        /**
-         * Given a moduleName, returns a module name
-         * (For modules, their qualified name equals their name)
-         */
-        findModuleByQualifiedName(qname: string): any;
-        /**
-         * Given an id, fetches a complete unit. The result might be returned from the cache.
-         * Use this method if you have just a unit Id, otherwise, unit.fetch() is a simpler alternative.
-         */
-        fetchUnitById<T extends sdk.internal.units.IAbstractUnit>(id: string, callback: common.ICallback<T>, errorCallback?: common.IErrorCallback): any;
-    }
-    namespace sdk {
-        namespace internal {
-            namespace model {
-                interface IUnitsCache {
-                    [id: string]: units.IAbstractUnit;
-                }
-                /**
-                 * Implementation of {@link IModel}.
-                 */
-                class Model extends BaseModel implements IModel {
-                    metadata: transport.IWorkingCopy;
-                    /**
-                     * Map unitId -> unit, containing all units of this model, which could be partial(ly loaded).
-                     */
-                    /**
-                     * Map unitType -> units[], containing all units of this model, per type, but not sorted in any particular order.
-                     * Please extend the type whenever applicable, for convenience of the programmer.
-                     */
-                    constructor(_client: modelapiclient.IModelApiClient, _errorHandler: common.IErrorCallback, _connectionConfig: configuration.ISdkConfig);
-                    closeConnection(callback: common.IVoidCallback, errorCallback?: common.IErrorCallback): void;
-                    /**
-                     * Instantiates a new Model that can communicate with the server for sending and receiving documents.
-                     * Loading a Model will automatically fetches all unit interfaces for this working copy and invokes the (success) callback,
-                     * or calls the errorHandler if this fails.
-                     */
-                    static create(client: modelapiclient.IModelApiClient, workingCopyInfo: configuration.ICreateWorkingCopyParameters, callback: common.ICallback<transport.IWorkingCopy>, errorCallback: common.IErrorCallback): void;
-                    /**
-                     * Instantiates a new working copy that can communicate with the server for sending and receiving documents.
-                     * Reading a working copy will automatically fetch all unit interfaces for this working copy and invoke callback, or call the errorHandler if this fails.
-                     */
-                    static read(client: modelapiclient.IModelApiClient, workingCopyId: string, callback: (model: IModel) => void, errorCallback: common.IErrorCallback, connectionConfig: configuration.ISdkConfig): void;
-                    id: string;
-                    /**
-                     * Returns the structural unit of type "Projects$Project" which is the project's root,
-                     * cast to the appropriate type.
-                     */
-                    root: projects.IProject;
-                    /**
-                     * Registers the given `unit` in the cache(s).
-                     */
-                    /**
-                     * Unregisters the given `unit` from the cache(s).
-                     */
-                    /**
-                     * Fetches a complete unit. The result might be returned from the cache.
-                     */
-                    fetchUnitById<T extends units.IAbstractUnit>(id: string, callback: common.ICallback<T>, errorCallback?: common.IErrorCallback): void;
-                    /**
-                     * Loads all unit interfaces and caches them.
-                     * This function cannot be called twice.
-                     */
-                    /**
-                     * If a reference is broken, it should be registered here, so that it can be restored once model elements are renamed.
-                     */
-                    /**
-                     * If a reference is no longer broken, it should be unregistered here.
-                     */
-                    /**
-                     * If a model element changes its name, broken by-name references should be attempted to resolve.
-                     *
-                     * In the future this might be made smarter and less expensive, once that becomes an issue.
-                     */
-                    /**
-                     * Deletes this working copy from the server, and the (SDK) client.
-                     */
-                    deleteWorkingCopy(callback: common.IVoidCallback, errorCallback?: common.IErrorCallback): void;
-                    exportMpk(outFilePath: string, callback: common.IVoidCallback, errorCallback?: common.IErrorCallback): void;
-                    /**
-                     * Given an object type name and a qualified name, finds the corresponding element (or null if the reference is broken).
-                     * Will always succeed for unbroken references,
-                     * since all objects that are referred by name should be part of the public interface of the model.
-                     *
-                     * Example usage:
-                     * 	`modelStore.resolveName(domainmodels.Attribute.typeName, "Expenses.Expense.Price");`
-                     */
-                    /**
-                     * Resolver methods for references by name
-                     */
-                    /**
-                     * Finds an item in a colleciton
-                     */
-                    findModuleByQualifiedName(name: string): projects.IModule;
-                    findLayoutByQualifiedName(qname: string): pages.ILayout;
-                    findJavaActionByQualifiedName(qname: string): javaactions.IJavaAction;
-                    findMicroflowByQualifiedName(qname: string): microflows.IMicroflow;
-                    findSnippetByQualifiedName(qname: string): pages.ISnippet;
-                    findMenuDocumentByQualifiedName(qname: string): menus.IMenuDocument;
-                    findLayoutParameterByQualifiedName(qname: string): pages.ILayoutParameter;
-                    findMicroflowParameterByQualifiedName(qname: string): microflows.IMicroflowParameter;
-                    findRuleParameterByQualifiedName(qname: string): microflows.IRuleParameter;
-                    findPageByQualifiedName(qname: string): pages.IPage;
-                    findAssociationBaseByQualifiedName(qname: string): domainmodels.IAssociationBase;
-                    findEntityByQualifiedName(qname: string): domainmodels.IEntity;
-                    findAttributeByQualifiedName(qname: string): domainmodels.IAttribute;
-                    findAppServiceActionByQualifiedName(qname: string): appservices.IAppServiceAction;
-                    findAppServiceActionParameterByQualifiedName(qname: string): appservices.IAppServiceActionParameter;
-                    findMxXmlSchemaByQualifiedName(qname: string): xmlschemas.IMxXmlSchema;
-                    findExportMappingByQualifiedName(qname: string): exportmappings.IExportMapping;
-                    findImportMappingByQualifiedName(qname: string): importmappings.IImportMapping;
-                    findUserRoleByQualifiedName(qname: string): security.IUserRole;
-                    findRegularExpressionByQualifiedName(qname: string): regularexpressions.IRegularExpression;
-                    findModuleRoleByQualifiedName(qname: string): security.IModuleRole;
-                    findImportedWebServiceByQualifiedName(qname: string): webservices.IImportedWebService;
-                    findDocumentTemplateByQualifiedName(qname: string): documenttemplates.IDocumentTemplate;
-                    findRuleByQualifiedName(qname: string): microflows.IRule;
-                    findDataSetByQualifiedName(qname: string): datasets.IDataSet;
-                    findConstantByQualifiedName(qname: string): constants.IConstant;
-                    findImageByQualifiedName(qname: string): images.IImage;
-                    findJavaActionParameterByQualifiedName(qname: string): javaactions.IJavaActionParameter;
-                    findEnumerationByQualifiedName(qname: string): enumerations.IEnumeration;
-                }
-            }
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    import configuration = sdk.configuration;
-    /**
-     * Client class of the Mendix Model Sdk.
-     * By instantiating this class with appropriate configuration, you can create and read working copies.
-     */
-    class ModelSdkClient {
-        private connectionConfig;
-        private client;
-        constructor(connectionConfig: configuration.ISdkConfig);
-        /**
-         * Create a new working copy on the model server, and reads it for immediate editing.
-         */
-        createWorkingCopy(workingCopyParameters: configuration.ICreateWorkingCopyParameters, callback: common.ICallback<IModel>, errorCallback: common.IErrorCallback): void;
-        /**
-         * Reads a working copy on the model server so it can be edited.
-         */
-        openWorkingCopy(workingCopyId: string, callback: common.ICallback<IModel>, errorCallback: common.IErrorCallback): void;
-        /**
-         * Deletes this working copy from the server, and the (SDK) client.
-         */
-        deleteWorkingCopy(workingCopyId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
-        /**
-         * Grants access to the member specified to his/her OpenID on this working copy.
-         */
-        grantAccess(workingCopyId: string, memberOpenId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
-        /**
-         * Revokes access of the member specified to his/her OpenID on this working copy.
-         */
-        revokeAccess(workingCopyId: string, memberOpenId: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
-        /**
-         * Returns whether the member specified to his/her OpenID has (been granted) access to this working copy.
-         */
-        checkAccess(workingCopyId: string, memberOpenId: string, callback: common.ICallback<boolean>, errorCallback: common.IErrorCallback): void;
-        /**
-         * Exports this working copy as MPK.
-         */
-        exportMpk(workingCopyId: string, outFilePath: string, callback: common.IVoidCallback, errorCallback: common.IErrorCallback): void;
-    }
-}
-declare module "mendixmodelsdk" {
-    namespace sdk {
-        namespace extras {
-            function serializeToJs(unit: internal.units.AbstractUnit): string;
-            /**
-             * Class which allows to serialise a given model part as TypeScript code that constructs that model piece.
-             * Limitations:
-             *  - Can only do elements in one (model) unit.
-             */
-            class JavaScriptSerialiser {
-                private unit;
-                private unitVarName;
-                private creations;
-                private creationsById;
-                private varNames;
-                constructor(unit: internal.units.IAbstractUnit, unitVarName: string);
-                schedule(structure: internal.structures.IStructure): void;
-                source(): string;
-                private creationAsSource(creation);
-                private settingAsSource(varName, setting);
-                private singleValueAsTsExpr(varName, setting, singleValue);
-                private asCreation(structure);
-            }
-        }
-    }
-}
-declare module "mendixmodelsdk" {
-    namespace sdk {
-        namespace internal {
-            /**
-             * The `transportation` module is responsible for performing requests on the (/a) Model API Server.
-             */
-            namespace transportation {
-                /**
-                 * Implementations of this interface are capable of placing a request with the Model API Server over HTTP.
-                 * Default implementation: {@link RestTransportation}.
-                 */
-                interface ITransportation {
-                    /**
-                     * Fire off a HTTP request, with specified method, url, data, and success and failure callbacks.
-                     */
-                    request<T>(method: string, url: string, data: Object, success: common.ICallback<T>, failure: common.IErrorCallback): any;
-                    requestMultipartBinaryFileUpload<T>(method: string, url: string, data: Object, filename: string, success: common.ICallback<T>, failure: common.IErrorCallback): any;
-                    requestFileDownload<T>(method: string, url: string, success: common.ICallback<T>, failure: common.IErrorCallback): any;
-                }
-                /**
-                 * Default implementation of {@link ITransportation} that communicates with the Model API Server over
-                 * HTTP using Restler.
-                 */
-                class RestTransportation implements ITransportation {
-                    private config;
-                    constructor(config: configuration.ISdkConfig);
-                    private sanitizedMethod(method);
-                    private url(urlEndpoint);
-                    private generateStandardOptions();
-                    private handleRequest<T>(request, url, data, success, failure);
-                    request<T>(method: string, url: string, data: Object, success: common.ICallback<T>, failure: common.IErrorCallback): void;
-                    requestMultipartBinaryFileUpload<T>(method: string, url: string, data: Object, filename: string, success: common.ICallback<T>, failure: common.IErrorCallback): void;
-                    requestFileDownload<T>(method: string, url: string, success: common.ICallback<T>, failure: common.IErrorCallback): void;
-                }
-            }
-        }
-    }
-}
-declare var mobservable: IMobservableStatic;
-declare var global: any;
-declare var require: {
-    (id: string): any;
-    resolve(id: string): string;
-    cache: any;
-    extensions: any;
-    main: any;
-};
-declare var module: {
-    exports: any;
-    require(id: string): any;
-    id: string;
-    filename: string;
-    loaded: boolean;
-    parent: any;
-    children: any[];
-};
-
diff --git a/mendixmodelsdk/tsconfig.json b/mendixmodelsdk/tsconfig.json
new file mode 100644
index 0000000000..34715792ce
--- /dev/null
+++ b/mendixmodelsdk/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mendixmodelsdk-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/merge-descriptors/index.d.ts b/merge-descriptors/index.d.ts
new file mode 100644
index 0000000000..053659176a
--- /dev/null
+++ b/merge-descriptors/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for merge-descriptors
+// Project: https://github.com/component/merge-descriptors
+// Definitions by: Zhiyuan Wang <https://github.com/danny8002/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare function merge(destination: Object, source: Object): Object;
+
+declare function merge(destination: Object, source: Object, redefine: boolean): Object;
+
+export = merge;
diff --git a/merge-descriptors/merge-descriptors-tests.ts b/merge-descriptors/merge-descriptors-tests.ts
index 81376320ff..6a5770e178 100644
--- a/merge-descriptors/merge-descriptors-tests.ts
+++ b/merge-descriptors/merge-descriptors-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="merge-descriptors.d.ts"/>
-import mixin = require('merge-descriptors');
+import mixin = require('merge-descriptors');
 
 function testAssertion(condition: boolean, errorMessage: string) {
     if (!condition) {
diff --git a/merge-descriptors/merge-descriptors.d.ts b/merge-descriptors/merge-descriptors.d.ts
deleted file mode 100644
index 3c51300e9a..0000000000
--- a/merge-descriptors/merge-descriptors.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Type definitions for merge-descriptors
-// Project: https://github.com/component/merge-descriptors
-// Definitions by: Zhiyuan Wang <https://github.com/danny8002/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'merge-descriptors' {
-
-    function merge(destination: Object, source: Object): Object;
-
-    function merge(destination: Object, source: Object, redefine: boolean): Object;
-
-    export = merge;
-}
\ No newline at end of file
diff --git a/merge-descriptors/tsconfig.json b/merge-descriptors/tsconfig.json
new file mode 100644
index 0000000000..76ee66d42d
--- /dev/null
+++ b/merge-descriptors/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "merge-descriptors-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/merge-stream/index.d.ts b/merge-stream/index.d.ts
new file mode 100644
index 0000000000..90f91ee327
--- /dev/null
+++ b/merge-stream/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for merge-stream v1.0.0
+// Project: https://github.com/grncdr/merge-stream
+// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>, Tom X. Tobin <http://tomxtobin.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+interface IMergedStream extends NodeJS.ReadWriteStream {
+    add(source: NodeJS.ReadableStream): IMergedStream;
+    add(source: NodeJS.ReadableStream[]): IMergedStream;
+    isEmpty(): boolean;
+}
+
+declare function merge<T extends NodeJS.ReadableStream>(...streams: T[]): IMergedStream;
+export = merge;
diff --git a/merge-stream/merge-stream-tests.ts b/merge-stream/merge-stream-tests.ts
index 140013eb9c..67a690e824 100644
--- a/merge-stream/merge-stream-tests.ts
+++ b/merge-stream/merge-stream-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./merge-stream.d.ts" />
 
 import stream = require("stream");
 import Stream = stream.Readable;
diff --git a/merge-stream/merge-stream.d.ts b/merge-stream/merge-stream.d.ts
deleted file mode 100644
index d2f8c756e6..0000000000
--- a/merge-stream/merge-stream.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for merge-stream v1.0.0
-// Project: https://github.com/grncdr/merge-stream
-// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>, Tom X. Tobin <http://tomxtobin.com/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare module "merge-stream" {
-    interface IMergedStream extends NodeJS.ReadWriteStream {
-        add(source: NodeJS.ReadableStream): IMergedStream;
-        add(source: NodeJS.ReadableStream[]): IMergedStream;
-        isEmpty(): boolean;
-    }
-
-    function merge<T extends NodeJS.ReadableStream>(...streams: T[]): IMergedStream;
-    export = merge;
-}
diff --git a/merge-stream/tsconfig.json b/merge-stream/tsconfig.json
new file mode 100644
index 0000000000..ac82b20b7b
--- /dev/null
+++ b/merge-stream/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "merge-stream-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/merge2/index.d.ts b/merge2/index.d.ts
new file mode 100644
index 0000000000..3e9c30b6c9
--- /dev/null
+++ b/merge2/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for merge2 v0.3.6
+// Project: https://github.com/teambition/merge2
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+interface IOptions {
+    end?: boolean;
+    objectMode?: boolean;
+}
+
+interface IMerge2Stream extends NodeJS.ReadWriteStream {
+    add(...args: Array<NodeJS.ReadWriteStream | IMerge2Stream | Array<NodeJS.ReadWriteStream | IMerge2Stream | IOptions>>): IMerge2Stream;
+}
+
+interface IMerge2 {
+    (...args: Array<NodeJS.ReadWriteStream | IMerge2Stream | Array<NodeJS.ReadWriteStream | IMerge2Stream> | IOptions>): IMerge2Stream;
+}
+
+declare var _tmp: IMerge2;
+export = _tmp;
diff --git a/merge2/merge2-tests.ts b/merge2/merge2-tests.ts
index b1c4b4e546..8f95b82bda 100644
--- a/merge2/merge2-tests.ts
+++ b/merge2/merge2-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="merge2.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
+
+
 
 import gulp = require('gulp');
 import * as merge2 from "merge2"; 
diff --git a/merge2/merge2.d.ts b/merge2/merge2.d.ts
deleted file mode 100644
index 404b95bbf0..0000000000
--- a/merge2/merge2.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Type definitions for merge2 v0.3.6
-// Project: https://github.com/teambition/merge2
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'merge2' {
-    interface IOptions {
-        end?: boolean;
-        objectMode?: boolean;
-    }
-
-    interface IMerge2Stream extends NodeJS.ReadWriteStream {
-        add(...args: Array<NodeJS.ReadWriteStream | IMerge2Stream | Array<NodeJS.ReadWriteStream | IMerge2Stream | IOptions>>): IMerge2Stream;
-    }
-
-    interface IMerge2 {
-        (...args: Array<NodeJS.ReadWriteStream | IMerge2Stream | Array<NodeJS.ReadWriteStream | IMerge2Stream> | IOptions>): IMerge2Stream;
-    }
-
-    var _tmp: IMerge2;
-    export = _tmp;
-}
diff --git a/merge2/tsconfig.json b/merge2/tsconfig.json
new file mode 100644
index 0000000000..fd977ffe0a
--- /dev/null
+++ b/merge2/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "merge2-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/meshblu/index.d.ts b/meshblu/index.d.ts
new file mode 100644
index 0000000000..39a9e53e93
--- /dev/null
+++ b/meshblu/index.d.ts
@@ -0,0 +1,281 @@
+// Type definitions for meshblu.js 1.30.1
+// Project: https://github.com/octoblu/meshblu-npm
+// Definitions by: Felipe Nipo <https://github.com/fnipo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="node" />
+
+declare module 'meshblu' {
+	var Meshblu: MeshbluStatic;
+
+	export = Meshblu;
+}
+
+interface MeshbluStatic {
+
+	/**
+	 * Establish a secure socket.io connection to Meshblu.
+	 * @param opt
+	 * @returns A Meshblu Connection.
+	 */
+	createConnection(opt: Meshblu.ConnectionOptions): Meshblu.Connection;
+
+}
+
+declare namespace Meshblu {
+
+	interface Connection {
+
+		/**
+		 * Authenticate with Meshblu.
+		 * @returns This Connection.
+		 */
+		identify(): Connection;
+
+		/**
+		 * @param data {string|number|object|array|Buffer} - data for signing.
+		 */
+		sign(data: any): string;
+
+		/**
+		 * @param message {string|number|object|array|Buffer} - signed data.
+		 * @param signature
+		 * @returns {*}
+		 */
+		verify(message: any, signature: any): any;
+
+		/**
+		 * @param uuid
+		 * @param message {string|number|object|array|Buffer} - data for encrypting.
+		 * @param options
+		 * @param fn The callback to be called. It should take one parameter, result,
+		 * 	which is an object containing a property "error".
+		 * @returns This Connection.
+		 */
+		encryptMessage(uuid: string, message: any, options: Meshblu.ConnectionOptions, fn:(result: any) => void): Connection;
+
+		/**
+		 * Send a meshblu message.
+		 * @param payload An array of devices UUIDs.
+		 * @param fn The callback to be called. It should take one parameter, result,
+		 * 	which is an object containing a property "error".
+		 * @returns This Connection.
+		 */
+		message(payload: MessagePayload, fn:(result: any) => void): Connection;
+
+		/**
+		 * Update a device record.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 * @returns This Connection.
+		 */
+		update(data: UpdateData, fn:(result: UpdateSuccess) => void): Connection;
+
+		/**
+		 * Register a new device record.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 * @returns This Connection.
+		 */
+		register(data: RegisterData, fn:(result: RegisterResponse) => void): Connection;
+
+		/**
+		 * Removes a device record.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 * @returns This Connection.
+		 */
+		unregister(data: Device, fn:(result: Device) => void): Connection;
+
+		/**
+		 * Get my device info.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 * @returns This Connection.
+		 */
+		whoami(data: any, fn:(result: DeviceResponse) => void): Connection;
+
+		/**
+		 * Find a Meshblu device.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 * @returns This Connection.
+		 */
+		device(data: Device, fn:(result: DeviceResponse) => void): Connection
+
+		/**
+		 * Find Meshblu devices.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 * @returns This Connection.
+		 */
+		devices(data: Color, fn:(result: DeviceResponse[]) => void): Connection
+
+		/**
+		 * Returns device messages as they are sent and received.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 * @returns This Connection.
+		 */
+		subscribe(data: SubscribeData, fn:(result: any) => void): Connection
+
+		/**
+		 * Cancels device subscription.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 * @returns This Connection.
+		 */
+		unsubscribe(data: UnsubscribeData, fn:(result: any) => void): Connection
+
+		/**
+		 * Send a meshblu data message.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 * @returns This Connection.
+		 */
+		data(data: DataInput, fn:(result: any) => void): Connection
+
+		/**
+		 * Get a meshblu data for a device.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 * @returns This Connection.
+		 */
+		getdata(data: GetDataInput, fn:(result: any) => void): Connection
+
+		/**
+		 * Generate a new session token for a device.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 */
+		generateAndStoreToken(data: Device, fn:(result: ConnectionOptions) => void): void
+
+		/**
+		 * Remove a session token from a device.
+		 * @param data
+		 * @param fn The callback to be called. It should take one parameter, result.
+		 */
+		revokeToken(data: ConnectionOptions, fn:(result: Device) => void): void
+
+		/**
+		 *
+		 * @param uuid
+		 * @param fn The callback to be called. It should take one parameter, err,
+		 * 	which will be null if there was no problem, and one parameter, publicKey,
+		 * 	of type NodeRSA.
+		 */
+		getPublicKey(uuid: string, fn:(err: Error, publicKey: any) => void): void;
+
+		/*
+		 * Lack of documentation about these api functions.
+		 */
+		send(text: string): Connection;
+		bufferedSocketEmit(): void;
+		parseUrl(serverUrl: string, port: string): string;
+		generateKeyPair(): KeyPair;
+		setPrivateKey(privateKey: string): void;
+		setup(): Connection;
+		connect(): void;
+		reconnect(): void;
+		claimdevice(data: Device, fn:(result: Device) => void): Connection;
+		mydevices(data: any, fn:(result: any) => void): Connection
+		status(data: any): Connection
+		authenticate(data: any, fn:(result: any) => void): Connection
+		events(data: any, fn:(result: any) => void): Connection
+		localdevices(fn:(result: any) => void): Connection
+		unclaimeddevices(data: any, fn:(result: any) => void): Connection
+		textBroadcast(data: any): Connection
+		directText(data: any): Connection
+		subscribeText(data: any, fn:(result: any) => void): Connection
+		unsubscribeText(data: any, fn:(result: any) => void): Connection
+		close(fn:(result: any) => void): Connection
+		resetToken(data: any, fn:(result: any) => void): void
+	}
+
+	/**
+	 * Contains the primary means of identifying a device.
+	 */
+	interface ConnectionOptions {
+		uuid: string;
+		token: string;
+	}
+
+	interface KeyPair {
+		privateKey: string;
+		publicKey: string;
+	}
+
+	interface MessagePayload {
+		devices: string[];
+		topic: string;
+		payload: any;
+		qos?: number;
+	}
+
+	interface UpdateData {
+		uuid: string;
+		color: string;
+	}
+
+	interface UpdateSuccess {
+		uuid: string;
+		token: string;
+		status: string;
+	}
+
+	interface RegisterData {
+		type: string;
+	}
+
+	interface RegisterResponse {
+		uuid: string;
+		token: string;
+		type: string;
+	}
+
+	interface Device {
+		uuid: string;
+	}
+
+	interface DeviceResponse {
+		uuid: string;
+		online: boolean;
+		color: string;
+	}
+
+	interface Color {
+		color: string;
+	}
+
+	interface SubscribeData {
+		uuid: string;
+		types?: string[];
+		topics?: string[];
+	}
+
+	interface UnsubscribeData {
+		uuid: string;
+		types?: string[];
+	}
+
+	interface DataInput {
+		uuid: string;
+		online: boolean;
+		x: number;
+		y: number;
+	}
+
+	interface GetDataInput {
+		uuid: string;
+		start: string;
+		finish: string;
+		limit: number;
+	}
+
+	interface IdentifySuccess {
+		uuid: string;
+		token: string;
+		status: string;
+	}
+
+}
diff --git a/meshblu/meshblu-tests.ts b/meshblu/meshblu-tests.ts
index 1c4bc0fb02..e3e926856e 100644
--- a/meshblu/meshblu-tests.ts
+++ b/meshblu/meshblu-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="meshblu.d.ts" />
+
 
 import Meshblu = require('meshblu');
 
diff --git a/meshblu/meshblu.d.ts b/meshblu/meshblu.d.ts
deleted file mode 100644
index 0bfe093052..0000000000
--- a/meshblu/meshblu.d.ts
+++ /dev/null
@@ -1,281 +0,0 @@
-// Type definitions for meshblu.js 1.30.1
-// Project: https://github.com/octoblu/meshblu-npm
-// Definitions by: Felipe Nipo <https://github.com/fnipo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path='../node/node.d.ts' />
-
-declare module 'meshblu' {
-	var Meshblu: MeshbluStatic;
-
-	export = Meshblu;
-}
-
-interface MeshbluStatic {
-
-	/**
-	 * Establish a secure socket.io connection to Meshblu.
-	 * @param opt
-	 * @returns A Meshblu Connection.
-	 */
-	createConnection(opt: Meshblu.ConnectionOptions): Meshblu.Connection;
-
-}
-
-declare namespace Meshblu {
-
-	interface Connection {
-
-		/**
-		 * Authenticate with Meshblu.
-		 * @returns This Connection.
-		 */
-		identify(): Connection;
-
-		/**
-		 * @param data {string|number|object|array|Buffer} - data for signing.
-		 */
-		sign(data: any): string;
-
-		/**
-		 * @param message {string|number|object|array|Buffer} - signed data.
-		 * @param signature
-		 * @returns {*}
-		 */
-		verify(message: any, signature: any): any;
-
-		/**
-		 * @param uuid
-		 * @param message {string|number|object|array|Buffer} - data for encrypting.
-		 * @param options
-		 * @param fn The callback to be called. It should take one parameter, result,
-		 * 	which is an object containing a property "error".
-		 * @returns This Connection.
-		 */
-		encryptMessage(uuid: string, message: any, options: Meshblu.ConnectionOptions, fn:(result: any) => void): Connection;
-
-		/**
-		 * Send a meshblu message.
-		 * @param payload An array of devices UUIDs.
-		 * @param fn The callback to be called. It should take one parameter, result,
-		 * 	which is an object containing a property "error".
-		 * @returns This Connection.
-		 */
-		message(payload: MessagePayload, fn:(result: any) => void): Connection;
-
-		/**
-		 * Update a device record.
-		 * @param data
-		 * @param fn The callback to be called. It should take one parameter, result.
-		 * @returns This Connection.
-		 */
-		update(data: UpdateData, fn:(result: UpdateSuccess) => void): Connection;
-
-		/**
-		 * Register a new device record.
-		 * @param data
-		 * @param fn The callback to be called. It should take one parameter, result.
-		 * @returns This Connection.
-		 */
-		register(data: RegisterData, fn:(result: RegisterResponse) => void): Connection;
-
-		/**
-		 * Removes a device record.
-		 * @param data
-		 * @param fn The callback to be called. It should take one parameter, result.
-		 * @returns This Connection.
-		 */
-		unregister(data: Device, fn:(result: Device) => void): Connection;
-
-		/**
-		 * Get my device info.
-		 * @param data
-		 * @param fn The callback to be called. It should take one parameter, result.
-		 * @returns This Connection.
-		 */
-		whoami(data: any, fn:(result: DeviceResponse) => void): Connection;
-
-		/**
-		 * Find a Meshblu device.
-		 * @param data
-		 * @param fn The callback to be called. It should take one parameter, result.
-		 * @returns This Connection.
-		 */
-		device(data: Device, fn:(result: DeviceResponse) => void): Connection
-
-		/**
-		 * Find Meshblu devices.
-		 * @param data
-		 * @param fn The callback to be called. It should take one parameter, result.
-		 * @returns This Connection.
-		 */
-		devices(data: Color, fn:(result: DeviceResponse[]) => void): Connection
-
-		/**
-		 * Returns device messages as they are sent and received.
-		 * @param data
-		 * @param fn The callback to be called. It should take one parameter, result.
-		 * @returns This Connection.
-		 */
-		subscribe(data: SubscribeData, fn:(result: any) => void): Connection
-
-		/**
-		 * Cancels device subscription.
-		 * @param data
-		 * @param fn The callback to be called. It should take one parameter, result.
-		 * @returns This Connection.
-		 */
-		unsubscribe(data: UnsubscribeData, fn:(result: any) => void): Connection
-
-		/**
-		 * Send a meshblu data message.
-		 * @param data
-		 * @param fn The callback to be called. It should take one parameter, result.
-		 * @returns This Connection.
-		 */
-		data(data: DataInput, fn:(result: any) => void): Connection
-
-		/**
-		 * Get a meshblu data for a device.
-		 * @param data
-		 * @param fn The callback to be called. It should take one parameter, result.
-		 * @returns This Connection.
-		 */
-		getdata(data: GetDataInput, fn:(result: any) => void): Connection
-
-		/**
-		 * Generate a new session token for a device.
-		 * @param data
-		 * @param fn The callback to be called. It should take one parameter, result.
-		 */
-		generateAndStoreToken(data: Device, fn:(result: ConnectionOptions) => void): void
-
-		/**
-		 * Remove a session token from a device.
-		 * @param data
-		 * @param fn The callback to be called. It should take one parameter, result.
-		 */
-		revokeToken(data: ConnectionOptions, fn:(result: Device) => void): void
-
-		/**
-		 *
-		 * @param uuid
-		 * @param fn The callback to be called. It should take one parameter, err,
-		 * 	which will be null if there was no problem, and one parameter, publicKey,
-		 * 	of type NodeRSA.
-		 */
-		getPublicKey(uuid: string, fn:(err: Error, publicKey: any) => void): void;
-
-		/*
-		 * Lack of documentation about these api functions.
-		 */
-		send(text: string): Connection;
-		bufferedSocketEmit(): void;
-		parseUrl(serverUrl: string, port: string): string;
-		generateKeyPair(): KeyPair;
-		setPrivateKey(privateKey: string): void;
-		setup(): Connection;
-		connect(): void;
-		reconnect(): void;
-		claimdevice(data: Device, fn:(result: Device) => void): Connection;
-		mydevices(data: any, fn:(result: any) => void): Connection
-		status(data: any): Connection
-		authenticate(data: any, fn:(result: any) => void): Connection
-		events(data: any, fn:(result: any) => void): Connection
-		localdevices(fn:(result: any) => void): Connection
-		unclaimeddevices(data: any, fn:(result: any) => void): Connection
-		textBroadcast(data: any): Connection
-		directText(data: any): Connection
-		subscribeText(data: any, fn:(result: any) => void): Connection
-		unsubscribeText(data: any, fn:(result: any) => void): Connection
-		close(fn:(result: any) => void): Connection
-		resetToken(data: any, fn:(result: any) => void): void
-	}
-
-	/**
-	 * Contains the primary means of identifying a device.
-	 */
-	interface ConnectionOptions {
-		uuid: string;
-		token: string;
-	}
-
-	interface KeyPair {
-		privateKey: string;
-		publicKey: string;
-	}
-
-	interface MessagePayload {
-		devices: string[];
-		topic: string;
-		payload: any;
-		qos?: number;
-	}
-
-	interface UpdateData {
-		uuid: string;
-		color: string;
-	}
-
-	interface UpdateSuccess {
-		uuid: string;
-		token: string;
-		status: string;
-	}
-
-	interface RegisterData {
-		type: string;
-	}
-
-	interface RegisterResponse {
-		uuid: string;
-		token: string;
-		type: string;
-	}
-
-	interface Device {
-		uuid: string;
-	}
-
-	interface DeviceResponse {
-		uuid: string;
-		online: boolean;
-		color: string;
-	}
-
-	interface Color {
-		color: string;
-	}
-
-	interface SubscribeData {
-		uuid: string;
-		types?: string[];
-		topics?: string[];
-	}
-
-	interface UnsubscribeData {
-		uuid: string;
-		types?: string[];
-	}
-
-	interface DataInput {
-		uuid: string;
-		online: boolean;
-		x: number;
-		y: number;
-	}
-
-	interface GetDataInput {
-		uuid: string;
-		start: string;
-		finish: string;
-		limit: number;
-	}
-
-	interface IdentifySuccess {
-		uuid: string;
-		token: string;
-		status: string;
-	}
-
-}
diff --git a/meshblu/tsconfig.json b/meshblu/tsconfig.json
new file mode 100644
index 0000000000..b2d57fb5b2
--- /dev/null
+++ b/meshblu/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "meshblu-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mess/index.d.ts b/mess/index.d.ts
new file mode 100644
index 0000000000..9b60b9e124
--- /dev/null
+++ b/mess/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for mess 0.1.2
+// Project: https://github.com/bobrik/node-mess
+// Definitions by: Wim Looman <https://github.com/Nemo157>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function shuffle<T>(array: T[]): T[];
+export = shuffle;
diff --git a/mess/mess-tests.ts b/mess/mess-tests.ts
index 240f435ae6..64584153f9 100644
--- a/mess/mess-tests.ts
+++ b/mess/mess-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./mess.d.ts" />
 
 import mess = require('mess');
 
diff --git a/mess/mess.d.ts b/mess/mess.d.ts
deleted file mode 100644
index 4935446393..0000000000
--- a/mess/mess.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for mess 0.1.2
-// Project: https://github.com/bobrik/node-mess
-// Definitions by: Wim Looman <https://github.com/Nemo157>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "mess" {
-	function shuffle<T>(array: T[]): T[];
-	export = shuffle;
-}
diff --git a/mess/tsconfig.json b/mess/tsconfig.json
new file mode 100644
index 0000000000..8209b428b8
--- /dev/null
+++ b/mess/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mess-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/messenger/messenger.d.ts b/messenger/index.d.ts
similarity index 100%
rename from messenger/messenger.d.ts
rename to messenger/index.d.ts
diff --git a/messenger/messenger-tests.ts b/messenger/messenger-tests.ts
index 1f560e6e2d..be555a2767 100644
--- a/messenger/messenger-tests.ts
+++ b/messenger/messenger-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="messenger.d.ts"/>
-
 var message = Messenger().post({
     message: "message",
     hideAfter: 5,
diff --git a/messenger/tsconfig.json b/messenger/tsconfig.json
new file mode 100644
index 0000000000..2b1f09fbf9
--- /dev/null
+++ b/messenger/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "messenger-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/meteor-jboulhous-dev/index.d.ts b/meteor-jboulhous-dev/index.d.ts
new file mode 100644
index 0000000000..6b529740b5
--- /dev/null
+++ b/meteor-jboulhous-dev/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for jboulhous:dev
+// Project: https://github.com/jboulhous/dev
+// Definitions by: Robbie Van Gorkom <https://github.com/vangorra>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="meteor" />
+
+declare namespace Meteor {
+	var isDevelopment : boolean;
+}
diff --git a/meteor-jboulhous-dev/meteor-jboulhous-dev-tests.ts b/meteor-jboulhous-dev/meteor-jboulhous-dev-tests.ts
index 7684cf7bab..602b020dae 100644
--- a/meteor-jboulhous-dev/meteor-jboulhous-dev-tests.ts
+++ b/meteor-jboulhous-dev/meteor-jboulhous-dev-tests.ts
@@ -1,3 +1,3 @@
-/// <reference path="meteor-jboulhous-dev.d.ts" />
+
 
 Meteor.isDevelopment;
diff --git a/meteor-jboulhous-dev/meteor-jboulhous-dev.d.ts b/meteor-jboulhous-dev/meteor-jboulhous-dev.d.ts
deleted file mode 100644
index be9abd9582..0000000000
--- a/meteor-jboulhous-dev/meteor-jboulhous-dev.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Type definitions for jboulhous:dev
-// Project: https://github.com/jboulhous/dev
-// Definitions by: Robbie Van Gorkom <https://github.com/vangorra>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../meteor/meteor.d.ts" />
-
-declare namespace Meteor {
-	var isDevelopment : boolean;
-}
diff --git a/meteor-jboulhous-dev/tsconfig.json b/meteor-jboulhous-dev/tsconfig.json
new file mode 100644
index 0000000000..6f3eff9fc1
--- /dev/null
+++ b/meteor-jboulhous-dev/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "meteor-jboulhous-dev-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/meteor-persistent-session/index.d.ts b/meteor-persistent-session/index.d.ts
new file mode 100644
index 0000000000..f122c412dd
--- /dev/null
+++ b/meteor-persistent-session/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for u2622:persistent-session
+// Project: https://github.com/okgrow/meteor-persistent-session
+// Definitions by: Robbie Van Gorkom <https://github.com/vangorra>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="meteor" />
+
+declare namespace Session {
+    function setTemp(key: string, value: string | number | boolean | any /** Null **/ | any /** Undefined **/): boolean;
+    function setPersistent(key: string, value: string | number | boolean | any /** Null **/ | any /** Undefined **/): boolean;
+    function setAuth(key: string, value: string | number | boolean | any /** Null **/ | any /** Undefined **/): boolean;
+
+    function setDefaultTemp(key: string, value: EJSONable | any /** Undefined **/): void;
+    function setDefaultPersistent(key: string, value: EJSONable | any /** Undefined **/): void;
+    function setDefaultAuth(key: string, value: EJSONable | any /** Undefined **/): void;
+
+    function makeTemp(key: string) : void;
+    function makePersistent(key: string) : void;
+    function makeAuth(key: string) : void;
+
+    function clear() : void;
+    function clear(key: string) : void;
+    function clearTemp() : void;
+    function clearPersistent() : void;
+    function clearAuth() : void;
+}
diff --git a/meteor-persistent-session/meteor-persistent-session-tests.ts b/meteor-persistent-session/meteor-persistent-session-tests.ts
index 9e9bc29297..75ec4ddf23 100644
--- a/meteor-persistent-session/meteor-persistent-session-tests.ts
+++ b/meteor-persistent-session/meteor-persistent-session-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="meteor-persistent-session.d.ts" />
+
 
 Session.setTemp('a', 'a');
 Session.setPersistent('a', 'a');
diff --git a/meteor-persistent-session/meteor-persistent-session.d.ts b/meteor-persistent-session/meteor-persistent-session.d.ts
deleted file mode 100644
index 13521f83da..0000000000
--- a/meteor-persistent-session/meteor-persistent-session.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// Type definitions for u2622:persistent-session
-// Project: https://github.com/okgrow/meteor-persistent-session
-// Definitions by: Robbie Van Gorkom <https://github.com/vangorra>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../meteor/meteor.d.ts" />
-
-declare namespace Session {
-    function setTemp(key: string, value: string | number | boolean | any /** Null **/ | any /** Undefined **/): boolean;
-    function setPersistent(key: string, value: string | number | boolean | any /** Null **/ | any /** Undefined **/): boolean;
-    function setAuth(key: string, value: string | number | boolean | any /** Null **/ | any /** Undefined **/): boolean;
-
-    function setDefaultTemp(key: string, value: EJSONable | any /** Undefined **/): void;
-    function setDefaultPersistent(key: string, value: EJSONable | any /** Undefined **/): void;
-    function setDefaultAuth(key: string, value: EJSONable | any /** Undefined **/): void;
-
-    function makeTemp(key: string) : void;
-    function makePersistent(key: string) : void;
-    function makeAuth(key: string) : void;
-
-    function clear() : void;
-    function clear(key: string) : void;
-    function clearTemp() : void;
-    function clearPersistent() : void;
-    function clearAuth() : void;
-}
diff --git a/meteor-persistent-session/tsconfig.json b/meteor-persistent-session/tsconfig.json
new file mode 100644
index 0000000000..3e5904b4bd
--- /dev/null
+++ b/meteor-persistent-session/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "meteor-persistent-session-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/meteor-prime8consulting-oauth2/index.d.ts b/meteor-prime8consulting-oauth2/index.d.ts
new file mode 100644
index 0000000000..ca92d7445d
--- /dev/null
+++ b/meteor-prime8consulting-oauth2/index.d.ts
@@ -0,0 +1,116 @@
+// Type definitions for prime8consulting:meteor-oauth2
+// Project: https://github.com/prime-8-consulting/meteor-oauth2/
+// Definitions by: Robbie Van Gorkom <https://github.com/vangorra>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="meteor" />
+
+declare namespace OAuth2Server {
+    interface RefreshToken {
+        refreshToken : string;
+        clientId : string;
+        userId : string;
+        expires : Date;
+    }
+
+    interface AuthCode {
+        authCode : string;
+        clientId : string;
+        userId : string;
+        expires : Date;
+    }
+
+    interface AccessToken {
+        accessToken : string;
+        clientId : string;
+        userId : string;
+        expires : Date
+    }
+
+    interface Client {
+        clientId : string;
+        active : boolean;
+        redirectUri : string;
+        clientSecret : string;
+    }
+
+    interface PubSubNames {
+        /**
+         * Constant string representing the auth codes pub/sub.
+         */
+        authCodes : string;
+
+        /**
+         * Constant string representing the refresh token pub/sub.
+         */
+        refreshTokens : string;
+    }
+
+    interface MethodNames {
+        /**
+         * Constant string representing th authCodeGran meteor method.
+         */
+        authCodeGrant : string;
+    }
+
+    interface Collections {
+        /**
+         * Collection of the refresh tokens.
+         */
+        refreshToken : Mongo.Collection<RefreshToken>;
+
+        /**
+         * Collection of the authorization codes.
+         */
+        authCode : Mongo.Collection<AuthCode>;
+
+        /**
+         * (server only) Collection of the access tokens.
+         */
+        accessToken : Mongo.Collection<AccessToken>;
+
+        /**
+         * (server only) Collection of the clients authorized to use the oauth2 service.
+         */
+        client : Mongo.Collection<Client>;
+    }
+
+    interface SubscribeTo {
+        /**
+         * Wrapper function to subscribe to the auth code subscription. Returns a standard subscription handle.
+         */
+        authCode() : Meteor.SubscriptionHandle;
+    }
+
+    interface AuthCodeGrantResult {
+        success : boolean;
+        error : any;
+        authorizationCode : string;
+        redirectToUri : string;
+    }
+
+    interface CallMethod {
+        /**
+         * Wrapper for Meteor.method to create an authorization code. This is an async function and a callback must be provided to be of any use.
+         */
+        authCodeGrant(
+            client_id : string,
+            redirect_uri : string,
+            response_type : string,
+            scope : string[],
+            state : string,
+            callback : (err : Meteor.Error, authCodeGrantResult : AuthCodeGrantResult) => void
+        ) : void;
+    }
+
+    interface OAuth2Server {
+        pubSubNames : PubSubNames;
+        methodNames : MethodNames;
+        collections : Collections;
+        oauthserver : any;
+        subscribeTo : SubscribeTo;
+        callMethod : CallMethod;
+    }
+}
+
+declare var oAuth2Server : OAuth2Server.OAuth2Server;
diff --git a/meteor-prime8consulting-oauth2/meteor-prime8consulting-oauth2-tests.ts b/meteor-prime8consulting-oauth2/meteor-prime8consulting-oauth2-tests.ts
index 0c4f57aa43..9c0b70b41a 100644
--- a/meteor-prime8consulting-oauth2/meteor-prime8consulting-oauth2-tests.ts
+++ b/meteor-prime8consulting-oauth2/meteor-prime8consulting-oauth2-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="meteor-prime8consulting-oauth2.d.ts" />
+
 
 let str : string;
 str = oAuth2Server.pubSubNames.authCodes;
diff --git a/meteor-prime8consulting-oauth2/meteor-prime8consulting-oauth2.d.ts b/meteor-prime8consulting-oauth2/meteor-prime8consulting-oauth2.d.ts
deleted file mode 100644
index 15e0e112ad..0000000000
--- a/meteor-prime8consulting-oauth2/meteor-prime8consulting-oauth2.d.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-// Type definitions for prime8consulting:meteor-oauth2
-// Project: https://github.com/prime-8-consulting/meteor-oauth2/
-// Definitions by: Robbie Van Gorkom <https://github.com/vangorra>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../meteor/meteor.d.ts" />
-
-declare namespace OAuth2Server {
-    interface RefreshToken {
-        refreshToken : string;
-        clientId : string;
-        userId : string;
-        expires : Date;
-    }
-
-    interface AuthCode {
-        authCode : string;
-        clientId : string;
-        userId : string;
-        expires : Date;
-    }
-
-    interface AccessToken {
-        accessToken : string;
-        clientId : string;
-        userId : string;
-        expires : Date
-    }
-
-    interface Client {
-        clientId : string;
-        active : boolean;
-        redirectUri : string;
-        clientSecret : string;
-    }
-
-    interface PubSubNames {
-        /**
-         * Constant string representing the auth codes pub/sub.
-         */
-        authCodes : string;
-
-        /**
-         * Constant string representing the refresh token pub/sub.
-         */
-        refreshTokens : string;
-    }
-
-    interface MethodNames {
-        /**
-         * Constant string representing th authCodeGran meteor method.
-         */
-        authCodeGrant : string;
-    }
-
-    interface Collections {
-        /**
-         * Collection of the refresh tokens.
-         */
-        refreshToken : Mongo.Collection<RefreshToken>;
-
-        /**
-         * Collection of the authorization codes.
-         */
-        authCode : Mongo.Collection<AuthCode>;
-
-        /**
-         * (server only) Collection of the access tokens.
-         */
-        accessToken : Mongo.Collection<AccessToken>;
-
-        /**
-         * (server only) Collection of the clients authorized to use the oauth2 service.
-         */
-        client : Mongo.Collection<Client>;
-    }
-
-    interface SubscribeTo {
-        /**
-         * Wrapper function to subscribe to the auth code subscription. Returns a standard subscription handle.
-         */
-        authCode() : Meteor.SubscriptionHandle;
-    }
-
-    interface AuthCodeGrantResult {
-        success : boolean;
-        error : any;
-        authorizationCode : string;
-        redirectToUri : string;
-    }
-
-    interface CallMethod {
-        /**
-         * Wrapper for Meteor.method to create an authorization code. This is an async function and a callback must be provided to be of any use.
-         */
-        authCodeGrant(
-            client_id : string,
-            redirect_uri : string,
-            response_type : string,
-            scope : string[],
-            state : string,
-            callback : (err : Meteor.Error, authCodeGrantResult : AuthCodeGrantResult) => void
-        ) : void;
-    }
-
-    interface OAuth2Server {
-        pubSubNames : PubSubNames;
-        methodNames : MethodNames;
-        collections : Collections;
-        oauthserver : any;
-        subscribeTo : SubscribeTo;
-        callMethod : CallMethod;
-    }
-}
-
-declare var oAuth2Server : OAuth2Server.OAuth2Server;
diff --git a/meteor-prime8consulting-oauth2/tsconfig.json b/meteor-prime8consulting-oauth2/tsconfig.json
new file mode 100644
index 0000000000..768f073ba9
--- /dev/null
+++ b/meteor-prime8consulting-oauth2/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "meteor-prime8consulting-oauth2-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/meteor-publish-composite/index.d.ts b/meteor-publish-composite/index.d.ts
new file mode 100644
index 0000000000..140648c247
--- /dev/null
+++ b/meteor-publish-composite/index.d.ts
@@ -0,0 +1,65 @@
+// Type definitions for meteor-publish-composite
+// Project: https://github.com/englue/meteor-publish-composite
+// Definitions by: Robert Van Gorkom <https://github.com/vangorra>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="../meteor" />
+
+declare interface PublishCompositeConfigN {
+    children? : PublishCompositeConfigN[];
+    find(
+        ...args : any[]
+    ) : Mongo.Cursor<any>;
+}
+
+declare interface PublishCompositeConfig4<InLevel1, InLevel2, InLevel3, InLevel4, OutLevel> {
+    children? : PublishCompositeConfigN[];
+    find(
+        arg4 : InLevel4,
+        arg3 : InLevel3,
+        arg2 : InLevel2,
+        arg1 : InLevel1
+    ) : Mongo.Cursor<OutLevel>;
+}
+
+declare interface PublishCompositeConfig3<InLevel1, InLevel2, InLevel3, OutLevel> {
+    children? : PublishCompositeConfig4<InLevel1, InLevel2, InLevel3, OutLevel, any>[];
+    find(
+        arg3 : InLevel3,
+        arg2 : InLevel2,
+        arg1 : InLevel1
+    ) : Mongo.Cursor<OutLevel>;
+}
+
+declare interface PublishCompositeConfig2<InLevel1, InLevel2, OutLevel> {
+    children? : PublishCompositeConfig3<InLevel1, InLevel2, OutLevel, any>[];
+    find(
+        arg2 : InLevel2,
+        arg1 : InLevel1
+    ) : Mongo.Cursor<OutLevel>;
+}
+
+declare interface PublishCompositeConfig1<InLevel1, OutLevel> {
+    children? : PublishCompositeConfig2<InLevel1, OutLevel, any>[];
+    find(
+        arg1 : InLevel1
+    ) : Mongo.Cursor<OutLevel>;
+}
+
+declare interface PublishCompositeConfig<OutLevel> {
+    children? : PublishCompositeConfig1<OutLevel, any>[];
+    find() : Mongo.Cursor<OutLevel>;
+}
+
+declare namespace Meteor {
+    function publishComposite(
+        name : string,
+        config : PublishCompositeConfig<any>|PublishCompositeConfig<any>[]
+    ) : void;
+
+    function publishComposite(
+        name : string,
+        configFunc : (...args : any[]) =>
+            PublishCompositeConfig<any>|PublishCompositeConfig<any>[]
+    ) : void;
+}
diff --git a/meteor-publish-composite/meteor-publish-composite-tests.ts b/meteor-publish-composite/meteor-publish-composite-tests.ts
index ad84c0f3ae..fa08882c3c 100644
--- a/meteor-publish-composite/meteor-publish-composite-tests.ts
+++ b/meteor-publish-composite/meteor-publish-composite-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="meteor-publish-composite.d.ts" />
-/// <reference path="../meteor/meteor.d.ts" />
+
 
 import User = Meteor.User;
 interface IPost { _id : string, authorId : string };
diff --git a/meteor-publish-composite/meteor-publish-composite.d.ts b/meteor-publish-composite/meteor-publish-composite.d.ts
deleted file mode 100644
index ac1e189e57..0000000000
--- a/meteor-publish-composite/meteor-publish-composite.d.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-// Type definitions for meteor-publish-composite
-// Project: https://github.com/englue/meteor-publish-composite
-// Definitions by: Robert Van Gorkom <https://github.com/vangorra>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../meteor/meteor.d.ts" />
-
-declare interface PublishCompositeConfigN {
-    children? : PublishCompositeConfigN[];
-    find(
-        ...args : any[]
-    ) : Mongo.Cursor<any>;
-}
-
-declare interface PublishCompositeConfig4<InLevel1, InLevel2, InLevel3, InLevel4, OutLevel> {
-    children? : PublishCompositeConfigN[];
-    find(
-        arg4 : InLevel4,
-        arg3 : InLevel3,
-        arg2 : InLevel2,
-        arg1 : InLevel1
-    ) : Mongo.Cursor<OutLevel>;
-}
-
-declare interface PublishCompositeConfig3<InLevel1, InLevel2, InLevel3, OutLevel> {
-    children? : PublishCompositeConfig4<InLevel1, InLevel2, InLevel3, OutLevel, any>[];
-    find(
-        arg3 : InLevel3,
-        arg2 : InLevel2,
-        arg1 : InLevel1
-    ) : Mongo.Cursor<OutLevel>;
-}
-
-declare interface PublishCompositeConfig2<InLevel1, InLevel2, OutLevel> {
-    children? : PublishCompositeConfig3<InLevel1, InLevel2, OutLevel, any>[];
-    find(
-        arg2 : InLevel2,
-        arg1 : InLevel1
-    ) : Mongo.Cursor<OutLevel>;
-}
-
-declare interface PublishCompositeConfig1<InLevel1, OutLevel> {
-    children? : PublishCompositeConfig2<InLevel1, OutLevel, any>[];
-    find(
-        arg1 : InLevel1
-    ) : Mongo.Cursor<OutLevel>;
-}
-
-declare interface PublishCompositeConfig<OutLevel> {
-    children? : PublishCompositeConfig1<OutLevel, any>[];
-    find() : Mongo.Cursor<OutLevel>;
-}
-
-declare namespace Meteor {
-    function publishComposite(
-        name : string,
-        config : PublishCompositeConfig<any>|PublishCompositeConfig<any>[]
-    ) : void;
-
-    function publishComposite(
-        name : string,
-        configFunc : (...args : any[]) =>
-            PublishCompositeConfig<any>|PublishCompositeConfig<any>[]
-    ) : void;
-}
diff --git a/meteor-publish-composite/tsconfig.json b/meteor-publish-composite/tsconfig.json
new file mode 100644
index 0000000000..7375b0d7fb
--- /dev/null
+++ b/meteor-publish-composite/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "meteor-publish-composite-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/meteor-roles/index.d.ts b/meteor-roles/index.d.ts
new file mode 100644
index 0000000000..9da0a8f978
--- /dev/null
+++ b/meteor-roles/index.d.ts
@@ -0,0 +1,264 @@
+// Type definitions for Meteor Roles 1.2.14
+// Project: https://github.com/alanning/meteor-roles/
+// Definitions by: Robbie Van Gorkom <https://github.com/vangorra>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="meteor" />
+
+/**
+ * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
+ *
+ * @module Roles
+ */
+declare namespace Roles {
+    /**
+     * Constant used to reference the special 'global' group that
+     * can be used to apply blanket permissions across all groups.
+     *
+     * @example
+     *     Roles.addUsersToRoles(user, 'admin', Roles.GLOBAL_GROUP)
+     *     Roles.userIsInRole(user, 'admin') // => true
+     *
+     *     Roles.setUserRoles(user, 'support-staff', Roles.GLOBAL_GROUP)
+     *     Roles.userIsInRole(user, 'support-staff') // => true
+     *     Roles.userIsInRole(user, 'admin') // => false
+     *
+     * @property GLOBAL_GROUP
+     * @type String
+     * @static
+     * @final
+     */
+    var GLOBAL_GROUP : string;
+
+    /**
+     * Subscription handle for the currently logged in user's permissions.
+     *
+     * NOTE: The corresponding publish function, `_roles`, depends on
+     * `this.userId` so it will automatically re-run when the currently
+     * logged-in user changes.
+     *
+     * @example
+     *
+     *     `Roles.subscription.ready()` // => `true` if user roles have been loaded
+     *
+     * @property subscription
+     * @type Object
+     * @for Roles
+     */
+    var subscription : Subscription;
+
+    /**
+     * Add users to roles. Will create roles as needed.
+     *
+     * NOTE: Mixing grouped and non-grouped roles for the same user
+     *       is not supported and will throw an error.
+     *
+     * Makes 2 calls to database:
+     *  1. retrieve list of all existing roles
+     *  2. update users' roles
+     *
+     * @example
+     *     Roles.addUsersToRoles(userId, 'admin')
+     *     Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')
+     *     Roles.addUsersToRoles([user1, user2], ['user','editor'])
+     *     Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
+     *     Roles.addUsersToRoles(userId, 'admin', Roles.GLOBAL_GROUP)
+     *
+     * @method addUsersToRoles
+     * @param {Array|String} users User id(s) or object(s) with an _id field
+     * @param {Array|String} roles Name(s) of roles/permissions to add users to
+     * @param {String} [group] Optional group name. If supplied, roles will be
+     *                         specific to that group.
+     *                         Group names can not start with '$' or numbers.
+     *                         Periods in names '.' are automatically converted
+     *                         to underscores.
+     *                         The special group Roles.GLOBAL_GROUP provides
+     *                         a convenient way to assign blanket roles/permissions
+     *                         across all groups.  The roles/permissions in the
+     *                         Roles.GLOBAL_GROUP group will be automatically
+     *                         included in checks for any group.
+     */
+    function addUsersToRoles(
+        user : string|string[]|Object|Object[],
+        roles : string|string[],
+        group? : string
+    ) : void;
+
+    /**
+     * Create a new role. Whitespace will be trimmed.
+     *
+     * @method createRole
+     * @param {String} role Name of role
+     * @return {String} id of new role
+     */
+    function createRole(role : string) : string;
+
+    /**
+     * Delete an existing role.  Will throw "Role in use" error if any users
+     * are currently assigned to the target role.
+     *
+     * @method deleteRole
+     * @param {String} role Name of role
+     */
+    function deleteRole (role : string) : void;
+
+    /**
+     * Retrieve set of all existing roles
+     *
+     * @method getAllRoles
+     * @return {Cursor} cursor of existing roles
+     */
+    function getAllRoles() : Mongo.Cursor<Role>;
+
+    /**
+     * Retrieve users groups, if any
+     *
+     * @method getGroupsForUser
+     * @param {String|Object} user User Id or actual user object
+     * @param {String} [role] Optional name of roles to restrict groups to.
+     *
+     * @return {Array} Array of user's groups, unsorted. Roles.GLOBAL_GROUP will be omitted
+     */
+    function getGroupsForUser(
+        user : string|Object,
+        role? : string
+    ) : string[];
+
+    /**
+     * Retrieve users roles
+     *
+     * @method getRolesForUser
+     * @param {String|Object} user User Id or actual user object
+     * @param {String} [group] Optional name of group to restrict roles to.
+     *                         User's Roles.GLOBAL_GROUP will also be included.
+     * @return {Array} Array of user's roles, unsorted.
+     */
+    function getRolesForUser(
+        user : string|Object,
+        group? : string
+    ) : Role[];
+
+    /**
+     * Retrieve all users who are in target role.
+     *
+     * NOTE: This is an expensive query; it performs a full collection scan
+     * on the users collection since there is no index set on the 'roles' field.
+     * This is by design as most queries will specify an _id so the _id index is
+     * used automatically.
+     *
+     * @method getUsersInRole
+     * @param {Array|String} role Name of role/permission.  If array, users
+     *                            returned will have at least one of the roles
+     *                            specified but need not have _all_ roles.
+     * @param {String} [group] Optional name of group to restrict roles to.
+     *                         User's Roles.GLOBAL_GROUP will also be checked.
+     * @param {Object} [options] Optional options which are passed directly
+     *                           through to `Meteor.users.find(query, options)`
+     * @return {Cursor} cursor of users in role
+     */
+    function getUsersInRole(
+        role : string|string[],
+        group? : string,
+        options? : {
+            sort?: Mongo.SortSpecifier;
+        skip?: number;
+        limit?: number;
+        fields?: Mongo.FieldSpecifier;
+        reactive?: boolean;
+        transform?: Function;
+    }) : Mongo.Cursor<Meteor.User>;
+
+    /**
+     * Remove users from roles
+     *
+     * @example
+     *     Roles.removeUsersFromRoles(users.bob, 'admin')
+     *     Roles.removeUsersFromRoles([users.bob, users.joe], ['editor'])
+     *     Roles.removeUsersFromRoles([users.bob, users.joe], ['editor', 'user'])
+     *     Roles.removeUsersFromRoles(users.eve, ['user'], 'group1')
+     *
+     * @method removeUsersFromRoles
+     * @param {Array|String} users User id(s) or object(s) with an _id field
+     * @param {Array|String} roles Name(s) of roles to add users to
+     * @param {String} [group] Optional. Group name. If supplied, only that
+     *                         group will have roles removed.
+     */
+    function removeUsersFromRoles(
+        user : string|string[]|Object|Object[],
+        roles? : string[],
+        group? : string
+    ) : void;
+
+    /**
+     * Set a users roles/permissions.
+     *
+     * @example
+     *     Roles.setUserRoles(userId, 'admin')
+     *     Roles.setUserRoles(userId, ['view-secrets'], 'example.com')
+     *     Roles.setUserRoles([user1, user2], ['user','editor'])
+     *     Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
+     *     Roles.setUserRoles(userId, 'admin', Roles.GLOBAL_GROUP)
+     *
+     * @method setUserRoles
+     * @param {Array|String} users User id(s) or object(s) with an _id field
+     * @param {Array|String} roles Name(s) of roles/permissions to add users to
+     * @param {String} [group] Optional group name. If supplied, roles will be
+     *                         specific to that group.
+     *                         Group names can not start with '$'.
+     *                         Periods in names '.' are automatically converted
+     *                         to underscores.
+     *                         The special group Roles.GLOBAL_GROUP provides
+     *                         a convenient way to assign blanket roles/permissions
+     *                         across all groups.  The roles/permissions in the
+     *                         Roles.GLOBAL_GROUP group will be automatically
+     *                         included in checks for any group.
+     */
+    function setUserRoles (
+        user : string|string[]|Object|Object[],
+        roles : string|string[],
+        group? : string
+    ) : void;
+
+    /**
+     * Check if user has specified permissions/roles
+     *
+     * @example
+     *     // non-group usage
+     *     Roles.userIsInRole(user, 'admin')
+     *     Roles.userIsInRole(user, ['admin','editor'])
+     *     Roles.userIsInRole(userId, 'admin')
+     *     Roles.userIsInRole(userId, ['admin','editor'])
+     *
+     *     // per-group usage
+     *     Roles.userIsInRole(user,   ['admin','editor'], 'group1')
+     *     Roles.userIsInRole(userId, ['admin','editor'], 'group1')
+     *     Roles.userIsInRole(userId, ['admin','editor'], Roles.GLOBAL_GROUP)
+     *
+     *     // this format can also be used as short-hand for Roles.GLOBAL_GROUP
+     *     Roles.userIsInRole(user, 'admin')
+     *
+     * @method userIsInRole
+     * @param {String|Object} user User Id or actual user object
+     * @param {String|Array} roles Name of role/permission or Array of
+     *                            roles/permissions to check against.  If array,
+     *                            will return true if user is in _any_ role.
+     * @param {String} [group] Optional. Name of group.  If supplied, limits check
+     *                         to just that group.
+     *                         The user's Roles.GLOBAL_GROUP will always be checked
+     *                         whether group is specified or not.
+     * @return {Boolean} true if user is in _any_ of the target roles
+     */
+    function userIsInRole(
+        user : string|string[]|Object|Object[],
+        roles : string|string[],
+        group? : string
+    ) : boolean;
+
+    interface Role {
+        name : string;
+    }
+} // module
+
+declare namespace Meteor {
+    var roles : Mongo.Collection<Roles.Role>;
+}
diff --git a/meteor-roles/meteor-roles-tests.ts b/meteor-roles/meteor-roles-tests.ts
index dae900800c..8f73f13208 100644
--- a/meteor-roles/meteor-roles-tests.ts
+++ b/meteor-roles/meteor-roles-tests.ts
@@ -1,6 +1,7 @@
-/// <reference path="../meteor/meteor.d.ts" />
-/// <reference path="../underscore/underscore.d.ts" />
-/// <reference path="meteor-roles.d.ts" />
+/// <reference types="meteor" />
+
+
+import * as _ from 'underscore';
 
 /**
  * All code below was copied from the examples at https://github.com/alanning/meteor-roles/.
diff --git a/meteor-roles/meteor-roles.d.ts b/meteor-roles/meteor-roles.d.ts
deleted file mode 100644
index e19ae86ba4..0000000000
--- a/meteor-roles/meteor-roles.d.ts
+++ /dev/null
@@ -1,264 +0,0 @@
-// Type definitions for Meteor Roles 1.2.14
-// Project: https://github.com/alanning/meteor-roles/
-// Definitions by: Robbie Van Gorkom <https://github.com/vangorra>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../meteor/meteor.d.ts" />
-
-/**
- * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
- *
- * @module Roles
- */
-declare namespace Roles {
-    /**
-     * Constant used to reference the special 'global' group that
-     * can be used to apply blanket permissions across all groups.
-     *
-     * @example
-     *     Roles.addUsersToRoles(user, 'admin', Roles.GLOBAL_GROUP)
-     *     Roles.userIsInRole(user, 'admin') // => true
-     *
-     *     Roles.setUserRoles(user, 'support-staff', Roles.GLOBAL_GROUP)
-     *     Roles.userIsInRole(user, 'support-staff') // => true
-     *     Roles.userIsInRole(user, 'admin') // => false
-     *
-     * @property GLOBAL_GROUP
-     * @type String
-     * @static
-     * @final
-     */
-    var GLOBAL_GROUP : string;
-
-    /**
-     * Subscription handle for the currently logged in user's permissions.
-     *
-     * NOTE: The corresponding publish function, `_roles`, depends on
-     * `this.userId` so it will automatically re-run when the currently
-     * logged-in user changes.
-     *
-     * @example
-     *
-     *     `Roles.subscription.ready()` // => `true` if user roles have been loaded
-     *
-     * @property subscription
-     * @type Object
-     * @for Roles
-     */
-    var subscription : Subscription;
-
-    /**
-     * Add users to roles. Will create roles as needed.
-     *
-     * NOTE: Mixing grouped and non-grouped roles for the same user
-     *       is not supported and will throw an error.
-     *
-     * Makes 2 calls to database:
-     *  1. retrieve list of all existing roles
-     *  2. update users' roles
-     *
-     * @example
-     *     Roles.addUsersToRoles(userId, 'admin')
-     *     Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')
-     *     Roles.addUsersToRoles([user1, user2], ['user','editor'])
-     *     Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
-     *     Roles.addUsersToRoles(userId, 'admin', Roles.GLOBAL_GROUP)
-     *
-     * @method addUsersToRoles
-     * @param {Array|String} users User id(s) or object(s) with an _id field
-     * @param {Array|String} roles Name(s) of roles/permissions to add users to
-     * @param {String} [group] Optional group name. If supplied, roles will be
-     *                         specific to that group.
-     *                         Group names can not start with '$' or numbers.
-     *                         Periods in names '.' are automatically converted
-     *                         to underscores.
-     *                         The special group Roles.GLOBAL_GROUP provides
-     *                         a convenient way to assign blanket roles/permissions
-     *                         across all groups.  The roles/permissions in the
-     *                         Roles.GLOBAL_GROUP group will be automatically
-     *                         included in checks for any group.
-     */
-    function addUsersToRoles(
-        user : string|string[]|Object|Object[],
-        roles : string|string[],
-        group? : string
-    ) : void;
-
-    /**
-     * Create a new role. Whitespace will be trimmed.
-     *
-     * @method createRole
-     * @param {String} role Name of role
-     * @return {String} id of new role
-     */
-    function createRole(role : string) : string;
-
-    /**
-     * Delete an existing role.  Will throw "Role in use" error if any users
-     * are currently assigned to the target role.
-     *
-     * @method deleteRole
-     * @param {String} role Name of role
-     */
-    function deleteRole (role : string) : void;
-
-    /**
-     * Retrieve set of all existing roles
-     *
-     * @method getAllRoles
-     * @return {Cursor} cursor of existing roles
-     */
-    function getAllRoles() : Mongo.Cursor<Role>;
-
-    /**
-     * Retrieve users groups, if any
-     *
-     * @method getGroupsForUser
-     * @param {String|Object} user User Id or actual user object
-     * @param {String} [role] Optional name of roles to restrict groups to.
-     *
-     * @return {Array} Array of user's groups, unsorted. Roles.GLOBAL_GROUP will be omitted
-     */
-    function getGroupsForUser(
-        user : string|Object,
-        role? : string
-    ) : string[];
-
-    /**
-     * Retrieve users roles
-     *
-     * @method getRolesForUser
-     * @param {String|Object} user User Id or actual user object
-     * @param {String} [group] Optional name of group to restrict roles to.
-     *                         User's Roles.GLOBAL_GROUP will also be included.
-     * @return {Array} Array of user's roles, unsorted.
-     */
-    function getRolesForUser(
-        user : string|Object,
-        group? : string
-    ) : Role[];
-
-    /**
-     * Retrieve all users who are in target role.
-     *
-     * NOTE: This is an expensive query; it performs a full collection scan
-     * on the users collection since there is no index set on the 'roles' field.
-     * This is by design as most queries will specify an _id so the _id index is
-     * used automatically.
-     *
-     * @method getUsersInRole
-     * @param {Array|String} role Name of role/permission.  If array, users
-     *                            returned will have at least one of the roles
-     *                            specified but need not have _all_ roles.
-     * @param {String} [group] Optional name of group to restrict roles to.
-     *                         User's Roles.GLOBAL_GROUP will also be checked.
-     * @param {Object} [options] Optional options which are passed directly
-     *                           through to `Meteor.users.find(query, options)`
-     * @return {Cursor} cursor of users in role
-     */
-    function getUsersInRole(
-        role : string|string[],
-        group? : string,
-        options? : {
-            sort?: Mongo.SortSpecifier;
-        skip?: number;
-        limit?: number;
-        fields?: Mongo.FieldSpecifier;
-        reactive?: boolean;
-        transform?: Function;
-    }) : Mongo.Cursor<Meteor.User>;
-
-    /**
-     * Remove users from roles
-     *
-     * @example
-     *     Roles.removeUsersFromRoles(users.bob, 'admin')
-     *     Roles.removeUsersFromRoles([users.bob, users.joe], ['editor'])
-     *     Roles.removeUsersFromRoles([users.bob, users.joe], ['editor', 'user'])
-     *     Roles.removeUsersFromRoles(users.eve, ['user'], 'group1')
-     *
-     * @method removeUsersFromRoles
-     * @param {Array|String} users User id(s) or object(s) with an _id field
-     * @param {Array|String} roles Name(s) of roles to add users to
-     * @param {String} [group] Optional. Group name. If supplied, only that
-     *                         group will have roles removed.
-     */
-    function removeUsersFromRoles(
-        user : string|string[]|Object|Object[],
-        roles? : string[],
-        group? : string
-    ) : void;
-
-    /**
-     * Set a users roles/permissions.
-     *
-     * @example
-     *     Roles.setUserRoles(userId, 'admin')
-     *     Roles.setUserRoles(userId, ['view-secrets'], 'example.com')
-     *     Roles.setUserRoles([user1, user2], ['user','editor'])
-     *     Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
-     *     Roles.setUserRoles(userId, 'admin', Roles.GLOBAL_GROUP)
-     *
-     * @method setUserRoles
-     * @param {Array|String} users User id(s) or object(s) with an _id field
-     * @param {Array|String} roles Name(s) of roles/permissions to add users to
-     * @param {String} [group] Optional group name. If supplied, roles will be
-     *                         specific to that group.
-     *                         Group names can not start with '$'.
-     *                         Periods in names '.' are automatically converted
-     *                         to underscores.
-     *                         The special group Roles.GLOBAL_GROUP provides
-     *                         a convenient way to assign blanket roles/permissions
-     *                         across all groups.  The roles/permissions in the
-     *                         Roles.GLOBAL_GROUP group will be automatically
-     *                         included in checks for any group.
-     */
-    function setUserRoles (
-        user : string|string[]|Object|Object[],
-        roles : string|string[],
-        group? : string
-    ) : void;
-
-    /**
-     * Check if user has specified permissions/roles
-     *
-     * @example
-     *     // non-group usage
-     *     Roles.userIsInRole(user, 'admin')
-     *     Roles.userIsInRole(user, ['admin','editor'])
-     *     Roles.userIsInRole(userId, 'admin')
-     *     Roles.userIsInRole(userId, ['admin','editor'])
-     *
-     *     // per-group usage
-     *     Roles.userIsInRole(user,   ['admin','editor'], 'group1')
-     *     Roles.userIsInRole(userId, ['admin','editor'], 'group1')
-     *     Roles.userIsInRole(userId, ['admin','editor'], Roles.GLOBAL_GROUP)
-     *
-     *     // this format can also be used as short-hand for Roles.GLOBAL_GROUP
-     *     Roles.userIsInRole(user, 'admin')
-     *
-     * @method userIsInRole
-     * @param {String|Object} user User Id or actual user object
-     * @param {String|Array} roles Name of role/permission or Array of
-     *                            roles/permissions to check against.  If array,
-     *                            will return true if user is in _any_ role.
-     * @param {String} [group] Optional. Name of group.  If supplied, limits check
-     *                         to just that group.
-     *                         The user's Roles.GLOBAL_GROUP will always be checked
-     *                         whether group is specified or not.
-     * @return {Boolean} true if user is in _any_ of the target roles
-     */
-    function userIsInRole(
-        user : string|string[]|Object|Object[],
-        roles : string|string[],
-        group? : string
-    ) : boolean;
-
-    interface Role {
-        name : string;
-    }
-} // module
-
-declare namespace Meteor {
-    var roles : Mongo.Collection<Roles.Role>;
-}
diff --git a/meteor-roles/tsconfig.json b/meteor-roles/tsconfig.json
new file mode 100644
index 0000000000..a253a77fb2
--- /dev/null
+++ b/meteor-roles/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "meteor-roles-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/meteor/meteor.d.ts b/meteor/index.d.ts
similarity index 100%
rename from meteor/meteor.d.ts
rename to meteor/index.d.ts
diff --git a/meteor/meteor-tests.ts b/meteor/meteor-tests.ts
index bc877bdea0..a6a07cd4cd 100644
--- a/meteor/meteor-tests.ts
+++ b/meteor/meteor-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path='meteor.d.ts'/>
-
 /**
  * All code below was copied from the examples at http://docs.meteor.com/.
  * When necessary, code was added to make the examples work (e.g. declaring a variable
diff --git a/meteor/tsconfig.json b/meteor/tsconfig.json
new file mode 100644
index 0000000000..c9a79f4a7b
--- /dev/null
+++ b/meteor/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "meteor-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/method-override/index.d.ts b/method-override/index.d.ts
new file mode 100644
index 0000000000..7037fbb99a
--- /dev/null
+++ b/method-override/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for method-override
+// Project: https://github.com/expressjs/method-override
+// Definitions by: Santi Albo <https://github.com/santialbo/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare namespace Express {
+    export interface Request {
+        originalMethod?: string;
+    }
+}
+
+import express = require('express');
+
+declare namespace e {
+    export interface MethodOverrideOptions {
+        methods: string[];
+    }
+}
+
+declare function e(getter?: string, options?: e.MethodOverrideOptions): express.RequestHandler;
+declare function e(getter?: (req: express.Request, res: express.Response) => string, options?: e.MethodOverrideOptions): express.RequestHandler;
+
+export = e;
diff --git a/method-override/method-override-tests.ts b/method-override/method-override-tests.ts
index 9023135d18..381b259ce0 100644
--- a/method-override/method-override-tests.ts
+++ b/method-override/method-override-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="method-override.d.ts" />
+
 
 import express = require('express');
 import methodOverride = require('method-override');
diff --git a/method-override/method-override.d.ts b/method-override/method-override.d.ts
deleted file mode 100644
index 572a9226f8..0000000000
--- a/method-override/method-override.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// Type definitions for method-override
-// Project: https://github.com/expressjs/method-override
-// Definitions by: Santi Albo <https://github.com/santialbo/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare namespace Express {
-    export interface Request {
-        originalMethod?: string;
-    }
-}
-
-declare module "method-override" {
-    import express = require('express');
-
-    namespace e {
-        export interface MethodOverrideOptions {
-            methods: string[];
-        }
-    }
-
-    function e(getter?: string, options?: e.MethodOverrideOptions): express.RequestHandler;
-    function e(getter?: (req: express.Request, res: express.Response) => string, options?: e.MethodOverrideOptions): express.RequestHandler;
-
-    export = e;
-}
diff --git a/method-override/tsconfig.json b/method-override/tsconfig.json
new file mode 100644
index 0000000000..dff40846da
--- /dev/null
+++ b/method-override/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "method-override-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/metismenu/index.d.ts b/metismenu/index.d.ts
new file mode 100644
index 0000000000..43faa279c7
--- /dev/null
+++ b/metismenu/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for metisMenu 2.0.3
+// Project: http://github.com/onokumus/metisMenu
+// Definitions by: onokums <https://github.com/onokumus/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface MetisMenuOptions {
+    toggle?: boolean;
+    doubleTapToGo?: boolean;
+    activeClass?: string;
+    collapseClass?: string;
+    collapseInClass?: string;
+    collapsingClass?: string;
+}
+
+interface JQuery {
+    metisMenu(options?: MetisMenuOptions): JQuery;
+}
diff --git a/metismenu/metismenu-tests.ts b/metismenu/metismenu-tests.ts
index 824beecbb1..b2e36f1d53 100644
--- a/metismenu/metismenu-tests.ts
+++ b/metismenu/metismenu-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="metismenu.d.ts"/>
+/// <reference types="jquery"/>
 
 $('#menu').metisMenu();
 $('.metismenu').metisMenu({toggle: false});
diff --git a/metismenu/metismenu.d.ts b/metismenu/metismenu.d.ts
deleted file mode 100644
index 19895762c8..0000000000
--- a/metismenu/metismenu.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Type definitions for metisMenu 2.0.3
-// Project: http://github.com/onokumus/metisMenu
-// Definitions by: onokums <https://github.com/onokumus/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface MetisMenuOptions {
-    toggle?: boolean;
-    doubleTapToGo?: boolean;
-    activeClass?: string;
-    collapseClass?: string;
-    collapseInClass?: string;
-    collapsingClass?: string;
-}
-
-interface JQuery {
-    metisMenu(options?: MetisMenuOptions): JQuery;
-}
diff --git a/metismenu/tsconfig.json b/metismenu/tsconfig.json
new file mode 100644
index 0000000000..b6c8ff9bce
--- /dev/null
+++ b/metismenu/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "metismenu-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/microgears/index.d.ts b/microgears/index.d.ts
new file mode 100644
index 0000000000..399a701eb2
--- /dev/null
+++ b/microgears/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for microgears v4.0.0
+// Project: http://github.com/marcusdb/microgears
+// Definitions by: Marcus David Bronstein <https://github.com/marcusdb>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace microgears {
+    export interface Service {
+        name: string;
+        async?: boolean;
+        pathname?: string;
+        namespace: string;
+    }
+
+    interface MetaInformation {
+        serviceName: string;
+        methodName: string;
+        serviceNameSpace: string;
+        extra: any;
+    }
+
+    interface Plugin {
+        name: string;
+        beforeChain(args: Array<any>, metaInfo: MetaInformation): Array<any>;
+        afterChain<T>(result: T, metaInfo: MetaInformation): T;
+    }
+
+    function addService(service: Service): Service;
+    function addPlugin(plugin: Plugin): void;
+}
+
+export = microgears;
\ No newline at end of file
diff --git a/microgears/microgears-tests.ts b/microgears/microgears-tests.ts
new file mode 100644
index 0000000000..376d0b8172
--- /dev/null
+++ b/microgears/microgears-tests.ts
@@ -0,0 +1,58 @@
+import microgears = require("microgears");
+
+
+function verify_module_file() {
+    var tracePlugin = new TracePlugin();
+    microgears.addPlugin(tracePlugin);
+    var service = new UserService();
+    var userService = microgears.addService(service);
+
+
+}
+
+class TracePlugin implements microgears.Plugin {
+    name: 'TracePlugin';
+    public beforeChain(args:Array<any>, _meta: microgears.MetaInformation) {
+        var serviceName = _meta.serviceName,
+            method = _meta.methodName;
+        console.log('before call-> ' + serviceName + '.' + method);
+
+        _meta.extra = {
+            count: 1
+        };
+
+        return args
+    }
+    public afterChain(result:any, _meta: microgears.MetaInformation) {
+        var serviceName = _meta.serviceName,
+            method = _meta.methodName;
+
+        console.log('after of-> ' + serviceName + '.' + method);
+        if (_meta.extra.count) {
+            console.log('this number comes to the beforeChain: ' + _meta.extra.count);
+        }
+
+        return result;
+    }
+}
+
+class User {
+    name: string;
+    email: string;
+
+    constructor(name: string, email: string) {
+        this.email = email;
+        this.name = name;
+    }
+}
+
+class UserService implements microgears.Service {
+    name: string = "userService";
+    namespace: string = "services.user";
+
+    public findUserById(id: number) {
+        return new User('test', 'test@example.com');
+    }
+
+}
+
diff --git a/microgears/tsconfig.json b/microgears/tsconfig.json
new file mode 100644
index 0000000000..85ce40f91f
--- /dev/null
+++ b/microgears/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "microgears-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/micromatch/index.d.ts b/micromatch/index.d.ts
new file mode 100644
index 0000000000..02608693a7
--- /dev/null
+++ b/micromatch/index.d.ts
@@ -0,0 +1,171 @@
+// Type definitions for micromatch 2.3.7
+// Project: https://github.com/jonschlinkert/micromatch
+// Definitions by: glen-84 <https://github.com/glen-84>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+import parseGlob = require('parse-glob');
+
+declare namespace micromatch {
+    type MatchFunction<T> = ((value: T) => boolean);
+    type Pattern = (string | RegExp | MatchFunction<string>);
+
+    interface Options {
+        /**
+         * Normalize slashes in file paths and glob patterns to forward slashes.
+         */
+        unixify?: boolean;
+        /**
+         * Match dotfiles. Same behavior as minimatch.
+         */
+        dot?: boolean;
+        /**
+         * Unescape slashes in glob patterns. Use cautiously, especially on windows.
+         */
+        unescape?: boolean;
+        /**
+         * Remove duplicate elements from the result array.
+         */
+        nodupes?: boolean;
+        /**
+         * Allow glob patterns without slashes to match a file path based on its basename. Same behavior as
+         * minimatch.
+         */
+        matchBase?: boolean;
+        /**
+         * Don't expand braces in glob patterns. Same behavior as minimatch nobrace.
+         */
+        nobraces?: boolean;
+        /**
+         * Don't expand POSIX bracket expressions.
+         */
+        nobrackets?: boolean;
+        /**
+         * Don't expand extended globs.
+         */
+        noextglob?: boolean;
+        /**
+         * Use a case-insensitive regex for matching files. Same behavior as minimatch.
+         */
+        nocase?: boolean;
+        /**
+         * If true, when no matches are found the actual (array-ified) glob pattern is returned instead of an empty
+         * array. Same behavior as minimatch.
+         */
+        nonull?: boolean;
+        /**
+         * Cache the platform (e.g. win32) to prevent this from being looked up for every file path.
+         */
+        cache?: boolean;
+    }
+
+    interface Glob {
+        options: micromatch.Options;
+        pattern: string;
+        history: { msg: any, pattern: string }[];
+        tokens: parseGlob.Result;
+        orig: string;
+        negated: boolean;
+
+        /**
+         * Initialize defaults.
+         */
+        init(pattern: string): void;
+
+        /**
+         * Push a change into `glob.history`. Useful for debugging.
+         */
+        track(msg: any): void;
+
+        /**
+         * Return true if `glob.pattern` was negated with `!`, also remove the `!` from the pattern.
+         */
+        isNegated(): boolean;
+
+        /**
+         * Expand braces in the given glob pattern.
+         */
+        braces(): void;
+
+        /**
+         * Expand bracket expressions in `glob.pattern`.
+         */
+        brackets(): void;
+
+        /**
+         * Expand extended globs in `glob.pattern`.
+         */
+        extglob(): void;
+
+        /**
+         * Parse the given pattern.
+         */
+        parse(pattern: string): parseGlob.Result;
+
+        /**
+         * Escape special characters in the given string.
+         */
+        escape(pattern: string): string;
+
+        /**
+         * Unescape special characters in the given string.
+         */
+        unescape(pattern: string): string;
+    }
+
+    interface GlobData {
+        pattern: string;
+        tokens: parseGlob.Result;
+        options: micromatch.Options;
+    }
+}
+
+interface Micromatch {
+    (files: string | string[], patterns: micromatch.Pattern | micromatch.Pattern[]): string[];
+
+    isMatch: {
+        /**
+         * Returns true if a file path matches the given pattern.
+         */
+        (filePath: string, pattern: micromatch.Pattern, opts?: micromatch.Options): boolean;
+        /**
+         * Returns a function for matching.
+         */
+        (filePath: string, opts?: micromatch.Options): micromatch.MatchFunction<string>;
+    };
+
+    /**
+     * Returns true if any part of a file path matches the given pattern. Think of this as "has path" versus
+     * "is path".
+     */
+    contains(filePath: string, pattern: micromatch.Pattern, opts?: micromatch.Options): boolean;
+
+    /**
+     * Returns a function for matching using the supplied pattern. e.g. create your own "matcher". The advantage of
+     * this method is that the pattern can be compiled outside of a loop.
+     */
+    matcher(pattern: micromatch.Pattern): micromatch.MatchFunction<string>;
+
+    /**
+     * Returns a function that can be passed to Array#filter().
+     */
+    filter(patterns: micromatch.Pattern | micromatch.Pattern[], opts?: micromatch.Options): micromatch.MatchFunction<any>;
+
+    /**
+     * Returns true if a file path matches any of the given patterns.
+     */
+    any(filePath: string, patterns: micromatch.Pattern | micromatch.Pattern[], opts?: micromatch.Options): boolean;
+
+    /**
+     * Returns an object with a regex-compatible string and tokens.
+     */
+    expand(pattern: string, opts?: micromatch.Options): micromatch.Glob | micromatch.GlobData;
+
+    /**
+     * Create a regular expression for matching file paths based on the given pattern.
+     */
+    makeRe(pattern: string, opts?: micromatch.Options): RegExp;
+}
+
+declare const micromatch: Micromatch;
+export = micromatch;
diff --git a/micromatch/micromatch-tests.ts b/micromatch/micromatch-tests.ts
index f90c4a4bde..a0e40d0306 100644
--- a/micromatch/micromatch-tests.ts
+++ b/micromatch/micromatch-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./micromatch.d.ts" />
+
 import mm = require('micromatch');
 
 var strArrResult: string[];
diff --git a/micromatch/micromatch.d.ts b/micromatch/micromatch.d.ts
deleted file mode 100644
index cea7098ecb..0000000000
--- a/micromatch/micromatch.d.ts
+++ /dev/null
@@ -1,174 +0,0 @@
-// Type definitions for micromatch 2.3.7
-// Project: https://github.com/jonschlinkert/micromatch
-// Definitions by: glen-84 <https://github.com/glen-84>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../parse-glob/parse-glob.d.ts" />
-
-declare module 'micromatch' {
-    import parseGlob = require('parse-glob');
-
-    namespace micromatch {
-        type MatchFunction<T> = ((value: T) => boolean);
-        type Pattern = (string | RegExp | MatchFunction<string>);
-
-        interface Options {
-            /**
-             * Normalize slashes in file paths and glob patterns to forward slashes.
-             */
-            unixify?: boolean;
-            /**
-             * Match dotfiles. Same behavior as minimatch.
-             */
-            dot?: boolean;
-            /**
-             * Unescape slashes in glob patterns. Use cautiously, especially on windows.
-             */
-            unescape?: boolean;
-            /**
-             * Remove duplicate elements from the result array.
-             */
-            nodupes?: boolean;
-            /**
-             * Allow glob patterns without slashes to match a file path based on its basename. Same behavior as
-             * minimatch.
-             */
-            matchBase?: boolean;
-            /**
-             * Don't expand braces in glob patterns. Same behavior as minimatch nobrace.
-             */
-            nobraces?: boolean;
-            /**
-             * Don't expand POSIX bracket expressions.
-             */
-            nobrackets?: boolean;
-            /**
-             * Don't expand extended globs.
-             */
-            noextglob?: boolean;
-            /**
-             * Use a case-insensitive regex for matching files. Same behavior as minimatch.
-             */
-            nocase?: boolean;
-            /**
-             * If true, when no matches are found the actual (array-ified) glob pattern is returned instead of an empty
-             * array. Same behavior as minimatch.
-             */
-            nonull?: boolean;
-            /**
-             * Cache the platform (e.g. win32) to prevent this from being looked up for every file path.
-             */
-            cache?: boolean;
-        }
-
-        interface Glob {
-            options: micromatch.Options;
-            pattern: string;
-            history: {msg: any, pattern: string}[];
-            tokens: parseGlob.Result;
-            orig: string;
-            negated: boolean;
-
-            /**
-             * Initialize defaults.
-             */
-            init(pattern: string): void;
-
-            /**
-             * Push a change into `glob.history`. Useful for debugging.
-             */
-            track(msg: any): void;
-
-            /**
-             * Return true if `glob.pattern` was negated with `!`, also remove the `!` from the pattern.
-             */
-            isNegated(): boolean;
-
-            /**
-             * Expand braces in the given glob pattern.
-             */
-            braces(): void;
-
-            /**
-             * Expand bracket expressions in `glob.pattern`.
-             */
-            brackets(): void;
-
-            /**
-             * Expand extended globs in `glob.pattern`.
-             */
-            extglob(): void;
-
-            /**
-             * Parse the given pattern.
-             */
-            parse(pattern: string): parseGlob.Result;
-
-            /**
-             * Escape special characters in the given string.
-             */
-            escape(pattern: string): string;
-
-            /**
-             * Unescape special characters in the given string.
-             */
-            unescape(pattern: string): string;
-        }
-
-        interface GlobData {
-            pattern: string;
-            tokens: parseGlob.Result;
-            options: micromatch.Options;
-        }
-    }
-
-    interface Micromatch {
-        (files: string | string[], patterns: micromatch.Pattern | micromatch.Pattern[]): string[];
-
-        isMatch: {
-            /**
-             * Returns true if a file path matches the given pattern.
-             */
-            (filePath: string, pattern: micromatch.Pattern, opts?: micromatch.Options): boolean;
-            /**
-             * Returns a function for matching.
-             */
-            (filePath: string, opts?: micromatch.Options): micromatch.MatchFunction<string>;
-        };
-
-        /**
-         * Returns true if any part of a file path matches the given pattern. Think of this as "has path" versus
-         * "is path".
-         */
-        contains(filePath: string, pattern: micromatch.Pattern, opts?: micromatch.Options): boolean;
-
-        /**
-         * Returns a function for matching using the supplied pattern. e.g. create your own "matcher". The advantage of
-         * this method is that the pattern can be compiled outside of a loop.
-         */
-        matcher(pattern: micromatch.Pattern): micromatch.MatchFunction<string>;
-
-        /**
-         * Returns a function that can be passed to Array#filter().
-         */
-        filter(patterns: micromatch.Pattern | micromatch.Pattern[], opts?: micromatch.Options): micromatch.MatchFunction<any>;
-
-        /**
-         * Returns true if a file path matches any of the given patterns.
-         */
-        any(filePath: string, patterns: micromatch.Pattern | micromatch.Pattern[], opts?: micromatch.Options): boolean;
-
-        /**
-         * Returns an object with a regex-compatible string and tokens.
-         */
-        expand(pattern: string, opts?: micromatch.Options): micromatch.Glob | micromatch.GlobData;
-
-        /**
-         * Create a regular expression for matching file paths based on the given pattern.
-         */
-        makeRe(pattern: string, opts?: micromatch.Options): RegExp;
-    }
-
-    const micromatch: Micromatch;
-    export = micromatch;
-}
diff --git a/micromatch/tsconfig.json b/micromatch/tsconfig.json
new file mode 100644
index 0000000000..bf17742efc
--- /dev/null
+++ b/micromatch/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "micromatch-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/microsoft-ajax/microsoft.ajax.d.ts b/microsoft-ajax/index.d.ts
similarity index 100%
rename from microsoft-ajax/microsoft.ajax.d.ts
rename to microsoft-ajax/index.d.ts
diff --git a/microsoft-ajax/microsoft.ajax-tests.ts b/microsoft-ajax/microsoft.ajax-tests.ts
index 566ac14664..fb0ebff654 100644
--- a/microsoft-ajax/microsoft.ajax-tests.ts
+++ b/microsoft-ajax/microsoft.ajax-tests.ts
@@ -2,7 +2,7 @@
 // Project: http://msdn.microsoft.com/en-us/library/ee341002(v=vs.100).aspx
 // Definitions by: Patrick Magee <https://github.com/pjmagee/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/// <reference path="microsoft.ajax.d.ts" />
+
 
 function GlobalNamespace_Tests() {
 
diff --git a/microsoft-ajax/tsconfig.json b/microsoft-ajax/tsconfig.json
new file mode 100644
index 0000000000..093bbd5c14
--- /dev/null
+++ b/microsoft-ajax/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "microsoft.ajax-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/microsoft-live-connect/index.d.ts b/microsoft-live-connect/index.d.ts
new file mode 100644
index 0000000000..723387e508
--- /dev/null
+++ b/microsoft-live-connect/index.d.ts
@@ -0,0 +1,2339 @@
+// Type definitions for Microsoft Live Connect v5.0
+// Project: http://msdn.microsoft.com/en-us/library/live/hh243643.aspx
+// Definitions by: John Vilk <https://github.com/jvilk/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="winjs" />
+/// <reference types="winrt" />
+
+declare namespace Microsoft.Live {
+    //#region REST Object Information
+
+    /**
+     * Sub object of REST objects that contains information about a user.
+     */
+    interface IUserInfo {
+        /**
+         * The name of the user.
+         */
+        name: string;
+        /**
+         * The Live ID of the user.
+         */
+        id: string;
+    }
+
+    /**
+     * Sub object of REST objects that contains information about who the
+     * item is shared with.
+     */
+    interface ISharedWith {
+        /**
+         * A localized string that contains info about who can access the
+         * item. The options are:
+         * - People I selected
+         * - Just me
+         * - Everyone (public)
+         * - Friends
+         * - My friends and their friends
+         * - People with a link
+         * The default is Just me.
+         */
+        access: string;
+    }
+
+    /**
+     * Convenience interface for when you have a bunch of objects of different
+     * types in a single collection. You discriminate between them using their
+     * 'type' field.
+     */
+    interface IObject {
+        /**
+         * The object's type.
+         */
+        type: string;
+    }
+
+    /**
+     * Contains a collection of one type of object.
+     */
+    interface IObjectCollection<T> {
+        /**
+         * An array container for objects when a collection of objects is
+         * returned.
+         */
+        data: T[];
+    }
+
+    /**
+     * The Album object contains info about a user's albums in Microsoft
+     * SkyDrive. Albums are stored at the root level of a user's SkyDrive
+     * directory, and can contain combinations of photos, videos, audio, files,
+     * and folders. The Live Connect REST API supports reading Album objects.
+     * Use the wl.photos scope to read a user's Album objects. Use the
+     * wl.skydrive scope to read a user's files. Use the wl.contacts_photos
+     * scope to read any albums, photos, videos, and audio that other users have
+     * shared with the user.
+     */
+    interface IAlbum {
+        /**
+         * The Album object's ID.
+         */
+        id: string;
+        /**
+         * Info about the user who authored the album.
+         */
+        from: IUserInfo;
+        /**
+         * The name of the album.
+         */
+        name: string;
+        /**
+         * A description of the album, or null if no description is specified.
+         */
+        description: string;
+        /**
+         * The resource ID of the parent.
+         */
+        parent_id: string;
+        /**
+         * The URL to upload items to the album, hosted in SkyDrive. Requires
+         * the wl.skydrive scope.
+         */
+        upload_location: string;
+        /**
+         * A value that indicates whether this album can be embedded. If this
+         * album can be embedded, this value is true; otherwise, it is false.
+         */
+        is_embeddable: boolean;
+        /**
+         * The total number of items in the album.
+         */
+        count: number;
+        /**
+         * A URL of the album, hosted in SkyDrive.
+         */
+        link: string;
+        /**
+         * The type of object; in this case, "album".
+         */
+        type: string;
+        /**
+         * The object that contains permissions info for the album. Requires the
+         * wl.skydrive scope.
+         */
+        shared_with: ISharedWith;
+        /**
+         * The time, in ISO 8601 format, at which the album was created.
+         */
+        created_time: string;
+        /**
+         * The time, in ISO 8601 format, that the system updated the album last.
+         */
+        updated_time: string;
+        /**
+         * The time, in ISO 8601 format, that the file was last updated.
+         */
+        client_updated_time: string;
+    }
+
+    /**
+     * Represents a new album.
+     */
+    interface INewAlbum {
+        /**
+         * The name of the album.
+         */
+        name: string;
+        /**
+         * A description of the album.
+         */
+        description?: string;
+    }
+
+    /**
+     * The Audio object contains info about a user's audio in SkyDrive. The Live
+     * Connect REST API supports creating, reading, updating, and deleting Audio
+     * objects. Use the wl.skydrive scope to read Audio objects. Use the
+     * wl.contacts_skydrive scope to read any audio that other users have shared
+     * with the user. Use the wl.skydrive_update scope to create, update, or
+     * delete Audio objects.
+     */
+    interface IAudio {
+        /**
+         * The Audio object's ID.
+         */
+        id: string;
+        /**
+         * Info about the user who uploaded the audio.
+         */
+        from: IUserInfo;
+        /**
+         * The name of the audio.
+         */
+        name: string;
+        /**
+         * A description of the audio, or null if no description is specified.
+         */
+        description: string;
+        /**
+         * The id of the folder in which the audio is currently stored.
+         */
+        parent_id: string;
+        /**
+         * The size, in bytes, of the audio.
+         */
+        size: number;
+        /**
+         * The URL to use to upload a new audio to overwrite the existing audio.
+         */
+        upload_location: string;
+        /**
+         * The number of comments associated with the audio.
+         */
+        comments_count: number;
+        /**
+         * A value that indicates whether comments are enabled for the audio. If
+         * comments can be made, this value is true; otherwise, it is false.
+         */
+        comments_enabled: boolean;
+        /**
+         * A value that indicates whether this audio can be embedded. If this
+         * audio can be embedded, this value is true; otherwise, it is false.
+         */
+        is_embeddable: boolean;
+        /**
+         * The URL to use to download the audio from SkyDrive.
+         * Warning
+         * This value is not persistent. Use it immediately after making the
+         * request, and avoid caching.
+         */
+        source: string;
+        /**
+         * A URL to view the item on SkyDrive.
+         */
+        link: string;
+        /**
+         * The type of object; in this case, "audio".
+         */
+        type: string;
+        /**
+         * The audio's title.
+         */
+        title: string;
+        /**
+         * The audio's artist name.
+         */
+        artist: string;
+        /**
+         * The audio's album name.
+         */
+        album: string;
+        /**
+         * The artist name of the audio's album.
+         */
+        album_artist: string;
+        /**
+         * The audio's genre.
+         */
+        genre: string;
+        /**
+         * The audio's playing time, in milliseconds.
+         */
+        duration: number;
+        /**
+         * A URL to view the audio's picture on SkyDrive.
+         */
+        picture: string;
+        /**
+         * The object that contains permission info.
+         */
+        shared_with: ISharedWith;
+        /**
+         * The time, in ISO 8601 format, at which the audio was created.
+         */
+        created_time: string;
+        /**
+         * The time, in ISO 8601 format, at which the audio was last updated.
+         */
+        updated_time: string;
+    }
+
+    /**
+     * Represents a new audio item.
+     */
+    interface INewAudio {
+        /**
+         * The name of the audio.
+         */
+        name: string;
+        /**
+         * A description of the audio.
+         */
+        description?: string;
+        /**
+         * The audio's title.
+         */
+        title?: string;
+        /**
+         * The audio's artist name.
+         */
+        artist?: string;
+        /**
+         * The audio's album name.
+         */
+        album?: string;
+        /**
+         * The artist name of the audio's album.
+         */
+        album_artist?: string;
+        /**
+         * The audio's genre.
+         */
+        genre?: string;
+    }
+
+    /**
+     * The Calendar object contains info about a user's Outlook.com calendar.
+     * The Live Connect REST API supports creating, reading, updating, and
+     * deleting calendars. Use the wl.calendars scope to read a user's Calendar
+     * objects. Use the wl.calendars_update scope to create Calendar objects for
+     * a user. Use the wl.contacts_calendars scope to read a user's friends'
+     * Calendar objects.
+     */
+    interface ICalendar {
+        /**
+         * The Calendar object's ID.
+         */
+        id: string;
+        /**
+         * Name of the calendar.
+         */
+        name: string;
+        /**
+         * Description of the calendar.
+         */
+        description: string;
+        /**
+         * The time, in ISO 8601 format, at which the calendar was created.
+         */
+        created_time: string;
+        /**
+         * The time, in ISO 8601 format, that the calendar was last updated.
+         */
+        updated_time: string;
+        /**
+         * Info about the user who owns the calendar.
+         */
+        from: IUserInfo;
+        /**
+         * A value that indicates whether this calendar is the default calendar.
+         * If this calendar is the default calendar, this value is true;
+         * otherwise, it is false.
+         */
+        is_default: boolean;
+        /**
+         * A public subscription URL with which Live Connect will synchronize
+         * properties and events periodically for this calendar. A NULL value
+         * indicates that this is not a subscribed calendar.
+         */
+        subscription_location: string;
+        /**
+         * Role and permissions that are granted to the user for the calendar.
+         * The possible values are:
+         * - free_busy: The user can see only free/busy info.
+         * - limited_details: The user can see a subset of all details.
+         * - read: The user can only read the content of the calendar events.
+         * - read_write: The user can read and write calendar and events.
+         * - co_owner: The user is co-owner of this calendar.
+         * - owner: The user is the owner of this calendar.
+         */
+        permissions: string;
+    }
+
+    /**
+     * Represents a new calendar item.
+     */
+    interface INewCalendar {
+        /**
+         * Name of the calendar.
+         */
+        name: string;
+        /**
+         * Description of the calendar.
+         */
+        description?: string;
+    }
+
+    /**
+     * Represents a request to create a new calendar that subscribes to the
+     * given iCal calendar.
+     */
+    interface INewCalendarSubscription {
+        /**
+         * Name of the calendar.
+         */
+        name: string;
+        /**
+         * A public subscription URL with which Live Connect will synchronize
+         * properties and events periodically for this calendar.
+         */
+        subscription_location: string;
+    }
+
+    /**
+     * The Comment object contains info about comments that are associated with
+     * a photo, audio, or video on SkyDrive. The Live Connect REST API supports
+     * reading Comment objects. Use the wl.photos scope to read Comment objects.
+     * Use the wl.contacts_photos scope to read the Comment objects that are
+     * associated with any albums, photos, and videos that other users have
+     * shared with the user.
+     */
+    interface IComment {
+        /**
+         * The Comment object's id.
+         */
+        id: string;
+        /**
+         * Info about the user who created the comment.
+         */
+        from: IUserInfo;
+        /**
+         * The text of the comment. The maximum length of a comment is 10,000
+         * characters.
+         */
+        message: string;
+        /**
+         * The time, in ISO 8601 format, at which the comment was created.
+         */
+        created_time: string;
+    }
+
+    /**
+     * Represents a new comment.
+     */
+    interface INewComment {
+        /**
+         * The text of the comment. The maximum length of a comment is 10,000
+         * characters.
+         */
+        message: string;
+    }
+
+    /**
+     * The Contact object contains info about a user's Outlook.com contacts. The
+     * Live Connect REST API supports reading Contact objects.
+     */
+    interface IContact {
+        /**
+         * The Contact object's ID.
+         */
+        id: string;
+        /**
+         * The contact's first name, or null if no first name is specified.
+         */
+        first_name: string;
+        /**
+         * The contact's last name, or null if no last name is specified.
+         */
+        last_name: string;
+        /**
+         * The contact's full name, formatted for location.
+         */
+        name: string;
+        /**
+         * A value that indicates whether the contact is set as a friend. If the
+         * contact is a friend, this value is true; otherwise, it is false.
+         */
+        is_friend: boolean;
+        /**
+         * A value that indicates whether the contact is set as a favorite
+         * contact. If the contact is a favorite, this value is true; otherwise,
+         * it is false.
+         */
+        is_favorite: boolean;
+        /**
+         * The contact's ID, if the contact has one. If not, this value is null.
+         */
+        user_id: string;
+        /**
+         * An array containing a SHA-256 hash for each of the contact's email
+         * addresses. For more info, see Friend finder.
+         */
+        email_hashes: string[];
+        /**
+         * The time, in ISO 8601 format, at which the user last updated the
+         * data.
+         */
+        updated_time: string;
+        /**
+         * The day of the contact's birth date, or null if no birth date is
+         * specified.
+         */
+        birth_day: number;
+        /**
+         * The month of the contact's birth date, or null if no birth date is
+         * specified.
+         */
+        birth_month: number;
+    }
+
+    /**
+     * Represents a new contact.
+     */
+    interface INewContact {
+        /**
+         * The contact's first name.
+         */
+        first_name?: string;
+        /**
+         * The contact's last name.
+         */
+        last_name?: string;
+        /**
+         * An array that contains the contact's work info.
+         */
+        work?: {
+            employer: {
+                name: string;
+            }
+        }[];
+        /**
+         * The contact's email addresses.
+         */
+        emails?: {
+            /**
+             * The contact's preferred email address.
+             */
+            preferred?: string;
+            /**
+             * The contact's personal email address.
+             */
+            personal?: string;
+            /**
+             * The contact's business email address.
+             */
+            business?: string;
+            /**
+             * The contact's "alternate" email address.
+             */
+            other?: string;
+        };
+    }
+
+    /**
+     * The Error object contains info about an error that is returned by the
+     * Live Connect APIs.
+     */
+    interface IError {
+        /**
+         * Info about the error.
+         */
+        error: {
+            /**
+             * The error code.
+             */
+            code: string;
+            /**
+             * The error message.
+             */
+            message: string;
+        };
+    }
+
+    /**
+     * The Event object contains info about events on a user's Outlook.com
+     * calendars. The Live Connect REST API supports creating Event objects. Use
+     * the wl.events_create scope to create Event objects on the user's default
+     * calendar only. Use the wl.calendars scope to read Event objects on the
+     * user's calendars. Use wl.calendars_update to create Event objects on any
+     * of the user's calendars. Use the wl.contacts_calendars scope to read
+     * Event objects from the user's friend's calendars.
+     */
+    interface IEvent {
+        /**
+         * The ID of the event.
+         */
+        id: string;
+        /**
+         * The name of the event, with a maximum length of 255 characters. This
+         * structure is required.
+         */
+        name: string;
+        /**
+         * The time, in ISO 8601 format, at which the event was created.
+         */
+        created_time: string;
+        /**
+         * The time, in ISO 8601 format, at which the event was updated. This
+         * structure is visible only in the Event object that is returned if the
+         * event was successfully created.
+         */
+        updated_time: string;
+        /**
+         * A description of the event, with a maximum length of 32,768
+         * characters. This structure is required.
+         */
+        description: string;
+        /**
+         * The ID of the calendar that contains the event.
+         */
+        calendar_id: string;
+        /**
+         * The object that contains the name and ID of the organizer.
+         */
+        from: IUserInfo;
+        /**
+         * The start time, in ISO 8601 format, of the event. When the event is
+         * being read, the time will be the user's local time, in ISO 8601
+         * format.
+         */
+        start_time: string;
+        /**
+         * The end time, in ISO 8601 format, of the event. If no end time is
+         * specified, the default value is 30 minutes after start_time. This
+         * structure is optional when creating an event. When the event is being
+         * read, the time will be the user's local time, in ISO 8601 format.
+         */
+        end_time: string;
+        /**
+         * The name of the location at which the event will take place. The
+         * maximum length is 1,000 characters.
+         */
+        location: string;
+        /**
+         * A value that specifies whether the event is an all-day event. If the
+         * event is an all-day event, this value is true; otherwise, it is
+         * false. If this structure is missing, the default value is false.
+         */
+        is_all_day_event: boolean;
+        /**
+         * A value that specifies whether the event is recurring. If the event
+         * is recurring, this value is true; otherwise, it is false.
+         */
+        is_recurrent: boolean;
+        /**
+         * The text description of the recurrence pattern, for example, "Occurs
+         * every week on Tuesday". The value is Null if this is not a recurrent
+         * event.
+         */
+        recurrence: string;
+        /**
+         * The time, in minutes, before the event for the reminder alarm.
+         */
+        reminder_time: number;
+        /**
+         * The user's availability status for the event. Valid values are:
+         * - free
+         * - busy
+         * - tentative
+         * - out_of_office
+         * @default "free"
+         */
+        availability: string;
+        /**
+         * A value that specifies whether the event is publicly visible. Valid
+         * values are:
+         * - public�the event is visible to anyone who can view the calendar.
+         * - private"�the event is visible only to the event owner.
+         * @default "public"
+         */
+        visibility: string;
+    }
+
+    /**
+     * Represents a new event.
+     */
+    interface INewEvent {
+        /**
+         * The name of the event, with a maximum length of 255 characters. This
+         * structure is required.
+         */
+        name: string;
+        /**
+         * A description of the event, with a maximum length of 32,768
+         * characters. This structure is required.
+         */
+        description: string;
+        /**
+         * The start time of the event. When the event is being read, the time
+         * will be the user's local time, in ISO 8601 format.
+         * Can be a date string, or a Date object.
+         */
+        start_time: any;
+        /**
+         * The end time of the event. If no end time is specified, the default
+         * value is 30 minutes after start_time. This structure is optional when
+         * creating an event. When the event is being read, the time will be the
+         * user's local time, in ISO 8601 format.
+         * Can be a date string, or a Date object.
+         */
+        end_time?: any;
+        /**
+         * The name of the location at which the event will take place. The
+         * maximum length is 1,000 characters.
+         */
+        location?: string;
+        /**
+         * A value that specifies whether the event is an all-day event. If the
+         * event is an all-day event, this value is true; otherwise, it is
+         * false. If this structure is missing, the default value is false.
+         */
+        is_all_day_event?: boolean;
+        /**
+         * The time, in minutes, before the event for the reminder alarm.
+         */
+        reminder_time?: number;
+        /**
+         * The user's availability status for the event. Valid values are:
+         * - free
+         * - busy
+         * - tentative
+         * - out_of_office
+         * @default "free"
+         */
+        availability?: string;
+        /**
+         * A value that specifies whether the event is publicly visible. Valid
+         * values are:
+         * - public�the event is visible to anyone who can view the calendar.
+         * - private"�the event is visible only to the event owner.
+         * @default "public"
+         */
+        visibility?: string;
+    }
+
+    /**
+     * Response received after successfully creating a new event.
+     */
+    interface INewEventResponse {
+        /**
+         * The name of the event, with a maximum length of 255 characters. This
+         * structure is required.
+         */
+        name: string;
+        /**
+         * A description of the event, with a maximum length of 32,768
+         * characters. This structure is required.
+         */
+        description: string;
+        /**
+         * The start time, in ISO 8601 format, of the event. When the event is
+         * being read, the time will be the user's local time, in ISO 8601
+         * format.
+         */
+        start_time: string;
+        /**
+         * The end time, in ISO 8601 format, of the event. If no end time is
+         * specified, the default value is 30 minutes after start_time. This
+         * structure is optional when creating an event. When the event is being
+         * read, the time will be the user's local time, in ISO 8601 format.
+         */
+        end_time: string;
+        /**
+         * The name of the location at which the event will take place. The
+         * maximum length is 1,000 characters.
+         */
+        location: string;
+        /**
+         * A value that specifies whether the event is an all-day event. If the
+         * event is an all-day event, this value is true; otherwise, it is
+         * false. If this structure is missing, the default value is false.
+         */
+        is_all_day_event: boolean;
+        /**
+         * A value that specifies whether the event is recurring. If the event
+         * is recurring, this value is true; otherwise, it is false.
+         */
+        is_recurrent: boolean;
+        /**
+         * The text description of the recurrence pattern, for example, "Occurs
+         * every week on Tuesday". The value is Null if this is not a recurrent
+         * event.
+         */
+        recurrence: string;
+        /**
+         * The time, in minutes, before the event for the reminder alarm.
+         */
+        reminder_time: number;
+        /**
+         * The user's availability status for the event. Valid values are:
+         * - free
+         * - busy
+         * - tentative
+         * - out_of_office
+         * @default "free"
+         */
+        availability: string;
+        /**
+         * A value that specifies whether the event is publicly visible. Valid
+         * values are:
+         * - public�the event is visible to anyone who can view the calendar.
+         * - private"�the event is visible only to the event owner.
+         * @default "public"
+         */
+        visibility: string;
+        /**
+         * The time, in ISO 8601 format, at which the event was updated. This
+         * structure is visible only in the Event object that is returned if the
+         * event was successfully created.
+         */
+        updated_time: string;
+    }
+
+    /**
+     * The File object contains info about a user's files in SkyDrive. The Live
+     * Connect REST API supports creating, reading, updating, and deleting File
+     * objects. Use the wl.skydrive scope to read File objects. Use the
+     * wl.contacts_skydrive scope to read any files that other users have shared
+     * with the user. Use the wl.skydrive_update scope to create, update, or
+     * delete File objects.
+     */
+    interface IFile {
+        /**
+         * The File object's ID.
+         */
+        id: string;
+        /**
+         * Info about the user who uploaded the file.
+         */
+        from: IUserInfo;
+        /**
+         * The name of the file.
+         */
+        name: string;
+        /**
+         * A description of the file, or null if no description is specified.
+         */
+        description: string;
+        /**
+         * The ID of the folder the file is currently stored in.
+         */
+        parent_id: string;
+        /**
+         * The size, in bytes, of the file.
+         */
+        size: number;
+        /**
+         * The URL to upload file content hosted in SkyDrive.
+         * Note: This structure is not available if the file is an Microsoft
+         * Office OneNote notebook.
+         */
+        upload_location: string;
+        /**
+         * The number of comments that are associated with the file.
+         */
+        comments_count: number;
+        /**
+         * A value that indicates whether comments are enabled for the file. If
+         * comments can be made, this value is true; otherwise, it is false.
+         */
+        comments_enabled: boolean;
+        /**
+         * A value that indicates whether this file can be embedded. If this
+         * file can be embedded, this value is true; otherwise, it is false.
+         */
+        is_embeddable: boolean;
+        /**
+         * The URL to use to download the file from SkyDrive.
+         * Warning: This value is not persistent. Use it immediately after
+         * making the request, and avoid caching.
+         * Note: This structure is not available if the file is an Office
+         * OneNote notebook.
+         */
+        source: string;
+        /**
+         * A URL to view the item on SkyDrive.
+         */
+        link: string;
+        /**
+         * The type of object; in this case, "file".
+         * Note: If the file is a Office OneNote notebook, the type structure is
+         * set to "notebook".
+         */
+        type: string;
+        /**
+         * Object that contains permission info.
+         */
+        shared_with: ISharedWith;
+        /**
+         * The time, in ISO 8601 format, at which the file was created.
+         */
+        created_time: string;
+        /**
+         * The time, in ISO 8601 format, that the system updated the file last.
+         */
+        updated_time: string;
+        /**
+         * The time, in ISO 8601 format, that the client machine updated the
+         * file last.
+         */
+        client_updated_time: string;
+        /**
+         * Sorts the items to specify the following criteria: updated, name,
+         * size, or default.
+         */
+        sort_by: string;
+    }
+
+    /**
+     * Success response to a new file creation request.
+     */
+    interface INewFileResponse {
+        /**
+         * ID of the new item.
+         */
+        id: string;
+        /**
+         * The file's name and file extension.
+         */
+        name: string;
+        /**
+         * URL where the item can be downloaded from.
+         */
+        source: string;
+    }
+
+    /**
+     * Returns when you perform a GET request to /FILE_ID/content.
+     */
+    interface IFileDownloadLink {
+        /**
+         * A URL download link for the file.
+         */
+        location: string;
+    }
+
+    /**
+     * The Folder object contains info about a user's folders in SkyDrive.
+     * Folders can contain combinations of photos, videos, audio, and
+     * subfolders. The Live Connect REST API supports reading Folder objects.
+     * Use the wl.photos scope to read Folder objects. Use the
+     * wl.contacts_photos scope to read any albums, photos, videos, and audio
+     * that other users have shared with the user.
+     */
+    interface IFolder {
+        /**
+         * The Folder object's ID.
+         */
+        id: string;
+        /**
+         * Info about the user who created the folder.
+         */
+        from: IUserInfo;
+        /**
+         * The name of the folder.
+         */
+        name: string;
+        /**
+         * A description of the folder, or null if no description is specified.
+         */
+        description: string;
+        /**
+         * The total number of items in the folder.
+         */
+        count: number;
+        /**
+         * The URL of the folder, hosted in SkyDrive.
+         */
+        link: string;
+        /**
+         * The resource ID of the parent.
+         */
+        parent_id: string;
+        /**
+         * The URL to upload items to the folder hosted in SkyDrive. Requires
+         * the wl.skydrive scope.
+         */
+        upload_location: string;
+        /**
+         * A value that indicates whether this folder can be embedded. If this
+         * folder can be embedded, this value is true; otherwise, it is false.
+         */
+        is_embeddable: boolean;
+        /**
+         * The type of object; in this case, "folder".
+         */
+        type: string;
+        /**
+         * The time, in ISO 8601 format, at which the folder was created.
+         */
+        created_time: string;
+        /**
+         * The time, in ISO 8601 format, that the system updated the file last.
+         */
+        updated_time: string;
+        /**
+         * The time, in ISO 8601 format, that the client machine updated the
+         * file last.
+         */
+        client_updated_time: string;
+        /**
+         * Permissions info for the folder. Requires the wl.skydrive scope.
+         */
+        shared_with: ISharedWith;
+        /**
+         * Sorts the items to specify the following criteria: updated, name,
+         * size, or default.
+         */
+        sort_by: string;
+    }
+
+    /**
+     * Represents a new folder.
+     */
+    interface INewFolder {
+        /**
+         * The name of the folder.
+         */
+        name: string;
+        /**
+         * A description of the folder.
+         */
+        description?: string;
+        /**
+         * Sorts the items to specify the following criteria: updated, name,
+         * size, or default.
+         */
+        sort_by?: string;
+    }
+
+    /**
+     * The Friend object contains info about a user's friends. A Friend object
+     * represents a user's contact whose is_friend value is set to true. The
+     * Live Connect REST API supports reading Friend objects.
+     */
+    interface IFriend {
+        /**
+         * The friend's ID.
+         */
+        id: string;
+        /**
+         * The friend's full name, formatted for locale.
+         */
+        name: string;
+    }
+
+    /**
+     * The Permissions object contains a list of scopes, showing those scopes to
+     * which the user has consented. The response body contains a JSON object
+     * that lists all consented scopes as a name/value pair. Each scope to which
+     * the user consented is present as a key.
+     */
+    interface IPermissions {
+        [scope: string]: number;
+    }
+
+    /**
+     * Information about an image.
+     */
+    interface IImageInfo {
+        /**
+         * The height, in pixels, of this image of this particular size.
+         */
+        height: number;
+        /**
+         * The width, in pixels, of this image of this particular size.
+         */
+        width: number;
+        /**
+         * The width, in pixels, of this image of this particular size.
+         */
+        source: string;
+        /**
+         * The type of this image of this particular size. Valid values are:
+         * full (maximum size: 2048 � 2048 pixels)
+         * - normal (maximum size 800 � 800 pixels)
+         * - album (maximum size 176 � 176 pixels)
+         * - small (maximum size 96 � 96 pixels)
+         */
+        type: string;
+    }
+
+    /**
+     * Represents location information.
+     */
+    interface ILocation {
+        /**
+         * The latitude portion of the location, expressed as positive (north)
+         * or negative (south) degrees relative to the equator.
+         */
+        latitude: number;
+        /**
+         * The longitude portion of the location expressed as positive (east) or
+         * negative (west) degrees relative to the Prime Meridian.
+         */
+        longitude: number;
+        /**
+         * The altitude portion of the location, expressed as positive (above)
+         * or negative (below) values relative to sea level, in units of
+         * measurement as determined by the camera.
+         */
+        altitude: number;
+    }
+
+    /**
+     * The Photo object contains info about a user's photos on SkyDrive. The
+     * Live Connect REST API supports creating, reading, updating, and deleting
+     * Photo objects. Use the wl.photos scope to read Photo objects. Use the
+     * wl.contacts_photos scope to read any albums, photos, videos, and audio
+     * that other users have shared with the user. Use the wl.skydrive_update
+     * scope to create, update, or delete Photo objects.
+     */
+    interface IPhoto {
+        /**
+         * The Photo object's ID.
+         */
+        id: string;
+        /**
+         * Info about the user who uploaded the photo.
+         */
+        from: IUserInfo;
+        /**
+         * The file name of the photo.
+         */
+        name: string;
+        /**
+         * A description of the photo, or null if no description is specified.
+         */
+        description: string;
+        /**
+         * The ID of the folder where the item is stored.
+         */
+        parent_id: string;
+        /**
+         * The size, in bytes, of the photo.
+         */
+        size: number;
+        /**
+         * The number of comments associated with the photo.
+         */
+        comments_count: number;
+        /**
+         * A value that indicates whether comments are enabled for the photo. If
+         * comments can be made, this value is true; otherwise, it is false.
+         */
+        comments_enabled: boolean;
+        /**
+         * The number of tags on the photo.
+         */
+        tags_count: number;
+        /**
+         * A value that indicates whether tags are enabled for the photo. If
+         * users can tag the photo, this value is true; otherwise, it is false.
+         */
+        tags_enabled: boolean;
+        /**
+         * A value that indicates whether this photo can be embedded. If this
+         * photo can be embedded, this value is true; otherwise, it is false.
+         */
+        is_embeddable: boolean;
+        /**
+         * A URL of the photo's picture.
+         */
+        picture: string;
+        /**
+         * The download URL for the photo.
+         * Warning: This value is not persistent. Use it immediately after
+         * making the request, and avoid caching.
+         */
+        source: string;
+        /**
+         * The URL to upload photo content hosted in SkyDrive. This value is
+         * returned only if the wl.skydrive scope is present.
+         */
+        upload_location: string;
+        /**
+         * Info about various sizes of the photo.
+         */
+        images: IImageInfo[];
+        /**
+         * A URL of the photo, hosted in SkyDrive.
+         */
+        link: string;
+        /**
+         * The date, in ISO 8601 format, on which the photo was taken, or null
+         * if no date is specified.
+         */
+        when_taken: string;
+        /**
+         * The height, in pixels, of the photo.
+         */
+        height: number;
+        /**
+         * The width, in pixels, of the photo.
+         */
+        width: number;
+        /**
+         * The type of object; in this case, "photo".
+         */
+        type: string;
+        /**
+         * The location where the photo was taken.
+         * Note: The location object is not available for shared photos.
+         */
+        location: ILocation;
+        /**
+         * The manufacturer of the camera that took the photo.
+         */
+        camera_make: string;
+        /**
+         * The brand and model number of the camera that took the photo.
+         */
+        camera_model: string;
+        /**
+         * The f-number that the photo was taken at.
+         */
+        focal_ratio: number;
+        /**
+         * The focal length that the photo was taken at, typically expressed in
+         * millimeters for newer lenses.
+         */
+        focal_length: number;
+        /**
+         * The numerator of the shutter speed (for example, the "1" in "1/15 s")
+         * that the photo was taken at.
+         */
+        exposure_numerator: number;
+        /**
+         * The denominator of the shutter speed (for example, the "15" in "1/15
+         * s") that the photo was taken at.
+         */
+        exposure_denominator: number;
+        /**
+         * The object that contains permissions info for the photo.
+         */
+        shared_with: ISharedWith;
+        /**
+         * The time, in ISO 8601 format, at which the photo was created.
+         */
+        created_time: string;
+        /**
+         * The time, in ISO 8601 format, at which the photo was last updated.
+         */
+        updated_time: string;
+    }
+
+    /**
+     * The Search object contains info about the objects found in a user's
+     * SkyDrive that match the search query. See Search query parameters for
+     * info about formatting a search query request.
+     */
+    interface ISearch {
+        /**
+         * An array of file and folder objects found in a user's SkyDrive that
+         * match the search query.
+         */
+        data: IObject[];
+        /**
+         * The path strings that reference the next and previous sets in a
+         * paginated response.
+         */
+        paging?: {
+            /**
+             * Path string for the next set of results.
+             */
+            next?: string;
+            /**
+             * Path string for the previous set of results.
+             */
+            previous?: string;
+        };
+    }
+
+    /**
+     * The Tag object contains info about tags that are associated with a photo
+     * or a video on SkyDrive. The Live Connect REST API supports reading Tag
+     * objects. Use the wl.photos, and wl.skydrive scopes to read Tag objects.
+     * Use the wl.contacts_photos and wl.contacts_skydrive scopes to read the
+     * Tag objects that are associated with any photos that other users have
+     * shared with the user.
+     */
+    interface ITag {
+        /**
+         * The Tag object's ID.
+         */
+        id: string;
+        /**
+         * The user object for the tagged person.
+         */
+        user: IUserInfo;
+        /**
+         * The center of the tag's horizontal position, measured as a
+         * floating-point percentage from 0 to 100, from the left edge of the
+         * photo. This value is not returned for Video objects.
+         */
+        x: number;
+        /**
+         * The center of the tag's vertical position, measured as a
+         * floating-point percentage from 0 to 100, from the top edge of the
+         * photo. This value is not returned for Video objects.
+         */
+        y: number;
+        /**
+         * The time, in ISO 8601 format, at which the tag was created.
+         */
+        created_time: string;
+    }
+
+    /**
+     * Contains work information for one employer.
+     */
+    interface IWorkInfo {
+        /**
+         * Info about the user's employer.
+         */
+        employer: {
+            /**
+             * The name of the user's employer, or null if the employer's name
+             * is not specified.
+             */
+            name: string;
+        };
+        /**
+         * Info about the user's work position.
+         */
+        position: {
+            /**
+             * The name of the user's work position, or null if the name of the
+             * work position is not specified.
+             */
+            name: string;
+        };
+    }
+
+    /**
+     * Information about one postal address.
+     */
+    interface IPostalAddress {
+        /**
+         * The street address, or null if one is not specified.
+         */
+        street: string;
+        /**
+         * The second line of the street address, or null if one is not
+         * specified.
+         */
+        street_2: string;
+        /**
+         * The city of the address, or null if one is not specified.
+         */
+        city: string;
+        /**
+         * The state of the address, or null if one is not specified.
+         */
+        state: string;
+        /**
+         * The postal code of the address, or null if one is not specified.
+         */
+        postal_code: string;
+        /**
+         * The region of the address, or null if one is not specified.
+         */
+        region: string;
+    }
+
+    /**
+     * The User object contains info about a user. The Live Connect REST API
+     * supports reading User objects.
+     */
+    interface IUser {
+        /**
+         * The user's ID.
+         */
+        id: string;
+        /**
+         * The user's full name.
+         */
+        name: string;
+        /**
+         * The user's first name.
+         */
+        first_name: string;
+        /**
+         * The user's last name.
+         */
+        last_name: string;
+        /**
+         * The user's gender, or null if no gender is specified.
+         */
+        gender: string;
+        /**
+         * The URL of the user's profile page.
+         */
+        link: string;
+        /**
+         * The day of the user's birth date, or null if no birth date is
+         * specified.
+         */
+        birth_day: number;
+        /**
+         * The month of the user's birth date, or null if no birth date is
+         * specified.
+         */
+        birth_month: number;
+        /**
+         * The year of the user's birth date, or null if no birth date is
+         * specified.
+         */
+        birth_year: number;
+        /**
+         * An array that contains the user's work info.
+         */
+        work: IWorkInfo[];
+        /**
+         * The user's email addresses.
+         */
+        emails: {
+            /**
+             * The user's preferred email address, or null if one is not
+             * specified.
+             */
+            preferred: string;
+            /**
+             * The email address that is associated with the account.
+             */
+            account: string;
+            /**
+             * The user's personal email address, or null if one is not
+             * specified.
+             */
+            personal: string;
+            /**
+             * The user's business email address, or null if one is not
+             * specified.
+             */
+            business: string;
+            /**
+             * The user's "alternate" email address, or null if one is not
+             * specified.
+             */
+            other: string;
+        };
+        /**
+         * The user's postal addresses.
+         */
+        addresses: {
+            /**
+             * The user's personal postal address.
+             */
+            personal: IPostalAddress;
+            /**
+             * The user's business postal address.
+             */
+            business: IPostalAddress;
+        };
+        /**
+         * The user's phone numbers.
+         */
+        phones: {
+            /**
+             * The user's personal phone number, or null if one is not
+             * specified.
+             */
+            personal: string;
+            /**
+             * The user's business phone number, or null if one is not
+             * specified.
+             */
+            business: string;
+            /**
+             * The user's mobile phone number, or null if one is not specified.
+             */
+            mobile: string;
+        };
+        /**
+         * The user's locale code.
+         */
+        locale: string;
+        /**
+         * The time, in ISO 8601 format, at which the user last updated the
+         * object.
+         */
+        updated_time: string;
+    }
+
+    /**
+     * The Video object contains info about a user's videos on SkyDrive. The
+     * Live Connect REST API supports creating, reading, updating, and deleting
+     * Video objects. Use the wl.photos scope to read Video objects. Use the
+     * wl.contacts_photos scope to read albums, photos, and videos that other
+     * users have shared with the user. Use the wl.skydrive_update scope to
+     * create, update, or delete Video objects.
+     */
+    interface IVideo {
+        /**
+         * The Video object's ID.
+         */
+        id: string;
+        /**
+         * Info about the user who uploaded the video.
+         */
+        from: IUserInfo;
+        /**
+         * The file name of the video.
+         */
+        name: string;
+        /**
+         * A description of the video, or null if no description is specified.
+         */
+        description: string;
+        /**
+         * The id of the folder where the item is stored.
+         */
+        parent_id: string;
+        /**
+         * The size, in bytes, of the video.
+         */
+        size: number;
+        /**
+         * The number of comments that are associated with the video.
+         */
+        comments_count: number;
+        /**
+         * A value that indicates whether comments are enabled for the video. If
+         * comments can be made, this value is true; otherwise, it is false.
+         */
+        comments_enabled: boolean;
+        /**
+         * The number of tags on the video.
+         */
+        tags_count: number;
+        /**
+         * A value that indicates whether tags are enabled for the video. If
+         * tags can be set, this value is true; otherwise, it is false.
+         */
+        tags_enabled: boolean;
+        /**
+         * A value that indicates whether this video can be embedded. If this
+         * video can be embedded, this value is true; otherwise, it is false.
+         */
+        is_embeddable: boolean;
+        /**
+         * A URL of a picture that represents the video.
+         */
+        picture: string;
+        /**
+         * The download URL for the video.
+         * Warning: This value is not persistent. Use it immediately after
+         * making the request, and avoid caching.
+         */
+        source: string;
+        /**
+         * The URL to upload video content, hosted in SkyDrive. This value is
+         * returned only if the wl.skydrive scope is present.
+         */
+        upload_location: string;
+        /**
+         * A URL of the video, hosted in SkyDrive.
+         */
+        link: string;
+        /**
+         * The height, in pixels, of the video.
+         */
+        height: number;
+        /**
+         * The width, in pixels, of the video.
+         */
+        width: number;
+        /**
+         * The duration, in milliseconds, of the video run time.
+         */
+        duration: number;
+        /**
+         * The bit rate, in bits per second, of the video.
+         */
+        bitrate: number;
+        /**
+         * The type of object; in this case, "video".
+         */
+        type: string;
+        /**
+         * The object that contains permission info.
+         */
+        shared_with: ISharedWith;
+        /**
+         * The time, in ISO 8601 format, at which the video was created.
+         */
+        created_time: string;
+        /**
+         * The time, in ISO 8601 format, at which the video was last updated.
+         */
+        updated_time: string;
+    }
+
+    //#endregion REST Object Information
+
+    //#region API Properties Interfaces
+
+    /**
+     * 'Properties' object passed into the WL.api method.
+     */
+    interface IAPIProperties {
+        /**
+         * Contains the path to the REST API object. For information on
+         * specifying paths for REST objects, see REST reference.
+         * http://msdn.microsoft.com/en-us/library/live/hh243648.aspx
+         */
+        path: string;
+        /**
+         * An HTTP method that specifies the action required for the API call.
+         * These actions are standard REST API actions: "COPY", "GET", "MOVE",
+         * "PUT", "POST", and "DELETE".
+         * @default "GET"
+         */
+        method?: string;
+        /**
+         * A JSON object that specifies the REST API request body. The body
+         * property is used only for "POST" and "PUT" requests.
+         */
+        body?: any;
+    }
+
+    /**
+     * 'Properties' object passed into the WL.backgroundDownload method.
+     */
+    interface IBackgroundDownloadProperties {
+        /**
+         * The path to the file to download. For information on specifying paths
+         * for REST objects, see REST reference.
+         * http://msdn.microsoft.com/en-us/library/live/hh243648.aspx
+         */
+        path: string;
+        /**
+         * The file output object to which the downloaded file data is written.
+         */
+        file_output?: Windows.Storage.StorageFile;
+    }
+
+    /**
+     * 'Properties' object passed into the WL.backgroundUpload method.
+     */
+    interface IBackgroundUploadProperties {
+        /**
+         * The path to the file to upload.
+         */
+        path: string;
+        /**
+         * The name of the file to upload.
+         */
+        file_name?: string;
+        /**
+         * The file input object to read the file from. Can be a
+         * Windows.Storage.StorageFile or an IFile.
+         */
+        file_input?: any;
+        /**
+         * The file input stream to read the file from.
+         */
+        stream_input?: Windows.Storage.Streams.IInputStream;
+        /**
+         * Indicates whether the uploaded file should overwrite an existing
+         * copy. Specify "true" to overwrite, "false" to not overwrite and for
+         * the WL.backgroundUpload method call to fail, or "rename" to not
+         * overwrite and enable SkyDrive to assign a new name to the uploaded
+         * file.
+         * @default "false".
+         */
+        overwrite?: string;
+    }
+
+    /**
+     * 'Properties' object passed into the WL.download method.
+     */
+    interface IDownloadProperties {
+        /**
+         * The path to the file to download. For information on specifying paths
+         * for REST objects, see REST reference.
+         * http://msdn.microsoft.com/en-us/library/live/hh243648.aspx
+         */
+        path: string;
+    }
+
+    /**
+     * 'Properties' object passed into the WL.fileDialog method.
+     */
+    interface IFileDialogProperties {
+        /**
+         * Specifies the type of SkyDrive file picker to display. Specify "open"
+         * to display the download version of the file picker. Specify "save"
+         * to display the upload version of the file picker.
+         */
+        mode: string;
+        /**
+         * Specify only if the mode property is set to "open". Specifies how
+         * many files the user can select to download. Specify "single" for a
+         * single file. Specify "multi" for multiple files.
+         * @default "single"
+         */
+        select?: string;
+        /**
+         * The color pallette to use for the file picker. Specify "white",
+         * "grey", or "transparent".
+         * @default "white"
+         */
+        lightbox?: string;
+    }
+
+    /**
+     * 'Properties' object passed into the WL.init method.
+     */
+    interface IInitProperties {
+        /**
+         * Web apps: Required.
+         * Specifies your app's OAuth client ID for web apps.
+         *
+         * Windows Store apps using JavaScript: not needed.
+         */
+        client_id?: string;
+        /**
+         * Contains the default redirect URI to be used for OAuth
+         * authentication. For web apps, the OAuth server redirects to this URI
+         * during the OAuth flow.
+         *
+         * For Windows Store apps using JavaScript, specifying this value will
+         * enable the library to return the authentication token.
+         */
+        redirect_uri?: string;
+        /**
+         * The scope values used to determine which portions of user data the
+         * app has access to, if the user consents.
+         *
+         * For a single scope, use this format: scope: "wl.signin". For multiple
+         * scopes, use this format: scope: ["wl.signin", "wl.basic"].
+         */
+        scope?: any;
+        /**
+         * If set to "true", the library logs error info to the web browser
+         * console and notifies your app by means of the wl.log event.
+         * @default true
+         */
+        logging?: boolean;
+        /**
+         * Web apps: optional.
+         * Windows Store apps using JavaScript: not applicable.
+         * If set to "true", the library attempts to retrieve the user's sign-in
+         * status from Live Connect.
+         * @default true
+         */
+        status?: boolean;
+        /**
+         * Web apps: optional.
+         * Windows Store apps using JavaScript: not applicable.
+         * Specifies the OAuth response type value. If set to "token", the
+         * client receives the access token directly. If set to "code", the
+         * client receives an authorization code, and the app server that serves
+         * the redirect_uri page should retrieve the access_token from the OAuth
+         * server by using the authorization code and client secret.
+         *
+         * You can only set response_type to "code" for web apps.
+         * @default "token"
+         */
+        response_type?: string;
+        /**
+         * Web apps: optional.
+         * Windows Store apps using JavaScript: not applicable.
+         * If set to "true", the library specifies a secure attribute when
+         * writing a cookie on an HTTPS page.
+         * @default "false"
+         */
+        secure_cookie?: string;
+    }
+
+    /**
+     * 'Properties' object passed into the WL.login method.
+     */
+    interface ILoginProperties {
+        /**
+         * This parameter only applies to web apps.
+         * Contains the redirect URI to be used for OAuth authentication. This
+         * value overrides the default redirect URI that is provided in the call
+         * to WL.init.
+         */
+        redirect_uri?: string;
+        /**
+         * Specifies the scopes to which the user who is signing in consents.
+         *
+         * For a single scope, use this format: scope: "wl.signin". For multiple
+         * scopes, use this format: scope: ["wl.signin", "wl.basic"].
+         *
+         * If no scope is provided, the scope value of WL.init is used. If no
+         * scope is provided in WL.init or WL.login, WL.login returns an error.
+         *
+         * Note  WL.login can request the "wl.offline_access" scope, but it
+         * requires a server-side implementation, and the WL.init function must
+         * set its response_type property to "code". For more info, see
+         * Server-side scenarios.
+         * http://msdn.microsoft.com/en-us/library/live/hh243649.aspx
+         */
+        scope: any;
+        /**
+         * Windows Store apps using JavaScript: not applicable.
+         * Web apps: Optional. If the WL.init function's response_type object is
+         * set to "code" and the app uses server-flow authentication, the state
+         * object here can be used to track the web app's calling state on the
+         * web app server side. For more info, see the description of the state
+         * query parameter in the Server-side scenarios topic's "Getting an
+         * authorization code" section.
+         * http://msdn.microsoft.com/en-us/library/live/hh243649.aspx
+         */
+        state?: string;
+    }
+
+    /**
+     * 'Properties' object passed into the WL.ui method.
+     */
+    interface IUIProperties {
+        /**
+         * Specifies the type of button to display. Specify "signin" to display
+         * the Live Connect sign-in button. Specify "skydrivepicker" to display
+         * the SkyDrive button.
+         */
+        name: string;
+        /**
+         * The value of the id attribute of the <div> tag to display the button
+         * in.
+         */
+        element: string;
+        /**
+         * Windows Store apps using JavaScript: not applicable.
+         * Web apps: Optional. If the name property is set to "signin", the
+         * WL.init function's response_type property is set to "code", and the
+         * app uses server-flow authentication, the state object here can be
+         * used to track the web app's calling state on the web app server side.
+         * For more info, see the description of the state query parameter in
+         * the Server-side scenarios topic's "Getting an authorization code"
+         * section.
+         * http://msdn.microsoft.com/en-us/library/live/hh243649.aspx
+         */
+        state?: string;
+    }
+
+    /**
+     * 'Properties' object passed into the WL.ui method when 'name' is set to
+     * 'skydrivepicker'.
+     */
+    interface ISkyDrivePickerProperies extends IUIProperties {
+        /**
+         * The type of SkyDrive file picker button to display. Specify "save" to
+         * display the upload button. Specify "open" to display the download
+         * button.
+         */
+        mode: string;
+        /**
+         * Required if the mode property is set to "open". Specifies how many
+         * files the user can select to download. Specify "single" for a single
+         * file. Specify "multi" for multiple files.
+         * @default "single"
+         */
+        select?: string;
+        /**
+         * Defines the color pallette used for the file picker button. Valid
+         * values are "white" and "blue".
+         * @default "white"
+         */
+        theme?: string;
+        /**
+         * Defines the color pallette used for the file picker dialog box. Valid
+         * values are "white", "gray", and "transparent".
+         * @default "white"
+         */
+        lightbox?: string;
+        /**
+         * If the mode property is set to "save", specifies the function to call
+         * after the user clicks either Save or Cancel in the file picker. If
+         * the mode property is set to "open", specifies the function to call
+         * after the user clicks either Open or Cancel in the file picker.
+         */
+        onselected?: Function;
+        /**
+         * Specifies the function to call if the selected files cannot be
+         * successfully uploaded or downloaded.
+         */
+        onerror?: Function;
+    }
+
+    /**
+     * 'Properties' object passed into the WL.ui method when 'name' is set to
+     * 'signin'.
+     */
+    interface ISignInProperties extends IUIProperties {
+        /**
+         * Defines the brand, or type of icon, to be used with the Live Connect
+         * sign-in button.
+         * @default "windows"
+         */
+        brand?: string;
+        /**
+         * Defines the color pallette used for the sign-in button. For Windows
+         * Store apps using JavaScript, valid values are "dark" and "light".
+         * For web apps, valid values are "blue" and "white".
+         */
+        theme?: string;
+        /**
+         * Defines the type of button.
+         * @default "signin"
+         */
+        type?: string;
+        /**
+         * If the value of the type property is set to "custom", this value
+         * specifies the sign-in text to be displayed in the button.
+         */
+        sign_in_text?: string;
+        /**
+         * If the value of the type property is "custom", this value specifies
+         * the sign-out text to be displayed in the button.
+         */
+        sign_out_text?: string;
+        /**
+         * Specifies the function to call after the user completes the sign-in
+         * process.
+         */
+        onloggedin?: Function;
+        /**
+         * Specifies the function to call after the user completes the sign-out
+         * process.
+         */
+        onloggedout?: Function;
+        /**
+         * Specifies the function to call whenever there is any error while the
+         * sign-in control is initializing or while the user is signing in.
+         */
+        onerror?: Function;
+    }
+
+    /**
+     * 'Properties' object passed into the WL.upload method.
+     */
+    interface IUploadProperties {
+        /**
+         * The path to the file to upload.
+         */
+        path: string;
+        /**
+         * The id attribute of the <input> tag containing info about the file to
+         * upload.
+         */
+        element: string;
+        /**
+         * Indicates whether the uploaded file should overwrite an existing
+         * copy. Specify true or "true" to overwrite, false or "false" to not
+         * overwrite and for the WL.upload method call to fail, or "rename" to
+         * not overwrite and enable SkyDrive to assign a new name to the
+         * uploaded file.
+         * @default "false"
+         */
+        overwrite?: string;
+    }
+
+    //#endregion API Properties Interfaces
+
+    /**
+     * Represents the user's session.
+     */
+    interface ISession {
+        /**
+         * The user's access token.
+         */
+        access_token: string;
+        /**
+         * The authentication token.
+         */
+        authentication_token: string;
+        /**
+         * A list of scopes that the app has requested and that the user has
+         * consented to.
+         *
+         * Note: This property is not available for Windows Store apps using
+         * JavaScript.
+         */
+        scope?: string[];
+        /**
+         * The amount of time remaining, in seconds, until the user's access
+         * token expires.
+         *
+         * Note: This property is not available for Windows Store apps using
+         * JavaScript.
+         */
+        expires_in?: number;
+        /**
+         * The exact time when the session will expire. This time is expressed
+         * in the number of seconds since 1 January, 1970.
+         *
+         * Note: This property is not available for Windows Store apps using
+         * JavaScript.
+         */
+        expires?: number;
+    }
+
+    /**
+     * Represents the user's login status.
+     */
+    interface ILoginStatus {
+        /**
+         * The sign-in status of the user. Valid values are "connected",
+         * "notConnected", or "unknown".
+         */
+        status: string;
+        /**
+         * A JSON object that contains the properties of the current session.
+         */
+        session: ISession;
+    }
+
+    /**
+     * Represents the Microsoft.Live.API.Event object.
+     */
+    interface IEventAPI {
+        /**
+         * Adds a handler to an event.
+         * @param event Required. The name of the event to which to add a
+         *   handler.
+         * @param callback Required. Specifies the name of the callback function
+         *   to handle the event.
+         * @returns This function can return the following errors:
+         *   WL.Event.subscribe: The input parameter/property 'callback' must be
+         *   included.
+         *   WL.Event.subscribe: The input value for parameter/property 'event'
+         *   is not valid.
+         */
+        subscribe(event: string, callback: Function): void;
+        /**
+         * Removes a handler from an event.
+         * @param event Required. The name of the event from which to remove a
+         *   handler.
+         * @param callback Optional. Removes the callback function from the
+         *   event. If this parameter is omitted or is null, all callback
+         *   functions that are registered to the event are removed. Removes the
+         *   callback function from the specified event.
+         */
+        unsubscribe(event: string, callback?: Function): void;
+    }
+
+    /**
+     * Returned from a successful file picker operation.
+     */
+    interface IFilePickerResult {
+        /**
+         * Contains data concerning the user's picked files.
+         */
+        data: {
+            /**
+             * Information on files choden in the picker.
+             */
+            files?: IFile[];
+            /**
+             * Information on folders chosen in the picker.
+             */
+            folders?: IFolder[];
+        }
+    }
+
+    /**
+     * The promise API implemented by this library.
+     */
+    interface IPromise<T> {
+        /**
+         * Adds event listeners for particular events.
+         * @param onSuccess Called when the promised event successfully occurs.
+         * @param onError Called when the promised event fails to occur. Could
+         *   be an IError or an IJSError.
+         * @param onProgress Called to indicate that the promised event is
+         *   making progress toward completion.
+         */
+        then(onSuccess: (response: T) => void,
+            onError?: (error: any) => void,
+            onProgress?: (progress: any) => void): IPromise<T>;
+        /**
+         * Cancels the pending request represented by the Promise, and triggers
+         * the error callback if the promised event has not yet occurred.
+         */
+        cancel(): void;
+    }
+
+    /**
+     * An error returned by the JavaScript library, as opposed to an error
+     * object from the REST API (which we represent with IError).
+     */
+    interface IJSError {
+        /**
+         * The error code.
+         */
+        error: string;
+        /**
+         * A description of the error.
+         */
+        error_description: string;
+    }
+
+    /**
+     * The Live Connect JavaScript API (Windows 8 and web), together with the
+     * REST API, enables apps to read, update, and share user data by using the
+     * JavaScript programming language. The JavaScript API (Windows 8 and web)
+     * provides methods for signing users in and out, getting user status,
+     * subscribing to events, creating UI controls, and calling the
+     * Representational State Transfer (REST) API.
+     */
+    interface API {
+        /**
+         * Makes a call to the Live Connect Representational State Transfer
+         * (REST) API. This method encapsulates a REST API request, and then
+         * calls a callback function to process the response.
+         * @param properties Required. A JSON object that contains properties
+         *   that are necessary to make the REST API call.
+         * @param callback Specifies a callback function that is executed when
+         *   the REST API call is complete. The callback function takes the API
+         *   response object as a parameter. The response object exposes the
+         *   data returned from Live Connect, or, if an error occurs, an error
+         *   property that contains the error code.
+         * @returns Returns a Promise object. This object's then method provides
+         *   the onSuccess, onError, and onProgress parameters to enable your
+         *   code to handle a successful, failed, and in-progress call to the
+         *   corresponding WL.api method, respectively.
+         */
+        api<T>(properties: IAPIProperties,
+              callback?: (response: any) => void): IPromise<T>;
+        /**
+         * Makes a call to download a file from Microsoft SkyDrive.
+         *
+         * **Important**:  WL.backgroundDownload is supported only for use with
+         * Windows Store apps using JavaScript. If you are writing a web app,
+         * use WL.download instead.
+         * @param properties Required. A JSON object that contains properties
+         *   that are necessary to make the REST API call.
+         * @param Optional. Specifies a callback function that is executed when
+         *   the REST API call is complete. The callback function takes the API
+         *   response object as a parameter. The response object exposes the
+         *   data that is returned from Live Connect, or, if an error occurs, an
+         *   error property that contains the error code.
+         * @returns Returns a Promise object. This object's then method accepts
+         *   callback functions for onSuccess, onError, and onProgress to enable
+         *   your code to handle a successful, failed, and in-progress call to
+         *   the corresponding WL.download method, respectively.
+         *   The onSuccess callback is passed a response object that contains
+         *   content_type and stream properties, representing the downloaded
+         *   file's content type and file stream, respectively.
+         */
+        backgroundDownload<T>(properties: IBackgroundDownloadProperties,
+            callback?: (response: any) => void): IPromise<T>;
+        /**
+         * Makes a call to upload a file to Microsoft SkyDrive.
+         *
+         * **Important**: WL.backgroundUpload is supported only for use with
+         * Windows Store apps using JavaScript. If you are writing a web app,
+         * use WL.upload instead.
+         * @param properties Required. A JSON object that contains properties
+         *   that are necessary to make the REST API call.
+         * @param callback Optional. Specifies a callback function that is
+         *   executed when the REST API call is complete. The callback function
+         *   takes the API response object as a parameter. The response object
+         *   exposes the data returned from Live Connect, or if an error occurs,
+         *   an error property that contains the error code.
+         * @returns Returns a Promise object. For Windows Store apps using
+         *   JavaScript, this object's then method accepts callback functions
+         *   for onSuccess, onError, and onProgress to enable your code to
+         *   handle a successful, failed, and in-progress call to the
+         *   corresponding WL.backgroudUpload method, respectively.
+         */
+        backgroundUpload<T>(properties: IBackgroundUploadProperties,
+            callback?: (response: any) => void): IPromise<T>;
+        /**
+         * Specifies whether the current user can be signed out of his or her
+         * Microsoft account.
+         *
+         * For Windows Store apps using JavaScript, you can use this function to
+         * determine whether you should display a control to the user to enable
+         * him or her to sign out of his or her Microsoft account. If this
+         * function returns true, you should display the control. However, if
+         * this function returns false, you should not display this control, as
+         * attempting to sign out the user in this case will have no effect.
+         *
+         * For web apps, this function always returns true.
+         * @returns Returns true if the user can be signed out; otherwise,
+         *   returns false if the user can't be signed out.
+         */
+        canLogout(): boolean;
+        /**
+         * Makes a call to download a file from Microsoft SkyDrive.
+         *
+         * **Important**: WL.download is supported only for use with web apps.
+         * If you are writing a Windows Store app using JavaScript, use
+         * WL.backgroundDownload instead.
+         * @param properties Required. A JSON object that contains properties
+         *   that are necessary to make the REST API call.
+         * @param callback Specifies a callback function that is executed when
+         *   the REST API call is complete. The callback function takes the API
+         *   response object as a parameter. The response object exposes the
+         *   data that is returned from Live Connect, or, if an error occurs, an
+         *   error property that contains the error code.
+         * @returns Returns a Promise object. This object's then method provides
+         *   the onError parameter to enable your code to handle a failed call
+         *   to the corresponding WL.download method.
+         */
+        download(properties: IDownloadProperties,
+            callback?: (response: any) => void): IPromise<void>;
+        Event: IEventAPI;
+        /**
+         * Displays the Microsoft SkyDrive file picker, which enables
+         * JavaScript-based web apps to display a pre-built, consistent user
+         * interface that enables a user to select files to upload and download
+         * to and from his or her SkyDrive storage location.
+         * @param properties Required. A JSON object containing properties for
+         *   displaying the button.
+         * @param callback Optional. A callback function that is executed after
+         *   the user finishes interacting with the SkyDrive file picker.
+         * @returns Returns a Promise object. This object's then method provides
+         *   the onSuccess and onError parameters to enable your code to handle
+         *   a successful and failed call to the corresponding WL.fileDialog
+         *   method, respectively.
+         */
+        fileDialog(properties: IFileDialogProperties,
+            callback?: (response: any) => void): IPromise<IFilePickerResult>;
+        /**
+         * Returns the sign-in status of the current user. If the user is signed
+         * in and connected to your app, this function returns the session
+         * object. This is an asynchronous function that returns the user's
+         * status by contacting the Live Connect authentication web service.
+         * @param callback Returns the sign-in status of the current user. If
+         *   the user is signed in and connected to your app, this function
+         *   returns the session object. This is an asynchronous function that
+         *   returns the user's status by contacting the Live Connect
+         *   authentication web service.
+         * @param force Optional. If set to "true", the function contacts the
+         *   Live Connect authentication web service to determine the user's
+         *   status. If set to "false" (the default), the function can return
+         *   the user status that is currently in memory, if there is one. If
+         *   the user's status has already been retrieved, the library can
+         *   return the cached value. However, you can force the library to
+         *   retrieve current status by setting the force parameter to "true".
+         * @returns Returns a Promise object. This object's then method provides
+         *   the onSuccess and onError parameters to enable your code to handle
+         *   a successful and failed call to the corresponding WL.getLoginStatus
+         *   method, respectively.
+         *   In the body of the onSuccess function, a status object is returned,
+         *   which contains the user's sign-in status and the session object.
+         */
+        getLoginStatus(callback?: (status: ILoginStatus) => void,
+            force?: boolean): IPromise<ILoginStatus>;
+        /**
+         * Retrieves the current session object synchronously, if a session
+         * object exists. For situations in which performance is critical, such
+         * as page loads, use the asynchronous WL.getLoginStatus method instead.
+         * @returns Returns the current session as a session object instance.
+         */
+        getSession(): ISession;
+        /**
+         * Initializes the JavaScript library. An app must call this function on
+         * every page before making other function calls in the library. The app
+         * should call this function before making function calls that subscribe
+         * to events. If the JavaScript library has already been initialized on
+         * the page, calling this function succeeds silently; the client_id and
+         * redirect_uri parameters are not validated.
+         * @param properties Required. A JSON object with initialization
+         *   properties.
+         * @returns Returns a Promise object. This object's then method provides
+         *   the onSuccess and onError parameters to enable your code to handle
+         *   a successful and failed call to the corresponding WL.init method,
+         *   respectively.
+         *   When the onSuccess callback is invoked, a login status object is
+         *   passed in as parameter that indicates the current user's login
+         *   status.
+         */
+        init(properties: IInitProperties): IPromise<ILoginStatus>;
+        /**
+         * Signs in the user or expands the user's list of scopes. Because this
+         * function can result in launching the consent page prompt, you should
+         * call it only in response to a user action, such as clicking a button.
+         * Otherwise, the user's web browser might block the popup.
+         *
+         * Typically, this function is used by apps that define their own
+         * sign-in controls, or by apps that ask users to grant additional
+         * permissions during an activity. For example, to enable a user to post
+         * his or her status to Live Connect, your app may have to prompt the
+         * user for permission and call this function with an expanded scope.
+         *
+         * If you call this function when the user has already consented to the
+         * requested scope and is already signed in, the callback function is
+         * invoked immediately with the current session.
+         * This function logs errors to the web browser console.
+         * @param properties Required. A JSON object with login properties.
+         * @param callback Optional. Specifies a callback function to execute
+         *   when sign-in is complete. The callback function takes the status
+         *   object as a parameter. For a description of the status object, see
+         *   WL.getLoginStatus. If you do not specify a callback function, your
+         *   app can still get the sign-in callback info by listening for an
+         *   auth.sessionChange or auth.statusChange event.
+         * @returns Returns a Promise object. This object's then method provides
+         *   the onSuccess, onError, and onProgress parameters to enable your
+         *   code to handle a successful, failed, and in-progress call to the
+         *   corresponding WL.login method, respectively.
+         */
+        login(properties: ILoginProperties,
+            callback?: (status: any) => void): IPromise<ILoginStatus>;
+        /**
+         * Signs the user out of Live Connect and clears any user state that is
+         * maintained by the JavaScript library, such as cookies. If the user
+         * account is connected, this function logs out the user from the app,
+         * but not from the PC. This function is useful primarily for websites
+         * that do not use the sign-in control.
+         * @param callback Optional. Specifies a callback function that is
+         *   executed when sign-out is complete. The callback function takes the
+         *   status object as a parameter. For a description of the status
+         *   object, see WL.getLoginStatus. If you do not specify a callback
+         *   function, your app can still get the sign-out callback info by
+         *   listening for an auth.sessionChange or auth.statusChange event.
+         * @returns Returns a Promise object. This object's then method provides
+         *   the onSuccess, onError, and onProgress parameters to enable your
+         *   code to handle a successful, failed, and in-progress call to the
+         *   corresponding WL.logout method, respectively.
+         */
+        logout(callback?: (status: ILoginStatus) => void): IPromise<ILoginStatus>;
+        /**
+         * Displays either the Live Connect sign-in button or the Microsoft
+         * SkyDrive file picker button. The sign-in button either prompts the
+         * user for his or her Microsoft account credentials if he or she is not
+         * signed in or else signs out the user if he or she is signed in. The
+         * file picker button displays the SkyDrive file picker to help the user
+         * select files to upload or download to or from his or her SkyDrive
+         * storage location.
+         * @param properties Required. A JSON object containing properties for
+         *   displaying the button.
+         * @param callback Optional. A callback function that is executed after
+         *   the sign-in button or file picker button is displayed.
+         *   Note: Do not use the callback parameter to run code after the user
+         *   finishes interacting with the sign-in button or file picker. Use a
+         *   combination of the onselected, onloggedin, onloggedout, and onerror
+         *   properties as previously described.
+         */
+        ui(properties: IUIProperties, callback?: () => void): void;
+        /**
+         * Makes a call to upload a file to Microsoft SkyDrive.
+         *
+         * **Important**: WL.upload is supported only for use with web apps. If
+         * you are writing a Windows Store app using JavaScript, use
+         * WL.backgroundUpload instead.
+         * @param properties Required. A JSON object that contains properties
+         *   that are necessary to make the REST API call.
+         * @param callback Optional. Specifies a callback function that is
+         *   executed when the REST API call is complete. The callback function
+         *   takes the API response object as a parameter. The response object
+         *   exposes the data returned from Live Connect, or if an error occurs,
+         *   an error property that contains the error code.
+         * @returns Returns a Promise object. This object's then method provides
+         *   the onSuccess, onError, and onProgress parameters to enable your
+         *   code to handle a successful, failed, and in-progress call to the
+         *   corresponding WL.upload method, respectively; however, the
+         *   onProgress parameter applies to newer web browsers such as Internet
+         *   Explorer 10 only.
+         */
+        upload<T>(properties: IUploadProperties,
+            callback?: (response: any) => void): IPromise<T>;
+    }
+}
+
+/**
+ * The WL object is a global object that encapsulates all functions of the
+ * JavaScript API (Windows 8 and web). Your app uses the WL object to call all
+ * of the JavaScript API (Windows 8 and web) functions.
+ */
+declare var WL: Microsoft.Live.API;
diff --git a/microsoft-live-connect/microsoft-live-connect-tests.ts b/microsoft-live-connect/microsoft-live-connect-tests.ts
index 00f2208f09..fad350e47c 100644
--- a/microsoft-live-connect/microsoft-live-connect-tests.ts
+++ b/microsoft-live-connect/microsoft-live-connect-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="microsoft-live-connect.d.ts" />
+
 
 /**
  * From: http://msdn.microsoft.com/en-us/library/live/hh550838.aspx
diff --git a/microsoft-live-connect/microsoft-live-connect-tests.ts.tscparams b/microsoft-live-connect/microsoft-live-connect-tests.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/microsoft-live-connect/microsoft-live-connect-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/microsoft-live-connect/microsoft-live-connect.d.ts b/microsoft-live-connect/microsoft-live-connect.d.ts
deleted file mode 100644
index 8cffeabd97..0000000000
--- a/microsoft-live-connect/microsoft-live-connect.d.ts
+++ /dev/null
@@ -1,2339 +0,0 @@
-// Type definitions for Microsoft Live Connect v5.0
-// Project: http://msdn.microsoft.com/en-us/library/live/hh243643.aspx
-// Definitions by: John Vilk <https://github.com/jvilk/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../winjs/winjs.d.ts" />
-/// <reference path="../winrt/winrt.d.ts" />
-
-declare namespace Microsoft.Live {
-    //#region REST Object Information
-
-    /**
-     * Sub object of REST objects that contains information about a user.
-     */
-    interface IUserInfo {
-        /**
-         * The name of the user.
-         */
-        name: string;
-        /**
-         * The Live ID of the user.
-         */
-        id: string;
-    }
-
-    /**
-     * Sub object of REST objects that contains information about who the
-     * item is shared with.
-     */
-    interface ISharedWith {
-        /**
-         * A localized string that contains info about who can access the
-         * item. The options are:
-         * - People I selected
-         * - Just me
-         * - Everyone (public)
-         * - Friends
-         * - My friends and their friends
-         * - People with a link
-         * The default is Just me.
-         */
-        access: string;
-    }
-
-    /**
-     * Convenience interface for when you have a bunch of objects of different
-     * types in a single collection. You discriminate between them using their
-     * 'type' field.
-     */
-    interface IObject {
-        /**
-         * The object's type.
-         */
-        type: string;
-    }
-
-    /**
-     * Contains a collection of one type of object.
-     */
-    interface IObjectCollection<T> {
-        /**
-         * An array container for objects when a collection of objects is
-         * returned.
-         */
-        data: T[];
-    }
-
-    /**
-     * The Album object contains info about a user's albums in Microsoft
-     * SkyDrive. Albums are stored at the root level of a user's SkyDrive
-     * directory, and can contain combinations of photos, videos, audio, files,
-     * and folders. The Live Connect REST API supports reading Album objects.
-     * Use the wl.photos scope to read a user's Album objects. Use the
-     * wl.skydrive scope to read a user's files. Use the wl.contacts_photos
-     * scope to read any albums, photos, videos, and audio that other users have
-     * shared with the user.
-     */
-    interface IAlbum {
-        /**
-         * The Album object's ID.
-         */
-        id: string;
-        /**
-         * Info about the user who authored the album.
-         */
-        from: IUserInfo;
-        /**
-         * The name of the album.
-         */
-        name: string;
-        /**
-         * A description of the album, or null if no description is specified.
-         */
-        description: string;
-        /**
-         * The resource ID of the parent.
-         */
-        parent_id: string;
-        /**
-         * The URL to upload items to the album, hosted in SkyDrive. Requires
-         * the wl.skydrive scope.
-         */
-        upload_location: string;
-        /**
-         * A value that indicates whether this album can be embedded. If this
-         * album can be embedded, this value is true; otherwise, it is false.
-         */
-        is_embeddable: boolean;
-        /**
-         * The total number of items in the album.
-         */
-        count: number;
-        /**
-         * A URL of the album, hosted in SkyDrive.
-         */
-        link: string;
-        /**
-         * The type of object; in this case, "album".
-         */
-        type: string;
-        /**
-         * The object that contains permissions info for the album. Requires the
-         * wl.skydrive scope.
-         */
-        shared_with: ISharedWith;
-        /**
-         * The time, in ISO 8601 format, at which the album was created.
-         */
-        created_time: string;
-        /**
-         * The time, in ISO 8601 format, that the system updated the album last.
-         */
-        updated_time: string;
-        /**
-         * The time, in ISO 8601 format, that the file was last updated.
-         */
-        client_updated_time: string;
-    }
-
-    /**
-     * Represents a new album.
-     */
-    interface INewAlbum {
-        /**
-         * The name of the album.
-         */
-        name: string;
-        /**
-         * A description of the album.
-         */
-        description?: string;
-    }
-
-    /**
-     * The Audio object contains info about a user's audio in SkyDrive. The Live
-     * Connect REST API supports creating, reading, updating, and deleting Audio
-     * objects. Use the wl.skydrive scope to read Audio objects. Use the
-     * wl.contacts_skydrive scope to read any audio that other users have shared
-     * with the user. Use the wl.skydrive_update scope to create, update, or
-     * delete Audio objects.
-     */
-    interface IAudio {
-        /**
-         * The Audio object's ID.
-         */
-        id: string;
-        /**
-         * Info about the user who uploaded the audio.
-         */
-        from: IUserInfo;
-        /**
-         * The name of the audio.
-         */
-        name: string;
-        /**
-         * A description of the audio, or null if no description is specified.
-         */
-        description: string;
-        /**
-         * The id of the folder in which the audio is currently stored.
-         */
-        parent_id: string;
-        /**
-         * The size, in bytes, of the audio.
-         */
-        size: number;
-        /**
-         * The URL to use to upload a new audio to overwrite the existing audio.
-         */
-        upload_location: string;
-        /**
-         * The number of comments associated with the audio.
-         */
-        comments_count: number;
-        /**
-         * A value that indicates whether comments are enabled for the audio. If
-         * comments can be made, this value is true; otherwise, it is false.
-         */
-        comments_enabled: boolean;
-        /**
-         * A value that indicates whether this audio can be embedded. If this
-         * audio can be embedded, this value is true; otherwise, it is false.
-         */
-        is_embeddable: boolean;
-        /**
-         * The URL to use to download the audio from SkyDrive.
-         * Warning
-         * This value is not persistent. Use it immediately after making the
-         * request, and avoid caching.
-         */
-        source: string;
-        /**
-         * A URL to view the item on SkyDrive.
-         */
-        link: string;
-        /**
-         * The type of object; in this case, "audio".
-         */
-        type: string;
-        /**
-         * The audio's title.
-         */
-        title: string;
-        /**
-         * The audio's artist name.
-         */
-        artist: string;
-        /**
-         * The audio's album name.
-         */
-        album: string;
-        /**
-         * The artist name of the audio's album.
-         */
-        album_artist: string;
-        /**
-         * The audio's genre.
-         */
-        genre: string;
-        /**
-         * The audio's playing time, in milliseconds.
-         */
-        duration: number;
-        /**
-         * A URL to view the audio's picture on SkyDrive.
-         */
-        picture: string;
-        /**
-         * The object that contains permission info.
-         */
-        shared_with: ISharedWith;
-        /**
-         * The time, in ISO 8601 format, at which the audio was created.
-         */
-        created_time: string;
-        /**
-         * The time, in ISO 8601 format, at which the audio was last updated.
-         */
-        updated_time: string;
-    }
-
-    /**
-     * Represents a new audio item.
-     */
-    interface INewAudio {
-        /**
-         * The name of the audio.
-         */
-        name: string;
-        /**
-         * A description of the audio.
-         */
-        description?: string;
-        /**
-         * The audio's title.
-         */
-        title?: string;
-        /**
-         * The audio's artist name.
-         */
-        artist?: string;
-        /**
-         * The audio's album name.
-         */
-        album?: string;
-        /**
-         * The artist name of the audio's album.
-         */
-        album_artist?: string;
-        /**
-         * The audio's genre.
-         */
-        genre?: string;
-    }
-
-    /**
-     * The Calendar object contains info about a user's Outlook.com calendar.
-     * The Live Connect REST API supports creating, reading, updating, and
-     * deleting calendars. Use the wl.calendars scope to read a user's Calendar
-     * objects. Use the wl.calendars_update scope to create Calendar objects for
-     * a user. Use the wl.contacts_calendars scope to read a user's friends'
-     * Calendar objects.
-     */
-    interface ICalendar {
-        /**
-         * The Calendar object's ID.
-         */
-        id: string;
-        /**
-         * Name of the calendar.
-         */
-        name: string;
-        /**
-         * Description of the calendar.
-         */
-        description: string;
-        /**
-         * The time, in ISO 8601 format, at which the calendar was created.
-         */
-        created_time: string;
-        /**
-         * The time, in ISO 8601 format, that the calendar was last updated.
-         */
-        updated_time: string;
-        /**
-         * Info about the user who owns the calendar.
-         */
-        from: IUserInfo;
-        /**
-         * A value that indicates whether this calendar is the default calendar.
-         * If this calendar is the default calendar, this value is true;
-         * otherwise, it is false.
-         */
-        is_default: boolean;
-        /**
-         * A public subscription URL with which Live Connect will synchronize
-         * properties and events periodically for this calendar. A NULL value
-         * indicates that this is not a subscribed calendar.
-         */
-        subscription_location: string;
-        /**
-         * Role and permissions that are granted to the user for the calendar.
-         * The possible values are:
-         * - free_busy: The user can see only free/busy info.
-         * - limited_details: The user can see a subset of all details.
-         * - read: The user can only read the content of the calendar events.
-         * - read_write: The user can read and write calendar and events.
-         * - co_owner: The user is co-owner of this calendar.
-         * - owner: The user is the owner of this calendar.
-         */
-        permissions: string;
-    }
-
-    /**
-     * Represents a new calendar item.
-     */
-    interface INewCalendar {
-        /**
-         * Name of the calendar.
-         */
-        name: string;
-        /**
-         * Description of the calendar.
-         */
-        description?: string;
-    }
-
-    /**
-     * Represents a request to create a new calendar that subscribes to the
-     * given iCal calendar.
-     */
-    interface INewCalendarSubscription {
-        /**
-         * Name of the calendar.
-         */
-        name: string;
-        /**
-         * A public subscription URL with which Live Connect will synchronize
-         * properties and events periodically for this calendar.
-         */
-        subscription_location: string;
-    }
-
-    /**
-     * The Comment object contains info about comments that are associated with
-     * a photo, audio, or video on SkyDrive. The Live Connect REST API supports
-     * reading Comment objects. Use the wl.photos scope to read Comment objects.
-     * Use the wl.contacts_photos scope to read the Comment objects that are
-     * associated with any albums, photos, and videos that other users have
-     * shared with the user.
-     */
-    interface IComment {
-        /**
-         * The Comment object's id.
-         */
-        id: string;
-        /**
-         * Info about the user who created the comment.
-         */
-        from: IUserInfo;
-        /**
-         * The text of the comment. The maximum length of a comment is 10,000
-         * characters.
-         */
-        message: string;
-        /**
-         * The time, in ISO 8601 format, at which the comment was created.
-         */
-        created_time: string;
-    }
-
-    /**
-     * Represents a new comment.
-     */
-    interface INewComment {
-        /**
-         * The text of the comment. The maximum length of a comment is 10,000
-         * characters.
-         */
-        message: string;
-    }
-
-    /**
-     * The Contact object contains info about a user's Outlook.com contacts. The
-     * Live Connect REST API supports reading Contact objects.
-     */
-    interface IContact {
-        /**
-         * The Contact object's ID.
-         */
-        id: string;
-        /**
-         * The contact's first name, or null if no first name is specified.
-         */
-        first_name: string;
-        /**
-         * The contact's last name, or null if no last name is specified.
-         */
-        last_name: string;
-        /**
-         * The contact's full name, formatted for location.
-         */
-        name: string;
-        /**
-         * A value that indicates whether the contact is set as a friend. If the
-         * contact is a friend, this value is true; otherwise, it is false.
-         */
-        is_friend: boolean;
-        /**
-         * A value that indicates whether the contact is set as a favorite
-         * contact. If the contact is a favorite, this value is true; otherwise,
-         * it is false.
-         */
-        is_favorite: boolean;
-        /**
-         * The contact's ID, if the contact has one. If not, this value is null.
-         */
-        user_id: string;
-        /**
-         * An array containing a SHA-256 hash for each of the contact's email
-         * addresses. For more info, see Friend finder.
-         */
-        email_hashes: string[];
-        /**
-         * The time, in ISO 8601 format, at which the user last updated the
-         * data.
-         */
-        updated_time: string;
-        /**
-         * The day of the contact's birth date, or null if no birth date is
-         * specified.
-         */
-        birth_day: number;
-        /**
-         * The month of the contact's birth date, or null if no birth date is
-         * specified.
-         */
-        birth_month: number;
-    }
-
-    /**
-     * Represents a new contact.
-     */
-    interface INewContact {
-        /**
-         * The contact's first name.
-         */
-        first_name?: string;
-        /**
-         * The contact's last name.
-         */
-        last_name?: string;
-        /**
-         * An array that contains the contact's work info.
-         */
-        work?: {
-            employer: {
-                name: string;
-            }
-        }[];
-        /**
-         * The contact's email addresses.
-         */
-        emails?: {
-            /**
-             * The contact's preferred email address.
-             */
-            preferred?: string;
-            /**
-             * The contact's personal email address.
-             */
-            personal?: string;
-            /**
-             * The contact's business email address.
-             */
-            business?: string;
-            /**
-             * The contact's "alternate" email address.
-             */
-            other?: string;
-        };
-    }
-
-    /**
-     * The Error object contains info about an error that is returned by the
-     * Live Connect APIs.
-     */
-    interface IError {
-        /**
-         * Info about the error.
-         */
-        error: {
-            /**
-             * The error code.
-             */
-            code: string;
-            /**
-             * The error message.
-             */
-            message: string;
-        };
-    }
-
-    /**
-     * The Event object contains info about events on a user's Outlook.com
-     * calendars. The Live Connect REST API supports creating Event objects. Use
-     * the wl.events_create scope to create Event objects on the user's default
-     * calendar only. Use the wl.calendars scope to read Event objects on the
-     * user's calendars. Use wl.calendars_update to create Event objects on any
-     * of the user's calendars. Use the wl.contacts_calendars scope to read
-     * Event objects from the user's friend's calendars.
-     */
-    interface IEvent {
-        /**
-         * The ID of the event.
-         */
-        id: string;
-        /**
-         * The name of the event, with a maximum length of 255 characters. This
-         * structure is required.
-         */
-        name: string;
-        /**
-         * The time, in ISO 8601 format, at which the event was created.
-         */
-        created_time: string;
-        /**
-         * The time, in ISO 8601 format, at which the event was updated. This
-         * structure is visible only in the Event object that is returned if the
-         * event was successfully created.
-         */
-        updated_time: string;
-        /**
-         * A description of the event, with a maximum length of 32,768
-         * characters. This structure is required.
-         */
-        description: string;
-        /**
-         * The ID of the calendar that contains the event.
-         */
-        calendar_id: string;
-        /**
-         * The object that contains the name and ID of the organizer.
-         */
-        from: IUserInfo;
-        /**
-         * The start time, in ISO 8601 format, of the event. When the event is
-         * being read, the time will be the user's local time, in ISO 8601
-         * format.
-         */
-        start_time: string;
-        /**
-         * The end time, in ISO 8601 format, of the event. If no end time is
-         * specified, the default value is 30 minutes after start_time. This
-         * structure is optional when creating an event. When the event is being
-         * read, the time will be the user's local time, in ISO 8601 format.
-         */
-        end_time: string;
-        /**
-         * The name of the location at which the event will take place. The
-         * maximum length is 1,000 characters.
-         */
-        location: string;
-        /**
-         * A value that specifies whether the event is an all-day event. If the
-         * event is an all-day event, this value is true; otherwise, it is
-         * false. If this structure is missing, the default value is false.
-         */
-        is_all_day_event: boolean;
-        /**
-         * A value that specifies whether the event is recurring. If the event
-         * is recurring, this value is true; otherwise, it is false.
-         */
-        is_recurrent: boolean;
-        /**
-         * The text description of the recurrence pattern, for example, "Occurs
-         * every week on Tuesday". The value is Null if this is not a recurrent
-         * event.
-         */
-        recurrence: string;
-        /**
-         * The time, in minutes, before the event for the reminder alarm.
-         */
-        reminder_time: number;
-        /**
-         * The user's availability status for the event. Valid values are:
-         * - free
-         * - busy
-         * - tentative
-         * - out_of_office
-         * @default "free"
-         */
-        availability: string;
-        /**
-         * A value that specifies whether the event is publicly visible. Valid
-         * values are:
-         * - public�the event is visible to anyone who can view the calendar.
-         * - private"�the event is visible only to the event owner.
-         * @default "public"
-         */
-        visibility: string;
-    }
-
-    /**
-     * Represents a new event.
-     */
-    interface INewEvent {
-        /**
-         * The name of the event, with a maximum length of 255 characters. This
-         * structure is required.
-         */
-        name: string;
-        /**
-         * A description of the event, with a maximum length of 32,768
-         * characters. This structure is required.
-         */
-        description: string;
-        /**
-         * The start time of the event. When the event is being read, the time
-         * will be the user's local time, in ISO 8601 format.
-         * Can be a date string, or a Date object.
-         */
-        start_time: any;
-        /**
-         * The end time of the event. If no end time is specified, the default
-         * value is 30 minutes after start_time. This structure is optional when
-         * creating an event. When the event is being read, the time will be the
-         * user's local time, in ISO 8601 format.
-         * Can be a date string, or a Date object.
-         */
-        end_time?: any;
-        /**
-         * The name of the location at which the event will take place. The
-         * maximum length is 1,000 characters.
-         */
-        location?: string;
-        /**
-         * A value that specifies whether the event is an all-day event. If the
-         * event is an all-day event, this value is true; otherwise, it is
-         * false. If this structure is missing, the default value is false.
-         */
-        is_all_day_event?: boolean;
-        /**
-         * The time, in minutes, before the event for the reminder alarm.
-         */
-        reminder_time?: number;
-        /**
-         * The user's availability status for the event. Valid values are:
-         * - free
-         * - busy
-         * - tentative
-         * - out_of_office
-         * @default "free"
-         */
-        availability?: string;
-        /**
-         * A value that specifies whether the event is publicly visible. Valid
-         * values are:
-         * - public�the event is visible to anyone who can view the calendar.
-         * - private"�the event is visible only to the event owner.
-         * @default "public"
-         */
-        visibility?: string;
-    }
-
-    /**
-     * Response received after successfully creating a new event.
-     */
-    interface INewEventResponse {
-        /**
-         * The name of the event, with a maximum length of 255 characters. This
-         * structure is required.
-         */
-        name: string;
-        /**
-         * A description of the event, with a maximum length of 32,768
-         * characters. This structure is required.
-         */
-        description: string;
-        /**
-         * The start time, in ISO 8601 format, of the event. When the event is
-         * being read, the time will be the user's local time, in ISO 8601
-         * format.
-         */
-        start_time: string;
-        /**
-         * The end time, in ISO 8601 format, of the event. If no end time is
-         * specified, the default value is 30 minutes after start_time. This
-         * structure is optional when creating an event. When the event is being
-         * read, the time will be the user's local time, in ISO 8601 format.
-         */
-        end_time: string;
-        /**
-         * The name of the location at which the event will take place. The
-         * maximum length is 1,000 characters.
-         */
-        location: string;
-        /**
-         * A value that specifies whether the event is an all-day event. If the
-         * event is an all-day event, this value is true; otherwise, it is
-         * false. If this structure is missing, the default value is false.
-         */
-        is_all_day_event: boolean;
-        /**
-         * A value that specifies whether the event is recurring. If the event
-         * is recurring, this value is true; otherwise, it is false.
-         */
-        is_recurrent: boolean;
-        /**
-         * The text description of the recurrence pattern, for example, "Occurs
-         * every week on Tuesday". The value is Null if this is not a recurrent
-         * event.
-         */
-        recurrence: string;
-        /**
-         * The time, in minutes, before the event for the reminder alarm.
-         */
-        reminder_time: number;
-        /**
-         * The user's availability status for the event. Valid values are:
-         * - free
-         * - busy
-         * - tentative
-         * - out_of_office
-         * @default "free"
-         */
-        availability: string;
-        /**
-         * A value that specifies whether the event is publicly visible. Valid
-         * values are:
-         * - public�the event is visible to anyone who can view the calendar.
-         * - private"�the event is visible only to the event owner.
-         * @default "public"
-         */
-        visibility: string;
-        /**
-         * The time, in ISO 8601 format, at which the event was updated. This
-         * structure is visible only in the Event object that is returned if the
-         * event was successfully created.
-         */
-        updated_time: string;
-    }
-
-    /**
-     * The File object contains info about a user's files in SkyDrive. The Live
-     * Connect REST API supports creating, reading, updating, and deleting File
-     * objects. Use the wl.skydrive scope to read File objects. Use the
-     * wl.contacts_skydrive scope to read any files that other users have shared
-     * with the user. Use the wl.skydrive_update scope to create, update, or
-     * delete File objects.
-     */
-    interface IFile {
-        /**
-         * The File object's ID.
-         */
-        id: string;
-        /**
-         * Info about the user who uploaded the file.
-         */
-        from: IUserInfo;
-        /**
-         * The name of the file.
-         */
-        name: string;
-        /**
-         * A description of the file, or null if no description is specified.
-         */
-        description: string;
-        /**
-         * The ID of the folder the file is currently stored in.
-         */
-        parent_id: string;
-        /**
-         * The size, in bytes, of the file.
-         */
-        size: number;
-        /**
-         * The URL to upload file content hosted in SkyDrive.
-         * Note: This structure is not available if the file is an Microsoft
-         * Office OneNote notebook.
-         */
-        upload_location: string;
-        /**
-         * The number of comments that are associated with the file.
-         */
-        comments_count: number;
-        /**
-         * A value that indicates whether comments are enabled for the file. If
-         * comments can be made, this value is true; otherwise, it is false.
-         */
-        comments_enabled: boolean;
-        /**
-         * A value that indicates whether this file can be embedded. If this
-         * file can be embedded, this value is true; otherwise, it is false.
-         */
-        is_embeddable: boolean;
-        /**
-         * The URL to use to download the file from SkyDrive.
-         * Warning: This value is not persistent. Use it immediately after
-         * making the request, and avoid caching.
-         * Note: This structure is not available if the file is an Office
-         * OneNote notebook.
-         */
-        source: string;
-        /**
-         * A URL to view the item on SkyDrive.
-         */
-        link: string;
-        /**
-         * The type of object; in this case, "file".
-         * Note: If the file is a Office OneNote notebook, the type structure is
-         * set to "notebook".
-         */
-        type: string;
-        /**
-         * Object that contains permission info.
-         */
-        shared_with: ISharedWith;
-        /**
-         * The time, in ISO 8601 format, at which the file was created.
-         */
-        created_time: string;
-        /**
-         * The time, in ISO 8601 format, that the system updated the file last.
-         */
-        updated_time: string;
-        /**
-         * The time, in ISO 8601 format, that the client machine updated the
-         * file last.
-         */
-        client_updated_time: string;
-        /**
-         * Sorts the items to specify the following criteria: updated, name,
-         * size, or default.
-         */
-        sort_by: string;
-    }
-
-    /**
-     * Success response to a new file creation request.
-     */
-    interface INewFileResponse {
-        /**
-         * ID of the new item.
-         */
-        id: string;
-        /**
-         * The file's name and file extension.
-         */
-        name: string;
-        /**
-         * URL where the item can be downloaded from.
-         */
-        source: string;
-    }
-
-    /**
-     * Returns when you perform a GET request to /FILE_ID/content.
-     */
-    interface IFileDownloadLink {
-        /**
-         * A URL download link for the file.
-         */
-        location: string;
-    }
-
-    /**
-     * The Folder object contains info about a user's folders in SkyDrive.
-     * Folders can contain combinations of photos, videos, audio, and
-     * subfolders. The Live Connect REST API supports reading Folder objects.
-     * Use the wl.photos scope to read Folder objects. Use the
-     * wl.contacts_photos scope to read any albums, photos, videos, and audio
-     * that other users have shared with the user.
-     */
-    interface IFolder {
-        /**
-         * The Folder object's ID.
-         */
-        id: string;
-        /**
-         * Info about the user who created the folder.
-         */
-        from: IUserInfo;
-        /**
-         * The name of the folder.
-         */
-        name: string;
-        /**
-         * A description of the folder, or null if no description is specified.
-         */
-        description: string;
-        /**
-         * The total number of items in the folder.
-         */
-        count: number;
-        /**
-         * The URL of the folder, hosted in SkyDrive.
-         */
-        link: string;
-        /**
-         * The resource ID of the parent.
-         */
-        parent_id: string;
-        /**
-         * The URL to upload items to the folder hosted in SkyDrive. Requires
-         * the wl.skydrive scope.
-         */
-        upload_location: string;
-        /**
-         * A value that indicates whether this folder can be embedded. If this
-         * folder can be embedded, this value is true; otherwise, it is false.
-         */
-        is_embeddable: boolean;
-        /**
-         * The type of object; in this case, "folder".
-         */
-        type: string;
-        /**
-         * The time, in ISO 8601 format, at which the folder was created.
-         */
-        created_time: string;
-        /**
-         * The time, in ISO 8601 format, that the system updated the file last.
-         */
-        updated_time: string;
-        /**
-         * The time, in ISO 8601 format, that the client machine updated the
-         * file last.
-         */
-        client_updated_time: string;
-        /**
-         * Permissions info for the folder. Requires the wl.skydrive scope.
-         */
-        shared_with: ISharedWith;
-        /**
-         * Sorts the items to specify the following criteria: updated, name,
-         * size, or default.
-         */
-        sort_by: string;
-    }
-
-    /**
-     * Represents a new folder.
-     */
-    interface INewFolder {
-        /**
-         * The name of the folder.
-         */
-        name: string;
-        /**
-         * A description of the folder.
-         */
-        description?: string;
-        /**
-         * Sorts the items to specify the following criteria: updated, name,
-         * size, or default.
-         */
-        sort_by?: string;
-    }
-
-    /**
-     * The Friend object contains info about a user's friends. A Friend object
-     * represents a user's contact whose is_friend value is set to true. The
-     * Live Connect REST API supports reading Friend objects.
-     */
-    interface IFriend {
-        /**
-         * The friend's ID.
-         */
-        id: string;
-        /**
-         * The friend's full name, formatted for locale.
-         */
-        name: string;
-    }
-
-    /**
-     * The Permissions object contains a list of scopes, showing those scopes to
-     * which the user has consented. The response body contains a JSON object
-     * that lists all consented scopes as a name/value pair. Each scope to which
-     * the user consented is present as a key.
-     */
-    interface IPermissions {
-        [scope: string]: number;
-    }
-
-    /**
-     * Information about an image.
-     */
-    interface IImageInfo {
-        /**
-         * The height, in pixels, of this image of this particular size.
-         */
-        height: number;
-        /**
-         * The width, in pixels, of this image of this particular size.
-         */
-        width: number;
-        /**
-         * The width, in pixels, of this image of this particular size.
-         */
-        source: string;
-        /**
-         * The type of this image of this particular size. Valid values are:
-         * full (maximum size: 2048 � 2048 pixels)
-         * - normal (maximum size 800 � 800 pixels)
-         * - album (maximum size 176 � 176 pixels)
-         * - small (maximum size 96 � 96 pixels)
-         */
-        type: string;
-    }
-
-    /**
-     * Represents location information.
-     */
-    interface ILocation {
-        /**
-         * The latitude portion of the location, expressed as positive (north)
-         * or negative (south) degrees relative to the equator.
-         */
-        latitude: number;
-        /**
-         * The longitude portion of the location expressed as positive (east) or
-         * negative (west) degrees relative to the Prime Meridian.
-         */
-        longitude: number;
-        /**
-         * The altitude portion of the location, expressed as positive (above)
-         * or negative (below) values relative to sea level, in units of
-         * measurement as determined by the camera.
-         */
-        altitude: number;
-    }
-
-    /**
-     * The Photo object contains info about a user's photos on SkyDrive. The
-     * Live Connect REST API supports creating, reading, updating, and deleting
-     * Photo objects. Use the wl.photos scope to read Photo objects. Use the
-     * wl.contacts_photos scope to read any albums, photos, videos, and audio
-     * that other users have shared with the user. Use the wl.skydrive_update
-     * scope to create, update, or delete Photo objects.
-     */
-    interface IPhoto {
-        /**
-         * The Photo object's ID.
-         */
-        id: string;
-        /**
-         * Info about the user who uploaded the photo.
-         */
-        from: IUserInfo;
-        /**
-         * The file name of the photo.
-         */
-        name: string;
-        /**
-         * A description of the photo, or null if no description is specified.
-         */
-        description: string;
-        /**
-         * The ID of the folder where the item is stored.
-         */
-        parent_id: string;
-        /**
-         * The size, in bytes, of the photo.
-         */
-        size: number;
-        /**
-         * The number of comments associated with the photo.
-         */
-        comments_count: number;
-        /**
-         * A value that indicates whether comments are enabled for the photo. If
-         * comments can be made, this value is true; otherwise, it is false.
-         */
-        comments_enabled: boolean;
-        /**
-         * The number of tags on the photo.
-         */
-        tags_count: number;
-        /**
-         * A value that indicates whether tags are enabled for the photo. If
-         * users can tag the photo, this value is true; otherwise, it is false.
-         */
-        tags_enabled: boolean;
-        /**
-         * A value that indicates whether this photo can be embedded. If this
-         * photo can be embedded, this value is true; otherwise, it is false.
-         */
-        is_embeddable: boolean;
-        /**
-         * A URL of the photo's picture.
-         */
-        picture: string;
-        /**
-         * The download URL for the photo.
-         * Warning: This value is not persistent. Use it immediately after
-         * making the request, and avoid caching.
-         */
-        source: string;
-        /**
-         * The URL to upload photo content hosted in SkyDrive. This value is
-         * returned only if the wl.skydrive scope is present.
-         */
-        upload_location: string;
-        /**
-         * Info about various sizes of the photo.
-         */
-        images: IImageInfo[];
-        /**
-         * A URL of the photo, hosted in SkyDrive.
-         */
-        link: string;
-        /**
-         * The date, in ISO 8601 format, on which the photo was taken, or null
-         * if no date is specified.
-         */
-        when_taken: string;
-        /**
-         * The height, in pixels, of the photo.
-         */
-        height: number;
-        /**
-         * The width, in pixels, of the photo.
-         */
-        width: number;
-        /**
-         * The type of object; in this case, "photo".
-         */
-        type: string;
-        /**
-         * The location where the photo was taken.
-         * Note: The location object is not available for shared photos.
-         */
-        location: ILocation;
-        /**
-         * The manufacturer of the camera that took the photo.
-         */
-        camera_make: string;
-        /**
-         * The brand and model number of the camera that took the photo.
-         */
-        camera_model: string;
-        /**
-         * The f-number that the photo was taken at.
-         */
-        focal_ratio: number;
-        /**
-         * The focal length that the photo was taken at, typically expressed in
-         * millimeters for newer lenses.
-         */
-        focal_length: number;
-        /**
-         * The numerator of the shutter speed (for example, the "1" in "1/15 s")
-         * that the photo was taken at.
-         */
-        exposure_numerator: number;
-        /**
-         * The denominator of the shutter speed (for example, the "15" in "1/15
-         * s") that the photo was taken at.
-         */
-        exposure_denominator: number;
-        /**
-         * The object that contains permissions info for the photo.
-         */
-        shared_with: ISharedWith;
-        /**
-         * The time, in ISO 8601 format, at which the photo was created.
-         */
-        created_time: string;
-        /**
-         * The time, in ISO 8601 format, at which the photo was last updated.
-         */
-        updated_time: string;
-    }
-
-    /**
-     * The Search object contains info about the objects found in a user's
-     * SkyDrive that match the search query. See Search query parameters for
-     * info about formatting a search query request.
-     */
-    interface ISearch {
-        /**
-         * An array of file and folder objects found in a user's SkyDrive that
-         * match the search query.
-         */
-        data: IObject[];
-        /**
-         * The path strings that reference the next and previous sets in a
-         * paginated response.
-         */
-        paging?: {
-            /**
-             * Path string for the next set of results.
-             */
-            next?: string;
-            /**
-             * Path string for the previous set of results.
-             */
-            previous?: string;
-        };
-    }
-
-    /**
-     * The Tag object contains info about tags that are associated with a photo
-     * or a video on SkyDrive. The Live Connect REST API supports reading Tag
-     * objects. Use the wl.photos, and wl.skydrive scopes to read Tag objects.
-     * Use the wl.contacts_photos and wl.contacts_skydrive scopes to read the
-     * Tag objects that are associated with any photos that other users have
-     * shared with the user.
-     */
-    interface ITag {
-        /**
-         * The Tag object's ID.
-         */
-        id: string;
-        /**
-         * The user object for the tagged person.
-         */
-        user: IUserInfo;
-        /**
-         * The center of the tag's horizontal position, measured as a
-         * floating-point percentage from 0 to 100, from the left edge of the
-         * photo. This value is not returned for Video objects.
-         */
-        x: number;
-        /**
-         * The center of the tag's vertical position, measured as a
-         * floating-point percentage from 0 to 100, from the top edge of the
-         * photo. This value is not returned for Video objects.
-         */
-        y: number;
-        /**
-         * The time, in ISO 8601 format, at which the tag was created.
-         */
-        created_time: string;
-    }
-
-    /**
-     * Contains work information for one employer.
-     */
-    interface IWorkInfo {
-        /**
-         * Info about the user's employer.
-         */
-        employer: {
-            /**
-             * The name of the user's employer, or null if the employer's name
-             * is not specified.
-             */
-            name: string;
-        };
-        /**
-         * Info about the user's work position.
-         */
-        position: {
-            /**
-             * The name of the user's work position, or null if the name of the
-             * work position is not specified.
-             */
-            name: string;
-        };
-    }
-
-    /**
-     * Information about one postal address.
-     */
-    interface IPostalAddress {
-        /**
-         * The street address, or null if one is not specified.
-         */
-        street: string;
-        /**
-         * The second line of the street address, or null if one is not
-         * specified.
-         */
-        street_2: string;
-        /**
-         * The city of the address, or null if one is not specified.
-         */
-        city: string;
-        /**
-         * The state of the address, or null if one is not specified.
-         */
-        state: string;
-        /**
-         * The postal code of the address, or null if one is not specified.
-         */
-        postal_code: string;
-        /**
-         * The region of the address, or null if one is not specified.
-         */
-        region: string;
-    }
-
-    /**
-     * The User object contains info about a user. The Live Connect REST API
-     * supports reading User objects.
-     */
-    interface IUser {
-        /**
-         * The user's ID.
-         */
-        id: string;
-        /**
-         * The user's full name.
-         */
-        name: string;
-        /**
-         * The user's first name.
-         */
-        first_name: string;
-        /**
-         * The user's last name.
-         */
-        last_name: string;
-        /**
-         * The user's gender, or null if no gender is specified.
-         */
-        gender: string;
-        /**
-         * The URL of the user's profile page.
-         */
-        link: string;
-        /**
-         * The day of the user's birth date, or null if no birth date is
-         * specified.
-         */
-        birth_day: number;
-        /**
-         * The month of the user's birth date, or null if no birth date is
-         * specified.
-         */
-        birth_month: number;
-        /**
-         * The year of the user's birth date, or null if no birth date is
-         * specified.
-         */
-        birth_year: number;
-        /**
-         * An array that contains the user's work info.
-         */
-        work: IWorkInfo[];
-        /**
-         * The user's email addresses.
-         */
-        emails: {
-            /**
-             * The user's preferred email address, or null if one is not
-             * specified.
-             */
-            preferred: string;
-            /**
-             * The email address that is associated with the account.
-             */
-            account: string;
-            /**
-             * The user's personal email address, or null if one is not
-             * specified.
-             */
-            personal: string;
-            /**
-             * The user's business email address, or null if one is not
-             * specified.
-             */
-            business: string;
-            /**
-             * The user's "alternate" email address, or null if one is not
-             * specified.
-             */
-            other: string;
-        };
-        /**
-         * The user's postal addresses.
-         */
-        addresses: {
-            /**
-             * The user's personal postal address.
-             */
-            personal: IPostalAddress;
-            /**
-             * The user's business postal address.
-             */
-            business: IPostalAddress;
-        };
-        /**
-         * The user's phone numbers.
-         */
-        phones: {
-            /**
-             * The user's personal phone number, or null if one is not
-             * specified.
-             */
-            personal: string;
-            /**
-             * The user's business phone number, or null if one is not
-             * specified.
-             */
-            business: string;
-            /**
-             * The user's mobile phone number, or null if one is not specified.
-             */
-            mobile: string;
-        };
-        /**
-         * The user's locale code.
-         */
-        locale: string;
-        /**
-         * The time, in ISO 8601 format, at which the user last updated the
-         * object.
-         */
-        updated_time: string;
-    }
-
-    /**
-     * The Video object contains info about a user's videos on SkyDrive. The
-     * Live Connect REST API supports creating, reading, updating, and deleting
-     * Video objects. Use the wl.photos scope to read Video objects. Use the
-     * wl.contacts_photos scope to read albums, photos, and videos that other
-     * users have shared with the user. Use the wl.skydrive_update scope to
-     * create, update, or delete Video objects.
-     */
-    interface IVideo {
-        /**
-         * The Video object's ID.
-         */
-        id: string;
-        /**
-         * Info about the user who uploaded the video.
-         */
-        from: IUserInfo;
-        /**
-         * The file name of the video.
-         */
-        name: string;
-        /**
-         * A description of the video, or null if no description is specified.
-         */
-        description: string;
-        /**
-         * The id of the folder where the item is stored.
-         */
-        parent_id: string;
-        /**
-         * The size, in bytes, of the video.
-         */
-        size: number;
-        /**
-         * The number of comments that are associated with the video.
-         */
-        comments_count: number;
-        /**
-         * A value that indicates whether comments are enabled for the video. If
-         * comments can be made, this value is true; otherwise, it is false.
-         */
-        comments_enabled: boolean;
-        /**
-         * The number of tags on the video.
-         */
-        tags_count: number;
-        /**
-         * A value that indicates whether tags are enabled for the video. If
-         * tags can be set, this value is true; otherwise, it is false.
-         */
-        tags_enabled: boolean;
-        /**
-         * A value that indicates whether this video can be embedded. If this
-         * video can be embedded, this value is true; otherwise, it is false.
-         */
-        is_embeddable: boolean;
-        /**
-         * A URL of a picture that represents the video.
-         */
-        picture: string;
-        /**
-         * The download URL for the video.
-         * Warning: This value is not persistent. Use it immediately after
-         * making the request, and avoid caching.
-         */
-        source: string;
-        /**
-         * The URL to upload video content, hosted in SkyDrive. This value is
-         * returned only if the wl.skydrive scope is present.
-         */
-        upload_location: string;
-        /**
-         * A URL of the video, hosted in SkyDrive.
-         */
-        link: string;
-        /**
-         * The height, in pixels, of the video.
-         */
-        height: number;
-        /**
-         * The width, in pixels, of the video.
-         */
-        width: number;
-        /**
-         * The duration, in milliseconds, of the video run time.
-         */
-        duration: number;
-        /**
-         * The bit rate, in bits per second, of the video.
-         */
-        bitrate: number;
-        /**
-         * The type of object; in this case, "video".
-         */
-        type: string;
-        /**
-         * The object that contains permission info.
-         */
-        shared_with: ISharedWith;
-        /**
-         * The time, in ISO 8601 format, at which the video was created.
-         */
-        created_time: string;
-        /**
-         * The time, in ISO 8601 format, at which the video was last updated.
-         */
-        updated_time: string;
-    }
-
-    //#endregion REST Object Information
-
-    //#region API Properties Interfaces
-
-    /**
-     * 'Properties' object passed into the WL.api method.
-     */
-    interface IAPIProperties {
-        /**
-         * Contains the path to the REST API object. For information on
-         * specifying paths for REST objects, see REST reference.
-         * http://msdn.microsoft.com/en-us/library/live/hh243648.aspx
-         */
-        path: string;
-        /**
-         * An HTTP method that specifies the action required for the API call.
-         * These actions are standard REST API actions: "COPY", "GET", "MOVE",
-         * "PUT", "POST", and "DELETE".
-         * @default "GET"
-         */
-        method?: string;
-        /**
-         * A JSON object that specifies the REST API request body. The body
-         * property is used only for "POST" and "PUT" requests.
-         */
-        body?: any;
-    }
-
-    /**
-     * 'Properties' object passed into the WL.backgroundDownload method.
-     */
-    interface IBackgroundDownloadProperties {
-        /**
-         * The path to the file to download. For information on specifying paths
-         * for REST objects, see REST reference.
-         * http://msdn.microsoft.com/en-us/library/live/hh243648.aspx
-         */
-        path: string;
-        /**
-         * The file output object to which the downloaded file data is written.
-         */
-        file_output?: Windows.Storage.StorageFile;
-    }
-
-    /**
-     * 'Properties' object passed into the WL.backgroundUpload method.
-     */
-    interface IBackgroundUploadProperties {
-        /**
-         * The path to the file to upload.
-         */
-        path: string;
-        /**
-         * The name of the file to upload.
-         */
-        file_name?: string;
-        /**
-         * The file input object to read the file from. Can be a
-         * Windows.Storage.StorageFile or an IFile.
-         */
-        file_input?: any;
-        /**
-         * The file input stream to read the file from.
-         */
-        stream_input?: Windows.Storage.Streams.IInputStream;
-        /**
-         * Indicates whether the uploaded file should overwrite an existing
-         * copy. Specify "true" to overwrite, "false" to not overwrite and for
-         * the WL.backgroundUpload method call to fail, or "rename" to not
-         * overwrite and enable SkyDrive to assign a new name to the uploaded
-         * file.
-         * @default "false".
-         */
-        overwrite?: string;
-    }
-
-    /**
-     * 'Properties' object passed into the WL.download method.
-     */
-    interface IDownloadProperties {
-        /**
-         * The path to the file to download. For information on specifying paths
-         * for REST objects, see REST reference.
-         * http://msdn.microsoft.com/en-us/library/live/hh243648.aspx
-         */
-        path: string;
-    }
-
-    /**
-     * 'Properties' object passed into the WL.fileDialog method.
-     */
-    interface IFileDialogProperties {
-        /**
-         * Specifies the type of SkyDrive file picker to display. Specify "open"
-         * to display the download version of the file picker. Specify "save"
-         * to display the upload version of the file picker.
-         */
-        mode: string;
-        /**
-         * Specify only if the mode property is set to "open". Specifies how
-         * many files the user can select to download. Specify "single" for a
-         * single file. Specify "multi" for multiple files.
-         * @default "single"
-         */
-        select?: string;
-        /**
-         * The color pallette to use for the file picker. Specify "white",
-         * "grey", or "transparent".
-         * @default "white"
-         */
-        lightbox?: string;
-    }
-
-    /**
-     * 'Properties' object passed into the WL.init method.
-     */
-    interface IInitProperties {
-        /**
-         * Web apps: Required.
-         * Specifies your app's OAuth client ID for web apps.
-         *
-         * Windows Store apps using JavaScript: not needed.
-         */
-        client_id?: string;
-        /**
-         * Contains the default redirect URI to be used for OAuth
-         * authentication. For web apps, the OAuth server redirects to this URI
-         * during the OAuth flow.
-         *
-         * For Windows Store apps using JavaScript, specifying this value will
-         * enable the library to return the authentication token.
-         */
-        redirect_uri?: string;
-        /**
-         * The scope values used to determine which portions of user data the
-         * app has access to, if the user consents.
-         *
-         * For a single scope, use this format: scope: "wl.signin". For multiple
-         * scopes, use this format: scope: ["wl.signin", "wl.basic"].
-         */
-        scope?: any;
-        /**
-         * If set to "true", the library logs error info to the web browser
-         * console and notifies your app by means of the wl.log event.
-         * @default true
-         */
-        logging?: boolean;
-        /**
-         * Web apps: optional.
-         * Windows Store apps using JavaScript: not applicable.
-         * If set to "true", the library attempts to retrieve the user's sign-in
-         * status from Live Connect.
-         * @default true
-         */
-        status?: boolean;
-        /**
-         * Web apps: optional.
-         * Windows Store apps using JavaScript: not applicable.
-         * Specifies the OAuth response type value. If set to "token", the
-         * client receives the access token directly. If set to "code", the
-         * client receives an authorization code, and the app server that serves
-         * the redirect_uri page should retrieve the access_token from the OAuth
-         * server by using the authorization code and client secret.
-         *
-         * You can only set response_type to "code" for web apps.
-         * @default "token"
-         */
-        response_type?: string;
-        /**
-         * Web apps: optional.
-         * Windows Store apps using JavaScript: not applicable.
-         * If set to "true", the library specifies a secure attribute when
-         * writing a cookie on an HTTPS page.
-         * @default "false"
-         */
-        secure_cookie?: string;
-    }
-
-    /**
-     * 'Properties' object passed into the WL.login method.
-     */
-    interface ILoginProperties {
-        /**
-         * This parameter only applies to web apps.
-         * Contains the redirect URI to be used for OAuth authentication. This
-         * value overrides the default redirect URI that is provided in the call
-         * to WL.init.
-         */
-        redirect_uri?: string;
-        /**
-         * Specifies the scopes to which the user who is signing in consents.
-         *
-         * For a single scope, use this format: scope: "wl.signin". For multiple
-         * scopes, use this format: scope: ["wl.signin", "wl.basic"].
-         *
-         * If no scope is provided, the scope value of WL.init is used. If no
-         * scope is provided in WL.init or WL.login, WL.login returns an error.
-         *
-         * Note  WL.login can request the "wl.offline_access" scope, but it
-         * requires a server-side implementation, and the WL.init function must
-         * set its response_type property to "code". For more info, see
-         * Server-side scenarios.
-         * http://msdn.microsoft.com/en-us/library/live/hh243649.aspx
-         */
-        scope: any;
-        /**
-         * Windows Store apps using JavaScript: not applicable.
-         * Web apps: Optional. If the WL.init function's response_type object is
-         * set to "code" and the app uses server-flow authentication, the state
-         * object here can be used to track the web app's calling state on the
-         * web app server side. For more info, see the description of the state
-         * query parameter in the Server-side scenarios topic's "Getting an
-         * authorization code" section.
-         * http://msdn.microsoft.com/en-us/library/live/hh243649.aspx
-         */
-        state?: string;
-    }
-
-    /**
-     * 'Properties' object passed into the WL.ui method.
-     */
-    interface IUIProperties {
-        /**
-         * Specifies the type of button to display. Specify "signin" to display
-         * the Live Connect sign-in button. Specify "skydrivepicker" to display
-         * the SkyDrive button.
-         */
-        name: string;
-        /**
-         * The value of the id attribute of the <div> tag to display the button
-         * in.
-         */
-        element: string;
-        /**
-         * Windows Store apps using JavaScript: not applicable.
-         * Web apps: Optional. If the name property is set to "signin", the
-         * WL.init function's response_type property is set to "code", and the
-         * app uses server-flow authentication, the state object here can be
-         * used to track the web app's calling state on the web app server side.
-         * For more info, see the description of the state query parameter in
-         * the Server-side scenarios topic's "Getting an authorization code"
-         * section.
-         * http://msdn.microsoft.com/en-us/library/live/hh243649.aspx
-         */
-        state?: string;
-    }
-
-    /**
-     * 'Properties' object passed into the WL.ui method when 'name' is set to
-     * 'skydrivepicker'.
-     */
-    interface ISkyDrivePickerProperies extends IUIProperties {
-        /**
-         * The type of SkyDrive file picker button to display. Specify "save" to
-         * display the upload button. Specify "open" to display the download
-         * button.
-         */
-        mode: string;
-        /**
-         * Required if the mode property is set to "open". Specifies how many
-         * files the user can select to download. Specify "single" for a single
-         * file. Specify "multi" for multiple files.
-         * @default "single"
-         */
-        select?: string;
-        /**
-         * Defines the color pallette used for the file picker button. Valid
-         * values are "white" and "blue".
-         * @default "white"
-         */
-        theme?: string;
-        /**
-         * Defines the color pallette used for the file picker dialog box. Valid
-         * values are "white", "gray", and "transparent".
-         * @default "white"
-         */
-        lightbox?: string;
-        /**
-         * If the mode property is set to "save", specifies the function to call
-         * after the user clicks either Save or Cancel in the file picker. If
-         * the mode property is set to "open", specifies the function to call
-         * after the user clicks either Open or Cancel in the file picker.
-         */
-        onselected?: Function;
-        /**
-         * Specifies the function to call if the selected files cannot be
-         * successfully uploaded or downloaded.
-         */
-        onerror?: Function;
-    }
-
-    /**
-     * 'Properties' object passed into the WL.ui method when 'name' is set to
-     * 'signin'.
-     */
-    interface ISignInProperties extends IUIProperties {
-        /**
-         * Defines the brand, or type of icon, to be used with the Live Connect
-         * sign-in button.
-         * @default "windows"
-         */
-        brand?: string;
-        /**
-         * Defines the color pallette used for the sign-in button. For Windows
-         * Store apps using JavaScript, valid values are "dark" and "light".
-         * For web apps, valid values are "blue" and "white".
-         */
-        theme?: string;
-        /**
-         * Defines the type of button.
-         * @default "signin"
-         */
-        type?: string;
-        /**
-         * If the value of the type property is set to "custom", this value
-         * specifies the sign-in text to be displayed in the button.
-         */
-        sign_in_text?: string;
-        /**
-         * If the value of the type property is "custom", this value specifies
-         * the sign-out text to be displayed in the button.
-         */
-        sign_out_text?: string;
-        /**
-         * Specifies the function to call after the user completes the sign-in
-         * process.
-         */
-        onloggedin?: Function;
-        /**
-         * Specifies the function to call after the user completes the sign-out
-         * process.
-         */
-        onloggedout?: Function;
-        /**
-         * Specifies the function to call whenever there is any error while the
-         * sign-in control is initializing or while the user is signing in.
-         */
-        onerror?: Function;
-    }
-
-    /**
-     * 'Properties' object passed into the WL.upload method.
-     */
-    interface IUploadProperties {
-        /**
-         * The path to the file to upload.
-         */
-        path: string;
-        /**
-         * The id attribute of the <input> tag containing info about the file to
-         * upload.
-         */
-        element: string;
-        /**
-         * Indicates whether the uploaded file should overwrite an existing
-         * copy. Specify true or "true" to overwrite, false or "false" to not
-         * overwrite and for the WL.upload method call to fail, or "rename" to
-         * not overwrite and enable SkyDrive to assign a new name to the
-         * uploaded file.
-         * @default "false"
-         */
-        overwrite?: string;
-    }
-
-    //#endregion API Properties Interfaces
-
-    /**
-     * Represents the user's session.
-     */
-    interface ISession {
-        /**
-         * The user's access token.
-         */
-        access_token: string;
-        /**
-         * The authentication token.
-         */
-        authentication_token: string;
-        /**
-         * A list of scopes that the app has requested and that the user has
-         * consented to.
-         *
-         * Note: This property is not available for Windows Store apps using
-         * JavaScript.
-         */
-        scope?: string[];
-        /**
-         * The amount of time remaining, in seconds, until the user's access
-         * token expires.
-         *
-         * Note: This property is not available for Windows Store apps using
-         * JavaScript.
-         */
-        expires_in?: number;
-        /**
-         * The exact time when the session will expire. This time is expressed
-         * in the number of seconds since 1 January, 1970.
-         *
-         * Note: This property is not available for Windows Store apps using
-         * JavaScript.
-         */
-        expires?: number;
-    }
-
-    /**
-     * Represents the user's login status.
-     */
-    interface ILoginStatus {
-        /**
-         * The sign-in status of the user. Valid values are "connected",
-         * "notConnected", or "unknown".
-         */
-        status: string;
-        /**
-         * A JSON object that contains the properties of the current session.
-         */
-        session: ISession;
-    }
-
-    /**
-     * Represents the Microsoft.Live.API.Event object.
-     */
-    interface IEventAPI {
-        /**
-         * Adds a handler to an event.
-         * @param event Required. The name of the event to which to add a
-         *   handler.
-         * @param callback Required. Specifies the name of the callback function
-         *   to handle the event.
-         * @returns This function can return the following errors:
-         *   WL.Event.subscribe: The input parameter/property 'callback' must be
-         *   included.
-         *   WL.Event.subscribe: The input value for parameter/property 'event'
-         *   is not valid.
-         */
-        subscribe(event: string, callback: Function): void;
-        /**
-         * Removes a handler from an event.
-         * @param event Required. The name of the event from which to remove a
-         *   handler.
-         * @param callback Optional. Removes the callback function from the
-         *   event. If this parameter is omitted or is null, all callback
-         *   functions that are registered to the event are removed. Removes the
-         *   callback function from the specified event.
-         */
-        unsubscribe(event: string, callback?: Function): void;
-    }
-
-    /**
-     * Returned from a successful file picker operation.
-     */
-    interface IFilePickerResult {
-        /**
-         * Contains data concerning the user's picked files.
-         */
-        data: {
-            /**
-             * Information on files choden in the picker.
-             */
-            files?: IFile[];
-            /**
-             * Information on folders chosen in the picker.
-             */
-            folders?: IFolder[];
-        }
-    }
-
-    /**
-     * The promise API implemented by this library.
-     */
-    interface IPromise<T> {
-        /**
-         * Adds event listeners for particular events.
-         * @param onSuccess Called when the promised event successfully occurs.
-         * @param onError Called when the promised event fails to occur. Could
-         *   be an IError or an IJSError.
-         * @param onProgress Called to indicate that the promised event is
-         *   making progress toward completion.
-         */
-        then(onSuccess: (response: T) => void,
-            onError?: (error: any) => void,
-            onProgress?: (progress: any) => void): IPromise<T>;
-        /**
-         * Cancels the pending request represented by the Promise, and triggers
-         * the error callback if the promised event has not yet occurred.
-         */
-        cancel(): void;
-    }
-
-    /**
-     * An error returned by the JavaScript library, as opposed to an error
-     * object from the REST API (which we represent with IError).
-     */
-    interface IJSError {
-        /**
-         * The error code.
-         */
-        error: string;
-        /**
-         * A description of the error.
-         */
-        error_description: string;
-    }
-
-    /**
-     * The Live Connect JavaScript API (Windows 8 and web), together with the
-     * REST API, enables apps to read, update, and share user data by using the
-     * JavaScript programming language. The JavaScript API (Windows 8 and web)
-     * provides methods for signing users in and out, getting user status,
-     * subscribing to events, creating UI controls, and calling the
-     * Representational State Transfer (REST) API.
-     */
-    interface API {
-        /**
-         * Makes a call to the Live Connect Representational State Transfer
-         * (REST) API. This method encapsulates a REST API request, and then
-         * calls a callback function to process the response.
-         * @param properties Required. A JSON object that contains properties
-         *   that are necessary to make the REST API call.
-         * @param callback Specifies a callback function that is executed when
-         *   the REST API call is complete. The callback function takes the API
-         *   response object as a parameter. The response object exposes the
-         *   data returned from Live Connect, or, if an error occurs, an error
-         *   property that contains the error code.
-         * @returns Returns a Promise object. This object's then method provides
-         *   the onSuccess, onError, and onProgress parameters to enable your
-         *   code to handle a successful, failed, and in-progress call to the
-         *   corresponding WL.api method, respectively.
-         */
-        api<T>(properties: IAPIProperties,
-              callback?: (response: any) => void): IPromise<T>;
-        /**
-         * Makes a call to download a file from Microsoft SkyDrive.
-         *
-         * **Important**:  WL.backgroundDownload is supported only for use with
-         * Windows Store apps using JavaScript. If you are writing a web app,
-         * use WL.download instead.
-         * @param properties Required. A JSON object that contains properties
-         *   that are necessary to make the REST API call.
-         * @param Optional. Specifies a callback function that is executed when
-         *   the REST API call is complete. The callback function takes the API
-         *   response object as a parameter. The response object exposes the
-         *   data that is returned from Live Connect, or, if an error occurs, an
-         *   error property that contains the error code.
-         * @returns Returns a Promise object. This object's then method accepts
-         *   callback functions for onSuccess, onError, and onProgress to enable
-         *   your code to handle a successful, failed, and in-progress call to
-         *   the corresponding WL.download method, respectively.
-         *   The onSuccess callback is passed a response object that contains
-         *   content_type and stream properties, representing the downloaded
-         *   file's content type and file stream, respectively.
-         */
-        backgroundDownload<T>(properties: IBackgroundDownloadProperties,
-            callback?: (response: any) => void): IPromise<T>;
-        /**
-         * Makes a call to upload a file to Microsoft SkyDrive.
-         *
-         * **Important**: WL.backgroundUpload is supported only for use with
-         * Windows Store apps using JavaScript. If you are writing a web app,
-         * use WL.upload instead.
-         * @param properties Required. A JSON object that contains properties
-         *   that are necessary to make the REST API call.
-         * @param callback Optional. Specifies a callback function that is
-         *   executed when the REST API call is complete. The callback function
-         *   takes the API response object as a parameter. The response object
-         *   exposes the data returned from Live Connect, or if an error occurs,
-         *   an error property that contains the error code.
-         * @returns Returns a Promise object. For Windows Store apps using
-         *   JavaScript, this object's then method accepts callback functions
-         *   for onSuccess, onError, and onProgress to enable your code to
-         *   handle a successful, failed, and in-progress call to the
-         *   corresponding WL.backgroudUpload method, respectively.
-         */
-        backgroundUpload<T>(properties: IBackgroundUploadProperties,
-            callback?: (response: any) => void): IPromise<T>;
-        /**
-         * Specifies whether the current user can be signed out of his or her
-         * Microsoft account.
-         *
-         * For Windows Store apps using JavaScript, you can use this function to
-         * determine whether you should display a control to the user to enable
-         * him or her to sign out of his or her Microsoft account. If this
-         * function returns true, you should display the control. However, if
-         * this function returns false, you should not display this control, as
-         * attempting to sign out the user in this case will have no effect.
-         *
-         * For web apps, this function always returns true.
-         * @returns Returns true if the user can be signed out; otherwise,
-         *   returns false if the user can't be signed out.
-         */
-        canLogout(): boolean;
-        /**
-         * Makes a call to download a file from Microsoft SkyDrive.
-         *
-         * **Important**: WL.download is supported only for use with web apps.
-         * If you are writing a Windows Store app using JavaScript, use
-         * WL.backgroundDownload instead.
-         * @param properties Required. A JSON object that contains properties
-         *   that are necessary to make the REST API call.
-         * @param callback Specifies a callback function that is executed when
-         *   the REST API call is complete. The callback function takes the API
-         *   response object as a parameter. The response object exposes the
-         *   data that is returned from Live Connect, or, if an error occurs, an
-         *   error property that contains the error code.
-         * @returns Returns a Promise object. This object's then method provides
-         *   the onError parameter to enable your code to handle a failed call
-         *   to the corresponding WL.download method.
-         */
-        download(properties: IDownloadProperties,
-            callback?: (response: any) => void): IPromise<void>;
-        Event: IEventAPI;
-        /**
-         * Displays the Microsoft SkyDrive file picker, which enables
-         * JavaScript-based web apps to display a pre-built, consistent user
-         * interface that enables a user to select files to upload and download
-         * to and from his or her SkyDrive storage location.
-         * @param properties Required. A JSON object containing properties for
-         *   displaying the button.
-         * @param callback Optional. A callback function that is executed after
-         *   the user finishes interacting with the SkyDrive file picker.
-         * @returns Returns a Promise object. This object's then method provides
-         *   the onSuccess and onError parameters to enable your code to handle
-         *   a successful and failed call to the corresponding WL.fileDialog
-         *   method, respectively.
-         */
-        fileDialog(properties: IFileDialogProperties,
-            callback?: (response: any) => void): IPromise<IFilePickerResult>;
-        /**
-         * Returns the sign-in status of the current user. If the user is signed
-         * in and connected to your app, this function returns the session
-         * object. This is an asynchronous function that returns the user's
-         * status by contacting the Live Connect authentication web service.
-         * @param callback Returns the sign-in status of the current user. If
-         *   the user is signed in and connected to your app, this function
-         *   returns the session object. This is an asynchronous function that
-         *   returns the user's status by contacting the Live Connect
-         *   authentication web service.
-         * @param force Optional. If set to "true", the function contacts the
-         *   Live Connect authentication web service to determine the user's
-         *   status. If set to "false" (the default), the function can return
-         *   the user status that is currently in memory, if there is one. If
-         *   the user's status has already been retrieved, the library can
-         *   return the cached value. However, you can force the library to
-         *   retrieve current status by setting the force parameter to "true".
-         * @returns Returns a Promise object. This object's then method provides
-         *   the onSuccess and onError parameters to enable your code to handle
-         *   a successful and failed call to the corresponding WL.getLoginStatus
-         *   method, respectively.
-         *   In the body of the onSuccess function, a status object is returned,
-         *   which contains the user's sign-in status and the session object.
-         */
-        getLoginStatus(callback?: (status: ILoginStatus) => void,
-            force?: boolean): IPromise<ILoginStatus>;
-        /**
-         * Retrieves the current session object synchronously, if a session
-         * object exists. For situations in which performance is critical, such
-         * as page loads, use the asynchronous WL.getLoginStatus method instead.
-         * @returns Returns the current session as a session object instance.
-         */
-        getSession(): ISession;
-        /**
-         * Initializes the JavaScript library. An app must call this function on
-         * every page before making other function calls in the library. The app
-         * should call this function before making function calls that subscribe
-         * to events. If the JavaScript library has already been initialized on
-         * the page, calling this function succeeds silently; the client_id and
-         * redirect_uri parameters are not validated.
-         * @param properties Required. A JSON object with initialization
-         *   properties.
-         * @returns Returns a Promise object. This object's then method provides
-         *   the onSuccess and onError parameters to enable your code to handle
-         *   a successful and failed call to the corresponding WL.init method,
-         *   respectively.
-         *   When the onSuccess callback is invoked, a login status object is
-         *   passed in as parameter that indicates the current user's login
-         *   status.
-         */
-        init(properties: IInitProperties): IPromise<ILoginStatus>;
-        /**
-         * Signs in the user or expands the user's list of scopes. Because this
-         * function can result in launching the consent page prompt, you should
-         * call it only in response to a user action, such as clicking a button.
-         * Otherwise, the user's web browser might block the popup.
-         *
-         * Typically, this function is used by apps that define their own
-         * sign-in controls, or by apps that ask users to grant additional
-         * permissions during an activity. For example, to enable a user to post
-         * his or her status to Live Connect, your app may have to prompt the
-         * user for permission and call this function with an expanded scope.
-         *
-         * If you call this function when the user has already consented to the
-         * requested scope and is already signed in, the callback function is
-         * invoked immediately with the current session.
-         * This function logs errors to the web browser console.
-         * @param properties Required. A JSON object with login properties.
-         * @param callback Optional. Specifies a callback function to execute
-         *   when sign-in is complete. The callback function takes the status
-         *   object as a parameter. For a description of the status object, see
-         *   WL.getLoginStatus. If you do not specify a callback function, your
-         *   app can still get the sign-in callback info by listening for an
-         *   auth.sessionChange or auth.statusChange event.
-         * @returns Returns a Promise object. This object's then method provides
-         *   the onSuccess, onError, and onProgress parameters to enable your
-         *   code to handle a successful, failed, and in-progress call to the
-         *   corresponding WL.login method, respectively.
-         */
-        login(properties: ILoginProperties,
-            callback?: (status: any) => void): IPromise<ILoginStatus>;
-        /**
-         * Signs the user out of Live Connect and clears any user state that is
-         * maintained by the JavaScript library, such as cookies. If the user
-         * account is connected, this function logs out the user from the app,
-         * but not from the PC. This function is useful primarily for websites
-         * that do not use the sign-in control.
-         * @param callback Optional. Specifies a callback function that is
-         *   executed when sign-out is complete. The callback function takes the
-         *   status object as a parameter. For a description of the status
-         *   object, see WL.getLoginStatus. If you do not specify a callback
-         *   function, your app can still get the sign-out callback info by
-         *   listening for an auth.sessionChange or auth.statusChange event.
-         * @returns Returns a Promise object. This object's then method provides
-         *   the onSuccess, onError, and onProgress parameters to enable your
-         *   code to handle a successful, failed, and in-progress call to the
-         *   corresponding WL.logout method, respectively.
-         */
-        logout(callback?: (status: ILoginStatus) => void): IPromise<ILoginStatus>;
-        /**
-         * Displays either the Live Connect sign-in button or the Microsoft
-         * SkyDrive file picker button. The sign-in button either prompts the
-         * user for his or her Microsoft account credentials if he or she is not
-         * signed in or else signs out the user if he or she is signed in. The
-         * file picker button displays the SkyDrive file picker to help the user
-         * select files to upload or download to or from his or her SkyDrive
-         * storage location.
-         * @param properties Required. A JSON object containing properties for
-         *   displaying the button.
-         * @param callback Optional. A callback function that is executed after
-         *   the sign-in button or file picker button is displayed.
-         *   Note: Do not use the callback parameter to run code after the user
-         *   finishes interacting with the sign-in button or file picker. Use a
-         *   combination of the onselected, onloggedin, onloggedout, and onerror
-         *   properties as previously described.
-         */
-        ui(properties: IUIProperties, callback?: () => void): void;
-        /**
-         * Makes a call to upload a file to Microsoft SkyDrive.
-         *
-         * **Important**: WL.upload is supported only for use with web apps. If
-         * you are writing a Windows Store app using JavaScript, use
-         * WL.backgroundUpload instead.
-         * @param properties Required. A JSON object that contains properties
-         *   that are necessary to make the REST API call.
-         * @param callback Optional. Specifies a callback function that is
-         *   executed when the REST API call is complete. The callback function
-         *   takes the API response object as a parameter. The response object
-         *   exposes the data returned from Live Connect, or if an error occurs,
-         *   an error property that contains the error code.
-         * @returns Returns a Promise object. This object's then method provides
-         *   the onSuccess, onError, and onProgress parameters to enable your
-         *   code to handle a successful, failed, and in-progress call to the
-         *   corresponding WL.upload method, respectively; however, the
-         *   onProgress parameter applies to newer web browsers such as Internet
-         *   Explorer 10 only.
-         */
-        upload<T>(properties: IUploadProperties,
-            callback?: (response: any) => void): IPromise<T>;
-    }
-}
-
-/**
- * The WL object is a global object that encapsulates all functions of the
- * JavaScript API (Windows 8 and web). Your app uses the WL object to call all
- * of the JavaScript API (Windows 8 and web) functions.
- */
-declare var WL: Microsoft.Live.API;
diff --git a/microsoft-live-connect/microsoft-live-connect.d.ts.tscparams b/microsoft-live-connect/microsoft-live-connect.d.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/microsoft-live-connect/microsoft-live-connect.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/microsoft-live-connect/tsconfig.json b/microsoft-live-connect/tsconfig.json
new file mode 100644
index 0000000000..66c40cccfc
--- /dev/null
+++ b/microsoft-live-connect/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "microsoft-live-connect-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/microsoft-sdk-soap/index.d.ts b/microsoft-sdk-soap/index.d.ts
new file mode 100644
index 0000000000..1b18a392ae
--- /dev/null
+++ b/microsoft-sdk-soap/index.d.ts
@@ -0,0 +1,2970 @@
+// Type definitions for Sdk.Soap.js
+// Project: https://code.msdn.microsoft.com/SdkSoapjs-9b51b99a
+// Definitions by: Markus Mauch <https://github.com/markusmauch/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="Q"/>
+
+declare namespace Sdk
+{
+    interface IEntityView
+    {
+        attributes: AttributeCollection;
+        entityState: EntityState;
+        id: string;
+        logicalName: string;
+        relatedEntities: RelatedEntityCollection;
+    }
+
+    interface IEntityCollectionView
+    {
+        entityName: string;
+        entities: Array<IEntityView>;
+        minActiveRowVersion: string;
+        moreRecords: boolean;
+        pagingCookie: string;
+        totalRecordCount: number;
+        totalRecordCountLimitExceeded: boolean;
+    }
+
+    interface IEntityReferenceView
+    {
+        Id: string;
+        Type: string;
+        Name: string;
+    }
+
+    interface IEntityReferenceCollectionView extends Array<IEntityReferenceView>
+    {
+    }
+
+    class Q
+    {
+        /**
+         * Creates a link between records.
+         * @param entityName The logical name of the entity that is specified in the entityId parameter.
+         * @param entityId The ID of the record to which the related records are associated.
+         * @param relationship The name of the relationship to be used to create the link.
+         * @param relatedEntities A collection of Sdk.EntityReference objects to be associated.
+         */
+        static associate( entityName: string, entityId: string, relationship: string, relatedEntities: Sdk.Collection<Sdk.EntityReference> ): Q.Promise<void>;
+        /**
+         * Creates an entity record and returns a string representation of the GUID value that is the Id of the created entity.
+         * @param entity An entity instance.
+         */
+        static create( entity: Sdk.Entity ): Q.Promise<string>;
+
+        /**
+         * Deletes an entity record
+         * @param entityName The LogicalName of the entity to delete.
+         * @param id An ID of the record to delete.
+         */
+        static del( entityName: string, id: string ): Q.Promise<void>;
+
+        /**
+         * Removes a link between records.
+         * @param entityName The logical name of the entity that is specified in the entityId parameter.
+         * @param entityId The ID of the record to which the related records are disassociated.
+         * @param relationship The name of the relationship to be used to remove the link.
+         * @param relatedEntities A collection of Sdk.EntityReference objects to be disassociated.
+         */
+        static disassociate( entityName: string, entityId: string, relationship: string, relatedEntities: Sdk.Collection<Sdk.EntityReference> ): Q.Promise<void>;
+
+        /**
+         * Executes a SOAP Request using the SOAPAction Execute.
+         * @param request A request object.
+         */
+        static execute( request: Sdk.OrganizationRequest ): Q.Promise<OrganizationResponse>;
+
+        /**
+         * Retrieves an entity instance.
+         * @param entityName The logical name of the entity to retrieve.
+         * @param id The id of the entity to retrieve.
+         * @param columnSet The columns of the entities to retrieve.
+         */
+        static retrieve( entityName: string, id: string, columnSet: Sdk.ColumnSet ): Q.Promise<Entity>;
+
+        /**
+         * Retrieves the results of a query
+         * @param query An Sdk.Query.QueryByAttribute query.
+         */
+        static retrieveMultiple( query: Sdk.Query.QueryByAttribute ): Q.Promise<Sdk.EntityCollection>;
+
+        /**
+         * Retrieves the results of a query
+         * @param query An Sdk.Query.QueryExpression query.
+         */
+        static retrieveMultiple( query: Sdk.Query.QueryExpression ): Q.Promise<Sdk.EntityCollection>;
+
+        /**
+         * Retrieves the results of a query
+         * @param query An Sdk.Query.FetchExpression query.
+         */
+        static retrieveMultiple( query: Sdk.Query.FetchExpression ): Q.Promise<Sdk.EntityCollection>;
+
+        /**
+         * Updates an entity instance.
+         * @param entity An entity instance to update.
+         */
+        static update( entity: Entity ): Q.Promise<boolean>;
+    }
+
+    class ColumnSet
+    {
+        /**
+         * Specifies the attributes for which non- null values are returned from a query.
+         * @param columns Comma separated string values for attribute logical names.
+         */
+        constructor( ...columns: string[] );
+
+        /**
+         * Specifies the attributes for which non- null values are returned from a query.
+         * @param columns An array of string values.
+         */
+        constructor( columns: string[] );
+
+        /**
+         * Specifies the attributes for which non- null values are returned from a query.
+         * @param allColumns If Boolean true value is passed as the first parameter all columns will be included. (Not recommended for production code).
+         */
+        constructor( allColumns: boolean );
+
+        /**
+         * Gets the collection of column names.
+         * @returns The collection of column names.
+         */
+        getColumns(): Sdk.Collection<string>;
+
+        /**
+         * Adds a column to the collection.
+         * @param column The logical name of the attribute to add.
+         */
+        addColumn( column: string ): void;
+
+        /**
+         * Adds a string array of column names.
+         * @param columns A string array of column names.
+         */
+        addColumns( columns: Array<string> ): void;
+
+        /**
+         * Sets the AllColumns property.
+         * @params allColumns A boolean value.
+         */
+        setAllColumns( allColumns: boolean ): void;
+
+        /**
+         * Whether all columns will be returned.
+         */
+        getAllColumns(): boolean;
+
+        /**
+         * Gets the number of columns.
+         */
+        getCount(): number;
+
+
+        /// prototype methods
+
+        /**
+         * Removes a column from the ColumnSet.
+         * @param columnName The logical name of an attribute to be removed from the ColumnSet.
+         * @param errorIfNotFound Whether to throw an error when the column to remove is not found. The default is false
+         */
+        removeColumn( columnName: string, errorIfNotFound?: boolean ): void;
+
+        /**
+         * The XML node with "<d:columnSet>" as the root element.
+         */
+        toXml(): string;
+
+        /**
+         * XML nodes for columnSet properties.
+         */
+        toValueXml(): string;
+    }
+
+    class ValueType
+    {
+    }
+
+    class Collection<T>
+    {
+        /**
+         * A Collection for a specified type.
+         * @param type The function that specifies the type.
+         * @param items An array of items to add to the collection.
+         */
+        constructor( type: T, items?: Array<T> );
+
+        /**
+         * Gets the type defined for the collection.
+         */
+        getType(): T;
+
+        /**
+         * Adds an item to the collection.
+         * @param item An item to add to the collection.
+         */
+        add( item: T ): void;
+
+        /**
+         * Adds an array of objects to the collection.
+         * @param items An array of items to add to the collection.
+         */
+        addRange( items: any[] ): void;
+
+        /**
+         * Removes all items from the collection.
+         */
+        clear(): void;
+
+        /**
+         * Returns whether an object exists within the collection.
+         * @param item The item to search in the collection.
+         */
+        contains( item: T ): boolean;
+
+        /**
+         * Returns whether an object exists within the collection.
+         * @param predicate A comparer function which is invoked for each item of the collection.
+         */
+        contains( predicate: ( item: T ) => boolean ): boolean;
+
+        /**
+         * Returns an Sdk.Collection that contains all the items of this collection that satisfy the specified predicate function.
+         * @param predicate A predicate function that takes a collection item as argument and returns a boolean.
+         */
+        select( predicate: ( item: T ) => boolean ): Collection<T>;
+
+        /**
+         * Applies the action contained within a delegate function.
+         * @param fn Delegate function with parameters for item and index.
+         */
+        forEach( fn: ( item: T, index: number ) => any ): void;
+
+        /**
+         * Gets the item in the collection at the specified index.
+         * @param index The index of the item to return.
+         */
+        getByIndex( index: number ): T;
+
+        /**
+         * Removes an item from the collection.
+         * @param item A reference to the item to be removed.
+         */
+        remove( item: T ): void;
+
+        /**
+         * Gets a copy of the array of items in the collection.
+         */
+        toArray(): Array<T>;
+
+        /**
+         * Returns the number of items in the collection.
+         */
+        getCount(): number;
+    }
+
+    class EntityCollection
+    {
+        /**
+         * Contains a collection of entity instances.
+         * @param entities Initializes a new instance of the EntityCollection class setting the Sdk.Collection of Sdk.Entity objects.
+         */
+        constructor( entities: Sdk.Collection<Sdk.Entity> );
+
+        /**
+         * Adds an entity to the collection.
+         * @param entity
+         */
+        addEntity( entity: Sdk.Entity ): void;
+
+        /**
+         * Gets the collection of entities.
+         */
+        getEntities(): Sdk.Collection<Sdk.Entity>;
+
+        /**
+         * Gets an entity in the collection.
+         * @param index The index of the entity in the collection.
+         */
+        getEntity( index: number ): Sdk.Entity;
+
+        /**
+         * Gets an entity in the collection.
+         * @param id The id of the entity in the collection.
+         */
+        getEntity( id: Sdk.Guid ): Sdk.Entity;
+
+        /**
+         * Sets an item in the collection.
+         * @param index The index of the entity in the collection.
+         * @param value The Sdk.Entity value to set.
+         */
+        setEntity( index: number, value: Sdk.Entity ): void;
+
+        /**
+         * Sets an item in the collection.
+         * @param id The Sdk.Guid id of the entity in the collection.
+         * @param value The Sdk.Entity value to set.
+         */
+        setEntity( id: Sdk.Guid, value: Sdk.Entity ): void;
+
+        /**
+         * Gets the logical name of the entity.
+         */
+        getEntityName(): string;
+
+        /**
+         * Sets the logical name of the entity.
+         * @param name The logical name of the entity.
+         */
+        setEntityName( name: string ): void;
+
+        /**
+         * Gets the lowest active row version value.
+         */
+        getMinActiveRowVersion(): string;
+
+        /**
+         * Sets the lowest active row version value.
+         * @param minActiveRowVersion The lowest active row version value.
+         */
+        setMinActiveRowVersion( minActiveRowVersion: string ): void;
+
+        /**
+         * Gets whether there are more records available.
+         */
+        getMoreRecords(): boolean;
+
+        /**
+         * Sets whether there are more records available.
+         * @param moreRecords Whether there are more records available.
+         */
+        setMoreRecords( moreRecords: boolean ): void;
+
+        /**
+         * Gets the current paging information.
+         */
+        getPagingCookie(): string;
+
+        /**
+         * Sets the current paging information.
+         * @param pagingCookie The current paging information.
+         */
+        setPagingCookie( pagingCookie: string ): void;
+
+        /**
+         * Gets the total number of records in the collection if ReturnTotalRecordCount was true when the query was executed.
+         */
+        getTotalRecordCount(): number;
+
+        /**
+         * Sets the total number of records in the collection if ReturnTotalRecordCount was true when the query was executed.
+         * @param totalRecordCount The total number of records in the collection if ReturnTotalRecordCount was true when the query was executed.
+         */
+        setTotalRecordCount( totalRecordCount: number ): void;
+
+        /**
+         * Gets whether the results of the query exceeds the total record count.
+         */
+        getTotalRecordCountLimitExceeded(): boolean;
+
+        /**
+         * Sets whether the results of the query exceeds the total record count.
+         * @param totalRecordCountLimitExceeded Whether the results of the query exceeds the total record count.
+         */
+        setTotalRecordCountLimitExceeded( totalRecordCountLimitExceeded: boolean ): void;
+
+        /**
+         * XML definition of an the child nodes of an entity.
+         */
+        toValueXml(): string;
+
+        /**
+         * Returns a view of the entity collection
+         */
+        view(): IEntityCollectionView;
+    }
+
+    class EntityReferenceCollection
+    {
+        /**
+         * Contains a collection of EntityReference instances.
+         * @param entityReferences Initializes a new instance of the EntityReferenceCollection class setting the Sdk.Collection of Sdk.EntityReference objects.
+         */
+        constructor( entityReferences?: Sdk.Collection<EntityReference> );
+
+        /**
+         * Gets the collection of entity references.
+         */
+        getEntityReferences(): Sdk.Collection<EntityReference>;
+
+        /**
+         * Sets the collection of entity references.
+         * @param entityReferences The entity references
+         */
+        setEntityReferences( entityReferences: Sdk.Collection<EntityReference> ): void;
+
+
+        /// prototype methods
+
+        /**
+         * Removes an entity reference to the collection.
+         * @param entityReference The entity reference to remove.
+         */
+        remove( entityReference: Sdk.EntityReference ): void;
+
+        /**
+         * Returns a view of the data in an entity reference collection instance.
+         */
+        view(): IEntityReferenceCollectionView;
+
+        /**
+         * Returns the values of serialized entity reference collection as XML nodes.
+         */
+        toValueXml(): string;
+    }
+
+    class RelatedEntityCollection extends EntityCollection
+    {
+    }
+
+    class AttributeCollection extends Collection<AttributeBase>
+    {
+        constructor();
+
+        /**
+         * Adds an attribute to the Attribute Collection.
+         * @param attribute The attribute to add.
+         * @param isChanged Override the the attribute IsChanged value.
+         */
+        add( attribute: AttributeBase, isChanged?: boolean ): void;
+
+        /**
+         * Gets the attributes in the collection.
+          */
+        getAttributes(): Collection<AttributeBase>;
+
+
+        /// prototype methods
+
+        /**
+         * Allows for a delegate function to be applied to each attribute in the collection.
+         * @param fm The function to be applied. Function should have parameters for the attribute and the iterator i.e.: '(att,i)'
+         */
+        forEach( fn: ( attribute: AttributeBase, index: number ) => any ): void;
+
+        /**
+         * Returns all attributes in the collection.
+         */
+        get(): Sdk.Collection<AttributeBase>;
+
+        /**
+         * Returns the attribute with matching name.
+         * @param attribuetName
+         */
+        get( attribuetName: string ): AttributeBase;
+
+        /**
+         * Returns the attribute with matching index.
+         * @param attribuetName
+         */
+        get( index: number ): AttributeBase;
+
+        /**
+         * Gets an attribute at a given index.
+         * @param index The index.
+         */
+        getAttributeByIndex( index: number ): AttributeBase;
+
+        /**
+         * Gets an attribute with a given name.
+         * @param name The Logical name of the attribute.
+         */
+        getAttributeByName( name: string ): AttributeBase;
+
+        /**
+         * Gets an array of the names of attributes in a collection.
+         */
+        getNames(): Array<string>;
+        /**
+         * The XML for an attribute collection.
+         */
+        toXml( action: string ): string;
+    }
+
+    class FormattedValueCollection
+    {
+    }
+
+    class RelatedEntitiesCollection
+    {
+    }
+
+    class AttributeBase
+    {
+        /**
+         * Gets whether the value of the attribute has changed.
+         */
+        getIsChanged(): boolean;
+
+        /**
+         * Gets the logical name of the attribute.
+         */
+        getName(): string;
+
+        /**
+         * Gets the value type of the attribute.
+         */
+        getType(): Sdk.ValueType;
+
+        /**
+         * Gets the value of the attribute.
+         * The type of value depends on the type of attribute.
+         */
+        getValue(): any;
+
+        /**
+         * Whether the value of the attribute is set.
+         */
+        isValueSet(): boolean;
+
+        /**
+         * Sets whether the value of the attribute has changed.
+         * @param isChanged Whether the value of the attribute has changed.
+         */
+        setIsChanged( isChanged: boolean ): void;
+
+        /**
+         * Sets the name of the attribute
+         * @param name The name of the attribute.
+         */
+        setName( name: string ): void;
+
+        /**
+         * For internal use only.
+         * @param type The type of the attribute.
+         */
+        setType( type: Sdk.ValueType ): void;
+
+        /**
+         * Sets the general value of the attribute
+         * @param name The value of the attribute.
+         */
+        setValue( value: any ): void;
+
+        /// prototype methods
+        /**
+         * XML node for Attribute.
+         */
+        toXml( action: string ): string;
+    }
+
+    class Boolean extends AttributeBase
+    {
+        /**
+         * A Boolean Attribute.
+         * @param name The logical name of the attribute .
+         * @param value The value of the managed property.
+         */
+        constructor( name: string, value?: boolean )
+
+        /**
+         * Gets the value of a Boolean attribute.
+         */
+        getValue(): boolean;
+
+        /**
+         * Sets the value of a Boolean attribute.
+         * @param value
+         */
+        setValue( value: boolean ): void;
+    }
+
+    class DateTime extends AttributeBase
+    {
+        /**
+         * A DateTime Attribute.
+         * @param name The logical name of the attribute.
+         * @param value The value of the attribute.
+         */
+        constructor( name: string, value?: Date );
+
+        /**
+         * Gets the value of a DateTime attribute.
+         */
+        getValue(): Date;
+
+        /**
+         * Sets the value of a DateTime attribute.
+         * @param value The value to set.
+         */
+        setValue( value: Date ): void;
+    }
+
+    class Decimal extends AttributeBase
+    {
+        /**
+         * A Decimal Attribute.
+         * @param name The logical name of the attribute.
+         * @param value The value of the attribute.
+         */
+        constructor( name: string, value?: number );
+
+        /**
+         * Gets the value of a Decimal attribute.
+         */
+        getValue(): number;
+
+        /**
+         * Sets the value of a Decimal attribute.
+         * @param value The value to set.
+         */
+        setValue( value: number ): void;
+    }
+
+    class Double
+    {
+        /**
+         * A Double Attribute.
+         * @param name The logical name of the attribute.
+         * @param value The value of the attribute.
+         */
+        constructor( name: string, value?: number );
+
+        /**
+         * Gets the value of a Double attribute.
+         */
+        getValue(): number;
+
+        /**
+         * Sets the value of a Double attribute.
+         * @param value The value to set.
+         */
+        setValue( value: number ): void;
+    }
+
+    class Guid extends AttributeBase
+    {
+        /**
+         * A Guid Attribute.
+         * @param name The logical name of the attribute.
+         * @param value" The value of the attribute
+         */
+        constructor( name: string, value?: string );
+
+        /**
+         * Gets the value of a Guid attribute.
+         */
+        getValue(): string;
+
+        /**
+         * Sets the value of a Guid attribute.
+         * @param value The value to set.
+         */
+        setValue( value: string ): void;
+    }
+
+    class Int extends AttributeBase
+    {
+        /**
+         * An Integer Attribute.
+         * @param name The logical name of the attribute.
+         * @param value The value of the attribute.
+         */
+        constructor( name: string, value?: number );
+
+        /**
+         * Gets the value of an Integer attribute.
+         */
+        getValue(): number;
+
+        /**
+         * Sets the value of an Integer attribute.
+         * @param value The value to set.
+         */
+        setValue( value: number ): void;
+    }
+
+    class Long extends AttributeBase
+    {
+        /**
+         * A Long Attribute.
+         * @param name The logical name of the attribute.
+         * @param value The value of the attribute.
+         */
+        constructor( name: string, value?: number );
+
+        /**
+         * Gets the value of a Long attribute.
+         */
+        getValue(): number;
+
+        /**
+         * Sets the value of a Long attribute.
+         * @param value The value to set.
+         */
+        setValue( value: number ): void;
+    }
+
+    class Lookup extends AttributeBase
+    {
+        /**
+         * A Lookup Attribute.
+         * @param name The logical name of the attribute.
+         * @param value The value of the attribute.
+         */
+        constructor( name: string, value?: EntityReference );
+
+        /**
+         * Gets the value of a Lookup attribute.
+         */
+        getValue(): EntityReference;
+
+        /**
+         * Sets the value of a Lookup attribute.
+         * @param value The value to set.
+         */
+        setValue( value: EntityReference ): void;
+    }
+
+    class Money extends AttributeBase
+    {
+        /**
+         * A Money Attribute.
+         * @param name The logical name of the attribute.
+         * @param value The value of the attribute.
+         */
+        constructor( name: string, value?: number );
+
+        /**
+         * Gets the value of a Money attribute.
+         */
+        getValue(): number;
+
+        /**
+         * Sets the value of a Money attribute.
+         * @param value The value to set.
+         */
+        setValue( value: number ): void;
+    }
+
+    class OptionSet extends AttributeBase
+    {
+        /**
+         * An OptionSet Attribute.
+         * @param name The logical name of the attribute.
+         * @param value The value of the attribute.
+         */
+        constructor( name: string, value?: number );
+
+        /**
+         * Gets the value of a OptionSet attribute.
+         */
+        getValue(): number;
+
+        /**
+         * Sets the value of an OptionSet attribute.
+         * @param value The value to set.
+         */
+        setValue( value: number ): void;
+    }
+
+    class PartyList extends AttributeBase
+    {
+        /**
+         * A PartyList Attribute.
+         * @param name The logical name of the attribute.
+         * @param value The value of the attribute.
+         */
+        constructor( name: string, value?: EntityCollection );
+
+        /**
+         * Gets the value of a PartyList attribute.
+         */
+        getValue(): EntityCollection;
+
+        /**
+         * Sets the value of a PartyList attribute.
+         * @param value The value to set.
+         */
+        setValue( value: EntityCollection ): void;
+    }
+
+    class String extends AttributeBase
+    {
+        /**
+         * A String Attribute.
+         * @param name The logical name of the attribute.
+         * @param value The value of the attribute.
+         */
+        constructor( name: string, value?: string );
+
+        /**
+         * Gets the value of a String attribute.
+         */
+        getValue(): string;
+
+        /**
+         * Sets the value of a String attribute.
+         * @param value The value to set.
+         */
+        setValue( value: string ): void;
+    }
+
+    class EntityState
+    {
+    }
+
+    class Entity
+    {
+        /**
+         * Represents an instance of an entity (a record).
+         * @param type The logical name of the entity.
+         */
+        constructor( type: string );
+
+        /**
+         * Gets the collection of attributes for the entity.
+         */
+        getAttributes(): Sdk.AttributeCollection;
+
+        /**
+         * Gets the collection of attributes for the entity.
+         * @param attributeName The attribute with matching name is returned.
+         */
+        getAttributes( attributeName: string ): Sdk.AttributeBase;
+
+        /**
+         * Gets the collection of attributes for the entity.
+         * @param index The attribute with matching index is returned.
+         */
+        getAttributes( index: number ): Sdk.AttributeBase;
+
+        /**
+         * Checks whether the entity has an attribute that satisfies the specified predicate.
+         * @param A comparer function that takes an Sdk.AttributeBase as argument and returns a boolean.
+         */
+        containsAttribute( predicate: ( attribute: Sdk.AttributeBase ) => boolean ): boolean;
+
+        /**
+         * Checks whether the entity has an attribute with the specified name.
+         * @param The name of the attribute.
+         */
+        containsAttribute( name: string ): boolean;
+
+        /**
+         * Sets the collection of attributes for the entity.
+         * @param attributes The collection of attributes for the entity.
+         */
+        setAttributes( attributes: Sdk.AttributeCollection ): void;
+
+        /**
+         * Gets the state of the entity.
+         */
+        getEntityState(): Sdk.EntityState;
+
+        /**
+         * Sets the state of the entity.
+         * @param state The state of the entity.
+         */
+        setEntityState( state: Sdk.EntityState ): void;
+
+        /**
+         * Gets the collection of formatted values for the entity attributes.
+         */
+        getFormattedValues(): Sdk.FormattedValueCollection;
+
+        /**
+         * Sets the collection of formatted values for the entity attributes.
+         * @param values" The collection of formatted values for the entity attributes.
+         */
+        setFormattedValues( values: Sdk.FormattedValueCollection ): void;
+
+        /**
+         * Gets the Id of the record represented by this entity instance.
+         */
+        getId(): string;
+
+        /**
+         * Sets the Id of the record represented by this entity instance.
+         * @param id The Id of the record represented by this entity instance.
+         * @param override Allow setting the Id property, for example when creating a new record from an existing one.
+         */
+        setId( id: string, override?: boolean ): void;
+
+        /**
+         * Gets the logical name of the entity.
+         */
+        getType(): string;
+
+        /**
+         * Sets the logical name of the entity.
+         * @param type The logical name of the entity.
+         */
+        setType( type: string ): void;
+
+        /**
+         * Gets a collection of related entities.
+         */
+        getRelatedEntities(): Sdk.RelatedEntitiesCollection;
+
+        /**
+         * Sets a collection of related entities.
+         * @param relatedEntities A collection of related entities.
+         */
+        setRelatedEntities( relatedEntities: Sdk.RelatedEntitiesCollection ): void;
+
+        /**
+         * Adds an attribute with an optional value to a newly instantiated Sdk.Entity
+         * @param attribute The attribute to add
+         * @param isChanged Whether the attribute should be considered changed, the default is true.
+         */
+        addAttribute( attribute: Sdk.AttributeBase, isChanged?: boolean ): void;
+
+        /**
+         * Adds an entity to the related entities.
+         * @param relationshipSchemaName The relationship SchemaName.
+         * @param entity The entity to add.
+         */
+        addRelatedEntity( relationshipSchemaName: string, entity: Sdk.Entity ): void;
+
+        /**
+         * Gets the value to indicate whether data for the entity has changed.
+         */
+        getIsChanged(): boolean;
+
+        /**
+         * Sets the value to indicate whether data for the entity has changed.
+         * @param isChanged The value to indicate whether data for the entity has changed.
+         */
+        setIsChanged( isChanged: boolean ): void;
+
+        /**
+         * Gets the value of the specified attribute.
+         * @param logicalName The logical name of the attribute.
+         */
+        getValue( logicalName: string ): any;
+
+        /**
+         * Generates properties for the entity based on metadata.
+         */
+        initializeSubClass( metadata: Sdk.Mdq.IEntityMetadata ): void;
+
+        /**
+         * Sets the value of the specified attribute.
+         * @param logicalName The logical name of the attribute.
+         * @param value The value for the attribute. Simple JavaScript types may be used for most attribute types. Sdk.EntityReference, Sdk.EntityCollection, and Sdk.BooleanManagedPropertyValue cannot use simple JavaScript types.
+         */
+        setValue( logicalName: string, value: Object ): void;
+
+        /**
+         * Generates an entity reference.
+         */
+        toEntityReference(): Sdk.EntityReference;
+
+        /**
+         * Overrides the default toString method.
+         */
+        toString(): string;
+
+        /**
+         * XML definition of an the child nodes of an entity.
+         * @param action
+         */
+        toValueXml( action: string ): string;
+
+        /**
+         * XML definition of an entity where the root node is <entity>.
+         */
+        toXml( action: string ): string;
+
+        /**
+         * Returns a view of the data in an entity instance
+         */
+        view(): IEntityView;
+    }
+
+    class EntityReference
+    {
+        /**
+         * Identifies a record.
+         * @param logicalName The logical name of the entity.
+         * @param id The id of the record.
+         * @param name The value of the primary attribute of the entity instance. This property can contain a value or null. This property is not automatically populated unless the EntityReference object has been retrieved from the server.
+         */
+        constructor( logicalName: string, id: string, name?: string );
+
+        /**
+         * Gets the logicalName representing the type of referenced entity.
+         */
+        getType(): string;
+
+        /**
+         * Gets the Id value of the referenced entity.
+         */
+        getId(): string;
+
+        /**
+         * Gets the primary attribute value of the referenced entity.
+         */
+        getName(): string;
+
+        /**
+         * Sets the logicalName representing the type of referenced entity.
+         * @param type The logicalName representing the type of referenced entity.
+         */
+        setType( type: string ): void;
+
+        /**
+         * Sets the Id value of the entity.
+         * @param id The Id value of the entity.
+         */
+        setId( id: string ): void;
+
+        /**
+         * Sets the primary attribute value of the referenced entity.
+         * @param name The primary attribute value of the referenced entity.
+         */
+        setName( name: string ): void;
+
+
+        /// prototype methods
+
+        /**
+         * Returns a serialized entity reference where the root element is <a:EntityReference>.
+         */
+        toXml(): string;
+
+        /**
+         * Returns the values of serialized entity reference as XML nodes.
+         */
+        toValueXml(): string;
+
+        /**
+         * Returns a view of the data in an EntityReference
+         */
+        view(): IEntityReferenceView;
+    }
+
+    class OrganizationRequest
+    {
+        /**
+         * Sets the request XML.
+         * @param xml The request XML.
+         */
+        setRequestXml( xml: string ): void;
+
+        /**
+         * Gets the request XML.
+         */
+        getRequestXml(): string;
+
+        /**
+         * Sets the response type.
+         * @param type A class that inherits from Sdk.OrganizationResponse.
+         */
+        setResponseType( type: OrganizationResponse ): void;
+
+        /**
+         * Gets the response type.
+         */
+        getResponseType(): OrganizationResponse;
+    }
+
+    class OrganizationResponse
+    {
+    }
+
+    /**
+     * Contains the data that is needed to convert a query in FetchXML to a QueryExpression.
+     * @param fetchXml Sets the query to convert.
+     */
+    class FetchXmlToQueryExpressionRequest extends Sdk.OrganizationRequest
+    {
+        constructor( fetchXml: string );
+
+        /**
+         * Sets the query to convert.
+         * @param The query to convert.
+         */
+        setFetchXml( value: string ): void;
+    }
+
+    /**
+     * Response to FetchXmlToQueryExpressionRequest.
+     * @param responseXml The response XML to the FetchXmlToQueryExpressionRequest.
+     */
+    class FetchXmlToQueryExpressionResponse extends Sdk.OrganizationResponse
+    {
+        constructor( responseXml: string );
+
+        /**
+         * Gets the results of the query conversion.
+         */
+        public getQuery(): Query.QueryExpression;
+    }
+
+    /**
+     * Contains the data that is needed to  convert a query, which is represented as a QueryExpression class, to its equivalent query, which is represented as FetchXML.
+     * @param query The query.
+     */
+    class QueryExpressionToFetchXmlRequest extends Sdk.OrganizationRequest
+    {
+        constructor( query: Sdk.Query.QueryBase );
+
+        /**
+         * Sets the query to convert.
+         * @param query The query.
+         * @param query
+         */
+        public setQuery( query: Sdk.Query.QueryBase ): void;
+    }
+
+    /**
+     * Response to QueryExpressionToFetchXmlRequest.
+     */
+    class QueryExpressionToFetchXmlResponse extends Sdk.OrganizationResponse
+    {
+        constructor( responseXml: string );
+
+        /**
+         * Gets the results of the query conversion.
+         */
+        public getFetchXml(): string;
+    }
+
+    /**
+     * Request to retrieve metadata and metadata changes.
+     * @param query The Sdk.Mdq.EntityQueryExpression that defines the query.
+     * @param clientVersionStamp The Sdk.Mdq.RetrieveMetadataChangesResponse.ServerVersionStamp value from a previous request. When included only the metadata changes since the previous request will be returned.
+     * @param deletedMetadataFilters An Sdk.Mdq.DeletedMetadataFilters enumeration value. When included the deleted metadata changes will be limited to the types defined by the enumeration.
+     */
+    class RetrieveMetadataChangesRequest extends Sdk.OrganizationRequest
+    {
+        constructor( query: Sdk.Mdq.EntityQueryExpression, clientVersionStamp?: string, deletedMetadataFilters?: Sdk.Mdq.DeletedMetadataFilters );
+        getEntityMetadata(): Sdk.Mdq.IEntityMetadata[];
+        getServerVersionStamp(): string;
+        getDeletedMetadata(): Object;
+    }
+
+    /**
+     * Response to RetrieveMetadataChangesRequest.
+     * @param resopnseXml The response XML.
+     */
+    class RetrieveMetadataChangesResponse
+    {
+        constructor( responseXml: string );
+
+        /***
+         *
+         */
+        public getEntityMetadata(): Array<Mdq.IEntityMetadata>;
+
+        /***
+         *
+         */
+        public getServerVersionStamp(): string;
+
+        /***
+         *
+         */
+        public getDeletedMetadata(): any;
+    }
+
+
+   /**
+    * Contains the data that is needed to set the state of an entity record.
+    * @param entityMoniker Sets the entity.
+    * @param state Sets the state of the entity record.
+    * @param status Sets the status that corresponds to the State property.
+    */
+    class SetStateRequest extends Sdk.OrganizationRequest
+    {
+        constructor( entityMoniker: EntityReference, state: number, status: number );
+
+        /**
+         * Sets the entity.
+         * @param value The entity.
+         */
+        public setEntityMoniker( value: EntityReference ): void;
+
+        /**
+         * Sets the state of the entity record.
+         * @param value The state of the entity record.
+         */
+        setState( value: number ): void;
+
+        /**
+         * Sets the status that corresponds to the State property.
+         * @param value The status that corresponds to the State property.
+         */
+        setStatus( value: number ): void;
+    }
+
+    /**
+     * Response to SetStateRequest.
+     */
+    class SetStateResponse
+    {
+        constructor( responseXml: string );
+    }
+}
+
+declare namespace Sdk.Query
+{
+    class QueryBase
+    {
+        /**
+         * Internal Use Only.
+         * @param type An Abstract class for different query classes to inherit from.
+         */
+        constructor( type: string );
+
+        /**
+         * Gets the columns to include.
+         */
+        getColumnSet(): Sdk.ColumnSet;
+
+        /**
+         * Sets the columns to include.
+         * @param columns An Sdk.ColumnSet instance.
+         */
+        setColumnSet( columns: Sdk.ColumnSet ): void;
+
+        /**
+         * Sets the columns to include.
+         * @param columns An array of attribute logical names for the columns to return.
+         */
+        setColumnSet( columns: Array<string> ): void;
+
+        /**
+         * Sets the columns to include.
+         * @param columns Pass each attribute logical name as an argument.
+         */
+        setColumnSet( ...columns: string[] ): void;
+
+        /**
+         *
+         */
+        getQueryType(): string;
+
+        /**
+         * Gets the logical name of the entity.
+         */
+        getEntityName(): string;
+
+        /**
+         * Sets the logical name of the entity.
+         * @param name The logical name of the entity.
+         */
+        setEntityName( name: string ): void;
+
+        /**
+         * Gets the number of pages and the number of entity instances per page returned from the query.
+         */
+        getPageInfo(): Sdk.Query.PagingInfo;
+
+        /**
+         * Sets the number of pages and the number of entity instances per page returned from the query.
+         * @param pageInfo The number of pages and the number of entity instances per page returned from the query.
+         */
+        setPageInfo( pageInfo: Sdk.Query.PagingInfo ): void;
+
+        /**
+         * Adds the specified column to the column set.
+         * @param columnName The logical name of the column to add.
+         */
+        addColumn( columnName: string ): void;
+
+        /**
+         * Removes a column from the ColumnSet used by the query.
+         * @param columnName The logical name of an attribute to be removed from the ColumnSet.
+         * @param errorIfNotFound Whether to throw an error when the column to remove is not found. The default is false.
+         */
+        removeColumn( columnName: string, errorIfNotFound?: boolean ): void;
+
+        /**
+         * Gets an Sdk.Collection of Sdk.Query.OrderExpression instances that define the order in which the entity instances are returned from the query.
+         */
+        getOrders(): Sdk.Collection<Sdk.Query.OrderExpression>;
+
+        /**
+         * Gets the number of rows to be returned.
+         */
+        getTopCount(): number;
+
+        /**
+         * Sets the number of rows to be returned.
+         * @param count The number of rows to be returned.
+         */
+        setTopCount( count: number ): void;
+
+        /**
+         * Gets the serialized QueryExpression.
+         */
+        toXml(): string;
+
+        /**
+         * Gets the serialized QueryExpression values.
+         */
+        toValueXml(): string;
+    }
+
+    class QueryByAttribute extends QueryBase
+    {
+        /**
+         * Initializes a new instance of the QueryByAttribute class setting the entity name.
+         * @param entityName The logical name of the entity.
+         *
+         */
+        constructor( entityName: string );
+
+        /**
+         * Gets An Sdk.Collection of Sdk.AttributeBase attributes.
+         */
+        getAttributeValues(): Sdk.Collection<Sdk.AttributeBase>;
+
+        /**
+         * Sets an Sdk.Collection of Sdk.Query.OrderExpression instances that define the order in which the entity instances are returned from the query.
+         * @param orders An Sdk.Collection of Sdk.Query.OrderExpression instances that define the order in which the entity instances are returned from the query.
+         */
+        setOrders( orders: Sdk.Collection<Sdk.Query.OrderExpression> ): void;
+
+        /// prototype methods
+
+        /**
+         * Adds the attribute with values to include in the query.
+         * @param attributeValue One of the classes that inherit from Sdk.AttributeBase including the value to use as criteria.
+         */
+        addAttributeValue( attributeValue: Sdk.AttributeBase ): void;
+
+        /**
+         * Adds an order to apply to the results of the query.
+         * @param order An order expression.
+         */
+        addOrder( order: Sdk.Query.OrderExpression ): void;
+
+        /**
+         * Removes an attribute with values to include in the query.
+         * @param attributeValue One of the classes that inherit from Sdk.AttributeBase including the value to use as criteria.
+         * @param errorIfNotFound Whether to throw an error when the attribute to remove is not found. The default is false.
+         */
+        removeAttributeValue( attributeValue: Sdk.AttributeBase, errorIfNotFound?: boolean ): void;
+    }
+
+    class QueryExpression extends QueryBase
+    {
+        /**
+         * Initializes a new instance of the QueryExpression class setting the entity name.
+         * @param entityName The name of the entity.
+         */
+        constructor( entityName: string );
+
+        /**
+         * Gets the complex condition and logical filter expressions that filter the results of the query.
+         */
+        getCriteria(): FilterExpression;
+
+        /**
+         * Sets the complex condition and logical filter expressions that filter the results of the query.
+         * @param criteria The query condition and filter criteria.
+         */
+        setCriteria( criteria: FilterExpression ): void;
+
+        /**
+         * Gets whether the results of the query contain duplicate entity instances.
+         */
+        getDistinct(): boolean;
+
+        /**
+         * Sets whether the results of the query contain duplicate entity instances.
+         */
+        setDistinct( isDistinct: boolean ): void;
+
+        /**
+         * Gets an Sdk.Collection of Sdk.Query.LinkEntity instances.
+         */
+        getLinkEntities(): Sdk.Collection<LinkEntity>;
+
+        /**
+         * Gets a value that indicates that no shared locks are issued against the data that would prohibit other transactions from modifying the data in the records returned from the query.
+         */
+        getNoLock(): boolean;
+
+        /**
+         * Sets a value that indicates that no shared locks are issued against the data that would prohibit other transactions from modifying the data in the records returned from the query.
+         * @param isNoLock True if there are no shared locks are issued against the data that would prohibit other transactions from modifying the data in the records returned from the query; otherwise, false.
+         */
+        setNoLock( isNoLock: boolean ): void;
+
+        /// prototype methods
+
+        /**
+         *  Contains a condition expression used to filter the results of the query.
+         * @param entityName The logical name of the entity in the condition expression.
+         * @param attributeName The logical name of the attribute in the condition expression.
+         * @param operator The condition operator.
+         * @param values The value(s) to compare. Use one of the following classes that inherit from Sdk.Query.ValueBase:
+         *          Sdk.Query.Booleans
+         *          Sdk.Query.BooleanManagedProperties
+         *          Sdk.Query.Dates
+         *          Sdk.Query.Decimals
+         *          Sdk.Query.Doubles
+         *          Sdk.Query.EntityReferences
+         *          Sdk.Query.Guids
+         *          Sdk.Query.Ints
+         *          Sdk.Query.Longs
+         *          Sdk.Query.Money
+         *          Sdk.Query.OptionSets
+         *          Sdk.Query.Strings
+         */
+        addCondition( entityName: string, attributeName: string, conditionOperator: Sdk.Query.ConditionOperator, values: Sdk.Query.ValueBase ): void;
+
+        /**
+         * Adds the specified link to the query expression setting the entity name to link to, the attribute name to link from and the attribute name to link to.
+         * @param firstParam An Sdk.Query.LinkEntity instance.
+         */
+        addLink( firstParam: Sdk.Query.LinkEntity ): void;
+
+        /**
+         * Adds the specified link to the query expression setting the entity name to link to, the attribute name to link from and the attribute name to link to.
+         * @param firstParam The name of entity to link from.
+         * @param linkFromAttributeName The name of the attribute to link from.
+         * @param linkToAttributeName The name of the attribute to link to.
+         * @param joinOperator The join operator. The default value is Inner
+         */
+        addLink( firstParam: string, linkFromAttributeName: string, linkToAttributeName: string, joinOperator: Sdk.Query.JoinOperator ): void;
+
+        /**
+         * Adds the specified order expression to the query expression.
+         * @param attributeName The name of the attribute.
+         * @param orderType The order, ascending or descending. Ascending is the default if not specified.
+         */
+        addOrder( attributeName: string, orderType: Sdk.Query.OrderType ): void;
+    }
+
+    class OrderExpression
+    {
+    }
+
+    class ConditionExpression
+    {
+        /**
+         * Contains a condition expression used to filter the results of the query.
+         * @param name entityName The logical name of the entity in the condition expression.
+         * @param name attributeName The logical name of the attribute in the condition expression.
+         * @param name operator The condition operator.
+         * @param name values The value(s) to compare.
+         *  Use one of the following classes that inherit from Sdk.Query.ValueBase: </para>
+         *  - Sdk.Query.Booleans </para>
+         *  - Sdk.Query.BooleanManagedProperties </para>
+         *  - Sdk.Query.Dates </para>
+         *  - Sdk.Query.Decimals </para>
+         *  - Sdk.Query.Doubles </para>
+         *  - Sdk.Query.EntityReferences </para>
+         *  - Sdk.Query.Guids </para>
+         *  - Sdk.Query.Ints </para>
+         *  - Sdk.Query.Longs </para>
+         *  - Sdk.Query.Money </para>
+         *  - Sdk.Query.OptionSets </para>
+         *  - Sdk.Query.Strings </para>
+         */
+        constructor( entityName: string, attributeName: string, operator: ConditionOperator, values?: ValueBase );
+
+        /**
+         * Returns the logical name of the entity in the condition expression.
+         */
+        getEntityName(): string;
+
+        /**
+         * Sets the logical name of the entity in the condition expression.
+         * @param name The logical name of the entity in the condition expression.
+         */
+        setEntityName( name: string ): void;
+
+        /**
+         * Returns the logical name of the attribute in the condition expression.
+         */
+        getAttributeName(): string;
+
+        /**
+         * Sets the logical name of the attribute in the condition expression.
+         * @param name The logical name of the attribute in the condition expression.
+         */
+        setAttributeName( name: string ): void;
+
+        /**
+         * Returns the condition operator.
+         */
+        getOperator(): ConditionOperator;
+
+        /**
+         * Sets the condition operator.
+         * @param operator The condition operator.
+         */
+        setOperator( operator: ConditionOperator ): void;
+
+        /**
+         * Returns the values for the attribute.
+         */
+        getValues(): ValueBase;
+
+        /**
+         * Sets the values for the attribute.
+         * @param The value(s) to compare
+         *  Use one of the following classes that inherit from Sdk.Query.ValueBase:
+         *  - Sdk.Query.Booleans
+         *  - Sdk.Query.BooleanManagedProperties
+         *  - Sdk.Query.Dates
+         *  - Sdk.Query.Decimals
+         *  - Sdk.Query.Doubles
+         *  - Sdk.Query.EntityReferences
+         *  - Sdk.Query.Guids
+         *  - Sdk.Query.Ints
+         *  - Sdk.Query.Longs
+         *  - Sdk.Query.Money
+         *  - Sdk.Query.OptionSets
+         *  - Sdk.Query.Strings
+         */
+        setValues( values: ValueBase ): void;
+    }
+
+    /**
+     * Specifies complex condition and logical filter expressions used for filtering the results of the query.
+     * @param logicalOperator The filter operator.
+     */
+    class FilterExpression
+    {
+        constructor( logicalOperator: LogicalOperator );
+
+        /**
+         * Adds a condition to the filter expression setting the attribute name, condition operator, and values.
+         * @param conditionExpression The expression that will set the condition.
+         */
+        public addCondition( firstParam: ConditionExpression ): void;
+
+        /**
+         * Adds a condition to the filter expression setting the attribute name, condition operator, and values.
+         * @param entityName The entityName of the new ConditionExpression that will be instantiated using the other parameters.
+         * @param attributeName The attribute name to use in the condition expression.
+         * @param conditionOperator The condition operator if the first parameter is a string.
+         * @param values The value(s) to compare.
+         *  Use one of the following classes that
+         *  - Sdk.Query.Booleans
+         *  - Sdk.Query.BooleanManagedProperties
+         *  - Sdk.Query.Dates
+         *  - Sdk.Query.Decimals
+         *  - Sdk.Query.Doubles
+         *  - Sdk.Query.EntityReferences
+         *  - Sdk.Query.Guids
+         *  - Sdk.Query.Ints
+         *  - Sdk.Query.Longs
+         *  - Sdk.Query.Money
+         *  - Sdk.Query.OptionSets
+         *  - Sdk.Query.Strings
+         */
+        public addCondition( entityName: string, attributeName: string, conditionOperator: ConditionOperator, values?: ValueBase ): void;
+
+        /**
+         * Adds a child filter to the filter expression.
+         * @param filterExpression The filter to add.
+         */
+        addFilter( filterExpression: FilterExpression ): void;
+
+        /**
+         * Adds a child filter to the filter expression.
+         * @param logicalOperator Creates new FilterExpression with the specified logical operator and adds it.
+         */
+        addFilter( logicalOperator: LogicalOperator ): void;
+
+        /**
+         * Returns a collection of Sdk.Query.ConditionExpression values.
+         */
+        getConditions(): Sdk.Collection<ConditionExpression>;
+
+        /**
+         * Gets the logical AND/OR filter operator.
+         */
+        getFilterOperator(): LogicalOperator
+
+        /**
+         * Returns an Sdk.Collection of Sdk.Query.FilterExpression.
+         */
+        getFilters(): Sdk.Collection<FilterExpression>;
+
+        /**
+         * Gets whether the expression is part of a quick find query.
+         */
+        getIsQuickFindFilter(): boolean;
+
+        /**
+         * Sets the filter operator.
+         * @param filterOperator The filter operator.
+         */
+        setFilterOperator( filterOperator: LogicalOperator ): void;
+
+        /**
+         * Sets whether the expression is part of a quick find query.
+         * @param isQuickFind True if the filter is part of a quick find query; otherwise, false.
+         */
+        setIsQuickFindFilter( isQuickFind: boolean ): void;
+    }
+
+    class FetchExpression
+    {
+        /**
+         * @param fetchXml The FetchXml to be used in a query.
+         */
+        constructor( fetchXml: string );
+
+        /**
+         * Gets the FetchXml to be used in a query.
+         */
+        public getFetchXml(): string;
+
+        /**
+         * Sets the FetchXml to be used in a query.
+         * @param fetchXml The FetchXml to be used in a query.
+         */
+        public setFetchXml( fetchXml: string ): void;
+    }
+
+    class LinkEntity
+    {
+        /**
+         * Initializes a new instance of the Sdk.Query.LinkEntity class setting the required properties.
+         * @param linkFromEntityName The logical name of the entity to link from.
+         * @param linkToEntityName The logical name of the entity to link to.
+         * @param linkFromAttributeName The name of the attribute to link from.
+         * @param linkToAttributeName The name of the attribute to link to.
+         * @param joinOperator The join operator.
+         * @param entityAlias The string representing an alias for the linkToEntityName.
+         */
+        constructor(
+            linkFromEntityName: string,
+            linkToEntityName: string,
+            linkFromAttributeName: string,
+            linkToAttributeName: string,
+            joinOperator: Sdk.Query.JoinOperator,
+            entityAlias: string );
+
+        /**
+         * Adds a linked entity.
+         * @param linkEntity An Sdk.Query.LinkEntity to add.
+         */
+        public addLink( linkEntity: Sdk.Query.LinkEntity ): void;
+
+        /**
+         * Gets the column set.
+         */
+        public getColumns(): Sdk.ColumnSet;
+
+        /**
+         * Sets the columns to include.
+         * @param columns An Sdk.ColumnSet instance.
+         */
+        public setColumns( columns: Sdk.ColumnSet ): void;
+
+        /**
+         * Sets the columns to include.
+         * @param columns An Array of attribute logical names for the columns to return.
+         */
+        public setColumns( columns: string[] ): void;
+
+        /**
+         * Sets the columns to include.
+         * @param columns Pass each attribute logical name as an argument.
+         */
+        public setColumns( ...columns: string[] ): void;
+
+        /**
+         * Gets the alias for the entity.
+         */
+        public getEntityAlias(): string;
+
+        /**
+         * Sets the alias for the entity.
+         * @param alias The alias for the entity.
+         */
+        public setEntityAlias( alias: string ): void;
+
+        /**
+         * Gets the join operator.
+         */
+        public getJoinOperator(): Sdk.Query.JoinOperator;
+
+        /**
+         * Sets the join operator.
+         * @param operator The join operator.
+         */
+        public setJoinOperator( operator: Sdk.Query.JoinOperator ): void;
+
+        /**
+         * Gets the complex condition and logical filter expressions that filter the results of the query.
+         */
+        public getLinkCriteria(): Sdk.Query.FilterExpression;
+
+        /**
+         * Sets the complex condition and logical filter expressions that filter the results of the query.
+         * @param criteria The complex condition and logical filter expressions that filter the results of the query.
+         */
+        public setLinkCriteria( criteria: Sdk.Query.FilterExpression ): void;
+
+        /**
+         * Gets the collection of Sdk.Query.LinkEntity that define links between multiple entity types.
+         */
+        public getLinkEntities(): Sdk.Collection<Sdk.Query.LinkEntity>;
+
+        /**
+         * Gets the logical name of the attribute of the entity that you are linking from.
+         */
+        public getLinkFromAttributeName(): string;
+
+        /**
+         * Sets the logical name of the attribute of the entity that you are linking from.
+         * @param name The logical name of the attribute of the entity that you are linking from.
+         */
+        public setLinkFromAttributeName( name: string ): void;
+
+        /**
+         * Gets the logical name of the entity that you are linking from.
+         */
+        public getLinkFromEntityName(): string;
+
+        /**
+         * Sets the logical name of the entity that you are linking from.
+         * @param name The logical name of the entity that you are linking from.
+         */
+        public setLinkFromEntityName( name: string ): void;
+
+        /**
+         * Gets the logical name of the attribute of the entity that you are linking to
+         */
+        public getLinkToAttributeName(): string;
+
+        /**
+         * Sets the logical name of the attribute of the entity that you are linking to.
+         * @param name The logical name of the attribute of the entity that you are linking to.
+         */
+        public setLinkToAttributeName( name: string ): void;
+
+        /**
+         * Gets the logical name of the entity that you are linking to.
+         */
+        public getLinkToEntityName(): string;
+
+        /**
+         * Sets the logical name of the entity that you are linking to.
+         * @param name The logical name of the entity that you are linking to.
+         */
+        public setLinkToEntityName( name: string ): void;
+
+        /**
+         * Gets the serialized link entity.
+         */
+        public toXml(): string;
+
+        /**
+         * Gets the serialized link entity values.
+         */
+        public toValueXml(): string;
+    }
+
+    class PagingInfo
+    {
+        /**
+         * Gets the number of entity instances returned per page.
+         */
+        getCount(): number;
+
+        /**
+         * Sets the number of entity instances returned per page.
+         * @param The number of entity instances returned per page
+         */
+        setCount( count: number ): void;
+
+        /**
+         * Gets the number of pages returned from the query.
+         */
+        getPageNumber(): number;
+
+        /**
+         * Sets the number of pages returned from the query.
+         * @param The number of pages returned from the query.
+         */
+        setPageNumber( pages: number ): void;
+
+        /**
+         * Gets the info used to page large result sets.
+         */
+        getPagingCookie(): string;
+
+        /**
+         * Sets the info used to page large result sets.
+         */
+        setPagingCookie( cookie: string ): void;
+
+        /**
+         * Gets whether the total number of records should be returned from the query.
+         */
+        getReturnTotalRecordCount(): boolean;
+
+        /**
+         * Sets whether the total number of records should be returned from the query.
+         * @param Specifies whether the TotalRecordCount should be set when the query is executed.
+         */
+        setReturnTotalRecordCount( returnTotalRecordsCount: boolean ): void;
+
+
+        /// prototype methods
+
+        /**
+         * Gets the serialized paging info.
+         *
+        toXml():string;
+
+        /**
+         * Gets the serialized paging info values.
+         */
+        toValueXml(): string;
+    }
+
+    export enum ConditionOperator
+    {
+        Equal,
+        NotEqual,
+        GreaterThan,
+        LessThan,
+        GreaterEqual,
+        LessEqual,
+        Like,
+        NotLike,
+        In,
+        NotIn,
+        Between,
+        NotBetween,
+        Null,
+        NotNull,
+        Yesterday,
+        Today,
+        Tomorrow,
+        Last7Days,
+        Next7Days,
+        LastWeek,
+        ThisWeek,
+        NextWeek,
+        LastMonth,
+        ThisMonth,
+        NextMonth,
+        On,
+        OnOrBefore,
+        OnOrAfter,
+        LastYear,
+        ThisYear,
+        NextYear,
+        LastXHours,
+        NextXHours,
+        LastXDays,
+        NextXDays,
+        LastXWeeks,
+        NextXWeeks,
+        LastXMonths,
+        NextXMonths,
+        LastXYears,
+        NextXYears,
+        EqualUserId,
+        NotEqualUserId,
+        EqualBusinessId,
+        NotEqualBusinessId,
+        Mask,
+        NotMask,
+        Contains,
+        DoesNotContain,
+        EqualUserLanguage,
+        NotOn,
+        OlderThanXMonths,
+        BeginsWith,
+        DoesNotBeginWith,
+        EndsWith,
+        DoesNotEndWith,
+        ThisFiscalYear,
+        ThisFiscalPeriod,
+        NextFiscalYear,
+        NextFiscalPeriod,
+        LastFiscalYear,
+        LastFiscalPeriod,
+        LastXFiscalYears,
+        LastXFiscalPeriods,
+        NextXFiscalYears,
+        NextXFiscalPeriods,
+        InFiscalYear,
+        InFiscalPeriod,
+        InFiscalPeriodAndYear,
+        InOrBeforeFiscalPeriodAndYear,
+        InOrAfterFiscalPeriodAndYear,
+        EqualUserOrUserTeams,
+        EqualUserTeams,
+    }
+
+    export enum JoinOperator
+    {
+        Inner,
+        LeftOuter,
+        Natural,
+    }
+
+    export enum OrderType
+    {
+        Ascending,
+        Descending,
+    }
+
+    export class ValueBase
+    { }
+
+    /**
+     * Specifies Boolean values to be compared in the query.
+     * @param args An array of Boolean values.
+     */
+    class Booleans extends ValueBase
+    {
+        constructor( args: boolean[] );
+
+        /**
+         * Returns the type of value with namespace prefix.
+         */
+        public getType(): string;
+
+        /**
+         * Returns an Sdk.Collection of boolean values.
+         */
+        public getValues(): Sdk.Collection<boolean>;
+
+
+        /**
+         * Specifies a Boolean value to be compared in the query.
+         * @param setValueArgs An array of boolean values.
+         */
+        public setValues( setValueArgs: boolean[] ): void;
+    }
+
+    /**
+     * Specifies the Date values to be compared in the query.
+     * @param args An array of Date values.
+     */
+    class Dates extends ValueBase
+    {
+        constructor( args: Date[] );
+
+        /**
+         * Returns the type of value with namespace prefix.
+         */
+        public getType(): string;
+
+        /**
+         * Returns an Sdk.Collection of Date values.
+         */
+        public getValues(): Sdk.Collection<Date>;
+
+        /**
+         * Specifies the Date values to be compared in the query.
+         * @param setValueArgs An array of Date values.
+         */
+        public setValues( setValueArgs: Date[] ): void;
+    }
+
+    /**
+     * Specifies the Decimal values to be compared in the query.
+     * @param args An array of Decimal values.
+     */
+    class Decimals extends ValueBase
+    {
+        constructor( args: number[] );
+
+        /**
+         * Returns the type of value with namespace prefix.
+         */
+        public getType(): string;
+
+        /**
+         * Returns an Sdk.Collection of number values.
+         */
+        public getValues(): Sdk.Collection<number>;
+
+        /**
+         * Specifies the Decimal values to be compared in the query.
+         * @param setValueArgs An array of number values.
+         */
+        public setValues( setValueArgs: number[] ): void;
+    }
+
+    /**
+     * Specifies the Double values to be compared in the query.
+     * @param args An array of Double values.
+     */
+    class Doubles extends ValueBase
+    {
+        constructor( args: number[] );
+
+        /**
+         * Returns the type of value with namespace prefix.
+         */
+        public getType(): string;
+
+        /**
+         * Returns an Sdk.Collection of number values.
+         */
+        public getValues(): Sdk.Collection<number>;
+
+        /**
+         * Specifies the Double values to be compared in the query.
+         * @param setValueArgs An array of number values.
+         */
+        public setValues( setValueArgs: number[] ): void;
+    }
+
+    /**
+     * Specifies the Int values to be compared in the query.
+     * @param args An array of Int values.
+     */
+    class Ints extends ValueBase
+    {
+        constructor( args: number[] );
+
+        /**
+         * Returns the type of value with namespace prefix.
+         */
+        public getType(): string;
+
+        /**
+         * Returns an Sdk.Collection of number values.
+         */
+        public getValues(): Sdk.Collection<number>;
+
+        /**
+         * Specifies the Int values to be compared in the query
+         * @param setValueArgs An array of number values.
+         */
+        public setValues( setValueArgs: number[] ): void;
+    }
+
+    /**
+     * Specifies the Long values to be compared in the query.
+     * @param args An array of Long values.
+     */
+    class Longs extends ValueBase
+    {
+        constructor( args: number[] );
+
+        /**
+         * Returns the type of value with namespace prefix.
+         */
+        public getType(): string;
+
+        /**
+         * Returns an Sdk.Collection of number values.
+         */
+        public getValues(): Sdk.Collection<number>;
+
+        /**
+         * Specifies the Long values to be compared in the query.
+         * @param setValueArgs An array of number values.
+         */
+        public setValues( setValueArgs: number[] ): void;
+    }
+
+    /**
+     * Specifies the Sdk.EntityReference values to be compared in the query.
+     * @param args An array of Sdk.EntityReference values.
+     */
+    class EntityReferences extends ValueBase
+    {
+        constructor( args: Sdk.EntityReference[] );
+
+        /**
+         * Returns the type of value with namespace prefix.
+         */
+        public getType(): string;
+
+        /**
+         * Returns an Sdk.Collection of Sdk.EntityReference values.
+         */
+        public getValues(): Sdk.Collection<number>;
+
+        /**
+         * Specifies the Long values to be compared in the query.
+         * @param setValueArgs An array of Sdk.EntityReference values.
+         */
+        public setValues( setValueArgs: Sdk.EntityReference[] ): void;
+    }
+
+    /**
+     * Specifies the Sdk.Query.Guids values to be compared in the query.
+     * @param args An array of GUID string values.
+     */
+    class Guids extends ValueBase
+    {
+        constructor( args: string[] );
+
+        /**
+         * Returns the type of value with namespace prefix.
+         */
+        public getType(): string;
+
+        /**
+         * Returns an Sdk.Collection of GUID string values.
+         */
+        public getValues(): Sdk.Collection<string>;
+
+        /**
+         * Specifies the Long values to be compared in the query.
+         * @param setValueArgs An array of GUID string values.
+         */
+        public setValues( setValueArgs: string[] ): void;
+    }
+
+    /**
+     * Specifies the Money values to be compared in the query.
+     * @param args An array of number values.
+     */
+    class Money extends ValueBase
+    {
+        constructor( args: number[] );
+
+        /**
+         * Returns the type of value with namespace prefix.
+         */
+        public getType(): string;
+
+        /**
+         * Returns an Sdk.Collection of number values.
+         */
+        public getValues(): Sdk.Collection<number>;
+
+        /**
+         * Specifies the Money values to be compared in the query.
+         * @param setValueArgs An array of number values.
+         */
+        public setValues( setValueArgs: number[] ): void;
+    }
+
+    /**
+     * Specifies the OptionSet values to be compared in the query.
+     * @param args An array of number values.
+     */
+    class OptionSets extends ValueBase
+    {
+        constructor( args: number[] );
+
+        /**
+         * Returns the type of value with namespace prefix.
+         */
+        public getType(): string;
+
+        /**
+         * Returns an Sdk.Collection of number values.
+         */
+        public getValues(): Sdk.Collection<number>;
+
+        /**
+         * Specifies the OptionSet values to be compared in the query.
+         * @param setValueArgs An array of number values.
+         */
+        public setValues( setValueArgs: number[] ): void;
+    }
+
+    /**
+     * Specifies the String values to be compared in the query.
+     * @param args An array of String values.
+     */
+    class Strings extends ValueBase
+    {
+        constructor( args: string[] );
+
+        /**
+         * Returns the type of value with namespace prefix.
+         */
+        public getType(): string;
+
+        /**
+         * Returns an Sdk.Collection of String values.
+         */
+        public getValues(): Sdk.Collection<string>;
+
+        /**
+         * Specifies the String values to be compared in the query.
+         * @param setValueArgs An array of String values.
+         */
+        public setValues( setValueArgs: string[] ): void
+    }
+
+    export enum LogicalOperator
+    {
+        Or,
+        And,
+    }
+}
+
+declare namespace Sdk.Util
+{
+    /**
+     * Verifies the parameter is a string formatted as a GUID.
+     * @param value The value to check.
+     */
+    function isGuid( value: string ): boolean;
+
+    /**
+     * Verifies the parameter is a string formatted as a GUID or null.
+     * @param value The value to check.
+     */
+    function isGuidOrNull( value: string ): boolean;
+
+    /**
+     * Verifies the parameter is a valid enum value.
+     * @param enumeration The enumeration.
+     * @param value The value to check.
+     */
+
+    /**
+     * Returns an empty GUID.
+     */
+    function getEmptyGuid(): string;
+
+    /**
+     * Formats a string with the arguments from an array.
+     * @param string The string containing placeholders for items in the array.
+     * @param args An array of strings to replace the placeholders.
+     */
+    function format( string: string, args: string[] ): string;
+
+    /**
+     *
+     */
+    function getError( resp: any ): string;
+
+    /**
+     * Returns the clinent URL.
+     */
+    function getClientUrl(): string;
+
+    /**
+     * Provides a way to override the client Url when a client-side context is not available.
+     * @param url The client URL to use instead of the default.
+     */
+    function setClientUrl( url: string ): void;
+
+    /**
+     *
+     */
+    function getXMLHttpRequest( action: string, async: boolean ): any;
+
+    /**
+     * Creates an entity from XML.
+     * @param The serialized entity returned from the SOAP service as XML.
+     */
+    function createEntityFromNode( node: string ): void;
+}
+
+declare namespace Sdk.Xml
+{
+}
+
+declare namespace Sdk.Mdq
+{
+    /**
+     * Defines a complex query to retrieve entity metadata.
+     * @param criteria The filter criteria for the metadata query.
+     * @param properties The properties to be returned by the query.
+     * @param attributeQuery A query expression for the entity attribute metadata to return.
+     * @param relationshipQuery A query expression for the entity relationship metadata to return.
+     * @param labelQuery A query expression for the labels to return.
+     */
+    export class EntityQueryExpression
+    {
+        constructor(
+            criteria: Sdk.Mdq.MetadataFilterExpression,
+            properties: Sdk.Mdq.MetadataPropertiesExpression,
+            attributeQuery?: Sdk.Mdq.AttributeQueryExpression,
+            relationshipQuery?: Sdk.Mdq.RelationshipQueryExpression,
+            labelQuery?: Sdk.Mdq.LabelQueryExpression );
+    }
+
+    /**
+     * An enumeration that specifies the type of deleted metadata to retrieve.
+     */
+    export enum DeletedMetadataFilters
+    {
+        All, // All deleted metadata
+        Attribute, // Deleted Attribute metadata
+        Default, // The value used if not set. Equals Entity
+        Entity, //Deleted Entity metadata
+        Label, //Deleted Label metadata
+        OptionSet, // Deleted OptionSet metadata
+        Relationship, //Deleted Relationship metadata
+    }
+
+    /**
+     * Specifies complex condition and logical filter expressions used for filtering the results of a metadata query.
+     * @param filterOperator The logical AND/OR filter operator.
+     */
+
+    export class MetadataFilterExpression
+    {
+        constructor( filterOperator: Sdk.Mdq.LogicalOperator );
+
+        /**
+         * Adds a condition. This method accepts either the properties to create a new Sdk.Mdq.MetadataConditionExpression or a Sdk.Mdq.MetadataConditionExpression as the first argument.
+         * @param propertyName The metadata property to evaluate.
+         * @param conditionOperator The condition operator.
+         * @param value The metadata value to evaluate.
+         */
+        public addCondition(
+            propertyName: SearchableEntityMetadataProperties|SearchableAttributeMetadataProperties|SearchableRelationshipMetadataProperties,
+            conditionOperator: MetadataConditionOperator,
+            value: Object ): void;
+        public addCondition(
+            propertyName: SearchableAttributeMetadataProperties, conditionOperator: MetadataConditionOperator, value: any): void;
+        public addCondition(
+            propertyName: SearchableEntityMetadataProperties|SearchableAttributeMetadataProperties|SearchableRelationshipMetadataProperties,
+            conditionOperator: MetadataConditionOperator,
+            value: Object ): void;
+        addCondition(propertyName: SearchableAttributeMetadataProperties, conditionOperator: MetadataConditionOperator): void;
+        public addCondition(
+            propertyName: SearchableEntityMetadataProperties|SearchableAttributeMetadataProperties|SearchableRelationshipMetadataProperties,
+            conditionOperator: MetadataConditionOperator,
+            value: Object): void;
+    }
+
+    /**
+     * Defines a complex query to retrieve attribute metadata for entities retrieved using an Sdk.Mdq.EntityQueryExpression.
+     * @param criteria The filter criteria for the metadata query.
+     * @param properties The properties to be returned by the query.
+     */
+    export class AttributeQueryExpression
+    {
+        constructor( criteria: MetadataFilterExpression, properties: Sdk.Mdq.MetadataPropertiesExpression );
+    }
+
+    /**
+     * Defines a complex query to retrieve entity relationship metadata for entities retrieved using an EntityQueryExpression.
+     * @param criteria The filter criteria for the metadata query.
+     * @param properties The properties to be returned by the query.
+     */
+    export class RelationshipQueryExpression
+    {
+        constructor( criteria: MetadataFilterExpression, properties: Mdq.MetadataPropertiesExpression );
+    }
+
+    /**
+     * Defines the languages for the labels to be retrieved for metadata items that have labels.
+     * @param languages An array of LCID number values.
+     */
+    export class LabelQueryExpression
+    {
+        constructor( languages: Array<number> );
+    }
+
+    /**
+     * Logical operator.
+     */
+    export enum LogicalOperator
+    {
+        And,
+        Or,
+    }
+
+    /**
+     * Specifies the properties for which non-null values are returned from a query.
+     * @param allProperties  Whether to retrieve all the properties of a metadata object.
+     * @param propertyNames: >An array of strings representing the metadata properties to retrieve.
+     */
+    export class MetadataPropertiesExpression
+    {
+        constructor( allProperties: boolean, propertyNames?: Array<EntityMetadataProperties|AttributeMetadataProperties|RelationshipMetadataProperties|any> );
+    }
+
+    export enum RelationshipMetadataProperties
+    {
+        AssociatedMenuConfiguration,
+        CascadeConfiguration,
+        HasChanged,
+        Entity1AssociatedMenuConfiguration,
+        Entity1IntersectAttribute,
+        Entity1LogicalName,
+        Entity2AssociatedMenuConfiguration,
+        Entity2IntersectAttribute,
+        Entity2LogicalName,
+        IntersectEntityName,
+        IsCustomizable,
+        IntroducedVersion,
+        IsCustomRelationship,
+        IsManaged,
+        IsValidForAdvancedFind,
+        MetadataId,
+        ReferencedAttribute,
+        ReferencedEntity,
+        ReferencingAttribute,
+        ReferencingEntity,
+        RelationshipType,
+        SchemaName,
+        SecurityTypes,
+    }
+
+    export enum AttributeMetadataProperties
+    {
+        AttributeOf,
+        AttributeType,
+        AttributeTypeName,
+        CalculationOf,
+        CanBeSecuredForCreate,
+        CanBeSecuredForRead,
+        CanBeSecuredForUpdate,
+        CanModifyAdditionalSettings,
+        ColumnNumber,
+        DefaultFormValue,
+        DefaultValue,
+        DeprecatedVersion,
+        Description,
+        DisplayName,
+        EntityLogicalName,
+        Format,
+        FormatName,
+        ImeMode,
+        IntroducedVersion,
+        IsAuditEnabled,
+        IsCustomAttribute,
+        IsCustomizable,
+        IsManaged,
+        IsPrimaryId,
+        IsPrimaryName,
+        IsRenameable,
+        IsSecured,
+        IsValidForAdvancedFind,
+        IsValidForCreate,
+        IsValidForRead,
+        IsValidForUpdate,
+        LinkedAttributeId,
+        LogicalName,
+        MaxLength,
+        MaxValue,
+        MetadataId,
+        MinValue,
+        OptionSet,
+        Precision,
+        PrecisionSource,
+        RequiredLevel,
+        SchemaName,
+        Targets,
+        YomiOf,
+    }
+
+    export enum EntityMetadataProperties
+    {
+        ActivityTypeMask,
+        Attributes,
+        AutoCreateAccessTeams,
+        AutoRouteToOwnerQueue,
+        CanBeInManyToMany,
+        CanBePrimaryEntityInRelationship,
+        CanBeRelatedEntityInRelationship,
+        CanCreateAttributes,
+        CanCreateCharts,
+        CanCreateForms,
+        CanCreateViews,
+        CanModifyAdditionalSettings,
+        CanTriggerWorkflow,
+        Description,
+        DisplayCollectionName,
+        DisplayName,
+        IconLargeName,
+        IconMediumName,
+        IconSmallName,
+        IntroducedVersion,
+        IsActivity,
+        IsActivityParty,
+        IsAIRUpdated,
+        IsAuditEnabled,
+        IsAvailableOffline,
+        IsBusinessProcessEnabled,
+        IsChildEntity,
+        IsConnectionsEnabled,
+        IsCustomEntity,
+        IsCustomizable,
+        IsDocumentManagementEnabled,
+        IsDuplicateDetectionEnabled,
+        IsEnabledForCharts,
+        IsImportable,
+        IsIntersect,
+        IsMailMergeEnabled,
+        IsManaged,
+        IsMappable,
+        IsQuickCreateEnabled,
+        IsReadingPaneEnabled,
+        IsRenameable,
+        IsValidForAdvancedFind,
+        IsValidForQueue,
+        IsVisibleInMobile,
+        IsVisibleInMobileClient,
+        LogicalName,
+        ManyToManyRelationships,
+        ManyToOneRelationships,
+        MetadataId,
+        ObjectTypeCode,
+        OneToManyRelationships,
+        OwnershipType,
+        PrimaryIdAttribute,
+        PrimaryImageAttribute,
+        PrimaryNameAttribute,
+        Privileges,
+        RecurrenceBaseEntityLogicalName,
+        ReportViewName,
+        SchemaName,
+    }
+
+    export enum SearchableEntityMetadataProperties
+    {
+        ActivityTypeMask,
+        AutoCreateAccessTeams,
+        AutoRouteToOwnerQueue,
+        CanBeInManyToMany,
+        CanBePrimaryEntityInRelationship,
+        CanBeRelatedEntityInRelationship,
+        CanCreateAttributes,
+        CanCreateCharts,
+        CanCreateForms,
+        CanCreateViews,
+        CanModifyAdditionalSettings,
+        CanTriggerWorkflow,
+        IconLargeName,
+        IconMediumName,
+        IconSmallName,
+        IntroducedVersion,
+        IsActivity,
+        IsActivityParty,
+        IsAIRUpdated,
+        IsAuditEnabled,
+        IsAvailableOffline,
+        IsBusinessProcessEnabled,
+        IsChildEntity,
+        IsConnectionsEnabled,
+        IsCustomEntity,
+        IsCustomizable,
+        IsDocumentManagementEnabled,
+        IsDuplicateDetectionEnabled,
+        IsEnabledForCharts,
+        IsImportable,
+        IsIntersect,
+        IsMailMergeEnabled,
+        IsManaged,
+        IsMappable,
+        IsQuickCreateEnabled,
+        IsReadingPaneEnabled,
+        IsRenameable,
+        IsValidForAdvancedFind,
+        IsValidForQueue,
+        IsVisibleInMobile,
+        IsVisibleInMobileClient,
+        LogicalName,
+        MetadataId,
+        ObjectTypeCode,
+        OwnershipType,
+        PrimaryIdAttribute,
+        PrimaryImageAttribute,
+        PrimaryNameAttribute,
+        RecurrenceBaseEntityLogicalName,
+        ReportViewName,
+        SchemaName,
+    }
+
+    export enum SearchableAttributeMetadataProperties
+    {
+        AttributeOf,
+        AttributeType,
+        CalculationOf,
+        CanBeSecuredForCreate,
+        CanBeSecuredForRead,
+        CanBeSecuredForUpdate,
+        CanModifyAdditionalSettings,
+        ColumnNumber,
+        DefaultFormValue,
+        DefaultValue,
+        DeprecatedVersion,
+        EntityLogicalName,
+        Format,
+        FormatName,
+        ImeMode,
+        IntroducedVersion,
+        IsAuditEnabled,
+        IsCustomAttribute,
+        IsCustomizable,
+        IsManaged,
+        IsPrimaryId,
+        IsPrimaryName,
+        IsRenameable,
+        IsSecured,
+        IsValidForAdvancedFind,
+        IsValidForCreate,
+        IsValidForRead,
+        IsValidForUpdate,
+        LinkedAttributeId,
+        LogicalName,
+        MaxLength,
+        MaxValue,
+        MetadataId,
+        MinValue,
+        Precision,
+        PrecisionSource,
+        RequiredLevel,
+        SchemaName,
+        YomiOf,
+    }
+
+    export enum SearchableRelationshipMetadataProperties
+    {
+        HasChanged,
+        Entity1IntersectAttribute,
+        Entity1LogicalName,
+        Entity2IntersectAttribute,
+        Entity2LogicalName,
+        IntersectEntityName,
+        IsCustomizable,
+        IntroducedVersion,
+        IsCustomRelationship,
+        IsManaged,
+        IsValidForAdvancedFind,
+        MetadataId,
+        ReferencedAttribute,
+        ReferencedEntity,
+        ReferencingAttribute,
+        ReferencingEntity,
+        RelationshipType,
+        SchemaName,
+        SecurityTypes,
+    }
+
+    export enum MetadataConditionOperator
+    {
+        Equals,
+        NotEquals,
+        In,
+        NotIn,
+        GreaterThan,
+        LessThan,
+    }
+
+    export interface IEntityMetadata
+    {
+        ActivityTypeMask: number;
+        Attributes: IAttributeMetadata[];
+        AutoCreateAccessTeams: any;
+        AutoRouteToOwnerQueue: boolean;
+        CanBeInManyToMany: ManagedProperty<boolean>;
+        CanBePrimaryEntityInRelationship: ManagedProperty<boolean>;
+        CanBeRelatedEntityInRelationship: ManagedProperty<boolean>;
+        CanCreateAttributes: ManagedProperty<boolean>;
+        CanCreateCharts: ManagedProperty<boolean>;
+        CanCreateForms: ManagedProperty<boolean>;
+        CanCreateViews: ManagedProperty<boolean>;
+        CanModifyAdditionalSettings: ManagedProperty<boolean>;
+        CanTriggerWorkflow: boolean;
+        Description: Label;
+        DisplayCollectionName: Label;
+        DisplayName: Label;
+        IconLargeName: string;
+        IconMediumName: string;
+        IconSmallName: string;
+        IntroducedVersion: any;
+        IsActivity: boolean;
+        IsActivityParty: boolean;
+        IsAIRUpdated: boolean;
+        IsAuditEnabled: ManagedProperty<boolean>;
+        IsAvailableOffline: boolean;
+        IsBusinessProcessEnabled: boolean;
+        IsChildEntity: boolean;
+        IsConnectionsEnabled: ManagedProperty<boolean>;
+        IsCustomEntity: boolean;
+        IsCustomizable: ManagedProperty<boolean>;
+        IsDocumentManagementEnabled: boolean;
+        IsDuplicateDetectionEnabled: ManagedProperty<boolean>;
+        IsEnabledForCharts: boolean;
+        IsImportable: boolean;
+        IsIntersect: boolean;
+        IsMailMergeEnabled: ManagedProperty<boolean>;
+        IsManaged: boolean;
+        IsMappable: ManagedProperty<boolean>;
+        IsQuickCreateEnabled: boolean;
+        IsReadingPaneEnabled: boolean;
+        IsRenameable: boolean;
+        IsValidForAdvancedFind: boolean;
+        IsValidForQueue: ManagedProperty<boolean>;
+        IsVisibleInMobile: ManagedProperty<boolean>;
+        IsVisibleInMobileClient: boolean;
+        LogicalName: string;
+        ManyToManyRelationships: ManyToManyRelationshipMetadata;
+        ManyToOneRelationships: OneToManyRelationshipMetadata;
+        MetadataId: string;
+        ObjectTypeCode: number;
+        OneToManyRelationships: OneToManyRelationshipMetadata;
+        OwnershipType: "BusinessOwned" | "BusinessParented" | "None	OrganizationOwned" | "TeamOwned	UserOwned";
+        PrimaryIdAttribute: string;
+        PrimaryImageAttribute: string;
+        PrimaryNameAttribute: string;
+        Privileges: SecurityPrivilegeMetadata[];
+        RecurrenceBaseEntityLogicalName: string;
+        ReportViewName: string;
+        SchemaName: string;
+    }
+
+    export interface SecurityPrivilegeMetadata
+    {
+        CanBeBasic: boolean;
+        CanBeDeep: boolean;
+        CanBeEntityReference: boolean;
+        CanBeGlobal: boolean;
+        CanBeLocal: boolean;
+        CanBeParentEntityReference: boolean;
+        ExtensionData: boolean;
+        Name: string;
+        PrivilegeId: string;
+        PrivilegeType: "Append" | "AppendTo" | "Assign" | "Create" | "Delete" | "None" | "Read" | "Share" | "Write";
+    }
+
+    export interface OneToManyRelationshipMetadata
+    {
+        AssociatedMenuConfiguration: AssociatedMenuConfiguration;
+        CascadeConfiguration: CascadeConfiguration;
+        HasChanged: any;
+        IntroducedVersion: any;
+        IsCustomizable: ManagedProperty<boolean>;
+        IsCustomRelationship: boolean;
+        IsHierarchical: any;
+        IsManaged: boolean;
+        IsValidForAdvancedFind: boolean;
+        MetadataId: string;
+        ReferencedAttribute: string;
+        ReferencedEntity: string;
+        ReferencingAttribute: string;
+        ReferencingEntity: string;
+        RelationshipType: string;
+        SchemaName: string;
+        SecurityTypes: any;
+    }
+
+    export interface CascadeConfiguration
+    {
+        Assign: CascadeType;
+        Delete: CascadeType;
+        ExtensionData: CascadeType;
+        Merge: CascadeType;
+        Reparent: CascadeType;
+        Share: CascadeType;
+        Unshare: CascadeType;
+    }
+
+    export type CascadeType = "Active" | "Cascade" | "NoCascade" | "UserOwned";
+
+    export interface ManyToManyRelationshipMetadata
+    {
+        Entity1AssociatedMenuConfiguration: AssociatedMenuConfiguration;
+        Entity1IntersectAttribute: string;
+        Entity1LogicalName: string;
+        Entity2AssociatedMenuConfiguration: AssociatedMenuConfiguration;
+        Entity2IntersectAttribute: string;
+        Entity2LogicalName: string;
+        HasChanged: boolean;
+        IntersectEntityName: string;
+        IntroducedVersion: any;
+        IsCustomizable: ManagedProperty<boolean>;
+        IsCustomRelationship: boolean;
+        IsManaged: boolean;
+        IsValidForAdvancedFind: boolean;
+        MetadataId: string;
+        RelationshipType: RelationshipType;
+        SchemaName: string;
+        SecurityTypes: SecurityType;
+    }
+
+    export interface AssociatedMenuConfiguration
+    {
+        Behavior: AssociatedMenuBehavior;
+        Group: AssociatedMenuGroup;
+        Label: Label;
+        Order: number;
+    }
+
+    export type AssociatedMenuBehavior = "DoNotDisplay" | "UseCollectionName" | "UseLabel";
+
+    export type AssociatedMenuGroup = "Details" | "Marketing" | "Sales" | "Service";
+
+    export type RelationshipType = "Default" | "ManyToManyRelationship" | "OneToManyRelationship";
+
+    export type SecurityType = "Append" | "Inheritance" | "None" | "ParentChild" | "Pointer";
+
+    export interface IAttributeMetadata
+    {
+        AttributeOf: string;
+        AttributeType: "Customer" | "DateTime" | "Decimal" | "Double" | "EntityName" | "Integer" | "Lookup" | "ManagedProperty" | "Memo" | "Money" | "Owner" | "PartyList" | "Picklist" | "State" | "Status" | "Uniqueidentifier" | "Virtual"
+        AttributeTypeName: "BigIntType" | "BooleanType" | "CalendarRulesType" | "CustomerType" | "DateTimeType" | "DecimalType" | "DoubleType" | "EntityNameType" | "ImageType" | "IntegerType" | "LookupType" | "ManagedPropertyType" | "MemoType" | "MoneyType" | "OwnerType" | "PartyListType" | "PicklistType" | "StateType	StatusType" | "StringType" | "UniqueidentifierType" | "VirtualType";
+        CalculationOf: any;
+        CanBeSecuredForCreate: boolean;
+        CanBeSecuredForRead: boolean;
+        CanBeSecuredForUpdate: boolean;
+        CanModifyAdditionalSettings: ManagedProperty<boolean>;
+        ColumnNumber: number;
+        DefaultFormValue: any;
+        DefaultValue: any;
+        DeprecatedVersion: any;
+        Description: Label;
+        DisplayName: Label;
+        EntityLogicalName: string;
+        Format: any;
+        FormatName: string;
+        ImeMode: any;
+        IntroducedVersion: any;
+        IsAuditEnabled: boolean;
+        IsCustomAttribute: boolean;
+        IsCustomizable: ManagedProperty<boolean>;
+        IsManaged: boolean;
+        IsPrimaryId: boolean;
+        IsPrimaryName: boolean;
+        IsRenameable: ManagedProperty<boolean>;
+        IsSecured: boolean;
+        IsValidForAdvancedFind: ManagedProperty<boolean>;
+        IsValidForCreate: boolean;
+        IsValidForRead: boolean;
+        IsValidForUpdate: boolean;
+        LinkedAttributeId: string;
+        LogicalName: string;
+        MaxLength: number;
+        MaxValue: any;
+        MetadataId: string;
+        MinValue: number;
+        OptionSet: any;
+        Precision: any;
+        PrecisionSource: any;
+        RequiredLevel: ManagedProperty<string>;
+        SchemaName: string;
+        Targets: string[];
+        YomiOf: any;
+    }
+
+    export interface ManagedProperty<T>
+    {
+        CanBeChanged: boolean;
+        ManagedPropertyLogicalName: string;
+        Value: T;
+    }
+
+    export interface Label
+    {
+        LocalizedLabels: LocalizedLabel[];
+        UserLocalizedLabel: LocalizedLabel;
+    }
+
+    export interface LocalizedLabel
+    {
+        Label: string;
+        LangaugeCode: number;
+        MetadataId: string;
+        HasChanged: boolean;
+        IsManaged: boolean;
+    }
+
+    namespace ValueEnums
+    {
+        export enum OwnershipType
+        {
+            None,
+            OrganizationOwned,
+            TeamOwned,
+            UserOwned,
+        }
+
+        export enum AttributeTypeCode
+        {
+            BigInt,
+            Boolean,
+            CalendarRules,
+            Customer,
+            DateTime,
+            Decimal,
+            Double,
+            EntityName,
+            Integer,
+            Lookup,
+            ManagedProperty,
+            Memo,
+            Money,
+            Owner,
+            PartyList,
+            Picklist,
+            State,
+            Status,
+            String,
+            Uniqueidentifier,
+            Virtual,
+        }
+
+
+        export enum AttributeRequiredLevel
+        {
+            ApplicationRequired,
+            None,
+            Recommended,
+            SystemRequired,
+        }
+
+
+        export enum DateTimeFormat
+        {
+            DateAndTime,
+            DateOnly,
+        }
+
+        export enum ImeMode
+        {
+            Active,
+            Auto,
+            Disabled,
+            Inactive,
+        }
+
+
+
+        export enum IntegerFormat
+        {
+            Duration,
+            Language,
+            Locale,
+            None,
+            TimeZone,
+        }
+
+
+        export enum SecurityTypes
+        {
+            Append,
+            Inheritance,
+            None,
+            ParentChild,
+            Pointer,
+        }
+
+        export enum StringFormat
+        {
+            Email,
+            PhoneticGuide,
+            Text,
+            TextArea,
+            TickerSymbol,
+            Url,
+            VersionNumber,
+        }
+    }
+}
+
+declare namespace Sdk.Mdq.ValueEnums
+{ }
diff --git a/microsoft-sdk-soap/microsoft-sdk-soap-tests.ts b/microsoft-sdk-soap/microsoft-sdk-soap-tests.ts
index 4141bec0d9..2e55285870 100644
--- a/microsoft-sdk-soap/microsoft-sdk-soap-tests.ts
+++ b/microsoft-sdk-soap/microsoft-sdk-soap-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="microsoft-sdk-soap.d.ts" />
+
 
 // QueryByAttribute
 var queryByAttribute = new Sdk.Query.QueryByAttribute( "account" );
diff --git a/microsoft-sdk-soap/microsoft-sdk-soap.d.ts b/microsoft-sdk-soap/microsoft-sdk-soap.d.ts
deleted file mode 100644
index 5ad7e295cb..0000000000
--- a/microsoft-sdk-soap/microsoft-sdk-soap.d.ts
+++ /dev/null
@@ -1,2970 +0,0 @@
-// Type definitions for Sdk.Soap.js
-// Project: https://code.msdn.microsoft.com/SdkSoapjs-9b51b99a
-// Definitions by: Markus Mauch <https://github.com/markusmauch/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../q/Q.d.ts"/>
-
-declare namespace Sdk
-{
-    interface IEntityView
-    {
-        attributes: AttributeCollection;
-        entityState: EntityState;
-        id: string;
-        logicalName: string;
-        relatedEntities: RelatedEntityCollection;
-    }
-
-    interface IEntityCollectionView
-    {
-        entityName: string;
-        entities: Array<IEntityView>;
-        minActiveRowVersion: string;
-        moreRecords: boolean;
-        pagingCookie: string;
-        totalRecordCount: number;
-        totalRecordCountLimitExceeded: boolean;
-    }
-
-    interface IEntityReferenceView
-    {
-        Id: string;
-        Type: string;
-        Name: string;
-    }
-
-    interface IEntityReferenceCollectionView extends Array<IEntityReferenceView>
-    {
-    }
-
-    class Q
-    {
-        /**
-         * Creates a link between records.
-         * @param entityName The logical name of the entity that is specified in the entityId parameter.
-         * @param entityId The ID of the record to which the related records are associated.
-         * @param relationship The name of the relationship to be used to create the link.
-         * @param relatedEntities A collection of Sdk.EntityReference objects to be associated.
-         */
-        static associate( entityName: string, entityId: string, relationship: string, relatedEntities: Sdk.Collection<Sdk.EntityReference> ): Q.Promise<void>;
-        /**
-         * Creates an entity record and returns a string representation of the GUID value that is the Id of the created entity.
-         * @param entity An entity instance.
-         */
-        static create( entity: Sdk.Entity ): Q.Promise<string>;
-
-        /**
-         * Deletes an entity record
-         * @param entityName The LogicalName of the entity to delete.
-         * @param id An ID of the record to delete.
-         */
-        static del( entityName: string, id: string ): Q.Promise<void>;
-
-        /**
-         * Removes a link between records.
-         * @param entityName The logical name of the entity that is specified in the entityId parameter.
-         * @param entityId The ID of the record to which the related records are disassociated.
-         * @param relationship The name of the relationship to be used to remove the link.
-         * @param relatedEntities A collection of Sdk.EntityReference objects to be disassociated.
-         */
-        static disassociate( entityName: string, entityId: string, relationship: string, relatedEntities: Sdk.Collection<Sdk.EntityReference> ): Q.Promise<void>;
-
-        /**
-         * Executes a SOAP Request using the SOAPAction Execute.
-         * @param request A request object.
-         */
-        static execute( request: Sdk.OrganizationRequest ): Q.Promise<OrganizationResponse>;
-
-        /**
-         * Retrieves an entity instance.
-         * @param entityName The logical name of the entity to retrieve.
-         * @param id The id of the entity to retrieve.
-         * @param columnSet The columns of the entities to retrieve.
-         */
-        static retrieve( entityName: string, id: string, columnSet: Sdk.ColumnSet ): Q.Promise<Entity>;
-
-        /**
-         * Retrieves the results of a query
-         * @param query An Sdk.Query.QueryByAttribute query.
-         */
-        static retrieveMultiple( query: Sdk.Query.QueryByAttribute ): Q.Promise<Sdk.EntityCollection>;
-
-        /**
-         * Retrieves the results of a query
-         * @param query An Sdk.Query.QueryExpression query.
-         */
-        static retrieveMultiple( query: Sdk.Query.QueryExpression ): Q.Promise<Sdk.EntityCollection>;
-
-        /**
-         * Retrieves the results of a query
-         * @param query An Sdk.Query.FetchExpression query.
-         */
-        static retrieveMultiple( query: Sdk.Query.FetchExpression ): Q.Promise<Sdk.EntityCollection>;
-
-        /**
-         * Updates an entity instance.
-         * @param entity An entity instance to update.
-         */
-        static update( entity: Entity ): Q.Promise<boolean>;
-    }
-
-    class ColumnSet
-    {
-        /**
-         * Specifies the attributes for which non- null values are returned from a query.
-         * @param columns Comma separated string values for attribute logical names.
-         */
-        constructor( ...columns: string[] );
-
-        /**
-         * Specifies the attributes for which non- null values are returned from a query.
-         * @param columns An array of string values.
-         */
-        constructor( columns: string[] );
-
-        /**
-         * Specifies the attributes for which non- null values are returned from a query.
-         * @param allColumns If Boolean true value is passed as the first parameter all columns will be included. (Not recommended for production code).
-         */
-        constructor( allColumns: boolean );
-
-        /**
-         * Gets the collection of column names.
-         * @returns The collection of column names.
-         */
-        getColumns(): Sdk.Collection<string>;
-
-        /**
-         * Adds a column to the collection.
-         * @param column The logical name of the attribute to add.
-         */
-        addColumn( column: string ): void;
-
-        /**
-         * Adds a string array of column names.
-         * @param columns A string array of column names.
-         */
-        addColumns( columns: Array<string> ): void;
-
-        /**
-         * Sets the AllColumns property.
-         * @params allColumns A boolean value.
-         */
-        setAllColumns( allColumns: boolean ): void;
-
-        /**
-         * Whether all columns will be returned.
-         */
-        getAllColumns(): boolean;
-
-        /**
-         * Gets the number of columns.
-         */
-        getCount(): number;
-
-
-        /// prototype methods
-
-        /**
-         * Removes a column from the ColumnSet.
-         * @param columnName The logical name of an attribute to be removed from the ColumnSet.
-         * @param errorIfNotFound Whether to throw an error when the column to remove is not found. The default is false
-         */
-        removeColumn( columnName: string, errorIfNotFound?: boolean ): void;
-
-        /**
-         * The XML node with "<d:columnSet>" as the root element.
-         */
-        toXml(): string;
-
-        /**
-         * XML nodes for columnSet properties.
-         */
-        toValueXml(): string;
-    }
-
-    class ValueType
-    {
-    }
-
-    class Collection<T>
-    {
-        /**
-         * A Collection for a specified type.
-         * @param type The function that specifies the type.
-         * @param items An array of items to add to the collection.
-         */
-        constructor( type: T, items?: Array<T> );
-
-        /**
-         * Gets the type defined for the collection.
-         */
-        getType(): T;
-
-        /**
-         * Adds an item to the collection.
-         * @param item An item to add to the collection.
-         */
-        add( item: T ): void;
-
-        /**
-         * Adds an array of objects to the collection.
-         * @param items An array of items to add to the collection.
-         */
-        addRange( items: any[] ): void;
-
-        /**
-         * Removes all items from the collection.
-         */
-        clear(): void;
-
-        /**
-         * Returns whether an object exists within the collection.
-         * @param item The item to search in the collection.
-         */
-        contains( item: T ): boolean;
-
-        /**
-         * Returns whether an object exists within the collection.
-         * @param predicate A comparer function which is invoked for each item of the collection.
-         */
-        contains( predicate: ( item: T ) => boolean ): boolean;
-
-        /**
-         * Returns an Sdk.Collection that contains all the items of this collection that satisfy the specified predicate function.
-         * @param predicate A predicate function that takes a collection item as argument and returns a boolean.
-         */
-        select( predicate: ( item: T ) => boolean ): Collection<T>;
-
-        /**
-         * Applies the action contained within a delegate function.
-         * @param fn Delegate function with parameters for item and index.
-         */
-        forEach( fn: ( item: T, index: number ) => any ): void;
-
-        /**
-         * Gets the item in the collection at the specified index.
-         * @param index The index of the item to return.
-         */
-        getByIndex( index: number ): T;
-
-        /**
-         * Removes an item from the collection.
-         * @param item A reference to the item to be removed.
-         */
-        remove( item: T ): void;
-
-        /**
-         * Gets a copy of the array of items in the collection.
-         */
-        toArray(): Array<T>;
-
-        /**
-         * Returns the number of items in the collection.
-         */
-        getCount(): number;
-    }
-
-    class EntityCollection
-    {
-        /**
-         * Contains a collection of entity instances.
-         * @param entities Initializes a new instance of the EntityCollection class setting the Sdk.Collection of Sdk.Entity objects.
-         */
-        constructor( entities: Sdk.Collection<Sdk.Entity> );
-
-        /**
-         * Adds an entity to the collection.
-         * @param entity
-         */
-        addEntity( entity: Sdk.Entity ): void;
-
-        /**
-         * Gets the collection of entities.
-         */
-        getEntities(): Sdk.Collection<Sdk.Entity>;
-
-        /**
-         * Gets an entity in the collection.
-         * @param index The index of the entity in the collection.
-         */
-        getEntity( index: number ): Sdk.Entity;
-
-        /**
-         * Gets an entity in the collection.
-         * @param id The id of the entity in the collection.
-         */
-        getEntity( id: Sdk.Guid ): Sdk.Entity;
-
-        /**
-         * Sets an item in the collection.
-         * @param index The index of the entity in the collection.
-         * @param value The Sdk.Entity value to set.
-         */
-        setEntity( index: number, value: Sdk.Entity ): void;
-
-        /**
-         * Sets an item in the collection.
-         * @param id The Sdk.Guid id of the entity in the collection.
-         * @param value The Sdk.Entity value to set.
-         */
-        setEntity( id: Sdk.Guid, value: Sdk.Entity ): void;
-
-        /**
-         * Gets the logical name of the entity.
-         */
-        getEntityName(): string;
-
-        /**
-         * Sets the logical name of the entity.
-         * @param name The logical name of the entity.
-         */
-        setEntityName( name: string ): void;
-
-        /**
-         * Gets the lowest active row version value.
-         */
-        getMinActiveRowVersion(): string;
-
-        /**
-         * Sets the lowest active row version value.
-         * @param minActiveRowVersion The lowest active row version value.
-         */
-        setMinActiveRowVersion( minActiveRowVersion: string ): void;
-
-        /**
-         * Gets whether there are more records available.
-         */
-        getMoreRecords(): boolean;
-
-        /**
-         * Sets whether there are more records available.
-         * @param moreRecords Whether there are more records available.
-         */
-        setMoreRecords( moreRecords: boolean ): void;
-
-        /**
-         * Gets the current paging information.
-         */
-        getPagingCookie(): string;
-
-        /**
-         * Sets the current paging information.
-         * @param pagingCookie The current paging information.
-         */
-        setPagingCookie( pagingCookie: string ): void;
-
-        /**
-         * Gets the total number of records in the collection if ReturnTotalRecordCount was true when the query was executed.
-         */
-        getTotalRecordCount(): number;
-
-        /**
-         * Sets the total number of records in the collection if ReturnTotalRecordCount was true when the query was executed.
-         * @param totalRecordCount The total number of records in the collection if ReturnTotalRecordCount was true when the query was executed.
-         */
-        setTotalRecordCount( totalRecordCount: number ): void;
-
-        /**
-         * Gets whether the results of the query exceeds the total record count.
-         */
-        getTotalRecordCountLimitExceeded(): boolean;
-
-        /**
-         * Sets whether the results of the query exceeds the total record count.
-         * @param totalRecordCountLimitExceeded Whether the results of the query exceeds the total record count.
-         */
-        setTotalRecordCountLimitExceeded( totalRecordCountLimitExceeded: boolean ): void;
-
-        /**
-         * XML definition of an the child nodes of an entity.
-         */
-        toValueXml(): string;
-
-        /**
-         * Returns a view of the entity collection
-         */
-        view(): IEntityCollectionView;
-    }
-
-    class EntityReferenceCollection
-    {
-        /**
-         * Contains a collection of EntityReference instances.
-         * @param entityReferences Initializes a new instance of the EntityReferenceCollection class setting the Sdk.Collection of Sdk.EntityReference objects.
-         */
-        constructor( entityReferences?: Sdk.Collection<EntityReference> );
-
-        /**
-         * Gets the collection of entity references.
-         */
-        getEntityReferences(): Sdk.Collection<EntityReference>;
-
-        /**
-         * Sets the collection of entity references.
-         * @param entityReferences The entity references
-         */
-        setEntityReferences( entityReferences: Sdk.Collection<EntityReference> ): void;
-
-
-        /// prototype methods
-
-        /**
-         * Removes an entity reference to the collection.
-         * @param entityReference The entity reference to remove.
-         */
-        remove( entityReference: Sdk.EntityReference ): void;
-
-        /**
-         * Returns a view of the data in an entity reference collection instance.
-         */
-        view(): IEntityReferenceCollectionView;
-
-        /**
-         * Returns the values of serialized entity reference collection as XML nodes.
-         */
-        toValueXml(): string;
-    }
-
-    class RelatedEntityCollection extends EntityCollection
-    {
-    }
-
-    class AttributeCollection extends Collection<AttributeBase>
-    {
-        constructor();
-
-        /**
-         * Adds an attribute to the Attribute Collection.
-         * @param attribute The attribute to add.
-         * @param isChanged Override the the attribute IsChanged value.
-         */
-        add( attribute: AttributeBase, isChanged?: boolean ): void;
-
-        /**
-         * Gets the attributes in the collection.
-          */
-        getAttributes(): Collection<AttributeBase>;
-
-
-        /// prototype methods
-
-        /**
-         * Allows for a delegate function to be applied to each attribute in the collection.
-         * @param fm The function to be applied. Function should have parameters for the attribute and the iterator i.e.: '(att,i)'
-         */
-        forEach( fn: ( attribute: AttributeBase, index: number ) => any ): void;
-
-        /**
-         * Returns all attributes in the collection.
-         */
-        get(): Sdk.Collection<AttributeBase>;
-
-        /**
-         * Returns the attribute with matching name.
-         * @param attribuetName
-         */
-        get( attribuetName: string ): AttributeBase;
-
-        /**
-         * Returns the attribute with matching index.
-         * @param attribuetName
-         */
-        get( index: number ): AttributeBase;
-
-        /**
-         * Gets an attribute at a given index.
-         * @param index The index.
-         */
-        getAttributeByIndex( index: number ): AttributeBase;
-
-        /**
-         * Gets an attribute with a given name.
-         * @param name The Logical name of the attribute.
-         */
-        getAttributeByName( name: string ): AttributeBase;
-
-        /**
-         * Gets an array of the names of attributes in a collection.
-         */
-        getNames(): Array<string>;
-        /**
-         * The XML for an attribute collection.
-         */
-        toXml( action: string ): string;
-    }
-
-    class FormattedValueCollection
-    {
-    }
-
-    class RelatedEntitiesCollection
-    {
-    }
-
-    class AttributeBase
-    {
-        /**
-         * Gets whether the value of the attribute has changed.
-         */
-        getIsChanged(): boolean;
-
-        /**
-         * Gets the logical name of the attribute.
-         */
-        getName(): string;
-
-        /**
-         * Gets the value type of the attribute.
-         */
-        getType(): Sdk.ValueType;
-
-        /**
-         * Gets the value of the attribute.
-         * The type of value depends on the type of attribute.
-         */
-        getValue(): any;
-
-        /**
-         * Whether the value of the attribute is set.
-         */
-        isValueSet(): boolean;
-
-        /**
-         * Sets whether the value of the attribute has changed.
-         * @param isChanged Whether the value of the attribute has changed.
-         */
-        setIsChanged( isChanged: boolean ): void;
-
-        /**
-         * Sets the name of the attribute
-         * @param name The name of the attribute.
-         */
-        setName( name: string ): void;
-
-        /**
-         * For internal use only.
-         * @param type The type of the attribute.
-         */
-        setType( type: Sdk.ValueType ): void;
-
-        /**
-         * Sets the general value of the attribute
-         * @param name The value of the attribute.
-         */
-        setValue( value: any ): void;
-
-        /// prototype methods
-        /**
-         * XML node for Attribute.
-         */
-        toXml( action: string ): string;
-    }
-
-    class Boolean extends AttributeBase
-    {
-        /**
-         * A Boolean Attribute.
-         * @param name The logical name of the attribute .
-         * @param value The value of the managed property.
-         */
-        constructor( name: string, value?: boolean )
-
-        /**
-         * Gets the value of a Boolean attribute.
-         */
-        getValue(): boolean;
-
-        /**
-         * Sets the value of a Boolean attribute.
-         * @param value
-         */
-        setValue( value: boolean ): void;
-    }
-
-    class DateTime extends AttributeBase
-    {
-        /**
-         * A DateTime Attribute.
-         * @param name The logical name of the attribute.
-         * @param value The value of the attribute.
-         */
-        constructor( name: string, value?: Date );
-
-        /**
-         * Gets the value of a DateTime attribute.
-         */
-        getValue(): Date;
-
-        /**
-         * Sets the value of a DateTime attribute.
-         * @param value The value to set.
-         */
-        setValue( value: Date ): void;
-    }
-
-    class Decimal extends AttributeBase
-    {
-        /**
-         * A Decimal Attribute.
-         * @param name The logical name of the attribute.
-         * @param value The value of the attribute.
-         */
-        constructor( name: string, value?: number );
-
-        /**
-         * Gets the value of a Decimal attribute.
-         */
-        getValue(): number;
-
-        /**
-         * Sets the value of a Decimal attribute.
-         * @param value The value to set.
-         */
-        setValue( value: number ): void;
-    }
-
-    class Double
-    {
-        /**
-         * A Double Attribute.
-         * @param name The logical name of the attribute.
-         * @param value The value of the attribute.
-         */
-        constructor( name: string, value?: number );
-
-        /**
-         * Gets the value of a Double attribute.
-         */
-        getValue(): number;
-
-        /**
-         * Sets the value of a Double attribute.
-         * @param value The value to set.
-         */
-        setValue( value: number ): void;
-    }
-
-    class Guid extends AttributeBase
-    {
-        /**
-         * A Guid Attribute.
-         * @param name The logical name of the attribute.
-         * @param value" The value of the attribute
-         */
-        constructor( name: string, value?: string );
-
-        /**
-         * Gets the value of a Guid attribute.
-         */
-        getValue(): string;
-
-        /**
-         * Sets the value of a Guid attribute.
-         * @param value The value to set.
-         */
-        setValue( value: string ): void;
-    }
-
-    class Int extends AttributeBase
-    {
-        /**
-         * An Integer Attribute.
-         * @param name The logical name of the attribute.
-         * @param value The value of the attribute.
-         */
-        constructor( name: string, value?: number );
-
-        /**
-         * Gets the value of an Integer attribute.
-         */
-        getValue(): number;
-
-        /**
-         * Sets the value of an Integer attribute.
-         * @param value The value to set.
-         */
-        setValue( value: number ): void;
-    }
-
-    class Long extends AttributeBase
-    {
-        /**
-         * A Long Attribute.
-         * @param name The logical name of the attribute.
-         * @param value The value of the attribute.
-         */
-        constructor( name: string, value?: number );
-
-        /**
-         * Gets the value of a Long attribute.
-         */
-        getValue(): number;
-
-        /**
-         * Sets the value of a Long attribute.
-         * @param value The value to set.
-         */
-        setValue( value: number ): void;
-    }
-
-    class Lookup extends AttributeBase
-    {
-        /**
-         * A Lookup Attribute.
-         * @param name The logical name of the attribute.
-         * @param value The value of the attribute.
-         */
-        constructor( name: string, value?: EntityReference );
-
-        /**
-         * Gets the value of a Lookup attribute.
-         */
-        getValue(): EntityReference;
-
-        /**
-         * Sets the value of a Lookup attribute.
-         * @param value The value to set.
-         */
-        setValue( value: EntityReference ): void;
-    }
-
-    class Money extends AttributeBase
-    {
-        /**
-         * A Money Attribute.
-         * @param name The logical name of the attribute.
-         * @param value The value of the attribute.
-         */
-        constructor( name: string, value?: number );
-
-        /**
-         * Gets the value of a Money attribute.
-         */
-        getValue(): number;
-
-        /**
-         * Sets the value of a Money attribute.
-         * @param value The value to set.
-         */
-        setValue( value: number ): void;
-    }
-
-    class OptionSet extends AttributeBase
-    {
-        /**
-         * An OptionSet Attribute.
-         * @param name The logical name of the attribute.
-         * @param value The value of the attribute.
-         */
-        constructor( name: string, value?: number );
-
-        /**
-         * Gets the value of a OptionSet attribute.
-         */
-        getValue(): number;
-
-        /**
-         * Sets the value of an OptionSet attribute.
-         * @param value The value to set.
-         */
-        setValue( value: number ): void;
-    }
-
-    class PartyList extends AttributeBase
-    {
-        /**
-         * A PartyList Attribute.
-         * @param name The logical name of the attribute.
-         * @param value The value of the attribute.
-         */
-        constructor( name: string, value?: EntityCollection );
-
-        /**
-         * Gets the value of a PartyList attribute.
-         */
-        getValue(): EntityCollection;
-
-        /**
-         * Sets the value of a PartyList attribute.
-         * @param value The value to set.
-         */
-        setValue( value: EntityCollection ): void;
-    }
-
-    class String extends AttributeBase
-    {
-        /**
-         * A String Attribute.
-         * @param name The logical name of the attribute.
-         * @param value The value of the attribute.
-         */
-        constructor( name: string, value?: string );
-
-        /**
-         * Gets the value of a String attribute.
-         */
-        getValue(): string;
-
-        /**
-         * Sets the value of a String attribute.
-         * @param value The value to set.
-         */
-        setValue( value: string ): void;
-    }
-
-    class EntityState
-    {
-    }
-
-    class Entity
-    {
-        /**
-         * Represents an instance of an entity (a record).
-         * @param type The logical name of the entity.
-         */
-        constructor( type: string );
-
-        /**
-         * Gets the collection of attributes for the entity.
-         */
-        getAttributes(): Sdk.AttributeCollection;
-
-        /**
-         * Gets the collection of attributes for the entity.
-         * @param attributeName The attribute with matching name is returned.
-         */
-        getAttributes( attributeName: string ): Sdk.AttributeBase;
-
-        /**
-         * Gets the collection of attributes for the entity.
-         * @param index The attribute with matching index is returned.
-         */
-        getAttributes( index: number ): Sdk.AttributeBase;
-
-        /**
-         * Checks whether the entity has an attribute that satisfies the specified predicate.
-         * @param A comparer function that takes an Sdk.AttributeBase as argument and returns a boolean.
-         */
-        containsAttribute( predicate: ( attribute: Sdk.AttributeBase ) => boolean ): boolean;
-
-        /**
-         * Checks whether the entity has an attribute with the specified name.
-         * @param The name of the attribute.
-         */
-        containsAttribute( name: string ): boolean;
-
-        /**
-         * Sets the collection of attributes for the entity.
-         * @param attributes The collection of attributes for the entity.
-         */
-        setAttributes( attributes: Sdk.AttributeCollection ): void;
-
-        /**
-         * Gets the state of the entity.
-         */
-        getEntityState(): Sdk.EntityState;
-
-        /**
-         * Sets the state of the entity.
-         * @param state The state of the entity.
-         */
-        setEntityState( state: Sdk.EntityState ): void;
-
-        /**
-         * Gets the collection of formatted values for the entity attributes.
-         */
-        getFormattedValues(): Sdk.FormattedValueCollection;
-
-        /**
-         * Sets the collection of formatted values for the entity attributes.
-         * @param values" The collection of formatted values for the entity attributes.
-         */
-        setFormattedValues( values: Sdk.FormattedValueCollection ): void;
-
-        /**
-         * Gets the Id of the record represented by this entity instance.
-         */
-        getId(): string;
-
-        /**
-         * Sets the Id of the record represented by this entity instance.
-         * @param id The Id of the record represented by this entity instance.
-         * @param override Allow setting the Id property, for example when creating a new record from an existing one.
-         */
-        setId( id: string, override?: boolean ): void;
-
-        /**
-         * Gets the logical name of the entity.
-         */
-        getType(): string;
-
-        /**
-         * Sets the logical name of the entity.
-         * @param type The logical name of the entity.
-         */
-        setType( type: string ): void;
-
-        /**
-         * Gets a collection of related entities.
-         */
-        getRelatedEntities(): Sdk.RelatedEntitiesCollection;
-
-        /**
-         * Sets a collection of related entities.
-         * @param relatedEntities A collection of related entities.
-         */
-        setRelatedEntities( relatedEntities: Sdk.RelatedEntitiesCollection ): void;
-
-        /**
-         * Adds an attribute with an optional value to a newly instantiated Sdk.Entity
-         * @param attribute The attribute to add
-         * @param isChanged Whether the attribute should be considered changed, the default is true.
-         */
-        addAttribute( attribute: Sdk.AttributeBase, isChanged?: boolean ): void;
-
-        /**
-         * Adds an entity to the related entities.
-         * @param relationshipSchemaName The relationship SchemaName.
-         * @param entity The entity to add.
-         */
-        addRelatedEntity( relationshipSchemaName: string, entity: Sdk.Entity ): void;
-
-        /**
-         * Gets the value to indicate whether data for the entity has changed.
-         */
-        getIsChanged(): boolean;
-
-        /**
-         * Sets the value to indicate whether data for the entity has changed.
-         * @param isChanged The value to indicate whether data for the entity has changed.
-         */
-        setIsChanged( isChanged: boolean ): void;
-
-        /**
-         * Gets the value of the specified attribute.
-         * @param logicalName The logical name of the attribute.
-         */
-        getValue( logicalName: string ): any;
-
-        /**
-         * Generates properties for the entity based on metadata.
-         */
-        initializeSubClass( metadata: Sdk.Mdq.IEntityMetadata ): void;
-
-        /**
-         * Sets the value of the specified attribute.
-         * @param logicalName The logical name of the attribute.
-         * @param value The value for the attribute. Simple JavaScript types may be used for most attribute types. Sdk.EntityReference, Sdk.EntityCollection, and Sdk.BooleanManagedPropertyValue cannot use simple JavaScript types.
-         */
-        setValue( logicalName: string, value: Object ): void;
-
-        /**
-         * Generates an entity reference.
-         */
-        toEntityReference(): Sdk.EntityReference;
-
-        /**
-         * Overrides the default toString method.
-         */
-        toString(): string;
-
-        /**
-         * XML definition of an the child nodes of an entity.
-         * @param action
-         */
-        toValueXml( action: string ): string;
-
-        /**
-         * XML definition of an entity where the root node is <entity>.
-         */
-        toXml( action: string ): string;
-
-        /**
-         * Returns a view of the data in an entity instance
-         */
-        view(): IEntityView;
-    }
-
-    class EntityReference
-    {
-        /**
-         * Identifies a record.
-         * @param logicalName The logical name of the entity.
-         * @param id The id of the record.
-         * @param name The value of the primary attribute of the entity instance. This property can contain a value or null. This property is not automatically populated unless the EntityReference object has been retrieved from the server.
-         */
-        constructor( logicalName: string, id: string, name?: string );
-
-        /**
-         * Gets the logicalName representing the type of referenced entity.
-         */
-        getType(): string;
-
-        /**
-         * Gets the Id value of the referenced entity.
-         */
-        getId(): string;
-
-        /**
-         * Gets the primary attribute value of the referenced entity.
-         */
-        getName(): string;
-
-        /**
-         * Sets the logicalName representing the type of referenced entity.
-         * @param type The logicalName representing the type of referenced entity.
-         */
-        setType( type: string ): void;
-
-        /**
-         * Sets the Id value of the entity.
-         * @param id The Id value of the entity.
-         */
-        setId( id: string ): void;
-
-        /**
-         * Sets the primary attribute value of the referenced entity.
-         * @param name The primary attribute value of the referenced entity.
-         */
-        setName( name: string ): void;
-
-
-        /// prototype methods
-
-        /**
-         * Returns a serialized entity reference where the root element is <a:EntityReference>.
-         */
-        toXml(): string;
-
-        /**
-         * Returns the values of serialized entity reference as XML nodes.
-         */
-        toValueXml(): string;
-
-        /**
-         * Returns a view of the data in an EntityReference
-         */
-        view(): IEntityReferenceView;
-    }
-
-    class OrganizationRequest
-    {
-        /**
-         * Sets the request XML.
-         * @param xml The request XML.
-         */
-        setRequestXml( xml: string ): void;
-
-        /**
-         * Gets the request XML.
-         */
-        getRequestXml(): string;
-
-        /**
-         * Sets the response type.
-         * @param type A class that inherits from Sdk.OrganizationResponse.
-         */
-        setResponseType( type: OrganizationResponse ): void;
-
-        /**
-         * Gets the response type.
-         */
-        getResponseType(): OrganizationResponse;
-    }
-
-    class OrganizationResponse
-    {
-    }
-
-    /**
-     * Contains the data that is needed to convert a query in FetchXML to a QueryExpression.
-     * @param fetchXml Sets the query to convert.
-     */
-    class FetchXmlToQueryExpressionRequest extends Sdk.OrganizationRequest
-    {
-        constructor( fetchXml: string );
-
-        /**
-         * Sets the query to convert.
-         * @param The query to convert.
-         */
-        setFetchXml( value: string ): void;
-    }
-
-    /**
-     * Response to FetchXmlToQueryExpressionRequest.
-     * @param responseXml The response XML to the FetchXmlToQueryExpressionRequest.
-     */
-    class FetchXmlToQueryExpressionResponse extends Sdk.OrganizationResponse
-    {
-        constructor( responseXml: string );
-
-        /**
-         * Gets the results of the query conversion.
-         */
-        public getQuery(): Query.QueryExpression;
-    }
-
-    /**
-     * Contains the data that is needed to  convert a query, which is represented as a QueryExpression class, to its equivalent query, which is represented as FetchXML.
-     * @param query The query.
-     */
-    class QueryExpressionToFetchXmlRequest extends Sdk.OrganizationRequest
-    {
-        constructor( query: Sdk.Query.QueryBase );
-
-        /**
-         * Sets the query to convert.
-         * @param query The query.
-         * @param query
-         */
-        public setQuery( query: Sdk.Query.QueryBase ): void;
-    }
-
-    /**
-     * Response to QueryExpressionToFetchXmlRequest.
-     */
-    class QueryExpressionToFetchXmlResponse extends Sdk.OrganizationResponse
-    {
-        constructor( responseXml: string );
-
-        /**
-         * Gets the results of the query conversion.
-         */
-        public getFetchXml(): string;
-    }
-
-    /**
-     * Request to retrieve metadata and metadata changes.
-     * @param query The Sdk.Mdq.EntityQueryExpression that defines the query.
-     * @param clientVersionStamp The Sdk.Mdq.RetrieveMetadataChangesResponse.ServerVersionStamp value from a previous request. When included only the metadata changes since the previous request will be returned.
-     * @param deletedMetadataFilters An Sdk.Mdq.DeletedMetadataFilters enumeration value. When included the deleted metadata changes will be limited to the types defined by the enumeration.
-     */
-    class RetrieveMetadataChangesRequest extends Sdk.OrganizationRequest
-    {
-        constructor( query: Sdk.Mdq.EntityQueryExpression, clientVersionStamp?: string, deletedMetadataFilters?: Sdk.Mdq.DeletedMetadataFilters );
-        getEntityMetadata(): Sdk.Mdq.IEntityMetadata[];
-        getServerVersionStamp(): string;
-        getDeletedMetadata(): Object;
-    }
-
-    /**
-     * Response to RetrieveMetadataChangesRequest.
-     * @param resopnseXml The response XML.
-     */
-    class RetrieveMetadataChangesResponse
-    {
-        constructor( responseXml: string );
-
-        /***
-         *
-         */
-        public getEntityMetadata(): Array<Mdq.IEntityMetadata>;
-
-        /***
-         *
-         */
-        public getServerVersionStamp(): string;
-
-        /***
-         *
-         */
-        public getDeletedMetadata(): any;
-    }
-
-
-   /**
-    * Contains the data that is needed to set the state of an entity record.
-    * @param entityMoniker Sets the entity.
-    * @param state Sets the state of the entity record.
-    * @param status Sets the status that corresponds to the State property.
-    */
-    class SetStateRequest extends Sdk.OrganizationRequest
-    {
-        constructor( entityMoniker: EntityReference, state: number, status: number );
-
-        /**
-         * Sets the entity.
-         * @param value The entity.
-         */
-        public setEntityMoniker( value: EntityReference ): void;
-
-        /**
-         * Sets the state of the entity record.
-         * @param value The state of the entity record.
-         */
-        setState( value: number ): void;
-
-        /**
-         * Sets the status that corresponds to the State property.
-         * @param value The status that corresponds to the State property.
-         */
-        setStatus( value: number ): void;
-    }
-
-    /**
-     * Response to SetStateRequest.
-     */
-    class SetStateResponse
-    {
-        constructor( responseXml: string );
-    }
-}
-
-declare namespace Sdk.Query
-{
-    class QueryBase
-    {
-        /**
-         * Internal Use Only.
-         * @param type An Abstract class for different query classes to inherit from.
-         */
-        constructor( type: string );
-
-        /**
-         * Gets the columns to include.
-         */
-        getColumnSet(): Sdk.ColumnSet;
-
-        /**
-         * Sets the columns to include.
-         * @param columns An Sdk.ColumnSet instance.
-         */
-        setColumnSet( columns: Sdk.ColumnSet ): void;
-
-        /**
-         * Sets the columns to include.
-         * @param columns An array of attribute logical names for the columns to return.
-         */
-        setColumnSet( columns: Array<string> ): void;
-
-        /**
-         * Sets the columns to include.
-         * @param columns Pass each attribute logical name as an argument.
-         */
-        setColumnSet( ...columns: string[] ): void;
-
-        /**
-         *
-         */
-        getQueryType(): string;
-
-        /**
-         * Gets the logical name of the entity.
-         */
-        getEntityName(): string;
-
-        /**
-         * Sets the logical name of the entity.
-         * @param name The logical name of the entity.
-         */
-        setEntityName( name: string ): void;
-
-        /**
-         * Gets the number of pages and the number of entity instances per page returned from the query.
-         */
-        getPageInfo(): Sdk.Query.PagingInfo;
-
-        /**
-         * Sets the number of pages and the number of entity instances per page returned from the query.
-         * @param pageInfo The number of pages and the number of entity instances per page returned from the query.
-         */
-        setPageInfo( pageInfo: Sdk.Query.PagingInfo ): void;
-
-        /**
-         * Adds the specified column to the column set.
-         * @param columnName The logical name of the column to add.
-         */
-        addColumn( columnName: string ): void;
-
-        /**
-         * Removes a column from the ColumnSet used by the query.
-         * @param columnName The logical name of an attribute to be removed from the ColumnSet.
-         * @param errorIfNotFound Whether to throw an error when the column to remove is not found. The default is false.
-         */
-        removeColumn( columnName: string, errorIfNotFound?: boolean ): void;
-
-        /**
-         * Gets an Sdk.Collection of Sdk.Query.OrderExpression instances that define the order in which the entity instances are returned from the query.
-         */
-        getOrders(): Sdk.Collection<Sdk.Query.OrderExpression>;
-
-        /**
-         * Gets the number of rows to be returned.
-         */
-        getTopCount(): number;
-
-        /**
-         * Sets the number of rows to be returned.
-         * @param count The number of rows to be returned.
-         */
-        setTopCount( count: number ): void;
-
-        /**
-         * Gets the serialized QueryExpression.
-         */
-        toXml(): string;
-
-        /**
-         * Gets the serialized QueryExpression values.
-         */
-        toValueXml(): string;
-    }
-
-    class QueryByAttribute extends QueryBase
-    {
-        /**
-         * Initializes a new instance of the QueryByAttribute class setting the entity name.
-         * @param entityName The logical name of the entity.
-         *
-         */
-        constructor( entityName: string );
-
-        /**
-         * Gets An Sdk.Collection of Sdk.AttributeBase attributes.
-         */
-        getAttributeValues(): Sdk.Collection<Sdk.AttributeBase>;
-
-        /**
-         * Sets an Sdk.Collection of Sdk.Query.OrderExpression instances that define the order in which the entity instances are returned from the query.
-         * @param orders An Sdk.Collection of Sdk.Query.OrderExpression instances that define the order in which the entity instances are returned from the query.
-         */
-        setOrders( orders: Sdk.Collection<Sdk.Query.OrderExpression> ): void;
-
-        /// prototype methods
-
-        /**
-         * Adds the attribute with values to include in the query.
-         * @param attributeValue One of the classes that inherit from Sdk.AttributeBase including the value to use as criteria.
-         */
-        addAttributeValue( attributeValue: Sdk.AttributeBase ): void;
-
-        /**
-         * Adds an order to apply to the results of the query.
-         * @param order An order expression.
-         */
-        addOrder( order: Sdk.Query.OrderExpression ): void;
-
-        /**
-         * Removes an attribute with values to include in the query.
-         * @param attributeValue One of the classes that inherit from Sdk.AttributeBase including the value to use as criteria.
-         * @param errorIfNotFound Whether to throw an error when the attribute to remove is not found. The default is false.
-         */
-        removeAttributeValue( attributeValue: Sdk.AttributeBase, errorIfNotFound?: boolean ): void;
-    }
-
-    class QueryExpression extends QueryBase
-    {
-        /**
-         * Initializes a new instance of the QueryExpression class setting the entity name.
-         * @param entityName The name of the entity.
-         */
-        constructor( entityName: string );
-
-        /**
-         * Gets the complex condition and logical filter expressions that filter the results of the query.
-         */
-        getCriteria(): FilterExpression;
-
-        /**
-         * Sets the complex condition and logical filter expressions that filter the results of the query.
-         * @param criteria The query condition and filter criteria.
-         */
-        setCriteria( criteria: FilterExpression ): void;
-
-        /**
-         * Gets whether the results of the query contain duplicate entity instances.
-         */
-        getDistinct(): boolean;
-
-        /**
-         * Sets whether the results of the query contain duplicate entity instances.
-         */
-        setDistinct( isDistinct: boolean ): void;
-
-        /**
-         * Gets an Sdk.Collection of Sdk.Query.LinkEntity instances.
-         */
-        getLinkEntities(): Sdk.Collection<LinkEntity>;
-
-        /**
-         * Gets a value that indicates that no shared locks are issued against the data that would prohibit other transactions from modifying the data in the records returned from the query.
-         */
-        getNoLock(): boolean;
-
-        /**
-         * Sets a value that indicates that no shared locks are issued against the data that would prohibit other transactions from modifying the data in the records returned from the query.
-         * @param isNoLock True if there are no shared locks are issued against the data that would prohibit other transactions from modifying the data in the records returned from the query; otherwise, false.
-         */
-        setNoLock( isNoLock: boolean ): void;
-
-        /// prototype methods
-
-        /**
-         *  Contains a condition expression used to filter the results of the query.
-         * @param entityName The logical name of the entity in the condition expression.
-         * @param attributeName The logical name of the attribute in the condition expression.
-         * @param operator The condition operator.
-         * @param values The value(s) to compare. Use one of the following classes that inherit from Sdk.Query.ValueBase:
-         *          Sdk.Query.Booleans
-         *          Sdk.Query.BooleanManagedProperties
-         *          Sdk.Query.Dates
-         *          Sdk.Query.Decimals
-         *          Sdk.Query.Doubles
-         *          Sdk.Query.EntityReferences
-         *          Sdk.Query.Guids
-         *          Sdk.Query.Ints
-         *          Sdk.Query.Longs
-         *          Sdk.Query.Money
-         *          Sdk.Query.OptionSets
-         *          Sdk.Query.Strings
-         */
-        addCondition( entityName: string, attributeName: string, conditionOperator: Sdk.Query.ConditionOperator, values: Sdk.Query.ValueBase ): void;
-
-        /**
-         * Adds the specified link to the query expression setting the entity name to link to, the attribute name to link from and the attribute name to link to.
-         * @param firstParam An Sdk.Query.LinkEntity instance.
-         */
-        addLink( firstParam: Sdk.Query.LinkEntity ): void;
-
-        /**
-         * Adds the specified link to the query expression setting the entity name to link to, the attribute name to link from and the attribute name to link to.
-         * @param firstParam The name of entity to link from.
-         * @param linkFromAttributeName The name of the attribute to link from.
-         * @param linkToAttributeName The name of the attribute to link to.
-         * @param joinOperator The join operator. The default value is Inner
-         */
-        addLink( firstParam: string, linkFromAttributeName: string, linkToAttributeName: string, joinOperator: Sdk.Query.JoinOperator ): void;
-
-        /**
-         * Adds the specified order expression to the query expression.
-         * @param attributeName The name of the attribute.
-         * @param orderType The order, ascending or descending. Ascending is the default if not specified.
-         */
-        addOrder( attributeName: string, orderType: Sdk.Query.OrderType ): void;
-    }
-
-    class OrderExpression
-    {
-    }
-
-    class ConditionExpression
-    {
-        /**
-         * Contains a condition expression used to filter the results of the query.
-         * @param name entityName The logical name of the entity in the condition expression.
-         * @param name attributeName The logical name of the attribute in the condition expression.
-         * @param name operator The condition operator.
-         * @param name values The value(s) to compare.
-         *  Use one of the following classes that inherit from Sdk.Query.ValueBase: </para>
-         *  - Sdk.Query.Booleans </para>
-         *  - Sdk.Query.BooleanManagedProperties </para>
-         *  - Sdk.Query.Dates </para>
-         *  - Sdk.Query.Decimals </para>
-         *  - Sdk.Query.Doubles </para>
-         *  - Sdk.Query.EntityReferences </para>
-         *  - Sdk.Query.Guids </para>
-         *  - Sdk.Query.Ints </para>
-         *  - Sdk.Query.Longs </para>
-         *  - Sdk.Query.Money </para>
-         *  - Sdk.Query.OptionSets </para>
-         *  - Sdk.Query.Strings </para>
-         */
-        constructor( entityName: string, attributeName: string, operator: ConditionOperator, values?: ValueBase );
-
-        /**
-         * Returns the logical name of the entity in the condition expression.
-         */
-        getEntityName(): string;
-
-        /**
-         * Sets the logical name of the entity in the condition expression.
-         * @param name The logical name of the entity in the condition expression.
-         */
-        setEntityName( name: string ): void;
-
-        /**
-         * Returns the logical name of the attribute in the condition expression.
-         */
-        getAttributeName(): string;
-
-        /**
-         * Sets the logical name of the attribute in the condition expression.
-         * @param name The logical name of the attribute in the condition expression.
-         */
-        setAttributeName( name: string ): void;
-
-        /**
-         * Returns the condition operator.
-         */
-        getOperator(): ConditionOperator;
-
-        /**
-         * Sets the condition operator.
-         * @param operator The condition operator.
-         */
-        setOperator( operator: ConditionOperator ): void;
-
-        /**
-         * Returns the values for the attribute.
-         */
-        getValues(): ValueBase;
-
-        /**
-         * Sets the values for the attribute.
-         * @param The value(s) to compare
-         *  Use one of the following classes that inherit from Sdk.Query.ValueBase:
-         *  - Sdk.Query.Booleans
-         *  - Sdk.Query.BooleanManagedProperties
-         *  - Sdk.Query.Dates
-         *  - Sdk.Query.Decimals
-         *  - Sdk.Query.Doubles
-         *  - Sdk.Query.EntityReferences
-         *  - Sdk.Query.Guids
-         *  - Sdk.Query.Ints
-         *  - Sdk.Query.Longs
-         *  - Sdk.Query.Money
-         *  - Sdk.Query.OptionSets
-         *  - Sdk.Query.Strings
-         */
-        setValues( values: ValueBase ): void;
-    }
-
-    /**
-     * Specifies complex condition and logical filter expressions used for filtering the results of the query.
-     * @param logicalOperator The filter operator.
-     */
-    class FilterExpression
-    {
-        constructor( logicalOperator: LogicalOperator );
-
-        /**
-         * Adds a condition to the filter expression setting the attribute name, condition operator, and values.
-         * @param conditionExpression The expression that will set the condition.
-         */
-        public addCondition( firstParam: ConditionExpression ): void;
-
-        /**
-         * Adds a condition to the filter expression setting the attribute name, condition operator, and values.
-         * @param entityName The entityName of the new ConditionExpression that will be instantiated using the other parameters.
-         * @param attributeName The attribute name to use in the condition expression.
-         * @param conditionOperator The condition operator if the first parameter is a string.
-         * @param values The value(s) to compare.
-         *  Use one of the following classes that
-         *  - Sdk.Query.Booleans
-         *  - Sdk.Query.BooleanManagedProperties
-         *  - Sdk.Query.Dates
-         *  - Sdk.Query.Decimals
-         *  - Sdk.Query.Doubles
-         *  - Sdk.Query.EntityReferences
-         *  - Sdk.Query.Guids
-         *  - Sdk.Query.Ints
-         *  - Sdk.Query.Longs
-         *  - Sdk.Query.Money
-         *  - Sdk.Query.OptionSets
-         *  - Sdk.Query.Strings
-         */
-        public addCondition( entityName: string, attributeName: string, conditionOperator: ConditionOperator, values?: ValueBase ): void;
-
-        /**
-         * Adds a child filter to the filter expression.
-         * @param filterExpression The filter to add.
-         */
-        addFilter( filterExpression: FilterExpression ): void;
-
-        /**
-         * Adds a child filter to the filter expression.
-         * @param logicalOperator Creates new FilterExpression with the specified logical operator and adds it.
-         */
-        addFilter( logicalOperator: LogicalOperator ): void;
-
-        /**
-         * Returns a collection of Sdk.Query.ConditionExpression values.
-         */
-        getConditions(): Sdk.Collection<ConditionExpression>;
-
-        /**
-         * Gets the logical AND/OR filter operator.
-         */
-        getFilterOperator(): LogicalOperator
-
-        /**
-         * Returns an Sdk.Collection of Sdk.Query.FilterExpression.
-         */
-        getFilters(): Sdk.Collection<FilterExpression>;
-
-        /**
-         * Gets whether the expression is part of a quick find query.
-         */
-        getIsQuickFindFilter(): boolean;
-
-        /**
-         * Sets the filter operator.
-         * @param filterOperator The filter operator.
-         */
-        setFilterOperator( filterOperator: LogicalOperator ): void;
-
-        /**
-         * Sets whether the expression is part of a quick find query.
-         * @param isQuickFind True if the filter is part of a quick find query; otherwise, false.
-         */
-        setIsQuickFindFilter( isQuickFind: boolean ): void;
-    }
-
-    class FetchExpression
-    {
-        /**
-         * @param fetchXml The FetchXml to be used in a query.
-         */
-        constructor( fetchXml: string );
-
-        /**
-         * Gets the FetchXml to be used in a query.
-         */
-        public getFetchXml(): string;
-
-        /**
-         * Sets the FetchXml to be used in a query.
-         * @param fetchXml The FetchXml to be used in a query.
-         */
-        public setFetchXml( fetchXml: string ): void;
-    }
-
-    class LinkEntity
-    {
-        /**
-         * Initializes a new instance of the Sdk.Query.LinkEntity class setting the required properties.
-         * @param linkFromEntityName The logical name of the entity to link from.
-         * @param linkToEntityName The logical name of the entity to link to.
-         * @param linkFromAttributeName The name of the attribute to link from.
-         * @param linkToAttributeName The name of the attribute to link to.
-         * @param joinOperator The join operator.
-         * @param entityAlias The string representing an alias for the linkToEntityName.
-         */
-        constructor(
-            linkFromEntityName: string,
-            linkToEntityName: string,
-            linkFromAttributeName: string,
-            linkToAttributeName: string,
-            joinOperator: Sdk.Query.JoinOperator,
-            entityAlias: string );
-
-        /**
-         * Adds a linked entity.
-         * @param linkEntity An Sdk.Query.LinkEntity to add.
-         */
-        public addLink( linkEntity: Sdk.Query.LinkEntity ): void;
-
-        /**
-         * Gets the column set.
-         */
-        public getColumns(): Sdk.ColumnSet;
-
-        /**
-         * Sets the columns to include.
-         * @param columns An Sdk.ColumnSet instance.
-         */
-        public setColumns( columns: Sdk.ColumnSet ): void;
-
-        /**
-         * Sets the columns to include.
-         * @param columns An Array of attribute logical names for the columns to return.
-         */
-        public setColumns( columns: string[] ): void;
-
-        /**
-         * Sets the columns to include.
-         * @param columns Pass each attribute logical name as an argument.
-         */
-        public setColumns( ...columns: string[] ): void;
-
-        /**
-         * Gets the alias for the entity.
-         */
-        public getEntityAlias(): string;
-
-        /**
-         * Sets the alias for the entity.
-         * @param alias The alias for the entity.
-         */
-        public setEntityAlias( alias: string ): void;
-
-        /**
-         * Gets the join operator.
-         */
-        public getJoinOperator(): Sdk.Query.JoinOperator;
-
-        /**
-         * Sets the join operator.
-         * @param operator The join operator.
-         */
-        public setJoinOperator( operator: Sdk.Query.JoinOperator ): void;
-
-        /**
-         * Gets the complex condition and logical filter expressions that filter the results of the query.
-         */
-        public getLinkCriteria(): Sdk.Query.FilterExpression;
-
-        /**
-         * Sets the complex condition and logical filter expressions that filter the results of the query.
-         * @param criteria The complex condition and logical filter expressions that filter the results of the query.
-         */
-        public setLinkCriteria( criteria: Sdk.Query.FilterExpression ): void;
-
-        /**
-         * Gets the collection of Sdk.Query.LinkEntity that define links between multiple entity types.
-         */
-        public getLinkEntities(): Sdk.Collection<Sdk.Query.LinkEntity>;
-
-        /**
-         * Gets the logical name of the attribute of the entity that you are linking from.
-         */
-        public getLinkFromAttributeName(): string;
-
-        /**
-         * Sets the logical name of the attribute of the entity that you are linking from.
-         * @param name The logical name of the attribute of the entity that you are linking from.
-         */
-        public setLinkFromAttributeName( name: string ): void;
-
-        /**
-         * Gets the logical name of the entity that you are linking from.
-         */
-        public getLinkFromEntityName(): string;
-
-        /**
-         * Sets the logical name of the entity that you are linking from.
-         * @param name The logical name of the entity that you are linking from.
-         */
-        public setLinkFromEntityName( name: string ): void;
-
-        /**
-         * Gets the logical name of the attribute of the entity that you are linking to
-         */
-        public getLinkToAttributeName(): string;
-
-        /**
-         * Sets the logical name of the attribute of the entity that you are linking to.
-         * @param name The logical name of the attribute of the entity that you are linking to.
-         */
-        public setLinkToAttributeName( name: string ): void;
-
-        /**
-         * Gets the logical name of the entity that you are linking to.
-         */
-        public getLinkToEntityName(): string;
-
-        /**
-         * Sets the logical name of the entity that you are linking to.
-         * @param name The logical name of the entity that you are linking to.
-         */
-        public setLinkToEntityName( name: string ): void;
-
-        /**
-         * Gets the serialized link entity.
-         */
-        public toXml(): string;
-
-        /**
-         * Gets the serialized link entity values.
-         */
-        public toValueXml(): string;
-    }
-
-    class PagingInfo
-    {
-        /**
-         * Gets the number of entity instances returned per page.
-         */
-        getCount(): number;
-
-        /**
-         * Sets the number of entity instances returned per page.
-         * @param The number of entity instances returned per page
-         */
-        setCount( count: number ): void;
-
-        /**
-         * Gets the number of pages returned from the query.
-         */
-        getPageNumber(): number;
-
-        /**
-         * Sets the number of pages returned from the query.
-         * @param The number of pages returned from the query.
-         */
-        setPageNumber( pages: number ): void;
-
-        /**
-         * Gets the info used to page large result sets.
-         */
-        getPagingCookie(): string;
-
-        /**
-         * Sets the info used to page large result sets.
-         */
-        setPagingCookie( cookie: string ): void;
-
-        /**
-         * Gets whether the total number of records should be returned from the query.
-         */
-        getReturnTotalRecordCount(): boolean;
-
-        /**
-         * Sets whether the total number of records should be returned from the query.
-         * @param Specifies whether the TotalRecordCount should be set when the query is executed.
-         */
-        setReturnTotalRecordCount( returnTotalRecordsCount: boolean ): void;
-
-
-        /// prototype methods
-
-        /**
-         * Gets the serialized paging info.
-         *
-        toXml():string;
-
-        /**
-         * Gets the serialized paging info values.
-         */
-        toValueXml(): string;
-    }
-
-    export enum ConditionOperator
-    {
-        Equal,
-        NotEqual,
-        GreaterThan,
-        LessThan,
-        GreaterEqual,
-        LessEqual,
-        Like,
-        NotLike,
-        In,
-        NotIn,
-        Between,
-        NotBetween,
-        Null,
-        NotNull,
-        Yesterday,
-        Today,
-        Tomorrow,
-        Last7Days,
-        Next7Days,
-        LastWeek,
-        ThisWeek,
-        NextWeek,
-        LastMonth,
-        ThisMonth,
-        NextMonth,
-        On,
-        OnOrBefore,
-        OnOrAfter,
-        LastYear,
-        ThisYear,
-        NextYear,
-        LastXHours,
-        NextXHours,
-        LastXDays,
-        NextXDays,
-        LastXWeeks,
-        NextXWeeks,
-        LastXMonths,
-        NextXMonths,
-        LastXYears,
-        NextXYears,
-        EqualUserId,
-        NotEqualUserId,
-        EqualBusinessId,
-        NotEqualBusinessId,
-        Mask,
-        NotMask,
-        Contains,
-        DoesNotContain,
-        EqualUserLanguage,
-        NotOn,
-        OlderThanXMonths,
-        BeginsWith,
-        DoesNotBeginWith,
-        EndsWith,
-        DoesNotEndWith,
-        ThisFiscalYear,
-        ThisFiscalPeriod,
-        NextFiscalYear,
-        NextFiscalPeriod,
-        LastFiscalYear,
-        LastFiscalPeriod,
-        LastXFiscalYears,
-        LastXFiscalPeriods,
-        NextXFiscalYears,
-        NextXFiscalPeriods,
-        InFiscalYear,
-        InFiscalPeriod,
-        InFiscalPeriodAndYear,
-        InOrBeforeFiscalPeriodAndYear,
-        InOrAfterFiscalPeriodAndYear,
-        EqualUserOrUserTeams,
-        EqualUserTeams,
-    }
-
-    export enum JoinOperator
-    {
-        Inner,
-        LeftOuter,
-        Natural,
-    }
-
-    export enum OrderType
-    {
-        Ascending,
-        Descending,
-    }
-
-    export class ValueBase
-    { }
-
-    /**
-     * Specifies Boolean values to be compared in the query.
-     * @param args An array of Boolean values.
-     */
-    class Booleans extends ValueBase
-    {
-        constructor( args: boolean[] );
-
-        /**
-         * Returns the type of value with namespace prefix.
-         */
-        public getType(): string;
-
-        /**
-         * Returns an Sdk.Collection of boolean values.
-         */
-        public getValues(): Sdk.Collection<boolean>;
-
-
-        /**
-         * Specifies a Boolean value to be compared in the query.
-         * @param setValueArgs An array of boolean values.
-         */
-        public setValues( setValueArgs: boolean[] ): void;
-    }
-
-    /**
-     * Specifies the Date values to be compared in the query.
-     * @param args An array of Date values.
-     */
-    class Dates extends ValueBase
-    {
-        constructor( args: Date[] );
-
-        /**
-         * Returns the type of value with namespace prefix.
-         */
-        public getType(): string;
-
-        /**
-         * Returns an Sdk.Collection of Date values.
-         */
-        public getValues(): Sdk.Collection<Date>;
-
-        /**
-         * Specifies the Date values to be compared in the query.
-         * @param setValueArgs An array of Date values.
-         */
-        public setValues( setValueArgs: Date[] ): void;
-    }
-
-    /**
-     * Specifies the Decimal values to be compared in the query.
-     * @param args An array of Decimal values.
-     */
-    class Decimals extends ValueBase
-    {
-        constructor( args: number[] );
-
-        /**
-         * Returns the type of value with namespace prefix.
-         */
-        public getType(): string;
-
-        /**
-         * Returns an Sdk.Collection of number values.
-         */
-        public getValues(): Sdk.Collection<number>;
-
-        /**
-         * Specifies the Decimal values to be compared in the query.
-         * @param setValueArgs An array of number values.
-         */
-        public setValues( setValueArgs: number[] ): void;
-    }
-
-    /**
-     * Specifies the Double values to be compared in the query.
-     * @param args An array of Double values.
-     */
-    class Doubles extends ValueBase
-    {
-        constructor( args: number[] );
-
-        /**
-         * Returns the type of value with namespace prefix.
-         */
-        public getType(): string;
-
-        /**
-         * Returns an Sdk.Collection of number values.
-         */
-        public getValues(): Sdk.Collection<number>;
-
-        /**
-         * Specifies the Double values to be compared in the query.
-         * @param setValueArgs An array of number values.
-         */
-        public setValues( setValueArgs: number[] ): void;
-    }
-
-    /**
-     * Specifies the Int values to be compared in the query.
-     * @param args An array of Int values.
-     */
-    class Ints extends ValueBase
-    {
-        constructor( args: number[] );
-
-        /**
-         * Returns the type of value with namespace prefix.
-         */
-        public getType(): string;
-
-        /**
-         * Returns an Sdk.Collection of number values.
-         */
-        public getValues(): Sdk.Collection<number>;
-
-        /**
-         * Specifies the Int values to be compared in the query
-         * @param setValueArgs An array of number values.
-         */
-        public setValues( setValueArgs: number[] ): void;
-    }
-
-    /**
-     * Specifies the Long values to be compared in the query.
-     * @param args An array of Long values.
-     */
-    class Longs extends ValueBase
-    {
-        constructor( args: number[] );
-
-        /**
-         * Returns the type of value with namespace prefix.
-         */
-        public getType(): string;
-
-        /**
-         * Returns an Sdk.Collection of number values.
-         */
-        public getValues(): Sdk.Collection<number>;
-
-        /**
-         * Specifies the Long values to be compared in the query.
-         * @param setValueArgs An array of number values.
-         */
-        public setValues( setValueArgs: number[] ): void;
-    }
-
-    /**
-     * Specifies the Sdk.EntityReference values to be compared in the query.
-     * @param args An array of Sdk.EntityReference values.
-     */
-    class EntityReferences extends ValueBase
-    {
-        constructor( args: Sdk.EntityReference[] );
-
-        /**
-         * Returns the type of value with namespace prefix.
-         */
-        public getType(): string;
-
-        /**
-         * Returns an Sdk.Collection of Sdk.EntityReference values.
-         */
-        public getValues(): Sdk.Collection<number>;
-
-        /**
-         * Specifies the Long values to be compared in the query.
-         * @param setValueArgs An array of Sdk.EntityReference values.
-         */
-        public setValues( setValueArgs: Sdk.EntityReference[] ): void;
-    }
-
-    /**
-     * Specifies the Sdk.Query.Guids values to be compared in the query.
-     * @param args An array of GUID string values.
-     */
-    class Guids extends ValueBase
-    {
-        constructor( args: string[] );
-
-        /**
-         * Returns the type of value with namespace prefix.
-         */
-        public getType(): string;
-
-        /**
-         * Returns an Sdk.Collection of GUID string values.
-         */
-        public getValues(): Sdk.Collection<string>;
-
-        /**
-         * Specifies the Long values to be compared in the query.
-         * @param setValueArgs An array of GUID string values.
-         */
-        public setValues( setValueArgs: string[] ): void;
-    }
-
-    /**
-     * Specifies the Money values to be compared in the query.
-     * @param args An array of number values.
-     */
-    class Money extends ValueBase
-    {
-        constructor( args: number[] );
-
-        /**
-         * Returns the type of value with namespace prefix.
-         */
-        public getType(): string;
-
-        /**
-         * Returns an Sdk.Collection of number values.
-         */
-        public getValues(): Sdk.Collection<number>;
-
-        /**
-         * Specifies the Money values to be compared in the query.
-         * @param setValueArgs An array of number values.
-         */
-        public setValues( setValueArgs: number[] ): void;
-    }
-
-    /**
-     * Specifies the OptionSet values to be compared in the query.
-     * @param args An array of number values.
-     */
-    class OptionSets extends ValueBase
-    {
-        constructor( args: number[] );
-
-        /**
-         * Returns the type of value with namespace prefix.
-         */
-        public getType(): string;
-
-        /**
-         * Returns an Sdk.Collection of number values.
-         */
-        public getValues(): Sdk.Collection<number>;
-
-        /**
-         * Specifies the OptionSet values to be compared in the query.
-         * @param setValueArgs An array of number values.
-         */
-        public setValues( setValueArgs: number[] ): void;
-    }
-
-    /**
-     * Specifies the String values to be compared in the query.
-     * @param args An array of String values.
-     */
-    class Strings extends ValueBase
-    {
-        constructor( args: string[] );
-
-        /**
-         * Returns the type of value with namespace prefix.
-         */
-        public getType(): string;
-
-        /**
-         * Returns an Sdk.Collection of String values.
-         */
-        public getValues(): Sdk.Collection<string>;
-
-        /**
-         * Specifies the String values to be compared in the query.
-         * @param setValueArgs An array of String values.
-         */
-        public setValues( setValueArgs: string[] ): void
-    }
-
-    export enum LogicalOperator
-    {
-        Or,
-        And,
-    }
-}
-
-declare namespace Sdk.Util
-{
-    /**
-     * Verifies the parameter is a string formatted as a GUID.
-     * @param value The value to check.
-     */
-    function isGuid( value: string ): boolean;
-
-    /**
-     * Verifies the parameter is a string formatted as a GUID or null.
-     * @param value The value to check.
-     */
-    function isGuidOrNull( value: string ): boolean;
-
-    /**
-     * Verifies the parameter is a valid enum value.
-     * @param enumeration The enumeration.
-     * @param value The value to check.
-     */
-
-    /**
-     * Returns an empty GUID.
-     */
-    function getEmptyGuid(): string;
-
-    /**
-     * Formats a string with the arguments from an array.
-     * @param string The string containing placeholders for items in the array.
-     * @param args An array of strings to replace the placeholders.
-     */
-    function format( string: string, args: string[] ): string;
-
-    /**
-     *
-     */
-    function getError( resp: any ): string;
-
-    /**
-     * Returns the clinent URL.
-     */
-    function getClientUrl(): string;
-
-    /**
-     * Provides a way to override the client Url when a client-side context is not available.
-     * @param url The client URL to use instead of the default.
-     */
-    function setClientUrl( url: string ): void;
-
-    /**
-     *
-     */
-    function getXMLHttpRequest( action: string, async: boolean ): any;
-
-    /**
-     * Creates an entity from XML.
-     * @param The serialized entity returned from the SOAP service as XML.
-     */
-    function createEntityFromNode( node: string ): void;
-}
-
-declare namespace Sdk.Xml
-{
-}
-
-declare namespace Sdk.Mdq
-{
-    /**
-     * Defines a complex query to retrieve entity metadata.
-     * @param criteria The filter criteria for the metadata query.
-     * @param properties The properties to be returned by the query.
-     * @param attributeQuery A query expression for the entity attribute metadata to return.
-     * @param relationshipQuery A query expression for the entity relationship metadata to return.
-     * @param labelQuery A query expression for the labels to return.
-     */
-    export class EntityQueryExpression
-    {
-        constructor(
-            criteria: Sdk.Mdq.MetadataFilterExpression,
-            properties: Sdk.Mdq.MetadataPropertiesExpression,
-            attributeQuery?: Sdk.Mdq.AttributeQueryExpression,
-            relationshipQuery?: Sdk.Mdq.RelationshipQueryExpression,
-            labelQuery?: Sdk.Mdq.LabelQueryExpression );
-    }
-
-    /**
-     * An enumeration that specifies the type of deleted metadata to retrieve.
-     */
-    export enum DeletedMetadataFilters
-    {
-        All, // All deleted metadata
-        Attribute, // Deleted Attribute metadata
-        Default, // The value used if not set. Equals Entity
-        Entity, //Deleted Entity metadata
-        Label, //Deleted Label metadata
-        OptionSet, // Deleted OptionSet metadata
-        Relationship, //Deleted Relationship metadata
-    }
-
-    /**
-     * Specifies complex condition and logical filter expressions used for filtering the results of a metadata query.
-     * @param filterOperator The logical AND/OR filter operator.
-     */
-
-    export class MetadataFilterExpression
-    {
-        constructor( filterOperator: Sdk.Mdq.LogicalOperator );
-
-        /**
-         * Adds a condition. This method accepts either the properties to create a new Sdk.Mdq.MetadataConditionExpression or a Sdk.Mdq.MetadataConditionExpression as the first argument.
-         * @param propertyName The metadata property to evaluate.
-         * @param conditionOperator The condition operator.
-         * @param value The metadata value to evaluate.
-         */
-        public addCondition(
-            propertyName: SearchableEntityMetadataProperties|SearchableAttributeMetadataProperties|SearchableRelationshipMetadataProperties,
-            conditionOperator: MetadataConditionOperator,
-            value: Object ): void;
-        public addCondition(
-            propertyName: SearchableAttributeMetadataProperties, conditionOperator: MetadataConditionOperator, value: any): void;
-        public addCondition(
-            propertyName: SearchableEntityMetadataProperties|SearchableAttributeMetadataProperties|SearchableRelationshipMetadataProperties,
-            conditionOperator: MetadataConditionOperator,
-            value: Object ): void;
-        addCondition(propertyName: SearchableAttributeMetadataProperties, conditionOperator: MetadataConditionOperator): void;
-        public addCondition(
-            propertyName: SearchableEntityMetadataProperties|SearchableAttributeMetadataProperties|SearchableRelationshipMetadataProperties,
-            conditionOperator: MetadataConditionOperator,
-            value: Object): void;
-    }
-
-    /**
-     * Defines a complex query to retrieve attribute metadata for entities retrieved using an Sdk.Mdq.EntityQueryExpression.
-     * @param criteria The filter criteria for the metadata query.
-     * @param properties The properties to be returned by the query.
-     */
-    export class AttributeQueryExpression
-    {
-        constructor( criteria: MetadataFilterExpression, properties: Sdk.Mdq.MetadataPropertiesExpression );
-    }
-
-    /**
-     * Defines a complex query to retrieve entity relationship metadata for entities retrieved using an EntityQueryExpression.
-     * @param criteria The filter criteria for the metadata query.
-     * @param properties The properties to be returned by the query.
-     */
-    export class RelationshipQueryExpression
-    {
-        constructor( criteria: MetadataFilterExpression, properties: Mdq.MetadataPropertiesExpression );
-    }
-
-    /**
-     * Defines the languages for the labels to be retrieved for metadata items that have labels.
-     * @param languages An array of LCID number values.
-     */
-    export class LabelQueryExpression
-    {
-        constructor( languages: Array<number> );
-    }
-
-    /**
-     * Logical operator.
-     */
-    export enum LogicalOperator
-    {
-        And,
-        Or,
-    }
-
-    /**
-     * Specifies the properties for which non-null values are returned from a query.
-     * @param allProperties  Whether to retrieve all the properties of a metadata object.
-     * @param propertyNames: >An array of strings representing the metadata properties to retrieve.
-     */
-    export class MetadataPropertiesExpression
-    {
-        constructor( allProperties: boolean, propertyNames?: Array<EntityMetadataProperties|AttributeMetadataProperties|RelationshipMetadataProperties|any> );
-    }
-
-    export enum RelationshipMetadataProperties
-    {
-        AssociatedMenuConfiguration,
-        CascadeConfiguration,
-        HasChanged,
-        Entity1AssociatedMenuConfiguration,
-        Entity1IntersectAttribute,
-        Entity1LogicalName,
-        Entity2AssociatedMenuConfiguration,
-        Entity2IntersectAttribute,
-        Entity2LogicalName,
-        IntersectEntityName,
-        IsCustomizable,
-        IntroducedVersion,
-        IsCustomRelationship,
-        IsManaged,
-        IsValidForAdvancedFind,
-        MetadataId,
-        ReferencedAttribute,
-        ReferencedEntity,
-        ReferencingAttribute,
-        ReferencingEntity,
-        RelationshipType,
-        SchemaName,
-        SecurityTypes,
-    }
-
-    export enum AttributeMetadataProperties
-    {
-        AttributeOf,
-        AttributeType,
-        AttributeTypeName,
-        CalculationOf,
-        CanBeSecuredForCreate,
-        CanBeSecuredForRead,
-        CanBeSecuredForUpdate,
-        CanModifyAdditionalSettings,
-        ColumnNumber,
-        DefaultFormValue,
-        DefaultValue,
-        DeprecatedVersion,
-        Description,
-        DisplayName,
-        EntityLogicalName,
-        Format,
-        FormatName,
-        ImeMode,
-        IntroducedVersion,
-        IsAuditEnabled,
-        IsCustomAttribute,
-        IsCustomizable,
-        IsManaged,
-        IsPrimaryId,
-        IsPrimaryName,
-        IsRenameable,
-        IsSecured,
-        IsValidForAdvancedFind,
-        IsValidForCreate,
-        IsValidForRead,
-        IsValidForUpdate,
-        LinkedAttributeId,
-        LogicalName,
-        MaxLength,
-        MaxValue,
-        MetadataId,
-        MinValue,
-        OptionSet,
-        Precision,
-        PrecisionSource,
-        RequiredLevel,
-        SchemaName,
-        Targets,
-        YomiOf,
-    }
-
-    export enum EntityMetadataProperties
-    {
-        ActivityTypeMask,
-        Attributes,
-        AutoCreateAccessTeams,
-        AutoRouteToOwnerQueue,
-        CanBeInManyToMany,
-        CanBePrimaryEntityInRelationship,
-        CanBeRelatedEntityInRelationship,
-        CanCreateAttributes,
-        CanCreateCharts,
-        CanCreateForms,
-        CanCreateViews,
-        CanModifyAdditionalSettings,
-        CanTriggerWorkflow,
-        Description,
-        DisplayCollectionName,
-        DisplayName,
-        IconLargeName,
-        IconMediumName,
-        IconSmallName,
-        IntroducedVersion,
-        IsActivity,
-        IsActivityParty,
-        IsAIRUpdated,
-        IsAuditEnabled,
-        IsAvailableOffline,
-        IsBusinessProcessEnabled,
-        IsChildEntity,
-        IsConnectionsEnabled,
-        IsCustomEntity,
-        IsCustomizable,
-        IsDocumentManagementEnabled,
-        IsDuplicateDetectionEnabled,
-        IsEnabledForCharts,
-        IsImportable,
-        IsIntersect,
-        IsMailMergeEnabled,
-        IsManaged,
-        IsMappable,
-        IsQuickCreateEnabled,
-        IsReadingPaneEnabled,
-        IsRenameable,
-        IsValidForAdvancedFind,
-        IsValidForQueue,
-        IsVisibleInMobile,
-        IsVisibleInMobileClient,
-        LogicalName,
-        ManyToManyRelationships,
-        ManyToOneRelationships,
-        MetadataId,
-        ObjectTypeCode,
-        OneToManyRelationships,
-        OwnershipType,
-        PrimaryIdAttribute,
-        PrimaryImageAttribute,
-        PrimaryNameAttribute,
-        Privileges,
-        RecurrenceBaseEntityLogicalName,
-        ReportViewName,
-        SchemaName,
-    }
-
-    export enum SearchableEntityMetadataProperties
-    {
-        ActivityTypeMask,
-        AutoCreateAccessTeams,
-        AutoRouteToOwnerQueue,
-        CanBeInManyToMany,
-        CanBePrimaryEntityInRelationship,
-        CanBeRelatedEntityInRelationship,
-        CanCreateAttributes,
-        CanCreateCharts,
-        CanCreateForms,
-        CanCreateViews,
-        CanModifyAdditionalSettings,
-        CanTriggerWorkflow,
-        IconLargeName,
-        IconMediumName,
-        IconSmallName,
-        IntroducedVersion,
-        IsActivity,
-        IsActivityParty,
-        IsAIRUpdated,
-        IsAuditEnabled,
-        IsAvailableOffline,
-        IsBusinessProcessEnabled,
-        IsChildEntity,
-        IsConnectionsEnabled,
-        IsCustomEntity,
-        IsCustomizable,
-        IsDocumentManagementEnabled,
-        IsDuplicateDetectionEnabled,
-        IsEnabledForCharts,
-        IsImportable,
-        IsIntersect,
-        IsMailMergeEnabled,
-        IsManaged,
-        IsMappable,
-        IsQuickCreateEnabled,
-        IsReadingPaneEnabled,
-        IsRenameable,
-        IsValidForAdvancedFind,
-        IsValidForQueue,
-        IsVisibleInMobile,
-        IsVisibleInMobileClient,
-        LogicalName,
-        MetadataId,
-        ObjectTypeCode,
-        OwnershipType,
-        PrimaryIdAttribute,
-        PrimaryImageAttribute,
-        PrimaryNameAttribute,
-        RecurrenceBaseEntityLogicalName,
-        ReportViewName,
-        SchemaName,
-    }
-
-    export enum SearchableAttributeMetadataProperties
-    {
-        AttributeOf,
-        AttributeType,
-        CalculationOf,
-        CanBeSecuredForCreate,
-        CanBeSecuredForRead,
-        CanBeSecuredForUpdate,
-        CanModifyAdditionalSettings,
-        ColumnNumber,
-        DefaultFormValue,
-        DefaultValue,
-        DeprecatedVersion,
-        EntityLogicalName,
-        Format,
-        FormatName,
-        ImeMode,
-        IntroducedVersion,
-        IsAuditEnabled,
-        IsCustomAttribute,
-        IsCustomizable,
-        IsManaged,
-        IsPrimaryId,
-        IsPrimaryName,
-        IsRenameable,
-        IsSecured,
-        IsValidForAdvancedFind,
-        IsValidForCreate,
-        IsValidForRead,
-        IsValidForUpdate,
-        LinkedAttributeId,
-        LogicalName,
-        MaxLength,
-        MaxValue,
-        MetadataId,
-        MinValue,
-        Precision,
-        PrecisionSource,
-        RequiredLevel,
-        SchemaName,
-        YomiOf,
-    }
-
-    export enum SearchableRelationshipMetadataProperties
-    {
-        HasChanged,
-        Entity1IntersectAttribute,
-        Entity1LogicalName,
-        Entity2IntersectAttribute,
-        Entity2LogicalName,
-        IntersectEntityName,
-        IsCustomizable,
-        IntroducedVersion,
-        IsCustomRelationship,
-        IsManaged,
-        IsValidForAdvancedFind,
-        MetadataId,
-        ReferencedAttribute,
-        ReferencedEntity,
-        ReferencingAttribute,
-        ReferencingEntity,
-        RelationshipType,
-        SchemaName,
-        SecurityTypes,
-    }
-
-    export enum MetadataConditionOperator
-    {
-        Equals,
-        NotEquals,
-        In,
-        NotIn,
-        GreaterThan,
-        LessThan,
-    }
-
-    export interface IEntityMetadata
-    {
-        ActivityTypeMask: number;
-        Attributes: IAttributeMetadata[];
-        AutoCreateAccessTeams: any;
-        AutoRouteToOwnerQueue: boolean;
-        CanBeInManyToMany: ManagedProperty<boolean>;
-        CanBePrimaryEntityInRelationship: ManagedProperty<boolean>;
-        CanBeRelatedEntityInRelationship: ManagedProperty<boolean>;
-        CanCreateAttributes: ManagedProperty<boolean>;
-        CanCreateCharts: ManagedProperty<boolean>;
-        CanCreateForms: ManagedProperty<boolean>;
-        CanCreateViews: ManagedProperty<boolean>;
-        CanModifyAdditionalSettings: ManagedProperty<boolean>;
-        CanTriggerWorkflow: boolean;
-        Description: Label;
-        DisplayCollectionName: Label;
-        DisplayName: Label;
-        IconLargeName: string;
-        IconMediumName: string;
-        IconSmallName: string;
-        IntroducedVersion: any;
-        IsActivity: boolean;
-        IsActivityParty: boolean;
-        IsAIRUpdated: boolean;
-        IsAuditEnabled: ManagedProperty<boolean>;
-        IsAvailableOffline: boolean;
-        IsBusinessProcessEnabled: boolean;
-        IsChildEntity: boolean;
-        IsConnectionsEnabled: ManagedProperty<boolean>;
-        IsCustomEntity: boolean;
-        IsCustomizable: ManagedProperty<boolean>;
-        IsDocumentManagementEnabled: boolean;
-        IsDuplicateDetectionEnabled: ManagedProperty<boolean>;
-        IsEnabledForCharts: boolean;
-        IsImportable: boolean;
-        IsIntersect: boolean;
-        IsMailMergeEnabled: ManagedProperty<boolean>;
-        IsManaged: boolean;
-        IsMappable: ManagedProperty<boolean>;
-        IsQuickCreateEnabled: boolean;
-        IsReadingPaneEnabled: boolean;
-        IsRenameable: boolean;
-        IsValidForAdvancedFind: boolean;
-        IsValidForQueue: ManagedProperty<boolean>;
-        IsVisibleInMobile: ManagedProperty<boolean>;
-        IsVisibleInMobileClient: boolean;
-        LogicalName: string;
-        ManyToManyRelationships: ManyToManyRelationshipMetadata;
-        ManyToOneRelationships: OneToManyRelationshipMetadata;
-        MetadataId: string;
-        ObjectTypeCode: number;
-        OneToManyRelationships: OneToManyRelationshipMetadata;
-        OwnershipType: "BusinessOwned" | "BusinessParented" | "None	OrganizationOwned" | "TeamOwned	UserOwned";
-        PrimaryIdAttribute: string;
-        PrimaryImageAttribute: string;
-        PrimaryNameAttribute: string;
-        Privileges: SecurityPrivilegeMetadata[];
-        RecurrenceBaseEntityLogicalName: string;
-        ReportViewName: string;
-        SchemaName: string;
-    }
-
-    export interface SecurityPrivilegeMetadata
-    {
-        CanBeBasic: boolean;
-        CanBeDeep: boolean;
-        CanBeEntityReference: boolean;
-        CanBeGlobal: boolean;
-        CanBeLocal: boolean;
-        CanBeParentEntityReference: boolean;
-        ExtensionData: boolean;
-        Name: string;
-        PrivilegeId: string;
-        PrivilegeType: "Append" | "AppendTo" | "Assign" | "Create" | "Delete" | "None" | "Read" | "Share" | "Write";
-    }
-
-    export interface OneToManyRelationshipMetadata
-    {
-        AssociatedMenuConfiguration: AssociatedMenuConfiguration;
-        CascadeConfiguration: CascadeConfiguration;
-        HasChanged: any;
-        IntroducedVersion: any;
-        IsCustomizable: ManagedProperty<boolean>;
-        IsCustomRelationship: boolean;
-        IsHierarchical: any;
-        IsManaged: boolean;
-        IsValidForAdvancedFind: boolean;
-        MetadataId: string;
-        ReferencedAttribute: string;
-        ReferencedEntity: string;
-        ReferencingAttribute: string;
-        ReferencingEntity: string;
-        RelationshipType: string;
-        SchemaName: string;
-        SecurityTypes: any;
-    }
-
-    export interface CascadeConfiguration
-    {
-        Assign: CascadeType;
-        Delete: CascadeType;
-        ExtensionData: CascadeType;
-        Merge: CascadeType;
-        Reparent: CascadeType;
-        Share: CascadeType;
-        Unshare: CascadeType;
-    }
-
-    export type CascadeType = "Active" | "Cascade" | "NoCascade" | "UserOwned";
-
-    export interface ManyToManyRelationshipMetadata
-    {
-        Entity1AssociatedMenuConfiguration: AssociatedMenuConfiguration;
-        Entity1IntersectAttribute: string;
-        Entity1LogicalName: string;
-        Entity2AssociatedMenuConfiguration: AssociatedMenuConfiguration;
-        Entity2IntersectAttribute: string;
-        Entity2LogicalName: string;
-        HasChanged: boolean;
-        IntersectEntityName: string;
-        IntroducedVersion: any;
-        IsCustomizable: ManagedProperty<boolean>;
-        IsCustomRelationship: boolean;
-        IsManaged: boolean;
-        IsValidForAdvancedFind: boolean;
-        MetadataId: string;
-        RelationshipType: RelationshipType;
-        SchemaName: string;
-        SecurityTypes: SecurityType;
-    }
-
-    export interface AssociatedMenuConfiguration
-    {
-        Behavior: AssociatedMenuBehavior;
-        Group: AssociatedMenuGroup;
-        Label: Label;
-        Order: number;
-    }
-
-    export type AssociatedMenuBehavior = "DoNotDisplay" | "UseCollectionName" | "UseLabel";
-
-    export type AssociatedMenuGroup = "Details" | "Marketing" | "Sales" | "Service";
-
-    export type RelationshipType = "Default" | "ManyToManyRelationship" | "OneToManyRelationship";
-
-    export type SecurityType = "Append" | "Inheritance" | "None" | "ParentChild" | "Pointer";
-
-    export interface IAttributeMetadata
-    {
-        AttributeOf: string;
-        AttributeType: "Customer" | "DateTime" | "Decimal" | "Double" | "EntityName" | "Integer" | "Lookup" | "ManagedProperty" | "Memo" | "Money" | "Owner" | "PartyList" | "Picklist" | "State" | "Status" | "Uniqueidentifier" | "Virtual"
-        AttributeTypeName: "BigIntType" | "BooleanType" | "CalendarRulesType" | "CustomerType" | "DateTimeType" | "DecimalType" | "DoubleType" | "EntityNameType" | "ImageType" | "IntegerType" | "LookupType" | "ManagedPropertyType" | "MemoType" | "MoneyType" | "OwnerType" | "PartyListType" | "PicklistType" | "StateType	StatusType" | "StringType" | "UniqueidentifierType" | "VirtualType";
-        CalculationOf: any;
-        CanBeSecuredForCreate: boolean;
-        CanBeSecuredForRead: boolean;
-        CanBeSecuredForUpdate: boolean;
-        CanModifyAdditionalSettings: ManagedProperty<boolean>;
-        ColumnNumber: number;
-        DefaultFormValue: any;
-        DefaultValue: any;
-        DeprecatedVersion: any;
-        Description: Label;
-        DisplayName: Label;
-        EntityLogicalName: string;
-        Format: any;
-        FormatName: string;
-        ImeMode: any;
-        IntroducedVersion: any;
-        IsAuditEnabled: boolean;
-        IsCustomAttribute: boolean;
-        IsCustomizable: ManagedProperty<boolean>;
-        IsManaged: boolean;
-        IsPrimaryId: boolean;
-        IsPrimaryName: boolean;
-        IsRenameable: ManagedProperty<boolean>;
-        IsSecured: boolean;
-        IsValidForAdvancedFind: ManagedProperty<boolean>;
-        IsValidForCreate: boolean;
-        IsValidForRead: boolean;
-        IsValidForUpdate: boolean;
-        LinkedAttributeId: string;
-        LogicalName: string;
-        MaxLength: number;
-        MaxValue: any;
-        MetadataId: string;
-        MinValue: number;
-        OptionSet: any;
-        Precision: any;
-        PrecisionSource: any;
-        RequiredLevel: ManagedProperty<string>;
-        SchemaName: string;
-        Targets: string[];
-        YomiOf: any;
-    }
-
-    export interface ManagedProperty<T>
-    {
-        CanBeChanged: boolean;
-        ManagedPropertyLogicalName: string;
-        Value: T;
-    }
-
-    export interface Label
-    {
-        LocalizedLabels: LocalizedLabel[];
-        UserLocalizedLabel: LocalizedLabel;
-    }
-
-    export interface LocalizedLabel
-    {
-        Label: string;
-        LangaugeCode: number;
-        MetadataId: string;
-        HasChanged: boolean;
-        IsManaged: boolean;
-    }
-
-    namespace ValueEnums
-    {
-        export enum OwnershipType
-        {
-            None,
-            OrganizationOwned,
-            TeamOwned,
-            UserOwned,
-        }
-
-        export enum AttributeTypeCode
-        {
-            BigInt,
-            Boolean,
-            CalendarRules,
-            Customer,
-            DateTime,
-            Decimal,
-            Double,
-            EntityName,
-            Integer,
-            Lookup,
-            ManagedProperty,
-            Memo,
-            Money,
-            Owner,
-            PartyList,
-            Picklist,
-            State,
-            Status,
-            String,
-            Uniqueidentifier,
-            Virtual,
-        }
-
-
-        export enum AttributeRequiredLevel
-        {
-            ApplicationRequired,
-            None,
-            Recommended,
-            SystemRequired,
-        }
-
-
-        export enum DateTimeFormat
-        {
-            DateAndTime,
-            DateOnly,
-        }
-
-        export enum ImeMode
-        {
-            Active,
-            Auto,
-            Disabled,
-            Inactive,
-        }
-
-
-
-        export enum IntegerFormat
-        {
-            Duration,
-            Language,
-            Locale,
-            None,
-            TimeZone,
-        }
-
-
-        export enum SecurityTypes
-        {
-            Append,
-            Inheritance,
-            None,
-            ParentChild,
-            Pointer,
-        }
-
-        export enum StringFormat
-        {
-            Email,
-            PhoneticGuide,
-            Text,
-            TextArea,
-            TickerSymbol,
-            Url,
-            VersionNumber,
-        }
-    }
-}
-
-declare namespace Sdk.Mdq.ValueEnums
-{ }
diff --git a/microsoft-sdk-soap/tsconfig.json b/microsoft-sdk-soap/tsconfig.json
new file mode 100644
index 0000000000..0e062950a2
--- /dev/null
+++ b/microsoft-sdk-soap/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "microsoft-sdk-soap-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/milkcocoa/milkcocoa.d.ts b/milkcocoa/index.d.ts
similarity index 100%
rename from milkcocoa/milkcocoa.d.ts
rename to milkcocoa/index.d.ts
diff --git a/milkcocoa/milkcocoa-tests.ts b/milkcocoa/milkcocoa-tests.ts
index 2a34b4e1b7..cbb58c9c8e 100644
--- a/milkcocoa/milkcocoa-tests.ts
+++ b/milkcocoa/milkcocoa-tests.ts
@@ -1,4 +1,3 @@
-///<reference path="./milkcocoa.d.ts"/>
 var mk = new MilkCocoa("hostAddress");
 mk.addAccount("sample@test.com", "password", null, (err: MilkCocoa.Error.AddAccount, user: milkcocoa.User) => {
   
diff --git a/milkcocoa/tsconfig.json b/milkcocoa/tsconfig.json
new file mode 100644
index 0000000000..6aa1c60aa5
--- /dev/null
+++ b/milkcocoa/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "milkcocoa-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/milliseconds/milliseconds.d.ts b/milliseconds/index.d.ts
similarity index 100%
rename from milliseconds/milliseconds.d.ts
rename to milliseconds/index.d.ts
diff --git a/milliseconds/milliseconds-tests.ts b/milliseconds/milliseconds-tests.ts
index 04fa7408fe..ea3b7c23ef 100644
--- a/milliseconds/milliseconds-tests.ts
+++ b/milliseconds/milliseconds-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="milliseconds.d.ts" />
+
 
 milliseconds.seconds(1)
 milliseconds.minutes(2)
diff --git a/milliseconds/tsconfig.json b/milliseconds/tsconfig.json
new file mode 100644
index 0000000000..3929006698
--- /dev/null
+++ b/milliseconds/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "milliseconds-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mime/index.d.ts b/mime/index.d.ts
new file mode 100644
index 0000000000..73a094492b
--- /dev/null
+++ b/mime/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for mime
+// Project: https://github.com/broofa/node-mime
+// Definitions by: Jeff Goddard <https://github.com/jedigo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/mime.d.ts
+
+
+export declare function lookup(path: string): string;
+export declare function extension(mime: string): string;
+export declare function load(filepath: string): void;
+export declare function define(mimes: Object): void;
+
+interface Charsets {
+    lookup(mime: string): string;
+}
+
+export declare var charsets: Charsets;
+export declare var default_type: string;
diff --git a/mime/mime-tests.ts b/mime/mime-tests.ts
index abfee0bd64..abffa341f7 100644
--- a/mime/mime-tests.ts
+++ b/mime/mime-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="mime.d.ts" />
 
 import * as mime from "mime";
 
diff --git a/mime/mime.d.ts b/mime/mime.d.ts
deleted file mode 100644
index 42152e49d3..0000000000
--- a/mime/mime.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Type definitions for mime
-// Project: https://github.com/broofa/node-mime
-// Definitions by: Jeff Goddard <https://github.com/jedigo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/mime.d.ts
-
-declare module "mime" {
-	export function lookup(path: string): string;
-	export function extension(mime: string): string;
-	export function load(filepath: string): void;
-	export function define(mimes: Object): void;
-
-	interface Charsets {
-		lookup(mime: string): string;
-	}
-
-	export var charsets: Charsets;
-	export var default_type: string;
-}
diff --git a/mime/tsconfig.json b/mime/tsconfig.json
new file mode 100644
index 0000000000..2c8de7fc3f
--- /dev/null
+++ b/mime/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mime-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/minilog/index.d.ts b/minilog/index.d.ts
new file mode 100644
index 0000000000..6e382f169d
--- /dev/null
+++ b/minilog/index.d.ts
@@ -0,0 +1,101 @@
+// Type definitions for minilog v2
+// Project: https://github.com/mixu/minilog
+// Definitions by: Guido <http://guido.io>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+//These type definitions are not complete, although basic usage should be typed.
+interface Minilog {
+    debug(...msg: any[]): Minilog;
+    info(...msg: any[]): Minilog;
+    log(...msg: any[]): Minilog;
+    warn(...msg: any[]): Minilog;
+    error(...msg: any[]): Minilog;
+}
+
+declare function Minilog(namespace: string): Minilog;
+
+declare namespace Minilog {
+    export function enable(): Minilog;
+    export function disable() : Minilog;
+    export function pipe(dest: any): Transform;
+
+    export var suggest: Filter;
+    export var backends: Minilog.MinilogBackends;
+
+    export var defaultBackend: any;
+    export var defaultFormatter: string;
+
+
+    export class Filter extends Transform{
+
+        /**
+        * Adds an entry to the whitelist
+        * Returns this filter
+        */
+        allow(name: any, level?: any): Filter;
+        /**
+        * Adds an entry to the blacklist
+        * Returns this filter
+        */
+        deny(name: any, level?: any): Filter;
+        /**
+        * Empties the whitelist and blacklist
+        * Returns this filter
+        */
+        clear(): Filter;
+
+        test(name:any, level:any): boolean;
+
+        /**
+        * specifies the behavior when a log line doesn't match either the whitelist or the blacklist.
+        The default is true (= "allow by default") - lines that do not match the whitelist or the blacklist are not filtered (e.g. ).
+        If you want to flip the default so that lines are filtered unless they are on the whitelist, set this to false (= "deny by default").
+        */
+        defaultResult: boolean;
+
+        /**
+        * controls whether the filter is enabled. Default: true
+        */
+        enabled: boolean;
+    }
+
+
+    export interface MinilogBackends {
+        array: any;
+        browser: any;
+        console: Console;
+        localstorage: any;
+        jQuery: any;
+    }
+
+    export class Console extends Transform{
+
+        /**
+        * List of available formatters
+        */
+        formatters: string[];
+
+        //Only available on client
+        color: Transform;
+        minilog: Transform;
+
+        //Only available on backend
+        formatClean: Transform;
+        formatColor: Transform;
+        formatNpm: Transform;
+        formatLearnboost: Transform;
+        formatMinilog: Transform;
+        formatWithStack: Transform;
+    }
+
+    export class Transform {
+        write(name: any, level: any, args: any): void;
+        pipe(dest: any): any;
+        unpipe(from: any): Transform;
+        mixin(dest: any): void;
+    }
+
+}
+
+export = Minilog;
+export as namespace Minilog;
diff --git a/minilog/minilog-tests.ts b/minilog/minilog-tests.ts
index c04f936e80..adf7c63ed1 100644
--- a/minilog/minilog-tests.ts
+++ b/minilog/minilog-tests.ts
@@ -3,11 +3,9 @@
 // Definitions by: Guido <http://guido.io>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="minilog.d.ts"/>
-
 
 //Following are example snippets from mixu.net/minilog
-
+import Minilog = require("minilog");
 var log = Minilog('app');
 Minilog.enable();
 
diff --git a/minilog/minilog.d.ts b/minilog/minilog.d.ts
deleted file mode 100644
index a2979a9cfe..0000000000
--- a/minilog/minilog.d.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-// Type definitions for minilog v2
-// Project: https://github.com/mixu/minilog
-// Definitions by: Guido <http://guido.io>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-//These type definitions are not complete, although basic usage should be typed.
-interface Minilog {
-    debug(...msg: any[]): Minilog;
-    info(...msg: any[]): Minilog;
-    log(...msg: any[]): Minilog;
-    warn(...msg: any[]): Minilog;
-    error(...msg: any[]): Minilog;
-}
-
-declare function Minilog(namespace: string): Minilog;
-
-declare namespace Minilog {
-    export function enable(): Minilog;
-    export function disable() : Minilog;
-    export function pipe(dest: any): Transform;
-
-    export var suggest: Filter;
-    export var backends: Minilog.MinilogBackends;
-
-    export var defaultBackend: any;
-    export var defaultFormatter: string;
-
-
-    export class Filter extends Transform{
-
-        /**
-        * Adds an entry to the whitelist
-        * Returns this filter
-        */
-        allow(name: any, level?: any): Filter;
-        /**
-        * Adds an entry to the blacklist
-        * Returns this filter
-        */
-        deny(name: any, level?: any): Filter;
-        /**
-        * Empties the whitelist and blacklist
-        * Returns this filter
-        */
-        clear(): Filter;
-
-        test(name:any, level:any): boolean;
-
-        /**
-        * specifies the behavior when a log line doesn't match either the whitelist or the blacklist.
-        The default is true (= "allow by default") - lines that do not match the whitelist or the blacklist are not filtered (e.g. ).
-        If you want to flip the default so that lines are filtered unless they are on the whitelist, set this to false (= "deny by default").
-        */
-        defaultResult: boolean;
-
-        /**
-        * controls whether the filter is enabled. Default: true
-        */
-        enabled: boolean;
-    }
-
-
-    export interface MinilogBackends {
-        array: any;
-        browser: any;
-        console: Console;
-        localstorage: any;
-        jQuery: any;
-    }
-
-    export class Console extends Transform{
-
-        /**
-        * List of available formatters
-        */
-        formatters: string[];
-
-        //Only available on client
-        color: Transform;
-        minilog: Transform;
-
-        //Only available on backend
-        formatClean: Transform;
-        formatColor: Transform;
-        formatNpm: Transform;
-        formatLearnboost: Transform;
-        formatMinilog: Transform;
-        formatWithStack: Transform;
-    }
-
-    export class Transform {
-        write(name: any, level: any, args: any): void;
-        pipe(dest: any): any;
-        unpipe(from: any): Transform;
-        mixin(dest: any): void;
-    }
-
-}
-
-declare module 'minilog' {
-    export = Minilog;
-}
diff --git a/minilog/tsconfig.json b/minilog/tsconfig.json
new file mode 100644
index 0000000000..40af8c2a32
--- /dev/null
+++ b/minilog/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "minilog-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/minimatch/index.d.ts b/minimatch/index.d.ts
new file mode 100644
index 0000000000..fa3fdd217c
--- /dev/null
+++ b/minimatch/index.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for Minimatch 2.0.8
+// Project: https://github.com/isaacs/minimatch
+// Definitions by: vvakame <https://github.com/vvakame/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function M(target: string, pattern: string, options?: M.IOptions): boolean;
+
+declare namespace M {
+    function match(list: string[], pattern: string, options?: IOptions): string[];
+    function filter(pattern: string, options?: IOptions): (element: string, indexed: number, array: string[]) => boolean;
+    function makeRe(pattern: string, options?: IOptions): RegExp;
+
+    var Minimatch: IMinimatchStatic;
+
+    interface IOptions {
+        debug?: boolean;
+        nobrace?: boolean;
+        noglobstar?: boolean;
+        dot?: boolean;
+        noext?: boolean;
+        nocase?: boolean;
+        nonull?: boolean;
+        matchBase?: boolean;
+        nocomment?: boolean;
+        nonegate?: boolean;
+        flipNegate?: boolean;
+    }
+
+    interface IMinimatchStatic {
+        new (pattern: string, options?: IOptions): IMinimatch;
+        prototype: IMinimatch;
+    }
+
+    interface IMinimatch {
+        pattern: string;
+        options: IOptions;
+        /** 2-dimensional array of regexp or string expressions. */
+        set: any[][]; // (RegExp | string)[][]
+        regexp: RegExp;
+        negate: boolean;
+        comment: boolean;
+        empty: boolean;
+
+        makeRe(): RegExp; // regexp or boolean
+        match(fname: string): boolean;
+        matchOne(files: string[], pattern: string[], partial: boolean): boolean;
+
+        /** Deprecated. For internal use. */
+        debug(): void;
+        /** Deprecated. For internal use. */
+        make(): void;
+        /** Deprecated. For internal use. */
+        parseNegate(): void;
+        /** Deprecated. For internal use. */
+        braceExpand(pattern: string, options: IOptions): void;
+        /** Deprecated. For internal use. */
+        parse(pattern: string, isSub?: boolean): void;
+    }
+}
+
+export = M;
diff --git a/minimatch/minimatch-tests.ts b/minimatch/minimatch-tests.ts
index 38c699e0f0..e47146a18a 100644
--- a/minimatch/minimatch-tests.ts
+++ b/minimatch/minimatch-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="./minimatch.d.ts" />
-
-import mm = require("minimatch");
+import mm = require("./");
 
 var pattern = "**/*.ts";
 var options = {
diff --git a/minimatch/minimatch.d.ts b/minimatch/minimatch.d.ts
deleted file mode 100644
index 5a6c7215ae..0000000000
--- a/minimatch/minimatch.d.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-// Type definitions for Minimatch 2.0.8
-// Project: https://github.com/isaacs/minimatch
-// Definitions by: vvakame <https://github.com/vvakame/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "minimatch" {
-
-	function M(target: string, pattern: string, options?: M.IOptions): boolean;
-
-	namespace M {
-		function match(list: string[], pattern: string, options?: IOptions): string[];
-		function filter(pattern: string, options?: IOptions): (element: string, indexed: number, array: string[]) => boolean;
-		function makeRe(pattern: string, options?: IOptions): RegExp;
-
-		var Minimatch: IMinimatchStatic;
-
-		interface IOptions {
-			debug?: boolean;
-			nobrace?: boolean;
-			noglobstar?: boolean;
-			dot?: boolean;
-			noext?: boolean;
-			nocase?: boolean;
-			nonull?: boolean;
-			matchBase?: boolean;
-			nocomment?: boolean;
-			nonegate?: boolean;
-			flipNegate?: boolean;
-		}
-
-		interface IMinimatchStatic {
-			new (pattern: string, options?: IOptions): IMinimatch;
-			prototype: IMinimatch;
-		}
-
-		interface IMinimatch {
-			pattern: string;
-			options: IOptions;
-			/** 2-dimensional array of regexp or string expressions. */
-			set: any[][]; // (RegExp | string)[][]
-			regexp: RegExp;
-			negate: boolean;
-			comment: boolean;
-			empty: boolean;
-
-			makeRe(): RegExp; // regexp or boolean
-			match(fname: string): boolean;
-			matchOne(files: string[], pattern: string[], partial: boolean): boolean;
-
-			/** Deprecated. For internal use. */
-			debug(): void;
-			/** Deprecated. For internal use. */
-			make(): void;
-			/** Deprecated. For internal use. */
-			parseNegate(): void;
-			/** Deprecated. For internal use. */
-			braceExpand(pattern: string, options: IOptions): void;
-			/** Deprecated. For internal use. */
-			parse(pattern: string, isSub?: boolean): void;
-		}
-	}
-
-	export = M;
-}
diff --git a/minimatch/tsconfig.json b/minimatch/tsconfig.json
new file mode 100644
index 0000000000..89946ae9fd
--- /dev/null
+++ b/minimatch/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "minimatch-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/minimist/index.d.ts b/minimist/index.d.ts
new file mode 100644
index 0000000000..4ab52d76ff
--- /dev/null
+++ b/minimist/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for minimist 1.1.3
+// Project: https://github.com/substack/minimist
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Necroskillz <https://github.com/Necroskillz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function minimist(args?: string[], opts?: minimist.Opts): minimist.ParsedArgs;
+
+declare namespace minimist {
+    export interface Opts {
+        // a string or array of strings argument names to always treat as strings
+        string?: string | string[];
+        // a string or array of strings to always treat as booleans
+        boolean?: boolean | string | string[];
+        // an object mapping string names to strings or arrays of string argument names to use
+        alias?: { [key: string]: string | string[] };
+        // an object mapping string argument names to default values
+        default?: { [key: string]: any };
+        // when true, populate argv._ with everything after the first non-option
+        stopEarly?: boolean;
+        // a function which is invoked with a command line parameter not defined in the opts configuration object.
+        // If the function returns false, the unknown option is not added to argv
+        unknown?: (arg: string) => boolean;
+        // when true, populate argv._ with everything before the -- and argv['--'] with everything after the --
+        '--'?: boolean;
+    }
+
+    export interface ParsedArgs {
+        [arg: string]: any;
+        _: string[];
+    }
+}
+
+export = minimist;
diff --git a/minimist/minimist-tests.ts b/minimist/minimist-tests.ts
index efd3076aac..6e63590462 100644
--- a/minimist/minimist-tests.ts
+++ b/minimist/minimist-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="minimist.d.ts" />
 
 import minimist = require('minimist');
 import Opts = minimist.Opts;
diff --git a/minimist/minimist.d.ts b/minimist/minimist.d.ts
deleted file mode 100644
index d455d1e755..0000000000
--- a/minimist/minimist.d.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// Type definitions for minimist 1.1.3
-// Project: https://github.com/substack/minimist
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Necroskillz <https://github.com/Necroskillz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'minimist' {
-	function minimist(args?: string[], opts?: minimist.Opts): minimist.ParsedArgs;
-
-	namespace minimist {
-		export interface Opts {
-			// a string or array of strings argument names to always treat as strings
-			string?: string|string[];
-			// a string or array of strings to always treat as booleans
-			boolean?: boolean|string|string[];
-			// an object mapping string names to strings or arrays of string argument names to use
-			alias?: {[key:string]: string|string[]};
-			// an object mapping string argument names to default values
-			default?: {[key:string]: any};
-			// when true, populate argv._ with everything after the first non-option
-			stopEarly?: boolean;
-			// a function which is invoked with a command line parameter not defined in the opts configuration object.
-			// If the function returns false, the unknown option is not added to argv
-			unknown?: (arg: string) => boolean;
-			// when true, populate argv._ with everything before the -- and argv['--'] with everything after the --
-			'--'?: boolean;
-		}
-
-		export interface ParsedArgs {
-			[arg: string]: any;
-			_: string[];
-		}
-	}
-
-	export = minimist;
-}
diff --git a/minimist/tsconfig.json b/minimist/tsconfig.json
new file mode 100644
index 0000000000..e696ab6eb7
--- /dev/null
+++ b/minimist/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "minimist-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mithril/mithril.d.ts b/mithril/index.d.ts
similarity index 100%
rename from mithril/mithril.d.ts
rename to mithril/index.d.ts
diff --git a/mithril/mithril-tests.ts b/mithril/mithril-tests.ts
index be5832a40d..100729a4ec 100644
--- a/mithril/mithril-tests.ts
+++ b/mithril/mithril-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="mithril.d.ts" />
+
 // This is the todolist example from http://lhorie.github.io/mithril/getting-started.html
 
 var todo = {
diff --git a/mithril/tsconfig.json b/mithril/tsconfig.json
new file mode 100644
index 0000000000..1529d81488
--- /dev/null
+++ b/mithril/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mithril-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mixpanel/mixpanel.d.ts b/mixpanel/index.d.ts
similarity index 100%
rename from mixpanel/mixpanel.d.ts
rename to mixpanel/index.d.ts
diff --git a/mixpanel/mixpanel-tests.ts b/mixpanel/mixpanel-tests.ts
index 90976a461c..f85406f3f8 100644
--- a/mixpanel/mixpanel-tests.ts
+++ b/mixpanel/mixpanel-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="mixpanel.d.ts" />
+
 function mixpanel_base()
 {
     mixpanel.init("new token");
diff --git a/mixpanel/tsconfig.json b/mixpanel/tsconfig.json
new file mode 100644
index 0000000000..9278a232eb
--- /dev/null
+++ b/mixpanel/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mixpanel-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mixto/mixto.d.ts b/mixto/index.d.ts
similarity index 100%
rename from mixto/mixto.d.ts
rename to mixto/index.d.ts
diff --git a/mixto/mixto-tests.ts b/mixto/mixto-tests.ts
index 4e6dcad726..49d43cd100 100644
--- a/mixto/mixto-tests.ts
+++ b/mixto/mixto-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./mixto.d.ts" />
+
 
 import Mixin = require("mixto");
 
diff --git a/mixto/tsconfig.json b/mixto/tsconfig.json
new file mode 100644
index 0000000000..3f016c0763
--- /dev/null
+++ b/mixto/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mixto-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mkdirp/index.d.ts b/mkdirp/index.d.ts
new file mode 100644
index 0000000000..7cd860f69a
--- /dev/null
+++ b/mkdirp/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for mkdirp 0.3.0
+// Project: http://github.com/substack/node-mkdirp
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare function mkdirp(dir: string, cb: (err: any, made: string) => void): void;
+declare function mkdirp(dir: string, flags: any, cb: (err: any, made: string) => void): void;
+
+declare namespace mkdirp {
+    function sync(dir: string, flags?: any): string;
+}
+export = mkdirp;
diff --git a/mkdirp/mkdirp-tests.ts b/mkdirp/mkdirp-tests.ts
index e256e61ada..68c51f74b6 100644
--- a/mkdirp/mkdirp-tests.ts
+++ b/mkdirp/mkdirp-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="mkdirp.d.ts" />
 
 import mkdirp = require('mkdirp');
 
diff --git a/mkdirp/mkdirp.d.ts b/mkdirp/mkdirp.d.ts
deleted file mode 100644
index cd635ab425..0000000000
--- a/mkdirp/mkdirp.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Type definitions for mkdirp 0.3.0
-// Project: http://github.com/substack/node-mkdirp
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'mkdirp' {
-
-	function mkdirp(dir: string, cb: (err: any, made: string) => void): void;
-	function mkdirp(dir: string, flags: any, cb: (err: any, made: string) => void): void;
-
-	namespace mkdirp {
-		function sync(dir: string, flags?: any): string;
-	}
-	export = mkdirp;
-}
diff --git a/mkdirp/tsconfig.json b/mkdirp/tsconfig.json
new file mode 100644
index 0000000000..ccd1236774
--- /dev/null
+++ b/mkdirp/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mkdirp-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mkpath/index.d.ts b/mkpath/index.d.ts
new file mode 100644
index 0000000000..a5fc7bd93c
--- /dev/null
+++ b/mkpath/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for mkpath v0.1.0
+// Project: https://www.npmjs.com/package/mkpath
+// Definitions by: Jared Klopper <https://github.com/optical>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare namespace mkpath {
+    function sync(path: string, mode?: number): void;
+}
+
+declare function mkpath(path: string, callback?: (err: any) => void): void;
+declare function mkpath(path: string, mode?: number, callback?: (err?: any) => void): void;
+
+export = mkpath;
diff --git a/mkpath/mkpath-tests.ts b/mkpath/mkpath-tests.ts
index 067c9f7253..26be0728db 100644
--- a/mkpath/mkpath-tests.ts
+++ b/mkpath/mkpath-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="mkpath.d.ts" />
+
 import mkpath = require('mkpath');
 
 mkpath('red/green/violet', function (err) {
diff --git a/mkpath/mkpath.d.ts b/mkpath/mkpath.d.ts
deleted file mode 100644
index bad1051ce1..0000000000
--- a/mkpath/mkpath.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Type definitions for mkpath v0.1.0
-// Project: https://www.npmjs.com/package/mkpath
-// Definitions by: Jared Klopper <https://github.com/optical>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'mkpath' {
-  namespace mkpath {
-    function sync(path: string, mode?: number): void;
-  }
-
-  function mkpath(path: string, callback?: (err: any) => void): void;
-  function mkpath(path: string, mode?: number, callback?: (err?: any) => void): void;
-
-  export = mkpath;
-}
diff --git a/mkpath/tsconfig.json b/mkpath/tsconfig.json
new file mode 100644
index 0000000000..ab1bc9a19f
--- /dev/null
+++ b/mkpath/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mkpath-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mmmagic/index.d.ts b/mmmagic/index.d.ts
new file mode 100644
index 0000000000..9a264f3d46
--- /dev/null
+++ b/mmmagic/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for mmmagic v0.4.1
+// Project: https://github.com/mscdex/mmmagic
+// Definitions by: Andrei Sebastian Cîmpean <http://andreime.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+export type bitmask = number;
+export declare class Magic {
+    constructor(magicPath?: string, mask?: bitmask);
+    constructor(mask?: bitmask);
+    detectFile(path: string, callback: (err: Error, result: string) => void): void;
+    detect(data: Buffer, callback: (err: Error, result: string) => void): void;
+}
+export declare var MAGIC_NONE: bitmask; // no flags set
+export declare var MAGIC_DEBUG: bitmask; // turn on debugging
+export declare var MAGIC_SYMLINK: bitmask; // follow symlinks (default for non-Windows)
+export declare var MAGIC_DEVICES: bitmask; // look at the contents of devices
+export declare var MAGIC_MIME_TYPE: bitmask; // return the MIME type
+export declare var MAGIC_CONTINUE: bitmask; // return all matches (returned as an array of strings)
+export declare var MAGIC_CHECK: bitmask; // print warnings to stderr
+export declare var MAGIC_PRESERVE_ATIME: bitmask; // restore access time on exit
+export declare var MAGIC_RAW: bitmask; // don't translate unprintable chars
+export declare var MAGIC_MIME_ENCODING: bitmask; // return the MIME encoding
+export declare var MAGIC_MIME: bitmask; // (export var MAGIC_MIME_TYPE | export var MAGIC_MIME_ENCODING)
+export declare var MAGIC_APPLE: bitmask; // return the Apple creator and type
+export declare var MAGIC_NO_CHECK_TAR: bitmask; // don't check for tar files
+export declare var MAGIC_NO_CHECK_SOFT: bitmask; // don't check magic entries
+export declare var MAGIC_NO_CHECK_APPTYPE: bitmask; // don't check application type
+export declare var MAGIC_NO_CHECK_ELF: bitmask; // don't check for elf details
+export declare var MAGIC_NO_CHECK_TEXT: bitmask; // don't check for text files
+export declare var MAGIC_NO_CHECK_CDF: bitmask; // don't check for cdf files
+export declare var MAGIC_NO_CHECK_TOKENS: bitmask; // don't check tokens
+export declare var MAGIC_NO_CHECK_ENCODING: bitmask
diff --git a/mmmagic/mmmagic-tests.ts b/mmmagic/mmmagic-tests.ts
index afe93ff091..039f3abd27 100644
--- a/mmmagic/mmmagic-tests.ts
+++ b/mmmagic/mmmagic-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="mmmagic.d.ts" />
 
 import Magic = require("mmmagic");
 
diff --git a/mmmagic/mmmagic.d.ts b/mmmagic/mmmagic.d.ts
deleted file mode 100644
index 78e4929a8d..0000000000
--- a/mmmagic/mmmagic.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-// Type definitions for mmmagic v0.4.1
-// Project: https://github.com/mscdex/mmmagic
-// Definitions by: Andrei Sebastian Cîmpean <http://andreime.com/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "mmmagic" {
-    export type bitmask = number;
-    export class Magic  {
-        constructor(magicPath?: string, mask?: bitmask);
-        constructor(mask?: bitmask);
-        detectFile(path: string, callback: (err: Error, result: string) => void): void;
-        detect(data: Buffer, callback: (err: Error, result: string) => void): void;
-    }
-    export var MAGIC_NONE: bitmask; // no flags set
-    export var MAGIC_DEBUG: bitmask; // turn on debugging
-    export var MAGIC_SYMLINK: bitmask; // follow symlinks (default for non-Windows)
-    export var MAGIC_DEVICES: bitmask; // look at the contents of devices
-    export var MAGIC_MIME_TYPE: bitmask; // return the MIME type
-    export var MAGIC_CONTINUE: bitmask; // return all matches (returned as an array of strings)
-    export var MAGIC_CHECK: bitmask; // print warnings to stderr
-    export var MAGIC_PRESERVE_ATIME: bitmask; // restore access time on exit
-    export var MAGIC_RAW: bitmask; // don't translate unprintable chars
-    export var MAGIC_MIME_ENCODING: bitmask; // return the MIME encoding
-    export var MAGIC_MIME: bitmask; // (export var MAGIC_MIME_TYPE | export var MAGIC_MIME_ENCODING)
-    export var MAGIC_APPLE: bitmask; // return the Apple creator and type
-    export var MAGIC_NO_CHECK_TAR: bitmask; // don't check for tar files
-    export var MAGIC_NO_CHECK_SOFT: bitmask; // don't check magic entries
-    export var MAGIC_NO_CHECK_APPTYPE: bitmask; // don't check application type
-    export var MAGIC_NO_CHECK_ELF: bitmask; // don't check for elf details
-    export var MAGIC_NO_CHECK_TEXT: bitmask; // don't check for text files
-    export var MAGIC_NO_CHECK_CDF: bitmask; // don't check for cdf files
-    export var MAGIC_NO_CHECK_TOKENS: bitmask; // don't check tokens
-    export var MAGIC_NO_CHECK_ENCODING: bitmask // don't check text encodings
-
-}
\ No newline at end of file
diff --git a/mmmagic/tsconfig.json b/mmmagic/tsconfig.json
new file mode 100644
index 0000000000..16aaf2013e
--- /dev/null
+++ b/mmmagic/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mmmagic-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mobile-detect/mobile-detect.d.ts b/mobile-detect/index.d.ts
similarity index 100%
rename from mobile-detect/mobile-detect.d.ts
rename to mobile-detect/index.d.ts
diff --git a/mobile-detect/mobile-detect-tests.ts b/mobile-detect/mobile-detect-tests.ts
index 64dbddc1af..7a3e814612 100644
--- a/mobile-detect/mobile-detect-tests.ts
+++ b/mobile-detect/mobile-detect-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="mobile-detect.d.ts" />
+
 
 var md: MobileDetect = new MobileDetect(window.navigator.userAgent);
 
diff --git a/mobile-detect/tsconfig.json b/mobile-detect/tsconfig.json
new file mode 100644
index 0000000000..c6afabf6e4
--- /dev/null
+++ b/mobile-detect/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mobile-detect-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mobservable-react/index.d.ts b/mobservable-react/index.d.ts
new file mode 100644
index 0000000000..a5f77cf5d4
--- /dev/null
+++ b/mobservable-react/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for mobservable v0.1.8
+// Project: https://github.com/mweststrate/mobservable-react
+// Definitions by: Michel Weststrate <https://github.com/mweststrate/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as React from 'react';
+
+/**
+ * Turns a React component or stateless render function into a reactive component.
+ */
+export function reactiveComponent<P>(clazz: React.ClassicComponentClass<P>): React.ClassicComponentClass<P>;
+export function reactiveComponent<TFunction extends React.ComponentClass<any>>(target: TFunction): void; // decorator signature
+export function reactiveComponent<P>(clazz: React.ComponentClass<P>): React.ComponentClass<P>;
+export function reactiveComponent<P>(renderFunction: (props: P) => React.ReactElement<any>): React.ClassicComponentClass<P>;
diff --git a/mobservable-react/mobservable-react-tests.ts b/mobservable-react/mobservable-react-tests.ts
index 1bf2b49c6d..af2bf5a138 100644
--- a/mobservable-react/mobservable-react-tests.ts
+++ b/mobservable-react/mobservable-react-tests.ts
@@ -1,7 +1,6 @@
-/// <reference path="./mobservable-react.d.ts"/>
-/// <reference path="../react/react-global.d.ts" />
-
 import {reactiveComponent} from 'mobservable-react';
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
 
 {
     let c1 = reactiveComponent(React.createClass({
diff --git a/mobservable-react/mobservable-react.d.ts b/mobservable-react/mobservable-react.d.ts
deleted file mode 100644
index 328a6047ce..0000000000
--- a/mobservable-react/mobservable-react.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Type definitions for mobservable v0.1.8
-// Project: https://github.com/mweststrate/mobservable-react
-// Definitions by: Michel Weststrate <https://github.com/mweststrate/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react-global.d.ts" />
-
-declare module "mobservable-react" {
-    /**
-     * Turns a React component or stateless render function into a reactive component.
-     */
-    export function reactiveComponent<P>(clazz: React.ClassicComponentClass<P>): React.ClassicComponentClass<P>;
-    export function reactiveComponent<TFunction extends React.ComponentClass<any>>(target: TFunction): void; // decorator signature
-    export function reactiveComponent<P>(clazz: React.ComponentClass<P>): React.ComponentClass<P>;
-    export function reactiveComponent<P>(renderFunction: (props: P) => React.ReactElement<any>): React.ClassicComponentClass<P>;
-}
\ No newline at end of file
diff --git a/mobservable-react/tsconfig.json b/mobservable-react/tsconfig.json
new file mode 100644
index 0000000000..85a7d5db33
--- /dev/null
+++ b/mobservable-react/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "experimentalDecorators": true,
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mobservable-react-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mobservable/mobservable.d.ts b/mobservable/index.d.ts
similarity index 100%
rename from mobservable/mobservable.d.ts
rename to mobservable/index.d.ts
diff --git a/mobservable/mobservable-tests.ts b/mobservable/mobservable-tests.ts
index 2966128fee..07088d5d87 100644
--- a/mobservable/mobservable-tests.ts
+++ b/mobservable/mobservable-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./mobservable.d.ts"/>
 import mobservable = require('mobservable');
 import {observable} from "mobservable";
 
diff --git a/mobservable/tsconfig.json b/mobservable/tsconfig.json
new file mode 100644
index 0000000000..3c1a3e4a17
--- /dev/null
+++ b/mobservable/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "experimentalDecorators": true,
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mobservable-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mocha-phantomjs/mocha-phantomjs.d.ts b/mocha-phantomjs/index.d.ts
similarity index 100%
rename from mocha-phantomjs/mocha-phantomjs.d.ts
rename to mocha-phantomjs/index.d.ts
diff --git a/mocha-phantomjs/mocha-phantomjs-tests.ts b/mocha-phantomjs/mocha-phantomjs-tests.ts
index 14124fb83b..5606e09469 100644
--- a/mocha-phantomjs/mocha-phantomjs-tests.ts
+++ b/mocha-phantomjs/mocha-phantomjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="mocha-phantomjs.d.ts" />
+
 
 function test_window() {
 	window.mochaPhantomJS();	
diff --git a/mocha-phantomjs/tsconfig.json b/mocha-phantomjs/tsconfig.json
new file mode 100644
index 0000000000..19edf96428
--- /dev/null
+++ b/mocha-phantomjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mocha-phantomjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mocha/mocha.d.ts b/mocha/index.d.ts
similarity index 100%
rename from mocha/mocha.d.ts
rename to mocha/index.d.ts
diff --git a/mocha/mocha-node-tests.ts b/mocha/mocha-node-tests.ts
index e27ec8e6d9..e5cd80c8cf 100644
--- a/mocha/mocha-node-tests.ts
+++ b/mocha/mocha-node-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="mocha-node.d.ts" />
+
 
 import MochaDef = require('mocha');
 
diff --git a/mocha/mocha-node.d.ts b/mocha/mocha-node.d.ts
index 66dca3af3f..dcee001b54 100644
--- a/mocha/mocha-node.d.ts
+++ b/mocha/mocha-node.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Vadim Macagon <https://github.com/enlight>, vvakame <https://github.com/vvakame>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="mocha.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 declare namespace Mocha {
     interface IRunnable extends NodeJS.EventEmitter {
diff --git a/mocha/mocha-tests.ts b/mocha/mocha-tests.ts
index d0108263ec..3480aa2c47 100644
--- a/mocha/mocha-tests.ts
+++ b/mocha/mocha-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="mocha.d.ts" />
+
 
 function test_describe() {
     describe('something', () => { });
diff --git a/mocha/tsconfig.json b/mocha/tsconfig.json
new file mode 100644
index 0000000000..d07dddb6ec
--- /dev/null
+++ b/mocha/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mocha-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mock-fs/index.d.ts b/mock-fs/index.d.ts
new file mode 100644
index 0000000000..300558192d
--- /dev/null
+++ b/mock-fs/index.d.ts
@@ -0,0 +1,56 @@
+// Type definitions for mock-fs 3.6.0
+// Project: https://github.com/tschaub/mock-fs
+// Definitions by: Wim Looman <https://github.com/Nemo157>, Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import fs = require("fs");
+
+declare function mock(config?: mock.Config, options?: mock.Options): void;
+
+declare namespace mock {
+    function file(config: FileConfig): File;
+    function directory(config: DirectoryConfig): Directory;
+    function symlink(config: SymlinkConfig): Symlink;
+
+    function restore(): void;
+
+    function fs(config?: Config, options?: Options): typeof fs;
+
+    interface Config {
+        [path: string]: string | Buffer | File | Directory | Symlink | Config;
+    }
+
+    interface Options {
+        createCwd?: boolean;
+        createTmp?: boolean;
+    }
+
+    interface CommonConfig {
+        mode?: number;
+        uid?: number;
+        git?: number;
+        atime?: Date;
+        ctime?: Date;
+        mtime?: Date;
+        birthtime?: Date;
+    }
+
+    interface FileConfig extends CommonConfig {
+        content: string | Buffer;
+    }
+    interface DirectoryConfig extends CommonConfig {
+        items: Config;
+    }
+    interface SymlinkConfig extends CommonConfig {
+        path: string;
+    }
+
+    class File { private _file: any; }
+    class Directory { private _directory: any; }
+    class Symlink { private _symlink: any; }
+}
+
+export = mock;
diff --git a/mock-fs/mock-fs-tests.ts b/mock-fs/mock-fs-tests.ts
index ef628ce588..83522e1a66 100644
--- a/mock-fs/mock-fs-tests.ts
+++ b/mock-fs/mock-fs-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="mock-fs.d.ts" />
 
 var mock = require('mock-fs');
 
diff --git a/mock-fs/mock-fs.d.ts b/mock-fs/mock-fs.d.ts
deleted file mode 100644
index baa42032f3..0000000000
--- a/mock-fs/mock-fs.d.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-// Type definitions for mock-fs 3.6.0
-// Project: https://github.com/tschaub/mock-fs
-// Definitions by: Wim Looman <https://github.com/Nemo157>, Qubo <https://github.com/tkqubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "mock-fs" {
-	import fs = require("fs");
-
-	function mock(config?: mock.Config, options?: mock.Options): void;
-
-	namespace mock {
-		function file(config: FileConfig): File;
-		function directory(config: DirectoryConfig): Directory;
-		function symlink(config: SymlinkConfig): Symlink;
-
-		function restore(): void;
-
-		function fs(config?: Config, options?: Options): typeof fs;
-
-		interface Config {
-			[path: string]: string | Buffer | File | Directory | Symlink | Config;
-		}
-
-		interface Options {
-			createCwd?: boolean;
-			createTmp?: boolean;
-		}
-
-		interface CommonConfig {
-			mode?: number;
-			uid?: number;
-			git?: number;
-			atime?: Date;
-			ctime?: Date;
-			mtime?: Date;
-			birthtime?: Date;
-		}
-
-		interface FileConfig extends CommonConfig {
-			content: string | Buffer;
-		}
-		interface DirectoryConfig extends CommonConfig {
-			items: Config;
-		}
-		interface SymlinkConfig extends CommonConfig {
-			path: string;
-		}
-
-		class File { private _file: any; }
-		class Directory { private _directory: any; }
-		class Symlink { private _symlink: any; }
-	}
-
-	export = mock;
-}
diff --git a/mock-fs/tsconfig.json b/mock-fs/tsconfig.json
new file mode 100644
index 0000000000..1f3d554e3a
--- /dev/null
+++ b/mock-fs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mock-fs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mockery/index.d.ts b/mockery/index.d.ts
new file mode 100644
index 0000000000..e9519acea1
--- /dev/null
+++ b/mockery/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for mockery 1.4.0
+// Project: https://github.com/mfncooper/mockery
+// Definitions by: jt000 <https://github.com/jt000>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+interface MockeryEnableArgs {
+    useCleanCache?: boolean;
+    warnOnReplace?: boolean;
+    warnOnUnregistered?: boolean;
+}
+
+export declare function enable(args?: MockeryEnableArgs): void;
+export declare function disable(): void;
+
+export declare function registerMock(name: string, mock: any): void;
+export declare function deregisterMock(name: string): void;
+
+export declare function registerSubstitute(name: string, substitute: string): void;
+export declare function deregisterSubstitute(name: string): void;
+
+export declare function registerAllowable(name: string, unhook?: boolean): void;
+export declare function deregisterAllowable(name: string): void;
+
+export declare function registerAllowables(names: string[]): void;
+export declare function deregisterAllowables(names: string[]): void;
+
+export declare function deregisterAll(): void;
+export declare function resetCache(): void;
+export declare function warnOnUnregistered(value: boolean): void;
+export declare function warnOnReplace(value: boolean): void;
diff --git a/mockery/mockery-tests.ts b/mockery/mockery-tests.ts
index d8623b3aaa..cfcd8c53bc 100644
--- a/mockery/mockery-tests.ts
+++ b/mockery/mockery-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="mockery.d.ts" />
 
 import mockery = require('mockery');
 
diff --git a/mockery/mockery.d.ts b/mockery/mockery.d.ts
deleted file mode 100644
index f6242839a8..0000000000
--- a/mockery/mockery.d.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// Type definitions for mockery 1.4.0
-// Project: https://github.com/mfncooper/mockery
-// Definitions by: jt000 <https://github.com/jt000>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "mockery" {
-
-    interface MockeryEnableArgs {
-        useCleanCache?: boolean;
-        warnOnReplace?: boolean;
-        warnOnUnregistered?: boolean;
-    }
-
-    export function enable(args?: MockeryEnableArgs): void;
-    export function disable(): void;
-
-    export function registerMock(name: string, mock: any): void;
-    export function deregisterMock(name: string): void;
-
-    export function registerSubstitute(name: string, substitute: string): void;
-    export function deregisterSubstitute(name: string): void;
-
-    export function registerAllowable(name: string, unhook?: boolean): void;
-    export function deregisterAllowable(name: string): void;
-
-    export function registerAllowables(names: string[]): void;
-    export function deregisterAllowables(names: string[]): void;
-
-    export function deregisterAll(): void;
-    export function resetCache(): void;
-    export function warnOnUnregistered(value: boolean): void;
-    export function warnOnReplace(value: boolean): void;
-}
\ No newline at end of file
diff --git a/mockery/tsconfig.json b/mockery/tsconfig.json
new file mode 100644
index 0000000000..ffe9a16962
--- /dev/null
+++ b/mockery/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mockery-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/modernizr/modernizr.d.ts b/modernizr/index.d.ts
similarity index 100%
rename from modernizr/modernizr.d.ts
rename to modernizr/index.d.ts
diff --git a/modernizr/modernizr-tests.ts b/modernizr/modernizr-tests.ts
index a3a7911cf1..1807a5f377 100644
--- a/modernizr/modernizr-tests.ts
+++ b/modernizr/modernizr-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="modernizr.d.ts" />
+
 
 declare var $: any;
 
diff --git a/modernizr/tsconfig.json b/modernizr/tsconfig.json
new file mode 100644
index 0000000000..449db7be84
--- /dev/null
+++ b/modernizr/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "modernizr-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/moment-range/index.d.ts b/moment-range/index.d.ts
new file mode 100644
index 0000000000..c8a1d307ab
--- /dev/null
+++ b/moment-range/index.d.ts
@@ -0,0 +1,57 @@
+// Type definitions for Moment.js 2.0.3
+// Project: https://github.com/gf3/moment-range
+// Definitions by: Bart van den Burg <https://github.com/Burgov>, Wilgert Velinga <https://github.com/wilgert>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as moment from 'moment';
+
+export as namespace moment;
+export = moment;
+
+declare module 'moment' {
+     interface Range {
+        start: Moment;
+        end: Moment;
+
+        contains (other: Date, exclusive?: boolean): boolean;
+        contains (other: Moment, exclusive?: boolean): boolean;
+
+        overlaps (range: Range): boolean;
+
+        intersect (other: Range): Range;
+
+        add (other: Range): Range;
+
+        subtract (other: Range): Range[];
+
+        by (range: string, hollaback: (current: Moment) => void, exclusive?: boolean): void;
+        by (range: Range, hollaback: (current: Moment) => void, exclusive?: boolean): void;
+
+        isSame (other: Range): boolean;
+
+        diff (unit?: string): number;
+
+        toDate (): Date;
+
+        toString (): string;
+
+        valueOf (): number;
+
+        center (): number;
+
+        clone (): Range;
+    }
+
+    interface Moment {
+        within (x: moment.Range): boolean;
+    }
+
+    interface MomentStatic {
+        range(range: string): moment.Range;
+        range(range: Date[]): moment.Range;
+        range(range: Moment[]): moment.Range;
+        range(start: Date, end: Date): moment.Range;
+        range(start: Moment, end: Moment): moment.Range;
+    }
+
+}
diff --git a/moment-range/moment-range-tests.ts b/moment-range/moment-range-tests.ts
index 7940e58506..21949aac1c 100644
--- a/moment-range/moment-range-tests.ts
+++ b/moment-range/moment-range-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="moment-range.d.ts" />
+import * as moment from 'moment';
 
 var range: moment.Range = moment.range(new Date(2012, 0, 15), new Date(2012, 4, 23));
 var range2: moment.Range = moment.range(moment("2011-04-15", "YYYY-MM-DD"), moment("2011-11-27", "YYYY-MM-DD"));
diff --git a/moment-range/moment-range.d.ts b/moment-range/moment-range.d.ts
deleted file mode 100644
index aacfb55f3a..0000000000
--- a/moment-range/moment-range.d.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-// Type definitions for Moment.js 2.0.3
-// Project: https://github.com/gf3/moment-range
-// Definitions by: Bart van den Burg <https://github.com/Burgov>, Wilgert Velinga <https://github.com/wilgert>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../moment/moment.d.ts" />
-
-declare namespace moment {
-
-    interface Moment {
-
-        within (x: Range): boolean;
-
-    }
-
-    interface MomentStatic {
-
-        range(range: string): Range;
-        range(range: Date[]): Range;
-        range(range: Moment[]): Range;
-        range(start: Date, end: Date): Range;
-        range(start: Moment, end: Moment): Range;
-
-    }
-
-    interface Range {
-        start: Moment;
-        end: Moment;
-
-        contains (other: Date, exclusive?: boolean): boolean;
-        contains (other: Moment, exclusive?: boolean): boolean;
-
-        overlaps (range: Range): boolean;
-
-        intersect (other: Range): Range;
-
-        add (other: Range): Range;
-
-        subtract (other: Range): Range[];
-
-        by (range: string, hollaback: (current: Moment) => void, exclusive?: boolean): void;
-        by (range: Range, hollaback: (current: Moment) => void, exclusive?: boolean): void;
-
-        isSame (other: Range): boolean;
-
-        diff (unit?: string): number;
-
-        toDate (): Date;
-
-        toString (): string;
-
-        valueOf (): number;
-
-        center (): number;
-
-        clone (): Range;
-    }
-
-}
diff --git a/moment-range/tsconfig.json b/moment-range/tsconfig.json
new file mode 100644
index 0000000000..176877211f
--- /dev/null
+++ b/moment-range/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "moment-range-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/moment-timezone/index.d.ts b/moment-timezone/index.d.ts
new file mode 100644
index 0000000000..298e828eef
--- /dev/null
+++ b/moment-timezone/index.d.ts
@@ -0,0 +1,70 @@
+// Type definitions for moment-timezone.js 0.2.5
+// Project: http://momentjs.com/timezone/
+// Definitions by: Michel Salib <https://github.com/michelsalib>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as moment from '../moment';
+
+export as namespace MomentTimezone;
+export = moment;
+
+declare namespace MomentTimezone {
+    interface MomentZone {
+        name: string;
+        abbrs: string[];
+        untils: number[];
+        offsets: number[];
+
+        abbr(timestamp: number): string;
+        offset(timestamp: number): number;
+        parse(timestamp: number): number
+    }
+
+    interface MomentTimezone {
+        (): moment.Moment;
+        (timezone: string): moment.Moment;
+        (date: number, timezone: string): moment.Moment;
+        (date: number[], timezone: string): moment.Moment;
+        (date: string, timezone: string): moment.Moment;
+        (date: string, format: moment.MomentFormatSpecification, timezone: string): moment.Moment;
+        (date: string, format: moment.MomentFormatSpecification, strict: boolean, timezone: string): moment.Moment;
+        (date: string, format: moment.MomentFormatSpecification, language: string, timezone: string): moment.Moment;
+        (date: string, format: moment.MomentFormatSpecification, language: string, strict: boolean, timezone: string): moment.Moment;
+        (date: Date, timezone: string): moment.Moment;
+        (date: moment.Moment, timezone: string): moment.Moment;
+        (date: Object, timezone: string): moment.Moment;
+
+        zone(timezone: string): MomentZone;
+
+        add(packedZoneString: string): void;
+        add(packedZoneString: string[]): void;
+
+        link(packedLinkString: string): void;
+        link(packedLinkString: string[]): void;
+
+        load(data: {
+            version: string;
+            links: string[];
+            zones: string[];
+        }): void;
+
+        names(): string[];
+        guess(): string;
+
+        setDefault(timezone: string): void;
+    }
+
+}
+
+declare module "../moment" {
+    interface Moment {
+        tz(): string;
+        tz(timezone: string): Moment;
+        zoneAbbr() :Moment;
+        zoneName() :Moment;
+    }
+
+    interface MomentStatic {
+        tz: MomentTimezone.MomentTimezone;
+    }
+}
diff --git a/moment-timezone/moment-timezone-tests.ts b/moment-timezone/moment-timezone-tests.ts
index 410c45fe2e..fa85c8010a 100644
--- a/moment-timezone/moment-timezone-tests.ts
+++ b/moment-timezone/moment-timezone-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="moment-timezone.d.ts" />
+
 
 import moment = require('moment-timezone');
 
diff --git a/moment-timezone/moment-timezone.d.ts b/moment-timezone/moment-timezone.d.ts
deleted file mode 100644
index c1d7e2d23f..0000000000
--- a/moment-timezone/moment-timezone.d.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-// Type definitions for moment-timezone.js 0.2.5
-// Project: http://momentjs.com/timezone/
-// Definitions by: Michel Salib <https://github.com/michelsalib>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../moment/moment.d.ts" />
-
-declare namespace moment {
-    interface Moment {
-        tz(): string;
-        tz(timezone: string): Moment;
-        zoneAbbr() :Moment;
-        zoneName() :Moment;
-    }
-
-    interface MomentStatic {
-        tz: MomentTimezone;
-    }
-}
-
-interface MomentZone {
-    name: string;
-    abbrs: string[];
-    untils: number[];
-    offsets: number[];
-
-    abbr(timestamp: number): string;
-    offset(timestamp: number): number;
-    parse(timestamp: number): number
-}
-
-interface MomentTimezone {
-    (): moment.Moment;
-    (timezone: string): moment.Moment;
-    (date: number, timezone: string): moment.Moment;
-    (date: number[], timezone: string): moment.Moment;
-    (date: string, timezone: string): moment.Moment;
-    (date: string, format: moment.MomentFormatSpecification, timezone: string): moment.Moment;
-    (date: string, format: moment.MomentFormatSpecification, strict: boolean, timezone: string): moment.Moment;
-    (date: string, format: moment.MomentFormatSpecification, language: string, timezone: string): moment.Moment;
-    (date: string, format: moment.MomentFormatSpecification, language: string, strict: boolean, timezone: string): moment.Moment;
-    (date: Date, timezone: string): moment.Moment;
-    (date: moment.Moment, timezone: string): moment.Moment;
-    (date: Object, timezone: string): moment.Moment;
-
-    zone(timezone: string): MomentZone;
-
-    add(packedZoneString: string): void;
-    add(packedZoneString: string[]): void;
-
-    link(packedLinkString: string): void;
-    link(packedLinkString: string[]): void;
-
-    load(data: {
-        version: string;
-        links: string[];
-        zones: string[];
-    }): void;
-
-    names(): string[];
-    guess(): string;
-
-    setDefault(timezone: string): void;
-}
-
-declare module 'moment-timezone' {
-    var _tmp: moment.MomentStatic;
-
-    export = _tmp;
-}
diff --git a/moment-timezone/tsconfig.json b/moment-timezone/tsconfig.json
new file mode 100644
index 0000000000..3d43b5468e
--- /dev/null
+++ b/moment-timezone/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "moment-timezone-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/moment/index.d.ts b/moment/index.d.ts
new file mode 100644
index 0000000000..8cffb15c4f
--- /dev/null
+++ b/moment/index.d.ts
@@ -0,0 +1,632 @@
+// Type definitions for Moment.js 2.11.1
+// Project: https://github.com/timrwood/moment
+// Definitions by: Michael Lakerveld <https://github.com/Lakerfield>, Aaron King <https://github.com/kingdango>, Hiroki Horiuchi <https://github.com/horiuchi>, Dick van den Brink <https://github.com/DickvdBrink>, Adi Dahiya <https://github.com/adidahiya>, Matt Brooks <https://github.com/EnableSoftware>, Gal Talmor <https://github.com/galtalmor>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace moment;
+
+declare var moment: moment.MomentStatic;
+export = moment;
+
+declare namespace moment {
+    export type MomentComparable = Moment | string | number | Date | number[];
+
+    export interface MomentDateObject {
+        years?: number;
+        /* One digit */
+        months?: number;
+        /* Day of the month */
+        date?: number;
+        hours?: number;
+        minutes?: number;
+        seconds?: number;
+        milliseconds?: number;
+    }
+
+    export interface MomentInput {
+        /** Year */
+        years?: number;
+        /** Year */
+        year?: number;
+        /** Year */
+        y?: number;
+
+        /** Month */
+        months?: number;
+        /** Month */
+        month?: number;
+        /** Month */
+        M?: number;
+
+        /** Week */
+        weeks?: number;
+        /** Week */
+        week?: number;
+        /** Week */
+        w?: number;
+
+        /** Day/Date */
+        days?: number;
+        /** Day/Date */
+        day?: number;
+        /** Day/Date */
+        date?: number;
+        /** Day/Date */
+        d?: number;
+
+        /** Hour */
+        hours?: number;
+        /** Hour */
+        hour?: number;
+        /** Hour */
+        h?: number;
+
+        /** Minute */
+        minutes?: number;
+        /** Minute */
+        minute?: number;
+        /** Minute */
+        m?: number;
+
+        /** Second */
+        seconds?: number;
+        /** Second */
+        second?: number;
+        /** Second */
+        s?: number;
+
+        /** Millisecond */
+        milliseconds?: number;
+        /** Millisecond */
+        millisecond?: number;
+        /** Millisecond */
+        ms?: number;
+    }
+
+    export interface Duration {
+        humanize(withSuffix?: boolean): string;
+
+        as(units: string): number;
+
+        milliseconds(): number;
+        asMilliseconds(): number;
+
+        seconds(): number;
+        asSeconds(): number;
+
+        minutes(): number;
+        asMinutes(): number;
+
+        hours(): number;
+        asHours(): number;
+
+        days(): number;
+        asDays(): number;
+
+        weeks(): number;
+        asWeeks(): number;
+
+        months(): number;
+        asMonths(): number;
+
+        years(): number;
+        asYears(): number;
+
+        add(n: number, p: string): Duration;
+        add(n: number): Duration;
+        add(d: Duration): Duration;
+
+        subtract(n: number, p: string): Duration;
+        subtract(n: number): Duration;
+        subtract(d: Duration): Duration;
+
+        toISOString(): string;
+        toJSON(): string;
+    }
+
+    export interface MomentLocale {
+        ordinal(n: number): string;
+    }
+
+    export interface MomentCreationData {
+        input?: string;
+        format?: string;
+        locale: MomentLocale;
+        isUTC: boolean;
+        strict?: boolean;
+    }
+
+    export interface Moment {
+        format(format?: string): string;
+
+        fromNow(withoutSuffix?: boolean): string;
+
+        startOf(unitOfTime: string): Moment;
+        endOf(unitOfTime: string): Moment;
+
+        /**
+         * Mutates the original moment by adding time. (deprecated in 2.8.0)
+         *
+         * @param unitOfTime the unit of time you want to add (eg "years" / "hours" etc)
+         * @param amount the amount you want to add
+         */
+        add(unitOfTime: string, amount: number): Moment;
+        /**
+         * Mutates the original moment by adding time.
+         *
+         * @param amount the amount you want to add
+         * @param unitOfTime the unit of time you want to add (eg "years" / "hours" etc)
+         */
+        add(amount: number|string, unitOfTime: string): Moment;
+        /**
+         * Mutates the original moment by adding time.
+         *
+         * @param objectLiteral a length of time or an object literal that describes multiple time units {days:7,months:1}
+         */
+        add(duration: Duration|MomentInput): Moment;
+
+        /**
+         * Mutates the original moment by subtracting time. (deprecated in 2.8.0)
+         *
+         * @param unitOfTime the unit of time you want to subtract (eg "years" / "hours" etc)
+         * @param amount the amount you want to subtract
+         */
+        subtract(unitOfTime: string, amount: number): Moment;
+        /**
+         * Mutates the original moment by subtracting time.
+         *
+         * @param unitOfTime the unit of time you want to subtract (eg "years" / "hours" etc)
+         * @param amount the amount you want to subtract
+         */
+        subtract(amount: number|string, unitOfTime: string): Moment;
+        /**
+         * Mutates the original moment by subtracting time.
+         *
+         * @param duration a length of time or an object literal that describes multiple time units {days:7,months:1}
+         */
+        subtract(duration: Duration|MomentInput): Moment;
+
+        calendar(start?: Moment, formats?: MomentCalendar): string;
+
+        clone(): Moment;
+
+        /**
+         * @return Unix timestamp, or milliseconds since the epoch.
+         */
+        valueOf(): number;
+
+        local(): Moment; // current date/time in local mode
+
+        utc(): Moment; // current date/time in UTC mode
+
+        isValid(): boolean;
+        invalidAt(): number;
+
+        year(y: number): Moment;
+        year(): number;
+        quarter(): number;
+        quarter(q: number): Moment;
+        month(M: number): Moment;
+        month(M: string): Moment;
+        month(): number;
+        day(d: number): Moment;
+        day(d: string): Moment;
+        day(): number;
+        date(d: number): Moment;
+        date(): number;
+        hour(h: number): Moment;
+        hour(): number;
+        hours(h: number): Moment;
+        hours(): number;
+        minute(m: number): Moment;
+        minute(): number;
+        minutes(m: number): Moment;
+        minutes(): number;
+        second(s: number): Moment;
+        second(): number;
+        seconds(s: number): Moment;
+        seconds(): number;
+        millisecond(ms: number): Moment;
+        millisecond(): number;
+        milliseconds(ms: number): Moment;
+        milliseconds(): number;
+        weekday(): number;
+        weekday(d: number): Moment;
+        isoWeekday(): number;
+        isoWeekday(d: number): Moment;
+        weekYear(): number;
+        weekYear(d: number): Moment;
+        isoWeekYear(): number;
+        isoWeekYear(d: number): Moment;
+        week(): number;
+        week(d: number): Moment;
+        weeks(): number;
+        weeks(d: number): Moment;
+        isoWeek(): number;
+        isoWeek(d: number): Moment;
+        isoWeeks(): number;
+        isoWeeks(d: number): Moment;
+        weeksInYear(): number;
+        isoWeeksInYear(): number;
+        dayOfYear(): number;
+        dayOfYear(d: number): Moment;
+
+        from(f: MomentComparable, suffix?: boolean): string;
+        to(f: MomentComparable, suffix?: boolean): string;
+        toNow(withoutPrefix?: boolean): string;
+
+        diff(b: MomentComparable, unitOfTime?: string, round?: boolean): number;
+
+        toArray(): number[];
+        toDate(): Date;
+        toISOString(): string;
+        toJSON(): string;
+        unix(): number;
+
+        isLeapYear(): boolean;
+        zone(): number;
+        zone(b?: number|string): Moment;
+        utcOffset(): number;
+        utcOffset(b: number|string): Moment;
+        daysInMonth(): number;
+        isDST(): boolean;
+
+        isBefore(b?: MomentComparable, granularity?: string): boolean;
+        isAfter(b?: MomentComparable, granularity?: string): boolean;
+        isSame(b: MomentComparable, granularity?: string): boolean;
+        isBetween(a: MomentComparable, b: MomentComparable, granularity?: string): boolean;
+
+        /**
+         * @since 2.10.7+
+         */
+        isSameOrBefore(b: MomentComparable, granularity?: string): boolean;
+        isSameOrAfter(b: MomentComparable, granularity?: string): boolean;
+
+        /**
+         * @deprecated since version 2.8.0
+         */
+        lang(languageOrReset: string|boolean): Moment;
+        lang(): MomentLanguage;
+
+        locale(languageOrReset: string|boolean): Moment;
+        locale(): string;
+
+        /**
+         * @since 2.12.0+
+         */
+        locales() : string[];
+        
+        localeData(languageOrReset: string|boolean): Moment;
+        localeData(): MomentLanguage;
+
+        /**
+         * @deprecated since version 2.7.0
+         */
+        max(date: Moment | string | number | Date | any[]): Moment;
+        max(date: string, format: string): Moment;
+
+        /**
+         * @deprecated since version 2.7.0
+         */
+        min(date: Moment | string | number | Date | any[]): Moment;
+        min(date: string, format: string): Moment;
+
+        get(unit: string): number;
+
+        set(unit: string, value: number): Moment;
+        set(objectLiteral: MomentInput): Moment;
+
+        /**
+         * This returns an object containing year, month, day-of-month, hour, minute, seconds, milliseconds.
+         * @since 2.10.5+
+         */
+        toObject(): MomentDateObject;
+
+        /**
+         * @since 2.10.7+
+         */
+        creationData(): MomentCreationData;
+    }
+
+    export type formatFunction = () => string;
+
+    export interface MomentCalendar {
+        lastDay?: string | formatFunction;
+        sameDay?: string | formatFunction;
+        nextDay?: string | formatFunction;
+        lastWeek?: string | formatFunction;
+        nextWeek?: string | formatFunction;
+        sameElse?: string | formatFunction;
+    }
+
+    export interface BaseMomentLanguage {
+        months?: any;
+        monthsShort?: any;
+        weekdays?: any;
+        weekdaysShort?: any;
+        weekdaysMin?: any;
+        relativeTime?: MomentRelativeTime;
+        meridiem?: (hour: number, minute: number, isLowercase: boolean) => string;
+        calendar?: MomentCalendar;
+        ordinal?: (num: number) => string;
+        week?: MomentLanguageWeek;
+    }
+
+    export interface MomentLanguage extends BaseMomentLanguage {
+        longDateFormat?: MomentLongDateFormat;
+    }
+
+    export interface MomentLanguageWeek {
+        dow?: number;
+        doy?: number;
+    }
+
+    export interface MomentLanguageData {
+        /**
+         * Get the full localized month name of a moment object
+         * @param  {Moment} aMoment a moment object
+         * @return {string}         full month name
+         */
+        months(aMoment: Moment): string;
+
+        /**
+         * Get the short localized month name of a moment object
+         * @param  {Moment} aMoment a moment object
+         * @return {string}         short month name
+         */
+        monthsShort(aMoment: Moment): string;
+
+        /**
+         * Parses a month name and returns the month id (0-11)
+         * @param  {string} longOrShortMonthString string of month to parse
+         * @return {number}                        month id (0 to 11) of input
+         */
+        monthsParse(longOrShortMonthString: string): number;
+
+        /**
+         * Gets the full weekday name of a moment object (eg. Monday)
+         * @param  {Moment} aMoment a moment object
+         * @return {string}         full weekday name
+         */
+        weekdays(aMoment: Moment): string;
+
+        /**
+         * Gets the short weekday name of a moment object (eg. Mon)
+         * @param  {Moment} aMoment a moment object
+         * @return {string}         short weekday name
+         */
+        weekdaysShort(aMoment: Moment): string;
+
+        /**
+         * Gets the min weekday name of a moment object (eg. Mo)
+         * @param  {Moment} aMoment a moment object
+         * @return {string}         min weekday name
+         */
+        weekdaysMin(aMoment: Moment): string;
+
+        /**
+         * Parses a weekday name and returns the weekday id (0-6)
+         * @param  {string} longOrShortMonthString string of weekday to parse
+         * @return {number}                        weekday id (0 to 6) of input
+         */
+        weekdaysParse(longOrShortMonthString: string): number;
+
+        /**
+         * Returns the full format of abbreviated date-time formats
+         * @param  {string} dateFormat date-time format such as LT, L, LL and so on
+         * @return {string}            full date format string
+         */
+        longDateFormat(dateFormat: string): string;
+
+        /**
+         * Returns whether a string represents PM
+         * @param  {string}  amPmString date string to check
+         * @return {boolean}            true if string represents PM
+         */
+        isPM(amPmString: string): boolean;
+
+        /**
+         * Returns am/pm string for particular time-of-day in upper/lower case
+         * @param  {number}  hour        hour
+         * @param  {number}  minute      minute
+         * @param  {boolean} isLowercase whether to return in lowercase
+         * @return {string}              'am' or 'pm'
+         */
+        meridiem(hour: number, minute: number, isLowercase: boolean): string;
+
+        /**
+         * Returns a format that would be used for calendar representation.
+         * @param  {string} key     one of 'sameDay', 'nextDay', 'lastDay', 'nextWeek', 'prevWeek', 'sameElse'
+         * @param  {Moment} aMoment a moment object
+         * @return {string}         date format string
+         */
+        calendar(key: string, aMoment: Moment): string;
+
+        /**
+         * Returns relative time string (eg. a year ago)
+         * @param  {number}  number        the relative number
+         * @param  {boolean} withoutSuffix whether to drop the suffix
+         * @param  {string}  key           one of 's', 'm', 'mm', 'h', 'hh', 'd', 'dd', 'M', 'MM', 'y', 'yy'. Single letter when number is 1.
+         * @param  {boolean} isFuture      whether this represents a future date
+         * @return {string}                humanized representation of relative time
+         */
+        relativeTime(number: number, withoutSuffix: boolean, key: string, isFuture: boolean): string;
+
+        /**
+         * Converts relative time string to past or future string depending on difference
+         * @param  {number} diff    positive or negative number
+         * @param  {string} relTime relative time string
+         * @return {string}         humanized representation of relative time
+         */
+        pastFuture(diff: number, relTime: string): string;
+
+        /**
+         * Convert number to ordinal string 1 -> 1st
+         * @param  {number} number the number
+         * @return {string}        ordinal string
+         */
+        ordinal(number: number): string;
+
+        /**
+         * Called before parsing every input string
+         */
+        preparse(str: string): string;
+
+        /**
+         * Called after formatting on every string
+         */
+        postformat(str: string): string;
+
+        /**
+         * Returns week-of-year of a moment object
+         * @param  {Moment} aMoment a moment object
+         * @return {number}         number of the week
+         */
+        week(aMoment: Moment): number;
+
+        /**
+         * Returns a translation of 'Invalid date'
+         * @return {string} translation of 'Invalid date'
+         */
+        invalidDate(): string;
+
+        /**
+         * Returns the first day of the week (0-6, Sunday to Saturday)
+         * @return {number} first day of the week
+         */
+        firstDayOfWeek(): number;
+
+        /**
+         * This and the first day of week are used to determine which is
+         * the first week of the year. dow == 1 and doy == 4 means week starts
+         * Monday and first week that has Thursday is the first week of the
+         * year (but doy is NOT simply Thursday).
+         * @return {number} number between 0-15
+         */
+        firstDayOfYear(): number;
+    }
+
+    export interface MomentLongDateFormat {
+        L: string;
+        LL: string;
+        LLL: string;
+        LLLL: string;
+        LT: string;
+        LTS: string;
+        l?: string;
+        ll?: string;
+        lll?: string;
+        llll?: string;
+        lt?: string;
+        lts?: string;
+    }
+
+    export interface MomentRelativeTime {
+        future: any;
+        past: any;
+        s: any;
+        m: any;
+        mm: any;
+        h: any;
+        hh: any;
+        d: any;
+        dd: any;
+        M: any;
+        MM: any;
+        y: any;
+        yy: any;
+    }
+
+    export interface MomentBuiltinFormat {
+        __momentBuiltinFormatBrand: any;
+    }
+
+    export type MomentFormatSpecification = string | MomentBuiltinFormat | (string | MomentBuiltinFormat)[];
+
+    export interface MomentStatic {
+        version: string;
+        fn: Moment;
+
+        (): Moment;
+        (date: number[]|number|Date|Moment|Object): Moment;
+        (date: string, format?: MomentFormatSpecification, strict?: boolean): Moment;
+        (date: string, format?: MomentFormatSpecification, language?: string, strict?: boolean): Moment;
+
+        utc(): Moment;
+        utc(date: number[]|number|Date|Moment|Object): Moment;
+        utc(date: string, format?: string, strict?: boolean): Moment;
+        utc(date: string, format?: string, language?: string, strict?: boolean): Moment;
+        utc(date: string, formats: string[], strict?: boolean): Moment;
+        utc(date: string, formats: string[], language?: string, strict?: boolean): Moment;
+
+        unix(timestamp: number): Moment;
+
+        invalid(parsingFlags?: Object): Moment;
+        isMoment(m?: any): boolean;
+        isDate(m: any): boolean;
+        isDuration(d?: any): boolean;
+
+        /**
+         * @deprecated since version 2.8.0
+         */
+        lang(language?: string, definition?: MomentLanguage): string;
+
+        locale(language?: string[]|string): string;
+        locale(language?: string, definition?: MomentLanguage): string;
+
+        localeData(language?: string): MomentLanguageData;
+
+        longDateFormat: any;
+        relativeTime: any;
+        meridiem: (hour: number, minute: number, isLowercase: boolean) => string;
+        calendar: any;
+        ordinal: (num: number) => string;
+
+        duration(milliseconds: Number): Duration;
+        duration(num: Number, unitOfTime: string): Duration;
+        duration(input: MomentInput): Duration;
+        duration(object: any): Duration;
+        duration(): Duration;
+
+        parseZone(date: string): Moment;
+
+        months(index: number): string;
+        months(format?: string): string[];
+        months(format: string, index: number): string;
+        monthsShort(index: number): string;
+        monthsShort(format?: string): string[];
+        monthsShort(format: string, index: number): string;
+
+        weekdays(index: number): string;
+        weekdays(format?: string): string[];
+        weekdays(format: string, index: number): string;
+        weekdaysShort(): string[];
+        weekdaysShort(index: number): string;
+        weekdaysShort(format: string): string[];
+        weekdaysShort(format: string, index: number): string;
+        weekdaysMin(index: number): string;
+        weekdaysMin(format?: string): string[];
+        weekdaysMin(format: string, index: number): string;
+
+        min(...moments: Moment[]): Moment;
+        min(moments: Moment[]): Moment;
+        max(...moments: Moment[]): Moment;
+        max(moments: Moment[]): Moment;
+
+        normalizeUnits(unit: string): string;
+        relativeTimeThreshold(threshold: string): number | boolean;
+        relativeTimeThreshold(threshold: string, limit: number): boolean;
+
+        /**
+         * @since 2.10.7+
+         */
+        now(): number;
+
+        /**
+         * Constant used to enable explicit ISO_8601 format parsing.
+         */
+        ISO_8601: MomentBuiltinFormat;
+
+        defaultFormat: string;
+    }
+}
diff --git a/moment/moment-external-tests.ts b/moment/moment-external-tests.ts
index c8108d1b99..e84d3dfe71 100644
--- a/moment/moment-external-tests.ts
+++ b/moment/moment-external-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="moment.d.ts" />
-
-import moment = require('moment');
+import moment = require('./');
 
 moment().add('hours', 1).fromNow();
 
diff --git a/moment/moment-node.d.ts b/moment/moment-node.d.ts
deleted file mode 100644
index 5199a64a27..0000000000
--- a/moment/moment-node.d.ts
+++ /dev/null
@@ -1,688 +0,0 @@
-// Type definitions for Moment.js 2.11.1
-// Project: https://github.com/timrwood/moment
-// Definitions by: Michael Lakerveld <https://github.com/Lakerfield>, Aaron King <https://github.com/kingdango>, Hiroki Horiuchi <https://github.com/horiuchi>, Dick van den Brink <https://github.com/DickvdBrink>, Adi Dahiya <https://github.com/adidahiya>, Matt Brooks <https://github.com/EnableSoftware>, Gal Talmor <https://github.com/galtalmor>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace moment {
-
-    type MomentComparable = Moment | string | number | Date | number[];
-
-    interface MomentDateObject {
-        years?: number;
-        /* One digit */
-        months?: number;
-        /* Day of the month */
-        date?: number;
-        hours?: number;
-        minutes?: number;
-        seconds?: number;
-        milliseconds?: number;
-    }
-
-    interface MomentInput {
-        /** Year */
-        years?: number;
-        /** Year */
-        year?: number;
-        /** Year */
-        y?: number;
-
-        /** Month */
-        months?: number;
-        /** Month */
-        month?: number;
-        /** Month */
-        M?: number;
-
-        /** Week */
-        weeks?: number;
-        /** Week */
-        week?: number;
-        /** Week */
-        w?: number;
-
-        /** Day/Date */
-        days?: number;
-        /** Day/Date */
-        day?: number;
-        /** Day/Date */
-        date?: number;
-        /** Day/Date */
-        d?: number;
-
-        /** Hour */
-        hours?: number;
-        /** Hour */
-        hour?: number;
-        /** Hour */
-        h?: number;
-
-        /** Minute */
-        minutes?: number;
-        /** Minute */
-        minute?: number;
-        /** Minute */
-        m?: number;
-
-        /** Second */
-        seconds?: number;
-        /** Second */
-        second?: number;
-        /** Second */
-        s?: number;
-
-        /** Millisecond */
-        milliseconds?: number;
-        /** Millisecond */
-        millisecond?: number;
-        /** Millisecond */
-        ms?: number;
-    }
-
-    interface Duration {
-        humanize(withSuffix?: boolean): string;
-
-        as(units: string): number;
-
-        milliseconds(): number;
-        asMilliseconds(): number;
-
-        seconds(): number;
-        asSeconds(): number;
-
-        minutes(): number;
-        asMinutes(): number;
-
-        hours(): number;
-        asHours(): number;
-
-        days(): number;
-        asDays(): number;
-
-        weeks(): number;
-        asWeeks(): number;
-
-        months(): number;
-        asMonths(): number;
-
-        years(): number;
-        asYears(): number;
-
-        add(n: number, p: string): Duration;
-        add(n: number): Duration;
-        add(d: Duration): Duration;
-
-        subtract(n: number, p: string): Duration;
-        subtract(n: number): Duration;
-        subtract(d: Duration): Duration;
-
-        toISOString(): string;
-        toJSON(): string;
-    }
-
-    interface MomentLocale {
-        ordinal(n: number): string;
-    }
-
-    interface MomentCreationData {
-        input?: string;
-        format?: string;
-        locale: MomentLocale;
-        isUTC: boolean;
-        strict?: boolean;
-    }
-
-    interface Moment {
-        format(format: string): string;
-        format(): string;
-
-        fromNow(withoutSuffix?: boolean): string;
-
-        startOf(unitOfTime: string): Moment;
-        endOf(unitOfTime: string): Moment;
-
-        /**
-         * Mutates the original moment by adding time. (deprecated in 2.8.0)
-         *
-         * @param unitOfTime the unit of time you want to add (eg "years" / "hours" etc)
-         * @param amount the amount you want to add
-         */
-        add(unitOfTime: string, amount: number): Moment;
-        /**
-         * Mutates the original moment by adding time.
-         *
-         * @param amount the amount you want to add
-         * @param unitOfTime the unit of time you want to add (eg "years" / "hours" etc)
-         */
-        add(amount: number, unitOfTime: string): Moment;
-        /**
-         * Mutates the original moment by adding time. Note that the order of arguments can be flipped.
-         *
-         * @param amount the amount you want to add
-         * @param unitOfTime the unit of time you want to add (eg "years" / "hours" etc)
-         */
-        add(amount: string, unitOfTime: string): Moment;
-        /**
-         * Mutates the original moment by adding time.
-         *
-         * @param objectLiteral an object literal that describes multiple time units {days:7,months:1}
-         */
-        add(objectLiteral: MomentInput): Moment;
-        /**
-         * Mutates the original moment by adding time.
-         *
-         * @param duration a length of time
-         */
-        add(duration: Duration): Moment;
-
-        /**
-         * Mutates the original moment by subtracting time. (deprecated in 2.8.0)
-         *
-         * @param unitOfTime the unit of time you want to subtract (eg "years" / "hours" etc)
-         * @param amount the amount you want to subtract
-         */
-        subtract(unitOfTime: string, amount: number): Moment;
-        /**
-         * Mutates the original moment by subtracting time.
-         *
-         * @param unitOfTime the unit of time you want to subtract (eg "years" / "hours" etc)
-         * @param amount the amount you want to subtract
-         */
-        subtract(amount: number, unitOfTime: string): Moment;
-        /**
-         * Mutates the original moment by subtracting time. Note that the order of arguments can be flipped.
-         *
-         * @param amount the amount you want to add
-         * @param unitOfTime the unit of time you want to subtract (eg "years" / "hours" etc)
-         */
-        subtract(amount: string, unitOfTime: string): Moment;
-        /**
-         * Mutates the original moment by subtracting time.
-         *
-         * @param objectLiteral an object literal that describes multiple time units {days:7,months:1}
-         */
-        subtract(objectLiteral: MomentInput): Moment;
-        /**
-         * Mutates the original moment by subtracting time.
-         *
-         * @param duration a length of time
-         */
-        subtract(duration: Duration): Moment;
-
-        calendar(): string;
-        calendar(start: Moment): string;
-        calendar(start: Moment, formats: MomentCalendar): string;
-
-        clone(): Moment;
-
-        /**
-         * @return Unix timestamp, or milliseconds since the epoch.
-         */
-        valueOf(): number;
-
-        local(): Moment; // current date/time in local mode
-
-        utc(): Moment; // current date/time in UTC mode
-
-        isValid(): boolean;
-        invalidAt(): number;
-
-        year(y: number): Moment;
-        year(): number;
-        quarter(): number;
-        quarter(q: number): Moment;
-        month(M: number): Moment;
-        month(M: string): Moment;
-        month(): number;
-        day(d: number): Moment;
-        day(d: string): Moment;
-        day(): number;
-        date(d: number): Moment;
-        date(): number;
-        hour(h: number): Moment;
-        hour(): number;
-        hours(h: number): Moment;
-        hours(): number;
-        minute(m: number): Moment;
-        minute(): number;
-        minutes(m: number): Moment;
-        minutes(): number;
-        second(s: number): Moment;
-        second(): number;
-        seconds(s: number): Moment;
-        seconds(): number;
-        millisecond(ms: number): Moment;
-        millisecond(): number;
-        milliseconds(ms: number): Moment;
-        milliseconds(): number;
-        weekday(): number;
-        weekday(d: number): Moment;
-        isoWeekday(): number;
-        isoWeekday(d: number): Moment;
-        weekYear(): number;
-        weekYear(d: number): Moment;
-        isoWeekYear(): number;
-        isoWeekYear(d: number): Moment;
-        week(): number;
-        week(d: number): Moment;
-        weeks(): number;
-        weeks(d: number): Moment;
-        isoWeek(): number;
-        isoWeek(d: number): Moment;
-        isoWeeks(): number;
-        isoWeeks(d: number): Moment;
-        weeksInYear(): number;
-        isoWeeksInYear(): number;
-        dayOfYear(): number;
-        dayOfYear(d: number): Moment;
-
-        from(f: MomentComparable, suffix?: boolean): string;
-        to(f: MomentComparable, suffix?: boolean): string;
-        toNow(withoutPrefix?: boolean): string;
-
-        diff(b: MomentComparable): number;
-        diff(b: MomentComparable, unitOfTime: string): number;
-        diff(b: MomentComparable, unitOfTime: string, round: boolean): number;
-
-        toArray(): number[];
-        toDate(): Date;
-        toISOString(): string;
-        toJSON(): string;
-        unix(): number;
-
-        isLeapYear(): boolean;
-        zone(): number;
-        zone(b: number): Moment;
-        zone(b: string): Moment;
-        utcOffset(): number;
-        utcOffset(b: number): Moment;
-        utcOffset(b: string): Moment;
-        daysInMonth(): number;
-        isDST(): boolean;
-
-        isBefore(): boolean;
-        isBefore(b: MomentComparable, granularity?: string): boolean;
-
-        isAfter(): boolean;
-        isAfter(b: MomentComparable, granularity?: string): boolean;
-
-        isSame(b: MomentComparable, granularity?: string): boolean;
-        isBetween(a: MomentComparable, b: MomentComparable, granularity?: string): boolean;
-
-        /**
-         * @since 2.10.7+
-         */
-        isSameOrBefore(b: MomentComparable, granularity?: string): boolean;
-        isSameOrAfter(b: MomentComparable, granularity?: string): boolean;
-
-        /**
-         * @deprecated since version 2.8.0
-         */
-        lang(language: string): Moment;
-        lang(reset: boolean): Moment;
-        lang(): MomentLanguage;
-
-        locale(language: string): Moment;
-        locale(reset: boolean): Moment;
-        locale(): string;
-
-        /**
-         * @since 2.12.0+
-         */
-        locales() : string[];
-        localeData(language: string): Moment;
-        localeData(reset: boolean): Moment;
-        localeData(): MomentLanguage;
-
-        /**
-         * @deprecated since version 2.7.0
-         */
-        max(date: Moment | string | number | Date | any[]): Moment;
-        max(date: string, format: string): Moment;
-
-        /**
-         * @deprecated since version 2.7.0
-         */
-        min(date: Moment | string | number | Date | any[]): Moment;
-        min(date: string, format: string): Moment;
-
-        get(unit: string): number;
-        set(unit: string, value: number): Moment;
-        set(objectLiteral: MomentInput): Moment;
-
-        /**
-         * This returns an object containing year, month, day-of-month, hour, minute, seconds, milliseconds.
-         * @since 2.10.5+
-         */
-        toObject(): MomentDateObject;
-
-        /**
-         * @since 2.10.7+
-         */
-        creationData(): MomentCreationData;
-    }
-
-    type formatFunction = () => string;
-
-    interface MomentCalendar {
-        lastDay?: string | formatFunction;
-        sameDay?: string | formatFunction;
-        nextDay?: string | formatFunction;
-        lastWeek?: string | formatFunction;
-        nextWeek?: string | formatFunction;
-        sameElse?: string | formatFunction;
-    }
-
-    interface BaseMomentLanguage {
-        months?: any;
-        monthsShort?: any;
-        weekdays?: any;
-        weekdaysShort?: any;
-        weekdaysMin?: any;
-        relativeTime?: MomentRelativeTime;
-        meridiem?: (hour: number, minute: number, isLowercase: boolean) => string;
-        calendar?: MomentCalendar;
-        ordinal?: (num: number) => string;
-        week?: MomentLanguageWeek;
-    }
-
-    interface MomentLanguage extends BaseMomentLanguage {
-        longDateFormat?: MomentLongDateFormat;
-    }
-
-    interface MomentLanguageWeek {
-        dow?: number;
-        doy?: number;
-    }
-
-    interface MomentLanguageData {
-        /**
-         * Get the full localized month name of a moment object
-         * @param  {Moment} aMoment a moment object
-         * @return {string}         full month name
-         */
-        months(aMoment: Moment): string;
-
-        /**
-         * Get the short localized month name of a moment object
-         * @param  {Moment} aMoment a moment object
-         * @return {string}         short month name
-         */
-        monthsShort(aMoment: Moment): string;
-
-        /**
-         * Parses a month name and returns the month id (0-11)
-         * @param  {string} longOrShortMonthString string of month to parse
-         * @return {number}                        month id (0 to 11) of input
-         */
-        monthsParse(longOrShortMonthString: string): number;
-
-        /**
-         * Gets the full weekday name of a moment object (eg. Monday)
-         * @param  {Moment} aMoment a moment object
-         * @return {string}         full weekday name
-         */
-        weekdays(aMoment: Moment): string;
-
-        /**
-         * Gets the short weekday name of a moment object (eg. Mon)
-         * @param  {Moment} aMoment a moment object
-         * @return {string}         short weekday name
-         */
-        weekdaysShort(aMoment: Moment): string;
-
-        /**
-         * Gets the min weekday name of a moment object (eg. Mo)
-         * @param  {Moment} aMoment a moment object
-         * @return {string}         min weekday name
-         */
-        weekdaysMin(aMoment: Moment): string;
-
-        /**
-         * Parses a weekday name and returns the weekday id (0-6)
-         * @param  {string} longOrShortMonthString string of weekday to parse
-         * @return {number}                        weekday id (0 to 6) of input
-         */
-        weekdaysParse(longOrShortMonthString: string): number;
-
-        /**
-         * Returns the full format of abbreviated date-time formats
-         * @param  {string} dateFormat date-time format such as LT, L, LL and so on
-         * @return {string}            full date format string
-         */
-        longDateFormat(dateFormat: string): string;
-
-        /**
-         * Returns whether a string represents PM
-         * @param  {string}  amPmString date string to check
-         * @return {boolean}            true if string represents PM
-         */
-        isPM(amPmString: string): boolean;
-
-        /**
-         * Returns am/pm string for particular time-of-day in upper/lower case
-         * @param  {number}  hour        hour
-         * @param  {number}  minute      minute
-         * @param  {boolean} isLowercase whether to return in lowercase
-         * @return {string}              'am' or 'pm'
-         */
-        meridiem(hour: number, minute: number, isLowercase: boolean): string;
-
-        /**
-         * Returns a format that would be used for calendar representation.
-         * @param  {string} key     one of 'sameDay', 'nextDay', 'lastDay', 'nextWeek', 'prevWeek', 'sameElse'
-         * @param  {Moment} aMoment a moment object
-         * @return {string}         date format string
-         */
-        calendar(key: string, aMoment: Moment): string;
-
-        /**
-         * Returns relative time string (eg. a year ago)
-         * @param  {number}  number        the relative number
-         * @param  {boolean} withoutSuffix whether to drop the suffix
-         * @param  {string}  key           one of 's', 'm', 'mm', 'h', 'hh', 'd', 'dd', 'M', 'MM', 'y', 'yy'. Single letter when number is 1.
-         * @param  {boolean} isFuture      whether this represents a future date
-         * @return {string}                humanized representation of relative time
-         */
-        relativeTime(number: number, withoutSuffix: boolean, key: string, isFuture: boolean): string;
-
-        /**
-         * Converts relative time string to past or future string depending on difference
-         * @param  {number} diff    positive or negative number
-         * @param  {string} relTime relative time string
-         * @return {string}         humanized representation of relative time
-         */
-        pastFuture(diff: number, relTime: string): string;
-
-        /**
-         * Convert number to ordinal string 1 -> 1st
-         * @param  {number} number the number
-         * @return {string}        ordinal string
-         */
-        ordinal(number: number): string;
-
-        /**
-         * Called before parsing every input string
-         */
-        preparse(str: string): string;
-
-        /**
-         * Called after formatting on every string
-         */
-        postformat(str: string): string;
-
-        /**
-         * Returns week-of-year of a moment object
-         * @param  {Moment} aMoment a moment object
-         * @return {number}         number of the week
-         */
-        week(aMoment: Moment): number;
-
-        /**
-         * Returns a translation of 'Invalid date'
-         * @return {string} translation of 'Invalid date'
-         */
-        invalidDate(): string;
-
-        /**
-         * Returns the first day of the week (0-6, Sunday to Saturday)
-         * @return {number} first day of the week
-         */
-        firstDayOfWeek(): number;
-
-        /**
-         * This and the first day of week are used to determine which is
-         * the first week of the year. dow == 1 and doy == 4 means week starts
-         * Monday and first week that has Thursday is the first week of the
-         * year (but doy is NOT simply Thursday).
-         * @return {number} number between 0-15
-         */
-        firstDayOfYear(): number;
-    }
-
-    interface MomentLongDateFormat {
-        L: string;
-        LL: string;
-        LLL: string;
-        LLLL: string;
-        LT: string;
-        LTS: string;
-        l?: string;
-        ll?: string;
-        lll?: string;
-        llll?: string;
-        lt?: string;
-        lts?: string;
-    }
-
-    interface MomentRelativeTime {
-        future: any;
-        past: any;
-        s: any;
-        m: any;
-        mm: any;
-        h: any;
-        hh: any;
-        d: any;
-        dd: any;
-        M: any;
-        MM: any;
-        y: any;
-        yy: any;
-    }
-
-    interface MomentBuiltinFormat {
-        __momentBuiltinFormatBrand: any;
-    }
-
-    type MomentFormatSpecification = string | MomentBuiltinFormat | (string | MomentBuiltinFormat)[];
-
-    interface MomentStatic {
-        version: string;
-        fn: Moment;
-
-        (): Moment;
-        (date: number): Moment;
-        (date: number[]): Moment;
-        (date: string, format?: MomentFormatSpecification, strict?: boolean): Moment;
-        (date: string, format?: MomentFormatSpecification, language?: string, strict?: boolean): Moment;
-        (date: Date): Moment;
-        (date: Moment): Moment;
-        (date: Object): Moment;
-
-        utc(): Moment;
-        utc(date: number): Moment;
-        utc(date: number[]): Moment;
-        utc(date: string, format?: string, strict?: boolean): Moment;
-        utc(date: string, format?: string, language?: string, strict?: boolean): Moment;
-        utc(date: string, formats: string[], strict?: boolean): Moment;
-        utc(date: string, formats: string[], language?: string, strict?: boolean): Moment;
-        utc(date: Date): Moment;
-        utc(date: Moment): Moment;
-        utc(date: Object): Moment;
-
-        unix(timestamp: number): Moment;
-
-        invalid(parsingFlags?: Object): Moment;
-        isMoment(): boolean;
-        isMoment(m: any): boolean;
-        isDate(m: any): boolean;
-        isDuration(): boolean;
-        isDuration(d: any): boolean;
-
-        /**
-         * @deprecated since version 2.8.0
-         */
-        lang(language?: string): string;
-        lang(language?: string, definition?: MomentLanguage): string;
-
-        locale(language?: string): string;
-        locale(language?: string[]): string;
-        locale(language?: string, definition?: MomentLanguage): string;
-
-        localeData(language?: string): MomentLanguageData;
-
-        longDateFormat: any;
-        relativeTime: any;
-        meridiem: (hour: number, minute: number, isLowercase: boolean) => string;
-        calendar: any;
-        ordinal: (num: number) => string;
-
-        duration(milliseconds: Number): Duration;
-        duration(num: Number, unitOfTime: string): Duration;
-        duration(input: MomentInput): Duration;
-        duration(object: any): Duration;
-        duration(): Duration;
-
-        parseZone(date: string): Moment;
-
-        months(): string[];
-        months(index: number): string;
-        months(format: string): string[];
-        months(format: string, index: number): string;
-        monthsShort(): string[];
-        monthsShort(index: number): string;
-        monthsShort(format: string): string[];
-        monthsShort(format: string, index: number): string;
-
-        weekdays(): string[];
-        weekdays(index: number): string;
-        weekdays(format: string): string[];
-        weekdays(format: string, index: number): string;
-        weekdaysShort(): string[];
-        weekdaysShort(index: number): string;
-        weekdaysShort(format: string): string[];
-        weekdaysShort(format: string, index: number): string;
-        weekdaysMin(): string[];
-        weekdaysMin(index: number): string;
-        weekdaysMin(format: string): string[];
-        weekdaysMin(format: string, index: number): string;
-
-        min(...moments: Moment[]): Moment;
-        min(moments: Moment[]): Moment;
-        max(...moments: Moment[]): Moment;
-        max(moments: Moment[]): Moment;
-
-        normalizeUnits(unit: string): string;
-        relativeTimeThreshold(threshold: string): number | boolean;
-        relativeTimeThreshold(threshold: string, limit: number): boolean;
-
-        /**
-         * @since 2.10.7+
-         */
-        now(): number;
-
-        /**
-         * Constant used to enable explicit ISO_8601 format parsing.
-         */
-        ISO_8601: MomentBuiltinFormat;
-
-        defaultFormat: string;
-    }
-
-}
-
-declare module 'moment' {
-    var moment: moment.MomentStatic;
-    export = moment;
-}
diff --git a/moment/moment-tests.ts b/moment/moment-tests.ts
index 2ac484ca25..3761e1e805 100644
--- a/moment/moment-tests.ts
+++ b/moment/moment-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="moment.d.ts" />
+import * as moment from './';
 
 moment().add('hours', 1).fromNow();
 
@@ -475,5 +475,3 @@ moment.locale('en', {
 });
 
 console.log(moment.version);
-
-moment.defaultFormat = 'YYYY-MM-DD HH:mm';
diff --git a/moment/moment.d.ts b/moment/moment.d.ts
deleted file mode 100644
index 8642fef4e8..0000000000
--- a/moment/moment.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Type definitions for Moment.js 2.8.0
-// Project: https://github.com/timrwood/moment
-// Definitions by: Michael Lakerveld <https://github.com/Lakerfield>, Aaron King <https://github.com/kingdango>, Hiroki Horiuchi <https://github.com/horiuchi>, Dick van den Brink <https://github.com/DickvdBrink>, Adi Dahiya <https://github.com/adidahiya>, Matt Brooks <https://github.com/EnableSoftware>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="moment-node.d.ts" />
-
-declare var moment: moment.MomentStatic;
diff --git a/moment/tsconfig.json b/moment/tsconfig.json
new file mode 100644
index 0000000000..7e3a357456
--- /dev/null
+++ b/moment/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "moment-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mongodb/index.d.ts b/mongodb/index.d.ts
new file mode 100644
index 0000000000..9ef49467df
--- /dev/null
+++ b/mongodb/index.d.ts
@@ -0,0 +1,1344 @@
+// Type definitions for MongoDB v2.1
+// Project: https://github.com/mongodb/node-mongodb-native/tree/2.1
+// Definitions by: Federico Caselli <https://github.com/CaselIT>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/
+
+/// <reference types="node" />
+
+import {EventEmitter} from 'events';
+
+// Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/MongoClient.html
+export class MongoClient {
+    constructor();
+
+    static connect(uri: string, callback: MongoCallback<Db>): void;
+    static connect(uri: string, options?: MongoClientOptions): Promise<Db>;
+    static connect(uri: string, options: MongoClientOptions, callback: MongoCallback<Db>): void;
+
+    connect(uri: string, callback: MongoCallback<Db>): void;
+    connect(uri: string, options?: MongoClientOptions): Promise<Db>;
+    connect(uri: string, options: MongoClientOptions, callback: MongoCallback<Db>): void;
+}
+
+export interface MongoCallback<T> {
+    (error: MongoError, result: T): void;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.1/api/MongoError.html
+export class MongoError extends Error {
+    constructor(message: string);
+    static create(options: Object): MongoError;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/MongoClient.html#.connect
+export interface MongoClientOptions {
+    uri_decode_auth?: boolean;
+    db?: DbCreateOptions;
+    server?: ServerOptions;
+    replSet?: ReplSetOptions;
+    mongos?: MongosOptions;
+    promiseLibrary?: Object;
+}
+
+// See : http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html
+export interface DbCreateOptions {
+    authSource?: string;
+    //  the write concern for the operation where < 1 is no acknowlegement of write and w >= 1, w = ‘majority’ or tag acknowledges the write.
+    w?: number | string;
+    // set the timeout for waiting for write concern to finish (combines with w option).
+    wtimeout?: number;
+    j?: boolean;
+    // use c++ bson parser. default:false.
+    native_parser?: boolean;
+    // force server to create _id fields instead of client. default:false.
+    forceServerObjectId?: boolean;
+    serializeFunctions?: boolean;
+    ignoreUndefined?: boolean;
+    // peform operations using raw bson buffers. default:false.
+    raw?: boolean;
+    // when deserializing a Long will fit it into a Number if it’s smaller than 53 bits. default:true.
+    promoteLongs?: boolean;
+    bufferMaxEntries?: number;
+    // the prefered read preference. use 'ReadPreference' class.
+    readPreference?: ReadPreference | string;
+    // custom primary key factory to generate _id values (see Custom primary keys).
+    pkFactory?: Object;
+    promiseLibrary?: Object;
+    readConcern?: { level?: Object };
+}
+
+// See http://mongodb.github.io/node-mongodb-native/2.1/api/ReadPreference.html
+export class ReadPreference {
+    constructor(mode: string, tags: Object);
+    mode: string;
+    tags: any;
+    static PRIMARY: string;
+    static PRIMARY_PREFERRED: string;
+    static SECONDARY: string;
+    static SECONDARY_PREFERRED: string;
+    static NEAREST: string;
+    isValid(mode: string): boolean;
+    static isValid(mode: string): boolean;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Server.html
+export interface SocketOptions {
+    // Reconnect on error. default:false
+    autoReconnect?: boolean;
+    // TCP Socket NoDelay option. default:true
+    noDelay?: boolean;
+    // TCP KeepAlive on the socket with a X ms delay before start. default:0
+    keepAlive?: number;
+    // TCP Connection timeout setting. default 0
+    connectTimeoutMS?: number;
+    // TCP Socket timeout setting. default 0
+    socketTimeoutMS?: number;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Server.html
+export interface ServerOptions {
+    // - specify the number of connections in the pool default:5
+    poolSize?: number;
+    ssl?: boolean;
+    sslValidate?: Object;
+    checkServerIdentity?: boolean | Function;
+    sslCA?: Array<Buffer | string>;
+    sslCert?: Buffer | string;
+    sslKey?: Buffer | string;
+    sslPass?: Buffer | string;
+    socketOptions?: SocketOptions;
+    reconnectTries?: number;
+    reconnectInterval?: number;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/ReplSet.html
+export interface ReplSetOptions {
+    ha?: boolean;
+    haInterval?: number;
+    replicaSet?: string;
+    secondaryAcceptableLatencyMS?: number;
+    connectWithNoPrimary?: boolean;
+    // - specify the number of connections in the pool default:5
+    poolSize?: number;
+    ssl?: boolean;
+    sslValidate?: Object;
+    checkServerIdentity?: boolean | Function;
+    sslCA?: Array<Buffer | string>;
+    sslCert?: Buffer | string;
+    sslKey?: Buffer | string;
+    sslPass?: Buffer | string;
+    socketOptions?: SocketOptions;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Mongos.html
+export interface MongosOptions {
+    ha?: boolean;
+    haInterval?: number;
+    // - specify the number of connections in the pool default:5
+    poolSize?: number;
+    ssl?: boolean;
+    sslValidate?: Object;
+    checkServerIdentity?: boolean | Function;
+    sslCA?: Array<Buffer | string>;
+    sslCert?: Buffer | string;
+    sslKey?: Buffer | string;
+    sslPass?: Buffer | string;
+    socketOptions?: SocketOptions;
+}
+
+// Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html
+export class Db extends EventEmitter {
+    constructor(databaseName: string, serverConfig: Server | ReplSet | Mongos, options?: DbCreateOptions);
+
+    serverConfig: Server | ReplSet | Mongos;
+    bufferMaxEntries: number;
+    databaseName: string;
+    options: any;
+    native_parser: boolean;
+    slaveOk: boolean;
+    writeConcern: any;
+
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#addUser
+    addUser(username: string, password: string, callback: MongoCallback<any>): void;
+    addUser(username: string, password: string, options?: DbAddUserOptions): Promise<any>;
+    addUser(username: string, password: string, options: DbAddUserOptions, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#admin
+    admin(): Admin;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#authenticate
+    authenticate(userName: string, password: string, callback: MongoCallback<any>): void;
+    authenticate(userName: string, password: string, options?: { authMechanism: string }): Promise<any>;
+    authenticate(userName: string, password: string, options: { authMechanism: string }, callback: MongoCallback<any>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#close
+    close(callback: MongoCallback<void>): void;
+    close(forceClose?: boolean): Promise<void>;
+    close(forceClose: boolean, callback: MongoCallback<void>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#collection
+    collection(name: string): Collection;
+    collection(name: string, callback: MongoCallback<Collection>): Collection;
+    collection(name: string, options: DbCollectionOptions, callback: MongoCallback<Collection>): Collection;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#collections
+    collections(): Promise<Collection[]>;
+    collections(callback: MongoCallback<Collection[]>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#command
+    command(command: Object, callback: MongoCallback<any>): void;
+    command(command: Object, options?: { readPreference: ReadPreference | string }): Promise<any>;
+    command(command: Object, options: { readPreference: ReadPreference | string }, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#createCollection
+    createCollection(name: string, callback: MongoCallback<Collection>): void;
+    createCollection(name: string, options?: CollectionCreateOptions): Promise<Collection>;
+    createCollection(name: string, options: CollectionCreateOptions, callback: MongoCallback<Collection>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#createIndex
+    createIndex(name: string, fieldOrSpec: string | Object, callback: MongoCallback<any>): void;
+    createIndex(name: string, fieldOrSpec: string | Object, options?: IndexOptions): Promise<any>;
+    createIndex(name: string, fieldOrSpec: string | Object, options: IndexOptions, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#db
+    db(dbName: string): Db;
+    db(dbName: string, options: { noListener?: boolean, returnNonCachedInstance?: boolean }): Db;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#dropCollection
+    dropCollection(name: string): Promise<boolean>;
+    dropCollection(name: string, callback: MongoCallback<boolean>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#dropDatabase
+    dropDatabase(): Promise<any>;
+    dropDatabase(callback: MongoCallback<any>): void;
+
+    //deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#ensureIndex
+    // ensureIndex(collectionName: any, fieldOrSpec: any, options: IndexOptions, callback: Function): void;
+    //deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#eval
+    // eval(code: any, parameters: any[], options?: any, callback?: MongoCallback<any>): void;
+
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#executeDbAdminCommand
+    executeDbAdminCommand(command: Object, callback: MongoCallback<any>): void;
+    executeDbAdminCommand(command: Object, options?: { readPreference?: ReadPreference | string, maxTimeMS?: number }): Promise<any>;
+    executeDbAdminCommand(command: Object, options: { readPreference?: ReadPreference | string, maxTimeMS?: number }, callback: MongoCallback<any>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#indexInformation
+    indexInformation(name: string, callback: MongoCallback<any>): void;
+    indexInformation(name: string, options?: { full?: boolean, readPreference?: ReadPreference | string }): Promise<any>;
+    indexInformation(name: string, options: { full?: boolean, readPreference?: ReadPreference | string }, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#listCollections
+    listCollections(filter: { name?: string }, options?: { batchSize?: number, readPreference?: ReadPreference | string }): CommandCursor;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#logout
+    logout(callback: MongoCallback<any>): void;
+    logout(options?: { dbName?: string }): Promise<any>;
+    logout(options: { dbName?: string }, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#open
+    open(): Promise<Db>;
+    open(callback: MongoCallback<Db>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#removeUser
+    removeUser(username: string, callback: MongoCallback<any>): void;
+    removeUser(username: string, options?: { w?: number | string, wtimeout?: number, j?: boolean }): Promise<any>;
+    removeUser(username: string, options: { w?: number | string, wtimeout?: number, j?: boolean }, callback: MongoCallback<any>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#renameCollection
+    renameCollection(fromCollection: string, toCollection: string, callback: MongoCallback<Collection>): void;
+    renameCollection(fromCollection: string, toCollection: string, options?: { dropTarget?: boolean }): Promise<Collection>;
+    renameCollection(fromCollection: string, toCollection: string, options: { dropTarget?: boolean }, callback: MongoCallback<Collection>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#stats
+    stats(callback: MongoCallback<any>): void;
+    stats(options?: { scale?: number }): Promise<any>;
+    stats(options: { scale?: number }, callback: MongoCallback<any>): void;
+}
+
+
+
+// Deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/Server.html
+export class Server extends EventEmitter {
+    constructor(host: string, port: number, options?: ServerOptions);
+
+    connections(): Array<any>;
+}
+
+// Deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/ReplSet.html
+export class ReplSet extends EventEmitter {
+    constructor(servers: Array<Server>, options?: ReplSetOptions);
+
+    connections(): Array<any>;
+}
+
+// Deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/ReplSet.html
+export class Mongos extends EventEmitter {
+    constructor(servers: Array<Server>, options?: MongosOptions);
+
+    connections(): Array<any>;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#addUser
+export interface DbAddUserOptions {
+    w?: string | number;
+    wtimeout?: number;
+    j?: boolean;
+    customData?: Object;
+    roles?: Object[];
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#createCollection
+export interface CollectionCreateOptions {
+    w?: number | string;
+    wtimeout?: number;
+    j?: boolean;
+    raw?: boolean;
+    pkFactory?: Object;
+    readPreference?: ReadPreference | string;
+    serializeFunctions?: boolean;
+    strict?: boolean;
+    capped?: boolean;
+    size?: number;
+    max?: number;
+    autoIndexId?: boolean;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#collection
+export interface DbCollectionOptions {
+    w?: number | string;
+    wtimeout?: number;
+    j?: boolean;
+    raw?: boolean;
+    pkFactory?: Object;
+    readPreference?: ReadPreference | string;
+    serializeFunctions?: boolean;
+    strict?: boolean;
+    readConcern?: { level: Object };
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#createIndex
+export interface IndexOptions {
+    // The write concern.
+    w?: number | string;
+    // The write concern timeout.
+    wtimeout?: number;
+    // Specify a journal write concern.
+    j?: boolean;
+    // Creates an unique index.
+    unique?: boolean;
+    // Creates a sparse index.
+    sparse?: boolean;
+    // Creates the index in the background, yielding whenever possible.
+    background?: boolean;
+    // A unique index cannot be created on a key that has pre-existing duplicate values.
+    // If you would like to create the index anyway, keeping the first document the database indexes and
+    // deleting all subsequent documents that have duplicate value
+    dropDups?: boolean;
+    // For geo spatial indexes set the lower bound for the co-ordinates.
+    min?: number;
+    // For geo spatial indexes set the high bound for the co-ordinates.
+    max?: number;
+    // Specify the format version of the indexes.
+    v?: number;
+    // Allows you to expire data on indexes applied to a data (MongoDB 2.2 or higher)
+    expireAfterSeconds?: number;
+    // Override the auto generated index name (useful if the resulting name is larger than 128 bytes)
+    name?: string;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html
+export interface Admin {
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#addUser
+    addUser(username: string, password: string, callback: MongoCallback<any>): void;
+    addUser(username: string, password: string, options?: AddUserOptions): Promise<any>;
+    addUser(username: string, password: string, options: AddUserOptions, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#authenticate
+    authenticate(username: string, callback: MongoCallback<any>): void;
+    authenticate(username: string, password?: string): Promise<any>;
+    authenticate(username: string, password: string, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#buildInfo
+    buildInfo(): Promise<any>;
+    buildInfo(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#command
+    command(command: Object, callback: MongoCallback<any>): void;
+    command(command: Object, options?: { readPreference?: ReadPreference | string, maxTimeMS?: number }): Promise<any>;
+    command(command: Object, options: { readPreference?: ReadPreference | string, maxTimeMS?: number }, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#listDatabases
+    listDatabases(): Promise<any>;
+    listDatabases(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#logout
+    logout(): Promise<any>;
+    logout(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#ping
+    ping(): Promise<any>;
+    ping(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#profilingInfo
+    profilingInfo(): Promise<any>;
+    profilingInfo(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#profilingLevel
+    profilingLevel(): Promise<any>;
+    profilingLevel(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#removeUser
+    removeUser(username: string, callback: MongoCallback<any>): void;
+    removeUser(username: string, options?: FSyncOptions): Promise<any>;
+    removeUser(username: string, options: FSyncOptions, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#replSetGetStatus
+    replSetGetStatus(): Promise<any>;
+    replSetGetStatus(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#serverInfo
+    serverInfo(): Promise<any>;
+    serverInfo(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#serverStatus
+    serverStatus(): Promise<any>;
+    serverStatus(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#setProfilingLevel
+    setProfilingLevel(level: string): Promise<any>;
+    setProfilingLevel(level: string, callback: MongoCallback<any>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#validateCollection
+    validateCollection(collectionNme: string, callback: MongoCallback<any>): void;
+    validateCollection(collectionNme: string, options?: Object): Promise<any>;
+    validateCollection(collectionNme: string, options: Object, callback: MongoCallback<any>): void;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#addUser
+export interface AddUserOptions {
+    w?: number | string;
+    wtimeout?: number;
+    j?: boolean;
+    fsync: boolean;
+    customData?: Object;
+    roles?: Object[]
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#removeUser
+export interface FSyncOptions {
+    w?: number | string;
+    wtimeout?: number;
+    j?: boolean;
+    fsync?: boolean
+}
+
+// Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/ObjectID.html
+export class ObjectID {
+    constructor(s?: string | number);
+
+    generationTime: number;
+
+    // Creates an ObjectID from a hex string representation of an ObjectID.
+    // hexString – create a ObjectID from a passed in 24 byte hexstring.
+    static createFromHexString(hexString: string): ObjectID;
+    // Creates an ObjectID from a second based number, with the rest of the ObjectID zeroed out. Used for comparisons or sorting the ObjectID.
+    // time – an integer number representing a number of seconds.
+    static createFromTime(time: number): ObjectID;
+    // Checks if a value is a valid bson ObjectId
+    // id - Value to be checked
+    static isValid(id: string | number): boolean;
+    //Compares the equality of this ObjectID with otherID.
+    equals(otherID: ObjectID): boolean;
+    // Generate a 12 byte id string used in ObjectID's
+    // time - optional parameter allowing to pass in a second based timestamp
+    generate(time?: number): string;
+    // Returns the generation date (accurate up to the second) that this ID was generated.
+    getTimestamp(): Date;
+    // Returns the ObjectID id as a 24 byte hex string representation
+    toHexString(): string;
+}
+
+// Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/Binary.html
+export class Binary {
+    constructor(buffer: Buffer, subType?: number);
+
+    static SUBTYPE_BYTE_ARRAY: number;
+    static SUBTYPE_DEFAULT: number;
+    static SUBTYPE_FUNCTION: number;
+    static SUBTYPE_MD5: number;
+    static SUBTYPE_USER_DEFINED: number;
+    static SUBTYPE_UUID: number;
+    static SUBTYPE_UUID_OLD: number;
+
+    // The length of the binary.
+    length(): number;
+    // Updates this binary with byte_value
+    put(byte_value: number | string): void;
+    // Reads length bytes starting at position.
+    read(position: number, length: number): Buffer;
+    // Returns the value of this binary as a string.
+    value(): string;
+    // Writes a buffer or string to the binary
+    write(buffer: Buffer | string, offset: number): void;
+}
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Double.html
+export class Double {
+    constructor(value: number);
+
+    valueOf(): number;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Long.html
+export class Long {
+    constructor(low: number, high: number);
+
+    static MAX_VALUE: Long;
+    static MIN_VALUE: Long;
+    static NEG_ONE: Long;
+    static ONE: Long;
+    static ZERO: Long;
+
+    static fromBits(lowBits: number, highBits: number): Long;
+    static fromInt(value: number): Long;
+    static fromNumber(value: number): Long;
+    static fromString(str: string, radix?: number): Long;
+
+    add(other: Long): Long;
+    and(other: Long): Long;
+    compare(other: Long): number;
+    div(other: Long): Long;
+    equals(other: Long): boolean;
+    getHighBits(): number;
+    getLowBits(): number;
+    getLowBitsUnsigned(): number;
+    getNumBitsAbs(): number;
+    greaterThan(other: Long): number;
+    greaterThanOrEqual(other: Long): number;
+    isNegative(): boolean;
+    isOdd(): boolean;
+    isZero(): boolean;
+    lessThan(other: Long): boolean;
+    lessThanOrEqual(other: Long): boolean;
+    modulo(other: Long): Long;
+    multiply(other: Long): Long;
+    negate(): Long;
+    not(): Long;
+    notEquals(other: Long): boolean;
+    or(other: Long): Long;
+    shiftLeft(other: number): Long;
+    shiftRight(other: number): Long;
+    shiftRightUnsigned(other: number): Long;
+    subtract(other: Long): Long;
+    toInt(): number;
+    toJSON(): string;
+    toNumber(): number;
+    toString(radix?: number): string;
+    xor(other: Long): Long;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/MaxKey.html
+export class MaxKey { }
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/MinKey.html
+export class MinKey { }
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Timestamp.html
+export class Timestamp {
+    constructor(low: number, high: number);
+
+    static MAX_VALUE: Timestamp;
+    static MIN_VALUE: Timestamp;
+    static NEG_ONE: Timestamp;
+    static ONE: Timestamp;
+    static ZERO: Timestamp;
+
+    static fromBits(lowBits: number, highBits: number): Timestamp;
+    static fromInt(value: number): Timestamp;
+    static fromNumber(value: number): Timestamp;
+    static fromString(str: string, radix?: number): Timestamp;
+
+    add(other: Timestamp): Timestamp;
+    and(other: Timestamp): Timestamp;
+    compare(other: Timestamp): number;
+    div(other: Timestamp): Timestamp;
+    equals(other: Timestamp): boolean;
+    getHighBits(): number;
+    getLowBits(): number;
+    getLowBitsUnsigned(): number;
+    getNumBitsAbs(): number;
+    greaterThan(other: Timestamp): number;
+    greaterThanOrEqual(other: Timestamp): number;
+    isNegative(): boolean;
+    isOdd(): boolean;
+    isZero(): boolean;
+    lessThan(other: Timestamp): boolean;
+    lessThanOrEqual(other: Timestamp): boolean;
+    modulo(other: Timestamp): Timestamp;
+    multiply(other: Timestamp): Timestamp;
+    negate(): Timestamp;
+    not(): Timestamp;
+    notEquals(other: Timestamp): boolean;
+    or(other: Timestamp): Timestamp;
+    shiftLeft(other: number): Timestamp;
+    shiftRight(other: number): Timestamp;
+    shiftRightUnsigned(other: number): Timestamp;
+    subtract(other: Timestamp): Timestamp;
+    toInt(): number;
+    toJSON(): string;
+    toNumber(): number;
+    toString(radix?: number): string;
+    xor(other: Timestamp): Timestamp;
+}
+
+// Documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html
+export interface Collection {
+    // Get the collection name.
+    collectionName: string;
+    // Get the full collection namespace.
+    namespace: string;
+    // The current write concern values.
+    writeConcern: any;
+    // The current read concern values.
+    readConcern: any;
+    // Get current index hint for collection.
+    hint: any;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#aggregate
+    aggregate(pipeline: Object[], callback: MongoCallback<any>): AggregationCursor;
+    aggregate(pipeline: Object[], options?: CollectionAggregationOptions, callback?: MongoCallback<any>): AggregationCursor;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#bulkWrite
+    bulkWrite(operations: Object[], callback: MongoCallback<BulkWriteOpResultObject>): void;
+    bulkWrite(operations: Object[], options?: CollectionBluckWriteOptions): Promise<BulkWriteOpResultObject>;
+    bulkWrite(operations: Object[], options: CollectionBluckWriteOptions, callback: MongoCallback<BulkWriteOpResultObject>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#count
+    count(query: Object, callback: MongoCallback<number>): void;
+    count(query: Object, options?: MongoCountPreferences): Promise<number>;
+    count(query: Object, options: MongoCountPreferences, callback: MongoCallback<number>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#createIndex
+    createIndex(fieldOrSpec: string | any, callback: MongoCallback<string>): void;
+    createIndex(fieldOrSpec: string | any, options?: IndexOptions): Promise<string>;
+    createIndex(fieldOrSpec: string | any, options: IndexOptions, callback: MongoCallback<string>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#createIndexes and http://docs.mongodb.org/manual/reference/command/createIndexes/
+    createIndexes(indexSpecs: Object[]): Promise<any>;
+    createIndexes(indexSpecs: Object[], callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#deleteMany
+    deleteMany(filter: Object, callback: MongoCallback<DeleteWriteOpResultObject>): void;
+    deleteMany(filter: Object, options?: CollectionOptions): Promise<DeleteWriteOpResultObject>;
+    deleteMany(filter: Object, options: CollectionOptions, callback: MongoCallback<DeleteWriteOpResultObject>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#deleteOne
+    deleteOne(filter: Object, callback: MongoCallback<DeleteWriteOpResultObject>): void;
+    deleteOne(filter: Object, options?: { w?: number | string, wtimmeout?: number, j?: boolean, bypassDocumentValidation?: boolean }): Promise<DeleteWriteOpResultObject>;
+    deleteOne(filter: Object, options: { w?: number | string, wtimmeout?: number, j?: boolean, bypassDocumentValidation?: boolean }, callback: MongoCallback<DeleteWriteOpResultObject>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#distinct
+    distinct(key: string, query: Object, callback: MongoCallback<any>): void;
+    distinct(key: string, query: Object, options?: { readPreference?: ReadPreference | string }): Promise<any>;
+    distinct(key: string, query: Object, options: { readPreference?: ReadPreference | string }, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#drop
+    drop(): Promise<any>;
+    drop(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#dropIndex
+    dropIndex(indexName: string, callback: MongoCallback<any>): void;
+    dropIndex(indexName: string, options?: CollectionOptions): Promise<any>;
+    dropIndex(indexName: string, options: CollectionOptions, callback: MongoCallback<any>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#dropIndexes
+    dropIndexes(): Promise<any>;
+    dropIndexes(callback?: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#find
+    find(query?: Object): Cursor;
+    /** @deprecated */
+    find(query: Object, fields?: Object, skip?: number, limit?: number, timeout?: number): Cursor;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOne
+    /** @deprecated use find().limit(1).next(function(err, doc){}) */
+    findOne(filter: Object, callback: MongoCallback<any>): void;
+    /** @deprecated use find().limit(1).next(function(err, doc){}) */
+    findOne(filter: Object, options?: FindOneOptions): Promise<any>;
+    /** @deprecated use find().limit(1).next(function(err, doc){}) */
+    findOne(filter: Object, options: FindOneOptions, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOneAndDelete
+    findOneAndDelete(filter: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject>): void;
+    findOneAndDelete(filter: Object, options?: { projection?: Object, sort?: Object, maxTimeMS?: number }): Promise<FindAndModifyWriteOpResultObject>;
+    findOneAndDelete(filter: Object, options: { projection?: Object, sort?: Object, maxTimeMS?: number }, callback: MongoCallback<FindAndModifyWriteOpResultObject>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOneAndReplace
+    findOneAndReplace(filter: Object, replacement: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject>): void;
+    findOneAndReplace(filter: Object, replacement: Object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject>;
+    findOneAndReplace(filter: Object, replacement: Object, options: FindOneAndReplaceOption, callback: MongoCallback<FindAndModifyWriteOpResultObject>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOneAndUpdate
+    findOneAndUpdate(filter: Object, update: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject>): void;
+    findOneAndUpdate(filter: Object, update: Object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject>;
+    findOneAndUpdate(filter: Object, update: Object, options: FindOneAndReplaceOption, callback: MongoCallback<FindAndModifyWriteOpResultObject>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#geoHaystackSearch
+    geoHaystackSearch(x: number, y: number, callback: MongoCallback<any>): void;
+    geoHaystackSearch(x: number, y: number, options?: GeoHaystackSearchOptions): Promise<any>;
+    geoHaystackSearch(x: number, y: number, options: GeoHaystackSearchOptions, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#geoNear
+    geoNear(x: number, y: number, callback: MongoCallback<any>): void;
+    geoNear(x: number, y: number, options?: GeoNearOptions): Promise<any>;
+    geoNear(x: number, y: number, options: GeoNearOptions, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#group
+    group(keys: Object | Array<any> | Function | Code, condition: Object, initial: Object, reduce: Function | Code, finalize: Function | Code, command: boolean, callback: MongoCallback<any>): void;
+    group(keys: Object | Array<any> | Function | Code, condition: Object, initial: Object, reduce: Function | Code, finalize: Function | Code, command: boolean, options?: { readPreference?: ReadPreference | string }): Promise<any>;
+    group(keys: Object | Array<any> | Function | Code, condition: Object, initial: Object, reduce: Function | Code, finalize: Function | Code, command: boolean, options: { readPreference?: ReadPreference | string }, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#indexes
+    indexes(): Promise<any>;
+    indexes(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#indexExists
+    indexExists(indexes: string | string[]): Promise<boolean>;
+    indexExists(indexes: string | string[], callback: MongoCallback<boolean>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#indexInformation
+    indexInformation(callback: MongoCallback<any>): void;
+    indexInformation(options?: { full: boolean }): Promise<any>;
+    indexInformation(options: { full: boolean }, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#initializeOrderedBulkOp
+    initializeOrderedBulkOp(options?: CollectionOptions): OrderedBulkOperation;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#initializeUnorderedBulkOp
+    initializeUnorderedBulkOp(options?: CollectionOptions): UnorderedBulkOperation;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#insertOne
+    /** @deprecated Use insertOne, insertMany or bulkWrite */
+    insert(docs: Object, callback: MongoCallback<InsertOneWriteOpResult>): void;
+    /** @deprecated Use insertOne, insertMany or bulkWrite */
+    insert(docs: Object, options?: CollectionInsertOneOptions): Promise<InsertOneWriteOpResult>;
+    /** @deprecated Use insertOne, insertMany or bulkWrite */
+    insert(docs: Object, options: CollectionInsertOneOptions, callback: MongoCallback<InsertOneWriteOpResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#insertMany
+    insertMany(docs: Object[], callback: MongoCallback<InsertWriteOpResult>): void;
+    insertMany(docs: Object[], options?: CollectionInsertManyOptions): Promise<InsertWriteOpResult>;
+    insertMany(docs: Object[], options: CollectionInsertManyOptions, callback: MongoCallback<InsertWriteOpResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#insertOne
+    insertOne(docs: Object, callback: MongoCallback<InsertOneWriteOpResult>): void;
+    insertOne(docs: Object, options?: CollectionInsertOneOptions): Promise<InsertOneWriteOpResult>;
+    insertOne(docs: Object, options: CollectionInsertOneOptions, callback: MongoCallback<InsertOneWriteOpResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#isCapped
+    isCapped(): Promise<any>;
+    isCapped(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#listIndexes
+    listIndexes(options?: { batchSize?: number, readPreference?: ReadPreference | string }): CommandCursor;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#mapReduce
+    mapReduce(map: Function | string, reduce: Function | string, callback: MongoCallback<any>): void;
+    mapReduce(map: Function | string, reduce: Function | string, options?: MapReduceOptions): Promise<any>;
+    mapReduce(map: Function | string, reduce: Function | string, options: MapReduceOptions, callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#options
+    options(): Promise<any>;
+    options(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#parallelCollectionScan
+    parallelCollectionScan(callback: MongoCallback<Cursor[]>): void;
+    parallelCollectionScan(options?: ParallelCollectionScanOptions): Promise<Cursor[]>;
+    parallelCollectionScan(options: ParallelCollectionScanOptions, callback: MongoCallback<Cursor[]>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#reIndex
+    reIndex(): Promise<any>;
+    reIndex(callback: MongoCallback<any>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#rename
+    rename(newName: string, callback: MongoCallback<Collection>): void;
+    rename(newName: string, options?: { dropTarget?: boolean }): Promise<Collection>;
+    rename(newName: string, options: { dropTarget?: boolean }, callback: MongoCallback<Collection>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#replaceOne
+    replaceOne(filter: Object, doc: Object, callback: MongoCallback<UpdateWriteOpResult>): void;
+    replaceOne(filter: Object, doc: Object, options?: ReplaceOneOptions): Promise<UpdateWriteOpResult>;
+    replaceOne(filter: Object, doc: Object, options: ReplaceOneOptions, callback: MongoCallback<UpdateWriteOpResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#save
+    /** @deprecated Use insertOne, insertMany, updateOne or updateMany */
+    save(doc: Object, callback: MongoCallback<WriteOpResult>): void;
+    save(doc: Object, options?: CollectionOptions): Promise<WriteOpResult>;
+    save(doc: Object, options: CollectionOptions, callback: MongoCallback<WriteOpResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#stats
+    stats(callback: MongoCallback<CollStats>): void;
+    stats(options?: { scale: number }): Promise<CollStats>;
+    stats(options: { scale: number }, callback: MongoCallback<CollStats>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#update
+    /** @deprecated use updateOne, updateMany or bulkWrite */
+    update(filter: Object, update: Object, callback: MongoCallback<WriteOpResult>): void;
+    /** @deprecated use updateOne, updateMany or bulkWrite */
+    update(filter: Object, update: Object, options?: ReplaceOneOptions & { multi?: boolean }): Promise<WriteOpResult>;
+    /** @deprecated use updateOne, updateMany or bulkWrite */
+    update(filter: Object, update: Object, options: ReplaceOneOptions & { multi?: boolean }, callback: MongoCallback<WriteOpResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#updateMany
+    updateMany(filter: Object, update: Object, callback: MongoCallback<UpdateWriteOpResult>): void;
+    updateMany(filter: Object, update: Object, options?: { upsert?: boolean; w?: any; wtimeout?: number; j?: boolean; }): Promise<UpdateWriteOpResult>;
+    updateMany(filter: Object, update: Object, options: { upsert?: boolean; w?: any; wtimeout?: number; j?: boolean; }, callback: MongoCallback<UpdateWriteOpResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#updateOne
+    updateOne(filter: Object, update: Object, callback: MongoCallback<UpdateWriteOpResult>): void;
+    updateOne(filter: Object, update: Object, options?: ReplaceOneOptions): Promise<UpdateWriteOpResult>;
+    updateOne(filter: Object, update: Object, options: ReplaceOneOptions, callback: MongoCallback<UpdateWriteOpResult>): void;
+}
+
+// Documentation: http://docs.mongodb.org/manual/reference/command/collStats/
+//TODO complete this
+export interface CollStats {
+    // Namespace.
+    ns: string;
+    // Number of documents.
+    count: number;
+    // Collection size in bytes.
+    size: number;
+    // Average object size in bytes.
+    avgObjSize: number;
+    // (Pre)allocated space for the collection in bytes.
+    storageSize: number;
+    // Number of extents (contiguously allocated chunks of datafile space).
+    numExtents: number;
+    // Number of indexes.
+    nindexes: number;
+    // Size of the most recently created extent in bytes.
+    lastExtentSize: number;
+    // Padding can speed up updates if documents grow.
+    paddingFactor: number;
+    userFlags: number;
+    // Total index size in bytes.
+    totalIndexSize: number;
+    // Size of specific indexes in bytes.
+    indexSizes: {
+        _id_: number;
+        username: number;
+    };
+    capped: boolean;
+    maxSize: boolean;
+    wiredTiger: any;
+    indexDetails: any;
+    ok: number;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#aggregate
+export interface CollectionAggregationOptions {
+    readPreference?: ReadPreference | string;
+    // Return the query as cursor, on 2.6 > it returns as a real cursor
+    // on pre 2.6 it returns as an emulated cursor.
+    cursor?: { batchSize: number };
+    // Explain returns the aggregation execution plan (requires mongodb 2.6 >).
+    explain?: boolean;
+    // lets the server know if it can use disk to store
+    // temporary results for the aggregation (requires mongodb 2.6 >).
+    allowDiskUse?: boolean;
+    // specifies a cumulative time limit in milliseconds for processing operations
+    // on the cursor. MongoDB interrupts the operation at the earliest following interrupt point.
+    maxTimeMS?: boolean;
+    // Allow driver to bypass schema validation in MongoDB 3.2 or higher.
+    bypassDocumentValidation?: boolean;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#insertMany
+export interface CollectionInsertManyOptions {
+    // The write concern.
+    w?: number | string;
+    // The write concern timeout.
+    wtimeout?: number;
+    // Specify a journal write concern.
+    j?: boolean;
+    // Serialize functions on any object.
+    serializeFunctions?: boolean;
+    //Force server to assign _id values instead of driver.
+    forceServerObjectId?: boolean;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#bulkWrite
+export interface CollectionBluckWriteOptions {
+    // The write concern.
+    w?: number | string;
+    // The write concern timeout.
+    wtimeout?: number;
+    // Specify a journal write concern.
+    j?: boolean;
+    // Serialize functions on any object.
+    serializeFunctions?: boolean;
+    // Execute write operation in ordered or unordered fashion.
+    ordered?: boolean;
+    // Allow driver to bypass schema validation in MongoDB 3.2 or higher.
+    bypassDocumentValidation?: boolean;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~BulkWriteOpResult
+export interface BulkWriteOpResultObject {
+    insertedCount?: number;
+    matchedCount?: number;
+    modifiedCount?: number;
+    deletedCount?: number;
+    upsertedCount?: number;
+    insertedIds?: any;
+    upsertedIds?: any;
+    result?: any;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#count
+export interface MongoCountPreferences {
+    // The limit of documents to count.
+    limit?: number;
+    // The number of documents to skip for the count.
+    skip?: boolean;
+    // An index name hint for the query.
+    hint?: string;
+    // The preferred read preference
+    readPreference?: ReadPreference | string;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~deleteWriteOpResult
+export interface DeleteWriteOpResultObject {
+    //The raw result returned from MongoDB, field will vary depending on server version.
+    result: {
+        //Is 1 if the command executed correctly.
+        ok?: number;
+        //The total count of documents deleted.
+        n?: number;
+    }
+    //The connection object used for the operation.
+    connection?: any;
+    //The number of documents deleted.
+    deletedCount?: number;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~findAndModifyWriteOpResult
+export interface FindAndModifyWriteOpResultObject {
+    //Document returned from findAndModify command.
+    value?: any;
+    //The raw lastErrorObject returned from the command.
+    lastErrorObject?: any;
+    //Is 1 if the command executed correctly.
+    ok?: number;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOneAndReplace
+export interface FindOneAndReplaceOption {
+    projection?: Object;
+    sort?: Object;
+    maxTimeMS?: number;
+    upsert?: boolean;
+    returnOriginal?: boolean;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#geoHaystackSearch
+export interface GeoHaystackSearchOptions {
+    readPreference?: ReadPreference | string;
+    maxDistance?: number;
+    search?: Object;
+    limit?: number;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#geoNear
+export interface GeoNearOptions {
+    readPreference?: ReadPreference | string;
+    num?: number;
+    minDistance?: number;
+    maxDistance?: number;
+    distanceMultiplier?: number;
+    query?: Object;
+    spherical?: boolean;
+    uniqueDocs?: boolean;
+    includeLocs?: boolean;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Code.html
+export class Code {
+    constructor(code: string | Function, scope?: Object)
+    code: string | Function;
+    scope: any;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#deleteMany
+export interface CollectionOptions {
+    //The write concern.
+    w?: number | string;
+    //The write concern timeout.
+    wtimeout?: number;
+    //Specify a journal write concern.
+    j?: boolean;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/OrderedBulkOperation.html
+export interface OrderedBulkOperation {
+    length: number;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/OrderedBulkOperation.html#execute
+    execute(callback: MongoCallback<BulkWriteResult>): void;
+    execute(options?: FSyncOptions): Promise<BulkWriteResult>;
+    execute(options: FSyncOptions, callback: MongoCallback<BulkWriteResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/OrderedBulkOperation.html#find
+    find(selector: Object): FindOperatorsOrdered;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/OrderedBulkOperation.html#insert
+    insert(doc: Object): OrderedBulkOperation;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/BulkWriteResult.html
+export interface BulkWriteResult {
+    ok: number;
+    nInserted: number;
+    nUpdated: number;
+    nUpserted: number;
+    nModified: number;
+    nRemoved: number;
+
+    getInsertedIds(): Array<Object>;
+    getLastOp(): Object;
+    getRawResponse(): Object;
+    getUpsertedIdAt(index: number): Object;
+    getUpsertedIds(): Array<Object>;
+    getWriteConcernError(): WriteConcernError;
+    getWriteErrorAt(index: number): WriteError;
+    getWriteErrorCount(): number;
+    getWriteErrors(): Array<Object>;
+    hasWriteErrors(): boolean;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/WriteError.html
+export interface WriteError {
+    //Write concern error code.
+    code: number;
+    //Write concern error original bulk operation index.
+    index: number;
+    //Write concern error message.
+    errmsg: string;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/WriteConcernError.html
+export interface WriteConcernError {
+    //Write concern error code.
+    code: number;
+    //Write concern error message.
+    errmsg: string;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/FindOperatorsOrdered.html
+export interface FindOperatorsOrdered {
+    delete(): OrderedBulkOperation;
+    deleteOne(): OrderedBulkOperation;
+    replaceOne(doc: Object): OrderedBulkOperation;
+    update(doc: Object): OrderedBulkOperation;
+    updateOne(doc: Object): OrderedBulkOperation;
+    upsert(): FindOperatorsOrdered;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/UnorderedBulkOperation.html
+export interface UnorderedBulkOperation {
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/UnorderedBulkOperation.html#execute
+    execute(callback: MongoCallback<BulkWriteResult>): void;
+    execute(options?: FSyncOptions): Promise<BulkWriteResult>;
+    execute(options: FSyncOptions, callback: MongoCallback<BulkWriteResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/UnorderedBulkOperation.html#find
+    find(selector: Object): FindOperatorsUnordered;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/UnorderedBulkOperation.html#insert
+    insert(doc: Object): UnorderedBulkOperation;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/FindOperatorsUnordered.html
+export interface FindOperatorsUnordered {
+    length: number;
+    remove(): UnorderedBulkOperation;
+    removeOne(): UnorderedBulkOperation;
+    replaceOne(doc: Object): UnorderedBulkOperation;
+    update(doc: Object): UnorderedBulkOperation;
+    updateOne(doc: Object): UnorderedBulkOperation;
+    upsert(): FindOperatorsUnordered;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOne
+export interface FindOneOptions {
+    limit?: number,
+    sort?: Array<any> | Object,
+    fields?: Object,
+    skip?: number,
+    hint?: Object,
+    explain?: boolean,
+    snapshot?: boolean,
+    timeout?: boolean,
+    tailable?: boolean,
+    batchSize?: number,
+    returnKey?: boolean,
+    maxScan?: number,
+    min?: number,
+    max?: number,
+    showDiskLoc?: boolean,
+    comment?: string,
+    raw?: boolean,
+    readPreference?: ReadPreference | string,
+    partial?: boolean,
+    maxTimeMs?: number
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~insertWriteOpResult
+export interface InsertWriteOpResult {
+    insertedCount: number;
+    ops: Array<any>;
+    insertedIds: Array<ObjectID>;
+    connection: any;
+    result: { ok: number, n: number }
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#insertOne
+export interface CollectionInsertOneOptions {
+    // The write concern.
+    w?: number | string;
+    // The write concern timeout.
+    wtimeout?: number;
+    // Specify a journal write concern.
+    j?: boolean;
+    // Serialize functions on any object.
+    serializeFunctions?: boolean;
+    //Force server to assign _id values instead of driver.
+    forceServerObjectId?: boolean;
+    //Allow driver to bypass schema validation in MongoDB 3.2 or higher.
+    bypassDocumentValidation?: boolean
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~insertOneWriteOpResult
+export interface InsertOneWriteOpResult {
+    insertedCount: number;
+    ops: Array<any>;
+    insertedId: ObjectID;
+    connection: any;
+    result: { ok: number, n: number }
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#parallelCollectionScan
+export interface ParallelCollectionScanOptions {
+    readPreference?: ReadPreference | string;
+    batchSize?: number;
+    numCursors?: number;
+    raw?: boolean;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#replaceOne
+export interface ReplaceOneOptions {
+    upsert?: boolean;
+    w?: number | string;
+    wtimeout?: number;
+    j?: boolean;
+    bypassDocumentValidation?: boolean;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~updateWriteOpResult
+export interface UpdateWriteOpResult {
+    result: { ok: number, n: number, nModified: number };
+    connection: any;
+    matchedCount: number;
+    modifiedCount: number;
+    upsertedCount: number;
+    upsertedId: { _id: ObjectID };
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#mapReduce
+export interface MapReduceOptions {
+    readPreference?: ReadPreference | string;
+    out?: Object;
+    query?: Object;
+    sort?: Object;
+    limit?: number;
+    keeptemp?: boolean;
+    finalize?: Function | string;
+    scope?: Object;
+    jsMode?: boolean;
+    verbose?: boolean;
+    bypassDocumentValidation?: boolean
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~WriteOpResult
+export interface WriteOpResult {
+    ops: Array<any>;
+    connection: any;
+    result: any;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/external-Readable.html
+export interface Readable {
+    pause(): void;
+    pipe(destination: Writable, options?: Object): void;
+    read(size: number): string | Buffer | void;
+    resume(): void;
+    setEncoding(encoding: string): void;
+    unpipe(destination?: Writable): void;
+    unshift(stream: Buffer | string): void;
+    wrap(stream: Stream): void;
+}
+
+export interface Writable { }
+export interface Stream { }
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#~resultCallback
+export type CursorResult = any | void | boolean;
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html
+export interface Cursor extends Readable, NodeJS.EventEmitter {
+
+    sortValue: string;
+    timeout: boolean;
+    readPreference: ReadPreference;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html
+    addCursorFlag(flag: string, value: boolean): Cursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#addQueryModifier
+    addQueryModifier(name: string, value: boolean): Cursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#batchSize
+    batchSize(value: number): Cursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#clone
+    clone(): Cursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#close
+    close(): Promise<CursorResult>;
+    close(callback: MongoCallback<CursorResult>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#comment
+    comment(value: string): Cursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#count
+    count(applySkipLimit: boolean, callback: MongoCallback<number>): void;
+    count(applySkipLimit: boolean, options?: CursorCommentOptions): Promise<number>;
+    count(applySkipLimit: boolean, options: CursorCommentOptions, callback: MongoCallback<number>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#explain
+    explain(): Promise<CursorResult>;
+    explain(callback: MongoCallback<CursorResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#filter
+    filter(filter: Object): Cursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#forEach
+    forEach(iterator: IteratorCallback, callback: EndCallback): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#hasNext
+    hasNext(): Promise<boolean>;
+    hasNext(callback: MongoCallback<boolean>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#hint
+    hint(hint: Object): Cursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#isClosed
+    isClosed(): boolean;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#limit
+    limit(value: number): Cursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#map
+    map(transform: Function): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#max
+    max(max: number): Cursor;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#maxAwaitTimeMS
+    maxAwaitTimeMS(value: number): Cursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#maxScan
+    maxScan(maxScan: Object): Cursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#maxTimeMS
+    maxTimeMS(value: number): Cursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#min
+    min(min: number): Cursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#next
+    next(): Promise<CursorResult>;
+    next(callback: MongoCallback<CursorResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#pause
+    pause(): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#pipe
+    pipe(destination: Writable, options?: Object): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#project
+    project(value: Object): Cursor;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#read
+    read(size: number): string | Buffer | void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#resume
+    resume(): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#next
+    returnKey(returnKey: Object): Cursor;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#rewind
+    rewind(): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#setCursorOption
+    setCursorOption(field: string, value: Object): Cursor;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#setEncoding
+    setEncoding(encoding: string): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#setReadPreference
+    setReadPreference(readPreference: string | ReadPreference): Cursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#showRecordId
+    showRecordId(showRecordId: Object): Cursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#skip
+    skip(value: number): Cursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#snapshot
+    snapshot(snapshot: Object): Cursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#sort
+    sort(keyOrList: string | Object[] | Object | Object, direction?: number): Cursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#stream
+    stream(options?: { transform?: Function }): Cursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#toArray
+    toArray(): Promise<any[]>;
+    toArray(callback: MongoCallback<any[]>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#unpipe
+    unpipe(destination?: Writable): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#unshift
+    unshift(stream: Buffer | string): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#wrap
+    wrap(stream: Stream): void;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#count
+export interface CursorCommentOptions {
+    skip?: number;
+    limit?: number;
+    maxTimeMS?: number;
+    hint?: string;
+    readPreference?: ReadPreference | string;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#~iteratorCallback
+export interface IteratorCallback {
+    (doc: any): void;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#~endCallback
+export interface EndCallback {
+    (error: MongoError): void;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#~resultCallback
+export type AggregationCursorResult = any | void;
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html
+export interface AggregationCursor extends Readable, NodeJS.EventEmitter {
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#batchSize
+    batchSize(value: number): AggregationCursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#clone
+    clone(): AggregationCursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#close
+    close(): Promise<AggregationCursorResult>;
+    close(callback: MongoCallback<AggregationCursorResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#each
+    each(callback: MongoCallback<AggregationCursorResult>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#explain
+    explain(): Promise<AggregationCursorResult>;
+    explain(callback: MongoCallback<AggregationCursorResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#geoNear
+    geoNear(document: Object): AggregationCursor;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#group
+    group(document: Object): AggregationCursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#isClosed
+    isClosed(): boolean;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#limit
+    limit(value: number): AggregationCursor;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#match
+    match(document: Object): AggregationCursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#maxTimeMS
+    maxTimeMS(value: number): AggregationCursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#next
+    next(): Promise<AggregationCursorResult>;
+    next(callback: MongoCallback<AggregationCursorResult>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#out
+    out(destination: string): AggregationCursor;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#pause
+    pause(): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#pipe
+    pipe(destination: Writable, options?: Object): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#project
+    project(document: Object): AggregationCursor;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#read
+    read(size: number): string | Buffer | void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#redact
+    redact(document: Object): AggregationCursor;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#resume
+    resume(): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#rewind
+    rewind(): AggregationCursor;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#setEncoding
+    setEncoding(encoding: string): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#skip
+    skip(value: number): AggregationCursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#sort
+    sort(document: Object): AggregationCursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#toArray
+    toArray(): Promise<any[]>;
+    toArray(callback: MongoCallback<any[]>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#unpipe
+    unpipe(destination?: Writable): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#unshift
+    unshift(stream: Buffer | string): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#unwind
+    unwind(field: string): AggregationCursor;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#wrap
+    wrap(stream: Stream): void;
+}
+
+//http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html
+export interface CommandCursor extends Readable, NodeJS.EventEmitter {
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#batchSize
+    batchSize(value: number): CommandCursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#clone
+    clone(): CommandCursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#close
+    close(): Promise<AggregationCursorResult>;
+    close(callback: MongoCallback<AggregationCursorResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#each
+    each(callback: MongoCallback<AggregationCursorResult>): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#isClosed
+    isClosed(): boolean;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#maxTimeMS
+    maxTimeMS(value: number): CommandCursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#next
+    next(): Promise<AggregationCursorResult>;
+    next(callback: MongoCallback<AggregationCursorResult>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#pause
+    pause(): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#pipe
+    pipe(destination: Writable, options?: Object): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#read
+    read(size: number): string | Buffer | void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#resume
+    resume(): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#rewind
+    rewind(): CommandCursor;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#setEncoding
+    setEncoding(encoding: string): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#setReadPreference
+    setReadPreference(readPreference: string | ReadPreference): CommandCursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#toArray
+    toArray(): Promise<any[]>;
+    toArray(callback: MongoCallback<any[]>): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#unpipe
+    unpipe(destination?: Writable): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#unshift
+    unshift(stream: Buffer | string): void;
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#wrap
+    wrap(stream: Stream): void;
+}
diff --git a/mongodb/mongodb-1.4.9-tests.ts b/mongodb/mongodb-1.4.9-tests.ts
index 3f3efbb554..28cb21b48e 100644
--- a/mongodb/mongodb-1.4.9-tests.ts
+++ b/mongodb/mongodb-1.4.9-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="mongodb-1.4.9.d.ts"/>
-
 // Test source : https://github.com/mongodb/node-mongodb-native
 import mongodb = require('mongodb');
 var MongoClient = mongodb.MongoClient;
diff --git a/mongodb/mongodb-1.4.9.d.ts b/mongodb/mongodb-1.4.9.d.ts
index a843643c49..fdff25982d 100644
--- a/mongodb/mongodb-1.4.9.d.ts
+++ b/mongodb/mongodb-1.4.9.d.ts
@@ -5,80 +5,80 @@
 
 // Documentation : http://mongodb.github.io/node-mongodb-native/
 
-/// <reference path='../node/node.d.ts' />
+/// <reference types="node" />
 
-declare module "mongodb" {
 
-  // Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/mongoclient.html
-  export class MongoClient{
+
+// Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/mongoclient.html
+export declare class MongoClient {
     constructor(serverConfig: any, options: any);
 
     static connect(uri: string, callback?: (err: Error, db: Db) => void): void;
     static connect(uri: string, options: any, callback?: (err: Error, db: Db) => void): void;
-  }
+}
 
-  // Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/server.html
-  export class Server {
-    constructor (host: string, port: number, opts?: ServerOptions);
+// Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/server.html
+export declare class Server {
+    constructor(host: string, port: number, opts?: ServerOptions);
 
     public connect(): any;
-  }
+}
 
-  // Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/db.html
-  export class Db {
-    constructor (databaseName: string, serverConfig: Server, dbOptions?: DbCreateOptions);
+// Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/db.html
+export declare class Db {
+    constructor(databaseName: string, serverConfig: Server, dbOptions?: DbCreateOptions);
 
     public db(dbName: string): Db;
 
-    public open(callback?: (err : Error, db : Db) => void ): void;
-    public close(forceClose?: boolean, callback?: (err: Error, result: any) => void ): void;
-    public admin(callback?: (err: Error, result: any) => void ): any;
-    public collectionsInfo(collectionName: string, callback?: (err: Error, result: any) => void ): void;
-    public collectionNames(collectionName: string, options: any, callback?: (err: Error, result: any) => void ): void;
+    public open(callback?: (err: Error, db: Db) => void): void;
+    public close(forceClose?: boolean, callback?: (err: Error, result: any) => void): void;
+    public admin(callback?: (err: Error, result: any) => void): any;
+    public collectionsInfo(collectionName: string, callback?: (err: Error, result: any) => void): void;
+    public collectionNames(collectionName: string, options: any, callback?: (err: Error, result: any) => void): void;
 
     public collection(collectionName: string): Collection;
-    public collection(collectionName: string, callback?: (err: Error, collection: Collection) => void ): Collection;
-    public collection(collectionName: string, options: MongoCollectionOptions, callback?: (err: Error, collection: Collection) => void ): Collection;
+    public collection(collectionName: string, callback?: (err: Error, collection: Collection) => void): Collection;
+    public collection(collectionName: string, options: MongoCollectionOptions, callback?: (err: Error, collection: Collection) => void): Collection;
 
-    public collections(callback?: (err: Error, collections: Collection[]) => void ): void;
-    public eval(code: any, parameters: any[], options?: any, callback?: (err: Error, result: any) => void ): void;
+    public collections(callback?: (err: Error, collections: Collection[]) => void): void;
+    public eval(code: any, parameters: any[], options?: any, callback?: (err: Error, result: any) => void): void;
     //public dereference(dbRef: DbRef, callback?: (err: Error, result: any) => void): void;
 
-    public logout(callback?: (err: Error, result: any) => void ): void;
-    public logout(options: any, callback?: (err: Error, result: any) => void ): void;
+    public logout(callback?: (err: Error, result: any) => void): void;
+    public logout(options: any, callback?: (err: Error, result: any) => void): void;
 
-    public authenticate(userName: string, password: string, callback?: (err: Error, result: any) => void ): void;
-    public authenticate(userName: string, password: string, options: any, callback?: (err: Error, result: any) => void ): void;
+    public authenticate(userName: string, password: string, callback?: (err: Error, result: any) => void): void;
+    public authenticate(userName: string, password: string, options: any, callback?: (err: Error, result: any) => void): void;
 
-    public addUser(username: string, password: string, callback?: (err: Error, result: any) => void ): void;
-    public addUser(username: string, password: string, options: any, callback?: (err: Error, result: any) => void ): void;
+    public addUser(username: string, password: string, callback?: (err: Error, result: any) => void): void;
+    public addUser(username: string, password: string, options: any, callback?: (err: Error, result: any) => void): void;
 
-    public removeUser(username: string, callback?: (err: Error, result: any) => void ): void;
-    public removeUser(username: string, options: any, callback?: (err: Error, result: any) => void ): void;
+    public removeUser(username: string, callback?: (err: Error, result: any) => void): void;
+    public removeUser(username: string, options: any, callback?: (err: Error, result: any) => void): void;
 
-    public createCollection(collectionName: string, callback?: (err: Error, result: Collection) => void ): void;
-    public createCollection(collectionName: string, options: CollectionCreateOptions, callback?: (err: Error, result: any) => void ): void;
+    public createCollection(collectionName: string, callback?: (err: Error, result: Collection) => void): void;
+    public createCollection(collectionName: string, options: CollectionCreateOptions, callback?: (err: Error, result: any) => void): void;
 
-    public command(selector: Object, callback?: (err: Error, result: any) => void ): void;
-    public command(selector: Object, options: any, callback?: (err: Error, result: any) => void ): void;
+    public command(selector: Object, callback?: (err: Error, result: any) => void): void;
+    public command(selector: Object, options: any, callback?: (err: Error, result: any) => void): void;
 
-    public dropCollection(collectionName: string, callback?: (err: Error, result: any) => void ): void;
-    public renameCollection(fromCollection: string, toCollection: string, callback?: (err: Error, result: any) => void ): void;
+    public dropCollection(collectionName: string, callback?: (err: Error, result: any) => void): void;
+    public renameCollection(fromCollection: string, toCollection: string, callback?: (err: Error, result: any) => void): void;
 
-    public lastError(options: Object, connectionOptions: any, callback?: (err: Error, result: any) => void ): void;
-    public previousError(options: Object, callback?: (err: Error, result: any) => void ): void;
+    public lastError(options: Object, connectionOptions: any, callback?: (err: Error, result: any) => void): void;
+    public previousError(options: Object, callback?: (err: Error, result: any) => void): void;
 
     // error = lastError
     // lastStatus = lastError
 
-    public executeDbCommand(command_hash: any, callback?: (err: Error, result: any) => void ): void;
-    public executeDbCommand(command_hash: any, options: any, callback?: (err: Error, result: any) => void ): void;
+    public executeDbCommand(command_hash: any, callback?: (err: Error, result: any) => void): void;
+    public executeDbCommand(command_hash: any, options: any, callback?: (err: Error, result: any) => void): void;
 
-    public executeDbAdminCommand(command_hash: any, callback?: (err: Error, result: any) => void ): void;
-    public executeDbAdminCommand(command_hash: any, options: any, callback?: (err: Error, result: any) => void ): void;
+    public executeDbAdminCommand(command_hash: any, callback?: (err: Error, result: any) => void): void;
+    public executeDbAdminCommand(command_hash: any, options: any, callback?: (err: Error, result: any) => void): void;
 
-    public resetErrorHistory(callback?: (err: Error, result: any) => void ): void;
-    public resetErrorHistory(options: any, callback?: (err: Error, result: any) => void ): void;
+    public resetErrorHistory(callback?: (err: Error, result: any) => void): void;
+    public resetErrorHistory(options: any, callback?: (err: Error, result: any) => void): void;
 
     public createIndex(collectionName: any, fieldOrSpec: any, options: IndexOptions, callback?: Function): void;
     public ensureIndex(collectionName: any, fieldOrSpec: any, options: IndexOptions, callback?: Function): void;
@@ -88,7 +88,7 @@ declare module "mongodb" {
     public dropIndex(collectionName: string, indexName: string, callback?: Function): void;
     public reIndex(collectionName: string, callback?: Function): void;
     public indexInformation(collectionName: string, options: any, callback?: Function): void;
-    public dropDatabase(callback?: (err: Error, result: any) => void ): void;
+    public dropDatabase(callback?: (err: Error, result: any) => void): void;
 
     public stats(options: any, callback?: Function): void;
     public _registerHandler(db_command: any, raw: any, connection: any, exhaust: any, callback?: Function): void;
@@ -101,21 +101,21 @@ declare module "mongodb" {
 
     public DEFAULT_URL: string;
 
-    public connect(url: string, options: { uri_decode_auth?: boolean; }, callback?: (err: Error, result: any) => void ): void;
+    public connect(url: string, options: { uri_decode_auth?: boolean; }, callback?: (err: Error, result: any) => void): void;
 
-    public addListener(event: string, handler:(param: any) => any): any;
-  }
+    public addListener(event: string, handler: (param: any) => any): any;
+}
 
-  // Class documentation : http://mongodb.github.io/node-mongodb-native/api-bson-generated/objectid.html
-  // Last update: doc. version 1.3.13 (28.08.2013)
-  export class ObjectID {
-    constructor (s?: string);
+// Class documentation : http://mongodb.github.io/node-mongodb-native/api-bson-generated/objectid.html
+// Last update: doc. version 1.3.13 (28.08.2013)
+export declare class ObjectID {
+    constructor(s?: string);
 
     // Returns the ObjectID id as a 24 byte hex string representation
-    public toHexString() : string;
+    public toHexString(): string;
 
     // Compares the equality of this ObjectID with otherID.
-    public equals(otherID: ObjectID) : boolean;
+    public equals(otherID: ObjectID): boolean;
 
     // Returns the generation date (accurate up to the second) that this ID was generated.
     public getTimestamp(): Date;
@@ -135,11 +135,11 @@ declare module "mongodb" {
     // Generate a 12 byte id string used in ObjectID's
     // time - optional parameter allowing to pass in a second based timestamp
     public generate(time?: number): string;
-  }
+}
 
-  // Class documentation : http://mongodb.github.io/node-mongodb-native/api-bson-generated/binary.html
-  export class Binary {
-    constructor (buffer: Buffer, subType?: number);
+// Class documentation : http://mongodb.github.io/node-mongodb-native/api-bson-generated/binary.html
+export declare class Binary {
+    constructor(buffer: Buffer, subType?: number);
 
     // Updates this binary with byte_value
     put(byte_value: any): void;
@@ -155,9 +155,9 @@ declare module "mongodb" {
 
     // The length of the binary.
     length(): number;
-  }
+}
 
-  export interface SocketOptions {
+export interface SocketOptions {
     //= set seconds before connection times out default:0
     timeout?: number;
     //= Disables the Nagle algorithm default:true
@@ -166,25 +166,25 @@ declare module "mongodb" {
     keepAlive?: number;
     //= ‘ascii’|’utf8’|’base64’ default:null
     encoding?: string;
-  }
+}
 
-  export interface ServerOptions {
+export interface ServerOptions {
     // - to reconnect automatically, default:false
     auto_reconnect?: boolean;
     // - specify the number of connections in the pool default:1
     poolSize?: number;
     // - a collection of pr socket settings
     socketOptions?: any;
-  }
+}
 
-  export interface PKFactory {
+export interface PKFactory {
     counter: number;
     createPk: () => number;
-  }
+}
 
-  // See : http://mongodb.github.io/node-mongodb-native/api-generated/db.html
-  // Current definition by documentation version 1.3.13 (28.08.2013)
-  export interface DbCreateOptions {
+// See : http://mongodb.github.io/node-mongodb-native/api-generated/db.html
+// Current definition by documentation version 1.3.13 (28.08.2013)
+export interface DbCreateOptions {
     //  the write concern for the operation where < 1 is no acknowlegement of write and w >= 1, w = ‘majority’ or tag acknowledges the write.
     w?: any;
 
@@ -232,19 +232,19 @@ declare module "mongodb" {
 
     // when deserializing a Long will fit it into a Number if it’s smaller than 53 bits. default:true.
     promoteLongs?: boolean;
-  }
+}
 
-  export class ReadPreference {
+export declare class ReadPreference {
     public static PRIMARY: string;
     public static PRIMARY_PREFERRED: string;
     public static SECONDARY: string;
     public static SECONDARY_PREFERRED: string;
     public static NEAREST: string;
-  }
+}
 
-  // See : http://mongodb.github.io/node-mongodb-native/api-generated/collection.html
-  // Current definition by documentation version 1.3.13 (28.08.2013)
-  export interface CollectionCreateOptions {
+// See : http://mongodb.github.io/node-mongodb-native/api-generated/collection.html
+// Current definition by documentation version 1.3.13 (28.08.2013)
+export interface CollectionCreateOptions {
     // the prefered read preference. use 'ReadPreference' class.
     readPreference?: string;
 
@@ -259,10 +259,10 @@ declare module "mongodb" {
 
     // object overriding the basic ObjectID primary key generation.
     pkFactory?: PKFactory;
-  }
+}
 
-  // Documentation: http://docs.mongodb.org/manual/reference/command/collStats/
-  export interface CollStats {
+// Documentation: http://docs.mongodb.org/manual/reference/command/collStats/
+export interface CollStats {
     // Namespace.
     ns: string;
 
@@ -291,18 +291,18 @@ declare module "mongodb" {
     paddingFactor: number;
     flags: number;
 
-     // Total index size in bytes.
+    // Total index size in bytes.
     totalIndexSize: number;
 
     // Size of specific indexes in bytes.
     indexSizes: {
-            _id_: number;
-            username: number;
+        _id_: number;
+        username: number;
     };
-  }
+}
 
-  // Documentation : http://mongodb.github.io/node-mongodb-native/api-generated/collection.html
-  export interface Collection {
+// Documentation : http://mongodb.github.io/node-mongodb-native/api-generated/collection.html
+export interface Collection {
     new (db: Db, collectionName: string, pkFactory?: Object, options?: CollectionCreateOptions): Collection; // is this right?
     /**
      * @deprecated use insertOne or insertMany
@@ -312,7 +312,7 @@ declare module "mongodb" {
     insert(query: any, options: { safe?: any; continueOnError?: boolean; keepGoing?: boolean; serializeFunctions?: boolean; }, callback?: (err: Error, result: any) => void): void;
 
     // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#insertOne
-    insertOne(doc:any, callback?: (err: Error, result: any) => void) :void;
+    insertOne(doc: any, callback?: (err: Error, result: any) => void): void;
     insertOne(doc: any, options: { w?: any; wtimeout?: number; j?: boolean; serializeFunctions?: boolean; forceServerObjectId?: boolean }, callback?: (err: Error, result: any) => void): void;
 
     // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#insertMany
@@ -327,16 +327,16 @@ declare module "mongodb" {
 
     // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#deleteOne
     deleteOne(filter: any, callback?: (err: Error, result: any) => void): void;
-    deleteOne(filter: any, options: { w?: any; wtimeout?: number; j?: boolean;}, callback?: (err: Error, result: any) => void): void;
+    deleteOne(filter: any, options: { w?: any; wtimeout?: number; j?: boolean; }, callback?: (err: Error, result: any) => void): void;
 
     // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#deleteMany
     deleteMany(filter: any, callback?: (err: Error, result: any) => void): void;
-    deleteMany(filter: any, options: { w?: any; wtimeout?: number; j?: boolean;}, callback?: (err: Error, result: any) => void): void;
+    deleteMany(filter: any, options: { w?: any; wtimeout?: number; j?: boolean; }, callback?: (err: Error, result: any) => void): void;
 
     rename(newName: String, callback?: (err: Error, result: any) => void): void;
 
-    save(doc: any, callback : (err: Error, result: any) => void): void;
-    save(doc: any, options: { w?: any; wtimeout?: number; j?: boolean;}, callback : (err: Error, result: any) => void): void;
+    save(doc: any, callback: (err: Error, result: any) => void): void;
+    save(doc: any, options: { w?: any; wtimeout?: number; j?: boolean; }, callback: (err: Error, result: any) => void): void;
     /**
      * @deprecated use updateOne or updateMany
      * Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#update
@@ -346,11 +346,11 @@ declare module "mongodb" {
 
     // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#updateOne
     updateOne(filter: Object, update: any, callback?: (err: Error, result: any) => void): void;
-    updateOne(filter: Object, update: any, options: { upsert?: boolean; w?: any; wtimeout?: number; j?: boolean;}, callback?: (err: Error, result: any) => void): void;
+    updateOne(filter: Object, update: any, options: { upsert?: boolean; w?: any; wtimeout?: number; j?: boolean; }, callback?: (err: Error, result: any) => void): void;
 
     // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#updateMany
     updateMany(filter: Object, update: any, callback?: (err: Error, result: any) => void): void;
-    updateMany(filter: Object, update: any, options: { upsert?: boolean; w?: any; wtimeout?: number; j?: boolean;}, callback?: (err: Error, result: any) => void): void;
+    updateMany(filter: Object, update: any, options: { upsert?: boolean; w?: any; wtimeout?: number; j?: boolean; }, callback?: (err: Error, result: any) => void): void;
 
     distinct(key: string, query: Object, callback?: (err: Error, result: any) => void): void;
     distinct(key: string, query: Object, options: { readPreference: string; }, callback?: (err: Error, result: any) => void): void;
@@ -370,8 +370,8 @@ declare module "mongodb" {
      * @deprecated use findOneAndDelete
      * Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findAndRemove
      */
-    findAndRemove(query : Object, sort? : any[], callback?: (err: Error, result: any) => void): void;
-    findAndRemove(query : Object, sort? : any[], options?: { safe: any; }, callback?: (err: Error, result: any) => void): void;
+    findAndRemove(query: Object, sort?: any[], callback?: (err: Error, result: any) => void): void;
+    findAndRemove(query: Object, sort?: any[], options?: { safe: any; }, callback?: (err: Error, result: any) => void): void;
 
     // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findOneAndDelete
     findOneAndDelete(filter: any, callback?: (err: Error, result: any) => void): void;
@@ -414,7 +414,7 @@ declare module "mongodb" {
 
     reIndex(callback?: Function): void;
     mapReduce(map: Function, reduce: Function, options: MapReduceOptions, callback?: Function): void;
-    group(keys: Object, condition: Object, initial: Object, reduce: Function, finalize: Function, command: boolean, options: {readPreference: string}, callback?: Function): void;
+    group(keys: Object, condition: Object, initial: Object, reduce: Function, finalize: Function, command: boolean, options: { readPreference: string }, callback?: Function): void;
     options(callback?: Function): void;
     isCapped(callback?: Function): void;
     indexExists(indexes: string, callback?: Function): void;
@@ -424,14 +424,14 @@ declare module "mongodb" {
     geoHaystackSearch(x: number, y: number, options: Object, callback?: Function): void;
     indexes(callback?: Function): void;
     aggregate(pipeline: any[], callback?: (err: Error, results: any) => void): void;
-    aggregate(pipeline: any[], options: {readPreference: string}, callback?: (err: Error, results: any) => void): void;
+    aggregate(pipeline: any[], options: { readPreference: string }, callback?: (err: Error, results: any) => void): void;
     stats(callback?: (err: Error, results: CollStats) => void): void;
-    stats(options: {readPreference: string; scale: number}, callback?: (err: Error, results: CollStats) => void): void;
+    stats(options: { readPreference: string; scale: number }, callback?: (err: Error, results: CollStats) => void): void;
 
     hint: any;
-  }
+}
 
-  export interface MapReduceOptions {
+export interface MapReduceOptions {
     out?: Object;
     query?: Object;
     sort?: Object;
@@ -442,9 +442,9 @@ declare module "mongodb" {
     jsMode?: boolean;
     verbose?: boolean;
     readPreference?: string;
-  }
+}
 
-  export interface IndexOptions {
+export interface IndexOptions {
     w?: any;
     wtimeout?: number;
     fsync?: boolean;
@@ -458,54 +458,54 @@ declare module "mongodb" {
     v?: number;
     expireAfterSeconds?: number;
     name?: string;
-  }
+}
 
-  // Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/cursor.html
-  // Last update: doc. version 1.3.13 (29.08.2013)
-  export class Cursor {
+// Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/cursor.html
+// Last update: doc. version 1.3.13 (29.08.2013)
+export declare class Cursor {
     // INTERNAL TYPE
     // constructor (db: Db, collection: Collection, selector, fields, skip, limit, sort, hint, explain, snapshot, timeout, tailable, batchSize, slaveOk, raw, read, returnKey, maxScan, min, max, showDiskLoc, comment, awaitdata, numberOfRetries, dbName, tailableRetryInterval, exhaust, partial);
     // constructor(db: Db, collection: Collection, selector, fields, options);
 
-    rewind() : Cursor;
-    toArray(callback?: (err: Error, results: any[]) => any) : void;
-    each(callback?: (err: Error, item: any) => void) : void;
-    count(applySkipLimit: boolean, callback?: (err: Error, count: number) => void) : void;
+    rewind(): Cursor;
+    toArray(callback?: (err: Error, results: any[]) => any): void;
+    each(callback?: (err: Error, item: any) => void): void;
+    count(applySkipLimit: boolean, callback?: (err: Error, count: number) => void): void;
 
-    sort(keyOrList: any, callback? : (err: Error, result: any) => void): Cursor;
+    sort(keyOrList: any, callback?: (err: Error, result: any) => void): Cursor;
 
     // this determines how the results are sorted. "asc", "ascending" or 1 for asceding order while "desc", "desceding or -1 for descending order. Note that the strings are case insensitive.
-    sort(keyOrList: String, direction : string, callback : (err: Error, result: any) => void): Cursor;
+    sort(keyOrList: String, direction: string, callback: (err: Error, result: any) => void): Cursor;
     limit(limit: number, callback?: (err: Error, result: any) => void): Cursor;
     setReadPreference(preference: string, callback?: Function): Cursor;
     skip(skip: number, callback?: (err: Error, result: any) => void): Cursor;
     batchSize(batchSize: number, callback?: (err: Error, result: any) => void): Cursor;
 
-    nextObject(callback?: (err: Error, doc: any) => void) : void;
-    explain(callback?: (err: Error, result: any) => void) : void;
+    nextObject(callback?: (err: Error, doc: any) => void): void;
+    explain(callback?: (err: Error, result: any) => void): void;
 
     stream(): CursorStream;
 
-    close(callback?: (err: Error, result: any) => void) : void;
+    close(callback?: (err: Error, result: any) => void): void;
     isClosed(): boolean;
 
     public static INIT: number;
     public static OPEN: number;
     public static CLOSED: number;
     public static GET_MORE: number;
-  }
+}
 
-  // Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/cursorstream.html
-  // Last update: doc. version 1.3.13 (29.08.2013)
-  export class CursorStream {
+// Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/cursorstream.html
+// Last update: doc. version 1.3.13 (29.08.2013)
+export declare class CursorStream {
     constructor(cursor: Cursor);
 
     public pause(): any;
     public resume(): any;
     public destroy(): any;
-  }
+}
 
-  export interface CollectionFindOptions {
+export interface CollectionFindOptions {
     limit?: number;
     sort?: any;
     fields?: Object;
@@ -530,14 +530,13 @@ declare module "mongodb" {
     raw?: boolean;
     readPreference?: String;
     partial?: boolean;
-  }
+}
 
-  export interface MongoCollectionOptions {
+export interface MongoCollectionOptions {
     safe?: any;
     serializeFunctions?: any;
     strict?: boolean;
     raw?: boolean;
     pkFactory?: any;
     readPreference?: string;
-  }
 }
diff --git a/mongodb/mongodb-tests.ts b/mongodb/mongodb-tests.ts
index 72589a4704..cea5175e69 100644
--- a/mongodb/mongodb-tests.ts
+++ b/mongodb/mongodb-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="mongodb.d.ts"/>
-
 // Test source : https://github.com/mongodb/node-mongodb-native
 import mongodb = require('mongodb');
 var MongoClient = mongodb.MongoClient;
diff --git a/mongodb/mongodb.d.ts b/mongodb/mongodb.d.ts
deleted file mode 100644
index 6c9f8efe7f..0000000000
--- a/mongodb/mongodb.d.ts
+++ /dev/null
@@ -1,1276 +0,0 @@
-// Type definitions for MongoDB v2.1
-// Project: https://github.com/mongodb/node-mongodb-native/tree/2.1
-// Definitions by: Federico Caselli <https://github.com/CaselIT>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/
-
-/// <reference path='../node/node.d.ts' />
-
-declare module "mongodb" {
-  import {EventEmitter} from 'events';
-
-
-  // Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/MongoClient.html
-  export class MongoClient {
-    constructor();
-
-    static connect(uri: string, callback: MongoCallback<Db>): void;
-    static connect(uri: string, options?: MongoClientOptions): Promise<Db>;
-    static connect(uri: string, options: MongoClientOptions, callback: MongoCallback<Db>): void;
-
-    connect(uri: string, callback: MongoCallback<Db>): void;
-    connect(uri: string, options?: MongoClientOptions): Promise<Db>;
-    connect(uri: string, options: MongoClientOptions, callback: MongoCallback<Db>): void;
-  }
-
-  export interface MongoCallback<T> {
-    (error: MongoError, result: T): void;
-  }
-
-  // http://mongodb.github.io/node-mongodb-native/2.1/api/MongoError.html
-  export class MongoError extends Error {
-    constructor(message: string);
-    static create(options: Object): MongoError;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/MongoClient.html#.connect
-  export interface MongoClientOptions {
-    uri_decode_auth?: boolean;
-    db?: DbCreateOptions;
-    server?: ServerOptions;
-    replSet?: ReplSetOptions;
-    mongos?: MongosOptions;
-    promiseLibrary?: Object;
-  }
-
-  // See : http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html
-  export interface DbCreateOptions {
-    authSource?: string;
-    //  the write concern for the operation where < 1 is no acknowlegement of write and w >= 1, w = ‘majority’ or tag acknowledges the write.
-    w?: number | string;
-    // set the timeout for waiting for write concern to finish (combines with w option).
-    wtimeout?: number;
-    j?: boolean;
-    // use c++ bson parser. default:false.
-    native_parser?: boolean;
-    // force server to create _id fields instead of client. default:false.
-    forceServerObjectId?: boolean;
-    serializeFunctions?: boolean;
-    ignoreUndefined?: boolean;
-    // peform operations using raw bson buffers. default:false.
-    raw?: boolean;
-    // when deserializing a Long will fit it into a Number if it’s smaller than 53 bits. default:true.
-    promoteLongs?: boolean;
-    bufferMaxEntries?: number;
-    // the prefered read preference. use 'ReadPreference' class.
-    readPreference?: ReadPreference | string;
-    // custom primary key factory to generate _id values (see Custom primary keys).
-    pkFactory?: Object;
-    promiseLibrary?: Object;
-    readConcern?: { level?: Object };
-  }
-
-  // See http://mongodb.github.io/node-mongodb-native/2.1/api/ReadPreference.html
-  export class ReadPreference {
-    constructor(mode: string, tags: Object);
-    mode: string;
-    tags: any;
-    static PRIMARY: string;
-    static PRIMARY_PREFERRED: string;
-    static SECONDARY: string;
-    static SECONDARY_PREFERRED: string;
-    static NEAREST: string;
-    isValid(mode: string): boolean;
-    static isValid(mode: string): boolean;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Server.html
-  export interface SocketOptions {
-    // Reconnect on error. default:false
-    autoReconnect?: boolean;
-    // TCP Socket NoDelay option. default:true
-    noDelay?: boolean;
-    // TCP KeepAlive on the socket with a X ms delay before start. default:0
-    keepAlive?: number;
-    // TCP Connection timeout setting. default 0
-    connectTimeoutMS?: number;
-    // TCP Socket timeout setting. default 0
-    socketTimeoutMS?: number;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Server.html
-  export interface ServerOptions {
-    // - specify the number of connections in the pool default:5
-    poolSize?: number;
-    ssl?: boolean;
-    sslValidate?: Object;
-    checkServerIdentity?: boolean | Function;
-    sslCA?: Array<Buffer | string>;
-    sslCert?: Buffer | string;
-    sslKey?: Buffer | string;
-    sslPass?: Buffer | string;
-    socketOptions?: SocketOptions;
-    reconnectTries?: number;
-    reconnectInterval?: number;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/ReplSet.html
-  export interface ReplSetOptions {
-    ha?: boolean;
-    haInterval?: number;
-    replicaSet?: string;
-    secondaryAcceptableLatencyMS?: number;
-    connectWithNoPrimary?: boolean;
-    // - specify the number of connections in the pool default:5
-    poolSize?: number;
-    ssl?: boolean;
-    sslValidate?: Object;
-    checkServerIdentity?: boolean | Function;
-    sslCA?: Array<Buffer | string>;
-    sslCert?: Buffer | string;
-    sslKey?: Buffer | string;
-    sslPass?: Buffer | string;
-    socketOptions?: SocketOptions;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Mongos.html
-  export interface MongosOptions {
-    ha?: boolean;
-    haInterval?: number;
-    // - specify the number of connections in the pool default:5
-    poolSize?: number;
-    ssl?: boolean;
-    sslValidate?: Object;
-    checkServerIdentity?: boolean | Function;
-    sslCA?: Array<Buffer | string>;
-    sslCert?: Buffer | string;
-    sslKey?: Buffer | string;
-    sslPass?: Buffer | string;
-    socketOptions?: SocketOptions;
-  }
-
-  // Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html
-  export class Db extends EventEmitter {
-    constructor(databaseName: string, serverConfig: Server | ReplSet | Mongos, options?: DbCreateOptions);
-
-    serverConfig: Server | ReplSet | Mongos;
-    bufferMaxEntries: number;
-    databaseName: string;
-    options: any;
-    native_parser: boolean;
-    slaveOk: boolean;
-    writeConcern: any;
-
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#addUser
-    addUser(username: string, password: string, callback: MongoCallback<any>): void;
-    addUser(username: string, password: string, options?: { w?: number | string, wtimeout?: number, j?: boolean, customData?: Object, roles?: Object[] }): Promise<any>;
-    addUser(username: string, password: string, options: { w?: number | string, wtimeout?: number, j?: boolean, customData?: Object, roles?: Object[] }, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#admin
-    admin(): Admin;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#authenticate
-    authenticate(userName: string, password: string, callback: MongoCallback<any>): void;
-    authenticate(userName: string, password: string, options?: { authMechanism: string }): Promise<any>;
-    authenticate(userName: string, password: string, options: { authMechanism: string }, callback: MongoCallback<any>): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#close
-    close(callback: MongoCallback<void>): void;
-    close(forceClose?: boolean): Promise<void>;
-    close(forceClose: boolean, callback: MongoCallback<void>): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#collection
-    collection(name: string): Collection;
-    collection(name: string, callback: MongoCallback<Collection>): Collection;
-    collection(name: string, options: DbCollectionOptions, callback: MongoCallback<Collection>): Collection;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#collections
-    collections(): Promise<Collection[]>;
-    collections(callback: MongoCallback<Collection[]>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#command
-    command(command: Object, callback?: MongoCallback<any>): void;
-    command(command: Object, options?: { readPreference: ReadPreference | string }): Promise<any>;
-    command(command: Object, options: { readPreference: ReadPreference | string }, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#createCollection
-    createCollection(name: string, callback: MongoCallback<Collection>): void;
-    createCollection(name: string, options?: CollectionCreateOptions): Promise<Collection>;
-    createCollection(name: string, options: CollectionCreateOptions, callback: MongoCallback<Collection>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#createIndex
-    createIndex(name: string, fieldOrSpec: string | Object, callback: MongoCallback<any>): void;
-    createIndex(name: string, fieldOrSpec: string | Object, options?: IndexOptions): Promise<any>;
-    createIndex(name: string, fieldOrSpec: string | Object, options: IndexOptions, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#db
-    db(dbName: string): Db;
-    db(dbName: string, options: { noListener?: boolean, returnNonCachedInstance?: boolean }): Db;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#dropCollection
-    dropCollection(name: string): Promise<any>;
-    dropCollection(name: string, callback: MongoCallback<any>): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#dropDatabase
-    dropDatabase(): Promise<any>;
-    dropDatabase(callback: MongoCallback<any>): void;
-
-    //deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#ensureIndex
-    // ensureIndex(collectionName: any, fieldOrSpec: any, options: IndexOptions, callback: Function): void;
-    //deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#eval
-    // eval(code: any, parameters: any[], options?: any, callback?: MongoCallback<any>): void;
-
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#executeDbAdminCommand
-    executeDbAdminCommand(command: Object, callback: MongoCallback<any>): void;
-    executeDbAdminCommand(command: Object, options?: { readPreference?: ReadPreference | string, maxTimeMS?: number }): Promise<any>;
-    executeDbAdminCommand(command: Object, options: { readPreference?: ReadPreference | string, maxTimeMS?: number }, callback: MongoCallback<any>): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#indexInformation
-    indexInformation(name: string, callback: MongoCallback<any>): void;
-    indexInformation(name: string, options?: { full?: boolean, readPreference?: ReadPreference | string }): Promise<any>;
-    indexInformation(name: string, options: { full?: boolean, readPreference?: ReadPreference | string }, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#listCollections
-    listCollections(filter: Object, options?: { batchSize?: number, readPreference?: ReadPreference | string }): CommandCursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#logout
-    logout(callback: MongoCallback<any>): void;
-    logout(options?: { dbName?: string }): Promise<any>;
-    logout(options: { dbName?: string }, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#open
-    open(): Promise<Db>;
-    open(callback: MongoCallback<Db>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#removeUser
-    removeUser(username: string, callback: MongoCallback<any>): void;
-    removeUser(username: string, options?: { w?: number | string, wtimeout?: number, j?: boolean }): Promise<any>;
-    removeUser(username: string, options: { w?: number | string, wtimeout?: number, j?: boolean }, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#renameCollection
-    renameCollection(fromCollection: string, toCollection: string, callback: MongoCallback<Collection>): void;
-    renameCollection(fromCollection: string, toCollection: string, options?: { dropTarget?: boolean }): Promise<Collection>;
-    renameCollection(fromCollection: string, toCollection: string, options: { dropTarget?: boolean }, callback: MongoCallback<Collection>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#stats
-    stats(callback: MongoCallback<any>): void;
-    stats(options?: { scale?: number }): Promise<any>;
-    stats(options: { scale?: number }, callback: MongoCallback<any>): void;
-  }
-
-  // Deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/Server.html
-  export class Server extends EventEmitter {
-    constructor(host: string, port: number, options?: ServerOptions);
-
-    connections(): Array<any>;
-  }
-
-  // Deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/ReplSet.html
-  export class ReplSet extends EventEmitter {
-    constructor(servers: Array<Server>, options?: ReplSetOptions);
-
-    connections(): Array<any>;
-  }
-
-  // Deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/ReplSet.html
-  export class Mongos extends EventEmitter {
-    constructor(servers: Array<Server>, options?: MongosOptions);
-
-    connections(): Array<any>;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#createCollection
-  export interface CollectionCreateOptions {
-    w?: number | string;
-    wtimeout?: number;
-    j?: boolean;
-    raw?: boolean;
-    pkFactory?: Object;
-    readPreference?: ReadPreference | string;
-    serializeFunctions?: boolean;
-    strict?: boolean;
-    capped?: boolean;
-    size?: number;
-    max?: number;
-    autoIndexId?: boolean;
-  }
-
-  // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#collection
-  export interface DbCollectionOptions {
-    w?: number | string;
-    wtimeout?: number;
-    j?: boolean;
-    raw?: boolean;
-    pkFactory?: Object;
-    readPreference?: ReadPreference | string;
-    serializeFunctions?: boolean;
-    strict?: boolean;
-    readConcern?: { level: Object };
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#createIndex
-  export interface IndexOptions {
-    // The write concern.
-    w?: number | string;
-    // The write concern timeout.
-    wtimeout?: number;
-    // Specify a journal write concern.
-    j?: boolean;
-    // Creates an unique index.
-    unique?: boolean;
-    // Creates a sparse index.
-    sparse?: boolean;
-    // Creates the index in the background, yielding whenever possible.
-    background?: boolean;
-    // A unique index cannot be created on a key that has pre-existing duplicate values.
-    // If you would like to create the index anyway, keeping the first document the database indexes and
-    // deleting all subsequent documents that have duplicate value
-    dropDups?: boolean;
-    // For geo spatial indexes set the lower bound for the co-ordinates.
-    min?: number;
-    // For geo spatial indexes set the high bound for the co-ordinates.
-    max?: number;
-    // Specify the format version of the indexes.
-    v?: number;
-    // Allows you to expire data on indexes applied to a data (MongoDB 2.2 or higher)
-    expireAfterSeconds?: number;
-    // Override the auto generated index name (useful if the resulting name is larger than 128 bytes)
-    name?: string;
-  }
-
-  // http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html
-  export interface Admin {
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#addUser
-    addUser(username: string, password: string, callback: MongoCallback<any>): void;
-    addUser(username: string, password: string, options?: AddUserOptions): Promise<any>;
-    addUser(username: string, password: string, options: AddUserOptions, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#authenticate
-    authenticate(username: string, callback: MongoCallback<any>): void;
-    authenticate(username: string, password?: string): Promise<any>;
-    authenticate(username: string, password: string, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#buildInfo
-    buildInfo(): Promise<any>;
-    buildInfo(callback: MongoCallback<any>): void
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#command
-    command(command: Object, callback: MongoCallback<any>): void;
-    command(command: Object, options?: { readPreference?: ReadPreference | string, maxTimeMS?: number }): Promise<any>;
-    command(command: Object, options: { readPreference?: ReadPreference | string, maxTimeMS?: number }, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#listDatabases
-    listDatabases(): Promise<any>;
-    listDatabases(callback: MongoCallback<any>): void
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#logout
-    logout(): Promise<any>;
-    logout(callback: MongoCallback<any>): void
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#ping
-    ping(): Promise<any>;
-    ping(callback: MongoCallback<any>): void
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#profilingInfo
-    profilingInfo(): Promise<any>;
-    profilingInfo(callback: MongoCallback<any>): void
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#profilingLevel
-    profilingLevel(): Promise<any>;
-    profilingLevel(callback: MongoCallback<any>): void
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#removeUser
-    removeUser(username: string, callback: MongoCallback<any>): void;
-    removeUser(username: string, options?: FSyncOptions): Promise<any>;
-    removeUser(username: string, options: FSyncOptions, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#replSetGetStatus
-    replSetGetStatus(): Promise<any>;
-    replSetGetStatus(callback: MongoCallback<any>): void
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#serverInfo
-    serverInfo(): Promise<any>;
-    serverInfo(callback: MongoCallback<any>): void
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#serverStatus
-    serverStatus(): Promise<any>;
-    serverStatus(callback: MongoCallback<any>): void
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#setProfilingLevel
-    setProfilingLevel(level: string): Promise<any>;
-    setProfilingLevel(level: string, callback: MongoCallback<any>): void
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#validateCollection
-    validateCollection(collectionNme: string, callback: MongoCallback<any>): void;
-    validateCollection(collectionNme: string, options?: Object): Promise<any>;
-    validateCollection(collectionNme: string, options: Object, callback: MongoCallback<any>): void;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#addUser
-  export interface AddUserOptions {
-    w?: number | string;
-    wtimeout?: number;
-    j?: boolean;
-    fsync: boolean;
-    customData?: Object;
-    roles?: Object[]
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#removeUser
-  export interface FSyncOptions {
-    w?: number | string;
-    wtimeout?: number;
-    j?: boolean;
-    fsync?: boolean
-  }
-
-  // Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/ObjectID.html
-  export class ObjectID {
-    constructor(s?: string | number);
-
-    generationTime: number;
-
-    // Creates an ObjectID from a hex string representation of an ObjectID.
-    // hexString – create a ObjectID from a passed in 24 byte hexstring.
-    static createFromHexString(hexString: string): ObjectID;
-    // Creates an ObjectID from a second based number, with the rest of the ObjectID zeroed out. Used for comparisons or sorting the ObjectID.
-    // time – an integer number representing a number of seconds.
-    static createFromTime(time: number): ObjectID;
-    // Checks if a value is a valid bson ObjectId
-    // id - Value to be checked
-    static isValid(id: string | number): boolean;
-    //Compares the equality of this ObjectID with otherID.
-    equals(otherID: ObjectID): boolean;
-    // Generate a 12 byte id string used in ObjectID's
-    // time - optional parameter allowing to pass in a second based timestamp
-    generate(time?: number): string;
-    // Returns the generation date (accurate up to the second) that this ID was generated.
-    getTimestamp(): Date;
-    // Returns the ObjectID id as a 24 byte hex string representation
-    toHexString(): string;
-  }
-
-  // Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/Binary.html
-  export class Binary {
-    constructor(buffer: Buffer, subType?: number);
-
-    static SUBTYPE_BYTE_ARRAY: number;
-    static SUBTYPE_DEFAULT: number;
-    static SUBTYPE_FUNCTION: number;
-    static SUBTYPE_MD5: number;
-    static SUBTYPE_USER_DEFINED: number;
-    static SUBTYPE_UUID: number;
-    static SUBTYPE_UUID_OLD: number;
-
-    // The length of the binary.
-    length(): number;
-    // Updates this binary with byte_value
-    put(byte_value: number | string): void;
-    // Reads length bytes starting at position.
-    read(position: number, length: number): Buffer;
-    // Returns the value of this binary as a string.
-    value(): string;
-    // Writes a buffer or string to the binary
-    write(buffer: Buffer | string, offset: number): void;
-  }
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Double.html
-  export class Double {
-    constructor(value: number);
-
-    valueOf(): number;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Long.html
-  export class Long {
-    constructor(low: number, high: number);
-
-    static MAX_VALUE: Long;
-    static MIN_VALUE: Long;
-    static NEG_ONE: Long;
-    static ONE: Long;
-    static ZERO: Long;
-
-    static fromBits(lowBits: number, highBits: number): Long;
-    static fromInt(value: number): Long;
-    static fromNumber(value: number): Long;
-    static fromString(str: string, radix?: number): Long;
-
-    add(other: Long): Long;
-    and(other: Long): Long;
-    compare(other: Long): number;
-    div(other: Long): Long;
-    equals(other: Long): boolean;
-    getHighBits(): number;
-    getLowBits(): number;
-    getLowBitsUnsigned(): number;
-    getNumBitsAbs(): number;
-    greaterThan(other: Long): number;
-    greaterThanOrEqual(other: Long): number;
-    isNegative(): boolean;
-    isOdd(): boolean;
-    isZero(): boolean;
-    lessThan(other: Long): boolean;
-    lessThanOrEqual(other: Long): boolean;
-    modulo(other: Long): Long;
-    multiply(other: Long): Long;
-    negate(): Long;
-    not(): Long;
-    notEquals(other: Long): boolean;
-    or(other: Long): Long;
-    shiftLeft(other: number): Long;
-    shiftRight(other: number): Long;
-    shiftRightUnsigned(other: number): Long;
-    subtract(other: Long): Long;
-    toInt(): number;
-    toJSON(): string;
-    toNumber(): number;
-    toString(radix?: number): string;
-    xor(other: Long): Long;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/MaxKey.html
-  export class MaxKey { }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/MinKey.html
-  export class MinKey { }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Timestamp.html
-  export class Timestamp {
-    constructor(low: number, high: number);
-
-    static MAX_VALUE: Timestamp;
-    static MIN_VALUE: Timestamp;
-    static NEG_ONE: Timestamp;
-    static ONE: Timestamp;
-    static ZERO: Timestamp;
-
-    static fromBits(lowBits: number, highBits: number): Timestamp;
-    static fromInt(value: number): Timestamp;
-    static fromNumber(value: number): Timestamp;
-    static fromString(str: string, radix?: number): Timestamp;
-
-    add(other: Timestamp): Timestamp;
-    and(other: Timestamp): Timestamp;
-    compare(other: Timestamp): number;
-    div(other: Timestamp): Timestamp;
-    equals(other: Timestamp): boolean;
-    getHighBits(): number;
-    getLowBits(): number;
-    getLowBitsUnsigned(): number;
-    getNumBitsAbs(): number;
-    greaterThan(other: Timestamp): number;
-    greaterThanOrEqual(other: Timestamp): number;
-    isNegative(): boolean;
-    isOdd(): boolean;
-    isZero(): boolean;
-    lessThan(other: Timestamp): boolean;
-    lessThanOrEqual(other: Timestamp): boolean;
-    modulo(other: Timestamp): Timestamp;
-    multiply(other: Timestamp): Timestamp;
-    negate(): Timestamp;
-    not(): Timestamp;
-    notEquals(other: Timestamp): boolean;
-    or(other: Timestamp): Timestamp;
-    shiftLeft(other: number): Timestamp;
-    shiftRight(other: number): Timestamp;
-    shiftRightUnsigned(other: number): Timestamp;
-    subtract(other: Timestamp): Timestamp;
-    toInt(): number;
-    toJSON(): string;
-    toNumber(): number;
-    toString(radix?: number): string;
-    xor(other: Timestamp): Timestamp;
-  }
-
-  // Documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html
-  export interface Collection {
-    // Get the collection name.
-    collectionName: string;
-    // Get the full collection namespace.
-    namespace: string;
-    // The current write concern values.
-    writeConcern: any;
-    // The current read concern values.
-    readConcern: any;
-    // Get current index hint for collection.
-    hint: any;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#aggregate
-    aggregate(pipeline: Object[], callback: MongoCallback<any>): void | AggregationCursor;
-    aggregate(pipeline: Object[], options: CollectionAggrigationOptions, callback: MongoCallback<any>): void | AggregationCursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#bulkWrite
-    bulkWrite(operations: Object[], callback: MongoCallback<BulkWriteOpResultObject>): void
-    bulkWrite(operations: Object[], options?: CollectionBluckWriteOptions): Promise<BulkWriteOpResultObject>
-    bulkWrite(operations: Object[], options: CollectionBluckWriteOptions, callback: MongoCallback<BulkWriteOpResultObject>): void
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#count
-    count(query: Object, callback: MongoCallback<number>): void;
-    count(query: Object, options?: MongoCountPreferences): Promise<number>;
-    count(query: Object, options: MongoCountPreferences, callback: MongoCallback<number>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#createIndex
-    createIndex(fieldOrSpec: string | any, callback: MongoCallback<string>): void;
-    createIndex(fieldOrSpec: string | any, options?: IndexOptions): Promise<string>;
-    createIndex(fieldOrSpec: string | any, options: IndexOptions, callback: MongoCallback<string>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#createIndexes and http://docs.mongodb.org/manual/reference/command/createIndexes/
-    createIndexes(indexSpecs: Object[]): Promise<any>;
-    createIndexes(indexSpecs: Object[], callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#deleteMany
-    deleteMany(filter: Object, callback: MongoCallback<DeleteWriteOpResultObject>): void;
-    deleteMany(filter: Object, options?: CollectionOptions): Promise<DeleteWriteOpResultObject>;
-    deleteMany(filter: Object, options: CollectionOptions, callback: MongoCallback<DeleteWriteOpResultObject>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#deleteOne
-    deleteOne(filter: Object, callback: MongoCallback<DeleteWriteOpResultObject>): void;
-    deleteOne(filter: Object, options?: { w?: number | string, wtimmeout?: number, j?: boolean, bypassDocumentValidation?: boolean }): Promise<DeleteWriteOpResultObject>;
-    deleteOne(filter: Object, options: { w?: number | string, wtimmeout?: number, j?: boolean, bypassDocumentValidation?: boolean }, callback: MongoCallback<DeleteWriteOpResultObject>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#distinct
-    distinct(key: string, query: Object, callback: MongoCallback<any>): void
-    distinct(key: string, query: Object, options?: { readPreference?: ReadPreference | string }): Promise<any>;
-    distinct(key: string, query: Object, options: { readPreference?: ReadPreference | string }, callback: MongoCallback<any>): void
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#drop
-    drop(): Promise<any>;
-    drop(callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#dropIndex
-    dropIndex(indexName: string, callback: MongoCallback<any>): void;
-    dropIndex(indexName: string, options?: CollectionOptions): Promise<any>;
-    dropIndex(indexName: string, options: CollectionOptions, callback: MongoCallback<any>): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#dropIndexes
-    dropIndexes(): Promise<any>;
-    dropIndexes(callback?: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#find
-    find(query: Object): Cursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOneAndDelete
-    findOneAndDelete(filter: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject>): void;
-    findOneAndDelete(filter: Object, options?: { projection?: Object, sort?: Object, maxTimeMS?: number }): Promise<FindAndModifyWriteOpResultObject>;
-    findOneAndDelete(filter: Object, options: { projection?: Object, sort?: Object, maxTimeMS?: number }, callback: MongoCallback<FindAndModifyWriteOpResultObject>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOneAndReplace
-    findOneAndReplace(filter: Object, replacement: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject>): void;
-    findOneAndReplace(filter: Object, replacement: Object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject>;
-    findOneAndReplace(filter: Object, replacement: Object, options: FindOneAndReplaceOption, callback: MongoCallback<FindAndModifyWriteOpResultObject>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOneAndUpdate
-    findOneAndUpdate(filter: Object, update: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject>): void;
-    findOneAndUpdate(filter: Object, update: Object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject>;
-    findOneAndUpdate(filter: Object, update: Object, options: FindOneAndReplaceOption, callback: MongoCallback<FindAndModifyWriteOpResultObject>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#geoHaystackSearch
-    geoHaystackSearch(x: number, y: number, callback: MongoCallback<any>): void;
-    geoHaystackSearch(x: number, y: number, options?: GeoHaystackSearchOptions): Promise<any>;
-    geoHaystackSearch(x: number, y: number, options: GeoHaystackSearchOptions, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#geoNear
-    geoNear(x: number, y: number, callback: MongoCallback<any>): void;
-    geoNear(x: number, y: number, options?: GeoNearOptions): Promise<any>;
-    geoNear(x: number, y: number, options: GeoNearOptions, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#group
-    group(keys: Object | Array<any> | Function | Code, condition: Object, initial: Object, reduce: Function | Code, finalize: Function | Code, command: boolean, callback: MongoCallback<any>): void;
-    group(keys: Object | Array<any> | Function | Code, condition: Object, initial: Object, reduce: Function | Code, finalize: Function | Code, command: boolean, options?: { readPreference?: ReadPreference | string }): Promise<any>;
-    group(keys: Object | Array<any> | Function | Code, condition: Object, initial: Object, reduce: Function | Code, finalize: Function | Code, command: boolean, options: { readPreference?: ReadPreference | string }, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#indexes
-    indexes(): Promise<any>;
-    indexes(callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#indexExists
-    indexExists(indexes: string | string[]): Promise<boolean>;
-    indexExists(indexes: string | string[], callback: MongoCallback<boolean>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#indexInformation
-    indexInformation(callback: MongoCallback<any>): void;
-    indexInformation(options?: { full: boolean }): Promise<any>;
-    indexInformation(options: { full: boolean }, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#initializeOrderedBulkOp
-    initializeOrderedBulkOp(options: CollectionOptions): OrderedBulkOperation;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#initializeUnorderedBulkOp
-    initializeUnorderedBulkOp(options: CollectionOptions): UnorderedBulkOperation;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#insertMany
-    insertMany(docs: Object[], callback: MongoCallback<InsertWriteOpResult>): void
-    insertMany(docs: Object[], options?: CollectionInsertManyOptions): Promise<InsertWriteOpResult>;
-    insertMany(docs: Object[], options: CollectionInsertManyOptions, callback: MongoCallback<InsertWriteOpResult>): void
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#insertOne
-    insertOne(docs: Object, callback: MongoCallback<InsertOneWriteOpResult>): void
-    insertOne(docs: Object, options?: CollectionInsertOneOptions): Promise<InsertOneWriteOpResult>;
-    insertOne(docs: Object, options: CollectionInsertOneOptions, callback: MongoCallback<InsertOneWriteOpResult>): void
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#isCapped
-    isCapped(): Promise<any>;
-    isCapped(callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#listIndexes
-    listIndexes(options?: { batchSize?: number, readPreference?: ReadPreference | string }): CommandCursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#mapReduce
-    mapReduce(map: Function | string, reduce: Function | string, callback: MongoCallback<any>): void;
-    mapReduce(map: Function | string, reduce: Function | string, options?: MapReduceOptions): Promise<any>;
-    mapReduce(map: Function | string, reduce: Function | string, options: MapReduceOptions, callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#options
-    options(): Promise<any>;
-    options(callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#parallelCollectionScan
-    parallelCollectionScan(callback: MongoCallback<Cursor[]>): void;
-    parallelCollectionScan(options?: ParallelCollectionScanOptions): Promise<Cursor[]>;
-    parallelCollectionScan(options: ParallelCollectionScanOptions, callback: MongoCallback<Cursor[]>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#reIndex
-    reIndex(): Promise<any>;
-    reIndex(callback: MongoCallback<any>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#rename
-    rename(newName: string, callback: MongoCallback<Collection>): void;
-    rename(newName: string, options?: { dropTarget?: boolean }): Promise<Collection>;
-    rename(newName: string, options: { dropTarget?: boolean }, callback: MongoCallback<Collection>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#replaceOne
-    replaceOne(filter: Object, doc: Object, callback: MongoCallback<UpdateWriteOpResult>): void;
-    replaceOne(filter: Object, doc: Object, options?: ReplaceOneOptions): Promise<UpdateWriteOpResult>;
-    replaceOne(filter: Object, doc: Object, options: ReplaceOneOptions, callback: MongoCallback<UpdateWriteOpResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#stats
-    stats(callback: MongoCallback<CollStats>): void;
-    stats(options?: { scale: number }): Promise<CollStats>;
-    stats(options: { scale: number }, callback: MongoCallback<CollStats>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#updateMany
-    updateMany(filter: Object, update: Object, callback: MongoCallback<UpdateWriteOpResult>): void;
-    updateMany(filter: Object, update: Object, options?: { upsert?: boolean; w?: any; wtimeout?: number; j?: boolean; }): Promise<UpdateWriteOpResult>;
-    updateMany(filter: Object, update: Object, options: { upsert?: boolean; w?: any; wtimeout?: number; j?: boolean; }, callback: MongoCallback<UpdateWriteOpResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#updateOne
-    updateOne(filter: Object, update: Object, callback: MongoCallback<UpdateWriteOpResult>): void;
-    updateOne(filter: Object, update: Object, options?: ReplaceOneOptions): Promise<UpdateWriteOpResult>;
-    updateOne(filter: Object, update: Object, options: ReplaceOneOptions, callback: MongoCallback<UpdateWriteOpResult>): void;
-  }
-
-  // Documentation: http://docs.mongodb.org/manual/reference/command/collStats/
-  export interface CollStats {
-    // Namespace.
-    ns: string;
-    // Number of documents.
-    count: number;
-    // Collection size in bytes.
-    size: number;
-    // Average object size in bytes.
-    avgObjSize: number;
-    // (Pre)allocated space for the collection in bytes.
-    storageSize: number;
-    // Number of extents (contiguously allocated chunks of datafile space).
-    numExtents: number;
-    // Number of indexes.
-    nindexes: number;
-    // Size of the most recently created extent in bytes.
-    lastExtentSize: number;
-    // Padding can speed up updates if documents grow.
-    paddingFactor: number;
-    userFlags: number;
-    // Total index size in bytes.
-    totalIndexSize: number;
-    // Size of specific indexes in bytes.
-    indexSizes: {
-      _id_: number;
-      username: number;
-    };
-    capped: boolean;
-    maxSize: boolean;
-    wiredTiger: any;
-    indexDetails: any;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#aggregate
-  export interface CollectionAggrigationOptions {
-    readPreference?: ReadPreference | string;
-    // Return the query as cursor, on 2.6 > it returns as a real cursor
-    // on pre 2.6 it returns as an emulated cursor.
-    cursor?: { batchSize: number };
-    // Explain returns the aggregation execution plan (requires mongodb 2.6 >).
-    explain?: boolean;
-    // lets the server know if it can use disk to store
-    // temporary results for the aggregation (requires mongodb 2.6 >).
-    allowDiskUse?: boolean;
-    // specifies a cumulative time limit in milliseconds for processing operations
-    // on the cursor. MongoDB interrupts the operation at the earliest following interrupt point.
-    maxTimeMS?: boolean;
-    // Allow driver to bypass schema validation in MongoDB 3.2 or higher.
-    bypassDocumentValidation?: boolean;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#insertMany
-  export interface CollectionInsertManyOptions {
-    // The write concern.
-    w?: number | string;
-    // The write concern timeout.
-    wtimeout?: number;
-    // Specify a journal write concern.
-    j?: boolean;
-    // Serialize functions on any object.
-    serializeFunctions?: boolean;
-    //Force server to assign _id values instead of driver.
-    forceServerObjectId?: boolean;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#bulkWrite
-  export interface CollectionBluckWriteOptions {
-    // The write concern.
-    w?: number | string;
-    // The write concern timeout.
-    wtimeout?: number;
-    // Specify a journal write concern.
-    j?: boolean;
-    // Serialize functions on any object.
-    serializeFunctions?: boolean;
-    // Execute write operation in ordered or unordered fashion.
-    ordered?: boolean;
-    // Allow driver to bypass schema validation in MongoDB 3.2 or higher.
-    bypassDocumentValidation?: boolean;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~BulkWriteOpResult
-  export interface BulkWriteOpResultObject {
-    insertedCount?: number;
-    matchedCount?: number;
-    modifiedCount?: number;
-    deletedCount?: number;
-    upsertedCount?: number;
-    insertedIds?: any;
-    upsertedIds?: any;
-    result?: any;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#count
-  export interface MongoCountPreferences {
-    // The limit of documents to count.
-    limit?: number;
-    // The number of documents to skip for the count.
-    skip?: boolean;
-    // An index name hint for the query.
-    hint?: string;
-    // The preferred read preference
-    readPreference?: ReadPreference | string;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~deleteWriteOpResult
-  export interface DeleteWriteOpResultObject {
-    //The raw result returned from MongoDB, field will vary depending on server version.
-    result: {
-      //Is 1 if the command executed correctly.
-      ok?: number;
-      //The total count of documents deleted.
-      n?: number;
-    }
-    //The connection object used for the operation.
-    connection?: any;
-    //The number of documents deleted.
-    deletedCount?: number;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~findAndModifyWriteOpResult
-  export interface FindAndModifyWriteOpResultObject {
-    //Document returned from findAndModify command.
-    value?: any;
-    //The raw lastErrorObject returned from the command.
-    lastErrorObject?: any;
-    //Is 1 if the command executed correctly.
-    ok?: number;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOneAndReplace
-  export interface FindOneAndReplaceOption {
-    projection?: Object;
-    sort?: Object;
-    maxTimeMS?: number;
-    upsert?: boolean;
-    returnOriginal?: boolean;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#geoHaystackSearch
-  export interface GeoHaystackSearchOptions {
-    readPreference?: ReadPreference | string;
-    maxDistance?: number;
-    search?: Object;
-    limit?: number;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#geoNear
-  export interface GeoNearOptions {
-    readPreference?: ReadPreference | string;
-    num?: number;
-    minDistance?: number;
-    maxDistance?: number;
-    distanceMultiplier?: number;
-    query?: Object;
-    spherical?: boolean;
-    uniqueDocs?: boolean;
-    includeLocs?: boolean;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Code.html
-  export class Code {
-    constructor(code: string | Function, scope?: Object)
-    code: string | Function;
-    scope: any;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#deleteMany
-  export interface CollectionOptions {
-    //The write concern.
-    w?: number | string;
-    //The write concern timeout.
-    wtimeout?: number;
-    //Specify a journal write concern.
-    j?: boolean;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/OrderedBulkOperation.html
-  export interface OrderedBulkOperation {
-    length: number;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/OrderedBulkOperation.html#execute
-    execute(callback: MongoCallback<BulkWriteResult>): void;
-    execute(options: FSyncOptions): Promise<BulkWriteResult>;
-    execute(options: FSyncOptions, callback: MongoCallback<BulkWriteResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/OrderedBulkOperation.html#find
-    find(selector: Object): FindOperatorsOrdered;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/OrderedBulkOperation.html#insert
-    insert(doc: Object): OrderedBulkOperation;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/BulkWriteResult.html
-  export interface BulkWriteResult {
-    ok: boolean;
-    nInserted: number;
-    nUpdated: number;
-    nUpserted: number;
-    nModified: number;
-    nRemoved: number;
-
-    getInsertedIds(): Array<Object>;
-    getLastOp(): Object;
-    getRawResponse(): Object;
-    getUpsertedIdAt(index: number): Object;
-    getUpsertedIds(): Array<Object>;
-    getWriteConcernError(): WriteConcernError;
-    getWriteErrorAt(index: number): WriteError;
-    getWriteErrorCount(): number;
-    getWriteErrors(): Array<Object>;
-    hasWriteErrors(): boolean;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/WriteError.html
-  export interface WriteError {
-    //Write concern error code.
-    code: number;
-    //Write concern error original bulk operation index.
-    index: number;
-    //Write concern error message.
-    errmsg: string;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/WriteConcernError.html
-  export interface WriteConcernError {
-    //Write concern error code.
-    code: number;
-    //Write concern error message.
-    errmsg: string;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/FindOperatorsOrdered.html
-  export interface FindOperatorsOrdered {
-    delete(): OrderedBulkOperation;
-    deleteOne(): OrderedBulkOperation;
-    replaceOne(doc: Object): OrderedBulkOperation;
-    update(doc: Object): OrderedBulkOperation;
-    updateOne(doc: Object): OrderedBulkOperation;
-    upsert(): FindOperatorsOrdered;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/UnorderedBulkOperation.html
-  export interface UnorderedBulkOperation {
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/UnorderedBulkOperation.html#execute
-    execute(callback: MongoCallback<BulkWriteResult>): void;
-    execute(options: FSyncOptions): Promise<BulkWriteResult>;
-    execute(options: FSyncOptions, callback: MongoCallback<BulkWriteResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/UnorderedBulkOperation.html#find
-    find(selector: Object): FindOperatorsUnordered;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/UnorderedBulkOperation.html#insert
-    insert(doc: Object): UnorderedBulkOperation;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/FindOperatorsUnordered.html
-  export interface FindOperatorsUnordered {
-    length: number;
-    remove(): UnorderedBulkOperation;
-    removeOne(): UnorderedBulkOperation;
-    replaceOne(doc: Object): UnorderedBulkOperation;
-    update(doc: Object): UnorderedBulkOperation;
-    updateOne(doc: Object): UnorderedBulkOperation;
-    upsert(): FindOperatorsUnordered;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~insertWriteOpResult
-  export interface InsertWriteOpResult {
-    insertedCount: number;
-    ops: Array<any>;
-    insertedIds: Array<ObjectID>;
-    connection: any;
-    result: { ok: number, n: number }
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#insertOne
-  export interface CollectionInsertOneOptions {
-    // The write concern.
-    w?: number | string;
-    // The write concern timeout.
-    wtimeout?: number;
-    // Specify a journal write concern.
-    j?: boolean;
-    // Serialize functions on any object.
-    serializeFunctions?: boolean;
-    //Force server to assign _id values instead of driver.
-    forceServerObjectId?: boolean;
-    //Allow driver to bypass schema validation in MongoDB 3.2 or higher.
-    bypassDocumentValidation?: boolean
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~insertOneWriteOpResult
-  export interface InsertOneWriteOpResult {
-    insertedCount: number;
-    ops: Array<any>;
-    insertedId: ObjectID;
-    connection: any;
-    result: { ok: number, n: number }
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#parallelCollectionScan
-  export interface ParallelCollectionScanOptions {
-    readPreference?: ReadPreference | string;
-    batchSize?: number;
-    numCursors?: number;
-    raw?: boolean;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#replaceOne
-  export interface ReplaceOneOptions {
-    upsert?: boolean;
-    w?: number | string;
-    wtimeout?: number;
-    j?: boolean;
-    bypassDocumentValidation?: boolean;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~updateWriteOpResult
-  export interface UpdateWriteOpResult {
-    result: { ok: number, n: number, nModified: number };
-    connection: any;
-    matchedCount: number;
-    modifiedCount: number;
-    upsertedCount: number;
-    upsertedId: { _id: ObjectID };
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#mapReduce
-  export interface MapReduceOptions {
-    readPreference?: ReadPreference | string;
-    out?: Object;
-    query?: Object;
-    sort?: Object;
-    limit?: number;
-    keeptemp?: boolean;
-    finalize?: Function | string;
-    scope?: Object;
-    jsMode?: boolean;
-    verbose?: boolean;
-    bypassDocumentValidation?: boolean
-  }
-
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/external-Readable.html
-  export interface Readable {
-    pause(): void;
-    pipe(destination: Writable, options?: Object): void;
-    read(size: number): string | Buffer | void;
-    resume(): void;
-    setEncoding(encoding: string): void;
-    unpipe(destination?: Writable): void;
-    unshift(stream: Buffer | string): void;
-    wrap(stream: Stream): void;
-  }
-
-  export interface Writable { }
-  export interface Stream { }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#~resultCallback
-  export type CursorResult = any | void | boolean;
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html
-  export interface Cursor extends Readable, NodeJS.EventEmitter {
-
-    sortValue: string;
-    timeout: boolean;
-    readPreference: ReadPreference;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html
-    addCursorFlag(flag: string, value: boolean): Cursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#addQueryModifier
-    addQueryModifier(name: string, value: boolean): Cursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#batchSize
-    batchSize(value: number): Cursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#clone
-    clone(): Cursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#close
-    close(): Promise<CursorResult>;
-    close(callback: MongoCallback<CursorResult>): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#comment
-    comment(value: string): Cursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#count
-    count(applySkipLimit: boolean, callback: MongoCallback<number>): void;
-    count(applySkipLimit: boolean, options?: CursorCommentOptions): Promise<number>;
-    count(applySkipLimit: boolean, options: CursorCommentOptions, callback: MongoCallback<number>): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#explain
-    explain(): Promise<CursorResult>;
-    explain(callback: MongoCallback<CursorResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#filter
-    filter(filter: Object): Cursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#forEach
-    forEach(iterator: IteratorCallback, callback: EndCallback): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#hasNext
-    hasNext(): Promise<boolean>;
-    hasNext(callback: MongoCallback<boolean>): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#hint
-    hint(hint: Object): Cursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#isClosed
-    isClosed(): boolean;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#limit
-    limit(value: number): Cursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#map
-    map(transform: Function): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#max
-    max(max: number): Cursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#maxAwaitTimeMS
-    maxAwaitTimeMS(value: number): Cursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#maxScan
-    maxScan(maxScan: Object): Cursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#maxTimeMS
-    maxTimeMS(value: number): Cursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#min
-    min(min: number): Cursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#next
-    next(): Promise<CursorResult>;
-    next(callback: MongoCallback<CursorResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#pause
-    pause(): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#pipe
-    pipe(destination: Writable, options?: Object): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#project
-    project(value: Object): Cursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#read
-    read(size: number): string | Buffer | void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#resume
-    resume(): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#next
-    returnKey(returnKey: Object): Cursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#rewind
-    rewind(): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#setCursorOption
-    setCursorOption(field: string, value: Object): Cursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#setEncoding
-    setEncoding(encoding: string): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#setReadPreference
-    setReadPreference(readPreference: string | ReadPreference): Cursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#showRecordId
-    showRecordId(showRecordId: Object): Cursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#skip
-    skip(value: number): Cursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#snapshot
-    snapshot(snapshot: Object): Cursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#sort
-    sort(keyOrList: string | Object[] | Object | Object, direction?: number): Cursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#stream
-    stream(options?: { transform?: Function }): Cursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#toArray
-    toArray(): Promise<any[]>;
-    toArray(callback: MongoCallback<any[]>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#unpipe
-    unpipe(destination?: Writable): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#unshift
-    unshift(stream: Buffer | string): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#wrap
-    wrap(stream: Stream): void;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#count
-  export interface CursorCommentOptions {
-    skip?: number;
-    limit?: number;
-    maxTimeMS?: number;
-    hint?: string;
-    readPreference?: ReadPreference | string;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#~iteratorCallback
-  export interface IteratorCallback {
-    (doc: any): void;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#~endCallback
-  export interface EndCallback {
-    (error: MongoError): void;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#~resultCallback
-  export type AggregationCursorResult = any | void;
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html
-  export interface AggregationCursor extends Readable, NodeJS.EventEmitter {
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#batchSize
-    batchSize(value: number): AggregationCursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#clone
-    clone(): AggregationCursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#close
-    close(): Promise<AggregationCursorResult>;
-    close(callback: MongoCallback<AggregationCursorResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#each
-    each(callback: MongoCallback<AggregationCursorResult>): void
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#explain
-    explain(): Promise<AggregationCursorResult>;
-    explain(callback: MongoCallback<AggregationCursorResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#geoNear
-    geoNear(document: Object): AggregationCursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#group
-    group(document: Object): AggregationCursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#isClosed
-    isClosed(): boolean;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#limit
-    limit(value: number): AggregationCursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#match
-    match(document: Object): AggregationCursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#maxTimeMS
-    maxTimeMS(value: number): AggregationCursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#next
-    next(): Promise<AggregationCursorResult>;
-    next(callback: MongoCallback<AggregationCursorResult>): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#out
-    out(destination: string): AggregationCursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#pause
-    pause(): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#pipe
-    pipe(destination: Writable, options?: Object): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#project
-    project(document: Object): AggregationCursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#read
-    read(size: number): string | Buffer | void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#redact
-    redact(document: Object): AggregationCursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#resume
-    resume(): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#rewind
-    rewind(): AggregationCursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#setEncoding
-    setEncoding(encoding: string): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#skip
-    skip(value: number): AggregationCursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#sort
-    sort(document: Object): AggregationCursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#toArray
-    toArray(): Promise<Object[]>;
-    toArray(callback: MongoCallback<Object[]>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#unpipe
-    unpipe(destination?: Writable): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#unshift
-    unshift(stream: Buffer | string): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#unwind
-    unwind(field: string): AggregationCursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#wrap
-    wrap(stream: Stream): void;
-  }
-
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html
-  export interface CommandCursor extends Readable, NodeJS.EventEmitter {
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#batchSize
-    batchSize(value: number): CommandCursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#clone
-    clone(): CommandCursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#close
-    close(): Promise<AggregationCursorResult>;
-    close(callback: MongoCallback<AggregationCursorResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#each
-    each(callback: MongoCallback<AggregationCursorResult>): void
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#isClosed
-    isClosed(): boolean;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#maxTimeMS
-    maxTimeMS(value: number): CommandCursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#next
-    next(): Promise<AggregationCursorResult>;
-    next(callback: MongoCallback<AggregationCursorResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#pause
-    pause(): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#pipe
-    pipe(destination: Writable, options?: Object): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#read
-    read(size: number): string | Buffer | void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#resume
-    resume(): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#rewind
-    rewind(): CommandCursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#setEncoding
-    setEncoding(encoding: string): void;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#setReadPreference
-    setReadPreference(readPreference: string | ReadPreference): CommandCursor;
-    // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#toArray
-    toArray(): Promise<Object[]>;
-    toArray(callback: MongoCallback<Object[]>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#unpipe
-    unpipe(destination?: Writable): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#unshift
-    unshift(stream: Buffer | string): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#wrap
-    wrap(stream: Stream): void;
-  }
-}
diff --git a/mongodb/tsconfig.json b/mongodb/tsconfig.json
new file mode 100644
index 0000000000..ef0eb8b337
--- /dev/null
+++ b/mongodb/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mongodb-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mongoose-auto-increment/index.d.ts b/mongoose-auto-increment/index.d.ts
new file mode 100644
index 0000000000..3604b2feaa
--- /dev/null
+++ b/mongoose-auto-increment/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for mongoose-auto-increment 5.0.1
+// Project: https://github.com/codetunnel/mongoose-auto-increment
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+import { Connection, Schema, Mongoose } from 'mongoose';
+
+/**
+ * Initialize plugin by creating counter collection in database.
+ */
+declare function initialize(connection: Connection): void;
+
+/**
+ * The function to use when invoking the plugin on a custom schema.
+ */
+declare function plugin(schema: Schema, options: Object): void;
diff --git a/mongoose-auto-increment/mongoose-auto-increment-tests.ts b/mongoose-auto-increment/mongoose-auto-increment-tests.ts
index fbd2ef68ae..10f371cc19 100644
--- a/mongoose-auto-increment/mongoose-auto-increment-tests.ts
+++ b/mongoose-auto-increment/mongoose-auto-increment-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="../mongoose/mongoose.d.ts" />
-/// <reference path="./mongoose-auto-increment.d.ts" />
-
 import * as autoIncrement from 'mongoose-auto-increment';
 import * as mongoose from 'mongoose';
 import { Schema } from 'mongoose';
diff --git a/mongoose-auto-increment/mongoose-auto-increment.d.ts b/mongoose-auto-increment/mongoose-auto-increment.d.ts
deleted file mode 100644
index 34e7b5ddd6..0000000000
--- a/mongoose-auto-increment/mongoose-auto-increment.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Type definitions for mongoose-auto-increment 5.0.1
-// Project: https://github.com/codetunnel/mongoose-auto-increment
-// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../mongoose/mongoose.d.ts" />
-
-declare module 'mongoose-auto-increment' {
-	import { Connection, Schema, Mongoose } from 'mongoose';
-	
-	/**
-	 * Initialize plugin by creating counter collection in database.
-	 */
-	function initialize(connection: Connection): void;
-
-	/**
-	 * The function to use when invoking the plugin on a custom schema.
-	 */
-	function plugin(schema: Schema, options: Object): void;
-}
diff --git a/mongoose-auto-increment/tsconfig.json b/mongoose-auto-increment/tsconfig.json
new file mode 100644
index 0000000000..53e6d43d52
--- /dev/null
+++ b/mongoose-auto-increment/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mongoose-auto-increment-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mongoose-deep-populate/index.d.ts b/mongoose-deep-populate/index.d.ts
new file mode 100644
index 0000000000..9c2de04b49
--- /dev/null
+++ b/mongoose-deep-populate/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for mongoose-deep-populate 2.0.3
+// Project: https://github.com/buunguyen/mongoose-deep-populate
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+import { Mongoose, Schema } from 'mongoose';
+
+export default function(mognoose: Mongoose): (schema: Schema, options: Object) => void;
diff --git a/mongoose-deep-populate/mongoose-deep-populate-tests.ts b/mongoose-deep-populate/mongoose-deep-populate-tests.ts
index d85a854a97..e3e7fd9194 100644
--- a/mongoose-deep-populate/mongoose-deep-populate-tests.ts
+++ b/mongoose-deep-populate/mongoose-deep-populate-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="../mongoose/mongoose.d.ts" />
-/// <reference path="./mongoose-deep-populate.d.ts" />
-
 import mongooseDeepPopulate from 'mongoose-deep-populate';
 import * as mongoose from 'mongoose';
 import { Schema } from 'mongoose';
diff --git a/mongoose-deep-populate/mongoose-deep-populate.d.ts b/mongoose-deep-populate/mongoose-deep-populate.d.ts
deleted file mode 100644
index 247ba6b480..0000000000
--- a/mongoose-deep-populate/mongoose-deep-populate.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for mongoose-deep-populate 2.0.3
-// Project: https://github.com/buunguyen/mongoose-deep-populate
-// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../mongoose/mongoose.d.ts" />
-
-declare module "mongoose-deep-populate" {
-	import { Mongoose, Schema } from 'mongoose';
-
-	export default function(mognoose: Mongoose): (schema: Schema, options: Object) => void;
-}
diff --git a/mongoose-deep-populate/tsconfig.json b/mongoose-deep-populate/tsconfig.json
new file mode 100644
index 0000000000..8957fe4840
--- /dev/null
+++ b/mongoose-deep-populate/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mongoose-deep-populate-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mongoose-mock/index.d.ts b/mongoose-mock/index.d.ts
new file mode 100644
index 0000000000..d5adb581d0
--- /dev/null
+++ b/mongoose-mock/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for mongoose-mock 0.4.0
+// Project: https://github.com/JohanObrink/mongoose-mock
+// Definitions by: jt000 <https://github.com/jt000>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+import mongoose = require('mongoose');
+
+declare var mock: mongoose.Mongoose;
+export = mock;
diff --git a/mongoose-mock/mongoose-mock-tests.ts b/mongoose-mock/mongoose-mock-tests.ts
index 4f364cf97b..b963b9dece 100644
--- a/mongoose-mock/mongoose-mock-tests.ts
+++ b/mongoose-mock/mongoose-mock-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="../mongoose/mongoose.d.ts" />
-/// <reference path="mongoose-mock.d.ts" />
-
 import mongooseMock = require('mongoose-mock');
 
 // returns a mongoose object
diff --git a/mongoose-mock/mongoose-mock.d.ts b/mongoose-mock/mongoose-mock.d.ts
deleted file mode 100644
index 588062dd03..0000000000
--- a/mongoose-mock/mongoose-mock.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Type definitions for mongoose-mock 0.4.0
-// Project: https://github.com/JohanObrink/mongoose-mock
-// Definitions by: jt000 <https://github.com/jt000>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../mongoose/mongoose.d.ts" />
-
-declare module "mongoose-mock" {
-    import mongoose = require('mongoose');
-
-    var mock: mongoose.Mongoose;
-    export = mock;
-}
\ No newline at end of file
diff --git a/mongoose-mock/tsconfig.json b/mongoose-mock/tsconfig.json
new file mode 100644
index 0000000000..7522e19e58
--- /dev/null
+++ b/mongoose-mock/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mongoose-mock-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mongoose/index.d.ts b/mongoose/index.d.ts
new file mode 100644
index 0000000000..798291a99b
--- /dev/null
+++ b/mongoose/index.d.ts
@@ -0,0 +1,501 @@
+// Type definitions for Mongoose 3.8.5
+// Project: http://mongoosejs.com/
+// Definitions by: horiuchi <https://github.com/horiuchi/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="node" />
+
+
+declare function connect(uri: string, options?: ConnectionOptions, callback?: (err: any) => void): Mongoose;
+declare function createConnection(): Connection;
+declare function createConnection(uri: string, options?: ConnectionOptions): Connection;
+declare function createConnection(host: string, database_name: string, port?: number, options?: ConnectionOptions): Connection;
+declare function disconnect(callback?: (err?: any) => void): Mongoose;
+
+declare function model<T extends Document>(name: string, schema?: Schema, collection?: string, skipInit?: boolean): Model<T>;
+declare function modelNames(): string[];
+declare function plugin(plugin: (schema: Schema, options?: Object) => void, options?: Object): Mongoose;
+
+declare function get(key: string): any;
+declare function set(key: string, value: any): void;
+
+declare var mongo: any;
+declare var mquery: any;
+declare var version: string;
+declare var connection: Connection;
+
+export declare class Mongoose {
+    connect(uri: string, options?: ConnectOpenOptionsBase, callback?: (err: any) => void): Mongoose;
+    createConnection(): Connection;
+    createConnection(uri: string, options?: Object): Connection;
+    createConnection(host: string, database_name: string, port?: number, options?: ConnectOpenOptionsBase): Connection;
+    disconnect(callback?: (err?: any) => void): Mongoose;
+    get(key: string): any;
+    model<T extends Document>(name: string, schema?: Schema, collection?: string, skipInit?: boolean): Model<T>;
+    modelNames(): string[];
+    plugin(plugin: (schema: Schema, options?: Object) => void, options?: Object): Mongoose;
+    set(key: string, value: any): void;
+
+    mongo: any;
+    mquery: any;
+    version: string;
+    connection: Connection;
+}
+
+export interface Connection extends NodeJS.EventEmitter {
+    constructor(base: Mongoose): Connection;
+
+    close(callback?: (err: any) => void): Connection;
+    collection(name: string, options?: Object): Collection;
+    model<T extends Document>(name: string, schema?: Schema, collection?: string): Model<T>;
+    modelNames(): string[];
+    open(host: string, database?: string, port?: number, options?: OpenSetConnectionOptions, callback?: (err: any) => void): Connection;
+    openSet(uris: string, database?: string, options?: OpenSetConnectionOptions, callback?: (err: any) => void): Connection;
+
+    db: any;
+    collections: { [index: string]: Collection };
+    readyState: number;
+}
+
+export interface ConnectOpenOptionsBase {
+    db?: any;
+    server?: any;
+    replset?: any;
+    /** Username for authentication if not supplied in the URI. */
+    user?: string;
+    /** Password for authentication if not supplied in the URI. */
+    pass?: string;
+    /** Options for authentication */
+    auth?: any;
+}
+
+export interface ConnectionOptions extends ConnectOpenOptionsBase {
+    /** Passed to the underlying driver's Mongos instance. */
+    mongos?: MongosOptions;
+}
+
+interface OpenSetConnectionOptions extends ConnectOpenOptionsBase {
+    /** If true, enables High Availability support for mongos */
+    mongos?: boolean;
+}
+
+interface MongosOptions {
+    /** Turn on high availability monitoring. (default: true) */
+    ha?: boolean;
+    /** Time between each replicaset status check. (default: 5000) */
+    haInterval?: number;
+    /**
+     * Number of connections in the connection pool for each
+     * server instance. (default: 5 (for legacy reasons)) */
+    poolSize?: number;
+    /**
+     * Use ssl connection (needs to have a mongod server with
+     * ssl support). (default: false).
+     */
+    ssl?: boolean;
+    /**
+     * Validate mongod server certificate against ca
+     * (needs to have a mongod server with ssl support, 2.4 or higher)
+     * (default: true)
+     */
+    sslValidate?: boolean;
+    /** Turn on high availability monitoring. */
+    sslCA?: (Buffer | string)[];
+    sslKey?: Buffer | string;
+    sslPass?: Buffer | string;
+    socketOptions?: {
+        noDelay?: boolean;
+        keepAlive?: number;
+        connectionTimeoutMS?: number;
+        socketTimeoutMS?: number;
+    };
+}
+
+export interface Collection {
+}
+
+
+export declare class SchemaType { }
+export declare class VirtualType {
+    get(fn: Function): VirtualType;
+    set(fn: Function): VirtualType;
+}
+export declare module Types {
+    export class ObjectId {
+        constructor(id?: string | number);
+        toHexString(): string;
+        equals(other: ObjectId): boolean;
+        getTimestamp(): Date;
+        isValid(): boolean;
+        static createFromTime(time: number): ObjectId;
+        static createFromHexString(hexString: string): ObjectId;
+    }
+}
+
+export declare class Schema {
+    static Types: {
+        String: String;
+        ObjectId: Types.ObjectId;
+        OId: Types.ObjectId;
+        Mixed: any;
+    };
+    constructor(schema?: Object, options?: Object);
+
+    add(obj: Object, prefix?: string): void;
+    eachPath(fn: (path: string, type: any) => void): Schema;
+    get(key: string): any;
+    index(fields: Object, options?: Object): Schema;
+    indexes(): void;
+    method(name: string, fn: Function): Schema;
+    method(method: Object): Schema;
+    path(path: string): any;
+    path(path: string, constructor: any): Schema;
+    pathType(path: string): string;
+    plugin(plugin: (schema: Schema, options?: Object) => void, options?: Object): Schema;
+    post(method: string, fn: Function): Schema;
+    pre(method: string, callback: Function): Schema;
+    requiredPaths(): string[];
+    set(key: string, value: any): void;
+    static(name: string, fn: Function): Schema;
+    virtual(name: string, options?: Object): VirtualType;
+    virtualpath(name: string): VirtualType;
+}
+export interface SchemaOption {
+    autoIndex?: boolean;
+    bufferCommands?: boolean;
+    capped?: boolean;
+    collection?: string;
+    id?: boolean;
+    _id?: boolean;
+    minimize?: boolean;
+    read?: string;
+    safe?: boolean;
+    shardKey?: boolean;
+    strict?: boolean;
+    toJSON?: Object;
+    toObject?: Object;
+    versionKey?: boolean;
+}
+
+export interface Model<T extends Document> extends NodeJS.EventEmitter {
+    new (doc?: Object, fields?: Object, skipInit?: boolean): T;
+
+    aggregate(...aggregations: Object[]): Aggregate<T[]>;
+    aggregate(aggregation: Object, callback: (err: any, res: T[]) => void): Promise<T[]>;
+    aggregate(aggregation1: Object, aggregation2: Object, callback: (err: any, res: T[]) => void): Promise<T[]>;
+    aggregate(aggregation1: Object, aggregation2: Object, aggregation3: Object, callback: (err: any, res: T[]) => void): Promise<T[]>;
+    count(conditions: Object, callback?: (err: any, count: number) => void): Query<number>;
+
+    create(doc: Object, fn?: (err: any, res: T) => void): Promise<T>;
+    create(doc1: Object, doc2: Object, fn?: (err: any, res1: T, res2: T) => void): Promise<T[]>;
+    create(doc1: Object, doc2: Object, doc3: Object, fn?: (err: any, res1: T, res2: T, res3: T) => void): Promise<T[]>;
+    discriminator<U extends Document>(name: string, schema: Schema): Model<U>;
+    distinct(field: string, callback?: (err: any, res: T[]) => void): Query<T[]>;
+    distinct(field: string, conditions: Object, callback?: (err: any, res: T[]) => void): Query<T[]>;
+    ensureIndexes(callback: (err: any) => void): Promise<T>;
+
+    find(cond: Object, callback?: (err: any, res: T[]) => void): Query<T[]>;
+    find(cond: Object, fields: Object, callback?: (err: any, res: T[]) => void): Query<T[]>;
+    find(cond: Object, fields: Object, options: Object, callback?: (err: any, res: T[]) => void): Query<T[]>;
+    findById(id: string, callback?: (err: any, res: T) => void): Query<T>;
+    findById(id: string, fields: Object, callback?: (err: any, res: T) => void): Query<T>;
+    findById(id: string, fields: Object, options: Object, callback?: (err: any, res: T) => void): Query<T>;
+    findByIdAndRemove(id: string, callback?: (err: any, res: T) => void): Query<T>;
+    findByIdAndRemove(id: string, options: Object, callback?: (err: any, res: T) => void): Query<T>;
+    findByIdAndUpdate(id: string, update: Object, callback?: (err: any, res: T) => void): Query<T>;
+    findByIdAndUpdate(id: string, update: Object, options: FindAndUpdateOption, callback?: (err: any, res: T) => void): Query<T>;
+    findOne(cond?: Object, callback?: (err: any, res: T) => void): Query<T>;
+    findOne(cond: Object, fields: Object, callback?: (err: any, res: T) => void): Query<T>;
+    findOne(cond: Object, fields: Object, options: Object, callback?: (err: any, res: T) => void): Query<T>;
+    findOneAndRemove(cond: Object, callback?: (err: any, res: T) => void): Query<T>;
+    findOneAndRemove(cond: Object, options: Object, callback?: (err: any, res: T) => void): Query<T>;
+    findOneAndUpdate(cond: Object, update: Object, callback?: (err: any, res: T) => void): Query<T>;
+    findOneAndUpdate(cond: Object, update: Object, options: FindAndUpdateOption, callback?: (err: any, res: T) => void): Query<T>;
+
+    geoNear(point: { type: string; coordinates: number[] }, options: Object, callback?: (err: any, res: T[], stats: any) => void): Query<T[]>;
+    geoNear(point: number[], options: Object, callback?: (err: any, res: T[], stats: any) => void): Query<T[]>;
+    geoSearch(cond: Object, options: GeoSearchOption, callback?: (err: any, res: T[]) => void): Query<T[]>;
+    increment(): T;
+    mapReduce<K, V>(options: MapReduceOption<T, K, V>, callback?: (err: any, res: MapReduceResult<K, V>[]) => void): Promise<MapReduceResult<K, V>[]>;
+    mapReduce<K, V>(options: MapReduceOption2<T, K, V>, callback?: (err: any, res: MapReduceResult<K, V>[]) => void): Promise<MapReduceResult<K, V>[]>;
+    model<U extends Document>(name: string): Model<U>;
+
+    populate<U>(doc: U, options: Object, callback?: (err: any, res: U) => void): Promise<U>;
+    populate<U>(doc: U[], options: Object, callback?: (err: any, res: U[]) => void): Promise<U[]>;
+    update(cond: Object, update: Object, callback?: (err: any, affectedRows: number, raw: any) => void): Query<T>;
+    update(cond: Object, update: Object, options: Object, callback?: (err: any, affectedRows: number, raw: any) => void): Query<T>;
+    remove(cond: Object, callback?: (err: any) => void): Query<{}>;
+    save(callback?: (err: any, result: T, numberAffected: number) => void): Query<T>;
+    where(path: string, val?: Object): Query<T[]>;
+
+    $where(argument: string): Query<T>;
+    $where(argument: Function): Query<T>;
+
+    base: Mongoose;
+    collection: Collection;
+    db: any;
+    discriminators: any;
+    modelName: string;
+    schema: Schema;
+}
+export interface FindAndUpdateOption {
+    new?: boolean;
+    upsert?: boolean;
+    sort?: Object;
+    select?: Object;
+}
+export interface GeoSearchOption {
+    near: number[];
+    maxDistance: number;
+    limit?: number;
+    lean?: boolean;
+}
+export interface MapReduceOption<T extends Document, Key, Val> {
+    map: () => void;
+    reduce: (key: Key, vals: T[]) => Val;
+    query?: Object;
+    limit?: number;
+    keeptemp?: boolean;
+    finalize?: (key: Key, val: Val) => Val;
+    scope?: Object;
+    jsMode?: boolean;
+    verbose?: boolean;
+    out?: {
+        inline?: number;
+        replace?: string;
+        reduce?: string;
+        merge?: string;
+    };
+}
+export interface MapReduceOption2<T extends Document, Key, Val> {
+    map: string;
+    reduce: (key: Key, vals: T[]) => Val;
+    query?: Object;
+    limit?: number;
+    keeptemp?: boolean;
+    finalize?: (key: Key, val: Val) => Val;
+    scope?: Object;
+    jsMode?: boolean;
+    verbose?: boolean;
+    out?: {
+        inline?: number;
+        replace?: string;
+        reduce?: string;
+        merge?: string;
+    };
+}
+export interface MapReduceResult<Key, Val> {
+    _id: Key;
+    value: Val;
+}
+
+export declare class Query<T> {
+    exec(callback?: (err: any, res: T) => void): Promise<T>;
+    exec(operation: string, callback?: (err: any, res: T) => void): Promise<T>;
+    exec(operation: Function, callback?: (err: any, res: T) => void): Promise<T>;
+
+    all(val: number): Query<T>;
+    all(path: string, val: number): Query<T>;
+    and(array: Object[]): Query<T>;
+    box(val: Object): Query<T>;
+    box(a: number[], b: number[]): Query<T>;
+    batchSize(val: number): Query<T>;
+    cast<U extends Document>(model: Model<U>, obj: Object): U;
+    //center(): Query<T>;
+    //centerSphere(path: string, val: Object): Query<T>;
+    circle(area: Object): Query<T>;
+    circle(path: string, area: Object): Query<T>;
+    comment(val: any): Query<T>;
+    count(callback?: (err: any, count: number) => void): Query<T>;
+    count(criteria: Object, callback?: (err: any, count: number) => void): Query<T>;
+    distinct(callback?: (err: any, res: T) => void): Query<T>;
+    distinct(field: string, callback?: (err: any, res: T) => void): Query<T>;
+    distinct(criteria: Object, field: string, callback?: (err: any, res: T) => void): Query<T>;
+    distinct(criteria: Query<T>, field: string, callback?: (err: any, res: T) => void): Query<T>;
+    elemMatch(criteria: Object): Query<T>;
+    elemMatch(criteria: (elem: Query<T>) => void): Query<T>;
+    elemMatch(path: string, criteria: Object): Query<T>;
+    elemMatch(path: string, criteria: (elem: Query<T>) => void): Query<T>;
+    equals(val: Object): Query<T>;
+    exists(val?: boolean): Query<T>;
+    exists(path: string, val?: boolean): Query<T>;
+    find(callback?: (err: any, res: T) => void): Query<T>;
+    find(criteria: Object, callback?: (err: any, res: T) => void): Query<T>;
+    findOne(callback?: (err: any, res: T) => void): Query<T>;
+    findOne(criteria: Object, callback?: (err: any, res: T) => void): Query<T>;
+    findOneAndRemove(callback?: (err: any, res: T) => void): Query<T>;
+    findOneAndRemove(cond: Object, callback?: (err: any, res: T) => void): Query<T>;
+    findOneAndRemove(cond: Object, options: Object, callback?: (err: any, res: T) => void): Query<T>;
+    findOneAndUpdate(callback?: (err: any, res: T) => void): Query<T>;
+    findOneAndUpdate(update: Object, callback?: (err: any, res: T) => void): Query<T>;
+    findOneAndUpdate(cond: Object, update: Object, callback?: (err: any, res: T) => void): Query<T>;
+    findOneAndUpdate(cond: Object, update: Object, options: FindAndUpdateOption, callback?: (err: any, res: T) => void): Query<T>;
+    geometry(object: Object): Query<T>;
+    gt(val: number): Query<T>;
+    gt(path: string, val: number): Query<T>;
+    gte(val: number): Query<T>;
+    gte(path: string, val: number): Query<T>;
+    hint(val: Object): Query<T>;
+    in(val: any[]): Query<T>;
+    in(path: string, val: any[]): Query<T>;
+    intersects(arg?: Object): Query<T>;
+    lean(bool?: boolean): Query<T>;
+    limit(val: number): Query<T>;
+    lt(val: number): Query<T>;
+    lt(path: string, val: number): Query<T>;
+    lte(val: number): Query<T>;
+    lte(path: string, val: number): Query<T>;
+    maxDistance(val: number): Query<T>;
+    maxDistance(path: string, val: number): Query<T>;
+    maxScan(val: number): Query<T>;
+    merge(source: Query<T>): Query<T>;
+    merge(source: Object): Query<T>;
+    mod(val: number[]): Query<T>;
+    mod(path: string, val: number[]): Query<T>;
+    ne(val: any): Query<T>;
+    ne(path: string, val: any): Query<T>;
+    near(val: Object): Query<T>;
+    near(path: string, val: Object): Query<T>;
+    nearSphere(val: Object): Query<T>;
+    nearSphere(path: string, val: Object): Query<T>;
+    nin(val: any[]): Query<T>;
+    nin(path: string, val: any[]): Query<T>;
+    nor(array: Object[]): Query<T>;
+    or(array: Object[]): Query<T>;
+    polygon(...coordinatePairs: number[][]): Query<T>;
+    polygon(path: string, ...coordinatePairs: number[][]): Query<T>;
+    populate(path: string, select?: string, match?: Object, options?: Object): Query<T>;
+    populate(path: string, select: string, model: string, match?: Object, options?: Object): Query<T>;
+    populate(opt: PopulateOption): Query<T>;
+    read(pref: string, tags?: Object[]): Query<T>;
+    regex(val: RegExp): Query<T>;
+    regex(path: string, val: RegExp): Query<T>;
+    remove(callback?: (err: any, res: T) => void): Query<T>;
+    remove(criteria: Object, callback?: (err: any, res: T) => void): Query<T>;
+    select(arg: string): Query<T>;
+    select(arg: Object): Query<T>;
+    setOptions(options: Object): Query<T>;
+    size(val: number): Query<T>;
+    size(path: string, val: number): Query<T>;
+    skip(val: number): Query<T>;
+    slaveOk(v?: boolean): Query<T>;
+    slice(val: number): Query<T>;
+    slice(val: number[]): Query<T>;
+    slice(path: string, val: number): Query<T>;
+    slice(path: string, val: number[]): Query<T>;
+    snapshot(v?: boolean): Query<T>;
+    sort(arg: Object): Query<T>;
+    sort(arg: string): Query<T>;
+    stream(options?: { transform?: Function; }): QueryStream;
+    tailable(v?: boolean): Query<T>;
+    toConstructor(): Query<T>;
+    update(callback?: (err: any, affectedRows: number, doc: T) => void): Query<T>;
+    update(doc: Object, callback?: (err: any, affectedRows: number, doc: T) => void): Query<T>;
+    update(criteria: Object, doc: Object, callback?: (err: any, affectedRows: number, doc: T) => void): Query<T>;
+    update(criteria: Object, doc: Object, options: Object, callback?: (err: any, affectedRows: number, doc: T) => void): Query<T>;
+    where(path?: string, val?: any): Query<T>;
+    where(path?: Object, val?: any): Query<T>;
+    within(val?: Object): Query<T>;
+    within(coordinate: number[], ...coordinatePairs: number[][]): Query<T>;
+
+    $where(argument: string): Query<T>;
+    $where(argument: Function): Query<T>;
+
+    static use$geoWithin: boolean;
+}
+
+export interface PopulateOption {
+    path: string;
+    select?: string;
+    model?: string;
+    match?: Object;
+    options?: Object;
+}
+
+export interface QueryStream extends NodeJS.EventEmitter {
+    destory(err?: any): void;
+    pause(): void;
+    resume(): void;
+    pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
+    paused: number;
+    readable: boolean;
+}
+
+export interface Document {
+    id?: string;
+    _id: any;
+
+    equals(doc: Document): boolean;
+    get(path: string, type?: new (...args: any[]) => any): any;
+    inspect(options?: Object): string;
+    invalidate(path: string, errorMsg: string, value: any): void;
+    invalidate(path: string, error: Error, value: any): void;
+    isDirectModified(path: string): boolean;
+    isInit(path: string): boolean;
+    isModified(path?: string): boolean;
+    isSelected(path: string): boolean;
+    markModified(path: string): void;
+    modifiedPaths(): string[];
+    populate<T>(callback?: (err: any, res: T) => void): Document;
+    populate<T>(path?: string, callback?: (err: any, res: T) => void): Document;
+    populate<T>(opt: PopulateOption, callback?: (err: any, res: T) => void): Document;
+    populated(path: string): any;
+    remove<T>(callback?: (err: any) => void): Query<T>;
+    save<T>(callback?: (err: any, res: T) => void): void;
+    set(path: string, val: any, type?: new (...args: any[]) => any, options?: Object): void;
+    set(path: string, val: any, options?: Object): void;
+    set(value: Object): void;
+    toJSON(options?: Object): Object;
+    toObject(options?: Object): Object;
+    toString(): string;
+    update<T>(doc: Object, options: Object, callback: (err: any, affectedRows: number, raw: any) => void): Query<T>;
+    validate(cb: (err: any) => void): void;
+
+    isNew: boolean;
+    errors: Object;
+    schema: Object;
+}
+
+
+export declare class Aggregate<T> {
+    constructor(...options: Object[]);
+
+    append(...options: Object[]): Aggregate<T>;
+    group(arg: Object): Aggregate<T>;
+    limit(num: number): Aggregate<T>;
+    match(arg: Object): Aggregate<T>;
+    near(parameters: Object): Aggregate<T>;
+    project(arg: string): Aggregate<T>;
+    project(arg: Object): Aggregate<T>;
+    select(filter: string): Aggregate<T>;
+    skip(num: number): Aggregate<T>;
+    sort(arg: string): Aggregate<T>;
+    sort(arg: Object): Aggregate<T>;
+    unwind(fiels: string, ...rest: string[]): Aggregate<T>;
+
+    exec(callback?: (err: any, result: T) => void): Promise<T>;
+    read(pref: string, ...tags: Object[]): Aggregate<T>;
+}
+
+export declare class Promise<T> {
+    constructor(fn?: (err: any, result: T) => void);
+
+    then<U>(onFulFill: (result: T) => void, onReject?: (err: any) => void): Promise<U>;
+    end(): void;
+
+    fulfill(result: T): Promise<T>;
+    reject(err: any): Promise<T>;
+    resolve(err: any, result: T): Promise<T>;
+
+    onFulfill(listener: (result: T) => void): Promise<T>;
+    onReject(listener: (err: any) => void): Promise<T>;
+    onResolve(listener: (err: any, result: T) => void): Promise<T>;
+    on(event: string, listener: Function): Promise<T>;
+
+    // Deprecated methods.
+    addBack(listener: (err: any, result: T) => void): Promise<T>;
+    addCallback(listener: (result: T) => void): Promise<T>;
+    addErrback(listener: (err: any) => void): Promise<T>;
+    complete(result: T): Promise<T>;
+    error(err: any): Promise<T>;
+}
diff --git a/mongoose/mongoose-tests.ts b/mongoose/mongoose-tests.ts
index 0df6b6216d..c9878dd398 100644
--- a/mongoose/mongoose-tests.ts
+++ b/mongoose/mongoose-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="mongoose.d.ts" />
 
 var fs = require('fs');
 import mongoose = require('mongoose');
diff --git a/mongoose/mongoose.d.ts b/mongoose/mongoose.d.ts
deleted file mode 100644
index 7041acd282..0000000000
--- a/mongoose/mongoose.d.ts
+++ /dev/null
@@ -1,503 +0,0 @@
-// Type definitions for Mongoose 3.8.5
-// Project: http://mongoosejs.com/
-// Definitions by: horiuchi <https://github.com/horiuchi/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../node/node.d.ts" />
-
-declare module "mongoose" {
-  function connect(uri: string, options?: ConnectionOptions , callback?: (err: any) => void): Mongoose;
-  function createConnection(): Connection;
-  function createConnection(uri: string, options?: ConnectionOptions): Connection;
-  function createConnection(host: string, database_name: string, port?: number, options?: ConnectionOptions): Connection;
-  function disconnect(callback?: (err?: any) => void): Mongoose;
-
-  function model<T extends Document>(name: string, schema?: Schema, collection?: string, skipInit?: boolean): Model<T>;
-  function modelNames(): string[];
-  function plugin(plugin: (schema: Schema, options?: Object) => void, options?: Object): Mongoose;
-
-  function get(key: string): any;
-  function set(key: string, value: any): void;
-
-  var mongo: any;
-  var mquery: any;
-  var version: string;
-  var connection: Connection;
-
-  export class Mongoose {
-    connect(uri: string, options?: ConnectOpenOptionsBase, callback?: (err: any) => void): Mongoose;
-    createConnection(): Connection;
-    createConnection(uri: string, options?: Object): Connection;
-    createConnection(host: string, database_name: string, port?: number, options?: ConnectOpenOptionsBase): Connection;
-    disconnect(callback?: (err?: any) => void): Mongoose;
-    get(key: string): any;
-    model<T extends Document>(name: string, schema?: Schema, collection?: string, skipInit?: boolean): Model<T>;
-    modelNames(): string[];
-    plugin(plugin: (schema: Schema, options?: Object) => void, options?: Object): Mongoose;
-    set(key: string, value: any): void;
-
-    mongo: any;
-    mquery: any;
-    version: string;
-    connection: Connection;
-  }
-
-  export interface Connection extends NodeJS.EventEmitter {
-    constructor(base: Mongoose): Connection;
-
-    close(callback?: (err: any) => void): Connection;
-    collection(name: string, options?: Object): Collection;
-    model<T extends Document>(name: string, schema?: Schema, collection?: string): Model<T>;
-    modelNames(): string[];
-    open(host: string, database?: string, port?: number, options?: OpenSetConnectionOptions, callback?: (err: any) => void): Connection;
-    openSet(uris: string, database?: string, options?: OpenSetConnectionOptions, callback?: (err: any) => void): Connection;
-
-    db: any;
-    collections: {[index: string]: Collection};
-    readyState: number;
-  }
-
-  export interface ConnectOpenOptionsBase {
-    db?: any;
-    server?: any;
-    replset?: any;
-    /** Username for authentication if not supplied in the URI. */
-    user?: string;
-    /** Password for authentication if not supplied in the URI. */
-    pass?: string;
-    /** Options for authentication */
-    auth?: any;
-  }
-
-  export interface ConnectionOptions extends ConnectOpenOptionsBase {
-    /** Passed to the underlying driver's Mongos instance. */
-    mongos?: MongosOptions;
-  }
-
-  interface OpenSetConnectionOptions extends ConnectOpenOptionsBase {
-      /** If true, enables High Availability support for mongos */
-      mongos?: boolean;
-  }
-
-  interface MongosOptions {
-      /** Turn on high availability monitoring. (default: true) */
-      ha?: boolean;
-      /** Time between each replicaset status check. (default: 5000) */
-      haInterval?: number;
-      /**
-       * Number of connections in the connection pool for each
-       * server instance. (default: 5 (for legacy reasons)) */
-      poolSize?: number;
-      /**
-       * Use ssl connection (needs to have a mongod server with
-       * ssl support). (default: false).
-       */
-      ssl?: boolean;
-      /**
-       * Validate mongod server certificate against ca
-       * (needs to have a mongod server with ssl support, 2.4 or higher)
-       * (default: true)
-       */
-      sslValidate?: boolean;
-      /** Turn on high availability monitoring. */
-      sslCA?: (Buffer|string)[];
-      sslKey?: Buffer|string;
-      sslPass?: Buffer|string;
-      socketOptions?: {
-          noDelay?: boolean;
-          keepAlive?: number;
-          connectionTimeoutMS?: number;
-          socketTimeoutMS?: number;
-      };
-  }
-
-  export interface Collection {
-  }
-
-
-  export class SchemaType { }
-  export class VirtualType {
-    get(fn: Function): VirtualType;
-    set(fn: Function): VirtualType;
-  }
-  export module Types {
-    export class ObjectId {
-      constructor(id?: string|number);
-      toHexString(): string;
-      equals(other: ObjectId): boolean;
-      getTimestamp(): Date;
-      isValid(): boolean;
-      static createFromTime(time: number): ObjectId;
-      static createFromHexString(hexString: string): ObjectId;
-    }
-  }
-
-  export class Schema {
-    static Types: {
-      String: String;
-      ObjectId: Types.ObjectId;
-      OId: Types.ObjectId;
-      Mixed: any;
-    };
-    constructor(schema?: Object, options?: Object);
-
-    add(obj: Object, prefix?: string): void;
-    eachPath(fn: (path: string, type: any) => void): Schema;
-    get(key: string): any;
-    index(fields: Object, options?: Object): Schema;
-    indexes(): void;
-    method(name: string, fn: Function): Schema;
-    method(method: Object): Schema;
-    path(path: string): any;
-    path(path: string, constructor: any): Schema;
-    pathType(path: string): string;
-    plugin(plugin: (schema: Schema, options?: Object) => void, options?: Object): Schema;
-    post(method: string, fn: Function): Schema;
-    pre(method: string, callback: Function): Schema;
-    requiredPaths(): string[];
-    set(key: string, value: any): void;
-    static(name: string, fn: Function): Schema;
-    virtual(name: string, options?: Object): VirtualType;
-    virtualpath(name: string): VirtualType;
-  }
-  export interface SchemaOption {
-    autoIndex?: boolean;
-    bufferCommands?: boolean;
-    capped?: boolean;
-    collection?: string;
-    id?: boolean;
-    _id?: boolean;
-    minimize?: boolean;
-    read?: string;
-    safe?: boolean;
-    shardKey?: boolean;
-    strict?: boolean;
-    toJSON?: Object;
-    toObject?: Object;
-    versionKey?: boolean;
-  }
-
-  export interface Model<T extends Document> extends NodeJS.EventEmitter {
-    new(doc?: Object, fields?: Object, skipInit?: boolean): T;
-
-    aggregate(...aggregations: Object[]): Aggregate<T[]>;
-    aggregate(aggregation: Object, callback: (err: any, res: T[]) => void): Promise<T[]>;
-    aggregate(aggregation1: Object, aggregation2: Object, callback: (err: any, res: T[]) => void): Promise<T[]>;
-    aggregate(aggregation1: Object, aggregation2: Object, aggregation3: Object, callback: (err: any, res: T[]) => void): Promise<T[]>;
-    count(conditions: Object, callback?: (err: any, count: number) => void): Query<number>;
-
-    create(doc: Object, fn?: (err: any, res: T) => void): Promise<T>;
-    create(doc1: Object, doc2: Object, fn?: (err: any, res1: T, res2: T) => void): Promise<T[]>;
-    create(doc1: Object, doc2: Object, doc3: Object, fn?: (err: any, res1: T, res2: T, res3: T) => void): Promise<T[]>;
-    discriminator<U extends Document>(name: string, schema: Schema): Model<U>;
-    distinct(field: string, callback?: (err: any, res: T[]) => void): Query<T[]>;
-    distinct(field: string, conditions: Object, callback?: (err: any, res: T[]) => void): Query<T[]>;
-    ensureIndexes(callback: (err: any) => void): Promise<T>;
-
-    find(cond: Object, callback?: (err: any, res: T[]) => void): Query<T[]>;
-    find(cond: Object, fields: Object, callback?: (err: any, res: T[]) => void): Query<T[]>;
-    find(cond: Object, fields: Object, options: Object, callback?: (err: any, res: T[]) => void): Query<T[]>;
-    findById(id: string, callback?: (err: any, res: T) => void): Query<T>;
-    findById(id: string, fields: Object, callback?: (err: any, res: T) => void): Query<T>;
-    findById(id: string, fields: Object, options: Object, callback?: (err: any, res: T) => void): Query<T>;
-    findByIdAndRemove(id: string, callback?: (err: any, res: T) => void): Query<T>;
-    findByIdAndRemove(id: string, options: Object, callback?: (err: any, res: T) => void): Query<T>;
-    findByIdAndUpdate(id: string, update: Object, callback?: (err: any, res: T) => void): Query<T>;
-    findByIdAndUpdate(id: string, update: Object, options: FindAndUpdateOption, callback?: (err: any, res: T) => void): Query<T>;
-    findOne(cond?: Object, callback?: (err: any, res: T) => void): Query<T>;
-    findOne(cond: Object, fields: Object, callback?: (err: any, res: T) => void): Query<T>;
-    findOne(cond: Object, fields: Object, options: Object, callback?: (err: any, res: T) => void): Query<T>;
-    findOneAndRemove(cond: Object, callback?: (err: any, res: T) => void): Query<T>;
-    findOneAndRemove(cond: Object, options: Object, callback?: (err: any, res: T) => void): Query<T>;
-    findOneAndUpdate(cond: Object, update: Object, callback?: (err: any, res: T) => void): Query<T>;
-    findOneAndUpdate(cond: Object, update: Object, options: FindAndUpdateOption, callback?: (err: any, res: T) => void): Query<T>;
-
-    geoNear(point: { type: string; coordinates: number[] }, options: Object, callback?: (err: any, res: T[], stats: any) => void): Query<T[]>;
-    geoNear(point: number[], options: Object, callback?: (err: any, res: T[], stats: any) => void): Query<T[]>;
-    geoSearch(cond: Object, options: GeoSearchOption, callback?: (err: any, res: T[]) => void): Query<T[]>;
-    increment(): T;
-    mapReduce<K, V>(options: MapReduceOption<T, K, V>, callback?: (err: any, res: MapReduceResult<K, V>[]) => void): Promise<MapReduceResult<K, V>[]>;
-    mapReduce<K, V>(options: MapReduceOption2<T, K, V>, callback?: (err: any, res: MapReduceResult<K, V>[]) => void): Promise<MapReduceResult<K, V>[]>;
-    model<U extends Document>(name: string): Model<U>;
-
-    populate<U>(doc: U, options: Object, callback?: (err: any, res: U) => void): Promise<U>;
-    populate<U>(doc: U[], options: Object, callback?: (err: any, res: U[]) => void): Promise<U[]>;
-    update(cond: Object, update: Object, callback?: (err: any, affectedRows: number, raw: any) => void): Query<T>;
-    update(cond: Object, update: Object, options: Object, callback?: (err: any, affectedRows: number, raw: any) => void): Query<T>;
-    remove(cond: Object, callback?: (err: any) => void): Query<{}>;
-    save(callback?: (err: any, result: T, numberAffected: number) => void): Query<T>;
-    where(path: string, val?: Object): Query<T[]>;
-
-    $where(argument: string): Query<T>;
-    $where(argument: Function): Query<T>;
-
-    base: Mongoose;
-    collection: Collection;
-    db: any;
-    discriminators: any;
-    modelName: string;
-    schema: Schema;
-  }
-  export interface FindAndUpdateOption {
-    new?: boolean;
-    upsert?: boolean;
-    sort?: Object;
-    select?: Object;
-  }
-  export interface GeoSearchOption {
-    near: number[];
-    maxDistance: number;
-    limit?: number;
-    lean?: boolean;
-  }
-  export interface MapReduceOption<T extends Document, Key, Val> {
-    map: () => void;
-    reduce: (key: Key, vals: T[]) => Val;
-    query?: Object;
-    limit?: number;
-    keeptemp?: boolean;
-    finalize?: (key: Key, val: Val) => Val;
-    scope?: Object;
-    jsMode?: boolean;
-    verbose?: boolean;
-    out?: {
-      inline?: number;
-      replace?: string;
-      reduce?: string;
-      merge?: string;
-    };
-  }
-  export interface MapReduceOption2<T extends Document, Key, Val> {
-    map: string;
-    reduce: (key: Key, vals: T[]) => Val;
-    query?: Object;
-    limit?: number;
-    keeptemp?: boolean;
-    finalize?: (key: Key, val: Val) => Val;
-    scope?: Object;
-    jsMode?: boolean;
-    verbose?: boolean;
-    out?: {
-      inline?: number;
-      replace?: string;
-      reduce?: string;
-      merge?: string;
-    };
-  }
-  export interface MapReduceResult<Key, Val> {
-    _id: Key;
-    value: Val;
-  }
-
-  export class Query<T> {
-    exec(callback?: (err: any, res: T) => void): Promise<T>;
-    exec(operation: string, callback?: (err: any, res: T) => void): Promise<T>;
-    exec(operation: Function, callback?: (err: any, res: T) => void): Promise<T>;
-
-    all(val: number): Query<T>;
-    all(path: string, val: number): Query<T>;
-    and(array: Object[]): Query<T>;
-    box(val: Object): Query<T>;
-    box(a: number[], b: number[]): Query<T>;
-    batchSize(val: number): Query<T>;
-    cast<U extends Document>(model: Model<U>, obj: Object): U;
-    //center(): Query<T>;
-    //centerSphere(path: string, val: Object): Query<T>;
-    circle(area: Object): Query<T>;
-    circle(path: string, area: Object): Query<T>;
-    comment(val: any): Query<T>;
-    count(callback?: (err: any, count: number) => void): Query<T>;
-    count(criteria: Object, callback?: (err: any, count: number) => void): Query<T>;
-    distinct(callback?: (err: any, res: T) => void): Query<T>;
-    distinct(field: string, callback?: (err: any, res: T) => void): Query<T>;
-    distinct(criteria: Object, field: string, callback?: (err: any, res: T) => void): Query<T>;
-    distinct(criteria: Query<T>, field: string, callback?: (err: any, res: T) => void): Query<T>;
-    elemMatch(criteria: Object): Query<T>;
-    elemMatch(criteria: (elem: Query<T>) => void): Query<T>;
-    elemMatch(path: string, criteria: Object): Query<T>;
-    elemMatch(path: string, criteria: (elem: Query<T>) => void): Query<T>;
-    equals(val: Object): Query<T>;
-    exists(val?: boolean): Query<T>;
-    exists(path: string, val?: boolean): Query<T>;
-    find(callback?: (err: any, res: T) => void): Query<T>;
-    find(criteria: Object, callback?: (err: any, res: T) => void): Query<T>;
-    findOne(callback?: (err: any, res: T) => void): Query<T>;
-    findOne(criteria: Object, callback?: (err: any, res: T) => void): Query<T>;
-    findOneAndRemove(callback?: (err: any, res: T) => void): Query<T>;
-    findOneAndRemove(cond: Object, callback?: (err: any, res: T) => void): Query<T>;
-    findOneAndRemove(cond: Object, options: Object, callback?: (err: any, res: T) => void): Query<T>;
-    findOneAndUpdate(callback?: (err: any, res: T) => void): Query<T>;
-    findOneAndUpdate(update: Object, callback?: (err: any, res: T) => void): Query<T>;
-    findOneAndUpdate(cond: Object, update: Object, callback?: (err: any, res: T) => void): Query<T>;
-    findOneAndUpdate(cond: Object, update: Object, options: FindAndUpdateOption, callback?: (err: any, res: T) => void): Query<T>;
-    geometry(object: Object): Query<T>;
-    gt(val: number): Query<T>;
-    gt(path: string, val: number): Query<T>;
-    gte(val: number): Query<T>;
-    gte(path: string, val: number): Query<T>;
-    hint(val: Object): Query<T>;
-    in(val: any[]): Query<T>;
-    in(path: string, val: any[]): Query<T>;
-    intersects(arg?: Object): Query<T>;
-    lean(bool?: boolean): Query<T>;
-    limit(val: number): Query<T>;
-    lt(val: number): Query<T>;
-    lt(path: string, val: number): Query<T>;
-    lte(val: number): Query<T>;
-    lte(path: string, val: number): Query<T>;
-    maxDistance(val: number): Query<T>;
-    maxDistance(path: string, val: number): Query<T>;
-    maxScan(val: number): Query<T>;
-    merge(source: Query<T>): Query<T>;
-    merge(source: Object): Query<T>;
-    mod(val: number[]): Query<T>;
-    mod(path: string, val: number[]): Query<T>;
-    ne(val: any): Query<T>;
-    ne(path: string, val: any): Query<T>;
-    near(val: Object): Query<T>;
-    near(path: string, val: Object): Query<T>;
-    nearSphere(val: Object): Query<T>;
-    nearSphere(path: string, val: Object): Query<T>;
-    nin(val: any[]): Query<T>;
-    nin(path: string, val: any[]): Query<T>;
-    nor(array: Object[]): Query<T>;
-    or(array: Object[]): Query<T>;
-    polygon(...coordinatePairs: number[][]): Query<T>;
-    polygon(path: string, ...coordinatePairs: number[][]): Query<T>;
-    populate(path: string, select?: string, match?: Object, options?: Object): Query<T>;
-    populate(path: string, select: string, model: string, match?: Object, options?: Object): Query<T>;
-    populate(opt: PopulateOption): Query<T>;
-    read(pref: string, tags?: Object[]): Query<T>;
-    regex(val: RegExp): Query<T>;
-    regex(path: string, val: RegExp): Query<T>;
-    remove(callback?: (err: any, res: T) => void): Query<T>;
-    remove(criteria: Object, callback?: (err: any, res: T) => void): Query<T>;
-    select(arg: string): Query<T>;
-    select(arg: Object): Query<T>;
-    setOptions(options: Object): Query<T>;
-    size(val: number): Query<T>;
-    size(path: string, val: number): Query<T>;
-    skip(val: number): Query<T>;
-    slaveOk(v?: boolean): Query<T>;
-    slice(val: number): Query<T>;
-    slice(val: number[]): Query<T>;
-    slice(path: string, val: number): Query<T>;
-    slice(path: string, val: number[]): Query<T>;
-    snapshot(v?: boolean): Query<T>;
-    sort(arg: Object): Query<T>;
-    sort(arg: string): Query<T>;
-    stream(options?: { transform?: Function; }): QueryStream;
-    tailable(v?: boolean): Query<T>;
-    toConstructor(): Query<T>;
-    update(callback?: (err: any, affectedRows: number, doc: T) => void): Query<T>;
-    update(doc: Object, callback?: (err: any, affectedRows: number, doc: T) => void): Query<T>;
-    update(criteria: Object, doc: Object, callback?: (err: any, affectedRows: number, doc: T) => void): Query<T>;
-    update(criteria: Object, doc: Object, options: Object, callback?: (err: any, affectedRows: number, doc: T) => void): Query<T>;
-    where(path?: string, val?: any): Query<T>;
-    where(path?: Object, val?: any): Query<T>;
-    within(val?: Object): Query<T>;
-    within(coordinate: number[], ...coordinatePairs: number[][]): Query<T>;
-
-    $where(argument: string): Query<T>;
-    $where(argument: Function): Query<T>;
-
-    static use$geoWithin: boolean;
-  }
-
-  export interface PopulateOption {
-    path: string;
-    select?: string;
-    model?: string;
-    match?: Object;
-    options?: Object;
-  }
-
-  export interface QueryStream extends NodeJS.EventEmitter {
-    destory(err?: any): void;
-    pause(): void;
-    resume(): void;
-    pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
-    paused: number;
-    readable: boolean;
-  }
-
-  export interface Document {
-    id?: string;
-    _id: any;
-
-    equals(doc: Document): boolean;
-    get(path: string, type?: new(...args: any[]) => any): any;
-    inspect(options?: Object): string;
-    invalidate(path: string, errorMsg: string, value: any): void;
-    invalidate(path: string, error: Error, value: any): void;
-    isDirectModified(path: string): boolean;
-    isInit(path: string): boolean;
-    isModified(path?: string): boolean;
-    isSelected(path: string): boolean;
-    markModified(path: string): void;
-    modifiedPaths(): string[];
-    populate<T>(callback?: (err: any, res: T) => void): Document;
-    populate<T>(path?: string, callback?: (err: any, res: T) => void): Document;
-    populate<T>(opt: PopulateOption, callback?: (err: any, res: T) => void): Document;
-    populated(path: string): any;
-    remove<T>(callback?: (err: any) => void): Query<T>;
-    save<T>(callback?: (err: any, res: T) => void): void;
-    set(path: string, val: any, type?: new(...args: any[]) => any, options?: Object): void;
-    set(path: string, val: any, options?: Object): void;
-    set(value: Object): void;
-    toJSON(options?: Object): Object;
-    toObject(options?: Object): Object;
-    toString(): string;
-    update<T>(doc: Object, options: Object, callback: (err: any, affectedRows: number, raw: any) => void): Query<T>;
-    validate(cb: (err: any) => void): void;
-
-    isNew: boolean;
-    errors: Object;
-    schema: Object;
-  }
-
-
-  export class Aggregate<T> {
-    constructor(...options: Object[]);
-
-    append(...options: Object[]): Aggregate<T>;
-    group(arg: Object): Aggregate<T>;
-    limit(num: number): Aggregate<T>;
-    match(arg: Object): Aggregate<T>;
-    near(parameters: Object): Aggregate<T>;
-    project(arg: string): Aggregate<T>;
-    project(arg: Object): Aggregate<T>;
-    select(filter: string): Aggregate<T>;
-    skip(num: number): Aggregate<T>;
-    sort(arg: string): Aggregate<T>;
-    sort(arg: Object): Aggregate<T>;
-    unwind(fiels: string, ...rest: string[]): Aggregate<T>;
-
-    exec(callback?: (err: any, result: T) => void): Promise<T>;
-    read(pref: string, ...tags: Object[]): Aggregate<T>;
-  }
-
-  export class Promise<T> {
-    constructor(fn?: (err: any, result: T) => void);
-
-    then<U>(onFulFill: (result: T) => void, onReject?: (err: any) => void): Promise<U>;
-    end(): void;
-
-    fulfill(result: T): Promise<T>;
-    reject(err: any): Promise<T>;
-    resolve(err: any, result: T): Promise<T>;
-
-    onFulfill(listener: (result: T) => void): Promise<T>;
-    onReject(listener: (err: any) => void): Promise<T>;
-    onResolve(listener: (err: any, result: T) => void): Promise<T>;
-    on(event: string, listener: Function): Promise<T>;
-
-    // Deprecated methods.
-    addBack(listener: (err: any, result: T) => void): Promise<T>;
-    addCallback(listener: (result: T) => void): Promise<T>;
-    addErrback(listener: (err: any) => void): Promise<T>;
-    complete(result: T): Promise<T>;
-    error(err: any): Promise<T>;
-  }
-
-}
diff --git a/mongoose/tsconfig.json b/mongoose/tsconfig.json
new file mode 100644
index 0000000000..7644d40f82
--- /dev/null
+++ b/mongoose/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mongoose-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/morgan/index.d.ts b/morgan/index.d.ts
new file mode 100644
index 0000000000..b8e56ae6be
--- /dev/null
+++ b/morgan/index.d.ts
@@ -0,0 +1,99 @@
+// Type definitions for morgan 1.2.2
+// Project: https://github.com/expressjs/morgan
+// Definitions by: James Roland Cabresos <https://github.com/staticfunction>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+
+import express = require('express');
+
+declare namespace morgan {
+
+    export function token<T>(name: string, callback: (req: express.Request, res: express.Response) => T): express.RequestHandler;
+
+    export interface StreamOptions {
+        /**
+         * Output stream for writing log lines
+         */
+        write: (str: string) => void;
+    }
+
+    /***
+     * Morgan accepts these properties in the options object.
+     */
+    export interface Options {
+
+        /***
+         * Buffer duration before writing logs to the stream, defaults to false. When set to true, defaults to 1000 ms.
+         */
+        buffer?: boolean;
+
+        /***
+         * Write log line on request instead of response. This means that a requests will be logged even if the server crashes, but data from the response cannot be logged (like the response code).
+         */
+        immediate?: boolean;
+
+        /***
+         * Function to determine if logging is skipped, defaults to false. This function will be called as skip(req, res).
+         */
+        skip?: (req: express.Request, res: express.Response) => boolean;
+
+        /***
+         * Output stream for writing log lines, defaults to process.stdout.
+         * @param str
+         */
+        stream?: StreamOptions;
+    }
+}
+
+/***
+ * Create a new morgan logger middleware function using the given format and options. The format argument may be a string of a predefined name (see below for the names), a string of a format string, or a function that will produce a log entry.
+ * @param format
+ * @param options
+ */
+declare function morgan(format: string, options?: morgan.Options): express.RequestHandler;
+
+/***
+ * Standard Apache combined log output.
+ * :remote-addr - :remote-user [:date] ":method :url HTTP/:http-version" :status :res[content-length] ":referrer" ":user-agent"
+ * @param format
+ * @param options
+ */
+declare function morgan(format: 'combined', options?: morgan.Options): express.RequestHandler;
+
+/***
+ * Standard Apache common log output.
+ * :remote-addr - :remote-user [:date] ":method :url HTTP/:http-version" :status :res[content-length]
+ * @param format
+ * @param options
+ */
+declare function morgan(format: 'common', options?: morgan.Options): express.RequestHandler;
+
+/***
+ * Concise output colored by response status for development use. The :status token will be colored red for server error codes, yellow for client error codes, cyan for redirection codes, and uncolored for all other codes.
+ * :method :url :status :response-time ms - :res[content-length]
+ * @param format
+ * @param options
+ */
+declare function morgan(format: 'dev', options?: morgan.Options): express.RequestHandler;
+
+/***
+ * Shorter than default, also including response time.
+ * :remote-addr :remote-user :method :url HTTP/:http-version :status :res[content-length] - :response-time ms
+ * @param format
+ * @param options
+ */
+declare function morgan(format: 'short', options?: morgan.Options): express.RequestHandler;
+
+/***
+ * The minimal output.
+ * :method :url :status :res[content-length] - :response-time ms
+ * @param format
+ * @param options
+ */
+declare function morgan(format: 'tiny', options?: morgan.Options): express.RequestHandler;
+
+declare function morgan(custom: (req: express.Request, res: express.Response) => string): express.RequestHandler
+
+export = morgan;
diff --git a/morgan/morgan-tests.ts b/morgan/morgan-tests.ts
index 4a0df99024..6c88cdfb7b 100644
--- a/morgan/morgan-tests.ts
+++ b/morgan/morgan-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="morgan.d.ts"/>
 /**
  * Created by staticfunction on 8/3/14.
  */
diff --git a/morgan/morgan.d.ts b/morgan/morgan.d.ts
deleted file mode 100644
index bf1e840956..0000000000
--- a/morgan/morgan.d.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-// Type definitions for morgan 1.2.2
-// Project: https://github.com/expressjs/morgan
-// Definitions by: James Roland Cabresos <https://github.com/staticfunction>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-declare module "morgan" {
-
-    import express = require('express');
-
-    namespace morgan {
-
-        export function token<T>(name: string, callback: (req: express.Request, res: express.Response) => T): express.RequestHandler;
-
-        export interface StreamOptions {
-            /**
-             * Output stream for writing log lines
-             */
-            write: (str: string) => void;
-        }
-
-        /***
-         * Morgan accepts these properties in the options object.
-         */
-        export interface Options {
-
-            /***
-             * Buffer duration before writing logs to the stream, defaults to false. When set to true, defaults to 1000 ms.
-             */
-            buffer?: boolean;
-
-            /***
-             * Write log line on request instead of response. This means that a requests will be logged even if the server crashes, but data from the response cannot be logged (like the response code).
-             */
-            immediate?: boolean;
-
-            /***
-             * Function to determine if logging is skipped, defaults to false. This function will be called as skip(req, res).
-             */
-            skip?: (req: express.Request, res: express.Response) => boolean;
-
-            /***
-             * Output stream for writing log lines, defaults to process.stdout.
-             * @param str
-             */
-            stream?: StreamOptions;
-        }
-    }
-
-    /***
-     * Create a new morgan logger middleware function using the given format and options. The format argument may be a string of a predefined name (see below for the names), a string of a format string, or a function that will produce a log entry.
-     * @param format
-     * @param options
-     */
-    function morgan(format: string, options?: morgan.Options): express.RequestHandler;
-
-    /***
-     * Standard Apache combined log output.
-     * :remote-addr - :remote-user [:date] ":method :url HTTP/:http-version" :status :res[content-length] ":referrer" ":user-agent"
-     * @param format
-     * @param options
-     */
-    function morgan(format: 'combined', options?: morgan.Options): express.RequestHandler;
-
-    /***
-     * Standard Apache common log output.
-     * :remote-addr - :remote-user [:date] ":method :url HTTP/:http-version" :status :res[content-length]
-     * @param format
-     * @param options
-     */
-    function morgan(format: 'common', options?: morgan.Options): express.RequestHandler;
-
-    /***
-     * Concise output colored by response status for development use. The :status token will be colored red for server error codes, yellow for client error codes, cyan for redirection codes, and uncolored for all other codes.
-     * :method :url :status :response-time ms - :res[content-length]
-     * @param format
-     * @param options
-     */
-    function morgan(format: 'dev', options?: morgan.Options): express.RequestHandler;
-
-    /***
-     * Shorter than default, also including response time.
-     * :remote-addr :remote-user :method :url HTTP/:http-version :status :res[content-length] - :response-time ms
-     * @param format
-     * @param options
-     */
-    function morgan(format: 'short', options?: morgan.Options): express.RequestHandler;
-
-    /***
-     * The minimal output.
-     * :method :url :status :res[content-length] - :response-time ms
-     * @param format
-     * @param options
-     */
-    function morgan(format: 'tiny', options?: morgan.Options): express.RequestHandler;
-
-    function morgan(custom: (req: express.Request, res: express.Response) => string): express.RequestHandler
-
-    export = morgan;
-}
diff --git a/morgan/tsconfig.json b/morgan/tsconfig.json
new file mode 100644
index 0000000000..b5df1ff724
--- /dev/null
+++ b/morgan/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "morgan-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mousetrap/mousetrap.d.ts b/mousetrap/index.d.ts
similarity index 100%
rename from mousetrap/mousetrap.d.ts
rename to mousetrap/index.d.ts
diff --git a/mousetrap/mousetrap-global-bind.d.ts b/mousetrap/mousetrap-global-bind.d.ts
index c27a1f58f7..1fc9418e45 100644
--- a/mousetrap/mousetrap-global-bind.d.ts
+++ b/mousetrap/mousetrap-global-bind.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Andrew Bradley <https://github.com/cspotcode>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./mousetrap.d.ts" />
+
 
 interface MousetrapStatic {
     bindGlobal(keys: string, callback: (e: ExtendedKeyboardEvent, combo: string) => any, action?: string): void;
diff --git a/mousetrap/mousetrap-tests.ts b/mousetrap/mousetrap-tests.ts
index ab8b858d34..8395b71067 100644
--- a/mousetrap/mousetrap-tests.ts
+++ b/mousetrap/mousetrap-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="mousetrap.d.ts"/>
+/// <reference types="jquery"/>
 
 Mousetrap.bind('4', function() { console.log('4'); });
 Mousetrap.bind("?", function() { console.log('show shortcuts!'); });
diff --git a/mousetrap/tsconfig.json b/mousetrap/tsconfig.json
new file mode 100644
index 0000000000..42d6b16bbf
--- /dev/null
+++ b/mousetrap/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mousetrap-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/moviedb/index.d.ts b/moviedb/index.d.ts
new file mode 100644
index 0000000000..f7e7c3558c
--- /dev/null
+++ b/moviedb/index.d.ts
@@ -0,0 +1,92 @@
+// Type definitions for MovieDB
+// Project: https://github.com/danzajdband/moviedb
+// Definitions by: Basarat Ali Syed <https://github.com/basarat>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Ghost module for Types
+declare namespace MovieDB {
+    export interface IMovieDB {
+        searchMovie(params: SearchOptions, callback: (err: any, movies: SearchResults) => void): void;
+        movieInfo(options: InfoOptions, callback: (err: any, curMovie: Movie) => void): void;
+
+        // More methods TBD:
+        // https://github.com/danzajdband/moviedb#available-methods
+    }
+
+    export interface SearchOptions {
+        query: string;
+    }
+
+    export interface InfoOptions {
+        id: number;
+    }
+
+    export interface SearchResults {
+        page: number;
+        results: SearchResult[];
+        total_Pages: number;
+        total_results: number;
+    }
+
+    export interface SearchResult {
+        adult: boolean;
+        backdrop_path: string;
+        id: number;
+        original_title: string;
+        release_date: Date;
+        poster_path: string;
+        popularity: number;
+        title: string;
+        vote_average: number;
+        vote_count: number;
+    }
+
+    export interface Movie {
+        adult: boolean;
+        backdrop_path: string;
+        belongs_to_collection: any;
+        budget: number;
+        genres: Genre[];
+        homepage: string;
+        id: number;
+        imdb_id: number;
+        original_title: string;
+        overview: string;
+        popularity: number;
+        poster_path: string;
+        production_companies: ProductionCompany[];
+        production_countries: ProductionCountry[];
+        release_date: Date;
+        revenue: number;
+        runtime: number;
+        spoken_languages: SpokenLanguage[];
+        status: string;
+        tagline: string;
+        title: string;
+        vote_average: number;
+        vote_count: number;
+    }
+
+    export interface Genre {
+        id: number;
+        name: string;
+    }
+
+    export interface ProductionCompany {
+        id: number;
+        name: string;
+    }
+
+    export interface ProductionCountry {
+        iso_3166_1: number;
+        name: string;
+    }
+
+    export interface SpokenLanguage {
+        iso_639_1: number;
+        name: string;
+    }
+}
+
+declare function apiKeyAcceptor(key: string): MovieDB.IMovieDB;
+export = apiKeyAcceptor;
diff --git a/moviedb/moviedb-tests.ts b/moviedb/moviedb-tests.ts
index 4e75b629c4..8bfea0bd18 100644
--- a/moviedb/moviedb-tests.ts
+++ b/moviedb/moviedb-tests.ts
@@ -1,23 +1,20 @@
-
-/// <reference path="./moviedb.d.ts"/>
-
 import moviedb = require('moviedb');
 
 export class TmbdMovieScanner {
-    movieDb: MovieDB.IMovieDB;
+    movieDb: any;
 
     constructor() {
         this.movieDb = moviedb('YOUR API KEY');
 
         // For testing purposes
-        this.movieDb.searchMovie({ query: "Aliens" }, (err, movies) => {
+        this.movieDb.searchMovie({ query: "Aliens" }, (err: any, movies: any) => {
             if (err) {
                 console.log('Error: ' + err);
                 return;
             }
             console.log(movies);            
         });
-        this.movieDb.movieInfo({ id: 666 }, (err, curMovie) => {
+        this.movieDb.movieInfo({ id: 666 }, (err: any, curMovie: any) => {
             if (err) {
                 console.log('Error: ' + err);
                 return;
diff --git a/moviedb/moviedb.d.ts b/moviedb/moviedb.d.ts
deleted file mode 100644
index 440641a2a8..0000000000
--- a/moviedb/moviedb.d.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-// Type definitions for MovieDB
-// Project: https://github.com/danzajdband/moviedb
-// Definitions by: Basarat Ali Syed <https://github.com/basarat>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Ghost module for Types
-declare namespace MovieDB {
-    export interface IMovieDB {
-        searchMovie(params: SearchOptions, callback: (err: any, movies: SearchResults) => void): void;
-        movieInfo(options: InfoOptions, callback: (err: any, curMovie: Movie) => void): void;
-
-        // More methods TBD:
-        // https://github.com/danzajdband/moviedb#available-methods
-    }
-
-    export interface SearchOptions {
-        query: string;
-    }
-
-    export interface InfoOptions {
-        id: number;
-    }
-
-    export interface SearchResults {
-        page: number;
-        results: SearchResult[];
-        total_Pages: number;
-        total_results: number;
-    }
-
-    export interface SearchResult {
-        adult: boolean;
-        backdrop_path: string;
-        id: number;
-        original_title: string;
-        release_date: Date;
-        poster_path: string;
-        popularity: number;
-        title: string;
-        vote_average: number;
-        vote_count: number;
-    }
-
-    export interface Movie {
-        adult: boolean;
-        backdrop_path: string;
-        belongs_to_collection: any;
-        budget: number;
-        genres: Genre[];
-        homepage: string;
-        id: number;
-        imdb_id: number;
-        original_title: string;
-        overview: string;
-        popularity: number;
-        poster_path: string;
-        production_companies: ProductionCompany[];
-        production_countries: ProductionCountry[];
-        release_date: Date;
-        revenue: number;
-        runtime: number;
-        spoken_languages: SpokenLanguage[];
-        status: string;
-        tagline: string;
-        title: string;
-        vote_average: number;
-        vote_count: number;
-    }
-
-    export interface Genre {
-        id: number;
-        name: string;
-    }
-
-    export interface ProductionCompany {
-        id: number;
-        name: string;
-    }
-
-    export interface ProductionCountry {
-        iso_3166_1: number;
-        name: string;
-    }
-
-    export interface SpokenLanguage {
-        iso_639_1: number;
-        name: string;
-    }
-}
-
-declare module 'moviedb' {
-    function apiKeyAcceptor(key: string): MovieDB.IMovieDB;
-    export = apiKeyAcceptor;
-}
diff --git a/moviedb/tsconfig.json b/moviedb/tsconfig.json
new file mode 100644
index 0000000000..99302f2ee2
--- /dev/null
+++ b/moviedb/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "moviedb-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mpromise/index.d.ts b/mpromise/index.d.ts
new file mode 100644
index 0000000000..d7ab105f19
--- /dev/null
+++ b/mpromise/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for mpromise 0.5.4
+// Project: https://github.com/aheckmann/mpromise
+// Definitions by: Seulgi Kim <https://github.com/sgkim126/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface IFulfillFunction<F> {
+    (...args: F[]): void;
+    (arg: F): void;
+}
+interface IRejectFunction<R> {
+    (err: R): void;
+}
+interface IResolveFunction<F, R> {
+    (err: R, ...args: F[]): void;
+    (err: R, arg: F): void;
+}
+
+declare class Promise<F, R> {
+    constructor(fn?: IResolveFunction<F, R>);
+
+    static FAILURE: string;
+    static SUCCESS: string;
+
+    fulfill(...args: F[]): Promise<F, R>;
+    fulfill(arg: F): Promise<F, R>;
+    reject(reason: R): Promise<F, R>;
+    resolve(reason: R, ...args: F[]): Promise<F, R>;
+    resolve(reason: R, arg: F): Promise<F, R>;
+
+    onFulfill(callback: IFulfillFunction<F>): Promise<F, R>;
+    onReject(callback: IRejectFunction<R>): Promise<F, R>;
+    onResolve(callback: IResolveFunction<F, R>): Promise<F, R>;
+
+    then<F, R>(onFulfilled: IFulfillFunction<F>, onRejected?: IRejectFunction<R>): Promise<F, R>;
+    end(): void;
+
+    chain(promise: Promise<F, R>): Promise<F, R>;
+}
+
+export = Promise;
diff --git a/mpromise/mpromise-tests.ts b/mpromise/mpromise-tests.ts
index cb09df4756..bdcd0befa5 100644
--- a/mpromise/mpromise-tests.ts
+++ b/mpromise/mpromise-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="mpromise.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 var assert = require('assert');
 import Promise = require('mpromise');
diff --git a/mpromise/mpromise.d.ts b/mpromise/mpromise.d.ts
deleted file mode 100644
index 73fafff1f6..0000000000
--- a/mpromise/mpromise.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// Type definitions for mpromise 0.5.4
-// Project: https://github.com/aheckmann/mpromise
-// Definitions by: Seulgi Kim <https://github.com/sgkim126/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "mpromise" {
-  interface IFulfillFunction<F> {
-    (...args: F[]): void;
-    (arg: F): void;
-  }
-  interface IRejectFunction<R> {
-    (err: R): void;
-  }
-  interface IResolveFunction<F, R> {
-    (err: R, ...args: F[]): void;
-    (err: R, arg: F): void;
-  }
-
-  class Promise<F, R> {
-    constructor(fn?: IResolveFunction<F, R>);
-
-    static FAILURE: string;
-    static SUCCESS: string;
-
-    fulfill(...args: F[]): Promise<F, R>;
-    fulfill(arg: F): Promise<F, R>;
-    reject(reason: R): Promise<F, R>;
-    resolve(reason: R, ...args: F[]): Promise<F, R>;
-    resolve(reason: R, arg: F): Promise<F, R>;
-
-    onFulfill(callback: IFulfillFunction<F>): Promise<F, R>;
-    onReject(callback: IRejectFunction<R>): Promise<F, R>;
-    onResolve(callback: IResolveFunction<F, R>): Promise<F, R>;
-
-    then<F, R>(onFulfilled: IFulfillFunction<F>, onRejected?: IRejectFunction<R>): Promise<F, R>;
-    end(): void;
-
-    chain(promise: Promise<F, R>): Promise<F, R>;
-  }
-
-  export = Promise;
-}
diff --git a/mpromise/tsconfig.json b/mpromise/tsconfig.json
new file mode 100644
index 0000000000..b542754ad4
--- /dev/null
+++ b/mpromise/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mpromise-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mqtt/index.d.ts b/mqtt/index.d.ts
new file mode 100644
index 0000000000..72c8cfbf9c
--- /dev/null
+++ b/mqtt/index.d.ts
@@ -0,0 +1,446 @@
+// Type definitions for MQTT
+// Project: https://github.com/mqttjs/MQTT.js
+// Definitions by: Pekka Leppänen <https://github.com/PekkaPLeppanen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+declare namespace mqtt {
+
+    import ReadableStream = NodeJS.ReadableStream;
+    import EventEmitter = NodeJS.EventEmitter;
+
+    interface Packet {
+        messageId: string;
+        [key: string]: any;
+    }
+
+    interface Granted {
+        /**
+         *  is a subscribed to topic
+         */
+        topic: string;
+        /**
+         *  is the granted qos level on it
+         */
+        qos: number;
+    }
+
+    interface Topic {
+        /**
+         * object which has topic names as object keys and as value the QoS, like {'test1': 0, 'test2': 1}.
+         */
+        [topic: string]: number;
+    }
+
+    /**
+     * MQTT CLIENT
+     */
+
+    interface ClientOptions extends SecureClientOptions {
+        /**
+         *  10 seconds, set to 0 to disable
+         */
+        keepalive?: number;
+
+        /**
+         * 'mqttjs_' + Math.random().toString(16).substr(2, 8)
+         */
+        clientId?: string;
+        /**
+         * 'MQTT'
+         */
+        protocolId?: string;
+        /**
+         * 4
+         */
+        protocolVersion?: number;
+        /**
+         * true, set to false to receive QoS 1 and 2 messages while offline
+         */
+        clean?: boolean;
+        /**
+         * 1000 milliseconds, interval between two reconnections
+         */
+        reconnectPeriod?: number;
+        /**
+         * 30 * 1000 milliseconds, time to wait before a CONNACK is received
+         */
+        connectTimeout?: number;
+        /**
+         * the username required by your broker, if any
+         */
+        username?: string;
+        /**
+         * the password required by your broker, if any
+         */
+        password?: string;
+        /**
+         * a Store for the incoming packets
+         */
+        incomingStore?: Store;
+        /**
+         * a Store for the outgoing packets
+         */
+        outgoingStore?: Store;
+        /**
+         * a message that will sent by the broker automatically when the client disconnect badly.
+         */
+        will?: {
+            /**
+             * the topic to publish
+             */
+            topic: string;
+            /**
+             * the message to publish
+             */
+            payload: string;
+            /**
+             * the QoS
+             */
+            qos: number;
+            /**
+             * the retain flag
+             */
+            retain: boolean;
+        };
+
+    }
+
+    interface SecureClientOptions {
+        /**
+         * path to private key
+         */
+        keyPath?: string;
+        /**
+         * path to corresponding public cert
+         */
+        certPath?: string;
+        rejectUnauthorized?: boolean;
+    }
+
+    interface ClientPublishOptions {
+        /**
+         * the QoS
+         */
+        qos?: number;
+        /**
+         * the retain flag
+         */
+        retain?: boolean;
+    }
+
+    interface ClientSubscribeOptions {
+        /**
+         * the QoS
+         */
+        qos?: number;
+    }
+
+    interface ClientSubscribeCallback {
+        (err: any, granted: Granted): void;
+    }
+
+    /**
+     * @deprecated use connect() instead
+     * Create a new IClient (see: IClient)
+     *
+     * @param port - broker port (default: 1883)
+     * @param host  - broker host (default: localhost)
+     * @param options - connect options
+     */
+    function createClient(port?: number, host?: string, options?: ClientOptions): Client;
+
+    /**
+     * @deprecated use connect() instead
+     * Create a new secure IClient
+     *
+     * @param port
+     * @param host
+     * @param options - connection options, must include keys.
+     */
+    function createSecureClient(port?: number, host?: string, options?: SecureClientOptions): Client;
+
+    /**
+     * Create a new MqttClient (see: IClient)
+     *
+     * The brokerUrl supports normal connections using mqtt:// or tcp:// and secure connections using mqtts:// or ssl://.
+     *
+     *  Passing the clientId is also supported, for example mqtt://user@localhost?clientId=123abc.
+     *
+     * @param brokerUrl
+     * @param options
+     */
+    function connect(brokerUrl: string, options?: ClientOptions): Client;
+
+    /**
+     * The Client class wraps a client connection to an MQTT broker over an arbitrary transport method (TCP, TLS, WebSocket, ecc).
+     *
+     * Client automatically handles the following:
+     *  - Regular server pings
+     *  - QoS flow
+     *  - Automatic reconnections
+     *  - Start publishing before being connected
+     *
+     */
+    interface Client extends EventEmitter {
+        (streamBuilder: any, options: ClientOptions): Client;
+
+        /**
+         * Publish a message to a topic
+         *
+         * @param topic
+         * @param message
+         * @param options
+         * @param callback
+         */
+        publish(topic: string, message: Buffer, options?: ClientPublishOptions, callback?: Function): Client;
+        publish(topic: string, message: string, options?: ClientPublishOptions, callback?: Function): Client;
+
+        /**
+         * Subscribe to a topic or topics
+         * @param topic to subscribe to or an Array of topics to subscribe to. It can also be an object.
+         * @param the options to subscribe with
+         * @param callback fired on suback
+         */
+        subscribe(topic: string, options?: ClientSubscribeOptions, callback?: ClientSubscribeCallback): Client;
+        subscribe(topic: string[], options?: ClientSubscribeOptions, callback?: ClientSubscribeCallback): Client;
+        subscribe(topic: Topic, options?: ClientSubscribeOptions, callback?: ClientSubscribeCallback): Client;
+
+        /**
+         * Unsubscribe from a topic or topics
+         *
+         * @param topic  is a String topic or an array of topics to unsubscribe from
+         * @param options
+         * @param callback  fired on unsuback
+         */
+        unsubscribe(topic: string, options?: ClientSubscribeOptions, callback?: ClientSubscribeCallback): Client;
+        unsubscribe(topic: string[], options?: ClientSubscribeOptions, callback?: ClientSubscribeCallback): Client;
+
+        /**
+         * end - close connection
+         *
+         * @param force passing it to true will close the client right away, without waiting for the in-flight messages to be acked.
+         *     This parameter is optional.
+         * @param callback
+         */
+        end(force?: boolean, callback?: Function): Client;
+
+        /**
+         * Handle messages with backpressure support, one at a time. Override at will, but always call callback, or the client will
+         * hang.
+         *
+         * @param packet
+         * @param callback
+         */
+        handleMessage(packet: Packet, callback: Function): Client;
+
+    }
+
+    /**
+     * STORE
+     */
+
+    /**
+     * In-memory implementation of the message store.
+     *
+     * Another implementaion is mqtt-level-store which uses Level-browserify to store the inflight data,
+     * making it usable both in Node and the Browser.
+     */
+    interface Store {
+        /**
+         * Adds a packet to the store, a packet is anything that has a messageId property. The callback is called when the packet has
+         * been stored.
+         * @param packet
+         * @param callback
+         */
+        put(packet: Packet, callback: Function): Store;
+
+        /**
+         * get a packet from the store
+         *
+         * @param packet
+         * @param callback
+         */
+        get(packet: Packet, callback: Function): Store;
+
+        /**
+         * Creates a stream with all the packets in the store.
+         */
+        createStream(): ReadableStream;
+
+        /**
+         * Removes a packet from the store, a packet is anything that has a messageId property. The callback is called when the packet
+         * has been removed.
+         * @param packet
+         * @param callback
+         */
+        del(packet: Packet, callback: Function): Store;
+
+        /**
+         * Closes the Store.
+         * @param callback
+         */
+        close(callback: Function): void;
+
+    }
+
+    /**
+     * CONNECTION
+     */
+
+    /**
+     * @deprecated use mqtt-connect instead
+     * Create a new MqttConnection (see: MqttConnection)
+     *
+     * @param port - broker port (default: 1883)
+     * @param host - broker host (default: localhost)
+     * @param callback - fired on underlying stream connect
+     */
+    function createConnection(port?: number, host?: string, callback?: Function): Connection;
+
+    interface ConnectOptions {
+
+        /**
+         * Protocol ID, usually MQIsdp.
+         */
+        protocolId?: string;
+        /**
+         * Protocol version, usually 3.
+         */
+        protocolVersion?: number;
+        /**
+         * keepalive period in seconds.
+         */
+        keepalive?: number;
+        /**
+         * client ID.
+         */
+        clientId?: string;
+        /**
+         * the client's will message options
+         */
+        will?: {
+            /**
+             * the topic to publish
+             */
+            topic: string;
+            /**
+             * the message to publish
+             */
+            payload: string;
+            /**
+             * the QoS
+             */
+            qos: number;
+            /**
+             * the retain flag
+             */
+            retain: boolean;
+        };
+        /**
+         * the 'clean start' flag.
+         */
+        clean?: boolean;
+        /**
+         * username for protocol v3.1.
+         */
+        username?: string;
+        /**
+         * password for protocol v3.1.
+         */
+        password?: string;
+    }
+
+    interface ConnectionPublishOptions {
+        /**
+         * the message ID of the packet, required if qos > 0.
+         */
+        messageId?: number;
+        /**
+         * the topic to publish
+         */
+        topic?: string;
+        /**
+         * the message to publish
+         */
+        payload?: string;
+        /**
+         * the QoS
+         */
+        qos?: number;
+        /**
+         * the retain flag
+         */
+        retain?: boolean;
+    }
+
+    /**
+     * The MqttConnection class represents a raw MQTT connection, both on the server and on the client side. For client side
+     * operations, it is strongly recommended that MqttClient is used, as MqttConnection requires a great deal of additional
+     * boilerplate such as setting up error handling and ping request/responses.
+     *
+     * If such fine grained control is required, MqttConnection can be instantiated using the mqtt.createConnection method.
+     *
+     * MqttServerClient is an unaltered subclass of MqttConnection and can be used in exactly the same way.
+     *
+     * @link https://github.com/mqttjs/MQTT.js/wiki/connection
+     *
+     */
+    interface Connection extends EventEmitter {
+        /**
+         * Send an MQTT connect packet.
+         * @param options
+         */
+        connect(options?: ConnectOptions): Connection;
+        /**
+         * Send an MQTT connack packet.
+         * @param options
+         */
+        connack(options?: { returnCode: number; }): Connection;
+        /**
+         * Send an MQTT publish packet.
+         * @param options
+         */
+        publish(options?: ConnectionPublishOptions): Connection;
+    }
+
+    /**
+     * SERVER
+     */
+
+    /**
+     * @deprecated use connect instead
+     * Create a new MqttServer (see : IServer)
+     *
+     * @param listener - callback called on server client event
+     */
+    function createServer(listener?: Function): Server;
+
+    /**
+     * @deprecated use connect instead
+     * Create a new MqttSecureServer
+     * @param keyPath - path to private key file
+     * @param certPath - path to corresponding public cert
+     * @param listener - callback called on server client event
+     */
+    function createSecureServer(keyPath: string, certPath: string, listener?: Function): Server;
+
+    /**
+     * The primary methods of instantiating mqtt.js server classes are through the mqtt.createServer and mqtt.createSecureServer
+     * methods. The former returns an instance of MqttServer and and the latter returns an instance of MqttSecureServer.
+     *
+     * While it is possible to instantiate these classes through new MqttServer(), it is strongly recommended to use the factory
+     * methods
+     *
+     * @link https://github.com/mqttjs/MQTT.js/wiki/server
+     */
+    interface Server extends EventEmitter {
+
+    }
+
+}
+
+export = mqtt;
diff --git a/mqtt/mqtt-tests.ts b/mqtt/mqtt-tests.ts
index 8e33ca3721..4022616c03 100644
--- a/mqtt/mqtt-tests.ts
+++ b/mqtt/mqtt-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="mqtt.d.ts"/>
-
 import mqtt = require('mqtt');
 
 var client: mqtt.Client = mqtt.connect('mqtt://test.mosquitto.org');
diff --git a/mqtt/mqtt.d.ts b/mqtt/mqtt.d.ts
deleted file mode 100644
index f783002d66..0000000000
--- a/mqtt/mqtt.d.ts
+++ /dev/null
@@ -1,448 +0,0 @@
-// Type definitions for MQTT
-// Project: https://github.com/mqttjs/MQTT.js
-// Definitions by: Pekka Leppänen <https://github.com/PekkaPLeppanen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'mqtt' {
-
-    namespace mqtt {
-
-        import ReadableStream = NodeJS.ReadableStream;
-        import EventEmitter = NodeJS.EventEmitter;
-
-        interface Packet {
-            messageId: string;
-            [key: string]: any;
-        }
-
-        interface Granted {
-            /**
-             *  is a subscribed to topic
-             */
-            topic: string;
-            /**
-             *  is the granted qos level on it
-             */
-            qos: number;
-        }
-
-        interface Topic {
-            /**
-             * object which has topic names as object keys and as value the QoS, like {'test1': 0, 'test2': 1}.
-             */
-            [topic: string]: number;
-        }
-
-        /**
-         * MQTT CLIENT
-         */
-
-        interface ClientOptions extends SecureClientOptions {
-            /**
-             *  10 seconds, set to 0 to disable
-             */
-            keepalive?: number;
-
-            /**
-             * 'mqttjs_' + Math.random().toString(16).substr(2, 8)
-             */
-            clientId?: string;
-            /**
-             * 'MQTT'
-             */
-            protocolId?: string;
-            /**
-             * 4
-             */
-            protocolVersion?: number;
-            /**
-             * true, set to false to receive QoS 1 and 2 messages while offline
-             */
-            clean?: boolean;
-            /**
-             * 1000 milliseconds, interval between two reconnections
-             */
-            reconnectPeriod?: number;
-            /**
-             * 30 * 1000 milliseconds, time to wait before a CONNACK is received
-             */
-            connectTimeout?: number;
-            /**
-             * the username required by your broker, if any
-             */
-            username?: string;
-            /**
-             * the password required by your broker, if any
-             */
-            password?: string;
-            /**
-             * a Store for the incoming packets
-             */
-            incomingStore?: Store;
-            /**
-             * a Store for the outgoing packets
-             */
-            outgoingStore?: Store;
-            /**
-             * a message that will sent by the broker automatically when the client disconnect badly.
-             */
-            will?: {
-                /**
-                 * the topic to publish
-                 */
-                topic: string;
-                /**
-                 * the message to publish
-                 */
-                payload: string;
-                /**
-                 * the QoS
-                 */
-                qos: number;
-                /**
-                 * the retain flag
-                 */
-                retain: boolean;
-            };
-
-        }
-
-        interface SecureClientOptions {
-            /**
-             * path to private key
-             */
-            keyPath?: string;
-            /**
-             * path to corresponding public cert
-             */
-            certPath?: string;
-            rejectUnauthorized?: boolean;
-        }
-
-        interface ClientPublishOptions {
-            /**
-             * the QoS
-             */
-            qos?: number;
-            /**
-             * the retain flag
-             */
-            retain?: boolean;
-        }
-
-        interface ClientSubscribeOptions {
-            /**
-             * the QoS
-             */
-            qos?: number;
-        }
-
-        interface ClientSubscribeCallback {
-            (err: any, granted: Granted): void;
-        }
-
-        /**
-         * @deprecated use connect() instead
-         * Create a new IClient (see: IClient)
-         *
-         * @param port - broker port (default: 1883)
-         * @param host  - broker host (default: localhost)
-         * @param options - connect options
-         */
-        function createClient(port?: number, host?: string, options?: ClientOptions): Client;
-
-        /**
-         * @deprecated use connect() instead
-         * Create a new secure IClient
-         *
-         * @param port
-         * @param host
-         * @param options - connection options, must include keys.
-         */
-        function createSecureClient(port?: number, host?: string, options?: SecureClientOptions): Client;
-
-        /**
-         * Create a new MqttClient (see: IClient)
-         *
-         * The brokerUrl supports normal connections using mqtt:// or tcp:// and secure connections using mqtts:// or ssl://.
-         *
-         *  Passing the clientId is also supported, for example mqtt://user@localhost?clientId=123abc.
-         *
-         * @param brokerUrl
-         * @param options
-         */
-        function connect(brokerUrl: string, options?: ClientOptions): Client;
-
-        /**
-         * The Client class wraps a client connection to an MQTT broker over an arbitrary transport method (TCP, TLS, WebSocket, ecc).
-         *
-         * Client automatically handles the following:
-         *  - Regular server pings
-         *  - QoS flow
-         *  - Automatic reconnections
-         *  - Start publishing before being connected
-         *
-         */
-        interface Client extends EventEmitter {
-            (streamBuilder: any, options: ClientOptions): Client;
-
-            /**
-             * Publish a message to a topic
-             *
-             * @param topic
-             * @param message
-             * @param options
-             * @param callback
-             */
-            publish(topic: string, message: Buffer, options?: ClientPublishOptions, callback?: Function): Client;
-            publish(topic: string, message: string, options?: ClientPublishOptions, callback?: Function): Client;
-
-            /**
-             * Subscribe to a topic or topics
-             * @param topic to subscribe to or an Array of topics to subscribe to. It can also be an object.
-             * @param the options to subscribe with
-             * @param callback fired on suback
-             */
-            subscribe(topic: string, options?: ClientSubscribeOptions, callback?: ClientSubscribeCallback): Client;
-            subscribe(topic: string[], options?: ClientSubscribeOptions, callback?: ClientSubscribeCallback): Client;
-            subscribe(topic: Topic, options?: ClientSubscribeOptions, callback?: ClientSubscribeCallback): Client;
-
-            /**
-             * Unsubscribe from a topic or topics
-             *
-             * @param topic  is a String topic or an array of topics to unsubscribe from
-             * @param options
-             * @param callback  fired on unsuback
-             */
-            unsubscribe(topic: string, options?: ClientSubscribeOptions, callback?: ClientSubscribeCallback): Client;
-            unsubscribe(topic: string[], options?: ClientSubscribeOptions, callback?: ClientSubscribeCallback): Client;
-
-            /**
-             * end - close connection
-             *
-             * @param force passing it to true will close the client right away, without waiting for the in-flight messages to be acked.
-             *     This parameter is optional.
-             * @param callback
-             */
-            end(force?: boolean, callback?: Function): Client;
-
-            /**
-             * Handle messages with backpressure support, one at a time. Override at will, but always call callback, or the client will
-             * hang.
-             *
-             * @param packet
-             * @param callback
-             */
-            handleMessage(packet: Packet, callback: Function): Client;
-
-        }
-
-        /**
-         * STORE
-         */
-
-        /**
-         * In-memory implementation of the message store.
-         *
-         * Another implementaion is mqtt-level-store which uses Level-browserify to store the inflight data,
-         * making it usable both in Node and the Browser.
-         */
-        interface Store {
-            /**
-             * Adds a packet to the store, a packet is anything that has a messageId property. The callback is called when the packet has
-             * been stored.
-             * @param packet
-             * @param callback
-             */
-            put(packet: Packet, callback: Function): Store;
-
-            /**
-             * get a packet from the store
-             *
-             * @param packet
-             * @param callback
-             */
-            get(packet: Packet, callback: Function): Store;
-
-            /**
-             * Creates a stream with all the packets in the store.
-             */
-            createStream(): ReadableStream;
-
-            /**
-             * Removes a packet from the store, a packet is anything that has a messageId property. The callback is called when the packet
-             * has been removed.
-             * @param packet
-             * @param callback
-             */
-            del(packet: Packet, callback: Function): Store;
-
-            /**
-             * Closes the Store.
-             * @param callback
-             */
-            close(callback: Function): void;
-
-        }
-
-        /**
-         * CONNECTION
-         */
-
-        /**
-         * @deprecated use mqtt-connect instead
-         * Create a new MqttConnection (see: MqttConnection)
-         *
-         * @param port - broker port (default: 1883)
-         * @param host - broker host (default: localhost)
-         * @param callback - fired on underlying stream connect
-         */
-        function createConnection(port?: number, host?: string, callback?: Function): Connection;
-
-        interface ConnectOptions {
-
-            /**
-             * Protocol ID, usually MQIsdp.
-             */
-            protocolId?: string;
-            /**
-             * Protocol version, usually 3.
-             */
-            protocolVersion?: number;
-            /**
-             * keepalive period in seconds.
-             */
-            keepalive?: number;
-            /**
-             * client ID.
-             */
-            clientId?: string;
-            /**
-             * the client's will message options
-             */
-            will?: {
-                /**
-                 * the topic to publish
-                 */
-                topic: string;
-                /**
-                 * the message to publish
-                 */
-                payload: string;
-                /**
-                 * the QoS
-                 */
-                qos: number;
-                /**
-                 * the retain flag
-                 */
-                retain: boolean;
-            };
-            /**
-             * the 'clean start' flag.
-             */
-            clean?:  boolean;
-            /**
-             * username for protocol v3.1.
-             */
-            username?: string;
-            /**
-             * password for protocol v3.1.
-             */
-            password?: string;
-        }
-
-        interface ConnectionPublishOptions {
-            /**
-             * the message ID of the packet, required if qos > 0.
-             */
-            messageId?: number;
-            /**
-             * the topic to publish
-             */
-            topic?: string;
-            /**
-             * the message to publish
-             */
-            payload?: string;
-            /**
-             * the QoS
-             */
-            qos?: number;
-            /**
-             * the retain flag
-             */
-            retain?: boolean;
-        }
-
-        /**
-         * The MqttConnection class represents a raw MQTT connection, both on the server and on the client side. For client side
-         * operations, it is strongly recommended that MqttClient is used, as MqttConnection requires a great deal of additional
-         * boilerplate such as setting up error handling and ping request/responses.
-         *
-         * If such fine grained control is required, MqttConnection can be instantiated using the mqtt.createConnection method.
-         *
-         * MqttServerClient is an unaltered subclass of MqttConnection and can be used in exactly the same way.
-         *
-         * @link https://github.com/mqttjs/MQTT.js/wiki/connection
-         *
-         */
-        interface Connection extends EventEmitter {
-            /**
-             * Send an MQTT connect packet.
-             * @param options
-             */
-            connect(options?: ConnectOptions): Connection;
-            /**
-             * Send an MQTT connack packet.
-             * @param options
-             */
-            connack(options?: { returnCode: number; }): Connection;
-            /**
-             * Send an MQTT publish packet.
-             * @param options
-             */
-            publish(options?: ConnectionPublishOptions): Connection;
-        }
-
-        /**
-         * SERVER
-         */
-
-        /**
-         * @deprecated use connect instead
-         * Create a new MqttServer (see : IServer)
-         *
-         * @param listener - callback called on server client event
-         */
-        function createServer(listener?: Function): Server;
-
-        /**
-         * @deprecated use connect instead
-         * Create a new MqttSecureServer
-         * @param keyPath - path to private key file
-         * @param certPath - path to corresponding public cert
-         * @param listener - callback called on server client event
-         */
-        function createSecureServer(keyPath: string, certPath: string, listener?: Function): Server;
-
-        /**
-         * The primary methods of instantiating mqtt.js server classes are through the mqtt.createServer and mqtt.createSecureServer
-         * methods. The former returns an instance of MqttServer and and the latter returns an instance of MqttSecureServer.
-         *
-         * While it is possible to instantiate these classes through new MqttServer(), it is strongly recommended to use the factory
-         * methods
-         *
-         * @link https://github.com/mqttjs/MQTT.js/wiki/server
-         */
-        interface Server extends EventEmitter {
-
-        }
-
-    }
-
-    export = mqtt;
-
-}
diff --git a/mqtt/tsconfig.json b/mqtt/tsconfig.json
new file mode 100644
index 0000000000..b9f23a11a9
--- /dev/null
+++ b/mqtt/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mqtt-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ms/index.d.ts b/ms/index.d.ts
new file mode 100644
index 0000000000..211c94508e
--- /dev/null
+++ b/ms/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for ms v0.7.1
+// Project: https://github.com/guille/ms.js
+// Definitions by: Zhiyuan Wang <https://github.com/danny8002/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+/**
+* Short/Long format for `value`.
+*
+* @param {Number} value
+* @param {{long: boolean}} options
+* @return {String}
+*/
+declare function ms(value: number, options?: { long: boolean }): string;
+
+/**
+* Parse the given `value` and return milliseconds.
+*
+* @param {String} value
+* @return {Number}
+*/
+declare function ms(value: string): number;
+
+export = ms;
diff --git a/ms/ms-tests.ts b/ms/ms-tests.ts
index 75312e9277..4e886506f6 100644
--- a/ms/ms-tests.ts
+++ b/ms/ms-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./ms.d.ts"/>
-
 import ms = require('ms');
 
 ms('2 days')  // 172800000 
diff --git a/ms/ms.d.ts b/ms/ms.d.ts
deleted file mode 100644
index acc4b9cd67..0000000000
--- a/ms/ms.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// Type definitions for ms v0.7.1
-// Project: https://github.com/guille/ms.js
-// Definitions by: Zhiyuan Wang <https://github.com/danny8002/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'ms' {
-
-    /**
-    * Short/Long format for `value`.
-    *
-    * @param {Number} value
-    * @param {{long: boolean}} options
-    * @return {String}
-    */
-    function ms(value: number, options?: { long: boolean }): string;
-
-    /**
-    * Parse the given `value` and return milliseconds.
-    *
-    * @param {String} value
-    * @return {Number}
-    */
-    function ms(value: string): number;
-
-    export = ms;
-}
\ No newline at end of file
diff --git a/ms/tsconfig.json b/ms/tsconfig.json
new file mode 100644
index 0000000000..259c926a13
--- /dev/null
+++ b/ms/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ms-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/msgpack/msgpack.d.ts b/msgpack/index.d.ts
similarity index 100%
rename from msgpack/msgpack.d.ts
rename to msgpack/index.d.ts
diff --git a/msgpack/msgpack-tests.ts b/msgpack/msgpack-tests.ts
index 1a4b2eb396..da0d12b926 100644
--- a/msgpack/msgpack-tests.ts
+++ b/msgpack/msgpack-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="msgpack.d.ts" />
+
 
 var packed = msgpack.pack("");
 msgpack.unpack(packed);
diff --git a/msgpack/tsconfig.json b/msgpack/tsconfig.json
new file mode 100644
index 0000000000..be8971f549
--- /dev/null
+++ b/msgpack/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "msgpack-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/msnodesql/index.d.ts b/msnodesql/index.d.ts
new file mode 100644
index 0000000000..08f31f7cae
--- /dev/null
+++ b/msnodesql/index.d.ts
@@ -0,0 +1,74 @@
+// Type definitions for msnodesql 0.2.1
+// Project: https://github.com/WindowsAzure/node-sqlserver
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Maxime LUCE <https://github.com/SomaticIT>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+///<reference types="node" />
+
+
+import events = require('events');
+
+export declare function open(connectionString: string, callback?: OpenCallback): Connection;
+
+export declare function query(connectionString: string, query: string): StreamEvents;
+export declare function query(connectionString: string, query: string, callback: QueryCallback<any>): StreamEvents;
+export declare function query(connectionString: string, query: string, params: any[]): StreamEvents;
+export declare function query(connectionString: string, query: string, params: any[], callback: QueryCallback<any>): StreamEvents;
+
+export declare function query<T>(connectionString: string, query: string, callback: QueryCallback<T>): StreamEvents;
+export declare function query<T>(connectionString: string, query: string, params: any[], callback: QueryCallback<T>): StreamEvents;
+
+export declare function queryRaw(connectionString: string, query: string): StreamEvents;
+export declare function queryRaw(connectionString: string, query: string, callback: QueryRawCallback): StreamEvents;
+export declare function queryRaw(connectionString: string, query: string, params: any[]): StreamEvents;
+export declare function queryRaw(connectionString: string, query: string, params: any[], callback: QueryRawCallback): StreamEvents;
+
+interface OpenCallback {
+    (err?: Error, connection?: Connection): void;
+}
+
+interface QueryCallback<T> {
+    (err?: Error, results?: T[], more?: boolean): void;
+}
+
+interface QueryRawCallback {
+    (err?: Error, results?: QueryRawResult, more?: boolean): void;
+}
+
+interface QueryRawResult {
+    meta: QueryRawColumn[];
+    rows: any[][];
+}
+
+interface QueryRawColumn {
+    name?: string;
+}
+
+interface ErrorCallback {
+    (err: Error): void;
+}
+
+interface Connection {
+    query(query: string): StreamEvents;
+    query(query: string, callback: QueryCallback<any>): StreamEvents;
+    query(query: string, params: any[]): StreamEvents;
+    query(query: string, params: any[], callback: QueryCallback<any>): StreamEvents;
+
+    query<T>(query: string, callback: QueryCallback<T>): StreamEvents;
+    query<T>(query: string, params: any[], callback: QueryCallback<T>): StreamEvents;
+
+    queryRaw(query: string): StreamEvents;
+    queryRaw(query: string, callback: QueryRawCallback): StreamEvents;
+    queryRaw(query: string, params: any[]): StreamEvents;
+    queryRaw(query: string, params: any[], callback: QueryRawCallback): StreamEvents;
+
+    beginTransaction(callback?: ErrorCallback);
+    commit(callback?: ErrorCallback);
+    rollback(callback?: ErrorCallback);
+
+    close(callback?: ErrorCallback);
+    close(immediately: boolean, callback?: ErrorCallback);
+}
+
+interface StreamEvents extends events.EventEmitter { }
diff --git a/msnodesql/msnodesql-tests.ts b/msnodesql/msnodesql-tests.ts
index f4a99fe0a5..4ae52b41e4 100644
--- a/msnodesql/msnodesql-tests.ts
+++ b/msnodesql/msnodesql-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="msnodesql.d.ts" />
 
 import sql = require('msnodesql');
 
diff --git a/msnodesql/msnodesql-tests.ts.tscparams b/msnodesql/msnodesql-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/msnodesql/msnodesql-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/msnodesql/msnodesql.d.ts b/msnodesql/msnodesql.d.ts
deleted file mode 100644
index cbc6b53431..0000000000
--- a/msnodesql/msnodesql.d.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-// Type definitions for msnodesql 0.2.1
-// Project: https://github.com/WindowsAzure/node-sqlserver
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Maxime LUCE <https://github.com/SomaticIT>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-///<reference path='../node/node.d.ts' />
-
-declare module "msnodesql" {
-    import events = require('events');
-
-    export function open(connectionString: string, callback?: OpenCallback): Connection;
-
-    export function query(connectionString: string, query: string): StreamEvents;
-    export function query(connectionString: string, query: string, callback: QueryCallback<any>): StreamEvents;
-    export function query(connectionString: string, query: string, params: any[]): StreamEvents;
-    export function query(connectionString: string, query: string, params: any[], callback: QueryCallback<any>): StreamEvents;
-
-    export function query<T>(connectionString: string, query: string, callback: QueryCallback<T>): StreamEvents;
-    export function query<T>(connectionString: string, query: string, params: any[], callback: QueryCallback<T>): StreamEvents;
-
-    export function queryRaw(connectionString: string, query: string): StreamEvents;
-    export function queryRaw(connectionString: string, query: string, callback: QueryRawCallback): StreamEvents;
-    export function queryRaw(connectionString: string, query: string, params: any[]): StreamEvents;
-    export function queryRaw(connectionString: string, query: string, params: any[], callback: QueryRawCallback): StreamEvents;
-
-    interface OpenCallback {
-        (err?: Error, connection?: Connection): void;
-    }
-
-    interface QueryCallback<T> {
-        (err?: Error, results?: T[], more?: boolean): void;
-    }
-
-    interface QueryRawCallback {
-        (err?: Error, results?: QueryRawResult, more?: boolean): void;
-    }
-
-    interface QueryRawResult {
-        meta: QueryRawColumn[];
-        rows: any[][];
-    }
-
-    interface QueryRawColumn {
-        name?: string;
-    }
-
-    interface ErrorCallback {
-        (err: Error): void;
-    }
-
-    interface Connection {
-        query(query: string): StreamEvents;
-        query(query: string, callback: QueryCallback<any>): StreamEvents;
-        query(query: string, params: any[]): StreamEvents;
-        query(query: string, params: any[], callback: QueryCallback<any>): StreamEvents;
-
-        query<T>(query: string, callback: QueryCallback<T>): StreamEvents;
-        query<T>(query: string, params: any[], callback: QueryCallback<T>): StreamEvents;
-
-        queryRaw(query: string): StreamEvents;
-        queryRaw(query: string, callback: QueryRawCallback): StreamEvents;
-        queryRaw(query: string, params: any[]): StreamEvents;
-        queryRaw(query: string, params: any[], callback: QueryRawCallback): StreamEvents;
-
-        beginTransaction(callback?: ErrorCallback);
-        commit(callback?: ErrorCallback);
-        rollback(callback?: ErrorCallback);
-
-        close(callback?: ErrorCallback);
-        close(immediately: boolean, callback?: ErrorCallback);
-    }
-
-    interface StreamEvents extends events.EventEmitter {}
-}
\ No newline at end of file
diff --git a/msnodesql/msnodesql.d.ts.tscparams b/msnodesql/msnodesql.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/msnodesql/msnodesql.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/msnodesql/tsconfig.json b/msnodesql/tsconfig.json
new file mode 100644
index 0000000000..80c8aacf2a
--- /dev/null
+++ b/msnodesql/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "msnodesql-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/msportalfx-test/index.d.ts b/msportalfx-test/index.d.ts
new file mode 100644
index 0000000000..073097e302
--- /dev/null
+++ b/msportalfx-test/index.d.ts
@@ -0,0 +1,310 @@
+// Type definitions for msportalfx-test
+// Project: https://msazure.visualstudio.com/DefaultCollection/AzureUX/_git/portalfx-msportalfx-test
+// Definitions by: Julio Casal <https://github.com/julioct>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="Q" />
+
+export = MsPortalTestFx;
+
+declare namespace MsPortalTestFx {
+
+    export module Locators {
+        export class Locator {
+            seleniumLocator: any;
+            findElements(context: any): any;
+            toString(): string;
+        }
+
+        export class ContentLocator extends Locator {
+            locators: Array<Locator>;
+            constructor(innerLocators: Locator[]);
+            findElements(context: any): any;
+            toString(): string;
+        }
+
+        export class ChainedLocator extends Locator {
+            locators: Array<Locator>;
+            constructor(innerLocators: Locator[]);
+            findElements(context: any): any;
+            toString(): string;
+        }
+
+        export class By {
+            static className(value: string): Locator;
+            static css(value: string): Locator;
+            static id(value: string): Locator;
+            static js(script: any, ...var_args: any[]): Locator;
+            static linkText(value: string): Locator;
+            static name(value: string): Locator;
+            static partialLinkText(value: string): Locator;
+            static tagName(value: string): Locator;
+            static xpath(value: string): Locator;
+            static text(value: string): Locator;
+            static chained(...values: Locator[]): Locator;
+            static content(...values: Locator[]): Locator;
+        }
+    }
+
+    export module ActionBars {
+        export class ActionBarButton extends PortalElement {
+            constructor(parentLocator?: Locators.Locator, baseLocator?: Locators.Locator);
+            click(): Q.Promise<void>;
+        }
+
+        export class CreateActionBar extends PortalElement {
+            public createButton: ActionBarButton;
+
+            constructor(parentLocator?: Locators.Locator);
+        }
+
+        export class DeleteActionBar extends PortalElement {
+            public deleteButton: ActionBarButton;
+            public cancelButton: ActionBarButton;
+
+            constructor(parentLocator?: Locators.Locator);
+        }
+
+        export class PickerActionBar extends PortalElement {
+            public selectButton: ActionBarButton;
+
+            constructor(parentLocator?: Locators.Locator);
+        }
+    }
+
+    export module Blades {
+        export class Blade extends MsPortalTestFx.PortalElement {
+            public title: string;
+
+            constructor(title: string);
+            clickCommand(commandText: string): Q.Promise<Blade>;
+            getTiles(): Q.Promise<Parts.Tile[]>;
+        }
+
+        export class CreateBlade extends Blade {
+            public actionBar: ActionBars.CreateActionBar;
+        }
+
+        export class BrowseResourceBlade extends Blade {
+            constructor(title: string);
+            selectResource(resourceName: string): Q.Promise<void>;
+            filterItems(filter: string): Q.Promise<BrowseResourceBlade>;
+        }
+
+        export class PickerBlade extends Blade {
+            pickItem(item: string): Q.Promise<void>;
+        }
+
+        export class SpecPickerBlade extends Blade {
+            pickSpec(specCode: string): Q.Promise<void>;
+        }
+
+        export class QuickStartBlade extends Blade {
+            constructor();
+            clickLink(linkText: string): Q.Promise<void>;
+        }
+
+        export class UsersBlade extends Blade {
+            constructor();
+        }
+    }
+
+    export module Controls {
+        export class FormElement extends MsPortalTestFx.PortalElement {
+            protected label: string;
+
+            constructor(baseLocator: Locators.Locator, parentLocator?: Locators.Locator, label?: string);
+        }
+
+        export class CheckBoxField extends FormElement {
+            constructor(parentLocator?: Locators.Locator, label?: string);
+        }
+
+        export class SelectorField extends FormElement {
+            constructor(parentLocator?: Locators.Locator, label?: string);
+            openPicker(): Q.Promise<void>;
+        }
+
+        export class CreatorAndSelectorField extends FormElement {
+            constructor(parentLocator?: Locators.Locator, selectModeLabel?: string, createModeLabel?: string);
+            openPicker(): Q.Promise<void>;
+            clickCreateNew(): Q.Promise<CreatorAndSelectorField>;
+            enterNewValue(...var_args: string[]): Q.Promise<CreatorAndSelectorField>;
+        }
+
+        export class GridCell extends MsPortalTestFx.PortalElement {
+            constructor(text: string, parentLocator?: Locators.Locator);
+            getLocator(): Locators.Locator;
+        }
+
+        export class TextField extends FormElement {
+            constructor(parentLocator?: Locators.Locator, label?: string, baseLocator?: Locators.Locator);
+            sendKeys(...var_args: string[]): Q.Promise<void>;
+        }
+
+        export class ResourceFilterTextField extends TextField {
+            constructor(parentLocator?: Locators.Locator);
+        }
+
+        export class HotSpot extends PortalElement {
+            constructor(parentLocator?: Locators.Locator, baseLocator?: Locators.Locator);
+            isSelected(): Q.Promise<boolean>;
+        }
+    }
+
+    export module Parts {
+        export class Part extends MsPortalTestFx.PortalElement {
+            public innerText: string;
+
+            constructor(parentLocator?: Locators.Locator, innerText?: string, baseLocator?: Locators.Locator);
+            isSelected(): Q.Promise<boolean>;
+            isLoaded(): Q.Promise<boolean>;
+            waitUntilLoaded(timeout?: number): Q.Promise<boolean>;
+            isClickable(): Q.Promise<boolean>;
+            hasError(): Q.Promise<boolean>;
+        }
+
+        export class PartProperty extends MsPortalTestFx.PortalElement {
+            public name: string;
+
+            constructor(name: string, parentLocator?: Locators.Locator);
+            getValue(): Q.Promise<string>;
+        }
+
+        export class ResourceSummaryPart extends Part {
+            public properties: Array<PartProperty>;
+            public resourceGroupProperty: PartProperty;
+            public quickStartHotSpot: Controls.HotSpot;
+            public accessHotSpot: Controls.HotSpot;
+
+            constructor(parentLocator?: Locators.Locator);
+        }
+
+        class PricingTierPart extends Part {
+        }
+
+        export class Tile extends MsPortalTestFx.PortalElement {
+            public progressLocator: Locators.Locator;
+
+            constructor(parentLocator?: Locators.Locator);
+            tryPin(): Q.Promise<void>;
+            getPart(): Part;
+            waitUntilLoaded(timeout?: number): Q.Promise<void>;
+        }
+    }
+
+    export module Commands {
+        export class ContextMenu extends PortalElement {
+            constructor();
+            public hasItem(text: string): Q.Promise<boolean>;
+            public clickItem(text: string): Q.Promise<void>;
+        }
+
+        export class ContextMenuItem extends PortalElement {
+            constructor(parentLocator: Locators.Locator, text?: string);
+        }
+    }
+
+    export module Notifications {
+        export class Notification extends PortalElement {
+            constructor();
+            getTitle(): Q.Promise<string>;
+            getDescription(): Q.Promise<string>;
+        }
+
+        export class NotificationsMenu extends PortalElement {
+            constructor();
+            waitForNewNotification(title?: string, description?: string, timeout?: number): Q.Promise<Notification>;
+        }
+    }
+
+    export module Tests {
+        export module Parts {
+            export function canPinAllBladeParts(targetBladeDeepLink: string, targetBladeTitle: string, timeout?: number): Q.Promise<boolean>;
+        }
+    }
+
+    export class PortalElement {
+        public baseLocator: Locators.Locator;
+        protected parentLocator: Locators.Locator;
+
+        constructor(baseLocator: Locators.Locator, parentLocator?: Locators.Locator);
+        click(): Q.Promise<void>;
+        rightClick(): Q.Promise<void>;
+        getAttribute(attributeName: string): Q.Promise<string>;
+        sendKeys(...var_args: string[]): Q.Promise<void>;
+        getText(): Q.Promise<string>;
+        isPresent(): Q.Promise<boolean>;
+        isElementPresent(subLocator: Locators.Locator): Q.Promise<boolean>;
+        isDisplayed(): Q.Promise<boolean>;
+        getLocator(): Locators.Locator;
+    }
+
+    export interface TestExtension {
+        name: string;
+        uri: string;
+    }
+
+    export interface Feature {
+        name: string;
+        value: string;
+    }
+
+    export interface PortalContext {
+        capabilities: {
+            browserName: string;
+            chromeOptions: {
+                args: string[]
+            }
+        },
+        chromeDriverPath?: string,
+        portalUrl: string;
+        signInUrl?: string;
+        signInEmail?: string;
+        signInPassword?: string;
+        features?: Feature[];
+        testExtensions?: TestExtension[];
+    }
+
+    export enum LogLevel {
+        All,
+        Debug,
+        Info,
+        Warning,
+        Severe,
+        Off
+    }
+
+    export class Portal {
+        portalContext: PortalContext;
+
+        goHome(timeout?: number): Q.Promise<void>;
+        openGalleryCreateBlade(galleryPackageName: string, bladeTitle: string, timeout?: number): Q.Promise<Blades.CreateBlade>;
+        openBrowseBlade(resourceProvider: string, resourceType: string, bladeTitle: string, timeout?: number): Q.Promise<Blades.BrowseResourceBlade>;
+        openResourceBlade(resourceId: string, bladeTitle: string, timeout?: number): Q.Promise<Blades.Blade>;
+        navigateToDeepLink(deepLink: string, timeout?: number): Q.Promise<any>;
+        waitForElementVisible(locator: Locators.Locator, timeout?: number): Q.Promise<boolean>;
+        waitForElementNotVisible(locator: Locators.Locator, timeout?: number): Q.Promise<boolean>;
+        waitUntilElementContainsAttribute(locator: Locators.Locator, attributeName: string, attributeValue: string, timeout?: number): Q.Promise<any>;
+        waitUntilElementDoesNotContainAttribute(locator: Locators.Locator, attributeName: string, attributeValue: string, timeout?: number): Q.Promise<any>;
+        waitForElementLocated(locator: Locators.Locator, timeout?: number): Q.Promise<any>;
+        waitForElementsLocated(locator: Locators.Locator, timeout?: number): Q.Promise<any[]>;
+        takeScreenshot(filePrefix?: string): Q.Promise<string>;
+        getBrowserLogs(level: LogLevel): Q.Promise<string[]>;
+        executeScript<T>(script: string): Q.Promise<T>;
+        applyFeature(name: string, value: string): void;
+        getCurrentUrl(): Q.Promise<string>;
+        quit(): Q.Promise<any>;
+    }
+
+    export class SplashScreen extends PortalElement {
+        clickUntrustedExtensionsOkButton(): Q.Promise<void>;
+    }
+
+    export class StartBoard extends PortalElement {
+        constructor();
+        getTiles(): Q.Promise<Parts.Tile[]>;
+    }
+
+    export var portal: Portal;
+}
diff --git a/msportalfx-test/msportalfx-test-tests.ts b/msportalfx-test/msportalfx-test-tests.ts
index 7d647106d7..fca44b0860 100644
--- a/msportalfx-test/msportalfx-test-tests.ts
+++ b/msportalfx-test/msportalfx-test-tests.ts
@@ -1,5 +1,5 @@
 
-/// <reference path="msportalfx-test.d.ts" />
+
 
 import testFx = require('MsPortalFx-Test');
 
diff --git a/msportalfx-test/msportalfx-test.d.ts b/msportalfx-test/msportalfx-test.d.ts
deleted file mode 100644
index beafe95dc6..0000000000
--- a/msportalfx-test/msportalfx-test.d.ts
+++ /dev/null
@@ -1,314 +0,0 @@
-// Type definitions for msportalfx-test
-// Project: https://msazure.visualstudio.com/DefaultCollection/AzureUX/_git/portalfx-msportalfx-test
-// Definitions by: Julio Casal <https://github.com/julioct>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../q/Q.d.ts" />
-
-declare namespace MsPortalTestFx {
-
-    export module Locators {
-        export class Locator {
-            seleniumLocator: any;
-            findElements(context: any): any;
-            toString(): string;
-        }
-
-        export class ContentLocator extends Locator {
-            locators: Array<Locator>;
-            constructor(innerLocators: Locator[]);
-            findElements(context: any): any;
-            toString(): string;
-        }
-
-        export class ChainedLocator extends Locator {
-            locators: Array<Locator>;
-            constructor(innerLocators: Locator[]);
-            findElements(context: any): any;
-            toString(): string;
-        }
-
-        export class By {
-            static className(value: string): Locator;
-            static css(value: string): Locator;
-            static id(value: string): Locator;
-            static js(script: any, ...var_args: any[]): Locator;
-            static linkText(value: string): Locator;
-            static name(value: string): Locator;
-            static partialLinkText(value: string): Locator;
-            static tagName(value: string): Locator;
-            static xpath(value: string): Locator;
-            static text(value: string): Locator;
-            static chained(...values: Locator[]): Locator;
-            static content(...values: Locator[]): Locator;
-        }
-    }
-
-    export module ActionBars {
-        export class ActionBarButton extends PortalElement {
-            constructor(parentLocator?: Locators.Locator, baseLocator?: Locators.Locator);
-            click(): Q.Promise<void>;
-        }
-
-        export class CreateActionBar extends PortalElement {
-            public createButton: ActionBarButton;
-
-            constructor(parentLocator?: Locators.Locator);
-        }
-
-        export class DeleteActionBar extends PortalElement {
-            public deleteButton: ActionBarButton;
-            public cancelButton: ActionBarButton;
-
-            constructor(parentLocator?: Locators.Locator);
-        }
-
-        export class PickerActionBar extends PortalElement {
-            public selectButton: ActionBarButton;
-
-            constructor(parentLocator?: Locators.Locator);
-        }
-    }
-
-    export module Blades {
-        export class Blade extends MsPortalTestFx.PortalElement {
-            public title: string;
-
-            constructor(title: string);
-            clickCommand(commandText: string): Q.Promise<Blade>;
-            getTiles(): Q.Promise<Parts.Tile[]>;
-        }
-
-        export class CreateBlade extends Blade {
-            public actionBar: ActionBars.CreateActionBar;
-        }
-
-        export class BrowseResourceBlade extends Blade {
-            constructor(title: string);
-            selectResource(resourceName: string): Q.Promise<void>;
-            filterItems(filter: string): Q.Promise<BrowseResourceBlade>;
-        }
-
-        export class PickerBlade extends Blade {
-            pickItem(item: string): Q.Promise<void>;
-        }
-
-        export class SpecPickerBlade extends Blade {
-            pickSpec(specCode: string): Q.Promise<void>;
-        }
-
-        export class QuickStartBlade extends Blade {
-            constructor();
-            clickLink(linkText: string): Q.Promise<void>;
-        }
-
-        export class UsersBlade extends Blade {
-            constructor();
-        }
-    }
-
-    export module Controls {
-        export class FormElement extends MsPortalTestFx.PortalElement {
-            protected label: string;
-
-            constructor(baseLocator: Locators.Locator, parentLocator?: Locators.Locator, label?: string);
-        }
-
-        export class CheckBoxField extends FormElement {
-            constructor(parentLocator?: Locators.Locator, label?: string);
-        }
-
-        export class SelectorField extends FormElement {
-            constructor(parentLocator?: Locators.Locator, label?: string);
-            openPicker(): Q.Promise<void>;
-        }
-
-        export class CreatorAndSelectorField extends FormElement {
-            constructor(parentLocator?: Locators.Locator, selectModeLabel?: string, createModeLabel?: string);
-            openPicker(): Q.Promise<void>;
-            clickCreateNew(): Q.Promise<CreatorAndSelectorField>;
-            enterNewValue(...var_args: string[]): Q.Promise<CreatorAndSelectorField>;
-        }
-
-        export class GridCell extends MsPortalTestFx.PortalElement {
-            constructor(text: string, parentLocator?: Locators.Locator);
-            getLocator(): Locators.Locator;
-        }
-
-        export class TextField extends FormElement {
-            constructor(parentLocator?: Locators.Locator, label?: string, baseLocator?: Locators.Locator);
-            sendKeys(...var_args: string[]): Q.Promise<void>;
-        }
-
-        export class ResourceFilterTextField extends TextField {
-            constructor(parentLocator?: Locators.Locator);
-        }
-
-        export class HotSpot extends PortalElement {
-            constructor(parentLocator?: Locators.Locator, baseLocator?: Locators.Locator);
-            isSelected(): Q.Promise<boolean>;
-        }
-    }
-
-    export module Parts {
-        export class Part extends MsPortalTestFx.PortalElement {
-            public innerText: string;
-
-            constructor(parentLocator?: Locators.Locator, innerText?: string, baseLocator?: Locators.Locator);
-            isSelected(): Q.Promise<boolean>;
-            isLoaded(): Q.Promise<boolean>;
-            waitUntilLoaded(timeout?: number): Q.Promise<boolean>;
-            isClickable(): Q.Promise<boolean>;
-            hasError(): Q.Promise<boolean>;
-        }
-
-        export class PartProperty extends MsPortalTestFx.PortalElement {
-            public name: string;
-
-            constructor(name: string, parentLocator?: Locators.Locator);
-            getValue(): Q.Promise<string>;
-        }
-
-        export class ResourceSummaryPart extends Part {
-            public properties: Array<PartProperty>;
-            public resourceGroupProperty: PartProperty;
-            public quickStartHotSpot: Controls.HotSpot;
-            public accessHotSpot: Controls.HotSpot;
-
-            constructor(parentLocator?: Locators.Locator);
-        }
-
-        class PricingTierPart extends Part {
-        }
-
-        export class Tile extends MsPortalTestFx.PortalElement {
-            public progressLocator: Locators.Locator;
-
-            constructor(parentLocator?: Locators.Locator);
-            tryPin(): Q.Promise<void>;
-            getPart(): Part;
-            waitUntilLoaded(timeout?: number): Q.Promise<void>;
-        }
-    }
-
-    export module Commands {
-        export class ContextMenu extends PortalElement {
-            constructor();
-            public hasItem(text: string): Q.Promise<boolean>;
-            public clickItem(text: string): Q.Promise<void>;
-        }
-
-        export class ContextMenuItem extends PortalElement {
-            constructor(parentLocator: Locators.Locator, text?: string);
-        }
-    }
-
-    export module Notifications {
-        export class Notification extends PortalElement {
-            constructor();
-            getTitle(): Q.Promise<string>;
-            getDescription(): Q.Promise<string>;
-        }
-
-        export class NotificationsMenu extends PortalElement {
-            constructor();
-            waitForNewNotification(title?: string, description?: string, timeout?: number): Q.Promise<Notification>;
-        }
-    }
-
-    export module Tests {
-        export module Parts {
-            export function canPinAllBladeParts(targetBladeDeepLink: string, targetBladeTitle: string, timeout?: number): Q.Promise<boolean>;
-        }
-    }
-
-    export class PortalElement {
-        public baseLocator: Locators.Locator;
-        protected parentLocator: Locators.Locator;
-
-        constructor(baseLocator: Locators.Locator, parentLocator?: Locators.Locator);
-        click(): Q.Promise<void>;
-        rightClick(): Q.Promise<void>;
-        getAttribute(attributeName: string): Q.Promise<string>;
-        sendKeys(...var_args: string[]): Q.Promise<void>;
-        getText(): Q.Promise<string>;
-        isPresent(): Q.Promise<boolean>;
-        isElementPresent(subLocator: Locators.Locator): Q.Promise<boolean>;
-        isDisplayed(): Q.Promise<boolean>;
-        getLocator(): Locators.Locator;
-    }
-
-    export interface TestExtension {
-        name: string;
-        uri: string;
-    }
-
-    export interface Feature {
-        name: string;
-        value: string;
-    }
-
-    export interface PortalContext {
-        capabilities: {
-            browserName: string;
-            chromeOptions: {
-                args: string[]
-            }
-        },
-        chromeDriverPath?: string,
-        portalUrl: string;
-        signInUrl?: string;
-        signInEmail?: string;
-        signInPassword?: string;
-        features?: Feature[];
-        testExtensions?: TestExtension[];
-    }
-
-    export enum LogLevel {
-        All,
-        Debug,
-        Info,
-        Warning,
-        Severe,
-        Off
-    }
-
-    export class Portal {
-        portalContext: PortalContext;
-
-        goHome(timeout?: number): Q.Promise<void>;
-        openGalleryCreateBlade(galleryPackageName: string, bladeTitle: string, timeout?: number): Q.Promise<Blades.CreateBlade>;
-        openBrowseBlade(resourceProvider: string, resourceType: string, bladeTitle: string, timeout?: number): Q.Promise<Blades.BrowseResourceBlade>;
-        openResourceBlade(resourceId: string, bladeTitle: string, timeout?: number): Q.Promise<Blades.Blade>;
-        navigateToDeepLink(deepLink: string, timeout?: number): Q.Promise<any>;
-        waitForElementVisible(locator: Locators.Locator, timeout?: number): Q.Promise<boolean>;
-        waitForElementNotVisible(locator: Locators.Locator, timeout?: number): Q.Promise<boolean>;
-        waitUntilElementContainsAttribute(locator: Locators.Locator, attributeName: string, attributeValue: string, timeout?: number): Q.Promise<any>;
-        waitUntilElementDoesNotContainAttribute(locator: Locators.Locator, attributeName: string, attributeValue: string, timeout?: number): Q.Promise<any>;
-        waitForElementLocated(locator: Locators.Locator, timeout?: number): Q.Promise<any>;
-        waitForElementsLocated(locator: Locators.Locator, timeout?: number): Q.Promise<any[]>;
-        takeScreenshot(filePrefix?: string): Q.Promise<string>;
-        getBrowserLogs(level: LogLevel): Q.Promise<string[]>;
-        executeScript<T>(script: string): Q.Promise<T>;
-        applyFeature(name: string, value: string): void;
-        getCurrentUrl(): Q.Promise<string>;
-        quit(): Q.Promise<any>;
-    }
-
-    export class SplashScreen extends PortalElement {
-        clickUntrustedExtensionsOkButton(): Q.Promise<void>;
-    }
-
-    export class StartBoard extends PortalElement {
-        constructor();
-        getTiles(): Q.Promise<Parts.Tile[]>;
-    }
-
-    export var portal: Portal;
-}
-
-
-
-declare module "MsPortalFx-Test" {
-    export = MsPortalTestFx;
-}
diff --git a/msportalfx-test/tsconfig.json b/msportalfx-test/tsconfig.json
new file mode 100644
index 0000000000..905d77b6f1
--- /dev/null
+++ b/msportalfx-test/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "msportalfx-test-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mssql/index.d.ts b/mssql/index.d.ts
new file mode 100644
index 0000000000..f35d05f470
--- /dev/null
+++ b/mssql/index.d.ts
@@ -0,0 +1,272 @@
+// Type definitions for mssql v3.1.0
+// Project: https://www.npmjs.com/package/mssql
+// Definitions by: COLSA Corporation <http://www.colsa.com/>, Ben Farr <https://github.com/jaminfarr>, Vitor Buzinaro <https://github.com/buzinas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import events = require('events');
+
+type sqlTypeWithNoParams = { type: sqlTypeFactoryWithNoParams }
+type sqlTypeWithLength = { type: sqlTypeFactoryWithLength, length: number }
+type sqlTypeWithScale = { type: sqlTypeFactoryWithScale, scale: number }
+type sqlTypeWithPrecisionScale = { type: sqlTypeFactoryWithPrecisionScale, precision: number, scale: number }
+type sqlTypeWithTvpType = { type: sqlTypeFactoryWithTvpType, tvpType: any }
+
+type sqlTypeFactoryWithNoParams = () => sqlTypeWithNoParams;
+type sqlTypeFactoryWithLength = (length?: number) => sqlTypeWithLength;
+type sqlTypeFactoryWithScale = (scale?: number) => sqlTypeWithScale;
+type sqlTypeFactoryWithPrecisionScale = (precision?: number, scale?: number) => sqlTypeWithPrecisionScale;
+type sqlTypeFactoryWithTvpType = (tvpType: any) => sqlTypeWithTvpType;
+
+export declare var VarChar: sqlTypeFactoryWithLength;
+export declare var NVarChar: sqlTypeFactoryWithLength;
+export declare var Text: sqlTypeFactoryWithNoParams;
+export declare var Int: sqlTypeFactoryWithNoParams;
+export declare var BigInt: sqlTypeFactoryWithNoParams;
+export declare var TinyInt: sqlTypeFactoryWithNoParams;
+export declare var SmallInt: sqlTypeFactoryWithNoParams;
+export declare var Bit: sqlTypeFactoryWithNoParams;
+export declare var Float: sqlTypeFactoryWithNoParams;
+export declare var Numeric: sqlTypeFactoryWithPrecisionScale;
+export declare var Decimal: sqlTypeFactoryWithPrecisionScale;
+export declare var Real: sqlTypeFactoryWithNoParams;
+export declare var Date: sqlTypeFactoryWithNoParams;
+export declare var DateTime: sqlTypeFactoryWithNoParams;
+export declare var DateTime2: sqlTypeFactoryWithScale;
+export declare var DateTimeOffset: sqlTypeFactoryWithScale;
+export declare var SmallDateTime: sqlTypeFactoryWithNoParams;
+export declare var Time: sqlTypeFactoryWithScale;
+export declare var UniqueIdentifier: sqlTypeFactoryWithNoParams;
+export declare var SmallMoney: sqlTypeFactoryWithNoParams;
+export declare var Money: sqlTypeFactoryWithNoParams;
+export declare var Binary: sqlTypeFactoryWithNoParams;
+export declare var VarBinary: sqlTypeFactoryWithLength;
+export declare var Image: sqlTypeFactoryWithNoParams;
+export declare var Xml: sqlTypeFactoryWithNoParams;
+export declare var Char: sqlTypeFactoryWithLength;
+export declare var NChar: sqlTypeFactoryWithLength;
+export declare var NText: sqlTypeFactoryWithNoParams;
+export declare var TVP: sqlTypeFactoryWithTvpType;
+export declare var UDT: sqlTypeFactoryWithNoParams;
+export declare var Geography: sqlTypeFactoryWithNoParams;
+export declare var Geometry: sqlTypeFactoryWithNoParams;
+
+export declare var TYPES: {
+    VarChar: sqlTypeFactoryWithLength;
+    NVarChar: sqlTypeFactoryWithLength;
+    Text: sqlTypeFactoryWithNoParams;
+    Int: sqlTypeFactoryWithNoParams;
+    BigInt: sqlTypeFactoryWithNoParams;
+    TinyInt: sqlTypeFactoryWithNoParams;
+    SmallInt: sqlTypeFactoryWithNoParams;
+    Bit: sqlTypeFactoryWithNoParams;
+    Float: sqlTypeFactoryWithNoParams;
+    Numeric: sqlTypeFactoryWithPrecisionScale;
+    Decimal: sqlTypeFactoryWithPrecisionScale;
+    Real: sqlTypeFactoryWithNoParams;
+    Date: sqlTypeFactoryWithNoParams;
+    DateTime: sqlTypeFactoryWithNoParams;
+    DateTime2: sqlTypeFactoryWithScale;
+    DateTimeOffset: sqlTypeFactoryWithScale;
+    SmallDateTime: sqlTypeFactoryWithNoParams;
+    Time: sqlTypeFactoryWithScale;
+    UniqueIdentifier: sqlTypeFactoryWithNoParams;
+    SmallMoney: sqlTypeFactoryWithNoParams;
+    Money: sqlTypeFactoryWithNoParams;
+    Binary: sqlTypeFactoryWithNoParams;
+    VarBinary: sqlTypeFactoryWithLength;
+    Image: sqlTypeFactoryWithNoParams;
+    Xml: sqlTypeFactoryWithNoParams;
+    Char: sqlTypeFactoryWithLength;
+    NChar: sqlTypeFactoryWithLength;
+    NText: sqlTypeFactoryWithNoParams;
+    TVP: sqlTypeFactoryWithTvpType;
+    UDT: sqlTypeFactoryWithNoParams;
+    Geography: sqlTypeFactoryWithNoParams;
+    Geometry: sqlTypeFactoryWithNoParams;
+};
+
+export declare var MAX: number;
+export declare var fix: boolean;
+export declare var Promise: any;
+
+
+interface IMap extends Array<{ js: any, sql: any }> {
+    register(jstype: any, sql: any): void;
+}
+
+export declare var map: IMap;
+
+export declare var DRIVERS: string[];
+
+type recordSet = any;
+type IIsolationLevel = number;
+
+export declare var ISOLATION_LEVEL: {
+    READ_UNCOMMITTED: IIsolationLevel
+    READ_COMMITTED: IIsolationLevel
+    REPEATABLE_READ: IIsolationLevel
+    SERIALIZABLE: IIsolationLevel
+    SNAPSHOT: IIsolationLevel
+}
+
+export interface IOptions {
+    encrypt: boolean;
+}
+
+
+export interface IPool {
+    min: number;
+    max: number;
+    idleTimeoutMillis: number;
+}
+
+export declare var pool: IPool;
+
+export interface config {
+    driver?: string;
+    user?: string;
+    password?: string;
+    server: string;
+    port?: number;
+    domain?: string;
+    database: string;
+    connectionTimeout?: number;
+    requestTimeout?: number;
+    stream?: boolean;
+    options?: IOptions;
+    pool?: IPool;
+}
+
+export declare class Connection extends events.EventEmitter {
+    public connected: boolean;
+    public connecting: boolean;
+    public driver: string;
+    public constructor(config: config, callback?: (err?: any) => void);
+    public connect(): Promise<void>;
+    public connect(callback: (err: any) => void): void;
+    public close(): Promise<void>;
+    public close(callback: (err: any) => void): void;
+}
+
+export declare class ConnectionError implements Error {
+    constructor(message: string, code?: any)
+    public name: string;
+    public message: string;
+    public code: string;
+}
+
+declare class columns {
+    public add(name: string, type: any, options: any): void;
+}
+
+declare class rows {
+    public add(...row: any[]): void;
+}
+
+export declare class Table {
+    public create: boolean;
+    public columns: columns;
+    public rows: rows;
+    public constructor(tableName: string);
+}
+
+interface IRequestParameters {
+    [name: string]: {
+        name: string;
+        type: any;
+        io: number;
+        value: any;
+        length: number;
+        scale: number;
+        precision: number;
+        tvpType: any;
+    }
+}
+
+export declare class Request extends events.EventEmitter {
+    public connection: Connection;
+    public transaction: Transaction;
+    public pstatement: PreparedStatement;
+    public parameters: IRequestParameters;
+    public verbose: boolean;
+    public multiple: boolean;
+    public canceled: boolean;
+    public stream: any;
+    public constructor(connection?: Connection);
+    public constructor(transaction: Transaction);
+    public constructor(preparedStatement: PreparedStatement);
+    public execute(procedure: string): Promise<recordSet>;
+    public execute<Entity>(procedure: string, callback: (err?: any, recordsets?: Entity[], returnValue?: any, rowsAffected?: number) => void): void;
+    public input(name: string, value: any): void;
+    public input(name: string, type: any, value: any): void;
+    public output(name: string, type: any, value?: any): void;
+    public pipe(stream: NodeJS.WritableStream): void;
+    public query(command: string): Promise<void>;
+    public query<Entity>(command: string): Promise<Entity[]>;
+    public query(command: string, callback: (err?: any, recordset?: any, rowsAffected?: number) => void): void;
+    public query<Entity>(command: string, callback: (err?: any, recordset?: Entity[]) => void): void;
+    public batch(batch: string): Promise<recordSet>;
+    public batch<Entity>(batch: string): Promise<Entity[]>;
+    public batch(batch: string, callback: (err?: any, recordset?: any) => void): void;
+    public batch<Entity>(batch: string, callback: (err?: any, recordset?: Entity[]) => void): void;
+    public bulk(table: Table): Promise<void>;
+    public bulk(table: Table, callback: (err: any, rowCount: any) => void): void;
+    public cancel(): void;
+}
+
+export declare class RequestError implements Error {
+    constructor(message: string, code?: any)
+    public name: string;
+    public message: string;
+    public code: string;
+}
+
+export declare class Transaction extends events.EventEmitter {
+    public connection: Connection;
+    public isolationLevel: IIsolationLevel;
+    public constructor(connection?: Connection);
+    public begin(isolationLevel?: IIsolationLevel): Promise<void>;
+    public begin(isolationLevel?: IIsolationLevel, callback?: (err?: any) => void): void;
+    public commit(): Promise<void>;
+    public commit(callback: (err?: any) => void): void;
+    public rollback(): Promise<void>;
+    public rollback(callback: (err?: any) => void): void;
+}
+
+export declare class TransactionError implements Error {
+    constructor(message: string, code?: any)
+    public name: string;
+    public message: string;
+    public code: string;
+}
+
+export declare class PreparedStatement extends events.EventEmitter {
+    public connection: Connection;
+    public transaction: Transaction;
+    public prepared: boolean;
+    public statement: string;
+    public parameters: IRequestParameters;
+    public multiple: boolean;
+    public stream: any;
+    public constructor(connection?: Connection);
+    public input(name: string, type: any): void;
+    public output(name: string, type: any): void;
+    public prepare(statement?: string): Promise<void>;
+    public prepare(statement?: string, callback?: (err?: any) => void): void;
+    public execute(values: Object): Promise<recordSet>;
+    public execute<Entity>(values: Object): Promise<Entity[]>;
+    public execute(values: Object, callback: (err: any, recordSet: recordSet, rowsAffected: number) => void): void;
+    public execute<Entity>(values: Object, callback: (err: any, recordSet: Entity[]) => void): void;
+    public unprepare(): Promise<void>;
+    public unprepare(callback: (err?: any) => void): void;
+}
+
+export declare class PreparedStatementError implements Error {
+    constructor(message: string, code?: any)
+    public name: string;
+    public message: string;
+    public code: string;
+}
diff --git a/mssql/mssql-tests.ts b/mssql/mssql-tests.ts
index f1f1a20b2c..52ae6f953c 100644
--- a/mssql/mssql-tests.ts
+++ b/mssql/mssql-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../node/node.d.ts" />
-/// <reference path="mssql.d.ts" />
+/// <reference types="node" />
 
 import sql = require('mssql');
 
diff --git a/mssql/mssql.d.ts b/mssql/mssql.d.ts
deleted file mode 100644
index 500be24b86..0000000000
--- a/mssql/mssql.d.ts
+++ /dev/null
@@ -1,273 +0,0 @@
-// Type definitions for mssql v2.2.0
-// Project: https://www.npmjs.com/package/mssql
-// Definitions by: COLSA Corporation <http://www.colsa.com/>, Ben Farr <https://github.com/jaminfarr>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "mssql" {
-    import events = require('events');
-
-    type sqlTypeWithNoParams       = { type: sqlTypeFactoryWithNoParams }
-    type sqlTypeWithLength         = { type: sqlTypeFactoryWithLength, length: number }
-    type sqlTypeWithScale          = { type: sqlTypeFactoryWithScale, scale: number }
-    type sqlTypeWithPrecisionScale = { type: sqlTypeFactoryWithPrecisionScale, precision: number, scale: number }
-    type sqlTypeWithTvpType        = { type: sqlTypeFactoryWithTvpType, tvpType: any }
-
-    type sqlTypeFactoryWithNoParams       = ()                                   => sqlTypeWithNoParams;
-    type sqlTypeFactoryWithLength         = (length?: number)                    => sqlTypeWithLength;
-    type sqlTypeFactoryWithScale          = (scale?: number)                     => sqlTypeWithScale;
-    type sqlTypeFactoryWithPrecisionScale = (precision?: number, scale?: number) => sqlTypeWithPrecisionScale;
-    type sqlTypeFactoryWithTvpType        = (tvpType: any)                       => sqlTypeWithTvpType;
-
-    export var VarChar:          sqlTypeFactoryWithLength;
-    export var NVarChar:         sqlTypeFactoryWithLength;
-    export var Text:             sqlTypeFactoryWithNoParams;
-    export var Int:              sqlTypeFactoryWithNoParams;
-    export var BigInt:           sqlTypeFactoryWithNoParams;
-    export var TinyInt:          sqlTypeFactoryWithNoParams;
-    export var SmallInt:         sqlTypeFactoryWithNoParams;
-    export var Bit:              sqlTypeFactoryWithNoParams;
-    export var Float:            sqlTypeFactoryWithNoParams;
-    export var Numeric:          sqlTypeFactoryWithPrecisionScale;
-    export var Decimal:          sqlTypeFactoryWithPrecisionScale;
-    export var Real:             sqlTypeFactoryWithNoParams;
-    export var Date:             sqlTypeFactoryWithNoParams;
-    export var DateTime:         sqlTypeFactoryWithNoParams;
-    export var DateTime2:        sqlTypeFactoryWithScale;
-    export var DateTimeOffset:   sqlTypeFactoryWithScale;
-    export var SmallDateTime:    sqlTypeFactoryWithNoParams;
-    export var Time:             sqlTypeFactoryWithScale;
-    export var UniqueIdentifier: sqlTypeFactoryWithNoParams;
-    export var SmallMoney:       sqlTypeFactoryWithNoParams;
-    export var Money:            sqlTypeFactoryWithNoParams;
-    export var Binary:           sqlTypeFactoryWithNoParams;
-    export var VarBinary:        sqlTypeFactoryWithLength;
-    export var Image:            sqlTypeFactoryWithNoParams;
-    export var Xml:              sqlTypeFactoryWithNoParams;
-    export var Char:             sqlTypeFactoryWithLength;
-    export var NChar:            sqlTypeFactoryWithLength;
-    export var NText:            sqlTypeFactoryWithNoParams;
-    export var TVP:              sqlTypeFactoryWithTvpType;
-    export var UDT:              sqlTypeFactoryWithNoParams;
-    export var Geography:        sqlTypeFactoryWithNoParams;
-    export var Geometry:         sqlTypeFactoryWithNoParams;
-
-    export var TYPES: {
-        VarChar:          sqlTypeFactoryWithLength;
-        NVarChar:         sqlTypeFactoryWithLength;
-        Text:             sqlTypeFactoryWithNoParams;
-        Int:              sqlTypeFactoryWithNoParams;
-        BigInt:           sqlTypeFactoryWithNoParams;
-        TinyInt:          sqlTypeFactoryWithNoParams;
-        SmallInt:         sqlTypeFactoryWithNoParams;
-        Bit:              sqlTypeFactoryWithNoParams;
-        Float:            sqlTypeFactoryWithNoParams;
-        Numeric:          sqlTypeFactoryWithPrecisionScale;
-        Decimal:          sqlTypeFactoryWithPrecisionScale;
-        Real:             sqlTypeFactoryWithNoParams;
-        Date:             sqlTypeFactoryWithNoParams;
-        DateTime:         sqlTypeFactoryWithNoParams;
-        DateTime2:        sqlTypeFactoryWithScale;
-        DateTimeOffset:   sqlTypeFactoryWithScale;
-        SmallDateTime:    sqlTypeFactoryWithNoParams;
-        Time:             sqlTypeFactoryWithScale;
-        UniqueIdentifier: sqlTypeFactoryWithNoParams;
-        SmallMoney:       sqlTypeFactoryWithNoParams;
-        Money:            sqlTypeFactoryWithNoParams;
-        Binary:           sqlTypeFactoryWithNoParams;
-        VarBinary:        sqlTypeFactoryWithLength;
-        Image:            sqlTypeFactoryWithNoParams;
-        Xml:              sqlTypeFactoryWithNoParams;
-        Char:             sqlTypeFactoryWithLength;
-        NChar:            sqlTypeFactoryWithLength;
-        NText:            sqlTypeFactoryWithNoParams;
-        TVP:              sqlTypeFactoryWithTvpType;
-        UDT:              sqlTypeFactoryWithNoParams;
-        Geography:        sqlTypeFactoryWithNoParams;
-        Geometry:         sqlTypeFactoryWithNoParams;
-    };
-
-    export var MAX: number;
-    export var fix: boolean;
-    export var Promise: any;
-
-
-    interface IMap extends Array<{js: any, sql: any }> {
-        register(jstype: any, sql: any): void;
-    }
-
-    export var map: IMap;
-
-    export var DRIVERS: string[];
-
-    type recordSet = any;
-    type IIsolationLevel = number;
-
-    export var ISOLATION_LEVEL: {
-        READ_UNCOMMITTED: IIsolationLevel
-        READ_COMMITTED: IIsolationLevel
-        REPEATABLE_READ: IIsolationLevel
-        SERIALIZABLE: IIsolationLevel
-        SNAPSHOT: IIsolationLevel
-    }
-
-    export interface IOptions {
-        encrypt: boolean;
-    }
-
-
-    export interface IPool {
-        min: number;
-        max: number;
-        idleTimeoutMillis: number;
-    }
-
-    export var pool: IPool;
-
-    export interface config {
-        driver?: string;
-        user?: string;
-        password?: string;
-        server: string;
-        port?: number;
-        domain?: string;
-        database: string;
-        connectionTimeout?: number;
-        requestTimeout?: number;
-        stream?: boolean;
-        options?: IOptions;
-        pool?: IPool;
-    }
-
-    export class Connection extends events.EventEmitter {
-        public connected: boolean;
-        public connecting: boolean;
-        public driver: string;
-        public constructor(config: config, callback?: (err?: any) => void);
-        public connect(): Promise<void>;
-        public connect(callback: (err: any) => void): void;
-        public close(): Promise<void>;
-        public close(callback: (err: any) => void): void;
-    }
-
-    export class ConnectionError implements Error {
-        constructor(message: string, code?: any)
-        public name: string;
-        public message: string;
-        public code: string;
-    }
-
-    class columns {
-        public add(name: string, type: any, options: any): void;
-    }
-
-    class rows {
-        public add(...row: any[]): void;
-    }
-
-    export class Table {
-        public create: boolean;
-        public columns: columns;
-        public rows: rows;
-        public constructor(tableName: string);
-    }
-
-    interface IRequestParameters {
-        [name: string]: {
-            name: string;
-            type: any;
-            io: number;
-            value: any;
-            length: number;
-            scale: number;
-            precision: number;
-            tvpType: any;
-        }
-    }
-
-    export class Request extends events.EventEmitter {
-        public connection: Connection;
-        public transaction: Transaction;
-        public pstatement: PreparedStatement;
-        public parameters: IRequestParameters;
-        public verbose: boolean;
-        public multiple: boolean;
-        public canceled: boolean;
-        public stream: any;
-        public constructor(connection?: Connection);
-        public constructor(transaction: Transaction);
-        public constructor(preparedStatement: PreparedStatement);
-        public execute(procedure: string): Promise<recordSet>;
-        public execute<Entity>(procedure: string, callback: (err?: any, recordsets?: Entity[], returnValue?: any) => void): void;
-        public input(name: string, value: any): void;
-        public input(name: string, type: any, value: any): void;
-        public output(name: string, type: any, value?: any): void;
-        public pipe(stream: NodeJS.WritableStream): void;
-        public query(command: string): Promise<void>;
-        public query<Entity>(command: string): Promise<Entity[]>;
-        public query(command: string, callback: (err?: any, recordset?: any) => void): void;
-        public query<Entity>(command: string, callback: (err?: any, recordset?: Entity[]) => void): void;
-        public batch(batch: string): Promise<recordSet>;
-        public batch<Entity>(batch: string): Promise<Entity[]>;
-        public batch(batch: string, callback: (err?: any, recordset?: any) => void): void;
-        public batch<Entity>(batch: string, callback: (err?: any, recordset?: Entity[]) => void): void;
-        public bulk(table: Table): Promise<void>;
-        public bulk(table: Table, callback: (err: any, rowCount: any) => void): void;
-        public cancel(): void;
-    }
-
-    export class RequestError implements Error {
-        constructor(message: string, code?: any)
-        public name: string;
-        public message: string;
-        public code: string;
-    }
-
-    export class Transaction extends events.EventEmitter {
-        public connection: Connection;
-        public isolationLevel: IIsolationLevel;
-        public constructor(connection?: Connection);
-        public begin(isolationLevel?: IIsolationLevel): Promise<void>;
-        public begin(isolationLevel?: IIsolationLevel, callback?: (err?: any) => void): void;
-        public commit(): Promise<void>;
-        public commit(callback: (err?: any) => void): void;
-        public rollback(): Promise<void>;
-        public rollback(callback: (err?: any) => void): void;
-    }
-
-    export class TransactionError implements Error {
-        constructor(message: string, code?: any)
-        public name: string;
-        public message: string;
-        public code: string;
-    }
-
-    export class PreparedStatement extends events.EventEmitter {
-        public connection: Connection;
-        public transaction: Transaction;
-        public prepared: boolean;
-        public statement: string;
-        public parameters: IRequestParameters;
-        public multiple: boolean;
-        public stream: any;
-        public constructor(connection?: Connection);
-        public input(name: string, type: any): void;
-        public output(name: string, type: any): void;
-        public prepare(statement?: string): Promise<void>;
-        public prepare(statement?: string, callback?: (err?: any) => void): void;
-        public execute(values: Object): Promise<recordSet>;
-        public execute<Entity>(values: Object): Promise<Entity[]>;
-        public execute(values: Object, callback: (err: any, recordSet: recordSet) => void): void;
-        public execute<Entity>(values: Object, callback: (err: any, recordSet: Entity[]) => void): void;
-        public unprepare(): Promise<void>;
-        public unprepare(callback: (err?: any) => void): void;
-    }
-
-    export class PreparedStatementError implements Error {
-        constructor(message: string, code?: any)
-        public name: string;
-        public message: string;
-        public code: string;
-    }
-}
diff --git a/mssql/tsconfig.json b/mssql/tsconfig.json
new file mode 100644
index 0000000000..7ebfbbaddc
--- /dev/null
+++ b/mssql/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mssql-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mu2/index.d.ts b/mu2/index.d.ts
new file mode 100644
index 0000000000..2f126a201d
--- /dev/null
+++ b/mu2/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for mu2
+// Project: http://github.com/raycmorgan/mu
+// Definitions by: Jeff Goddard <https://github.com/jedigo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/mu2.d.ts
+
+/// <reference types="node" />
+
+
+export declare var root: string;
+
+export declare function compileAndRender(templateName: string, view: any): NodeJS.ReadableStream;
+
+export declare function compile(filename: string, callback: (err: Error, parsed: IParsed) => void): void;
+
+export declare function compileText(name: string, template: string, callback: (err: Error, parsed: IParsed) => void): void;
+export declare function compileText(name: string, template: string): IParsed;
+export declare function compileText(template: string): IParsed;
+
+export declare function render(filenameOrParsed: string, view: any): NodeJS.ReadableStream;
+export declare function render(filenameOrParsed: IParsed, view: any): NodeJS.ReadableStream;
+
+export declare function renderText(template: string, view: any, partials?: any): NodeJS.ReadableStream;
+
+export declare function clearCache(templateName?: string): void;
+
+export interface IParsed { }
diff --git a/mu2/mu2-tests.ts b/mu2/mu2-tests.ts
index 24b85ec4df..dc960f20d7 100644
--- a/mu2/mu2-tests.ts
+++ b/mu2/mu2-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="mu2.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import mu2 = require('mu2');
 import stream = require('stream');
diff --git a/mu2/mu2.d.ts b/mu2/mu2.d.ts
deleted file mode 100644
index e2c84af069..0000000000
--- a/mu2/mu2.d.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// Type definitions for mu2
-// Project: http://github.com/raycmorgan/mu
-// Definitions by: Jeff Goddard <https://github.com/jedigo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/mu2.d.ts
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "mu2" {
-	export var root: string;
-
-	export function compileAndRender(templateName: string, view: any): NodeJS.ReadableStream;
-
-	export function compile(filename: string, callback: (err: Error, parsed: IParsed) => void): void;
-
-	export function compileText(name: string, template: string, callback: (err: Error, parsed: IParsed) => void): void;
-	export function compileText(name: string, template: string): IParsed;
-	export function compileText(template: string): IParsed;
-
-	export function render(filenameOrParsed: string, view: any): NodeJS.ReadableStream;
-	export function render(filenameOrParsed: IParsed, view: any): NodeJS.ReadableStream;
-
-	export function renderText(template: string, view: any, partials?: any): NodeJS.ReadableStream;
-
-	export function clearCache(templateName?: string): void;
-
-	export interface IParsed { }
-}
diff --git a/mu2/tsconfig.json b/mu2/tsconfig.json
new file mode 100644
index 0000000000..08d45d6c5b
--- /dev/null
+++ b/mu2/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mu2-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/multer/index.d.ts b/multer/index.d.ts
new file mode 100644
index 0000000000..e408e2b268
--- /dev/null
+++ b/multer/index.d.ts
@@ -0,0 +1,110 @@
+// Type definitions for multer
+// Project: https://github.com/expressjs/multer
+// Definitions by: jt000 <https://github.com/jt000>, vilicvane <https://vilic.github.io/>, David Broder-Rodgers <https://github.com/DavidBR-SW>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import express = require('express');
+
+declare namespace multer {
+    interface Field {
+        /** The field name. */
+        name: string;
+        /** Optional maximum number of files per field to accept. */
+        maxCount?: number;
+    }
+
+    interface Options {
+        /** The destination directory for the uploaded files. */
+        dest?: string;
+        /** The storage engine to use for uploaded files. */
+        storage?: StorageEngine;
+        /** An object specifying the size limits of the following optional properties. This object is passed to busboy directly, and the details of properties can be found on https://github.com/mscdex/busboy#busboy-methods */
+        limits?: {
+            /** Max field name size (Default: 100 bytes) */
+            fieldNameSize?: number;
+            /** Max field value size (Default: 1MB) */
+            fieldSize?: number;
+            /** Max number of non- file fields (Default: Infinity) */
+            fields?: number;
+            /** For multipart forms, the max file size (in bytes)(Default: Infinity) */
+            fileSize?: number;
+            /** For multipart forms, the max number of file fields (Default: Infinity) */
+            files?: number;
+            /** For multipart forms, the max number of parts (fields + files)(Default: Infinity) */
+            parts?: number;
+            /** For multipart forms, the max number of header key=> value pairs to parse Default: 2000(same as node's http). */
+            headerPairs?: number;
+        };
+        /** A function to control which files to upload and which to skip. */
+        fileFilter?: (req: Express.Request, file: Express.Multer.File, callback: (error: Error, acceptFile: boolean) => void) => void;
+    }
+
+    interface StorageEngine {
+        _handleFile(req: express.Request, file: Express.Multer.File, callback: (error?: any, info?: Express.Multer.File) => void): void;
+        _removeFile(req: express.Request, file: Express.Multer.File, callback: (error: Error) => void): void;
+    }
+
+    interface DiskStorageOptions {
+        /** A function used to determine within which folder the uploaded files should be stored. Defaults to the system's default temporary directory. */
+        destination?: (req: Express.Request, file: Express.Multer.File, callback: (error: Error, destination: string) => void) => void;
+        /** A function used to determine what the file should be named inside the folder. Defaults to a random name with no file extension. */
+        filename?: (req: Express.Request, file: Express.Multer.File, callback: (error: Error, filename: string) => void) => void;
+    }
+
+    interface Instance {
+        /** Accept a single file with the name fieldname. The single file will be stored in req.file. */
+        single(fieldame: string): express.RequestHandler;
+        /** Accept an array of files, all with the name fieldname. Optionally error out if more than maxCount files are uploaded. The array of files will be stored in req.files. */
+        array(fieldame: string, maxCount?: number): express.RequestHandler;
+        /** Accept a mix of files, specified by fields. An object with arrays of files will be stored in req.files. */
+        fields(fields: Field[]): express.RequestHandler;
+        /** Accepts all files that comes over the wire. An array of files will be stored in req.files. */
+        any(): express.RequestHandler;
+    }
+}
+
+interface Multer {
+
+    (options?: multer.Options): multer.Instance;
+
+    /* The disk storage engine gives you full control on storing files to disk. */
+    diskStorage(options: multer.DiskStorageOptions): multer.StorageEngine;
+    /* The memory storage engine stores the files in memory as Buffer objects. */
+    memoryStorage(): multer.StorageEngine;
+}
+
+declare var multer: Multer;
+
+export = multer;
+
+declare namespace Express {
+    export interface Request {
+        file: Multer.File;
+        files: {
+            [fieldname: string]: Multer.File
+        };
+    }
+
+    namespace Multer {
+        export interface File {
+            /** Field name specified in the form */
+            fieldname: string;
+            /** Name of the file on the user's computer */
+            originalname: string;
+            /** Encoding type of the file */
+            encoding: string;
+            /** Mime type of the file */
+            mimetype: string;
+            /** Size of the file in bytes */
+            size: number;
+            /** The folder to which the file has been saved (DiskStorage) */
+            destination: string;
+            /** The name of the file within the destination (DiskStorage) */
+            filename: string;
+            /** Location of the uploaded file (DiskStorage) */
+            path: string;
+            /** A Buffer of the entire file (MemoryStorage) */
+            buffer: Buffer;
+        }
+    }
+}
diff --git a/multer/multer-tests.ts b/multer/multer-tests.ts
index 7d4ca5d171..00cbc52b98 100644
--- a/multer/multer-tests.ts
+++ b/multer/multer-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../express/express.d.ts" />
-/// <reference path="multer.d.ts" />
+
+
 
 import express = require('express');
 import multer = require('multer');
diff --git a/multer/multer.d.ts b/multer/multer.d.ts
deleted file mode 100644
index 8bb3c263d3..0000000000
--- a/multer/multer.d.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-// Type definitions for multer
-// Project: https://github.com/expressjs/multer
-// Definitions by: jt000 <https://github.com/jt000>, vilicvane <https://vilic.github.io/>, David Broder-Rodgers <https://github.com/DavidBR-SW>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare namespace Express {
-    export interface Request {
-        file: Multer.File;
-        files: {
-            [fieldname: string]: Multer.File
-        };
-    }
-
-    namespace Multer {
-        export interface File {
-            /** Field name specified in the form */
-            fieldname: string;
-            /** Name of the file on the user's computer */
-            originalname: string;
-            /** Encoding type of the file */
-            encoding: string;
-            /** Mime type of the file */
-            mimetype: string;
-            /** Size of the file in bytes */
-            size: number;
-            /** The folder to which the file has been saved (DiskStorage) */
-            destination: string;
-            /** The name of the file within the destination (DiskStorage) */
-            filename: string;
-            /** Location of the uploaded file (DiskStorage) */
-            path: string;
-            /** A Buffer of the entire file (MemoryStorage) */
-            buffer: Buffer;
-        }
-    }
-}
-
-declare module "multer" {
-    import express = require('express');
-
-    namespace multer {
-        interface Field {
-            /** The field name. */
-            name: string;
-            /** Optional maximum number of files per field to accept. */
-            maxCount?: number;
-        }
-
-        interface Options {
-            /** The destination directory for the uploaded files. */
-            dest?: string;
-            /** The storage engine to use for uploaded files. */
-            storage?: StorageEngine;
-            /** An object specifying the size limits of the following optional properties. This object is passed to busboy directly, and the details of properties can be found on https://github.com/mscdex/busboy#busboy-methods */
-            limits?: {
-                /** Max field name size (Default: 100 bytes) */
-                fieldNameSize?: number;
-                /** Max field value size (Default: 1MB) */
-                fieldSize?: number;
-                /** Max number of non- file fields (Default: Infinity) */
-                fields?: number;
-                /** For multipart forms, the max file size (in bytes)(Default: Infinity) */
-                fileSize?: number;
-                /** For multipart forms, the max number of file fields (Default: Infinity) */
-                files?: number;
-                /** For multipart forms, the max number of parts (fields + files)(Default: Infinity) */
-                parts?: number;
-                /** For multipart forms, the max number of header key=> value pairs to parse Default: 2000(same as node's http). */
-                headerPairs?: number;
-            };
-            /** A function to control which files to upload and which to skip. */
-            fileFilter?: (req: Express.Request, file: Express.Multer.File, callback: (error: Error, acceptFile: boolean) => void) => void;
-        }
-
-        interface StorageEngine {
-            _handleFile(req: express.Request, file: Express.Multer.File, callback: (error?: any, info?: Express.Multer.File) => void): void;
-            _removeFile(req: express.Request, file: Express.Multer.File, callback: (error: Error) => void): void;
-        }
-
-        interface DiskStorageOptions {
-            /** A function used to determine within which folder the uploaded files should be stored. Defaults to the system's default temporary directory. */
-            destination?: (req: Express.Request, file: Express.Multer.File, callback: (error: Error, destination: string) => void) => void;
-            /** A function used to determine what the file should be named inside the folder. Defaults to a random name with no file extension. */
-            filename?: (req: Express.Request, file: Express.Multer.File, callback: (error: Error, filename: string) => void) => void;
-        }
-
-        interface Instance {
-            /** Accept a single file with the name fieldname. The single file will be stored in req.file. */
-            single(fieldame: string): express.RequestHandler;
-            /** Accept an array of files, all with the name fieldname. Optionally error out if more than maxCount files are uploaded. The array of files will be stored in req.files. */
-            array(fieldame: string, maxCount?: number): express.RequestHandler;
-            /** Accept a mix of files, specified by fields. An object with arrays of files will be stored in req.files. */
-            fields(fields: Field[]): express.RequestHandler;
-            /** Accepts all files that comes over the wire. An array of files will be stored in req.files. */
-            any(): express.RequestHandler;
-        }
-    }
-
-    interface Multer {
-
-        (options?: multer.Options): multer.Instance;
-
-        /* The disk storage engine gives you full control on storing files to disk. */
-        diskStorage(options: multer.DiskStorageOptions): multer.StorageEngine;
-        /* The memory storage engine stores the files in memory as Buffer objects. */
-        memoryStorage(): multer.StorageEngine;
-    }
-
-    var multer: Multer;
-
-    export = multer;
-}
diff --git a/multer/tsconfig.json b/multer/tsconfig.json
new file mode 100644
index 0000000000..ac340521bd
--- /dev/null
+++ b/multer/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "multer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/multiparty/index.d.ts b/multiparty/index.d.ts
new file mode 100644
index 0000000000..5b8b6d12dc
--- /dev/null
+++ b/multiparty/index.d.ts
@@ -0,0 +1,110 @@
+// Type definitions for node-multiparty
+// Project: https://github.com/andrewrk/node-multiparty
+// Definitions by: Ken Fukuyama <https://github.com/kenfdev>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import http = require('http');
+import events = require('events');
+import stream = require('stream');
+
+export declare class Form extends events.EventEmitter {
+    constructor(options?: FormOptions);
+    /**
+     * Parses an incoming node.js request containing form data.
+     * This will cause form to emit events based off the incoming request
+     * @param request
+     * @param callback
+     */
+    parse(request: http.ServerRequest, callback?: (error: Error, fields: any, files: any) => any): void;
+}
+
+export interface File {
+    /**
+     * same as name - the field name for this file
+     */
+    fieldName: string;
+    /**
+     * the filename that the user reports for the file
+     */
+    originalFileName: string;
+    /**
+     * the absolute path of the uploaded file on disk
+     */
+    path: string;
+    /**
+     * the HTTP headers that were sent along with this file
+     */
+    headers: any;
+    /**
+     * size of the file in bytes
+     */
+    size: number;
+}
+
+interface Part extends stream.Readable {
+    /**
+     * the headers for this part. For example, you may be interested in content-type
+     */
+    headers: any;
+    /**
+     * the field name for this part
+     */
+    name: string;
+    /**
+     * only if the part is an incoming file
+     */
+    filename: string;
+    /**
+     * the byte offset of this part in the request body
+     */
+    byteOffset: number;
+    /**
+     * assuming that this is the last part in the request, this is the size of this part in bytes.
+     * You could use this, for example, to set the Content-Length header if uploading to S3.
+     * If the part had a Content-Length header then that value is used here instead.
+     */
+    byteCount: number;
+}
+
+export interface FormOptions {
+    /**
+     * sets encoding for the incoming form fields. Defaults to utf8.
+     */
+    encoding?: string;
+    /**
+     * Limits the amount of memory all fields (not files) can allocate in bytes.
+     * If this value is exceeded, an error event is emitted. The default size is 2MB.
+     */
+    maxFieldsSize?: number;
+    /**
+     * Limits the number of fields that will be parsed before emitting an error event.
+     * A file counts as a field in this case. Defaults to 1000.
+     */
+    maxFields?: number;
+    /**
+     * Only relevant when autoFiles is true.
+     * Limits the total bytes accepted for all files combined.
+     * If this value is exceeded, an error event is emitted.
+     * The default is Infinity.
+     */
+    maxFilesSize?: number;
+    /**
+     * Enables field events and disables part events for fields.
+     * This is automatically set to true if you add a field listener.
+     */
+    autoFields?: boolean;
+    /**
+     * Enables file events and disables part events for files.
+     * This is automatically set to true if you add a file listener.
+     */
+    autoFiles?: boolean;
+    /**
+     * Only relevant when autoFiles is true.
+     * The directory for placing file uploads in.
+     * You can move them later using fs.rename(). Defaults to os.tmpDir().
+     */
+    uploadDir?: string;
+}
diff --git a/multiparty/multiparty-tests.ts b/multiparty/multiparty-tests.ts
index 47e6a62f71..91d979b25b 100644
--- a/multiparty/multiparty-tests.ts
+++ b/multiparty/multiparty-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path='multiparty.d.ts' />
-/// <reference path='../node/node.d.ts' />
+
+/// <reference types="node" />
 import multiparty = require('multiparty');
 import http = require('http');
 import util = require('util');
diff --git a/multiparty/multiparty.d.ts b/multiparty/multiparty.d.ts
deleted file mode 100644
index a280c366f8..0000000000
--- a/multiparty/multiparty.d.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-// Type definitions for node-multiparty
-// Project: https://github.com/andrewrk/node-multiparty
-// Definitions by: Ken Fukuyama <https://github.com/kenfdev>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path='../node/node.d.ts' />
-
-declare module "multiparty" {
-  import http = require('http');
-  import events = require('events');
-  import stream = require('stream');
-
-  export class Form extends events.EventEmitter {
-    constructor(options?: FormOptions);
-    /**
-     * Parses an incoming node.js request containing form data.
-     * This will cause form to emit events based off the incoming request
-     * @param request
-     * @param callback
-     */
-    parse(request: http.ServerRequest, callback?: (error: Error, fields: any, files: any) => any): void;
-  }
-
-  export interface File {
-    /**
-     * same as name - the field name for this file
-     */
-    fieldName: string;
-    /**
-     * the filename that the user reports for the file
-     */
-    originalFileName: string;
-    /**
-     * the absolute path of the uploaded file on disk
-     */
-    path: string;
-    /**
-     * the HTTP headers that were sent along with this file
-     */
-    headers: any;
-    /**
-     * size of the file in bytes
-     */
-    size: number;
-  }
-
-  interface Part extends stream.Readable {
-    /**
-     * the headers for this part. For example, you may be interested in content-type
-     */
-    headers: any;
-    /**
-     * the field name for this part
-     */
-    name: string;
-    /**
-     * only if the part is an incoming file
-     */
-    filename: string;
-    /**
-     * the byte offset of this part in the request body
-     */
-    byteOffset: number;
-    /**
-     * assuming that this is the last part in the request, this is the size of this part in bytes.
-     * You could use this, for example, to set the Content-Length header if uploading to S3.
-     * If the part had a Content-Length header then that value is used here instead.
-     */
-    byteCount: number;
-  }
-
-  export interface FormOptions {
-    /**
-     * sets encoding for the incoming form fields. Defaults to utf8.
-     */
-    encoding?:string;
-    /**
-     * Limits the amount of memory all fields (not files) can allocate in bytes.
-     * If this value is exceeded, an error event is emitted. The default size is 2MB.
-     */
-    maxFieldsSize?:number;
-    /**
-     * Limits the number of fields that will be parsed before emitting an error event.
-     * A file counts as a field in this case. Defaults to 1000.
-     */
-    maxFields?:number;
-    /**
-     * Only relevant when autoFiles is true.
-     * Limits the total bytes accepted for all files combined.
-     * If this value is exceeded, an error event is emitted.
-     * The default is Infinity.
-     */
-    maxFilesSize?:number;
-    /**
-     * Enables field events and disables part events for fields.
-     * This is automatically set to true if you add a field listener.
-     */
-    autoFields?:boolean;
-    /**
-     * Enables file events and disables part events for files.
-     * This is automatically set to true if you add a file listener.
-     */
-    autoFiles?:boolean;
-    /**
-     * Only relevant when autoFiles is true.
-     * The directory for placing file uploads in.
-     * You can move them later using fs.rename(). Defaults to os.tmpDir().
-     */
-    uploadDir?:string;
-  }
-}
\ No newline at end of file
diff --git a/multiparty/tsconfig.json b/multiparty/tsconfig.json
new file mode 100644
index 0000000000..9f9426b41e
--- /dev/null
+++ b/multiparty/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "multiparty-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/multiplexjs/index.d.ts b/multiplexjs/index.d.ts
new file mode 100644
index 0000000000..61f846243d
--- /dev/null
+++ b/multiplexjs/index.d.ts
@@ -0,0 +1,2551 @@
+// Type definitions for Multiplex.js 0.9
+// Project: http://github.com/multiplex/multiplex.js
+// Definitions by: Kamyar Nazeri <http://github.com/KamyarNazeri>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare var multiplex: multiplex.MultiplexStatic;
+
+
+// Support AMD require
+declare module 'multiplexjs' {
+    export = multiplex;
+}
+
+
+// Collapse multiplex into mx
+import mx = multiplex;
+
+
+// ES6 compatibility
+interface Array<T> extends multiplex.Iterable<T> { }
+interface String extends multiplex.Iterable<string> { }
+
+
+
+declare namespace multiplex {
+
+    /**
+    * ES6 Iterable
+    */
+    interface Iterable<T> {
+        "@@iterator"(): Iterator<T>
+    }
+    interface Iterator<T> {
+        next(): IteratorResult<T>;
+        return?(value?: any): IteratorResult<T>;
+        throw?(e?: any): IteratorResult<T>;
+    }
+    interface IteratorResult<T> {
+        done: boolean;
+        value?: T;
+    }
+
+
+
+    /**
+    * Supports a simple iteration over a collection.
+    */
+    interface Enumerator<T> {
+
+        /**
+        * Advances the enumerator to the next element of the collection.
+        */
+        next(): boolean;
+
+        /**
+        * Gets the element in the collection at the current position of the enumerator.
+        */
+        current: T;
+    }
+    interface EnumeratorConstructor {
+        new <T>(generator: (yielder: (value: T) => T) => any): Enumerator<T>;
+    }
+
+
+
+    /**
+    * Exposes the enumerator, which supports a simple iteration over a collection of a specified type.
+    * Enumerable uses ES6 Iteration protocol.
+    */
+    interface Enumerable<T> extends Iterable<T> {
+
+        /**
+        * Returns an enumerator that iterates through the collection.
+        */
+        getEnumerator(): Enumerator<T>;
+    }
+    interface EnumerableConstructor {
+
+        /**
+        * Exposes the enumerator, which supports an iteration over the specified Enumerable object.
+        * @param obj An Iterable object. eg. Enumerable, Array, String, Set, Map, Iterable & Generators
+        */
+        new <T>(obj: Iterable<T>): Enumerable<T>;
+
+
+        /**
+        * Defines an enumerator, which supports an iteration over the specified Generator function.
+        * @param factory An Enumerator factory function.
+        */
+        new <T>(factory: () => Enumerator<T>): Enumerable<T>;
+
+        /**
+        * Defines an enumerator, which supports an iteration over the items of the specified Array-like object.
+        * An Array-like object is an object which has the "length" property and indexed properties access, eg. jQuery
+        * @param obj An Array-like object.
+        */
+        new <T>(obj: ArrayLike<T>): Enumerable<T>;
+
+        /**
+        * Defines an enumerator, which supports an iteration over the arguments local variable available within all functions.
+        * @param obj arguments local variable available within all functions.
+        */
+        new (obj: IArguments): Enumerable<any>;
+
+        /**
+        * Defines an enumerator, which supports an iteration over the properties of the specified object.
+        * @param obj A regular Object.
+        */
+        new (obj: Object): Enumerable<KeyValuePair<string, any>>;
+
+
+
+
+        /**
+        * Returns an empty Enumerable.
+        */
+        empty<T>(): Enumerable<T>;
+
+        /**
+        * Detects if an object is Enumerable.
+        * @param obj An object to check its Enumerability.
+        */
+        is(obj: any): boolean;
+
+        /**
+        * Generates a sequence of integral numbers within a specified range.
+        * @param start The value of the first integer in the sequence.
+        * @param count The number of sequential integers to generate.
+        */
+        range(start: number, count: number): Enumerable<number>;
+
+        /**
+        * Generates a sequence that contains one repeated value.
+        * @param element The value to be repeated.
+        * @param count The number of times to repeat the value in the generated sequence.
+        */
+        repeat<T>(element: T, count: number): Enumerable<T>;
+    }
+
+
+
+    /**
+    * Defines a method that a type implements to compare two objects.
+    */
+    interface Comparer<T> {
+        /**
+        * Compares two objects and returns a value indicating whether one is less than, equal to, or greater than the other.
+        * returns An integer that indicates the relative values of x and y, as shown in the following table:
+        * Less than zero x is less than y.
+        * Zero x equals y.
+        * Greater than zero x is greater than y..
+        * @param x The first object to compare.
+        * @param y The second object to compare.
+        */
+        compare(x: T, y: T): number;
+    }
+    interface ComparerConstructor {
+
+        /**
+        * Returns a default sort order comparer for the type specified by the generic argument.
+        */
+        defaultComparer: Comparer<any>;
+
+        /**
+        * Creates a comparer by using the specified comparison.
+        * @param comparison The comparison to use.
+        */
+        create<T>(comparison: (x: T, y: T) => number): Comparer<T>;
+    }
+
+
+
+    /**
+    * Provides a base class for implementations of the EqualityComparer.
+    */
+    interface EqualityComparer<T> {
+
+        /**
+        * Determines whether the specified objects are equal.
+        * @param x The first object of type Object to compare.
+        * @param y The second object of type Object to compare.
+        */
+        equals(x: T, y: T): boolean;
+
+
+        /**
+        * Returns a hash code for the specified object.
+        * @param obj The Object for which a hash code is to be returned.
+        */
+        hash(obj: T): number
+    }
+    interface EqualityComparerConstructor {
+
+        /**
+        * Gets a default equality comparer for the type specified by the generic argument.
+        */
+        defaultComparer: EqualityComparer<any>;
+
+
+        /**
+        * Creates an EqualityComparer by using the specified equality and hashCodeProvider.
+        * @param hashCodeProvider The hashCodeProvider to use for a hash code is to be returned.
+        * @param equality The equality function.
+        */
+        create<T>(hashCodeProvider: (obj: T) => number, equality: (x: T, y: T) => boolean): EqualityComparer<T>;
+    }
+
+
+
+    /**
+    * Initializes a new instance of the abstract Collection class.
+    */
+    interface Collection<T> extends Enumerable<T> {
+
+        /**
+        * Gets the number of elements contained in the Collection.
+        */
+        count(): number;
+
+
+        /**
+        * Copies the Collection to an existing one-dimensional Array, starting at the specified array index.
+        * @param array The one-dimensional Array that is the destination of the elements copied from Dictionary keys.
+        * @param arrayIndex The zero-based index in array at which copying begins.
+        */
+        copyTo(array: T[], arrayIndex: number): void
+    }
+    interface CollectionConstructor {
+
+        /**
+        * Initializes a new instance of the Collection class that is empty.
+        */
+        new <T>(): Collection<T>
+
+
+        /**
+        * Initializes a new instance of the Collection class that is wrapper around the specified Enumerable.
+        * @param value The Iterable to wrap.
+        */
+        new <T>(value: Iterable<T>): Collection<T>
+    }
+
+
+
+    /**
+    * Initializes a new instance of the abstract Collection class.
+    */
+    interface ReadOnlyCollection<T> extends Collection<T> {
+
+        /**
+        * Gets the element at the specified index.
+        * @param index The zero-based index of the element to get.
+        */
+        [index: number]: T;
+
+
+        /**
+        * Gets the element at the specified index.
+        * @param index The zero-based index of the element to get.
+        */
+        get(index: number): T
+
+
+        /**
+        * Determines whether the ReadOnlyCollection contains a specific value.
+        * @param item The object to locate in the ReadOnlyCollection.
+        */
+        contains(item: T): boolean
+
+
+        /**
+        * Searches for the specified object and returns the zero-based index of the first occurrence within the entire ReadOnlyCollection.
+        * @param item The object to locate in the ReadOnlyCollection.
+        */
+        indexOf(item: T): number
+    }
+    interface ReadOnlyCollectionConstructor {
+
+        /**
+        * Initializes a new instance of the ReadOnlyCollection class that is a read-only wrapper around the specified list.
+        * @param list The list to wrap.
+        */
+        new <T>(list: List<T>): ReadOnlyCollection<T>
+    }
+
+
+
+    /**
+    * Represents a strongly typed list of objects that can be accessed by index.
+    */
+    interface List<T> extends Collection<T> {
+
+        /**
+        * Gets the element at the specified index.
+        * @param index The zero-based index of the element to get.
+        */
+        [index: number]: T;
+
+
+        /**
+        * Adds an object to the end of the List.
+        * @param item The object to be added to the end of the List.
+        */
+        add(item: T): void
+
+
+        /**
+        * Adds the elements of the specified collection to the end of the List.
+        * @param collection The collection whose elements should be added to the end of the List.
+        */
+        addRange(collection: Iterable<T>): void
+
+
+        /**
+        * Returns a read-only wrapper for the current list.
+        */
+        asReadOnly(): ReadOnlyCollection<T>
+
+
+        /**
+        * Searches the entire sorted List for an element using the default comparer and returns the zero-based index of the element.
+        * Returns The zero-based index of item in the sorted List, if item is found; otherwise, a negative number
+        * that is the  bitwise complement of the index of the  next element that is larger than item or, if there is no larger element,
+        * the bitwise complement of List.count().
+        * @param item The object to locate. The value can be null for reference types.
+        */
+        binarySearch(item: T): number
+
+
+        /**
+        * Searches the entire sorted List for an element using the specified comparer and returns the zero-based index of the element.
+        * returns The zero-based index of item in the sorted List, if item is found; otherwise, a negative number
+        * that is the  bitwise complement of the index of the  next element that is larger than item or, if there is no larger element,
+        * the bitwise complement of List.count().
+        * @param item The object to locate. The value can be null for reference types.
+        * @param comparer The Comparer implementation to use when comparing elements.
+        */
+        binarySearch(item: T, comparer: Comparer<T>): number
+
+
+        /**
+        * Searches a range of elements in the sorted List for an element using the specified comparer and returns the zero-based index of the element.
+        * returns The zero-based index of item in the sorted List, if item is found; otherwise, a negative number
+        * that is the  bitwise complement of the index of the  next element that is larger than item or, if there is no larger element,
+        * the bitwise complement of List.count().
+        * @param item The object to locate. The value can be null for reference types.
+        * @param index The zero-based starting index of the range to search.
+        * @param count The length of the range to search.
+        * @param comparer The Comparer implementation to use when comparing elements.
+        */
+        binarySearch(item: T, index: number, count: number, comparer: Comparer<T>): number
+
+
+        /**
+        * Removes all items from the List.
+        */
+        clear(): void
+
+
+        /**
+        * Determines whether the List contains elements that match the conditions defined by the specified predicate.
+        * @param match The predicate function that defines the conditions of the elements to search for.
+        */
+        exists(match: (item: T) => boolean): boolean
+
+
+        /**
+        * Searches for an element that matches the conditions defined by the specified predicate, and returns the first occurrence within the entire List.
+        * @param match The predicate function that defines the conditions of the elements to search for.
+        */
+        find(match: (item: T) => boolean): T
+
+
+        /**
+        * Retrieves all the elements that match the conditions defined by the specified predicate.
+        * @param match The predicate function that defines the conditions of the elements to search for.
+        */
+        findAll(match: (item: T) => boolean): List<T>
+
+
+        /**
+        * Searches for an element that matches the conditions defined by the specified predicate,
+        * and returns the zero-based index of the first occurrence within the entire List, if found; otherwise, –1.
+        * @param match The predicate function that defines the conditions of the elements to search for.
+        */
+        findIndex(match: (item: T) => boolean): number
+
+
+        /**
+        * Searches for an element that matches the conditions defined by the specified predicate,
+        * and returns the zero-based index of the first occurrence within the range of elements
+        * in the List that extends from the specified index to the last element, if found; otherwise, –1.
+        * @param startIndex The zero-based starting index of the search.
+        * @param match The predicate function that defines the conditions of the elements to search for.
+        */
+        findIndex(startIndex: number, match: (item: T) => boolean): number
+
+
+        /**
+        * Searches for an element that matches the conditions defined by the specified predicate,
+        * and returns the zero-based index of the first occurrence within the range of elements
+        * in the List that starts at the specified index and contains the specified number of elements, if found; otherwise, –1.
+        * @param startIndex The zero-based starting index of the search.
+        * @param count The number of elements in the section to search.
+        * @param match The predicate function that defines the conditions of the elements to search for.
+        */
+        findIndex(startIndex: number, count: number, match: (item: T) => boolean): number
+
+
+        /**
+        * Searches for an element that matches the conditions defined by the specified predicate,
+        * and returns the last occurrence within the entire List.
+        * @param match The predicate function that defines the conditions of the elements to search for.
+        */
+        findLast(match: (item: T) => boolean): T
+
+
+        /**
+        * Searches for an element that matches the conditions defined by the specified predicate,
+        * and returns the zero-based index of the last occurrence within the entire List, if found; otherwise, –1.
+        * @param match The predicate function that defines the conditions of the elements to search for.
+        */
+        findLastIndex(match: (item: T) => boolean): number
+
+
+        /**
+        * Searches for an element that matches the conditions defined by the specified predicate,
+        * and returns the zero-based index  of the last occurrence within the range of elements
+        * in the List that extends from the first element to the specified index, if found; otherwise, –1.
+        * @param startIndex The zero-based starting index of the search.
+        * @param match The predicate function that defines the conditions of the elements to search for.
+        */
+        findLastIndex(startIndex: number, match: (item: T) => boolean): number
+
+
+        /**
+        * Searches for an element that matches the conditions defined by the specified predicate,
+        * and returns the zero-based index  of the last occurrence within the range of elements
+        * in the List that contains the specified number of elements and ends at the specified index, if found; otherwise, –1.
+        * @param startIndex The zero-based starting index of the search.
+        * @param count The number of elements in the section to search.
+        * @param match The predicate function that defines the conditions of the elements to search for.
+        */
+        findLastIndex(startIndex: number, count: number, match: (item: T) => boolean): number
+
+
+        /**
+        * Performs the specified action on each element of the List.
+        * @param action The action function to perform on each element of the List.
+        */
+        forEach(action: (item: T) => void): void
+
+
+        /**
+        * Gets the element at the specified index.
+        * @param index The zero-based index of the element to get.
+        */
+        get(index: number): T
+
+
+        /**
+        * Creates a shallow copy of a range of elements in the source List.
+        * @param index The zero-based List index at which the range starts.
+        * @param count The number of elements in the range.
+        */
+        getRange(index: number, count: number): List<T>
+
+
+        /**
+        *   Searches for the specified object and returns the zero-based index of the first occurrence within the entire List, if found; otherwise, –1.
+        *   @param item The object to locate in the List.
+        */
+        indexOf(item: T): number
+
+
+        /**
+        *   Searches for the specified object and returns the zero-based index of the first occurrence within
+        *   the range of elements in the List that extends from the specified index to the last element, if found; otherwise, –1.
+        *   @param item The object to locate in the List.
+        *   @param index The zero-based starting index of the search. 0 (zero) is valid in an empty list.
+        */
+        indexOf(item: T, index: number): number
+
+
+        /**
+        * Inserts an element into the List at the specified index.
+        * @param index The zero-based index at which item should be inserted.
+        * @param item The object to insert. The value can be null for reference types.
+        */
+        insert(index: number, item: T): void
+
+
+        /**
+        * Inserts the elements of a collection into the List at the specified index.
+        * @param index The zero-based index at which item should be inserted.
+        * @param collection The collection whose elements should be inserted into the List.
+        */
+        insertRange(index: number, collection: Iterable<T>): void
+
+
+        /**
+        * Gets an Array wrapper around the List.
+        */
+        items(): T[]
+
+
+        /**
+        *   Searches for the specified object and returns the zero-based index of the last occurrence within the entire List, if found; otherwise, –1.
+        *   @param item The object to locate in the List.
+        */
+        lastIndexOf(item: T): number
+
+
+        /**
+        *   Searches for the specified object and returns the zero-based index of the last occurrence
+        *   within the range of elements in the List that extends from the specified index to the last element if found; otherwise, –1.
+        *   @param item The object to locate in the List.
+        *   @param index The zero-based starting index of the search. 0 (zero) is valid in an empty list.
+        */
+        lastIndexOf(item: T, index: number): number
+
+
+        /**
+        * Removes the first occurrence of a specific object from the List.
+        * @param item The object to remove from the List.
+        */
+        remove(item: T): boolean
+
+
+        /**
+        * Removes all the elements that match the conditions defined by the specified predicate.
+        * @param match The predicate function that defines the conditions of the elements to remove.
+        */
+        removeAll(match: (item: T) => boolean): number
+
+
+        /**
+        * Removes the element at the specified index of the List.
+        * @param index The zero-based index of the element to remove.
+        */
+        removeAt(index: number): void
+
+
+        /**
+        * Removes a range of elements from the List.
+        * @param index The zero-based index of the element to remove.
+        * @param count The number of elements to remove.
+        */
+        removeRange(index: number, count: number): void
+
+
+        /**
+        * Reverses the order of the elements in the entire List
+        */
+        reverse(): any
+
+
+        /**
+        * Reverses the order of the elements in the entire List
+        * @param index The zero-based starting index of the range to reverse.
+        * @param count The number of elements in the range to reverse.
+        */
+        reverse(index: number, count: number): void
+
+
+        /**
+        * Sets the element at the specified index.
+        * @param index The zero-based index of the element to set.
+        * @param item The object to be added at the specified index.
+        */
+        set(index: number, value: T): void
+
+
+        /**
+        * Sorts the elements in the entire List using the default comparer.
+        */
+        sort(): void
+
+
+        /**
+        * Sorts the elements in the entire List using the specified Comparison.
+        * @param comparison The comparison function to use when comparing elements.
+        */
+        sort(comparison: (x: T, y: T) => number): void
+
+
+        /**
+        * Sorts the elements in the entire List using the specified comparer.
+        * @param comparer The Comparer implementation to use when comparing elements.
+        */
+        sort(comparer: Comparer<T>): void
+
+
+        /**
+        * Sorts the elements in a range of elements in List using the specified comparer.
+        * @param index The zero-based starting index of the range to sort.
+        * @param count The length of the range to sort.
+        * @param comparer The Comparer implementation to use when comparing elements.
+        */
+        sort(index: number, count: number, comparer: Comparer<T>): void
+
+
+        /**
+        * Copies the elements of the List to a new array.
+        */
+        toArray(): T[]
+
+
+        /**
+        * Determines whether every element in the List matches the conditions defined by the specified predicate.
+        * @param match The Predicate function that defines the conditions to check against the elements.
+        */
+        trueForAll(match: (item: T) => boolean): boolean
+    }
+    interface ListConstructor {
+
+        /**
+        * Initializes a new instance of the List class that is empty.
+        */
+        new <T>(): List<T>
+
+
+        /**
+        * Initializes a new instance of the List class that is empty and has the specified initial capacity.
+        * @param capacity The number of elements that the new list can initially store.
+        */
+        new <T>(capacity: number): List<T>
+
+
+        /**
+        * Initializes a new instance of the List class that contains elements copied from the specified arguments
+        * @param args Arbitrary number of arguments to copy to the new list.
+        */
+        new <T>(...args: T[]): List<T>
+
+
+        /**
+        * Initializes a new instance of the List class that contains elements copied from the specified collection
+        * and has sufficient capacity to accommodate the number of elements copied.
+        * @param collection The collection whose elements are copied to the new list.
+        */
+        new <T>(collection: Iterable<T>): List<T>
+    }
+
+
+
+    /**
+    * Represents a collection of key/value pairs that are sorted by key based on the associated Comparer implementation.
+    */
+    interface SortedList<TKey, TValue> extends Collection<KeyValuePair<TKey, TValue>> {
+
+        /**
+        * Adds an element with the specified key and value into the SortedList.
+        * @param key The key of the element to add.
+        * @param value The value of the element to add. The value can be null for reference types.
+        */
+        add(key: TKey, value: TValue): void
+
+
+        /**
+        * Gets the value associated with the specified key.
+        * @param key The key whose value to get.
+        */
+        get(key: TKey): TValue
+
+
+        /**
+        * Gets or sets the number of elements that the SortedList can contain.
+        * @param value The number of elements that the SortedList can contain.
+        */
+        capacity(value?: number): number
+
+
+        /**
+        * Removes all elements from the SortedList.
+        */
+        clear(): void
+
+
+        /**
+        * Gets the Comparer for the sorted list.
+        */
+        comparer(): Comparer<TKey>
+
+
+        /**
+        * Determines whether the SortedList contains a specific key.
+        * @param key The key to locate in the SortedList.
+        */
+        containsKey(key: TKey): boolean
+
+
+        /**
+        * Determines whether the SortedList contains a specific value.
+        * @param value The value to locate in the SortedList.
+        */
+        containsValue(value: TValue): boolean
+
+
+        /**
+        * Gets a collection containing the keys in the SortedList, in sorted order.
+        */
+        keys(): Collection<TKey>
+
+
+        /**
+        * Gets a collection containing the values in the SortedLis.
+        */
+        values(): Collection<TValue>
+
+
+        /**
+        * Searches for the specified key and returns the zero-based index within the entire SortedList.
+        * @param key The key to locate in the SortedList.
+        */
+        indexOfKey(key: TKey): number
+
+
+        /**
+        * Searches for the specified value and returns the zero-based index of the first occurrence within the entire SortedList.
+        * @param value The value to locate in the SortedList.
+        */
+        indexOfValue(value: TValue): number
+
+
+        /**
+        * Removes the element with the specified key from the SortedList.
+        * Returns true if the element is successfully removed; otherwise, false. This method also returns false if key was not found in the original SortedList.
+        * @param key The key of the element to remove.
+        */
+        remove(key: TKey): boolean
+
+
+        /**
+        * Removes the element at the specified index of the SortedList.
+        * @param index The zero-based index of the element to remove.
+        */
+        removeAt(index: number): void
+
+
+        /**
+        * Sets the value associated with the specified key.
+        * @param key The key whose value to get or set.
+        * @param value The value associated with the specified key.
+        */
+        set(key: TKey, value: TValue): void
+
+
+        /**
+        * Sets the capacity to the actual number of elements in the SortedList, if that number is less than 90 percent of current capacity.
+        */
+        trimExcess(): void
+
+
+        /**
+        * Gets the value associated with the specified key.
+        * @param key The key whose value to get.
+        * @param callback When this method returns, callback method is called with the value
+        * associated with the specified key, if the key is found; otherwise, null for the type of the value parameter.
+        */
+        tryGetValue(key: TKey, callback: (value: TValue) => void): boolean
+    }
+    interface SortedListConstructor {
+
+        /**
+        * Initializes a new instance of the SortedList class that is empty,
+        * has the default initial capacity, and uses the default Comparer.
+        */
+        new <TKey, TValue>(): SortedList<TKey, TValue>
+
+
+        /**
+        * Initializes a new instance of the SortedList class that contains elements  copied from the specified Dictionary,
+        * has sufficient capacity to accommodate the number of elements copied,  and uses the default Comparer.
+        * @param dictionary The Dictionary whose elements are copied to the new SortedList.
+        */
+        new <TKey, TValue>(dictionary: Dictionary<TKey, TValue>): SortedList<TKey, TValue>
+
+
+        /**
+        * Initializes a new instance of the SortedList class that is empty,
+        * has the default initial capacity, and uses the specified Comparer.
+        * @param comparer The Comparer implementation to use when comparing keys.-or-null to use the default Comparer for the type of the key.
+        */
+        new <TKey, TValue>(comparer: Comparer<TKey>): SortedList<TKey, TValue>
+
+
+        /**
+        * Initializes a new instance of the SortedList class that is empty,
+        * has the specified initial capacity, and uses the default Comparer.
+        * @param capacity The initial number of elements that the SortedList can contain.
+        */
+        new <TKey, TValue>(capacity: number): SortedList<TKey, TValue>
+
+
+        /**
+        * Initializes a new instance of the SortedList class that contains elements copied from the specified Dictionary,
+        * has sufficient capacity to accommodate the number of elements copied, and uses the specified Comparer.
+        * @param dictionary The Dictionary whose elements are copied to the new SortedList.
+        * @param comparer The Comparer implementation to use when comparing keys.-or-null to use the default Comparer for the type of the key.
+        */
+        new <TKey, TValue>(dictionary: Dictionary<TKey, TValue>, comparer: Comparer<TKey>): SortedList<TKey, TValue>
+
+
+        /**
+        * Initializes a new instance of the SortedList class that is empty,
+        * has the specified initial capacity, and uses the specified Comparer.
+        * @param capacity The initial number of elements that the SortedList can contain.
+        * @param comparer The Comparer implementation to use when comparing keys.-or-null to use the default Comparer for the type of the key.
+        */
+        new <TKey, TValue>(capacity: number, comparer: Comparer<TKey>): SortedList<TKey, TValue>
+    }
+
+
+
+    /**
+    * Defines a key/value pair that can be set or retrieved.
+    */
+    interface KeyValuePair<TKey, TValue> {
+
+        /**
+        * Gets the key in the key/value pair.
+        */
+        key: TKey;
+
+
+        /**
+        * Gets the value in the key/value pair.
+        */
+        value: TValue;
+    }
+    interface KeyValuePairConstructor {
+
+        /**
+        * Initializes a new instance of the KeyValuePair with the specified key and value.
+        * @param key The object defined in each key/value pair.
+        * @param value The definition associated with key.
+        */
+        new <TKey, TValue>(key: TKey, value: TValue): KeyValuePair<TKey, TValue>
+    }
+
+
+
+    /**
+    * Represents a collection of keys and values.
+    */
+    interface Dictionary<TKey, TValue> extends Collection<KeyValuePair<TKey, TValue>> {
+
+        /**
+        * Adds an element with the provided key and value to the Dictionary.
+        * @param key The object to use as the key of the element to add.
+        * @param value The object to use as the value of the element to add.
+        */
+        add(key: TKey, value: TValue): void
+
+
+        /**
+        * Removes all keys and values from the Dictionary.
+        */
+        clear(): void
+
+
+        /**
+        * Determines whether the Dictionary contains the specified key.
+        * @param key The key to locate in the Dictionary.
+        */
+        containsKey(key: TKey): boolean
+
+
+        /**
+        * Determines whether the Dictionary contains a specific value.
+        * @param value The value to locate in the Dictionary.
+        */
+        containsValue(value: TValue): boolean
+
+
+        /**
+        * Copies the Dictionary keys to an existing one-dimensional Array, starting at the specified array index.
+        * @param array The one-dimensional Array that is the destination of the elements copied from Dictionary keys.
+        * @param arrayIndex The zero-based index in array at which copying begins.
+        */
+        copyTo(array: TKey[], arrayIndex: number): void
+        copyTo(array: KeyValuePair<TKey, TValue>[], arrayIndex: number): void
+
+
+        /**
+        * Gets a Collection containing the keys of the Dictionary.
+        */
+        keys(): Collection<TKey>
+
+
+        /**
+        * Gets a Collection containing the values in the Dictionary.
+        */
+        values(): Collection<TValue>
+
+
+        /**
+        * Gets element with the specified key.
+        * @param key The key of the element to get.
+        */
+        get(key: TKey): TValue
+
+
+        /**
+        * Sets the element with the specified key.
+        * @param key The key of the element to set.
+        * @param value The object to use as the value of the element to set.
+        */
+        set(key: TKey, value: TValue): void
+
+
+        /**
+        * Gets the value associated with the specified key.
+        * @param key The key whose value to get.
+        * @param callback When this method returns, callback method is called with the value
+        * associated with the specified key, if the key is found; otherwise, null for the type of the value parameter.
+        */
+        tryGetValue(key: TKey, callback: (value: TValue) => void): boolean
+
+
+        /**
+        * Removes the element with the specified key from the Dictionary.
+        * @param key The key of the element to remove.
+        */
+        remove(key: TKey): boolean
+    }
+    interface DictionaryConstructor {
+
+        /**
+        * Initializes a new instance of the Dictionary class that is empty,
+        */
+        new <TKey, TValue>(): Dictionary<TKey, TValue>
+
+
+        /**
+        * Initializes a new instance of the Dictionary class that contains elements copied
+        * from the specified Dictionary and uses the default equality comparer for the key type.
+        * @param dictionary The Dictionary whose elements are copied to the new Dictionary.
+        */
+        new <TKey, TValue>(dictionary: Dictionary<TKey, TValue>): Dictionary<TKey, TValue>
+
+
+        /**
+        * Initializes a new instance of the Dictionary class that is empty, and uses the specified EqualityComparer.
+        * @param comparer The EqualityComparer implementation to use when comparing keys.
+        */
+        new <TKey, TValue>(comparer: EqualityComparer<TKey>): Dictionary<TKey, TValue>
+
+
+        /**
+        * Initializes a new instance of the Dictionary class that is empty, has the specified initial capacity, and uses the default equality comparer for the key type.
+        * @param capacity The initial number of elements that the Dictionary can contain.
+        */
+        new <TKey, TValue>(capacity: number): Dictionary<TKey, TValue>
+
+
+        /**
+        * Initializes a new instance of the Dictionary that is empty, has the specified initial capacity, and uses the specified EqualityComparer.
+        * @param capacity The initial number of elements that the Dictionary can contain.
+        * @param comparer The EqualityComparer implementation to use when comparing keys.
+        */
+        new <TKey, TValue>(capacity: number, comparer: EqualityComparer<TKey>): Dictionary<TKey, TValue>
+
+
+        /**
+        * Initializes a new instance of the Dictionary class that contains elements copied
+        * from the specified Dictionary and uses the specified EqualityComparer.
+        * @param dictionary The Dictionary whose elements are copied to the new Dictionary.
+        * @param comparer The EqualityComparer implementation to use when comparing keys.
+        */
+        new <TKey, TValue>(dictionary: Dictionary<TKey, TValue>, comparer: EqualityComparer<TKey>): Dictionary<TKey, TValue>
+    }
+
+
+
+    /**
+    * Represents a set of values.
+    */
+    interface HashSet<T> extends Collection<T> {
+
+        /**
+        * Adds an element to the current set.
+        * @param item The element to add to the set.
+        */
+        add(item: T): boolean
+
+
+        /**
+        * Removes all elements from a HashSet object.
+        */
+        clear(): void
+
+
+        /**
+        * Copies the elements of a HashSet object to an array.
+        * @param array The one-dimensional array that is the destination of the elements copied from the HashSet object.
+        */
+        copyTo(array: T[]): void
+
+
+        /**
+        * Copies the elements of a HashSet object to an array. starting at the specified array index.
+        * @param array The one-dimensional array that is the destination of the elements copied from the HashSet object.
+        * @param arrayIndex The zero-based index in array at which copying begins.
+        */
+        copyTo(array: T[], arrayIndex: number): void
+
+
+        /**
+        * Copies the elements of a HashSet object to an array.
+        * @param array The one-dimensional array that is the destination of the elements copied from the HashSet object.
+        * @param arrayIndex The zero-based index in array at which copying begins.
+        * @param count The number of elements to copy to array.
+        */
+        copyTo(array: T[], arrayIndex: number, count: number): void
+
+
+        /**
+        * Gets the EqualityComparer object that is used to determine equality for the values in the set.
+        */
+        comparer(): EqualityComparer<T>
+
+
+        /**
+        * Removes the specified element from a HashSet object.
+        * @param item The element to remove.
+        */
+        remove(item: T): boolean
+
+
+        /**
+        * Removes all elements that match the conditions defined by the specified predicate from a HashSet collection.
+        * @param match The predicate function that defines the conditions of the elements to remove.
+        */
+        removeWhere(match: (item: T) => boolean): number
+
+
+        /**
+        * Removes all elements in the specified collection from the current set.
+        * @param other The collection of items to remove from the set.
+        */
+        exceptWith(other: Iterable<T>): void
+
+
+        /**
+        * Modifies the current set so that it contains only elements that are also in a specified collection.
+        * @param other The collection to compare to the current set.
+        */
+        intersectWith(other: Iterable<T>): void
+
+
+        /**
+        * Determines whether the current set is a proper (strict) subset of a specified collection.
+        * @param other The collection to compare to the current set.
+        */
+        isProperSubsetOf(other: Iterable<T>): boolean
+
+
+        /**
+        * Determines whether the current set is a proper (strict) superset of a specified collection.
+        * @param other The collection to compare to the current set.
+        */
+        isProperSupersetOf(other: Iterable<T>): boolean
+
+
+        /**
+        * Determines whether a set is a subset of a specified collection.
+        * @param other The collection to compare to the current set.
+        */
+        isSubsetOf(other: Iterable<T>): boolean
+
+
+        /**
+        * Determines whether the current set is a superset of a specified collection.
+        * @param other The collection to compare to the current set.
+        */
+        isSupersetOf(other: Iterable<T>): boolean
+
+
+        /**
+        * Determines whether the current set overlaps with the specified collection.
+        * @param other The collection to compare to the current set.
+        */
+        overlaps(other: Iterable<T>): boolean
+
+
+        /**
+        * Determines whether the current set and the specified collection contain the same elements.
+        * @param other The collection to compare to the current set.
+        */
+        setEquals(other: Iterable<T>): boolean
+
+
+        /**
+        * Modifies the current set so that it contains only elements that are present
+        * either in the current set or in the specified collection, but not both.
+        * @param other The collection to compare to the current set.
+        */
+        symmetricExceptWith(other: Iterable<T>): void
+
+
+        /**
+        * Modifies the current set so that it contains all elements that are present
+        * in either the current set or the specified collection.
+        * @param other The collection to compare to the current set.
+        */
+        unionWith(other: Iterable<T>): void
+
+    }
+    interface HashSetConstructor {
+
+        /**
+        * Initializes a new instance of the HashSet class that is empty and uses the default equality comparer for the set type.
+        */
+        new <T>(): HashSet<T>
+
+
+        /**
+        * Initializes a new instance of the HashSet class that uses the default equality comparer for the set type,
+        * and contains elements copied from the specified collection.
+        * @param collection The collection whose elements are copied to the new set.
+        */
+        new <T>(collection: Iterable<T>): HashSet<T>
+
+
+        /**
+        * Initializes a new instance of the HashSet class that is empty and uses the specified equality comparer for the set type.
+        * @param comparer The EqualityComparer implementation to use when comparing values in the set.
+        */
+        new <T>(comparer: EqualityComparer<T>): HashSet<T>
+
+
+        /**
+        * Initializes a new instance of the HashSet class that uses the specified equality comparer for the set type,
+        * contains elements copied from the specified collection, and uses the specified equality comparer for the set type.
+        * @param collection The collection whose elements are copied to the new set.
+        * @param comparer The EqualityComparer implementation to use when comparing values in the set.
+        */
+        new <T>(collection: Iterable<T>, comparer: EqualityComparer<T>): HashSet<T>
+    }
+
+
+
+    /**
+    * Represents a node in a LinkedList.
+    */
+    interface LinkedListNode<T> {
+
+        /**
+        * Gets the value contained in the node.
+        */
+        value(): T
+
+
+        /**
+        * Gets the LinkedList that the LinkedListNode belongs to.
+        */
+        list(): LinkedList<T>
+
+
+        /**
+        * Gets the next node in the LinkedList.
+        */
+        next(): LinkedListNode<T>
+
+
+        /**
+        * Gets the previous node in the LinkedList.
+        */
+        previous(): LinkedListNode<T>
+    }
+    interface LinkedListNodeConstructor {
+
+        /**
+        * Initializes a new instance of the LinkedListNode class, containing the specified value.
+        * @param value The value to contain in the LinkedListNode
+        */
+        new <T>(value: T): LinkedListNode<T>
+    }
+
+
+
+    /**
+    * Represents a doubly linked list.
+    */
+    interface LinkedList<T> extends Collection<T> {
+
+        /**
+        * Adds an item to the LinkedList.
+        * @param item The object to add to the LinkedList.
+        */
+        add(item: T): void
+
+
+        /**
+        * Removes all nodes from the LinkedList.
+        */
+        clear(): void
+
+
+        /**
+        * Determines whether a value is in the LinkedList.
+        * @param value The value to locate in the LinkedList. The value can be null for reference types.
+        */
+        contains(item: T): boolean
+
+
+        /**
+        * Gets the first node of the LinkedList.
+        */
+        getFirst(): LinkedListNode<T>
+
+
+        /**
+        * Gets the last node of the LinkedList.
+        */
+        getLast(): LinkedListNode<T>
+
+
+        /**
+        * Adds the specified new node after the specified existing node in the LinkedList and returns the new LinkedListNode.
+        * @param node The LinkedListNode after which to insert newNode.
+        * @param newNode The new LinkedListNode to add to the LinkedList.
+        */
+        addAfter(node: LinkedListNode<T>, newNode: LinkedListNode<T>): LinkedListNode<T>
+
+
+        /**
+        * Adds the specified new node after the specified existing node in the LinkedList.
+        * returns The new LinkedListNode containing value.
+        * @param node The LinkedListNode after which to insert newNode.
+        * @param value The value to add to the LinkedList.
+        */
+        addAfter(node: LinkedListNode<T>, value: T): LinkedListNode<T>
+
+
+        /**
+        * Adds the specified new node before the specified existing node in the LinkedList.
+        * returns The new LinkedListNode.
+        * @param node The LinkedListNode before which to insert newNode.
+        * @param newNode The new LinkedListNode to add to the LinkedList.
+        */
+        addBefore(node: LinkedListNode<T>, newNode: LinkedListNode<T>): LinkedListNode<T>
+
+
+        /**
+        * Adds the specified new node before the specified existing node in the LinkedList.
+        * returns The new LinkedListNode containing value.
+        * @param node The LinkedListNode before which to insert newNode.
+        * @param value The value to add to the LinkedList.
+        */
+        addBefore(node: LinkedListNode<T>, value: T): LinkedListNode<T>
+
+
+        /**
+        * Adds the specified new node at the start of the LinkedList.
+        * returns The new LinkedListNode.
+        * @param node The new LinkedListNode to add at the start of the LinkedList.
+        */
+        addFirst(node: LinkedListNode<T>): LinkedListNode<T>
+
+
+        /**
+        * Adds the specified new node at the start of the LinkedList.
+        * returns The new LinkedListNode containing value.
+        * @param value The value to add at the start of the LinkedList.
+        */
+        addFirst(value: T): LinkedListNode<T>
+
+
+        /**
+        * Adds the specified new node at the end of the LinkedList.
+        * returns The new LinkedListNode.
+        * @param node The new LinkedListNode to add at the end of the LinkedList.
+        */
+        addLast(node: LinkedListNode<T>): LinkedListNode<T>
+
+
+        /**
+        * Adds the specified new node at the end of the LinkedList.
+        * returns The new LinkedListNode containing value.
+        * @param value The value to add at the end of the LinkedList.
+        */
+        addLast(value: T): LinkedListNode<T>
+
+
+        /**
+        * Finds the first node that contains the specified value.
+        * @param value The value to locate in the LinkedList.
+        */
+        find(value: T): LinkedListNode<T>
+
+
+        /**
+        * Finds the last node that contains the specified value.
+        * @param value The value to locate in the LinkedList.
+        */
+        findLast(value: T): LinkedListNode<T>
+
+        /**
+        * Removes the node at the start of the LinkedList.
+        * returns true if the node is successfully removed; otherwise, false.
+        * This method also returns false if value was not found in the original LinkedList.
+        * @param node
+        */
+        remove(node: LinkedListNode<T>): boolean
+
+
+        /**
+        * Removes the first occurrence of the specified value from the LinkedList.
+        * returns true if the element containing value is successfully removed; otherwise, false.
+        * This method also returns false if value was not found in the original LinkedList.
+        * @param value The value to remove from the LinkedList.
+        */
+        remove(value: T): boolean
+
+
+        /**
+        * Removes the node at the start of the LinkedList.
+        */
+        removeFirst(): void
+
+
+        /**
+        * Removes the node at the end of the LinkedList.
+        */
+        removeLast(): void
+    }
+    interface LinkedListConstructor {
+
+        /**
+        * Initializes a new instance of the LinkedList class that is empty.
+        */
+        new <T>(): LinkedList<T>
+
+
+        /**
+        * Initializes a new instance of the LinkedList class that contains elements copied from the specified Enumerable.
+        * @param collection The collection to copy elements from.
+        */
+        new <T>(collection: Iterable<T>): LinkedList<T>
+    }
+
+
+
+    /**
+    * Represents a first-in, first-out collection of objects.
+    */
+    interface Queue<T> extends Collection<T> {
+
+        /**
+        * Removes all objects from the Queue.
+        */
+        clear(): void
+
+
+        /**
+        * Determines whether an element is in the Queue.
+        * @param item The object to locate in the Queue.
+        */
+        contains(item: T): boolean
+
+
+        /**
+        * Removes and returns the object at the beginning of the Queue.
+        */
+        dequeue(): T
+
+        /**
+        * Adds an object to the end of the Queue.
+        * @param item The object to add to the Queue.
+        */
+        enqueue(item: T): void
+
+
+        /**
+        * Returns the object at the beginning of the Queue without removing it.
+        */
+        peek(): T
+
+
+        /**
+        * Copies the Queue to a new array.
+        */
+        toArray(): T[]
+    }
+    interface QueueConstructor {
+
+        /**
+        * Initializes a new instance of the Queue class that is empty.
+        */
+        new <T>(): Queue<T>
+
+
+        /**
+        * Initializes a new instance of the Queue class that contains elements copied from the specified collection.
+        * @param collection The collection to copy elements from.
+        */
+        new <T>(collection: Iterable<T>): Queue<T>
+    }
+
+
+
+    /**
+    * Represents a variable size last-in-first-out (LIFO) collection of instances of the same arbitrary type.
+    */
+    interface Stack<T> extends Collection<T> {
+
+        /**
+        * Removes all objects from the Stack.
+        */
+        clear(): void
+
+
+        /**
+        * Determines whether an element is in the Stack.
+        * @param item The object to locate in the Stack.
+        */
+        contains(item: T): boolean
+
+
+        /**
+        * Returns the object at the top of the Stack without removing it.
+        */
+        peek(): T
+
+
+        /**
+        *   Removes and returns the object at the top of the Stack.
+        */
+        pop(): T
+
+
+        /**
+        * Inserts an object at the top of the Stack.
+        * @param item The object to push onto the Stack.
+        */
+        push(item: T): void
+
+
+        /**
+        *   Copies the Stack to a new array.
+        */
+        toArray(): T[]
+    }
+    interface StackConstructor {
+
+        /**
+        * Initializes a new instance of the Stack class that is empty.
+        */
+        new <T>(): Stack<T>
+
+
+        /**
+        * Initializes a new instance of the Stack class that contains elements copied from the specified collection.
+        * @param collection The collection to copy elements from.
+        */
+        new <T>(collection: Iterable<T>): Stack<T>
+    }
+
+
+
+    /**
+    * Defines a data structures that map keys to Enumerable sequences of values.
+    */
+    interface Lookup<TKey, TElement> extends Collection<Grouping<TKey, TElement>> {
+
+        /**
+        * Determines whether a specified key exists in the Lookup.
+        * @param key The key to search for in the Lookup.
+        */
+        contains(key: TKey): boolean
+        contains(item: Grouping<TKey, TElement>): boolean
+
+
+
+        /**
+        * Gets the value associated with the specified key.
+        * @param key The key of the element to add.
+        */
+        get(key: TKey): Enumerable<TElement>
+    }
+
+
+
+    /**
+    * Represents a collection of objects that have a common key.
+    */
+    interface Grouping<TKey, TElement> extends Collection<TElement> {
+
+        /**
+        * Gets the key of the Grouping.
+        */
+        key: TKey
+    }
+
+
+
+    /**
+    * Exposes the enumerator, which supports a simple iteration over a collection of a specified type.
+    */
+    interface OrderedEnumerable<TElement> extends Enumerable<TElement> {
+
+        /**
+        * Performs a subsequent ordering on the elements of an OrderedEnumerable<TElement> according to a key.
+        * @param keySelector The selector used to extract the key for each element.
+        * @param comparer The Comparer used to compare keys for placement in the returned sequence.
+        * @param descending true to sort the elements in descending order; false to sort the elements in ascending order.
+        */
+        createOrderedEnumerable<TKey>(keySelector: (item: TElement) => TKey, comparer: Comparer<TKey>, descending: boolean): OrderedEnumerable<TElement>
+
+
+        /**
+        * Performs a subsequent ordering of the elements in a sequence in descending order, according to a key.
+        * Returns an OrderedEnumerable whose elements are sorted in descending order according to a key.
+        * @param keySelector A function to extract a key from each element.
+        */
+        thenBy<TKey>(keySelector: (item: TElement) => TKey): OrderedEnumerable<TElement>
+
+
+        /**
+        * Performs a subsequent ordering of the elements in a sequence in ascending order by using a specified comparer.
+        * Returns an OrderedEnumerable whose elements are sorted according to a key.
+        * @param keySelector A function to extract a key from each element.
+        * @param comparer A Comparer to compare keys.
+        */
+        thenBy<TKey>(keySelector: (item: TElement) => TKey, comparer: Comparer<TKey>): OrderedEnumerable<TElement>
+
+
+        /**
+        * Performs a subsequent ordering of the elements in a sequence in descending order, according to a key.
+        * Returns an OrderedEnumerable whose elements are sorted in descending order according to a key.
+        * @param keySelector A function to extract a key from each element.
+        */
+        thenByDescending<TKey>(keySelector: (item: TElement) => TKey): OrderedEnumerable<TElement>
+
+
+        /**
+        * Performs a subsequent ordering of the elements in a sequence in descending order, according to a key.
+        * Returns an OrderedEnumerable whose elements are sorted in descending order according to a key.
+        * @param keySelector A function to extract a key from each element.
+        * @param comparer A Comparer to compare keys.
+        */
+        thenByDescending<TKey>(keySelector: (item: TElement) => TKey, comparer: Comparer<TKey>): OrderedEnumerable<TElement>
+    }
+
+
+
+    /**
+    * Defines Enumerable extention methods applied on Enumerable
+    */
+    interface Enumerable<T> {
+
+
+        /**
+        * Applies an accumulator function over a sequence.
+        * Returns the final accumulator value.
+        * @param func An accumulator function to be invoked on each element.
+        */
+        aggregate(func: (accumulate: T, item: T) => T): T
+
+
+        /**
+        * Applies an accumulator function over a sequence. The specified seed value is used as the initial accumulator value.
+        * Returns the final accumulator value.
+        * @param seed The initial accumulator value.
+        * @param func An accumulator function to be invoked on each element.
+        */
+        aggregate<TAccumulate>(seed: TAccumulate, func: (accumulate: TAccumulate, item: T) => TAccumulate): TAccumulate
+
+
+        /**
+        * Applies an accumulator function over a sequence. The specified seed value is used as the initial accumulator value,
+        * and the specified function is used to select the result value.
+        * Returns the final accumulator value.
+        * @param seed The initial accumulator value.
+        * @param func An accumulator function to be invoked on each element.
+        * @param resultSelector A function to transform the final accumulator value into the result value.
+        */
+        aggregate<TAccumulate, TResult>(seed: TAccumulate, func: (accumulate: TAccumulate, item: T) => TAccumulate, resultSelector: (accumulate: TAccumulate) => TResult): TResult;
+
+
+        /**
+        * Determines whether all elements of a sequence satisfy a condition.
+        * Returns true if every element of the source sequence passes the test in the specified predicate, or if the sequence is empty; otherwise, false.
+        * @param predicate A function to test each element for a condition.
+        */
+        all(predicate: (item: T) => boolean): boolean
+
+
+        /**
+        * Determines whether a sequence contains any elements.
+        * Returns true if the source sequence contains any elements; otherwise, false.
+        */
+        any(): boolean
+
+
+        /**
+        * Determines whether any element of a sequence satisfies a condition.
+        * Returns true if any elements in the source sequence pass the test in the specified predicate; otherwise, false.
+        * @param predicate A function to test each element for a condition.
+        */
+        any(predicate: (item: T) => boolean): boolean
+
+
+        /**
+        * Returns the input typed as Enumerable.
+        */
+        asEnumerable(): Enumerable<T>
+
+
+        /**
+        * Computes the average of a sequence of numeric values.
+        */
+        average(): number
+
+
+        /**
+        * Computes the average of a sequence of numeric values that are obtained by invoking a transform function on each element of the input sequence.
+        * @param selector A transform function to apply to each element.
+        */
+        average(selector: (item: number) => number): number
+
+
+        /**
+        * Concatenates two sequences.
+        * @param second The sequence to concatenate to the first sequence.
+        */
+        concat(second: Iterable<T>): Enumerable<T>
+
+
+        /**
+        * Determines whether a sequence contains a specified element by using the default equality comparer.
+        * @param value The value to locate in the sequence.
+        */
+        contains(value: T): boolean
+
+
+        /**
+        * Returns the last element of a sequence that satisfies a specified condition.
+        * @param value The value to locate in the sequence.
+        * @param comparer An equality comparer to compare values.
+        */
+        contains(value: T, comparer: EqualityComparer<T>): boolean
+
+
+        /**
+        * Returns the number of elements in a sequence.
+        */
+        count(): number
+
+
+        /**
+        * Returns a number that represents how many elements in the specified sequence satisfy a condition.
+        * @param predicate A function to test each element for a condition.
+        */
+        count(predicate: (item: T) => boolean): number
+
+
+        /**
+        * Returns the elements of the specified sequence or null if the sequence is empty.
+        */
+        defaultIfEmpty(): Enumerable<T>
+
+
+        /**
+        * Returns the elements of the specified sequence or the specified value in  a singleton collection if the sequence is empty.
+        * @param defaultValue The value to return if the sequence is empty.
+        */
+        defaultIfEmpty(defaultValue: T): Enumerable<T>
+
+
+        /**
+        * Returns distinct elements from a sequence by using the default equality comparer to compare values.
+        */
+        distinct(): Enumerable<T>
+
+
+        /**
+        * Produces the set difference of two sequences by using the EqualityComparer to compare values.
+        * @param comparer An EqualityComparer to compare values.
+        */
+        distinct(comparer: EqualityComparer<T>): Enumerable<T>
+
+
+        /**
+        * Produces the set difference of two sequences by using the default equality comparer to compare values.
+        * @param second An Iterable whose elements that also occur in the first sequence will cause those elements to be removed from the returned sequence.
+        */
+        except(second: Iterable<T>): Enumerable<T>
+
+
+        /**
+        * Produces the set difference of two sequences by using the specified EqualityComparer to compare values.
+        * @param second An Iterable whose elements that also occur in the first sequence will cause those elements to be removed from the returned sequence.
+        * @param comparer An EqualityComparer to compare values.
+        */
+        except(second: Iterable<T>, comparer: EqualityComparer<T>): Enumerable<T>
+
+
+        /**
+        * Returns the element at a specified index in a sequence. Throws an error if the index is less than 0 or greater than or equal to the number of elements in source.
+        * @param index The zero-based index of the element to retrieve.
+        */
+        elementAt(index: number): T
+
+
+        /**
+        * Returns the first element of a sequence. this method throws an exception if there is no element in the sequence.
+        */
+        first(): T
+
+
+        /**
+        * Returns the first element in a sequence that satisfies a specified condition. this method throws an exception if there is no element in the sequence.
+        * @param predicate A function to test each source element for a condition; the second parameter of the function represents the index of the source element.
+        */
+        first(predicate: (item: T) => boolean): T
+
+
+        /**
+        * Returns the first element of a sequence, or null if the sequence contains no elements.
+        */
+        firstOrDefault(): T
+
+
+        /**
+        * Returns the first element of the sequence that satisfies a condition or null if no such element is found.
+        * @param predicate A function to test each source element for a condition; the second parameter of the function represents the index of the source element.
+        */
+        firstOrDefault(predicate: (item: T) => boolean): T
+
+
+        /**
+        * Returns the first element of the sequence that satisfies a condition or a default value if no such element is found.
+        * @param predicate A function to test each source element for a condition; the second parameter of the function represents the index of the source element.
+        * @param defaultValue The value to return if no element exists with specified condition.
+        */
+        firstOrDefault(predicate: (item: T) => boolean, defaultValue: T): T
+
+
+        /**
+        * Performs the specified action on each element of an Enumerable.
+        * @param action The action function to perform on each element of an Enumerable.
+        */
+        forEach(action: (item: T) => void): void
+
+
+        /**
+        * Performs the specified action on each element of an Enumerable.
+        * @param action The action function to perform on each element of an Enumerable; the second parameter of the function represents the index of the source element.
+        */
+        forEach(action: (item: T, index: number) => void): void
+
+
+        /**
+        * Groups the elements of a sequence according to a specified key selector function.
+        * @param keySelector A function to extract the key for each element.
+        */
+        groupBy<TKey>(keySelector: (item: T) => TKey): Enumerable<Grouping<TKey, T>>;
+
+
+        /**
+        * Groups the elements of a sequence according to a specified key selector function.
+        * @param keySelector A function to extract the key for each element.
+        * @param comparer An equality comparer to compare values.
+        */
+        groupBy<TKey>(keySelector: (item: T) => TKey, comparer: EqualityComparer<TKey>): Enumerable<Grouping<TKey, T>>;
+
+
+        /**
+        * Groups the elements of a sequence according to a specified key selector function and projects the elements for each group by using a specified function.
+        * @param keySelector A function to extract the key for each element.
+        * @param elementSelector A function to map each source element to an element in the Grouping.
+        */
+        groupBy<TKey, TElement>(keySelector: (item: T) => TKey, elementSelector: (item: T) => TElement): Enumerable<Grouping<TKey, TElement>>;
+
+
+        /**
+        * Groups the elements of a sequence according to a key selector function.
+        * The keys are compared by using a comparer and each group's elements are projected by using a specified function.
+        * @param keySelector A function to extract the key for each element.
+        * @param elementSelector A function to map each source element to an element in the Grouping.
+        * @param comparer An equality comparer to compare values.
+        */
+        groupBy<TKey, TElement>(keySelector: (item: T) => TKey, elementSelector: (item: T) => TElement, comparer: EqualityComparer<TKey>): Enumerable<Grouping<TKey, TElement>>;
+
+
+        /**
+        * Groups the elements of a sequence according to a specified key selector function and projects the elements for each group by using a specified function.
+        * @param keySelector A function to extract the key for each element.
+        * @param elementSelector A function to map each source element to an element in the Grouping.
+        * @param resultSelector A function to extract the key for each element.
+        */
+        groupBy<TKey, TElement, TResult>(keySelector: (item: T) => TKey, elementSelector: (item: T) => TElement, resultSelector: (key: TKey, elements: Iterable<TElement>) => TResult): Enumerable<TResult>;
+
+
+        /**
+        * Groups the elements of a sequence according to a key selector function.
+        * The keys are compared by using a comparer and each group's elements are projected by using a specified function.
+        * @param keySelector A function to extract the key for each element.
+        * @param elementSelector A function to map each source element to an element in the Grouping.
+        * @param resultSelector A function to extract the key for each element.
+        * @param comparer An equality comparer to compare values.
+        */
+        groupBy<TKey, TElement, TResult>(keySelector: (item: T) => TKey, elementSelector: (item: T) => TElement, resultSelector: (key: TKey, elements: Iterable<TElement>) => TResult, comparer: EqualityComparer<TKey>): Enumerable<TResult>;
+
+
+        /**
+        * Correlates the elements of two sequences based on equality of keys and groups the results. The default equality comparer is used to compare keys.
+        * @param inner The sequence to join to the current sequence.
+        * @param outerKeySelector A function to extract the join key from each element of the first sequence.
+        * @param innerKeySelector A function to extract the join key from each element of the second sequence.
+        * @param resultSelector A function to create a result element from an element from the first sequence and a collection of matching elements from the second sequence.
+        */
+        groupJoin<TInner, TKey, TResult>(inner: Iterable<TInner>, outerKeySelector: (item: T) => TKey, innerKeySelector: (item: TInner) => TKey, resultSelector: (outer: T, inner: Enumerable<TInner>) => TResult): Enumerable<TResult>;
+
+
+        /**
+        * Correlates the elements of two sequences based on key equality and groups the results. A specified EqualityComparer is used to compare keys.
+        * @param inner The sequence to join to the current sequence.
+        * @param outerKeySelector A function to extract the join key from each element of the first sequence.
+        * @param innerKeySelector A function to extract the join key from each element of the second sequence.
+        * @param resultSelector A function to create a result element from an element from the first sequence and a collection of matching elements from the second sequence.
+        * @param comparer An equality comparer to compare values.
+        */
+        groupJoin<TInner, TKey, TResult>(inner: Iterable<TInner>, outerKeySelector: (item: T) => TKey, innerKeySelector: (item: TInner) => TKey, resultSelector: (outer: T, inner: Enumerable<TInner>) => TResult, comparer: EqualityComparer<TKey>): Enumerable<TResult>;
+
+
+        /**
+        * Produces the set intersection of two sequences by using the default equality comparer to compare values.
+        * @param second An Iterable whose distinct elements that also appear in the first sequence will be returned.
+        */
+        intersect(second: Iterable<T>): Enumerable<T>;
+
+
+        /**
+        * Produces the set intersection of two sequences by using the default equality comparer to compare values.
+        * @param second An Iterable whose distinct elements that also appear in the first sequence will be returned.
+        * @param comparer An EqualityComparer to compare values.
+        */
+        intersect(second: Iterable<T>, comparer: EqualityComparer<T>): Enumerable<T>;
+
+
+        /**
+        * Correlates the elements of two sequences based on matching keys. The default equality comparer is used to compare keys.
+        * @param inner The sequence to join to the current sequence.
+        * @param outerKeySelector A function to extract the join key from each element of the first sequence.
+        * @param innerKeySelector A function to extract the join key from each element of the second sequence.
+        * @param resultSelector A function to create a result element from an element from the first sequence and a collection of matching elements from the second sequence.
+        */
+        join<TInner, TKey, TResult>(inner: Iterable<TInner>, outerKeySelector: (item: T) => TKey, innerKeySelector: (item: TInner) => TKey, resultSelector: (outer: T, inner: TInner) => TResult): Enumerable<TResult>;
+
+
+        /**
+        * Correlates the elements of two sequences based on matching keys. A specified EqualityComparer is used to compare keys.
+        * @param inner The sequence to join to the current sequence.
+        * @param outerKeySelector A function to extract the join key from each element of the first sequence.
+        * @param innerKeySelector A function to extract the join key from each element of the second sequence.
+        * @param resultSelector A function to create a result element from an element from the first sequence and a collection of matching elements from the second sequence.
+        * @param comparer An equality comparer to compare values.
+        */
+        join<TInner, TKey, TResult>(inner: Iterable<TInner>, outerKeySelector: (item: T) => TKey, innerKeySelector: (item: TInner) => TKey, resultSelector: (outer: T, inner: TInner) => TResult, comparer: EqualityComparer<TKey>): Enumerable<TResult>;
+
+
+        /**
+        * Returns the last element of a sequence.
+        */
+        last(): T
+
+
+        /**
+        * Returns the last element of a sequence that satisfies a specified condition.
+        * @param predicate A function to test each source element for a condition.
+        */
+        last(predicate: (item: T) => boolean): T
+
+
+        /**
+        * Returns the first element of a sequence, or null if the sequence contains no elements.
+        */
+        lastOrDefault(): T
+
+
+        /**
+        * Returns the last element of a sequence, or null if the sequence contains no elements.
+        * @param predicate A function to test each source element for a condition.
+        */
+        lastOrDefault(predicate: (item: T) => boolean): T
+
+
+        /**
+        * Returns the last element of a sequence that satisfies a condition or null if no such element is found.
+        * @param predicate A function to test each source element for a condition.
+        * @param defaultValue The value to return if no element exists with specified condition.
+        */
+        lastOrDefault(predicate: (item: T) => boolean, defaultValue: T): T
+
+
+        /**
+        * Returns the maximum value in a sequence of values.
+        */
+        max(): T
+
+
+        /**
+        * Invokes a transform function on each element of a sequence and returns the maximum value.
+        * @param selector A transform function to apply to each element.
+        */
+        max<TResult>(selector: (item: T) => TResult): TResult
+
+
+        /**
+        * Returns the minimum value in a sequence of values.
+        */
+        min(): T
+
+
+        /**
+        * Invokes a transform function on each element of a sequence and returns the minimum value.
+        * @param selector A transform function to apply to each element.
+        */
+        min<TResult>(selector: (item: T) => TResult): TResult
+
+
+        /**
+        * Filters the elements of an Enumerable based on a specified type.
+        * @param type The type to filter the elements of the sequence on.
+        */
+        ofType<TResult>(type: { new (...args: any[]): TResult }): Enumerable<TResult>
+
+
+        /**
+        * Sorts the elements of a sequence in ascending order by using a specified comparer.
+        * @param keySelector A function to extract a key from each element.
+        */
+        orderBy<TKey>(keySelector: (item: T) => TKey): OrderedEnumerable<T>
+
+
+        /**
+        * Sorts the elements of a sequence in ascending order by using a specified comparer.
+        * Returns an OrderedEnumerable whose elements are sorted according to a key.
+        * @param keySelector A function to extract a key from each element.
+        * @param comparer A Comparer to compare keys.
+        */
+        orderBy<TKey>(keySelector: (item: T) => TKey, comparer: EqualityComparer<TKey>): OrderedEnumerable<T>
+
+
+        /**
+        * Sorts the elements of a sequence in descending order by using a specified comparer.
+        * Returns an OrderedEnumerable whose elements are sorted according to a key.
+        * Returns an OrderedEnumerable whose elements are sorted in descending order according to a key.
+        * @param keySelector A function to extract a key from each element.
+        */
+        orderByDescending<TKey>(keySelector: (item: T) => TKey): OrderedEnumerable<T>
+
+
+        /**
+        * Sorts the elements of a sequence in descending order by using a specified comparer.
+        * Returns an OrderedEnumerable whose elements are sorted in descending order according to a key.
+        * @param keySelector A function to extract a key from each element.
+        * @param comparer A Comparer to compare keys.
+        */
+        orderByDescending<TKey>(keySelector: (item: T) => TKey, comparer: EqualityComparer<TKey>): OrderedEnumerable<T>
+
+
+        /**
+        * Inverts the order of the elements in a sequence.
+        */
+        reverse(): Enumerable<T>
+
+
+        /**
+        * Determines whether two sequences are equal by comparing the elements by using the default equality comparer for their type.
+        * @param second An Iterable to compare to the first sequence.
+        */
+        sequenceEqual(second: Iterable<T>): boolean
+
+
+        /**
+        * Determines whether two sequences are equal by comparing their elements by using a specified EqualityComparer.
+        * @param second An Iterable to compare to the first sequence.
+        * @param comparer The EqualityComparer to compare values.
+        */
+        sequenceEqual(second: Iterable<T>, comparer: EqualityComparer<T>): boolean
+
+
+        /**
+        * Projects each element of a sequence into a new form.
+        * @param selector A transform function to apply to each source element.
+        */
+        select<TResult>(selector: (item: T) => TResult): Enumerable<TResult>
+
+
+        /**
+        * Projects each element of a sequence into a new form by incorporating the element's index.
+        * @param selector A transform function to apply to each source element; the second parameter of the function represents the index of the source element.
+        */
+        select<TResult>(selector: (item: T, index: number) => TResult): Enumerable<TResult>
+
+
+        /**
+        * Projects each element of a sequence to an Enumerable and flattens the resulting sequences into one sequence.
+        * @param collectionSelector A transform function to apply to each source element.
+        */
+        selectMany<TResult>(selector: (item: T) => Iterable<TResult>): Enumerable<TResult>;
+
+
+        /**
+        * Projects each element of a sequence to an Enumerable and flattens the resulting sequences into one sequence. The index of each source element is used in the projected form of that element.
+        * @param collectionSelector A transform function to apply to each source element; the second parameter of the function represents the index of the source element.
+        */
+        selectMany<TResult>(selector: (item: T, index: number) => Iterable<TResult>): Enumerable<TResult>;
+
+
+        /**
+        * Projects each element of a sequence to an Enumerable and flattens the resulting sequences into one sequence.
+        * @param collectionSelector A transform function to apply to each source element; the second parameter of the function represents the index of the source element.
+        * @param resultSelector A transform function to apply to each element of the intermediate sequence.
+        */
+        selectMany<TCollection, TResult>(collectionSelector: (item: T) => Iterable<TCollection>, resultSelector: (item: T, collection: TCollection) => TResult): Enumerable<TResult>;
+
+
+        /**
+        * Projects each element of a sequence to an Enumerable and flattens the resulting sequences into one sequence. The index of each source element is used in the projected form of that element.
+        * @param collectionSelector A transform function to apply to each source element; the second parameter of the function represents the index of the source element.
+        * @param resultSelector A transform function to apply to each element of the intermediate sequence.
+        */
+        selectMany<TCollection, TResult>(collectionSelector: (item: T, index: number) => Iterable<TCollection>, resultSelector: (item: T, collection: TCollection) => TResult): Enumerable<TResult>;
+
+
+        /**
+        * Returns the only element of a sequence, and throws an exception if there is not exactly one element in the sequence.
+        */
+        single(): T
+
+
+        /**
+        * Returns the only element of a sequence that satisfies a specified condition, and throws an exception if more than one such element exists.
+        * @param predicate A function to test each source element for a condition.
+        */
+        single(predicate: (item: T) => boolean): T
+
+
+        /**
+        * Returns the only element of a sequence, or a null if the sequence is empty; this method throws an exception if there is more than one element in the sequence.
+        */
+        singleOrDefault(): T
+
+
+        /**
+        * Returns the only element of a sequence that satisfies a specified condition or a null if no such element exists; this method throws an exception if more than one element satisfies the condition.
+        * @param predicate A function to test each source element for a condition.
+        */
+        singleOrDefault(predicate: (item: T) => boolean): T
+
+
+        /**
+        * Returns the only element of a sequence that satisfies a specified condition or a default value if no such element exists; this method throws an exception if more than one element satisfies the condition.
+        * @param predicate A function to test each source element for a condition.
+        * @param defaultValue The value to return if no element exists with specified condition.
+        */
+        singleOrDefault(predicate: (item: T) => boolean, defaultValue: T): T
+
+
+        /**
+        * Bypasses a specified number of elements in a sequence and then returns the remaining elements.
+        * @param count The number of elements to skip before returning the remaining elements.
+        */
+        skip(count: number): Enumerable<T>
+
+
+        /**
+        * Bypasses elements in a sequence as long as a specified condition is true and then returns the remaining elements.
+        * @param predicate A function to test each source element for a condition.
+        */
+        skipWhile(predicate: (item: T) => boolean): Enumerable<T>
+
+
+        /**
+        * Bypasses elements in a sequence as long as a specified condition is true and then returns the remaining elements. The element's index is used in the logic of the predicate function.
+        * @param predicate A function to test each source element for a condition; the second parameter of the function represents the index of the source element.
+        */
+        skipWhile(predicate: (item: T, index: number) => boolean): Enumerable<T>
+
+
+        /**
+        * Computes the sum of a sequence of values.
+        */
+        sum(): number
+
+
+        /**
+        * Computes the sum of the sequence of values that are obtained by invoking a transform function on each element of the input sequence.
+        * @param selector A transform function to apply to each element.
+        */
+        sum(selector: (item: T) => number): number
+
+
+        /**
+        * Returns a specified number of contiguous elements from the start of a sequence.
+        * @param count The number of elements to return.
+        */
+        take(count: number): Enumerable<T>
+
+
+        /**
+        * Returns elements from a sequence as long as a specified condition is true.
+        * @param predicate A function to test each source element for a condition.
+        */
+        takeWhile(predicate: (item: T) => boolean): Enumerable<T>
+
+
+        /**
+        * Returns elements from a sequence as long as a specified condition is true. The element's index is used in the logic of the predicate function.
+        * @param predicate A function to test each source element for a condition; the second parameter of the function represents the index of the source element.
+        */
+        takeWhile(predicate: (item: T, index: number) => boolean): Enumerable<T>
+
+
+        /**
+        * Creates an array from an Enumerable.
+        */
+        toArray(): T[]
+
+
+        /**
+        * Creates a Dictionary from an Enumerable according to a specified key selector function.
+        * @param keySelector A function to extract a key from each element.
+        */
+        toDictionary<TKey>(keySelector: (item: T) => TKey): Dictionary<TKey, T>;
+
+
+        /**
+        * Creates a Dictionary from an Enumerable according to specified key selector and comparer.
+        * @param keySelector A function to extract a key from each element.
+        * @param comparer An equality comparer to compare values.
+        */
+        toDictionary<TKey>(keySelector: (item: T) => TKey, comparer: EqualityComparer<TKey>): Dictionary<TKey, T>;
+
+
+        /**
+        * Creates a Dictionary from an Enumerable according to specified key selector and element selector functions.
+        * @param keySelector A function to extract a key from each element.
+        * @param elementSelector A transform function to produce a result element value from each element.
+        */
+        toDictionary<TKey, TElement>(keySelector: (item: T) => TKey, elementSelector: (item: T) => TElement): Dictionary<TKey, TElement>;
+
+
+        /**
+        * Creates a Dictionary from an Enumerable according to a specified key selector function, a comparer, and an element selector function.
+        * @param keySelector A function to extract a key from each element.
+        * @param elementSelector A transform function to produce a result element value from each element.
+        * @param comparer An equality comparer to compare values.
+        */
+        toDictionary<TKey, TElement>(keySelector: (item: T) => TKey, elementSelector: (item: T) => TElement, comparer: EqualityComparer<TKey>): Dictionary<TKey, TElement>;
+
+
+        /**
+        * Creates a List from an Enumerable.
+        */
+        toList(): List<T>
+
+
+        /**
+        * Creates a Lookup from an Enumerable according to a specified key selector function.
+        * @param keySelector A function to extract a key from each element.
+        */
+        toLookup<TKey>(keySelector: (item: T) => TKey): Lookup<TKey, T>;
+
+
+        /**
+        * Creates a Lookup from an Enumerable according to a specified key selector function and comparer.
+        * @param keySelector A function to extract a key from each element.
+        * @param comparer An equality comparer to compare values.
+        */
+        toLookup<TKey>(keySelector: (item: T) => TKey, comparer: EqualityComparer<TKey>): Lookup<TKey, T>;
+
+
+        /**
+        * Creates a Lookup from an Enumerable according to specified key selector and element selector functions.
+        * @param keySelector A function to extract a key from each element.
+        * @param elementSelector A transform function to produce a result element value from each element.
+        */
+        toLookup<TKey, TElement>(keySelector: (item: T) => TKey, elementSelector: (item: T) => TElement): Lookup<TKey, TElement>;
+
+
+        /**
+        * Creates a Lookup from an Enumerable according to a specified key selector function, a comparer and an element selector function.
+        * @param keySelector A function to extract a key from each element.
+        * @param elementSelector A transform function to produce a result element value from each element.
+        * @param comparer An equality comparer to compare values.
+        */
+        toLookup<TKey, TElement>(keySelector: (item: T) => TKey, elementSelector: (item: T) => TElement, comparer: EqualityComparer<TKey>): Lookup<TKey, TElement>;
+
+
+        /**
+        * Produces the set union of two sequences by using the default equality comparer.
+        * @param second An Iterable whose distinct elements form the second set for the union.
+        */
+        union(second: Iterable<T>): Enumerable<T>
+
+
+        /**
+        * Produces the set union of two sequences by using a specified EqualityComparer.
+        * @param second An Iterable whose distinct elements form the second set for the union.
+        * @param comparer The EqualityComparer to compare values.
+        */
+        union(second: Iterable<T>, comparer: EqualityComparer<T>): Enumerable<T>
+
+
+        /**
+        * Filters a sequence of values based on a predicate.
+        * @param predicate A function to test each source element for a condition.
+        */
+        where(predicate: (item: T) => boolean): Enumerable<T>;
+
+
+        /**
+        * Filters a sequence of values based on a predicate. Each element's index is used in the logic of the predicate function.
+        * @param predicate A function to test each source element for a condition; the second parameter of the function represents the index of the source element.
+        */
+        where(predicate: (item: T, index: number) => boolean): Enumerable<T>;
+
+
+        /**
+        * Merges two sequences by using the specified predicate function.
+        * @param second The second sequence to merge.
+        * @param resultSelector A function that specifies how to merge the elements from the two sequences.
+        */
+        zip<TSecond, TResult>(second: Iterable<TSecond>, resultSelector: (first: T, second: TSecond) => TResult): Enumerable<TResult>;
+    }
+
+
+
+    /**
+    * Represents Array-like objects which has the "length" property and indexed properties access, eg. jQuery
+    */
+    interface ArrayLike<T> {
+        length: number;
+        [n: number]: T;
+    }
+
+
+
+    /**
+    * Provides 'hash' and 'equals' functions for a particular type, suitable for use in hashing algorithms and data structures such as a hash table.
+    */
+    interface RuntimeComparer {
+
+        /**
+        * Serves as a hash function for a particular type.
+        */
+        __hash__(): number;
+
+        /**
+        * Determines whether the specified Object is equal to the current Object.
+        */
+        __equals__(obj: any): boolean;
+    }
+
+
+
+    /**
+    * Provides a set of static methods that provide support for internal operations.
+    */
+    interface MultiplexRuntime {
+
+        /**
+        * Serves as a hash function for a particular type, suitable for use in hashing algorithms and data structures such as a hash table.
+        * @param obj An object to retrieve the hash code for.
+        */
+        hash(obj: any): number;
+
+
+        /**
+        * Determines whether the specified object instances are considered equal.
+        * @param objA The first object to compare.
+        * @param objB The second object to compare.
+        */
+        equals(objA: any, objB: any): boolean;
+
+
+        /**
+        * Performs a comparison of two objects of the same type and returns a value indicating whether one object is less than, equal to, or greater than the other.
+        * @param objA The first object to compare.
+        * @param objB The second object to compare.
+        */
+        compare<T>(objA: T, objB: T): number;
+
+
+        /**
+        * Creates A function expression from the specified string lambda expression
+        * @param exp String lambda expression.
+        */
+        lambda<T, TResult>(exp: string): (obj: T) => TResult;
+
+
+        /**
+        * Creates A function expression from the specified string lambda expression
+        * @param exp String lambda expression.
+        */
+        lambda<T1, T2, TResult>(exp: string): (obj1: T1, obj2: T2) => TResult;
+
+
+        /**
+        * Creates A function expression from the specified string lambda expression
+        * @param exp String lambda expression.
+        */
+        lambda<T1, T2, T3, TResult>(exp: string): (obj1: T1, obj2: T2, obj3: T3) => TResult;
+
+
+        /**
+        * Creates A function expression from the specified string lambda expression
+        * @param exp String lambda expression.
+        */
+        lambda<TResult>(exp: string): (...args: any[]) => TResult;
+
+
+        /**
+        * Defines new or modifies existing properties directly on the specified object, returning the object.
+        * @param obj The object on which to define or modify properties.
+        * @param prop The name of the property to be defined or modified.
+        * @param attributes The descriptor for the property being defined or modified.
+        */
+        define<T>(obj: T, prop: String, attributes: PropertyDescriptor): T;
+
+
+        /**
+        * Extends the given object by implementing supplied members.
+        * @param obj The object on which to define or modify properties.
+        * @param properties Represetnts the mixin source object
+        * @param attributes The descriptor for the property being defined or modified.
+        */
+        mixin<T>(obj: T, properties: Object, attributes?: PropertyDescriptor): T;
+    }
+
+
+
+    /**
+    * Defines MultiplexStatic module members
+    */
+    interface MultiplexStatic {
+
+
+
+        /* Factory Methods
+        --------------------------------------------------------------------------*/
+
+        /**
+        * Exposes the enumerator, which supports an iteration over the specified Enumerable object.
+        * @param obj An Iterable object. eg. Enumerable, Array, String, Set, Map, Iterable & Generators
+        */
+        <T>(obj: Iterable<T>): Enumerable<T>
+
+
+        /**
+        * Defines an enumerator, which supports an iteration over the specified Generator function.
+        * @param factory An Enumerator factory function.
+        */
+        <T>(factory: () => Enumerator<T>): Enumerable<T>
+
+
+        /**
+        * Defines an enumerator, which supports an iteration over the items of the specified Array-like object.
+        * An Array-like object is an object which has the "length" property and indexed properties access, eg. jQuery
+        * @param obj An Array-like object.
+        */
+        <T>(obj: ArrayLike<T>): Enumerable<T>
+
+
+        /**
+        * Defines an enumerator, which supports an iteration over the arguments local variable available within all functions.
+        * @param obj arguments local variable available within all functions.
+        */
+        (obj: IArguments): Enumerable<any>
+
+
+        /**
+        * Defines an enumerator, which supports an iteration over the properties of the specified object.
+        * @param obj A regular Object.
+        */
+        (obj: Object): Enumerable<KeyValuePair<string, any>>
+
+
+
+
+
+
+        /* Static Methods
+        --------------------------------------------------------------------------*/
+
+        /**
+        * Gets and combines hash code for the given parameters, calls the overridden "hash" method when available.
+        * @param objs Optional number of objects to combine their hash codes.
+        */
+        hash(...obj: any[]): number;
+
+
+        /**
+        * Determines whether the specified object instances are considered equal. calls the overridden "equals" method when available.
+        * @param objA The first object to compare.
+        * @param objB The second object to compare.
+        */
+        equals(objA: any, objB: any): boolean;
+
+
+        /**
+        * Determines whether the specified object instances are considered equal. calls the overridden "equals" method when available.
+        * @param objA The first object to compare.
+        * @param objB The second object to compare.
+        * @param comparer An equality comparer to compare values.
+        */
+        equals(objA: any, objB: any, comparer: EqualityComparer<any>): boolean;
+
+
+        /**
+        * Performs a comparison of two objects of the same type and returns a value indicating whether one object is less than, equal to, or greater than the other.
+        * @param objA The first object to compare.
+        * @param objB The second object to compare.
+        */
+        compare<T>(objA: T, objB: T): number;
+
+
+        /**
+        * Extends Enumerable extension methods to the given type
+        * @param type The type to extend.
+        */
+        enumerableExtend(type: Function): void;
+
+
+        /**
+        * Returns an empty Enumerable.
+        */
+        empty<T>(): Enumerable<T>;
+
+
+        /**
+        * Detects if an object is Enumerable.
+        * @param obj An object to check its Enumerability.
+        */
+        is(obj: any): boolean;
+
+
+        /**
+        * Generates a sequence of integral numbers within a specified range.
+        * @param start The value of the first integer in the sequence.
+        * @param count The number of sequential integers to generate.
+        */
+        range(start: number, count: number): Enumerable<number>;
+
+
+        /**
+        * Generates a sequence that contains one repeated value.
+        * @param element The value to be repeated.
+        * @param count The number of times to repeat the value in the generated sequence.
+        */
+        repeat<T>(element: T, count: number): Enumerable<T>;
+
+
+
+
+
+
+        /* Mutiplex Types
+        --------------------------------------------------------------------------*/
+
+        /**
+        * Provides a set of static methods that provide support for internal operations.
+        */
+        runtime: MultiplexRuntime
+
+        /**
+        * Supports a simple iteration over a collection.
+        */
+        Enumerator: EnumeratorConstructor
+
+        /**
+        * Exposes the enumerator, which supports a simple iteration over a collection of a specified type.
+        */
+        Enumerable: EnumerableConstructor
+
+        /**
+        * Provides a base class for implementations of Comparer<T> generic interface.
+        */
+        Comparer: ComparerConstructor
+
+        /**
+        * Provides a base class for implementations of the EqualityComparer.
+        */
+        EqualityComparer: EqualityComparerConstructor
+
+        /**
+        * Initializes a new instance of the abstract Collection class.
+        */
+        Collection: CollectionConstructor
+
+        /**
+        * Initializes a new instance of the abstract Collection class.
+        */
+        ReadOnlyCollection: ReadOnlyCollectionConstructor
+
+        /**
+        * Represents a strongly typed list of objects that can be accessed by index.
+        */
+        List: ListConstructor
+
+        /**
+        * Represents a collection of key/value pairs that are sorted by key based on the associated Comparer implementation.
+        */
+        SortedList: SortedListConstructor
+
+        /**
+        * Defines a key/value pair that can be set or retrieved.
+        */
+        KeyValuePair: KeyValuePairConstructor
+
+        /**
+        * Represents a collection of keys and values.
+        */
+        Dictionary: DictionaryConstructor
+
+        /**
+        * Represents a set of values.
+        */
+        HashSet: HashSetConstructor
+
+        /**
+        * Represents a node in a LinkedList.
+        */
+        LinkedListNode: LinkedListNodeConstructor
+
+        /**
+        * Represents a doubly linked list.
+        */
+        LinkedList: LinkedListConstructor
+
+        /**
+        * Represents a first-in, first-out collection of objects.
+        */
+        Queue: QueueConstructor
+
+        /**
+        * Represents a variable size last-in-first-out (LIFO) collection of instances of the same arbitrary type.
+        */
+        Stack: StackConstructor
+    }
+}
diff --git a/multiplexjs/multiplexjs-tests.ts b/multiplexjs/multiplexjs-tests.ts
index c3148742ea..94f212b533 100644
--- a/multiplexjs/multiplexjs-tests.ts
+++ b/multiplexjs/multiplexjs-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="multiplexjs.d.ts" />
-/// <reference path='../qunit/qunit.d.ts'/>
+
+/// <reference types="qunit"/>
 
 
 namespace MxTests {
diff --git a/multiplexjs/multiplexjs.d.ts b/multiplexjs/multiplexjs.d.ts
deleted file mode 100644
index 8739e59ea5..0000000000
--- a/multiplexjs/multiplexjs.d.ts
+++ /dev/null
@@ -1,2551 +0,0 @@
-// Type definitions for Multiplex.js 0.9
-// Project: http://github.com/multiplex/multiplex.js
-// Definitions by: Kamyar Nazeri <http://github.com/KamyarNazeri>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-
-declare var multiplex: multiplex.MultiplexStatic;
-
-
-// Support AMD require
-declare module 'multiplex' {
-    export = multiplex;
-}
-
-
-// Collapse multiplex into mx
-import mx = multiplex;
-
-
-// ES6 compatibility
-interface Array<T> extends multiplex.Iterable<T> { }
-interface String extends multiplex.Iterable<string> { }
-
-
-
-declare namespace multiplex {
-
-    /**
-    * ES6 Iterable
-    */
-    interface Iterable<T> {
-        "@@iterator"(): Iterator<T>
-    }
-    interface Iterator<T> {
-        next(): IteratorResult<T>;
-        return?(value?: any): IteratorResult<T>;
-        throw?(e?: any): IteratorResult<T>;
-    }
-    interface IteratorResult<T> {
-        done: boolean;
-        value?: T;
-    }
-
-
-
-    /**
-    * Supports a simple iteration over a collection.
-    */
-    interface Enumerator<T> {
-
-        /**
-        * Advances the enumerator to the next element of the collection.
-        */
-        next(): boolean;
-
-        /**
-        * Gets the element in the collection at the current position of the enumerator.
-        */
-        current: T;
-    }
-    interface EnumeratorConstructor {
-        new <T>(generator: (yielder: (value: T) => T) => any): Enumerator<T>;
-    }
-
-
-
-    /**
-    * Exposes the enumerator, which supports a simple iteration over a collection of a specified type.
-    * Enumerable uses ES6 Iteration protocol.
-    */
-    interface Enumerable<T> extends Iterable<T> {
-
-        /**
-        * Returns an enumerator that iterates through the collection.
-        */
-        getEnumerator(): Enumerator<T>;
-    }
-    interface EnumerableConstructor {
-
-        /**
-        * Exposes the enumerator, which supports an iteration over the specified Enumerable object.
-        * @param obj An Iterable object. eg. Enumerable, Array, String, Set, Map, Iterable & Generators
-        */
-        new <T>(obj: Iterable<T>): Enumerable<T>;
-
-
-        /**
-        * Defines an enumerator, which supports an iteration over the specified Generator function.
-        * @param factory An Enumerator factory function.
-        */
-        new <T>(factory: () => Enumerator<T>): Enumerable<T>;
-
-        /**
-        * Defines an enumerator, which supports an iteration over the items of the specified Array-like object.
-        * An Array-like object is an object which has the "length" property and indexed properties access, eg. jQuery
-        * @param obj An Array-like object.
-        */
-        new <T>(obj: ArrayLike<T>): Enumerable<T>;
-
-        /**
-        * Defines an enumerator, which supports an iteration over the arguments local variable available within all functions.
-        * @param obj arguments local variable available within all functions.
-        */
-        new (obj: IArguments): Enumerable<any>;
-
-        /**
-        * Defines an enumerator, which supports an iteration over the properties of the specified object.
-        * @param obj A regular Object.
-        */
-        new (obj: Object): Enumerable<KeyValuePair<string, any>>;
-
-
-
-
-        /**
-        * Returns an empty Enumerable.
-        */
-        empty<T>(): Enumerable<T>;
-
-        /**
-        * Detects if an object is Enumerable.
-        * @param obj An object to check its Enumerability.
-        */
-        is(obj: any): boolean;
-
-        /**
-        * Generates a sequence of integral numbers within a specified range.
-        * @param start The value of the first integer in the sequence.
-        * @param count The number of sequential integers to generate.
-        */
-        range(start: number, count: number): Enumerable<number>;
-
-        /**
-        * Generates a sequence that contains one repeated value.
-        * @param element The value to be repeated.
-        * @param count The number of times to repeat the value in the generated sequence.
-        */
-        repeat<T>(element: T, count: number): Enumerable<T>;
-    }
-
-
-
-    /**
-    * Defines a method that a type implements to compare two objects.
-    */
-    interface Comparer<T> {
-        /**
-        * Compares two objects and returns a value indicating whether one is less than, equal to, or greater than the other.
-        * returns An integer that indicates the relative values of x and y, as shown in the following table:
-        * Less than zero x is less than y.
-        * Zero x equals y.
-        * Greater than zero x is greater than y..
-        * @param x The first object to compare.
-        * @param y The second object to compare.
-        */
-        compare(x: T, y: T): number;
-    }
-    interface ComparerConstructor {
-
-        /**
-        * Returns a default sort order comparer for the type specified by the generic argument.
-        */
-        defaultComparer: Comparer<any>;
-
-        /**
-        * Creates a comparer by using the specified comparison.
-        * @param comparison The comparison to use.
-        */
-        create<T>(comparison: (x: T, y: T) => number): Comparer<T>;
-    }
-
-
-
-    /**
-    * Provides a base class for implementations of the EqualityComparer.
-    */
-    interface EqualityComparer<T> {
-
-        /**
-        * Determines whether the specified objects are equal.
-        * @param x The first object of type Object to compare.
-        * @param y The second object of type Object to compare.
-        */
-        equals(x: T, y: T): boolean;
-
-
-        /**
-        * Returns a hash code for the specified object.
-        * @param obj The Object for which a hash code is to be returned.
-        */
-        hash(obj: T): number
-    }
-    interface EqualityComparerConstructor {
-
-        /**
-        * Gets a default equality comparer for the type specified by the generic argument.
-        */
-        defaultComparer: EqualityComparer<any>;
-
-
-        /**
-        * Creates an EqualityComparer by using the specified equality and hashCodeProvider.
-        * @param hashCodeProvider The hashCodeProvider to use for a hash code is to be returned.
-        * @param equality The equality function.
-        */
-        create<T>(hashCodeProvider: (obj: T) => number, equality: (x: T, y: T) => boolean): EqualityComparer<T>;
-    }
-
-
-
-    /**
-    * Initializes a new instance of the abstract Collection class.
-    */
-    interface Collection<T> extends Enumerable<T> {
-
-        /**
-        * Gets the number of elements contained in the Collection.
-        */
-        count(): number;
-
-
-        /**
-        * Copies the Collection to an existing one-dimensional Array, starting at the specified array index.
-        * @param array The one-dimensional Array that is the destination of the elements copied from Dictionary keys.
-        * @param arrayIndex The zero-based index in array at which copying begins.
-        */
-        copyTo(array: T[], arrayIndex: number): void
-    }
-    interface CollectionConstructor {
-
-        /**
-        * Initializes a new instance of the Collection class that is empty.
-        */
-        new <T>(): Collection<T>
-
-
-        /**
-        * Initializes a new instance of the Collection class that is wrapper around the specified Enumerable.
-        * @param value The Iterable to wrap.
-        */
-        new <T>(value: Iterable<T>): Collection<T>
-    }
-
-
-
-    /**
-    * Initializes a new instance of the abstract Collection class.
-    */
-    interface ReadOnlyCollection<T> extends Collection<T> {
-
-        /**
-        * Gets the element at the specified index.
-        * @param index The zero-based index of the element to get.
-        */
-        [index: number]: T;
-
-
-        /**
-        * Gets the element at the specified index.
-        * @param index The zero-based index of the element to get.
-        */
-        get(index: number): T
-
-
-        /**
-        * Determines whether the ReadOnlyCollection contains a specific value.
-        * @param item The object to locate in the ReadOnlyCollection.
-        */
-        contains(item: T): boolean
-
-
-        /**
-        * Searches for the specified object and returns the zero-based index of the first occurrence within the entire ReadOnlyCollection.
-        * @param item The object to locate in the ReadOnlyCollection.
-        */
-        indexOf(item: T): number
-    }
-    interface ReadOnlyCollectionConstructor {
-
-        /**
-        * Initializes a new instance of the ReadOnlyCollection class that is a read-only wrapper around the specified list.
-        * @param list The list to wrap.
-        */
-        new <T>(list: List<T>): ReadOnlyCollection<T>
-    }
-
-
-
-    /**
-    * Represents a strongly typed list of objects that can be accessed by index.
-    */
-    interface List<T> extends Collection<T> {
-
-        /**
-        * Gets the element at the specified index.
-        * @param index The zero-based index of the element to get.
-        */
-        [index: number]: T;
-
-
-        /**
-        * Adds an object to the end of the List.
-        * @param item The object to be added to the end of the List.
-        */
-        add(item: T): void
-
-
-        /**
-        * Adds the elements of the specified collection to the end of the List.
-        * @param collection The collection whose elements should be added to the end of the List.
-        */
-        addRange(collection: Iterable<T>): void
-
-
-        /**
-        * Returns a read-only wrapper for the current list.
-        */
-        asReadOnly(): ReadOnlyCollection<T>
-
-
-        /**
-        * Searches the entire sorted List for an element using the default comparer and returns the zero-based index of the element.
-        * Returns The zero-based index of item in the sorted List, if item is found; otherwise, a negative number
-        * that is the  bitwise complement of the index of the  next element that is larger than item or, if there is no larger element,
-        * the bitwise complement of List.count().
-        * @param item The object to locate. The value can be null for reference types.
-        */
-        binarySearch(item: T): number
-
-
-        /**
-        * Searches the entire sorted List for an element using the specified comparer and returns the zero-based index of the element.
-        * returns The zero-based index of item in the sorted List, if item is found; otherwise, a negative number
-        * that is the  bitwise complement of the index of the  next element that is larger than item or, if there is no larger element,
-        * the bitwise complement of List.count().
-        * @param item The object to locate. The value can be null for reference types.
-        * @param comparer The Comparer implementation to use when comparing elements.
-        */
-        binarySearch(item: T, comparer: Comparer<T>): number
-
-
-        /**
-        * Searches a range of elements in the sorted List for an element using the specified comparer and returns the zero-based index of the element.
-        * returns The zero-based index of item in the sorted List, if item is found; otherwise, a negative number
-        * that is the  bitwise complement of the index of the  next element that is larger than item or, if there is no larger element,
-        * the bitwise complement of List.count().
-        * @param item The object to locate. The value can be null for reference types.
-        * @param index The zero-based starting index of the range to search.
-        * @param count The length of the range to search.
-        * @param comparer The Comparer implementation to use when comparing elements.
-        */
-        binarySearch(item: T, index: number, count: number, comparer: Comparer<T>): number
-
-
-        /**
-        * Removes all items from the List.
-        */
-        clear(): void
-
-
-        /**
-        * Determines whether the List contains elements that match the conditions defined by the specified predicate.
-        * @param match The predicate function that defines the conditions of the elements to search for.
-        */
-        exists(match: (item: T) => boolean): boolean
-
-
-        /**
-        * Searches for an element that matches the conditions defined by the specified predicate, and returns the first occurrence within the entire List.
-        * @param match The predicate function that defines the conditions of the elements to search for.
-        */
-        find(match: (item: T) => boolean): T
-
-
-        /**
-        * Retrieves all the elements that match the conditions defined by the specified predicate.
-        * @param match The predicate function that defines the conditions of the elements to search for.
-        */
-        findAll(match: (item: T) => boolean): List<T>
-
-
-        /**
-        * Searches for an element that matches the conditions defined by the specified predicate,
-        * and returns the zero-based index of the first occurrence within the entire List, if found; otherwise, –1.
-        * @param match The predicate function that defines the conditions of the elements to search for.
-        */
-        findIndex(match: (item: T) => boolean): number
-
-
-        /**
-        * Searches for an element that matches the conditions defined by the specified predicate,
-        * and returns the zero-based index of the first occurrence within the range of elements
-        * in the List that extends from the specified index to the last element, if found; otherwise, –1.
-        * @param startIndex The zero-based starting index of the search.
-        * @param match The predicate function that defines the conditions of the elements to search for.
-        */
-        findIndex(startIndex: number, match: (item: T) => boolean): number
-
-
-        /**
-        * Searches for an element that matches the conditions defined by the specified predicate,
-        * and returns the zero-based index of the first occurrence within the range of elements
-        * in the List that starts at the specified index and contains the specified number of elements, if found; otherwise, –1.
-        * @param startIndex The zero-based starting index of the search.
-        * @param count The number of elements in the section to search.
-        * @param match The predicate function that defines the conditions of the elements to search for.
-        */
-        findIndex(startIndex: number, count: number, match: (item: T) => boolean): number
-
-
-        /**
-        * Searches for an element that matches the conditions defined by the specified predicate,
-        * and returns the last occurrence within the entire List.
-        * @param match The predicate function that defines the conditions of the elements to search for.
-        */
-        findLast(match: (item: T) => boolean): T
-
-
-        /**
-        * Searches for an element that matches the conditions defined by the specified predicate,
-        * and returns the zero-based index of the last occurrence within the entire List, if found; otherwise, –1.
-        * @param match The predicate function that defines the conditions of the elements to search for.
-        */
-        findLastIndex(match: (item: T) => boolean): number
-
-
-        /**
-        * Searches for an element that matches the conditions defined by the specified predicate,
-        * and returns the zero-based index  of the last occurrence within the range of elements
-        * in the List that extends from the first element to the specified index, if found; otherwise, –1.
-        * @param startIndex The zero-based starting index of the search.
-        * @param match The predicate function that defines the conditions of the elements to search for.
-        */
-        findLastIndex(startIndex: number, match: (item: T) => boolean): number
-
-
-        /**
-        * Searches for an element that matches the conditions defined by the specified predicate,
-        * and returns the zero-based index  of the last occurrence within the range of elements
-        * in the List that contains the specified number of elements and ends at the specified index, if found; otherwise, –1.
-        * @param startIndex The zero-based starting index of the search.
-        * @param count The number of elements in the section to search.
-        * @param match The predicate function that defines the conditions of the elements to search for.
-        */
-        findLastIndex(startIndex: number, count: number, match: (item: T) => boolean): number
-
-
-        /**
-        * Performs the specified action on each element of the List.
-        * @param action The action function to perform on each element of the List.
-        */
-        forEach(action: (item: T) => void): void
-
-
-        /**
-        * Gets the element at the specified index.
-        * @param index The zero-based index of the element to get.
-        */
-        get(index: number): T
-
-
-        /**
-        * Creates a shallow copy of a range of elements in the source List.
-        * @param index The zero-based List index at which the range starts.
-        * @param count The number of elements in the range.
-        */
-        getRange(index: number, count: number): List<T>
-
-
-        /**
-        *   Searches for the specified object and returns the zero-based index of the first occurrence within the entire List, if found; otherwise, –1.
-        *   @param item The object to locate in the List.
-        */
-        indexOf(item: T): number
-
-
-        /**
-        *   Searches for the specified object and returns the zero-based index of the first occurrence within
-        *   the range of elements in the List that extends from the specified index to the last element, if found; otherwise, –1.
-        *   @param item The object to locate in the List.
-        *   @param index The zero-based starting index of the search. 0 (zero) is valid in an empty list.
-        */
-        indexOf(item: T, index: number): number
-
-
-        /**
-        * Inserts an element into the List at the specified index.
-        * @param index The zero-based index at which item should be inserted.
-        * @param item The object to insert. The value can be null for reference types.
-        */
-        insert(index: number, item: T): void
-
-
-        /**
-        * Inserts the elements of a collection into the List at the specified index.
-        * @param index The zero-based index at which item should be inserted.
-        * @param collection The collection whose elements should be inserted into the List.
-        */
-        insertRange(index: number, collection: Iterable<T>): void
-
-
-        /**
-        * Gets an Array wrapper around the List.
-        */
-        items(): T[]
-
-
-        /**
-        *   Searches for the specified object and returns the zero-based index of the last occurrence within the entire List, if found; otherwise, –1.
-        *   @param item The object to locate in the List.
-        */
-        lastIndexOf(item: T): number
-
-
-        /**
-        *   Searches for the specified object and returns the zero-based index of the last occurrence
-        *   within the range of elements in the List that extends from the specified index to the last element if found; otherwise, –1.
-        *   @param item The object to locate in the List.
-        *   @param index The zero-based starting index of the search. 0 (zero) is valid in an empty list.
-        */
-        lastIndexOf(item: T, index: number): number
-
-
-        /**
-        * Removes the first occurrence of a specific object from the List.
-        * @param item The object to remove from the List.
-        */
-        remove(item: T): boolean
-
-
-        /**
-        * Removes all the elements that match the conditions defined by the specified predicate.
-        * @param match The predicate function that defines the conditions of the elements to remove.
-        */
-        removeAll(match: (item: T) => boolean): number
-
-
-        /**
-        * Removes the element at the specified index of the List.
-        * @param index The zero-based index of the element to remove.
-        */
-        removeAt(index: number): void
-
-
-        /**
-        * Removes a range of elements from the List.
-        * @param index The zero-based index of the element to remove.
-        * @param count The number of elements to remove.
-        */
-        removeRange(index: number, count: number): void
-
-
-        /**
-        * Reverses the order of the elements in the entire List
-        */
-        reverse(): any
-
-
-        /**
-        * Reverses the order of the elements in the entire List
-        * @param index The zero-based starting index of the range to reverse.
-        * @param count The number of elements in the range to reverse.
-        */
-        reverse(index: number, count: number): void
-
-
-        /**
-        * Sets the element at the specified index.
-        * @param index The zero-based index of the element to set.
-        * @param item The object to be added at the specified index.
-        */
-        set(index: number, value: T): void
-
-
-        /**
-        * Sorts the elements in the entire List using the default comparer.
-        */
-        sort(): void
-
-
-        /**
-        * Sorts the elements in the entire List using the specified Comparison.
-        * @param comparison The comparison function to use when comparing elements.
-        */
-        sort(comparison: (x: T, y: T) => number): void
-
-
-        /**
-        * Sorts the elements in the entire List using the specified comparer.
-        * @param comparer The Comparer implementation to use when comparing elements.
-        */
-        sort(comparer: Comparer<T>): void
-
-
-        /**
-        * Sorts the elements in a range of elements in List using the specified comparer.
-        * @param index The zero-based starting index of the range to sort.
-        * @param count The length of the range to sort.
-        * @param comparer The Comparer implementation to use when comparing elements.
-        */
-        sort(index: number, count: number, comparer: Comparer<T>): void
-
-
-        /**
-        * Copies the elements of the List to a new array.
-        */
-        toArray(): T[]
-
-
-        /**
-        * Determines whether every element in the List matches the conditions defined by the specified predicate.
-        * @param match The Predicate function that defines the conditions to check against the elements.
-        */
-        trueForAll(match: (item: T) => boolean): boolean
-    }
-    interface ListConstructor {
-
-        /**
-        * Initializes a new instance of the List class that is empty.
-        */
-        new <T>(): List<T>
-
-
-        /**
-        * Initializes a new instance of the List class that is empty and has the specified initial capacity.
-        * @param capacity The number of elements that the new list can initially store.
-        */
-        new <T>(capacity: number): List<T>
-
-
-        /**
-        * Initializes a new instance of the List class that contains elements copied from the specified arguments
-        * @param args Arbitrary number of arguments to copy to the new list.
-        */
-        new <T>(...args: T[]): List<T>
-
-
-        /**
-        * Initializes a new instance of the List class that contains elements copied from the specified collection
-        * and has sufficient capacity to accommodate the number of elements copied.
-        * @param collection The collection whose elements are copied to the new list.
-        */
-        new <T>(collection: Iterable<T>): List<T>
-    }
-
-
-
-    /**
-    * Represents a collection of key/value pairs that are sorted by key based on the associated Comparer implementation.
-    */
-    interface SortedList<TKey, TValue> extends Collection<KeyValuePair<TKey, TValue>> {
-
-        /**
-        * Adds an element with the specified key and value into the SortedList.
-        * @param key The key of the element to add.
-        * @param value The value of the element to add. The value can be null for reference types.
-        */
-        add(key: TKey, value: TValue): void
-
-
-        /**
-        * Gets the value associated with the specified key.
-        * @param key The key whose value to get.
-        */
-        get(key: TKey): TValue
-
-
-        /**
-        * Gets or sets the number of elements that the SortedList can contain.
-        * @param value The number of elements that the SortedList can contain.
-        */
-        capacity(value?: number): number
-
-
-        /**
-        * Removes all elements from the SortedList.
-        */
-        clear(): void
-
-
-        /**
-        * Gets the Comparer for the sorted list.
-        */
-        comparer(): Comparer<TKey>
-
-
-        /**
-        * Determines whether the SortedList contains a specific key.
-        * @param key The key to locate in the SortedList.
-        */
-        containsKey(key: TKey): boolean
-
-
-        /**
-        * Determines whether the SortedList contains a specific value.
-        * @param value The value to locate in the SortedList.
-        */
-        containsValue(value: TValue): boolean
-
-
-        /**
-        * Gets a collection containing the keys in the SortedList, in sorted order.
-        */
-        keys(): Collection<TKey>
-
-
-        /**
-        * Gets a collection containing the values in the SortedLis.
-        */
-        values(): Collection<TValue>
-
-
-        /**
-        * Searches for the specified key and returns the zero-based index within the entire SortedList.
-        * @param key The key to locate in the SortedList.
-        */
-        indexOfKey(key: TKey): number
-
-
-        /**
-        * Searches for the specified value and returns the zero-based index of the first occurrence within the entire SortedList.
-        * @param value The value to locate in the SortedList.
-        */
-        indexOfValue(value: TValue): number
-
-
-        /**
-        * Removes the element with the specified key from the SortedList.
-        * Returns true if the element is successfully removed; otherwise, false. This method also returns false if key was not found in the original SortedList.
-        * @param key The key of the element to remove.
-        */
-        remove(key: TKey): boolean
-
-
-        /**
-        * Removes the element at the specified index of the SortedList.
-        * @param index The zero-based index of the element to remove.
-        */
-        removeAt(index: number): void
-
-
-        /**
-        * Sets the value associated with the specified key.
-        * @param key The key whose value to get or set.
-        * @param value The value associated with the specified key.
-        */
-        set(key: TKey, value: TValue): void
-
-
-        /**
-        * Sets the capacity to the actual number of elements in the SortedList, if that number is less than 90 percent of current capacity.
-        */
-        trimExcess(): void
-
-
-        /**
-        * Gets the value associated with the specified key.
-        * @param key The key whose value to get.
-        * @param callback When this method returns, callback method is called with the value
-        * associated with the specified key, if the key is found; otherwise, null for the type of the value parameter.
-        */
-        tryGetValue(key: TKey, callback: (value: TValue) => void): boolean
-    }
-    interface SortedListConstructor {
-
-        /**
-        * Initializes a new instance of the SortedList class that is empty,
-        * has the default initial capacity, and uses the default Comparer.
-        */
-        new <TKey, TValue>(): SortedList<TKey, TValue>
-
-
-        /**
-        * Initializes a new instance of the SortedList class that contains elements  copied from the specified Dictionary,
-        * has sufficient capacity to accommodate the number of elements copied,  and uses the default Comparer.
-        * @param dictionary The Dictionary whose elements are copied to the new SortedList.
-        */
-        new <TKey, TValue>(dictionary: Dictionary<TKey, TValue>): SortedList<TKey, TValue>
-
-
-        /**
-        * Initializes a new instance of the SortedList class that is empty,
-        * has the default initial capacity, and uses the specified Comparer.
-        * @param comparer The Comparer implementation to use when comparing keys.-or-null to use the default Comparer for the type of the key.
-        */
-        new <TKey, TValue>(comparer: Comparer<TKey>): SortedList<TKey, TValue>
-
-
-        /**
-        * Initializes a new instance of the SortedList class that is empty,
-        * has the specified initial capacity, and uses the default Comparer.
-        * @param capacity The initial number of elements that the SortedList can contain.
-        */
-        new <TKey, TValue>(capacity: number): SortedList<TKey, TValue>
-
-
-        /**
-        * Initializes a new instance of the SortedList class that contains elements copied from the specified Dictionary,
-        * has sufficient capacity to accommodate the number of elements copied, and uses the specified Comparer.
-        * @param dictionary The Dictionary whose elements are copied to the new SortedList.
-        * @param comparer The Comparer implementation to use when comparing keys.-or-null to use the default Comparer for the type of the key.
-        */
-        new <TKey, TValue>(dictionary: Dictionary<TKey, TValue>, comparer: Comparer<TKey>): SortedList<TKey, TValue>
-
-
-        /**
-        * Initializes a new instance of the SortedList class that is empty,
-        * has the specified initial capacity, and uses the specified Comparer.
-        * @param capacity The initial number of elements that the SortedList can contain.
-        * @param comparer The Comparer implementation to use when comparing keys.-or-null to use the default Comparer for the type of the key.
-        */
-        new <TKey, TValue>(capacity: number, comparer: Comparer<TKey>): SortedList<TKey, TValue>
-    }
-
-
-
-    /**
-    * Defines a key/value pair that can be set or retrieved.
-    */
-    interface KeyValuePair<TKey, TValue> {
-
-        /**
-        * Gets the key in the key/value pair.
-        */
-        key: TKey;
-
-
-        /**
-        * Gets the value in the key/value pair.
-        */
-        value: TValue;
-    }
-    interface KeyValuePairConstructor {
-
-        /**
-        * Initializes a new instance of the KeyValuePair with the specified key and value.
-        * @param key The object defined in each key/value pair.
-        * @param value The definition associated with key.
-        */
-        new <TKey, TValue>(key: TKey, value: TValue): KeyValuePair<TKey, TValue>
-    }
-
-
-
-    /**
-    * Represents a collection of keys and values.
-    */
-    interface Dictionary<TKey, TValue> extends Collection<KeyValuePair<TKey, TValue>> {
-
-        /**
-        * Adds an element with the provided key and value to the Dictionary.
-        * @param key The object to use as the key of the element to add.
-        * @param value The object to use as the value of the element to add.
-        */
-        add(key: TKey, value: TValue): void
-
-
-        /**
-        * Removes all keys and values from the Dictionary.
-        */
-        clear(): void
-
-
-        /**
-        * Determines whether the Dictionary contains the specified key.
-        * @param key The key to locate in the Dictionary.
-        */
-        containsKey(key: TKey): boolean
-
-
-        /**
-        * Determines whether the Dictionary contains a specific value.
-        * @param value The value to locate in the Dictionary.
-        */
-        containsValue(value: TValue): boolean
-
-
-        /**
-        * Copies the Dictionary keys to an existing one-dimensional Array, starting at the specified array index.
-        * @param array The one-dimensional Array that is the destination of the elements copied from Dictionary keys.
-        * @param arrayIndex The zero-based index in array at which copying begins.
-        */
-        copyTo(array: TKey[], arrayIndex: number): void
-        copyTo(array: KeyValuePair<TKey, TValue>[], arrayIndex: number): void
-
-
-        /**
-        * Gets a Collection containing the keys of the Dictionary.
-        */
-        keys(): Collection<TKey>
-
-
-        /**
-        * Gets a Collection containing the values in the Dictionary.
-        */
-        values(): Collection<TValue>
-
-
-        /**
-        * Gets element with the specified key.
-        * @param key The key of the element to get.
-        */
-        get(key: TKey): TValue
-
-
-        /**
-        * Sets the element with the specified key.
-        * @param key The key of the element to set.
-        * @param value The object to use as the value of the element to set.
-        */
-        set(key: TKey, value: TValue): void
-
-
-        /**
-        * Gets the value associated with the specified key.
-        * @param key The key whose value to get.
-        * @param callback When this method returns, callback method is called with the value
-        * associated with the specified key, if the key is found; otherwise, null for the type of the value parameter.
-        */
-        tryGetValue(key: TKey, callback: (value: TValue) => void): boolean
-
-
-        /**
-        * Removes the element with the specified key from the Dictionary.
-        * @param key The key of the element to remove.
-        */
-        remove(key: TKey): boolean
-    }
-    interface DictionaryConstructor {
-
-        /**
-        * Initializes a new instance of the Dictionary class that is empty,
-        */
-        new <TKey, TValue>(): Dictionary<TKey, TValue>
-
-
-        /**
-        * Initializes a new instance of the Dictionary class that contains elements copied
-        * from the specified Dictionary and uses the default equality comparer for the key type.
-        * @param dictionary The Dictionary whose elements are copied to the new Dictionary.
-        */
-        new <TKey, TValue>(dictionary: Dictionary<TKey, TValue>): Dictionary<TKey, TValue>
-
-
-        /**
-        * Initializes a new instance of the Dictionary class that is empty, and uses the specified EqualityComparer.
-        * @param comparer The EqualityComparer implementation to use when comparing keys.
-        */
-        new <TKey, TValue>(comparer: EqualityComparer<TKey>): Dictionary<TKey, TValue>
-
-
-        /**
-        * Initializes a new instance of the Dictionary class that is empty, has the specified initial capacity, and uses the default equality comparer for the key type.
-        * @param capacity The initial number of elements that the Dictionary can contain.
-        */
-        new <TKey, TValue>(capacity: number): Dictionary<TKey, TValue>
-
-
-        /**
-        * Initializes a new instance of the Dictionary that is empty, has the specified initial capacity, and uses the specified EqualityComparer.
-        * @param capacity The initial number of elements that the Dictionary can contain.
-        * @param comparer The EqualityComparer implementation to use when comparing keys.
-        */
-        new <TKey, TValue>(capacity: number, comparer: EqualityComparer<TKey>): Dictionary<TKey, TValue>
-
-
-        /**
-        * Initializes a new instance of the Dictionary class that contains elements copied
-        * from the specified Dictionary and uses the specified EqualityComparer.
-        * @param dictionary The Dictionary whose elements are copied to the new Dictionary.
-        * @param comparer The EqualityComparer implementation to use when comparing keys.
-        */
-        new <TKey, TValue>(dictionary: Dictionary<TKey, TValue>, comparer: EqualityComparer<TKey>): Dictionary<TKey, TValue>
-    }
-
-
-
-    /**
-    * Represents a set of values.
-    */
-    interface HashSet<T> extends Collection<T> {
-
-        /**
-        * Adds an element to the current set.
-        * @param item The element to add to the set.
-        */
-        add(item: T): boolean
-
-
-        /**
-        * Removes all elements from a HashSet object.
-        */
-        clear(): void
-
-
-        /**
-        * Copies the elements of a HashSet object to an array.
-        * @param array The one-dimensional array that is the destination of the elements copied from the HashSet object.
-        */
-        copyTo(array: T[]): void
-
-
-        /**
-        * Copies the elements of a HashSet object to an array. starting at the specified array index.
-        * @param array The one-dimensional array that is the destination of the elements copied from the HashSet object.
-        * @param arrayIndex The zero-based index in array at which copying begins.
-        */
-        copyTo(array: T[], arrayIndex: number): void
-
-
-        /**
-        * Copies the elements of a HashSet object to an array.
-        * @param array The one-dimensional array that is the destination of the elements copied from the HashSet object.
-        * @param arrayIndex The zero-based index in array at which copying begins.
-        * @param count The number of elements to copy to array.
-        */
-        copyTo(array: T[], arrayIndex: number, count: number): void
-
-
-        /**
-        * Gets the EqualityComparer object that is used to determine equality for the values in the set.
-        */
-        comparer(): EqualityComparer<T>
-
-
-        /**
-        * Removes the specified element from a HashSet object.
-        * @param item The element to remove.
-        */
-        remove(item: T): boolean
-
-
-        /**
-        * Removes all elements that match the conditions defined by the specified predicate from a HashSet collection.
-        * @param match The predicate function that defines the conditions of the elements to remove.
-        */
-        removeWhere(match: (item: T) => boolean): number
-
-
-        /**
-        * Removes all elements in the specified collection from the current set.
-        * @param other The collection of items to remove from the set.
-        */
-        exceptWith(other: Iterable<T>): void
-
-
-        /**
-        * Modifies the current set so that it contains only elements that are also in a specified collection.
-        * @param other The collection to compare to the current set.
-        */
-        intersectWith(other: Iterable<T>): void
-
-
-        /**
-        * Determines whether the current set is a proper (strict) subset of a specified collection.
-        * @param other The collection to compare to the current set.
-        */
-        isProperSubsetOf(other: Iterable<T>): boolean
-
-
-        /**
-        * Determines whether the current set is a proper (strict) superset of a specified collection.
-        * @param other The collection to compare to the current set.
-        */
-        isProperSupersetOf(other: Iterable<T>): boolean
-
-
-        /**
-        * Determines whether a set is a subset of a specified collection.
-        * @param other The collection to compare to the current set.
-        */
-        isSubsetOf(other: Iterable<T>): boolean
-
-
-        /**
-        * Determines whether the current set is a superset of a specified collection.
-        * @param other The collection to compare to the current set.
-        */
-        isSupersetOf(other: Iterable<T>): boolean
-
-
-        /**
-        * Determines whether the current set overlaps with the specified collection.
-        * @param other The collection to compare to the current set.
-        */
-        overlaps(other: Iterable<T>): boolean
-
-
-        /**
-        * Determines whether the current set and the specified collection contain the same elements.
-        * @param other The collection to compare to the current set.
-        */
-        setEquals(other: Iterable<T>): boolean
-
-
-        /**
-        * Modifies the current set so that it contains only elements that are present
-        * either in the current set or in the specified collection, but not both.
-        * @param other The collection to compare to the current set.
-        */
-        symmetricExceptWith(other: Iterable<T>): void
-
-
-        /**
-        * Modifies the current set so that it contains all elements that are present
-        * in either the current set or the specified collection.
-        * @param other The collection to compare to the current set.
-        */
-        unionWith(other: Iterable<T>): void
-
-    }
-    interface HashSetConstructor {
-
-        /**
-        * Initializes a new instance of the HashSet class that is empty and uses the default equality comparer for the set type.
-        */
-        new <T>(): HashSet<T>
-
-
-        /**
-        * Initializes a new instance of the HashSet class that uses the default equality comparer for the set type,
-        * and contains elements copied from the specified collection.
-        * @param collection The collection whose elements are copied to the new set.
-        */
-        new <T>(collection: Iterable<T>): HashSet<T>
-
-
-        /**
-        * Initializes a new instance of the HashSet class that is empty and uses the specified equality comparer for the set type.
-        * @param comparer The EqualityComparer implementation to use when comparing values in the set.
-        */
-        new <T>(comparer: EqualityComparer<T>): HashSet<T>
-
-
-        /**
-        * Initializes a new instance of the HashSet class that uses the specified equality comparer for the set type,
-        * contains elements copied from the specified collection, and uses the specified equality comparer for the set type.
-        * @param collection The collection whose elements are copied to the new set.
-        * @param comparer The EqualityComparer implementation to use when comparing values in the set.
-        */
-        new <T>(collection: Iterable<T>, comparer: EqualityComparer<T>): HashSet<T>
-    }
-
-
-
-    /**
-    * Represents a node in a LinkedList.
-    */
-    interface LinkedListNode<T> {
-
-        /**
-        * Gets the value contained in the node.
-        */
-        value(): T
-
-
-        /**
-        * Gets the LinkedList that the LinkedListNode belongs to.
-        */
-        list(): LinkedList<T>
-
-
-        /**
-        * Gets the next node in the LinkedList.
-        */
-        next(): LinkedListNode<T>
-
-
-        /**
-        * Gets the previous node in the LinkedList.
-        */
-        previous(): LinkedListNode<T>
-    }
-    interface LinkedListNodeConstructor {
-
-        /**
-        * Initializes a new instance of the LinkedListNode class, containing the specified value.
-        * @param value The value to contain in the LinkedListNode
-        */
-        new <T>(value: T): LinkedListNode<T>
-    }
-
-
-
-    /**
-    * Represents a doubly linked list.
-    */
-    interface LinkedList<T> extends Collection<T> {
-
-        /**
-        * Adds an item to the LinkedList.
-        * @param item The object to add to the LinkedList.
-        */
-        add(item: T): void
-
-
-        /**
-        * Removes all nodes from the LinkedList.
-        */
-        clear(): void
-
-
-        /**
-        * Determines whether a value is in the LinkedList.
-        * @param value The value to locate in the LinkedList. The value can be null for reference types.
-        */
-        contains(item: T): boolean
-
-
-        /**
-        * Gets the first node of the LinkedList.
-        */
-        getFirst(): LinkedListNode<T>
-
-
-        /**
-        * Gets the last node of the LinkedList.
-        */
-        getLast(): LinkedListNode<T>
-
-
-        /**
-        * Adds the specified new node after the specified existing node in the LinkedList and returns the new LinkedListNode.
-        * @param node The LinkedListNode after which to insert newNode.
-        * @param newNode The new LinkedListNode to add to the LinkedList.
-        */
-        addAfter(node: LinkedListNode<T>, newNode: LinkedListNode<T>): LinkedListNode<T>
-
-
-        /**
-        * Adds the specified new node after the specified existing node in the LinkedList.
-        * returns The new LinkedListNode containing value.
-        * @param node The LinkedListNode after which to insert newNode.
-        * @param value The value to add to the LinkedList.
-        */
-        addAfter(node: LinkedListNode<T>, value: T): LinkedListNode<T>
-
-
-        /**
-        * Adds the specified new node before the specified existing node in the LinkedList.
-        * returns The new LinkedListNode.
-        * @param node The LinkedListNode before which to insert newNode.
-        * @param newNode The new LinkedListNode to add to the LinkedList.
-        */
-        addBefore(node: LinkedListNode<T>, newNode: LinkedListNode<T>): LinkedListNode<T>
-
-
-        /**
-        * Adds the specified new node before the specified existing node in the LinkedList.
-        * returns The new LinkedListNode containing value.
-        * @param node The LinkedListNode before which to insert newNode.
-        * @param value The value to add to the LinkedList.
-        */
-        addBefore(node: LinkedListNode<T>, value: T): LinkedListNode<T>
-
-
-        /**
-        * Adds the specified new node at the start of the LinkedList.
-        * returns The new LinkedListNode.
-        * @param node The new LinkedListNode to add at the start of the LinkedList.
-        */
-        addFirst(node: LinkedListNode<T>): LinkedListNode<T>
-
-
-        /**
-        * Adds the specified new node at the start of the LinkedList.
-        * returns The new LinkedListNode containing value.
-        * @param value The value to add at the start of the LinkedList.
-        */
-        addFirst(value: T): LinkedListNode<T>
-
-
-        /**
-        * Adds the specified new node at the end of the LinkedList.
-        * returns The new LinkedListNode.
-        * @param node The new LinkedListNode to add at the end of the LinkedList.
-        */
-        addLast(node: LinkedListNode<T>): LinkedListNode<T>
-
-
-        /**
-        * Adds the specified new node at the end of the LinkedList.
-        * returns The new LinkedListNode containing value.
-        * @param value The value to add at the end of the LinkedList.
-        */
-        addLast(value: T): LinkedListNode<T>
-
-
-        /**
-        * Finds the first node that contains the specified value.
-        * @param value The value to locate in the LinkedList.
-        */
-        find(value: T): LinkedListNode<T>
-
-
-        /**
-        * Finds the last node that contains the specified value.
-        * @param value The value to locate in the LinkedList.
-        */
-        findLast(value: T): LinkedListNode<T>
-
-        /**
-        * Removes the node at the start of the LinkedList.
-        * returns true if the node is successfully removed; otherwise, false.
-        * This method also returns false if value was not found in the original LinkedList.
-        * @param node
-        */
-        remove(node: LinkedListNode<T>): boolean
-
-
-        /**
-        * Removes the first occurrence of the specified value from the LinkedList.
-        * returns true if the element containing value is successfully removed; otherwise, false.
-        * This method also returns false if value was not found in the original LinkedList.
-        * @param value The value to remove from the LinkedList.
-        */
-        remove(value: T): boolean
-
-
-        /**
-        * Removes the node at the start of the LinkedList.
-        */
-        removeFirst(): void
-
-
-        /**
-        * Removes the node at the end of the LinkedList.
-        */
-        removeLast(): void
-    }
-    interface LinkedListConstructor {
-
-        /**
-        * Initializes a new instance of the LinkedList class that is empty.
-        */
-        new <T>(): LinkedList<T>
-
-
-        /**
-        * Initializes a new instance of the LinkedList class that contains elements copied from the specified Enumerable.
-        * @param collection The collection to copy elements from.
-        */
-        new <T>(collection: Iterable<T>): LinkedList<T>
-    }
-
-
-
-    /**
-    * Represents a first-in, first-out collection of objects.
-    */
-    interface Queue<T> extends Collection<T> {
-
-        /**
-        * Removes all objects from the Queue.
-        */
-        clear(): void
-
-
-        /**
-        * Determines whether an element is in the Queue.
-        * @param item The object to locate in the Queue.
-        */
-        contains(item: T): boolean
-
-
-        /**
-        * Removes and returns the object at the beginning of the Queue.
-        */
-        dequeue(): T
-
-        /**
-        * Adds an object to the end of the Queue.
-        * @param item The object to add to the Queue.
-        */
-        enqueue(item: T): void
-
-
-        /**
-        * Returns the object at the beginning of the Queue without removing it.
-        */
-        peek(): T
-
-
-        /**
-        * Copies the Queue to a new array.
-        */
-        toArray(): T[]
-    }
-    interface QueueConstructor {
-
-        /**
-        * Initializes a new instance of the Queue class that is empty.
-        */
-        new <T>(): Queue<T>
-
-
-        /**
-        * Initializes a new instance of the Queue class that contains elements copied from the specified collection.
-        * @param collection The collection to copy elements from.
-        */
-        new <T>(collection: Iterable<T>): Queue<T>
-    }
-
-
-
-    /**
-    * Represents a variable size last-in-first-out (LIFO) collection of instances of the same arbitrary type.
-    */
-    interface Stack<T> extends Collection<T> {
-
-        /**
-        * Removes all objects from the Stack.
-        */
-        clear(): void
-
-
-        /**
-        * Determines whether an element is in the Stack.
-        * @param item The object to locate in the Stack.
-        */
-        contains(item: T): boolean
-
-
-        /**
-        * Returns the object at the top of the Stack without removing it.
-        */
-        peek(): T
-
-
-        /**
-        *   Removes and returns the object at the top of the Stack.
-        */
-        pop(): T
-
-
-        /**
-        * Inserts an object at the top of the Stack.
-        * @param item The object to push onto the Stack.
-        */
-        push(item: T): void
-
-
-        /**
-        *   Copies the Stack to a new array.
-        */
-        toArray(): T[]
-    }
-    interface StackConstructor {
-
-        /**
-        * Initializes a new instance of the Stack class that is empty.
-        */
-        new <T>(): Stack<T>
-
-
-        /**
-        * Initializes a new instance of the Stack class that contains elements copied from the specified collection.
-        * @param collection The collection to copy elements from.
-        */
-        new <T>(collection: Iterable<T>): Stack<T>
-    }
-
-
-
-    /**
-    * Defines a data structures that map keys to Enumerable sequences of values.
-    */
-    interface Lookup<TKey, TElement> extends Collection<Grouping<TKey, TElement>> {
-
-        /**
-        * Determines whether a specified key exists in the Lookup.
-        * @param key The key to search for in the Lookup.
-        */
-        contains(key: TKey): boolean
-        contains(item: Grouping<TKey, TElement>): boolean
-
-
-
-        /**
-        * Gets the value associated with the specified key.
-        * @param key The key of the element to add.
-        */
-        get(key: TKey): Enumerable<TElement>
-    }
-
-
-
-    /**
-    * Represents a collection of objects that have a common key.
-    */
-    interface Grouping<TKey, TElement> extends Collection<TElement> {
-
-        /**
-        * Gets the key of the Grouping.
-        */
-        key: TKey
-    }
-
-
-
-    /**
-    * Exposes the enumerator, which supports a simple iteration over a collection of a specified type.
-    */
-    interface OrderedEnumerable<TElement> extends Enumerable<TElement> {
-
-        /**
-        * Performs a subsequent ordering on the elements of an OrderedEnumerable<TElement> according to a key.
-        * @param keySelector The selector used to extract the key for each element.
-        * @param comparer The Comparer used to compare keys for placement in the returned sequence.
-        * @param descending true to sort the elements in descending order; false to sort the elements in ascending order.
-        */
-        createOrderedEnumerable<TKey>(keySelector: (item: TElement) => TKey, comparer: Comparer<TKey>, descending: boolean): OrderedEnumerable<TElement>
-
-
-        /**
-        * Performs a subsequent ordering of the elements in a sequence in descending order, according to a key.
-        * Returns an OrderedEnumerable whose elements are sorted in descending order according to a key.
-        * @param keySelector A function to extract a key from each element.
-        */
-        thenBy<TKey>(keySelector: (item: TElement) => TKey): OrderedEnumerable<TElement>
-
-
-        /**
-        * Performs a subsequent ordering of the elements in a sequence in ascending order by using a specified comparer.
-        * Returns an OrderedEnumerable whose elements are sorted according to a key.
-        * @param keySelector A function to extract a key from each element.
-        * @param comparer A Comparer to compare keys.
-        */
-        thenBy<TKey>(keySelector: (item: TElement) => TKey, comparer: Comparer<TKey>): OrderedEnumerable<TElement>
-
-
-        /**
-        * Performs a subsequent ordering of the elements in a sequence in descending order, according to a key.
-        * Returns an OrderedEnumerable whose elements are sorted in descending order according to a key.
-        * @param keySelector A function to extract a key from each element.
-        */
-        thenByDescending<TKey>(keySelector: (item: TElement) => TKey): OrderedEnumerable<TElement>
-
-
-        /**
-        * Performs a subsequent ordering of the elements in a sequence in descending order, according to a key.
-        * Returns an OrderedEnumerable whose elements are sorted in descending order according to a key.
-        * @param keySelector A function to extract a key from each element.
-        * @param comparer A Comparer to compare keys.
-        */
-        thenByDescending<TKey>(keySelector: (item: TElement) => TKey, comparer: Comparer<TKey>): OrderedEnumerable<TElement>
-    }
-
-
-
-    /**
-    * Defines Enumerable extention methods applied on Enumerable
-    */
-    interface Enumerable<T> {
-
-
-        /**
-        * Applies an accumulator function over a sequence.
-        * Returns the final accumulator value.
-        * @param func An accumulator function to be invoked on each element.
-        */
-        aggregate(func: (accumulate: T, item: T) => T): T
-
-
-        /**
-        * Applies an accumulator function over a sequence. The specified seed value is used as the initial accumulator value.
-        * Returns the final accumulator value.
-        * @param seed The initial accumulator value.
-        * @param func An accumulator function to be invoked on each element.
-        */
-        aggregate<TAccumulate>(seed: TAccumulate, func: (accumulate: TAccumulate, item: T) => TAccumulate): TAccumulate
-
-
-        /**
-        * Applies an accumulator function over a sequence. The specified seed value is used as the initial accumulator value,
-        * and the specified function is used to select the result value.
-        * Returns the final accumulator value.
-        * @param seed The initial accumulator value.
-        * @param func An accumulator function to be invoked on each element.
-        * @param resultSelector A function to transform the final accumulator value into the result value.
-        */
-        aggregate<TAccumulate, TResult>(seed: TAccumulate, func: (accumulate: TAccumulate, item: T) => TAccumulate, resultSelector: (accumulate: TAccumulate) => TResult): TResult;
-
-
-        /**
-        * Determines whether all elements of a sequence satisfy a condition.
-        * Returns true if every element of the source sequence passes the test in the specified predicate, or if the sequence is empty; otherwise, false.
-        * @param predicate A function to test each element for a condition.
-        */
-        all(predicate: (item: T) => boolean): boolean
-
-
-        /**
-        * Determines whether a sequence contains any elements.
-        * Returns true if the source sequence contains any elements; otherwise, false.
-        */
-        any(): boolean
-
-
-        /**
-        * Determines whether any element of a sequence satisfies a condition.
-        * Returns true if any elements in the source sequence pass the test in the specified predicate; otherwise, false.
-        * @param predicate A function to test each element for a condition.
-        */
-        any(predicate: (item: T) => boolean): boolean
-
-
-        /**
-        * Returns the input typed as Enumerable.
-        */
-        asEnumerable(): Enumerable<T>
-
-
-        /**
-        * Computes the average of a sequence of numeric values.
-        */
-        average(): number
-
-
-        /**
-        * Computes the average of a sequence of numeric values that are obtained by invoking a transform function on each element of the input sequence.
-        * @param selector A transform function to apply to each element.
-        */
-        average(selector: (item: number) => number): number
-
-
-        /**
-        * Concatenates two sequences.
-        * @param second The sequence to concatenate to the first sequence.
-        */
-        concat(second: Iterable<T>): Enumerable<T>
-
-
-        /**
-        * Determines whether a sequence contains a specified element by using the default equality comparer.
-        * @param value The value to locate in the sequence.
-        */
-        contains(value: T): boolean
-
-
-        /**
-        * Returns the last element of a sequence that satisfies a specified condition.
-        * @param value The value to locate in the sequence.
-        * @param comparer An equality comparer to compare values.
-        */
-        contains(value: T, comparer: EqualityComparer<T>): boolean
-
-
-        /**
-        * Returns the number of elements in a sequence.
-        */
-        count(): number
-
-
-        /**
-        * Returns a number that represents how many elements in the specified sequence satisfy a condition.
-        * @param predicate A function to test each element for a condition.
-        */
-        count(predicate: (item: T) => boolean): number
-
-
-        /**
-        * Returns the elements of the specified sequence or null if the sequence is empty.
-        */
-        defaultIfEmpty(): Enumerable<T>
-
-
-        /**
-        * Returns the elements of the specified sequence or the specified value in  a singleton collection if the sequence is empty.
-        * @param defaultValue The value to return if the sequence is empty.
-        */
-        defaultIfEmpty(defaultValue: T): Enumerable<T>
-
-
-        /**
-        * Returns distinct elements from a sequence by using the default equality comparer to compare values.
-        */
-        distinct(): Enumerable<T>
-
-
-        /**
-        * Produces the set difference of two sequences by using the EqualityComparer to compare values.
-        * @param comparer An EqualityComparer to compare values.
-        */
-        distinct(comparer: EqualityComparer<T>): Enumerable<T>
-
-
-        /**
-        * Produces the set difference of two sequences by using the default equality comparer to compare values.
-        * @param second An Iterable whose elements that also occur in the first sequence will cause those elements to be removed from the returned sequence.
-        */
-        except(second: Iterable<T>): Enumerable<T>
-
-
-        /**
-        * Produces the set difference of two sequences by using the specified EqualityComparer to compare values.
-        * @param second An Iterable whose elements that also occur in the first sequence will cause those elements to be removed from the returned sequence.
-        * @param comparer An EqualityComparer to compare values.
-        */
-        except(second: Iterable<T>, comparer: EqualityComparer<T>): Enumerable<T>
-
-
-        /**
-        * Returns the element at a specified index in a sequence. Throws an error if the index is less than 0 or greater than or equal to the number of elements in source.
-        * @param index The zero-based index of the element to retrieve.
-        */
-        elementAt(index: number): T
-
-
-        /**
-        * Returns the first element of a sequence. this method throws an exception if there is no element in the sequence.
-        */
-        first(): T
-
-
-        /**
-        * Returns the first element in a sequence that satisfies a specified condition. this method throws an exception if there is no element in the sequence.
-        * @param predicate A function to test each source element for a condition; the second parameter of the function represents the index of the source element.
-        */
-        first(predicate: (item: T) => boolean): T
-
-
-        /**
-        * Returns the first element of a sequence, or null if the sequence contains no elements.
-        */
-        firstOrDefault(): T
-
-
-        /**
-        * Returns the first element of the sequence that satisfies a condition or null if no such element is found.
-        * @param predicate A function to test each source element for a condition; the second parameter of the function represents the index of the source element.
-        */
-        firstOrDefault(predicate: (item: T) => boolean): T
-
-
-        /**
-        * Returns the first element of the sequence that satisfies a condition or a default value if no such element is found.
-        * @param predicate A function to test each source element for a condition; the second parameter of the function represents the index of the source element.
-        * @param defaultValue The value to return if no element exists with specified condition.
-        */
-        firstOrDefault(predicate: (item: T) => boolean, defaultValue: T): T
-
-
-        /**
-        * Performs the specified action on each element of an Enumerable.
-        * @param action The action function to perform on each element of an Enumerable.
-        */
-        forEach(action: (item: T) => void): void
-
-
-        /**
-        * Performs the specified action on each element of an Enumerable.
-        * @param action The action function to perform on each element of an Enumerable; the second parameter of the function represents the index of the source element.
-        */
-        forEach(action: (item: T, index: number) => void): void
-
-
-        /**
-        * Groups the elements of a sequence according to a specified key selector function.
-        * @param keySelector A function to extract the key for each element.
-        */
-        groupBy<TKey>(keySelector: (item: T) => TKey): Enumerable<Grouping<TKey, T>>;
-
-
-        /**
-        * Groups the elements of a sequence according to a specified key selector function.
-        * @param keySelector A function to extract the key for each element.
-        * @param comparer An equality comparer to compare values.
-        */
-        groupBy<TKey>(keySelector: (item: T) => TKey, comparer: EqualityComparer<TKey>): Enumerable<Grouping<TKey, T>>;
-
-
-        /**
-        * Groups the elements of a sequence according to a specified key selector function and projects the elements for each group by using a specified function.
-        * @param keySelector A function to extract the key for each element.
-        * @param elementSelector A function to map each source element to an element in the Grouping.
-        */
-        groupBy<TKey, TElement>(keySelector: (item: T) => TKey, elementSelector: (item: T) => TElement): Enumerable<Grouping<TKey, TElement>>;
-
-
-        /**
-        * Groups the elements of a sequence according to a key selector function.
-        * The keys are compared by using a comparer and each group's elements are projected by using a specified function.
-        * @param keySelector A function to extract the key for each element.
-        * @param elementSelector A function to map each source element to an element in the Grouping.
-        * @param comparer An equality comparer to compare values.
-        */
-        groupBy<TKey, TElement>(keySelector: (item: T) => TKey, elementSelector: (item: T) => TElement, comparer: EqualityComparer<TKey>): Enumerable<Grouping<TKey, TElement>>;
-
-
-        /**
-        * Groups the elements of a sequence according to a specified key selector function and projects the elements for each group by using a specified function.
-        * @param keySelector A function to extract the key for each element.
-        * @param elementSelector A function to map each source element to an element in the Grouping.
-        * @param resultSelector A function to extract the key for each element.
-        */
-        groupBy<TKey, TElement, TResult>(keySelector: (item: T) => TKey, elementSelector: (item: T) => TElement, resultSelector: (key: TKey, elements: Iterable<TElement>) => TResult): Enumerable<TResult>;
-
-
-        /**
-        * Groups the elements of a sequence according to a key selector function.
-        * The keys are compared by using a comparer and each group's elements are projected by using a specified function.
-        * @param keySelector A function to extract the key for each element.
-        * @param elementSelector A function to map each source element to an element in the Grouping.
-        * @param resultSelector A function to extract the key for each element.
-        * @param comparer An equality comparer to compare values.
-        */
-        groupBy<TKey, TElement, TResult>(keySelector: (item: T) => TKey, elementSelector: (item: T) => TElement, resultSelector: (key: TKey, elements: Iterable<TElement>) => TResult, comparer: EqualityComparer<TKey>): Enumerable<TResult>;
-
-
-        /**
-        * Correlates the elements of two sequences based on equality of keys and groups the results. The default equality comparer is used to compare keys.
-        * @param inner The sequence to join to the current sequence.
-        * @param outerKeySelector A function to extract the join key from each element of the first sequence.
-        * @param innerKeySelector A function to extract the join key from each element of the second sequence.
-        * @param resultSelector A function to create a result element from an element from the first sequence and a collection of matching elements from the second sequence.
-        */
-        groupJoin<TInner, TKey, TResult>(inner: Iterable<TInner>, outerKeySelector: (item: T) => TKey, innerKeySelector: (item: TInner) => TKey, resultSelector: (outer: T, inner: Enumerable<TInner>) => TResult): Enumerable<TResult>;
-
-
-        /**
-        * Correlates the elements of two sequences based on key equality and groups the results. A specified EqualityComparer is used to compare keys.
-        * @param inner The sequence to join to the current sequence.
-        * @param outerKeySelector A function to extract the join key from each element of the first sequence.
-        * @param innerKeySelector A function to extract the join key from each element of the second sequence.
-        * @param resultSelector A function to create a result element from an element from the first sequence and a collection of matching elements from the second sequence.
-        * @param comparer An equality comparer to compare values.
-        */
-        groupJoin<TInner, TKey, TResult>(inner: Iterable<TInner>, outerKeySelector: (item: T) => TKey, innerKeySelector: (item: TInner) => TKey, resultSelector: (outer: T, inner: Enumerable<TInner>) => TResult, comparer: EqualityComparer<TKey>): Enumerable<TResult>;
-
-
-        /**
-        * Produces the set intersection of two sequences by using the default equality comparer to compare values.
-        * @param second An Iterable whose distinct elements that also appear in the first sequence will be returned.
-        */
-        intersect(second: Iterable<T>): Enumerable<T>;
-
-
-        /**
-        * Produces the set intersection of two sequences by using the default equality comparer to compare values.
-        * @param second An Iterable whose distinct elements that also appear in the first sequence will be returned.
-        * @param comparer An EqualityComparer to compare values.
-        */
-        intersect(second: Iterable<T>, comparer: EqualityComparer<T>): Enumerable<T>;
-
-
-        /**
-        * Correlates the elements of two sequences based on matching keys. The default equality comparer is used to compare keys.
-        * @param inner The sequence to join to the current sequence.
-        * @param outerKeySelector A function to extract the join key from each element of the first sequence.
-        * @param innerKeySelector A function to extract the join key from each element of the second sequence.
-        * @param resultSelector A function to create a result element from an element from the first sequence and a collection of matching elements from the second sequence.
-        */
-        join<TInner, TKey, TResult>(inner: Iterable<TInner>, outerKeySelector: (item: T) => TKey, innerKeySelector: (item: TInner) => TKey, resultSelector: (outer: T, inner: TInner) => TResult): Enumerable<TResult>;
-
-
-        /**
-        * Correlates the elements of two sequences based on matching keys. A specified EqualityComparer is used to compare keys.
-        * @param inner The sequence to join to the current sequence.
-        * @param outerKeySelector A function to extract the join key from each element of the first sequence.
-        * @param innerKeySelector A function to extract the join key from each element of the second sequence.
-        * @param resultSelector A function to create a result element from an element from the first sequence and a collection of matching elements from the second sequence.
-        * @param comparer An equality comparer to compare values.
-        */
-        join<TInner, TKey, TResult>(inner: Iterable<TInner>, outerKeySelector: (item: T) => TKey, innerKeySelector: (item: TInner) => TKey, resultSelector: (outer: T, inner: TInner) => TResult, comparer: EqualityComparer<TKey>): Enumerable<TResult>;
-
-
-        /**
-        * Returns the last element of a sequence.
-        */
-        last(): T
-
-
-        /**
-        * Returns the last element of a sequence that satisfies a specified condition.
-        * @param predicate A function to test each source element for a condition.
-        */
-        last(predicate: (item: T) => boolean): T
-
-
-        /**
-        * Returns the first element of a sequence, or null if the sequence contains no elements.
-        */
-        lastOrDefault(): T
-
-
-        /**
-        * Returns the last element of a sequence, or null if the sequence contains no elements.
-        * @param predicate A function to test each source element for a condition.
-        */
-        lastOrDefault(predicate: (item: T) => boolean): T
-
-
-        /**
-        * Returns the last element of a sequence that satisfies a condition or null if no such element is found.
-        * @param predicate A function to test each source element for a condition.
-        * @param defaultValue The value to return if no element exists with specified condition.
-        */
-        lastOrDefault(predicate: (item: T) => boolean, defaultValue: T): T
-
-
-        /**
-        * Returns the maximum value in a sequence of values.
-        */
-        max(): T
-
-
-        /**
-        * Invokes a transform function on each element of a sequence and returns the maximum value.
-        * @param selector A transform function to apply to each element.
-        */
-        max<TResult>(selector: (item: T) => TResult): TResult
-
-
-        /**
-        * Returns the minimum value in a sequence of values.
-        */
-        min(): T
-
-
-        /**
-        * Invokes a transform function on each element of a sequence and returns the minimum value.
-        * @param selector A transform function to apply to each element.
-        */
-        min<TResult>(selector: (item: T) => TResult): TResult
-
-
-        /**
-        * Filters the elements of an Enumerable based on a specified type.
-        * @param type The type to filter the elements of the sequence on.
-        */
-        ofType<TResult>(type: { new (...args: any[]): TResult }): Enumerable<TResult>
-
-
-        /**
-        * Sorts the elements of a sequence in ascending order by using a specified comparer.
-        * @param keySelector A function to extract a key from each element.
-        */
-        orderBy<TKey>(keySelector: (item: T) => TKey): OrderedEnumerable<T>
-
-
-        /**
-        * Sorts the elements of a sequence in ascending order by using a specified comparer.
-        * Returns an OrderedEnumerable whose elements are sorted according to a key.
-        * @param keySelector A function to extract a key from each element.
-        * @param comparer A Comparer to compare keys.
-        */
-        orderBy<TKey>(keySelector: (item: T) => TKey, comparer: EqualityComparer<TKey>): OrderedEnumerable<T>
-
-
-        /**
-        * Sorts the elements of a sequence in descending order by using a specified comparer.
-        * Returns an OrderedEnumerable whose elements are sorted according to a key.
-        * Returns an OrderedEnumerable whose elements are sorted in descending order according to a key.
-        * @param keySelector A function to extract a key from each element.
-        */
-        orderByDescending<TKey>(keySelector: (item: T) => TKey): OrderedEnumerable<T>
-
-
-        /**
-        * Sorts the elements of a sequence in descending order by using a specified comparer.
-        * Returns an OrderedEnumerable whose elements are sorted in descending order according to a key.
-        * @param keySelector A function to extract a key from each element.
-        * @param comparer A Comparer to compare keys.
-        */
-        orderByDescending<TKey>(keySelector: (item: T) => TKey, comparer: EqualityComparer<TKey>): OrderedEnumerable<T>
-
-
-        /**
-        * Inverts the order of the elements in a sequence.
-        */
-        reverse(): Enumerable<T>
-
-
-        /**
-        * Determines whether two sequences are equal by comparing the elements by using the default equality comparer for their type.
-        * @param second An Iterable to compare to the first sequence.
-        */
-        sequenceEqual(second: Iterable<T>): boolean
-
-
-        /**
-        * Determines whether two sequences are equal by comparing their elements by using a specified EqualityComparer.
-        * @param second An Iterable to compare to the first sequence.
-        * @param comparer The EqualityComparer to compare values.
-        */
-        sequenceEqual(second: Iterable<T>, comparer: EqualityComparer<T>): boolean
-
-
-        /**
-        * Projects each element of a sequence into a new form.
-        * @param selector A transform function to apply to each source element.
-        */
-        select<TResult>(selector: (item: T) => TResult): Enumerable<TResult>
-
-
-        /**
-        * Projects each element of a sequence into a new form by incorporating the element's index.
-        * @param selector A transform function to apply to each source element; the second parameter of the function represents the index of the source element.
-        */
-        select<TResult>(selector: (item: T, index: number) => TResult): Enumerable<TResult>
-
-
-        /**
-        * Projects each element of a sequence to an Enumerable and flattens the resulting sequences into one sequence.
-        * @param collectionSelector A transform function to apply to each source element.
-        */
-        selectMany<TResult>(selector: (item: T) => Iterable<TResult>): Enumerable<TResult>;
-
-
-        /**
-        * Projects each element of a sequence to an Enumerable and flattens the resulting sequences into one sequence. The index of each source element is used in the projected form of that element.
-        * @param collectionSelector A transform function to apply to each source element; the second parameter of the function represents the index of the source element.
-        */
-        selectMany<TResult>(selector: (item: T, index: number) => Iterable<TResult>): Enumerable<TResult>;
-
-
-        /**
-        * Projects each element of a sequence to an Enumerable and flattens the resulting sequences into one sequence.
-        * @param collectionSelector A transform function to apply to each source element; the second parameter of the function represents the index of the source element.
-        * @param resultSelector A transform function to apply to each element of the intermediate sequence.
-        */
-        selectMany<TCollection, TResult>(collectionSelector: (item: T) => Iterable<TCollection>, resultSelector: (item: T, collection: TCollection) => TResult): Enumerable<TResult>;
-
-
-        /**
-        * Projects each element of a sequence to an Enumerable and flattens the resulting sequences into one sequence. The index of each source element is used in the projected form of that element.
-        * @param collectionSelector A transform function to apply to each source element; the second parameter of the function represents the index of the source element.
-        * @param resultSelector A transform function to apply to each element of the intermediate sequence.
-        */
-        selectMany<TCollection, TResult>(collectionSelector: (item: T, index: number) => Iterable<TCollection>, resultSelector: (item: T, collection: TCollection) => TResult): Enumerable<TResult>;
-
-
-        /**
-        * Returns the only element of a sequence, and throws an exception if there is not exactly one element in the sequence.
-        */
-        single(): T
-
-
-        /**
-        * Returns the only element of a sequence that satisfies a specified condition, and throws an exception if more than one such element exists.
-        * @param predicate A function to test each source element for a condition.
-        */
-        single(predicate: (item: T) => boolean): T
-
-
-        /**
-        * Returns the only element of a sequence, or a null if the sequence is empty; this method throws an exception if there is more than one element in the sequence.
-        */
-        singleOrDefault(): T
-
-
-        /**
-        * Returns the only element of a sequence that satisfies a specified condition or a null if no such element exists; this method throws an exception if more than one element satisfies the condition.
-        * @param predicate A function to test each source element for a condition.
-        */
-        singleOrDefault(predicate: (item: T) => boolean): T
-
-
-        /**
-        * Returns the only element of a sequence that satisfies a specified condition or a default value if no such element exists; this method throws an exception if more than one element satisfies the condition.
-        * @param predicate A function to test each source element for a condition.
-        * @param defaultValue The value to return if no element exists with specified condition.
-        */
-        singleOrDefault(predicate: (item: T) => boolean, defaultValue: T): T
-
-
-        /**
-        * Bypasses a specified number of elements in a sequence and then returns the remaining elements.
-        * @param count The number of elements to skip before returning the remaining elements.
-        */
-        skip(count: number): Enumerable<T>
-
-
-        /**
-        * Bypasses elements in a sequence as long as a specified condition is true and then returns the remaining elements.
-        * @param predicate A function to test each source element for a condition.
-        */
-        skipWhile(predicate: (item: T) => boolean): Enumerable<T>
-
-
-        /**
-        * Bypasses elements in a sequence as long as a specified condition is true and then returns the remaining elements. The element's index is used in the logic of the predicate function.
-        * @param predicate A function to test each source element for a condition; the second parameter of the function represents the index of the source element.
-        */
-        skipWhile(predicate: (item: T, index: number) => boolean): Enumerable<T>
-
-
-        /**
-        * Computes the sum of a sequence of values.
-        */
-        sum(): number
-
-
-        /**
-        * Computes the sum of the sequence of values that are obtained by invoking a transform function on each element of the input sequence.
-        * @param selector A transform function to apply to each element.
-        */
-        sum(selector: (item: T) => number): number
-
-
-        /**
-        * Returns a specified number of contiguous elements from the start of a sequence.
-        * @param count The number of elements to return.
-        */
-        take(count: number): Enumerable<T>
-
-
-        /**
-        * Returns elements from a sequence as long as a specified condition is true.
-        * @param predicate A function to test each source element for a condition.
-        */
-        takeWhile(predicate: (item: T) => boolean): Enumerable<T>
-
-
-        /**
-        * Returns elements from a sequence as long as a specified condition is true. The element's index is used in the logic of the predicate function.
-        * @param predicate A function to test each source element for a condition; the second parameter of the function represents the index of the source element.
-        */
-        takeWhile(predicate: (item: T, index: number) => boolean): Enumerable<T>
-
-
-        /**
-        * Creates an array from an Enumerable.
-        */
-        toArray(): T[]
-
-
-        /**
-        * Creates a Dictionary from an Enumerable according to a specified key selector function.
-        * @param keySelector A function to extract a key from each element.
-        */
-        toDictionary<TKey>(keySelector: (item: T) => TKey): Dictionary<TKey, T>;
-
-
-        /**
-        * Creates a Dictionary from an Enumerable according to specified key selector and comparer.
-        * @param keySelector A function to extract a key from each element.
-        * @param comparer An equality comparer to compare values.
-        */
-        toDictionary<TKey>(keySelector: (item: T) => TKey, comparer: EqualityComparer<TKey>): Dictionary<TKey, T>;
-
-
-        /**
-        * Creates a Dictionary from an Enumerable according to specified key selector and element selector functions.
-        * @param keySelector A function to extract a key from each element.
-        * @param elementSelector A transform function to produce a result element value from each element.
-        */
-        toDictionary<TKey, TElement>(keySelector: (item: T) => TKey, elementSelector: (item: T) => TElement): Dictionary<TKey, TElement>;
-
-
-        /**
-        * Creates a Dictionary from an Enumerable according to a specified key selector function, a comparer, and an element selector function.
-        * @param keySelector A function to extract a key from each element.
-        * @param elementSelector A transform function to produce a result element value from each element.
-        * @param comparer An equality comparer to compare values.
-        */
-        toDictionary<TKey, TElement>(keySelector: (item: T) => TKey, elementSelector: (item: T) => TElement, comparer: EqualityComparer<TKey>): Dictionary<TKey, TElement>;
-
-
-        /**
-        * Creates a List from an Enumerable.
-        */
-        toList(): List<T>
-
-
-        /**
-        * Creates a Lookup from an Enumerable according to a specified key selector function.
-        * @param keySelector A function to extract a key from each element.
-        */
-        toLookup<TKey>(keySelector: (item: T) => TKey): Lookup<TKey, T>;
-
-
-        /**
-        * Creates a Lookup from an Enumerable according to a specified key selector function and comparer.
-        * @param keySelector A function to extract a key from each element.
-        * @param comparer An equality comparer to compare values.
-        */
-        toLookup<TKey>(keySelector: (item: T) => TKey, comparer: EqualityComparer<TKey>): Lookup<TKey, T>;
-
-
-        /**
-        * Creates a Lookup from an Enumerable according to specified key selector and element selector functions.
-        * @param keySelector A function to extract a key from each element.
-        * @param elementSelector A transform function to produce a result element value from each element.
-        */
-        toLookup<TKey, TElement>(keySelector: (item: T) => TKey, elementSelector: (item: T) => TElement): Lookup<TKey, TElement>;
-
-
-        /**
-        * Creates a Lookup from an Enumerable according to a specified key selector function, a comparer and an element selector function.
-        * @param keySelector A function to extract a key from each element.
-        * @param elementSelector A transform function to produce a result element value from each element.
-        * @param comparer An equality comparer to compare values.
-        */
-        toLookup<TKey, TElement>(keySelector: (item: T) => TKey, elementSelector: (item: T) => TElement, comparer: EqualityComparer<TKey>): Lookup<TKey, TElement>;
-
-
-        /**
-        * Produces the set union of two sequences by using the default equality comparer.
-        * @param second An Iterable whose distinct elements form the second set for the union.
-        */
-        union(second: Iterable<T>): Enumerable<T>
-
-
-        /**
-        * Produces the set union of two sequences by using a specified EqualityComparer.
-        * @param second An Iterable whose distinct elements form the second set for the union.
-        * @param comparer The EqualityComparer to compare values.
-        */
-        union(second: Iterable<T>, comparer: EqualityComparer<T>): Enumerable<T>
-
-
-        /**
-        * Filters a sequence of values based on a predicate.
-        * @param predicate A function to test each source element for a condition.
-        */
-        where(predicate: (item: T) => boolean): Enumerable<T>;
-
-
-        /**
-        * Filters a sequence of values based on a predicate. Each element's index is used in the logic of the predicate function.
-        * @param predicate A function to test each source element for a condition; the second parameter of the function represents the index of the source element.
-        */
-        where(predicate: (item: T, index: number) => boolean): Enumerable<T>;
-
-
-        /**
-        * Merges two sequences by using the specified predicate function.
-        * @param second The second sequence to merge.
-        * @param resultSelector A function that specifies how to merge the elements from the two sequences.
-        */
-        zip<TSecond, TResult>(second: Iterable<TSecond>, resultSelector: (first: T, second: TSecond) => TResult): Enumerable<TResult>;
-    }
-
-
-
-    /**
-    * Represents Array-like objects which has the "length" property and indexed properties access, eg. jQuery
-    */
-    interface ArrayLike<T> {
-        length: number;
-        [n: number]: T;
-    }
-
-
-
-    /**
-    * Provides 'hash' and 'equals' functions for a particular type, suitable for use in hashing algorithms and data structures such as a hash table.
-    */
-    interface RuntimeComparer {
-
-        /**
-        * Serves as a hash function for a particular type.
-        */
-        __hash__(): number;
-
-        /**
-        * Determines whether the specified Object is equal to the current Object.
-        */
-        __equals__(obj: any): boolean;
-    }
-
-
-
-    /**
-    * Provides a set of static methods that provide support for internal operations.
-    */
-    interface MultiplexRuntime {
-
-        /**
-        * Serves as a hash function for a particular type, suitable for use in hashing algorithms and data structures such as a hash table.
-        * @param obj An object to retrieve the hash code for.
-        */
-        hash(obj: any): number;
-
-
-        /**
-        * Determines whether the specified object instances are considered equal.
-        * @param objA The first object to compare.
-        * @param objB The second object to compare.
-        */
-        equals(objA: any, objB: any): boolean;
-
-
-        /**
-        * Performs a comparison of two objects of the same type and returns a value indicating whether one object is less than, equal to, or greater than the other.
-        * @param objA The first object to compare.
-        * @param objB The second object to compare.
-        */
-        compare<T>(objA: T, objB: T): number;
-
-
-        /**
-        * Creates A function expression from the specified string lambda expression
-        * @param exp String lambda expression.
-        */
-        lambda<T, TResult>(exp: string): (obj: T) => TResult;
-
-
-        /**
-        * Creates A function expression from the specified string lambda expression
-        * @param exp String lambda expression.
-        */
-        lambda<T1, T2, TResult>(exp: string): (obj1: T1, obj2: T2) => TResult;
-
-
-        /**
-        * Creates A function expression from the specified string lambda expression
-        * @param exp String lambda expression.
-        */
-        lambda<T1, T2, T3, TResult>(exp: string): (obj1: T1, obj2: T2, obj3: T3) => TResult;
-
-
-        /**
-        * Creates A function expression from the specified string lambda expression
-        * @param exp String lambda expression.
-        */
-        lambda<TResult>(exp: string): (...args: any[]) => TResult;
-
-
-        /**
-        * Defines new or modifies existing properties directly on the specified object, returning the object.
-        * @param obj The object on which to define or modify properties.
-        * @param prop The name of the property to be defined or modified.
-        * @param attributes The descriptor for the property being defined or modified.
-        */
-        define<T>(obj: T, prop: String, attributes: PropertyDescriptor): T;
-
-
-        /**
-        * Extends the given object by implementing supplied members.
-        * @param obj The object on which to define or modify properties.
-        * @param properties Represetnts the mixin source object
-        * @param attributes The descriptor for the property being defined or modified.
-        */
-        mixin<T>(obj: T, properties: Object, attributes?: PropertyDescriptor): T;
-    }
-
-
-
-    /**
-    * Defines MultiplexStatic module members
-    */
-    interface MultiplexStatic {
-
-
-
-        /* Factory Methods
-        --------------------------------------------------------------------------*/
-
-        /**
-        * Exposes the enumerator, which supports an iteration over the specified Enumerable object.
-        * @param obj An Iterable object. eg. Enumerable, Array, String, Set, Map, Iterable & Generators
-        */
-        <T>(obj: Iterable<T>): Enumerable<T>
-
-
-        /**
-        * Defines an enumerator, which supports an iteration over the specified Generator function.
-        * @param factory An Enumerator factory function.
-        */
-        <T>(factory: () => Enumerator<T>): Enumerable<T>
-
-
-        /**
-        * Defines an enumerator, which supports an iteration over the items of the specified Array-like object.
-        * An Array-like object is an object which has the "length" property and indexed properties access, eg. jQuery
-        * @param obj An Array-like object.
-        */
-        <T>(obj: ArrayLike<T>): Enumerable<T>
-
-
-        /**
-        * Defines an enumerator, which supports an iteration over the arguments local variable available within all functions.
-        * @param obj arguments local variable available within all functions.
-        */
-        (obj: IArguments): Enumerable<any>
-
-
-        /**
-        * Defines an enumerator, which supports an iteration over the properties of the specified object.
-        * @param obj A regular Object.
-        */
-        (obj: Object): Enumerable<KeyValuePair<string, any>>
-
-
-
-
-
-
-        /* Static Methods
-        --------------------------------------------------------------------------*/
-
-        /**
-        * Gets and combines hash code for the given parameters, calls the overridden "hash" method when available.
-        * @param objs Optional number of objects to combine their hash codes.
-        */
-        hash(...obj: any[]): number;
-
-
-        /**
-        * Determines whether the specified object instances are considered equal. calls the overridden "equals" method when available.
-        * @param objA The first object to compare.
-        * @param objB The second object to compare.
-        */
-        equals(objA: any, objB: any): boolean;
-
-
-        /**
-        * Determines whether the specified object instances are considered equal. calls the overridden "equals" method when available.
-        * @param objA The first object to compare.
-        * @param objB The second object to compare.
-        * @param comparer An equality comparer to compare values.
-        */
-        equals(objA: any, objB: any, comparer: EqualityComparer<any>): boolean;
-
-
-        /**
-        * Performs a comparison of two objects of the same type and returns a value indicating whether one object is less than, equal to, or greater than the other.
-        * @param objA The first object to compare.
-        * @param objB The second object to compare.
-        */
-        compare<T>(objA: T, objB: T): number;
-
-
-        /**
-        * Extends Enumerable extension methods to the given type
-        * @param type The type to extend.
-        */
-        enumerableExtend(type: Function): void;
-
-
-        /**
-        * Returns an empty Enumerable.
-        */
-        empty<T>(): Enumerable<T>;
-
-
-        /**
-        * Detects if an object is Enumerable.
-        * @param obj An object to check its Enumerability.
-        */
-        is(obj: any): boolean;
-
-
-        /**
-        * Generates a sequence of integral numbers within a specified range.
-        * @param start The value of the first integer in the sequence.
-        * @param count The number of sequential integers to generate.
-        */
-        range(start: number, count: number): Enumerable<number>;
-
-
-        /**
-        * Generates a sequence that contains one repeated value.
-        * @param element The value to be repeated.
-        * @param count The number of times to repeat the value in the generated sequence.
-        */
-        repeat<T>(element: T, count: number): Enumerable<T>;
-
-
-
-
-
-
-        /* Mutiplex Types
-        --------------------------------------------------------------------------*/
-
-        /**
-        * Provides a set of static methods that provide support for internal operations.
-        */
-        runtime: MultiplexRuntime
-
-        /**
-        * Supports a simple iteration over a collection.
-        */
-        Enumerator: EnumeratorConstructor
-
-        /**
-        * Exposes the enumerator, which supports a simple iteration over a collection of a specified type.
-        */
-        Enumerable: EnumerableConstructor
-
-        /**
-        * Provides a base class for implementations of Comparer<T> generic interface.
-        */
-        Comparer: ComparerConstructor
-
-        /**
-        * Provides a base class for implementations of the EqualityComparer.
-        */
-        EqualityComparer: EqualityComparerConstructor
-
-        /**
-        * Initializes a new instance of the abstract Collection class.
-        */
-        Collection: CollectionConstructor
-
-        /**
-        * Initializes a new instance of the abstract Collection class.
-        */
-        ReadOnlyCollection: ReadOnlyCollectionConstructor
-
-        /**
-        * Represents a strongly typed list of objects that can be accessed by index.
-        */
-        List: ListConstructor
-
-        /**
-        * Represents a collection of key/value pairs that are sorted by key based on the associated Comparer implementation.
-        */
-        SortedList: SortedListConstructor
-
-        /**
-        * Defines a key/value pair that can be set or retrieved.
-        */
-        KeyValuePair: KeyValuePairConstructor
-
-        /**
-        * Represents a collection of keys and values.
-        */
-        Dictionary: DictionaryConstructor
-
-        /**
-        * Represents a set of values.
-        */
-        HashSet: HashSetConstructor
-
-        /**
-        * Represents a node in a LinkedList.
-        */
-        LinkedListNode: LinkedListNodeConstructor
-
-        /**
-        * Represents a doubly linked list.
-        */
-        LinkedList: LinkedListConstructor
-
-        /**
-        * Represents a first-in, first-out collection of objects.
-        */
-        Queue: QueueConstructor
-
-        /**
-        * Represents a variable size last-in-first-out (LIFO) collection of instances of the same arbitrary type.
-        */
-        Stack: StackConstructor
-    }
-}
diff --git a/multiplexjs/tsconfig.json b/multiplexjs/tsconfig.json
new file mode 100644
index 0000000000..4612a63c90
--- /dev/null
+++ b/multiplexjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "multiplexjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mustache/mustache.d.ts b/mustache/index.d.ts
similarity index 100%
rename from mustache/mustache.d.ts
rename to mustache/index.d.ts
diff --git a/mustache/mustache-0.7.3-tests.ts b/mustache/mustache-0.7.3-tests.ts
index f95913cc7b..5d85f4791a 100644
--- a/mustache/mustache-0.7.3-tests.ts
+++ b/mustache/mustache-0.7.3-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="mustache-0.7.3.d.ts" />
+
 
 var view = { title: "Joe", calc: function () { return 2 + 4; } };
 var output = Mustache.render("{{title}} spends {{calc}}", view);
diff --git a/mustache/mustache-tests.ts b/mustache/mustache-tests.ts
index 8f0d21e237..ad9c410d76 100644
--- a/mustache/mustache-tests.ts
+++ b/mustache/mustache-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="mustache.d.ts" />
+
 
 var view1 = { title: "Joe", calc: function () { return 2 + 4; } };
 var template1 = "{{title}} spends {{calc}}";
diff --git a/mustache/tsconfig.json b/mustache/tsconfig.json
new file mode 100644
index 0000000000..f94a257b6c
--- /dev/null
+++ b/mustache/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "mustache-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/mysql/index.d.ts b/mysql/index.d.ts
new file mode 100644
index 0000000000..c325fa4f85
--- /dev/null
+++ b/mysql/index.d.ts
@@ -0,0 +1,500 @@
+// Type definitions for node-mysql
+// Project: https://github.com/felixge/node-mysql
+// Definitions by: William Johnston <https://github.com/wjohnsto>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="node" />
+
+
+import stream = require("stream");
+
+declare function createConnection(connectionUri: string): IConnection;
+declare function createConnection(config: IConnectionConfig): IConnection;
+declare function createPool(config: IPoolConfig): IPool;
+declare function createPoolCluster(config?: IPoolClusterConfig): IPoolCluster;
+declare function escape(value: any): string;
+declare function format(sql: string): string;
+declare function format(sql: string, values: Array<any>): string;
+declare function format(sql: string, values: any): string;
+
+interface IMySql {
+    createConnection(connectionUri: string): IConnection;
+    createConnection(config: IConnectionConfig): IConnection;
+    createPool(config: IPoolConfig): IPool;
+    createPoolCluster(config?: IPoolClusterConfig): IPoolCluster;
+    escape(value: any): string;
+    format(sql: string): string;
+    format(sql: string, values: Array<any>): string;
+    format(sql: string, values: any): string;
+}
+
+interface IConnectionStatic {
+    createQuery(sql: string): IQuery;
+    createQuery(sql: string, callback: (err: IError, ...args: any[]) => void): IQuery;
+    createQuery(sql: string, values: Array<any>): IQuery;
+    createQuery(sql: string, values: Array<any>, callback: (err: IError, ...args: any[]) => void): IQuery;
+}
+
+interface IConnection {
+    config: IConnectionConfig;
+
+    threadId: number;
+
+    beginTransaction(callback: (err: IError) => void): void;
+
+    connect(): void;
+    connect(callback: (err: IError, ...args: any[]) => void): void;
+    connect(options: any, callback?: (err: IError, ...args: any[]) => void): void;
+
+    commit(callback: (err: IError) => void): void;
+
+    changeUser(options: IConnectionOptions): void;
+    changeUser(options: IConnectionOptions, callback: (err: IError) => void): void;
+
+    query: IQueryFunction;
+
+    end(): void;
+    end(callback: (err: IError, ...args: any[]) => void): void;
+    end(options: any, callback: (err: IError, ...args: any[]) => void): void;
+
+    destroy(): void;
+
+    pause(): void;
+
+    release(): void;
+    resume(): void;
+
+    escape(value: any): string;
+
+    escapeId(value: string): string;
+    escapeId(values: Array<string>): string;
+
+    format(sql: string): string;
+    format(sql: string, values: Array<any>): string;
+    format(sql: string, values: any): string;
+
+    on(ev: string, callback: (...args: any[]) => void): IConnection;
+    on(ev: 'error', callback: (err: IError) => void): IConnection;
+
+    rollback(callback: () => void): void;
+}
+
+interface IPool {
+    config: IPoolConfig;
+
+    getConnection(callback: (err: IError, connection: IConnection) => void): void;
+
+    query: IQueryFunction;
+
+    end(): void;
+    end(callback: (err: IError, ...args: any[]) => void): void;
+
+    on(ev: string, callback: (...args: any[]) => void): IPool;
+    on(ev: 'connection', callback: (connection: IConnection) => void): IPool;
+    on(ev: 'error', callback: (err: IError) => void): IPool;
+}
+
+interface IPoolCluster {
+    config: IPoolClusterConfig;
+
+    add(config: IPoolConfig): void;
+    add(group: string, config: IPoolConfig): void;
+
+    end(): void;
+
+    getConnection(callback: (err: IError, connection: IConnection) => void): void;
+    getConnection(group: string, callback: (err: IError, connection: IConnection) => void): void;
+    getConnection(group: string, selector: string, callback: (err: IError, connection: IConnection) => void): void;
+
+    of(pattern: string): IPool;
+    of(pattern: string, selector: string): IPool;
+
+    on(ev: string, callback: (...args: any[]) => void): IPoolCluster;
+    on(ev: 'remove', callback: (nodeId: number) => void): IPoolCluster;
+    on(ev: 'connection', callback: (connection: IConnection) => void): IPoolCluster;
+    on(ev: 'error', callback: (err: IError) => void): IPoolCluster;
+}
+
+interface IQuery {
+    /**
+     * The SQL for a constructed query
+     */
+    sql: string;
+
+    /**
+     * Emits a query packet to start the query
+     */
+    start(): void;
+
+    /**
+     * Determines the packet class to use given the first byte of the packet.
+     * 
+     * @param firstByte The first byte of the packet
+     * @param parser The packet parser
+     */
+    determinePacket(firstByte: number, parser: any): any;
+
+    /**
+     * Creates a Readable stream with the given options
+     * 
+     * @param options The options for the stream.
+     */
+    stream(options: IStreamOptions): stream.Readable;
+
+    /**
+     * Pipes a stream downstream, providing automatic pause/resume based on the 
+     * options sent to the stream.
+     * 
+     * @param options The options for the stream.
+     */
+    pipe(callback: (...args: any[]) => void): IQuery;
+
+    on(ev: string, callback: (...args: any[]) => void): IQuery;
+    on(ev: 'error', callback: (err: IError) => void): IQuery;
+    on(ev: 'fields', callback: (fields: any, index: number) => void): IQuery;
+    on(ev: 'result', callback: (row: any, index: number) => void): IQuery;
+    on(ev: 'end', callback: () => void): IQuery;
+}
+
+interface IQueryFunction {
+    (sql: string): IQuery;
+    (sql: string, callback: (err: IError, ...args: any[]) => void): IQuery;
+    (sql: string, values: Array<any>): IQuery;
+    (sql: string, values: Array<any>, callback: (err: IError, ...args: any[]) => void): IQuery;
+    (sql: string, values: any): IQuery;
+    (sql: string, values: any, callback: (err: IError, ...args: any[]) => void): IQuery;
+    (options: IQueryOptions): IQuery;
+    (options: IQueryOptions, callback: (err: IError, ...args: any[]) => void): IQuery;
+    (options: IQueryOptions, values: Array<any>): IQuery;
+    (options: IQueryOptions, values: Array<any>, callback: (err: IError, ...args: any[]) => void): IQuery;
+    (options: IQueryOptions, values: any): IQuery;
+    (options: IQueryOptions, values: any, callback: (err: IError, ...args: any[]) => void): IQuery;
+}
+
+interface IQueryOptions {
+    /**
+     * The SQL for the query
+     */
+    sql: string;
+
+    /**
+     * Every operation takes an optional inactivity timeout option. This allows you to specify appropriate timeouts for 
+     * operations. It is important to note that these timeouts are not part of the MySQL protocol, and rather timeout 
+     * operations through the client. This means that when a timeout is reached, the connection it occurred on will be 
+     * destroyed and no further operations can be performed.
+     */
+    timeout?: number;
+
+    /**
+     * Either a boolean or string. If true, tables will be nested objects. If string (e.g. '_'), tables will be 
+     * nested as tableName_fieldName
+     */
+    nestTables?: any;
+
+    /**
+     * Determines if column values should be converted to native JavaScript types. It is not recommended (and may go away / change in the future) 
+     * to disable type casting, but you can currently do so on either the connection or query level. (Default: true)
+     * 
+     * You can also specify a function (field: any, next: () => void) => {} to do the type casting yourself.
+     * 
+     * WARNING: YOU MUST INVOKE the parser using one of these three field functions in your custom typeCast callback. They can only be called once.
+     * 
+     * field.string()
+     * field.buffer()
+     * field.geometry()
+     * 
+     * are aliases for
+     * 
+     * parser.parseLengthCodedString()
+     * parser.parseLengthCodedBuffer()
+     * parser.parseGeometryValue()
+     * 
+     * You can find which field function you need to use by looking at: RowDataPacket.prototype._typeCast
+     */
+    typeCast?: any;
+}
+
+interface IStreamOptions {
+    /**
+     * Sets the max buffer size in objects of a stream
+     */
+    highWaterMark?: number;
+
+    /**
+     * The object mode of the stream (Default: true)
+     */
+    objectMode?: any;
+}
+
+interface IConnectionOptions {
+    /**
+     * The MySQL user to authenticate as
+     */
+    user?: string;
+
+    /**
+     * The password of that MySQL user
+     */
+    password?: string;
+
+    /**
+     * Name of the database to use for this connection
+     */
+    database?: string;
+
+    /**
+     * The charset for the connection. This is called "collation" in the SQL-level of MySQL (like utf8_general_ci). 
+     * If a SQL-level charset is specified (like utf8mb4) then the default collation for that charset is used. 
+     * (Default: 'UTF8_GENERAL_CI')
+     */
+    charset?: string;
+}
+
+interface IConnectionConfig extends IConnectionOptions {
+    /**
+     * The hostname of the database you are connecting to. (Default: localhost)
+     */
+    host?: string;
+
+    /**
+     * The port number to connect to. (Default: 3306)
+     */
+    port?: number;
+
+    /**
+     * The source IP address to use for TCP connection
+     */
+    localAddress?: string;
+
+    /**
+     * The path to a unix domain socket to connect to. When used host and port are ignored
+     */
+    socketPath?: string;
+
+    /**
+     * The timezone used to store local dates. (Default: 'local')
+     */
+    timezone?: string;
+
+    /**
+     * The milliseconds before a timeout occurs during the initial connection to the MySQL server. (Default: 10 seconds)
+     */
+    connectTimeout?: number;
+
+    /**
+     * Stringify objects instead of converting to values. (Default: 'false')
+     */
+    stringifyObjects?: boolean;
+
+    /**
+     * Allow connecting to MySQL instances that ask for the old (insecure) authentication method. (Default: false)
+     */
+    insecureAuth?: boolean;
+
+    /**
+     * Determines if column values should be converted to native JavaScript types. It is not recommended (and may go away / change in the future) 
+     * to disable type casting, but you can currently do so on either the connection or query level. (Default: true)
+     * 
+     * You can also specify a function (field: any, next: () => void) => {} to do the type casting yourself.
+     * 
+     * WARNING: YOU MUST INVOKE the parser using one of these three field functions in your custom typeCast callback. They can only be called once.
+     * 
+     * field.string()
+     * field.buffer()
+     * field.geometry()
+     * 
+     * are aliases for
+     * 
+     * parser.parseLengthCodedString()
+     * parser.parseLengthCodedBuffer()
+     * parser.parseGeometryValue()
+     * 
+     * You can find which field function you need to use by looking at: RowDataPacket.prototype._typeCast
+     */
+    typeCast?: any;
+
+    /**
+     * A custom query format function
+     */
+    queryFormat?: (query: string, values: any) => void;
+
+    /**
+     * When dealing with big numbers (BIGINT and DECIMAL columns) in the database, you should enable this option 
+     * (Default: false)
+     */
+    supportBigNumbers?: boolean;
+
+    /**
+     * Enabling both supportBigNumbers and bigNumberStrings forces big numbers (BIGINT and DECIMAL columns) to be 
+     * always returned as JavaScript String objects (Default: false). Enabling supportBigNumbers but leaving 
+     * bigNumberStrings disabled will return big numbers as String objects only when they cannot be accurately 
+     * represented with [JavaScript Number objects] (http://ecma262-5.com/ELS5_HTML.htm#Section_8.5) 
+     * (which happens when they exceed the [-2^53, +2^53] range), otherwise they will be returned as Number objects. 
+     * This option is ignored if supportBigNumbers is disabled.
+     */
+    bigNumberStrings?: boolean;
+
+    /**
+     * Force date types (TIMESTAMP, DATETIME, DATE) to be returned as strings rather then inflated into JavaScript Date 
+     * objects. (Default: false)
+     */
+    dateStrings?: boolean;
+
+    /**
+     * This will print all incoming and outgoing packets on stdout. 
+     * You can also restrict debugging to packet types by passing an array of types (strings) to debug;
+     * 
+     * (Default: false)
+     */
+    debug?: any;
+
+    /**
+     * Generates stack traces on Error to include call site of library entrance ("long stack traces"). Slight 
+     * performance penalty for most calls. (Default: true)
+     */
+    trace?: boolean;
+
+    /**
+     * Allow multiple mysql statements per query. Be careful with this, it exposes you to SQL injection attacks. (Default: false)
+     */
+    multipleStatements?: boolean;
+
+    /**
+     * List of connection flags to use other than the default ones. It is also possible to blacklist default ones
+     */
+    flags?: Array<string>;
+
+    /**
+     * object with ssl parameters or a string containing name of ssl profile
+     */
+    ssl?: any;
+}
+
+interface IPoolConfig extends IConnectionConfig {
+    /**
+     * The milliseconds before a timeout occurs during the connection acquisition. This is slightly different from connectTimeout, 
+     * because acquiring a pool connection does not always involve making a connection. (Default: 10 seconds)
+     */
+    acquireTimeout?: number;
+
+    /**
+     * Determines the pool's action when no connections are available and the limit has been reached. If true, the pool will queue 
+     * the connection request and call it when one becomes available. If false, the pool will immediately call back with an error. 
+     * (Default: true)
+     */
+    waitForConnections?: boolean;
+
+    /**
+     * The maximum number of connections to create at once. (Default: 10)
+     */
+    connectionLimit?: number;
+
+    /**
+     * The maximum number of connection requests the pool will queue before returning an error from getConnection. If set to 0, there 
+     * is no limit to the number of queued connection requests. (Default: 0)
+     */
+    queueLimit?: number;
+}
+
+interface IPoolClusterConfig {
+    /**
+     * If true, PoolCluster will attempt to reconnect when connection fails. (Default: true)
+     */
+    canRetry?: boolean;
+
+    /**
+     * If connection fails, node's errorCount increases. When errorCount is greater than removeNodeErrorCount, 
+     * remove a node in the PoolCluster. (Default: 5)
+     */
+    removeNodeErrorCount?: number;
+
+    /**
+     * If connection fails, specifies the number of milliseconds before another connection attempt will be made.
+     * If set to 0, then node will be removed instead and never re-used. (Default: 0)
+     */
+    restoreNodeTimeout?: number;
+
+    /**
+     * The default selector. (Default: RR)
+     * RR: Select one alternately. (Round-Robin)
+     * RANDOM: Select the node by random function.
+     * ORDER: Select the first node available unconditionally.
+     */
+    defaultSelector?: string;
+}
+
+interface ISslCredentials {
+    /**
+     * A string or buffer holding the PFX or PKCS12 encoded private key, certificate and CA certificates
+     */
+    pfx?: string;
+
+    /**
+     * A string holding the PEM encoded private key
+     */
+    key?: string;
+
+    /**
+     * A string of passphrase for the private key or pfx
+     */
+    passphrase?: string;
+
+    /**
+     * A string holding the PEM encoded certificate
+     */
+    cert?: string;
+
+    /**
+     * Either a string or list of strings of PEM encoded CA certificates to trust.
+     */
+    ca?: Array<string>;
+
+    /**
+     * Either a string or list of strings of PEM encoded CRLs (Certificate Revocation List)
+     */
+    crl?: Array<string>;
+
+    /**
+     * A string describing the ciphers to use or exclude
+     */
+    ciphers?: string;
+}
+
+interface IError extends Error {
+    /**
+     * Either a MySQL server error (e.g. 'ER_ACCESS_DENIED_ERROR'), 
+     * a node.js error (e.g. 'ECONNREFUSED') or an internal error 
+     * (e.g. 'PROTOCOL_CONNECTION_LOST').
+     */
+    code: string;
+
+    /**
+     * The error number for the error code
+     */
+    errno: number;
+
+    /**
+     * The sql state marker
+     */
+    sqlStateMarker?: string;
+
+    /**
+     * The sql state
+     */
+    sqlState?: string;
+
+    /**
+     * The field count
+     */
+    fieldCount?: number;
+
+    /**
+     * The stack trace for the error
+     */
+    stack?: string;
+
+    /**
+     * Boolean, indicating if this error is terminal to the connection object.
+     */
+    fatal: boolean;
+}
diff --git a/mysql/mysql-tests.ts b/mysql/mysql-tests.ts
index 080bece2db..8a8a106192 100644
--- a/mysql/mysql-tests.ts
+++ b/mysql/mysql-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="mysql.d.ts" />
-
-import fs = require('fs');
+import fs = require('fs');
 import mysql = require('mysql');
 import stream = require('stream');
 
diff --git a/mysql/mysql.d.ts b/mysql/mysql.d.ts
deleted file mode 100644
index b03db6eaaa..0000000000
--- a/mysql/mysql.d.ts
+++ /dev/null
@@ -1,502 +0,0 @@
-// Type definitions for node-mysql
-// Project: https://github.com/felixge/node-mysql
-// Definitions by: William Johnston <https://github.com/wjohnsto>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path='../node/node.d.ts' />
-
-declare module "mysql" {
-	import stream = require("stream");
-
-	function createConnection(connectionUri: string): IConnection;
-	function createConnection(config: IConnectionConfig): IConnection;
-	function createPool(config: IPoolConfig): IPool;
-	function createPoolCluster(config?: IPoolClusterConfig): IPoolCluster;
-	function escape(value: any): string;
-	function format(sql: string): string;
-	function format(sql: string, values: Array<any>): string;
-	function format(sql: string, values: any): string;
-
-	interface IMySql {
-		createConnection(connectionUri: string): IConnection;
-		createConnection(config: IConnectionConfig): IConnection;
-		createPool(config: IPoolConfig): IPool;
-		createPoolCluster(config?: IPoolClusterConfig): IPoolCluster;
-		escape(value: any): string;
-		format(sql: string): string;
-		format(sql: string, values: Array<any>): string;
-		format(sql: string, values: any): string;
-	}
-
-    interface IConnectionStatic {
-        createQuery(sql: string): IQuery;
-        createQuery(sql: string, callback: (err: IError, ...args: any[]) => void): IQuery;
-        createQuery(sql: string, values: Array<any>): IQuery;
-        createQuery(sql: string, values: Array<any>, callback: (err: IError, ...args: any[]) => void): IQuery;
-    }
-
-    interface IConnection {
-        config: IConnectionConfig;
-
-        threadId: number;
-
-        beginTransaction(callback: (err: IError) => void): void;
-
-        connect(): void;
-        connect(callback: (err: IError, ...args: any[]) => void): void;
-        connect(options: any, callback?: (err: IError, ...args: any[]) => void): void;
-
-        commit(callback: (err: IError) => void): void;
-
-        changeUser(options: IConnectionOptions): void;
-        changeUser(options: IConnectionOptions, callback: (err: IError) => void): void;
-
-        query: IQueryFunction;
-
-        end(): void;
-        end(callback: (err: IError, ...args: any[]) => void): void;
-        end(options: any, callback: (err: IError, ...args: any[]) => void): void;
-
-        destroy(): void;
-
-        pause(): void;
-
-        release(): void;
-        resume(): void;
-
-        escape(value: any): string;
-
-        escapeId(value: string): string;
-        escapeId(values: Array<string>): string;
-
-        format(sql: string): string;
-        format(sql: string, values: Array<any>): string;
-        format(sql: string, values: any): string;
-
-        on(ev: string, callback: (...args: any[]) => void): IConnection;
-        on(ev: 'error', callback: (err: IError) => void): IConnection;
-
-        rollback(callback: () => void): void;
-    }
-
-    interface IPool {
-        config: IPoolConfig;
-
-        getConnection(callback: (err: IError, connection: IConnection) => void): void;
-
-        query: IQueryFunction;
-
-        end(): void;
-        end(callback: (err: IError, ...args: any[]) => void): void;
-
-        on(ev: string, callback: (...args: any[]) => void): IPool;
-        on(ev: 'connection', callback: (connection: IConnection) => void): IPool;
-        on(ev: 'error', callback: (err: IError) => void): IPool;
-    }
-
-    interface IPoolCluster {
-        config: IPoolClusterConfig;
-
-        add(config: IPoolConfig): void;
-        add(group: string, config: IPoolConfig): void;
-
-        end(): void;
-
-        getConnection(callback: (err: IError, connection: IConnection) => void): void;
-        getConnection(group: string, callback: (err: IError, connection: IConnection) => void): void;
-        getConnection(group: string, selector: string, callback: (err: IError, connection: IConnection) => void): void;
-
-        of(pattern: string): IPool;
-        of(pattern: string, selector: string): IPool;
-
-        on(ev: string, callback: (...args: any[]) => void): IPoolCluster;
-        on(ev: 'remove', callback: (nodeId: number) => void): IPoolCluster;
-        on(ev: 'connection', callback: (connection: IConnection) => void): IPoolCluster;
-        on(ev: 'error', callback: (err: IError) => void): IPoolCluster;
-    }
-
-    interface IQuery {
-        /**
-         * The SQL for a constructed query
-         */
-        sql: string;
-
-        /**
-         * Emits a query packet to start the query
-         */
-        start(): void;
-
-        /**
-         * Determines the packet class to use given the first byte of the packet.
-         * 
-         * @param firstByte The first byte of the packet
-         * @param parser The packet parser
-         */
-        determinePacket(firstByte: number, parser: any): any;
-
-        /**
-         * Creates a Readable stream with the given options
-         * 
-         * @param options The options for the stream.
-         */
-        stream(options: IStreamOptions): stream.Readable;
-
-        /**
-         * Pipes a stream downstream, providing automatic pause/resume based on the 
-         * options sent to the stream.
-         * 
-         * @param options The options for the stream.
-         */
-        pipe(callback: (...args: any[]) => void): IQuery;
-
-        on(ev: string, callback: (...args: any[]) => void): IQuery;
-        on(ev: 'error', callback: (err: IError) => void): IQuery;
-        on(ev: 'fields', callback: (fields: any, index: number) => void): IQuery;
-        on(ev: 'result', callback: (row: any, index: number) => void): IQuery;
-        on(ev: 'end', callback: () => void): IQuery;
-    }
-
-    interface IQueryFunction {
-        (sql: string): IQuery;
-        (sql: string, callback: (err: IError, ...args: any[]) => void): IQuery;
-        (sql: string, values: Array<any>): IQuery;
-        (sql: string, values: Array<any>, callback: (err: IError, ...args: any[]) => void): IQuery;
-        (sql: string, values: any): IQuery;
-        (sql: string, values: any, callback: (err: IError, ...args: any[]) => void): IQuery;
-        (options: IQueryOptions): IQuery;
-        (options: IQueryOptions, callback: (err: IError, ...args: any[]) => void): IQuery;
-        (options: IQueryOptions, values: Array<any>): IQuery;
-        (options: IQueryOptions, values: Array<any>, callback: (err: IError, ...args: any[]) => void): IQuery;
-        (options: IQueryOptions, values: any): IQuery;
-        (options: IQueryOptions, values: any, callback: (err: IError, ...args: any[]) => void): IQuery;
-    }
-
-    interface IQueryOptions {
-        /**
-         * The SQL for the query
-         */
-        sql: string;
-
-        /**
-         * Every operation takes an optional inactivity timeout option. This allows you to specify appropriate timeouts for 
-         * operations. It is important to note that these timeouts are not part of the MySQL protocol, and rather timeout 
-         * operations through the client. This means that when a timeout is reached, the connection it occurred on will be 
-         * destroyed and no further operations can be performed.
-         */
-        timeout?: number;
-
-        /**
-         * Either a boolean or string. If true, tables will be nested objects. If string (e.g. '_'), tables will be 
-         * nested as tableName_fieldName
-         */
-        nestTables?: any;
-
-        /**
-         * Determines if column values should be converted to native JavaScript types. It is not recommended (and may go away / change in the future) 
-         * to disable type casting, but you can currently do so on either the connection or query level. (Default: true)
-         * 
-         * You can also specify a function (field: any, next: () => void) => {} to do the type casting yourself.
-         * 
-         * WARNING: YOU MUST INVOKE the parser using one of these three field functions in your custom typeCast callback. They can only be called once.
-         * 
-         * field.string()
-         * field.buffer()
-         * field.geometry()
-         * 
-         * are aliases for
-         * 
-         * parser.parseLengthCodedString()
-         * parser.parseLengthCodedBuffer()
-         * parser.parseGeometryValue()
-         * 
-         * You can find which field function you need to use by looking at: RowDataPacket.prototype._typeCast
-         */
-        typeCast?: any;
-    }
-
-    interface IStreamOptions {
-        /**
-         * Sets the max buffer size in objects of a stream
-         */
-        highWaterMark?: number;
-
-        /**
-         * The object mode of the stream (Default: true)
-         */
-        objectMode?: any;
-    }
-
-    interface IConnectionOptions {
-        /**
-         * The MySQL user to authenticate as
-         */
-        user?: string;
-
-        /**
-         * The password of that MySQL user
-         */
-        password?: string;
-
-        /**
-         * Name of the database to use for this connection
-         */
-        database?: string;
-
-        /**
-         * The charset for the connection. This is called "collation" in the SQL-level of MySQL (like utf8_general_ci). 
-         * If a SQL-level charset is specified (like utf8mb4) then the default collation for that charset is used. 
-         * (Default: 'UTF8_GENERAL_CI')
-         */
-        charset?: string;
-    }
-
-    interface IConnectionConfig extends IConnectionOptions {
-        /**
-         * The hostname of the database you are connecting to. (Default: localhost)
-         */
-        host?: string;
-
-        /**
-         * The port number to connect to. (Default: 3306)
-         */
-        port?: number;
-
-        /**
-         * The source IP address to use for TCP connection
-         */
-        localAddress?: string;
-
-        /**
-         * The path to a unix domain socket to connect to. When used host and port are ignored
-         */
-        socketPath?: string;
-
-        /**
-         * The timezone used to store local dates. (Default: 'local')
-         */
-        timezone?: string;
-
-        /**
-         * The milliseconds before a timeout occurs during the initial connection to the MySQL server. (Default: 10 seconds)
-         */
-        connectTimeout?: number;
-
-        /**
-         * Stringify objects instead of converting to values. (Default: 'false')
-         */
-        stringifyObjects?: boolean;
-
-        /**
-         * Allow connecting to MySQL instances that ask for the old (insecure) authentication method. (Default: false)
-         */
-        insecureAuth?: boolean;
-
-        /**
-         * Determines if column values should be converted to native JavaScript types. It is not recommended (and may go away / change in the future) 
-         * to disable type casting, but you can currently do so on either the connection or query level. (Default: true)
-         * 
-         * You can also specify a function (field: any, next: () => void) => {} to do the type casting yourself.
-         * 
-         * WARNING: YOU MUST INVOKE the parser using one of these three field functions in your custom typeCast callback. They can only be called once.
-         * 
-         * field.string()
-         * field.buffer()
-         * field.geometry()
-         * 
-         * are aliases for
-         * 
-         * parser.parseLengthCodedString()
-         * parser.parseLengthCodedBuffer()
-         * parser.parseGeometryValue()
-         * 
-         * You can find which field function you need to use by looking at: RowDataPacket.prototype._typeCast
-         */
-        typeCast?: any;
-
-        /**
-         * A custom query format function
-         */
-        queryFormat?: (query: string, values: any) => void;
-
-        /**
-         * When dealing with big numbers (BIGINT and DECIMAL columns) in the database, you should enable this option 
-         * (Default: false)
-         */
-        supportBigNumbers?: boolean;
-
-        /**
-         * Enabling both supportBigNumbers and bigNumberStrings forces big numbers (BIGINT and DECIMAL columns) to be 
-         * always returned as JavaScript String objects (Default: false). Enabling supportBigNumbers but leaving 
-         * bigNumberStrings disabled will return big numbers as String objects only when they cannot be accurately 
-         * represented with [JavaScript Number objects] (http://ecma262-5.com/ELS5_HTML.htm#Section_8.5) 
-         * (which happens when they exceed the [-2^53, +2^53] range), otherwise they will be returned as Number objects. 
-         * This option is ignored if supportBigNumbers is disabled.
-         */
-        bigNumberStrings?: boolean;
-
-        /**
-         * Force date types (TIMESTAMP, DATETIME, DATE) to be returned as strings rather then inflated into JavaScript Date 
-         * objects. (Default: false)
-         */
-        dateStrings?: boolean;
-
-        /**
-         * This will print all incoming and outgoing packets on stdout. 
-         * You can also restrict debugging to packet types by passing an array of types (strings) to debug;
-         * 
-         * (Default: false)
-         */
-        debug?: any;
-
-        /**
-         * Generates stack traces on Error to include call site of library entrance ("long stack traces"). Slight 
-         * performance penalty for most calls. (Default: true)
-         */
-        trace?: boolean;
-
-        /**
-         * Allow multiple mysql statements per query. Be careful with this, it exposes you to SQL injection attacks. (Default: false)
-         */
-        multipleStatements?: boolean;
-
-        /**
-         * List of connection flags to use other than the default ones. It is also possible to blacklist default ones
-         */
-        flags?: Array<string>;
-
-        /**
-         * object with ssl parameters or a string containing name of ssl profile
-         */
-        ssl?: any;
-    }
-
-    interface IPoolConfig extends IConnectionConfig {
-        /**
-         * The milliseconds before a timeout occurs during the connection acquisition. This is slightly different from connectTimeout, 
-         * because acquiring a pool connection does not always involve making a connection. (Default: 10 seconds)
-         */
-        acquireTimeout?: number;
-
-        /**
-         * Determines the pool's action when no connections are available and the limit has been reached. If true, the pool will queue 
-         * the connection request and call it when one becomes available. If false, the pool will immediately call back with an error. 
-         * (Default: true)
-         */
-        waitForConnections?: boolean;
-
-        /**
-         * The maximum number of connections to create at once. (Default: 10)
-         */
-        connectionLimit?: number;
-
-        /**
-         * The maximum number of connection requests the pool will queue before returning an error from getConnection. If set to 0, there 
-         * is no limit to the number of queued connection requests. (Default: 0)
-         */
-        queueLimit?: number;
-    }
-
-    interface IPoolClusterConfig {
-        /**
-         * If true, PoolCluster will attempt to reconnect when connection fails. (Default: true)
-         */
-        canRetry?: boolean;
-
-        /**
-         * If connection fails, node's errorCount increases. When errorCount is greater than removeNodeErrorCount, 
-         * remove a node in the PoolCluster. (Default: 5)
-         */
-        removeNodeErrorCount?: number;
-
-        /**
-         * If connection fails, specifies the number of milliseconds before another connection attempt will be made.
-         * If set to 0, then node will be removed instead and never re-used. (Default: 0)
-         */
-        restoreNodeTimeout?: number;
-
-        /**
-         * The default selector. (Default: RR)
-         * RR: Select one alternately. (Round-Robin)
-         * RANDOM: Select the node by random function.
-         * ORDER: Select the first node available unconditionally.
-         */
-        defaultSelector?: string;
-    }
-
-    interface ISslCredentials {
-        /**
-         * A string or buffer holding the PFX or PKCS12 encoded private key, certificate and CA certificates
-         */
-        pfx?: string;
-
-        /**
-         * A string holding the PEM encoded private key
-         */
-        key?: string;
-        
-        /**
-         * A string of passphrase for the private key or pfx
-         */
-        passphrase?: string;
-        
-        /**
-         * A string holding the PEM encoded certificate
-         */
-        cert?: string;
-        
-        /**
-         * Either a string or list of strings of PEM encoded CA certificates to trust.
-         */
-        ca?: Array<string>;
-        
-        /**
-         * Either a string or list of strings of PEM encoded CRLs (Certificate Revocation List)
-         */
-        crl?: Array<string>;
-        
-        /**
-         * A string describing the ciphers to use or exclude
-         */
-        ciphers?: string;
-    }
-
-    interface IError extends Error {
-        /**
-         * Either a MySQL server error (e.g. 'ER_ACCESS_DENIED_ERROR'), 
-         * a node.js error (e.g. 'ECONNREFUSED') or an internal error 
-         * (e.g. 'PROTOCOL_CONNECTION_LOST').
-         */
-        code: string;
-
-        /**
-         * The error number for the error code
-         */
-        errno: number;
-
-        /**
-         * The sql state marker
-         */
-        sqlStateMarker?: string;
-
-        /**
-         * The sql state
-         */
-        sqlState?: string;
-
-        /**
-         * The field count
-         */
-        fieldCount?: number;
-
-        /**
-         * The stack trace for the error
-         */
-        stack?: string;
-
-        /**
-         * Boolean, indicating if this error is terminal to the connection object.
-         */
-        fatal: boolean;
-    }
-}
-
diff --git a/mysql/tsconfig.json b/mysql/tsconfig.json
new file mode 100644
index 0000000000..023135e250
--- /dev/null
+++ b/mysql/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mysql-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/mz/index.d.ts b/mz/index.d.ts
new file mode 100644
index 0000000000..3a1fa74aea
--- /dev/null
+++ b/mz/index.d.ts
@@ -0,0 +1,798 @@
+// Type definitions for mz
+// Project: https://github.com/normalize/mz
+// Definitions by: Thomas Hickman <https://github.com/ThomasHickman>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Modified from the node.js definitions https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/node/node.d.ts
+
+/// <reference types="bluebird" />
+/// <reference types="node" />
+
+
+declare module "mz/fs" {
+    import * as stream from "stream";
+    import * as events from "events";
+
+    interface Stats {
+        isFile(): boolean;
+        isDirectory(): boolean;
+        isBlockDevice(): boolean;
+        isCharacterDevice(): boolean;
+        isSymbolicLink(): boolean;
+        isFIFO(): boolean;
+        isSocket(): boolean;
+        dev: number;
+        ino: number;
+        mode: number;
+        nlink: number;
+        uid: number;
+        gid: number;
+        rdev: number;
+        size: number;
+        blksize: number;
+        blocks: number;
+        atime: Date;
+        mtime: Date;
+        ctime: Date;
+        birthtime: Date;
+    }
+
+    interface FSWatcher extends events.EventEmitter {
+        close(): void;
+    }
+
+    export interface ReadStream extends stream.Readable {
+        close(): void;
+    }
+    export interface WriteStream extends stream.Writable {
+        close(): void;
+        bytesWritten: number;
+    }
+
+    /**
+     * Asynchronous rename.
+     * @param oldPath
+     * @param newPath
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function rename(oldPath: string, newPath: string): Promise<void>;
+
+    /**
+     * Asynchronous rename.
+     * @param oldPath
+     * @param newPath
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function rename(oldPath: string, newPath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    /**
+     * Synchronous rename
+     * @param oldPath
+     * @param newPath
+     */
+    export function renameSync(oldPath: string, newPath: string): void;
+    export function truncate(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function truncate(path: string, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function truncateSync(path: string, len?: number): void;
+    export function ftruncate(fd: number): Promise<void>;
+    export function ftruncate(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function ftruncate(fd: number, len: number): Promise<void>;
+    export function ftruncate(fd: number, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function ftruncateSync(fd: number, len?: number): void;
+    export function chown(path: string, uid: number, gid: number): Promise<void>;
+    export function chown(path: string, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function chownSync(path: string, uid: number, gid: number): void;
+    export function fchown(fd: number, uid: number, gid: number): Promise<void>;
+    export function fchown(fd: number, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function fchownSync(fd: number, uid: number, gid: number): void;
+    export function lchown(path: string, uid: number, gid: number): Promise<void>;
+    export function lchown(path: string, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function lchownSync(path: string, uid: number, gid: number): void;
+    export function chmod(path: string, mode: number): Promise<void>;
+    export function chmod(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function chmod(path: string, mode: string): Promise<void>;
+    export function chmod(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function chmodSync(path: string, mode: number): void;
+    export function chmodSync(path: string, mode: string): void;
+    export function fchmod(fd: number, mode: number): Promise<void>;
+    export function fchmod(fd: number, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function fchmod(fd: number, mode: string): Promise<void>;
+    export function fchmod(fd: number, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function fchmodSync(fd: number, mode: number): void;
+    export function fchmodSync(fd: number, mode: string): void;
+    export function lchmod(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function lchmod(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function lchmodSync(path: string, mode: number): void;
+    export function lchmodSync(path: string, mode: string): void;
+    export function stat(path: string): Promise<Stats>;
+    export function stat(path: string, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
+    export function lstat(path: string): Promise<Stats>;
+    export function lstat(path: string, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
+    export function fstat(fd: number): Promise<Stats>;
+    export function fstat(fd: number, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
+    export function statSync(path: string): Stats;
+    export function lstatSync(path: string): Stats;
+    export function fstatSync(fd: number): Stats;
+    export function link(srcpath: string, dstpath: string): Promise<void>;
+    export function link(srcpath: string, dstpath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function linkSync(srcpath: string, dstpath: string): void;
+    export function symlink(srcpath: string, dstpath: string, type?: string): Promise<void>;
+    export function symlink(srcpath: string, dstpath: string, type?: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function symlinkSync(srcpath: string, dstpath: string, type?: string): void;
+    export function readlink(path: string): Promise<string>;
+    export function readlink(path: string, callback?: (err: NodeJS.ErrnoException, linkString: string) => any): void;
+    export function readlinkSync(path: string): string;
+    export function realpath(path: string): Promise<string>;
+    export function realpath(path: string, callback?: (err: NodeJS.ErrnoException, resolvedPath: string) => any): void;
+    export function realpath(path: string, cache: {[path: string]: string}): Promise<string>;
+    export function realpath(path: string, cache: {[path: string]: string}, callback: (err: NodeJS.ErrnoException, resolvedPath: string) =>any): void;
+    export function realpathSync(path: string, cache?: { [path: string]: string }): string;
+    /*
+     * Asynchronous unlink - deletes the file specified in {path}
+     *
+     * @param path
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function unlink(path: string): Promise<void>;
+    /*
+     * Asynchronous unlink - deletes the file specified in {path}
+     *
+     * @param path
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function unlink(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    /*
+     * Synchronous unlink - deletes the file specified in {path}
+     *
+     * @param path
+     */
+    export function unlinkSync(path: string): void;
+    /*
+     * Asynchronous rmdir - removes the directory specified in {path}
+     *
+     * @param path
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function rmdir(path: string): Promise<void>;
+    /*
+     * Asynchronous rmdir - removes the directory specified in {path}
+     *
+     * @param path
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function rmdir(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    /*
+     * Synchronous rmdir - removes the directory specified in {path}
+     *
+     * @param path
+     */
+    export function rmdirSync(path: string): void;
+    /*
+     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
+     *
+     * @param path
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function mkdir(path: string): Promise<void>;
+    /*
+     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
+     *
+     * @param path
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function mkdir(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    /*
+     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
+     *
+     * @param path
+     * @param mode
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function mkdir(path: string, mode: number): Promise<void>;
+    /*
+     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
+     *
+     * @param path
+     * @param mode
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function mkdir(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    /*
+     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
+     *
+     * @param path
+     * @param mode
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function mkdir(path: string, mode: string): Promise<void>;
+    /*
+     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
+     *
+     * @param path
+     * @param mode
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function mkdir(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    /*
+     * Synchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
+     *
+     * @param path
+     * @param mode
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function mkdirSync(path: string, mode?: number): void;
+    /*
+     * Synchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
+     *
+     * @param path
+     * @param mode
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function mkdirSync(path: string, mode?: string): void;
+    export function readdir(path: string): Promise<string[]>;
+    export function readdir(path: string, callback?: (err: NodeJS.ErrnoException, files: string[]) => void): void;
+    export function readdirSync(path: string): string[];
+    export function close(fd: number): Promise<void>;
+    export function close(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function closeSync(fd: number): void;
+    export function open(path: string, flags: string): Promise<number>;
+    export function open(path: string, flags: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
+    export function open(path: string, flags: string, mode: number): Promise<number>;
+    export function open(path: string, flags: string, mode: number, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
+    export function open(path: string, flags: string, mode: string): Promise<number>;
+    export function open(path: string, flags: string, mode: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
+    export function openSync(path: string, flags: string, mode?: number): number;
+    export function openSync(path: string, flags: string, mode?: string): number;
+    export function utimes(path: string, atime: number, mtime: number): Promise<void>;
+    export function utimes(path: string, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function utimes(path: string, atime: Date, mtime: Date): Promise<void>;
+    export function utimes(path: string, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function utimesSync(path: string, atime: number, mtime: number): void;
+    export function utimesSync(path: string, atime: Date, mtime: Date): void;
+    export function futimes(fd: number, atime: number, mtime: number): Promise<void>;
+    export function futimes(fd: number, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function futimes(fd: number, atime: Date, mtime: Date): Promise<void>;
+    export function futimes(fd: number, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function futimesSync(fd: number, atime: number, mtime: number): void;
+    export function futimesSync(fd: number, atime: Date, mtime: Date): void;
+    export function fsync(fd: number): Promise<void>;
+    export function fsync(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function fsyncSync(fd: number): void;
+    export function write(fd: number, buffer: Buffer, offset: number, length: number, position: number): Promise<[number, Buffer]>;
+    export function write(fd: number, buffer: Buffer, offset: number, length: number, position: number, callback?: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
+    export function write(fd: number, buffer: Buffer, offset: number, length: number): Promise<[number, Buffer]>;
+    export function write(fd: number, buffer: Buffer, offset: number, length: number, callback?: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
+    export function write(fd: number, data: any): Promise<[number, string]>;
+    export function write(fd: number, data: any, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+    export function write(fd: number, data: any, offset: number): Promise<[number, string]>;
+    export function write(fd: number, data: any, offset: number, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+    export function write(fd: number, data: any, offset: number, encoding: string): Promise<[number, string]>;
+    export function write(fd: number, data: any, offset: number, encoding: string, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+    export function writeSync(fd: number, buffer: Buffer, offset: number, length: number, position: number): number;
+    export function read(fd: number, buffer: Buffer, offset: number, length: number, position: number): Promise<[number, Buffer]>;
+    export function read(fd: number, buffer: Buffer, offset: number, length: number, position: number, callback?: (err: NodeJS.ErrnoException, bytesRead: number, buffer: Buffer) => void): void;
+    export function readSync(fd: number, buffer: Buffer, offset: number, length: number, position: number): number;
+    /*
+     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param encoding
+     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     */
+    export function readFile(filename: string, encoding: string): Promise<string>;
+    /*
+     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param encoding
+     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     */
+    export function readFile(filename: string, encoding: string, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
+    /*
+     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
+     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     */
+    export function readFile(filename: string, options: { encoding: string; flag?: string; }): Promise<string>;
+    /*
+     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
+     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     */
+    export function readFile(filename: string, options: { encoding: string; flag?: string; }, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
+    /*
+     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
+     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     */
+    export function readFile(filename: string, options: { flag?: string; }): Promise<Buffer>;
+    /*
+     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
+     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     */
+    export function readFile(filename: string, options: { flag?: string; }, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+    /*
+     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     */
+    export function readFile(filename: string): Promise<Buffer>;
+    /*
+     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     */
+    export function readFile(filename: string, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+    /*
+     * Synchronous readFile - Synchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param encoding
+     */
+    export function readFileSync(filename: string, encoding: string): string;
+    /*
+     * Synchronous readFile - Synchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFileSync returns a string; otherwise it returns a Buffer.
+     */
+    export function readFileSync(filename: string, options: { encoding: string; flag?: string; }): string;
+    /*
+     * Synchronous readFile - Synchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFileSync returns a string; otherwise it returns a Buffer.
+     */
+    export function readFileSync(filename: string, options?: { flag?: string; }): Buffer;
+    export function writeFile(filename: string, data: any): Promise<void>;
+    export function writeFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }): Promise<void>;
+    export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }): Promise<void>;
+    export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
+    export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
+    export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }): Promise<void>;
+    export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }): Promise<void>;
+    export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function appendFile(filename: string, data: any): Promise<void>;
+    export function appendFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
+    export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
+    export function watchFile(filename: string, listener: (curr: Stats, prev: Stats) => void): void;
+    export function watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: (curr: Stats, prev: Stats) => void): void;
+    export function unwatchFile(filename: string, listener?: (curr: Stats, prev: Stats) => void): void;
+    export function watch(filename: string, listener?: (event: string, filename: string) => any): FSWatcher;
+    export function watch(filename: string, options: { persistent?: boolean; }, listener?: (event: string, filename: string) => any): FSWatcher;
+    export function exists(path: string): Promise<boolean>;
+    export function exists(path: string, callback: (err:any, exists: boolean) => void): void;
+    export function existsSync(path: string): boolean;
+    /** Constant for fs.access(). File is visible to the calling process. */
+    export var F_OK: number;
+    /** Constant for fs.access(). File can be read by the calling process. */
+    export var R_OK: number;
+    /** Constant for fs.access(). File can be written by the calling process. */
+    export var W_OK: number;
+    /** Constant for fs.access(). File can be executed by the calling process. */
+    export var X_OK: number;
+    /** Tests a user's permissions for the file specified by path. */
+    export function access(path: string): Promise<void>;
+    /** Tests a user's permissions for the file specified by path. */
+    export function access(path: string, callback: (err: NodeJS.ErrnoException) => void): void;
+    export function access(path: string, mode: number): Promise<void>;
+    export function access(path: string, mode: number, callback: (err: NodeJS.ErrnoException) => void): void;
+    /** Synchronous version of fs.access. This throws if any accessibility checks fail, and does nothing otherwise. */
+    export function accessSync(path: string, mode ?: number): void;
+    export function createReadStream(path: string, options?: {
+        flags?: string;
+        encoding?: string;
+        fd?: number;
+        mode?: number;
+        autoClose?: boolean;
+    }): ReadStream;
+    export function createWriteStream(path: string, options?: {
+        flags?: string;
+        encoding?: string;
+        fd?: number;
+        mode?: number;
+    }): WriteStream;
+}
+
+declare module "mz/dns" {
+    export function lookup(domain: string, family: number): Promise<[string, number]>;
+    export function lookup(domain: string, family: number, callback: (err: Error, address: string, family: number) =>void ): string;
+    export function lookup(domain: string): Promise<[string, number]>;
+    export function lookup(domain: string, callback: (err: Error, address: string, family: number) =>void ): string;
+    export function resolve(domain: string, rrtype: string): Promise<string[]>;
+    export function resolve(domain: string, rrtype: string, callback: (err: Error, addresses: string[]) =>void ): string[];
+    export function resolve(domain: string): Promise<string[]>;
+    export function resolve(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
+    export function resolve4(domain: string): Promise<string[]>;
+    export function resolve4(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
+    export function resolve6(domain: string): Promise<string[]>;
+    export function resolve6(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
+    export function resolveMx(domain: string): Promise<string[]>;
+    export function resolveMx(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
+    export function resolveTxt(domain: string): Promise<string[]>;
+    export function resolveTxt(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
+    export function resolveSrv(domain: string): Promise<string[]>;
+    export function resolveSrv(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
+    export function resolveNs(domain: string): Promise<string[]>;
+    export function resolveNs(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
+    export function resolveCname(domain: string): Promise<string[]>;
+    export function resolveCname(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
+    export function reverse(ip: string): Promise<string[]>;
+    export function reverse(ip: string, callback: (err: Error, domains: string[]) =>void ): string[];
+}
+
+declare module "mz/crypto" {
+    export interface CredentialDetails {
+        pfx: string;
+        key: string;
+        passphrase: string;
+        cert: string;
+        ca: any;    //string | string array
+        crl: any;   //string | string array
+        ciphers: string;
+    }
+    export interface Credentials { context?: any; }
+    export function createCredentials(details: CredentialDetails): Credentials;
+    export function createHash(algorithm: string): Hash;
+    export function createHmac(algorithm: string, key: string): Hmac;
+    export function createHmac(algorithm: string, key: Buffer): Hmac;
+    export interface Hash {
+        update(data: any, input_encoding?: string): Hash;
+        digest(encoding: 'buffer'): Buffer;
+        digest(encoding: string): any;
+        digest(): Buffer;
+    }
+    export interface Hmac extends NodeJS.ReadWriteStream {
+        update(data: any, input_encoding?: string): Hmac;
+        digest(encoding: 'buffer'): Buffer;
+        digest(encoding: string): any;
+        digest(): Buffer;
+    }
+    export function createCipher(algorithm: string, password: any): Cipher;
+    export function createCipheriv(algorithm: string, key: any, iv: any): Cipher;
+    export interface Cipher {
+        update(data: Buffer): Buffer;
+        update(data: string, input_encoding?: string, output_encoding?: string): string;
+        final(): Buffer;
+        final(output_encoding: string): string;
+        setAutoPadding(auto_padding: boolean): void;
+    }
+    export function createDecipher(algorithm: string, password: any): Decipher;
+    export function createDecipheriv(algorithm: string, key: any, iv: any): Decipher;
+    export interface Decipher {
+        update(data: Buffer): Buffer;
+        update(data: string, input_encoding?: string, output_encoding?: string): string;
+        final(): Buffer;
+        final(output_encoding: string): string;
+        setAutoPadding(auto_padding: boolean): void;
+    }
+    export function createSign(algorithm: string): Signer;
+    export interface Signer extends NodeJS.WritableStream {
+        update(data: any): void;
+        sign(private_key: string, output_format: string): string;
+    }
+    export function createVerify(algorith: string): Verify;
+    export interface Verify extends NodeJS.WritableStream {
+        update(data: any): void;
+        verify(object: string, signature: string, signature_format?: string): boolean;
+    }
+    export function createDiffieHellman(prime_length: number): DiffieHellman;
+    export function createDiffieHellman(prime: number, encoding?: string): DiffieHellman;
+    export interface DiffieHellman {
+        generateKeys(encoding?: string): string;
+        computeSecret(other_public_key: string, input_encoding?: string, output_encoding?: string): string;
+        getPrime(encoding?: string): string;
+        getGenerator(encoding: string): string;
+        getPublicKey(encoding?: string): string;
+        getPrivateKey(encoding?: string): string;
+        setPublicKey(public_key: string, encoding?: string): void;
+        setPrivateKey(public_key: string, encoding?: string): void;
+    }
+    export function getDiffieHellman(group_name: string): DiffieHellman;
+    export function pbkdf2(password: string|Buffer, salt: string|Buffer, iterations: number, keylen: number): Promise<Buffer>;
+    export function pbkdf2(password: string|Buffer, salt: string|Buffer, iterations: number, keylen: number, callback: (err: Error, derivedKey: Buffer) => any): void;
+    export function pbkdf2(password: string|Buffer, salt: string|Buffer, iterations: number, keylen: number, digest: string): Promise<Buffer>;
+    export function pbkdf2(password: string|Buffer, salt: string|Buffer, iterations: number, keylen: number, digest: string, callback: (err: Error, derivedKey: Buffer) => any): void;
+    export function pbkdf2Sync(password: string|Buffer, salt: string|Buffer, iterations: number, keylen: number) : Buffer;
+    export function pbkdf2Sync(password: string|Buffer, salt: string|Buffer, iterations: number, keylen: number, digest: string) : Buffer;
+    //export function randomBytes(size: number): Buffer;
+    export function randomBytes(size: number): Promise<Buffer>;
+    //export function randomBytes(size: number): Buffer;
+    export function randomBytes(size: number, callback: (err: Error, buf: Buffer) =>void ): void;
+    //export function pseudoRandomBytes(size: number): Buffer;
+    export function pseudoRandomBytes(size: number): Promise<Buffer>;
+    //export function pseudoRandomBytes(size: number): Buffer;
+    export function pseudoRandomBytes(size: number, callback: (err: Error, buf: Buffer) =>void ): void;
+    export interface RsaPublicKey {
+        key: string;
+        padding?: any;
+    }
+    export interface RsaPrivateKey {
+        key: string;
+        passphrase?: string,
+        padding?: any;
+    }
+    export function publicEncrypt(public_key: string|RsaPublicKey, buffer: Buffer): Buffer
+    export function privateDecrypt(private_key: string|RsaPrivateKey, buffer: Buffer): Buffer
+}
+
+declare module "mz/child_process" {
+    import * as events from "events";
+    import * as stream from "stream";
+
+    export interface ChildProcess extends events.EventEmitter {
+        stdin:  stream.Writable;
+        stdout: stream.Readable;
+        stderr: stream.Readable;
+        stdio: (stream.Readable|stream.Writable)[];
+        pid: number;
+        kill(signal?: string): void;
+        send(message: any, sendHandle?: any): void;
+        disconnect(): void;
+        unref(): void;
+    }
+
+    export function spawn(command: string, args?: string[], options?: {
+        cwd?: string;
+        stdio?: any;
+        custom?: any;
+        env?: any;
+        detached?: boolean;
+    }): ChildProcess;
+    export function exec(command: string, options: {
+        cwd?: string;
+        stdio?: any;
+        customFds?: any;
+        env?: any;
+        encoding?: string;
+        timeout?: number;
+        maxBuffer?: number;
+        killSignal?: string;
+    }): Promise<[Buffer, Buffer]>;
+    export function exec(command: string, options: {
+        cwd?: string;
+        stdio?: any;
+        customFds?: any;
+        env?: any;
+        encoding?: string;
+        timeout?: number;
+        maxBuffer?: number;
+        killSignal?: string;
+    }, callback?: (error: Error, stdout: Buffer, stderr: Buffer) =>void ): ChildProcess;
+    export function exec(command: string): Promise<[Buffer, Buffer]>;
+    export function exec(command: string, callback?: (error: Error, stdout: Buffer, stderr: Buffer) =>void ): ChildProcess;
+    export function execFile(file: string): Promise<[Buffer, Buffer]>;
+    export function execFile(file: string,
+        callback?: (error: Error, stdout: Buffer, stderr: Buffer) =>void ): ChildProcess;
+    export function execFile(file: string, args?: string[]): Promise<[Buffer, Buffer]>;
+    export function execFile(file: string, args?: string[],
+        callback?: (error: Error, stdout: Buffer, stderr: Buffer) =>void ): ChildProcess;
+    export function execFile(file: string, args?: string[], options?: {
+        cwd?: string;
+        stdio?: any;
+        customFds?: any;
+        env?: any;
+        encoding?: string;
+        timeout?: number;
+        maxBuffer?: number;
+        killSignal?: string;
+    }): Promise<[Buffer, Buffer]>;
+    export function execFile(file: string, args?: string[], options?: {
+        cwd?: string;
+        stdio?: any;
+        customFds?: any;
+        env?: any;
+        encoding?: string;
+        timeout?: number;
+        maxBuffer?: number;
+        killSignal?: string;
+    }, callback?: (error: Error, stdout: Buffer, stderr: Buffer) =>void ): ChildProcess;
+    export function fork(modulePath: string, args?: string[], options?: {
+        cwd?: string;
+        env?: any;
+        execPath?: string;
+        execArgv?: string[];
+        silent?: boolean;
+        uid?: number;
+        gid?: number;
+    }): ChildProcess;
+    export function spawnSync(command: string, args?: string[], options?: {
+        cwd?: string;
+        input?: string | Buffer;
+        stdio?: any;
+        env?: any;
+        uid?: number;
+        gid?: number;
+        timeout?: number;
+        maxBuffer?: number;
+        killSignal?: string;
+        encoding?: string;
+    }): {
+        pid: number;
+        output: string[];
+        stdout: string | Buffer;
+        stderr: string | Buffer;
+        status: number;
+        signal: string;
+        error: Error;
+    };
+    export function execSync(command: string, options?: {
+        cwd?: string;
+        input?: string|Buffer;
+        stdio?: any;
+        env?: any;
+        uid?: number;
+        gid?: number;
+        timeout?: number;
+        maxBuffer?: number;
+        killSignal?: string;
+        encoding?: string;
+    }): string | Buffer;
+    export function execFileSync(command: string, args?: string[], options?: {
+        cwd?: string;
+        input?: string|Buffer;
+        stdio?: any;
+        env?: any;
+        uid?: number;
+        gid?: number;
+        timeout?: number;
+        maxBuffer?: number;
+        killSignal?: string;
+        encoding?: string;
+    }): string | Buffer;
+}
+
+
+declare module "mz/zlib" {
+    import * as stream from "stream";
+    export interface ZlibOptions { chunkSize?: number; windowBits?: number; level?: number; memLevel?: number; strategy?: number; dictionary?: any; }
+
+    export interface Gzip extends stream.Transform { }
+    export interface Gunzip extends stream.Transform { }
+    export interface Deflate extends stream.Transform { }
+    export interface Inflate extends stream.Transform { }
+    export interface DeflateRaw extends stream.Transform { }
+    export interface InflateRaw extends stream.Transform { }
+    export interface Unzip extends stream.Transform { }
+
+    export function createGzip(options?: ZlibOptions): Gzip;
+    export function createGunzip(options?: ZlibOptions): Gunzip;
+    export function createDeflate(options?: ZlibOptions): Deflate;
+    export function createInflate(options?: ZlibOptions): Inflate;
+    export function createDeflateRaw(options?: ZlibOptions): DeflateRaw;
+    export function createInflateRaw(options?: ZlibOptions): InflateRaw;
+    export function createUnzip(options?: ZlibOptions): Unzip;
+
+    export function deflate(buf: Buffer): Promise<any>;
+
+    export function deflate(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
+    export function deflateSync(buf: Buffer, options?: ZlibOptions): any;
+    export function deflateRaw(buf: Buffer): Promise<any>;
+    export function deflateRaw(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
+    export function deflateRawSync(buf: Buffer, options?: ZlibOptions): any;
+    export function gzip(buf: Buffer): Promise<any>;
+    export function gzip(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
+    export function gzipSync(buf: Buffer, options?: ZlibOptions): any;
+    export function gunzip(buf: Buffer): Promise<any>;
+    export function gunzip(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
+    export function gunzipSync(buf: Buffer, options?: ZlibOptions): any;
+    export function inflate(buf: Buffer): Promise<any>;
+    export function inflate(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
+    export function inflateSync(buf: Buffer, options?: ZlibOptions): any;
+    export function inflateRaw(buf: Buffer): Promise<any>;
+    export function inflateRaw(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
+    export function inflateRawSync(buf: Buffer, options?: ZlibOptions): any;
+    export function unzip(buf: Buffer): Promise<any>;
+    export function unzip(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
+    export function unzipSync(buf: Buffer, options?: ZlibOptions): any;
+
+    // Constants
+    export var Z_NO_FLUSH: number;
+    export var Z_PARTIAL_FLUSH: number;
+    export var Z_SYNC_FLUSH: number;
+    export var Z_FULL_FLUSH: number;
+    export var Z_FINISH: number;
+    export var Z_BLOCK: number;
+    export var Z_TREES: number;
+    export var Z_OK: number;
+    export var Z_STREAM_END: number;
+    export var Z_NEED_DICT: number;
+    export var Z_ERRNO: number;
+    export var Z_STREAM_ERROR: number;
+    export var Z_DATA_ERROR: number;
+    export var Z_MEM_ERROR: number;
+    export var Z_BUF_ERROR: number;
+    export var Z_VERSION_ERROR: number;
+    export var Z_NO_COMPRESSION: number;
+    export var Z_BEST_SPEED: number;
+    export var Z_BEST_COMPRESSION: number;
+    export var Z_DEFAULT_COMPRESSION: number;
+    export var Z_FILTERED: number;
+    export var Z_HUFFMAN_ONLY: number;
+    export var Z_RLE: number;
+    export var Z_FIXED: number;
+    export var Z_DEFAULT_STRATEGY: number;
+    export var Z_BINARY: number;
+    export var Z_TEXT: number;
+    export var Z_ASCII: number;
+    export var Z_UNKNOWN: number;
+    export var Z_DEFLATED: number;
+    export var Z_NULL: number;
+}
+
+declare module "mz/readline" {
+    import * as events from "events";
+    import * as stream from "stream";
+
+    export interface Key {
+        sequence?: string;
+        name?: string;
+        ctrl?: boolean;
+        meta?: boolean;
+        shift?: boolean;
+    }
+
+    export interface ReadLine extends events.EventEmitter {
+        setPrompt(prompt: string): void;
+        prompt(preserveCursor?: boolean): void;
+        question(query: string, callback: (answer: string) => void): void;
+        question(query: string): Promise<string>;
+        pause(): ReadLine;
+        resume(): ReadLine;
+        close(): void;
+        write(data: string|Buffer, key?: Key): void;
+    }
+
+    export interface Completer {
+        (line: string): Promise<[string[], string]>;
+        (line: string): [string[], string];
+        (line: string, callback: (err: any, result: [string[], string]) => void): any;
+        (line: string, callback: (err: any, result: CompleterResult) => void): any;
+    }
+
+    export interface CompleterResult {
+        completions: string[];
+        line: string;
+    }
+
+    export interface ReadLineOptions {
+        input: NodeJS.ReadableStream;
+        output?: NodeJS.WritableStream;
+        completer?: Completer;
+        terminal?: boolean;
+        historySize?: number;
+    }
+
+    export function createInterface(input: NodeJS.ReadableStream, output?: NodeJS.WritableStream, completer?: Completer, terminal?: boolean): ReadLine;
+    export function createInterface(options: ReadLineOptions): ReadLine;
+
+    export function cursorTo(stream: NodeJS.WritableStream, x: number, y: number): void;
+    export function moveCursor(stream: NodeJS.WritableStream, dx: number|string, dy: number|string): void;
+    export function clearLine(stream: NodeJS.WritableStream, dir: number): void;
+    export function clearScreenDown(stream: NodeJS.WritableStream): void;
+}
+
+
+declare module "mz"{
+    export import child_process = require("mz/child_process");
+    export import crypto = require("mz/child_process")
+    export import dns = require("mz/dns")
+    export import fs = require("mz/fs")
+    export import readline = require("mz/readline")
+    export import zlib = require("mz/zlib")
+}
diff --git a/mz/mz-tests.ts b/mz/mz-tests.ts
index abcff6ac61..f0b4222201 100644
--- a/mz/mz-tests.ts
+++ b/mz/mz-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="../mocha/mocha.d.ts" />
-/// <reference path="../node/node.d.ts" />
-/// <reference path="mz.d.ts" />
+/// <reference types="mocha" />
+/// <reference types="node" />
+
 
 
 import assert = require('assert')
diff --git a/mz/mz.d.ts b/mz/mz.d.ts
deleted file mode 100644
index 8c3206c714..0000000000
--- a/mz/mz.d.ts
+++ /dev/null
@@ -1,798 +0,0 @@
-// Type definitions for mz
-// Project: https://github.com/normalize/mz
-// Definitions by: Thomas Hickman <https://github.com/ThomasHickman>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Modified from the node.js definitions https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/node/node.d.ts
-
-/// <reference path="../bluebird/bluebird.d.ts" />
-/// <reference path="../node/node.d.ts" />
-
-
-declare module "mz/fs" {
-    import * as stream from "stream";
-    import * as events from "events";
-
-    interface Stats {
-        isFile(): boolean;
-        isDirectory(): boolean;
-        isBlockDevice(): boolean;
-        isCharacterDevice(): boolean;
-        isSymbolicLink(): boolean;
-        isFIFO(): boolean;
-        isSocket(): boolean;
-        dev: number;
-        ino: number;
-        mode: number;
-        nlink: number;
-        uid: number;
-        gid: number;
-        rdev: number;
-        size: number;
-        blksize: number;
-        blocks: number;
-        atime: Date;
-        mtime: Date;
-        ctime: Date;
-        birthtime: Date;
-    }
-
-    interface FSWatcher extends events.EventEmitter {
-        close(): void;
-    }
-
-    export interface ReadStream extends stream.Readable {
-        close(): void;
-    }
-    export interface WriteStream extends stream.Writable {
-        close(): void;
-        bytesWritten: number;
-    }
-
-    /**
-     * Asynchronous rename.
-     * @param oldPath
-     * @param newPath
-     * @param callback No arguments other than a possible exception are given to the completion callback.
-     */
-    export function rename(oldPath: string, newPath: string): Promise<void>;
-
-    /**
-     * Asynchronous rename.
-     * @param oldPath
-     * @param newPath
-     * @param callback No arguments other than a possible exception are given to the completion callback.
-     */
-    export function rename(oldPath: string, newPath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    /**
-     * Synchronous rename
-     * @param oldPath
-     * @param newPath
-     */
-    export function renameSync(oldPath: string, newPath: string): void;
-    export function truncate(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function truncate(path: string, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function truncateSync(path: string, len?: number): void;
-    export function ftruncate(fd: number): Promise<void>;
-    export function ftruncate(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function ftruncate(fd: number, len: number): Promise<void>;
-    export function ftruncate(fd: number, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function ftruncateSync(fd: number, len?: number): void;
-    export function chown(path: string, uid: number, gid: number): Promise<void>;
-    export function chown(path: string, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function chownSync(path: string, uid: number, gid: number): void;
-    export function fchown(fd: number, uid: number, gid: number): Promise<void>;
-    export function fchown(fd: number, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function fchownSync(fd: number, uid: number, gid: number): void;
-    export function lchown(path: string, uid: number, gid: number): Promise<void>;
-    export function lchown(path: string, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function lchownSync(path: string, uid: number, gid: number): void;
-    export function chmod(path: string, mode: number): Promise<void>;
-    export function chmod(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function chmod(path: string, mode: string): Promise<void>;
-    export function chmod(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function chmodSync(path: string, mode: number): void;
-    export function chmodSync(path: string, mode: string): void;
-    export function fchmod(fd: number, mode: number): Promise<void>;
-    export function fchmod(fd: number, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function fchmod(fd: number, mode: string): Promise<void>;
-    export function fchmod(fd: number, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function fchmodSync(fd: number, mode: number): void;
-    export function fchmodSync(fd: number, mode: string): void;
-    export function lchmod(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function lchmod(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function lchmodSync(path: string, mode: number): void;
-    export function lchmodSync(path: string, mode: string): void;
-    export function stat(path: string): Promise<Stats>;
-    export function stat(path: string, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
-    export function lstat(path: string): Promise<Stats>;
-    export function lstat(path: string, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
-    export function fstat(fd: number): Promise<Stats>;
-    export function fstat(fd: number, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
-    export function statSync(path: string): Stats;
-    export function lstatSync(path: string): Stats;
-    export function fstatSync(fd: number): Stats;
-    export function link(srcpath: string, dstpath: string): Promise<void>;
-    export function link(srcpath: string, dstpath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function linkSync(srcpath: string, dstpath: string): void;
-    export function symlink(srcpath: string, dstpath: string, type?: string): Promise<void>;
-    export function symlink(srcpath: string, dstpath: string, type?: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function symlinkSync(srcpath: string, dstpath: string, type?: string): void;
-    export function readlink(path: string): Promise<string>;
-    export function readlink(path: string, callback?: (err: NodeJS.ErrnoException, linkString: string) => any): void;
-    export function readlinkSync(path: string): string;
-    export function realpath(path: string): Promise<string>;
-    export function realpath(path: string, callback?: (err: NodeJS.ErrnoException, resolvedPath: string) => any): void;
-    export function realpath(path: string, cache: {[path: string]: string}): Promise<string>;
-    export function realpath(path: string, cache: {[path: string]: string}, callback: (err: NodeJS.ErrnoException, resolvedPath: string) =>any): void;
-    export function realpathSync(path: string, cache?: { [path: string]: string }): string;
-    /*
-     * Asynchronous unlink - deletes the file specified in {path}
-     *
-     * @param path
-     * @param callback No arguments other than a possible exception are given to the completion callback.
-     */
-    export function unlink(path: string): Promise<void>;
-    /*
-     * Asynchronous unlink - deletes the file specified in {path}
-     *
-     * @param path
-     * @param callback No arguments other than a possible exception are given to the completion callback.
-     */
-    export function unlink(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    /*
-     * Synchronous unlink - deletes the file specified in {path}
-     *
-     * @param path
-     */
-    export function unlinkSync(path: string): void;
-    /*
-     * Asynchronous rmdir - removes the directory specified in {path}
-     *
-     * @param path
-     * @param callback No arguments other than a possible exception are given to the completion callback.
-     */
-    export function rmdir(path: string): Promise<void>;
-    /*
-     * Asynchronous rmdir - removes the directory specified in {path}
-     *
-     * @param path
-     * @param callback No arguments other than a possible exception are given to the completion callback.
-     */
-    export function rmdir(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    /*
-     * Synchronous rmdir - removes the directory specified in {path}
-     *
-     * @param path
-     */
-    export function rmdirSync(path: string): void;
-    /*
-     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param callback No arguments other than a possible exception are given to the completion callback.
-     */
-    export function mkdir(path: string): Promise<void>;
-    /*
-     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param callback No arguments other than a possible exception are given to the completion callback.
-     */
-    export function mkdir(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    /*
-     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param mode
-     * @param callback No arguments other than a possible exception are given to the completion callback.
-     */
-    export function mkdir(path: string, mode: number): Promise<void>;
-    /*
-     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param mode
-     * @param callback No arguments other than a possible exception are given to the completion callback.
-     */
-    export function mkdir(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    /*
-     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param mode
-     * @param callback No arguments other than a possible exception are given to the completion callback.
-     */
-    export function mkdir(path: string, mode: string): Promise<void>;
-    /*
-     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param mode
-     * @param callback No arguments other than a possible exception are given to the completion callback.
-     */
-    export function mkdir(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    /*
-     * Synchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param mode
-     * @param callback No arguments other than a possible exception are given to the completion callback.
-     */
-    export function mkdirSync(path: string, mode?: number): void;
-    /*
-     * Synchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param mode
-     * @param callback No arguments other than a possible exception are given to the completion callback.
-     */
-    export function mkdirSync(path: string, mode?: string): void;
-    export function readdir(path: string): Promise<string[]>;
-    export function readdir(path: string, callback?: (err: NodeJS.ErrnoException, files: string[]) => void): void;
-    export function readdirSync(path: string): string[];
-    export function close(fd: number): Promise<void>;
-    export function close(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function closeSync(fd: number): void;
-    export function open(path: string, flags: string): Promise<number>;
-    export function open(path: string, flags: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
-    export function open(path: string, flags: string, mode: number): Promise<number>;
-    export function open(path: string, flags: string, mode: number, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
-    export function open(path: string, flags: string, mode: string): Promise<number>;
-    export function open(path: string, flags: string, mode: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
-    export function openSync(path: string, flags: string, mode?: number): number;
-    export function openSync(path: string, flags: string, mode?: string): number;
-    export function utimes(path: string, atime: number, mtime: number): Promise<void>;
-    export function utimes(path: string, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function utimes(path: string, atime: Date, mtime: Date): Promise<void>;
-    export function utimes(path: string, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function utimesSync(path: string, atime: number, mtime: number): void;
-    export function utimesSync(path: string, atime: Date, mtime: Date): void;
-    export function futimes(fd: number, atime: number, mtime: number): Promise<void>;
-    export function futimes(fd: number, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function futimes(fd: number, atime: Date, mtime: Date): Promise<void>;
-    export function futimes(fd: number, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function futimesSync(fd: number, atime: number, mtime: number): void;
-    export function futimesSync(fd: number, atime: Date, mtime: Date): void;
-    export function fsync(fd: number): Promise<void>;
-    export function fsync(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function fsyncSync(fd: number): void;
-    export function write(fd: number, buffer: Buffer, offset: number, length: number, position: number): Promise<[number, Buffer]>;
-    export function write(fd: number, buffer: Buffer, offset: number, length: number, position: number, callback?: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
-    export function write(fd: number, buffer: Buffer, offset: number, length: number): Promise<[number, Buffer]>;
-    export function write(fd: number, buffer: Buffer, offset: number, length: number, callback?: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
-    export function write(fd: number, data: any): Promise<[number, string]>;
-    export function write(fd: number, data: any, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
-    export function write(fd: number, data: any, offset: number): Promise<[number, string]>;
-    export function write(fd: number, data: any, offset: number, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
-    export function write(fd: number, data: any, offset: number, encoding: string): Promise<[number, string]>;
-    export function write(fd: number, data: any, offset: number, encoding: string, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
-    export function writeSync(fd: number, buffer: Buffer, offset: number, length: number, position: number): number;
-    export function read(fd: number, buffer: Buffer, offset: number, length: number, position: number): Promise<[number, Buffer]>;
-    export function read(fd: number, buffer: Buffer, offset: number, length: number, position: number, callback?: (err: NodeJS.ErrnoException, bytesRead: number, buffer: Buffer) => void): void;
-    export function readSync(fd: number, buffer: Buffer, offset: number, length: number, position: number): number;
-    /*
-     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param encoding
-     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
-     */
-    export function readFile(filename: string, encoding: string): Promise<string>;
-    /*
-     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param encoding
-     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
-     */
-    export function readFile(filename: string, encoding: string, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
-    /*
-     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
-     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
-     */
-    export function readFile(filename: string, options: { encoding: string; flag?: string; }): Promise<string>;
-    /*
-     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
-     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
-     */
-    export function readFile(filename: string, options: { encoding: string; flag?: string; }, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
-    /*
-     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
-     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
-     */
-    export function readFile(filename: string, options: { flag?: string; }): Promise<Buffer>;
-    /*
-     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
-     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
-     */
-    export function readFile(filename: string, options: { flag?: string; }, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
-    /*
-     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
-     */
-    export function readFile(filename: string): Promise<Buffer>;
-    /*
-     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
-     */
-    export function readFile(filename: string, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
-    /*
-     * Synchronous readFile - Synchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param encoding
-     */
-    export function readFileSync(filename: string, encoding: string): string;
-    /*
-     * Synchronous readFile - Synchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFileSync returns a string; otherwise it returns a Buffer.
-     */
-    export function readFileSync(filename: string, options: { encoding: string; flag?: string; }): string;
-    /*
-     * Synchronous readFile - Synchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFileSync returns a string; otherwise it returns a Buffer.
-     */
-    export function readFileSync(filename: string, options?: { flag?: string; }): Buffer;
-    export function writeFile(filename: string, data: any): Promise<void>;
-    export function writeFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
-    export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }): Promise<void>;
-    export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-    export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }): Promise<void>;
-    export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-    export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
-    export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
-    export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }): Promise<void>;
-    export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-    export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }): Promise<void>;
-    export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-    export function appendFile(filename: string, data: any): Promise<void>;
-    export function appendFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
-    export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
-    export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
-    export function watchFile(filename: string, listener: (curr: Stats, prev: Stats) => void): void;
-    export function watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: (curr: Stats, prev: Stats) => void): void;
-    export function unwatchFile(filename: string, listener?: (curr: Stats, prev: Stats) => void): void;
-    export function watch(filename: string, listener?: (event: string, filename: string) => any): FSWatcher;
-    export function watch(filename: string, options: { persistent?: boolean; }, listener?: (event: string, filename: string) => any): FSWatcher;
-    export function exists(path: string): Promise<boolean>;
-    export function exists(path: string, callback: (err:any, exists: boolean) => void): void;
-    export function existsSync(path: string): boolean;
-    /** Constant for fs.access(). File is visible to the calling process. */
-    export var F_OK: number;
-    /** Constant for fs.access(). File can be read by the calling process. */
-    export var R_OK: number;
-    /** Constant for fs.access(). File can be written by the calling process. */
-    export var W_OK: number;
-    /** Constant for fs.access(). File can be executed by the calling process. */
-    export var X_OK: number;
-    /** Tests a user's permissions for the file specified by path. */
-    export function access(path: string): Promise<void>;
-    /** Tests a user's permissions for the file specified by path. */
-    export function access(path: string, callback: (err: NodeJS.ErrnoException) => void): void;
-    export function access(path: string, mode: number): Promise<void>;
-    export function access(path: string, mode: number, callback: (err: NodeJS.ErrnoException) => void): void;
-    /** Synchronous version of fs.access. This throws if any accessibility checks fail, and does nothing otherwise. */
-    export function accessSync(path: string, mode ?: number): void;
-    export function createReadStream(path: string, options?: {
-        flags?: string;
-        encoding?: string;
-        fd?: number;
-        mode?: number;
-        autoClose?: boolean;
-    }): ReadStream;
-    export function createWriteStream(path: string, options?: {
-        flags?: string;
-        encoding?: string;
-        fd?: number;
-        mode?: number;
-    }): WriteStream;
-}
-
-declare module "mz/dns" {
-    export function lookup(domain: string, family: number): Promise<[string, number]>;
-    export function lookup(domain: string, family: number, callback: (err: Error, address: string, family: number) =>void ): string;
-    export function lookup(domain: string): Promise<[string, number]>;
-    export function lookup(domain: string, callback: (err: Error, address: string, family: number) =>void ): string;
-    export function resolve(domain: string, rrtype: string): Promise<string[]>;
-    export function resolve(domain: string, rrtype: string, callback: (err: Error, addresses: string[]) =>void ): string[];
-    export function resolve(domain: string): Promise<string[]>;
-    export function resolve(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
-    export function resolve4(domain: string): Promise<string[]>;
-    export function resolve4(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
-    export function resolve6(domain: string): Promise<string[]>;
-    export function resolve6(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
-    export function resolveMx(domain: string): Promise<string[]>;
-    export function resolveMx(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
-    export function resolveTxt(domain: string): Promise<string[]>;
-    export function resolveTxt(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
-    export function resolveSrv(domain: string): Promise<string[]>;
-    export function resolveSrv(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
-    export function resolveNs(domain: string): Promise<string[]>;
-    export function resolveNs(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
-    export function resolveCname(domain: string): Promise<string[]>;
-    export function resolveCname(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
-    export function reverse(ip: string): Promise<string[]>;
-    export function reverse(ip: string, callback: (err: Error, domains: string[]) =>void ): string[];
-}
-
-declare module "mz/crypto" {
-    export interface CredentialDetails {
-        pfx: string;
-        key: string;
-        passphrase: string;
-        cert: string;
-        ca: any;    //string | string array
-        crl: any;   //string | string array
-        ciphers: string;
-    }
-    export interface Credentials { context?: any; }
-    export function createCredentials(details: CredentialDetails): Credentials;
-    export function createHash(algorithm: string): Hash;
-    export function createHmac(algorithm: string, key: string): Hmac;
-    export function createHmac(algorithm: string, key: Buffer): Hmac;
-    export interface Hash {
-        update(data: any, input_encoding?: string): Hash;
-        digest(encoding: 'buffer'): Buffer;
-        digest(encoding: string): any;
-        digest(): Buffer;
-    }
-    export interface Hmac extends NodeJS.ReadWriteStream {
-        update(data: any, input_encoding?: string): Hmac;
-        digest(encoding: 'buffer'): Buffer;
-        digest(encoding: string): any;
-        digest(): Buffer;
-    }
-    export function createCipher(algorithm: string, password: any): Cipher;
-    export function createCipheriv(algorithm: string, key: any, iv: any): Cipher;
-    export interface Cipher {
-        update(data: Buffer): Buffer;
-        update(data: string, input_encoding?: string, output_encoding?: string): string;
-        final(): Buffer;
-        final(output_encoding: string): string;
-        setAutoPadding(auto_padding: boolean): void;
-    }
-    export function createDecipher(algorithm: string, password: any): Decipher;
-    export function createDecipheriv(algorithm: string, key: any, iv: any): Decipher;
-    export interface Decipher {
-        update(data: Buffer): Buffer;
-        update(data: string, input_encoding?: string, output_encoding?: string): string;
-        final(): Buffer;
-        final(output_encoding: string): string;
-        setAutoPadding(auto_padding: boolean): void;
-    }
-    export function createSign(algorithm: string): Signer;
-    export interface Signer extends NodeJS.WritableStream {
-        update(data: any): void;
-        sign(private_key: string, output_format: string): string;
-    }
-    export function createVerify(algorith: string): Verify;
-    export interface Verify extends NodeJS.WritableStream {
-        update(data: any): void;
-        verify(object: string, signature: string, signature_format?: string): boolean;
-    }
-    export function createDiffieHellman(prime_length: number): DiffieHellman;
-    export function createDiffieHellman(prime: number, encoding?: string): DiffieHellman;
-    export interface DiffieHellman {
-        generateKeys(encoding?: string): string;
-        computeSecret(other_public_key: string, input_encoding?: string, output_encoding?: string): string;
-        getPrime(encoding?: string): string;
-        getGenerator(encoding: string): string;
-        getPublicKey(encoding?: string): string;
-        getPrivateKey(encoding?: string): string;
-        setPublicKey(public_key: string, encoding?: string): void;
-        setPrivateKey(public_key: string, encoding?: string): void;
-    }
-    export function getDiffieHellman(group_name: string): DiffieHellman;
-    export function pbkdf2(password: string|Buffer, salt: string|Buffer, iterations: number, keylen: number): Promise<Buffer>;
-    export function pbkdf2(password: string|Buffer, salt: string|Buffer, iterations: number, keylen: number, callback: (err: Error, derivedKey: Buffer) => any): void;
-    export function pbkdf2(password: string|Buffer, salt: string|Buffer, iterations: number, keylen: number, digest: string): Promise<Buffer>;
-    export function pbkdf2(password: string|Buffer, salt: string|Buffer, iterations: number, keylen: number, digest: string, callback: (err: Error, derivedKey: Buffer) => any): void;
-    export function pbkdf2Sync(password: string|Buffer, salt: string|Buffer, iterations: number, keylen: number) : Buffer;
-    export function pbkdf2Sync(password: string|Buffer, salt: string|Buffer, iterations: number, keylen: number, digest: string) : Buffer;
-    //export function randomBytes(size: number): Buffer;
-    export function randomBytes(size: number): Promise<Buffer>;
-    //export function randomBytes(size: number): Buffer;
-    export function randomBytes(size: number, callback: (err: Error, buf: Buffer) =>void ): void;
-    //export function pseudoRandomBytes(size: number): Buffer;
-    export function pseudoRandomBytes(size: number): Promise<Buffer>;
-    //export function pseudoRandomBytes(size: number): Buffer;
-    export function pseudoRandomBytes(size: number, callback: (err: Error, buf: Buffer) =>void ): void;
-    export interface RsaPublicKey {
-        key: string;
-        padding?: any;
-    }
-    export interface RsaPrivateKey {
-        key: string;
-        passphrase?: string,
-        padding?: any;
-    }
-    export function publicEncrypt(public_key: string|RsaPublicKey, buffer: Buffer): Buffer
-    export function privateDecrypt(private_key: string|RsaPrivateKey, buffer: Buffer): Buffer
-}
-
-declare module "mz/child_process" {
-    import * as events from "events";
-    import * as stream from "stream";
-
-    export interface ChildProcess extends events.EventEmitter {
-        stdin:  stream.Writable;
-        stdout: stream.Readable;
-        stderr: stream.Readable;
-        stdio: (stream.Readable|stream.Writable)[];
-        pid: number;
-        kill(signal?: string): void;
-        send(message: any, sendHandle?: any): void;
-        disconnect(): void;
-        unref(): void;
-    }
-
-    export function spawn(command: string, args?: string[], options?: {
-        cwd?: string;
-        stdio?: any;
-        custom?: any;
-        env?: any;
-        detached?: boolean;
-    }): ChildProcess;
-    export function exec(command: string, options: {
-        cwd?: string;
-        stdio?: any;
-        customFds?: any;
-        env?: any;
-        encoding?: string;
-        timeout?: number;
-        maxBuffer?: number;
-        killSignal?: string;
-    }): Promise<[Buffer, Buffer]>;
-    export function exec(command: string, options: {
-        cwd?: string;
-        stdio?: any;
-        customFds?: any;
-        env?: any;
-        encoding?: string;
-        timeout?: number;
-        maxBuffer?: number;
-        killSignal?: string;
-    }, callback?: (error: Error, stdout: Buffer, stderr: Buffer) =>void ): ChildProcess;
-    export function exec(command: string): Promise<[Buffer, Buffer]>;
-    export function exec(command: string, callback?: (error: Error, stdout: Buffer, stderr: Buffer) =>void ): ChildProcess;
-    export function execFile(file: string): Promise<[Buffer, Buffer]>;
-    export function execFile(file: string,
-        callback?: (error: Error, stdout: Buffer, stderr: Buffer) =>void ): ChildProcess;
-    export function execFile(file: string, args?: string[]): Promise<[Buffer, Buffer]>;
-    export function execFile(file: string, args?: string[],
-        callback?: (error: Error, stdout: Buffer, stderr: Buffer) =>void ): ChildProcess;
-    export function execFile(file: string, args?: string[], options?: {
-        cwd?: string;
-        stdio?: any;
-        customFds?: any;
-        env?: any;
-        encoding?: string;
-        timeout?: number;
-        maxBuffer?: number;
-        killSignal?: string;
-    }): Promise<[Buffer, Buffer]>;
-    export function execFile(file: string, args?: string[], options?: {
-        cwd?: string;
-        stdio?: any;
-        customFds?: any;
-        env?: any;
-        encoding?: string;
-        timeout?: number;
-        maxBuffer?: number;
-        killSignal?: string;
-    }, callback?: (error: Error, stdout: Buffer, stderr: Buffer) =>void ): ChildProcess;
-    export function fork(modulePath: string, args?: string[], options?: {
-        cwd?: string;
-        env?: any;
-        execPath?: string;
-        execArgv?: string[];
-        silent?: boolean;
-        uid?: number;
-        gid?: number;
-    }): ChildProcess;
-    export function spawnSync(command: string, args?: string[], options?: {
-        cwd?: string;
-        input?: string | Buffer;
-        stdio?: any;
-        env?: any;
-        uid?: number;
-        gid?: number;
-        timeout?: number;
-        maxBuffer?: number;
-        killSignal?: string;
-        encoding?: string;
-    }): {
-        pid: number;
-        output: string[];
-        stdout: string | Buffer;
-        stderr: string | Buffer;
-        status: number;
-        signal: string;
-        error: Error;
-    };
-    export function execSync(command: string, options?: {
-        cwd?: string;
-        input?: string|Buffer;
-        stdio?: any;
-        env?: any;
-        uid?: number;
-        gid?: number;
-        timeout?: number;
-        maxBuffer?: number;
-        killSignal?: string;
-        encoding?: string;
-    }): string | Buffer;
-    export function execFileSync(command: string, args?: string[], options?: {
-        cwd?: string;
-        input?: string|Buffer;
-        stdio?: any;
-        env?: any;
-        uid?: number;
-        gid?: number;
-        timeout?: number;
-        maxBuffer?: number;
-        killSignal?: string;
-        encoding?: string;
-    }): string | Buffer;
-}
-
-
-declare module "mz/zlib" {
-    import * as stream from "stream";
-    export interface ZlibOptions { chunkSize?: number; windowBits?: number; level?: number; memLevel?: number; strategy?: number; dictionary?: any; }
-
-    export interface Gzip extends stream.Transform { }
-    export interface Gunzip extends stream.Transform { }
-    export interface Deflate extends stream.Transform { }
-    export interface Inflate extends stream.Transform { }
-    export interface DeflateRaw extends stream.Transform { }
-    export interface InflateRaw extends stream.Transform { }
-    export interface Unzip extends stream.Transform { }
-
-    export function createGzip(options?: ZlibOptions): Gzip;
-    export function createGunzip(options?: ZlibOptions): Gunzip;
-    export function createDeflate(options?: ZlibOptions): Deflate;
-    export function createInflate(options?: ZlibOptions): Inflate;
-    export function createDeflateRaw(options?: ZlibOptions): DeflateRaw;
-    export function createInflateRaw(options?: ZlibOptions): InflateRaw;
-    export function createUnzip(options?: ZlibOptions): Unzip;
-
-    export function deflate(buf: Buffer): Promise<any>;
-
-    export function deflate(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
-    export function deflateSync(buf: Buffer, options?: ZlibOptions): any;
-    export function deflateRaw(buf: Buffer): Promise<any>;
-    export function deflateRaw(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
-    export function deflateRawSync(buf: Buffer, options?: ZlibOptions): any;
-    export function gzip(buf: Buffer): Promise<any>;
-    export function gzip(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
-    export function gzipSync(buf: Buffer, options?: ZlibOptions): any;
-    export function gunzip(buf: Buffer): Promise<any>;
-    export function gunzip(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
-    export function gunzipSync(buf: Buffer, options?: ZlibOptions): any;
-    export function inflate(buf: Buffer): Promise<any>;
-    export function inflate(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
-    export function inflateSync(buf: Buffer, options?: ZlibOptions): any;
-    export function inflateRaw(buf: Buffer): Promise<any>;
-    export function inflateRaw(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
-    export function inflateRawSync(buf: Buffer, options?: ZlibOptions): any;
-    export function unzip(buf: Buffer): Promise<any>;
-    export function unzip(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
-    export function unzipSync(buf: Buffer, options?: ZlibOptions): any;
-
-    // Constants
-    export var Z_NO_FLUSH: number;
-    export var Z_PARTIAL_FLUSH: number;
-    export var Z_SYNC_FLUSH: number;
-    export var Z_FULL_FLUSH: number;
-    export var Z_FINISH: number;
-    export var Z_BLOCK: number;
-    export var Z_TREES: number;
-    export var Z_OK: number;
-    export var Z_STREAM_END: number;
-    export var Z_NEED_DICT: number;
-    export var Z_ERRNO: number;
-    export var Z_STREAM_ERROR: number;
-    export var Z_DATA_ERROR: number;
-    export var Z_MEM_ERROR: number;
-    export var Z_BUF_ERROR: number;
-    export var Z_VERSION_ERROR: number;
-    export var Z_NO_COMPRESSION: number;
-    export var Z_BEST_SPEED: number;
-    export var Z_BEST_COMPRESSION: number;
-    export var Z_DEFAULT_COMPRESSION: number;
-    export var Z_FILTERED: number;
-    export var Z_HUFFMAN_ONLY: number;
-    export var Z_RLE: number;
-    export var Z_FIXED: number;
-    export var Z_DEFAULT_STRATEGY: number;
-    export var Z_BINARY: number;
-    export var Z_TEXT: number;
-    export var Z_ASCII: number;
-    export var Z_UNKNOWN: number;
-    export var Z_DEFLATED: number;
-    export var Z_NULL: number;
-}
-
-declare module "mz/readline" {
-    import * as events from "events";
-    import * as stream from "stream";
-
-    export interface Key {
-        sequence?: string;
-        name?: string;
-        ctrl?: boolean;
-        meta?: boolean;
-        shift?: boolean;
-    }
-
-    export interface ReadLine extends events.EventEmitter {
-        setPrompt(prompt: string): void;
-        prompt(preserveCursor?: boolean): void;
-        question(query: string, callback: (answer: string) => void): void;
-        question(query: string): Promise<string>;
-        pause(): ReadLine;
-        resume(): ReadLine;
-        close(): void;
-        write(data: string|Buffer, key?: Key): void;
-    }
-
-    export interface Completer {
-        (line: string): Promise<[string[], string]>;
-        (line: string): [string[], string];
-        (line: string, callback: (err: any, result: [string[], string]) => void): any;
-        (line: string, callback: (err: any, result: CompleterResult) => void): any;
-    }
-
-    export interface CompleterResult {
-        completions: string[];
-        line: string;
-    }
-
-    export interface ReadLineOptions {
-        input: NodeJS.ReadableStream;
-        output?: NodeJS.WritableStream;
-        completer?: Completer;
-        terminal?: boolean;
-        historySize?: number;
-    }
-
-    export function createInterface(input: NodeJS.ReadableStream, output?: NodeJS.WritableStream, completer?: Completer, terminal?: boolean): ReadLine;
-    export function createInterface(options: ReadLineOptions): ReadLine;
-
-    export function cursorTo(stream: NodeJS.WritableStream, x: number, y: number): void;
-    export function moveCursor(stream: NodeJS.WritableStream, dx: number|string, dy: number|string): void;
-    export function clearLine(stream: NodeJS.WritableStream, dir: number): void;
-    export function clearScreenDown(stream: NodeJS.WritableStream): void;
-}
-
-
-declare module "mz"{
-    export import child_process = require("mz/child_process");
-    export import crypto = require("mz/child_process")
-    export import dns = require("mz/dns")
-    export import fs = require("mz/fs")
-    export import readline = require("mz/readline")
-    export import zlib = require("mz/zlib")
-}
diff --git a/mz/tsconfig.json b/mz/tsconfig.json
new file mode 100644
index 0000000000..a23f381107
--- /dev/null
+++ b/mz/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "mz-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/nanoajax/index.d.ts b/nanoajax/index.d.ts
new file mode 100644
index 0000000000..a94f07203b
--- /dev/null
+++ b/nanoajax/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for nanoajax v0.2.4
+// Project: https://github.com/yanatan16/nanoajax
+// Definitions by: Nathan Cahill <https://github.com/nathancahill/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface RequestParameters {
+    url: string;
+    headers?: { [key: string]: string; };
+    body?: string | FormData;
+    method?: string;
+    cors?: boolean;
+}
+
+interface Callback {
+    (statusCode: number, response: string, request: XMLHttpRequest): any
+}
+
+export declare function ajax(params: RequestParameters, callback: Callback): XMLHttpRequest
diff --git a/nanoajax/nanoajax-tests.ts b/nanoajax/nanoajax-tests.ts
index f02c1c854a..a6ee194ab8 100644
--- a/nanoajax/nanoajax-tests.ts
+++ b/nanoajax/nanoajax-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./nanoajax.d.ts" />
 
 import * as nanoajax from 'nanoajax';
 
diff --git a/nanoajax/nanoajax.d.ts b/nanoajax/nanoajax.d.ts
deleted file mode 100644
index bd068e2bc9..0000000000
--- a/nanoajax/nanoajax.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Type definitions for nanoajax v0.2.4
-// Project: https://github.com/yanatan16/nanoajax
-// Definitions by: Nathan Cahill <https://github.com/nathancahill/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'nanoajax' {
-    interface RequestParameters {
-        url: string;
-        headers?: { [key: string]: string; };
-        body?: string|FormData;
-        method?: string;
-        cors?: boolean;
-    }
-
-    interface Callback {
-        (statusCode: number, response: string, request: XMLHttpRequest): any
-    }
-
-    export function ajax(params: RequestParameters, callback: Callback): XMLHttpRequest
-}
diff --git a/nanoajax/tsconfig.json b/nanoajax/tsconfig.json
new file mode 100644
index 0000000000..8aaad59c20
--- /dev/null
+++ b/nanoajax/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "nanoajax-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/natural-sort/index.d.ts b/natural-sort/index.d.ts
new file mode 100644
index 0000000000..4e929d4edc
--- /dev/null
+++ b/natural-sort/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for NaturalSort
+// Project: https://github.com/studio-b12/natural-sort
+// Definitions by: Antonio Morales <https://github.com/a-morales>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace naturalSort;
+
+declare function naturalSort<T>(a: T, b: T): number;
+export = naturalSort;
diff --git a/natural-sort/natural-sort-tests.ts b/natural-sort/natural-sort-tests.ts
index d380ca51b0..b336542520 100644
--- a/natural-sort/natural-sort-tests.ts
+++ b/natural-sort/natural-sort-tests.ts
@@ -1,6 +1,5 @@
-/// <reference path="./natural-sort.d.ts" />
 
-import naturalSort = require("naturalSort");
+import naturalSort = require("natural-sort");
 
 [5, 3, 2, 4, 1].sort(naturalSort);
 ["a", "c", "b", "z", "w", "l"].sort(naturalSort);
diff --git a/natural-sort/natural-sort.d.ts b/natural-sort/natural-sort.d.ts
deleted file mode 100644
index a37a64ce91..0000000000
--- a/natural-sort/natural-sort.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for NaturalSort
-// Project: https://github.com/studio-b12/natural-sort
-// Definitions by: Antonio Morales <https://github.com/a-morales>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "naturalSort" {
-  function naturalSort<T>(a: T, b: T): number;
-  export = naturalSort;
-}
diff --git a/natural-sort/tsconfig.json b/natural-sort/tsconfig.json
new file mode 100644
index 0000000000..1a2fb6b8fa
--- /dev/null
+++ b/natural-sort/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "natural-sort-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/natural/index.d.ts b/natural/index.d.ts
new file mode 100644
index 0000000000..e0a3889bf4
--- /dev/null
+++ b/natural/index.d.ts
@@ -0,0 +1,191 @@
+// Type definitions for Natural 0.2.1
+// Project: https://github.com/NaturalNode/natural
+// Definitions by: Dylan R. E. Moonfire <https://github.com/dmoonfire/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+import events = require("events");
+
+interface Tokenizer {
+    tokenize(text: string): string[];
+}
+declare class WordTokenizer implements Tokenizer {
+    tokenize(text: string): string[];
+}
+declare class AggressiveTokenizer implements Tokenizer {
+    tokenize(text: string): string[];
+}
+declare class TreebankWordTokenizer implements Tokenizer {
+    tokenize(text: string): string[];
+}
+interface RegexTokenizerOptions {
+    pattern: RegExp;
+    discardEmpty?: boolean;
+}
+declare class RegexpTokenizer implements Tokenizer {
+    constructor(options: RegexTokenizerOptions);
+    tokenize(text: string): string[];
+}
+declare class WordPunctTokenizer implements Tokenizer {
+    tokenize(text: string): string[];
+}
+
+declare function JaroWinklerDistance(s1: string, s2: string, dt?: number): number;
+declare function LevenshteinDistance(source: string, target: string, options?: any): number;
+declare function DiceCoefficient(str1: string, str2: string): number;
+
+interface Stemmer {
+    stem(token: string): string;
+}
+declare var PorterStemmer: {
+    stem(token: string): string;
+}
+declare var PorterStemmerRu: {
+    stem(token: string): string;
+}
+declare var PorterStemmerEs: {
+    stem(token: string): string;
+}
+declare var PorterStemmerFa: {
+    stem(token: string): string;
+}
+declare var PorterStemmerFr: {
+    stem(token: string): string;
+}
+declare var PorterStemmerIt: {
+    stem(token: string): string;
+}
+declare var PorterStemmerNo: {
+    stem(token: string): string;
+}
+declare var PorterStemmerPt: {
+    stem(token: string): string;
+}
+declare var LancasterStemmer: {
+    stem(token: string): string;
+}
+
+interface BayesClassifierCallback { (err: any, classifier: any): void }
+declare class BayesClassifier {
+    events: events.EventEmitter;
+    addDocument(text: string, stem: string): void;
+    addDocument(text: string[], stem: string): void;
+    train(): void;
+    classify(observation: string): string;
+    getClassifications(observation: string): string[];
+    save(filename: string, callback: BayesClassifierCallback): void;
+    static load(filename: string, stemmer: Stemmer, callback: BayesClassifierCallback): void;
+    static restore(classifier: any, stemmer?: Stemmer): BayesClassifier;
+}
+
+interface Phonetic {
+    compare(stringA: string, stringB: string): boolean;
+    process(token: string, maxLength?: number): string;
+}
+declare var Metaphone: {
+    compare(stringA: string, stringB: string): boolean;
+    process(token: string, maxLength?: number): string;
+};
+declare var SoundEx: {
+    compare(stringA: string, stringB: string): boolean;
+    process(token: string, maxLength?: number): string;
+};
+declare var DoubleMetaphone: {
+    compare(stringA: string, stringB: string): boolean;
+    process(token: string, maxLength?: number): string[];
+};
+
+declare class NounInflector {
+    pluralize(token: string): string;
+    singularize(token: string): string;
+}
+declare var CountInflector: {
+    nth(i: number): string;
+}
+declare class PresentVerbInflector {
+    pluralize(token: string): string;
+    singularize(token: string): string;
+}
+declare var NGrams: {
+    bigrams(sequence: string, startSymbol?: string, endSymbol?: string): string[][];
+    bigrams(sequence: string[], startSymbol?: string, endSymbol?: string): string[][];
+    trigrams(sequence: string, startSymbol?: string, endSymbol?: string): string[][];
+    trigrams(sequence: string[], startSymbol?: string, endSymbol?: string): string[][];
+    ngrams(sequence: string, n: number, startSymbol?: string, endSymbol?: string): string[][];
+    ngrams(sequence: string[], n: number, startSymbol?: string, endSymbol?: string): string[][];
+}
+declare var NGramsZH: {
+    bigrams(sequence: string, startSymbol?: string, endSymbol?: string): string[][];
+    bigrams(sequence: string[], startSymbol?: string, endSymbol?: string): string[][];
+    trigrams(sequence: string, startSymbol?: string, endSymbol?: string): string[][];
+    trigrams(sequence: string[], startSymbol?: string, endSymbol?: string): string[][];
+    ngrams(sequence: string, n: number, startSymbol?: string, endSymbol?: string): string[][];
+    ngrams(sequence: string[], n: number, startSymbol?: string, endSymbol?: string): string[][];
+}
+
+interface TfIdfCallback { (i: number, measure: number): void }
+interface TfIdfTerm {
+    term: string;
+    tfidf: number;
+}
+declare class TfIdf {
+    constructor(deserialized?: any);
+    addDocument(document: string, key?: string, restoreCache?: boolean): void;
+    addDocument(document: string[], key?: string, restoreCache?: boolean): void;
+    addFileSync(path: string, encoding?: string, key?: string, restoreCache?: boolean): void;
+    tfidf(terms: string, d: number): void;
+    tfidfs(terms: string, callback: TfIdfCallback): void;
+    tfidfs(terms: string[], callback: TfIdfCallback): void;
+    listTerms(d: number): TfIdfTerm[];
+}
+
+declare class Trie {
+    constructor(caseSensitive?: boolean);
+    addString(text: string): boolean;
+    addStrings(strings: string[]): void;
+    contains(token: string): boolean;
+    findPrefix(text: string): string[];
+    findMatchesOnPath(text: string): string[];
+    keysWithPrefix(text: string): string[];
+}
+
+declare class EdgeWeightedDigraph {
+    add(start: number, end: number, weight: number): void;
+    v(): number;
+    e(): number;
+}
+declare class ShortestPathTree {
+    constructor(diagraph: EdgeWeightedDigraph, startVertex: number);
+    getDistTo(vertex: number): number;
+    hasDistTo(vertex: number): boolean;
+    pathTo(vertex: number): number[];
+}
+declare class LongestPathTree {
+    constructor(diagraph: EdgeWeightedDigraph, startVertex: number);
+    getDistTo(vertex: number): number;
+    hasDistTo(vertex: number): boolean;
+    pathTo(vertex: number): number[];
+}
+
+interface WordNetLookupResults {
+    synsetOffset: number;
+    pos: string;
+    lemma: string;
+    synonyms: string[];
+    gloss: string;
+}
+interface WordNetLookupCallback { (results: WordNetLookupResults[]): void }
+interface WordNetGetCallback { (results: WordNetLookupResults): void }
+declare class WordNet {
+    constructor(filename?: string);
+    lookup(word: string, callback: WordNetLookupCallback): void;
+    get(synsetOffset: number, pos: string, callback: WordNetGetCallback): void;
+}
+
+declare class Spellcheck {
+    constructor(wordlist: string[]);
+    isCorrect(word: string): boolean;
+    getCorrections(word: string, maxDistance?: number): string[];
+}
diff --git a/natural/natural-tests.ts b/natural/natural-tests.ts
index 29e38d59a2..c8650c6308 100644
--- a/natural/natural-tests.ts
+++ b/natural/natural-tests.ts
@@ -3,7 +3,6 @@
 // Definitions by: Dylan R. E. Moonfire <https://github.com/dmoonfire/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="natural.d.ts" />
 
 import natural = require('natural');
 
diff --git a/natural/natural.d.ts b/natural/natural.d.ts
deleted file mode 100644
index ff519eeccf..0000000000
--- a/natural/natural.d.ts
+++ /dev/null
@@ -1,192 +0,0 @@
-// Type definitions for Natural 0.2.1
-// Project: https://github.com/NaturalNode/natural
-// Definitions by: Dylan R. E. Moonfire <https://github.com/dmoonfire/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare module "natural" {
-  import events = require("events");
-
-  interface Tokenizer {
-    tokenize(text: string): string[];
-  }
-  class WordTokenizer implements Tokenizer {
-    tokenize(text: string): string[];
-  }
-  class AggressiveTokenizer implements Tokenizer {
-    tokenize(text: string): string[];
-  }
-  class TreebankWordTokenizer implements Tokenizer {
-    tokenize(text: string): string[];
-  }
-  interface RegexTokenizerOptions {
-    pattern: RegExp;
-    discardEmpty?: boolean;
-  }
-  class RegexpTokenizer implements Tokenizer {
-    constructor(options: RegexTokenizerOptions);
-    tokenize(text: string): string[];
-  }
-  class WordPunctTokenizer implements Tokenizer {
-    tokenize(text: string): string[];
-  }
-
-  function JaroWinklerDistance(s1: string, s2: string, dt?: number): number;
-  function LevenshteinDistance(source: string, target: string, options?: any): number;
-  function DiceCoefficient(str1: string, str2: string): number;
-
-  interface Stemmer {
-    stem(token: string): string;
-  }
-  var PorterStemmer: {
-    stem(token: string): string;
-  }
-  var PorterStemmerRu: {
-    stem(token: string): string;
-  }
-  var PorterStemmerEs: {
-    stem(token: string): string;
-  }
-  var PorterStemmerFa: {
-    stem(token: string): string;
-  }
-  var PorterStemmerFr: {
-    stem(token: string): string;
-  }
-  var PorterStemmerIt: {
-    stem(token: string): string;
-  }
-  var PorterStemmerNo: {
-    stem(token: string): string;
-  }
-  var PorterStemmerPt: {
-    stem(token: string): string;
-  }
-  var LancasterStemmer: {
-    stem(token: string): string;
-  }
-
-  interface BayesClassifierCallback { (err: any, classifier: any): void }
-  class BayesClassifier {
-    events: events.EventEmitter;
-    addDocument(text: string, stem: string): void;
-    addDocument(text: string[], stem: string): void;
-    train(): void;
-    classify(observation: string): string;
-    getClassifications(observation: string): string[];
-    save(filename: string, callback: BayesClassifierCallback): void;
-    static load(filename: string, stemmer: Stemmer, callback: BayesClassifierCallback): void;
-    static restore(classifier: any, stemmer?: Stemmer): BayesClassifier;
-  }
-
-  interface Phonetic {
-    compare(stringA: string, stringB: string): boolean;
-    process(token: string, maxLength?: number): string;
-  }
-  var Metaphone: {
-    compare(stringA: string, stringB: string): boolean;
-    process(token: string, maxLength?: number): string;
-  };
-  var SoundEx: {
-    compare(stringA: string, stringB: string): boolean;
-    process(token: string, maxLength?: number): string;
-  };
-  var DoubleMetaphone: {
-    compare(stringA: string, stringB: string): boolean;
-    process(token: string, maxLength?: number): string[];
-  };
-
-  class NounInflector {
-    pluralize(token: string): string;
-    singularize(token: string): string;
-  }
-  var CountInflector: {
-    nth(i: number): string;
-  }
-  class PresentVerbInflector {
-    pluralize(token: string): string;
-    singularize(token: string): string;
-  }
-  var NGrams: {
-    bigrams(sequence: string, startSymbol?: string, endSymbol?: string): string[][];
-    bigrams(sequence: string[], startSymbol?: string, endSymbol?: string): string[][];
-    trigrams(sequence: string, startSymbol?: string, endSymbol?: string): string[][];
-    trigrams(sequence: string[], startSymbol?: string, endSymbol?: string): string[][];
-    ngrams(sequence: string, n: number, startSymbol?: string, endSymbol?: string): string[][];
-    ngrams(sequence: string[], n: number, startSymbol?: string, endSymbol?: string): string[][];
-  }
-  var NGramsZH: {
-    bigrams(sequence: string, startSymbol?: string, endSymbol?: string): string[][];
-    bigrams(sequence: string[], startSymbol?: string, endSymbol?: string): string[][];
-    trigrams(sequence: string, startSymbol?: string, endSymbol?: string): string[][];
-    trigrams(sequence: string[], startSymbol?: string, endSymbol?: string): string[][];
-    ngrams(sequence: string, n: number, startSymbol?: string, endSymbol?: string): string[][];
-    ngrams(sequence: string[], n: number, startSymbol?: string, endSymbol?: string): string[][];
-  }
-
-  interface TfIdfCallback { (i: number, measure: number): void }
-  interface TfIdfTerm {
-    term: string;
-    tfidf: number;
-  }
-  class TfIdf {
-    constructor(deserialized?: any);
-    addDocument(document: string, key?: string, restoreCache?: boolean): void;
-    addDocument(document: string[], key?: string, restoreCache?: boolean): void;
-    addFileSync(path: string, encoding?: string, key?: string, restoreCache?: boolean): void;
-    tfidf(terms: string, d: number): void;
-    tfidfs(terms: string, callback: TfIdfCallback): void;
-    tfidfs(terms: string[], callback: TfIdfCallback): void;
-    listTerms(d: number): TfIdfTerm[];
-  }
-
-  class Trie {
-    constructor(caseSensitive?: boolean);
-    addString(text: string): boolean;
-    addStrings(strings: string[]): void;
-    contains(token: string): boolean;
-    findPrefix(text: string): string[];
-    findMatchesOnPath(text: string): string[];
-    keysWithPrefix(text: string): string[];
-  }
-
-  class EdgeWeightedDigraph {
-    add(start: number, end: number, weight: number): void;
-    v(): number;
-    e(): number;
-  }
-  class ShortestPathTree {
-    constructor(diagraph: EdgeWeightedDigraph, startVertex: number);
-    getDistTo(vertex: number): number;
-    hasDistTo(vertex: number): boolean;
-    pathTo(vertex: number): number[];
-  }
-  class LongestPathTree {
-    constructor(diagraph: EdgeWeightedDigraph, startVertex: number);
-    getDistTo(vertex: number): number;
-    hasDistTo(vertex: number): boolean;
-    pathTo(vertex: number): number[];
-  }
-
-  interface WordNetLookupResults {
-    synsetOffset: number;
-    pos: string;
-    lemma: string;
-    synonyms: string[];
-    gloss: string;
-  }
-  interface WordNetLookupCallback { (results: WordNetLookupResults[]): void }
-  interface WordNetGetCallback { (results: WordNetLookupResults): void }
-  class WordNet {
-    constructor(filename?: string);
-    lookup(word: string, callback: WordNetLookupCallback): void;
-    get(synsetOffset: number, pos: string, callback: WordNetGetCallback): void;
-  }
-
-  class Spellcheck {
-    constructor(wordlist: string[]);
-    isCorrect(word: string): boolean;
-    getCorrections(word: string, maxDistance?: number): string[];
-  }
-}
diff --git a/natural/tsconfig.json b/natural/tsconfig.json
new file mode 100644
index 0000000000..ea6783e16f
--- /dev/null
+++ b/natural/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "natural-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/navigation/index.d.ts b/navigation/index.d.ts
new file mode 100644
index 0000000000..3e4107983a
--- /dev/null
+++ b/navigation/index.d.ts
@@ -0,0 +1,601 @@
+// Type definitions for Navigation 2.0.0
+// Project: http://grahammendick.github.io/navigation/
+// Definitions by: Graham Mendick <https://github.com/grahammendick>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+export = Navigation;
+
+declare namespace Navigation {
+    /**
+     * Defines a contract a class must implement in order to configure a State
+     */
+    interface StateInfo {
+        /**
+         * Gets the unique key
+         */
+        key: string;
+        /**
+         * Gets the default NavigationData for this State
+         */
+        defaults?: any;
+        /**
+         * Gets the default NavigationData Types for  this State
+         */
+        defaultTypes?: any;
+        /**
+         * Gets the textual description of the state
+         */
+        title?: string;
+        /**
+         * Gets the route Url patterns
+         */
+        route?: string | string[];
+        /**
+         * Gets a value that indicates whether to maintain the crumb trail 
+         */
+        trackCrumbTrail?: boolean | string;
+        /**
+         * Gets a value that indicates whether NavigationData Types are
+         * preserved when navigating
+         */
+        trackTypes?: boolean;
+        /**
+         * Gets the additional state attributes
+         */
+        [extras: string]: any;
+    }
+
+    /**
+     * Represents a view and is the destination of a navigation
+     */
+    class State implements StateInfo {
+        /**
+         * Gets the unique key
+         */
+        key: string;
+        /**
+         * Gets the default NavigationData for this State
+         */
+        defaults: any;
+        /**
+         * Gets the default NavigationData Types for  this State
+         */
+        defaultTypes: any;
+        /**
+         * Gets the formatted default NavigationData for this State
+         */
+        formattedDefaults: any;
+        /**
+         * Gets the formatted default array NavigationData for this State
+         */
+        formattedArrayDefaults: { [index: string]: string[]; };
+        /**
+         * Gets the textual description of the state
+         */
+        title: string;
+        /**
+         * Gets the route Url patterns
+         */
+        route: string | string[];
+        /**
+         * Gets a value that indicates whether to maintain the crumb trail 
+         */
+        trackCrumbTrail: boolean;
+        /**
+         * Gets the crumb trail key
+         */
+        crumbTrailKey: string;
+        /**
+         * Gets a value that indicates whether NavigationData Types are
+         * preserved when navigating
+         */
+        trackTypes: boolean;
+        /**
+         * Gets the additional state attributes
+         */
+        [extras: string]: any;        
+        /**
+         * Called on the old State before navigating to a different State
+         * @param state The new State
+         * @param data The new NavigationData
+         * @param url The new target location
+         * @param unload The function to call to continue to navigate
+         * @param history A value indicating whether browser history was used
+         */
+        unloading: (state: State, data: any, url: string, unload: () => void, history?: boolean) => void;
+        /**
+         * Called on the old State after navigating to a different State
+         */
+        dispose: () => void;
+        /**
+         * Called on the current State after navigating to it
+         * @param data The current NavigationData
+         * @param asyncData The data passed asynchronously while navigating
+         */
+        navigated: (data: any, asyncData?: any) => void;
+        /**
+         * Called on the new State before navigating to it
+         * @param data The new NavigationData
+         * @param url The new target location
+         * @param navigate The function to call to continue to navigate
+         * @param history A value indicating whether browser history was used
+         */
+        navigating: (data: any, url: string, navigate: (asyncData?: any) => void, history: boolean) => void;
+        /**
+         * Encodes the Url value
+         * @param state The State navigated to
+         * @param key The key of the navigation data item
+         * @param val The Url value of the navigation data item
+         * @param queryString A value indicating the Url value's location
+         */
+        urlEncode(state: State, key: string, val: string, queryString: boolean): string;
+        /**
+         * Decodes the Url value
+         * @param state The State navigated to
+         * @param key The key of the navigation data item
+         * @param val The Url value of the navigation data item
+         * @param queryString A value indicating the Url value's location
+         */
+        urlDecode(state: State, key: string, val: string, queryString: boolean): string;
+        /**
+         * Truncates the crumb trail whenever a repeated or initial State is
+         * encountered
+         * @param The State navigated to
+         * @param The Crumb collection representing the crumb trail
+         * @returns Truncated crumb trail
+         */
+        truncateCrumbTrail(state: State, crumbs: Crumb[]): Crumb[];
+    }
+
+    /**
+     * Defines a contract a class must implement in order to manage the browser
+     * Url
+     */
+    interface HistoryManager {
+        /**
+         * Gets or sets a value indicating whether to disable browser history
+         */
+        disabled: boolean;
+        /**
+         * Registers browser history event listeners
+         * @param navigateHistory The history navigation event handler
+         */
+        init(navigateHistory: () => void): void;
+        /**
+         * Adds browser history
+         * @param url The current url
+         * @param replace A value indicating whether to replace the current
+         * browser history entry
+         */
+        addHistory(url: string, replace: boolean): void;
+        /**
+         * Gets the current location
+         */
+        getCurrentUrl(): string;
+        /**
+         * Gets an Href from the url
+         */
+        getHref(url: string): string;
+        /**
+         * Gets a Url from the anchor 
+         */
+        getUrl(anchor: HTMLAnchorElement): string;
+        /**
+         * Removes browser history event listeners
+         */
+        stop(): void;
+    }
+
+    /**
+     * Manages history using the browser Url's hash. If used in a browser
+     * without the hashchange event or outside of a browser environment, then
+     * history is disabled
+     */
+    class HashHistoryManager implements HistoryManager {
+        /**
+         * Gets or sets a value indicating whether to disable browser history.
+         * Set to true if used in a browser without the hashchange event or 
+         * outside of a browser environment
+         */
+        disabled: boolean;
+        /**
+         * Initializes a new instance of the HashHistoryManager class
+         */
+        constructor();
+        /**
+         * Initializes a new instance of the HashHistoryManager class
+         * @param replaceQueryIdentifier a value indicating whether to use '#'
+         * in place of '?'. Set to true for Internet explorer 6 and 7 support
+         */
+        constructor(replaceQueryIdentifier: boolean);
+        /**
+         * Registers a listener for the hashchange event
+         * @param navigateHistory The history navigation event handler
+         */
+        init(navigateHistory: any): void;
+        /**
+         * Sets the browser Url's hash to the url
+         * @param url The current url 
+         * @param replace A value indicating whether to replace the current
+         * browser history entry
+         */
+        addHistory(url: string, replace: boolean): void;
+        /**
+         * Gets the current location
+         */
+        getCurrentUrl(): string;
+        /**
+         * Gets an Href from the url
+         */
+        getHref(url: string): string;
+        /**
+         * Gets a Url from the anchor 
+         */
+        getUrl(anchor: HTMLAnchorElement): string;
+        /**
+         * Removes a listener for the hashchange event
+         */
+        stop(): void;
+    }
+
+    /**
+     * Manages history using the HTML5 history api. If used in a browser
+     * without the HTML5 history api or outside of a browser environment, then
+     * history is disabled
+     */
+    class HTML5HistoryManager implements HistoryManager {
+        /**
+         * Gets or sets a value indicating whether to disable browser history.
+         * Set to true if used in a browser without the HTML5 history api or 
+         * outside of a browser environment
+         */
+        disabled: boolean;
+        /**
+         * Initializes a new instance of the HTML5HistoryManager class
+         */
+        constructor();
+        /**
+         * Initializes a new instance of the HTML5HistoryManager class
+         * @param applicationPath The application path
+         */
+        constructor(applicationPath: string);
+        /**
+         * Registers a listener for the popstate event
+         * @param navigateHistory The history navigation event handler
+         */
+        init(navigateHistory: () => void): void;
+        /**
+         * Sets the browser Url to the url using pushState
+         * @param url The current url 
+         * @param replace A value indicating whether to replace the current
+         * browser history entry
+         */
+        addHistory(url: string, replace: boolean): void;
+        /**
+         * Gets the current location
+         */
+        getCurrentUrl(): string;
+        /**
+         * Gets an Href from the url
+         */
+        getHref(url: string): string;
+        /**
+         * Gets a Url from the anchor 
+         */
+        getUrl(anchor: HTMLAnchorElement): string;
+        /**
+         * Removes a listener for the popstate event
+         */
+        stop(): void;
+    }
+
+    /**
+     * Represents one piece of the crumb trail and holds the information need
+     * to return to and recreate the State as previously visited
+     */
+    class Crumb {
+        /**
+         * Gets the Context Data held at the time of navigating away from this
+         * State
+         */
+        data: any;
+        /**
+         * Gets the configuration information associated with this navigation
+         */
+        state: State;
+        /**
+         * Gets a value indicating whether the Crumb is the last in the crumb
+         * trail
+         */
+        last: boolean;
+        /**
+         * Gets the State Title
+         */
+        title: string;
+        /**
+         * Gets the link navigation to return to the State and pass the
+         * associated Data
+         */
+        url: string;
+        /**
+         * Gets the link navigation without crumb trail to return to the State
+         * and pass the associated Data
+         */
+        crumblessUrl: string;
+        /**
+         * Initializes a new instance of the Crumb class
+         * @param data The Context Data held at the time of navigating away
+         * from this State
+         * @param state The configuration information associated with this
+         * navigation
+         * @param link The link navigation to return to the State and pass the
+         * associated Data
+         * @param crumblessLink The link navigation without crumb trail to
+         * return to the State and pass the associated Data
+         * @param last A value indicating whether the Crumb is the last in the
+         * crumb trail
+         */
+        constructor(data: any, state: State, link: string, crumblessLink: string, last: boolean);
+    }
+
+    /**
+     * Provides properties for accessing context sensitive navigation
+     * information. Holds the current State and NavigationData
+     */
+    class StateContext {
+        /**
+         * Gets the last State displayed before the current State
+         */
+        oldState: State;
+        /**
+         * Gets the NavigationData for the last displayed State
+         */
+        oldData: any;
+        /**
+         * Gets the State of the last Crumb in the crumb trail
+         */
+        previousState: State;
+        /**
+         * Gets the NavigationData of the last Crumb in the crumb trail
+         */
+        previousData: any;
+        /**
+         * Gets the current State
+         */
+        state: State;
+        /**
+         * Gets the NavigationData for the current State
+         */
+        data: any;
+        /**
+         * Gets the current Url
+         */
+        url: string;
+        /**
+         * Gets or sets the current title
+         */
+        title: string;
+        /**
+         * Gets a Crumb collection representing the crumb trail, ordered oldest
+         * Crumb first
+         */
+        crumbs: Crumb[];
+        /**
+         * Gets the crumb trail
+         */
+        crumbTrail: string[];
+        /**
+         * Gets the next crumb
+         */
+        nextCrumb: Crumb;
+        /**
+         * Clears the Context Data
+         */
+        clear(): void;
+        /** 
+         * Combines the data with all the current NavigationData
+         * @param The data to add to the current NavigationData
+         * @returns The combined data
+         */
+        includeCurrentData(data: any): any;
+        /** 
+         * Combines the data with a subset of the current NavigationData
+         * @param The data to add to the current NavigationData
+         * @returns The combined data
+         */
+        includeCurrentData(data: any, keys: string[]): any;
+    }
+
+    /**
+     * Manages all navigation. These can be forward, backward or refreshing the
+     * current State
+     */
+    class StateNavigator {
+        /**
+         * Provides access to context sensitive navigation information
+         */
+        stateContext: StateContext;
+        /**
+         * Gets the browser Url manager
+         */
+        historyManager: HistoryManager;
+        /**
+         * Gets a list of States
+         */
+        states: { [index: string]: State; };
+        /**
+         * Initializes a new instance of the StateNavigator class
+         */
+        constructor();
+        /**
+         * Initializes a new instance of the StateNavigator class
+         * @param states A collection of States
+         */
+        constructor(states: StateInfo[]);
+        /**
+         * Initializes a new instance of the StateNavigator class
+         * @param states A collection of States
+         * @param historyManager The manager of the browser Url
+         */
+        constructor(states: StateInfo[], historyManager: HistoryManager);
+        /**
+         * Configures the StateNavigator
+         * @param stateInfos A collection of State Infos
+         */
+        configure(stateInfos: StateInfo[]): void;
+        /**
+         * Configures the StateNavigator
+         * @param stateInfos A collection of State Infos
+         * @param historyManager The manager of the browser Url
+         */
+        configure(stateInfos: StateInfo[], historyManager: HistoryManager): void;
+        /**
+         * Registers a navigate event listener
+         * @param handler The navigate event listener
+         */
+        onNavigate(handler: (oldState: State, state: State, data: any) => void): void;
+        /**
+         * Unregisters a navigate event listener
+         * @param handler The navigate event listener
+         */
+        offNavigate(handler: (oldState: State, state: State, data: any) => void): void;
+        /**
+         * Navigates to a State
+         * @param stateKey The key of a State
+         * @throws state does not match the key of a State or there is 
+         * NavigationData that cannot be converted to a String
+         * @throws A mandatory route parameter has not been supplied a value
+         */
+        navigate(stateKey: string): void;
+        /**
+         * Navigates to a State
+         * @param stateKey The key of a State
+         * @param navigationData The NavigationData to be passed to the next
+         * State and stored in the StateContext
+         * @throws state does not match the key of a State or there is 
+         * NavigationData that cannot be converted to a String
+         * @throws A mandatory route parameter has not been supplied a value
+         */
+        navigate(stateKey: string, navigationData: any): void;
+        /**
+         * Navigates to a State
+         * @param stateKey The key of a State
+         * @param navigationData The NavigationData to be passed to the next
+         * State and stored in the StateContext
+         * @param A value determining the effect on browser history
+         * @throws state does not match the key of a State or there is 
+         * NavigationData that cannot be converted to a String
+         * @throws A mandatory route parameter has not been supplied a value
+         */
+        navigate(stateKey: string, navigationData: any, historyAction: 'add' | 'replace' | 'none'): void;
+        /**
+         * Gets a Url to navigate to a State
+         * @param stateKey The key of a State
+         * @returns Url that will navigate to State specified in the action
+         * @throws state does not match the key of a State or there is 
+         * NavigationData that cannot be converted to a String
+         */
+        getNavigationLink(stateKey: string): string;
+        /**
+         * Gets a Url to navigate to a State
+         * @param stateKey The key of a State
+         * @param navigationData The NavigationData to be passed to the next
+         * State and stored in the StateContext
+         * @returns Url that will navigate to State specified in the action
+         * @throws state does not match the key of a State or there is 
+         * NavigationData that cannot be converted to a String
+         */
+        getNavigationLink(stateKey: string, navigationData: any): string;
+        /**
+         * Determines if the distance specified is within the bounds of the
+         * crumb trail represented by the Crumbs collection
+         */
+        canNavigateBack(distance: number): boolean;
+        /**
+         * Navigates back along the crumb trail
+         * @param distance Starting at 1, the number of Crumb steps to go back
+         * @throws canNavigateBack returns false for this distance
+         * @throws A mandatory route parameter has not been supplied a value
+         */
+        navigateBack(distance: number): void;
+        /**
+         * Navigates back along the crumb trail
+         * @param distance Starting at 1, the number of Crumb steps to go back
+         * @param A value determining the effect on browser history
+         * @throws canNavigateBack returns false for this distance
+         * @throws A mandatory route parameter has not been supplied a value
+         */
+        navigateBack(distance: number, historyAction: 'add' | 'replace' | 'none'): void;
+        /**
+         * Gets a Url to navigate back along the crumb trail
+         * @param distance Starting at 1, the number of Crumb steps to go back
+         * @throws canNavigateBack returns false for this distance
+         */
+        getNavigationBackLink(distance: number): string;
+        /**
+         * Navigates to the current State passing no NavigationData
+         * @throws A mandatory route parameter has not been supplied a value
+         */
+        refresh(): void;
+        /**
+         * Navigates to the current State
+         * @param navigationData The NavigationData to be passed to the current
+         * State and stored in the StateContext
+         * @throws There is NavigationData that cannot be converted to a String
+         * @throws A mandatory route parameter has not been supplied a value
+         */
+        refresh(navigationData: any): void;
+        /**
+         * Navigates to the current State
+         * @param navigationData The NavigationData to be passed to the current
+         * State and stored in the StateContext
+         * @param A value determining the effect on browser history
+         * @throws There is NavigationData that cannot be converted to a String
+         * @throws A mandatory route parameter has not been supplied a value
+         */
+        refresh(navigationData: any, historyAction: 'add' | 'replace' | 'none'): void;
+        /**
+         * Gets a Url to navigate to the current State
+         */
+        getRefreshLink(): string;
+        /**
+         * Gets a Url to navigate to the current State
+         * @param navigationData The NavigationData to be passed to the current
+         * State and stored in the StateContext
+         * @returns Url that will navigate to the current State
+         * @throws There is NavigationData that cannot be converted to a String
+         */
+        getRefreshLink(navigationData: any): string;
+        /**
+         * Navigates to the url
+         * @param url The target location
+         */
+        navigateLink(url: string): void;
+        /**
+         * Navigates to the url
+         * @param url The target location
+         * @param A value determining the effect on browser history
+         */
+        navigateLink(url: string, historyAction: 'add' | 'replace' | 'none'): void;
+        /**
+         * Navigates to the url
+         * @param url The target location
+         * @param A value determining the effect on browser history
+         * @param history A value indicating whether browser history was used
+         */
+        navigateLink(url: string, historyAction: 'add' | 'replace' | 'none', history: boolean): void;
+        /**
+         * Parses the url out into State and Navigation Data
+         * @param url The url to parse
+         */
+        parseLink(url: string): { state: State; data: any; };
+        /**
+         * Navigates to the current location 
+         */
+        start(): void;
+        /**
+         * Navigates to the passed in url
+         * @param url The url to navigate to 
+         */
+        start(url: string): void;
+    }
+}
diff --git a/navigation/navigation-tests.ts b/navigation/navigation-tests.ts
index 7d78cbe5ba..1d6019bb17 100644
--- a/navigation/navigation-tests.ts
+++ b/navigation/navigation-tests.ts
@@ -1,4 +1,5 @@
-/// <reference path="navigation.d.ts" />
+import Navigation = require("navigation");
+
 
 namespace NavigationTests {
 	// History Manager
diff --git a/navigation/navigation.d.ts b/navigation/navigation.d.ts
deleted file mode 100644
index 79dc718c90..0000000000
--- a/navigation/navigation.d.ts
+++ /dev/null
@@ -1,603 +0,0 @@
-// Type definitions for Navigation 2.0.0
-// Project: http://grahammendick.github.io/navigation/
-// Definitions by: Graham Mendick <https://github.com/grahammendick>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-declare module 'navigation' {
-    export = Navigation;
-}
-
-declare namespace Navigation {
-    /**
-     * Defines a contract a class must implement in order to configure a State
-     */
-    interface StateInfo {
-        /**
-         * Gets the unique key
-         */
-        key: string;
-        /**
-         * Gets the default NavigationData for this State
-         */
-        defaults?: any;
-        /**
-         * Gets the default NavigationData Types for  this State
-         */
-        defaultTypes?: any;
-        /**
-         * Gets the textual description of the state
-         */
-        title?: string;
-        /**
-         * Gets the route Url patterns
-         */
-        route?: string | string[];
-        /**
-         * Gets a value that indicates whether to maintain the crumb trail 
-         */
-        trackCrumbTrail?: boolean | string;
-        /**
-         * Gets a value that indicates whether NavigationData Types are
-         * preserved when navigating
-         */
-        trackTypes?: boolean;
-        /**
-         * Gets the additional state attributes
-         */
-        [extras: string]: any;
-    }
-
-    /**
-     * Represents a view and is the destination of a navigation
-     */
-    class State implements StateInfo {
-        /**
-         * Gets the unique key
-         */
-        key: string;
-        /**
-         * Gets the default NavigationData for this State
-         */
-        defaults: any;
-        /**
-         * Gets the default NavigationData Types for  this State
-         */
-        defaultTypes: any;
-        /**
-         * Gets the formatted default NavigationData for this State
-         */
-        formattedDefaults: any;
-        /**
-         * Gets the formatted default array NavigationData for this State
-         */
-        formattedArrayDefaults: { [index: string]: string[]; };
-        /**
-         * Gets the textual description of the state
-         */
-        title: string;
-        /**
-         * Gets the route Url patterns
-         */
-        route: string | string[];
-        /**
-         * Gets a value that indicates whether to maintain the crumb trail 
-         */
-        trackCrumbTrail: boolean;
-        /**
-         * Gets the crumb trail key
-         */
-        crumbTrailKey: string;
-        /**
-         * Gets a value that indicates whether NavigationData Types are
-         * preserved when navigating
-         */
-        trackTypes: boolean;
-        /**
-         * Gets the additional state attributes
-         */
-        [extras: string]: any;        
-        /**
-         * Called on the old State before navigating to a different State
-         * @param state The new State
-         * @param data The new NavigationData
-         * @param url The new target location
-         * @param unload The function to call to continue to navigate
-         * @param history A value indicating whether browser history was used
-         */
-        unloading: (state: State, data: any, url: string, unload: () => void, history?: boolean) => void;
-        /**
-         * Called on the old State after navigating to a different State
-         */
-        dispose: () => void;
-        /**
-         * Called on the current State after navigating to it
-         * @param data The current NavigationData
-         * @param asyncData The data passed asynchronously while navigating
-         */
-        navigated: (data: any, asyncData?: any) => void;
-        /**
-         * Called on the new State before navigating to it
-         * @param data The new NavigationData
-         * @param url The new target location
-         * @param navigate The function to call to continue to navigate
-         * @param history A value indicating whether browser history was used
-         */
-        navigating: (data: any, url: string, navigate: (asyncData?: any) => void, history: boolean) => void;
-        /**
-         * Encodes the Url value
-         * @param state The State navigated to
-         * @param key The key of the navigation data item
-         * @param val The Url value of the navigation data item
-         * @param queryString A value indicating the Url value's location
-         */
-        urlEncode(state: State, key: string, val: string, queryString: boolean): string;
-        /**
-         * Decodes the Url value
-         * @param state The State navigated to
-         * @param key The key of the navigation data item
-         * @param val The Url value of the navigation data item
-         * @param queryString A value indicating the Url value's location
-         */
-        urlDecode(state: State, key: string, val: string, queryString: boolean): string;
-        /**
-         * Truncates the crumb trail whenever a repeated or initial State is
-         * encountered
-         * @param The State navigated to
-         * @param The Crumb collection representing the crumb trail
-         * @returns Truncated crumb trail
-         */
-        truncateCrumbTrail(state: State, crumbs: Crumb[]): Crumb[];
-    }
-
-    /**
-     * Defines a contract a class must implement in order to manage the browser
-     * Url
-     */
-    interface HistoryManager {
-        /**
-         * Gets or sets a value indicating whether to disable browser history
-         */
-        disabled: boolean;
-        /**
-         * Registers browser history event listeners
-         * @param navigateHistory The history navigation event handler
-         */
-        init(navigateHistory: () => void): void;
-        /**
-         * Adds browser history
-         * @param url The current url
-         * @param replace A value indicating whether to replace the current
-         * browser history entry
-         */
-        addHistory(url: string, replace: boolean): void;
-        /**
-         * Gets the current location
-         */
-        getCurrentUrl(): string;
-        /**
-         * Gets an Href from the url
-         */
-        getHref(url: string): string;
-        /**
-         * Gets a Url from the anchor 
-         */
-        getUrl(anchor: HTMLAnchorElement): string;
-        /**
-         * Removes browser history event listeners
-         */
-        stop(): void;
-    }
-
-    /**
-     * Manages history using the browser Url's hash. If used in a browser
-     * without the hashchange event or outside of a browser environment, then
-     * history is disabled
-     */
-    class HashHistoryManager implements HistoryManager {
-        /**
-         * Gets or sets a value indicating whether to disable browser history.
-         * Set to true if used in a browser without the hashchange event or 
-         * outside of a browser environment
-         */
-        disabled: boolean;
-        /**
-         * Initializes a new instance of the HashHistoryManager class
-         */
-        constructor();
-        /**
-         * Initializes a new instance of the HashHistoryManager class
-         * @param replaceQueryIdentifier a value indicating whether to use '#'
-         * in place of '?'. Set to true for Internet explorer 6 and 7 support
-         */
-        constructor(replaceQueryIdentifier: boolean);
-        /**
-         * Registers a listener for the hashchange event
-         * @param navigateHistory The history navigation event handler
-         */
-        init(navigateHistory: any): void;
-        /**
-         * Sets the browser Url's hash to the url
-         * @param url The current url 
-         * @param replace A value indicating whether to replace the current
-         * browser history entry
-         */
-        addHistory(url: string, replace: boolean): void;
-        /**
-         * Gets the current location
-         */
-        getCurrentUrl(): string;
-        /**
-         * Gets an Href from the url
-         */
-        getHref(url: string): string;
-        /**
-         * Gets a Url from the anchor 
-         */
-        getUrl(anchor: HTMLAnchorElement): string;
-        /**
-         * Removes a listener for the hashchange event
-         */
-        stop(): void;
-    }
-
-    /**
-     * Manages history using the HTML5 history api. If used in a browser
-     * without the HTML5 history api or outside of a browser environment, then
-     * history is disabled
-     */
-    class HTML5HistoryManager implements HistoryManager {
-        /**
-         * Gets or sets a value indicating whether to disable browser history.
-         * Set to true if used in a browser without the HTML5 history api or 
-         * outside of a browser environment
-         */
-        disabled: boolean;
-        /**
-         * Initializes a new instance of the HTML5HistoryManager class
-         */
-        constructor();
-        /**
-         * Initializes a new instance of the HTML5HistoryManager class
-         * @param applicationPath The application path
-         */
-        constructor(applicationPath: string);
-        /**
-         * Registers a listener for the popstate event
-         * @param navigateHistory The history navigation event handler
-         */
-        init(navigateHistory: () => void): void;
-        /**
-         * Sets the browser Url to the url using pushState
-         * @param url The current url 
-         * @param replace A value indicating whether to replace the current
-         * browser history entry
-         */
-        addHistory(url: string, replace: boolean): void;
-        /**
-         * Gets the current location
-         */
-        getCurrentUrl(): string;
-        /**
-         * Gets an Href from the url
-         */
-        getHref(url: string): string;
-        /**
-         * Gets a Url from the anchor 
-         */
-        getUrl(anchor: HTMLAnchorElement): string;
-        /**
-         * Removes a listener for the popstate event
-         */
-        stop(): void;
-    }
-
-    /**
-     * Represents one piece of the crumb trail and holds the information need
-     * to return to and recreate the State as previously visited
-     */
-    class Crumb {
-        /**
-         * Gets the Context Data held at the time of navigating away from this
-         * State
-         */
-        data: any;
-        /**
-         * Gets the configuration information associated with this navigation
-         */
-        state: State;
-        /**
-         * Gets a value indicating whether the Crumb is the last in the crumb
-         * trail
-         */
-        last: boolean;
-        /**
-         * Gets the State Title
-         */
-        title: string;
-        /**
-         * Gets the link navigation to return to the State and pass the
-         * associated Data
-         */
-        url: string;
-        /**
-         * Gets the link navigation without crumb trail to return to the State
-         * and pass the associated Data
-         */
-        crumblessUrl: string;
-        /**
-         * Initializes a new instance of the Crumb class
-         * @param data The Context Data held at the time of navigating away
-         * from this State
-         * @param state The configuration information associated with this
-         * navigation
-         * @param link The link navigation to return to the State and pass the
-         * associated Data
-         * @param crumblessLink The link navigation without crumb trail to
-         * return to the State and pass the associated Data
-         * @param last A value indicating whether the Crumb is the last in the
-         * crumb trail
-         */
-        constructor(data: any, state: State, link: string, crumblessLink: string, last: boolean);
-    }
-
-    /**
-     * Provides properties for accessing context sensitive navigation
-     * information. Holds the current State and NavigationData
-     */
-    class StateContext {
-        /**
-         * Gets the last State displayed before the current State
-         */
-        oldState: State;
-        /**
-         * Gets the NavigationData for the last displayed State
-         */
-        oldData: any;
-        /**
-         * Gets the State of the last Crumb in the crumb trail
-         */
-        previousState: State;
-        /**
-         * Gets the NavigationData of the last Crumb in the crumb trail
-         */
-        previousData: any;
-        /**
-         * Gets the current State
-         */
-        state: State;
-        /**
-         * Gets the NavigationData for the current State
-         */
-        data: any;
-        /**
-         * Gets the current Url
-         */
-        url: string;
-        /**
-         * Gets or sets the current title
-         */
-        title: string;
-        /**
-         * Gets a Crumb collection representing the crumb trail, ordered oldest
-         * Crumb first
-         */
-        crumbs: Crumb[];
-        /**
-         * Gets the crumb trail
-         */
-        crumbTrail: string[];
-        /**
-         * Gets the next crumb
-         */
-        nextCrumb: Crumb;
-        /**
-         * Clears the Context Data
-         */
-        clear(): void;
-        /** 
-         * Combines the data with all the current NavigationData
-         * @param The data to add to the current NavigationData
-         * @returns The combined data
-         */
-        includeCurrentData(data: any): any;
-        /** 
-         * Combines the data with a subset of the current NavigationData
-         * @param The data to add to the current NavigationData
-         * @returns The combined data
-         */
-        includeCurrentData(data: any, keys: string[]): any;
-    }
-
-    /**
-     * Manages all navigation. These can be forward, backward or refreshing the
-     * current State
-     */
-    class StateNavigator {
-        /**
-         * Provides access to context sensitive navigation information
-         */
-        stateContext: StateContext;
-        /**
-         * Gets the browser Url manager
-         */
-        historyManager: HistoryManager;
-        /**
-         * Gets a list of States
-         */
-        states: { [index: string]: State; };
-        /**
-         * Initializes a new instance of the StateNavigator class
-         */
-        constructor();
-        /**
-         * Initializes a new instance of the StateNavigator class
-         * @param states A collection of States
-         */
-        constructor(states: StateInfo[]);
-        /**
-         * Initializes a new instance of the StateNavigator class
-         * @param states A collection of States
-         * @param historyManager The manager of the browser Url
-         */
-        constructor(states: StateInfo[], historyManager: HistoryManager);
-        /**
-         * Configures the StateNavigator
-         * @param stateInfos A collection of State Infos
-         */
-        configure(stateInfos: StateInfo[]): void;
-        /**
-         * Configures the StateNavigator
-         * @param stateInfos A collection of State Infos
-         * @param historyManager The manager of the browser Url
-         */
-        configure(stateInfos: StateInfo[], historyManager: HistoryManager): void;
-        /**
-         * Registers a navigate event listener
-         * @param handler The navigate event listener
-         */
-        onNavigate(handler: (oldState: State, state: State, data: any) => void): void;
-        /**
-         * Unregisters a navigate event listener
-         * @param handler The navigate event listener
-         */
-        offNavigate(handler: (oldState: State, state: State, data: any) => void): void;
-        /**
-         * Navigates to a State
-         * @param stateKey The key of a State
-         * @throws state does not match the key of a State or there is 
-         * NavigationData that cannot be converted to a String
-         * @throws A mandatory route parameter has not been supplied a value
-         */
-        navigate(stateKey: string): void;
-        /**
-         * Navigates to a State
-         * @param stateKey The key of a State
-         * @param navigationData The NavigationData to be passed to the next
-         * State and stored in the StateContext
-         * @throws state does not match the key of a State or there is 
-         * NavigationData that cannot be converted to a String
-         * @throws A mandatory route parameter has not been supplied a value
-         */
-        navigate(stateKey: string, navigationData: any): void;
-        /**
-         * Navigates to a State
-         * @param stateKey The key of a State
-         * @param navigationData The NavigationData to be passed to the next
-         * State and stored in the StateContext
-         * @param A value determining the effect on browser history
-         * @throws state does not match the key of a State or there is 
-         * NavigationData that cannot be converted to a String
-         * @throws A mandatory route parameter has not been supplied a value
-         */
-        navigate(stateKey: string, navigationData: any, historyAction: 'add' | 'replace' | 'none'): void;
-        /**
-         * Gets a Url to navigate to a State
-         * @param stateKey The key of a State
-         * @returns Url that will navigate to State specified in the action
-         * @throws state does not match the key of a State or there is 
-         * NavigationData that cannot be converted to a String
-         */
-        getNavigationLink(stateKey: string): string;
-        /**
-         * Gets a Url to navigate to a State
-         * @param stateKey The key of a State
-         * @param navigationData The NavigationData to be passed to the next
-         * State and stored in the StateContext
-         * @returns Url that will navigate to State specified in the action
-         * @throws state does not match the key of a State or there is 
-         * NavigationData that cannot be converted to a String
-         */
-        getNavigationLink(stateKey: string, navigationData: any): string;
-        /**
-         * Determines if the distance specified is within the bounds of the
-         * crumb trail represented by the Crumbs collection
-         */
-        canNavigateBack(distance: number): boolean;
-        /**
-         * Navigates back along the crumb trail
-         * @param distance Starting at 1, the number of Crumb steps to go back
-         * @throws canNavigateBack returns false for this distance
-         * @throws A mandatory route parameter has not been supplied a value
-         */
-        navigateBack(distance: number): void;
-        /**
-         * Navigates back along the crumb trail
-         * @param distance Starting at 1, the number of Crumb steps to go back
-         * @param A value determining the effect on browser history
-         * @throws canNavigateBack returns false for this distance
-         * @throws A mandatory route parameter has not been supplied a value
-         */
-        navigateBack(distance: number, historyAction: 'add' | 'replace' | 'none'): void;
-        /**
-         * Gets a Url to navigate back along the crumb trail
-         * @param distance Starting at 1, the number of Crumb steps to go back
-         * @throws canNavigateBack returns false for this distance
-         */
-        getNavigationBackLink(distance: number): string;
-        /**
-         * Navigates to the current State passing no NavigationData
-         * @throws A mandatory route parameter has not been supplied a value
-         */
-        refresh(): void;
-        /**
-         * Navigates to the current State
-         * @param navigationData The NavigationData to be passed to the current
-         * State and stored in the StateContext
-         * @throws There is NavigationData that cannot be converted to a String
-         * @throws A mandatory route parameter has not been supplied a value
-         */
-        refresh(navigationData: any): void;
-        /**
-         * Navigates to the current State
-         * @param navigationData The NavigationData to be passed to the current
-         * State and stored in the StateContext
-         * @param A value determining the effect on browser history
-         * @throws There is NavigationData that cannot be converted to a String
-         * @throws A mandatory route parameter has not been supplied a value
-         */
-        refresh(navigationData: any, historyAction: 'add' | 'replace' | 'none'): void;
-        /**
-         * Gets a Url to navigate to the current State
-         */
-        getRefreshLink(): string;
-        /**
-         * Gets a Url to navigate to the current State
-         * @param navigationData The NavigationData to be passed to the current
-         * State and stored in the StateContext
-         * @returns Url that will navigate to the current State
-         * @throws There is NavigationData that cannot be converted to a String
-         */
-        getRefreshLink(navigationData: any): string;
-        /**
-         * Navigates to the url
-         * @param url The target location
-         */
-        navigateLink(url: string): void;
-        /**
-         * Navigates to the url
-         * @param url The target location
-         * @param A value determining the effect on browser history
-         */
-        navigateLink(url: string, historyAction: 'add' | 'replace' | 'none'): void;
-        /**
-         * Navigates to the url
-         * @param url The target location
-         * @param A value determining the effect on browser history
-         * @param history A value indicating whether browser history was used
-         */
-        navigateLink(url: string, historyAction: 'add' | 'replace' | 'none', history: boolean): void;
-        /**
-         * Parses the url out into State and Navigation Data
-         * @param url The url to parse
-         */
-        parseLink(url: string): { state: State; data: any; };
-        /**
-         * Navigates to the current location 
-         */
-        start(): void;
-        /**
-         * Navigates to the passed in url
-         * @param url The url to navigate to 
-         */
-        start(url: string): void;
-    }
-}
diff --git a/navigation/tsconfig.json b/navigation/tsconfig.json
new file mode 100644
index 0000000000..01b6ed5f86
--- /dev/null
+++ b/navigation/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "navigation-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/nconf/index.d.ts b/nconf/index.d.ts
new file mode 100644
index 0000000000..16d0dd9788
--- /dev/null
+++ b/nconf/index.d.ts
@@ -0,0 +1,108 @@
+// Type definitions for nconf
+// Project: https://github.com/flatiron/nconf
+// Definitions by: Jeff Goddard <https://github.com/jedigo>, Jean-Martin Thibault <https://github.com/jmthibault>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/nconf.d.ts
+
+
+export declare var version: number;
+export declare var stores: any;
+export declare var sources: any[];
+
+export declare function clear(key: string, callback?: ICallbackFunction): any;
+export declare function get(key: string, callback?: ICallbackFunction): any;
+export declare function merge(key: string, value: any, callback?: ICallbackFunction): any;
+export declare function set(key: string, value: any, callback?: ICallbackFunction): any;
+export declare function reset(callback?: ICallbackFunction): any;
+
+export declare function load(callback?: ICallbackFunction): any;
+export declare function mergeSources(data: any): void;
+export declare function loadSources(): any;
+export declare function save(value: any, callback?: ICallbackFunction): any;
+
+export declare function add(name: string, options?: IOptions): Provider;
+export declare function argv(options?: IOptions): Provider;
+export declare function env(options?: IOptions): Provider;
+export declare function file(name: string, options?: IFileOptions): Provider;
+export declare function file(name: string, filename: string): Provider;
+export declare function file(options: IFileOptions): Provider;
+export declare function use(name: string, options?: IOptions): Provider;
+export declare function defaults(options?: IOptions): Provider;
+export declare function init(options?: IOptions): void;
+export declare function overrides(options?: IOptions): Provider;
+export declare function remove(name: string): void;
+export declare function create(name: string, options: IOptions): IStore;
+
+export declare function key(...values: any[]): string;
+export declare function path(key: any): any[];
+export declare function loadFiles(files: any, callback?: ICallbackFunction): void;
+export declare function loadFilesSync(files: any, callback?: ICallbackFunction): void;
+
+export declare var formats: {
+    json: IFormat;
+    ini: IFormat;
+};
+
+export interface IFormat {
+    stringify: (obj: any, replacer: any, spacing?: any) => string;
+    parse: (str: string) => any;
+}
+
+export interface IOptions {
+    [index: string]: any;
+}
+
+export interface IFileOptions {
+    type?: string;
+    file?: string;
+    dir?: string;
+    search?: boolean;
+    format?: IFormat;
+    json_spacing?: number;
+}
+
+export interface ICallbackFunction {
+    (err: Error): void;
+}
+
+export declare class Provider {
+    constructor(options: IOptions);
+
+    stores: any;
+    sources: any[];
+
+    clear(key: string, callback?: ICallbackFunction): any;
+    get(key: string, callback?: ICallbackFunction): any;
+    merge(key: string, value: any, callback?: ICallbackFunction): any;
+    set(key: string, value: any, callback?: ICallbackFunction): any;
+    reset(callback?: ICallbackFunction): any;
+
+    load(callback?: ICallbackFunction): any;
+    mergeSources(data: any): void;
+    loadSources(): any;
+    save(value: any, callback?: ICallbackFunction): any;
+
+    add(name: string, options?: IOptions): Provider;
+    argv(options?: IOptions): Provider;
+    env(options?: IOptions): Provider;
+    file(name: string, options?: IFileOptions): Provider;
+    file(name: string, filename: string): Provider;
+    file(options: IFileOptions): Provider;
+    use(name: string, options?: IOptions): Provider;
+
+    defaults(options?: IOptions): Provider;
+    init(options?: IOptions): void;
+    overrides(options?: IOptions): Provider;
+    remove(name: string): void;
+    create(name: string, options: IOptions): IStore;
+}
+
+export interface IStore {
+    type: string;
+    get(key: string): any;
+    set(key: string, value: any): boolean;
+    clear(key: string): boolean;
+    merge(key: string, value: any): boolean;
+    reset(callback?: ICallbackFunction): boolean;
+}
diff --git a/nconf/nconf-tests.ts b/nconf/nconf-tests.ts
index dd33514c23..e7a18d68a8 100644
--- a/nconf/nconf-tests.ts
+++ b/nconf/nconf-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="nconf.d.ts" />
 
 import nconf = require('nconf');
 
diff --git a/nconf/nconf.d.ts b/nconf/nconf.d.ts
deleted file mode 100644
index e631fe86c5..0000000000
--- a/nconf/nconf.d.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-// Type definitions for nconf
-// Project: https://github.com/flatiron/nconf
-// Definitions by: Jeff Goddard <https://github.com/jedigo>, Jean-Martin Thibault <https://github.com/jmthibault>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/nconf.d.ts
-
-declare module "nconf" {
-	export var version: number;
-	export var stores: any;
-	export var sources: any[];
-
-	export function clear(key: string, callback?: ICallbackFunction): any;
-	export function get (key: string, callback?: ICallbackFunction): any;
-	export function merge(key: string, value: any, callback?: ICallbackFunction): any;
-	export function set (key: string, value: any, callback?: ICallbackFunction): any;
-	export function reset(callback?: ICallbackFunction): any;
-
-	export function load(callback?: ICallbackFunction): any;
-	export function mergeSources(data: any): void;
-	export function loadSources(): any;
-	export function save(value: any, callback?: ICallbackFunction): any;
-
-	export function add(name: string, options?: IOptions): Provider;
-	export function argv(options?: IOptions): Provider;
-	export function env(options?: IOptions): Provider;
-	export function file(name: string, options?: IFileOptions): Provider;
-	export function file(name: string, filename: string): Provider;
-	export function file(options: IFileOptions): Provider;
-	export function use(name: string, options?: IOptions): Provider;
-	export function defaults(options?: IOptions): Provider;
-	export function init(options?: IOptions): void;
-	export function overrides(options?: IOptions): Provider;
-	export function remove(name: string): void;
-	export function create(name: string, options: IOptions): IStore;
-
-	export function key(...values: any[]): string;
-	export function path(key: any): any[];
-	export function loadFiles(files: any, callback?: ICallbackFunction): void;
-	export function loadFilesSync(files: any, callback?: ICallbackFunction): void;
-
-	export var formats: {
-		json: IFormat;
-		ini: IFormat;
-	};
-
-	export interface IFormat {
-		stringify: (obj: any, replacer: any, spacing?: any) => string;
-		parse: (str: string) => any;
-	}
-
-	export interface IOptions {
-		[index: string]: any;
-	}
-
-	export interface IFileOptions {
-		type?: string;
-		file?: string;
-		dir?: string;
-		search?: boolean;
-		format?: IFormat;
-		json_spacing?: number;
-	}
-
-	export interface ICallbackFunction {
-		(err: Error): void;
-	}
-
-	export class Provider {
-		constructor(options: IOptions);
-
-		stores: any;
-		sources: any[];
-
-		clear(key: string, callback?: ICallbackFunction): any;
-		get (key: string, callback?: ICallbackFunction): any;
-		merge(key: string, value: any, callback?: ICallbackFunction): any;
-		set (key: string, value: any, callback?: ICallbackFunction): any;
-		reset(callback?: ICallbackFunction): any;
-
-		load(callback?: ICallbackFunction): any;
-		mergeSources(data: any): void;
-		loadSources(): any;
-		save(value: any, callback?: ICallbackFunction): any;
-
-		add(name: string, options?: IOptions): Provider;
-		argv(options?: IOptions): Provider;
-		env(options?: IOptions): Provider;
-		file(name: string, options?: IFileOptions): Provider;
-		file(name: string, filename: string): Provider;
-		file(options: IFileOptions): Provider;
-		use(name: string, options?: IOptions): Provider;
-
-		defaults(options?: IOptions): Provider;
-		init(options?: IOptions): void;
-		overrides(options?: IOptions): Provider;
-		remove(name: string): void;
-		create(name: string, options: IOptions): IStore;
-	}
-
-	export interface IStore {
-		type: string;
-		get (key: string): any;
-		set (key: string, value: any): boolean;
-		clear(key: string): boolean;
-		merge(key: string, value: any): boolean;
-		reset(callback?: ICallbackFunction): boolean;
-	}
-}
diff --git a/nconf/tsconfig.json b/nconf/tsconfig.json
new file mode 100644
index 0000000000..1e39b03faf
--- /dev/null
+++ b/nconf/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "nconf-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ncp/index.d.ts b/ncp/index.d.ts
new file mode 100644
index 0000000000..f0b7905409
--- /dev/null
+++ b/ncp/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for ncp v0.5.1
+// Project: https://github.com/AvianFlu/ncp
+// Definitions by: Bart van der Schoor <https://github.com/bartvds/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export function ncp(source: string, destination: string, callback: (err: Error) => void): void;
+export function ncp(source: string, destination: string, options: Options, callback: (err: Error) => void): void;
+
+interface Options {
+    filter?: RegExp;
+    transform?: (read: NodeJS.ReadableStream, write: NodeJS.WritableStream) => void;
+    clobber?: boolean;
+    stopOnErr?: boolean;
+    errs?: NodeJS.WritableStream;
+}
diff --git a/ncp/ncp-tests.ts b/ncp/ncp-tests.ts
index f1ce04c21e..753fb734e8 100644
--- a/ncp/ncp-tests.ts
+++ b/ncp/ncp-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="ncp.d.ts" />
-
 import ncp = require('ncp');
 import stream = require('stream');
 
diff --git a/ncp/ncp.d.ts b/ncp/ncp.d.ts
deleted file mode 100644
index 50393195e6..0000000000
--- a/ncp/ncp.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Type definitions for ncp v0.5.1
-// Project: https://github.com/AvianFlu/ncp
-// Definitions by: Bart van der Schoor <https://github.com/bartvds/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'ncp' {
-	function ncp (source: string, destination: string, callback: (err: Error) => void): void;
-	function ncp (source: string, destination: string, options: Options, callback: (err: Error) => void): void;
-
-	interface Options {
-		filter? : RegExp;
-		transform? : (read: NodeJS.ReadableStream, write: NodeJS.WritableStream) => void;
-		clobber? : boolean;
-		stopOnErr? : boolean;
-		errs? : NodeJS.WritableStream;
-	}
-}
diff --git a/ncp/tsconfig.json b/ncp/tsconfig.json
new file mode 100644
index 0000000000..a97cff5499
--- /dev/null
+++ b/ncp/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ncp-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/nedb/index.d.ts b/nedb/index.d.ts
new file mode 100644
index 0000000000..6eec23843a
--- /dev/null
+++ b/nedb/index.d.ts
@@ -0,0 +1,205 @@
+// Type definitions for NeDB
+// Project: https://github.com/louischatriot/nedb
+// Definitions by: Stefan Steinhart <https://github.com/reppners>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class NeDBDataStore {
+
+    constructor();
+    constructor(path:string);
+    constructor(options:NeDB.DataStoreOptions);
+
+    persistence:NeDB.Persistence;
+
+    /**
+     * Load the database from the datafile, and trigger the execution of buffered commands if any
+     */
+    loadDatabase(cb?:(err:Error)=>void):void;
+
+    /**
+     * Get an array of all the data in the database
+     */
+    getAllData():Array<any>;
+
+
+    /**
+     * Reset all currently defined indexes
+     */
+    resetIndexes(newData:any):void;
+
+    /**
+     * Ensure an index is kept for this field. Same parameters as lib/indexes
+     * For now this function is synchronous, we need to test how much time it takes
+     * We use an async API for consistency with the rest of the code
+     * @param {String} options.fieldName
+     * @param {Boolean} options.unique
+     * @param {Boolean} options.sparse
+     * @param {Function} cb Optional callback, signature: err
+     */
+    ensureIndex(options:NeDB.EnsureIndexOptions, cb?:(err:Error)=>void):void;
+
+    /**
+     * Remove an index
+     * @param {String} fieldName
+     * @param {Function} cb Optional callback, signature: err
+     */
+    removeIndex(fieldName:string, cb?:(err:Error)=>void):void;
+
+    /**
+     * Add one or several document(s) to all indexes
+     */
+    addToIndexes<T>(doc:T):void;
+    addToIndexes<T>(doc:Array<T>):void;
+
+    /**
+     * Remove one or several document(s) from all indexes
+     */
+    removeFromIndexes<T>(doc:T):void;
+    removeFromIndexes<T>(doc:Array<T>):void;
+
+    /**
+     * Update one or several documents in all indexes
+     * To update multiple documents, oldDoc must be an array of { oldDoc, newDoc } pairs
+     * If one update violates a constraint, all changes are rolled back
+     */
+    updateIndexes<T>(oldDoc:T, newDoc:T):void;
+    updateIndexes<T>(updates:Array<{oldDoc:T; newDoc:T;}>):void;
+
+    /**
+     * Return the list of candidates for a given query
+     * Crude implementation for now, we return the candidates given by the first usable index if any
+     * We try the following query types, in this order: basic match, $in match, comparison match
+     * One way to make it better would be to enable the use of multiple indexes if the first usable index
+     * returns too much data. I may do it in the future.
+     *
+     * TODO: needs to be moved to the Cursor module
+     */
+    getCandidates(query:any):void;
+
+    /**
+     * Insert a new document
+     * @param {Function} cb Optional callback, signature: err, insertedDoc
+     */
+    insert<T>(newDoc:T, cb?:(err:Error, document:T)=>void):void;
+
+    /**
+     * Count all documents matching the query
+     * @param {any} query MongoDB-style query
+     */
+    count(query:any, callback:(err:Error, n:number)=>void):void;
+    count(query:any):NeDB.CursorCount;
+
+    /**
+     * Find all documents matching the query
+     * If no callback is passed, we return the cursor so that user can limit, skip and finally exec
+     * @param {any} query MongoDB-style query
+     * @param {any} projection MongoDB-style projection
+     */
+    find<T>(query:any, projection:T, callback:(err:Error, documents:Array<T>)=>void):void;
+    find<T>(query:any, projection:T):NeDB.Cursor<T>;
+
+    /**
+     * Find all documents matching the query
+     * If no callback is passed, we return the cursor so that user can limit, skip and finally exec
+     * * @param {any} query MongoDB-style query
+     */
+    find<T>(query:any, callback:(err:Error, documents:Array<T>)=>void):void;
+    find<T>(query:any):NeDB.Cursor<T>;
+
+    /**
+     * Find one document matching the query
+     * @param {any} query MongoDB-style query
+     * @param {any} projection MongoDB-style projection
+     */
+    findOne<T>(query:any, projection:T, callback:(err:Error, document:T)=>void):void;
+
+    /**
+     * Find one document matching the query
+     * @param {any} query MongoDB-style query
+     */
+    findOne<T>(query:any, callback:(err:Error, document:T)=>void):void;
+
+    /**
+     * Update all docs matching query
+     * For now, very naive implementation (recalculating the whole database)
+     * @param {any} query
+     * @param {any} updateQuery
+     * @param {Object} options Optional options
+     *                 options.multi If true, can update multiple documents (defaults to false)
+     *                 options.upsert If true, document is inserted if the query doesn't match anything
+     * @param {Function} cb Optional callback, signature: err, numReplaced, upsert (set to true if the update was in fact an upsert)
+     *
+     * @api private Use Datastore.update which has the same signature
+     */
+    update(query:any, updateQuery:any, options?:NeDB.UpdateOptions, cb?:(err:Error, numberOfUpdated:number, upsert:boolean)=>void):void;
+
+    /**
+     * Remove all docs matching the query
+     * For now very naive implementation (similar to update)
+     * @param {Object} query
+     * @param {Object} options Optional options
+     *                 options.multi If true, can update multiple documents (defaults to false)
+     * @param {Function} cb Optional callback, signature: err, numRemoved
+     *
+     * @api private Use Datastore.remove which has the same signature
+     */
+    remove(query:any, options:NeDB.RemoveOptions, cb?:(err:Error, n:number)=>void):void;
+    remove(query:any, cb?:(err:Error, n:number)=>void):void;
+}
+
+export = NeDBDataStore;
+export as namespace Nedb;
+
+declare namespace NeDB {
+
+    interface Cursor<T> {
+        sort(query:any):Cursor<T>;
+        skip(n:number):Cursor<T>;
+        limit(n:number):Cursor<T>;
+        projection(query:any):Cursor<T>;
+        exec(callback:(err:Error, documents:Array<T>)=>void):void;
+    }
+
+    interface CursorCount {
+        exec(callback:(err:Error, count:number)=>void):void;
+    }
+
+    interface DataStoreOptions {
+        filename?:string // Optional, datastore will be in-memory only if not provided
+        inMemoryOnly?:boolean // Optional, default to false
+        nodeWebkitAppName?:boolean // Optional, specify the name of your NW app if you want options.filename to be relative to the directory where
+        autoload?:boolean // Optional, defaults to false
+        onload?:(error:Error)=>any // Optional, if autoload is used this will be called after the load database with the error object as parameter. If you don't pass it the error will be thrown
+        afterSerialization?:(line:string)=>string; // (optional): hook you can use to transform data after it was serialized and before it is written to disk. Can be used for example to encrypt data before writing database to disk. This function takes a string as parameter (one line of an NeDB data file) and outputs the transformed string, which must absolutely not contain a \n character (or data will be lost)
+        beforeDeserialization?:(line:string)=>string; // (optional): reverse of afterSerialization. Make sure to include both and not just one or you risk data loss. For the same reason, make sure both functions are inverses of one another. Some failsafe mechanisms are in place to prevent data loss if you misuse the serialization hooks: NeDB checks that never one is declared without the other, and checks that they are reverse of one another by testing on random strings of various lengths. In addition, if too much data is detected as corrupt, NeDB will refuse to start as it could mean you're not using the deserialization hook corresponding to the serialization hook used before (see below)
+        corruptAlertThreshold?:number; // (optional): between 0 and 1, defaults to 10%. NeDB will refuse to start if more than this percentage of the datafile is corrupt. 0 means you don't tolerate any corruption, 1 means you don't care
+    }
+
+    /**
+     * multi (defaults to false) which allows the modification of several documents if set to true
+     * upsert (defaults to false) if you want to insert a new document corresponding to the update rules if your query doesn't match anything
+     */
+    interface UpdateOptions {
+        multi?: boolean;
+        upsert?: boolean;
+    }
+
+    /**
+     * options only one option for now: multi which allows the removal of multiple documents if set to true. Default is false
+     */
+    interface RemoveOptions {
+        multi?:boolean
+    }
+
+    interface EnsureIndexOptions {
+        fieldName:string;
+        unique?:boolean;
+        sparse?:boolean;
+    }
+
+    interface Persistence {
+        compactDatafile():void;
+        setAutocompactionInterval(interval:number):void;
+        stopAutocompaction():void;
+    }
+}
diff --git a/nedb/nedb-tests.ts b/nedb/nedb-tests.ts
index fd60057196..14b122e64c 100644
--- a/nedb/nedb-tests.ts
+++ b/nedb/nedb-tests.ts
@@ -2,9 +2,9 @@
  * Created by stefansteinhart on 31.01.15.
  */
 
-/// <reference path="../q/Q.d.ts" />
-/// <reference path="../node/node.d.ts" />
-/// <reference path="nedb.d.ts" />
+/// <reference types="Q" />
+/// <reference types="node" />
+
 
 import Q = require('q');
 import nedb = require('nedb');
@@ -147,7 +147,7 @@ class BaseCollection<T> {
         return deferred.promise;
     }
 
-    public update(query:Object, updateQuery:Object, options?:NeDB.UpdateOptions):Q.Promise<number> {
+    public update(query:Object, updateQuery:Object, options?:any):Q.Promise<number> {
 
         var deferred = Q.defer<number>();
 
diff --git a/nedb/nedb.d.ts b/nedb/nedb.d.ts
deleted file mode 100644
index 8ae1f99d1b..0000000000
--- a/nedb/nedb.d.ts
+++ /dev/null
@@ -1,207 +0,0 @@
-// Type definitions for NeDB
-// Project: https://github.com/louischatriot/nedb
-// Definitions by: Stefan Steinhart <https://github.com/reppners>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "nedb" {
-
-    class NeDBDataStore {
-
-        constructor();
-        constructor(path:string);
-        constructor(options:NeDB.DataStoreOptions);
-
-        persistence:NeDB.Persistence;
-
-        /**
-         * Load the database from the datafile, and trigger the execution of buffered commands if any
-         */
-        loadDatabase(cb?:(err:Error)=>void):void;
-
-        /**
-         * Get an array of all the data in the database
-         */
-        getAllData():Array<any>;
-
-
-        /**
-         * Reset all currently defined indexes
-         */
-        resetIndexes(newData:any):void;
-
-        /**
-         * Ensure an index is kept for this field. Same parameters as lib/indexes
-         * For now this function is synchronous, we need to test how much time it takes
-         * We use an async API for consistency with the rest of the code
-         * @param {String} options.fieldName
-         * @param {Boolean} options.unique
-         * @param {Boolean} options.sparse
-         * @param {Function} cb Optional callback, signature: err
-         */
-        ensureIndex(options:NeDB.EnsureIndexOptions, cb?:(err:Error)=>void):void;
-
-        /**
-         * Remove an index
-         * @param {String} fieldName
-         * @param {Function} cb Optional callback, signature: err
-         */
-        removeIndex(fieldName:string, cb?:(err:Error)=>void):void;
-
-        /**
-         * Add one or several document(s) to all indexes
-         */
-        addToIndexes<T>(doc:T):void;
-        addToIndexes<T>(doc:Array<T>):void;
-
-        /**
-         * Remove one or several document(s) from all indexes
-         */
-        removeFromIndexes<T>(doc:T):void;
-        removeFromIndexes<T>(doc:Array<T>):void;
-
-        /**
-         * Update one or several documents in all indexes
-         * To update multiple documents, oldDoc must be an array of { oldDoc, newDoc } pairs
-         * If one update violates a constraint, all changes are rolled back
-         */
-        updateIndexes<T>(oldDoc:T, newDoc:T):void;
-        updateIndexes<T>(updates:Array<{oldDoc:T; newDoc:T;}>):void;
-
-        /**
-         * Return the list of candidates for a given query
-         * Crude implementation for now, we return the candidates given by the first usable index if any
-         * We try the following query types, in this order: basic match, $in match, comparison match
-         * One way to make it better would be to enable the use of multiple indexes if the first usable index
-         * returns too much data. I may do it in the future.
-         *
-         * TODO: needs to be moved to the Cursor module
-         */
-        getCandidates(query:any):void;
-
-        /**
-         * Insert a new document
-         * @param {Function} cb Optional callback, signature: err, insertedDoc
-         */
-        insert<T>(newDoc:T, cb?:(err:Error, document:T)=>void):void;
-
-        /**
-         * Count all documents matching the query
-         * @param {any} query MongoDB-style query
-         */
-        count(query:any, callback:(err:Error, n:number)=>void):void;
-        count(query:any):NeDB.CursorCount;
-
-        /**
-         * Find all documents matching the query
-         * If no callback is passed, we return the cursor so that user can limit, skip and finally exec
-         * @param {any} query MongoDB-style query
-         * @param {any} projection MongoDB-style projection
-         */
-        find<T>(query:any, projection:T, callback:(err:Error, documents:Array<T>)=>void):void;
-        find<T>(query:any, projection:T):NeDB.Cursor<T>;
-
-        /**
-         * Find all documents matching the query
-         * If no callback is passed, we return the cursor so that user can limit, skip and finally exec
-         * * @param {any} query MongoDB-style query
-         */
-        find<T>(query:any, callback:(err:Error, documents:Array<T>)=>void):void;
-        find<T>(query:any):NeDB.Cursor<T>;
-
-        /**
-         * Find one document matching the query
-         * @param {any} query MongoDB-style query
-         * @param {any} projection MongoDB-style projection
-         */
-        findOne<T>(query:any, projection:T, callback:(err:Error, document:T)=>void):void;
-
-        /**
-         * Find one document matching the query
-         * @param {any} query MongoDB-style query
-         */
-        findOne<T>(query:any, callback:(err:Error, document:T)=>void):void;
-
-        /**
-         * Update all docs matching query
-         * For now, very naive implementation (recalculating the whole database)
-         * @param {any} query
-         * @param {any} updateQuery
-         * @param {Object} options Optional options
-         *                 options.multi If true, can update multiple documents (defaults to false)
-         *                 options.upsert If true, document is inserted if the query doesn't match anything
-         * @param {Function} cb Optional callback, signature: err, numReplaced, upsert (set to true if the update was in fact an upsert)
-         *
-         * @api private Use Datastore.update which has the same signature
-         */
-        update(query:any, updateQuery:any, options?:NeDB.UpdateOptions, cb?:(err:Error, numberOfUpdated:number, upsert:boolean)=>void):void;
-
-        /**
-         * Remove all docs matching the query
-         * For now very naive implementation (similar to update)
-         * @param {Object} query
-         * @param {Object} options Optional options
-         *                 options.multi If true, can update multiple documents (defaults to false)
-         * @param {Function} cb Optional callback, signature: err, numRemoved
-         *
-         * @api private Use Datastore.remove which has the same signature
-         */
-        remove(query:any, options:NeDB.RemoveOptions, cb?:(err:Error, n:number)=>void):void;
-        remove(query:any, cb?:(err:Error, n:number)=>void):void;
-    }
-
-    export = NeDBDataStore;
-}
-
-declare namespace NeDB {
-
-    interface Cursor<T> {
-        sort(query:any):Cursor<T>;
-        skip(n:number):Cursor<T>;
-        limit(n:number):Cursor<T>;
-        projection(query:any):Cursor<T>;
-        exec(callback:(err:Error, documents:Array<T>)=>void):void;
-    }
-
-    interface CursorCount {
-        exec(callback:(err:Error, count:number)=>void):void;
-    }
-
-    interface DataStoreOptions {
-        filename?:string // Optional, datastore will be in-memory only if not provided
-        inMemoryOnly?:boolean // Optional, default to false
-        nodeWebkitAppName?:boolean // Optional, specify the name of your NW app if you want options.filename to be relative to the directory where
-        autoload?:boolean // Optional, defaults to false
-        onload?:(error:Error)=>any // Optional, if autoload is used this will be called after the load database with the error object as parameter. If you don't pass it the error will be thrown
-        afterSerialization?:(line:string)=>string; // (optional): hook you can use to transform data after it was serialized and before it is written to disk. Can be used for example to encrypt data before writing database to disk. This function takes a string as parameter (one line of an NeDB data file) and outputs the transformed string, which must absolutely not contain a \n character (or data will be lost)
-        beforeDeserialization?:(line:string)=>string; // (optional): reverse of afterSerialization. Make sure to include both and not just one or you risk data loss. For the same reason, make sure both functions are inverses of one another. Some failsafe mechanisms are in place to prevent data loss if you misuse the serialization hooks: NeDB checks that never one is declared without the other, and checks that they are reverse of one another by testing on random strings of various lengths. In addition, if too much data is detected as corrupt, NeDB will refuse to start as it could mean you're not using the deserialization hook corresponding to the serialization hook used before (see below)
-        corruptAlertThreshold?:number; // (optional): between 0 and 1, defaults to 10%. NeDB will refuse to start if more than this percentage of the datafile is corrupt. 0 means you don't tolerate any corruption, 1 means you don't care
-    }
-
-    /**
-     * multi (defaults to false) which allows the modification of several documents if set to true
-     * upsert (defaults to false) if you want to insert a new document corresponding to the update rules if your query doesn't match anything
-     */
-    interface UpdateOptions {
-        multi?: boolean;
-        upsert?: boolean;
-    }
-
-    /**
-     * options only one option for now: multi which allows the removal of multiple documents if set to true. Default is false
-     */
-    interface RemoveOptions {
-        multi?:boolean
-    }
-
-    interface EnsureIndexOptions {
-        fieldName:string;
-        unique?:boolean;
-        sparse?:boolean;
-    }
-
-    interface Persistence {
-        compactDatafile():void;
-        setAutocompactionInterval(interval:number):void;
-        stopAutocompaction():void;
-    }
-}
diff --git a/nedb/tsconfig.json b/nedb/tsconfig.json
new file mode 100644
index 0000000000..eecb859d96
--- /dev/null
+++ b/nedb/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "nedb-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/needle/index.d.ts b/needle/index.d.ts
new file mode 100644
index 0000000000..63270e3ff8
--- /dev/null
+++ b/needle/index.d.ts
@@ -0,0 +1,97 @@
+// Type definitions for needle 0.7.8
+// Project: https://github.com/tomas/needle
+// Definitions by: San Chen <https://github.com/bigsan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare var needle: Needle.NeedleStatic;
+export = needle;
+
+declare namespace Needle {
+	interface ReadableStream extends NodeJS.ReadableStream {
+	}
+
+    interface Callback {
+        (error: Error, response: any, body: any): void;
+    }
+
+    interface RequestOptions {
+        timeout?: number;
+        follow?: number;
+        follow_max?: number;
+        multipart?: boolean;
+        proxy?: string;
+        agent?: string;
+        headers?: HttpHeaderOptions;
+        auth?: string; // auto | digest | basic (default)
+        json?: boolean;
+
+        // These properties are overwritten by those in the 'headers' field
+        compressed?: boolean;
+        cookies?: { [name: string]: any; };
+        // Overwritten if present in the URI
+        username?: string;
+        password?: string;
+    }
+
+    interface ResponseOptions {
+        decode?: boolean;
+        parse?: boolean;
+        output?: any;
+    }
+
+    interface HttpHeaderOptions {
+        cookies?: { [name: string]: any; };
+        compressed?: boolean;
+        accept?: string;
+        connection?: string;
+        user_agent?: string;
+
+        // Overwritten if present in the URI
+        username?: string;
+        password?: string;
+    }
+
+    interface TLSOptions {
+        pfx?: any;
+        key?: any;
+        passphrase?: string;
+        cert?: any;
+        ca?: any;
+        ciphers?: any;
+        rejectUnauthorized?: boolean;
+        secureProtocol?: any;
+    }
+
+    interface NeedleOptions extends RequestOptions, ResponseOptions, HttpHeaderOptions, TLSOptions {
+    }
+
+    interface NeedleStatic {
+        defaults(options?: any): void;
+
+        head(url: string): ReadableStream;
+        head(url: string, callback?: Callback): ReadableStream;
+        head(url: string, options?: RequestOptions, callback?: Callback): ReadableStream;
+
+        get(url: string): ReadableStream;
+        get(url: string, callback?: Callback): ReadableStream;
+        get(url: string, options?: RequestOptions, callback?: Callback): ReadableStream;
+
+        post(url: string, data: any): ReadableStream;
+        post(url: string, data: any, callback?: Callback): ReadableStream;
+        post(url: string, data: any, options?: RequestOptions, callback?: Callback): ReadableStream;
+
+        put(url: string, data: any): ReadableStream;
+        put(url: string, data: any, callback?: Callback): ReadableStream;
+        put(url: string, data: any, options?: RequestOptions, callback?: Callback): ReadableStream;
+
+        delete(url: string, data: any): ReadableStream;
+        delete(url: string, data: any, callback?: Callback): ReadableStream;
+        delete(url: string, data: any, options?: RequestOptions, callback?: Callback): ReadableStream;
+
+        request(method: string, url: string, data: any): ReadableStream;
+        request(method: string, url: string, data: any, callback?: Callback): ReadableStream;
+        request(method: string, url: string, data: any, options?: RequestOptions, callback?: Callback): ReadableStream;
+    }
+}
diff --git a/needle/needle-tests.ts b/needle/needle-tests.ts
index 106d46a716..4db70f008c 100644
--- a/needle/needle-tests.ts
+++ b/needle/needle-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="needle.d.ts" />
+
 
 import needle = require("needle");
 
diff --git a/needle/needle.d.ts b/needle/needle.d.ts
deleted file mode 100644
index 449368e185..0000000000
--- a/needle/needle.d.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-// Type definitions for needle 0.7.8
-// Project: https://github.com/tomas/needle
-// Definitions by: San Chen <https://github.com/bigsan>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare namespace Needle {
-	interface ReadableStream extends NodeJS.ReadableStream {
-	}
-
-    interface Callback {
-        (error: Error, response: any, body: any): void;
-    }
-
-    interface RequestOptions {
-        timeout?: number;
-        follow?: number;
-        follow_max?: number;
-        multipart?: boolean;
-        proxy?: string;
-        agent?: string;
-        headers?: HttpHeaderOptions;
-        auth?: string; // auto | digest | basic (default)
-        json?: boolean;
-
-        // These properties are overwritten by those in the 'headers' field
-        compressed?: boolean;
-        cookies?: { [name: string]: any; };
-        // Overwritten if present in the URI
-        username?: string;
-        password?: string;
-    }
-
-    interface ResponseOptions {
-        decode?: boolean;
-        parse?: boolean;
-        output?: any;
-    }
-
-    interface HttpHeaderOptions {
-        cookies?: { [name: string]: any; };
-        compressed?: boolean;
-        accept?: string;
-        connection?: string;
-        user_agent?: string;
-
-        // Overwritten if present in the URI
-        username?: string;
-        password?: string;
-    }
-
-    interface TLSOptions {
-        pfx?: any;
-        key?: any;
-        passphrase?: string;
-        cert?: any;
-        ca?: any;
-        ciphers?: any;
-        rejectUnauthorized?: boolean;
-        secureProtocol?: any;
-    }
-
-    interface NeedleOptions extends RequestOptions, ResponseOptions, HttpHeaderOptions, TLSOptions {
-    }
-
-    interface NeedleStatic {
-        defaults(options?: any): void;
-
-        head(url: string): ReadableStream;
-        head(url: string, callback?: Callback): ReadableStream;
-        head(url: string, options?: RequestOptions, callback?: Callback): ReadableStream;
-
-        get(url: string): ReadableStream;
-        get(url: string, callback?: Callback): ReadableStream;
-        get(url: string, options?: RequestOptions, callback?: Callback): ReadableStream;
-
-        post(url: string, data: any): ReadableStream;
-        post(url: string, data: any, callback?: Callback): ReadableStream;
-        post(url: string, data: any, options?: RequestOptions, callback?: Callback): ReadableStream;
-
-        put(url: string, data: any): ReadableStream;
-        put(url: string, data: any, callback?: Callback): ReadableStream;
-        put(url: string, data: any, options?: RequestOptions, callback?: Callback): ReadableStream;
-
-        delete(url: string, data: any): ReadableStream;
-        delete(url: string, data: any, callback?: Callback): ReadableStream;
-        delete(url: string, data: any, options?: RequestOptions, callback?: Callback): ReadableStream;
-
-        request(method: string, url: string, data: any): ReadableStream;
-        request(method: string, url: string, data: any, callback?: Callback): ReadableStream;
-        request(method: string, url: string, data: any, options?: RequestOptions, callback?: Callback): ReadableStream;
-    }
-}
-
-declare module "needle" {
-    var needle: Needle.NeedleStatic;
-    export = needle;
-}
diff --git a/needle/tsconfig.json b/needle/tsconfig.json
new file mode 100644
index 0000000000..cf2efab434
--- /dev/null
+++ b/needle/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "needle-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/netmask/index.d.ts b/netmask/index.d.ts
new file mode 100644
index 0000000000..2b1768b467
--- /dev/null
+++ b/netmask/index.d.ts
@@ -0,0 +1,46 @@
+// Type definitions for Netmask 1.0.5
+// Project: https://github.com/rs/node-netmask
+// Definitions by: Matt Frantz <https://github.com/mhfrantz/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// netmask.d.ts
+
+
+
+export declare function long2ip(long: number): string;
+export declare function ip2long(ip: string): number;
+
+export declare class Netmask {
+    maskLong: number;
+    bitmask: number;
+    netLong: number;
+    // The number of IP address in the block (eg.: 254)
+    size: number;
+    // The address of the network block as a string (eg.: 216.240.32.0)
+    base: string;
+    // The netmask as a string (eg.: 255.255.255.0)
+    mask: string;
+    // The host mask, the opposite of the netmask (eg.: 0.0.0.255)
+    hostmask: string;
+    // The first usable address of the block
+    first: string;
+    // The last  usable address of the block
+    last: string;
+    // The block's broadcast address: the last address of the block (eg.: 192.168.1.255)
+    broadcast: string;
+
+    constructor(netmask: string);
+    constructor(net: string, mask: string);
+
+    // Returns true if the given ip or netmask is contained in the block
+    contains(ip: string | Netmask | number): boolean;
+
+    // Returns the Netmask object for the block which follow this one
+    next(count?: number): Netmask;
+
+    // Evaluate a function on each IP address
+    forEach(fn: (ip: string, long: number, index: number) => void): void;
+
+    // Returns the complete netmask formatted as `base/bitmask`
+    toString(): string;
+}
diff --git a/netmask/netmask-tests.ts b/netmask/netmask-tests.ts
index 519e1722e3..4532ecd3b5 100644
--- a/netmask/netmask-tests.ts
+++ b/netmask/netmask-tests.ts
@@ -1,5 +1,4 @@
 
-///<reference path="netmask.d.ts" />
 
 import netmask = require('netmask');
 
diff --git a/netmask/netmask.d.ts b/netmask/netmask.d.ts
deleted file mode 100644
index 698a834fbb..0000000000
--- a/netmask/netmask.d.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-// Type definitions for Netmask 1.0.5
-// Project: https://github.com/rs/node-netmask
-// Definitions by: Matt Frantz <https://github.com/mhfrantz/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// netmask.d.ts
-
-declare module 'netmask' {
-
-  export function long2ip(long: number): string;
-  export function ip2long(ip: string): number;
-
-  export class Netmask {
-    maskLong: number;
-    bitmask: number;
-    netLong: number;
-    // The number of IP address in the block (eg.: 254)
-    size: number;
-    // The address of the network block as a string (eg.: 216.240.32.0)
-    base: string;
-    // The netmask as a string (eg.: 255.255.255.0)
-    mask: string;
-    // The host mask, the opposite of the netmask (eg.: 0.0.0.255)
-    hostmask: string;
-    // The first usable address of the block
-    first: string;
-    // The last  usable address of the block
-    last: string;
-    // The block's broadcast address: the last address of the block (eg.: 192.168.1.255)
-    broadcast: string;
-
-    constructor (netmask: string);
-    constructor (net: string, mask: string);
-
-    // Returns true if the given ip or netmask is contained in the block
-    contains(ip: string | Netmask | number): boolean;
-
-    // Returns the Netmask object for the block which follow this one
-    next(count?: number): Netmask;
-
-    // Evaluate a function on each IP address
-    forEach(fn: (ip: string, long: number, index: number) => void): void;
-
-    // Returns the complete netmask formatted as `base/bitmask`
-    toString(): string;
-  }
-}
diff --git a/netmask/tsconfig.json b/netmask/tsconfig.json
new file mode 100644
index 0000000000..1bbd08da0d
--- /dev/null
+++ b/netmask/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "netmask-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/nexpect/index.d.ts b/nexpect/index.d.ts
new file mode 100644
index 0000000000..8ee97809ff
--- /dev/null
+++ b/nexpect/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for nexpect 0.4.2
+// Project: https://github.com/nodejitsu/nexpect
+// Definitions by: vvakame <http://github.com/vvakame>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import child_process = require("child_process");
+
+declare function spawn(command: string[], options?: ISpawnOptions): IChain;
+
+declare function spawn(command: string, params?: any[], options?: ISpawnOptions): IChain;
+
+declare function spawn(command: string, options?: ISpawnOptions): IChain;
+
+interface IChain {
+    expect(expectation: string): IChain;
+    expect(expectation: RegExp): IChain;
+    wait(expectation: string): IChain;
+    wait(expectation: RegExp): IChain;
+    sendline(line: string): IChain;
+    sendEof(): IChain;
+    run(callback: (err: Error, output: string[], exit: string | number) => void): child_process.ChildProcess;
+}
+
+interface ISpawnOptions {
+    cwd?: string;
+    env?: any;
+    ignoreCase?: any;
+    stripColors?: any;
+    stream?: any;
+    verbose?: any;
+}
diff --git a/nexpect/nexpect-tests.ts b/nexpect/nexpect-tests.ts
index d584329227..14af939c52 100644
--- a/nexpect/nexpect-tests.ts
+++ b/nexpect/nexpect-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./nexpect.d.ts" />
 
 import nexpect = require('nexpect');
 
diff --git a/nexpect/nexpect.d.ts b/nexpect/nexpect.d.ts
deleted file mode 100644
index e3326fe324..0000000000
--- a/nexpect/nexpect.d.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// Type definitions for nexpect 0.4.2
-// Project: https://github.com/nodejitsu/nexpect
-// Definitions by: vvakame <http://github.com/vvakame>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "nexpect" {
-    import child_process = require("child_process");
-
-    function spawn(command:string[], options?:ISpawnOptions):IChain;
-
-    function spawn(command:string, params?:any[], options?:ISpawnOptions):IChain;
-
-    function spawn(command:string, options?:ISpawnOptions):IChain;
-
-    interface IChain {
-        expect(expectation:string):IChain;
-        expect(expectation:RegExp):IChain;
-        wait(expectation:string):IChain;
-        wait(expectation:RegExp):IChain;
-        sendline(line:string):IChain;
-        sendEof():IChain;
-        run(callback:(err:Error, output:string[], exit: string | number)=>void):child_process.ChildProcess;
-    }
-
-    interface ISpawnOptions {
-        cwd?:string;
-        env?:any;
-        ignoreCase?:any;
-        stripColors?:any;
-        stream?:any;
-        verbose?:any;
-    }
-}
diff --git a/nexpect/tsconfig.json b/nexpect/tsconfig.json
new file mode 100644
index 0000000000..3368d8a961
--- /dev/null
+++ b/nexpect/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "nexpect-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ng-command/index.d.ts b/ng-command/index.d.ts
new file mode 100644
index 0000000000..2b80057f75
--- /dev/null
+++ b/ng-command/index.d.ts
@@ -0,0 +1,51 @@
+// Type definitions for ng-command 0.2.0
+// Project: https://github.com/stephenlautier/ng-command
+// Definitions by: Stephen Lautier <https://github.com/stephenlautier>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare namespace ngCommand {
+
+	var ModuleName: string;
+
+	/**
+	* Command proxy object.
+	*/
+	interface ICommand {
+		/**
+		* Determines whether the command is currently executing.
+		*/
+		isExecuting: boolean;
+		/**
+		* Determines whether the command can execute or not.
+		*/
+		canExecute: boolean;
+		/**
+		* Executes the command function.
+		*/
+		execute: () => angular.IPromise<any>;
+	}
+
+	class Command implements ICommand {
+		static id: string;
+
+		isExecuting: boolean;
+		canExecute: boolean;
+		constructor($scope: angular.IScope, execute: () => angular.IPromise<any>, canExecute?: () => boolean);
+		execute(): angular.IPromise<any>;
+	}
+
+	/**
+	* Command factory which creates instances of @see ICommand.
+	*/
+	interface ICommandFactory {
+		/**
+		* Factory instance creator method.
+		* @param $scope Scope which will keep track of the command.
+		* @param execute The execute function when the command is executed.
+		* @param canExecute Additional function which determines whether the command can executes.
+		*/
+		($scope: angular.IScope, execute: () => angular.IPromise<any>, canExecute?: () => boolean): ICommand;
+	}
+}
diff --git a/ng-command/ng-command-tests.ts b/ng-command/ng-command-tests.ts
index 77fea7b400..640022bb2d 100644
--- a/ng-command/ng-command-tests.ts
+++ b/ng-command/ng-command-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="ng-command.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
+
+/// <reference types="angularjs" />
 
 var app = angular.module('testModule', ['ng-command']);
 
diff --git a/ng-command/ng-command.d.ts b/ng-command/ng-command.d.ts
deleted file mode 100644
index f06dc44110..0000000000
--- a/ng-command/ng-command.d.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-// Type definitions for ng-command 0.2.0
-// Project: https://github.com/stephenlautier/ng-command
-// Definitions by: Stephen Lautier <https://github.com/stephenlautier>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace ngCommand {
-
-	var ModuleName: string;
-
-	/**
-	* Command proxy object.
-	*/
-	interface ICommand {
-		/**
-		* Determines whether the command is currently executing.
-		*/
-		isExecuting: boolean;
-		/**
-		* Determines whether the command can execute or not.
-		*/
-		canExecute: boolean;
-		/**
-		* Executes the command function.
-		*/
-		execute: () => angular.IPromise<any>;
-	}
-
-	class Command implements ICommand {
-		static id: string;
-
-		isExecuting: boolean;
-		canExecute: boolean;
-		constructor($scope: angular.IScope, execute: () => angular.IPromise<any>, canExecute?: () => boolean);
-		execute(): angular.IPromise<any>;
-	}
-
-	/**
-	* Command factory which creates instances of @see ICommand.
-	*/
-	interface ICommandFactory {
-		/**
-		* Factory instance creator method.
-		* @param $scope Scope which will keep track of the command.
-		* @param execute The execute function when the command is executed.
-		* @param canExecute Additional function which determines whether the command can executes.
-		*/
-		($scope: angular.IScope, execute: () => angular.IPromise<any>, canExecute?: () => boolean): ICommand;
-	}
-}
diff --git a/ng-command/tsconfig.json b/ng-command/tsconfig.json
new file mode 100644
index 0000000000..18696fc719
--- /dev/null
+++ b/ng-command/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ng-command-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ng-cordova/actionSheet-tests.ts b/ng-cordova/actionSheet-tests.ts
index 4b73349ef3..e7e2da2326 100644
--- a/ng-cordova/actionSheet-tests.ts
+++ b/ng-cordova/actionSheet-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="tsd.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
+
+/// <reference types="angularjs" />
 
 namespace ngCordova {
     'use strict';
diff --git a/ng-cordova/actionSheet.d.ts b/ng-cordova/actionSheet.d.ts
index 31482f337a..306ef924e8 100644
--- a/ng-cordova/actionSheet.d.ts
+++ b/ng-cordova/actionSheet.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Phil McCloghry-Laing <https://github.com/pmccloghrylaing>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../angularjs/angular.d.ts" />
+/// <reference types="angularjs" />
 
 declare namespace ngCordova {
     export interface IActionSheetService {
diff --git a/ng-cordova/app-version-tests.ts b/ng-cordova/app-version-tests.ts
index cd38348623..45c978a5a1 100644
--- a/ng-cordova/app-version-tests.ts
+++ b/ng-cordova/app-version-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="app-version.d.ts" />
+
 
 namespace ngCordova {
     function test($cordovaAppVersion: IAppVersionService) {
diff --git a/ng-cordova/app-version.d.ts b/ng-cordova/app-version.d.ts
index 0e800b284e..6f48e9befe 100644
--- a/ng-cordova/app-version.d.ts
+++ b/ng-cordova/app-version.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Jacques Kang <https://www.linkedin.com/in/jacqueskang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../angularjs/angular.d.ts" />
+/// <reference types="angularjs" />
 
 declare namespace ngCordova {
     export interface IAppVersionService {
diff --git a/ng-cordova/appAvailability-tests.ts b/ng-cordova/appAvailability-tests.ts
index c9e2be537b..01dd597306 100644
--- a/ng-cordova/appAvailability-tests.ts
+++ b/ng-cordova/appAvailability-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="tsd.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="../ionic/ionic.d.ts" />
+
+/// <reference types="angularjs" />
+/// <reference types="ionic" />
 
 // For the full application demo please see following repo :
 // https://github.com/ksachdeva/ngCordova-typescript-demo
diff --git a/ng-cordova/appAvailability.d.ts b/ng-cordova/appAvailability.d.ts
index 22eaee1a46..9d2d6c8af1 100644
--- a/ng-cordova/appAvailability.d.ts
+++ b/ng-cordova/appAvailability.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Kapil Sachdeva <https://github.com/ksachdeva>
 // Definitions: https://github.com/ksachdeva/DefinitelyTyped
 
-/// <reference path="../angularjs/angular.d.ts" />
+/// <reference types="angularjs" />
 
 declare namespace ngCordova {
 
diff --git a/ng-cordova/badge-tests.ts b/ng-cordova/badge-tests.ts
index c27adacf9a..e5ee7df3d4 100644
--- a/ng-cordova/badge-tests.ts
+++ b/ng-cordova/badge-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="tsd.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
+
+/// <reference types="angularjs" />
 
 namespace ngCordova {
     'use strict';
diff --git a/ng-cordova/badge.d.ts b/ng-cordova/badge.d.ts
index 9d3e23a057..4e230928c4 100644
--- a/ng-cordova/badge.d.ts
+++ b/ng-cordova/badge.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Phil McCloghry-Laing <https://github.com/pmccloghrylaing>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../angularjs/angular.d.ts" />
+/// <reference types="angularjs" />
 
 declare namespace ngCordova {
     export interface IBadgeService {
diff --git a/ng-cordova/camera-tests.ts b/ng-cordova/camera-tests.ts
index 7b955d2621..0acf46b23d 100644
--- a/ng-cordova/camera-tests.ts
+++ b/ng-cordova/camera-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="camera.d.ts" />
+
 
 namespace ngCordova {
     function cameraTest($cordovaCamera: ICameraService) {
diff --git a/ng-cordova/camera.d.ts b/ng-cordova/camera.d.ts
index 66b93ca2c1..903da00375 100644
--- a/ng-cordova/camera.d.ts
+++ b/ng-cordova/camera.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Jacques Kang <https://www.linkedin.com/in/jacqueskang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../cordova/plugins/Camera.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
+/// <reference types="Camera" />
+/// <reference types="angularjs" />
 
 declare namespace ngCordova {
     export interface ICameraService {
diff --git a/ng-cordova/datepicker-tests.ts b/ng-cordova/datepicker-tests.ts
index 517abd0054..c2d4bb2c37 100644
--- a/ng-cordova/datepicker-tests.ts
+++ b/ng-cordova/datepicker-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="datepicker.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+
+/// <reference types="jquery" />
 
 namespace ngCordova {
     function smoketest($cordovaDatePicker: IDatePickerService, isIos: boolean) {
diff --git a/ng-cordova/datepicker.d.ts b/ng-cordova/datepicker.d.ts
index 66e06808aa..552eb71125 100644
--- a/ng-cordova/datepicker.d.ts
+++ b/ng-cordova/datepicker.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Jacques Kang <https://www.linkedin.com/in/jacqueskang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../angularjs/angular.d.ts" />
+/// <reference types="angularjs" />
 
 declare namespace ngCordova {
 
diff --git a/ng-cordova/device-tests.ts b/ng-cordova/device-tests.ts
index 37a30bf663..597073458a 100644
--- a/ng-cordova/device-tests.ts
+++ b/ng-cordova/device-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="device.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="../ionic/ionic.d.ts" />
+
+/// <reference types="angularjs" />
+/// <reference types="ionic" />
 
 // For the full application demo please see following repo :
 // https://github.com/ksachdeva/ngCordova-typescript-demo
diff --git a/ng-cordova/deviceMotion-tests.ts b/ng-cordova/deviceMotion-tests.ts
index b838661978..ed2ae62a16 100644
--- a/ng-cordova/deviceMotion-tests.ts
+++ b/ng-cordova/deviceMotion-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="tsd.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="../ionic/ionic.d.ts" />
+
+/// <reference types="angularjs" />
+/// <reference types="ionic" />
 
 // For the full application demo please see following repo :
 // https://github.com/ksachdeva/ngCordova-typescript-demo
diff --git a/ng-cordova/deviceMotion.d.ts b/ng-cordova/deviceMotion.d.ts
index db78c348b7..de58afa684 100644
--- a/ng-cordova/deviceMotion.d.ts
+++ b/ng-cordova/deviceMotion.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michel Vidailhet <https://github.com/mvidailhet>, Kapil Sachdeva <https://github.com/ksachdeva>
 // Definitions: https://github.com/ksachdeva/DefinitelyTyped
 
-/// <reference path="../angularjs/angular.d.ts" />
+/// <reference types="angularjs" />
 
 declare namespace ngCordova {
 
diff --git a/ng-cordova/deviceOrientation-tests.ts b/ng-cordova/deviceOrientation-tests.ts
index b192fe583e..96270c71c3 100644
--- a/ng-cordova/deviceOrientation-tests.ts
+++ b/ng-cordova/deviceOrientation-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="tsd.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="../ionic/ionic.d.ts" />
+
+/// <reference types="angularjs" />
+/// <reference types="ionic" />
 
 // For the full application demo please see following repo :
 // https://github.com/ksachdeva/ngCordova-typescript-demo
diff --git a/ng-cordova/deviceOrientation.d.ts b/ng-cordova/deviceOrientation.d.ts
index c4e3549283..26beaeb2ea 100644
--- a/ng-cordova/deviceOrientation.d.ts
+++ b/ng-cordova/deviceOrientation.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michel Vidailhet <https://github.com/mvidailhet>, Kapil Sachdeva <https://github.com/ksachdeva>
 // Definitions: https://github.com/ksachdeva/DefinitelyTyped
 
-/// <reference path="../angularjs/angular.d.ts" />
+/// <reference types="angularjs" />
 
 declare namespace ngCordova {
 
diff --git a/ng-cordova/dialogs-tests.ts b/ng-cordova/dialogs-tests.ts
index 2e6c152b9c..74ad19d2bf 100644
--- a/ng-cordova/dialogs-tests.ts
+++ b/ng-cordova/dialogs-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="tsd.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="../ionic/ionic.d.ts" />
+
+/// <reference types="angularjs" />
+/// <reference types="ionic" />
 
 // For the full application demo please see following repo :
 // https://github.com/ksachdeva/ngCordova-typescript-demo
diff --git a/ng-cordova/dialogs.d.ts b/ng-cordova/dialogs.d.ts
index 92f5f3e8c2..39b58889de 100644
--- a/ng-cordova/dialogs.d.ts
+++ b/ng-cordova/dialogs.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michel Vidailhet <https://github.com/mvidailhet>, Kapil Sachdeva <https://github.com/ksachdeva>
 // Definitions: https://github.com/ksachdeva/DefinitelyTyped
 
-/// <reference path="../angularjs/angular.d.ts" />
+/// <reference types="angularjs" />
 
 declare namespace ngCordova {
 
diff --git a/ng-cordova/emailComposer-tests.ts b/ng-cordova/emailComposer-tests.ts
index 8880939a51..89c686775a 100644
--- a/ng-cordova/emailComposer-tests.ts
+++ b/ng-cordova/emailComposer-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="tsd.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="../ionic/ionic.d.ts" />
+
+/// <reference types="angularjs" />
+/// <reference types="ionic" />
 
 // For the full application demo please see following repo :
 // https://github.com/ksachdeva/ngCordova-typescript-demo
diff --git a/ng-cordova/emailComposer.d.ts b/ng-cordova/emailComposer.d.ts
index b91d217073..1fa18e1265 100644
--- a/ng-cordova/emailComposer.d.ts
+++ b/ng-cordova/emailComposer.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Kapil Sachdeva <https://github.com/ksachdeva>
 // Definitions: https://github.com/ksachdeva/DefinitelyTyped
 
-/// <reference path="../angularjs/angular.d.ts" />
+/// <reference types="angularjs" />
 
 declare namespace ngCordova {
 
diff --git a/ng-cordova/file-tests.ts b/ng-cordova/file-tests.ts
index b430487cf9..aae6822a73 100644
--- a/ng-cordova/file-tests.ts
+++ b/ng-cordova/file-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="tsd.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="../cordova/cordova.d.ts" />
+
+/// <reference types="angularjs" />
+/// <reference types="cordova" />
 
 namespace ngCordova {
     'use strict';
diff --git a/ng-cordova/file.d.ts b/ng-cordova/file.d.ts
index 081fe67778..bf28a1d424 100644
--- a/ng-cordova/file.d.ts
+++ b/ng-cordova/file.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Phil McCloghry-Laing <https://github.com/pmccloghrylaing>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="../cordova/plugins/FileSystem.d.ts" />
+/// <reference types="angularjs" />
+/// <reference types="FileSystem" />
 
 declare namespace ngCordova {
     export interface IFileService {
diff --git a/ng-cordova/fileTransfer-tests.ts b/ng-cordova/fileTransfer-tests.ts
index c56f1f8b3d..5a89c614e1 100644
--- a/ng-cordova/fileTransfer-tests.ts
+++ b/ng-cordova/fileTransfer-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="tsd.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="../cordova/cordova.d.ts" />
+
+/// <reference types="angularjs" />
+/// <reference types="cordova" />
 
 namespace ngCordova {
     'use strict';
diff --git a/ng-cordova/fileTransfer.d.ts b/ng-cordova/fileTransfer.d.ts
index d1222e8a61..0dcae52ee4 100644
--- a/ng-cordova/fileTransfer.d.ts
+++ b/ng-cordova/fileTransfer.d.ts
@@ -3,9 +3,9 @@
 // Definitions by: Phil McCloghry-Laing <https://github.com/pmccloghrylaing>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="../cordova/plugins/FileTransfer.d.ts" />
-/// <reference path="../cordova/plugins/FileSystem.d.ts" />
+/// <reference types="angularjs" />
+/// <reference types="FileTransfer" />
+/// <reference types="FileSystem" />
 
 declare namespace ngCordova {
     export interface IFileTransferService {
diff --git a/ng-cordova/geolocation-tests.ts b/ng-cordova/geolocation-tests.ts
index 731280de7c..0c60a993a7 100644
--- a/ng-cordova/geolocation-tests.ts
+++ b/ng-cordova/geolocation-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="tsd.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="../ionic/ionic.d.ts" />
+
+/// <reference types="angularjs" />
+/// <reference types="ionic" />
 
 // For the full application demo please see following repo :
 // https://github.com/ksachdeva/ngCordova-typescript-demo
diff --git a/ng-cordova/geolocation.d.ts b/ng-cordova/geolocation.d.ts
index dc65f93d61..5f30a79663 100644
--- a/ng-cordova/geolocation.d.ts
+++ b/ng-cordova/geolocation.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Kapil Sachdeva <https://github.com/ksachdeva>
 // Definitions: https://github.com/ksachdeva/DefinitelyTyped
 
-/// <reference path="../angularjs/angular.d.ts" />
+/// <reference types="angularjs" />
 
 declare namespace ngCordova {
 
diff --git a/ng-cordova/tsd.d.ts b/ng-cordova/index.d.ts
similarity index 100%
rename from ng-cordova/tsd.d.ts
rename to ng-cordova/index.d.ts
diff --git a/ng-cordova/network-tests.ts b/ng-cordova/network-tests.ts
index 35b270cbe5..822d42aed9 100644
--- a/ng-cordova/network-tests.ts
+++ b/ng-cordova/network-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="tsd.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="../ionic/ionic.d.ts" />
+
+/// <reference types="angularjs" />
+/// <reference types="ionic" />
 
 // For the full application demo please see following repo :
 // https://github.com/ksachdeva/ngCordova-typescript-demo
diff --git a/ng-cordova/network.d.ts b/ng-cordova/network.d.ts
index 71b9d9f82a..e92a2e0e2a 100644
--- a/ng-cordova/network.d.ts
+++ b/ng-cordova/network.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Kapil Sachdeva <https://github.com/ksachdeva>
 // Definitions: https://github.com/ksachdeva/DefinitelyTyped
 
-/// <reference path="../angularjs/angular.d.ts" />
+/// <reference types="angularjs" />
 
 declare namespace ngCordova {
 
diff --git a/ng-cordova/toast-tests.ts b/ng-cordova/toast-tests.ts
index 43ed529e5d..f5bb213e16 100644
--- a/ng-cordova/toast-tests.ts
+++ b/ng-cordova/toast-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="toast.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="../ionic/ionic.d.ts" />
+
+/// <reference types="angularjs" />
+/// <reference types="ionic" />
 
 // For the full application demo please see following repo :
 // https://github.com/ksachdeva/ngCordova-typescript-demo
diff --git a/ng-cordova/toast.d.ts b/ng-cordova/toast.d.ts
index 272dd4c28a..493499be8c 100644
--- a/ng-cordova/toast.d.ts
+++ b/ng-cordova/toast.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Kapil Sachdeva <https://github.com/ksachdeva>
 // Definitions: https://github.com/ksachdeva/DefinitelyTyped
 
-/// <reference path="../angularjs/angular.d.ts" />
+/// <reference types="angularjs" />
 
 declare namespace ngCordova {
 
diff --git a/ng-dialog/index.d.ts b/ng-dialog/index.d.ts
new file mode 100644
index 0000000000..f164ec1b69
--- /dev/null
+++ b/ng-dialog/index.d.ts
@@ -0,0 +1,259 @@
+// Type definitions for ngDialog
+// Project: https://github.com/likeastore/ngDialog
+// Definitions by: Stephen Lautier <https://github.com/stephenlautier>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+import * as angular from 'angularjs';
+
+export type IDialogService = angular.dialog.IDialogService;
+export type IDialogOpenResult = angular.dialog.IDialogOpenResult;
+export type IDialogClosePromise = angular.dialog.IDialogClosePromise;
+export type IDialogProvider = angular.dialog.IDialogProvider;
+export type IDialogScope = angular.dialog.IDialogScope;
+export type IDialogConfirmScope = angular.dialog.IDialogConfirmScope;
+export type IDialogOptions = angular.dialog.IDialogOptions;
+export type IDialogOpenOptions = angular.dialog.IDialogOpenOptions;
+export type IDialogOpenConfirmOptions = angular.dialog.IDialogOpenConfirmOptions;
+
+declare module 'angularjs' {
+	export namespace dialog {
+
+		interface IDialogService {
+			getDefaults(): IDialogOptions;
+			open(options: IDialogOpenOptions): IDialogOpenResult;
+			openConfirm(options: IDialogOpenConfirmOptions): IPromise<any>;
+
+			/**
+			 * Determine whether the specified dialog is open or not.
+			 * @param id Dialog id to check for.
+			 * @returns {boolean} Indicating whether it exists or not.
+			 */
+			isOpen(id: string): boolean;
+			close(id: string, value?: any): void;
+			closeAll(value?: any): void;
+			getOpenDialogs(): string[];
+		}
+
+		interface IDialogOpenResult {
+			id: string;
+			close: (value?: any) => void;
+			closePromise: IPromise<IDialogClosePromise>;
+		}
+
+		interface IDialogClosePromise {
+			id: string;
+			value: any;
+		}
+
+		interface IDialogProvider extends angular.IServiceProvider {
+			/**
+			 * Default options for the dialogs.
+			 * @param defaultOptions
+			 * @returns {}
+			 */
+			setDefaults(defaultOptions: IDialogOptions): void;
+
+			/**
+			 * Adds an additional listener on every $locationChangeSuccess event and gets update version of html into dialog.
+			 * May be useful in some rare cases when you're dependant on DOM changes, defaults to false.
+			 * @param {boolean} force
+			 */
+			setForceHtmlReload(force: boolean) : void;
+
+			/**
+			 * Adds additional listener on every $locationChangeSuccess event and gets updated version of body into dialog.
+			 * Maybe useful in some rare cases when you're dependant on DOM changes, defaults to false. Use it in module's
+			 * config as provider instance:
+			 * @param {boolean} force
+			 */
+			setForceBodyReload(force: boolean) : void;
+		}
+
+		/**
+		 * Dialog Scope which extends the $scope.
+		 */
+		interface IDialogScope extends angular.IScope {
+			/**
+			 * This allows you to close dialog straight from handler in a popup element.
+			 * @param value Any value passed to this function will be attached to the object which resolves on the close promise for this dialog.
+			 * For dialogs opened with the openConfirm() method the value is used as the reject reason.
+			 */
+			closeThisDialog(value?: any): void;
+
+			/**
+			 * Any serializable data that you want to be stored in the controller's dialog scope.
+			 * From version 0.3.6 $scope.ngDialogData keeps references to the objects instead of copying them.
+			 */
+			ngDialogData : string | {} | any[];
+
+			/**
+			 * The id of the dialog. If you you ngDialogData, it'll be also available under ngDialogData.ngDialogId
+			 */
+			ngDialogId : string;
+		}
+
+		interface IDialogConfirmScope extends IDialogScope {
+			/**
+			 * Use this method to close the dialog and resolve the promise that was returned when opening the modal.
+			 *
+			 * The function accepts a single optional parameter which is used as the value of the resolved promise.
+			 * @param {any} [value] - The value with which the promise will resolve
+			 */
+			confirm(value?:any) : void;
+		}
+
+		interface IDialogOptions {
+			/**
+			 * This option allows you to control the dialog's look, you can use built-in themes or create your own styled modals.
+			 * It will be appended with the "ngdialog" class e.g. className is "default-theme flat-ui" it will be class="ngdialog default-theme flat-ui".
+			 */
+			className?: string;
+
+			/**
+			 * If true then animation for the dialog will be disabled, default false.
+			 */
+			disableAnimation?: boolean;
+
+			/**
+			 * If false it allows to hide overlay div behind the modals, default true.
+			 */
+			overlay?: boolean;
+
+			/**
+			 * If false it allows to hide close button on modals, default true.
+			 */
+			showClose?: boolean;
+
+			/**
+			 * It allows to close modals by clicking Esc button, default true.
+			 * This will close all open modals if there several of them open at the same time.
+			 */
+			closeByEscape?: boolean;
+
+			/**
+			 * It allows to close modals by clicking on overlay background, default true. If @see Hammer.js is loaded, it will listen for tap instead of click.
+			 */
+			closeByDocument?: boolean;
+
+			/**
+			 * Listens for $locationChangeSuccess event and closes open dialogs if true (also handles the ui.router $stateChangeSuccess event if ui.router is used)
+			 * default : false
+			 */
+			closeByNavigation?: boolean;
+
+			/**
+			 * If true allows to use plain string as template, default false.
+			 */
+			plain?: boolean;
+
+			/**
+			 * Give a name for a dialog instance. It is useful for identifying specific dialog if there are multiple dialog boxes opened.
+			 */
+			name?: string | number;
+
+			/**
+			 * Provide either the name of a function or a function to be called before the dialog is closed.
+			 * If the callback function specified in the option returns false then the dialog will not be closed.
+			 * Alternatively, if the callback function returns a promise that gets resolved the dialog will be closed.
+			 *
+			 * more: https://github.com/likeastore/ngDialog#preclosecallback-string--function
+			 */
+			preCloseCallback?: string|Function;
+
+			/**
+			 * Pass false to disable template caching. Useful for developing purposes, default is true.
+			 */
+			cache?: boolean;
+
+			/**
+			 * Specify your element where to append dialog instance, accepts selector string (e.g. #yourId, .yourClass).
+			 * If not specified appends dialog to body as default behavior.
+			 */
+			appendTo?: string;
+
+			/**
+			 * When true, ensures that the focused element remains within the dialog to conform to accessibility recommendations.
+			 * Default value is true
+			 */
+			trapFocus?: boolean;
+
+			/**
+			 * When true, closing the dialog restores focus to the element that launched it. Designed to improve keyboard
+			 * accessibility. Default value is true
+			 */
+			preserveFocus?: boolean;
+
+			/**
+			 * When true, automatically selects appropriate values for any unspecified accessibility attributes. Default value is true
+			 */
+			ariaAuto? : boolean;
+
+			/**
+			 * Specifies the value for the role attribute that should be applied to the dialog element. Default value is null (unspecified)
+			 */
+			ariaRole?: string;
+
+			/**
+			 * Specifies the value for the aria-labelledby attribute that should be applied to the dialog element.
+			 * Default value is null (unspecified)
+			 *
+			 * If specified, the value is not validated against the DOM
+			 */
+			ariaLabelledById?: string;
+
+			/**
+			 * Specifies the CSS selector for the element to be referenced by the aria-labelledby attribute on the dialog element. Default value is null (unspecified)
+			 *
+			 * If specified, the first matching element is used.
+			 */
+			ariaLabelledBySelector?: string;
+
+			/**
+			 * Specifies the value for the aria-describedby attribute that should be applied to the dialog element. Default value is null (unspecified)
+			 *
+			 * If specified, the value is not validated against the DOM.
+			 */
+			ariaDescribedById?: string;
+
+			/**
+			 * Specifies the CSS selector for the element to be referenced by the aria-describedby attribute on the dialog element. Default value is null (unspecified)
+			 *
+			 * If specified, the first matching element is used.
+			 */
+			ariaDescribedBySelector?: string;
+		}
+
+		/**
+		 * Options which are provided to open a dialog.
+		 */
+		interface IDialogOpenOptions extends IDialogOptions {
+			template: string;
+			controller?: string| any[] | any;
+			controllerAs?: string;
+
+			/**
+			 * Scope object that will be passed to dialog. If you use controller with separate $scope service this object will be passed to $scope.$parent param.
+			 */
+			scope?: IDialogScope;
+
+			/**
+			 * An optional map of dependencies which should be injected into the controller. If any of these dependencies
+			 * are promises, ngDialog will wait for them all to be resolved or one to be rejected before the controller
+			 * is instantiated.
+			 */
+			resolve?: {[key : string] : string | Function};
+
+			/**
+			 * Any serializable data that you want to be stored in the controller's dialog scope. ($scope.ngDialogData).
+			 * From version 0.3.6 $scope.ngDialogData keeps references to the objects instead of copying them.
+			 */
+			data?: string | {} | any[];
+		}
+
+		interface IDialogOpenConfirmOptions extends IDialogOpenOptions {
+			scope?: IDialogConfirmScope;
+		}
+	}
+}
diff --git a/ng-dialog/ng-dialog-tests.ts b/ng-dialog/ng-dialog-tests.ts
index 2fe90fe22f..4a2a144850 100644
--- a/ng-dialog/ng-dialog-tests.ts
+++ b/ng-dialog/ng-dialog-tests.ts
@@ -1,5 +1,6 @@
-/// <reference path="ng-dialog.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
+
+/// <reference types="angularjs" />
+import * as angular from 'angularjs';
 
 var app = angular.module('testModule', ['ngDialog']);
 
diff --git a/ng-dialog/ng-dialog.d.ts b/ng-dialog/ng-dialog.d.ts
deleted file mode 100644
index 63510520ad..0000000000
--- a/ng-dialog/ng-dialog.d.ts
+++ /dev/null
@@ -1,245 +0,0 @@
-// Type definitions for ngDialog
-// Project: https://github.com/likeastore/ngDialog
-// Definitions by: Stephen Lautier <https://github.com/stephenlautier>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace angular.dialog {
-
-	interface IDialogService {
-		getDefaults(): IDialogOptions;
-		open(options: IDialogOpenOptions): IDialogOpenResult;
-		openConfirm(options: IDialogOpenConfirmOptions): IPromise<any>;
-
-		/**
-		 * Determine whether the specified dialog is open or not.
-		 * @param id Dialog id to check for.
-		 * @returns {boolean} Indicating whether it exists or not.
-		 */
-		isOpen(id: string): boolean;
-		close(id: string, value?: any): void;
-		closeAll(value?: any): void;
-		getOpenDialogs(): string[];
-	}
-
-	interface IDialogOpenResult {
-		id: string;
-		close: (value?: any) => void;
-		closePromise: IPromise<IDialogClosePromise>;
-	}
-
-	interface IDialogClosePromise {
-		id: string;
-		value: any;
-	}
-
-	interface IDialogProvider extends angular.IServiceProvider {
-		/**
-		 * Default options for the dialogs.
-		 * @param defaultOptions
-		 * @returns {}
-		 */
-		setDefaults(defaultOptions: IDialogOptions): void;
-
-		/**
-		 * Adds an additional listener on every $locationChangeSuccess event and gets update version of html into dialog.
-		 * May be useful in some rare cases when you're dependant on DOM changes, defaults to false.
-		 * @param {boolean} force
-		 */
-		setForceHtmlReload(force: boolean) : void;
-
-		/**
-		 * Adds additional listener on every $locationChangeSuccess event and gets updated version of body into dialog.
-		 * Maybe useful in some rare cases when you're dependant on DOM changes, defaults to false. Use it in module's
-		 * config as provider instance:
-		 * @param {boolean} force
-		 */
-		setForceBodyReload(force: boolean) : void;
-	}
-
-	/**
-	 * Dialog Scope which extends the $scope.
-	 */
-	interface IDialogScope extends angular.IScope {
-		/**
-		 * This allows you to close dialog straight from handler in a popup element.
-		 * @param value Any value passed to this function will be attached to the object which resolves on the close promise for this dialog.
-		 * For dialogs opened with the openConfirm() method the value is used as the reject reason.
-		 */
-		closeThisDialog(value?: any): void;
-
-		/**
-		 * Any serializable data that you want to be stored in the controller's dialog scope.
-		 * From version 0.3.6 $scope.ngDialogData keeps references to the objects instead of copying them.
-		 */
-		ngDialogData : string | {} | any[];
-
-		/**
-		 * The id of the dialog. If you you ngDialogData, it'll be also available under ngDialogData.ngDialogId
-		 */
-		ngDialogId : string;
-	}
-
-	interface IDialogConfirmScope extends IDialogScope {
-		/**
-		 * Use this method to close the dialog and resolve the promise that was returned when opening the modal.
-		 *
-		 * The function accepts a single optional parameter which is used as the value of the resolved promise.
-		 * @param {any} [value] - The value with which the promise will resolve
-		 */
-		confirm(value?:any) : void;
-	}
-
-	interface IDialogOptions {
-		/**
-		 * This option allows you to control the dialog's look, you can use built-in themes or create your own styled modals.
-		 * It will be appended with the "ngdialog" class e.g. className is "default-theme flat-ui" it will be class="ngdialog default-theme flat-ui".
-		 */
-		className?: string;
-
-		/**
-		 * If true then animation for the dialog will be disabled, default false.
-		 */
-		disableAnimation?: boolean;
-
-		/**
-		 * If false it allows to hide overlay div behind the modals, default true.
-		 */
-		overlay?: boolean;
-
-		/**
-		 * If false it allows to hide close button on modals, default true.
-		 */
-		showClose?: boolean;
-
-		/**
-		 * It allows to close modals by clicking Esc button, default true.
-		 * This will close all open modals if there several of them open at the same time.
-		 */
-		closeByEscape?: boolean;
-
-		/**
-		 * It allows to close modals by clicking on overlay background, default true. If @see Hammer.js is loaded, it will listen for tap instead of click.
-		 */
-		closeByDocument?: boolean;
-
-		/**
-		 * Listens for $locationChangeSuccess event and closes open dialogs if true (also handles the ui.router $stateChangeSuccess event if ui.router is used)
-		 * default : false
-		 */
-		closeByNavigation?: boolean;
-
-		/**
-		 * If true allows to use plain string as template, default false.
-		 */
-		plain?: boolean;
-
-		/**
-		 * Give a name for a dialog instance. It is useful for identifying specific dialog if there are multiple dialog boxes opened.
-		 */
-		name?: string | number;
-
-		/**
-		 * Provide either the name of a function or a function to be called before the dialog is closed.
-		 * If the callback function specified in the option returns false then the dialog will not be closed.
-		 * Alternatively, if the callback function returns a promise that gets resolved the dialog will be closed.
-		 *
-		 * more: https://github.com/likeastore/ngDialog#preclosecallback-string--function
-		 */
-		preCloseCallback?: string|Function;
-
-		/**
-		 * Pass false to disable template caching. Useful for developing purposes, default is true.
-		 */
-		cache?: boolean;
-
-		/**
-		 * Specify your element where to append dialog instance, accepts selector string (e.g. #yourId, .yourClass).
-		 * If not specified appends dialog to body as default behavior.
-		 */
-		appendTo?: string;
-
-		/**
-		 * When true, ensures that the focused element remains within the dialog to conform to accessibility recommendations.
-		 * Default value is true
-		 */
-		trapFocus?: boolean;
-
-		/**
-		 * When true, closing the dialog restores focus to the element that launched it. Designed to improve keyboard
-		 * accessibility. Default value is true
-		 */
-		preserveFocus?: boolean;
-
-		/**
-		 * When true, automatically selects appropriate values for any unspecified accessibility attributes. Default value is true
-		 */
-		ariaAuto? : boolean;
-
-		/**
-		 * Specifies the value for the role attribute that should be applied to the dialog element. Default value is null (unspecified)
-		 */
-		ariaRole?: string;
-
-		/**
-		 * Specifies the value for the aria-labelledby attribute that should be applied to the dialog element.
-		 * Default value is null (unspecified)
-		 *
-		 * If specified, the value is not validated against the DOM
-		 */
-		ariaLabelledById?: string;
-
-		/**
-		 * Specifies the CSS selector for the element to be referenced by the aria-labelledby attribute on the dialog element. Default value is null (unspecified)
-		 *
-		 * If specified, the first matching element is used.
-		 */
-		ariaLabelledBySelector?: string;
-
-		/**
-		 * Specifies the value for the aria-describedby attribute that should be applied to the dialog element. Default value is null (unspecified)
-		 *
-		 * If specified, the value is not validated against the DOM.
-		 */
-		ariaDescribedById?: string;
-
-		/**
-		 * Specifies the CSS selector for the element to be referenced by the aria-describedby attribute on the dialog element. Default value is null (unspecified)
-		 *
-		 * If specified, the first matching element is used.
-		 */
-		ariaDescribedBySelector?: string;
-	}
-
-	/**
-	 * Options which are provided to open a dialog.
-	 */
-	interface IDialogOpenOptions extends IDialogOptions {
-		template: string;
-		controller?: string| any[] | any;
-		controllerAs?: string;
-
-		/**
-		 * Scope object that will be passed to dialog. If you use controller with separate $scope service this object will be passed to $scope.$parent param.
-		 */
-		scope?: IDialogScope;
-
-		/**
-		 * An optional map of dependencies which should be injected into the controller. If any of these dependencies
-		 * are promises, ngDialog will wait for them all to be resolved or one to be rejected before the controller
-		 * is instantiated.
-		 */
-		resolve?: {[key : string] : string | Function};
-
-		/**
-		 * Any serializable data that you want to be stored in the controller's dialog scope. ($scope.ngDialogData).
-		 * From version 0.3.6 $scope.ngDialogData keeps references to the objects instead of copying them.
-		 */
-		data?: string | {} | any[];
-	}
-
-	interface IDialogOpenConfirmOptions extends IDialogOpenOptions {
-		scope?: IDialogConfirmScope;
-	}
-}
diff --git a/ng-dialog/tsconfig.json b/ng-dialog/tsconfig.json
new file mode 100644
index 0000000000..bf756b0bd2
--- /dev/null
+++ b/ng-dialog/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ng-dialog-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ng-facebook/index.d.ts b/ng-facebook/index.d.ts
new file mode 100644
index 0000000000..be446def31
--- /dev/null
+++ b/ng-facebook/index.d.ts
@@ -0,0 +1,46 @@
+// Type definitions for ng-facebook
+// Project: https://github.com/GoDisco/ngFacebook
+// Definitions by: Crevil <https://github.com/Crevil>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+/// <reference types="fb" />
+
+declare namespace angular.ngFacebook {
+    interface IFacebookProvider {
+        setAppId(appId: string): IFacebookProvider;
+        getAppId(): string;
+
+        setVersion(version: string): IFacebookProvider;
+        getVersion(): string;
+
+        setPermissions(permissions: string|Array<string>): IFacebookProvider;
+        getPermissions(): string;
+
+        setCustomInit(customInit: FBInitParams): IFacebookProvider;
+        getCustomInit(): FBInitParams;
+    }
+
+    interface IFacebookService {
+        config<T extends string|number|FBInitParams>(property: string): T;
+        init(): void;
+
+        setCache<T>(attr: string, val: T): void;
+        getCache<T>(attr: string): T;
+        clearCache(): void;
+
+        isConnected(): boolean;
+        getAuthResponse(): {};
+        getLoginStatus(force?: boolean): angular.IPromise<{}>;
+        login(permissions?: string, rerequest?: boolean): angular.IPromise<{}>;
+        logout(): angular.IPromise<void>;
+
+        ui(params: FBUIParams): angular.IPromise<any>;
+        api(path: string): angular.IPromise<{}>;
+        api(path: string, method: string): angular.IPromise<{}>;
+        api(path: string, params: Object): angular.IPromise<{}>;
+        api(path: string, method: string, params: Object): angular.IPromise<{}>;
+
+        cachedApi(path: string): angular.IPromise<any>;
+    }
+}
diff --git a/ng-facebook/ng-facebook-tests.ts b/ng-facebook/ng-facebook-tests.ts
index 9aace5d140..83a15969d7 100644
--- a/ng-facebook/ng-facebook-tests.ts
+++ b/ng-facebook/ng-facebook-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="ng-facebook.d.ts" />
+
 
 {
     let $facebookProvider: angular.ngFacebook.IFacebookProvider;
diff --git a/ng-facebook/ng-facebook.d.ts b/ng-facebook/ng-facebook.d.ts
deleted file mode 100644
index dc2adc883a..0000000000
--- a/ng-facebook/ng-facebook.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// Type definitions for ng-facebook
-// Project: https://github.com/GoDisco/ngFacebook
-// Definitions by: Crevil <https://github.com/Crevil>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="../fbsdk/fbsdk.d.ts" />
-
-declare namespace angular.ngFacebook {
-    interface IFacebookProvider {
-        setAppId(appId: string): IFacebookProvider;
-        getAppId(): string;
-
-        setVersion(version: string): IFacebookProvider;
-        getVersion(): string;
-
-        setPermissions(permissions: string|Array<string>): IFacebookProvider;
-        getPermissions(): string;
-
-        setCustomInit(customInit: FBInitParams): IFacebookProvider;
-        getCustomInit(): FBInitParams;
-    }
-
-    interface IFacebookService {
-        config<T extends string|number|FBInitParams>(property: string): T;
-        init(): void;
-
-        setCache<T>(attr: string, val: T): void;
-        getCache<T>(attr: string): T;
-        clearCache(): void;
-
-        isConnected(): boolean;
-        getAuthResponse(): {};
-        getLoginStatus(force?: boolean): angular.IPromise<{}>;
-        login(permissions?: string, rerequest?: boolean): angular.IPromise<{}>;
-        logout(): angular.IPromise<void>;
-
-        ui(params: FBUIParams): angular.IPromise<any>;
-        api(path: string): angular.IPromise<{}>;
-        api(path: string, method: string): angular.IPromise<{}>;
-        api(path: string, params: Object): angular.IPromise<{}>;
-        api(path: string, method: string, params: Object): angular.IPromise<{}>;
-
-        cachedApi(path: string): angular.IPromise<any>;
-    }
-}
diff --git a/ng-facebook/tsconfig.json b/ng-facebook/tsconfig.json
new file mode 100644
index 0000000000..1b56451a47
--- /dev/null
+++ b/ng-facebook/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ng-facebook-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ng-file-upload/index.d.ts b/ng-file-upload/index.d.ts
new file mode 100644
index 0000000000..b975468bfc
--- /dev/null
+++ b/ng-file-upload/index.d.ts
@@ -0,0 +1,281 @@
+// Type definitions for Angular File Upload 11.1.1
+// Project: https://github.com/danialfarid/ng-file-upload
+// Definitions by: John Reilly <https://github.com/johnnyreilly>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+import * as angular from 'angularjs';
+
+declare var angularFileUploadDefaultExport: string;
+export = angularFileUploadDefaultExport;
+
+declare module 'angularjs' {
+    export namespace angularFileUpload  {
+        interface ImageDimensions {
+            height: number;
+            width: number;
+        }
+
+        interface FileUploadOptions {
+            /**
+             * Standard HTML accept attr, browser specific select popup window
+             * @type {string}
+             */
+            ngfAccept?: string;
+            /**
+             * Default true, allow dropping files only for Chrome webkit browser
+             * @type {boolean}
+             */
+            ngfAllowDir?: boolean;
+            /**
+             * Default false, enable firefox image paste by making element contenteditable
+             * @type {boolean}
+             */
+            ngfEnableFirefoxPaste?: boolean;
+            /**
+             * Default false, hides element if file drag&drop is not
+             * @type {boolean}
+             */
+            ngfHideOnDropNotAvailable?: boolean;
+            /**
+             * Validate error name: minDuration
+             * @type {(number|string)}
+             */
+            ngfMinDuration: number | string;
+            ngfMinSize?: number | string;
+            /**
+             * Validate error name: minRatio
+             * @type {(number|string)}
+             */
+            ngfMinRatio?: number | string;
+            /**
+             * Validate error name: maxDuration
+             * @type {(number|string)}
+             */
+            ngfMaxDuration?: number | string;
+            /**
+             * Maximum number of files allowed to be selected or dropped, validate error name: maxFiles
+             * @type {number}
+             */
+            ngfMaxFiles?: number;
+            /**
+             * Validate error name: maxSize
+             * @type {(number|string)}
+             */
+            ngfMaxSize?: number | string;
+            /**
+             * Validate error name: maxTotalSize
+             * @type {(number|string)}
+             */
+            ngfMaxTotalSize?: number | string;
+            /**
+             * Allows selecting multiple files
+             * @type {boolean}
+             */
+            ngfMultiple?: boolean;
+            /**
+             * List of comma separated valid aspect ratio of images in float or 2:3 format
+             * @type {string}
+             */
+            ngfRatio?: string;
+            /**
+             * Default false, whether to propagate drag/drop events.
+             * @type {boolean}
+             */
+            ngfStopPropagation?: boolean;
+            /**
+             * Default false, if true file.$error will be set if the dimension or duration
+             * values for validations cannot be calculated for example image load error or unsupported video by the browser.
+             * By default it would assume the file is valid if the duration or dimension cannot be calculated by the browser.
+             * @type {boolean}
+             */
+            ngfValidateForce?: boolean;
+        }
+
+        interface IUploadService {
+            /**
+             * Convert a single file or array of files to a single or array of
+             * base64 data url representation of the file(s).
+             * Could be used to send file in base64 format inside json to the databases
+             *
+             * @param  {Array<File>}
+             * @return {angular.IPromise}
+             */
+            base64DataUrl(files: File | Array<File>): angular.IPromise<Array<string> | string>;
+            /**
+             * Convert the file to blob url object or base64 data url based on boolean disallowObjectUrl value
+             *
+             * @param {File} file
+             * @param  {boolean} [disallowObjectUrl]
+             * @return {angular.IPromise<string>}
+             */
+            dataUrl(file: File, disallowObjectUrl?: boolean): angular.IPromise<Blob | string>;
+            /**
+             * Alternative way of uploading, send the file binary with the file's content-type.
+             * Could be used to upload files to CouchDB, imgur, etc... html5 FileReader is needed.
+             * This is equivalent to angular $http() but allow you to listen to the progress event for HTML5 browsers.
+             *
+             * @param {IRequestConfig} config
+             * @return {angular.IPromise<ImageDimensions>}
+             */
+            http<T>(config: IRequestConfig): IUploadPromise<T>;
+            /**
+             * Get image file dimensions
+             *
+             * @param  {File} file
+             * @return {angular.IPromise<ImageDimensions>}
+             */
+            imageDimensions(file: File): angular.IPromise<ImageDimensions>;
+            /**
+             * Returns boolean showing if image resize is supported by this browser
+             *
+             * @return {boolean}
+             */
+            isResizeSupported(): boolean;
+            /**
+             * Returns boolean showing if resumable upload is supported by this browser
+             *
+             * @return {boolean}
+             */
+            isResumeSupported(): boolean;
+            /**
+             * Returns true if there is an upload in progress. Can be used to prompt user before closing browser tab
+             *
+             * @return {boolean}
+             */
+            isUploadInProgress(): boolean;
+            /**
+             * Converts the value to json to send data as json string. Same as angular.toJson(obj)
+             *
+             * @param  {Object} obj
+             * @return {string}
+             */
+            json(obj: Object): string;
+            /**
+             * Converts the object to a Blob object with application/json content type
+             * for jsob byte streaming support
+             *
+             * @param  {Object} obj
+             * @return {Blob}
+             */
+            jsonBlob(obj: Object): Blob;
+            /**
+             * Returns a file which will be uploaded with the newName instead of original file name
+             *
+             * @param  {File} file
+             * @param  {string} newName
+             * @return {File}
+             */
+            rename(file: File, newName: string): File;
+            /**
+             * Resizes an image. Returns a promise
+             *
+             * @param  {File} file
+             * @param  {number} [width]
+             * @param  {number} [height]
+             * @param  {number} [quality]
+             * @param  {string} [type]
+             * @param  {number} [ratio]
+             * @param  {boolean} [centerCrop]
+             * @return {angular.IPromise<string>}
+             */
+            resize(file: File, width?: number, height?: number, quality?: number, type?: string,
+                ratio?: number | string, centerCrop?: boolean): angular.IPromise<string>;
+            /**
+             * Set the default values for ngf-select and ngf-drop directives
+             *
+             * @param {FileUploadOptions} defaultFileUploadOptions
+             */
+            setDefaults(defaultFileUploadOptions: FileUploadOptions): void;
+            /**
+             * Upload a file. Returns a Promise,
+             *
+             * @param {IFileUploadConfigFile} config
+             * @return {IUploadPromise<T>}
+             */
+            upload<T>(config: IFileUploadConfigFile): IUploadPromise<T>;
+        }
+
+        interface IUploadPromise<T> extends IHttpPromise<T> {
+            /**
+             * Cancel/abort the upload in progress.
+             *
+             * @return {IUploadPromise<T>}
+             */
+            abort(): IUploadPromise<T>;
+            progress(callback: IHttpPromiseCallback<T>): IUploadPromise<T>;
+            /**
+             * Access or attach event listeners to the underlying XMLHttpRequest
+             *
+             * @param  {IHttpPromiseCallback<T>}
+             * @return {IUploadPromise<T>}
+             */
+            xhr(callback: IHttpPromiseCallback<T>): IUploadPromise<T>;
+        }
+
+        interface IFileUploadConfigFile extends IRequestConfig {
+            /**
+             * Specify the file and optional data to be sent to the server.
+             * Each field including nested objects will be sent as a form data multipart.
+             * Samples: {pic: file, username: username}
+             * {files: files, otherInfo: {id: id, person: person,...}} multiple files (html5)
+             * {profiles: {[{pic: file1, username: username1}, {pic: file2, username: username2}]} nested array multiple files (html5)
+             * {file: file, info: Upload.json({id: id, name: name, ...})} send fields as json string
+             * {file: file, info: Upload.jsonBlob({id: id, name: name, ...})} send fields as json blob, 'application/json' content_type
+             * {picFile: Upload.rename(file, 'profile.jpg'), title: title} send file with picFile key and profile.jpg file name
+             *
+             * @type {Object}
+             */
+            data: any;
+            /**
+             * upload.php script, node.js route, or servlet url
+             * @type {string}
+             */
+            url: string;
+            /**
+             * This is to accommodate server implementations expecting nested data object keys in .key or [key] format.
+             * Example: data: {rec: {name: 'N', pic: file}} sent as: rec[name] -> N, rec[pic] -> file
+             * data: {rec: {name: 'N', pic: file}, objectKey: '.k'} sent as: rec.name -> N, rec.pic -> file
+             * @type {string}
+             */
+            objectKey?: string;
+            /**
+             * This is to accommodate server implementations expecting array data object keys in '[i]' or '[]' or
+             * ''(multiple entries with same key) format.
+             * Example: data: {rec: [file[0], file[1], ...]} sent as: rec[0] -> file[0], rec[1] -> file[1],...
+             * data: {rec: {rec: [f[0], f[1], ...], arrayKey: '[]'} sent as: rec[] -> f[0], rec[] -> f[1],...
+             * @type {string}
+             */
+            arrayKey?: string;
+            /**
+             * Uploaded file size so far on the server
+             * @type {string}
+             */
+            resumeSizeUrl?: string;
+            /**
+             * Reads the uploaded file size from resumeSizeUrl GET response
+             * @type {Function}
+             */
+            resumeSizeResponseReader?: Function;
+            /**
+             * Function that returns a prommise which will be resolved to the upload file size on the server.
+             * @type {[type]}
+             */
+            resumeSize?: Function;
+            /**
+             * Upload in chunks of specified size
+             * @type {(number|string)}
+             */
+            resumeChunkSize?: number | string;
+            /**
+             * Default false, experimental as hotfix for potential library conflicts with other plugins
+             * @type {boolean}
+             */
+            disableProgress?: boolean;
+        }
+
+        interface IFileProgressEvent extends ProgressEvent {
+            config: IFileUploadConfigFile;
+        }
+    }
+}
diff --git a/ng-file-upload/ng-file-upload-tests.ts b/ng-file-upload/ng-file-upload-tests.ts
index f7fdcf1015..40fe92b919 100644
--- a/ng-file-upload/ng-file-upload-tests.ts
+++ b/ng-file-upload/ng-file-upload-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="ng-file-upload.d.ts" />
+import * as angular from 'angularjs';
 
 "use strict";
 
diff --git a/ng-file-upload/ng-file-upload.d.ts b/ng-file-upload/ng-file-upload.d.ts
deleted file mode 100644
index 41b0331dbe..0000000000
--- a/ng-file-upload/ng-file-upload.d.ts
+++ /dev/null
@@ -1,280 +0,0 @@
-// Type definitions for Angular File Upload 11.1.1
-// Project: https://github.com/danialfarid/ng-file-upload
-// Definitions by: John Reilly <https://github.com/johnnyreilly>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare module "ng-file-upload" {
-    let angularFileUploadDefaultExport: string;
-    export = angularFileUploadDefaultExport;
-}
-
-declare namespace angular.angularFileUpload  {
-    interface ImageDimensions {
-        height: number;
-        width: number;
-    }
-
-    interface FileUploadOptions {
-        /**
-         * Standard HTML accept attr, browser specific select popup window
-         * @type {string}
-         */
-        ngfAccept?: string;
-        /**
-         * Default true, allow dropping files only for Chrome webkit browser
-         * @type {boolean}
-         */
-        ngfAllowDir?: boolean;
-        /**
-         * Default false, enable firefox image paste by making element contenteditable
-         * @type {boolean}
-         */
-        ngfEnableFirefoxPaste?: boolean;
-        /**
-         * Default false, hides element if file drag&drop is not
-         * @type {boolean}
-         */
-        ngfHideOnDropNotAvailable?: boolean;
-        /**
-         * Validate error name: minDuration
-         * @type {(number|string)}
-         */
-        ngfMinDuration: number | string;
-        ngfMinSize?: number | string;
-        /**
-         * Validate error name: minRatio
-         * @type {(number|string)}
-         */
-        ngfMinRatio?: number | string;
-        /**
-         * Validate error name: maxDuration
-         * @type {(number|string)}
-         */
-        ngfMaxDuration?: number | string;
-        /**
-         * Maximum number of files allowed to be selected or dropped, validate error name: maxFiles
-         * @type {number}
-         */
-        ngfMaxFiles?: number;
-        /**
-         * Validate error name: maxSize
-         * @type {(number|string)}
-         */
-        ngfMaxSize?: number | string;
-        /**
-         * Validate error name: maxTotalSize
-         * @type {(number|string)}
-         */
-        ngfMaxTotalSize?: number | string;
-        /**
-         * Allows selecting multiple files
-         * @type {boolean}
-         */
-        ngfMultiple?: boolean;
-        /**
-         * List of comma separated valid aspect ratio of images in float or 2:3 format
-         * @type {string}
-         */
-        ngfRatio?: string;
-        /**
-         * Default false, whether to propagate drag/drop events.
-         * @type {boolean}
-         */
-        ngfStopPropagation?: boolean;
-        /**
-         * Default false, if true file.$error will be set if the dimension or duration
-         * values for validations cannot be calculated for example image load error or unsupported video by the browser.
-         * By default it would assume the file is valid if the duration or dimension cannot be calculated by the browser.
-         * @type {boolean}
-         */
-        ngfValidateForce?: boolean;
-    }
-
-    interface IUploadService {
-        /**
-         * Convert a single file or array of files to a single or array of
-         * base64 data url representation of the file(s).
-         * Could be used to send file in base64 format inside json to the databases
-         *
-         * @param  {Array<File>}
-         * @return {angular.IPromise}
-         */
-        base64DataUrl(files: File | Array<File>): angular.IPromise<Array<string> | string>;
-        /**
-         * Convert the file to blob url object or base64 data url based on boolean disallowObjectUrl value
-         *
-         * @param {File} file
-         * @param  {boolean} [disallowObjectUrl]
-         * @return {angular.IPromise<string>}
-         */
-        dataUrl(file: File, disallowObjectUrl?: boolean): angular.IPromise<Blob | string>;
-        /**
-         * Alternative way of uploading, send the file binary with the file's content-type.
-         * Could be used to upload files to CouchDB, imgur, etc... html5 FileReader is needed.
-         * This is equivalent to angular $http() but allow you to listen to the progress event for HTML5 browsers.
-         *
-         * @param {IRequestConfig} config
-         * @return {angular.IPromise<ImageDimensions>}
-         */
-        http<T>(config: IRequestConfig): IUploadPromise<T>;
-        /**
-         * Get image file dimensions
-         *
-         * @param  {File} file
-         * @return {angular.IPromise<ImageDimensions>}
-         */
-        imageDimensions(file: File): angular.IPromise<ImageDimensions>;
-        /**
-         * Returns boolean showing if image resize is supported by this browser
-         *
-         * @return {boolean}
-         */
-        isResizeSupported(): boolean;
-        /**
-         * Returns boolean showing if resumable upload is supported by this browser
-         *
-         * @return {boolean}
-         */
-        isResumeSupported(): boolean;
-        /**
-         * Returns true if there is an upload in progress. Can be used to prompt user before closing browser tab
-         *
-         * @return {boolean}
-         */
-        isUploadInProgress(): boolean;
-        /**
-         * Converts the value to json to send data as json string. Same as angular.toJson(obj)
-         *
-         * @param  {Object} obj
-         * @return {string}
-         */
-        json(obj: Object): string;
-        /**
-         * Converts the object to a Blob object with application/json content type
-         * for jsob byte streaming support
-         *
-         * @param  {Object} obj
-         * @return {Blob}
-         */
-        jsonBlob(obj: Object): Blob;
-        /**
-         * Returns a file which will be uploaded with the newName instead of original file name
-         *
-         * @param  {File} file
-         * @param  {string} newName
-         * @return {File}
-         */
-        rename(file: File, newName: string): File;
-        /**
-         * Resizes an image. Returns a promise
-         *
-         * @param  {File} file
-         * @param  {number} [width]
-         * @param  {number} [height]
-         * @param  {number} [quality]
-         * @param  {string} [type]
-         * @param  {number} [ratio]
-         * @param  {boolean} [centerCrop]
-         * @return {angular.IPromise<string>}
-         */
-        resize(file: File, width?: number, height?: number, quality?: number, type?: string,
-            ratio?: number | string, centerCrop?: boolean): angular.IPromise<string>;
-        /**
-         * Set the default values for ngf-select and ngf-drop directives
-         *
-         * @param {FileUploadOptions} defaultFileUploadOptions
-         */
-        setDefaults(defaultFileUploadOptions: FileUploadOptions): void;
-        /**
-         * Upload a file. Returns a Promise,
-         *
-         * @param {IFileUploadConfigFile} config
-         * @return {IUploadPromise<T>}
-         */
-        upload<T>(config: IFileUploadConfigFile): IUploadPromise<T>;
-    }
-
-    interface IUploadPromise<T> extends IHttpPromise<T> {
-        /**
-         * Cancel/abort the upload in progress.
-         *
-         * @return {IUploadPromise<T>}
-         */
-        abort(): IUploadPromise<T>;
-        progress(callback: IHttpPromiseCallback<T>): IUploadPromise<T>;
-        /**
-         * Access or attach event listeners to the underlying XMLHttpRequest
-         *
-         * @param  {IHttpPromiseCallback<T>}
-         * @return {IUploadPromise<T>}
-         */
-        xhr(callback: IHttpPromiseCallback<T>): IUploadPromise<T>;
-    }
-
-    interface IFileUploadConfigFile extends IRequestConfig {
-        /**
-         * Specify the file and optional data to be sent to the server.
-         * Each field including nested objects will be sent as a form data multipart.
-         * Samples: {pic: file, username: username}
-         * {files: files, otherInfo: {id: id, person: person,...}} multiple files (html5)
-         * {profiles: {[{pic: file1, username: username1}, {pic: file2, username: username2}]} nested array multiple files (html5)
-         * {file: file, info: Upload.json({id: id, name: name, ...})} send fields as json string
-         * {file: file, info: Upload.jsonBlob({id: id, name: name, ...})} send fields as json blob, 'application/json' content_type
-         * {picFile: Upload.rename(file, 'profile.jpg'), title: title} send file with picFile key and profile.jpg file name
-         *
-         * @type {Object}
-         */
-        data: any;
-        /**
-         * upload.php script, node.js route, or servlet url
-         * @type {string}
-         */
-        url: string;
-        /**
-         * This is to accommodate server implementations expecting nested data object keys in .key or [key] format.
-         * Example: data: {rec: {name: 'N', pic: file}} sent as: rec[name] -> N, rec[pic] -> file
-         * data: {rec: {name: 'N', pic: file}, objectKey: '.k'} sent as: rec.name -> N, rec.pic -> file
-         * @type {string}
-         */
-        objectKey?: string;
-        /**
-         * This is to accommodate server implementations expecting array data object keys in '[i]' or '[]' or
-         * ''(multiple entries with same key) format.
-         * Example: data: {rec: [file[0], file[1], ...]} sent as: rec[0] -> file[0], rec[1] -> file[1],...
-         * data: {rec: {rec: [f[0], f[1], ...], arrayKey: '[]'} sent as: rec[] -> f[0], rec[] -> f[1],...
-         * @type {string}
-         */
-        arrayKey?: string;
-        /**
-         * Uploaded file size so far on the server
-         * @type {string}
-         */
-        resumeSizeUrl?: string;
-        /**
-         * Reads the uploaded file size from resumeSizeUrl GET response
-         * @type {Function}
-         */
-        resumeSizeResponseReader?: Function;
-        /**
-         * Function that returns a prommise which will be resolved to the upload file size on the server.
-         * @type {[type]}
-         */
-        resumeSize?: Function;
-        /**
-         * Upload in chunks of specified size
-         * @type {(number|string)}
-         */
-        resumeChunkSize?: number | string;
-        /**
-         * Default false, experimental as hotfix for potential library conflicts with other plugins
-         * @type {boolean}
-         */
-        disableProgress?: boolean;
-    }
-
-    interface IFileProgressEvent extends ProgressEvent {
-        config: IFileUploadConfigFile;
-    }
-}
diff --git a/ng-file-upload/tsconfig.json b/ng-file-upload/tsconfig.json
new file mode 100644
index 0000000000..dd05b7cafb
--- /dev/null
+++ b/ng-file-upload/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ng-file-upload-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ng-flow/index.d.ts b/ng-flow/index.d.ts
new file mode 100644
index 0000000000..0e960ab511
--- /dev/null
+++ b/ng-flow/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for ng-flow
+// Project: https://github.com/flowjs/ng-flow
+// Definitions by: Ryan McNamara <https://github.com/ryan10132>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/// <reference types="flowjs" />
+/// <reference types="angularjs" />
+
+declare namespace angular.flow {
+    interface IFlowFactory {
+        create(options?: flowjs.IFlowOptions): flowjs.IFlow;
+    }
+}
diff --git a/ng-flow/ng-flow-tests.ts b/ng-flow/ng-flow-tests.ts
index beca6583c0..6ad191e221 100644
--- a/ng-flow/ng-flow-tests.ts
+++ b/ng-flow/ng-flow-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="ng-flow.d.ts" />
+
 
 var flowFactory: ng.flow.IFlowFactory;
 flowFactory.create(<flowjs.IFlowOptions> {});
diff --git a/ng-flow/ng-flow.d.ts b/ng-flow/ng-flow.d.ts
deleted file mode 100644
index fe5fad56a0..0000000000
--- a/ng-flow/ng-flow.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for ng-flow
-// Project: https://github.com/flowjs/ng-flow
-// Definitions by: Ryan McNamara <https://github.com/ryan10132>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/// <reference path="../flowjs/flowjs.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace angular.flow {
-    interface IFlowFactory {
-        create(options?: flowjs.IFlowOptions): flowjs.IFlow;
-    }
-}
diff --git a/ng-flow/tsconfig.json b/ng-flow/tsconfig.json
new file mode 100644
index 0000000000..ac2ff5f465
--- /dev/null
+++ b/ng-flow/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ng-flow-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ng-grid/index.d.ts b/ng-grid/index.d.ts
new file mode 100644
index 0000000000..053ca62c27
--- /dev/null
+++ b/ng-grid/index.d.ts
@@ -0,0 +1,649 @@
+// Type definitions for ng-grid
+// Project: http://angular-ui.github.io/ng-grid/
+// Definitions by: Ken Smith <https://github.com/smithkl42>, Roland Zwaga <https://github.com/rolandzwaga>, Kent Cooper <https://github.com/kentcooper>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// These are very definitely preliminary. Please feel free to improve.
+
+// Changelog:
+// 25/4/2014: Added interfaces for all classes and services
+
+
+declare class ngGridReorderable {
+    constructor();
+}
+
+declare var ngStyleProvider:ngGrid.IStyleProviderStatic;
+declare var ngSearchProvider:ngGrid.ISearchProviderStatic;
+declare var ngSelectionProvider:ngGrid.ISelectionProviderStatic;
+declare var ngEventProvider:ngGrid.IEventProviderStatic;
+declare var ngAggregate:ngGrid.IAggregateStatic;
+declare var ngRenderedRange:ngGrid.IRenderedRangeStatic;
+declare var ngDimension:ngGrid.IDimensionStatic;
+declare var ngRow:ngGrid.IRowStatic;
+declare var ngColumn:ngGrid.IColumnStatic;
+declare var ngFooter:ngGrid.IFooterStatic;
+
+declare namespace ngGrid {
+
+    export interface IDomAccessProvider {
+        previousColumn:IColumn;
+        grid:IGridInstance;
+        changeUserSelect(elm:angular.IAugmentedJQuery, value:string):void;
+        focusCellElement($scope:IGridScope, index:number):void;
+        selectionHandlers($scope:IGridScope, elm:angular.IAugmentedJQuery):void;
+    }
+
+    export interface IStyleProviderStatic {
+        new($scope:IGridScope, grid:IGridInstance):IStyleProvider;
+    }
+
+    export interface IStyleProvider {
+    }
+
+    export interface ISearchProviderStatic {
+        new($scope:IGridScope, grid:IGridInstance, $filter:angular.IFilterService):ISearchProvider;
+    }
+
+    export interface ISearchProvider {
+        fieldMap:any;
+        extFilter:boolean;
+        evalFilter():void;
+    }
+
+    export interface ISelectionProviderStatic {
+        new(grid:IGridInstance, $scope:IGridScope, $parse:angular.IParseService):ISelectionProvider;
+    }
+
+    export interface ISelectionProvider {
+        multi:boolean;
+        selectedItems:any[];
+        selectedIndex:number;
+        lastClickedRow:any;
+        ignoreSelectedItemChanges:boolean;
+        pKeyParser:angular.ICompiledExpression;
+        ChangeSelection(rowItem:any, event:any):void;
+        getSelection(entity:any):number;
+        getSelectionIndex(entity:any):number;
+        setSelection(rowItem:IRow, isSelected:boolean):void;
+        toggleSelectAll(checkAll:boolean, bypass:boolean, selectFiltered:boolean):void;
+    }
+
+    export interface IEventProviderStatic {
+        new(grid:IGridInstance, $scope:IGridScope, domUtilityService:service.IDomUtilityService, $timeout:angular.ITimeoutService):IEventProvider;
+    }
+
+    export interface IEventProvider {
+        colToMove:IColumn;
+        groupToMove:any;
+        assignEvents():void;
+        assignGridEventHandlers():void;
+        dragStart(event:any):void;
+        dragOver(event:any):void;
+        setDraggables():void;
+        onGroupMouseDown(event:any):void;
+        onGroupDrop(event:any):void;
+        onHeaderMouseDown(event:any):void;
+        onHeaderDrop(event:any):void;
+    }
+
+    export interface IAggregateStatic {
+        new(aggEntity:any, rowFactory:IRowFactory, rowHeight:number, groupInitState:boolean):IAggregate;
+    }
+
+    export interface IAggregate {
+        rowIndex:number;
+        offsetTop:number;
+        entity:any;
+        label:string;
+        field:string;
+        depth:number;
+        parent:any;
+        children:any[];
+        aggChildren:any[];
+        aggIndex:number;
+        collapsed:boolean;
+        groupInitState:boolean;
+        rowFactory:IRowFactory;
+        rowHeight:number;
+        isAggRow:boolean;
+        offsetLeft:number;
+        aggLabelFilter:any;
+    }
+
+    export interface IRowConfig {
+        enableCellSelection:boolean;
+        enableRowSelection:boolean;
+        jqueryUITheme:boolean;
+        rowClasses:string[];
+        rowHeight:number;
+        selectWithCheckboxOnly:boolean;
+        selectedItems:any[];
+
+        afterSelectionChangeCallback():void;
+        beforeSelectionChangeCallback():void;
+    }
+
+    export interface IRenderedRangeStatic {
+        new(top:number, bottom:number):IRenderedRange;
+    }
+
+    export interface IRenderedRange {
+        bottomRow:number;
+        topRow:number;
+    }
+
+    export interface IRowFactory {
+        aggCache:any;
+        dataChanged:boolean;
+        groupedData:any;
+        numberOfAggregates:number;
+        parentCache:any[];
+        parsedData:any[];
+        renderedRange:IRenderedRange;
+        rowConfig:IRowConfig;
+        rowHeight:number;
+        selectionProvider:ISelectionProvider;
+
+        UpdateViewableRange(newRange:IRenderedRange):void;
+        buildAggregateRow(aggEntity:any, rowIndex:number):IAggregate;
+        buildEntityRow(entity:any, rowIndex:number):IRow;
+        filteredRowsChanged():void;
+        fixRowCache():void;
+        getGrouping(groups:any):void;
+        parseGroupData(groupData:any):void;
+        renderedChange():void;
+        renderedChangeNoGroups():void;
+    }
+
+    export interface IDimensionStatic {
+        new(options:any):IDimension;
+    }
+
+    export interface IDimension {
+        outerHeight?:number;
+        outerWidth?:number;
+        autoFitHeight?:boolean;
+    }
+
+    export interface IElementDimension {
+        rootMaxH?:number;
+        rootMaxW?:number;
+        rowIndexCellW?:number;
+        rowSelectedCellW?:number;
+        scrollH?:number;
+        scrollW?:number;
+    }
+
+    export interface IRowStatic {
+        new(entity:any, config:IRowConfig, selectionProvider:ISelectionProvider, rowIndex:number, $utils:any):IRow;
+    }
+
+    export interface IRow {
+        entity:any;
+        config:IRowConfig;
+        selectionProvider:ISelectionProvider;
+        rowIndex:number;
+        utils:any;
+        selected:boolean;
+        cursor:string;
+        offsetTop:number;
+        rowDisplayIndex:number;
+        afterSelectionChange():void;
+        beforeSelectionChange():void;
+        setSelection(isSelected:boolean):void;
+        continueSelection(event:any):void;
+        ensureEntity(expected:any):void;
+        toggleSelected(event:any):boolean;
+        alternatingRowClass():void;
+        getProperty(path:string):any;
+        copy():IRow;
+        setVars(fromRow:IRow):void;
+    }
+
+    export interface IColumnStatic {
+        new(config:IGridOptions, $scope:IGridScope, grid:IGridInstance, domUtilityService:service.IDomUtilityService, $templateCache:angular.ITemplateCacheService, $utils:any):IColumn;
+    }
+
+    export interface IColumn {
+        colDef:IColumnDef;
+        width:number;
+        groupIndex:number;
+        isGroupedBy:boolean;
+        minWidth:number;
+        maxWidth:number;
+        enableCellEdit:boolean;
+        cellEditableCondition:any;
+        headerRowHeight:number;
+        displayName:string;
+        index:number;
+        isAggCol:boolean;
+        cellClass:string;
+        sortPriority:number;
+        cellFilter:any;
+        field:string;
+        aggLabelFilter:any;
+        visible:boolean;
+        sortable:boolean;
+        resizable:boolean;
+        pinnable:boolean;
+        pinned:boolean;
+        originalIndex:number;
+        groupable:boolean;
+        sortDirection:string;
+        sortingAlgorithm:Function;
+        headerClass:string;
+        cursor:string;
+        headerCellTemplate:string;
+        cellTemplate:string;
+        groupedByClass():string;
+        toggleVisible():void;
+        showSortButtonUp():boolean;
+        showSortButtonDown():boolean;
+        noSortVisible():boolean;
+        sort(event:any):boolean;
+        gripClick():any;
+        gripOnMouseDown(event:any):any;
+        onMouseMove(event:any):void;
+        gripOnMouseUp(event:any):void;
+        copy():IColumn;
+        setVars(fromCol:IColumn):void;
+    }
+
+    export interface IGridScope extends angular.IScope {
+        elementsNeedMeasuring:boolean;
+        columns:any[];
+        renderedRows:any[];
+        renderedColumns:any[];
+        headerRow:any;
+        rowHeight:number;
+        jqueryUITheme:any;
+        showSelectionCheckbox:boolean;
+        enableCellSelection:boolean;
+        enableCellEditOnFocus:boolean;
+        footer:IFooter;
+        selectedItems:any[];
+        multiSelect:boolean;
+        showFooter:boolean;
+        footerRowHeight:number;
+        showColumnMenu:boolean;
+        forceSyncScrolling:boolean;
+        showMenu:boolean;
+        configGroups:any[];
+        gridId:string;
+        enablePaging:boolean;
+        pagingOptions:IPagingOptions;
+        i18n:any;
+        selectionProvider:ISelectionProvider;
+        adjustScrollLeft(scrollLeft:number):void;
+        adjustScrollTop(scrollTop:number, force:boolean):void;
+        toggleShowMenu():void;
+        toggleSelectAll():void;
+        totalFilteredItemsLength():number;
+        showGroupPanel():any;
+        topPanelHeight():number;
+        viewportDimHeight():number;
+        groupBy(col:IColumn):void;
+        removeGroup(index:number):void;
+        togglePin(col:IColumn):void;
+        totalRowWidth():number;
+        headerScrollerDim():any;
+    }
+
+    export interface IGridInstance {
+        $canvas:angular.IAugmentedJQuery;
+        $viewport:angular.IAugmentedJQuery;
+        $groupPanel:angular.IAugmentedJQuery;
+        $footerPanel:angular.IAugmentedJQuery;
+        $headerScroller:angular.IAugmentedJQuery;
+        $headerContainer:angular.IAugmentedJQuery;
+        $headers:angular.IAugmentedJQuery;
+        $topPanel:angular.IAugmentedJQuery;
+        $root:angular.IAugmentedJQuery;
+        config:IGridOptions;
+        data:any;
+        elementDims:IElementDimension;
+        eventProvider:IEventProvider;
+        filteredRows:IRow[];
+        footerController:any;
+        gridId:string;
+        lastSortedColumns:IColumn[];
+        lateBindColumns:boolean;
+        maxCanvasHt:number;
+        prevScrollIndex:number;
+        prevScrollTop:number;
+        rootDim:IDimension;
+        rowCache:IRow[];
+        rowFactory:IRowFactory;
+        rowMap:IRow[];
+        searchProvider:ISearchProvider;
+        styleProvider:IStyleProvider;
+
+        buildColumnDefsFromData():void;
+        buildColumns():void;
+        calcMaxCanvasHeight():void;
+        clearSortingData():void;
+        configureColumnWidths():void;
+        fixColumnIndexes():void;
+        fixGroupIndexes():void;
+        getTemplate(key:string):angular.IPromise<any>;
+        init():angular.IPromise<any>;
+        initTemplates():angular.IPromise<any>;
+        minRowsToRender():void;
+        refreshDomSizes():void;
+        resizeOnData(col:IColumn):void;
+        setRenderedRows(newRows:IRow[]):void;
+        sortActual():void;
+        sortColumnsInit():void;
+        sortData(col:IColumn, event:any):void;
+    }
+
+    export interface IFooterStatic {
+        new($scope:IGridScope, grid:IGridInstance):IFooter;
+    }
+
+    export interface IFooter {
+    }
+
+    export interface IGridOptions {
+
+        /** Define an aggregate template to customize the rows when grouped. See github wiki for more details. */
+        aggregateTemplate?: string;
+
+        /** Callback for when you want to validate something after selection. */
+        afterSelectionChange?: (rowItem?: IRow, event?: any) => void ;
+
+        /** Callback if you want to inspect something before selection,
+        return false if you want to cancel the selection. return true otherwise.
+        If you need to wait for an async call to proceed with selection you can
+        use rowItem.changeSelection(event) method after returning false initially.
+        Note: when shift+ Selecting multiple items in the grid this will only get called
+        once and the rowItem will be an array of items that are queued to be selected. */
+        beforeSelectionChange?: (rowItem?: IRow, event?: any) => boolean ;
+
+        /** checkbox templates. */
+        checkboxCellTemplate?: string;
+
+        /** checkbox templates. */
+        checkboxHeaderTemplate?: string;
+
+        /** definitions of columns as an array [], if not defined columns are auto-generated. See github wiki for more details. */
+        columnDefs?: IColumnDef[];
+
+        /** Data being displayed in the grid. This can be either a string of object ID or object reference.
+            Using string is preferred, as this turns on change tracking in ng-grid
+        */
+        data?: any;
+
+        /** Data updated callback, fires every time the data is modified from outside the grid. */
+        dataUpdated?: Function;
+
+        /** Enables cell editing. */
+        enableCellEdit?: boolean;
+
+        /** Enables cell selection. */
+        enableCellSelection?: boolean;
+
+        /** Enable or disable resizing of columns */
+        enableColumnResize?: boolean;
+
+        /** Enable or disable reordering of columns */
+        enableColumnReordering?: boolean;
+
+        /** Enable or disable HEAVY column virtualization. This turns off selection checkboxes and column pinning and is designed for spreadsheet-like data. */
+        enableColumnHeavyVirt?: boolean;
+
+        /** Enables the server-side paging feature */
+        enablePaging?: boolean;
+
+        /** Enable column pinning */
+        enablePinning?: boolean;
+
+        /** Enable drag and drop row reordering. Only works in HTML5 compliant browsers. */
+        enableRowReordering?: boolean;
+
+        /** To be able to have selectable rows in grid. */
+        enableRowSelection?: boolean;
+
+        /** Enables or disables sorting in grid. */
+        enableSorting?: boolean;
+
+        /**  string list of properties to exclude when auto-generating columns. */
+        excludeProperties?: any;
+
+        /** filterOptions -
+        filterText: The text bound to the built-in search box.
+        useExternalFilter: Bypass internal filtering if you want to roll your own filtering mechanism but want to use builtin search box.
+        */
+        filterOptions?: IFilterOptions;
+
+        /** Defining the height of the footer in pixels. */
+        footerRowHeight?: number;
+
+        /** Initial fields to group data by. Array of field names, not displayName. */
+        groups?: string[];
+
+        /** The height of the header row in pixels. */
+        headerRowHeight?: number;
+
+        /** Define a header row template for further customization. See github wiki for more details. */
+        headerRowTemplate?: string;
+
+        /** Enables the use of jquery UI reaggable/droppable plugin. requires jqueryUI to work if enabled.
+        Useful if you want drag + drop but your users insist on crappy browsers. */
+        jqueryUIDraggable?: boolean;
+
+        /** Enable the use jqueryUIThemes */
+        jqueryUITheme?: boolean;
+
+        /** Prevent unselections when in single selection mode. */
+        keepLastSelected?: boolean;
+
+        /** Maintains the column widths while resizing.
+        Defaults to true when using *'s or undefined widths. Can be ovverriden by setting to false. */
+        maintainColumnRatios?: boolean;
+
+        /** Set this to false if you only want one item selected at a time */
+        multiSelect?: boolean;
+
+        /**  pagingOptions - */
+        pagingOptions?: IPagingOptions;
+
+        /** Array of plugin functions to register in ng-grid */
+        pinSelectionCheckbox?: boolean;
+
+        /** Array of plugin functions to register in ng-grid */
+        plugins?: any[];
+
+        /** Row height of rows in grid. */
+        rowHeight?: number;
+
+        /** Define a row template to customize output. See github wiki for more details. */
+        rowTemplate?: string;
+
+        /** all of the items selected in the grid. In single select mode there will only be one item in the array. */
+        selectedItems?: any[];
+
+        /** Select deselect an item by index. */
+        selectItem?: (idx:number, state:boolean) =>any;
+
+        /** Disable row selections by clicking on the row and only when the checkbox is clicked. */
+        selectWithCheckboxOnly?: boolean;
+
+        /** Enables menu to choose which columns to display and group by.
+        If both showColumnMenu and showFilter are false the menu button will not display.*/
+        showColumnMenu?: boolean;
+
+        /** Enables display of the filterbox in the column menu.
+        If both showColumnMenu and showFilter are false the menu button will not display.*/
+        showFilter?: boolean;
+
+        /** Show or hide the footer alltogether the footer is enabled by default */
+        showFooter?: boolean;
+
+        /** Show the dropzone for drag and drop grouping */
+        showGroupPanel?: boolean;
+
+        /** Row selection check boxes appear as the first column. */
+        showSelectionCheckbox?: boolean;
+
+        /** Define a sortInfo object to specify a default sorting state.
+        You can also observe this variable to utilize server-side sorting (see useExternalSorting).
+        Syntax is sortinfo: { fields: ['fieldName1',' fieldName2'], direction: 'ASC'/'asc' || 'desc'/'DESC'}*/
+        sortInfo?: any;
+
+        /** Set the tab index of the Vieport. */
+        tabIndex?: number;
+
+        /** Prevents the internal sorting from executing.
+        The sortInfo object will be updated with the sorting information so you can handle sorting (see sortInfo)*/
+        useExternalSorting?: boolean;
+
+        /** i18n language support. choose from the installed or included languages, en, fr, sp, etc...*/
+        i18n?: string;
+
+        /** the threshold in rows to force virtualization on  */
+        virtualizationThreshold?: number;
+
+        /** Enables or disables text highlighting in grid by adding the "unselectable" class (See CSS file) */
+        enableHighlighting?: boolean;
+    }
+
+    export interface IColumnDef {
+        /**
+         * This can be an absolute numberor it can also be defined in percentages (20%, 30%),
+         * in weighted *s, or "auto" (which sizes the column based on data length)
+         * (much like WPF/Silverlight)/ note: "auto" only works in single page apps currently because the re-size
+         * happens on "document.ready
+         */
+        width?: any;
+
+        /** The minum width the column is allowed to be. See width for the different options */
+        minWidth?: any;
+
+        /** Set the default visiblity of the column */
+        visible?: boolean;
+
+        /** Can also be a property path on your data model. "foo.bar.myField", "Name.First", etc..*/
+        field?: string;
+
+        /** What to display in the column header */
+        displayName?: string;
+
+        /** Restrict or allow the column to be sorted */
+        sortable?: boolean;
+
+        /** Restrict or allow the column to be resized */
+        resizable?: boolean;
+
+        /** Allows the column to be grouped with drag and drop, but has no effect on gridOptions.groups */
+        groupable?: boolean;
+
+        /** Allows the column to be pinned when enablePinning is set to true */
+        pinnable?: boolean;
+
+        /** The template to use while editing */
+        editableCellTemplate?: string;
+
+        /** Allows the cell to use an edit template when focused (grid option enableCellSelection must be enabled)*/
+        enableCellEdit?: boolean;
+
+        /** Controls when to use the edit template on per-row basis using an angular expression (enableCellEdit must also be true for editing)*/
+        cellEditableCondition?: string;
+
+        /** The funtion to use when filtering values in this column */
+        sortFn?: (a: any, b: any) => number;
+
+        /** Html template used to render the cell */
+        cellTemplate?: string;
+
+        /** User defined CSS class name */
+        cellClass?: string;
+
+        /** User defined CSS class name for the header cell */
+        headerClass?: string;
+
+        /** Html template used to render the header cell */
+        headerCellTemplate?: string;
+
+        /** string name for filter to use on the cell ('currency', 'date', etc..) */
+        cellFilter?: string;
+
+        /** String name for filter to use on the aggregate label ('currency', 'date', etc..) defaults to cellFilter if not set. */
+        aggLabelFilter?: string;
+
+        pinned?: boolean;
+    }
+
+    export interface IFilterOptions {
+        filterText?: string;
+        useExternalFilter?: boolean;
+    }
+
+    export interface IPagingOptions {
+        /**  pageSizes: list of available page sizes.  */
+        pageSizes?: number[];
+        /** pageSize: currently selected page size.  */
+        pageSize?: number;
+        /** totalServerItems: Total items are on the server.  */
+        totalServerItems?: number;
+        /** currentPage: the uhm... current page. */
+        currentPage?: number;
+    }
+
+    export interface IPlugin {
+        init(childScope:IGridScope, gridInstance:IGridInstance, services:any):void;
+    }
+
+    export module service {
+
+        export interface IDomUtilityService {
+            eventStorage:any;
+            numberOfGrids:number;
+            immediate:number;
+            AssignGridContainers($scope:IGridScope, rootel:angular.IAugmentedJQuery, grid:IGridInstance):void;
+            getRealWidth(obj:IDimension):number;
+            UpdateGridLayout($scope:IGridScope, grid:IGridInstance):void;
+            setStyleText(grid:IGridInstance, css:string):void;
+            BuildStyles($scope:IGridScope, grid:IGridInstance, digest:boolean):void;
+            setColLeft(col:IColumn, colLeft:number, grid:IGridInstance):void;
+            RebuildGrid($scope:IGridScope, grid:IGridInstance):void;
+            digest($scope:IGridScope):void;
+            ScrollH:number;
+            ScrollW:number;
+            LetterW:number;
+        }
+
+        export interface ISortInfo {
+            fields:string[];
+        }
+
+        export interface ISortService {
+            colSortFnCache:any;
+            isCustomSort:boolean;
+            isSorting:boolean;
+            guessSortFn(item:any):(a:any, b:any)=>number;
+            basicSort(a:any, b:any):number;
+            sortNumber(a:number, b:number):number;
+            sortNumberStr(a:string, b:string):number;
+            sortAlpha(a:string, b:string):number;
+            sortDate(a:Date, b:Date):number;
+            sortBool(a:boolean, b:boolean):number;
+            sortData(sortInfo:ISortInfo, data:any):void;
+            Sort(sortInfo:ISortInfo, data:any):void;
+            getSortFn(col:IColumn, data:any):(a:any, b:any)=>number;
+        }
+
+        export interface IUtilityService {
+            visualLength(node:any):number;
+            forIn(obj:any, action:(value:any, property:string)=>{}):void;
+            evalProperty(entity:any, path:string):any;
+            endsWith(str:string, suffix:string):boolean;
+            isNullOrUndefined(obj:any):boolean;
+            getElementsByClassName(cl:string):any[];
+            newId():string;
+            seti18n($scope:IGridScope, language:string):void;
+            getInstanceType(o:any):string;
+        }
+    }
+}
diff --git a/ng-grid/ng-grid-tests.ts b/ng-grid/ng-grid-tests.ts
index d8d153f289..5dcd9c34c9 100644
--- a/ng-grid/ng-grid-tests.ts
+++ b/ng-grid/ng-grid-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="ng-grid.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
+
+/// <reference types="angularjs" />
 
 var options1: ngGrid.IGridOptions = {
     data: [{ 'Name': 'Bob' }, { 'Name': 'Jane' }]
diff --git a/ng-grid/ng-grid.d.ts b/ng-grid/ng-grid.d.ts
deleted file mode 100644
index 12a784407a..0000000000
--- a/ng-grid/ng-grid.d.ts
+++ /dev/null
@@ -1,650 +0,0 @@
-// Type definitions for ng-grid
-// Project: http://angular-ui.github.io/ng-grid/
-// Definitions by: Ken Smith <https://github.com/smithkl42>, Roland Zwaga <https://github.com/rolandzwaga>, Kent Cooper <https://github.com/kentcooper>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// These are very definitely preliminary. Please feel free to improve.
-
-// Changelog:
-// 25/4/2014: Added interfaces for all classes and services
-
-/// <reference path='../angularjs/angular.d.ts' />
-
-declare class ngGridReorderable {
-    constructor();
-}
-
-declare var ngStyleProvider:ngGrid.IStyleProviderStatic;
-declare var ngSearchProvider:ngGrid.ISearchProviderStatic;
-declare var ngSelectionProvider:ngGrid.ISelectionProviderStatic;
-declare var ngEventProvider:ngGrid.IEventProviderStatic;
-declare var ngAggregate:ngGrid.IAggregateStatic;
-declare var ngRenderedRange:ngGrid.IRenderedRangeStatic;
-declare var ngDimension:ngGrid.IDimensionStatic;
-declare var ngRow:ngGrid.IRowStatic;
-declare var ngColumn:ngGrid.IColumnStatic;
-declare var ngFooter:ngGrid.IFooterStatic;
-
-declare namespace ngGrid {
-
-    export interface IDomAccessProvider {
-        previousColumn:IColumn;
-        grid:IGridInstance;
-        changeUserSelect(elm:angular.IAugmentedJQuery, value:string):void;
-        focusCellElement($scope:IGridScope, index:number):void;
-        selectionHandlers($scope:IGridScope, elm:angular.IAugmentedJQuery):void;
-    }
-
-    export interface IStyleProviderStatic {
-        new($scope:IGridScope, grid:IGridInstance):IStyleProvider;
-    }
-
-    export interface IStyleProvider {
-    }
-
-    export interface ISearchProviderStatic {
-        new($scope:IGridScope, grid:IGridInstance, $filter:angular.IFilterService):ISearchProvider;
-    }
-
-    export interface ISearchProvider {
-        fieldMap:any;
-        extFilter:boolean;
-        evalFilter():void;
-    }
-
-    export interface ISelectionProviderStatic {
-        new(grid:IGridInstance, $scope:IGridScope, $parse:angular.IParseService):ISelectionProvider;
-    }
-
-    export interface ISelectionProvider {
-        multi:boolean;
-        selectedItems:any[];
-        selectedIndex:number;
-        lastClickedRow:any;
-        ignoreSelectedItemChanges:boolean;
-        pKeyParser:angular.ICompiledExpression;
-        ChangeSelection(rowItem:any, event:any):void;
-        getSelection(entity:any):number;
-        getSelectionIndex(entity:any):number;
-        setSelection(rowItem:IRow, isSelected:boolean):void;
-        toggleSelectAll(checkAll:boolean, bypass:boolean, selectFiltered:boolean):void;
-    }
-
-    export interface IEventProviderStatic {
-        new(grid:IGridInstance, $scope:IGridScope, domUtilityService:service.IDomUtilityService, $timeout:angular.ITimeoutService):IEventProvider;
-    }
-
-    export interface IEventProvider {
-        colToMove:IColumn;
-        groupToMove:any;
-        assignEvents():void;
-        assignGridEventHandlers():void;
-        dragStart(event:any):void;
-        dragOver(event:any):void;
-        setDraggables():void;
-        onGroupMouseDown(event:any):void;
-        onGroupDrop(event:any):void;
-        onHeaderMouseDown(event:any):void;
-        onHeaderDrop(event:any):void;
-    }
-
-    export interface IAggregateStatic {
-        new(aggEntity:any, rowFactory:IRowFactory, rowHeight:number, groupInitState:boolean):IAggregate;
-    }
-
-    export interface IAggregate {
-        rowIndex:number;
-        offsetTop:number;
-        entity:any;
-        label:string;
-        field:string;
-        depth:number;
-        parent:any;
-        children:any[];
-        aggChildren:any[];
-        aggIndex:number;
-        collapsed:boolean;
-        groupInitState:boolean;
-        rowFactory:IRowFactory;
-        rowHeight:number;
-        isAggRow:boolean;
-        offsetLeft:number;
-        aggLabelFilter:any;
-    }
-
-    export interface IRowConfig {
-        enableCellSelection:boolean;
-        enableRowSelection:boolean;
-        jqueryUITheme:boolean;
-        rowClasses:string[];
-        rowHeight:number;
-        selectWithCheckboxOnly:boolean;
-        selectedItems:any[];
-
-        afterSelectionChangeCallback():void;
-        beforeSelectionChangeCallback():void;
-    }
-
-    export interface IRenderedRangeStatic {
-        new(top:number, bottom:number):IRenderedRange;
-    }
-
-    export interface IRenderedRange {
-        bottomRow:number;
-        topRow:number;
-    }
-
-    export interface IRowFactory {
-        aggCache:any;
-        dataChanged:boolean;
-        groupedData:any;
-        numberOfAggregates:number;
-        parentCache:any[];
-        parsedData:any[];
-        renderedRange:IRenderedRange;
-        rowConfig:IRowConfig;
-        rowHeight:number;
-        selectionProvider:ISelectionProvider;
-
-        UpdateViewableRange(newRange:IRenderedRange):void;
-        buildAggregateRow(aggEntity:any, rowIndex:number):IAggregate;
-        buildEntityRow(entity:any, rowIndex:number):IRow;
-        filteredRowsChanged():void;
-        fixRowCache():void;
-        getGrouping(groups:any):void;
-        parseGroupData(groupData:any):void;
-        renderedChange():void;
-        renderedChangeNoGroups():void;
-    }
-
-    export interface IDimensionStatic {
-        new(options:any):IDimension;
-    }
-
-    export interface IDimension {
-        outerHeight?:number;
-        outerWidth?:number;
-        autoFitHeight?:boolean;
-    }
-
-    export interface IElementDimension {
-        rootMaxH?:number;
-        rootMaxW?:number;
-        rowIndexCellW?:number;
-        rowSelectedCellW?:number;
-        scrollH?:number;
-        scrollW?:number;
-    }
-
-    export interface IRowStatic {
-        new(entity:any, config:IRowConfig, selectionProvider:ISelectionProvider, rowIndex:number, $utils:any):IRow;
-    }
-
-    export interface IRow {
-        entity:any;
-        config:IRowConfig;
-        selectionProvider:ISelectionProvider;
-        rowIndex:number;
-        utils:any;
-        selected:boolean;
-        cursor:string;
-        offsetTop:number;
-        rowDisplayIndex:number;
-        afterSelectionChange():void;
-        beforeSelectionChange():void;
-        setSelection(isSelected:boolean):void;
-        continueSelection(event:any):void;
-        ensureEntity(expected:any):void;
-        toggleSelected(event:any):boolean;
-        alternatingRowClass():void;
-        getProperty(path:string):any;
-        copy():IRow;
-        setVars(fromRow:IRow):void;
-    }
-
-    export interface IColumnStatic {
-        new(config:IGridOptions, $scope:IGridScope, grid:IGridInstance, domUtilityService:service.IDomUtilityService, $templateCache:angular.ITemplateCacheService, $utils:any):IColumn;
-    }
-
-    export interface IColumn {
-        colDef:IColumnDef;
-        width:number;
-        groupIndex:number;
-        isGroupedBy:boolean;
-        minWidth:number;
-        maxWidth:number;
-        enableCellEdit:boolean;
-        cellEditableCondition:any;
-        headerRowHeight:number;
-        displayName:string;
-        index:number;
-        isAggCol:boolean;
-        cellClass:string;
-        sortPriority:number;
-        cellFilter:any;
-        field:string;
-        aggLabelFilter:any;
-        visible:boolean;
-        sortable:boolean;
-        resizable:boolean;
-        pinnable:boolean;
-        pinned:boolean;
-        originalIndex:number;
-        groupable:boolean;
-        sortDirection:string;
-        sortingAlgorithm:Function;
-        headerClass:string;
-        cursor:string;
-        headerCellTemplate:string;
-        cellTemplate:string;
-        groupedByClass():string;
-        toggleVisible():void;
-        showSortButtonUp():boolean;
-        showSortButtonDown():boolean;
-        noSortVisible():boolean;
-        sort(event:any):boolean;
-        gripClick():any;
-        gripOnMouseDown(event:any):any;
-        onMouseMove(event:any):void;
-        gripOnMouseUp(event:any):void;
-        copy():IColumn;
-        setVars(fromCol:IColumn):void;
-    }
-
-    export interface IGridScope extends angular.IScope {
-        elementsNeedMeasuring:boolean;
-        columns:any[];
-        renderedRows:any[];
-        renderedColumns:any[];
-        headerRow:any;
-        rowHeight:number;
-        jqueryUITheme:any;
-        showSelectionCheckbox:boolean;
-        enableCellSelection:boolean;
-        enableCellEditOnFocus:boolean;
-        footer:IFooter;
-        selectedItems:any[];
-        multiSelect:boolean;
-        showFooter:boolean;
-        footerRowHeight:number;
-        showColumnMenu:boolean;
-        forceSyncScrolling:boolean;
-        showMenu:boolean;
-        configGroups:any[];
-        gridId:string;
-        enablePaging:boolean;
-        pagingOptions:IPagingOptions;
-        i18n:any;
-        selectionProvider:ISelectionProvider;
-        adjustScrollLeft(scrollLeft:number):void;
-        adjustScrollTop(scrollTop:number, force:boolean):void;
-        toggleShowMenu():void;
-        toggleSelectAll():void;
-        totalFilteredItemsLength():number;
-        showGroupPanel():any;
-        topPanelHeight():number;
-        viewportDimHeight():number;
-        groupBy(col:IColumn):void;
-        removeGroup(index:number):void;
-        togglePin(col:IColumn):void;
-        totalRowWidth():number;
-        headerScrollerDim():any;
-    }
-
-    export interface IGridInstance {
-        $canvas:angular.IAugmentedJQuery;
-        $viewport:angular.IAugmentedJQuery;
-        $groupPanel:angular.IAugmentedJQuery;
-        $footerPanel:angular.IAugmentedJQuery;
-        $headerScroller:angular.IAugmentedJQuery;
-        $headerContainer:angular.IAugmentedJQuery;
-        $headers:angular.IAugmentedJQuery;
-        $topPanel:angular.IAugmentedJQuery;
-        $root:angular.IAugmentedJQuery;
-        config:IGridOptions;
-        data:any;
-        elementDims:IElementDimension;
-        eventProvider:IEventProvider;
-        filteredRows:IRow[];
-        footerController:any;
-        gridId:string;
-        lastSortedColumns:IColumn[];
-        lateBindColumns:boolean;
-        maxCanvasHt:number;
-        prevScrollIndex:number;
-        prevScrollTop:number;
-        rootDim:IDimension;
-        rowCache:IRow[];
-        rowFactory:IRowFactory;
-        rowMap:IRow[];
-        searchProvider:ISearchProvider;
-        styleProvider:IStyleProvider;
-
-        buildColumnDefsFromData():void;
-        buildColumns():void;
-        calcMaxCanvasHeight():void;
-        clearSortingData():void;
-        configureColumnWidths():void;
-        fixColumnIndexes():void;
-        fixGroupIndexes():void;
-        getTemplate(key:string):angular.IPromise<any>;
-        init():angular.IPromise<any>;
-        initTemplates():angular.IPromise<any>;
-        minRowsToRender():void;
-        refreshDomSizes():void;
-        resizeOnData(col:IColumn):void;
-        setRenderedRows(newRows:IRow[]):void;
-        sortActual():void;
-        sortColumnsInit():void;
-        sortData(col:IColumn, event:any):void;
-    }
-
-    export interface IFooterStatic {
-        new($scope:IGridScope, grid:IGridInstance):IFooter;
-    }
-
-    export interface IFooter {
-    }
-
-    export interface IGridOptions {
-
-        /** Define an aggregate template to customize the rows when grouped. See github wiki for more details. */
-        aggregateTemplate?: string;
-
-        /** Callback for when you want to validate something after selection. */
-        afterSelectionChange?: (rowItem?: IRow, event?: any) => void ;
-
-        /** Callback if you want to inspect something before selection,
-        return false if you want to cancel the selection. return true otherwise.
-        If you need to wait for an async call to proceed with selection you can
-        use rowItem.changeSelection(event) method after returning false initially.
-        Note: when shift+ Selecting multiple items in the grid this will only get called
-        once and the rowItem will be an array of items that are queued to be selected. */
-        beforeSelectionChange?: (rowItem?: IRow, event?: any) => boolean ;
-
-        /** checkbox templates. */
-        checkboxCellTemplate?: string;
-
-        /** checkbox templates. */
-        checkboxHeaderTemplate?: string;
-
-        /** definitions of columns as an array [], if not defined columns are auto-generated. See github wiki for more details. */
-        columnDefs?: IColumnDef[];
-
-        /** Data being displayed in the grid. This can be either a string of object ID or object reference.
-            Using string is preferred, as this turns on change tracking in ng-grid
-        */
-        data?: any;
-
-        /** Data updated callback, fires every time the data is modified from outside the grid. */
-        dataUpdated?: Function;
-
-        /** Enables cell editing. */
-        enableCellEdit?: boolean;
-
-        /** Enables cell selection. */
-        enableCellSelection?: boolean;
-
-        /** Enable or disable resizing of columns */
-        enableColumnResize?: boolean;
-
-        /** Enable or disable reordering of columns */
-        enableColumnReordering?: boolean;
-
-        /** Enable or disable HEAVY column virtualization. This turns off selection checkboxes and column pinning and is designed for spreadsheet-like data. */
-        enableColumnHeavyVirt?: boolean;
-
-        /** Enables the server-side paging feature */
-        enablePaging?: boolean;
-
-        /** Enable column pinning */
-        enablePinning?: boolean;
-
-        /** Enable drag and drop row reordering. Only works in HTML5 compliant browsers. */
-        enableRowReordering?: boolean;
-
-        /** To be able to have selectable rows in grid. */
-        enableRowSelection?: boolean;
-
-        /** Enables or disables sorting in grid. */
-        enableSorting?: boolean;
-
-        /**  string list of properties to exclude when auto-generating columns. */
-        excludeProperties?: any;
-
-        /** filterOptions -
-        filterText: The text bound to the built-in search box.
-        useExternalFilter: Bypass internal filtering if you want to roll your own filtering mechanism but want to use builtin search box.
-        */
-        filterOptions?: IFilterOptions;
-
-        /** Defining the height of the footer in pixels. */
-        footerRowHeight?: number;
-
-        /** Initial fields to group data by. Array of field names, not displayName. */
-        groups?: string[];
-
-        /** The height of the header row in pixels. */
-        headerRowHeight?: number;
-
-        /** Define a header row template for further customization. See github wiki for more details. */
-        headerRowTemplate?: string;
-
-        /** Enables the use of jquery UI reaggable/droppable plugin. requires jqueryUI to work if enabled.
-        Useful if you want drag + drop but your users insist on crappy browsers. */
-        jqueryUIDraggable?: boolean;
-
-        /** Enable the use jqueryUIThemes */
-        jqueryUITheme?: boolean;
-
-        /** Prevent unselections when in single selection mode. */
-        keepLastSelected?: boolean;
-
-        /** Maintains the column widths while resizing.
-        Defaults to true when using *'s or undefined widths. Can be ovverriden by setting to false. */
-        maintainColumnRatios?: boolean;
-
-        /** Set this to false if you only want one item selected at a time */
-        multiSelect?: boolean;
-
-        /**  pagingOptions - */
-        pagingOptions?: IPagingOptions;
-
-        /** Array of plugin functions to register in ng-grid */
-        pinSelectionCheckbox?: boolean;
-
-        /** Array of plugin functions to register in ng-grid */
-        plugins?: any[];
-
-        /** Row height of rows in grid. */
-        rowHeight?: number;
-
-        /** Define a row template to customize output. See github wiki for more details. */
-        rowTemplate?: string;
-
-        /** all of the items selected in the grid. In single select mode there will only be one item in the array. */
-        selectedItems?: any[];
-
-        /** Select deselect an item by index. */
-        selectItem?: (idx:number, state:boolean) =>any;
-
-        /** Disable row selections by clicking on the row and only when the checkbox is clicked. */
-        selectWithCheckboxOnly?: boolean;
-
-        /** Enables menu to choose which columns to display and group by.
-        If both showColumnMenu and showFilter are false the menu button will not display.*/
-        showColumnMenu?: boolean;
-
-        /** Enables display of the filterbox in the column menu.
-        If both showColumnMenu and showFilter are false the menu button will not display.*/
-        showFilter?: boolean;
-
-        /** Show or hide the footer alltogether the footer is enabled by default */
-        showFooter?: boolean;
-
-        /** Show the dropzone for drag and drop grouping */
-        showGroupPanel?: boolean;
-
-        /** Row selection check boxes appear as the first column. */
-        showSelectionCheckbox?: boolean;
-
-        /** Define a sortInfo object to specify a default sorting state.
-        You can also observe this variable to utilize server-side sorting (see useExternalSorting).
-        Syntax is sortinfo: { fields: ['fieldName1',' fieldName2'], direction: 'ASC'/'asc' || 'desc'/'DESC'}*/
-        sortInfo?: any;
-
-        /** Set the tab index of the Vieport. */
-        tabIndex?: number;
-
-        /** Prevents the internal sorting from executing.
-        The sortInfo object will be updated with the sorting information so you can handle sorting (see sortInfo)*/
-        useExternalSorting?: boolean;
-
-        /** i18n language support. choose from the installed or included languages, en, fr, sp, etc...*/
-        i18n?: string;
-
-        /** the threshold in rows to force virtualization on  */
-        virtualizationThreshold?: number;
-
-        /** Enables or disables text highlighting in grid by adding the "unselectable" class (See CSS file) */
-        enableHighlighting?: boolean;
-    }
-
-    export interface IColumnDef {
-        /**
-         * This can be an absolute numberor it can also be defined in percentages (20%, 30%),
-         * in weighted *s, or "auto" (which sizes the column based on data length)
-         * (much like WPF/Silverlight)/ note: "auto" only works in single page apps currently because the re-size
-         * happens on "document.ready
-         */
-        width?: any;
-
-        /** The minum width the column is allowed to be. See width for the different options */
-        minWidth?: any;
-
-        /** Set the default visiblity of the column */
-        visible?: boolean;
-
-        /** Can also be a property path on your data model. "foo.bar.myField", "Name.First", etc..*/
-        field?: string;
-
-        /** What to display in the column header */
-        displayName?: string;
-
-        /** Restrict or allow the column to be sorted */
-        sortable?: boolean;
-
-        /** Restrict or allow the column to be resized */
-        resizable?: boolean;
-
-        /** Allows the column to be grouped with drag and drop, but has no effect on gridOptions.groups */
-        groupable?: boolean;
-
-        /** Allows the column to be pinned when enablePinning is set to true */
-        pinnable?: boolean;
-
-        /** The template to use while editing */
-        editableCellTemplate?: string;
-
-        /** Allows the cell to use an edit template when focused (grid option enableCellSelection must be enabled)*/
-        enableCellEdit?: boolean;
-
-        /** Controls when to use the edit template on per-row basis using an angular expression (enableCellEdit must also be true for editing)*/
-        cellEditableCondition?: string;
-
-        /** The funtion to use when filtering values in this column */
-        sortFn?: (a: any, b: any) => number;
-
-        /** Html template used to render the cell */
-        cellTemplate?: string;
-
-        /** User defined CSS class name */
-        cellClass?: string;
-
-        /** User defined CSS class name for the header cell */
-        headerClass?: string;
-
-        /** Html template used to render the header cell */
-        headerCellTemplate?: string;
-
-        /** string name for filter to use on the cell ('currency', 'date', etc..) */
-        cellFilter?: string;
-
-        /** String name for filter to use on the aggregate label ('currency', 'date', etc..) defaults to cellFilter if not set. */
-        aggLabelFilter?: string;
-
-        pinned?: boolean;
-    }
-
-    export interface IFilterOptions {
-        filterText?: string;
-        useExternalFilter?: boolean;
-    }
-
-    export interface IPagingOptions {
-        /**  pageSizes: list of available page sizes.  */
-        pageSizes?: number[];
-        /** pageSize: currently selected page size.  */
-        pageSize?: number;
-        /** totalServerItems: Total items are on the server.  */
-        totalServerItems?: number;
-        /** currentPage: the uhm... current page. */
-        currentPage?: number;
-    }
-
-    export interface IPlugin {
-        init(childScope:IGridScope, gridInstance:IGridInstance, services:any):void;
-    }
-
-    export module service {
-
-        export interface IDomUtilityService {
-            eventStorage:any;
-            numberOfGrids:number;
-            immediate:number;
-            AssignGridContainers($scope:IGridScope, rootel:angular.IAugmentedJQuery, grid:IGridInstance):void;
-            getRealWidth(obj:IDimension):number;
-            UpdateGridLayout($scope:IGridScope, grid:IGridInstance):void;
-            setStyleText(grid:IGridInstance, css:string):void;
-            BuildStyles($scope:IGridScope, grid:IGridInstance, digest:boolean):void;
-            setColLeft(col:IColumn, colLeft:number, grid:IGridInstance):void;
-            RebuildGrid($scope:IGridScope, grid:IGridInstance):void;
-            digest($scope:IGridScope):void;
-            ScrollH:number;
-            ScrollW:number;
-            LetterW:number;
-        }
-
-        export interface ISortInfo {
-            fields:string[];
-        }
-
-        export interface ISortService {
-            colSortFnCache:any;
-            isCustomSort:boolean;
-            isSorting:boolean;
-            guessSortFn(item:any):(a:any, b:any)=>number;
-            basicSort(a:any, b:any):number;
-            sortNumber(a:number, b:number):number;
-            sortNumberStr(a:string, b:string):number;
-            sortAlpha(a:string, b:string):number;
-            sortDate(a:Date, b:Date):number;
-            sortBool(a:boolean, b:boolean):number;
-            sortData(sortInfo:ISortInfo, data:any):void;
-            Sort(sortInfo:ISortInfo, data:any):void;
-            getSortFn(col:IColumn, data:any):(a:any, b:any)=>number;
-        }
-
-        export interface IUtilityService {
-            visualLength(node:any):number;
-            forIn(obj:any, action:(value:any, property:string)=>{}):void;
-            evalProperty(entity:any, path:string):any;
-            endsWith(str:string, suffix:string):boolean;
-            isNullOrUndefined(obj:any):boolean;
-            getElementsByClassName(cl:string):any[];
-            newId():string;
-            seti18n($scope:IGridScope, language:string):void;
-            getInstanceType(o:any):string;
-        }
-    }
-}
diff --git a/ng-grid/tsconfig.json b/ng-grid/tsconfig.json
new file mode 100644
index 0000000000..dd4eebb478
--- /dev/null
+++ b/ng-grid/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ng-grid-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ng-i18next/index.d.ts b/ng-i18next/index.d.ts
new file mode 100644
index 0000000000..a63590d4fa
--- /dev/null
+++ b/ng-i18next/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for i18next v0.3.6
+// Project: https://github.com/i18next/ng-i18next
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="i18next" />
+
+declare namespace angular.i18next {
+    interface I18nextProvider {
+        options: any;
+    }
+}
diff --git a/ng-i18next/ng-i18next-tests.ts b/ng-i18next/ng-i18next-tests.ts
index 243a39865a..3ed6518afb 100644
--- a/ng-i18next/ng-i18next-tests.ts
+++ b/ng-i18next/ng-i18next-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="ng-i18next.d.ts" />
+
 /**
 * @summary Test for "ng-i18next" with options.
 */
diff --git a/ng-i18next/ng-i18next.d.ts b/ng-i18next/ng-i18next.d.ts
deleted file mode 100644
index 650952c2ed..0000000000
--- a/ng-i18next/ng-i18next.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for i18next v0.3.6
-// Project: https://github.com/i18next/ng-i18next
-// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../i18next/i18next-2.0.17.d.ts" />
-
-declare namespace angular.i18next {
-    interface I18nextProvider {
-        options: I18nextOptions;
-    }
-}
diff --git a/ng-i18next/tsconfig.json b/ng-i18next/tsconfig.json
new file mode 100644
index 0000000000..4602c3c3d4
--- /dev/null
+++ b/ng-i18next/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ng-i18next-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ng-notify/index.d.ts b/ng-notify/index.d.ts
new file mode 100644
index 0000000000..ff0a9ae3eb
--- /dev/null
+++ b/ng-notify/index.d.ts
@@ -0,0 +1,73 @@
+// Type definitions for ng-notify 0.7.1
+// Project: https://github.com/matowens/ng-notify
+// Definitions by: Nick Zamosenchuk <https://github.com/nzamosenchuk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs"/>
+
+declare namespace ngNotify {
+
+    /**
+     * Contains the options used to configure notification.
+     */
+    interface IUserOptions{
+        type?: string;
+        theme?: string;
+        position?: string;
+        duration?: number;
+        sticky?: boolean;
+        button?: boolean;
+        html?: boolean;
+    }
+
+    /**
+     * Simply and lightweight notification service for AngularJS
+     */
+    interface INotifyService {
+
+        /**
+         * Allows to create a whole new set of styles for each notification type.
+         * @param themeName The name used when setting the theme in the config object.
+         * @param className The class used to target this theme in the stylesheet.
+         */
+        addTheme(themeName:string, className:string):void;
+
+        /**
+         * Allows to create a new type of notification to use in their app.
+         * @param typeName The name used to trigger this notification type in the set method.
+         * @param className The class used to target this type in the stylesheet.
+         */
+        addType(typeName:string, className:string):void;
+
+        /**
+         * Sets default settings for all notifications to take into account when displaying.
+         * @param userOptions Notification configuration object
+         */
+        config(userOptions: IUserOptions):void;
+
+        /**
+         * Manually dismisses any sticky notifications that may still be set.
+         */
+        dismiss():void;
+
+        /**
+         * Displays a notification message.
+         * @param message A message text to display.
+         */
+        set(message: string):void;
+
+        /**
+         * Displays a notification message and sets the type for this one notification.
+         * @param message A message text to display.
+         * @param type The type of the notification.
+         */
+        set(message: string, type: string):void;
+
+        /**
+         * displays a notification message and sets the formatting/behavioral options for this one notification.
+         * @param message A message text to display.
+         * @param userOptions Notification configuration object.
+         */
+        set(message: string, userOptions: IUserOptions):void;
+    }
+}
diff --git a/ng-notify/ng-notify-tests.ts b/ng-notify/ng-notify-tests.ts
index 4a03d62cec..cf2af57792 100644
--- a/ng-notify/ng-notify-tests.ts
+++ b/ng-notify/ng-notify-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path='../angularjs/angular.d.ts'/>
-/// <reference path="ng-notify.d.ts" />
+/// <reference types="angularjs"/>
+
 
 class NgNotifyTestController {
 
diff --git a/ng-notify/ng-notify.d.ts b/ng-notify/ng-notify.d.ts
deleted file mode 100644
index de0eeaafc6..0000000000
--- a/ng-notify/ng-notify.d.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-// Type definitions for ng-notify 0.7.1
-// Project: https://github.com/matowens/ng-notify
-// Definitions by: Nick Zamosenchuk <https://github.com/nzamosenchuk>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/// <reference path='../angularjs/angular.d.ts'/>
-
-declare namespace ngNotify {
-
-    /**
-     * Contains the options used to configure notification.
-     */
-    interface IUserOptions{
-        type?: string;
-        theme?: string;
-        position?: string;
-        duration?: number;
-        sticky?: boolean;
-        button?: boolean;
-        html?: boolean;
-    }
-
-    /**
-     * Simply and lightweight notification service for AngularJS
-     */
-    interface INotifyService {
-
-        /**
-         * Allows to create a whole new set of styles for each notification type.
-         * @param themeName The name used when setting the theme in the config object.
-         * @param className The class used to target this theme in the stylesheet.
-         */
-        addTheme(themeName:string, className:string):void;
-
-        /**
-         * Allows to create a new type of notification to use in their app.
-         * @param typeName The name used to trigger this notification type in the set method.
-         * @param className The class used to target this type in the stylesheet.
-         */
-        addType(typeName:string, className:string):void;
-
-        /**
-         * Sets default settings for all notifications to take into account when displaying.
-         * @param userOptions Notification configuration object
-         */
-        config(userOptions: IUserOptions):void;
-
-        /**
-         * Manually dismisses any sticky notifications that may still be set.
-         */
-        dismiss():void;
-
-        /**
-         * Displays a notification message.
-         * @param message A message text to display.
-         */
-        set(message: string):void;
-
-        /**
-         * Displays a notification message and sets the type for this one notification.
-         * @param message A message text to display.
-         * @param type The type of the notification.
-         */
-        set(message: string, type: string):void;
-
-        /**
-         * displays a notification message and sets the formatting/behavioral options for this one notification.
-         * @param message A message text to display.
-         * @param userOptions Notification configuration object.
-         */
-        set(message: string, userOptions: IUserOptions):void;
-    }
-}
diff --git a/ng-notify/tsconfig.json b/ng-notify/tsconfig.json
new file mode 100644
index 0000000000..f61313758d
--- /dev/null
+++ b/ng-notify/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ng-notify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ng-stomp/index.d.ts b/ng-stomp/index.d.ts
new file mode 100644
index 0000000000..5750ac8a88
--- /dev/null
+++ b/ng-stomp/index.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for ngStomp
+// Project: https://github.com/beevelop/ng-stomp
+// Definitions by: Lukasz Potapczuk <https://github.com/lpotapczuk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/// <reference types="angularjs" />
+
+
+interface ngStomp {
+        sock:any;
+        stomp:any;
+        debug:any;
+        off: any;
+
+        setDebug:(callback:Function)=> void;
+
+        connect: (endpoint:string, headers?:Headers)=> angular.IHttpPromise<any>;
+
+        disconnect: (callback:()=>void) => angular.IHttpPromise<any>;
+
+        subscribe: (destination:string, callback:(payload:string, headers:Headers, res:Function)=>void, headers?:Headers, scope?:any) => any;
+
+        unsubscribe: () => any;
+
+        send: (destination:string, body:any, headers:Headers)=> any;
+
+    }
+
+     interface Headers {
+        [key: string]: any;
+    }
+
+
+
+
+
+
diff --git a/ng-stomp/ng-stomp-tests.ts b/ng-stomp/ng-stomp-tests.ts
index 214e7b0e71..287e1a7be2 100644
--- a/ng-stomp/ng-stomp-tests.ts
+++ b/ng-stomp/ng-stomp-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="ng-stomp.d.ts" />
+/// <reference types="angularjs" />
+
 
 namespace ngStompTesting {
 
diff --git a/ng-stomp/ng-stomp.d.ts b/ng-stomp/ng-stomp.d.ts
deleted file mode 100644
index 7cf263eeb6..0000000000
--- a/ng-stomp/ng-stomp.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Type definitions for ngStomp
-// Project: https://github.com/beevelop/ng-stomp
-// Definitions by: Lukasz Potapczuk <https://github.com/lpotapczuk>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/// <reference path="../angularjs/angular.d.ts" />
-
-
-interface ngStomp {
-        sock:any;
-        stomp:any;
-        debug:any;
-        off: any;
-
-        setDebug:(callback:Function)=> void;
-
-        connect: (endpoint:string, headers?:Headers)=> angular.IHttpPromise<any>;
-
-        disconnect: (callback:()=>void) => angular.IHttpPromise<any>;
-
-        subscribe: (destination:string, callback:(payload:string, headers:Headers, res:Function)=>void, headers?:Headers, scope?:any) => any;
-
-        unsubscribe: () => any;
-
-        send: (destination:string, body:any, headers:Headers)=> any;
-
-    }
-
-     interface Headers {
-        [key: string]: any;
-    }
-
-
-
-
-
-
diff --git a/ng-stomp/tsconfig.json b/ng-stomp/tsconfig.json
new file mode 100644
index 0000000000..b01ebcaccf
--- /dev/null
+++ b/ng-stomp/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ng-stomp-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ng-table/index.d.ts b/ng-table/index.d.ts
new file mode 100644
index 0000000000..44795db690
--- /dev/null
+++ b/ng-table/index.d.ts
@@ -0,0 +1,838 @@
+// Type definitions for ng-table
+// Project: https://github.com/esvit/ng-table
+// Definitions by: Christian Crowhurst <https://github.com/christianacca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+/**
+ * Parameters manager for an ngTable directive
+ */
+declare class NgTableParams<T> {
+    /**
+     * The page of data rows currently being displayed in the table
+     */
+    data: T[];
+
+    constructor(baseParameters?: NgTable.IParamValues<T>, baseSettings?: NgTable.ISettings<T>)
+    
+    /**
+     * Returns the number of data rows per page
+     */
+    count(): number
+    /**
+     * Sets the number of data rows per page.
+     * Changes to count will cause `isDataReloadRequired` to return true
+     */
+    count(count: number): NgTableParams<T>
+    
+    /**
+     * Returns the current filter values used to restrict the set of data rows.
+     * @param trim supply true to return the current filter minus any insignificant values
+     * (null,  undefined and empty string)
+     */
+    filter(trim?: boolean): NgTable.IFilterValues
+    /**
+     * Sets filter values to the `filter` supplied; any existing filter will be removed
+     * Changes to filter will cause `isDataReloadRequired` to return true and the current `page` to be set to 1
+     */
+    filter(filter: NgTable.IFilterValues): NgTableParams<T>
+    /**
+     * Generate array of pages.
+     * When no arguments supplied, the current parameter state of this `NgTableParams` instance will be used
+     */
+    generatePagesArray(currentPage?: number, totalItems?: number, pageSize?: number, maxBlocks?: number): NgTable.IPageButton[]
+    /**
+     * Returns the current grouping used to group the data rows
+     */
+    group(): NgTable.Grouping<T>
+    /**
+     * Sets grouping to the `field` and `sortDirection` supplied; any existing grouping will be removed
+     * Changes to group will cause `isDataReloadRequired` to return true and the current `page` to be set to 1
+     */
+    group(field: string, sortDirection?: string): NgTableParams<T>
+    /**
+     * Sets grouping to the `group` supplied; any existing grouping will be removed.
+     * Changes to group will cause `isDataReloadRequired` to return true and the current `page` to be set to 1
+     */
+    group(group: NgTable.Grouping<T>): NgTableParams<T>
+    /**
+     * Returns true when an attempt to `reload` the current `parameter` values have resulted in a failure.
+     * This method will continue to return true until the `reload` is successfully called or when the
+     * `parameter` values have changed
+     */
+    hasErrorState(): boolean
+    /**
+     * Returns true if `filter` has significant filter value(s) (any value except null, undefined, or empty string),
+     * otherwise false
+     */
+    hasFilter(): boolean
+    /**
+     * Return true when a change to `filters` require the `reload` method
+     * to be run so as to ensure the data presented to the user reflects these filters
+     */
+    hasFilterChanges(): boolean
+    /**
+     * Returns true when at least one group has been set
+     */
+    hasGroup(): boolean
+    /**
+     * Returns true when the `group` and when supplied, the `sortDirection` matches an existing group
+     */
+    hasGroup(group: string | NgTable.IGroupingFunc<T>, sortDirection?: string): boolean
+    /**
+     * Return true when a change to this instance should require the `reload` method
+     * to be run so as to ensure the data rows presented to the user reflects the current state.
+     * 
+     * Note that this method will return false when the `reload` method has run but fails. In this case
+     * `hasErrorState` will return true.
+     * 
+     * The built-in `ngTable` directives will watch for when this function returns true and will then call
+     * the `reload` method to load its data rows
+     */
+    isDataReloadRequired(): boolean
+    /**
+     * Returns sorting values in a format that can be consumed by the angular `$orderBy` filter service
+     */
+    orderBy(): string[]
+    /**
+     * Trigger a reload of the data rows
+     */
+    reload<TResult extends NgTable.Data.DataResult<T>>(): ng.IPromise<TResult[]>
+    /**
+     * Returns the settings for the table.
+     */
+    settings(): NgTable.ISettings<T>
+    /**
+     * Sets the settings for the table; new setting values will be merged with the existing settings.
+     * Supplying a new `dataset` will cause `isDataReloadRequired` to return true and the `ngTableEventsChannel`
+     * to fire its `datasetChanged` event
+     */
+    settings(newSettings: NgTable.ISettings<T>): NgTableParams<T>
+    /** 
+     * Returns the current sorting used to order the data rows.
+     * Changes to sorting will cause `isDataReloadRequired` to return true
+     */
+    sorting(): NgTable.ISortingValues
+    /**
+     * Sets sorting values to the `sorting` supplied; any existing sorting will be removed.
+     * Changes to sorting will cause `isDataReloadRequired` to return true
+     */
+    sorting(sorting: NgTable.ISortingValues): NgTableParams<T>
+    /**
+     * Sets sorting to the `field` and `direction` supplied; any existing sorting will be removed
+     */
+    sorting(field: string, direction: string): NgTableParams<T>
+    /**
+     * Returns the index of the current "slice" of data rows
+     */
+    page(): number
+    /**
+     * Sets the index of the current "slice" of data rows. The index starts at 1.
+     * Changing the page number will cause `isDataReloadRequired` to return true
+     */
+    page(page: number): NgTableParams<T>
+    /**
+     * Returns the count of the data rows that match the current `filter`
+     */
+    total(): number
+    /**
+     * Sets `settings().total` to the value supplied.
+     * Typically you will need to set a `total` in the body of any custom `getData` function
+     * you supply as a setting value to this instance.
+     * @example
+     * var tp = new NgTableParams({}, { getData: customGetData })
+     * function customGetData(params) {
+     *      var queryResult = /* code to fetch current data rows and total *\/
+     *      params.total(queryResult.total);
+     *      return queryResult.dataRowsPage;
+     * }
+     */
+    total(total: number): NgTableParams<T>
+    /**
+     * Returns the current parameter values uri-encoded. Set `asString` to 
+     * true for the parameters to be returned as an array of strings of the form 'paramName=value'
+     * otherwise parameters returned as a key-value object
+     */
+    url(asString?: boolean): { [name: string]: string } | string[]
+}
+
+declare namespace NgTable {
+
+    interface IDataSettings {
+        applyPaging?: boolean;
+    }
+    
+    /**
+     * An angular value object that allow for overriding of the initial default values used when constructing
+     * an instance of `NgTableParams`  
+     */
+    interface IDefaults {
+        params?: IParamValues<any>;
+        settings?: ISettings<any>
+    }
+
+    /**
+     * Map of the names of fields declared on a data row and the corrosponding filter value
+     */
+    interface IFilterValues { [name: string]: any }
+    
+    /**
+     * Map of the names of fields on a data row and the corrosponding sort direction;
+     * Set the value of a key to undefined to let value of `ISettings.defaultSort` apply
+     */
+    interface ISortingValues { [name: string]: string }
+
+    type Grouping<T> = IGroupValues | IGroupingFunc<T>;
+
+    /**
+     * Map of the names of fields on a data row and the corrosponding sort direction
+     */
+    interface IGroupValues { [name: string]: string }
+    
+    /**
+     * Signature of a function that should return the name of the group
+     * that the `item` should be placed within
+     */
+    interface IGroupingFunc<T> {
+        (item: T): string;
+        /**
+         * 'asc' or 'desc'; leave undefined to let the value of `ISettings.groupOptions.defaultSort` apply
+         */
+        sortDirection?: string
+    }
+     
+    /**
+     * The runtime values for `NgTableParams` that determine the set of data rows and 
+     * how they are to be displayed in a table
+     */
+    interface IParamValues<T> {
+        /**
+         * The index of the "slice" of data rows, starting at 1, to be displayed by the table.
+         */
+        page?: number;
+        /**
+         * The number of data rows per page
+         */
+        count?: number;
+        /** 
+         * The filter that should be applied to restrict the set of data rows
+         */
+        filter?: IFilterValues;
+        /**
+         * The sort order that should be applied to the data rows.
+         */
+        sorting?: ISortingValues;
+        /**
+         * The grouping that should be applied to the data rows
+         */
+        group?: string | Grouping<T>;
+    }
+
+
+    type FilterComparator<T> = boolean | IFilterComparatorFunc<T>;
+
+    interface IFilterComparatorFunc<T> {
+        (actual: T, expected: T): boolean;
+    }
+
+    interface IFilterFunc<T> {
+        (data: T[], filter: IFilterValues, filterComparator: FilterComparator<T>): T[]
+    }
+
+
+    interface IFilterSettings<T> {
+        /**
+         * Use this to determine how items are matched against the filter values.
+         * This setting is identical to the `comparator` parameter supported by the angular 
+         * `$filter` filter service
+         * 
+         * Defaults to `undefined` which will result in a case insensitive susbstring match when 
+         * `IDefaultGetData` service is supplying the implementation for the
+         * `ISettings.getData` function
+         */
+        filterComparator?: FilterComparator<T>;
+        /**
+         * A duration to wait for the user to stop typing before applying the filter.
+         * - Defaults to 0 for small managed inmemory arrays ie where a `ISettings.dataset` argument is 
+         *   supplied to `NgTableParams.settings`.
+         * - Defaults to 500 milliseconds otherwise.
+         */
+        filterDelay?: number;
+        /**
+         * The number of elements up to which a managed inmemory array is considered small. Defaults to 10000.
+         */
+        filterDelayThreshold?: number;
+        /**
+         * Overrides `IDefaultGetDataProvider.filterFilterName`.
+         * The value supplied should be the name of the angular `$filter` service that will be selected to perform 
+         * the actual filter logic.
+         * Defaults to 'filter'.
+         */
+        filterFilterName?: string;
+        /**
+         * Tells `IDefaultGetData` to use this function supplied to perform the filtering instead of selecting an angular $filter.
+         */
+        filterFn?: IFilterFunc<T>;
+        /**
+         * The layout to use when multiple html templates are to rendered in a single table header column.
+         * Available values:
+         * - stack (the default)
+         * - horizontal 
+         */
+        filterLayout?: string
+    }
+
+    interface IGroupSettings {
+        /**
+         * The default sort direction that will be used whenever a group is supplied that
+         * does not define its own sort direction
+         */
+        defaultSort?: string;
+        /**
+         * Determines whether groups should be displayed expanded to show their items. Defaults to true
+         */
+        isExpanded?: boolean;
+    }
+    
+    /**
+     * Definition of the buttons rendered by the data row pager directive
+     */
+    interface IPageButton {
+        type: string;
+        number?: number;
+        active: boolean;
+        current?: boolean;
+    }
+        
+    /**
+     * Configuration settings for `NgTableParams`
+     */
+    interface ISettings<T> {
+        /**
+         * Returns true whenever a call to `getData` is in progress
+         */
+        $loading?: boolean;
+        /**
+         * An array that contains all the data rows that NgTable should manage.
+         * The `gateData` function will be used to manage the data rows
+         * that ultimately will be displayed.
+         */
+        dataset?: T[];
+        dataOptions?: {};
+        /**
+         * The total number of data rows before paging has been applied.
+         * Typically you will not need to supply this yourself
+         */
+        total?: number;
+        /**
+         * The default sort direction that will be used whenever a sorting is supplied that
+         * does not define its own sort direction
+         */
+        defaultSort?: string;
+        filterOptions?: IFilterSettings<T>;
+        groupOptions?: IGroupSettings;
+        /**
+         * The page size buttons that should be displayed. Each value defined in the array
+         * determines the possible values that can be supplied to `NgTableParams.page()`
+         */
+        counts?: number[];
+        /**
+         * The collection of interceptors that should apply to the results of a call to
+         * the `getData` function before the data rows are displayed in the table
+         */
+        interceptors?: IInterceptor<T>[];
+        /**
+         * Configuration for the template that will display the page size buttons
+         */
+        paginationMaxBlocks?: number;
+        /**
+         * Configuration for the template that will display the page size buttons
+         */
+        paginationMinBlocks?: number;
+        /**
+         * The html tag that will be used to display the sorting indicator in the table header
+         */
+        sortingIndicator?: string;
+        /**
+         * The function that will be used fetch data rows. Leave undefined to let the `IDefaultGetData`
+         * service provide a default implementation that will work with the `dataset` array you supply.
+         * 
+         * Typically you will supply a custom function when you need to execute filtering, paging and sorting
+         * on the server
+         */
+        getData?: Data.IGetDataFunc<T> | Data.IInterceptableGetDataFunc<T>;
+        /** 
+         * The function that will be used group data rows according to the groupings returned by `NgTableParams.group()`
+        */
+        getGroups?: Data.IGetGroupFunc<T>;
+    }
+
+    /**
+     * Configuration values that determine the behaviour of the `ngTableFilterConfig` service
+     */
+    interface IFilterConfigValues {
+        /**
+         * The default base url to use when deriving the url for a filter template given just an alias name
+         * Defaults to 'ng-table/filters/'
+         */
+        defaultBaseUrl?: string;
+        /**
+         * The extension to use when deriving the url of a filter template when given just an alias name
+         */
+        defaultExt?: string;
+        /**
+         * A map of alias names and their corrosponding urls. A lookup against this map will be used
+         * to find the url matching an alias name.
+         * If no match is found then a url will be derived using the following pattern `${defaultBaseUrl}${aliasName}.${defaultExt}`
+         */
+        aliasUrls?: { [name: string]: string };
+    }
+    
+    /**
+     * The angular provider used to configure the behaviour of the `ngTableFilterConfig` service
+     */
+    interface IFilterConfigProvider {
+        $get: IFilterConfig;
+        /**
+         * Reset back to factory defaults the config values that `ngTableFilterConfig` service will use
+         */
+        resetConfigs(): void;
+        /**
+         * Set the config values used by `ngTableFilterConfig` service
+         */
+        setConfig(customConfig: IFilterConfigValues): void;
+    }
+    
+    /**
+     * A key value-pair map where the key is the name of a field in a data row and the value is the definition 
+     * for the template used to render a filter cell in the header of a html table.
+     * Where the value is supplied as a string this should either be url to a html template or an alias to a url registered
+     * using the `ngTableFilterConfigProvider` 
+     * @example
+     * vm.ageFilter = { "age": "number" }
+     * @example
+     * vm.ageFilter = { "age": "my/custom/ageTemplate.html" }
+     * @example
+     * vm.ageFilter = { "age": { id: "number", placeholder: "Age of person"} }
+     */
+    interface IFilterTemplateDefMap {
+        [name: string]: string | IFilterTemplateDef
+    }
+    
+    /**
+     * A fully qualified template definition for a single filter
+     */
+    interface IFilterTemplateDef {
+        /**
+         * A url to a html template of an alias to a url registered using the `ngTableFilterConfigProvider` 
+         */
+        id: string,
+        /**
+         * The text that should be rendered as a prompt to assist the user when entering a filter value
+         */
+        placeholder: string
+    }
+    
+    /**
+     * Exposes configuration values and methods used to return the location of the html
+     * templates used to render the filter row of an ng-table directive
+     */
+    interface IFilterConfig {
+        /**
+         * Readonly copy of the final values used to configure the service.
+         */
+        config: IFilterConfigValues,
+        /**
+         * Return the url of the html filter template for the supplied definition and key.
+         * For more information see the documentation for `IFilterTemplateMap`
+         */
+        getTemplateUrl(filterDef: string | IFilterTemplateDef, filterKey?: string): string,
+        /**
+         * Return the url of the html filter template registered with the alias supplied
+         */
+        getUrlForAlias(aliasName: string, filterKey?: string): string
+    }
+
+    interface InternalTableParams<T> extends NgTableParams<T> {
+        isNullInstance: boolean
+    }
+    
+    /**
+     * A custom object that can be registered with an NgTableParams instance that can be used
+     * to post-process the results (and failures) returned by its `getData` function
+     */
+    interface IInterceptor<T> {
+        response?: <TData>(data: TData, params: NgTableParams<T>) => TData;
+        responseError?: (reason: any, params: NgTableParams<T>) => any;
+    }
+
+    type SelectData = ISelectOption[] | ISelectDataFunc
+
+    interface ISelectOption {
+        id: string | number;
+        title: string;
+    }
+
+    interface ISelectDataFunc {
+        (): ISelectOption[] | ng.IPromise<ISelectOption[]>
+    }    
+        
+    /**
+     * Definition of the constructor function that will construct new instances of `NgTableParams`.
+     * On construction of `NgTableParams` the `ngTableEventsChannel` will fire its `afterCreated` event.
+     */
+    interface ITableParamsConstructor<T> {
+        new (baseParameters?: IParamValues<T>, baseSettings?: ISettings<T>): NgTableParams<T>
+    }
+
+
+    namespace Data {
+
+        type DataResult<T> = T | IDataRowGroup<T>;
+
+        interface IDataRowGroup<T> {
+            data: T[];
+            $hideRows: boolean;
+            value: string;
+        }
+             
+        /**
+         * A default implementation of the getData function that will apply the `filter`, `orderBy` and
+         * paging values from the `NgTableParams` instance supplied to the data array supplied.
+         * 
+         * A call to this function will:
+         * - return the resulting array
+         * - assign the total item count after filtering to the `total` of the `NgTableParams` instance supplied
+         */
+        interface IDefaultGetData<T> {
+            (data: T[], params: NgTableParams<T>): T[];
+            /**
+             * Convenience function that this service will use to apply paging to the data rows.
+             * 
+             * Returns a slice of rows from the `data` array supplied and sets the `NgTableParams.total()`
+             * on the `params` instance supplied to `data.length`
+             */
+            applyPaging(data: T[], params: NgTableParams<T>): T[],
+            /**
+             * Returns a reference to the function that this service will use to filter data rows
+             */
+            getFilterFn(params: NgTableParams<T>): IFilterFunc<T>,
+            /**
+             * Returns a reference to the function that this service will use to sort data rows
+             */
+            getOrderByFn(params?: NgTableParams<T>): void
+        }   
+
+        /**
+         * Allows for the configuration of the ngTableDefaultGetData service.
+         */
+        interface IDefaultGetDataProvider {
+            $get<T>(): IDefaultGetData<T>;
+            /**
+             * The name of a angular filter that knows how to apply the values returned by
+             * `NgTableParams.filter()` to restrict an array of data.
+             * (defaults to the angular `filter` filter service)
+             */
+            filterFilterName: string,
+            /**
+             * The name of a angular filter that knows how to apply the values returned by
+            * `NgTableParams.orderBy()` to sort an array of data.
+            * (defaults to the angular `orderBy` filter service)
+            */
+            sortingFilterName: string
+        }
+
+        interface IGetDataBcShimFunc<T> {
+            (originalFunc: ILegacyGetDataFunc<T>): { (params: NgTableParams<T>): ng.IPromise<T[]> }
+        }
+        
+        /**
+         * Signature of a function that will called whenever NgTable requires to load data rows
+         * into the table.
+         * `params` is the table requesting the data rows
+         */
+        interface IGetDataFunc<T> {
+            (params: NgTableParams<T>): T[] | ng.IPromise<T[]>;
+        }
+
+        interface IGetGroupFunc<T> {
+            (params: NgTableParams<T>): { [name: string]: IDataRowGroup<T>[] }
+        }
+        
+        /**
+         * Variation of the `IGetDataFunc` function signature that allows for flexibility for
+         * the shape of the return value.
+         * Typcially you will use this function signature when you want to configure `NgTableParams` with
+         * interceptors that will return the final data rows array.   
+         */
+        interface IInterceptableGetDataFunc<T> {
+            <TResult>(params: NgTableParams<T>): TResult;
+        }
+
+        interface ILegacyGetDataFunc<T> {
+            ($defer: ng.IDeferred<T[]>, params: NgTableParams<T>): void
+        }
+    }
+
+    namespace Events {
+        interface IEventSelectorFunc {
+            (publisher: NgTableParams<any>): boolean
+        }
+
+        type EventSelector<T> = NgTableParams<T> | IEventSelectorFunc
+
+        interface IDatasetChangedListener<T> {
+            (publisher: NgTableParams<T>, newDataset: T[], oldDataset: T[]): any
+        }
+        interface IAfterCreatedListener {
+            (publisher: NgTableParams<any>): any
+        }
+        interface IAfterReloadDataListener<T> {
+            (publisher: NgTableParams<T>, newData: NgTable.Data.DataResult<T>[], oldData: NgTable.Data.DataResult<T>[]): any
+        }
+        interface IPagesChangedListener {
+            (publisher: NgTableParams<any>, newPages: NgTable.IPageButton[], oldPages: NgTable.IPageButton[]): any
+        }
+        
+        interface IUnregistrationFunc {
+            (): void
+        }
+
+        interface IEventsChannel {
+            /**
+             * Subscribe to receive notification whenever a new `NgTableParams` instance has finished being constructed.
+             * Optionally supply an `eventFilter` to restrict which events that should trigger the `listener` to be called. Supply a
+             * `scope` to have angular automatically unregister the listener when the `scope` is destroyed.
+             * 
+             * @param listener the function that will be called when the event fires
+             * @param scope the angular `$scope` that will limit the lifetime of the event subscription
+             * @param eventFilter a predicate function that should return true to receive the event
+             * @return a unregistration function that when called will unregister the `listener`
+             */
+            onAfterCreated(listener: Events.IAfterCreatedListener, scope: ng.IScope, eventFilter?: Events.IEventSelectorFunc): IUnregistrationFunc;
+            /**
+             * Subscribe to receive notification whenever a new `NgTableParams` instance has finished being constructed.
+             * Optionally supply an `eventFilter` to restrict which events that should trigger the `listener` to be called.
+             * 
+             * @param listener the function that will be called when the event fires
+             * @param eventFilter a predicate function that should return true to receive the event
+             * @return a unregistration function that when called will unregister the `listener`
+             */
+            onAfterCreated(listener: Events.IAfterCreatedListener, eventFilter?: Events.IEventSelectorFunc): IUnregistrationFunc;
+            /**
+             * Subscribe to receive notification whenever the `reload` method of an `NgTableParams` instance has successfully executed
+             * Optionally supply an `eventFilter` to restrict which events that should trigger the `listener` to be called. Supply a
+             * `scope` to have angular automatically unregister the listener when the `scope` is destroyed.
+             * 
+             * @param listener the function that will be called when the event fires
+             * @param scope the angular `$scope` that will limit the lifetime of the event subscription
+             * @param eventFilter either the specific `NgTableParams` instance you want to receive events for or a predicate function that should return true to receive the event
+             * @return a unregistration function that when called will unregister the `listener`
+             */
+            onAfterReloadData<T>(listener: Events.IAfterReloadDataListener<T>, scope: ng.IScope, eventFilter?: Events.EventSelector<T>): IUnregistrationFunc;
+            /**
+             * Subscribe to receive notification whenever the `reload` method of an `NgTableParams` instance has successfully executed
+             * Optionally supply an `eventFilter` to restrict which events that should trigger the `listener` to be called.
+             * 
+             * @param listener the function that will be called when the event fires
+             * @param eventFilter a predicate function that should return true to receive the event
+             * @return a unregistration function that when called will unregister the `listener`
+             */
+            onAfterReloadData<T>(listener: Events.IAfterReloadDataListener<T>, eventFilter?: Events.EventSelector<T>): IUnregistrationFunc;
+            
+            /**
+             * Subscribe to receive notification whenever a new data rows *array* is supplied as a `settings` value to a `NgTableParams` instance.
+             * Optionally supply an `eventFilter` to restrict which events that should trigger the `listener` to be called. Supply a
+             * `scope` to have angular automatically unregister the listener when the `scope` is destroyed.
+             * 
+             * @param listener the function that will be called when the event fires
+             * @param scope the angular `$scope` that will limit the lifetime of the event subscription
+             * @param eventFilter either the specific `NgTableParams` instance you want to receive events for or a predicate function that should return true to receive the event
+             * @return a unregistration function that when called will unregister the `listener`
+             */
+            onDatasetChanged<T>(listener: Events.IDatasetChangedListener<T>, scope: ng.IScope, eventFilter?: Events.EventSelector<T>): IUnregistrationFunc;
+            /**
+             * Subscribe to receive notification whenever a new data rows *array* is supplied as a `settings` value to a `NgTableParams` instance.
+             * Optionally supply an `eventFilter` to restrict which events that should trigger the `listener` to be called.
+             * 
+             * @param listener the function that will be called when the event fires
+             * @param eventFilter either the specific `NgTableParams` instance you want to receive events for or a predicate function that should return true to receive the event
+             * @return a unregistration function that when called will unregister the `listener`
+             */
+            onDatasetChanged<T>(listener: Events.IDatasetChangedListener<T>, eventFilter?: Events.EventSelector<T>): IUnregistrationFunc;
+            
+            /**
+             * Subscribe to receive notification whenever the paging buttons for an `NgTableParams` instance change
+             * Optionally supply an `eventFilter` to restrict which events that should trigger the `listener` to be called. Supply a
+             * `scope` to have angular automatically unregister the listener when the `scope` is destroyed.
+             * 
+             * @param listener the function that will be called when the event fires
+             * @param scope the angular `$scope` that will limit the lifetime of the event subscription
+             * @param eventFilter either the specific `NgTableParams` instance you want to receive events for or a predicate function that should return true to receive the event
+             * @return a unregistration function that when called will unregister the `listener`
+             */
+            onPagesChanged<T>(listener: Events.IPagesChangedListener, scope: ng.IScope, eventFilter?: Events.EventSelector<T>): IUnregistrationFunc;
+            /**
+             * Subscribe to receive notification whenever the paging buttons for an `NgTableParams` instance change
+             * Optionally supply an `eventFilter` to restrict which events that should trigger the `listener` to be called.
+             * 
+             * @param listener the function that will be called when the event fires
+             * @param eventFilter either the specific `NgTableParams` instance you want to receive events for or a predicate function that should return true to receive the event
+             * @return a unregistration function that when called will unregister the `listener`
+             */
+            onPagesChanged<T>(listener: Events.IPagesChangedListener, eventFilter?: Events.EventSelector<T>): IUnregistrationFunc;
+
+            publishAfterCreated<T>(publisher: NgTableParams<T>): void;
+            publishAfterReloadData<T>(publisher: NgTableParams<T>, newData: T[], oldData: T[]): void;
+            publishDatasetChanged<T>(publisher: NgTableParams<T>, newDataset: T[], oldDataset: T[]): void;
+            publishPagesChanged<T>(publisher: NgTableParams<T>, newPages: NgTable.IPageButton[], oldPages: NgTable.IPageButton[]): void;
+        }
+    }
+
+    namespace Columns {
+
+        type ColumnFieldContext = ng.IScope & {
+            $column: IColumnDef;
+            $columns: IColumnDef[];
+        }
+
+        interface IColumnField<T> {
+            (context?: ColumnFieldContext): T;
+            assign($scope: ng.IScope, value: T): void;
+        }
+        
+        /**
+         * The definition of the column within a ngTable.
+         * When using `ng-table` directive a column definition will be parsed from each `td` tag found in the
+         * `tr` data row tag.
+         * 
+         * @example
+         * <tr>
+         *  <td data-title="'Name of User'" filter="{ username: 'text'}" sortable="'username'" />
+         *  <td data-title="'Age of User'" filter="{ age: 'number'}" sortable="'age'" />
+         * </tr>
+         */
+        interface IColumnDef {
+            /**
+             * Custom CSS class that should be added to the `th` tag(s) of this column in the table header
+             * 
+             * To set this on the `td` tag of a html table use the attribute `header-class` or `data-header-class`
+             */
+            class: IColumnField<string>;
+            /**
+             * The `ISelectOption`s that can be used in a html filter template for this colums.
+             */
+            data?: SelectData;
+            /**
+             * The index position of this column within the `$columns` container array 
+             */
+            id: number;
+            /**
+             * The definition of 0 or more html filter templates that should be rendered for this column in
+             * the table header
+             */
+            filter: IColumnField<IFilterTemplateDefMap>;
+            /**
+             * Supplies the `ISelectOption`s that can be used in a html filter template for this colums.
+             * At the creation of the `NgTableParams` this field will be called and the result then assigned
+             * to the `data` field of this column.
+             */
+            filterData: IColumnField<ng.IPromise<SelectData> | SelectData>;
+            /**
+             * The name of the data row field that will be used to group on, or false when this column
+             * does not support grouping
+             */
+            groupable: IColumnField<string | boolean>;
+            /**
+             * The url of a custom html template that should be used to render a table header for this column
+             * 
+             * To set this on the `td` tag for a html table use the attribute `header` or `data-header`
+             */
+            headerTemplateURL: IColumnField<string | boolean>;
+            /**
+             * The text that should be used as a tooltip for this column in the table header
+             */
+            headerTitle: IColumnField<string>;
+            /**
+             * Determines whether this column should be displayed in the table
+             * 
+             * To set this on the `td` tag for a html table use the attribute `ng-if`
+             */
+            show: IColumnField<boolean>;
+            /**
+             * The name of the data row field that will be used to sort on, or false when this column
+             * does not support sorting
+             */
+            sortable: IColumnField<string | boolean>;
+            /**
+             * The title of this column that should be displayed in the table header
+             */
+            title: IColumnField<string>;
+            /**
+             * An alternate column title. Typically this can be used for responsive table layouts
+             * where the titleAlt should be used for small screen sizes
+             */
+            titleAlt: IColumnField<string>;
+        }
+
+        type DynamicTableColField<T> = IDynamicTableColFieldFunc<T> | T;
+
+        interface IDynamicTableColFieldFunc<T> {
+            (context: ColumnFieldContext): T;
+        }
+        
+        /**
+         * The definition of the column supplied to a ngTableDynamic directive.
+         */
+        interface IDynamicTableColDef {
+            /**
+             * Custom CSS class that should be added to the `th` tag(s) of this column in the table header
+             */
+            class?: DynamicTableColField<string>;
+            /**
+             * The definition of 0 or more html filter templates that should be rendered for this column in
+             * the table header
+             */
+            filter?: DynamicTableColField<IFilterTemplateDefMap>;
+            /**
+             * Supplies the `ISelectOption`s that can be used in a html filter template for this colums.
+             * At the creation of the `NgTableParams` this field will be called and the result then assigned
+             * to the `data` field of this column.
+             */
+            filterData?: DynamicTableColField<ng.IPromise<SelectData> | SelectData>;
+            /**
+             * The name of the data row field that will be used to group on, or false when this column
+             * does not support grouping
+             */
+            groupable?: DynamicTableColField<string | boolean>;
+            /**
+             * The url of a custom html template that should be used to render a table header for this column
+             */
+            headerTemplateURL?: DynamicTableColField<string | boolean>;
+            /**
+             * The text that should be used as a tooltip for this column in the table header
+             */
+            headerTitle?: DynamicTableColField<string>;
+            /**
+             * Determines whether this column should be displayed in the table
+             */
+            show?: DynamicTableColField<boolean>;
+            /**
+             * The name of the data row field that will be used to sort on, or false when this column
+             * does not support sorting
+             */
+            sortable?: DynamicTableColField<string|boolean>;
+            /**
+             * The title of this column that should be displayed in the table header
+             */
+            title?: DynamicTableColField<string>;
+            /**
+             * An alternate column title. Typically this can be used for responsive table layouts
+             * where the titleAlt should be used for small screen sizes
+             */
+            titleAlt?: DynamicTableColField<string>;
+        }
+    }
+}
+
diff --git a/ng-table/ng-table-tests.ts b/ng-table/ng-table-tests.ts
index 1cc9c47a02..e8c9c44e4d 100644
--- a/ng-table/ng-table-tests.ts
+++ b/ng-table/ng-table-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="ng-table.d.ts" />
+
 
 interface IPerson {
     age: number;
diff --git a/ng-table/ng-table.d.ts b/ng-table/ng-table.d.ts
deleted file mode 100644
index ab485a2779..0000000000
--- a/ng-table/ng-table.d.ts
+++ /dev/null
@@ -1,838 +0,0 @@
-// Type definitions for ng-table
-// Project: https://github.com/esvit/ng-table
-// Definitions by: Christian Crowhurst <https://github.com/christianacca>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-/**
- * Parameters manager for an ngTable directive
- */
-declare class NgTableParams<T> {
-    /**
-     * The page of data rows currently being displayed in the table
-     */
-    data: T[];
-
-    constructor(baseParameters?: NgTable.IParamValues<T>, baseSettings?: NgTable.ISettings<T>)
-    
-    /**
-     * Returns the number of data rows per page
-     */
-    count(): number
-    /**
-     * Sets the number of data rows per page.
-     * Changes to count will cause `isDataReloadRequired` to return true
-     */
-    count(count: number): NgTableParams<T>
-    
-    /**
-     * Returns the current filter values used to restrict the set of data rows.
-     * @param trim supply true to return the current filter minus any insignificant values
-     * (null,  undefined and empty string)
-     */
-    filter(trim?: boolean): NgTable.IFilterValues
-    /**
-     * Sets filter values to the `filter` supplied; any existing filter will be removed
-     * Changes to filter will cause `isDataReloadRequired` to return true and the current `page` to be set to 1
-     */
-    filter(filter: NgTable.IFilterValues): NgTableParams<T>
-    /**
-     * Generate array of pages.
-     * When no arguments supplied, the current parameter state of this `NgTableParams` instance will be used
-     */
-    generatePagesArray(currentPage?: number, totalItems?: number, pageSize?: number, maxBlocks?: number): NgTable.IPageButton[]
-    /**
-     * Returns the current grouping used to group the data rows
-     */
-    group(): NgTable.Grouping<T>
-    /**
-     * Sets grouping to the `field` and `sortDirection` supplied; any existing grouping will be removed
-     * Changes to group will cause `isDataReloadRequired` to return true and the current `page` to be set to 1
-     */
-    group(field: string, sortDirection?: string): NgTableParams<T>
-    /**
-     * Sets grouping to the `group` supplied; any existing grouping will be removed.
-     * Changes to group will cause `isDataReloadRequired` to return true and the current `page` to be set to 1
-     */
-    group(group: NgTable.Grouping<T>): NgTableParams<T>
-    /**
-     * Returns true when an attempt to `reload` the current `parameter` values have resulted in a failure.
-     * This method will continue to return true until the `reload` is successfully called or when the
-     * `parameter` values have changed
-     */
-    hasErrorState(): boolean
-    /**
-     * Returns true if `filter` has significant filter value(s) (any value except null, undefined, or empty string),
-     * otherwise false
-     */
-    hasFilter(): boolean
-    /**
-     * Return true when a change to `filters` require the `reload` method
-     * to be run so as to ensure the data presented to the user reflects these filters
-     */
-    hasFilterChanges(): boolean
-    /**
-     * Returns true when at least one group has been set
-     */
-    hasGroup(): boolean
-    /**
-     * Returns true when the `group` and when supplied, the `sortDirection` matches an existing group
-     */
-    hasGroup(group: string | NgTable.IGroupingFunc<T>, sortDirection?: string): boolean
-    /**
-     * Return true when a change to this instance should require the `reload` method
-     * to be run so as to ensure the data rows presented to the user reflects the current state.
-     * 
-     * Note that this method will return false when the `reload` method has run but fails. In this case
-     * `hasErrorState` will return true.
-     * 
-     * The built-in `ngTable` directives will watch for when this function returns true and will then call
-     * the `reload` method to load its data rows
-     */
-    isDataReloadRequired(): boolean
-    /**
-     * Returns sorting values in a format that can be consumed by the angular `$orderBy` filter service
-     */
-    orderBy(): string[]
-    /**
-     * Trigger a reload of the data rows
-     */
-    reload<TResult extends NgTable.Data.DataResult<T>>(): ng.IPromise<TResult[]>
-    /**
-     * Returns the settings for the table.
-     */
-    settings(): NgTable.ISettings<T>
-    /**
-     * Sets the settings for the table; new setting values will be merged with the existing settings.
-     * Supplying a new `dataset` will cause `isDataReloadRequired` to return true and the `ngTableEventsChannel`
-     * to fire its `datasetChanged` event
-     */
-    settings(newSettings: NgTable.ISettings<T>): NgTableParams<T>
-    /** 
-     * Returns the current sorting used to order the data rows.
-     * Changes to sorting will cause `isDataReloadRequired` to return true
-     */
-    sorting(): NgTable.ISortingValues
-    /**
-     * Sets sorting values to the `sorting` supplied; any existing sorting will be removed.
-     * Changes to sorting will cause `isDataReloadRequired` to return true
-     */
-    sorting(sorting: NgTable.ISortingValues): NgTableParams<T>
-    /**
-     * Sets sorting to the `field` and `direction` supplied; any existing sorting will be removed
-     */
-    sorting(field: string, direction: string): NgTableParams<T>
-    /**
-     * Returns the index of the current "slice" of data rows
-     */
-    page(): number
-    /**
-     * Sets the index of the current "slice" of data rows. The index starts at 1.
-     * Changing the page number will cause `isDataReloadRequired` to return true
-     */
-    page(page: number): NgTableParams<T>
-    /**
-     * Returns the count of the data rows that match the current `filter`
-     */
-    total(): number
-    /**
-     * Sets `settings().total` to the value supplied.
-     * Typically you will need to set a `total` in the body of any custom `getData` function
-     * you supply as a setting value to this instance.
-     * @example
-     * var tp = new NgTableParams({}, { getData: customGetData })
-     * function customGetData(params) {
-     *      var queryResult = /* code to fetch current data rows and total *\/
-     *      params.total(queryResult.total);
-     *      return queryResult.dataRowsPage;
-     * }
-     */
-    total(total: number): NgTableParams<T>
-    /**
-     * Returns the current parameter values uri-encoded. Set `asString` to 
-     * true for the parameters to be returned as an array of strings of the form 'paramName=value'
-     * otherwise parameters returned as a key-value object
-     */
-    url(asString?: boolean): { [name: string]: string } | string[]
-}
-
-declare namespace NgTable {
-
-    interface IDataSettings {
-        applyPaging?: boolean;
-    }
-    
-    /**
-     * An angular value object that allow for overriding of the initial default values used when constructing
-     * an instance of `NgTableParams`  
-     */
-    interface IDefaults {
-        params?: IParamValues<any>;
-        settings?: ISettings<any>
-    }
-
-    /**
-     * Map of the names of fields declared on a data row and the corrosponding filter value
-     */
-    interface IFilterValues { [name: string]: any }
-    
-    /**
-     * Map of the names of fields on a data row and the corrosponding sort direction;
-     * Set the value of a key to undefined to let value of `ISettings.defaultSort` apply
-     */
-    interface ISortingValues { [name: string]: string }
-
-    type Grouping<T> = IGroupValues | IGroupingFunc<T>;
-
-    /**
-     * Map of the names of fields on a data row and the corrosponding sort direction
-     */
-    interface IGroupValues { [name: string]: string }
-    
-    /**
-     * Signature of a function that should return the name of the group
-     * that the `item` should be placed within
-     */
-    interface IGroupingFunc<T> {
-        (item: T): string;
-        /**
-         * 'asc' or 'desc'; leave undefined to let the value of `ISettings.groupOptions.defaultSort` apply
-         */
-        sortDirection?: string
-    }
-     
-    /**
-     * The runtime values for `NgTableParams` that determine the set of data rows and 
-     * how they are to be displayed in a table
-     */
-    interface IParamValues<T> {
-        /**
-         * The index of the "slice" of data rows, starting at 1, to be displayed by the table.
-         */
-        page?: number;
-        /**
-         * The number of data rows per page
-         */
-        count?: number;
-        /** 
-         * The filter that should be applied to restrict the set of data rows
-         */
-        filter?: IFilterValues;
-        /**
-         * The sort order that should be applied to the data rows.
-         */
-        sorting?: ISortingValues;
-        /**
-         * The grouping that should be applied to the data rows
-         */
-        group?: string | Grouping<T>;
-    }
-
-
-    type FilterComparator<T> = boolean | IFilterComparatorFunc<T>;
-
-    interface IFilterComparatorFunc<T> {
-        (actual: T, expected: T): boolean;
-    }
-
-    interface IFilterFunc<T> {
-        (data: T[], filter: IFilterValues, filterComparator: FilterComparator<T>): T[]
-    }
-
-
-    interface IFilterSettings<T> {
-        /**
-         * Use this to determine how items are matched against the filter values.
-         * This setting is identical to the `comparator` parameter supported by the angular 
-         * `$filter` filter service
-         * 
-         * Defaults to `undefined` which will result in a case insensitive susbstring match when 
-         * `IDefaultGetData` service is supplying the implementation for the
-         * `ISettings.getData` function
-         */
-        filterComparator?: FilterComparator<T>;
-        /**
-         * A duration to wait for the user to stop typing before applying the filter.
-         * - Defaults to 0 for small managed inmemory arrays ie where a `ISettings.dataset` argument is 
-         *   supplied to `NgTableParams.settings`.
-         * - Defaults to 500 milliseconds otherwise.
-         */
-        filterDelay?: number;
-        /**
-         * The number of elements up to which a managed inmemory array is considered small. Defaults to 10000.
-         */
-        filterDelayThreshold?: number;
-        /**
-         * Overrides `IDefaultGetDataProvider.filterFilterName`.
-         * The value supplied should be the name of the angular `$filter` service that will be selected to perform 
-         * the actual filter logic.
-         * Defaults to 'filter'.
-         */
-        filterFilterName?: string;
-        /**
-         * Tells `IDefaultGetData` to use this function supplied to perform the filtering instead of selecting an angular $filter.
-         */
-        filterFn?: IFilterFunc<T>;
-        /**
-         * The layout to use when multiple html templates are to rendered in a single table header column.
-         * Available values:
-         * - stack (the default)
-         * - horizontal 
-         */
-        filterLayout?: string
-    }
-
-    interface IGroupSettings {
-        /**
-         * The default sort direction that will be used whenever a group is supplied that
-         * does not define its own sort direction
-         */
-        defaultSort?: string;
-        /**
-         * Determines whether groups should be displayed expanded to show their items. Defaults to true
-         */
-        isExpanded?: boolean;
-    }
-    
-    /**
-     * Definition of the buttons rendered by the data row pager directive
-     */
-    interface IPageButton {
-        type: string;
-        number?: number;
-        active: boolean;
-        current?: boolean;
-    }
-        
-    /**
-     * Configuration settings for `NgTableParams`
-     */
-    interface ISettings<T> {
-        /**
-         * Returns true whenever a call to `getData` is in progress
-         */
-        $loading?: boolean;
-        /**
-         * An array that contains all the data rows that NgTable should manage.
-         * The `gateData` function will be used to manage the data rows
-         * that ultimately will be displayed.
-         */
-        dataset?: T[];
-        dataOptions?: {};
-        /**
-         * The total number of data rows before paging has been applied.
-         * Typically you will not need to supply this yourself
-         */
-        total?: number;
-        /**
-         * The default sort direction that will be used whenever a sorting is supplied that
-         * does not define its own sort direction
-         */
-        defaultSort?: string;
-        filterOptions?: IFilterSettings<T>;
-        groupOptions?: IGroupSettings;
-        /**
-         * The page size buttons that should be displayed. Each value defined in the array
-         * determines the possible values that can be supplied to `NgTableParams.page()`
-         */
-        counts?: number[];
-        /**
-         * The collection of interceptors that should apply to the results of a call to
-         * the `getData` function before the data rows are displayed in the table
-         */
-        interceptors?: IInterceptor<T>[];
-        /**
-         * Configuration for the template that will display the page size buttons
-         */
-        paginationMaxBlocks?: number;
-        /**
-         * Configuration for the template that will display the page size buttons
-         */
-        paginationMinBlocks?: number;
-        /**
-         * The html tag that will be used to display the sorting indicator in the table header
-         */
-        sortingIndicator?: string;
-        /**
-         * The function that will be used fetch data rows. Leave undefined to let the `IDefaultGetData`
-         * service provide a default implementation that will work with the `dataset` array you supply.
-         * 
-         * Typically you will supply a custom function when you need to execute filtering, paging and sorting
-         * on the server
-         */
-        getData?: Data.IGetDataFunc<T> | Data.IInterceptableGetDataFunc<T>;
-        /** 
-         * The function that will be used group data rows according to the groupings returned by `NgTableParams.group()`
-        */
-        getGroups?: Data.IGetGroupFunc<T>;
-    }
-
-    /**
-     * Configuration values that determine the behaviour of the `ngTableFilterConfig` service
-     */
-    interface IFilterConfigValues {
-        /**
-         * The default base url to use when deriving the url for a filter template given just an alias name
-         * Defaults to 'ng-table/filters/'
-         */
-        defaultBaseUrl?: string;
-        /**
-         * The extension to use when deriving the url of a filter template when given just an alias name
-         */
-        defaultExt?: string;
-        /**
-         * A map of alias names and their corrosponding urls. A lookup against this map will be used
-         * to find the url matching an alias name.
-         * If no match is found then a url will be derived using the following pattern `${defaultBaseUrl}${aliasName}.${defaultExt}`
-         */
-        aliasUrls?: { [name: string]: string };
-    }
-    
-    /**
-     * The angular provider used to configure the behaviour of the `ngTableFilterConfig` service
-     */
-    interface IFilterConfigProvider {
-        $get: IFilterConfig;
-        /**
-         * Reset back to factory defaults the config values that `ngTableFilterConfig` service will use
-         */
-        resetConfigs(): void;
-        /**
-         * Set the config values used by `ngTableFilterConfig` service
-         */
-        setConfig(customConfig: IFilterConfigValues): void;
-    }
-    
-    /**
-     * A key value-pair map where the key is the name of a field in a data row and the value is the definition 
-     * for the template used to render a filter cell in the header of a html table.
-     * Where the value is supplied as a string this should either be url to a html template or an alias to a url registered
-     * using the `ngTableFilterConfigProvider` 
-     * @example
-     * vm.ageFilter = { "age": "number" }
-     * @example
-     * vm.ageFilter = { "age": "my/custom/ageTemplate.html" }
-     * @example
-     * vm.ageFilter = { "age": { id: "number", placeholder: "Age of person"} }
-     */
-    interface IFilterTemplateDefMap {
-        [name: string]: string | IFilterTemplateDef
-    }
-    
-    /**
-     * A fully qualified template definition for a single filter
-     */
-    interface IFilterTemplateDef {
-        /**
-         * A url to a html template of an alias to a url registered using the `ngTableFilterConfigProvider` 
-         */
-        id: string,
-        /**
-         * The text that should be rendered as a prompt to assist the user when entering a filter value
-         */
-        placeholder: string
-    }
-    
-    /**
-     * Exposes configuration values and methods used to return the location of the html
-     * templates used to render the filter row of an ng-table directive
-     */
-    interface IFilterConfig {
-        /**
-         * Readonly copy of the final values used to configure the service.
-         */
-        config: IFilterConfigValues,
-        /**
-         * Return the url of the html filter template for the supplied definition and key.
-         * For more information see the documentation for `IFilterTemplateMap`
-         */
-        getTemplateUrl(filterDef: string | IFilterTemplateDef, filterKey?: string): string,
-        /**
-         * Return the url of the html filter template registered with the alias supplied
-         */
-        getUrlForAlias(aliasName: string, filterKey?: string): string
-    }
-
-    interface InternalTableParams<T> extends NgTableParams<T> {
-        isNullInstance: boolean
-    }
-    
-    /**
-     * A custom object that can be registered with an NgTableParams instance that can be used
-     * to post-process the results (and failures) returned by its `getData` function
-     */
-    interface IInterceptor<T> {
-        response?: <TData>(data: TData, params: NgTableParams<T>) => TData;
-        responseError?: (reason: any, params: NgTableParams<T>) => any;
-    }
-
-    type SelectData = ISelectOption[] | ISelectDataFunc
-
-    interface ISelectOption {
-        id: string | number;
-        title: string;
-    }
-
-    interface ISelectDataFunc {
-        (): ISelectOption[] | ng.IPromise<ISelectOption[]>
-    }    
-        
-    /**
-     * Definition of the constructor function that will construct new instances of `NgTableParams`.
-     * On construction of `NgTableParams` the `ngTableEventsChannel` will fire its `afterCreated` event.
-     */
-    interface ITableParamsConstructor<T> {
-        new (baseParameters?: IParamValues<T>, baseSettings?: ISettings<T>): NgTableParams<T>
-    }
-
-
-    namespace Data {
-
-        type DataResult<T> = T | IDataRowGroup<T>;
-
-        interface IDataRowGroup<T> {
-            data: T[];
-            $hideRows: boolean;
-            value: string;
-        }
-             
-        /**
-         * A default implementation of the getData function that will apply the `filter`, `orderBy` and
-         * paging values from the `NgTableParams` instance supplied to the data array supplied.
-         * 
-         * A call to this function will:
-         * - return the resulting array
-         * - assign the total item count after filtering to the `total` of the `NgTableParams` instance supplied
-         */
-        interface IDefaultGetData<T> {
-            (data: T[], params: NgTableParams<T>): T[];
-            /**
-             * Convenience function that this service will use to apply paging to the data rows.
-             * 
-             * Returns a slice of rows from the `data` array supplied and sets the `NgTableParams.total()`
-             * on the `params` instance supplied to `data.length`
-             */
-            applyPaging(data: T[], params: NgTableParams<T>): T[],
-            /**
-             * Returns a reference to the function that this service will use to filter data rows
-             */
-            getFilterFn(params: NgTableParams<T>): IFilterFunc<T>,
-            /**
-             * Returns a reference to the function that this service will use to sort data rows
-             */
-            getOrderByFn(params?: NgTableParams<T>): void
-        }   
-
-        /**
-         * Allows for the configuration of the ngTableDefaultGetData service.
-         */
-        interface IDefaultGetDataProvider {
-            $get<T>(): IDefaultGetData<T>;
-            /**
-             * The name of a angular filter that knows how to apply the values returned by
-             * `NgTableParams.filter()` to restrict an array of data.
-             * (defaults to the angular `filter` filter service)
-             */
-            filterFilterName: string,
-            /**
-             * The name of a angular filter that knows how to apply the values returned by
-            * `NgTableParams.orderBy()` to sort an array of data.
-            * (defaults to the angular `orderBy` filter service)
-            */
-            sortingFilterName: string
-        }
-
-        interface IGetDataBcShimFunc<T> {
-            (originalFunc: ILegacyGetDataFunc<T>): { (params: NgTableParams<T>): ng.IPromise<T[]> }
-        }
-        
-        /**
-         * Signature of a function that will called whenever NgTable requires to load data rows
-         * into the table.
-         * `params` is the table requesting the data rows
-         */
-        interface IGetDataFunc<T> {
-            (params: NgTableParams<T>): T[] | ng.IPromise<T[]>;
-        }
-
-        interface IGetGroupFunc<T> {
-            (params: NgTableParams<T>): { [name: string]: IDataRowGroup<T>[] }
-        }
-        
-        /**
-         * Variation of the `IGetDataFunc` function signature that allows for flexibility for
-         * the shape of the return value.
-         * Typcially you will use this function signature when you want to configure `NgTableParams` with
-         * interceptors that will return the final data rows array.   
-         */
-        interface IInterceptableGetDataFunc<T> {
-            <TResult>(params: NgTableParams<T>): TResult;
-        }
-
-        interface ILegacyGetDataFunc<T> {
-            ($defer: ng.IDeferred<T[]>, params: NgTableParams<T>): void
-        }
-    }
-
-    namespace Events {
-        interface IEventSelectorFunc {
-            (publisher: NgTableParams<any>): boolean
-        }
-
-        type EventSelector<T> = NgTableParams<T> | IEventSelectorFunc
-
-        interface IDatasetChangedListener<T> {
-            (publisher: NgTableParams<T>, newDataset: T[], oldDataset: T[]): any
-        }
-        interface IAfterCreatedListener {
-            (publisher: NgTableParams<any>): any
-        }
-        interface IAfterReloadDataListener<T> {
-            (publisher: NgTableParams<T>, newData: NgTable.Data.DataResult<T>[], oldData: NgTable.Data.DataResult<T>[]): any
-        }
-        interface IPagesChangedListener {
-            (publisher: NgTableParams<any>, newPages: NgTable.IPageButton[], oldPages: NgTable.IPageButton[]): any
-        }
-        
-        interface IUnregistrationFunc {
-            (): void
-        }
-
-        interface IEventsChannel {
-            /**
-             * Subscribe to receive notification whenever a new `NgTableParams` instance has finished being constructed.
-             * Optionally supply an `eventFilter` to restrict which events that should trigger the `listener` to be called. Supply a
-             * `scope` to have angular automatically unregister the listener when the `scope` is destroyed.
-             * 
-             * @param listener the function that will be called when the event fires
-             * @param scope the angular `$scope` that will limit the lifetime of the event subscription
-             * @param eventFilter a predicate function that should return true to receive the event
-             * @return a unregistration function that when called will unregister the `listener`
-             */
-            onAfterCreated(listener: Events.IAfterCreatedListener, scope: ng.IScope, eventFilter?: Events.IEventSelectorFunc): IUnregistrationFunc;
-            /**
-             * Subscribe to receive notification whenever a new `NgTableParams` instance has finished being constructed.
-             * Optionally supply an `eventFilter` to restrict which events that should trigger the `listener` to be called.
-             * 
-             * @param listener the function that will be called when the event fires
-             * @param eventFilter a predicate function that should return true to receive the event
-             * @return a unregistration function that when called will unregister the `listener`
-             */
-            onAfterCreated(listener: Events.IAfterCreatedListener, eventFilter?: Events.IEventSelectorFunc): IUnregistrationFunc;
-            /**
-             * Subscribe to receive notification whenever the `reload` method of an `NgTableParams` instance has successfully executed
-             * Optionally supply an `eventFilter` to restrict which events that should trigger the `listener` to be called. Supply a
-             * `scope` to have angular automatically unregister the listener when the `scope` is destroyed.
-             * 
-             * @param listener the function that will be called when the event fires
-             * @param scope the angular `$scope` that will limit the lifetime of the event subscription
-             * @param eventFilter either the specific `NgTableParams` instance you want to receive events for or a predicate function that should return true to receive the event
-             * @return a unregistration function that when called will unregister the `listener`
-             */
-            onAfterReloadData<T>(listener: Events.IAfterReloadDataListener<T>, scope: ng.IScope, eventFilter?: Events.EventSelector<T>): IUnregistrationFunc;
-            /**
-             * Subscribe to receive notification whenever the `reload` method of an `NgTableParams` instance has successfully executed
-             * Optionally supply an `eventFilter` to restrict which events that should trigger the `listener` to be called.
-             * 
-             * @param listener the function that will be called when the event fires
-             * @param eventFilter a predicate function that should return true to receive the event
-             * @return a unregistration function that when called will unregister the `listener`
-             */
-            onAfterReloadData<T>(listener: Events.IAfterReloadDataListener<T>, eventFilter?: Events.EventSelector<T>): IUnregistrationFunc;
-            
-            /**
-             * Subscribe to receive notification whenever a new data rows *array* is supplied as a `settings` value to a `NgTableParams` instance.
-             * Optionally supply an `eventFilter` to restrict which events that should trigger the `listener` to be called. Supply a
-             * `scope` to have angular automatically unregister the listener when the `scope` is destroyed.
-             * 
-             * @param listener the function that will be called when the event fires
-             * @param scope the angular `$scope` that will limit the lifetime of the event subscription
-             * @param eventFilter either the specific `NgTableParams` instance you want to receive events for or a predicate function that should return true to receive the event
-             * @return a unregistration function that when called will unregister the `listener`
-             */
-            onDatasetChanged<T>(listener: Events.IDatasetChangedListener<T>, scope: ng.IScope, eventFilter?: Events.EventSelector<T>): IUnregistrationFunc;
-            /**
-             * Subscribe to receive notification whenever a new data rows *array* is supplied as a `settings` value to a `NgTableParams` instance.
-             * Optionally supply an `eventFilter` to restrict which events that should trigger the `listener` to be called.
-             * 
-             * @param listener the function that will be called when the event fires
-             * @param eventFilter either the specific `NgTableParams` instance you want to receive events for or a predicate function that should return true to receive the event
-             * @return a unregistration function that when called will unregister the `listener`
-             */
-            onDatasetChanged<T>(listener: Events.IDatasetChangedListener<T>, eventFilter?: Events.EventSelector<T>): IUnregistrationFunc;
-            
-            /**
-             * Subscribe to receive notification whenever the paging buttons for an `NgTableParams` instance change
-             * Optionally supply an `eventFilter` to restrict which events that should trigger the `listener` to be called. Supply a
-             * `scope` to have angular automatically unregister the listener when the `scope` is destroyed.
-             * 
-             * @param listener the function that will be called when the event fires
-             * @param scope the angular `$scope` that will limit the lifetime of the event subscription
-             * @param eventFilter either the specific `NgTableParams` instance you want to receive events for or a predicate function that should return true to receive the event
-             * @return a unregistration function that when called will unregister the `listener`
-             */
-            onPagesChanged<T>(listener: Events.IPagesChangedListener, scope: ng.IScope, eventFilter?: Events.EventSelector<T>): IUnregistrationFunc;
-            /**
-             * Subscribe to receive notification whenever the paging buttons for an `NgTableParams` instance change
-             * Optionally supply an `eventFilter` to restrict which events that should trigger the `listener` to be called.
-             * 
-             * @param listener the function that will be called when the event fires
-             * @param eventFilter either the specific `NgTableParams` instance you want to receive events for or a predicate function that should return true to receive the event
-             * @return a unregistration function that when called will unregister the `listener`
-             */
-            onPagesChanged<T>(listener: Events.IPagesChangedListener, eventFilter?: Events.EventSelector<T>): IUnregistrationFunc;
-
-            publishAfterCreated<T>(publisher: NgTableParams<T>): void;
-            publishAfterReloadData<T>(publisher: NgTableParams<T>, newData: T[], oldData: T[]): void;
-            publishDatasetChanged<T>(publisher: NgTableParams<T>, newDataset: T[], oldDataset: T[]): void;
-            publishPagesChanged<T>(publisher: NgTableParams<T>, newPages: NgTable.IPageButton[], oldPages: NgTable.IPageButton[]): void;
-        }
-    }
-
-    namespace Columns {
-
-        type ColumnFieldContext = ng.IScope & {
-            $column: IColumnDef;
-            $columns: IColumnDef[];
-        }
-
-        interface IColumnField<T> {
-            (context?: ColumnFieldContext): T;
-            assign($scope: ng.IScope, value: T): void;
-        }
-        
-        /**
-         * The definition of the column within a ngTable.
-         * When using `ng-table` directive a column definition will be parsed from each `td` tag found in the
-         * `tr` data row tag.
-         * 
-         * @example
-         * <tr>
-         *  <td data-title="'Name of User'" filter="{ username: 'text'}" sortable="'username'" />
-         *  <td data-title="'Age of User'" filter="{ age: 'number'}" sortable="'age'" />
-         * </tr>
-         */
-        interface IColumnDef {
-            /**
-             * Custom CSS class that should be added to the `th` tag(s) of this column in the table header
-             * 
-             * To set this on the `td` tag of a html table use the attribute `header-class` or `data-header-class`
-             */
-            class: IColumnField<string>;
-            /**
-             * The `ISelectOption`s that can be used in a html filter template for this colums.
-             */
-            data?: SelectData;
-            /**
-             * The index position of this column within the `$columns` container array 
-             */
-            id: number;
-            /**
-             * The definition of 0 or more html filter templates that should be rendered for this column in
-             * the table header
-             */
-            filter: IColumnField<IFilterTemplateDefMap>;
-            /**
-             * Supplies the `ISelectOption`s that can be used in a html filter template for this colums.
-             * At the creation of the `NgTableParams` this field will be called and the result then assigned
-             * to the `data` field of this column.
-             */
-            filterData: IColumnField<ng.IPromise<SelectData> | SelectData>;
-            /**
-             * The name of the data row field that will be used to group on, or false when this column
-             * does not support grouping
-             */
-            groupable: IColumnField<string | boolean>;
-            /**
-             * The url of a custom html template that should be used to render a table header for this column
-             * 
-             * To set this on the `td` tag for a html table use the attribute `header` or `data-header`
-             */
-            headerTemplateURL: IColumnField<string | boolean>;
-            /**
-             * The text that should be used as a tooltip for this column in the table header
-             */
-            headerTitle: IColumnField<string>;
-            /**
-             * Determines whether this column should be displayed in the table
-             * 
-             * To set this on the `td` tag for a html table use the attribute `ng-if`
-             */
-            show: IColumnField<boolean>;
-            /**
-             * The name of the data row field that will be used to sort on, or false when this column
-             * does not support sorting
-             */
-            sortable: IColumnField<string | boolean>;
-            /**
-             * The title of this column that should be displayed in the table header
-             */
-            title: IColumnField<string>;
-            /**
-             * An alternate column title. Typically this can be used for responsive table layouts
-             * where the titleAlt should be used for small screen sizes
-             */
-            titleAlt: IColumnField<string>;
-        }
-
-        type DynamicTableColField<T> = IDynamicTableColFieldFunc<T> | T;
-
-        interface IDynamicTableColFieldFunc<T> {
-            (context: ColumnFieldContext): T;
-        }
-        
-        /**
-         * The definition of the column supplied to a ngTableDynamic directive.
-         */
-        interface IDynamicTableColDef {
-            /**
-             * Custom CSS class that should be added to the `th` tag(s) of this column in the table header
-             */
-            class?: DynamicTableColField<string>;
-            /**
-             * The definition of 0 or more html filter templates that should be rendered for this column in
-             * the table header
-             */
-            filter?: DynamicTableColField<IFilterTemplateDefMap>;
-            /**
-             * Supplies the `ISelectOption`s that can be used in a html filter template for this colums.
-             * At the creation of the `NgTableParams` this field will be called and the result then assigned
-             * to the `data` field of this column.
-             */
-            filterData?: DynamicTableColField<ng.IPromise<SelectData> | SelectData>;
-            /**
-             * The name of the data row field that will be used to group on, or false when this column
-             * does not support grouping
-             */
-            groupable?: DynamicTableColField<string | boolean>;
-            /**
-             * The url of a custom html template that should be used to render a table header for this column
-             */
-            headerTemplateURL?: DynamicTableColField<string | boolean>;
-            /**
-             * The text that should be used as a tooltip for this column in the table header
-             */
-            headerTitle?: DynamicTableColField<string>;
-            /**
-             * Determines whether this column should be displayed in the table
-             */
-            show?: DynamicTableColField<boolean>;
-            /**
-             * The name of the data row field that will be used to sort on, or false when this column
-             * does not support sorting
-             */
-            sortable?: DynamicTableColField<string|boolean>;
-            /**
-             * The title of this column that should be displayed in the table header
-             */
-            title?: DynamicTableColField<string>;
-            /**
-             * An alternate column title. Typically this can be used for responsive table layouts
-             * where the titleAlt should be used for small screen sizes
-             */
-            titleAlt?: DynamicTableColField<string>;
-        }
-    }
-}
-
diff --git a/ng-table/tsconfig.json b/ng-table/tsconfig.json
new file mode 100644
index 0000000000..38cfaa9bb4
--- /dev/null
+++ b/ng-table/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ng-table-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ngbootbox/index.d.ts b/ngbootbox/index.d.ts
new file mode 100644
index 0000000000..31bcf2f670
--- /dev/null
+++ b/ngbootbox/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for ngbootbox
+// Project: https://github.com/eriktufvesson/ngBootbox
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="bootbox" />
+
+interface NgBootboxDialog {
+	title?: string;
+	message?: string;
+	templateUrl?: string;
+	locale?: string;
+	callback?: () => any;
+	onEscape?: () => any | boolean;
+	show?: boolean;
+	backdrop?: boolean;
+	closeButton?: boolean;
+	animate?: boolean;
+	className?: string;
+	size?: string;
+	buttons?: BootboxButtonMap;
+}
+
+interface BootboxService {
+	alert(msg: string): Promise<any>;
+	confirm(msg: string): Promise<any>;
+	prompt(msg: string): Promise<any>;
+	customDialog(options: NgBootboxDialog): void;
+	setDefaults(options: BootboxDefaultOptions): void;
+	hideAll(): void;
+
+	addLocale(name: string, values: BootboxLocaleValues): void;
+	removeLocale(name: string): void;
+	setLocale(name: string): void;
+}
+
+declare var $ngBootbox: BootboxService;
diff --git a/ngbootbox/ngbootbox-tests.ts b/ngbootbox/ngbootbox-tests.ts
index ec4fb2830d..ae8b264249 100644
--- a/ngbootbox/ngbootbox-tests.ts
+++ b/ngbootbox/ngbootbox-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="ngbootbox.d.ts" />
+/// <reference types="angularjs" />
+
 
 class TestBootboxController {
 
diff --git a/ngbootbox/ngbootbox.d.ts b/ngbootbox/ngbootbox.d.ts
deleted file mode 100644
index eeb0d643c5..0000000000
--- a/ngbootbox/ngbootbox.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-// Type definitions for ngbootbox
-// Project: https://github.com/eriktufvesson/ngBootbox
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../bootbox/bootbox.d.ts" />
-
-interface NgBootboxDialog {
-	title?: string;
-	message?: string;
-	templateUrl?: string;
-	locale?: string;
-	callback?: () => any;
-	onEscape?: () => any | boolean;
-	show?: boolean;
-	backdrop?: boolean;
-	closeButton?: boolean;
-	animate?: boolean;
-	className?: string;
-	size?: string;
-	buttons?: BootboxButtonMap;
-}
-
-interface BootboxService {
-	alert(msg: string): Promise<any>;
-	confirm(msg: string): Promise<any>;
-	prompt(msg: string): Promise<any>;
-	customDialog(options: NgBootboxDialog): void;
-	setDefaults(options: BootboxDefaultOptions): void;
-	hideAll(): void;
-
-	addLocale(name: string, values: BootboxLocaleValues): void;
-	removeLocale(name: string): void;
-	setLocale(name: string): void;
-}
-
-declare var $ngBootbox: BootboxService;
diff --git a/ngbootbox/tsconfig.json b/ngbootbox/tsconfig.json
new file mode 100644
index 0000000000..05890aec29
--- /dev/null
+++ b/ngbootbox/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ngbootbox-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ngkookies/ngkookies.d.ts b/ngkookies/index.d.ts
similarity index 100%
rename from ngkookies/ngkookies.d.ts
rename to ngkookies/index.d.ts
diff --git a/ngkookies/ngkookies-tests.ts b/ngkookies/ngkookies-tests.ts
index cb52809afb..c87ae9df12 100644
--- a/ngkookies/ngkookies-tests.ts
+++ b/ngkookies/ngkookies-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="ngkookies.d.ts" />
+
 
 var app: any;
 
diff --git a/ngkookies/tsconfig.json b/ngkookies/tsconfig.json
new file mode 100644
index 0000000000..0e43960bc6
--- /dev/null
+++ b/ngkookies/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ngkookies-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ngprogress-lite/ngprogress-lite.d.ts b/ngprogress-lite/index.d.ts
similarity index 100%
rename from ngprogress-lite/ngprogress-lite.d.ts
rename to ngprogress-lite/index.d.ts
diff --git a/ngprogress-lite/ngprogress-lite-tests.ts b/ngprogress-lite/ngprogress-lite-tests.ts
index a6d68f08fe..5b9d1a4855 100644
--- a/ngprogress-lite/ngprogress-lite-tests.ts
+++ b/ngprogress-lite/ngprogress-lite-tests.ts
@@ -1,5 +1,5 @@
-///<reference path="../angularjs/angular.d.ts" />
-/// <reference path="./ngprogress-lite.d.ts" />
+///<reference types="angularjs" />
+
 
 var app = angular.module('testApp', ['ngProgressLite']);
 
diff --git a/ngprogress-lite/tsconfig.json b/ngprogress-lite/tsconfig.json
new file mode 100644
index 0000000000..7f4cddfaef
--- /dev/null
+++ b/ngprogress-lite/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ngprogress-lite-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ngprogress/ngprogress.d.ts b/ngprogress/index.d.ts
similarity index 100%
rename from ngprogress/ngprogress.d.ts
rename to ngprogress/index.d.ts
diff --git a/ngprogress/ngprogress-tests.ts b/ngprogress/ngprogress-tests.ts
index 9d52f97291..c1c2875d79 100644
--- a/ngprogress/ngprogress-tests.ts
+++ b/ngprogress/ngprogress-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./ngprogress.d.ts" />
+
 
 
 var ngProgress: NgProgress.INgProgress = <any> {};
diff --git a/ngprogress/tsconfig.json b/ngprogress/tsconfig.json
new file mode 100644
index 0000000000..6066ac1e35
--- /dev/null
+++ b/ngprogress/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ngprogress-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ngstorage/index.d.ts b/ngstorage/index.d.ts
new file mode 100644
index 0000000000..94184296b3
--- /dev/null
+++ b/ngstorage/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for ngstorage 0.3.10
+// Project: https://github.com/gsklee/ngStorage
+// Definitions by: Jakub Pistek <https://github.com/kubiq>
+// Definitions: https://github.com/kubiq/DefinitelyTyped
+
+
+declare namespace angular.storage {
+
+    export interface IStorageService {
+        $default(items: {}): IStorageService;
+        $reset(items?: {}): IStorageService;
+        $apply(): void;
+
+        get<T>(key: string): T;
+        set<T>(key: string, value: T): T;
+    }
+
+    export interface IStorageProvider extends angular.IServiceProvider {
+
+        get<T>(key:string): T;
+        set<T>(key:string, value:T): T;
+
+        setKeyPrefix(prefix: string): void;
+        setSerializer(serializer: (value: any)=>string): void;
+        setDeserializer(deserializer: (value: string)=>any): void;
+    }
+}
diff --git a/ngstorage/ngstorage-tests.ts b/ngstorage/ngstorage-tests.ts
index 2a25697b51..38299343ac 100644
--- a/ngstorage/ngstorage-tests.ts
+++ b/ngstorage/ngstorage-tests.ts
@@ -1,9 +1,9 @@
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="ngstorage.d.ts" />
+/// <reference types="angularjs" />
+
 
 var app: any;
 
-app.controller('MainCtrl', function ($localStorage: angular.storage.ILocalStorageService) {
+app.controller('LocalCtrl', function ($localStorage: angular.storage.IStorageService) {
 
     $localStorage.set('MyKey', 'value');
 
@@ -16,12 +16,32 @@ app.controller('MainCtrl', function ($localStorage: angular.storage.ILocalStorag
     $localStorage.$reset({
         counter: 1
     });
+    
+    $localStorage.$reset();
 
     $localStorage.$apply();
 });
 
-app.config(['$localStorageProvider',
-    function ($localStorageProvider: angular.storage.ILocalStorageProvider) {
+app.controller('SessionCtrl', function ($sessionStorage: angular.storage.IStorageService) {
+
+    $sessionStorage.set('MyKey', 'value');
+
+    $sessionStorage.get('MyKey');
+
+    $sessionStorage.$default({
+        counter: 1
+    });
+
+    $sessionStorage.$reset({
+        counter: 1
+    });
+    
+    $sessionStorage.$reset();
+
+    $sessionStorage.$apply();
+});
+
+app.config(['$localStorageProvider', function ($localStorageProvider: angular.storage.IStorageProvider) {
         $localStorageProvider.setKeyPrefix('NewPrefix');
 
         $localStorageProvider.get('MyKey');
@@ -39,4 +59,23 @@ app.config(['$localStorageProvider',
         $localStorageProvider.setSerializer(mySerializer);
         $localStorageProvider.setDeserializer(myDeserializer);
     }
+]).config(['$sessionStorageProvider', function ($sessionStorageProvider: angular.storage.IStorageProvider) {
+
+        $sessionStorageProvider.setKeyPrefix('NewPrefix');
+
+        $sessionStorageProvider.get('MyKey');
+
+        $sessionStorageProvider.set('MyKey', { counter: 'value' });
+
+        var mySerializer = function (value:any):string {
+            return value.toString();
+        };
+
+        var myDeserializer = function (value:string):any {
+            return value;
+        };
+
+        $sessionStorageProvider.setSerializer(mySerializer);
+        $sessionStorageProvider.setDeserializer(myDeserializer);
+    }
 ]);
diff --git a/ngstorage/ngstorage.d.ts b/ngstorage/ngstorage.d.ts
deleted file mode 100644
index df72725ced..0000000000
--- a/ngstorage/ngstorage.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Type definitions for ngstorage 0.3.10
-// Project: https://github.com/gsklee/ngStorage
-// Definitions by: Jakub Pistek <https://github.com/kubiq>
-// Definitions: https://github.com/kubiq/DefinitelyTyped
-
-/// <reference path='../angularjs/angular.d.ts' />
-
-declare namespace angular.storage {
-
-    export interface ILocalStorageService {
-        $default(items: any):ILocalStorageService;
-        $reset(items: any):ILocalStorageService;
-        $apply():void;
-
-        get<T>(key: string): T;
-        set<T>(key: string, value: T): T;
-    }
-
-    export interface ILocalStorageProvider extends angular.IServiceProvider {
-
-        get<T>(key:string): T;
-        set<T>(key:string, value:T): T;
-
-        setKeyPrefix(prefix: string):void;
-        setSerializer(serializer: (value: any)=>string):void;
-        setDeserializer(deserializer: (value: string)=>any):void;
-    }
-}
diff --git a/ngstorage/tsconfig.json b/ngstorage/tsconfig.json
new file mode 100644
index 0000000000..0a21237915
--- /dev/null
+++ b/ngstorage/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ngstorage-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angularjs-toaster/angularjs-toaster-tests.ts b/ngtoaster/angularjs-toaster-tests.ts
similarity index 95%
rename from angularjs-toaster/angularjs-toaster-tests.ts
rename to ngtoaster/angularjs-toaster-tests.ts
index ffff321596..73b0416e66 100644
--- a/angularjs-toaster/angularjs-toaster-tests.ts
+++ b/ngtoaster/angularjs-toaster-tests.ts
@@ -1,4 +1,6 @@
-/// <reference path="angularjs-toaster.d.ts" />
+import ngtoaster = require("ngtoaster");
+import * as angular from 'angularjs';
+
 class NgToasterTestController {
   constructor(public $scope: ng.IScope, public $window: ng.IWindowService, public toaster: ngtoaster.IToasterService) {
     this.bar = 'Hi';
diff --git a/ngtoaster/index.d.ts b/ngtoaster/index.d.ts
new file mode 100644
index 0000000000..03bcba04b7
--- /dev/null
+++ b/ngtoaster/index.d.ts
@@ -0,0 +1,108 @@
+// Type definitions for angularjs-toaster v0.4.13
+// Project: https://github.com/jirikavi/AngularJS-Toaster
+// Definitions by: Ben Tesser <https://github.com/btesser>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+export = ngtoaster;
+export as namespace toaster;
+
+declare namespace ngtoaster {
+  interface IToasterService {
+    pop(params:IPopParams): void
+    /**
+     * @param {string} type Type of toaster  -- 'error', 'info', 'wait', 'success', and 'warning'
+     */
+    pop(type?:string, title?:string, body?:string, timeout?:number, bodyOutputType?:string, clickHandler?:EventListener,
+        toasterId?:number, showCloseButton?:boolean): void
+    error(params: IPopParams): void
+    error(title?:string, body?:string, timeout?:number, bodyOutputType?:string, clickHandler?:EventListener,
+        toasterId?:number): void
+    info(params: IPopParams): void
+    info(title?:string, body?:string, timeout?:number, bodyOutputType?:string, clickHandler?:EventListener,
+        toasterId?:number): void
+    wait(params: IPopParams): void
+    wait(title?:string, body?:string, timeout?:number, bodyOutputType?:string, clickHandler?:EventListener,
+        toasterId?:number): void
+    success(params: IPopParams): void
+    success(title?:string, body?:string, timeout?:number, bodyOutputType?:string, clickHandler?:EventListener,
+        toasterId?:number): void
+    warning(params: IPopParams): void
+    warning(title?:string, body?:string, timeout?:number, bodyOutputType?:string, clickHandler?:EventListener,
+        toasterId?:number): void
+    clear(): void
+    toast:IToast;
+  }
+
+  interface IToasterEventRegistry {
+    setup(): void
+    subscribeToNewToastEvent(onNewToast:IToastEventListener): void
+    subscribeToClearToastsEvent(onClearToasts:IToastEventListener): void
+    unsubscribeToNewToastEvent(onNewToast:IToastEventListener): void
+    unsubscribeToClearToastsEvent(onClearToasts:IToastEventListener): void
+  }
+
+  interface IPopParams extends IToast{
+    toasterId?: number;
+  }
+
+  interface IToastEventListener {
+    (event:Event, toasterId: number): void;
+  }
+
+  interface IToast {
+    /**
+     * Acceptable types are:
+     * 'error', 'info', 'wait', 'success', and 'warning'
+     */
+    type?: string;
+    title?: string;
+    body?: string;
+    timeout?: number;
+    bodyOutputType?: string;
+    clickHandler?: EventListener;
+    showCloseButton?: boolean;
+  }
+
+  interface IToasterConfig {
+    /**
+     * limits max number of toasts
+     */
+    limit?: number;
+    'tap-to-dismiss'?: boolean;
+    'close-button'?: boolean;
+    'newest-on-top'?: boolean;
+    'time-out'?: number;
+    'icon-classes'?: IIconClasses;
+    /**
+     * Options include:
+     * '', 'trustedHtml', 'template', 'templateWithData'
+     */
+    'body-output-type'?: string;
+    'body-template'?: string;
+    'icon-class'?: string;
+    /**
+     * Options include:
+     * 'toast-top-full-width', 'toast-bottom-full-width', 'toast-center',
+     * 'toast-top-left', 'toast-top-center', 'toast-top-rigt',
+     * 'toast-bottom-left', 'toast-bottom-center', 'toast-bottom-rigt',
+     */
+    'position-class'?: string;
+    'title-class'?: string;
+    'message-class'?: string;
+    'prevent-duplicates'?: boolean;
+    /**
+     * stop timeout on mouseover and restart timer on mouseout
+     */
+    'mouseover-timer-stop'?: boolean;
+  }
+
+  interface IIconClasses {
+    error: string;
+    info: string;
+    wait: string;
+    success: string;
+    warning: string;
+  }
+}
diff --git a/ngtoaster/tsconfig.json b/ngtoaster/tsconfig.json
new file mode 100644
index 0000000000..8c83cfe7d5
--- /dev/null
+++ b/ngtoaster/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angularjs-toaster-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ngwysiwyg/ngwysiwyg.d.ts b/ngwysiwyg/index.d.ts
similarity index 100%
rename from ngwysiwyg/ngwysiwyg.d.ts
rename to ngwysiwyg/index.d.ts
diff --git a/ngwysiwyg/ngwysiwyg-tests.ts b/ngwysiwyg/ngwysiwyg-tests.ts
index c779e918ea..fd6eaf1ee8 100644
--- a/ngwysiwyg/ngwysiwyg-tests.ts
+++ b/ngwysiwyg/ngwysiwyg-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="ngwysiwyg.d.ts" />
+
 
 //import ngWYSIWYG = require("ngWYSIWYG");
 
diff --git a/ngwysiwyg/tsconfig.json b/ngwysiwyg/tsconfig.json
new file mode 100644
index 0000000000..2469d52a9f
--- /dev/null
+++ b/ngwysiwyg/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ngwysiwyg-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/nightmare/index.d.ts b/nightmare/index.d.ts
new file mode 100644
index 0000000000..9abcbca272
--- /dev/null
+++ b/nightmare/index.d.ts
@@ -0,0 +1,119 @@
+// Type definitions for Nightmare 1.6.5
+// Project: https://github.com/segmentio/nightmare
+// Definitions by: horiuchi <https://github.com/horiuchi/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare class Nightmare {
+    constructor(options?: Nightmare.IConstructorOptions);
+
+    // Interact
+    goto(url: string): Nightmare;
+    back(): Nightmare;
+    forward(): Nightmare;
+    refresh(): Nightmare;
+    click(selector: string): Nightmare;
+    type(selector: string, text: string): Nightmare;
+    upload(selector: string, path: string): Nightmare;
+    scrollTo(top: number, left: number): Nightmare;
+    inject(type: string, file: string): Nightmare;
+    evaluate(fn: () => void): Nightmare;
+    evaluate<R>(fn: () => R, cb: (result: R) => void): Nightmare;
+    evaluate<T>(fn: (arg: T) => void, cb: () => void, arg: T): Nightmare;
+    evaluate<T, R>(fn: (arg: T) => R, cb: (result: R) => void, arg: T): Nightmare;
+    evaluate<T1, T2, R>(fn: (arg1: T1, arg2: T2) => R, cb: (result: R) => void, arg1: T1, arg2: T2): Nightmare;
+    evaluate<T1, T2, T3, R>(fn: (arg1: T1, arg2: T2, arg3: T3) => R, cb: (result: R) => void, arg1: T1, arg2: T2, arg3: T3): Nightmare;
+    wait(): Nightmare;
+    wait(ms: number): Nightmare;
+    wait(selector: string): Nightmare;
+    wait(fn: () => any, value: any, delay?: number): Nightmare;
+    use(plugin: (nightmare: Nightmare) => void): Nightmare;
+    run(cb?: (err: any, nightmare: Nightmare) => void): Nightmare;
+
+    // Extract
+    exists(selector: string, cb: (result: boolean) => void): Nightmare;
+    visible(selector: string, cb: (result: boolean) => void): Nightmare;
+    on(event: string, cb: () => void): Nightmare;
+    on(event: 'initialized', cb: () => void): Nightmare;
+    on(event: 'loadStarted', cb: () => void): Nightmare;
+    on(event: 'loadFinished', cb: (status: string) => void): Nightmare;
+    on(event: 'urlChanged', cb: (targetUrl: string) => void): Nightmare;
+    on(event: 'navigationRequested', cb: (url: string, type: string, willNavigate: boolean, main: boolean) => void): Nightmare;
+    on(event: 'resourceRequested', cb: (requestData: Nightmare.IRequest, networkRequest: Nightmare.INetwordRequest) => void): Nightmare;
+    on(event: 'resourceReceived', cb: (response: Nightmare.IResponse) => void): Nightmare;
+    on(event: 'resourceError', cb: (resourceError: Nightmare.IResourceError) => void): Nightmare;
+    on(event: 'consoleMessage', cb: (msg: string, lineNumber: number, sourceId: number) => void): Nightmare;
+    on(event: 'alert', cb: (msg: string) => void): Nightmare;
+    on(event: 'confirm', cb: (msg: string) => void): Nightmare;
+    on(event: 'prompt', cb: (msg: string, defaultValue?: string) => void): Nightmare;
+    on(event: 'error', cb: (msg: string, trace?: Nightmare.IStackTrace[]) => void): Nightmare;
+    on(event: 'timeout', cb: (msg: string) => void): Nightmare;
+    screenshot(path: string): Nightmare;
+    pdf(path: string): Nightmare;
+    title(cb: (title: string) => void): Nightmare;
+    url(cb: (url: string) => void): Nightmare;
+
+    // Settings
+    authentication(user: string, password: string): Nightmare;
+    useragent(useragent: string): Nightmare;
+    viewport(width: number, height: number): Nightmare;
+    zoom(zoomFactor: number): Nightmare;
+    headers(headers: Object): Nightmare;
+}
+
+declare namespace Nightmare {
+    export interface IConstructorOptions {
+        timeout?: any;  // number | string;
+        interval?: any; // number | string;
+        port?: number;
+        weak?: boolean;
+        loadImages?: boolean;
+        ignoreSslErrors?: boolean;
+        sslProtocol?: string;
+        webSecurity?: boolean;
+        proxy?: string;
+        proxyType?: string;
+        proxyAuth?: string;
+        cookiesFile?: string;
+        phantomPath?: string;
+    }
+
+    export interface IRequest {
+        id: number;
+        method: string;
+        url: string;
+        time: Date;
+        headers: Object;
+    }
+    export interface INetwordRequest {
+        abort(): void;
+        changeUrl(url: string): void;
+        setHeader(key: string, value: string): void;
+    }
+    export interface IResponse {
+        id: number;
+        url: string;
+        time: Date;
+        headers: Object;
+        bodySize: number;
+        contentType: string;
+        redirectURL: string;
+        stage: string;
+        status: number;
+        statusText: string;
+    }
+    export interface IResourceError {
+        id: number;
+        url: string;
+        errorCode: number;
+        errorString: string;
+    }
+    export interface IStackTrace {
+        file: string;
+        line: number;
+        function?: string;
+    }
+}
+
+export = Nightmare;
diff --git a/nightmare/nightmare-tests.ts b/nightmare/nightmare-tests.ts
index ba3034f628..ed3c85841d 100644
--- a/nightmare/nightmare-tests.ts
+++ b/nightmare/nightmare-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="./nightmare.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+
+/// <reference types="jquery" />
 
 import Nightmare = require("nightmare");
 
diff --git a/nightmare/nightmare.d.ts b/nightmare/nightmare.d.ts
deleted file mode 100644
index f67d7594d7..0000000000
--- a/nightmare/nightmare.d.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-// Type definitions for Nightmare 1.6.5
-// Project: https://github.com/segmentio/nightmare
-// Definitions by: horiuchi <https://github.com/horiuchi/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "nightmare" {
-
-  class Nightmare {
-    constructor(options?: Nightmare.IConstructorOptions);
-
-    // Interact
-    goto(url: string): Nightmare;
-    back(): Nightmare;
-    forward(): Nightmare;
-    refresh(): Nightmare;
-    click(selector: string): Nightmare;
-    type(selector: string, text: string): Nightmare;
-    upload(selector: string, path: string): Nightmare;
-    scrollTo(top: number, left: number): Nightmare;
-    inject(type: string, file: string): Nightmare;
-    evaluate(fn: () => void): Nightmare;
-    evaluate<R>(fn: () => R, cb: (result: R) => void): Nightmare;
-    evaluate<T>(fn: (arg: T) => void, cb: () => void, arg: T): Nightmare;
-    evaluate<T, R>(fn: (arg: T) => R, cb: (result: R) => void, arg: T): Nightmare;
-    evaluate<T1, T2, R>(fn: (arg1: T1, arg2: T2) => R, cb: (result: R) => void, arg1: T1, arg2: T2): Nightmare;
-    evaluate<T1, T2, T3, R>(fn: (arg1: T1, arg2: T2, arg3: T3) => R, cb: (result: R) => void, arg1: T1, arg2: T2, arg3: T3): Nightmare;
-    wait(): Nightmare;
-    wait(ms: number): Nightmare;
-    wait(selector: string): Nightmare;
-    wait(fn: () => any, value: any, delay?: number): Nightmare;
-    use(plugin: (nightmare: Nightmare) => void): Nightmare;
-    run(cb?: (err: any, nightmare: Nightmare) => void): Nightmare;
-
-    // Extract
-    exists(selector: string, cb: (result: boolean) => void): Nightmare;
-    visible(selector: string, cb: (result: boolean) => void): Nightmare;
-    on(event: string, cb: () => void): Nightmare;
-    on(event: 'initialized', cb: () => void): Nightmare;
-    on(event: 'loadStarted', cb: () => void): Nightmare;
-    on(event: 'loadFinished', cb: (status: string) => void): Nightmare;
-    on(event: 'urlChanged', cb: (targetUrl: string) => void): Nightmare;
-    on(event: 'navigationRequested', cb: (url: string, type: string, willNavigate: boolean, main: boolean) => void): Nightmare;
-    on(event: 'resourceRequested', cb: (requestData: Nightmare.IRequest, networkRequest: Nightmare.INetwordRequest) => void): Nightmare;
-    on(event: 'resourceReceived', cb: (response: Nightmare.IResponse) => void): Nightmare;
-    on(event: 'resourceError', cb: (resourceError: Nightmare.IResourceError) => void): Nightmare;
-    on(event: 'consoleMessage', cb: (msg: string, lineNumber: number, sourceId: number) => void): Nightmare;
-    on(event: 'alert', cb: (msg: string) => void): Nightmare;
-    on(event: 'confirm', cb: (msg: string) => void): Nightmare;
-    on(event: 'prompt', cb: (msg: string, defaultValue?: string) => void): Nightmare;
-    on(event: 'error', cb: (msg: string, trace?: Nightmare.IStackTrace[]) => void): Nightmare;
-    on(event: 'timeout', cb: (msg: string) => void): Nightmare;
-    screenshot(path: string): Nightmare;
-    pdf(path: string): Nightmare;
-    title(cb: (title: string) => void): Nightmare;
-    url(cb: (url: string) => void): Nightmare;
-
-    // Settings
-    authentication(user: string, password: string): Nightmare;
-    useragent(useragent: string): Nightmare;
-    viewport(width: number, height: number): Nightmare;
-    zoom(zoomFactor: number): Nightmare;
-    headers(headers: Object): Nightmare;
-  }
-
-  namespace Nightmare {
-    export interface IConstructorOptions {
-      timeout?: any;  // number | string;
-      interval?: any; // number | string;
-      port?: number;
-      weak?: boolean;
-      loadImages?: boolean;
-      ignoreSslErrors?: boolean;
-      sslProtocol?: string;
-      webSecurity?: boolean;
-      proxy?: string;
-      proxyType?: string;
-      proxyAuth?: string;
-      cookiesFile?: string;
-      phantomPath?: string;
-    }
-
-    export interface IRequest {
-      id: number;
-      method: string;
-      url: string;
-      time: Date;
-      headers: Object;
-    }
-    export interface INetwordRequest {
-      abort(): void;
-      changeUrl(url: string): void;
-      setHeader(key: string, value: string): void;
-    }
-    export interface IResponse {
-      id: number;
-      url: string;
-      time: Date;
-      headers: Object;
-      bodySize: number;
-      contentType: string;
-      redirectURL: string;
-      stage: string;
-      status: number;
-      statusText: string;
-    }
-    export interface IResourceError {
-      id: number;
-      url: string;
-      errorCode: number;
-      errorString: string;
-    }
-    export interface IStackTrace {
-      file: string;
-      line: number;
-      function?: string;
-    }
-  }
-
-  export = Nightmare;
-}
-
diff --git a/nightmare/tsconfig.json b/nightmare/tsconfig.json
new file mode 100644
index 0000000000..1eff4127ea
--- /dev/null
+++ b/nightmare/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "nightmare-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/noVNC/noVNC.d.ts b/noVNC/index.d.ts
similarity index 100%
rename from noVNC/noVNC.d.ts
rename to noVNC/index.d.ts
diff --git a/noVNC/noVNC-tests.ts b/noVNC/noVNC-tests.ts
index 238cbce1ff..b8a1f7fd63 100644
--- a/noVNC/noVNC-tests.ts
+++ b/noVNC/noVNC-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="noVNC.d.ts" />
-
 Util.load_scripts(["webutil.js", "base64.js", "websock.js", "des.js",
 				   "input.js", "display.js", "jsunzip.js", "rfb.js"]);
 
diff --git a/noVNC/noVNC-tests.ts.tscparams b/noVNC/noVNC-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/noVNC/noVNC-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/noVNC/noVNC.d.ts.tscparams b/noVNC/noVNC.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/noVNC/noVNC.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/noVNC/tsconfig.json b/noVNC/tsconfig.json
new file mode 100644
index 0000000000..4ca96bdb40
--- /dev/null
+++ b/noVNC/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "noVNC-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/noble/index.d.ts b/noble/index.d.ts
new file mode 100644
index 0000000000..4a9720ba5e
--- /dev/null
+++ b/noble/index.d.ts
@@ -0,0 +1,106 @@
+// Type definitions for noble
+// Project: https://github.com/sandeepmistry/noble
+// Definitions by: Seon-Wook Park <https://github.com/swook>, Hans Bakker <https://github.com/wind-rider>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import events = require("events");
+
+export declare function startScanning(): void;
+export declare function startScanning(serviceUUIDs: string[]): void;
+export declare function startScanning(serviceUUIDs: string[], allowDuplicates: boolean): void;
+export declare function stopScanning(): void;
+
+export declare function on(event: string, listener: Function): events.EventEmitter;
+export declare function on(event: "stateChange", listener: (state: string) => void): events.EventEmitter;
+export declare function on(event: "scanStart", listener: () => void): events.EventEmitter;
+export declare function on(event: "scanStop", listener: () => void): events.EventEmitter;
+export declare function on(event: "discover", listener: (peripheral: Peripheral) => void): events.EventEmitter;
+
+export declare class Peripheral extends events.EventEmitter {
+    uuid: string;
+    advertisement: Advertisement;
+    rssi: number;
+    services: Service[];
+    state: string;
+
+    connect(callback?: (error: string) => void): void;
+    disconnect(callback?: () => void): void;
+    updateRssi(callback?: (error: string, rssi: number) => void): void;
+    discoverServices(serviceUUIDs: string[], callback?: (error: string, services: Service[]) => void): void;
+    discoverAllServicesAndCharacteristics(callback?: (error: string, services: Service[], characteristics: Characteristic[]) => void): void;
+    discoverSomeServicesAndCharacteristics(serviceUUIDs: string[], characteristicUUIDs: string[], callback?: (error: string, services: Service[], characteristics: Characteristic[]) => void): void;
+
+    readHandle(handle: Buffer, callback: (error: string, data: Buffer) => void): void;
+    writeHandle(handle: Buffer, data: Buffer, withoutResponse: boolean, callback: (error: string) => void): void;
+    toString(): string;
+
+    on(event: string, listener: Function): this;
+    on(event: "connect", listener: (error: string) => void): this;
+    on(event: "disconnect", listener: (error: string) => void): this;
+    on(event: "rssiUpdate", listener: (rssi: number) => void): this;
+    on(event: "servicesDiscover", listener: (services: Service[]) => void): this;
+}
+
+export interface Advertisement {
+    localName: string;
+    serviceData: Buffer;
+    txPowerLevel: number;
+    manufacturerData: Buffer;
+    serviceUuids: string[];
+}
+
+export declare class Service extends events.EventEmitter {
+    uuid: string;
+    name: string;
+    type: string;
+    includedServiceUuids: string[];
+    characteristics: Characteristic[];
+
+    discoverIncludedServices(serviceUUIDs: string[], callback?: (error: string, includedServiceUuids: string[]) => void): void;
+    discoverCharacteristics(characteristicUUIDs: string[], callback?: (error: string, characteristics: Characteristic[]) => void): void;
+    toString(): string;
+
+    on(event: string, listener: Function): this;
+    on(event: "includedServicesDiscover", listener: (includedServiceUuids: string[]) => void): this;
+    on(event: "characteristicsDiscover", listener: (characteristics: Characteristic[]) => void): this;
+}
+
+export declare class Characteristic extends events.EventEmitter {
+    uuid: string;
+    name: string;
+    type: string;
+    properties: string[];
+    descriptors: Descriptor[];
+
+    read(callback?: (error: string, data: Buffer) => void): void;
+    write(data: Buffer, notify: boolean, callback?: (error: string) => void): void;
+    broadcast(broadcast: boolean, callback?: (error: string) => void): void;
+    notify(notify: boolean, callback?: (error: string) => void): void;
+    discoverDescriptors(callback?: (error: string, descriptors: Descriptor[]) => void): void;
+    toString(): string;
+
+    on(event: string, listener: Function): this;
+    on(event: string, option: boolean, listener: Function): this;
+    on(event: "read", listener: (data: Buffer, isNotification: boolean) => void): this;
+    on(event: "write", withoutResponse: boolean, listener: (error: string) => void): this;
+    on(event: "broadcast", listener: (state: string) => void): this;
+    on(event: "notify", listener: (state: string) => void): this;
+    on(event: "descriptorsDiscover", listener: (descriptors: Descriptor[]) => void): this;
+}
+
+export declare class Descriptor extends events.EventEmitter {
+    uuid: string;
+    name: string;
+    type: string;
+
+    readValue(callback?: (error: string, data: Buffer) => void): void;
+    writeValue(data: Buffer, callback?: (error: string) => void): void;
+    toString(): string;
+
+    on(event: string, listener: Function): this;
+    on(event: "valueRead", listener: (error: string, data: Buffer) => void): this;
+    on(event: "valueWrite", listener: (error: string) => void): this;
+}
diff --git a/noble/noble-tests.ts b/noble/noble-tests.ts
index 4b1d396564..9c3f403944 100644
--- a/noble/noble-tests.ts
+++ b/noble/noble-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="noble.d.ts" />
 
 import noble = require("noble");
 
diff --git a/noble/noble.d.ts b/noble/noble.d.ts
deleted file mode 100644
index 8003bdbc68..0000000000
--- a/noble/noble.d.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-// Type definitions for noble
-// Project: https://github.com/sandeepmistry/noble
-// Definitions by: Seon-Wook Park <https://github.com/swook>, Hans Bakker <https://github.com/wind-rider>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "noble" {
-    import events = require("events");
-
-    export function startScanning(): void;
-    export function startScanning(serviceUUIDs: string[]): void;
-    export function startScanning(serviceUUIDs: string[], allowDuplicates: boolean): void;
-    export function stopScanning(): void;
-
-    export function on(event: string, listener: Function): events.EventEmitter;
-    export function on(event: "stateChange", listener: (state: string) => void): events.EventEmitter;
-    export function on(event: "scanStart", listener: () => void): events.EventEmitter;
-    export function on(event: "scanStop", listener: () => void): events.EventEmitter;
-    export function on(event: "discover", listener: (peripheral: Peripheral) => void): events.EventEmitter;
-
-    export class Peripheral extends events.EventEmitter {
-        uuid:          string;
-        advertisement: Advertisement;
-        rssi:          number;
-        services:      Service[];
-        state:         string;
-
-        connect(callback?: (error: string) => void): void;
-        disconnect(callback?: () => void): void;
-        updateRssi(callback?: (error: string, rssi: number) => void): void;
-        discoverServices(serviceUUIDs: string[], callback?: (error: string, services: Service[]) => void): void;
-        discoverAllServicesAndCharacteristics(callback?: (error: string, services: Service[], characteristics: Characteristic[]) => void): void;
-        discoverSomeServicesAndCharacteristics(serviceUUIDs: string[], characteristicUUIDs: string[], callback?: (error: string, services: Service[], characteristics: Characteristic[]) => void): void;
-
-        readHandle(handle: Buffer, callback: (error: string, data: Buffer) => void): void;
-        writeHandle(handle: Buffer, data: Buffer, withoutResponse: boolean, callback: (error: string) => void): void;
-        toString(): string;
-
-        on(event: string, listener: Function): this;
-        on(event: "connect", listener: (error: string) => void): this;
-        on(event: "disconnect", listener: (error: string) => void): this;
-        on(event: "rssiUpdate", listener: (rssi: number) => void): this;
-        on(event: "servicesDiscover", listener: (services: Service[]) => void): this;
-    }
-
-    export interface Advertisement {
-        localName:        string;
-        serviceData:      Buffer;
-        txPowerLevel:     number;
-        manufacturerData: Buffer;
-        serviceUuids:     string[];
-    }
-
-    export class Service extends events.EventEmitter {
-        uuid:                 string;
-        name:                 string;
-        type:                 string;
-        includedServiceUuids: string[];
-        characteristics:      Characteristic[];
-
-        discoverIncludedServices(serviceUUIDs: string[], callback?: (error: string, includedServiceUuids: string[]) => void): void;
-        discoverCharacteristics(characteristicUUIDs: string[], callback?: (error: string, characteristics: Characteristic[]) => void): void;
-        toString(): string;
-
-        on(event: string, listener: Function): this;
-        on(event: "includedServicesDiscover", listener: (includedServiceUuids: string[]) => void): this;
-        on(event: "characteristicsDiscover", listener: (characteristics: Characteristic[]) => void): this;
-    }
-
-    export class Characteristic extends events.EventEmitter {
-        uuid:        string;
-        name:        string;
-        type:        string;
-        properties:  string[];
-        descriptors: Descriptor[];
-
-        read(callback?: (error: string, data: Buffer) => void): void;
-        write(data: Buffer, notify: boolean, callback?: (error: string) => void): void;
-        broadcast(broadcast: boolean, callback?: (error: string) => void): void;
-        notify(notify: boolean, callback?: (error: string) => void): void;
-        discoverDescriptors(callback?: (error: string, descriptors: Descriptor[]) => void): void;
-        toString(): string;
-
-        on(event: string, listener: Function): this;
-        on(event: string, option: boolean, listener: Function): this;
-        on(event: "read", listener: (data: Buffer, isNotification: boolean) => void): this;
-        on(event: "write", withoutResponse: boolean, listener: (error: string) => void): this;
-        on(event: "broadcast", listener: (state: string) => void): this;
-        on(event: "notify", listener: (state: string) => void): this;
-        on(event: "descriptorsDiscover", listener: (descriptors: Descriptor[]) => void): this;
-    }
-
-    export class Descriptor extends events.EventEmitter {
-        uuid: string;
-        name: string;
-        type: string;
-
-        readValue(callback?: (error: string, data: Buffer) => void): void;
-        writeValue(data: Buffer, callback?: (error: string) => void): void;
-        toString(): string;
-
-        on(event: string, listener: Function): this;
-        on(event: "valueRead", listener: (error: string, data: Buffer) => void): this;
-        on(event: "valueWrite", listener: (error: string) => void): this;
-    }
-}
-
diff --git a/noble/tsconfig.json b/noble/tsconfig.json
new file mode 100644
index 0000000000..45320c2087
--- /dev/null
+++ b/noble/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "noble-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/nock/index.d.ts b/nock/index.d.ts
new file mode 100644
index 0000000000..713084514e
--- /dev/null
+++ b/nock/index.d.ts
@@ -0,0 +1,124 @@
+// Type definitions for nock v0.54.0
+// Project: https://github.com/pgte/nock
+// Definitions by: bonnici <https://github.com/bonnici>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/nock.d.ts
+
+export = nock;
+
+declare function nock (host: string, options?: nock.Options): nock.Scope;
+
+declare namespace nock {
+	export function cleanAll(): void;
+
+	export function disableNetConnect(): void;
+	export function enableNetConnect(): void;
+	export function enableNetConnect(regex: RegExp): void;
+	export function enableNetConnect(domain: string): void;
+
+	export var recorder: Recorder;
+
+	export interface Scope {
+		get(path: string, data?: string): Scope;
+		get(path: RegExp, data?: string): Scope;
+
+		post(path: string, data?: string): Scope;
+		post(path: string, data?: Object): Scope;
+		post(path: string, regex?: RegExp): Scope;
+		post(path: RegExp, data?: string): Scope;
+		post(path: RegExp, data?: Object): Scope;
+		post(path: RegExp, regex?: RegExp): Scope;
+
+		patch(path: string, data?: string): Scope;
+		patch(path: string, data?: Object): Scope;
+		patch(path: string, regex?: RegExp): Scope;
+		patch(path: RegExp, data?: string): Scope;
+		patch(path: RegExp, data?: Object): Scope;
+		patch(path: RegExp, regex?: RegExp): Scope;
+
+		put(path: string, data?: string): Scope;
+		put(path: string, data?: Object): Scope;
+		put(path: string, regex?: RegExp): Scope;
+		put(path: RegExp, data?: string): Scope;
+		put(path: RegExp, data?: Object): Scope;
+		put(path: RegExp, regex?: RegExp): Scope;
+
+		head(path: string): Scope;
+		head(path: RegExp): Scope;
+
+		delete(path: string, data?: string): Scope;
+		delete(path: string, data?: Object): Scope;
+		delete(path: string, regex?: RegExp): Scope;
+		delete(path: RegExp, data?: string): Scope;
+		delete(path: RegExp, data?: Object): Scope;
+		delete(path: RegExp, regex?: RegExp): Scope;
+
+		merge(path: string, data?: string): Scope;
+		merge(path: string, data?: Object): Scope;
+		merge(path: string, regex?: RegExp): Scope;
+		merge(path: RegExp, data?: string): Scope;
+		merge(path: RegExp, data?: Object): Scope;
+		merge(path: RegExp, regex?: RegExp): Scope;
+
+		query(params: any): Scope;
+		query(acceptAnyParams: boolean): Scope;
+
+		intercept(path: string, verb: string, body?: string, options?: any): Scope;
+		intercept(path: string, verb: string, body?: Object, options?: any): Scope;
+		intercept(path: string, verb: string, body?: RegExp, options?: any): Scope;
+		intercept(path: RegExp, verb: string, body?: string, options?: any): Scope;
+		intercept(path: RegExp, verb: string, body?: Object, options?: any): Scope;
+		intercept(path: RegExp, verb: string, body?: RegExp, options?: any): Scope;
+
+		reply(responseCode: number, body?: string, headers?: Object): Scope;
+		reply(responseCode: number, body?: Object, headers?: Object): Scope;
+		reply(responseCode: number, callback: (uri: string, body: string) => string, headers?: Object): Scope;
+		replyWithFile(responseCode: number, fileName: string): Scope;
+		replyWithError(errorMessage: string): Scope;
+
+		defaultReplyHeaders(headers: Object): Scope;
+
+		matchHeader(name: string, value: string): Scope;
+		matchHeader(name: string, regex: RegExp): Scope;
+		matchHeader(name: string, fn: (value: string) => boolean): Scope;
+
+		filteringPath(regex: RegExp, replace: string): Scope;
+		filteringPath(fn: (path: string) => string): Scope;
+		filteringRequestBody(regex: RegExp, replace: string): Scope;
+		filteringRequestBody(fn: (path: string) => string): Scope;
+
+		persist(): Scope;
+		log(out: () => void): Scope;
+
+		delay(timeMs: number): Scope;
+		delayConnection(timeMs: number): Scope;
+
+		times(repeats: number): Scope;
+		once(): Scope;
+		twice(): Scope;
+		thrice(): Scope;
+
+		done(): void;
+		isDone(): boolean;
+		restore(): void;
+		pendingMocks(): Object[];
+	}
+
+	export interface Recorder {
+		rec(capture?: boolean): void;
+		rec(options?: RecorderOptions): void;
+		play(): any[];
+	}
+
+	export interface Options {
+		allowUnmocked?: boolean;
+	}
+
+	export interface RecorderOptions {
+		dont_print?: boolean;
+		output_objects?: boolean;
+		enable_reqheaders_recording?: boolean;
+	}
+}
+
diff --git a/nock/nock-tests.ts b/nock/nock-tests.ts
index bc936a05b8..fcdab490ed 100644
--- a/nock/nock-tests.ts
+++ b/nock/nock-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="nock.d.ts" />
+
 
 import nock = require('nock');
 
diff --git a/nock/nock.d.ts b/nock/nock.d.ts
deleted file mode 100644
index 208aac9b31..0000000000
--- a/nock/nock.d.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-// Type definitions for nock v0.54.0
-// Project: https://github.com/pgte/nock
-// Definitions by: bonnici <https://github.com/bonnici>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/nock.d.ts
-
-declare module "nock" {
-	export = nock;
-
-	function nock (host: string, options?: nock.Options): nock.Scope;
-
-	namespace nock {
-		export function cleanAll(): void;
-
-		export function disableNetConnect(): void;
-		export function enableNetConnect(): void;
-		export function enableNetConnect(regex: RegExp): void;
-		export function enableNetConnect(domain: string): void;
-
-		export var recorder: Recorder;
-
-		export interface Scope {
-			get(path: string, data?: string): Scope;
-
-			post(path: string, data?: string): Scope;
-			post(path: string, data?: Object): Scope;
-			post(path: string, regex?: RegExp): Scope;
-
-			patch(path: string, data?: string): Scope;
-			patch(path: string, data?: Object): Scope;
-			patch(path: string, regex?: RegExp): Scope;
-
-			put(path: string, data?: string): Scope;
-			put(path: string, data?: Object): Scope;
-			put(path: string, regex?: RegExp): Scope;
-
-			head(path: string): Scope;
-
-			delete(path: string, data?: string): Scope;
-			delete(path: string, data?: Object): Scope;
-			delete(path: string, regex?: RegExp): Scope;
-
-			merge(path: string, data?: string): Scope;
-			merge(path: string, data?: Object): Scope;
-			merge(path: string, regex?: RegExp): Scope;
-
-			query(params: any): Scope;
-			query(acceptAnyParams: boolean): Scope;
-
-			intercept(path: string, verb: string, body?: string, options?: any): Scope;
-			intercept(path: string, verb: string, body?: Object, options?: any): Scope;
-			intercept(path: string, verb: string, body?: RegExp, options?: any): Scope;
-
-			reply(responseCode: number, body?: string, headers?: Object): Scope;
-			reply(responseCode: number, body?: Object, headers?: Object): Scope;
-			reply(responseCode: number, callback: (uri: string, body: string) => string, headers?: Object): Scope;
-			replyWithFile(responseCode: number, fileName: string): Scope;
-			replyWithError(errorMessage: string): Scope;
-
-			defaultReplyHeaders(headers: Object): Scope;
-
-			matchHeader(name: string, value: string): Scope;
-			matchHeader(name: string, regex: RegExp): Scope;
-			matchHeader(name: string, fn: (value: string) => boolean): Scope;
-
-			filteringPath(regex: RegExp, replace: string): Scope;
-			filteringPath(fn: (path: string) => string): Scope;
-			filteringRequestBody(regex: RegExp, replace: string): Scope;
-			filteringRequestBody(fn: (path: string) => string): Scope;
-
-			persist(): Scope;
-			log(out: () => void): Scope;
-
-			delay(timeMs: number): Scope;
-			delayConnection(timeMs: number): Scope;
-
-			times(repeats: number): Scope;
-			once(): Scope;
-			twice(): Scope;
-			thrice(): Scope;
-
-			done(): void;
-			isDone(): boolean;
-			restore(): void;
-			pendingMocks(): Object[];
-		}
-
-		export interface Recorder {
-			rec(capture?: boolean): void;
-			rec(options?: RecorderOptions): void;
-			play(): any[];
-		}
-
-		export interface Options {
-			allowUnmocked?: boolean;
-		}
-
-		export interface RecorderOptions {
-			dont_print?: boolean;
-			output_objects?: boolean;
-			enable_reqheaders_recording?: boolean;
-		}
-	}
-}
diff --git a/nock/tsconfig.json b/nock/tsconfig.json
new file mode 100644
index 0000000000..0b4e35f74d
--- /dev/null
+++ b/nock/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "nock-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-array-ext/index.d.ts b/node-array-ext/index.d.ts
new file mode 100644
index 0000000000..40991495ce
--- /dev/null
+++ b/node-array-ext/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for node-array-ext v1.0.00
+// Project: https://github.com/Beng89/node-array-ext
+// Definitions by: Ben Goltz <https://github.com/Beng89>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/**
+ * Processes each of the elements in the array and triggers a callback once every element has been processed.
+ *  - note that the elements are called in order but are not guaranteed to finish in order.
+ */
+export declare function asyncEach<T>(array: Array<T>, each: (i: number, element: T, done: (err?: Error) => void) => void, finish: (err?: Error) => void): void;
+/**
+ * Processes each of the elements in the array and triggers a callback once every element has been processed.
+ *  - note that the elements are called in order and are guaranteed to finish in order.
+ */
+export declare function awaitEach<T>(array: Array<T>, each: (i: number, element: T, done: (err?: Error) => void) => void, finish: (err?: Error) => void): void;
diff --git a/node-array-ext/node-array-ext-tests.ts b/node-array-ext/node-array-ext-tests.ts
index 8981165cd3..21d463a640 100644
--- a/node-array-ext/node-array-ext-tests.ts
+++ b/node-array-ext/node-array-ext-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./node-array-ext.d.ts" />
+
 import extensions = require("node-array-ext");
 
 var array: Array<string> = [ "hello", "world", "test" ];
diff --git a/node-array-ext/node-array-ext.d.ts b/node-array-ext/node-array-ext.d.ts
deleted file mode 100644
index 3199751330..0000000000
--- a/node-array-ext/node-array-ext.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for node-array-ext v1.0.00
-// Project: https://github.com/Beng89/node-array-ext
-// Definitions by: Ben Goltz <https://github.com/Beng89>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "node-array-ext" {
-	/**
-	 * Processes each of the elements in the array and triggers a callback once every element has been processed.
-	 *  - note that the elements are called in order but are not guaranteed to finish in order.
-	 */
-	export function asyncEach<T> (array: Array<T>, each: (i: number, element: T, done: (err?: Error) => void) => void, finish: (err?: Error) => void): void;
-	/**
-	 * Processes each of the elements in the array and triggers a callback once every element has been processed.
-	 *  - note that the elements are called in order and are guaranteed to finish in order.
-	 */
-	export function awaitEach<T> (array: Array<T>, each: (i: number, element: T, done: (err?: Error) => void) => void, finish: (err?: Error) => void): void;
-}
\ No newline at end of file
diff --git a/node-array-ext/tsconfig.json b/node-array-ext/tsconfig.json
new file mode 100644
index 0000000000..8cf0c6afcc
--- /dev/null
+++ b/node-array-ext/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-array-ext-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-azure/azure.d.ts b/node-azure/azure.d.ts
deleted file mode 100644
index da2c14871f..0000000000
--- a/node-azure/azure.d.ts
+++ /dev/null
@@ -1,1882 +0,0 @@
-// Type definitions for Azure SDK for Node v0.9.16
-// Project: https://github.com/WindowsAzure/azure-sdk-for-node
-// Definitions by: Andrew Gaspar <https://github.com/AndrewGaspar>,
-//                 Anti Veeranna <https://github.com/antiveeranna>,
-//                 Maxime LUCE <https://github.com/SomaticIT>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-/**
-* TODO
-*/
-declare module "azure" {
-    import events = require("events");
-    import stream = require("stream");
-    import url = require("url");
-
-    //#region Services
-    export class TableService extends BatchServiceClient {
-        static incorrectTableNameErr: string;
-        static incorrectCallbackErr: string;
-        static incorrectTableQuery: string;
-        static incorrectPartitionErr: string;
-
-        //#region Constructors
-
-        /**
-        * Creates a new TableService object.
-        * Uses the AZURE_STORAGE_ACCOUNT and AZURE_STORAGE_ACCESS_KEY environment variables.
-        *
-        * @constructor
-        * @extends {ServiceClient}
-        */
-        constructor();
-        /**
-        * Creates a new TableService object.
-        * Uses a connectionString to connect
-        *
-        * @constructor
-        * @extends {ServiceClient}
-        * @param {string} connectionString The connection string.
-        */
-        constructor(connectionString: string);
-        /**
-        * Creates a new TableService object.
-        * Uses a storage account and an access key.
-        *
-        * @constructor
-        * @extends {ServiceClient}
-        * @param {string} storageAccount                    The storage account or the connection string.
-        * @param {string} storageAccessKey                  The storage access key.
-        * @param {string} host                              The host address.
-        * @param {object} authenticationProvider            The authentication provider.
-        */
-        constructor(storageAccount: string, storageAccessKey: string, host?: string, authenticationProvider?: string);
-
-        //#endregion
-
-        //#region Service Methods
-
-        getServiceProperties(callback: StorageServicePropertiesCallback): void;
-        getServiceProperties(options: TimeoutIntervalOptions, callback: StorageServicePropertiesCallback): void;
-
-        setServiceProperties(serviceProperties: StorageServiceProperties, callback: StorageCallbackVoid): void;
-        setServiceProperties(serviceProperties: StorageServiceProperties, options: TimeoutIntervalOptions, callback: StorageCallbackVoid): void;
-
-        //#endregion
-
-        //#region Table Methods
-
-        getTable(table: string, callback?: TableRequestCallback): void;
-        getTable(table: string, options: TimeoutIntervalOptions, callback?: TableRequestCallback): void;
-
-        createTable(table: string, callback?: TableRequestCallback): void;
-        createTable(table: string, options: TimeoutIntervalOptions, callback?: TableRequestCallback): void;
-
-        createTableIfNotExists(table: string, callback?: CreateTableIfNotExistsCallback): void;
-        createTableIfNotExists(table: string, options: TimeoutIntervalOptions, callback?: CreateTableIfNotExistsCallback): void;
-
-        deleteTable(table: string, callback?: DeleteTableCallback): void;
-        deleteTable(table: string, options: TimeoutIntervalOptions, callback?: DeleteTableCallback): void;
-
-        queryTables(callback?: QueryTablesCallback): void;
-        queryTables(options: QueryTablesOptions, callback?: QueryTablesCallback): void;
-
-        //#endregion
-
-        //#region Entities Methods
-
-        queryEntity(table: string, partitionKey: string, rowKey: string, callback?: QueryEntityCallback): void;
-        queryEntity(table: string, partitionKey: string, rowKey: string, options: TimeoutIntervalOptions, callback?: QueryEntityCallback): void;
-
-        queryEntities(tableQuery: TableQuery, callback?: QueryEntitiesCallback): void;
-        queryEntities(tableQuery: TableQuery, options: TimeoutIntervalOptions, callback?: QueryEntitiesCallback): void;
-
-        insertEntity(tableName: string, entityDescriptor: Entity, callback?: ModifyEntityCallback): void;
-        insertEntity(tableName: string, entityDescriptor: Entity, options: TimeoutIntervalOptions, callback?: ModifyEntityCallback): void;
-
-        insertOrReplaceEntity(tableName: string, entityDescriptor: Entity, callback?: ModifyEntityCallback): void;
-        insertOrReplaceEntity(tableName: string, entityDescriptor: Entity, options: TimeoutIntervalOptions, callback?: ModifyEntityCallback): void;
-
-        updateEntity(tableName: string, entityDescriptor: Entity, callback?: ModifyEntityCallback): void;
-        updateEntity(tableName: string, entityDescriptor: Entity, options: UpdateEntityOptions, callback?: ModifyEntityCallback): void;
-
-        mergeEntity(tableName: string, entityDescriptor: Entity, callback?: ModifyEntityCallback): void;
-        mergeEntity(tableName: string, entityDescriptor: Entity, options: UpdateEntityOptions, callback?: ModifyEntityCallback): void;
-
-        insertOrMergeEntity(tableName: string, entityDescriptor: Entity, callback?: ModifyEntityCallback): void;
-        insertOrMergeEntity(tableName: string, entityDescriptor: Entity, options: UpdateEntityOptions, callback?: ModifyEntityCallback): void;
-
-        deleteEntity(tableName: string, entityDescriptor: Entity, callback?: DeleteEntityCallback): void;
-        deleteEntity(tableName: string, entityDescriptor: Entity, options: UpdateEntityOptions, callback?: DeleteEntityCallback): void;
-
-        //#endregion
-    }
-
-    export class BlobService extends StorageServiceClient {
-        singleBlobPutThresholdInBytes: number;
-        parallelOperationThreadCount: number;
-
-        SpeedSummary: typeof SpeedSummary;
-
-        //#region Constructors
-
-        /**
-        * Creates a new BlobService object.
-        * Uses the AZURE_STORAGE_ACCOUNT and AZURE_STORAGE_ACCESS_KEY environment variables.
-        *
-        * @constructor
-        * @extends {StorageServiceClient}
-        */
-        constructor();
-
-        /**
-        * Creates a new BlobService object.
-        * Uses a connectionString to connect
-        *
-        * @constructor
-        * @extends {StorageServiceClient}
-        * @param {string} connectionString The connection string.
-        */
-        constructor(connectionString: string);
-
-        /**
-        * Creates a new BlobService object.
-        * Uses a storage account and an access key.
-        *
-        * @constructor
-        * @extends {StorageServiceClient}
-        * @param {string} storageAccount                    The storage account or the connection string.
-        * @param {string} storageAccessKey                  The storage access key.
-        * @param {string} host                              The host address.
-        * @param {object} sasToken                          The Shared Access Signature token.
-        */
-        constructor(storageAccount: string, storageAccessKey: string, host?: string, sasToken?: string);
-
-        //#endregion
-
-        //#region Service Methods
-
-        /**
-        * Gets the properties of a storage account�s Blob service, including Azure Storage Analytics.
-        */
-        getServiceProperties(callback: StorageServicePropertiesCallback): void;
-        getServiceProperties(options: TimeoutIntervalOptions, callback: StorageServicePropertiesCallback): void;
-
-        /**
-        * Sets the properties of a storage account�s Blob service, including Azure Storage Analytics.
-        * You can also use this operation to set the default request version for all incoming requests that do not have a version specified.
-        */
-        setServiceProperties(serviceProperties: StorageServiceProperties, callback: StorageCallbackVoid): void;
-        setServiceProperties(serviceProperties: StorageServiceProperties, options: TimeoutIntervalOptions, callback: StorageCallbackVoid): void;
-
-        //#endregion
-
-        //#region Containers Methods
-
-        /**
-        * Lists a segment containing a collection of container items under the specified account.
-        */
-        listContainers(callback: ListContainersCallback): void;
-        listContainers(options: ListContainersOptions, callback: ListContainersCallback): void;
-
-        /**
-         * Creates a new container under the specified account.
-         * If a container with the same name already exists, the operation fails.
-         */
-        createContainer(container: string, callback: StorageCallback<ContainerResult>): void;
-        createContainer(container: string, options: CreateContainerOptions, callback: StorageCallback<ContainerResult>): void;
-
-        /**
-         * Creates a new container under the specified account if the container does not exists.
-         */
-        createContainerIfNotExists(container: string, callback: StorageCallback<boolean>): void;
-        createContainerIfNotExists(container: string, options: CreateContainerOptions, callback: StorageCallback<boolean>): void;
-
-        /**
-         * Retrieves a container and its properties from a specified account.
-         */
-        getContainerProperties(container: string, callback: StorageCallback<ContainerResult>): void;
-        getContainerProperties(container: string, options: GetContainerPropertiesOptions, callback: StorageCallback<ContainerResult>): void;
-
-        /**
-         * Returns all user-defined metadata for the container.
-         */
-        getContainerMetadata(container: string, callback: StorageCallback<ContainerResult>): void;
-        getContainerMetadata(container: string, options: GetContainerPropertiesOptions, callback: StorageCallback<ContainerResult>): void;
-
-        /**
-         * Sets the container's metadata.
-         */
-        setContainerMetadata(container: string, metadata: StorageMetadata, callback: StorageCallback<ContainerResult>): void;
-        setContainerMetadata(container: string, metadata: StorageMetadata, options: AccessConditionsOptions, callback: StorageCallback<ContainerResult>): void;
-
-        /**
-         * Gets the container's ACL.
-         */
-        getContainerAcl(container: string, callback: StorageCallback<ContainerResult>): void;
-        getContainerAcl(container: string, options: GetContainerPropertiesOptions, callback: StorageCallback<ContainerResult>): void;
-
-        /**
-         * Updates the container's ACL.
-         */
-        setContainerAcl(container: string, publicAccessLevel: string, callback: StorageCallback<ContainerResult>): void;
-        setContainerAcl(container: string, publicAccessLevel: string, options: StorageAclOptions, callback: StorageCallback<ContainerResult>): void;
-
-        /**
-         * Marks the specified container for deletion.
-         * The container and any blobs contained within it are later deleted during garbage collection.
-         */
-        deleteContainer(container: string, callback: StorageCallbackVoid): void;
-        deleteContainer(container: string, options: LeaseIdOptions, callback: StorageCallbackVoid): void;
-
-        //#endregion
-
-        //#region Blob Methods
-
-        /**
-        * Lists all of the blobs in the given container.
-        */
-        listBlobs(container: string, callback: ListBlobsCallback): void;
-        listBlobs(container: string, options: ListBlobsOptions, callback: ListBlobsCallback): void;
-
-        /**
-         * Returns all user-defined metadata, standard HTTP properties, and system properties for the blob.
-         * It does not return or modify the content of the blob.
-         */
-        getBlobProperties(container: string, blob: string, callback: StorageCallback<BlobResult>): void;
-        getBlobProperties(container: string, blob: string, options: GetBlobPropertiesOptions, callback: StorageCallback<BlobResult>): void;
-
-        /**
-         * Sets user-defined properties for the specified blob or snapshot.
-         * It does not return or modify the content of the blob.
-         */
-        setBlobProperties(container: string, blob: string, callback: StorageCallback<BlobResult>): void;
-        setBlobProperties(container: string, blob: string, options: SetBlobPropertiesOptions, callback: StorageCallback<BlobResult>): void;
-
-        /**
-         * Sets user-defined metadata for the specified blob or snapshot as one or more name-value pairs 
-         * It does not return or modify the content of the blob.
-         */
-        setBlobMetadata(container: string, blob: string, metadata: StorageMetadata, callback: StorageCallback<BlobResult>): void;
-        setBlobMetadata(container: string, blob: string, metadata: StorageMetadata, options: GetBlobPropertiesOptions, callback: StorageCallback<BlobResult>): void;
-
-        /**
-         * Provides a stream to read from a blob.
-         */
-        getBlob(container: string, blob: string, callback: StorageCallback<BlobResult>): stream.Readable;
-        getBlob(container: string, blob: string, options: ReadBlobOptions, callback: StorageCallback<BlobResult>): stream.Readable;
-
-        /**
-         * Downloads a blob into a file.
-         */
-        getBlobToFile(container: string, blob: string, localFileName: string, callback: StorageCallback<BlobResult>): void;
-        getBlobToFile(container: string, blob: string, localFileName: string, options: ReadBlobOptions, callback: StorageCallback<BlobResult>): void;
-
-        /**
-         * Downloads a blob into a stream.
-         */
-        getBlobToStream(container: string, blob: string, stream: stream.Writable, callback: StorageCallback<BlobResult>): void;
-        getBlobToStream(container: string, blob: string, stream: stream.Writable, options: ReadBlobOptions, callback: StorageCallback<BlobResult>): void;
-
-        /**
-         * Downloads a blob into a text string.
-         */
-        getBlobToText(container: string, blob: string, callback: GetBlobToTextCallback): void;
-        getBlobToText(container: string, blob: string, options: ReadBlobOptions, callback: GetBlobToTextCallback): void;
-
-        /**
-         * Marks the specified blob or snapshot for deletion. The blob is later deleted during garbage collection.
-         * If a blob has snapshots, you must delete them when deleting the blob. Using the deleteSnapshots option, you can choose either to delete both the blob and its snapshots, 
-         * or to delete only the snapshots but not the blob itself. If the blob has snapshots, you must include the deleteSnapshots option or the blob service will return an error
-         * and nothing will be deleted. 
-         * If you are deleting a specific snapshot using the snapshotId option, the deleteSnapshots option must NOT be included.
-         */
-        deleteBlob(container: string, blob: string, callback: StorageCallback<boolean>): void;
-        deleteBlob(container: string, blob: string, options: DeleteBlobOptions, callback: StorageCallback<boolean>): void;
-
-        /**
-         * Creates a read-only snapshot of a blob.
-         */
-        createBlobSnapshot(container: string, blob: string, callback: StorageCallback<string>): void;
-        createBlobSnapshot(container: string, blob: string, options: BlobSnapshotOptions, callback: StorageCallback<string>): void;
-
-        /**
-         * Starts to copy a blob to a destination within the storage account. The Copy Blob operation copies the entire committed blob.
-         */
-        copyBlob(sourceUri: string, targetContainer: string, targetBlob: string, callback: StorageCallback<BlobResult>): void;
-        copyBlob(sourceUri: string, targetContainer: string, targetBlob: string, options: CopyBlobOptions, callback: StorageCallback<BlobResult>): void;
-
-        /**
-         * Creates a read-only snapshot of a blob.
-         */
-        abortCopyBlob(container: string, blob: string, copyId: string, callback: StorageCallbackVoid): void;
-        abortCopyBlob(container: string, blob: string, copyId: string, options: LeaseIdOptions, callback: StorageCallbackVoid): void;
-
-        /**
-         * Retrieves a shared access signature token.
-         */
-        generateSharedAccessSignature(container: string, blob: string, sharedAccessPolicy: SharedAccessPolicy): SharedAccessSignatureResult;
-
-        /**
-         * Retrieves a blob or container URL.
-         */
-        getBlobUrl(container: string): string;
-        getBlobUrl(container: string, blob: string): string;
-        getBlobUrl(container: string, blob: string, sharedAccessPolicy: SharedAccessPolicy): string;
-
-        /**
-         * Uploads a blob.
-         */
-        createBlob(container: string, blob: string, blobType: string, callback: StorageCallback<string>): stream.Writable;
-        createBlob(container: string, blob: string, blobType: string, options: UploadBlockBlobOptions, callback: StorageCallback<string>): stream.Writable;
-
-        //#endregion
-
-        //#region Page Blob Methods
-
-        /**
-         * Creates a page blob of the specified length.
-         */
-        createPageBlob(container: string, blob: string, length: number, callback: StorageCallbackVoid): void;
-        createPageBlob(container: string, blob: string, length: number, options: SetBlobPropertiesOptions, callback: StorageCallbackVoid): void;
-
-        /**
-         * Updates a page blob from a stream.
-         */
-        createBlobPagesFromStream(container: string, blob: string, readStream: stream.Readable, rangeStart: number, rangeEnd: number, callback: StorageCallback<BlobResult>): void;
-        createBlobPagesFromStream(container: string, blob: string, readStream: stream.Readable, rangeStart: number, rangeEnd: number, options: CreatePagesOptions, callback: StorageCallback<BlobResult>): void;
-
-        /**
-         * Updates a page blob from a text string.
-         */
-        createBlobPagesFromText(container: string, blob: string, text: string, rangeStart: number, rangeEnd: number, callback: StorageCallback<BlobResult>): void;
-        createBlobPagesFromText(container: string, blob: string, text: string, rangeStart: number, rangeEnd: number, options: CreatePagesOptions, callback: StorageCallback<BlobResult>): void;
-
-        /**
-         * Lists page ranges.
-         * Lists all of the page ranges by default, or only the page ranges over a specific range of bytes if rangeStart and rangeEnd are specified.
-         */
-        listBlobRegions(container: string, blob: string, callback: StorageCallback<PageRange[]>): void;
-        listBlobRegions(container: string, blob: string, options: PageRangeOptions, callback: StorageCallback<PageRange[]>): void;
-
-        /**
-         * Clears a range of pages.
-         */
-        clearBlobPages(container: string, blob: string, rangeStart: number, rangeEnd: number, callback: StorageCallbackVoid): void;
-        clearBlobPages(container: string, blob: string, rangeStart: number, rangeEnd: number, options: LeaseAccessConditionsOptions, callback: StorageCallbackVoid): void;
-
-        /**
-         * Resizes a page blob.
-         */
-        resizePageBlob(container: string, blob: string, size: number, callback: StorageCallback<BlobResult>): void;
-        resizePageBlob(container: string, blob: string, size: number, options: LeaseAccessConditionsOptions, callback: StorageCallback<BlobResult>): void;
-
-        /**
-         * Sets the page blob's sequence number.
-         */
-        setPageBlobSequenceNumber(container: string, blob: string, sequenceNumberAction: string, sequenceNumber: string, callback: StorageCallback<BlobResult>): void;
-        setPageBlobSequenceNumber(container: string, blob: string, sequenceNumberAction: string, sequenceNumber: string, options: AccessConditionsOptions, callback: StorageCallback<BlobResult>): void;
-
-        //#endregion
-
-        //#region Block Blob Methods
-
-        /**
-         * Uploads a block blob from file.
-         */
-        putBlockBlobFromFile(container: string, blob: string, localFileName: string, callback: StorageCallback<BlobResult>): SpeedSummary;
-        putBlockBlobFromFile(container: string, blob: string, localFileName: string, options: UploadBlockBlobOptions, callback: StorageCallback<BlobResult>): SpeedSummary;
-        createBlockBlobFromFile(container: string, blob: string, localFileName: string, callback: StorageCallback<BlobResult>): SpeedSummary;
-        createBlockBlobFromFile(container: string, blob: string, localFileName: string, options: UploadBlockBlobOptions, callback: StorageCallback<BlobResult>): SpeedSummary;
-
-        /**
-         * Uploads a block blob from a stream.
-         */
-        putBlockBlobFromStream(container: string, blob: string, stream: stream.Stream, streamLength: number, callback: StorageCallback<BlobResult>): SpeedSummary;
-        putBlockBlobFromStream(container: string, blob: string, stream: stream.Stream, streamLength: number, options: UploadBlockBlobOptions, callback: StorageCallback<BlobResult>): SpeedSummary;
-        createBlockBlobFromStream(container: string, blob: string, stream: stream.Stream, streamLength: number, callback: StorageCallback<BlobResult>): SpeedSummary;
-        createBlockBlobFromStream(container: string, blob: string, stream: stream.Stream, streamLength: number, options: UploadBlockBlobOptions, callback: StorageCallback<BlobResult>): SpeedSummary;
-
-        /**
-         * Uploads a block blob from a text string.
-         */
-        createBlockBlobFromText(container: string, blob: string, text: string, callback: StorageCallback<BlobResult>): SpeedSummary;
-        createBlockBlobFromText(container: string, blob: string, text: string, options: UploadBlockBlobOptions, callback: StorageCallback<BlobResult>): SpeedSummary;
-
-        /**
-         * Creates a new block to be committed as part of a blob.
-         */
-        createBlobBlockFromStream(blockId: string, container: string, blob: string, readStream: stream.Stream, streamLength: number, callback: StorageCallbackVoid): void;
-        createBlobBlockFromStream(blockId: string, container: string, blob: string, readStream: stream.Stream, streamLength: number, options: CreateBlockOptions, callback: StorageCallbackVoid): void;
-
-        /**
-         * Creates a new block to be committed as part of a blob.
-         */
-        createBlobBlockFromText(blockId: string, container: string, blob: string, text: string, callback: StorageCallbackVoid): void;
-        createBlobBlockFromText(blockId: string, container: string, blob: string, text: string, options: CreateBlockOptions, callback: StorageCallbackVoid): void;
-
-        /**
-         * Writes a blob by specifying the list of block IDs that make up the blob.
-         * In order to be written as part of a blob, a block must have been successfully written to the server in a prior
-         * createBlock operation.
-         */
-        commitBlobBlocks(container: string, blob: string, blockList: BlockList, callback: StorageCallback<BlockList>): void;
-        commitBlobBlocks(container: string, blob: string, blockList: BlockList, options: CreateBlockOptions, callback: StorageCallback<BlockList>): void;
-
-        /**
-         * Retrieves the list of blocks that have been uploaded as part of a block blob.
-         */
-        listBlobBlocks(container: string, blob: string, blockListType: string, callback: StorageCallback<BlockList>): void;
-        listBlobBlocks(container: string, blob: string, blockListType: string, options: GetBlobPropertiesOptions, callback: StorageCallback<BlockList>): void;
-
-        /**
-         * Generate a random block id prefix.
-         */
-        generateBlockIdPrefix(): string;
-        /**
-         * Get a block id according to prefix and block number.
-         */
-        getBlockId(prefix: string, number: number): string;
-
-        //#endregion
-
-        //#region Lease Methods
-
-        /**
-         * Acquires a new lease. 
-         * If container and blob are specified, acquires a blob lease. 
-         * Otherwise, if only container is specified and blob is null, acquires a container lease.
-         */
-        acquireLease(container: string, blob: string, callback: StorageCallback<LeaseResult>): void;
-        acquireLease(container: string, blob: string, options: LeaseOptions, callback: StorageCallback<LeaseResult>): void;
-
-        /**
-         * Renews an existing lease.
-         * If container and blob are specified, renews the blob lease.
-         * Otherwise, if only container is specified and blob is null, renews the container lease.
-         */
-        renewLease(container: string, blob: string, leaseId: string, callback: StorageCallback<LeaseResult>): void;
-        renewLease(container: string, blob: string, leaseId: string, options: AccessConditionsOptions, callback: StorageCallback<LeaseResult>): void;
-
-        /**
-         * Releases the lease.
-         * If container and blob are specified, releases the blob lease.
-         * Otherwise, if only container is specified and blob is null, releases the container lease.
-         */
-        releaseLease(container: string, blob: string, leaseId: string, callback: StorageCallback<LeaseResult>): void;
-        releaseLease(container: string, blob: string, leaseId: string, options: AccessConditionsOptions, callback: StorageCallback<LeaseResult>): void;
-
-        /**
-         * Breaks the lease but ensures that another client cannot acquire a new lease until the current lease period has expired.
-         * If container and blob are specified, breaks the blob lease.
-         * Otherwise, if only container is specified and blob is null, breaks the container lease.
-         */
-        breakLease(container: string, blob: string, leaseId: string, callback: StorageCallback<LeaseResult>): void;
-        breakLease(container: string, blob: string, leaseId: string, options: BreakLeaseOptions, callback: StorageCallback<LeaseResult>): void;
-
-        //#endregion
-    }
-
-    export class QueueService extends StorageServiceClient {
-        authenticationProvider: SharedKey;
-
-        //#region Constructors
-
-        /**
-        * Creates a new BlobService object.
-        * Uses the AZURE_STORAGE_ACCOUNT and AZURE_STORAGE_ACCESS_KEY environment variables.
-        *
-        * @constructor
-        * @extends {StorageServiceClient}
-        */
-        constructor();
-
-        /**
-        * Creates a new BlobService object.
-        * Uses a connectionString to connect
-        *
-        * @constructor
-        * @extends {StorageServiceClient}
-        * @param {string} connectionString The connection string.
-        */
-        constructor(connectionString: string);
-
-        /**
-        * Creates a new BlobService object.
-        * Uses a storage account and an access key.
-        *
-        * @constructor
-        * @extends {StorageServiceClient}
-        * @param {string} storageAccount                    The storage account or the connection string.
-        * @param {string} storageAccessKey                  The storage access key.
-        * @param {string} host                              The host address.
-        * @param {object} sasToken                          The Shared Access Signature token.
-        */
-        constructor(storageAccount: string, storageAccessKey: string, host?: string, sasToken?: string);
-
-        //#endregion
-
-        //#region Service Methods
-
-        /**
-        * Gets the properties of a storage account�s Blob service, including Azure Storage Analytics.
-        */
-        getServiceProperties(callback: StorageServicePropertiesCallback): void;
-        getServiceProperties(options: TimeoutIntervalOptions, callback: StorageServicePropertiesCallback): void;
-
-        /**
-        * Sets the properties of a storage account�s Blob service, including Azure Storage Analytics.
-        * You can also use this operation to set the default request version for all incoming requests that do not have a version specified.
-        */
-        setServiceProperties(serviceProperties: StorageServiceProperties, callback: StorageCallbackVoid): void;
-        setServiceProperties(serviceProperties: StorageServiceProperties, options: TimeoutIntervalOptions, callback: StorageCallbackVoid): void;
-
-        //#endregion
-
-        //#region Queue Methods
-
-        /**
-         * Lists all queues under the given account.
-         */
-        listQueues(callback: ListQueuesCallback): void;
-        listQueues(options: ListQueuesOptions, callback: ListQueuesCallback): void;
-
-        /**
-         * Creates a new queue under the given account.
-         */
-        createQueue(queue: string, callback: StorageCallback<QueueResult>): void;
-        createQueue(queue: string, options: MetadataOptions, callback: StorageCallback<QueueResult>): void;
-
-        /**
-         * Creates a new queue under the given account if it doesn't exist.
-         */
-        createQueueIfNotExists(queue: string, callback: StorageCallback<boolean>): void;
-        createQueueIfNotExists(queue: string, options: MetadataOptions, callback: StorageCallback<boolean>): void;
-
-        /**
-         * Permanently deletes the specified queue.
-         */
-        deleteQueue(queue: string, callback: StorageCallback<boolean>): void;
-        deleteQueue(queue: string, options: TimeoutIntervalOptions, callback: StorageCallback<boolean>): void;
-
-        /**
-         * Returns queue properties, including user-defined metadata.
-         */
-        getQueueMetadata(queue: string, callback: StorageCallback<QueueResult>): void;
-        getQueueMetadata(queue: string, options: TimeoutIntervalOptions, callback: StorageCallback<QueueResult>): void;
-
-        /**
-         * Sets user-defined metadata on the specified queue. Metadata is associated with the queue as name-value pairs.
-         */
-        setQueueMetadata(queue: string, metadata: StorageMetadata, callback: StorageCallback<QueueResult>): void;
-        setQueueMetadata(queue: string, metadata: StorageMetadata, options: TimeoutIntervalOptions, callback: StorageCallback<QueueResult>): void;
-
-        //#endregion
-
-        //#region Message Methods
-
-        /**
-         * Adds a new message to the back of the message queue. A visibility timeout can also be specified to make the message
-         * invisible until the visibility timeout expires. A message must be in a format that can be included in an XML request
-         * with UTF-8 encoding. The encoded message can be up to 64KB in size for versions 2011-08-18 and newer, or 8KB in size
-         * for previous versions.
-         */
-        createMessage(queue: string, messageText: string, callback: StorageCallback<QueueMessageResult>): void
-        createMessage(queue: string, messageText: string, options: CreateQueueMessageOptions, callback: StorageCallback<QueueMessageResult>): void
-
-        /**
-         * Retrieves a message from the queue and makes it invisible to other consumers.
-         */
-        getMessages(queue: string, callback: StorageCallback<QueueMessageResult[]>): void;
-        getMessages(queue: string, options: GetQueueMessagesOptions, callback: StorageCallback<QueueMessageResult[]>): void;
-
-        /**
-         * Retrieves a message from the front of the queue, without changing the message visibility.
-         */
-        peekMessages(queue: string, callback: StorageCallback<QueueMessageResult[]>): void;
-        peekMessages(queue: string, options: PeekQueueMessagesOptions, callback: StorageCallback<QueueMessageResult[]>): void;
-
-        /**
-         * Deletes a specified message from the queue.
-         */
-        deleteMessage(queue: string, messageId: string, popreceipt: string, callback: StorageCallback<boolean>): void
-        deleteMessage(queue: string, messageId: string, popreceipt: string, options: TimeoutIntervalOptions, callback: StorageCallback<boolean>): void
-
-        /**
-         * Clears all messages from the queue.
-         */
-        clearMessages(queue: string, callback: StorageCallbackVoid): void;
-        clearMessages(queue: string, options: TimeoutIntervalOptions, callback: StorageCallbackVoid): void;
-
-        /**
-         * Deletes a specified message from the queue.
-         */
-        updateMessage(queue: string, messageId: string, popreceipt: string, visibilitytimeout: number, callback: StorageCallback<QueueMessageResult>): void
-        updateMessage(queue: string, messageId: string, popreceipt: string, visibilitytimeout: number, options: UpdateQueueMessagesOptions, callback: StorageCallback<QueueMessageResult>): void
-
-        //#endregion
-    }
-
-    export class ServiceBusService {
-
-    }
-
-    export class SqlService {
-
-    }
-
-    export class ServiceManagementService {
-
-    }
-
-    export class SqlManagementService {
-    }
-    //#endregion
-
-    //#region Service Creators
-    export function createTableService(): TableService;
-    export function createTableService(connectionString: string): TableService;
-    export function createTableService(storageAccount: string, storageAccessKey: string, host?: string, authenticationProvider?: string): TableService;
-
-    export function createBlobService(): BlobService;
-    export function createBlobService(connectionString: string): BlobService;
-    export function createBlobService(storageAccount: string, storageAccessKey: string, host?: string, authenticationProvider?: string): BlobService;
-
-    export function createQueueService(): QueueService;
-    export function createQueueService(connectionString: string): QueueService;
-    export function createQueueService(storageAccount: string, storageAccessKey: string, host?: string, authenticationProvider?: string): QueueService;
-
-    export function createServiceBusService(): ServiceBusService;
-    export function createServiceBusService(connectionString: string): ServiceBusService;
-    export function createServiceBusService(namespace: string, accessKey?: string, issuer?: string, acsNamespace?: string, host?: string, authenticationProvider?: string): ServiceBusService;
-
-    export function createSqlService(serverName: string, administratorLogin: string, administratorLoginPassword: string, host?: string, acsHost?: string, authenticationProvider?: string): SqlService;
-
-    export function createServiceManagementService(subscriptionId: string, authentication: string, hostOptions: string): ServiceManagementService;
-
-    export function createSqlManagementService(subscriptionId: string, authentication: string, hostOptions: string): SqlManagementService;
-    //#endregion
-
-    //#region RoleEnvironment
-
-    interface RoleEnvironmentInterface extends events.EventEmitter {
-        incorrectCallbackErr: string;
-        clientId: string;
-        VersionEndpointFixedPath: string;
-        EnvironmentVariables: {
-            [key: string]: string;
-            VersionEndpointEnvironmentName: string;
-        };
-
-        /**
-         * Returns a RoleInstance object that represents the role instance
-         * in which this code is currently executing.
-         */
-        getCurrentRoleInstance(callback: SimpleCallback<RoleInstance>): void;
-
-        /**
-         * Returns the deployment ID that uniquely identifies the deployment in
-         * which this role instance is running.
-         */
-        getDeploymentId(callback: SimpleCallback<string>): void;
-
-        /**
-         * Indicates whether the role instance is running in the Microsoft Azure
-         * environment.  It is good practice to enclose any code that uses 
-         * service runtime in the isAvailable callback.
-         */
-        isAvailable(callback: SimpleCallback<boolean>): void;
-
-        /**
-         * Indicates whether the role instance is running in the development fabric.
-         */
-        isEmulated(callback: SimpleCallback<boolean>): void;
-
-        /**
-         * Returns the set of Role objects defined for your service.
-         * Roles are defined in the service definition file.
-         */
-        getRoles(callback: SimpleCallback<Dictionary<Role>>): void;
-
-        /**
-         * Retrieves the settings in the service configuration file.
-         * 
-         * A role's configuration settings are defined in the service definition file.
-         * Values for configuration settings are set in the service configuration file.
-         * For more information on configuration settings, see the [Service Definition Schema](http://msdn.microsoft.com/en-us/library/windowsazure/ee758711.aspx)
-         * and [Service Configuration Schema](http://msdn.microsoft.com/en-us/library/windowsazure/ee758710.aspx).
-         */
-        getConfigurationSettings(callback: SimpleCallback<Dictionary<string>>): void;
-
-        /**
-         * Retrieves the set of named local storage resources, along with the path.
-         * For example, the DiagnosticStore resource which is defined for every role
-         * provides a location for runtime diagnostics and logs.
-         */
-        getLocalResources(callback: SimpleCallback<Dictionary<RoleLocalResource>>): void;
-
-        /**
-         * Requests that the current role instance be stopped and restarted.
-         * 
-         * Before the role instance is recycled, the Microsoft Azure load balancer takes the role instance out of rotation.
-         * This ensures that no new requests are routed to the instance while it is restarting.
-         * 
-         * A call to `RequestRecycle` initiates the normal shutdown cycle. Microsoft Azure raises the
-         * `Stopping` event and calls the `OnStop` method so that you can run the necessary code to
-         * prepare the instance to be recycled.
-         */
-        requestRecycle(callback: ErrorCallback): void;
-
-        /**
-         * Sets the status of the role instance.
-         * 
-         * An instance may indicate that it is in one of two states: Ready or Busy. If an instance's state is Ready, it is
-         * prepared to receive requests from the load balancer. If the instance's state is Busy, it will not receive
-         * requests from the load balancer.
-         */
-        setStatus(roleInstanceStatus: string, expirationUtc: Date, callback: ErrorCallback): void;
-
-        /**
-         * Clears the status of the role instance.
-         * An instance may indicate that it has completed communicating status by calling this method.
-         */
-        clearStatus(callback: ErrorCallback): void;
-    }
-
-    export var RoleEnvironment: RoleEnvironmentInterface;
-
-    //#endregion
-
-    //#region Export of internal classes
-    export class WebResource {
-        rawResponse: boolean;
-        queryString: Dictionary<string>;
-
-        constructor();
-
-        get(path: string): WebResource;
-        put(path: string): WebResource;
-        post(path: string): WebResource;
-        merge(path: string): WebResource;
-        head(path: string): WebResource;
-        del(path: string): WebResource;
-
-        withProperty(name: string, value: string): WebResource;
-        withRawResponse(rawResponse: boolean): WebResource;
-        withHeadersOnly(headersOnly: boolean): WebResource;
-        withQueryOption(name: string, value: string, defaultValue: string): WebResource;
-        withQueryOptions(queryOptions: Dictionary<string>): WebResource;
-        withHeader(name: string, value: string): WebResource;
-        withHeaders(headers: Dictionary<string>): WebResource;
-        withBody(body: any): WebResource;
-        addOptionalMetadataHeaders(metadata: StorageMetadata): WebResource;
-
-        validResponse(statusCode: number): boolean;
-        pipeInput(inputStream: stream.Stream, destStream: stream.Stream): stream.Stream;
-    }
-
-    export class ServiceClient extends events.EventEmitter {
-        static EnvironmentVariables: any;
-        static DEVSTORE_STORAGE_ACCOUNT: string;
-        static DEVSTORE_STORAGE_ACCESS_KEY: string;
-        static DEVSTORE_BLOB_HOST: string;
-        static DEVSTORE_QUEUE_HOST: string;
-        static DEVSTORE_TABLE_HOST: string;
-        static CLOUD_BLOB_HOST: string;
-        static CLOUD_QUEUE_HOST: string;
-        static CLOUD_TABLE_HOST: string;
-        static CLOUD_SERVICEBUS_HOST: string;
-        static CLOUD_ACCESS_CONTROL_HOST: string;
-        static CLOUD_SERVICE_MANAGEMENT_HOST: string;
-        static CLOUD_DATABASE_HOST: string;
-        static DEFAULT_SERVICEBUS_ISSUER: string;
-        static DEFAULT_WRAP_NAMESPACE_SUFFIX: string;
-        static DEFAULT_PROTOCOL: string;
-
-        constructor(host: string, authenticationProvider: any);
-
-        setHost(host: string): void;
-        performRequest(webResource: WebResource, outputData: string, options: any, callback: Function): void;
-        performRequestOutputStream(webResource: WebResource, outputStream: any, options: any, callback: Function): void;
-        performRequestInputStream(webResource: WebResource, outputData: string, inputStream: any, options: any, callback: Function): void;
-        withFilter(newFilter: Filter): ServiceClient;
-        parseMetadataHeaders(headers: any): any;
-        isEmulated(): boolean;
-        setProxy(proxyUrl: string, proxyPort: number): void;
-    }
-
-    export class BatchServiceClient extends StorageServiceClient {
-        operations: any[];
-
-        constructor(storageAccount: string, storageAccessKey: string, host: string, usePathstyleUri: boolean, authenticationProvider: any);
-        beginBatch(): void;
-        isInBatch(): boolean;
-        rollback(): void;
-        hasOperations(): boolean;
-        addOperation(webResource: WebResource, outputData: any): void;
-        commitBatch(callback: (error: any, operationResponses: any[], response: any) => void): void;
-        commitBatch(options: any, callback: (error: any, operationResponses: any[], response: any) => void): void;
-        processResponse(responseObject: any, requestOperations: any[]): any[];
-        processOperation(webResource: WebResource, rawResponse: string): any;
-    }
-
-    export class ServiceManagementClient {
-
-    }
-
-    export class TableQuery {
-        static select(...fields: string[]): TableQuery;
-        from(table: string): TableQuery;
-        whereKeys(partitionKey: string, rowKey: string): TableQuery;
-        whereNextKeys(partitionKey: string, rowKey: string): TableQuery;
-        where(condition: string, ...values: string[]): TableQuery;
-        and(condition: string, ...args: string[]): TableQuery;
-        or(condition: string, ...args: string[]): TableQuery;
-        top(integer: number): TableQuery;
-        toQueryObject(): any;
-        toPath(): string;
-    }
-
-    export class BlobResult {
-        blob: string;
-        container: string;
-
-        etag: string;
-        lastModified: string;
-        contentType: string;
-        contentEncoding: string;
-        contentLanguage: string;
-        contentMD5: string;
-        cacheControl: string;
-        contentRange: string;
-        contentTypeHeader: string;
-        contentEncodingHeader: string;
-        contentLanguageHeader: string;
-        contentMD5Header: string;
-        cacheControlHeader: string;
-        contentLength: number;
-        contentLengthHeader: number;
-        contentDisposition: string;
-        contentDispositionHeader: string;
-        range: string;
-        rangeHeader: string;
-        getContentMd5: string;
-        acceptRanges: string;
-        blobType: string;
-        leaseStatus: string;
-        leaseId: string;
-        leaseDuration: string;
-        leaseState: string;
-        sequenceNumber: string;
-        copyStatus: string;
-        copyCompletionTime: string;
-        copyStatusDescription: string;
-        copyId: string;
-        copyProgress: number;
-        requestId: string;
-
-        metadata: StorageMetadata;
-
-        constructor();
-        constructor(container: string);
-        constructor(container: string, blob: string);
-
-        static parse(blobXml: any): BlobResult;
-        static setHeadersFromBlob(webResource: WebResource, blob: BlobResult): void;
-
-        getPropertiesFromHeaders(headers: any): void;
-    }
-
-    export class ContainerResult {
-        name: string;
-        publicAccessLevel: string;
-
-        etag: string;
-        lastModified: string;
-        leaseStatus: string;
-        leaseDuration: string;
-        leaseState: string;
-        requestId: string;
-
-        metadata: StorageMetadata;
-        signedIdentifiers: SignedIdentifier[];
-
-        constructor();
-        constructor(name: string);
-        constructor(name: string, publicAccessLevel: string);
-
-        static parse(containerXml: any): ContainerResult;
-
-        getPropertiesFromHeaders(headers: any): void;
-    }
-
-    export class LeaseResult {
-        container: string;
-        blob: string;
-        id: string;
-        time: string;
-        etag: string;
-        lastModified: string;
-
-        constructor();
-        constructor(container: string);
-        constructor(container: string, blob: string);
-        constructor(container: string, blob: string, id: string);
-        constructor(container: string, blob: string, id: string, time: string);
-
-        getPropertiesFromHeaders(header: any): void;
-    }
-
-    export class QueueResult {
-        name: string;
-        metadata: StorageMetadata;
-        approximatemessagecount: number;
-
-        constructor();
-        constructor(name: string);
-        constructor(name: string, metadata: StorageMetadata);
-
-        static parse(messageXml: any): QueueResult;
-
-        getPropertiesFromHeaders(headers: any): void;
-    }
-
-    export class QueueMessageResult {
-        queue: string;
-        insertiontime: string;
-        expirationtime: string;
-        timenextvisible: string;
-        messagetext: string;
-        dequeuecount: string;
-        messageid: string;
-        popreceipt: string;
-        metadata: StorageMetadata;
-
-        constructor();
-        constructor(queue: string);
-        constructor(queue: string, messageid: string);
-        constructor(queue: string, messageid: string, popreceipt: string);
-        constructor(queue: string, messageid: string, popreceipt: string, metadata: StorageMetadata);
-
-        static serialize(messageJs: string): string;
-        static parse(messageXml: any): QueueMessageResult;
-
-        getPropertiesFromHeaders(headers: any): void;
-    }
-
-    export class SpeedSummary {
-        name: string;
-        totalSize: number;
-        completeSize: number;
-
-        _startTime: Date;
-        _timeWindowInSeconds: number;
-        _timeWindow: number;
-        _totalWindowSize: number;
-        _speedTracks: number[];
-        _speedTrackPtr: number;
-
-        constructor(name: string);
-
-        /**
-         * Get running seconds
-         */
-        getElapsedSeconds(): string;
-        getElapsedSeconds(humanReadable: boolean): number;
-
-        /**
-         * Get complete percentage
-         */
-        getCompletePercent(): number;
-        getCompletePercent(len: number): number;
-
-        /**
-         * Get average upload/download speed
-         */
-        getAverageSpeed(): string;
-        getAverageSpeed(humanReadable: boolean): number;
-
-        /**
-         * Get internal speed
-         */
-        getSpeed(): string;
-        getSpeed(humanReadable: boolean): number;
-
-        /**
-         * Get auto increment function
-         */
-        getSpeed(size: number): (error: Error, value: any) => void;
-
-        /**
-         * Get total size
-         */
-        getTotalSize(): string;
-        getTotalSize(humanReadable: boolean): number;
-
-        /**
-         * Get completed data size
-         */
-        getCompleteSize(): string;
-        getCompleteSize(humanReadable: boolean): number;
-    }
-
-    export module Constants {
-
-    }
-
-    export interface Filter {
-        handle(requestOptions: any, next: Function): void;
-    }
-
-    export class LinearRetryPolicyFilter implements Filter {
-        constructor(retryCount?: number, retryInterval?: number);
-        retryCount: number;
-        retryInterval: number;
-        handle(requestOptions: any, next: Function): void;
-    }
-
-    export class ExponentialRetryPolicyFilter implements Filter {
-        constructor(retryCount?: number, retryInterval?: number, minRetryInterval?: number, maxRetryInterval?: number);
-        retryCount: number;
-        retryInterval: number;
-        minRetryInterval: number;
-        maxRetryInterval: number;
-        handle(requestOptions: any, next: Function): void;
-    }
-
-    export class HmacSha256Sign {
-
-    }
-
-    export class SharedAccessSignature {
-        storageAccount: string;
-        storageAccessKey: string;
-        permissionSet: string[];
-        signer: HmacSha256Sign;
-
-        constructor(storageAccount: string, storageAccessKey: string, permissionSet: string[])
-
-        /**
-         * Generates the query string for a shared access signature signing.
-         */
-        generateSignedQueryString(path: string, queryString: Dictionary<string>, resourceType: string, sharedAccessPolicy: SharedAccessPolicy): Dictionary<string>;
-
-        /**
-         * Signs a request with the signature header.
-         */
-        signRequest(webResource: WebResource, callback: ErrorCallback): void;
-
-        /**
-         * Generates the shared access signature for a resource.
-         */
-        _generateSignature(path: string, resourceType: string, sharedAccessPolicy: SharedAccessPolicy): string;
-
-        /**
-         * Generates the query string for a shared access signature signing.
-         */
-        _permissionMatchesRequest(sharedAccessSignature: string, webResource: WebResource, resourceType: string, requiredPermissions: string[]): string;
-    }
-
-    export class SharedKey {
-        storageAccount: string;
-        storageAccessKey: string;
-        usePathStyleUri: string;
-        signer: HmacSha256Sign;
-
-        constructor(storageAccount: string, storageAccessKey: string, usePathStyleUri: boolean);
-
-        /**
-         * Signs a request with the Authentication header.
-         */
-        signRequest(webResource: WebResource, callback: ErrorCallback): void;
-
-        /**
-         * Retrieves the webresource's canonicalized resource string.
-         */
-        _getCanonicalizedResource(webResource: WebResource): string;
-
-        /**
-         * Constructs the Canonicalized Headers string.
-         *
-         * To construct the CanonicalizedHeaders portion of the signature string,
-         * follow these steps: 1. Retrieve all headers for the resource that begin
-         * with x-ms-, including the x-ms-date header. 2. Convert each HTTP header
-         * name to lowercase. 3. Sort the headers lexicographically by header name,
-         * in ascending order. Each header may appear only once in the
-         * string. 4. Unfold the string by replacing any breaking white space with a
-         * single space. 5. Trim any white space around the colon in the header. 6.
-         * Finally, append a new line character to each canonicalized header in the
-         * resulting list. Construct the CanonicalizedHeaders string by
-         * concatenating all headers in this list into a single string.
-         */
-        _getCanonicalizedHeaders(webResource: WebResource): string;
-    }
-
-    export class SharedKeyLite {
-        storageAccount: string;
-        storageAccessKey: string;
-        usePathStyleUri: string;
-        signer: HmacSha256Sign;
-
-        constructor(storageAccount: string, storageAccessKey: string, usePathStyleUri: boolean);
-
-        /**
-         * Signs a request with the Authentication header.
-         */
-        signRequest(webResource: WebResource, callback: ErrorCallback): void;
-
-        /**
-         * Retrieves the webresource's canonicalized resource string.
-         */
-        _getCanonicalizedResource(webResource: WebResource): string;
-
-        /**
-         * Constructs the Canonicalized Headers string.
-         *
-         * To construct the CanonicalizedHeaders portion of the signature string,
-         * follow these steps: 1. Retrieve all headers for the resource that begin
-         * with x-ms-, including the x-ms-date header. 2. Convert each HTTP header
-         * name to lowercase. 3. Sort the headers lexicographically by header name,
-         * in ascending order. Each header may appear only once in the
-         * string. 4. Unfold the string by replacing any breaking white space with a
-         * single space. 5. Trim any white space around the colon in the header. 6.
-         * Finally, append a new line character to each canonicalized header in the
-         * resulting list. Construct the CanonicalizedHeaders string by
-         * concatenating all headers in this list into a single string.
-         */
-        _getCanonicalizedHeaders(webResource: WebResource): string;
-    }
-
-    export class SharedKeyTable {
-        storageAccount: string;
-        storageAccessKey: string;
-        usePathStyleUri: string;
-        signer: HmacSha256Sign;
-
-        constructor(storageAccount: string, storageAccessKey: string, usePathStyleUri: boolean);
-
-        /**
-         * Signs a request with the Authentication header.
-         */
-        signRequest(webResource: WebResource, callback: ErrorCallback): void;
-
-        /**
-         * Retrieves the webresource's canonicalized resource string.
-         */
-        _getCanonicalizedResource(webResource: WebResource): string;
-    }
-
-    export class SharedKeyLiteTable {
-        torageAccount: string;
-        storageAccessKey: string;
-        usePathStyleUri: string;
-        signer: HmacSha256Sign;
-
-        constructor(storageAccount: string, storageAccessKey: string, usePathStyleUri: boolean);
-
-        /**
-         * Signs a request with the Authentication header.
-         */
-        signRequest(webResource: WebResource, callback: ErrorCallback): void;
-
-        /**
-         * Retrieves the webresource's canonicalized resource string.
-         */
-        _getCanonicalizedResource(webResource: WebResource): string;
-    }
-
-    export module ISO8061Date {
-        /**
-         * Formats a date into an iso 8061 string.
-         */
-        export function format(date: Date): string;
-
-        /**
-         * Parses an ISO 8061 date string into a date object.
-         */
-        export function parse(stringDateTime: string): Date;
-    }
-
-    export class Logger {
-        level: string;
-        loggerFunction: (level: string, message: string) => void;
-
-        static LogLevels: {
-            EMERGENCY: string;
-            ALERT: string;
-            CRITICAL: string;
-            ERROR: string;
-            WARNING: string;
-            NOTICE: string;
-            INFO: string;
-            DEBUG: string;
-        };
-        static logPriority: string[];
-
-        log(level: string, message: string): void;
-        emergency(message: string): void;
-        alert(message: string): void;
-        critical(message: string): void;
-        error(message: string): void;
-        warning(message: string): void;
-        notice(message: string): void;
-        info(message: string): void;
-        debug(message: string): void;
-
-        defaultLoggerFunction(level: string, message: string): void;
-    }
-
-    export class ConnectionStringParser {
-        _value: string;
-        _pos: number;
-        _state: string;
-
-        constructor(connectionString: string);
-
-        _parse(options: ConnectionStringParseOptions): Dictionary<string>;
-
-        _extractKey(): string;
-        _extractString(quote: string): string;
-        _extractValue(): string;
-
-        _skipWhitespaces(): void;
-        _skipOperator(operator: string): void;
-
-        static parse(connectionString: string): Dictionary<string>;
-    }
-
-    export module ServiceSettings {
-        export var DEFAULT_PROTOCOL: string;
-
-        export class NoMatchError implements Error {
-            name: string;
-            message: string;
-            constr: any;
-
-            constructor();
-            constructor(message: string);
-            constructor(message: string, constr: any);
-        }
-
-        /**
-         * Throws an exception if the connection string format does not match any of the
-         * available formats.
-         */
-        export function noMatchConnectionString(connectionString: string): void;
-
-        /**
-         * Throws an exception if the settings dont match any of the available formats.
-         */
-        export function noMatchSettings(settings: any): void;
-
-        /**
-         * Parses the connection string and then validate that the parsed keys belong to
-         * the validSettingKeys
-         */
-        export function parseAndValidateKeys(connectionString: string, validKeys: string[]): string[];
-
-        /**
-         * Creates an anonymous function that acts as predicate to perform a validation.
-         */
-        export function getValidator(requirements: Dictionary<Requirement>, isRequired: boolean, atLeastOne: boolean): ValidatorFunction;
-
-        /**
-         * Creates a setting value condition that validates it is one of the passed valid values.
-         */
-        export function setting(name: string): string[];
-
-        /**
-         * Creates an "at least one" predicate for the provided list of requirements.
-         */
-        export function atLeastOne(...args: any[]): ValidatorFunction;
-
-        /**
-         * Creates an optional predicate for the provided list of requirements.
-         */
-        export function optional(...args: any[]): ValidatorFunction;
-
-        /**
-         * Creates an required predicate for the provided list of requirements.
-         */
-        export function allRequired(...args: any[]): ValidatorFunction;
-
-        /**
-         * Creates a setting value condition using the passed predicate.
-         */
-        export function settingWithFunc(name: string, predicate: Function): Requirement[];
-
-        /**
-         * Tests to see if a given list of settings matches a set of filters exactly.
-         */
-        export function matchedSpecification(settings: Dictionary<any>): boolean;
-
-        /**
-         * Tests to see if a given list of settings matches a set of filters exactly.
-         */
-        export function parseHost(uri: string): url.Url;
-    }
-
-    export class StorageServiceSettings {
-        _name: string;
-        _key: string;
-        _blobEndpointUri: string;
-        _queueEndpointUri: string;
-        _tableEndpointUri: string;
-        _usePathStyleUri: boolean;
-
-        constructor(name: string, key: string, blobEndpointUri: string, queueEndpointUri: string, tableEndpointUri: string, usePathStyleUri: boolean);
-
-        /**
-         * Returns a StorageServiceSettings with development storage credentials using
-         * the specified proxy Uri.
-         */
-        static _getDevelopmentStorageAccount(): StorageServiceSettings;
-        static _getDevelopmentStorageAccount(proxy: string): StorageServiceSettings;
-
-        /**
-         * Gets a StorageServiceSettings object that references the development storage
-         * account.
-         */
-        static getDevelopmentStorageAccountSettings(): StorageServiceSettings;
-
-        /**
-         * Gets the default service endpoint using the specified protocol and account
-         * name.
-         */
-        static _getDefaultServiceEndpoint(settings: Dictionary<string>, dns: string): string;
-
-        /**
-         * Creates StorageServiceSettings object given endpoints uri.
-         */
-        static _createStorageServiceSettings(settings: Dictionary<string>, blobEndpointUri: string, queueEndpointUri: string, tableEndpointUri: string): StorageServiceSettings;
-
-        /**
-         * Creates a ServiceBusSettings object from a set of settings.
-         */
-        static createFromSettings(settings: Dictionary<string>): StorageServiceSettings;
-
-        /**
-         * Creates a StorageServiceSettings object from the given connection string.
-         */
-        static createFromConnectionString(connectionString: string): StorageServiceSettings;
-
-        static createExplicitlyOrFromEnvironment(storageAccount: string, storageAccessKey: string, host: string): StorageServiceSettings;
-
-        static isDevelopmentStorage(storageAccount: string, storageAccessKey: string, parsedHost: string): boolean;
-
-        static createFromConfig(config: any): StorageServiceSettings;
-
-        static customizeConfig(config: any): void;
-    }
-
-    export class ServiceBusSettings {
-
-    }
-
-    export class ServiceManagementSettinsg {
-
-    }
-
-    export module Validate {
-        /**
-         * Checks if the given uri is valid or not.
-         */
-        export function isValidUri(uri: string): boolean;
-
-        /**
-         * Validates that a clusterCreationObject is properly formed.
-         */
-        export function isValidHDInsightCreationObject(clusterCreationObject: ClusterCreationOptions): void;
-        export function isValidHDInsightCreationObject(clusterCreationObject: ClusterCreationOptions, callback: ErrorCallback): void;
-
-        export function isValidUuid(uuid: string): void;
-        export function isValidUuid(uuid: string, callback: ErrorCallback): void;
-
-        /**
-         * Creates a anonymous function that check if a given key is base 64 encoded.
-         */
-        export function isBase64Encoded(key: string): boolean;
-
-        /**
-         * Validates a function.
-         */
-        export function isValidFunction(functionObject: any, functionName: string): void;
-
-        /**
-         * Validates that a Service Bus namespace name
-         * is legally allowable. Does not check availability.
-         */
-        export function namespaceNameIsValid(name: string): boolean;
-        export function namespaceNameIsValid(name: string, callback: ErrorCallback): boolean;
-
-        /**
-         * Validates a container name.
-         */
-        export function containerNameIsValid(containerName: string): boolean;
-        export function containerNameIsValid(containerName: string, callback: ErrorCallback): boolean;
-
-        /**
-         * Validates a blob name.
-         */
-        export function blobNameIsValid(containerName: string, blob: string): boolean;
-        export function blobNameIsValid(containerName: string, blob: string, callback: ErrorCallback): boolean;
-
-        /**
-         * Validates a table name.
-         */
-        export function tableNameIsValid(tableName: string): boolean;
-        export function tableNameIsValid(tableName: string, callback: ErrorCallback): boolean;
-
-        /**
-         * Validates a queue name.
-         */
-        export function queueNameIsValid(queueName: string): boolean;
-        export function queueNameIsValid(queueName: string, callback: ErrorCallback): boolean;
-
-        export function pageRangesAreValid(rangeStart: number, rangeEnd: number, writeBlockSizeInBytes: number): boolean;
-        export function pageRangesAreValid(rangeStart: number, rangeEnd: number, writeBlockSizeInBytes: number, callback: ErrorCallback): boolean;
-
-        export function validateArgs(functionName: string, validationRules: Function): boolean;
-    }
-
-    export module date {
-        /**
-         * Generates a Date object which is in the given days from now.
-         */
-        export function daysFromNow(days: number): Date;
-
-        /**
-         * Generates a Date object which is in the given hours from now.
-         */
-        export function hoursFromNow(hours: number): Date;
-
-        /**
-         * Generates a Date object which is in the given minutes from now.
-         */
-        export function minutesFromNow(minutes: number): Date;
-
-        /**
-         * Generates a Date object which is in the given seconds from now.
-         */
-        export function secondsFromNow(seconds: number): Date;
-    }
-    //#endregion
-
-    //#region Non-explicit, undeclared interfaces
-    export interface WebResponse {
-        isSuccessful: boolean;
-        statusCode: number;
-        body: {
-            entry: {
-                id: string;
-                title: any;
-                updated: string;
-                author: {
-                    name: any;
-                };
-                link: any;
-                category: any;
-                content: any;
-            };
-        };
-        headers: any;
-        md5: any;
-    }
-
-    //#region Common Interfaces
-    export interface SimpleCallback<T> {
-        (error: Error, result: T): void;
-    }
-    export interface ErrorCallback {
-        (error: Error): void;
-    }
-    export interface StorageCallbackVoid {
-        (err: Error, response: WebResponse): void;
-    }
-    export interface StorageCallback<T> {
-        (err: Error, result: T, response: WebResponse): void;
-    }
-    export interface StorageServiceStatsCallback extends StorageCallback<StorageServiceStats> { }
-    export interface StorageServicePropertiesCallback extends StorageCallback<StorageServiceProperties> { }
-
-    export interface TimeoutIntervalOptions {
-        locationMode?: string;
-        timeoutIntervalInMs?: number;
-        maximumExecutionTimeInMs?: number;
-    }
-    export interface MetadataOptions extends TimeoutIntervalOptions {
-        metadata?: StorageMetadata;
-    }
-    export interface StorageAclOptions extends TimeoutIntervalOptions {
-        leaseId?: string;
-        signedIdentifiers: SignedIdentifier[]
-    }
-
-    export interface Dictionary<T> {
-        [key: string]: T;
-    }
-    export interface StorageServiceProperties {
-        Logging: {
-            Version: number;
-            Delete: boolean;
-            Read: boolean;
-            Write: boolean;
-            RetentionPolicy: {
-                Enabled: boolean;
-                Days: number;
-            };
-        };
-        Metrics: {
-            Version: number;
-            Enabled: boolean;
-            IncludeAPIs: boolean;
-            RetentionPolicy: {
-                Enabled: boolean;
-                Days: number;
-            };
-        };
-        DefaultServiceVersion: string;
-    }
-    export interface StorageServiceStats {
-        GeoReplication: {
-            Status: string;
-            LastSyncTime: Date;
-        }
-    }
-    export interface SignedIdentifier {
-        Id: string;
-        AccessPolicy: SharedAccessPolicy;
-    }
-    export interface StorageMetadata {
-        [key: string]: string;
-    }
-    export interface ContinuationToken {
-        nextMarker: string;
-        targetLocation: string;
-    }
-    export interface SharedAccessPolicy {
-        Id?: string;
-        AccessPolicy: {
-            Start?: Date;
-            Expiry: Date;
-            Permission?: string;
-        }
-    }
-    //#endregion
-    //#region TableService Interfaces
-    export interface TableRequestCallback {
-        (error: Error, tableResult: { TableName: string; }, response: WebResponse): void;
-    }
-
-    export interface CreateTableIfNotExistsCallback {
-        (error: Error, created: boolean, response: WebResponse): void;
-    }
-
-    export interface DeleteTableCallback {
-        (error: Error, successful: boolean, response: WebResponse): void;
-    }
-
-    export interface QueryTablesCallback {
-        (error: Error, queryTablesResult: TableResult[], resultsContinuation: QueryResultContinuation, response: WebResponse): void;
-    }
-
-    export interface QueryResultContinuation {
-        tableService: TableService;
-    }
-
-    export interface QueryTablesOptions extends TimeoutIntervalOptions {
-        nextTableName?: string;
-    }
-
-    export interface TableResult {
-        TableName: string;
-    }
-
-    export interface QueryEntityCallback {
-        (error: Error, entity: Entity, response: WebResponse): void;
-    }
-
-    export interface QueryEntitiesCallback {
-        (error: Error, entities: Entity[], resultContinuation: QueryEntitiesResultContinuation, response: WebResponse): void;
-    }
-
-    export interface QueryEntitiesResultContinuation extends QueryResultContinuation {
-        tableQuery: TableQuery;
-        nextPartitionKey: string;
-        nextRowKey: string;
-        getNextPage(callback?: QueryEntitiesCallback): void;
-        hasNextPage(): boolean;
-    }
-
-    export interface ModifyEntityCallback {
-        (error: Error, entity: Entity, response: WebResponse): void;
-    }
-
-    export interface DeleteEntityCallback {
-        (error: Error, successful: boolean, response: WebResponse): void;
-    }
-
-    export interface UpdateEntityOptions extends TimeoutIntervalOptions {
-        checkEtag?: boolean;
-    }
-
-    export interface Entity {
-        PartitionKey: string;
-        RowKey: string;
-        Timestamp?: Date;
-        etag?: string;
-        [property: string]: string | number | boolean | Date;
-    }
-    //#endregion
-    //#region BlobService Interfaces
-    export interface LeaseIdOptions extends TimeoutIntervalOptions {
-        leaseId?: string;
-    }
-    export interface AccessConditionsOptions extends TimeoutIntervalOptions {
-        accessConditions?: StorageAccessCondition;
-    }
-    export interface LeaseAccessConditionsOptions extends LeaseIdOptions {
-        accessConditions?: StorageAccessCondition;
-    }
-
-    export interface ListContainersOptions extends TimeoutIntervalOptions {
-        prefix?: string;
-        maxresults?: number;
-        marker: string;
-        include?: string;
-    }
-    export interface ListContainersCallback {
-        (err: Error, containers: ContainerResult[], continuationToken: ContinuationToken, response: WebResponse): void;
-    }
-    export interface CreateContainerOptions extends TimeoutIntervalOptions {
-        metadata?: StorageMetadata;
-        publicAccessLevel?: string;
-    }
-    export interface GetContainerPropertiesOptions extends TimeoutIntervalOptions {
-        leaseId?: string;
-    }
-    export interface GetContainerMetadataOptions extends GetContainerPropertiesOptions {
-        accessConditions?: StorageAccessCondition;
-    }
-
-    export interface ListBlobsOptions extends ListContainersOptions {
-        prefix?: string;
-        delimiter?: string;
-    }
-    export interface ListBlobsCallback {
-        (err: Error, blobs: BlobResult[], continuationToken: ContinuationToken, response: WebResponse): void;
-    }
-    export interface GetBlobPropertiesOptions extends LeaseAccessConditionsOptions {
-        snapshotId?: string;
-    }
-    export interface SetBlobPropertiesOptions extends LeaseAccessConditionsOptions {
-        contentType?: string;
-        contentEncoding?: string;
-        contentLanguage?: string;
-        contentMD5?: string;
-        cacheControl?: string;
-        contentDisposition?: string;
-    }
-    export interface ReadBlobOptions extends GetBlobPropertiesOptions {
-        rangeStart?: string;
-        rangeEnd?: string;
-        useTransactionalMD5?: boolean;
-        disableContentMD5Validation?: boolean;
-    }
-    export interface GetBlobToTextCallback {
-        (err: Error, text: string, result: BlobResult, response: WebResponse): void;
-    }
-    export interface DeleteBlobOptions extends GetBlobPropertiesOptions {
-        deleteSnapshots?: string;
-    }
-    export interface BlobSnapshotOptions extends GetBlobPropertiesOptions {
-        metadata?: StorageMetadata;
-    }
-    export interface CopyBlobOptions extends BlobSnapshotOptions {
-        sourceLeaseId?: string;
-        sourceAccessConditions: StorageAccessCondition;
-    }
-
-    export interface UploadBlobOptions extends SetBlobPropertiesOptions {
-        metadata?: StorageMetadata;
-        speedSummary?: SpeedSummary;
-        parallelOperationThreadCount?: number;
-        storeBlobContentMD5?: boolean;
-        useTransactionalMD5?: boolean;
-    }
-    export interface CreatePagesOptions extends LeaseAccessConditionsOptions {
-        contentMD5?: string;
-        useTransactionalMD5?: boolean;
-    }
-    export interface PageRangeOptions extends LeaseIdOptions {
-        snapshotId?: string;
-        rangeStart?: number;
-        rangeEnd?: number;
-    }
-
-    export interface UploadBlockBlobOptions extends UploadBlobOptions {
-        blockIdPrefix?: string;
-    }
-    export interface CreateBlockOptions extends LeaseAccessConditionsOptions {
-        contentMD5?: string;
-        useTransactionalMD5?: boolean;
-    }
-
-    export interface LeaseOptions extends AccessConditionsOptions {
-        leaseDuration?: string;
-        proposedLeaseId?: string;
-    }
-    export interface BreakLeaseOptions extends AccessConditionsOptions {
-        leaseBreakPeriod?: number;
-    }
-
-    export interface SharedAccessSignatureResult {
-        baseUrl: string;
-        path: string;
-        queryString: {
-            se: string;
-            sp: string;
-            sr: string;
-            sv: string;
-            sig: string;
-        };
-        url: () => string;
-    }
-    export interface BlobHeaders {
-        cacheControl?: string;
-        contentType?: string;
-        contentEncoding?: string;
-        contentLanguage?: string;
-        contentDisposition?: string;
-    }
-    export interface PageRange {
-        start: number;
-        end: number;
-    }
-    export interface BlockList {
-        LatestBlocks: string[];
-        CommittedBlocks: string[];
-        UncommittedBlocks: string[];
-    }
-    export interface StorageAccessCondition {
-        "If-Modified-Since": Date;
-        "If-Unmodified-Since": Date;
-        "If-Match": string;
-        "If-None-Match": string;
-    }
-    //#endregion
-    //#region QueueService Interfaces
-    export interface ListQueuesOptions extends TimeoutIntervalOptions {
-        prefix?: string;
-        maxresults?: number;
-        marker: string;
-        include?: string;
-    }
-    export interface ListQueuesCallback {
-        (err: Error, queues: QueueResult[], continuationToken: ContinuationToken, response: WebResponse): void;
-    }
-
-    export interface CreateQueueMessageOptions extends TimeoutIntervalOptions {
-        messagettl?: number;
-        visibilitytimeout?: number;
-    }
-    export interface PeekQueueMessagesOptions extends TimeoutIntervalOptions {
-        numofmessages?: number;
-    }
-    export interface GetQueueMessagesOptions extends PeekQueueMessagesOptions {
-        peekonly?: boolean;
-        visibilitytimeout?: number;
-    }
-    export interface UpdateQueueMessagesOptions extends TimeoutIntervalOptions {
-        messagetext?: string;
-    }
-    //#endregion
-
-    //#region RoleEnvironment Interfaces
-    export interface Role {
-        name: string;
-        instances: {
-            [instanceId: string]: RoleInstance;
-        };
-    }
-    export interface RoleInstance {
-        id: string;
-        faultDomain: string;
-        updateDomain: string;
-        endpoints: {
-            [endpoint: string]: RoleInstanceEndpoint
-        };
-    }
-    export interface RoleInstanceEndpoint {
-        protocol: string;
-        address: string;
-        port: number;
-    }
-    export interface RoleLocalResource {
-        name: string;
-        path: string;
-        maximumSizeInMegabytes: number;
-    }
-    //#endregion
-    //#region ConnectionStringParser Interfaces
-    export interface ConnectionStringParseOptions {
-        skipLowerCase: boolean;
-    }
-    //#endregion
-    //#region Validate Interfaces
-    export interface ClusterCreationOptions {
-        name: string;
-        location: string;
-        defaultStorageAccountName: string;
-        defaultStorageAccountKey: string;
-        defaultStorageContainer: string;
-        user: string;
-        password: string;
-        nodes: number;
-        additionalStorageAccounts?: {
-            name: string;
-            key: string;
-        }[];
-        oozieMetastore?: {
-            server: string;
-            database: string;
-            user: string;
-            password: string;
-        };
-        hiveMetastore?: {
-            server: string;
-            database: string;
-            user: string;
-            password: string;
-        };
-    }
-    //#endregion
-    //#region ServiceSettings Interfaces
-    export interface Requirement {
-        SettingName: string;
-        SettingPredicate: Function;
-    }
-    export interface ValidatorFunction {
-        (userSettings: Dictionary<any>): any;
-    }
-    //#endregion
-    //#endregion
-
-    //#region Un-exported internal classes
-    class StorageServiceClient extends ServiceClient {
-        static incorrectStorageAccountErr: string;
-        static incorrectStorageAccessKeyErr: string;
-        static getStorageSettings(connectionString: string): StorageServiceSettings;
-        static getStorageSettings(storageAccount?: string, storageAccessKey?: string, host?: string): StorageServiceSettings;
-
-        apiVersion: string;
-        usePathStyleUri: string;
-
-        constructor(storageAccount: string, storageAccessKey: string, host: string, usePathStyleUri: boolean, authenticationProvider: any);
-    }
-    //#endregion
-
-    export function isEmulated(): boolean;
-}
diff --git a/node-cache/index.d.ts b/node-cache/index.d.ts
new file mode 100644
index 0000000000..32b4139f7a
--- /dev/null
+++ b/node-cache/index.d.ts
@@ -0,0 +1,262 @@
+// Type definitions for node-cache v3.0.0
+// Project: https://github.com/tcs-de/nodecache
+// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare namespace NodeCache {
+	interface NodeCache {
+		/** container for cached data */
+		data: Data;
+
+		/** module options */
+		options: Options;
+
+		/** statistics container */
+		stats: Stats;
+
+		/**
+		 * get a cached key and change the stats
+		 *
+		 * @param key cache key or an array of keys
+		 * @param cb Callback function
+		 */
+		get<T>(
+			key: string,
+			cb?: Callback<T>
+		): T;
+
+		/**
+		 * get multiple cached keys at once and change the stats
+		 *
+		 * @param keys an array of keys
+		 * @param cb Callback function
+		 */
+		mget<T>(
+			keys: string[],
+			cb?: Callback<{[key: string]: T}>
+		): {[key: string]: T};
+
+		/**
+		 * set a cached key and change the stats
+		 *
+		 * @param key cache key
+		 * @param value A element to cache. If the option `option.forceString` is `true` the module trys to translate
+		 * it to a serialized JSON
+		 * @param ttl The time to live in seconds.
+		 * @param cb Callback function
+		 */
+		set<T>(
+			key: string,
+			value: T,
+			ttl: number|string,
+			cb?: Callback<boolean>
+		): boolean;
+
+		set<T>(
+			key: string,
+			value: T,
+			cb?: Callback<boolean>
+		): boolean;
+
+		/**
+		 * remove keys
+		 * @param keys cache key to delete or a array of cache keys
+		 * @param cb Callback function
+		 * @returns Number of deleted keys
+		 */
+		del(
+			keys: string|string[],
+			cb?: Callback<number>
+		): number;
+
+		/**
+		 * reset or redefine the ttl of a key. If `ttl` is not passed or set to 0 it's similar to `.del()`
+		 */
+		ttl(
+			key: string,
+			ttl: number,
+			cb?: Callback<boolean>
+		): boolean;
+
+		ttl(
+			key: string,
+			cb?: Callback<boolean>,
+			ttl?: number
+		): boolean;
+
+		/**
+		 * list all keys within this cache
+		 * @param cb Callback function
+		 * @returns An array of all keys
+		 */
+		keys(cb?: Callback<string[]>): string[];
+
+		/**
+		 * get the stats
+		 *
+		 * @returns Stats data
+		 */
+		getStats(): Stats;
+
+		/**
+		 * flush the hole data and reset the stats
+		 */
+		flushAll(): void;
+
+		/**
+		 * This will clear the interval timeout which is set on checkperiod option.
+		 */
+		close(): void;
+	}
+
+	interface Data {
+		[key: string]: WrappedValue<any>;
+	}
+
+	interface Options {
+		forceString: boolean;
+		objectValueSize: number;
+		arrayValueSize: number;
+		stdTTL: number;
+		checkperiod: number;
+		useClones: boolean;
+	}
+
+	interface Stats {
+		hits: number;
+		misses: number;
+		keys: number;
+		ksize: number;
+		vsize: number;
+	}
+
+	interface WrappedValue<T> {
+		// ttl
+		t: number;
+		// value
+		v: T;
+	}
+
+	interface Callback<T> {
+		(err: any, data: T): void;
+	}
+}
+
+import events = require("events");
+
+import Data = NodeCache.Data;
+import Options = NodeCache.Options;
+import Stats = NodeCache.Stats;
+import Callback = NodeCache.Callback;
+
+declare class NodeCache extends events.EventEmitter implements NodeCache.NodeCache {
+	/** container for cached data */
+	data: Data;
+
+	/** module options */
+	options: Options;
+
+	/** statistics container */
+	stats: Stats;
+
+	constructor(options?: Options);
+
+	/**
+	 * get a cached key and change the stats
+	 *
+	 * @param key cache key or an array of keys
+	 * @param cb Callback function
+	 */
+	get<T>(
+		key: string,
+		cb?: Callback<T>
+	): T;
+
+	/**
+	 * get multiple cached keys at once and change the stats
+	 *
+	 * @param keys an array of keys
+	 * @param cb Callback function
+	 */
+	mget<T>(
+		keys: string[],
+		cb?: Callback<{[key: string]: T}>
+	): {[key: string]: T};
+
+	/**
+	 * set a cached key and change the stats
+	 *
+	 * @param key cache key
+	 * @param value A element to cache. If the option `option.forceString` is `true` the module trys to translate
+	 * it to a serialized JSON
+	 * @param ttl The time to live in seconds.
+	 * @param cb Callback function
+	 */
+	set<T>(
+		key: string,
+		value: T,
+		ttl: number|string,
+		cb?: Callback<boolean>
+	): boolean;
+
+	set<T>(
+		key: string,
+		value: T,
+		cb?: Callback<boolean>
+	): boolean;
+
+	/**
+	 * remove keys
+	 * @param keys cache key to delete or a array of cache keys
+	 * @param cb Callback function
+	 * @returns Number of deleted keys
+	 */
+	del(
+		keys: string|string[],
+		cb?: Callback<number>
+	): number;
+
+	/**
+	 * reset or redefine the ttl of a key. If `ttl` is not passed or set to 0 it's similar to `.del()`
+	 */
+	ttl(
+		key: string,
+		ttl: number,
+		cb?: Callback<boolean>
+	): boolean;
+
+	ttl(
+		key: string,
+		cb?: Callback<boolean>,
+		ttl?: number
+	): boolean;
+
+	/**
+	 * list all keys within this cache
+	 * @param cb Callback function
+	 * @returns An array of all keys
+	 */
+	keys(cb?: Callback<string[]>): string[];
+
+	/**
+	 * get the stats
+	 *
+	 * @returns Stats data
+	 */
+	getStats(): Stats;
+
+	/**
+	 * flush the hole data and reset the stats
+	 */
+	flushAll(): void;
+
+	/**
+	 * This will clear the interval timeout which is set on checkperiod option.
+	 */
+	close(): void;
+}
+
+export = NodeCache;
+
diff --git a/node-cache/node-cache-tests.ts b/node-cache/node-cache-tests.ts
index a61ec6c897..7f5f917c07 100644
--- a/node-cache/node-cache-tests.ts
+++ b/node-cache/node-cache-tests.ts
@@ -1,10 +1,10 @@
-/// <reference path="./node-cache.d.ts" />
+
 
 import NodeCache = require('node-cache');
 
-import Options = NodeCacheTypes.Options;
-import Stats = NodeCacheTypes.Stats;
-import Callback = NodeCacheTypes.Callback;
+import Options = NodeCache.Options;
+import Stats = NodeCache.Stats;
+import Callback = NodeCache.Callback;
 
 interface TypeSample {
 	a: number;
@@ -14,7 +14,7 @@ interface TypeSample {
 
 {
 	let options: Options;
-	let cache: NodeCacheTypes.NodeCache;
+	let cache: NodeCache.NodeCache;
 	cache = new NodeCache();
 	cache = new NodeCache(options);
 }
diff --git a/node-cache/node-cache.d.ts b/node-cache/node-cache.d.ts
deleted file mode 100644
index c599a7df16..0000000000
--- a/node-cache/node-cache.d.ts
+++ /dev/null
@@ -1,263 +0,0 @@
-// Type definitions for node-cache v3.0.0
-// Project: https://github.com/tcs-de/nodecache
-// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare namespace NodeCacheTypes {
-	interface NodeCache {
-		/** container for cached data */
-		data: Data;
-
-		/** module options */
-		options: Options;
-
-		/** statistics container */
-		stats: Stats;
-
-		/**
-		 * get a cached key and change the stats
-		 *
-		 * @param key cache key or an array of keys
-		 * @param cb Callback function
-		 */
-		get<T>(
-			key: string,
-			cb?: Callback<T>
-		): T;
-
-		/**
-		 * get multiple cached keys at once and change the stats
-		 *
-		 * @param keys an array of keys
-		 * @param cb Callback function
-		 */
-		mget<T>(
-			keys: string[],
-			cb?: Callback<{[key: string]: T}>
-		): {[key: string]: T};
-
-		/**
-		 * set a cached key and change the stats
-		 *
-		 * @param key cache key
-		 * @param value A element to cache. If the option `option.forceString` is `true` the module trys to translate
-		 * it to a serialized JSON
-		 * @param ttl The time to live in seconds.
-		 * @param cb Callback function
-		 */
-		set<T>(
-			key: string,
-			value: T,
-			ttl: number|string,
-			cb?: Callback<boolean>
-		): boolean;
-
-		set<T>(
-			key: string,
-			value: T,
-			cb?: Callback<boolean>
-		): boolean;
-
-		/**
-		 * remove keys
-		 * @param keys cache key to delete or a array of cache keys
-		 * @param cb Callback function
-		 * @returns Number of deleted keys
-		 */
-		del(
-			keys: string|string[],
-			cb?: Callback<number>
-		): number;
-
-		/**
-		 * reset or redefine the ttl of a key. If `ttl` is not passed or set to 0 it's similar to `.del()`
-		 */
-		ttl(
-			key: string,
-			ttl: number,
-			cb?: Callback<boolean>
-		): boolean;
-
-		ttl(
-			key: string,
-			cb?: Callback<boolean>,
-			ttl?: number
-		): boolean;
-
-		/**
-		 * list all keys within this cache
-		 * @param cb Callback function
-		 * @returns An array of all keys
-		 */
-		keys(cb?: Callback<string[]>): string[];
-
-		/**
-		 * get the stats
-		 *
-		 * @returns Stats data
-		 */
-		getStats(): Stats;
-
-		/**
-		 * flush the hole data and reset the stats
-		 */
-		flushAll(): void;
-
-		/**
-		 * This will clear the interval timeout which is set on checkperiod option.
-		 */
-		close(): void;
-	}
-
-	interface Data {
-		[key: string]: WrappedValue<any>;
-	}
-
-	interface Options {
-		forceString: boolean;
-		objectValueSize: number;
-		arrayValueSize: number;
-		stdTTL: number;
-		checkperiod: number;
-		useClones: boolean;
-	}
-
-	interface Stats {
-		hits: number;
-		misses: number;
-		keys: number;
-		ksize: number;
-		vsize: number;
-	}
-
-	interface WrappedValue<T> {
-		// ttl
-		t: number;
-		// value
-		v: T;
-	}
-
-	interface Callback<T> {
-		(err: any, data: T): void;
-	}
-}
-
-declare module "node-cache" {
-	import events = require("events");
-
-	import Data = NodeCacheTypes.Data;
-	import Options = NodeCacheTypes.Options;
-	import Stats = NodeCacheTypes.Stats;
-	import Callback = NodeCacheTypes.Callback;
-
-	class NodeCache extends events.EventEmitter implements NodeCacheTypes.NodeCache {
-		/** container for cached data */
-		data: Data;
-
-		/** module options */
-		options: Options;
-
-		/** statistics container */
-		stats: Stats;
-
-		constructor(options?: Options);
-
-		/**
-		 * get a cached key and change the stats
-		 *
-		 * @param key cache key or an array of keys
-		 * @param cb Callback function
-		 */
-		get<T>(
-			key: string,
-			cb?: Callback<T>
-		): T;
-
-		/**
-		 * get multiple cached keys at once and change the stats
-		 *
-		 * @param keys an array of keys
-		 * @param cb Callback function
-		 */
-		mget<T>(
-			keys: string[],
-			cb?: Callback<{[key: string]: T}>
-		): {[key: string]: T};
-
-		/**
-		 * set a cached key and change the stats
-		 *
-		 * @param key cache key
-		 * @param value A element to cache. If the option `option.forceString` is `true` the module trys to translate
-		 * it to a serialized JSON
-		 * @param ttl The time to live in seconds.
-		 * @param cb Callback function
-		 */
-		set<T>(
-			key: string,
-			value: T,
-			ttl: number|string,
-			cb?: Callback<boolean>
-		): boolean;
-
-		set<T>(
-			key: string,
-			value: T,
-			cb?: Callback<boolean>
-		): boolean;
-
-		/**
-		 * remove keys
-		 * @param keys cache key to delete or a array of cache keys
-		 * @param cb Callback function
-		 * @returns Number of deleted keys
-		 */
-		del(
-			keys: string|string[],
-			cb?: Callback<number>
-		): number;
-
-		/**
-		 * reset or redefine the ttl of a key. If `ttl` is not passed or set to 0 it's similar to `.del()`
-		 */
-		ttl(
-			key: string,
-			ttl: number,
-			cb?: Callback<boolean>
-		): boolean;
-
-		ttl(
-			key: string,
-			cb?: Callback<boolean>,
-			ttl?: number
-		): boolean;
-
-		/**
-		 * list all keys within this cache
-		 * @param cb Callback function
-		 * @returns An array of all keys
-		 */
-		keys(cb?: Callback<string[]>): string[];
-
-		/**
-		 * get the stats
-		 *
-		 * @returns Stats data
-		 */
-		getStats(): Stats;
-
-		/**
-		 * flush the hole data and reset the stats
-		 */
-		flushAll(): void;
-
-		/**
-		 * This will clear the interval timeout which is set on checkperiod option.
-		 */
-		close(): void;
-	}
-
-	export = NodeCache;
-}
diff --git a/node-cache/tsconfig.json b/node-cache/tsconfig.json
new file mode 100644
index 0000000000..22f9ab749a
--- /dev/null
+++ b/node-cache/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-cache-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-calendar/node-calendar.d.ts b/node-calendar/index.d.ts
similarity index 100%
rename from node-calendar/node-calendar.d.ts
rename to node-calendar/index.d.ts
diff --git a/node-calendar/node-calendar-tests.ts b/node-calendar/node-calendar-tests.ts
index 6b065e4c28..d702a91482 100644
--- a/node-calendar/node-calendar-tests.ts
+++ b/node-calendar/node-calendar-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="node-calendar" />
 
 import node_calendar = require('node-calendar');
 
diff --git a/node-calendar/tsconfig.json b/node-calendar/tsconfig.json
new file mode 100644
index 0000000000..f60c618f36
--- /dev/null
+++ b/node-calendar/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-calendar-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-config-manager/index.d.ts b/node-config-manager/index.d.ts
new file mode 100644
index 0000000000..748da75066
--- /dev/null
+++ b/node-config-manager/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for node-config-manager 1.0.2
+// Project: https://www.npmjs.com/package/node-config-manager
+// Definitions by: TANAKA Koichi <https://gitnub.com/mugeso/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface Options {
+    configDir: string;
+    env: string;
+    camelCase: boolean;
+}
+
+interface ConfigManager {
+    init(options: Options): ConfigManager;
+    set(key: string, value: string | boolean): ConfigManager;
+    get(key: string): string | boolean;
+    addConfig(configName: string): ConfigManager;
+    getConfig(configName: string): any;
+    removeConfig(configName: string): ConfigManager;
+    count(): number;
+    method: any;
+}
+
+declare var cfgManager: ConfigManager;
+export = cfgManager;
diff --git a/node-config-manager/node-config-manager-tests.ts b/node-config-manager/node-config-manager-tests.ts
index e46bc84313..b333e0f72f 100644
--- a/node-config-manager/node-config-manager-tests.ts
+++ b/node-config-manager/node-config-manager-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="node-config-manager.d.ts" />
 
 import cfgManager = require('node-config-manager');
 var options = {
diff --git a/node-config-manager/node-config-manager.d.ts b/node-config-manager/node-config-manager.d.ts
deleted file mode 100644
index 0ef556ac5b..0000000000
--- a/node-config-manager/node-config-manager.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// Type definitions for node-config-manager 1.0.2
-// Project: https://www.npmjs.com/package/node-config-manager
-// Definitions by: TANAKA Koichi <https://gitnub.com/mugeso/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "node-config-manager" {
-    interface Options {
-        configDir: string;
-        env: string;
-        camelCase: boolean;
-    }
-
-    interface ConfigManager {
-        init(options: Options): ConfigManager;
-        set(key: string, value: string|boolean): ConfigManager;
-        get(key: string): string|boolean;
-        addConfig(configName: string): ConfigManager;
-        getConfig(configName: string): any;
-        removeConfig(configName: string): ConfigManager;
-        count(): number;
-        method: any;
-    }
-
-    var cfgManager: ConfigManager;
-    export = cfgManager;
-}
diff --git a/node-config-manager/tsconfig.json b/node-config-manager/tsconfig.json
new file mode 100644
index 0000000000..2a6060ee30
--- /dev/null
+++ b/node-config-manager/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-config-manager-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-dir/index.d.ts b/node-dir/index.d.ts
new file mode 100644
index 0000000000..ce3b9d755e
--- /dev/null
+++ b/node-dir/index.d.ts
@@ -0,0 +1,64 @@
+// Type definitions for node-dir
+// Project: https://github.com/fshost/node-dir
+// Definitions by: Panu Horsmalahti <https://github.com/panuhorsmalahti/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export interface Options {
+    // file encoding (defaults to 'utf8')
+    encoding?: string;
+
+    // a regex pattern or array to specify filenames to ignore
+    exclude?: RegExp | string[];
+
+    // a regex pattern or array to specify directories to ignore
+    excludeDir?: RegExp | string[];
+
+    // a regex pattern or array to specify filenames to operate on
+    match?: RegExp | string[];
+
+    // a regex pattern or array to specify directories to recurse
+    matchDir?: RegExp | string[];
+
+    // whether to recurse subdirectories when reading files (defaults to true)
+    recursive?: boolean;
+
+    // sort files in each directory in descending order
+    reverse?: boolean;
+
+    // whether to aggregate only the base filename rather than the full filepath
+    shortName?: boolean;
+
+    // sort files in each directory in ascending order (defaults to true)
+    sort?: boolean;
+
+    // control if done function called on error (defaults to true)
+    doneOnErr?: boolean;
+}
+
+export interface FileCallback {
+    (error: any, content: any, next: () => void): void;
+}
+
+export interface FileNamedCallback {
+    (error: any, content: any, filename: string, next: () => void): void;
+}
+
+export interface StreamCallback {
+    (error: any, stream: any, next: () => void): void;
+}
+
+export interface FinishedCallback {
+    (error: any, files: any): void;
+}
+
+export declare function readFiles(dir: string, fileCallback: FileCallback, finishedCallback?: FinishedCallback): void;
+export declare function readFiles(dir: string, fileCallback: FileNamedCallback, finishedCallback?: FinishedCallback): void;
+export declare function readFiles(dir: string, options: Options, fileCallback: FileCallback, finishedCallback?: FinishedCallback): void;
+export declare function readFiles(dir: string, options: Options, fileCallback: FileNamedCallback, finishedCallback?: FinishedCallback): void;
+export declare function readFilesStream(dir: string, options: Options, streamCallback: StreamCallback,
+    finishedCallback?: FinishedCallback): void;
+export declare function files(dir: string, callback: (error: any, files: any) => void): void;
+export declare function subdirs(dir: string, callback: (error: any, subdirs: any) => void): void;
+export declare function paths(dir: string, callback: (error: any, paths: any) => void): void;
+export declare function paths(dir: string, combine: boolean, callback: (error: any, paths: any) => void): void;
diff --git a/node-dir/node-dir-tests.ts b/node-dir/node-dir-tests.ts
index 6cc03ec538..4c8ab0b56b 100644
--- a/node-dir/node-dir-tests.ts
+++ b/node-dir/node-dir-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="node-dir.d.ts" />
 
 import * as dir from "node-dir";
 
diff --git a/node-dir/node-dir.d.ts b/node-dir/node-dir.d.ts
deleted file mode 100644
index 857cdf7bdf..0000000000
--- a/node-dir/node-dir.d.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-// Type definitions for node-dir
-// Project: https://github.com/fshost/node-dir
-// Definitions by: Panu Horsmalahti <https://github.com/panuhorsmalahti/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "node-dir" {
-    export interface Options {
-        // file encoding (defaults to 'utf8')
-        encoding?: string;
-
-        // a regex pattern or array to specify filenames to ignore
-        exclude?: RegExp | string[];
-
-        // a regex pattern or array to specify directories to ignore
-        excludeDir?: RegExp | string[];
-
-        // a regex pattern or array to specify filenames to operate on
-        match?: RegExp | string[];
-
-        // a regex pattern or array to specify directories to recurse
-        matchDir?: RegExp | string[];
-
-        // whether to recurse subdirectories when reading files (defaults to true)
-        recursive?: boolean;
-
-        // sort files in each directory in descending order
-        reverse?: boolean;
-
-        // whether to aggregate only the base filename rather than the full filepath
-        shortName?: boolean;
-
-        // sort files in each directory in ascending order (defaults to true)
-        sort?: boolean;
-
-        // control if done function called on error (defaults to true)
-        doneOnErr?: boolean;
-    }
-
-    export interface FileCallback {
-        (error: any, content: any, next: () => void): void;
-    }
-
-    export interface FileNamedCallback {
-        (error: any, content: any, filename: string, next: () => void): void;
-    }
-
-    export interface StreamCallback {
-        (error: any, stream: any, next: () => void): void;
-    }
-
-    export interface FinishedCallback {
-        (error: any, files: any): void;
-    }
-
-    export function readFiles(dir: string, fileCallback: FileCallback, finishedCallback?: FinishedCallback): void;
-	export function readFiles(dir: string, fileCallback: FileNamedCallback, finishedCallback?: FinishedCallback): void;
-    export function readFiles(dir: string, options: Options, fileCallback: FileCallback, finishedCallback?: FinishedCallback): void;
-    export function readFiles(dir: string, options: Options, fileCallback: FileNamedCallback, finishedCallback?: FinishedCallback): void;
-    export function readFilesStream(dir: string, options: Options, streamCallback: StreamCallback,
-        finishedCallback?: FinishedCallback): void;
-    export function files(dir: string, callback: (error: any, files: any) => void): void;
-    export function subdirs(dir: string, callback: (error: any, subdirs: any) => void): void;
-    export function paths(dir: string, callback: (error: any, paths: any) => void): void;
-    export function paths(dir: string, combine: boolean, callback: (error: any, paths: any) => void): void;
-}
diff --git a/node-dir/tsconfig.json b/node-dir/tsconfig.json
new file mode 100644
index 0000000000..cc85f33771
--- /dev/null
+++ b/node-dir/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-dir-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-ffi/node-ffi.d.ts b/node-ffi/node-ffi.d.ts
deleted file mode 100644
index 7d63469fa7..0000000000
--- a/node-ffi/node-ffi.d.ts
+++ /dev/null
@@ -1,195 +0,0 @@
-// Type definitions for node-ffi
-// Project: https://github.com/rbranson/node-ffi
-// Definitions by: Paul Loyd <https://github.com/loyd>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="node-ffi-buffer.d.ts" />
-/// <reference path="../ref/ref.d.ts" />
-/// <reference path="../ref-struct/ref-struct.d.ts" />
-
-declare module "ffi" {
-    import ref = require('ref');
-    import StructType = require('ref-struct');
-
-    /** Provides a friendly API on-top of `DynamicLibrary` and `ForeignFunction`. */
-    export var Library: {
-        /** The extension to use on libraries. */
-        EXT: string;
-
-        /**
-         * @param libFile name of library
-         * @param funcs hash of [retType, [...argType], opts?: {abi?, async?, varargs?}]
-         * @param lib hash that will be extended
-         */
-        new (libFile: string, funcs?: {[key: string]: any[]}, lib?: Object): any;
-
-        /**
-         * @param libFile name of library
-         * @param funcs hash of [retType, [...argType], opts?: {abi?, async?, varargs?}]
-         * @param lib hash that will be extended
-         */
-        (libFile: string, funcs?: {[key: string]: any[]}, lib?: Object): any;
-    };
-
-    /** Get value of errno. */
-    export function errno(): number;
-
-    export interface Function extends ref.Type {
-        /** The type of return value. */
-        retType: ref.Type;
-        /** The type of arguments. */
-        argTypes: ref.Type[];
-        /** Is set for node-ffi functions. */
-        ffi_type: Buffer;
-        abi: number;
-
-        /** Get a `Callback` pointer of this function type. */
-        toPointer(fn: (...args: any[]) => any): Buffer;
-        /** Get a `ForeignFunction` of this function type. */
-        toFunction(buf: Buffer): ForeignFunction;
-    }
-
-    /** Creates and returns a type for a C function pointer. */
-    export var Function: {
-        new (retType: ref.Type, argTypes: any[], abi?: number): Function;
-        new (retType: string, argTypes: any[], abi?: number): Function;
-        (retType: ref.Type, argTypes: any[], abi?: number): Function;
-        (retType: string, argTypes: any[], abi?: number): Function;
-    };
-
-    export interface ForeignFunction {
-        (...args: any[]): any;
-        async(...args: any[]): void;
-    }
-
-    /**
-     * Represents a foreign function in another library. Manages all of the aspects
-     * of function execution, including marshalling the data parameters for the
-     * function into native types and also unmarshalling the return from function
-     * execution.
-     */
-    export var ForeignFunction: {
-        new (ptr: Buffer, retType: ref.Type, argTypes: any[], abi?: number): ForeignFunction;
-        new (ptr: Buffer, retType: string, argTypes: any[], abi?: number): ForeignFunction;
-        (ptr: Buffer, retType: ref.Type, argTypes: any[], abi?: number): ForeignFunction;
-        (ptr: Buffer, retType: string, argTypes: any[], abi?: number): ForeignFunction;
-    }
-
-    export interface VariadicForeignFunction {
-        /**
-         * What gets returned is another function that needs to be invoked with the rest
-         * of the variadic types that are being invoked from the function.
-         */
-        (...args: any[]): ForeignFunction;
-
-        /**
-         * Return type as a property of the function generator to
-         * allow for monkey patching the return value in the very rare case where the
-         * return type is variadic as well
-         */
-        returnType: any;
-    }
-
-    /**
-     * For when you want to call to a C function with variable amount of arguments.
-     * i.e. `printf`.
-     *
-     * This function takes care of caching and reusing `ForeignFunction` instances that
-     * contain the same ffi_type argument signature.
-     */
-    export var VariadicForeignFunction: {
-        new (ptr: Buffer, ret: ref.Type, fixedArgs: any[], abi?: number): VariadicForeignFunction;
-        new (ptr: Buffer, ret: string, fixedArgs: any[], abi?: number): VariadicForeignFunction;
-        (ptr: Buffer, ret: ref.Type, fixedArgs: any[], abi?: number): VariadicForeignFunction;
-        (ptr: Buffer, ret: string, fixedArgs: any[], abi?: number): VariadicForeignFunction;
-    };
-
-    export interface DynamicLibrary {
-        /** Close library, returns the result of the `dlclose` system function. */
-        close(): number;
-        /** Get a symbol from this library. */
-        get(symbol: string): Buffer;
-        /** Get the result of the `dlerror` system function. */
-        error(): string;
-    }
-
-    /**
-     * This class loads and fetches function pointers for dynamic libraries
-     * (.so, .dylib, etc). After the libray's function pointer is acquired, then you
-     * call `get(symbol)` to retreive a pointer to an exported symbol. You need to
-     * call `get___` on the pointer to dereference it into its actual value, or
-     * turn the pointer into a callable function with `ForeignFunction`.
-     */
-    export var DynamicLibrary: {
-        FLAGS: {
-            RTLD_LAZY: number;
-            RTLD_NOW: number;
-            RTLD_LOCAL: number;
-            RTLD_GLOBAL: number;
-            RTLD_NOLOAD: number;
-            RTLD_NODELETE: number;
-            RTLD_NEXT: Buffer;
-            RTLD_DEFAUL: Buffer;
-        }
-
-        new (path?: string, mode?: number): DynamicLibrary;
-        (path?: string, mode?: number): DynamicLibrary;
-    };
-
-    /**
-     * Turns a JavaScript function into a C function pointer.
-     * The function pointer may be used in other C functions that
-     * accept C callback functions.
-     */
-    export var Callback: {
-        new (retType: any, argTypes: any[], abi: number, fn: any): Buffer;
-        new (retType: any, argTypes: any[], fn: any): Buffer;
-        (retType: any, argTypes: any[], abi: number, fn: any): Buffer;
-        (retType: any, argTypes: any[], fn: any): Buffer;
-    }
-
-    export var ffiType: {
-        /** Get a `ffi_type *` Buffer appropriate for the given type. */
-        (type: ref.Type): Buffer
-        /** Get a `ffi_type *` Buffer appropriate for the given type. */
-        (type: string): Buffer
-        FFI_TYPE: StructType;
-    }
-
-    export var CIF: (retType: any, types: any[], abi?: any) => Buffer
-    export var CIF_var: (retType: any, types: any[], numFixedArgs: number, abi?: any) => Buffer;
-    export var HAS_OBJC: boolean;
-    export var FFI_TYPES: {[key: string]: Buffer};
-    export var FFI_OK: number;
-    export var FFI_BAD_TYPEDEF: number;
-    export var FFI_BAD_ABI: number;
-    export var FFI_DEFAULT_ABI: number;
-    export var FFI_FIRST_ABI: number;
-    export var FFI_LAST_ABI: number;
-    export var FFI_SYSV: number;
-    export var FFI_UNIX64: number;
-    export var RTLD_LAZY: number;
-    export var RTLD_NOW: number;
-    export var RTLD_LOCAL: number;
-    export var RTLD_GLOBAL: number;
-    export var RTLD_NOLOAD: number;
-    export var RTLD_NODELETE: number;
-    export var RTLD_NEXT: Buffer;
-    export var RTLD_DEFAULT: Buffer;
-    export var LIB_EXT: string;
-    export var FFI_TYPE: StructType;
-
-    /** Default types. */
-    export var types: {
-        void: ref.Type;                 int64: ref.Type;                 ushort: ref.Type;
-        int: ref.Type;                  uint64: ref.Type;                float: ref.Type;
-        uint: ref.Type;                 long: ref.Type;                  double: ref.Type;
-        int8: ref.Type;                 ulong: ref.Type;                 Object: ref.Type;
-        uint8: ref.Type;                longlong: ref.Type;              CString: ref.Type;
-        int16: ref.Type;                ulonglong: ref.Type;             bool: ref.Type;
-        uint16: ref.Type;               char: ref.Type;                  byte: ref.Type;
-        int32: ref.Type;                uchar: ref.Type;                 size_t: ref.Type;
-        uint32: ref.Type;               short: ref.Type;
-    };
-}
diff --git a/node-fibers/index.d.ts b/node-fibers/index.d.ts
new file mode 100644
index 0000000000..bc818dd946
--- /dev/null
+++ b/node-fibers/index.d.ts
@@ -0,0 +1,45 @@
+// Type definitions for node-fibers
+// Project: https://github.com/laverdet/node-fibers
+// Definitions by: Cary Haynie <https://github.com/caryhaynie>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface Fiber {
+    reset: () => any;
+    run: (param?: any) => any;
+    throwInto: (ex: any) => any;
+}
+
+declare module "fibers" {
+
+    function Fiber(fn: Function): Fiber;
+
+    namespace Fiber {
+        export var current: Fiber;
+        export function yield(value?: any): any
+    }
+
+    export = Fiber;
+}
+
+declare module "fibers/future" {
+
+    class Future {
+        constructor();
+        detach(): void;
+        get(): any;
+        isResolved (): boolean;
+        proxy(future: Future): void;
+        proxyErrors(futureOrList: any): Future;
+        resolver(): Function;
+        resolve(fn: Function): void;
+        resolveSuccess(fn: Function): void;
+        return(result?: any): void;
+        throw (error: any): void;
+        wait (): void;
+        static wait(future: Future): any;
+        static wait(future_list: Future[]): any;
+        static wrap(fn: Function): Future
+    }
+
+    export = Future;
+}
diff --git a/node-fibers/node-fibers-tests.ts b/node-fibers/node-fibers-tests.ts
index c14c1b03d5..34bf388d79 100644
--- a/node-fibers/node-fibers-tests.ts
+++ b/node-fibers/node-fibers-tests.ts
@@ -1,11 +1,10 @@
-///<reference path='./node-fibers.d.ts'/>
 // node-fibers tests
 // compile with --module=common
 
 import Fiber = require("fibers");
 import Future = require("fibers/future");
 
-function sleep(ms) {
+function sleep(ms: number) {
     var fiber = Fiber.current;
     setTimeout(function() {
         fiber.run();
@@ -20,7 +19,7 @@ Fiber(function() {
 }).run();
 console.log('back in main');
 
-var inc = Fiber(function(start) {
+var inc = Fiber(function(start: any) {
     var total = start;
     while (true) {
         total += Fiber.yield(total);
@@ -80,7 +79,7 @@ console.log('done!');
 
 // This function returns a future which resolves after a timeout. This
 // demonstrates manually resolving futures.
-function sleep2(ms) {
+function sleep2(ms: number) {
     var future = new Future();
     setTimeout(function() {
         future.return();
diff --git a/node-fibers/node-fibers-tests.ts.tscparams b/node-fibers/node-fibers-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/node-fibers/node-fibers-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/node-fibers/node-fibers.d.ts b/node-fibers/node-fibers.d.ts
deleted file mode 100644
index 640fec5bfa..0000000000
--- a/node-fibers/node-fibers.d.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-// Type definitions for node-fibers
-// Project: https://github.com/laverdet/node-fibers
-// Definitions by: Cary Haynie <https://github.com/caryhaynie>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface Fiber {
-    reset: () => any;
-    run: (param?: any) => any;
-    throwInto: (ex: any) => any;
-}
-
-declare module "fibers" {
-
-    function Fiber(fn: Function): Fiber;
-
-    namespace Fiber {
-        export var current: Fiber;
-        export function yield(value?: any): any
-    }
-
-    export = Fiber;
-}
-
-declare module "fibers/future" {
-
-    class Future {
-        constructor();
-        detach(): void;
-        get(): any;
-        isResolved (): boolean;
-        proxy(future: Future): void;
-        proxyErrors(futureOrList: any): Future;
-        resolver(): Function;
-        resolve(fn: Function): void;
-        resolveSuccess(fn: Function): void;
-        return(result?: any): void;
-        throw (error: any): void;
-        wait (): void;
-        static wait(future: Future);
-        static wait(future_list: Future[]);
-        static wrap(fn: Function): Future
-    }
-
-    export = Future;
-}
diff --git a/node-fibers/node-fibers.d.ts.tscparams b/node-fibers/node-fibers.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/node-fibers/node-fibers.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/node-fibers/tsconfig.json b/node-fibers/tsconfig.json
new file mode 100644
index 0000000000..30631b50e8
--- /dev/null
+++ b/node-fibers/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-fibers-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-form/index.d.ts b/node-form/index.d.ts
new file mode 100644
index 0000000000..58f9ee5c21
--- /dev/null
+++ b/node-form/index.d.ts
@@ -0,0 +1,709 @@
+// Type definitions for node-form v1.0.13
+// Project: https://github.com/rsamec/form
+// Definitions by: Roman Samec <https://github.com/rsamec>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="Q" />
+
+export as namespace Validation;
+
+export = Validation;
+
+declare namespace Validation {
+    /**
+    * Custom message functions.
+    */
+    interface IErrorCustomMessage {
+        (config: any, args: any): string;
+    }
+    /**
+    * It represents a property validator for atomic object.
+    */
+    interface IPropertyValidator {
+        isAcceptable(s: any): boolean;
+        customMessage?: IErrorCustomMessage;
+        tagName?: string;
+    }
+    /**
+    * It represents a property validator for simple string value.
+    */
+    interface IStringValidator extends IPropertyValidator {
+        isAcceptable(s: string): boolean;
+    }
+    /**
+    * It represents an async property validator for atomic object.
+    */
+    interface IAsyncPropertyValidator {
+        isAcceptable(s: any): Q.Promise<boolean>;
+        customMessage?: IErrorCustomMessage;
+        isAsync: boolean;
+        tagName?: string;
+    }
+    /**
+    * It represents an async property validator for simple string value.
+    */
+    interface IAsyncStringPropertyValidator extends IAsyncPropertyValidator {
+        isAcceptable(s: string): Q.Promise<boolean>;
+    }
+    /**
+    * It defines compare operators.
+    */
+    enum CompareOperator {
+        LessThan = 0,
+        LessThanEqual = 1,
+        Equal = 2,
+        NotEqual = 3,
+        GreaterThanEqual = 4,
+        GreaterThan = 5,
+    }
+    class StringFce {
+        static format(s: string, args: any): string;
+    }
+    class NumberFce {
+        static GetNegDigits(value: string): number;
+    }
+    class LettersOnlyValidator implements IStringValidator {
+        public isAcceptable(s: string): boolean;
+        public tagName: string;
+    }
+    class ZipCodeValidator implements IStringValidator {
+        public isAcceptable(s: string): boolean;
+        public tagName: string;
+    }
+    class EmailValidator implements IStringValidator {
+        public isAcceptable(s: string): boolean;
+        public tagName: string;
+    }
+    class UrlValidator implements IStringValidator {
+        public isAcceptable(s: string): boolean;
+        public tagName: string;
+    }
+    class RequiredValidator implements IStringValidator {
+        public isAcceptable(s: string): boolean;
+        public tagName: string;
+    }
+    class DateValidator implements IStringValidator {
+        public isAcceptable(s: string): boolean;
+        public tagName: string;
+    }
+    class DateISOValidator implements IStringValidator {
+        public isAcceptable(s: string): boolean;
+        public tagName: string;
+    }
+    class NumberValidator implements IStringValidator {
+        public isAcceptable(s: string): boolean;
+        public tagName: string;
+    }
+    class DigitValidator implements IStringValidator {
+        public isAcceptable(s: string): boolean;
+        public tagName: string;
+    }
+    class SignedDigitValidator implements IStringValidator {
+        public isAcceptable(s: string): boolean;
+        public tagName: string;
+    }
+    class MinLengthValidator implements IStringValidator {
+        public MinLength: number;
+        constructor(MinLength?: number);
+        public isAcceptable(s: string): boolean;
+        public tagName: string;
+    }
+    class MaxLengthValidator implements IStringValidator {
+        public MaxLength: number;
+        constructor(MaxLength?: number);
+        public isAcceptable(s: string): boolean;
+        public tagName: string;
+    }
+    class RangeLengthValidator implements IStringValidator {
+        public RangeLength: number[];
+        constructor(RangeLength?: number[]);
+        public isAcceptable(s: string): boolean;
+        public MinLength : number;
+        public MaxLength : number;
+        public tagName: string;
+    }
+    class MinValidator implements IPropertyValidator {
+        public Min: number;
+        constructor(Min?: number);
+        public isAcceptable(s: any): boolean;
+        public tagName: string;
+    }
+    class MaxValidator implements IPropertyValidator {
+        public Max: number;
+        constructor(Max?: number);
+        public isAcceptable(s: any): boolean;
+        public tagName: string;
+    }
+    class RangeValidator implements IPropertyValidator {
+        public Range: number[];
+        constructor(Range?: number[]);
+        public isAcceptable(s: any): boolean;
+        public Min : number;
+        public Max : number;
+        public tagName: string;
+    }
+    class StepValidator implements IPropertyValidator {
+        public Step: string;
+        constructor(Step?: string);
+        public isAcceptable(s: any): boolean;
+        public tagName: string;
+    }
+    class PatternValidator implements IStringValidator {
+        public Pattern: string;
+        constructor(Pattern?: string);
+        public isAcceptable(s: string): boolean;
+        public tagName: string;
+    }
+    class ContainsValidator implements IAsyncPropertyValidator {
+        public Options: Q.Promise<any[]>;
+        constructor(Options: Q.Promise<any[]>);
+        public isAcceptable(s: string): Q.Promise<boolean>;
+        public isAsync: boolean;
+        public tagName: string;
+    }
+}
+declare namespace Validation {
+    /**
+    * basic error structure
+    */
+    interface IError {
+        HasError: boolean;
+        ErrorMessage: string;
+        TranslateArgs?: IErrorTranslateArgs;
+    }
+    /**
+    *  support for localization of error messages
+    */
+    interface IErrorTranslateArgs {
+        TranslateId: string;
+        MessageArgs: any;
+        CustomMessage?: IErrorCustomMessage;
+    }
+    /**
+    * It defines conditional function.
+    */
+    interface IOptional {
+        (): boolean;
+    }
+    /**
+    * It represents the validation result.
+    */
+    interface IValidationFailure extends IError {
+        IsAsync: boolean;
+        Error: IError;
+    }
+    /**
+    * This class provides unit of information about error.
+    * Implements composite design pattern to enable nesting of error information.
+    */
+    interface IValidationResult {
+        /**
+        * The name of error collection.
+        */
+        Name: string;
+        /**
+        * Add error information to child collection of errors.
+        * @param validationResult - error information to be added.
+        */
+        Add(validationResult: IValidationResult): void;
+        /**
+        * Remove error information from child collection of errors.
+        * @param index - index of error information to be removed.
+        */
+        Remove(index: number): void;
+        /**
+        * Return collections of child errors information.
+        */
+        Children: IValidationResult[];
+        /**
+        * Return true if there is any error.
+        */
+        HasErrors: boolean;
+        /**
+        * Return true if there is any error and hasw dirty state.
+        */
+        HasErrorsDirty: boolean;
+        /**
+        * Return error message, if there is no error, return empty string.
+        */
+        ErrorMessage: string;
+        /**
+        * Return number of errors.
+        */
+        ErrorCount: number;
+        /**
+        * It enables to have errors optional.
+        */
+        Optional?: IOptional;
+        /**
+        * It enables support for localization of error messages.
+        */
+        TranslateArgs?: IErrorTranslateArgs[];
+    }
+    /**
+    *
+    * @ngdoc object
+    * @name  Error
+    * @module Validation
+    *
+    *
+    * @description
+    * It represents basic error structure.
+    */
+    class Error implements IError {
+        public HasError: boolean;
+        public ErrorMessage: string;
+        constructor();
+    }
+    /**
+    *
+    * @ngdoc object
+    * @name  ValidationFailure
+    * @module Validation
+    *
+    *
+    * @description
+    * It represents validation failure.
+    */
+    class ValidationFailure implements IError {
+        public Error: IError;
+        public IsAsync: boolean;
+        constructor(Error: IError, IsAsync: boolean);
+        public HasError : boolean;
+        public ErrorMessage : string;
+        public TranslateArgs : IErrorTranslateArgs;
+    }
+    /**
+    *
+    * @ngdoc object
+    * @name  ValidationResult
+    * @module Validation
+    *
+    *
+    * @description
+    * It represents simple abstract error object.
+    */
+    class ValidationResult implements IValidationResult {
+        public Name: string;
+        constructor(Name: string);
+        public IsDirty: boolean;
+        public Children : IValidationResult[];
+        public Add(error: IValidationResult): void;
+        public Remove(index: number): void;
+        public Optional: IOptional;
+        public TranslateArgs: IErrorTranslateArgs[];
+        public HasErrorsDirty : boolean;
+        public HasErrors : boolean;
+        public ErrorCount : number;
+        public ErrorMessage : string;
+    }
+    /**
+    *
+    * @ngdoc object
+    * @name  CompositeValidationResult
+    * @module Validation
+    *
+    *
+    * @description
+    * It represents composite error object.
+    */
+    class CompositeValidationResult implements IValidationResult {
+        public Name: string;
+        public Children: IValidationResult[];
+        constructor(Name: string);
+        public Optional: IOptional;
+        public AddFirst(error: IValidationResult): void;
+        public Add(error: IValidationResult): void;
+        public Remove(index: number): void;
+        public HasErrorsDirty : boolean;
+        public HasErrors : boolean;
+        public ErrorCount : number;
+        public ErrorMessage : string;
+        public TranslateArgs : IErrorTranslateArgs[];
+        public LogErrors(headerMessage?: string): void;
+        public Errors : {
+            [name: string]: IValidationResult;
+        };
+        private FlattenErros;
+        public SetDirty(): void;
+        public SetPristine(): void;
+        private SetDirtyEx(node, dirty);
+        private flattenErrors(node, errorCollection);
+        private traverse(node, indent);
+    }
+}
+declare namespace Validation {
+    /**
+    * @ngdoc module
+    * @name Validation
+    *
+    *
+    * @description
+    * # Validation (core module)
+    * The module itself contains the essential components for an validation engine to function. The table below
+    * lists a high level breakdown of each of the components (object, functions) available within this core module.
+    *
+    * <div doc-module-components="Validation"></div>
+    */
+    /**
+    * It defines validation function.
+    */
+    interface IValidate {
+        (args: IError): void;
+    }
+    /**
+    * It defines async validation function.
+    */
+    interface IAsyncValidate {
+        (args: IError): Q.Promise<any>;
+    }
+    /**
+    * It represents named validation function.
+    */
+    interface IValidatorFce {
+        Name: string;
+        ValidationFce?: IValidate;
+        AsyncValidationFce?: IAsyncValidate;
+    }
+    /**
+    * This class represents custom validator.
+    */
+    interface IValidator {
+        Validate(context: any): IValidationFailure;
+        ValidateAsync(context: any): Q.Promise<IValidationFailure>;
+        Error: IError;
+    }
+    /**
+    * It represents abstract validator for type of <T>.
+    */
+    interface IAbstractValidator<T> {
+        RuleFor(prop: string, validator: IPropertyValidator): any;
+        ValidationFor(prop: string, validator: IValidatorFce): any;
+        ValidatorFor<K>(prop: string, validator: IAbstractValidator<K>): any;
+        /**
+        * It creates new concrete validation rule and assigned data context to this rule.
+        * @param name of the rule
+        * @constructor
+        */
+        CreateRule(name: string): IAbstractValidationRule<any>;
+        CreateAbstractRule(name: string): IAbstractValidationRule<any>;
+        CreateAbstractListRule(name: string): IAbstractValidationRule<any>;
+        /**
+        * return true if this validation rule is intended for list of items, otherwise true
+        */
+        ForList: boolean;
+    }
+    /**
+    * It represents concrete validation rule for type of <T>.
+    */
+    interface IAbstractValidationRule<T> {
+        /**
+        * Performs validation using a validation context and returns a collection of Validation Failures.
+        */
+        Validate(context: T): IValidationResult;
+        /**
+        * Performs validation using a validation context and returns a collection of Validation Failures asynchronoulsy.
+        */
+        ValidateAsync(context: T): Q.Promise<IValidationResult>;
+        /**
+        * Performs validation and async validation using a validation context.
+        */
+        ValidateAll(context: T): void;
+        /**
+        * Performs validation and async validation using a validation context for a passed field.
+        */
+        ValidateField(context: T, propName: string): void;
+        /**
+        * Return validation results.
+        */
+        ValidationResult: IValidationResult;
+        Rules: {
+            [name: string]: IPropertyValidationRule<T>;
+        };
+        Validators: {
+            [name: string]: IValidator;
+        };
+        Children: {
+            [name: string]: AbstractValidationRule<any>;
+        };
+    }
+    /**
+    * It represents property validation rule for type of <T>.
+    */
+    interface IPropertyValidationRule<T> {
+        /**
+        *The validators that are grouped under this rule.
+        */
+        Validators: {
+            [name: string]: any;
+        };
+        /**
+        * Performs validation using a validation context and returns a collection of Validation Failures.
+        */
+        Validate(context: IValidationContext<T>): IValidationFailure[];
+        /**
+        * Performs validation using a validation context and returns a collection of Validation Failures asynchronoulsy.
+        */
+        ValidateAsync(context: IValidationContext<T>): Q.Promise<IValidationFailure[]>;
+    }
+    /**
+    *  It represents a data context for validation rule.
+    */
+    interface IValidationContext<T> {
+        /**
+        * Return current value.
+        */
+        Value: string;
+        /**
+        * Return property name for current data context.
+        */
+        Key: string;
+        /**
+        * Data context for validation rule.
+        */
+        Data: T;
+    }
+    /**
+    *
+    * @ngdoc object
+    * @name  AbstractValidator
+    * @module Validation
+    *
+    *
+    * @description
+    * It enables to create custom validator for your own abstract object (class) and to assign validation rules to its properties.
+    * You can assigned these rules
+    *
+    * +  property validation rules - use _RuleFor_ property
+    * +  property async validation rules - use _RuleFor_ property
+    * +  shared validation rules - use _ValidationFor_ property
+    * +  custom object validator - use _ValidatorFor_ property - enables composition of child custom validators
+    */
+    class AbstractValidator<T> implements IAbstractValidator<T> {
+        public Validators: {
+            [name: string]: IPropertyValidator[];
+        };
+        public AbstractValidators: {
+            [name: string]: IAbstractValidator<any>;
+        };
+        public ValidationFunctions: {
+            [name: string]: IValidatorFce[];
+        };
+        public RuleFor(prop: string, validator: IPropertyValidator): void;
+        public ValidationFor(prop: string, fce: IValidatorFce): void;
+        public ValidatorFor<K>(prop: string, validator: IAbstractValidator<K>, forList?: boolean): void;
+        public CreateAbstractRule(name: string): AbstractValidationRule<T>;
+        public CreateAbstractListRule(name: string): AbstractListValidationRule<T>;
+        public CreateRule(name: string): AbstractValidationRule<T>;
+        /**
+        * Return true if this validation rule is intended for list of items, otherwise true.
+        */
+        public ForList: boolean;
+    }
+    /**
+    *
+    * @ngdoc object
+    * @name  AbstractValidationRule
+    * @module Validation
+    *
+    *
+    * @description
+    * It represents concreate validator for custom object. It enables to assign validation rules to custom object properties.
+    */
+    class AbstractValidationRule<T> implements IAbstractValidationRule<T> {
+        public Name: string;
+        public validator: AbstractValidator<T>;
+        public ValidationResult: IValidationResult;
+        public Rules: {
+            [name: string]: IPropertyValidationRule<T>;
+        };
+        public Validators: {
+            [name: string]: IValidator;
+        };
+        public Children: {
+            [name: string]: AbstractValidationRule<any>;
+        };
+        /**
+        * Return true if this validation rule is intended for list of items, otherwise true.
+        */
+        public ForList: boolean;
+        constructor(Name: string, validator: AbstractValidator<T>, forList?: boolean);
+        public addChildren(): void;
+        public SetOptional(fce: IOptional): void;
+        private createRuleFor(prop);
+        /**
+        * Performs validation using a validation context and returns a collection of Validation Failures.
+        */
+        public Validate(context: T): IValidationResult;
+        /**
+        * Performs validation using a validation context and returns a collection of Validation Failures asynchronoulsy.
+        */
+        public ValidateAsync(context: T): Q.Promise<IValidationResult>;
+        public ValidateAll(context: T): void;
+        public ValidateField(context: T, propName: string): void;
+    }
+    /**
+    *
+    * @ngdoc object
+    * @name  AbstractListValidationRule
+    * @module Validation
+    *
+    *
+    * @description
+    * It represents an validator for custom object. It enables to assign rules to custom object properties.
+    */
+    class AbstractListValidationRule<T> extends AbstractValidationRule<T> {
+        public Name: string;
+        public validator: AbstractValidator<T>;
+        constructor(Name: string, validator: AbstractValidator<T>);
+        /**
+        * Performs validation using a validation context and returns a collection of Validation Failures.
+        */
+        public Validate(context: any): IValidationResult;
+        /**
+        * Performs validation using a validation context and returns a collection of Validation Failures asynchronoulsy.
+        */
+        public ValidateAsync(context: any): Q.Promise<IValidationResult>;
+        private getValidationRule(i);
+        private getIndexedKey(i);
+        public NotifyListChanged(list: any[]): void;
+    }
+    /**
+    *
+    * @ngdoc object
+    * @name  ValidationContext
+    * @module Validation
+    *
+    *
+    * @description
+    * It represents a data context for validation rule.
+    */
+    class ValidationContext<T> implements IValidationContext<T> {
+        public Key: string;
+        public Data: T;
+        constructor(Key: string, Data: T);
+        public Value : any;
+    }
+    class MessageLocalization {
+        static customMsg: string;
+        static defaultMessages: {
+            "required": string;
+            "remote": string;
+            "email": string;
+            "url": string;
+            "date": string;
+            "dateISO": string;
+            "number": string;
+            "digits": string;
+            "signedDigits": string;
+            "creditcard": string;
+            "equalTo": string;
+            "maxlength": string;
+            "minlength": string;
+            "rangelength": string;
+            "range": string;
+            "max": string;
+            "min": string;
+            "step": string;
+            "contains": string;
+            "mask": string;
+            "custom": string;
+        };
+        static ValidationMessages: {
+            "required": string;
+            "remote": string;
+            "email": string;
+            "url": string;
+            "date": string;
+            "dateISO": string;
+            "number": string;
+            "digits": string;
+            "signedDigits": string;
+            "creditcard": string;
+            "equalTo": string;
+            "maxlength": string;
+            "minlength": string;
+            "rangelength": string;
+            "range": string;
+            "max": string;
+            "min": string;
+            "step": string;
+            "contains": string;
+            "mask": string;
+            "custom": string;
+        };
+        static GetValidationMessage(validator: any): string;
+    }
+    /**
+    *
+    * @ngdoc object
+    * @name  PropertyValidationRule
+    * @module Validation
+    *
+    *
+    * @description
+    * It represents a property validation rule. The property has assigned collection of property validators.
+    */
+    class PropertyValidationRule<T> extends ValidationResult implements IPropertyValidationRule<T> {
+        public Name: string;
+        public Validators: {
+            [name: string]: any;
+        };
+        public ValidationFailures: {
+            [name: string]: IValidationFailure;
+        };
+        constructor(Name: string, validatorsToAdd?: IPropertyValidator[]);
+        public AddValidator(validator: any): void;
+        public Errors : {
+            [name: string]: IValidationFailure;
+        };
+        public HasErrors : boolean;
+        public ErrorCount : number;
+        public ErrorMessage : string;
+        public TranslateArgs : IErrorTranslateArgs[];
+        /**
+        * Performs validation using a validation context and returns a collection of Validation Failures.
+        */
+        public Validate(context: IValidationContext<T>): IValidationFailure[];
+        public ValidateEx(value: any): IValidationFailure[];
+        /**
+        * Performs validation using a validation context and returns a collection of Validation Failures asynchronoulsy.
+        */
+        public ValidateAsync(context: IValidationContext<T>): Q.Promise<IValidationFailure[]>;
+        /**
+        * Performs validation using a validation context and returns a collection of Validation Failures asynchronoulsy.
+        */
+        public ValidateAsyncEx(value: string): Q.Promise<IValidationFailure[]>;
+    }
+    /**
+    *
+    * @ngdoc object
+    * @name  Validator
+    * @module Validation
+    *
+    *
+    * @description
+    * It represents a custom validator. It enables to define your own shared validation rules
+    */
+    class Validator extends ValidationResult implements IValidator {
+        public Name: string;
+        private ValidateFce;
+        private AsyncValidationFce;
+        public Error: IError;
+        public ValidationFailures: {
+            [name: string]: IValidationFailure;
+        };
+        constructor(Name: string, ValidateFce?: IValidate, AsyncValidationFce?: IAsyncValidate);
+        public Optional: IOptional;
+        public Validate(context: any): IValidationFailure;
+        public ValidateAsync(context: any): Q.Promise<IValidationFailure>;
+        public HasError : boolean;
+        public Errors : {
+            [name: string]: IValidationFailure;
+        };
+        public HasErrors : boolean;
+        public ErrorCount : number;
+        public ErrorMessage : string;
+        public TranslateArgs : IErrorTranslateArgs[];
+    }
+}
diff --git a/node-form/node-form-tests.ts b/node-form/node-form-tests.ts
index 776014b681..3ee0f31d47 100644
--- a/node-form/node-form-tests.ts
+++ b/node-form/node-form-tests.ts
@@ -1,8 +1,5 @@
-/// <reference path="node-form.d.ts" />
-/// <reference path="../underscore/underscore.d.ts" />
-/// <reference path="../q/Q.d.ts" />
-/// <reference path="../moment/moment.d.ts" />
 
+/// <reference types="Q" />
 
 export interface IPerson{
     Checked:boolean;
diff --git a/node-form/node-form.d.ts b/node-form/node-form.d.ts
deleted file mode 100644
index 1e42547b36..0000000000
--- a/node-form/node-form.d.ts
+++ /dev/null
@@ -1,710 +0,0 @@
-// Type definitions for node-form v1.0.13
-// Project: https://github.com/rsamec/form
-// Definitions by: Roman Samec <https://github.com/rsamec>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../underscore/underscore.d.ts" />
-/// <reference path="../q/Q.d.ts" />
-/// <reference path="../moment/moment.d.ts" />
-declare namespace Validation {
-    /**
-    * Custom message functions.
-    */
-    interface IErrorCustomMessage {
-        (config: any, args: any): string;
-    }
-    /**
-    * It represents a property validator for atomic object.
-    */
-    interface IPropertyValidator {
-        isAcceptable(s: any): boolean;
-        customMessage?: IErrorCustomMessage;
-        tagName?: string;
-    }
-    /**
-    * It represents a property validator for simple string value.
-    */
-    interface IStringValidator extends IPropertyValidator {
-        isAcceptable(s: string): boolean;
-    }
-    /**
-    * It represents an async property validator for atomic object.
-    */
-    interface IAsyncPropertyValidator {
-        isAcceptable(s: any): Q.Promise<boolean>;
-        customMessage?: IErrorCustomMessage;
-        isAsync: boolean;
-        tagName?: string;
-    }
-    /**
-    * It represents an async property validator for simple string value.
-    */
-    interface IAsyncStringPropertyValidator extends IAsyncPropertyValidator {
-        isAcceptable(s: string): Q.Promise<boolean>;
-    }
-    /**
-    * It defines compare operators.
-    */
-    enum CompareOperator {
-        LessThan = 0,
-        LessThanEqual = 1,
-        Equal = 2,
-        NotEqual = 3,
-        GreaterThanEqual = 4,
-        GreaterThan = 5,
-    }
-    class StringFce {
-        static format(s: string, args: any): string;
-    }
-    class NumberFce {
-        static GetNegDigits(value: string): number;
-    }
-    class LettersOnlyValidator implements IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class ZipCodeValidator implements IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class EmailValidator implements IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class UrlValidator implements IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class RequiredValidator implements IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class DateValidator implements IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class DateISOValidator implements IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class NumberValidator implements IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class DigitValidator implements IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class SignedDigitValidator implements IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class MinLengthValidator implements IStringValidator {
-        public MinLength: number;
-        constructor(MinLength?: number);
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class MaxLengthValidator implements IStringValidator {
-        public MaxLength: number;
-        constructor(MaxLength?: number);
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class RangeLengthValidator implements IStringValidator {
-        public RangeLength: number[];
-        constructor(RangeLength?: number[]);
-        public isAcceptable(s: string): boolean;
-        public MinLength : number;
-        public MaxLength : number;
-        public tagName: string;
-    }
-    class MinValidator implements IPropertyValidator {
-        public Min: number;
-        constructor(Min?: number);
-        public isAcceptable(s: any): boolean;
-        public tagName: string;
-    }
-    class MaxValidator implements IPropertyValidator {
-        public Max: number;
-        constructor(Max?: number);
-        public isAcceptable(s: any): boolean;
-        public tagName: string;
-    }
-    class RangeValidator implements IPropertyValidator {
-        public Range: number[];
-        constructor(Range?: number[]);
-        public isAcceptable(s: any): boolean;
-        public Min : number;
-        public Max : number;
-        public tagName: string;
-    }
-    class StepValidator implements IPropertyValidator {
-        public Step: string;
-        constructor(Step?: string);
-        public isAcceptable(s: any): boolean;
-        public tagName: string;
-    }
-    class PatternValidator implements IStringValidator {
-        public Pattern: string;
-        constructor(Pattern?: string);
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class ContainsValidator implements IAsyncPropertyValidator {
-        public Options: Q.Promise<any[]>;
-        constructor(Options: Q.Promise<any[]>);
-        public isAcceptable(s: string): Q.Promise<boolean>;
-        public isAsync: boolean;
-        public tagName: string;
-    }
-}
-declare namespace Validation {
-    /**
-    * basic error structure
-    */
-    interface IError {
-        HasError: boolean;
-        ErrorMessage: string;
-        TranslateArgs?: IErrorTranslateArgs;
-    }
-    /**
-    *  support for localization of error messages
-    */
-    interface IErrorTranslateArgs {
-        TranslateId: string;
-        MessageArgs: any;
-        CustomMessage?: IErrorCustomMessage;
-    }
-    /**
-    * It defines conditional function.
-    */
-    interface IOptional {
-        (): boolean;
-    }
-    /**
-    * It represents the validation result.
-    */
-    interface IValidationFailure extends IError {
-        IsAsync: boolean;
-        Error: IError;
-    }
-    /**
-    * This class provides unit of information about error.
-    * Implements composite design pattern to enable nesting of error information.
-    */
-    interface IValidationResult {
-        /**
-        * The name of error collection.
-        */
-        Name: string;
-        /**
-        * Add error information to child collection of errors.
-        * @param validationResult - error information to be added.
-        */
-        Add(validationResult: IValidationResult): void;
-        /**
-        * Remove error information from child collection of errors.
-        * @param index - index of error information to be removed.
-        */
-        Remove(index: number): void;
-        /**
-        * Return collections of child errors information.
-        */
-        Children: IValidationResult[];
-        /**
-        * Return true if there is any error.
-        */
-        HasErrors: boolean;
-        /**
-        * Return true if there is any error and hasw dirty state.
-        */
-        HasErrorsDirty: boolean;
-        /**
-        * Return error message, if there is no error, return empty string.
-        */
-        ErrorMessage: string;
-        /**
-        * Return number of errors.
-        */
-        ErrorCount: number;
-        /**
-        * It enables to have errors optional.
-        */
-        Optional?: IOptional;
-        /**
-        * It enables support for localization of error messages.
-        */
-        TranslateArgs?: IErrorTranslateArgs[];
-    }
-    /**
-    *
-    * @ngdoc object
-    * @name  Error
-    * @module Validation
-    *
-    *
-    * @description
-    * It represents basic error structure.
-    */
-    class Error implements IError {
-        public HasError: boolean;
-        public ErrorMessage: string;
-        constructor();
-    }
-    /**
-    *
-    * @ngdoc object
-    * @name  ValidationFailure
-    * @module Validation
-    *
-    *
-    * @description
-    * It represents validation failure.
-    */
-    class ValidationFailure implements IError {
-        public Error: IError;
-        public IsAsync: boolean;
-        constructor(Error: IError, IsAsync: boolean);
-        public HasError : boolean;
-        public ErrorMessage : string;
-        public TranslateArgs : IErrorTranslateArgs;
-    }
-    /**
-    *
-    * @ngdoc object
-    * @name  ValidationResult
-    * @module Validation
-    *
-    *
-    * @description
-    * It represents simple abstract error object.
-    */
-    class ValidationResult implements IValidationResult {
-        public Name: string;
-        constructor(Name: string);
-        public IsDirty: boolean;
-        public Children : IValidationResult[];
-        public Add(error: IValidationResult): void;
-        public Remove(index: number): void;
-        public Optional: IOptional;
-        public TranslateArgs: IErrorTranslateArgs[];
-        public HasErrorsDirty : boolean;
-        public HasErrors : boolean;
-        public ErrorCount : number;
-        public ErrorMessage : string;
-    }
-    /**
-    *
-    * @ngdoc object
-    * @name  CompositeValidationResult
-    * @module Validation
-    *
-    *
-    * @description
-    * It represents composite error object.
-    */
-    class CompositeValidationResult implements IValidationResult {
-        public Name: string;
-        public Children: IValidationResult[];
-        constructor(Name: string);
-        public Optional: IOptional;
-        public AddFirst(error: IValidationResult): void;
-        public Add(error: IValidationResult): void;
-        public Remove(index: number): void;
-        public HasErrorsDirty : boolean;
-        public HasErrors : boolean;
-        public ErrorCount : number;
-        public ErrorMessage : string;
-        public TranslateArgs : IErrorTranslateArgs[];
-        public LogErrors(headerMessage?: string): void;
-        public Errors : {
-            [name: string]: IValidationResult;
-        };
-        private FlattenErros;
-        public SetDirty(): void;
-        public SetPristine(): void;
-        private SetDirtyEx(node, dirty);
-        private flattenErrors(node, errorCollection);
-        private traverse(node, indent);
-    }
-}
-declare namespace Validation {
-    /**
-    * @ngdoc module
-    * @name Validation
-    *
-    *
-    * @description
-    * # Validation (core module)
-    * The module itself contains the essential components for an validation engine to function. The table below
-    * lists a high level breakdown of each of the components (object, functions) available within this core module.
-    *
-    * <div doc-module-components="Validation"></div>
-    */
-    /**
-    * It defines validation function.
-    */
-    interface IValidate {
-        (args: IError): void;
-    }
-    /**
-    * It defines async validation function.
-    */
-    interface IAsyncValidate {
-        (args: IError): Q.Promise<any>;
-    }
-    /**
-    * It represents named validation function.
-    */
-    interface IValidatorFce {
-        Name: string;
-        ValidationFce?: IValidate;
-        AsyncValidationFce?: IAsyncValidate;
-    }
-    /**
-    * This class represents custom validator.
-    */
-    interface IValidator {
-        Validate(context: any): IValidationFailure;
-        ValidateAsync(context: any): Q.Promise<IValidationFailure>;
-        Error: IError;
-    }
-    /**
-    * It represents abstract validator for type of <T>.
-    */
-    interface IAbstractValidator<T> {
-        RuleFor(prop: string, validator: IPropertyValidator): any;
-        ValidationFor(prop: string, validator: IValidatorFce): any;
-        ValidatorFor<K>(prop: string, validator: IAbstractValidator<K>): any;
-        /**
-        * It creates new concrete validation rule and assigned data context to this rule.
-        * @param name of the rule
-        * @constructor
-        */
-        CreateRule(name: string): IAbstractValidationRule<any>;
-        CreateAbstractRule(name: string): IAbstractValidationRule<any>;
-        CreateAbstractListRule(name: string): IAbstractValidationRule<any>;
-        /**
-        * return true if this validation rule is intended for list of items, otherwise true
-        */
-        ForList: boolean;
-    }
-    /**
-    * It represents concrete validation rule for type of <T>.
-    */
-    interface IAbstractValidationRule<T> {
-        /**
-        * Performs validation using a validation context and returns a collection of Validation Failures.
-        */
-        Validate(context: T): IValidationResult;
-        /**
-        * Performs validation using a validation context and returns a collection of Validation Failures asynchronoulsy.
-        */
-        ValidateAsync(context: T): Q.Promise<IValidationResult>;
-        /**
-        * Performs validation and async validation using a validation context.
-        */
-        ValidateAll(context: T): void;
-        /**
-        * Performs validation and async validation using a validation context for a passed field.
-        */
-        ValidateField(context: T, propName: string): void;
-        /**
-        * Return validation results.
-        */
-        ValidationResult: IValidationResult;
-        Rules: {
-            [name: string]: IPropertyValidationRule<T>;
-        };
-        Validators: {
-            [name: string]: IValidator;
-        };
-        Children: {
-            [name: string]: AbstractValidationRule<any>;
-        };
-    }
-    /**
-    * It represents property validation rule for type of <T>.
-    */
-    interface IPropertyValidationRule<T> {
-        /**
-        *The validators that are grouped under this rule.
-        */
-        Validators: {
-            [name: string]: any;
-        };
-        /**
-        * Performs validation using a validation context and returns a collection of Validation Failures.
-        */
-        Validate(context: IValidationContext<T>): IValidationFailure[];
-        /**
-        * Performs validation using a validation context and returns a collection of Validation Failures asynchronoulsy.
-        */
-        ValidateAsync(context: IValidationContext<T>): Q.Promise<IValidationFailure[]>;
-    }
-    /**
-    *  It represents a data context for validation rule.
-    */
-    interface IValidationContext<T> {
-        /**
-        * Return current value.
-        */
-        Value: string;
-        /**
-        * Return property name for current data context.
-        */
-        Key: string;
-        /**
-        * Data context for validation rule.
-        */
-        Data: T;
-    }
-    /**
-    *
-    * @ngdoc object
-    * @name  AbstractValidator
-    * @module Validation
-    *
-    *
-    * @description
-    * It enables to create custom validator for your own abstract object (class) and to assign validation rules to its properties.
-    * You can assigned these rules
-    *
-    * +  property validation rules - use _RuleFor_ property
-    * +  property async validation rules - use _RuleFor_ property
-    * +  shared validation rules - use _ValidationFor_ property
-    * +  custom object validator - use _ValidatorFor_ property - enables composition of child custom validators
-    */
-    class AbstractValidator<T> implements IAbstractValidator<T> {
-        public Validators: {
-            [name: string]: IPropertyValidator[];
-        };
-        public AbstractValidators: {
-            [name: string]: IAbstractValidator<any>;
-        };
-        public ValidationFunctions: {
-            [name: string]: IValidatorFce[];
-        };
-        public RuleFor(prop: string, validator: IPropertyValidator): void;
-        public ValidationFor(prop: string, fce: IValidatorFce): void;
-        public ValidatorFor<K>(prop: string, validator: IAbstractValidator<K>, forList?: boolean): void;
-        public CreateAbstractRule(name: string): AbstractValidationRule<T>;
-        public CreateAbstractListRule(name: string): AbstractListValidationRule<T>;
-        public CreateRule(name: string): AbstractValidationRule<T>;
-        /**
-        * Return true if this validation rule is intended for list of items, otherwise true.
-        */
-        public ForList: boolean;
-    }
-    /**
-    *
-    * @ngdoc object
-    * @name  AbstractValidationRule
-    * @module Validation
-    *
-    *
-    * @description
-    * It represents concreate validator for custom object. It enables to assign validation rules to custom object properties.
-    */
-    class AbstractValidationRule<T> implements IAbstractValidationRule<T> {
-        public Name: string;
-        public validator: AbstractValidator<T>;
-        public ValidationResult: IValidationResult;
-        public Rules: {
-            [name: string]: IPropertyValidationRule<T>;
-        };
-        public Validators: {
-            [name: string]: IValidator;
-        };
-        public Children: {
-            [name: string]: AbstractValidationRule<any>;
-        };
-        /**
-        * Return true if this validation rule is intended for list of items, otherwise true.
-        */
-        public ForList: boolean;
-        constructor(Name: string, validator: AbstractValidator<T>, forList?: boolean);
-        public addChildren(): void;
-        public SetOptional(fce: IOptional): void;
-        private createRuleFor(prop);
-        /**
-        * Performs validation using a validation context and returns a collection of Validation Failures.
-        */
-        public Validate(context: T): IValidationResult;
-        /**
-        * Performs validation using a validation context and returns a collection of Validation Failures asynchronoulsy.
-        */
-        public ValidateAsync(context: T): Q.Promise<IValidationResult>;
-        public ValidateAll(context: T): void;
-        public ValidateField(context: T, propName: string): void;
-    }
-    /**
-    *
-    * @ngdoc object
-    * @name  AbstractListValidationRule
-    * @module Validation
-    *
-    *
-    * @description
-    * It represents an validator for custom object. It enables to assign rules to custom object properties.
-    */
-    class AbstractListValidationRule<T> extends AbstractValidationRule<T> {
-        public Name: string;
-        public validator: AbstractValidator<T>;
-        constructor(Name: string, validator: AbstractValidator<T>);
-        /**
-        * Performs validation using a validation context and returns a collection of Validation Failures.
-        */
-        public Validate(context: any): IValidationResult;
-        /**
-        * Performs validation using a validation context and returns a collection of Validation Failures asynchronoulsy.
-        */
-        public ValidateAsync(context: any): Q.Promise<IValidationResult>;
-        private getValidationRule(i);
-        private getIndexedKey(i);
-        public NotifyListChanged(list: any[]): void;
-    }
-    /**
-    *
-    * @ngdoc object
-    * @name  ValidationContext
-    * @module Validation
-    *
-    *
-    * @description
-    * It represents a data context for validation rule.
-    */
-    class ValidationContext<T> implements IValidationContext<T> {
-        public Key: string;
-        public Data: T;
-        constructor(Key: string, Data: T);
-        public Value : any;
-    }
-    class MessageLocalization {
-        static customMsg: string;
-        static defaultMessages: {
-            "required": string;
-            "remote": string;
-            "email": string;
-            "url": string;
-            "date": string;
-            "dateISO": string;
-            "number": string;
-            "digits": string;
-            "signedDigits": string;
-            "creditcard": string;
-            "equalTo": string;
-            "maxlength": string;
-            "minlength": string;
-            "rangelength": string;
-            "range": string;
-            "max": string;
-            "min": string;
-            "step": string;
-            "contains": string;
-            "mask": string;
-            "custom": string;
-        };
-        static ValidationMessages: {
-            "required": string;
-            "remote": string;
-            "email": string;
-            "url": string;
-            "date": string;
-            "dateISO": string;
-            "number": string;
-            "digits": string;
-            "signedDigits": string;
-            "creditcard": string;
-            "equalTo": string;
-            "maxlength": string;
-            "minlength": string;
-            "rangelength": string;
-            "range": string;
-            "max": string;
-            "min": string;
-            "step": string;
-            "contains": string;
-            "mask": string;
-            "custom": string;
-        };
-        static GetValidationMessage(validator: any): string;
-    }
-    /**
-    *
-    * @ngdoc object
-    * @name  PropertyValidationRule
-    * @module Validation
-    *
-    *
-    * @description
-    * It represents a property validation rule. The property has assigned collection of property validators.
-    */
-    class PropertyValidationRule<T> extends ValidationResult implements IPropertyValidationRule<T> {
-        public Name: string;
-        public Validators: {
-            [name: string]: any;
-        };
-        public ValidationFailures: {
-            [name: string]: IValidationFailure;
-        };
-        constructor(Name: string, validatorsToAdd?: IPropertyValidator[]);
-        public AddValidator(validator: any): void;
-        public Errors : {
-            [name: string]: IValidationFailure;
-        };
-        public HasErrors : boolean;
-        public ErrorCount : number;
-        public ErrorMessage : string;
-        public TranslateArgs : IErrorTranslateArgs[];
-        /**
-        * Performs validation using a validation context and returns a collection of Validation Failures.
-        */
-        public Validate(context: IValidationContext<T>): IValidationFailure[];
-        public ValidateEx(value: any): IValidationFailure[];
-        /**
-        * Performs validation using a validation context and returns a collection of Validation Failures asynchronoulsy.
-        */
-        public ValidateAsync(context: IValidationContext<T>): Q.Promise<IValidationFailure[]>;
-        /**
-        * Performs validation using a validation context and returns a collection of Validation Failures asynchronoulsy.
-        */
-        public ValidateAsyncEx(value: string): Q.Promise<IValidationFailure[]>;
-    }
-    /**
-    *
-    * @ngdoc object
-    * @name  Validator
-    * @module Validation
-    *
-    *
-    * @description
-    * It represents a custom validator. It enables to define your own shared validation rules
-    */
-    class Validator extends ValidationResult implements IValidator {
-        public Name: string;
-        private ValidateFce;
-        private AsyncValidationFce;
-        public Error: IError;
-        public ValidationFailures: {
-            [name: string]: IValidationFailure;
-        };
-        constructor(Name: string, ValidateFce?: IValidate, AsyncValidationFce?: IAsyncValidate);
-        public Optional: IOptional;
-        public Validate(context: any): IValidationFailure;
-        public ValidateAsync(context: any): Q.Promise<IValidationFailure>;
-        public HasError : boolean;
-        public Errors : {
-            [name: string]: IValidationFailure;
-        };
-        public HasErrors : boolean;
-        public ErrorCount : number;
-        public ErrorMessage : string;
-        public TranslateArgs : IErrorTranslateArgs[];
-    }
-}
-
-declare module "node-form"{
-    export = Validation;
-}
diff --git a/node-form/tsconfig.json b/node-form/tsconfig.json
new file mode 100644
index 0000000000..7bfe312b24
--- /dev/null
+++ b/node-form/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-form-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-gcm/index.d.ts b/node-gcm/index.d.ts
new file mode 100644
index 0000000000..61c7ae70dc
--- /dev/null
+++ b/node-gcm/index.d.ts
@@ -0,0 +1,87 @@
+// Type definitions for node-gcm 0.14.0
+// Project: https://www.npmjs.org/package/node-gcm
+// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+export interface INotificationOptions {
+    title: string;
+    body?: string;
+    icon: string;
+    sound?: string;
+    badge?: string;
+    tag?: string;
+    color?: string;
+    click_action?: string;
+}
+
+export interface IMessageOptions {
+    collapseKey?: string;
+    priority?: string;
+    contentAvailable?: boolean;
+    delayWhileIdle?: boolean;
+    timeToLive?: number;
+    restrictedPackageName?: string;
+    dryRun?: boolean;
+    data?: {
+        [key: string]: string;
+    };
+    notification?: INotificationOptions;
+}
+
+export declare class Message {
+    constructor(options?: IMessageOptions);
+    collapseKey: string;
+    delayWhileIdle: boolean;
+    timeToLive: number;
+    dryRun: boolean;
+
+    addData(key: string, value: string): void;
+    addData(data: { [key: string]: string }): void;
+    addNotification(value: INotificationOptions): void;
+    addNotification(key: string, value: INotificationOptions): void;
+}
+
+
+export interface ISenderOptions {
+    proxy?: any;
+    maxSockets?: number;
+    timeout?: number;
+}
+export interface ISenderSendOptions {
+    retries?: number;
+    backoff?: number;
+}
+
+export interface IRecipient {
+    to?: string,
+    topic?: string,
+    notificationKey?: string,
+    registrationIds?: string[],
+    registrationTokens?: string[]
+}
+
+export declare class Sender {
+    constructor(key: string, options?: ISenderOptions);
+    key: string;
+    options: ISenderOptions;
+
+    send(message: Message, registrationIds: string | string[] | IRecipient, callback: (err: any, resJson: IResponseBody) => void): void;
+    send(message: Message, registrationIds: string | string[] | IRecipient, retries: number, callback: (err: any, resJson: IResponseBody) => void): void;
+    send(message: Message, registrationIds: string | string[] | IRecipient, options: ISenderSendOptions, callback: (err: any, resJson: IResponseBody) => void): void;
+    sendNoRetry(message: Message, registrationIds: string | string[] | IRecipient, callback: (err: any, resJson: IResponseBody) => void): void;
+}
+
+
+export interface IResponseBody {
+    success: number;
+    failure: number;
+    canonical_ids: number;
+    multicast_id?: number;
+    results?: {
+        message_id?: string;
+        registration_id?: string;
+        error?: string;
+    }[];
+}
diff --git a/node-gcm/node-gcm-tests.ts b/node-gcm/node-gcm-tests.ts
index b184949edf..cab0612d1b 100644
--- a/node-gcm/node-gcm-tests.ts
+++ b/node-gcm/node-gcm-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="node-gcm.d.ts" />
 
 import gcm = require('node-gcm');
 
diff --git a/node-gcm/node-gcm.d.ts b/node-gcm/node-gcm.d.ts
deleted file mode 100644
index 9b3b3f97a0..0000000000
--- a/node-gcm/node-gcm.d.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-// Type definitions for node-gcm 0.14.0
-// Project: https://www.npmjs.org/package/node-gcm
-// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "node-gcm" {
-
-    export interface INotificationOptions {
-        title: string;
-        body?: string;
-        icon: string;
-        sound?: string;
-        badge?: string;
-        tag?: string;
-        color?: string;
-        click_action?: string;
-    }
-    
-    export interface IMessageOptions {
-        collapseKey?: string;
-        priority?: string;
-        contentAvailable?: boolean;
-        delayWhileIdle?: boolean;
-        timeToLive?: number;
-        restrictedPackageName?: string;
-        dryRun?: boolean;
-        data?: {
-            [key: string]: string;
-        };
-        notification?: INotificationOptions;
-    }
-    
-    export class Message {
-        constructor(options?: IMessageOptions);
-        collapseKey: string;
-        delayWhileIdle: boolean;
-        timeToLive: number;
-        dryRun: boolean;
-
-        addData(key: string, value: string): void;
-        addData(data: { [key: string]: string }): void;
-        addNotification(value: INotificationOptions): void;
-        addNotification(key: string, value:INotificationOptions): void;
-    }
-
-
-    export interface ISenderOptions {
-        proxy?: any;
-        maxSockets?: number;
-        timeout?: number;
-    }
-    export interface ISenderSendOptions {
-        retries?: number;
-        backoff?: number;
-    }
-
-    export interface IRecipient {
-        to?: string,
-        topic?: string,
-        notificationKey?: string,
-        registrationIds?: string[],
-        registrationTokens?: string[]
-    }
-    
-    export class Sender {
-        constructor(key: string, options?: ISenderOptions);
-        key: string;
-        options: ISenderOptions;
-
-        send(message: Message, registrationIds: string|string[]|IRecipient, callback: (err: any, resJson: IResponseBody) => void): void;
-        send(message: Message, registrationIds: string|string[]|IRecipient, retries: number, callback: (err: any, resJson: IResponseBody) => void): void;
-        send(message: Message, registrationIds: string|string[]|IRecipient, options: ISenderSendOptions, callback: (err: any, resJson: IResponseBody) => void): void;
-        sendNoRetry(message: Message, registrationIds: string|string[]|IRecipient, callback: (err: any, resJson: IResponseBody) => void): void;
-    }
-
-
-    export interface IResponseBody {
-        success: number;
-        failure: number;
-        canonical_ids: number;
-        multicast_id?: number;
-        results?: {
-            message_id?: string;
-            registration_id?: string;
-            error?: string;
-        }[];
-    }
-
-}
-
diff --git a/node-gcm/tsconfig.json b/node-gcm/tsconfig.json
new file mode 100644
index 0000000000..6cec2c996b
--- /dev/null
+++ b/node-gcm/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-gcm-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-getopt/index.d.ts b/node-getopt/index.d.ts
new file mode 100644
index 0000000000..304f09bd4c
--- /dev/null
+++ b/node-getopt/index.d.ts
@@ -0,0 +1,128 @@
+// Type definitions for node-getopt 0.2.3
+// Project: https://github.com/jiangmiao/node-getopt
+// Definitions by: Karl.M.Cauchy <https://github.com/kcauchy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Type Script Declaration for node-getopt
+ */
+
+
+interface StringMap {
+    [index: string]: string;
+}
+
+/**
+ * Parsed options.
+ */
+declare class ParsedOption {
+    public argv: string[];
+    public options: StringMap;
+
+    constructor(argv: string[], options: StringMap);
+    public empty(): boolean;
+}
+
+interface EventCallback {
+    (args: string[], options: StringMap): void;
+}
+
+interface ErrorFunc {
+    (exception: Error): void;
+}
+
+interface OptionConfigurationArray {
+    [index: number]: string[];
+}
+
+declare class Getopt {
+    static HAS_ARGUMENT: boolean;
+    static NO_ARGUMENT: boolean;
+    static MULTI_SUPPORTED: boolean;
+    static SINGLE_ONLY: boolean;
+    static VERSION: string;
+
+    /**
+     * options is a set of option. each option contains 3 fields.
+     *    [short_name, long_name_with_definition, comment]
+     *    Definition:
+     *    * '=ARG':   has argument
+     *    * '[=ARG]': has argument but optional
+     *    * '+':      multiple option supported
+     *
+     *    ARG can be replaced by any word.
+     * @param options
+     */
+    public constructor(options: any[]);
+
+    /**
+     * after parsing, trigger the action if optionName is found.
+     * the 'this' in action will be the instance of Getopt.
+     * @param name
+     * @param cb
+     */
+    public on(name: string, cb: EventCallback): Getopt;
+
+    public emit(name: string, cb: EventCallback): Getopt;
+
+    /**
+     * parse argv
+     *
+     * Returns: {argv: '...', options: {...}}
+     *
+     */
+    public parse(argv: string[]): ParsedOption;
+
+    /**
+     * alias of parse(process.argv.slice(2))
+     */
+    public parse_system(): ParsedOption;
+
+    public parseSystem(): ParsedOption;
+
+    /**
+     * Set help template. the placeholders will be replaced by getopt.
+     *
+     * Placeholders:
+     *    * [[OPTIONS]] - The options list
+     *
+     * Returns: String
+     * @param help
+     */
+    public setHelp(help: string): Getopt;
+
+    /**
+     * console.info(getopt.getHelp());
+     */
+    public showHelp(): Getopt;
+
+    /**
+     * Get the help generated.
+     */
+    public getHelp(): string;
+
+    /**
+     * set help template to HELP if HELP is not empty.
+     * bind 'help' option to default action, show help and exit with 0.
+     * @param help
+     */
+    public bindHelp(help?: string): Getopt;
+
+    public getVersion(): string;
+
+    static getVersion(): string;
+
+    /**
+     * when parse failed callback will be trigger. default is display error message and exit with 1.
+     * @param errorFunc
+     */
+    public error(errorFunc: ErrorFunc): Getopt;
+
+    /**
+     * equals new Getopt(options)
+     * @param options
+     */
+    static create(options: string[]): Getopt;
+}
+
+export = Getopt;
diff --git a/node-getopt/node-getopt-tests.ts b/node-getopt/node-getopt-tests.ts
index 83aa050536..7427731ca8 100644
--- a/node-getopt/node-getopt-tests.ts
+++ b/node-getopt/node-getopt-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../node/node.d.ts" />
-/// <reference path="node-getopt.d.ts" />
+/// <reference types="node" />
 
 import Getopt = require('node-getopt');
 
diff --git a/node-getopt/node-getopt.d.ts b/node-getopt/node-getopt.d.ts
deleted file mode 100644
index 4a205e800d..0000000000
--- a/node-getopt/node-getopt.d.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-// Type definitions for node-getopt 0.2.3
-// Project: https://github.com/jiangmiao/node-getopt
-// Definitions by: Karl.M.Cauchy <https://github.com/kcauchy>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/**
- * Type Script Declaration for node-getopt
- */
-declare module "node-getopt" {
-
-    interface StringMap {
-        [index: string]: string;
-    }
-
-    /**
-     * Parsed options.
-     */
-    class ParsedOption {
-        public argv: string[];
-        public options: StringMap;
-
-        constructor(argv: string[], options: StringMap);
-        public empty() : boolean;
-    }
-
-    interface EventCallback {
-        (arguments: string[], options: StringMap) : void;
-    }
-
-    interface ErrorFunc {
-        (exception: Error): void;
-    }
-
-    interface OptionConfigurationArray {
-        [index: number]: string[];
-    }
-
-    class Getopt {
-        static HAS_ARGUMENT : boolean;
-        static NO_ARGUMENT : boolean;
-        static MULTI_SUPPORTED : boolean;
-        static SINGLE_ONLY : boolean;
-        static VERSION : string;
-
-        /**
-         * options is a set of option. each option contains 3 fields.
-         *    [short_name, long_name_with_definition, comment]
-         *    Definition:
-         *    * '=ARG':   has argument
-         *    * '[=ARG]': has argument but optional
-         *    * '+':      multiple option supported
-         *
-         *    ARG can be replaced by any word.
-         * @param options
-         */
-        public constructor(options: any[]);
-
-        /**
-         * after parsing, trigger the action if optionName is found.
-         * the 'this' in action will be the instance of Getopt.
-         * @param name
-         * @param cb
-         */
-        public on(name: string, cb: EventCallback) : Getopt;
-
-        public emit(name: string, cb: EventCallback) : Getopt;
-
-        /**
-         * parse argv
-         *
-         * Returns: {argv: '...', options: {...}}
-         *
-         */
-        public parse(argv: string[]): ParsedOption;
-
-        /**
-         * alias of parse(process.argv.slice(2))
-         */
-        public parse_system(): ParsedOption;
-
-        public parseSystem():ParsedOption;
-
-        /**
-         * Set help template. the placeholders will be replaced by getopt.
-         *
-         * Placeholders:
-         *    * [[OPTIONS]] - The options list
-         *
-         * Returns: String
-         * @param help
-         */
-        public setHelp(help: string): Getopt;
-
-        /**
-         * console.info(getopt.getHelp());
-         */
-        public showHelp():Getopt;
-
-        /**
-         * Get the help generated.
-         */
-        public getHelp(): string;
-
-        /**
-         * set help template to HELP if HELP is not empty.
-         * bind 'help' option to default action, show help and exit with 0.
-         * @param help
-         */
-        public bindHelp(help?:string): Getopt;
-
-        public getVersion(): string;
-
-        static getVersion():string;
-
-        /**
-         * when parse failed callback will be trigger. default is display error message and exit with 1.
-         * @param errorFunc
-         */
-        public error(errorFunc: ErrorFunc) : Getopt;
-
-        /**
-         * equals new Getopt(options)
-         * @param options
-         */
-        static create(options: string[]): Getopt;
-    }
-
-    export = Getopt;
-}
diff --git a/node-getopt/tsconfig.json b/node-getopt/tsconfig.json
new file mode 100644
index 0000000000..2c71612969
--- /dev/null
+++ b/node-getopt/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-getopt-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-git/node-git.d.ts b/node-git/node-git.d.ts
deleted file mode 100644
index f966734db4..0000000000
--- a/node-git/node-git.d.ts
+++ /dev/null
@@ -1,684 +0,0 @@
-// Type definitions for node-git
-// Project: https://github.com/christkv/node-git
-// Definitions by: vvakame <https://github.com/vvakame>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "git" {
-    // lib/git/git.js
-    export class Git {
-
-        constructor(gitDirectory:any);
-
-        refs(options:any, prefix:string, callback:(err:any, data:string)=>void):void;
-
-        fs_read(gitDirectory:string, file:string, callback:(err:any, data:any)=>void):void;
-
-        transform_options(options:any):string[];
-
-        git(functionName:any, options:any, ...args:any[]):void; // last element is callback
-
-        call_git(prefix:string, command:any, postfix:string, options:any, args:any, callback: (error: any, result: string) => void):void;
-
-        rev_list(callback:Function):void;
-
-        rev_list(options:any, callback:Function):void;
-
-        rev_list(options:any, reference:string, callback:Function):void;
-
-        rev_parse(options:any, str:string, callback:Function):void;
-
-        rev_parse(options:any, str:string, level:number, callback:Function):void;
-
-        ls_tree(treeish:any, callback:Function):void;
-
-        ls_tree(treeish:any, paths:any[], callback:Function):void;
-
-        ls_tree(treeish:any, paths:any[], options:any, callback:Function):void;
-
-        cat_file(type:any, ref:any, callback:Function):void;
-
-        file_size(ref:any, callback:Function):void;
-
-        fs_mkdir(dir:any, callback:Function):void;
-
-        init(options:any, callback:Function):void;
-
-        // not implemented!
-        clone(options:any, originalPath:any, targetPath:any, callback:Function):void;
-
-        diff(commit1:any, commit2:any, callback: (error: any, patch: string) => void):void;
-
-		diff(commit1: any, commit2: any, options: any, callback: (error: any, patch: string) => void):void;
-
-        fs_exist(path:any, callback:Function):void;
-
-        fs_write(file:any, content:any, callback:Function):void;
-
-        log(commit:any, path:any, options:any, callback:Function):void;
-
-        select_existing_objects(objectIds:any[], callback:Function):void;
-
-        format_patch(options:any, reference:any, callback:Function):void;
-
-        blame(callback:Function):void;
-
-        blame(options:any, callback:Function):void;
-
-        blame_tree(commit:any, callback:Function):void;
-
-        blame_tree(commit:any, path:any, callback:Function):void;
-
-        looking_for(commit:any, callback:Function):void;
-
-        looking_for(commit:any, path:any, callback:Function):void;
-
-        commit(...args:any[]):void; // last element is callback
-
-        commit(options:any, ...args:any[]):void; // last element is callback
-
-        config(...args:any[]):void; // last element is callback
-
-        config(options:any, ...args:any[]):void; // last element is callback
-
-        add(...args:any[]):void; // last element is callback
-
-        add(options:any, ...args:any[]):void; // last element is callback
-
-        remove(...args:any[]):void; // last element is callback
-
-        remove(options:any, ...args:any[]):void; // last element is callback
-
-        ls_files(...args:any[]):void; // last element is callback
-
-        ls_files(options:any, ...args:any[]):void; // last element is callback
-
-        diff_files(...args:any[]):void; // last element is callback
-
-        diff_files(options:any, ...args:any[]):void; // last element is callback
-
-        diff_index(...args:any[]):void; // last element is callback
-
-        diff_index(options:any, ...args:any[]):void; // last element is callback
-
-        file_type(...args:any[]):void; // last element is callback
-
-        file_type(options:any, ...args:any[]):void; // last element is callback
-
-        put_raw_object(...args:any[]):void; // last element is callback
-
-        put_raw_object(options:any, ...args:any[]):void; // last element is callback
-
-        commit_from_sha(id:string):any;
-    }
-
-    // lib/git/actor.js
-    export class Actor {
-        name:string;
-        email:string;
-
-        constructor(name:string, email:string);
-
-        static from_string(str:string):Actor;
-    }
-
-    // lib/git/blame.js
-    export class Blame {
-        repo:Repo;
-        file:string;
-        commit:string;
-        lines:BlameLine[];
-
-        constructor(repo:Repo, file:string, callback:(err:any, blame:Blame)=>void);
-
-        constructor(repo:Repo, file:string, commit:string, callback:(err:any, blame:Blame)=>void);
-    }
-
-    // lib/git/blame_line.js
-    export class BlameLine {
-        lineno:number;
-        oldlineno:number;
-        commit:any;
-        line:string;
-
-        constructor(lineno:number, oldlineno:number, commit:any, line:string);
-    }
-
-    // lib/git/blob.js
-    export class Blob {
-        repo:Repo;
-        id:any;
-        mode:any;
-        name:any;
-        data:any;
-        size:any;
-        mine_type:any;
-        basename:any;
-
-        constructor(repo:any, id:any, mode:any, name:any);
-
-        static blame(repo:any, commit:any, file:any, callback:Function):void;
-    }
-
-    // lib/git/commit.js
-    export class Commit {
-        repo:Repo;
-        id:string;
-        parents:any[];
-        tree:any;
-        author:Actor;
-        sha:string; // synonym to id
-        authored_date:string;
-        committer:Actor;
-        committed_date:string;
-        message:string;
-        filechanges:any;
-        short_message:string;
-        _id_abbrev:any;
-
-        constructor(repo:Repo, id:string, parents:any[], tree:any, author:Actor, authoredDate:string, committer:Actor, committedDate:string, message:string, filechanges:any);
-
-        load(callback:Function):void;
-
-        id_abbrev(callback:Function):void;
-
-        static list_from_string(repo:any, text:any):Commit[];
-
-        static find_all(repo:any, callback:Function):void;
-
-        static find_all(repo:any, reference:any, callback:Function):void;
-
-        static find_all(repo:any, reference:any, options:any, callback:Function):void;
-
-        static count(repo:any, ref:any, callback:Function):void;
-
-        static diff(repo:any, a:any, callback:Function):void;
-
-        static diff(repo:any, a:any, b:any, callback:Function):void;
-
-        static diff(repo:any, a:any, b:any, paths:any, callback:Function):void;
-
-        show(callback:Function):void;
-
-        diffs(callback:Function):void;
-
-        toPatch(callback:Function):void;
-    }
-
-    // lib/git/commit_stats.js
-    export class CommitStats {
-        repo:any;
-        id:any;
-        files:any[];
-        additions:any;
-        deletions:any;
-        total:any;
-
-        constructor(repo:any, id:any, files:any[]);
-
-        static find_all(repo:any, reference:any, callback:Function):void;
-
-        static find_all(repo:any, reference:any, options:any, callback:Function):void;
-
-        static list_from_string(repo:any, text:string):CommitStats[];
-    }
-
-    // lib/git/config.js
-    export class Config {
-        repo:any;
-        data:any;
-
-        constructor(repo:any);
-
-        fetch(key:any, defaultValue:any):any
-
-        set(key:any, value:any, callback:Function):void;
-    }
-
-    // lib/git/diff.js
-    export class Diff {
-        repo:any;
-        a_path:any;
-        b_path:any;
-        a_blob:any;
-        b_blob:any;
-        a_mode:any;
-        b_mode:any;
-        new_file:any;
-        deleted_file:any;
-        diff:any;
-
-        constructor(repo:any, aPath:any, bPath:any, aBlob:any, bBlob:any, aMode:any, bMode:any, newFile:any, deletedFile:any, diff:any);
-
-        static list_from_string(repo:any, text:any, callback:Function):void;
-    }
-
-    // lib/git/file_index/js
-    export class FileIndex {
-        repo_path:any;
-        index_file:any;
-        sha_count:any;
-        commit_index:any;
-        commit_order:any;
-        all_files:any;
-
-        constructor(repoPath:any, callback:Function);
-
-        commits_from(commitSha:any, callback:Function):void;
-
-        sort_commits(shaArray:any[]):any[];
-
-        files(commitSha:any, callback:Function):void;
-
-        count_all(callback:Function):void;
-
-        count(commitSha:any, callback:Function):void;
-
-        commits_for(file:any, callback:Function):void;
-
-        last_commits(commitSha:any, filesMatcher:any, callback:Function):void;
-    }
-
-    // lib/git/file_window.js
-    export class FileWindow {
-        idxfile:any;
-        version:any;
-        global_offset:any;
-        offset:any;
-        seek_offset:any;
-
-        constructor(idxfile:any, version:any);
-
-        unmap():void;
-
-        index(idx:number):void;
-
-        index(idx:any[]):void;
-
-        close():void;
-    }
-
-    // lib/git/git_file_operations.js
-    export class GitFileOperations {
-        static glob_streaming(path:any):any;
-
-        static glob(path:any, callback:Function):void;
-
-        static glob(path:any, files:any, callback:Function):void;
-
-        static fs_read(path:any, file:any, callback:Function):void;
-
-        static fs_mkdir(dir:any, callback:Function):void;
-
-        static fs_exist(dir:any, path:any, callback:Function):void;
-
-        static fs_rmdir_r(dir:any, callback:Function):void;
-
-        static fs_write(dir:any, file:any, content:any, callback:Function):void;
-    }
-
-    // lib/git/git_index.js
-    export class GitIndex {
-        repo:any;
-        tree:any;
-        current_tree:any;
-
-        constructor(repo:any);
-
-        read_tree(tree:any, callback:Function):void;
-
-        add(filePath:any, data:any):void;
-
-        commit(message:any, callback:Function):void;
-
-        commit(message:any, parents:any, callback:Function):void;
-
-        commit(message:any, parents:any, actor:any, callback:Function):void;
-
-        commit(message:any, parents:any, actor:any, lastTree:any, callback:Function):void;
-
-        write_tree(tree:any, callback:Function):any;
-
-        write_tree(tree:any, nowTree:any, callback:Function):any;
-
-        write_blob(data:any):any;
-    }
-
-    // lib/git/git_object.js
-    export class GitObject {
-        static from_raw(rawObject:any, repository:any):any;
-    }
-
-    // lib/git/head.js
-    export class Head {
-        name:string;
-        commit:any; // string or Commit or ...?
-
-        constructor(name:string, commit:any);
-
-        static current(repo:any, callback:Function):void;
-
-        static current(repo:any, options:any, callback:Function):void;
-
-        static find_all(repo:any, callback:Function):void;
-
-        static find_all(repo:any, options:any, callback:Function):void;
-    }
-
-    // lib/git/loose_storage.js
-    export class LooseStorage {
-        directory:any;
-
-        constructor(directory:any);
-
-        find(sha1:any):RawObject;
-
-        get_raw_object(buf:any):RawObject;
-
-        unpack_object_header_gently(buf:any):any[];
-
-        is_legacy_loose_object(buf:any):boolean;
-
-        put_raw_object(content:any, type:any, callback:Function):void;
-
-        static verify_header(type:any, size:any):void;
-    }
-
-    // lib/git/merge.js
-    export class Merge {
-        static STATUS_BOTH:string;
-        static STATUS_OURS:string;
-        static STATUS_THEIRS:string;
-
-        conflicts:any;
-        text:any;
-        sections:any;
-
-        constructor(str:string);
-    }
-
-    // lib/git/pack_storage.js
-    export class PackStorage {
-        name:any;
-        cache:any;
-        version:any;
-        offsets:any;
-        size:any;
-
-        constructor(file:any);
-
-        find(sha1:any):RawObject;
-
-        close():void;
-
-        parse_object(pack:any, offset:any):RawObject;
-
-        unpack_object(pack:any, packfile:any, offset:any, options:any):any[];
-
-        unpack_deltified(packfile:any, type:any, offset:any, objOffset:any, size:any, options:any):any;
-    }
-
-    // lib/git/raw.js
-    export class RawObject {
-        type:any;
-        content:any;
-
-        constructor(type:any, content:any);
-
-        sha1(encoding?:string):any;
-
-        sha1_hex():any;
-    }
-
-    // lib/git/ref.js
-    export class Ref {
-    }
-
-    // lib/git/remote.js
-    export class Remote {
-        constructor(name:any, commit:any);
-
-        find_all(repo:any, callback:Function):void;
-
-        find_all(repo:any, options:any, callback:Function):void;
-    }
-
-    // lib/git/repo.js
-    export class Repo {
-        path:string;
-        options:any;
-        git:any;
-        config_object:any;
-        bare:any;
-        working_directory:any;
-
-        constructor(path:string, callback:(err:any, repo:Repo)=>void);
-
-        constructor(path:string, options:any, callback:(err:any, repo:Repo)=>void);
-
-        head(callback:(err:any, head:Head)=>void):void;
-
-        heads(callback:(err:any, heads:Head[])=>void):void;
-
-        tags(callback:Function):void;
-
-        commits(callback:Function):void;
-
-        commits(start:string, callback:Function):void;
-
-        commits(start:string, maxCount:number, callback:Function):void;
-
-        commits(start:string, maxCount:number, skip:any, callback:Function):void;
-
-        commit(id:string, callback:Function):void;
-
-        commit_count(start:any, callback:Function):void;
-
-        tree(callback:Function):void;
-
-        tree(treeish:string, callback:Function):void;
-
-        tree(treeish:string, paths:any, callback:Function):void;
-
-        blob(id:string, callback:Function):void;
-
-        init_bare(path:any, gitOptions:any, repoOptions:any, callback:Function):void;
-
-        fork_bare(path:any, callback:Function):void;
-
-        fork_bare(path:any, options:any, callback:Function):void;
-
-        // buggy?
-		diff(a: string, callback: (error: any, patch: string) => void):void;
-
-		diff(a: string, b: string, callback: (error: any, patch: string) => void):void;
-
-		diff(a: string, b: string, paths: any, callback: (error: any, patch: string) => void):void;
-
-        commit_diff(commit:string, callback:Function):void;
-
-        alternates(callback:Function):void;
-
-        set_alternates(alts:any, callback:Function):void;
-
-        log(callback:(err:any, commits:Commit[])=>void):void;
-
-        log(commit:string, callback:(err:any, commits:Commit[])=>void):void;
-
-        log(commit:string, path:any, callback:(err:any, commits:Commit[])=>void):void;
-
-        log(commit:string, path:any, options:any, callback:(err:any, commits:Commit[])=>void):void;
-
-        commit_deltas_from(otherRepo:any, callback:Function):void;
-
-        commit_deltas_from(otherRepo:any, reference:any, callback:Function):void;
-
-        commit_deltas_from(otherRepo:any, reference:any, otherReference:any, callback:Function):void;
-
-        refs(callback:Function):void;
-
-        description(callback:Function):void;
-
-        update_ref(head:any, commitSha:any, callback:Function):void;
-
-        get_head(headName:any, callback:Function):void;
-
-        blame(file:string, commit:string, callback:(err:any, blame:Blame)=>void):void;
-
-        commit_stats(callback:Function):void;
-
-        commit_stats(start:any, callback:Function):void;
-
-        commit_stats(start:any, maxCount:any, callback:Function):void;
-
-        commit_stats(start:any, maxCount:any, skip:any, callback:Function):void;
-
-        commit_index(message:any, callback:Function):void;
-
-        commit_all(message:any, callback:Function):void;
-
-        config(callback:Function):void;
-
-        add(files:any, callback:Function):void;
-
-        remove(files:any, callback:Function):void;
-
-        status(callback:Function):void;
-
-        is_head(headName:any, callback:Function):void;
-
-        index(callback:Function):void;
-    }
-
-    // lib/git/repository.js
-    export class Repository {
-        git_directory:any;
-        options:any;
-        already_searched:any;
-        packs:any;
-        loose:any;
-
-        constructor(gitDirectory:any, options?:any);
-
-        get_object_by_sha1(sha1:string):any;
-
-        files_changed(treeSha1:any, treeSha2:any, pathLimiter:any):boolean;
-
-        cat_file(sha:any):any;
-
-        cat_file_size(sha:any):number;
-
-        cat_file_type(sha:any):any;
-
-        ls_tree(sha:any, paths:any, recursive:any):any;
-
-        get_raw_tree(sha:any, recursive:any):any;
-
-        get_raw_trees(sha:any, path:any):string;
-
-        ls_tree_path(sha:any, path:any, append:any):any
-
-        quick_diff(tree1:any, tree2:any, path:any, recurse:any):any[];
-
-        list_tree(sha:any):any;
-
-        rev_list(sha:any, options:any, callback:Function):void;
-
-        object_exists(sha1:any, callback:Function):void;
-
-        in_packs(shaHex:any, callback:Function):void;
-
-        in_loose(shaHex:any, callback:Function):void;
-
-        get_subtree(commitSha:any, path:any, callback:Function):void;
-
-        static init(dir:any, bare:any, callback:Function):void;
-
-        put_raw_object(content:any, type:any, callback:Function):any;
-    }
-
-    // lib/git/status.js
-    export class Status {
-        repo:any;
-        files:any[];
-
-        constructor(repo:any, callback:Function);
-
-        index(file:any):any;
-    }
-
-    // lib/git/status_file.js
-    export class StatusFile {
-        repo:any;
-        path:any;
-        type:any;
-        stage:any;
-        mode_index:any;
-        mode_repo:any;
-        sha_index:any;
-        sha_repo:any;
-        untracked:any;
-
-        constructor(repo:any, hash:any);
-    }
-
-    // lib/git/sub_module.js
-    export class Submodule {
-        repo:any;
-        id:any;
-        mode:any;
-        name:any;
-        basename:any;
-
-        constructor(repo:any, id:any, mode:any, name:any);
-
-        static create(repo:any, attributes:any, callback:Function):void;
-
-        static config(repo:any, ref:any, callback:Function):void;
-    }
-
-    // lib/git/tag.js
-    export class Tag {
-        name:any;
-        commit:any;
-
-        constructor(name:any, commit:any);
-
-        static find_all(repo:any, callback:Function):void;
-
-        static find_all(repo:any, options:any, callback:Function):void;
-    }
-
-    // lib/git/tree.js
-    export class Tree {
-        repo:any;
-        id:any;
-        mode:any;
-        name:any;
-        contents:any;
-        basename:any;
-
-        constructor(repo:any, id:any, mode:any, name:any, contents:any);
-
-        static content_from_string(repo:any, text:any, callback:Function):void;
-
-        find(file:string):any;
-
-        static create(repo:any, callback:Function):void;
-
-        static create(repo:any, attributes:any, callback:Function):void;
-    }
-
-    // lib/git/user_info.js
-    export class UserInfo {
-        name:any;
-        email:any;
-        date:any;
-        offset:any;
-
-        constructor(str:string);
-    }
-
-    // lib/zlib/
-    // lib/sprintf/
-    // lib/diff/
-}
diff --git a/node-imap/imap-tests.ts b/node-imap/imap-tests.ts
deleted file mode 100644
index 3c124ca46d..0000000000
--- a/node-imap/imap-tests.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-/// <reference path="./imap.d.ts" />
-
-import Imap = require('imap');
-var inspect = require('util').inspect;
-
-var imap = new Imap({
-    user: 'mygmailname@gmail.com',
-    password: 'mygmailpassword',
-    host: 'imap.gmail.com',
-    port: 993,
-    tls: true
-});
-
-imap.once('ready', function () {
-    imap.openBox('INBOX', true,function (err, box) {
-        if (err) throw err;
-        var f = imap.seq.fetch('1:3', {
-            bodies: 'HEADER.FIELDS (FROM TO SUBJECT DATE)',
-            struct: true
-        });
-        f.on('message', function (msg, seqno) {
-            console.log('Message #%d', seqno);
-            var prefix = '(#' + seqno + ') ';
-            msg.on('body', function (stream, info) {
-                var buffer = '';
-                stream.on('data', function (chunk) {
-                    buffer += chunk.toString('utf8');
-                });
-                stream.once('end', function () {
-                    console.log(prefix + 'Parsed header: %s', inspect(Imap.parseHeader(buffer)));
-                });
-            });
-            msg.once('attributes', function (attrs) {
-                console.log(prefix + 'Attributes: %s', inspect(attrs, false, 8));
-            });
-            msg.once('end', function () {
-                console.log(prefix + 'Finished');
-            });
-        });
-        f.once('error', function (err) {
-            console.log('Fetch error: ' + err);
-        });
-        f.once('end', function () {
-            console.log('Done fetching all messages!');
-            imap.end();
-        });
-    });
-});
-
-imap.once('error', function (err) {
-    console.log(err);
-});
-
-imap.once('end', function () {
-    console.log('Connection ended');
-});
-
-imap.connect();
-
-imap.openBox('INBOX', true, function (err, box) {
-    if (err) throw err;
-    var f = imap.seq.fetch(box.messages.total + ':*', { bodies: ['HEADER.FIELDS (FROM)', 'TEXT'] });
-    f.on('message', function (msg, seqno) {
-        console.log('Message #%d', seqno);
-        var prefix = '(#' + seqno + ') ';
-        msg.on('body', function (stream, info) {
-            if (info.which === 'TEXT')
-                console.log(prefix + 'Body [%s] found, %d total bytes', inspect(info.which), info.size);
-            var buffer = '', count = 0;
-            stream.on('data', function (chunk) {
-                count += chunk.length;
-                buffer += chunk.toString('utf8');
-                if (info.which === 'TEXT')
-                    console.log(prefix + 'Body [%s] (%d/%d)', inspect(info.which), count, info.size);
-            });
-            stream.once('end', function () {
-                if (info.which !== 'TEXT')
-                    console.log(prefix + 'Parsed header: %s', inspect(Imap.parseHeader(buffer)));
-                else
-                    console.log(prefix + 'Body [%s] Finished', inspect(info.which));
-            });
-        });
-        msg.once('attributes', function (attrs) {
-            console.log(prefix + 'Attributes: %s', inspect(attrs, false, 8));
-        });
-        msg.once('end', function () {
-            console.log(prefix + 'Finished');
-        });
-    });
-    f.once('error', function (err) {
-        console.log('Fetch error: ' + err);
-    });
-    f.once('end', function () {
-        console.log('Done fetching all messages!');
-        imap.end();
-    });
-});
-
-var fs = require('fs'), fileStream : any;
-
-imap.openBox('INBOX', true,function (err, box) {
-    if (err) throw err;
-    imap.search(['UNSEEN', ['SINCE', 'May 20, 2010']], function (err : Error, results: any) {
-        if (err) throw err;
-        var f = imap.fetch(results, { bodies: '' });
-        f.on('message', function (msg, seqno) {
-            console.log('Message #%d', seqno);
-            var prefix = '(#' + seqno + ') ';
-            msg.on('body', function (stream, info) {
-                console.log(prefix + 'Body');
-                stream.pipe(fs.createWriteStream('msg-' + seqno + '-body.txt'));
-            });
-            msg.once('attributes', function (attrs) {
-                console.log(prefix + 'Attributes: %s', inspect(attrs, false, 8));
-            });
-            msg.once('end', function () {
-                console.log(prefix + 'Finished');
-            });
-        });
-        f.once('error', function (err) {
-            console.log('Fetch error: ' + err);
-        });
-        f.once('end', function () {
-            console.log('Done fetching all messages!');
-            imap.end();
-        });
-    });
-});
diff --git a/node-imap/imap.d.ts b/node-imap/imap.d.ts
deleted file mode 100644
index e5f3b18efa..0000000000
--- a/node-imap/imap.d.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-// Type definitions for node imap
-// Project: https://github.com/mscdex/node-imap
-// Definitions by: Steve Fenton <https://github.com/Steve-Fenton>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "imap" {
-    interface ImapOptions {
-        user: string;
-        password: string;
-        host: string;
-        port: number;
-        tls: boolean;
-    }
-
-    interface ImapBox {
-        name: string;
-        readOnly: boolean;
-        newKeywords: boolean;
-        uidvalidity: number;
-        uidnext: number;
-        flags: any[]; // TODO
-        permFlags: any[]; // TODO
-        persistentUIDs: boolean;
-        messages: {
-            total: number;
-            'new': number;
-            unseen: number;
-        }
-    }
-
-    interface ImapChunk {
-        toString(charset: string): string;
-        length: number;
-    }
-
-    interface ImapFetch {
-        once(event: 'end', callback: () => void): void;
-        once(event: 'error', callback: (error: Error) => void): void;
-        once(event: string, callback: Function): void;
-
-        on(event: 'message', callback: (msg: ImapMessage, seqno: number) => void): void;
-        on(event: string, callback: Function): void;
-    }
-
-    interface ImapBodyStream {
-        once(event: 'end', callback: () => void): void;
-        once(event: string, callback: Function): void;
-
-        on(event: 'data', callback: (chunk: ImapChunk) => void): void;
-        on(event: string, callback: Function): void;
-
-        pipe(stream: any): void;
-    }
-
-    interface ImapMessage {
-        // TODO: typeof attributes
-        once(event: 'attributes', callback: (attributes: any) => void): void;
-        once(event: string, callback: Function): void;
-
-        // TODO: typeof info
-        on(event: 'body', callback: (stream: ImapBodyStream, info: any) => void): void;
-        on(event: string, callback: Function): void;
-    }
-
-    class Imap {
-        constructor(options: ImapOptions);
-
-        connect(): void;
-
-        //TODO:
-        // param a
-        openBox(name: string, a: boolean, callback: (err: Error, box: ImapBox) => void) : void;
-
-        //TODO:
-        // param a
-        // param b
-        once(event: 'end', callback: () => void): void;
-        once(event: 'error', callback: (error: Error) => void): void;
-        once(a: string, callback: Function) : void;
-
-        end(): void;
-
-        //TODO:
-        // return type
-        parseHeader(header: string): any;
-        static parseHeader(header: string): any;
-
-        search(searchTerms: any[], callback: Function): void;
-
-        fetch(results: any, options: {}): ImapFetch;
-
-        //TODO:
-        // type
-        seq: {
-            fetch(messageSourceQuery: string, options: {}): ImapFetch;
-        };
-    }
-
-    export = Imap;
-}
diff --git a/node-int64/index.d.ts b/node-int64/index.d.ts
new file mode 100644
index 0000000000..a056b55601
--- /dev/null
+++ b/node-int64/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for node-int64 v0.4.0
+// Project: https://github.com/broofa/node-int64
+// Definitions by: Benno Dreissig <https://github.com/x3cion>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+declare class Int64 {
+
+    static MAX_INT: number;
+    static MIN_INT: number;
+
+    constructor(buffer: Buffer, offset?: number);
+    constructor(array: Uint8Array, offset?: number);
+    constructor(str: string);
+    constructor(hi: number, lo: number);
+
+
+    _2scomp(): void;
+
+    setValue(str: string): void;
+    toNumber(allowImprecise?: boolean): number;
+    valueOf(): number;
+    toString(radix?: number): string;
+    toOctetString(separator?: string): string;
+    toBuffer(rawBuffer?: boolean): Buffer;
+    copy(targetBuffer: Buffer, targetOffset?: number): void;
+    compare(other: Int64): number;
+    equals(other: Int64): boolean;
+    inspect(): string;
+
+}
+
+export = Int64;
diff --git a/node-int64/node-int64-tests.ts b/node-int64/node-int64-tests.ts
index 095bab4a03..16df3a00ca 100644
--- a/node-int64/node-int64-tests.ts
+++ b/node-int64/node-int64-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../node/node.d.ts" />
-/// <reference path="node-int64.d.ts" />
+/// <reference types="node" />
 
 // Play example copy
 
diff --git a/node-int64/node-int64.d.ts b/node-int64/node-int64.d.ts
deleted file mode 100644
index d441d28458..0000000000
--- a/node-int64/node-int64.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-// Type definitions for node-int64 v0.4.0
-// Project: https://github.com/broofa/node-int64
-// Definitions by: Benno Dreissig <https://github.com/x3cion>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "node-int64" {
-	class Int64 {
-
-		static MAX_INT: number;
-		static MIN_INT: number;
-
-		constructor(buffer:Buffer, offset?:number);
-		constructor(array:Uint8Array, offset?:number);
-		constructor(str:string);
-		constructor(hi:number, lo:number);
-
-
-		_2scomp(): void;
-
-		setValue(str:string): void;
-		toNumber(allowImprecise?:boolean): number;
-		valueOf(): number;
-		toString(radix?:number): string;
-		toOctetString(separator?:string): string;
-		toBuffer(rawBuffer?:boolean): Buffer;
-		copy(targetBuffer: Buffer, targetOffset?:number): void;
-		compare(other: Int64): number;
-		equals(other: Int64): boolean;
-		inspect(): string;
-
-	}
-
-	export = Int64;
-
-}
-
-
diff --git a/node-int64/tsconfig.json b/node-int64/tsconfig.json
new file mode 100644
index 0000000000..cd95f4e8a5
--- /dev/null
+++ b/node-int64/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-int64-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-jsfl-runner/index.d.ts b/node-jsfl-runner/index.d.ts
new file mode 100644
index 0000000000..166570deeb
--- /dev/null
+++ b/node-jsfl-runner/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for node-jsfl-runner v0.2.4
+// Project: https://www.npmjs.com/package/node-jsfl-runner
+// Definitions by: Michael Randolph <https://github.com/mrand01>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export interface JSFL {
+    init: (...args: any[]) => void;
+    [index: string]: any;
+}
+
+/**
+ * Creates a JSFL file from a JSFL object
+ * @param jsfl A valid JSFL object
+ * @param fileName Path to output JSFL file location
+ * @param initParams Parameters to pass to JSFL init function
+ * @param callback Callback
+ */
+export function createJSFL(jsfl: JSFL, fileName: string, initParams: Array<any>, callback: (err: NodeJS.ErrnoException) => void): void;
+
+/**
+ * Deletes a JSFL file
+ * @param fileName Path to JSFL file to delete
+ * @param callback Callback
+ */
+export function deleteJSFL(fileName: string, callback: (err: NodeJS.ErrnoException) => void): void;
+
+/**
+ * Runs a JSFL file
+ * @param flashLocation Path to Flash executable
+ * @param fileName Path to JSFL file to run
+ * @param callback Callback
+ */
+export function runJSFL(flashLocation: string, fileName: string, callback: (err: NodeJS.ErrnoException) => void): void;
diff --git a/node-jsfl-runner/node-jsfl-runner-tests.ts b/node-jsfl-runner/node-jsfl-runner-tests.ts
index 31202b9f71..a0b8d8f6cd 100644
--- a/node-jsfl-runner/node-jsfl-runner-tests.ts
+++ b/node-jsfl-runner/node-jsfl-runner-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="node-jsfl-runner.d.ts" />
-
 import * as jsfl from 'node-jsfl-runner';
 
 let myJSFL: jsfl.JSFL = {
diff --git a/node-jsfl-runner/node-jsfl-runner.d.ts b/node-jsfl-runner/node-jsfl-runner.d.ts
deleted file mode 100644
index f3bf197635..0000000000
--- a/node-jsfl-runner/node-jsfl-runner.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Type definitions for node-jsfl-runner v0.2.4
-// Project: https://www.npmjs.com/package/node-jsfl-runner
-// Definitions by: Michael Randolph <https://github.com/mrand01>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-declare module "node-jsfl-runner" {
-  interface JSFL {
-    init: (...args: any[]) => void;
-    [index: string]: any;
-  }
-  
-  /**
-   * Creates a JSFL file from a JSFL object
-   * @param jsfl A valid JSFL object
-   * @param fileName Path to output JSFL file location
-   * @param initParams Parameters to pass to JSFL init function
-   * @param callback Callback
-   */
-  function createJSFL(jsfl: JSFL, fileName: string, initParams: Array<any>, callback: (err: NodeJS.ErrnoException) => void): void;
-  
-  /**
-   * Deletes a JSFL file
-   * @param fileName Path to JSFL file to delete
-   * @param callback Callback
-   */
-  function deleteJSFL(fileName: string, callback: (err: NodeJS.ErrnoException) => void): void;
-  
-  /**
-   * Runs a JSFL file
-   * @param flashLocation Path to Flash executable
-   * @param fileName Path to JSFL file to run
-   * @param callback Callback
-   */
-  function runJSFL(flashLocation:string, fileName: string, callback: (err: NodeJS.ErrnoException) => void): void;
-}
\ No newline at end of file
diff --git a/node-jsfl-runner/tsconfig.json b/node-jsfl-runner/tsconfig.json
new file mode 100644
index 0000000000..0c0e1d746e
--- /dev/null
+++ b/node-jsfl-runner/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-jsfl-runner-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-mysql-wrapper/index.d.ts b/node-mysql-wrapper/index.d.ts
new file mode 100644
index 0000000000..7785d8a7b4
--- /dev/null
+++ b/node-mysql-wrapper/index.d.ts
@@ -0,0 +1,825 @@
+// Type definitions for node-mysql-wrapper
+// Project: https://github.com/nodets/node-mysql-wrapper
+// Definitions by: Makis Maropoulos <https://github.com/kataras>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference path="./my-meteor.d.ts" />
+
+import * as Mysql from 'mysql';
+import * as Promise from 'bluebird';
+import {EventEmitter} from 'events';
+
+declare var EQUAL_TO_PROPERTY_SYMBOL: string;
+declare var TABLE_RULES_PROPERTY: string;
+
+type DeleteAnswer = {
+    affectedRows: number;
+    table: string;
+};
+
+type RawRules = {
+    table: string,
+    begin: string,
+    orderBy: string,
+    orderByDesc: string,
+    groupBy: string,
+    limit: number, // limit = limitStart  =0 and limitEnd = limit.
+    limitStart: number,
+    limitEnd: number,
+    end: string
+
+};
+
+type TableToSearchPart = { tableName: string, propertyName: string };
+
+type PropertyChangedCallback = (args: PropertyChangedArgs) => any;
+
+interface Map<T> {
+    [index: string]: T;
+}
+
+interface IQuery<T> {
+    _table: Table<T>;
+    execute(rawCriteria: any, callback?: (_results: any) => any): Promise<any>;
+}
+
+interface IQueryConstructor<T> {
+    new (_table: Table<T>): IQuery<T>;
+}
+
+
+declare class Helper {
+    /** 
+     * Callback like forEach
+     * @name valueCallback
+     * @function
+     * @param {T} the value of the object's key 
+     * @returnTye {U}
+     * @return {U}
+    */
+        
+    /**
+     * CallbaforEach
+     * @name keyCallback
+     * @function
+     * @param {string} the name of the object's key 
+     * @returnTye {U}
+     * @return {U}
+    */
+
+    constructor();
+
+    /**
+     * Create and return a copy of an object.
+     * @param {T} object the object you want to copy.
+     * @returnType {T}
+     * @return {T}
+     */
+    static copyObject<T>(object: T): T;
+
+    /**
+     * Converts any_string to anyString and returns it.
+     * @param {string} columnKey the string you want to convert.
+     * @returnType {string}
+     * @return {string}
+     */
+    static toObjectProperty(columnKey: string): string;
+
+    /**
+     * Converts anyString to any_string and returns it.
+     * @param {string} objectKey the string you want to convert.
+     * @returnType {string}
+     * @return {string}
+     */
+    static toRowProperty(objectKey: string): string;
+
+    /**
+     * Iterate object's keys and return their values to the callback.
+     * @param {<T>} map the object.
+     * @param {valueCallback}
+     * @returnType {U}
+     * @return {U}
+     */
+    static forEachValue<T, U>(map: T, callback: (value: T) => U): U;
+
+    /**
+    * Iterate object's keys and return their names to the callback.
+    * @param {Map<T>} map the object.
+    * @param {keyCallback}
+    * @returnType {U}
+    * @return {U}
+    */
+
+    static forEachKey<T, U>(map: Map<T>, callback: (key: string) => U): U;
+
+    /**
+     * Checks if anything is a function.
+     * @param {functionToCheck} the object or function to pass
+     * @return boolean
+     */
+    static isFunction(functionToCheck: any): boolean;
+
+    /**
+     * Checks if an object has 'tableRules' property.
+     * @param {obj} the object to pass
+     * @return boolean
+     */
+    static hasRules(obj: any): boolean;
+}
+
+
+interface ICriteriaParts {
+    rawCriteriaObject: any;
+    tables: TableToSearchPart[];
+    noDatabaseProperties: string[];
+    whereClause: string;
+
+    selectFromClause<T>(_table: Table<T>): string;
+
+}
+
+
+
+declare class CriteriaParts implements ICriteriaParts {
+
+    /**
+     * The raw format of the criteria eg: {yearsOld:22}.
+     */
+    rawCriteriaObject: any;
+
+    /**
+     * Which tables to search after the find method of the proto table finish.
+     */
+    tables: TableToSearchPart[];
+
+    /**
+     * The properties of the criteria which don't belong to the database's table.
+     */
+    noDatabaseProperties: string[];
+
+    /**
+     * The converted/exported where clause. 
+     */
+    whereClause: string;
+
+    constructor(rawCriteriaObject: any, tables: TableToSearchPart[], noDatabaseProperties: string[], whereClause: string);
+
+    selectFromClause<T>(_table: Table<T>): string;
+}
+
+declare class CriteriaDivider<T> {
+    private _table;
+    constructor(table: Table<T>);
+
+    /**
+     * Builds the criteria raw object to Criteria object.
+     * @param {any} rawCriteriaObject the criteria at raw format you pass eg: {yearsOld:18}.
+     * @returnType {Criteria}
+     * @return {Criteria}
+     */
+    build(rawCriteriaObject: any): CriteriaParts;
+}
+
+declare class SelectQueryRules {
+    private lastPropertyClauseName: string;
+    manuallyEndClause: string;
+    manuallyBeginClause: string;
+    exceptColumns: string[];
+    orderByColumn: string;
+    orderByDescColumn: string;
+    groupByColumn: string;
+    limitStart: number;
+    limitEnd: number;
+    public tableName: string; //auto den benei oute sto last, oute sto from.
+    static build(): SelectQueryRules;
+    private last(propertyClauseName);
+    except(...columns: string[]): SelectQueryRules;
+
+    /**
+     * Same as .except(...columns)
+     */
+    exclude(...columns: string[]): SelectQueryRules;
+
+    orderBy(columnKey: string, descending?: boolean): SelectQueryRules;
+    groupBy(columnKey: string): SelectQueryRules;
+    limit(limitRowsOrStart: number, limitEnd?: number): SelectQueryRules;
+    appendToBegin(manualAfterWhereString: string): SelectQueryRules;
+    appendToEnd(manualAfterWhereString: string): SelectQueryRules;
+    append(appendToCurrent: string): SelectQueryRules;
+    clearOrderBy(): SelectQueryRules;
+    clearGroupBy(): SelectQueryRules;
+    clearLimit(): SelectQueryRules;
+    clearEndClause(): SelectQueryRules;
+    clearBeginClause(): SelectQueryRules;
+    clear(): SelectQueryRules;
+    from(parentRule: SelectQueryRules): SelectQueryRules;
+    isEmpty(): boolean;
+    toString(): string;
+    toRawObject(): RawRules;
+    static toString(rules: SelectQueryRules): string;
+    static toRawObject(rules: SelectQueryRules): RawRules;
+    static fromRawObject(obj: RawRules): SelectQueryRules;
+}
+
+declare class CriteriaBuilder<T>{
+
+    private rawCriteria: any;
+    private primaryTable: Table<T>;
+    private parentBuilder: CriteriaBuilder<any>;
+
+    constructor(primaryTable: Table<T>); //to arxiko apo to Table.ts 9a benei
+    constructor(primaryTable: Table<T>, tableName: string, parentBuilder: CriteriaBuilder<any>);// auta 9a benoun apo to parent select query.
+    constructor(primaryTable: Table<T>, tablePropertyName?: string, parentBuilder?: CriteriaBuilder<any>);
+
+    except(...columns: string[]): CriteriaBuilder<T>;
+
+    /**
+    * Same as .except(...columns)
+    */
+    exclude(...columns: string[]): CriteriaBuilder<T>;
+
+    where(key: string, value: any): CriteriaBuilder<T>;
+
+    private createRulesIfNotExists(): void;
+
+    orderBy(column: string, desceding?: boolean): CriteriaBuilder<T>;
+
+    limit(start: number, end?: number): CriteriaBuilder<T>;
+
+    join(realTableName: string, foreignColumnName: string): CriteriaBuilder<T>;
+
+    joinAs(tableNameProperty: string, realTableName: string, foreignColumnName: string): CriteriaBuilder<T>;
+
+    at(tableNameProperty: string): CriteriaBuilder<T>;
+
+    parent(): CriteriaBuilder<T>;
+
+    original(): CriteriaBuilder<T>;
+
+    /**
+     * Auto kanei kuklous mexri na paei sto primary table kai ekei na epistrepsei to sunoliko raw criteria gia execute i kati allo.
+     */
+    build(): any;
+
+    static from<T>(table: Table<T>): CriteriaBuilder<T>
+
+}
+
+declare class SelectQuery<T> implements IQuery<T> { // T for Table's result type.
+
+    _table: Table<T>
+    constructor(_table: Table<T>);
+
+    private parseQueryResult(result: any, criteria: ICriteriaParts): Promise<any>;
+
+    /**
+     * Executes the select and returns the Promise.
+     */
+    promise(rawCriteria: any, callback?: (_results: T[]) => any): Promise<T[]>;
+
+    /**
+     * Exactly the same thing as promise().
+     * Executes the select and returns the Promise.
+    */
+    execute(rawCriteria: any, callback?: (_results: T[]) => any): Promise<T[]>;
+}
+
+declare class SaveQuery<T> implements IQuery<T> {
+    _table: Table<T>
+    constructor(_table: Table<T>);
+    execute(criteriaRawJsObject: any, callback?: (_result: T | any) => any): Promise<T | any>;
+}
+
+declare class DeleteQuery<T> implements IQuery<T>{
+    _table: Table<T>
+    constructor(_table: Table<T>);
+    execute(criteriaOrID: any | number | string, callback?: (_result: DeleteAnswer) => any): Promise<DeleteAnswer>;
+}
+
+
+declare class PropertyChangedArgs {
+    propertyName: string;
+    oldValue: any;
+    constructor(propertyName: string, oldValue: any);
+}
+
+declare class ObservableObject {
+
+    /** Property names that your row couldn't have:
+     * "propertyChangedListeners", "notifyPropertyChanged", "onPropertyChanged", "toJSON", "makeObservable", "_forget"
+     */
+    static RESERVED_PROPERTY_NAMES: string[];
+
+    private propertyChangedListeners: PropertyChangedCallback[];
+
+    /** Make the obj observable. Used in constructor or extend this class and use it. */
+    private makeObservable(obj: any): void;
+
+    constructor();
+    constructor(obj?: any);
+
+    /**Add a listener/observer to watch for changes in this object's properties */
+    onPropertyChanged(listener: PropertyChangedCallback): void;
+
+    /** If developer wants manualy notify for property changed */
+    notifyPropertyChanged(propertyName: string, oldValue: any): void;
+
+    /**Remove property changed listeners  */
+    _forget(): void;
+
+    toJSON(...excludeProperties: string[]): any;
+
+}
+
+declare enum CollectionChangedAction {
+    INSERT, DELETE, RESET//for now I will use only add, remove and reset . replace and move is for future., REPLACE, MOVE
+}
+
+declare class CollectionChangedEventArgs<T> {
+    action: CollectionChangedAction;
+    oldItems: (T | (T & ObservableObject))[];
+    newItems: (T | (T & ObservableObject))[];
+    oldStartingIndex: number;
+    newStartingIndex: number;
+
+    constructor(action: CollectionChangedAction, oldItems?: (T | (T & ObservableObject))[], newItems?: (T | (T & ObservableObject))[], oldStartingIndex?: number, newStartingIndex?: number);
+}
+
+
+declare class BaseCollection<T> {//T=result type of Table
+    private list: (T | (T & ObservableObject))[];
+    listeners: ((eventArgs: CollectionChangedEventArgs<T>) => void)[];
+    constructor(table: Table<T>);
+    length: number;
+    items: (T | (T & ObservableObject))[];
+    indexOf(item: T | string | number): number;
+    findItem(itemId: string | number): T;
+    getItem(index: number): T;
+    getItemObservable(index: number): T & ObservableObject;
+    addItem(...items: (T | (T & ObservableObject))[]): (T | (T & ObservableObject));
+    removeItem(...items: (T | (T & ObservableObject))[]): BaseCollection<T>;
+    removeItemById(id: number | string): BaseCollection<T>;
+    forgetItem(...items: (T | (T & ObservableObject))[]): BaseCollection<T>;
+    reset(): BaseCollection<T>;
+    notifyCollectionChanged(evtArgs: CollectionChangedEventArgs<T>): void;
+    onCollectionChanged(callback: (eventArgs: CollectionChangedEventArgs<T>) => void): void;
+}
+
+declare class ObservableCollection<T> { //auti i klasi 9a xrisimopoieite ws Collection me kapoies paralages mesa sto index.ts.
+    local: BaseCollection<T>;
+    private _items: (T & ObservableObject)[];
+
+    constructor(table: Table<T>, fetchAllFromDatabase?: boolean, callbackWhenReady?: Function);
+
+    items: (T & ObservableObject)[];
+
+    onCollectionChanged(callback: (eventArgs: CollectionChangedEventArgs<T>) => void): void;
+
+    startListeningToDatabase(): void;
+
+    find(criteriaRawJsObject?: any, callback?: (_results: T[]) => any): Promise<T[]>;
+
+    findOne(criteriaRawJsObject: any, callback?: (_result: T) => any): Promise<T>;
+
+    findById(id: number | string, callback?: (result: T) => any): Promise<T>;
+
+    findAll(tableRules?: RawRules, callback?: (_results: T[]) => any): Promise<T[]>;
+
+    /**
+     * .insert() and .update() do the same thing:  .save();
+     */
+    insert(criteriaRawJsObject: any, callback?: (_result: any) => any): Promise<T | any>;
+
+    update(criteriaRawJsObject: any, callback?: (_result: any) => any): Promise<T | any>;
+
+    save(criteriaRawJsObject: any, callback?: (_result: any) => any): Promise<T | any>;
+
+    remove(criteriaOrID: any | number | string, callback?: (_result: DeleteAnswer) => any): Promise<DeleteAnswer>;
+
+    /**
+     * same thing as .remove();
+     */
+    delete(criteriaOrID: any | number | string, callback?: (_result: DeleteAnswer) => any): Promise<DeleteAnswer>;
+
+
+}
+
+declare class MeteorCollection<T> {
+    private collection: Mongo.Collection<T>;
+    protected table: Table<T>;
+
+    constructor(table: Table<T>, name?: string);
+
+    startListeningToDatabase(): void;
+
+    rawCollection: Mongo.Collection<T>;
+
+    fill(criteriaRawJsObject: any): void;
+
+    fillAll(): void;
+
+    fillOne(criteriaRawJsObject: any): void;
+
+    //ONLY MONGO/METEOR COLLECTION METHODS START
+    allow(options: {
+        insert?: (userId: string, doc: T) => boolean;
+        update?: (userId: string, doc: T, fieldNames: string[], modifier: any) => boolean;
+        remove?: (userId: string, doc: T) => boolean;
+        fetch?: string[];
+        transform?: Function;
+    }): boolean;
+
+    deny(options: {
+        insert?: (userId: string, doc: T) => boolean;
+        update?: (userId: string, doc: T, fieldNames: string[], modifier: any) => boolean;
+        remove?: (userId: string, doc: T) => boolean;
+        fetch?: string[];
+        transform?: Function;
+    }): boolean;
+
+    find(selector?: any, options?: {
+        sort?: any;
+        skip?: number;
+        limit?: number;
+        fields?: any;
+        reactive?: boolean;
+        transform?: Function;
+    }): Mongo.Cursor<T>;
+
+    findOne(selector?: any, options?: {
+        sort?: any;
+        skip?: number;
+        fields?: any;
+        reactive?: boolean;
+        transform?: Function;
+    }): T;
+
+    //ONLY MONGO/METEOR COLLECTION METHODS FINISH.
+
+}
+
+
+declare class Connection extends EventEmitter {
+
+    /**
+     * The real database connection socket.
+     */
+    connection: Mysql.IConnection;
+
+    /**
+     * Collection of the supported event types for the tables.
+     */
+    eventTypes: string[];
+
+    /**
+     * Force to fetch ONLY these Database table names {array of string}.  
+     */
+    tableNamesToUseOnly: any[];
+
+    /**
+     * All tables {MysqlTable} inside this connection's database.
+     */
+    tables: Table<any>[];
+
+    constructor(connection: string | Mysql.IConnection | Mysql.IConnectionConfig);
+
+    /**
+     * Creates the MysqlConnection from the connection url or the real connection object.
+     * @param {string | Mysql.IConnection |  Mysql.IConnectionConfig} connection the connection url or the real connection object.
+     * @returnType {nothing}
+     * @return {nothing}
+     */
+    create(connection: string | Mysql.IConnection | Mysql.IConnectionConfig): void;
+
+    /**
+     * Attach a real connection.
+     * @param {Mysql.IConnection} connection the real connection object.
+     * @returnType {nothing}
+     * @return {nothing} 
+     */
+    attach(connection: Mysql.IConnection): void;
+
+    /**
+     * Close the entire real connection and remove all event's listeners (if exist).
+     * @param {function} callback If error occurs when closing the connection, this callback has the responsibility to catch it.
+     * @returnType {nothing}
+     * @return {nothing} 
+     */
+    end(callback?: (error: any) => void): void;
+
+    /**
+     * Close the entire real connection and remove all event's listeners (if exist).
+     * the difference from the 'end' is that this method doesn't care about errors so no callback passing here. 
+     */
+    destroy(): void;
+
+    /**
+     * Clear all binary logs from the whole database.
+     * When finish returns a promise, use it with .then(function(){});
+     * @return Promise
+     */
+    clearBinaryLogs(): Promise<void>;
+
+    /**
+     * Link the real connection with this MysqlConnection object.
+     * @param {function} readyCallback when the link operation is done this callback is executed.
+     * @returnType {Promise}
+     * @return {Promise}
+     */
+    link(readyCallback?: () => void): Promise<void>;
+
+    /**
+     * Force to use/fetch information from only certain of database's tables, otherwise all database's tables information will be fetched.
+     * @param {Array} tables the array of the tables  {string}
+     * @returnType {nothing}
+     * @return {nothing}
+     */
+    useOnly(...tables: any[]): void;
+
+    /**
+     * This method has the resposibility of fetching the correct tables from the database ( table = columns' names, primary key name).
+     * @returnType {Promise}
+     * @return {Promise}
+     */
+    fetchDatabaseInformation(): Promise<void>;
+
+    /**
+     * Escape the query column's value  and return it.
+     * @param {string} val the value which will be escaped. 
+     * @returnType {string}
+     * @return {string}
+     */
+    escape(val: string): string;
+
+    /**
+     * Call when must notify the Database events, SAVE(INSERT,UPDATE), REMOVE(DELETE).
+     * @param {string} tableWhichCalled the table name which event is coming from.
+     * @param {string} queryStr the full parsed query string which used to determinate the type of event to notify.
+     * @param {any[]} rawRows the raw rows results (results before a method parse/edit/export them as objects), these are passing to the watch listener(s).
+     * @returnType {nothing}
+     * @return {nothing}
+     */
+    notice(tableWhichCalled: string, queryStr: string, rawRows: any[]): void;
+
+    /**
+     * Adds an event listener/watcher on a table for a 'database event'.
+     * @param {string} tableName the table name which you want to add the event listener.
+     * @param {string or string[]} evtType the event(s) type you want to watch, one of these(string) or an array of them(string[]): ["INSERT", "UPDATE", "REMOVE", "SAVE"].
+     * @param {function} callback Callback which has one parameter(typeof any[]) which filled by the rawRows (results after query executed and before parsed to object(s)). 
+     * @returnType {nothing}
+     * @return {nothing}
+     */
+    watch(tableName: string, evtType: any, callback: (rawRows: any[]) => void): void;
+
+    /**
+     * Removes an event listener/watcher from a table for a specific event type.
+     * @param {string} tableName the table name which you want to remove the event listener. 
+     * @param {string} evtType the Event type you want to remove, one of these: "INSERT", "UPDATE", "REMOVE", "SAVE".
+     * @param {function} callbackToRemove the callback that you were used for watch this event type.
+     * @returnType {nothing}
+     * @return {nothing}
+     */
+    unwatch(tableName: string, evtType: string, callbackToRemove: (rawResults: any[]) => void): void;
+
+    /**
+     * Executes a database query.
+     * @param {string} queryStr the query text/string to be executed.
+     * @param {function} callback the function will be called and fill the one and only parameter when an errors occurs.
+     * @param {any[]} queryArguments (optional) the query arguments you want to pass into query. ['arg1','arg2']...
+     * @returnType {nothing}
+     * @return {nothing} 
+     */
+    query(queryStr: string, callback: (err: Mysql.IError, results: any) => any, queryArguments?: any[]): void;
+
+    /**
+     * Returns a MysqlTable object from the database factory. (Note: this method doesn't create anything, just finds and returns the correct table, you don't have to create anything at all. Tables are fetched by the library itself.)
+     * If you are using typescript you can pass a class (generic<T>) in order to use the auto completion assistance on table's results methods(find,findById,findAll,save,remove,safeRemove). 
+     * @param {string} tableName the table name which you want to get, on the form of: 'anyDatabaseTable' OR 'any_database_table' (possible your real table name into your database).
+     * @returnType {MysqlTable}
+     * @return {MysqlTable}
+     */
+    table<T>(tableName: string): Table<T>;
+}
+
+declare class Table<T>  {
+    /** Private keywords here are useless but I put them. 
+     * If the developer wants to see the properties of the Table class, he/she just comes here.
+    */
+
+    private _name: string;
+    private _connection: Connection;
+    private _columns: string[];
+    private _primaryKey: string;
+    private _criteriaDivider: CriteriaDivider<T>;
+    private _rules: SelectQueryRules;
+    private _selectQuery: SelectQuery<T>
+    private _saveQuery: SaveQuery<T>;
+    private _deleteQuery: DeleteQuery<T>;
+    constructor(tableName: string, connection: Connection);
+
+
+
+    /**
+     * An array of all columns' names inside this table.
+     */
+    columns: string[];
+
+    /**
+     * The name of the primary key column which this table is using.
+     */
+    primaryKey: string;
+
+    /**
+     * The MysqlConnection object which this MysqlTable belongs. 
+     */
+    connection: Connection;
+
+    /**
+     * The real database name of the table. Autofilled by library. 
+     */
+    name: string;
+
+    /**
+     * Set of the query rules that will be applied after the 'where clause' on each select query executed by this table. 
+     * @return {SelectQueryRules}
+     */
+    rules: SelectQueryRules;
+
+    /**
+     * Returns this table's criteria divider class.
+     * @return {CriteriaDivider}
+     */
+    criteriaDivider: CriteriaDivider<T>;
+
+    /**
+     * Returns new Criteria Builder each time.
+     * Helps you  to make criteria raw js objects ready to use in find,remove and save methods.
+     * @return {CriteriaBuilder}
+     */
+    criteria: CriteriaBuilder<T>;
+
+    /**
+    * Adds or turn on an event listener/watcher on a table for a 'database event'.
+    * @param {string} evtType the event type you want to watch, one of these: ["INSERT", "UPDATE", "REMOVE", "SAVE"].
+    * @param {function} callback Callback which has one parameter(typeof any[]) which filled by the rawResults (results after query executed and before exports to object(s)). 
+    * @returnType {nothing}
+    * @return {nothing}
+    */
+    on(evtType: string, callback: (rawResults: any[]) => void): void;
+
+    /**
+     * Removes or turn off an event listener/watcher from a table for a specific event type.
+     * @param {string} evtType the Event type you want to remove, one of these: "INSERT", "UPDATE", "REMOVE", "SAVE".
+     * @param {function} callbackToRemove the callback that you were used for watch this event type.
+     * @returnType {nothing}
+     * @return {nothing}
+     */
+    off(evtType: string, callbackToRemove: (rawResults: any[]) => void): void;
+
+    /**
+     * Use it when you want to check if extended function is exists here.
+     * @param {string} extendedFunctionName the name of the function you want to check.
+     * @returnType {boolean}
+     * @return {boolean}
+     */
+    has(extendedFunctionName: string): boolean;
+
+    /**
+     * Extends this table's capabilities with a function.
+     * @param {string} functionName the function name you want to use, this is used when you want to call this function later.
+     * @param {function} theFunction the function with any optional parameters you want to pass along.
+     * @returnType {nothing}
+     * @return {nothing} 
+     */
+    extend(functionName: string, theFunction: (...args: any[]) => any): void;
+
+    /**
+     * Converts and returns an object from this form: { a_property:'dsda', other_property:something, any_property_name:true } to { aProperty:..., otherProperty...,anyPropertyName...}
+     * @param {any} row the raw row object.
+     * @returnType {any}
+     * @return {any}
+     */
+    objectFromRow(row: any): any;
+
+    /**
+     * Converts and returns an object from this form: { aProperty:'dsda', otherProperty:something, anyPropertyName:true } to { a_property:..., other_property...,any_property_name...}
+     * @param {any} row the raw row object.
+     * @returnType {any}
+     * @return {any}
+     */
+    rowFromObject(obj: any): any;
+
+    /**
+     * Returns and array of [columns[],values[]]
+     * @param {any} jsObject the raw row object.
+     * @returnType {array}
+     * @return {array}
+     */
+    getRowAsArray(jsObject: any): Array<any>;
+
+    /**
+     * Returns the primary key's value from an object.
+     * @param {any} jsObject the object which you want to find and return the value of the primary key.
+     * @returnType {number | string}
+     * @return {number | string}
+     */
+    getPrimaryKeyValue(jsObject: any): number | string;
+
+    /**
+     * 
+     */
+    find(criteriaRawJsObject: any): Promise<T[]>; // only criteria 
+    find(criteriaRawJsObject: any, callback: ((_results: T[]) => any)): Promise<T[]>; // criteria and callback
+    find(criteriaRawJsObject: any, callback?: (_results: T[]) => any): Promise<T[]>;
+
+    findSingle(criteriaRawJsObject: any, callback?: (_result: T) => any): Promise<T>;
+
+    findById(id: number | string): Promise<T>; // without callback
+    findById(id: number | string, callback?: (result: T) => any): Promise<T>;
+
+    findAll(): Promise<T[]>; // only criteria and promise
+    findAll(tableRules: RawRules): Promise<T[]> // only rules and promise
+    findAll(tableRules?: RawRules, callback?: (_results: T[]) => any): Promise<T[]>;
+
+
+    save(criteriaRawJsObject: any): Promise<any>; //without callback
+    save(criteriaRawJsObject: any, callback?: (_result: any) => any): Promise<any>;
+
+    remove(id: number | string): Promise<DeleteAnswer>; // ID without callback
+    remove(criteriaRawObject: any): Promise<DeleteAnswer>; // criteria obj without callback
+    remove(criteriaOrID: any | number | string, callback?: (_result: DeleteAnswer) => any): Promise<DeleteAnswer>;
+
+}
+
+declare class MeteorTable<T>{
+    public table: Table<T>;
+    constructor(table: Table<T>);
+
+    insert(doc: T, callback?: (_result: T) => void): T;
+
+    remove(selector: any, callback?: () => DeleteAnswer): DeleteAnswer;
+
+    update(selector: any, modifier: any, options?: {
+        multi?: boolean;
+        upsert?: boolean;
+    }, callback?: (result: T) => any): number;
+
+    collection(nameOfCollection?: string, fillWithCriteria?: any): Mongo.Collection<T>;
+}
+
+declare class Database {
+    connection: Connection;
+    isReady: boolean;
+    readyListenerCallbacks: Function[];
+    constructor(connection?: Connection);
+    static when(..._promises: Promise<any>[]): Promise<any>;
+    setConnection(connection: Connection): void;
+
+    /**
+     * Force to use/fetch information from only certain of database's tables, otherwise all database's tables information will be fetched.
+     * @param {Array} tables the array of the tables  {string}
+     * @returnType {nothing}
+     * @return {nothing}
+     */
+    useOnly(...useTables: any[]): void;
+
+    has(tableName: string, functionName?: string): boolean;
+    ready(callback?: () => void): void;
+    table<T>(tableName: string): Table<T>;
+    noticeReady(): void;
+    removeReadyListener(callback: () => void): void;
+    query(queryStr: string, callback: (err: Mysql.IError, results: any) => any, queryArguments?: any[]): void;
+
+    /**
+    * Close the entire real connection and remove all event's listeners (if exist).
+    * the difference from the 'end' is that this method doesn't care about errors so no callback passing here. 
+    */
+    destroy(): void;
+
+    /**
+   * Close the entire real connection and remove all event's listeners (if exist).
+   * @param {function} maybeAcallbackError If error occurs when closing the connection, this callback has the responsibility to catch it.
+   * @returnType {nothing}
+   * @return {nothing} 
+   */
+    end(maybeAcallbackError: (err: any) => void): void;
+
+    newTableRules(tableName: string): SelectQueryRules;
+
+    buildRules(): SelectQueryRules;
+    buildRules(parentRules?: SelectQueryRules): SelectQueryRules;
+
+    collection<T>(tableName: string, callbackWhenReady?: Function): ObservableCollection<T>;
+
+    /**Meteor js feature only: Returns a table which it's collection can make synchronization with the client */
+    meteorTable<T>(tableName: string): MeteorTable<T>;
+}
+
+declare function wrap(mysqlUrlOrObjectOrMysqlAlreadyConnection: Mysql.IConnection | string, ...useTables: any[]): Database;
+
+/** For meteor js only
+ * Same as wrap but it's sync mode - autoconnect to the database without need to use database.ready(callback).
+ */
+declare function connect(mysqlUrlOrObjectOrMysqlAlreadyConnection: Mysql.IConnection | string, ...useTables: any[]): Database;
+
+declare function observable<T>(obj: T): T & ObservableObject;
diff --git a/node-mysql-wrapper/node-mysql-wrapper-tests.ts b/node-mysql-wrapper/node-mysql-wrapper-tests.ts
index 3d26b6e8bc..6e01affe12 100644
--- a/node-mysql-wrapper/node-mysql-wrapper-tests.ts
+++ b/node-mysql-wrapper/node-mysql-wrapper-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="./node-mysql-wrapper.d.ts" />
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../bluebird/bluebird.d.ts" />
+
+/// <reference types="node" />
+/// <reference types="bluebird" />
 
 var express = require('express');
 var app = express();
diff --git a/node-mysql-wrapper/node-mysql-wrapper.d.ts b/node-mysql-wrapper/node-mysql-wrapper.d.ts
deleted file mode 100644
index 2eb489f079..0000000000
--- a/node-mysql-wrapper/node-mysql-wrapper.d.ts
+++ /dev/null
@@ -1,830 +0,0 @@
-// Type definitions for node-mysql-wrapper
-// Project: https://github.com/nodets/node-mysql-wrapper
-// Definitions by: Makis Maropoulos <https://github.com/kataras>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path='./../mysql/mysql.d.ts' />
-///<reference path='./../bluebird/bluebird.d.ts' />
-///<reference path="./my-meteor.d.ts" />
-
-
-declare module "node-mysql-wrapper" {
-    import * as Mysql from 'mysql';
-    import * as Promise from 'bluebird';
-    import {EventEmitter} from 'events';
-
-    var EQUAL_TO_PROPERTY_SYMBOL: string;
-    var TABLE_RULES_PROPERTY: string;
-
-    type DeleteAnswer = {
-        affectedRows: number;
-        table: string;
-    };
-
-    type RawRules = {
-        table: string,
-        begin: string,
-        orderBy: string,
-        orderByDesc: string,
-        groupBy: string,
-        limit: number, // limit = limitStart  =0 and limitEnd = limit.
-        limitStart: number,
-        limitEnd: number,
-        end: string
-
-    };
-
-    type TableToSearchPart = { tableName: string, propertyName: string };
-
-    type PropertyChangedCallback = (args: PropertyChangedArgs) => any;
-
-    interface Map<T> {
-        [index: string]: T;
-    }
-
-    interface IQuery<T> {
-        _table: Table<T>;
-        execute(rawCriteria: any, callback?: (_results: any) => any): Promise<any>;
-    }
-
-    interface IQueryConstructor<T> {
-        new (_table: Table<T>): IQuery<T>;
-    }
-
-
-    class Helper {
-        /** 
-         * Callback like forEach
-         * @name valueCallback
-         * @function
-         * @param {T} the value of the object's key 
-         * @returnTye {U}
-         * @return {U}
-        */
-        
-        /**
-         * Callback like forEach
-         * @name keyCallback
-         * @function
-         * @param {string} the name of the object's key 
-         * @returnTye {U}
-         * @return {U}
-        */
-
-        constructor();
-        
-        /**
-         * Create and return a copy of an object.
-         * @param {T} object the object you want to copy.
-         * @returnType {T}
-         * @return {T}
-         */
-        static copyObject<T>(object: T): T;
-        
-        /**
-         * Converts any_string to anyString and returns it.
-         * @param {string} columnKey the string you want to convert.
-         * @returnType {string}
-         * @return {string}
-         */
-        static toObjectProperty(columnKey: string): string;
-        
-        /**
-         * Converts anyString to any_string and returns it.
-         * @param {string} objectKey the string you want to convert.
-         * @returnType {string}
-         * @return {string}
-         */
-        static toRowProperty(objectKey: string): string;
-    
-        /**
-         * Iterate object's keys and return their values to the callback.
-         * @param {<T>} map the object.
-         * @param {valueCallback}
-         * @returnType {U}
-         * @return {U}
-         */
-        static forEachValue<T, U>(map: T, callback: (value: T) => U): U;
-
-        /**
-        * Iterate object's keys and return their names to the callback.
-        * @param {Map<T>} map the object.
-        * @param {keyCallback}
-        * @returnType {U}
-        * @return {U}
-        */
-
-        static forEachKey<T, U>(map: Map<T>, callback: (key: string) => U): U;
-        
-        /**
-         * Checks if anything is a function.
-         * @param {functionToCheck} the object or function to pass
-         * @return boolean
-         */
-        static isFunction(functionToCheck: any): boolean;
-        
-        /**
-         * Checks if an object has 'tableRules' property.
-         * @param {obj} the object to pass
-         * @return boolean
-         */
-        static hasRules(obj: any): boolean;
-    }
-
-
-    interface ICriteriaParts {
-        rawCriteriaObject: any;
-        tables: TableToSearchPart[];
-        noDatabaseProperties: string[];
-        whereClause: string;
-
-        selectFromClause<T>(_table: Table<T>): string;
-
-    }
-
-
-
-    class CriteriaParts implements ICriteriaParts {
-        
-        /**
-         * The raw format of the criteria eg: {yearsOld:22}.
-         */
-        rawCriteriaObject: any;
-        
-        /**
-         * Which tables to search after the find method of the proto table finish.
-         */
-        tables: TableToSearchPart[];
-        
-        /**
-         * The properties of the criteria which don't belong to the database's table.
-         */
-        noDatabaseProperties: string[];
-        
-        /**
-         * The converted/exported where clause. 
-         */
-        whereClause: string;
-
-        constructor(rawCriteriaObject: any, tables: TableToSearchPart[], noDatabaseProperties: string[], whereClause: string);
-
-        selectFromClause<T>(_table: Table<T>): string;
-    }
-
-    class CriteriaDivider<T> {
-        private _table;
-        constructor(table: Table<T>);
-        
-        /**
-         * Builds the criteria raw object to Criteria object.
-         * @param {any} rawCriteriaObject the criteria at raw format you pass eg: {yearsOld:18}.
-         * @returnType {Criteria}
-         * @return {Criteria}
-         */
-        build(rawCriteriaObject: any): CriteriaParts;
-    }
-
-    class SelectQueryRules {
-        private lastPropertyClauseName: string;
-        manuallyEndClause: string;
-        manuallyBeginClause: string;
-        exceptColumns: string[];
-        orderByColumn: string;
-        orderByDescColumn: string;
-        groupByColumn: string;
-        limitStart: number;
-        limitEnd: number;
-        public tableName: string; //auto den benei oute sto last, oute sto from.
-        static build(): SelectQueryRules;
-        private last(propertyClauseName);
-        except(...columns: string[]): SelectQueryRules;
-        
-        /**
-         * Same as .except(...columns)
-         */
-        exclude(...columns: string[]): SelectQueryRules;
-
-        orderBy(columnKey: string, descending?: boolean): SelectQueryRules;
-        groupBy(columnKey: string): SelectQueryRules;
-        limit(limitRowsOrStart: number, limitEnd?: number): SelectQueryRules;
-        appendToBegin(manualAfterWhereString: string): SelectQueryRules;
-        appendToEnd(manualAfterWhereString: string): SelectQueryRules;
-        append(appendToCurrent: string): SelectQueryRules;
-        clearOrderBy(): SelectQueryRules;
-        clearGroupBy(): SelectQueryRules;
-        clearLimit(): SelectQueryRules;
-        clearEndClause(): SelectQueryRules;
-        clearBeginClause(): SelectQueryRules;
-        clear(): SelectQueryRules;
-        from(parentRule: SelectQueryRules): SelectQueryRules;
-        isEmpty(): boolean;
-        toString(): string;
-        toRawObject(): RawRules;
-        static toString(rules: SelectQueryRules): string;
-        static toRawObject(rules: SelectQueryRules): RawRules;
-        static fromRawObject(obj: RawRules): SelectQueryRules;
-    }
-
-    class CriteriaBuilder<T>{
-
-        private rawCriteria: any;
-        private primaryTable: Table<T>;
-        private parentBuilder: CriteriaBuilder<any>;
-
-        constructor(primaryTable: Table<T>); //to arxiko apo to Table.ts 9a benei
-        constructor(primaryTable: Table<T>, tableName: string, parentBuilder: CriteriaBuilder<any>);// auta 9a benoun apo to parent select query.
-        constructor(primaryTable: Table<T>, tablePropertyName?: string, parentBuilder?: CriteriaBuilder<any>);
-
-        except(...columns: string[]): CriteriaBuilder<T>;
-        
-        /**
-	    * Same as .except(...columns)
-	    */
-        exclude(...columns: string[]): CriteriaBuilder<T>;
-
-        where(key: string, value: any): CriteriaBuilder<T>;
-
-        private createRulesIfNotExists(): void;
-
-        orderBy(column: string, desceding?: boolean): CriteriaBuilder<T>;
-
-        limit(start: number, end?: number): CriteriaBuilder<T>;
-
-        join(realTableName: string, foreignColumnName: string): CriteriaBuilder<T>;
-
-        joinAs(tableNameProperty: string, realTableName: string, foreignColumnName: string): CriteriaBuilder<T>;
-
-        at(tableNameProperty: string): CriteriaBuilder<T>;
-
-        parent(): CriteriaBuilder<T>;
-
-        original(): CriteriaBuilder<T>;
-        
-        /**
-         * Auto kanei kuklous mexri na paei sto primary table kai ekei na epistrepsei to sunoliko raw criteria gia execute i kati allo.
-         */
-        build(): any;
-
-        static from<T>(table: Table<T>): CriteriaBuilder<T>
-
-    }
-
-    class SelectQuery<T> implements IQuery<T> { // T for Table's result type.
-       
-        _table: Table<T>
-        constructor(_table: Table<T>);
-
-        private parseQueryResult(result: any, criteria: ICriteriaParts): Promise<any>;
-
-        /**
-         * Executes the select and returns the Promise.
-         */
-        promise(rawCriteria: any, callback?: (_results: T[]) => any): Promise<T[]>;
-
-        /**
-         * Exactly the same thing as promise().
-         * Executes the select and returns the Promise.
-        */
-        execute(rawCriteria: any, callback?: (_results: T[]) => any): Promise<T[]>;
-    }
-
-    class SaveQuery<T> implements IQuery<T> {
-        _table: Table<T>
-        constructor(_table: Table<T>);
-        execute(criteriaRawJsObject: any, callback?: (_result: T | any) => any): Promise<T | any>;
-    }
-
-    class DeleteQuery<T> implements IQuery<T>{
-        _table: Table<T>
-        constructor(_table: Table<T>);
-        execute(criteriaOrID: any | number | string, callback?: (_result: DeleteAnswer) => any): Promise<DeleteAnswer>;
-    }
-
-
-    class PropertyChangedArgs {
-        propertyName: string;
-        oldValue: any;
-        constructor(propertyName: string, oldValue: any);
-    }
-
-    class ObservableObject {
-
-        /** Property names that your row couldn't have:
-         * "propertyChangedListeners", "notifyPropertyChanged", "onPropertyChanged", "toJSON", "makeObservable", "_forget"
-         */
-        static RESERVED_PROPERTY_NAMES: string[];
-
-        private propertyChangedListeners: PropertyChangedCallback[];
-        
-        /** Make the obj observable. Used in constructor or extend this class and use it. */
-        private makeObservable(obj: any): void;
-
-        constructor();
-        constructor(obj?: any);
-
-        /**Add a listener/observer to watch for changes in this object's properties */
-        onPropertyChanged(listener: PropertyChangedCallback): void;
-        
-        /** If developer wants manualy notify for property changed */
-        notifyPropertyChanged(propertyName: string, oldValue: any): void;
-
-        /**Remove property changed listeners  */
-        _forget(): void;
-
-        toJSON(...excludeProperties: string[]): any;
-
-    }
-
-    enum CollectionChangedAction {
-        INSERT, DELETE, RESET//for now I will use only add, remove and reset . replace and move is for future., REPLACE, MOVE
-    }
-
-    class CollectionChangedEventArgs<T> {
-        action: CollectionChangedAction;
-        oldItems: (T | (T & ObservableObject))[];
-        newItems: (T | (T & ObservableObject))[];
-        oldStartingIndex: number;
-        newStartingIndex: number;
-
-        constructor(action: CollectionChangedAction, oldItems?: (T | (T & ObservableObject))[], newItems?: (T | (T & ObservableObject))[], oldStartingIndex?: number, newStartingIndex?: number);
-    }
-
-
-    class BaseCollection<T> {//T=result type of Table
-        private list: (T | (T & ObservableObject))[];
-        listeners: ((eventArgs: CollectionChangedEventArgs<T>) => void)[];
-        constructor(table: Table<T>);
-        length: number;
-        items: (T | (T & ObservableObject))[];
-        indexOf(item: T | string | number): number;
-        findItem(itemId: string | number): T;
-        getItem(index: number): T;
-        getItemObservable(index: number): T & ObservableObject;
-        addItem(...items: (T | (T & ObservableObject))[]): (T | (T & ObservableObject));
-        removeItem(...items: (T | (T & ObservableObject))[]): BaseCollection<T>;
-        removeItemById(id: number | string): BaseCollection<T>;
-        forgetItem(...items: (T | (T & ObservableObject))[]): BaseCollection<T>;
-        reset(): BaseCollection<T>;
-        notifyCollectionChanged(evtArgs: CollectionChangedEventArgs<T>): void;
-        onCollectionChanged(callback: (eventArgs: CollectionChangedEventArgs<T>) => void): void;
-    }
-
-    class ObservableCollection<T> { //auti i klasi 9a xrisimopoieite ws Collection me kapoies paralages mesa sto index.ts.
-        local: BaseCollection<T>;
-        private _items: (T & ObservableObject)[];
-
-        constructor(table: Table<T>, fetchAllFromDatabase?: boolean, callbackWhenReady?: Function);
-
-        items: (T & ObservableObject)[];
-
-        onCollectionChanged(callback: (eventArgs: CollectionChangedEventArgs<T>) => void): void;
-
-        startListeningToDatabase(): void;
-
-        find(criteriaRawJsObject?: any, callback?: (_results: T[]) => any): Promise<T[]>;
-
-        findOne(criteriaRawJsObject: any, callback?: (_result: T) => any): Promise<T>;
-
-        findById(id: number | string, callback?: (result: T) => any): Promise<T>;
-
-        findAll(tableRules?: RawRules, callback?: (_results: T[]) => any): Promise<T[]>;
-    
-        /**
-         * .insert() and .update() do the same thing:  .save();
-         */
-        insert(criteriaRawJsObject: any, callback?: (_result: any) => any): Promise<T | any>;
-
-        update(criteriaRawJsObject: any, callback?: (_result: any) => any): Promise<T | any>;
-
-        save(criteriaRawJsObject: any, callback?: (_result: any) => any): Promise<T | any>;
-
-        remove(criteriaOrID: any | number | string, callback?: (_result: DeleteAnswer) => any): Promise<DeleteAnswer>;
-	
-        /**
-         * same thing as .remove();
-         */
-        delete(criteriaOrID: any | number | string, callback?: (_result: DeleteAnswer) => any): Promise<DeleteAnswer>;
-
-
-    }
-
-    class MeteorCollection<T> {
-        private collection: Mongo.Collection<T>;
-        protected table: Table<T>;
-
-        constructor(table: Table<T>, name?: string);
-
-        startListeningToDatabase(): void;
-
-        rawCollection: Mongo.Collection<T>;
-
-        fill(criteriaRawJsObject: any): void;
-
-        fillAll(): void;
-
-        fillOne(criteriaRawJsObject: any): void;
-    
-        //ONLY MONGO/METEOR COLLECTION METHODS START
-        allow(options: {
-            insert?: (userId: string, doc: T) => boolean;
-            update?: (userId: string, doc: T, fieldNames: string[], modifier: any) => boolean;
-            remove?: (userId: string, doc: T) => boolean;
-            fetch?: string[];
-            transform?: Function;
-        }): boolean;
-
-        deny(options: {
-            insert?: (userId: string, doc: T) => boolean;
-            update?: (userId: string, doc: T, fieldNames: string[], modifier: any) => boolean;
-            remove?: (userId: string, doc: T) => boolean;
-            fetch?: string[];
-            transform?: Function;
-        }): boolean;
-
-        find(selector?: any, options?: {
-            sort?: any;
-            skip?: number;
-            limit?: number;
-            fields?: any;
-            reactive?: boolean;
-            transform?: Function;
-        }): Mongo.Cursor<T>;
-
-        findOne(selector?: any, options?: {
-            sort?: any;
-            skip?: number;
-            fields?: any;
-            reactive?: boolean;
-            transform?: Function;
-        }): T;
-    
-        //ONLY MONGO/METEOR COLLECTION METHODS FINISH.
-
-    }
-
-
-    class Connection extends EventEmitter {
-        
-        /**
-         * The real database connection socket.
-         */
-        connection: Mysql.IConnection;
-        
-        /**
-         * Collection of the supported event types for the tables.
-         */
-        eventTypes: string[];
-        
-        /**
-         * Force to fetch ONLY these Database table names {array of string}.  
-         */
-        tableNamesToUseOnly: any[];
-        
-        /**
-         * All tables {MysqlTable} inside this connection's database.
-         */
-        tables: Table<any>[];
-
-        constructor(connection: string | Mysql.IConnection | Mysql.IConnectionConfig);
-        
-        /**
-         * Creates the MysqlConnection from the connection url or the real connection object.
-         * @param {string | Mysql.IConnection |  Mysql.IConnectionConfig} connection the connection url or the real connection object.
-         * @returnType {nothing}
-         * @return {nothing}
-         */
-        create(connection: string | Mysql.IConnection | Mysql.IConnectionConfig): void;
-        
-        /**
-         * Attach a real connection.
-         * @param {Mysql.IConnection} connection the real connection object.
-         * @returnType {nothing}
-         * @return {nothing} 
-         */
-        attach(connection: Mysql.IConnection): void;
-        
-        /**
-         * Close the entire real connection and remove all event's listeners (if exist).
-         * @param {function} callback If error occurs when closing the connection, this callback has the responsibility to catch it.
-         * @returnType {nothing}
-         * @return {nothing} 
-         */
-        end(callback?: (error: any) => void): void;
-        
-        /**
-         * Close the entire real connection and remove all event's listeners (if exist).
-         * the difference from the 'end' is that this method doesn't care about errors so no callback passing here. 
-         */
-        destroy(): void;
-        
-        /**
-         * Clear all binary logs from the whole database.
-         * When finish returns a promise, use it with .then(function(){});
-         * @return Promise
-         */
-        clearBinaryLogs(): Promise<void>;
-        
-        /**
-         * Link the real connection with this MysqlConnection object.
-         * @param {function} readyCallback when the link operation is done this callback is executed.
-         * @returnType {Promise}
-         * @return {Promise}
-         */
-        link(readyCallback?: () => void): Promise<void>;
-        
-        /**
-         * Force to use/fetch information from only certain of database's tables, otherwise all database's tables information will be fetched.
-         * @param {Array} tables the array of the tables  {string}
-         * @returnType {nothing}
-         * @return {nothing}
-         */
-        useOnly(...tables: any[]): void;
-        
-        /**
-         * This method has the resposibility of fetching the correct tables from the database ( table = columns' names, primary key name).
-         * @returnType {Promise}
-         * @return {Promise}
-         */
-        fetchDatabaseInformation(): Promise<void>;
-        
-        /**
-         * Escape the query column's value  and return it.
-         * @param {string} val the value which will be escaped. 
-         * @returnType {string}
-         * @return {string}
-         */
-        escape(val: string): string;
-        
-        /**
-         * Call when must notify the Database events, SAVE(INSERT,UPDATE), REMOVE(DELETE).
-         * @param {string} tableWhichCalled the table name which event is coming from.
-         * @param {string} queryStr the full parsed query string which used to determinate the type of event to notify.
-         * @param {any[]} rawRows the raw rows results (results before a method parse/edit/export them as objects), these are passing to the watch listener(s).
-         * @returnType {nothing}
-         * @return {nothing}
-         */
-        notice(tableWhichCalled: string, queryStr: string, rawRows: any[]): void;
-        
-        /**
-         * Adds an event listener/watcher on a table for a 'database event'.
-         * @param {string} tableName the table name which you want to add the event listener.
-         * @param {string or string[]} evtType the event(s) type you want to watch, one of these(string) or an array of them(string[]): ["INSERT", "UPDATE", "REMOVE", "SAVE"].
-         * @param {function} callback Callback which has one parameter(typeof any[]) which filled by the rawRows (results after query executed and before parsed to object(s)). 
-         * @returnType {nothing}
-         * @return {nothing}
-         */
-        watch(tableName: string, evtType: any, callback: (rawRows: any[]) => void): void;
-        
-        /**
-         * Removes an event listener/watcher from a table for a specific event type.
-         * @param {string} tableName the table name which you want to remove the event listener. 
-         * @param {string} evtType the Event type you want to remove, one of these: "INSERT", "UPDATE", "REMOVE", "SAVE".
-         * @param {function} callbackToRemove the callback that you were used for watch this event type.
-         * @returnType {nothing}
-         * @return {nothing}
-         */
-        unwatch(tableName: string, evtType: string, callbackToRemove: (rawResults: any[]) => void): void;
-        
-        /**
-         * Executes a database query.
-         * @param {string} queryStr the query text/string to be executed.
-         * @param {function} callback the function will be called and fill the one and only parameter when an errors occurs.
-         * @param {any[]} queryArguments (optional) the query arguments you want to pass into query. ['arg1','arg2']...
-         * @returnType {nothing}
-         * @return {nothing} 
-         */
-        query(queryStr: string, callback: (err: Mysql.IError, results: any) => any, queryArguments?: any[]): void;
-        
-        /**
-         * Returns a MysqlTable object from the database factory. (Note: this method doesn't create anything, just finds and returns the correct table, you don't have to create anything at all. Tables are fetched by the library itself.)
-         * If you are using typescript you can pass a class (generic<T>) in order to use the auto completion assistance on table's results methods(find,findById,findAll,save,remove,safeRemove). 
-         * @param {string} tableName the table name which you want to get, on the form of: 'anyDatabaseTable' OR 'any_database_table' (possible your real table name into your database).
-         * @returnType {MysqlTable}
-         * @return {MysqlTable}
-         */
-        table<T>(tableName: string): Table<T>;
-    }
-
-    class Table<T>  {
-        /** Private keywords here are useless but I put them. 
-         * If the developer wants to see the properties of the Table class, he/she just comes here.
-        */
-
-        private _name: string;
-        private _connection: Connection;
-        private _columns: string[];
-        private _primaryKey: string;
-        private _criteriaDivider: CriteriaDivider<T>;
-        private _rules: SelectQueryRules;
-        private _selectQuery: SelectQuery<T>
-        private _saveQuery: SaveQuery<T>;
-        private _deleteQuery: DeleteQuery<T>;
-        constructor(tableName: string, connection: Connection);
-
-
-      
-        /**
-         * An array of all columns' names inside this table.
-         */
-        columns: string[];
-        
-        /**
-         * The name of the primary key column which this table is using.
-         */
-        primaryKey: string;
-        
-        /**
-         * The MysqlConnection object which this MysqlTable belongs. 
-         */
-        connection: Connection;
-        
-        /**
-         * The real database name of the table. Autofilled by library. 
-         */
-        name: string;
-        
-        /**
-         * Set of the query rules that will be applied after the 'where clause' on each select query executed by this table. 
-         * @return {SelectQueryRules}
-         */
-        rules: SelectQueryRules;
-        
-        /**
-         * Returns this table's criteria divider class.
-         * @return {CriteriaDivider}
-         */
-        criteriaDivider: CriteriaDivider<T>;
-        
-        /**
-         * Returns new Criteria Builder each time.
-         * Helps you  to make criteria raw js objects ready to use in find,remove and save methods.
-         * @return {CriteriaBuilder}
-         */
-        criteria: CriteriaBuilder<T>;
-        
-        /**
-        * Adds or turn on an event listener/watcher on a table for a 'database event'.
-        * @param {string} evtType the event type you want to watch, one of these: ["INSERT", "UPDATE", "REMOVE", "SAVE"].
-        * @param {function} callback Callback which has one parameter(typeof any[]) which filled by the rawResults (results after query executed and before exports to object(s)). 
-        * @returnType {nothing}
-        * @return {nothing}
-        */
-        on(evtType: string, callback: (rawResults: any[]) => void): void;
-            
-        /**
-         * Removes or turn off an event listener/watcher from a table for a specific event type.
-         * @param {string} evtType the Event type you want to remove, one of these: "INSERT", "UPDATE", "REMOVE", "SAVE".
-         * @param {function} callbackToRemove the callback that you were used for watch this event type.
-         * @returnType {nothing}
-         * @return {nothing}
-         */
-        off(evtType: string, callbackToRemove: (rawResults: any[]) => void): void;
-         
-        /**
-         * Use it when you want to check if extended function is exists here.
-         * @param {string} extendedFunctionName the name of the function you want to check.
-         * @returnType {boolean}
-         * @return {boolean}
-         */
-        has(extendedFunctionName: string): boolean;
-        
-        /**
-         * Extends this table's capabilities with a function.
-         * @param {string} functionName the function name you want to use, this is used when you want to call this function later.
-         * @param {function} theFunction the function with any optional parameters you want to pass along.
-         * @returnType {nothing}
-         * @return {nothing} 
-         */
-        extend(functionName: string, theFunction: (...args: any[]) => any): void;
-        
-        /**
-         * Converts and returns an object from this form: { a_property:'dsda', other_property:something, any_property_name:true } to { aProperty:..., otherProperty...,anyPropertyName...}
-         * @param {any} row the raw row object.
-         * @returnType {any}
-         * @return {any}
-         */
-        objectFromRow(row: any): any;
-           
-        /**
-         * Converts and returns an object from this form: { aProperty:'dsda', otherProperty:something, anyPropertyName:true } to { a_property:..., other_property...,any_property_name...}
-         * @param {any} row the raw row object.
-         * @returnType {any}
-         * @return {any}
-         */
-        rowFromObject(obj: any): any;
-        
-        /**
-         * Returns and array of [columns[],values[]]
-         * @param {any} jsObject the raw row object.
-         * @returnType {array}
-         * @return {array}
-         */
-        getRowAsArray(jsObject: any): Array<any>;
-        
-        /**
-         * Returns the primary key's value from an object.
-         * @param {any} jsObject the object which you want to find and return the value of the primary key.
-         * @returnType {number | string}
-         * @return {number | string}
-         */
-        getPrimaryKeyValue(jsObject: any): number | string;
-        
-        /**
-         * 
-         */
-        find(criteriaRawJsObject: any): Promise<T[]>; // only criteria 
-        find(criteriaRawJsObject: any, callback: ((_results: T[]) => any)): Promise<T[]>; // criteria and callback
-        find(criteriaRawJsObject: any, callback?: (_results: T[]) => any): Promise<T[]>;
-
-        findSingle(criteriaRawJsObject: any, callback?: (_result: T) => any): Promise<T>;
-
-        findById(id: number | string): Promise<T>; // without callback
-        findById(id: number | string, callback?: (result: T) => any): Promise<T>;
-
-        findAll(): Promise<T[]>; // only criteria and promise
-        findAll(tableRules: RawRules): Promise<T[]> // only rules and promise
-        findAll(tableRules?: RawRules, callback?: (_results: T[]) => any): Promise<T[]>;
-
-
-        save(criteriaRawJsObject: any): Promise<any>; //without callback
-        save(criteriaRawJsObject: any, callback?: (_result: any) => any): Promise<any>;
-
-        remove(id: number | string): Promise<DeleteAnswer>; // ID without callback
-        remove(criteriaRawObject: any): Promise<DeleteAnswer>; // criteria obj without callback
-        remove(criteriaOrID: any | number | string, callback?: (_result: DeleteAnswer) => any): Promise<DeleteAnswer>;
-
-    }
-
-    class MeteorTable<T>{
-        public table: Table<T>;
-        constructor(table: Table<T>);
-
-        insert(doc: T, callback?: (_result: T) => void): T;
-
-        remove(selector: any, callback?: () => DeleteAnswer): DeleteAnswer;
-
-        update(selector: any, modifier: any, options?: {
-            multi?: boolean;
-            upsert?: boolean;
-        }, callback?: (result: T) => any): number;
-
-        collection(nameOfCollection?: string, fillWithCriteria?: any): Mongo.Collection<T>;
-    }
-
-    class Database {
-        connection: Connection;
-        isReady: boolean;
-        readyListenerCallbacks: Function[];
-        constructor(connection?: Connection);
-        static when(..._promises: Promise<any>[]): Promise<any>;
-        setConnection(connection: Connection): void;
-            
-        /**
-         * Force to use/fetch information from only certain of database's tables, otherwise all database's tables information will be fetched.
-         * @param {Array} tables the array of the tables  {string}
-         * @returnType {nothing}
-         * @return {nothing}
-         */
-        useOnly(...useTables: any[]): void;
-
-        has(tableName: string, functionName?: string): boolean;
-        ready(callback?: () => void): void;
-        table<T>(tableName: string): Table<T>;
-        noticeReady(): void;
-        removeReadyListener(callback: () => void): void;
-        query(queryStr: string, callback: (err: Mysql.IError, results: any) => any, queryArguments?: any[]): void;
-        
-        /**
-        * Close the entire real connection and remove all event's listeners (if exist).
-        * the difference from the 'end' is that this method doesn't care about errors so no callback passing here. 
-        */
-        destroy(): void;
-        
-        /**
-       * Close the entire real connection and remove all event's listeners (if exist).
-       * @param {function} maybeAcallbackError If error occurs when closing the connection, this callback has the responsibility to catch it.
-       * @returnType {nothing}
-       * @return {nothing} 
-       */
-        end(maybeAcallbackError: (err: any) => void): void;
-
-        newTableRules(tableName: string): SelectQueryRules;
-
-        buildRules(): SelectQueryRules;
-        buildRules(parentRules?: SelectQueryRules): SelectQueryRules;
-
-        collection<T>(tableName: string, callbackWhenReady?: Function): ObservableCollection<T>;
-
-        /**Meteor js feature only: Returns a table which it's collection can make synchronization with the client */
-        meteorTable<T>(tableName: string): MeteorTable<T>;
-    }
-
-    function wrap(mysqlUrlOrObjectOrMysqlAlreadyConnection: Mysql.IConnection | string, ...useTables: any[]): Database;
-    
-    /** For meteor js only
-     * Same as wrap but it's sync mode - autoconnect to the database without need to use database.ready(callback).
-     */
-    function connect(mysqlUrlOrObjectOrMysqlAlreadyConnection: Mysql.IConnection | string, ...useTables: any[]): Database;
-
-    function observable<T>(obj: T): T & ObservableObject;
-}
diff --git a/node-mysql-wrapper/tsconfig.json b/node-mysql-wrapper/tsconfig.json
new file mode 100644
index 0000000000..ccaed4fef5
--- /dev/null
+++ b/node-mysql-wrapper/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-mysql-wrapper-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-notifier/index.d.ts b/node-notifier/index.d.ts
new file mode 100644
index 0000000000..dad13583b9
--- /dev/null
+++ b/node-notifier/index.d.ts
@@ -0,0 +1,166 @@
+// Type definitions for node-notifier
+// Project: https://github.com/mikaelbr/node-notifier
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare module "node-notifier" {
+    import NotificationCenter = require('node-notifier/notifiers/notificationcenter');
+    import NotifySend = require("node-notifier/notifiers/notifysend");
+    import WindowsToaster = require("node-notifier/notifiers/toaster");
+    import WindowsBalloon = require("node-notifier/notifiers/balloon");
+    import Growl = require("node-notifier/notifiers/growl");
+
+    namespace nodeNotifier {
+        interface NodeNotifier extends NodeJS.EventEmitter {
+            notify(notification?: Notification, callback?: NotificationCallback): NodeNotifier;
+            NotificationCenter: NotificationCenter;
+            NotifySend: NotifySend;
+            WindowsToaster: WindowsToaster;
+            WindowsBalloon: WindowsBalloon;
+            Growl: Growl;
+        }
+
+        interface Notification {
+            title?: string;
+            message?: string;
+            /** Absolute path (not balloons) */
+            icon?: string;
+            /** Only Notification Center or Windows Toasters */
+            sound?: boolean;
+            /** Wait with callback until user action is taken on notification */
+            wait?: boolean;
+        }
+
+        interface NotificationCallback {
+            (err: any, response: any): any;
+        }
+
+        interface Option {
+            withFallback?: boolean;
+            customPath?: string;
+        }
+    }
+
+    var nodeNotifier: nodeNotifier.NodeNotifier;
+
+    export = nodeNotifier;
+}
+
+declare module "node-notifier/notifiers/notificationcenter" {
+    import notifier = require('node-notifier');
+
+    class NotificationCenter {
+        constructor(option?: notifier.Option);
+        notify(notification?: NotificationCenter.Notification, callback?: notifier.NotificationCallback): NotificationCenter;
+    }
+
+    namespace NotificationCenter {
+        interface Notification extends notifier.Notification {
+            subtitle?: string;
+            /** Attach image? (Absolute path) */
+            contentImage?: string;
+            /** URL to open on click */
+            open?: string;
+        }
+    }
+
+    export = NotificationCenter;
+}
+
+declare module "node-notifier/notifiers/notifysend" {
+    import notifier = require('node-notifier');
+
+    class NotifySend {
+        constructor(option?: notifier.Option);
+        notify(notification?: NotifySend.Notification, callback?: notifier.NotificationCallback): NotifySend;
+    }
+
+    namespace NotifySend {
+        interface Notification {
+            title?: string;
+            message?: string;
+            icon?: string;
+            /** Specifies the urgency level  (low,  normal,  critical). */
+            urgency?: string;
+            /** Specifies  the  timeout  in  milliseconds at which to expire the notification */
+            time?: number;
+            /** Specifies the notification category */
+            category?: string;
+            /** Specifies basic extra data to pass. Valid types are int, double, string and byte. */
+            hint?: string;
+        }
+    }
+
+    export = NotifySend;
+}
+
+declare module "node-notifier/notifiers/toaster" {
+    import notifier = require('node-notifier');
+
+    class WindowsToaster {
+        constructor(option?: notifier.Option);
+        notify(notification?: notifier.Notification, callback?: notifier.NotificationCallback): WindowsToaster;
+    }
+
+    export = WindowsToaster;
+}
+
+declare module "node-notifier/notifiers/growl" {
+    import notifier = require('node-notifier');
+
+    class Growl {
+        constructor(option?: Growl.Option);
+        notify(notification?: Growl.Notification, callback?: notifier.NotificationCallback): Growl;
+    }
+
+    namespace Growl {
+        interface Option {
+            name?: string;
+            host?: string;
+            port?: number;
+        }
+
+        interface Notification {
+            title?: string;
+            message?: string;
+            /** Absolute path (not balloons) */
+            icon?: string;
+            /** Wait with callback until user action is taken on notification */
+            wait?: boolean;
+            /** whether or not to sticky the notification (defaults to false) */
+             sticky?: boolean;
+            /** type of notification to use (defaults to the first registered type) */
+            label: string;
+            /** the priority of the notification from lowest (-2) to highest (2) */
+            priority: number;
+        }
+    }
+
+    export = Growl;
+}
+
+declare module "node-notifier/notifiers/balloon" {
+    import notifier = require('node-notifier');
+
+    class WindowsBalloon {
+        constructor(option?: notifier.Option);
+        notify(notification?: WindowsBalloon.Notification, callback?: notifier.NotificationCallback): WindowsBalloon;
+    }
+
+    namespace WindowsBalloon {
+        interface Notification {
+            title?: string;
+            message?: string;
+            /** Only Notification Center or Windows Toasters */
+            sound?: boolean;
+            /** How long to show balloons in ms */
+            time?: number;
+            /** Wait with callback until user action is taken on notification */
+            wait?: boolean;
+        }
+    }
+
+    export = WindowsBalloon;
+}
diff --git a/node-notifier/node-notifier-tests.ts b/node-notifier/node-notifier-tests.ts
index dfc4963ac7..7e6ce74c14 100644
--- a/node-notifier/node-notifier-tests.ts
+++ b/node-notifier/node-notifier-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="node-notifier.d.ts" />
+
 'use strict';
 
 import notifier = require('node-notifier');
diff --git a/node-notifier/node-notifier.d.ts b/node-notifier/node-notifier.d.ts
deleted file mode 100644
index 3fed2b0ecf..0000000000
--- a/node-notifier/node-notifier.d.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-// Type definitions for node-notifier
-// Project: https://github.com/mikaelbr/node-notifier
-// Definitions by: Qubo <https://github.com/tkQubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "node-notifier" {
-    import NotificationCenter = require('node-notifier/notifiers/notificationcenter');
-    import NotifySend = require("node-notifier/notifiers/notifysend");
-    import WindowsToaster = require("node-notifier/notifiers/toaster");
-    import WindowsBalloon = require("node-notifier/notifiers/balloon");
-    import Growl = require("node-notifier/notifiers/growl");
-
-    namespace nodeNotifier {
-        interface NodeNotifier extends NodeJS.EventEmitter {
-            notify(notification?: Notification, callback?: NotificationCallback): NodeNotifier;
-            NotificationCenter: NotificationCenter;
-            NotifySend: NotifySend;
-            WindowsToaster: WindowsToaster;
-            WindowsBalloon: WindowsBalloon;
-            Growl: Growl;
-        }
-
-        interface Notification {
-            title?: string;
-            message?: string;
-            /** Absolute path (not balloons) */
-            icon?: string;
-            /** Only Notification Center or Windows Toasters */
-            sound?: boolean;
-            /** Wait with callback until user action is taken on notification */
-            wait?: boolean;
-        }
-
-        interface NotificationCallback {
-            (err: any, response: any): any;
-        }
-
-        interface Option {
-            withFallback?: boolean;
-            customPath?: string;
-        }
-    }
-
-    var nodeNotifier: nodeNotifier.NodeNotifier;
-
-    export = nodeNotifier;
-}
-
-declare module "node-notifier/notifiers/notificationcenter" {
-    import notifier = require('node-notifier');
-
-    class NotificationCenter {
-        constructor(option?: notifier.Option);
-        notify(notification?: NotificationCenter.Notification, callback?: notifier.NotificationCallback): NotificationCenter;
-    }
-
-    namespace NotificationCenter {
-        interface Notification extends notifier.Notification {
-            subtitle?: string;
-            /** Attach image? (Absolute path) */
-            contentImage?: string;
-            /** URL to open on click */
-            open?: string;
-        }
-    }
-
-    export = NotificationCenter;
-}
-
-declare module "node-notifier/notifiers/notifysend" {
-    import notifier = require('node-notifier');
-
-    class NotifySend {
-        constructor(option?: notifier.Option);
-        notify(notification?: NotifySend.Notification, callback?: notifier.NotificationCallback): NotifySend;
-    }
-
-    namespace NotifySend {
-        interface Notification {
-            title?: string;
-            message?: string;
-            icon?: string;
-            /** Specifies the urgency level  (low,  normal,  critical). */
-            urgency?: string;
-            /** Specifies  the  timeout  in  milliseconds at which to expire the notification */
-            time?: number;
-            /** Specifies the notification category */
-            category?: string;
-            /** Specifies basic extra data to pass. Valid types are int, double, string and byte. */
-            hint?: string;
-        }
-    }
-
-    export = NotifySend;
-}
-
-declare module "node-notifier/notifiers/toaster" {
-    import notifier = require('node-notifier');
-
-    class WindowsToaster {
-        constructor(option?: notifier.Option);
-        notify(notification?: notifier.Notification, callback?: notifier.NotificationCallback): WindowsToaster;
-    }
-
-    export = WindowsToaster;
-}
-
-declare module "node-notifier/notifiers/growl" {
-    import notifier = require('node-notifier');
-
-    class Growl {
-        constructor(option?: Growl.Option);
-        notify(notification?: Growl.Notification, callback?: notifier.NotificationCallback): Growl;
-    }
-
-    namespace Growl {
-        interface Option {
-            name?: string;
-            host?: string;
-            port?: number;
-        }
-
-        interface Notification {
-            title?: string;
-            message?: string;
-            /** Absolute path (not balloons) */
-            icon?: string;
-            /** Wait with callback until user action is taken on notification */
-            wait?: boolean;
-            /** whether or not to sticky the notification (defaults to false) */
-             sticky?: boolean;
-            /** type of notification to use (defaults to the first registered type) */
-            label: string;
-            /** the priority of the notification from lowest (-2) to highest (2) */
-            priority: number;
-        }
-    }
-
-    export = Growl;
-}
-
-declare module "node-notifier/notifiers/balloon" {
-    import notifier = require('node-notifier');
-
-    class WindowsBalloon {
-        constructor(option?: notifier.Option);
-        notify(notification?: WindowsBalloon.Notification, callback?: notifier.NotificationCallback): WindowsBalloon;
-    }
-
-    namespace WindowsBalloon {
-        interface Notification {
-            title?: string;
-            message?: string;
-            /** Only Notification Center or Windows Toasters */
-            sound?: boolean;
-            /** How long to show balloons in ms */
-            time?: number;
-            /** Wait with callback until user action is taken on notification */
-            wait?: boolean;
-        }
-    }
-
-    export = WindowsBalloon;
-}
diff --git a/node-notifier/tsconfig.json b/node-notifier/tsconfig.json
new file mode 100644
index 0000000000..07f65c170f
--- /dev/null
+++ b/node-notifier/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-notifier-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-persist/index.d.ts b/node-persist/index.d.ts
new file mode 100644
index 0000000000..5d34750bc1
--- /dev/null
+++ b/node-persist/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for node-persist
+// Project: https://github.com/simonlast/node-persist
+// Definitions by: Spencer Williams <http://spencerwi.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+/// <reference types="Q" />
+
+
+type milliseconds = number;
+declare namespace NodePersist {
+    export interface InitOptions {
+        dir?: string;
+        stringify?: (toSerialize: any) => string;
+        parse?: (serialized: string) => any;
+        encoding?: string;
+        logging?: boolean | Function;
+        continuous?: boolean;
+        interval?: milliseconds | boolean;
+        ttl?: milliseconds | boolean;
+    }
+    export function init(options?: InitOptions, callback?: Function): Q.Promise<any>;
+    export function initSync(options?: InitOptions): void;
+    export function getItem(key: string, callback?: (err: any, value: any) => any): Q.Promise<any>;
+    export function getItemSync(key: string): any;
+    export function setItem(key: string, value: any, callback?: (err: any) => any): Q.Promise<any>;
+    export function setItemSync(key: string, value: any): void;
+    export function removeItem(key: string, callback?: (err: any) => any): Q.Promise<any>;
+    export function removeItemSync(key: string): void;
+    export function clear(callback?: (err: any) => any): Q.Promise<any>;
+    export function clearSync(): void;
+    export function values(): Array<any>;
+    export function valuesWithKeyMatch(match: string): Array<any>;
+    export function keys(): Array<string>;
+    export function length(): number;
+    export function forEach(callback: (key: string, value: any) => void): void;
+
+    export function persist(callback?: (err: any) => any): Q.Promise<any>;
+    export function persistSync(): void;
+    export function persistKey(key: string, callback?: (err: any) => any): Q.Promise<any>;
+    export function persistKeySync(key: string): void;
+}
+export = NodePersist;
diff --git a/node-persist/node-persist-tests.ts b/node-persist/node-persist-tests.ts
index a4e2af1ed9..9e558fcbb4 100644
--- a/node-persist/node-persist-tests.ts
+++ b/node-persist/node-persist-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./node-persist.d.ts" />
+
 // node-persist tests
 // compile with --module=common
 
diff --git a/node-persist/node-persist.d.ts b/node-persist/node-persist.d.ts
deleted file mode 100644
index c6c5378aef..0000000000
--- a/node-persist/node-persist.d.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-// Type definitions for node-persist
-// Project: https://github.com/simonlast/node-persist
-// Definitions by: Spencer Williams <http://spencerwi.com/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../q/Q.d.ts" />
-
-declare module "node-persist" {
-    type milliseconds = number;
-    namespace NodePersist {
-        export interface InitOptions {
-            dir?: string;
-            stringify?: (toSerialize: any)=>string;
-            parse?: (serialized: string)=>any;
-            encoding?: string;
-            logging?: boolean|Function;
-            continuous?: boolean;
-            interval?: milliseconds|boolean;
-            ttl?: milliseconds|boolean;
-        }
-        export function init(options?: InitOptions, callback?: Function): Q.Promise<any>;
-        export function initSync(options?: InitOptions): void;
-        export function getItem(key: string, callback?: (err: any, value: any)=>any): Q.Promise<any>;
-        export function getItemSync(key: string): any;
-        export function setItem(key: string, value: any, callback?: (err: any)=>any): Q.Promise<any>;
-        export function setItemSync(key: string, value: any): void;
-        export function removeItem(key: string, callback?: (err: any)=>any): Q.Promise<any>;
-        export function removeItemSync(key: string): void;
-        export function clear(callback?: (err: any)=>any): Q.Promise<any>;
-        export function clearSync(): void;
-        export function values(): Array<any>;
-        export function valuesWithKeyMatch(match: string): Array<any>;
-        export function keys(): Array<string>;
-        export function length(): number;
-        export function forEach(callback: (key: string, value: any)=>void): void;
-
-        export function persist(callback?: (err: any)=>any): Q.Promise<any>;
-        export function persistSync(): void;
-        export function persistKey(key: string, callback?: (err: any)=>any): Q.Promise<any>;
-        export function persistKeySync(key: string): void;
-    }
-    export = NodePersist;
-}
diff --git a/node-persist/tsconfig.json b/node-persist/tsconfig.json
new file mode 100644
index 0000000000..6aaaceb87e
--- /dev/null
+++ b/node-persist/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-persist-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-polyglot/index.d.ts b/node-polyglot/index.d.ts
new file mode 100644
index 0000000000..9ea2c09a48
--- /dev/null
+++ b/node-polyglot/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for node-polyglot v0.4.1
+// Project: https://github.com/airbnb/polyglot.js
+// Definitions by: Tim Jackson-Kiely <https://github.com/timjk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare namespace Polyglot {
+    interface InterpolationOptions {
+        smart_count?: number | { length: number };
+        _?: string;
+
+        [interpolationKey: string]: any;
+    }
+
+    interface PolyglotOptions {
+        phrases?: any;
+        locale?: string;
+    }
+}
+
+declare class Polyglot {
+    constructor(options?: Polyglot.PolyglotOptions);
+
+    extend(phrases: any): void;
+
+    t(phrase: string): string;
+
+    t(phrase: string, smartCount: number): string;
+
+    t(phrase: string, interpolationOptions: Polyglot.InterpolationOptions): string;
+
+    clear(): void;
+
+    replace(phrases: any): void;
+
+    locale(): string;
+
+    locale(locale: string): void;
+}
+
+export = Polyglot;
diff --git a/node-polyglot/node-polyglot-tests.ts b/node-polyglot/node-polyglot-tests.ts
index 249be95778..f9d4879328 100644
--- a/node-polyglot/node-polyglot-tests.ts
+++ b/node-polyglot/node-polyglot-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./node-polyglot.d.ts" />
 
 import Polyglot = require("node-polyglot");
 
diff --git a/node-polyglot/node-polyglot.d.ts b/node-polyglot/node-polyglot.d.ts
deleted file mode 100644
index 829f20d150..0000000000
--- a/node-polyglot/node-polyglot.d.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-// Type definitions for node-polyglot v0.4.1
-// Project: https://github.com/airbnb/polyglot.js
-// Definitions by: Tim Jackson-Kiely <https://github.com/timjk>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "node-polyglot" {
-	namespace Polyglot {
-		interface InterpolationOptions {
-			smart_count?: number | { length: number };
-			_?: string;
-
-			[interpolationKey: string]: any;
-		}
-
-		interface PolyglotOptions {
-			phrases?: any;
-			locale?: string;
-		}
-	}
-
-	class Polyglot {
-		constructor(options?: Polyglot.PolyglotOptions);
-
-		extend(phrases: any): void;
-
-		t(phrase: string): string;
-
-		t(phrase: string, smartCount: number): string;
-
-		t(phrase: string, interpolationOptions: Polyglot.InterpolationOptions): string;
-
-		clear(): void;
-
-		replace(phrases: any): void;
-
-		locale(): string;
-
-		locale(locale: string): void;
-	}
-
-	export = Polyglot;
-}
-
diff --git a/node-polyglot/tsconfig.json b/node-polyglot/tsconfig.json
new file mode 100644
index 0000000000..893dd5dff9
--- /dev/null
+++ b/node-polyglot/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-polyglot-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-sass-middleware/index.d.ts b/node-sass-middleware/index.d.ts
new file mode 100644
index 0000000000..51be3992f1
--- /dev/null
+++ b/node-sass-middleware/index.d.ts
@@ -0,0 +1,65 @@
+// Type definitions for node-sass-middleware
+// Project: https://github.com/sass/node-sass-middleware
+// Definitions by: Pascal Garber <http://www.jumplink.eu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+import * as sass from "node-sass";
+import * as express from "express";
+
+interface Options extends sass.Options {
+    /**
+     * 
+     */
+    src: string;
+    /**
+     * 
+     */
+    dest?: string;
+    /**
+     * 
+     */
+    root?: string;
+    /**
+     * 
+     */
+    prefix?: string;
+    /**
+     * 
+     */
+    force?: boolean;
+    /**
+     * 
+     */
+    debug?: boolean;
+    /**
+     * 
+     */
+    indentedSyntax?: boolean;
+    /**
+     * 
+     */
+    response?: boolean;
+    /**
+     * 
+     */
+    error?: () => void;
+}
+
+/**
+ * 
+ *
+ */
+
+declare function nodeSassMiddleware(options: Options): express.RequestHandler;
+
+/**
+ * 
+ */
+declare namespace nodeSassMiddleware { }
+
+/**
+ * 
+ */
+export = nodeSassMiddleware;
diff --git a/node-sass-middleware/node-sass-middleware-tests.ts b/node-sass-middleware/node-sass-middleware-tests.ts
index 088aa5ce5e..bfc755a424 100644
--- a/node-sass-middleware/node-sass-middleware-tests.ts
+++ b/node-sass-middleware/node-sass-middleware-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="node-sass-middleware.d.ts" />
 
 import * as express from "express";
 import * as sassMiddleware from "node-sass-middleware";
diff --git a/node-sass-middleware/node-sass-middleware.d.ts b/node-sass-middleware/node-sass-middleware.d.ts
deleted file mode 100644
index 36af6b6c25..0000000000
--- a/node-sass-middleware/node-sass-middleware.d.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-// Type definitions for node-sass-middleware
-// Project: https://github.com/sass/node-sass-middleware
-// Definitions by: Pascal Garber <http://www.jumplink.eu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-/// <reference path="../node-sass/node-sass.d.ts" />
-
-declare module "node-sass-middleware" {
-
-    import * as sass from "node-sass";
-    import * as express from "express";
-
-    interface Options extends sass.Options {
-        /**
-         * 
-         */
-        src: string;
-        /**
-         * 
-         */
-        dest?: string;
-        /**
-         * 
-         */
-        root?: string;
-        /**
-         * 
-         */
-        prefix?: string;
-        /**
-         * 
-         */
-        force?: boolean;
-        /**
-         * 
-         */
-        debug?: boolean;
-        /**
-         * 
-         */
-        indentedSyntax?: boolean;
-        /**
-         * 
-         */
-        response?: boolean;
-        /**
-         * 
-         */
-        error?: () => void;
-    }
-
-    /**
-     * 
-     *
-     */
-
-    function nodeSassMiddleware(options: Options): express.RequestHandler;
-
-    /**
-     * 
-     */
-    namespace nodeSassMiddleware { }
-
-    /**
-     * 
-     */
-    export = nodeSassMiddleware;
-}
\ No newline at end of file
diff --git a/node-sass-middleware/tsconfig.json b/node-sass-middleware/tsconfig.json
new file mode 100644
index 0000000000..d97ee5a0a5
--- /dev/null
+++ b/node-sass-middleware/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-sass-middleware-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-sass/index.d.ts b/node-sass/index.d.ts
new file mode 100644
index 0000000000..dd41842bf9
--- /dev/null
+++ b/node-sass/index.d.ts
@@ -0,0 +1,55 @@
+// Type definitions for Node Sass
+// Project: https://github.com/sass/node-sass
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+interface Importer {
+    (url: string, prev: string, done: (data: { file: string; contents: string; }) => void): void;
+}
+
+interface Options {
+    file?: string;
+    data?: string;
+    importer?: Importer | Importer[];
+    functions?: { [key: string]: Function };
+    includePaths?: string[];
+    indentedSyntax?: boolean;
+    indentType?: string;
+    indentWidth?: number;
+    linefeed?: string;
+    omitSourceMapUrl?: boolean;
+    outFile?: string;
+    outputStyle?: string;
+    precision?: number;
+    sourceComments?: boolean;
+    sourceMap?: boolean | string;
+    sourceMapContents?: boolean;
+    sourceMapEmbed?: boolean;
+    sourceMapRoot?: boolean;
+}
+
+interface SassError extends Error {
+    message: string;
+    line: number;
+    column: number;
+    status: number;
+    file: string;
+}
+
+interface Result {
+    css: Buffer;
+    map: Buffer;
+    stats: {
+        entry: string;
+        start: number;
+        end: number;
+        duration: number;
+        includedFiles: string[];
+    }
+}
+
+export declare function render(options: Options, callback: (err: SassError, result: Result) => any): void;
+export declare function renderSync(options: Options): Result;
diff --git a/node-sass/node-sass-tests.ts b/node-sass/node-sass-tests.ts
index a7c1477cb9..968cc6454f 100644
--- a/node-sass/node-sass-tests.ts
+++ b/node-sass/node-sass-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="node-sass.d.ts" />
+
 import sass = require('node-sass');
 sass.render({
   file: '/path/to/myFile.scss',
diff --git a/node-sass/node-sass.d.ts b/node-sass/node-sass.d.ts
deleted file mode 100644
index 93844fb445..0000000000
--- a/node-sass/node-sass.d.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-// Type definitions for Node Sass
-// Project: https://github.com/sass/node-sass
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "node-sass" {
-    interface Importer {
-        (url: string, prev: string, done: (data: { file: string; contents: string; }) => void): void;
-    }
-
-    interface Options {
-        file?: string;
-        data?: string;
-        importer?: Importer | Importer[];
-        functions?: { [key: string]: Function };
-        includePaths?: string[];
-        indentedSyntax?: boolean;
-        indentType?: string;
-        indentWidth?: number;
-        linefeed?: string;
-        omitSourceMapUrl?: boolean;
-        outFile?: string;
-        outputStyle?: string;
-        precision?: number;
-        sourceComments?: boolean;
-        sourceMap?: boolean | string;
-        sourceMapContents?: boolean;
-        sourceMapEmbed?: boolean;
-        sourceMapRoot?: boolean;
-    }
-
-    interface SassError extends Error {
-        message: string;
-        line: number;
-        column: number;
-        status: number;
-        file: string;
-    }
-
-    interface Result {
-        css: Buffer;
-        map: Buffer;
-        stats: {
-            entry: string;
-            start: number;
-            end: number;
-            duration: number;
-            includedFiles: string[];
-        }
-    }
-
-    export function render(options: Options, callback: (err: SassError, result: Result) => any): void;
-    export function renderSync(options: Options): Result;
-}
diff --git a/node-sass/tsconfig.json b/node-sass/tsconfig.json
new file mode 100644
index 0000000000..7ac8b5a42e
--- /dev/null
+++ b/node-sass/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-sass-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-schedule/index.d.ts b/node-schedule/index.d.ts
new file mode 100644
index 0000000000..ff6e4ce273
--- /dev/null
+++ b/node-schedule/index.d.ts
@@ -0,0 +1,198 @@
+// Type definitions for node-schedule
+// Project: https://github.com/tejasmanohar/node-schedule/
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+import nodeSchedule = require('node-schedule');
+
+/**
+ * Recurrence rules.
+ */
+export interface RecurrenceRule {
+    /**
+     * Day of the month.
+     *
+     * @public
+     * @type {number}
+     */
+    date?: number;
+
+    /**
+     * Day of the week.
+     *
+     * @public
+     * @type {number|Array<number|Range>}
+     */
+    dayOfWeek?: number | Array<number | Range>;
+
+    /**
+     * Hour.
+     *
+     * @public
+     * @type {number}
+     */
+    hour?: number;
+
+    /**
+     * Minute.
+     *
+     * @public
+     * @type {number}
+     */
+    minute?: number;
+
+    /**
+     * Month.
+     *
+     * @public
+     * @type {number}
+     */
+    month?: number;
+
+    /**
+     * Second.
+     *
+     * @public
+     * @type {number}
+     */
+    second?: number;
+
+    /**
+     * Year.
+     *
+     * @public
+     * @type {number}
+     */
+    year?: number;
+}
+
+/**
+ * Range.
+ *
+ * @class
+ */
+export declare class Range {
+    /**
+     * Constructor.
+     *
+     * @constructor
+     * @param {number} start The start.
+     * @param {end}    end   The end.
+     * @param {step}   step  The step.
+     */
+    constructor(start?: number, end?: number, step?: number);
+
+    /**
+     * Return a {boolean} if the class contains the specified value.
+     *
+     * @param {number} value The value.
+     * @returns {boolean} {true} if the class contains the specified value, otherwise, {false}.
+     */
+    contains(value: number): boolean;
+}
+
+/**
+ * Scheduler jobs.
+ *
+ * @class
+ */
+export declare class Job {
+    /**
+     * Constructor.
+     *
+     * @constructor
+     * @param {RecurrenceRule}  rule      The rule.
+     * @param {callback}        callback  The callback.
+     */
+    constructor(name?: string, job?: Function, callback?: Function);
+
+    /**
+     * Constructor.
+     *
+     * @constructor
+     * @param {RecurrenceRule} rule The rule.
+     * @param
+     */
+    constructor(job?: Function, callback?: Function);
+
+    /**
+     * Attach an event handler function.
+     *
+     * @public
+     * @param {string}    eventName The event name.
+     * @param {Function}  handler   The function to execute when the event is triggered.
+     */
+    on(eventName: string, handler: Function): void;
+
+    /**
+     *
+     * @public
+     */
+    schedule(date: Date): void;
+}
+
+/**
+ * Invocation.
+ *
+ * @class
+ */
+export declare class Invocation {
+    /**
+     * Fire date.
+     *
+     * @public
+     * @type {Date}
+     */
+    public fireDate: Date;
+
+    /**
+     * Job.
+     *
+     * @public
+     * @type {Job}
+     */
+    public job: Job;
+
+    /**
+     * Recurrence rule.
+     *
+     * @public
+     * @type {RecurrenceRule}
+     */
+    public recurrenceRule: RecurrenceRule;
+
+    /**
+     * Timer identifier.
+     *
+     * @public
+     * @type {number}
+     */
+    public timerID: number;
+
+    /**
+     * Constructor.
+     *
+     * @constructor
+     * @param {Job}             job             The job.
+     * @param {Date}            fireDate        The fire date.
+     * @param {RecurrenceRule}  recurrenceRule  The recurrence rule.
+     */
+    constructor(job: Job, fireDate: Date, recurrenceRule: RecurrenceRule);
+}
+
+/**
+ * Cancels the job.
+ *
+ * @param {Job} job The job.
+ * @returns {boolean} {true} if the job has been cancelled with success, otherwise, {false}.
+ */
+export declare function cancelJob(job: Job): boolean;
+
+/**
+ * Create a schedule job.
+ *
+ * @param {RecurrenceRule} rule The rule.
+ * @param {Function} callback The callback.
+ */
+export declare function scheduleJob(rule: RecurrenceRule | Date | string, callback: Function): void;
diff --git a/node-schedule/node-schedule-tests.ts b/node-schedule/node-schedule-tests.ts
index bc4dbbd743..d1533dbf04 100644
--- a/node-schedule/node-schedule-tests.ts
+++ b/node-schedule/node-schedule-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="node-schedule.d.ts"/>
-
 import nodeSchedule = require("node-schedule");
 
 /**
diff --git a/node-schedule/node-schedule.d.ts b/node-schedule/node-schedule.d.ts
deleted file mode 100644
index 17dbb8402a..0000000000
--- a/node-schedule/node-schedule.d.ts
+++ /dev/null
@@ -1,199 +0,0 @@
-// Type definitions for node-schedule
-// Project: https://github.com/tejasmanohar/node-schedule/
-// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "node-schedule" {
-    import nodeSchedule = require('node-schedule');
-
-    /**
-     * Recurrence rules.
-     */
-    export interface RecurrenceRule {
-        /**
-         * Day of the month.
-         *
-         * @public
-         * @type {number}
-         */
-        date?: number;
-
-        /**
-         * Day of the week.
-         *
-         * @public
-         * @type {number|Array<number|Range>}
-         */
-        dayOfWeek?: number|Array<number|Range>;
-
-        /**
-         * Hour.
-         *
-         * @public
-         * @type {number}
-         */
-        hour?: number;
-
-        /**
-         * Minute.
-         *
-         * @public
-         * @type {number}
-         */
-        minute?: number;
-
-        /**
-         * Month.
-         *
-         * @public
-         * @type {number}
-         */
-        month?: number;
-
-        /**
-         * Second.
-         *
-         * @public
-         * @type {number}
-         */
-        second?: number;
-
-        /**
-         * Year.
-         *
-         * @public
-         * @type {number}
-         */
-        year?: number;
-    }
-
-    /**
-     * Range.
-     *
-     * @class
-     */
-    export class Range {
-        /**
-         * Constructor.
-         *
-         * @constructor
-         * @param {number} start The start.
-         * @param {end}    end   The end.
-         * @param {step}   step  The step.
-         */
-        constructor(start?: number, end?: number, step?: number);
-
-        /**
-         * Return a {boolean} if the class contains the specified value.
-         *
-         * @param {number} value The value.
-         * @returns {boolean} {true} if the class contains the specified value, otherwise, {false}.
-         */
-        contains(value: number): boolean;
-    }
-
-    /**
-     * Scheduler jobs.
-     *
-     * @class
-     */
-    export class Job {
-        /**
-         * Constructor.
-         *
-         * @constructor
-         * @param {RecurrenceRule}  rule      The rule.
-         * @param {callback}        callback  The callback.
-         */
-        constructor(name?: string, job?: Function, callback?: Function);
-
-        /**
-         * Constructor.
-         *
-         * @constructor
-         * @param {RecurrenceRule} rule The rule.
-         * @param
-         */
-        constructor(job?: Function, callback?: Function);
-
-        /**
-         * Attach an event handler function.
-         *
-         * @public
-         * @param {string}    eventName The event name.
-         * @param {Function}  handler   The function to execute when the event is triggered.
-         */
-        on(eventName: string, handler: Function): void;
-
-        /**
-         *
-         * @public
-         */
-        schedule(date: Date): void;
-    }
-
-    /**
-     * Invocation.
-     *
-     * @class
-     */
-    export class Invocation {
-        /**
-         * Fire date.
-         *
-         * @public
-         * @type {Date}
-         */
-        public fireDate: Date;
-
-        /**
-         * Job.
-         *
-         * @public
-         * @type {Job}
-         */
-        public job: Job;
-
-        /**
-         * Recurrence rule.
-         *
-         * @public
-         * @type {RecurrenceRule}
-         */
-        public recurrenceRule: RecurrenceRule;
-
-        /**
-         * Timer identifier.
-         *
-         * @public
-         * @type {number}
-         */
-        public timerID: number;
-
-        /**
-         * Constructor.
-         *
-         * @constructor
-         * @param {Job}             job             The job.
-         * @param {Date}            fireDate        The fire date.
-         * @param {RecurrenceRule}  recurrenceRule  The recurrence rule.
-         */
-        constructor(job: Job, fireDate: Date, recurrenceRule: RecurrenceRule);
-    }
-
-    /**
-     * Cancels the job.
-     *
-     * @param {Job} job The job.
-     * @returns {boolean} {true} if the job has been cancelled with success, otherwise, {false}.
-     */
-    export function cancelJob(job: Job): boolean;
-
-    /**
-     * Create a schedule job.
-     *
-     * @param {RecurrenceRule} rule The rule.
-     * @param {Function} callback The callback.
-     */
-    export function scheduleJob(rule: RecurrenceRule|Date|string, callback: Function): void;
-}
diff --git a/node-schedule/tsconfig.json b/node-schedule/tsconfig.json
new file mode 100644
index 0000000000..ff31029be5
--- /dev/null
+++ b/node-schedule/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-schedule-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-slack/index.d.ts b/node-slack/index.d.ts
new file mode 100644
index 0000000000..e4d8616c16
--- /dev/null
+++ b/node-slack/index.d.ts
@@ -0,0 +1,57 @@
+// Type definitions for node-slack
+// Project: https://github.com/xoxco/node-slack
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+import request = require('request');
+
+declare class Slack {
+    constructor(hookUrl: string, option?: Slack.Option);
+    send(message: Slack.Message): any; //TODO: Here comes deferred's promise as a return type
+    send(message: Slack.Message, callback: Slack.SendCallback): request.Request;
+    respond(query: Slack.Query): Slack.TextResponse;
+    respond(query: Slack.Query, callback: Slack.ResponseCallback): Slack.TextResponse;
+}
+
+declare namespace Slack {
+
+    interface Option {
+        proxy: string;
+    }
+
+    interface Message {
+        text: string;
+        channel?: string;
+        username?: string;
+        icon_emoji?: string;
+        attachments?: any[];
+        unfurl_links?: boolean;
+        link_names?: number;
+    }
+
+    interface SendCallback {
+        (err: any, body: any): any;
+    }
+
+    interface Query {
+        token?: string;
+        team_id?: string;
+        channel_id?: string;
+        channel_name?: string;
+        timestamp?: number;
+        user_id?: string;
+        user_name?: string;
+        text: string;
+    }
+
+    interface TextResponse {
+        text: string;
+    }
+
+    interface ResponseCallback {
+        (err: any, query: Query): any;
+    }
+}
+
+export = Slack;
diff --git a/node-slack/node-slack-tests.ts b/node-slack/node-slack-tests.ts
index e0c6e23b93..89dc5f783e 100644
--- a/node-slack/node-slack-tests.ts
+++ b/node-slack/node-slack-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../express/express.d.ts" />
-/// <reference path="node-slack.d.ts" />
+
 
 import express = require('express');
 import Slack = require('node-slack');
diff --git a/node-slack/node-slack.d.ts b/node-slack/node-slack.d.ts
deleted file mode 100644
index dd99332a05..0000000000
--- a/node-slack/node-slack.d.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-// Type definitions for node-slack
-// Project: https://github.com/xoxco/node-slack
-// Definitions by: Qubo <https://github.com/tkQubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../request/request.d.ts" />
-
-declare module "node-slack" {
-    import request = require('request');
-
-    class Slack {
-        constructor(hookUrl: string, option?: Slack.Option);
-        send(message: Slack.Message): any; //TODO: Here comes deferred's promise as a return type
-        send(message: Slack.Message, callback: Slack.SendCallback): request.Request;
-        respond(query: Slack.Query): Slack.TextResponse;
-        respond(query: Slack.Query, callback: Slack.ResponseCallback): Slack.TextResponse;
-    }
-
-    namespace Slack {
-
-        interface Option {
-            proxy: string;
-        }
-
-        interface Message {
-            text: string;
-            channel?: string;
-            username?: string;
-            icon_emoji?: string;
-            attachments?: any[];
-            unfurl_links?: boolean;
-            link_names?: number;
-        }
-
-        interface SendCallback {
-            (err: any, body: any): any;
-        }
-
-        interface Query {
-            token?: string;
-            team_id?: string;
-            channel_id?: string;
-            channel_name?: string;
-            timestamp?: number;
-            user_id?: string;
-            user_name?: string;
-            text: string;
-        }
-
-        interface TextResponse {
-            text: string;
-        }
-
-        interface ResponseCallback {
-            (err: any, query: Query): any;
-        }
-    }
-
-    export = Slack;
-}
-
diff --git a/node-slack/tsconfig.json b/node-slack/tsconfig.json
new file mode 100644
index 0000000000..d052d5ee84
--- /dev/null
+++ b/node-slack/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-slack-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-snap7/index.d.ts b/node-snap7/index.d.ts
new file mode 100644
index 0000000000..ab7a7423cb
--- /dev/null
+++ b/node-snap7/index.d.ts
@@ -0,0 +1,662 @@
+// Type definitions for node-snap7 0.2.2
+// Project: https://github.com/mathiask88/node-snap7
+// Definitions by: Heilingbrunner <https://github.com/heilingbrunner>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+// see: https://www.npmjs.com/package/node-snap7#api
+
+/// <reference types="node" />
+
+
+
+export declare enum ConnectionType {
+    CONNTYPE_PG = 0x01,
+    CONNTYPE_OP = 0x02,
+    CONNTYPE_BASIC = 0x03
+}
+
+export declare enum ParamNumber {
+    RemotePort = 2,
+    PingTimeout = 3,
+    SendTimeout = 4,
+    RecvTimeout = 5,
+    SrcRef = 7,
+    DstRef = 8,
+    SrcTSap = 9,
+    PDURequest = 10
+}
+
+export declare enum Area {
+    S7AreaPE = 0x81,
+    S7AreaPA = 0x82,
+    S7AreaMK = 0x83,
+    S7AreaDB = 0x84,
+    S7AreaCT = 0x1C,
+    S7AreaTM = 0x1D
+}
+
+export declare enum WordLen {
+    S7WLBit = 0x01,
+    S7WLByte = 0x02,
+    S7WLWord = 0x04,
+    S7WLDWord = 0x06,
+    S7WLReal = 0x08,
+    S7WLCounter = 0x1C,
+    S7WLTimer = 0x1D
+}
+
+export declare enum BlockType {
+    Block_OB = 0x38,
+    Block_DB = 0x41,
+    Block_SDB = 0x42,
+    Block_FC = 0x43,
+    Block_SFC = 0x44,
+    Block_FB = 0x45,
+    Block_SFB = 0x46
+}
+
+export declare enum SubBlockType {
+    SubBlk_OB = 0x08,
+    SubBlk_DB = 0x0A,
+    SubBlk_SDB = 0x0B,
+    SubBlk_FC = 0x0C,
+    SubBlk_SFC = 0x0D,
+    SubBlk_FB = 0x0E,
+    SubBlk_SFB = 0x0F
+}
+
+export declare enum LangType {
+    BlockLangAWL = 0x01,
+    BlockLangKOP = 0x02,
+    BlockLangFUP = 0x03,
+    BlockLangSCL = 0x04,
+    BlockLangDB = 0x05,
+    BlockLangGRAPH = 0x06
+}
+
+export declare enum Status {
+    S7CpuStatusUnknown = 0x00,
+    S7CpuStatusRun = 0x08,
+    S7CpuStatusStop = 0x04
+}
+
+interface MultiVarRead {
+    Area: Area;
+    WordLen: WordLen;
+    DBNumber?: number;
+    Start: number;
+    Amount: number;
+}
+
+interface MultiVarWrite {
+    Area: Area;
+    WordLen: WordLen;
+    DBNumber?: number;
+    Start: number;
+    Amount: number;
+    Data: Buffer;
+}
+
+interface MultiVarsReadResult {
+    Result: number; //Error Code
+    Data: Buffer;
+}
+
+interface MultiVarsWriteResult {
+    Result: number; //Error Code
+}
+
+interface S7Client_Static {
+    new (): S7Client;
+
+    //Static members here ...
+  }
+
+interface S7Client {
+
+    //Instance members here
+
+    //API - Control functions
+
+    /** 
+     * Connects the client to the PLC with the parameters specified in the previous call of ConnectTo() or SetConnectionParams().
+     * - cb: The optional callback parameter will be executed after connection attempt
+     * If callback is not set the function is blocking and returns true on success or false on error. 
+     * If callback is set the function is non-blocking and an error argument is given to the callback.
+     */
+    Connect(callback?: (err: any) => void): boolean;
+
+    /** 
+     * Connects the client to the hardware at ip, rack, slot coordinates.
+     * - ip: PLC/Equipment IPV4 Address ex. “192.168.1.12”
+     * - rack: PLC Rack number
+     * - slot: PLC Slot number
+     * - cb: The optional callback parameter will be executed after connection attempt
+     * If callback is not set the function is blocking and returns true on success or false on error. 
+     * If callback is set the function is non-blocking and an error argument is given to the callback.
+     */
+    ConnectTo(ip: string, rack: number, slot: number, callback?: (err: any) => void): boolean;
+
+    /** 
+     * Sets internally ip, localTSAP, remoteTSAP coordinates.
+     * - ip PLC/Equipment IPv4 address ex. “192.168.1.12”
+     * - localTSAP Local TSAP (PC TSAP)
+     * - remoteTSAP Remote TSAP (PLC TSAP)
+     * Returns true on success or false on error. 
+     */
+    SetConnectionParams(ip: string, localTSAP: any, remoteTSAP: any): boolean;
+
+    /**
+     * Sets the connection resource type, i.e the way in which the Clients connects to a PLC.
+     */
+    SetConnectionType(connectionType: ConnectionType): void;
+
+    /**
+     * Disconnects “gracefully” the Client from the PLC.
+     * Returns true on success or false on error.
+     */
+    Disconnect(): void;
+
+    /** 
+     * Reads an internal Client object parameter.
+     * Returns the parameter value on success or false on error.
+     */
+    GetParam(paramNumber: ParamNumber): any;
+
+    /**
+     * Sets an internal Client object parameter.
+     * paramNumber One from the parameter list above
+     * value New parameter value
+     * Returns true on success or false on error.
+     */
+    SetParam(paramNumber: ParamNumber, value: any): boolean;
+
+    //API - Data I/O functions
+
+    /**
+     * This is the main function to read data from a PLC. With it you can read DB, Inputs, Outputs, Merkers, Timers and Counters.
+     * - area Area identifier (see table below)
+     * - dbNumber DB number if area = S7AreaDB, otherwise ignored
+     * - start Offset to start
+     * - amount Amount of words to read
+     * - wordLen Word size (see table below)
+     * The optional callback parameter will be executed after read
+     * If callback is not set the function is blocking and returns a buffer object on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     */
+    ReadArea(area: Area, dbNumber: number, start: number, amount: number, wordLen: WordLen, callback?: (err: any, data: Buffer) => void): Buffer | boolean;
+
+    /**
+     * This is the main function to write data into a PLC.
+     * - area Area identifier (see table below)
+     * - dbNumber DB number if area = S7AreaDB, otherwise ignored
+     * - start Offset to start
+     * - amount Amount of words to read
+     * - wordLen Word size (see table below)
+     * - buffer User buffer
+     * - The optional callback parameter will be executed after write
+     * If callback is not set the function is blocking and returns true on success or false on error. 
+     * If callback is set the function is non-blocking and an error argument is given to the callback.
+     */
+    WriteArea(area: Area, dbNumber: number, start: number, amount: number, wordLen: WordLen, buffer: Buffer, callback?: (err: any) => void): boolean;
+
+    /**
+     * This is a lean function of ReadArea() to read PLC DB.
+     * It simply internally calls ReadArea() with area = S7Client.S7AreaDB and wordLen = s7client.S7WLByte.
+     * - dbNumber DB number
+     * - start Offset to start
+     * - size Size to read (bytes)
+     * - The optional callback parameter will be executed after read
+     * If callback is not set the function is blocking and returns a buffer object on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     */
+    DBRead(dbNumber: number, start: number, size: number, callback?: (err: any, data: any) => void): Buffer | boolean;
+
+    /**
+     * This is a lean function of WriteArea() to write PLC DB.
+     * It simply internally calls WriteArea() with area = S7Client.S7AreaDB and wordLen = s7client.S7WLByte.
+     * - dbNumber DB number
+     * - start Offset to start
+     * - size Size to write (bytes)
+     * - buffer User buffer
+     * - The optional callback parameter will be executed after write
+     * If callback is not set the function is blocking and returns true on success or false on error. 
+     * If callback is set the function is non-blocking and an error argument is given to the callback.
+     */
+    DBWrite(dbNumber: number, start: number, size: number, buffer: Buffer, callback?: (err: any) => void): boolean;
+
+    /**
+     * This is a lean function of ReadArea() to read PLC process outputs.
+     * It simply internally calls ReadArea() with area = S7Client.S7AreaPA and wordLen = s7client.S7WLByte.
+     * - start Offset to start
+     * - size Size to read (bytes)
+     * - The optional callback parameter will be executed after read
+     * If callback is not set the function is blocking and returns a buffer object on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     */
+    ABRead(start: number, size: number, callback?: (err: any, data: Buffer) => void): Buffer | boolean;
+
+    /**
+     * This is a lean function of WriteArea() to write PLC process outputs.
+     * It simply internally calls WriteArea() with area = S7Client.S7AreaPA and wordLen = s7client.S7WLByte.
+     * - start Offset to start
+     * - size Size to write (bytes)
+     * - buffer User buffer
+     * - The optional callback parameter will be executed after write
+     * If callback is not set the function is blocking and returns true on success or false on error. 
+     * If callback is set the function is non-blocking and an error argument is given to the callback.
+     */
+    ABWrite(start: number, size: number, buffer: Buffer, callback?: (err: any) => void): boolean;
+
+    /**
+     * This is a lean function of ReadArea() to read PLC process inputs.
+     * It simply internally calls ReadArea() with area = S7Client.S7AreaPE and wordLen = s7client.S7WLByte.
+     * - start Offset to start
+     * - size Size to read (bytes)
+     * - The optional callback parameter will be executed after read
+     * If callback is not set the function is blocking and returns a buffer object on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     */
+    EBRead(start: number, size: number, callback?: (err: any, data: Buffer) => void): Buffer | boolean;
+
+    /**
+     * This is a lean function of WriteArea() to write PLC process inputs.
+     * It simply internally calls WriteArea() with area = S7Client.S7AreaPE and wordLen = s7client.S7WLByte.
+     * - start Offset to start
+     * - size Size to write (bytes)
+     * - buffer User buffer
+     * - The optional callback parameter will be executed after write
+     * If callback is not set the function is blocking and returns true on success or false on error. 
+     * If callback is set the function is non-blocking and an error argument is given to the callback.
+     */
+    EBWrite(start: number, size: number, buffer: Buffer, callback?: (err: any) => void): boolean;
+
+    /**
+     * This is a lean function of ReadArea() to read PLC Merkers.
+     * It simply internally calls ReadArea() with area = S7Client.S7AreaMK and wordLen = s7client.S7WLByte.
+     * - start Offset to start
+     * - size Size to read (bytes)
+     * - The optional callback parameter will be executed after read
+     * If callback is not set the function is blocking and returns a buffer object on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     */
+    MBRead(start: number, size: number, callback?: (err: any, data: Buffer) => void): Buffer | boolean;
+
+    /**
+     * This is a lean function of WriteArea() to write PLC Merkers.
+     * It simply internally calls WriteArea() with area = S7Client.S7AreaMK and wordLen = s7client.S7WLByte.
+     * - start Offset to start
+     * - size Size to write (bytes)
+     * - buffer User buffer
+     * - The optional callback parameter will be executed after write
+     * If callback is not set the function is blocking and returns true on success or false on error. 
+     * If callback is set the function is non-blocking and an error argument is given to the callback.
+     */
+    MBWrite(start: number, size: number, buffer: Buffer, callback?: (err: any) => void): boolean;
+
+    /**
+     * This is a lean function of ReadArea() to read PLC Timers.
+     * It simply internally calls ReadArea() with area = S7Client.S7AreaTM and wordLen = S7Client.S7WLTimer.
+     * - start Offset to start
+     * - amount Number of timers
+     * - The optional callback parameter will be executed after read
+     * If callback is not set the function is blocking and returns a buffer object on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     */
+    TMRead(start: number, size: number, callback?: (err: any, data: Buffer) => void): Buffer | boolean;
+
+    /**
+     * This is a lean function of WriteArea() to write PLC Timers.
+     * It simply internally calls WriteArea() with area = S7Client.S7AreaTM and wordLen = S7Client.S7WLTimer.
+     * - start Offset to start
+     * - amount Number of timers
+     * - buffer User buffer
+     * - The optional callback parameter will be executed after write
+     * If callback is not set the function is blocking and returns true on success or false on error. 
+     * If callback is set the function is non-blocking and an error argument is given to the callback.
+     */
+    TMWrite(start: number, size: number, buffer: Buffer, callback?: (err: any) => void): boolean;
+
+    /**
+     * This is a lean function of ReadArea() to read PLC Counters.
+     * It simply internally calls ReadArea() with area = S7Client.S7AreaCT and wordLen = S7Client.S7WLCounter.
+     * - start Offset to start
+     * - amount Number of counters
+     * -  The optional callback parameter will be executed after read
+     * If callback is not set the function is blocking and returns a buffer object on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     */
+    CTRead(start: number, size: number, callback?: (err: any, data: Buffer) => void): Buffer | boolean;
+
+    /**
+     * This is a lean function of WriteArea() to write PLC Counters.
+     * It simply internally calls WriteArea() with area = S7Client.S7AreaCT and wordLen = S7Client.S7WLCounter.
+     * - start Offset to start
+     * - amount Number of counters
+     * - buffer User buffer
+     * - The optional callback parameter will be executed after write
+     * If callback is not set the function is blocking and returns true on success or false on error. 
+     * If callback is set the function is non-blocking and an error argument is given to the callback.
+     */
+    CTWrite(start: number, size: number, buffer: Buffer, callback?: (err: any) => void): boolean;
+
+    /**
+     * This is function allows to read different kind of variables from a PLC in a single call. With it you can read DB, 
+     * Inputs, Outputs, Merkers, Timers and Counters.
+     * - multiVars Array of objects with read information (see structure below)
+     * - The optional callback parameter will be executed after read
+     * If callback is not set the function is blocking and returns an array on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     */
+    ReadMultiVars(multiVars: MultiVarRead[], callback?: (err: any, data: MultiVarsReadResult[]) => void): MultiVarsReadResult[] | boolean;
+
+    /**
+     * This is function allows to write different kind of variables into a PLC in a single call. With it you can write DB, 
+     * Inputs, Outputs, Merkers, Timers and Counters.
+     * - multiVars Array of objects with write information (see structure below)
+     * - The optional callback parameter will be executed after write
+     * If callback is not set the function is blocking and returns an array on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     */
+    WriteMultiVars(multiVars: MultiVarWrite[], callback?: (err: any, data: MultiVarsWriteResult[]) => void): MultiVarsWriteResult[] | boolean;
+
+    //API - Directory functions
+
+    /**
+     * This function returns an object of the AG blocks amount divided by type.
+     * - The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns an object (see below) on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     */
+    ListBlocks(callback?: (err: any, data: Object) => void): Object | boolean;
+
+    /**
+     * This function returns an array of the AG list of a specified block type.
+     * - blockType Type of block (see table below)
+     * - The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns an array on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     */
+    ListBlocksOfType(blockType: BlockType, callback?: (err: any, data: any) => void): any | boolean;
+
+    /**
+     * Returns an object with detailed information about a given AG block. This function is very useful if you need to read or write 
+     * data in a DB which you do not know the size in advance (see MC7Size field)
+     * - blockType Type of block (see table above)
+     * - blockNum Number of block
+     * - The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns an object (see below) on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     */
+    GetAgBlockInfo(blockType: BlockType, blockNum: number, callback?: (err: any, data: any) => void): any | boolean;
+
+    /**
+     * Returns detailed information about a block present in a user buffer. This function is usually used in conjunction with FullUpload(). 
+     * An uploaded block saved to disk, could be loaded in a user buffer and checked with this function.
+     * - buffer User buffer
+     * Returns an object (see example above) on success or false on error.
+     */
+    GetPgBlockInfo(buffer: Buffer): Object | boolean;
+
+    //API - Block oriented functions
+
+    /**
+     * Uploads a block from AG. The whole block (including header and footer) is copied into the user buffer.
+     * - blockType Type of block (see table above)
+     * - blockNum Number of block
+     * - The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns a Buffer object on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     */
+    FullUpload(blockType: BlockType, blockNum: number, callback?: (err: any, data: Object) => void): Object | boolean;
+
+    /**
+     * Uploads a block body from AG. Only the block body (but header and footer) is copied into the user buffer.
+     * - blockType Type of block (see table above)
+     * - blockNum Number of block
+     * - The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns a Buffer object on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     */
+    Upload(blockType: BlockType, blockNum: number, callback?: (err: any, data: Object) => void): Object | boolean;
+
+    /**
+     * Downloads a block into AG. A whole block (including header and footer) must be available into the user buffer.
+     * - blockNum Number of block
+     * - buffer User buffer
+     * - The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns true on success or false on error. 
+     * If callback is set the function is non-blocking and an error argument is given to the callback.
+     * If the parameter blockNum is -1, the block number is not changed else the block is downloaded with the provided number (just like a “Download As…”).
+     */
+    Download(blockNum: number, buffer: Buffer, callback?: (err: any) => void): boolean;
+
+    /**
+     * Deletes a block into AG.
+     * !!! There is no undo function available !!!
+     * - blockType Type of block (see table above)
+     * - blockNum Number of block
+     * - The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns true on success or false on error. 
+     * If callback is set the function is non-blocking and an error argument is given to the callback.
+     */
+    Delete(blockType: BlockType, blockNum: number, callback?: (err: any) => void): boolean;
+
+    /**
+     * Uploads a DB from AG. This function is equivalent to Upload() with BlockType = Block_DB but it uses a different approach 
+     * so it’s not subject to the security level set.
+     * Only data is uploaded.
+     * - dbNumber DB number
+     * - The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns a Buffer object on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     * This function first gathers the DB size via GetAgBlockInfo() then calls DBRead().
+     */
+    DBGet(dbNumber: number, callback?: (err: any, data: Buffer) => void): Buffer | boolean;
+
+    /**
+     * Fills a DB in AG with a given byte without the need of specifying its size.
+     * - dbNumber DB number
+     * - fillChar char or char code
+     * - The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns true on success or false on error. 
+     * If callback is set the function is non-blocking and an error argument is given to the callback.
+     */
+    DBFill(dbNumber: number, fillChar: string, callback?: (err: any) => void): boolean;
+
+    //API - Date/Time functions
+
+    /**
+     * Reads PLC date and time.
+     * - The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns a javascript Date() object on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     */
+    GetPlcDateTime(callback?: (err: any, data: any) => void): any | boolean;
+
+    /**
+     * Sets the PLC date and time.
+     * - dateTime
+     * - The optional callback parameter will be executed after completion
+     * The dateTime argument can be a javascript Date() object or an object with the structure below.
+     * {
+     *   "year": 2015,  // year 
+     *   "month": 4,    // months since January     0-11 
+     *   "day": 3,      // day of the month         1-31 
+     *   "hours": 19,   // hours since midnight     0-23 
+     *   "minutes": 37, // minutes after the hour   0-59 
+     *   "seconds": 0   // seconds after the minute 0-59 
+     * }
+     * If callback is not set the function is blocking and returns a true on success or false on error. 
+     * If callback is set the function is non-blocking and an error argument is given to the callback.
+     */
+    SetPlcDateTime(dateTime: Date, callback?: (err: any) => void): boolean;
+
+    /**
+     * Sets the PLC date and time in accord to the PC system Date/Time.
+     * - The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns true on success or false on error. 
+     * If callback is set the function is non-blocking and an error argument is given to the callback.
+     */
+    SetPlcSystemDateTime(callback?: (err: any) => void): boolean;
+
+    //API - System info functions
+
+    /**
+     * Reads a partial list of given idand index.
+     * - The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns a buffer on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     */
+    ReadSZL(id: number, index: number, callback?: (err: any, data: any) => void): Buffer | boolean;
+
+    /**
+     * Reads the directory of the partial lists.
+     * - The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns an array on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     */
+    ReadSZLList(callback?: (err: any, data: any) => void): any | boolean;
+
+    /**
+     * Gets CPU order code and version info.
+     * - The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns an object on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     */
+    GetOrderCode(callback?: (err: any, data: any) => void): any | boolean;
+
+    /**
+     * Gets CPU module name, serial number and other info.
+     * - The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns an object on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     */
+    GetCpuInfo(callback?: (err: any, data: any) => void): any | boolean;
+
+    /**
+     * Gets CP (communication processor) info.
+     * - The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns an object on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     */
+    GetCpInfo(callback?: (err: any, data: any) => void): any | boolean;
+
+    //API - PLC control functions
+
+    /**
+     * Puts the CPU in RUN mode performing an HOT START.
+     * - The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns true on success or false on error. 
+     * If callback is set the function is non-blocking and an error argument is given to the callback.
+     */
+    PlcHotStart(callback?: (err: any) => void): boolean;
+
+    /**
+     * Puts the CPU in RUN mode performing a COLD START.
+     * - The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns true on success or false on error. 
+     * If callback is set the function is non-blocking and an error argument is given to the callback.
+     */
+    PlcColdStart(callback?: (err: any) => void): boolean;
+
+    /**
+     * Puts the CPU in STOP mode.
+     * - The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns true on success or false on error. 
+     * If callback is set the function is non-blocking and an error argument is given to the callback.
+     */
+    PlcStop(callback?: (err: any) => void): boolean;
+
+    /**
+     * Performs the Copy Ram to Rom action.
+     * - timeout Maximum time expected to complete the operation (ms)
+     * - The optional callback parameter will be executed after completion or on timeout
+     * If callback is not set the function is blocking and returns true on success or false on error. 
+     * If callback is set the function is non-blocking and an error argument is given to the callback.
+     * Not all CPUs support this operation. The CPU must be in STOP mode.
+     */
+    CopyRamToRom(timeout: number, callback?: (err: any) => void): boolean;
+
+    /**
+     * Performs the Memory compress action.
+     * - timeout Maximum time expected to complete the operation (ms)
+     * - The optional callback parameter will be executed after completion or on timeout
+     * If callback is not set the function is blocking and returns true on success or false on error. 
+     * If callback is set the function is non-blocking and an error argument is given to the callback.
+     */
+    Compress(timeout: number, callback?: (err: any) => void): boolean;
+
+    //API - Security functions
+
+    /**
+     * Send the password to the PLC to meet its security level.
+     * - password Password
+     * - The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns true on success or false on error. 
+     * If callback is set the function is non-blocking and an error argument is given to the callback.
+     * A password accepted by a PLC is an 8 chars string, a longer password will be trimmed, and a shorter one will be "right space padded".
+     */
+    SetSessionPassword(password: string, callback?: (err: any) => void): boolean;
+
+    /**
+     * Clears the password set for the current session (logout).
+     * - The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns true on success or false on error. 
+     * If callback is set the function is non-blocking and an error argument is given to the callback.
+     */
+    ClearSessionPassword(callback?: (err: any) => void): boolean;
+
+    /**
+     * Gets the CPU protection level info.
+     * - The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns the protection object on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     */
+    GetProtection(callback?: (err: any, data: any) => void): any | boolean;
+
+    //API - Properties
+
+    /**
+     * Returns the last job execution time in milliseconds or false on error.
+     */
+    ExecTime(): number | boolean;
+
+    /**
+     * Returns the last job result.
+     */
+    LastError(): any;
+
+    /**
+     * Returns the PDU length requested by the client or false on error. The requested PDU length can be modified with SetParam().
+     */
+    PduRequested(): number | boolean;
+
+    /**
+     * Returns the PDU length negotiated between the client and the PLC during the connection or false on error.
+     * It’s useful to know the PDU negotiated when we need to call ReadMultivar() or WriteMultiVar(). 
+     * All other data transfer functions handle this information by themselves and split the telegrams automatically if needed.
+     */
+    PduLength(): number | boolean;
+
+    /**
+     * Returns the CPU status (running/stopped).
+     * The optional callback parameter will be executed after completion
+     * If callback is not set the function is blocking and returns the CPU status on success or false on error. 
+     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
+     */
+    PlcStatus(callback?: (err: any, data: Status) => void): Status | boolean;
+
+    /**
+     * Returns the connection status.
+     */
+    Connected(): any;
+
+    /**
+     * Returns a textual explanation of a given error number.
+     * - errNum Error number
+     */
+    ErrorText(err: number): string;
+}
+
+export declare var S7Client: S7Client_Static;
diff --git a/node-snap7/node-snap7-tests.ts b/node-snap7/node-snap7-tests.ts
index 005b9d9087..b592c365be 100644
--- a/node-snap7/node-snap7-tests.ts
+++ b/node-snap7/node-snap7-tests.ts
@@ -2,7 +2,6 @@
 // see: https://github.com/mathiask88/node-snap7-testsuite
 // see: http://definitelytyped.org/guides/contributing.html
 
-/// <reference path="node-snap7.d.ts" />
 
 import snap7 = require("node-snap7");
 
diff --git a/node-snap7/node-snap7.d.ts b/node-snap7/node-snap7.d.ts
deleted file mode 100644
index 422a32085d..0000000000
--- a/node-snap7/node-snap7.d.ts
+++ /dev/null
@@ -1,664 +0,0 @@
-// Type definitions for node-snap7 0.2.2
-// Project: https://github.com/mathiask88/node-snap7
-// Definitions by: Heilingbrunner <https://github.com/heilingbrunner>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-// see: https://www.npmjs.com/package/node-snap7#api
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "node-snap7" {
-
-  export enum ConnectionType {
-    CONNTYPE_PG = 0x01,
-    CONNTYPE_OP = 0x02,
-    CONNTYPE_BASIC = 0x03
-  }
-
-  export enum ParamNumber {
-    RemotePort = 2,
-    PingTimeout = 3,
-    SendTimeout = 4,
-    RecvTimeout = 5,
-    SrcRef = 7,
-    DstRef = 8,
-    SrcTSap = 9,
-    PDURequest = 10
-  }
-
-  export enum Area {
-    S7AreaPE = 0x81,
-    S7AreaPA = 0x82,
-    S7AreaMK = 0x83,
-    S7AreaDB = 0x84,
-    S7AreaCT = 0x1C,
-    S7AreaTM = 0x1D
-  }
-
-  export enum WordLen {
-    S7WLBit = 0x01,
-    S7WLByte = 0x02,
-    S7WLWord = 0x04,
-    S7WLDWord = 0x06,
-    S7WLReal = 0x08,
-    S7WLCounter = 0x1C,
-    S7WLTimer = 0x1D
-  }
-
-  export enum BlockType {
-    Block_OB = 0x38,
-    Block_DB = 0x41,
-    Block_SDB = 0x42,
-    Block_FC = 0x43,
-    Block_SFC = 0x44,
-    Block_FB = 0x45,
-    Block_SFB = 0x46
-  }
-
-  export enum SubBlockType {
-    SubBlk_OB = 0x08,
-    SubBlk_DB = 0x0A,
-    SubBlk_SDB = 0x0B,
-    SubBlk_FC = 0x0C,
-    SubBlk_SFC = 0x0D,
-    SubBlk_FB = 0x0E,
-    SubBlk_SFB = 0x0F
-  }
-
-  export enum LangType {
-    BlockLangAWL = 0x01,
-    BlockLangKOP = 0x02,
-    BlockLangFUP = 0x03,
-    BlockLangSCL = 0x04,
-    BlockLangDB = 0x05,
-    BlockLangGRAPH = 0x06
-  }
-
-  export enum Status {
-    S7CpuStatusUnknown = 0x00,
-    S7CpuStatusRun = 0x08,
-    S7CpuStatusStop = 0x04
-  }
-  
-  interface MultiVarRead{
-    Area: Area;
-    WordLen: WordLen;
-    DBNumber?: number;
-    Start: number;
-    Amount: number;
-  }
-  
-  interface MultiVarWrite{
-    Area: Area;
-    WordLen: WordLen;
-    DBNumber?: number;
-    Start: number;
-    Amount: number;
-    Data: Buffer;
-  }
-  
-  interface MultiVarsReadResult{
-    Result: number; //Error Code
-    Data: Buffer;
-  }
-  
-  interface MultiVarsWriteResult{
-    Result: number; //Error Code
-  }
-  
-  interface S7Client_Static {
-      new(): S7Client;
-      
-      //Static members here ...
-      
-  }
-  
-  interface S7Client {
-
-    //Instance members here
-
-    //API - Control functions
-       
-    /** 
-     * Connects the client to the PLC with the parameters specified in the previous call of ConnectTo() or SetConnectionParams().
-     * - cb: The optional callback parameter will be executed after connection attempt
-     * If callback is not set the function is blocking and returns true on success or false on error. 
-     * If callback is set the function is non-blocking and an error argument is given to the callback.
-     */
-    Connect(callback?: (err: any) => void): boolean;
-    
-    /** 
-     * Connects the client to the hardware at ip, rack, slot coordinates.
-     * - ip: PLC/Equipment IPV4 Address ex. “192.168.1.12”
-     * - rack: PLC Rack number
-     * - slot: PLC Slot number
-     * - cb: The optional callback parameter will be executed after connection attempt
-     * If callback is not set the function is blocking and returns true on success or false on error. 
-     * If callback is set the function is non-blocking and an error argument is given to the callback.
-     */
-    ConnectTo(ip: string, rack: number, slot: number, callback?: (err: any) => void): boolean;
-    
-    /** 
-     * Sets internally ip, localTSAP, remoteTSAP coordinates.
-     * - ip PLC/Equipment IPv4 address ex. “192.168.1.12”
-     * - localTSAP Local TSAP (PC TSAP)
-     * - remoteTSAP Remote TSAP (PLC TSAP)
-     * Returns true on success or false on error. 
-     */
-    SetConnectionParams(ip: string, localTSAP: any, remoteTSAP: any): boolean;
-    
-    /**
-     * Sets the connection resource type, i.e the way in which the Clients connects to a PLC.
-     */
-    SetConnectionType(connectionType: ConnectionType): void;
-    
-    /**
-     * Disconnects “gracefully” the Client from the PLC.
-     * Returns true on success or false on error.
-     */
-    Disconnect(): void;
-
-    /** 
-     * Reads an internal Client object parameter.
-     * Returns the parameter value on success or false on error.
-     */
-    GetParam(paramNumber: ParamNumber): any;
-    
-    /**
-     * Sets an internal Client object parameter.
-     * paramNumber One from the parameter list above
-     * value New parameter value
-     * Returns true on success or false on error.
-     */
-    SetParam(paramNumber: ParamNumber, value: any): boolean;
-   
-    //API - Data I/O functions
-    
-    /**
-     * This is the main function to read data from a PLC. With it you can read DB, Inputs, Outputs, Merkers, Timers and Counters.
-     * - area Area identifier (see table below)
-     * - dbNumber DB number if area = S7AreaDB, otherwise ignored
-     * - start Offset to start
-     * - amount Amount of words to read
-     * - wordLen Word size (see table below)
-     * The optional callback parameter will be executed after read
-     * If callback is not set the function is blocking and returns a buffer object on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     */
-    ReadArea(area: Area, dbNumber: number, start: number, amount: number, wordLen: WordLen, callback?: (err: any, data: Buffer) => void): Buffer|boolean;
-    
-    /**
-     * This is the main function to write data into a PLC.
-     * - area Area identifier (see table below)
-     * - dbNumber DB number if area = S7AreaDB, otherwise ignored
-     * - start Offset to start
-     * - amount Amount of words to read
-     * - wordLen Word size (see table below)
-     * - buffer User buffer
-     * - The optional callback parameter will be executed after write
-     * If callback is not set the function is blocking and returns true on success or false on error. 
-     * If callback is set the function is non-blocking and an error argument is given to the callback.
-     */
-    WriteArea(area: Area, dbNumber: number, start: number, amount: number, wordLen: WordLen, buffer: Buffer, callback?: (err: any) => void): boolean;
-
-    /**
-     * This is a lean function of ReadArea() to read PLC DB.
-     * It simply internally calls ReadArea() with area = S7Client.S7AreaDB and wordLen = s7client.S7WLByte.
-     * - dbNumber DB number
-     * - start Offset to start
-     * - size Size to read (bytes)
-     * - The optional callback parameter will be executed after read
-     * If callback is not set the function is blocking and returns a buffer object on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     */
-    DBRead(dbNumber: number, start: number, size: number, callback?: (err: any, data: any) => void): Buffer|boolean;
-    
-    /**
-     * This is a lean function of WriteArea() to write PLC DB.
-     * It simply internally calls WriteArea() with area = S7Client.S7AreaDB and wordLen = s7client.S7WLByte.
-     * - dbNumber DB number
-     * - start Offset to start
-     * - size Size to write (bytes)
-     * - buffer User buffer
-     * - The optional callback parameter will be executed after write
-     * If callback is not set the function is blocking and returns true on success or false on error. 
-     * If callback is set the function is non-blocking and an error argument is given to the callback.
-     */
-    DBWrite(dbNumber: number, start: number, size: number, buffer: Buffer, callback?: (err: any) => void): boolean;
-    
-    /**
-     * This is a lean function of ReadArea() to read PLC process outputs.
-     * It simply internally calls ReadArea() with area = S7Client.S7AreaPA and wordLen = s7client.S7WLByte.
-     * - start Offset to start
-     * - size Size to read (bytes)
-     * - The optional callback parameter will be executed after read
-     * If callback is not set the function is blocking and returns a buffer object on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     */
-    ABRead(start: number, size: number, callback?: (err: any, data: Buffer) => void): Buffer|boolean;
-    
-    /**
-     * This is a lean function of WriteArea() to write PLC process outputs.
-     * It simply internally calls WriteArea() with area = S7Client.S7AreaPA and wordLen = s7client.S7WLByte.
-     * - start Offset to start
-     * - size Size to write (bytes)
-     * - buffer User buffer
-     * - The optional callback parameter will be executed after write
-     * If callback is not set the function is blocking and returns true on success or false on error. 
-     * If callback is set the function is non-blocking and an error argument is given to the callback.
-     */
-    ABWrite(start: number, size: number, buffer: Buffer, callback?: (err: any) => void): boolean;
-    
-    /**
-     * This is a lean function of ReadArea() to read PLC process inputs.
-     * It simply internally calls ReadArea() with area = S7Client.S7AreaPE and wordLen = s7client.S7WLByte.
-     * - start Offset to start
-     * - size Size to read (bytes)
-     * - The optional callback parameter will be executed after read
-     * If callback is not set the function is blocking and returns a buffer object on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     */
-    EBRead(start: number, size: number, callback?: (err: any, data: Buffer) => void): Buffer|boolean;
-    
-    /**
-     * This is a lean function of WriteArea() to write PLC process inputs.
-     * It simply internally calls WriteArea() with area = S7Client.S7AreaPE and wordLen = s7client.S7WLByte.
-     * - start Offset to start
-     * - size Size to write (bytes)
-     * - buffer User buffer
-     * - The optional callback parameter will be executed after write
-     * If callback is not set the function is blocking and returns true on success or false on error. 
-     * If callback is set the function is non-blocking and an error argument is given to the callback.
-     */
-    EBWrite(start: number, size: number, buffer: Buffer, callback?: (err: any) => void): boolean;
-    
-    /**
-     * This is a lean function of ReadArea() to read PLC Merkers.
-     * It simply internally calls ReadArea() with area = S7Client.S7AreaMK and wordLen = s7client.S7WLByte.
-     * - start Offset to start
-     * - size Size to read (bytes)
-     * - The optional callback parameter will be executed after read
-     * If callback is not set the function is blocking and returns a buffer object on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     */
-    MBRead(start: number, size: number, callback?: (err: any, data: Buffer) => void): Buffer|boolean;
-    
-    /**
-     * This is a lean function of WriteArea() to write PLC Merkers.
-     * It simply internally calls WriteArea() with area = S7Client.S7AreaMK and wordLen = s7client.S7WLByte.
-     * - start Offset to start
-     * - size Size to write (bytes)
-     * - buffer User buffer
-     * - The optional callback parameter will be executed after write
-     * If callback is not set the function is blocking and returns true on success or false on error. 
-     * If callback is set the function is non-blocking and an error argument is given to the callback.
-     */
-    MBWrite(start: number, size: number, buffer: Buffer, callback?: (err: any) => void): boolean;
-    
-    /**
-     * This is a lean function of ReadArea() to read PLC Timers.
-     * It simply internally calls ReadArea() with area = S7Client.S7AreaTM and wordLen = S7Client.S7WLTimer.
-     * - start Offset to start
-     * - amount Number of timers
-     * - The optional callback parameter will be executed after read
-     * If callback is not set the function is blocking and returns a buffer object on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     */
-    TMRead(start: number, size: number, callback?: (err: any, data: Buffer) => void): Buffer|boolean;
-
-    /**
-     * This is a lean function of WriteArea() to write PLC Timers.
-     * It simply internally calls WriteArea() with area = S7Client.S7AreaTM and wordLen = S7Client.S7WLTimer.
-     * - start Offset to start
-     * - amount Number of timers
-     * - buffer User buffer
-     * - The optional callback parameter will be executed after write
-     * If callback is not set the function is blocking and returns true on success or false on error. 
-     * If callback is set the function is non-blocking and an error argument is given to the callback.
-     */
-    TMWrite(start: number, size: number, buffer: Buffer, callback?: (err: any) => void): boolean;
-
-    /**
-     * This is a lean function of ReadArea() to read PLC Counters.
-     * It simply internally calls ReadArea() with area = S7Client.S7AreaCT and wordLen = S7Client.S7WLCounter.
-     * - start Offset to start
-     * - amount Number of counters
-     * -  The optional callback parameter will be executed after read
-     * If callback is not set the function is blocking and returns a buffer object on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     */
-    CTRead(start: number, size: number, callback?: (err: any, data: Buffer) => void): Buffer|boolean;
-    
-    /**
-     * This is a lean function of WriteArea() to write PLC Counters.
-     * It simply internally calls WriteArea() with area = S7Client.S7AreaCT and wordLen = S7Client.S7WLCounter.
-     * - start Offset to start
-     * - amount Number of counters
-     * - buffer User buffer
-     * - The optional callback parameter will be executed after write
-     * If callback is not set the function is blocking and returns true on success or false on error. 
-     * If callback is set the function is non-blocking and an error argument is given to the callback.
-     */
-    CTWrite(start: number, size: number, buffer: Buffer, callback?: (err: any) => void): boolean;
-    
-    /**
-     * This is function allows to read different kind of variables from a PLC in a single call. With it you can read DB, 
-     * Inputs, Outputs, Merkers, Timers and Counters.
-     * - multiVars Array of objects with read information (see structure below)
-     * - The optional callback parameter will be executed after read
-     * If callback is not set the function is blocking and returns an array on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     */
-    ReadMultiVars(multiVars: MultiVarRead[], callback?: (err: any, data: MultiVarsReadResult[]) => void): MultiVarsReadResult[]|boolean;
-    
-    /**
-     * This is function allows to write different kind of variables into a PLC in a single call. With it you can write DB, 
-     * Inputs, Outputs, Merkers, Timers and Counters.
-     * - multiVars Array of objects with write information (see structure below)
-     * - The optional callback parameter will be executed after write
-     * If callback is not set the function is blocking and returns an array on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     */
-    WriteMultiVars(multiVars: MultiVarWrite[], callback?: (err: any, data: MultiVarsWriteResult[]) => void): MultiVarsWriteResult[]|boolean;
-
-    //API - Directory functions
-    
-    /**
-     * This function returns an object of the AG blocks amount divided by type.
-     * - The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns an object (see below) on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     */
-    ListBlocks(callback?: (err: any, data: Object) => void): Object|boolean;
-    
-    /**
-     * This function returns an array of the AG list of a specified block type.
-     * - blockType Type of block (see table below)
-     * - The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns an array on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     */
-    ListBlocksOfType(blockType: BlockType, callback?: (err: any, data: any) => void): any|boolean;
-    
-    /**
-     * Returns an object with detailed information about a given AG block. This function is very useful if you need to read or write 
-     * data in a DB which you do not know the size in advance (see MC7Size field)
-     * - blockType Type of block (see table above)
-     * - blockNum Number of block
-     * - The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns an object (see below) on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     */
-    GetAgBlockInfo(blockType: BlockType, blockNum: number, callback?: (err: any, data: any) => void): any|boolean;
-    
-    /**
-     * Returns detailed information about a block present in a user buffer. This function is usually used in conjunction with FullUpload(). 
-     * An uploaded block saved to disk, could be loaded in a user buffer and checked with this function.
-     * - buffer User buffer
-     * Returns an object (see example above) on success or false on error.
-     */
-    GetPgBlockInfo(buffer: Buffer): Object|boolean;
-      
-    //API - Block oriented functions
-    
-    /**
-     * Uploads a block from AG. The whole block (including header and footer) is copied into the user buffer.
-     * - blockType Type of block (see table above)
-     * - blockNum Number of block
-     * - The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns a Buffer object on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     */
-    FullUpload(blockType: BlockType, blockNum: number, callback?: (err: any, data: Object) => void): Object|boolean;
-    
-    /**
-     * Uploads a block body from AG. Only the block body (but header and footer) is copied into the user buffer.
-     * - blockType Type of block (see table above)
-     * - blockNum Number of block
-     * - The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns a Buffer object on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     */
-    Upload(blockType: BlockType, blockNum: number, callback?: (err: any, data: Object) => void): Object|boolean;
-    
-    /**
-     * Downloads a block into AG. A whole block (including header and footer) must be available into the user buffer.
-     * - blockNum Number of block
-     * - buffer User buffer
-     * - The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns true on success or false on error. 
-     * If callback is set the function is non-blocking and an error argument is given to the callback.
-     * If the parameter blockNum is -1, the block number is not changed else the block is downloaded with the provided number (just like a “Download As…”).
-     */
-    Download(blockNum: number, buffer: Buffer, callback?: (err: any) => void): boolean;
-    
-    /**
-     * Deletes a block into AG.
-     * !!! There is no undo function available !!!
-     * - blockType Type of block (see table above)
-     * - blockNum Number of block
-     * - The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns true on success or false on error. 
-     * If callback is set the function is non-blocking and an error argument is given to the callback.
-     */
-    Delete(blockType: BlockType, blockNum: number, callback?: (err: any) => void): boolean;
-    
-    /**
-     * Uploads a DB from AG. This function is equivalent to Upload() with BlockType = Block_DB but it uses a different approach 
-     * so it’s not subject to the security level set.
-     * Only data is uploaded.
-     * - dbNumber DB number
-     * - The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns a Buffer object on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     * This function first gathers the DB size via GetAgBlockInfo() then calls DBRead().
-     */
-    DBGet(dbNumber: number, callback?: (err: any, data: Buffer) => void): Buffer|boolean;
-    
-    /**
-     * Fills a DB in AG with a given byte without the need of specifying its size.
-     * - dbNumber DB number
-     * - fillChar char or char code
-     * - The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns true on success or false on error. 
-     * If callback is set the function is non-blocking and an error argument is given to the callback.
-     */
-    DBFill(dbNumber: number, fillChar: string, callback?: (err: any) => void): boolean;
-
-    //API - Date/Time functions
-    
-    /**
-     * Reads PLC date and time.
-     * - The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns a javascript Date() object on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     */
-    GetPlcDateTime(callback?: (err: any, data: any) => void): any|boolean;
-    
-    /**
-     * Sets the PLC date and time.
-     * - dateTime
-     * - The optional callback parameter will be executed after completion
-     * The dateTime argument can be a javascript Date() object or an object with the structure below.
-     * {
-     *   "year": 2015,  // year 
-     *   "month": 4,    // months since January     0-11 
-     *   "day": 3,      // day of the month         1-31 
-     *   "hours": 19,   // hours since midnight     0-23 
-     *   "minutes": 37, // minutes after the hour   0-59 
-     *   "seconds": 0   // seconds after the minute 0-59 
-     * }
-     * If callback is not set the function is blocking and returns a true on success or false on error. 
-     * If callback is set the function is non-blocking and an error argument is given to the callback.
-     */
-    SetPlcDateTime(dateTime: Date, callback?: (err: any) => void): boolean;
-    
-    /**
-     * Sets the PLC date and time in accord to the PC system Date/Time.
-     * - The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns true on success or false on error. 
-     * If callback is set the function is non-blocking and an error argument is given to the callback.
-     */
-    SetPlcSystemDateTime(callback?: (err: any) => void): boolean;
-    
-    //API - System info functions
-    
-    /**
-     * Reads a partial list of given idand index.
-     * - The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns a buffer on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     */
-    ReadSZL(id: number, index: number, callback?: (err: any, data: any) => void): Buffer|boolean;
-    
-    /**
-     * Reads the directory of the partial lists.
-     * - The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns an array on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     */
-    ReadSZLList(callback?: (err: any, data: any) => void): any|boolean;
-    
-    /**
-     * Gets CPU order code and version info.
-     * - The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns an object on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     */
-    GetOrderCode(callback?: (err: any, data: any) => void): any|boolean;
-    
-    /**
-     * Gets CPU module name, serial number and other info.
-     * - The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns an object on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     */
-    GetCpuInfo(callback?: (err: any, data: any) => void): any|boolean;
-    
-    /**
-     * Gets CP (communication processor) info.
-     * - The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns an object on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     */
-    GetCpInfo(callback?: (err: any, data: any) => void): any|boolean;
-    
-    //API - PLC control functions
-    
-    /**
-     * Puts the CPU in RUN mode performing an HOT START.
-     * - The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns true on success or false on error. 
-     * If callback is set the function is non-blocking and an error argument is given to the callback.
-     */
-    PlcHotStart(callback?: (err: any) => void): boolean;
-    
-    /**
-     * Puts the CPU in RUN mode performing a COLD START.
-     * - The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns true on success or false on error. 
-     * If callback is set the function is non-blocking and an error argument is given to the callback.
-     */
-    PlcColdStart(callback?: (err: any) => void): boolean;
-    
-    /**
-     * Puts the CPU in STOP mode.
-     * - The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns true on success or false on error. 
-     * If callback is set the function is non-blocking and an error argument is given to the callback.
-     */
-    PlcStop(callback?: (err: any) => void): boolean;
-    
-    /**
-     * Performs the Copy Ram to Rom action.
-     * - timeout Maximum time expected to complete the operation (ms)
-     * - The optional callback parameter will be executed after completion or on timeout
-     * If callback is not set the function is blocking and returns true on success or false on error. 
-     * If callback is set the function is non-blocking and an error argument is given to the callback.
-     * Not all CPUs support this operation. The CPU must be in STOP mode.
-     */
-    CopyRamToRom(timeout: number, callback?: (err: any) => void): boolean;
-    
-    /**
-     * Performs the Memory compress action.
-     * - timeout Maximum time expected to complete the operation (ms)
-     * - The optional callback parameter will be executed after completion or on timeout
-     * If callback is not set the function is blocking and returns true on success or false on error. 
-     * If callback is set the function is non-blocking and an error argument is given to the callback.
-     */
-    Compress(timeout: number, callback?: (err: any) => void): boolean;
-    
-    //API - Security functions
-    
-    /**
-     * Send the password to the PLC to meet its security level.
-     * - password Password
-     * - The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns true on success or false on error. 
-     * If callback is set the function is non-blocking and an error argument is given to the callback.
-     * A password accepted by a PLC is an 8 chars string, a longer password will be trimmed, and a shorter one will be "right space padded".
-     */
-    SetSessionPassword(password: string, callback?: (err: any) => void): boolean;
-    
-    /**
-     * Clears the password set for the current session (logout).
-     * - The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns true on success or false on error. 
-     * If callback is set the function is non-blocking and an error argument is given to the callback.
-     */
-    ClearSessionPassword(callback?: (err: any) => void): boolean;
-    
-    /**
-     * Gets the CPU protection level info.
-     * - The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns the protection object on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     */
-    GetProtection(callback?: (err: any, data: any) => void): any|boolean;
-    
-    //API - Properties
-    
-    /**
-     * Returns the last job execution time in milliseconds or false on error.
-     */
-    ExecTime(): number|boolean;
-    
-    /**
-     * Returns the last job result.
-     */
-    LastError(): any;
-    
-    /**
-     * Returns the PDU length requested by the client or false on error. The requested PDU length can be modified with SetParam().
-     */
-    PduRequested(): number|boolean;
-    
-    /**
-     * Returns the PDU length negotiated between the client and the PLC during the connection or false on error.
-     * It’s useful to know the PDU negotiated when we need to call ReadMultivar() or WriteMultiVar(). 
-     * All other data transfer functions handle this information by themselves and split the telegrams automatically if needed.
-     */
-    PduLength(): number|boolean;
-    
-    /**
-     * Returns the CPU status (running/stopped).
-     * The optional callback parameter will be executed after completion
-     * If callback is not set the function is blocking and returns the CPU status on success or false on error. 
-     * If callback is set the function is non-blocking and an error and result argument is given to the callback.
-     */
-    PlcStatus(callback?: (err: any, data: Status) => void): Status|boolean;
-    
-    /**
-     * Returns the connection status.
-     */
-    Connected(): any;
-    
-    /**
-     * Returns a textual explanation of a given error number.
-     * - errNum Error number
-     */
-    ErrorText(err: number): string;
-  }
-  
-  export var S7Client :S7Client_Static;
-}
diff --git a/node-snap7/tsconfig.json b/node-snap7/tsconfig.json
new file mode 100644
index 0000000000..56236f4975
--- /dev/null
+++ b/node-snap7/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-snap7-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-uuid/index.d.ts b/node-uuid/index.d.ts
new file mode 100644
index 0000000000..84c6c2521b
--- /dev/null
+++ b/node-uuid/index.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for node-uuid.js
+// Project: https://github.com/broofa/node-uuid
+// Definitions by: Jeff May <https://github.com/jeffmay>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export as namespace uuid;
+
+export interface UUIDOptions {
+
+    /**
+     * Node id as Array of 6 bytes (per 4.1.6).
+     * Default: Randomly generated ID. See note 1.
+     */
+    node?: any[];
+
+    /**
+     * (Number between 0 - 0x3fff) RFC clock sequence.
+     * Default: An internally maintained clockseq is used.
+     */
+    clockseq?: number;
+
+    /**
+     * (Number | Date) Time in milliseconds since unix Epoch.
+     * Default: The current time is used.
+     */
+    msecs?: number|Date;
+
+    /**
+     * (Number between 0-9999) additional time, in 100-nanosecond units. Ignored if msecs is unspecified.
+     * Default: internal uuid counter is used, as per 4.2.1.2.
+     */
+    nsecs?: number;
+}
+
+export interface UUID {
+    v1(options?: UUIDOptions): string;
+    v1(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
+
+    v4(options?: UUIDOptions): string;
+    v4(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
+
+    parse(id: string, buffer?: number[], offset?: number): number[];
+
+    unparse(buffer: number[], offset?: number): string;
+}
+
+export function v1(options?: UUIDOptions): string;
+export function v1(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
+export function v1(options?: UUIDOptions, buffer?: Buffer, offset?: number): Buffer;
+
+export function v4(options?: UUIDOptions): string;
+export function v4(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
+export function v4(options?: UUIDOptions, buffer?: Buffer, offset?: number): Buffer;
+
+export function parse(id: string, buffer?: number[], offset?: number): number[];
+export function parse(id: string, buffer?: Buffer, offset?: number): Buffer;
+
+export function unparse(buffer: number[], offset?: number): string;
+export function unparse(buffer: Buffer, offset?: number): string;
diff --git a/node-uuid/node-uuid-base.d.ts b/node-uuid/node-uuid-base.d.ts
deleted file mode 100644
index fc59e9c762..0000000000
--- a/node-uuid/node-uuid-base.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// Type definitions for node-uuid.js
-// Project: https://github.com/broofa/node-uuid
-// Definitions by: Jeff May <https://github.com/jeffmay>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/** Common definitions for all environments */
-declare namespace __NodeUUID {
-    interface UUIDOptions {
-
-        /**
-         * Node id as Array of 6 bytes (per 4.1.6).
-         * Default: Randomly generated ID. See note 1.
-         */
-        node?: any[];
-
-        /**
-         * (Number between 0 - 0x3fff) RFC clock sequence.
-         * Default: An internally maintained clockseq is used.
-         */
-        clockseq?: number;
-
-        /**
-         * (Number | Date) Time in milliseconds since unix Epoch.
-         * Default: The current time is used.
-         */
-        msecs?: number|Date;
-
-        /**
-         * (Number between 0-9999) additional time, in 100-nanosecond units. Ignored if msecs is unspecified.
-         * Default: internal uuid counter is used, as per 4.2.1.2.
-         */
-        nsecs?: number;
-    }
-
-    interface UUID {
-        v1(options?: UUIDOptions): string;
-        v1(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
-
-        v4(options?: UUIDOptions): string;
-        v4(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
-
-        parse(id: string, buffer?: number[], offset?: number): number[];
-
-        unparse(buffer: number[], offset?: number): string;
-    }
-}
diff --git a/node-uuid/node-uuid-cjs-tests.ts b/node-uuid/node-uuid-cjs-tests.ts
index 62212e5d3e..464bbcc625 100644
--- a/node-uuid/node-uuid-cjs-tests.ts
+++ b/node-uuid/node-uuid-cjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="node-uuid-cjs.d.ts" />
+
 
 import nodeUuid = require('node-uuid');
 
diff --git a/node-uuid/node-uuid-cjs.d.ts b/node-uuid/node-uuid-cjs.d.ts
deleted file mode 100644
index 78f753544a..0000000000
--- a/node-uuid/node-uuid-cjs.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Type definitions for node-uuid.js
-// Project: https://github.com/broofa/node-uuid
-// Definitions by: Jeff May <https://github.com/jeffmay>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="./node-uuid-base.d.ts" />
-
-/**
- * Expose as CommonJS module
- * For use in node environment or browser environment (using webpack or other module loaders)
- */
-declare module "node-uuid" {
-    var uuid: __NodeUUID.UUID;
-    export = uuid;
-}
\ No newline at end of file
diff --git a/node-uuid/node-uuid-global-tests.ts b/node-uuid/node-uuid-global-tests.ts
index 2336cabdd7..de0ea25e39 100644
--- a/node-uuid/node-uuid-global-tests.ts
+++ b/node-uuid/node-uuid-global-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="node-uuid-global.d.ts" />
+
 
 var uid1: string = uuid.v1();
 var uid4: string = uuid.v4();
diff --git a/node-uuid/node-uuid-global.d.ts b/node-uuid/node-uuid-global.d.ts
deleted file mode 100644
index 7e8111fa34..0000000000
--- a/node-uuid/node-uuid-global.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for node-uuid.js
-// Project: https://github.com/broofa/node-uuid
-// Definitions by: Jeff May <https://github.com/jeffmay>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="./node-uuid-base.d.ts" />
-
-/** Expose as global variable */
-declare var uuid: __NodeUUID.UUID;
diff --git a/node-uuid/node-uuid-tests.ts b/node-uuid/node-uuid-tests.ts
index b77e7f48c8..21373a7a42 100644
--- a/node-uuid/node-uuid-tests.ts
+++ b/node-uuid/node-uuid-tests.ts
@@ -1,11 +1,11 @@
-/// <reference path="node-uuid.d.ts" />
+
 
 import nodeUuid = require('node-uuid');
 
 var uid1: string = nodeUuid.v1();
 var uid4: string = nodeUuid.v4();
 
-var options: __NodeUUID.UUIDOptions = {
+var options: nodeUuid.UUIDOptions = {
   node: [],
   clockseq: 2,
   nsecs: 3,
diff --git a/node-uuid/node-uuid.d.ts b/node-uuid/node-uuid.d.ts
deleted file mode 100644
index a67370531d..0000000000
--- a/node-uuid/node-uuid.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Type definitions for node-uuid.js
-// Project: https://github.com/broofa/node-uuid
-// Definitions by: Jeff May <https://github.com/jeffmay>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="./node-uuid-base.d.ts" />
-/// <reference path="./node-uuid-cjs.d.ts" />
-
-/**
- * Definitions for use in node environment
- *
- * !! For browser enviroments, use node-uuid-global or node-uuid-cjs
- */
-declare module __NodeUUID {
-    /**
-     * Overloads for node environment
-     * We need to duplicate some declarations because
-     * interface merging doesn't work with overloads
-     */
-    interface UUID {
-        v1(options?: UUIDOptions): string;
-        v1(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
-        v1(options?: UUIDOptions, buffer?: Buffer, offset?: number): Buffer;
-
-        v4(options?: UUIDOptions): string;
-        v4(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
-        v4(options?: UUIDOptions, buffer?: Buffer, offset?: number): Buffer;
-
-        parse(id: string, buffer?: number[], offset?: number): number[];
-        parse(id: string, buffer?: Buffer, offset?: number): Buffer;
-
-        unparse(buffer: number[], offset?: number): string;
-        unparse(buffer: Buffer, offset?: number): string;
-    }
-}
diff --git a/node-uuid/tsconfig.json b/node-uuid/tsconfig.json
new file mode 100644
index 0000000000..8855e33598
--- /dev/null
+++ b/node-uuid/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-uuid-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-validator/node-validator.d.ts b/node-validator/index.d.ts
similarity index 100%
rename from node-validator/node-validator.d.ts
rename to node-validator/index.d.ts
diff --git a/node-validator/node-validator-tests.ts b/node-validator/node-validator-tests.ts
index 8f45c1685f..843c95ce8b 100644
--- a/node-validator/node-validator-tests.ts
+++ b/node-validator/node-validator-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="node-validator.d.ts"/>
-
 import { run, isObject, isString, isIsoDate, isArray } from 'node-validator';
 
 let checkChild = isObject()
diff --git a/node-validator/tsconfig.json b/node-validator/tsconfig.json
new file mode 100644
index 0000000000..fc738208c3
--- /dev/null
+++ b/node-validator/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-validator-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node-webkit/node-webkit-tests.ts b/node-webkit/node-webkit-tests.ts
deleted file mode 100644
index ba53c3fc4f..0000000000
--- a/node-webkit/node-webkit-tests.ts
+++ /dev/null
@@ -1,205 +0,0 @@
-///<reference path="../node/node.d.ts"/>
-///<reference path="node-webkit.d.ts"/>
-
-// Load native UI library
-// See docs: https://github.com/rogerwang/node-webkit/wiki/Shell
-import gui = require("nw.gui");
-
-
-/* WINDOW */
-
-    // Get the current window
-    var win = gui.Window.get();
-
-    // Listen to the minimize event
-    win.on('minimize', function() {
-        console.log('Window is minimized');
-    });
-
-    // Minimize the window
-    win.minimize();
-
-    // Unlisten the minimize event
-    win.removeAllListeners('minimize');
-
-    // Create a new window and get it
-    var new_win = gui.Window.get(
-        window.open('https://github.com')
-    );
-
-    // And listen to new window's focus event
-    new_win.on('focus', function() {
-        console.log('New window is focused');
-    });
-
-
-    // Get the current window
-    var win = gui.Window.get();
-
-    // Create a new window and get it
-    var new_win = gui.Window.get(
-        window.open('https://github.com')
-    );
-
-    // png as base64string
-    win.capturePage(function(base64string:string){
-        // do something with the base64string
-    }, { format : 'png', datatype : 'raw'} );
-
-    // png as node buffer
-    win.capturePage(function(buffer:Buffer){
-        // do something with the buffer
-    }, { format : 'png', datatype : 'buffer'} );
-
-
-    // Open a new window.
-    var win = gui.Window.get(
-        window.open('popup.html')
-    );
-
-    // Release the 'win' object here after the new window is closed.
-    win.on('closed', function() {
-        win = null;
-    });
-
-    // Listen to main window's close event
-    gui.Window.get().on('close', function() {
-        // Hide the window to give user the feeling of closing immediately
-        this.hide();
-
-        // If the new window is still open then close it.
-        if (win != null)
-            win.close(true);
-
-        // After closing the new window, close the main window.
-        this.close(true);
-    });
-
-
-/* MENU */
-
-    // Create an empty menu
-    var menu = new gui.Menu();
-
-    // Add some items
-    menu.append(new gui.MenuItem({ label: 'Item A' }));
-    menu.append(new gui.MenuItem({ label: 'Item B' }));
-    menu.append(new gui.MenuItem({ type: 'separator' }));
-    menu.append(new gui.MenuItem({ label: 'Item C' }));
-
-    // Remove one item
-    menu.removeAt(1);
-
-    // Popup as context menu
-    menu.popup(10, 10);
-
-    // Iterate menu's items
-    for (var i = 0; i < menu.items.length; ++i) {
-        console.log(menu.items[i]);
-    }
-
-
-    var win = gui.Window.get();
-    var nativeMenuBar = new gui.Menu({ type: "menubar" });
-    nativeMenuBar.createMacBuiltin("My App");
-    win.menu = nativeMenuBar;
-
-    nativeMenuBar.createMacBuiltin("My App", {
-        hideEdit: true,
-        hideWindow: true
-    });
-
-/* MENU ITEM */
-
-    var itemc:gui.MenuItem;
-
-    // Create a separator
-    itemc = new gui.MenuItem({ type: 'separator' });
-
-    // Create a normal item with label and icon
-    itemc = new gui.MenuItem({
-        type: "normal",
-        label: "I'm a menu item",
-        icon: "img/icon.png"
-    });
-
-    // Or you can omit the 'type' field for normal items
-    itemc = new gui.MenuItem({ label: 'Simple item' });
-
-    // Bind a callback to item
-    itemc = new gui.MenuItem({
-        label: "Click me",
-        click: function() {
-            console.log("I'm clicked");
-        },
-        key: "s",
-        modifiers: "ctrl-alt",
-    });
-
-    // You can have submenu!
-    var submenu = new gui.Menu();
-    submenu.append(new gui.MenuItem({ label: 'Item 1' }));
-    submenu.append(new gui.MenuItem({ label: 'Item 2' }));
-    submenu.append(new gui.MenuItem({ label: 'Item 3' }));
-    itemc.submenu = submenu;
-
-    // And everything can be changed at runtime
-    itemc.label = 'New label';
-    itemc.click = function() { console.log('New click callback'); };
-
-
-/* APP */
-
-    // Print arguments
-    console.log(gui.App.argv);
-
-    // Quit current app
-    gui.App.quit();
-
-    // Get the name field in manifest
-    gui.App.manifest.name
-
-    gui.App.addOriginAccessWhitelistEntry('http://github.com/', 'app', 'myapp', true);
-
-
-/* CLIPBOARD */
-
-    // We can not create a clipboard, we have to receive the system clipboard
-    var clipboard = gui.Clipboard.get();
-
-    // Read from clipboard
-    var text = clipboard.get('text');
-    console.log(text);
-
-    // Or write something
-    clipboard.set('I love node-webkit :)', 'text');
-
-    // And clear it!
-    clipboard.clear();
-
-
-/* TRAY */
-
-    // Create a tray icon
-    var tray = new gui.Tray({ title: 'Tray', icon: 'img/icon.png' });
-
-    // Give it a menu
-    var menu = new gui.Menu();
-    menu.append(new gui.MenuItem({ type: 'checkbox', label: 'box1' }));
-    tray.menu = menu;
-
-    // Remove the tray
-    tray.remove();
-    tray = null;
-
-
-/* SHELL */
-
-    // Open URL with default browser.
-    gui.Shell.openExternal('https://github.com/rogerwang/node-webkit');
-
-    // Open a text file with default text editor.
-    gui.Shell.openItem('test.txt');
-
-    // Open a file in file explorer.
-    gui.Shell.showItemInFolder('test.txt');
\ No newline at end of file
diff --git a/node-webkit/node-webkit.d.ts b/node-webkit/node-webkit.d.ts
deleted file mode 100644
index 81129274dc..0000000000
--- a/node-webkit/node-webkit.d.ts
+++ /dev/null
@@ -1,221 +0,0 @@
-// Type definitions for node-webkit
-// Project: https://github.com/rogerwang/node-webkit
-// Definitions by: Pedro Casaubon <https://github.com/xperiments>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "nw.gui" {
-
-    interface IEventEmitter {
-        addListener(event: string, listener: Function): EventEmitter;
-        on(event: string, listener: Function): EventEmitter;
-        once(event: string, listener: Function): EventEmitter;
-        removeListener(event: string, listener: Function): EventEmitter;
-        removeAllListeners(event?: string): EventEmitter;
-        setMaxListeners(n: number): void;
-        listeners(event: string): Function[];
-        emit(event: string, ...args: any[]): boolean;
-    }
-
-    class EventEmitter implements IEventEmitter {
-        addListener(event: string, listener: Function): EventEmitter;
-        on(event: string, listener: Function): EventEmitter;
-        once(event: string, listener: Function): EventEmitter;
-        removeListener(event: string, listener: Function): EventEmitter;
-        removeAllListeners(event?: string): EventEmitter;
-        setMaxListeners(n: number): void;
-        listeners(event: string): Function[];
-        emit(event: string, ...args: any[]): boolean;
-    }
-
-    export interface MenuConfig {
-        type?: string;
-    }
-
-    export interface HideMenusOptions {
-        hideEdit: boolean;
-        hideWindow: boolean;
-    }
-
-    export interface MenuItemConfig {
-        label?: string;
-        click?: Function;
-        type?: string;
-        submenu?: Menu;
-        icon?: string;
-        tooltip?: string;
-        checked?: boolean;
-        enabled?: boolean;
-        key?: string;
-        modifiers?: string;
-    }
-
-    export class MenuItem extends EventEmitter implements MenuItemConfig {
-        constructor(config: MenuItemConfig);
-        label: string;
-        click: Function;
-        type: string;
-        submenu: Menu;
-        icon: string;
-        tooltip: string;
-        checked: boolean;
-        enabled: boolean;
-        key: string;
-        modifiers: string;
-    }
-
-    export class Menu {
-        constructor(config?: MenuConfig);
-        items: MenuItem[];
-        append(item: MenuItem): void;
-        remove(item: MenuItem): void;
-        insert(item: MenuItem, atPosition: number): void;
-        removeAt(index: number): void;
-        popup(x: number, y: number): void;
-        // since v0.10.0-rc1
-        createMacBuiltin(appname: string, options?: HideMenusOptions): void;
-
-    }
-
-    export interface ShortcutOption {
-        key: string;
-        active: Function;
-        failed: Function;
-    }
-
-    export class Shortcut extends EventEmitter {
-        constructor(option: ShortcutOption);
-        key: string;
-        active: Function;
-        failed: Function;
-    }
-
-    export interface WindowManifestOptions {
-
-        title?: string;
-        icon?: string;
-        toolbar?: boolean;
-        frame?: boolean;
-        width?: number;
-        height?: number;
-        position?: string;
-        min_width?: number;
-        min_height?: number;
-        max_width?: number;
-        max_height?: number;
-    }
-
-    export class Window extends EventEmitter {
-        static get(windowObject?: any): Window;
-        static open(url: string, options?: WindowManifestOptions): Window;
-        x: number;
-        y: number;
-        width: number;
-        height: number;
-        title: string;
-        menu: Menu;
-        isFullScreen: boolean;
-        isKioskMode: boolean;
-        zoomLevel: number;
-        moveTo(x: number, y: number): void;
-        moveBy(x: number, y: number): void;
-        resizeTo(width: number, height: number): void;
-        resizeBy(width: number, height: number): void;
-        focus(): void;
-        blur(): void;
-        show(): void;
-        hide(): void;
-        close(force?: boolean): void;
-        reload(): void;
-        reloadIgnoringCache(): void;
-        maximize(): void;
-        unmaximize(): void;
-        minimize(): void;
-        restore(): void;
-        enterFullscreen(): void;
-        leaveFullscreen(): void;
-        toggleFullscreen(): void;
-        enterKioskMode(): void;
-        leaveKioskMode(): void;
-        toggleKioskMode(): void;
-        showDevTools(id?: string, headless?: boolean): void;
-        showDevTools(id: HTMLIFrameElement, headless?: boolean): void;
-        closeDevTools(): void;
-        isDevToolsOpen(): boolean;
-        setMaximumSize(width: number, height: number): void;
-        setMinimumSize(width: number, height: number): void;
-        setResizable(resizable: boolean): void;
-        setAlwaysOnTop(top: boolean): void;
-        setPosition(position: string): void;
-        setShowInTaskbar(show: boolean): void;
-        requestAttention(attention: boolean): void;
-        requestAttention(attention: number): void;
-        capturePage(callback: Function, imageformat?: string): void;
-        capturePage(callback: Function, config_object: { format: string; datatype: string }): void;
-        setProgressBar(progress: number): void;
-        setBadgeLabel(label: string): void;
-        eval(frame: HTMLIFrameElement, script: string): void;
-    }
-
-    export interface App {
-        argv: any;
-        fullArgv: any;
-        dataPath: string;
-        manifest: any;
-        clearCache(): void;
-        closeAllWindows(): void;
-        crashBrowser(): void;
-        crashRenderer(): void;
-        getProxyForURL(url: string): void;
-        quit(): void;
-        setCrashDumpDir(dir: string): void;
-        addOriginAccessWhitelistEntry(
-            sourceOrigin: string
-            , destinationProtocol: string
-            , destinationHost: string
-            , allowDestinationSubdomains: boolean
-            ): void;
-        removeOriginAccessWhitelistEntry(
-            sourceOrigin: string
-            , destinationProtocol: string
-            , destinationHost: string
-            , allowDestinationSubdomains: boolean
-            ): void;
-        registerGlobalHotKey(shortcut: Shortcut): void;
-        unregisterGlobalHotKey(shortcut: Shortcut): void;
-    }
-
-    export class Clipboard {
-        static get(): Clipboard;
-        get(type?: string): string;
-        set(data: string, type?: string): void;
-        clear(): void;
-    }
-
-    export interface TrayOption {
-        title?: string;
-        tooltip?: string;
-        icon?: string;
-        alticon?: string;
-        menu?: Menu;
-    }
-
-    export class Tray implements TrayOption {
-        constructor(option: TrayOption);
-        title: string;
-        tooltip: string;
-        icon: string;
-        alticon: string;
-        menu: Menu;
-        remove(): void;
-    }
-
-    interface Shell {
-        openExternal(uri: string): void;
-        openItem(file_path: string): void;
-        showItemInFolder(file_path: string): void;
-    }
-
-    export var App: App;
-    export var Shell: Shell;
-
-}
diff --git a/node/index.d.ts b/node/index.d.ts
new file mode 100644
index 0000000000..31f1cecc0c
--- /dev/null
+++ b/node/index.d.ts
@@ -0,0 +1,2344 @@
+// Type definitions for Node.js v4.x
+// Project: http://nodejs.org/
+// Definitions by: Microsoft TypeScript <http://typescriptlang.org>, DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/************************************************
+*                                               *
+*               Node.js v4.x API                *
+*                                               *
+************************************************/
+
+interface Error {
+    stack?: string;
+}
+
+
+// compat for TypeScript 1.8
+// if you use with --target es3 or --target es5 and use below definitions,
+// use the lib.es6.d.ts that is bundled with TypeScript 1.8.
+interface MapConstructor {}
+interface WeakMapConstructor {}
+interface SetConstructor {}
+interface WeakSetConstructor {}
+
+/************************************************
+*                                               *
+*                   GLOBAL                      *
+*                                               *
+************************************************/
+declare var process: NodeJS.Process;
+declare var global: NodeJS.Global;
+
+declare var __filename: string;
+declare var __dirname: string;
+
+declare function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
+declare function clearTimeout(timeoutId: NodeJS.Timer): void;
+declare function setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
+declare function clearInterval(intervalId: NodeJS.Timer): void;
+declare function setImmediate(callback: (...args: any[]) => void, ...args: any[]): any;
+declare function clearImmediate(immediateId: any): void;
+
+interface NodeRequireFunction {
+    (id: string): any;
+}
+
+interface NodeRequire extends NodeRequireFunction {
+    resolve(id:string): string;
+    cache: any;
+    extensions: any;
+    main: any;
+}
+
+declare var require: NodeRequire;
+
+interface NodeModule {
+    exports: any;
+    require: NodeRequireFunction;
+    id: string;
+    filename: string;
+    loaded: boolean;
+    parent: any;
+    children: any[];
+}
+
+declare var module: NodeModule;
+
+// Same as module.exports
+declare var exports: any;
+declare var SlowBuffer: {
+    new (str: string, encoding?: string): Buffer;
+    new (size: number): Buffer;
+    new (size: Uint8Array): Buffer;
+    new (array: any[]): Buffer;
+    prototype: Buffer;
+    isBuffer(obj: any): boolean;
+    byteLength(string: string, encoding?: string): number;
+    concat(list: Buffer[], totalLength?: number): Buffer;
+};
+
+
+// Buffer class
+type BufferEncoding = "ascii" | "utf8" | "utf16le" | "ucs2" | "binary" | "hex";
+interface Buffer extends NodeBuffer {}
+
+/**
+ * Raw data is stored in instances of the Buffer class.
+ * A Buffer is similar to an array of integers but corresponds to a raw memory allocation outside the V8 heap.  A Buffer cannot be resized.
+ * Valid string encodings: 'ascii'|'utf8'|'utf16le'|'ucs2'(alias of 'utf16le')|'base64'|'binary'(deprecated)|'hex'
+ */
+declare var Buffer: {
+    /**
+     * Allocates a new buffer containing the given {str}.
+     *
+     * @param str String to store in buffer.
+     * @param encoding encoding to use, optional.  Default is 'utf8'
+     */
+    new (str: string, encoding?: string): Buffer;
+    /**
+     * Allocates a new buffer of {size} octets.
+     *
+     * @param size count of octets to allocate.
+     */
+    new (size: number): Buffer;
+    /**
+     * Allocates a new buffer containing the given {array} of octets.
+     *
+     * @param array The octets to store.
+     */
+    new (array: Uint8Array): Buffer;
+    /**
+     * Produces a Buffer backed by the same allocated memory as
+     * the given {ArrayBuffer}.
+     * 
+     *
+     * @param arrayBuffer The ArrayBuffer with which to share memory.
+     */
+    new (arrayBuffer: ArrayBuffer): Buffer;
+    /**
+     * Allocates a new buffer containing the given {array} of octets.
+     *
+     * @param array The octets to store.
+     */
+    new (array: any[]): Buffer;
+    /**
+     * Copies the passed {buffer} data onto a new {Buffer} instance.
+     *
+     * @param buffer The buffer to copy.
+     */
+    new (buffer: Buffer): Buffer;
+    prototype: Buffer;
+    /**
+     * Returns true if {obj} is a Buffer
+     *
+     * @param obj object to test.
+     */
+    isBuffer(obj: any): obj is Buffer;
+    /**
+     * Returns true if {encoding} is a valid encoding argument.
+     * Valid string encodings in Node 0.12: 'ascii'|'utf8'|'utf16le'|'ucs2'(alias of 'utf16le')|'base64'|'binary'(deprecated)|'hex'
+     *
+     * @param encoding string to test.
+     */
+    isEncoding(encoding: string): boolean;
+    /**
+     * Gives the actual byte length of a string. encoding defaults to 'utf8'.
+     * This is not the same as String.prototype.length since that returns the number of characters in a string.
+     *
+     * @param string string to test.
+     * @param encoding encoding used to evaluate (defaults to 'utf8')
+     */
+    byteLength(string: string, encoding?: string): number;
+    /**
+     * Returns a buffer which is the result of concatenating all the buffers in the list together.
+     *
+     * If the list has no items, or if the totalLength is 0, then it returns a zero-length buffer.
+     * If the list has exactly one item, then the first item of the list is returned.
+     * If the list has more than one item, then a new Buffer is created.
+     *
+     * @param list An array of Buffer objects to concatenate
+     * @param totalLength Total length of the buffers when concatenated.
+     *   If totalLength is not provided, it is read from the buffers in the list. However, this adds an additional loop to the function, so it is faster to provide the length explicitly.
+     */
+    concat(list: Buffer[], totalLength?: number): Buffer;
+    /**
+     * The same as buf1.compare(buf2).
+     */
+    compare(buf1: Buffer, buf2: Buffer): number;
+};
+
+/************************************************
+*                                               *
+*               GLOBAL INTERFACES               *
+*                                               *
+************************************************/
+declare namespace NodeJS {
+    export interface ErrnoException extends Error {
+        errno?: number;
+        code?: string;
+        path?: string;
+        syscall?: string;
+        stack?: string;
+    }
+
+    export interface EventEmitter {
+        addListener(event: string, listener: Function): this;
+        on(event: string, listener: Function): this;
+        once(event: string, listener: Function): this;
+        removeListener(event: string, listener: Function): this;
+        removeAllListeners(event?: string): this;
+        setMaxListeners(n: number): this;
+        getMaxListeners(): number;
+        listeners(event: string): Function[];
+        emit(event: string, ...args: any[]): boolean;
+        listenerCount(type: string): number;
+    }
+
+    export interface ReadableStream extends EventEmitter {
+        readable: boolean;
+        read(size?: number): string|Buffer;
+        setEncoding(encoding: string): void;
+        pause(): void;
+        resume(): void;
+        pipe<T extends WritableStream>(destination: T, options?: { end?: boolean; }): T;
+        unpipe<T extends WritableStream>(destination?: T): void;
+        unshift(chunk: string): void;
+        unshift(chunk: Buffer): void;
+        wrap(oldStream: ReadableStream): ReadableStream;
+    }
+
+    export interface WritableStream extends EventEmitter {
+        writable: boolean;
+        write(buffer: Buffer|string, cb?: Function): boolean;
+        write(str: string, encoding?: string, cb?: Function): boolean;
+        end(): void;
+        end(buffer: Buffer, cb?: Function): void;
+        end(str: string, cb?: Function): void;
+        end(str: string, encoding?: string, cb?: Function): void;
+    }
+
+    export interface ReadWriteStream extends ReadableStream, WritableStream {}
+
+    export interface Events extends EventEmitter { }
+
+    export interface Domain extends Events {
+        run(fn: Function): void;
+        add(emitter: Events): void;
+        remove(emitter: Events): void;
+        bind(cb: (err: Error, data: any) => any): any;
+        intercept(cb: (data: any) => any): any;
+        dispose(): void;
+
+        addListener(event: string, listener: Function): this;
+        on(event: string, listener: Function): this;
+        once(event: string, listener: Function): this;
+        removeListener(event: string, listener: Function): this;
+        removeAllListeners(event?: string): this;
+    }
+
+    export interface MemoryUsage {
+        rss: number;
+        heapTotal: number;
+        heapUsed: number;
+    }
+
+    export interface Process extends EventEmitter {
+        stdout: WritableStream;
+        stderr: WritableStream;
+        stdin: ReadableStream;
+        argv: string[];
+        execArgv: string[];
+        execPath: string;
+        abort(): void;
+        chdir(directory: string): void;
+        cwd(): string;
+        env: any;
+        exit(code?: number): void;
+        getgid(): number;
+        setgid(id: number): void;
+        setgid(id: string): void;
+        getuid(): number;
+        setuid(id: number): void;
+        setuid(id: string): void;
+        version: string;
+        versions: {
+            http_parser: string;
+            node: string;
+            v8: string;
+            ares: string;
+            uv: string;
+            zlib: string;
+            openssl: string;
+        };
+        config: {
+            target_defaults: {
+                cflags: any[];
+                default_configuration: string;
+                defines: string[];
+                include_dirs: string[];
+                libraries: string[];
+            };
+            variables: {
+                clang: number;
+                host_arch: string;
+                node_install_npm: boolean;
+                node_install_waf: boolean;
+                node_prefix: string;
+                node_shared_openssl: boolean;
+                node_shared_v8: boolean;
+                node_shared_zlib: boolean;
+                node_use_dtrace: boolean;
+                node_use_etw: boolean;
+                node_use_openssl: boolean;
+                target_arch: string;
+                v8_no_strict_aliasing: number;
+                v8_use_snapshot: boolean;
+                visibility: string;
+            };
+        };
+        kill(pid:number, signal?: string|number): void;
+        pid: number;
+        title: string;
+        arch: string;
+        platform: string;
+        memoryUsage(): MemoryUsage;
+        nextTick(callback: Function): void;
+        umask(mask?: number): number;
+        uptime(): number;
+        hrtime(time?:number[]): number[];
+        domain: Domain;
+
+        // Worker
+        send?(message: any, sendHandle?: any): void;
+        disconnect(): void;
+        connected: boolean;
+    }
+
+    export interface Global {
+        Array: typeof Array;
+        ArrayBuffer: typeof ArrayBuffer;
+        Boolean: typeof Boolean;
+        Buffer: typeof Buffer;
+        DataView: typeof DataView;
+        Date: typeof Date;
+        Error: typeof Error;
+        EvalError: typeof EvalError;
+        Float32Array: typeof Float32Array;
+        Float64Array: typeof Float64Array;
+        Function: typeof Function;
+        GLOBAL: Global;
+        Infinity: typeof Infinity;
+        Int16Array: typeof Int16Array;
+        Int32Array: typeof Int32Array;
+        Int8Array: typeof Int8Array;
+        Intl: typeof Intl;
+        JSON: typeof JSON;
+        Map: MapConstructor;
+        Math: typeof Math;
+        NaN: typeof NaN;
+        Number: typeof Number;
+        Object: typeof Object;
+        Promise: Function;
+        RangeError: typeof RangeError;
+        ReferenceError: typeof ReferenceError;
+        RegExp: typeof RegExp;
+        Set: SetConstructor;
+        String: typeof String;
+        Symbol: Function;
+        SyntaxError: typeof SyntaxError;
+        TypeError: typeof TypeError;
+        URIError: typeof URIError;
+        Uint16Array: typeof Uint16Array;
+        Uint32Array: typeof Uint32Array;
+        Uint8Array: typeof Uint8Array;
+        Uint8ClampedArray: Function;
+        WeakMap: WeakMapConstructor;
+        WeakSet: WeakSetConstructor;
+        clearImmediate: (immediateId: any) => void;
+        clearInterval: (intervalId: NodeJS.Timer) => void;
+        clearTimeout: (timeoutId: NodeJS.Timer) => void;
+        console: typeof console;
+        decodeURI: typeof decodeURI;
+        decodeURIComponent: typeof decodeURIComponent;
+        encodeURI: typeof encodeURI;
+        encodeURIComponent: typeof encodeURIComponent;
+        escape: (str: string) => string;
+        eval: typeof eval;
+        global: Global;
+        isFinite: typeof isFinite;
+        isNaN: typeof isNaN;
+        parseFloat: typeof parseFloat;
+        parseInt: typeof parseInt;
+        process: Process;
+        root: Global;
+        setImmediate: (callback: (...args: any[]) => void, ...args: any[]) => any;
+        setInterval: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => NodeJS.Timer;
+        setTimeout: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => NodeJS.Timer;
+        undefined: typeof undefined;
+        unescape: (str: string) => string;
+        gc: () => void;
+        v8debug?: any;
+    }
+
+    export interface Timer {
+        ref() : void;
+        unref() : void;
+    }
+}
+
+/**
+ * @deprecated
+ */
+interface NodeBuffer extends Uint8Array {
+    write(string: string, offset?: number, length?: number, encoding?: string): number;
+    toString(encoding?: string, start?: number, end?: number): string;
+    toJSON(): any;
+    equals(otherBuffer: Buffer): boolean;
+    compare(otherBuffer: Buffer): number;
+    copy(targetBuffer: Buffer, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
+    slice(start?: number, end?: number): Buffer;
+    writeUIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    writeUIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    writeIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    writeIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    readUIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readUIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readUInt8(offset: number, noAssert?: boolean): number;
+    readUInt16LE(offset: number, noAssert?: boolean): number;
+    readUInt16BE(offset: number, noAssert?: boolean): number;
+    readUInt32LE(offset: number, noAssert?: boolean): number;
+    readUInt32BE(offset: number, noAssert?: boolean): number;
+    readInt8(offset: number, noAssert?: boolean): number;
+    readInt16LE(offset: number, noAssert?: boolean): number;
+    readInt16BE(offset: number, noAssert?: boolean): number;
+    readInt32LE(offset: number, noAssert?: boolean): number;
+    readInt32BE(offset: number, noAssert?: boolean): number;
+    readFloatLE(offset: number, noAssert?: boolean): number;
+    readFloatBE(offset: number, noAssert?: boolean): number;
+    readDoubleLE(offset: number, noAssert?: boolean): number;
+    readDoubleBE(offset: number, noAssert?: boolean): number;
+    writeUInt8(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt16LE(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt16BE(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt32LE(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt32BE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt8(value: number, offset: number, noAssert?: boolean): number;
+    writeInt16LE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt16BE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt32LE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt32BE(value: number, offset: number, noAssert?: boolean): number;
+    writeFloatLE(value: number, offset: number, noAssert?: boolean): number;
+    writeFloatBE(value: number, offset: number, noAssert?: boolean): number;
+    writeDoubleLE(value: number, offset: number, noAssert?: boolean): number;
+    writeDoubleBE(value: number, offset: number, noAssert?: boolean): number;
+    fill(value: any, offset?: number, end?: number): this;
+    // TODO: encoding param
+    indexOf(value: string | number | Buffer, byteOffset?: number): number;
+    // TODO: entries
+    // TODO: includes
+    // TODO: keys
+    // TODO: values
+}
+
+/************************************************
+*                                               *
+*                   MODULES                     *
+*                                               *
+************************************************/
+declare module "buffer" {
+    export var INSPECT_MAX_BYTES: number;
+    var BuffType: typeof Buffer;
+    var SlowBuffType: typeof SlowBuffer;
+    export { BuffType as Buffer, SlowBuffType as SlowBuffer };
+}
+
+declare module "querystring" {
+    export interface StringifyOptions {
+        encodeURIComponent?: Function;
+    }
+
+    export interface ParseOptions {
+        maxKeys?: number;
+        decodeURIComponent?: Function;
+    }
+
+    export function stringify<T>(obj: T, sep?: string, eq?: string, options?: StringifyOptions): string;
+    export function parse(str: string, sep?: string, eq?: string, options?: ParseOptions): any;
+    export function parse<T extends {}>(str: string, sep?: string, eq?: string, options?: ParseOptions): T;
+    export function escape(str: string): string;
+    export function unescape(str: string): string;
+}
+
+declare module "events" {
+    export class EventEmitter implements NodeJS.EventEmitter {
+        static EventEmitter: EventEmitter;
+        static listenerCount(emitter: EventEmitter, event: string): number; // deprecated
+        static defaultMaxListeners: number;
+
+        addListener(event: string, listener: Function): this;
+        on(event: string, listener: Function): this;
+        once(event: string, listener: Function): this;
+        removeListener(event: string, listener: Function): this;
+        removeAllListeners(event?: string): this;
+        setMaxListeners(n: number): this;
+        getMaxListeners(): number;
+        listeners(event: string): Function[];
+        emit(event: string, ...args: any[]): boolean;
+        listenerCount(type: string): number;
+    }
+}
+
+declare module "http" {
+    import * as events from "events";
+    import * as net from "net";
+    import * as stream from "stream";
+
+    export interface RequestOptions {
+        protocol?: string;
+        host?: string;
+        hostname?: string;
+        family?: number;
+        port?: number;
+        localAddress?: string;
+        socketPath?: string;
+        method?: string;
+        path?: string;
+        headers?: { [key: string]: any };
+        auth?: string;
+        agent?: Agent|boolean;
+    }
+
+    export interface Server extends events.EventEmitter, net.Server {
+        setTimeout(msecs: number, callback: Function): void;
+        maxHeadersCount: number;
+        timeout: number;
+    }
+    /**
+     * @deprecated Use IncomingMessage
+     */
+    export interface ServerRequest extends IncomingMessage {
+        connection: net.Socket;
+    }
+    export interface ServerResponse extends events.EventEmitter, stream.Writable {
+        // Extended base methods
+        write(buffer: Buffer): boolean;
+        write(buffer: Buffer, cb?: Function): boolean;
+        write(str: string, cb?: Function): boolean;
+        write(str: string, encoding?: string, cb?: Function): boolean;
+        write(str: string, encoding?: string, fd?: string): boolean;
+
+        writeContinue(): void;
+        writeHead(statusCode: number, reasonPhrase?: string, headers?: any): void;
+        writeHead(statusCode: number, headers?: any): void;
+        statusCode: number;
+        statusMessage: string;
+        headersSent: boolean;
+        setHeader(name: string, value: string | string[]): void;
+        sendDate: boolean;
+        getHeader(name: string): string;
+        removeHeader(name: string): void;
+        write(chunk: any, encoding?: string): any;
+        addTrailers(headers: any): void;
+
+        // Extended base methods
+        end(): void;
+        end(buffer: Buffer, cb?: Function): void;
+        end(str: string, cb?: Function): void;
+        end(str: string, encoding?: string, cb?: Function): void;
+        end(data?: any, encoding?: string): void;
+    }
+    export interface ClientRequest extends events.EventEmitter, stream.Writable {
+        // Extended base methods
+        write(buffer: Buffer): boolean;
+        write(buffer: Buffer, cb?: Function): boolean;
+        write(str: string, cb?: Function): boolean;
+        write(str: string, encoding?: string, cb?: Function): boolean;
+        write(str: string, encoding?: string, fd?: string): boolean;
+
+        write(chunk: any, encoding?: string): void;
+        abort(): void;
+        setTimeout(timeout: number, callback?: Function): void;
+        setNoDelay(noDelay?: boolean): void;
+        setSocketKeepAlive(enable?: boolean, initialDelay?: number): void;
+
+        setHeader(name: string, value: string | string[]): void;
+        getHeader(name: string): string;
+        removeHeader(name: string): void;
+        addTrailers(headers: any): void;
+
+        // Extended base methods
+        end(): void;
+        end(buffer: Buffer, cb?: Function): void;
+        end(str: string, cb?: Function): void;
+        end(str: string, encoding?: string, cb?: Function): void;
+        end(data?: any, encoding?: string): void;
+    }
+    export interface IncomingMessage extends events.EventEmitter, stream.Readable {
+        httpVersion: string;
+        headers: any;
+        rawHeaders: string[];
+        trailers: any;
+        rawTrailers: any;
+        setTimeout(msecs: number, callback: Function): NodeJS.Timer;
+        /**
+         * Only valid for request obtained from http.Server.
+         */
+        method?: string;
+        /**
+         * Only valid for request obtained from http.Server.
+         */
+        url?: string;
+        /**
+         * Only valid for response obtained from http.ClientRequest.
+         */
+        statusCode?: number;
+        /**
+         * Only valid for response obtained from http.ClientRequest.
+         */
+        statusMessage?: string;
+        socket: net.Socket;
+    }
+    /**
+     * @deprecated Use IncomingMessage
+     */
+    export interface ClientResponse extends IncomingMessage { }
+
+    export interface AgentOptions {
+        /**
+         * Keep sockets around in a pool to be used by other requests in the future. Default = false
+         */
+        keepAlive?: boolean;
+        /**
+         * When using HTTP KeepAlive, how often to send TCP KeepAlive packets over sockets being kept alive. Default = 1000.
+         * Only relevant if keepAlive is set to true.
+         */
+        keepAliveMsecs?: number;
+        /**
+         * Maximum number of sockets to allow per host. Default for Node 0.10 is 5, default for Node 0.12 is Infinity
+         */
+        maxSockets?: number;
+        /**
+         * Maximum number of sockets to leave open in a free state. Only relevant if keepAlive is set to true. Default = 256.
+         */
+        maxFreeSockets?: number;
+    }
+
+    export class Agent {
+        maxSockets: number;
+        sockets: any;
+        requests: any;
+
+        constructor(opts?: AgentOptions);
+
+        /**
+         * Destroy any sockets that are currently in use by the agent.
+         * It is usually not necessary to do this. However, if you are using an agent with KeepAlive enabled,
+         * then it is best to explicitly shut down the agent when you know that it will no longer be used. Otherwise,
+         * sockets may hang open for quite a long time before the server terminates them.
+         */
+        destroy(): void;
+    }
+
+    export var METHODS: string[];
+
+    export var STATUS_CODES: {
+        [errorCode: number]: string;
+        [errorCode: string]: string;
+    };
+    export function createServer(requestListener?: (request: IncomingMessage, response: ServerResponse) =>void ): Server;
+    export function createClient(port?: number, host?: string): any;
+    export function request(options: RequestOptions, callback?: (res: IncomingMessage) => void): ClientRequest;
+    export function get(options: any, callback?: (res: IncomingMessage) => void): ClientRequest;
+    export var globalAgent: Agent;
+}
+
+declare module "cluster" {
+    import * as child from "child_process";
+    import * as events from "events";
+
+    export interface ClusterSettings {
+        exec?: string;
+        args?: string[];
+        silent?: boolean;
+    }
+
+    export interface Address {
+        address: string;
+        port: number;
+        addressType: string;
+    }
+
+    export class Worker extends events.EventEmitter {
+        id: string;
+        process: child.ChildProcess;
+        suicide: boolean;
+        send(message: any, sendHandle?: any): void;
+        kill(signal?: string): void;
+        destroy(signal?: string): void;
+        disconnect(): void;
+        isConnected(): boolean;
+        isDead(): boolean;
+    }
+
+    export var settings: ClusterSettings;
+    export var isMaster: boolean;
+    export var isWorker: boolean;
+    export function setupMaster(settings?: ClusterSettings): void;
+    export function fork(env?: any): Worker;
+    export function disconnect(callback?: Function): void;
+    export var worker: Worker;
+    export var workers: {
+        [index: string]: Worker
+    };
+
+    // Event emitter
+    export function addListener(event: string, listener: Function): void;
+    export function on(event: "disconnect", listener: (worker: Worker) => void): void;
+    export function on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): void;
+    export function on(event: "fork", listener: (worker: Worker) => void): void;
+    export function on(event: "listening", listener: (worker: Worker, address: any) => void): void;
+    export function on(event: "message", listener: (worker: Worker, message: any) => void): void;
+    export function on(event: "online", listener: (worker: Worker) => void): void;
+    export function on(event: "setup", listener: (settings: any) => void): void;
+    export function on(event: string, listener: Function): any;
+    export function once(event: string, listener: Function): void;
+    export function removeListener(event: string, listener: Function): void;
+    export function removeAllListeners(event?: string): void;
+    export function setMaxListeners(n: number): void;
+    export function listeners(event: string): Function[];
+    export function emit(event: string, ...args: any[]): boolean;
+}
+
+declare module "zlib" {
+    import * as stream from "stream";
+    export interface ZlibOptions { chunkSize?: number; windowBits?: number; level?: number; memLevel?: number; strategy?: number; dictionary?: any; }
+
+    export interface Gzip extends stream.Transform { }
+    export interface Gunzip extends stream.Transform { }
+    export interface Deflate extends stream.Transform { }
+    export interface Inflate extends stream.Transform { }
+    export interface DeflateRaw extends stream.Transform { }
+    export interface InflateRaw extends stream.Transform { }
+    export interface Unzip extends stream.Transform { }
+
+    export function createGzip(options?: ZlibOptions): Gzip;
+    export function createGunzip(options?: ZlibOptions): Gunzip;
+    export function createDeflate(options?: ZlibOptions): Deflate;
+    export function createInflate(options?: ZlibOptions): Inflate;
+    export function createDeflateRaw(options?: ZlibOptions): DeflateRaw;
+    export function createInflateRaw(options?: ZlibOptions): InflateRaw;
+    export function createUnzip(options?: ZlibOptions): Unzip;
+
+    export function deflate(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
+    export function deflateSync(buf: Buffer, options?: ZlibOptions): any;
+    export function deflateRaw(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
+    export function deflateRawSync(buf: Buffer, options?: ZlibOptions): any;
+    export function gzip(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
+    export function gzipSync(buf: Buffer, options?: ZlibOptions): any;
+    export function gunzip(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
+    export function gunzipSync(buf: Buffer, options?: ZlibOptions): any;
+    export function inflate(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
+    export function inflateSync(buf: Buffer, options?: ZlibOptions): any;
+    export function inflateRaw(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
+    export function inflateRawSync(buf: Buffer, options?: ZlibOptions): any;
+    export function unzip(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
+    export function unzipSync(buf: Buffer, options?: ZlibOptions): any;
+
+    // Constants
+    export var Z_NO_FLUSH: number;
+    export var Z_PARTIAL_FLUSH: number;
+    export var Z_SYNC_FLUSH: number;
+    export var Z_FULL_FLUSH: number;
+    export var Z_FINISH: number;
+    export var Z_BLOCK: number;
+    export var Z_TREES: number;
+    export var Z_OK: number;
+    export var Z_STREAM_END: number;
+    export var Z_NEED_DICT: number;
+    export var Z_ERRNO: number;
+    export var Z_STREAM_ERROR: number;
+    export var Z_DATA_ERROR: number;
+    export var Z_MEM_ERROR: number;
+    export var Z_BUF_ERROR: number;
+    export var Z_VERSION_ERROR: number;
+    export var Z_NO_COMPRESSION: number;
+    export var Z_BEST_SPEED: number;
+    export var Z_BEST_COMPRESSION: number;
+    export var Z_DEFAULT_COMPRESSION: number;
+    export var Z_FILTERED: number;
+    export var Z_HUFFMAN_ONLY: number;
+    export var Z_RLE: number;
+    export var Z_FIXED: number;
+    export var Z_DEFAULT_STRATEGY: number;
+    export var Z_BINARY: number;
+    export var Z_TEXT: number;
+    export var Z_ASCII: number;
+    export var Z_UNKNOWN: number;
+    export var Z_DEFLATED: number;
+    export var Z_NULL: number;
+}
+
+declare module "os" {
+    export interface CpuInfo {
+        model: string;
+        speed: number;
+        times: {
+            user: number;
+            nice: number;
+            sys: number;
+            idle: number;
+            irq: number;
+        };
+    }
+
+    export interface NetworkInterfaceInfo {
+        address: string;
+        netmask: string;
+        family: string;
+        mac: string;
+        internal: boolean;
+    }
+
+    export function tmpdir(): string;
+    export function homedir(): string;
+    export function endianness(): string;
+    export function hostname(): string;
+    export function type(): string;
+    export function platform(): string;
+    export function arch(): string;
+    export function release(): string;
+    export function uptime(): number;
+    export function loadavg(): number[];
+    export function totalmem(): number;
+    export function freemem(): number;
+    export function cpus(): CpuInfo[];
+    export function networkInterfaces(): {[index: string]: NetworkInterfaceInfo[]};
+    export var EOL: string;
+}
+
+declare module "https" {
+    import * as tls from "tls";
+    import * as events from "events";
+    import * as http from "http";
+
+    export interface ServerOptions {
+        pfx?: any;
+        key?: any;
+        passphrase?: string;
+        cert?: any;
+        ca?: any;
+        crl?: any;
+        ciphers?: string;
+        honorCipherOrder?: boolean;
+        requestCert?: boolean;
+        rejectUnauthorized?: boolean;
+        NPNProtocols?: any;
+        SNICallback?: (servername: string) => any;
+    }
+
+    export interface RequestOptions extends http.RequestOptions{
+        pfx?: any;
+        key?: any;
+        passphrase?: string;
+        cert?: any;
+        ca?: any;
+        ciphers?: string;
+        rejectUnauthorized?: boolean;
+        secureProtocol?: string;
+    }
+
+    export interface Agent {
+        maxSockets: number;
+        sockets: any;
+        requests: any;
+    }
+    export var Agent: {
+        new (options?: RequestOptions): Agent;
+    };
+    export interface Server extends tls.Server { }
+    export function createServer(options: ServerOptions, requestListener?: Function): Server;
+    export function request(options: RequestOptions, callback?: (res: http.IncomingMessage) =>void ): http.ClientRequest;
+    export function get(options: RequestOptions, callback?: (res: http.IncomingMessage) =>void ): http.ClientRequest;
+    export var globalAgent: Agent;
+}
+
+declare module "punycode" {
+    export function decode(string: string): string;
+    export function encode(string: string): string;
+    export function toUnicode(domain: string): string;
+    export function toASCII(domain: string): string;
+    export var ucs2: ucs2;
+    interface ucs2 {
+        decode(string: string): number[];
+        encode(codePoints: number[]): string;
+    }
+    export var version: any;
+}
+
+declare module "repl" {
+    import * as stream from "stream";
+    import * as events from "events";
+
+    export interface ReplOptions {
+        prompt?: string;
+        input?: NodeJS.ReadableStream;
+        output?: NodeJS.WritableStream;
+        terminal?: boolean;
+        eval?: Function;
+        useColors?: boolean;
+        useGlobal?: boolean;
+        ignoreUndefined?: boolean;
+        writer?: Function;
+    }
+    export function start(options: ReplOptions): events.EventEmitter;
+}
+
+declare module "readline" {
+    import * as events from "events";
+    import * as stream from "stream";
+
+    export interface Key {
+        sequence?: string;
+        name?: string;
+        ctrl?: boolean;
+        meta?: boolean;
+        shift?: boolean;
+    }
+
+    export interface ReadLine extends events.EventEmitter {
+        setPrompt(prompt: string): void;
+        prompt(preserveCursor?: boolean): void;
+        question(query: string, callback: (answer: string) => void): void;
+        pause(): ReadLine;
+        resume(): ReadLine;
+        close(): void;
+        write(data: string|Buffer, key?: Key): void;
+    }
+
+    export interface Completer {
+        (line: string): CompleterResult;
+        (line: string, callback: (err: any, result: CompleterResult) => void): any;
+    }
+
+    export interface CompleterResult {
+        completions: string[];
+        line: string;
+    }
+
+    export interface ReadLineOptions {
+        input: NodeJS.ReadableStream;
+        output?: NodeJS.WritableStream;
+        completer?: Completer;
+        terminal?: boolean;
+        historySize?: number;
+    }
+
+    export function createInterface(input: NodeJS.ReadableStream, output?: NodeJS.WritableStream, completer?: Completer, terminal?: boolean): ReadLine;
+    export function createInterface(options: ReadLineOptions): ReadLine;
+
+    export function cursorTo(stream: NodeJS.WritableStream, x: number, y: number): void;
+    export function moveCursor(stream: NodeJS.WritableStream, dx: number|string, dy: number|string): void;
+    export function clearLine(stream: NodeJS.WritableStream, dir: number): void;
+    export function clearScreenDown(stream: NodeJS.WritableStream): void;
+}
+
+declare module "vm" {
+    export interface Context { }
+    export interface ScriptOptions {
+        filename?: string;
+        lineOffset?: number;
+        columnOffset?: number;
+        displayErrors?: boolean;
+        timeout?: number;
+        cachedData?: Buffer;
+        produceCachedData?: boolean;
+    }
+    export interface RunningScriptOptions {
+        filename?: string;
+        lineOffset?: number;
+        columnOffset?: number;
+        displayErrors?: boolean;
+        timeout?: number;
+    }
+    export class Script {
+        constructor(code: string, options?: ScriptOptions);
+        runInContext(contextifiedSandbox: Context, options?: RunningScriptOptions): any;
+        runInNewContext(sandbox?: Context, options?: RunningScriptOptions): any;
+        runInThisContext(options?: RunningScriptOptions): any;
+    }
+    export function createContext(sandbox?: Context): Context;
+    export function isContext(sandbox: Context): boolean;
+    export function runInContext(code: string, contextifiedSandbox: Context, options?: RunningScriptOptions): any;
+    export function runInDebugContext(code: string): any;
+    export function runInNewContext(code: string, sandbox?: Context, options?: RunningScriptOptions): any;
+    export function runInThisContext(code: string, options?: RunningScriptOptions): any;
+}
+
+declare module "child_process" {
+    import * as events from "events";
+    import * as stream from "stream";
+
+    export interface ChildProcess extends events.EventEmitter {
+        stdin:  stream.Writable;
+        stdout: stream.Readable;
+        stderr: stream.Readable;
+        stdio: [stream.Writable, stream.Readable, stream.Readable];
+        pid: number;
+        kill(signal?: string): void;
+        send(message: any, sendHandle?: any): void;
+        disconnect(): void;
+        unref(): void;
+    }
+
+    export interface SpawnOptions {
+        cwd?: string;
+        env?: any;
+        stdio?: any;
+        detached?: boolean;
+        uid?: number;
+        gid?: number;
+        shell?: boolean | string;
+    }
+    export function spawn(command: string, args?: string[], options?: SpawnOptions): ChildProcess;
+
+    export interface ExecOptions {
+        cwd?: string;
+        env?: any;
+        shell?: string;
+        timeout?: number;
+        maxBuffer?: number;
+        killSignal?: string;
+        uid?: number;
+        gid?: number;
+    }
+    export interface ExecOptionsWithStringEncoding extends ExecOptions {
+        encoding: BufferEncoding;
+    }
+    export interface ExecOptionsWithBufferEncoding extends ExecOptions {
+        encoding: string; // specify `null`.
+    }
+    export function exec(command: string, callback?: (error: Error, stdout: string, stderr: string) =>void ): ChildProcess;
+    export function exec(command: string, options: ExecOptionsWithStringEncoding, callback?: (error: Error, stdout: string, stderr: string) =>void ): ChildProcess;
+    // usage. child_process.exec("tsc", {encoding: null as string}, (err, stdout, stderr) => {});
+    export function exec(command: string, options: ExecOptionsWithBufferEncoding, callback?: (error: Error, stdout: Buffer, stderr: Buffer) =>void ): ChildProcess;
+    export function exec(command: string, options: ExecOptions, callback?: (error: Error, stdout: string, stderr: string) =>void ): ChildProcess;
+
+    export interface ExecFileOptions {
+        cwd?: string;
+        env?: any;
+        timeout?: number;
+        maxBuffer?: number;
+        killSignal?: string;
+        uid?: number;
+        gid?: number;
+    }
+    export interface ExecFileOptionsWithStringEncoding extends ExecFileOptions {
+        encoding: BufferEncoding;
+    }
+    export interface ExecFileOptionsWithBufferEncoding extends ExecFileOptions {
+        encoding: string; // specify `null`.
+    }
+    export function execFile(file: string, callback?: (error: Error, stdout: string, stderr: string) =>void ): ChildProcess;
+    export function execFile(file: string, options?: ExecFileOptionsWithStringEncoding, callback?: (error: Error, stdout: string, stderr: string) =>void ): ChildProcess;
+    // usage. child_process.execFile("file.sh", {encoding: null as string}, (err, stdout, stderr) => {});
+    export function execFile(file: string, options?: ExecFileOptionsWithBufferEncoding, callback?: (error: Error, stdout: Buffer, stderr: Buffer) =>void ): ChildProcess;
+    export function execFile(file: string, options?: ExecFileOptions, callback?: (error: Error, stdout: string, stderr: string) =>void ): ChildProcess;
+    export function execFile(file: string, args?: string[], callback?: (error: Error, stdout: string, stderr: string) =>void ): ChildProcess;
+    export function execFile(file: string, args?: string[], options?: ExecFileOptionsWithStringEncoding, callback?: (error: Error, stdout: string, stderr: string) =>void ): ChildProcess;
+    // usage. child_process.execFile("file.sh", ["foo"], {encoding: null as string}, (err, stdout, stderr) => {});
+    export function execFile(file: string, args?: string[], options?: ExecFileOptionsWithBufferEncoding, callback?: (error: Error, stdout: Buffer, stderr: Buffer) =>void ): ChildProcess;
+    export function execFile(file: string, args?: string[], options?: ExecFileOptions, callback?: (error: Error, stdout: string, stderr: string) =>void ): ChildProcess;
+
+    export interface ForkOptions {
+        cwd?: string;
+        env?: any;
+        execPath?: string;
+        execArgv?: string[];
+        silent?: boolean;
+        uid?: number;
+        gid?: number;
+    }
+    export function fork(modulePath: string, args?: string[], options?: ForkOptions): ChildProcess;
+
+    export interface SpawnSyncOptions {
+        cwd?: string;
+        input?: string | Buffer;
+        stdio?: any;
+        env?: any;
+        uid?: number;
+        gid?: number;
+        timeout?: number;
+        killSignal?: string;
+        maxBuffer?: number;
+        encoding?: string;
+        shell?: boolean | string;
+    }
+    export interface SpawnSyncOptionsWithStringEncoding extends SpawnSyncOptions {
+        encoding: BufferEncoding;
+    }
+    export interface SpawnSyncOptionsWithBufferEncoding extends SpawnSyncOptions {
+        encoding: string; // specify `null`.
+    }
+    export interface SpawnSyncReturns<T> {
+        pid: number;
+        output: string[];
+        stdout: T;
+        stderr: T;
+        status: number;
+        signal: string;
+        error: Error;
+    }
+    export function spawnSync(command: string): SpawnSyncReturns<Buffer>;
+    export function spawnSync(command: string, options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
+    export function spawnSync(command: string, options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
+    export function spawnSync(command: string, options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
+    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
+    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
+    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
+
+    export interface ExecSyncOptions {
+        cwd?: string;
+        input?: string | Buffer;
+        stdio?: any;
+        env?: any;
+        shell?: string;
+        uid?: number;
+        gid?: number;
+        timeout?: number;
+        killSignal?: string;
+        maxBuffer?: number;
+        encoding?: string;
+    }
+    export interface ExecSyncOptionsWithStringEncoding extends ExecSyncOptions {
+        encoding: BufferEncoding;
+    }
+    export interface ExecSyncOptionsWithBufferEncoding extends ExecSyncOptions {
+        encoding: string; // specify `null`.
+    }
+    export function execSync(command: string): Buffer;
+    export function execSync(command: string, options?: ExecSyncOptionsWithStringEncoding): string;
+    export function execSync(command: string, options?: ExecSyncOptionsWithBufferEncoding): Buffer;
+    export function execSync(command: string, options?: ExecSyncOptions): Buffer;
+
+    export interface ExecFileSyncOptions {
+        cwd?: string;
+        input?: string | Buffer;
+        stdio?: any;
+        env?: any;
+        uid?: number;
+        gid?: number;
+        timeout?: number;
+        killSignal?: string;
+        maxBuffer?: number;
+        encoding?: string;
+    }
+    export interface ExecFileSyncOptionsWithStringEncoding extends ExecFileSyncOptions {
+        encoding: BufferEncoding;
+    }
+    export interface ExecFileSyncOptionsWithBufferEncoding extends ExecFileSyncOptions {
+        encoding: string; // specify `null`.
+    }
+    export function execFileSync(command: string): Buffer;
+    export function execFileSync(command: string, options?: ExecFileSyncOptionsWithStringEncoding): string;
+    export function execFileSync(command: string, options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
+    export function execFileSync(command: string, options?: ExecFileSyncOptions): Buffer;
+    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptionsWithStringEncoding): string;
+    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
+    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptions): Buffer;
+}
+
+declare module "url" {
+    export interface Url {
+        href?: string;
+        protocol?: string;
+        auth?: string;
+        hostname?: string;
+        port?: string;
+        host?: string;
+        pathname?: string;
+        search?: string;
+        query?: any; // string | Object
+        slashes?: boolean;
+        hash?: string;
+        path?: string;
+    }
+
+    export function parse(urlStr: string, parseQueryString?: boolean , slashesDenoteHost?: boolean ): Url;
+    export function format(url: Url): string;
+    export function resolve(from: string, to: string): string;
+}
+
+declare module "dns" {
+    export function lookup(domain: string, family: number, callback: (err: Error, address: string, family: number) =>void ): string;
+    export function lookup(domain: string, callback: (err: Error, address: string, family: number) =>void ): string;
+    export function resolve(domain: string, rrtype: string, callback: (err: Error, addresses: string[]) =>void ): string[];
+    export function resolve(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
+    export function resolve4(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
+    export function resolve6(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
+    export function resolveMx(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
+    export function resolveTxt(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
+    export function resolveSrv(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
+    export function resolveNs(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
+    export function resolveCname(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
+    export function reverse(ip: string, callback: (err: Error, domains: string[]) =>void ): string[];
+}
+
+declare module "net" {
+    import * as stream from "stream";
+
+    export interface Socket extends stream.Duplex {
+        // Extended base methods
+        write(buffer: Buffer): boolean;
+        write(buffer: Buffer, cb?: Function): boolean;
+        write(str: string, cb?: Function): boolean;
+        write(str: string, encoding?: string, cb?: Function): boolean;
+        write(str: string, encoding?: string, fd?: string): boolean;
+
+        connect(port: number, host?: string, connectionListener?: Function): void;
+        connect(path: string, connectionListener?: Function): void;
+        bufferSize: number;
+        setEncoding(encoding?: string): void;
+        write(data: any, encoding?: string, callback?: Function): void;
+        destroy(): void;
+        pause(): void;
+        resume(): void;
+        setTimeout(timeout: number, callback?: Function): void;
+        setNoDelay(noDelay?: boolean): void;
+        setKeepAlive(enable?: boolean, initialDelay?: number): void;
+        address(): { port: number; family: string; address: string; };
+        unref(): void;
+        ref(): void;
+
+        remoteAddress: string;
+        remoteFamily: string;
+        remotePort: number;
+        localAddress: string;
+        localPort: number;
+        bytesRead: number;
+        bytesWritten: number;
+
+        // Extended base methods
+        end(): void;
+        end(buffer: Buffer, cb?: Function): void;
+        end(str: string, cb?: Function): void;
+        end(str: string, encoding?: string, cb?: Function): void;
+        end(data?: any, encoding?: string): void;
+    }
+
+    export var Socket: {
+        new (options?: { fd?: string; type?: string; allowHalfOpen?: boolean; }): Socket;
+    };
+
+    export interface ListenOptions {
+        port?: number;
+        host?: string;
+        backlog?: number;
+        path?: string;
+        exclusive?: boolean;
+    }
+
+    export interface Server extends Socket {
+        listen(port: number, hostname?: string, backlog?: number, listeningListener?: Function): Server;
+        listen(port: number, hostname?: string, listeningListener?: Function): Server;
+        listen(port: number, backlog?: number, listeningListener?: Function): Server;
+        listen(port: number, listeningListener?: Function): Server;
+        listen(path: string, backlog?: number, listeningListener?: Function): Server;
+        listen(path: string, listeningListener?: Function): Server;
+        listen(handle: any, backlog?: number, listeningListener?: Function): Server;
+        listen(handle: any, listeningListener?: Function): Server;
+        listen(options: ListenOptions, listeningListener?: Function): Server;
+        close(callback?: Function): Server;
+        address(): { port: number; family: string; address: string; };
+        getConnections(cb: (error: Error, count: number) => void): void;
+        ref(): Server;
+        unref(): Server;
+        maxConnections: number;
+        connections: number;
+    }
+    export function createServer(connectionListener?: (socket: Socket) =>void ): Server;
+    export function createServer(options?: { allowHalfOpen?: boolean; }, connectionListener?: (socket: Socket) =>void ): Server;
+    export function connect(options: { port: number, host?: string, localAddress? : string, localPort? : string, family? : number, allowHalfOpen?: boolean; }, connectionListener?: Function): Socket;
+    export function connect(port: number, host?: string, connectionListener?: Function): Socket;
+    export function connect(path: string, connectionListener?: Function): Socket;
+    export function createConnection(options: { port: number, host?: string, localAddress? : string, localPort? : string, family? : number, allowHalfOpen?: boolean; }, connectionListener?: Function): Socket;
+    export function createConnection(port: number, host?: string, connectionListener?: Function): Socket;
+    export function createConnection(path: string, connectionListener?: Function): Socket;
+    export function isIP(input: string): number;
+    export function isIPv4(input: string): boolean;
+    export function isIPv6(input: string): boolean;
+}
+
+declare module "dgram" {
+    import * as events from "events";
+
+    interface RemoteInfo {
+        address: string;
+        port: number;
+        size: number;
+    }
+
+    interface AddressInfo {
+        address: string;
+        family: string;
+        port: number;
+    }
+
+    export function createSocket(type: string, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
+
+    interface Socket extends events.EventEmitter {
+        send(buf: Buffer, offset: number, length: number, port: number, address: string, callback?: (error: Error, bytes: number) => void): void;
+        bind(port: number, address?: string, callback?: () => void): void;
+        close(): void;
+        address(): AddressInfo;
+        setBroadcast(flag: boolean): void;
+        setMulticastTTL(ttl: number): void;
+        setMulticastLoopback(flag: boolean): void;
+        addMembership(multicastAddress: string, multicastInterface?: string): void;
+        dropMembership(multicastAddress: string, multicastInterface?: string): void;
+    }
+}
+
+declare module "fs" {
+    import * as stream from "stream";
+    import * as events from "events";
+
+    interface Stats {
+        isFile(): boolean;
+        isDirectory(): boolean;
+        isBlockDevice(): boolean;
+        isCharacterDevice(): boolean;
+        isSymbolicLink(): boolean;
+        isFIFO(): boolean;
+        isSocket(): boolean;
+        dev: number;
+        ino: number;
+        mode: number;
+        nlink: number;
+        uid: number;
+        gid: number;
+        rdev: number;
+        size: number;
+        blksize: number;
+        blocks: number;
+        atime: Date;
+        mtime: Date;
+        ctime: Date;
+        birthtime: Date;
+    }
+
+    interface FSWatcher extends events.EventEmitter {
+        close(): void;
+    }
+
+    export interface ReadStream extends stream.Readable {
+        close(): void;
+    }
+    export interface WriteStream extends stream.Writable {
+        close(): void;
+        bytesWritten: number;
+    }
+
+    /**
+     * Asynchronous rename.
+     * @param oldPath
+     * @param newPath
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function rename(oldPath: string, newPath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    /**
+     * Synchronous rename
+     * @param oldPath
+     * @param newPath
+     */
+    export function renameSync(oldPath: string, newPath: string): void;
+    export function truncate(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function truncate(path: string, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function truncateSync(path: string, len?: number): void;
+    export function ftruncate(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function ftruncate(fd: number, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function ftruncateSync(fd: number, len?: number): void;
+    export function chown(path: string, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function chownSync(path: string, uid: number, gid: number): void;
+    export function fchown(fd: number, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function fchownSync(fd: number, uid: number, gid: number): void;
+    export function lchown(path: string, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function lchownSync(path: string, uid: number, gid: number): void;
+    export function chmod(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function chmod(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function chmodSync(path: string, mode: number): void;
+    export function chmodSync(path: string, mode: string): void;
+    export function fchmod(fd: number, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function fchmod(fd: number, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function fchmodSync(fd: number, mode: number): void;
+    export function fchmodSync(fd: number, mode: string): void;
+    export function lchmod(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function lchmod(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function lchmodSync(path: string, mode: number): void;
+    export function lchmodSync(path: string, mode: string): void;
+    export function stat(path: string, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
+    export function lstat(path: string, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
+    export function fstat(fd: number, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
+    export function statSync(path: string): Stats;
+    export function lstatSync(path: string): Stats;
+    export function fstatSync(fd: number): Stats;
+    export function link(srcpath: string, dstpath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function linkSync(srcpath: string, dstpath: string): void;
+    export function symlink(srcpath: string, dstpath: string, type?: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function symlinkSync(srcpath: string, dstpath: string, type?: string): void;
+    export function readlink(path: string, callback?: (err: NodeJS.ErrnoException, linkString: string) => any): void;
+    export function readlinkSync(path: string): string;
+    export function realpath(path: string, callback?: (err: NodeJS.ErrnoException, resolvedPath: string) => any): void;
+    export function realpath(path: string, cache: {[path: string]: string}, callback: (err: NodeJS.ErrnoException, resolvedPath: string) =>any): void;
+    export function realpathSync(path: string, cache?: { [path: string]: string }): string;
+    /*
+     * Asynchronous unlink - deletes the file specified in {path}
+     *
+     * @param path
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function unlink(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    /*
+     * Synchronous unlink - deletes the file specified in {path}
+     *
+     * @param path
+     */
+    export function unlinkSync(path: string): void;
+    /*
+     * Asynchronous rmdir - removes the directory specified in {path}
+     *
+     * @param path
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function rmdir(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    /*
+     * Synchronous rmdir - removes the directory specified in {path}
+     *
+     * @param path
+     */
+    export function rmdirSync(path: string): void;
+    /*
+     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
+     *
+     * @param path
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function mkdir(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    /*
+     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
+     *
+     * @param path
+     * @param mode
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function mkdir(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    /*
+     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
+     *
+     * @param path
+     * @param mode
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function mkdir(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    /*
+     * Synchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
+     *
+     * @param path
+     * @param mode
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function mkdirSync(path: string, mode?: number): void;
+    /*
+     * Synchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
+     *
+     * @param path
+     * @param mode
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function mkdirSync(path: string, mode?: string): void;
+    export function readdir(path: string, callback?: (err: NodeJS.ErrnoException, files: string[]) => void): void;
+    export function readdirSync(path: string): string[];
+    export function close(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function closeSync(fd: number): void;
+    export function open(path: string, flags: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
+    export function open(path: string, flags: string, mode: number, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
+    export function open(path: string, flags: string, mode: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
+    export function openSync(path: string, flags: string, mode?: number): number;
+    export function openSync(path: string, flags: string, mode?: string): number;
+    export function utimes(path: string, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function utimes(path: string, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function utimesSync(path: string, atime: number, mtime: number): void;
+    export function utimesSync(path: string, atime: Date, mtime: Date): void;
+    export function futimes(fd: number, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function futimes(fd: number, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function futimesSync(fd: number, atime: number, mtime: number): void;
+    export function futimesSync(fd: number, atime: Date, mtime: Date): void;
+    export function fsync(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function fsyncSync(fd: number): void;
+    export function write(fd: number, buffer: Buffer, offset: number, length: number, position: number, callback?: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
+    export function write(fd: number, buffer: Buffer, offset: number, length: number, callback?: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
+    export function write(fd: number, data: any, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+    export function write(fd: number, data: any, offset: number, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+    export function write(fd: number, data: any, offset: number, encoding: string, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+    export function writeSync(fd: number, buffer: Buffer, offset: number, length: number, position?: number): number;
+    export function writeSync(fd: number, data: any, position?: number, enconding?: string): number;
+    export function read(fd: number, buffer: Buffer, offset: number, length: number, position: number, callback?: (err: NodeJS.ErrnoException, bytesRead: number, buffer: Buffer) => void): void;
+    export function readSync(fd: number, buffer: Buffer, offset: number, length: number, position: number): number;
+    /*
+     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param encoding
+     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     */
+    export function readFile(filename: string, encoding: string, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
+    /*
+     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
+     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     */
+    export function readFile(filename: string, options: { encoding: string; flag?: string; }, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
+    /*
+     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
+     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     */
+    export function readFile(filename: string, options: { flag?: string; }, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+    /*
+     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     */
+    export function readFile(filename: string, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+    /*
+     * Synchronous readFile - Synchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param encoding
+     */
+    export function readFileSync(filename: string, encoding: string): string;
+    /*
+     * Synchronous readFile - Synchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFileSync returns a string; otherwise it returns a Buffer.
+     */
+    export function readFileSync(filename: string, options: { encoding: string; flag?: string; }): string;
+    /*
+     * Synchronous readFile - Synchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFileSync returns a string; otherwise it returns a Buffer.
+     */
+    export function readFileSync(filename: string, options?: { flag?: string; }): Buffer;
+    export function writeFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
+    export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
+    export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function appendFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
+    export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
+    export function watchFile(filename: string, listener: (curr: Stats, prev: Stats) => void): void;
+    export function watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: (curr: Stats, prev: Stats) => void): void;
+    export function unwatchFile(filename: string, listener?: (curr: Stats, prev: Stats) => void): void;
+    export function watch(filename: string, listener?: (event: string, filename: string) => any): FSWatcher;
+    export function watch(filename: string, options: { persistent?: boolean; }, listener?: (event: string, filename: string) => any): FSWatcher;
+    export function exists(path: string, callback?: (exists: boolean) => void): void;
+    export function existsSync(path: string): boolean;
+    /** Constant for fs.access(). File is visible to the calling process. */
+    export var F_OK: number;
+    /** Constant for fs.access(). File can be read by the calling process. */
+    export var R_OK: number;
+    /** Constant for fs.access(). File can be written by the calling process. */
+    export var W_OK: number;
+    /** Constant for fs.access(). File can be executed by the calling process. */
+    export var X_OK: number;
+    /** Tests a user's permissions for the file specified by path. */
+    export function access(path: string, callback: (err: NodeJS.ErrnoException) => void): void;
+    export function access(path: string, mode: number, callback: (err: NodeJS.ErrnoException) => void): void;
+    /** Synchronous version of fs.access. This throws if any accessibility checks fail, and does nothing otherwise. */
+    export function accessSync(path: string, mode ?: number): void;
+    export function createReadStream(path: string, options?: {
+        flags?: string;
+        encoding?: string;
+        fd?: number;
+        mode?: number;
+        autoClose?: boolean;
+    }): ReadStream;
+    export function createWriteStream(path: string, options?: {
+        flags?: string;
+        encoding?: string;
+        fd?: number;
+        mode?: number;
+    }): WriteStream;
+}
+
+declare module "path" {
+
+    /**
+     * A parsed path object generated by path.parse() or consumed by path.format().
+     */
+    export interface ParsedPath {
+        /**
+         * The root of the path such as '/' or 'c:\'
+         */
+        root: string;
+        /**
+         * The full directory path such as '/home/user/dir' or 'c:\path\dir'
+         */
+        dir: string;
+        /**
+         * The file name including extension (if any) such as 'index.html'
+         */
+        base: string;
+        /**
+         * The file extension (if any) such as '.html'
+         */
+        ext: string;
+        /**
+         * The file name without extension (if any) such as 'index'
+         */
+        name: string;
+    }
+
+    /**
+     * Normalize a string path, reducing '..' and '.' parts.
+     * When multiple slashes are found, they're replaced by a single one; when the path contains a trailing slash, it is preserved. On Windows backslashes are used.
+     *
+     * @param p string path to normalize.
+     */
+    export function normalize(p: string): string;
+    /**
+     * Join all arguments together and normalize the resulting path.
+     * Arguments must be strings. In v0.8, non-string arguments were silently ignored. In v0.10 and up, an exception is thrown.
+     *
+     * @param paths string paths to join.
+     */
+    export function join(...paths: any[]): string;
+    /**
+     * Join all arguments together and normalize the resulting path.
+     * Arguments must be strings. In v0.8, non-string arguments were silently ignored. In v0.10 and up, an exception is thrown.
+     *
+     * @param paths string paths to join.
+     */
+    export function join(...paths: string[]): string;
+    /**
+     * The right-most parameter is considered {to}.  Other parameters are considered an array of {from}.
+     *
+     * Starting from leftmost {from} paramter, resolves {to} to an absolute path.
+     *
+     * If {to} isn't already absolute, {from} arguments are prepended in right to left order, until an absolute path is found. If after using all {from} paths still no absolute path is found, the current working directory is used as well. The resulting path is normalized, and trailing slashes are removed unless the path gets resolved to the root directory.
+     *
+     * @param pathSegments string paths to join.  Non-string arguments are ignored.
+     */
+    export function resolve(...pathSegments: any[]): string;
+    /**
+     * Determines whether {path} is an absolute path. An absolute path will always resolve to the same location, regardless of the working directory.
+     *
+     * @param path path to test.
+     */
+    export function isAbsolute(path: string): boolean;
+    /**
+     * Solve the relative path from {from} to {to}.
+     * At times we have two absolute paths, and we need to derive the relative path from one to the other. This is actually the reverse transform of path.resolve.
+     *
+     * @param from
+     * @param to
+     */
+    export function relative(from: string, to: string): string;
+    /**
+     * Return the directory name of a path. Similar to the Unix dirname command.
+     *
+     * @param p the path to evaluate.
+     */
+    export function dirname(p: string): string;
+    /**
+     * Return the last portion of a path. Similar to the Unix basename command.
+     * Often used to extract the file name from a fully qualified path.
+     *
+     * @param p the path to evaluate.
+     * @param ext optionally, an extension to remove from the result.
+     */
+    export function basename(p: string, ext?: string): string;
+    /**
+     * Return the extension of the path, from the last '.' to end of string in the last portion of the path.
+     * If there is no '.' in the last portion of the path or the first character of it is '.', then it returns an empty string
+     *
+     * @param p the path to evaluate.
+     */
+    export function extname(p: string): string;
+    /**
+     * The platform-specific file separator. '\\' or '/'.
+     */
+    export var sep: string;
+    /**
+     * The platform-specific file delimiter. ';' or ':'.
+     */
+    export var delimiter: string;
+    /**
+     * Returns an object from a path string - the opposite of format().
+     *
+     * @param pathString path to evaluate.
+     */
+    export function parse(pathString: string): ParsedPath;
+    /**
+     * Returns a path string from an object - the opposite of parse().
+     *
+     * @param pathString path to evaluate.
+     */
+    export function format(pathObject: ParsedPath): string;
+
+    export module posix {
+      export function normalize(p: string): string;
+      export function join(...paths: any[]): string;
+      export function resolve(...pathSegments: any[]): string;
+      export function isAbsolute(p: string): boolean;
+      export function relative(from: string, to: string): string;
+      export function dirname(p: string): string;
+      export function basename(p: string, ext?: string): string;
+      export function extname(p: string): string;
+      export var sep: string;
+      export var delimiter: string;
+      export function parse(p: string): ParsedPath;
+      export function format(pP: ParsedPath): string;
+    }
+
+    export module win32 {
+      export function normalize(p: string): string;
+      export function join(...paths: any[]): string;
+      export function resolve(...pathSegments: any[]): string;
+      export function isAbsolute(p: string): boolean;
+      export function relative(from: string, to: string): string;
+      export function dirname(p: string): string;
+      export function basename(p: string, ext?: string): string;
+      export function extname(p: string): string;
+      export var sep: string;
+      export var delimiter: string;
+      export function parse(p: string): ParsedPath;
+      export function format(pP: ParsedPath): string;
+    }
+}
+
+declare module "string_decoder" {
+    export interface NodeStringDecoder {
+        write(buffer: Buffer): string;
+        detectIncompleteChar(buffer: Buffer): number;
+    }
+    export var StringDecoder: {
+        new (encoding: string): NodeStringDecoder;
+    };
+}
+
+declare module "tls" {
+    import * as crypto from "crypto";
+    import * as net from "net";
+    import * as stream from "stream";
+
+    var CLIENT_RENEG_LIMIT: number;
+    var CLIENT_RENEG_WINDOW: number;
+
+    export interface TlsOptions {
+        host?: string;
+        port?: number;
+        pfx?: any;   //string or buffer
+        key?: any;   //string or buffer
+        passphrase?: string;
+        cert?: any;
+        ca?: any;    //string or buffer
+        crl?: any;   //string or string array
+        ciphers?: string;
+        honorCipherOrder?: any;
+        requestCert?: boolean;
+        rejectUnauthorized?: boolean;
+        NPNProtocols?: any;  //array or Buffer;
+        SNICallback?: (servername: string) => any;
+    }
+
+    export interface ConnectionOptions {
+        host?: string;
+        port?: number;
+        socket?: net.Socket;
+        pfx?: any;   //string | Buffer
+        key?: any;   //string | Buffer
+        passphrase?: string;
+        cert?: any;  //string | Buffer
+        ca?: any;    //Array of string | Buffer
+        rejectUnauthorized?: boolean;
+        NPNProtocols?: any;  //Array of string | Buffer
+        servername?: string;
+    }
+
+    export interface Server extends net.Server {
+        close(): Server;
+        address(): { port: number; family: string; address: string; };
+        addContext(hostName: string, credentials: {
+            key: string;
+            cert: string;
+            ca: string;
+        }): void;
+        maxConnections: number;
+        connections: number;
+    }
+
+    export interface ClearTextStream extends stream.Duplex {
+        authorized: boolean;
+        authorizationError: Error;
+        getPeerCertificate(): any;
+        getCipher: {
+            name: string;
+            version: string;
+        };
+        address: {
+            port: number;
+            family: string;
+            address: string;
+        };
+        remoteAddress: string;
+        remotePort: number;
+    }
+
+    export interface SecurePair {
+        encrypted: any;
+        cleartext: any;
+    }
+
+    export interface SecureContextOptions {
+        pfx?: any;   //string | buffer
+        key?: any;   //string | buffer
+        passphrase?: string;
+        cert?: any;  // string | buffer
+        ca?: any;    // string | buffer
+        crl?: any;   // string | string[]
+        ciphers?: string;
+        honorCipherOrder?: boolean;
+    }
+
+    export interface SecureContext {
+        context: any;
+    }
+
+    export function createServer(options: TlsOptions, secureConnectionListener?: (cleartextStream: ClearTextStream) =>void ): Server;
+    export function connect(options: TlsOptions, secureConnectionListener?: () =>void ): ClearTextStream;
+    export function connect(port: number, host?: string, options?: ConnectionOptions, secureConnectListener?: () =>void ): ClearTextStream;
+    export function connect(port: number, options?: ConnectionOptions, secureConnectListener?: () =>void ): ClearTextStream;
+    export function createSecurePair(credentials?: crypto.Credentials, isServer?: boolean, requestCert?: boolean, rejectUnauthorized?: boolean): SecurePair;
+    export function createSecureContext(details: SecureContextOptions): SecureContext;
+}
+
+declare module "crypto" {
+    export interface CredentialDetails {
+        pfx: string;
+        key: string;
+        passphrase: string;
+        cert: string;
+        ca: any;    //string | string array
+        crl: any;   //string | string array
+        ciphers: string;
+    }
+    export interface Credentials { context?: any; }
+    export function createCredentials(details: CredentialDetails): Credentials;
+    export function createHash(algorithm: string): Hash;
+    export function createHmac(algorithm: string, key: string): Hmac;
+    export function createHmac(algorithm: string, key: Buffer): Hmac;
+    export interface Hash {
+        update(data: any, input_encoding?: string): Hash;
+        digest(encoding: 'buffer'): Buffer;
+        digest(encoding: string): any;
+        digest(): Buffer;
+    }
+    export interface Hmac extends NodeJS.ReadWriteStream {
+        update(data: any, input_encoding?: string): Hmac;
+        digest(encoding: 'buffer'): Buffer;
+        digest(encoding: string): any;
+        digest(): Buffer;
+    }
+    export function createCipher(algorithm: string, password: any): Cipher;
+    export function createCipheriv(algorithm: string, key: any, iv: any): Cipher;
+    export interface Cipher extends NodeJS.ReadWriteStream {
+        update(data: Buffer): Buffer;
+        update(data: string, input_encoding: "utf8"|"ascii"|"binary"): Buffer;
+        update(data: Buffer, input_encoding: any, output_encoding: "binary"|"base64"|"hex"): string;
+        update(data: string, input_encoding: "utf8"|"ascii"|"binary", output_encoding: "binary"|"base64"|"hex"): string;
+        final(): Buffer;
+        final(output_encoding: string): string;
+        setAutoPadding(auto_padding: boolean): void;
+        getAuthTag(): Buffer;
+    }
+    export function createDecipher(algorithm: string, password: any): Decipher;
+    export function createDecipheriv(algorithm: string, key: any, iv: any): Decipher;
+    export interface Decipher extends NodeJS.ReadWriteStream {
+        update(data: Buffer): Buffer;
+        update(data: string, input_encoding: "binary"|"base64"|"hex"): Buffer;
+        update(data: Buffer, input_encoding: any, output_encoding: "utf8"|"ascii"|"binary"): string;
+        update(data: string, input_encoding: "binary"|"base64"|"hex", output_encoding: "utf8"|"ascii"|"binary"): string;
+        final(): Buffer;
+        final(output_encoding: string): string;
+        setAutoPadding(auto_padding: boolean): void;
+        setAuthTag(tag: Buffer): void;
+    }
+    export function createSign(algorithm: string): Signer;
+    export interface Signer extends NodeJS.WritableStream {
+        update(data: any): void;
+        sign(private_key: string, output_format: string): string;
+    }
+    export function createVerify(algorith: string): Verify;
+    export interface Verify extends NodeJS.WritableStream {
+        update(data: any): void;
+        verify(object: string, signature: string, signature_format?: string): boolean;
+    }
+    export function createDiffieHellman(prime_length: number): DiffieHellman;
+    export function createDiffieHellman(prime: number, encoding?: string): DiffieHellman;
+    export interface DiffieHellman {
+        generateKeys(encoding?: string): string;
+        computeSecret(other_public_key: string, input_encoding?: string, output_encoding?: string): string;
+        getPrime(encoding?: string): string;
+        getGenerator(encoding: string): string;
+        getPublicKey(encoding?: string): string;
+        getPrivateKey(encoding?: string): string;
+        setPublicKey(public_key: string, encoding?: string): void;
+        setPrivateKey(public_key: string, encoding?: string): void;
+    }
+    export function getDiffieHellman(group_name: string): DiffieHellman;
+    export function pbkdf2(password: string|Buffer, salt: string|Buffer, iterations: number, keylen: number, callback: (err: Error, derivedKey: Buffer) => any): void;
+    export function pbkdf2(password: string|Buffer, salt: string|Buffer, iterations: number, keylen: number, digest: string, callback: (err: Error, derivedKey: Buffer) => any): void;
+    export function pbkdf2Sync(password: string|Buffer, salt: string|Buffer, iterations: number, keylen: number) : Buffer;
+    export function pbkdf2Sync(password: string|Buffer, salt: string|Buffer, iterations: number, keylen: number, digest: string) : Buffer;
+    export function randomBytes(size: number): Buffer;
+    export function randomBytes(size: number, callback: (err: Error, buf: Buffer) =>void ): void;
+    export function pseudoRandomBytes(size: number): Buffer;
+    export function pseudoRandomBytes(size: number, callback: (err: Error, buf: Buffer) =>void ): void;
+    export interface RsaPublicKey {
+        key: string;
+        padding?: any;
+    }
+    export interface RsaPrivateKey {
+        key: string;
+        passphrase?: string,
+        padding?: any;
+    }
+    export function publicEncrypt(public_key: string|RsaPublicKey, buffer: Buffer): Buffer
+    export function privateDecrypt(private_key: string|RsaPrivateKey, buffer: Buffer): Buffer
+}
+
+declare module "stream" {
+    import * as events from "events";
+
+    export class Stream extends events.EventEmitter {
+        pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
+    }
+
+    export interface ReadableOptions {
+        highWaterMark?: number;
+        encoding?: string;
+        objectMode?: boolean;
+    }
+
+    export class Readable extends events.EventEmitter implements NodeJS.ReadableStream {
+        readable: boolean;
+        constructor(opts?: ReadableOptions);
+        _read(size: number): void;
+        read(size?: number): any;
+        setEncoding(encoding: string): void;
+        pause(): void;
+        resume(): void;
+        pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
+        unpipe<T extends NodeJS.WritableStream>(destination?: T): void;
+        unshift(chunk: any): void;
+        wrap(oldStream: NodeJS.ReadableStream): NodeJS.ReadableStream;
+        push(chunk: any, encoding?: string): boolean;
+    }
+
+    export interface WritableOptions {
+        highWaterMark?: number;
+        decodeStrings?: boolean;
+        objectMode?: boolean;
+    }
+
+    export class Writable extends events.EventEmitter implements NodeJS.WritableStream {
+        writable: boolean;
+        constructor(opts?: WritableOptions);
+        _write(chunk: any, encoding: string, callback: Function): void;
+        write(chunk: any, cb?: Function): boolean;
+        write(chunk: any, encoding?: string, cb?: Function): boolean;
+        end(): void;
+        end(chunk: any, cb?: Function): void;
+        end(chunk: any, encoding?: string, cb?: Function): void;
+    }
+
+    export interface DuplexOptions extends ReadableOptions, WritableOptions {
+        allowHalfOpen?: boolean;
+    }
+
+    // Note: Duplex extends both Readable and Writable.
+    export class Duplex extends Readable implements NodeJS.ReadWriteStream {
+        writable: boolean;
+        constructor(opts?: DuplexOptions);
+        _write(chunk: any, encoding: string, callback: Function): void;
+        write(chunk: any, cb?: Function): boolean;
+        write(chunk: any, encoding?: string, cb?: Function): boolean;
+        end(): void;
+        end(chunk: any, cb?: Function): void;
+        end(chunk: any, encoding?: string, cb?: Function): void;
+    }
+
+    export interface TransformOptions extends ReadableOptions, WritableOptions {}
+
+    // Note: Transform lacks the _read and _write methods of Readable/Writable.
+    export class Transform extends events.EventEmitter implements NodeJS.ReadWriteStream {
+        readable: boolean;
+        writable: boolean;
+        constructor(opts?: TransformOptions);
+        _transform(chunk: any, encoding: string, callback: Function): void;
+        _flush(callback: Function): void;
+        read(size?: number): any;
+        setEncoding(encoding: string): void;
+        pause(): void;
+        resume(): void;
+        pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
+        unpipe<T extends NodeJS.WritableStream>(destination?: T): void;
+        unshift(chunk: any): void;
+        wrap(oldStream: NodeJS.ReadableStream): NodeJS.ReadableStream;
+        push(chunk: any, encoding?: string): boolean;
+        write(chunk: any, cb?: Function): boolean;
+        write(chunk: any, encoding?: string, cb?: Function): boolean;
+        end(): void;
+        end(chunk: any, cb?: Function): void;
+        end(chunk: any, encoding?: string, cb?: Function): void;
+    }
+
+    export class PassThrough extends Transform {}
+}
+
+declare module "util" {
+    export interface InspectOptions {
+        showHidden?: boolean;
+        depth?: number;
+        colors?: boolean;
+        customInspect?: boolean;
+    }
+
+    export function format(format: any, ...param: any[]): string;
+    export function debug(string: string): void;
+    export function error(...param: any[]): void;
+    export function puts(...param: any[]): void;
+    export function print(...param: any[]): void;
+    export function log(string: string): void;
+    export function inspect(object: any, showHidden?: boolean, depth?: number, color?: boolean): string;
+    export function inspect(object: any, options: InspectOptions): string;
+    export function isArray(object: any): boolean;
+    export function isRegExp(object: any): boolean;
+    export function isDate(object: any): boolean;
+    export function isError(object: any): boolean;
+    export function inherits(constructor: any, superConstructor: any): void;
+    export function debuglog(key:string): (msg:string,...param: any[])=>void;
+}
+
+declare module "assert" {
+    function internal (value: any, message?: string): void;
+    namespace internal {
+        export class AssertionError implements Error {
+            name: string;
+            message: string;
+            actual: any;
+            expected: any;
+            operator: string;
+            generatedMessage: boolean;
+
+            constructor(options?: {message?: string; actual?: any; expected?: any;
+                                  operator?: string; stackStartFunction?: Function});
+        }
+
+        export function fail(actual?: any, expected?: any, message?: string, operator?: string): void;
+        export function ok(value: any, message?: string): void;
+        export function equal(actual: any, expected: any, message?: string): void;
+        export function notEqual(actual: any, expected: any, message?: string): void;
+        export function deepEqual(actual: any, expected: any, message?: string): void;
+        export function notDeepEqual(acutal: any, expected: any, message?: string): void;
+        export function strictEqual(actual: any, expected: any, message?: string): void;
+        export function notStrictEqual(actual: any, expected: any, message?: string): void;
+        export function deepStrictEqual(actual: any, expected: any, message?: string): void;
+        export function notDeepStrictEqual(actual: any, expected: any, message?: string): void;
+        export var throws: {
+            (block: Function, message?: string): void;
+            (block: Function, error: Function, message?: string): void;
+            (block: Function, error: RegExp, message?: string): void;
+            (block: Function, error: (err: any) => boolean, message?: string): void;
+        };
+
+        export var doesNotThrow: {
+            (block: Function, message?: string): void;
+            (block: Function, error: Function, message?: string): void;
+            (block: Function, error: RegExp, message?: string): void;
+            (block: Function, error: (err: any) => boolean, message?: string): void;
+        };
+
+        export function ifError(value: any): void;
+    }
+
+    export = internal;
+}
+
+declare module "tty" {
+    import * as net from "net";
+
+    export function isatty(fd: number): boolean;
+    export interface ReadStream extends net.Socket {
+        isRaw: boolean;
+        setRawMode(mode: boolean): void;
+        isTTY: boolean;
+    }
+    export interface WriteStream extends net.Socket {
+        columns: number;
+        rows: number;
+        isTTY: boolean;
+    }
+}
+
+declare module "domain" {
+    import * as events from "events";
+
+    export class Domain extends events.EventEmitter implements NodeJS.Domain {
+        run(fn: Function): void;
+        add(emitter: events.EventEmitter): void;
+        remove(emitter: events.EventEmitter): void;
+        bind(cb: (err: Error, data: any) => any): any;
+        intercept(cb: (data: any) => any): any;
+        dispose(): void;
+    }
+
+    export function create(): Domain;
+}
+
+declare module "constants" {
+    export var E2BIG: number;
+    export var EACCES: number;
+    export var EADDRINUSE: number;
+    export var EADDRNOTAVAIL: number;
+    export var EAFNOSUPPORT: number;
+    export var EAGAIN: number;
+    export var EALREADY: number;
+    export var EBADF: number;
+    export var EBADMSG: number;
+    export var EBUSY: number;
+    export var ECANCELED: number;
+    export var ECHILD: number;
+    export var ECONNABORTED: number;
+    export var ECONNREFUSED: number;
+    export var ECONNRESET: number;
+    export var EDEADLK: number;
+    export var EDESTADDRREQ: number;
+    export var EDOM: number;
+    export var EEXIST: number;
+    export var EFAULT: number;
+    export var EFBIG: number;
+    export var EHOSTUNREACH: number;
+    export var EIDRM: number;
+    export var EILSEQ: number;
+    export var EINPROGRESS: number;
+    export var EINTR: number;
+    export var EINVAL: number;
+    export var EIO: number;
+    export var EISCONN: number;
+    export var EISDIR: number;
+    export var ELOOP: number;
+    export var EMFILE: number;
+    export var EMLINK: number;
+    export var EMSGSIZE: number;
+    export var ENAMETOOLONG: number;
+    export var ENETDOWN: number;
+    export var ENETRESET: number;
+    export var ENETUNREACH: number;
+    export var ENFILE: number;
+    export var ENOBUFS: number;
+    export var ENODATA: number;
+    export var ENODEV: number;
+    export var ENOENT: number;
+    export var ENOEXEC: number;
+    export var ENOLCK: number;
+    export var ENOLINK: number;
+    export var ENOMEM: number;
+    export var ENOMSG: number;
+    export var ENOPROTOOPT: number;
+    export var ENOSPC: number;
+    export var ENOSR: number;
+    export var ENOSTR: number;
+    export var ENOSYS: number;
+    export var ENOTCONN: number;
+    export var ENOTDIR: number;
+    export var ENOTEMPTY: number;
+    export var ENOTSOCK: number;
+    export var ENOTSUP: number;
+    export var ENOTTY: number;
+    export var ENXIO: number;
+    export var EOPNOTSUPP: number;
+    export var EOVERFLOW: number;
+    export var EPERM: number;
+    export var EPIPE: number;
+    export var EPROTO: number;
+    export var EPROTONOSUPPORT: number;
+    export var EPROTOTYPE: number;
+    export var ERANGE: number;
+    export var EROFS: number;
+    export var ESPIPE: number;
+    export var ESRCH: number;
+    export var ETIME: number;
+    export var ETIMEDOUT: number;
+    export var ETXTBSY: number;
+    export var EWOULDBLOCK: number;
+    export var EXDEV: number;
+    export var WSAEINTR: number;
+    export var WSAEBADF: number;
+    export var WSAEACCES: number;
+    export var WSAEFAULT: number;
+    export var WSAEINVAL: number;
+    export var WSAEMFILE: number;
+    export var WSAEWOULDBLOCK: number;
+    export var WSAEINPROGRESS: number;
+    export var WSAEALREADY: number;
+    export var WSAENOTSOCK: number;
+    export var WSAEDESTADDRREQ: number;
+    export var WSAEMSGSIZE: number;
+    export var WSAEPROTOTYPE: number;
+    export var WSAENOPROTOOPT: number;
+    export var WSAEPROTONOSUPPORT: number;
+    export var WSAESOCKTNOSUPPORT: number;
+    export var WSAEOPNOTSUPP: number;
+    export var WSAEPFNOSUPPORT: number;
+    export var WSAEAFNOSUPPORT: number;
+    export var WSAEADDRINUSE: number;
+    export var WSAEADDRNOTAVAIL: number;
+    export var WSAENETDOWN: number;
+    export var WSAENETUNREACH: number;
+    export var WSAENETRESET: number;
+    export var WSAECONNABORTED: number;
+    export var WSAECONNRESET: number;
+    export var WSAENOBUFS: number;
+    export var WSAEISCONN: number;
+    export var WSAENOTCONN: number;
+    export var WSAESHUTDOWN: number;
+    export var WSAETOOMANYREFS: number;
+    export var WSAETIMEDOUT: number;
+    export var WSAECONNREFUSED: number;
+    export var WSAELOOP: number;
+    export var WSAENAMETOOLONG: number;
+    export var WSAEHOSTDOWN: number;
+    export var WSAEHOSTUNREACH: number;
+    export var WSAENOTEMPTY: number;
+    export var WSAEPROCLIM: number;
+    export var WSAEUSERS: number;
+    export var WSAEDQUOT: number;
+    export var WSAESTALE: number;
+    export var WSAEREMOTE: number;
+    export var WSASYSNOTREADY: number;
+    export var WSAVERNOTSUPPORTED: number;
+    export var WSANOTINITIALISED: number;
+    export var WSAEDISCON: number;
+    export var WSAENOMORE: number;
+    export var WSAECANCELLED: number;
+    export var WSAEINVALIDPROCTABLE: number;
+    export var WSAEINVALIDPROVIDER: number;
+    export var WSAEPROVIDERFAILEDINIT: number;
+    export var WSASYSCALLFAILURE: number;
+    export var WSASERVICE_NOT_FOUND: number;
+    export var WSATYPE_NOT_FOUND: number;
+    export var WSA_E_NO_MORE: number;
+    export var WSA_E_CANCELLED: number;
+    export var WSAEREFUSED: number;
+    export var SIGHUP: number;
+    export var SIGINT: number;
+    export var SIGILL: number;
+    export var SIGABRT: number;
+    export var SIGFPE: number;
+    export var SIGKILL: number;
+    export var SIGSEGV: number;
+    export var SIGTERM: number;
+    export var SIGBREAK: number;
+    export var SIGWINCH: number;
+    export var SSL_OP_ALL: number;
+    export var SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: number;
+    export var SSL_OP_CIPHER_SERVER_PREFERENCE: number;
+    export var SSL_OP_CISCO_ANYCONNECT: number;
+    export var SSL_OP_COOKIE_EXCHANGE: number;
+    export var SSL_OP_CRYPTOPRO_TLSEXT_BUG: number;
+    export var SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: number;
+    export var SSL_OP_EPHEMERAL_RSA: number;
+    export var SSL_OP_LEGACY_SERVER_CONNECT: number;
+    export var SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: number;
+    export var SSL_OP_MICROSOFT_SESS_ID_BUG: number;
+    export var SSL_OP_MSIE_SSLV2_RSA_PADDING: number;
+    export var SSL_OP_NETSCAPE_CA_DN_BUG: number;
+    export var SSL_OP_NETSCAPE_CHALLENGE_BUG: number;
+    export var SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG: number;
+    export var SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: number;
+    export var SSL_OP_NO_COMPRESSION: number;
+    export var SSL_OP_NO_QUERY_MTU: number;
+    export var SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION: number;
+    export var SSL_OP_NO_SSLv2: number;
+    export var SSL_OP_NO_SSLv3: number;
+    export var SSL_OP_NO_TICKET: number;
+    export var SSL_OP_NO_TLSv1: number;
+    export var SSL_OP_NO_TLSv1_1: number;
+    export var SSL_OP_NO_TLSv1_2: number;
+    export var SSL_OP_PKCS1_CHECK_1: number;
+    export var SSL_OP_PKCS1_CHECK_2: number;
+    export var SSL_OP_SINGLE_DH_USE: number;
+    export var SSL_OP_SINGLE_ECDH_USE: number;
+    export var SSL_OP_SSLEAY_080_CLIENT_DH_BUG: number;
+    export var SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG: number;
+    export var SSL_OP_TLS_BLOCK_PADDING_BUG: number;
+    export var SSL_OP_TLS_D5_BUG: number;
+    export var SSL_OP_TLS_ROLLBACK_BUG: number;
+    export var ENGINE_METHOD_DSA: number;
+    export var ENGINE_METHOD_DH: number;
+    export var ENGINE_METHOD_RAND: number;
+    export var ENGINE_METHOD_ECDH: number;
+    export var ENGINE_METHOD_ECDSA: number;
+    export var ENGINE_METHOD_CIPHERS: number;
+    export var ENGINE_METHOD_DIGESTS: number;
+    export var ENGINE_METHOD_STORE: number;
+    export var ENGINE_METHOD_PKEY_METHS: number;
+    export var ENGINE_METHOD_PKEY_ASN1_METHS: number;
+    export var ENGINE_METHOD_ALL: number;
+    export var ENGINE_METHOD_NONE: number;
+    export var DH_CHECK_P_NOT_SAFE_PRIME: number;
+    export var DH_CHECK_P_NOT_PRIME: number;
+    export var DH_UNABLE_TO_CHECK_GENERATOR: number;
+    export var DH_NOT_SUITABLE_GENERATOR: number;
+    export var NPN_ENABLED: number;
+    export var RSA_PKCS1_PADDING: number;
+    export var RSA_SSLV23_PADDING: number;
+    export var RSA_NO_PADDING: number;
+    export var RSA_PKCS1_OAEP_PADDING: number;
+    export var RSA_X931_PADDING: number;
+    export var RSA_PKCS1_PSS_PADDING: number;
+    export var POINT_CONVERSION_COMPRESSED: number;
+    export var POINT_CONVERSION_UNCOMPRESSED: number;
+    export var POINT_CONVERSION_HYBRID: number;
+    export var O_RDONLY: number;
+    export var O_WRONLY: number;
+    export var O_RDWR: number;
+    export var S_IFMT: number;
+    export var S_IFREG: number;
+    export var S_IFDIR: number;
+    export var S_IFCHR: number;
+    export var S_IFLNK: number;
+    export var O_CREAT: number;
+    export var O_EXCL: number;
+    export var O_TRUNC: number;
+    export var O_APPEND: number;
+    export var F_OK: number;
+    export var R_OK: number;
+    export var W_OK: number;
+    export var X_OK: number;
+    export var UV_UDP_REUSEADDR: number;
+}
diff --git a/node/node-0.11-tests.ts b/node/node-0.11-tests.ts
index 8609639a8c..d1dc9979c6 100644
--- a/node/node-0.11-tests.ts
+++ b/node/node-0.11-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="node-0.11.d.ts" />
+
 
 import assert = require("assert");
 import fs = require("fs");
diff --git a/node/node-0.12-tests.ts b/node/node-0.12-tests.ts
index 2560181896..5b9a1ebd1f 100644
--- a/node/node-0.12-tests.ts
+++ b/node/node-0.12-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="node-0.12.d.ts" />
+
 import * as assert from "assert";
 import * as fs from "fs";
 import * as events from "events";
diff --git a/node/node-0.8.8.d.ts.tscparams b/node/node-0.8.8.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/node/node-0.8.8.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/node/node-tests.ts b/node/node-tests.ts
index 66c4256caf..8b37bfbd36 100644
--- a/node/node-tests.ts
+++ b/node/node-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="node.d.ts" />
+
 import * as assert from "assert";
 import * as fs from "fs";
 import * as events from "events";
@@ -15,6 +15,7 @@ import * as querystring from "querystring";
 import * as path from "path";
 import * as readline from "readline";
 import * as childProcess from "child_process";
+import * as cluster from "cluster";
 import * as os from "os";
 import * as vm from "vm";
 // Specifically test buffer module regression.
@@ -138,6 +139,7 @@ function bufferTests() {
     var base64Buffer = new Buffer('','base64');
     var octets: Uint8Array = null;
     var octetBuffer = new Buffer(octets);
+    var sharedBuffer = new Buffer(octets.buffer);
     var copiedBuffer = new Buffer(utf8Buffer);
     console.log(Buffer.isBuffer(octetBuffer));
     console.log(Buffer.isEncoding('utf8'));
@@ -181,6 +183,12 @@ function bufferTests() {
         let sb = new ImportedSlowBuffer(43);
         b.writeUInt8(0, 6);
     }
+
+    // Buffer has Uint8Array's buffer field (an ArrayBuffer).
+    {
+      let buffer = new Buffer('123');
+      let octets = new Uint8Array(buffer.buffer);
+    }
 }
 
 
@@ -636,6 +644,18 @@ namespace readline_tests {
 childProcess.exec("echo test");
 childProcess.spawnSync("echo test");
 
+//////////////////////////////////////////////////////////////////////
+/// cluster tests: https://nodejs.org/api/cluster.html ///
+//////////////////////////////////////////////////////////////////////
+
+cluster.fork();
+Object.keys(cluster.workers).forEach(key => {
+    const worker = cluster.workers[key];
+    if (worker.isDead()) {
+        console.log('worker %d is dead', worker.process.pid);
+    }
+});
+
 ////////////////////////////////////////////////////
 /// os tests : https://nodejs.org/api/os.html
 ////////////////////////////////////////////////////
diff --git a/node/node.d.ts b/node/node.d.ts
deleted file mode 100644
index 66e9a935f7..0000000000
--- a/node/node.d.ts
+++ /dev/null
@@ -1,2329 +0,0 @@
-// Type definitions for Node.js v4.x
-// Project: http://nodejs.org/
-// Definitions by: Microsoft TypeScript <http://typescriptlang.org>, DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/************************************************
-*                                               *
-*               Node.js v4.x API                *
-*                                               *
-************************************************/
-
-interface Error {
-    stack?: string;
-}
-
-
-// compat for TypeScript 1.8
-// if you use with --target es3 or --target es5 and use below definitions,
-// use the lib.es6.d.ts that is bundled with TypeScript 1.8.
-interface MapConstructor {}
-interface WeakMapConstructor {}
-interface SetConstructor {}
-interface WeakSetConstructor {}
-
-/************************************************
-*                                               *
-*                   GLOBAL                      *
-*                                               *
-************************************************/
-declare var process: NodeJS.Process;
-declare var global: NodeJS.Global;
-
-declare var __filename: string;
-declare var __dirname: string;
-
-declare function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
-declare function clearTimeout(timeoutId: NodeJS.Timer): void;
-declare function setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
-declare function clearInterval(intervalId: NodeJS.Timer): void;
-declare function setImmediate(callback: (...args: any[]) => void, ...args: any[]): any;
-declare function clearImmediate(immediateId: any): void;
-
-interface NodeRequireFunction {
-    (id: string): any;
-}
-
-interface NodeRequire extends NodeRequireFunction {
-    resolve(id:string): string;
-    cache: any;
-    extensions: any;
-    main: any;
-}
-
-declare var require: NodeRequire;
-
-interface NodeModule {
-    exports: any;
-    require: NodeRequireFunction;
-    id: string;
-    filename: string;
-    loaded: boolean;
-    parent: any;
-    children: any[];
-}
-
-declare var module: NodeModule;
-
-// Same as module.exports
-declare var exports: any;
-declare var SlowBuffer: {
-    new (str: string, encoding?: string): Buffer;
-    new (size: number): Buffer;
-    new (size: Uint8Array): Buffer;
-    new (array: any[]): Buffer;
-    prototype: Buffer;
-    isBuffer(obj: any): boolean;
-    byteLength(string: string, encoding?: string): number;
-    concat(list: Buffer[], totalLength?: number): Buffer;
-};
-
-
-// Buffer class
-type BufferEncoding = "ascii" | "utf8" | "utf16le" | "ucs2" | "binary" | "hex";
-interface Buffer extends NodeBuffer {}
-
-/**
- * Raw data is stored in instances of the Buffer class.
- * A Buffer is similar to an array of integers but corresponds to a raw memory allocation outside the V8 heap.  A Buffer cannot be resized.
- * Valid string encodings: 'ascii'|'utf8'|'utf16le'|'ucs2'(alias of 'utf16le')|'base64'|'binary'(deprecated)|'hex'
- */
-declare var Buffer: {
-    /**
-     * Allocates a new buffer containing the given {str}.
-     *
-     * @param str String to store in buffer.
-     * @param encoding encoding to use, optional.  Default is 'utf8'
-     */
-    new (str: string, encoding?: string): Buffer;
-    /**
-     * Allocates a new buffer of {size} octets.
-     *
-     * @param size count of octets to allocate.
-     */
-    new (size: number): Buffer;
-    /**
-     * Allocates a new buffer containing the given {array} of octets.
-     *
-     * @param array The octets to store.
-     */
-    new (array: Uint8Array): Buffer;
-    /**
-     * Allocates a new buffer containing the given {array} of octets.
-     *
-     * @param array The octets to store.
-     */
-    new (array: any[]): Buffer;
-    /**
-     * Copies the passed {buffer} data onto a new {Buffer} instance.
-     *
-     * @param buffer The buffer to copy.
-     */
-    new (buffer: Buffer): Buffer;
-    prototype: Buffer;
-    /**
-     * Returns true if {obj} is a Buffer
-     *
-     * @param obj object to test.
-     */
-    isBuffer(obj: any): obj is Buffer;
-    /**
-     * Returns true if {encoding} is a valid encoding argument.
-     * Valid string encodings in Node 0.12: 'ascii'|'utf8'|'utf16le'|'ucs2'(alias of 'utf16le')|'base64'|'binary'(deprecated)|'hex'
-     *
-     * @param encoding string to test.
-     */
-    isEncoding(encoding: string): boolean;
-    /**
-     * Gives the actual byte length of a string. encoding defaults to 'utf8'.
-     * This is not the same as String.prototype.length since that returns the number of characters in a string.
-     *
-     * @param string string to test.
-     * @param encoding encoding used to evaluate (defaults to 'utf8')
-     */
-    byteLength(string: string, encoding?: string): number;
-    /**
-     * Returns a buffer which is the result of concatenating all the buffers in the list together.
-     *
-     * If the list has no items, or if the totalLength is 0, then it returns a zero-length buffer.
-     * If the list has exactly one item, then the first item of the list is returned.
-     * If the list has more than one item, then a new Buffer is created.
-     *
-     * @param list An array of Buffer objects to concatenate
-     * @param totalLength Total length of the buffers when concatenated.
-     *   If totalLength is not provided, it is read from the buffers in the list. However, this adds an additional loop to the function, so it is faster to provide the length explicitly.
-     */
-    concat(list: Buffer[], totalLength?: number): Buffer;
-    /**
-     * The same as buf1.compare(buf2).
-     */
-    compare(buf1: Buffer, buf2: Buffer): number;
-};
-
-/************************************************
-*                                               *
-*               GLOBAL INTERFACES               *
-*                                               *
-************************************************/
-declare namespace NodeJS {
-    export interface ErrnoException extends Error {
-        errno?: number;
-        code?: string;
-        path?: string;
-        syscall?: string;
-        stack?: string;
-    }
-
-    export interface EventEmitter {
-        addListener(event: string, listener: Function): this;
-        on(event: string, listener: Function): this;
-        once(event: string, listener: Function): this;
-        removeListener(event: string, listener: Function): this;
-        removeAllListeners(event?: string): this;
-        setMaxListeners(n: number): this;
-        getMaxListeners(): number;
-        listeners(event: string): Function[];
-        emit(event: string, ...args: any[]): boolean;
-        listenerCount(type: string): number;
-    }
-
-    export interface ReadableStream extends EventEmitter {
-        readable: boolean;
-        read(size?: number): string|Buffer;
-        setEncoding(encoding: string): void;
-        pause(): void;
-        resume(): void;
-        pipe<T extends WritableStream>(destination: T, options?: { end?: boolean; }): T;
-        unpipe<T extends WritableStream>(destination?: T): void;
-        unshift(chunk: string): void;
-        unshift(chunk: Buffer): void;
-        wrap(oldStream: ReadableStream): ReadableStream;
-    }
-
-    export interface WritableStream extends EventEmitter {
-        writable: boolean;
-        write(buffer: Buffer|string, cb?: Function): boolean;
-        write(str: string, encoding?: string, cb?: Function): boolean;
-        end(): void;
-        end(buffer: Buffer, cb?: Function): void;
-        end(str: string, cb?: Function): void;
-        end(str: string, encoding?: string, cb?: Function): void;
-    }
-
-    export interface ReadWriteStream extends ReadableStream, WritableStream {}
-
-    export interface Events extends EventEmitter { }
-
-    export interface Domain extends Events {
-        run(fn: Function): void;
-        add(emitter: Events): void;
-        remove(emitter: Events): void;
-        bind(cb: (err: Error, data: any) => any): any;
-        intercept(cb: (data: any) => any): any;
-        dispose(): void;
-
-        addListener(event: string, listener: Function): this;
-        on(event: string, listener: Function): this;
-        once(event: string, listener: Function): this;
-        removeListener(event: string, listener: Function): this;
-        removeAllListeners(event?: string): this;
-    }
-
-    export interface MemoryUsage {
-        rss: number;
-        heapTotal: number;
-        heapUsed: number;
-    }
-
-    export interface Process extends EventEmitter {
-        stdout: WritableStream;
-        stderr: WritableStream;
-        stdin: ReadableStream;
-        argv: string[];
-        execArgv: string[];
-        execPath: string;
-        abort(): void;
-        chdir(directory: string): void;
-        cwd(): string;
-        env: any;
-        exit(code?: number): void;
-        getgid(): number;
-        setgid(id: number): void;
-        setgid(id: string): void;
-        getuid(): number;
-        setuid(id: number): void;
-        setuid(id: string): void;
-        version: string;
-        versions: {
-            http_parser: string;
-            node: string;
-            v8: string;
-            ares: string;
-            uv: string;
-            zlib: string;
-            openssl: string;
-        };
-        config: {
-            target_defaults: {
-                cflags: any[];
-                default_configuration: string;
-                defines: string[];
-                include_dirs: string[];
-                libraries: string[];
-            };
-            variables: {
-                clang: number;
-                host_arch: string;
-                node_install_npm: boolean;
-                node_install_waf: boolean;
-                node_prefix: string;
-                node_shared_openssl: boolean;
-                node_shared_v8: boolean;
-                node_shared_zlib: boolean;
-                node_use_dtrace: boolean;
-                node_use_etw: boolean;
-                node_use_openssl: boolean;
-                target_arch: string;
-                v8_no_strict_aliasing: number;
-                v8_use_snapshot: boolean;
-                visibility: string;
-            };
-        };
-        kill(pid:number, signal?: string|number): void;
-        pid: number;
-        title: string;
-        arch: string;
-        platform: string;
-        memoryUsage(): MemoryUsage;
-        nextTick(callback: Function): void;
-        umask(mask?: number): number;
-        uptime(): number;
-        hrtime(time?:number[]): number[];
-        domain: Domain;
-
-        // Worker
-        send?(message: any, sendHandle?: any): void;
-        disconnect(): void;
-        connected: boolean;
-    }
-
-    export interface Global {
-        Array: typeof Array;
-        ArrayBuffer: typeof ArrayBuffer;
-        Boolean: typeof Boolean;
-        Buffer: typeof Buffer;
-        DataView: typeof DataView;
-        Date: typeof Date;
-        Error: typeof Error;
-        EvalError: typeof EvalError;
-        Float32Array: typeof Float32Array;
-        Float64Array: typeof Float64Array;
-        Function: typeof Function;
-        GLOBAL: Global;
-        Infinity: typeof Infinity;
-        Int16Array: typeof Int16Array;
-        Int32Array: typeof Int32Array;
-        Int8Array: typeof Int8Array;
-        Intl: typeof Intl;
-        JSON: typeof JSON;
-        Map: MapConstructor;
-        Math: typeof Math;
-        NaN: typeof NaN;
-        Number: typeof Number;
-        Object: typeof Object;
-        Promise: Function;
-        RangeError: typeof RangeError;
-        ReferenceError: typeof ReferenceError;
-        RegExp: typeof RegExp;
-        Set: SetConstructor;
-        String: typeof String;
-        Symbol: Function;
-        SyntaxError: typeof SyntaxError;
-        TypeError: typeof TypeError;
-        URIError: typeof URIError;
-        Uint16Array: typeof Uint16Array;
-        Uint32Array: typeof Uint32Array;
-        Uint8Array: typeof Uint8Array;
-        Uint8ClampedArray: Function;
-        WeakMap: WeakMapConstructor;
-        WeakSet: WeakSetConstructor;
-        clearImmediate: (immediateId: any) => void;
-        clearInterval: (intervalId: NodeJS.Timer) => void;
-        clearTimeout: (timeoutId: NodeJS.Timer) => void;
-        console: typeof console;
-        decodeURI: typeof decodeURI;
-        decodeURIComponent: typeof decodeURIComponent;
-        encodeURI: typeof encodeURI;
-        encodeURIComponent: typeof encodeURIComponent;
-        escape: (str: string) => string;
-        eval: typeof eval;
-        global: Global;
-        isFinite: typeof isFinite;
-        isNaN: typeof isNaN;
-        parseFloat: typeof parseFloat;
-        parseInt: typeof parseInt;
-        process: Process;
-        root: Global;
-        setImmediate: (callback: (...args: any[]) => void, ...args: any[]) => any;
-        setInterval: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => NodeJS.Timer;
-        setTimeout: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => NodeJS.Timer;
-        undefined: typeof undefined;
-        unescape: (str: string) => string;
-        gc: () => void;
-        v8debug?: any;
-    }
-
-    export interface Timer {
-        ref() : void;
-        unref() : void;
-    }
-}
-
-/**
- * @deprecated
- */
-interface NodeBuffer {
-    [index: number]: number;
-    write(string: string, offset?: number, length?: number, encoding?: string): number;
-    toString(encoding?: string, start?: number, end?: number): string;
-    toJSON(): any;
-    length: number;
-    equals(otherBuffer: Buffer): boolean;
-    compare(otherBuffer: Buffer): number;
-    copy(targetBuffer: Buffer, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
-    slice(start?: number, end?: number): Buffer;
-    writeUIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-    writeUIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-    writeIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-    writeIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-    readUIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
-    readUIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
-    readIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
-    readIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
-    readUInt8(offset: number, noAssert?: boolean): number;
-    readUInt16LE(offset: number, noAssert?: boolean): number;
-    readUInt16BE(offset: number, noAssert?: boolean): number;
-    readUInt32LE(offset: number, noAssert?: boolean): number;
-    readUInt32BE(offset: number, noAssert?: boolean): number;
-    readInt8(offset: number, noAssert?: boolean): number;
-    readInt16LE(offset: number, noAssert?: boolean): number;
-    readInt16BE(offset: number, noAssert?: boolean): number;
-    readInt32LE(offset: number, noAssert?: boolean): number;
-    readInt32BE(offset: number, noAssert?: boolean): number;
-    readFloatLE(offset: number, noAssert?: boolean): number;
-    readFloatBE(offset: number, noAssert?: boolean): number;
-    readDoubleLE(offset: number, noAssert?: boolean): number;
-    readDoubleBE(offset: number, noAssert?: boolean): number;
-    writeUInt8(value: number, offset: number, noAssert?: boolean): number;
-    writeUInt16LE(value: number, offset: number, noAssert?: boolean): number;
-    writeUInt16BE(value: number, offset: number, noAssert?: boolean): number;
-    writeUInt32LE(value: number, offset: number, noAssert?: boolean): number;
-    writeUInt32BE(value: number, offset: number, noAssert?: boolean): number;
-    writeInt8(value: number, offset: number, noAssert?: boolean): number;
-    writeInt16LE(value: number, offset: number, noAssert?: boolean): number;
-    writeInt16BE(value: number, offset: number, noAssert?: boolean): number;
-    writeInt32LE(value: number, offset: number, noAssert?: boolean): number;
-    writeInt32BE(value: number, offset: number, noAssert?: boolean): number;
-    writeFloatLE(value: number, offset: number, noAssert?: boolean): number;
-    writeFloatBE(value: number, offset: number, noAssert?: boolean): number;
-    writeDoubleLE(value: number, offset: number, noAssert?: boolean): number;
-    writeDoubleBE(value: number, offset: number, noAssert?: boolean): number;
-    fill(value: any, offset?: number, end?: number): Buffer;
-    indexOf(value: string | number | Buffer, byteOffset?: number): number;
-}
-
-/************************************************
-*                                               *
-*                   MODULES                     *
-*                                               *
-************************************************/
-declare module "buffer" {
-    export var INSPECT_MAX_BYTES: number;
-    var BuffType: typeof Buffer;
-    var SlowBuffType: typeof SlowBuffer;
-    export { BuffType as Buffer, SlowBuffType as SlowBuffer };
-}
-
-declare module "querystring" {
-    export interface StringifyOptions {
-        encodeURIComponent?: Function;
-    }
-
-    export interface ParseOptions {
-        maxKeys?: number;
-        decodeURIComponent?: Function;
-    }
-
-    export function stringify<T>(obj: T, sep?: string, eq?: string, options?: StringifyOptions): string;
-    export function parse(str: string, sep?: string, eq?: string, options?: ParseOptions): any;
-    export function parse<T extends {}>(str: string, sep?: string, eq?: string, options?: ParseOptions): T;
-    export function escape(str: string): string;
-    export function unescape(str: string): string;
-}
-
-declare module "events" {
-    export class EventEmitter implements NodeJS.EventEmitter {
-        static EventEmitter: EventEmitter;
-        static listenerCount(emitter: EventEmitter, event: string): number; // deprecated
-        static defaultMaxListeners: number;
-
-        addListener(event: string, listener: Function): this;
-        on(event: string, listener: Function): this;
-        once(event: string, listener: Function): this;
-        removeListener(event: string, listener: Function): this;
-        removeAllListeners(event?: string): this;
-        setMaxListeners(n: number): this;
-        getMaxListeners(): number;
-        listeners(event: string): Function[];
-        emit(event: string, ...args: any[]): boolean;
-        listenerCount(type: string): number;
-    }
-}
-
-declare module "http" {
-    import * as events from "events";
-    import * as net from "net";
-    import * as stream from "stream";
-
-    export interface RequestOptions {
-        protocol?: string;
-        host?: string;
-        hostname?: string;
-        family?: number;
-        port?: number;
-        localAddress?: string;
-        socketPath?: string;
-        method?: string;
-        path?: string;
-        headers?: { [key: string]: any };
-        auth?: string;
-        agent?: Agent|boolean;
-    }
-
-    export interface Server extends events.EventEmitter, net.Server {
-        setTimeout(msecs: number, callback: Function): void;
-        maxHeadersCount: number;
-        timeout: number;
-    }
-    /**
-     * @deprecated Use IncomingMessage
-     */
-    export interface ServerRequest extends IncomingMessage {
-        connection: net.Socket;
-    }
-    export interface ServerResponse extends events.EventEmitter, stream.Writable {
-        // Extended base methods
-        write(buffer: Buffer): boolean;
-        write(buffer: Buffer, cb?: Function): boolean;
-        write(str: string, cb?: Function): boolean;
-        write(str: string, encoding?: string, cb?: Function): boolean;
-        write(str: string, encoding?: string, fd?: string): boolean;
-
-        writeContinue(): void;
-        writeHead(statusCode: number, reasonPhrase?: string, headers?: any): void;
-        writeHead(statusCode: number, headers?: any): void;
-        statusCode: number;
-        statusMessage: string;
-        headersSent: boolean;
-        setHeader(name: string, value: string | string[]): void;
-        sendDate: boolean;
-        getHeader(name: string): string;
-        removeHeader(name: string): void;
-        write(chunk: any, encoding?: string): any;
-        addTrailers(headers: any): void;
-
-        // Extended base methods
-        end(): void;
-        end(buffer: Buffer, cb?: Function): void;
-        end(str: string, cb?: Function): void;
-        end(str: string, encoding?: string, cb?: Function): void;
-        end(data?: any, encoding?: string): void;
-    }
-    export interface ClientRequest extends events.EventEmitter, stream.Writable {
-        // Extended base methods
-        write(buffer: Buffer): boolean;
-        write(buffer: Buffer, cb?: Function): boolean;
-        write(str: string, cb?: Function): boolean;
-        write(str: string, encoding?: string, cb?: Function): boolean;
-        write(str: string, encoding?: string, fd?: string): boolean;
-
-        write(chunk: any, encoding?: string): void;
-        abort(): void;
-        setTimeout(timeout: number, callback?: Function): void;
-        setNoDelay(noDelay?: boolean): void;
-        setSocketKeepAlive(enable?: boolean, initialDelay?: number): void;
-
-        setHeader(name: string, value: string | string[]): void;
-        getHeader(name: string): string;
-        removeHeader(name: string): void;
-        addTrailers(headers: any): void;
-
-        // Extended base methods
-        end(): void;
-        end(buffer: Buffer, cb?: Function): void;
-        end(str: string, cb?: Function): void;
-        end(str: string, encoding?: string, cb?: Function): void;
-        end(data?: any, encoding?: string): void;
-    }
-    export interface IncomingMessage extends events.EventEmitter, stream.Readable {
-        httpVersion: string;
-        headers: any;
-        rawHeaders: string[];
-        trailers: any;
-        rawTrailers: any;
-        setTimeout(msecs: number, callback: Function): NodeJS.Timer;
-        /**
-         * Only valid for request obtained from http.Server.
-         */
-        method?: string;
-        /**
-         * Only valid for request obtained from http.Server.
-         */
-        url?: string;
-        /**
-         * Only valid for response obtained from http.ClientRequest.
-         */
-        statusCode?: number;
-        /**
-         * Only valid for response obtained from http.ClientRequest.
-         */
-        statusMessage?: string;
-        socket: net.Socket;
-    }
-    /**
-     * @deprecated Use IncomingMessage
-     */
-    export interface ClientResponse extends IncomingMessage { }
-
-    export interface AgentOptions {
-        /**
-         * Keep sockets around in a pool to be used by other requests in the future. Default = false
-         */
-        keepAlive?: boolean;
-        /**
-         * When using HTTP KeepAlive, how often to send TCP KeepAlive packets over sockets being kept alive. Default = 1000.
-         * Only relevant if keepAlive is set to true.
-         */
-        keepAliveMsecs?: number;
-        /**
-         * Maximum number of sockets to allow per host. Default for Node 0.10 is 5, default for Node 0.12 is Infinity
-         */
-        maxSockets?: number;
-        /**
-         * Maximum number of sockets to leave open in a free state. Only relevant if keepAlive is set to true. Default = 256.
-         */
-        maxFreeSockets?: number;
-    }
-
-    export class Agent {
-        maxSockets: number;
-        sockets: any;
-        requests: any;
-
-        constructor(opts?: AgentOptions);
-
-        /**
-         * Destroy any sockets that are currently in use by the agent.
-         * It is usually not necessary to do this. However, if you are using an agent with KeepAlive enabled,
-         * then it is best to explicitly shut down the agent when you know that it will no longer be used. Otherwise,
-         * sockets may hang open for quite a long time before the server terminates them.
-         */
-        destroy(): void;
-    }
-
-    export var METHODS: string[];
-
-    export var STATUS_CODES: {
-        [errorCode: number]: string;
-        [errorCode: string]: string;
-    };
-    export function createServer(requestListener?: (request: IncomingMessage, response: ServerResponse) =>void ): Server;
-    export function createClient(port?: number, host?: string): any;
-    export function request(options: RequestOptions, callback?: (res: IncomingMessage) => void): ClientRequest;
-    export function get(options: any, callback?: (res: IncomingMessage) => void): ClientRequest;
-    export var globalAgent: Agent;
-}
-
-declare module "cluster" {
-    import * as child from "child_process";
-    import * as events from "events";
-
-    export interface ClusterSettings {
-        exec?: string;
-        args?: string[];
-        silent?: boolean;
-    }
-
-    export interface Address {
-        address: string;
-        port: number;
-        addressType: string;
-    }
-
-    export class Worker extends events.EventEmitter {
-        id: string;
-        process: child.ChildProcess;
-        suicide: boolean;
-        send(message: any, sendHandle?: any): void;
-        kill(signal?: string): void;
-        destroy(signal?: string): void;
-        disconnect(): void;
-    }
-
-    export var settings: ClusterSettings;
-    export var isMaster: boolean;
-    export var isWorker: boolean;
-    export function setupMaster(settings?: ClusterSettings): void;
-    export function fork(env?: any): Worker;
-    export function disconnect(callback?: Function): void;
-    export var worker: Worker;
-    export var workers: Worker[];
-
-    // Event emitter
-    export function addListener(event: string, listener: Function): void;
-    export function on(event: "disconnect", listener: (worker: Worker) => void): void;
-    export function on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): void;
-    export function on(event: "fork", listener: (worker: Worker) => void): void;
-    export function on(event: "listening", listener: (worker: Worker, address: any) => void): void;
-    export function on(event: "message", listener: (worker: Worker, message: any) => void): void;
-    export function on(event: "online", listener: (worker: Worker) => void): void;
-    export function on(event: "setup", listener: (settings: any) => void): void;
-    export function on(event: string, listener: Function): any;
-    export function once(event: string, listener: Function): void;
-    export function removeListener(event: string, listener: Function): void;
-    export function removeAllListeners(event?: string): void;
-    export function setMaxListeners(n: number): void;
-    export function listeners(event: string): Function[];
-    export function emit(event: string, ...args: any[]): boolean;
-}
-
-declare module "zlib" {
-    import * as stream from "stream";
-    export interface ZlibOptions { chunkSize?: number; windowBits?: number; level?: number; memLevel?: number; strategy?: number; dictionary?: any; }
-
-    export interface Gzip extends stream.Transform { }
-    export interface Gunzip extends stream.Transform { }
-    export interface Deflate extends stream.Transform { }
-    export interface Inflate extends stream.Transform { }
-    export interface DeflateRaw extends stream.Transform { }
-    export interface InflateRaw extends stream.Transform { }
-    export interface Unzip extends stream.Transform { }
-
-    export function createGzip(options?: ZlibOptions): Gzip;
-    export function createGunzip(options?: ZlibOptions): Gunzip;
-    export function createDeflate(options?: ZlibOptions): Deflate;
-    export function createInflate(options?: ZlibOptions): Inflate;
-    export function createDeflateRaw(options?: ZlibOptions): DeflateRaw;
-    export function createInflateRaw(options?: ZlibOptions): InflateRaw;
-    export function createUnzip(options?: ZlibOptions): Unzip;
-
-    export function deflate(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
-    export function deflateSync(buf: Buffer, options?: ZlibOptions): any;
-    export function deflateRaw(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
-    export function deflateRawSync(buf: Buffer, options?: ZlibOptions): any;
-    export function gzip(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
-    export function gzipSync(buf: Buffer, options?: ZlibOptions): any;
-    export function gunzip(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
-    export function gunzipSync(buf: Buffer, options?: ZlibOptions): any;
-    export function inflate(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
-    export function inflateSync(buf: Buffer, options?: ZlibOptions): any;
-    export function inflateRaw(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
-    export function inflateRawSync(buf: Buffer, options?: ZlibOptions): any;
-    export function unzip(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
-    export function unzipSync(buf: Buffer, options?: ZlibOptions): any;
-
-    // Constants
-    export var Z_NO_FLUSH: number;
-    export var Z_PARTIAL_FLUSH: number;
-    export var Z_SYNC_FLUSH: number;
-    export var Z_FULL_FLUSH: number;
-    export var Z_FINISH: number;
-    export var Z_BLOCK: number;
-    export var Z_TREES: number;
-    export var Z_OK: number;
-    export var Z_STREAM_END: number;
-    export var Z_NEED_DICT: number;
-    export var Z_ERRNO: number;
-    export var Z_STREAM_ERROR: number;
-    export var Z_DATA_ERROR: number;
-    export var Z_MEM_ERROR: number;
-    export var Z_BUF_ERROR: number;
-    export var Z_VERSION_ERROR: number;
-    export var Z_NO_COMPRESSION: number;
-    export var Z_BEST_SPEED: number;
-    export var Z_BEST_COMPRESSION: number;
-    export var Z_DEFAULT_COMPRESSION: number;
-    export var Z_FILTERED: number;
-    export var Z_HUFFMAN_ONLY: number;
-    export var Z_RLE: number;
-    export var Z_FIXED: number;
-    export var Z_DEFAULT_STRATEGY: number;
-    export var Z_BINARY: number;
-    export var Z_TEXT: number;
-    export var Z_ASCII: number;
-    export var Z_UNKNOWN: number;
-    export var Z_DEFLATED: number;
-    export var Z_NULL: number;
-}
-
-declare module "os" {
-    export interface CpuInfo {
-        model: string;
-        speed: number;
-        times: {
-            user: number;
-            nice: number;
-            sys: number;
-            idle: number;
-            irq: number;
-        };
-    }
-
-    export interface NetworkInterfaceInfo {
-        address: string;
-        netmask: string;
-        family: string;
-        mac: string;
-        internal: boolean;
-    }
-
-    export function tmpdir(): string;
-    export function homedir(): string;
-    export function endianness(): string;
-    export function hostname(): string;
-    export function type(): string;
-    export function platform(): string;
-    export function arch(): string;
-    export function release(): string;
-    export function uptime(): number;
-    export function loadavg(): number[];
-    export function totalmem(): number;
-    export function freemem(): number;
-    export function cpus(): CpuInfo[];
-    export function networkInterfaces(): {[index: string]: NetworkInterfaceInfo[]};
-    export var EOL: string;
-}
-
-declare module "https" {
-    import * as tls from "tls";
-    import * as events from "events";
-    import * as http from "http";
-
-    export interface ServerOptions {
-        pfx?: any;
-        key?: any;
-        passphrase?: string;
-        cert?: any;
-        ca?: any;
-        crl?: any;
-        ciphers?: string;
-        honorCipherOrder?: boolean;
-        requestCert?: boolean;
-        rejectUnauthorized?: boolean;
-        NPNProtocols?: any;
-        SNICallback?: (servername: string) => any;
-    }
-
-    export interface RequestOptions extends http.RequestOptions{
-        pfx?: any;
-        key?: any;
-        passphrase?: string;
-        cert?: any;
-        ca?: any;
-        ciphers?: string;
-        rejectUnauthorized?: boolean;
-        secureProtocol?: string;
-    }
-
-    export interface Agent {
-        maxSockets: number;
-        sockets: any;
-        requests: any;
-    }
-    export var Agent: {
-        new (options?: RequestOptions): Agent;
-    };
-    export interface Server extends tls.Server { }
-    export function createServer(options: ServerOptions, requestListener?: Function): Server;
-    export function request(options: RequestOptions, callback?: (res: http.IncomingMessage) =>void ): http.ClientRequest;
-    export function get(options: RequestOptions, callback?: (res: http.IncomingMessage) =>void ): http.ClientRequest;
-    export var globalAgent: Agent;
-}
-
-declare module "punycode" {
-    export function decode(string: string): string;
-    export function encode(string: string): string;
-    export function toUnicode(domain: string): string;
-    export function toASCII(domain: string): string;
-    export var ucs2: ucs2;
-    interface ucs2 {
-        decode(string: string): number[];
-        encode(codePoints: number[]): string;
-    }
-    export var version: any;
-}
-
-declare module "repl" {
-    import * as stream from "stream";
-    import * as events from "events";
-
-    export interface ReplOptions {
-        prompt?: string;
-        input?: NodeJS.ReadableStream;
-        output?: NodeJS.WritableStream;
-        terminal?: boolean;
-        eval?: Function;
-        useColors?: boolean;
-        useGlobal?: boolean;
-        ignoreUndefined?: boolean;
-        writer?: Function;
-    }
-    export function start(options: ReplOptions): events.EventEmitter;
-}
-
-declare module "readline" {
-    import * as events from "events";
-    import * as stream from "stream";
-
-    export interface Key {
-        sequence?: string;
-        name?: string;
-        ctrl?: boolean;
-        meta?: boolean;
-        shift?: boolean;
-    }
-
-    export interface ReadLine extends events.EventEmitter {
-        setPrompt(prompt: string): void;
-        prompt(preserveCursor?: boolean): void;
-        question(query: string, callback: (answer: string) => void): void;
-        pause(): ReadLine;
-        resume(): ReadLine;
-        close(): void;
-        write(data: string|Buffer, key?: Key): void;
-    }
-
-    export interface Completer {
-        (line: string): CompleterResult;
-        (line: string, callback: (err: any, result: CompleterResult) => void): any;
-    }
-
-    export interface CompleterResult {
-        completions: string[];
-        line: string;
-    }
-
-    export interface ReadLineOptions {
-        input: NodeJS.ReadableStream;
-        output?: NodeJS.WritableStream;
-        completer?: Completer;
-        terminal?: boolean;
-        historySize?: number;
-    }
-
-    export function createInterface(input: NodeJS.ReadableStream, output?: NodeJS.WritableStream, completer?: Completer, terminal?: boolean): ReadLine;
-    export function createInterface(options: ReadLineOptions): ReadLine;
-
-    export function cursorTo(stream: NodeJS.WritableStream, x: number, y: number): void;
-    export function moveCursor(stream: NodeJS.WritableStream, dx: number|string, dy: number|string): void;
-    export function clearLine(stream: NodeJS.WritableStream, dir: number): void;
-    export function clearScreenDown(stream: NodeJS.WritableStream): void;
-}
-
-declare module "vm" {
-    export interface Context { }
-    export interface ScriptOptions {
-        filename?: string;
-        lineOffset?: number;
-        columnOffset?: number;
-        displayErrors?: boolean;
-        timeout?: number;
-        cachedData?: Buffer;
-        produceCachedData?: boolean;
-    }
-    export interface RunningScriptOptions {
-        filename?: string;
-        lineOffset?: number;
-        columnOffset?: number;
-        displayErrors?: boolean;
-        timeout?: number;
-    }
-    export class Script {
-        constructor(code: string, options?: ScriptOptions);
-        runInContext(contextifiedSandbox: Context, options?: RunningScriptOptions): any;
-        runInNewContext(sandbox?: Context, options?: RunningScriptOptions): any;
-        runInThisContext(options?: RunningScriptOptions): any;
-    }
-    export function createContext(sandbox?: Context): Context;
-    export function isContext(sandbox: Context): boolean;
-    export function runInContext(code: string, contextifiedSandbox: Context, options?: RunningScriptOptions): any;
-    export function runInDebugContext(code: string): any;
-    export function runInNewContext(code: string, sandbox?: Context, options?: RunningScriptOptions): any;
-    export function runInThisContext(code: string, options?: RunningScriptOptions): any;
-}
-
-declare module "child_process" {
-    import * as events from "events";
-    import * as stream from "stream";
-
-    export interface ChildProcess extends events.EventEmitter {
-        stdin:  stream.Writable;
-        stdout: stream.Readable;
-        stderr: stream.Readable;
-        stdio: [stream.Writable, stream.Readable, stream.Readable];
-        pid: number;
-        kill(signal?: string): void;
-        send(message: any, sendHandle?: any): void;
-        disconnect(): void;
-        unref(): void;
-    }
-
-    export interface SpawnOptions {
-        cwd?: string;
-        env?: any;
-        stdio?: any;
-        detached?: boolean;
-        uid?: number;
-        gid?: number;
-        shell?: boolean | string;
-    }
-    export function spawn(command: string, args?: string[], options?: SpawnOptions): ChildProcess;
-
-    export interface ExecOptions {
-        cwd?: string;
-        env?: any;
-        shell?: string;
-        timeout?: number;
-        maxBuffer?: number;
-        killSignal?: string;
-        uid?: number;
-        gid?: number;
-    }
-    export interface ExecOptionsWithStringEncoding extends ExecOptions {
-        encoding: BufferEncoding;
-    }
-    export interface ExecOptionsWithBufferEncoding extends ExecOptions {
-        encoding: string; // specify `null`.
-    }
-    export function exec(command: string, callback?: (error: Error, stdout: string, stderr: string) =>void ): ChildProcess;
-    export function exec(command: string, options: ExecOptionsWithStringEncoding, callback?: (error: Error, stdout: string, stderr: string) =>void ): ChildProcess;
-    // usage. child_process.exec("tsc", {encoding: null as string}, (err, stdout, stderr) => {});
-    export function exec(command: string, options: ExecOptionsWithBufferEncoding, callback?: (error: Error, stdout: Buffer, stderr: Buffer) =>void ): ChildProcess;
-    export function exec(command: string, options: ExecOptions, callback?: (error: Error, stdout: string, stderr: string) =>void ): ChildProcess;
-
-    export interface ExecFileOptions {
-        cwd?: string;
-        env?: any;
-        timeout?: number;
-        maxBuffer?: number;
-        killSignal?: string;
-        uid?: number;
-        gid?: number;
-    }
-    export interface ExecFileOptionsWithStringEncoding extends ExecFileOptions {
-        encoding: BufferEncoding;
-    }
-    export interface ExecFileOptionsWithBufferEncoding extends ExecFileOptions {
-        encoding: string; // specify `null`.
-    }
-    export function execFile(file: string, callback?: (error: Error, stdout: string, stderr: string) =>void ): ChildProcess;
-    export function execFile(file: string, options?: ExecFileOptionsWithStringEncoding, callback?: (error: Error, stdout: string, stderr: string) =>void ): ChildProcess;
-    // usage. child_process.execFile("file.sh", {encoding: null as string}, (err, stdout, stderr) => {});
-    export function execFile(file: string, options?: ExecFileOptionsWithBufferEncoding, callback?: (error: Error, stdout: Buffer, stderr: Buffer) =>void ): ChildProcess;
-    export function execFile(file: string, options?: ExecFileOptions, callback?: (error: Error, stdout: string, stderr: string) =>void ): ChildProcess;
-    export function execFile(file: string, args?: string[], callback?: (error: Error, stdout: string, stderr: string) =>void ): ChildProcess;
-    export function execFile(file: string, args?: string[], options?: ExecFileOptionsWithStringEncoding, callback?: (error: Error, stdout: string, stderr: string) =>void ): ChildProcess;
-    // usage. child_process.execFile("file.sh", ["foo"], {encoding: null as string}, (err, stdout, stderr) => {});
-    export function execFile(file: string, args?: string[], options?: ExecFileOptionsWithBufferEncoding, callback?: (error: Error, stdout: Buffer, stderr: Buffer) =>void ): ChildProcess;
-    export function execFile(file: string, args?: string[], options?: ExecFileOptions, callback?: (error: Error, stdout: string, stderr: string) =>void ): ChildProcess;
-
-    export interface ForkOptions {
-        cwd?: string;
-        env?: any;
-        execPath?: string;
-        execArgv?: string[];
-        silent?: boolean;
-        uid?: number;
-        gid?: number;
-    }
-    export function fork(modulePath: string, args?: string[], options?: ForkOptions): ChildProcess;
-
-    export interface SpawnSyncOptions {
-        cwd?: string;
-        input?: string | Buffer;
-        stdio?: any;
-        env?: any;
-        uid?: number;
-        gid?: number;
-        timeout?: number;
-        killSignal?: string;
-        maxBuffer?: number;
-        encoding?: string;
-        shell?: boolean | string;
-    }
-    export interface SpawnSyncOptionsWithStringEncoding extends SpawnSyncOptions {
-        encoding: BufferEncoding;
-    }
-    export interface SpawnSyncOptionsWithBufferEncoding extends SpawnSyncOptions {
-        encoding: string; // specify `null`.
-    }
-    export interface SpawnSyncReturns<T> {
-        pid: number;
-        output: string[];
-        stdout: T;
-        stderr: T;
-        status: number;
-        signal: string;
-        error: Error;
-    }
-    export function spawnSync(command: string): SpawnSyncReturns<Buffer>;
-    export function spawnSync(command: string, options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
-    export function spawnSync(command: string, options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
-    export function spawnSync(command: string, options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
-    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
-    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
-    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
-
-    export interface ExecSyncOptions {
-        cwd?: string;
-        input?: string | Buffer;
-        stdio?: any;
-        env?: any;
-        shell?: string;
-        uid?: number;
-        gid?: number;
-        timeout?: number;
-        killSignal?: string;
-        maxBuffer?: number;
-        encoding?: string;
-    }
-    export interface ExecSyncOptionsWithStringEncoding extends ExecSyncOptions {
-        encoding: BufferEncoding;
-    }
-    export interface ExecSyncOptionsWithBufferEncoding extends ExecSyncOptions {
-        encoding: string; // specify `null`.
-    }
-    export function execSync(command: string): Buffer;
-    export function execSync(command: string, options?: ExecSyncOptionsWithStringEncoding): string;
-    export function execSync(command: string, options?: ExecSyncOptionsWithBufferEncoding): Buffer;
-    export function execSync(command: string, options?: ExecSyncOptions): Buffer;
-
-    export interface ExecFileSyncOptions {
-        cwd?: string;
-        input?: string | Buffer;
-        stdio?: any;
-        env?: any;
-        uid?: number;
-        gid?: number;
-        timeout?: number;
-        killSignal?: string;
-        maxBuffer?: number;
-        encoding?: string;
-    }
-    export interface ExecFileSyncOptionsWithStringEncoding extends ExecFileSyncOptions {
-        encoding: BufferEncoding;
-    }
-    export interface ExecFileSyncOptionsWithBufferEncoding extends ExecFileSyncOptions {
-        encoding: string; // specify `null`.
-    }
-    export function execFileSync(command: string): Buffer;
-    export function execFileSync(command: string, options?: ExecFileSyncOptionsWithStringEncoding): string;
-    export function execFileSync(command: string, options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
-    export function execFileSync(command: string, options?: ExecFileSyncOptions): Buffer;
-    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptionsWithStringEncoding): string;
-    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
-    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptions): Buffer;
-}
-
-declare module "url" {
-    export interface Url {
-        href?: string;
-        protocol?: string;
-        auth?: string;
-        hostname?: string;
-        port?: string;
-        host?: string;
-        pathname?: string;
-        search?: string;
-        query?: any; // string | Object
-        slashes?: boolean;
-        hash?: string;
-        path?: string;
-    }
-
-    export function parse(urlStr: string, parseQueryString?: boolean , slashesDenoteHost?: boolean ): Url;
-    export function format(url: Url): string;
-    export function resolve(from: string, to: string): string;
-}
-
-declare module "dns" {
-    export function lookup(domain: string, family: number, callback: (err: Error, address: string, family: number) =>void ): string;
-    export function lookup(domain: string, callback: (err: Error, address: string, family: number) =>void ): string;
-    export function resolve(domain: string, rrtype: string, callback: (err: Error, addresses: string[]) =>void ): string[];
-    export function resolve(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
-    export function resolve4(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
-    export function resolve6(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
-    export function resolveMx(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
-    export function resolveTxt(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
-    export function resolveSrv(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
-    export function resolveNs(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
-    export function resolveCname(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[];
-    export function reverse(ip: string, callback: (err: Error, domains: string[]) =>void ): string[];
-}
-
-declare module "net" {
-    import * as stream from "stream";
-
-    export interface Socket extends stream.Duplex {
-        // Extended base methods
-        write(buffer: Buffer): boolean;
-        write(buffer: Buffer, cb?: Function): boolean;
-        write(str: string, cb?: Function): boolean;
-        write(str: string, encoding?: string, cb?: Function): boolean;
-        write(str: string, encoding?: string, fd?: string): boolean;
-
-        connect(port: number, host?: string, connectionListener?: Function): void;
-        connect(path: string, connectionListener?: Function): void;
-        bufferSize: number;
-        setEncoding(encoding?: string): void;
-        write(data: any, encoding?: string, callback?: Function): void;
-        destroy(): void;
-        pause(): void;
-        resume(): void;
-        setTimeout(timeout: number, callback?: Function): void;
-        setNoDelay(noDelay?: boolean): void;
-        setKeepAlive(enable?: boolean, initialDelay?: number): void;
-        address(): { port: number; family: string; address: string; };
-        unref(): void;
-        ref(): void;
-
-        remoteAddress: string;
-        remoteFamily: string;
-        remotePort: number;
-        localAddress: string;
-        localPort: number;
-        bytesRead: number;
-        bytesWritten: number;
-
-        // Extended base methods
-        end(): void;
-        end(buffer: Buffer, cb?: Function): void;
-        end(str: string, cb?: Function): void;
-        end(str: string, encoding?: string, cb?: Function): void;
-        end(data?: any, encoding?: string): void;
-    }
-
-    export var Socket: {
-        new (options?: { fd?: string; type?: string; allowHalfOpen?: boolean; }): Socket;
-    };
-
-    export interface ListenOptions {
-        port?: number;
-        host?: string;
-        backlog?: number;
-        path?: string;
-        exclusive?: boolean;
-    }
-
-    export interface Server extends Socket {
-        listen(port: number, hostname?: string, backlog?: number, listeningListener?: Function): Server;
-        listen(port: number, hostname?: string, listeningListener?: Function): Server;
-        listen(port: number, backlog?: number, listeningListener?: Function): Server;
-        listen(port: number, listeningListener?: Function): Server;
-        listen(path: string, backlog?: number, listeningListener?: Function): Server;
-        listen(path: string, listeningListener?: Function): Server;
-        listen(handle: any, backlog?: number, listeningListener?: Function): Server;
-        listen(handle: any, listeningListener?: Function): Server;
-        listen(options: ListenOptions, listeningListener?: Function): Server;
-        close(callback?: Function): Server;
-        address(): { port: number; family: string; address: string; };
-        getConnections(cb: (error: Error, count: number) => void): void;
-        ref(): Server;
-        unref(): Server;
-        maxConnections: number;
-        connections: number;
-    }
-    export function createServer(connectionListener?: (socket: Socket) =>void ): Server;
-    export function createServer(options?: { allowHalfOpen?: boolean; }, connectionListener?: (socket: Socket) =>void ): Server;
-    export function connect(options: { port: number, host?: string, localAddress? : string, localPort? : string, family? : number, allowHalfOpen?: boolean; }, connectionListener?: Function): Socket;
-    export function connect(port: number, host?: string, connectionListener?: Function): Socket;
-    export function connect(path: string, connectionListener?: Function): Socket;
-    export function createConnection(options: { port: number, host?: string, localAddress? : string, localPort? : string, family? : number, allowHalfOpen?: boolean; }, connectionListener?: Function): Socket;
-    export function createConnection(port: number, host?: string, connectionListener?: Function): Socket;
-    export function createConnection(path: string, connectionListener?: Function): Socket;
-    export function isIP(input: string): number;
-    export function isIPv4(input: string): boolean;
-    export function isIPv6(input: string): boolean;
-}
-
-declare module "dgram" {
-    import * as events from "events";
-
-    interface RemoteInfo {
-        address: string;
-        port: number;
-        size: number;
-    }
-
-    interface AddressInfo {
-        address: string;
-        family: string;
-        port: number;
-    }
-
-    export function createSocket(type: string, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
-
-    interface Socket extends events.EventEmitter {
-        send(buf: Buffer, offset: number, length: number, port: number, address: string, callback?: (error: Error, bytes: number) => void): void;
-        bind(port: number, address?: string, callback?: () => void): void;
-        close(): void;
-        address(): AddressInfo;
-        setBroadcast(flag: boolean): void;
-        setMulticastTTL(ttl: number): void;
-        setMulticastLoopback(flag: boolean): void;
-        addMembership(multicastAddress: string, multicastInterface?: string): void;
-        dropMembership(multicastAddress: string, multicastInterface?: string): void;
-    }
-}
-
-declare module "fs" {
-    import * as stream from "stream";
-    import * as events from "events";
-
-    interface Stats {
-        isFile(): boolean;
-        isDirectory(): boolean;
-        isBlockDevice(): boolean;
-        isCharacterDevice(): boolean;
-        isSymbolicLink(): boolean;
-        isFIFO(): boolean;
-        isSocket(): boolean;
-        dev: number;
-        ino: number;
-        mode: number;
-        nlink: number;
-        uid: number;
-        gid: number;
-        rdev: number;
-        size: number;
-        blksize: number;
-        blocks: number;
-        atime: Date;
-        mtime: Date;
-        ctime: Date;
-        birthtime: Date;
-    }
-
-    interface FSWatcher extends events.EventEmitter {
-        close(): void;
-    }
-
-    export interface ReadStream extends stream.Readable {
-        close(): void;
-    }
-    export interface WriteStream extends stream.Writable {
-        close(): void;
-        bytesWritten: number;
-    }
-
-    /**
-     * Asynchronous rename.
-     * @param oldPath
-     * @param newPath
-     * @param callback No arguments other than a possible exception are given to the completion callback.
-     */
-    export function rename(oldPath: string, newPath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    /**
-     * Synchronous rename
-     * @param oldPath
-     * @param newPath
-     */
-    export function renameSync(oldPath: string, newPath: string): void;
-    export function truncate(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function truncate(path: string, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function truncateSync(path: string, len?: number): void;
-    export function ftruncate(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function ftruncate(fd: number, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function ftruncateSync(fd: number, len?: number): void;
-    export function chown(path: string, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function chownSync(path: string, uid: number, gid: number): void;
-    export function fchown(fd: number, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function fchownSync(fd: number, uid: number, gid: number): void;
-    export function lchown(path: string, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function lchownSync(path: string, uid: number, gid: number): void;
-    export function chmod(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function chmod(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function chmodSync(path: string, mode: number): void;
-    export function chmodSync(path: string, mode: string): void;
-    export function fchmod(fd: number, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function fchmod(fd: number, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function fchmodSync(fd: number, mode: number): void;
-    export function fchmodSync(fd: number, mode: string): void;
-    export function lchmod(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function lchmod(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function lchmodSync(path: string, mode: number): void;
-    export function lchmodSync(path: string, mode: string): void;
-    export function stat(path: string, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
-    export function lstat(path: string, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
-    export function fstat(fd: number, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
-    export function statSync(path: string): Stats;
-    export function lstatSync(path: string): Stats;
-    export function fstatSync(fd: number): Stats;
-    export function link(srcpath: string, dstpath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function linkSync(srcpath: string, dstpath: string): void;
-    export function symlink(srcpath: string, dstpath: string, type?: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function symlinkSync(srcpath: string, dstpath: string, type?: string): void;
-    export function readlink(path: string, callback?: (err: NodeJS.ErrnoException, linkString: string) => any): void;
-    export function readlinkSync(path: string): string;
-    export function realpath(path: string, callback?: (err: NodeJS.ErrnoException, resolvedPath: string) => any): void;
-    export function realpath(path: string, cache: {[path: string]: string}, callback: (err: NodeJS.ErrnoException, resolvedPath: string) =>any): void;
-    export function realpathSync(path: string, cache?: { [path: string]: string }): string;
-    /*
-     * Asynchronous unlink - deletes the file specified in {path}
-     *
-     * @param path
-     * @param callback No arguments other than a possible exception are given to the completion callback.
-     */
-    export function unlink(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    /*
-     * Synchronous unlink - deletes the file specified in {path}
-     *
-     * @param path
-     */
-    export function unlinkSync(path: string): void;
-    /*
-     * Asynchronous rmdir - removes the directory specified in {path}
-     *
-     * @param path
-     * @param callback No arguments other than a possible exception are given to the completion callback.
-     */
-    export function rmdir(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    /*
-     * Synchronous rmdir - removes the directory specified in {path}
-     *
-     * @param path
-     */
-    export function rmdirSync(path: string): void;
-    /*
-     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param callback No arguments other than a possible exception are given to the completion callback.
-     */
-    export function mkdir(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    /*
-     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param mode
-     * @param callback No arguments other than a possible exception are given to the completion callback.
-     */
-    export function mkdir(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    /*
-     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param mode
-     * @param callback No arguments other than a possible exception are given to the completion callback.
-     */
-    export function mkdir(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    /*
-     * Synchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param mode
-     * @param callback No arguments other than a possible exception are given to the completion callback.
-     */
-    export function mkdirSync(path: string, mode?: number): void;
-    /*
-     * Synchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
-     *
-     * @param path
-     * @param mode
-     * @param callback No arguments other than a possible exception are given to the completion callback.
-     */
-    export function mkdirSync(path: string, mode?: string): void;
-    export function readdir(path: string, callback?: (err: NodeJS.ErrnoException, files: string[]) => void): void;
-    export function readdirSync(path: string): string[];
-    export function close(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function closeSync(fd: number): void;
-    export function open(path: string, flags: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
-    export function open(path: string, flags: string, mode: number, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
-    export function open(path: string, flags: string, mode: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
-    export function openSync(path: string, flags: string, mode?: number): number;
-    export function openSync(path: string, flags: string, mode?: string): number;
-    export function utimes(path: string, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function utimes(path: string, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function utimesSync(path: string, atime: number, mtime: number): void;
-    export function utimesSync(path: string, atime: Date, mtime: Date): void;
-    export function futimes(fd: number, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function futimes(fd: number, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function futimesSync(fd: number, atime: number, mtime: number): void;
-    export function futimesSync(fd: number, atime: Date, mtime: Date): void;
-    export function fsync(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-    export function fsyncSync(fd: number): void;
-    export function write(fd: number, buffer: Buffer, offset: number, length: number, position: number, callback?: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
-    export function write(fd: number, buffer: Buffer, offset: number, length: number, callback?: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
-    export function write(fd: number, data: any, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
-    export function write(fd: number, data: any, offset: number, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
-    export function write(fd: number, data: any, offset: number, encoding: string, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
-    export function writeSync(fd: number, buffer: Buffer, offset: number, length: number, position?: number): number;
-    export function writeSync(fd: number, data: any, position?: number, enconding?: string): number;
-    export function read(fd: number, buffer: Buffer, offset: number, length: number, position: number, callback?: (err: NodeJS.ErrnoException, bytesRead: number, buffer: Buffer) => void): void;
-    export function readSync(fd: number, buffer: Buffer, offset: number, length: number, position: number): number;
-    /*
-     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param encoding
-     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
-     */
-    export function readFile(filename: string, encoding: string, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
-    /*
-     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
-     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
-     */
-    export function readFile(filename: string, options: { encoding: string; flag?: string; }, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
-    /*
-     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
-     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
-     */
-    export function readFile(filename: string, options: { flag?: string; }, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
-    /*
-     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
-     */
-    export function readFile(filename: string, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
-    /*
-     * Synchronous readFile - Synchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param encoding
-     */
-    export function readFileSync(filename: string, encoding: string): string;
-    /*
-     * Synchronous readFile - Synchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFileSync returns a string; otherwise it returns a Buffer.
-     */
-    export function readFileSync(filename: string, options: { encoding: string; flag?: string; }): string;
-    /*
-     * Synchronous readFile - Synchronously reads the entire contents of a file.
-     *
-     * @param fileName
-     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFileSync returns a string; otherwise it returns a Buffer.
-     */
-    export function readFileSync(filename: string, options?: { flag?: string; }): Buffer;
-    export function writeFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
-    export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-    export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-    export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
-    export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
-    export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-    export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-    export function appendFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
-    export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
-    export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
-    export function watchFile(filename: string, listener: (curr: Stats, prev: Stats) => void): void;
-    export function watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: (curr: Stats, prev: Stats) => void): void;
-    export function unwatchFile(filename: string, listener?: (curr: Stats, prev: Stats) => void): void;
-    export function watch(filename: string, listener?: (event: string, filename: string) => any): FSWatcher;
-    export function watch(filename: string, options: { persistent?: boolean; }, listener?: (event: string, filename: string) => any): FSWatcher;
-    export function exists(path: string, callback?: (exists: boolean) => void): void;
-    export function existsSync(path: string): boolean;
-    /** Constant for fs.access(). File is visible to the calling process. */
-    export var F_OK: number;
-    /** Constant for fs.access(). File can be read by the calling process. */
-    export var R_OK: number;
-    /** Constant for fs.access(). File can be written by the calling process. */
-    export var W_OK: number;
-    /** Constant for fs.access(). File can be executed by the calling process. */
-    export var X_OK: number;
-    /** Tests a user's permissions for the file specified by path. */
-    export function access(path: string, callback: (err: NodeJS.ErrnoException) => void): void;
-    export function access(path: string, mode: number, callback: (err: NodeJS.ErrnoException) => void): void;
-    /** Synchronous version of fs.access. This throws if any accessibility checks fail, and does nothing otherwise. */
-    export function accessSync(path: string, mode ?: number): void;
-    export function createReadStream(path: string, options?: {
-        flags?: string;
-        encoding?: string;
-        fd?: number;
-        mode?: number;
-        autoClose?: boolean;
-    }): ReadStream;
-    export function createWriteStream(path: string, options?: {
-        flags?: string;
-        encoding?: string;
-        fd?: number;
-        mode?: number;
-    }): WriteStream;
-}
-
-declare module "path" {
-
-    /**
-     * A parsed path object generated by path.parse() or consumed by path.format().
-     */
-    export interface ParsedPath {
-        /**
-         * The root of the path such as '/' or 'c:\'
-         */
-        root: string;
-        /**
-         * The full directory path such as '/home/user/dir' or 'c:\path\dir'
-         */
-        dir: string;
-        /**
-         * The file name including extension (if any) such as 'index.html'
-         */
-        base: string;
-        /**
-         * The file extension (if any) such as '.html'
-         */
-        ext: string;
-        /**
-         * The file name without extension (if any) such as 'index'
-         */
-        name: string;
-    }
-
-    /**
-     * Normalize a string path, reducing '..' and '.' parts.
-     * When multiple slashes are found, they're replaced by a single one; when the path contains a trailing slash, it is preserved. On Windows backslashes are used.
-     *
-     * @param p string path to normalize.
-     */
-    export function normalize(p: string): string;
-    /**
-     * Join all arguments together and normalize the resulting path.
-     * Arguments must be strings. In v0.8, non-string arguments were silently ignored. In v0.10 and up, an exception is thrown.
-     *
-     * @param paths string paths to join.
-     */
-    export function join(...paths: any[]): string;
-    /**
-     * Join all arguments together and normalize the resulting path.
-     * Arguments must be strings. In v0.8, non-string arguments were silently ignored. In v0.10 and up, an exception is thrown.
-     *
-     * @param paths string paths to join.
-     */
-    export function join(...paths: string[]): string;
-    /**
-     * The right-most parameter is considered {to}.  Other parameters are considered an array of {from}.
-     *
-     * Starting from leftmost {from} paramter, resolves {to} to an absolute path.
-     *
-     * If {to} isn't already absolute, {from} arguments are prepended in right to left order, until an absolute path is found. If after using all {from} paths still no absolute path is found, the current working directory is used as well. The resulting path is normalized, and trailing slashes are removed unless the path gets resolved to the root directory.
-     *
-     * @param pathSegments string paths to join.  Non-string arguments are ignored.
-     */
-    export function resolve(...pathSegments: any[]): string;
-    /**
-     * Determines whether {path} is an absolute path. An absolute path will always resolve to the same location, regardless of the working directory.
-     *
-     * @param path path to test.
-     */
-    export function isAbsolute(path: string): boolean;
-    /**
-     * Solve the relative path from {from} to {to}.
-     * At times we have two absolute paths, and we need to derive the relative path from one to the other. This is actually the reverse transform of path.resolve.
-     *
-     * @param from
-     * @param to
-     */
-    export function relative(from: string, to: string): string;
-    /**
-     * Return the directory name of a path. Similar to the Unix dirname command.
-     *
-     * @param p the path to evaluate.
-     */
-    export function dirname(p: string): string;
-    /**
-     * Return the last portion of a path. Similar to the Unix basename command.
-     * Often used to extract the file name from a fully qualified path.
-     *
-     * @param p the path to evaluate.
-     * @param ext optionally, an extension to remove from the result.
-     */
-    export function basename(p: string, ext?: string): string;
-    /**
-     * Return the extension of the path, from the last '.' to end of string in the last portion of the path.
-     * If there is no '.' in the last portion of the path or the first character of it is '.', then it returns an empty string
-     *
-     * @param p the path to evaluate.
-     */
-    export function extname(p: string): string;
-    /**
-     * The platform-specific file separator. '\\' or '/'.
-     */
-    export var sep: string;
-    /**
-     * The platform-specific file delimiter. ';' or ':'.
-     */
-    export var delimiter: string;
-    /**
-     * Returns an object from a path string - the opposite of format().
-     *
-     * @param pathString path to evaluate.
-     */
-    export function parse(pathString: string): ParsedPath;
-    /**
-     * Returns a path string from an object - the opposite of parse().
-     *
-     * @param pathString path to evaluate.
-     */
-    export function format(pathObject: ParsedPath): string;
-
-    export module posix {
-      export function normalize(p: string): string;
-      export function join(...paths: any[]): string;
-      export function resolve(...pathSegments: any[]): string;
-      export function isAbsolute(p: string): boolean;
-      export function relative(from: string, to: string): string;
-      export function dirname(p: string): string;
-      export function basename(p: string, ext?: string): string;
-      export function extname(p: string): string;
-      export var sep: string;
-      export var delimiter: string;
-      export function parse(p: string): ParsedPath;
-      export function format(pP: ParsedPath): string;
-    }
-
-    export module win32 {
-      export function normalize(p: string): string;
-      export function join(...paths: any[]): string;
-      export function resolve(...pathSegments: any[]): string;
-      export function isAbsolute(p: string): boolean;
-      export function relative(from: string, to: string): string;
-      export function dirname(p: string): string;
-      export function basename(p: string, ext?: string): string;
-      export function extname(p: string): string;
-      export var sep: string;
-      export var delimiter: string;
-      export function parse(p: string): ParsedPath;
-      export function format(pP: ParsedPath): string;
-    }
-}
-
-declare module "string_decoder" {
-    export interface NodeStringDecoder {
-        write(buffer: Buffer): string;
-        detectIncompleteChar(buffer: Buffer): number;
-    }
-    export var StringDecoder: {
-        new (encoding: string): NodeStringDecoder;
-    };
-}
-
-declare module "tls" {
-    import * as crypto from "crypto";
-    import * as net from "net";
-    import * as stream from "stream";
-
-    var CLIENT_RENEG_LIMIT: number;
-    var CLIENT_RENEG_WINDOW: number;
-
-    export interface TlsOptions {
-        host?: string;
-        port?: number;
-        pfx?: any;   //string or buffer
-        key?: any;   //string or buffer
-        passphrase?: string;
-        cert?: any;
-        ca?: any;    //string or buffer
-        crl?: any;   //string or string array
-        ciphers?: string;
-        honorCipherOrder?: any;
-        requestCert?: boolean;
-        rejectUnauthorized?: boolean;
-        NPNProtocols?: any;  //array or Buffer;
-        SNICallback?: (servername: string) => any;
-    }
-
-    export interface ConnectionOptions {
-        host?: string;
-        port?: number;
-        socket?: net.Socket;
-        pfx?: any;   //string | Buffer
-        key?: any;   //string | Buffer
-        passphrase?: string;
-        cert?: any;  //string | Buffer
-        ca?: any;    //Array of string | Buffer
-        rejectUnauthorized?: boolean;
-        NPNProtocols?: any;  //Array of string | Buffer
-        servername?: string;
-    }
-
-    export interface Server extends net.Server {
-        close(): Server;
-        address(): { port: number; family: string; address: string; };
-        addContext(hostName: string, credentials: {
-            key: string;
-            cert: string;
-            ca: string;
-        }): void;
-        maxConnections: number;
-        connections: number;
-    }
-
-    export interface ClearTextStream extends stream.Duplex {
-        authorized: boolean;
-        authorizationError: Error;
-        getPeerCertificate(): any;
-        getCipher: {
-            name: string;
-            version: string;
-        };
-        address: {
-            port: number;
-            family: string;
-            address: string;
-        };
-        remoteAddress: string;
-        remotePort: number;
-    }
-
-    export interface SecurePair {
-        encrypted: any;
-        cleartext: any;
-    }
-
-    export interface SecureContextOptions {
-        pfx?: any;   //string | buffer
-        key?: any;   //string | buffer
-        passphrase?: string;
-        cert?: any;  // string | buffer
-        ca?: any;    // string | buffer
-        crl?: any;   // string | string[]
-        ciphers?: string;
-        honorCipherOrder?: boolean;
-    }
-
-    export interface SecureContext {
-        context: any;
-    }
-
-    export function createServer(options: TlsOptions, secureConnectionListener?: (cleartextStream: ClearTextStream) =>void ): Server;
-    export function connect(options: TlsOptions, secureConnectionListener?: () =>void ): ClearTextStream;
-    export function connect(port: number, host?: string, options?: ConnectionOptions, secureConnectListener?: () =>void ): ClearTextStream;
-    export function connect(port: number, options?: ConnectionOptions, secureConnectListener?: () =>void ): ClearTextStream;
-    export function createSecurePair(credentials?: crypto.Credentials, isServer?: boolean, requestCert?: boolean, rejectUnauthorized?: boolean): SecurePair;
-    export function createSecureContext(details: SecureContextOptions): SecureContext;
-}
-
-declare module "crypto" {
-    export interface CredentialDetails {
-        pfx: string;
-        key: string;
-        passphrase: string;
-        cert: string;
-        ca: any;    //string | string array
-        crl: any;   //string | string array
-        ciphers: string;
-    }
-    export interface Credentials { context?: any; }
-    export function createCredentials(details: CredentialDetails): Credentials;
-    export function createHash(algorithm: string): Hash;
-    export function createHmac(algorithm: string, key: string): Hmac;
-    export function createHmac(algorithm: string, key: Buffer): Hmac;
-    export interface Hash {
-        update(data: any, input_encoding?: string): Hash;
-        digest(encoding: 'buffer'): Buffer;
-        digest(encoding: string): any;
-        digest(): Buffer;
-    }
-    export interface Hmac extends NodeJS.ReadWriteStream {
-        update(data: any, input_encoding?: string): Hmac;
-        digest(encoding: 'buffer'): Buffer;
-        digest(encoding: string): any;
-        digest(): Buffer;
-    }
-    export function createCipher(algorithm: string, password: any): Cipher;
-    export function createCipheriv(algorithm: string, key: any, iv: any): Cipher;
-    export interface Cipher extends NodeJS.ReadWriteStream {
-        update(data: Buffer): Buffer;
-        update(data: string, input_encoding: "utf8"|"ascii"|"binary"): Buffer;
-        update(data: Buffer, input_encoding: any, output_encoding: "binary"|"base64"|"hex"): string;
-        update(data: string, input_encoding: "utf8"|"ascii"|"binary", output_encoding: "binary"|"base64"|"hex"): string;
-        final(): Buffer;
-        final(output_encoding: string): string;
-        setAutoPadding(auto_padding: boolean): void;
-        getAuthTag(): Buffer;
-    }
-    export function createDecipher(algorithm: string, password: any): Decipher;
-    export function createDecipheriv(algorithm: string, key: any, iv: any): Decipher;
-    export interface Decipher extends NodeJS.ReadWriteStream {
-        update(data: Buffer): Buffer;
-        update(data: string, input_encoding: "binary"|"base64"|"hex"): Buffer;
-        update(data: Buffer, input_encoding: any, output_encoding: "utf8"|"ascii"|"binary"): string;
-        update(data: string, input_encoding: "binary"|"base64"|"hex", output_encoding: "utf8"|"ascii"|"binary"): string;
-        final(): Buffer;
-        final(output_encoding: string): string;
-        setAutoPadding(auto_padding: boolean): void;
-        setAuthTag(tag: Buffer): void;
-    }
-    export function createSign(algorithm: string): Signer;
-    export interface Signer extends NodeJS.WritableStream {
-        update(data: any): void;
-        sign(private_key: string, output_format: string): string;
-    }
-    export function createVerify(algorith: string): Verify;
-    export interface Verify extends NodeJS.WritableStream {
-        update(data: any): void;
-        verify(object: string, signature: string, signature_format?: string): boolean;
-    }
-    export function createDiffieHellman(prime_length: number): DiffieHellman;
-    export function createDiffieHellman(prime: number, encoding?: string): DiffieHellman;
-    export interface DiffieHellman {
-        generateKeys(encoding?: string): string;
-        computeSecret(other_public_key: string, input_encoding?: string, output_encoding?: string): string;
-        getPrime(encoding?: string): string;
-        getGenerator(encoding: string): string;
-        getPublicKey(encoding?: string): string;
-        getPrivateKey(encoding?: string): string;
-        setPublicKey(public_key: string, encoding?: string): void;
-        setPrivateKey(public_key: string, encoding?: string): void;
-    }
-    export function getDiffieHellman(group_name: string): DiffieHellman;
-    export function pbkdf2(password: string|Buffer, salt: string|Buffer, iterations: number, keylen: number, callback: (err: Error, derivedKey: Buffer) => any): void;
-    export function pbkdf2(password: string|Buffer, salt: string|Buffer, iterations: number, keylen: number, digest: string, callback: (err: Error, derivedKey: Buffer) => any): void;
-    export function pbkdf2Sync(password: string|Buffer, salt: string|Buffer, iterations: number, keylen: number) : Buffer;
-    export function pbkdf2Sync(password: string|Buffer, salt: string|Buffer, iterations: number, keylen: number, digest: string) : Buffer;
-    export function randomBytes(size: number): Buffer;
-    export function randomBytes(size: number, callback: (err: Error, buf: Buffer) =>void ): void;
-    export function pseudoRandomBytes(size: number): Buffer;
-    export function pseudoRandomBytes(size: number, callback: (err: Error, buf: Buffer) =>void ): void;
-    export interface RsaPublicKey {
-        key: string;
-        padding?: any;
-    }
-    export interface RsaPrivateKey {
-        key: string;
-        passphrase?: string,
-        padding?: any;
-    }
-    export function publicEncrypt(public_key: string|RsaPublicKey, buffer: Buffer): Buffer
-    export function privateDecrypt(private_key: string|RsaPrivateKey, buffer: Buffer): Buffer
-}
-
-declare module "stream" {
-    import * as events from "events";
-
-    export class Stream extends events.EventEmitter {
-        pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
-    }
-
-    export interface ReadableOptions {
-        highWaterMark?: number;
-        encoding?: string;
-        objectMode?: boolean;
-    }
-
-    export class Readable extends events.EventEmitter implements NodeJS.ReadableStream {
-        readable: boolean;
-        constructor(opts?: ReadableOptions);
-        _read(size: number): void;
-        read(size?: number): any;
-        setEncoding(encoding: string): void;
-        pause(): void;
-        resume(): void;
-        pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
-        unpipe<T extends NodeJS.WritableStream>(destination?: T): void;
-        unshift(chunk: any): void;
-        wrap(oldStream: NodeJS.ReadableStream): NodeJS.ReadableStream;
-        push(chunk: any, encoding?: string): boolean;
-    }
-
-    export interface WritableOptions {
-        highWaterMark?: number;
-        decodeStrings?: boolean;
-        objectMode?: boolean;
-    }
-
-    export class Writable extends events.EventEmitter implements NodeJS.WritableStream {
-        writable: boolean;
-        constructor(opts?: WritableOptions);
-        _write(chunk: any, encoding: string, callback: Function): void;
-        write(chunk: any, cb?: Function): boolean;
-        write(chunk: any, encoding?: string, cb?: Function): boolean;
-        end(): void;
-        end(chunk: any, cb?: Function): void;
-        end(chunk: any, encoding?: string, cb?: Function): void;
-    }
-
-    export interface DuplexOptions extends ReadableOptions, WritableOptions {
-        allowHalfOpen?: boolean;
-    }
-
-    // Note: Duplex extends both Readable and Writable.
-    export class Duplex extends Readable implements NodeJS.ReadWriteStream {
-        writable: boolean;
-        constructor(opts?: DuplexOptions);
-        _write(chunk: any, encoding: string, callback: Function): void;
-        write(chunk: any, cb?: Function): boolean;
-        write(chunk: any, encoding?: string, cb?: Function): boolean;
-        end(): void;
-        end(chunk: any, cb?: Function): void;
-        end(chunk: any, encoding?: string, cb?: Function): void;
-    }
-
-    export interface TransformOptions extends ReadableOptions, WritableOptions {}
-
-    // Note: Transform lacks the _read and _write methods of Readable/Writable.
-    export class Transform extends events.EventEmitter implements NodeJS.ReadWriteStream {
-        readable: boolean;
-        writable: boolean;
-        constructor(opts?: TransformOptions);
-        _transform(chunk: any, encoding: string, callback: Function): void;
-        _flush(callback: Function): void;
-        read(size?: number): any;
-        setEncoding(encoding: string): void;
-        pause(): void;
-        resume(): void;
-        pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
-        unpipe<T extends NodeJS.WritableStream>(destination?: T): void;
-        unshift(chunk: any): void;
-        wrap(oldStream: NodeJS.ReadableStream): NodeJS.ReadableStream;
-        push(chunk: any, encoding?: string): boolean;
-        write(chunk: any, cb?: Function): boolean;
-        write(chunk: any, encoding?: string, cb?: Function): boolean;
-        end(): void;
-        end(chunk: any, cb?: Function): void;
-        end(chunk: any, encoding?: string, cb?: Function): void;
-    }
-
-    export class PassThrough extends Transform {}
-}
-
-declare module "util" {
-    export interface InspectOptions {
-        showHidden?: boolean;
-        depth?: number;
-        colors?: boolean;
-        customInspect?: boolean;
-    }
-
-    export function format(format: any, ...param: any[]): string;
-    export function debug(string: string): void;
-    export function error(...param: any[]): void;
-    export function puts(...param: any[]): void;
-    export function print(...param: any[]): void;
-    export function log(string: string): void;
-    export function inspect(object: any, showHidden?: boolean, depth?: number, color?: boolean): string;
-    export function inspect(object: any, options: InspectOptions): string;
-    export function isArray(object: any): boolean;
-    export function isRegExp(object: any): boolean;
-    export function isDate(object: any): boolean;
-    export function isError(object: any): boolean;
-    export function inherits(constructor: any, superConstructor: any): void;
-    export function debuglog(key:string): (msg:string,...param: any[])=>void;
-}
-
-declare module "assert" {
-    function internal (value: any, message?: string): void;
-    namespace internal {
-        export class AssertionError implements Error {
-            name: string;
-            message: string;
-            actual: any;
-            expected: any;
-            operator: string;
-            generatedMessage: boolean;
-
-            constructor(options?: {message?: string; actual?: any; expected?: any;
-                                  operator?: string; stackStartFunction?: Function});
-        }
-
-        export function fail(actual?: any, expected?: any, message?: string, operator?: string): void;
-        export function ok(value: any, message?: string): void;
-        export function equal(actual: any, expected: any, message?: string): void;
-        export function notEqual(actual: any, expected: any, message?: string): void;
-        export function deepEqual(actual: any, expected: any, message?: string): void;
-        export function notDeepEqual(acutal: any, expected: any, message?: string): void;
-        export function strictEqual(actual: any, expected: any, message?: string): void;
-        export function notStrictEqual(actual: any, expected: any, message?: string): void;
-        export function deepStrictEqual(actual: any, expected: any, message?: string): void;
-        export function notDeepStrictEqual(actual: any, expected: any, message?: string): void;
-        export var throws: {
-            (block: Function, message?: string): void;
-            (block: Function, error: Function, message?: string): void;
-            (block: Function, error: RegExp, message?: string): void;
-            (block: Function, error: (err: any) => boolean, message?: string): void;
-        };
-
-        export var doesNotThrow: {
-            (block: Function, message?: string): void;
-            (block: Function, error: Function, message?: string): void;
-            (block: Function, error: RegExp, message?: string): void;
-            (block: Function, error: (err: any) => boolean, message?: string): void;
-        };
-
-        export function ifError(value: any): void;
-    }
-
-    export = internal;
-}
-
-declare module "tty" {
-    import * as net from "net";
-
-    export function isatty(fd: number): boolean;
-    export interface ReadStream extends net.Socket {
-        isRaw: boolean;
-        setRawMode(mode: boolean): void;
-        isTTY: boolean;
-    }
-    export interface WriteStream extends net.Socket {
-        columns: number;
-        rows: number;
-        isTTY: boolean;
-    }
-}
-
-declare module "domain" {
-    import * as events from "events";
-
-    export class Domain extends events.EventEmitter implements NodeJS.Domain {
-        run(fn: Function): void;
-        add(emitter: events.EventEmitter): void;
-        remove(emitter: events.EventEmitter): void;
-        bind(cb: (err: Error, data: any) => any): any;
-        intercept(cb: (data: any) => any): any;
-        dispose(): void;
-    }
-
-    export function create(): Domain;
-}
-
-declare module "constants" {
-    export var E2BIG: number;
-    export var EACCES: number;
-    export var EADDRINUSE: number;
-    export var EADDRNOTAVAIL: number;
-    export var EAFNOSUPPORT: number;
-    export var EAGAIN: number;
-    export var EALREADY: number;
-    export var EBADF: number;
-    export var EBADMSG: number;
-    export var EBUSY: number;
-    export var ECANCELED: number;
-    export var ECHILD: number;
-    export var ECONNABORTED: number;
-    export var ECONNREFUSED: number;
-    export var ECONNRESET: number;
-    export var EDEADLK: number;
-    export var EDESTADDRREQ: number;
-    export var EDOM: number;
-    export var EEXIST: number;
-    export var EFAULT: number;
-    export var EFBIG: number;
-    export var EHOSTUNREACH: number;
-    export var EIDRM: number;
-    export var EILSEQ: number;
-    export var EINPROGRESS: number;
-    export var EINTR: number;
-    export var EINVAL: number;
-    export var EIO: number;
-    export var EISCONN: number;
-    export var EISDIR: number;
-    export var ELOOP: number;
-    export var EMFILE: number;
-    export var EMLINK: number;
-    export var EMSGSIZE: number;
-    export var ENAMETOOLONG: number;
-    export var ENETDOWN: number;
-    export var ENETRESET: number;
-    export var ENETUNREACH: number;
-    export var ENFILE: number;
-    export var ENOBUFS: number;
-    export var ENODATA: number;
-    export var ENODEV: number;
-    export var ENOENT: number;
-    export var ENOEXEC: number;
-    export var ENOLCK: number;
-    export var ENOLINK: number;
-    export var ENOMEM: number;
-    export var ENOMSG: number;
-    export var ENOPROTOOPT: number;
-    export var ENOSPC: number;
-    export var ENOSR: number;
-    export var ENOSTR: number;
-    export var ENOSYS: number;
-    export var ENOTCONN: number;
-    export var ENOTDIR: number;
-    export var ENOTEMPTY: number;
-    export var ENOTSOCK: number;
-    export var ENOTSUP: number;
-    export var ENOTTY: number;
-    export var ENXIO: number;
-    export var EOPNOTSUPP: number;
-    export var EOVERFLOW: number;
-    export var EPERM: number;
-    export var EPIPE: number;
-    export var EPROTO: number;
-    export var EPROTONOSUPPORT: number;
-    export var EPROTOTYPE: number;
-    export var ERANGE: number;
-    export var EROFS: number;
-    export var ESPIPE: number;
-    export var ESRCH: number;
-    export var ETIME: number;
-    export var ETIMEDOUT: number;
-    export var ETXTBSY: number;
-    export var EWOULDBLOCK: number;
-    export var EXDEV: number;
-    export var WSAEINTR: number;
-    export var WSAEBADF: number;
-    export var WSAEACCES: number;
-    export var WSAEFAULT: number;
-    export var WSAEINVAL: number;
-    export var WSAEMFILE: number;
-    export var WSAEWOULDBLOCK: number;
-    export var WSAEINPROGRESS: number;
-    export var WSAEALREADY: number;
-    export var WSAENOTSOCK: number;
-    export var WSAEDESTADDRREQ: number;
-    export var WSAEMSGSIZE: number;
-    export var WSAEPROTOTYPE: number;
-    export var WSAENOPROTOOPT: number;
-    export var WSAEPROTONOSUPPORT: number;
-    export var WSAESOCKTNOSUPPORT: number;
-    export var WSAEOPNOTSUPP: number;
-    export var WSAEPFNOSUPPORT: number;
-    export var WSAEAFNOSUPPORT: number;
-    export var WSAEADDRINUSE: number;
-    export var WSAEADDRNOTAVAIL: number;
-    export var WSAENETDOWN: number;
-    export var WSAENETUNREACH: number;
-    export var WSAENETRESET: number;
-    export var WSAECONNABORTED: number;
-    export var WSAECONNRESET: number;
-    export var WSAENOBUFS: number;
-    export var WSAEISCONN: number;
-    export var WSAENOTCONN: number;
-    export var WSAESHUTDOWN: number;
-    export var WSAETOOMANYREFS: number;
-    export var WSAETIMEDOUT: number;
-    export var WSAECONNREFUSED: number;
-    export var WSAELOOP: number;
-    export var WSAENAMETOOLONG: number;
-    export var WSAEHOSTDOWN: number;
-    export var WSAEHOSTUNREACH: number;
-    export var WSAENOTEMPTY: number;
-    export var WSAEPROCLIM: number;
-    export var WSAEUSERS: number;
-    export var WSAEDQUOT: number;
-    export var WSAESTALE: number;
-    export var WSAEREMOTE: number;
-    export var WSASYSNOTREADY: number;
-    export var WSAVERNOTSUPPORTED: number;
-    export var WSANOTINITIALISED: number;
-    export var WSAEDISCON: number;
-    export var WSAENOMORE: number;
-    export var WSAECANCELLED: number;
-    export var WSAEINVALIDPROCTABLE: number;
-    export var WSAEINVALIDPROVIDER: number;
-    export var WSAEPROVIDERFAILEDINIT: number;
-    export var WSASYSCALLFAILURE: number;
-    export var WSASERVICE_NOT_FOUND: number;
-    export var WSATYPE_NOT_FOUND: number;
-    export var WSA_E_NO_MORE: number;
-    export var WSA_E_CANCELLED: number;
-    export var WSAEREFUSED: number;
-    export var SIGHUP: number;
-    export var SIGINT: number;
-    export var SIGILL: number;
-    export var SIGABRT: number;
-    export var SIGFPE: number;
-    export var SIGKILL: number;
-    export var SIGSEGV: number;
-    export var SIGTERM: number;
-    export var SIGBREAK: number;
-    export var SIGWINCH: number;
-    export var SSL_OP_ALL: number;
-    export var SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: number;
-    export var SSL_OP_CIPHER_SERVER_PREFERENCE: number;
-    export var SSL_OP_CISCO_ANYCONNECT: number;
-    export var SSL_OP_COOKIE_EXCHANGE: number;
-    export var SSL_OP_CRYPTOPRO_TLSEXT_BUG: number;
-    export var SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: number;
-    export var SSL_OP_EPHEMERAL_RSA: number;
-    export var SSL_OP_LEGACY_SERVER_CONNECT: number;
-    export var SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: number;
-    export var SSL_OP_MICROSOFT_SESS_ID_BUG: number;
-    export var SSL_OP_MSIE_SSLV2_RSA_PADDING: number;
-    export var SSL_OP_NETSCAPE_CA_DN_BUG: number;
-    export var SSL_OP_NETSCAPE_CHALLENGE_BUG: number;
-    export var SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG: number;
-    export var SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: number;
-    export var SSL_OP_NO_COMPRESSION: number;
-    export var SSL_OP_NO_QUERY_MTU: number;
-    export var SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION: number;
-    export var SSL_OP_NO_SSLv2: number;
-    export var SSL_OP_NO_SSLv3: number;
-    export var SSL_OP_NO_TICKET: number;
-    export var SSL_OP_NO_TLSv1: number;
-    export var SSL_OP_NO_TLSv1_1: number;
-    export var SSL_OP_NO_TLSv1_2: number;
-    export var SSL_OP_PKCS1_CHECK_1: number;
-    export var SSL_OP_PKCS1_CHECK_2: number;
-    export var SSL_OP_SINGLE_DH_USE: number;
-    export var SSL_OP_SINGLE_ECDH_USE: number;
-    export var SSL_OP_SSLEAY_080_CLIENT_DH_BUG: number;
-    export var SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG: number;
-    export var SSL_OP_TLS_BLOCK_PADDING_BUG: number;
-    export var SSL_OP_TLS_D5_BUG: number;
-    export var SSL_OP_TLS_ROLLBACK_BUG: number;
-    export var ENGINE_METHOD_DSA: number;
-    export var ENGINE_METHOD_DH: number;
-    export var ENGINE_METHOD_RAND: number;
-    export var ENGINE_METHOD_ECDH: number;
-    export var ENGINE_METHOD_ECDSA: number;
-    export var ENGINE_METHOD_CIPHERS: number;
-    export var ENGINE_METHOD_DIGESTS: number;
-    export var ENGINE_METHOD_STORE: number;
-    export var ENGINE_METHOD_PKEY_METHS: number;
-    export var ENGINE_METHOD_PKEY_ASN1_METHS: number;
-    export var ENGINE_METHOD_ALL: number;
-    export var ENGINE_METHOD_NONE: number;
-    export var DH_CHECK_P_NOT_SAFE_PRIME: number;
-    export var DH_CHECK_P_NOT_PRIME: number;
-    export var DH_UNABLE_TO_CHECK_GENERATOR: number;
-    export var DH_NOT_SUITABLE_GENERATOR: number;
-    export var NPN_ENABLED: number;
-    export var RSA_PKCS1_PADDING: number;
-    export var RSA_SSLV23_PADDING: number;
-    export var RSA_NO_PADDING: number;
-    export var RSA_PKCS1_OAEP_PADDING: number;
-    export var RSA_X931_PADDING: number;
-    export var RSA_PKCS1_PSS_PADDING: number;
-    export var POINT_CONVERSION_COMPRESSED: number;
-    export var POINT_CONVERSION_UNCOMPRESSED: number;
-    export var POINT_CONVERSION_HYBRID: number;
-    export var O_RDONLY: number;
-    export var O_WRONLY: number;
-    export var O_RDWR: number;
-    export var S_IFMT: number;
-    export var S_IFREG: number;
-    export var S_IFDIR: number;
-    export var S_IFCHR: number;
-    export var S_IFLNK: number;
-    export var O_CREAT: number;
-    export var O_EXCL: number;
-    export var O_TRUNC: number;
-    export var O_APPEND: number;
-    export var F_OK: number;
-    export var R_OK: number;
-    export var W_OK: number;
-    export var X_OK: number;
-    export var UV_UDP_REUSEADDR: number;
-}
diff --git a/node/tsconfig.json b/node/tsconfig.json
new file mode 100644
index 0000000000..451334e573
--- /dev/null
+++ b/node/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "node-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/node_redis/index.d.ts b/node_redis/index.d.ts
new file mode 100644
index 0000000000..f096f3021f
--- /dev/null
+++ b/node_redis/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for node_redis 0.8
+// Project: https://github.com/mranney/node_redis
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+// PLEASE USE redis/redis.d.ts directly!
+
diff --git a/node_redis/node_redis.d.ts b/node_redis/node_redis.d.ts
deleted file mode 100644
index cc33d4da83..0000000000
--- a/node_redis/node_redis.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for node_redis 0.8
-// Project: https://github.com/mranney/node_redis
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../redis/redis.d.ts" />
-
-// PLEASE USE redis/redis.d.ts directly!
-
diff --git a/node_redis/tsconfig.json b/node_redis/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/node_redis/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node_zeromq/zmq.d.ts b/node_zeromq/zmq.d.ts
deleted file mode 100644
index 636a014aa6..0000000000
--- a/node_zeromq/zmq.d.ts
+++ /dev/null
@@ -1,218 +0,0 @@
-// Type definitions for ZeroMQ Node
-// Project: https://github.com/JustinTulloss/zeromq.node
-// Definitions by: Dave McKeown <http://github.com/davemckeown>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path='../node/node.d.ts' />
-
-interface EventEmitter {}
-
-declare module 'zmq' {
-
-    interface SocketTypes {
-        pub: number;
-        xpub: number;
-        sub: number;
-        xsub: number;
-        req: number;
-        xreq: number;
-        rep: number;
-        xrep: number;
-        push: number;
-        pull: number;
-        dealer: number;
-        router: number;
-        pair: number;
-    }
-
-    interface SocketOptions {
-        _fd: number;
-        _ioevents: number;
-        _receiveMore: number;
-        _subscribe: number;
-        _unsubscribe: number;
-        affinity: number;
-        backlog: number;
-        hwm: number;
-        identity: number;
-        linger: number;
-        mcast_loop: number;
-        rate: number;
-        rcvbuf: number;
-        last_endpoint: number;
-        reconnect_ivl: number;
-        recovery_ivl: number;
-        sndbuf: number;
-        swap: number;
-    }
-
-    interface Socket extends EventEmitter {
-        /**
-         * Set `opt` to `val`.
-         *
-         * @param opt Option
-         * @param val Value
-         */
-        setsocketopt(opt: number, val: any): Socket;
-
-        /**
-         * Set `opt` to `val`.
-         *
-         * @param opt Option
-         * @param val Value
-         */
-        setsocketopt(opt: string, val: any): Socket;
-
-        /**
-         * Get socket `opt`.
-         *
-         * @param opt Option number
-         */
-        getsocketopt(opt: number): any;
-
-        /**
-         * Get socket `opt`.
-         *
-         * @param opt Option string
-         */
-        getsocketopt(opt: string): any;
-
-        /**
-         * Async bind.
-         *
-         * Emits the "bind" event.
-         *
-         * @param addr Socket address
-         * @param cb Bind callback
-         */
-        bind(addr: string, callback?: (error: string) => void ): Socket;
-
-        /**
-         * Sync bind.
-         *
-         * @param addr Socket address
-         */
-        bindSync(addr: string): Socket;
-
-        /**
-         * Async unbind.
-         *
-         * Emits the "unbind" event.
-         *
-         * @param addr Socket address
-         * @param cb Unind callback
-         */
-        unbind(addr: string, callback?: (error: string) => void ): Socket;
-
-        /**
-         * Sync unbind.
-         *
-         * @param addr Socket address
-         */
-        unbindSync(addr: string): Socket;
-
-        /**
-         * Connect to `addr`.
-         *
-         * @param addr Connection address
-         */
-        connect(addr: string): Socket;
-
-        /**
-         * Disconnect from `addr`.
-         *
-         * @param addr The address
-         */
-        disconnect(addr: string): Socket;
-
-        /**
-         * Subscribe with the given `filter`.
-         *
-         * @param filter The filter
-         */
-        subscribe(filter: string): Socket;
-
-        /**
-         * Unsubscribe with the given `filter`.
-         *
-         * @param filter The filter
-         */
-        unsubscribe(filter: string): Socket;
-
-        /**
-         * Send the given `msg`.
-         *
-         * @param msg The message
-         * @param flags Message flags
-         */
-        send(msg: string, flags?: number): Socket;
-
-        /**
-         * Send the given `msg`.
-         *
-         * @param msg {Buffer} The message
-         * @param flags {number} Optional message flags
-         */
-        send(msg: Buffer, flags?: number): Socket;
-
-        /**
-        * Send the given `msg`.
-        *
-        * @param msg The message
-        * @param flags Message flags
-        */
-        send(msg: any[], flags?: number): Socket;
-
-        /**
-        * Enable monitoring of a Socket
-        *
-        * @param {Number} timer interval in ms > 0 or Undefined for default
-        * @return {Socket} for chaining
-        */
-        monitor(interval?: number): Socket;
-
-        /**
-         * Close the socket.
-         *
-         */
-        close(): Socket;
-
-        /**
-         * Socket event
-         * @param eventName {string}
-         * @param callback {Function}
-         */
-        on(eventName: string, callback: (...buffer: Buffer[]) => void): void;
-
-        // Socket Options
-        _fd: any;
-        _ioevents: any;
-        _receiveMore: any;
-        _subscribe: any;
-        _unsubscribe: any;
-        affinity: any;
-        backlog(): any;
-        hwm: any;
-        identity: any;
-        linger: any;
-        mcast_loop: any;
-        rate: any;
-        rcvbuf: any;
-        last_endpoint: any;
-        reconnect_ivl: any;
-        recovery_ivl: any;
-        sndbuf: any;
-        swap: any;
-
-
-    }
-
-    export var version: string;
-    export var types: SocketTypes;
-    export var options: SocketOptions;
-
-    function socket(type: string, options?: any): Socket;
-    function socket(type: number, options?: any): Socket;
-    function createSocket(type: string, options?: any): Socket;
-
-}
diff --git a/nodemailer-direct-transport/index.d.ts b/nodemailer-direct-transport/index.d.ts
new file mode 100644
index 0000000000..1f4017d5b6
--- /dev/null
+++ b/nodemailer-direct-transport/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for nodemailer-direct-transport 1.0.2
+// Project: https://github.com/andris9/nodemailer-direct-transport
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as nodemailer from 'nodemailer';
+
+declare namespace directTransport {
+
+    export interface AuthOptions {
+        user?: string;
+        pass?: string;
+        xoauth2?: any;
+    }
+
+    export interface DirectOptions {
+        /**
+         * optional hostname of the client, used for identifying to the server
+         */
+        name?: string;
+        /**
+         * if true, the connection emits all traffic between client and server as 'log' events
+         */
+        debug?: boolean;
+    }
+}
+
+declare function directTransport(options: directTransport.DirectOptions): nodemailer.Transport;
+
+export = directTransport;
diff --git a/nodemailer-direct-transport/nodemailer-direct-transport-tests.ts b/nodemailer-direct-transport/nodemailer-direct-transport-tests.ts
index ef8c784794..ec2ba16cdc 100644
--- a/nodemailer-direct-transport/nodemailer-direct-transport-tests.ts
+++ b/nodemailer-direct-transport/nodemailer-direct-transport-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="nodemailer-direct-transport.d.ts" />
 
 import directTransport = require('nodemailer-direct-transport');
 
diff --git a/nodemailer-direct-transport/nodemailer-direct-transport.d.ts b/nodemailer-direct-transport/nodemailer-direct-transport.d.ts
deleted file mode 100644
index ce5caed172..0000000000
--- a/nodemailer-direct-transport/nodemailer-direct-transport.d.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// Type definitions for nodemailer-direct-transport 1.0.2
-// Project: https://github.com/andris9/nodemailer-direct-transport
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../nodemailer/nodemailer-types.d.ts" />
-
-declare module "nodemailer-direct-transport" {
-
-	namespace directTransport {
-
-		export interface AuthOptions {
-			user?: string;
-			pass?: string;
-			xoauth2?: any;
-		}
-
-		export interface DirectOptions {
-			/**
-			 * optional hostname of the client, used for identifying to the server
-			 */
-			name?: string;
-			/**
-			 * if true, the connection emits all traffic between client and server as 'log' events
-			 */
-			debug?: boolean;
-		}
-	}
-
-	function directTransport(options: directTransport.DirectOptions): nodemailer.Transport;
-
-	export = directTransport;
-
-}
diff --git a/nodemailer-direct-transport/tsconfig.json b/nodemailer-direct-transport/tsconfig.json
new file mode 100644
index 0000000000..c1e1cfc136
--- /dev/null
+++ b/nodemailer-direct-transport/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "nodemailer-direct-transport-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/nodemailer-pickup-transport/index.d.ts b/nodemailer-pickup-transport/index.d.ts
new file mode 100644
index 0000000000..b14110a4cd
--- /dev/null
+++ b/nodemailer-pickup-transport/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for nodemailer-pickup-transport v0.1.1
+// Project: https://www.npmjs.com/package/nodemailer-pickup-transport
+// Definitions by: Peter Snider <https://github.com/psnider/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import nodemailer = require('nodemailer');
+
+declare namespace PickupTransport {
+    export interface Options {
+        directory: string;
+    }
+}
+
+declare function PickupTransport(options: PickupTransport.Options): nodemailer.Transport;
+export = PickupTransport;
diff --git a/nodemailer-pickup-transport/nodemailer-pickup-transport-tests.ts b/nodemailer-pickup-transport/nodemailer-pickup-transport-tests.ts
index 13b0c7515c..4580c64d4b 100644
--- a/nodemailer-pickup-transport/nodemailer-pickup-transport-tests.ts
+++ b/nodemailer-pickup-transport/nodemailer-pickup-transport-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path='../nodemailer/nodemailer.d.ts' />
-/// <reference path='nodemailer-pickup-transport.d.ts' />
-
 import nodemailer = require('nodemailer')
 import pickupTransport = require('nodemailer-pickup-transport')
 
diff --git a/nodemailer-pickup-transport/nodemailer-pickup-transport.d.ts b/nodemailer-pickup-transport/nodemailer-pickup-transport.d.ts
deleted file mode 100644
index 52aef3801d..0000000000
--- a/nodemailer-pickup-transport/nodemailer-pickup-transport.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Type definitions for nodemailer-pickup-transport v0.1.1
-// Project: https://www.npmjs.com/package/nodemailer-pickup-transport
-// Definitions by: Peter Snider <https://github.com/psnider/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../nodemailer/nodemailer-types.d.ts" />
-
-declare module "nodemailer-pickup-transport" {
-
-    namespace PickupTransport {
-        export interface Options {
-            directory: string;
-        }
-    }
-
-    function PickupTransport(options: PickupTransport.Options): nodemailer.Transport;
-    export = PickupTransport;
-}
-
diff --git a/nodemailer-pickup-transport/tsconfig.json b/nodemailer-pickup-transport/tsconfig.json
new file mode 100644
index 0000000000..a137e4096d
--- /dev/null
+++ b/nodemailer-pickup-transport/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "nodemailer-pickup-transport-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/nodemailer-smtp-pool/index.d.ts b/nodemailer-smtp-pool/index.d.ts
new file mode 100644
index 0000000000..02d0c02b90
--- /dev/null
+++ b/nodemailer-smtp-pool/index.d.ts
@@ -0,0 +1,85 @@
+// Type definitions for nodemailer-smtp-pool 1.0.1
+// Project: https://github.com/andris9/nodemailer-smtp-pool
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import tls = require("tls");
+import nodemailer = require("nodemailer");
+
+declare namespace smtpPool {
+
+    export interface AuthOptions {
+        user?: string;
+        pass?: string;
+        xoauth2?: any;
+    }
+
+    export interface SmtpPoolOptions {
+        /**
+         * is the port to connect to (defaults to 25 or 465)
+         */
+        port?: number;
+        /**
+         * is the hostname or IP address to connect to (defaults to 'localhost')
+         */
+        host?: string;
+        /**
+         * defines if the connection should use SSL (if true) or not (if false)
+         */
+        secure?: boolean;
+        /**
+         *  defines authentication data (see authentication section below)
+         */
+        auth?: AuthOptions;
+        /**
+         *  turns off STARTTLS support if true
+         */
+        ignoreTLS?: boolean;
+        /**
+         * optional hostname of the client, used for identifying to the server
+         */
+        name?: string;
+        /**
+         * is the local interface to bind to for network connections
+         */
+        localAddress?: string;
+        /**
+         * how many milliseconds to wait for the connection to establish
+         */
+        connectionTimeout?: number;
+        /**
+         * how many milliseconds to wait for the greeting after connection is established
+         */
+        greetingTimeout?: number;
+        /**
+         * how many milliseconds of inactivity to allow
+         */
+        socketTimeout?: number;
+        /**
+         * if true, the connection emits all traffic between client and server as 'log' events
+         */
+        debug?: boolean;
+        /**
+         * defines preferred authentication method, eg. 'PLAIN'
+         */
+        authMethod?: string;
+        /**
+         *  defines additional options to be passed to the socket constructor, eg. {rejectUnauthorized: true}
+         */
+        tls?: tls.ConnectionOptions;
+        /**
+         * (defaults to 5) is the count of maximum simultaneous connections to make against the SMTP server
+         */
+        maxConnections?: number;
+        /**
+         * (defaults to 100) limits the message count to be sent using a single connection. After maxMessages messages the connection is dropped and a new one is created for the following messages
+         */
+        maxMessages?: number;
+    }
+}
+
+
+declare function smtpPool(options: smtpPool.SmtpPoolOptions): nodemailer.Transport;
+export = smtpPool;
diff --git a/nodemailer-smtp-pool/nodemailer-smtp-pool-tests.ts b/nodemailer-smtp-pool/nodemailer-smtp-pool-tests.ts
index 1970ebab5d..c4681fc0a8 100644
--- a/nodemailer-smtp-pool/nodemailer-smtp-pool-tests.ts
+++ b/nodemailer-smtp-pool/nodemailer-smtp-pool-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="nodemailer-smtp-pool.d.ts" />
 
 import smtpPool = require('nodemailer-smtp-pool');
 
diff --git a/nodemailer-smtp-pool/nodemailer-smtp-pool.d.ts b/nodemailer-smtp-pool/nodemailer-smtp-pool.d.ts
deleted file mode 100644
index d815bab293..0000000000
--- a/nodemailer-smtp-pool/nodemailer-smtp-pool.d.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-// Type definitions for nodemailer-smtp-pool 1.0.1
-// Project: https://github.com/andris9/nodemailer-smtp-pool
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../nodemailer/nodemailer-types.d.ts" />
-
-declare module "nodemailer-smtp-pool" {
-	import tls = require("tls");
-
-	namespace smtpPool {
-
-		export interface AuthOptions {
-			user?: string;
-			pass?: string;
-			xoauth2?: any;
-		}
-
-		export interface SmtpPoolOptions {
-			/**
-			 * is the port to connect to (defaults to 25 or 465)
-			 */
-			port?: number;
-			/**
-			 * is the hostname or IP address to connect to (defaults to 'localhost')
-			 */
-			host?: string;
-			/**
-			 * defines if the connection should use SSL (if true) or not (if false)
-			 */
-			secure?: boolean;
-			/**
-			 *  defines authentication data (see authentication section below)
-			 */
-			auth?: AuthOptions;
-			/**
-			 *  turns off STARTTLS support if true
-			 */
-			ignoreTLS?: boolean;
-			/**
-			 * optional hostname of the client, used for identifying to the server
-			 */
-			name?: string;
-			/**
-			 * is the local interface to bind to for network connections
-			 */
-			localAddress?: string;
-			/**
-			 * how many milliseconds to wait for the connection to establish
-			 */
-			connectionTimeout?: number;
-			/**
-			 * how many milliseconds to wait for the greeting after connection is established
-			 */
-			greetingTimeout?: number;
-			/**
-			 * how many milliseconds of inactivity to allow
-			 */
-			socketTimeout?: number;
-			/**
-			 * if true, the connection emits all traffic between client and server as 'log' events
-			 */
-			debug?: boolean;
-			/**
-			 * defines preferred authentication method, eg. 'PLAIN'
-			 */
-			authMethod?: string;
-			/**
-			 *  defines additional options to be passed to the socket constructor, eg. {rejectUnauthorized: true}
-			 */
-			tls?: tls.ConnectionOptions;
-			/**
-			 * (defaults to 5) is the count of maximum simultaneous connections to make against the SMTP server
-			 */
-			maxConnections?: number;
-			/**
-			 * (defaults to 100) limits the message count to be sent using a single connection. After maxMessages messages the connection is dropped and a new one is created for the following messages
-			 */
-			maxMessages?: number;
-		}
-	}
-
-
-	function smtpPool(options: smtpPool.SmtpPoolOptions): nodemailer.Transport;
-	export = smtpPool;
-
-}
diff --git a/nodemailer-smtp-pool/tsconfig.json b/nodemailer-smtp-pool/tsconfig.json
new file mode 100644
index 0000000000..3c9723f4f5
--- /dev/null
+++ b/nodemailer-smtp-pool/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "nodemailer-smtp-pool-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/nodemailer-smtp-transport/index.d.ts b/nodemailer-smtp-transport/index.d.ts
new file mode 100644
index 0000000000..29f156494d
--- /dev/null
+++ b/nodemailer-smtp-transport/index.d.ts
@@ -0,0 +1,110 @@
+// Type definitions for nodemailer-smtp-transport 1.0.2
+// Project: https://github.com/andris9/nodemailer-smtp-transport
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import tls = require("tls");
+import nodemailer = require('nodemailer');
+
+declare namespace smtpTransport {
+    export interface AuthOptions {
+        user?: string;
+        pass?: string;
+        xoauth2?: any;
+    }
+
+    export interface SmtpOptions {
+        /**
+         * Fills in certain SMTP configurations options (e.g. 'host', 'port', and 'secure') for
+         * well-known services. Possible values:
+         *   - '1und1'
+         *   - 'AOL'
+         *   - 'DebugMail.io'
+         *   - 'DynectEmail'
+         *   - 'FastMail'
+         *   - 'GandiMail'
+         *   - 'Gmail'
+         *   - 'Godaddy'
+         *   - 'GodaddyAsia'
+         *   - 'GodaddyEurope'
+         *   - 'hot.ee'
+         *   - 'Hotmail'
+         *   - 'iCloud'
+         *   - 'mail.ee'
+         *   - 'Mail.ru'
+         *   - 'Mailgun'
+         *   - 'Mailjet'
+         *   - 'Mandrill'
+         *   - 'Naver'
+         *   - 'Postmark'
+         *   - 'QQ'
+         *   - 'QQex'
+         *   - 'SendCloud'
+         *   - 'SendGrid'
+         *   - 'SES'
+         *   - 'Sparkpost'
+         *   - 'Yahoo'
+         *   - 'Yandex'
+         *   - 'Zoho'
+         */
+        service?: string;
+        /**
+         * is the port to connect to (defaults to 25 or 465)
+         */
+        port?: number;
+        /**
+         * is the hostname or IP address to connect to (defaults to 'localhost')
+         */
+        host?: string;
+        /**
+         * defines if the connection should use SSL (if true) or not (if false)
+         */
+        secure?: boolean;
+        /**
+         *  defines authentication data (see authentication section below)
+         */
+        auth?: AuthOptions;
+        /**
+         *  turns off STARTTLS support if true
+         */
+        ignoreTLS?: boolean;
+        /**
+         * optional hostname of the client, used for identifying to the server
+         */
+        name?: string;
+        /**
+         * is the local interface to bind to for network connections
+         */
+        localAddress?: string;
+        /**
+         * how many milliseconds to wait for the connection to establish
+         */
+        connectionTimeout?: number;
+        /**
+         * how many milliseconds to wait for the greeting after connection is established
+         */
+        greetingTimeout?: number;
+        /**
+         * how many milliseconds of inactivity to allow
+         */
+        socketTimeout?: number;
+        /**
+         * if true, the connection emits all traffic between client and server as 'log' events
+         */
+        debug?: boolean;
+        /**
+         * defines preferred authentication method, eg. 'PLAIN'
+         */
+        authMethod?: string;
+        /**
+         *  defines additional options to be passed to the socket constructor, eg. {rejectUnauthorized: true}
+         */
+        tls?: tls.ConnectionOptions;
+    }
+}
+
+declare function smtpTransport(options: smtpTransport.SmtpOptions): nodemailer.Transport;
+
+export = smtpTransport;
diff --git a/nodemailer-smtp-transport/nodemailer-smtp-transport-tests.ts b/nodemailer-smtp-transport/nodemailer-smtp-transport-tests.ts
index 3b0c2e29ad..b789cf3045 100644
--- a/nodemailer-smtp-transport/nodemailer-smtp-transport-tests.ts
+++ b/nodemailer-smtp-transport/nodemailer-smtp-transport-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="nodemailer-smtp-transport.d.ts" />
 
 import smtpTransport = require('nodemailer-smtp-transport');
 
diff --git a/nodemailer-smtp-transport/nodemailer-smtp-transport.d.ts b/nodemailer-smtp-transport/nodemailer-smtp-transport.d.ts
deleted file mode 100644
index 0beff75ee5..0000000000
--- a/nodemailer-smtp-transport/nodemailer-smtp-transport.d.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-// Type definitions for nodemailer-smtp-transport 1.0.2
-// Project: https://github.com/andris9/nodemailer-smtp-transport
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../nodemailer/nodemailer-types.d.ts" />
-
-declare module "nodemailer-smtp-transport" {
-
-	import tls = require("tls");
-
-	namespace smtpTransport {
-		export interface AuthOptions {
-			user?: string;
-			pass?: string;
-			xoauth2?: any;
-		}
-
-		export interface SmtpOptions {
-			/**
-			 * Fills in certain SMTP configurations options (e.g. 'host', 'port', and 'secure') for
-			 * well-known services. Possible values:
-			 *   - '1und1'
-			 *   - 'AOL'
-			 *   - 'DebugMail.io'
-			 *   - 'DynectEmail'
-			 *   - 'FastMail'
-			 *   - 'GandiMail'
-			 *   - 'Gmail'
-			 *   - 'Godaddy'
-			 *   - 'GodaddyAsia'
-			 *   - 'GodaddyEurope'
-			 *   - 'hot.ee'
-			 *   - 'Hotmail'
-			 *   - 'iCloud'
-			 *   - 'mail.ee'
-			 *   - 'Mail.ru'
-			 *   - 'Mailgun'
-			 *   - 'Mailjet'
-			 *   - 'Mandrill'
-			 *   - 'Naver'
-			 *   - 'Postmark'
-			 *   - 'QQ'
-			 *   - 'QQex'
-			 *   - 'SendCloud'
-			 *   - 'SendGrid'
-			 *   - 'SES'
-			 *   - 'Sparkpost'
-			 *   - 'Yahoo'
-			 *   - 'Yandex'
-			 *   - 'Zoho'
-			 */
-			service?: string;
-			/**
-			 * is the port to connect to (defaults to 25 or 465)
-			 */
-			port?: number;
-			/**
-			 * is the hostname or IP address to connect to (defaults to 'localhost')
-			 */
-			host?: string;
-			/**
-			 * defines if the connection should use SSL (if true) or not (if false)
-			 */
-			secure?: boolean;
-			/**
-			 *  defines authentication data (see authentication section below)
-			 */
-			auth?: AuthOptions;
-			/**
-			 *  turns off STARTTLS support if true
-			 */
-			ignoreTLS?: boolean;
-			/**
-			 * optional hostname of the client, used for identifying to the server
-			 */
-			name?: string;
-			/**
-			 * is the local interface to bind to for network connections
-			 */
-			localAddress?: string;
-			/**
-			 * how many milliseconds to wait for the connection to establish
-			 */
-			connectionTimeout?: number;
-			/**
-			 * how many milliseconds to wait for the greeting after connection is established
-			 */
-			greetingTimeout?: number;
-			/**
-			 * how many milliseconds of inactivity to allow
-			 */
-			socketTimeout?: number;
-			/**
-			 * if true, the connection emits all traffic between client and server as 'log' events
-			 */
-			debug?: boolean;
-			/**
-			 * defines preferred authentication method, eg. 'PLAIN'
-			 */
-			authMethod?: string;
-			/**
-			 *  defines additional options to be passed to the socket constructor, eg. {rejectUnauthorized: true}
-			 */
-			tls?: tls.ConnectionOptions;
-		}
-	}
-
-	function smtpTransport(options: smtpTransport.SmtpOptions): nodemailer.Transport;
-
-	export = smtpTransport;
-}
diff --git a/nodemailer-smtp-transport/tsconfig.json b/nodemailer-smtp-transport/tsconfig.json
new file mode 100644
index 0000000000..28d7210f97
--- /dev/null
+++ b/nodemailer-smtp-transport/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "nodemailer-smtp-transport-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/nodemailer/index.d.ts b/nodemailer/index.d.ts
new file mode 100644
index 0000000000..27dda32673
--- /dev/null
+++ b/nodemailer/index.d.ts
@@ -0,0 +1,58 @@
+// Type definitions for Nodemailer 1.3.2
+// Project: https://github.com/andris9/Nodemailer
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+/// <reference path="nodemailer-types.d.ts" />
+
+import directTransport = require("nodemailer-direct-transport");
+import smtpTransport = require("nodemailer-smtp-transport");
+
+export type Transport = nodemailer.Transport;
+export type SendMailOptions = nodemailer.SendMailOptions;
+export type SentMessageInfo = nodemailer.SentMessageInfo;
+
+/**
+ * Transporter plugin
+ */
+export interface Plugin {
+    (mail: SendMailOptions, callback?: (error: Error, info: SentMessageInfo) => void): void;
+}
+
+/**
+ * This is what you use to send mail
+ */
+export interface Transporter {
+    /**
+     * Send a mail
+     */
+    sendMail(mail: SendMailOptions, callback?: (error: Error, info: SentMessageInfo) => void): void;
+
+    /**
+     * Attach a plugin. 'compile' and 'stream' plugins can be attached with use(plugin) method
+     *
+     * @param step is a string, either 'compile' or 'stream' thatd defines when the plugin should be hooked
+     * @param pluginFunc is a function that takes two arguments: the mail object and a callback function
+     */
+    use(step: string, plugin: Plugin): void;
+
+
+    /**
+     * Close all connections
+     */
+    close?(): void;
+}
+
+/**
+ * Create a direct transporter
+ */
+export declare function createTransport(options?: directTransport.DirectOptions, defaults?: Object): Transporter;
+/**
+ * Create an SMTP transporter
+ */
+export declare function createTransport(options?: smtpTransport.SmtpOptions, defaults?: Object): Transporter;
+/**
+ * Create a transporter from a given implementation
+ */
+export declare function createTransport(transport: Transport, defaults?: Object): Transporter;
diff --git a/nodemailer/nodemailer-tests.ts b/nodemailer/nodemailer-tests.ts
index a991096d5b..33d3d1dbfa 100644
--- a/nodemailer/nodemailer-tests.ts
+++ b/nodemailer/nodemailer-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="nodemailer.d.ts" />
 
 import nodemailer = require('nodemailer');
 
diff --git a/nodemailer/nodemailer-types.d.ts b/nodemailer/nodemailer-types.d.ts
index 6fde6ebad9..4ce161d6f4 100644
--- a/nodemailer/nodemailer-types.d.ts
+++ b/nodemailer/nodemailer-types.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../node/node.d.ts" />
+/// <reference types="node" />
 
 declare namespace nodemailer {
 
diff --git a/nodemailer/nodemailer.d.ts b/nodemailer/nodemailer.d.ts
deleted file mode 100644
index 7f5d070927..0000000000
--- a/nodemailer/nodemailer.d.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-// Type definitions for Nodemailer 1.3.2
-// Project: https://github.com/andris9/Nodemailer
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="./nodemailer-types.d.ts" />
-/// <reference path="../nodemailer-direct-transport/nodemailer-direct-transport.d.ts" />
-/// <reference path="../nodemailer-smtp-transport/nodemailer-smtp-transport.d.ts" />
-
-declare module "nodemailer" {
-
-	import directTransport = require("nodemailer-direct-transport");
-	import smtpTransport = require("nodemailer-smtp-transport");
-
-	export type Transport = nodemailer.Transport;
-	export type SendMailOptions = nodemailer.SendMailOptions;
-	export type SentMessageInfo = nodemailer.SentMessageInfo;
-
-	/**
-	 * Transporter plugin
-	 */
-	export interface Plugin {
-		(mail: SendMailOptions, callback?: (error: Error, info: SentMessageInfo) => void): void;
-	}
-
-	/**
-	 * This is what you use to send mail
-	 */
-	export interface Transporter {
-		/**
-		 * Send a mail
-		 */
-		sendMail(mail: SendMailOptions, callback?: (error: Error, info: SentMessageInfo) => void): void;
-
-		/**
-		 * Attach a plugin. 'compile' and 'stream' plugins can be attached with use(plugin) method
-		 *
-		 * @param step is a string, either 'compile' or 'stream' thatd defines when the plugin should be hooked
-		 * @param pluginFunc is a function that takes two arguments: the mail object and a callback function
-		 */
-		use(step: string, plugin: Plugin): void;
-
-
-		/**
-		 * Close all connections
-		 */
-		close?(): void;
-	}
-
-	/**
-	 * Create a direct transporter
-	 */
-	export function createTransport(options?: directTransport.DirectOptions, defaults?: Object): Transporter;
-	/**
-	 * Create an SMTP transporter
-	 */
-	export function createTransport(options?: smtpTransport.SmtpOptions, defaults?: Object): Transporter;
-	/**
-	 * Create a transporter from a given implementation
-	 */
-	export function createTransport(transport: Transport, defaults?: Object): Transporter;
-}
diff --git a/nodemailer/tsconfig.json b/nodemailer/tsconfig.json
new file mode 100644
index 0000000000..65dbd8cb7e
--- /dev/null
+++ b/nodemailer/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "nodemailer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/nodeunit/index.d.ts b/nodeunit/index.d.ts
new file mode 100644
index 0000000000..f00764009b
--- /dev/null
+++ b/nodeunit/index.d.ts
@@ -0,0 +1,65 @@
+// Type definitions for nodeunit
+// Project: https://github.com/caolan/nodeunit
+// Definitions by: Jeff Goddard <https://github.com/jedigo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/nodeunit.d.ts
+
+
+export interface ITestCase {
+    (testCase: { [property: string]: ITestBody | ITestGroup | void }): void;
+}
+export declare var testCase: ITestCase;
+
+export interface Test {
+    done: ICallbackFunction;
+    expect(num: number): void;
+
+    //assersions from node assert module
+    fail(actual: any, expected: any, message: string, operator: string): void;
+    assert(value: any, message: string): void;
+    ok(value: any, message?: string): void;
+    equal(actual: any, expected: any, message?: string): void;
+    notEqual(actual: any, expected: any, message?: string): void;
+    deepEqual(actual: any, expected: any, message?: string): void;
+    notDeepEqual(actual: any, expected: any, message?: string): void;
+    strictEqual(actual: any, expected: any, message?: string): void;
+    notStrictEqual(actual: any, expected: any, message?: string): void;
+    throws(block: any, error?: any, message?: string): void;
+    doesNotThrow(block: any, error?: any, message?: string): void;
+    ifError(value: any): void;
+
+    //assertion wrappers
+    equals(actual: any, expected: any, message?: string): void;
+    same(actual: any, expected: any, message?: string): void;
+}
+
+// Test Group Usage:
+//  var testGroup: nodeunit.ITestGroup = {
+//      setUp: (callback) => {
+// 	      callback();
+//      },
+//      tearDown: (callback) => {
+// 	       callback();
+//      },
+//      test1: (test: nodeunit.Test) => {
+//          test.done();
+//      }
+//    }
+//    exports.testgroup = testGroup;
+
+export interface ITestBody {
+    (callback: Test): void;
+}
+
+export interface ITestGroup {
+    /** The setUp function is run before each test */
+    setUp?: (callback: ICallbackFunction) => void;
+    /** The tearDown function is run after each test calls test.done() */
+    tearDown?: (callback: ICallbackFunction) => void;
+    [property: string]: ITestGroup | ITestBody | ((callback: ICallbackFunction) => void);
+}
+
+export interface ICallbackFunction {
+    (err?: any): void;
+}
diff --git a/nodeunit/nodeunit-tests.ts b/nodeunit/nodeunit-tests.ts
index e7cf5e73e9..7644dd6cc4 100644
--- a/nodeunit/nodeunit-tests.ts
+++ b/nodeunit/nodeunit-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="nodeunit.d.ts" />
 
 import nodeunit = require('nodeunit');
 
diff --git a/nodeunit/nodeunit.d.ts b/nodeunit/nodeunit.d.ts
deleted file mode 100644
index cb71d729a0..0000000000
--- a/nodeunit/nodeunit.d.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-// Type definitions for nodeunit
-// Project: https://github.com/caolan/nodeunit
-// Definitions by: Jeff Goddard <https://github.com/jedigo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/nodeunit.d.ts
-
-declare module 'nodeunit' {
-	export interface ITestCase {
-			(testCase: {[property: string]: ITestBody | ITestGroup | void}) : void;
-		}
-    export var testCase : ITestCase;
-
-	export interface Test {
-		done: ICallbackFunction;
-		expect(num: number): void;
-
-		//assersions from node assert module
-		fail(actual: any, expected: any, message: string, operator: string): void;
-		assert(value: any, message: string): void;
-		ok(value: any, message?: string): void;
-		equal(actual: any, expected: any, message?: string): void;
-		notEqual(actual: any, expected: any, message?: string): void;
-		deepEqual(actual: any, expected: any, message?: string): void;
-		notDeepEqual(actual: any, expected: any, message?: string): void;
-		strictEqual(actual: any, expected: any, message?: string): void;
-		notStrictEqual(actual: any, expected: any, message?: string): void;
-		throws(block: any, error?: any, message?: string): void;
-		doesNotThrow(block: any, error?: any, message?: string): void;
-		ifError(value: any): void;
-
-		//assertion wrappers
-		equals(actual: any, expected: any, message?: string): void;
-		same(actual: any, expected: any, message?: string): void;
-	}
-
-	// Test Group Usage:
-	//  var testGroup: nodeunit.ITestGroup = {
-	//      setUp: (callback) => {
-	// 	      callback();
-	//      },
-	//      tearDown: (callback) => {
-	// 	       callback();
-	//      },
-	//      test1: (test: nodeunit.Test) => {
-	//          test.done();
-	//      }
-	//    }
-	//    exports.testgroup = testGroup;
-
-	export interface ITestBody {
-		(callback: Test): void;
-	}
-
-	export interface ITestGroup {
-		/** The setUp function is run before each test */
-		setUp?: (callback: ICallbackFunction) => void;
-		/** The tearDown function is run after each test calls test.done() */
-		tearDown?: (callback: ICallbackFunction) => void;
-		[property: string] : ITestGroup | ITestBody | ((callback: ICallbackFunction) => void);
-	}
-
-	export interface ICallbackFunction {
-		(err?: any): void;
-	}
-}
diff --git a/nodeunit/tsconfig.json b/nodeunit/tsconfig.json
new file mode 100644
index 0000000000..a03f073c30
--- /dev/null
+++ b/nodeunit/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "nodeunit-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/noisejs/index.d.ts b/noisejs/index.d.ts
new file mode 100644
index 0000000000..dd145dd0c6
--- /dev/null
+++ b/noisejs/index.d.ts
@@ -0,0 +1,57 @@
+// Type definitions for noisejs
+// Project: https://github.com/xixixao/noisejs
+// Definitions by: Atsushi Izumihara <https://github.com/izmhr>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = Noise;
+export as namespace Noise;
+
+declare class Noise {
+  /**
+   * Passing in seed will seed this Noise instance
+   * @param  {number} seed
+   * @return {Noise}       Noise instance
+   */
+  constructor(seed?: number);
+
+  /**
+   * 2D simplex noise
+   * @param  {number} x
+   * @param  {number} y
+   * @return {number} noise value
+   */
+  simplex2(x: number, y: number): number;
+
+  /**
+   * 3D simplex noise
+   * @param  {number} x
+   * @param  {number} y
+   * @param  {number} z
+   * @return {number} noise value
+   */
+  simplex3(x: number, y: number, z: number): number;
+
+  /**
+   * 2D Perlin Noise
+   * @param  {number} x
+   * @param  {number} y
+   * @return {number} noise value
+   */
+  perlin2(x: number, y: number): number;
+
+  /**
+   * 3D Perlin Noise
+   * @param  {number} x
+   * @param  {number} y
+   * @param  {number} z
+   * @return {number} noise value
+   */
+  perlin3(x: number, y: number, z: number): number;
+
+  /**
+   * This isn't a very good seeding function, but it works ok. It supports 2^16
+   * different seed values. Write something better if you need more seeds.
+   * @param {number} seed [description]
+   */
+  seed(seed: number): void;
+}
diff --git a/noisejs/noisejs-tests.ts b/noisejs/noisejs-tests.ts
index 10c6a68bcf..f61ff22560 100644
--- a/noisejs/noisejs-tests.ts
+++ b/noisejs/noisejs-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="noisejs.d.ts"/>
-
+import Noise = require("noisejs");
 var noise = new Noise(Math.random());
 
 var simplex2_noise_val = noise.simplex2(0.1, 0.2);
diff --git a/noisejs/noisejs.d.ts b/noisejs/noisejs.d.ts
deleted file mode 100644
index 6e3f751225..0000000000
--- a/noisejs/noisejs.d.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-// Type definitions for noisejs
-// Project: https://github.com/xixixao/noisejs
-// Definitions by: Atsushi Izumihara <https://github.com/izmhr>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare class Noise {
-  /**
-   * Passing in seed will seed this Noise instance
-   * @param  {number} seed
-   * @return {Noise}       Noise instance
-   */
-  constructor(seed?: number);
-
-  /**
-   * 2D simplex noise
-   * @param  {number} x
-   * @param  {number} y
-   * @return {number} noise value
-   */
-  simplex2(x: number, y: number): number;
-
-  /**
-   * 3D simplex noise
-   * @param  {number} x
-   * @param  {number} y
-   * @param  {number} z
-   * @return {number} noise value
-   */
-  simplex3(x: number, y: number, z: number): number;
-
-  /**
-   * 2D Perlin Noise
-   * @param  {number} x
-   * @param  {number} y
-   * @return {number} noise value
-   */
-  perlin2(x: number, y: number): number;
-
-  /**
-   * 3D Perlin Noise
-   * @param  {number} x
-   * @param  {number} y
-   * @param  {number} z
-   * @return {number} noise value
-   */
-  perlin3(x: number, y: number, z: number): number;
-
-  /**
-   * This isn't a very good seeding function, but it works ok. It supports 2^16
-   * different seed values. Write something better if you need more seeds.
-   * @param {number} seed [description]
-   */
-  seed(seed: number): void;
-}
-
-declare module "noisejs" {
-  export = Noise;
-}
diff --git a/noisejs/tsconfig.json b/noisejs/tsconfig.json
new file mode 100644
index 0000000000..57121383a2
--- /dev/null
+++ b/noisejs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "noisejs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/nomnom/nomnom.d.ts b/nomnom/index.d.ts
similarity index 100%
rename from nomnom/nomnom.d.ts
rename to nomnom/index.d.ts
diff --git a/nomnom/nomnom-tests.ts b/nomnom/nomnom-tests.ts
index f840b0e021..94685666a4 100644
--- a/nomnom/nomnom-tests.ts
+++ b/nomnom/nomnom-tests.ts
@@ -1,5 +1,5 @@
 // https://github.com/harthur/nomnom
-/// <reference path="nomnom.d.ts" />
+
 
 import nomnom = require("nomnom");
 
diff --git a/nomnom/tsconfig.json b/nomnom/tsconfig.json
new file mode 100644
index 0000000000..660dc53267
--- /dev/null
+++ b/nomnom/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "nomnom-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/nopt/index.d.ts b/nopt/index.d.ts
new file mode 100644
index 0000000000..e6422fafc3
--- /dev/null
+++ b/nopt/index.d.ts
@@ -0,0 +1,45 @@
+// Type definitions for nopt 3.0.1
+// Project: https://github.com/npm/nopt
+// Definitions by: jbondc <https://github.com/jbondc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+interface CommandData {
+    [key: string]: string
+}
+
+interface TypeDefs {
+    [key: string]: TypeInfo
+}
+
+interface TypeInfo {
+    type: Object
+    validate: (data: CommandData, k: string, val: string) => boolean
+}
+
+declare namespace nopt {
+    export function clean(data: CommandData, types: FlagTypeMap, typeDefs?: TypeDefs): string
+    export var typeDefs: TypeDefs
+}
+
+interface FlagTypeMap {
+    [k: string]: Object
+}
+
+interface ShortFlags {
+    [k: string]: string[] | string
+}
+
+declare function nopt(types: FlagTypeMap, shorthands?: ShortFlags, args?: string[], slice?: number): OptionsParsed
+
+interface OptionsParsed {
+    [k: string]: any
+    argv: {
+        remain: string[]
+        cooked: string[]
+        original: string[]
+    }
+}
+
+export = nopt
diff --git a/nopt/nopt-tests.ts b/nopt/nopt-tests.ts
index 1e2fb60a5c..fe014dcb33 100644
--- a/nopt/nopt-tests.ts
+++ b/nopt/nopt-tests.ts
@@ -2,8 +2,7 @@
 * Maintained by: jbondc <https://github.com/jbondc>
 */
 
-/// <reference path="../node/node.d.ts" />
-/// <reference path="nopt.d.ts" />
+/// <reference types="node" />
 
 import nopt = require("nopt");
 
diff --git a/nopt/nopt.d.ts b/nopt/nopt.d.ts
deleted file mode 100644
index 5cbda6b2b9..0000000000
--- a/nopt/nopt.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// Type definitions for nopt 3.0.1
-// Project: https://github.com/npm/nopt
-// Definitions by: jbondc <https://github.com/jbondc>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "nopt" {
-
-	interface CommandData {
-		[key: string]: string
-	}
-
-	interface TypeDefs {
-		[key: string]: TypeInfo
-	}
-
-	interface TypeInfo {
-		type: Object
-		validate: (data: CommandData, k: string, val: string) => boolean
-	}
-
-	namespace nopt {
-		export function clean(data: CommandData, types: FlagTypeMap, typeDefs?: TypeDefs): string
-		export var typeDefs: TypeDefs
-	}
-
-	interface FlagTypeMap {
-		[k: string]: Object
-	}
-
-	interface ShortFlags {
-		[k: string]: string[]|string
-	}
-
-	function nopt(types: FlagTypeMap, shorthands?: ShortFlags, args?: string[], slice?: number): OptionsParsed
-
-	interface OptionsParsed {
-		[k: string]: any
-		argv: {
-			remain: string[]
-			cooked: string[]
-			original: string[]
-		}
-	}
-
-	export = nopt
-}
diff --git a/nopt/tsconfig.json b/nopt/tsconfig.json
new file mode 100644
index 0000000000..e33d887b6b
--- /dev/null
+++ b/nopt/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "nopt-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/normalizr/index.d.ts b/normalizr/index.d.ts
new file mode 100644
index 0000000000..90750db1cf
--- /dev/null
+++ b/normalizr/index.d.ts
@@ -0,0 +1,109 @@
+// Type definitions for normalizr 2.0.1
+// Project: https://github.com/gaearon/normalizr/
+// Definitions by: Markus Peloso <https://github.com/ToastHawaii/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = Normalizr;
+
+declare namespace Normalizr {
+    type AttributeSetting = string | ((entity: any) => any);
+
+    type SchemaClass = Schema | ArraySchema | UnionSchema;
+
+    type SchemaObject = { [property: string]: SchemaClass | SchemaObject };
+
+    type SchemaType = SchemaClass | SchemaObject | Object;
+
+    export class Schema {
+        /**
+         * Schema lets you define a type of entity returned by your API.
+         * This should correspond to model in your server code.
+         * @param key The key parameter lets you specify the name of the dictionary for this kind of entity.
+         * @param options
+         */
+        constructor(key: string, options?: { idAttribute: AttributeSetting; });
+
+        /**
+         * Lets you specify relationships between different entities.
+         * @param nestedSchema
+         */
+        define(nestedSchema: SchemaObject): void;
+
+        /**
+         * Returns the key of the schema.
+         */
+        getKey(): string;
+
+        /**
+         * Returns the idAttribute of the schema.
+         */
+        getIdAttribute(): AttributeSetting;
+    }
+
+    interface UnionSchema {
+        getItemSchema(): SchemaType;
+        getSchemaKey(item: any): string;
+    }
+
+    interface ArraySchema {
+        getItemSchema(): SchemaType;
+    }
+
+    /**
+     * Describes an array of the schema passed as argument.
+     * @param schema
+     * @param options
+     */
+    export function arrayOf(schema: SchemaType, options?: {
+        /**
+         * If the array contains entities with different schemas, you can use the schemaAttribute option to specify which schema to use for each entity.
+         */
+        schemaAttribute: AttributeSetting
+    }): ArraySchema;
+
+    /**
+     * Describes a map whose values follow the schema passed as argument.
+     * @param schema
+     * @param options
+     */
+    export function valuesOf(schema: SchemaType, options?: {
+        /**
+         * If the map contains entities with different schemas, you can use the schemaAttribute option to specify which schema to use for each entity.
+         */
+        schemaAttribute: AttributeSetting
+    }): ArraySchema;
+
+    /**
+     * Describe a schema which is a union of multiple schemas. This is useful if you need the polymorphic behavior provided by arrayOf or valuesOf but for non-collection fields.
+     * @param schemaMap
+     * @param options
+     */
+    export function unionOf(schemaMap: SchemaType, options?: {
+        /**
+         * Use the required schemaAttribute option to specify which schema to use for each entity.
+         */
+        schemaAttribute: AttributeSetting
+    }): UnionSchema;
+
+    /**
+     * Normalizes object according to schema.
+     * Passed schema should be a nested object reflecting the structure of API response.
+     * @param obj
+     * @param schema
+     * @param options
+     */
+    export function normalize(obj: any | Array<any>, schema: SchemaType, options?: {
+        /**
+         * This is useful if your backend emits additional fields, such as separate ID fields, you'd like to delete in the normalized entity.
+         */
+        assignEntity?: (normalized: any, key: string, entity: any) => any;
+
+        /**
+         * You can use this to resolve conflicts when merging entities with the same key.
+         */
+        mergeIntoEntity?: (stored: any, normalized: any, entityKey: string) => any;
+    }): {
+            entites: any;
+            result: any;
+        };
+}
diff --git a/normalizr/normalizr-tests.ts b/normalizr/normalizr-tests.ts
new file mode 100644
index 0000000000..7b39cb2fc8
--- /dev/null
+++ b/normalizr/normalizr-tests.ts
@@ -0,0 +1,270 @@
+
+
+import { normalize, Schema, arrayOf, unionOf, valuesOf } from 'normalizr';
+
+// First, define a schema for our entities:
+
+const article1 = new Schema('articles');
+const user1 = new Schema('users');
+
+// Then we define nesting rules:
+
+article1.define({
+    author: user1,
+    contributors: arrayOf(user1)
+});
+
+// Now we can use this schema in our API response handlers:
+
+const ServerActionCreators = {
+    // These are two different XHR endpoints with different response schemas.
+    // We can use the schema objects defined earlier to express both of them:
+
+    receiveOneArticle(response: any) {
+        // Here, the response is an object containing data about one article.
+        // Passing the article schema as second parameter to normalize() lets it
+        // correctly traverse the response tree and gather all entities:
+
+        // BEFORE:
+        // {
+        //   id: 1,
+        //   title: 'Some Article',
+        //   author: {
+        //     id: 7,
+        //     name: 'Dan'
+        //   },
+        //   contributors: [{
+        //     id: 10,
+        //     name: 'Abe'
+        //   }, {
+        //     id: 15,
+        //     name: 'Fred'
+        //   }]
+        // }
+        //
+        // AFTER:
+        // {
+        //   result: 1,                    // <--- Note object is referenced by ID
+        //   entities: {
+        //     articles: {
+        //       1: {
+        //         author: 7,              // <--- Same happens for references to
+        //         contributors: [10, 15]  // <--- other entities in the schema
+        //         ...}
+        //     },
+        //     users: {
+        //       7: { ... },
+        //       10: { ... },
+        //       15: { ... }
+        //     }
+        //   }
+        // }
+
+        response = normalize(response, article1);
+    },
+
+    receiveAllArticles(response: any) {
+        // Here, the response is an object with the key 'articles' referencing
+        // an array of article objects. Passing { articles: arrayOf(article) } as
+        // second parameter to normalize() lets it correctly traverse the response
+        // tree and gather all entities:
+
+        // BEFORE:
+        // {
+        //   articles: [{
+        //     id: 1,
+        //     title: 'Some Article',
+        //     author: {
+        //       id: 7,
+        //       name: 'Dan'
+        //     },
+        //     ...
+        //   },
+        //   ...
+        //   ]
+        // }
+        //
+        // AFTER:
+        // {
+        //   result: {
+        //    articles: [1, 2, ...]     // <--- Note how object array turned into ID array
+        //   },
+        //   entities: {
+        //     articles: {
+        //       1: { author: 7, ... }, // <--- Same happens for references to other entities in the schema
+        //       2: { ... },
+        //       ...
+        //     },
+        //     users: {
+        //       7: { ... },
+        //       ..
+        //     }
+        //   }
+        // }
+
+        response = normalize(response, {
+            articles: arrayOf(article1)
+        });
+    }
+}
+
+// new Schema(key, [options])
+
+const article2 = new Schema('articles');
+
+// You can use a custom id attribute
+const article3 = new Schema('articles', { idAttribute: 'slug' });
+
+// Or you can specify a function to infer it
+function generateSlug(entity: any) { /* ... */ }
+const article4 = new Schema('articles', { idAttribute: generateSlug });
+
+// Schema.prototype.define(nestedSchema)
+
+const article5 = new Schema('articles');
+const user5 = new Schema('users');
+
+article5.define({
+    author: user5
+});
+
+// Schema.prototype.getKey()
+
+const article6 = new Schema('articles');
+
+article6.getKey();
+// articles
+
+// Schema.prototype.getIdAttribute()
+
+const article7 = new Schema('articles');
+const slugArticle7 = new Schema('articles', { idAttribute: 'slug' });
+
+article7.getIdAttribute();
+// id
+slugArticle7.getIdAttribute();
+// slug
+
+// arrayOf(schema, [options])
+
+const article8 = new Schema('articles');
+const user8 = new Schema('users');
+
+article8.define({
+    author: user8,
+    contributors: arrayOf(user8)
+});
+
+const article9 = new Schema('articles');
+const image9 = new Schema('images');
+const video9 = new Schema('videos');
+const asset9 = {
+    images: image9,
+    videos: video9
+};
+
+// You can specify the name of the attribute that determines the schema
+article9.define({
+    assets: arrayOf(asset9, { schemaAttribute: 'type' })
+});
+
+// Or you can specify a function to infer it
+function inferSchema9(entity: any) { /* ... */ }
+article9.define({
+    assets: arrayOf(asset9, { schemaAttribute: inferSchema9 })
+});
+
+// valuesOf(schema, [options])
+
+const article10 = new Schema('articles');
+const user10 = new Schema('users');
+
+article10.define({
+    collaboratorsByRole: valuesOf(user10)
+});
+
+const article11 = new Schema('articles');
+const user11 = new Schema('users');
+const group11 = new Schema('groups');
+const collaborator11 = {
+    users: user11,
+    groups: group11
+};
+
+// You can specify the name of the attribute that determines the schema
+article11.define({
+    collaboratorsByRole: valuesOf(collaborator11, { schemaAttribute: 'type' })
+});
+
+// Or you can specify a function to infer it
+function inferSchema11(entity: any) { /* ... */ }
+article11.define({
+    collaboratorsByRole: valuesOf(collaborator11, { schemaAttribute: inferSchema })
+});
+
+// unionOf(schemaMap, [options])
+
+const group12 = new Schema('groups');
+const user12 = new Schema('users');
+
+// a member can be either a user or a group
+const member12 = {
+    users: user12,
+    groups: group12
+};
+
+// You can specify the name of the attribute that determines the schema
+group12.define({
+    owner: unionOf(member12, { schemaAttribute: 'type' })
+});
+
+// Or you can specify a function to infer it
+function inferSchema(entity: any) { /* ... */ }
+group12.define({
+    creator: unionOf(member12, { schemaAttribute: inferSchema })
+});
+
+const group13 = new Schema('groups');
+const user13 = new Schema('users');
+
+const member13 = unionOf({
+    users: user13,
+    groups: group13
+}, { schemaAttribute: 'type' });
+
+group13.define({
+    owner: member13,
+    members: arrayOf(member13),
+    relationships: valuesOf(member13)
+});
+
+// normalize(obj, schema, [options])
+
+const article14 = new Schema('articles');
+const user14 = new Schema('users');
+
+article14.define({
+    author: user14,
+    contributors: arrayOf(user14),
+    meta: {
+        likes: arrayOf({
+            user: user14
+        })
+    }
+});
+
+// ...
+
+// Normalize one article object
+const json = { id: 1, author: /*...*/{} };
+const normalized1 = normalize(json, article14);
+
+// Normalize an array of article objects
+const arr = [{ id: 1, author: /*...*/{} }/*, ...*/]
+const normalized2 = normalize(arr, arrayOf(article14));
+
+// Normalize an array of article objects, referenced by an object key:
+const wrappedArr = { articles: [{ id: 1, author: /*...*/{} }/*, ...*/] }
+const normalized3 = normalize(wrappedArr, {
+    articles: arrayOf(article14)
+});
diff --git a/normalizr/tsconfig.json b/normalizr/tsconfig.json
new file mode 100644
index 0000000000..1cb6ce06a8
--- /dev/null
+++ b/normalizr/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "normalizr-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/notie/notie.d.ts b/notie/index.d.ts
similarity index 100%
rename from notie/notie.d.ts
rename to notie/index.d.ts
diff --git a/notie/notie-tests.ts b/notie/notie-tests.ts
index f1e78c2a59..05b1edf096 100644
--- a/notie/notie-tests.ts
+++ b/notie/notie-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path='notie.d.ts' />
-
 notie.alert(1, 'Success!', 1.5);
 notie.alert(2, 'Warning<br><b>with</b><br><i>HTML</i><br><u>included.</u>', 2);
 notie.alert(3, 'Error.', 2.5);
diff --git a/notie/tsconfig.json b/notie/tsconfig.json
new file mode 100644
index 0000000000..d9a081e290
--- /dev/null
+++ b/notie/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "notie-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/notify/index.d.ts b/notify/index.d.ts
new file mode 100644
index 0000000000..d5d91ebab2
--- /dev/null
+++ b/notify/index.d.ts
@@ -0,0 +1,171 @@
+// Type definitions for Notify.js
+// Project: https://github.com/jpillora/notifyjs
+// Definitions by: Xiaohan Zhang <https://github.com/hellochar>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/
+
+/// <reference types="jquery" />
+
+declare namespace Notify {
+    interface Options {
+        /**
+         * Whether to hide the notification on click. Default is true.
+         */
+        clickToHide?: boolean;
+
+        /**
+         * Whether to auto-hide the notification (after autoHideDelay milliseconds). Default is true.
+         */
+        autoHide?: boolean;
+
+        /**
+         * If autoHide, hide after milliseconds. Default is 5000.
+         */
+        autoHideDelay?: number;
+
+        /**
+         * Show the arrow pointing at the element. Default is true.
+         */
+        arrowShow?: boolean;
+
+        /**
+         * Arrow size in pixels. Default is 5.
+         */
+        arrowSize?: number;
+
+        /**
+         * Position of the notification when created relative to an element. Default is 'bottom left'.
+         */
+        elementPosition?: string;
+
+        /**
+         * Position of the notification when created globally. Default is 'top right'.
+         */
+        globalPosition?: string;
+
+        /**
+         * Style of the notification. Default is 'bootstrap'.
+         *
+         * For more information on styles, refer to Notify.StyleDefinition.
+         */
+        style?: string;
+
+        /**
+         * Class of the notification (string or [string]). Default is 'error'.
+         *
+         * Notify looks through the classes defined in the given style and will apply the CSS
+         * attributes of that style. Additionally, a CSS class of "notifyjs-<style name>-<class name>"
+         * will be applied.
+         */
+        className?: string;
+
+        /**
+         * Animation when notification is shown. Default is 'slideDown'.
+         */
+        showAnimation?: string;
+
+        /**
+         * Duration show animation, in milliseconds. Default is 400.
+         */
+        showDuration?: number;
+
+        /**
+         * Animation when notification is hidden. Default is 'slideUp'.
+         */
+        hideAnimation?: string;
+
+        /**
+         * Duration for hide animation, in milliseconds. Default is 200.
+         */
+        hideDuration?: number;
+
+        /**
+         * Padding in px between element and notification. Deafult is 2.
+         */
+        gap?: number;
+    }
+
+    /**
+     * Notifications created with a specified class will have CSS properties applied to that
+     * notification. This interface defines what properties and their values to apply for a given class.
+     * Keys should be CSS property names, and values their values.
+     */
+    interface ClassCSS {
+        [propertyName: string]: string;
+    }
+
+    interface StyleDefinition {
+
+        /**
+         * Defines the HTML wrapping the notification.
+         *
+         * If you only have HTML element that you need to modify per notification then you should give
+         * this element an attribute of data-notify-text or data-notify-html. Use data-notify-html if
+         * you wish to display arbitrary HTML inside the notification, otherwise, use data-notify-text
+         * as it is more secure.
+         * For more complex notifications, you may give a value to the data-notify-text/data-notify-html
+         * attribute on an element, such as <div data-notify-html="propertyName"></div>. You may then
+         * pass a javasript Object with a "propertyName" key to the notify method, whose value will be
+         * the text/html that the element is populated with.
+         */
+        html: string;
+
+        /**
+         * Defines the available classes in this style. The "base" property will be applied to every
+         * notification with this style.
+         */
+        classes?: {
+                     [className: string]: ClassCSS;
+                     base?: ClassCSS;
+                 };
+
+        /**
+         * All notifications will have this CSS applied to it.
+         */
+        css?: string;
+    }
+
+    interface JQueryStatic {
+        /**
+         * Create a global notification.
+         */
+        (text: string, className?: string): void;
+        (text: string, options?: Options): void;
+        (data: any, className?: string): void;
+        (data: any, options?: Options): void;
+
+        /**
+         * Create a notification positioned relative to the given element.
+         */
+        (element: JQuery, text: string, className?: string): void;
+        (element: JQuery, text: string, options?: Options): void;
+        (element: JQuery, data: any, className?: string): void;
+        (element: JQuery, data: any, options?: Options): void;
+
+        /**
+         * Define a style for Notify to use.
+         */
+        addStyle(styleName: string, styleDefinition: StyleDefinition): void;
+
+        /**
+         * Specify the default options for all notifications.
+         */
+        defaults(options: Options): void;
+    }
+
+
+}
+
+interface JQueryStatic {
+    notify: Notify.JQueryStatic;
+}
+
+interface JQuery {
+    /**
+     * Create a notification positioned relative to the currently selected element.
+     */
+    notify(text: string, className?: string): void;
+    notify(text: string, options?: Notify.Options): void;
+    notify(data: any, className?: string): void;
+    notify(data: any, options?: Notify.Options): void;
+}
+
diff --git a/notify/notify-tests.ts b/notify/notify-tests.ts
index 3395345bfe..33c4c17cc3 100644
--- a/notify/notify-tests.ts
+++ b/notify/notify-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="notify.d.ts" />
+
 
 $.notify.addStyle("bootstrap", {
   html: "<div>\n<span data-notify-text></span>\n</div>",
diff --git a/notify/notify.d.ts b/notify/notify.d.ts
deleted file mode 100644
index 8e7e436048..0000000000
--- a/notify/notify.d.ts
+++ /dev/null
@@ -1,171 +0,0 @@
-// Type definitions for Notify.js
-// Project: https://github.com/jpillora/notifyjs
-// Definitions by: Xiaohan Zhang <https://github.com/hellochar>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace Notify {
-    interface Options {
-        /**
-         * Whether to hide the notification on click. Default is true.
-         */
-        clickToHide?: boolean;
-
-        /**
-         * Whether to auto-hide the notification (after autoHideDelay milliseconds). Default is true.
-         */
-        autoHide?: boolean;
-
-        /**
-         * If autoHide, hide after milliseconds. Default is 5000.
-         */
-        autoHideDelay?: number;
-
-        /**
-         * Show the arrow pointing at the element. Default is true.
-         */
-        arrowShow?: boolean;
-
-        /**
-         * Arrow size in pixels. Default is 5.
-         */
-        arrowSize?: number;
-
-        /**
-         * Position of the notification when created relative to an element. Default is 'bottom left'.
-         */
-        elementPosition?: string;
-
-        /**
-         * Position of the notification when created globally. Default is 'top right'.
-         */
-        globalPosition?: string;
-
-        /**
-         * Style of the notification. Default is 'bootstrap'.
-         *
-         * For more information on styles, refer to Notify.StyleDefinition.
-         */
-        style?: string;
-
-        /**
-         * Class of the notification (string or [string]). Default is 'error'.
-         *
-         * Notify looks through the classes defined in the given style and will apply the CSS
-         * attributes of that style. Additionally, a CSS class of "notifyjs-<style name>-<class name>"
-         * will be applied.
-         */
-        className?: string;
-
-        /**
-         * Animation when notification is shown. Default is 'slideDown'.
-         */
-        showAnimation?: string;
-
-        /**
-         * Duration show animation, in milliseconds. Default is 400.
-         */
-        showDuration?: number;
-
-        /**
-         * Animation when notification is hidden. Default is 'slideUp'.
-         */
-        hideAnimation?: string;
-
-        /**
-         * Duration for hide animation, in milliseconds. Default is 200.
-         */
-        hideDuration?: number;
-
-        /**
-         * Padding in px between element and notification. Deafult is 2.
-         */
-        gap?: number;
-    }
-
-    /**
-     * Notifications created with a specified class will have CSS properties applied to that
-     * notification. This interface defines what properties and their values to apply for a given class.
-     * Keys should be CSS property names, and values their values.
-     */
-    interface ClassCSS {
-        [propertyName: string]: string;
-    }
-
-    interface StyleDefinition {
-
-        /**
-         * Defines the HTML wrapping the notification.
-         *
-         * If you only have HTML element that you need to modify per notification then you should give
-         * this element an attribute of data-notify-text or data-notify-html. Use data-notify-html if
-         * you wish to display arbitrary HTML inside the notification, otherwise, use data-notify-text
-         * as it is more secure.
-         * For more complex notifications, you may give a value to the data-notify-text/data-notify-html
-         * attribute on an element, such as <div data-notify-html="propertyName"></div>. You may then
-         * pass a javasript Object with a "propertyName" key to the notify method, whose value will be
-         * the text/html that the element is populated with.
-         */
-        html: string;
-
-        /**
-         * Defines the available classes in this style. The "base" property will be applied to every
-         * notification with this style.
-         */
-        classes?: {
-                     [className: string]: ClassCSS;
-                     base?: ClassCSS;
-                 };
-
-        /**
-         * All notifications will have this CSS applied to it.
-         */
-        css?: string;
-    }
-
-    interface JQueryStatic {
-        /**
-         * Create a global notification.
-         */
-        (text: string, className?: string): void;
-        (text: string, options?: Options): void;
-        (data: any, className?: string): void;
-        (data: any, options?: Options): void;
-
-        /**
-         * Create a notification positioned relative to the given element.
-         */
-        (element: JQuery, text: string, className?: string): void;
-        (element: JQuery, text: string, options?: Options): void;
-        (element: JQuery, data: any, className?: string): void;
-        (element: JQuery, data: any, options?: Options): void;
-
-        /**
-         * Define a style for Notify to use.
-         */
-        addStyle(styleName: string, styleDefinition: StyleDefinition): void;
-
-        /**
-         * Specify the default options for all notifications.
-         */
-        defaults(options: Options): void;
-    }
-
-
-}
-
-interface JQueryStatic {
-    notify: Notify.JQueryStatic;
-}
-
-interface JQuery {
-    /**
-     * Create a notification positioned relative to the currently selected element.
-     */
-    notify(text: string, className?: string): void;
-    notify(text: string, options?: Notify.Options): void;
-    notify(data: any, className?: string): void;
-    notify(data: any, options?: Notify.Options): void;
-}
-
diff --git a/notify/tsconfig.json b/notify/tsconfig.json
new file mode 100644
index 0000000000..ca1d617af4
--- /dev/null
+++ b/notify/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "notify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/notifyjs/notifyjs.d.ts b/notifyjs/index.d.ts
similarity index 100%
rename from notifyjs/notifyjs.d.ts
rename to notifyjs/index.d.ts
diff --git a/notifyjs/notifyjs-tests.ts b/notifyjs/notifyjs-tests.ts
index 7d9ffec678..236209967c 100644
--- a/notifyjs/notifyjs-tests.ts
+++ b/notifyjs/notifyjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="notifyjs.d.ts" />
+
 
 function test_Notify_constructor() {
     //Min
diff --git a/notifyjs/tsconfig.json b/notifyjs/tsconfig.json
new file mode 100644
index 0000000000..04ea92bcf3
--- /dev/null
+++ b/notifyjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "notifyjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/nouislider/index.d.ts b/nouislider/index.d.ts
new file mode 100644
index 0000000000..8b75146011
--- /dev/null
+++ b/nouislider/index.d.ts
@@ -0,0 +1,179 @@
+// Type definitions for nouislider v8.0.2
+// Project: https://github.com/leongersen/noUiSlider
+// Definitions by: Patrick Davies <https://github.com/bleuarg>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/// <reference types="wnumb"/>
+
+export = noUiSlider;
+export as namespace noUiSlider;
+
+declare namespace noUiSlider {
+    /**
+     * To create a slider, call noUiSlider.create() with an element and your options.
+     */
+    function create(target: HTMLElement, options: Options): void;
+
+    interface Options {
+        /**
+         * The start option sets the number of handles and their start positions, relative to range.
+         */
+        start: number | number[] | number[][];
+        /**
+        * The connect setting can be used to control the bar between the handles,
+        * or the edges of the slider. Use "lower" to connect to the lower side,
+        * or "upper" to connect to the upper side. Setting true sets the bar between the handles.
+        */
+        range: Object;
+        /**
+         * noUiSlider offers several ways to handle user interaction.
+         * The range can be set to drag, and handles can move to taps.
+         * All these effects are optional, and can be enable by adding their keyword to the behaviour option.
+         * This option accepts a "-" separated list of "drag", "tap", "fixed", "snap" or "none".
+         */
+        connect?: string | boolean;
+        /**
+        * When using two handles, the minimum distance between the handles can be set using the margin option.
+        * The margin value is relative to the value set in 'range'.
+        * This option is only available on standard linear sliders.
+        */
+        margin?: number;
+        /**
+         * The limit option is the oposite of the margin option,
+         * limiting the maximum distance between two handles.
+         * As with the margin option, the limit option can only be used on linear sliders.
+         */
+        limit?: number;
+        /**
+         * By default, the slider slides fluently.
+         * In order to make the handles jump between intervals, you can use this option.
+         * The step option is relative to the values provided to range.
+         */
+        step?: number;
+        /**
+         * The orientation setting can be used to set the slider to "vertical" or "horizontal".
+         * Set dimensions! Vertical sliders don't assume a default height, so you'll need to set one.
+         * You can use any unit you want, including % or px.
+         */
+        orientation?: string;
+        /**
+         * By default the sliders are top-to-bottom and left-to-right,
+         * but you can change this using the direction option,
+         * which decides where the upper side of the slider is.
+         */
+        direction?: string;
+        /**
+         * Set the animate option to false to prevent the slider from animating to a new value with when calling .val().
+         */
+        animate?: boolean;
+        /**
+         * All values on the slider are part of a range. The range has a minimum and maximum value.
+         */
+        behaviour?: string;
+        /**
+         * To format the slider output, noUiSlider offers a format option.
+         * Simply specify to and from functions to encode and decode the values.
+         * See manual formatting to the right for usage information.
+         * By default, noUiSlider will format output with 2 decimals.
+         */
+        format?: Object | ((...args:any[]) => any);
+
+        /**
+         * Allows you to generate points along the slider.
+         */
+        pips?: PipsOptions;
+    }
+
+    interface PipsOptions {
+        /**
+         * The 'range' mode uses the slider range to determine where the pips should be. A pip is generated for every percentage specified.
+         *
+         * The 'steps', like 'range', uses the slider range. In steps mode, a pip is generated for every step.
+         * The 'filter' option can be used to filter the generated pips from the 'steps' options'
+         * The filter function must return 0 (no value), 1 (large value) or 2 (small value).
+         *
+         * In 'positions' mode, pips are generated at percentage-based positions on the slider.
+         * Optionally, the stepped option can be set to true to match the pips to the slider steps.
+         *
+         * The 'count' mode can be used to generate a fixed number of pips. As with positions mode, the stepped option can be used.
+         *
+         * The 'values' mode is similar to positions, but it accepts values instead of percentages. The stepped option can be used for this mode.
+         *
+         */
+        mode: string; // "range" | "steps" | "positions" | "count" | "values"
+        /**
+         * Range Mode: percentage for range mode
+         * Step Mode: step number for steps
+         * Positions Mode: percentage-based positions on the slider
+         * Count Mode: positions between pips
+         */
+        density?: number;
+        /**
+         * Step Mode: The filter option can be used to filter the generated pips.
+         * The filter function must return 0 (no value), 1 (large value) or 2 (small value).
+         */
+        filter?: (...args: any[]) => PipFilterResult;
+        /**
+         * format for step mode
+         * see noUiSlider format
+         */
+        format?: Object;
+        /**
+         *
+         * values for positions and values mode
+         * number pips for count mode
+         */
+        values?: number | number[];
+        /**
+         * stepped option for positions, values and count mode
+         */
+        stepped?: boolean;
+    }
+
+    const enum PipFilterResult {
+        NoValue,
+        LargeValue,
+        SmallValue,
+    }
+
+    interface Callback {
+        /**
+         * Array for both one-handle and two-handle sliders. It contains the current slider values,
+         * with formatting applied.
+         */
+        (values: any[], handle: number, unencoded: number): void
+    }
+
+
+    interface noUiSlider {
+        /**
+         * Bind event to the slider.
+         */
+        on(eventName: string, callback: Callback): void;
+        /**
+         * Unbind event to the slider.
+         */
+        off(eventName: string): void;
+        /**
+         * Destroy's the slider.
+         */
+        destroy(): void;
+
+        /**
+         * To get the current slider value. For one-handle sliders, calling .get() will return the value.
+         * For two-handle sliders, an array[value, value] will be returned.
+         */
+        get(): number | number[];
+        /**
+         * noUiSlider will keep your values within the slider range, which saves you a bunch of validation.
+         * If you have configured the slider to use one handle, you can change the current value by passing
+         * a number to the .set() method. If you have two handles, pass an array. One-handled sliders
+         * will also accept arrays. Within an array, you can set one position to null
+         * if you want to leave a handle unchanged.
+         */
+        set(value: number | number[]): void;
+    }
+
+    interface Instance extends HTMLElement {
+        noUiSlider: noUiSlider
+    }
+}
diff --git a/nouislider/nouislider-7.0.10.d.ts b/nouislider/nouislider-7.0.10.d.ts
index b9643d4fb5..a05232da07 100644
--- a/nouislider/nouislider-7.0.10.d.ts
+++ b/nouislider/nouislider-7.0.10.d.ts
@@ -2,8 +2,8 @@
 // Project: https://github.com/leongersen/noUiSlider
 // Definitions by: Corey Jepperson <https://github.com/acoreyj>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="../wnumb/wnumb.d.ts"/>
+/// <reference types="jquery"/>
+/// <reference types="wnumb"/>
 
 
 interface noUiSliderInstance extends JQuery{
diff --git a/nouislider/nouislider-tests-7.0.10.ts b/nouislider/nouislider-tests-7.0.10.ts
index 79c6b327f2..0bb6023774 100644
--- a/nouislider/nouislider-tests-7.0.10.ts
+++ b/nouislider/nouislider-tests-7.0.10.ts
@@ -1,5 +1,5 @@
-/// <reference path="nouislider-7.0.10.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+
+/// <reference types="jquery" />
 
 //basic
 var basicSlider = $("<div/>").noUiSlider({
diff --git a/nouislider/nouislider-tests.ts b/nouislider/nouislider-tests.ts
index 2739e609ce..9588797fcf 100644
--- a/nouislider/nouislider-tests.ts
+++ b/nouislider/nouislider-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="nouislider.d.ts" />
+import noUiSlider = require("nouislider");
 
 var testHtmlElement = document.getElementById('test');
 
diff --git a/nouislider/nouislider.d.ts b/nouislider/nouislider.d.ts
deleted file mode 100644
index 14fb8717f8..0000000000
--- a/nouislider/nouislider.d.ts
+++ /dev/null
@@ -1,176 +0,0 @@
-// Type definitions for nouislider v8.0.2
-// Project: https://github.com/leongersen/noUiSlider
-// Definitions by: Patrick Davies <https://github.com/bleuarg>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/// <reference path="../wnumb/wnumb.d.ts"/>
-
-declare namespace noUiSlider {
-    /**
-     * To create a slider, call noUiSlider.create() with an element and your options.
-     */
-    function create(target: HTMLElement, options: Options): void;
-
-    interface Options {
-        /**
-         * The start option sets the number of handles and their start positions, relative to range.
-         */
-        start: number | number[] | number[][];
-        /**
-        * The connect setting can be used to control the bar between the handles,
-        * or the edges of the slider. Use "lower" to connect to the lower side,
-        * or "upper" to connect to the upper side. Setting true sets the bar between the handles.
-        */
-        range: Object;
-        /**
-         * noUiSlider offers several ways to handle user interaction.
-         * The range can be set to drag, and handles can move to taps.
-         * All these effects are optional, and can be enable by adding their keyword to the behaviour option.
-         * This option accepts a "-" separated list of "drag", "tap", "fixed", "snap" or "none".
-         */
-        connect?: string | boolean;
-        /**
-        * When using two handles, the minimum distance between the handles can be set using the margin option.
-        * The margin value is relative to the value set in 'range'.
-        * This option is only available on standard linear sliders.
-        */
-        margin?: number;
-        /**
-         * The limit option is the oposite of the margin option,
-         * limiting the maximum distance between two handles.
-         * As with the margin option, the limit option can only be used on linear sliders.
-         */
-        limit?: number;
-        /**
-         * By default, the slider slides fluently.
-         * In order to make the handles jump between intervals, you can use this option.
-         * The step option is relative to the values provided to range.
-         */
-        step?: number;
-        /**
-         * The orientation setting can be used to set the slider to "vertical" or "horizontal".
-         * Set dimensions! Vertical sliders don't assume a default height, so you'll need to set one.
-         * You can use any unit you want, including % or px.
-         */
-        orientation?: string;
-        /**
-         * By default the sliders are top-to-bottom and left-to-right,
-         * but you can change this using the direction option,
-         * which decides where the upper side of the slider is.
-         */
-        direction?: string;
-        /**
-         * Set the animate option to false to prevent the slider from animating to a new value with when calling .val().
-         */
-        animate?: boolean;
-        /**
-         * All values on the slider are part of a range. The range has a minimum and maximum value.
-         */
-        behaviour?: string;
-        /**
-         * To format the slider output, noUiSlider offers a format option.
-         * Simply specify to and from functions to encode and decode the values.
-         * See manual formatting to the right for usage information.
-         * By default, noUiSlider will format output with 2 decimals.
-         */
-        format?: Object | ((...args:any[]) => any);
-
-        /**
-         * Allows you to generate points along the slider.
-         */
-        pips?: PipsOptions;
-    }
-
-    interface PipsOptions {
-        /**
-         * The 'range' mode uses the slider range to determine where the pips should be. A pip is generated for every percentage specified.
-         *
-         * The 'steps', like 'range', uses the slider range. In steps mode, a pip is generated for every step.
-         * The 'filter' option can be used to filter the generated pips from the 'steps' options'
-         * The filter function must return 0 (no value), 1 (large value) or 2 (small value).
-         *
-         * In 'positions' mode, pips are generated at percentage-based positions on the slider.
-         * Optionally, the stepped option can be set to true to match the pips to the slider steps.
-         *
-         * The 'count' mode can be used to generate a fixed number of pips. As with positions mode, the stepped option can be used.
-         *
-         * The 'values' mode is similar to positions, but it accepts values instead of percentages. The stepped option can be used for this mode.
-         *
-         */
-        mode: string; // "range" | "steps" | "positions" | "count" | "values"
-        /**
-         * Range Mode: percentage for range mode
-         * Step Mode: step number for steps
-         * Positions Mode: percentage-based positions on the slider
-         * Count Mode: positions between pips
-         */
-        density?: number;
-        /**
-         * Step Mode: The filter option can be used to filter the generated pips.
-         * The filter function must return 0 (no value), 1 (large value) or 2 (small value).
-         */
-        filter?: (...args: any[]) => PipFilterResult;
-        /**
-         * format for step mode
-         * see noUiSlider format
-         */
-        format?: Object;
-        /**
-         *
-         * values for positions and values mode
-         * number pips for count mode
-         */
-        values?: number | number[];
-        /**
-         * stepped option for positions, values and count mode
-         */
-        stepped?: boolean;
-    }
-
-    const enum PipFilterResult {
-        NoValue,
-        LargeValue,
-        SmallValue,
-    }
-
-    interface Callback {
-        /**
-         * Array for both one-handle and two-handle sliders. It contains the current slider values,
-         * with formatting applied.
-         */
-        (values: any[], handle: number, unencoded: number): void
-    }
-
-
-    interface noUiSlider {
-        /**
-         * Bind event to the slider.
-         */
-        on(eventName: string, callback: Callback): void;
-        /**
-         * Unbind event to the slider.
-         */
-        off(eventName: string): void;
-        /**
-         * Destroy's the slider.
-         */
-        destroy(): void;
-
-        /**
-         * To get the current slider value. For one-handle sliders, calling .get() will return the value.
-         * For two-handle sliders, an array[value, value] will be returned.
-         */
-        get(): number | number[];
-        /**
-         * noUiSlider will keep your values within the slider range, which saves you a bunch of validation.
-         * If you have configured the slider to use one handle, you can change the current value by passing
-         * a number to the .set() method. If you have two handles, pass an array. One-handled sliders
-         * will also accept arrays. Within an array, you can set one position to null
-         * if you want to leave a handle unchanged.
-         */
-        set(value: number | number[]): void;
-    }
-
-    interface Instance extends HTMLElement {
-        noUiSlider: noUiSlider
-    }
-}
diff --git a/nouislider/tsconfig.json b/nouislider/tsconfig.json
new file mode 100644
index 0000000000..9d926881c5
--- /dev/null
+++ b/nouislider/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "nouislider-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/npm/index.d.ts b/npm/index.d.ts
new file mode 100644
index 0000000000..1ef58a0dcd
--- /dev/null
+++ b/npm/index.d.ts
@@ -0,0 +1,459 @@
+// Type definitions for npm 2.0.0
+// Project: https://github.com/npm/npm
+// Definitions by: Maxime LUCE <https://github.com/SomaticIT/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare var npm: NPM.Static;
+export = npm;
+
+declare namespace NPM {
+    export interface Static extends NodeJS.EventEmitter {
+        config: Config;
+        commands: Commands;
+        rollbacks: any[];
+        spinner: Spinner;
+        fullList: string[];
+        abbrevs: Dictionary<string>;
+
+        prefix: string;
+        bin: string;
+        globalBin: string;
+        dir: string;
+        globalDir: string;
+        root: string;
+        cache: string;
+        tmp: string;
+
+
+        load(cli: ConfigOptions): void;
+        load(callback: SimpleCallback<Config>): void;
+        load(cli: ConfigOptions, callback: SimpleCallback<Config>): void;
+
+        deref(command: string): string;
+    }
+
+    //#region Commands Interfaces
+
+    export interface Commands {
+        // Commands
+        install: CommandFunction;
+        uninstall: CommandFunction;
+        cache: CommandFunction;
+        config: CommandFunction;
+        set: CommandFunction;
+        get: CommandFunction;
+        update: CommandFunction;
+        outdated: CommandFunction;
+        prune: CommandFunction;
+        submodule: CommandFunction;
+        pack: CommandFunction;
+        dedupe: CommandFunction;
+
+        rebuild: CommandFunction;
+        link: CommandFunction;
+
+        publish: CommandFunction;
+        star: CommandFunction;
+        stars: CommandFunction;
+        tag: CommandFunction;
+        adduser: CommandFunction;
+        unpublish: CommandFunction;
+        owner: CommandFunction;
+        deprecate: CommandFunction;
+        shrinkwrap: CommandFunction;
+
+        help: CommandFunction;
+        "help-search": CommandFunction;
+        ls: CommandFunction;
+        search: CommandFunction;
+        view: CommandFunction;
+        init: CommandFunction;
+        version: CommandFunction;
+        edit: CommandFunction;
+        explore: CommandFunction;
+        docs: CommandFunction;
+        repo: CommandFunction;
+        bugs: CommandFunction;
+        faq: CommandFunction;
+        root: CommandFunction;
+        prefix: CommandFunction;
+        bin: CommandFunction;
+        whoami: CommandFunction;
+
+        test: CommandFunction;
+        stop: CommandFunction;
+        start: CommandFunction;
+        restart: CommandFunction;
+        "run-script": CommandFunction;
+        completion: CommandFunction;
+
+        //Aliases
+        rm: CommandFunction;               // uninstall
+        r: CommandFunction;                // uninstall
+        un: CommandFunction;               // uninstall
+        unlink: CommandFunction;           // uninstall
+        remove: CommandFunction;           // uninstall
+        rb: CommandFunction;               // rebuild
+        list: CommandFunction;             // ls
+        la: CommandFunction;               // ls
+        ll: CommandFunction;               // ls
+        i: CommandFunction;                // install
+        isntall: CommandFunction;          // install
+        up: CommandFunction;               // update
+        c: CommandFunction;                // config
+        info: CommandFunction;             // view
+        show: CommandFunction;             // view
+        find: CommandFunction;             // search
+        s: CommandFunction;                // search
+        se: CommandFunction;               // search
+        author: CommandFunction;           // owner
+        home: CommandFunction;             // docs
+        issues: CommandFunction;           // bugs
+        unstar: CommandFunction;           // star
+        apihelp: CommandFunction;          // help
+        long: CommandFunction;             // adduser
+        "add-user": CommandFunction;       // adduser
+        tst: CommandFunction;              // test
+        t: CommandFunction;                // test
+        "find-dupes": CommandFunction;     // dedupe
+        ddp: CommandFunction;              // dedupe
+        v: CommandFunction;                // view
+
+        // plumbing
+        build: CommandFunction;
+        unbuild: CommandFunction;
+        xmas: CommandFunction;
+        substack: CommandFunction;
+        visnup: CommandFunction;
+
+    }
+
+    export interface CommandFunction {
+        (args: string[], callback: CommandCallback): void;
+    }
+
+    export interface CommandCallback {
+        (err?: Error, result?: any, result2?: any, result3?: any, result4?: any): void;
+    }
+
+    //#endregion
+
+    //#region Other Interfaces
+
+    export interface Spinner {
+        int: string;
+        started: boolean;
+        start(): void;
+        stop(): void;
+    }
+
+    //#endregion
+
+    //#region Config Interfaces
+
+    export interface ConfigStatic {
+        new (base: Config): Config;
+        (base: Config): Config;
+    }
+
+    export interface Config {
+        loaded: boolean;
+        sources: Dictionary<ConfigSource>;
+        rootConf: Config;
+        usingBuiltin: boolean;
+        root?: Config;
+        Conf: ConfigStatic;
+        defs: ConfigDefs;
+
+        get(setting: string): string;
+        set(setting: string, value: string): void;
+
+        loadPrefix(cb: ErrorCallback): void;
+        loadCAFile(caFilePath: string, cb: ErrorCallback): void;
+        loadUid(cb: SimpleCallback<string>): void;
+        setUser(cb: ErrorCallback): void;
+        findPrefix(prefix: string, cb: SimpleCallback<string>): void;
+        getCredentialsByURI(uri: string): Credentials;
+        setCredentialsByURI(uri: string, cred: Credentials): void;
+
+        loadExtras(cb: ErrorCallback): void;
+        save(where: string, cb: ErrorCallback): Config;
+        addFile(file: string, name: string): Config;
+        parse(content: string, file: string): any;
+        add(data: Object, marker: Object): any;
+        addEnv(env: Dictionary<string>): any;
+    }
+
+    export interface ConfigDefs {
+        defaults: ConfigOptions;
+        types: ConfigTypes;
+    }
+
+    export interface ConfigOptions {
+        "always-auth"?: boolean;
+        "bin-links"?: boolean;
+        browser?: string;
+
+        ca?: any; // string | string[]
+        cafile?: string;
+
+        cache?: string;
+
+        "cache-lock-stale"?: number;
+        "cache-lock-retries"?: number;
+        "cache-lock-wait"?: number;
+
+        "cache-max"?: number;
+        "cache-min"?: number;
+
+        cert?: string;
+
+        color?: any; // boolean | string ("always")
+        depth?: number;
+        description?: boolean;
+        dev?: boolean;
+        editor?: string;
+        "engine-strict"?: boolean;
+        force?: boolean;
+
+        "fetch-retries"?: number;
+        "fetch-retry-factor"?: number;
+        "fetch-retry-mintimeout"?: number;
+        "fetch-retry-maxtimeout"?: number;
+
+        git?: string;
+        "git-tag-version"?: boolean;
+
+        global?: boolean;
+        globalconfig?: string;
+        group?: any; // number | string
+        heading?: string;
+        "ignore-scripts"?: boolean;
+        "init-module"?: string;
+        "init.author.name"?: string;
+        "init.author.email"?: string;
+        "init.author.url"?: string;
+        "init.version"?: string;
+        "init.license"?: string;
+        json?: boolean;
+        key?: string;
+        link?: boolean;
+        "local-address"?: string;
+        loglevel?: string;
+        logstream?: NodeJS.ReadWriteStream;
+        long?: boolean;
+        message?: string;
+        "node-version"?: string;
+        npat?: boolean;
+        "onload-script"?: boolean;
+        optional?: boolean;
+        parseable?: boolean;
+        prefix?: string;
+        production?: boolean;
+        "proprietary-attribs"?: boolean;
+        proxy?: any; // boolean | string
+        "https-proxy"?: string;
+        "user-agent"?: string;
+        "rebuild-bundle"?: boolean;
+        registry?: string;
+        rollback?: boolean;
+        save?: boolean;
+        "save-bundle"?: boolean;
+        "save-dev"?: boolean;
+        "save-exact"?: boolean;
+        "save-optional"?: boolean;
+        "save-prefix"?: string;
+        scope?: string;
+        searchopts?: string;
+        searchexclude?: string;
+        searchsort?: string;
+        shell?: string;
+        shrinkwrap?: boolean;
+        "sign-git-tag"?: boolean;
+        spin?: any; // boolean | string ("always")
+        "strict-ssl"?: boolean;
+        tag?: string;
+        tmp?: string;
+        unicode?: boolean;
+        "unsafe-perm"?: boolean;
+        usage?: boolean;
+        user?: any; // string | number
+        userconfig?: string;
+        umask?: number;
+        version?: boolean;
+        versions?: boolean;
+        viewer?: string;
+
+        _exit?: boolean;
+    }
+
+    export interface ConfigTypes {
+        "always-auth": typeof Boolean;
+        "bin-links": typeof Boolean;
+        browser: any[];
+
+        ca: any[];
+        cafile: typeof String;
+        cache: typeof String;
+
+        "cache-lock-stale": typeof Number;
+        "cache-lock-retries": typeof Number;
+        "cache-lock-wait": typeof Number;
+
+        "cache-max": typeof Number;
+        "cache-min": typeof Number;
+
+        cert: typeof String;
+
+        color: any[];
+        depth: typeof Number;
+        description: typeof Boolean;
+        dev: typeof Boolean;
+        editor: typeof String;
+        "engine-strict": typeof Boolean;
+        force: typeof Boolean;
+
+        "fetch-retries": typeof Number;
+        "fetch-retry-factor": typeof Number;
+        "fetch-retry-mintimeout": typeof Number;
+        "fetch-retry-maxtimeout": typeof Number;
+
+        git: typeof String;
+        "git-tag-version": typeof Boolean;
+
+        global: typeof Boolean;
+        globalconfig: typeof String;
+        group: any[];
+        heading: typeof String;
+        "ignore-scripts": typeof Boolean;
+        "init-module": typeof String;
+        "init.author.name": typeof String;
+        "init.author.email": typeof String;
+        "init.author.url": typeof String;
+        "init.version": typeof String;
+        "init.license": typeof String;
+        json: typeof Boolean;
+        key: any[];
+        link: typeof Boolean;
+        "local-address": typeof String;
+        loglevel: any[];
+        logstream: any; // typeof stream.Stream
+        long: typeof Boolean;
+        message: typeof String;
+        "node-version": any[];
+        npat: typeof Boolean;
+        "onload-script": any[];
+        optional: typeof Boolean;
+        parseable: typeof Boolean;
+        prefix: typeof String;
+        production: typeof Boolean;
+        "proprietary-attribs": typeof Boolean;
+        proxy: any[];
+        "https-proxy": any[];
+        "user-agent": typeof String;
+        "rebuild-bundle": Boolean;
+        registry: any[];
+        rollback: typeof Boolean;
+        save: typeof Boolean;
+        "save-bundle": typeof Boolean;
+        "save-dev": typeof Boolean;
+        "save-exact": typeof Boolean;
+        "save-optional": typeof Boolean;
+        "save-prefix": typeof String;
+        scope: typeof String;
+        searchopts: typeof String;
+        searchexclude: any[];
+        searchsort: any[];
+        shell: typeof String;
+        shrinkwrap: typeof Boolean;
+        "sign-git-tag": typeof Boolean;
+        spin: any[];
+        "strict-ssl": typeof Boolean;
+        tag: typeof String;
+        tmp: typeof String;
+        unicode: typeof Boolean;
+        "unsafe-perm": typeof Boolean;
+        usage: typeof Boolean;
+        user: any; // String | Number
+        userconfig: typeof String;
+        umask: typeof Number;
+        version: typeof Boolean;
+        versions: typeof Boolean;
+        viewer: typeof String;
+
+        _exit: typeof Boolean;
+    }
+
+    export interface ConfigShorthands {
+        s: any[];
+        d: any[];
+        dd: any[];
+        ddd: any[];
+        noreg: any[];
+        N: any[];
+        reg: any[];
+        "no-reg": any[];
+        silent: any[];
+        verbose: any[];
+        quiet: any[];
+        q: any[];
+        h: any[];
+        H: any[];
+        "?": any[];
+        help: any[];
+        v: any[];
+        f: any[];
+        gangster: any[];
+        gangsta: any[];
+        desc: any[];
+        "no-desc": any[];
+        "local": any[];
+        l: any[];
+        m: any[];
+        p: any[];
+        porcelain: any[];
+        g: any[];
+        S: any[];
+        D: any[];
+        E: any[];
+        O: any[];
+        y: any[];
+        n: any[];
+        B: any[];
+        C: any[];
+    }
+
+    export interface ConfigSource {
+        path: string;
+        type: string;
+    }
+
+    export interface Credentials {
+        scope: string;
+        token?: string;
+        password?: string;
+        username?: string;
+        email?: string;
+        auth?: string;
+    }
+
+    //#endregion
+
+    //#region Utilities Interfaces
+
+    export interface Dictionary<T> {
+        [key: string]: T;
+    }
+
+    export interface ErrorCallback {
+        (err?: Error): void;
+    }
+
+    export interface SimpleCallback<T> {
+        (err?: Error, result?: T): void;
+    }
+
+    //#endregion
+}
diff --git a/npm/npm-tests.ts b/npm/npm-tests.ts
index 9a85782642..f288b2fc2a 100644
--- a/npm/npm-tests.ts
+++ b/npm/npm-tests.ts
@@ -4,8 +4,8 @@
 * Created by using code samples from https://github.com/npm/npm#using-npm-programmatically.
 */
 
-/// <reference path="../node/node.d.ts" />
-/// <reference path="npm.d.ts" />
+/// <reference types="node" />
+
 
 import npm = require("npm");
 
diff --git a/npm/npm.d.ts b/npm/npm.d.ts
deleted file mode 100644
index 2218ee59b3..0000000000
--- a/npm/npm.d.ts
+++ /dev/null
@@ -1,461 +0,0 @@
-// Type definitions for npm 2.0.0
-// Project: https://github.com/npm/npm
-// Definitions by: Maxime LUCE <https://github.com/SomaticIT/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare namespace NPM {
-    export interface Static extends NodeJS.EventEmitter {
-        config: Config;
-        commands: Commands;
-        rollbacks: any[];
-        spinner: Spinner;
-        fullList: string[];
-        abbrevs: Dictionary<string>;
-
-        prefix: string;
-        bin: string;
-        globalBin: string;
-        dir: string;
-        globalDir: string;
-        root: string;
-        cache: string;
-        tmp: string;
-
-
-        load(cli: ConfigOptions): void;
-        load(callback: SimpleCallback<Config>): void;
-        load(cli: ConfigOptions, callback: SimpleCallback<Config>): void;
-
-        deref(command: string): string;
-    }
-
-    //#region Commands Interfaces
-
-    export interface Commands {
-        // Commands
-        install: CommandFunction;
-        uninstall: CommandFunction;
-        cache: CommandFunction;
-        config: CommandFunction;
-        set: CommandFunction;
-        get: CommandFunction;
-        update: CommandFunction;
-        outdated: CommandFunction;
-        prune: CommandFunction;
-        submodule: CommandFunction;
-        pack: CommandFunction;
-        dedupe: CommandFunction;
-
-        rebuild: CommandFunction;
-        link: CommandFunction;
-
-        publish: CommandFunction;
-        star: CommandFunction;
-        stars: CommandFunction;
-        tag: CommandFunction;
-        adduser: CommandFunction;
-        unpublish: CommandFunction;
-        owner: CommandFunction;
-        deprecate: CommandFunction;
-        shrinkwrap: CommandFunction;
-
-        help: CommandFunction;
-        "help-search": CommandFunction;
-        ls: CommandFunction;
-        search: CommandFunction;
-        view: CommandFunction;
-        init: CommandFunction;
-        version: CommandFunction;
-        edit: CommandFunction;
-        explore: CommandFunction;
-        docs: CommandFunction;
-        repo: CommandFunction;
-        bugs: CommandFunction;
-        faq: CommandFunction;
-        root: CommandFunction;
-        prefix: CommandFunction;
-        bin: CommandFunction;
-        whoami: CommandFunction;
-
-        test: CommandFunction;
-        stop: CommandFunction;
-        start: CommandFunction;
-        restart: CommandFunction;
-        "run-script": CommandFunction;
-        completion: CommandFunction;
-
-        //Aliases
-        rm: CommandFunction;               // uninstall
-        r: CommandFunction;                // uninstall
-        un: CommandFunction;               // uninstall
-        unlink: CommandFunction;           // uninstall
-        remove: CommandFunction;           // uninstall
-        rb: CommandFunction;               // rebuild
-        list: CommandFunction;             // ls
-        la: CommandFunction;               // ls
-        ll: CommandFunction;               // ls
-        i: CommandFunction;                // install
-        isntall: CommandFunction;          // install
-        up: CommandFunction;               // update
-        c: CommandFunction;                // config
-        info: CommandFunction;             // view
-        show: CommandFunction;             // view
-        find: CommandFunction;             // search
-        s: CommandFunction;                // search
-        se: CommandFunction;               // search
-        author: CommandFunction;           // owner
-        home: CommandFunction;             // docs
-        issues: CommandFunction;           // bugs
-        unstar: CommandFunction;           // star
-        apihelp: CommandFunction;          // help
-        long: CommandFunction;             // adduser
-        "add-user": CommandFunction;       // adduser
-        tst: CommandFunction;              // test
-        t: CommandFunction;                // test
-        "find-dupes": CommandFunction;     // dedupe
-        ddp: CommandFunction;              // dedupe
-        v: CommandFunction;                // view
-
-        // plumbing
-        build: CommandFunction;
-        unbuild: CommandFunction;
-        xmas: CommandFunction;
-        substack: CommandFunction;
-        visnup: CommandFunction;
-
-    }
-
-    export interface CommandFunction {
-        (args: string[], callback: CommandCallback): void;
-    }
-
-    export interface CommandCallback {
-        (err?: Error, result?: any, result2?: any, result3?: any, result4?: any): void;
-    }
-
-    //#endregion
-
-    //#region Other Interfaces
-
-    export interface Spinner {
-        int: string;
-        started: boolean;
-        start(): void;
-        stop(): void;
-    }
-
-    //#endregion
-
-    //#region Config Interfaces
-
-    export interface ConfigStatic {
-        new (base: Config): Config;
-        (base: Config): Config;
-    }
-
-    export interface Config {
-        loaded: boolean;
-        sources: Dictionary<ConfigSource>;
-        rootConf: Config;
-        usingBuiltin: boolean;
-        root?: Config;
-        Conf: ConfigStatic;
-        defs: ConfigDefs;
-
-        get(setting: string): string;
-        set(setting: string, value: string): void;
-
-        loadPrefix(cb: ErrorCallback): void;
-        loadCAFile(caFilePath: string, cb: ErrorCallback): void;
-        loadUid(cb: SimpleCallback<string>): void;
-        setUser(cb: ErrorCallback): void;
-        findPrefix(prefix: string, cb: SimpleCallback<string>): void;
-        getCredentialsByURI(uri: string): Credentials;
-        setCredentialsByURI(uri: string, cred: Credentials): void;
-
-        loadExtras(cb: ErrorCallback): void;
-        save(where: string, cb: ErrorCallback): Config;
-        addFile(file: string, name: string): Config;
-        parse(content: string, file: string): any;
-        add(data: Object, marker: Object): any;
-        addEnv(env: Dictionary<string>): any;
-    }
-
-    export interface ConfigDefs {
-        defaults: ConfigOptions;
-        types: ConfigTypes;
-    }
-
-    export interface ConfigOptions {
-        "always-auth"?: boolean;
-        "bin-links"?: boolean;
-        browser?: string;
-
-        ca?: any; // string | string[]
-        cafile?: string;
-
-        cache?: string;
-
-        "cache-lock-stale"?: number;
-        "cache-lock-retries"?: number;
-        "cache-lock-wait"?: number;
-
-        "cache-max"?: number;
-        "cache-min"?: number;
-
-        cert?: string;
-
-        color?: any; // boolean | string ("always")
-        depth?: number;
-        description?: boolean;
-        dev?: boolean;
-        editor?: string;
-        "engine-strict"?: boolean;
-        force?: boolean;
-
-        "fetch-retries"?: number;
-        "fetch-retry-factor"?: number;
-        "fetch-retry-mintimeout"?: number;
-        "fetch-retry-maxtimeout"?: number;
-
-        git?: string;
-        "git-tag-version"?: boolean;
-
-        global?: boolean;
-        globalconfig?: string;
-        group?: any; // number | string
-        heading?: string;
-        "ignore-scripts"?: boolean;
-        "init-module"?: string;
-        "init.author.name"?: string;
-        "init.author.email"?: string;
-        "init.author.url"?: string;
-        "init.version"?: string;
-        "init.license"?: string;
-        json?: boolean;
-        key?: string;
-        link?: boolean;
-        "local-address"?: string;
-        loglevel?: string;
-        logstream?: NodeJS.ReadWriteStream;
-        long?: boolean;
-        message?: string;
-        "node-version"?: string;
-        npat?: boolean;
-        "onload-script"?: boolean;
-        optional?: boolean;
-        parseable?: boolean;
-        prefix?: string;
-        production?: boolean;
-        "proprietary-attribs"?: boolean;
-        proxy?: any; // boolean | string
-        "https-proxy"?: string;
-        "user-agent"?: string;
-        "rebuild-bundle"?: boolean;
-        registry?: string;
-        rollback?: boolean;
-        save?: boolean;
-        "save-bundle"?: boolean;
-        "save-dev"?: boolean;
-        "save-exact"?: boolean;
-        "save-optional"?: boolean;
-        "save-prefix"?: string;
-        scope?: string;
-        searchopts?: string;
-        searchexclude?: string;
-        searchsort?: string;
-        shell?: string;
-        shrinkwrap?: boolean;
-        "sign-git-tag"?: boolean;
-        spin?: any; // boolean | string ("always")
-        "strict-ssl"?: boolean;
-        tag?: string;
-        tmp?: string;
-        unicode?: boolean;
-        "unsafe-perm"?: boolean;
-        usage?: boolean;
-        user?: any; // string | number
-        userconfig?: string;
-        umask?: number;
-        version?: boolean;
-        versions?: boolean;
-        viewer?: string;
-
-        _exit?: boolean;
-    }
-
-    export interface ConfigTypes {
-        "always-auth": typeof Boolean;
-        "bin-links": typeof Boolean;
-        browser: any[];
-
-        ca: any[];
-        cafile: typeof String;
-        cache: typeof String;
-
-        "cache-lock-stale": typeof Number;
-        "cache-lock-retries": typeof Number;
-        "cache-lock-wait": typeof Number;
-
-        "cache-max": typeof Number;
-        "cache-min": typeof Number;
-
-        cert: typeof String;
-
-        color: any[];
-        depth: typeof Number;
-        description: typeof Boolean;
-        dev: typeof Boolean;
-        editor: typeof String;
-        "engine-strict": typeof Boolean;
-        force: typeof Boolean;
-
-        "fetch-retries": typeof Number;
-        "fetch-retry-factor": typeof Number;
-        "fetch-retry-mintimeout": typeof Number;
-        "fetch-retry-maxtimeout": typeof Number;
-
-        git: typeof String;
-        "git-tag-version": typeof Boolean;
-
-        global: typeof Boolean;
-        globalconfig: typeof String;
-        group: any[];
-        heading: typeof String;
-        "ignore-scripts": typeof Boolean;
-        "init-module": typeof String;
-        "init.author.name": typeof String;
-        "init.author.email": typeof String;
-        "init.author.url": typeof String;
-        "init.version": typeof String;
-        "init.license": typeof String;
-        json: typeof Boolean;
-        key: any[];
-        link: typeof Boolean;
-        "local-address": typeof String;
-        loglevel: any[];
-        logstream: any; // typeof stream.Stream
-        long: typeof Boolean;
-        message: typeof String;
-        "node-version": any[];
-        npat: typeof Boolean;
-        "onload-script": any[];
-        optional: typeof Boolean;
-        parseable: typeof Boolean;
-        prefix: typeof String;
-        production: typeof Boolean;
-        "proprietary-attribs": typeof Boolean;
-        proxy: any[];
-        "https-proxy": any[];
-        "user-agent": typeof String;
-        "rebuild-bundle": Boolean;
-        registry: any[];
-        rollback: typeof Boolean;
-        save: typeof Boolean;
-        "save-bundle": typeof Boolean;
-        "save-dev": typeof Boolean;
-        "save-exact": typeof Boolean;
-        "save-optional": typeof Boolean;
-        "save-prefix": typeof String;
-        scope: typeof String;
-        searchopts: typeof String;
-        searchexclude: any[];
-        searchsort: any[];
-        shell: typeof String;
-        shrinkwrap: typeof Boolean;
-        "sign-git-tag": typeof Boolean;
-        spin: any[];
-        "strict-ssl": typeof Boolean;
-        tag: typeof String;
-        tmp: typeof String;
-        unicode: typeof Boolean;
-        "unsafe-perm": typeof Boolean;
-        usage: typeof Boolean;
-        user: any; // String | Number
-        userconfig: typeof String;
-        umask: typeof Number;
-        version: typeof Boolean;
-        versions: typeof Boolean;
-        viewer: typeof String;
-
-        _exit: typeof Boolean;
-    }
-
-    export interface ConfigShorthands {
-        s: any[];
-        d: any[];
-        dd: any[];
-        ddd: any[];
-        noreg: any[];
-        N: any[];
-        reg: any[];
-        "no-reg": any[];
-        silent: any[];
-        verbose: any[];
-        quiet: any[];
-        q: any[];
-        h: any[];
-        H: any[];
-        "?": any[];
-        help: any[];
-        v: any[];
-        f: any[];
-        gangster: any[];
-        gangsta: any[];
-        desc: any[];
-        "no-desc": any[];
-        "local": any[];
-        l: any[];
-        m: any[];
-        p: any[];
-        porcelain: any[];
-        g: any[];
-        S: any[];
-        D: any[];
-        E: any[];
-        O: any[];
-        y: any[];
-        n: any[];
-        B: any[];
-        C: any[];
-    }
-
-    export interface ConfigSource {
-        path: string;
-        type: string;
-    }
-
-    export interface Credentials {
-        scope: string;
-        token?: string;
-        password?: string;
-        username?: string;
-        email?: string;
-        auth?: string;
-    }
-
-    //#endregion
-
-    //#region Utilities Interfaces
-
-    export interface Dictionary<T> {
-        [key: string]: T;
-    }
-
-    export interface ErrorCallback {
-        (err?: Error): void;
-    }
-
-    export interface SimpleCallback<T> {
-        (err?: Error, result?: T): void;
-    }
-
-    //#endregion
-}
-
-declare module "npm" {
-    var npm: NPM.Static;
-    export = npm;
-}
diff --git a/npm/tsconfig.json b/npm/tsconfig.json
new file mode 100644
index 0000000000..d2d523f86f
--- /dev/null
+++ b/npm/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "npm-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/nprogress/NProgress-tests.ts b/nprogress/NProgress-tests.ts
index 3d07cafa2b..08bdb8ae28 100644
--- a/nprogress/NProgress-tests.ts
+++ b/nprogress/NProgress-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="./NProgress.d.ts"/>
-
 function test_basics() {
     NProgress.start();
     NProgress.inc();
diff --git a/nprogress/NProgress.d.ts b/nprogress/index.d.ts
similarity index 100%
rename from nprogress/NProgress.d.ts
rename to nprogress/index.d.ts
diff --git a/nprogress/tsconfig.json b/nprogress/tsconfig.json
new file mode 100644
index 0000000000..f620e9dc1a
--- /dev/null
+++ b/nprogress/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "nprogress-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/numbro/numbro.d.ts b/numbro/index.d.ts
similarity index 100%
rename from numbro/numbro.d.ts
rename to numbro/index.d.ts
diff --git a/numbro/numbro-commonjs-tests.ts b/numbro/numbro-commonjs-tests.ts
index c428a475e8..3dc0eba233 100644
--- a/numbro/numbro-commonjs-tests.ts
+++ b/numbro/numbro-commonjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="numbro.d.ts" />
+
 import numbro = require("numbro");
 
 var valueFormat: string = numbro(1000).format('0,0');
diff --git a/numbro/numbro-tests.ts b/numbro/numbro-tests.ts
index 0b18e898dd..5b5b762353 100644
--- a/numbro/numbro-tests.ts
+++ b/numbro/numbro-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="numbro.d.ts" />
+
 
 var valueFormat: string = numbro(1000).format('0,0');
 // '1,000'
diff --git a/numbro/tsconfig.json b/numbro/tsconfig.json
new file mode 100644
index 0000000000..9e04139421
--- /dev/null
+++ b/numbro/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "numbro-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/numeraljs/numeraljs.d.ts b/numeral/index.d.ts
similarity index 100%
rename from numeraljs/numeraljs.d.ts
rename to numeral/index.d.ts
diff --git a/numeraljs/numeraljs-commonjs-tests.ts b/numeral/numeraljs-commonjs-tests.ts
similarity index 96%
rename from numeraljs/numeraljs-commonjs-tests.ts
rename to numeral/numeraljs-commonjs-tests.ts
index e8d54d16c6..983f0ebc82 100644
--- a/numeraljs/numeraljs-commonjs-tests.ts
+++ b/numeral/numeraljs-commonjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="numeraljs.d.ts" />
+
 import numeral = require("numeral");
 
 var valueFormat: string = numeral(1000).format('0,0');
diff --git a/numeraljs/numeraljs-tests.ts b/numeral/numeraljs-tests.ts
similarity index 95%
rename from numeraljs/numeraljs-tests.ts
rename to numeral/numeraljs-tests.ts
index e70721b902..6202b16b0e 100644
--- a/numeraljs/numeraljs-tests.ts
+++ b/numeral/numeraljs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="numeraljs.d.ts" />
+
 
 var valueFormat: string = numeral(1000).format('0,0');
 // '1,000'
diff --git a/numeral/tsconfig.json b/numeral/tsconfig.json
new file mode 100644
index 0000000000..007f8cb70d
--- /dev/null
+++ b/numeral/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "numeraljs-commonjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/nunjucks/index.d.ts b/nunjucks/index.d.ts
new file mode 100644
index 0000000000..c4f1ce9e8c
--- /dev/null
+++ b/nunjucks/index.d.ts
@@ -0,0 +1,132 @@
+// Type definitions for nunjucks
+// Project: http://mozilla.github.io/nunjucks/
+// Definitions by: Ruben Slabbert <https://github.com/RubenSlabbert/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare namespace Nunjucks {
+    function render(name: string, context?: Object): string;
+    function render(name: string, context?: Object, callback?: (err: any, res: string) => any): void;
+
+    function renderString(src: string, context: Object): string;
+    function renderString(src: string, context: Object, callback?: (err: any, res: string) => any): void;
+
+    function compile(src: string, env?: Environment): Template;
+    function compile(src: string, env?: Environment, callback?: (err: any, res: Template) => any): Template;
+
+    function precompile(path: string, opts?: PrecompileOptions): string;
+    function precompileString(src: string, opts?: PrecompileOptions): string;
+
+    interface PrecompileOptions {
+        name?: string;
+        asFunction?: boolean;
+        force?: boolean;
+        env?: Environment;
+        include?: string[];
+        exclude?: string[];
+        wrapper?(templates: { name: string, template: string }, opts: PrecompileOptions): string;
+    }
+
+    class Template {
+        constructor(src: string, env?: Environment, eagerCompile?: boolean);
+        render(context?: Object): string;
+        render(context?: Object, callback?: (err: any, res: string) => any): void;
+    }
+
+    function configure(options: ConfigureOptions): Environment;
+    function configure(path: string, options?: ConfigureOptions): Environment;
+
+    interface ConfigureOptions {
+        autoescape?: boolean;
+        throwOnUndefined?: boolean;
+        trimBlocks?: boolean;
+        lstripBlocks?: boolean;
+        watch?: boolean;
+        noCache?: boolean;
+        web?: {
+            useCache?: boolean,
+            async?: boolean
+        };
+        express?: Object;
+        tags?: {
+            blockStart?: string,
+            blockEnd?: string,
+            variableStart?: string,
+            variableEnd?: string,
+            commentStart?: string,
+            commentEnd?: string
+        };
+    }
+
+    class Environment {
+        options: {
+            autoescape: boolean;
+        };
+
+        constructor(loader: ILoader, opts?: ConfigureOptions);
+        constructor(loaders: ILoader[], opts?: ConfigureOptions);
+
+        render(name: string, context?: Object): string;
+        render(name: string, context?: Object, callback?: (err: any, res: string) => any): void;
+
+        renderString(name: string, context: Object): string;
+        renderString(name: string, context: Object, callback?: (err: any, res: string) => any): void;
+
+        addFilter(name: string, func: (...args: any[]) => any, async?: boolean): void;
+        getFilter(name: string): void;
+
+        addExtension(name: string, ext: Extension): void;
+        removeExtension(name: string): void;
+        getExtension(name: string): Extension;
+        hasExtension(name: string): void;
+
+        addGlobal(name: string, value: any): void;
+
+        getTemplate(name: string, eagerCompile?: boolean): Template;
+        getTemplate(name: string, eagerCompile?: boolean, callback?: (err: any, templ: Template) => Template): void;
+
+        express(app: Object): void;
+    }
+
+    interface Extension {
+        tags: string[];
+        // Parser API is undocumented it is suggested to check the source: https://github.com/mozilla/nunjucks/blob/master/src/parser.js
+        parse(parser: any, nodes: any, lexer: any): any;
+    }
+
+    function installJinjaCompat(): void;
+
+    interface ILoader {
+        async?: boolean;
+        getSource(name: string): LoaderSource;
+        extend?(extender: ILoader): ILoader;
+    }
+
+    // Needs both Loader and ILoader since nunjucks uses a custom object system
+    // Object system is also responsible for the extend methods
+    class Loader {
+        on(name: string, func: (...args: any[]) => any): void;
+        emit(name: string, ...args: any[]): void;
+        resolve(from: string, to: string): string;
+        isRelative(filename: string): boolean;
+        extend(toExtend: ILoader): ILoader;
+    }
+
+    interface LoaderSource {
+        src: string;
+        path: string;
+        noCache: boolean;
+    }
+
+    class FileSystemLoader extends Loader implements ILoader {
+        init(searchPaths: string[], opts: any): void;
+        getSource(name: string): LoaderSource;
+    }
+
+    class PrecompiledLoader extends Loader implements ILoader {
+        init(searchPaths: string[], opts: any): void;
+        getSource(name: string): LoaderSource;
+    }
+}
+
+export = Nunjucks;
diff --git a/nunjucks/nunjucks-tests.ts b/nunjucks/nunjucks-tests.ts
index 11438b14c8..7407cc65ba 100644
--- a/nunjucks/nunjucks-tests.ts
+++ b/nunjucks/nunjucks-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="nunjucks.d.ts" />
 
 import nunjucks = require("nunjucks");
 
diff --git a/nunjucks/nunjucks.d.ts b/nunjucks/nunjucks.d.ts
deleted file mode 100644
index f6c059128f..0000000000
--- a/nunjucks/nunjucks.d.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-// Type definitions for nunjucks
-// Project: http://mozilla.github.io/nunjucks/
-// Definitions by: Ruben Slabbert <https://github.com/RubenSlabbert/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "nunjucks" {
-    namespace Nunjucks {
-        function render(name: string, context?: Object): string;
-        function render(name: string, context?: Object, callback?: (err: any, res: string) => any): void;
-
-        function renderString(src: string, context: Object): string;
-        function renderString(src: string, context: Object, callback?: (err: any, res: string) => any): void;
-
-        function compile(src: string, env?: Environment): Template;
-        function compile(src: string, env?: Environment, callback?: (err: any, res: Template) => any): Template;
-
-        function precompile(path: string, opts?: PrecompileOptions): string;
-        function precompileString(src: string, opts?: PrecompileOptions): string;
-
-        interface PrecompileOptions {
-            name?: string;
-            asFunction?: boolean;
-            force?: boolean;
-            env?: Environment;
-            include?: string[];
-            exclude?: string[];
-            wrapper?(templates: { name: string, template: string }, opts: PrecompileOptions): string;
-        }
-
-        class Template {
-            constructor(src: string, env?: Environment, eagerCompile?: boolean);
-            render(context?: Object): string;
-            render(context?: Object, callback?: (err: any, res: string) => any): void;
-        }
-
-        function configure(options: ConfigureOptions): Environment;
-        function configure(path: string, options?: ConfigureOptions): Environment;
-
-        interface ConfigureOptions {
-            autoescape?: boolean;
-            throwOnUndefined?: boolean;
-            trimBlocks?: boolean;
-            lstripBlocks?: boolean;
-            watch?: boolean;
-            noCache?: boolean;
-            web?: {
-                useCache?: boolean,
-                async?: boolean
-            };
-            express?: Object;
-            tags?: {
-                blockStart?: string,
-                blockEnd?: string,
-                variableStart?: string,
-                variableEnd?: string,
-                commentStart?: string,
-                commentEnd?: string
-            };
-        }
-
-        class Environment {
-            options: {
-                autoescape: boolean;
-            };
-
-            constructor(loader: ILoader, opts?: ConfigureOptions);
-            constructor(loaders: ILoader[], opts?: ConfigureOptions);
-
-            render(name: string, context?: Object): string;
-            render(name: string, context?: Object, callback?: (err: any, res: string) => any): void;
-
-            renderString(name: string, context: Object): string;
-            renderString(name: string, context: Object, callback?: (err: any, res: string) => any): void;
-
-            addFilter(name: string, func: (...args: any[]) => any, async?: boolean): void;
-            getFilter(name: string): void;
-
-            addExtension(name: string, ext: Extension): void;
-            removeExtension(name: string): void;
-            getExtension(name: string): Extension;
-            hasExtension(name: string): void;
-
-            addGlobal(name: string, value: any): void;
-
-            getTemplate(name: string, eagerCompile?: boolean): Template;
-            getTemplate(name: string, eagerCompile?: boolean, callback?: (err: any, templ: Template) => Template): void;
-
-            express(app: Object): void;
-        }
-
-        interface Extension {
-            tags: string[];
-            // Parser API is undocumented it is suggested to check the source: https://github.com/mozilla/nunjucks/blob/master/src/parser.js
-            parse(parser: any, nodes: any, lexer: any): any;
-        }
-
-        function installJinjaCompat(): void;
-
-        interface ILoader {
-            async?: boolean;
-            getSource(name: string): LoaderSource;
-            extend?(extender: ILoader): ILoader;
-        }
-
-        // Needs both Loader and ILoader since nunjucks uses a custom object system
-        // Object system is also responsible for the extend methods
-        class Loader {
-            on(name: string, func: (...args: any[]) => any): void;
-            emit(name: string, ...args: any[]): void;
-            resolve(from: string, to: string): string;
-            isRelative(filename: string): boolean;
-            extend(toExtend: ILoader): ILoader;
-        }
-
-        interface LoaderSource {
-            src: string;
-            path: string;
-            noCache: boolean;
-        }
-
-        class FileSystemLoader extends Loader implements ILoader {
-            init(searchPaths: string[], opts: any): void;
-            getSource(name: string): LoaderSource;
-        }
-
-        class PrecompiledLoader extends Loader implements ILoader {
-            init(searchPaths: string[], opts: any): void;
-            getSource(name: string): LoaderSource;
-        }
-    }
-
-    export = Nunjucks;
-}
\ No newline at end of file
diff --git a/nunjucks/tsconfig.json b/nunjucks/tsconfig.json
new file mode 100644
index 0000000000..ca0c5b5894
--- /dev/null
+++ b/nunjucks/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "nunjucks-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/nvd3/index.d.ts b/nvd3/index.d.ts
new file mode 100644
index 0000000000..177d4f8355
--- /dev/null
+++ b/nvd3/index.d.ts
@@ -0,0 +1,3351 @@
+// Type definitions for nvd3 1.8.1
+// Project: https://github.com/novus/nvd3
+// Definitions by: Peter Mitchell <https://github.com/PjMitchell/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="d3" />
+declare namespace nv {
+
+//#region Core Interfaces
+	interface Margin {
+		left?: number,
+		right?: number,
+		top?: number,
+		bottom?: number
+	}
+
+    interface Size {
+        height: number;
+        width: number;
+    }
+
+    interface ArcsRadius {
+        inner: number;
+        outer: number;
+    }
+
+    interface Offset {
+        left?: number;
+        top?: number;
+    }
+
+    interface State {
+        dispatch: d3.Dispatch;
+    }
+
+    interface InteractiveLayer {
+        tooltip: Tooltip
+    }
+
+    interface SymbolMap {
+        set(name:string,func: (size: any)=>void): void
+    }
+
+    interface Utils {
+        /* Default color chooser uses a color scale of 20 colors from D3  https://github.com/mbostock/d3/wiki/Ordinal-Scales#categorical-colors */
+        defaultColor(): string[];
+
+        getColor(arg: any): string[];
+
+        /* Binds callback function to run when window is resized */
+        windowResize(listener: (ev: Event) => any): void;
+        /* Gets the browser window size */
+        windowSize(): Size;
+        state(): State;
+        symbolMap: SymbolMap;
+    }
+
+    interface ChartFactory<TChart extends Nvd3Element> {
+        generate: () => TChart;
+        callback?: (chart: TChart) => void;
+    }
+
+    interface Nvd3TooltipStatic {
+        show([left, top]: [number, number], content: string, gravity?: string): void; //todo sort out use on nv.tooltip.
+        cleanup(): void; //todo sort out use on nv.tooltip.
+    }
+
+    interface Nvd3Element {
+        dispatch: d3.Dispatch;
+        options(options: any): this;
+        update(): void;
+        (transition: d3.Transition<any[]>, ...args: any[]): any;
+        (selection: d3.Selection<any[]>, ...args: any[]): any;
+        (transition: d3.Transition<any>, ...args: any[]): any;
+        (selection: d3.Selection<any>, ...args: any[]): any;
+    }
+
+    interface Chart extends Nvd3Element {
+        state: State;
+        interactiveLayer: InteractiveLayer;
+    }
+
+//#endregion
+
+//#region Chart Component
+
+    interface Legend extends Nvd3Element {
+        align(): boolean;
+        align(value: boolean): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        expanded(): boolean;
+        expanded(value: boolean): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        key(): any;
+        key(value: any): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        /*Specifies how much spacing there is between legend items.*/
+        padding(): number;
+        /*Specifies how much spacing there is between legend items.*/
+        padding(value: number): this;
+        radioButtonMode(): boolean;
+        //If true, clicking legend items will cause it to behave like a radio button. (only one can be selected at
+        radioButtonMode(value: boolean): this;
+        rightAlign(): boolean;
+        rightAlign(value: boolean): this;
+        //If true, legend will update data.disabled and trigger a 'stateChange' dispatch.
+        updateState(): boolean;
+        //If true, legend will update data.disabled and trigger a 'stateChange' dispatch.
+        updateState(value: boolean): this;
+        //Options are "classic" and "furious"
+        vers(): string;
+        //Options are "classic" and "furious"
+        vers(value: string): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+    }
+
+	interface Nvd3Axis extends d3.svg.Axis {
+        axisLabel(): string;
+        axisLabel(value: string): this;
+        axisLabelDistance(): number;
+        axisLabelDistance(value: number): this;
+        domain(): number[];
+        domain(domain: number[]): this;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(): number;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(value: number): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        orient(): string;
+        orient(orientation: string): this;
+        range(): number[];
+        range(range: number[]): this;
+        rangeBand(): number;
+        rangeBands(interval: [number, number], padding?: number, outerPadding?: number): this;
+        /*Rotates the X axis labels by the specified degree.*/
+        rotateLabels(): number;
+        /*Rotates the X axis labels by the specified degree.*/
+        rotateLabels(range: number): this;
+        rotateYLabels(): number;
+        rotateYLabels(range: number): this;
+        scale(): any;
+        scale(scale: any): this;
+        showMaxMin(value: boolean): this;
+        staggerLabels(): boolean;
+        staggerLabels(value: boolean): this;
+        tickFormat(): (d: any) => string;
+        tickFormat(format: (t: any) => string): this;
+        tickFormat(format: string): this;
+        tickFormat(format: (d: any, i: any) => string): this;
+        tickPadding(): number;
+        tickPadding(padding: number): this;
+        tickSize(): number;
+        tickSize(size: number): this;
+        tickSize(inner: number, outer: number): this;
+        tickValues(): any[];
+        tickValues(values: any[]): this;
+        ticks(): any[];
+        ticks(...args: any[]): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+	}
+
+    interface BoxPlot extends Nvd3Element {
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(): number;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(value: number): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        id(): any;
+        id(value: number|string): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        maxBoxWidth(): number;
+        maxBoxWidth(value: number): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any) => any;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any) => any): this;
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(): number[];
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(value: number[]): this;
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(): number[];
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(value: number[]): this;
+        /* Override the default scale type for the X axis*/
+        xScale(): any;
+        /* Override the default scale type for the X axis*/
+        xScale(value: any): this;
+        y(): (d: any) => number;
+        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        y(func: (d: any) => number): this;
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(): number[];
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(value: number[]): this;
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(): number[];
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(value: number[]): this;
+        /* Override the default scale type for the y axis*/
+        yScale(): any;
+        /* Override the default scale type for the y axis*/
+        yScale(value: any): this;
+    }
+
+    interface Bullet extends Nvd3Element {
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceX(): number[];
+        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceX(value: number[]): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        markers(): (d: any) => any //todo;
+        markers(func: (d: any) => any): this //todo;
+        measures(): (d: any) => any //todo;
+        measures(func: (d: any) => any): this //todo;
+        orient(): string;
+        orient(orientation: string): this;
+        ranges(): (d: any) => any //todo;
+        ranges(func: (d: any) => any): this //todo;
+        tickFormat(): (d: any) => string;
+        tickFormat(format: (d: any) => string): this;
+        tickFormat(format: string): this;
+        tickFormat(format: (d: any, i: any) => string): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+    }
+
+    interface CandlestickBar extends Nvd3Element {
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(): boolean;
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(value: boolean): this;
+        close(): (d: any) => number;
+        close(func: (d:any) => number): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceX(): number[];
+        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceX(value: number[]): this;
+        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option*/
+        forceY(): number[];
+        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option*/
+        forceY(value: number[]): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        high(): (d: any) => number;
+        high(func: (d: any) => number): this;
+        id(): any;
+id(value: number|string): this;
+        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
+        interactive(): boolean;
+        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
+        interactive(value: boolean): this;
+        low(): (d: any) => number;
+        low(func: (d: any) => number): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        open(): (d: any) => number;
+        open(func: (d: any) => number): this;
+        padData(): boolean;
+        padData(value: boolean): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any) => any;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any) => any): this;
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(): number[];
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(value: number[]): this;
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(): number[];
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(value: number[]): this;
+        /* Override the default scale type for the X axis*/
+        xScale(): any;
+        /* Override the default scale type for the X axis*/
+        xScale(value: any): this;
+        y(): (d: any) => number;
+        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        y(func: (d: any) => number): this;
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(): number[];
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(value: number[]): this;
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(): number[];
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(value: number[]): this;
+        /* Override the default scale type for the y axis*/
+        yScale(): any;
+        /* Override the default scale type for the y axis*/
+        yScale(value: any): this;
+    }
+
+    interface DiscreteBar extends Nvd3Element {
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(): number;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(value: number): this;
+        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
+        forceY(): number[];
+        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
+        forceY(value: number[]): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        id(): any;
+id(value: number|string): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        rectClass(): string;
+        rectClass(value: string): this;
+        /*Prints the Y values on the top of the bars. Only recommended to use if there aren't many bars.*/
+        showValues(): boolean;
+        /*Prints the Y values on the top of the bars. Only recommended to use if there aren't many bars.*/
+        showValues(value: boolean): this;
+        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
+        valueFormat(): string;
+        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
+        valueFormat(value: string): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any) => any;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any) => any): this;
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(): number[];
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(value: number[]): this;
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(): number[];
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(value: number[]): this;
+        /* Override the default scale type for the X axis*/
+        xScale(): any;
+        /* Override the default scale type for the X axis*/
+        xScale(value: any): this;
+        y(): (d: any) => number;
+        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        y(func: (d: any) => number): this;
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(): number[];
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(value: number[]): this;
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(): number[];
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(value: number[]): this;
+        /* Override the default scale type for the y axis*/
+        yScale(): any;
+        /* Override the default scale type for the y axis*/
+        yScale(value: any): this;
+    }
+
+    interface Distribution extends Nvd3Element {
+        axis(): string;
+        axis(value: 'x'): this;
+        axis(value: 'y'): this;
+        axis(value: string): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        domain(): number[];
+        domain(value: number[]): this;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(): number;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(value: number): this;
+        getData(func: (d: any) => number): this;
+        scale(): any;
+        scale(value: any): this;
+        size(): number;
+        size(value: number): this;
+        width(): number;
+        width(value: number): this;
+
+
+    }
+
+    interface HistoricalBar extends Nvd3Element {
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(): boolean;
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(value: boolean): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(): number;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(value: number): this;
+        /* List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
+        forceX(): number[];
+        /* List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
+        forceX(value: number[]): this;
+        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
+        forceY(): number[];
+        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
+        forceY(value: number[]): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        id(): any;
+id(value: number|string): this;
+        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
+        interactive(): boolean;
+        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
+        interactive(value: boolean): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        /*.*/
+        padData(): boolean;
+        /**/
+        padData(value: boolean): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any) => any;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any) => any): this;
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(): number[];
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(value: number[]): this;
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(): number[];
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(value: number[]): this;
+        /* Override the default scale type for the X axis*/
+        xScale(): any;
+        /* Override the default scale type for the X axis*/
+        xScale(value: any): this;
+        y(): (d: any) => number;
+        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        y(func: (d: any) => number): this;
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(): number[];
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(value: number[]): this;
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(): number[];
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(value: number[]): this;
+        /* Override the default scale type for the y axis*/
+        yScale(): any;
+        /* Override the default scale type for the y axis*/
+        yScale(value: any): this;
+    }
+
+    interface Line extends Scatter {
+        scatter: Scatter;
+        /*A provided function that allows a line to be non-continuous when not defined.*/
+        defined(): (d: any, i: number) => boolean;
+        /*A provided function that allows a line to be non-continuous when not defined.*/
+        defined(func: (d: any, i: number) => boolean): this;
+        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
+        interpolate(): string;
+        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
+        interpolate(value: string): this;
+        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
+        isArea(): (d: any) => boolean;
+        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
+        isArea(value: boolean): this;
+        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
+        isArea(func: (d: any) => boolean): this;
+    }
+
+    interface MultiBar extends Nvd3Element {
+        /*this option lets you specific a color for each bar group to have the same color but differentiated by shading.*/
+        barColor(value: string[]): this;
+        /*this option lets you specific a color for each bar group to have the same color but differentiated by shading.*/
+        barColor(func: (d: any, i: number) => string): this;
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(): boolean;
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(value: boolean): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /**/
+        disabled(): boolean[];
+        /**/
+        disabled(value: boolean[]): this;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(): number;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(value: number): this;
+        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
+        forceY(): number[];
+        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
+        forceY(value: number[]): this;
+        /*The padding between bar groups, this is passed as the padding attribute of rangeBands*/
+        groupSpacing(): number;
+        /*The padding between bar groups, this is passed as the padding attribute of rangeBands*/
+        groupSpacing(value: number): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        /*.*/
+        hideable(): boolean;
+        /**/
+        hideable(value: boolean): this;
+        id(): any;
+id(value: number|string): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        /*.*/
+        stacked(): boolean;
+        /**/
+        stacked(value: boolean): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        stackOffset(offset: 'silhouette'): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        stackOffset(offset: 'wiggle'): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        stackOffset(offset: 'expand'): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        stackOffset(offset: 'zero'): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        stackOffset(offset: string): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        stackOffset(offset: (data: Array<[number, number]>) => number[]): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any) => any;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any) => any): this;
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(): number[];
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(value: number[]): this;
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(): number[];
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(value: number[]): this;
+        /* Override the default scale type for the X axis*/
+        xScale(): any;
+        /* Override the default scale type for the X axis*/
+        xScale(value: any): this;
+        y(): (d: any) => number;
+        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        y(func: (d: any) => number): this;
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(): number[];
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(value: number[]): this;
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(): number[];
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(value: number[]): this;
+        /* Override the default scale type for the y axis*/
+        yScale(): any;
+        /* Override the default scale type for the y axis*/
+        yScale(value: any): this;
+    }
+
+    interface MultiBarHorizontal extends Nvd3Element {
+        /*this option lets you specific a color for each bar group to have the same color but differentiated by shading.*/
+        barColor(value: string[]): this;
+        /*this option lets you specific a color for each bar group to have the same color but differentiated by shading.*/
+        barColor(func: (d: any, i: number) => string): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /**/
+        disabled(): boolean[];
+        /**/
+        disabled(value: boolean[]): this;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(): number;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(value: number): this;
+        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
+        forceY(): number[];
+        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
+        forceY(value: number[]): this;
+        /*The padding between bar groups, this is passed as the padding attribute of rangeBands*/
+        groupSpacing(): number;
+        /*The padding between bar groups, this is passed as the padding attribute of rangeBands*/
+        groupSpacing(value: number): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        id(): any;
+id(value: number|string): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        /*Prints the Y values on the top of the bars. Only recommended to use if there aren't many bars.*/
+        showValues(): boolean;
+        /*Prints the Y values on the top of the bars. Only recommended to use if there aren't many bars.*/
+        showValues(value: boolean): this;
+        /*.*/
+        stacked(): boolean;
+        /**/
+        stacked(value: boolean): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        stackOffset(offset: 'silhouette'): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        stackOffset(offset: 'wiggle'): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        stackOffset(offset: 'expand'): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        stackOffset(offset: 'zero'): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        stackOffset(offset: string): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        stackOffset(offset: (data: Array<[number, number]>) => number[]): this;
+        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
+        valueFormat(): string;
+        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
+        valueFormat(value: string): this;
+        /*.*/
+        valuePadding(): number;
+        /**/
+        valuePadding(value: number): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any) => any;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any) => any): this;
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(): number[];
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(value: number[]): this;
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(): number[];
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(value: number[]): this;
+        /* Override the default scale type for the X axis*/
+        xScale(): any;
+        /* Override the default scale type for the X axis*/
+        xScale(value: any): this;
+        y(): (d: any) => number;
+        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        y(func: (d: any) => number): this;
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(): number[];
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(value: number[]): this;
+        /**/
+        yErr(): (d: any, i: number) => number|number[];
+        /**/
+        yErr(func: (d: any, i: number) => number | number[]): this;
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(): number[];
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(value: number[]): this;
+        /* Override the default scale type for the y axis*/
+        yScale(): any;
+        /* Override the default scale type for the y axis*/
+        yScale(value: any): this;
+    }
+
+    interface OhlcBar extends Nvd3Element {
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(): boolean;
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(value: boolean): this;
+        close(): (d: any) => number;
+        close(func: (d: any) => number): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceX(): number[];
+        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceX(value: number[]): this;
+        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option*/
+        forceY(): number[];
+        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option*/
+        forceY(value: number[]): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        high(): (d: any) => number;
+        high(func: (d: any) => number): this;
+        id(): any;
+id(value: number|string): this;
+        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
+        interactive(): boolean;
+        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
+        interactive(value: boolean): this;
+        low(): (d: any) => number;
+        low(func: (d: any) => number): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        open(): (d: any) => number;
+        open(func: (d: any) => number): this;
+        padData(): boolean;
+        padData(value: boolean): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any) => any;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any) => any): this;
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(): number[];
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(value: number[]): this;
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(): number[];
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(value: number[]): this;
+        /* Override the default scale type for the X axis*/
+        xScale(): any;
+        /* Override the default scale type for the X axis*/
+        xScale(value: any): this;
+        y(): (d: any) => number;
+        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        y(func: (d: any) => number): this;
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(): number[];
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(value: number[]): this;
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(): number[];
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(value: number[]): this;
+        /* Override the default scale type for the y axis*/
+        yScale(): any;
+        /* Override the default scale type for the y axis*/
+        yScale(value: any): this;
+    }
+
+    interface ParallelCoordinates extends Nvd3Element {
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        dimensionData(): any
+        dimensionData(d: any): this
+        /*D3 format for each x axis*/
+        dimensionFormats(): string[];
+        /*D3 format for each x axis*/
+        dimensionFormats(value: string[]): this;
+        /*Name of each dimension, used for each axis.*/
+        dimensionNames(): string[];
+        /*Name of each dimension, used for each axis.*/
+        dimensionNames(value: string[]): this;
+        /*Deprecated. Use dimensionsNames instead. */
+        dimensions(): any;
+        /*Deprecated. Use dimensionsNames instead. .*/
+        dimensions(value: any): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        /*Specifies each line tension. Values between 0 and 1.*/
+        lineTension(): number;
+        /*Specifies each line tension. Values between 0 and 1.*/
+        lineTension(value: number): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+    }
+
+    interface Pie extends Nvd3Element {
+        /*Specifies each slice size, by an inner and a outer radius. Values between 0 and 1*/
+        arcsRadius(): ArcsRadius[];
+        /*Specifies each slice size, by an inner and a outer radius. Values between 0 and 1*/
+        arcsRadius(value: ArcsRadius[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*D3 3.4+, For donut charts only, the corner radius of the slices. Typically used with padAngle.*/
+        cornerRadius(): number;
+        /*D3 3.4+, For donut charts only, the corner radius of the slices. Typically used with padAngle.*/
+        cornerRadius(value: number): this;
+        /*Whether to make a pie graph a donut graph or not.*/
+        donut(): boolean;
+        /*Whether to make a pie graph a donut graph or not.*/
+        donut(value: boolean): this;
+        /**/
+        donutLabelsOutside(): boolean;
+        /**/
+        donutLabelsOutside(value: boolean): this;
+        /*Percent of pie radius to cut out of the middle to make the donut. It is multiplied by the outer radius to calculate the inner radius, thus it should be between 0 and 1.*/
+        donutRatio(): number;
+        /*Percent of pie radius to cut out of the middle to make the donut. It is multiplied by the outer radius to calculate the inner radius, thus it should be between 0 and 1.*/
+        donutRatio(value: number): this;
+        /*Function used to manage the ending angle of the pie/donut chart*/
+        endAngle(): (d: any) => number;
+        /*Function used to manage the ending angle of the pie/donut chart*/
+        endAngle(func: (d: any) => number): this;
+        /*For pie/donut charts, whether to increase slice radius on hover or not*/
+        growOnHover(): boolean;
+        /*For pie/donut charts, whether to increase slice radius on hover or not*/
+        growOnHover(value: boolean): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        id(): any;
+id(value: number|string): this;
+        /**/
+        labelFormat(): string;
+        /**/
+        labelFormat(value: string): this;
+        /**/
+        labelFormat(format: (d: any) => string): this;
+        /**/
+        labelSunbeamLayout(): boolean;
+        /**/
+        labelSunbeamLayout(value: boolean): this;
+        /*Pie/donut charts: The slice threshold size to not display the label because it woudl be too small of a space*/
+        labelThreshold(): number;
+        /*Pie/donut charts: The slice threshold size to not display the label because it woudl be too small of a space*/
+        labelThreshold(value: number): this;
+        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
+        labelType(): string;
+        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
+        labelType(value: 'key'): this;
+        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
+        labelType(value: 'value'): this;
+        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
+        labelType(value: 'percent'): this;
+        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
+        labelType(value: string): this;
+        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
+        labelType(func: (d: any, i: number, values:any)=> string): this;
+        /*Whether pie/donut chart labels should be outside the slices instead of inside them*/
+        labelsOutside(): boolean;
+        /*Whether pie/donut chart labels should be outside the slices instead of inside them*/
+        labelsOutside(value: boolean): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        /*D3 3.4+, For donut charts only, the percent of the chart that should be spacing between slices.*/
+        padAngle(): number;
+        /*D3 3.4+, For donut charts only, the percent of the chart that should be spacing between slices.*/
+        padAngle(value: number): this;
+        /**/
+        pieLabelsOutside(): boolean;
+        /**/
+        pieLabelsOutside(value: boolean): this;
+        /*Show pie/donut chart labels for each slice*/
+        showLabels(): boolean;
+        /*Show pie/donut chart labels for each slice*/
+        showLabels(value: boolean): this;
+        /*Function used to manage the starting  angle of the pie/donut chart*/
+        startAngle(): (d: any) => number;
+        /*Function used to manage the starting  angle of the pie/donut chart*/
+        startAngle(func: (d: any) => number): this;
+        /*Text to include within the middle of a donut chart*/
+        title(): string;
+        /*Text to include within the middle of a donut chart*/
+        title(value: string): this;
+        /*Vertical offset for the donut chart title*/
+        titleOffset(): number;
+        /*Vertical offset for the donut chart title*/
+        titleOffset(value: number): this;
+        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
+        valueFormat(): string;
+        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
+        valueFormat(value: string): this;
+        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
+        valueFormat(format: (d: any) => string): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any) => any;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any) => any): this;
+        /*Proxy function to return the Y value so adjustments can be made if needed.For pie/ donut chart this returns the value for the slice.*/
+        y(): (d: any) => number;
+        /*Proxy function to return the Y value so adjustments can be made if needed. For pie/donut chart this returns the value for the slice.*/
+        y(func: (d: any) => number): this;
+        /**/
+    }
+
+    interface Scatter extends Nvd3Element {
+        clearHighlights(): this;
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(): boolean;
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(value: boolean): this;
+        /*When useVoronoi and clipVoronoi are true, you can control the clip radius with this option. Essentially this lets you set how far away from the actual point you can put the mouse for it to select the point.*/
+        clipRadius(func: (d: any) => number): this;
+        /*When useVoronoi and clipVoronoi are true, you can control the clip radius with this option. Essentially this lets you set how far away from the actual point you can put the mouse for it to select the point.*/
+        clipRadius(value: number): this;
+        /*When useVoronoi is on, this masks each voronoi section with a circle to limit selection to smaller area.*/
+        clipVoronoi(): boolean;
+        /*When useVoronoi is on, this masks each voronoi section with a circle to limit selection to smaller area.*/
+        clipVoronoi(value: boolean): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(): number;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(value: number): this;
+        /*List of numbers to Force into the point scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forcePoint(): number[];
+        /*List of numbers to Force into the point scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forcePoint(value: number[]): this;
+        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceX(): number[];
+        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceX(value: number[]): this;
+        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceY(): number[];
+        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceY(value: number[]): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        id(): any;
+        id(value: number | string): this;
+        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
+        interactive(): boolean;
+        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
+        interactive(value: boolean): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        /**/
+        padData(): boolean;
+        /**/
+        padData(value: boolean): this;
+        /**/
+        padDataOuter(): number;
+        /**/
+        padDataOuter(value: number): this;
+        /* Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
+        pointActive(): (d: any) => boolean;
+        /*Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
+        pointActive(func: (d: any) => boolean): this;
+        /* Defines the whole point scale's domain. Using this will disable calculating the domain based on the data.*/
+        pointxDomain(): number[];
+        /* Defines the whole point scale's domain. Using this will disable calculating the domain based on the data.*/
+        pointDomain(value: number[]): this;
+        /* Override the point scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        pointRange(): number[];
+        /* Override the point scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        pointRange(value: number[]): this;
+        /* Override the default scale type for the point axis*/
+        pointScale(): any;
+        /* Override the default scale type for the point axis*/
+        pointScale(value: any): this;
+        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
+        pointSize(): (d: any) => number;
+        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
+        pointSize(func: (d: any) => number): this;
+        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
+        pointSize(value: number): this;
+        /*Displays the voronoi areas on the chart. This is mostly helpful when debugging issues.*/
+        showVoronoi(): boolean;
+        /*Displays the voronoi areas on the chart. This is mostly helpful when debugging issues.*/
+        showVoronoi(value: boolean): this;
+        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
+        useVoronoi(): boolean;
+        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
+        useVoronoi(value: boolean): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any) => any;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any) => any): this;
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(): number[];
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(value: number[]): this;
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(): number[];
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(value: number[]): this;
+        /* Override the default scale type for the X axis*/
+        xScale(): any;
+        /* Override the default scale type for the X axis*/
+        xScale(value: any): this;
+        y(): (d: any) => number;
+        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        y(func: (d: any) => number): this;
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(): number[];
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(value: number[]): this;
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(): number[];
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(value: number[]): this;
+        /* Override the default scale type for the y axis*/
+        yScale(): any;
+        /* Override the default scale type for the y axis*/
+        yScale(value: any): this;
+
+    }
+
+    interface SparkLine extends Nvd3Element {
+        animate(): boolean;
+        animate(value: boolean): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any, i?: number) => number;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any, i?: number) => number): this;
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(): number[];
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(value: number[]): this;
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(): number[];
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(value: number[]): this;
+        /* Override the default scale type for the X axis*/
+        xScale(): any;
+        /* Override the default scale type for the X axis*/
+        xScale(value: any): this;
+        y(): (d: any, i?: number) => number;
+        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        y(func: (d: any, i?: number) => number): this;
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(): number[];
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(value: number[]): this;
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(): number[];
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(value: number[]): this;
+        /* Override the default scale type for the y axis*/
+        yScale(): any;
+        /* Override the default scale type for the y axis*/
+        yScale(value: any): this;
+    }
+
+    interface SparkLinePlus extends SparkLine {
+        sparkline: SparkLine;
+
+        alignValue(): boolean;
+        alignValue(value: boolean): this;
+        /*Message to display if no data is provided*/
+        noData(): string;
+        /*Message to display if no data is provided*/
+        noData(value: string): this;
+        rightAlignValue(): boolean;
+        rightAlignValue(value: boolean): this;
+        /*Shows the last value in the sparkline to the right of the line.*/
+        showLastValue(): boolean;
+        /*Shows the last value in the sparkline to the right of the line.*/
+        showLastValue(value: boolean): this;
+        xTickFormat(format: (d: any) => string): this;
+        xTickFormat(format: string): this;
+        xTickFormat(format: (d: any, i: any) => string) : this;
+        yTickFormat(format: (d: any) => string): this;
+        yTickFormat(format: string): this;
+        yTickFormat(format: (d: any, i: any) => string) :this;
+    }
+
+    interface StackedArea extends Scatter {
+        scatter: Scatter;
+        /*A provided function that allows a line to be non-continuous when not defined.*/
+        defined(): (d: any, i: number) => boolean;
+        /*A provided function that allows a line to be non-continuous when not defined.*/
+        defined(func: (d: any, i: number) => boolean): this;
+        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
+        interpolate(): string;
+        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
+        interpolate(value: string): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        offset(offset: 'silhouette'): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        offset(offset: 'wiggle'): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        offset(offset: 'expand'): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        offset(offset: 'zero'): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        offset(offset: string): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        offset(offset: (data: Array<[number, number]>) => number[]): this;
+        order(): string;
+        order(value: string): this;
+        style(offset: 'stack'): this;
+        style(offset: 'stream'): this;
+        style(offset: 'stream-center'): this;
+        style(offset: 'expand'): this;
+        style(offset: 'stack_percent'): this;
+        style(offset: string): this;
+    }
+
+    interface Sunburst extends Nvd3Element {
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        id(): any;
+        id(value: number|string): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        /*For sunburst only: specifies the mode of drawing the sunburst segments. Can be 'size' or 'count'. 'size' draws the segments according to the 'size' attribute of the leaf nodes, 'count' draws according to the amount of siblings a node has.*/
+        mode(): string;
+        /*For sunburst only: specifies the mode of drawing the sunburst segments. Can be 'size' or 'count'. 'size' draws the segments according to the 'size' attribute of the leaf nodes, 'count' draws according to the amount of siblings a node has.*/
+        mode(value: 'size'): this;
+        /*For sunburst only: specifies the mode of drawing the sunburst segments. Can be 'size' or 'count'. 'size' draws the segments according to the 'size' attribute of the leaf nodes, 'count' draws according to the amount of siblings a node has.*/
+        mode(value: 'count'): this;
+        /*For sunburst only: specifies the mode of drawing the sunburst segments. Can be 'size' or 'count'. 'size' draws the segments according to the 'size' attribute of the leaf nodes, 'count' draws according to the amount of siblings a node has.*/
+        mode(value: string): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+    }
+
+    interface Tooltip {
+
+        /*For tooltip: Parent dom element of the SVG that holds the chart. This will make the tooltip dom be created inside this container instead of on the document body.*/
+        chartContainer(el: HTMLElement): this
+        /*For tooltip: Parent dom element of the SVG that holds the chart. This will make the tooltip dom be created inside this container instead of on the document body.*/
+        chartContainer(): HTMLElement
+        /*Attaches additional CSS classes to the tooltip DIV that is created.*/
+        classes(el: string): this
+        /*Attaches additional CSS classes to the tooltip DIV that is created.*/
+        classes(): string
+        /*Function that generates the tooltip content html.*/
+        contentGenerator(): (d: any) => string;
+        /*Function that generates the tooltip content html.*/
+        contentGenerator(func: (d: any) => string): this;
+        data(): any;
+        data(value: any): this;
+        distance(): number;
+        distance(value: number): this;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(): number;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(value: number): this;
+        /*For tooltip: completely enables or disabled the tooltip*/
+        enabled(): boolean;
+        /*For tooltip: completely enables or disabled the tooltip*/
+        enabled(value: boolean): this;
+        /*For tooltip: If not null, this fixes the top position of the tooltip.*/
+        fixedTop(): number;
+        /*For tooltip: If not null, this fixes the top position of the tooltip.*/
+        fixedTop(value: number): this;
+        /*Can be 'n','s','e','w'. Determines how tooltip is positioned*/
+        gravity(): string;
+        /*Can be 'n','s','e','w'. Determines how tooltip is positioned*/
+        gravity(value: string): this;
+        /*For tooltip: show the x axis value in the tooltip or not (not valid for pie charts for instance)*/
+        headerEnabled(): boolean;
+        /*For tooltip: show the x axis value in the tooltip or not (not valid for pie charts for instance)*/
+        headerEnabled(value: boolean): this;
+        /*For tooltip: formats the x axis value in the tooltip*/
+        headerFormatter(func: (d: any) => string): this;
+        /*For tooltip: formats the x axis value in the tooltip*/
+        headerFormatter(): (d: any) => string;
+        /*For tooltip: show or hide the tooltip by setting this to true or false. Tooltips used to be created and destroyed, but now we re-used the element and set opacity to 1 or 0.*/
+        hidden(): boolean;
+        /*For tooltip: show or hide the tooltip by setting this to true or false. Tooltips used to be created and destroyed, but now we re-used the element and set opacity to 1 or 0.*/
+        hidden(value: boolean): this;
+        /*Delay in ms before the tooltip hides itself after a mouseout event. A new mouseover event cancels the hide if within this timeout period.*/
+        hideDelay(): number;
+        /*Delay in ms before the tooltip hides itself after a mouseout event. A new mouseover event cancels the hide if within this timeout period.*/
+        hideDelay(value: number): this;
+        /**/
+        id(): any;
+        keyFormatter(): (d: any, i: number) => string;
+        keyFormatter(func: (d: any, i: number) => string): this;
+        offset(): Offset;
+        offset(value: Offset): this;
+        /*sets the top/left positioning for the tooltip. Should be given an object with 'left' and/or 'top' attributes. You can override just one, just like the 'margin' option on charts*/
+        position(): Offset;
+        /*sets the top/left positioning for the tooltip. Should be given an object with 'left' and/or 'top' attributes. You can override just one, just like the 'margin' option on charts*/
+        position(value: Offset): this;
+        /*Tolerance allowed before tooltip is moved from its current position (creates 'snapping' effect)*/
+        snapDistance(): number;
+        /*Tolerance allowed before tooltip is moved from its current position (creates 'snapping' effect)*/
+        snapDistance(value: number): this;
+        /*returns the dom element of the tooltip.*/
+        tooltipElem(): HTMLElement;
+        /*formats the y axis value(s) in the tooltip*/
+        valueFormatter(): (d: any) => string;
+        /*formats the y axis value(s) in the tooltip*/
+        valueFormatter(func: (d: any) => string): this;
+    }
+
+//#endregion
+
+//#region Charts
+    interface BoxPlotChart extends Chart {
+        boxplot: BoxPlot;
+        xAxis: Nvd3Axis;
+        yAxis: Nvd3Axis;
+        tooltip: Tooltip;
+
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(): number;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(value: number): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        id(): any;
+        id(value: number|string): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        maxBoxWidth(): number;
+        maxBoxWidth(value: number): this;
+        noData(): string;
+        noData(value: string): this;
+        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
+        rightAlignYAxis(): boolean;
+        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
+        rightAlignYAxis(value: boolean): this;
+        /*Display or hide the X axis*/
+        showXAxis(): boolean;
+        /*Display or hide the X axis*/
+        showXAxis(value: boolean): this;
+        /*Display or hide the Y axis*/
+        showYAxis(): boolean;
+        /*Display or hide the Y axis*/
+        showYAxis(value: boolean): this;
+        /*Makes the X labels stagger at different distances from the axis so they're less likely to overlap.*/
+        staggerLabels(): boolean;
+        /*Makes the X labels stagger at different distances from the axis so they're less likely to overlap.*/
+        staggerLabels(value: boolean): this;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(): (d: any) => string;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(func: (d: any) => string): this;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(): boolean;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(value: boolean): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any) => any;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any) => any): this;
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(): number[];
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(value: number[]): this;
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(): number[];
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(value: number[]): this;
+        /* Override the default scale type for the X axis*/
+        xScale(): any;
+        /* Override the default scale type for the X axis*/
+        xScale(value: any): this;
+        y(): (d: any) => number;
+        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        y(func: (d: any) => number): this;
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(): number[];
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(value: number[]): this;
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(): number[];
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(value: number[]): this;
+        /* Override the default scale type for the y axis*/
+        yScale(): any;
+        /* Override the default scale type for the y axis*/
+        yScale(value: any): this;
+
+	}
+
+    interface BulletChart extends Chart{
+        bullet: Bullet;
+        tooltip: Tooltip;
+
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceX(): number[];
+        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceX(value: number[]): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        markers(): (d: any) => any //todo;
+        markers(func: (d: any) => any): this //todo;
+        measures(): (d: any) => any //todo;
+        measures(func: (d: any) => any): this //todo;
+        noData(): string;
+        noData(value: string): this;
+        orient(): string;
+        orient(orientation: string): this;
+        ranges(): (d: any) => any //todo;
+        ranges(func: (d: any) => any): this //todo;
+        tickFormat(): (d: any) => string;
+        tickFormat(format: (d: any) => string): this;
+        tickFormat(format: string): this;
+        tickFormat(format: (d: any, i: any) => string): this;
+        ticks(): any[];
+        ticks(...args: any[]): this;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(): (d: any) => string;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(func: (d: any) => string): this;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(): boolean;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(value: boolean): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+	}
+
+    interface CandlestickBarChart extends Chart {
+        bars: CandlestickBar;
+        legend: Legend;
+        xAxis: Nvd3Axis;
+        yAxis: Nvd3Axis;
+        tooltip: Tooltip;
+
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(): boolean;
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(value: boolean): this;
+        close(): (d: any) => number;
+        close(func: (d: any) => number): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(): number;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(value: number): this;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(): any;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(value: any): this;
+        forceX(): number[];
+        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceX(value: number[]): this;
+        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option*/
+        forceY(): number[];
+        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option*/
+        forceY(value: number[]): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        high(): (d: any) => number;
+        high(func: (d: any) => number): this;
+        id(): any;
+        id(value: number|string): this;
+        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
+        interactive(): boolean;
+        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
+        interactive(value: boolean): this;
+        low(): (d: any) => number;
+        low(func: (d: any) => number): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        noData(): string;
+        noData(value: string): this;
+        open(): (d: any) => number;
+        open(func: (d: any) => number): this;
+        padData(): boolean;
+        padData(value: boolean): this;
+        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
+        rightAlignYAxis(): boolean;
+        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
+        rightAlignYAxis(value: boolean): this;
+        /*Whether to display the legend or not*/
+        showLegend(): boolean;
+        /*Whether to display the legend or not*/
+        showLegend(value: boolean): this;
+        /*Display or hide the X axis*/
+        showXAxis(): boolean;
+        /*Display or hide the X axis*/
+        showXAxis(value: boolean): this;
+        /*Display or hide the Y axis*/
+        showYAxis(): boolean;
+        /*Display or hide the Y axis*/
+        showYAxis(value: boolean): this;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(): (d: any) => string;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(func: (d: any) => string): this;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(): boolean;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(value: boolean): this;
+        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
+        useInteractiveGuideline(): boolean;
+        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
+        useInteractiveGuideline(value: boolean): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any) => any;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any) => any): this;
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(): number[];
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(value: number[]): this;
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(): number[];
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(value: number[]): this;
+        /* Override the default scale type for the X axis*/
+        xScale(): any;
+        /* Override the default scale type for the X axis*/
+        xScale(value: any): this;
+        y(): (d: any) => number;
+        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        y(func: (d: any) => number): this;
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(): number[];
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(value: number[]): this;
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(): number[];
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(value: number[]): this;
+        /* Override the default scale type for the y axis*/
+        yScale(): any;
+        /* Override the default scale type for the y axis*/
+        yScale(value: any): this;
+    }
+
+    interface CumulativeLineChart extends LineChart {
+        controls: Legend;
+        average(func: (d: any) => number): this;
+        average(): (d: any) => number;
+        noErrorCheck(value: boolean): this;
+        noErrorCheck(): boolean;
+    }
+
+    interface DiscreteBarChart extends Chart {
+        discretebar: DiscreteBar;
+        legend: Legend;
+        xAxis: Nvd3Axis;
+        yAxis: Nvd3Axis;
+        tooltip: Tooltip;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(): number;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(value: number): this;
+        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
+        forceY(): number[];
+        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
+        forceY(value: number[]): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        id(): any;
+        id(value: number|string): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        noData(): string;
+        noData(value: string): this;
+        rectClass(): string;
+        rectClass(value: string): this;
+        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
+        rightAlignYAxis(): boolean;
+        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
+        rightAlignYAxis(value: boolean): this;
+        /*Prints the Y values on the top of the bars. Only recommended to use if there aren't many bars.*/
+        showValues(): boolean;
+        /*Prints the Y values on the top of the bars. Only recommended to use if there aren't many bars.*/
+        showValues(value: boolean): this;
+        /*Display or hide the X axis*/
+        showXAxis(): boolean;
+        /*Display or hide the X axis*/
+        showXAxis(value: boolean): this;
+        /*Display or hide the Y axis*/
+        showYAxis(): boolean;
+        /*Display or hide the Y axis*/
+        showYAxis(value: boolean): this;
+        /*Makes the X labels stagger at different distances from the axis so they're less likely to overlap.*/
+        staggerLabels(): boolean;
+        /*Makes the X labels stagger at different distances from the axis so they're less likely to overlap.*/
+        staggerLabels(value: boolean): this;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(): (d: any) => string;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(func: (d: any) => string): this;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(): boolean;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(value: boolean): this;
+        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
+        valueFormat(): string;
+        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
+        valueFormat(value: string): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any) => any;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any) => any): this;
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(): number[];
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(value: number[]): this;
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(): number[];
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(value: number[]): this;
+        /* Override the default scale type for the X axis*/
+        xScale(): any;
+        /* Override the default scale type for the X axis*/
+        xScale(value: any): this;
+        y(): (d: any) => number;
+        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        y(func: (d: any) => number): this;
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(): number[];
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(value: number[]): this;
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(): number[];
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(value: number[]): this;
+        /* Override the default scale type for the y axis*/
+        yScale(): any;
+        /* Override the default scale type for the y axis*/
+        yScale(value: any): this;
+    }
+
+    interface HistoricalBarChart extends Chart {
+        bars: HistoricalBar;
+        legend: Legend;
+        xAxis: Nvd3Axis;
+        yAxis: Nvd3Axis;
+        tooltip: Tooltip;
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(): boolean;
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(value: boolean): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(): any;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(value: any): this;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(): number;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(value: number): this;
+        /* List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
+        forceX(): number[];
+        /* List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
+        forceX(value: number[]): this;
+        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
+        forceY(): number[];
+        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
+        forceY(value: number[]): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        id(): any;
+id(value: number|string): this;
+        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
+        interactive(): boolean;
+        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
+        interactive(value: boolean): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        noData(): string;
+        noData(value: string): this;
+        /**/
+        padData(): boolean;
+        /**/
+        padData(value: boolean): this;
+        rightAlignYAxis(): boolean;
+        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
+        rightAlignYAxis(value: boolean): this;
+        /*Whether to display the legend or not.*/
+        showLegend(): boolean;
+        /*Whether to display the legend or not.*/
+        showLegend(value: boolean): this;
+        /*Display or hide the X axis*/
+        showXAxis(): boolean;
+        /*Display or hide the X axis*/
+        showXAxis(value: boolean): this;
+        /*Display or hide the Y axis*/
+        showYAxis(): boolean;
+        /*Display or hide the Y axis*/
+        showYAxis(value: boolean): this;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(): (d: any) => string;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(func: (d: any) => string): this;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(): boolean;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(value: boolean): this;
+        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
+        useInteractiveGuideline(): boolean;
+        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
+        useInteractiveGuideline(value: boolean): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any) => any;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any) => any): this;
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(): number[];
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(value: number[]): this;
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(): number[];
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(value: number[]): this;
+        /* Override the default scale type for the X axis*/
+        xScale(): any;
+        /* Override the default scale type for the X axis*/
+        xScale(value: any): this;
+        y(): (d: any) => number;
+        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        y(func: (d: any) => number): this;
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(): number[];
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(value: number[]): this;
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(): number[];
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(value: number[]): this;
+        /* Override the default scale type for the y axis*/
+        yScale(): any;
+        /* Override the default scale type for the y axis*/
+        yScale(value: any): this;
+    }
+
+    interface LineChart extends Chart {
+        lines: Line;
+        xAxis: Nvd3Axis;
+        yAxis: Nvd3Axis;
+        legend: Legend;
+        tooltip: Tooltip;
+
+        clearHighlights(): this;
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(): boolean;
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(value: boolean): this;
+        /*When useVoronoi and clipVoronoi are true, you can control the clip radius with this option. Essentially this lets you set how far away from the actual point you can put the mouse for it to select the point.*/
+        clipRadius(func: (d: any) => number): this;
+        /*When useVoronoi and clipVoronoi are true, you can control the clip radius with this option. Essentially this lets you set how far away from the actual point you can put the mouse for it to select the point.*/
+        clipRadius(value: number): this;
+        /*When useVoronoi is on, this masks each voronoi section with a circle to limit selection to smaller area.*/
+        clipVoronoi(): boolean;
+        /*When useVoronoi is on, this masks each voronoi section with a circle to limit selection to smaller area.*/
+        clipVoronoi(value: boolean): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(): any;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(value: any): this;
+        /*A provided function that allows a line to be non-continuous when not defined.*/
+        defined(): (d: any, i: number) => boolean;
+        /*A provided function that allows a line to be non-continuous when not defined.*/
+        defined(func: (d: any, i: number) => boolean): this;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(): number;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(value: number): this;
+        /*List of numbers to Force into the point scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forcePoint(): number[];
+        /*List of numbers to Force into the point scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forcePoint(value: number[]): this;
+        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceX(): number[];
+        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceX(value: number[]): this;
+        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceY(): number[];
+        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceY(value: number[]): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        /**/
+        highlightPoint(): (d: any) => boolean;
+        /**/
+        highlightPoint(func: (d: any) => boolean): this;
+        id(): any;
+id(value: number|string): this;
+        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
+        interactive(): boolean;
+        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
+        interactive(value: boolean): this;
+        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
+        interpolate(): string;
+        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
+        interpolate(value: string): this;
+        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
+        isArea(): (d: any) => boolean;
+        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
+        isArea(value: boolean): this;
+        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
+        isArea(func: (d: any) => boolean): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        noData(): string;
+        noData(value: string): this;
+        /**/
+        padData(): boolean;
+        /**/
+        padData(value: boolean): this;
+        /**/
+        padDataOuter(): number;
+        /**/
+        padDataOuter(value: number): this;
+        /* Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
+        pointActive(): (d: any) => boolean;
+        /*Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
+        pointActive(func: (d: any) => boolean): this;
+        /* Defines the whole point scale's domain. Using this will disable calculating the domain based on the data.*/
+        pointxDomain(): number[];
+        /* Defines the whole point scale's domain. Using this will disable calculating the domain based on the data.*/
+        pointDomain(value: number[]): this;
+        /* Override the point scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        pointRange(): number[];
+        /* Override the point scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        pointRange(value: number[]): this;
+        /* Override the default scale type for the point axis*/
+        pointScale(): any;
+        /* Override the default scale type for the point axis*/
+        pointScale(value: any): this;
+        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
+        pointSize(): (d: any) => number;
+        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
+        pointSize(func: (d: any) => number): this;
+        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
+        pointSize(value: number): this;
+        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
+        rightAlignYAxis(): boolean;
+        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
+        rightAlignYAxis(value: boolean): this;
+        /*Whether to display the legend or not.*/
+        showLegend(): boolean;
+        /*Whether to display the legend or not.*/
+        showLegend(value: boolean): this;
+        /*Displays the voronoi areas on the chart. This is mostly helpful when debugging issues.*/
+        showVoronoi(): boolean;
+        /*Displays the voronoi areas on the chart. This is mostly helpful when debugging issues.*/
+        showVoronoi(value: boolean): this;
+        /*Display or hide the X axis*/
+        showXAxis(): boolean;
+        /*Display or hide the X axis*/
+        showXAxis(value: boolean): this;
+        /*Display or hide the Y axis*/
+        showYAxis(): boolean;
+        /*Display or hide the Y axis*/
+        showYAxis(value: boolean): this;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(): (d: any) => string;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(func: (d: any) => string): this;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(): boolean;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(value: boolean): this;
+        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
+        useInteractiveGuideline(): boolean;
+        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
+        useInteractiveGuideline(value: boolean): this;
+        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
+        useVoronoi(): boolean;
+        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
+        useVoronoi(value: boolean): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any) => any;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any) => any): this;
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(): number[];
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(value: number[]): this;
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(): number[];
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(value: number[]): this;
+        /* Override the default scale type for the X axis*/
+        xScale(): any;
+        /* Override the default scale type for the X axis*/
+        xScale(value: any): this;
+        y(): (d: any) => number;
+        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        y(func: (d: any) => number): this;
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(): number[];
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(value: number[]): this;
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(): number[];
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(value: number[]): this;
+        /* Override the default scale type for the y axis*/
+        yScale(): any;
+        /* Override the default scale type for the y axis*/
+        yScale(value: any): this;
+    }
+
+    interface LinePlusBarChart extends Chart {
+        legend: Legend;
+        lines: Line;
+        lines2: Line;
+        bars: HistoricalBar;
+        bars2: HistoricalBar;
+        xAxis: Nvd3Axis;
+        x2Axis: Nvd3Axis;
+        y1Axis: Nvd3Axis;
+        y2Axis: Nvd3Axis;
+        y3Axis: Nvd3Axis;
+        y4Axis: Nvd3Axis;
+        tooltip: Tooltip;
+
+        brushExtent(): [number, number] | [[number, number], [number, number]];
+        brushExtent(value: [number, number] | [[number, number], [number, number]]) : this;
+        clearHighlights(): this;
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(): boolean;
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(value: boolean): this;
+        /*When useVoronoi and clipVoronoi are true, you can control the clip radius with this option. Essentially this lets you set how far away from the actual point you can put the mouse for it to select the point.*/
+        clipRadius(func: (d: any) => number): this;
+        /*When useVoronoi and clipVoronoi are true, you can control the clip radius with this option. Essentially this lets you set how far away from the actual point you can put the mouse for it to select the point.*/
+        clipRadius(value: number): this;
+        /*When useVoronoi is on, this masks each voronoi section with a circle to limit selection to smaller area.*/
+        clipVoronoi(): boolean;
+        /*When useVoronoi is on, this masks each voronoi section with a circle to limit selection to smaller area.*/
+        clipVoronoi(value: boolean): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(): any;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(value: any): this;
+        /*A provided function that allows a line to be non-continuous when not defined.*/
+        defined(): (d: any, i: number) => boolean;
+        /*A provided function that allows a line to be non-continuous when not defined.*/
+        defined(func: (d: any, i: number) => boolean): this;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(): number;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(value: number): this;
+        focusEnable(): boolean;
+        focusEnable(value: boolean): this;
+        focusHeight(): number;
+        focusHeight(value: number): this;
+        focusShowAxisX(): boolean;
+        focusShowAxisX(value: boolean): this;
+        focusShowAxisY(): boolean;
+        focusShowAxisY(value: boolean): this;
+        /*List of numbers to Force into the point scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forcePoint(): number[];
+        /*List of numbers to Force into the point scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forcePoint(value: number[]): this;
+        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceX(): number[];
+        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceX(value: number[]): this;
+        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceY(): number[];
+        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceY(value: number[]): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        /**/
+        highlightPoint(): (d: any) => boolean;
+        /**/
+        highlightPoint(func: (d: any) => boolean): this;
+        id(): any;
+id(value: number|string): this;
+        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
+        interactive(): boolean;
+        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
+        interactive(value: boolean): this;
+        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
+        interpolate(): string;
+        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
+        interpolate(value: string): this;
+        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
+        isArea(): (d: any) => boolean;
+        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
+        isArea(value: boolean): this;
+        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
+        isArea(func: (d: any) => boolean): this;
+        /*The extra text after the label in the legend that tells what axis the series belongs to, for any series on the left axis.*/
+        legendLeftAxisHint(): string;
+        /*The extra text after the label in the legend that tells what axis the series belongs to, for any series on the left axis.*/
+        legendLeftAxisHint(value: string): this
+        /*The extra text after the label in the legend that tells what axis the series belongs to, for any seris on the right axis.*/
+        legendRightAxisHint(): string;
+                /*The extra text after the label in the legend that tells what axis the series belongs to, for any seris on the right axis.*/
+        legendRightAxisHint(value: string): this
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        noData(): string;
+        noData(value: string): this;
+        /**/
+        padData(): boolean;
+        /**/
+        padData(value: boolean): this;
+        /**/
+        padDataOuter(): number;
+        /**/
+        padDataOuter(value: number): this;
+        /* Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
+        pointActive(): (d: any) => boolean;
+        /*Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
+        pointActive(func: (d: any) => boolean): this;
+        /* Defines the whole point scale's domain. Using this will disable calculating the domain based on the data.*/
+        pointxDomain(): number[];
+        /* Defines the whole point scale's domain. Using this will disable calculating the domain based on the data.*/
+        pointDomain(value: number[]): this;
+        /* Override the point scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        pointRange(): number[];
+        /* Override the point scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        pointRange(value: number[]): this;
+        /* Override the default scale type for the point axis*/
+        pointScale(): any;
+        /* Override the default scale type for the point axis*/
+        pointScale(value: any): this;
+        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
+        pointSize(): (d: any) => number;
+        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
+        pointSize(func: (d: any) => number): this;
+        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
+        pointSize(value: number): this;
+        /*Whether to display the legend or not.*/
+        showLegend(): boolean;
+        /*Whether to display the legend or not.*/
+        showLegend(value: boolean): this;
+        /*Displays the voronoi areas on the chart. This is mostly helpful when debugging issues.*/
+        showVoronoi(): boolean;
+        /*Displays the voronoi areas on the chart. This is mostly helpful when debugging issues.*/
+        showVoronoi(value: boolean): this;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(): (d: any) => string;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(func: (d: any) => string): this;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(): boolean;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(value: boolean): this;
+        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
+        useInteractiveGuideline(): boolean;
+        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
+        useInteractiveGuideline(value: boolean): this;
+        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
+        useVoronoi(): boolean;
+        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
+        useVoronoi(value: boolean): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any) => any;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any) => any): this;
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(): number[];
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(value: number[]): this;
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(): number[];
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(value: number[]): this;
+        /* Override the default scale type for the X axis*/
+        xScale(): any;
+        /* Override the default scale type for the X axis*/
+        xScale(value: any): this;
+        y(): (d: any) => number;
+        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        y(func: (d: any) => number): this;
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(): number[];
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(value: number[]): this;
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(): number[];
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(value: number[]): this;
+        /* Override the default scale type for the y axis*/
+        yScale(): any;
+        /* Override the default scale type for the y axis*/
+        yScale(value: any): this;
+    }
+
+    interface LineWithFocusChart extends Chart {
+        legend: Legend;
+        lines: Line;
+        lines2: Line;
+        xAxis: Nvd3Axis;
+        x2Axis: Nvd3Axis;
+        yAxis: Nvd3Axis;
+        y2Axis: Nvd3Axis;
+        tooltip: Tooltip;
+
+        brushExtent(): [number, number] | [[number, number], [number, number]];
+        brushExtent(value: [number, number] | [[number, number], [number, number]]): this;
+        clearHighlights(): this;
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(): boolean;
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(value: boolean): this;
+        /*When useVoronoi and clipVoronoi are true, you can control the clip radius with this option. Essentially this lets you set how far away from the actual point you can put the mouse for it to select the point.*/
+        clipRadius(func: (d: any) => number): this;
+        /*When useVoronoi and clipVoronoi are true, you can control the clip radius with this option. Essentially this lets you set how far away from the actual point you can put the mouse for it to select the point.*/
+        clipRadius(value: number): this;
+        /*When useVoronoi is on, this masks each voronoi section with a circle to limit selection to smaller area.*/
+        clipVoronoi(): boolean;
+        /*When useVoronoi is on, this masks each voronoi section with a circle to limit selection to smaller area.*/
+        clipVoronoi(value: boolean): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(): any;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(value: any): this;
+        /*A provided function that allows a line to be non-continuous when not defined.*/
+        defined(): (d: any, i: number) => boolean;
+        /*A provided function that allows a line to be non-continuous when not defined.*/
+        defined(func: (d: any, i: number) => boolean): this;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(): number;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(value: number): this;
+        focusHeight(): number;
+        focusHeight(value: number): this;
+        focusMargin(): Margin;
+        focusMargin(value: Margin): this;
+        /*List of numbers to Force into the point scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forcePoint(): number[];
+        /*List of numbers to Force into the point scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forcePoint(value: number[]): this;
+        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceX(): number[];
+        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceX(value: number[]): this;
+        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceY(): number[];
+        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceY(value: number[]): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        /**/
+        highlightPoint(): (d: any) => boolean;
+        /**/
+        highlightPoint(func: (d: any) => boolean): this;
+        id(): any;
+id(value: number|string): this;
+        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
+        interactive(): boolean;
+        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
+        interactive(value: boolean): this;
+        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
+        interpolate(): string;
+        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
+        interpolate(value: string): this;
+        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
+        isArea(): (d: any) => boolean;
+        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
+        isArea(value: boolean): this;
+        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
+        isArea(func: (d: any) => boolean): this;
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        noData(): string;
+        noData(value: string): this;
+        /**/
+        padData(): boolean;
+        /**/
+        padData(value: boolean): this;
+        /**/
+        padDataOuter(): number;
+        /**/
+        padDataOuter(value: number): this;
+        /* Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
+        pointActive(): (d: any) => boolean;
+        /*Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
+        pointActive(func: (d: any) => boolean): this;
+        /* Defines the whole point scale's domain. Using this will disable calculating the domain based on the data.*/
+        pointxDomain(): number[];
+        /* Defines the whole point scale's domain. Using this will disable calculating the domain based on the data.*/
+        pointDomain(value: number[]): this;
+        /* Override the point scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        pointRange(): number[];
+        /* Override the point scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        pointRange(value: number[]): this;
+        /* Override the default scale type for the point axis*/
+        pointScale(): any;
+        /* Override the default scale type for the point axis*/
+        pointScale(value: any): this;
+        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
+        pointSize(): (d: any) => number;
+        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
+        pointSize(func: (d: any) => number): this;
+        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
+        pointSize(value: number): this;
+        /*Whether to display the legend or not.*/
+        showLegend(): boolean;
+        /*Whether to display the legend or not.*/
+        showLegend(value: boolean): this;
+        /*Displays the voronoi areas on the chart. This is mostly helpful when debugging issues.*/
+        showVoronoi(): boolean;
+        /*Displays the voronoi areas on the chart. This is mostly helpful when debugging issues.*/
+        showVoronoi(value: boolean): this;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(): (d: any) => string;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(func: (d: any) => string): this;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(): boolean;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(value: boolean): this;
+        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
+        useInteractiveGuideline(): boolean;
+        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
+        useInteractiveGuideline(value: boolean): this;
+        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
+        useVoronoi(): boolean;
+        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
+        useVoronoi(value: boolean): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any) => any;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any) => any): this;
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(): number[];
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(value: number[]): this;
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(): number[];
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(value: number[]): this;
+        /* Override the default scale type for the X axis*/
+        xScale(): any;
+        /* Override the default scale type for the X axis*/
+        xScale(value: any): this;
+        xTickFormat(): (d: any) => string;
+        xTickFormat(format: (t: any) => string): this;
+        xTickFormat(format: string): this;
+        xTickFormat(format: (d: any, i: any) => string): this;
+        y(): (d: any) => number;
+        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        y(func: (d: any) => number): this;
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(): number[];
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(value: number[]): this;
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(): number[];
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(value: number[]): this;
+        /* Override the default scale type for the y axis*/
+        yScale(): any;
+        /* Override the default scale type for the y axis*/
+        yScale(value: any): this;
+        yTickFormat(): (d: any) => string;
+        yTickFormat(format: (t: any) => string): this;
+        yTickFormat(format: string): this;
+        yTickFormat(format: (d: any, i: any) => string): this;
+    }
+
+    interface MultiBarChart extends Chart {
+        multibar: MultiBar;
+        legend: Legend;
+        controls: Legend;
+        xAxis: Nvd3Axis;
+        yAxis: Nvd3Axis;
+        tooltip: Tooltip;
+
+        /*this option lets you specific a color for each bar group to have the same color but differentiated by shading.*/
+        barColor(value: string[]): this;
+        /*this option lets you specific a color for each bar group to have the same color but differentiated by shading.*/
+        barColor(func: (d: any, i: number) => string): this;
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(): boolean;
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(value: boolean): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*Object that defines the labels for control items in the graph. For instance, in the stackedAreaChart, there are controls for making it stacked, expanded, or stream. For stacked bar charts, there is stacked and grouped.*/
+        controlLabels(): any;
+        /*Object that defines the labels for control items in the graph. For instance, in the stackedAreaChart, there are controls for making it stacked, expanded, or stream. For stacked bar charts, there is stacked and grouped.*/
+        controlLabels(value: any): this;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(): any;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(value: any): this;
+        /**/
+        disabled(): boolean[];
+        /**/
+        disabled(value: boolean[]): this;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(): number;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(value: number): this;
+        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
+        forceY(): number[];
+        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
+        forceY(value: number[]): this;
+        /*The padding between bar groups, this is passed as the padding attribute of rangeBands*/
+        groupSpacing(): number;
+        /*The padding between bar groups, this is passed as the padding attribute of rangeBands*/
+        groupSpacing(value: number): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        /*.*/
+        hideable(): boolean;
+        /**/
+        hideable(value: boolean): this;
+        id(): any;
+id(value: number|string): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        noData(): string;
+        noData(value: string): this;
+        reduceXTicks(): boolean;
+        reduceXTicks(value: boolean): this;
+        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
+        rightAlignYAxis(): boolean;
+        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
+        rightAlignYAxis(value: boolean): this;
+        /*Rotates the X axis labels by the specified degree.*/
+        rotateLabels(): number;
+        /*Rotates the X axis labels by the specified degree.*/
+        rotateLabels(value: number): this;
+        /*Whether to show extra controls or not. Extra controls include things like making mulitBar charts stacked or side by side.*/
+        showControls(): boolean;
+        /*Whether to show extra controls or not. Extra controls include things like making mulitBar charts stacked or side by side.*/
+        showControls(value: boolean): this;
+        /*Whether to display the legend or not.*/
+        showLegend(): boolean;
+        /*Whether to display the legend or not.*/
+        showLegend(value: boolean): this;
+        /*Display or hide the X axis*/
+        showXAxis(): boolean;
+        /*Display or hide the X axis*/
+        showXAxis(value: boolean): this;
+        /*Display or hide the Y axis*/
+        showYAxis(): boolean;
+        /*Display or hide the Y axis*/
+        showYAxis(value: boolean): this;
+        /*.*/
+        stacked(): boolean;
+        /**/
+        stacked(value: boolean): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        stackOffset(offset: 'silhouette'): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        stackOffset(offset: 'wiggle'): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        stackOffset(offset: 'expand'): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        stackOffset(offset: 'zero'): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        stackOffset(offset: string): this;
+        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
+        stackOffset(offset: (data: Array<[number, number]>) => number[]): this;
+        /*Makes the X labels stagger at different distances from the axis so they're less likely to overlap.*/
+        staggerLabels(): boolean;
+        /*Makes the X labels stagger at different distances from the axis so they're less likely to overlap.*/
+        staggerLabels(value: boolean): this;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(): (d: any) => string;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(func: (d: any) => string): this;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(): boolean;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(value: boolean): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any) => any;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any) => any): this;
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(): number[];
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(value: number[]): this;
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(): number[];
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(value: number[]): this;
+        /* Override the default scale type for the X axis*/
+        xScale(): any;
+        /* Override the default scale type for the X axis*/
+        xScale(value: any): this;
+        y(): (d: any) => number;
+        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        y(func: (d: any) => number): this;
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(): number[];
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(value: number[]): this;
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(): number[];
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(value: number[]): this;
+        /* Override the default scale type for the y axis*/
+        yScale(): any;
+        /* Override the default scale type for the y axis*/
+        yScale(value: any): this;
+
+    }
+
+    interface MultiBarHorizontalChart extends Chart {
+        multibar: MultiBar;
+        legend: Legend;
+        controls: Legend;
+        xAxis: Nvd3Axis;
+        yAxis: Nvd3Axis;
+        tooltip: Tooltip;
+
+        /*this option lets you specific a color for each bar group to have the same color but differentiated by shading.*/
+        barColor(value: string[]): this;
+        /*this option lets you specific a color for each bar group to have the same color but differentiated by shading.*/
+        barColor(func: (d: any, i: number) => string): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*Object that defines the labels for control items in the graph. For instance, in the stackedAreaChart, there are controls for making it stacked, expanded, or stream. For stacked bar charts, there is stacked and grouped.*/
+        controlLabels(): any;
+        /*Object that defines the labels for control items in the graph. For instance, in the stackedAreaChart, there are controls for making it stacked, expanded, or stream. For stacked bar charts, there is stacked and grouped.*/
+        controlLabels(value: any): this;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(): any;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(value: any): this;
+        /**/
+        disabled(): boolean[];
+        /**/
+        disabled(value: boolean[]): this;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(): number;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(value: number): this;
+        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
+        forceY(): number[];
+        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
+        forceY(value: number[]): this;
+        /*The padding between bar groups, this is passed as the padding attribute of rangeBands*/
+        groupSpacing(): number;
+        /*The padding between bar groups, this is passed as the padding attribute of rangeBands*/
+        groupSpacing(value: number): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        id(): any;
+id(value: number|string): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        noData(): string;
+        noData(value: string): this;
+        showControls(): boolean;
+        /*Whether to show extra controls or not. Extra controls include things like making mulitBar charts stacked or side by side.*/
+        showControls(value: boolean): this;
+        /*Whether to display the legend or not.*/
+        showLegend(): boolean;
+        /*Whether to display the legend or not.*/
+        showLegend(value: boolean): this;
+        /*Prints the Y values on the top of the bars. Only recommended to use if there aren't many bars.*/
+        showValues(): boolean;
+        /*Prints the Y values on the top of the bars. Only recommended to use if there aren't many bars.*/
+        showValues(value: boolean): this;
+        /*Display or hide the X axis*/
+        showXAxis(): boolean;
+        /*Display or hide the X axis*/
+        showXAxis(value: boolean): this;
+        /*Display or hide the Y axis*/
+        showYAxis(): boolean;
+        /*Display or hide the Y axis*/
+        showYAxis(value: boolean): this;
+        /*.*/
+        stacked(): boolean;
+        /**/
+        stacked(value: boolean): this;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(): (d: any) => string;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(func: (d: any) => string): this;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(): boolean;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(value: boolean): this;
+        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
+        valueFormat(): string;
+        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
+        valueFormat(value: string): this;
+        /*.*/
+        valuePadding(): number;
+        /**/
+        valuePadding(value: number): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any) => any;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any) => any): this;
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(): number[];
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(value: number[]): this;
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(): number[];
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(value: number[]): this;
+        /* Override the default scale type for the X axis*/
+        xScale(): any;
+        /* Override the default scale type for the X axis*/
+        xScale(value: any): this;
+        y(): (d: any) => number;
+        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        y(func: (d: any) => number): this;
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(): number[];
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(value: number[]): this;
+        /**/
+        yErr(): (d: any, i: number) => number | number[];
+        /**/
+        yErr(func: (d: any, i: number) => number | number[]): this;
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(): number[];
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(value: number[]): this;
+        /* Override the default scale type for the y axis*/
+        yScale(): any;
+        /* Override the default scale type for the y axis*/
+        yScale(value: any): this;
+
+    }
+
+    interface MultiChart extends Chart {
+        lines1: Line;
+        lines2: Line;
+        bars1: MultiBar;
+        bars2: MultiBar;
+        scatters1: Scatter;
+        scatters2: Scatter;
+        stack1: StackedArea;
+        stack2: StackedArea;
+        xAxis: Nvd3Axis;
+        yAxis1: Nvd3Axis;
+        yAxis2: Nvd3Axis;
+        tooltip: Tooltip;
+
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
+        interpolate(): string;
+        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
+        interpolate(value: string): this;
+        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
+        isArea(): (d: any) => boolean;
+        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
+        isArea(value: boolean): this;
+        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
+        isArea(func: (d: any) => boolean): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        noData(): string;
+        noData(value: string): this;
+        /*Whether to display the legend or not.*/
+        showLegend(): boolean;
+        /*Whether to display the legend or not.*/
+        showLegend(value: boolean): this;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(): (d: any) => string;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(func: (d: any) => string): this;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(): boolean;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(value: boolean): this;
+        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
+        useVoronoi(): boolean;
+        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
+        useVoronoi(value: boolean): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any) => any;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any) => any): this;
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        y(): (d: any) => number;
+        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        y(func: (d: any) => number): this;
+        /* */
+        yDomain1(): number[];
+        /* */
+        yDomain1(value: number[]): this;
+        /* */
+        yDomain2(): number[];
+        /* */
+        yDomain2(value: number[]): this;
+    }
+
+    interface OhlcBarChart extends Chart {
+        bars: OhlcBar;
+        legend: Legend;
+        xAxis: Nvd3Axis;
+        yAxis: Nvd3Axis;
+        tooltip: Tooltip;
+
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(): boolean;
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(value: boolean): this;
+        close(): (d: any) => number;
+        close(func: (d: any) => number): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(): any;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(value: any): this;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(): number;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(value: number): this;
+        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceX(): number[];
+        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceX(value: number[]): this;
+        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option*/
+        forceY(): number[];
+        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option*/
+        forceY(value: number[]): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        high(): (d: any) => number;
+        high(func: (d: any) => number): this;
+        id(): any;
+        id(value: number|string): this;
+        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
+        interactive(): boolean;
+        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
+        interactive(value: boolean): this;
+        low(): (d: any) => number;
+        low(func: (d: any) => number): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        noData(): string;
+        noData(value: string): this;
+        open(): (d: any) => number;
+        open(func: (d: any) => number): this;
+        padData(): boolean;
+        padData(value: boolean): this;
+        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
+        rightAlignYAxis(): boolean;
+        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
+        rightAlignYAxis(value: boolean): this;
+        /*Whether to display the legend or not*/
+        showLegend(): boolean;
+        /*Whether to display the legend or not*/
+        showLegend(value: boolean): this;
+        /*Display or hide the X axis*/
+        showXAxis(): boolean;
+        /*Display or hide the X axis*/
+        showXAxis(value: boolean): this;
+        /*Display or hide the Y axis*/
+        showYAxis(): boolean;
+        /*Display or hide the Y axis*/
+        showYAxis(value: boolean): this;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(): (d: any) => string;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(func: (d: any) => string): this;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(): boolean;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(value: boolean): this;
+        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
+        useInteractiveGuideline(): boolean;
+        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
+        useInteractiveGuideline(value: boolean): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any) => any;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any) => any): this;
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(): number[];
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(value: number[]): this;
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(): number[];
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(value: number[]): this;
+        /* Override the default scale type for the X axis*/
+        xScale(): any;
+        /* Override the default scale type for the X axis*/
+        xScale(value: any): this;
+        y(): (d: any) => number;
+        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        y(func: (d: any) => number): this;
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(): number[];
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(value: number[]): this;
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(): number[];
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(value: number[]): this;
+        /* Override the default scale type for the y axis*/
+        yScale(): any;
+        /* Override the default scale type for the y axis*/
+        yScale(value: any): this;
+    }
+
+    interface ParallelCoordinatesChart extends Chart {
+        parallelCoordinates: ParallelCoordinates;
+        legend: Legend;
+        tooltip: Tooltip;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(): any;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(value: any): this;
+        dimensionData(): any
+        dimensionData(d:any) : this
+        /*D3 format for each x axis*/
+        dimensionFormats(): string[];
+        /*D3 format for each x axis*/
+        dimensionFormats(value: string[]): this;
+        /*Name of each dimension, used for each axis.*/
+        dimensionNames(): string[];
+        /*Name of each dimension, used for each axis.*/
+        dimensionNames(value: string[]): this;
+        /*Deprecated. Use dimensionsNames instead. */
+        dimensions(): any;
+        /*Deprecated. Use dimensionsNames instead. .*/
+        dimensions(value: any): this;
+        /**/
+        displayBrush(): boolean;
+        /**/
+        displayBrush(value: boolean): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        /*Specifies each line tension. Values between 0 and 1.*/
+        lineTension(): number;
+        /*Specifies each line tension. Values between 0 and 1.*/
+        lineTension(value: number): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        /**/
+        noData(): string;
+        /**/
+        noData(value: string): this;
+        /**/
+        showLegend(): boolean;
+        /**/
+        showLegend(value: boolean): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+    }
+
+    interface PieChart extends Chart {
+        legend: Legend;
+        pie: Pie;
+        tooltip: Tooltip;
+
+        /*Specifies each slice size, by an inner and a outer radius. Values between 0 and 1*/
+        arcsRadius(): ArcsRadius[];
+        /*Specifies each slice size, by an inner and a outer radius. Values between 0 and 1*/
+        arcsRadius(value: ArcsRadius[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*D3 3.4+, For donut charts only, the corner radius of the slices. Typically used with padAngle.*/
+        cornerRadius(): number;
+        /*D3 3.4+, For donut charts only, the corner radius of the slices. Typically used with padAngle.*/
+        cornerRadius(value: number): this;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(): any;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(value: any): this;
+        /*Whether to make a pie graph a donut graph or not.*/
+        donut(): boolean;
+        /*Whether to make a pie graph a donut graph or not.*/
+        donut(value: boolean): this;
+        /**/
+        donutLabelsOutside(): boolean;
+        /**/
+        donutLabelsOutside(value: boolean): this;
+        /*Percent of pie radius to cut out of the middle to make the donut. It is multiplied by the outer radius to calculate the inner radius, thus it should be between 0 and 1.*/
+        donutRatio(): number;
+        /*Percent of pie radius to cut out of the middle to make the donut. It is multiplied by the outer radius to calculate the inner radius, thus it should be between 0 and 1.*/
+        donutRatio(value: number): this;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(): number;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(value: number): this;
+        /*Function used to manage the ending angle of the pie/donut chart*/
+        endAngle(): (d: any) => number;
+        /*Function used to manage the ending angle of the pie/donut chart*/
+        endAngle(func: (d: any) => number): this;
+        /*For pie/donut charts, whether to increase slice radius on hover or not*/
+        growOnHover(): boolean;
+        /*For pie/donut charts, whether to increase slice radius on hover or not*/
+        growOnHover(value: boolean): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        id(): any;
+id(value: number|string): this;
+        /**/
+        labelFormat(): string;
+        /**/
+        labelFormat(value: string): this;
+        /**/
+        labelFormat(format: (d: any) => string): this;
+        /**/
+        labelSunbeamLayout(): boolean;
+        /**/
+        labelSunbeamLayout(value: boolean): this;
+        /*Pie/donut charts: The slice threshold size to not display the label because it woudl be too small of a space*/
+        labelThreshold(): number;
+        /*Pie/donut charts: The slice threshold size to not display the label because it woudl be too small of a space*/
+        labelThreshold(value: number): this;
+        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
+        labelType(): string;
+        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
+        labelType(value: 'key'): this;
+        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
+        labelType(value: 'value'): this;
+        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
+        labelType(value: 'percent'): this;
+        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
+        labelType(value: string): this;
+        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
+        labelType(func: (d: any, i: number, values: any) => string): this;
+        /*Whether pie/donut chart labels should be outside the slices instead of inside them*/
+        labelsOutside(): boolean;
+        /*Whether pie/donut chart labels should be outside the slices instead of inside them*/
+        labelsOutside(value: boolean): this;
+        /*Position of the legend (top or right). */
+        legendPosition(): string;
+        /*Position of the legend (top or right). */
+        legendPosition(value: 'top'): this;
+        /*Position of the legend (top or right). */
+        legendPosition(value: 'right'): this;
+        /*Position of the legend (top or right). */
+        legendPosition(value: string): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        /*Message to display if no data is provided*/
+        noData(): string;
+        /*Message to display if no data is provided*/
+        noData(value : string): this;
+        /*D3 3.4+, For donut charts only, the percent of the chart that should be spacing between slices.*/
+        padAngle(): number;
+        /*D3 3.4+, For donut charts only, the percent of the chart that should be spacing between slices.*/
+        padAngle(value: number): this;
+        /**/
+        pieLabelsOutside(): boolean;
+        /**/
+        pieLabelsOutside(value: boolean): this;
+        /*Show pie/donut chart labels for each slice*/
+        showLabels(): boolean;
+        /*Show pie/donut chart labels for each slice*/
+        showLabels(value: boolean): this;
+        /*Whether to display the legend or not*/
+        showLegend(): boolean;
+        /*Whether to display the legend or not*/
+        showLegend(value: boolean): this;
+        /*Function used to manage the starting  angle of the pie/donut chart*/
+        startAngle(): (d: any) => number;
+        /*Function used to manage the starting  angle of the pie/donut chart*/
+        startAngle(func: (d: any) => number): this;
+        /*Text to include within the middle of a donut chart*/
+        title(): string;
+        /*Text to include within the middle of a donut chart*/
+        title(value: string): this;
+        /*Vertical offset for the donut chart title*/
+        titleOffset(): number;
+        /*Vertical offset for the donut chart title*/
+        titleOffset(value: number): this;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(): (d: any) => string;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(func: (d: any) => string): this;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(): boolean;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(value: boolean): this;
+        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
+        valueFormat(): string;
+        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
+        valueFormat(value: string): this;
+        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
+        valueFormat(format: (d: any) => string): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any) => any;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any) => any): this;
+        /*Proxy function to return the Y value so adjustments can be made if needed.For pie/ donut chart this returns the value for the slice.*/
+        y(): (d: any) => number;
+        /*Proxy function to return the Y value so adjustments can be made if needed. For pie/donut chart this returns the value for the slice.*/
+        y(func: (d: any) => number): this;
+    }
+
+    interface ScatterChart extends Chart {
+        scatter: Scatter;
+        xAxis: Nvd3Axis;
+        yAxis: Nvd3Axis;
+        legend: Legend;
+        tooltip: Tooltip;
+        distX: Distribution;
+        distY: Distribution;
+
+        clearHighlights(): this;
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(): boolean;
+        /*If true, masks lines within the X and Y scales using a clip-path*/
+        clipEdge(value: boolean): this;
+        /*When useVoronoi and clipVoronoi are true, you can control the clip radius with this option. Essentially this lets you set how far away from the actual point you can put the mouse for it to select the point.*/
+        clipRadius(func: (d: any) => number): this;
+        /*When useVoronoi and clipVoronoi are true, you can control the clip radius with this option. Essentially this lets you set how far away from the actual point you can put the mouse for it to select the point.*/
+        clipRadius(value: number): this;
+        /*When useVoronoi is on, this masks each voronoi section with a circle to limit selection to smaller area.*/
+        clipVoronoi(): boolean;
+        /*When useVoronoi is on, this masks each voronoi section with a circle to limit selection to smaller area.*/
+        clipVoronoi(value: boolean): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(value: string[]): this;
+        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
+        color(func: (d: any, i: number) => string): this;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(): any;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(value: any): this;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(): number;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(value: number): this;
+        /*List of numbers to Force into the point scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forcePoint(): number[];
+        /*List of numbers to Force into the point scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forcePoint(value: number[]): this;
+        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceX(): number[];
+        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceX(value: number[]): this;
+        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceY(): number[];
+        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
+        forceY(value: number[]): this;
+        /*The height the graph or component created inside the SVG should be made*/
+        height(): number;
+        /*The height the graph or component created inside the SVG should be made.*/
+        height(value: number): this;
+        /**/
+        highlightPoint(): (d: any) => boolean;
+        /**/
+        highlightPoint(func: (d: any) => boolean): this;
+        id(): any;
+id(value: number|string): this;
+        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
+        interactive(): boolean;
+        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
+        interactive(value: boolean): this;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(): Margin;
+        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
+        margin(value: Margin): this;
+        noData(): string;
+        noData(value: string): this;
+        /**/
+        padData(): boolean;
+        /**/
+        padData(value: boolean): this;
+        /**/
+        padDataOuter(): number;
+        /**/
+        padDataOuter(value: number): this;
+        /* Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
+        pointActive(): (d: any) => boolean;
+        /*Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
+        pointActive(func: (d: any) => boolean): this;
+        /* Defines the whole point scale's domain. Using this will disable calculating the domain based on the data.*/
+        pointxDomain(): number[];
+        /* Defines the whole point scale's domain. Using this will disable calculating the domain based on the data.*/
+        pointDomain(value: number[]): this;
+        /* Override the point scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        pointRange(): number[];
+        /* Override the point scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        pointRange(value: number[]): this;
+        /* Override the default scale type for the point axis*/
+        pointScale(): any;
+        /* Override the default scale type for the point axis*/
+        pointScale(value: any): this;
+        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
+        pointSize(): (d: any) => number;
+        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
+        pointSize(func: (d: any) => number): this;
+        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
+        pointSize(value: number): this;
+        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
+        rightAlignYAxis(): boolean;
+        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
+        rightAlignYAxis(value: boolean): this;
+        /**/
+        showDistX(): boolean;
+        /**/
+        showDistX(value: boolean): this;
+        /**/
+        showDistY(): boolean;
+        /**/
+        showDistY(value: boolean): this;
+        /*Whether to display the legend or not.*/
+        showLegend(): boolean;
+        /*Whether to display the legend or not.*/
+        showLegend(value: boolean): this;
+        /*Displays the voronoi areas on the chart. This is mostly helpful when debugging issues.*/
+        showVoronoi(): boolean;
+        /*Displays the voronoi areas on the chart. This is mostly helpful when debugging issues.*/
+        showVoronoi(value: boolean): this;
+        /*Display or hide the X axis*/
+        showXAxis(): boolean;
+        /*Display or hide the X axis*/
+        showXAxis(value: boolean): this;
+        /*Display or hide the Y axis*/
+        showYAxis(): boolean;
+        /*Display or hide the Y axis*/
+        showYAxis(value: boolean): this;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(): (d: any) => string;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(func: (d: any) => string): this;
+        /**/
+        tooltipXContent(): (d: any) => string;
+        /**/
+        tooltipXContent(func: (d: any) => string): this;
+        /**/
+        tooltipYContent(): (d: any) => string;
+        /**/
+        tooltipYContent(func: (d: any) => string): this;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(): boolean;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(value: boolean): this;
+        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
+        useVoronoi(): boolean;
+        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
+        useVoronoi(value: boolean): this;
+        /* The width the graph or component created inside the SVG should be made*/
+        width(): number;
+        /*The width the graph or component created inside the SVG should be made.*/
+        width(value: number): this;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(): (d: any) => any;
+        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        x(func: (d: any) => any): this;
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(): number[];
+        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
+        xDomain(value: number[]): this;
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(): number[];
+        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        xRange(value: number[]): this;
+        /* Override the default scale type for the X axis*/
+        xScale(): any;
+        /* Override the default scale type for the X axis*/
+        xScale(value: any): this;
+        y(): (d: any) => number;
+        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
+        y(func: (d: any) => number): this;
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(): number[];
+        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
+        yDomain(value: number[]): this;
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(): number[];
+        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
+        yRange(value: number[]): this;
+        /* Override the default scale type for the y axis*/
+        yScale(): any;
+        /* Override the default scale type for the y axis*/
+        yScale(value: any): this;
+
+    }
+
+    interface StackedAreaChart extends StackedArea, Chart {
+        stacked: StackedArea;
+        legend: Legend;
+        controls: Legend;
+        xAxis: Nvd3Axis;
+        yAxis: Nvd3Axis;
+        tooltip: Tooltip;
+
+        controlLabels(): any;
+        /*Object that defines the labels for control items in the graph. For instance, in the stackedAreaChart, there are controls for making it stacked, expanded, or stream. For stacked bar charts, there is stacked and grouped.*/
+        controlLabels(value: any): this;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(): any;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(value: any): this;
+        /*Message to display if no data is provided*/
+        noData(): string;
+        /*Message to display if no data is provided*/
+        noData(value: string): this;
+        rightAlignYAxis(): boolean;
+        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
+        rightAlignYAxis(value: boolean): this;
+        showLegend(): boolean;
+        /*Whether to display the legend or not*/
+        showLegend(value: boolean): this;
+        /*Display or hide the X axis*/
+        showXAxis(): boolean;
+        /*Display or hide the X axis*/
+        showXAxis(value: boolean): this;
+        /*Display or hide the Y axis*/
+        showYAxis(): boolean;
+        /*Display or hide the Y axis*/
+        showYAxis(value: boolean): this;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(): (d: any) => string;
+        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
+        tooltipContent(func: (d: any) => string): this;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(): boolean;
+        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
+        tooltips(value: boolean): this;
+        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
+        useInteractiveGuideline(): boolean;
+        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
+        useInteractiveGuideline(value: boolean): this;
+    }
+
+    interface SunburstChart extends Sunburst, Chart {
+        sunburst: Sunburst;
+        tooltip: Tooltip;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(): number;
+        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
+        duration(value: number): this;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(): any;
+        /*No longer used.Use chart.dispatch.changeState(...) instead*/
+        defaultState(value: any): this;
+        /*Message to display if no data is provided*/
+        noData(): string;
+        /*Message to display if no data is provided*/
+        noData(value: string): this;
+    }
+
+//#endregion
+
+    interface Models{
+        boxPlotChart(): BoxPlotChart;
+        bullet(): Bullet;
+        bulletChart(): BulletChart;
+        candlestickBar(): CandlestickBar;
+        candlestickBarChart(): CandlestickBarChart;
+        cumulativeLineChart(): CumulativeLineChart;
+        discreteBar(): DiscreteBar;
+        discreteBarChart(): DiscreteBarChart;
+        distribution(): Distribution;
+		historicalBar(): HistoricalBar;
+        historicalBarChart(bar_model?: HistoricalBar): HistoricalBarChart;
+        ohlcBar(): OhlcBar;
+        ohlcBarChart(): OhlcBarChart;
+        legend(): Legend;
+        line(): Line;
+        lineChart(): LineChart;
+        linePlusBarChart(): LinePlusBarChart;
+        lineWithFocusChart(): LineWithFocusChart;
+        multiBarChart(): MultiBarChart;
+        multiBarHorizontalChart(): MultiBarHorizontalChart;
+        multiChart(): MultiChart;
+        parallelCoordinates(): ParallelCoordinates;
+        parallelCoordinatesChart(): ParallelCoordinatesChart;
+        pie(): Pie;
+        pieChart(): PieChart;
+        scatter(): Scatter;
+        scatterChart(): ScatterChart;
+        sparkline(): SparkLine;
+        sparklinePlus(): SparkLinePlus;
+        stackedArea(): StackedArea;
+        stackedAreaChart(): StackedAreaChart;
+        sunburst(): Sunburst;
+        sunburstChart(): SunburstChart;
+		tooltip(): Tooltip;
+	}
+
+    interface Nvd3Static{
+        /*set to false in production*/
+        dev: boolean
+        /*stores all the ready to use charts*/
+        charts: any
+        models: Models;
+        tooltip: Nvd3TooltipStatic;
+        utils: Utils;
+
+        /*stores some statistics and potential error messages*/
+        logs: any;
+
+        addGraph<TChart extends Nvd3Element>(factory: ChartFactory<TChart>): void;
+        addGraph<TChart extends Nvd3Element>(generate: () => TChart, callBack?: (chart: TChart) => void): void;
+
+
+        log(topic: string, value?: string): string //returns last argument
+        log(arg: any[]): any //returns last argument
+	}
+}
+declare var nv : nv.Nvd3Static;
diff --git a/nvd3/nvd3-test-boxplot.ts b/nvd3/nvd3-test-boxplot.ts
index 3b78095314..e76a7d3f4a 100644
--- a/nvd3/nvd3-test-boxplot.ts
+++ b/nvd3/nvd3-test-boxplot.ts
@@ -1,5 +1,5 @@
-/// <reference path="../d3/d3.d.ts" />
-/// <reference path="nvd3.d.ts" />
+/// <reference types="d3" />
+
 nv.addGraph(function() { 
       var chart = nv.models.boxPlotChart() 
           .x(function(d) { return d.label }) 
diff --git a/nvd3/nvd3-test-bullet.ts b/nvd3/nvd3-test-bullet.ts
index bec9053db2..f985f5f47e 100644
--- a/nvd3/nvd3-test-bullet.ts
+++ b/nvd3/nvd3-test-bullet.ts
@@ -1,5 +1,5 @@
-/// <reference path="../d3/d3.d.ts" />
-/// <reference path="nvd3.d.ts" />
+/// <reference types="d3" />
+
 namespace nvd3_test_bullet {
     var width = 960,
         height = 55,
diff --git a/nvd3/nvd3-test-bulletChart.ts b/nvd3/nvd3-test-bulletChart.ts
index 92400d9e6f..082e508d74 100644
--- a/nvd3/nvd3-test-bulletChart.ts
+++ b/nvd3/nvd3-test-bulletChart.ts
@@ -1,5 +1,5 @@
-/// <reference path="../d3/d3.d.ts" />
-/// <reference path="nvd3.d.ts" />
+/// <reference types="d3" />
+
 namespace nvd3_test_bulletChart {
     var width = 960,
         height = 80,
diff --git a/nvd3/nvd3-test-candlestick.ts b/nvd3/nvd3-test-candlestick.ts
index 46881dea27..6aed19f1a3 100644
--- a/nvd3/nvd3-test-candlestick.ts
+++ b/nvd3/nvd3-test-candlestick.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_candlestick {
     var data = [{
         values: [
diff --git a/nvd3/nvd3-test-candlestickChart.ts b/nvd3/nvd3-test-candlestickChart.ts
index d907628848..b282f0f522 100644
--- a/nvd3/nvd3-test-candlestickChart.ts
+++ b/nvd3/nvd3-test-candlestickChart.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_candlestickChart {
     var data = [{
         values: [
diff --git a/nvd3/nvd3-test-cumulativeLineChart.ts b/nvd3/nvd3-test-cumulativeLineChart.ts
index 76b8b0ac11..e004534615 100644
--- a/nvd3/nvd3-test-cumulativeLineChart.ts
+++ b/nvd3/nvd3-test-cumulativeLineChart.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_cumulativeLineChart {
     // Wrapping in nv.addGraph allows for '0 timeout render', stores rendered charts in nv.graphs,
     // and may do more in the future... it's NOT required
diff --git a/nvd3/nvd3-test-discreteBarChart.ts b/nvd3/nvd3-test-discreteBarChart.ts
index 981fd9f02f..65e8ba41ca 100644
--- a/nvd3/nvd3-test-discreteBarChart.ts
+++ b/nvd3/nvd3-test-discreteBarChart.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_discreteBarChart {
     var historicalBarChart = [
         {
diff --git a/nvd3/nvd3-test-donutChart.ts b/nvd3/nvd3-test-donutChart.ts
index f95a8c45ff..c36b6d9ba5 100644
--- a/nvd3/nvd3-test-donutChart.ts
+++ b/nvd3/nvd3-test-donutChart.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_donutChart {
     var testdata = [
         { key: "One", y: 5 },
diff --git a/nvd3/nvd3-test-furiousLegend.ts b/nvd3/nvd3-test-furiousLegend.ts
index a6f68da0dc..244dc6f282 100644
--- a/nvd3/nvd3-test-furiousLegend.ts
+++ b/nvd3/nvd3-test-furiousLegend.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_furiousLegend {
     var width = 500,
         height = 40;
diff --git a/nvd3/nvd3-test-historicalBar.ts b/nvd3/nvd3-test-historicalBar.ts
index dc765cdcda..e21264ab08 100644
--- a/nvd3/nvd3-test-historicalBar.ts
+++ b/nvd3/nvd3-test-historicalBar.ts
@@ -1,5 +1,5 @@
-/// <reference path="../d3/d3.d.ts" />
-/// <reference path="nvd3.d.ts" />
+/// <reference types="d3" />
+
 nv.addGraph({ 
 	generate: function() { 
 		var chart = nv.models.historicalBar(); 
diff --git a/nvd3/nvd3-test-historicalBarChart.ts b/nvd3/nvd3-test-historicalBarChart.ts
index dfd8a30aef..f4e8595913 100644
--- a/nvd3/nvd3-test-historicalBarChart.ts
+++ b/nvd3/nvd3-test-historicalBarChart.ts
@@ -1,5 +1,5 @@
-/// <reference path="../d3/d3.d.ts" />
-/// <reference path="nvd3.d.ts" />
+/// <reference types="d3" />
+
 var data = [{ 
         values : [] 
     }]; 
diff --git a/nvd3/nvd3-test-legend.ts b/nvd3/nvd3-test-legend.ts
index 96df3d680b..1329169de4 100644
--- a/nvd3/nvd3-test-legend.ts
+++ b/nvd3/nvd3-test-legend.ts
@@ -1,5 +1,5 @@
-/// <reference path="../d3/d3.d.ts" />
-/// <reference path="nvd3.d.ts" />
+/// <reference types="d3" />
+
 namespace nvd3_test_legend {
     var width = 500,
         height = 20;
diff --git a/nvd3/nvd3-test-line.ts b/nvd3/nvd3-test-line.ts
index 11431b2b9b..048a765efc 100644
--- a/nvd3/nvd3-test-line.ts
+++ b/nvd3/nvd3-test-line.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_line {
     nv.addGraph({
         generate: function () {
@@ -22,7 +22,7 @@ namespace nvd3_test_line {
 
             return chart;
         },
-        callback: function (graph) {
+        callback: function (graph: any) {
             window.onresize = function () {
                 var width = nv.utils.windowSize().width - 40,
                     height = nv.utils.windowSize().height - 40,
diff --git a/nvd3/nvd3-test-lineChart.ts b/nvd3/nvd3-test-lineChart.ts
index 0cbf4c6772..cc355d442e 100644
--- a/nvd3/nvd3-test-lineChart.ts
+++ b/nvd3/nvd3-test-lineChart.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_lineChart {
     // Wrapping in nv.addGraph allows for '0 timeout render', stores rendered charts in nv.graphs, and may do more in the future... it's NOT required
     var chart;
diff --git a/nvd3/nvd3-test-lineChartLogScale.ts b/nvd3/nvd3-test-lineChartLogScale.ts
index 0788d9fc09..579342e5fe 100644
--- a/nvd3/nvd3-test-lineChartLogScale.ts
+++ b/nvd3/nvd3-test-lineChartLogScale.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_lineChartLogScale {
 var chart;
      var data;
diff --git a/nvd3/nvd3-test-lineChartSVGResize.ts b/nvd3/nvd3-test-lineChartSVGResize.ts
index f8c770e6a3..ebbebc8840 100644
--- a/nvd3/nvd3-test-lineChartSVGResize.ts
+++ b/nvd3/nvd3-test-lineChartSVGResize.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_lineChartSVGResize {
     nv.addGraph(function () {
         var chart = nv.models.lineChart();
diff --git a/nvd3/nvd3-test-linePlusBarChart.ts b/nvd3/nvd3-test-linePlusBarChart.ts
index ddda286e33..feb9a9d474 100644
--- a/nvd3/nvd3-test-linePlusBarChart.ts
+++ b/nvd3/nvd3-test-linePlusBarChart.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_linePlusBarChart {
     var testdata = [
         {
diff --git a/nvd3/nvd3-test-lineWithFocusChart.ts b/nvd3/nvd3-test-lineWithFocusChart.ts
index 4ef77f7ad7..7ed536a2f6 100644
--- a/nvd3/nvd3-test-lineWithFocusChart.ts
+++ b/nvd3/nvd3-test-lineWithFocusChart.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_lineWithFocusChart {
     nv.addGraph(function () {
         var chart = nv.models.lineWithFocusChart();
diff --git a/nvd3/nvd3-test-lineWithFocusChartx2AxisLabel.ts b/nvd3/nvd3-test-lineWithFocusChartx2AxisLabel.ts
index d72e5bcd9b..1b3e2628bc 100644
--- a/nvd3/nvd3-test-lineWithFocusChartx2AxisLabel.ts
+++ b/nvd3/nvd3-test-lineWithFocusChartx2AxisLabel.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_lineWithFocusChartx2AxisLabel {
 
     nv.addGraph(function () {
diff --git a/nvd3/nvd3-test-monitoringChart.ts b/nvd3/nvd3-test-monitoringChart.ts
index b80a373e88..c8a41df1bd 100644
--- a/nvd3/nvd3-test-monitoringChart.ts
+++ b/nvd3/nvd3-test-monitoringChart.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_monitoringChart {
 
     var testdata1 = [
diff --git a/nvd3/nvd3-test-multiChart.ts b/nvd3/nvd3-test-multiChart.ts
index 0ba784b9ff..459b69308b 100644
--- a/nvd3/nvd3-test-multiChart.ts
+++ b/nvd3/nvd3-test-multiChart.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_multiChart {
     //todo resolve stream_layersIssue var testdata = stream_layers(9, 10 + Math.random() * 100, .1).map(function (data, i) {
     //    return {
diff --git a/nvd3/nvd3-test-multibarChart.ts b/nvd3/nvd3-test-multibarChart.ts
index 0a162dd59a..5ee5e1b76a 100644
--- a/nvd3/nvd3-test-multibarChart.ts
+++ b/nvd3/nvd3-test-multibarChart.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_multibarChart {
     //todo resolve stream_layers var test_data = stream_layers(3, 10 + Math.random() * 100, .1).map(function (data, i) {
     var test_data = [3, 10 + Math.random() * 100, .1].map(function (data, i) {
diff --git a/nvd3/nvd3-test-multibarChart2.ts b/nvd3/nvd3-test-multibarChart2.ts
index ac108c4edf..d2fe6035d2 100644
--- a/nvd3/nvd3-test-multibarChart2.ts
+++ b/nvd3/nvd3-test-multibarChart2.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_multibarChart2 {
     //todo resolve stream_layers var test_data = stream_layers(3, 128, .1).map(function (data, i) {
     var test_data = [3, 128, .1].map(function (data, i) {
@@ -29,7 +29,7 @@ namespace nvd3_test_multibarChart2 {
 
             return chart;
         },
-        callback: function (graph) {
+        callback: function (graph: nv.MultiBarChart) {
             nv.utils.windowResize(function () {
                 var width = nv.utils.windowSize().width;
                 var height = nv.utils.windowSize().height;
diff --git a/nvd3/nvd3-test-multibarHorizontalChart.ts b/nvd3/nvd3-test-multibarHorizontalChart.ts
index 5c10d31e81..85bd14ed1d 100644
--- a/nvd3/nvd3-test-multibarHorizontalChart.ts
+++ b/nvd3/nvd3-test-multibarHorizontalChart.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_multibarHorizontalChart {
     var long_short_data = [
         {
diff --git a/nvd3/nvd3-test-ohlc.ts b/nvd3/nvd3-test-ohlc.ts
index da49307e8d..535c319a1a 100644
--- a/nvd3/nvd3-test-ohlc.ts
+++ b/nvd3/nvd3-test-ohlc.ts
@@ -1,5 +1,5 @@
-/// <reference path="../d3/d3.d.ts" />
-/// <reference path="nvd3.d.ts" />
+/// <reference types="d3" />
+
 namespace nvd3_test_ohlc {
     var data = [{
         values: [
diff --git a/nvd3/nvd3-test-ohlcChart.ts b/nvd3/nvd3-test-ohlcChart.ts
index a7fa373a01..e943397696 100644
--- a/nvd3/nvd3-test-ohlcChart.ts
+++ b/nvd3/nvd3-test-ohlcChart.ts
@@ -1,5 +1,5 @@
-/// <reference path="../d3/d3.d.ts" />
-/// <reference path="nvd3.d.ts" />
+/// <reference types="d3" />
+
 namespace nvd3_test_ohlcChart {
     var data = [{
         values: [
diff --git a/nvd3/nvd3-test-parallelCoordinates.ts b/nvd3/nvd3-test-parallelCoordinates.ts
index 14b6e97e01..de9501a242 100644
--- a/nvd3/nvd3-test-parallelCoordinates.ts
+++ b/nvd3/nvd3-test-parallelCoordinates.ts
@@ -1,5 +1,5 @@
-/// <reference path="../d3/d3.d.ts" />
-/// <reference path="nvd3.d.ts" />
+/// <reference types="d3" />
+
 namespace nvd3_test_parallelCoordinates {
     var chart;
     nv.addGraph(function () {
diff --git a/nvd3/nvd3-test-parallelCoordinatesChart.ts b/nvd3/nvd3-test-parallelCoordinatesChart.ts
index 624951b83d..77191d712a 100644
--- a/nvd3/nvd3-test-parallelCoordinatesChart.ts
+++ b/nvd3/nvd3-test-parallelCoordinatesChart.ts
@@ -1,5 +1,5 @@
-/// <reference path="../d3/d3.d.ts" />
-/// <reference path="nvd3.d.ts" />
+/// <reference types="d3" />
+
 namespace nvd3_test_parallelCoordinatesChart {
     var chart;
     function resetBrush() {
diff --git a/nvd3/nvd3-test-pie.ts b/nvd3/nvd3-test-pie.ts
index c932e742a1..ae79f81332 100644
--- a/nvd3/nvd3-test-pie.ts
+++ b/nvd3/nvd3-test-pie.ts
@@ -1,5 +1,5 @@
-/// <reference path="../d3/d3.d.ts" />
-/// <reference path="nvd3.d.ts" />
+/// <reference types="d3" />
+
 namespace nvd3_test_pie {
 
     var testdata = [
diff --git a/nvd3/nvd3-test-pieChart.ts b/nvd3/nvd3-test-pieChart.ts
index f6d292f24d..c7dc623bcd 100644
--- a/nvd3/nvd3-test-pieChart.ts
+++ b/nvd3/nvd3-test-pieChart.ts
@@ -1,5 +1,5 @@
-/// <reference path="../d3/d3.d.ts" />
-/// <reference path="nvd3.d.ts" />
+/// <reference types="d3" />
+
 namespace nvd3_test_pieChart {
 
     var testdata = [
diff --git a/nvd3/nvd3-test-scatter.ts b/nvd3/nvd3-test-scatter.ts
index a2bfd1d473..2939667c07 100644
--- a/nvd3/nvd3-test-scatter.ts
+++ b/nvd3/nvd3-test-scatter.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_scatter {
     nv.addGraph(function () {
 
diff --git a/nvd3/nvd3-test-scatterChart.ts b/nvd3/nvd3-test-scatterChart.ts
index 86f051ce69..3175b3e418 100644
--- a/nvd3/nvd3-test-scatterChart.ts
+++ b/nvd3/nvd3-test-scatterChart.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_scatterChart {
     // register our custom symbols to nvd3
     // make sure your path is valid given any size because size scales if the chart scales.
diff --git a/nvd3/nvd3-test-scatterPlusLineChart.ts b/nvd3/nvd3-test-scatterPlusLineChart.ts
index de6c8a20a9..be89930e65 100644
--- a/nvd3/nvd3-test-scatterPlusLineChart.ts
+++ b/nvd3/nvd3-test-scatterPlusLineChart.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_scatterPlusLineChart {
     var chart;
     nv.addGraph(function () {
diff --git a/nvd3/nvd3-test-sparkLine.ts b/nvd3/nvd3-test-sparkLine.ts
index 4fc1a2601f..35da6b35df 100644
--- a/nvd3/nvd3-test-sparkLine.ts
+++ b/nvd3/nvd3-test-sparkLine.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_sparkLine {
 
     nv.addGraph({
diff --git a/nvd3/nvd3-test-sparkLinePlus.ts b/nvd3/nvd3-test-sparkLinePlus.ts
index 0de40287f5..e60bddab34 100644
--- a/nvd3/nvd3-test-sparkLinePlus.ts
+++ b/nvd3/nvd3-test-sparkLinePlus.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_sparkLinePlus {
     function defaultChartConfig(containerId, data) {
         nv.addGraph(function () {
diff --git a/nvd3/nvd3-test-stackArea.ts b/nvd3/nvd3-test-stackArea.ts
index c906446ced..614397cdcc 100644
--- a/nvd3/nvd3-test-stackArea.ts
+++ b/nvd3/nvd3-test-stackArea.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_stackArea {
     nv.addGraph({
         generate: function () {
@@ -25,7 +25,7 @@ namespace nvd3_test_stackArea {
             svg.transition().duration(500).call(chart);
             return chart;
         },
-        callback: function (graph) {
+        callback: function (graph: nv.StackedAreaChart) {
 
             graph.dispatch.on('tooltipShow', function (e) {
                 var offsetElement = document.getElementById("chart"),
diff --git a/nvd3/nvd3-test-stackAreaChart.ts b/nvd3/nvd3-test-stackAreaChart.ts
index 1cfbc33fec..2905501819 100644
--- a/nvd3/nvd3-test-stackAreaChart.ts
+++ b/nvd3/nvd3-test-stackAreaChart.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_stackAreaChart {
     var histcatexplong = [
         {
diff --git a/nvd3/nvd3-test-sunburst.ts b/nvd3/nvd3-test-sunburst.ts
index 85013ce3bd..dabdee2ae9 100644
--- a/nvd3/nvd3-test-sunburst.ts
+++ b/nvd3/nvd3-test-sunburst.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_sunburst {
 
     var chart;
diff --git a/nvd3/nvd3-test-timeSeries.ts b/nvd3/nvd3-test-timeSeries.ts
index 04ccc9fd02..f27a5f9935 100644
--- a/nvd3/nvd3-test-timeSeries.ts
+++ b/nvd3/nvd3-test-timeSeries.ts
@@ -1,4 +1,4 @@
-/// <reference path="nvd3.d.ts" />
+
 namespace nvd3_test_timeSeries {
     var data = [{
         values: []
diff --git a/nvd3/nvd3-test-tooltip.ts b/nvd3/nvd3-test-tooltip.ts
index 312d22ea90..023645b6fa 100644
--- a/nvd3/nvd3-test-tooltip.ts
+++ b/nvd3/nvd3-test-tooltip.ts
@@ -1,5 +1,5 @@
-/// <reference path="../d3/d3.d.ts" />
-/// <reference path="nvd3.d.ts" />
+/// <reference types="d3" />
+
 namespace nvd3_test_tooltip {
     var width = 500,
         height = 20;
diff --git a/nvd3/nvd3.d.ts b/nvd3/nvd3.d.ts
deleted file mode 100644
index f0297abcb0..0000000000
--- a/nvd3/nvd3.d.ts
+++ /dev/null
@@ -1,3351 +0,0 @@
-// Type definitions for nvd3 1.8.1
-// Project: https://github.com/novus/nvd3
-// Definitions by: Peter Mitchell <https://github.com/PjMitchell/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../d3/d3.d.ts" />
-declare namespace nv {
-
-//#region Core Interfaces
-	interface Margin {
-		left?: number,
-		right?: number,
-		top?: number,
-		bottom?: number
-	}
-
-    interface Size {
-        height: number;
-        width: number;
-    }
-
-    interface ArcsRadius {
-        inner: number;
-        outer: number;
-    }
-
-    interface Offset {
-        left?: number;
-        top?: number;
-    }
-
-    interface State {
-        dispatch: d3.Dispatch;
-    }
-
-    interface InteractiveLayer {
-        tooltip: Tooltip
-    }
-
-    interface SymbolMap {
-        set(name:string,func: (size: any)=>void): void
-    }
-
-    interface Utils {
-        /* Default color chooser uses a color scale of 20 colors from D3  https://github.com/mbostock/d3/wiki/Ordinal-Scales#categorical-colors */
-        defaultColor(): string[];
-
-        getColor(arg: any): string[];
-
-        /* Binds callback function to run when window is resized */
-        windowResize(listener: (ev: Event) => any): void;
-        /* Gets the browser window size */
-        windowSize(): Size;
-        state(): State;
-        symbolMap: SymbolMap;
-    }
-
-    interface ChartFactory<TChart extends Nvd3Element> {
-        generate: () => TChart;
-        callback?: (chart: TChart) => void;
-    }
-
-    interface Nvd3TooltipStatic {
-        show([left, top]: [number, number], content: string, gravity?: string): void; //todo sort out use on nv.tooltip.
-        cleanup(): void; //todo sort out use on nv.tooltip.
-    }
-
-    interface Nvd3Element {
-        dispatch: d3.Dispatch;
-        options(options: any): this;
-        update(): void;
-        (transition: d3.Transition<any[]>, ...args: any[]): any;
-        (selection: d3.Selection<any[]>, ...args: any[]): any;
-        (transition: d3.Transition<any>, ...args: any[]): any;
-        (selection: d3.Selection<any>, ...args: any[]): any;
-    }
-
-    interface Chart extends Nvd3Element {
-        state: State;
-        interactiveLayer: InteractiveLayer;
-    }
-
-//#endregion
-
-//#region Chart Component
-
-    interface Legend extends Nvd3Element {
-        align(): boolean;
-        align(value: boolean): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        expanded(): boolean;
-        expanded(value: boolean): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        key(): any;
-        key(value: any): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        /*Specifies how much spacing there is between legend items.*/
-        padding(): number;
-        /*Specifies how much spacing there is between legend items.*/
-        padding(value: number): this;
-        radioButtonMode(): boolean;
-        //If true, clicking legend items will cause it to behave like a radio button. (only one can be selected at
-        radioButtonMode(value: boolean): this;
-        rightAlign(): boolean;
-        rightAlign(value: boolean): this;
-        //If true, legend will update data.disabled and trigger a 'stateChange' dispatch.
-        updateState(): boolean;
-        //If true, legend will update data.disabled and trigger a 'stateChange' dispatch.
-        updateState(value: boolean): this;
-        //Options are "classic" and "furious"
-        vers(): string;
-        //Options are "classic" and "furious"
-        vers(value: string): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-    }
-
-	interface Nvd3Axis extends d3.svg.Axis {
-        axisLabel(): string;
-        axisLabel(value: string): this;
-        axisLabelDistance(): number;
-        axisLabelDistance(value: number): this;
-        domain(): number[];
-        domain(domain: number[]): this;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(): number;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(value: number): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        orient(): string;
-        orient(orientation: string): this;
-        range(): number[];
-        range(range: number[]): this;
-        rangeBand(): number;
-        rangeBands(interval: [number, number], padding?: number, outerPadding?: number): this;
-        /*Rotates the X axis labels by the specified degree.*/
-        rotateLabels(): number;
-        /*Rotates the X axis labels by the specified degree.*/
-        rotateLabels(range: number): this;
-        rotateYLabels(): number;
-        rotateYLabels(range: number): this;
-        scale(): any;
-        scale(scale: any): this;
-        showMaxMin(value: boolean): this;
-        staggerLabels(): boolean;
-        staggerLabels(value: boolean): this;
-        tickFormat(): (d: any) => string;
-        tickFormat(format: (t: any) => string): this;
-        tickFormat(format: string): this;
-        tickFormat(format: (d: any, i: any) => string): this;
-        tickPadding(): number;
-        tickPadding(padding: number): this;
-        tickSize(): number;
-        tickSize(size: number): this;
-        tickSize(inner: number, outer: number): this;
-        tickValues(): any[];
-        tickValues(values: any[]): this;
-        ticks(): any[];
-        ticks(...args: any[]): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-	}
-
-    interface BoxPlot extends Nvd3Element {
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(): number;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(value: number): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        id(): any;
-        id(value: number|string): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        maxBoxWidth(): number;
-        maxBoxWidth(value: number): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any) => any;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any) => any): this;
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(): number[];
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(value: number[]): this;
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(): number[];
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(value: number[]): this;
-        /* Override the default scale type for the X axis*/
-        xScale(): any;
-        /* Override the default scale type for the X axis*/
-        xScale(value: any): this;
-        y(): (d: any) => number;
-        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        y(func: (d: any) => number): this;
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(): number[];
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(value: number[]): this;
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(): number[];
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(value: number[]): this;
-        /* Override the default scale type for the y axis*/
-        yScale(): any;
-        /* Override the default scale type for the y axis*/
-        yScale(value: any): this;
-    }
-
-    interface Bullet extends Nvd3Element {
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceX(): number[];
-        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceX(value: number[]): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        markers(): (d: any) => any //todo;
-        markers(func: (d: any) => any): this //todo;
-        measures(): (d: any) => any //todo;
-        measures(func: (d: any) => any): this //todo;
-        orient(): string;
-        orient(orientation: string): this;
-        ranges(): (d: any) => any //todo;
-        ranges(func: (d: any) => any): this //todo;
-        tickFormat(): (d: any) => string;
-        tickFormat(format: (d: any) => string): this;
-        tickFormat(format: string): this;
-        tickFormat(format: (d: any, i: any) => string): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-    }
-
-    interface CandlestickBar extends Nvd3Element {
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(): boolean;
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(value: boolean): this;
-        close(): (d: any) => number;
-        close(func: (d:any) => number): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceX(): number[];
-        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceX(value: number[]): this;
-        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option*/
-        forceY(): number[];
-        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option*/
-        forceY(value: number[]): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        high(): (d: any) => number;
-        high(func: (d: any) => number): this;
-        id(): any;
-id(value: number|string): this;
-        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
-        interactive(): boolean;
-        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
-        interactive(value: boolean): this;
-        low(): (d: any) => number;
-        low(func: (d: any) => number): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        open(): (d: any) => number;
-        open(func: (d: any) => number): this;
-        padData(): boolean;
-        padData(value: boolean): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any) => any;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any) => any): this;
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(): number[];
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(value: number[]): this;
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(): number[];
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(value: number[]): this;
-        /* Override the default scale type for the X axis*/
-        xScale(): any;
-        /* Override the default scale type for the X axis*/
-        xScale(value: any): this;
-        y(): (d: any) => number;
-        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        y(func: (d: any) => number): this;
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(): number[];
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(value: number[]): this;
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(): number[];
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(value: number[]): this;
-        /* Override the default scale type for the y axis*/
-        yScale(): any;
-        /* Override the default scale type for the y axis*/
-        yScale(value: any): this;
-    }
-
-    interface DiscreteBar extends Nvd3Element {
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(): number;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(value: number): this;
-        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
-        forceY(): number[];
-        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
-        forceY(value: number[]): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        id(): any;
-id(value: number|string): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        rectClass(): string;
-        rectClass(value: string): this;
-        /*Prints the Y values on the top of the bars. Only recommended to use if there aren't many bars.*/
-        showValues(): boolean;
-        /*Prints the Y values on the top of the bars. Only recommended to use if there aren't many bars.*/
-        showValues(value: boolean): this;
-        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
-        valueFormat(): string;
-        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
-        valueFormat(value: string): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any) => any;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any) => any): this;
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(): number[];
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(value: number[]): this;
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(): number[];
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(value: number[]): this;
-        /* Override the default scale type for the X axis*/
-        xScale(): any;
-        /* Override the default scale type for the X axis*/
-        xScale(value: any): this;
-        y(): (d: any) => number;
-        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        y(func: (d: any) => number): this;
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(): number[];
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(value: number[]): this;
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(): number[];
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(value: number[]): this;
-        /* Override the default scale type for the y axis*/
-        yScale(): any;
-        /* Override the default scale type for the y axis*/
-        yScale(value: any): this;
-    }
-
-    interface Distribution extends Nvd3Element {
-        axis(): string;
-        axis(value: 'x'): this;
-        axis(value: 'y'): this;
-        axis(value: string): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        domain(): number[];
-        domain(value: number[]): this;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(): number;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(value: number): this;
-        getData(func: (d: any) => number): this;
-        scale(): any;
-        scale(value: any): this;
-        size(): number;
-        size(value: number): this;
-        width(): number;
-        width(value: number): this;
-
-
-    }
-
-    interface HistoricalBar extends Nvd3Element {
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(): boolean;
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(value: boolean): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(): number;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(value: number): this;
-        /* List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
-        forceX(): number[];
-        /* List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
-        forceX(value: number[]): this;
-        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
-        forceY(): number[];
-        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
-        forceY(value: number[]): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        id(): any;
-id(value: number|string): this;
-        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
-        interactive(): boolean;
-        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
-        interactive(value: boolean): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        /*.*/
-        padData(): boolean;
-        /**/
-        padData(value: boolean): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any) => any;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any) => any): this;
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(): number[];
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(value: number[]): this;
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(): number[];
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(value: number[]): this;
-        /* Override the default scale type for the X axis*/
-        xScale(): any;
-        /* Override the default scale type for the X axis*/
-        xScale(value: any): this;
-        y(): (d: any) => number;
-        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        y(func: (d: any) => number): this;
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(): number[];
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(value: number[]): this;
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(): number[];
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(value: number[]): this;
-        /* Override the default scale type for the y axis*/
-        yScale(): any;
-        /* Override the default scale type for the y axis*/
-        yScale(value: any): this;
-    }
-
-    interface Line extends Scatter {
-        scatter: Scatter;
-        /*A provided function that allows a line to be non-continuous when not defined.*/
-        defined(): (d: any, i: number) => boolean;
-        /*A provided function that allows a line to be non-continuous when not defined.*/
-        defined(func: (d: any, i: number) => boolean): this;
-        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
-        interpolate(): string;
-        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
-        interpolate(value: string): this;
-        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
-        isArea(): (d: any) => boolean;
-        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
-        isArea(value: boolean): this;
-        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
-        isArea(func: (d: any) => boolean): this;
-    }
-
-    interface MultiBar extends Nvd3Element {
-        /*this option lets you specific a color for each bar group to have the same color but differentiated by shading.*/
-        barColor(value: string[]): this;
-        /*this option lets you specific a color for each bar group to have the same color but differentiated by shading.*/
-        barColor(func: (d: any, i: number) => string): this;
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(): boolean;
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(value: boolean): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /**/
-        disabled(): boolean[];
-        /**/
-        disabled(value: boolean[]): this;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(): number;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(value: number): this;
-        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
-        forceY(): number[];
-        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
-        forceY(value: number[]): this;
-        /*The padding between bar groups, this is passed as the padding attribute of rangeBands*/
-        groupSpacing(): number;
-        /*The padding between bar groups, this is passed as the padding attribute of rangeBands*/
-        groupSpacing(value: number): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        /*.*/
-        hideable(): boolean;
-        /**/
-        hideable(value: boolean): this;
-        id(): any;
-id(value: number|string): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        /*.*/
-        stacked(): boolean;
-        /**/
-        stacked(value: boolean): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        stackOffset(offset: 'silhouette'): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        stackOffset(offset: 'wiggle'): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        stackOffset(offset: 'expand'): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        stackOffset(offset: 'zero'): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        stackOffset(offset: string): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        stackOffset(offset: (data: Array<[number, number]>) => number[]): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any) => any;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any) => any): this;
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(): number[];
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(value: number[]): this;
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(): number[];
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(value: number[]): this;
-        /* Override the default scale type for the X axis*/
-        xScale(): any;
-        /* Override the default scale type for the X axis*/
-        xScale(value: any): this;
-        y(): (d: any) => number;
-        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        y(func: (d: any) => number): this;
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(): number[];
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(value: number[]): this;
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(): number[];
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(value: number[]): this;
-        /* Override the default scale type for the y axis*/
-        yScale(): any;
-        /* Override the default scale type for the y axis*/
-        yScale(value: any): this;
-    }
-
-    interface MultiBarHorizontal extends Nvd3Element {
-        /*this option lets you specific a color for each bar group to have the same color but differentiated by shading.*/
-        barColor(value: string[]): this;
-        /*this option lets you specific a color for each bar group to have the same color but differentiated by shading.*/
-        barColor(func: (d: any, i: number) => string): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /**/
-        disabled(): boolean[];
-        /**/
-        disabled(value: boolean[]): this;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(): number;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(value: number): this;
-        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
-        forceY(): number[];
-        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
-        forceY(value: number[]): this;
-        /*The padding between bar groups, this is passed as the padding attribute of rangeBands*/
-        groupSpacing(): number;
-        /*The padding between bar groups, this is passed as the padding attribute of rangeBands*/
-        groupSpacing(value: number): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        id(): any;
-id(value: number|string): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        /*Prints the Y values on the top of the bars. Only recommended to use if there aren't many bars.*/
-        showValues(): boolean;
-        /*Prints the Y values on the top of the bars. Only recommended to use if there aren't many bars.*/
-        showValues(value: boolean): this;
-        /*.*/
-        stacked(): boolean;
-        /**/
-        stacked(value: boolean): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        stackOffset(offset: 'silhouette'): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        stackOffset(offset: 'wiggle'): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        stackOffset(offset: 'expand'): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        stackOffset(offset: 'zero'): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        stackOffset(offset: string): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        stackOffset(offset: (data: Array<[number, number]>) => number[]): this;
-        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
-        valueFormat(): string;
-        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
-        valueFormat(value: string): this;
-        /*.*/
-        valuePadding(): number;
-        /**/
-        valuePadding(value: number): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any) => any;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any) => any): this;
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(): number[];
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(value: number[]): this;
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(): number[];
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(value: number[]): this;
-        /* Override the default scale type for the X axis*/
-        xScale(): any;
-        /* Override the default scale type for the X axis*/
-        xScale(value: any): this;
-        y(): (d: any) => number;
-        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        y(func: (d: any) => number): this;
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(): number[];
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(value: number[]): this;
-        /**/
-        yErr(): (d: any, i: number) => number|number[];
-        /**/
-        yErr(func: (d: any, i: number) => number | number[]): this;
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(): number[];
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(value: number[]): this;
-        /* Override the default scale type for the y axis*/
-        yScale(): any;
-        /* Override the default scale type for the y axis*/
-        yScale(value: any): this;
-    }
-
-    interface OhlcBar extends Nvd3Element {
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(): boolean;
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(value: boolean): this;
-        close(): (d: any) => number;
-        close(func: (d: any) => number): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceX(): number[];
-        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceX(value: number[]): this;
-        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option*/
-        forceY(): number[];
-        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option*/
-        forceY(value: number[]): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        high(): (d: any) => number;
-        high(func: (d: any) => number): this;
-        id(): any;
-id(value: number|string): this;
-        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
-        interactive(): boolean;
-        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
-        interactive(value: boolean): this;
-        low(): (d: any) => number;
-        low(func: (d: any) => number): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        open(): (d: any) => number;
-        open(func: (d: any) => number): this;
-        padData(): boolean;
-        padData(value: boolean): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any) => any;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any) => any): this;
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(): number[];
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(value: number[]): this;
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(): number[];
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(value: number[]): this;
-        /* Override the default scale type for the X axis*/
-        xScale(): any;
-        /* Override the default scale type for the X axis*/
-        xScale(value: any): this;
-        y(): (d: any) => number;
-        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        y(func: (d: any) => number): this;
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(): number[];
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(value: number[]): this;
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(): number[];
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(value: number[]): this;
-        /* Override the default scale type for the y axis*/
-        yScale(): any;
-        /* Override the default scale type for the y axis*/
-        yScale(value: any): this;
-    }
-
-    interface ParallelCoordinates extends Nvd3Element {
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        dimensionData(): any
-        dimensionData(d: any): this
-        /*D3 format for each x axis*/
-        dimensionFormats(): string[];
-        /*D3 format for each x axis*/
-        dimensionFormats(value: string[]): this;
-        /*Name of each dimension, used for each axis.*/
-        dimensionNames(): string[];
-        /*Name of each dimension, used for each axis.*/
-        dimensionNames(value: string[]): this;
-        /*Deprecated. Use dimensionsNames instead. */
-        dimensions(): any;
-        /*Deprecated. Use dimensionsNames instead. .*/
-        dimensions(value: any): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        /*Specifies each line tension. Values between 0 and 1.*/
-        lineTension(): number;
-        /*Specifies each line tension. Values between 0 and 1.*/
-        lineTension(value: number): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-    }
-
-    interface Pie extends Nvd3Element {
-        /*Specifies each slice size, by an inner and a outer radius. Values between 0 and 1*/
-        arcsRadius(): ArcsRadius[];
-        /*Specifies each slice size, by an inner and a outer radius. Values between 0 and 1*/
-        arcsRadius(value: ArcsRadius[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*D3 3.4+, For donut charts only, the corner radius of the slices. Typically used with padAngle.*/
-        cornerRadius(): number;
-        /*D3 3.4+, For donut charts only, the corner radius of the slices. Typically used with padAngle.*/
-        cornerRadius(value: number): this;
-        /*Whether to make a pie graph a donut graph or not.*/
-        donut(): boolean;
-        /*Whether to make a pie graph a donut graph or not.*/
-        donut(value: boolean): this;
-        /**/
-        donutLabelsOutside(): boolean;
-        /**/
-        donutLabelsOutside(value: boolean): this;
-        /*Percent of pie radius to cut out of the middle to make the donut. It is multiplied by the outer radius to calculate the inner radius, thus it should be between 0 and 1.*/
-        donutRatio(): number;
-        /*Percent of pie radius to cut out of the middle to make the donut. It is multiplied by the outer radius to calculate the inner radius, thus it should be between 0 and 1.*/
-        donutRatio(value: number): this;
-        /*Function used to manage the ending angle of the pie/donut chart*/
-        endAngle(): (d: any) => number;
-        /*Function used to manage the ending angle of the pie/donut chart*/
-        endAngle(func: (d: any) => number): this;
-        /*For pie/donut charts, whether to increase slice radius on hover or not*/
-        growOnHover(): boolean;
-        /*For pie/donut charts, whether to increase slice radius on hover or not*/
-        growOnHover(value: boolean): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        id(): any;
-id(value: number|string): this;
-        /**/
-        labelFormat(): string;
-        /**/
-        labelFormat(value: string): this;
-        /**/
-        labelFormat(format: (d: any) => string): this;
-        /**/
-        labelSunbeamLayout(): boolean;
-        /**/
-        labelSunbeamLayout(value: boolean): this;
-        /*Pie/donut charts: The slice threshold size to not display the label because it woudl be too small of a space*/
-        labelThreshold(): number;
-        /*Pie/donut charts: The slice threshold size to not display the label because it woudl be too small of a space*/
-        labelThreshold(value: number): this;
-        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
-        labelType(): string;
-        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
-        labelType(value: 'key'): this;
-        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
-        labelType(value: 'value'): this;
-        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
-        labelType(value: 'percent'): this;
-        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
-        labelType(value: string): this;
-        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
-        labelType(func: (d: any, i: number, values:any)=> string): this;
-        /*Whether pie/donut chart labels should be outside the slices instead of inside them*/
-        labelsOutside(): boolean;
-        /*Whether pie/donut chart labels should be outside the slices instead of inside them*/
-        labelsOutside(value: boolean): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        /*D3 3.4+, For donut charts only, the percent of the chart that should be spacing between slices.*/
-        padAngle(): number;
-        /*D3 3.4+, For donut charts only, the percent of the chart that should be spacing between slices.*/
-        padAngle(value: number): this;
-        /**/
-        pieLabelsOutside(): boolean;
-        /**/
-        pieLabelsOutside(value: boolean): this;
-        /*Show pie/donut chart labels for each slice*/
-        showLabels(): boolean;
-        /*Show pie/donut chart labels for each slice*/
-        showLabels(value: boolean): this;
-        /*Function used to manage the starting  angle of the pie/donut chart*/
-        startAngle(): (d: any) => number;
-        /*Function used to manage the starting  angle of the pie/donut chart*/
-        startAngle(func: (d: any) => number): this;
-        /*Text to include within the middle of a donut chart*/
-        title(): string;
-        /*Text to include within the middle of a donut chart*/
-        title(value: string): this;
-        /*Vertical offset for the donut chart title*/
-        titleOffset(): number;
-        /*Vertical offset for the donut chart title*/
-        titleOffset(value: number): this;
-        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
-        valueFormat(): string;
-        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
-        valueFormat(value: string): this;
-        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
-        valueFormat(format: (d: any) => string): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any) => any;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any) => any): this;
-        /*Proxy function to return the Y value so adjustments can be made if needed.For pie/ donut chart this returns the value for the slice.*/
-        y(): (d: any) => number;
-        /*Proxy function to return the Y value so adjustments can be made if needed. For pie/donut chart this returns the value for the slice.*/
-        y(func: (d: any) => number): this;
-        /**/
-    }
-
-    interface Scatter extends Nvd3Element {
-        clearHighlights(): this;
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(): boolean;
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(value: boolean): this;
-        /*When useVoronoi and clipVoronoi are true, you can control the clip radius with this option. Essentially this lets you set how far away from the actual point you can put the mouse for it to select the point.*/
-        clipRadius(func: (d: any) => number): this;
-        /*When useVoronoi and clipVoronoi are true, you can control the clip radius with this option. Essentially this lets you set how far away from the actual point you can put the mouse for it to select the point.*/
-        clipRadius(value: number): this;
-        /*When useVoronoi is on, this masks each voronoi section with a circle to limit selection to smaller area.*/
-        clipVoronoi(): boolean;
-        /*When useVoronoi is on, this masks each voronoi section with a circle to limit selection to smaller area.*/
-        clipVoronoi(value: boolean): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(): number;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(value: number): this;
-        /*List of numbers to Force into the point scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forcePoint(): number[];
-        /*List of numbers to Force into the point scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forcePoint(value: number[]): this;
-        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceX(): number[];
-        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceX(value: number[]): this;
-        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceY(): number[];
-        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceY(value: number[]): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        id(): any;
-        id(value: number | string): this;
-        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
-        interactive(): boolean;
-        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
-        interactive(value: boolean): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        /**/
-        padData(): boolean;
-        /**/
-        padData(value: boolean): this;
-        /**/
-        padDataOuter(): number;
-        /**/
-        padDataOuter(value: number): this;
-        /* Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
-        pointActive(): (d: any) => boolean;
-        /*Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
-        pointActive(func: (d: any) => boolean): this;
-        /* Defines the whole point scale's domain. Using this will disable calculating the domain based on the data.*/
-        pointxDomain(): number[];
-        /* Defines the whole point scale's domain. Using this will disable calculating the domain based on the data.*/
-        pointDomain(value: number[]): this;
-        /* Override the point scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        pointRange(): number[];
-        /* Override the point scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        pointRange(value: number[]): this;
-        /* Override the default scale type for the point axis*/
-        pointScale(): any;
-        /* Override the default scale type for the point axis*/
-        pointScale(value: any): this;
-        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
-        pointSize(): (d: any) => number;
-        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
-        pointSize(func: (d: any) => number): this;
-        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
-        pointSize(value: number): this;
-        /*Displays the voronoi areas on the chart. This is mostly helpful when debugging issues.*/
-        showVoronoi(): boolean;
-        /*Displays the voronoi areas on the chart. This is mostly helpful when debugging issues.*/
-        showVoronoi(value: boolean): this;
-        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
-        useVoronoi(): boolean;
-        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
-        useVoronoi(value: boolean): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any) => any;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any) => any): this;
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(): number[];
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(value: number[]): this;
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(): number[];
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(value: number[]): this;
-        /* Override the default scale type for the X axis*/
-        xScale(): any;
-        /* Override the default scale type for the X axis*/
-        xScale(value: any): this;
-        y(): (d: any) => number;
-        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        y(func: (d: any) => number): this;
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(): number[];
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(value: number[]): this;
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(): number[];
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(value: number[]): this;
-        /* Override the default scale type for the y axis*/
-        yScale(): any;
-        /* Override the default scale type for the y axis*/
-        yScale(value: any): this;
-
-    }
-
-    interface SparkLine extends Nvd3Element {
-        animate(): boolean;
-        animate(value: boolean): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any, i?: number) => number;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any, i?: number) => number): this;
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(): number[];
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(value: number[]): this;
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(): number[];
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(value: number[]): this;
-        /* Override the default scale type for the X axis*/
-        xScale(): any;
-        /* Override the default scale type for the X axis*/
-        xScale(value: any): this;
-        y(): (d: any, i?: number) => number;
-        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        y(func: (d: any, i?: number) => number): this;
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(): number[];
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(value: number[]): this;
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(): number[];
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(value: number[]): this;
-        /* Override the default scale type for the y axis*/
-        yScale(): any;
-        /* Override the default scale type for the y axis*/
-        yScale(value: any): this;
-    }
-
-    interface SparkLinePlus extends SparkLine {
-        sparkline: SparkLine;
-
-        alignValue(): boolean;
-        alignValue(value: boolean): this;
-        /*Message to display if no data is provided*/
-        noData(): string;
-        /*Message to display if no data is provided*/
-        noData(value: string): this;
-        rightAlignValue(): boolean;
-        rightAlignValue(value: boolean): this;
-        /*Shows the last value in the sparkline to the right of the line.*/
-        showLastValue(): boolean;
-        /*Shows the last value in the sparkline to the right of the line.*/
-        showLastValue(value: boolean): this;
-        xTickFormat(format: (d: any) => string): this;
-        xTickFormat(format: string): this;
-        xTickFormat(format: (d: any, i: any) => string) : this;
-        yTickFormat(format: (d: any) => string): this;
-        yTickFormat(format: string): this;
-        yTickFormat(format: (d: any, i: any) => string) :this;
-    }
-
-    interface StackedArea extends Scatter {
-        scatter: Scatter;
-        /*A provided function that allows a line to be non-continuous when not defined.*/
-        defined(): (d: any, i: number) => boolean;
-        /*A provided function that allows a line to be non-continuous when not defined.*/
-        defined(func: (d: any, i: number) => boolean): this;
-        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
-        interpolate(): string;
-        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
-        interpolate(value: string): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        offset(offset: 'silhouette'): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        offset(offset: 'wiggle'): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        offset(offset: 'expand'): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        offset(offset: 'zero'): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        offset(offset: string): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        offset(offset: (data: Array<[number, number]>) => number[]): this;
-        order(): string;
-        order(value: string): this;
-        style(offset: 'stack'): this;
-        style(offset: 'stream'): this;
-        style(offset: 'stream-center'): this;
-        style(offset: 'expand'): this;
-        style(offset: 'stack_percent'): this;
-        style(offset: string): this;
-    }
-
-    interface Sunburst extends Nvd3Element {
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        id(): any;
-        id(value: number|string): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        /*For sunburst only: specifies the mode of drawing the sunburst segments. Can be 'size' or 'count'. 'size' draws the segments according to the 'size' attribute of the leaf nodes, 'count' draws according to the amount of siblings a node has.*/
-        mode(): string;
-        /*For sunburst only: specifies the mode of drawing the sunburst segments. Can be 'size' or 'count'. 'size' draws the segments according to the 'size' attribute of the leaf nodes, 'count' draws according to the amount of siblings a node has.*/
-        mode(value: 'size'): this;
-        /*For sunburst only: specifies the mode of drawing the sunburst segments. Can be 'size' or 'count'. 'size' draws the segments according to the 'size' attribute of the leaf nodes, 'count' draws according to the amount of siblings a node has.*/
-        mode(value: 'count'): this;
-        /*For sunburst only: specifies the mode of drawing the sunburst segments. Can be 'size' or 'count'. 'size' draws the segments according to the 'size' attribute of the leaf nodes, 'count' draws according to the amount of siblings a node has.*/
-        mode(value: string): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-    }
-
-    interface Tooltip {
-
-        /*For tooltip: Parent dom element of the SVG that holds the chart. This will make the tooltip dom be created inside this container instead of on the document body.*/
-        chartContainer(el: HTMLElement): this
-        /*For tooltip: Parent dom element of the SVG that holds the chart. This will make the tooltip dom be created inside this container instead of on the document body.*/
-        chartContainer(): HTMLElement
-        /*Attaches additional CSS classes to the tooltip DIV that is created.*/
-        classes(el: string): this
-        /*Attaches additional CSS classes to the tooltip DIV that is created.*/
-        classes(): string
-        /*Function that generates the tooltip content html.*/
-        contentGenerator(): (d: any) => string;
-        /*Function that generates the tooltip content html.*/
-        contentGenerator(func: (d: any) => string): this;
-        data(): any;
-        data(value: any): this;
-        distance(): number;
-        distance(value: number): this;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(): number;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(value: number): this;
-        /*For tooltip: completely enables or disabled the tooltip*/
-        enabled(): boolean;
-        /*For tooltip: completely enables or disabled the tooltip*/
-        enabled(value: boolean): this;
-        /*For tooltip: If not null, this fixes the top position of the tooltip.*/
-        fixedTop(): number;
-        /*For tooltip: If not null, this fixes the top position of the tooltip.*/
-        fixedTop(value: number): this;
-        /*Can be 'n','s','e','w'. Determines how tooltip is positioned*/
-        gravity(): string;
-        /*Can be 'n','s','e','w'. Determines how tooltip is positioned*/
-        gravity(value: string): this;
-        /*For tooltip: show the x axis value in the tooltip or not (not valid for pie charts for instance)*/
-        headerEnabled(): boolean;
-        /*For tooltip: show the x axis value in the tooltip or not (not valid for pie charts for instance)*/
-        headerEnabled(value: boolean): this;
-        /*For tooltip: formats the x axis value in the tooltip*/
-        headerFormatter(func: (d: any) => string): this;
-        /*For tooltip: formats the x axis value in the tooltip*/
-        headerFormatter(): (d: any) => string;
-        /*For tooltip: show or hide the tooltip by setting this to true or false. Tooltips used to be created and destroyed, but now we re-used the element and set opacity to 1 or 0.*/
-        hidden(): boolean;
-        /*For tooltip: show or hide the tooltip by setting this to true or false. Tooltips used to be created and destroyed, but now we re-used the element and set opacity to 1 or 0.*/
-        hidden(value: boolean): this;
-        /*Delay in ms before the tooltip hides itself after a mouseout event. A new mouseover event cancels the hide if within this timeout period.*/
-        hideDelay(): number;
-        /*Delay in ms before the tooltip hides itself after a mouseout event. A new mouseover event cancels the hide if within this timeout period.*/
-        hideDelay(value: number): this;
-        /**/
-        id(): any;
-        keyFormatter(): (d: any, i: number) => string;
-        keyFormatter(func: (d: any, i: number) => string): this;
-        offset(): Offset;
-        offset(value: Offset): this;
-        /*sets the top/left positioning for the tooltip. Should be given an object with 'left' and/or 'top' attributes. You can override just one, just like the 'margin' option on charts*/
-        position(): Offset;
-        /*sets the top/left positioning for the tooltip. Should be given an object with 'left' and/or 'top' attributes. You can override just one, just like the 'margin' option on charts*/
-        position(value: Offset): this;
-        /*Tolerance allowed before tooltip is moved from its current position (creates 'snapping' effect)*/
-        snapDistance(): number;
-        /*Tolerance allowed before tooltip is moved from its current position (creates 'snapping' effect)*/
-        snapDistance(value: number): this;
-        /*returns the dom element of the tooltip.*/
-        tooltipElem(): HTMLElement;
-        /*formats the y axis value(s) in the tooltip*/
-        valueFormatter(): (d: any) => string;
-        /*formats the y axis value(s) in the tooltip*/
-        valueFormatter(func: (d: any) => string): this;
-    }
-
-//#endregion
-
-//#region Charts
-    interface BoxPlotChart extends Chart {
-        boxplot: BoxPlot;
-        xAxis: Nvd3Axis;
-        yAxis: Nvd3Axis;
-        tooltip: Tooltip;
-
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(): number;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(value: number): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        id(): any;
-        id(value: number|string): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        maxBoxWidth(): number;
-        maxBoxWidth(value: number): this;
-        noData(): string;
-        noData(value: string): this;
-        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
-        rightAlignYAxis(): boolean;
-        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
-        rightAlignYAxis(value: boolean): this;
-        /*Display or hide the X axis*/
-        showXAxis(): boolean;
-        /*Display or hide the X axis*/
-        showXAxis(value: boolean): this;
-        /*Display or hide the Y axis*/
-        showYAxis(): boolean;
-        /*Display or hide the Y axis*/
-        showYAxis(value: boolean): this;
-        /*Makes the X labels stagger at different distances from the axis so they're less likely to overlap.*/
-        staggerLabels(): boolean;
-        /*Makes the X labels stagger at different distances from the axis so they're less likely to overlap.*/
-        staggerLabels(value: boolean): this;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(): (d: any) => string;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(func: (d: any) => string): this;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(): boolean;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(value: boolean): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any) => any;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any) => any): this;
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(): number[];
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(value: number[]): this;
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(): number[];
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(value: number[]): this;
-        /* Override the default scale type for the X axis*/
-        xScale(): any;
-        /* Override the default scale type for the X axis*/
-        xScale(value: any): this;
-        y(): (d: any) => number;
-        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        y(func: (d: any) => number): this;
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(): number[];
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(value: number[]): this;
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(): number[];
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(value: number[]): this;
-        /* Override the default scale type for the y axis*/
-        yScale(): any;
-        /* Override the default scale type for the y axis*/
-        yScale(value: any): this;
-
-	}
-
-    interface BulletChart extends Chart{
-        bullet: Bullet;
-        tooltip: Tooltip;
-
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceX(): number[];
-        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceX(value: number[]): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        markers(): (d: any) => any //todo;
-        markers(func: (d: any) => any): this //todo;
-        measures(): (d: any) => any //todo;
-        measures(func: (d: any) => any): this //todo;
-        noData(): string;
-        noData(value: string): this;
-        orient(): string;
-        orient(orientation: string): this;
-        ranges(): (d: any) => any //todo;
-        ranges(func: (d: any) => any): this //todo;
-        tickFormat(): (d: any) => string;
-        tickFormat(format: (d: any) => string): this;
-        tickFormat(format: string): this;
-        tickFormat(format: (d: any, i: any) => string): this;
-        ticks(): any[];
-        ticks(...args: any[]): this;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(): (d: any) => string;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(func: (d: any) => string): this;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(): boolean;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(value: boolean): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-	}
-
-    interface CandlestickBarChart extends Chart {
-        bars: CandlestickBar;
-        legend: Legend;
-        xAxis: Nvd3Axis;
-        yAxis: Nvd3Axis;
-        tooltip: Tooltip;
-
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(): boolean;
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(value: boolean): this;
-        close(): (d: any) => number;
-        close(func: (d: any) => number): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(): number;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(value: number): this;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(): any;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(value: any): this;
-        forceX(): number[];
-        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceX(value: number[]): this;
-        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option*/
-        forceY(): number[];
-        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option*/
-        forceY(value: number[]): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        high(): (d: any) => number;
-        high(func: (d: any) => number): this;
-        id(): any;
-        id(value: number|string): this;
-        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
-        interactive(): boolean;
-        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
-        interactive(value: boolean): this;
-        low(): (d: any) => number;
-        low(func: (d: any) => number): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        noData(): string;
-        noData(value: string): this;
-        open(): (d: any) => number;
-        open(func: (d: any) => number): this;
-        padData(): boolean;
-        padData(value: boolean): this;
-        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
-        rightAlignYAxis(): boolean;
-        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
-        rightAlignYAxis(value: boolean): this;
-        /*Whether to display the legend or not*/
-        showLegend(): boolean;
-        /*Whether to display the legend or not*/
-        showLegend(value: boolean): this;
-        /*Display or hide the X axis*/
-        showXAxis(): boolean;
-        /*Display or hide the X axis*/
-        showXAxis(value: boolean): this;
-        /*Display or hide the Y axis*/
-        showYAxis(): boolean;
-        /*Display or hide the Y axis*/
-        showYAxis(value: boolean): this;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(): (d: any) => string;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(func: (d: any) => string): this;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(): boolean;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(value: boolean): this;
-        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
-        useInteractiveGuideline(): boolean;
-        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
-        useInteractiveGuideline(value: boolean): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any) => any;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any) => any): this;
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(): number[];
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(value: number[]): this;
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(): number[];
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(value: number[]): this;
-        /* Override the default scale type for the X axis*/
-        xScale(): any;
-        /* Override the default scale type for the X axis*/
-        xScale(value: any): this;
-        y(): (d: any) => number;
-        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        y(func: (d: any) => number): this;
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(): number[];
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(value: number[]): this;
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(): number[];
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(value: number[]): this;
-        /* Override the default scale type for the y axis*/
-        yScale(): any;
-        /* Override the default scale type for the y axis*/
-        yScale(value: any): this;
-    }
-
-    interface CumulativeLineChart extends LineChart {
-        controls: Legend;
-        average(func: (d: any) => number): this;
-        average(): (d: any) => number;
-        noErrorCheck(value: boolean): this;
-        noErrorCheck(): boolean;
-    }
-
-    interface DiscreteBarChart extends Chart {
-        discretebar: DiscreteBar;
-        legend: Legend;
-        xAxis: Nvd3Axis;
-        yAxis: Nvd3Axis;
-        tooltip: Tooltip;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(): number;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(value: number): this;
-        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
-        forceY(): number[];
-        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
-        forceY(value: number[]): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        id(): any;
-        id(value: number|string): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        noData(): string;
-        noData(value: string): this;
-        rectClass(): string;
-        rectClass(value: string): this;
-        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
-        rightAlignYAxis(): boolean;
-        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
-        rightAlignYAxis(value: boolean): this;
-        /*Prints the Y values on the top of the bars. Only recommended to use if there aren't many bars.*/
-        showValues(): boolean;
-        /*Prints the Y values on the top of the bars. Only recommended to use if there aren't many bars.*/
-        showValues(value: boolean): this;
-        /*Display or hide the X axis*/
-        showXAxis(): boolean;
-        /*Display or hide the X axis*/
-        showXAxis(value: boolean): this;
-        /*Display or hide the Y axis*/
-        showYAxis(): boolean;
-        /*Display or hide the Y axis*/
-        showYAxis(value: boolean): this;
-        /*Makes the X labels stagger at different distances from the axis so they're less likely to overlap.*/
-        staggerLabels(): boolean;
-        /*Makes the X labels stagger at different distances from the axis so they're less likely to overlap.*/
-        staggerLabels(value: boolean): this;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(): (d: any) => string;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(func: (d: any) => string): this;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(): boolean;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(value: boolean): this;
-        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
-        valueFormat(): string;
-        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
-        valueFormat(value: string): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any) => any;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any) => any): this;
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(): number[];
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(value: number[]): this;
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(): number[];
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(value: number[]): this;
-        /* Override the default scale type for the X axis*/
-        xScale(): any;
-        /* Override the default scale type for the X axis*/
-        xScale(value: any): this;
-        y(): (d: any) => number;
-        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        y(func: (d: any) => number): this;
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(): number[];
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(value: number[]): this;
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(): number[];
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(value: number[]): this;
-        /* Override the default scale type for the y axis*/
-        yScale(): any;
-        /* Override the default scale type for the y axis*/
-        yScale(value: any): this;
-    }
-
-    interface HistoricalBarChart extends Chart {
-        bars: HistoricalBar;
-        legend: Legend;
-        xAxis: Nvd3Axis;
-        yAxis: Nvd3Axis;
-        tooltip: Tooltip;
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(): boolean;
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(value: boolean): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(): any;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(value: any): this;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(): number;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(value: number): this;
-        /* List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
-        forceX(): number[];
-        /* List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
-        forceX(value: number[]): this;
-        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
-        forceY(): number[];
-        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
-        forceY(value: number[]): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        id(): any;
-id(value: number|string): this;
-        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
-        interactive(): boolean;
-        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
-        interactive(value: boolean): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        noData(): string;
-        noData(value: string): this;
-        /**/
-        padData(): boolean;
-        /**/
-        padData(value: boolean): this;
-        rightAlignYAxis(): boolean;
-        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
-        rightAlignYAxis(value: boolean): this;
-        /*Whether to display the legend or not.*/
-        showLegend(): boolean;
-        /*Whether to display the legend or not.*/
-        showLegend(value: boolean): this;
-        /*Display or hide the X axis*/
-        showXAxis(): boolean;
-        /*Display or hide the X axis*/
-        showXAxis(value: boolean): this;
-        /*Display or hide the Y axis*/
-        showYAxis(): boolean;
-        /*Display or hide the Y axis*/
-        showYAxis(value: boolean): this;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(): (d: any) => string;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(func: (d: any) => string): this;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(): boolean;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(value: boolean): this;
-        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
-        useInteractiveGuideline(): boolean;
-        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
-        useInteractiveGuideline(value: boolean): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any) => any;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any) => any): this;
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(): number[];
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(value: number[]): this;
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(): number[];
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(value: number[]): this;
-        /* Override the default scale type for the X axis*/
-        xScale(): any;
-        /* Override the default scale type for the X axis*/
-        xScale(value: any): this;
-        y(): (d: any) => number;
-        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        y(func: (d: any) => number): this;
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(): number[];
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(value: number[]): this;
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(): number[];
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(value: number[]): this;
-        /* Override the default scale type for the y axis*/
-        yScale(): any;
-        /* Override the default scale type for the y axis*/
-        yScale(value: any): this;
-    }
-
-    interface LineChart extends Chart {
-        lines: Line;
-        xAxis: Nvd3Axis;
-        yAxis: Nvd3Axis;
-        legend: Legend;
-        tooltip: Tooltip;
-
-        clearHighlights(): this;
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(): boolean;
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(value: boolean): this;
-        /*When useVoronoi and clipVoronoi are true, you can control the clip radius with this option. Essentially this lets you set how far away from the actual point you can put the mouse for it to select the point.*/
-        clipRadius(func: (d: any) => number): this;
-        /*When useVoronoi and clipVoronoi are true, you can control the clip radius with this option. Essentially this lets you set how far away from the actual point you can put the mouse for it to select the point.*/
-        clipRadius(value: number): this;
-        /*When useVoronoi is on, this masks each voronoi section with a circle to limit selection to smaller area.*/
-        clipVoronoi(): boolean;
-        /*When useVoronoi is on, this masks each voronoi section with a circle to limit selection to smaller area.*/
-        clipVoronoi(value: boolean): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(): any;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(value: any): this;
-        /*A provided function that allows a line to be non-continuous when not defined.*/
-        defined(): (d: any, i: number) => boolean;
-        /*A provided function that allows a line to be non-continuous when not defined.*/
-        defined(func: (d: any, i: number) => boolean): this;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(): number;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(value: number): this;
-        /*List of numbers to Force into the point scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forcePoint(): number[];
-        /*List of numbers to Force into the point scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forcePoint(value: number[]): this;
-        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceX(): number[];
-        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceX(value: number[]): this;
-        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceY(): number[];
-        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceY(value: number[]): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        /**/
-        highlightPoint(): (d: any) => boolean;
-        /**/
-        highlightPoint(func: (d: any) => boolean): this;
-        id(): any;
-id(value: number|string): this;
-        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
-        interactive(): boolean;
-        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
-        interactive(value: boolean): this;
-        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
-        interpolate(): string;
-        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
-        interpolate(value: string): this;
-        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
-        isArea(): (d: any) => boolean;
-        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
-        isArea(value: boolean): this;
-        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
-        isArea(func: (d: any) => boolean): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        noData(): string;
-        noData(value: string): this;
-        /**/
-        padData(): boolean;
-        /**/
-        padData(value: boolean): this;
-        /**/
-        padDataOuter(): number;
-        /**/
-        padDataOuter(value: number): this;
-        /* Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
-        pointActive(): (d: any) => boolean;
-        /*Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
-        pointActive(func: (d: any) => boolean): this;
-        /* Defines the whole point scale's domain. Using this will disable calculating the domain based on the data.*/
-        pointxDomain(): number[];
-        /* Defines the whole point scale's domain. Using this will disable calculating the domain based on the data.*/
-        pointDomain(value: number[]): this;
-        /* Override the point scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        pointRange(): number[];
-        /* Override the point scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        pointRange(value: number[]): this;
-        /* Override the default scale type for the point axis*/
-        pointScale(): any;
-        /* Override the default scale type for the point axis*/
-        pointScale(value: any): this;
-        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
-        pointSize(): (d: any) => number;
-        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
-        pointSize(func: (d: any) => number): this;
-        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
-        pointSize(value: number): this;
-        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
-        rightAlignYAxis(): boolean;
-        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
-        rightAlignYAxis(value: boolean): this;
-        /*Whether to display the legend or not.*/
-        showLegend(): boolean;
-        /*Whether to display the legend or not.*/
-        showLegend(value: boolean): this;
-        /*Displays the voronoi areas on the chart. This is mostly helpful when debugging issues.*/
-        showVoronoi(): boolean;
-        /*Displays the voronoi areas on the chart. This is mostly helpful when debugging issues.*/
-        showVoronoi(value: boolean): this;
-        /*Display or hide the X axis*/
-        showXAxis(): boolean;
-        /*Display or hide the X axis*/
-        showXAxis(value: boolean): this;
-        /*Display or hide the Y axis*/
-        showYAxis(): boolean;
-        /*Display or hide the Y axis*/
-        showYAxis(value: boolean): this;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(): (d: any) => string;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(func: (d: any) => string): this;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(): boolean;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(value: boolean): this;
-        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
-        useInteractiveGuideline(): boolean;
-        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
-        useInteractiveGuideline(value: boolean): this;
-        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
-        useVoronoi(): boolean;
-        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
-        useVoronoi(value: boolean): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any) => any;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any) => any): this;
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(): number[];
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(value: number[]): this;
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(): number[];
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(value: number[]): this;
-        /* Override the default scale type for the X axis*/
-        xScale(): any;
-        /* Override the default scale type for the X axis*/
-        xScale(value: any): this;
-        y(): (d: any) => number;
-        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        y(func: (d: any) => number): this;
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(): number[];
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(value: number[]): this;
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(): number[];
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(value: number[]): this;
-        /* Override the default scale type for the y axis*/
-        yScale(): any;
-        /* Override the default scale type for the y axis*/
-        yScale(value: any): this;
-    }
-
-    interface LinePlusBarChart extends Chart {
-        legend: Legend;
-        lines: Line;
-        lines2: Line;
-        bars: HistoricalBar;
-        bars2: HistoricalBar;
-        xAxis: Nvd3Axis;
-        x2Axis: Nvd3Axis;
-        y1Axis: Nvd3Axis;
-        y2Axis: Nvd3Axis;
-        y3Axis: Nvd3Axis;
-        y4Axis: Nvd3Axis;
-        tooltip: Tooltip;
-
-        brushExtent(): [number, number] | [[number, number], [number, number]];
-        brushExtent(value: [number, number] | [[number, number], [number, number]]) : this;
-        clearHighlights(): this;
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(): boolean;
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(value: boolean): this;
-        /*When useVoronoi and clipVoronoi are true, you can control the clip radius with this option. Essentially this lets you set how far away from the actual point you can put the mouse for it to select the point.*/
-        clipRadius(func: (d: any) => number): this;
-        /*When useVoronoi and clipVoronoi are true, you can control the clip radius with this option. Essentially this lets you set how far away from the actual point you can put the mouse for it to select the point.*/
-        clipRadius(value: number): this;
-        /*When useVoronoi is on, this masks each voronoi section with a circle to limit selection to smaller area.*/
-        clipVoronoi(): boolean;
-        /*When useVoronoi is on, this masks each voronoi section with a circle to limit selection to smaller area.*/
-        clipVoronoi(value: boolean): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(): any;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(value: any): this;
-        /*A provided function that allows a line to be non-continuous when not defined.*/
-        defined(): (d: any, i: number) => boolean;
-        /*A provided function that allows a line to be non-continuous when not defined.*/
-        defined(func: (d: any, i: number) => boolean): this;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(): number;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(value: number): this;
-        focusEnable(): boolean;
-        focusEnable(value: boolean): this;
-        focusHeight(): number;
-        focusHeight(value: number): this;
-        focusShowAxisX(): boolean;
-        focusShowAxisX(value: boolean): this;
-        focusShowAxisY(): boolean;
-        focusShowAxisY(value: boolean): this;
-        /*List of numbers to Force into the point scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forcePoint(): number[];
-        /*List of numbers to Force into the point scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forcePoint(value: number[]): this;
-        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceX(): number[];
-        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceX(value: number[]): this;
-        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceY(): number[];
-        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceY(value: number[]): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        /**/
-        highlightPoint(): (d: any) => boolean;
-        /**/
-        highlightPoint(func: (d: any) => boolean): this;
-        id(): any;
-id(value: number|string): this;
-        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
-        interactive(): boolean;
-        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
-        interactive(value: boolean): this;
-        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
-        interpolate(): string;
-        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
-        interpolate(value: string): this;
-        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
-        isArea(): (d: any) => boolean;
-        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
-        isArea(value: boolean): this;
-        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
-        isArea(func: (d: any) => boolean): this;
-        /*The extra text after the label in the legend that tells what axis the series belongs to, for any series on the left axis.*/
-        legendLeftAxisHint(): string;
-        /*The extra text after the label in the legend that tells what axis the series belongs to, for any series on the left axis.*/
-        legendLeftAxisHint(value: string): this
-        /*The extra text after the label in the legend that tells what axis the series belongs to, for any seris on the right axis.*/
-        legendRightAxisHint(): string;
-                /*The extra text after the label in the legend that tells what axis the series belongs to, for any seris on the right axis.*/
-        legendRightAxisHint(value: string): this
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        noData(): string;
-        noData(value: string): this;
-        /**/
-        padData(): boolean;
-        /**/
-        padData(value: boolean): this;
-        /**/
-        padDataOuter(): number;
-        /**/
-        padDataOuter(value: number): this;
-        /* Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
-        pointActive(): (d: any) => boolean;
-        /*Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
-        pointActive(func: (d: any) => boolean): this;
-        /* Defines the whole point scale's domain. Using this will disable calculating the domain based on the data.*/
-        pointxDomain(): number[];
-        /* Defines the whole point scale's domain. Using this will disable calculating the domain based on the data.*/
-        pointDomain(value: number[]): this;
-        /* Override the point scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        pointRange(): number[];
-        /* Override the point scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        pointRange(value: number[]): this;
-        /* Override the default scale type for the point axis*/
-        pointScale(): any;
-        /* Override the default scale type for the point axis*/
-        pointScale(value: any): this;
-        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
-        pointSize(): (d: any) => number;
-        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
-        pointSize(func: (d: any) => number): this;
-        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
-        pointSize(value: number): this;
-        /*Whether to display the legend or not.*/
-        showLegend(): boolean;
-        /*Whether to display the legend or not.*/
-        showLegend(value: boolean): this;
-        /*Displays the voronoi areas on the chart. This is mostly helpful when debugging issues.*/
-        showVoronoi(): boolean;
-        /*Displays the voronoi areas on the chart. This is mostly helpful when debugging issues.*/
-        showVoronoi(value: boolean): this;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(): (d: any) => string;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(func: (d: any) => string): this;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(): boolean;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(value: boolean): this;
-        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
-        useInteractiveGuideline(): boolean;
-        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
-        useInteractiveGuideline(value: boolean): this;
-        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
-        useVoronoi(): boolean;
-        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
-        useVoronoi(value: boolean): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any) => any;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any) => any): this;
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(): number[];
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(value: number[]): this;
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(): number[];
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(value: number[]): this;
-        /* Override the default scale type for the X axis*/
-        xScale(): any;
-        /* Override the default scale type for the X axis*/
-        xScale(value: any): this;
-        y(): (d: any) => number;
-        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        y(func: (d: any) => number): this;
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(): number[];
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(value: number[]): this;
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(): number[];
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(value: number[]): this;
-        /* Override the default scale type for the y axis*/
-        yScale(): any;
-        /* Override the default scale type for the y axis*/
-        yScale(value: any): this;
-    }
-
-    interface LineWithFocusChart extends Chart {
-        legend: Legend;
-        lines: Line;
-        lines2: Line;
-        xAxis: Nvd3Axis;
-        x2Axis: Nvd3Axis;
-        yAxis: Nvd3Axis;
-        y2Axis: Nvd3Axis;
-        tooltip: Tooltip;
-
-        brushExtent(): [number, number] | [[number, number], [number, number]];
-        brushExtent(value: [number, number] | [[number, number], [number, number]]): this;
-        clearHighlights(): this;
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(): boolean;
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(value: boolean): this;
-        /*When useVoronoi and clipVoronoi are true, you can control the clip radius with this option. Essentially this lets you set how far away from the actual point you can put the mouse for it to select the point.*/
-        clipRadius(func: (d: any) => number): this;
-        /*When useVoronoi and clipVoronoi are true, you can control the clip radius with this option. Essentially this lets you set how far away from the actual point you can put the mouse for it to select the point.*/
-        clipRadius(value: number): this;
-        /*When useVoronoi is on, this masks each voronoi section with a circle to limit selection to smaller area.*/
-        clipVoronoi(): boolean;
-        /*When useVoronoi is on, this masks each voronoi section with a circle to limit selection to smaller area.*/
-        clipVoronoi(value: boolean): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(): any;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(value: any): this;
-        /*A provided function that allows a line to be non-continuous when not defined.*/
-        defined(): (d: any, i: number) => boolean;
-        /*A provided function that allows a line to be non-continuous when not defined.*/
-        defined(func: (d: any, i: number) => boolean): this;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(): number;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(value: number): this;
-        focusHeight(): number;
-        focusHeight(value: number): this;
-        focusMargin(): Margin;
-        focusMargin(value: Margin): this;
-        /*List of numbers to Force into the point scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forcePoint(): number[];
-        /*List of numbers to Force into the point scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forcePoint(value: number[]): this;
-        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceX(): number[];
-        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceX(value: number[]): this;
-        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceY(): number[];
-        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceY(value: number[]): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        /**/
-        highlightPoint(): (d: any) => boolean;
-        /**/
-        highlightPoint(func: (d: any) => boolean): this;
-        id(): any;
-id(value: number|string): this;
-        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
-        interactive(): boolean;
-        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
-        interactive(value: boolean): this;
-        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
-        interpolate(): string;
-        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
-        interpolate(value: string): this;
-        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
-        isArea(): (d: any) => boolean;
-        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
-        isArea(value: boolean): this;
-        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
-        isArea(func: (d: any) => boolean): this;
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        noData(): string;
-        noData(value: string): this;
-        /**/
-        padData(): boolean;
-        /**/
-        padData(value: boolean): this;
-        /**/
-        padDataOuter(): number;
-        /**/
-        padDataOuter(value: number): this;
-        /* Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
-        pointActive(): (d: any) => boolean;
-        /*Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
-        pointActive(func: (d: any) => boolean): this;
-        /* Defines the whole point scale's domain. Using this will disable calculating the domain based on the data.*/
-        pointxDomain(): number[];
-        /* Defines the whole point scale's domain. Using this will disable calculating the domain based on the data.*/
-        pointDomain(value: number[]): this;
-        /* Override the point scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        pointRange(): number[];
-        /* Override the point scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        pointRange(value: number[]): this;
-        /* Override the default scale type for the point axis*/
-        pointScale(): any;
-        /* Override the default scale type for the point axis*/
-        pointScale(value: any): this;
-        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
-        pointSize(): (d: any) => number;
-        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
-        pointSize(func: (d: any) => number): this;
-        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
-        pointSize(value: number): this;
-        /*Whether to display the legend or not.*/
-        showLegend(): boolean;
-        /*Whether to display the legend or not.*/
-        showLegend(value: boolean): this;
-        /*Displays the voronoi areas on the chart. This is mostly helpful when debugging issues.*/
-        showVoronoi(): boolean;
-        /*Displays the voronoi areas on the chart. This is mostly helpful when debugging issues.*/
-        showVoronoi(value: boolean): this;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(): (d: any) => string;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(func: (d: any) => string): this;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(): boolean;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(value: boolean): this;
-        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
-        useInteractiveGuideline(): boolean;
-        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
-        useInteractiveGuideline(value: boolean): this;
-        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
-        useVoronoi(): boolean;
-        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
-        useVoronoi(value: boolean): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any) => any;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any) => any): this;
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(): number[];
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(value: number[]): this;
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(): number[];
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(value: number[]): this;
-        /* Override the default scale type for the X axis*/
-        xScale(): any;
-        /* Override the default scale type for the X axis*/
-        xScale(value: any): this;
-        xTickFormat(): (d: any) => string;
-        xTickFormat(format: (t: any) => string): this;
-        xTickFormat(format: string): this;
-        xTickFormat(format: (d: any, i: any) => string): this;
-        y(): (d: any) => number;
-        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        y(func: (d: any) => number): this;
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(): number[];
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(value: number[]): this;
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(): number[];
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(value: number[]): this;
-        /* Override the default scale type for the y axis*/
-        yScale(): any;
-        /* Override the default scale type for the y axis*/
-        yScale(value: any): this;
-        yTickFormat(): (d: any) => string;
-        yTickFormat(format: (t: any) => string): this;
-        yTickFormat(format: string): this;
-        yTickFormat(format: (d: any, i: any) => string): this;
-    }
-
-    interface MultiBarChart extends Chart {
-        multibar: MultiBar;
-        legend: Legend;
-        controls: Legend;
-        xAxis: Nvd3Axis;
-        yAxis: Nvd3Axis;
-        tooltip: Tooltip;
-
-        /*this option lets you specific a color for each bar group to have the same color but differentiated by shading.*/
-        barColor(value: string[]): this;
-        /*this option lets you specific a color for each bar group to have the same color but differentiated by shading.*/
-        barColor(func: (d: any, i: number) => string): this;
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(): boolean;
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(value: boolean): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*Object that defines the labels for control items in the graph. For instance, in the stackedAreaChart, there are controls for making it stacked, expanded, or stream. For stacked bar charts, there is stacked and grouped.*/
-        controlLabels(): any;
-        /*Object that defines the labels for control items in the graph. For instance, in the stackedAreaChart, there are controls for making it stacked, expanded, or stream. For stacked bar charts, there is stacked and grouped.*/
-        controlLabels(value: any): this;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(): any;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(value: any): this;
-        /**/
-        disabled(): boolean[];
-        /**/
-        disabled(value: boolean[]): this;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(): number;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(value: number): this;
-        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
-        forceY(): number[];
-        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
-        forceY(value: number[]): this;
-        /*The padding between bar groups, this is passed as the padding attribute of rangeBands*/
-        groupSpacing(): number;
-        /*The padding between bar groups, this is passed as the padding attribute of rangeBands*/
-        groupSpacing(value: number): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        /*.*/
-        hideable(): boolean;
-        /**/
-        hideable(value: boolean): this;
-        id(): any;
-id(value: number|string): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        noData(): string;
-        noData(value: string): this;
-        reduceXTicks(): boolean;
-        reduceXTicks(value: boolean): this;
-        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
-        rightAlignYAxis(): boolean;
-        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
-        rightAlignYAxis(value: boolean): this;
-        /*Rotates the X axis labels by the specified degree.*/
-        rotateLabels(): number;
-        /*Rotates the X axis labels by the specified degree.*/
-        rotateLabels(value: number): this;
-        /*Whether to show extra controls or not. Extra controls include things like making mulitBar charts stacked or side by side.*/
-        showControls(): boolean;
-        /*Whether to show extra controls or not. Extra controls include things like making mulitBar charts stacked or side by side.*/
-        showControls(value: boolean): this;
-        /*Whether to display the legend or not.*/
-        showLegend(): boolean;
-        /*Whether to display the legend or not.*/
-        showLegend(value: boolean): this;
-        /*Display or hide the X axis*/
-        showXAxis(): boolean;
-        /*Display or hide the X axis*/
-        showXAxis(value: boolean): this;
-        /*Display or hide the Y axis*/
-        showYAxis(): boolean;
-        /*Display or hide the Y axis*/
-        showYAxis(value: boolean): this;
-        /*.*/
-        stacked(): boolean;
-        /**/
-        stacked(value: boolean): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        stackOffset(offset: 'silhouette'): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        stackOffset(offset: 'wiggle'): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        stackOffset(offset: 'expand'): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        stackOffset(offset: 'zero'): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        stackOffset(offset: string): this;
-        /* options include 'silhouette', 'wiggle', 'expand', 'zero', or a custom function*/
-        stackOffset(offset: (data: Array<[number, number]>) => number[]): this;
-        /*Makes the X labels stagger at different distances from the axis so they're less likely to overlap.*/
-        staggerLabels(): boolean;
-        /*Makes the X labels stagger at different distances from the axis so they're less likely to overlap.*/
-        staggerLabels(value: boolean): this;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(): (d: any) => string;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(func: (d: any) => string): this;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(): boolean;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(value: boolean): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any) => any;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any) => any): this;
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(): number[];
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(value: number[]): this;
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(): number[];
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(value: number[]): this;
-        /* Override the default scale type for the X axis*/
-        xScale(): any;
-        /* Override the default scale type for the X axis*/
-        xScale(value: any): this;
-        y(): (d: any) => number;
-        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        y(func: (d: any) => number): this;
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(): number[];
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(value: number[]): this;
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(): number[];
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(value: number[]): this;
-        /* Override the default scale type for the y axis*/
-        yScale(): any;
-        /* Override the default scale type for the y axis*/
-        yScale(value: any): this;
-
-    }
-
-    interface MultiBarHorizontalChart extends Chart {
-        multibar: MultiBar;
-        legend: Legend;
-        controls: Legend;
-        xAxis: Nvd3Axis;
-        yAxis: Nvd3Axis;
-        tooltip: Tooltip;
-
-        /*this option lets you specific a color for each bar group to have the same color but differentiated by shading.*/
-        barColor(value: string[]): this;
-        /*this option lets you specific a color for each bar group to have the same color but differentiated by shading.*/
-        barColor(func: (d: any, i: number) => string): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*Object that defines the labels for control items in the graph. For instance, in the stackedAreaChart, there are controls for making it stacked, expanded, or stream. For stacked bar charts, there is stacked and grouped.*/
-        controlLabels(): any;
-        /*Object that defines the labels for control items in the graph. For instance, in the stackedAreaChart, there are controls for making it stacked, expanded, or stream. For stacked bar charts, there is stacked and grouped.*/
-        controlLabels(value: any): this;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(): any;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(value: any): this;
-        /**/
-        disabled(): boolean[];
-        /**/
-        disabled(value: boolean[]): this;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(): number;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(value: number): this;
-        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
-        forceY(): number[];
-        /* List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the Y domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option.*/
-        forceY(value: number[]): this;
-        /*The padding between bar groups, this is passed as the padding attribute of rangeBands*/
-        groupSpacing(): number;
-        /*The padding between bar groups, this is passed as the padding attribute of rangeBands*/
-        groupSpacing(value: number): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        id(): any;
-id(value: number|string): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        noData(): string;
-        noData(value: string): this;
-        showControls(): boolean;
-        /*Whether to show extra controls or not. Extra controls include things like making mulitBar charts stacked or side by side.*/
-        showControls(value: boolean): this;
-        /*Whether to display the legend or not.*/
-        showLegend(): boolean;
-        /*Whether to display the legend or not.*/
-        showLegend(value: boolean): this;
-        /*Prints the Y values on the top of the bars. Only recommended to use if there aren't many bars.*/
-        showValues(): boolean;
-        /*Prints the Y values on the top of the bars. Only recommended to use if there aren't many bars.*/
-        showValues(value: boolean): this;
-        /*Display or hide the X axis*/
-        showXAxis(): boolean;
-        /*Display or hide the X axis*/
-        showXAxis(value: boolean): this;
-        /*Display or hide the Y axis*/
-        showYAxis(): boolean;
-        /*Display or hide the Y axis*/
-        showYAxis(value: boolean): this;
-        /*.*/
-        stacked(): boolean;
-        /**/
-        stacked(value: boolean): this;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(): (d: any) => string;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(func: (d: any) => string): this;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(): boolean;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(value: boolean): this;
-        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
-        valueFormat(): string;
-        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
-        valueFormat(value: string): this;
-        /*.*/
-        valuePadding(): number;
-        /**/
-        valuePadding(value: number): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any) => any;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any) => any): this;
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(): number[];
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(value: number[]): this;
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(): number[];
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(value: number[]): this;
-        /* Override the default scale type for the X axis*/
-        xScale(): any;
-        /* Override the default scale type for the X axis*/
-        xScale(value: any): this;
-        y(): (d: any) => number;
-        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        y(func: (d: any) => number): this;
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(): number[];
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(value: number[]): this;
-        /**/
-        yErr(): (d: any, i: number) => number | number[];
-        /**/
-        yErr(func: (d: any, i: number) => number | number[]): this;
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(): number[];
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(value: number[]): this;
-        /* Override the default scale type for the y axis*/
-        yScale(): any;
-        /* Override the default scale type for the y axis*/
-        yScale(value: any): this;
-
-    }
-
-    interface MultiChart extends Chart {
-        lines1: Line;
-        lines2: Line;
-        bars1: MultiBar;
-        bars2: MultiBar;
-        scatters1: Scatter;
-        scatters2: Scatter;
-        stack1: StackedArea;
-        stack2: StackedArea;
-        xAxis: Nvd3Axis;
-        yAxis1: Nvd3Axis;
-        yAxis2: Nvd3Axis;
-        tooltip: Tooltip;
-
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
-        interpolate(): string;
-        /*controls the line interpolation between points, many options exist, see the D3 reference:*/
-        interpolate(value: string): this;
-        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
-        isArea(): (d: any) => boolean;
-        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
-        isArea(value: boolean): this;
-        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
-        isArea(func: (d: any) => boolean): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        noData(): string;
-        noData(value: string): this;
-        /*Whether to display the legend or not.*/
-        showLegend(): boolean;
-        /*Whether to display the legend or not.*/
-        showLegend(value: boolean): this;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(): (d: any) => string;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(func: (d: any) => string): this;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(): boolean;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(value: boolean): this;
-        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
-        useVoronoi(): boolean;
-        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
-        useVoronoi(value: boolean): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any) => any;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any) => any): this;
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        y(): (d: any) => number;
-        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        y(func: (d: any) => number): this;
-        /* */
-        yDomain1(): number[];
-        /* */
-        yDomain1(value: number[]): this;
-        /* */
-        yDomain2(): number[];
-        /* */
-        yDomain2(value: number[]): this;
-    }
-
-    interface OhlcBarChart extends Chart {
-        bars: OhlcBar;
-        legend: Legend;
-        xAxis: Nvd3Axis;
-        yAxis: Nvd3Axis;
-        tooltip: Tooltip;
-
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(): boolean;
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(value: boolean): this;
-        close(): (d: any) => number;
-        close(func: (d: any) => number): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(): any;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(value: any): this;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(): number;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(value: number): this;
-        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceX(): number[];
-        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceX(value: number[]): this;
-        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option*/
-        forceY(): number[];
-        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the yDomain option*/
-        forceY(value: number[]): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        high(): (d: any) => number;
-        high(func: (d: any) => number): this;
-        id(): any;
-        id(value: number|string): this;
-        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
-        interactive(): boolean;
-        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
-        interactive(value: boolean): this;
-        low(): (d: any) => number;
-        low(func: (d: any) => number): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        noData(): string;
-        noData(value: string): this;
-        open(): (d: any) => number;
-        open(func: (d: any) => number): this;
-        padData(): boolean;
-        padData(value: boolean): this;
-        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
-        rightAlignYAxis(): boolean;
-        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
-        rightAlignYAxis(value: boolean): this;
-        /*Whether to display the legend or not*/
-        showLegend(): boolean;
-        /*Whether to display the legend or not*/
-        showLegend(value: boolean): this;
-        /*Display or hide the X axis*/
-        showXAxis(): boolean;
-        /*Display or hide the X axis*/
-        showXAxis(value: boolean): this;
-        /*Display or hide the Y axis*/
-        showYAxis(): boolean;
-        /*Display or hide the Y axis*/
-        showYAxis(value: boolean): this;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(): (d: any) => string;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(func: (d: any) => string): this;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(): boolean;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(value: boolean): this;
-        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
-        useInteractiveGuideline(): boolean;
-        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
-        useInteractiveGuideline(value: boolean): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any) => any;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any) => any): this;
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(): number[];
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(value: number[]): this;
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(): number[];
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(value: number[]): this;
-        /* Override the default scale type for the X axis*/
-        xScale(): any;
-        /* Override the default scale type for the X axis*/
-        xScale(value: any): this;
-        y(): (d: any) => number;
-        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        y(func: (d: any) => number): this;
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(): number[];
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(value: number[]): this;
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(): number[];
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(value: number[]): this;
-        /* Override the default scale type for the y axis*/
-        yScale(): any;
-        /* Override the default scale type for the y axis*/
-        yScale(value: any): this;
-    }
-
-    interface ParallelCoordinatesChart extends Chart {
-        parallelCoordinates: ParallelCoordinates;
-        legend: Legend;
-        tooltip: Tooltip;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(): any;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(value: any): this;
-        dimensionData(): any
-        dimensionData(d:any) : this
-        /*D3 format for each x axis*/
-        dimensionFormats(): string[];
-        /*D3 format for each x axis*/
-        dimensionFormats(value: string[]): this;
-        /*Name of each dimension, used for each axis.*/
-        dimensionNames(): string[];
-        /*Name of each dimension, used for each axis.*/
-        dimensionNames(value: string[]): this;
-        /*Deprecated. Use dimensionsNames instead. */
-        dimensions(): any;
-        /*Deprecated. Use dimensionsNames instead. .*/
-        dimensions(value: any): this;
-        /**/
-        displayBrush(): boolean;
-        /**/
-        displayBrush(value: boolean): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        /*Specifies each line tension. Values between 0 and 1.*/
-        lineTension(): number;
-        /*Specifies each line tension. Values between 0 and 1.*/
-        lineTension(value: number): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        /**/
-        noData(): string;
-        /**/
-        noData(value: string): this;
-        /**/
-        showLegend(): boolean;
-        /**/
-        showLegend(value: boolean): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-    }
-
-    interface PieChart extends Chart {
-        legend: Legend;
-        pie: Pie;
-        tooltip: Tooltip;
-
-        /*Specifies each slice size, by an inner and a outer radius. Values between 0 and 1*/
-        arcsRadius(): ArcsRadius[];
-        /*Specifies each slice size, by an inner and a outer radius. Values between 0 and 1*/
-        arcsRadius(value: ArcsRadius[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*D3 3.4+, For donut charts only, the corner radius of the slices. Typically used with padAngle.*/
-        cornerRadius(): number;
-        /*D3 3.4+, For donut charts only, the corner radius of the slices. Typically used with padAngle.*/
-        cornerRadius(value: number): this;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(): any;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(value: any): this;
-        /*Whether to make a pie graph a donut graph or not.*/
-        donut(): boolean;
-        /*Whether to make a pie graph a donut graph or not.*/
-        donut(value: boolean): this;
-        /**/
-        donutLabelsOutside(): boolean;
-        /**/
-        donutLabelsOutside(value: boolean): this;
-        /*Percent of pie radius to cut out of the middle to make the donut. It is multiplied by the outer radius to calculate the inner radius, thus it should be between 0 and 1.*/
-        donutRatio(): number;
-        /*Percent of pie radius to cut out of the middle to make the donut. It is multiplied by the outer radius to calculate the inner radius, thus it should be between 0 and 1.*/
-        donutRatio(value: number): this;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(): number;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(value: number): this;
-        /*Function used to manage the ending angle of the pie/donut chart*/
-        endAngle(): (d: any) => number;
-        /*Function used to manage the ending angle of the pie/donut chart*/
-        endAngle(func: (d: any) => number): this;
-        /*For pie/donut charts, whether to increase slice radius on hover or not*/
-        growOnHover(): boolean;
-        /*For pie/donut charts, whether to increase slice radius on hover or not*/
-        growOnHover(value: boolean): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        id(): any;
-id(value: number|string): this;
-        /**/
-        labelFormat(): string;
-        /**/
-        labelFormat(value: string): this;
-        /**/
-        labelFormat(format: (d: any) => string): this;
-        /**/
-        labelSunbeamLayout(): boolean;
-        /**/
-        labelSunbeamLayout(value: boolean): this;
-        /*Pie/donut charts: The slice threshold size to not display the label because it woudl be too small of a space*/
-        labelThreshold(): number;
-        /*Pie/donut charts: The slice threshold size to not display the label because it woudl be too small of a space*/
-        labelThreshold(value: number): this;
-        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
-        labelType(): string;
-        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
-        labelType(value: 'key'): this;
-        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
-        labelType(value: 'value'): this;
-        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
-        labelType(value: 'percent'): this;
-        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
-        labelType(value: string): this;
-        /*pie/donut charts only: what kind of data to display for the slice labels. Options are key, value, or percent. */
-        labelType(func: (d: any, i: number, values: any) => string): this;
-        /*Whether pie/donut chart labels should be outside the slices instead of inside them*/
-        labelsOutside(): boolean;
-        /*Whether pie/donut chart labels should be outside the slices instead of inside them*/
-        labelsOutside(value: boolean): this;
-        /*Position of the legend (top or right). */
-        legendPosition(): string;
-        /*Position of the legend (top or right). */
-        legendPosition(value: 'top'): this;
-        /*Position of the legend (top or right). */
-        legendPosition(value: 'right'): this;
-        /*Position of the legend (top or right). */
-        legendPosition(value: string): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        /*Message to display if no data is provided*/
-        noData(): string;
-        /*Message to display if no data is provided*/
-        noData(value : string): this;
-        /*D3 3.4+, For donut charts only, the percent of the chart that should be spacing between slices.*/
-        padAngle(): number;
-        /*D3 3.4+, For donut charts only, the percent of the chart that should be spacing between slices.*/
-        padAngle(value: number): this;
-        /**/
-        pieLabelsOutside(): boolean;
-        /**/
-        pieLabelsOutside(value: boolean): this;
-        /*Show pie/donut chart labels for each slice*/
-        showLabels(): boolean;
-        /*Show pie/donut chart labels for each slice*/
-        showLabels(value: boolean): this;
-        /*Whether to display the legend or not*/
-        showLegend(): boolean;
-        /*Whether to display the legend or not*/
-        showLegend(value: boolean): this;
-        /*Function used to manage the starting  angle of the pie/donut chart*/
-        startAngle(): (d: any) => number;
-        /*Function used to manage the starting  angle of the pie/donut chart*/
-        startAngle(func: (d: any) => number): this;
-        /*Text to include within the middle of a donut chart*/
-        title(): string;
-        /*Text to include within the middle of a donut chart*/
-        title(value: string): this;
-        /*Vertical offset for the donut chart title*/
-        titleOffset(): number;
-        /*Vertical offset for the donut chart title*/
-        titleOffset(value: number): this;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(): (d: any) => string;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(func: (d: any) => string): this;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(): boolean;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(value: boolean): this;
-        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
-        valueFormat(): string;
-        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
-        valueFormat(value: string): this;
-        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
-        valueFormat(format: (d: any) => string): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any) => any;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any) => any): this;
-        /*Proxy function to return the Y value so adjustments can be made if needed.For pie/ donut chart this returns the value for the slice.*/
-        y(): (d: any) => number;
-        /*Proxy function to return the Y value so adjustments can be made if needed. For pie/donut chart this returns the value for the slice.*/
-        y(func: (d: any) => number): this;
-    }
-
-    interface ScatterChart extends Chart {
-        scatter: Scatter;
-        xAxis: Nvd3Axis;
-        yAxis: Nvd3Axis;
-        legend: Legend;
-        tooltip: Tooltip;
-        distX: Distribution;
-        distY: Distribution;
-
-        clearHighlights(): this;
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(): boolean;
-        /*If true, masks lines within the X and Y scales using a clip-path*/
-        clipEdge(value: boolean): this;
-        /*When useVoronoi and clipVoronoi are true, you can control the clip radius with this option. Essentially this lets you set how far away from the actual point you can put the mouse for it to select the point.*/
-        clipRadius(func: (d: any) => number): this;
-        /*When useVoronoi and clipVoronoi are true, you can control the clip radius with this option. Essentially this lets you set how far away from the actual point you can put the mouse for it to select the point.*/
-        clipRadius(value: number): this;
-        /*When useVoronoi is on, this masks each voronoi section with a circle to limit selection to smaller area.*/
-        clipVoronoi(): boolean;
-        /*When useVoronoi is on, this masks each voronoi section with a circle to limit selection to smaller area.*/
-        clipVoronoi(value: boolean): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(value: string[]): this;
-        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(): any;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(value: any): this;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(): number;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(value: number): this;
-        /*List of numbers to Force into the point scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forcePoint(): number[];
-        /*List of numbers to Force into the point scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forcePoint(value: number[]): this;
-        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceX(): number[];
-        /*List of numbers to Force into the X scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceX(value: number[]): this;
-        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceY(): number[];
-        /*List of numbers to Force into the Y scale (ie. 0, or a max / min, etc.). This ensures the numbers are in the X domain but doesn't override the whole domain. This option only applies if you have not overridden the whole domain with the xDomain option*/
-        forceY(value: number[]): this;
-        /*The height the graph or component created inside the SVG should be made*/
-        height(): number;
-        /*The height the graph or component created inside the SVG should be made.*/
-        height(value: number): this;
-        /**/
-        highlightPoint(): (d: any) => boolean;
-        /**/
-        highlightPoint(func: (d: any) => boolean): this;
-        id(): any;
-id(value: number|string): this;
-        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
-        interactive(): boolean;
-        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
-        interactive(value: boolean): this;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(): Margin;
-        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
-        margin(value: Margin): this;
-        noData(): string;
-        noData(value: string): this;
-        /**/
-        padData(): boolean;
-        /**/
-        padData(value: boolean): this;
-        /**/
-        padDataOuter(): number;
-        /**/
-        padDataOuter(value: number): this;
-        /* Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
-        pointActive(): (d: any) => boolean;
-        /*Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
-        pointActive(func: (d: any) => boolean): this;
-        /* Defines the whole point scale's domain. Using this will disable calculating the domain based on the data.*/
-        pointxDomain(): number[];
-        /* Defines the whole point scale's domain. Using this will disable calculating the domain based on the data.*/
-        pointDomain(value: number[]): this;
-        /* Override the point scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        pointRange(): number[];
-        /* Override the point scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        pointRange(value: number[]): this;
-        /* Override the default scale type for the point axis*/
-        pointScale(): any;
-        /* Override the default scale type for the point axis*/
-        pointScale(value: any): this;
-        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
-        pointSize(): (d: any) => number;
-        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
-        pointSize(func: (d: any) => number): this;
-        /* Specifies the size of the points in a scatter. Scatter is also used to make the hover points on lines.*/
-        pointSize(value: number): this;
-        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
-        rightAlignYAxis(): boolean;
-        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
-        rightAlignYAxis(value: boolean): this;
-        /**/
-        showDistX(): boolean;
-        /**/
-        showDistX(value: boolean): this;
-        /**/
-        showDistY(): boolean;
-        /**/
-        showDistY(value: boolean): this;
-        /*Whether to display the legend or not.*/
-        showLegend(): boolean;
-        /*Whether to display the legend or not.*/
-        showLegend(value: boolean): this;
-        /*Displays the voronoi areas on the chart. This is mostly helpful when debugging issues.*/
-        showVoronoi(): boolean;
-        /*Displays the voronoi areas on the chart. This is mostly helpful when debugging issues.*/
-        showVoronoi(value: boolean): this;
-        /*Display or hide the X axis*/
-        showXAxis(): boolean;
-        /*Display or hide the X axis*/
-        showXAxis(value: boolean): this;
-        /*Display or hide the Y axis*/
-        showYAxis(): boolean;
-        /*Display or hide the Y axis*/
-        showYAxis(value: boolean): this;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(): (d: any) => string;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(func: (d: any) => string): this;
-        /**/
-        tooltipXContent(): (d: any) => string;
-        /**/
-        tooltipXContent(func: (d: any) => string): this;
-        /**/
-        tooltipYContent(): (d: any) => string;
-        /**/
-        tooltipYContent(func: (d: any) => string): this;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(): boolean;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(value: boolean): this;
-        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
-        useVoronoi(): boolean;
-        /*Use voronoi diagram to select nearest point to display tooltip instead of requiring a hover over the specific point itself. Setting this to false will also set clipVoronoi to false.*/
-        useVoronoi(value: boolean): this;
-        /* The width the graph or component created inside the SVG should be made*/
-        width(): number;
-        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(): (d: any) => any;
-        /* Proxy function to return the X value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        x(func: (d: any) => any): this;
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(): number[];
-        /* Defines the whole X scale's domain. Using this will disable calculating the domain based on the data.*/
-        xDomain(value: number[]): this;
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(): number[];
-        /* Override the X scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        xRange(value: number[]): this;
-        /* Override the default scale type for the X axis*/
-        xScale(): any;
-        /* Override the default scale type for the X axis*/
-        xScale(value: any): this;
-        y(): (d: any) => number;
-        /* Proxy function to return the y value so adjustments can be made if needed. For pie/donut chart this returns the key for the slice.*/
-        y(func: (d: any) => number): this;
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(): number[];
-        /* Defines the whole y scale's domain. Using this will disable calculating the domain based on the data.*/
-        yDomain(value: number[]): this;
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(): number[];
-        /* Override the y scale's range. Using this will disable calculating the range based on the data and chart width/height.*/
-        yRange(value: number[]): this;
-        /* Override the default scale type for the y axis*/
-        yScale(): any;
-        /* Override the default scale type for the y axis*/
-        yScale(value: any): this;
-
-    }
-
-    interface StackedAreaChart extends StackedArea, Chart {
-        stacked: StackedArea;
-        legend: Legend;
-        controls: Legend;
-        xAxis: Nvd3Axis;
-        yAxis: Nvd3Axis;
-        tooltip: Tooltip;
-
-        controlLabels(): any;
-        /*Object that defines the labels for control items in the graph. For instance, in the stackedAreaChart, there are controls for making it stacked, expanded, or stream. For stacked bar charts, there is stacked and grouped.*/
-        controlLabels(value: any): this;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(): any;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(value: any): this;
-        /*Message to display if no data is provided*/
-        noData(): string;
-        /*Message to display if no data is provided*/
-        noData(value: string): this;
-        rightAlignYAxis(): boolean;
-        /*When only one Y axis is used, this puts the Y axis on the right side instead of the left.*/
-        rightAlignYAxis(value: boolean): this;
-        showLegend(): boolean;
-        /*Whether to display the legend or not*/
-        showLegend(value: boolean): this;
-        /*Display or hide the X axis*/
-        showXAxis(): boolean;
-        /*Display or hide the X axis*/
-        showXAxis(value: boolean): this;
-        /*Display or hide the Y axis*/
-        showYAxis(): boolean;
-        /*Display or hide the Y axis*/
-        showYAxis(value: boolean): this;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(): (d: any) => string;
-        /*Deprecated. Use chart.tooltip.contentGenerator or chart.interactiveGuideline.tooltip.contentGenerator to control tooltip content.*/
-        tooltipContent(func: (d: any) => string): this;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(): boolean;
-        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(value: boolean): this;
-        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
-        useInteractiveGuideline(): boolean;
-        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
-        useInteractiveGuideline(value: boolean): this;
-    }
-
-    interface SunburstChart extends Sunburst, Chart {
-        sunburst: Sunburst;
-        tooltip: Tooltip;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(): number;
-        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
-        duration(value: number): this;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(): any;
-        /*No longer used.Use chart.dispatch.changeState(...) instead*/
-        defaultState(value: any): this;
-        /*Message to display if no data is provided*/
-        noData(): string;
-        /*Message to display if no data is provided*/
-        noData(value: string): this;
-    }
-
-//#endregion
-
-    interface Models{
-        boxPlotChart(): BoxPlotChart;
-        bullet(): Bullet;
-        bulletChart(): BulletChart;
-        candlestickBar(): CandlestickBar;
-        candlestickBarChart(): CandlestickBarChart;
-        cumulativeLineChart(): CumulativeLineChart;
-        discreteBar(): DiscreteBar;
-        discreteBarChart(): DiscreteBarChart;
-        distribution(): Distribution;
-		historicalBar(): HistoricalBar;
-        historicalBarChart(bar_model?: HistoricalBar): HistoricalBarChart;
-        ohlcBar(): OhlcBar;
-        ohlcBarChart(): OhlcBarChart;
-        legend(): Legend;
-        line(): Line;
-        lineChart(): LineChart;
-        linePlusBarChart(): LinePlusBarChart;
-        lineWithFocusChart(): LineWithFocusChart;
-        multiBarChart(): MultiBarChart;
-        multiBarHorizontalChart(): MultiBarHorizontalChart;
-        multiChart(): MultiChart;
-        parallelCoordinates(): ParallelCoordinates;
-        parallelCoordinatesChart(): ParallelCoordinatesChart;
-        pie(): Pie;
-        pieChart(): PieChart;
-        scatter(): Scatter;
-        scatterChart(): ScatterChart;
-        sparkline(): SparkLine;
-        sparklinePlus(): SparkLinePlus;
-        stackedArea(): StackedArea;
-        stackedAreaChart(): StackedAreaChart;
-        sunburst(): Sunburst;
-        sunburstChart(): SunburstChart;
-		tooltip(): Tooltip;
-	}
-
-    interface Nvd3Static{
-        /*set to false in production*/
-        dev: boolean
-        /*stores all the ready to use charts*/
-        charts: any
-        models: Models;
-        tooltip: Nvd3TooltipStatic;
-        utils: Utils;
-
-        /*stores some statistics and potential error messages*/
-        logs: any;
-
-        addGraph<TChart extends Nvd3Element>(factory: ChartFactory<TChart>): void;
-        addGraph<TChart extends Nvd3Element>(generate: () => TChart, callBack?: (chart: TChart) => void): void;
-
-
-        log(topic: string, value?: string): string //returns last argument
-        log(arg: any[]): any //returns last argument
-	}
-}
-declare var nv : nv.Nvd3Static;
diff --git a/nvd3/tsconfig.json b/nvd3/tsconfig.json
new file mode 100644
index 0000000000..af6755830c
--- /dev/null
+++ b/nvd3/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/nw.gui/index.d.ts b/nw.gui/index.d.ts
new file mode 100644
index 0000000000..39052e82a6
--- /dev/null
+++ b/nw.gui/index.d.ts
@@ -0,0 +1,219 @@
+// Type definitions for node-webkit
+// Project: https://github.com/rogerwang/node-webkit
+// Definitions by: Pedro Casaubon <https://github.com/xperiments>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+interface IEventEmitter {
+    addListener(event: string, listener: Function): EventEmitter;
+    on(event: string, listener: Function): EventEmitter;
+    once(event: string, listener: Function): EventEmitter;
+    removeListener(event: string, listener: Function): EventEmitter;
+    removeAllListeners(event?: string): EventEmitter;
+    setMaxListeners(n: number): void;
+    listeners(event: string): Function[];
+    emit(event: string, ...args: any[]): boolean;
+}
+
+declare class EventEmitter implements IEventEmitter {
+    addListener(event: string, listener: Function): EventEmitter;
+    on(event: string, listener: Function): EventEmitter;
+    once(event: string, listener: Function): EventEmitter;
+    removeListener(event: string, listener: Function): EventEmitter;
+    removeAllListeners(event?: string): EventEmitter;
+    setMaxListeners(n: number): void;
+    listeners(event: string): Function[];
+    emit(event: string, ...args: any[]): boolean;
+}
+
+export interface MenuConfig {
+    type?: string;
+}
+
+export interface HideMenusOptions {
+    hideEdit: boolean;
+    hideWindow: boolean;
+}
+
+export interface MenuItemConfig {
+    label?: string;
+    click?: Function;
+    type?: string;
+    submenu?: Menu;
+    icon?: string;
+    tooltip?: string;
+    checked?: boolean;
+    enabled?: boolean;
+    key?: string;
+    modifiers?: string;
+}
+
+export declare class MenuItem extends EventEmitter implements MenuItemConfig {
+    constructor(config: MenuItemConfig);
+    label: string;
+    click: Function;
+    type: string;
+    submenu: Menu;
+    icon: string;
+    tooltip: string;
+    checked: boolean;
+    enabled: boolean;
+    key: string;
+    modifiers: string;
+}
+
+export declare class Menu {
+    constructor(config?: MenuConfig);
+    items: MenuItem[];
+    append(item: MenuItem): void;
+    remove(item: MenuItem): void;
+    insert(item: MenuItem, atPosition: number): void;
+    removeAt(index: number): void;
+    popup(x: number, y: number): void;
+    // since v0.10.0-rc1
+    createMacBuiltin(appname: string, options?: HideMenusOptions): void;
+
+}
+
+export interface ShortcutOption {
+    key: string;
+    active: Function;
+    failed: Function;
+}
+
+export declare class Shortcut extends EventEmitter {
+    constructor(option: ShortcutOption);
+    key: string;
+    active: Function;
+    failed: Function;
+}
+
+export interface WindowManifestOptions {
+
+    title?: string;
+    icon?: string;
+    toolbar?: boolean;
+    frame?: boolean;
+    width?: number;
+    height?: number;
+    position?: string;
+    min_width?: number;
+    min_height?: number;
+    max_width?: number;
+    max_height?: number;
+}
+
+export declare class Window extends EventEmitter {
+    static get(windowObject?: any): Window;
+    static open(url: string, options?: WindowManifestOptions): Window;
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+    title: string;
+    menu: Menu;
+    isFullScreen: boolean;
+    isKioskMode: boolean;
+    zoomLevel: number;
+    moveTo(x: number, y: number): void;
+    moveBy(x: number, y: number): void;
+    resizeTo(width: number, height: number): void;
+    resizeBy(width: number, height: number): void;
+    focus(): void;
+    blur(): void;
+    show(): void;
+    hide(): void;
+    close(force?: boolean): void;
+    reload(): void;
+    reloadIgnoringCache(): void;
+    maximize(): void;
+    unmaximize(): void;
+    minimize(): void;
+    restore(): void;
+    enterFullscreen(): void;
+    leaveFullscreen(): void;
+    toggleFullscreen(): void;
+    enterKioskMode(): void;
+    leaveKioskMode(): void;
+    toggleKioskMode(): void;
+    showDevTools(id?: string, headless?: boolean): void;
+    showDevTools(id: HTMLIFrameElement, headless?: boolean): void;
+    closeDevTools(): void;
+    isDevToolsOpen(): boolean;
+    setMaximumSize(width: number, height: number): void;
+    setMinimumSize(width: number, height: number): void;
+    setResizable(resizable: boolean): void;
+    setAlwaysOnTop(top: boolean): void;
+    setPosition(position: string): void;
+    setShowInTaskbar(show: boolean): void;
+    requestAttention(attention: boolean): void;
+    requestAttention(attention: number): void;
+    capturePage(callback: Function, imageformat?: string): void;
+    capturePage(callback: Function, config_object: { format: string; datatype: string }): void;
+    setProgressBar(progress: number): void;
+    setBadgeLabel(label: string): void;
+    eval(frame: HTMLIFrameElement, script: string): void;
+}
+
+export interface App {
+    argv: any;
+    fullArgv: any;
+    dataPath: string;
+    manifest: any;
+    clearCache(): void;
+    closeAllWindows(): void;
+    crashBrowser(): void;
+    crashRenderer(): void;
+    getProxyForURL(url: string): void;
+    quit(): void;
+    setCrashDumpDir(dir: string): void;
+    addOriginAccessWhitelistEntry(
+        sourceOrigin: string
+        , destinationProtocol: string
+        , destinationHost: string
+        , allowDestinationSubdomains: boolean
+    ): void;
+    removeOriginAccessWhitelistEntry(
+        sourceOrigin: string
+        , destinationProtocol: string
+        , destinationHost: string
+        , allowDestinationSubdomains: boolean
+    ): void;
+    registerGlobalHotKey(shortcut: Shortcut): void;
+    unregisterGlobalHotKey(shortcut: Shortcut): void;
+}
+
+export declare class Clipboard {
+    static get(): Clipboard;
+    get(type?: string): string;
+    set(data: string, type?: string): void;
+    clear(): void;
+}
+
+export interface TrayOption {
+    title?: string;
+    tooltip?: string;
+    icon?: string;
+    alticon?: string;
+    menu?: Menu;
+}
+
+export declare class Tray implements TrayOption {
+    constructor(option: TrayOption);
+    title: string;
+    tooltip: string;
+    icon: string;
+    alticon: string;
+    menu: Menu;
+    remove(): void;
+}
+
+interface Shell {
+    openExternal(uri: string): void;
+    openItem(file_path: string): void;
+    showItemInFolder(file_path: string): void;
+}
+
+export declare var App: App;
+export declare var Shell: Shell;
diff --git a/nw.gui/node-webkit-tests.ts b/nw.gui/node-webkit-tests.ts
new file mode 100644
index 0000000000..d5a8c9b117
--- /dev/null
+++ b/nw.gui/node-webkit-tests.ts
@@ -0,0 +1,204 @@
+///<reference types="node"/>
+
+// Load native UI library
+// See docs: https://github.com/rogerwang/node-webkit/wiki/Shell
+import gui = require("nw.gui");
+
+
+/* WINDOW */
+
+// Get the current window
+var win = gui.Window.get();
+
+// Listen to the minimize event
+win.on('minimize', function() {
+    console.log('Window is minimized');
+});
+
+// Minimize the window
+win.minimize();
+
+// Unlisten the minimize event
+win.removeAllListeners('minimize');
+
+// Create a new window and get it
+var new_win = gui.Window.get(
+    window.open('https://github.com')
+);
+
+// And listen to new window's focus event
+new_win.on('focus', function() {
+    console.log('New window is focused');
+});
+
+
+// Get the current window
+var win = gui.Window.get();
+
+// Create a new window and get it
+var new_win = gui.Window.get(
+    window.open('https://github.com')
+);
+
+// png as base64string
+win.capturePage(function(base64string: string) {
+    // do something with the base64string
+}, { format: 'png', datatype: 'raw' });
+
+// png as node buffer
+win.capturePage(function(buffer: Buffer) {
+    // do something with the buffer
+}, { format: 'png', datatype: 'buffer' });
+
+
+// Open a new window.
+var win = gui.Window.get(
+    window.open('popup.html')
+);
+
+// Release the 'win' object here after the new window is closed.
+win.on('closed', function() {
+    win = null;
+});
+
+// Listen to main window's close event
+gui.Window.get().on('close', function() {
+    // Hide the window to give user the feeling of closing immediately
+    this.hide();
+
+    // If the new window is still open then close it.
+    if (win != null)
+        win.close(true);
+
+    // After closing the new window, close the main window.
+    this.close(true);
+});
+
+
+/* MENU */
+
+// Create an empty menu
+var menu = new gui.Menu();
+
+// Add some items
+menu.append(new gui.MenuItem({ label: 'Item A' }));
+menu.append(new gui.MenuItem({ label: 'Item B' }));
+menu.append(new gui.MenuItem({ type: 'separator' }));
+menu.append(new gui.MenuItem({ label: 'Item C' }));
+
+// Remove one item
+menu.removeAt(1);
+
+// Popup as context menu
+menu.popup(10, 10);
+
+// Iterate menu's items
+for (var i = 0; i < menu.items.length; ++i) {
+    console.log(menu.items[i]);
+}
+
+
+var win = gui.Window.get();
+var nativeMenuBar = new gui.Menu({ type: "menubar" });
+nativeMenuBar.createMacBuiltin("My App");
+win.menu = nativeMenuBar;
+
+nativeMenuBar.createMacBuiltin("My App", {
+    hideEdit: true,
+    hideWindow: true
+});
+
+/* MENU ITEM */
+
+var itemc: gui.MenuItem;
+
+// Create a separator
+itemc = new gui.MenuItem({ type: 'separator' });
+
+// Create a normal item with label and icon
+itemc = new gui.MenuItem({
+    type: "normal",
+    label: "I'm a menu item",
+    icon: "img/icon.png"
+});
+
+// Or you can omit the 'type' field for normal items
+itemc = new gui.MenuItem({ label: 'Simple item' });
+
+// Bind a callback to item
+itemc = new gui.MenuItem({
+    label: "Click me",
+    click: function() {
+        console.log("I'm clicked");
+    },
+    key: "s",
+    modifiers: "ctrl-alt",
+});
+
+// You can have submenu!
+var submenu = new gui.Menu();
+submenu.append(new gui.MenuItem({ label: 'Item 1' }));
+submenu.append(new gui.MenuItem({ label: 'Item 2' }));
+submenu.append(new gui.MenuItem({ label: 'Item 3' }));
+itemc.submenu = submenu;
+
+// And everything can be changed at runtime
+itemc.label = 'New label';
+itemc.click = function() { console.log('New click callback'); };
+
+
+/* APP */
+
+// Print arguments
+console.log(gui.App.argv);
+
+// Quit current app
+gui.App.quit();
+
+// Get the name field in manifest
+gui.App.manifest.name
+
+gui.App.addOriginAccessWhitelistEntry('http://github.com/', 'app', 'myapp', true);
+
+
+/* CLIPBOARD */
+
+// We can not create a clipboard, we have to receive the system clipboard
+var clipboard = gui.Clipboard.get();
+
+// Read from clipboard
+var text = clipboard.get('text');
+console.log(text);
+
+// Or write something
+clipboard.set('I love node-webkit :)', 'text');
+
+// And clear it!
+clipboard.clear();
+
+
+/* TRAY */
+
+// Create a tray icon
+var tray = new gui.Tray({ title: 'Tray', icon: 'img/icon.png' });
+
+// Give it a menu
+var menu = new gui.Menu();
+menu.append(new gui.MenuItem({ type: 'checkbox', label: 'box1' }));
+tray.menu = menu;
+
+// Remove the tray
+tray.remove();
+tray = null;
+
+
+/* SHELL */
+
+// Open URL with default browser.
+gui.Shell.openExternal('https://github.com/rogerwang/node-webkit');
+
+// Open a text file with default text editor.
+gui.Shell.openItem('test.txt');
+
+// Open a file in file explorer.
+gui.Shell.showItemInFolder('test.txt');
\ No newline at end of file
diff --git a/nw.gui/tsconfig.json b/nw.gui/tsconfig.json
new file mode 100644
index 0000000000..5b1dbeef4c
--- /dev/null
+++ b/nw.gui/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-webkit-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/oauth.js/oauth.js.d.ts b/oauth.js/index.d.ts
similarity index 100%
rename from oauth.js/oauth.js.d.ts
rename to oauth.js/index.d.ts
diff --git a/oauth.js/oauth.js-tests.ts b/oauth.js/oauth.js-tests.ts
index 81fa694b86..5ef55efad5 100644
--- a/oauth.js/oauth.js-tests.ts
+++ b/oauth.js/oauth.js-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="oauth.js.d.ts" />
+
 
 var encoded1: string = OAuth.percentEncode("abcあいう");
 var encoded2: string = OAuth.percentEncode(["abc", "あいう"]);
diff --git a/oauth.js/tsconfig.json b/oauth.js/tsconfig.json
new file mode 100644
index 0000000000..74b637f8db
--- /dev/null
+++ b/oauth.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "oauth.js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/oauth2-server/index.d.ts b/oauth2-server/index.d.ts
new file mode 100644
index 0000000000..0e3ff61006
--- /dev/null
+++ b/oauth2-server/index.d.ts
@@ -0,0 +1,423 @@
+// Type definitions for Node OAuth2 Server
+// Project: https://github.com/thomseddon/node-oauth2-server
+// Definitions by: Robbie Van Gorkom <https://github.com/vangorra>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* =================== USAGE ===================
+
+ import * as oauthserver from "oauth2-server";
+ var oauth = oauthserver();
+
+ =============================================== */
+
+
+
+
+import {RequestHandler} from "express";
+import {Request} from "express";
+
+declare function o(config: o.Config): o.OAuth2Server;
+
+declare namespace o {
+    interface OAuth2Server {
+        grant(): RequestHandler;
+        authorise(): any;
+        errorHandler(): any;
+    }
+
+    interface Config {
+        /**
+         * Model object
+         */
+        model: {};
+
+        /**
+         * grant types you wish to support, currently the module supports authorization_code,
+         * password, refresh_token and client_credentials
+         */
+        grants: string[];
+
+        /**
+         * If true errors will be logged to console. You may also pass a custom function, in
+         * which case that function will be called with the error as its first argument
+         * Default: false
+         */
+        debug?: boolean;
+
+        /**
+         * Life of access tokens in seconds
+         * If null, tokens will considered to never expire
+         * Default: 3600
+         */
+        accessTokenLifetime?: number;
+
+        /**
+         * Life of refresh tokens in seconds
+         * If null, tokens will considered to never expire
+         * Default: 1209600
+         */
+        refreshTokenLifetime?: number;
+
+        /**
+         * Life of auth codes in seconds
+         * Default: 30
+         */
+        authCodeLifetime?: number;
+
+        /**
+         * Regex to sanity check client id against before checking model. Note: the default
+         * just matches common client_id structures, change as needed
+         * Default: /^[a-z0-9-_]{3,40}$/i
+         */
+        clientIdRegex?: RegExp;
+
+        /**
+         * If true, non grant errors will not be handled internally (so you can ensure a
+         * consistent format with the rest of your api)
+         */
+        passthroughErrors?: boolean;
+
+        /**
+         * If true, next will be called even if a response has been sent (you probably don't want this)
+         */
+        continueAfterResponse?: boolean;
+    }
+
+    interface BaseModel {
+        /**
+         *
+         * @param bearerToken - The bearer token (access token) that has been provided
+         * @param callback
+         */
+        getAccessToken(bearerToken: string,
+            callback: GetAccessTokenCallback): void;
+
+        /**
+         *
+         * @param clientId
+         * @param clientSecret - If null, omit from search query (only search by clientId)
+         * @param callback
+         */
+        getClient(clientId: string,
+            clientSecret: string,
+            callback: GetClientCallback): void;
+
+        /**
+         *
+         * @param clientId
+         * @param grantType
+         * @param callback
+         */
+        grantTypeAllowed(clientId: string,
+            grantType: string,
+            callback: GrantTypeAllowedCallback): void;
+
+        /**
+         *
+         * @param accessToken
+         * @param clientId
+         * @param expires
+         * @param user
+         * @param callback
+         */
+        saveAccessToken(accessToken: string,
+            clientId: string,
+            expires: Date,
+            user: User,
+            callback: SaveAccessTokenCallback): void;
+    }
+
+    interface AuthorizationCodeModel extends BaseModel {
+        /**
+         *
+         * @param authCode
+         * @param callback
+         */
+        getAuthCode(authCode: string,
+            callback: GetAuthCodeCallback): void;
+
+        /**
+         *
+         * @param authCode
+         * @param clientId
+         * @param expires
+         * @param user - Whatever was passed as user to the codeGrant function (see example)
+         * @param callback
+         */
+        saveAuthCode(authCode: string,
+            clientId: string,
+            expires: Date,
+            user: User | string,
+            callback: SaveAuthCodeCallback): void;
+    }
+
+    interface PasswordModel extends BaseModel {
+        /**
+         *
+         * @param username
+         * @param password
+         * @param callback
+         */
+        getUser(username: string,
+            password: string,
+            callback: GetUserCallback): void;
+    }
+
+    interface RefreshTokenModel extends BaseModel {
+        /**
+         *
+         * @param refreshToken
+         * @param clientId
+         * @param expires
+         * @param user
+         * @param callback
+         */
+        saveRefreshToken(refreshToken: string,
+            clientId: string,
+            expires: Date,
+            user: User,
+            callback: SaveRefreshTokenCallback): void;
+
+        /**
+         *
+         * @param refreshToken - The bearer token (refresh token) that has been provided
+         * @param callback
+         */
+        getRefreshToken(refreshToken: string,
+            callback: GetRefreshTokenCallback): void;
+
+        /**
+         * The spec does not actually require that you revoke the old token - hence this is
+         * optional (Last paragraph: http://tools.ietf.org/html/rfc6749#section-6)
+         * @param refreshToken
+         * @param callback
+         */
+        revokeRefreshToken?(refreshToken: string,
+            callback: RevokeRefreshTokenCallback): void;
+    }
+
+    interface ExtensionModel extends BaseModel {
+        /**
+         *
+         * @param grantType
+         * @param req
+         * @param callback
+         */
+        extendedGrant(grantType: string,
+            req: Request,
+            callback: ExtendedGrantCallback): void;
+    }
+
+    interface ClientCredentialsModel extends BaseModel {
+        /**
+         *
+         * @param clientId
+         * @param clientSecret
+         * @param callback
+         */
+        getUserFromClient(clientId: string,
+            clientSecret: string,
+            callback: GetUserFromClientCallback): void;
+
+        /**
+         *
+         * @param type - accessToken or refreshToken
+         * @param req - The current express request
+         * @param callback
+         */
+        generateToken?(type: string,
+            req: Request,
+            callback: GenerateTokenCallback): void;
+    }
+
+    interface GenerateTokenCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         * @param token - string indicates success
+         * null indicates to revert to the default token generator
+         * object indicates a reissue (i.e. will not be passed to saveAccessToken/saveRefreshToken)
+         * Must contain the following keys (if object):
+         * string accessToken OR refreshToken dependant on type
+         */
+        (error: any, token: string | Object): void;
+    }
+
+    interface GetUserFromClientCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         * @param user - The user retrieved from storage or falsey to indicate an invalid user
+         * Saved in req.user
+         */
+        (error: any, user: User): void;
+    }
+
+    interface ExtendedGrantCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         * @param supported - Whether you support the grant type
+         * @param user - The user retrieved from storage or falsey to indicate an invalid user
+         * Saved in req.user
+         */
+        (error: any, supported: boolean, user: User): void;
+    }
+
+    interface RevokeRefreshTokenCallback {
+        /**
+         * Truthy to indicate an error
+         * @param error
+         */
+        (error: any): void;
+    }
+
+    interface GetRefreshTokenCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         * @param refreshToken - The refresh token retrieved form storage or falsey to indicate invalid refresh token
+         */
+        (error: any, refreshToken: RefreshToken): void;
+    }
+
+    interface SaveRefreshTokenCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         */
+        (error: any): void;
+    }
+
+    interface GetUserCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         * @param user - The user retrieved from storage or falsey to indicate an invalid user
+         * Saved in req.user
+         */
+        (error: any, user: User): void;
+    }
+
+    interface SaveAuthCodeCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         */
+        (error: any): void;
+    }
+
+    interface GetAuthCodeCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         * @param authCode - The authorization code retrieved form storage or falsey to indicate invalid code
+         */
+        (error: String, authCode: AuthCode): void
+    }
+
+    interface SaveAccessTokenCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         */
+        (error: any): void;
+    }
+
+    interface GetAccessTokenCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         * @param accessToken - The access token retrieved form storage or falsey to indicate invalid access token
+         */
+        (error: any, accessToken: AccessToken): void;
+    }
+
+    interface GetClientCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         * @param client - The client retrieved from storage or falsey to indicate an invalid client
+         * Saved in req.client
+         */
+        (error: any, client: Client): void;
+    }
+
+    interface GrantTypeAllowedCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         * @param allowed - Indicates whether the grantType is allowed for this clientId
+         */
+        (error: any, allowed: boolean): void;
+    }
+
+    interface RefreshToken {
+        /**
+         * client id associated with this token
+         */
+        clientId: string;
+
+        /**
+         * The date when it expires
+         * null to indicate the token never expires
+         */
+        expires: Date;
+
+        /**
+         *
+         */
+        userId: string;
+    }
+
+    interface AuthCode {
+        /**
+         * client id associated with this auth code
+         */
+        clientId: string;
+
+        /**
+         * The date when it expires
+         */
+        expires: Date;
+
+        /**
+         * The userId
+         */
+        userId: string;
+    }
+
+    interface User {
+        id: string;
+    }
+
+    interface Client {
+        clientId: string;
+
+        /**
+         * authorization_code grant type only
+         */
+        redirectUri: string;
+    }
+
+    interface AccessToken {
+        /**
+         * The date when it expires
+         * null to indicate the token never expires
+         */
+        expires: Date;
+
+        /**
+         * If a user key exists, this is saved as req.user
+         */
+        user?: User;
+
+        /**
+         * If a user key exists, this is saved as req.user
+         * Otherwise a userId key must exist, which is saved in req.user.id
+         */
+        userId?: string;
+    }
+}
+
+export = o;
diff --git a/oauth2-server/oauth2-server-tests.ts b/oauth2-server/oauth2-server-tests.ts
index a97ac2d995..56216edc8f 100644
--- a/oauth2-server/oauth2-server-tests.ts
+++ b/oauth2-server/oauth2-server-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../express/express.d.ts" />
-/// <reference path="oauth2-server.d.ts" />
+
 
 import * as express from "express";
 import * as oauthserver from "oauth2-server";
diff --git a/oauth2-server/oauth2-server.d.ts b/oauth2-server/oauth2-server.d.ts
deleted file mode 100644
index 8c562269e8..0000000000
--- a/oauth2-server/oauth2-server.d.ts
+++ /dev/null
@@ -1,424 +0,0 @@
-// Type definitions for Node OAuth2 Server
-// Project: https://github.com/thomseddon/node-oauth2-server
-// Definitions by: Robbie Van Gorkom <https://github.com/vangorra>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/* =================== USAGE ===================
-
- import * as oauthserver from "oauth2-server";
- var oauth = oauthserver();
-
- =============================================== */
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "oauth2-server" {
-    import {RequestHandler} from "express";
-    import {Request} from "express";
-
-    function o(config : o.Config) : o.OAuth2Server;
-
-    namespace o {
-        interface OAuth2Server {
-            grant() : RequestHandler;
-            authorise() : any;
-            errorHandler() : any;
-        }
-
-        interface Config {
-            /**
-             * Model object
-             */
-            model: {};
-
-            /**
-             * grant types you wish to support, currently the module supports authorization_code,
-             * password, refresh_token and client_credentials
-             */
-            grants: string[];
-
-            /**
-             * If true errors will be logged to console. You may also pass a custom function, in
-             * which case that function will be called with the error as its first argument
-             * Default: false
-             */
-            debug?: boolean;
-
-            /**
-             * Life of access tokens in seconds
-             * If null, tokens will considered to never expire
-             * Default: 3600
-             */
-            accessTokenLifetime?: number;
-
-            /**
-             * Life of refresh tokens in seconds
-             * If null, tokens will considered to never expire
-             * Default: 1209600
-             */
-            refreshTokenLifetime?: number;
-
-            /**
-             * Life of auth codes in seconds
-             * Default: 30
-             */
-            authCodeLifetime?: number;
-
-            /**
-             * Regex to sanity check client id against before checking model. Note: the default
-             * just matches common client_id structures, change as needed
-             * Default: /^[a-z0-9-_]{3,40}$/i
-             */
-            clientIdRegex?: RegExp;
-
-            /**
-             * If true, non grant errors will not be handled internally (so you can ensure a
-             * consistent format with the rest of your api)
-             */
-            passthroughErrors?: boolean;
-
-            /**
-             * If true, next will be called even if a response has been sent (you probably don't want this)
-             */
-            continueAfterResponse?: boolean;
-        }
-
-        interface BaseModel {
-            /**
-             *
-             * @param bearerToken - The bearer token (access token) that has been provided
-             * @param callback
-             */
-            getAccessToken(bearerToken:string,
-                           callback:GetAccessTokenCallback) : void;
-
-            /**
-             *
-             * @param clientId
-             * @param clientSecret - If null, omit from search query (only search by clientId)
-             * @param callback
-             */
-            getClient(clientId:string,
-                      clientSecret:string,
-                      callback:GetClientCallback) : void;
-
-            /**
-             *
-             * @param clientId
-             * @param grantType
-             * @param callback
-             */
-            grantTypeAllowed(clientId:string,
-                             grantType:string,
-                             callback:GrantTypeAllowedCallback) : void;
-
-            /**
-             *
-             * @param accessToken
-             * @param clientId
-             * @param expires
-             * @param user
-             * @param callback
-             */
-            saveAccessToken(accessToken:string,
-                            clientId:string,
-                            expires:Date,
-                            user:User,
-                            callback:SaveAccessTokenCallback) : void;
-        }
-
-        interface AuthorizationCodeModel extends BaseModel {
-            /**
-             *
-             * @param authCode
-             * @param callback
-             */
-            getAuthCode(authCode:string,
-                        callback:GetAuthCodeCallback) : void;
-
-            /**
-             *
-             * @param authCode
-             * @param clientId
-             * @param expires
-             * @param user - Whatever was passed as user to the codeGrant function (see example)
-             * @param callback
-             */
-            saveAuthCode(authCode:string,
-                         clientId:string,
-                         expires:Date,
-                         user:User|string,
-                         callback:SaveAuthCodeCallback) : void;
-        }
-
-        interface PasswordModel extends BaseModel {
-            /**
-             *
-             * @param username
-             * @param password
-             * @param callback
-             */
-            getUser(username:string,
-                    password:string,
-                    callback:GetUserCallback) : void;
-        }
-
-        interface RefreshTokenModel extends BaseModel {
-            /**
-             *
-             * @param refreshToken
-             * @param clientId
-             * @param expires
-             * @param user
-             * @param callback
-             */
-            saveRefreshToken(refreshToken:string,
-                             clientId:string,
-                             expires:Date,
-                             user:User,
-                             callback:SaveRefreshTokenCallback) : void;
-
-            /**
-             *
-             * @param refreshToken - The bearer token (refresh token) that has been provided
-             * @param callback
-             */
-            getRefreshToken(refreshToken:string,
-                            callback:GetRefreshTokenCallback) : void;
-
-            /**
-             * The spec does not actually require that you revoke the old token - hence this is
-             * optional (Last paragraph: http://tools.ietf.org/html/rfc6749#section-6)
-             * @param refreshToken
-             * @param callback
-             */
-            revokeRefreshToken?(refreshToken:string,
-                                callback:RevokeRefreshTokenCallback) : void;
-        }
-
-        interface ExtensionModel extends BaseModel {
-            /**
-             *
-             * @param grantType
-             * @param req
-             * @param callback
-             */
-            extendedGrant(grantType:string,
-                          req:Request,
-                          callback:ExtendedGrantCallback) : void;
-        }
-
-        interface ClientCredentialsModel extends BaseModel {
-            /**
-             *
-             * @param clientId
-             * @param clientSecret
-             * @param callback
-             */
-            getUserFromClient(clientId:string,
-                              clientSecret:string,
-                              callback:GetUserFromClientCallback) : void;
-
-            /**
-             *
-             * @param type - accessToken or refreshToken
-             * @param req - The current express request
-             * @param callback
-             */
-            generateToken?(type:string,
-                           req:Request,
-                           callback:GenerateTokenCallback) : void;
-        }
-
-        interface GenerateTokenCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             * @param token - string indicates success
-             * null indicates to revert to the default token generator
-             * object indicates a reissue (i.e. will not be passed to saveAccessToken/saveRefreshToken)
-             * Must contain the following keys (if object):
-             * string accessToken OR refreshToken dependant on type
-             */
-            (error:any, token:string|Object) : void;
-        }
-
-        interface GetUserFromClientCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             * @param user - The user retrieved from storage or falsey to indicate an invalid user
-             * Saved in req.user
-             */
-            (error:any, user:User) : void;
-        }
-
-        interface ExtendedGrantCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             * @param supported - Whether you support the grant type
-             * @param user - The user retrieved from storage or falsey to indicate an invalid user
-             * Saved in req.user
-             */
-            (error:any, supported:boolean, user:User) : void;
-        }
-
-        interface RevokeRefreshTokenCallback {
-            /**
-             * Truthy to indicate an error
-             * @param error
-             */
-            (error:any) : void;
-        }
-
-        interface GetRefreshTokenCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             * @param refreshToken - The refresh token retrieved form storage or falsey to indicate invalid refresh token
-             */
-            (error:any, refreshToken:RefreshToken) : void;
-        }
-
-        interface SaveRefreshTokenCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             */
-            (error:any) : void;
-        }
-
-        interface GetUserCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             * @param user - The user retrieved from storage or falsey to indicate an invalid user
-             * Saved in req.user
-             */
-            (error:any, user:User) : void;
-        }
-
-        interface SaveAuthCodeCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             */
-            (error:any) : void;
-        }
-
-        interface GetAuthCodeCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             * @param authCode - The authorization code retrieved form storage or falsey to indicate invalid code
-             */
-            (error:String, authCode:AuthCode) : void
-        }
-
-        interface SaveAccessTokenCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             */
-            (error:any) : void;
-        }
-
-        interface GetAccessTokenCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             * @param accessToken - The access token retrieved form storage or falsey to indicate invalid access token
-             */
-            (error:any, accessToken:AccessToken) : void;
-        }
-
-        interface GetClientCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             * @param client - The client retrieved from storage or falsey to indicate an invalid client
-             * Saved in req.client
-             */
-            (error:any, client:Client) : void;
-        }
-
-        interface GrantTypeAllowedCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             * @param allowed - Indicates whether the grantType is allowed for this clientId
-             */
-            (error:any, allowed:boolean) : void;
-        }
-
-        interface RefreshToken {
-            /**
-             * client id associated with this token
-             */
-            clientId : string;
-
-            /**
-             * The date when it expires
-             * null to indicate the token never expires
-             */
-            expires : Date;
-
-            /**
-             *
-             */
-            userId : string;
-        }
-
-        interface AuthCode {
-            /**
-             * client id associated with this auth code
-             */
-            clientId : string;
-
-            /**
-             * The date when it expires
-             */
-            expires : Date;
-
-            /**
-             * The userId
-             */
-            userId : string;
-        }
-
-        interface User {
-            id: string;
-        }
-
-        interface Client {
-            clientId: string;
-
-            /**
-             * authorization_code grant type only
-             */
-            redirectUri: string;
-        }
-
-        interface AccessToken {
-            /**
-             * The date when it expires
-             * null to indicate the token never expires
-             */
-            expires: Date;
-
-            /**
-             * If a user key exists, this is saved as req.user
-             */
-            user?: User;
-
-            /**
-             * If a user key exists, this is saved as req.user
-             * Otherwise a userId key must exist, which is saved in req.user.id
-             */
-            userId?: string;
-        }
-    }
-
-    export = o;
-}
diff --git a/oauth2-server/tsconfig.json b/oauth2-server/tsconfig.json
new file mode 100644
index 0000000000..37c57029c3
--- /dev/null
+++ b/oauth2-server/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "oauth2-server-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/obelisk.js/obelisk.js.d.ts b/obelisk.js/index.d.ts
similarity index 100%
rename from obelisk.js/obelisk.js.d.ts
rename to obelisk.js/index.d.ts
diff --git a/obelisk.js/obelisk.js-tests.ts b/obelisk.js/obelisk.js-tests.ts
index bc706cec8d..e47b474467 100644
--- a/obelisk.js/obelisk.js-tests.ts
+++ b/obelisk.js/obelisk.js-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="obelisk.js.d.ts"/>
-
 function test_brick() {
     var canvas = <HTMLCanvasElement>document.getElementById('canvas-demo');
 
diff --git a/obelisk.js/tsconfig.json b/obelisk.js/tsconfig.json
new file mode 100644
index 0000000000..d2fa90b1c7
--- /dev/null
+++ b/obelisk.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "obelisk.js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/object-assign/index.d.ts b/object-assign/index.d.ts
new file mode 100644
index 0000000000..dce1a14efb
--- /dev/null
+++ b/object-assign/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for object-assign 4.0.1
+// Project: https://github.com/sindresorhus/object-assign
+// Definitions by: Christopher Brown <https://github.com/chbrown>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function objectAssign(target: any, ...sources: any[]): any;
+export = objectAssign;
diff --git a/object-assign/object-assign-tests.ts b/object-assign/object-assign-tests.ts
index 53dfd5e707..61e05d9677 100644
--- a/object-assign/object-assign-tests.ts
+++ b/object-assign/object-assign-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="object-assign.d.ts" />
+
 import objectAssign = require("object-assign");
 
 function assign1() {
diff --git a/object-assign/object-assign.d.ts b/object-assign/object-assign.d.ts
deleted file mode 100644
index 52ef486c72..0000000000
--- a/object-assign/object-assign.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for object-assign 4.0.1
-// Project: https://github.com/sindresorhus/object-assign
-// Definitions by: Christopher Brown <https://github.com/chbrown>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "object-assign" {
-  function objectAssign(target: any, ...sources: any[]): any;
-  export = objectAssign;
-}
diff --git a/object-assign/tsconfig.json b/object-assign/tsconfig.json
new file mode 100644
index 0000000000..5c920654bf
--- /dev/null
+++ b/object-assign/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "object-assign-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/object-hash/index.d.ts b/object-hash/index.d.ts
new file mode 100644
index 0000000000..7ce1e2ce7f
--- /dev/null
+++ b/object-hash/index.d.ts
@@ -0,0 +1,51 @@
+// Type definitions for object-hash v0.5.0
+// Project: https://github.com/puleos/object-hash
+// Definitions by: Michael Zabka <https://github.com/misak113/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import HashStatic = ObjectHash.HashStatic;
+export = HashStatic;
+export as namespace objectHash;
+
+declare namespace ObjectHash {
+	export interface IOptions {
+		algorithm?: string;
+		encoding?: string;
+		excludeValues?: boolean;
+	}
+
+	interface HashTableItem {
+		value: any;
+		count: number;
+	}
+
+	interface HashTableItemWithKey extends HashTableItem {
+		hash: string;
+	}
+
+	export interface HashTable {
+		add(...values: any[]): HashTable;
+		remove(...values: any[]): HashTable;
+		hasKey(key: string): boolean;
+		getValue(key: string): any;
+		getCount(key: string): number;
+		table(): { [key: string]: HashTableItem };
+		toArray(): HashTableItemWithKey[];
+		reset(): HashTable;
+	}
+
+	export interface HashTableStatic {
+		(options?: IOptions): HashTable;
+	}
+
+	export interface Hash {
+		(object: any, options?: IOptions): string;
+		sha1(object: any): string;
+		keys(object: any): string;
+		MD5(object: any): string;
+		keysMD5(object: any): string;
+		HashTable: HashTableStatic;
+	}
+
+	export var HashStatic: Hash;
+}
diff --git a/object-hash/object-hash-tests.ts b/object-hash/object-hash-tests.ts
index e72c9e4891..4fbac3f461 100644
--- a/object-hash/object-hash-tests.ts
+++ b/object-hash/object-hash-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="object-hash.d.ts" />
+
 
 import hash = require('object-hash');
 
@@ -23,7 +23,7 @@ var options = {
 hashed = hash(obj, options);
 
 // HashTable
-var table: ObjectHash.HashTable;
+var table: any;
 table = hash.HashTable();
 table = hash.HashTable(options);
 
diff --git a/object-hash/object-hash.d.ts b/object-hash/object-hash.d.ts
deleted file mode 100644
index 6fab03d520..0000000000
--- a/object-hash/object-hash.d.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// Type definitions for object-hash v0.5.0
-// Project: https://github.com/puleos/object-hash
-// Definitions by: Michael Zabka <https://github.com/misak113/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace ObjectHash {
-	export interface IOptions {
-		algorithm?: string;
-		encoding?: string;
-		excludeValues?: boolean;
-	}
-
-	interface HashTableItem {
-		value: any;
-		count: number;
-	}
-
-	interface HashTableItemWithKey extends HashTableItem {
-		hash: string;
-	}
-
-	export interface HashTable {
-		add(...values: any[]): HashTable;
-		remove(...values: any[]): HashTable;
-		hasKey(key: string): boolean;
-		getValue(key: string): any;
-		getCount(key: string): number;
-		table(): { [key: string]: HashTableItem };
-		toArray(): HashTableItemWithKey[];
-		reset(): HashTable;
-	}
-
-	export interface HashTableStatic {
-		(options?: IOptions): HashTable;
-	}
-
-	export interface Hash {
-		(object: any, options?: IOptions): string;
-		sha1(object: any): string;
-		keys(object: any): string;
-		MD5(object: any): string;
-		keysMD5(object: any): string;
-		HashTable: HashTableStatic;
-	}
-
-	export var HashStatic: Hash;
-}
-
-declare module 'object-hash' {
-	import HashStatic = ObjectHash.HashStatic;
-	export = HashStatic;
-}
diff --git a/object-hash/tsconfig.json b/object-hash/tsconfig.json
new file mode 100644
index 0000000000..7630716b4c
--- /dev/null
+++ b/object-hash/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "object-hash-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/object-path/object-path.d.ts b/object-path/index.d.ts
similarity index 100%
rename from object-path/object-path.d.ts
rename to object-path/index.d.ts
diff --git a/object-path/object-path-tests.ts b/object-path/object-path-tests.ts
index c922e389b8..4516b336a8 100644
--- a/object-path/object-path-tests.ts
+++ b/object-path/object-path-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="object-path.d.ts" />
+
 
 import ObjectPath = require('object-path');
 
diff --git a/object-path/tsconfig.json b/object-path/tsconfig.json
new file mode 100644
index 0000000000..a086d4218c
--- /dev/null
+++ b/object-path/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "object-path-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/oblo-util/index.d.ts b/oblo-util/index.d.ts
new file mode 100644
index 0000000000..9fa2a26b2c
--- /dev/null
+++ b/oblo-util/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for oblo-util v0.6.4
+// Project: https://github.com/Oblosys/oblo-util
+// Definitions by: Martijn Schrage <https://github.com/Oblosys/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="jquery" />
+
+interface ObloUtilStatic {
+  debug : boolean;
+  
+  log(...args: any[]) : void;
+  error(...args: any[]) : void;
+  clip(min : number, max : number, x : number) : number;
+  square(x : number) : number;
+  replicate<X>(n : number, x : X) : X[];
+  pad(c : string, l : number, str : any) : string;
+  padZero(l : number, n : number) : string;
+  addslashes(str : string) : string;
+  showJSON(json : any, indentStr? : string, maxDepth? : number) : string;
+  showTime(date : Date) : string;
+  showDate(date : Date) : string;
+  readDate(dateStr : string) : Date;
+  setAttr($elt : JQuery, attrName : string, isSet : boolean) : void;
+}
+
+declare var util: ObloUtilStatic;
+
+declare module "oblo-util" {
+	export = util;
+}
diff --git a/oblo-util/oblo-util-tests.ts b/oblo-util/oblo-util-tests.ts
index 401611ce7d..4717bad412 100644
--- a/oblo-util/oblo-util-tests.ts
+++ b/oblo-util/oblo-util-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="oblo-util.d.ts" />
+
 
 util.debug = false;
 
diff --git a/oblo-util/oblo-util.d.ts b/oblo-util/oblo-util.d.ts
deleted file mode 100644
index b3921a6929..0000000000
--- a/oblo-util/oblo-util.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-// Type definitions for oblo-util v0.6.4
-// Project: https://github.com/Oblosys/oblo-util
-// Definitions by: Martijn Schrage <https://github.com/Oblosys/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface ObloUtilStatic {
-  debug : boolean;
-  
-  log(...args: any[]) : void;
-  error(...args: any[]) : void;
-  clip(min : number, max : number, x : number) : number;
-  square(x : number) : number;
-  replicate<X>(n : number, x : X) : X[];
-  pad(c : string, l : number, str : any) : string;
-  padZero(l : number, n : number) : string;
-  addslashes(str : string) : string;
-  showJSON(json : any, indentStr? : string, maxDepth? : number) : string;
-  showTime(date : Date) : string;
-  showDate(date : Date) : string;
-  readDate(dateStr : string) : Date;
-  setAttr($elt : JQuery, attrName : string, isSet : boolean) : void;
-}
-
-declare var util: ObloUtilStatic;
-
-declare module "oblo-util" {
-	export = util;
-}
diff --git a/oblo-util/tsconfig.json b/oblo-util/tsconfig.json
new file mode 100644
index 0000000000..dd5298dc31
--- /dev/null
+++ b/oblo-util/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "oblo-util-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/oboe/index.d.ts b/oboe/index.d.ts
new file mode 100644
index 0000000000..2f20af4eae
--- /dev/null
+++ b/oboe/index.d.ts
@@ -0,0 +1,68 @@
+// Type definitions for oboe v2.0.3
+// Project: https://github.com/jimhigson/oboe.js
+// Definitions by: Jared Klopper <https://github.com/optical>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare namespace oboe {
+	interface OboeFunction extends Function {
+		drop: Object;
+		(url: string): Oboe;
+		(options: Options): Oboe;
+		(stream: NodeJS.ReadableStream): Oboe;
+	}
+
+	interface Oboe {
+		done(callback: (result: any) => void): Oboe;
+
+		fail(callback: (result: FailReason) => void): Oboe;
+
+		node(pattern: string, callback: CallbackSignature): Oboe;
+		node(patterns: PatternMap): Oboe;
+
+		on(event: string, pattern: string, callback: CallbackSignature): Oboe;
+		on(eventPattern: string, callback: CallbackSignature): Oboe;
+
+		path(pattern: string, callback: CallbackSignature): Oboe;
+		path(listeners: any): Oboe;
+
+		removeListener(eventPattern: string, callback: CallbackSignature): Oboe;
+		removeListener(event: string, pattern: string, callback: CallbackSignature): Oboe;
+
+		start(callback: (status: number, headers: Object) => void): Oboe;
+
+		abort():void;
+
+		source: string;
+	}
+
+	interface CallbackSignature {
+          (node: any, pathOrHeaders: any, ancestors: Object[]): any;
+	}
+
+	interface Options {
+		url: string;
+		method?: string;
+		headers?: Object;
+		body?: any;
+		cached?: boolean;
+		withCredentials?: boolean;
+	}
+
+	interface FailReason {
+		thrown?: Error;
+		statusCode?: number;
+		body?: string;
+		jsonBody?: Object;
+	}
+
+	interface PatternMap {
+	  [pattern: string]: CallbackSignature
+	}
+}
+
+declare var oboe: oboe.OboeFunction;
+
+export = oboe;
+export as namespace oboe;
diff --git a/oboe/oboe-tests.ts b/oboe/oboe-tests.ts
index a1a870a141..e490ca2642 100644
--- a/oboe/oboe-tests.ts
+++ b/oboe/oboe-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="oboe.d.ts" />
+
 import oboe = require('oboe');
 
 oboe('friends.json')
diff --git a/oboe/oboe.d.ts b/oboe/oboe.d.ts
deleted file mode 100644
index e9c5705551..0000000000
--- a/oboe/oboe.d.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-// Type definitions for oboe v2.0.3
-// Project: https://github.com/jimhigson/oboe.js
-// Definitions by: Jared Klopper <https://github.com/optical>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare namespace oboe {
-	interface OboeFunction extends Function {
-		drop: Object;
-		(url: string): Oboe;
-		(options: Options): Oboe;
-		(stream: NodeJS.ReadableStream): Oboe;
-	}
-
-	interface Oboe {
-		done(callback: (result: any) => void): Oboe;
-
-		fail(callback: (result: FailReason) => void): Oboe;
-
-		node(pattern: string, callback: CallbackSignature): Oboe;
-		node(patterns: PatternMap): Oboe;
-
-		on(event: string, pattern: string, callback: CallbackSignature): Oboe;
-		on(eventPattern: string, callback: CallbackSignature): Oboe;
-
-		path(pattern: string, callback: CallbackSignature): Oboe;
-		path(listeners: any): Oboe;
-
-		removeListener(eventPattern: string, callback: CallbackSignature): Oboe;
-		removeListener(event: string, pattern: string, callback: CallbackSignature): Oboe;
-
-		start(callback: (status: number, headers: Object) => void): Oboe;
-
-		abort():void;
-
-		source: string;
-	}
-
-	interface CallbackSignature {
-          (node: any, pathOrHeaders: any, ancestors: Object[]): any;
-	}
-
-	interface Options {
-		url: string;
-		method?: string;
-		headers?: Object;
-		body?: any;
-		cached?: boolean;
-		withCredentials?: boolean;
-	}
-
-	interface FailReason {
-		thrown?: Error;
-		statusCode?: number;
-		body?: string;
-		jsonBody?: Object;
-	}
-
-	interface PatternMap {
-	  [pattern: string]: CallbackSignature
-	}
-}
-
-declare var oboe: oboe.OboeFunction;
-
-declare module "oboe" {
-	export = oboe;
-}
diff --git a/oboe/tsconfig.json b/oboe/tsconfig.json
new file mode 100644
index 0000000000..e16b88cf00
--- /dev/null
+++ b/oboe/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "oboe-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/observe-js/index.d.ts b/observe-js/index.d.ts
new file mode 100644
index 0000000000..4b668bec16
--- /dev/null
+++ b/observe-js/index.d.ts
@@ -0,0 +1,248 @@
+// Type definitions for observe-js v0.5.5
+// Project: https://github.com/Polymer/observe-js
+// Definitions by: Oliver Herrmann <https://github.com/herrmanno/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace observejs {
+
+	/*----------------------
+		Observable
+	----------------------*/
+
+	interface Observable {
+		/**
+		 * Begins observation.
+		 * @param onChange the function that gets invoked if a change is detected
+		 * @param the target of observation
+		 */
+		open(onChange:(newValue:any, oldValue:any)=>any, receiver?:any):void
+
+		/**
+		 * Report any changes now (does nothing if there are no changes to report).
+		 */
+		deliver(): void
+
+		/**
+		 * If there are changes to report, ignore them. Returns the current value of the observation.
+		 */
+		discardChanges():void
+
+		/**
+		 * Ends observation. Frees resources and drops references to observed objects.
+		 */
+		close():void
+	}
+
+
+	/*----------------------
+		PathObserver
+	----------------------*/
+
+	interface PathObserver_static {
+		/**
+		 * Constructor
+		 * @param receiver the target for observation
+		 * @param path specifies the paht to observe. If path === '' the receiver itself gets observed.
+		 * @param defaultValue the defaultValue
+		 */
+		new(receiver:any, path:string, defaultValue?:any): PathObserver_instance
+	}
+
+	interface PathObserver_instance extends Observable {
+		/**
+		 * sets the observed value without notifying about the change.
+		 * @param value the value to set
+		 */
+		setValue(value:any): void
+	}
+
+	/**
+	 * Observes a "value-at-a-path" from a given object:
+	 */
+	var PathObserver: PathObserver_static
+
+
+	/*----------------------
+		ArrayObserver
+	----------------------*/
+
+	interface splice {
+
+		/**
+		 * the index position that the change occured
+		 */
+		index:number
+
+		/**
+		 * an array of values representing the sequence of removed elements
+		 */
+		removed: Array<any>
+
+		/**
+		 * the number of element which were inserted
+		 */
+		addedCount:number
+	}
+
+	interface ArrayObserver_static {
+
+		/**
+		 * Constructor
+		 * @param receiver the target for observation
+		 */
+		new(receiver:Array<any>): ArrayObserver_instance
+
+		/**
+		 * transforms a copy of an old state of an array into a copy of its current state.
+		 * @param previous array of old state
+		 * @param current array of current state
+		 * @param splices  splices to apply
+		 */
+		applySplices(previous:Array<any>, current:Array<any>, splices:Array<splice>):void
+	}
+
+	interface ArrayObserver_instance extends Observable {
+		open(onChange:(splices:Array<splice>)=>any):void
+	}
+
+	/**
+	 * ArrayObserver observes the index-positions of an Array and reports changes as the minimal set of "splices" which would have had the same effect.
+	 */
+	var ArrayObserver: ArrayObserver_static
+
+
+	/*----------------------
+		ObjectObserver
+	----------------------*/
+
+	interface Properties {
+		[key:string]:any
+	}
+
+	interface ObjectObserver_static {
+
+		/**
+		 * Constructor
+		 * @param receiver the target for observation
+		 */
+		new(receiver:any): ObjectObserver_instance
+	}
+
+	interface ObjectObserver_instance extends Observable {
+		open(onChange:(added:Properties, removed:Properties, changed:Properties, getOldValueFn:(property:string)=>any)=>any):void
+	}
+
+	/**
+	 * Observes the set of own-properties of an object and their values
+	 */
+	var ObjectObserver: ObjectObserver_static
+
+
+	/*----------------------
+		CompounObserver
+	----------------------*/
+
+	interface CompoundObserver_static {
+
+		/**
+		 * Constructor
+		 */
+		new(): CompoundObserver_instance
+	}
+
+	interface CompoundObserver_instance extends Observable {
+		open(onChange:(newValues:Array<any>, oldValue:Array<any>)=>any):void
+
+		/**
+		 * Adds the receivers property at the specified path to the list of observables.
+		 * @param receiver the target for observation
+		 * @param path specifies the paht to observe. If path === '' the receiver itself gets observed.
+		 */
+		addPath(receiver:any, path:string):void
+
+		/**
+		 * Adds an Observer to the list of observables.
+		 */
+		addObserver(observer:Observable):void
+
+	}
+
+	/**
+	 * CompoundObserver allows simultaneous observation of multiple paths and/or Observables.
+	 */
+	var CompoundObserver: CompoundObserver_static
+
+
+
+	/*----------------------
+		ObserverTransform
+	----------------------*/
+
+	interface ObserverTransform_static {
+
+		/**
+		 * Constructor
+		 * @param observer the observer to transform
+		 * @param getValue function that proxys getting a value
+		 * @param setValue function that proxys setting a value
+		 */
+		new(observer:Observable, getValue:(value:any)=>any, setValue:(value:any)=>any): ObserverTransform_instance
+
+		/**
+		 * Constructor
+		 * @param observer the observer to transform
+		 * @param valueFn function that gets invoked with all observed values. May return a single new value.
+		 */
+		new(observer:Observable, valueFn:(values:Array<any>)=>any): ObserverTransform_instance
+	}
+
+	interface ObserverTransform_instance extends Observable {
+		/**
+		 * sets the observed value without notifying about the change.
+		 * @param value the value to set
+		 */
+		setValue(value:any): void
+	}
+
+	/**
+	 * CompoundObserver allows simultaneous observation of multiple paths and/or Observables.
+	 */
+	var ObserverTransform: ObserverTransform_static
+
+
+	/*----------------------
+		Path
+	----------------------*/
+
+	interface Path {
+
+		/**
+		 * Returns the current value of the path from the provided object. If eval() is available,
+  		 * a compiled getter will be used for better performance. Like PathObserver above, undefined
+  		 * is returned unless you provide an overriding defaultValue.
+		 */
+		getValueFrom(object:any, defaultValue:any): any
+
+		/**
+		 * Attempts to set the value of the path from the provided object. Returns true IFF the path
+  		 * was reachable and set.
+		 */
+		getValueFrom(object:any, newValue:any): any
+	}
+}
+
+declare var PathObserver: typeof observejs.PathObserver;
+declare var ArrayObserver: typeof observejs.ArrayObserver;
+declare var ObjectObserver: typeof observejs.ObjectObserver;
+declare var CompoundObserver: typeof observejs.CompoundObserver;
+declare var ObserverTransform: typeof observejs.ObserverTransform;
+declare var Path: observejs.Path;
+
+export {
+	PathObserver,
+	ArrayObserver,
+	ObjectObserver,
+	CompoundObserver,
+	ObserverTransform,
+	Path
+};
diff --git a/observe-js/observe-js-tests.ts b/observe-js/observe-js-tests.ts
index 2c39fd1b50..23dc1159f3 100644
--- a/observe-js/observe-js-tests.ts
+++ b/observe-js/observe-js-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="observe-js.d.ts" />
+import {PathObserver, ArrayObserver, ObjectObserver, CompoundObserver, ObserverTransform} from 'observe-js';
 
 namespace observejs {
 
diff --git a/observe-js/observe-js.d.ts b/observe-js/observe-js.d.ts
deleted file mode 100644
index d24e8b2158..0000000000
--- a/observe-js/observe-js.d.ts
+++ /dev/null
@@ -1,250 +0,0 @@
-// Type definitions for observe-js v0.5.5
-// Project: https://github.com/Polymer/observe-js
-// Definitions by: Oliver Herrmann <https://github.com/herrmanno/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace observejs {
-
-	/*----------------------
-		Observable
-	----------------------*/
-
-	interface Observable {
-		/**
-		 * Begins observation.
-		 * @param onChange the function that gets invoked if a change is detected
-		 * @param the target of observation
-		 */
-		open(onChange:(newValue:any, oldValue:any)=>any, receiver?:any):void
-
-		/**
-		 * Report any changes now (does nothing if there are no changes to report).
-		 */
-		deliver(): void
-
-		/**
-		 * If there are changes to report, ignore them. Returns the current value of the observation.
-		 */
-		discardChanges():void
-
-		/**
-		 * Ends observation. Frees resources and drops references to observed objects.
-		 */
-		close():void
-	}
-
-
-	/*----------------------
-		PathObserver
-	----------------------*/
-
-	interface PathObserver_static {
-		/**
-		 * Constructor
-		 * @param receiver the target for observation
-		 * @param path specifies the paht to observe. If path === '' the receiver itself gets observed.
-		 * @param defaultValue the defaultValue
-		 */
-		new(receiver:any, path:string, defaultValue?:any): PathObserver_instance
-	}
-
-	interface PathObserver_instance extends Observable {
-		/**
-		 * sets the observed value without notifying about the change.
-		 * @param value the value to set
-		 */
-		setValue(value:any): void
-	}
-
-	/**
-	 * Observes a "value-at-a-path" from a given object:
-	 */
-	var PathObserver: PathObserver_static
-
-
-	/*----------------------
-		ArrayObserver
-	----------------------*/
-
-	interface splice {
-
-		/**
-		 * the index position that the change occured
-		 */
-		index:number
-
-		/**
-		 * an array of values representing the sequence of removed elements
-		 */
-		removed: Array<any>
-
-		/**
-		 * the number of element which were inserted
-		 */
-		addedCount:number
-	}
-
-	interface ArrayObserver_static {
-
-		/**
-		 * Constructor
-		 * @param receiver the target for observation
-		 */
-		new(receiver:Array<any>): ArrayObserver_instance
-
-		/**
-		 * transforms a copy of an old state of an array into a copy of its current state.
-		 * @param previous array of old state
-		 * @param current array of current state
-		 * @param splices  splices to apply
-		 */
-		applySplices(previous:Array<any>, current:Array<any>, splices:Array<splice>):void
-	}
-
-	interface ArrayObserver_instance extends Observable {
-		open(onChange:(splices:Array<splice>)=>any):void
-	}
-
-	/**
-	 * ArrayObserver observes the index-positions of an Array and reports changes as the minimal set of "splices" which would have had the same effect.
-	 */
-	var ArrayObserver: ArrayObserver_static
-
-
-	/*----------------------
-		ObjectObserver
-	----------------------*/
-
-	interface Properties {
-		[key:string]:any
-	}
-
-	interface ObjectObserver_static {
-
-		/**
-		 * Constructor
-		 * @param receiver the target for observation
-		 */
-		new(receiver:any): ObjectObserver_instance
-	}
-
-	interface ObjectObserver_instance extends Observable {
-		open(onChange:(added:Properties, removed:Properties, changed:Properties, getOldValueFn:(property:string)=>any)=>any):void
-	}
-
-	/**
-	 * Observes the set of own-properties of an object and their values
-	 */
-	var ObjectObserver: ObjectObserver_static
-
-
-	/*----------------------
-		CompounObserver
-	----------------------*/
-
-	interface CompoundObserver_static {
-
-		/**
-		 * Constructor
-		 */
-		new(): CompoundObserver_instance
-	}
-
-	interface CompoundObserver_instance extends Observable {
-		open(onChange:(newValues:Array<any>, oldValue:Array<any>)=>any):void
-
-		/**
-		 * Adds the receivers property at the specified path to the list of observables.
-		 * @param receiver the target for observation
-		 * @param path specifies the paht to observe. If path === '' the receiver itself gets observed.
-		 */
-		addPath(receiver:any, path:string):void
-
-		/**
-		 * Adds an Observer to the list of observables.
-		 */
-		addObserver(observer:Observable):void
-
-	}
-
-	/**
-	 * CompoundObserver allows simultaneous observation of multiple paths and/or Observables.
-	 */
-	var CompoundObserver: CompoundObserver_static
-
-
-
-	/*----------------------
-		ObserverTransform
-	----------------------*/
-
-	interface ObserverTransform_static {
-
-		/**
-		 * Constructor
-		 * @param observer the observer to transform
-		 * @param getValue function that proxys getting a value
-		 * @param setValue function that proxys setting a value
-		 */
-		new(observer:Observable, getValue:(value:any)=>any, setValue:(value:any)=>any): ObserverTransform_instance
-
-		/**
-		 * Constructor
-		 * @param observer the observer to transform
-		 * @param valueFn function that gets invoked with all observed values. May return a single new value.
-		 */
-		new(observer:Observable, valueFn:(values:Array<any>)=>any): ObserverTransform_instance
-	}
-
-	interface ObserverTransform_instance extends Observable {
-		/**
-		 * sets the observed value without notifying about the change.
-		 * @param value the value to set
-		 */
-		setValue(value:any): void
-	}
-
-	/**
-	 * CompoundObserver allows simultaneous observation of multiple paths and/or Observables.
-	 */
-	var ObserverTransform: ObserverTransform_static
-
-
-	/*----------------------
-		Path
-	----------------------*/
-
-	interface Path {
-
-		/**
-		 * Returns the current value of the path from the provided object. If eval() is available,
-  		 * a compiled getter will be used for better performance. Like PathObserver above, undefined
-  		 * is returned unless you provide an overriding defaultValue.
-		 */
-		getValueFrom(object:any, defaultValue:any): any
-
-		/**
-		 * Attempts to set the value of the path from the provided object. Returns true IFF the path
-  		 * was reachable and set.
-		 */
-		getValueFrom(object:any, newValue:any): any
-	}
-}
-
-declare module "observe-js" {
-	var PathObserver: typeof observejs.PathObserver;
-	var ArrayObserver: typeof observejs.ArrayObserver;
-	var ObjectObserver: typeof observejs.ObjectObserver;
-	var CompoundObserver: typeof observejs.CompoundObserver;
-	var ObserverTransform: typeof observejs.ObserverTransform;
-	var Path: observejs.Path;
-
-	export {
-		PathObserver,
-		ArrayObserver,
-		ObjectObserver,
-		CompoundObserver,
-		ObserverTransform,
-		Path
-	};
-}
diff --git a/observe-js/tsconfig.json b/observe-js/tsconfig.json
new file mode 100644
index 0000000000..24c03a02b7
--- /dev/null
+++ b/observe-js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "observe-js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/oclazyload/index.d.ts b/oclazyload/index.d.ts
new file mode 100644
index 0000000000..574b037b70
--- /dev/null
+++ b/oclazyload/index.d.ts
@@ -0,0 +1,149 @@
+// Type definitions for oc.LazyLoad
+// Project: https://github.com/ocombe/ocLazyLoad
+// Definitions by: Roland Zwaga <https://github.com/rolandzwaga>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+
+declare namespace oc {
+
+    interface ILazyLoad {
+        /**
+         * Loads a module or a list of modules into Angular.
+         *
+         * @param module The name of a predefined module config object, or a module config object, or an array of either
+         * @param config Options to be used when loading the modules
+         */
+        load(module: string|ITypedModuleConfig|IModuleConfig|(string|ITypedModuleConfig|IModuleConfig)[], config?: IOptionsConfig): ng.IPromise<any>;
+
+        /**
+         * Defines a module config object.
+         * @param config The module config object
+         * @returns The module config object that was passed in
+         */
+        setModuleConfig(config: IModuleConfig): IModuleConfig;
+
+        /**
+         * Gets the specified module config object.
+         * @param name The name of the module config object to get
+         */
+        getModuleConfig(name: string): IModuleConfig;
+
+        /**
+         * Gets the list of loaded module names.
+         */
+        getModules(): string[];
+
+        /**
+         * Checks if a module name, or list of modules names, has been previously loaded into Angular.
+         */
+        isLoaded(moduleName: string|string[]): boolean;
+
+        /**
+         * Injects a module with the associated name into Angular. Useful for manual injection when loading through RequireJS, SystemJS, etc. Useful in
+         * conjunction with the toggleWatch() method.
+         */
+        inject(moduleName: string|string[]): ng.IPromise<any>;
+
+        /**
+         * Enables or disables watching Angular for new modules. Useful in conjunction with the inject() method. Make sure to not keep the watch enabled
+         * indefinitely, or unexpected results may occur.
+         */
+        toggleWatch(watch: boolean): void;
+    }
+
+    interface ITypedModuleConfig extends IOptionsConfig {
+        /**
+         * The file extension, without the period. For example, 'html'.
+         */
+        type: string;
+
+        /**
+         * The file path, including file name.
+         */
+        path: string;
+    }
+
+    interface IModuleConfig extends IOptionsConfig {
+        /**
+         * The name of the module for easy retrieval later.
+         */
+        name?: string;
+
+        /**
+         * The list of files to be loaded for this module.
+         */
+        files: string[];
+    }
+
+    interface IOptionsConfig extends ng.IRequestShortcutConfig {
+        /**
+         * If true, bypasses browser cache by appending a timestamp to URLs. Defaults to true.
+         */
+        cache?: boolean;
+
+        /**
+         * If true, a module config will be invoked each time the module is reloaded. Use with caution, as re-invoking configs can lead to unexpected results.
+         * Defaults to false.
+         */
+        reconfig?: boolean;
+
+        /**
+         * If true, a module run block will be invoked each time the module is reloaded. Use with caution, as re-invoking run blocks can lead to unexpected results.
+         * Defaults to false.
+         */
+        rerun?: boolean;
+
+        /**
+         * If true, will load files in a series, instead of in parallel. Defaults to false.
+         */
+        serie?: boolean;
+
+        /**
+         * If set, will insert files immediately before the provided CSS selector, instead of the default behavior of inserting files immediately before the
+         * last child of the <head> element. Defaults to undefined.
+         */
+        insertBefore?: string;
+    }
+
+    interface ILazyLoadProvider {
+        /**
+         * Configures the main service provider.
+         * @param config The configuration settings to use
+         */
+        config(config: IProviderConfig): void;
+    }
+
+    interface IProviderConfig {
+        /**
+         * If true, all errors will be logged to the console, in addition to rejecting a promise. Defaults to false.
+         */
+        debug?: boolean;
+
+        /**
+         * If true, an event will be broadcast whenever a module, component or file is loaded. Events that can be broadcast are: ocLazyLoad.moduleLoaded,
+         * ocLazyLoad.moduleReloaded, ocLazyLoad.componentLoaded, ocLazyLoad.fileLoaded. Defaults to false.
+         */
+        events?: boolean;
+
+        /**
+         * Predefines a set of module configurations for later use. A name must be provided for each module so that it can be retrieved later.
+         */
+        modules?: IModuleConfig[];
+    }
+}
+
+declare namespace angular {
+    interface IAngularStatic {
+        /**
+         * The angular.module is a global place for creating, registering and retrieving Angular modules. All modules (angular core or 3rd party) that should be available to an application must be registered using this mechanism.
+         *
+         * When passed two or more arguments, a new module is created. If passed only one argument, an existing module (the name passed as the first argument to module) is retrieved.
+         *
+         * @param name The name of the module to create or retrieve.
+         * @param requires The names of modules this module depends on, and/or ocLazyLoad module configurations. If specified then new module is being created. If unspecified then the module is being retrieved for further configuration.
+         * @param configFn Optional configuration function for the module.
+         */
+        module(name: string, requires?: (string|oc.IModuleConfig)[], configFn?: Function): IModule;
+    }
+}
diff --git a/oclazyload/oclazyload-tests.ts b/oclazyload/oclazyload-tests.ts
index e9c4661e29..f281d3b798 100644
--- a/oclazyload/oclazyload-tests.ts
+++ b/oclazyload/oclazyload-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="oclazyload.d.ts" />
+
 
 angular.module('app', ['oc.lazyLoad']).config(['$ocLazyLoadProvider', function ($ocLazyLoadProvider: oc.ILazyLoadProvider) {
     $ocLazyLoadProvider.config({
diff --git a/oclazyload/oclazyload.d.ts b/oclazyload/oclazyload.d.ts
deleted file mode 100644
index d799bec64c..0000000000
--- a/oclazyload/oclazyload.d.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-// Type definitions for oc.LazyLoad
-// Project: https://github.com/ocombe/ocLazyLoad
-// Definitions by: Roland Zwaga <https://github.com/rolandzwaga>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare namespace oc {
-
-    interface ILazyLoad {
-        /**
-         * Loads a module or a list of modules into Angular.
-         *
-         * @param module The name of a predefined module config object, or a module config object, or an array of either
-         * @param config Options to be used when loading the modules
-         */
-        load(module: string|ITypedModuleConfig|IModuleConfig|(string|ITypedModuleConfig|IModuleConfig)[], config?: IOptionsConfig): ng.IPromise<any>;
-
-        /**
-         * Defines a module config object.
-         * @param config The module config object
-         * @returns The module config object that was passed in
-         */
-        setModuleConfig(config: IModuleConfig): IModuleConfig;
-
-        /**
-         * Gets the specified module config object.
-         * @param name The name of the module config object to get
-         */
-        getModuleConfig(name: string): IModuleConfig;
-
-        /**
-         * Gets the list of loaded module names.
-         */
-        getModules(): string[];
-
-        /**
-         * Checks if a module name, or list of modules names, has been previously loaded into Angular.
-         */
-        isLoaded(moduleName: string|string[]): boolean;
-
-        /**
-         * Injects a module with the associated name into Angular. Useful for manual injection when loading through RequireJS, SystemJS, etc. Useful in
-         * conjunction with the toggleWatch() method.
-         */
-        inject(moduleName: string|string[]): ng.IPromise<any>;
-
-        /**
-         * Enables or disables watching Angular for new modules. Useful in conjunction with the inject() method. Make sure to not keep the watch enabled
-         * indefinitely, or unexpected results may occur.
-         */
-        toggleWatch(watch: boolean): void;
-    }
-
-    interface ITypedModuleConfig extends IOptionsConfig {
-        /**
-         * The file extension, without the period. For example, 'html'.
-         */
-        type: string;
-
-        /**
-         * The file path, including file name.
-         */
-        path: string;
-    }
-
-    interface IModuleConfig extends IOptionsConfig {
-        /**
-         * The name of the module for easy retrieval later.
-         */
-        name?: string;
-
-        /**
-         * The list of files to be loaded for this module.
-         */
-        files: string[];
-    }
-
-    interface IOptionsConfig extends ng.IRequestShortcutConfig {
-        /**
-         * If true, bypasses browser cache by appending a timestamp to URLs. Defaults to true.
-         */
-        cache?: boolean;
-
-        /**
-         * If true, a module config will be invoked each time the module is reloaded. Use with caution, as re-invoking configs can lead to unexpected results.
-         * Defaults to false.
-         */
-        reconfig?: boolean;
-
-        /**
-         * If true, a module run block will be invoked each time the module is reloaded. Use with caution, as re-invoking run blocks can lead to unexpected results.
-         * Defaults to false.
-         */
-        rerun?: boolean;
-
-        /**
-         * If true, will load files in a series, instead of in parallel. Defaults to false.
-         */
-        serie?: boolean;
-
-        /**
-         * If set, will insert files immediately before the provided CSS selector, instead of the default behavior of inserting files immediately before the
-         * last child of the <head> element. Defaults to undefined.
-         */
-        insertBefore?: string;
-    }
-
-    interface ILazyLoadProvider {
-        /**
-         * Configures the main service provider.
-         * @param config The configuration settings to use
-         */
-        config(config: IProviderConfig): void;
-    }
-
-    interface IProviderConfig {
-        /**
-         * If true, all errors will be logged to the console, in addition to rejecting a promise. Defaults to false.
-         */
-        debug?: boolean;
-
-        /**
-         * If true, an event will be broadcast whenever a module, component or file is loaded. Events that can be broadcast are: ocLazyLoad.moduleLoaded,
-         * ocLazyLoad.moduleReloaded, ocLazyLoad.componentLoaded, ocLazyLoad.fileLoaded. Defaults to false.
-         */
-        events?: boolean;
-
-        /**
-         * Predefines a set of module configurations for later use. A name must be provided for each module so that it can be retrieved later.
-         */
-        modules?: IModuleConfig[];
-    }
-}
-
-declare namespace angular {
-    interface IAngularStatic {
-        /**
-         * The angular.module is a global place for creating, registering and retrieving Angular modules. All modules (angular core or 3rd party) that should be available to an application must be registered using this mechanism.
-         *
-         * When passed two or more arguments, a new module is created. If passed only one argument, an existing module (the name passed as the first argument to module) is retrieved.
-         *
-         * @param name The name of the module to create or retrieve.
-         * @param requires The names of modules this module depends on, and/or ocLazyLoad module configurations. If specified then new module is being created. If unspecified then the module is being retrieved for further configuration.
-         * @param configFn Optional configuration function for the module.
-         */
-        module(name: string, requires?: (string|oc.IModuleConfig)[], configFn?: Function): IModule;
-    }
-}
diff --git a/oclazyload/tsconfig.json b/oclazyload/tsconfig.json
new file mode 100644
index 0000000000..e5a8ddc7cb
--- /dev/null
+++ b/oclazyload/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "oclazyload-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/office-js/index.d.ts b/office-js/index.d.ts
new file mode 100644
index 0000000000..6761ab646c
--- /dev/null
+++ b/office-js/index.d.ts
@@ -0,0 +1,11086 @@
+// Type definitions for Office.js
+// Project: http://dev.office.com
+// Definitions by: OfficeDev <https://github.com/OfficeDev>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*
+office-js
+Copyright (c) Microsoft Corporation
+*/
+
+declare namespace Office {
+    export var context: Context;
+    /**
+     * This method is called after the Office API was loaded.
+     * @param reason Indicates how the app was initialized
+     */
+    export function initialize(reason: InitializationReason): void;
+    /**
+     * Indicates if the large namespace for objects will be used or not.
+     * @param useShortNamespace  Indicates if 'true' that the short namespace will be used
+     */
+    export function useShortNamespace(useShortNamespace: boolean): void;
+    // Enumerations
+    export enum AsyncResultStatus {
+        /**
+         * Operation succeeded
+         */
+        Succeeded,
+        /**
+         * Operation failed, check error object
+         */
+        Failed
+    }
+    export enum InitializationReason {
+        /**
+         * Indicates the app was just inserted in the document
+         */
+        Inserted,
+        /**
+         * Indicates if the extension already existed in the document
+         */
+        DocumentOpened
+    }
+    // Objects
+    export interface AsyncResult {
+        asyncContext: any;
+        status: AsyncResultStatus;
+        error: Error;
+        value: any;
+    }
+    export interface Context {
+        contentLanguage: string;
+        displayLanguage: string;
+        license: string;
+        touchEnabled: boolean;
+        requirements: {
+            /**
+             * Check if the specified requirement set is supported by the host Office application.
+             * @param name - Set name. e.g.: "MatrixBindings".
+             * @param minVersion - The minimum required version.
+             */
+            isSetSupported(name: string, minVersion?: number): boolean;
+        }
+    }
+    export interface Error {
+        message: string;
+        name: string;
+    }
+}
+declare namespace OfficeExtension {
+    /** An abstract proxy object that represents an object in an Office document. You create proxy objects from the context (or from other proxy objects), add commands to a queue to act on the object, and then synchronize the proxy object state with the document by calling "context.sync()". */
+    class ClientObject {
+        /** The request context associated with the object */
+        context: ClientRequestContext;
+    }
+}
+declare namespace OfficeExtension {
+    interface LoadOption {
+        select?: string | string[];
+        expand?: string | string[];
+        top?: number;
+        skip?: number;
+    }
+    /** An abstract RequestContext object that facilitates requests to the host Office application. The "Excel.run" and "Word.run" methods provide a request context. */
+    class ClientRequestContext {
+        constructor(url?: string);
+        /** Collection of objects that are tracked for automatic adjustments based on surrounding changes in the document. */
+        trackedObjects: TrackedObjects;
+        /** Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties. */
+        load(object: ClientObject, option?: string | string[] | LoadOption): void;
+        /** Adds a trace message to the queue. If the promise returned by "context.sync()" is rejected due to an error, this adds a ".traceMessages" array to the OfficeExtension.Error object, containing all trace messages that were executed. These messages can help you monitor the program execution sequence and detect the cause of the error. */
+        trace(message: string): void;
+        /** Synchronizes the state between JavaScript proxy objects and the Office document, by executing instructions queued on the request context and retrieving properties of loaded Office objects for use in your code.�This method returns a promise, which is resolved when the synchronization is complete. */
+        sync<T>(passThroughValue?: T): IPromise<T>;
+    }
+}
+declare namespace OfficeExtension {
+    /** Contains the result for methods that return primitive types. The object's value property is retrieved from the document after "context.sync()" is invoked. */
+    class ClientResult<T> {
+        /** The value of the result that is retrieved from the document after "context.sync()" is invoked. */
+        value: T;
+    }
+}
+declare namespace OfficeExtension {
+    /** The error object returned by "context.sync()", if a promise is rejected due to an error while processing the request. */
+    class Error {
+        /** Error name: "OfficeExtension.Error".*/
+        name: string;
+        /** The error message passed through from the host Office application. */
+        message: string;
+        /** Stack trace, if applicable. */
+        stack: string;
+        /** Error code string, such as "InvalidArgument". */
+        code: string;
+        /** Trace messages (if any) that were added via a "context.trace()" invocation before calling "context.sync()". If there was an error, this contains all trace messages that were executed before the error occurred. These messages can help you monitor the program execution sequence and detect the case of the error. */
+        traceMessages: Array<string>;
+        /** Debug info, if applicable. The ".errorLocation" property can describe the object and method or property that caused the error. */
+        debugInfo: {
+            /** If applicable, will return the object type and the name of the method or property that caused the error. */
+            errorLocation?: string;
+        };
+    }
+}
+declare namespace OfficeExtension {
+    class ErrorCodes {
+        static accessDenied: string;
+        static generalException: string;
+        static activityLimitReached: string;
+    }
+}
+declare namespace OfficeExtension {
+    /** A Promise object that represents a deferred interaction with the host Office application. Promises can be chained via ".then", and errors can be caught via ".catch".  Remember to always use a ".catch" on the outer promise, and to return intermediary promises so as not to break the promise chain. */
+    interface IPromise<R> {
+        /**
+         * This method will be called once the previous promise has been resolved.
+         * Both the onFulfilled on onRejected callbacks are optional.
+         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+         */
+        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
+        /**
+         * This method will be called once the previous promise has been resolved.
+         * Both the onFulfilled on onRejected callbacks are optional.
+         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+         */
+        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => U): IPromise<U>;
+        /**
+         * This method will be called once the previous promise has been resolved.
+         * Both the onFulfilled on onRejected callbacks are optional.
+         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+         */
+        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => void): IPromise<U>;
+        /**
+         * This method will be called once the previous promise has been resolved.
+         * Both the onFulfilled on onRejected callbacks are optional.
+         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+         */
+        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
+        /**
+         * This method will be called once the previous promise has been resolved.
+         * Both the onFulfilled on onRejected callbacks are optional.
+         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+         */
+        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): IPromise<U>;
+        /**
+         * This method will be called once the previous promise has been resolved.
+         * Both the onFulfilled on onRejected callbacks are optional.
+         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+         */
+        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => void): IPromise<U>;
+        /**
+         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
+         * @param onRejected function to be called if or when the promise rejects.
+         */
+        catch<U>(onRejected?: (error: any) => IPromise<U>): IPromise<U>;
+        /**
+         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
+         * @param onRejected function to be called if or when the promise rejects.
+         */
+        catch<U>(onRejected?: (error: any) => U): IPromise<U>;
+        /**
+         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
+         * @param onRejected function to be called if or when the promise rejects.
+         */
+        catch<U>(onRejected?: (error: any) => void): IPromise<U>;
+    }
+}
+declare namespace OfficeExtension {
+    /** Collection of tracked objects, contained within a request context. See "context.trackedObjects" for more information. */
+    class TrackedObjects {
+        /** Track a new object for automatic adjustment based on surrounding changes in the document. Only some object types require this. If you are using an object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created. */
+        add(object: ClientObject): void;
+        /** Track a new object for automatic adjustment based on surrounding changes in the document. Only some object types require this. If you are using an object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created. */
+        add(objects: ClientObject[]): void;
+        /** Release the memory associated with an object that was previously added to this collection. Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect. */
+        remove(object: ClientObject): void;
+        /** Release the memory associated with an object that was previously added to this collection. Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect. */
+        remove(objects: ClientObject[]): void;
+    }
+}
+
+declare namespace Office {
+    /**
+     * Returns a promise of an object described in the expression. Callback is invoked only if method fails.
+     * @param expression The object to be retrieved. Example "bindings#BindingName", retrieves a binding promise for a binding named 'BindingName'
+     * @param callback The optional callback method
+     */
+    export function select(expression: string, callback?: (result: AsyncResult) => void): Binding;
+    // Enumerations
+    export enum ActiveView {
+        Read,
+        Edit
+    }
+    export enum BindingType {
+        /**
+         * Text based Binding
+         */
+        Text,
+        /**
+         * Matrix based Binding
+         */
+        Matrix,
+        /**
+         * Table based Binding
+         */
+        Table
+    }
+    export enum CoercionType {
+        /**
+         * Coerce as Text
+         */
+        Text,
+        /**
+         * Coerce as Matrix
+         */
+        Matrix,
+        /**
+         * Coerce as Table
+         */
+        Table,
+        /**
+         * Coerce as HTML
+         */
+        Html,
+        /**
+         * Coerce as Office Open XML
+         */
+        Ooxml,
+        /**
+         * Coerce as JSON object containing an array of the ids, titles, and indexes of the selected slides.
+         */
+        SlideRange,
+        /**
+        * Coerce as Image
+        */
+        Image
+    }
+    export enum DocumentMode {
+        /**
+         * Document in Read Only Mode
+         */
+        ReadOnly,
+        /**
+         * Document in Read/Write Mode
+         */
+        ReadWrite
+    }
+    export enum EventType {
+        /**
+         * Occurs when the user changes the current view of the document.
+         */
+        ActiveViewChanged,
+        /**
+         * Triggers when a binding level data change happens
+         */
+        BindingDataChanged,
+        /**
+         *  Triggers when a binding level selection happens
+         */
+        BindingSelectionChanged,
+        /**
+         * Triggers when a document level selection happens
+         */
+        DocumentSelectionChanged,
+        /**
+         * Triggers when a customXmlPart node was deleted
+         */
+        NodeDeleted,
+        /**
+         * Triggers when a customXmlPart node was inserted
+         */
+        NodeInserted,
+        /**
+         * Triggers when a customXmlPart node was replaced
+         */
+        NodeReplaced,
+        /**
+         * Triggers when settings change in a co-Auth session.
+         */
+        SettingsChanged,
+        /**
+         * Triggers when a Task selection happens in Project.
+         */
+        TaskSelectionChanged,
+        /**
+         *  Triggers when a Resource selection happens in Project.
+         */
+        ResourceSelectionChanged,
+        /**
+         * Triggers when a View selection happens in Project.
+         */
+        ViewSelectionChanged
+    }
+    export enum FileType {
+        /**
+         * Returns the file as plain text
+         */
+        Text,
+        /**
+         * Returns the file as a byte array
+         */
+        Compressed,
+        /**
+         * Returns the file in PDF format as a byte array
+         */
+        Pdf
+    }
+    export enum FilterType {
+        /**
+         * Returns all items
+         */
+        All,
+        /**
+         * Returns only visible items
+         */
+        OnlyVisible
+    }
+    export enum GoToType {
+        /**
+         * Goes to a binding object using the specified binding id.
+         */
+        Binding,
+        /**
+         * Goes to a named item using that item's name.
+         * In Excel, you can use any structured reference for a named range or table: "Worksheet2!Table1"
+         */
+        NamedItem,
+        /**
+         * Goes to a slide using the specified id.
+         */
+        Slide,
+        /**
+         * Goes to the specified index by slide number or enum Office.Index
+         */
+        Index
+    }
+    export enum Index {
+        First,
+        Last,
+        Next,
+        Previous
+    }
+    export enum SelectionMode {
+        Default,
+        Selected,
+        None
+    }
+    export enum ValueFormat {
+        /**
+         * Returns items without format
+         */
+        Unformatted,
+        /**
+         * Returns items with format
+         */
+        Formatted
+    }
+    // Objects
+    export interface Binding {
+        document: Document;
+        /**
+         * Id of the Binding
+         */
+        id: string;
+        type: BindingType;
+        /**
+         * Adds an event handler to the object using the specified event type.
+         * @param eventType The event type. For binding it can be 'bindingDataChanged' and 'bindingSelectionChanged'
+         * @param handler The name of the handler
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        addHandlerAsync(eventType: EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Returns the current selection.
+         * @param options Syntax example: {coercionType: 'matrix,'valueFormat: 'formatted', filterType:'all'}
+         *       coercionType: The expected shape of the selection. If not specified returns the bindingType shape. Use Office.CoercionType or text value.
+         *       valueFormat: Get data with or without format. Use Office.ValueFormat or text value.
+         *       startRow: Used in partial get for table/matrix. Indicates the start row.
+         *       startColumn: Used in partial get for table/matrix. Indicates the start column.
+         *       rowCount: Used in partial get for table/matrix. Indicates the number of rows from the start row.
+         *       columnCount: Used in partial get for table/matrix. Indicates the number of columns from the start column.
+         *       filterType: Get the visible or all the data. Useful when filtering data. Use Office.FilterType or text value.
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getDataAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Removes an event handler from the object using the specified event type.
+         * @param eventType The event type. For binding can be 'bindingDataChanged' and 'bindingSelectionChanged'
+         * @param options Syntax example: {handler:eventHandler}
+         *       handler: Indicates a specific handler to be removed, if not specified all handlers are removed
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        removeHandlerAsync(eventType: EventType, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Writes the specified data into the current selection.
+         * @param data The data to be set. Either a string or value, 2d array or TableData object
+         * @param options Syntax example: {coercionType:Office.CoercionType.Matrix} or {coercionType: 'matrix'}
+         *       coercionType: Explicitly sets the shape of the data object. Use Office.CoercionType or text value. If not supplied is inferred from the data type.
+         *       startRow: Used in partial set for table/matrix. Indicates the start row.
+         *       startColumn: Used in partial set for table/matrix. Indicates the start column.
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        setDataAsync(data: TableData|any, options?: any, callback?: (result: AsyncResult) => void): void;
+    }
+    export interface Bindings {
+        document: Document;
+        /**
+         * Creates a binding against a named object in the document
+         * @param itemName Name of the bindable object in the document. For Example 'MyExpenses' table in Excel."
+         * @param bindingType The Office BindingType for the data
+         * @param options Syntax example: {id: "BindingID"}
+         *       id: Name of the binding, autogenerated if not supplied.
+         *       asyncContext: Object keeping state for the callback
+         *       columns: The string[] of the columns involved in the binding
+         * @param callback The optional callback method
+         */
+        addFromNamedItemAsync(itemName: string, bindingType: BindingType, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Create a binding by prompting the user to make a selection on the document.
+         * @param bindingType The Office BindingType for the data
+         * @param options addFromPromptAsyncOptions- e.g. {promptText: "Please select data", id: "mySales"}
+         *       promptText: Greet your users with a friendly word.
+         *       asyncContext: Object keeping state for the callback
+         *       id: Identifier.
+         *       sampleData: A TableData that gives sample table in the Dialog.TableData.Headers is [][] of string.
+         * @param callback The optional callback method
+         */
+        addFromPromptAsync(bindingType: BindingType, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Create a binding based on what the user's current selection.
+         * @param bindingType The Office BindingType for the data
+         * @param options addFromSelectionAsyncOptions- e.g. {id: "BindingID"}
+         *       id: Identifier.
+         *       asyncContext: Object keeping state for the callback
+         *       columns: The string[] of the columns involved in the binding
+         *       sampleData: A TableData that gives sample table in the Dialog.TableData.Headers is [][] of string.
+         * @param callback The optional callback method
+         */
+        addFromSelectionAsync(bindingType: BindingType, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Gets an array with all the binding objects in the document.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getAllAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Retrieves a binding based on its Name
+         * @param id The binding id
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getByIdAsync(id: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Removes the binding from the document
+         * @param id The binding id
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        releaseByIdAsync(id: string, options?: any, callback?: (result: AsyncResult) => void): void;
+    }
+    export interface Context {
+        document: Document;
+    }
+    export interface CustomXmlNode {
+        baseName: string;
+        namespaceUri: string;
+        nodeType: string;
+        /**
+         * Gets the nodes associated with the xPath expression.
+         * @param xPath The xPath expression
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getNodesAsync(xPath: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Gets the node value.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getNodeValueAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Asynchronously gets the text of an XML node in a custom XML part.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getTextAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Gets the node's XML.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getXmlAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Sets the node value.
+         * @param value The value to be set on the node
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        setNodeValueAsync(value: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Asynchronously sets the text of an XML node in a custom XML part.
+         * @param text Required. The text value of the XML node.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        setTextAsync(text: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Sets the node XML.
+         * @param xml The XML to be set on the node
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        setXmlAsync(xml: string, options?: any, callback?: (result: AsyncResult) => void): void;
+    }
+    export interface CustomXmlPart {
+        builtIn: boolean;
+        id: string;
+        namespaceManager: CustomXmlPrefixMappings;
+        /**
+         * Adds an event handler to the object using the specified event type.
+         * @param eventType The event type. For CustomXmlPartNode it can be 'nodeDeleted', 'nodeInserted' or 'nodeReplaced'
+         * @param handler The name of the handler
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        addHandlerAsync(eventType: EventType, handler?: (result: any) => void, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Deletes the Custom XML Part.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        deleteAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Gets the nodes associated with the xPath expression.
+         * @param xPath The xPath expression
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getNodesAsync(xPath: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Gets the XML for the Custom XML Part.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getXmlAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Removes an event handler from the object using the specified event type.
+         * @param eventType The event type. For CustomXmlPartNode it can be 'nodeDeleted', 'nodeInserted' or 'nodeReplaced'
+         * @param options Syntax example: {handler:eventHandler}
+         *       handler: Indicates a specific handler to be removed, if not specified all handlers are removed
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        removeHandlerAsync(eventType: EventType, options?: any, callback?: (result: AsyncResult) => void): void;
+    }
+    export interface CustomXmlParts {
+        /**
+         * Asynchronously adds a new custom XML part to a file.
+         * @param xml The XML to add to the newly created custom XML part.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         */
+        addAsync(xml: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Asynchronously gets the specified custom XML part by its id.
+         * @param id The id of the custom XML part.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         */
+        getByIdAsync(id: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Asynchronously gets the specified custom XML part(s) by its namespace.
+         * @param ns  The namespace to search.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         */
+        getByNamespaceAsync(ns: string, options?: any, callback?: (result: AsyncResult) => void): void;
+    }
+    export interface CustomXmlPrefixMappings {
+        /**
+         * Adds a namespace.
+         * @param prefix The namespace prefix
+         * @param ns The namespace URI
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        addNamespaceAsync(prefix: string, ns: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Gets a namespace  with the specified prefix
+         * @param prefix The namespace prefix
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getNamespaceAsync(prefix: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Gets a prefix  for  the specified URI
+         * @param ns The namespace URI
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getPrefixAsync(ns: string, options?: any, callback?: (result: AsyncResult) => void): void;
+    }
+    export interface Document {
+        bindings: Bindings;
+        customXmlParts: CustomXmlParts;
+        mode: DocumentMode;
+        settings: Settings;
+        url: string;
+        /**
+         * Adds an event handler for the specified event type.
+         * @param eventType The event type. For document can be 'DocumentSelectionChanged'
+         * @param handler The name of the handler
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        addHandlerAsync(eventType: EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Returns the current view of the presentation.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getActiveViewAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Gets the entire file in slices of up to 4MB.
+         * @param fileType The format in which the file will be returned
+         * @param options Syntax example: {sliceSize:1024}
+         *       sliceSize: Specifies the desired slice size (in bytes) up to 4MB. If not specified a default slice size of 4MB will be used.
+         * @param callback The optional callback method
+         */
+        getFileAsync(fileType: FileType, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Gets file properties of the current document.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getFilePropertiesAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Returns the current selection.
+         * @param coercionType The expected shape of the selection.
+         * @param options Syntax example: {valueFormat: 'formatted', filterType:'all'}
+         *       valueFormat: Get data with or without format. Use Office.ValueFormat or text value.
+         *       filterType: Get the visible or all the data. Useful when filtering data. Use Office.FilterType or text value.
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getSelectedDataAsync(coercionType: CoercionType, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Goes to the specified object or location in the document.
+         * @param id The identifier of the object or location to go to.
+         * @param goToType The type of the location to go to.
+         * @param options Syntax example: {asyncContext:context}
+         *       selectionMode: Use Office.SelectionMode or text value.
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        goToByIdAsync(id: string|number, goToType: GoToType, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Removes an event handler for the specified event type.
+         * @param eventType The event type. For document can be 'DocumentSelectionChanged'
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         *       handler: The name of the handler. If not specified all handlers are removed
+         * @param callback The optional callback method
+         */
+        removeHandlerAsync(eventType: EventType, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Writes the specified data into the current selection.
+         * @param data The data to be set. Either a string or value, 2d array or TableData object
+         * @param options Syntax example: {coercionType:Office.CoercionType.Matrix} or {coercionType: 'matrix'}
+         *       coercionType: Explicitly sets the shape of the data object. Use Office.CoercionType or text value. If not supplied is inferred from the data type.
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        setSelectedDataAsync(data: string|TableData|any[][], options?: any, callback?: (result: AsyncResult) => void): void;
+    }
+    export interface File {
+        size: number;
+        sliceCount: number;
+        /**
+         * Closes the File.
+         * @param callback The optional callback method
+         */
+        closeAsync(callback?: (result: AsyncResult) => void): void;
+        /**
+         * Gets the specified slice.
+         * @param sliceIndex The index of the slice to be retrieved
+         * @param callback The optional callback method
+         */
+        getSliceAsync(sliceIndex: number, callback?: (result: AsyncResult) => void): void;
+    }
+    export interface FileProperties {
+        /**
+         * File's URL
+         */
+        url: string
+    }
+    export interface MatrixBinding extends Binding {
+        columnCount: number;
+        rowCount: number;
+    }
+    export interface Settings {
+        /**
+         * Adds an event handler for the object using the specified event type.
+         * @param eventType The event type. For settings can be 'settingsChanged'
+         * @param handler The name of the handler
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        addHandlerAsync(eventType: EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Retrieves the setting with the specified name.
+         * @param settingName The name of the setting
+         */
+        get(name: string): any;
+        /**
+         * Gets the latest version of the settings object.
+         * @param callback The optional callback method
+         */
+        refreshAsync(callback?: (result: AsyncResult) => void): void;
+        /**
+         * Removes the setting with the specified name.
+         * @param settingName The name of the setting
+         */
+        remove(name: string): void;
+        /**
+         * Removes an event handler for the specified event type.
+         * @param eventType The event type. For settings can be 'settingsChanged'
+         * @param options Syntax example: {handler:eventHandler}
+         *       handler: Indicates a specific handler to be removed, if not specified all handlers are removed
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        removeHandlerAsync(eventType: EventType, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Saves all settings.
+         * @param options Syntax example: {overwriteIfStale:false}
+         *       overwriteIfStale: Indicates whether the setting will be replaced if stale.
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        saveAsync(callback?: (result: AsyncResult) => void): void;
+        /**
+         * Sets a value for the setting with the specified name.
+         * @param settingName The name of the setting
+         * @param value The value for the setting
+         */
+        set(name: string, value: any): void;
+    }
+    export interface Slice {
+        data: any;
+        index: number;
+        size: number;
+    }
+    export interface TableBinding extends Binding {
+        columnCount: number;
+        hasHeaders: boolean;
+        rowCount: number;
+        /**
+         * Adds the specified columns to the table
+         * @param tableData  A TableData object with the headers and rows
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        addColumnsAsync(tableData: TableData|any[][], options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Adds the specified rows to the table
+         * @param rows  A 2D array with the rows to add
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        addRowsAsync(rows: TableData|any[][], options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Clears the table
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        deleteAllDataValuesAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Clears formatting on the bound table.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        clearFormatsAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Gets the formatting on specified items in the table.
+         * @param cellReference An object literal containing name-value pairs that specify the range of cells to get formatting from.
+         * @param formats An array specifying the format properties to get.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getFormatsAsync(cellReference?: any, formats?: any[], options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Sets formatting on specified items and data in the table.
+         * @param formatsInfo Array elements are themselves three-element arrays:[target, type, formats]
+         *       target: The identifier of the item to format. String.
+         *       type: The kind of item to format. String.
+         *       formats: An object literal containing a list of property name-value pairs that define the formatting to apply.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        setFormatsAsync(formatsInfo?: any[], options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Updates table formatting options on the bound table.
+         * @param tableOptions An object literal containing a list of property name-value pairs that define the table options to apply.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        setTableOptionsAsync(tableOptions: any, options?: any, callback?: (result: AsyncResult) => void): void;
+    }
+    export class TableData {
+        constructor(rows: any[][], headers: any[]);
+        constructor();
+        headers: any[];
+        rows: any[][];
+    }
+    export enum Table {
+        All,
+        Data,
+        Headers
+    }
+    export interface TextBinding extends Binding { }
+    export enum ProjectProjectFields {
+        CurrencyDigits,
+        CurrencySymbol,
+        CurrencySymbolPosition,
+        DurationUnits,
+        GUID,
+        Finish,
+        Start,
+        ReadOnly,
+        VERSION,
+        WorkUnits,
+        ProjectServerUrl,
+        WSSUrl,
+        WSSList
+    }
+    export enum ProjectResourceFields {
+        Accrual,
+        ActualCost,
+        ActualOvertimeCost,
+        ActualOvertimeWork,
+        ActualOvertimeWorkProtected,
+        ActualWork,
+        ActualWorkProtected,
+        BaseCalendar,
+        Baseline10BudgetCost,
+        Baseline10BudgetWork,
+        Baseline10Cost,
+        Baseline10Work,
+        Baseline1BudgetCost,
+        Baseline1BudgetWork,
+        Baseline1Cost,
+        Baseline1Work,
+        Baseline2BudgetCost,
+        Baseline2BudgetWork,
+        Baseline2Cost,
+        Baseline2Work,
+        Baseline3BudgetCost,
+        Baseline3BudgetWork,
+        Baseline3Cost,
+        Baseline3Work,
+        Baseline4BudgetCost,
+        Baseline4BudgetWork,
+        Baseline4Cost,
+        Baseline4Work,
+        Baseline5BudgetCost,
+        Baseline5BudgetWork,
+        Baseline5Cost,
+        Baseline5Work,
+        Baseline6BudgetCost,
+        Baseline6BudgetWork,
+        Baseline6Cost,
+        Baseline6Work,
+        Baseline7BudgetCost,
+        Baseline7BudgetWork,
+        Baseline7Cost,
+        Baseline7Work,
+        Baseline8BudgetCost,
+        Baseline8BudgetWork,
+        Baseline8Cost,
+        Baseline8Work,
+        Baseline9BudgetCost,
+        Baseline9BudgetWork,
+        Baseline9Cost,
+        Baseline9Work,
+        BaselineBudgetCost,
+        BaselineBudgetWork,
+        BaselineCost,
+        BaselineWork,
+        BudgetCost,
+        BudgetWork,
+        ResourceCalendarGUID,
+        Code,
+        Cost1,
+        Cost10,
+        Cost2,
+        Cost3,
+        Cost4,
+        Cost5,
+        Cost6,
+        Cost7,
+        Cost8,
+        Cost9,
+        ResourceCreationDate,
+        Date1,
+        Date10,
+        Date2,
+        Date3,
+        Date4,
+        Date5,
+        Date6,
+        Date7,
+        Date8,
+        Date9,
+        Duration1,
+        Duration10,
+        Duration2,
+        Duration3,
+        Duration4,
+        Duration5,
+        Duration6,
+        Duration7,
+        Duration8,
+        Duration9,
+        Email,
+        End,
+        Finish1,
+        Finish10,
+        Finish2,
+        Finish3,
+        Finish4,
+        Finish5,
+        Finish6,
+        Finish7,
+        Finish8,
+        Finish9,
+        Flag10,
+        Flag1,
+        Flag11,
+        Flag12,
+        Flag13,
+        Flag14,
+        Flag15,
+        Flag16,
+        Flag17,
+        Flag18,
+        Flag19,
+        Flag2,
+        Flag20,
+        Flag3,
+        Flag4,
+        Flag5,
+        Flag6,
+        Flag7,
+        Flag8,
+        Flag9,
+        Group,
+        Units,
+        Name,
+        Notes,
+        Number1,
+        Number10,
+        Number11,
+        Number12,
+        Number13,
+        Number14,
+        Number15,
+        Number16,
+        Number17,
+        Number18,
+        Number19,
+        Number2,
+        Number20,
+        Number3,
+        Number4,
+        Number5,
+        Number6,
+        Number7,
+        Number8,
+        Number9,
+        OvertimeCost,
+        OvertimeRate,
+        OvertimeWork,
+        PercentWorkComplete,
+        CostPerUse,
+        Generic,
+        OverAllocated,
+        RegularWork,
+        RemainingCost,
+        RemainingOvertimeCost,
+        RemainingOvertimeWork,
+        RemainingWork,
+        ResourceGUID,
+        Cost,
+        Work,
+        Start,
+        Start1,
+        Start10,
+        Start2,
+        Start3,
+        Start4,
+        Start5,
+        Start6,
+        Start7,
+        Start8,
+        Start9,
+        StandardRate,
+        Text1,
+        Text10,
+        Text11,
+        Text12,
+        Text13,
+        Text14,
+        Text15,
+        Text16,
+        Text17,
+        Text18,
+        Text19,
+        Text2,
+        Text20,
+        Text21,
+        Text22,
+        Text23,
+        Text24,
+        Text25,
+        Text26,
+        Text27,
+        Text28,
+        Text29,
+        Text3,
+        Text30,
+        Text4,
+        Text5,
+        Text6,
+        Text7,
+        Text8,
+        Text9
+    }
+    export enum ProjectTaskFields {
+        ActualCost,
+        ActualDuration,
+        ActualFinish,
+        ActualOvertimeCost,
+        ActualOvertimeWork,
+        ActualStart,
+        ActualWork,
+        Text1,
+        Text10,
+        Finish10,
+        Start10,
+        Text11,
+        Text12,
+        Text13,
+        Text14,
+        Text15,
+        Text16,
+        Text17,
+        Text18,
+        Text19,
+        Finish1,
+        Start1,
+        Text2,
+        Text20,
+        Text21,
+        Text22,
+        Text23,
+        Text24,
+        Text25,
+        Text26,
+        Text27,
+        Text28,
+        Text29,
+        Finish2,
+        Start2,
+        Text3,
+        Text30,
+        Finish3,
+        Start3,
+        Text4,
+        Finish4,
+        Start4,
+        Text5,
+        Finish5,
+        Start5,
+        Text6,
+        Finish6,
+        Start6,
+        Text7,
+        Finish7,
+        Start7,
+        Text8,
+        Finish8,
+        Start8,
+        Text9,
+        Finish9,
+        Start9,
+        Baseline10BudgetCost,
+        Baseline10BudgetWork,
+        Baseline10Cost,
+        Baseline10Duration,
+        Baseline10Finish,
+        Baseline10FixedCost,
+        Baseline10FixedCostAccrual,
+        Baseline10Start,
+        Baseline10Work,
+        Baseline1BudgetCost,
+        Baseline1BudgetWork,
+        Baseline1Cost,
+        Baseline1Duration,
+        Baseline1Finish,
+        Baseline1FixedCost,
+        Baseline1FixedCostAccrual,
+        Baseline1Start,
+        Baseline1Work,
+        Baseline2BudgetCost,
+        Baseline2BudgetWork,
+        Baseline2Cost,
+        Baseline2Duration,
+        Baseline2Finish,
+        Baseline2FixedCost,
+        Baseline2FixedCostAccrual,
+        Baseline2Start,
+        Baseline2Work,
+        Baseline3BudgetCost,
+        Baseline3BudgetWork,
+        Baseline3Cost,
+        Baseline3Duration,
+        Baseline3Finish,
+        Baseline3FixedCost,
+        Baseline3FixedCostAccrual,
+        Basline3Start,
+        Baseline3Work,
+        Baseline4BudgetCost,
+        Baseline4BudgetWork,
+        Baseline4Cost,
+        Baseline4Duration,
+        Baseline4Finish,
+        Baseline4FixedCost,
+        Baseline4FixedCostAccrual,
+        Baseline4Start,
+        Baseline4Work,
+        Baseline5BudgetCost,
+        Baseline5BudgetWork,
+        Baseline5Cost,
+        Baseline5Duration,
+        Baseline5Finish,
+        Baseline5FixedCost,
+        Baseline5FixedCostAccrual,
+        Baseline5Start,
+        Baseline5Work,
+        Baseline6BudgetCost,
+        Baseline6BudgetWork,
+        Baseline6Cost,
+        Baseline6Duration,
+        Baseline6Finish,
+        Baseline6FixedCost,
+        Baseline6FixedCostAccrual,
+        Baseline6Start,
+        Baseline6Work,
+        Baseline7BudgetCost,
+        Baseline7BudgetWork,
+        Baseline7Cost,
+        Baseline7Duration,
+        Baseline7Finish,
+        Baseline7FixedCost,
+        Baseline7FixedCostAccrual,
+        Baseline7Start,
+        Baseline7Work,
+        Baseline8BudgetCost,
+        Baseline8BudgetWork,
+        Baseline8Cost,
+        Baseline8Duration,
+        Baseline8Finish,
+        Baseline8FixedCost,
+        Baseline8FixedCostAccrual,
+        Baseline8Start,
+        Baseline8Work,
+        Baseline9BudgetCost,
+        Baseline9BudgetWork,
+        Baseline9Cost,
+        Baseline9Duration,
+        Baseline9Finish,
+        Baseline9FixedCost,
+        Baseline9FixedCostAccrual,
+        Baseline9Start,
+        Baseline9Work,
+        BaselineBudgetCost,
+        BaselineBudgetWork,
+        BaselineCost,
+        BaselineDuration,
+        BaselineFinish,
+        BaselineFixedCost,
+        BaselineFixedCostAccrual,
+        BaselineStart,
+        BaselineWork,
+        BudgetCost,
+        BudgetFixedCost,
+        BudgetFixedWork,
+        BudgetWork,
+        TaskCalendarGUID,
+        ConstraintDate,
+        ConstraintType,
+        Cost1,
+        Cost10,
+        Cost2,
+        Cost3,
+        Cost4,
+        Cost5,
+        Cost6,
+        Cost7,
+        Cost8,
+        Cost9,
+        Date1,
+        Date10,
+        Date2,
+        Date3,
+        Date4,
+        Date5,
+        Date6,
+        Date7,
+        Date8,
+        Date9,
+        Deadline,
+        Duration1,
+        Duration10,
+        Duration2,
+        Duration3,
+        Duration4,
+        Duration5,
+        Duration6,
+        Duration7,
+        Duration8,
+        Duration9,
+        Duration,
+        EarnedValueMethod,
+        FinishSlack,
+        FixedCost,
+        FixedCostAccrual,
+        Flag10,
+        Flag1,
+        Flag11,
+        Flag12,
+        Flag13,
+        Flag14,
+        Flag15,
+        Flag16,
+        Flag17,
+        Flag18,
+        Flag19,
+        Flag2,
+        Flag20,
+        Flag3,
+        Flag4,
+        Flag5,
+        Flag6,
+        Flag7,
+        Flag8,
+        Flag9,
+        FreeSlack,
+        HasRollupSubTasks,
+        ID,
+        Name,
+        Notes,
+        Number1,
+        Number10,
+        Number11,
+        Number12,
+        Number13,
+        Number14,
+        Number15,
+        Number16,
+        Number17,
+        Number18,
+        Number19,
+        Number2,
+        Number20,
+        Number3,
+        Number4,
+        Number5,
+        Number6,
+        Number7,
+        Number8,
+        Number9,
+        ScheduledDuration,
+        ScheduledFinish,
+        ScheduledStart,
+        OutlineLevel,
+        OvertimeCost,
+        OvertimeWork,
+        PercentComplete,
+        PercentWorkComplete,
+        Predecessors,
+        PreleveledFinish,
+        PreleveledStart,
+        Priority,
+        Active,
+        Critical,
+        Milestone,
+        Overallocated,
+        IsRollup,
+        Summary,
+        RegularWork,
+        RemainingCost,
+        RemainingDuration,
+        RemainingOvertimeCost,
+        RemainingWork,
+        ResourceNames,
+        Cost,
+        Finish,
+        Start,
+        Work,
+        StartSlack,
+        Status,
+        Successors,
+        StatusManager,
+        TotalSlack,
+        TaskGUID,
+        Type,
+        WBS,
+        WBSPREDECESSORS,
+        WBSSUCCESSORS,
+        WSSID
+    }
+    export enum ProjectViewTypes {
+        Gantt,
+        NetworkDiagram,
+        TaskDiagram,
+        TaskForm,
+        TaskSheet,
+        ResourceForm,
+        ResourceSheet,
+        ResourceGraph,
+        TeamPlanner,
+        TaskDetails,
+        TaskNameForm,
+        ResourceNames,
+        Calendar,
+        TaskUsage,
+        ResourceUsage,
+        Timeline
+    }
+    // Objects
+    export interface Document {
+        /**
+         * Get Project field (Ex. ProjectWebAccessURL).
+         * @param fieldId Project level fields.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getProjectFieldAsync(fieldId: number, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Get resource field for provided resource Id. (Ex.ResourceName)
+         * @param resourceId Either a string or value of the Resource Id.
+         * @param fieldId Resource Fields.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getResourceFieldAsync(resourceId: string, fieldId: number, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Get the current selected Resource's Id.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getSelectedResourceAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Get the current selected Task's Id.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getSelectedTaskAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Get the current selected View Type (Ex. Gantt) and View Name.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getSelectedViewAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Get the Task Name, WSS Task Id, and ResourceNames for given taskId.
+         * @param taskId Either a string or value of the Task Id.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getTaskAsync(taskId: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Get task field for provided task Id. (Ex. StartDate).
+         * @param taskId Either a string or value of the Task Id.
+         * @param fieldId Task Fields.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getTaskFieldAsync(taskId: string, fieldId: number, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Get the WSS Url and list name for the Tasks List, the MPP is synced too.
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: Object keeping state for the callback
+         * @param callback The optional callback method
+         */
+        getWSSUrlAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+    }
+}
+
+
+declare namespace Excel {
+    /**
+     *
+     * Represents the Excel application that manages the workbook.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class Application extends OfficeExtension.ClientObject {
+        private m_calculationMode;
+        /**
+         *
+         * Returns the calculation mode used in the workbook. See Excel.CalculationMode for details. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        calculationMode: string;
+        /**
+         *
+         * Recalculate all currently opened workbooks in Excel.
+         *
+         * @param calculationType Specifies the calculation type to use. See Excel.CalculationType for details.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        calculate(calculationType: string): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Application;
+    }
+    /**
+     *
+     * Workbook is the top level object which contains related workbook objects such as worksheets, tables, ranges, etc.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class Workbook extends OfficeExtension.ClientObject {
+        private m_application;
+        private m_bindings;
+        private m_functions;
+        private m_names;
+        private m_tables;
+        private m_worksheets;
+        /**
+         *
+         * Represents Excel application instance that contains this workbook. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        application: Excel.Application;
+        /**
+         *
+         * Represents a collection of bindings that are part of the workbook. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        bindings: Excel.BindingCollection;
+        /**
+         *
+         * Represents Excel application instance that contains this workbook. Read-only.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        functions: Excel.Functions;
+        /**
+         *
+         * Represents a collection of workbook scoped named items (named ranges and constants). Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        names: Excel.NamedItemCollection;
+        /**
+         *
+         * Represents a collection of tables associated with the workbook. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        tables: Excel.TableCollection;
+        /**
+         *
+         * Represents a collection of worksheets associated with the workbook. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        worksheets: Excel.WorksheetCollection;
+        /**
+         *
+         * Gets the currently selected range from the workbook.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getSelectedRange(): Excel.Range;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Workbook;
+    }
+    /**
+     *
+     * An Excel worksheet is a grid of cells. It can contain data, tables, charts, etc.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class Worksheet extends OfficeExtension.ClientObject {
+        private m_charts;
+        private m_id;
+        private m_name;
+        private m_position;
+        private m_protection;
+        private m_tables;
+        private m_visibility;
+        /**
+         *
+         * Returns collection of charts that are part of the worksheet. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        charts: Excel.ChartCollection;
+        /**
+         *
+         * Returns sheet protection object for a worksheet.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        protection: Excel.WorksheetProtection;
+        /**
+         *
+         * Collection of tables that are part of the worksheet. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        tables: Excel.TableCollection;
+        /**
+         *
+         * Returns a value that uniquely identifies the worksheet in a given workbook. The value of the identifier remains the same even when the worksheet is renamed or moved. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        id: string;
+        /**
+         *
+         * The display name of the worksheet.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        name: string;
+        /**
+         *
+         * The zero-based position of the worksheet within the workbook.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        position: number;
+        /**
+         *
+         * The Visibility of the worksheet.
+         *
+         * [Api set: ExcelApi 1.1 for reading visibility; 1.2 for setting it.]
+         */
+        visibility: string;
+        /**
+         *
+         * Activate the worksheet in the Excel UI.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        activate(): void;
+        /**
+         *
+         * Deletes the worksheet from the workbook.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        delete(): void;
+        /**
+         *
+         * Gets the range object containing the single cell based on row and column numbers. The cell can be outside the bounds of its parent range, so long as it's stays within the worksheet grid.
+         *
+         * @param row The row number of the cell to be retrieved. Zero-indexed.
+         * @param column the column number of the cell to be retrieved. Zero-indexed.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getCell(row: number, column: number): Excel.Range;
+        /**
+         *
+         * Gets the range object specified by the address or name.
+         *
+         * @param address The address or the name of the range. If not specified, the entire worksheet range is returned.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getRange(address?: string): Excel.Range;
+        /**
+         *
+         * The used range is the smallest range that encompasses any cells that have a value or formatting assigned to them. If the worksheet is blank, this function will return the top left cell.
+         *
+         * @param valuesOnly Considers only cells with values as used cells (ignores formatting). [Parameter available: ExcelApi 1.2]
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getUsedRange(valuesOnly?: boolean): Excel.Range;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Worksheet;
+    }
+    /**
+     *
+     * Represents a collection of worksheet objects that are part of the workbook.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class WorksheetCollection extends OfficeExtension.ClientObject {
+        private m__items;
+        /** Gets the loaded child items in this collection. */
+        items: Array<Excel.Worksheet>;
+        /**
+         *
+         * Adds a new worksheet to the workbook. The worksheet will be added at the end of existing worksheets. If you wish to activate the newly added worksheet, call ".activate() on it.
+         *
+         * @param name The name of the worksheet to be added. If specified, name should be unqiue. If not specified, Excel determines the name of the new worksheet.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        add(name?: string): Excel.Worksheet;
+        /**
+         *
+         * Gets the currently active worksheet in the workbook.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getActiveWorksheet(): Excel.Worksheet;
+        /**
+         *
+         * Gets a worksheet object using its Name or ID.
+         *
+         * @param key The Name or ID of the worksheet.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getItem(key: string): Excel.Worksheet;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.WorksheetCollection;
+    }
+    /**
+     *
+     * Represents the protection of a sheet object.
+     *
+     * [Api set: ExcelApi 1.2]
+     */
+    class WorksheetProtection extends OfficeExtension.ClientObject {
+        private m_options;
+        private m_protected;
+        /**
+         *
+         * Sheet protection options.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        options: Excel.WorksheetProtectionOptions;
+        /**
+         *
+         * Indicates if the worksheet is protected. Read-Only.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        protected: boolean;
+        /**
+         *
+         * Protect a worksheet. It throws if the worksheet has been protected.
+         *
+         * @param options sheet protection options.
+         * @param password sheet protection password.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        protect(options?: Excel.WorksheetProtectionOptions, password?: string): void;
+        /**
+         *
+         * Unprotect a worksheet
+         *
+         * @param password sheet protection password.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        unprotect(password?: string): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.WorksheetProtection;
+    }
+    /**
+     *
+     * Represents the options in sheet protection.
+     *
+     * [Api set: ExcelApi 1.2]
+     */
+    interface WorksheetProtectionOptions {
+        /**
+         *
+         * Represents the worksheet protection option of allowing using auto filter feature.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        allowAutoFilter?: boolean;
+        /**
+         *
+         * Represents the worksheet protection option of allowing deleting columns.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        allowDeleteColumns?: boolean;
+        /**
+         *
+         * Represents the worksheet protection option of allowing deleting rows.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        allowDeleteRows?: boolean;
+        /**
+         *
+         * Represents the worksheet protection option of allowing formatting cells.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        allowFormatCells?: boolean;
+        /**
+         *
+         * Represents the worksheet protection option of allowing formatting columns.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        allowFormatColumns?: boolean;
+        /**
+         *
+         * Represents the worksheet protection option of allowing formatting rows.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        allowFormatRows?: boolean;
+        /**
+         *
+         * Represents the worksheet protection option of allowing inserting columns.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        allowInsertColumns?: boolean;
+        /**
+         *
+         * Represents the worksheet protection option of allowing inserting hyperlinks.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        allowInsertHyperlinks?: boolean;
+        /**
+         *
+         * Represents the worksheet protection option of allowing inserting rows.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        allowInsertRows?: boolean;
+        /**
+         *
+         * Represents the worksheet protection option of allowing using pivot table feature.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        allowPivotTables?: boolean;
+        /**
+         *
+         * Represents the worksheet protection option of allowing using sort feature.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        allowSort?: boolean;
+    }
+    /**
+     *
+     * Range represents a set of one or more contiguous cells such as a cell, a row, a column, block of cells, etc.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class Range extends OfficeExtension.ClientObject {
+        private m_address;
+        private m_addressLocal;
+        private m_cellCount;
+        private m_columnCount;
+        private m_columnHidden;
+        private m_columnIndex;
+        private m_format;
+        private m_formulas;
+        private m_formulasLocal;
+        private m_formulasR1C1;
+        private m_hidden;
+        private m_numberFormat;
+        private m_rowCount;
+        private m_rowHidden;
+        private m_rowIndex;
+        private m_sort;
+        private m_text;
+        private m_valueTypes;
+        private m_values;
+        private m_worksheet;
+        private m__ReferenceId;
+        /**
+         *
+         * Returns a format object, encapsulating the range's font, fill, borders, alignment, and other properties. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        format: Excel.RangeFormat;
+        sort: Excel.RangeSort;
+        /**
+         *
+         * The worksheet containing the current range. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        worksheet: Excel.Worksheet;
+        /**
+         *
+         * Represents the range reference in A1-style. Address value will contain the Sheet reference (e.g. Sheet1!A1:B4). Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        address: string;
+        /**
+         *
+         * Represents range reference for the specified range in the language of the user. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        addressLocal: string;
+        /**
+         *
+         * Number of cells in the range. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        cellCount: number;
+        /**
+         *
+         * Represents the total number of columns in the range. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        columnCount: number;
+        /**
+         *
+         * Represents if all columns of the current range are hidden.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        columnHidden: boolean;
+        /**
+         *
+         * Represents the column number of the first cell in the range. Zero-indexed. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        columnIndex: number;
+        /**
+         *
+         * Represents the formula in A1-style notation.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        formulas: Array<Array<any>>;
+        /**
+         *
+         * Represents the formula in A1-style notation, in the user's language and number-formatting locale.  For example, the English "=SUM(A1, 1.5)" formula would become "=SUMME(A1; 1,5)" in German.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        formulasLocal: Array<Array<any>>;
+        /**
+         *
+         * Represents the formula in R1C1-style notation.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        formulasR1C1: Array<Array<any>>;
+        /**
+         *
+         * Represents if all cells of the current range are hidden.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        hidden: boolean;
+        /**
+         *
+         * Represents Excel's number format code for the given cell.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        numberFormat: Array<Array<any>>;
+        /**
+         *
+         * Returns the total number of rows in the range. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        rowCount: number;
+        /**
+         *
+         * Represents if all rows of the current range are hidden.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        rowHidden: boolean;
+        /**
+         *
+         * Returns the row number of the first cell in the range. Zero-indexed. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        rowIndex: number;
+        /**
+         *
+         * Text values of the specified range. The Text value will not depend on the cell width. The # sign substitution that happens in Excel UI will not affect the text value returned by the API. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        text: Array<Array<any>>;
+        /**
+         *
+         * Represents the type of data of each cell. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        valueTypes: Array<Array<string>>;
+        /**
+         *
+         * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        values: Array<Array<any>>;
+        /**
+         *
+         * Clear range values, format, fill, border, etc.
+         *
+         * @param applyTo Determines the type of clear action. See Excel.ClearApplyTo for details.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        clear(applyTo?: string): void;
+        /**
+         *
+         * Deletes the cells associated with the range.
+         *
+         * @param shift Specifies which way to shift the cells. See Excel.DeleteShiftDirection for details.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        delete(shift: string): void;
+        /**
+         *
+         * Gets the smallest range object that encompasses the given ranges. For example, the GetBoundingRect of "B2:C5" and "D10:E15" is "B2:E16".
+         *
+         * @param anotherRange The range object or address or range name.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getBoundingRect(anotherRange: Excel.Range | string): Excel.Range;
+        /**
+         *
+         * Gets the range object containing the single cell based on row and column numbers. The cell can be outside the bounds of its parent range, so long as it's stays within the worksheet grid. The returned cell is located relative to the top left cell of the range.
+         *
+         * @param row Row number of the cell to be retrieved. Zero-indexed.
+         * @param column Column number of the cell to be retrieved. Zero-indexed.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getCell(row: number, column: number): Excel.Range;
+        /**
+         *
+         * Gets a column contained in the range.
+         *
+         * @param column Column number of the range to be retrieved. Zero-indexed.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getColumn(column: number): Excel.Range;
+        /**
+         *
+         * Gets an object that represents the entire column of the range.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getEntireColumn(): Excel.Range;
+        /**
+         *
+         * Gets an object that represents the entire row of the range.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getEntireRow(): Excel.Range;
+        /**
+         *
+         * Gets the range object that represents the rectangular intersection of the given ranges.
+         *
+         * @param anotherRange The range object or range address that will be used to determine the intersection of ranges.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getIntersection(anotherRange: Excel.Range | string): Excel.Range;
+        /**
+         *
+         * Gets the last cell within the range. For example, the last cell of "B2:D5" is "D5".
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getLastCell(): Excel.Range;
+        /**
+         *
+         * Gets the last column within the range. For example, the last column of "B2:D5" is "D2:D5".
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getLastColumn(): Excel.Range;
+        /**
+         *
+         * Gets the last row within the range. For example, the last row of "B2:D5" is "B5:D5".
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getLastRow(): Excel.Range;
+        /**
+         *
+         * Gets an object which represents a range that's offset from the specified range. The dimension of the returned range will match this range. If the resulting range is forced outside the bounds of the worksheet grid, an exception will be thrown.
+         *
+         * @param rowOffset The number of rows (positive, negative, or 0) by which the range is to be offset. Positive values are offset downward, and negative values are offset upward.
+         * @param columnOffset The number of columns (positive, negative, or 0) by which the range is to be offset. Positive values are offset to the right, and negative values are offset to the left.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getOffsetRange(rowOffset: number, columnOffset: number): Excel.Range;
+        /**
+         *
+         * Gets a row contained in the range.
+         *
+         * @param row Row number of the range to be retrieved. Zero-indexed.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getRow(row: number): Excel.Range;
+        /**
+         *
+         * Returns the used range of the given range object.
+         *
+         * @param valuesOnly Considers only cells with values as used cells. [Parameter available: ExcelApi 1.2]
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getUsedRange(valuesOnly?: boolean): Excel.Range;
+        /**
+         *
+         * Inserts a cell or a range of cells into the worksheet in place of this range, and shifts the other cells to make space. Returns a new Range object at the now blank space.
+         *
+         * @param shift Specifies which way to shift the cells. See Excel.InsertShiftDirection for details.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        insert(shift: string): Excel.Range;
+        /**
+         *
+         * Merge the range cells into one region in the worksheet.
+         *
+         * @param across Set true to merge cells in each row of the specified range as separate merged cells. The default value is false.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        merge(across?: boolean): void;
+        /**
+         *
+         * Selects the specified range in the Excel UI.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        select(): void;
+        /**
+         *
+         * Unmerge the range cells into separate cells.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        unmerge(): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Range;
+    }
+    /**
+     *
+     * Represents a string reference of the form SheetName!A1:B5, or a global or local named range
+     *
+     * [Api set: ExcelApi 1.2]
+     */
+    interface RangeReference {
+        address: string;
+    }
+    /**
+     *
+     * A collection of all the nameditem objects that are part of the workbook.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class NamedItemCollection extends OfficeExtension.ClientObject {
+        private m__items;
+        /** Gets the loaded child items in this collection. */
+        items: Array<Excel.NamedItem>;
+        /**
+         *
+         * Gets a nameditem object using its name
+         *
+         * @param name nameditem name.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getItem(name: string): Excel.NamedItem;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.NamedItemCollection;
+    }
+    /**
+     *
+     * Represents a defined name for a range of cells or value. Names can be primitive named objects (as seen in the type below), range object, reference to a range. This object can be used to obtain range object associated with names.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class NamedItem extends OfficeExtension.ClientObject {
+        private m_name;
+        private m_type;
+        private m_value;
+        private m_visible;
+        private m__Id;
+        /**
+         *
+         * The name of the object. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        name: string;
+        /**
+         *
+         * Indicates what type of reference is associated with the name. See Excel.NamedItemType for details. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        type: string;
+        /**
+         *
+         * Represents the formula that the name is defined to refer to. E.g. =Sheet14!$B$2:$H$12, =4.75, etc. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        value: any;
+        /**
+         *
+         * Specifies whether the object is visible or not.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        visible: boolean;
+        /**
+         *
+         * Returns the range object that is associated with the name. Throws an exception if the named item's type is not a range.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getRange(): Excel.Range;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.NamedItem;
+    }
+    /**
+     *
+     * Represents an Office.js binding that is defined in the workbook.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class Binding extends OfficeExtension.ClientObject {
+        private m_id;
+        private m_type;
+        /**
+         *
+         * Represents binding identifier. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        id: string;
+        /**
+         *
+         * Returns the type of the binding. See Excel.BindingType for details. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        type: string;
+        /**
+         *
+         * Returns the range represented by the binding. Will throw an error if binding is not of the correct type.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getRange(): Excel.Range;
+        /**
+         *
+         * Returns the table represented by the binding. Will throw an error if binding is not of the correct type.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getTable(): Excel.Table;
+        /**
+         *
+         * Returns the text represented by the binding. Will throw an error if binding is not of the correct type.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getText(): OfficeExtension.ClientResult<string>;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Binding;
+    }
+    /**
+     *
+     * Represents the collection of all the binding objects that are part of the workbook.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class BindingCollection extends OfficeExtension.ClientObject {
+        private m_count;
+        private m__items;
+        /** Gets the loaded child items in this collection. */
+        items: Array<Excel.Binding>;
+        /**
+         *
+         * Returns the number of bindings in the collection. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        count: number;
+        /**
+         *
+         * Gets a binding object by ID.
+         *
+         * @param id Id of the binding object to be retrieved.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getItem(id: string): Excel.Binding;
+        /**
+         *
+         * Gets a binding object based on its position in the items array.
+         *
+         * @param index Index value of the object to be retrieved. Zero-indexed.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getItemAt(index: number): Excel.Binding;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.BindingCollection;
+    }
+    /**
+     *
+     * Represents a collection of all the tables that are part of the workbook.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class TableCollection extends OfficeExtension.ClientObject {
+        private m_count;
+        private m__items;
+        /** Gets the loaded child items in this collection. */
+        items: Array<Excel.Table>;
+        /**
+         *
+         * Returns the number of tables in the workbook. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        count: number;
+        /**
+         *
+         * Create a new table. The range source address determines the worksheet under which the table will be added. If the table cannot be added (e.g., because the address is invalid, or the table would overlap with another table), an error will be thrown.
+         *
+         * @param address Address or name of the range object representing the data source. If the address does not contain a sheet name, the currently-active sheet is used.
+         * @param hasHeaders Boolean value that indicates whether the data being imported has column labels. If the source does not contain headers (i.e,. when this property set to false), Excel will automatically generate header shifting the data down by one row.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        add(address: string, hasHeaders: boolean): Excel.Table;
+        /**
+         *
+         * Gets a table by Name or ID.
+         *
+         * @param key Name or ID of the table to be retrieved.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getItem(key: number | string): Excel.Table;
+        /**
+         *
+         * Gets a table based on its position in the collection.
+         *
+         * @param index Index value of the object to be retrieved. Zero-indexed.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getItemAt(index: number): Excel.Table;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableCollection;
+    }
+    /**
+     *
+     * Represents an Excel table.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class Table extends OfficeExtension.ClientObject {
+        private m_columns;
+        private m_id;
+        private m_name;
+        private m_rows;
+        private m_showHeaders;
+        private m_showTotals;
+        private m_sort;
+        private m_style;
+        private m_worksheet;
+        /**
+         *
+         * Represents a collection of all the columns in the table. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        columns: Excel.TableColumnCollection;
+        /**
+         *
+         * Represents a collection of all the rows in the table. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        rows: Excel.TableRowCollection;
+        /**
+         *
+         * Represents the sorting for the table.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        sort: Excel.TableSort;
+        /**
+         *
+         * The worksheet containing the current table. Read-only.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        worksheet: Excel.Worksheet;
+        /**
+         *
+         * Returns a value that uniquely identifies the table in a given workbook. The value of the identifier remains the same even when the table is renamed. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        id: number;
+        /**
+         *
+         * Name of the table.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        name: string;
+        /**
+         *
+         * Indicates whether the header row is visible or not. This value can be set to show or remove the header row.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        showHeaders: boolean;
+        /**
+         *
+         * Indicates whether the total row is visible or not. This value can be set to show or remove the total row.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        showTotals: boolean;
+        /**
+         *
+         * Constant value that represents the Table style. Possible values are: TableStyleLight1 thru TableStyleLight21, TableStyleMedium1 thru TableStyleMedium28, TableStyleStyleDark1 thru TableStyleStyleDark11. A custom user-defined style present in the workbook can also be specified.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        style: string;
+        /**
+         *
+         * Clears all the filters currently applied on the table.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        clearFilters(): void;
+        /**
+         *
+         * Converts the table into a normal range of cells. All data is preserved.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        convertToRange(): Excel.Range;
+        /**
+         *
+         * Deletes the table.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        delete(): void;
+        /**
+         *
+         * Gets the range object associated with the data body of the table.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getDataBodyRange(): Excel.Range;
+        /**
+         *
+         * Gets the range object associated with header row of the table.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getHeaderRowRange(): Excel.Range;
+        /**
+         *
+         * Gets the range object associated with the entire table.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getRange(): Excel.Range;
+        /**
+         *
+         * Gets the range object associated with totals row of the table.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getTotalRowRange(): Excel.Range;
+        /**
+         *
+         * Reapplies all the filters currently on the table.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        reapplyFilters(): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Table;
+    }
+    /**
+     *
+     * Represents a collection of all the columns that are part of the table.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class TableColumnCollection extends OfficeExtension.ClientObject {
+        private m_count;
+        private m__items;
+        /** Gets the loaded child items in this collection. */
+        items: Array<Excel.TableColumn>;
+        /**
+         *
+         * Returns the number of columns in the table. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        count: number;
+        /**
+         *
+         * Adds a new column to the table.
+         *
+         * @param index Specifies the relative position of the new column. The previous column at this position is shifted to the right. The index value should be equal to or less than the last column's index value, so it cannot be used to append a column at the end of the table. Zero-indexed.
+         * @param values A 2-dimensional array of unformatted values of the table column.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        add(index: number, values?: Array<Array<boolean | string | number>> | boolean | string | number): Excel.TableColumn;
+        /**
+         *
+         * Gets a column object by Name or ID.
+         *
+         * @param key Column Name or ID.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getItem(key: number | string): Excel.TableColumn;
+        /**
+         *
+         * Gets a column based on its position in the collection.
+         *
+         * @param index Index value of the object to be retrieved. Zero-indexed.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getItemAt(index: number): Excel.TableColumn;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableColumnCollection;
+    }
+    /**
+     *
+     * Represents a column in a table.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class TableColumn extends OfficeExtension.ClientObject {
+        private m_filter;
+        private m_id;
+        private m_index;
+        private m_name;
+        private m_values;
+        /**
+         *
+         * Retrieve the filter applied to the column.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        filter: Excel.Filter;
+        /**
+         *
+         * Returns a unique key that identifies the column within the table. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        id: number;
+        /**
+         *
+         * Returns the index number of the column within the columns collection of the table. Zero-indexed. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        index: number;
+        /**
+         *
+         * Returns the name of the table column. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        name: string;
+        /**
+         *
+         * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        values: Array<Array<any>>;
+        /**
+         *
+         * Deletes the column from the table.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        delete(): void;
+        /**
+         *
+         * Gets the range object associated with the data body of the column.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getDataBodyRange(): Excel.Range;
+        /**
+         *
+         * Gets the range object associated with the header row of the column.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getHeaderRowRange(): Excel.Range;
+        /**
+         *
+         * Gets the range object associated with the entire column.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getRange(): Excel.Range;
+        /**
+         *
+         * Gets the range object associated with the totals row of the column.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getTotalRowRange(): Excel.Range;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableColumn;
+    }
+    /**
+     *
+     * Represents a collection of all the rows that are part of the table.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class TableRowCollection extends OfficeExtension.ClientObject {
+        private m_count;
+        private m__items;
+        /** Gets the loaded child items in this collection. */
+        items: Array<Excel.TableRow>;
+        /**
+         *
+         * Returns the number of rows in the table. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        count: number;
+        /**
+         *
+         * Adds a new row to the table.
+         *
+         * @param index Specifies the relative position of the new row. If null, the addition happens at the end. Any rows below the inserted row are shifted downwards. Zero-indexed.
+         * @param values A 2-dimensional array of unformatted values of the table row.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        add(index?: number, values?: Array<Array<boolean | string | number>> | boolean | string | number): Excel.TableRow;
+        /**
+         *
+         * Gets a row based on its position in the collection.
+         *
+         * @param index Index value of the object to be retrieved. Zero-indexed.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getItemAt(index: number): Excel.TableRow;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableRowCollection;
+    }
+    /**
+     *
+     * Represents a row in a table.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class TableRow extends OfficeExtension.ClientObject {
+        private m_index;
+        private m_values;
+        /**
+         *
+         * Returns the index number of the row within the rows collection of the table. Zero-indexed. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        index: number;
+        /**
+         *
+         * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        values: Array<Array<any>>;
+        /**
+         *
+         * Deletes the row from the table.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        delete(): void;
+        /**
+         *
+         * Returns the range object associated with the entire row.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getRange(): Excel.Range;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableRow;
+    }
+    /**
+     *
+     * A format object encapsulating the range's font, fill, borders, alignment, and other properties.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class RangeFormat extends OfficeExtension.ClientObject {
+        private m_borders;
+        private m_columnWidth;
+        private m_fill;
+        private m_font;
+        private m_horizontalAlignment;
+        private m_protection;
+        private m_rowHeight;
+        private m_verticalAlignment;
+        private m_wrapText;
+        /**
+         *
+         * Collection of border objects that apply to the overall range selected Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        borders: Excel.RangeBorderCollection;
+        /**
+         *
+         * Returns the fill object defined on the overall range. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        fill: Excel.RangeFill;
+        /**
+         *
+         * Returns the font object defined on the overall range selected Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        font: Excel.RangeFont;
+        /**
+         *
+         * Returns the format protection object for a range.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        protection: Excel.FormatProtection;
+        /**
+         *
+         * Gets or sets the width of all colums within the range. If the column widths are not uniform, null will be returned.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        columnWidth: number;
+        /**
+         *
+         * Represents the horizontal alignment for the specified object. See Excel.HorizontalAlignment for details.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        horizontalAlignment: string;
+        /**
+         *
+         * Gets or sets the height of all rows in the range. If the row heights are not uniform null will be returned.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        rowHeight: number;
+        /**
+         *
+         * Represents the vertical alignment for the specified object. See Excel.VerticalAlignment for details.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        verticalAlignment: string;
+        /**
+         *
+         * Indicates if Excel wraps the text in the object. A null value indicates that the entire range doesn't have uniform wrap setting
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        wrapText: boolean;
+        /**
+         *
+         * Changes the width of the columns of the current range to achieve the best fit, based on the current data in the columns.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        autofitColumns(): void;
+        /**
+         *
+         * Changes the height of the rows of the current range to achieve the best fit, based on the current data in the columns.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        autofitRows(): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeFormat;
+    }
+    /**
+     *
+     * Represents the format protection of a range object.
+     *
+     * [Api set: ExcelApi 1.2]
+     */
+    class FormatProtection extends OfficeExtension.ClientObject {
+        private m_formulaHidden;
+        private m_locked;
+        /**
+         *
+         * Indicates if Excel hides the formula for the cells in the range. A null value indicates that the entire range doesn't have uniform formula hidden setting.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        formulaHidden: boolean;
+        /**
+         *
+         * Indicates if Excel locks the cells in the object. A null value indicates that the entire range doesn't have uniform lock setting.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        locked: boolean;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.FormatProtection;
+    }
+    /**
+     *
+     * Represents the background of a range object.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class RangeFill extends OfficeExtension.ClientObject {
+        private m_color;
+        /**
+         *
+         * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange")
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        color: string;
+        /**
+         *
+         * Resets the range background.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        clear(): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeFill;
+    }
+    /**
+     *
+     * Represents the border of an object.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class RangeBorder extends OfficeExtension.ClientObject {
+        private m_color;
+        private m_sideIndex;
+        private m_style;
+        private m_weight;
+        /**
+         *
+         * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        color: string;
+        /**
+         *
+         * Constant value that indicates the specific side of the border. See Excel.BorderIndex for details. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        sideIndex: string;
+        /**
+         *
+         * One of the constants of line style specifying the line style for the border. See Excel.BorderLineStyle for details.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        style: string;
+        /**
+         *
+         * Specifies the weight of the border around a range. See Excel.BorderWeight for details.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        weight: string;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeBorder;
+    }
+    /**
+     *
+     * Represents the border objects that make up range border.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class RangeBorderCollection extends OfficeExtension.ClientObject {
+        private m_count;
+        private m__items;
+        /** Gets the loaded child items in this collection. */
+        items: Array<Excel.RangeBorder>;
+        /**
+         *
+         * Number of border objects in the collection. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        count: number;
+        /**
+         *
+         * Gets a border object using its name
+         *
+         * @param index Index value of the border object to be retrieved. See Excel.BorderIndex for details.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getItem(index: string): Excel.RangeBorder;
+        /**
+         *
+         * Gets a border object using its index
+         *
+         * @param index Index value of the object to be retrieved. Zero-indexed.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getItemAt(index: number): Excel.RangeBorder;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeBorderCollection;
+    }
+    /**
+     *
+     * This object represents the font attributes (font name, font size, color, etc.) for an object.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class RangeFont extends OfficeExtension.ClientObject {
+        private m_bold;
+        private m_color;
+        private m_italic;
+        private m_name;
+        private m_size;
+        private m_underline;
+        /**
+         *
+         * Represents the bold status of font.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        bold: boolean;
+        /**
+         *
+         * HTML color code representation of the text color. E.g. #FF0000 represents Red.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        color: string;
+        /**
+         *
+         * Represents the italic status of the font.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        italic: boolean;
+        /**
+         *
+         * Font name (e.g. "Calibri")
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        name: string;
+        /**
+         *
+         * Font size.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        size: number;
+        /**
+         *
+         * Type of underline applied to the font. See Excel.RangeUnderlineStyle for details.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        underline: string;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeFont;
+    }
+    /**
+     *
+     * A collection of all the chart objects on a worksheet.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartCollection extends OfficeExtension.ClientObject {
+        private m_count;
+        private m__items;
+        /** Gets the loaded child items in this collection. */
+        items: Array<Excel.Chart>;
+        /**
+         *
+         * Returns the number of charts in the worksheet. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        count: number;
+        /**
+         *
+         * Creates a new chart.
+         *
+         * @param type Represents the type of a chart. See Excel.ChartType for details.
+         * @param sourceData The Range object corresponding to the source data.
+         * @param seriesBy Specifies the way columns or rows are used as data series on the chart. See Excel.ChartSeriesBy for details.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        add(type: string, sourceData: Excel.Range, seriesBy?: string): Excel.Chart;
+        /**
+         *
+         * Gets a chart using its name. If there are multiple charts with the same name, the first one will be returned.
+         *
+         * @param name Name of the chart to be retrieved.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getItem(name: string): Excel.Chart;
+        /**
+         *
+         * Gets a chart based on its position in the collection.
+         *
+         * @param index Index value of the object to be retrieved. Zero-indexed.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getItemAt(index: number): Excel.Chart;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartCollection;
+    }
+    /**
+     *
+     * Represents a chart object in a workbook.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class Chart extends OfficeExtension.ClientObject {
+        private m_axes;
+        private m_dataLabels;
+        private m_format;
+        private m_height;
+        private m_left;
+        private m_legend;
+        private m_name;
+        private m_series;
+        private m_title;
+        private m_top;
+        private m_width;
+        private m_worksheet;
+        /**
+         *
+         * Represents chart axes. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        axes: Excel.ChartAxes;
+        /**
+         *
+         * Represents the datalabels on the chart. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        dataLabels: Excel.ChartDataLabels;
+        /**
+         *
+         * Encapsulates the format properties for the chart area. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        format: Excel.ChartAreaFormat;
+        /**
+         *
+         * Represents the legend for the chart. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        legend: Excel.ChartLegend;
+        /**
+         *
+         * Represents either a single series or collection of series in the chart. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        series: Excel.ChartSeriesCollection;
+        /**
+         *
+         * Represents the title of the specified chart, including the text, visibility, position and formating of the title. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        title: Excel.ChartTitle;
+        /**
+         *
+         * The worksheet containing the current chart. Read-only.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        worksheet: Excel.Worksheet;
+        /**
+         *
+         * Represents the height, in points, of the chart object.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        height: number;
+        /**
+         *
+         * The distance, in points, from the left side of the chart to the worksheet origin.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        left: number;
+        /**
+         *
+         * Represents the name of a chart object.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        name: string;
+        /**
+         *
+         * Represents the distance, in points, from the top edge of the object to the top of row 1 (on a worksheet) or the top of the chart area (on a chart).
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        top: number;
+        /**
+         *
+         * Represents the width, in points, of the chart object.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        width: number;
+        /**
+         *
+         * Deletes the chart object.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        delete(): void;
+        /**
+         *
+         * Renders the chart as a base64-encoded image by scaling the chart to fit the specified dimensions.
+            The aspect ratio is preserved as part of the resizing.
+         *
+         * @param height (Optional) The desired height of the resulting image.
+         * @param width (Optional) The desired width of the resulting image.
+         * @param fittingMode (Optional) The method used to scale the chart to the specified to the specified dimensions (if both height and width are set)."
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        getImage(width?: number, height?: number, fittingMode?: string): OfficeExtension.ClientResult<string>;
+        /**
+         *
+         * Resets the source data for the chart.
+         *
+         * @param sourceData The Range object corresponding to the source data.
+         * @param seriesBy Specifies the way columns or rows are used as data series on the chart. Can be one of the following: Auto (default), Rows, Columns. See Excel.ChartSeriesBy for details.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        setData(sourceData: Excel.Range, seriesBy?: string): void;
+        /**
+         *
+         * Positions the chart relative to cells on the worksheet.
+         *
+         * @param startCell The start cell. This is where the chart will be moved to. The start cell is the top-left or top-right cell, depending on the user's right-to-left display settings.
+         * @param endCell (Optional) The end cell. If specified, the chart's width and height will be set to fully cover up this cell/range.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        setPosition(startCell: Excel.Range | string, endCell?: Excel.Range | string): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Chart;
+    }
+    /**
+     *
+     * Encapsulates the format properties for the overall chart area.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartAreaFormat extends OfficeExtension.ClientObject {
+        private m_fill;
+        private m_font;
+        /**
+         *
+         * Represents the fill format of an object, which includes background formatting information. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        fill: Excel.ChartFill;
+        /**
+         *
+         * Represents the font attributes (font name, font size, color, etc.) for the current object. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        font: Excel.ChartFont;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAreaFormat;
+    }
+    /**
+     *
+     * Represents a collection of chart series.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartSeriesCollection extends OfficeExtension.ClientObject {
+        private m_count;
+        private m__items;
+        /** Gets the loaded child items in this collection. */
+        items: Array<Excel.ChartSeries>;
+        /**
+         *
+         * Returns the number of series in the collection. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        count: number;
+        /**
+         *
+         * Retrieves a series based on its position in the collection
+         *
+         * @param index Index value of the object to be retrieved. Zero-indexed.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getItemAt(index: number): Excel.ChartSeries;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartSeriesCollection;
+    }
+    /**
+     *
+     * Represents a series in a chart.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartSeries extends OfficeExtension.ClientObject {
+        private m_format;
+        private m_name;
+        private m_points;
+        /**
+         *
+         * Represents the formatting of a chart series, which includes fill and line formatting. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        format: Excel.ChartSeriesFormat;
+        /**
+         *
+         * Represents a collection of all points in the series. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        points: Excel.ChartPointsCollection;
+        /**
+         *
+         * Represents the name of a series in a chart.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        name: string;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartSeries;
+    }
+    /**
+     *
+     * encapsulates the format properties for the chart series
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartSeriesFormat extends OfficeExtension.ClientObject {
+        private m_fill;
+        private m_line;
+        /**
+         *
+         * Represents the fill format of a chart series, which includes background formating information. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        fill: Excel.ChartFill;
+        /**
+         *
+         * Represents line formatting. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        line: Excel.ChartLineFormat;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartSeriesFormat;
+    }
+    /**
+     *
+     * A collection of all the chart points within a series inside a chart.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartPointsCollection extends OfficeExtension.ClientObject {
+        private m_count;
+        private m__items;
+        /** Gets the loaded child items in this collection. */
+        items: Array<Excel.ChartPoint>;
+        /**
+         *
+         * Returns the number of chart points in the collection. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        count: number;
+        /**
+         *
+         * Retrieve a point based on its position within the series.
+         *
+         * @param index Index value of the object to be retrieved. Zero-indexed.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getItemAt(index: number): Excel.ChartPoint;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartPointsCollection;
+    }
+    /**
+     *
+     * Represents a point of a series in a chart.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartPoint extends OfficeExtension.ClientObject {
+        private m_format;
+        private m_value;
+        /**
+         *
+         * Encapsulates the format properties chart point. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        format: Excel.ChartPointFormat;
+        /**
+         *
+         * Returns the value of a chart point. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        value: any;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartPoint;
+    }
+    /**
+     *
+     * Represents formatting object for chart points.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartPointFormat extends OfficeExtension.ClientObject {
+        private m_fill;
+        /**
+         *
+         * Represents the fill format of a chart, which includes background formating information. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        fill: Excel.ChartFill;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartPointFormat;
+    }
+    /**
+     *
+     * Represents the chart axes.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartAxes extends OfficeExtension.ClientObject {
+        private m_categoryAxis;
+        private m_seriesAxis;
+        private m_valueAxis;
+        /**
+         *
+         * Represents the category axis in a chart. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        categoryAxis: Excel.ChartAxis;
+        /**
+         *
+         * Represents the series axis of a 3-dimensional chart. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        seriesAxis: Excel.ChartAxis;
+        /**
+         *
+         * Represents the value axis in an axis. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        valueAxis: Excel.ChartAxis;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAxes;
+    }
+    /**
+     *
+     * Represents a single axis in a chart.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartAxis extends OfficeExtension.ClientObject {
+        private m_format;
+        private m_majorGridlines;
+        private m_majorUnit;
+        private m_maximum;
+        private m_minimum;
+        private m_minorGridlines;
+        private m_minorUnit;
+        private m_title;
+        /**
+         *
+         * Represents the formatting of a chart object, which includes line and font formatting. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        format: Excel.ChartAxisFormat;
+        /**
+         *
+         * Returns a gridlines object that represents the major gridlines for the specified axis. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        majorGridlines: Excel.ChartGridlines;
+        /**
+         *
+         * Returns a Gridlines object that represents the minor gridlines for the specified axis. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        minorGridlines: Excel.ChartGridlines;
+        /**
+         *
+         * Represents the axis title. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        title: Excel.ChartAxisTitle;
+        /**
+         *
+         * Represents the interval between two major tick marks. Can be set to a numeric value or an empty string.  The returned value is always a number.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        majorUnit: any;
+        /**
+         *
+         * Represents the maximum value on the value axis.  Can be set to a numeric value or an empty string (for automatic axis values).  The returned value is always a number.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        maximum: any;
+        /**
+         *
+         * Represents the minimum value on the value axis. Can be set to a numeric value or an empty string (for automatic axis values).  The returned value is always a number.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        minimum: any;
+        /**
+         *
+         * Represents the interval between two minor tick marks. "Can be set to a numeric value or an empty string (for automatic axis values). The returned value is always a number.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        minorUnit: any;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAxis;
+    }
+    /**
+     *
+     * Encapsulates the format properties for the chart axis.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartAxisFormat extends OfficeExtension.ClientObject {
+        private m_font;
+        private m_line;
+        /**
+         *
+         * Represents the font attributes (font name, font size, color, etc.) for a chart axis element. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        font: Excel.ChartFont;
+        /**
+         *
+         * Represents chart line formatting. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        line: Excel.ChartLineFormat;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAxisFormat;
+    }
+    /**
+     *
+     * Represents the title of a chart axis.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartAxisTitle extends OfficeExtension.ClientObject {
+        private m_format;
+        private m_text;
+        private m_visible;
+        /**
+         *
+         * Represents the formatting of chart axis title. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        format: Excel.ChartAxisTitleFormat;
+        /**
+         *
+         * Represents the axis title.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        text: string;
+        /**
+         *
+         * A boolean that specifies the visibility of an axis title.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        visible: boolean;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAxisTitle;
+    }
+    /**
+     *
+     * Represents the chart axis title formatting.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartAxisTitleFormat extends OfficeExtension.ClientObject {
+        private m_font;
+        /**
+         *
+         * Represents the font attributes, such as font name, font size, color, etc. of chart axis title object. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        font: Excel.ChartFont;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAxisTitleFormat;
+    }
+    /**
+     *
+     * Represents a collection of all the data labels on a chart point.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartDataLabels extends OfficeExtension.ClientObject {
+        private m_format;
+        private m_position;
+        private m_separator;
+        private m_showBubbleSize;
+        private m_showCategoryName;
+        private m_showLegendKey;
+        private m_showPercentage;
+        private m_showSeriesName;
+        private m_showValue;
+        /**
+         *
+         * Represents the format of chart data labels, which includes fill and font formatting. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        format: Excel.ChartDataLabelFormat;
+        /**
+         *
+         * DataLabelPosition value that represents the position of the data label. See Excel.ChartDataLabelPosition for details.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        position: string;
+        /**
+         *
+         * String representing the separator used for the data labels on a chart.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        separator: string;
+        /**
+         *
+         * Boolean value representing if the data label bubble size is visible or not.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        showBubbleSize: boolean;
+        /**
+         *
+         * Boolean value representing if the data label category name is visible or not.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        showCategoryName: boolean;
+        /**
+         *
+         * Boolean value representing if the data label legend key is visible or not.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        showLegendKey: boolean;
+        /**
+         *
+         * Boolean value representing if the data label percentage is visible or not.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        showPercentage: boolean;
+        /**
+         *
+         * Boolean value representing if the data label series name is visible or not.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        showSeriesName: boolean;
+        /**
+         *
+         * Boolean value representing if the data label value is visible or not.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        showValue: boolean;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartDataLabels;
+    }
+    /**
+     *
+     * Encapsulates the format properties for the chart data labels.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartDataLabelFormat extends OfficeExtension.ClientObject {
+        private m_fill;
+        private m_font;
+        /**
+         *
+         * Represents the fill format of the current chart data label. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        fill: Excel.ChartFill;
+        /**
+         *
+         * Represents the font attributes (font name, font size, color, etc.) for a chart data label. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        font: Excel.ChartFont;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartDataLabelFormat;
+    }
+    /**
+     *
+     * Represents major or minor gridlines on a chart axis.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartGridlines extends OfficeExtension.ClientObject {
+        private m_format;
+        private m_visible;
+        /**
+         *
+         * Represents the formatting of chart gridlines. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        format: Excel.ChartGridlinesFormat;
+        /**
+         *
+         * Boolean value representing if the axis gridlines are visible or not.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        visible: boolean;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartGridlines;
+    }
+    /**
+     *
+     * Encapsulates the format properties for chart gridlines.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartGridlinesFormat extends OfficeExtension.ClientObject {
+        private m_line;
+        /**
+         *
+         * Represents chart line formatting. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        line: Excel.ChartLineFormat;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartGridlinesFormat;
+    }
+    /**
+     *
+     * Represents the legend in a chart.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartLegend extends OfficeExtension.ClientObject {
+        private m_format;
+        private m_overlay;
+        private m_position;
+        private m_visible;
+        /**
+         *
+         * Represents the formatting of a chart legend, which includes fill and font formatting. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        format: Excel.ChartLegendFormat;
+        /**
+         *
+         * Boolean value for whether the chart legend should overlap with the main body of the chart.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        overlay: boolean;
+        /**
+         *
+         * Represents the position of the legend on the chart. See Excel.ChartLegendPosition for details.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        position: string;
+        /**
+         *
+         * A boolean value the represents the visibility of a ChartLegend object.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        visible: boolean;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartLegend;
+    }
+    /**
+     *
+     * Encapsulates the format properties of a chart legend.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartLegendFormat extends OfficeExtension.ClientObject {
+        private m_fill;
+        private m_font;
+        /**
+         *
+         * Represents the fill format of an object, which includes background formating information. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        fill: Excel.ChartFill;
+        /**
+         *
+         * Represents the font attributes such as font name, font size, color, etc. of a chart legend. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        font: Excel.ChartFont;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartLegendFormat;
+    }
+    /**
+     *
+     * Represents a chart title object of a chart.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartTitle extends OfficeExtension.ClientObject {
+        private m_format;
+        private m_overlay;
+        private m_text;
+        private m_visible;
+        /**
+         *
+         * Represents the formatting of a chart title, which includes fill and font formatting. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        format: Excel.ChartTitleFormat;
+        /**
+         *
+         * Boolean value representing if the chart title will overlay the chart or not.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        overlay: boolean;
+        /**
+         *
+         * Represents the title text of a chart.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        text: string;
+        /**
+         *
+         * A boolean value the represents the visibility of a chart title object.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        visible: boolean;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartTitle;
+    }
+    /**
+     *
+     * Provides access to the office art formatting for chart title.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartTitleFormat extends OfficeExtension.ClientObject {
+        private m_fill;
+        private m_font;
+        /**
+         *
+         * Represents the fill format of an object, which includes background formating information. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        fill: Excel.ChartFill;
+        /**
+         *
+         * Represents the font attributes (font name, font size, color, etc.) for an object. Read-only.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        font: Excel.ChartFont;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartTitleFormat;
+    }
+    /**
+     *
+     * Represents the fill formatting for a chart element.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartFill extends OfficeExtension.ClientObject {
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartFill;
+        /**
+         *
+         * Clear the fill color of a chart element.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        clear(): void;
+        /**
+         *
+         * Sets the fill formatting of a chart element to a uniform color.
+         *
+         * @param color HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        setSolidColor(color: string): void;
+    }
+    /**
+     *
+     * Enapsulates the formatting options for line elements.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartLineFormat extends OfficeExtension.ClientObject {
+        private m_color;
+        /**
+         *
+         * HTML color code representing the color of lines in the chart.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        color: string;
+        /**
+         *
+         * Clear the line format of a chart element.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        clear(): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartLineFormat;
+    }
+    /**
+     *
+     * This object represents the font attributes (font name, font size, color, etc.) for a chart object.
+     *
+     * [Api set: ExcelApi 1.1]
+     */
+    class ChartFont extends OfficeExtension.ClientObject {
+        private m_bold;
+        private m_color;
+        private m_italic;
+        private m_name;
+        private m_size;
+        private m_underline;
+        /**
+         *
+         * Represents the bold status of font.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        bold: boolean;
+        /**
+         *
+         * HTML color code representation of the text color. E.g. #FF0000 represents Red.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        color: string;
+        /**
+         *
+         * Represents the italic status of the font.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        italic: boolean;
+        /**
+         *
+         * Font name (e.g. "Calibri")
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        name: string;
+        /**
+         *
+         * Size of the font (e.g. 11)
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        size: number;
+        /**
+         *
+         * Type of underline applied to the font. See Excel.ChartUnderlineStyle for details.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        underline: string;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartFont;
+    }
+    /**
+     *
+     * Manages sorting operations on Range objects.
+     *
+     * [Api set: ExcelApi 1.2]
+     */
+    class RangeSort extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Perform a sort operation.
+         *
+         * @param fields The list of conditions to sort on.
+         * @param matchCase Whether to have the casing impact string ordering.
+         * @param hasHeaders Whether the range has a header.
+         * @param orientation Whether the operation is sorting rows or columns.
+         * @param method The ordering method used for Chinese characters.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        apply(fields: Array<Excel.SortField>, matchCase?: boolean, hasHeaders?: boolean, orientation?: string, method?: string): void;
+    }
+    /**
+     *
+     * Manages sorting operations on Table objects.
+     *
+     * [Api set: ExcelApi 1.2]
+     */
+    class TableSort extends OfficeExtension.ClientObject {
+        private m_fields;
+        private m_matchCase;
+        private m_method;
+        /**
+         *
+         * Represents the current conditions used to last sort the table.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        fields: Array<Excel.SortField>;
+        /**
+         *
+         * Represents whether the casing impacted the last sort of the table.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        matchCase: boolean;
+        /**
+         *
+         * Represents Chinese character ordering method last used to sort the table.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        method: string;
+        /**
+         *
+         * Perform a sort operation.
+         *
+         * @param fields The list of conditions to sort on.
+         * @param matchCase Whether to have the casing impact string ordering.
+         * @param method The ordering method used for Chinese characters.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        apply(fields: Array<Excel.SortField>, matchCase?: boolean, method?: string): void;
+        /**
+         *
+         * Clears the sorting that is currently on the table. While this doesn't modify the table's ordering, it clears the state of the header buttons.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        clear(): void;
+        /**
+         *
+         * Reapplies the current sorting parameters to the table.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        reapply(): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableSort;
+    }
+    /**
+     *
+     * Represents a condition in a sorting operation.
+     *
+     * [Api set: ExcelApi 1.2]
+     */
+    interface SortField {
+        /**
+         *
+         * Represents whether the sorting is done in an ascending fashion.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        ascending?: boolean;
+        /**
+         *
+         * Represents the color that is the target of the condition if the sorting is on font or cell color.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        color?: string;
+        /**
+         *
+         * Represents additional sorting options for this field.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        dataOption?: string;
+        /**
+         *
+         * Represents the icon that is the target of the condition if the sorting is on the cell's icon.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        icon?: Excel.Icon;
+        /**
+         *
+         * Represents the column (or row, depending on the sort orientation) that the condition is on. Represented as an offset from the first column (or row).
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        key: number;
+        /**
+         *
+         * Represents the type of sorting of this condition.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        sortOn?: string;
+    }
+    /**
+     *
+     * Manages the filtering of a table's column.
+     *
+     * [Api set: ExcelApi 1.2]
+     */
+    class Filter extends OfficeExtension.ClientObject {
+        private m_criteria;
+        /**
+         *
+         * The currently applied filter on the given column.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        criteria: Excel.FilterCriteria;
+        /**
+         *
+         * Apply the given filter criteria on the given column.
+         *
+         * @param criteria The criteria to apply.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        apply(criteria: Excel.FilterCriteria): void;
+        /**
+         *
+         * Apply a "Bottom Item" filter to the column for the given number of elements.
+         *
+         * @param count The number of elements from the bottom to show.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        applyBottomItemsFilter(count: number): void;
+        /**
+         *
+         * Apply a "Bottom Percent" filter to the column for the given percentage of elements.
+         *
+         * @param percent The percentage of elements from the bottom to show.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        applyBottomPercentFilter(percent: number): void;
+        /**
+         *
+         * Apply a "Cell Color" filter to the column for the given color.
+         *
+         * @param color The background color of the cells to show.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        applyCellColorFilter(color: string): void;
+        /**
+         *
+         * Apply a "Icon" filter to the column for the given criteria strings.
+         *
+         * @param criteria1 The first criteria string.
+         * @param criteria2 The second criteria string.
+         * @param oper The operator that describes how the two criteria are joined.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        applyCustomFilter(criteria1: string, criteria2?: string, oper?: string): void;
+        /**
+         *
+         * Apply a "Dynamic" filter to the column.
+         *
+         * @param criteria The dynamic criteria to apply.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        applyDynamicFilter(criteria: string): void;
+        /**
+         *
+         * Apply a "Font Color" filter to the column for the given color.
+         *
+         * @param color The font color of the cells to show.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        applyFontColorFilter(color: string): void;
+        /**
+         *
+         * Apply a "Icon" filter to the column for the given icon.
+         *
+         * @param icon The icons of the cells to show.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        applyIconFilter(icon: Excel.Icon): void;
+        /**
+         *
+         * Apply a "Top Item" filter to the column for the given number of elements.
+         *
+         * @param count The number of elements from the top to show.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        applyTopItemsFilter(count: number): void;
+        /**
+         *
+         * Apply a "Top Percent" filter to the column for the given percentage of elements.
+         *
+         * @param percent The percentage of elements from the top to show.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        applyTopPercentFilter(percent: number): void;
+        /**
+         *
+         * Apply a "Values" filter to the column for the given values.
+         *
+         * @param values The list of values to show.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        applyValuesFilter(values: Array<string | Excel.FilterDatetime>): void;
+        /**
+         *
+         * Clear the filter on the given column.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        clear(): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Filter;
+    }
+    /**
+     *
+     * Represents the filtering criteria applied to a column.
+     *
+     * [Api set: ExcelApi 1.2]
+     */
+    interface FilterCriteria {
+        /**
+         *
+         * The HTML color string used to filter cells. Used with "cellColor" and "fontColor" filtering.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        color?: string;
+        /**
+         *
+         * The first criterion used to filter data. Used as an operator in the case of "custom" filtering.
+             For example ">50" for number greater than 50 or "=*s" for values ending in "s".
+
+             Used as a number in the case of top/bottom items/percents. E.g. "5" for the top 5 items if filterOn is set to "topItems"
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        criterion1?: string;
+        /**
+         *
+         * The second criterion used to filter data. Only used as an operator in the case of "custom" filtering.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        criterion2?: string;
+        /**
+         *
+         * The dynamic criteria from the Excel.DynamicFilterCriteria set to apply on this column. Used with "dynamic" filtering.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        dynamicCriteria?: string;
+        /**
+         *
+         * The property used by the filter to determine whether the values should stay visible.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        filterOn: string;
+        /**
+         *
+         * The icon used to filter cells. Used with "icon" filtering.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        icon?: Excel.Icon;
+        /**
+         *
+         * The operator used to combine criterion 1 and 2 when using "custom" filtering.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        operator?: string;
+        /**
+         *
+         * The set of values to be used as part of "values" filtering.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        values?: Array<string | Excel.FilterDatetime>;
+    }
+    /**
+     *
+     * Represents how to filter a date when filtering on values.
+     *
+     * [Api set: ExcelApi 1.2]
+     */
+    interface FilterDatetime {
+        /**
+         *
+         * The date in ISO8601 format used to filter data.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        date: string;
+        /**
+         *
+         * How specific the date should be used to keep data. For example, if the date is 2005-04-02 and the specifity is set to "month", the filter operation will keep all rows with a date in the month of april 2009.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        specificity: string;
+    }
+    /**
+     *
+     * Represents a cell icon.
+     *
+     * [Api set: ExcelApi 1.2]
+     */
+    interface Icon {
+        /**
+         *
+         * Represents the index of the icon in the given set.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        index: number;
+        /**
+         *
+         * Represents the set that the icon is part of.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        set: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    namespace BindingType {
+        var range: string;
+        var table: string;
+        var text: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    namespace BorderIndex {
+        var edgeTop: string;
+        var edgeBottom: string;
+        var edgeLeft: string;
+        var edgeRight: string;
+        var insideVertical: string;
+        var insideHorizontal: string;
+        var diagonalDown: string;
+        var diagonalUp: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    namespace BorderLineStyle {
+        var none: string;
+        var continuous: string;
+        var dash: string;
+        var dashDot: string;
+        var dashDotDot: string;
+        var dot: string;
+        var double: string;
+        var slantDashDot: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    namespace BorderWeight {
+        var hairline: string;
+        var thin: string;
+        var medium: string;
+        var thick: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    namespace CalculationMode {
+        var automatic: string;
+        var automaticExceptTables: string;
+        var manual: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    namespace CalculationType {
+        var recalculate: string;
+        var full: string;
+        var fullRebuild: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    namespace ClearApplyTo {
+        var all: string;
+        var formats: string;
+        var contents: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    namespace ChartDataLabelPosition {
+        var invalid: string;
+        var none: string;
+        var center: string;
+        var insideEnd: string;
+        var insideBase: string;
+        var outsideEnd: string;
+        var left: string;
+        var right: string;
+        var top: string;
+        var bottom: string;
+        var bestFit: string;
+        var callout: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    namespace ChartLegendPosition {
+        var invalid: string;
+        var top: string;
+        var bottom: string;
+        var left: string;
+        var right: string;
+        var corner: string;
+        var custom: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    namespace ChartSeriesBy {
+        var auto: string;
+        var columns: string;
+        var rows: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    namespace ChartType {
+        var invalid: string;
+        var columnClustered: string;
+        var columnStacked: string;
+        var columnStacked100: string;
+        var _3DColumnClustered: string;
+        var _3DColumnStacked: string;
+        var _3DColumnStacked100: string;
+        var barClustered: string;
+        var barStacked: string;
+        var barStacked100: string;
+        var _3DBarClustered: string;
+        var _3DBarStacked: string;
+        var _3DBarStacked100: string;
+        var lineStacked: string;
+        var lineStacked100: string;
+        var lineMarkers: string;
+        var lineMarkersStacked: string;
+        var lineMarkersStacked100: string;
+        var pieOfPie: string;
+        var pieExploded: string;
+        var _3DPieExploded: string;
+        var barOfPie: string;
+        var xyscatterSmooth: string;
+        var xyscatterSmoothNoMarkers: string;
+        var xyscatterLines: string;
+        var xyscatterLinesNoMarkers: string;
+        var areaStacked: string;
+        var areaStacked100: string;
+        var _3DAreaStacked: string;
+        var _3DAreaStacked100: string;
+        var doughnutExploded: string;
+        var radarMarkers: string;
+        var radarFilled: string;
+        var surface: string;
+        var surfaceWireframe: string;
+        var surfaceTopView: string;
+        var surfaceTopViewWireframe: string;
+        var bubble: string;
+        var bubble3DEffect: string;
+        var stockHLC: string;
+        var stockOHLC: string;
+        var stockVHLC: string;
+        var stockVOHLC: string;
+        var cylinderColClustered: string;
+        var cylinderColStacked: string;
+        var cylinderColStacked100: string;
+        var cylinderBarClustered: string;
+        var cylinderBarStacked: string;
+        var cylinderBarStacked100: string;
+        var cylinderCol: string;
+        var coneColClustered: string;
+        var coneColStacked: string;
+        var coneColStacked100: string;
+        var coneBarClustered: string;
+        var coneBarStacked: string;
+        var coneBarStacked100: string;
+        var coneCol: string;
+        var pyramidColClustered: string;
+        var pyramidColStacked: string;
+        var pyramidColStacked100: string;
+        var pyramidBarClustered: string;
+        var pyramidBarStacked: string;
+        var pyramidBarStacked100: string;
+        var pyramidCol: string;
+        var _3DColumn: string;
+        var line: string;
+        var _3DLine: string;
+        var _3DPie: string;
+        var pie: string;
+        var xyscatter: string;
+        var _3DArea: string;
+        var area: string;
+        var doughnut: string;
+        var radar: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    namespace ChartUnderlineStyle {
+        var none: string;
+        var single: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    namespace DeleteShiftDirection {
+        var up: string;
+        var left: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.2]
+     */
+    namespace DynamicFilterCriteria {
+        var unknown: string;
+        var aboveAverage: string;
+        var allDatesInPeriodApril: string;
+        var allDatesInPeriodAugust: string;
+        var allDatesInPeriodDecember: string;
+        var allDatesInPeriodFebruray: string;
+        var allDatesInPeriodJanuary: string;
+        var allDatesInPeriodJuly: string;
+        var allDatesInPeriodJune: string;
+        var allDatesInPeriodMarch: string;
+        var allDatesInPeriodMay: string;
+        var allDatesInPeriodNovember: string;
+        var allDatesInPeriodOctober: string;
+        var allDatesInPeriodQuarter1: string;
+        var allDatesInPeriodQuarter2: string;
+        var allDatesInPeriodQuarter3: string;
+        var allDatesInPeriodQuarter4: string;
+        var allDatesInPeriodSeptember: string;
+        var belowAverage: string;
+        var lastMonth: string;
+        var lastQuarter: string;
+        var lastWeek: string;
+        var lastYear: string;
+        var nextMonth: string;
+        var nextQuarter: string;
+        var nextWeek: string;
+        var nextYear: string;
+        var thisMonth: string;
+        var thisQuarter: string;
+        var thisWeek: string;
+        var thisYear: string;
+        var today: string;
+        var tomorrow: string;
+        var yearToDate: string;
+        var yesterday: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.2]
+     */
+    namespace FilterDatetimeSpecificity {
+        var year: string;
+        var month: string;
+        var day: string;
+        var hour: string;
+        var minute: string;
+        var second: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.2]
+     */
+    namespace FilterOn {
+        var bottomItems: string;
+        var bottomPercent: string;
+        var cellColor: string;
+        var dynamic: string;
+        var fontColor: string;
+        var values: string;
+        var topItems: string;
+        var topPercent: string;
+        var icon: string;
+        var custom: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.2]
+     */
+    namespace FilterOperator {
+        var and: string;
+        var or: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    namespace HorizontalAlignment {
+        var general: string;
+        var left: string;
+        var center: string;
+        var right: string;
+        var fill: string;
+        var justify: string;
+        var centerAcrossSelection: string;
+        var distributed: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.2]
+     */
+    namespace IconSet {
+        var invalid: string;
+        var threeArrows: string;
+        var threeArrowsGray: string;
+        var threeFlags: string;
+        var threeTrafficLights1: string;
+        var threeTrafficLights2: string;
+        var threeSigns: string;
+        var threeSymbols: string;
+        var threeSymbols2: string;
+        var fourArrows: string;
+        var fourArrowsGray: string;
+        var fourRedToBlack: string;
+        var fourRating: string;
+        var fourTrafficLights: string;
+        var fiveArrows: string;
+        var fiveArrowsGray: string;
+        var fiveRating: string;
+        var fiveQuarters: string;
+        var threeStars: string;
+        var threeTriangles: string;
+        var fiveBoxes: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.2]
+     */
+    namespace ImageFittingMode {
+        var fit: string;
+        var fitAndCenter: string;
+        var fill: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    namespace InsertShiftDirection {
+        var down: string;
+        var right: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    namespace NamedItemType {
+        var string: string;
+        var integer: string;
+        var double: string;
+        var boolean: string;
+        var range: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    namespace RangeUnderlineStyle {
+        var none: string;
+        var single: string;
+        var double: string;
+        var singleAccountant: string;
+        var doubleAccountant: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    namespace SheetVisibility {
+        var visible: string;
+        var hidden: string;
+        var veryHidden: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    namespace RangeValueType {
+        var unknown: string;
+        var empty: string;
+        var string: string;
+        var integer: string;
+        var double: string;
+        var boolean: string;
+        var error: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.2]
+     */
+    namespace SortOrientation {
+        var rows: string;
+        var columns: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.2]
+     */
+    namespace SortOn {
+        var value: string;
+        var cellColor: string;
+        var fontColor: string;
+        var icon: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.2]
+     */
+    namespace SortDataOption {
+        var normal: string;
+        var textAsNumber: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.2]
+     */
+    namespace SortMethod {
+        var pinYin: string;
+        var strokeCount: string;
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    namespace VerticalAlignment {
+        var top: string;
+        var center: string;
+        var bottom: string;
+        var justify: string;
+        var distributed: string;
+    }
+    /**
+     *
+     * An object containing the result of a function-evaluation operation
+     *
+     * [Api set: ExcelApi 1.2]
+     */
+    class FunctionResult<T> extends OfficeExtension.ClientObject {
+        private m_error;
+        private m_value;
+        /**
+         *
+         * Error value (such as "#DIV/0") representing the error. If the error string is not set, then the function succeeded, and its result is written to the Value field. The error is always in the English locale.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        error: string;
+        /**
+         *
+         * The value of function evaluation. The value field will be populated only if no error has occured (i.e., the Error property is not set).
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        value: T;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): FunctionResult<T>;
+    }
+    /**
+     *
+     * An object for evaluating Excel functions.
+     *
+     * [Api set: ExcelApi 1.2]
+     */
+    class Functions extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Returns the absolute value of a number, a number without its sign.
+         *
+         * @param number Is the real number for which you want the absolute value.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        abs(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the accrued interest for a security that pays periodic interest.
+         *
+         * @param issue Is the security's issue date, expressed as a serial date number.
+         * @param firstInterest Is the security's first interest date, expressed as a serial date number.
+         * @param settlement Is the security's settlement date, expressed as a serial date number.
+         * @param rate Is the security's annual coupon rate.
+         * @param par Is the security's par value.
+         * @param frequency Is the number of coupon payments per year.
+         * @param basis Is the type of day count basis to use.
+         * @param calcMethod Is a logical value: to accrued interest from issue date = TRUE or omitted; to calculate from last coupon payment date = FALSE.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        accrInt(issue: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, firstInterest: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, par: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, calcMethod?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the accrued interest for a security that pays interest at maturity.
+         *
+         * @param issue Is the security's issue date, expressed as a serial date number.
+         * @param settlement Is the security's maturity date, expressed as a serial date number.
+         * @param rate Is the security's annual coupon rate.
+         * @param par Is the security's par value.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        accrIntM(issue: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, par: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the arccosine of a number, in radians in the range 0 to Pi. The arccosine is the angle whose cosine is Number.
+         *
+         * @param number Is the cosine of the angle you want and must be from -1 to 1.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        acos(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the inverse hyperbolic cosine of a number.
+         *
+         * @param number Is any real number equal to or greater than 1.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        acosh(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the arccotangent of a number, in radians in the range 0 to Pi.
+         *
+         * @param number Is the cotangent of the angle you want.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        acot(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the inverse hyperbolic cotangent of a number.
+         *
+         * @param number Is the hyperbolic cotangent of the angle that you want.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        acoth(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the prorated linear depreciation of an asset for each accounting period.
+         *
+         * @param cost Is the cost of the asset.
+         * @param datePurchased Is the date the asset is purchased.
+         * @param firstPeriod Is the date of the end of the first period.
+         * @param salvage Is the salvage value at the end of life of the asset.
+         * @param period Is the period.
+         * @param rate Is the rate of depreciation.
+         * @param basis Year_basis : 0 for year of 360 days, 1 for actual, 3 for year of 365 days.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        amorDegrc(cost: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, datePurchased: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, firstPeriod: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, salvage: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, period: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the prorated linear depreciation of an asset for each accounting period.
+         *
+         * @param cost Is the cost of the asset.
+         * @param datePurchased Is the date the asset is purchased.
+         * @param firstPeriod Is the date of the end of the first period.
+         * @param salvage Is the salvage value at the end of life of the asset.
+         * @param period Is the period.
+         * @param rate Is the rate of depreciation.
+         * @param basis Year_basis : 0 for year of 360 days, 1 for actual, 3 for year of 365 days.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        amorLinc(cost: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, datePurchased: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, firstPeriod: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, salvage: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, period: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Checks whether all arguments are TRUE, and returns TRUE if all arguments are TRUE.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 conditions you want to test that can be either TRUE or FALSE and can be logical values, arrays, or references.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        and(...values: Array<boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<boolean>;
+        /**
+         *
+         * Converts a Roman numeral to Arabic.
+         *
+         * @param text Is the Roman numeral you want to convert.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        arabic(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the number of areas in a reference. An area is a range of contiguous cells or a single cell.
+         *
+         * @param reference Is a reference to a cell or range of cells and can refer to multiple areas.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        areas(reference: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Changes full-width (double-byte) characters to half-width (single-byte) characters. Use with double-byte character sets (DBCS).
+         *
+         * @param text Is a text, or a reference to a cell containing a text.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        asc(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Returns the arcsine of a number in radians, in the range -Pi/2 to Pi/2.
+         *
+         * @param number Is the sine of the angle you want and must be from -1 to 1.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        asin(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the inverse hyperbolic sine of a number.
+         *
+         * @param number Is any real number equal to or greater than 1.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        asinh(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the arctangent of a number in radians, in the range -Pi/2 to Pi/2.
+         *
+         * @param number Is the tangent of the angle you want.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        atan(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the arctangent of the specified x- and y- coordinates, in radians between -Pi and Pi, excluding -Pi.
+         *
+         * @param xNum Is the x-coordinate of the point.
+         * @param yNum Is the y-coordinate of the point.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        atan2(xNum: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, yNum: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the inverse hyperbolic tangent of a number.
+         *
+         * @param number Is any real number between -1 and 1 excluding -1 and 1.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        atanh(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the average of the absolute deviations of data points from their mean. Arguments can be numbers or names, arrays, or references that contain numbers.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 arguments for which you want the average of the absolute deviations.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        aveDev(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Returns the average (arithmetic mean) of its arguments, which can be numbers or names, arrays, or references that contain numbers.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 numeric arguments for which you want the average.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        average(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Returns the average (arithmetic mean) of its arguments, evaluating text and FALSE in arguments as 0; TRUE evaluates as 1. Arguments can be numbers, names, arrays, or references.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 arguments for which you want the average.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        averageA(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Finds average(arithmetic mean) for the cells specified by a given condition or criteria.
+         *
+         * @param range Is the range of cells you want evaluated.
+         * @param criteria Is the condition or criteria in the form of a number, expression, or text that defines which cells will be used to find the average.
+         * @param averageRange Are the actual cells to be used to find the average. If omitted, the cells in range are used.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        averageIf(range: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, averageRange?: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Finds average(arithmetic mean) for the cells specified by a given set of conditions or criteria.
+         *
+         * @param averageRange Are the actual cells to be used to find the average.
+         * @param values List of parameters, where the first element of each pair is the Is the range of cells you want evaluated for the particular condition , and the second element is is the condition or criteria in the form of a number, expression, or text that defines which cells will be used to find the average.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        averageIfs(averageRange: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, ...values: Array<Excel.Range | Excel.RangeReference | Excel.FunctionResult<any> | number | string | boolean>): FunctionResult<number>;
+        /**
+         *
+         * Converts a number to text (baht).
+         *
+         * @param number Is a number that you want to convert.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        bahtText(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Converts a number into a text representation with the given radix (base).
+         *
+         * @param number Is the number that you want to convert.
+         * @param radix Is the base Radix that you want to convert the number into.
+         * @param minLength Is the minimum length of the returned string.  If omitted leading zeros are not added.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        base(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, radix: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, minLength?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Returns the modified Bessel function In(x).
+         *
+         * @param x Is the value at which to evaluate the function.
+         * @param n Is the order of the Bessel function.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        besselI(x: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, n: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the Bessel function Jn(x).
+         *
+         * @param x Is the value at which to evaluate the function.
+         * @param n Is the order of the Bessel function.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        besselJ(x: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, n: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the modified Bessel function Kn(x).
+         *
+         * @param x Is the value at which to evaluate the function.
+         * @param n Is the order of the function.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        besselK(x: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, n: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the Bessel function Yn(x).
+         *
+         * @param x Is the value at which to evaluate the function.
+         * @param n Is the order of the function.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        besselY(x: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, n: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the beta probability distribution function.
+         *
+         * @param x Is the value between A and B at which to evaluate the function.
+         * @param alpha Is a parameter to the distribution and must be greater than 0.
+         * @param beta Is a parameter to the distribution and must be greater than 0.
+         * @param cumulative Is a logical value: for the cumulative distribution function, use TRUE; for the probability density function, use FALSE.
+         * @param A Is an optional lower bound to the interval of x. If omitted, A = 0.
+         * @param B Is an optional upper bound to the interval of x. If omitted, B = 1.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        beta_Dist(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, alpha: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, beta: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, A?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, B?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the inverse of the cumulative beta probability density function (BETA.DIST).
+         *
+         * @param probability Is a probability associated with the beta distribution.
+         * @param alpha Is a parameter to the distribution and must be greater than 0.
+         * @param beta Is a parameter to the distribution and must be greater than 0.
+         * @param A Is an optional lower bound to the interval of x. If omitted, A = 0.
+         * @param B Is an optional upper bound to the interval of x. If omitted, B = 1.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        beta_Inv(probability: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, alpha: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, beta: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, A?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, B?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts a binary number to decimal.
+         *
+         * @param number Is the binary number you want to convert.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        bin2Dec(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts a binary number to hexadecimal.
+         *
+         * @param number Is the binary number you want to convert.
+         * @param places Is the number of characters to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        bin2Hex(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, places?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts a binary number to octal.
+         *
+         * @param number Is the binary number you want to convert.
+         * @param places Is the number of characters to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        bin2Oct(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, places?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the individual term binomial distribution probability.
+         *
+         * @param numberS Is the number of successes in trials.
+         * @param trials Is the number of independent trials.
+         * @param probabilityS Is the probability of success on each trial.
+         * @param cumulative Is a logical value: for the cumulative distribution function, use TRUE; for the probability mass function, use FALSE.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        binom_Dist(numberS: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, trials: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, probabilityS: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the probability of a trial result using a binomial distribution.
+         *
+         * @param trials Is the number of independent trials.
+         * @param probabilityS Is the probability of success on each trial.
+         * @param numberS Is the number of successes in trials.
+         * @param numberS2 If provided this function returns the probability that the number of successful trials shall lie between numberS and numberS2.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        binom_Dist_Range(trials: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, probabilityS: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numberS: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numberS2?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the smallest value for which the cumulative binomial distribution is greater than or equal to a criterion value.
+         *
+         * @param trials Is the number of Bernoulli trials.
+         * @param probabilityS Is the probability of success on each trial, a number between 0 and 1 inclusive.
+         * @param alpha Is the criterion value, a number between 0 and 1 inclusive.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        binom_Inv(trials: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, probabilityS: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, alpha: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns a bitwise 'And' of two numbers.
+         *
+         * @param number1 Is the decimal representation of the binary number you want to evaluate.
+         * @param number2 Is the decimal representation of the binary number you want to evaluate.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        bitand(number1: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, number2: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns a number shifted left by shift_amount bits.
+         *
+         * @param number Is the decimal representation of the binary number you want to evaluate.
+         * @param shiftAmount Is the number of bits that you want to shift Number left by.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        bitlshift(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, shiftAmount: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns a bitwise 'Or' of two numbers.
+         *
+         * @param number1 Is the decimal representation of the binary number you want to evaluate.
+         * @param number2 Is the decimal representation of the binary number you want to evaluate.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        bitor(number1: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, number2: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns a number shifted right by shift_amount bits.
+         *
+         * @param number Is the decimal representation of the binary number you want to evaluate.
+         * @param shiftAmount Is the number of bits that you want to shift Number right by.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        bitrshift(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, shiftAmount: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns a bitwise 'Exclusive Or' of two numbers.
+         *
+         * @param number1 Is the decimal representation of the binary number you want to evaluate.
+         * @param number2 Is the decimal representation of the binary number you want to evaluate.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        bitxor(number1: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, number2: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Rounds a number up, to the nearest integer or to the nearest multiple of significance.
+         *
+         * @param number Is the value you want to round.
+         * @param significance Is the multiple to which you want to round.
+         * @param mode When given and nonzero this function will round away from zero.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        ceiling_Math(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, significance?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, mode?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Rounds a number up, to the nearest integer or to the nearest multiple of significance.
+         *
+         * @param number Is the value you want to round.
+         * @param significance Is the multiple to which you want to round.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        ceiling_Precise(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, significance?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the character specified by the code number from the character set for your computer.
+         *
+         * @param number Is a number between 1 and 255 specifying which character you want.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        char(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Returns the left-tailed probability of the chi-squared distribution.
+         *
+         * @param x Is the value at which you want to evaluate the distribution, a nonnegative number.
+         * @param degFreedom Is the number of degrees of freedom, a number between 1 and 10^10, excluding 10^10.
+         * @param cumulative Is a logical value for the function to return: the cumulative distribution function = TRUE; the probability density function = FALSE.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        chiSq_Dist(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the right-tailed probability of the chi-squared distribution.
+         *
+         * @param x Is the value at which you want to evaluate the distribution, a nonnegative number.
+         * @param degFreedom Is the number of degrees of freedom, a number between 1 and 10^10, excluding 10^10.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        chiSq_Dist_RT(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the inverse of the left-tailed probability of the chi-squared distribution.
+         *
+         * @param probability Is a probability associated with the chi-squared distribution, a value between 0 and 1 inclusive.
+         * @param degFreedom Is the number of degrees of freedom, a number between 1 and 10^10, excluding 10^10.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        chiSq_Inv(probability: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the inverse of the right-tailed probability of the chi-squared distribution.
+         *
+         * @param probability Is a probability associated with the chi-squared distribution, a value between 0 and 1 inclusive.
+         * @param degFreedom Is the number of degrees of freedom, a number between 1 and 10^10, excluding 10^10.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        chiSq_Inv_RT(probability: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Chooses a value or action to perform from a list of values, based on an index number.
+         *
+         * @param indexNum Specifies which value argument is selected. indexNum must be between 1 and 254, or a formula or a reference to a number between 1 and 254.
+         * @param values List of parameters, whose elements are 1 to 254 numbers, cell references, defined names, formulas, functions, or text arguments from which CHOOSE selects.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        choose(indexNum: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, ...values: Array<Excel.Range | number | string | boolean | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number | string | boolean>;
+        /**
+         *
+         * Removes all nonprintable characters from text.
+         *
+         * @param text Is any worksheet information from which you want to remove nonprintable characters.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        clean(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Returns a numeric code for the first character in a text string, in the character set used by your computer.
+         *
+         * @param text Is the text for which you want the code of the first character.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        code(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the number of columns in an array or reference.
+         *
+         * @param array Is an array or array formula, or a reference to a range of cells for which you want the number of columns.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        columns(array: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the number of combinations for a given number of items.
+         *
+         * @param number Is the total number of items.
+         * @param numberChosen Is the number of items in each combination.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        combin(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numberChosen: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the number of combinations with repetitions for a given number of items.
+         *
+         * @param number Is the total number of items.
+         * @param numberChosen Is the number of items in each combination.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        combina(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numberChosen: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts real and imaginary coefficients into a complex number.
+         *
+         * @param realNum Is the real coefficient of the complex number.
+         * @param iNum Is the imaginary coefficient of the complex number.
+         * @param suffix Is the suffix for the imaginary component of the complex number.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        complex(realNum: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, iNum: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, suffix?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Joins several text strings into one text string.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 text strings to be joined into a single text string and can be text strings, numbers, or single-cell references.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        concatenate(...values: Array<string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<string>;
+        /**
+         *
+         * Returns the confidence interval for a population mean, using a normal distribution.
+         *
+         * @param alpha Is the significance level used to compute the confidence level, a number greater than 0 and less than 1.
+         * @param standardDev Is the population standard deviation for the data range and is assumed to be known. standardDev must be greater than 0.
+         * @param size Is the sample size.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        confidence_Norm(alpha: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, standardDev: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, size: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the confidence interval for a population mean, using a Student's T distribution.
+         *
+         * @param alpha Is the significance level used to compute the confidence level, a number greater than 0 and less than 1.
+         * @param standardDev Is the population standard deviation for the data range and is assumed to be known. standardDev must be greater than 0.
+         * @param size Is the sample size.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        confidence_T(alpha: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, standardDev: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, size: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts a number from one measurement system to another.
+         *
+         * @param number Is the value in from_units to convert.
+         * @param fromUnit Is the units for number.
+         * @param toUnit Is the units for the result.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        convert(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, fromUnit: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, toUnit: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the cosine of an angle.
+         *
+         * @param number Is the angle in radians for which you want the cosine.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        cos(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the hyperbolic cosine of a number.
+         *
+         * @param number Is any real number.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        cosh(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the cotangent of an angle.
+         *
+         * @param number Is the angle in radians for which you want the cotangent.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        cot(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the hyperbolic cotangent of a number.
+         *
+         * @param number Is the angle in radians for which you want the hyperbolic cotangent.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        coth(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Counts the number of cells in a range that contain numbers.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 arguments that can contain or refer to a variety of different types of data, but only numbers are counted.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        count(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Counts the number of cells in a range that are not empty.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 arguments representing the values and cells you want to count. Values can be any type of information.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        countA(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Counts the number of empty cells in a specified range of cells.
+         *
+         * @param range Is the range from which you want to count the empty cells.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        countBlank(range: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Counts the number of cells within a range that meet the given condition.
+         *
+         * @param range Is the range of cells from which you want to count nonblank cells.
+         * @param criteria Is the condition in the form of a number, expression, or text that defines which cells will be counted.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        countIf(range: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Counts the number of cells specified by a given set of conditions or criteria.
+         *
+         * @param values List of parameters, where the first element of each pair is the Is the range of cells you want evaluated for the particular condition , and the second element is is the condition in the form of a number, expression, or text that defines which cells will be counted.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        countIfs(...values: Array<Excel.Range | Excel.RangeReference | Excel.FunctionResult<any> | number | string | boolean>): FunctionResult<number>;
+        /**
+         *
+         * Returns the number of days from the beginning of the coupon period to the settlement date.
+         *
+         * @param settlement Is the security's settlement date, expressed as a serial date number.
+         * @param maturity Is the security's maturity date, expressed as a serial date number.
+         * @param frequency Is the number of coupon payments per year.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        coupDayBs(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the number of days in the coupon period that contains the settlement date.
+         *
+         * @param settlement Is the security's settlement date, expressed as a serial date number.
+         * @param maturity Is the security's maturity date, expressed as a serial date number.
+         * @param frequency Is the number of coupon payments per year.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        coupDays(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the number of days from the settlement date to the next coupon date.
+         *
+         * @param settlement Is the security's settlement date, expressed as a serial date number.
+         * @param maturity Is the security's maturity date, expressed as a serial date number.
+         * @param frequency Is the number of coupon payments per year.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        coupDaysNc(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the next coupon date after the settlement date.
+         *
+         * @param settlement Is the security's settlement date, expressed as a serial date number.
+         * @param maturity Is the security's maturity date, expressed as a serial date number.
+         * @param frequency Is the number of coupon payments per year.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        coupNcd(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the number of coupons payable between the settlement date and maturity date.
+         *
+         * @param settlement Is the security's settlement date, expressed as a serial date number.
+         * @param maturity Is the security's maturity date, expressed as a serial date number.
+         * @param frequency Is the number of coupon payments per year.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        coupNum(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the previous coupon date before the settlement date.
+         *
+         * @param settlement Is the security's settlement date, expressed as a serial date number.
+         * @param maturity Is the security's maturity date, expressed as a serial date number.
+         * @param frequency Is the number of coupon payments per year.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        coupPcd(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the cosecant of an angle.
+         *
+         * @param number Is the angle in radians for which you want the cosecant.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        csc(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the hyperbolic cosecant of an angle.
+         *
+         * @param number Is the angle in radians for which you want the hyperbolic cosecant.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        csch(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the cumulative interest paid between two periods.
+         *
+         * @param rate Is the interest rate.
+         * @param nper Is the total number of payment periods.
+         * @param pv Is the present value.
+         * @param startPeriod Is the first period in the calculation.
+         * @param endPeriod Is the last period in the calculation.
+         * @param type Is the timing of the payment.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        cumIPmt(rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, nper: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pv: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, startPeriod: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, endPeriod: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, type: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the cumulative principal paid on a loan between two periods.
+         *
+         * @param rate Is the interest rate.
+         * @param nper Is the total number of payment periods.
+         * @param pv Is the present value.
+         * @param startPeriod Is the first period in the calculation.
+         * @param endPeriod Is the last period in the calculation.
+         * @param type Is the timing of the payment.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        cumPrinc(rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, nper: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pv: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, startPeriod: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, endPeriod: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, type: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Averages the values in a column in a list or database that match conditions you specify.
+         *
+         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
+         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
+         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        daverage(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Counts the cells containing numbers in the field (column) of records in the database that match the conditions you specify.
+         *
+         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
+         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
+         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        dcount(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Counts nonblank cells in the field (column) of records in the database that match the conditions you specify.
+         *
+         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
+         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
+         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        dcountA(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Extracts from a database a single record that matches the conditions you specify.
+         *
+         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
+         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
+         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        dget(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number | boolean | string>;
+        /**
+         *
+         * Returns the largest number in the field (column) of records in the database that match the conditions you specify.
+         *
+         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
+         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
+         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        dmax(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the smallest number in the field (column) of records in the database that match the conditions you specify.
+         *
+         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
+         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
+         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        dmin(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Multiplies the values in the field (column) of records in the database that match the conditions you specify.
+         *
+         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
+         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
+         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        dproduct(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Estimates the standard deviation based on a sample from selected database entries.
+         *
+         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
+         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
+         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        dstDev(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Calculates the standard deviation based on the entire population of selected database entries.
+         *
+         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
+         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
+         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        dstDevP(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Adds the numbers in the field (column) of records in the database that match the conditions you specify.
+         *
+         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
+         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
+         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        dsum(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Estimates variance based on a sample from selected database entries.
+         *
+         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
+         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
+         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        dvar(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Calculates variance based on the entire population of selected database entries.
+         *
+         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
+         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
+         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        dvarP(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the number that represents the date in Microsoft Excel date-time code.
+         *
+         * @param year Is a number from 1900 or 1904 (depending on the workbook's date system) to 9999.
+         * @param month Is a number from 1 to 12 representing the month of the year.
+         * @param day Is a number from 1 to 31 representing the day of the month.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        date(year: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, month: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, day: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts a date in the form of text to a number that represents the date in Microsoft Excel date-time code.
+         *
+         * @param dateText Is text that represents a date in a Microsoft Excel date format, between 1/1/1900 or 1/1/1904 (depending on the workbook's date system) and 12/31/9999.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        datevalue(dateText: string | number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the day of the month, a number from 1 to 31.
+         *
+         * @param serialNumber Is a number in the date-time code used by Microsoft Excel.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        day(serialNumber: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the number of days between the two dates.
+         *
+         * @param endDate startDate and endDate are the two dates between which you want to know the number of days.
+         * @param startDate startDate and endDate are the two dates between which you want to know the number of days.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        days(endDate: string | number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, startDate: string | number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the number of days between two dates based on a 360-day year (twelve 30-day months).
+         *
+         * @param startDate startDate and endDate are the two dates between which you want to know the number of days.
+         * @param endDate startDate and endDate are the two dates between which you want to know the number of days.
+         * @param method Is a logical value specifying the calculation method: U.S. (NASD) = FALSE or omitted; European = TRUE.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        days360(startDate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, endDate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, method?: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the depreciation of an asset for a specified period using the fixed-declining balance method.
+         *
+         * @param cost Is the initial cost of the asset.
+         * @param salvage Is the salvage value at the end of the life of the asset.
+         * @param life Is the number of periods over which the asset is being depreciated (sometimes called the useful life of the asset).
+         * @param period Is the period for which you want to calculate the depreciation. Period must use the same units as Life.
+         * @param month Is the number of months in the first year. If month is omitted, it is assumed to be 12.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        db(cost: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, salvage: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, life: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, period: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, month?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Changes half-width (single-byte) characters within a character string to full-width (double-byte) characters. Use with double-byte character sets (DBCS).
+         *
+         * @param text Is a text, or a reference to a cell containing a text.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        dbcs(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Returns the depreciation of an asset for a specified period using the double-declining balance method or some other method you specify.
+         *
+         * @param cost Is the initial cost of the asset.
+         * @param salvage Is the salvage value at the end of the life of the asset.
+         * @param life Is the number of periods over which the asset is being depreciated (sometimes called the useful life of the asset).
+         * @param period Is the period for which you want to calculate the depreciation. Period must use the same units as Life.
+         * @param factor Is the rate at which the balance declines. If Factor is omitted, it is assumed to be 2 (the double-declining balance method).
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        ddb(cost: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, salvage: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, life: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, period: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, factor?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts a decimal number to binary.
+         *
+         * @param number Is the decimal integer you want to convert.
+         * @param places Is the number of characters to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        dec2Bin(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, places?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts a decimal number to hexadecimal.
+         *
+         * @param number Is the decimal integer you want to convert.
+         * @param places Is the number of characters to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        dec2Hex(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, places?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts a decimal number to octal.
+         *
+         * @param number Is the decimal integer you want to convert.
+         * @param places Is the number of characters to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        dec2Oct(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, places?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts a text representation of a number in a given base into a decimal number.
+         *
+         * @param number Is the number that you want to convert.
+         * @param radix Is the base Radix of the number you are converting.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        decimal(number: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, radix: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts radians to degrees.
+         *
+         * @param angle Is the angle in radians that you want to convert.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        degrees(angle: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Tests whether two numbers are equal.
+         *
+         * @param number1 Is the first number.
+         * @param number2 Is the second number.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        delta(number1: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, number2?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the sum of squares of deviations of data points from their sample mean.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 arguments, or an array or array reference, on which you want DEVSQ to calculate.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        devSq(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Returns the discount rate for a security.
+         *
+         * @param settlement Is the security's settlement date, expressed as a serial date number.
+         * @param maturity Is the security's maturity date, expressed as a serial date number.
+         * @param pr Is the security's price per $100 face value.
+         * @param redemption Is the security's redemption value per $100 face value.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        disc(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pr: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, redemption: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts a number to text, using currency format.
+         *
+         * @param number Is a number, a reference to a cell containing a number, or a formula that evaluates to a number.
+         * @param decimals Is the number of digits to the right of the decimal point. The number is rounded as necessary; if omitted, Decimals = 2.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        dollar(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, decimals?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Converts a dollar price, expressed as a fraction, into a dollar price, expressed as a decimal number.
+         *
+         * @param fractionalDollar Is a number expressed as a fraction.
+         * @param fraction Is the integer to use in the denominator of the fraction.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        dollarDe(fractionalDollar: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, fraction: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts a dollar price, expressed as a decimal number, into a dollar price, expressed as a fraction.
+         *
+         * @param decimalDollar Is a decimal number.
+         * @param fraction Is the integer to use in the denominator of a fraction.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        dollarFr(decimalDollar: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, fraction: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the annual duration of a security with periodic interest payments.
+         *
+         * @param settlement Is the security's settlement date, expressed as a serial date number.
+         * @param maturity Is the security's maturity date, expressed as a serial date number.
+         * @param coupon Is the security's annual coupon rate.
+         * @param yld Is the security's annual yield.
+         * @param frequency Is the number of coupon payments per year.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        duration(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, coupon: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, yld: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Rounds a number up, to the nearest integer or to the nearest multiple of significance.
+         *
+         * @param number Is the value you want to round.
+         * @param significance Is the multiple to which you want to round.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        ecma_Ceiling(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, significance: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the serial number of the date that is the indicated number of months before or after the start date.
+         *
+         * @param startDate Is a serial date number that represents the start date.
+         * @param months Is the number of months before or after startDate.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        edate(startDate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, months: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the effective annual interest rate.
+         *
+         * @param nominalRate Is the nominal interest rate.
+         * @param npery Is the number of compounding periods per year.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        effect(nominalRate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, npery: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the serial number of the last day of the month before or after a specified number of months.
+         *
+         * @param startDate Is a serial date number that represents the start date.
+         * @param months Is the number of months before or after the startDate.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        eoMonth(startDate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, months: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the error function.
+         *
+         * @param lowerLimit Is the lower bound for integrating ERF.
+         * @param upperLimit Is the upper bound for integrating ERF.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        erf(lowerLimit: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, upperLimit?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the complementary error function.
+         *
+         * @param x Is the lower bound for integrating ERF.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        erfC(x: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the complementary error function.
+         *
+         * @param X Is the lower bound for integrating ERFC.PRECISE.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        erfC_Precise(X: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the error function.
+         *
+         * @param X Is the lower bound for integrating ERF.PRECISE.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        erf_Precise(X: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns a number matching an error value.
+         *
+         * @param errorVal Is the error value for which you want the identifying number, and can be an actual error value or a reference to a cell containing an error value.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        error_Type(errorVal: string | number | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Rounds a positive number up and negative number down to the nearest even integer.
+         *
+         * @param number Is the value to round.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        even(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Checks whether two text strings are exactly the same, and returns TRUE or FALSE. EXACT is case-sensitive.
+         *
+         * @param text1 Is the first text string.
+         * @param text2 Is the second text string.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        exact(text1: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, text2: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<boolean>;
+        /**
+         *
+         * Returns e raised to the power of a given number.
+         *
+         * @param number Is the exponent applied to the base e. The constant e equals 2.71828182845904, the base of the natural logarithm.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        exp(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the exponential distribution.
+         *
+         * @param x Is the value of the function, a nonnegative number.
+         * @param lambda Is the parameter value, a positive number.
+         * @param cumulative Is a logical value for the function to return: the cumulative distribution function = TRUE; the probability density function = FALSE.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        expon_Dist(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, lambda: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the future value of an initial principal after applying a series of compound interest rates.
+         *
+         * @param principal Is the present value.
+         * @param schedule Is an array of interest rates to apply.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        fvschedule(principal: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, schedule: number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the (left-tailed) F probability distribution (degree of diversity) for two data sets.
+         *
+         * @param x Is the value at which to evaluate the function, a nonnegative number.
+         * @param degFreedom1 Is the numerator degrees of freedom, a number between 1 and 10^10, excluding 10^10.
+         * @param degFreedom2 Is the denominator degrees of freedom, a number between 1 and 10^10, excluding 10^10.
+         * @param cumulative Is a logical value for the function to return: the cumulative distribution function = TRUE; the probability density function = FALSE.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        f_Dist(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom1: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom2: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the (right-tailed) F probability distribution (degree of diversity) for two data sets.
+         *
+         * @param x Is the value at which to evaluate the function, a nonnegative number.
+         * @param degFreedom1 Is the numerator degrees of freedom, a number between 1 and 10^10, excluding 10^10.
+         * @param degFreedom2 Is the denominator degrees of freedom, a number between 1 and 10^10, excluding 10^10.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        f_Dist_RT(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom1: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom2: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the inverse of the (left-tailed) F probability distribution: if p = F.DIST(x,...), then F.INV(p,...) = x.
+         *
+         * @param probability Is a probability associated with the F cumulative distribution, a number between 0 and 1 inclusive.
+         * @param degFreedom1 Is the numerator degrees of freedom, a number between 1 and 10^10, excluding 10^10.
+         * @param degFreedom2 Is the denominator degrees of freedom, a number between 1 and 10^10, excluding 10^10.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        f_Inv(probability: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom1: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom2: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the inverse of the (right-tailed) F probability distribution: if p = F.DIST.RT(x,...), then F.INV.RT(p,...) = x.
+         *
+         * @param probability Is a probability associated with the F cumulative distribution, a number between 0 and 1 inclusive.
+         * @param degFreedom1 Is the numerator degrees of freedom, a number between 1 and 10^10, excluding 10^10.
+         * @param degFreedom2 Is the denominator degrees of freedom, a number between 1 and 10^10, excluding 10^10.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        f_Inv_RT(probability: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom1: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom2: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the factorial of a number, equal to 1*2*3*...* Number.
+         *
+         * @param number Is the nonnegative number you want the factorial of.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        fact(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the double factorial of a number.
+         *
+         * @param number Is the value for which to return the double factorial.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        factDouble(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the logical value FALSE.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        false(): FunctionResult<boolean>;
+        /**
+         *
+         * Returns the starting position of one text string within another text string. FIND is case-sensitive.
+         *
+         * @param findText Is the text you want to find. Use double quotes (empty text) to match the first character in withinText; wildcard characters not allowed.
+         * @param withinText Is the text containing the text you want to find.
+         * @param startNum Specifies the character at which to start the search. The first character in withinText is character number 1. If omitted, startNum = 1.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        find(findText: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, withinText: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, startNum?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Finds the starting position of one text string within another text string. FINDB is case-sensitive. Use with double-byte character sets (DBCS).
+         *
+         * @param findText Is the text you want to find.
+         * @param withinText Is the text containing the text you want to find.
+         * @param startNum Specifies the character at which to start the search.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        findB(findText: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, withinText: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, startNum?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the Fisher transformation.
+         *
+         * @param x Is the value for which you want the transformation, a number between -1 and 1, excluding -1 and 1.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        fisher(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the inverse of the Fisher transformation: if y = FISHER(x), then FISHERINV(y) = x.
+         *
+         * @param y Is the value for which you want to perform the inverse of the transformation.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        fisherInv(y: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Rounds a number to the specified number of decimals and returns the result as text with or without commas.
+         *
+         * @param number Is the number you want to round and convert to text.
+         * @param decimals Is the number of digits to the right of the decimal point. If omitted, Decimals = 2.
+         * @param noCommas Is a logical value: do not display commas in the returned text = TRUE; do display commas in the returned text = FALSE or omitted.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        fixed(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, decimals?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, noCommas?: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Rounds a number down, to the nearest integer or to the nearest multiple of significance.
+         *
+         * @param number Is the value you want to round.
+         * @param significance Is the multiple to which you want to round.
+         * @param mode When given and nonzero this function will round towards zero.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        floor_Math(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, significance?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, mode?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Rounds a number down, to the nearest integer or to the nearest multiple of significance.
+         *
+         * @param number Is the numeric value you want to round.
+         * @param significance Is the multiple to which you want to round.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        floor_Precise(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, significance?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the future value of an investment based on periodic, constant payments and a constant interest rate.
+         *
+         * @param rate Is the interest rate per period. For example, use 6%/4 for quarterly payments at 6% APR.
+         * @param nper Is the total number of payment periods in the investment.
+         * @param pmt Is the payment made each period; it cannot change over the life of the investment.
+         * @param pv Is the present value, or the lump-sum amount that a series of future payments is worth now. If omitted, Pv = 0.
+         * @param type Is a value representing the timing of payment: payment at the beginning of the period = 1; payment at the end of the period = 0 or omitted.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        fv(rate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, nper: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pmt: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pv?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, type?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the Gamma function value.
+         *
+         * @param x Is the value for which you want to calculate Gamma.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        gamma(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the natural logarithm of the gamma function.
+         *
+         * @param x Is the value for which you want to calculate GAMMALN, a positive number.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        gammaLn(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the natural logarithm of the gamma function.
+         *
+         * @param x Is the value for which you want to calculate GAMMALN.PRECISE, a positive number.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        gammaLn_Precise(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the gamma distribution.
+         *
+         * @param x Is the value at which you want to evaluate the distribution, a nonnegative number.
+         * @param alpha Is a parameter to the distribution, a positive number.
+         * @param beta Is a parameter to the distribution, a positive number. If beta = 1, GAMMA.DIST returns the standard gamma distribution.
+         * @param cumulative Is a logical value: return the cumulative distribution function = TRUE; return the probability mass function = FALSE or omitted.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        gamma_Dist(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, alpha: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, beta: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the inverse of the gamma cumulative distribution: if p = GAMMA.DIST(x,...), then GAMMA.INV(p,...) = x.
+         *
+         * @param probability Is the probability associated with the gamma distribution, a number between 0 and 1, inclusive.
+         * @param alpha Is a parameter to the distribution, a positive number.
+         * @param beta Is a parameter to the distribution, a positive number. If beta = 1, GAMMA.INV returns the inverse of the standard gamma distribution.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        gamma_Inv(probability: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, alpha: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, beta: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns 0.5 less than the standard normal cumulative distribution.
+         *
+         * @param x Is the value for which you want the distribution.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        gauss(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the greatest common divisor.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 values.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        gcd(...values: Array<number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Tests whether a number is greater than a threshold value.
+         *
+         * @param number Is the value to test against step.
+         * @param step Is the threshold value.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        geStep(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, step?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the geometric mean of an array or range of positive numeric data.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 numbers or names, arrays, or references that contain numbers for which you want the mean.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        geoMean(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Looks for a value in the top row of a table or array of values and returns the value in the same column from a row you specify.
+         *
+         * @param lookupValue Is the value to be found in the first row of the table and can be a value, a reference, or a text string.
+         * @param tableArray Is a table of text, numbers, or logical values in which data is looked up. tableArray can be a reference to a range or a range name.
+         * @param rowIndexNum Is the row number in tableArray from which the matching value should be returned. The first row of values in the table is row 1.
+         * @param rangeLookup Is a logical value: to find the closest match in the top row (sorted in ascending order) = TRUE or omitted; find an exact match = FALSE.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        hlookup(lookupValue: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, tableArray: Excel.Range | number | Excel.RangeReference | Excel.FunctionResult<any>, rowIndexNum: Excel.Range | number | Excel.RangeReference | Excel.FunctionResult<any>, rangeLookup?: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number | string | boolean>;
+        /**
+         *
+         * Returns the harmonic mean of a data set of positive numbers: the reciprocal of the arithmetic mean of reciprocals.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 numbers or names, arrays, or references that contain numbers for which you want the harmonic mean.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        harMean(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Converts a Hexadecimal number to binary.
+         *
+         * @param number Is the hexadecimal number you want to convert.
+         * @param places Is the number of characters to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        hex2Bin(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, places?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts a hexadecimal number to decimal.
+         *
+         * @param number Is the hexadecimal number you want to convert.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        hex2Dec(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts a hexadecimal number to octal.
+         *
+         * @param number Is the hexadecimal number you want to convert.
+         * @param places Is the number of characters to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        hex2Oct(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, places?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the hour as a number from 0 (12:00 A.M.) to 23 (11:00 P.M.).
+         *
+         * @param serialNumber Is a number in the date-time code used by Microsoft Excel, or text in time format, such as 16:48:00 or 4:48:00 PM.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        hour(serialNumber: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the hypergeometric distribution.
+         *
+         * @param sampleS Is the number of successes in the sample.
+         * @param numberSample Is the size of the sample.
+         * @param populationS Is the number of successes in the population.
+         * @param numberPop Is the population size.
+         * @param cumulative Is a logical value: for the cumulative distribution function, use TRUE; for the probability density function, use FALSE.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        hypGeom_Dist(sampleS: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numberSample: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, populationS: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numberPop: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Creates a shortcut or jump that opens a document stored on your hard drive, a network server, or on the Internet.
+         *
+         * @param linkLocation Is the text giving the path and file name to the document to be opened, a hard drive location, UNC address, or URL path.
+         * @param friendlyName Is text or a number that is displayed in the cell. If omitted, the cell displays the linkLocation text.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        hyperlink(linkLocation: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, friendlyName?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number | string | boolean>;
+        /**
+         *
+         * Rounds a number up, to the nearest integer or to the nearest multiple of significance.
+         *
+         * @param number Is the value you want to round.
+         * @param significance Is the optional multiple to which you want to round.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        iso_Ceiling(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, significance?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Checks whether a condition is met, and returns one value if TRUE, and another value if FALSE.
+         *
+         * @param logicalTest Is any value or expression that can be evaluated to TRUE or FALSE.
+         * @param valueIfTrue Is the value that is returned if logicalTest is TRUE. If omitted, TRUE is returned. You can nest up to seven IF functions.
+         * @param valueIfFalse Is the value that is returned if logicalTest is FALSE. If omitted, FALSE is returned.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        if(logicalTest: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, valueIfTrue?: Excel.Range | number | string | boolean | Excel.RangeReference | Excel.FunctionResult<any>, valueIfFalse?: Excel.Range | number | string | boolean | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number | string | boolean>;
+        /**
+         *
+         * Returns the absolute value (modulus) of a complex number.
+         *
+         * @param inumber Is a complex number for which you want the absolute value.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imAbs(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the argument q, an angle expressed in radians.
+         *
+         * @param inumber Is a complex number for which you want the argument.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imArgument(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the complex conjugate of a complex number.
+         *
+         * @param inumber Is a complex number for which you want the conjugate.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imConjugate(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the cosine of a complex number.
+         *
+         * @param inumber Is a complex number for which you want the cosine.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imCos(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the hyperbolic cosine of a complex number.
+         *
+         * @param inumber Is a complex number for which you want the hyperbolic cosine.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imCosh(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the cotangent of a complex number.
+         *
+         * @param inumber Is a complex number for which you want the cotangent.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imCot(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the cosecant of a complex number.
+         *
+         * @param inumber Is a complex number for which you want the cosecant.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imCsc(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the hyperbolic cosecant of a complex number.
+         *
+         * @param inumber Is a complex number for which you want the hyperbolic cosecant.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imCsch(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the quotient of two complex numbers.
+         *
+         * @param inumber1 Is the complex numerator or dividend.
+         * @param inumber2 Is the complex denominator or divisor.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imDiv(inumber1: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, inumber2: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the exponential of a complex number.
+         *
+         * @param inumber Is a complex number for which you want the exponential.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imExp(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the natural logarithm of a complex number.
+         *
+         * @param inumber Is a complex number for which you want the natural logarithm.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imLn(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the base-10 logarithm of a complex number.
+         *
+         * @param inumber Is a complex number for which you want the common logarithm.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imLog10(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the base-2 logarithm of a complex number.
+         *
+         * @param inumber Is a complex number for which you want the base-2 logarithm.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imLog2(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns a complex number raised to an integer power.
+         *
+         * @param inumber Is a complex number you want to raise to a power.
+         * @param number Is the power to which you want to raise the complex number.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imPower(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the product of 1 to 255 complex numbers.
+         *
+         * @param values Inumber1, Inumber2,... are from 1 to 255 complex numbers to multiply.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imProduct(...values: Array<Excel.Range | number | string | boolean | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Returns the real coefficient of a complex number.
+         *
+         * @param inumber Is a complex number for which you want the real coefficient.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imReal(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the secant of a complex number.
+         *
+         * @param inumber Is a complex number for which you want the secant.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imSec(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the hyperbolic secant of a complex number.
+         *
+         * @param inumber Is a complex number for which you want the hyperbolic secant.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imSech(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the sine of a complex number.
+         *
+         * @param inumber Is a complex number for which you want the sine.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imSin(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the hyperbolic sine of a complex number.
+         *
+         * @param inumber Is a complex number for which you want the hyperbolic sine.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imSinh(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the square root of a complex number.
+         *
+         * @param inumber Is a complex number for which you want the square root.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imSqrt(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the difference of two complex numbers.
+         *
+         * @param inumber1 Is the complex number from which to subtract inumber2.
+         * @param inumber2 Is the complex number to subtract from inumber1.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imSub(inumber1: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, inumber2: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the sum of complex numbers.
+         *
+         * @param values List of parameters, whose elements are from 1 to 255 complex numbers to add.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imSum(...values: Array<Excel.Range | number | string | boolean | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Returns the tangent of a complex number.
+         *
+         * @param inumber Is a complex number for which you want the tangent.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imTan(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the imaginary coefficient of a complex number.
+         *
+         * @param inumber Is a complex number for which you want the imaginary coefficient.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        imaginary(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Rounds a number down to the nearest integer.
+         *
+         * @param number Is the real number you want to round down to an integer.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        int(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the interest rate for a fully invested security.
+         *
+         * @param settlement Is the security's settlement date, expressed as a serial date number.
+         * @param maturity Is the security's maturity date, expressed as a serial date number.
+         * @param investment Is the amount invested in the security.
+         * @param redemption Is the amount to be received at maturity.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        intRate(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, investment: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, redemption: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the interest payment for a given period for an investment, based on periodic, constant payments and a constant interest rate.
+         *
+         * @param rate Is the interest rate per period. For example, use 6%/4 for quarterly payments at 6% APR.
+         * @param per Is the period for which you want to find the interest and must be in the range 1 to Nper.
+         * @param nper Is the total number of payment periods in an investment.
+         * @param pv Is the present value, or the lump-sum amount that a series of future payments is worth now.
+         * @param fv Is the future value, or a cash balance you want to attain after the last payment is made. If omitted, Fv = 0.
+         * @param type Is a logical value representing the timing of payment: at the end of the period = 0 or omitted, at the beginning of the period = 1.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        ipmt(rate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, per: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, nper: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pv: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, fv?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, type?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the internal rate of return for a series of cash flows.
+         *
+         * @param values Is an array or a reference to cells that contain numbers for which you want to calculate the internal rate of return.
+         * @param guess Is a number that you guess is close to the result of IRR; 0.1 (10 percent) if omitted.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        irr(values: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, guess?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Checks whether a value is an error (#VALUE!, #REF!, #DIV/0!, #NUM!, #NAME?, or #NULL!) excluding #N/A, and returns TRUE or FALSE.
+         *
+         * @param value Is the value you want to test. Value can refer to a cell, a formula, or a name that refers to a cell, formula, or value.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        isErr(value: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<boolean>;
+        /**
+         *
+         * Checks whether a value is an error (#N/A, #VALUE!, #REF!, #DIV/0!, #NUM!, #NAME?, or #NULL!), and returns TRUE or FALSE.
+         *
+         * @param value Is the value you want to test. Value can refer to a cell, a formula, or a name that refers to a cell, formula, or value.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        isError(value: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<boolean>;
+        /**
+         *
+         * Returns TRUE if the number is even.
+         *
+         * @param number Is the value to test.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        isEven(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Checks whether a reference is to a cell containing a formula, and returns TRUE or FALSE.
+         *
+         * @param reference Is a reference to the cell you want to test.  Reference can be a cell reference, a formula, or name that refers to a cell.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        isFormula(reference: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<boolean>;
+        /**
+         *
+         * Checks whether a value is a logical value (TRUE or FALSE), and returns TRUE or FALSE.
+         *
+         * @param value Is the value you want to test. Value can refer to a cell, a formula, or a name that refers to a cell, formula, or value.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        isLogical(value: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<boolean>;
+        /**
+         *
+         * Checks whether a value is #N/A, and returns TRUE or FALSE.
+         *
+         * @param value Is the value you want to test. Value can refer to a cell, a formula, or a name that refers to a cell, formula, or value.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        isNA(value: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<boolean>;
+        /**
+         *
+         * Checks whether a value is not text (blank cells are not text), and returns TRUE or FALSE.
+         *
+         * @param value Is the value you want tested: a cell; a formula; or a name referring to a cell, formula, or value.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        isNonText(value: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<boolean>;
+        /**
+         *
+         * Checks whether a value is a number, and returns TRUE or FALSE.
+         *
+         * @param value Is the value you want to test. Value can refer to a cell, a formula, or a name that refers to a cell, formula, or value.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        isNumber(value: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<boolean>;
+        /**
+         *
+         * Returns TRUE if the number is odd.
+         *
+         * @param number Is the value to test.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        isOdd(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Checks whether a value is text, and returns TRUE or FALSE.
+         *
+         * @param value Is the value you want to test. Value can refer to a cell, a formula, or a name that refers to a cell, formula, or value.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        isText(value: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<boolean>;
+        /**
+         *
+         * Returns the ISO week number in the year for a given date.
+         *
+         * @param date Is the date-time code used by Microsoft Excel for date and time calculation.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        isoWeekNum(date: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the interest paid during a specific period of an investment.
+         *
+         * @param rate Interest rate per period. For example, use 6%/4 for quarterly payments at 6% APR.
+         * @param per Period for which you want to find the interest.
+         * @param nper Number of payment periods in an investment.
+         * @param pv Lump sum amount that a series of future payments is right now.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        ispmt(rate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, per: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, nper: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pv: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Checks whether a value is a reference, and returns TRUE or FALSE.
+         *
+         * @param value Is the value you want to test. Value can refer to a cell, a formula, or a name that refers to a cell, formula, or value.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        isref(value: Excel.Range | number | string | boolean | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<boolean>;
+        /**
+         *
+         * Returns the kurtosis of a data set.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 numbers or names, arrays, or references that contain numbers for which you want the kurtosis.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        kurt(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Returns the k-th largest value in a data set. For example, the fifth largest number.
+         *
+         * @param array Is the array or range of data for which you want to determine the k-th largest value.
+         * @param k Is the position (from the largest) in the array or cell range of the value to return.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        large(array: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, k: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the least common multiple.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 values for which you want the least common multiple.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        lcm(...values: Array<number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Returns the specified number of characters from the start of a text string.
+         *
+         * @param text Is the text string containing the characters you want to extract.
+         * @param numChars Specifies how many characters you want LEFT to extract; 1 if omitted.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        left(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numChars?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Returns the specified number of characters from the start of a text string. Use with double-byte character sets (DBCS).
+         *
+         * @param text Is the text string containing the characters you want to extract.
+         * @param numBytes Specifies how many characters you want LEFT to return.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        leftb(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numBytes?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Returns the number of characters in a text string.
+         *
+         * @param text Is the text whose length you want to find. Spaces count as characters.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        len(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the number of characters in a text string. Use with double-byte character sets (DBCS).
+         *
+         * @param text Is the text whose length you want to find.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        lenb(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the natural logarithm of a number.
+         *
+         * @param number Is the positive real number for which you want the natural logarithm.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        ln(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the logarithm of a number to the base you specify.
+         *
+         * @param number Is the positive real number for which you want the logarithm.
+         * @param base Is the base of the logarithm; 10 if omitted.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        log(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, base?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the base-10 logarithm of a number.
+         *
+         * @param number Is the positive real number for which you want the base-10 logarithm.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        log10(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the lognormal distribution of x, where ln(x) is normally distributed with parameters Mean and Standard_dev.
+         *
+         * @param x Is the value at which to evaluate the function, a positive number.
+         * @param mean Is the mean of ln(x).
+         * @param standardDev Is the standard deviation of ln(x), a positive number.
+         * @param cumulative Is a logical value: for the cumulative distribution function, use TRUE; for the probability density function, use FALSE.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        logNorm_Dist(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, mean: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, standardDev: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the inverse of the lognormal cumulative distribution function of x, where ln(x) is normally distributed with parameters Mean and Standard_dev.
+         *
+         * @param probability Is a probability associated with the lognormal distribution, a number between 0 and 1, inclusive.
+         * @param mean Is the mean of ln(x).
+         * @param standardDev Is the standard deviation of ln(x), a positive number.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        logNorm_Inv(probability: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, mean: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, standardDev: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Looks up a value either from a one-row or one-column range or from an array. Provided for backward compatibility.
+         *
+         * @param lookupValue Is a value that LOOKUP searches for in lookupVector and can be a number, text, a logical value, or a name or reference to a value.
+         * @param lookupVector Is a range that contains only one row or one column of text, numbers, or logical values, placed in ascending order.
+         * @param resultVector Is a range that contains only one row or column, the same size as lookupVector.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        lookup(lookupValue: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, lookupVector: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, resultVector?: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number | string | boolean>;
+        /**
+         *
+         * Converts all letters in a text string to lowercase.
+         *
+         * @param text Is the text you want to convert to lowercase. Characters in Text that are not letters are not changed.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        lower(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Returns the Macauley modified duration for a security with an assumed par value of $100.
+         *
+         * @param settlement Is the security's settlement date, expressed as a serial date number.
+         * @param maturity Is the security's maturity date, expressed as a serial date number.
+         * @param coupon Is the security's annual coupon rate.
+         * @param yld Is the security's annual yield.
+         * @param frequency Is the number of coupon payments per year.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        mduration(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, coupon: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, yld: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the internal rate of return for a series of periodic cash flows, considering both cost of investment and interest on reinvestment of cash.
+         *
+         * @param values Is an array or a reference to cells that contain numbers that represent a series of payments (negative) and income (positive) at regular periods.
+         * @param financeRate Is the interest rate you pay on the money used in the cash flows.
+         * @param reinvestRate Is the interest rate you receive on the cash flows as you reinvest them.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        mirr(values: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, financeRate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, reinvestRate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns a number rounded to the desired multiple.
+         *
+         * @param number Is the value to round.
+         * @param multiple Is the multiple to which you want to round number.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        mround(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, multiple: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the relative position of an item in an array that matches a specified value in a specified order.
+         *
+         * @param lookupValue Is the value you use to find the value you want in the array, a number, text, or logical value, or a reference to one of these.
+         * @param lookupArray Is a contiguous range of cells containing possible lookup values, an array of values, or a reference to an array.
+         * @param matchType Is a number 1, 0, or -1 indicating which value to return.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        match(lookupValue: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, lookupArray: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, matchType?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the largest value in a set of values. Ignores logical values and text.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 numbers, empty cells, logical values, or text numbers for which you want the maximum.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        max(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Returns the largest value in a set of values. Does not ignore logical values and text.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 numbers, empty cells, logical values, or text numbers for which you want the maximum.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        maxA(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Returns the median, or the number in the middle of the set of given numbers.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 numbers or names, arrays, or references that contain numbers for which you want the median.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        median(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Returns the characters from the middle of a text string, given a starting position and length.
+         *
+         * @param text Is the text string from which you want to extract the characters.
+         * @param startNum Is the position of the first character you want to extract. The first character in Text is 1.
+         * @param numChars Specifies how many characters to return from Text.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        mid(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, startNum: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numChars: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Returns characters from the middle of a text string, given a starting position and length. Use with double-byte character sets (DBCS).
+         *
+         * @param text Is the text string containing the characters you want to extract.
+         * @param startNum Is the position of the first character you want to extract in text.
+         * @param numBytes Specifies how many characters to return from text.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        midb(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, startNum: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numBytes: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Returns the smallest number in a set of values. Ignores logical values and text.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 numbers, empty cells, logical values, or text numbers for which you want the minimum.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        min(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Returns the smallest value in a set of values. Does not ignore logical values and text.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 numbers, empty cells, logical values, or text numbers for which you want the minimum.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        minA(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Returns the minute, a number from 0 to 59.
+         *
+         * @param serialNumber Is a number in the date-time code used by Microsoft Excel or text in time format, such as 16:48:00 or 4:48:00 PM.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        minute(serialNumber: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the remainder after a number is divided by a divisor.
+         *
+         * @param number Is the number for which you want to find the remainder after the division is performed.
+         * @param divisor Is the number by which you want to divide Number.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        mod(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, divisor: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the month, a number from 1 (January) to 12 (December).
+         *
+         * @param serialNumber Is a number in the date-time code used by Microsoft Excel.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        month(serialNumber: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the multinomial of a set of numbers.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 values for which you want the multinomial.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        multiNomial(...values: Array<number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Converts non-number value to a number, dates to serial numbers, TRUE to 1, anything else to 0 (zero).
+         *
+         * @param value Is the value you want converted.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        n(value: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the number of periods for an investment based on periodic, constant payments and a constant interest rate.
+         *
+         * @param rate Is the interest rate per period. For example, use 6%/4 for quarterly payments at 6% APR.
+         * @param pmt Is the payment made each period; it cannot change over the life of the investment.
+         * @param pv Is the present value, or the lump-sum amount that a series of future payments is worth now.
+         * @param fv Is the future value, or a cash balance you want to attain after the last payment is made. If omitted, zero is used.
+         * @param type Is a logical value: payment at the beginning of the period = 1; payment at the end of the period = 0 or omitted.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        nper(rate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pmt: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pv: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, fv?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, type?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the error value #N/A (value not available).
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        na(): FunctionResult<number | string>;
+        /**
+         *
+         * Returns the negative binomial distribution, the probability that there will be Number_f failures before the Number_s-th success, with Probability_s probability of a success.
+         *
+         * @param numberF Is the number of failures.
+         * @param numberS Is the threshold number of successes.
+         * @param probabilityS Is the probability of a success; a number between 0 and 1.
+         * @param cumulative Is a logical value: for the cumulative distribution function, use TRUE; for the probability mass function, use FALSE.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        negBinom_Dist(numberF: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numberS: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, probabilityS: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the number of whole workdays between two dates.
+         *
+         * @param startDate Is a serial date number that represents the start date.
+         * @param endDate Is a serial date number that represents the end date.
+         * @param holidays Is an optional set of one or more serial date numbers to exclude from the working calendar, such as state and federal holidays and floating holidays.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        networkDays(startDate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, endDate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, holidays?: number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the number of whole workdays between two dates with custom weekend parameters.
+         *
+         * @param startDate Is a serial date number that represents the start date.
+         * @param endDate Is a serial date number that represents the end date.
+         * @param weekend Is a number or string specifying when weekends occur.
+         * @param holidays Is an optional set of one or more serial date numbers to exclude from the working calendar, such as state and federal holidays and floating holidays.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        networkDays_Intl(startDate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, endDate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, weekend?: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, holidays?: number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the annual nominal interest rate.
+         *
+         * @param effectRate Is the effective interest rate.
+         * @param npery Is the number of compounding periods per year.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        nominal(effectRate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, npery: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the normal distribution for the specified mean and standard deviation.
+         *
+         * @param x Is the value for which you want the distribution.
+         * @param mean Is the arithmetic mean of the distribution.
+         * @param standardDev Is the standard deviation of the distribution, a positive number.
+         * @param cumulative Is a logical value: for the cumulative distribution function, use TRUE; for the probability density function, use FALSE.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        norm_Dist(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, mean: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, standardDev: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the inverse of the normal cumulative distribution for the specified mean and standard deviation.
+         *
+         * @param probability Is a probability corresponding to the normal distribution, a number between 0 and 1 inclusive.
+         * @param mean Is the arithmetic mean of the distribution.
+         * @param standardDev Is the standard deviation of the distribution, a positive number.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        norm_Inv(probability: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, mean: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, standardDev: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the standard normal distribution (has a mean of zero and a standard deviation of one).
+         *
+         * @param z Is the value for which you want the distribution.
+         * @param cumulative Is a logical value for the function to return: the cumulative distribution function = TRUE; the probability density function = FALSE.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        norm_S_Dist(z: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the inverse of the standard normal cumulative distribution (has a mean of zero and a standard deviation of one).
+         *
+         * @param probability Is a probability corresponding to the normal distribution, a number between 0 and 1 inclusive.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        norm_S_Inv(probability: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Changes FALSE to TRUE, or TRUE to FALSE.
+         *
+         * @param logical Is a value or expression that can be evaluated to TRUE or FALSE.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        not(logical: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<boolean>;
+        /**
+         *
+         * Returns the current date and time formatted as a date and time.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        now(): FunctionResult<number>;
+        /**
+         *
+         * Returns the net present value of an investment based on a discount rate and a series of future payments (negative values) and income (positive values).
+         *
+         * @param rate Is the rate of discount over the length of one period.
+         * @param values List of parameters, whose elements are 1 to 254 payments and income, equally spaced in time and occurring at the end of each period.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        npv(rate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, ...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Converts text to number in a locale-independent manner.
+         *
+         * @param text Is the string representing the number you want to convert.
+         * @param decimalSeparator Is the character used as the decimal separator in the string.
+         * @param groupSeparator Is the character used as the group separator in the string.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        numberValue(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, decimalSeparator?: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, groupSeparator?: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts an octal number to binary.
+         *
+         * @param number Is the octal number you want to convert.
+         * @param places Is the number of characters to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        oct2Bin(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, places?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts an octal number to decimal.
+         *
+         * @param number Is the octal number you want to convert.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        oct2Dec(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts an octal number to hexadecimal.
+         *
+         * @param number Is the octal number you want to convert.
+         * @param places Is the number of characters to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        oct2Hex(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, places?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Rounds a positive number up and negative number down to the nearest odd integer.
+         *
+         * @param number Is the value to round.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        odd(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the price per $100 face value of a security with an odd first period.
+         *
+         * @param settlement Is the security's settlement date, expressed as a serial date number.
+         * @param maturity Is the security's maturity date, expressed as a serial date number.
+         * @param issue Is the security's issue date, expressed as a serial date number.
+         * @param firstCoupon Is the security's first coupon date, expressed as a serial date number.
+         * @param rate Is the security's interest rate.
+         * @param yld Is the security's annual yield.
+         * @param redemption Is the security's redemption value per $100 face value.
+         * @param frequency Is the number of coupon payments per year.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        oddFPrice(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, issue: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, firstCoupon: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, yld: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, redemption: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the yield of a security with an odd first period.
+         *
+         * @param settlement Is the security's settlement date, expressed as a serial date number.
+         * @param maturity Is the security's maturity date, expressed as a serial date number.
+         * @param issue Is the security's issue date, expressed as a serial date number.
+         * @param firstCoupon Is the security's first coupon date, expressed as a serial date number.
+         * @param rate Is the security's interest rate.
+         * @param pr Is the security's price.
+         * @param redemption Is the security's redemption value per $100 face value.
+         * @param frequency Is the number of coupon payments per year.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        oddFYield(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, issue: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, firstCoupon: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pr: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, redemption: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the price per $100 face value of a security with an odd last period.
+         *
+         * @param settlement Is the security's settlement date, expressed as a serial date number.
+         * @param maturity Is the security's maturity date, expressed as a serial date number.
+         * @param lastInterest Is the security's last coupon date, expressed as a serial date number.
+         * @param rate Is the security's interest rate.
+         * @param yld Is the security's annual yield.
+         * @param redemption Is the security's redemption value per $100 face value.
+         * @param frequency Is the number of coupon payments per year.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        oddLPrice(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, lastInterest: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, yld: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, redemption: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the yield of a security with an odd last period.
+         *
+         * @param settlement Is the security's settlement date, expressed as a serial date number.
+         * @param maturity Is the security's maturity date, expressed as a serial date number.
+         * @param lastInterest Is the security's last coupon date, expressed as a serial date number.
+         * @param rate Is the security's interest rate.
+         * @param pr Is the security's price.
+         * @param redemption Is the security's redemption value per $100 face value.
+         * @param frequency Is the number of coupon payments per year.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        oddLYield(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, lastInterest: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pr: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, redemption: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Checks whether any of the arguments are TRUE, and returns TRUE or FALSE. Returns FALSE only if all arguments are FALSE.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 conditions that you want to test that can be either TRUE or FALSE.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        or(...values: Array<boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<boolean>;
+        /**
+         *
+         * Returns the number of periods required by an investment to reach a specified value.
+         *
+         * @param rate Is the interest rate per period.
+         * @param pv Is the present value of the investment.
+         * @param fv Is the desired future value of the investment.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        pduration(rate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pv: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, fv: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the rank of a value in a data set as a percentage of the data set as a percentage (0..1, exclusive) of the data set.
+         *
+         * @param array Is the array or range of data with numeric values that defines relative standing.
+         * @param x Is the value for which you want to know the rank.
+         * @param significance Is an optional value that identifies the number of significant digits for the returned percentage, three digits if omitted (0.xxx%).
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        percentRank_Exc(array: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, significance?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the rank of a value in a data set as a percentage of the data set as a percentage (0..1, inclusive) of the data set.
+         *
+         * @param array Is the array or range of data with numeric values that defines relative standing.
+         * @param x Is the value for which you want to know the rank.
+         * @param significance Is an optional value that identifies the number of significant digits for the returned percentage, three digits if omitted (0.xxx%).
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        percentRank_Inc(array: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, significance?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the k-th percentile of values in a range, where k is in the range 0..1, exclusive.
+         *
+         * @param array Is the array or range of data that defines relative standing.
+         * @param k Is the percentile value that is between 0 through 1, inclusive.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        percentile_Exc(array: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, k: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the k-th percentile of values in a range, where k is in the range 0..1, inclusive.
+         *
+         * @param array Is the array or range of data that defines relative standing.
+         * @param k Is the percentile value that is between 0 through 1, inclusive.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        percentile_Inc(array: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, k: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the number of permutations for a given number of objects that can be selected from the total objects.
+         *
+         * @param number Is the total number of objects.
+         * @param numberChosen Is the number of objects in each permutation.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        permut(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numberChosen: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the number of permutations for a given number of objects (with repetitions) that can be selected from the total objects.
+         *
+         * @param number Is the total number of objects.
+         * @param numberChosen Is the number of objects in each permutation.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        permutationa(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numberChosen: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the value of the density function for a standard normal distribution.
+         *
+         * @param x Is the number for which you want the density of the standard normal distribution.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        phi(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the value of Pi, 3.14159265358979, accurate to 15 digits.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        pi(): FunctionResult<number>;
+        /**
+         *
+         * Calculates the payment for a loan based on constant payments and a constant interest rate.
+         *
+         * @param rate Is the interest rate per period for the loan. For example, use 6%/4 for quarterly payments at 6% APR.
+         * @param nper Is the total number of payments for the loan.
+         * @param pv Is the present value: the total amount that a series of future payments is worth now.
+         * @param fv Is the future value, or a cash balance you want to attain after the last payment is made, 0 (zero) if omitted.
+         * @param type Is a logical value: payment at the beginning of the period = 1; payment at the end of the period = 0 or omitted.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        pmt(rate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, nper: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pv: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, fv?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, type?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the Poisson distribution.
+         *
+         * @param x Is the number of events.
+         * @param mean Is the expected numeric value, a positive number.
+         * @param cumulative Is a logical value: for the cumulative Poisson probability, use TRUE; for the Poisson probability mass function, use FALSE.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        poisson_Dist(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, mean: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the result of a number raised to a power.
+         *
+         * @param number Is the base number, any real number.
+         * @param power Is the exponent, to which the base number is raised.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        power(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, power: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the payment on the principal for a given investment based on periodic, constant payments and a constant interest rate.
+         *
+         * @param rate Is the interest rate per period. For example, use 6%/4 for quarterly payments at 6% APR.
+         * @param per Specifies the period and must be in the range 1 to nper.
+         * @param nper Is the total number of payment periods in an investment.
+         * @param pv Is the present value: the total amount that a series of future payments is worth now.
+         * @param fv Is the future value, or cash balance you want to attain after the last payment is made.
+         * @param type Is a logical value: payment at the beginning of the period = 1; payment at the end of the period = 0 or omitted.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        ppmt(rate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, per: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, nper: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pv: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, fv?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, type?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the price per $100 face value of a security that pays periodic interest.
+         *
+         * @param settlement Is the security's settlement date, expressed as a serial date number.
+         * @param maturity Is the security's maturity date, expressed as a serial date number.
+         * @param rate Is the security's annual coupon rate.
+         * @param yld Is the security's annual yield.
+         * @param redemption Is the security's redemption value per $100 face value.
+         * @param frequency Is the number of coupon payments per year.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        price(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, yld: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, redemption: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the price per $100 face value of a discounted security.
+         *
+         * @param settlement Is the security's settlement date, expressed as a serial date number.
+         * @param maturity Is the security's maturity date, expressed as a serial date number.
+         * @param discount Is the security's discount rate.
+         * @param redemption Is the security's redemption value per $100 face value.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        priceDisc(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, discount: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, redemption: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the price per $100 face value of a security that pays interest at maturity.
+         *
+         * @param settlement Is the security's settlement date, expressed as a serial date number.
+         * @param maturity Is the security's maturity date, expressed as a serial date number.
+         * @param issue Is the security's issue date, expressed as a serial date number.
+         * @param rate Is the security's interest rate at date of issue.
+         * @param yld Is the security's annual yield.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        priceMat(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, issue: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, yld: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Multiplies all the numbers given as arguments.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 numbers, logical values, or text representations of numbers that you want to multiply.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        product(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Converts a text string to proper case; the first letter in each word to uppercase, and all other letters to lowercase.
+         *
+         * @param text Is text enclosed in quotation marks, a formula that returns text, or a reference to a cell containing text to partially capitalize.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        proper(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Returns the present value of an investment: the total amount that a series of future payments is worth now.
+         *
+         * @param rate Is the interest rate per period. For example, use 6%/4 for quarterly payments at 6% APR.
+         * @param nper Is the total number of payment periods in an investment.
+         * @param pmt Is the payment made each period and cannot change over the life of the investment.
+         * @param fv Is the future value, or a cash balance you want to attain after the last payment is made.
+         * @param type Is a logical value: payment at the beginning of the period = 1; payment at the end of the period = 0 or omitted.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        pv(rate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, nper: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pmt: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, fv?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, type?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the quartile of a data set, based on percentile values from 0..1, exclusive.
+         *
+         * @param array Is the array or cell range of numeric values for which you want the quartile value.
+         * @param quart Is a number: minimum value = 0; 1st quartile = 1; median value = 2; 3rd quartile = 3; maximum value = 4.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        quartile_Exc(array: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, quart: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the quartile of a data set, based on percentile values from 0..1, inclusive.
+         *
+         * @param array Is the array or cell range of numeric values for which you want the quartile value.
+         * @param quart Is a number: minimum value = 0; 1st quartile = 1; median value = 2; 3rd quartile = 3; maximum value = 4.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        quartile_Inc(array: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, quart: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the integer portion of a division.
+         *
+         * @param numerator Is the dividend.
+         * @param denominator Is the divisor.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        quotient(numerator: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, denominator: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts degrees to radians.
+         *
+         * @param angle Is an angle in degrees that you want to convert.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        radians(angle: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns a random number greater than or equal to 0 and less than 1, evenly distributed (changes on recalculation).
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        rand(): FunctionResult<number>;
+        /**
+         *
+         * Returns a random number between the numbers you specify.
+         *
+         * @param bottom Is the smallest integer RANDBETWEEN will return.
+         * @param top Is the largest integer RANDBETWEEN will return.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        randBetween(bottom: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, top: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the rank of a number in a list of numbers: its size relative to other values in the list; if more than one value has the same rank, the average rank is returned.
+         *
+         * @param number Is the number for which you want to find the rank.
+         * @param ref Is an array of, or a reference to, a list of numbers. Nonnumeric values are ignored.
+         * @param order Is a number: rank in the list sorted descending = 0 or omitted; rank in the list sorted ascending = any nonzero value.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        rank_Avg(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, ref: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, order?: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the rank of a number in a list of numbers: its size relative to other values in the list; if more than one value has the same rank, the top rank of that set of values is returned.
+         *
+         * @param number Is the number for which you want to find the rank.
+         * @param ref Is an array of, or a reference to, a list of numbers. Nonnumeric values are ignored.
+         * @param order Is a number: rank in the list sorted descending = 0 or omitted; rank in the list sorted ascending = any nonzero value.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        rank_Eq(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, ref: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, order?: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the interest rate per period of a loan or an investment. For example, use 6%/4 for quarterly payments at 6% APR.
+         *
+         * @param nper Is the total number of payment periods for the loan or investment.
+         * @param pmt Is the payment made each period and cannot change over the life of the loan or investment.
+         * @param pv Is the present value: the total amount that a series of future payments is worth now.
+         * @param fv Is the future value, or a cash balance you want to attain after the last payment is made. If omitted, uses Fv = 0.
+         * @param type Is a logical value: payment at the beginning of the period = 1; payment at the end of the period = 0 or omitted.
+         * @param guess Is your guess for what the rate will be; if omitted, Guess = 0.1 (10 percent).
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        rate(nper: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pmt: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pv: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, fv?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, type?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, guess?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the amount received at maturity for a fully invested security.
+         *
+         * @param settlement Is the security's settlement date, expressed as a serial date number.
+         * @param maturity Is the security's maturity date, expressed as a serial date number.
+         * @param investment Is the amount invested in the security.
+         * @param discount Is the security's discount rate.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        received(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, investment: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, discount: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Replaces part of a text string with a different text string.
+         *
+         * @param oldText Is text in which you want to replace some characters.
+         * @param startNum Is the position of the character in oldText that you want to replace with newText.
+         * @param numChars Is the number of characters in oldText that you want to replace.
+         * @param newText Is the text that will replace characters in oldText.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        replace(oldText: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, startNum: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numChars: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, newText: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Replaces part of a text string with a different text string. Use with double-byte character sets (DBCS).
+         *
+         * @param oldText Is text in which you want to replace some characters.
+         * @param startNum Is the position of the character in oldText that you want to replace with newText.
+         * @param numBytes Is the number of characters in oldText that you want to replace with newText.
+         * @param newText Is the text that will replace characters in oldText.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        replaceB(oldText: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, startNum: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numBytes: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, newText: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Repeats text a given number of times. Use REPT to fill a cell with a number of instances of a text string.
+         *
+         * @param text Is the text you want to repeat.
+         * @param numberTimes Is a positive number specifying the number of times to repeat text.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        rept(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numberTimes: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Returns the specified number of characters from the end of a text string.
+         *
+         * @param text Is the text string that contains the characters you want to extract.
+         * @param numChars Specifies how many characters you want to extract, 1 if omitted.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        right(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numChars?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Returns the specified number of characters from the end of a text string. Use with double-byte character sets (DBCS).
+         *
+         * @param text Is the text string containing the characters you want to extract.
+         * @param numBytes Specifies how many characters you want to extract.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        rightb(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numBytes?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Converts an Arabic numeral to Roman, as text.
+         *
+         * @param number Is the Arabic numeral you want to convert.
+         * @param form Is the number specifying the type of Roman numeral you want.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        roman(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, form?: boolean | number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Rounds a number to a specified number of digits.
+         *
+         * @param number Is the number you want to round.
+         * @param numDigits Is the number of digits to which you want to round. Negative rounds to the left of the decimal point; zero to the nearest integer.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        round(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numDigits: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Rounds a number down, toward zero.
+         *
+         * @param number Is any real number that you want rounded down.
+         * @param numDigits Is the number of digits to which you want to round. Negative rounds to the left of the decimal point; zero or omitted, to the nearest integer.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        roundDown(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numDigits: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Rounds a number up, away from zero.
+         *
+         * @param number Is any real number that you want rounded up.
+         * @param numDigits Is the number of digits to which you want to round. Negative rounds to the left of the decimal point; zero or omitted, to the nearest integer.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        roundUp(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numDigits: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the number of rows in a reference or array.
+         *
+         * @param array Is an array, an array formula, or a reference to a range of cells for which you want the number of rows.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        rows(array: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns an equivalent interest rate for the growth of an investment.
+         *
+         * @param nper Is the number of periods for the investment.
+         * @param pv Is the present value of the investment.
+         * @param fv Is the future value of the investment.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        rri(nper: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pv: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, fv: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the secant of an angle.
+         *
+         * @param number Is the angle in radians for which you want the secant.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        sec(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the hyperbolic secant of an angle.
+         *
+         * @param number Is the angle in radians for which you want the hyperbolic secant.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        sech(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the second, a number from 0 to 59.
+         *
+         * @param serialNumber Is a number in the date-time code used by Microsoft Excel or text in time format, such as 16:48:23 or 4:48:47 PM.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        second(serialNumber: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the sum of a power series based on the formula.
+         *
+         * @param x Is the input value to the power series.
+         * @param n Is the initial power to which you want to raise x.
+         * @param m Is the step by which to increase n for each term in the series.
+         * @param coefficients Is a set of coefficients by which each successive power of x is multiplied.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        seriesSum(x: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, n: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, m: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, coefficients: Excel.Range | string | number | boolean | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the sheet number of the referenced sheet.
+         *
+         * @param value Is the name of a sheet or a reference that you want the sheet number of.  If omitted the number of the sheet containing the function is returned.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        sheet(value?: Excel.Range | string | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the number of sheets in a reference.
+         *
+         * @param reference Is a reference for which you want to know the number of sheets it contains.  If omitted the number of sheets in the workbook containing the function is returned.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        sheets(reference?: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the sign of a number: 1 if the number is positive, zero if the number is zero, or -1 if the number is negative.
+         *
+         * @param number Is any real number.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        sign(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the sine of an angle.
+         *
+         * @param number Is the angle in radians for which you want the sine. Degrees * PI()/180 = radians.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        sin(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the hyperbolic sine of a number.
+         *
+         * @param number Is any real number.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        sinh(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the skewness of a distribution: a characterization of the degree of asymmetry of a distribution around its mean.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 numbers or names, arrays, or references that contain numbers for which you want the skewness.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        skew(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Returns the skewness of a distribution based on a population: a characterization of the degree of asymmetry of a distribution around its mean.
+         *
+         * @param values List of parameters, whose elements are 1 to 254 numbers or names, arrays, or references that contain numbers for which you want the population skewness.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        skew_p(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Returns the straight-line depreciation of an asset for one period.
+         *
+         * @param cost Is the initial cost of the asset.
+         * @param salvage Is the salvage value at the end of the life of the asset.
+         * @param life Is the number of periods over which the asset is being depreciated (sometimes called the useful life of the asset).
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        sln(cost: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, salvage: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, life: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the k-th smallest value in a data set. For example, the fifth smallest number.
+         *
+         * @param array Is an array or range of numerical data for which you want to determine the k-th smallest value.
+         * @param k Is the position (from the smallest) in the array or range of the value to return.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        small(array: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, k: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the square root of a number.
+         *
+         * @param number Is the number for which you want the square root.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        sqrt(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the square root of (number * Pi).
+         *
+         * @param number Is the number by which p is multiplied.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        sqrtPi(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Estimates standard deviation based on a sample, including logical values and text. Text and the logical value FALSE have the value 0; the logical value TRUE has the value 1.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 values corresponding to a sample of a population and can be values or names or references to values.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        stDevA(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Calculates standard deviation based on an entire population, including logical values and text. Text and the logical value FALSE have the value 0; the logical value TRUE has the value 1.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 values corresponding to a population and can be values, names, arrays, or references that contain values.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        stDevPA(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Calculates standard deviation based on the entire population given as arguments (ignores logical values and text).
+         *
+         * @param values List of parameters, whose elements are 1 to 255 numbers corresponding to a population and can be numbers or references that contain numbers.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        stDev_P(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Estimates standard deviation based on a sample (ignores logical values and text in the sample).
+         *
+         * @param values List of parameters, whose elements are 1 to 255 numbers corresponding to a sample of a population and can be numbers or references that contain numbers.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        stDev_S(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Returns a normalized value from a distribution characterized by a mean and standard deviation.
+         *
+         * @param x Is the value you want to normalize.
+         * @param mean Is the arithmetic mean of the distribution.
+         * @param standardDev Is the standard deviation of the distribution, a positive number.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        standardize(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, mean: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, standardDev: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Replaces existing text with new text in a text string.
+         *
+         * @param text Is the text or the reference to a cell containing text in which you want to substitute characters.
+         * @param oldText Is the existing text you want to replace. If the case of oldText does not match the case of text, SUBSTITUTE will not replace the text.
+         * @param newText Is the text you want to replace oldText with.
+         * @param instanceNum Specifies which occurrence of oldText you want to replace. If omitted, every instance of oldText is replaced.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        substitute(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, oldText: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, newText: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, instanceNum?: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Returns a subtotal in a list or database.
+         *
+         * @param functionNum Is the number 1 to 11 that specifies the summary function for the subtotal.
+         * @param values List of parameters, whose elements are 1 to 254 ranges or references for which you want the subtotal.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        subtotal(functionNum: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, ...values: Array<Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Adds all the numbers in a range of cells.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 numbers to sum. Logical values and text are ignored in cells, included if typed as arguments.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        sum(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Adds the cells specified by a given condition or criteria.
+         *
+         * @param range Is the range of cells you want evaluated.
+         * @param criteria Is the condition or criteria in the form of a number, expression, or text that defines which cells will be added.
+         * @param sumRange Are the actual cells to sum. If omitted, the cells in range are used.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        sumIf(range: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, sumRange?: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Adds the cells specified by a given set of conditions or criteria.
+         *
+         * @param sumRange Are the actual cells to sum.
+         * @param values List of parameters, where the first element of each pair is the Is the range of cells you want evaluated for the particular condition , and the second element is is the condition or criteria in the form of a number, expression, or text that defines which cells will be added.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        sumIfs(sumRange: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, ...values: Array<Excel.Range | Excel.RangeReference | Excel.FunctionResult<any> | number | string | boolean>): FunctionResult<number>;
+        /**
+         *
+         * Returns the sum of the squares of the arguments. The arguments can be numbers, arrays, names, or references to cells that contain numbers.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 numbers, arrays, names, or references to arrays for which you want the sum of the squares.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        sumSq(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Returns the sum-of-years' digits depreciation of an asset for a specified period.
+         *
+         * @param cost Is the initial cost of the asset.
+         * @param salvage Is the salvage value at the end of the life of the asset.
+         * @param life Is the number of periods over which the asset is being depreciated (sometimes called the useful life of the asset).
+         * @param per Is the period and must use the same units as Life.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        syd(cost: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, salvage: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, life: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, per: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Checks whether a value is text, and returns the text if it is, or returns double quotes (empty text) if it is not.
+         *
+         * @param value Is the value to test.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        t(value: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Returns the bond-equivalent yield for a treasury bill.
+         *
+         * @param settlement Is the Treasury bill's settlement date, expressed as a serial date number.
+         * @param maturity Is the Treasury bill's maturity date, expressed as a serial date number.
+         * @param discount Is the Treasury bill's discount rate.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        tbillEq(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, discount: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the price per $100 face value for a treasury bill.
+         *
+         * @param settlement Is the Treasury bill's settlement date, expressed as a serial date number.
+         * @param maturity Is the Treasury bill's maturity date, expressed as a serial date number.
+         * @param discount Is the Treasury bill's discount rate.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        tbillPrice(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, discount: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the yield for a treasury bill.
+         *
+         * @param settlement Is the Treasury bill's settlement date, expressed as a serial date number.
+         * @param maturity Is the Treasury bill's maturity date, expressed as a serial date number.
+         * @param pr Is the Treasury Bill's price per $100 face value.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        tbillYield(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pr: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the tangent of an angle.
+         *
+         * @param number Is the angle in radians for which you want the tangent. Degrees * PI()/180 = radians.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        tan(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the hyperbolic tangent of a number.
+         *
+         * @param number Is any real number.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        tanh(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts a value to text in a specific number format.
+         *
+         * @param value Is a number, a formula that evaluates to a numeric value, or a reference to a cell containing a numeric value.
+         * @param formatText Is a number format in text form from the Category box on the Number tab in the Format Cells dialog box (not General).
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        text(value: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, formatText: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Converts hours, minutes, and seconds given as numbers to an Excel serial number, formatted with a time format.
+         *
+         * @param hour Is a number from 0 to 23 representing the hour.
+         * @param minute Is a number from 0 to 59 representing the minute.
+         * @param second Is a number from 0 to 59 representing the second.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        time(hour: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, minute: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, second: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts a text time to an Excel serial number for a time, a number from 0 (12:00:00 AM) to 0.999988426 (11:59:59 PM). Format the number with a time format after entering the formula.
+         *
+         * @param timeText Is a text string that gives a time in any one of the Microsoft Excel time formats (date information in the string is ignored).
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        timevalue(timeText: string | number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the current date formatted as a date.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        today(): FunctionResult<number>;
+        /**
+         *
+         * Removes all spaces from a text string except for single spaces between words.
+         *
+         * @param text Is the text from which you want spaces removed.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        trim(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Returns the mean of the interior portion of a set of data values.
+         *
+         * @param array Is the range or array of values to trim and average.
+         * @param percent Is the fractional number of data points to exclude from the top and bottom of the data set.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        trimMean(array: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, percent: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the logical value TRUE.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        true(): FunctionResult<boolean>;
+        /**
+         *
+         * Truncates a number to an integer by removing the decimal, or fractional, part of the number.
+         *
+         * @param number Is the number you want to truncate.
+         * @param numDigits Is a number specifying the precision of the truncation, 0 (zero) if omitted.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        trunc(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numDigits?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns an integer representing the data type of a value: number = 1; text = 2; logical value = 4; error value = 16; array = 64.
+         *
+         * @param value Can be any value.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        type(value: boolean | string | number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts a number to text, using currency format.
+         *
+         * @param number Is a number, a reference to a cell containing a number, or a formula that evaluates to a number.
+         * @param decimals Is the number of digits to the right of the decimal point.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        usdollar(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, decimals?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Returns the Unicode character referenced by the given numeric value.
+         *
+         * @param number Is the Unicode number representing a character.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        unichar(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Returns the number (code point) corresponding to the first character of the text.
+         *
+         * @param text Is the character that you want the Unicode value of.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        unicode(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Converts a text string to all uppercase letters.
+         *
+         * @param text Is the text you want converted to uppercase, a reference or a text string.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        upper(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
+        /**
+         *
+         * Looks for a value in the leftmost column of a table, and then returns a value in the same row from a column you specify. By default, the table must be sorted in an ascending order.
+         *
+         * @param lookupValue Is the value to be found in the first column of the table, and can be a value, a reference, or a text string.
+         * @param tableArray Is a table of text, numbers, or logical values, in which data is retrieved. tableArray can be a reference to a range or a range name.
+         * @param colIndexNum Is the column number in tableArray from which the matching value should be returned. The first column of values in the table is column 1.
+         * @param rangeLookup Is a logical value: to find the closest match in the first column (sorted in ascending order) = TRUE or omitted; find an exact match = FALSE.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        vlookup(lookupValue: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, tableArray: Excel.Range | number | Excel.RangeReference | Excel.FunctionResult<any>, colIndexNum: Excel.Range | number | Excel.RangeReference | Excel.FunctionResult<any>, rangeLookup?: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number | string | boolean>;
+        /**
+         *
+         * Converts a text string that represents a number to a number.
+         *
+         * @param text Is the text enclosed in quotation marks or a reference to a cell containing the text you want to convert.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        value(text: string | boolean | number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Estimates variance based on a sample, including logical values and text. Text and the logical value FALSE have the value 0; the logical value TRUE has the value 1.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 value arguments corresponding to a sample of a population.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        varA(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Calculates variance based on the entire population, including logical values and text. Text and the logical value FALSE have the value 0; the logical value TRUE has the value 1.
+         *
+         * @param values List of parameters, whose elements are 1 to 255 value arguments corresponding to a population.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        varPA(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Calculates variance based on the entire population (ignores logical values and text in the population).
+         *
+         * @param values List of parameters, whose elements are 1 to 255 numeric arguments corresponding to a population.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        var_P(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Estimates variance based on a sample (ignores logical values and text in the sample).
+         *
+         * @param values List of parameters, whose elements are 1 to 255 numeric arguments corresponding to a sample of a population.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        var_S(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
+        /**
+         *
+         * Returns the depreciation of an asset for any period you specify, including partial periods, using the double-declining balance method or some other method you specify.
+         *
+         * @param cost Is the initial cost of the asset.
+         * @param salvage Is the salvage value at the end of the life of the asset.
+         * @param life Is the number of periods over which the asset is being depreciated (sometimes called the useful life of the asset).
+         * @param startPeriod Is the starting period for which you want to calculate the depreciation, in the same units as Life.
+         * @param endPeriod Is the ending period for which you want to calculate the depreciation, in the same units as Life.
+         * @param factor Is the rate at which the balance declines, 2 (double-declining balance) if omitted.
+         * @param noSwitch Switch to straight-line depreciation when depreciation is greater than the declining balance = FALSE or omitted; do not switch = TRUE.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        vdb(cost: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, salvage: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, life: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, startPeriod: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, endPeriod: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, factor?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, noSwitch?: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the week number in the year.
+         *
+         * @param serialNumber Is the date-time code used by Microsoft Excel for date and time calculation.
+         * @param returnType Is a number (1 or 2) that determines the type of the return value.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        weekNum(serialNumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, returnType?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns a number from 1 to 7 identifying the day of the week of a date.
+         *
+         * @param serialNumber Is a number that represents a date.
+         * @param returnType Is a number: for Sunday=1 through Saturday=7, use 1; for Monday=1 through Sunday=7, use 2; for Monday=0 through Sunday=6, use 3.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        weekday(serialNumber: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, returnType?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the Weibull distribution.
+         *
+         * @param x Is the value at which to evaluate the function, a nonnegative number.
+         * @param alpha Is a parameter to the distribution, a positive number.
+         * @param beta Is a parameter to the distribution, a positive number.
+         * @param cumulative Is a logical value: for the cumulative distribution function, use TRUE; for the probability mass function, use FALSE.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        weibull_Dist(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, alpha: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, beta: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the serial number of the date before or after a specified number of workdays.
+         *
+         * @param startDate Is a serial date number that represents the start date.
+         * @param days Is the number of nonweekend and non-holiday days before or after startDate.
+         * @param holidays Is an optional array of one or more serial date numbers to exclude from the working calendar, such as state and federal holidays and floating holidays.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        workDay(startDate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, days: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, holidays?: number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the serial number of the date before or after a specified number of workdays with custom weekend parameters.
+         *
+         * @param startDate Is a serial date number that represents the start date.
+         * @param days Is the number of nonweekend and non-holiday days before or after startDate.
+         * @param weekend Is a number or string specifying when weekends occur.
+         * @param holidays Is an optional array of one or more serial date numbers to exclude from the working calendar, such as state and federal holidays and floating holidays.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        workDay_Intl(startDate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, days: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, weekend?: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, holidays?: number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the internal rate of return for a schedule of cash flows.
+         *
+         * @param values Is a series of cash flows that correspond to a schedule of payments in dates.
+         * @param dates Is a schedule of payment dates that corresponds to the cash flow payments.
+         * @param guess Is a number that you guess is close to the result of XIRR.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        xirr(values: number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>, dates: number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>, guess?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the net present value for a schedule of cash flows.
+         *
+         * @param rate Is the discount rate to apply to the cash flows.
+         * @param values Is a series of cash flows that correspond to a schedule of payments in dates.
+         * @param dates Is a schedule of payment dates that corresponds to the cash flow payments.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        xnpv(rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, values: number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>, dates: number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns a logical 'Exclusive Or' of all arguments.
+         *
+         * @param values List of parameters, whose elements are 1 to 254 conditions you want to test that can be either TRUE or FALSE and can be logical values, arrays, or references.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        xor(...values: Array<boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<boolean>;
+        /**
+         *
+         * Returns the year of a date, an integer in the range 1900 - 9999.
+         *
+         * @param serialNumber Is a number in the date-time code used by Microsoft Excel.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        year(serialNumber: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the year fraction representing the number of whole days between start_date and end_date.
+         *
+         * @param startDate Is a serial date number that represents the start date.
+         * @param endDate Is a serial date number that represents the end date.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        yearFrac(startDate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, endDate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the yield on a security that pays periodic interest.
+         *
+         * @param settlement Is the security's settlement date, expressed as a serial date number.
+         * @param maturity Is the security's maturity date, expressed as a serial date number.
+         * @param rate Is the security's annual coupon rate.
+         * @param pr Is the security's price per $100 face value.
+         * @param redemption Is the security's redemption value per $100 face value.
+         * @param frequency Is the number of coupon payments per year.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        yield(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pr: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, redemption: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the annual yield for a discounted security. For example, a treasury bill.
+         *
+         * @param settlement Is the security's settlement date, expressed as a serial date number.
+         * @param maturity Is the security's maturity date, expressed as a serial date number.
+         * @param pr Is the security's price per $100 face value.
+         * @param redemption Is the security's redemption value per $100 face value.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        yieldDisc(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pr: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, redemption: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the annual yield of a security that pays interest at maturity.
+         *
+         * @param settlement Is the security's settlement date, expressed as a serial date number.
+         * @param maturity Is the security's maturity date, expressed as a serial date number.
+         * @param issue Is the security's issue date, expressed as a serial date number.
+         * @param rate Is the security's interest rate at date of issue.
+         * @param pr Is the security's price per $100 face value.
+         * @param basis Is the type of day count basis to use.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        yieldMat(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, issue: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pr: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        /**
+         *
+         * Returns the one-tailed P-value of a z-test.
+         *
+         * @param array Is the array or range of data against which to test X.
+         * @param x Is the value to test.
+         * @param sigma Is the population (known) standard deviation. If omitted, the sample standard deviation is used.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        z_Test(array: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, sigma?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+    }
+    namespace ErrorCodes {
+        var accessDenied: string;
+        var badPassword: string;
+        var generalException: string;
+        var insertDeleteConflict: string;
+        var invalidArgument: string;
+        var invalidBinding: string;
+        var invalidOperation: string;
+        var invalidReference: string;
+        var invalidSelection: string;
+        var itemAlreadyExists: string;
+        var itemNotFound: string;
+        var notImplemented: string;
+        var unsupportedOperation: string;
+    }
+}
+declare namespace Excel {
+    /**
+     * The RequestContext object facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the request context is required to get access to the Excel object model from the add-in.
+     */
+    class RequestContext extends OfficeExtension.ClientRequestContext {
+        private m_workbook;
+        constructor(url?: string);
+        workbook: Workbook;
+    }
+    /**
+     * Executes a batch script that performs actions on the Excel object model. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
+     * @param batch - A function that takes in an Excel.RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the request context is required to get access to the Excel object model from the add-in.
+     */
+    function run<T>(batch: (context: Excel.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+}
+
+
+declare namespace Word {
+    /**
+     *
+     * The Application object.
+     *
+     * [Api set: WordApi ]
+     */
+    class Application extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Creates a new document by using a base64 encoded .docx file.
+         *
+         * @param base64File Optional. The base64 encoded .docx file. The default value is null.
+         *
+         * [Api set: WordApi ]
+         */
+        createDoc(base64File?: string): Word.Document;
+        /**
+         * Create a new instance of Word.Application object
+         */
+        static newObject(context: OfficeExtension.ClientRequestContext): Word.Application;
+    }
+    /**
+     *
+     * Represents the body of a document or a section.
+     *
+     * [Api set: WordApi ]
+     */
+    class Body extends OfficeExtension.ClientObject {
+        private m_contentControls;
+        private m_font;
+        private m_inlinePictures;
+        private m_paragraphs;
+        private m_parentContentControl;
+        private m_style;
+        private m_text;
+        private m__ReferenceId;
+        /**
+         *
+         * Gets the collection of rich text content control objects that are in the body. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        contentControls: Word.ContentControlCollection;
+        /**
+         *
+         * Gets the text format of the body. Use this to get and set font name, size, color, and other properties. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        font: Word.Font;
+        /**
+         *
+         * Gets the collection of inlinePicture objects that are in the body. The collection does not include floating images. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        inlinePictures: Word.InlinePictureCollection;
+        /**
+         *
+         * Gets the collection of paragraph objects that are in the body. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        paragraphs: Word.ParagraphCollection;
+        /**
+         *
+         * Gets the content control that contains the body. Returns null if there isn't a parent content control. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        parentContentControl: Word.ContentControl;
+        /**
+         *
+         * Gets or sets the style used for the body. This is the name of the pre-installed or custom style.
+         *
+         * [Api set: WordApi ]
+         */
+        style: string;
+        /**
+         *
+         * Gets the text of the body. Use the insertText method to insert text. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        text: string;
+        /**
+         *
+         * Clears the contents of the body object. The user can perform the undo operation on the cleared content.
+         *
+         * [Api set: WordApi ]
+         */
+        clear(): void;
+        /**
+         *
+         * Gets the HTML representation of the body object.
+         *
+         * [Api set: WordApi ]
+         */
+        getHtml(): OfficeExtension.ClientResult<string>;
+        /**
+         *
+         * Gets the OOXML (Office Open XML) representation of the body object.
+         *
+         * [Api set: WordApi ]
+         */
+        getOoxml(): OfficeExtension.ClientResult<string>;
+        /**
+         *
+         * Gets the whole body, or the starting or ending point of the body, as a range.
+         *
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Start' or 'End'.
+         *
+         * [Api set: WordApi ]
+         */
+        getRange(rangeLocation?: string): Word.Range;
+        /**
+         *
+         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Start' or 'End'.
+         *
+         * @param breakType Required. The break type to add to the body.
+         * @param insertLocation Required. The value can be 'Start' or 'End'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertBreak(breakType: string, insertLocation: string): void;
+        /**
+         *
+         * Wraps the body object with a Rich Text content control.
+         *
+         * [Api set: WordApi ]
+         */
+        insertContentControl(): Word.ContentControl;
+        /**
+         *
+         * Inserts a document into the body at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * @param base64File Required. The base64 encoded content of a .docx file.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertFileFromBase64(base64File: string, insertLocation: string): Word.Range;
+        /**
+         *
+         * Inserts HTML at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * @param html Required. The HTML to be inserted in the document.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertHtml(html: string, insertLocation: string): Word.Range;
+        /**
+         *
+         * Inserts a picture into the body at the specified location. The insertLocation value can be 'Start' or 'End'.
+         *
+         * @param base64EncodedImage Required. The base64 encoded image to be inserted in the body.
+         * @param insertLocation Required. The value can be 'Start' or 'End'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: string): Word.InlinePicture;
+        /**
+         *
+         * Inserts OOXML at the specified location.  The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * @param ooxml Required. The OOXML to be inserted.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertOoxml(ooxml: string, insertLocation: string): Word.Range;
+        /**
+         *
+         * Inserts a paragraph at the specified location. The insertLocation value can be 'Start' or 'End'.
+         *
+         * @param paragraphText Required. The paragraph text to be inserted.
+         * @param insertLocation Required. The value can be 'Start' or 'End'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertParagraph(paragraphText: string, insertLocation: string): Word.Paragraph;
+        /**
+         *
+         * Inserts text into the body at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * @param text Required. Text to be inserted.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertText(text: string, insertLocation: string): Word.Range;
+        /**
+         *
+         * Performs a search with the specified searchOptions on the scope of the body object. The search results are a collection of range objects.
+         *
+         * @param searchText Required. The search text.
+         * @param searchOptions Optional. Options for the search.
+         *
+         * [Api set: WordApi ]
+         */
+        search(searchText: string, searchOptions?: Word.SearchOptions | {
+            ignorePunct?: boolean;
+            ignoreSpace?: boolean;
+            matchCase?: boolean;
+            matchPrefix?: boolean;
+            matchSoundsLike?: boolean;
+            matchSuffix?: boolean;
+            matchWholeWord?: boolean;
+            matchWildcards?: boolean;
+        }): Word.SearchResultCollection;
+        /**
+         *
+         * Selects the body and navigates the Word UI to it.
+         *
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         *
+         * [Api set: WordApi ]
+         */
+        select(selectionMode?: string): void;
+        /**
+         *
+         * Splits the body into child ranges by using delimiters.
+         *
+         * @param delimiters Required. The delimiters as an array of strings.
+         * @param multiParagraphs Optional. Indicates whether a returned child range can cover multiple paragraphs. Default is false which indicates the paragraph boundaries are also used as delimiters.
+         * @param trimDelimiters Optional. Indicates whether to trim delimiters from the ranges in the range collection. Default is false which indicates that the delimiters are included in the ranges returned in the range collection.
+         * @param trimWhitespace Optional. Indicates whether to trim whitespace characters (spaces, tabs and column breaks) from the start and end of the ranges returned in the range collection. Default is false which indicates that whitespace characters at the start and end of the ranges are included in the range collection.
+         *
+         * [Api set: WordApi ]
+         */
+        splitTextRanges(delimiters: Array<string>, multiParagraphs?: boolean, trimDelimiters?: boolean, trimWhitespace?: boolean): Word.RangeCollection;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Word.Body;
+    }
+    /**
+     *
+     * Represents a content control. Content controls are bounded and potentially labeled regions in a document that serve as containers for specific types of content. Individual content controls may contain contents such as images, tables, or paragraphs of formatted text. Currently, only rich text content controls are supported.
+     *
+     * [Api set: WordApi ]
+     */
+    class ContentControl extends OfficeExtension.ClientObject {
+        private m_appearance;
+        private m_cannotDelete;
+        private m_cannotEdit;
+        private m_color;
+        private m_contentControls;
+        private m_font;
+        private m_id;
+        private m_inlinePictures;
+        private m_paragraphs;
+        private m_parentContentControl;
+        private m_placeholderText;
+        private m_removeWhenEdited;
+        private m_style;
+        private m_tag;
+        private m_text;
+        private m_title;
+        private m_type;
+        private m__ReferenceId;
+        /**
+         *
+         * Gets the collection of content control objects in the content control. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        contentControls: Word.ContentControlCollection;
+        /**
+         *
+         * Gets the text format of the content control. Use this to get and set font name, size, color, and other properties. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        font: Word.Font;
+        /**
+         *
+         * Gets the collection of inlinePicture objects in the content control. The collection does not include floating images. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        inlinePictures: Word.InlinePictureCollection;
+        /**
+         *
+         * Get the collection of paragraph objects in the content control. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        paragraphs: Word.ParagraphCollection;
+        /**
+         *
+         * Gets the content control that contains the content control. Returns null if there isn't a parent content control. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        parentContentControl: Word.ContentControl;
+        /**
+         *
+         * Gets or sets the appearance of the content control. The value can be 'boundingBox', 'tags' or 'hidden'.
+         *
+         * [Api set: WordApi ]
+         */
+        appearance: string;
+        /**
+         *
+         * Gets or sets a value that indicates whether the user can delete the content control. Mutually exclusive with removeWhenEdited.
+         *
+         * [Api set: WordApi ]
+         */
+        cannotDelete: boolean;
+        /**
+         *
+         * Gets or sets a value that indicates whether the user can edit the contents of the content control.
+         *
+         * [Api set: WordApi ]
+         */
+        cannotEdit: boolean;
+        /**
+         *
+         * Gets or sets the color of the content control. Color is set in '#RRGGBB' format or by using the color name.
+         *
+         * [Api set: WordApi ]
+         */
+        color: string;
+        /**
+         *
+         * Gets an integer that represents the content control identifier. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        id: number;
+        /**
+         *
+         * Gets or sets the placeholder text of the content control. Dimmed text will be displayed when the content control is empty.
+         *
+         * [Api set: WordApi ]
+         */
+        placeholderText: string;
+        /**
+         *
+         * Gets or sets a value that indicates whether the content control is removed after it is edited. Mutually exclusive with cannotDelete.
+         *
+         * [Api set: WordApi ]
+         */
+        removeWhenEdited: boolean;
+        /**
+         *
+         * Gets or sets the style used for the content control. This is the name of the pre-installed or custom style.
+         *
+         * [Api set: WordApi ]
+         */
+        style: string;
+        /**
+         *
+         * Gets or sets a tag to identify a content control.
+         *
+         * [Api set: WordApi ]
+         */
+        tag: string;
+        /**
+         *
+         * Gets the text of the content control. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        text: string;
+        /**
+         *
+         * Gets or sets the title for a content control.
+         *
+         * [Api set: WordApi ]
+         */
+        title: string;
+        /**
+         *
+         * Gets the content control type. Only rich text content controls are supported currently. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        type: string;
+        /**
+         *
+         * Clears the contents of the content control. The user can perform the undo operation on the cleared content.
+         *
+         * [Api set: WordApi ]
+         */
+        clear(): void;
+        /**
+         *
+         * Deletes the content control and its content. If keepContent is set to true, the content is not deleted.
+         *
+         * @param keepContent Required. Indicates whether the content should be deleted with the content control. If keepContent is set to true, the content is not deleted.
+         *
+         * [Api set: WordApi ]
+         */
+        delete(keepContent: boolean): void;
+        /**
+         *
+         * Gets the HTML representation of the content control object.
+         *
+         * [Api set: WordApi ]
+         */
+        getHtml(): OfficeExtension.ClientResult<string>;
+        /**
+         *
+         * Gets the Office Open XML (OOXML) representation of the content control object.
+         *
+         * [Api set: WordApi ]
+         */
+        getOoxml(): OfficeExtension.ClientResult<string>;
+        /**
+         *
+         * Gets the whole content control, or the starting or ending point of the content control, as a range.
+         *
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Start' or 'End'.
+         *
+         * [Api set: WordApi ]
+         */
+        getRange(rangeLocation?: string): Word.Range;
+        /**
+         *
+         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Start', 'End', 'Before' or 'After'.
+         *
+         * @param breakType Required. Type of break.
+         * @param insertLocation Required. The value can be 'Start', 'End', 'Before' or 'After'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertBreak(breakType: string, insertLocation: string): void;
+        /**
+         *
+         * Inserts a document into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * @param base64File Required. The base64 encoded content of a .docx file.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertFileFromBase64(base64File: string, insertLocation: string): Word.Range;
+        /**
+         *
+         * Inserts HTML into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * @param html Required. The HTML to be inserted in to the content control.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertHtml(html: string, insertLocation: string): Word.Range;
+        /**
+         *
+         * Inserts an inline picture into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * @param base64EncodedImage Required. The base64 encoded image to be inserted in the content control.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: string): Word.InlinePicture;
+        /**
+         *
+         * Inserts OOXML into the content control at the specified location.  The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * @param ooxml Required. The OOXML to be inserted in to the content control.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertOoxml(ooxml: string, insertLocation: string): Word.Range;
+        /**
+         *
+         * Inserts a paragraph at the specified location. The insertLocation value can be 'Start', 'End', 'Before' or 'After'.
+         *
+         * @param paragraphText Required. The paragrph text to be inserted.
+         * @param insertLocation Required. The value can be 'Start', 'End', 'Before' or 'After'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertParagraph(paragraphText: string, insertLocation: string): Word.Paragraph;
+        /**
+         *
+         * Inserts text into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * @param text Required. The text to be inserted in to the content control.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertText(text: string, insertLocation: string): Word.Range;
+        /**
+         *
+         * Performs a search with the specified searchOptions on the scope of the content control object. The search results are a collection of range objects.
+         *
+         * @param searchText Required. The search text.
+         * @param searchOptions Optional. Options for the search.
+         *
+         * [Api set: WordApi ]
+         */
+        search(searchText: string, searchOptions?: Word.SearchOptions | {
+            ignorePunct?: boolean;
+            ignoreSpace?: boolean;
+            matchCase?: boolean;
+            matchPrefix?: boolean;
+            matchSoundsLike?: boolean;
+            matchSuffix?: boolean;
+            matchWholeWord?: boolean;
+            matchWildcards?: boolean;
+        }): Word.SearchResultCollection;
+        /**
+         *
+         * Selects the content control. This causes Word to scroll to the selection.
+         *
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         *
+         * [Api set: WordApi ]
+         */
+        select(selectionMode?: string): void;
+        /**
+         *
+         * Splits the content control into child ranges by using delimiters.
+         *
+         * @param delimiters Required. The delimiters as an array of strings.
+         * @param multiParagraphs Optional. Indicates whether a returned child range can cover multiple paragraphs. Default is false which indicates the paragraph boundaries are also used as delimiters.
+         * @param trimDelimiters Optional. Indicates whether to trim delimiters from the ranges in the range collection. Default is false which indicates that the delimiters are included in the ranges returned in the range collection.
+         * @param trimWhitespace Optional. Indicates whether to trim whitespace characters (spaces, tabs and column breaks) from the start and end of the ranges returned in the range collection. Default is false which indicates that whitespace characters at the start and end of the ranges are included in the range collection.
+         *
+         * [Api set: WordApi ]
+         */
+        splitTextRanges(delimiters: Array<string>, multiParagraphs?: boolean, trimDelimiters?: boolean, trimWhitespace?: boolean): Word.RangeCollection;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Word.ContentControl;
+    }
+    /**
+     *
+     * Contains a collection of ContentControl objects. Content controls are bounded and potentially labeled regions in a document that serve as containers for specific types of content. Individual content controls may contain contents such as images, tables, or paragraphs of formatted text. Currently, only rich text content controls are supported.
+     *
+     * [Api set: WordApi ]
+     */
+    class ContentControlCollection extends OfficeExtension.ClientObject {
+        private m__ReferenceId;
+        private m__items;
+        /** Gets the loaded child items in this collection. */
+        items: Array<Word.ContentControl>;
+        /**
+         *
+         * Gets a content control by its identifier.
+         *
+         * @param id Required. A content control identifier.
+         *
+         * [Api set: WordApi ]
+         */
+        getById(id: number): Word.ContentControl;
+        /**
+         *
+         * Gets the content controls that have the specified tag.
+         *
+         * @param tag Required. A tag set on a content control.
+         *
+         * [Api set: WordApi ]
+         */
+        getByTag(tag: string): Word.ContentControlCollection;
+        /**
+         *
+         * Gets the content controls that have the specified title.
+         *
+         * @param title Required. The title of a content control.
+         *
+         * [Api set: WordApi ]
+         */
+        getByTitle(title: string): Word.ContentControlCollection;
+        /**
+         *
+         * Gets a content control by its index in the collection.
+         *
+         * @param index The index
+         *
+         * [Api set: WordApi ]
+         */
+        getItem(index: number): Word.ContentControl;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Word.ContentControlCollection;
+    }
+    /**
+     *
+     * The Document object is the top level object. A Document object contains one or more sections, content controls, and the body that contains the contents of the document.
+     *
+     * [Api set: WordApi ]
+     */
+    class Document extends OfficeExtension.ClientObject {
+        private m_body;
+        private m_contentControls;
+        private m_saved;
+        private m_sections;
+        private m__ReferenceId;
+        /**
+         *
+         * Gets the body of the document. The body is the text that excludes headers, footers, footnotes, textboxes, etc.. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        body: Word.Body;
+        /**
+         *
+         * Gets the collection of content control objects that are in the current document. This includes content controls in the body of the document, headers, footers, textboxes, etc.. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        contentControls: Word.ContentControlCollection;
+        /**
+         *
+         * Gets the collection of section objects that are in the document. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        sections: Word.SectionCollection;
+        /**
+         *
+         * Indicates whether the changes in the document have been saved. A value of true indicates that the document hasn't changed since it was saved. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        saved: boolean;
+        /**
+         *
+         * Gets the current selection of the document. Multiple selections are not supported.
+         *
+         * [Api set: WordApi ]
+         */
+        getSelection(): Word.Range;
+        /**
+         *
+         * Open the document.
+         *
+         * [Api set: WordApi ]
+         */
+        open(): void;
+        /**
+         *
+         * Saves the document. This will use the Word default file naming convention if the document has not been saved before.
+         *
+         * [Api set: WordApi ]
+         */
+        save(): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Word.Document;
+    }
+    /**
+     *
+     * Represents a font.
+     *
+     * [Api set: WordApi ]
+     */
+    class Font extends OfficeExtension.ClientObject {
+        private m_bold;
+        private m_color;
+        private m_doubleStrikeThrough;
+        private m_highlightColor;
+        private m_italic;
+        private m_name;
+        private m_size;
+        private m_strikeThrough;
+        private m_subscript;
+        private m_superscript;
+        private m_underline;
+        private m__ReferenceId;
+        /**
+         *
+         * Gets or sets a value that indicates whether the font is bold. True if the font is formatted as bold, otherwise, false.
+         *
+         * [Api set: WordApi ]
+         */
+        bold: boolean;
+        /**
+         *
+         * Gets or sets the color for the specified font. You can provide the value in the '#RRGGBB' format or the color name.
+         *
+         * [Api set: WordApi ]
+         */
+        color: string;
+        /**
+         *
+         * Gets or sets a value that indicates whether the font has a double strike through. True if the font is formatted as double strikethrough text, otherwise, false.
+         *
+         * [Api set: WordApi ]
+         */
+        doubleStrikeThrough: boolean;
+        /**
+         *
+         * Gets or sets the highlight color for the specified font. You can provide the value as either in the '#RRGGBB' format or the color name.
+         *
+         * [Api set: WordApi ]
+         */
+        highlightColor: string;
+        /**
+         *
+         * Gets or sets a value that indicates whether the font is italicized. True if the font is italicized, otherwise, false.
+         *
+         * [Api set: WordApi ]
+         */
+        italic: boolean;
+        /**
+         *
+         * Gets or sets a value that represents the name of the font.
+         *
+         * [Api set: WordApi ]
+         */
+        name: string;
+        /**
+         *
+         * Gets or sets a value that represents the font size in points.
+         *
+         * [Api set: WordApi ]
+         */
+        size: number;
+        /**
+         *
+         * Gets or sets a value that indicates whether the font has a strike through. True if the font is formatted as strikethrough text, otherwise, false.
+         *
+         * [Api set: WordApi ]
+         */
+        strikeThrough: boolean;
+        /**
+         *
+         * Gets or sets a value that indicates whether the font is a subscript. True if the font is formatted as subscript, otherwise, false.
+         *
+         * [Api set: WordApi ]
+         */
+        subscript: boolean;
+        /**
+         *
+         * Gets or sets a value that indicates whether the font is a superscript. True if the font is formatted as superscript, otherwise, false.
+         *
+         * [Api set: WordApi ]
+         */
+        superscript: boolean;
+        /**
+         *
+         * Gets or sets a value that indicates the font's underline type. 'None' if the font is not underlined.
+         *
+         * [Api set: WordApi ]
+         */
+        underline: string;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Word.Font;
+    }
+    /**
+     *
+     * Represents an inline picture.
+     *
+     * [Api set: WordApi ]
+     */
+    class InlinePicture extends OfficeExtension.ClientObject {
+        private m_altTextDescription;
+        private m_altTextTitle;
+        private m_height;
+        private m_hyperlink;
+        private m_imageFormat;
+        private m_lockAspectRatio;
+        private m_paragraph;
+        private m_parentContentControl;
+        private m_width;
+        private m__Id;
+        private m__ReferenceId;
+        /**
+         *
+         * Gets the paragraph that contains the inline image. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        paragraph: Word.Paragraph;
+        /**
+         *
+         * Gets the content control that contains the inline image. Returns null if there isn't a parent content control. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        parentContentControl: Word.ContentControl;
+        /**
+         *
+         * Gets or sets a string that represents the alternative text associated with the inline image
+         *
+         * [Api set: WordApi ]
+         */
+        altTextDescription: string;
+        /**
+         *
+         * Gets or sets a string that contains the title for the inline image.
+         *
+         * [Api set: WordApi ]
+         */
+        altTextTitle: string;
+        /**
+         *
+         * Gets or sets a number that describes the height of the inline image.
+         *
+         * [Api set: WordApi ]
+         */
+        height: number;
+        /**
+         *
+         * Gets or sets the hyperlink associated with the inline image.
+         *
+         * [Api set: WordApi ]
+         */
+        hyperlink: string;
+        /**
+         *
+         * Gets the format of the inline image. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        imageFormat: string;
+        /**
+         *
+         * Gets or sets a value that indicates whether the inline image retains its original proportions when you resize it.
+         *
+         * [Api set: WordApi ]
+         */
+        lockAspectRatio: boolean;
+        /**
+         *
+         * Gets or sets a number that describes the width of the inline image.
+         *
+         * [Api set: WordApi ]
+         */
+        width: number;
+        /**
+         *
+         * Deletes the inline picture from the document.
+         *
+         * [Api set: WordApi ]
+         */
+        delete(): void;
+        /**
+         *
+         * Gets the base64 encoded string representation of the inline image.
+         *
+         * [Api set: WordApi ]
+         */
+        getBase64ImageSrc(): OfficeExtension.ClientResult<string>;
+        /**
+         *
+         * Gets the picture, or the starting or ending point of the picture, as a range.
+         *
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Start' or 'End'.
+         *
+         * [Api set: WordApi ]
+         */
+        getRange(rangeLocation?: string): Word.Range;
+        /**
+         *
+         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Before' or 'After'.
+         *
+         * @param breakType Required. The break type to add.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertBreak(breakType: string, insertLocation: string): void;
+        /**
+         *
+         * Wraps the inline picture with a rich text content control.
+         *
+         * [Api set: WordApi ]
+         */
+        insertContentControl(): Word.ContentControl;
+        /**
+         *
+         * Inserts a document at the specified location. The insertLocation value can be 'Before' or 'After'.
+         *
+         * @param base64File Required. The base64 encoded content of a .docx file.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertFileFromBase64(base64File: string, insertLocation: string): Word.Range;
+        /**
+         *
+         * Inserts HTML at the specified location. The insertLocation value can be 'Before' or 'After'.
+         *
+         * @param html Required. The HTML to be inserted.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertHtml(html: string, insertLocation: string): Word.Range;
+        /**
+         *
+         * Inserts an inline picture at the specified location. The insertLocation value can be 'Replace', 'Before' or 'After'.
+         *
+         * @param base64EncodedImage Required. The base64 encoded image to be inserted.
+         * @param insertLocation Required. The value can be 'Replace', 'Before' or 'After'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: string): Word.InlinePicture;
+        /**
+         *
+         * Inserts OOXML at the specified location.  The insertLocation value can be 'Before' or 'After'.
+         *
+         * @param ooxml Required. The OOXML to be inserted.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertOoxml(ooxml: string, insertLocation: string): Word.Range;
+        /**
+         *
+         * Inserts a paragraph at the specified location. The insertLocation value can be 'Before' or 'After'.
+         *
+         * @param paragraphText Required. The paragraph text to be inserted.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertParagraph(paragraphText: string, insertLocation: string): Word.Paragraph;
+        /**
+         *
+         * Inserts text at the specified location. The insertLocation value can be 'Before' or 'After'.
+         *
+         * @param text Required. Text to be inserted.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertText(text: string, insertLocation: string): Word.Range;
+        /**
+         *
+         * Selects the inline picture. This causes Word to scroll to the selection.
+         *
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         *
+         * [Api set: WordApi ]
+         */
+        select(selectionMode?: string): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Word.InlinePicture;
+    }
+    /**
+     *
+     * Contains a collection of [inlinePicture](inlinePicture.md) objects.
+     *
+     * [Api set: WordApi ]
+     */
+    class InlinePictureCollection extends OfficeExtension.ClientObject {
+        private m__ReferenceId;
+        private m__items;
+        /** Gets the loaded child items in this collection. */
+        items: Array<Word.InlinePicture>;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Word.InlinePictureCollection;
+    }
+    /**
+     *
+     * Represents a single paragraph in a selection, range, content control, or document body.
+     *
+     * [Api set: WordApi ]
+     */
+    class Paragraph extends OfficeExtension.ClientObject {
+        private m_alignment;
+        private m_contentControls;
+        private m_firstLineIndent;
+        private m_font;
+        private m_inlinePictures;
+        private m_leftIndent;
+        private m_lineSpacing;
+        private m_lineUnitAfter;
+        private m_lineUnitBefore;
+        private m_listLevel;
+        private m_outlineLevel;
+        private m_parentContentControl;
+        private m_rightIndent;
+        private m_spaceAfter;
+        private m_spaceBefore;
+        private m_style;
+        private m_text;
+        private m__Id;
+        private m__ReferenceId;
+        /**
+         *
+         * Gets the collection of content control objects that are in the paragraph. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        contentControls: Word.ContentControlCollection;
+        /**
+         *
+         * Gets the text format of the paragraph. Use this to get and set font name, size, color, and other properties. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        font: Word.Font;
+        /**
+         *
+         * Gets the collection of inlinePicture objects that are in the paragraph. The collection does not include floating images. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        inlinePictures: Word.InlinePictureCollection;
+        /**
+         *
+         * Gets the content control that contains the paragraph. Returns null if there isn't a parent content control. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        parentContentControl: Word.ContentControl;
+        /**
+         *
+         * Gets or sets the alignment for a paragraph. The value can  be 'left', 'centered', 'right', or 'justified'.
+         *
+         * [Api set: WordApi ]
+         */
+        alignment: string;
+        /**
+         *
+         * Gets or sets the value, in points, for a first line or hanging indent. Use a positive value to set a first-line indent, and use a negative value to set a hanging indent.
+         *
+         * [Api set: WordApi ]
+         */
+        firstLineIndent: number;
+        /**
+         *
+         * Gets or sets the left indent value, in points, for the paragraph.
+         *
+         * [Api set: WordApi ]
+         */
+        leftIndent: number;
+        /**
+         *
+         * Gets or sets the line spacing, in points, for the specified paragraph. In the Word UI, this value is divided by 12.
+         *
+         * [Api set: WordApi ]
+         */
+        lineSpacing: number;
+        /**
+         *
+         * Gets or sets the amount of spacing, in grid lines. after the paragraph.
+         *
+         * [Api set: WordApi ]
+         */
+        lineUnitAfter: number;
+        /**
+         *
+         * Gets or sets the amount of spacing, in grid lines, before the paragraph.
+         *
+         * [Api set: WordApi ]
+         */
+        lineUnitBefore: number;
+        /**
+         *
+         * Gets or sets the list level of the paragraph.
+         *
+         * [Api set: WordApi ]
+         */
+        listLevel: number;
+        /**
+         *
+         * Gets or sets the outline level for the paragraph.
+         *
+         * [Api set: WordApi ]
+         */
+        outlineLevel: number;
+        /**
+         *
+         * Gets or sets the right indent value, in points, for the paragraph.
+         *
+         * [Api set: WordApi ]
+         */
+        rightIndent: number;
+        /**
+         *
+         * Gets or sets the spacing, in points, after the paragraph.
+         *
+         * [Api set: WordApi ]
+         */
+        spaceAfter: number;
+        /**
+         *
+         * Gets or sets the spacing, in points, before the paragraph.
+         *
+         * [Api set: WordApi ]
+         */
+        spaceBefore: number;
+        /**
+         *
+         * Gets or sets the style used for the paragraph. This is the name of the pre-installed or custom style.
+         *
+         * [Api set: WordApi ]
+         */
+        style: string;
+        /**
+         *
+         * Gets the text of the paragraph. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        text: string;
+        /**
+         *
+         * Clears the contents of the paragraph object. The user can perform the undo operation on the cleared content.
+         *
+         * [Api set: WordApi ]
+         */
+        clear(): void;
+        /**
+         *
+         * Deletes the paragraph and its content from the document.
+         *
+         * [Api set: WordApi ]
+         */
+        delete(): void;
+        /**
+         *
+         * Gets the HTML representation of the paragraph object.
+         *
+         * [Api set: WordApi ]
+         */
+        getHtml(): OfficeExtension.ClientResult<string>;
+        /**
+         *
+         * Gets the Office Open XML (OOXML) representation of the paragraph object.
+         *
+         * [Api set: WordApi ]
+         */
+        getOoxml(): OfficeExtension.ClientResult<string>;
+        /**
+         *
+         * Gets the whole paragraph, or the starting or ending point of the paragraph, as a range.
+         *
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Start' or 'End'.
+         *
+         * [Api set: WordApi ]
+         */
+        getRange(rangeLocation?: string): Word.Range;
+        /**
+         *
+         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Before' or 'After'.
+         *
+         * @param breakType Required. The break type to add to the document.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertBreak(breakType: string, insertLocation: string): void;
+        /**
+         *
+         * Wraps the paragraph object with a rich text content control.
+         *
+         * [Api set: WordApi ]
+         */
+        insertContentControl(): Word.ContentControl;
+        /**
+         *
+         * Inserts a document into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * @param base64File Required. The base64 encoded content of a .docx file.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertFileFromBase64(base64File: string, insertLocation: string): Word.Range;
+        /**
+         *
+         * Inserts HTML into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * @param html Required. The HTML to be inserted in the paragraph.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertHtml(html: string, insertLocation: string): Word.Range;
+        /**
+         *
+         * Inserts a picture into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * @param base64EncodedImage Required. The base64 encoded image to be inserted.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: string): Word.InlinePicture;
+        /**
+         *
+         * Inserts OOXML into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * @param ooxml Required. The OOXML to be inserted in the paragraph.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertOoxml(ooxml: string, insertLocation: string): Word.Range;
+        /**
+         *
+         * Inserts a paragraph at the specified location. The insertLocation value can be 'Before' or 'After'.
+         *
+         * @param paragraphText Required. The paragraph text to be inserted.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertParagraph(paragraphText: string, insertLocation: string): Word.Paragraph;
+        /**
+         *
+         * Inserts text into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * @param text Required. Text to be inserted.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertText(text: string, insertLocation: string): Word.Range;
+        /**
+         *
+         * Performs a search with the specified searchOptions on the scope of the paragraph object. The search results are a collection of range objects.
+         *
+         * @param searchText Required. The search text.
+         * @param searchOptions Optional. Options for the search.
+         *
+         * [Api set: WordApi ]
+         */
+        search(searchText: string, searchOptions?: Word.SearchOptions | {
+            ignorePunct?: boolean;
+            ignoreSpace?: boolean;
+            matchCase?: boolean;
+            matchPrefix?: boolean;
+            matchSoundsLike?: boolean;
+            matchSuffix?: boolean;
+            matchWholeWord?: boolean;
+            matchWildcards?: boolean;
+        }): Word.SearchResultCollection;
+        /**
+         *
+         * Selects and navigates the Word UI to the paragraph.
+         *
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         *
+         * [Api set: WordApi ]
+         */
+        select(selectionMode?: string): void;
+        /**
+         *
+         * Splits the paragraph into child ranges by using delimiters.
+         *
+         * @param delimiters Required. The delimiters as an array of strings.
+         * @param trimDelimiters Optional. Indicates whether to trim delimiters from the ranges in the range collection. Default is false which indicates that the delimiters are included in the ranges returned in the range collection.
+         * @param trimWhitespace Optional. Indicates whether to trim whitespace characters (spaces, tabs and column breaks) from the start and end of the ranges returned in the range collection. Default is false which indicates that whitespace characters at the start and end of the ranges are included in the range collection.
+         *
+         * [Api set: WordApi ]
+         */
+        splitTextRanges(delimiters: Array<string>, trimDelimiters?: boolean, trimWhitespace?: boolean): Word.RangeCollection;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Word.Paragraph;
+    }
+    /**
+     *
+     * Contains a collection of [paragraph](paragraph.md) objects.
+     *
+     * [Api set: WordApi ]
+     */
+    class ParagraphCollection extends OfficeExtension.ClientObject {
+        private m__ReferenceId;
+        private m__items;
+        /** Gets the loaded child items in this collection. */
+        items: Array<Word.Paragraph>;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Word.ParagraphCollection;
+    }
+    /**
+     *
+     * Represents a contiguous area in a document.
+     *
+     * [Api set: WordApi ]
+     */
+    class Range extends OfficeExtension.ClientObject {
+        private m_contentControls;
+        private m_font;
+        private m_inlinePictures;
+        private m_isEmpty;
+        private m_paragraphs;
+        private m_parentContentControl;
+        private m_style;
+        private m_text;
+        private m__Id;
+        private m__ReferenceId;
+        /**
+         *
+         * Gets the collection of content control objects that are in the range. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        contentControls: Word.ContentControlCollection;
+        /**
+         *
+         * Gets the text format of the range. Use this to get and set font name, size, color, and other properties. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        font: Word.Font;
+        /**
+         *
+         * Gets the collection of inline picture objects that are in the range. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        inlinePictures: Word.InlinePictureCollection;
+        /**
+         *
+         * Gets the collection of paragraph objects that are in the range. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        paragraphs: Word.ParagraphCollection;
+        /**
+         *
+         * Gets the content control that contains the range. Returns null if there isn't a parent content control. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        parentContentControl: Word.ContentControl;
+        /**
+         *
+         * Checks whether the range length is zero. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        isEmpty: boolean;
+        /**
+         *
+         * Gets or sets the style used for the range. This is the name of the pre-installed or custom style.
+         *
+         * [Api set: WordApi ]
+         */
+        style: string;
+        /**
+         *
+         * Gets the text of the range. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        text: string;
+        /**
+         *
+         * Clears the contents of the range object. The user can perform the undo operation on the cleared content.
+         *
+         * [Api set: WordApi ]
+         */
+        clear(): void;
+        /**
+         *
+         * Compares this range's location with another range's location.
+         *
+         * @param range Required. The range to compare with this range.
+         *
+         * [Api set: WordApi ]
+         */
+        compareLocationWith(range: Word.Range): OfficeExtension.ClientResult<string>;
+        /**
+         *
+         * Deletes the range and its content from the document.
+         *
+         * [Api set: WordApi ]
+         */
+        delete(): void;
+        /**
+         *
+         * Expands the range in either direction to cover another range.
+         *
+         * @param range Required. Another range.
+         *
+         * [Api set: WordApi ]
+         */
+        expandTo(range: Word.Range): void;
+        /**
+         *
+         * Gets the HTML representation of the range object.
+         *
+         * [Api set: WordApi ]
+         */
+        getHtml(): OfficeExtension.ClientResult<string>;
+        /**
+         *
+         * Gets the OOXML representation of the range object.
+         *
+         * [Api set: WordApi ]
+         */
+        getOoxml(): OfficeExtension.ClientResult<string>;
+        /**
+         *
+         * Clones the range, or gets the starting or ending point of the range as a new range.
+         *
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Start' or 'End'.
+         *
+         * [Api set: WordApi ]
+         */
+        getRange(rangeLocation?: string): Word.Range;
+        /**
+         *
+         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Replace', 'Before' or 'After'.
+         *
+         * @param breakType Required. The break type to add.
+         * @param insertLocation Required. The value can be 'Replace', 'Before' or 'After'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertBreak(breakType: string, insertLocation: string): void;
+        /**
+         *
+         * Wraps the range object with a rich text content control.
+         *
+         * [Api set: WordApi ]
+         */
+        insertContentControl(): Word.ContentControl;
+        /**
+         *
+         * Inserts a document at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         *
+         * @param base64File Required. The base64 encoded content of a .docx file.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertFileFromBase64(base64File: string, insertLocation: string): Word.Range;
+        /**
+         *
+         * Inserts HTML at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         *
+         * @param html Required. The HTML to be inserted.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertHtml(html: string, insertLocation: string): Word.Range;
+        /**
+         *
+         * Inserts a picture at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         *
+         * @param base64EncodedImage Required. The base64 encoded image to be inserted.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: string): Word.InlinePicture;
+        /**
+         *
+         * Inserts OOXML at the specified location.  The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         *
+         * @param ooxml Required. The OOXML to be inserted.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertOoxml(ooxml: string, insertLocation: string): Word.Range;
+        /**
+         *
+         * Inserts a paragraph at the specified location. The insertLocation value can be 'Before' or 'After'.
+         *
+         * @param paragraphText Required. The paragraph text to be inserted.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertParagraph(paragraphText: string, insertLocation: string): Word.Paragraph;
+        /**
+         *
+         * Inserts text at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         *
+         * @param text Required. Text to be inserted.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         *
+         * [Api set: WordApi ]
+         */
+        insertText(text: string, insertLocation: string): Word.Range;
+        /**
+         *
+         * Shrink the range to the intersection of the range with another range.
+         *
+         * @param range Required. Another range.
+         *
+         * [Api set: WordApi ]
+         */
+        intersectWith(range: Word.Range): void;
+        /**
+         *
+         * Performs a search with the specified searchOptions on the scope of the range object. The search results are a collection of range objects.
+         *
+         * @param searchText Required. The search text.
+         * @param searchOptions Optional. Options for the search.
+         *
+         * [Api set: WordApi ]
+         */
+        search(searchText: string, searchOptions?: Word.SearchOptions | {
+            ignorePunct?: boolean;
+            ignoreSpace?: boolean;
+            matchCase?: boolean;
+            matchPrefix?: boolean;
+            matchSoundsLike?: boolean;
+            matchSuffix?: boolean;
+            matchWholeWord?: boolean;
+            matchWildcards?: boolean;
+        }): Word.SearchResultCollection;
+        /**
+         *
+         * Selects and navigates the Word UI to the range.
+         *
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         *
+         * [Api set: WordApi ]
+         */
+        select(selectionMode?: string): void;
+        /**
+         *
+         * Splits the range into child ranges by using delimiters.
+         *
+         * @param delimiters Required. The delimiters as an array of strings.
+         * @param multiParagraphs Optional. Indicates whether a returned child range can cover multiple paragraphs. Default is false which indicates the paragraph boundaries are also used as delimiters.
+         * @param trimDelimiters Optional. Indicates whether to trim delimiters from the ranges in the range collection. Default is false which indicates that the delimiters are included in the ranges returned in the range collection.
+         * @param trimWhitespace Optional. Indicates whether to trim whitespace characters (spaces, tabs and column breaks) from the start and end of the child ranges returned in the range collection. Default is false which indicates that whitespace characters at the start and end of the child ranges are included in the range collection.
+         *
+         * [Api set: WordApi ]
+         */
+        splitTextRanges(delimiters: Array<string>, multiParagraphs?: boolean, trimDelimiters?: boolean, trimWhitespace?: boolean): Word.RangeCollection;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Word.Range;
+    }
+    /**
+     *
+     * Contains a collection of [range](range.md) objects.
+     *
+     * [Api set: WordApi ]
+     */
+    class RangeCollection extends OfficeExtension.ClientObject {
+        private m__ReferenceId;
+        private m__items;
+        /** Gets the loaded child items in this collection. */
+        items: Array<Word.Range>;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Word.RangeCollection;
+    }
+    /**
+     *
+     * Specifies the options to be included in a search operation.
+     *
+     * [Api set: WordApi ]
+     */
+    class SearchOptions extends OfficeExtension.ClientObject {
+        private m_ignorePunct;
+        private m_ignoreSpace;
+        private m_matchCase;
+        private m_matchPrefix;
+        private m_matchSoundsLike;
+        private m_matchSuffix;
+        private m_matchWholeWord;
+        private m_matchWildcards;
+        matchWildCards: boolean;
+        /**
+         *
+         * Gets or sets a value that indicates whether to ignore all punctuation characters between words. Corresponds to the Ignore punctuation check box in the Find and Replace dialog box.
+         *
+         * [Api set: WordApi ]
+         */
+        ignorePunct: boolean;
+        /**
+         *
+         * Gets or sets a value that indicates whether to ignore all whitespace between words. Corresponds to the Ignore whitespace characters check box in the Find and Replace dialog box.
+         *
+         * [Api set: WordApi ]
+         */
+        ignoreSpace: boolean;
+        /**
+         *
+         * Gets or sets a value that indicates whether to perform a case sensitive search. Corresponds to the Match case check box in the Find and Replace dialog box (Edit menu).
+         *
+         * [Api set: WordApi ]
+         */
+        matchCase: boolean;
+        /**
+         *
+         * Gets or sets a value that indicates whether to match words that begin with the search string. Corresponds to the Match prefix check box in the Find and Replace dialog box.
+         *
+         * [Api set: WordApi ]
+         */
+        matchPrefix: boolean;
+        /**
+         *
+         * Gets or sets a value that indicates whether to find words that sound similar to the search string. Corresponds to the Sounds like check box in the Find and Replace dialog box
+         *
+         * [Api set: WordApi ]
+         */
+        matchSoundsLike: boolean;
+        /**
+         *
+         * Gets or sets a value that indicates whether to match words that end with the search string. Corresponds to the Match suffix check box in the Find and Replace dialog box.
+         *
+         * [Api set: WordApi ]
+         */
+        matchSuffix: boolean;
+        /**
+         *
+         * Gets or sets a value that indicates whether to find operation only entire words, not text that is part of a larger word. Corresponds to the Find whole words only check box in the Find and Replace dialog box.
+         *
+         * [Api set: WordApi ]
+         */
+        matchWholeWord: boolean;
+        /**
+         *
+         * Gets or sets a value that indicates whether the search will be performed using special search operators. Corresponds to the Use wildcards check box in the Find and Replace dialog box.
+         *
+         * [Api set: WordApi ]
+         */
+        matchWildcards: boolean;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Word.SearchOptions;
+        /**
+         * Create a new instance of Word.SearchOptions object
+         */
+        static newObject(context: OfficeExtension.ClientRequestContext): Word.SearchOptions;
+    }
+    /**
+     *
+     * Contains a collection of [range](range.md) objects as a result of a search operation.
+     *
+     * [Api set: WordApi ]
+     */
+    class SearchResultCollection extends OfficeExtension.ClientObject {
+        private m__ReferenceId;
+        private m__items;
+        /** Gets the loaded child items in this collection. */
+        items: Array<Word.Range>;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Word.SearchResultCollection;
+    }
+    /**
+     *
+     * Represents a section in a Word document.
+     *
+     * [Api set: WordApi ]
+     */
+    class Section extends OfficeExtension.ClientObject {
+        private m_body;
+        private m__Id;
+        private m__ReferenceId;
+        /**
+         *
+         * Gets the body of the section. This does not include the header/footer and other section metadata. Read-only.
+         *
+         * [Api set: WordApi ]
+         */
+        body: Word.Body;
+        /**
+         *
+         * Gets one of the section's footers.
+         *
+         * @param type Required. The type of footer to return. This value can be: 'primary', 'firstPage' or 'evenPages'.
+         *
+         * [Api set: WordApi ]
+         */
+        getFooter(type: string): Word.Body;
+        /**
+         *
+         * Gets one of the section's headers.
+         *
+         * @param type Required. The type of header to return. This value can be: 'primary', 'firstPage' or 'evenPages'.
+         *
+         * [Api set: WordApi ]
+         */
+        getHeader(type: string): Word.Body;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Word.Section;
+    }
+    /**
+     *
+     * Contains the collection of the document's [section](section.md) objects.
+     *
+     * [Api set: WordApi ]
+     */
+    class SectionCollection extends OfficeExtension.ClientObject {
+        private m__ReferenceId;
+        private m__items;
+        /** Gets the loaded child items in this collection. */
+        items: Array<Word.Section>;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Word.SectionCollection;
+    }
+    /**
+     *
+     * ContentControl types
+     *
+     * [Api set: WordApi ]
+     */
+    namespace ContentControlType {
+        var richText: string;
+    }
+    /**
+     *
+     * ContentControl appearance
+     *
+     * [Api set: WordApi ]
+     */
+    namespace ContentControlAppearance {
+        var boundingBox: string;
+        var tags: string;
+        var hidden: string;
+    }
+    /**
+     *
+     * Underline types
+     *
+     * [Api set: WordApi ]
+     */
+    namespace UnderlineType {
+        var none: string;
+        var single: string;
+        var word: string;
+        var double: string;
+        var dotted: string;
+        var hidden: string;
+        var thick: string;
+        var dashLine: string;
+        var dotLine: string;
+        var dotDashLine: string;
+        var twoDotDashLine: string;
+        var wave: string;
+    }
+    /**
+     * [Api set: WordApi ]
+     */
+    namespace BreakType {
+        var page: string;
+        var column: string;
+        var next: string;
+        var sectionContinuous: string;
+        var sectionEven: string;
+        var sectionOdd: string;
+        var line: string;
+        var lineClearLeft: string;
+        var lineClearRight: string;
+        var textWrapping: string;
+    }
+    /**
+     *
+     * The insertion location types
+     *
+     * [Api set: WordApi ]
+     */
+    namespace InsertLocation {
+        var before: string;
+        var after: string;
+        var start: string;
+        var end: string;
+        var replace: string;
+    }
+    /**
+     * [Api set: WordApi ]
+     */
+    namespace Alignment {
+        var unknown: string;
+        var left: string;
+        var centered: string;
+        var right: string;
+        var justified: string;
+    }
+    /**
+     * [Api set: WordApi ]
+     */
+    namespace HeaderFooterType {
+        var primary: string;
+        var firstPage: string;
+        var evenPages: string;
+    }
+    /**
+     * [Api set: WordApi ]
+     */
+    namespace SelectionMode {
+        var select: string;
+        var start: string;
+        var end: string;
+    }
+    /**
+     * [Api set: WordApi ]
+     */
+    namespace ImageFormat {
+        var unsupported: string;
+        var undefined: string;
+        var bmp: string;
+        var jpeg: string;
+        var gif: string;
+        var tiff: string;
+        var png: string;
+        var icon: string;
+        var exif: string;
+        var wmf: string;
+        var emf: string;
+        var pict: string;
+        var pdf: string;
+    }
+    /**
+     * [Api set: WordApi ]
+     */
+    namespace RangeLocation {
+        var whole: string;
+        var start: string;
+        var end: string;
+    }
+    /**
+     * [Api set: WordApi ]
+     */
+    namespace LocationRelation {
+        var unrelated: string;
+        var equal: string;
+        var containsStart: string;
+        var containsEnd: string;
+        var contains: string;
+        var insideStart: string;
+        var insideEnd: string;
+        var inside: string;
+        var adjacentBefore: string;
+        var overlapsBefore: string;
+        var before: string;
+        var adjacentAfter: string;
+        var overlapsAfter: string;
+        var after: string;
+    }
+    namespace ErrorCodes {
+        var accessDenied: string;
+        var generalException: string;
+        var invalidArgument: string;
+        var itemNotFound: string;
+        var notImplemented: string;
+    }
+}
+declare namespace Word {
+    /**
+     * The RequestContext object facilitates requests to the Word application. Since the Office add-in and the Word application run in two different processes, the request context is required to get access to the Word object model from the add-in.
+     */
+    class RequestContext extends OfficeExtension.ClientRequestContext {
+        private m_document;
+        private m_application;
+        constructor(url?: string);
+        document: Document;
+        application: Application;
+    }
+    /**
+     * Executes a batch script that performs actions on the Word object model. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
+     * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Word application. Since the Office add-in and the Word application run in two different processes, the request context is required to get access to the Word object model from the add-in.
+     */
+    function run<T>(batch: (context: Word.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+}
+
+declare namespace Office.MailboxEnums {
+    export enum BodyType {
+        /**
+         * The body is in HTML format
+         */
+        HTML,
+        /**
+         * The body is in text format
+         */
+        text
+    }
+    export enum EntityType {
+        /**
+         * Specifies that the entity is a meeting suggestion
+         */
+        MeetingSuggestion,
+        /**
+         * Specifies that the entity is a task suggestion
+         */
+        TaskSuggestion,
+        /**
+         * Specifies that the entity is a postal address
+         */
+        Address,
+        /**
+         * Specifies that the entity is SMTP email address
+         */
+        EmailAddress,
+        /**
+         * Specifies that the entity is an Internet URL
+         */
+        Url,
+        /**
+         * Specifies that the entity is US phone number
+         */
+        PhoneNumber,
+        /**
+         * Specifies that the entity is a contact
+         */
+        Contact
+    }
+    export enum ItemType {
+        /**
+         * A meeting request, response, or cancellation
+         */
+        Message,
+        /**
+         * Specifies an appointment item
+         */
+        Appointment
+    }
+    export enum ResponseType {
+        /**
+         * There has been no response from the attendee
+         */
+        None,
+        /**
+         * The attendee is the meeting organizer
+         */
+        Organizer,
+        /**
+         * The meeting request was tentatively accepted by the attendee
+         */
+        Tentative,
+        /**
+         * The meeting request was accepted by the attendee
+         */
+        Accepted,
+        /**
+         * The meeting request was declined by the attendee
+         */
+        Declined
+    }
+    export enum RecipientType {
+        /**
+         * Specifies that the recipient is not one of the other recipient types
+         */
+        Other,
+        /**
+         * Specifies that the recipient is a distribution list containing a list of email addresses
+         */
+        DistributionList,
+        /**
+         * Specifies that the recipient is an SMTP email address that is on the Exchange server
+         */
+        User,
+        /**
+         * Specifies that the recipient is an SMTP email address that is not on the Exchange server
+         */
+        ExternalUser
+    }
+    export enum AttachmentType {
+        /**
+         * The attachment is a file
+         */
+        File,
+        /**
+         * The attachment is an Exchange item
+         */
+        Item
+    }
+}
+declare namespace Office {
+    export module Types {
+        export interface ItemRead extends Office.Item {
+            subject: any;
+            /**
+             * Displays a reply form that includes the sender and all the recipients of the selected message
+             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
+             */
+            displayReplyAllForm(htmlBody: string): void;
+            /**
+             * Displays a reply form that includes only the sender of the selected message
+             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
+             */
+            displayReplyForm(htmlBody: string): void;
+            /**
+             * Gets an array of entities found in an message
+             */
+            getEntities(): Office.Entities;
+            /**
+             * Gets an array of entities of the specified entity type found in an message
+             * @param entityType One of the EntityType enumeration values
+             */
+            getEntitiesByType(entityType: Office.MailboxEnums.EntityType): Office.Entities;
+            /**
+             * Returns well-known entities that pass the named filter defined in the manifest XML file
+             * @param name  A TableData object with the headers and rows
+             */
+            getFilteredEntitiesByName(name: string): Office.Entities;
+            /**
+             * Returns string values in the currently selected message object that match the regular expressions defined in the manifest XML file
+             */
+            getRegExMatches(): string[];
+            /**
+             * Returns string values that match the named regular expression defined in the manifest XML file
+             */
+            getRegExMatchesByName(name: string): string[];
+        }
+        export interface ItemCompose extends Office.Item {
+            body: Office.Body;
+            subject: any;
+            /**
+             * Adds a file to a message as an attachment
+             * @param uri The URI that provides the location of the file to attach to the message. The maximum length is 2048 characters
+             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
+             * @param options Any optional parameters or state data passed to the method
+             * @param callback The optional callback method
+             */
+            addFileAttachmentAsync(uri: string, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
+            /**
+             * Adds an Exchange item, such as a message, as an attachment to the message
+             * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters
+             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
+             * @param options Any optional parameters or state data passed to the method
+             * @param callback The optional callback method
+             */
+            addItemAttachmentAsync(itemId: any, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
+            /**
+             * Removes an attachment from a message
+             * @param attachmentIndex The index of the attachment to remove. The maximum length of the string is 100 characters
+             * @param options Any optional parameters or state data passed to the method
+             * @param callback The optional callback method
+             */
+            removeAttachmentAsync(attachmentIndex: string, option?: any, callback?: (result: AsyncResult) => void): void;
+        }
+        export interface MessageCompose extends Office.Message {
+            attachments: Office.AttachmentDetails[];
+            body: Office.Body;
+            bcc: Office.Recipients;
+            cc: Office.Recipients;
+            subject: Office.Subject;
+            to: Office.Recipients;
+            /**
+             * Adds a file to a message as an attachment
+             * @param uri The URI that provides the location of the file to attach to the message. The maximum length is 2048 characters
+             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
+             * @param options Any optional parameters or state data passed to the method
+             * @param callback The optional callback method
+             */
+            addFileAttachmentAsync(uri: string, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
+            /**
+             * Adds an Exchange item, such as a message, as an attachment to the message
+             * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters
+             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
+             * @param options Any optional parameters or state data passed to the method
+             * @param callback The optional callback method
+             */
+            addItemAttachmentAsync(itemId: any, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
+            /**
+             * Removes an attachment from a message
+             * @param attachmentIndex The index of the attachment to remove. The maximum length of the string is 100 characters
+             * @param options Any optional parameters or state data passed to the method
+             * @param callback The optional callback method
+             */
+            removeAttachmentAsync(attachmentIndex: string, option?: any, callback?: (result: AsyncResult) => void): void;
+        }
+        export interface MessageRead extends Office.Message {
+            cc: Office.EmailAddressDetails[];
+            from: Office.EmailAddressDetails;
+            internetMessageId: string;
+            normalizedSubject: string;
+            sender: Office.EmailAddressDetails;
+            subject: string;
+            to: Office.EmailAddressDetails;
+            /**
+             * Displays a reply form that includes the sender and all the recipients of the selected message
+             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
+             */
+            displayReplyAllForm(htmlBody: string): void;
+            /**
+             * Displays a reply form that includes only the sender of the selected message
+             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
+             */
+            displayReplyForm(htmlBody: string): void;
+            /**
+             * Gets an array of entities found in an message
+             */
+            getEntities(): Office.Entities;
+            /**
+             * Gets an array of entities of the specified entity type found in an message
+             * @param entityType One of the EntityType enumeration values
+             */
+            getEntitiesByType(entityType: Office.MailboxEnums.EntityType): Office.Entities;
+            /**
+             * Returns well-known entities that pass the named filter defined in the manifest XML file
+             * @param name  A TableData object with the headers and rows
+             */
+            getFilteredEntitiesByName(name: string): Office.Entities;
+            /**
+             * Returns string values in the currently selected message object that match the regular expressions defined in the manifest XML file
+             */
+            getRegExMatches(): string[];
+            /**
+             * Returns string values that match the named regular expression defined in the manifest XML file
+             */
+            getRegExMatchesByName(name: string): string[];
+        }
+        export interface AppointmentCompose extends Office.Appointment {
+            body: Office.Body;
+            end: Office.Time;
+            location: Office.Location;
+            optionalAttendees: Office.Recipients;
+            requiredAttendees: Office.Recipients;
+            start: Office.Time;
+            subject: Office.Subject;
+            /**
+             * Adds a file to an appointment as an attachment
+             * @param uri The URI that provides the location of the file to attach to the appointment. The maximum length is 2048 characters
+             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
+             * @param options Any optional parameters or state data passed to the method
+             * @param callback The optional callback method
+             */
+            addFileAttachmentAsync(uri: string, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
+            /**
+             * Adds an Exchange item, such as a message, as an attachment to the appointment
+             * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters
+             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
+             * @param options Any optional parameters or state data passed to the method
+             * @param callback The optional callback method
+             */
+            addItemAttachmentAsync(itemId: any, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
+            /**
+             * Removes an attachment from a appointment
+             * @param attachmentIndex The index of the attachment to remove. The maximum length of the string is 100 characters
+             * @param options Any optional parameters or state data passed to the method
+             * @param callback The optional callback method
+             */
+            removeAttachmentAsync(attachmentIndex: string, option?: any, callback?: (result: AsyncResult) => void): void;
+        }
+        export interface AppointmentRead extends Office.Appointment {
+            attachments: Office.AttachmentDetails[];
+            end: Date;
+            location: string;
+            normalizedSubject: string;
+            optionalAttendees: Office.EmailAddressDetails;
+            organizer: Office.EmailAddressDetails;
+            requiredAttendees: Office.EmailAddressDetails;
+            resources: string[];
+            start: Date;
+            subject: string;
+            /**
+             * Displays a reply form that includes the organizer and all the attendees of the selected appointment item
+             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
+             */
+            displayReplyAllForm(htmlBody: string): void;
+            /**
+             * Displays a reply form that includes only the organizer of the selected appointment item
+             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
+             */
+            displayReplyForm(htmlBody: string): void;
+            /**
+             * Gets an array of entities found in an appointment
+             */
+            getEntities(): Office.Entities;
+            /**
+             * Gets an array of entities of the specified entity type found in an appointment
+             * @param entityType One of the EntityType enumeration values
+             */
+            getEntitiesByType(entityType: Office.MailboxEnums.EntityType): Office.Entities;
+            /**
+             * Returns well-known entities that pass the named filter defined in the manifest XML file
+             * @param name  A TableData object with the headers and rows
+             */
+            getFilteredEntitiesByName(name: string): Office.Entities;
+            /**
+             * Returns string values in the currently selected appointment object that match the regular expressions defined in the manifest XML file
+             */
+            getRegExMatches(): string[];
+            /**
+             * Returns string values that match the named regular expression defined in the manifest XML file
+             */
+            getRegExMatchesByName(name: string): string[];
+        }
+    }
+    export module cast {
+        export module item {
+            function toAppointmentCompose(item: Office.Item): Office.Types.AppointmentCompose;
+            function toAppointmentRead(item: Office.Item): Office.Types.AppointmentRead;
+            function toAppointment(item: Office.Item): Office.Appointment;
+            function toMessageCompose(item: Office.Item): Office.Types.MessageCompose;
+            function toMessageRead(item: Office.Item): Office.Types.MessageRead;
+            function toMessage(item: Office.Item): Office.Message;
+            function toItemCompose(item: Office.Item): Office.Types.ItemCompose;
+            function toItemRead(item: Office.Item): Office.Types.ItemRead;
+        }
+    }
+    export interface AttachmentDetails {
+        attachmentType: Office.MailboxEnums.AttachmentType;
+        contentType: string;
+        id: string;
+        isInline: boolean;
+        name: string;
+        size: number;
+    }
+    export interface Contact {
+        personName: string;
+        businessName: string;
+        phoneNumbers: PhoneNumber[];
+        emailAddresses: string[];
+        urls: string[];
+        addresses: string[];
+        contactString: string;
+    }
+
+    export interface Context {
+        mailbox: Mailbox;
+        roamingSettings: RoamingSettings;
+    }
+    export interface CustomProperties {
+        /**
+         * Returns the value of the specified custom property
+         * @param name The name of the property to be returned
+         */
+        get(name: string): any;
+        /**
+         * Sets the specified property to the specified value
+         * @param name The name of the property to be set
+         * @param value The value of the property to be set
+         */
+        set(name: string, value: string): void;
+        /**
+         * Removes the specified property from the custom property collection.
+         * @param name The name of the property to be removed
+         */
+        remove(name: string): void;
+        /**
+         * Saves the custom property collection to the server
+         * @param callback The optional callback method
+         * @param userContext Optional variable for any state data that is passed to the saveAsync method
+         */
+        saveAsync(callback?: (result: AsyncResult) => void, userContext?: any): void;
+    }
+    export interface EmailAddressDetails {
+        emailAddress: string;
+        displayName: string;
+        appointmentResponse: Office.MailboxEnums.ResponseType;
+        recipientType: Office.MailboxEnums.RecipientType;
+    }
+    export interface EmailUser {
+        name: string;
+        userId: string;
+    }
+    export interface Entities {
+        addresses: string[];
+        taskSuggestions: string[];
+        meetingSuggestions: MeetingSuggestion[];
+        emailAddresses: string[];
+        urls: string[];
+        phoneNumbers: PhoneNumber[];
+        contacts: Contact[];
+    }
+    export interface Item {
+        dateTimeCreated: Date;
+        dateTimeModified: Date;
+        itemClass: string;
+        itemId: string;
+        itemType: Office.MailboxEnums.ItemType;
+        /**
+         * Asynchronously loads custom properties that are specific to the item and a app for Office
+         * @param callback The optional callback method
+         * @param userContext Optional variable for any state data that is passed to the asynchronous method
+         */
+        loadCustomPropertiesAsync(callback?: (result: AsyncResult) => void, userContext?: any): void;
+    }
+    export interface Appointment extends Item {
+    }
+    export interface Body {
+        /**
+         * Gets a value that indicates whether the content is in HTML or text format
+         * @param tableData  A TableData object with the headers and rows
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the getTypeAsync method returns
+         */
+        getTypeAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Adds the specified content to the beginning of the item body
+         * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the string is inserted
+         */
+        prependAsync(data: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Replaces the selection in the body with the specified text
+         * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the string is inserted
+         */
+        setSelectedDataAsync(data: string, options?: any, callback?: (result: AsyncResult) => void): void;
+    }
+    export interface Location {
+        /**
+         * Begins an asynchronous request for the location of an appointment
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the string is inserted
+         */
+        getAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Begins an asynchronous request to set the location of an appointment
+         * @param data The location of the appointment. The string is limited to 255 characters
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the location is set
+         */
+        setAsync(location: string, options?: any, callback?: (result: AsyncResult) => void): void;
+    }
+    export interface Mailbox {
+        item: Item;
+        userProfile: UserProfile;
+        /**
+         * Gets a Date object from a dictionary containing time information
+         * @param timeValue A Date object
+         */
+        convertToLocalClientTime(timeValue: Date): any;
+        /**
+         * Gets a dictionary containing time information in local client time
+         * @param input A dictionary containing a date. The dictionary should contain the following fields: year, month, date, hours, minutes, seconds, time zone, time zone offset
+         */
+        convertToUtcClientTime(input: any): Date;
+        /**
+         * Displays an existing calendar appointment
+         * @param itemId The Exchange Web Services (EWS) identifier for an existing calendar appointment
+         */
+        displayAppointmentForm(itemId: any): void;
+        /**
+         * Displays an existing message
+         * @param itemId The Exchange Web Services (EWS) identifier for an existing message
+         */
+        displayMessageForm(itemId: any): void;
+        /**
+         * Displays a form for creating a new calendar appointment
+         * @param requiredAttendees An array of strings containing the email addresses or an array containing an EmailAddressDetails object for each of the required attendees for the appointment. The array is limited to a maximum of 100 entries
+         * @param optionalAttendees An array of strings containing the email addresses or an array containing an EmailAddressDetails object for each of the optional attendees for the appointment. The array is limited to a maximum of 100 entries
+         * @param start A Date object specifying the start date and time of the appointment
+         * @param end A Date object specifying the end date and time of the appointment
+         * @param location A string containing the location of the appointment. The string is limited to a maximum of 255 characters
+         * @param resources An array of strings containing the resources required for the appointment. The array is limited to a maximum of 100 entries
+         * @param subject A string containing the subject of the appointment. The string is limited to a maximum of 255 characters
+         * @param body The body of the appointment message. The body content is limited to a maximum size of 32 KB
+         */
+        displayNewAppointmentForm(requiredAttendees: any, optionalAttendees: any, start: Date, end: Date, location: string, resources: string[], subject: string, body: string): void;
+        /**
+         * Gets a string that contains a token used to get an attachment or item from an Exchange Server
+         * @param callback The optional method to call when the string is inserted
+         * @param userContext Optional variable for any state data that is passed to the asynchronous method
+         */
+        getCallbackTokenAsync(callback?: (result: AsyncResult) => void, userContext?: any): void;
+        /**
+         * Gets a token identifying the user and the app for Office
+         * @param callback The optional method to call when the string is inserted
+         * @param userContext Optional variable for any state data that is passed to the asynchronous method
+         */
+        getUserIdentityTokenAsync(callback?: (result: AsyncResult) => void, userContext?: any): void;
+        /**
+         * Makes an asynchronous request to an Exchange Web Services (EWS) service on the Exchange server that hosts the user’s mailbox
+         * @param data The EWS request
+         * @param callback The optional method to call when the string is inserted
+         * @param userContext Optional variable for any state data that is passed to the asynchronous method
+         */
+        makeEwsRequestAsync(data: any, callback?: (result: AsyncResult) => void, userContext?: any): void;
+    }
+    export interface Message extends Item {
+        conversationId: string;
+    }
+    export interface MeetingRequest extends Message {
+        start: Date;
+        end: Date;
+        location: string;
+        optionalAttendees: EmailAddressDetails[];
+        requiredAttendees: EmailAddressDetails[];
+    }
+    export interface MeetingSuggestion {
+        meetingString: string;
+        attendees: EmailAddressDetails[];
+        location: string;
+        subject: string;
+        start: Date;
+        end: Date;
+    }
+    export interface PhoneNumber {
+        phoneString: string;
+        originalPhoneString: string;
+        type: string;
+    }
+    export interface Recipients {
+        /**
+         * Begins an asynchronous request to add a recipient list to an appointment or message
+         * @param recipients The recipients to add to the recipients list
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the string is inserted
+         */
+        addAsync(recipients: any, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Begins an asynchronous request to get the recipient list for an appointment or message
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the string is inserted
+         */
+        getAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Begins an asynchronous request to set the recipient list for an appointment or message
+         * @param recipients The recipients to add to the recipients list
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the string is inserted
+         */
+        setAsync(recipients: any, options?: any, callback?: (result: AsyncResult) => void): void;
+    }
+    export interface RoamingSettings {
+        /**
+         * Retrieves the specified setting
+         * @param name The case-sensitive name of the setting to retrieve
+         */
+        get(name: string): any;
+        /**
+         * Removes the specified setting
+         * @param name The case-sensitive name of the setting to remove
+         */
+        remove(name: string): void;
+        /**
+         * Saves the settings
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult
+         */
+        saveAsync(callback?: (result: AsyncResult) => void): void;
+        /**
+         * Sets or creates the specified setting
+         * @param name The case-sensitive name of the setting to set or create
+         * @param value Specifies the value to be stored
+         */
+        set(name: string, value: any): void;
+    }
+    export interface Subject {
+        /**
+         * Begins an asynchronous request to get the subject of an appointment or message
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the string is inserted
+         */
+        getAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Begins an asynchronous call to set the subject of an appointment or message
+         * @param data The subject of the appointment. The string is limited to 255 characters
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the string is inserted
+         */
+        setAsync(data: string, options?: any, callback?: (result: AsyncResult) => void): void;
+    }
+    export interface TaskSuggestion {
+        assignees: EmailUser[];
+        taskString: string;
+    }
+    export interface Time {
+        /**
+         * Begins an asynchronous request to get the start or end time
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the string is inserted
+         */
+        getAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Begins an asynchronous request to set the start or end time
+         * @param dateTime A date-time object in Coordinated Universal Time (UTC)
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the string is inserted
+         */
+        setAsync(dateTime: Date, options?: any, callback?: (result: AsyncResult) => void): void;
+    }
+    export interface UserProfile {
+        displayName: string;
+        emailAddress: string;
+        timeZone: string;
+    }
+}
+
diff --git a/office-js/office-js-tests.ts b/office-js/office-js-tests.ts
index 23d4d12d31..768ed7ae5d 100644
--- a/office-js/office-js-tests.ts
+++ b/office-js/office-js-tests.ts
@@ -3,7 +3,7 @@ office-js
 Copyright (c) Microsoft Corporation
 */
 
-/// <reference path="office-js.d.ts" />
+
 
 function test_excel() {
 	
diff --git a/office-js/office-js.d.ts b/office-js/office-js.d.ts
deleted file mode 100644
index ff4065fa17..0000000000
--- a/office-js/office-js.d.ts
+++ /dev/null
@@ -1,11086 +0,0 @@
-// Type definitions for Office.js
-// Project: http://dev.office.com
-// Definitions by: OfficeDev <https://github.com/OfficeDev>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/*
-office-js
-Copyright (c) Microsoft Corporation
-*/
-
-declare namespace Office {
-    export var context: Context;
-    /**
-     * This method is called after the Office API was loaded.
-     * @param reason Indicates how the app was initialized
-     */
-    export function initialize(reason: InitializationReason): void;
-    /**
-     * Indicates if the large namespace for objects will be used or not.
-     * @param useShortNamespace  Indicates if 'true' that the short namespace will be used
-     */
-    export function useShortNamespace(useShortNamespace: boolean): void;
-    // Enumerations
-    export enum AsyncResultStatus {
-        /**
-         * Operation succeeded
-         */
-        Succeeded,
-        /**
-         * Operation failed, check error object
-         */
-        Failed
-    }
-    export enum InitializationReason {
-        /**
-         * Indicates the app was just inserted in the document
-         */
-        Inserted,
-        /**
-         * Indicates if the extension already existed in the document
-         */
-        DocumentOpened
-    }
-    // Objects
-    export interface AsyncResult {
-        asyncContext: any;
-        status: AsyncResultStatus;
-        error: Error;
-        value: any;
-    }
-    export interface Context {
-        contentLanguage: string;
-        displayLanguage: string;
-        license: string;
-        touchEnabled: boolean;
-        requirements: {
-            /**
-             * Check if the specified requirement set is supported by the host Office application.
-             * @param name - Set name. e.g.: "MatrixBindings".
-             * @param minVersion - The minimum required version.
-             */
-            isSetSupported(name: string, minVersion?: number): boolean;
-        }
-    }
-    export interface Error {
-        message: string;
-        name: string;
-    }
-}
-declare namespace OfficeExtension {
-    /** An abstract proxy object that represents an object in an Office document. You create proxy objects from the context (or from other proxy objects), add commands to a queue to act on the object, and then synchronize the proxy object state with the document by calling "context.sync()". */
-    class ClientObject {
-        /** The request context associated with the object */
-        context: ClientRequestContext;
-    }
-}
-declare namespace OfficeExtension {
-    interface LoadOption {
-        select?: string | string[];
-        expand?: string | string[];
-        top?: number;
-        skip?: number;
-    }
-    /** An abstract RequestContext object that facilitates requests to the host Office application. The "Excel.run" and "Word.run" methods provide a request context. */
-    class ClientRequestContext {
-        constructor(url?: string);
-        /** Collection of objects that are tracked for automatic adjustments based on surrounding changes in the document. */
-        trackedObjects: TrackedObjects;
-        /** Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties. */
-        load(object: ClientObject, option?: string | string[] | LoadOption): void;
-        /** Adds a trace message to the queue. If the promise returned by "context.sync()" is rejected due to an error, this adds a ".traceMessages" array to the OfficeExtension.Error object, containing all trace messages that were executed. These messages can help you monitor the program execution sequence and detect the cause of the error. */
-        trace(message: string): void;
-        /** Synchronizes the state between JavaScript proxy objects and the Office document, by executing instructions queued on the request context and retrieving properties of loaded Office objects for use in your code.�This method returns a promise, which is resolved when the synchronization is complete. */
-        sync<T>(passThroughValue?: T): IPromise<T>;
-    }
-}
-declare namespace OfficeExtension {
-    /** Contains the result for methods that return primitive types. The object's value property is retrieved from the document after "context.sync()" is invoked. */
-    class ClientResult<T> {
-        /** The value of the result that is retrieved from the document after "context.sync()" is invoked. */
-        value: T;
-    }
-}
-declare namespace OfficeExtension {
-    /** The error object returned by "context.sync()", if a promise is rejected due to an error while processing the request. */
-    class Error {
-        /** Error name: "OfficeExtension.Error".*/
-        name: string;
-        /** The error message passed through from the host Office application. */
-        message: string;
-        /** Stack trace, if applicable. */
-        stack: string;
-        /** Error code string, such as "InvalidArgument". */
-        code: string;
-        /** Trace messages (if any) that were added via a "context.trace()" invocation before calling "context.sync()". If there was an error, this contains all trace messages that were executed before the error occurred. These messages can help you monitor the program execution sequence and detect the case of the error. */
-        traceMessages: Array<string>;
-        /** Debug info, if applicable. The ".errorLocation" property can describe the object and method or property that caused the error. */
-        debugInfo: {
-            /** If applicable, will return the object type and the name of the method or property that caused the error. */
-            errorLocation?: string;
-        };
-    }
-}
-declare namespace OfficeExtension {
-    class ErrorCodes {
-        static accessDenied: string;
-        static generalException: string;
-        static activityLimitReached: string;
-    }
-}
-declare namespace OfficeExtension {
-    /** A Promise object that represents a deferred interaction with the host Office application. Promises can be chained via ".then", and errors can be caught via ".catch".  Remember to always use a ".catch" on the outer promise, and to return intermediary promises so as not to break the promise chain. */
-    interface IPromise<R> {
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => U): IPromise<U>;
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => void): IPromise<U>;
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): IPromise<U>;
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => void): IPromise<U>;
-        /**
-         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
-         * @param onRejected function to be called if or when the promise rejects.
-         */
-        catch<U>(onRejected?: (error: any) => IPromise<U>): IPromise<U>;
-        /**
-         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
-         * @param onRejected function to be called if or when the promise rejects.
-         */
-        catch<U>(onRejected?: (error: any) => U): IPromise<U>;
-        /**
-         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
-         * @param onRejected function to be called if or when the promise rejects.
-         */
-        catch<U>(onRejected?: (error: any) => void): IPromise<U>;
-    }
-}
-declare namespace OfficeExtension {
-    /** Collection of tracked objects, contained within a request context. See "context.trackedObjects" for more information. */
-    class TrackedObjects {
-        /** Track a new object for automatic adjustment based on surrounding changes in the document. Only some object types require this. If you are using an object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created. */
-        add(object: ClientObject): void;
-        /** Track a new object for automatic adjustment based on surrounding changes in the document. Only some object types require this. If you are using an object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created. */
-        add(objects: ClientObject[]): void;
-        /** Release the memory associated with an object that was previously added to this collection. Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect. */
-        remove(object: ClientObject): void;
-        /** Release the memory associated with an object that was previously added to this collection. Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect. */
-        remove(objects: ClientObject[]): void;
-    }
-}
-
-declare namespace Office {
-    /**
-     * Returns a promise of an object described in the expression. Callback is invoked only if method fails.
-     * @param expression The object to be retrieved. Example "bindings#BindingName", retrieves a binding promise for a binding named 'BindingName'
-     * @param callback The optional callback method
-     */
-    export function select(expression: string, callback?: (result: AsyncResult) => void): Binding;
-    // Enumerations
-    export enum ActiveView {
-        Read,
-        Edit
-    }
-    export enum BindingType {
-        /**
-         * Text based Binding
-         */
-        Text,
-        /**
-         * Matrix based Binding
-         */
-        Matrix,
-        /**
-         * Table based Binding
-         */
-        Table
-    }
-    export enum CoercionType {
-        /**
-         * Coerce as Text
-         */
-        Text,
-        /**
-         * Coerce as Matrix
-         */
-        Matrix,
-        /**
-         * Coerce as Table
-         */
-        Table,
-        /**
-         * Coerce as HTML
-         */
-        Html,
-        /**
-         * Coerce as Office Open XML
-         */
-        Ooxml,
-        /**
-         * Coerce as JSON object containing an array of the ids, titles, and indexes of the selected slides.
-         */
-        SlideRange,
-        /**
-        * Coerce as Image
-        */
-        Image
-    }
-    export enum DocumentMode {
-        /**
-         * Document in Read Only Mode
-         */
-        ReadOnly,
-        /**
-         * Document in Read/Write Mode
-         */
-        ReadWrite
-    }
-    export enum EventType {
-        /**
-         * Occurs when the user changes the current view of the document.
-         */
-        ActiveViewChanged,
-        /**
-         * Triggers when a binding level data change happens
-         */
-        BindingDataChanged,
-        /**
-         *  Triggers when a binding level selection happens
-         */
-        BindingSelectionChanged,
-        /**
-         * Triggers when a document level selection happens
-         */
-        DocumentSelectionChanged,
-        /**
-         * Triggers when a customXmlPart node was deleted
-         */
-        NodeDeleted,
-        /**
-         * Triggers when a customXmlPart node was inserted
-         */
-        NodeInserted,
-        /**
-         * Triggers when a customXmlPart node was replaced
-         */
-        NodeReplaced,
-        /**
-         * Triggers when settings change in a co-Auth session.
-         */
-        SettingsChanged,
-        /**
-         * Triggers when a Task selection happens in Project.
-         */
-        TaskSelectionChanged,
-        /**
-         *  Triggers when a Resource selection happens in Project.
-         */
-        ResourceSelectionChanged,
-        /**
-         * Triggers when a View selection happens in Project.
-         */
-        ViewSelectionChanged
-    }
-    export enum FileType {
-        /**
-         * Returns the file as plain text
-         */
-        Text,
-        /**
-         * Returns the file as a byte array
-         */
-        Compressed,
-        /**
-         * Returns the file in PDF format as a byte array
-         */
-        Pdf
-    }
-    export enum FilterType {
-        /**
-         * Returns all items
-         */
-        All,
-        /**
-         * Returns only visible items
-         */
-        OnlyVisible
-    }
-    export enum GoToType {
-        /**
-         * Goes to a binding object using the specified binding id.
-         */
-        Binding,
-        /**
-         * Goes to a named item using that item's name.
-         * In Excel, you can use any structured reference for a named range or table: "Worksheet2!Table1"
-         */
-        NamedItem,
-        /**
-         * Goes to a slide using the specified id.
-         */
-        Slide,
-        /**
-         * Goes to the specified index by slide number or enum Office.Index
-         */
-        Index
-    }
-    export enum Index {
-        First,
-        Last,
-        Next,
-        Previous
-    }
-    export enum SelectionMode {
-        Default,
-        Selected,
-        None
-    }
-    export enum ValueFormat {
-        /**
-         * Returns items without format
-         */
-        Unformatted,
-        /**
-         * Returns items with format
-         */
-        Formatted
-    }
-    // Objects
-    export interface Binding {
-        document: Document;
-        /**
-         * Id of the Binding
-         */
-        id: string;
-        type: BindingType;
-        /**
-         * Adds an event handler to the object using the specified event type.
-         * @param eventType The event type. For binding it can be 'bindingDataChanged' and 'bindingSelectionChanged'
-         * @param handler The name of the handler
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        addHandlerAsync(eventType: EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Returns the current selection.
-         * @param options Syntax example: {coercionType: 'matrix,'valueFormat: 'formatted', filterType:'all'}
-         *       coercionType: The expected shape of the selection. If not specified returns the bindingType shape. Use Office.CoercionType or text value.
-         *       valueFormat: Get data with or without format. Use Office.ValueFormat or text value.
-         *       startRow: Used in partial get for table/matrix. Indicates the start row.
-         *       startColumn: Used in partial get for table/matrix. Indicates the start column.
-         *       rowCount: Used in partial get for table/matrix. Indicates the number of rows from the start row.
-         *       columnCount: Used in partial get for table/matrix. Indicates the number of columns from the start column.
-         *       filterType: Get the visible or all the data. Useful when filtering data. Use Office.FilterType or text value.
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getDataAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Removes an event handler from the object using the specified event type.
-         * @param eventType The event type. For binding can be 'bindingDataChanged' and 'bindingSelectionChanged'
-         * @param options Syntax example: {handler:eventHandler}
-         *       handler: Indicates a specific handler to be removed, if not specified all handlers are removed
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        removeHandlerAsync(eventType: EventType, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Writes the specified data into the current selection.
-         * @param data The data to be set. Either a string or value, 2d array or TableData object
-         * @param options Syntax example: {coercionType:Office.CoercionType.Matrix} or {coercionType: 'matrix'}
-         *       coercionType: Explicitly sets the shape of the data object. Use Office.CoercionType or text value. If not supplied is inferred from the data type.
-         *       startRow: Used in partial set for table/matrix. Indicates the start row.
-         *       startColumn: Used in partial set for table/matrix. Indicates the start column.
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        setDataAsync(data: TableData|any, options?: any, callback?: (result: AsyncResult) => void): void;
-    }
-    export interface Bindings {
-        document: Document;
-        /**
-         * Creates a binding against a named object in the document
-         * @param itemName Name of the bindable object in the document. For Example 'MyExpenses' table in Excel."
-         * @param bindingType The Office BindingType for the data
-         * @param options Syntax example: {id: "BindingID"}
-         *       id: Name of the binding, autogenerated if not supplied.
-         *       asyncContext: Object keeping state for the callback
-         *       columns: The string[] of the columns involved in the binding
-         * @param callback The optional callback method
-         */
-        addFromNamedItemAsync(itemName: string, bindingType: BindingType, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Create a binding by prompting the user to make a selection on the document.
-         * @param bindingType The Office BindingType for the data
-         * @param options addFromPromptAsyncOptions- e.g. {promptText: "Please select data", id: "mySales"}
-         *       promptText: Greet your users with a friendly word.
-         *       asyncContext: Object keeping state for the callback
-         *       id: Identifier.
-         *       sampleData: A TableData that gives sample table in the Dialog.TableData.Headers is [][] of string.
-         * @param callback The optional callback method
-         */
-        addFromPromptAsync(bindingType: BindingType, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Create a binding based on what the user's current selection.
-         * @param bindingType The Office BindingType for the data
-         * @param options addFromSelectionAsyncOptions- e.g. {id: "BindingID"}
-         *       id: Identifier.
-         *       asyncContext: Object keeping state for the callback
-         *       columns: The string[] of the columns involved in the binding
-         *       sampleData: A TableData that gives sample table in the Dialog.TableData.Headers is [][] of string.
-         * @param callback The optional callback method
-         */
-        addFromSelectionAsync(bindingType: BindingType, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Gets an array with all the binding objects in the document.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getAllAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Retrieves a binding based on its Name
-         * @param id The binding id
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getByIdAsync(id: string, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Removes the binding from the document
-         * @param id The binding id
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        releaseByIdAsync(id: string, options?: any, callback?: (result: AsyncResult) => void): void;
-    }
-    export interface Context {
-        document: Document;
-    }
-    export interface CustomXmlNode {
-        baseName: string;
-        namespaceUri: string;
-        nodeType: string;
-        /**
-         * Gets the nodes associated with the xPath expression.
-         * @param xPath The xPath expression
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getNodesAsync(xPath: string, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Gets the node value.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getNodeValueAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Asynchronously gets the text of an XML node in a custom XML part.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getTextAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Gets the node's XML.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getXmlAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Sets the node value.
-         * @param value The value to be set on the node
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        setNodeValueAsync(value: string, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Asynchronously sets the text of an XML node in a custom XML part.
-         * @param text Required. The text value of the XML node.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        setTextAsync(text: string, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Sets the node XML.
-         * @param xml The XML to be set on the node
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        setXmlAsync(xml: string, options?: any, callback?: (result: AsyncResult) => void): void;
-    }
-    export interface CustomXmlPart {
-        builtIn: boolean;
-        id: string;
-        namespaceManager: CustomXmlPrefixMappings;
-        /**
-         * Adds an event handler to the object using the specified event type.
-         * @param eventType The event type. For CustomXmlPartNode it can be 'nodeDeleted', 'nodeInserted' or 'nodeReplaced'
-         * @param handler The name of the handler
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        addHandlerAsync(eventType: EventType, handler?: (result: any) => void, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Deletes the Custom XML Part.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        deleteAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Gets the nodes associated with the xPath expression.
-         * @param xPath The xPath expression
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getNodesAsync(xPath: string, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Gets the XML for the Custom XML Part.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getXmlAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Removes an event handler from the object using the specified event type.
-         * @param eventType The event type. For CustomXmlPartNode it can be 'nodeDeleted', 'nodeInserted' or 'nodeReplaced'
-         * @param options Syntax example: {handler:eventHandler}
-         *       handler: Indicates a specific handler to be removed, if not specified all handlers are removed
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        removeHandlerAsync(eventType: EventType, options?: any, callback?: (result: AsyncResult) => void): void;
-    }
-    export interface CustomXmlParts {
-        /**
-         * Asynchronously adds a new custom XML part to a file.
-         * @param xml The XML to add to the newly created custom XML part.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
-         */
-        addAsync(xml: string, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Asynchronously gets the specified custom XML part by its id.
-         * @param id The id of the custom XML part.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
-         */
-        getByIdAsync(id: string, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Asynchronously gets the specified custom XML part(s) by its namespace.
-         * @param ns  The namespace to search.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
-         */
-        getByNamespaceAsync(ns: string, options?: any, callback?: (result: AsyncResult) => void): void;
-    }
-    export interface CustomXmlPrefixMappings {
-        /**
-         * Adds a namespace.
-         * @param prefix The namespace prefix
-         * @param ns The namespace URI
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        addNamespaceAsync(prefix: string, ns: string, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Gets a namespace  with the specified prefix
-         * @param prefix The namespace prefix
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getNamespaceAsync(prefix: string, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Gets a prefix  for  the specified URI
-         * @param ns The namespace URI
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getPrefixAsync(ns: string, options?: any, callback?: (result: AsyncResult) => void): void;
-    }
-    export interface Document {
-        bindings: Bindings;
-        customXmlParts: CustomXmlParts;
-        mode: DocumentMode;
-        settings: Settings;
-        url: string;
-        /**
-         * Adds an event handler for the specified event type.
-         * @param eventType The event type. For document can be 'DocumentSelectionChanged'
-         * @param handler The name of the handler
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        addHandlerAsync(eventType: EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Returns the current view of the presentation.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getActiveViewAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Gets the entire file in slices of up to 4MB.
-         * @param fileType The format in which the file will be returned
-         * @param options Syntax example: {sliceSize:1024}
-         *       sliceSize: Specifies the desired slice size (in bytes) up to 4MB. If not specified a default slice size of 4MB will be used.
-         * @param callback The optional callback method
-         */
-        getFileAsync(fileType: FileType, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Gets file properties of the current document.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getFilePropertiesAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Returns the current selection.
-         * @param coercionType The expected shape of the selection.
-         * @param options Syntax example: {valueFormat: 'formatted', filterType:'all'}
-         *       valueFormat: Get data with or without format. Use Office.ValueFormat or text value.
-         *       filterType: Get the visible or all the data. Useful when filtering data. Use Office.FilterType or text value.
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getSelectedDataAsync(coercionType: CoercionType, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Goes to the specified object or location in the document.
-         * @param id The identifier of the object or location to go to.
-         * @param goToType The type of the location to go to.
-         * @param options Syntax example: {asyncContext:context}
-         *       selectionMode: Use Office.SelectionMode or text value.
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        goToByIdAsync(id: string|number, goToType: GoToType, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Removes an event handler for the specified event type.
-         * @param eventType The event type. For document can be 'DocumentSelectionChanged'
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         *       handler: The name of the handler. If not specified all handlers are removed
-         * @param callback The optional callback method
-         */
-        removeHandlerAsync(eventType: EventType, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Writes the specified data into the current selection.
-         * @param data The data to be set. Either a string or value, 2d array or TableData object
-         * @param options Syntax example: {coercionType:Office.CoercionType.Matrix} or {coercionType: 'matrix'}
-         *       coercionType: Explicitly sets the shape of the data object. Use Office.CoercionType or text value. If not supplied is inferred from the data type.
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        setSelectedDataAsync(data: string|TableData|any[][], options?: any, callback?: (result: AsyncResult) => void): void;
-    }
-    export interface File {
-        size: number;
-        sliceCount: number;
-        /**
-         * Closes the File.
-         * @param callback The optional callback method
-         */
-        closeAsync(callback?: (result: AsyncResult) => void): void;
-        /**
-         * Gets the specified slice.
-         * @param sliceIndex The index of the slice to be retrieved
-         * @param callback The optional callback method
-         */
-        getSliceAsync(sliceIndex: number, callback?: (result: AsyncResult) => void): void;
-    }
-    export interface FileProperties {
-        /**
-         * File's URL
-         */
-        url: string
-    }
-    export interface MatrixBinding extends Binding {
-        columnCount: number;
-        rowCount: number;
-    }
-    export interface Settings {
-        /**
-         * Adds an event handler for the object using the specified event type.
-         * @param eventType The event type. For settings can be 'settingsChanged'
-         * @param handler The name of the handler
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        addHandlerAsync(eventType: EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Retrieves the setting with the specified name.
-         * @param settingName The name of the setting
-         */
-        get(name: string): any;
-        /**
-         * Gets the latest version of the settings object.
-         * @param callback The optional callback method
-         */
-        refreshAsync(callback?: (result: AsyncResult) => void): void;
-        /**
-         * Removes the setting with the specified name.
-         * @param settingName The name of the setting
-         */
-        remove(name: string): void;
-        /**
-         * Removes an event handler for the specified event type.
-         * @param eventType The event type. For settings can be 'settingsChanged'
-         * @param options Syntax example: {handler:eventHandler}
-         *       handler: Indicates a specific handler to be removed, if not specified all handlers are removed
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        removeHandlerAsync(eventType: EventType, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Saves all settings.
-         * @param options Syntax example: {overwriteIfStale:false}
-         *       overwriteIfStale: Indicates whether the setting will be replaced if stale.
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        saveAsync(callback?: (result: AsyncResult) => void): void;
-        /**
-         * Sets a value for the setting with the specified name.
-         * @param settingName The name of the setting
-         * @param value The value for the setting
-         */
-        set(name: string, value: any): void;
-    }
-    export interface Slice {
-        data: any;
-        index: number;
-        size: number;
-    }
-    export interface TableBinding extends Binding {
-        columnCount: number;
-        hasHeaders: boolean;
-        rowCount: number;
-        /**
-         * Adds the specified columns to the table
-         * @param tableData  A TableData object with the headers and rows
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        addColumnsAsync(tableData: TableData|any[][], options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Adds the specified rows to the table
-         * @param rows  A 2D array with the rows to add
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        addRowsAsync(rows: TableData|any[][], options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Clears the table
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        deleteAllDataValuesAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Clears formatting on the bound table.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        clearFormatsAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Gets the formatting on specified items in the table.
-         * @param cellReference An object literal containing name-value pairs that specify the range of cells to get formatting from.
-         * @param formats An array specifying the format properties to get.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getFormatsAsync(cellReference?: any, formats?: any[], options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Sets formatting on specified items and data in the table.
-         * @param formatsInfo Array elements are themselves three-element arrays:[target, type, formats]
-         *       target: The identifier of the item to format. String.
-         *       type: The kind of item to format. String.
-         *       formats: An object literal containing a list of property name-value pairs that define the formatting to apply.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        setFormatsAsync(formatsInfo?: any[], options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Updates table formatting options on the bound table.
-         * @param tableOptions An object literal containing a list of property name-value pairs that define the table options to apply.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        setTableOptionsAsync(tableOptions: any, options?: any, callback?: (result: AsyncResult) => void): void;
-    }
-    export class TableData {
-        constructor(rows: any[][], headers: any[]);
-        constructor();
-        headers: any[];
-        rows: any[][];
-    }
-    export enum Table {
-        All,
-        Data,
-        Headers
-    }
-    export interface TextBinding extends Binding { }
-    export enum ProjectProjectFields {
-        CurrencyDigits,
-        CurrencySymbol,
-        CurrencySymbolPosition,
-        DurationUnits,
-        GUID,
-        Finish,
-        Start,
-        ReadOnly,
-        VERSION,
-        WorkUnits,
-        ProjectServerUrl,
-        WSSUrl,
-        WSSList
-    }
-    export enum ProjectResourceFields {
-        Accrual,
-        ActualCost,
-        ActualOvertimeCost,
-        ActualOvertimeWork,
-        ActualOvertimeWorkProtected,
-        ActualWork,
-        ActualWorkProtected,
-        BaseCalendar,
-        Baseline10BudgetCost,
-        Baseline10BudgetWork,
-        Baseline10Cost,
-        Baseline10Work,
-        Baseline1BudgetCost,
-        Baseline1BudgetWork,
-        Baseline1Cost,
-        Baseline1Work,
-        Baseline2BudgetCost,
-        Baseline2BudgetWork,
-        Baseline2Cost,
-        Baseline2Work,
-        Baseline3BudgetCost,
-        Baseline3BudgetWork,
-        Baseline3Cost,
-        Baseline3Work,
-        Baseline4BudgetCost,
-        Baseline4BudgetWork,
-        Baseline4Cost,
-        Baseline4Work,
-        Baseline5BudgetCost,
-        Baseline5BudgetWork,
-        Baseline5Cost,
-        Baseline5Work,
-        Baseline6BudgetCost,
-        Baseline6BudgetWork,
-        Baseline6Cost,
-        Baseline6Work,
-        Baseline7BudgetCost,
-        Baseline7BudgetWork,
-        Baseline7Cost,
-        Baseline7Work,
-        Baseline8BudgetCost,
-        Baseline8BudgetWork,
-        Baseline8Cost,
-        Baseline8Work,
-        Baseline9BudgetCost,
-        Baseline9BudgetWork,
-        Baseline9Cost,
-        Baseline9Work,
-        BaselineBudgetCost,
-        BaselineBudgetWork,
-        BaselineCost,
-        BaselineWork,
-        BudgetCost,
-        BudgetWork,
-        ResourceCalendarGUID,
-        Code,
-        Cost1,
-        Cost10,
-        Cost2,
-        Cost3,
-        Cost4,
-        Cost5,
-        Cost6,
-        Cost7,
-        Cost8,
-        Cost9,
-        ResourceCreationDate,
-        Date1,
-        Date10,
-        Date2,
-        Date3,
-        Date4,
-        Date5,
-        Date6,
-        Date7,
-        Date8,
-        Date9,
-        Duration1,
-        Duration10,
-        Duration2,
-        Duration3,
-        Duration4,
-        Duration5,
-        Duration6,
-        Duration7,
-        Duration8,
-        Duration9,
-        Email,
-        End,
-        Finish1,
-        Finish10,
-        Finish2,
-        Finish3,
-        Finish4,
-        Finish5,
-        Finish6,
-        Finish7,
-        Finish8,
-        Finish9,
-        Flag10,
-        Flag1,
-        Flag11,
-        Flag12,
-        Flag13,
-        Flag14,
-        Flag15,
-        Flag16,
-        Flag17,
-        Flag18,
-        Flag19,
-        Flag2,
-        Flag20,
-        Flag3,
-        Flag4,
-        Flag5,
-        Flag6,
-        Flag7,
-        Flag8,
-        Flag9,
-        Group,
-        Units,
-        Name,
-        Notes,
-        Number1,
-        Number10,
-        Number11,
-        Number12,
-        Number13,
-        Number14,
-        Number15,
-        Number16,
-        Number17,
-        Number18,
-        Number19,
-        Number2,
-        Number20,
-        Number3,
-        Number4,
-        Number5,
-        Number6,
-        Number7,
-        Number8,
-        Number9,
-        OvertimeCost,
-        OvertimeRate,
-        OvertimeWork,
-        PercentWorkComplete,
-        CostPerUse,
-        Generic,
-        OverAllocated,
-        RegularWork,
-        RemainingCost,
-        RemainingOvertimeCost,
-        RemainingOvertimeWork,
-        RemainingWork,
-        ResourceGUID,
-        Cost,
-        Work,
-        Start,
-        Start1,
-        Start10,
-        Start2,
-        Start3,
-        Start4,
-        Start5,
-        Start6,
-        Start7,
-        Start8,
-        Start9,
-        StandardRate,
-        Text1,
-        Text10,
-        Text11,
-        Text12,
-        Text13,
-        Text14,
-        Text15,
-        Text16,
-        Text17,
-        Text18,
-        Text19,
-        Text2,
-        Text20,
-        Text21,
-        Text22,
-        Text23,
-        Text24,
-        Text25,
-        Text26,
-        Text27,
-        Text28,
-        Text29,
-        Text3,
-        Text30,
-        Text4,
-        Text5,
-        Text6,
-        Text7,
-        Text8,
-        Text9
-    }
-    export enum ProjectTaskFields {
-        ActualCost,
-        ActualDuration,
-        ActualFinish,
-        ActualOvertimeCost,
-        ActualOvertimeWork,
-        ActualStart,
-        ActualWork,
-        Text1,
-        Text10,
-        Finish10,
-        Start10,
-        Text11,
-        Text12,
-        Text13,
-        Text14,
-        Text15,
-        Text16,
-        Text17,
-        Text18,
-        Text19,
-        Finish1,
-        Start1,
-        Text2,
-        Text20,
-        Text21,
-        Text22,
-        Text23,
-        Text24,
-        Text25,
-        Text26,
-        Text27,
-        Text28,
-        Text29,
-        Finish2,
-        Start2,
-        Text3,
-        Text30,
-        Finish3,
-        Start3,
-        Text4,
-        Finish4,
-        Start4,
-        Text5,
-        Finish5,
-        Start5,
-        Text6,
-        Finish6,
-        Start6,
-        Text7,
-        Finish7,
-        Start7,
-        Text8,
-        Finish8,
-        Start8,
-        Text9,
-        Finish9,
-        Start9,
-        Baseline10BudgetCost,
-        Baseline10BudgetWork,
-        Baseline10Cost,
-        Baseline10Duration,
-        Baseline10Finish,
-        Baseline10FixedCost,
-        Baseline10FixedCostAccrual,
-        Baseline10Start,
-        Baseline10Work,
-        Baseline1BudgetCost,
-        Baseline1BudgetWork,
-        Baseline1Cost,
-        Baseline1Duration,
-        Baseline1Finish,
-        Baseline1FixedCost,
-        Baseline1FixedCostAccrual,
-        Baseline1Start,
-        Baseline1Work,
-        Baseline2BudgetCost,
-        Baseline2BudgetWork,
-        Baseline2Cost,
-        Baseline2Duration,
-        Baseline2Finish,
-        Baseline2FixedCost,
-        Baseline2FixedCostAccrual,
-        Baseline2Start,
-        Baseline2Work,
-        Baseline3BudgetCost,
-        Baseline3BudgetWork,
-        Baseline3Cost,
-        Baseline3Duration,
-        Baseline3Finish,
-        Baseline3FixedCost,
-        Baseline3FixedCostAccrual,
-        Basline3Start,
-        Baseline3Work,
-        Baseline4BudgetCost,
-        Baseline4BudgetWork,
-        Baseline4Cost,
-        Baseline4Duration,
-        Baseline4Finish,
-        Baseline4FixedCost,
-        Baseline4FixedCostAccrual,
-        Baseline4Start,
-        Baseline4Work,
-        Baseline5BudgetCost,
-        Baseline5BudgetWork,
-        Baseline5Cost,
-        Baseline5Duration,
-        Baseline5Finish,
-        Baseline5FixedCost,
-        Baseline5FixedCostAccrual,
-        Baseline5Start,
-        Baseline5Work,
-        Baseline6BudgetCost,
-        Baseline6BudgetWork,
-        Baseline6Cost,
-        Baseline6Duration,
-        Baseline6Finish,
-        Baseline6FixedCost,
-        Baseline6FixedCostAccrual,
-        Baseline6Start,
-        Baseline6Work,
-        Baseline7BudgetCost,
-        Baseline7BudgetWork,
-        Baseline7Cost,
-        Baseline7Duration,
-        Baseline7Finish,
-        Baseline7FixedCost,
-        Baseline7FixedCostAccrual,
-        Baseline7Start,
-        Baseline7Work,
-        Baseline8BudgetCost,
-        Baseline8BudgetWork,
-        Baseline8Cost,
-        Baseline8Duration,
-        Baseline8Finish,
-        Baseline8FixedCost,
-        Baseline8FixedCostAccrual,
-        Baseline8Start,
-        Baseline8Work,
-        Baseline9BudgetCost,
-        Baseline9BudgetWork,
-        Baseline9Cost,
-        Baseline9Duration,
-        Baseline9Finish,
-        Baseline9FixedCost,
-        Baseline9FixedCostAccrual,
-        Baseline9Start,
-        Baseline9Work,
-        BaselineBudgetCost,
-        BaselineBudgetWork,
-        BaselineCost,
-        BaselineDuration,
-        BaselineFinish,
-        BaselineFixedCost,
-        BaselineFixedCostAccrual,
-        BaselineStart,
-        BaselineWork,
-        BudgetCost,
-        BudgetFixedCost,
-        BudgetFixedWork,
-        BudgetWork,
-        TaskCalendarGUID,
-        ConstraintDate,
-        ConstraintType,
-        Cost1,
-        Cost10,
-        Cost2,
-        Cost3,
-        Cost4,
-        Cost5,
-        Cost6,
-        Cost7,
-        Cost8,
-        Cost9,
-        Date1,
-        Date10,
-        Date2,
-        Date3,
-        Date4,
-        Date5,
-        Date6,
-        Date7,
-        Date8,
-        Date9,
-        Deadline,
-        Duration1,
-        Duration10,
-        Duration2,
-        Duration3,
-        Duration4,
-        Duration5,
-        Duration6,
-        Duration7,
-        Duration8,
-        Duration9,
-        Duration,
-        EarnedValueMethod,
-        FinishSlack,
-        FixedCost,
-        FixedCostAccrual,
-        Flag10,
-        Flag1,
-        Flag11,
-        Flag12,
-        Flag13,
-        Flag14,
-        Flag15,
-        Flag16,
-        Flag17,
-        Flag18,
-        Flag19,
-        Flag2,
-        Flag20,
-        Flag3,
-        Flag4,
-        Flag5,
-        Flag6,
-        Flag7,
-        Flag8,
-        Flag9,
-        FreeSlack,
-        HasRollupSubTasks,
-        ID,
-        Name,
-        Notes,
-        Number1,
-        Number10,
-        Number11,
-        Number12,
-        Number13,
-        Number14,
-        Number15,
-        Number16,
-        Number17,
-        Number18,
-        Number19,
-        Number2,
-        Number20,
-        Number3,
-        Number4,
-        Number5,
-        Number6,
-        Number7,
-        Number8,
-        Number9,
-        ScheduledDuration,
-        ScheduledFinish,
-        ScheduledStart,
-        OutlineLevel,
-        OvertimeCost,
-        OvertimeWork,
-        PercentComplete,
-        PercentWorkComplete,
-        Predecessors,
-        PreleveledFinish,
-        PreleveledStart,
-        Priority,
-        Active,
-        Critical,
-        Milestone,
-        Overallocated,
-        IsRollup,
-        Summary,
-        RegularWork,
-        RemainingCost,
-        RemainingDuration,
-        RemainingOvertimeCost,
-        RemainingWork,
-        ResourceNames,
-        Cost,
-        Finish,
-        Start,
-        Work,
-        StartSlack,
-        Status,
-        Successors,
-        StatusManager,
-        TotalSlack,
-        TaskGUID,
-        Type,
-        WBS,
-        WBSPREDECESSORS,
-        WBSSUCCESSORS,
-        WSSID
-    }
-    export enum ProjectViewTypes {
-        Gantt,
-        NetworkDiagram,
-        TaskDiagram,
-        TaskForm,
-        TaskSheet,
-        ResourceForm,
-        ResourceSheet,
-        ResourceGraph,
-        TeamPlanner,
-        TaskDetails,
-        TaskNameForm,
-        ResourceNames,
-        Calendar,
-        TaskUsage,
-        ResourceUsage,
-        Timeline
-    }
-    // Objects
-    export interface Document {
-        /**
-         * Get Project field (Ex. ProjectWebAccessURL).
-         * @param fieldId Project level fields.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getProjectFieldAsync(fieldId: number, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Get resource field for provided resource Id. (Ex.ResourceName)
-         * @param resourceId Either a string or value of the Resource Id.
-         * @param fieldId Resource Fields.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getResourceFieldAsync(resourceId: string, fieldId: number, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Get the current selected Resource's Id.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getSelectedResourceAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Get the current selected Task's Id.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getSelectedTaskAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Get the current selected View Type (Ex. Gantt) and View Name.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getSelectedViewAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Get the Task Name, WSS Task Id, and ResourceNames for given taskId.
-         * @param taskId Either a string or value of the Task Id.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getTaskAsync(taskId: string, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Get task field for provided task Id. (Ex. StartDate).
-         * @param taskId Either a string or value of the Task Id.
-         * @param fieldId Task Fields.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getTaskFieldAsync(taskId: string, fieldId: number, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Get the WSS Url and list name for the Tasks List, the MPP is synced too.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
-        getWSSUrlAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-    }
-}
-
-
-declare namespace Excel {
-    /**
-     *
-     * Represents the Excel application that manages the workbook.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class Application extends OfficeExtension.ClientObject {
-        private m_calculationMode;
-        /**
-         *
-         * Returns the calculation mode used in the workbook. See Excel.CalculationMode for details. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        calculationMode: string;
-        /**
-         *
-         * Recalculate all currently opened workbooks in Excel.
-         *
-         * @param calculationType Specifies the calculation type to use. See Excel.CalculationType for details.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        calculate(calculationType: string): void;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Application;
-    }
-    /**
-     *
-     * Workbook is the top level object which contains related workbook objects such as worksheets, tables, ranges, etc.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class Workbook extends OfficeExtension.ClientObject {
-        private m_application;
-        private m_bindings;
-        private m_functions;
-        private m_names;
-        private m_tables;
-        private m_worksheets;
-        /**
-         *
-         * Represents Excel application instance that contains this workbook. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        application: Excel.Application;
-        /**
-         *
-         * Represents a collection of bindings that are part of the workbook. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        bindings: Excel.BindingCollection;
-        /**
-         *
-         * Represents Excel application instance that contains this workbook. Read-only.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        functions: Excel.Functions;
-        /**
-         *
-         * Represents a collection of workbook scoped named items (named ranges and constants). Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        names: Excel.NamedItemCollection;
-        /**
-         *
-         * Represents a collection of tables associated with the workbook. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        tables: Excel.TableCollection;
-        /**
-         *
-         * Represents a collection of worksheets associated with the workbook. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        worksheets: Excel.WorksheetCollection;
-        /**
-         *
-         * Gets the currently selected range from the workbook.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getSelectedRange(): Excel.Range;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Workbook;
-    }
-    /**
-     *
-     * An Excel worksheet is a grid of cells. It can contain data, tables, charts, etc.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class Worksheet extends OfficeExtension.ClientObject {
-        private m_charts;
-        private m_id;
-        private m_name;
-        private m_position;
-        private m_protection;
-        private m_tables;
-        private m_visibility;
-        /**
-         *
-         * Returns collection of charts that are part of the worksheet. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        charts: Excel.ChartCollection;
-        /**
-         *
-         * Returns sheet protection object for a worksheet.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        protection: Excel.WorksheetProtection;
-        /**
-         *
-         * Collection of tables that are part of the worksheet. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        tables: Excel.TableCollection;
-        /**
-         *
-         * Returns a value that uniquely identifies the worksheet in a given workbook. The value of the identifier remains the same even when the worksheet is renamed or moved. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        id: string;
-        /**
-         *
-         * The display name of the worksheet.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        name: string;
-        /**
-         *
-         * The zero-based position of the worksheet within the workbook.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        position: number;
-        /**
-         *
-         * The Visibility of the worksheet.
-         *
-         * [Api set: ExcelApi 1.1 for reading visibility; 1.2 for setting it.]
-         */
-        visibility: string;
-        /**
-         *
-         * Activate the worksheet in the Excel UI.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        activate(): void;
-        /**
-         *
-         * Deletes the worksheet from the workbook.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        delete(): void;
-        /**
-         *
-         * Gets the range object containing the single cell based on row and column numbers. The cell can be outside the bounds of its parent range, so long as it's stays within the worksheet grid.
-         *
-         * @param row The row number of the cell to be retrieved. Zero-indexed.
-         * @param column the column number of the cell to be retrieved. Zero-indexed.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getCell(row: number, column: number): Excel.Range;
-        /**
-         *
-         * Gets the range object specified by the address or name.
-         *
-         * @param address The address or the name of the range. If not specified, the entire worksheet range is returned.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getRange(address?: string): Excel.Range;
-        /**
-         *
-         * The used range is the smallest range that encompasses any cells that have a value or formatting assigned to them. If the worksheet is blank, this function will return the top left cell.
-         *
-         * @param valuesOnly Considers only cells with values as used cells (ignores formatting). [Parameter available: ExcelApi 1.2]
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getUsedRange(valuesOnly?: boolean): Excel.Range;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Worksheet;
-    }
-    /**
-     *
-     * Represents a collection of worksheet objects that are part of the workbook.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class WorksheetCollection extends OfficeExtension.ClientObject {
-        private m__items;
-        /** Gets the loaded child items in this collection. */
-        items: Array<Excel.Worksheet>;
-        /**
-         *
-         * Adds a new worksheet to the workbook. The worksheet will be added at the end of existing worksheets. If you wish to activate the newly added worksheet, call ".activate() on it.
-         *
-         * @param name The name of the worksheet to be added. If specified, name should be unqiue. If not specified, Excel determines the name of the new worksheet.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        add(name?: string): Excel.Worksheet;
-        /**
-         *
-         * Gets the currently active worksheet in the workbook.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getActiveWorksheet(): Excel.Worksheet;
-        /**
-         *
-         * Gets a worksheet object using its Name or ID.
-         *
-         * @param key The Name or ID of the worksheet.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getItem(key: string): Excel.Worksheet;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.WorksheetCollection;
-    }
-    /**
-     *
-     * Represents the protection of a sheet object.
-     *
-     * [Api set: ExcelApi 1.2]
-     */
-    class WorksheetProtection extends OfficeExtension.ClientObject {
-        private m_options;
-        private m_protected;
-        /**
-         *
-         * Sheet protection options.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        options: Excel.WorksheetProtectionOptions;
-        /**
-         *
-         * Indicates if the worksheet is protected. Read-Only.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        protected: boolean;
-        /**
-         *
-         * Protect a worksheet. It throws if the worksheet has been protected.
-         *
-         * @param options sheet protection options.
-         * @param password sheet protection password.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        protect(options?: Excel.WorksheetProtectionOptions, password?: string): void;
-        /**
-         *
-         * Unprotect a worksheet
-         *
-         * @param password sheet protection password.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        unprotect(password?: string): void;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.WorksheetProtection;
-    }
-    /**
-     *
-     * Represents the options in sheet protection.
-     *
-     * [Api set: ExcelApi 1.2]
-     */
-    interface WorksheetProtectionOptions {
-        /**
-         *
-         * Represents the worksheet protection option of allowing using auto filter feature.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        allowAutoFilter?: boolean;
-        /**
-         *
-         * Represents the worksheet protection option of allowing deleting columns.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        allowDeleteColumns?: boolean;
-        /**
-         *
-         * Represents the worksheet protection option of allowing deleting rows.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        allowDeleteRows?: boolean;
-        /**
-         *
-         * Represents the worksheet protection option of allowing formatting cells.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        allowFormatCells?: boolean;
-        /**
-         *
-         * Represents the worksheet protection option of allowing formatting columns.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        allowFormatColumns?: boolean;
-        /**
-         *
-         * Represents the worksheet protection option of allowing formatting rows.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        allowFormatRows?: boolean;
-        /**
-         *
-         * Represents the worksheet protection option of allowing inserting columns.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        allowInsertColumns?: boolean;
-        /**
-         *
-         * Represents the worksheet protection option of allowing inserting hyperlinks.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        allowInsertHyperlinks?: boolean;
-        /**
-         *
-         * Represents the worksheet protection option of allowing inserting rows.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        allowInsertRows?: boolean;
-        /**
-         *
-         * Represents the worksheet protection option of allowing using pivot table feature.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        allowPivotTables?: boolean;
-        /**
-         *
-         * Represents the worksheet protection option of allowing using sort feature.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        allowSort?: boolean;
-    }
-    /**
-     *
-     * Range represents a set of one or more contiguous cells such as a cell, a row, a column, block of cells, etc.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class Range extends OfficeExtension.ClientObject {
-        private m_address;
-        private m_addressLocal;
-        private m_cellCount;
-        private m_columnCount;
-        private m_columnHidden;
-        private m_columnIndex;
-        private m_format;
-        private m_formulas;
-        private m_formulasLocal;
-        private m_formulasR1C1;
-        private m_hidden;
-        private m_numberFormat;
-        private m_rowCount;
-        private m_rowHidden;
-        private m_rowIndex;
-        private m_sort;
-        private m_text;
-        private m_valueTypes;
-        private m_values;
-        private m_worksheet;
-        private m__ReferenceId;
-        /**
-         *
-         * Returns a format object, encapsulating the range's font, fill, borders, alignment, and other properties. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        format: Excel.RangeFormat;
-        sort: Excel.RangeSort;
-        /**
-         *
-         * The worksheet containing the current range. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        worksheet: Excel.Worksheet;
-        /**
-         *
-         * Represents the range reference in A1-style. Address value will contain the Sheet reference (e.g. Sheet1!A1:B4). Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        address: string;
-        /**
-         *
-         * Represents range reference for the specified range in the language of the user. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        addressLocal: string;
-        /**
-         *
-         * Number of cells in the range. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        cellCount: number;
-        /**
-         *
-         * Represents the total number of columns in the range. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        columnCount: number;
-        /**
-         *
-         * Represents if all columns of the current range are hidden.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        columnHidden: boolean;
-        /**
-         *
-         * Represents the column number of the first cell in the range. Zero-indexed. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        columnIndex: number;
-        /**
-         *
-         * Represents the formula in A1-style notation.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        formulas: Array<Array<any>>;
-        /**
-         *
-         * Represents the formula in A1-style notation, in the user's language and number-formatting locale.  For example, the English "=SUM(A1, 1.5)" formula would become "=SUMME(A1; 1,5)" in German.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        formulasLocal: Array<Array<any>>;
-        /**
-         *
-         * Represents the formula in R1C1-style notation.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        formulasR1C1: Array<Array<any>>;
-        /**
-         *
-         * Represents if all cells of the current range are hidden.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        hidden: boolean;
-        /**
-         *
-         * Represents Excel's number format code for the given cell.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        numberFormat: Array<Array<any>>;
-        /**
-         *
-         * Returns the total number of rows in the range. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        rowCount: number;
-        /**
-         *
-         * Represents if all rows of the current range are hidden.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        rowHidden: boolean;
-        /**
-         *
-         * Returns the row number of the first cell in the range. Zero-indexed. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        rowIndex: number;
-        /**
-         *
-         * Text values of the specified range. The Text value will not depend on the cell width. The # sign substitution that happens in Excel UI will not affect the text value returned by the API. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        text: Array<Array<any>>;
-        /**
-         *
-         * Represents the type of data of each cell. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        valueTypes: Array<Array<string>>;
-        /**
-         *
-         * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        values: Array<Array<any>>;
-        /**
-         *
-         * Clear range values, format, fill, border, etc.
-         *
-         * @param applyTo Determines the type of clear action. See Excel.ClearApplyTo for details.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        clear(applyTo?: string): void;
-        /**
-         *
-         * Deletes the cells associated with the range.
-         *
-         * @param shift Specifies which way to shift the cells. See Excel.DeleteShiftDirection for details.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        delete(shift: string): void;
-        /**
-         *
-         * Gets the smallest range object that encompasses the given ranges. For example, the GetBoundingRect of "B2:C5" and "D10:E15" is "B2:E16".
-         *
-         * @param anotherRange The range object or address or range name.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getBoundingRect(anotherRange: Excel.Range | string): Excel.Range;
-        /**
-         *
-         * Gets the range object containing the single cell based on row and column numbers. The cell can be outside the bounds of its parent range, so long as it's stays within the worksheet grid. The returned cell is located relative to the top left cell of the range.
-         *
-         * @param row Row number of the cell to be retrieved. Zero-indexed.
-         * @param column Column number of the cell to be retrieved. Zero-indexed.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getCell(row: number, column: number): Excel.Range;
-        /**
-         *
-         * Gets a column contained in the range.
-         *
-         * @param column Column number of the range to be retrieved. Zero-indexed.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getColumn(column: number): Excel.Range;
-        /**
-         *
-         * Gets an object that represents the entire column of the range.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getEntireColumn(): Excel.Range;
-        /**
-         *
-         * Gets an object that represents the entire row of the range.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getEntireRow(): Excel.Range;
-        /**
-         *
-         * Gets the range object that represents the rectangular intersection of the given ranges.
-         *
-         * @param anotherRange The range object or range address that will be used to determine the intersection of ranges.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getIntersection(anotherRange: Excel.Range | string): Excel.Range;
-        /**
-         *
-         * Gets the last cell within the range. For example, the last cell of "B2:D5" is "D5".
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getLastCell(): Excel.Range;
-        /**
-         *
-         * Gets the last column within the range. For example, the last column of "B2:D5" is "D2:D5".
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getLastColumn(): Excel.Range;
-        /**
-         *
-         * Gets the last row within the range. For example, the last row of "B2:D5" is "B5:D5".
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getLastRow(): Excel.Range;
-        /**
-         *
-         * Gets an object which represents a range that's offset from the specified range. The dimension of the returned range will match this range. If the resulting range is forced outside the bounds of the worksheet grid, an exception will be thrown.
-         *
-         * @param rowOffset The number of rows (positive, negative, or 0) by which the range is to be offset. Positive values are offset downward, and negative values are offset upward.
-         * @param columnOffset The number of columns (positive, negative, or 0) by which the range is to be offset. Positive values are offset to the right, and negative values are offset to the left.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getOffsetRange(rowOffset: number, columnOffset: number): Excel.Range;
-        /**
-         *
-         * Gets a row contained in the range.
-         *
-         * @param row Row number of the range to be retrieved. Zero-indexed.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getRow(row: number): Excel.Range;
-        /**
-         *
-         * Returns the used range of the given range object.
-         *
-         * @param valuesOnly Considers only cells with values as used cells. [Parameter available: ExcelApi 1.2]
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getUsedRange(valuesOnly?: boolean): Excel.Range;
-        /**
-         *
-         * Inserts a cell or a range of cells into the worksheet in place of this range, and shifts the other cells to make space. Returns a new Range object at the now blank space.
-         *
-         * @param shift Specifies which way to shift the cells. See Excel.InsertShiftDirection for details.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        insert(shift: string): Excel.Range;
-        /**
-         *
-         * Merge the range cells into one region in the worksheet.
-         *
-         * @param across Set true to merge cells in each row of the specified range as separate merged cells. The default value is false.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        merge(across?: boolean): void;
-        /**
-         *
-         * Selects the specified range in the Excel UI.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        select(): void;
-        /**
-         *
-         * Unmerge the range cells into separate cells.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        unmerge(): void;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Range;
-    }
-    /**
-     *
-     * Represents a string reference of the form SheetName!A1:B5, or a global or local named range
-     *
-     * [Api set: ExcelApi 1.2]
-     */
-    interface RangeReference {
-        address: string;
-    }
-    /**
-     *
-     * A collection of all the nameditem objects that are part of the workbook.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class NamedItemCollection extends OfficeExtension.ClientObject {
-        private m__items;
-        /** Gets the loaded child items in this collection. */
-        items: Array<Excel.NamedItem>;
-        /**
-         *
-         * Gets a nameditem object using its name
-         *
-         * @param name nameditem name.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getItem(name: string): Excel.NamedItem;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.NamedItemCollection;
-    }
-    /**
-     *
-     * Represents a defined name for a range of cells or value. Names can be primitive named objects (as seen in the type below), range object, reference to a range. This object can be used to obtain range object associated with names.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class NamedItem extends OfficeExtension.ClientObject {
-        private m_name;
-        private m_type;
-        private m_value;
-        private m_visible;
-        private m__Id;
-        /**
-         *
-         * The name of the object. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        name: string;
-        /**
-         *
-         * Indicates what type of reference is associated with the name. See Excel.NamedItemType for details. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        type: string;
-        /**
-         *
-         * Represents the formula that the name is defined to refer to. E.g. =Sheet14!$B$2:$H$12, =4.75, etc. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        value: any;
-        /**
-         *
-         * Specifies whether the object is visible or not.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        visible: boolean;
-        /**
-         *
-         * Returns the range object that is associated with the name. Throws an exception if the named item's type is not a range.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getRange(): Excel.Range;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.NamedItem;
-    }
-    /**
-     *
-     * Represents an Office.js binding that is defined in the workbook.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class Binding extends OfficeExtension.ClientObject {
-        private m_id;
-        private m_type;
-        /**
-         *
-         * Represents binding identifier. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        id: string;
-        /**
-         *
-         * Returns the type of the binding. See Excel.BindingType for details. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        type: string;
-        /**
-         *
-         * Returns the range represented by the binding. Will throw an error if binding is not of the correct type.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getRange(): Excel.Range;
-        /**
-         *
-         * Returns the table represented by the binding. Will throw an error if binding is not of the correct type.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getTable(): Excel.Table;
-        /**
-         *
-         * Returns the text represented by the binding. Will throw an error if binding is not of the correct type.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getText(): OfficeExtension.ClientResult<string>;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Binding;
-    }
-    /**
-     *
-     * Represents the collection of all the binding objects that are part of the workbook.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class BindingCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__items;
-        /** Gets the loaded child items in this collection. */
-        items: Array<Excel.Binding>;
-        /**
-         *
-         * Returns the number of bindings in the collection. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        count: number;
-        /**
-         *
-         * Gets a binding object by ID.
-         *
-         * @param id Id of the binding object to be retrieved.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getItem(id: string): Excel.Binding;
-        /**
-         *
-         * Gets a binding object based on its position in the items array.
-         *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getItemAt(index: number): Excel.Binding;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.BindingCollection;
-    }
-    /**
-     *
-     * Represents a collection of all the tables that are part of the workbook.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class TableCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__items;
-        /** Gets the loaded child items in this collection. */
-        items: Array<Excel.Table>;
-        /**
-         *
-         * Returns the number of tables in the workbook. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        count: number;
-        /**
-         *
-         * Create a new table. The range source address determines the worksheet under which the table will be added. If the table cannot be added (e.g., because the address is invalid, or the table would overlap with another table), an error will be thrown.
-         *
-         * @param address Address or name of the range object representing the data source. If the address does not contain a sheet name, the currently-active sheet is used.
-         * @param hasHeaders Boolean value that indicates whether the data being imported has column labels. If the source does not contain headers (i.e,. when this property set to false), Excel will automatically generate header shifting the data down by one row.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        add(address: string, hasHeaders: boolean): Excel.Table;
-        /**
-         *
-         * Gets a table by Name or ID.
-         *
-         * @param key Name or ID of the table to be retrieved.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getItem(key: number | string): Excel.Table;
-        /**
-         *
-         * Gets a table based on its position in the collection.
-         *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getItemAt(index: number): Excel.Table;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableCollection;
-    }
-    /**
-     *
-     * Represents an Excel table.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class Table extends OfficeExtension.ClientObject {
-        private m_columns;
-        private m_id;
-        private m_name;
-        private m_rows;
-        private m_showHeaders;
-        private m_showTotals;
-        private m_sort;
-        private m_style;
-        private m_worksheet;
-        /**
-         *
-         * Represents a collection of all the columns in the table. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        columns: Excel.TableColumnCollection;
-        /**
-         *
-         * Represents a collection of all the rows in the table. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        rows: Excel.TableRowCollection;
-        /**
-         *
-         * Represents the sorting for the table.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        sort: Excel.TableSort;
-        /**
-         *
-         * The worksheet containing the current table. Read-only.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        worksheet: Excel.Worksheet;
-        /**
-         *
-         * Returns a value that uniquely identifies the table in a given workbook. The value of the identifier remains the same even when the table is renamed. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        id: number;
-        /**
-         *
-         * Name of the table.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        name: string;
-        /**
-         *
-         * Indicates whether the header row is visible or not. This value can be set to show or remove the header row.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        showHeaders: boolean;
-        /**
-         *
-         * Indicates whether the total row is visible or not. This value can be set to show or remove the total row.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        showTotals: boolean;
-        /**
-         *
-         * Constant value that represents the Table style. Possible values are: TableStyleLight1 thru TableStyleLight21, TableStyleMedium1 thru TableStyleMedium28, TableStyleStyleDark1 thru TableStyleStyleDark11. A custom user-defined style present in the workbook can also be specified.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        style: string;
-        /**
-         *
-         * Clears all the filters currently applied on the table.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        clearFilters(): void;
-        /**
-         *
-         * Converts the table into a normal range of cells. All data is preserved.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        convertToRange(): Excel.Range;
-        /**
-         *
-         * Deletes the table.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        delete(): void;
-        /**
-         *
-         * Gets the range object associated with the data body of the table.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getDataBodyRange(): Excel.Range;
-        /**
-         *
-         * Gets the range object associated with header row of the table.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getHeaderRowRange(): Excel.Range;
-        /**
-         *
-         * Gets the range object associated with the entire table.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getRange(): Excel.Range;
-        /**
-         *
-         * Gets the range object associated with totals row of the table.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getTotalRowRange(): Excel.Range;
-        /**
-         *
-         * Reapplies all the filters currently on the table.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        reapplyFilters(): void;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Table;
-    }
-    /**
-     *
-     * Represents a collection of all the columns that are part of the table.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class TableColumnCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__items;
-        /** Gets the loaded child items in this collection. */
-        items: Array<Excel.TableColumn>;
-        /**
-         *
-         * Returns the number of columns in the table. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        count: number;
-        /**
-         *
-         * Adds a new column to the table.
-         *
-         * @param index Specifies the relative position of the new column. The previous column at this position is shifted to the right. The index value should be equal to or less than the last column's index value, so it cannot be used to append a column at the end of the table. Zero-indexed.
-         * @param values A 2-dimensional array of unformatted values of the table column.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        add(index: number, values?: Array<Array<boolean | string | number>> | boolean | string | number): Excel.TableColumn;
-        /**
-         *
-         * Gets a column object by Name or ID.
-         *
-         * @param key Column Name or ID.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getItem(key: number | string): Excel.TableColumn;
-        /**
-         *
-         * Gets a column based on its position in the collection.
-         *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getItemAt(index: number): Excel.TableColumn;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableColumnCollection;
-    }
-    /**
-     *
-     * Represents a column in a table.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class TableColumn extends OfficeExtension.ClientObject {
-        private m_filter;
-        private m_id;
-        private m_index;
-        private m_name;
-        private m_values;
-        /**
-         *
-         * Retrieve the filter applied to the column.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        filter: Excel.Filter;
-        /**
-         *
-         * Returns a unique key that identifies the column within the table. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        id: number;
-        /**
-         *
-         * Returns the index number of the column within the columns collection of the table. Zero-indexed. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        index: number;
-        /**
-         *
-         * Returns the name of the table column. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        name: string;
-        /**
-         *
-         * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        values: Array<Array<any>>;
-        /**
-         *
-         * Deletes the column from the table.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        delete(): void;
-        /**
-         *
-         * Gets the range object associated with the data body of the column.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getDataBodyRange(): Excel.Range;
-        /**
-         *
-         * Gets the range object associated with the header row of the column.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getHeaderRowRange(): Excel.Range;
-        /**
-         *
-         * Gets the range object associated with the entire column.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getRange(): Excel.Range;
-        /**
-         *
-         * Gets the range object associated with the totals row of the column.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getTotalRowRange(): Excel.Range;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableColumn;
-    }
-    /**
-     *
-     * Represents a collection of all the rows that are part of the table.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class TableRowCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__items;
-        /** Gets the loaded child items in this collection. */
-        items: Array<Excel.TableRow>;
-        /**
-         *
-         * Returns the number of rows in the table. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        count: number;
-        /**
-         *
-         * Adds a new row to the table.
-         *
-         * @param index Specifies the relative position of the new row. If null, the addition happens at the end. Any rows below the inserted row are shifted downwards. Zero-indexed.
-         * @param values A 2-dimensional array of unformatted values of the table row.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        add(index?: number, values?: Array<Array<boolean | string | number>> | boolean | string | number): Excel.TableRow;
-        /**
-         *
-         * Gets a row based on its position in the collection.
-         *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getItemAt(index: number): Excel.TableRow;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableRowCollection;
-    }
-    /**
-     *
-     * Represents a row in a table.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class TableRow extends OfficeExtension.ClientObject {
-        private m_index;
-        private m_values;
-        /**
-         *
-         * Returns the index number of the row within the rows collection of the table. Zero-indexed. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        index: number;
-        /**
-         *
-         * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        values: Array<Array<any>>;
-        /**
-         *
-         * Deletes the row from the table.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        delete(): void;
-        /**
-         *
-         * Returns the range object associated with the entire row.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getRange(): Excel.Range;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableRow;
-    }
-    /**
-     *
-     * A format object encapsulating the range's font, fill, borders, alignment, and other properties.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class RangeFormat extends OfficeExtension.ClientObject {
-        private m_borders;
-        private m_columnWidth;
-        private m_fill;
-        private m_font;
-        private m_horizontalAlignment;
-        private m_protection;
-        private m_rowHeight;
-        private m_verticalAlignment;
-        private m_wrapText;
-        /**
-         *
-         * Collection of border objects that apply to the overall range selected Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        borders: Excel.RangeBorderCollection;
-        /**
-         *
-         * Returns the fill object defined on the overall range. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        fill: Excel.RangeFill;
-        /**
-         *
-         * Returns the font object defined on the overall range selected Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        font: Excel.RangeFont;
-        /**
-         *
-         * Returns the format protection object for a range.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        protection: Excel.FormatProtection;
-        /**
-         *
-         * Gets or sets the width of all colums within the range. If the column widths are not uniform, null will be returned.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        columnWidth: number;
-        /**
-         *
-         * Represents the horizontal alignment for the specified object. See Excel.HorizontalAlignment for details.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        horizontalAlignment: string;
-        /**
-         *
-         * Gets or sets the height of all rows in the range. If the row heights are not uniform null will be returned.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        rowHeight: number;
-        /**
-         *
-         * Represents the vertical alignment for the specified object. See Excel.VerticalAlignment for details.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        verticalAlignment: string;
-        /**
-         *
-         * Indicates if Excel wraps the text in the object. A null value indicates that the entire range doesn't have uniform wrap setting
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        wrapText: boolean;
-        /**
-         *
-         * Changes the width of the columns of the current range to achieve the best fit, based on the current data in the columns.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        autofitColumns(): void;
-        /**
-         *
-         * Changes the height of the rows of the current range to achieve the best fit, based on the current data in the columns.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        autofitRows(): void;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeFormat;
-    }
-    /**
-     *
-     * Represents the format protection of a range object.
-     *
-     * [Api set: ExcelApi 1.2]
-     */
-    class FormatProtection extends OfficeExtension.ClientObject {
-        private m_formulaHidden;
-        private m_locked;
-        /**
-         *
-         * Indicates if Excel hides the formula for the cells in the range. A null value indicates that the entire range doesn't have uniform formula hidden setting.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        formulaHidden: boolean;
-        /**
-         *
-         * Indicates if Excel locks the cells in the object. A null value indicates that the entire range doesn't have uniform lock setting.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        locked: boolean;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.FormatProtection;
-    }
-    /**
-     *
-     * Represents the background of a range object.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class RangeFill extends OfficeExtension.ClientObject {
-        private m_color;
-        /**
-         *
-         * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange")
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        color: string;
-        /**
-         *
-         * Resets the range background.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        clear(): void;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeFill;
-    }
-    /**
-     *
-     * Represents the border of an object.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class RangeBorder extends OfficeExtension.ClientObject {
-        private m_color;
-        private m_sideIndex;
-        private m_style;
-        private m_weight;
-        /**
-         *
-         * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        color: string;
-        /**
-         *
-         * Constant value that indicates the specific side of the border. See Excel.BorderIndex for details. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        sideIndex: string;
-        /**
-         *
-         * One of the constants of line style specifying the line style for the border. See Excel.BorderLineStyle for details.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        style: string;
-        /**
-         *
-         * Specifies the weight of the border around a range. See Excel.BorderWeight for details.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        weight: string;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeBorder;
-    }
-    /**
-     *
-     * Represents the border objects that make up range border.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class RangeBorderCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__items;
-        /** Gets the loaded child items in this collection. */
-        items: Array<Excel.RangeBorder>;
-        /**
-         *
-         * Number of border objects in the collection. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        count: number;
-        /**
-         *
-         * Gets a border object using its name
-         *
-         * @param index Index value of the border object to be retrieved. See Excel.BorderIndex for details.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getItem(index: string): Excel.RangeBorder;
-        /**
-         *
-         * Gets a border object using its index
-         *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getItemAt(index: number): Excel.RangeBorder;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeBorderCollection;
-    }
-    /**
-     *
-     * This object represents the font attributes (font name, font size, color, etc.) for an object.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class RangeFont extends OfficeExtension.ClientObject {
-        private m_bold;
-        private m_color;
-        private m_italic;
-        private m_name;
-        private m_size;
-        private m_underline;
-        /**
-         *
-         * Represents the bold status of font.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        bold: boolean;
-        /**
-         *
-         * HTML color code representation of the text color. E.g. #FF0000 represents Red.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        color: string;
-        /**
-         *
-         * Represents the italic status of the font.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        italic: boolean;
-        /**
-         *
-         * Font name (e.g. "Calibri")
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        name: string;
-        /**
-         *
-         * Font size.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        size: number;
-        /**
-         *
-         * Type of underline applied to the font. See Excel.RangeUnderlineStyle for details.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        underline: string;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeFont;
-    }
-    /**
-     *
-     * A collection of all the chart objects on a worksheet.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__items;
-        /** Gets the loaded child items in this collection. */
-        items: Array<Excel.Chart>;
-        /**
-         *
-         * Returns the number of charts in the worksheet. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        count: number;
-        /**
-         *
-         * Creates a new chart.
-         *
-         * @param type Represents the type of a chart. See Excel.ChartType for details.
-         * @param sourceData The Range object corresponding to the source data.
-         * @param seriesBy Specifies the way columns or rows are used as data series on the chart. See Excel.ChartSeriesBy for details.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        add(type: string, sourceData: Excel.Range, seriesBy?: string): Excel.Chart;
-        /**
-         *
-         * Gets a chart using its name. If there are multiple charts with the same name, the first one will be returned.
-         *
-         * @param name Name of the chart to be retrieved.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getItem(name: string): Excel.Chart;
-        /**
-         *
-         * Gets a chart based on its position in the collection.
-         *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getItemAt(index: number): Excel.Chart;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartCollection;
-    }
-    /**
-     *
-     * Represents a chart object in a workbook.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class Chart extends OfficeExtension.ClientObject {
-        private m_axes;
-        private m_dataLabels;
-        private m_format;
-        private m_height;
-        private m_left;
-        private m_legend;
-        private m_name;
-        private m_series;
-        private m_title;
-        private m_top;
-        private m_width;
-        private m_worksheet;
-        /**
-         *
-         * Represents chart axes. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        axes: Excel.ChartAxes;
-        /**
-         *
-         * Represents the datalabels on the chart. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        dataLabels: Excel.ChartDataLabels;
-        /**
-         *
-         * Encapsulates the format properties for the chart area. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        format: Excel.ChartAreaFormat;
-        /**
-         *
-         * Represents the legend for the chart. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        legend: Excel.ChartLegend;
-        /**
-         *
-         * Represents either a single series or collection of series in the chart. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        series: Excel.ChartSeriesCollection;
-        /**
-         *
-         * Represents the title of the specified chart, including the text, visibility, position and formating of the title. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        title: Excel.ChartTitle;
-        /**
-         *
-         * The worksheet containing the current chart. Read-only.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        worksheet: Excel.Worksheet;
-        /**
-         *
-         * Represents the height, in points, of the chart object.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        height: number;
-        /**
-         *
-         * The distance, in points, from the left side of the chart to the worksheet origin.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        left: number;
-        /**
-         *
-         * Represents the name of a chart object.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        name: string;
-        /**
-         *
-         * Represents the distance, in points, from the top edge of the object to the top of row 1 (on a worksheet) or the top of the chart area (on a chart).
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        top: number;
-        /**
-         *
-         * Represents the width, in points, of the chart object.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        width: number;
-        /**
-         *
-         * Deletes the chart object.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        delete(): void;
-        /**
-         *
-         * Renders the chart as a base64-encoded image by scaling the chart to fit the specified dimensions.
-            The aspect ratio is preserved as part of the resizing.
-         *
-         * @param height (Optional) The desired height of the resulting image.
-         * @param width (Optional) The desired width of the resulting image.
-         * @param fittingMode (Optional) The method used to scale the chart to the specified to the specified dimensions (if both height and width are set)."
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getImage(width?: number, height?: number, fittingMode?: string): OfficeExtension.ClientResult<string>;
-        /**
-         *
-         * Resets the source data for the chart.
-         *
-         * @param sourceData The Range object corresponding to the source data.
-         * @param seriesBy Specifies the way columns or rows are used as data series on the chart. Can be one of the following: Auto (default), Rows, Columns. See Excel.ChartSeriesBy for details.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        setData(sourceData: Excel.Range, seriesBy?: string): void;
-        /**
-         *
-         * Positions the chart relative to cells on the worksheet.
-         *
-         * @param startCell The start cell. This is where the chart will be moved to. The start cell is the top-left or top-right cell, depending on the user's right-to-left display settings.
-         * @param endCell (Optional) The end cell. If specified, the chart's width and height will be set to fully cover up this cell/range.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        setPosition(startCell: Excel.Range | string, endCell?: Excel.Range | string): void;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Chart;
-    }
-    /**
-     *
-     * Encapsulates the format properties for the overall chart area.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartAreaFormat extends OfficeExtension.ClientObject {
-        private m_fill;
-        private m_font;
-        /**
-         *
-         * Represents the fill format of an object, which includes background formatting information. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        fill: Excel.ChartFill;
-        /**
-         *
-         * Represents the font attributes (font name, font size, color, etc.) for the current object. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        font: Excel.ChartFont;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAreaFormat;
-    }
-    /**
-     *
-     * Represents a collection of chart series.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartSeriesCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__items;
-        /** Gets the loaded child items in this collection. */
-        items: Array<Excel.ChartSeries>;
-        /**
-         *
-         * Returns the number of series in the collection. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        count: number;
-        /**
-         *
-         * Retrieves a series based on its position in the collection
-         *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getItemAt(index: number): Excel.ChartSeries;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartSeriesCollection;
-    }
-    /**
-     *
-     * Represents a series in a chart.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartSeries extends OfficeExtension.ClientObject {
-        private m_format;
-        private m_name;
-        private m_points;
-        /**
-         *
-         * Represents the formatting of a chart series, which includes fill and line formatting. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        format: Excel.ChartSeriesFormat;
-        /**
-         *
-         * Represents a collection of all points in the series. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        points: Excel.ChartPointsCollection;
-        /**
-         *
-         * Represents the name of a series in a chart.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        name: string;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartSeries;
-    }
-    /**
-     *
-     * encapsulates the format properties for the chart series
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartSeriesFormat extends OfficeExtension.ClientObject {
-        private m_fill;
-        private m_line;
-        /**
-         *
-         * Represents the fill format of a chart series, which includes background formating information. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        fill: Excel.ChartFill;
-        /**
-         *
-         * Represents line formatting. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        line: Excel.ChartLineFormat;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartSeriesFormat;
-    }
-    /**
-     *
-     * A collection of all the chart points within a series inside a chart.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartPointsCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__items;
-        /** Gets the loaded child items in this collection. */
-        items: Array<Excel.ChartPoint>;
-        /**
-         *
-         * Returns the number of chart points in the collection. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        count: number;
-        /**
-         *
-         * Retrieve a point based on its position within the series.
-         *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        getItemAt(index: number): Excel.ChartPoint;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartPointsCollection;
-    }
-    /**
-     *
-     * Represents a point of a series in a chart.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartPoint extends OfficeExtension.ClientObject {
-        private m_format;
-        private m_value;
-        /**
-         *
-         * Encapsulates the format properties chart point. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        format: Excel.ChartPointFormat;
-        /**
-         *
-         * Returns the value of a chart point. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        value: any;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartPoint;
-    }
-    /**
-     *
-     * Represents formatting object for chart points.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartPointFormat extends OfficeExtension.ClientObject {
-        private m_fill;
-        /**
-         *
-         * Represents the fill format of a chart, which includes background formating information. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        fill: Excel.ChartFill;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartPointFormat;
-    }
-    /**
-     *
-     * Represents the chart axes.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartAxes extends OfficeExtension.ClientObject {
-        private m_categoryAxis;
-        private m_seriesAxis;
-        private m_valueAxis;
-        /**
-         *
-         * Represents the category axis in a chart. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        categoryAxis: Excel.ChartAxis;
-        /**
-         *
-         * Represents the series axis of a 3-dimensional chart. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        seriesAxis: Excel.ChartAxis;
-        /**
-         *
-         * Represents the value axis in an axis. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        valueAxis: Excel.ChartAxis;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAxes;
-    }
-    /**
-     *
-     * Represents a single axis in a chart.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartAxis extends OfficeExtension.ClientObject {
-        private m_format;
-        private m_majorGridlines;
-        private m_majorUnit;
-        private m_maximum;
-        private m_minimum;
-        private m_minorGridlines;
-        private m_minorUnit;
-        private m_title;
-        /**
-         *
-         * Represents the formatting of a chart object, which includes line and font formatting. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        format: Excel.ChartAxisFormat;
-        /**
-         *
-         * Returns a gridlines object that represents the major gridlines for the specified axis. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        majorGridlines: Excel.ChartGridlines;
-        /**
-         *
-         * Returns a Gridlines object that represents the minor gridlines for the specified axis. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        minorGridlines: Excel.ChartGridlines;
-        /**
-         *
-         * Represents the axis title. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        title: Excel.ChartAxisTitle;
-        /**
-         *
-         * Represents the interval between two major tick marks. Can be set to a numeric value or an empty string.  The returned value is always a number.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        majorUnit: any;
-        /**
-         *
-         * Represents the maximum value on the value axis.  Can be set to a numeric value or an empty string (for automatic axis values).  The returned value is always a number.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        maximum: any;
-        /**
-         *
-         * Represents the minimum value on the value axis. Can be set to a numeric value or an empty string (for automatic axis values).  The returned value is always a number.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        minimum: any;
-        /**
-         *
-         * Represents the interval between two minor tick marks. "Can be set to a numeric value or an empty string (for automatic axis values). The returned value is always a number.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        minorUnit: any;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAxis;
-    }
-    /**
-     *
-     * Encapsulates the format properties for the chart axis.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartAxisFormat extends OfficeExtension.ClientObject {
-        private m_font;
-        private m_line;
-        /**
-         *
-         * Represents the font attributes (font name, font size, color, etc.) for a chart axis element. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        font: Excel.ChartFont;
-        /**
-         *
-         * Represents chart line formatting. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        line: Excel.ChartLineFormat;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAxisFormat;
-    }
-    /**
-     *
-     * Represents the title of a chart axis.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartAxisTitle extends OfficeExtension.ClientObject {
-        private m_format;
-        private m_text;
-        private m_visible;
-        /**
-         *
-         * Represents the formatting of chart axis title. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        format: Excel.ChartAxisTitleFormat;
-        /**
-         *
-         * Represents the axis title.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        text: string;
-        /**
-         *
-         * A boolean that specifies the visibility of an axis title.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        visible: boolean;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAxisTitle;
-    }
-    /**
-     *
-     * Represents the chart axis title formatting.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartAxisTitleFormat extends OfficeExtension.ClientObject {
-        private m_font;
-        /**
-         *
-         * Represents the font attributes, such as font name, font size, color, etc. of chart axis title object. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        font: Excel.ChartFont;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAxisTitleFormat;
-    }
-    /**
-     *
-     * Represents a collection of all the data labels on a chart point.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartDataLabels extends OfficeExtension.ClientObject {
-        private m_format;
-        private m_position;
-        private m_separator;
-        private m_showBubbleSize;
-        private m_showCategoryName;
-        private m_showLegendKey;
-        private m_showPercentage;
-        private m_showSeriesName;
-        private m_showValue;
-        /**
-         *
-         * Represents the format of chart data labels, which includes fill and font formatting. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        format: Excel.ChartDataLabelFormat;
-        /**
-         *
-         * DataLabelPosition value that represents the position of the data label. See Excel.ChartDataLabelPosition for details.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        position: string;
-        /**
-         *
-         * String representing the separator used for the data labels on a chart.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        separator: string;
-        /**
-         *
-         * Boolean value representing if the data label bubble size is visible or not.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        showBubbleSize: boolean;
-        /**
-         *
-         * Boolean value representing if the data label category name is visible or not.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        showCategoryName: boolean;
-        /**
-         *
-         * Boolean value representing if the data label legend key is visible or not.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        showLegendKey: boolean;
-        /**
-         *
-         * Boolean value representing if the data label percentage is visible or not.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        showPercentage: boolean;
-        /**
-         *
-         * Boolean value representing if the data label series name is visible or not.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        showSeriesName: boolean;
-        /**
-         *
-         * Boolean value representing if the data label value is visible or not.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        showValue: boolean;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartDataLabels;
-    }
-    /**
-     *
-     * Encapsulates the format properties for the chart data labels.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartDataLabelFormat extends OfficeExtension.ClientObject {
-        private m_fill;
-        private m_font;
-        /**
-         *
-         * Represents the fill format of the current chart data label. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        fill: Excel.ChartFill;
-        /**
-         *
-         * Represents the font attributes (font name, font size, color, etc.) for a chart data label. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        font: Excel.ChartFont;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartDataLabelFormat;
-    }
-    /**
-     *
-     * Represents major or minor gridlines on a chart axis.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartGridlines extends OfficeExtension.ClientObject {
-        private m_format;
-        private m_visible;
-        /**
-         *
-         * Represents the formatting of chart gridlines. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        format: Excel.ChartGridlinesFormat;
-        /**
-         *
-         * Boolean value representing if the axis gridlines are visible or not.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        visible: boolean;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartGridlines;
-    }
-    /**
-     *
-     * Encapsulates the format properties for chart gridlines.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartGridlinesFormat extends OfficeExtension.ClientObject {
-        private m_line;
-        /**
-         *
-         * Represents chart line formatting. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        line: Excel.ChartLineFormat;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartGridlinesFormat;
-    }
-    /**
-     *
-     * Represents the legend in a chart.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartLegend extends OfficeExtension.ClientObject {
-        private m_format;
-        private m_overlay;
-        private m_position;
-        private m_visible;
-        /**
-         *
-         * Represents the formatting of a chart legend, which includes fill and font formatting. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        format: Excel.ChartLegendFormat;
-        /**
-         *
-         * Boolean value for whether the chart legend should overlap with the main body of the chart.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        overlay: boolean;
-        /**
-         *
-         * Represents the position of the legend on the chart. See Excel.ChartLegendPosition for details.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        position: string;
-        /**
-         *
-         * A boolean value the represents the visibility of a ChartLegend object.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        visible: boolean;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartLegend;
-    }
-    /**
-     *
-     * Encapsulates the format properties of a chart legend.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartLegendFormat extends OfficeExtension.ClientObject {
-        private m_fill;
-        private m_font;
-        /**
-         *
-         * Represents the fill format of an object, which includes background formating information. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        fill: Excel.ChartFill;
-        /**
-         *
-         * Represents the font attributes such as font name, font size, color, etc. of a chart legend. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        font: Excel.ChartFont;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartLegendFormat;
-    }
-    /**
-     *
-     * Represents a chart title object of a chart.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartTitle extends OfficeExtension.ClientObject {
-        private m_format;
-        private m_overlay;
-        private m_text;
-        private m_visible;
-        /**
-         *
-         * Represents the formatting of a chart title, which includes fill and font formatting. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        format: Excel.ChartTitleFormat;
-        /**
-         *
-         * Boolean value representing if the chart title will overlay the chart or not.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        overlay: boolean;
-        /**
-         *
-         * Represents the title text of a chart.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        text: string;
-        /**
-         *
-         * A boolean value the represents the visibility of a chart title object.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        visible: boolean;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartTitle;
-    }
-    /**
-     *
-     * Provides access to the office art formatting for chart title.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartTitleFormat extends OfficeExtension.ClientObject {
-        private m_fill;
-        private m_font;
-        /**
-         *
-         * Represents the fill format of an object, which includes background formating information. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        fill: Excel.ChartFill;
-        /**
-         *
-         * Represents the font attributes (font name, font size, color, etc.) for an object. Read-only.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        font: Excel.ChartFont;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartTitleFormat;
-    }
-    /**
-     *
-     * Represents the fill formatting for a chart element.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartFill extends OfficeExtension.ClientObject {
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartFill;
-        /**
-         *
-         * Clear the fill color of a chart element.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        clear(): void;
-        /**
-         *
-         * Sets the fill formatting of a chart element to a uniform color.
-         *
-         * @param color HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        setSolidColor(color: string): void;
-    }
-    /**
-     *
-     * Enapsulates the formatting options for line elements.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartLineFormat extends OfficeExtension.ClientObject {
-        private m_color;
-        /**
-         *
-         * HTML color code representing the color of lines in the chart.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        color: string;
-        /**
-         *
-         * Clear the line format of a chart element.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        clear(): void;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartLineFormat;
-    }
-    /**
-     *
-     * This object represents the font attributes (font name, font size, color, etc.) for a chart object.
-     *
-     * [Api set: ExcelApi 1.1]
-     */
-    class ChartFont extends OfficeExtension.ClientObject {
-        private m_bold;
-        private m_color;
-        private m_italic;
-        private m_name;
-        private m_size;
-        private m_underline;
-        /**
-         *
-         * Represents the bold status of font.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        bold: boolean;
-        /**
-         *
-         * HTML color code representation of the text color. E.g. #FF0000 represents Red.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        color: string;
-        /**
-         *
-         * Represents the italic status of the font.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        italic: boolean;
-        /**
-         *
-         * Font name (e.g. "Calibri")
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        name: string;
-        /**
-         *
-         * Size of the font (e.g. 11)
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        size: number;
-        /**
-         *
-         * Type of underline applied to the font. See Excel.ChartUnderlineStyle for details.
-         *
-         * [Api set: ExcelApi 1.1]
-         */
-        underline: string;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartFont;
-    }
-    /**
-     *
-     * Manages sorting operations on Range objects.
-     *
-     * [Api set: ExcelApi 1.2]
-     */
-    class RangeSort extends OfficeExtension.ClientObject {
-        /**
-         *
-         * Perform a sort operation.
-         *
-         * @param fields The list of conditions to sort on.
-         * @param matchCase Whether to have the casing impact string ordering.
-         * @param hasHeaders Whether the range has a header.
-         * @param orientation Whether the operation is sorting rows or columns.
-         * @param method The ordering method used for Chinese characters.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        apply(fields: Array<Excel.SortField>, matchCase?: boolean, hasHeaders?: boolean, orientation?: string, method?: string): void;
-    }
-    /**
-     *
-     * Manages sorting operations on Table objects.
-     *
-     * [Api set: ExcelApi 1.2]
-     */
-    class TableSort extends OfficeExtension.ClientObject {
-        private m_fields;
-        private m_matchCase;
-        private m_method;
-        /**
-         *
-         * Represents the current conditions used to last sort the table.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        fields: Array<Excel.SortField>;
-        /**
-         *
-         * Represents whether the casing impacted the last sort of the table.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        matchCase: boolean;
-        /**
-         *
-         * Represents Chinese character ordering method last used to sort the table.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        method: string;
-        /**
-         *
-         * Perform a sort operation.
-         *
-         * @param fields The list of conditions to sort on.
-         * @param matchCase Whether to have the casing impact string ordering.
-         * @param method The ordering method used for Chinese characters.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        apply(fields: Array<Excel.SortField>, matchCase?: boolean, method?: string): void;
-        /**
-         *
-         * Clears the sorting that is currently on the table. While this doesn't modify the table's ordering, it clears the state of the header buttons.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        clear(): void;
-        /**
-         *
-         * Reapplies the current sorting parameters to the table.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        reapply(): void;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableSort;
-    }
-    /**
-     *
-     * Represents a condition in a sorting operation.
-     *
-     * [Api set: ExcelApi 1.2]
-     */
-    interface SortField {
-        /**
-         *
-         * Represents whether the sorting is done in an ascending fashion.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        ascending?: boolean;
-        /**
-         *
-         * Represents the color that is the target of the condition if the sorting is on font or cell color.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        color?: string;
-        /**
-         *
-         * Represents additional sorting options for this field.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        dataOption?: string;
-        /**
-         *
-         * Represents the icon that is the target of the condition if the sorting is on the cell's icon.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        icon?: Excel.Icon;
-        /**
-         *
-         * Represents the column (or row, depending on the sort orientation) that the condition is on. Represented as an offset from the first column (or row).
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        key: number;
-        /**
-         *
-         * Represents the type of sorting of this condition.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        sortOn?: string;
-    }
-    /**
-     *
-     * Manages the filtering of a table's column.
-     *
-     * [Api set: ExcelApi 1.2]
-     */
-    class Filter extends OfficeExtension.ClientObject {
-        private m_criteria;
-        /**
-         *
-         * The currently applied filter on the given column.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        criteria: Excel.FilterCriteria;
-        /**
-         *
-         * Apply the given filter criteria on the given column.
-         *
-         * @param criteria The criteria to apply.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        apply(criteria: Excel.FilterCriteria): void;
-        /**
-         *
-         * Apply a "Bottom Item" filter to the column for the given number of elements.
-         *
-         * @param count The number of elements from the bottom to show.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        applyBottomItemsFilter(count: number): void;
-        /**
-         *
-         * Apply a "Bottom Percent" filter to the column for the given percentage of elements.
-         *
-         * @param percent The percentage of elements from the bottom to show.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        applyBottomPercentFilter(percent: number): void;
-        /**
-         *
-         * Apply a "Cell Color" filter to the column for the given color.
-         *
-         * @param color The background color of the cells to show.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        applyCellColorFilter(color: string): void;
-        /**
-         *
-         * Apply a "Icon" filter to the column for the given criteria strings.
-         *
-         * @param criteria1 The first criteria string.
-         * @param criteria2 The second criteria string.
-         * @param oper The operator that describes how the two criteria are joined.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        applyCustomFilter(criteria1: string, criteria2?: string, oper?: string): void;
-        /**
-         *
-         * Apply a "Dynamic" filter to the column.
-         *
-         * @param criteria The dynamic criteria to apply.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        applyDynamicFilter(criteria: string): void;
-        /**
-         *
-         * Apply a "Font Color" filter to the column for the given color.
-         *
-         * @param color The font color of the cells to show.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        applyFontColorFilter(color: string): void;
-        /**
-         *
-         * Apply a "Icon" filter to the column for the given icon.
-         *
-         * @param icon The icons of the cells to show.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        applyIconFilter(icon: Excel.Icon): void;
-        /**
-         *
-         * Apply a "Top Item" filter to the column for the given number of elements.
-         *
-         * @param count The number of elements from the top to show.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        applyTopItemsFilter(count: number): void;
-        /**
-         *
-         * Apply a "Top Percent" filter to the column for the given percentage of elements.
-         *
-         * @param percent The percentage of elements from the top to show.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        applyTopPercentFilter(percent: number): void;
-        /**
-         *
-         * Apply a "Values" filter to the column for the given values.
-         *
-         * @param values The list of values to show.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        applyValuesFilter(values: Array<string | Excel.FilterDatetime>): void;
-        /**
-         *
-         * Clear the filter on the given column.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        clear(): void;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Filter;
-    }
-    /**
-     *
-     * Represents the filtering criteria applied to a column.
-     *
-     * [Api set: ExcelApi 1.2]
-     */
-    interface FilterCriteria {
-        /**
-         *
-         * The HTML color string used to filter cells. Used with "cellColor" and "fontColor" filtering.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        color?: string;
-        /**
-         *
-         * The first criterion used to filter data. Used as an operator in the case of "custom" filtering.
-             For example ">50" for number greater than 50 or "=*s" for values ending in "s".
-
-             Used as a number in the case of top/bottom items/percents. E.g. "5" for the top 5 items if filterOn is set to "topItems"
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        criterion1?: string;
-        /**
-         *
-         * The second criterion used to filter data. Only used as an operator in the case of "custom" filtering.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        criterion2?: string;
-        /**
-         *
-         * The dynamic criteria from the Excel.DynamicFilterCriteria set to apply on this column. Used with "dynamic" filtering.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        dynamicCriteria?: string;
-        /**
-         *
-         * The property used by the filter to determine whether the values should stay visible.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        filterOn: string;
-        /**
-         *
-         * The icon used to filter cells. Used with "icon" filtering.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        icon?: Excel.Icon;
-        /**
-         *
-         * The operator used to combine criterion 1 and 2 when using "custom" filtering.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        operator?: string;
-        /**
-         *
-         * The set of values to be used as part of "values" filtering.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        values?: Array<string | Excel.FilterDatetime>;
-    }
-    /**
-     *
-     * Represents how to filter a date when filtering on values.
-     *
-     * [Api set: ExcelApi 1.2]
-     */
-    interface FilterDatetime {
-        /**
-         *
-         * The date in ISO8601 format used to filter data.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        date: string;
-        /**
-         *
-         * How specific the date should be used to keep data. For example, if the date is 2005-04-02 and the specifity is set to "month", the filter operation will keep all rows with a date in the month of april 2009.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        specificity: string;
-    }
-    /**
-     *
-     * Represents a cell icon.
-     *
-     * [Api set: ExcelApi 1.2]
-     */
-    interface Icon {
-        /**
-         *
-         * Represents the index of the icon in the given set.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        index: number;
-        /**
-         *
-         * Represents the set that the icon is part of.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        set: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace BindingType {
-        var range: string;
-        var table: string;
-        var text: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace BorderIndex {
-        var edgeTop: string;
-        var edgeBottom: string;
-        var edgeLeft: string;
-        var edgeRight: string;
-        var insideVertical: string;
-        var insideHorizontal: string;
-        var diagonalDown: string;
-        var diagonalUp: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace BorderLineStyle {
-        var none: string;
-        var continuous: string;
-        var dash: string;
-        var dashDot: string;
-        var dashDotDot: string;
-        var dot: string;
-        var double: string;
-        var slantDashDot: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace BorderWeight {
-        var hairline: string;
-        var thin: string;
-        var medium: string;
-        var thick: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace CalculationMode {
-        var automatic: string;
-        var automaticExceptTables: string;
-        var manual: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace CalculationType {
-        var recalculate: string;
-        var full: string;
-        var fullRebuild: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace ClearApplyTo {
-        var all: string;
-        var formats: string;
-        var contents: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace ChartDataLabelPosition {
-        var invalid: string;
-        var none: string;
-        var center: string;
-        var insideEnd: string;
-        var insideBase: string;
-        var outsideEnd: string;
-        var left: string;
-        var right: string;
-        var top: string;
-        var bottom: string;
-        var bestFit: string;
-        var callout: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace ChartLegendPosition {
-        var invalid: string;
-        var top: string;
-        var bottom: string;
-        var left: string;
-        var right: string;
-        var corner: string;
-        var custom: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace ChartSeriesBy {
-        var auto: string;
-        var columns: string;
-        var rows: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace ChartType {
-        var invalid: string;
-        var columnClustered: string;
-        var columnStacked: string;
-        var columnStacked100: string;
-        var _3DColumnClustered: string;
-        var _3DColumnStacked: string;
-        var _3DColumnStacked100: string;
-        var barClustered: string;
-        var barStacked: string;
-        var barStacked100: string;
-        var _3DBarClustered: string;
-        var _3DBarStacked: string;
-        var _3DBarStacked100: string;
-        var lineStacked: string;
-        var lineStacked100: string;
-        var lineMarkers: string;
-        var lineMarkersStacked: string;
-        var lineMarkersStacked100: string;
-        var pieOfPie: string;
-        var pieExploded: string;
-        var _3DPieExploded: string;
-        var barOfPie: string;
-        var xyscatterSmooth: string;
-        var xyscatterSmoothNoMarkers: string;
-        var xyscatterLines: string;
-        var xyscatterLinesNoMarkers: string;
-        var areaStacked: string;
-        var areaStacked100: string;
-        var _3DAreaStacked: string;
-        var _3DAreaStacked100: string;
-        var doughnutExploded: string;
-        var radarMarkers: string;
-        var radarFilled: string;
-        var surface: string;
-        var surfaceWireframe: string;
-        var surfaceTopView: string;
-        var surfaceTopViewWireframe: string;
-        var bubble: string;
-        var bubble3DEffect: string;
-        var stockHLC: string;
-        var stockOHLC: string;
-        var stockVHLC: string;
-        var stockVOHLC: string;
-        var cylinderColClustered: string;
-        var cylinderColStacked: string;
-        var cylinderColStacked100: string;
-        var cylinderBarClustered: string;
-        var cylinderBarStacked: string;
-        var cylinderBarStacked100: string;
-        var cylinderCol: string;
-        var coneColClustered: string;
-        var coneColStacked: string;
-        var coneColStacked100: string;
-        var coneBarClustered: string;
-        var coneBarStacked: string;
-        var coneBarStacked100: string;
-        var coneCol: string;
-        var pyramidColClustered: string;
-        var pyramidColStacked: string;
-        var pyramidColStacked100: string;
-        var pyramidBarClustered: string;
-        var pyramidBarStacked: string;
-        var pyramidBarStacked100: string;
-        var pyramidCol: string;
-        var _3DColumn: string;
-        var line: string;
-        var _3DLine: string;
-        var _3DPie: string;
-        var pie: string;
-        var xyscatter: string;
-        var _3DArea: string;
-        var area: string;
-        var doughnut: string;
-        var radar: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace ChartUnderlineStyle {
-        var none: string;
-        var single: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace DeleteShiftDirection {
-        var up: string;
-        var left: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.2]
-     */
-    namespace DynamicFilterCriteria {
-        var unknown: string;
-        var aboveAverage: string;
-        var allDatesInPeriodApril: string;
-        var allDatesInPeriodAugust: string;
-        var allDatesInPeriodDecember: string;
-        var allDatesInPeriodFebruray: string;
-        var allDatesInPeriodJanuary: string;
-        var allDatesInPeriodJuly: string;
-        var allDatesInPeriodJune: string;
-        var allDatesInPeriodMarch: string;
-        var allDatesInPeriodMay: string;
-        var allDatesInPeriodNovember: string;
-        var allDatesInPeriodOctober: string;
-        var allDatesInPeriodQuarter1: string;
-        var allDatesInPeriodQuarter2: string;
-        var allDatesInPeriodQuarter3: string;
-        var allDatesInPeriodQuarter4: string;
-        var allDatesInPeriodSeptember: string;
-        var belowAverage: string;
-        var lastMonth: string;
-        var lastQuarter: string;
-        var lastWeek: string;
-        var lastYear: string;
-        var nextMonth: string;
-        var nextQuarter: string;
-        var nextWeek: string;
-        var nextYear: string;
-        var thisMonth: string;
-        var thisQuarter: string;
-        var thisWeek: string;
-        var thisYear: string;
-        var today: string;
-        var tomorrow: string;
-        var yearToDate: string;
-        var yesterday: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.2]
-     */
-    namespace FilterDatetimeSpecificity {
-        var year: string;
-        var month: string;
-        var day: string;
-        var hour: string;
-        var minute: string;
-        var second: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.2]
-     */
-    namespace FilterOn {
-        var bottomItems: string;
-        var bottomPercent: string;
-        var cellColor: string;
-        var dynamic: string;
-        var fontColor: string;
-        var values: string;
-        var topItems: string;
-        var topPercent: string;
-        var icon: string;
-        var custom: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.2]
-     */
-    namespace FilterOperator {
-        var and: string;
-        var or: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace HorizontalAlignment {
-        var general: string;
-        var left: string;
-        var center: string;
-        var right: string;
-        var fill: string;
-        var justify: string;
-        var centerAcrossSelection: string;
-        var distributed: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.2]
-     */
-    namespace IconSet {
-        var invalid: string;
-        var threeArrows: string;
-        var threeArrowsGray: string;
-        var threeFlags: string;
-        var threeTrafficLights1: string;
-        var threeTrafficLights2: string;
-        var threeSigns: string;
-        var threeSymbols: string;
-        var threeSymbols2: string;
-        var fourArrows: string;
-        var fourArrowsGray: string;
-        var fourRedToBlack: string;
-        var fourRating: string;
-        var fourTrafficLights: string;
-        var fiveArrows: string;
-        var fiveArrowsGray: string;
-        var fiveRating: string;
-        var fiveQuarters: string;
-        var threeStars: string;
-        var threeTriangles: string;
-        var fiveBoxes: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.2]
-     */
-    namespace ImageFittingMode {
-        var fit: string;
-        var fitAndCenter: string;
-        var fill: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace InsertShiftDirection {
-        var down: string;
-        var right: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace NamedItemType {
-        var string: string;
-        var integer: string;
-        var double: string;
-        var boolean: string;
-        var range: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace RangeUnderlineStyle {
-        var none: string;
-        var single: string;
-        var double: string;
-        var singleAccountant: string;
-        var doubleAccountant: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace SheetVisibility {
-        var visible: string;
-        var hidden: string;
-        var veryHidden: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace RangeValueType {
-        var unknown: string;
-        var empty: string;
-        var string: string;
-        var integer: string;
-        var double: string;
-        var boolean: string;
-        var error: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.2]
-     */
-    namespace SortOrientation {
-        var rows: string;
-        var columns: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.2]
-     */
-    namespace SortOn {
-        var value: string;
-        var cellColor: string;
-        var fontColor: string;
-        var icon: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.2]
-     */
-    namespace SortDataOption {
-        var normal: string;
-        var textAsNumber: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.2]
-     */
-    namespace SortMethod {
-        var pinYin: string;
-        var strokeCount: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace VerticalAlignment {
-        var top: string;
-        var center: string;
-        var bottom: string;
-        var justify: string;
-        var distributed: string;
-    }
-    /**
-     *
-     * An object containing the result of a function-evaluation operation
-     *
-     * [Api set: ExcelApi 1.2]
-     */
-    class FunctionResult<T> extends OfficeExtension.ClientObject {
-        private m_error;
-        private m_value;
-        /**
-         *
-         * Error value (such as "#DIV/0") representing the error. If the error string is not set, then the function succeeded, and its result is written to the Value field. The error is always in the English locale.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        error: string;
-        /**
-         *
-         * The value of function evaluation. The value field will be populated only if no error has occured (i.e., the Error property is not set).
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        value: T;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): FunctionResult<T>;
-    }
-    /**
-     *
-     * An object for evaluating Excel functions.
-     *
-     * [Api set: ExcelApi 1.2]
-     */
-    class Functions extends OfficeExtension.ClientObject {
-        /**
-         *
-         * Returns the absolute value of a number, a number without its sign.
-         *
-         * @param number Is the real number for which you want the absolute value.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        abs(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the accrued interest for a security that pays periodic interest.
-         *
-         * @param issue Is the security's issue date, expressed as a serial date number.
-         * @param firstInterest Is the security's first interest date, expressed as a serial date number.
-         * @param settlement Is the security's settlement date, expressed as a serial date number.
-         * @param rate Is the security's annual coupon rate.
-         * @param par Is the security's par value.
-         * @param frequency Is the number of coupon payments per year.
-         * @param basis Is the type of day count basis to use.
-         * @param calcMethod Is a logical value: to accrued interest from issue date = TRUE or omitted; to calculate from last coupon payment date = FALSE.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        accrInt(issue: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, firstInterest: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, par: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, calcMethod?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the accrued interest for a security that pays interest at maturity.
-         *
-         * @param issue Is the security's issue date, expressed as a serial date number.
-         * @param settlement Is the security's maturity date, expressed as a serial date number.
-         * @param rate Is the security's annual coupon rate.
-         * @param par Is the security's par value.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        accrIntM(issue: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, par: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the arccosine of a number, in radians in the range 0 to Pi. The arccosine is the angle whose cosine is Number.
-         *
-         * @param number Is the cosine of the angle you want and must be from -1 to 1.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        acos(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the inverse hyperbolic cosine of a number.
-         *
-         * @param number Is any real number equal to or greater than 1.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        acosh(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the arccotangent of a number, in radians in the range 0 to Pi.
-         *
-         * @param number Is the cotangent of the angle you want.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        acot(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the inverse hyperbolic cotangent of a number.
-         *
-         * @param number Is the hyperbolic cotangent of the angle that you want.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        acoth(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the prorated linear depreciation of an asset for each accounting period.
-         *
-         * @param cost Is the cost of the asset.
-         * @param datePurchased Is the date the asset is purchased.
-         * @param firstPeriod Is the date of the end of the first period.
-         * @param salvage Is the salvage value at the end of life of the asset.
-         * @param period Is the period.
-         * @param rate Is the rate of depreciation.
-         * @param basis Year_basis : 0 for year of 360 days, 1 for actual, 3 for year of 365 days.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        amorDegrc(cost: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, datePurchased: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, firstPeriod: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, salvage: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, period: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the prorated linear depreciation of an asset for each accounting period.
-         *
-         * @param cost Is the cost of the asset.
-         * @param datePurchased Is the date the asset is purchased.
-         * @param firstPeriod Is the date of the end of the first period.
-         * @param salvage Is the salvage value at the end of life of the asset.
-         * @param period Is the period.
-         * @param rate Is the rate of depreciation.
-         * @param basis Year_basis : 0 for year of 360 days, 1 for actual, 3 for year of 365 days.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        amorLinc(cost: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, datePurchased: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, firstPeriod: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, salvage: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, period: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Checks whether all arguments are TRUE, and returns TRUE if all arguments are TRUE.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 conditions you want to test that can be either TRUE or FALSE and can be logical values, arrays, or references.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        and(...values: Array<boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<boolean>;
-        /**
-         *
-         * Converts a Roman numeral to Arabic.
-         *
-         * @param text Is the Roman numeral you want to convert.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        arabic(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the number of areas in a reference. An area is a range of contiguous cells or a single cell.
-         *
-         * @param reference Is a reference to a cell or range of cells and can refer to multiple areas.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        areas(reference: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Changes full-width (double-byte) characters to half-width (single-byte) characters. Use with double-byte character sets (DBCS).
-         *
-         * @param text Is a text, or a reference to a cell containing a text.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        asc(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Returns the arcsine of a number in radians, in the range -Pi/2 to Pi/2.
-         *
-         * @param number Is the sine of the angle you want and must be from -1 to 1.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        asin(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the inverse hyperbolic sine of a number.
-         *
-         * @param number Is any real number equal to or greater than 1.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        asinh(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the arctangent of a number in radians, in the range -Pi/2 to Pi/2.
-         *
-         * @param number Is the tangent of the angle you want.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        atan(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the arctangent of the specified x- and y- coordinates, in radians between -Pi and Pi, excluding -Pi.
-         *
-         * @param xNum Is the x-coordinate of the point.
-         * @param yNum Is the y-coordinate of the point.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        atan2(xNum: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, yNum: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the inverse hyperbolic tangent of a number.
-         *
-         * @param number Is any real number between -1 and 1 excluding -1 and 1.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        atanh(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the average of the absolute deviations of data points from their mean. Arguments can be numbers or names, arrays, or references that contain numbers.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 arguments for which you want the average of the absolute deviations.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        aveDev(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Returns the average (arithmetic mean) of its arguments, which can be numbers or names, arrays, or references that contain numbers.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 numeric arguments for which you want the average.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        average(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Returns the average (arithmetic mean) of its arguments, evaluating text and FALSE in arguments as 0; TRUE evaluates as 1. Arguments can be numbers, names, arrays, or references.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 arguments for which you want the average.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        averageA(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Finds average(arithmetic mean) for the cells specified by a given condition or criteria.
-         *
-         * @param range Is the range of cells you want evaluated.
-         * @param criteria Is the condition or criteria in the form of a number, expression, or text that defines which cells will be used to find the average.
-         * @param averageRange Are the actual cells to be used to find the average. If omitted, the cells in range are used.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        averageIf(range: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, averageRange?: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Finds average(arithmetic mean) for the cells specified by a given set of conditions or criteria.
-         *
-         * @param averageRange Are the actual cells to be used to find the average.
-         * @param values List of parameters, where the first element of each pair is the Is the range of cells you want evaluated for the particular condition , and the second element is is the condition or criteria in the form of a number, expression, or text that defines which cells will be used to find the average.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        averageIfs(averageRange: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, ...values: Array<Excel.Range | Excel.RangeReference | Excel.FunctionResult<any> | number | string | boolean>): FunctionResult<number>;
-        /**
-         *
-         * Converts a number to text (baht).
-         *
-         * @param number Is a number that you want to convert.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        bahtText(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Converts a number into a text representation with the given radix (base).
-         *
-         * @param number Is the number that you want to convert.
-         * @param radix Is the base Radix that you want to convert the number into.
-         * @param minLength Is the minimum length of the returned string.  If omitted leading zeros are not added.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        base(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, radix: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, minLength?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Returns the modified Bessel function In(x).
-         *
-         * @param x Is the value at which to evaluate the function.
-         * @param n Is the order of the Bessel function.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        besselI(x: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, n: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the Bessel function Jn(x).
-         *
-         * @param x Is the value at which to evaluate the function.
-         * @param n Is the order of the Bessel function.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        besselJ(x: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, n: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the modified Bessel function Kn(x).
-         *
-         * @param x Is the value at which to evaluate the function.
-         * @param n Is the order of the function.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        besselK(x: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, n: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the Bessel function Yn(x).
-         *
-         * @param x Is the value at which to evaluate the function.
-         * @param n Is the order of the function.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        besselY(x: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, n: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the beta probability distribution function.
-         *
-         * @param x Is the value between A and B at which to evaluate the function.
-         * @param alpha Is a parameter to the distribution and must be greater than 0.
-         * @param beta Is a parameter to the distribution and must be greater than 0.
-         * @param cumulative Is a logical value: for the cumulative distribution function, use TRUE; for the probability density function, use FALSE.
-         * @param A Is an optional lower bound to the interval of x. If omitted, A = 0.
-         * @param B Is an optional upper bound to the interval of x. If omitted, B = 1.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        beta_Dist(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, alpha: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, beta: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, A?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, B?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the inverse of the cumulative beta probability density function (BETA.DIST).
-         *
-         * @param probability Is a probability associated with the beta distribution.
-         * @param alpha Is a parameter to the distribution and must be greater than 0.
-         * @param beta Is a parameter to the distribution and must be greater than 0.
-         * @param A Is an optional lower bound to the interval of x. If omitted, A = 0.
-         * @param B Is an optional upper bound to the interval of x. If omitted, B = 1.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        beta_Inv(probability: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, alpha: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, beta: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, A?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, B?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts a binary number to decimal.
-         *
-         * @param number Is the binary number you want to convert.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        bin2Dec(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts a binary number to hexadecimal.
-         *
-         * @param number Is the binary number you want to convert.
-         * @param places Is the number of characters to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        bin2Hex(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, places?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts a binary number to octal.
-         *
-         * @param number Is the binary number you want to convert.
-         * @param places Is the number of characters to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        bin2Oct(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, places?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the individual term binomial distribution probability.
-         *
-         * @param numberS Is the number of successes in trials.
-         * @param trials Is the number of independent trials.
-         * @param probabilityS Is the probability of success on each trial.
-         * @param cumulative Is a logical value: for the cumulative distribution function, use TRUE; for the probability mass function, use FALSE.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        binom_Dist(numberS: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, trials: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, probabilityS: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the probability of a trial result using a binomial distribution.
-         *
-         * @param trials Is the number of independent trials.
-         * @param probabilityS Is the probability of success on each trial.
-         * @param numberS Is the number of successes in trials.
-         * @param numberS2 If provided this function returns the probability that the number of successful trials shall lie between numberS and numberS2.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        binom_Dist_Range(trials: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, probabilityS: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numberS: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numberS2?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the smallest value for which the cumulative binomial distribution is greater than or equal to a criterion value.
-         *
-         * @param trials Is the number of Bernoulli trials.
-         * @param probabilityS Is the probability of success on each trial, a number between 0 and 1 inclusive.
-         * @param alpha Is the criterion value, a number between 0 and 1 inclusive.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        binom_Inv(trials: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, probabilityS: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, alpha: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns a bitwise 'And' of two numbers.
-         *
-         * @param number1 Is the decimal representation of the binary number you want to evaluate.
-         * @param number2 Is the decimal representation of the binary number you want to evaluate.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        bitand(number1: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, number2: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns a number shifted left by shift_amount bits.
-         *
-         * @param number Is the decimal representation of the binary number you want to evaluate.
-         * @param shiftAmount Is the number of bits that you want to shift Number left by.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        bitlshift(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, shiftAmount: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns a bitwise 'Or' of two numbers.
-         *
-         * @param number1 Is the decimal representation of the binary number you want to evaluate.
-         * @param number2 Is the decimal representation of the binary number you want to evaluate.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        bitor(number1: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, number2: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns a number shifted right by shift_amount bits.
-         *
-         * @param number Is the decimal representation of the binary number you want to evaluate.
-         * @param shiftAmount Is the number of bits that you want to shift Number right by.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        bitrshift(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, shiftAmount: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns a bitwise 'Exclusive Or' of two numbers.
-         *
-         * @param number1 Is the decimal representation of the binary number you want to evaluate.
-         * @param number2 Is the decimal representation of the binary number you want to evaluate.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        bitxor(number1: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, number2: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Rounds a number up, to the nearest integer or to the nearest multiple of significance.
-         *
-         * @param number Is the value you want to round.
-         * @param significance Is the multiple to which you want to round.
-         * @param mode When given and nonzero this function will round away from zero.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        ceiling_Math(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, significance?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, mode?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Rounds a number up, to the nearest integer or to the nearest multiple of significance.
-         *
-         * @param number Is the value you want to round.
-         * @param significance Is the multiple to which you want to round.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        ceiling_Precise(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, significance?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the character specified by the code number from the character set for your computer.
-         *
-         * @param number Is a number between 1 and 255 specifying which character you want.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        char(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Returns the left-tailed probability of the chi-squared distribution.
-         *
-         * @param x Is the value at which you want to evaluate the distribution, a nonnegative number.
-         * @param degFreedom Is the number of degrees of freedom, a number between 1 and 10^10, excluding 10^10.
-         * @param cumulative Is a logical value for the function to return: the cumulative distribution function = TRUE; the probability density function = FALSE.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        chiSq_Dist(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the right-tailed probability of the chi-squared distribution.
-         *
-         * @param x Is the value at which you want to evaluate the distribution, a nonnegative number.
-         * @param degFreedom Is the number of degrees of freedom, a number between 1 and 10^10, excluding 10^10.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        chiSq_Dist_RT(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the inverse of the left-tailed probability of the chi-squared distribution.
-         *
-         * @param probability Is a probability associated with the chi-squared distribution, a value between 0 and 1 inclusive.
-         * @param degFreedom Is the number of degrees of freedom, a number between 1 and 10^10, excluding 10^10.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        chiSq_Inv(probability: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the inverse of the right-tailed probability of the chi-squared distribution.
-         *
-         * @param probability Is a probability associated with the chi-squared distribution, a value between 0 and 1 inclusive.
-         * @param degFreedom Is the number of degrees of freedom, a number between 1 and 10^10, excluding 10^10.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        chiSq_Inv_RT(probability: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Chooses a value or action to perform from a list of values, based on an index number.
-         *
-         * @param indexNum Specifies which value argument is selected. indexNum must be between 1 and 254, or a formula or a reference to a number between 1 and 254.
-         * @param values List of parameters, whose elements are 1 to 254 numbers, cell references, defined names, formulas, functions, or text arguments from which CHOOSE selects.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        choose(indexNum: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, ...values: Array<Excel.Range | number | string | boolean | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number | string | boolean>;
-        /**
-         *
-         * Removes all nonprintable characters from text.
-         *
-         * @param text Is any worksheet information from which you want to remove nonprintable characters.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        clean(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Returns a numeric code for the first character in a text string, in the character set used by your computer.
-         *
-         * @param text Is the text for which you want the code of the first character.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        code(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the number of columns in an array or reference.
-         *
-         * @param array Is an array or array formula, or a reference to a range of cells for which you want the number of columns.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        columns(array: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the number of combinations for a given number of items.
-         *
-         * @param number Is the total number of items.
-         * @param numberChosen Is the number of items in each combination.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        combin(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numberChosen: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the number of combinations with repetitions for a given number of items.
-         *
-         * @param number Is the total number of items.
-         * @param numberChosen Is the number of items in each combination.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        combina(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numberChosen: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts real and imaginary coefficients into a complex number.
-         *
-         * @param realNum Is the real coefficient of the complex number.
-         * @param iNum Is the imaginary coefficient of the complex number.
-         * @param suffix Is the suffix for the imaginary component of the complex number.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        complex(realNum: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, iNum: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, suffix?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Joins several text strings into one text string.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 text strings to be joined into a single text string and can be text strings, numbers, or single-cell references.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        concatenate(...values: Array<string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<string>;
-        /**
-         *
-         * Returns the confidence interval for a population mean, using a normal distribution.
-         *
-         * @param alpha Is the significance level used to compute the confidence level, a number greater than 0 and less than 1.
-         * @param standardDev Is the population standard deviation for the data range and is assumed to be known. standardDev must be greater than 0.
-         * @param size Is the sample size.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        confidence_Norm(alpha: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, standardDev: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, size: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the confidence interval for a population mean, using a Student's T distribution.
-         *
-         * @param alpha Is the significance level used to compute the confidence level, a number greater than 0 and less than 1.
-         * @param standardDev Is the population standard deviation for the data range and is assumed to be known. standardDev must be greater than 0.
-         * @param size Is the sample size.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        confidence_T(alpha: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, standardDev: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, size: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts a number from one measurement system to another.
-         *
-         * @param number Is the value in from_units to convert.
-         * @param fromUnit Is the units for number.
-         * @param toUnit Is the units for the result.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        convert(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, fromUnit: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, toUnit: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the cosine of an angle.
-         *
-         * @param number Is the angle in radians for which you want the cosine.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        cos(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the hyperbolic cosine of a number.
-         *
-         * @param number Is any real number.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        cosh(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the cotangent of an angle.
-         *
-         * @param number Is the angle in radians for which you want the cotangent.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        cot(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the hyperbolic cotangent of a number.
-         *
-         * @param number Is the angle in radians for which you want the hyperbolic cotangent.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        coth(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Counts the number of cells in a range that contain numbers.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 arguments that can contain or refer to a variety of different types of data, but only numbers are counted.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        count(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Counts the number of cells in a range that are not empty.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 arguments representing the values and cells you want to count. Values can be any type of information.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        countA(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Counts the number of empty cells in a specified range of cells.
-         *
-         * @param range Is the range from which you want to count the empty cells.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        countBlank(range: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Counts the number of cells within a range that meet the given condition.
-         *
-         * @param range Is the range of cells from which you want to count nonblank cells.
-         * @param criteria Is the condition in the form of a number, expression, or text that defines which cells will be counted.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        countIf(range: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Counts the number of cells specified by a given set of conditions or criteria.
-         *
-         * @param values List of parameters, where the first element of each pair is the Is the range of cells you want evaluated for the particular condition , and the second element is is the condition in the form of a number, expression, or text that defines which cells will be counted.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        countIfs(...values: Array<Excel.Range | Excel.RangeReference | Excel.FunctionResult<any> | number | string | boolean>): FunctionResult<number>;
-        /**
-         *
-         * Returns the number of days from the beginning of the coupon period to the settlement date.
-         *
-         * @param settlement Is the security's settlement date, expressed as a serial date number.
-         * @param maturity Is the security's maturity date, expressed as a serial date number.
-         * @param frequency Is the number of coupon payments per year.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        coupDayBs(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the number of days in the coupon period that contains the settlement date.
-         *
-         * @param settlement Is the security's settlement date, expressed as a serial date number.
-         * @param maturity Is the security's maturity date, expressed as a serial date number.
-         * @param frequency Is the number of coupon payments per year.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        coupDays(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the number of days from the settlement date to the next coupon date.
-         *
-         * @param settlement Is the security's settlement date, expressed as a serial date number.
-         * @param maturity Is the security's maturity date, expressed as a serial date number.
-         * @param frequency Is the number of coupon payments per year.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        coupDaysNc(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the next coupon date after the settlement date.
-         *
-         * @param settlement Is the security's settlement date, expressed as a serial date number.
-         * @param maturity Is the security's maturity date, expressed as a serial date number.
-         * @param frequency Is the number of coupon payments per year.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        coupNcd(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the number of coupons payable between the settlement date and maturity date.
-         *
-         * @param settlement Is the security's settlement date, expressed as a serial date number.
-         * @param maturity Is the security's maturity date, expressed as a serial date number.
-         * @param frequency Is the number of coupon payments per year.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        coupNum(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the previous coupon date before the settlement date.
-         *
-         * @param settlement Is the security's settlement date, expressed as a serial date number.
-         * @param maturity Is the security's maturity date, expressed as a serial date number.
-         * @param frequency Is the number of coupon payments per year.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        coupPcd(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the cosecant of an angle.
-         *
-         * @param number Is the angle in radians for which you want the cosecant.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        csc(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the hyperbolic cosecant of an angle.
-         *
-         * @param number Is the angle in radians for which you want the hyperbolic cosecant.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        csch(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the cumulative interest paid between two periods.
-         *
-         * @param rate Is the interest rate.
-         * @param nper Is the total number of payment periods.
-         * @param pv Is the present value.
-         * @param startPeriod Is the first period in the calculation.
-         * @param endPeriod Is the last period in the calculation.
-         * @param type Is the timing of the payment.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        cumIPmt(rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, nper: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pv: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, startPeriod: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, endPeriod: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, type: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the cumulative principal paid on a loan between two periods.
-         *
-         * @param rate Is the interest rate.
-         * @param nper Is the total number of payment periods.
-         * @param pv Is the present value.
-         * @param startPeriod Is the first period in the calculation.
-         * @param endPeriod Is the last period in the calculation.
-         * @param type Is the timing of the payment.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        cumPrinc(rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, nper: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pv: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, startPeriod: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, endPeriod: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, type: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Averages the values in a column in a list or database that match conditions you specify.
-         *
-         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
-         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
-         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        daverage(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Counts the cells containing numbers in the field (column) of records in the database that match the conditions you specify.
-         *
-         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
-         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
-         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        dcount(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Counts nonblank cells in the field (column) of records in the database that match the conditions you specify.
-         *
-         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
-         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
-         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        dcountA(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Extracts from a database a single record that matches the conditions you specify.
-         *
-         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
-         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
-         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        dget(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number | boolean | string>;
-        /**
-         *
-         * Returns the largest number in the field (column) of records in the database that match the conditions you specify.
-         *
-         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
-         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
-         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        dmax(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the smallest number in the field (column) of records in the database that match the conditions you specify.
-         *
-         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
-         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
-         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        dmin(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Multiplies the values in the field (column) of records in the database that match the conditions you specify.
-         *
-         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
-         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
-         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        dproduct(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Estimates the standard deviation based on a sample from selected database entries.
-         *
-         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
-         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
-         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        dstDev(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Calculates the standard deviation based on the entire population of selected database entries.
-         *
-         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
-         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
-         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        dstDevP(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Adds the numbers in the field (column) of records in the database that match the conditions you specify.
-         *
-         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
-         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
-         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        dsum(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Estimates variance based on a sample from selected database entries.
-         *
-         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
-         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
-         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        dvar(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Calculates variance based on the entire population of selected database entries.
-         *
-         * @param database Is the range of cells that makes up the list or database. A database is a list of related data.
-         * @param field Is either the label of the column in double quotation marks or a number that represents the column's position in the list.
-         * @param criteria Is the range of cells that contains the conditions you specify. The range includes a column label and one cell below the label for a condition.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        dvarP(database: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, field: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the number that represents the date in Microsoft Excel date-time code.
-         *
-         * @param year Is a number from 1900 or 1904 (depending on the workbook's date system) to 9999.
-         * @param month Is a number from 1 to 12 representing the month of the year.
-         * @param day Is a number from 1 to 31 representing the day of the month.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        date(year: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, month: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, day: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts a date in the form of text to a number that represents the date in Microsoft Excel date-time code.
-         *
-         * @param dateText Is text that represents a date in a Microsoft Excel date format, between 1/1/1900 or 1/1/1904 (depending on the workbook's date system) and 12/31/9999.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        datevalue(dateText: string | number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the day of the month, a number from 1 to 31.
-         *
-         * @param serialNumber Is a number in the date-time code used by Microsoft Excel.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        day(serialNumber: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the number of days between the two dates.
-         *
-         * @param endDate startDate and endDate are the two dates between which you want to know the number of days.
-         * @param startDate startDate and endDate are the two dates between which you want to know the number of days.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        days(endDate: string | number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, startDate: string | number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the number of days between two dates based on a 360-day year (twelve 30-day months).
-         *
-         * @param startDate startDate and endDate are the two dates between which you want to know the number of days.
-         * @param endDate startDate and endDate are the two dates between which you want to know the number of days.
-         * @param method Is a logical value specifying the calculation method: U.S. (NASD) = FALSE or omitted; European = TRUE.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        days360(startDate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, endDate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, method?: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the depreciation of an asset for a specified period using the fixed-declining balance method.
-         *
-         * @param cost Is the initial cost of the asset.
-         * @param salvage Is the salvage value at the end of the life of the asset.
-         * @param life Is the number of periods over which the asset is being depreciated (sometimes called the useful life of the asset).
-         * @param period Is the period for which you want to calculate the depreciation. Period must use the same units as Life.
-         * @param month Is the number of months in the first year. If month is omitted, it is assumed to be 12.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        db(cost: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, salvage: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, life: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, period: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, month?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Changes half-width (single-byte) characters within a character string to full-width (double-byte) characters. Use with double-byte character sets (DBCS).
-         *
-         * @param text Is a text, or a reference to a cell containing a text.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        dbcs(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Returns the depreciation of an asset for a specified period using the double-declining balance method or some other method you specify.
-         *
-         * @param cost Is the initial cost of the asset.
-         * @param salvage Is the salvage value at the end of the life of the asset.
-         * @param life Is the number of periods over which the asset is being depreciated (sometimes called the useful life of the asset).
-         * @param period Is the period for which you want to calculate the depreciation. Period must use the same units as Life.
-         * @param factor Is the rate at which the balance declines. If Factor is omitted, it is assumed to be 2 (the double-declining balance method).
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        ddb(cost: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, salvage: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, life: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, period: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, factor?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts a decimal number to binary.
-         *
-         * @param number Is the decimal integer you want to convert.
-         * @param places Is the number of characters to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        dec2Bin(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, places?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts a decimal number to hexadecimal.
-         *
-         * @param number Is the decimal integer you want to convert.
-         * @param places Is the number of characters to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        dec2Hex(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, places?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts a decimal number to octal.
-         *
-         * @param number Is the decimal integer you want to convert.
-         * @param places Is the number of characters to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        dec2Oct(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, places?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts a text representation of a number in a given base into a decimal number.
-         *
-         * @param number Is the number that you want to convert.
-         * @param radix Is the base Radix of the number you are converting.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        decimal(number: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, radix: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts radians to degrees.
-         *
-         * @param angle Is the angle in radians that you want to convert.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        degrees(angle: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Tests whether two numbers are equal.
-         *
-         * @param number1 Is the first number.
-         * @param number2 Is the second number.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        delta(number1: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, number2?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the sum of squares of deviations of data points from their sample mean.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 arguments, or an array or array reference, on which you want DEVSQ to calculate.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        devSq(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Returns the discount rate for a security.
-         *
-         * @param settlement Is the security's settlement date, expressed as a serial date number.
-         * @param maturity Is the security's maturity date, expressed as a serial date number.
-         * @param pr Is the security's price per $100 face value.
-         * @param redemption Is the security's redemption value per $100 face value.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        disc(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pr: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, redemption: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts a number to text, using currency format.
-         *
-         * @param number Is a number, a reference to a cell containing a number, or a formula that evaluates to a number.
-         * @param decimals Is the number of digits to the right of the decimal point. The number is rounded as necessary; if omitted, Decimals = 2.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        dollar(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, decimals?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Converts a dollar price, expressed as a fraction, into a dollar price, expressed as a decimal number.
-         *
-         * @param fractionalDollar Is a number expressed as a fraction.
-         * @param fraction Is the integer to use in the denominator of the fraction.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        dollarDe(fractionalDollar: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, fraction: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts a dollar price, expressed as a decimal number, into a dollar price, expressed as a fraction.
-         *
-         * @param decimalDollar Is a decimal number.
-         * @param fraction Is the integer to use in the denominator of a fraction.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        dollarFr(decimalDollar: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, fraction: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the annual duration of a security with periodic interest payments.
-         *
-         * @param settlement Is the security's settlement date, expressed as a serial date number.
-         * @param maturity Is the security's maturity date, expressed as a serial date number.
-         * @param coupon Is the security's annual coupon rate.
-         * @param yld Is the security's annual yield.
-         * @param frequency Is the number of coupon payments per year.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        duration(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, coupon: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, yld: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Rounds a number up, to the nearest integer or to the nearest multiple of significance.
-         *
-         * @param number Is the value you want to round.
-         * @param significance Is the multiple to which you want to round.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        ecma_Ceiling(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, significance: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the serial number of the date that is the indicated number of months before or after the start date.
-         *
-         * @param startDate Is a serial date number that represents the start date.
-         * @param months Is the number of months before or after startDate.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        edate(startDate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, months: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the effective annual interest rate.
-         *
-         * @param nominalRate Is the nominal interest rate.
-         * @param npery Is the number of compounding periods per year.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        effect(nominalRate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, npery: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the serial number of the last day of the month before or after a specified number of months.
-         *
-         * @param startDate Is a serial date number that represents the start date.
-         * @param months Is the number of months before or after the startDate.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        eoMonth(startDate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, months: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the error function.
-         *
-         * @param lowerLimit Is the lower bound for integrating ERF.
-         * @param upperLimit Is the upper bound for integrating ERF.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        erf(lowerLimit: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, upperLimit?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the complementary error function.
-         *
-         * @param x Is the lower bound for integrating ERF.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        erfC(x: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the complementary error function.
-         *
-         * @param X Is the lower bound for integrating ERFC.PRECISE.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        erfC_Precise(X: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the error function.
-         *
-         * @param X Is the lower bound for integrating ERF.PRECISE.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        erf_Precise(X: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns a number matching an error value.
-         *
-         * @param errorVal Is the error value for which you want the identifying number, and can be an actual error value or a reference to a cell containing an error value.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        error_Type(errorVal: string | number | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Rounds a positive number up and negative number down to the nearest even integer.
-         *
-         * @param number Is the value to round.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        even(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Checks whether two text strings are exactly the same, and returns TRUE or FALSE. EXACT is case-sensitive.
-         *
-         * @param text1 Is the first text string.
-         * @param text2 Is the second text string.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        exact(text1: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, text2: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<boolean>;
-        /**
-         *
-         * Returns e raised to the power of a given number.
-         *
-         * @param number Is the exponent applied to the base e. The constant e equals 2.71828182845904, the base of the natural logarithm.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        exp(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the exponential distribution.
-         *
-         * @param x Is the value of the function, a nonnegative number.
-         * @param lambda Is the parameter value, a positive number.
-         * @param cumulative Is a logical value for the function to return: the cumulative distribution function = TRUE; the probability density function = FALSE.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        expon_Dist(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, lambda: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the future value of an initial principal after applying a series of compound interest rates.
-         *
-         * @param principal Is the present value.
-         * @param schedule Is an array of interest rates to apply.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        fvschedule(principal: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, schedule: number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the (left-tailed) F probability distribution (degree of diversity) for two data sets.
-         *
-         * @param x Is the value at which to evaluate the function, a nonnegative number.
-         * @param degFreedom1 Is the numerator degrees of freedom, a number between 1 and 10^10, excluding 10^10.
-         * @param degFreedom2 Is the denominator degrees of freedom, a number between 1 and 10^10, excluding 10^10.
-         * @param cumulative Is a logical value for the function to return: the cumulative distribution function = TRUE; the probability density function = FALSE.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        f_Dist(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom1: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom2: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the (right-tailed) F probability distribution (degree of diversity) for two data sets.
-         *
-         * @param x Is the value at which to evaluate the function, a nonnegative number.
-         * @param degFreedom1 Is the numerator degrees of freedom, a number between 1 and 10^10, excluding 10^10.
-         * @param degFreedom2 Is the denominator degrees of freedom, a number between 1 and 10^10, excluding 10^10.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        f_Dist_RT(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom1: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom2: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the inverse of the (left-tailed) F probability distribution: if p = F.DIST(x,...), then F.INV(p,...) = x.
-         *
-         * @param probability Is a probability associated with the F cumulative distribution, a number between 0 and 1 inclusive.
-         * @param degFreedom1 Is the numerator degrees of freedom, a number between 1 and 10^10, excluding 10^10.
-         * @param degFreedom2 Is the denominator degrees of freedom, a number between 1 and 10^10, excluding 10^10.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        f_Inv(probability: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom1: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom2: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the inverse of the (right-tailed) F probability distribution: if p = F.DIST.RT(x,...), then F.INV.RT(p,...) = x.
-         *
-         * @param probability Is a probability associated with the F cumulative distribution, a number between 0 and 1 inclusive.
-         * @param degFreedom1 Is the numerator degrees of freedom, a number between 1 and 10^10, excluding 10^10.
-         * @param degFreedom2 Is the denominator degrees of freedom, a number between 1 and 10^10, excluding 10^10.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        f_Inv_RT(probability: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom1: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, degFreedom2: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the factorial of a number, equal to 1*2*3*...* Number.
-         *
-         * @param number Is the nonnegative number you want the factorial of.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        fact(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the double factorial of a number.
-         *
-         * @param number Is the value for which to return the double factorial.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        factDouble(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the logical value FALSE.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        false(): FunctionResult<boolean>;
-        /**
-         *
-         * Returns the starting position of one text string within another text string. FIND is case-sensitive.
-         *
-         * @param findText Is the text you want to find. Use double quotes (empty text) to match the first character in withinText; wildcard characters not allowed.
-         * @param withinText Is the text containing the text you want to find.
-         * @param startNum Specifies the character at which to start the search. The first character in withinText is character number 1. If omitted, startNum = 1.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        find(findText: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, withinText: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, startNum?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Finds the starting position of one text string within another text string. FINDB is case-sensitive. Use with double-byte character sets (DBCS).
-         *
-         * @param findText Is the text you want to find.
-         * @param withinText Is the text containing the text you want to find.
-         * @param startNum Specifies the character at which to start the search.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        findB(findText: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, withinText: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, startNum?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the Fisher transformation.
-         *
-         * @param x Is the value for which you want the transformation, a number between -1 and 1, excluding -1 and 1.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        fisher(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the inverse of the Fisher transformation: if y = FISHER(x), then FISHERINV(y) = x.
-         *
-         * @param y Is the value for which you want to perform the inverse of the transformation.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        fisherInv(y: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Rounds a number to the specified number of decimals and returns the result as text with or without commas.
-         *
-         * @param number Is the number you want to round and convert to text.
-         * @param decimals Is the number of digits to the right of the decimal point. If omitted, Decimals = 2.
-         * @param noCommas Is a logical value: do not display commas in the returned text = TRUE; do display commas in the returned text = FALSE or omitted.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        fixed(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, decimals?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, noCommas?: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Rounds a number down, to the nearest integer or to the nearest multiple of significance.
-         *
-         * @param number Is the value you want to round.
-         * @param significance Is the multiple to which you want to round.
-         * @param mode When given and nonzero this function will round towards zero.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        floor_Math(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, significance?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, mode?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Rounds a number down, to the nearest integer or to the nearest multiple of significance.
-         *
-         * @param number Is the numeric value you want to round.
-         * @param significance Is the multiple to which you want to round.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        floor_Precise(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, significance?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the future value of an investment based on periodic, constant payments and a constant interest rate.
-         *
-         * @param rate Is the interest rate per period. For example, use 6%/4 for quarterly payments at 6% APR.
-         * @param nper Is the total number of payment periods in the investment.
-         * @param pmt Is the payment made each period; it cannot change over the life of the investment.
-         * @param pv Is the present value, or the lump-sum amount that a series of future payments is worth now. If omitted, Pv = 0.
-         * @param type Is a value representing the timing of payment: payment at the beginning of the period = 1; payment at the end of the period = 0 or omitted.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        fv(rate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, nper: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pmt: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pv?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, type?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the Gamma function value.
-         *
-         * @param x Is the value for which you want to calculate Gamma.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        gamma(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the natural logarithm of the gamma function.
-         *
-         * @param x Is the value for which you want to calculate GAMMALN, a positive number.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        gammaLn(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the natural logarithm of the gamma function.
-         *
-         * @param x Is the value for which you want to calculate GAMMALN.PRECISE, a positive number.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        gammaLn_Precise(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the gamma distribution.
-         *
-         * @param x Is the value at which you want to evaluate the distribution, a nonnegative number.
-         * @param alpha Is a parameter to the distribution, a positive number.
-         * @param beta Is a parameter to the distribution, a positive number. If beta = 1, GAMMA.DIST returns the standard gamma distribution.
-         * @param cumulative Is a logical value: return the cumulative distribution function = TRUE; return the probability mass function = FALSE or omitted.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        gamma_Dist(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, alpha: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, beta: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the inverse of the gamma cumulative distribution: if p = GAMMA.DIST(x,...), then GAMMA.INV(p,...) = x.
-         *
-         * @param probability Is the probability associated with the gamma distribution, a number between 0 and 1, inclusive.
-         * @param alpha Is a parameter to the distribution, a positive number.
-         * @param beta Is a parameter to the distribution, a positive number. If beta = 1, GAMMA.INV returns the inverse of the standard gamma distribution.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        gamma_Inv(probability: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, alpha: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, beta: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns 0.5 less than the standard normal cumulative distribution.
-         *
-         * @param x Is the value for which you want the distribution.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        gauss(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the greatest common divisor.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 values.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        gcd(...values: Array<number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Tests whether a number is greater than a threshold value.
-         *
-         * @param number Is the value to test against step.
-         * @param step Is the threshold value.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        geStep(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, step?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the geometric mean of an array or range of positive numeric data.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 numbers or names, arrays, or references that contain numbers for which you want the mean.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        geoMean(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Looks for a value in the top row of a table or array of values and returns the value in the same column from a row you specify.
-         *
-         * @param lookupValue Is the value to be found in the first row of the table and can be a value, a reference, or a text string.
-         * @param tableArray Is a table of text, numbers, or logical values in which data is looked up. tableArray can be a reference to a range or a range name.
-         * @param rowIndexNum Is the row number in tableArray from which the matching value should be returned. The first row of values in the table is row 1.
-         * @param rangeLookup Is a logical value: to find the closest match in the top row (sorted in ascending order) = TRUE or omitted; find an exact match = FALSE.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        hlookup(lookupValue: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, tableArray: Excel.Range | number | Excel.RangeReference | Excel.FunctionResult<any>, rowIndexNum: Excel.Range | number | Excel.RangeReference | Excel.FunctionResult<any>, rangeLookup?: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number | string | boolean>;
-        /**
-         *
-         * Returns the harmonic mean of a data set of positive numbers: the reciprocal of the arithmetic mean of reciprocals.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 numbers or names, arrays, or references that contain numbers for which you want the harmonic mean.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        harMean(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Converts a Hexadecimal number to binary.
-         *
-         * @param number Is the hexadecimal number you want to convert.
-         * @param places Is the number of characters to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        hex2Bin(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, places?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts a hexadecimal number to decimal.
-         *
-         * @param number Is the hexadecimal number you want to convert.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        hex2Dec(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts a hexadecimal number to octal.
-         *
-         * @param number Is the hexadecimal number you want to convert.
-         * @param places Is the number of characters to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        hex2Oct(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, places?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the hour as a number from 0 (12:00 A.M.) to 23 (11:00 P.M.).
-         *
-         * @param serialNumber Is a number in the date-time code used by Microsoft Excel, or text in time format, such as 16:48:00 or 4:48:00 PM.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        hour(serialNumber: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the hypergeometric distribution.
-         *
-         * @param sampleS Is the number of successes in the sample.
-         * @param numberSample Is the size of the sample.
-         * @param populationS Is the number of successes in the population.
-         * @param numberPop Is the population size.
-         * @param cumulative Is a logical value: for the cumulative distribution function, use TRUE; for the probability density function, use FALSE.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        hypGeom_Dist(sampleS: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numberSample: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, populationS: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numberPop: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Creates a shortcut or jump that opens a document stored on your hard drive, a network server, or on the Internet.
-         *
-         * @param linkLocation Is the text giving the path and file name to the document to be opened, a hard drive location, UNC address, or URL path.
-         * @param friendlyName Is text or a number that is displayed in the cell. If omitted, the cell displays the linkLocation text.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        hyperlink(linkLocation: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, friendlyName?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number | string | boolean>;
-        /**
-         *
-         * Rounds a number up, to the nearest integer or to the nearest multiple of significance.
-         *
-         * @param number Is the value you want to round.
-         * @param significance Is the optional multiple to which you want to round.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        iso_Ceiling(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, significance?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Checks whether a condition is met, and returns one value if TRUE, and another value if FALSE.
-         *
-         * @param logicalTest Is any value or expression that can be evaluated to TRUE or FALSE.
-         * @param valueIfTrue Is the value that is returned if logicalTest is TRUE. If omitted, TRUE is returned. You can nest up to seven IF functions.
-         * @param valueIfFalse Is the value that is returned if logicalTest is FALSE. If omitted, FALSE is returned.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        if(logicalTest: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, valueIfTrue?: Excel.Range | number | string | boolean | Excel.RangeReference | Excel.FunctionResult<any>, valueIfFalse?: Excel.Range | number | string | boolean | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number | string | boolean>;
-        /**
-         *
-         * Returns the absolute value (modulus) of a complex number.
-         *
-         * @param inumber Is a complex number for which you want the absolute value.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imAbs(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the argument q, an angle expressed in radians.
-         *
-         * @param inumber Is a complex number for which you want the argument.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imArgument(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the complex conjugate of a complex number.
-         *
-         * @param inumber Is a complex number for which you want the conjugate.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imConjugate(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the cosine of a complex number.
-         *
-         * @param inumber Is a complex number for which you want the cosine.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imCos(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the hyperbolic cosine of a complex number.
-         *
-         * @param inumber Is a complex number for which you want the hyperbolic cosine.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imCosh(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the cotangent of a complex number.
-         *
-         * @param inumber Is a complex number for which you want the cotangent.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imCot(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the cosecant of a complex number.
-         *
-         * @param inumber Is a complex number for which you want the cosecant.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imCsc(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the hyperbolic cosecant of a complex number.
-         *
-         * @param inumber Is a complex number for which you want the hyperbolic cosecant.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imCsch(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the quotient of two complex numbers.
-         *
-         * @param inumber1 Is the complex numerator or dividend.
-         * @param inumber2 Is the complex denominator or divisor.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imDiv(inumber1: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, inumber2: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the exponential of a complex number.
-         *
-         * @param inumber Is a complex number for which you want the exponential.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imExp(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the natural logarithm of a complex number.
-         *
-         * @param inumber Is a complex number for which you want the natural logarithm.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imLn(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the base-10 logarithm of a complex number.
-         *
-         * @param inumber Is a complex number for which you want the common logarithm.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imLog10(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the base-2 logarithm of a complex number.
-         *
-         * @param inumber Is a complex number for which you want the base-2 logarithm.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imLog2(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns a complex number raised to an integer power.
-         *
-         * @param inumber Is a complex number you want to raise to a power.
-         * @param number Is the power to which you want to raise the complex number.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imPower(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the product of 1 to 255 complex numbers.
-         *
-         * @param values Inumber1, Inumber2,... are from 1 to 255 complex numbers to multiply.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imProduct(...values: Array<Excel.Range | number | string | boolean | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Returns the real coefficient of a complex number.
-         *
-         * @param inumber Is a complex number for which you want the real coefficient.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imReal(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the secant of a complex number.
-         *
-         * @param inumber Is a complex number for which you want the secant.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imSec(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the hyperbolic secant of a complex number.
-         *
-         * @param inumber Is a complex number for which you want the hyperbolic secant.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imSech(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the sine of a complex number.
-         *
-         * @param inumber Is a complex number for which you want the sine.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imSin(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the hyperbolic sine of a complex number.
-         *
-         * @param inumber Is a complex number for which you want the hyperbolic sine.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imSinh(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the square root of a complex number.
-         *
-         * @param inumber Is a complex number for which you want the square root.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imSqrt(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the difference of two complex numbers.
-         *
-         * @param inumber1 Is the complex number from which to subtract inumber2.
-         * @param inumber2 Is the complex number to subtract from inumber1.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imSub(inumber1: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, inumber2: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the sum of complex numbers.
-         *
-         * @param values List of parameters, whose elements are from 1 to 255 complex numbers to add.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imSum(...values: Array<Excel.Range | number | string | boolean | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Returns the tangent of a complex number.
-         *
-         * @param inumber Is a complex number for which you want the tangent.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imTan(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the imaginary coefficient of a complex number.
-         *
-         * @param inumber Is a complex number for which you want the imaginary coefficient.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        imaginary(inumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Rounds a number down to the nearest integer.
-         *
-         * @param number Is the real number you want to round down to an integer.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        int(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the interest rate for a fully invested security.
-         *
-         * @param settlement Is the security's settlement date, expressed as a serial date number.
-         * @param maturity Is the security's maturity date, expressed as a serial date number.
-         * @param investment Is the amount invested in the security.
-         * @param redemption Is the amount to be received at maturity.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        intRate(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, investment: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, redemption: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the interest payment for a given period for an investment, based on periodic, constant payments and a constant interest rate.
-         *
-         * @param rate Is the interest rate per period. For example, use 6%/4 for quarterly payments at 6% APR.
-         * @param per Is the period for which you want to find the interest and must be in the range 1 to Nper.
-         * @param nper Is the total number of payment periods in an investment.
-         * @param pv Is the present value, or the lump-sum amount that a series of future payments is worth now.
-         * @param fv Is the future value, or a cash balance you want to attain after the last payment is made. If omitted, Fv = 0.
-         * @param type Is a logical value representing the timing of payment: at the end of the period = 0 or omitted, at the beginning of the period = 1.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        ipmt(rate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, per: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, nper: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pv: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, fv?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, type?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the internal rate of return for a series of cash flows.
-         *
-         * @param values Is an array or a reference to cells that contain numbers for which you want to calculate the internal rate of return.
-         * @param guess Is a number that you guess is close to the result of IRR; 0.1 (10 percent) if omitted.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        irr(values: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, guess?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Checks whether a value is an error (#VALUE!, #REF!, #DIV/0!, #NUM!, #NAME?, or #NULL!) excluding #N/A, and returns TRUE or FALSE.
-         *
-         * @param value Is the value you want to test. Value can refer to a cell, a formula, or a name that refers to a cell, formula, or value.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        isErr(value: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<boolean>;
-        /**
-         *
-         * Checks whether a value is an error (#N/A, #VALUE!, #REF!, #DIV/0!, #NUM!, #NAME?, or #NULL!), and returns TRUE or FALSE.
-         *
-         * @param value Is the value you want to test. Value can refer to a cell, a formula, or a name that refers to a cell, formula, or value.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        isError(value: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<boolean>;
-        /**
-         *
-         * Returns TRUE if the number is even.
-         *
-         * @param number Is the value to test.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        isEven(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Checks whether a reference is to a cell containing a formula, and returns TRUE or FALSE.
-         *
-         * @param reference Is a reference to the cell you want to test.  Reference can be a cell reference, a formula, or name that refers to a cell.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        isFormula(reference: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<boolean>;
-        /**
-         *
-         * Checks whether a value is a logical value (TRUE or FALSE), and returns TRUE or FALSE.
-         *
-         * @param value Is the value you want to test. Value can refer to a cell, a formula, or a name that refers to a cell, formula, or value.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        isLogical(value: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<boolean>;
-        /**
-         *
-         * Checks whether a value is #N/A, and returns TRUE or FALSE.
-         *
-         * @param value Is the value you want to test. Value can refer to a cell, a formula, or a name that refers to a cell, formula, or value.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        isNA(value: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<boolean>;
-        /**
-         *
-         * Checks whether a value is not text (blank cells are not text), and returns TRUE or FALSE.
-         *
-         * @param value Is the value you want tested: a cell; a formula; or a name referring to a cell, formula, or value.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        isNonText(value: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<boolean>;
-        /**
-         *
-         * Checks whether a value is a number, and returns TRUE or FALSE.
-         *
-         * @param value Is the value you want to test. Value can refer to a cell, a formula, or a name that refers to a cell, formula, or value.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        isNumber(value: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<boolean>;
-        /**
-         *
-         * Returns TRUE if the number is odd.
-         *
-         * @param number Is the value to test.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        isOdd(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Checks whether a value is text, and returns TRUE or FALSE.
-         *
-         * @param value Is the value you want to test. Value can refer to a cell, a formula, or a name that refers to a cell, formula, or value.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        isText(value: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<boolean>;
-        /**
-         *
-         * Returns the ISO week number in the year for a given date.
-         *
-         * @param date Is the date-time code used by Microsoft Excel for date and time calculation.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        isoWeekNum(date: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the interest paid during a specific period of an investment.
-         *
-         * @param rate Interest rate per period. For example, use 6%/4 for quarterly payments at 6% APR.
-         * @param per Period for which you want to find the interest.
-         * @param nper Number of payment periods in an investment.
-         * @param pv Lump sum amount that a series of future payments is right now.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        ispmt(rate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, per: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, nper: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pv: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Checks whether a value is a reference, and returns TRUE or FALSE.
-         *
-         * @param value Is the value you want to test. Value can refer to a cell, a formula, or a name that refers to a cell, formula, or value.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        isref(value: Excel.Range | number | string | boolean | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<boolean>;
-        /**
-         *
-         * Returns the kurtosis of a data set.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 numbers or names, arrays, or references that contain numbers for which you want the kurtosis.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        kurt(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Returns the k-th largest value in a data set. For example, the fifth largest number.
-         *
-         * @param array Is the array or range of data for which you want to determine the k-th largest value.
-         * @param k Is the position (from the largest) in the array or cell range of the value to return.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        large(array: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, k: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the least common multiple.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 values for which you want the least common multiple.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        lcm(...values: Array<number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Returns the specified number of characters from the start of a text string.
-         *
-         * @param text Is the text string containing the characters you want to extract.
-         * @param numChars Specifies how many characters you want LEFT to extract; 1 if omitted.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        left(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numChars?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Returns the specified number of characters from the start of a text string. Use with double-byte character sets (DBCS).
-         *
-         * @param text Is the text string containing the characters you want to extract.
-         * @param numBytes Specifies how many characters you want LEFT to return.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        leftb(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numBytes?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Returns the number of characters in a text string.
-         *
-         * @param text Is the text whose length you want to find. Spaces count as characters.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        len(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the number of characters in a text string. Use with double-byte character sets (DBCS).
-         *
-         * @param text Is the text whose length you want to find.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        lenb(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the natural logarithm of a number.
-         *
-         * @param number Is the positive real number for which you want the natural logarithm.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        ln(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the logarithm of a number to the base you specify.
-         *
-         * @param number Is the positive real number for which you want the logarithm.
-         * @param base Is the base of the logarithm; 10 if omitted.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        log(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, base?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the base-10 logarithm of a number.
-         *
-         * @param number Is the positive real number for which you want the base-10 logarithm.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        log10(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the lognormal distribution of x, where ln(x) is normally distributed with parameters Mean and Standard_dev.
-         *
-         * @param x Is the value at which to evaluate the function, a positive number.
-         * @param mean Is the mean of ln(x).
-         * @param standardDev Is the standard deviation of ln(x), a positive number.
-         * @param cumulative Is a logical value: for the cumulative distribution function, use TRUE; for the probability density function, use FALSE.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        logNorm_Dist(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, mean: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, standardDev: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the inverse of the lognormal cumulative distribution function of x, where ln(x) is normally distributed with parameters Mean and Standard_dev.
-         *
-         * @param probability Is a probability associated with the lognormal distribution, a number between 0 and 1, inclusive.
-         * @param mean Is the mean of ln(x).
-         * @param standardDev Is the standard deviation of ln(x), a positive number.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        logNorm_Inv(probability: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, mean: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, standardDev: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Looks up a value either from a one-row or one-column range or from an array. Provided for backward compatibility.
-         *
-         * @param lookupValue Is a value that LOOKUP searches for in lookupVector and can be a number, text, a logical value, or a name or reference to a value.
-         * @param lookupVector Is a range that contains only one row or one column of text, numbers, or logical values, placed in ascending order.
-         * @param resultVector Is a range that contains only one row or column, the same size as lookupVector.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        lookup(lookupValue: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, lookupVector: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, resultVector?: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number | string | boolean>;
-        /**
-         *
-         * Converts all letters in a text string to lowercase.
-         *
-         * @param text Is the text you want to convert to lowercase. Characters in Text that are not letters are not changed.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        lower(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Returns the Macauley modified duration for a security with an assumed par value of $100.
-         *
-         * @param settlement Is the security's settlement date, expressed as a serial date number.
-         * @param maturity Is the security's maturity date, expressed as a serial date number.
-         * @param coupon Is the security's annual coupon rate.
-         * @param yld Is the security's annual yield.
-         * @param frequency Is the number of coupon payments per year.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        mduration(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, coupon: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, yld: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the internal rate of return for a series of periodic cash flows, considering both cost of investment and interest on reinvestment of cash.
-         *
-         * @param values Is an array or a reference to cells that contain numbers that represent a series of payments (negative) and income (positive) at regular periods.
-         * @param financeRate Is the interest rate you pay on the money used in the cash flows.
-         * @param reinvestRate Is the interest rate you receive on the cash flows as you reinvest them.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        mirr(values: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, financeRate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, reinvestRate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns a number rounded to the desired multiple.
-         *
-         * @param number Is the value to round.
-         * @param multiple Is the multiple to which you want to round number.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        mround(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, multiple: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the relative position of an item in an array that matches a specified value in a specified order.
-         *
-         * @param lookupValue Is the value you use to find the value you want in the array, a number, text, or logical value, or a reference to one of these.
-         * @param lookupArray Is a contiguous range of cells containing possible lookup values, an array of values, or a reference to an array.
-         * @param matchType Is a number 1, 0, or -1 indicating which value to return.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        match(lookupValue: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, lookupArray: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, matchType?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the largest value in a set of values. Ignores logical values and text.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 numbers, empty cells, logical values, or text numbers for which you want the maximum.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        max(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Returns the largest value in a set of values. Does not ignore logical values and text.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 numbers, empty cells, logical values, or text numbers for which you want the maximum.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        maxA(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Returns the median, or the number in the middle of the set of given numbers.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 numbers or names, arrays, or references that contain numbers for which you want the median.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        median(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Returns the characters from the middle of a text string, given a starting position and length.
-         *
-         * @param text Is the text string from which you want to extract the characters.
-         * @param startNum Is the position of the first character you want to extract. The first character in Text is 1.
-         * @param numChars Specifies how many characters to return from Text.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        mid(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, startNum: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numChars: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Returns characters from the middle of a text string, given a starting position and length. Use with double-byte character sets (DBCS).
-         *
-         * @param text Is the text string containing the characters you want to extract.
-         * @param startNum Is the position of the first character you want to extract in text.
-         * @param numBytes Specifies how many characters to return from text.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        midb(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, startNum: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numBytes: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Returns the smallest number in a set of values. Ignores logical values and text.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 numbers, empty cells, logical values, or text numbers for which you want the minimum.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        min(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Returns the smallest value in a set of values. Does not ignore logical values and text.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 numbers, empty cells, logical values, or text numbers for which you want the minimum.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        minA(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Returns the minute, a number from 0 to 59.
-         *
-         * @param serialNumber Is a number in the date-time code used by Microsoft Excel or text in time format, such as 16:48:00 or 4:48:00 PM.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        minute(serialNumber: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the remainder after a number is divided by a divisor.
-         *
-         * @param number Is the number for which you want to find the remainder after the division is performed.
-         * @param divisor Is the number by which you want to divide Number.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        mod(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, divisor: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the month, a number from 1 (January) to 12 (December).
-         *
-         * @param serialNumber Is a number in the date-time code used by Microsoft Excel.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        month(serialNumber: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the multinomial of a set of numbers.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 values for which you want the multinomial.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        multiNomial(...values: Array<number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Converts non-number value to a number, dates to serial numbers, TRUE to 1, anything else to 0 (zero).
-         *
-         * @param value Is the value you want converted.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        n(value: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the number of periods for an investment based on periodic, constant payments and a constant interest rate.
-         *
-         * @param rate Is the interest rate per period. For example, use 6%/4 for quarterly payments at 6% APR.
-         * @param pmt Is the payment made each period; it cannot change over the life of the investment.
-         * @param pv Is the present value, or the lump-sum amount that a series of future payments is worth now.
-         * @param fv Is the future value, or a cash balance you want to attain after the last payment is made. If omitted, zero is used.
-         * @param type Is a logical value: payment at the beginning of the period = 1; payment at the end of the period = 0 or omitted.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        nper(rate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pmt: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pv: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, fv?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, type?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the error value #N/A (value not available).
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        na(): FunctionResult<number | string>;
-        /**
-         *
-         * Returns the negative binomial distribution, the probability that there will be Number_f failures before the Number_s-th success, with Probability_s probability of a success.
-         *
-         * @param numberF Is the number of failures.
-         * @param numberS Is the threshold number of successes.
-         * @param probabilityS Is the probability of a success; a number between 0 and 1.
-         * @param cumulative Is a logical value: for the cumulative distribution function, use TRUE; for the probability mass function, use FALSE.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        negBinom_Dist(numberF: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numberS: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, probabilityS: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the number of whole workdays between two dates.
-         *
-         * @param startDate Is a serial date number that represents the start date.
-         * @param endDate Is a serial date number that represents the end date.
-         * @param holidays Is an optional set of one or more serial date numbers to exclude from the working calendar, such as state and federal holidays and floating holidays.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        networkDays(startDate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, endDate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, holidays?: number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the number of whole workdays between two dates with custom weekend parameters.
-         *
-         * @param startDate Is a serial date number that represents the start date.
-         * @param endDate Is a serial date number that represents the end date.
-         * @param weekend Is a number or string specifying when weekends occur.
-         * @param holidays Is an optional set of one or more serial date numbers to exclude from the working calendar, such as state and federal holidays and floating holidays.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        networkDays_Intl(startDate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, endDate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, weekend?: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, holidays?: number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the annual nominal interest rate.
-         *
-         * @param effectRate Is the effective interest rate.
-         * @param npery Is the number of compounding periods per year.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        nominal(effectRate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, npery: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the normal distribution for the specified mean and standard deviation.
-         *
-         * @param x Is the value for which you want the distribution.
-         * @param mean Is the arithmetic mean of the distribution.
-         * @param standardDev Is the standard deviation of the distribution, a positive number.
-         * @param cumulative Is a logical value: for the cumulative distribution function, use TRUE; for the probability density function, use FALSE.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        norm_Dist(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, mean: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, standardDev: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the inverse of the normal cumulative distribution for the specified mean and standard deviation.
-         *
-         * @param probability Is a probability corresponding to the normal distribution, a number between 0 and 1 inclusive.
-         * @param mean Is the arithmetic mean of the distribution.
-         * @param standardDev Is the standard deviation of the distribution, a positive number.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        norm_Inv(probability: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, mean: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, standardDev: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the standard normal distribution (has a mean of zero and a standard deviation of one).
-         *
-         * @param z Is the value for which you want the distribution.
-         * @param cumulative Is a logical value for the function to return: the cumulative distribution function = TRUE; the probability density function = FALSE.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        norm_S_Dist(z: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the inverse of the standard normal cumulative distribution (has a mean of zero and a standard deviation of one).
-         *
-         * @param probability Is a probability corresponding to the normal distribution, a number between 0 and 1 inclusive.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        norm_S_Inv(probability: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Changes FALSE to TRUE, or TRUE to FALSE.
-         *
-         * @param logical Is a value or expression that can be evaluated to TRUE or FALSE.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        not(logical: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<boolean>;
-        /**
-         *
-         * Returns the current date and time formatted as a date and time.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        now(): FunctionResult<number>;
-        /**
-         *
-         * Returns the net present value of an investment based on a discount rate and a series of future payments (negative values) and income (positive values).
-         *
-         * @param rate Is the rate of discount over the length of one period.
-         * @param values List of parameters, whose elements are 1 to 254 payments and income, equally spaced in time and occurring at the end of each period.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        npv(rate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, ...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Converts text to number in a locale-independent manner.
-         *
-         * @param text Is the string representing the number you want to convert.
-         * @param decimalSeparator Is the character used as the decimal separator in the string.
-         * @param groupSeparator Is the character used as the group separator in the string.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        numberValue(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, decimalSeparator?: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, groupSeparator?: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts an octal number to binary.
-         *
-         * @param number Is the octal number you want to convert.
-         * @param places Is the number of characters to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        oct2Bin(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, places?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts an octal number to decimal.
-         *
-         * @param number Is the octal number you want to convert.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        oct2Dec(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts an octal number to hexadecimal.
-         *
-         * @param number Is the octal number you want to convert.
-         * @param places Is the number of characters to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        oct2Hex(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, places?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Rounds a positive number up and negative number down to the nearest odd integer.
-         *
-         * @param number Is the value to round.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        odd(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the price per $100 face value of a security with an odd first period.
-         *
-         * @param settlement Is the security's settlement date, expressed as a serial date number.
-         * @param maturity Is the security's maturity date, expressed as a serial date number.
-         * @param issue Is the security's issue date, expressed as a serial date number.
-         * @param firstCoupon Is the security's first coupon date, expressed as a serial date number.
-         * @param rate Is the security's interest rate.
-         * @param yld Is the security's annual yield.
-         * @param redemption Is the security's redemption value per $100 face value.
-         * @param frequency Is the number of coupon payments per year.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        oddFPrice(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, issue: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, firstCoupon: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, yld: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, redemption: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the yield of a security with an odd first period.
-         *
-         * @param settlement Is the security's settlement date, expressed as a serial date number.
-         * @param maturity Is the security's maturity date, expressed as a serial date number.
-         * @param issue Is the security's issue date, expressed as a serial date number.
-         * @param firstCoupon Is the security's first coupon date, expressed as a serial date number.
-         * @param rate Is the security's interest rate.
-         * @param pr Is the security's price.
-         * @param redemption Is the security's redemption value per $100 face value.
-         * @param frequency Is the number of coupon payments per year.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        oddFYield(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, issue: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, firstCoupon: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pr: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, redemption: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the price per $100 face value of a security with an odd last period.
-         *
-         * @param settlement Is the security's settlement date, expressed as a serial date number.
-         * @param maturity Is the security's maturity date, expressed as a serial date number.
-         * @param lastInterest Is the security's last coupon date, expressed as a serial date number.
-         * @param rate Is the security's interest rate.
-         * @param yld Is the security's annual yield.
-         * @param redemption Is the security's redemption value per $100 face value.
-         * @param frequency Is the number of coupon payments per year.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        oddLPrice(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, lastInterest: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, yld: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, redemption: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the yield of a security with an odd last period.
-         *
-         * @param settlement Is the security's settlement date, expressed as a serial date number.
-         * @param maturity Is the security's maturity date, expressed as a serial date number.
-         * @param lastInterest Is the security's last coupon date, expressed as a serial date number.
-         * @param rate Is the security's interest rate.
-         * @param pr Is the security's price.
-         * @param redemption Is the security's redemption value per $100 face value.
-         * @param frequency Is the number of coupon payments per year.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        oddLYield(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, lastInterest: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pr: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, redemption: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Checks whether any of the arguments are TRUE, and returns TRUE or FALSE. Returns FALSE only if all arguments are FALSE.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 conditions that you want to test that can be either TRUE or FALSE.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        or(...values: Array<boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<boolean>;
-        /**
-         *
-         * Returns the number of periods required by an investment to reach a specified value.
-         *
-         * @param rate Is the interest rate per period.
-         * @param pv Is the present value of the investment.
-         * @param fv Is the desired future value of the investment.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        pduration(rate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pv: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, fv: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the rank of a value in a data set as a percentage of the data set as a percentage (0..1, exclusive) of the data set.
-         *
-         * @param array Is the array or range of data with numeric values that defines relative standing.
-         * @param x Is the value for which you want to know the rank.
-         * @param significance Is an optional value that identifies the number of significant digits for the returned percentage, three digits if omitted (0.xxx%).
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        percentRank_Exc(array: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, significance?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the rank of a value in a data set as a percentage of the data set as a percentage (0..1, inclusive) of the data set.
-         *
-         * @param array Is the array or range of data with numeric values that defines relative standing.
-         * @param x Is the value for which you want to know the rank.
-         * @param significance Is an optional value that identifies the number of significant digits for the returned percentage, three digits if omitted (0.xxx%).
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        percentRank_Inc(array: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, significance?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the k-th percentile of values in a range, where k is in the range 0..1, exclusive.
-         *
-         * @param array Is the array or range of data that defines relative standing.
-         * @param k Is the percentile value that is between 0 through 1, inclusive.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        percentile_Exc(array: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, k: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the k-th percentile of values in a range, where k is in the range 0..1, inclusive.
-         *
-         * @param array Is the array or range of data that defines relative standing.
-         * @param k Is the percentile value that is between 0 through 1, inclusive.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        percentile_Inc(array: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, k: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the number of permutations for a given number of objects that can be selected from the total objects.
-         *
-         * @param number Is the total number of objects.
-         * @param numberChosen Is the number of objects in each permutation.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        permut(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numberChosen: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the number of permutations for a given number of objects (with repetitions) that can be selected from the total objects.
-         *
-         * @param number Is the total number of objects.
-         * @param numberChosen Is the number of objects in each permutation.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        permutationa(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numberChosen: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the value of the density function for a standard normal distribution.
-         *
-         * @param x Is the number for which you want the density of the standard normal distribution.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        phi(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the value of Pi, 3.14159265358979, accurate to 15 digits.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        pi(): FunctionResult<number>;
-        /**
-         *
-         * Calculates the payment for a loan based on constant payments and a constant interest rate.
-         *
-         * @param rate Is the interest rate per period for the loan. For example, use 6%/4 for quarterly payments at 6% APR.
-         * @param nper Is the total number of payments for the loan.
-         * @param pv Is the present value: the total amount that a series of future payments is worth now.
-         * @param fv Is the future value, or a cash balance you want to attain after the last payment is made, 0 (zero) if omitted.
-         * @param type Is a logical value: payment at the beginning of the period = 1; payment at the end of the period = 0 or omitted.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        pmt(rate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, nper: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pv: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, fv?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, type?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the Poisson distribution.
-         *
-         * @param x Is the number of events.
-         * @param mean Is the expected numeric value, a positive number.
-         * @param cumulative Is a logical value: for the cumulative Poisson probability, use TRUE; for the Poisson probability mass function, use FALSE.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        poisson_Dist(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, mean: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the result of a number raised to a power.
-         *
-         * @param number Is the base number, any real number.
-         * @param power Is the exponent, to which the base number is raised.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        power(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, power: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the payment on the principal for a given investment based on periodic, constant payments and a constant interest rate.
-         *
-         * @param rate Is the interest rate per period. For example, use 6%/4 for quarterly payments at 6% APR.
-         * @param per Specifies the period and must be in the range 1 to nper.
-         * @param nper Is the total number of payment periods in an investment.
-         * @param pv Is the present value: the total amount that a series of future payments is worth now.
-         * @param fv Is the future value, or cash balance you want to attain after the last payment is made.
-         * @param type Is a logical value: payment at the beginning of the period = 1; payment at the end of the period = 0 or omitted.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        ppmt(rate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, per: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, nper: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pv: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, fv?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, type?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the price per $100 face value of a security that pays periodic interest.
-         *
-         * @param settlement Is the security's settlement date, expressed as a serial date number.
-         * @param maturity Is the security's maturity date, expressed as a serial date number.
-         * @param rate Is the security's annual coupon rate.
-         * @param yld Is the security's annual yield.
-         * @param redemption Is the security's redemption value per $100 face value.
-         * @param frequency Is the number of coupon payments per year.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        price(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, yld: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, redemption: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the price per $100 face value of a discounted security.
-         *
-         * @param settlement Is the security's settlement date, expressed as a serial date number.
-         * @param maturity Is the security's maturity date, expressed as a serial date number.
-         * @param discount Is the security's discount rate.
-         * @param redemption Is the security's redemption value per $100 face value.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        priceDisc(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, discount: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, redemption: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the price per $100 face value of a security that pays interest at maturity.
-         *
-         * @param settlement Is the security's settlement date, expressed as a serial date number.
-         * @param maturity Is the security's maturity date, expressed as a serial date number.
-         * @param issue Is the security's issue date, expressed as a serial date number.
-         * @param rate Is the security's interest rate at date of issue.
-         * @param yld Is the security's annual yield.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        priceMat(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, issue: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, yld: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Multiplies all the numbers given as arguments.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 numbers, logical values, or text representations of numbers that you want to multiply.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        product(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Converts a text string to proper case; the first letter in each word to uppercase, and all other letters to lowercase.
-         *
-         * @param text Is text enclosed in quotation marks, a formula that returns text, or a reference to a cell containing text to partially capitalize.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        proper(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Returns the present value of an investment: the total amount that a series of future payments is worth now.
-         *
-         * @param rate Is the interest rate per period. For example, use 6%/4 for quarterly payments at 6% APR.
-         * @param nper Is the total number of payment periods in an investment.
-         * @param pmt Is the payment made each period and cannot change over the life of the investment.
-         * @param fv Is the future value, or a cash balance you want to attain after the last payment is made.
-         * @param type Is a logical value: payment at the beginning of the period = 1; payment at the end of the period = 0 or omitted.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        pv(rate: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, nper: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pmt: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, fv?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, type?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the quartile of a data set, based on percentile values from 0..1, exclusive.
-         *
-         * @param array Is the array or cell range of numeric values for which you want the quartile value.
-         * @param quart Is a number: minimum value = 0; 1st quartile = 1; median value = 2; 3rd quartile = 3; maximum value = 4.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        quartile_Exc(array: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, quart: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the quartile of a data set, based on percentile values from 0..1, inclusive.
-         *
-         * @param array Is the array or cell range of numeric values for which you want the quartile value.
-         * @param quart Is a number: minimum value = 0; 1st quartile = 1; median value = 2; 3rd quartile = 3; maximum value = 4.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        quartile_Inc(array: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, quart: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the integer portion of a division.
-         *
-         * @param numerator Is the dividend.
-         * @param denominator Is the divisor.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        quotient(numerator: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, denominator: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts degrees to radians.
-         *
-         * @param angle Is an angle in degrees that you want to convert.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        radians(angle: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns a random number greater than or equal to 0 and less than 1, evenly distributed (changes on recalculation).
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        rand(): FunctionResult<number>;
-        /**
-         *
-         * Returns a random number between the numbers you specify.
-         *
-         * @param bottom Is the smallest integer RANDBETWEEN will return.
-         * @param top Is the largest integer RANDBETWEEN will return.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        randBetween(bottom: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, top: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the rank of a number in a list of numbers: its size relative to other values in the list; if more than one value has the same rank, the average rank is returned.
-         *
-         * @param number Is the number for which you want to find the rank.
-         * @param ref Is an array of, or a reference to, a list of numbers. Nonnumeric values are ignored.
-         * @param order Is a number: rank in the list sorted descending = 0 or omitted; rank in the list sorted ascending = any nonzero value.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        rank_Avg(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, ref: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, order?: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the rank of a number in a list of numbers: its size relative to other values in the list; if more than one value has the same rank, the top rank of that set of values is returned.
-         *
-         * @param number Is the number for which you want to find the rank.
-         * @param ref Is an array of, or a reference to, a list of numbers. Nonnumeric values are ignored.
-         * @param order Is a number: rank in the list sorted descending = 0 or omitted; rank in the list sorted ascending = any nonzero value.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        rank_Eq(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, ref: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, order?: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the interest rate per period of a loan or an investment. For example, use 6%/4 for quarterly payments at 6% APR.
-         *
-         * @param nper Is the total number of payment periods for the loan or investment.
-         * @param pmt Is the payment made each period and cannot change over the life of the loan or investment.
-         * @param pv Is the present value: the total amount that a series of future payments is worth now.
-         * @param fv Is the future value, or a cash balance you want to attain after the last payment is made. If omitted, uses Fv = 0.
-         * @param type Is a logical value: payment at the beginning of the period = 1; payment at the end of the period = 0 or omitted.
-         * @param guess Is your guess for what the rate will be; if omitted, Guess = 0.1 (10 percent).
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        rate(nper: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pmt: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pv: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, fv?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, type?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, guess?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the amount received at maturity for a fully invested security.
-         *
-         * @param settlement Is the security's settlement date, expressed as a serial date number.
-         * @param maturity Is the security's maturity date, expressed as a serial date number.
-         * @param investment Is the amount invested in the security.
-         * @param discount Is the security's discount rate.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        received(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, investment: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, discount: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Replaces part of a text string with a different text string.
-         *
-         * @param oldText Is text in which you want to replace some characters.
-         * @param startNum Is the position of the character in oldText that you want to replace with newText.
-         * @param numChars Is the number of characters in oldText that you want to replace.
-         * @param newText Is the text that will replace characters in oldText.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        replace(oldText: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, startNum: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numChars: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, newText: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Replaces part of a text string with a different text string. Use with double-byte character sets (DBCS).
-         *
-         * @param oldText Is text in which you want to replace some characters.
-         * @param startNum Is the position of the character in oldText that you want to replace with newText.
-         * @param numBytes Is the number of characters in oldText that you want to replace with newText.
-         * @param newText Is the text that will replace characters in oldText.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        replaceB(oldText: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, startNum: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numBytes: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, newText: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Repeats text a given number of times. Use REPT to fill a cell with a number of instances of a text string.
-         *
-         * @param text Is the text you want to repeat.
-         * @param numberTimes Is a positive number specifying the number of times to repeat text.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        rept(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numberTimes: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Returns the specified number of characters from the end of a text string.
-         *
-         * @param text Is the text string that contains the characters you want to extract.
-         * @param numChars Specifies how many characters you want to extract, 1 if omitted.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        right(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numChars?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Returns the specified number of characters from the end of a text string. Use with double-byte character sets (DBCS).
-         *
-         * @param text Is the text string containing the characters you want to extract.
-         * @param numBytes Specifies how many characters you want to extract.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        rightb(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numBytes?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Converts an Arabic numeral to Roman, as text.
-         *
-         * @param number Is the Arabic numeral you want to convert.
-         * @param form Is the number specifying the type of Roman numeral you want.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        roman(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, form?: boolean | number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Rounds a number to a specified number of digits.
-         *
-         * @param number Is the number you want to round.
-         * @param numDigits Is the number of digits to which you want to round. Negative rounds to the left of the decimal point; zero to the nearest integer.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        round(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numDigits: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Rounds a number down, toward zero.
-         *
-         * @param number Is any real number that you want rounded down.
-         * @param numDigits Is the number of digits to which you want to round. Negative rounds to the left of the decimal point; zero or omitted, to the nearest integer.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        roundDown(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numDigits: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Rounds a number up, away from zero.
-         *
-         * @param number Is any real number that you want rounded up.
-         * @param numDigits Is the number of digits to which you want to round. Negative rounds to the left of the decimal point; zero or omitted, to the nearest integer.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        roundUp(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numDigits: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the number of rows in a reference or array.
-         *
-         * @param array Is an array, an array formula, or a reference to a range of cells for which you want the number of rows.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        rows(array: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns an equivalent interest rate for the growth of an investment.
-         *
-         * @param nper Is the number of periods for the investment.
-         * @param pv Is the present value of the investment.
-         * @param fv Is the future value of the investment.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        rri(nper: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pv: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, fv: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the secant of an angle.
-         *
-         * @param number Is the angle in radians for which you want the secant.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        sec(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the hyperbolic secant of an angle.
-         *
-         * @param number Is the angle in radians for which you want the hyperbolic secant.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        sech(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the second, a number from 0 to 59.
-         *
-         * @param serialNumber Is a number in the date-time code used by Microsoft Excel or text in time format, such as 16:48:23 or 4:48:47 PM.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        second(serialNumber: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the sum of a power series based on the formula.
-         *
-         * @param x Is the input value to the power series.
-         * @param n Is the initial power to which you want to raise x.
-         * @param m Is the step by which to increase n for each term in the series.
-         * @param coefficients Is a set of coefficients by which each successive power of x is multiplied.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        seriesSum(x: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, n: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, m: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, coefficients: Excel.Range | string | number | boolean | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the sheet number of the referenced sheet.
-         *
-         * @param value Is the name of a sheet or a reference that you want the sheet number of.  If omitted the number of the sheet containing the function is returned.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        sheet(value?: Excel.Range | string | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the number of sheets in a reference.
-         *
-         * @param reference Is a reference for which you want to know the number of sheets it contains.  If omitted the number of sheets in the workbook containing the function is returned.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        sheets(reference?: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the sign of a number: 1 if the number is positive, zero if the number is zero, or -1 if the number is negative.
-         *
-         * @param number Is any real number.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        sign(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the sine of an angle.
-         *
-         * @param number Is the angle in radians for which you want the sine. Degrees * PI()/180 = radians.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        sin(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the hyperbolic sine of a number.
-         *
-         * @param number Is any real number.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        sinh(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the skewness of a distribution: a characterization of the degree of asymmetry of a distribution around its mean.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 numbers or names, arrays, or references that contain numbers for which you want the skewness.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        skew(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Returns the skewness of a distribution based on a population: a characterization of the degree of asymmetry of a distribution around its mean.
-         *
-         * @param values List of parameters, whose elements are 1 to 254 numbers or names, arrays, or references that contain numbers for which you want the population skewness.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        skew_p(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Returns the straight-line depreciation of an asset for one period.
-         *
-         * @param cost Is the initial cost of the asset.
-         * @param salvage Is the salvage value at the end of the life of the asset.
-         * @param life Is the number of periods over which the asset is being depreciated (sometimes called the useful life of the asset).
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        sln(cost: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, salvage: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, life: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the k-th smallest value in a data set. For example, the fifth smallest number.
-         *
-         * @param array Is an array or range of numerical data for which you want to determine the k-th smallest value.
-         * @param k Is the position (from the smallest) in the array or range of the value to return.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        small(array: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, k: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the square root of a number.
-         *
-         * @param number Is the number for which you want the square root.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        sqrt(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the square root of (number * Pi).
-         *
-         * @param number Is the number by which p is multiplied.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        sqrtPi(number: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Estimates standard deviation based on a sample, including logical values and text. Text and the logical value FALSE have the value 0; the logical value TRUE has the value 1.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 values corresponding to a sample of a population and can be values or names or references to values.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        stDevA(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Calculates standard deviation based on an entire population, including logical values and text. Text and the logical value FALSE have the value 0; the logical value TRUE has the value 1.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 values corresponding to a population and can be values, names, arrays, or references that contain values.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        stDevPA(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Calculates standard deviation based on the entire population given as arguments (ignores logical values and text).
-         *
-         * @param values List of parameters, whose elements are 1 to 255 numbers corresponding to a population and can be numbers or references that contain numbers.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        stDev_P(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Estimates standard deviation based on a sample (ignores logical values and text in the sample).
-         *
-         * @param values List of parameters, whose elements are 1 to 255 numbers corresponding to a sample of a population and can be numbers or references that contain numbers.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        stDev_S(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Returns a normalized value from a distribution characterized by a mean and standard deviation.
-         *
-         * @param x Is the value you want to normalize.
-         * @param mean Is the arithmetic mean of the distribution.
-         * @param standardDev Is the standard deviation of the distribution, a positive number.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        standardize(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, mean: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, standardDev: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Replaces existing text with new text in a text string.
-         *
-         * @param text Is the text or the reference to a cell containing text in which you want to substitute characters.
-         * @param oldText Is the existing text you want to replace. If the case of oldText does not match the case of text, SUBSTITUTE will not replace the text.
-         * @param newText Is the text you want to replace oldText with.
-         * @param instanceNum Specifies which occurrence of oldText you want to replace. If omitted, every instance of oldText is replaced.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        substitute(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, oldText: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, newText: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, instanceNum?: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Returns a subtotal in a list or database.
-         *
-         * @param functionNum Is the number 1 to 11 that specifies the summary function for the subtotal.
-         * @param values List of parameters, whose elements are 1 to 254 ranges or references for which you want the subtotal.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        subtotal(functionNum: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, ...values: Array<Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Adds all the numbers in a range of cells.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 numbers to sum. Logical values and text are ignored in cells, included if typed as arguments.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        sum(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Adds the cells specified by a given condition or criteria.
-         *
-         * @param range Is the range of cells you want evaluated.
-         * @param criteria Is the condition or criteria in the form of a number, expression, or text that defines which cells will be added.
-         * @param sumRange Are the actual cells to sum. If omitted, the cells in range are used.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        sumIf(range: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, criteria: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, sumRange?: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Adds the cells specified by a given set of conditions or criteria.
-         *
-         * @param sumRange Are the actual cells to sum.
-         * @param values List of parameters, where the first element of each pair is the Is the range of cells you want evaluated for the particular condition , and the second element is is the condition or criteria in the form of a number, expression, or text that defines which cells will be added.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        sumIfs(sumRange: Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, ...values: Array<Excel.Range | Excel.RangeReference | Excel.FunctionResult<any> | number | string | boolean>): FunctionResult<number>;
-        /**
-         *
-         * Returns the sum of the squares of the arguments. The arguments can be numbers, arrays, names, or references to cells that contain numbers.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 numbers, arrays, names, or references to arrays for which you want the sum of the squares.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        sumSq(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Returns the sum-of-years' digits depreciation of an asset for a specified period.
-         *
-         * @param cost Is the initial cost of the asset.
-         * @param salvage Is the salvage value at the end of the life of the asset.
-         * @param life Is the number of periods over which the asset is being depreciated (sometimes called the useful life of the asset).
-         * @param per Is the period and must use the same units as Life.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        syd(cost: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, salvage: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, life: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, per: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Checks whether a value is text, and returns the text if it is, or returns double quotes (empty text) if it is not.
-         *
-         * @param value Is the value to test.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        t(value: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Returns the bond-equivalent yield for a treasury bill.
-         *
-         * @param settlement Is the Treasury bill's settlement date, expressed as a serial date number.
-         * @param maturity Is the Treasury bill's maturity date, expressed as a serial date number.
-         * @param discount Is the Treasury bill's discount rate.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        tbillEq(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, discount: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the price per $100 face value for a treasury bill.
-         *
-         * @param settlement Is the Treasury bill's settlement date, expressed as a serial date number.
-         * @param maturity Is the Treasury bill's maturity date, expressed as a serial date number.
-         * @param discount Is the Treasury bill's discount rate.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        tbillPrice(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, discount: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the yield for a treasury bill.
-         *
-         * @param settlement Is the Treasury bill's settlement date, expressed as a serial date number.
-         * @param maturity Is the Treasury bill's maturity date, expressed as a serial date number.
-         * @param pr Is the Treasury Bill's price per $100 face value.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        tbillYield(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pr: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the tangent of an angle.
-         *
-         * @param number Is the angle in radians for which you want the tangent. Degrees * PI()/180 = radians.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        tan(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the hyperbolic tangent of a number.
-         *
-         * @param number Is any real number.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        tanh(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts a value to text in a specific number format.
-         *
-         * @param value Is a number, a formula that evaluates to a numeric value, or a reference to a cell containing a numeric value.
-         * @param formatText Is a number format in text form from the Category box on the Number tab in the Format Cells dialog box (not General).
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        text(value: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, formatText: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Converts hours, minutes, and seconds given as numbers to an Excel serial number, formatted with a time format.
-         *
-         * @param hour Is a number from 0 to 23 representing the hour.
-         * @param minute Is a number from 0 to 59 representing the minute.
-         * @param second Is a number from 0 to 59 representing the second.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        time(hour: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, minute: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, second: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts a text time to an Excel serial number for a time, a number from 0 (12:00:00 AM) to 0.999988426 (11:59:59 PM). Format the number with a time format after entering the formula.
-         *
-         * @param timeText Is a text string that gives a time in any one of the Microsoft Excel time formats (date information in the string is ignored).
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        timevalue(timeText: string | number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the current date formatted as a date.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        today(): FunctionResult<number>;
-        /**
-         *
-         * Removes all spaces from a text string except for single spaces between words.
-         *
-         * @param text Is the text from which you want spaces removed.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        trim(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Returns the mean of the interior portion of a set of data values.
-         *
-         * @param array Is the range or array of values to trim and average.
-         * @param percent Is the fractional number of data points to exclude from the top and bottom of the data set.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        trimMean(array: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, percent: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the logical value TRUE.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        true(): FunctionResult<boolean>;
-        /**
-         *
-         * Truncates a number to an integer by removing the decimal, or fractional, part of the number.
-         *
-         * @param number Is the number you want to truncate.
-         * @param numDigits Is a number specifying the precision of the truncation, 0 (zero) if omitted.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        trunc(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, numDigits?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns an integer representing the data type of a value: number = 1; text = 2; logical value = 4; error value = 16; array = 64.
-         *
-         * @param value Can be any value.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        type(value: boolean | string | number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts a number to text, using currency format.
-         *
-         * @param number Is a number, a reference to a cell containing a number, or a formula that evaluates to a number.
-         * @param decimals Is the number of digits to the right of the decimal point.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        usdollar(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, decimals?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Returns the Unicode character referenced by the given numeric value.
-         *
-         * @param number Is the Unicode number representing a character.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        unichar(number: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Returns the number (code point) corresponding to the first character of the text.
-         *
-         * @param text Is the character that you want the Unicode value of.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        unicode(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Converts a text string to all uppercase letters.
-         *
-         * @param text Is the text you want converted to uppercase, a reference or a text string.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        upper(text: string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<string>;
-        /**
-         *
-         * Looks for a value in the leftmost column of a table, and then returns a value in the same row from a column you specify. By default, the table must be sorted in an ascending order.
-         *
-         * @param lookupValue Is the value to be found in the first column of the table, and can be a value, a reference, or a text string.
-         * @param tableArray Is a table of text, numbers, or logical values, in which data is retrieved. tableArray can be a reference to a range or a range name.
-         * @param colIndexNum Is the column number in tableArray from which the matching value should be returned. The first column of values in the table is column 1.
-         * @param rangeLookup Is a logical value: to find the closest match in the first column (sorted in ascending order) = TRUE or omitted; find an exact match = FALSE.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        vlookup(lookupValue: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, tableArray: Excel.Range | number | Excel.RangeReference | Excel.FunctionResult<any>, colIndexNum: Excel.Range | number | Excel.RangeReference | Excel.FunctionResult<any>, rangeLookup?: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number | string | boolean>;
-        /**
-         *
-         * Converts a text string that represents a number to a number.
-         *
-         * @param text Is the text enclosed in quotation marks or a reference to a cell containing the text you want to convert.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        value(text: string | boolean | number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Estimates variance based on a sample, including logical values and text. Text and the logical value FALSE have the value 0; the logical value TRUE has the value 1.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 value arguments corresponding to a sample of a population.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        varA(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Calculates variance based on the entire population, including logical values and text. Text and the logical value FALSE have the value 0; the logical value TRUE has the value 1.
-         *
-         * @param values List of parameters, whose elements are 1 to 255 value arguments corresponding to a population.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        varPA(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Calculates variance based on the entire population (ignores logical values and text in the population).
-         *
-         * @param values List of parameters, whose elements are 1 to 255 numeric arguments corresponding to a population.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        var_P(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Estimates variance based on a sample (ignores logical values and text in the sample).
-         *
-         * @param values List of parameters, whose elements are 1 to 255 numeric arguments corresponding to a sample of a population.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        var_S(...values: Array<number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<number>;
-        /**
-         *
-         * Returns the depreciation of an asset for any period you specify, including partial periods, using the double-declining balance method or some other method you specify.
-         *
-         * @param cost Is the initial cost of the asset.
-         * @param salvage Is the salvage value at the end of the life of the asset.
-         * @param life Is the number of periods over which the asset is being depreciated (sometimes called the useful life of the asset).
-         * @param startPeriod Is the starting period for which you want to calculate the depreciation, in the same units as Life.
-         * @param endPeriod Is the ending period for which you want to calculate the depreciation, in the same units as Life.
-         * @param factor Is the rate at which the balance declines, 2 (double-declining balance) if omitted.
-         * @param noSwitch Switch to straight-line depreciation when depreciation is greater than the declining balance = FALSE or omitted; do not switch = TRUE.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        vdb(cost: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, salvage: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, life: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, startPeriod: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, endPeriod: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, factor?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, noSwitch?: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the week number in the year.
-         *
-         * @param serialNumber Is the date-time code used by Microsoft Excel for date and time calculation.
-         * @param returnType Is a number (1 or 2) that determines the type of the return value.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        weekNum(serialNumber: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, returnType?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns a number from 1 to 7 identifying the day of the week of a date.
-         *
-         * @param serialNumber Is a number that represents a date.
-         * @param returnType Is a number: for Sunday=1 through Saturday=7, use 1; for Monday=1 through Sunday=7, use 2; for Monday=0 through Sunday=6, use 3.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        weekday(serialNumber: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, returnType?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the Weibull distribution.
-         *
-         * @param x Is the value at which to evaluate the function, a nonnegative number.
-         * @param alpha Is a parameter to the distribution, a positive number.
-         * @param beta Is a parameter to the distribution, a positive number.
-         * @param cumulative Is a logical value: for the cumulative distribution function, use TRUE; for the probability mass function, use FALSE.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        weibull_Dist(x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, alpha: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, beta: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, cumulative: boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the serial number of the date before or after a specified number of workdays.
-         *
-         * @param startDate Is a serial date number that represents the start date.
-         * @param days Is the number of nonweekend and non-holiday days before or after startDate.
-         * @param holidays Is an optional array of one or more serial date numbers to exclude from the working calendar, such as state and federal holidays and floating holidays.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        workDay(startDate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, days: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, holidays?: number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the serial number of the date before or after a specified number of workdays with custom weekend parameters.
-         *
-         * @param startDate Is a serial date number that represents the start date.
-         * @param days Is the number of nonweekend and non-holiday days before or after startDate.
-         * @param weekend Is a number or string specifying when weekends occur.
-         * @param holidays Is an optional array of one or more serial date numbers to exclude from the working calendar, such as state and federal holidays and floating holidays.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        workDay_Intl(startDate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, days: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, weekend?: number | string | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, holidays?: number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the internal rate of return for a schedule of cash flows.
-         *
-         * @param values Is a series of cash flows that correspond to a schedule of payments in dates.
-         * @param dates Is a schedule of payment dates that corresponds to the cash flow payments.
-         * @param guess Is a number that you guess is close to the result of XIRR.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        xirr(values: number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>, dates: number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>, guess?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the net present value for a schedule of cash flows.
-         *
-         * @param rate Is the discount rate to apply to the cash flows.
-         * @param values Is a series of cash flows that correspond to a schedule of payments in dates.
-         * @param dates Is a schedule of payment dates that corresponds to the cash flow payments.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        xnpv(rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, values: number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>, dates: number | string | Excel.Range | boolean | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns a logical 'Exclusive Or' of all arguments.
-         *
-         * @param values List of parameters, whose elements are 1 to 254 conditions you want to test that can be either TRUE or FALSE and can be logical values, arrays, or references.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        xor(...values: Array<boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>>): FunctionResult<boolean>;
-        /**
-         *
-         * Returns the year of a date, an integer in the range 1900 - 9999.
-         *
-         * @param serialNumber Is a number in the date-time code used by Microsoft Excel.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        year(serialNumber: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the year fraction representing the number of whole days between start_date and end_date.
-         *
-         * @param startDate Is a serial date number that represents the start date.
-         * @param endDate Is a serial date number that represents the end date.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        yearFrac(startDate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, endDate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the yield on a security that pays periodic interest.
-         *
-         * @param settlement Is the security's settlement date, expressed as a serial date number.
-         * @param maturity Is the security's maturity date, expressed as a serial date number.
-         * @param rate Is the security's annual coupon rate.
-         * @param pr Is the security's price per $100 face value.
-         * @param redemption Is the security's redemption value per $100 face value.
-         * @param frequency Is the number of coupon payments per year.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        yield(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pr: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, redemption: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, frequency: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the annual yield for a discounted security. For example, a treasury bill.
-         *
-         * @param settlement Is the security's settlement date, expressed as a serial date number.
-         * @param maturity Is the security's maturity date, expressed as a serial date number.
-         * @param pr Is the security's price per $100 face value.
-         * @param redemption Is the security's redemption value per $100 face value.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        yieldDisc(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pr: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, redemption: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the annual yield of a security that pays interest at maturity.
-         *
-         * @param settlement Is the security's settlement date, expressed as a serial date number.
-         * @param maturity Is the security's maturity date, expressed as a serial date number.
-         * @param issue Is the security's issue date, expressed as a serial date number.
-         * @param rate Is the security's interest rate at date of issue.
-         * @param pr Is the security's price per $100 face value.
-         * @param basis Is the type of day count basis to use.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        yieldMat(settlement: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, maturity: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, issue: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, rate: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, pr: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, basis?: number | string | boolean | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        /**
-         *
-         * Returns the one-tailed P-value of a z-test.
-         *
-         * @param array Is the array or range of data against which to test X.
-         * @param x Is the value to test.
-         * @param sigma Is the population (known) standard deviation. If omitted, the sample standard deviation is used.
-         *
-         * [Api set: ExcelApi 1.2]
-         */
-        z_Test(array: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, sigma?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-    }
-    namespace ErrorCodes {
-        var accessDenied: string;
-        var badPassword: string;
-        var generalException: string;
-        var insertDeleteConflict: string;
-        var invalidArgument: string;
-        var invalidBinding: string;
-        var invalidOperation: string;
-        var invalidReference: string;
-        var invalidSelection: string;
-        var itemAlreadyExists: string;
-        var itemNotFound: string;
-        var notImplemented: string;
-        var unsupportedOperation: string;
-    }
-}
-declare namespace Excel {
-    /**
-     * The RequestContext object facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the request context is required to get access to the Excel object model from the add-in.
-     */
-    class RequestContext extends OfficeExtension.ClientRequestContext {
-        private m_workbook;
-        constructor(url?: string);
-        workbook: Workbook;
-    }
-    /**
-     * Executes a batch script that performs actions on the Excel object model. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
-     * @param batch - A function that takes in an Excel.RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the request context is required to get access to the Excel object model from the add-in.
-     */
-    function run<T>(batch: (context: Excel.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
-}
-
-
-declare namespace Word {
-    /**
-     *
-     * The Application object.
-     *
-     * [Api set: WordApi ]
-     */
-    class Application extends OfficeExtension.ClientObject {
-        /**
-         *
-         * Creates a new document by using a base64 encoded .docx file.
-         *
-         * @param base64File Optional. The base64 encoded .docx file. The default value is null.
-         *
-         * [Api set: WordApi ]
-         */
-        createDoc(base64File?: string): Word.Document;
-        /**
-         * Create a new instance of Word.Application object
-         */
-        static newObject(context: OfficeExtension.ClientRequestContext): Word.Application;
-    }
-    /**
-     *
-     * Represents the body of a document or a section.
-     *
-     * [Api set: WordApi ]
-     */
-    class Body extends OfficeExtension.ClientObject {
-        private m_contentControls;
-        private m_font;
-        private m_inlinePictures;
-        private m_paragraphs;
-        private m_parentContentControl;
-        private m_style;
-        private m_text;
-        private m__ReferenceId;
-        /**
-         *
-         * Gets the collection of rich text content control objects that are in the body. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        contentControls: Word.ContentControlCollection;
-        /**
-         *
-         * Gets the text format of the body. Use this to get and set font name, size, color, and other properties. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        font: Word.Font;
-        /**
-         *
-         * Gets the collection of inlinePicture objects that are in the body. The collection does not include floating images. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        inlinePictures: Word.InlinePictureCollection;
-        /**
-         *
-         * Gets the collection of paragraph objects that are in the body. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        paragraphs: Word.ParagraphCollection;
-        /**
-         *
-         * Gets the content control that contains the body. Returns null if there isn't a parent content control. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        parentContentControl: Word.ContentControl;
-        /**
-         *
-         * Gets or sets the style used for the body. This is the name of the pre-installed or custom style.
-         *
-         * [Api set: WordApi ]
-         */
-        style: string;
-        /**
-         *
-         * Gets the text of the body. Use the insertText method to insert text. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        text: string;
-        /**
-         *
-         * Clears the contents of the body object. The user can perform the undo operation on the cleared content.
-         *
-         * [Api set: WordApi ]
-         */
-        clear(): void;
-        /**
-         *
-         * Gets the HTML representation of the body object.
-         *
-         * [Api set: WordApi ]
-         */
-        getHtml(): OfficeExtension.ClientResult<string>;
-        /**
-         *
-         * Gets the OOXML (Office Open XML) representation of the body object.
-         *
-         * [Api set: WordApi ]
-         */
-        getOoxml(): OfficeExtension.ClientResult<string>;
-        /**
-         *
-         * Gets the whole body, or the starting or ending point of the body, as a range.
-         *
-         * @param rangeLocation Optional. The range location can be 'Whole', 'Start' or 'End'.
-         *
-         * [Api set: WordApi ]
-         */
-        getRange(rangeLocation?: string): Word.Range;
-        /**
-         *
-         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Start' or 'End'.
-         *
-         * @param breakType Required. The break type to add to the body.
-         * @param insertLocation Required. The value can be 'Start' or 'End'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertBreak(breakType: string, insertLocation: string): void;
-        /**
-         *
-         * Wraps the body object with a Rich Text content control.
-         *
-         * [Api set: WordApi ]
-         */
-        insertContentControl(): Word.ContentControl;
-        /**
-         *
-         * Inserts a document into the body at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
-         *
-         * @param base64File Required. The base64 encoded content of a .docx file.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertFileFromBase64(base64File: string, insertLocation: string): Word.Range;
-        /**
-         *
-         * Inserts HTML at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
-         *
-         * @param html Required. The HTML to be inserted in the document.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertHtml(html: string, insertLocation: string): Word.Range;
-        /**
-         *
-         * Inserts a picture into the body at the specified location. The insertLocation value can be 'Start' or 'End'.
-         *
-         * @param base64EncodedImage Required. The base64 encoded image to be inserted in the body.
-         * @param insertLocation Required. The value can be 'Start' or 'End'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: string): Word.InlinePicture;
-        /**
-         *
-         * Inserts OOXML at the specified location.  The insertLocation value can be 'Replace', 'Start' or 'End'.
-         *
-         * @param ooxml Required. The OOXML to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertOoxml(ooxml: string, insertLocation: string): Word.Range;
-        /**
-         *
-         * Inserts a paragraph at the specified location. The insertLocation value can be 'Start' or 'End'.
-         *
-         * @param paragraphText Required. The paragraph text to be inserted.
-         * @param insertLocation Required. The value can be 'Start' or 'End'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertParagraph(paragraphText: string, insertLocation: string): Word.Paragraph;
-        /**
-         *
-         * Inserts text into the body at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
-         *
-         * @param text Required. Text to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertText(text: string, insertLocation: string): Word.Range;
-        /**
-         *
-         * Performs a search with the specified searchOptions on the scope of the body object. The search results are a collection of range objects.
-         *
-         * @param searchText Required. The search text.
-         * @param searchOptions Optional. Options for the search.
-         *
-         * [Api set: WordApi ]
-         */
-        search(searchText: string, searchOptions?: Word.SearchOptions | {
-            ignorePunct?: boolean;
-            ignoreSpace?: boolean;
-            matchCase?: boolean;
-            matchPrefix?: boolean;
-            matchSoundsLike?: boolean;
-            matchSuffix?: boolean;
-            matchWholeWord?: boolean;
-            matchWildcards?: boolean;
-        }): Word.SearchResultCollection;
-        /**
-         *
-         * Selects the body and navigates the Word UI to it.
-         *
-         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
-         *
-         * [Api set: WordApi ]
-         */
-        select(selectionMode?: string): void;
-        /**
-         *
-         * Splits the body into child ranges by using delimiters.
-         *
-         * @param delimiters Required. The delimiters as an array of strings.
-         * @param multiParagraphs Optional. Indicates whether a returned child range can cover multiple paragraphs. Default is false which indicates the paragraph boundaries are also used as delimiters.
-         * @param trimDelimiters Optional. Indicates whether to trim delimiters from the ranges in the range collection. Default is false which indicates that the delimiters are included in the ranges returned in the range collection.
-         * @param trimWhitespace Optional. Indicates whether to trim whitespace characters (spaces, tabs and column breaks) from the start and end of the ranges returned in the range collection. Default is false which indicates that whitespace characters at the start and end of the ranges are included in the range collection.
-         *
-         * [Api set: WordApi ]
-         */
-        splitTextRanges(delimiters: Array<string>, multiParagraphs?: boolean, trimDelimiters?: boolean, trimWhitespace?: boolean): Word.RangeCollection;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.Body;
-    }
-    /**
-     *
-     * Represents a content control. Content controls are bounded and potentially labeled regions in a document that serve as containers for specific types of content. Individual content controls may contain contents such as images, tables, or paragraphs of formatted text. Currently, only rich text content controls are supported.
-     *
-     * [Api set: WordApi ]
-     */
-    class ContentControl extends OfficeExtension.ClientObject {
-        private m_appearance;
-        private m_cannotDelete;
-        private m_cannotEdit;
-        private m_color;
-        private m_contentControls;
-        private m_font;
-        private m_id;
-        private m_inlinePictures;
-        private m_paragraphs;
-        private m_parentContentControl;
-        private m_placeholderText;
-        private m_removeWhenEdited;
-        private m_style;
-        private m_tag;
-        private m_text;
-        private m_title;
-        private m_type;
-        private m__ReferenceId;
-        /**
-         *
-         * Gets the collection of content control objects in the content control. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        contentControls: Word.ContentControlCollection;
-        /**
-         *
-         * Gets the text format of the content control. Use this to get and set font name, size, color, and other properties. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        font: Word.Font;
-        /**
-         *
-         * Gets the collection of inlinePicture objects in the content control. The collection does not include floating images. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        inlinePictures: Word.InlinePictureCollection;
-        /**
-         *
-         * Get the collection of paragraph objects in the content control. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        paragraphs: Word.ParagraphCollection;
-        /**
-         *
-         * Gets the content control that contains the content control. Returns null if there isn't a parent content control. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        parentContentControl: Word.ContentControl;
-        /**
-         *
-         * Gets or sets the appearance of the content control. The value can be 'boundingBox', 'tags' or 'hidden'.
-         *
-         * [Api set: WordApi ]
-         */
-        appearance: string;
-        /**
-         *
-         * Gets or sets a value that indicates whether the user can delete the content control. Mutually exclusive with removeWhenEdited.
-         *
-         * [Api set: WordApi ]
-         */
-        cannotDelete: boolean;
-        /**
-         *
-         * Gets or sets a value that indicates whether the user can edit the contents of the content control.
-         *
-         * [Api set: WordApi ]
-         */
-        cannotEdit: boolean;
-        /**
-         *
-         * Gets or sets the color of the content control. Color is set in '#RRGGBB' format or by using the color name.
-         *
-         * [Api set: WordApi ]
-         */
-        color: string;
-        /**
-         *
-         * Gets an integer that represents the content control identifier. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        id: number;
-        /**
-         *
-         * Gets or sets the placeholder text of the content control. Dimmed text will be displayed when the content control is empty.
-         *
-         * [Api set: WordApi ]
-         */
-        placeholderText: string;
-        /**
-         *
-         * Gets or sets a value that indicates whether the content control is removed after it is edited. Mutually exclusive with cannotDelete.
-         *
-         * [Api set: WordApi ]
-         */
-        removeWhenEdited: boolean;
-        /**
-         *
-         * Gets or sets the style used for the content control. This is the name of the pre-installed or custom style.
-         *
-         * [Api set: WordApi ]
-         */
-        style: string;
-        /**
-         *
-         * Gets or sets a tag to identify a content control.
-         *
-         * [Api set: WordApi ]
-         */
-        tag: string;
-        /**
-         *
-         * Gets the text of the content control. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        text: string;
-        /**
-         *
-         * Gets or sets the title for a content control.
-         *
-         * [Api set: WordApi ]
-         */
-        title: string;
-        /**
-         *
-         * Gets the content control type. Only rich text content controls are supported currently. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        type: string;
-        /**
-         *
-         * Clears the contents of the content control. The user can perform the undo operation on the cleared content.
-         *
-         * [Api set: WordApi ]
-         */
-        clear(): void;
-        /**
-         *
-         * Deletes the content control and its content. If keepContent is set to true, the content is not deleted.
-         *
-         * @param keepContent Required. Indicates whether the content should be deleted with the content control. If keepContent is set to true, the content is not deleted.
-         *
-         * [Api set: WordApi ]
-         */
-        delete(keepContent: boolean): void;
-        /**
-         *
-         * Gets the HTML representation of the content control object.
-         *
-         * [Api set: WordApi ]
-         */
-        getHtml(): OfficeExtension.ClientResult<string>;
-        /**
-         *
-         * Gets the Office Open XML (OOXML) representation of the content control object.
-         *
-         * [Api set: WordApi ]
-         */
-        getOoxml(): OfficeExtension.ClientResult<string>;
-        /**
-         *
-         * Gets the whole content control, or the starting or ending point of the content control, as a range.
-         *
-         * @param rangeLocation Optional. The range location can be 'Whole', 'Start' or 'End'.
-         *
-         * [Api set: WordApi ]
-         */
-        getRange(rangeLocation?: string): Word.Range;
-        /**
-         *
-         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Start', 'End', 'Before' or 'After'.
-         *
-         * @param breakType Required. Type of break.
-         * @param insertLocation Required. The value can be 'Start', 'End', 'Before' or 'After'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertBreak(breakType: string, insertLocation: string): void;
-        /**
-         *
-         * Inserts a document into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
-         *
-         * @param base64File Required. The base64 encoded content of a .docx file.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertFileFromBase64(base64File: string, insertLocation: string): Word.Range;
-        /**
-         *
-         * Inserts HTML into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
-         *
-         * @param html Required. The HTML to be inserted in to the content control.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertHtml(html: string, insertLocation: string): Word.Range;
-        /**
-         *
-         * Inserts an inline picture into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
-         *
-         * @param base64EncodedImage Required. The base64 encoded image to be inserted in the content control.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: string): Word.InlinePicture;
-        /**
-         *
-         * Inserts OOXML into the content control at the specified location.  The insertLocation value can be 'Replace', 'Start' or 'End'.
-         *
-         * @param ooxml Required. The OOXML to be inserted in to the content control.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertOoxml(ooxml: string, insertLocation: string): Word.Range;
-        /**
-         *
-         * Inserts a paragraph at the specified location. The insertLocation value can be 'Start', 'End', 'Before' or 'After'.
-         *
-         * @param paragraphText Required. The paragrph text to be inserted.
-         * @param insertLocation Required. The value can be 'Start', 'End', 'Before' or 'After'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertParagraph(paragraphText: string, insertLocation: string): Word.Paragraph;
-        /**
-         *
-         * Inserts text into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
-         *
-         * @param text Required. The text to be inserted in to the content control.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertText(text: string, insertLocation: string): Word.Range;
-        /**
-         *
-         * Performs a search with the specified searchOptions on the scope of the content control object. The search results are a collection of range objects.
-         *
-         * @param searchText Required. The search text.
-         * @param searchOptions Optional. Options for the search.
-         *
-         * [Api set: WordApi ]
-         */
-        search(searchText: string, searchOptions?: Word.SearchOptions | {
-            ignorePunct?: boolean;
-            ignoreSpace?: boolean;
-            matchCase?: boolean;
-            matchPrefix?: boolean;
-            matchSoundsLike?: boolean;
-            matchSuffix?: boolean;
-            matchWholeWord?: boolean;
-            matchWildcards?: boolean;
-        }): Word.SearchResultCollection;
-        /**
-         *
-         * Selects the content control. This causes Word to scroll to the selection.
-         *
-         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
-         *
-         * [Api set: WordApi ]
-         */
-        select(selectionMode?: string): void;
-        /**
-         *
-         * Splits the content control into child ranges by using delimiters.
-         *
-         * @param delimiters Required. The delimiters as an array of strings.
-         * @param multiParagraphs Optional. Indicates whether a returned child range can cover multiple paragraphs. Default is false which indicates the paragraph boundaries are also used as delimiters.
-         * @param trimDelimiters Optional. Indicates whether to trim delimiters from the ranges in the range collection. Default is false which indicates that the delimiters are included in the ranges returned in the range collection.
-         * @param trimWhitespace Optional. Indicates whether to trim whitespace characters (spaces, tabs and column breaks) from the start and end of the ranges returned in the range collection. Default is false which indicates that whitespace characters at the start and end of the ranges are included in the range collection.
-         *
-         * [Api set: WordApi ]
-         */
-        splitTextRanges(delimiters: Array<string>, multiParagraphs?: boolean, trimDelimiters?: boolean, trimWhitespace?: boolean): Word.RangeCollection;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.ContentControl;
-    }
-    /**
-     *
-     * Contains a collection of ContentControl objects. Content controls are bounded and potentially labeled regions in a document that serve as containers for specific types of content. Individual content controls may contain contents such as images, tables, or paragraphs of formatted text. Currently, only rich text content controls are supported.
-     *
-     * [Api set: WordApi ]
-     */
-    class ContentControlCollection extends OfficeExtension.ClientObject {
-        private m__ReferenceId;
-        private m__items;
-        /** Gets the loaded child items in this collection. */
-        items: Array<Word.ContentControl>;
-        /**
-         *
-         * Gets a content control by its identifier.
-         *
-         * @param id Required. A content control identifier.
-         *
-         * [Api set: WordApi ]
-         */
-        getById(id: number): Word.ContentControl;
-        /**
-         *
-         * Gets the content controls that have the specified tag.
-         *
-         * @param tag Required. A tag set on a content control.
-         *
-         * [Api set: WordApi ]
-         */
-        getByTag(tag: string): Word.ContentControlCollection;
-        /**
-         *
-         * Gets the content controls that have the specified title.
-         *
-         * @param title Required. The title of a content control.
-         *
-         * [Api set: WordApi ]
-         */
-        getByTitle(title: string): Word.ContentControlCollection;
-        /**
-         *
-         * Gets a content control by its index in the collection.
-         *
-         * @param index The index
-         *
-         * [Api set: WordApi ]
-         */
-        getItem(index: number): Word.ContentControl;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.ContentControlCollection;
-    }
-    /**
-     *
-     * The Document object is the top level object. A Document object contains one or more sections, content controls, and the body that contains the contents of the document.
-     *
-     * [Api set: WordApi ]
-     */
-    class Document extends OfficeExtension.ClientObject {
-        private m_body;
-        private m_contentControls;
-        private m_saved;
-        private m_sections;
-        private m__ReferenceId;
-        /**
-         *
-         * Gets the body of the document. The body is the text that excludes headers, footers, footnotes, textboxes, etc.. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        body: Word.Body;
-        /**
-         *
-         * Gets the collection of content control objects that are in the current document. This includes content controls in the body of the document, headers, footers, textboxes, etc.. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        contentControls: Word.ContentControlCollection;
-        /**
-         *
-         * Gets the collection of section objects that are in the document. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        sections: Word.SectionCollection;
-        /**
-         *
-         * Indicates whether the changes in the document have been saved. A value of true indicates that the document hasn't changed since it was saved. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        saved: boolean;
-        /**
-         *
-         * Gets the current selection of the document. Multiple selections are not supported.
-         *
-         * [Api set: WordApi ]
-         */
-        getSelection(): Word.Range;
-        /**
-         *
-         * Open the document.
-         *
-         * [Api set: WordApi ]
-         */
-        open(): void;
-        /**
-         *
-         * Saves the document. This will use the Word default file naming convention if the document has not been saved before.
-         *
-         * [Api set: WordApi ]
-         */
-        save(): void;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.Document;
-    }
-    /**
-     *
-     * Represents a font.
-     *
-     * [Api set: WordApi ]
-     */
-    class Font extends OfficeExtension.ClientObject {
-        private m_bold;
-        private m_color;
-        private m_doubleStrikeThrough;
-        private m_highlightColor;
-        private m_italic;
-        private m_name;
-        private m_size;
-        private m_strikeThrough;
-        private m_subscript;
-        private m_superscript;
-        private m_underline;
-        private m__ReferenceId;
-        /**
-         *
-         * Gets or sets a value that indicates whether the font is bold. True if the font is formatted as bold, otherwise, false.
-         *
-         * [Api set: WordApi ]
-         */
-        bold: boolean;
-        /**
-         *
-         * Gets or sets the color for the specified font. You can provide the value in the '#RRGGBB' format or the color name.
-         *
-         * [Api set: WordApi ]
-         */
-        color: string;
-        /**
-         *
-         * Gets or sets a value that indicates whether the font has a double strike through. True if the font is formatted as double strikethrough text, otherwise, false.
-         *
-         * [Api set: WordApi ]
-         */
-        doubleStrikeThrough: boolean;
-        /**
-         *
-         * Gets or sets the highlight color for the specified font. You can provide the value as either in the '#RRGGBB' format or the color name.
-         *
-         * [Api set: WordApi ]
-         */
-        highlightColor: string;
-        /**
-         *
-         * Gets or sets a value that indicates whether the font is italicized. True if the font is italicized, otherwise, false.
-         *
-         * [Api set: WordApi ]
-         */
-        italic: boolean;
-        /**
-         *
-         * Gets or sets a value that represents the name of the font.
-         *
-         * [Api set: WordApi ]
-         */
-        name: string;
-        /**
-         *
-         * Gets or sets a value that represents the font size in points.
-         *
-         * [Api set: WordApi ]
-         */
-        size: number;
-        /**
-         *
-         * Gets or sets a value that indicates whether the font has a strike through. True if the font is formatted as strikethrough text, otherwise, false.
-         *
-         * [Api set: WordApi ]
-         */
-        strikeThrough: boolean;
-        /**
-         *
-         * Gets or sets a value that indicates whether the font is a subscript. True if the font is formatted as subscript, otherwise, false.
-         *
-         * [Api set: WordApi ]
-         */
-        subscript: boolean;
-        /**
-         *
-         * Gets or sets a value that indicates whether the font is a superscript. True if the font is formatted as superscript, otherwise, false.
-         *
-         * [Api set: WordApi ]
-         */
-        superscript: boolean;
-        /**
-         *
-         * Gets or sets a value that indicates the font's underline type. 'None' if the font is not underlined.
-         *
-         * [Api set: WordApi ]
-         */
-        underline: string;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.Font;
-    }
-    /**
-     *
-     * Represents an inline picture.
-     *
-     * [Api set: WordApi ]
-     */
-    class InlinePicture extends OfficeExtension.ClientObject {
-        private m_altTextDescription;
-        private m_altTextTitle;
-        private m_height;
-        private m_hyperlink;
-        private m_imageFormat;
-        private m_lockAspectRatio;
-        private m_paragraph;
-        private m_parentContentControl;
-        private m_width;
-        private m__Id;
-        private m__ReferenceId;
-        /**
-         *
-         * Gets the paragraph that contains the inline image. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        paragraph: Word.Paragraph;
-        /**
-         *
-         * Gets the content control that contains the inline image. Returns null if there isn't a parent content control. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        parentContentControl: Word.ContentControl;
-        /**
-         *
-         * Gets or sets a string that represents the alternative text associated with the inline image
-         *
-         * [Api set: WordApi ]
-         */
-        altTextDescription: string;
-        /**
-         *
-         * Gets or sets a string that contains the title for the inline image.
-         *
-         * [Api set: WordApi ]
-         */
-        altTextTitle: string;
-        /**
-         *
-         * Gets or sets a number that describes the height of the inline image.
-         *
-         * [Api set: WordApi ]
-         */
-        height: number;
-        /**
-         *
-         * Gets or sets the hyperlink associated with the inline image.
-         *
-         * [Api set: WordApi ]
-         */
-        hyperlink: string;
-        /**
-         *
-         * Gets the format of the inline image. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        imageFormat: string;
-        /**
-         *
-         * Gets or sets a value that indicates whether the inline image retains its original proportions when you resize it.
-         *
-         * [Api set: WordApi ]
-         */
-        lockAspectRatio: boolean;
-        /**
-         *
-         * Gets or sets a number that describes the width of the inline image.
-         *
-         * [Api set: WordApi ]
-         */
-        width: number;
-        /**
-         *
-         * Deletes the inline picture from the document.
-         *
-         * [Api set: WordApi ]
-         */
-        delete(): void;
-        /**
-         *
-         * Gets the base64 encoded string representation of the inline image.
-         *
-         * [Api set: WordApi ]
-         */
-        getBase64ImageSrc(): OfficeExtension.ClientResult<string>;
-        /**
-         *
-         * Gets the picture, or the starting or ending point of the picture, as a range.
-         *
-         * @param rangeLocation Optional. The range location can be 'Whole', 'Start' or 'End'.
-         *
-         * [Api set: WordApi ]
-         */
-        getRange(rangeLocation?: string): Word.Range;
-        /**
-         *
-         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Before' or 'After'.
-         *
-         * @param breakType Required. The break type to add.
-         * @param insertLocation Required. The value can be 'Before' or 'After'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertBreak(breakType: string, insertLocation: string): void;
-        /**
-         *
-         * Wraps the inline picture with a rich text content control.
-         *
-         * [Api set: WordApi ]
-         */
-        insertContentControl(): Word.ContentControl;
-        /**
-         *
-         * Inserts a document at the specified location. The insertLocation value can be 'Before' or 'After'.
-         *
-         * @param base64File Required. The base64 encoded content of a .docx file.
-         * @param insertLocation Required. The value can be 'Before' or 'After'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertFileFromBase64(base64File: string, insertLocation: string): Word.Range;
-        /**
-         *
-         * Inserts HTML at the specified location. The insertLocation value can be 'Before' or 'After'.
-         *
-         * @param html Required. The HTML to be inserted.
-         * @param insertLocation Required. The value can be 'Before' or 'After'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertHtml(html: string, insertLocation: string): Word.Range;
-        /**
-         *
-         * Inserts an inline picture at the specified location. The insertLocation value can be 'Replace', 'Before' or 'After'.
-         *
-         * @param base64EncodedImage Required. The base64 encoded image to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Before' or 'After'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: string): Word.InlinePicture;
-        /**
-         *
-         * Inserts OOXML at the specified location.  The insertLocation value can be 'Before' or 'After'.
-         *
-         * @param ooxml Required. The OOXML to be inserted.
-         * @param insertLocation Required. The value can be 'Before' or 'After'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertOoxml(ooxml: string, insertLocation: string): Word.Range;
-        /**
-         *
-         * Inserts a paragraph at the specified location. The insertLocation value can be 'Before' or 'After'.
-         *
-         * @param paragraphText Required. The paragraph text to be inserted.
-         * @param insertLocation Required. The value can be 'Before' or 'After'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertParagraph(paragraphText: string, insertLocation: string): Word.Paragraph;
-        /**
-         *
-         * Inserts text at the specified location. The insertLocation value can be 'Before' or 'After'.
-         *
-         * @param text Required. Text to be inserted.
-         * @param insertLocation Required. The value can be 'Before' or 'After'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertText(text: string, insertLocation: string): Word.Range;
-        /**
-         *
-         * Selects the inline picture. This causes Word to scroll to the selection.
-         *
-         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
-         *
-         * [Api set: WordApi ]
-         */
-        select(selectionMode?: string): void;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.InlinePicture;
-    }
-    /**
-     *
-     * Contains a collection of [inlinePicture](inlinePicture.md) objects.
-     *
-     * [Api set: WordApi ]
-     */
-    class InlinePictureCollection extends OfficeExtension.ClientObject {
-        private m__ReferenceId;
-        private m__items;
-        /** Gets the loaded child items in this collection. */
-        items: Array<Word.InlinePicture>;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.InlinePictureCollection;
-    }
-    /**
-     *
-     * Represents a single paragraph in a selection, range, content control, or document body.
-     *
-     * [Api set: WordApi ]
-     */
-    class Paragraph extends OfficeExtension.ClientObject {
-        private m_alignment;
-        private m_contentControls;
-        private m_firstLineIndent;
-        private m_font;
-        private m_inlinePictures;
-        private m_leftIndent;
-        private m_lineSpacing;
-        private m_lineUnitAfter;
-        private m_lineUnitBefore;
-        private m_listLevel;
-        private m_outlineLevel;
-        private m_parentContentControl;
-        private m_rightIndent;
-        private m_spaceAfter;
-        private m_spaceBefore;
-        private m_style;
-        private m_text;
-        private m__Id;
-        private m__ReferenceId;
-        /**
-         *
-         * Gets the collection of content control objects that are in the paragraph. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        contentControls: Word.ContentControlCollection;
-        /**
-         *
-         * Gets the text format of the paragraph. Use this to get and set font name, size, color, and other properties. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        font: Word.Font;
-        /**
-         *
-         * Gets the collection of inlinePicture objects that are in the paragraph. The collection does not include floating images. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        inlinePictures: Word.InlinePictureCollection;
-        /**
-         *
-         * Gets the content control that contains the paragraph. Returns null if there isn't a parent content control. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        parentContentControl: Word.ContentControl;
-        /**
-         *
-         * Gets or sets the alignment for a paragraph. The value can  be 'left', 'centered', 'right', or 'justified'.
-         *
-         * [Api set: WordApi ]
-         */
-        alignment: string;
-        /**
-         *
-         * Gets or sets the value, in points, for a first line or hanging indent. Use a positive value to set a first-line indent, and use a negative value to set a hanging indent.
-         *
-         * [Api set: WordApi ]
-         */
-        firstLineIndent: number;
-        /**
-         *
-         * Gets or sets the left indent value, in points, for the paragraph.
-         *
-         * [Api set: WordApi ]
-         */
-        leftIndent: number;
-        /**
-         *
-         * Gets or sets the line spacing, in points, for the specified paragraph. In the Word UI, this value is divided by 12.
-         *
-         * [Api set: WordApi ]
-         */
-        lineSpacing: number;
-        /**
-         *
-         * Gets or sets the amount of spacing, in grid lines. after the paragraph.
-         *
-         * [Api set: WordApi ]
-         */
-        lineUnitAfter: number;
-        /**
-         *
-         * Gets or sets the amount of spacing, in grid lines, before the paragraph.
-         *
-         * [Api set: WordApi ]
-         */
-        lineUnitBefore: number;
-        /**
-         *
-         * Gets or sets the list level of the paragraph.
-         *
-         * [Api set: WordApi ]
-         */
-        listLevel: number;
-        /**
-         *
-         * Gets or sets the outline level for the paragraph.
-         *
-         * [Api set: WordApi ]
-         */
-        outlineLevel: number;
-        /**
-         *
-         * Gets or sets the right indent value, in points, for the paragraph.
-         *
-         * [Api set: WordApi ]
-         */
-        rightIndent: number;
-        /**
-         *
-         * Gets or sets the spacing, in points, after the paragraph.
-         *
-         * [Api set: WordApi ]
-         */
-        spaceAfter: number;
-        /**
-         *
-         * Gets or sets the spacing, in points, before the paragraph.
-         *
-         * [Api set: WordApi ]
-         */
-        spaceBefore: number;
-        /**
-         *
-         * Gets or sets the style used for the paragraph. This is the name of the pre-installed or custom style.
-         *
-         * [Api set: WordApi ]
-         */
-        style: string;
-        /**
-         *
-         * Gets the text of the paragraph. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        text: string;
-        /**
-         *
-         * Clears the contents of the paragraph object. The user can perform the undo operation on the cleared content.
-         *
-         * [Api set: WordApi ]
-         */
-        clear(): void;
-        /**
-         *
-         * Deletes the paragraph and its content from the document.
-         *
-         * [Api set: WordApi ]
-         */
-        delete(): void;
-        /**
-         *
-         * Gets the HTML representation of the paragraph object.
-         *
-         * [Api set: WordApi ]
-         */
-        getHtml(): OfficeExtension.ClientResult<string>;
-        /**
-         *
-         * Gets the Office Open XML (OOXML) representation of the paragraph object.
-         *
-         * [Api set: WordApi ]
-         */
-        getOoxml(): OfficeExtension.ClientResult<string>;
-        /**
-         *
-         * Gets the whole paragraph, or the starting or ending point of the paragraph, as a range.
-         *
-         * @param rangeLocation Optional. The range location can be 'Whole', 'Start' or 'End'.
-         *
-         * [Api set: WordApi ]
-         */
-        getRange(rangeLocation?: string): Word.Range;
-        /**
-         *
-         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Before' or 'After'.
-         *
-         * @param breakType Required. The break type to add to the document.
-         * @param insertLocation Required. The value can be 'Before' or 'After'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertBreak(breakType: string, insertLocation: string): void;
-        /**
-         *
-         * Wraps the paragraph object with a rich text content control.
-         *
-         * [Api set: WordApi ]
-         */
-        insertContentControl(): Word.ContentControl;
-        /**
-         *
-         * Inserts a document into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
-         *
-         * @param base64File Required. The base64 encoded content of a .docx file.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertFileFromBase64(base64File: string, insertLocation: string): Word.Range;
-        /**
-         *
-         * Inserts HTML into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
-         *
-         * @param html Required. The HTML to be inserted in the paragraph.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertHtml(html: string, insertLocation: string): Word.Range;
-        /**
-         *
-         * Inserts a picture into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
-         *
-         * @param base64EncodedImage Required. The base64 encoded image to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: string): Word.InlinePicture;
-        /**
-         *
-         * Inserts OOXML into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
-         *
-         * @param ooxml Required. The OOXML to be inserted in the paragraph.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertOoxml(ooxml: string, insertLocation: string): Word.Range;
-        /**
-         *
-         * Inserts a paragraph at the specified location. The insertLocation value can be 'Before' or 'After'.
-         *
-         * @param paragraphText Required. The paragraph text to be inserted.
-         * @param insertLocation Required. The value can be 'Before' or 'After'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertParagraph(paragraphText: string, insertLocation: string): Word.Paragraph;
-        /**
-         *
-         * Inserts text into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
-         *
-         * @param text Required. Text to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertText(text: string, insertLocation: string): Word.Range;
-        /**
-         *
-         * Performs a search with the specified searchOptions on the scope of the paragraph object. The search results are a collection of range objects.
-         *
-         * @param searchText Required. The search text.
-         * @param searchOptions Optional. Options for the search.
-         *
-         * [Api set: WordApi ]
-         */
-        search(searchText: string, searchOptions?: Word.SearchOptions | {
-            ignorePunct?: boolean;
-            ignoreSpace?: boolean;
-            matchCase?: boolean;
-            matchPrefix?: boolean;
-            matchSoundsLike?: boolean;
-            matchSuffix?: boolean;
-            matchWholeWord?: boolean;
-            matchWildcards?: boolean;
-        }): Word.SearchResultCollection;
-        /**
-         *
-         * Selects and navigates the Word UI to the paragraph.
-         *
-         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
-         *
-         * [Api set: WordApi ]
-         */
-        select(selectionMode?: string): void;
-        /**
-         *
-         * Splits the paragraph into child ranges by using delimiters.
-         *
-         * @param delimiters Required. The delimiters as an array of strings.
-         * @param trimDelimiters Optional. Indicates whether to trim delimiters from the ranges in the range collection. Default is false which indicates that the delimiters are included in the ranges returned in the range collection.
-         * @param trimWhitespace Optional. Indicates whether to trim whitespace characters (spaces, tabs and column breaks) from the start and end of the ranges returned in the range collection. Default is false which indicates that whitespace characters at the start and end of the ranges are included in the range collection.
-         *
-         * [Api set: WordApi ]
-         */
-        splitTextRanges(delimiters: Array<string>, trimDelimiters?: boolean, trimWhitespace?: boolean): Word.RangeCollection;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.Paragraph;
-    }
-    /**
-     *
-     * Contains a collection of [paragraph](paragraph.md) objects.
-     *
-     * [Api set: WordApi ]
-     */
-    class ParagraphCollection extends OfficeExtension.ClientObject {
-        private m__ReferenceId;
-        private m__items;
-        /** Gets the loaded child items in this collection. */
-        items: Array<Word.Paragraph>;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.ParagraphCollection;
-    }
-    /**
-     *
-     * Represents a contiguous area in a document.
-     *
-     * [Api set: WordApi ]
-     */
-    class Range extends OfficeExtension.ClientObject {
-        private m_contentControls;
-        private m_font;
-        private m_inlinePictures;
-        private m_isEmpty;
-        private m_paragraphs;
-        private m_parentContentControl;
-        private m_style;
-        private m_text;
-        private m__Id;
-        private m__ReferenceId;
-        /**
-         *
-         * Gets the collection of content control objects that are in the range. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        contentControls: Word.ContentControlCollection;
-        /**
-         *
-         * Gets the text format of the range. Use this to get and set font name, size, color, and other properties. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        font: Word.Font;
-        /**
-         *
-         * Gets the collection of inline picture objects that are in the range. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        inlinePictures: Word.InlinePictureCollection;
-        /**
-         *
-         * Gets the collection of paragraph objects that are in the range. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        paragraphs: Word.ParagraphCollection;
-        /**
-         *
-         * Gets the content control that contains the range. Returns null if there isn't a parent content control. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        parentContentControl: Word.ContentControl;
-        /**
-         *
-         * Checks whether the range length is zero. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        isEmpty: boolean;
-        /**
-         *
-         * Gets or sets the style used for the range. This is the name of the pre-installed or custom style.
-         *
-         * [Api set: WordApi ]
-         */
-        style: string;
-        /**
-         *
-         * Gets the text of the range. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        text: string;
-        /**
-         *
-         * Clears the contents of the range object. The user can perform the undo operation on the cleared content.
-         *
-         * [Api set: WordApi ]
-         */
-        clear(): void;
-        /**
-         *
-         * Compares this range's location with another range's location.
-         *
-         * @param range Required. The range to compare with this range.
-         *
-         * [Api set: WordApi ]
-         */
-        compareLocationWith(range: Word.Range): OfficeExtension.ClientResult<string>;
-        /**
-         *
-         * Deletes the range and its content from the document.
-         *
-         * [Api set: WordApi ]
-         */
-        delete(): void;
-        /**
-         *
-         * Expands the range in either direction to cover another range.
-         *
-         * @param range Required. Another range.
-         *
-         * [Api set: WordApi ]
-         */
-        expandTo(range: Word.Range): void;
-        /**
-         *
-         * Gets the HTML representation of the range object.
-         *
-         * [Api set: WordApi ]
-         */
-        getHtml(): OfficeExtension.ClientResult<string>;
-        /**
-         *
-         * Gets the OOXML representation of the range object.
-         *
-         * [Api set: WordApi ]
-         */
-        getOoxml(): OfficeExtension.ClientResult<string>;
-        /**
-         *
-         * Clones the range, or gets the starting or ending point of the range as a new range.
-         *
-         * @param rangeLocation Optional. The range location can be 'Whole', 'Start' or 'End'.
-         *
-         * [Api set: WordApi ]
-         */
-        getRange(rangeLocation?: string): Word.Range;
-        /**
-         *
-         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Replace', 'Before' or 'After'.
-         *
-         * @param breakType Required. The break type to add.
-         * @param insertLocation Required. The value can be 'Replace', 'Before' or 'After'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertBreak(breakType: string, insertLocation: string): void;
-        /**
-         *
-         * Wraps the range object with a rich text content control.
-         *
-         * [Api set: WordApi ]
-         */
-        insertContentControl(): Word.ContentControl;
-        /**
-         *
-         * Inserts a document at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
-         *
-         * @param base64File Required. The base64 encoded content of a .docx file.
-         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertFileFromBase64(base64File: string, insertLocation: string): Word.Range;
-        /**
-         *
-         * Inserts HTML at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
-         *
-         * @param html Required. The HTML to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertHtml(html: string, insertLocation: string): Word.Range;
-        /**
-         *
-         * Inserts a picture at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
-         *
-         * @param base64EncodedImage Required. The base64 encoded image to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: string): Word.InlinePicture;
-        /**
-         *
-         * Inserts OOXML at the specified location.  The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
-         *
-         * @param ooxml Required. The OOXML to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertOoxml(ooxml: string, insertLocation: string): Word.Range;
-        /**
-         *
-         * Inserts a paragraph at the specified location. The insertLocation value can be 'Before' or 'After'.
-         *
-         * @param paragraphText Required. The paragraph text to be inserted.
-         * @param insertLocation Required. The value can be 'Before' or 'After'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertParagraph(paragraphText: string, insertLocation: string): Word.Paragraph;
-        /**
-         *
-         * Inserts text at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
-         *
-         * @param text Required. Text to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
-         *
-         * [Api set: WordApi ]
-         */
-        insertText(text: string, insertLocation: string): Word.Range;
-        /**
-         *
-         * Shrink the range to the intersection of the range with another range.
-         *
-         * @param range Required. Another range.
-         *
-         * [Api set: WordApi ]
-         */
-        intersectWith(range: Word.Range): void;
-        /**
-         *
-         * Performs a search with the specified searchOptions on the scope of the range object. The search results are a collection of range objects.
-         *
-         * @param searchText Required. The search text.
-         * @param searchOptions Optional. Options for the search.
-         *
-         * [Api set: WordApi ]
-         */
-        search(searchText: string, searchOptions?: Word.SearchOptions | {
-            ignorePunct?: boolean;
-            ignoreSpace?: boolean;
-            matchCase?: boolean;
-            matchPrefix?: boolean;
-            matchSoundsLike?: boolean;
-            matchSuffix?: boolean;
-            matchWholeWord?: boolean;
-            matchWildcards?: boolean;
-        }): Word.SearchResultCollection;
-        /**
-         *
-         * Selects and navigates the Word UI to the range.
-         *
-         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
-         *
-         * [Api set: WordApi ]
-         */
-        select(selectionMode?: string): void;
-        /**
-         *
-         * Splits the range into child ranges by using delimiters.
-         *
-         * @param delimiters Required. The delimiters as an array of strings.
-         * @param multiParagraphs Optional. Indicates whether a returned child range can cover multiple paragraphs. Default is false which indicates the paragraph boundaries are also used as delimiters.
-         * @param trimDelimiters Optional. Indicates whether to trim delimiters from the ranges in the range collection. Default is false which indicates that the delimiters are included in the ranges returned in the range collection.
-         * @param trimWhitespace Optional. Indicates whether to trim whitespace characters (spaces, tabs and column breaks) from the start and end of the child ranges returned in the range collection. Default is false which indicates that whitespace characters at the start and end of the child ranges are included in the range collection.
-         *
-         * [Api set: WordApi ]
-         */
-        splitTextRanges(delimiters: Array<string>, multiParagraphs?: boolean, trimDelimiters?: boolean, trimWhitespace?: boolean): Word.RangeCollection;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.Range;
-    }
-    /**
-     *
-     * Contains a collection of [range](range.md) objects.
-     *
-     * [Api set: WordApi ]
-     */
-    class RangeCollection extends OfficeExtension.ClientObject {
-        private m__ReferenceId;
-        private m__items;
-        /** Gets the loaded child items in this collection. */
-        items: Array<Word.Range>;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.RangeCollection;
-    }
-    /**
-     *
-     * Specifies the options to be included in a search operation.
-     *
-     * [Api set: WordApi ]
-     */
-    class SearchOptions extends OfficeExtension.ClientObject {
-        private m_ignorePunct;
-        private m_ignoreSpace;
-        private m_matchCase;
-        private m_matchPrefix;
-        private m_matchSoundsLike;
-        private m_matchSuffix;
-        private m_matchWholeWord;
-        private m_matchWildcards;
-        matchWildCards: boolean;
-        /**
-         *
-         * Gets or sets a value that indicates whether to ignore all punctuation characters between words. Corresponds to the Ignore punctuation check box in the Find and Replace dialog box.
-         *
-         * [Api set: WordApi ]
-         */
-        ignorePunct: boolean;
-        /**
-         *
-         * Gets or sets a value that indicates whether to ignore all whitespace between words. Corresponds to the Ignore whitespace characters check box in the Find and Replace dialog box.
-         *
-         * [Api set: WordApi ]
-         */
-        ignoreSpace: boolean;
-        /**
-         *
-         * Gets or sets a value that indicates whether to perform a case sensitive search. Corresponds to the Match case check box in the Find and Replace dialog box (Edit menu).
-         *
-         * [Api set: WordApi ]
-         */
-        matchCase: boolean;
-        /**
-         *
-         * Gets or sets a value that indicates whether to match words that begin with the search string. Corresponds to the Match prefix check box in the Find and Replace dialog box.
-         *
-         * [Api set: WordApi ]
-         */
-        matchPrefix: boolean;
-        /**
-         *
-         * Gets or sets a value that indicates whether to find words that sound similar to the search string. Corresponds to the Sounds like check box in the Find and Replace dialog box
-         *
-         * [Api set: WordApi ]
-         */
-        matchSoundsLike: boolean;
-        /**
-         *
-         * Gets or sets a value that indicates whether to match words that end with the search string. Corresponds to the Match suffix check box in the Find and Replace dialog box.
-         *
-         * [Api set: WordApi ]
-         */
-        matchSuffix: boolean;
-        /**
-         *
-         * Gets or sets a value that indicates whether to find operation only entire words, not text that is part of a larger word. Corresponds to the Find whole words only check box in the Find and Replace dialog box.
-         *
-         * [Api set: WordApi ]
-         */
-        matchWholeWord: boolean;
-        /**
-         *
-         * Gets or sets a value that indicates whether the search will be performed using special search operators. Corresponds to the Use wildcards check box in the Find and Replace dialog box.
-         *
-         * [Api set: WordApi ]
-         */
-        matchWildcards: boolean;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.SearchOptions;
-        /**
-         * Create a new instance of Word.SearchOptions object
-         */
-        static newObject(context: OfficeExtension.ClientRequestContext): Word.SearchOptions;
-    }
-    /**
-     *
-     * Contains a collection of [range](range.md) objects as a result of a search operation.
-     *
-     * [Api set: WordApi ]
-     */
-    class SearchResultCollection extends OfficeExtension.ClientObject {
-        private m__ReferenceId;
-        private m__items;
-        /** Gets the loaded child items in this collection. */
-        items: Array<Word.Range>;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.SearchResultCollection;
-    }
-    /**
-     *
-     * Represents a section in a Word document.
-     *
-     * [Api set: WordApi ]
-     */
-    class Section extends OfficeExtension.ClientObject {
-        private m_body;
-        private m__Id;
-        private m__ReferenceId;
-        /**
-         *
-         * Gets the body of the section. This does not include the header/footer and other section metadata. Read-only.
-         *
-         * [Api set: WordApi ]
-         */
-        body: Word.Body;
-        /**
-         *
-         * Gets one of the section's footers.
-         *
-         * @param type Required. The type of footer to return. This value can be: 'primary', 'firstPage' or 'evenPages'.
-         *
-         * [Api set: WordApi ]
-         */
-        getFooter(type: string): Word.Body;
-        /**
-         *
-         * Gets one of the section's headers.
-         *
-         * @param type Required. The type of header to return. This value can be: 'primary', 'firstPage' or 'evenPages'.
-         *
-         * [Api set: WordApi ]
-         */
-        getHeader(type: string): Word.Body;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.Section;
-    }
-    /**
-     *
-     * Contains the collection of the document's [section](section.md) objects.
-     *
-     * [Api set: WordApi ]
-     */
-    class SectionCollection extends OfficeExtension.ClientObject {
-        private m__ReferenceId;
-        private m__items;
-        /** Gets the loaded child items in this collection. */
-        items: Array<Word.Section>;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.SectionCollection;
-    }
-    /**
-     *
-     * ContentControl types
-     *
-     * [Api set: WordApi ]
-     */
-    namespace ContentControlType {
-        var richText: string;
-    }
-    /**
-     *
-     * ContentControl appearance
-     *
-     * [Api set: WordApi ]
-     */
-    namespace ContentControlAppearance {
-        var boundingBox: string;
-        var tags: string;
-        var hidden: string;
-    }
-    /**
-     *
-     * Underline types
-     *
-     * [Api set: WordApi ]
-     */
-    namespace UnderlineType {
-        var none: string;
-        var single: string;
-        var word: string;
-        var double: string;
-        var dotted: string;
-        var hidden: string;
-        var thick: string;
-        var dashLine: string;
-        var dotLine: string;
-        var dotDashLine: string;
-        var twoDotDashLine: string;
-        var wave: string;
-    }
-    /**
-     * [Api set: WordApi ]
-     */
-    namespace BreakType {
-        var page: string;
-        var column: string;
-        var next: string;
-        var sectionContinuous: string;
-        var sectionEven: string;
-        var sectionOdd: string;
-        var line: string;
-        var lineClearLeft: string;
-        var lineClearRight: string;
-        var textWrapping: string;
-    }
-    /**
-     *
-     * The insertion location types
-     *
-     * [Api set: WordApi ]
-     */
-    namespace InsertLocation {
-        var before: string;
-        var after: string;
-        var start: string;
-        var end: string;
-        var replace: string;
-    }
-    /**
-     * [Api set: WordApi ]
-     */
-    namespace Alignment {
-        var unknown: string;
-        var left: string;
-        var centered: string;
-        var right: string;
-        var justified: string;
-    }
-    /**
-     * [Api set: WordApi ]
-     */
-    namespace HeaderFooterType {
-        var primary: string;
-        var firstPage: string;
-        var evenPages: string;
-    }
-    /**
-     * [Api set: WordApi ]
-     */
-    namespace SelectionMode {
-        var select: string;
-        var start: string;
-        var end: string;
-    }
-    /**
-     * [Api set: WordApi ]
-     */
-    namespace ImageFormat {
-        var unsupported: string;
-        var undefined: string;
-        var bmp: string;
-        var jpeg: string;
-        var gif: string;
-        var tiff: string;
-        var png: string;
-        var icon: string;
-        var exif: string;
-        var wmf: string;
-        var emf: string;
-        var pict: string;
-        var pdf: string;
-    }
-    /**
-     * [Api set: WordApi ]
-     */
-    namespace RangeLocation {
-        var whole: string;
-        var start: string;
-        var end: string;
-    }
-    /**
-     * [Api set: WordApi ]
-     */
-    namespace LocationRelation {
-        var unrelated: string;
-        var equal: string;
-        var containsStart: string;
-        var containsEnd: string;
-        var contains: string;
-        var insideStart: string;
-        var insideEnd: string;
-        var inside: string;
-        var adjacentBefore: string;
-        var overlapsBefore: string;
-        var before: string;
-        var adjacentAfter: string;
-        var overlapsAfter: string;
-        var after: string;
-    }
-    namespace ErrorCodes {
-        var accessDenied: string;
-        var generalException: string;
-        var invalidArgument: string;
-        var itemNotFound: string;
-        var notImplemented: string;
-    }
-}
-declare namespace Word {
-    /**
-     * The RequestContext object facilitates requests to the Word application. Since the Office add-in and the Word application run in two different processes, the request context is required to get access to the Word object model from the add-in.
-     */
-    class RequestContext extends OfficeExtension.ClientRequestContext {
-        private m_document;
-        private m_application;
-        constructor(url?: string);
-        document: Document;
-        application: Application;
-    }
-    /**
-     * Executes a batch script that performs actions on the Word object model. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
-     * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Word application. Since the Office add-in and the Word application run in two different processes, the request context is required to get access to the Word object model from the add-in.
-     */
-    function run<T>(batch: (context: Word.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
-}
-
-declare namespace Office.MailboxEnums {
-    export enum BodyType {
-        /**
-         * The body is in HTML format
-         */
-        HTML,
-        /**
-         * The body is in text format
-         */
-        text
-    }
-    export enum EntityType {
-        /**
-         * Specifies that the entity is a meeting suggestion
-         */
-        MeetingSuggestion,
-        /**
-         * Specifies that the entity is a task suggestion
-         */
-        TaskSuggestion,
-        /**
-         * Specifies that the entity is a postal address
-         */
-        Address,
-        /**
-         * Specifies that the entity is SMTP email address
-         */
-        EmailAddress,
-        /**
-         * Specifies that the entity is an Internet URL
-         */
-        Url,
-        /**
-         * Specifies that the entity is US phone number
-         */
-        PhoneNumber,
-        /**
-         * Specifies that the entity is a contact
-         */
-        Contact
-    }
-    export enum ItemType {
-        /**
-         * A meeting request, response, or cancellation
-         */
-        Message,
-        /**
-         * Specifies an appointment item
-         */
-        Appointment
-    }
-    export enum ResponseType {
-        /**
-         * There has been no response from the attendee
-         */
-        None,
-        /**
-         * The attendee is the meeting organizer
-         */
-        Organizer,
-        /**
-         * The meeting request was tentatively accepted by the attendee
-         */
-        Tentative,
-        /**
-         * The meeting request was accepted by the attendee
-         */
-        Accepted,
-        /**
-         * The meeting request was declined by the attendee
-         */
-        Declined
-    }
-    export enum RecipientType {
-        /**
-         * Specifies that the recipient is not one of the other recipient types
-         */
-        Other,
-        /**
-         * Specifies that the recipient is a distribution list containing a list of email addresses
-         */
-        DistributionList,
-        /**
-         * Specifies that the recipient is an SMTP email address that is on the Exchange server
-         */
-        User,
-        /**
-         * Specifies that the recipient is an SMTP email address that is not on the Exchange server
-         */
-        ExternalUser
-    }
-    export enum AttachmentType {
-        /**
-         * The attachment is a file
-         */
-        File,
-        /**
-         * The attachment is an Exchange item
-         */
-        Item
-    }
-}
-declare namespace Office {
-    export module Types {
-        export interface ItemRead extends Office.Item {
-            subject: any;
-            /**
-             * Displays a reply form that includes the sender and all the recipients of the selected message
-             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
-             */
-            displayReplyAllForm(htmlBody: string): void;
-            /**
-             * Displays a reply form that includes only the sender of the selected message
-             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
-             */
-            displayReplyForm(htmlBody: string): void;
-            /**
-             * Gets an array of entities found in an message
-             */
-            getEntities(): Office.Entities;
-            /**
-             * Gets an array of entities of the specified entity type found in an message
-             * @param entityType One of the EntityType enumeration values
-             */
-            getEntitiesByType(entityType: Office.MailboxEnums.EntityType): Office.Entities;
-            /**
-             * Returns well-known entities that pass the named filter defined in the manifest XML file
-             * @param name  A TableData object with the headers and rows
-             */
-            getFilteredEntitiesByName(name: string): Office.Entities;
-            /**
-             * Returns string values in the currently selected message object that match the regular expressions defined in the manifest XML file
-             */
-            getRegExMatches(): string[];
-            /**
-             * Returns string values that match the named regular expression defined in the manifest XML file
-             */
-            getRegExMatchesByName(name: string): string[];
-        }
-        export interface ItemCompose extends Office.Item {
-            body: Office.Body;
-            subject: any;
-            /**
-             * Adds a file to a message as an attachment
-             * @param uri The URI that provides the location of the file to attach to the message. The maximum length is 2048 characters
-             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
-             * @param options Any optional parameters or state data passed to the method
-             * @param callback The optional callback method
-             */
-            addFileAttachmentAsync(uri: string, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
-            /**
-             * Adds an Exchange item, such as a message, as an attachment to the message
-             * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters
-             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
-             * @param options Any optional parameters or state data passed to the method
-             * @param callback The optional callback method
-             */
-            addItemAttachmentAsync(itemId: any, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
-            /**
-             * Removes an attachment from a message
-             * @param attachmentIndex The index of the attachment to remove. The maximum length of the string is 100 characters
-             * @param options Any optional parameters or state data passed to the method
-             * @param callback The optional callback method
-             */
-            removeAttachmentAsync(attachmentIndex: string, option?: any, callback?: (result: AsyncResult) => void): void;
-        }
-        export interface MessageCompose extends Office.Message {
-            attachments: Office.AttachmentDetails[];
-            body: Office.Body;
-            bcc: Office.Recipients;
-            cc: Office.Recipients;
-            subject: Office.Subject;
-            to: Office.Recipients;
-            /**
-             * Adds a file to a message as an attachment
-             * @param uri The URI that provides the location of the file to attach to the message. The maximum length is 2048 characters
-             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
-             * @param options Any optional parameters or state data passed to the method
-             * @param callback The optional callback method
-             */
-            addFileAttachmentAsync(uri: string, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
-            /**
-             * Adds an Exchange item, such as a message, as an attachment to the message
-             * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters
-             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
-             * @param options Any optional parameters or state data passed to the method
-             * @param callback The optional callback method
-             */
-            addItemAttachmentAsync(itemId: any, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
-            /**
-             * Removes an attachment from a message
-             * @param attachmentIndex The index of the attachment to remove. The maximum length of the string is 100 characters
-             * @param options Any optional parameters or state data passed to the method
-             * @param callback The optional callback method
-             */
-            removeAttachmentAsync(attachmentIndex: string, option?: any, callback?: (result: AsyncResult) => void): void;
-        }
-        export interface MessageRead extends Office.Message {
-            cc: Office.EmailAddressDetails[];
-            from: Office.EmailAddressDetails;
-            internetMessageId: string;
-            normalizedSubject: string;
-            sender: Office.EmailAddressDetails;
-            subject: string;
-            to: Office.EmailAddressDetails;
-            /**
-             * Displays a reply form that includes the sender and all the recipients of the selected message
-             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
-             */
-            displayReplyAllForm(htmlBody: string): void;
-            /**
-             * Displays a reply form that includes only the sender of the selected message
-             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
-             */
-            displayReplyForm(htmlBody: string): void;
-            /**
-             * Gets an array of entities found in an message
-             */
-            getEntities(): Office.Entities;
-            /**
-             * Gets an array of entities of the specified entity type found in an message
-             * @param entityType One of the EntityType enumeration values
-             */
-            getEntitiesByType(entityType: Office.MailboxEnums.EntityType): Office.Entities;
-            /**
-             * Returns well-known entities that pass the named filter defined in the manifest XML file
-             * @param name  A TableData object with the headers and rows
-             */
-            getFilteredEntitiesByName(name: string): Office.Entities;
-            /**
-             * Returns string values in the currently selected message object that match the regular expressions defined in the manifest XML file
-             */
-            getRegExMatches(): string[];
-            /**
-             * Returns string values that match the named regular expression defined in the manifest XML file
-             */
-            getRegExMatchesByName(name: string): string[];
-        }
-        export interface AppointmentCompose extends Office.Appointment {
-            body: Office.Body;
-            end: Office.Time;
-            location: Office.Location;
-            optionalAttendees: Office.Recipients;
-            requiredAttendees: Office.Recipients;
-            start: Office.Time;
-            subject: Office.Subject;
-            /**
-             * Adds a file to an appointment as an attachment
-             * @param uri The URI that provides the location of the file to attach to the appointment. The maximum length is 2048 characters
-             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
-             * @param options Any optional parameters or state data passed to the method
-             * @param callback The optional callback method
-             */
-            addFileAttachmentAsync(uri: string, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
-            /**
-             * Adds an Exchange item, such as a message, as an attachment to the appointment
-             * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters
-             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
-             * @param options Any optional parameters or state data passed to the method
-             * @param callback The optional callback method
-             */
-            addItemAttachmentAsync(itemId: any, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
-            /**
-             * Removes an attachment from a appointment
-             * @param attachmentIndex The index of the attachment to remove. The maximum length of the string is 100 characters
-             * @param options Any optional parameters or state data passed to the method
-             * @param callback The optional callback method
-             */
-            removeAttachmentAsync(attachmentIndex: string, option?: any, callback?: (result: AsyncResult) => void): void;
-        }
-        export interface AppointmentRead extends Office.Appointment {
-            attachments: Office.AttachmentDetails[];
-            end: Date;
-            location: string;
-            normalizedSubject: string;
-            optionalAttendees: Office.EmailAddressDetails;
-            organizer: Office.EmailAddressDetails;
-            requiredAttendees: Office.EmailAddressDetails;
-            resources: string[];
-            start: Date;
-            subject: string;
-            /**
-             * Displays a reply form that includes the organizer and all the attendees of the selected appointment item
-             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
-             */
-            displayReplyAllForm(htmlBody: string): void;
-            /**
-             * Displays a reply form that includes only the organizer of the selected appointment item
-             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
-             */
-            displayReplyForm(htmlBody: string): void;
-            /**
-             * Gets an array of entities found in an appointment
-             */
-            getEntities(): Office.Entities;
-            /**
-             * Gets an array of entities of the specified entity type found in an appointment
-             * @param entityType One of the EntityType enumeration values
-             */
-            getEntitiesByType(entityType: Office.MailboxEnums.EntityType): Office.Entities;
-            /**
-             * Returns well-known entities that pass the named filter defined in the manifest XML file
-             * @param name  A TableData object with the headers and rows
-             */
-            getFilteredEntitiesByName(name: string): Office.Entities;
-            /**
-             * Returns string values in the currently selected appointment object that match the regular expressions defined in the manifest XML file
-             */
-            getRegExMatches(): string[];
-            /**
-             * Returns string values that match the named regular expression defined in the manifest XML file
-             */
-            getRegExMatchesByName(name: string): string[];
-        }
-    }
-    export module cast {
-        export module item {
-            function toAppointmentCompose(item: Office.Item): Office.Types.AppointmentCompose;
-            function toAppointmentRead(item: Office.Item): Office.Types.AppointmentRead;
-            function toAppointment(item: Office.Item): Office.Appointment;
-            function toMessageCompose(item: Office.Item): Office.Types.MessageCompose;
-            function toMessageRead(item: Office.Item): Office.Types.MessageRead;
-            function toMessage(item: Office.Item): Office.Message;
-            function toItemCompose(item: Office.Item): Office.Types.ItemCompose;
-            function toItemRead(item: Office.Item): Office.Types.ItemRead;
-        }
-    }
-    export interface AttachmentDetails {
-        attachmentType: Office.MailboxEnums.AttachmentType;
-        contentType: string;
-        id: string;
-        isInline: boolean;
-        name: string;
-        size: number;
-    }
-    export interface Contact {
-        personName: string;
-        businessName: string;
-        phoneNumbers: PhoneNumber[];
-        emailAddresses: string[];
-        urls: string[];
-        addresses: string[];
-        contactString: string;
-    }
-
-    export interface Context {
-        mailbox: Mailbox;
-        roamingSettings: RoamingSettings;
-    }
-    export interface CustomProperties {
-        /**
-         * Returns the value of the specified custom property
-         * @param name The name of the property to be returned
-         */
-        get(name: string): any;
-        /**
-         * Sets the specified property to the specified value
-         * @param name The name of the property to be set
-         * @param value The value of the property to be set
-         */
-        set(name: string, value: string): void;
-        /**
-         * Removes the specified property from the custom property collection.
-         * @param name The name of the property to be removed
-         */
-        remove(name: string): void;
-        /**
-         * Saves the custom property collection to the server
-         * @param callback The optional callback method
-         * @param userContext Optional variable for any state data that is passed to the saveAsync method
-         */
-        saveAsync(callback?: (result: AsyncResult) => void, userContext?: any): void;
-    }
-    export interface EmailAddressDetails {
-        emailAddress: string;
-        displayName: string;
-        appointmentResponse: Office.MailboxEnums.ResponseType;
-        recipientType: Office.MailboxEnums.RecipientType;
-    }
-    export interface EmailUser {
-        name: string;
-        userId: string;
-    }
-    export interface Entities {
-        addresses: string[];
-        taskSuggestions: string[];
-        meetingSuggestions: MeetingSuggestion[];
-        emailAddresses: string[];
-        urls: string[];
-        phoneNumbers: PhoneNumber[];
-        contacts: Contact[];
-    }
-    export interface Item {
-        dateTimeCreated: Date;
-        dateTimeModified: Date;
-        itemClass: string;
-        itemId: string;
-        itemType: Office.MailboxEnums.ItemType;
-        /**
-         * Asynchronously loads custom properties that are specific to the item and a app for Office
-         * @param callback The optional callback method
-         * @param userContext Optional variable for any state data that is passed to the asynchronous method
-         */
-        loadCustomPropertiesAsync(callback?: (result: AsyncResult) => void, userContext?: any): void;
-    }
-    export interface Appointment extends Item {
-    }
-    export interface Body {
-        /**
-         * Gets a value that indicates whether the content is in HTML or text format
-         * @param tableData  A TableData object with the headers and rows
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the getTypeAsync method returns
-         */
-        getTypeAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Adds the specified content to the beginning of the item body
-         * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        prependAsync(data: string, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Replaces the selection in the body with the specified text
-         * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        setSelectedDataAsync(data: string, options?: any, callback?: (result: AsyncResult) => void): void;
-    }
-    export interface Location {
-        /**
-         * Begins an asynchronous request for the location of an appointment
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        getAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Begins an asynchronous request to set the location of an appointment
-         * @param data The location of the appointment. The string is limited to 255 characters
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the location is set
-         */
-        setAsync(location: string, options?: any, callback?: (result: AsyncResult) => void): void;
-    }
-    export interface Mailbox {
-        item: Item;
-        userProfile: UserProfile;
-        /**
-         * Gets a Date object from a dictionary containing time information
-         * @param timeValue A Date object
-         */
-        convertToLocalClientTime(timeValue: Date): any;
-        /**
-         * Gets a dictionary containing time information in local client time
-         * @param input A dictionary containing a date. The dictionary should contain the following fields: year, month, date, hours, minutes, seconds, time zone, time zone offset
-         */
-        convertToUtcClientTime(input: any): Date;
-        /**
-         * Displays an existing calendar appointment
-         * @param itemId The Exchange Web Services (EWS) identifier for an existing calendar appointment
-         */
-        displayAppointmentForm(itemId: any): void;
-        /**
-         * Displays an existing message
-         * @param itemId The Exchange Web Services (EWS) identifier for an existing message
-         */
-        displayMessageForm(itemId: any): void;
-        /**
-         * Displays a form for creating a new calendar appointment
-         * @param requiredAttendees An array of strings containing the email addresses or an array containing an EmailAddressDetails object for each of the required attendees for the appointment. The array is limited to a maximum of 100 entries
-         * @param optionalAttendees An array of strings containing the email addresses or an array containing an EmailAddressDetails object for each of the optional attendees for the appointment. The array is limited to a maximum of 100 entries
-         * @param start A Date object specifying the start date and time of the appointment
-         * @param end A Date object specifying the end date and time of the appointment
-         * @param location A string containing the location of the appointment. The string is limited to a maximum of 255 characters
-         * @param resources An array of strings containing the resources required for the appointment. The array is limited to a maximum of 100 entries
-         * @param subject A string containing the subject of the appointment. The string is limited to a maximum of 255 characters
-         * @param body The body of the appointment message. The body content is limited to a maximum size of 32 KB
-         */
-        displayNewAppointmentForm(requiredAttendees: any, optionalAttendees: any, start: Date, end: Date, location: string, resources: string[], subject: string, body: string): void;
-        /**
-         * Gets a string that contains a token used to get an attachment or item from an Exchange Server
-         * @param callback The optional method to call when the string is inserted
-         * @param userContext Optional variable for any state data that is passed to the asynchronous method
-         */
-        getCallbackTokenAsync(callback?: (result: AsyncResult) => void, userContext?: any): void;
-        /**
-         * Gets a token identifying the user and the app for Office
-         * @param callback The optional method to call when the string is inserted
-         * @param userContext Optional variable for any state data that is passed to the asynchronous method
-         */
-        getUserIdentityTokenAsync(callback?: (result: AsyncResult) => void, userContext?: any): void;
-        /**
-         * Makes an asynchronous request to an Exchange Web Services (EWS) service on the Exchange server that hosts the user’s mailbox
-         * @param data The EWS request
-         * @param callback The optional method to call when the string is inserted
-         * @param userContext Optional variable for any state data that is passed to the asynchronous method
-         */
-        makeEwsRequestAsync(data: any, callback?: (result: AsyncResult) => void, userContext?: any): void;
-    }
-    export interface Message extends Item {
-        conversationId: string;
-    }
-    export interface MeetingRequest extends Message {
-        start: Date;
-        end: Date;
-        location: string;
-        optionalAttendees: EmailAddressDetails[];
-        requiredAttendees: EmailAddressDetails[];
-    }
-    export interface MeetingSuggestion {
-        meetingString: string;
-        attendees: EmailAddressDetails[];
-        location: string;
-        subject: string;
-        start: Date;
-        end: Date;
-    }
-    export interface PhoneNumber {
-        phoneString: string;
-        originalPhoneString: string;
-        type: string;
-    }
-    export interface Recipients {
-        /**
-         * Begins an asynchronous request to add a recipient list to an appointment or message
-         * @param recipients The recipients to add to the recipients list
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        addAsync(recipients: any, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Begins an asynchronous request to get the recipient list for an appointment or message
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        getAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Begins an asynchronous request to set the recipient list for an appointment or message
-         * @param recipients The recipients to add to the recipients list
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        setAsync(recipients: any, options?: any, callback?: (result: AsyncResult) => void): void;
-    }
-    export interface RoamingSettings {
-        /**
-         * Retrieves the specified setting
-         * @param name The case-sensitive name of the setting to retrieve
-         */
-        get(name: string): any;
-        /**
-         * Removes the specified setting
-         * @param name The case-sensitive name of the setting to remove
-         */
-        remove(name: string): void;
-        /**
-         * Saves the settings
-         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult
-         */
-        saveAsync(callback?: (result: AsyncResult) => void): void;
-        /**
-         * Sets or creates the specified setting
-         * @param name The case-sensitive name of the setting to set or create
-         * @param value Specifies the value to be stored
-         */
-        set(name: string, value: any): void;
-    }
-    export interface Subject {
-        /**
-         * Begins an asynchronous request to get the subject of an appointment or message
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        getAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Begins an asynchronous call to set the subject of an appointment or message
-         * @param data The subject of the appointment. The string is limited to 255 characters
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        setAsync(data: string, options?: any, callback?: (result: AsyncResult) => void): void;
-    }
-    export interface TaskSuggestion {
-        assignees: EmailUser[];
-        taskString: string;
-    }
-    export interface Time {
-        /**
-         * Begins an asynchronous request to get the start or end time
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        getAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Begins an asynchronous request to set the start or end time
-         * @param dateTime A date-time object in Coordinated Universal Time (UTC)
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        setAsync(dateTime: Date, options?: any, callback?: (result: AsyncResult) => void): void;
-    }
-    export interface UserProfile {
-        displayName: string;
-        emailAddress: string;
-        timeZone: string;
-    }
-}
-
diff --git a/office-js/tsconfig.json b/office-js/tsconfig.json
new file mode 100644
index 0000000000..f446ea6a71
--- /dev/null
+++ b/office-js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "office-js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/offline-js/offline-js.d.ts b/offline-js/index.d.ts
similarity index 100%
rename from offline-js/offline-js.d.ts
rename to offline-js/index.d.ts
diff --git a/offline-js/offline-js-tests.ts b/offline-js/offline-js-tests.ts
index d43f091fa6..d2dfb87cc8 100644
--- a/offline-js/offline-js-tests.ts
+++ b/offline-js/offline-js-tests.ts
@@ -1,5 +1,5 @@
 // Test file for offline-js.
-/// <reference path="offline-js.d.ts" />
+
 
 Offline.options = {
     checkOnLoad: false,
diff --git a/offline-js/tsconfig.json b/offline-js/tsconfig.json
new file mode 100644
index 0000000000..1edabb1b76
--- /dev/null
+++ b/offline-js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "offline-js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/oidc-token-manager/oidc-token-manager.d.ts b/oidc-token-manager/index.d.ts
similarity index 100%
rename from oidc-token-manager/oidc-token-manager.d.ts
rename to oidc-token-manager/index.d.ts
diff --git a/oidc-token-manager/oidc-token-manager-tests.ts b/oidc-token-manager/oidc-token-manager-tests.ts
index 71261cce1a..a548a4aefc 100644
--- a/oidc-token-manager/oidc-token-manager-tests.ts
+++ b/oidc-token-manager/oidc-token-manager-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="oidc-token-manager.d.ts" />
+
 
 var config = {
     client_id: "implicitclient",
diff --git a/oidc-token-manager/tsconfig.json b/oidc-token-manager/tsconfig.json
new file mode 100644
index 0000000000..b62397d01e
--- /dev/null
+++ b/oidc-token-manager/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "oidc-token-manager-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/on-finished/index.d.ts b/on-finished/index.d.ts
new file mode 100644
index 0000000000..ec07267131
--- /dev/null
+++ b/on-finished/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for on-finished v2.2.0
+// Project: https://github.com/jshttp/on-finished
+// Definitions by: Honza Dvorsky <http://github.com/czechboy0>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+
+declare function onFinished(msg: NodeJS.EventEmitter, listener: Function): NodeJS.EventEmitter;
+
+declare namespace onFinished {
+    export function isFinished(msg: NodeJS.EventEmitter): boolean;
+}
+
+export = onFinished;
diff --git a/on-finished/on-finished-tests.ts b/on-finished/on-finished-tests.ts
index c3956ac6b0..57040531fc 100644
--- a/on-finished/on-finished-tests.ts
+++ b/on-finished/on-finished-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../node/node.d.ts" />
-/// <reference path="./on-finished.d.ts" />
+/// <reference types="node" />
 
 import events = require('events');
 import onFinished = require('on-finished');
diff --git a/on-finished/on-finished.d.ts b/on-finished/on-finished.d.ts
deleted file mode 100644
index d81ad766a9..0000000000
--- a/on-finished/on-finished.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Type definitions for on-finished v2.2.0
-// Project: https://github.com/jshttp/on-finished
-// Definitions by: Honza Dvorsky <http://github.com/czechboy0>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-
-declare module 'on-finished' {
-
-    function onFinished(msg:NodeJS.EventEmitter, listener:Function): NodeJS.EventEmitter;
-
-    namespace onFinished {
-        export function isFinished(msg:NodeJS.EventEmitter):boolean;
-    }
-
-    export = onFinished;
-}
diff --git a/on-finished/tsconfig.json b/on-finished/tsconfig.json
new file mode 100644
index 0000000000..25280666ff
--- /dev/null
+++ b/on-finished/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "on-finished-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/on-headers/index.d.ts b/on-headers/index.d.ts
new file mode 100644
index 0000000000..e9931798c5
--- /dev/null
+++ b/on-headers/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for serve-favicon 2.1.6
+// Project: https://github.com/jshttp/on-headers
+// Definitions by: John Jeffery <https://github.com/jjeffery/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import http = require("http");
+
+/**
+ * This will add the listener to fire when headers are emitted for res.
+ * The listener is passed the response object as its context (this).
+ * Headers are considered emitted only once, right before they 
+ * are sent to the client.
+ *
+ * When this is called multiple times on the same res, the listeners
+ * are fired in the reverse order they were added.
+ *
+ * @param res HTTP server response object
+ * @param listener Function to call prior to headers being emitted,
+ *        the response object is passed as this context.
+ */
+declare function onHeaders(res: http.ServerResponse, listener: Function): void;
+
+// Note that this definition might be able to be improved in a future
+// version of typescript. At the moment it is not possible to declare
+// the type of the 'this' context for a function, but it might be included
+// in a future typescript version.
+// https://github.com/Microsoft/TypeScript/issues/229
+
+export = onHeaders;
diff --git a/on-headers/on-headers-tests.ts b/on-headers/on-headers-tests.ts
index 11f33c4ef0..3776ab2ba2 100644
--- a/on-headers/on-headers-tests.ts
+++ b/on-headers/on-headers-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="on-headers.d.ts"/>
-
-import http = require('http')
+import http = require('http')
 import onHeaders = require('on-headers')
 
 http.createServer(onRequest)
diff --git a/on-headers/on-headers.d.ts b/on-headers/on-headers.d.ts
deleted file mode 100644
index 8ac8e2a2e2..0000000000
--- a/on-headers/on-headers.d.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// Type definitions for serve-favicon 2.1.6
-// Project: https://github.com/jshttp/on-headers
-// Definitions by: John Jeffery <https://github.com/jjeffery/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "on-headers" {
-    import http = require("http");
-
-    /**
-     * This will add the listener to fire when headers are emitted for res.
-     * The listener is passed the response object as its context (this).
-     * Headers are considered emitted only once, right before they 
-     * are sent to the client.
-     *
-     * When this is called multiple times on the same res, the listeners
-     * are fired in the reverse order they were added.
-     *
-     * @param res HTTP server response object
-     * @param listener Function to call prior to headers being emitted,
-     *        the response object is passed as this context.
-     */
-    function onHeaders(res: http.ServerResponse, listener: Function):void;
-
-    // Note that this definition might be able to be improved in a future
-    // version of typescript. At the moment it is not possible to declare
-    // the type of the 'this' context for a function, but it might be included
-    // in a future typescript version.
-    // https://github.com/Microsoft/TypeScript/issues/229
-
-    export = onHeaders;
-}
\ No newline at end of file
diff --git a/on-headers/tsconfig.json b/on-headers/tsconfig.json
new file mode 100644
index 0000000000..43a156419a
--- /dev/null
+++ b/on-headers/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "on-headers-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/once/once.d.ts b/once/index.d.ts
similarity index 100%
rename from once/once.d.ts
rename to once/index.d.ts
diff --git a/once/once-tests.ts b/once/once-tests.ts
index 05f60f0400..a7931aced2 100644
--- a/once/once-tests.ts
+++ b/once/once-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="once.d.ts" />
+
 
 import once from "once";
 
diff --git a/once/tsconfig.json b/once/tsconfig.json
new file mode 100644
index 0000000000..442bcc43fa
--- /dev/null
+++ b/once/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "once-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/onoff/index.d.ts b/onoff/index.d.ts
new file mode 100644
index 0000000000..c080025735
--- /dev/null
+++ b/onoff/index.d.ts
@@ -0,0 +1,53 @@
+// Type definitions for onoff
+// Project: https://github.com/fivdi/onoff
+// Definitions by: Marcel Ernst <https://github.com/marcel-ernst>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export = __ONOFF;
+
+declare namespace __ONOFF {
+
+    var version:string;
+
+    interface GpioOptions {
+        debounceTimeout:number;
+    }
+
+    class Gpio {
+        constructor(gpio:number, direction:string);
+        constructor(gpio:number, direction:string, edge:string);
+        constructor(gpio:number, direction:string, edge:string, options:GpioOptions);
+        constructor(gpio:number, direction:string, options:GpioOptions);
+
+        gpio:number
+        gpioPath:string;
+        opts:GpioOptions;
+        readBuffer:Buffer;
+        listeners:Array<(error:Error, value:number) => void>;
+        valueFd:number;
+
+        read(cb:(err:Error, value:number) => void):void;
+        readSync():number;
+
+        write(value:number, cb:(err:Error, value:number) => void):void;
+        writeSync(value:number):void;
+
+        watch(cb:(error:Error, value:number) => void):void;
+        unwatch():void;
+        unwatch(cb:(error:Error, value:number) => void):void;
+        unwatchAll():void;
+
+        direction():string;
+        setDirection(value:string):void;
+
+        edge():string;
+        setEdge(value:string):void;
+
+        options():GpioOptions;
+
+        unexport():void;
+    }
+
+}
\ No newline at end of file
diff --git a/onoff/onoff-tests.ts b/onoff/onoff-tests.ts
index d838360bd6..cd39dc4a8d 100644
--- a/onoff/onoff-tests.ts
+++ b/onoff/onoff-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="onoff" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 import * as onoff from 'onoff';
 
 var led:onoff.Gpio = new onoff.Gpio(17, 'out');
diff --git a/onoff/onoff.d.ts b/onoff/onoff.d.ts
deleted file mode 100644
index 9a4ade5931..0000000000
--- a/onoff/onoff.d.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-// Type definitions for onoff
-// Project: https://github.com/fivdi/onoff
-// Definitions by: Marcel Ernst <https://github.com/marcel-ernst>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare namespace __ONOFF {
-
-    var version:string;
-
-    interface GpioOptions {
-        debounceTimeout:number;
-    }
-
-    class Gpio {
-        constructor(gpio:number, direction:string);
-        constructor(gpio:number, direction:string, edge:string);
-        constructor(gpio:number, direction:string, edge:string, options:GpioOptions);
-        constructor(gpio:number, direction:string, options:GpioOptions);
-
-        gpio:number
-        gpioPath:string;
-        opts:GpioOptions;
-        readBuffer:Buffer;
-        listeners:Array<(error:Error, value:number) => void>;
-        valueFd:number;
-
-        read(cb:(err:Error, value:number) => void):void;
-        readSync():number;
-
-        write(value:number, cb:(err:Error, value:number) => void):void;
-        writeSync(value:number):void;
-
-        watch(cb:(error:Error, value:number) => void):void;
-        unwatch():void;
-        unwatch(cb:(error:Error, value:number) => void):void;
-        unwatchAll():void;
-
-        direction():string;
-        setDirection(value:string):void;
-
-        edge():string;
-        setEdge(value:string):void;
-
-        options():GpioOptions;
-
-        unexport():void;
-    }
-
-}
-
-declare module "onoff" {
-    export = __ONOFF;
-}
\ No newline at end of file
diff --git a/onoff/tsconfig.json b/onoff/tsconfig.json
new file mode 100644
index 0000000000..484a4ff53c
--- /dev/null
+++ b/onoff/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "onoff-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/onsenui/onsenui.d.ts b/onsenui/index.d.ts
similarity index 100%
rename from onsenui/onsenui.d.ts
rename to onsenui/index.d.ts
diff --git a/onsenui/onsenui-tests.ts b/onsenui/onsenui-tests.ts
index f0918dc624..57bfd30835 100644
--- a/onsenui/onsenui-tests.ts
+++ b/onsenui/onsenui-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="onsenui.d.ts" />
+
 
 function onsStatic(): void {
 	ons.ready(function(): void {
diff --git a/onsenui/tsconfig.json b/onsenui/tsconfig.json
new file mode 100644
index 0000000000..16c0038394
--- /dev/null
+++ b/onsenui/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "onsenui-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/open/index.d.ts b/open/index.d.ts
new file mode 100644
index 0000000000..9822824a98
--- /dev/null
+++ b/open/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for open 0.0.3
+// Project: https://github.com/jjrdn/node-open
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function open(target: string, app?: string): void;
+export = open;
diff --git a/open/open-tests.ts b/open/open-tests.ts
index a529fa9cf2..fa7701553e 100644
--- a/open/open-tests.ts
+++ b/open/open-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="open.d.ts" />
 
 import open = require('open');
 
diff --git a/open/open.d.ts b/open/open.d.ts
deleted file mode 100644
index bca02e5ac1..0000000000
--- a/open/open.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for open 0.0.3
-// Project: https://github.com/jjrdn/node-open
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'open' {
-	function open(target: string, app?: string): void;
-	export = open;
-}
diff --git a/open/tsconfig.json b/open/tsconfig.json
new file mode 100644
index 0000000000..396e301103
--- /dev/null
+++ b/open/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "open-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/openlayers/openlayers.d.ts b/openlayers/index.d.ts
similarity index 100%
rename from openlayers/openlayers.d.ts
rename to openlayers/index.d.ts
diff --git a/openlayers/openlayers-tests.ts b/openlayers/openlayers-tests.ts
index 3858720e23..ac8190ce05 100644
--- a/openlayers/openlayers-tests.ts
+++ b/openlayers/openlayers-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="openlayers.d.ts" />
+
 
 // Basic type variables for test functions
 var voidValue: void;
diff --git a/openlayers/tsconfig.json b/openlayers/tsconfig.json
new file mode 100644
index 0000000000..fb8ffee6c0
--- /dev/null
+++ b/openlayers/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "openlayers-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/openpgp/openpgp.d.ts b/openpgp/index.d.ts
similarity index 100%
rename from openpgp/openpgp.d.ts
rename to openpgp/index.d.ts
diff --git a/openpgp/openpgp-tests.ts b/openpgp/openpgp-tests.ts
index 464bc77cdd..744c76fb53 100644
--- a/openpgp/openpgp-tests.ts
+++ b/openpgp/openpgp-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="openpgp.d.ts" />
+
 
 // Open PGP Sample codes
 
diff --git a/openpgp/tsconfig.json b/openpgp/tsconfig.json
new file mode 100644
index 0000000000..184951df76
--- /dev/null
+++ b/openpgp/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "openpgp-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/opn/index.d.ts b/opn/index.d.ts
new file mode 100644
index 0000000000..78a1043442
--- /dev/null
+++ b/opn/index.d.ts
@@ -0,0 +1,80 @@
+// Type definitions for opn 3.0.2
+// Project: https://github.com/sindresorhus/opn
+// Definitions by: Shinnosuke Watanabe <https://github.com/shinnn>,
+//                 Maxime LUCE <https://github.com/SomaticIT>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as cp from "child_process";
+
+interface DefaultFunction {
+    /**
+     * Uses the command open on OS X, start on Windows and xdg-open on other platforms.
+     * 
+     * Returns the spawned child process. 
+     * You'd normally not need to use this for anything, but it can be useful if you'd like 
+     * to attach custom event listeners or perform other operations directly on the spawned process.
+     * 
+* @param target - The thing you want to open. Can be a URL, file, or executable. Opens in the default app for the file type. Eg. URLs opens in your default browser.
+     */
+    (target: string): cp.ChildProcess;
+
+    /**
+     * Uses the command open on OS X, start on Windows and xdg-open on other platforms.
+     * 
+     * Returns the spawned child process. 
+     * You'd normally not need to use this for anything, but it can be useful if you'd like 
+     * to attach custom event listeners or perform other operations directly on the spawned process.
+     * 
+ * @param target - The thing you want to open. Can be a URL, file, or executable. Opens in the default app for the file type. Eg. URLs opens in your default browser.
+     * @param callback- Called when the opened app exits, or if `wait: false`, immediately when opening.
+     */
+    (target: string, callback: (err: Error) => void): cp.ChildProcess;
+
+    /**
+     * Uses the command open on OS X, start on Windows and xdg-open on other platforms.
+     * 
+     * Returns the spawned child process. 
+     * You'd normally not need to use this for anything, but it can be useful if you'd like 
+     * to attach custom event listeners or perform other operations directly on the spawned process.
+     * 
+     * @param target - The thing you want to open. Can be a URL, file, or executable. Opens in the default app for the file type. Eg. URLs opens in your default browser.
+     * @param options - Options to be passed to opn.
+     */
+    (target: string, options: Opn.Options): cp.ChildProcess;
+
+    /**
+     * Uses the command open on OS X, start on Windows and xdg-open on other platforms.
+     * 
+     * Returns the spawned child process. 
+     * You'd normally not need to use this for anything, but it can be useful if you'd like 
+     * to attach custom event listeners or perform other operations directly on the spawned process.
+     * 
+     * @param target - The thing you want to open. Can be a URL, file, or executable. Opens in the default app for the file type. Eg. URLs opens in your default browser.
+     * @param options - Options to be passed to opn.
+     * @param callback- Called when the opened app exits, or if `wait: false`, immediately when opening.
+     */
+    (target: string, options: Opn.Options, callback: (err: Error) => void): cp.ChildProcess;
+}
+
+declare var opn: DefaultFunction;
+export = opn;
+
+declare namespace Opn {
+    export interface Options {
+        /**
+         * Wait for the opened app to exit before calling the `callback`. 
+         * If `false` it's called immediately when opening the app.
+         * On Windows you have to explicitly specify an app for it to be able to wait.
+         */
+        wait?: boolean;
+        
+        /**
+         * Specify the app to open the target with, or an array with the app and app arguments.
+         * The app name is platform dependent. Don't hard code it in reusable modules. 
+         * Eg. Chrome is `google chrome` on OS X, `google-chrome` on Linux and `chrome` on Windows.
+         */
+        app?: string | string[];
+    }
+}
diff --git a/opn/opn-tests.ts b/opn/opn-tests.ts
index 2b39f1950c..33a043de9f 100644
--- a/opn/opn-tests.ts
+++ b/opn/opn-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="opn.d.ts" />
+
 
 import * as opn from "opn";
 
diff --git a/opn/opn.d.ts b/opn/opn.d.ts
deleted file mode 100644
index 20de0fc474..0000000000
--- a/opn/opn.d.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-// Type definitions for opn 3.0.2
-// Project: https://github.com/sindresorhus/opn
-// Definitions by: Shinnosuke Watanabe <https://github.com/shinnn>,
-//                 Maxime LUCE <https://github.com/SomaticIT>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare namespace Opn {
-    export interface Options {
-        /**
-         * Wait for the opened app to exit before calling the `callback`. 
-         * If `false` it's called immediately when opening the app.
-         * On Windows you have to explicitly specify an app for it to be able to wait.
-         */
-        wait?: boolean;
-        
-        /**
-         * Specify the app to open the target with, or an array with the app and app arguments.
-         * The app name is platform dependent. Don't hard code it in reusable modules. 
-         * Eg. Chrome is `google chrome` on OS X, `google-chrome` on Linux and `chrome` on Windows.
-         */
-        app?: string | string[];
-    }
-}
-
-declare module "opn" {
-    import * as cp from "child_process";
-
-    interface DefaultFunction {
-        /**
-         * Uses the command open on OS X, start on Windows and xdg-open on other platforms.
-         * 
-         * Returns the spawned child process. 
-         * You'd normally not need to use this for anything, but it can be useful if you'd like 
-         * to attach custom event listeners or perform other operations directly on the spawned process.
-         * 
-         * @param target - The thing you want to open. Can be a URL, file, or executable. Opens in the default app for the file type. Eg. URLs opens in your default browser.
-         */
-        (target: string): cp.ChildProcess;
-
-        /**
-         * Uses the command open on OS X, start on Windows and xdg-open on other platforms.
-         * 
-         * Returns the spawned child process. 
-         * You'd normally not need to use this for anything, but it can be useful if you'd like 
-         * to attach custom event listeners or perform other operations directly on the spawned process.
-         * 
-         * @param target - The thing you want to open. Can be a URL, file, or executable. Opens in the default app for the file type. Eg. URLs opens in your default browser.
-         * @param callback- Called when the opened app exits, or if `wait: false`, immediately when opening.
-         */
-        (target: string, callback: (err: Error) => void): cp.ChildProcess;
-
-        /**
-         * Uses the command open on OS X, start on Windows and xdg-open on other platforms.
-         * 
-         * Returns the spawned child process. 
-         * You'd normally not need to use this for anything, but it can be useful if you'd like 
-         * to attach custom event listeners or perform other operations directly on the spawned process.
-         * 
-         * @param target - The thing you want to open. Can be a URL, file, or executable. Opens in the default app for the file type. Eg. URLs opens in your default browser.
-         * @param options - Options to be passed to opn.
-         */
-        (target: string, options: Opn.Options): cp.ChildProcess;
-
-        /**
-         * Uses the command open on OS X, start on Windows and xdg-open on other platforms.
-         * 
-         * Returns the spawned child process. 
-         * You'd normally not need to use this for anything, but it can be useful if you'd like 
-         * to attach custom event listeners or perform other operations directly on the spawned process.
-         * 
-         * @param target - The thing you want to open. Can be a URL, file, or executable. Opens in the default app for the file type. Eg. URLs opens in your default browser.
-         * @param options - Options to be passed to opn.
-         * @param callback- Called when the opened app exits, or if `wait: false`, immediately when opening.
-         */
-        (target: string, options: Opn.Options, callback: (err: Error) => void): cp.ChildProcess;
-    }
-
-    const opn: DefaultFunction;
-    export = opn;
-}
diff --git a/opn/tsconfig.json b/opn/tsconfig.json
new file mode 100644
index 0000000000..f768699c2b
--- /dev/null
+++ b/opn/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "opn-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/optimist/index.d.ts b/optimist/index.d.ts
new file mode 100644
index 0000000000..be4d8993a9
--- /dev/null
+++ b/optimist/index.d.ts
@@ -0,0 +1,88 @@
+// Type definitions for optimist
+// Project: https://github.com/substack/node-optimist
+// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>, Christopher Brown <https://github.com/chbrown>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare namespace optimist {
+    interface Opt {
+        alias?: string | string[];
+        default?: any;
+        demand?: string | number | string[];
+        describe?: string;
+        type?: string;
+    }
+
+    interface Parser {
+        /** Implicitly use process.argv array to construct the argv object */
+        argv: any;
+        /** Pass in the process.argv yourself */
+        (args: string[]): any;
+        /** Use .parse() to do the same thing as treating optimist as a function */
+        parse(args: string[]): any;
+
+        // The types below follow the order and documentation of https://github.com/substack/node-optimist
+
+        /** Set key names as equivalent such that updates to a key will propagate to aliases and vice-versa. */
+        alias(key: string, alias: string | string[]): Parser;
+        /** Take an object that maps keys to aliases. */
+        alias(aliases: { [index: string]: string | string[] }): Parser;
+
+        /** Set argv[key] to value if no option was specified on process.argv */
+        default(key: string, value: any): Parser;
+        /** Take an object that maps keys to default values */
+        default(defaults: { [index: string]: any }): Parser;
+
+        /** Show the usage information and exit if key wasn't specified in process.argv */
+        demand(key: string): Parser;
+        /** Demand at least as many non-option arguments, which show up in argv._ */
+        demand(key: number): Parser;
+        /** Demand each element in key */
+        demand(key: string[]): Parser;
+
+        /** Describe a key for the generated usage information */
+        describe(key: string, desc: string): Parser;
+        /** Take an object that maps keys to descriptions */
+        describe(descriptions: { [index: string]: string }): Parser;
+
+        /** Instead of chaining together, e.g. optimist.alias().demand().default()...,
+        you can specify keys in opt for each of the chainable methods. */
+        options(key: string, opt: Opt): Parser;
+        /** Take an object that maps keys to opt parameters */
+        options(options: { [index: string]: Opt }): Parser;
+
+        /** Set a usage message to show which commands to use. Inside message,
+        the string $0 will get interpolated to the current script name or node
+        command for the present script similar to how $0 works in bash or perl. */
+        usage(message: string): Parser;
+
+        /** Check that certain conditions are met in the provided arguments. If fn
+        throws or returns false, show the thrown error, usage information, and exit.
+        */
+        check(fn: (argv: any) => any): Parser;
+
+        /** Interpret key as a boolean. If a non-flag option follows key in process.argv,
+        that string won't get set as the value of key. If key never shows up as a
+        flag in process.arguments, argv[key] will be false. */
+        boolean(key: string): Parser;
+        /** Interpret all the elements as booleans. */
+        boolean(key: string[]): Parser;
+
+        /** Tell the parser logic not to interpret key as a number or boolean. This can be useful if you need to preserve leading zeros in an input. */
+        string(key: string): Parser;
+        /** Interpret all the elements as strings */
+        string(key: string[]): Parser;
+
+        /** Format usage output to wrap at columns many columns. */
+        wrap(columns: number): Parser;
+
+        /** Return the generated usage string. */
+        help(): string;
+        /** Print the usage data using fn for printing (defaults to console.error). */
+        showHelp(fn?: (message: string) => void): void;
+    }
+}
+
+declare var optimist: optimist.Parser;
+export = optimist;
diff --git a/optimist/optimist-tests.ts b/optimist/optimist-tests.ts
index feaa3d6f7d..83aa25592d 100644
--- a/optimist/optimist-tests.ts
+++ b/optimist/optimist-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="optimist.d.ts" />
 
 import optimist = require('optimist');
 
diff --git a/optimist/optimist.d.ts b/optimist/optimist.d.ts
deleted file mode 100644
index 12a51be1d6..0000000000
--- a/optimist/optimist.d.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-// Type definitions for optimist
-// Project: https://github.com/substack/node-optimist
-// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>, Christopher Brown <https://github.com/chbrown>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "optimist" {
-
-	namespace optimist {
-		interface Opt {
-			alias?: string | string[];
-			default?: any;
-			demand?: string | number | string[];
-			describe?: string;
-			type?: string;
-		}
-
-		interface Parser {
-			/** Implicitly use process.argv array to construct the argv object */
-			argv: any;
-			/** Pass in the process.argv yourself */
-			(args: string[]): any;
-			/** Use .parse() to do the same thing as treating optimist as a function */
-			parse(args: string[]): any;
-
-			// The types below follow the order and documentation of https://github.com/substack/node-optimist
-
-			/** Set key names as equivalent such that updates to a key will propagate to aliases and vice-versa. */
-			alias(key: string, alias: string | string[]): Parser;
-			/** Take an object that maps keys to aliases. */
-			alias(aliases: {[index: string]: string | string[]}): Parser;
-
-			/** Set argv[key] to value if no option was specified on process.argv */
-			default(key: string, value: any): Parser;
-			/** Take an object that maps keys to default values */
-			default(defaults: {[index: string]: any}): Parser;
-
-			/** Show the usage information and exit if key wasn't specified in process.argv */
-			demand(key: string): Parser;
-			/** Demand at least as many non-option arguments, which show up in argv._ */
-			demand(key: number): Parser;
-			/** Demand each element in key */
-			demand(key: string[]): Parser;
-
-			/** Describe a key for the generated usage information */
-			describe(key: string, desc: string): Parser;
-			/** Take an object that maps keys to descriptions */
-			describe(descriptions: {[index: string]: string}): Parser;
-
-			/** Instead of chaining together, e.g. optimist.alias().demand().default()...,
-			you can specify keys in opt for each of the chainable methods. */
-			options(key: string, opt: Opt): Parser;
-			/** Take an object that maps keys to opt parameters */
-			options(options: {[index: string]: Opt}): Parser;
-
-			/** Set a usage message to show which commands to use. Inside message,
-			the string $0 will get interpolated to the current script name or node
-			command for the present script similar to how $0 works in bash or perl. */
-			usage(message: string): Parser;
-
-			/** Check that certain conditions are met in the provided arguments. If fn
-			throws or returns false, show the thrown error, usage information, and exit.
-			*/
-			check(fn: (argv: any) => any): Parser;
-
-			/** Interpret key as a boolean. If a non-flag option follows key in process.argv,
-			that string won't get set as the value of key. If key never shows up as a
-			flag in process.arguments, argv[key] will be false. */
-			boolean(key: string): Parser;
-			/** Interpret all the elements as booleans. */
-			boolean(key: string[]): Parser;
-
-			/** Tell the parser logic not to interpret key as a number or boolean. This can be useful if you need to preserve leading zeros in an input. */
-			string(key: string): Parser;
-			/** Interpret all the elements as strings */
-			string(key: string[]): Parser;
-
-			/** Format usage output to wrap at columns many columns. */
-			wrap(columns: number): Parser;
-
-			/** Return the generated usage string. */
-			help(): string;
-			/** Print the usage data using fn for printing (defaults to console.error). */
-			showHelp(fn?: (message: string) => void): void;
-		}
-	}
-
-	var optimist: optimist.Parser;
-	export = optimist;
-}
diff --git a/optimist/tsconfig.json b/optimist/tsconfig.json
new file mode 100644
index 0000000000..a0d2ef0be7
--- /dev/null
+++ b/optimist/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "optimist-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ora/index.d.ts b/ora/index.d.ts
new file mode 100644
index 0000000000..e58b5575c7
--- /dev/null
+++ b/ora/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for ora
+// Project: https://github.com/sindresorhus/ora
+// Definitions by: Basarat Ali Syed <https://github.com/basarat/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+type Color = 'black' | 'red' | 'green' | 'yellow' | 'blue' | 'magenta' | 'cyan' | 'white' | 'gray';
+type Text = string;
+interface Options {
+    text?: Text;
+    spinner?: string | { interval?: number; frames: string[]; }
+    color?: Color;
+    stream?: any;
+}
+interface Instance {
+    start(): void;
+    stop(): void;
+    clear(): void;
+    frame(): void;
+    render(): void;
+    text: Text;
+    color: Color;
+}
+declare function ora(options: Options | Text): Instance;
+export = ora;
diff --git a/ora/ora-tests.ts b/ora/ora-tests.ts
index bea4f29b51..7116db78ce 100644
--- a/ora/ora-tests.ts
+++ b/ora/ora-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="ora.d.ts" />
 
 import ora = require('ora');
 const spinner = ora('Loading unicorns');
diff --git a/ora/ora.d.ts b/ora/ora.d.ts
deleted file mode 100644
index 692f82b96c..0000000000
--- a/ora/ora.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// Type definitions for ora
-// Project: https://github.com/sindresorhus/ora
-// Definitions by: Basarat Ali Syed <https://github.com/basarat/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'ora' {
-    type Color = 'black' | 'red' | 'green' | 'yellow' | 'blue' | 'magenta' | 'cyan' | 'white' | 'gray';
-    type Text = string;
-    interface Options {
-        text?: Text;
-        spinner?: string | { interval?: number; frames: string[]; }
-        color?: Color;
-        stream?: any;
-    }
-    interface Instance {
-        start(): void;
-        stop(): void;
-        clear(): void;
-        frame(): void;
-        render(): void;
-        text: Text;
-        color: Color;
-    }
-    function ora(options: Options | Text): Instance;
-    export = ora;
-}
diff --git a/ora/tsconfig.json b/ora/tsconfig.json
new file mode 100644
index 0000000000..557d4900c8
--- /dev/null
+++ b/ora/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ora-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/oracledb/index.d.ts b/oracledb/index.d.ts
new file mode 100644
index 0000000000..a9d7a2b3e6
--- /dev/null
+++ b/oracledb/index.d.ts
@@ -0,0 +1,307 @@
+// Type definitions for oracledb v1.5.0
+// Project: https://github.com/oracle/node-oracledb
+// Definitions by: Richard Natal <https://github.com/Bigous>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import * as stream from "stream";
+
+export interface ILob {
+    chunkSize: number;
+    length: number;
+    pieceSize: number;
+    offset?: number;
+    type: string;
+    /**
+     * Release method on ILob class.
+     * @remarks The cleanup() called by Release() only frees OCI error handle and Lob
+     *          locator.  These calls acquire mutex on OCI environment handle very briefly.
+     */
+    release?(): void;
+    /**
+     * Read method on ILob class.
+     * @param {(err : any, chunk: string | Buffer) => void} callback Callback to recive the data from lob.
+     * @remarks CLobs send strings while BLobs send Buffer object.
+     */
+    read?(callback: (err: any, chunk: string | Buffer) => void): void;
+    /**
+     * Read method on ILob class.
+     * @param {Buffer} data Data write into Lob.
+     * @param {(err: any) => void} callback Callback executed when writ is finished or when some error occured.
+     * @remarks CLobs send strings while BLobs send Buffer object.
+     */
+    write?(data: Buffer, callback: (err: any) => void): void;
+}
+
+export interface Lob extends stream.Duplex {
+    iLob: ILob;
+    chunkSize: number;
+    length: number;
+    pieceSize: number;
+    type: string;
+
+    /**
+     * Do not call this... used internally by node-oracledb
+     */
+    constructor(iLob: ILob, opts: stream.DuplexOptions): Lob;
+    constructor(iLob: ILob): Lob;
+
+    /**
+     * Closes the current LOB.
+     * @param  {(err: any) => void} callback? When passed, is called after the release.
+     * @returns void
+     */
+    close(callback: (err: any) => void): void;
+    close(): void;
+}
+
+export interface IConnectionAttributes {
+    user?: string;
+    password?: string;
+    connectString: string;
+    stmtCacheSize?: number;
+    externalAuth?: boolean;
+}
+
+export interface IPoolAttributes extends IConnectionAttributes {
+    poolMax?: number;
+    poolMin?: number;
+    poolIncrement?: number;
+    poolTimeout?: number;
+}
+
+export interface IExecuteOptions {
+    /** Maximum number of rows that will be retrieved. Used when resultSet is false. */
+    maxRows?: number;
+    /** Number of rows to be fetched in advance. */
+    prefetchRows?: number;
+    /** Result format - ARRAY o OBJECT */
+    outFormat?: number;
+    /** Should use ResultSet or not. */
+    resultSet?: boolean;
+    /** Transaction should auto commit after each statement? */
+    autoCommit?: boolean;
+}
+
+export interface IExecuteReturn {
+    /** Number o rows affected by the statement (used for inserts / updates)*/
+    rowsAffected?: number;
+    /** When the statement has out parameters, it comes here. */
+    outBinds?: Array<any> | Object;
+    /** Metadata information - just columns names for now. */
+    metaData?: Array<IMetaData>;
+    /** When not using ResultSet, query results comes here. */
+    rows?: Array<Array<any>> | Array<any>;
+    /** When using ResultSet, query results comes here. */
+    resultSet?: IResultSet;
+}
+
+export interface IMetaData {
+    /** Column name */
+    name: string;
+}
+
+export interface IResultSet {
+    /** Metadata information - just columns names for now. */
+    metaData?: Array<IMetaData>;
+    /**
+     * Closes the ResultSet.
+     * @param  {(err:any)=>void} callback Callback called on finish or when some error occurs
+     * @returns void
+     * @remarks After using a resultSet, it must be closed to free the resources used by the driver.
+     */
+    close(callback: (err: any) => void): void;
+    /**
+     * Fetch one row from ResultSet.
+     * @param  {(err:any,row:Array<any>|Object)=>void} callback Callback called when the row is available or when some error occurs.
+     * @returns void
+     */
+    getRow(callback: (err: any, row: Array<any> | Object) => void): void;
+    /**
+     * Fetch some rows from ResultSet.
+     * @param  {number} rowCount Number of rows to be fetched.
+     * @param  {(err:any,rows:Array<Array<any>>|Array<Object>)=>void} callback Callback called when the rows are available, or when some error occurs.
+     * @returns void
+     * @remarks When the number of rows passed to the callback is less than the rowCount, no more rows are available to be fetched.
+     */
+    getRows(rowCount: number, callback: (err: any, rows: Array<Array<any>> | Array<Object>) => void): void;
+}
+
+export interface IConnection {
+    /** Statement cache size in bytes (read-only)*/
+    stmtCacheSize: number;
+    /** Client id (to be sent to database) (write-only)*/
+    clientId: string;
+    /** Module (write-only) */
+    module: string;
+    /** Action */
+    action: string;
+    /** Oracle server version */
+    oracleServerVersion: number;
+
+    /**
+     * Execute method on Connection class.
+     * @param	{string} sql SQL Statement.
+     * @param	{Object|Array<any>} Binds Binds Object/Array
+     * @param	{IExecuteOptions} options Options object
+     * @param	{(err: any, value: IExecuteReturn) => void} callback Callback function to receive the result.
+     */
+    execute(sql: string,
+        binds: Object | Array<any>,
+        options: IExecuteOptions,
+        callback: (err: any, value: IExecuteReturn) => void): void;
+
+    /**
+     * Execute method on Connection class.
+     * @param	{string} sql SQL Statement.
+     * @param	{Object|Array<any>} Binds Binds Object/Array
+     * @param	{(err: any, value: IExecuteReturn) => void} callback Callback function to receive the result.
+     */
+    execute(sql: string,
+        binds: Object | Array<any>,
+        callback: (err: any, value: IExecuteReturn) => void): void;
+
+    /**
+     * Execute method on Connection class.
+     * @param	{string} sql SQL Statement.
+     * @param	{IExecuteOptions} options Options object
+     * @param	{(err: any, value: IExecuteReturn) => void} callback Callback function to receive the result.
+     */
+    execute(sql: string,
+        options: IExecuteOptions,
+        callback: (err: any, value: IExecuteReturn) => void): void;
+
+    /**
+     * Execute method on Connection class.
+     * @param	{string} sql SQL Statement.
+     * @param	{(err: any, value: IExecuteReturn) => void} callback Callback function to receive the result.
+     */
+    execute(sql: string,
+        callback: (err: any, value: IExecuteReturn) => void): void;
+
+    /**
+     * Release method on Connection class.
+     * @param	{(err: any) => void} callback Callback function to be called when the connection has been released.
+     */
+    release(callback: (err: any) => void): void;
+
+    /**
+     * Send a commit requisition to the database.
+     * @param	{(err: any) => void} callback Callback on commit done.
+     */
+    commit(callback: (err: any) => void): void;
+
+    /**
+     * Send a rollback requisition to database.
+     * @param	{(err: any) => void} callback Callback on rollback done.
+     */
+    rollback(callback: (err: any) => void): void;
+
+    /**
+     * Send a break to the database.
+     * @param	{(err: any) => void} callback Callback on break done.
+     */
+    break(callback: (err: any) => void): void;
+}
+
+export interface IConnectionPool {
+    poolMax: number;
+    poolMin: number;
+    poolIncrement: number;
+    poolTimeout: number;
+    connectionsOpen: number;
+    connectionsInUse: number;
+    stmtCacheSize: number;
+    /**
+     * Finalizes the connection pool.
+     * @param  {(err:any)=>void} callback Callback called when the pool is terminated or when some error occurs
+     * @returns void
+     */
+    terminate(callback: (err: any) => void): void;
+    /**
+     * Retrieve a connection from the pool.
+     * @param  {(err:any,connection:IConnection)=>void} callback Callback called when the connection is available or when some error occurs.
+     * @returns void
+     * @see {@link https://jsao.io/2015/03/making-a-wrapper-module-for-the-node-js-driver-for-oracle-database/}
+     * @see {@link https://github.com/OraOpenSource/orawrap}
+     */
+    getConnection(callback: (err: any, connection: IConnection) => void): void;
+}
+
+export declare const DEFAULT: number;
+/** Data type */
+export declare const STRING: number;
+/** Data type */
+export declare const NUMBER: number;
+/** Data type */
+export declare const DATE: number;
+/** Data type */
+export declare const CURSOR: number;
+/** Data type */
+export declare const BUFFER: number;
+/** Data type */
+export declare const CLOB: number;
+/** Data type */
+export declare const BLOB: number;
+/** Bind direction */
+export declare const BIND_IN: number;
+/** Bind direction */
+export declare const BIND_INOUT: number;
+/** Bind direction */
+export declare const BIND_OUT: number;
+/** outFormat */
+export declare const ARRAY: number;
+/** outFormat */
+export declare const OBJECT: number;
+
+/**
+ * Do not use this method - used internally by node-oracledb.
+ */
+export declare function newLob(iLob: ILob): Lob;
+
+/**
+ * Creates a connection with the database.
+ * @param  {IConnectionAttributes} connectionAttributes Parameters to stablish the connection.
+ * @param  {(err:any,connection:IConnection)=>void} callback Callback to run when the connection gets stablished or when some error occurs.
+ * @returns void
+ */
+export declare function getConnection(connectionAttributes: IConnectionAttributes, callback: (err: any, connection: IConnection) => void): void;
+
+/**
+ * Creates a database managed connection pool.
+ * @param  {IPoolAttributes} poolAttributes Parameters to stablish the connection pool.
+ * @param  {(err:any,connection:IConnectionPool)=>void} callback Callback to run when the connection pool gets created or when some error occurs.
+ * @returns void
+ */
+export declare function createPool(poolAttributes: IPoolAttributes, callback: (err: any, connection: IConnectionPool) => void): void;
+
+/** Default maximum connections in created pools */
+export declare var poolMax: number;
+/** Default minimum connections in created pools */
+export declare var poolMin: number;
+/** Default number of connections to increment when available connections reach 0 in created pools. poolMax will be respected.*/
+export declare var poolIncrement: number;
+/** Default timeout for unused connections in pool to be released. poolMin will be respected.*/
+export declare var poolTimeout: number;
+/** Default size of statements cache. Used to speed up creating queries.*/
+export declare var stmtCacheSize: number;
+/** Default number of rows that the driver will fetch in each query.*/
+export declare var prefetchRows: number;
+/** Default transaction behaviour of auto commit for each statement. */
+export declare var autoCommit: boolean;
+/** Default maximum number of rows to be fetched in statements not using ResultSets */
+export declare var maxRows: number;
+/** Default format for returning rows. When ARRAY, it will return Array<Array<any>>. When OBJECT, it will return Array<Object>. */
+export declare var outFormat: number;
+/** node-oracledb driver version. */
+export declare var version: number;
+export declare var connectionClass: string;
+/** Default authentication/authorization method. When true, the SO trusted user will be used. */
+export declare var externalAuth: boolean;
+export declare var fetchAsString: any;
+/** Default size in bytes that the driver will fetch from LOBs in advance. */
+export declare var lobPrefetchSize: number;
+/** Version of OCI that is used. */
+export declare var oracleClientVersion: number;
diff --git a/oracledb/oracledb-tests.ts b/oracledb/oracledb-tests.ts
index 674775bd79..8e5599d14f 100644
--- a/oracledb/oracledb-tests.ts
+++ b/oracledb/oracledb-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="oracledb.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import * as OracleDB from 'oracledb';
 
diff --git a/oracledb/oracledb.d.ts b/oracledb/oracledb.d.ts
deleted file mode 100644
index c57a8efaae..0000000000
--- a/oracledb/oracledb.d.ts
+++ /dev/null
@@ -1,308 +0,0 @@
-// Type definitions for oracledb v1.5.0
-// Project: https://github.com/oracle/node-oracledb
-// Definitions by: Richard Natal <https://github.com/Bigous>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'oracledb' {
-	import * as stream from "stream";
-
-	export interface ILob {
-		chunkSize: number;
-		length: number;
-		pieceSize: number;
-		offset?: number;
-		type: string;
-		/**
-		 * Release method on ILob class.
-		 * @remarks The cleanup() called by Release() only frees OCI error handle and Lob
-		 *          locator.  These calls acquire mutex on OCI environment handle very briefly.
-		 */
-		release?(): void;
-		/**
-		 * Read method on ILob class.
-		 * @param {(err : any, chunk: string | Buffer) => void} callback Callback to recive the data from lob.
-		 * @remarks CLobs send strings while BLobs send Buffer object.
-		 */
-		read?(callback: (err: any, chunk: string | Buffer) => void): void;
-		/**
-		 * Read method on ILob class.
-		 * @param {Buffer} data Data write into Lob.
-		 * @param {(err: any) => void} callback Callback executed when writ is finished or when some error occured.
-		 * @remarks CLobs send strings while BLobs send Buffer object.
-		 */
-		write?(data: Buffer, callback: (err: any) => void): void;
-	}
-
-	export interface Lob extends stream.Duplex {
-		iLob: ILob;
-		chunkSize: number;
-		length: number;
-		pieceSize: number;
-		type: string;
-
-		/**
-		 * Do not call this... used internally by node-oracledb
-		 */
-		constructor(iLob: ILob, opts: stream.DuplexOptions): Lob;
-		constructor(iLob: ILob): Lob;
-
-		/**
-		 * Closes the current LOB.
-		 * @param  {(err: any) => void} callback? When passed, is called after the release.
-		 * @returns void
-		 */
-		close(callback: (err: any) => void): void;
-		close(): void;
-	}
-
-	export interface IConnectionAttributes {
-		user?: string;
-		password?: string;
-		connectString: string;
-		stmtCacheSize?: number;
-		externalAuth?: boolean;
-	}
-
-	export interface IPoolAttributes extends IConnectionAttributes {
-		poolMax?: number;
-		poolMin?: number;
-		poolIncrement?: number;
-		poolTimeout?: number;
-	}
-
-	export interface IExecuteOptions {
-		/** Maximum number of rows that will be retrieved. Used when resultSet is false. */
-		maxRows?: number;
-		/** Number of rows to be fetched in advance. */
-		prefetchRows?: number;
-		/** Result format - ARRAY o OBJECT */
-		outFormat?: number;
-		/** Should use ResultSet or not. */
-		resultSet?: boolean;
-		/** Transaction should auto commit after each statement? */
-		autoCommit?: boolean;
-	}
-
-	export interface IExecuteReturn {
-		/** Number o rows affected by the statement (used for inserts / updates)*/
-		rowsAffected?: number;
-		/** When the statement has out parameters, it comes here. */
-		outBinds?: Array<any> | Object;
-		/** Metadata information - just columns names for now. */
-		metaData?: Array<IMetaData>;
-		/** When not using ResultSet, query results comes here. */
-		rows?: Array<Array<any>> | Array<any>;
-		/** When using ResultSet, query results comes here. */
-		resultSet?: IResultSet;
-	}
-
-	export interface IMetaData {
-		/** Column name */
-		name: string;
-	}
-
-	export interface IResultSet {
-		/** Metadata information - just columns names for now. */
-		metaData?: Array<IMetaData>;
-		/**
-		 * Closes the ResultSet.
-		 * @param  {(err:any)=>void} callback Callback called on finish or when some error occurs
-		 * @returns void
-		 * @remarks After using a resultSet, it must be closed to free the resources used by the driver.
-		 */
-		close(callback: (err: any) => void): void;
-		/**
-		 * Fetch one row from ResultSet.
-		 * @param  {(err:any,row:Array<any>|Object)=>void} callback Callback called when the row is available or when some error occurs.
-		 * @returns void
-		 */
-		getRow(callback: (err: any, row: Array<any> | Object) => void): void;
-		/**
-		 * Fetch some rows from ResultSet.
-		 * @param  {number} rowCount Number of rows to be fetched.
-		 * @param  {(err:any,rows:Array<Array<any>>|Array<Object>)=>void} callback Callback called when the rows are available, or when some error occurs.
-		 * @returns void
-		 * @remarks When the number of rows passed to the callback is less than the rowCount, no more rows are available to be fetched.
-		 */
-		getRows(rowCount: number, callback: (err: any, rows: Array<Array<any>> | Array<Object>) => void): void;
-	}
-
-	export interface IConnection {
-		/** Statement cache size in bytes (read-only)*/
-		stmtCacheSize: number;
-		/** Client id (to be sent to database) (write-only)*/
-		clientId: string;
-		/** Module (write-only) */
-		module: string;
-		/** Action */
-		action: string;
-		/** Oracle server version */
-		oracleServerVersion: number;
-
-		/**
-		 * Execute method on Connection class.
-		 * @param	{string} sql SQL Statement.
-		 * @param	{Object|Array<any>} Binds Binds Object/Array
-		 * @param	{IExecuteOptions} options Options object
-		 * @param	{(err: any, value: IExecuteReturn) => void} callback Callback function to receive the result.
-		 */
-		execute(sql: string,
-			binds: Object | Array<any>,
-			options: IExecuteOptions,
-			callback: (err: any, value: IExecuteReturn) => void): void;
-
-		/**
-		 * Execute method on Connection class.
-		 * @param	{string} sql SQL Statement.
-		 * @param	{Object|Array<any>} Binds Binds Object/Array
-		 * @param	{(err: any, value: IExecuteReturn) => void} callback Callback function to receive the result.
-		 */
-		execute(sql: string,
-			binds: Object | Array<any>,
-			callback: (err: any, value: IExecuteReturn) => void): void;
-
-		/**
-		 * Execute method on Connection class.
-		 * @param	{string} sql SQL Statement.
-		 * @param	{IExecuteOptions} options Options object
-		 * @param	{(err: any, value: IExecuteReturn) => void} callback Callback function to receive the result.
-		 */
-		execute(sql: string,
-			options: IExecuteOptions,
-			callback: (err: any, value: IExecuteReturn) => void): void;
-
-		/**
-		 * Execute method on Connection class.
-		 * @param	{string} sql SQL Statement.
-		 * @param	{(err: any, value: IExecuteReturn) => void} callback Callback function to receive the result.
-		 */
-		execute(sql: string,
-			callback: (err: any, value: IExecuteReturn) => void): void;
-
-		/**
-		 * Release method on Connection class.
-		 * @param	{(err: any) => void} callback Callback function to be called when the connection has been released.
-		 */
-		release(callback: (err: any) => void): void;
-
-		/**
-		 * Send a commit requisition to the database.
-		 * @param	{(err: any) => void} callback Callback on commit done.
-		 */
-		commit(callback: (err: any) => void): void;
-
-		/**
-		 * Send a rollback requisition to database.
-		 * @param	{(err: any) => void} callback Callback on rollback done.
-		 */
-		rollback(callback: (err: any) => void): void;
-
-		/**
-		 * Send a break to the database.
-		 * @param	{(err: any) => void} callback Callback on break done.
-		 */
-		break(callback: (err: any) => void): void;
-	}
-
-	export interface IConnectionPool {
-		poolMax: number;
-		poolMin: number;
-		poolIncrement: number;
-		poolTimeout: number;
-		connectionsOpen: number;
-		connectionsInUse: number;
-		stmtCacheSize: number;
-		/**
-		 * Finalizes the connection pool.
-		 * @param  {(err:any)=>void} callback Callback called when the pool is terminated or when some error occurs
-		 * @returns void
-		 */
-		terminate(callback: (err: any) => void): void;
-		/**
-		 * Retrieve a connection from the pool.
-		 * @param  {(err:any,connection:IConnection)=>void} callback Callback called when the connection is available or when some error occurs.
-		 * @returns void
-		 * @see {@link https://jsao.io/2015/03/making-a-wrapper-module-for-the-node-js-driver-for-oracle-database/}
-		 * @see {@link https://github.com/OraOpenSource/orawrap}
-		 */
-		getConnection(callback: (err: any, connection: IConnection) => void): void;
-	}
-
-	export const DEFAULT: number;
-	/** Data type */
-	export const STRING: number;
-	/** Data type */
-	export const NUMBER: number;
-	/** Data type */
-	export const DATE: number;
-	/** Data type */
-	export const CURSOR: number;
-	/** Data type */
-	export const BUFFER: number;
-	/** Data type */
-	export const CLOB: number;
-	/** Data type */
-	export const BLOB: number;
-	/** Bind direction */
-	export const BIND_IN: number;
-	/** Bind direction */
-	export const BIND_INOUT: number;
-	/** Bind direction */
-	export const BIND_OUT: number;
-	/** outFormat */
-	export const ARRAY: number;
-	/** outFormat */
-	export const OBJECT: number;
-
-	/**
-	 * Do not use this method - used internally by node-oracledb.
-	 */
-	export function newLob(iLob: ILob): Lob;
-
-	/**
-	 * Creates a connection with the database.
-	 * @param  {IConnectionAttributes} connectionAttributes Parameters to stablish the connection.
-	 * @param  {(err:any,connection:IConnection)=>void} callback Callback to run when the connection gets stablished or when some error occurs.
-	 * @returns void
-	 */
-	export function getConnection(connectionAttributes: IConnectionAttributes, callback: (err: any, connection: IConnection) => void): void;
-
-	/**
-	 * Creates a database managed connection pool.
-	 * @param  {IPoolAttributes} poolAttributes Parameters to stablish the connection pool.
-	 * @param  {(err:any,connection:IConnectionPool)=>void} callback Callback to run when the connection pool gets created or when some error occurs.
-	 * @returns void
-	 */
-	export function createPool(poolAttributes: IPoolAttributes, callback: (err: any, connection: IConnectionPool) => void): void;
-
-	/** Default maximum connections in created pools */
-	export var poolMax: number;
-	/** Default minimum connections in created pools */
-	export var poolMin: number;
-	/** Default number of connections to increment when available connections reach 0 in created pools. poolMax will be respected.*/
-	export var poolIncrement: number;
-	/** Default timeout for unused connections in pool to be released. poolMin will be respected.*/
-	export var poolTimeout: number;
-	/** Default size of statements cache. Used to speed up creating queries.*/
-	export var stmtCacheSize: number;
-	/** Default number of rows that the driver will fetch in each query.*/
-	export var prefetchRows: number;
-	/** Default transaction behaviour of auto commit for each statement. */
-	export var autoCommit: boolean;
-	/** Default maximum number of rows to be fetched in statements not using ResultSets */
-	export var maxRows: number;
-	/** Default format for returning rows. When ARRAY, it will return Array<Array<any>>. When OBJECT, it will return Array<Object>. */
-	export var outFormat: number;
-	/** node-oracledb driver version. */
-	export var version: number;
-	export var connectionClass: string;
-	/** Default authentication/authorization method. When true, the SO trusted user will be used. */
-	export var externalAuth: boolean;
-	export var fetchAsString: any;
-	/** Default size in bytes that the driver will fetch from LOBs in advance. */
-	export var lobPrefetchSize: number;
-	/** Version of OCI that is used. */
-	export var oracleClientVersion: number;
-}
diff --git a/oracledb/tsconfig.json b/oracledb/tsconfig.json
new file mode 100644
index 0000000000..a8a941c9d4
--- /dev/null
+++ b/oracledb/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "oracledb-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/orchestrator/index.d.ts b/orchestrator/index.d.ts
new file mode 100644
index 0000000000..4ca354ab69
--- /dev/null
+++ b/orchestrator/index.d.ts
@@ -0,0 +1,125 @@
+// Type definitions for Orchestrator
+// Project: https://github.com/orchestrator/orchestrator
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="Q" />
+
+declare type Strings = string|string[];
+
+declare class Orchestrator {
+    add: Orchestrator.AddMethod;
+    /**
+     * Have you defined a task with this name?
+     * @param name The task name to query
+     */
+    hasTask(name: string): boolean;
+    start: Orchestrator.StartMethod;
+    stop(): void;
+
+    /**
+     * Listen to orchestrator internals
+     * @param event Event name to listen to:
+     * <ul>
+     *   <li>start: from start() method, shows you the task sequence
+     *   <li>stop: from stop() method, the queue finished successfully
+     *   <li>err: from stop() method, the queue was aborted due to a task error
+     *   <li>task_start: from _runTask() method, task was started
+     *   <li>task_stop: from _runTask() method, task completed successfully
+     *   <li>task_err: from _runTask() method, task errored
+     *   <li>task_not_found: from start() method, you're trying to start a task that doesn't exist
+     *   <li>task_recursion: from start() method, there are recursive dependencies in your task list
+     * </ul>
+     * @param cb Passes single argument: e: event details
+     */
+    on(event: string, cb: (e: Orchestrator.OnCallbackEvent) => any): Orchestrator;
+
+    /**
+     * Listen to all orchestrator events from one callback
+     * @param cb Passes single argument: e: event details
+     */
+    onAll(cb: (e: Orchestrator.OnAllCallbackEvent) => any): void;
+}
+
+declare namespace Orchestrator {
+    interface AddMethodCallback {
+        /**
+         * Accept a callback
+         * @param callback
+         */
+        (callback?: Function): any;
+        /**
+         * Return a promise
+         */
+        (): Q.Promise<any>;
+        /**
+         * Return a stream: (task is marked complete when stream ends)
+         */
+        (): any; //TODO: stream type should be here e.g. map-stream
+    }
+
+    /**
+     * Define a task
+     */
+    interface AddMethod {
+        /**
+         * Define a task
+         * @param name The name of the task.
+         * @param deps An array of task names to be executed and completed before your task will run.
+         * @param fn The function that performs the task's operations. For asynchronous tasks, you need to provide a hint when the task is complete:
+         * <ul>
+         *     <li>Take in a callback</li>
+         *     <li>Return a stream or a promise</li>
+         * </ul>
+         */
+        (name: string, deps?: string[], fn?: AddMethodCallback|Function): Orchestrator;
+        /**
+         * Define a task
+         * @param name The name of the task.
+         * @param fn The function that performs the task's operations. For asynchronous tasks, you need to provide a hint when the task is complete:
+         * <ul>
+         *     <li>Take in a callback</li>
+         *     <li>Return a stream or a promise</li>
+         * </ul>
+         */
+        (name: string, fn?: AddMethodCallback|Function): Orchestrator;
+    }
+
+    /**
+     * Start running the tasks
+     */
+    interface StartMethod {
+        /**
+         * Start running the tasks
+         * @param tasks Tasks to be executed. You may pass any number of tasks as individual arguments.
+         * @param cb Callback to call after run completed.
+         */
+        (tasks: Strings, cb?: (error?: any) => any): Orchestrator;
+        /**
+         * Start running the tasks
+         * @param tasks Tasks to be executed. You may pass any number of tasks as individual arguments.
+         * @param cb Callback to call after run completed.
+         */
+        (...tasks: Strings[]/*, cb?: (error: any) => any */): Orchestrator;
+        //TODO: TypeScript 1.5.3 cannot express varargs followed by callback as a last argument...
+        (task1: Strings, task2: Strings, cb?: (error?: any) => any): Orchestrator;
+        (task1: Strings, task2: Strings, task3: Strings, cb?: (error?: any) => any): Orchestrator;
+        (task1: Strings, task2: Strings, task3: Strings, task4: Strings, cb?: (error?: any) => any): Orchestrator;
+        (task1: Strings, task2: Strings, task3: Strings, task4: Strings, task5: Strings, cb?: (error?: any) => any): Orchestrator;
+        (task1: Strings, task2: Strings, task3: Strings, task4: Strings, task5: Strings, task6: Strings, cb?: (error?: any) => any): Orchestrator;
+    }
+
+    interface OnCallbackEvent {
+        message: string;
+        task: string;
+        err: any;
+        duration?: number;
+    }
+
+    interface OnAllCallbackEvent extends OnCallbackEvent {
+        src: string;
+    }
+
+}
+
+export = Orchestrator;
diff --git a/orchestrator/orchestrator-tests.ts b/orchestrator/orchestrator-tests.ts
index 6f1a4a79bf..4897a875e6 100644
--- a/orchestrator/orchestrator-tests.ts
+++ b/orchestrator/orchestrator-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="../requirejs/require.d.ts" />
-/// <reference path="orchestrator.d.ts" />
-
 'use strict';
 
 import Orchestrator = require('orchestrator');
@@ -30,7 +27,7 @@ orchestrator.add('thing2', function(callback: any){
 });
 
 
-var Q = require('q');
+import Q = require('q');
 
 orchestrator.add('thing3', function(){
     var deferred = Q.defer();
diff --git a/orchestrator/orchestrator.d.ts b/orchestrator/orchestrator.d.ts
deleted file mode 100644
index a7ed2b4ae9..0000000000
--- a/orchestrator/orchestrator.d.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-// Type definitions for Orchestrator
-// Project: https://github.com/orchestrator/orchestrator
-// Definitions by: Qubo <https://github.com/tkQubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../q/Q.d.ts" />
-
-declare type Strings = string|string[];
-
-declare module "orchestrator" {
-    class Orchestrator {
-        add: Orchestrator.AddMethod;
-        /**
-         * Have you defined a task with this name?
-         * @param name The task name to query
-         */
-        hasTask(name: string): boolean;
-        start: Orchestrator.StartMethod;
-        stop(): void;
-
-        /**
-         * Listen to orchestrator internals
-         * @param event Event name to listen to:
-         * <ul>
-         *   <li>start: from start() method, shows you the task sequence
-         *   <li>stop: from stop() method, the queue finished successfully
-         *   <li>err: from stop() method, the queue was aborted due to a task error
-         *   <li>task_start: from _runTask() method, task was started
-         *   <li>task_stop: from _runTask() method, task completed successfully
-         *   <li>task_err: from _runTask() method, task errored
-         *   <li>task_not_found: from start() method, you're trying to start a task that doesn't exist
-         *   <li>task_recursion: from start() method, there are recursive dependencies in your task list
-         * </ul>
-         * @param cb Passes single argument: e: event details
-         */
-        on(event: string, cb: (e: Orchestrator.OnCallbackEvent) => any): Orchestrator;
-
-        /**
-         * Listen to all orchestrator events from one callback
-         * @param cb Passes single argument: e: event details
-         */
-        onAll(cb: (e: Orchestrator.OnAllCallbackEvent) => any): void;
-    }
-
-    namespace Orchestrator {
-        interface AddMethodCallback {
-            /**
-             * Accept a callback
-             * @param callback
-             */
-            (callback?: Function): any;
-            /**
-             * Return a promise
-             */
-            (): Q.Promise<any>;
-            /**
-             * Return a stream: (task is marked complete when stream ends)
-             */
-            (): any; //TODO: stream type should be here e.g. map-stream
-        }
-
-        /**
-         * Define a task
-         */
-        interface AddMethod {
-            /**
-             * Define a task
-             * @param name The name of the task.
-             * @param deps An array of task names to be executed and completed before your task will run.
-             * @param fn The function that performs the task's operations. For asynchronous tasks, you need to provide a hint when the task is complete:
-             * <ul>
-             *     <li>Take in a callback</li>
-             *     <li>Return a stream or a promise</li>
-             * </ul>
-             */
-            (name: string, deps?: string[], fn?: AddMethodCallback|Function): Orchestrator;
-            /**
-             * Define a task
-             * @param name The name of the task.
-             * @param fn The function that performs the task's operations. For asynchronous tasks, you need to provide a hint when the task is complete:
-             * <ul>
-             *     <li>Take in a callback</li>
-             *     <li>Return a stream or a promise</li>
-             * </ul>
-             */
-            (name: string, fn?: AddMethodCallback|Function): Orchestrator;
-        }
-
-        /**
-         * Start running the tasks
-         */
-        interface StartMethod {
-            /**
-             * Start running the tasks
-             * @param tasks Tasks to be executed. You may pass any number of tasks as individual arguments.
-             * @param cb Callback to call after run completed.
-             */
-            (tasks: Strings, cb?: (error?: any) => any): Orchestrator;
-            /**
-             * Start running the tasks
-             * @param tasks Tasks to be executed. You may pass any number of tasks as individual arguments.
-             * @param cb Callback to call after run completed.
-             */
-            (...tasks: Strings[]/*, cb?: (error: any) => any */): Orchestrator;
-            //TODO: TypeScript 1.5.3 cannot express varargs followed by callback as a last argument...
-            (task1: Strings, task2: Strings, cb?: (error?: any) => any): Orchestrator;
-            (task1: Strings, task2: Strings, task3: Strings, cb?: (error?: any) => any): Orchestrator;
-            (task1: Strings, task2: Strings, task3: Strings, task4: Strings, cb?: (error?: any) => any): Orchestrator;
-            (task1: Strings, task2: Strings, task3: Strings, task4: Strings, task5: Strings, cb?: (error?: any) => any): Orchestrator;
-            (task1: Strings, task2: Strings, task3: Strings, task4: Strings, task5: Strings, task6: Strings, cb?: (error?: any) => any): Orchestrator;
-        }
-
-        interface OnCallbackEvent {
-            message: string;
-            task: string;
-            err: any;
-            duration?: number;
-        }
-
-        interface OnAllCallbackEvent extends OnCallbackEvent {
-            src: string;
-        }
-
-    }
-
-    export = Orchestrator;
-}
diff --git a/orchestrator/tsconfig.json b/orchestrator/tsconfig.json
new file mode 100644
index 0000000000..abec478f66
--- /dev/null
+++ b/orchestrator/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "orchestrator-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/os-locale/index.d.ts b/os-locale/index.d.ts
new file mode 100644
index 0000000000..c14e3b2bce
--- /dev/null
+++ b/os-locale/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for os-locale 1.4.0
+// Project: https://github.com/sindresorhus/os-locale
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function osLocale(options: { spawn?: boolean }, cb: (err: any, locale: string) => void): void;
+declare function osLocale(cb: (err: any, locale: string) => void): void;
+declare function osLocaleSync(): string;
+declare function osLocaleSync(options: { spawn?: boolean }): string;
+
+export { osLocaleSync as sync };
+export default osLocale;
diff --git a/os-locale/os-locale-tests.ts b/os-locale/os-locale-tests.ts
index bcf5b01291..c54f45f6a0 100644
--- a/os-locale/os-locale-tests.ts
+++ b/os-locale/os-locale-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./os-locale.d.ts" />
 
 import osLocale, { sync } from 'os-locale';
 
diff --git a/os-locale/os-locale.d.ts b/os-locale/os-locale.d.ts
deleted file mode 100644
index 59d4036a92..0000000000
--- a/os-locale/os-locale.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// Type definitions for os-locale 1.4.0
-// Project: https://github.com/sindresorhus/os-locale
-// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "os-locale" {
-	function osLocale(options: {spawn?: boolean}, cb: (err: any, locale: string) => void): void;
-	function osLocale(cb: (err: any, locale: string) => void): void;
-	function osLocaleSync(): string;
-	function osLocaleSync(options: {spawn?: boolean}): string;
-
-	export { osLocaleSync as sync };
-	export default osLocale;
-}
diff --git a/os-locale/tsconfig.json b/os-locale/tsconfig.json
new file mode 100644
index 0000000000..0766a4a9b1
--- /dev/null
+++ b/os-locale/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "os-locale-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/osmtogeojson/index.d.ts b/osmtogeojson/index.d.ts
new file mode 100644
index 0000000000..5057b5c60e
--- /dev/null
+++ b/osmtogeojson/index.d.ts
@@ -0,0 +1,94 @@
+// Type definitions for osmtogeojson 2.2.5
+// Project: https://github.com/tyrasd/osmtogeojson.git
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export interface OsmToGeoJSON {
+    (data: Document | OsmJSON.OsmJSONObject, options?: Options): GeoJSON.GeoJSONObject;
+    toGeojson(data: Document | OsmJSON.OsmJSONObject, options?: Options): GeoJSON.GeoJSONObject;
+}
+
+export interface Options {
+    verbose?: boolean;
+    /**
+     * If true, the resulting GeoJSON feature's properties will be a simple key-value list instead of a structured json object (with separate tags and metadata). default: false
+     */
+    flatProperties?: boolean;
+    /**
+     * Either a blacklist of tag keys or a callback function. Will be used to decide if a feature is interesting enough for its own GeoJSON feature.
+     */
+    uninterestingTags?: { [tag: string]: boolean; } | Function; //TODO: type function
+    /**
+     * Either a json object or callback function that is used to determine if a closed way should be treated as a Polygon or LineString.
+     */
+    polygonFeatures?: any | Function; //TODO: type this
+}
+
+export declare namespace GeoJSON {
+    export interface GeoJSONObject {
+        type: string;
+    }
+
+    export interface Feature extends GeoJSONObject {
+        id?: string;
+        geometry: Geometry;
+        properties: any; //TODO: type this
+    }
+
+    export interface FeatureCollection extends GeoJSONObject {
+        features: Feature[];
+    }
+
+    export interface Geometry extends GeoJSONObject {
+        coordinates: Coordinate | Coordinate[] | Coordinate[][];
+    }
+
+    export interface GeometryCollection extends GeoJSONObject {
+        geometries: Geometry[];
+    }
+
+    export type Coordinate2d = [number, number];
+    export type Coordinate3d = [number, number, number];
+    export type Coordinate = Coordinate2d | Coordinate3d;
+}
+
+export declare namespace OsmJSON {
+    export interface OsmJSONObject {
+        elements: (Node | Way | Relationship)[];
+    }
+
+    export interface Element {
+        type: string;
+        id: number;
+        tags?: { [name: string]: string; }
+        timestamp?: string;
+        version?: number;
+        changeset?: number;
+        user?: string;
+        uid?: number;
+    }
+
+    export interface Node extends Element {
+        lat: number;
+        lon: number;
+    }
+
+    export interface Way extends Element {
+        nodes: number[];
+    }
+
+    export interface Relationship extends Element {
+        members: Member[];
+    }
+
+    export interface Member {
+        type: string;
+        ref: number;
+        role: string;
+    }
+}
+
+declare var osmtogeojson: OsmToGeoJSON;
+
+export default osmtogeojson;
diff --git a/osmtogeojson/osmtogeojson-tests.ts b/osmtogeojson/osmtogeojson-tests.ts
index f7d52c0754..429dda705f 100644
--- a/osmtogeojson/osmtogeojson-tests.ts
+++ b/osmtogeojson/osmtogeojson-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="osmtogeojson.d.ts" />
-/// <reference path="../xmldom/xmldom.d.ts" />
-
 import osmtogeojson from 'osmtogeojson';
 import {OsmJSON, GeoJSON} from 'osmtogeojson';
 import * as xmldom from 'xmldom';
diff --git a/osmtogeojson/osmtogeojson.d.ts b/osmtogeojson/osmtogeojson.d.ts
deleted file mode 100644
index 45e1b94ac4..0000000000
--- a/osmtogeojson/osmtogeojson.d.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-// Type definitions for osmtogeojson 2.2.5
-// Project: https://github.com/tyrasd/osmtogeojson.git
-// Definitions by: Qubo <https://github.com/tkqubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "osmtogeojson" {
-  export interface OsmToGeoJSON {
-    (data: Document|OsmJSON.OsmJSONObject, options?: Options): GeoJSON.GeoJSONObject;
-    toGeojson(data: Document|OsmJSON.OsmJSONObject, options?: Options): GeoJSON.GeoJSONObject;
-  }
-
-  export interface Options {
-    verbose?: boolean;
-    /**
-     * If true, the resulting GeoJSON feature's properties will be a simple key-value list instead of a structured json object (with separate tags and metadata). default: false
-     */
-    flatProperties?: boolean;
-    /**
-     * Either a blacklist of tag keys or a callback function. Will be used to decide if a feature is interesting enough for its own GeoJSON feature.
-     */
-    uninterestingTags?: { [tag: string]: boolean; }|Function; //TODO: type function
-    /**
-     * Either a json object or callback function that is used to determine if a closed way should be treated as a Polygon or LineString.
-     */
-    polygonFeatures?: any|Function; //TODO: type this
-  }
-
-  export namespace GeoJSON {
-    export interface GeoJSONObject {
-      type: string;
-    }
-
-    export interface Feature extends GeoJSONObject {
-      id?: string;
-      geometry: Geometry;
-      properties: any; //TODO: type this
-    }
-
-    export interface FeatureCollection extends GeoJSONObject {
-      features: Feature[];
-    }
-
-    export interface Geometry extends GeoJSONObject {
-      coordinates: Coordinate|Coordinate[]|Coordinate[][];
-    }
-
-    export interface GeometryCollection extends GeoJSONObject {
-      geometries: Geometry[];
-    }
-
-    export type Coordinate2d = [number, number];
-    export type Coordinate3d = [number, number, number];
-    export type Coordinate = Coordinate2d|Coordinate3d;
-  }
-
-  export namespace OsmJSON {
-    export interface OsmJSONObject {
-      elements: (Node|Way|Relationship)[];
-    }
-
-    export interface Element {
-      type: string;
-      id: number;
-      tags?: { [name: string]: string; }
-      timestamp?: string;
-      version?: number;
-      changeset?: number;
-      user?: string;
-      uid?: number;
-    }
-
-    export interface Node extends Element {
-      lat: number;
-      lon: number;
-    }
-
-    export interface Way extends Element {
-      nodes: number[];
-    }
-
-    export interface Relationship extends Element {
-      members: Member[];
-    }
-
-    export interface Member {
-      type: string;
-      ref: number;
-      role: string;
-    }
-  }
-
-  var osmtogeojson: OsmToGeoJSON;
-
-  export default osmtogeojson;
-}
-
diff --git a/osmtogeojson/tsconfig.json b/osmtogeojson/tsconfig.json
new file mode 100644
index 0000000000..9dafe57453
--- /dev/null
+++ b/osmtogeojson/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "osmtogeojson-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/owlcarousel/index.d.ts b/owlcarousel/index.d.ts
new file mode 100644
index 0000000000..b00fe862d8
--- /dev/null
+++ b/owlcarousel/index.d.ts
@@ -0,0 +1,62 @@
+// Type definitions for OwlCarousel v.1.3.3
+// Project: https://github.com/OwlFonk/OwlCarousel
+// Definitions by: Damian Piątkowski <https://github.com/dpiatkowski>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface IOwlCarouselOptions {
+
+    // options
+    items: number;
+    itemsDesktop: number[];
+    itemsDesktopSmall: number[];
+    itemsTablet: number[];
+    itemsTabletSmall: any;
+    itemsMobile: number[];
+    itemsCustom: any;
+    singleItem: boolean;
+    itemsScaleUp: boolean;
+    slideSpeed: number;
+    paginationSpeed: number;
+    rewindSpeed: number;
+    autoPlay: any;
+    stopOnHover: boolean;
+    navigation: boolean;
+    navigationText: any;
+    rewindNav: boolean;
+    scrollPerPage: boolean;
+    pagination: boolean;
+    paginationNumbers: boolean;
+    responsive: boolean;
+    responsiveRefreshRate: number;
+    responsiveBaseWidth: JQuery;
+    baseClass: string;
+    theme: string;
+    lazyLoad: boolean;
+    lazyFollow: boolean;
+    lazyEffect: any;
+    autoHeight: boolean;
+    jsonPath: any;
+    jsonSuccess: (data: any) => void;
+    dragBeforeAnimFinish: boolean;
+    mouseDrag: boolean;
+    touchDrag: boolean;
+    addClassActive: boolean;
+    transitionStyle: any;
+
+    // callbacks
+    beforeUpdate: (params?: any) => void;
+    afterUpdate: (params?: any) => void;
+    beforeInit: (params?: any) => void;
+    afterInit: (params?: any) => void;
+    beforeMove: (params?: any) => void;
+    afterMove: (params?: any) => void;
+    afterAction: (params?: any) => void;
+    startDragging: (params?: any) => void;
+    afterLazyLoad: (params?: any) => void;
+}
+
+interface JQuery {
+    owlCarousel(options?: any): JQuery;
+}
diff --git a/owlcarousel/owlcarousel-tests.ts b/owlcarousel/owlcarousel-tests.ts
index 82190dca64..3d9ed9a69b 100644
--- a/owlcarousel/owlcarousel-tests.ts
+++ b/owlcarousel/owlcarousel-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="owlcarousel.d.ts" />
+/// <reference types="jquery"/>
+
 
 $(".className").owlCarousel();
 
diff --git a/owlcarousel/owlcarousel.d.ts b/owlcarousel/owlcarousel.d.ts
deleted file mode 100644
index 3d462b55f6..0000000000
--- a/owlcarousel/owlcarousel.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-// Type definitions for OwlCarousel v.1.3.3
-// Project: https://github.com/OwlFonk/OwlCarousel
-// Definitions by: Damian Piątkowski <https://github.com/dpiatkowski>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface IOwlCarouselOptions {
-
-    // options
-    items: number;
-    itemsDesktop: number[];
-    itemsDesktopSmall: number[];
-    itemsTablet: number[];
-    itemsTabletSmall: any;
-    itemsMobile: number[];
-    itemsCustom: any;
-    singleItem: boolean;
-    itemsScaleUp: boolean;
-    slideSpeed: number;
-    paginationSpeed: number;
-    rewindSpeed: number;
-    autoPlay: any;
-    stopOnHover: boolean;
-    navigation: boolean;
-    navigationText: any;
-    rewindNav: boolean;
-    scrollPerPage: boolean;
-    pagination: boolean;
-    paginationNumbers: boolean;
-    responsive: boolean;
-    responsiveRefreshRate: number;
-    responsiveBaseWidth: JQuery;
-    baseClass: string;
-    theme: string;
-    lazyLoad: boolean;
-    lazyFollow: boolean;
-    lazyEffect: any;
-    autoHeight: boolean;
-    jsonPath: any;
-    jsonSuccess: (data: any) => void;
-    dragBeforeAnimFinish: boolean;
-    mouseDrag: boolean;
-    touchDrag: boolean;
-    addClassActive: boolean;
-    transitionStyle: any;
-
-    // callbacks
-    beforeUpdate: (params?: any) => void;
-    afterUpdate: (params?: any) => void;
-    beforeInit: (params?: any) => void;
-    afterInit: (params?: any) => void;
-    beforeMove: (params?: any) => void;
-    afterMove: (params?: any) => void;
-    afterAction: (params?: any) => void;
-    startDragging: (params?: any) => void;
-    afterLazyLoad: (params?: any) => void;
-}
-
-interface JQuery {
-    owlCarousel(options?: any): JQuery;
-}
diff --git a/owlcarousel/tsconfig.json b/owlcarousel/tsconfig.json
new file mode 100644
index 0000000000..e7cd5aa6a1
--- /dev/null
+++ b/owlcarousel/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "owlcarousel-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/p2/index.d.ts b/p2/index.d.ts
new file mode 100644
index 0000000000..5fb85052e6
--- /dev/null
+++ b/p2/index.d.ts
@@ -0,0 +1,997 @@
+// Type definitions for p2.js v0.7.1
+// Project: https://github.com/schteppe/p2.js/
+// Definitions by: Clark Stevenson <https://github.com/clark-stevenson>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = p2;
+export as namespace p2;
+
+declare namespace p2 {
+
+    export class AABB {
+
+        constructor(options?: {
+            upperBound?: number[];
+            lowerBound?: number[];
+        });
+
+        setFromPoints(points: number[][], position: number[], angle: number, skinSize: number): void;
+        copy(aabb: AABB): void;
+        extend(aabb: AABB): void;
+        overlaps(aabb: AABB): boolean;
+
+    }
+
+    export class Broadphase {
+
+        static AABB: number;
+        static BOUNDING_CIRCLE: number;
+
+        static NAIVE: number;
+        static SAP: number;
+
+        static boundingRadiusCheck(bodyA: Body, bodyB: Body): boolean;
+        static aabbCheck(bodyA: Body, bodyB: Body): boolean;
+        static canCollide(bodyA: Body, bodyB: Body): boolean;
+
+        constructor(type: number);
+
+        type: number;
+        result: Body[];
+        world: World;
+        boundingVolumeType: number;
+
+        setWorld(world: World): void;
+        getCollisionPairs(world: World): Body[];
+        boundingVolumeCheck(bodyA: Body, bodyB: Body): boolean;
+
+    }
+
+    export class GridBroadphase extends Broadphase {
+
+        constructor(options?: {
+            xmin?: number;
+            xmax?: number;
+            ymin?: number;
+            ymax?: number;
+            nx?: number;
+            ny?: number;
+        });
+
+        xmin: number;
+        xmax: number;
+        ymin: number;
+        ymax: number;
+        nx: number;
+        ny: number;
+        binsizeX: number;
+        binsizeY: number;
+
+    }
+
+    export class NativeBroadphase extends Broadphase {
+
+    }
+
+    export class Narrowphase {
+
+        contactEquations: ContactEquation[];
+        frictionEquations: FrictionEquation[];
+        enableFriction: boolean;
+        enableEquations: boolean;
+        slipForce: number;
+        frictionCoefficient: number;
+        surfaceVelocity: number;
+        reuseObjects: boolean;
+        resuableContactEquations: any[];
+        reusableFrictionEquations: any[];
+        restitution: number;
+        stiffness: number;
+        relaxation: number;
+        frictionStiffness: number;
+        frictionRelaxation: number;
+        enableFrictionReduction: boolean;
+        contactSkinSize: number;
+
+        collidedLastStep(bodyA: Body, bodyB: Body): boolean;
+        reset(): void;
+        createContactEquation(bodyA: Body, bodyB: Body, shapeA: Shape, shapeB: Shape): ContactEquation;
+        createFrictionFromContact(c: ContactEquation): FrictionEquation;
+
+    }
+
+    export class SAPBroadphase extends Broadphase {
+
+        axisList: Body[];
+        axisIndex: number;
+
+    }
+
+    export class Constraint {
+
+        static DISTANCE: number;
+        static GEAR: number;
+        static LOCK: number;
+        static PRISMATIC: number;
+        static REVOLUTE: number;
+
+        constructor(bodyA: Body, bodyB: Body, type: number, options?: {
+            collideConnected?: boolean;
+        });
+
+        type: number;
+        equeations: Equation[];
+        bodyA: Body;
+        bodyB: Body;
+        collideConnected: boolean;
+
+        update(): void;
+        setStiffness(stiffness: number): void;
+        setRelaxation(relaxation: number): void;
+
+    }
+
+    export class DistanceConstraint extends Constraint {
+
+        constructor(bodyA: Body, bodyB: Body, options?: {
+            distance?: number;
+            localAnchorA?: number[];
+            localAnchorB?: number[];
+            maxForce?: number;
+        });
+
+        localAnchorA: number[];
+        localAnchorB: number[];
+        distance: number;
+        maxForce: number;
+        upperLimitEnabled: boolean;
+        upperLimit: number;
+        lowerLimitEnabled: boolean;
+        lowerLimit: number;
+        position: number;
+
+        setMaxForce(f: number): void;
+        getMaxForce(): number;
+
+    }
+
+    export class GearConstraint extends Constraint {
+
+        constructor(bodyA: Body, bodyB: Body, options?: {
+            angle?: number;
+            ratio?: number;
+            maxTorque?: number;
+        });
+
+        ratio: number;
+        angle: number;
+
+        setMaxTorque(torque: number): void;
+        getMaxTorque(): number;
+
+    }
+
+    export class LockConstraint extends Constraint {
+
+        constructor(bodyA: Body, bodyB: Body, options?: {
+            localOffsetB?: number[];
+            localAngleB?: number;
+            maxForce?: number;
+        });
+
+        setMaxForce(force: number): void;
+        getMaxForce(): number;
+
+    }
+
+    export class PrismaticConstraint extends Constraint {
+
+        constructor(bodyA: Body, bodyB: Body, options?: {
+            maxForce?: number;
+            localAnchorA?: number[];
+            localAnchorB?: number[];
+            localAxisA?: number[];
+            disableRotationalLock?: boolean;
+            upperLimit?: number;
+            lowerLimit?: number;
+        });
+
+        localAnchorA: number[];
+        localAnchorB: number[];
+        localAxisA: number[];
+        position: number;
+        velocity: number;
+        lowerLimitEnabled: boolean;
+        upperLimitEnabled: boolean;
+        lowerLimit: number;
+        upperLimit: number;
+        upperLimitEquation: ContactEquation;
+        lowerLimitEquation: ContactEquation;
+        motorEquation: Equation;
+        motorEnabled: boolean;
+        motorSpeed: number;
+
+        enableMotor(): void;
+        disableMotor(): void;
+        setLimits(lower: number, upper: number): void;
+
+    }
+
+    export class RevoluteConstraint extends Constraint {
+
+        constructor(bodyA: Body, bodyB: Body, options?: {
+            worldPivot?: number[];
+            localPivotA?: number[];
+            localPivotB?: number[];
+            maxForce?: number;
+        });
+
+        pivotA: number[];
+        pivotB: number[];
+        motorEquation: RotationalVelocityEquation;
+        motorEnabled: boolean;
+        angle: number;
+        lowerLimitEnabled: boolean;
+        upperLimitEnabled: boolean;
+        lowerLimit: number;
+        upperLimit: number;
+        upperLimitEquation: ContactEquation;
+        lowerLimitEquation: ContactEquation;
+
+        enableMotor(): void;
+        disableMotor(): void;
+        motorIsEnabled(): boolean;
+        setLimits(lower: number, upper: number): void;
+        setMotorSpeed(speed: number): void;
+        getMotorSpeed(): number;
+
+    }
+
+    export class AngleLockEquation extends Equation {
+
+        constructor(bodyA: Body, bodyB: Body, options?: {
+            angle?: number;
+            ratio?: number;
+        });
+
+        computeGq(): number;
+        setRatio(ratio: number): number;
+        setMaxTorque(torque: number): number;
+
+    }
+
+    export class ContactEquation extends Equation {
+
+        constructor(bodyA: Body, bodyB: Body);
+
+        contactPointA: number[];
+        penetrationVec: number[];
+        contactPointB: number[];
+        normalA: number[];
+        restitution: number;
+        firstImpact: boolean;
+        shapeA: Shape;
+        shapeB: Shape;
+
+        computeB(a: number, b: number, h: number): number;
+
+    }
+
+    export class Equation {
+
+        static DEFAULT_STIFFNESS: number;
+        static DEFAULT_RELAXATION: number;
+
+        constructor(bodyA: Body, bodyB: Body, minForce?: number, maxForce?: number);
+
+        minForce: number;
+        maxForce: number;
+        bodyA: Body;
+        bodyB: Body;
+        stiffness: number;
+        relaxation: number;
+        G: number[];
+        offset: number;
+        a: number;
+        b: number;
+        epsilon: number;
+        timeStep: number;
+        needsUpdate: boolean;
+        multiplier: number;
+        relativeVelocity: number;
+        enabled: boolean;
+
+        gmult(G: number[], vi: number[], wi: number[], vj: number[], wj: number[]): number;
+        computeB(a: number, b: number, h: number): number;
+        computeGq(): number;
+        computeGW(): number;
+        computeGWlambda(): number;
+        computeGiMf(): number;
+        computeGiMGt(): number;
+        addToWlambda(deltalambda: number): number;
+        computeInvC(eps: number): number;
+
+    }
+
+    export class FrictionEquation extends Equation {
+
+        constructor(bodyA: Body, bodyB: Body, slipForce: number);
+
+        contactPointA: number[];
+        contactPointB: number[];
+        t: number[];
+        shapeA: Shape;
+        shapeB: Shape;
+        frictionCoefficient: number;
+
+        setSlipForce(slipForce: number): number;
+        getSlipForce(): number;
+        computeB(a: number, b: number, h: number): number;
+
+    }
+
+    export class RotationalLockEquation extends Equation {
+
+        constructor(bodyA: Body, bodyB: Body, options?: {
+            angle?: number;
+        });
+
+        angle: number;
+
+        computeGq(): number;
+
+    }
+
+    export class RotationalVelocityEquation extends Equation {
+
+        constructor(bodyA: Body, bodyB: Body);
+
+        computeB(a: number, b: number, h: number): number;
+
+    }
+
+    export class EventEmitter {
+
+        on(type: string, listener: Function, context: any): EventEmitter;
+        has(type: string, listener: Function): boolean;
+        off(type: string, listener: Function): EventEmitter;
+        emit(event: any): EventEmitter;
+
+    }
+
+    export class ContactMaterialOptions {
+
+        friction: number;
+        restitution: number;
+        stiffness: number;
+        relaxation: number;
+        frictionStiffness: number;
+        frictionRelaxation: number;
+        surfaceVelocity: number;
+
+    }
+
+    export class ContactMaterial {
+
+        static idCounter: number;
+
+        constructor(materialA: Material, materialB: Material, options?: ContactMaterialOptions);
+
+        id: number;
+        materialA: Material;
+        materialB: Material;
+        friction: number;
+        restitution: number;
+        stiffness: number;
+        relaxation: number;
+        frictionStuffness: number;
+        frictionRelaxation: number;
+        surfaceVelocity: number;
+        contactSkinSize: number;
+
+    }
+
+    export class Material {
+
+        static idCounter: number;
+
+        constructor(id: number);
+
+        id: number;
+
+    }
+
+    export class vec2 {
+
+        static crossLength(a: number[], b: number[]): number;
+        static crossVZ(out: number[], vec: number[], zcomp: number): number;
+        static crossZV(out: number[], zcomp: number, vec: number[]): number;
+        static rotate(out: number[], a: number[], angle: number): void;
+        static rotate90cw(out: number[], a: number[]): number;
+        static centroid(out: number[], a: number[], b: number[], c: number[]): number[];
+        static create(): number[];
+        static clone(a: number[]): number[];
+        static fromValues(x: number, y: number): number[];
+        static copy(out: number[], a: number[]): number[];
+        static set(out: number[], x: number, y: number): number[];
+        static toLocalFrame(out: number[], worldPoint: number[], framePosition: number[], frameAngle: number): void;
+        static toGlobalFrame(out: number[], localPoint: number[], framePosition: number[], frameAngle: number): void;
+        static add(out: number[], a: number[], b: number[]): number[];
+        static subtract(out: number[], a: number[], b: number[]): number[];
+        static sub(out: number[], a: number[], b: number[]): number[];
+        static multiply(out: number[], a: number[], b: number[]): number[];
+        static mul(out: number[], a: number[], b: number[]): number[];
+        static divide(out: number[], a: number[], b: number[]): number[];
+        static div(out: number[], a: number[], b: number[]): number[];
+        static scale(out: number[], a: number[], b: number): number[];
+        static distance(a: number[], b: number[]): number;
+        static dist(a: number[], b: number[]): number;
+        static squaredDistance(a: number[], b: number[]): number;
+        static sqrDist(a: number[], b: number[]): number;
+        static length(a: number[]): number;
+        static len(a: number[]): number;
+        static squaredLength(a: number[]): number;
+        static sqrLen(a: number[]): number;
+        static negate(out: number[], a: number[]): number[];
+        static normalize(out: number[], a: number[]): number[];
+        static dot(a: number[], b: number[]): number;
+        static str(a: number[]): string;
+
+    }
+
+    export interface BodyOptions {
+
+        mass?: number;
+        position?: number[];
+        velocity?: number[];
+        angle?: number;
+        angularVelocity?: number;
+        force?: number[];
+        angularForce?: number;
+        fixedRotation?: boolean;
+
+    }
+
+    export class Body extends EventEmitter {
+
+        sleepyEvent: {
+            type: string;
+        };
+
+        sleepEvent: {
+            type: string;
+        };
+
+        wakeUpEvent: {
+            type: string;
+        };
+
+        static DYNAMIC: number;
+        static STATIC: number;
+        static KINEMATIC: number;
+        static AWAKE: number;
+        static SLEEPY: number;
+        static SLEEPING: number;
+
+        constructor(options?: BodyOptions);
+
+        id: number;
+        world: World;
+        shapes: Shape[];
+        mass: number;
+        invMass: number;
+        inertia: number;
+        invInertia: number;
+        invMassSolve: number;
+        invInertiaSolve: number;
+        fixedRotation: number;
+        position: number[];
+        interpolatedPosition: number[];
+        interpolatedAngle: number;
+        previousPosition: number[];
+        previousAngle: number;
+        velocity: number[];
+        vlambda: number[];
+        wlambda: number[];
+        angle: number;
+        angularVelocity: number;
+        force: number[];
+        angularForce: number;
+        damping: number;
+        angularDamping: number;
+        type: number;
+        boundingRadius: number;
+        aabb: AABB;
+        aabbNeedsUpdate: boolean;
+        allowSleep: boolean;
+        wantsToSleep: boolean;
+        sleepState: number;
+        sleepSpeedLimit: number;
+        sleepTimeLimit: number;
+        gravityScale: number;
+        collisionResponse: boolean;
+
+        updateSolveMassProperties(): void;
+        setDensity(density: number): void;
+        getArea(): number;
+        getAABB(): AABB;
+        updateAABB(): void;
+        updateBoundingRadius(): void;
+        addShape(shape: Shape, offset?: number[], angle?: number): void;
+        removeShape(shape: Shape): boolean;
+        updateMassProperties(): void;
+        applyForce(force: number[], worldPoint: number[]): void;
+        toLocalFrame(out: number[], worldPoint: number[]): void;
+        toWorldFrame(out: number[], localPoint: number[]): void;
+        fromPolygon(path: number[][], options?: {
+            optimalDecomp?: boolean;
+            skipSimpleCheck?: boolean;
+            removeCollinearPoints?: any; //boolean | number
+        }): boolean;
+        adjustCenterOfMass(): void;
+        setZeroForce(): void;
+        resetConstraintVelocity(): void;
+        applyDamping(dy: number): void;
+        wakeUp(): void;
+        sleep(): void;
+        sleepTick(time: number, dontSleep: boolean, dt: number): void;
+        getVelocityFromPosition(story: number[], dt: number): number[];
+        getAngularVelocityFromPosition(timeStep: number): number;
+        overlaps(body: Body): boolean;
+
+    }
+
+    export class Spring {
+
+        constructor(bodyA: Body, bodyB: Body, options?: {
+
+            stiffness?: number;
+            damping?: number;
+            localAnchorA?: number[];
+            localAnchorB?: number[];
+            worldAnchorA?: number[];
+            worldAnchorB?: number[];
+
+        });
+
+        stiffness: number;
+        damping: number;
+        bodyA: Body;
+        bodyB: Body;
+
+        applyForce(): void;
+
+    }
+
+    export class LinearSpring extends Spring {
+
+        localAnchorA: number[];
+        localAnchorB: number[];
+        restLength: number;
+
+        setWorldAnchorA(worldAnchorA: number[]): void;
+        setWorldAnchorB(worldAnchorB: number[]): void;
+        getWorldAnchorA(result: number[]): number[];
+        getWorldAnchorB(result: number[]): number[];
+        applyForce(): void;
+
+    }
+
+    export class RotationalSpring extends Spring {
+
+        constructor(bodyA: Body, bodyB: Body, options?: {
+            restAngle?: number;
+            stiffness?: number;
+            damping?: number;
+        });
+
+        restAngle: number;
+
+    }
+
+    export interface CapsuleOptions extends SharedShapeOptions {
+
+      length?: number;
+      radius?: number;
+
+    }
+
+    export class Capsule extends Shape {
+
+        constructor(options?: CapsuleOptions);
+
+        length: number;
+        radius: number;
+
+    }
+
+    export interface CircleOptions extends SharedShapeOptions {
+
+      radius?: number;
+
+    }
+
+    export class Circle extends Shape {
+
+        constructor(options?: CircleOptions);
+
+        radius: number;
+
+    }
+
+    export interface ConvexOptions extends SharedShapeOptions {
+
+      length?: number;
+      radius?: number;
+
+    }
+
+    export class Convex extends Shape {
+
+        static triangleArea(a: number[], b: number[], c: number[]): number;
+
+        constructor(options?: ConvexOptions);
+
+        vertices: number[][];
+        axes: number[];
+        centerOfMass: number[];
+        triangles: number[];
+        boundingRadius: number;
+
+        projectOntoLocalAxis(localAxis: number[], result: number[]): void;
+        projectOntoWorldAxis(localAxis: number[], shapeOffset: number[], shapeAngle: number, result: number[]): void;
+
+        updateCenterOfMass(): void;
+
+    }
+
+    export interface HeightfieldOptions extends SharedShapeOptions {
+
+        heights?: number[];
+        minValue?: number;
+        maxValue?: number;
+        elementWidth?: number;
+
+    }
+
+    export class Heightfield extends Shape {
+
+        constructor(options?: HeightfieldOptions);
+
+        data: number[];
+        maxValue: number;
+        minValue: number;
+        elementWidth: number;
+
+    }
+
+    export interface SharedShapeOptions {
+
+        position?: number[];
+        angle?: number;
+        collisionGroup?: number;
+        collisionResponse?: boolean;
+        collisionMask?: number;
+        sensor?: boolean;
+
+    }
+
+    export interface ShapeOptions extends SharedShapeOptions {
+
+        type?: number;
+
+    }
+
+    export class Shape {
+
+        static idCounter: number;
+        static CIRCLE: number;
+        static PARTICLE: number;
+        static PLANE: number;
+        static CONVEX: number;
+        static LINE: number;
+        static BOX: number;
+        static CAPSULE: number;
+        static HEIGHTFIELD: number;
+
+        constructor(options?: ShapeOptions);
+
+        type: number;
+        id: number;
+        position: number[];
+        angle: number;
+        boundingRadius: number;
+        collisionGroup: number;
+        collisionResponse: boolean;
+        collisionMask: number;
+        material: Material;
+        area: number;
+        sensor: boolean;
+
+        computeMomentOfInertia(mass: number): number;
+        updateBoundingRadius(): number;
+        updateArea(): void;
+        computeAABB(out: AABB, position: number[], angle: number): void;
+
+    }
+
+    export interface LineOptions extends SharedShapeOptions {
+
+      length?: number;
+
+    }
+
+    export class Line extends Shape {
+
+        constructor(options?: LineOptions);
+
+        length: number;
+
+    }
+
+    export class Particle extends Shape {
+
+        constructor(options?: SharedShapeOptions);
+
+    }
+
+    export class Plane extends Shape {
+
+        constructor(options?: SharedShapeOptions);
+
+    }
+
+    export interface BoxOptions {
+
+      width?: number;
+      height?: number;
+
+    }
+
+    export class Box extends Shape {
+
+        constructor(options?: BoxOptions);
+
+        width: number;
+        height: number;
+
+    }
+
+    export class Solver extends EventEmitter {
+
+        static GS: number;
+        static ISLAND: number;
+
+        constructor(options?: {}, type?: number);
+
+        type: number;
+        equations: Equation[];
+        equationSortFunction: Equation; //Equation | boolean
+
+        solve(dy: number, world: World): void;
+        solveIsland(dy: number, island: Island): void;
+        sortEquations(): void;
+        addEquation(eq: Equation): void;
+        addEquations(eqs: Equation[]): void;
+        removeEquation(eq: Equation): void;
+        removeAllEquations(): void;
+
+    }
+
+    export class GSSolver extends Solver {
+
+        constructor(options?: {
+            iterations?: number;
+            tolerance?: number;
+        });
+
+        iterations: number;
+        tolerance: number;
+        useZeroRHS: boolean;
+        frictionIterations: number;
+        usedIterations: number;
+
+        solve(h: number, world: World): void;
+
+    }
+
+    export class OverlapKeeper {
+
+        constructor(bodyA: Body, shapeA: Shape, bodyB: Body, shapeB: Shape);
+
+        shapeA: Shape;
+        shapeB: Shape;
+        bodyA: Body;
+        bodyB: Body;
+
+        tick(): void;
+        setOverlapping(bodyA: Body, shapeA: Shape, bodyB: Body, shapeB: Body): void;
+        bodiesAreOverlapping(bodyA: Body, bodyB: Body): boolean;
+        set(bodyA: Body, shapeA: Shape, bodyB: Body, shapeB: Shape): void;
+
+    }
+
+    export class TupleDictionary {
+
+        data: number[];
+        keys: number[];
+
+        getKey(id1: number, id2: number): string;
+        getByKey(key: number): number;
+        get(i: number, j: number): number;
+        set(i: number, j: number, value: number): number;
+        reset(): void;
+        copy(dict: TupleDictionary): void;
+
+    }
+
+    export class Utils {
+
+        static appendArray<T>(a: Array<T>, b: Array<T>): Array<T>;
+        static splice<T>(array: Array<T>, index: number, howMany: number): void;
+        static extend(a: any, b: any): void;
+        static defaults(options: any, defaults: any): any;
+
+    }
+
+    export class Island {
+
+        equations: Equation[];
+        bodies: Body[];
+
+        reset(): void;
+        getBodies(result: any): Body[];
+        wantsToSleep(): boolean;
+        sleep(): boolean;
+
+    }
+
+    export class IslandManager extends Solver {
+
+        static getUnvisitedNode(nodes: IslandNode[]): IslandNode; // IslandNode | boolean
+
+        equations: Equation[];
+        islands: Island[];
+        nodes: IslandNode[];
+
+        visit(node: IslandNode, bds: Body[], eqs: Equation[]): void;
+        bfs(root: IslandNode, bds: Body[], eqs: Equation[]): void;
+        split(world: World): Island[];
+
+    }
+
+    export class IslandNode {
+
+        constructor(body: Body);
+
+        body: Body;
+        neighbors: IslandNode[];
+        equations: Equation[];
+        visited: boolean;
+
+        reset(): void;
+
+    }
+
+    export class World extends EventEmitter {
+
+        postStepEvent: {
+            type: string;
+        };
+
+        addBodyEvent: {
+            type: string;
+        };
+
+        removeBodyEvent: {
+            type: string;
+        };
+
+        addSpringEvent: {
+            type: string;
+        };
+
+        impactEvent: {
+            type: string;
+            bodyA: Body;
+            bodyB: Body;
+            shapeA: Shape;
+            shapeB: Shape;
+            contactEquation: ContactEquation;
+        };
+
+        postBroadphaseEvent: {
+            type: string;
+            pairs: Body[];
+        };
+
+        beginContactEvent: {
+            type: string;
+            shapeA: Shape;
+            shapeB: Shape;
+            bodyA: Body;
+            bodyB: Body;
+            contactEquations: ContactEquation[];
+        };
+
+        endContactEvent: {
+            type: string;
+            shapeA: Shape;
+            shapeB: Shape;
+            bodyA: Body;
+            bodyB: Body;
+        };
+
+        preSolveEvent: {
+            type: string;
+            contactEquations: ContactEquation[];
+            frictionEquations: FrictionEquation[];
+        };
+
+        static NO_SLEEPING: number;
+        static BODY_SLEEPING: number;
+        static ISLAND_SLEEPING: number;
+
+        static integrateBody(body: Body, dy: number): void;
+
+        constructor(options?: {
+            solver?: Solver;
+            gravity?: number[];
+            broadphase?: Broadphase;
+            islandSplit?: boolean;
+            doProfiling?: boolean;
+        });
+
+        springs: Spring[];
+        bodies: Body[];
+        solver: Solver;
+        narrowphase: Narrowphase;
+        islandManager: IslandManager;
+        gravity: number[];
+        frictionGravity: number;
+        useWorldGravityAsFrictionGravity: boolean;
+        useFrictionGravityOnZeroGravity: boolean;
+        doProfiling: boolean;
+        lastStepTime: number;
+        broadphase: Broadphase;
+        constraints: Constraint[];
+        defaultMaterial: Material;
+        defaultContactMaterial: ContactMaterial;
+        lastTimeStep: number;
+        applySpringForces: boolean;
+        applyDamping: boolean;
+        applyGravity: boolean;
+        solveConstraints: boolean;
+        contactMaterials: ContactMaterial[];
+        time: number;
+        stepping: boolean;
+        islandSplit: boolean;
+        emitImpactEvent: boolean;
+        sleepMode: number;
+
+        addConstraint(c: Constraint): void;
+        addContactMaterial(contactMaterial: ContactMaterial): void;
+        removeContactMaterial(cm: ContactMaterial): void;
+        getContactMaterial(materialA: Material, materialB: Material): ContactMaterial; // ContactMaterial | boolean
+        removeConstraint(c: Constraint): void;
+        step(dy: number, timeSinceLastCalled?: number, maxSubSteps?: number): void;
+        runNarrowphase(np: Narrowphase, bi: Body, si: Shape, xi: any[], ai: number, bj: Body, sj: Shape, xj: any[], aj: number, cm: number, glen: number): void;
+        addSpring(s: Spring): void;
+        removeSpring(s: Spring): void;
+        addBody(body: Body): void;
+        removeBody(body: Body): void;
+        getBodyByID(id: number): Body; //Body | boolean
+        disableBodyCollision(bodyA: Body, bodyB: Body): void;
+        enableBodyCollision(bodyA: Body, bodyB: Body): void;
+        clear(): void;
+        clone(): World;
+        hitTest(worldPoint: number[], bodies: Body[], precision: number): Body[];
+        setGlobalEquationParameters(parameters: {
+            relaxation?: number;
+            stiffness?: number;
+        }): void;
+        setGlobalStiffness(stiffness: number): void;
+        setGlobalRelaxation(relaxation: number): void;
+    }
+
+}
diff --git a/p2/p2-tests.ts b/p2/p2-tests.ts
index 63c213321c..bdad71b906 100644
--- a/p2/p2-tests.ts
+++ b/p2/p2-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="p2.d.ts"/>
-
+import p2 = require("p2");
 // Create a physics world, where bodies and constraints live
 var world = new p2.World({
     gravity:[0, -9.82]
diff --git a/p2/p2.d.ts b/p2/p2.d.ts
deleted file mode 100644
index a6f3cf256e..0000000000
--- a/p2/p2.d.ts
+++ /dev/null
@@ -1,1009 +0,0 @@
-// Type definitions for p2.js v0.7.1
-// Project: https://github.com/schteppe/p2.js/
-// Definitions by: Clark Stevenson <https://github.com/clark-stevenson>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "p2" {
-    export = p2;
-}
-
-declare namespace p2 {
-
-    export class AABB {
-
-        constructor(options?: {
-            upperBound?: number[];
-            lowerBound?: number[];
-        });
-
-        setFromPoints(points: number[][], position: number[], angle: number, skinSize: number): void;
-        copy(aabb: AABB): void;
-        extend(aabb: AABB): void;
-        overlaps(aabb: AABB): boolean;
-
-    }
-
-    export class Broadphase {
-
-        static AABB: number;
-        static BOUNDING_CIRCLE: number;
-
-        static NAIVE: number;
-        static SAP: number;
-
-        static boundingRadiusCheck(bodyA: Body, bodyB: Body): boolean;
-        static aabbCheck(bodyA: Body, bodyB: Body): boolean;
-        static canCollide(bodyA: Body, bodyB: Body): boolean;
-
-        constructor(type: number);
-
-        type: number;
-        result: Body[];
-        world: World;
-        boundingVolumeType: number;
-
-        setWorld(world: World): void;
-        getCollisionPairs(world: World): Body[];
-        boundingVolumeCheck(bodyA: Body, bodyB: Body): boolean;
-
-    }
-
-    export class GridBroadphase extends Broadphase {
-
-        constructor(options?: {
-            xmin?: number;
-            xmax?: number;
-            ymin?: number;
-            ymax?: number;
-            nx?: number;
-            ny?: number;
-        });
-
-        xmin: number;
-        xmax: number;
-        ymin: number;
-        ymax: number;
-        nx: number;
-        ny: number;
-        binsizeX: number;
-        binsizeY: number;
-
-    }
-
-    export class NativeBroadphase extends Broadphase {
-
-    }
-
-    export class Narrowphase {
-
-        contactEquations: ContactEquation[];
-        frictionEquations: FrictionEquation[];
-        enableFriction: boolean;
-        enableEquations: boolean;
-        slipForce: number;
-        frictionCoefficient: number;
-        surfaceVelocity: number;
-        reuseObjects: boolean;
-        resuableContactEquations: any[];
-        reusableFrictionEquations: any[];
-        restitution: number;
-        stiffness: number;
-        relaxation: number;
-        frictionStiffness: number;
-        frictionRelaxation: number;
-        enableFrictionReduction: boolean;
-        contactSkinSize: number;
-
-        collidedLastStep(bodyA: Body, bodyB: Body): boolean;
-        reset(): void;
-        createContactEquation(bodyA: Body, bodyB: Body, shapeA: Shape, shapeB: Shape): ContactEquation;
-        createFrictionFromContact(c: ContactEquation): FrictionEquation;
-
-    }
-
-    export class SAPBroadphase extends Broadphase {
-
-        axisList: Body[];
-        axisIndex: number;
-
-    }
-
-    export class Constraint {
-
-        static DISTANCE: number;
-        static GEAR: number;
-        static LOCK: number;
-        static PRISMATIC: number;
-        static REVOLUTE: number;
-
-        constructor(bodyA: Body, bodyB: Body, type: number, options?: {
-            collideConnected?: boolean;
-            wakeUpBodies?: boolean;
-        });
-
-        type: number;
-        equeations: Equation[];
-        bodyA: Body;
-        bodyB: Body;
-        collideConnected: boolean;
-
-        update(): void;
-        setStiffness(stiffness: number): void;
-        setRelaxation(relaxation: number): void;
-
-    }
-
-    export class DistanceConstraint extends Constraint {
-
-        constructor(bodyA: Body, bodyB: Body, type: number, options?: {
-            collideConnected?: boolean;
-            wakeUpBodies?: boolean;
-            distance?: number;
-            localAnchorA?: number[];
-            localAnchorB?: number[];
-            maxForce?: number;
-        });
-
-        localAnchorA: number[];
-        localAnchorB: number[];
-        distance: number;
-        maxForce: number;
-        upperLimitEnabled: boolean;
-        upperLimit: number;
-        lowerLimitEnabled: boolean;
-        lowerLimit: number;
-        position: number;
-
-        setMaxForce(f: number): void;
-        getMaxForce(): number;
-
-    }
-
-    export class GearConstraint extends Constraint {
-
-        constructor(bodyA: Body, bodyB: Body, type: number, options?: {
-            collideConnected?: boolean;
-            wakeUpBodies?: boolean;
-            angle?: number;
-            ratio?: number;
-            maxTorque?: number;
-        });
-
-        ratio: number;
-        angle: number;
-
-        setMaxTorque(torque: number): void;
-        getMaxTorque(): number;
-
-    }
-
-    export class LockConstraint extends Constraint {
-
-        constructor(bodyA: Body, bodyB: Body, type: number, options?: {
-            collideConnected?: boolean;
-            wakeUpBodies?: boolean;
-            localOffsetB?: number[];
-            localAngleB?: number;
-            maxForce?: number;
-        });
-
-        setMaxForce(force: number): void;
-        getMaxForce(): number;
-
-    }
-
-    export class PrismaticConstraint extends Constraint {
-
-        constructor(bodyA: Body, bodyB: Body, type: number, options?: {
-            collideConnected?: boolean;
-            wakeUpBodies?: boolean;
-            maxForce?: number;
-            localAnchorA?: number[];
-            localAnchorB?: number[];
-            localAxisA?: number[];
-            disableRotationalLock?: boolean;
-            upperLimit?: number;
-            lowerLimit?: number;
-        });
-
-        localAnchorA: number[];
-        localAnchorB: number[];
-        localAxisA: number[];
-        position: number;
-        velocity: number;
-        lowerLimitEnabled: boolean;
-        upperLimitEnabled: boolean;
-        lowerLimit: number;
-        upperLimit: number;
-        upperLimitEquation: ContactEquation;
-        lowerLimitEquation: ContactEquation;
-        motorEquation: Equation;
-        motorEnabled: boolean;
-        motorSpeed: number;
-
-        enableMotor(): void;
-        disableMotor(): void;
-        setLimits(lower: number, upper: number): void;
-
-    }
-
-    export class RevoluteConstraint extends Constraint {
-
-        constructor(bodyA: Body, bodyB: Body, type: number, options?: {
-            collideConnected?: boolean;
-            wakeUpBodies?: boolean;
-            worldPivot?: number[];
-            localPivotA?: number[];
-            localPivotB?: number[];
-            maxForce?: number;
-        });
-
-        pivotA: number[];
-        pivotB: number[];
-        motorEquation: RotationalVelocityEquation;
-        motorEnabled: boolean;
-        angle: number;
-        lowerLimitEnabled: boolean;
-        upperLimitEnabled: boolean;
-        lowerLimit: number;
-        upperLimit: number;
-        upperLimitEquation: ContactEquation;
-        lowerLimitEquation: ContactEquation;
-
-        enableMotor(): void;
-        disableMotor(): void;
-        motorIsEnabled(): boolean;
-        setLimits(lower: number, upper: number): void;
-        setMotorSpeed(speed: number): void;
-        getMotorSpeed(): number;
-
-    }
-
-    export class AngleLockEquation extends Equation {
-
-        constructor(bodyA: Body, bodyB: Body, options?: {
-            angle?: number;
-            ratio?: number;
-        });
-
-        computeGq(): number;
-        setRatio(ratio: number): number;
-        setMaxTorque(torque: number): number;
-
-    }
-
-    export class ContactEquation extends Equation {
-
-        constructor(bodyA: Body, bodyB: Body);
-
-        contactPointA: number[];
-        penetrationVec: number[];
-        contactPointB: number[];
-        normalA: number[];
-        restitution: number;
-        firstImpact: boolean;
-        shapeA: Shape;
-        shapeB: Shape;
-
-        computeB(a: number, b: number, h: number): number;
-
-    }
-
-    export class Equation {
-
-        static DEFAULT_STIFFNESS: number;
-        static DEFAULT_RELAXATION: number;
-
-        constructor(bodyA: Body, bodyB: Body, minForce?: number, maxForce?: number);
-
-        minForce: number;
-        maxForce: number;
-        bodyA: Body;
-        bodyB: Body;
-        stiffness: number;
-        relaxation: number;
-        G: number[];
-        offset: number;
-        a: number;
-        b: number;
-        epsilon: number;
-        timeStep: number;
-        needsUpdate: boolean;
-        multiplier: number;
-        relativeVelocity: number;
-        enabled: boolean;
-
-        gmult(G: number[], vi: number[], wi: number[], vj: number[], wj: number[]): number;
-        computeB(a: number, b: number, h: number): number;
-        computeGq(): number;
-        computeGW(): number;
-        computeGWlambda(): number;
-        computeGiMf(): number;
-        computeGiMGt(): number;
-        addToWlambda(deltalambda: number): number;
-        computeInvC(eps: number): number;
-
-    }
-
-    export class FrictionEquation extends Equation {
-
-        constructor(bodyA: Body, bodyB: Body, slipForce: number);
-
-        contactPointA: number[];
-        contactPointB: number[];
-        t: number[];
-        shapeA: Shape;
-        shapeB: Shape;
-        frictionCoefficient: number;
-
-        setSlipForce(slipForce: number): number;
-        getSlipForce(): number;
-        computeB(a: number, b: number, h: number): number;
-
-    }
-
-    export class RotationalLockEquation extends Equation {
-
-        constructor(bodyA: Body, bodyB: Body, options?: {
-            angle?: number;
-        });
-
-        angle: number;
-
-        computeGq(): number;
-
-    }
-
-    export class RotationalVelocityEquation extends Equation {
-
-        constructor(bodyA: Body, bodyB: Body);
-
-        computeB(a: number, b: number, h: number): number;
-
-    }
-
-    export class EventEmitter {
-
-        on(type: string, listener: Function, context: any): EventEmitter;
-        has(type: string, listener: Function): boolean;
-        off(type: string, listener: Function): EventEmitter;
-        emit(event: any): EventEmitter;
-
-    }
-
-    export class ContactMaterialOptions {
-
-        friction: number;
-        restitution: number;
-        stiffness: number;
-        relaxation: number;
-        frictionStiffness: number;
-        frictionRelaxation: number;
-        surfaceVelocity: number;
-
-    }
-
-    export class ContactMaterial {
-
-        static idCounter: number;
-
-        constructor(materialA: Material, materialB: Material, options?: ContactMaterialOptions);
-
-        id: number;
-        materialA: Material;
-        materialB: Material;
-        friction: number;
-        restitution: number;
-        stiffness: number;
-        relaxation: number;
-        frictionStuffness: number;
-        frictionRelaxation: number;
-        surfaceVelocity: number;
-        contactSkinSize: number;
-
-    }
-
-    export class Material {
-
-        static idCounter: number;
-
-        constructor(id: number);
-
-        id: number;
-
-    }
-
-    export class vec2 {
-
-        static crossLength(a: number[], b: number[]): number;
-        static crossVZ(out: number[], vec: number[], zcomp: number): number;
-        static crossZV(out: number[], zcomp: number, vec: number[]): number;
-        static rotate(out: number[], a: number[], angle: number): void;
-        static rotate90cw(out: number[], a: number[]): number;
-        static centroid(out: number[], a: number[], b: number[], c: number[]): number[];
-        static create(): number[];
-        static clone(a: number[]): number[];
-        static fromValues(x: number, y: number): number[];
-        static copy(out: number[], a: number[]): number[];
-        static set(out: number[], x: number, y: number): number[];
-        static toLocalFrame(out: number[], worldPoint: number[], framePosition: number[], frameAngle: number): void;
-        static toGlobalFrame(out: number[], localPoint: number[], framePosition: number[], frameAngle: number): void;
-        static add(out: number[], a: number[], b: number[]): number[];
-        static subtract(out: number[], a: number[], b: number[]): number[];
-        static sub(out: number[], a: number[], b: number[]): number[];
-        static multiply(out: number[], a: number[], b: number[]): number[];
-        static mul(out: number[], a: number[], b: number[]): number[];
-        static divide(out: number[], a: number[], b: number[]): number[];
-        static div(out: number[], a: number[], b: number[]): number[];
-        static scale(out: number[], a: number[], b: number): number[];
-        static distance(a: number[], b: number[]): number;
-        static dist(a: number[], b: number[]): number;
-        static squaredDistance(a: number[], b: number[]): number;
-        static sqrDist(a: number[], b: number[]): number;
-        static length(a: number[]): number;
-        static len(a: number[]): number;
-        static squaredLength(a: number[]): number;
-        static sqrLen(a: number[]): number;
-        static negate(out: number[], a: number[]): number[];
-        static normalize(out: number[], a: number[]): number[];
-        static dot(a: number[], b: number[]): number;
-        static str(a: number[]): string;
-
-    }
-
-    export interface BodyOptions {
-
-        mass?: number;
-        position?: number[];
-        velocity?: number[];
-        angle?: number;
-        angularVelocity?: number;
-        force?: number[];
-        angularForce?: number;
-        fixedRotation?: boolean;
-
-    }
-
-    export class Body extends EventEmitter {
-
-        sleepyEvent: {
-            type: string;
-        };
-
-        sleepEvent: {
-            type: string;
-        };
-
-        wakeUpEvent: {
-            type: string;
-        };
-
-        static DYNAMIC: number;
-        static STATIC: number;
-        static KINEMATIC: number;
-        static AWAKE: number;
-        static SLEEPY: number;
-        static SLEEPING: number;
-
-        constructor(options?: BodyOptions);
-
-        id: number;
-        world: World;
-        shapes: Shape[];
-        mass: number;
-        invMass: number;
-        inertia: number;
-        invInertia: number;
-        invMassSolve: number;
-        invInertiaSolve: number;
-        fixedRotation: number;
-        position: number[];
-        interpolatedPosition: number[];
-        interpolatedAngle: number;
-        previousPosition: number[];
-        previousAngle: number;
-        velocity: number[];
-        vlambda: number[];
-        wlambda: number[];
-        angle: number;
-        angularVelocity: number;
-        force: number[];
-        angularForce: number;
-        damping: number;
-        angularDamping: number;
-        type: number;
-        boundingRadius: number;
-        aabb: AABB;
-        aabbNeedsUpdate: boolean;
-        allowSleep: boolean;
-        wantsToSleep: boolean;
-        sleepState: number;
-        sleepSpeedLimit: number;
-        sleepTimeLimit: number;
-        gravityScale: number;
-        collisionResponse: boolean;
-
-        updateSolveMassProperties(): void;
-        setDensity(density: number): void;
-        getArea(): number;
-        getAABB(): AABB;
-        updateAABB(): void;
-        updateBoundingRadius(): void;
-        addShape(shape: Shape, offset?: number[], angle?: number): void;
-        removeShape(shape: Shape): boolean;
-        updateMassProperties(): void;
-        applyForce(force: number[], worldPoint: number[]): void;
-        toLocalFrame(out: number[], worldPoint: number[]): void;
-        toWorldFrame(out: number[], localPoint: number[]): void;
-        fromPolygon(path: number[][], options?: {
-            optimalDecomp?: boolean;
-            skipSimpleCheck?: boolean;
-            removeCollinearPoints?: any; //boolean | number
-        }): boolean;
-        adjustCenterOfMass(): void;
-        setZeroForce(): void;
-        resetConstraintVelocity(): void;
-        applyDamping(dy: number): void;
-        wakeUp(): void;
-        sleep(): void;
-        sleepTick(time: number, dontSleep: boolean, dt: number): void;
-        getVelocityFromPosition(story: number[], dt: number): number[];
-        getAngularVelocityFromPosition(timeStep: number): number;
-        overlaps(body: Body): boolean;
-
-    }
-
-    export class Spring {
-
-        constructor(bodyA: Body, bodyB: Body, options?: {
-
-            stiffness?: number;
-            damping?: number;
-            localAnchorA?: number[];
-            localAnchorB?: number[];
-            worldAnchorA?: number[];
-            worldAnchorB?: number[];
-
-        });
-
-        stiffness: number;
-        damping: number;
-        bodyA: Body;
-        bodyB: Body;
-
-        applyForce(): void;
-
-    }
-
-    export class LinearSpring extends Spring {
-
-        localAnchorA: number[];
-        localAnchorB: number[];
-        restLength: number;
-
-        setWorldAnchorA(worldAnchorA: number[]): void;
-        setWorldAnchorB(worldAnchorB: number[]): void;
-        getWorldAnchorA(result: number[]): number[];
-        getWorldAnchorB(result: number[]): number[];
-        applyForce(): void;
-
-    }
-
-    export class RotationalSpring extends Spring {
-
-        constructor(bodyA: Body, bodyB: Body, options?: {
-            restAngle?: number;
-            stiffness?: number;
-            damping?: number;
-        });
-
-        restAngle: number;
-
-    }
-
-    export interface CapsuleOptions extends SharedShapeOptions {
-
-      length?: number;
-      radius?: number;
-
-    }
-
-    export class Capsule extends Shape {
-
-        constructor(options?: CapsuleOptions);
-
-        length: number;
-        radius: number;
-
-    }
-
-    export interface CircleOptions extends SharedShapeOptions {
-
-      radius?: number;
-
-    }
-
-    export class Circle extends Shape {
-
-        constructor(options?: CircleOptions);
-
-        radius: number;
-
-    }
-
-    export interface ConvexOptions extends SharedShapeOptions {
-
-      length?: number;
-      radius?: number;
-
-    }
-
-    export class Convex extends Shape {
-
-        static triangleArea(a: number[], b: number[], c: number[]): number;
-
-        constructor(options?: ConvexOptions);
-
-        vertices: number[][];
-        axes: number[];
-        centerOfMass: number[];
-        triangles: number[];
-        boundingRadius: number;
-
-        projectOntoLocalAxis(localAxis: number[], result: number[]): void;
-        projectOntoWorldAxis(localAxis: number[], shapeOffset: number[], shapeAngle: number, result: number[]): void;
-
-        updateCenterOfMass(): void;
-
-    }
-
-    export interface HeightfieldOptions extends SharedShapeOptions {
-
-        heights?: number[];
-        minValue?: number;
-        maxValue?: number;
-        elementWidth?: number;
-
-    }
-
-    export class Heightfield extends Shape {
-
-        constructor(options?: HeightfieldOptions);
-
-        data: number[];
-        maxValue: number;
-        minValue: number;
-        elementWidth: number;
-
-    }
-
-    export interface SharedShapeOptions {
-
-        position?: number[];
-        angle?: number;
-        collisionGroup?: number;
-        collisionResponse?: boolean;
-        collisionMask?: number;
-        sensor?: boolean;
-
-    }
-
-    export interface ShapeOptions extends SharedShapeOptions {
-
-        type?: number;
-
-    }
-
-    export class Shape {
-
-        static idCounter: number;
-        static CIRCLE: number;
-        static PARTICLE: number;
-        static PLANE: number;
-        static CONVEX: number;
-        static LINE: number;
-        static BOX: number;
-        static CAPSULE: number;
-        static HEIGHTFIELD: number;
-
-        constructor(options?: ShapeOptions);
-
-        type: number;
-        id: number;
-        position: number[];
-        angle: number;
-        boundingRadius: number;
-        collisionGroup: number;
-        collisionResponse: boolean;
-        collisionMask: number;
-        material: Material;
-        area: number;
-        sensor: boolean;
-
-        computeMomentOfInertia(mass: number): number;
-        updateBoundingRadius(): number;
-        updateArea(): void;
-        computeAABB(out: AABB, position: number[], angle: number): void;
-
-    }
-
-    export interface LineOptions extends SharedShapeOptions {
-
-      length?: number;
-
-    }
-
-    export class Line extends Shape {
-
-        constructor(options?: LineOptions);
-
-        length: number;
-
-    }
-
-    export class Particle extends Shape {
-
-        constructor(options?: SharedShapeOptions);
-
-    }
-
-    export class Plane extends Shape {
-
-        constructor(options?: SharedShapeOptions);
-
-    }
-
-    export interface BoxOptions {
-
-      width?: number;
-      height?: number;
-
-    }
-
-    export class Box extends Shape {
-
-        constructor(options?: BoxOptions);
-
-        width: number;
-        height: number;
-
-    }
-
-    export class Solver extends EventEmitter {
-
-        static GS: number;
-        static ISLAND: number;
-
-        constructor(options?: {}, type?: number);
-
-        type: number;
-        equations: Equation[];
-        equationSortFunction: Equation; //Equation | boolean
-
-        solve(dy: number, world: World): void;
-        solveIsland(dy: number, island: Island): void;
-        sortEquations(): void;
-        addEquation(eq: Equation): void;
-        addEquations(eqs: Equation[]): void;
-        removeEquation(eq: Equation): void;
-        removeAllEquations(): void;
-
-    }
-
-    export class GSSolver extends Solver {
-
-        constructor(options?: {
-            iterations?: number;
-            tolerance?: number;
-        });
-
-        iterations: number;
-        tolerance: number;
-        useZeroRHS: boolean;
-        frictionIterations: number;
-        usedIterations: number;
-
-        solve(h: number, world: World): void;
-
-    }
-
-    export class OverlapKeeper {
-
-        constructor(bodyA: Body, shapeA: Shape, bodyB: Body, shapeB: Shape);
-
-        shapeA: Shape;
-        shapeB: Shape;
-        bodyA: Body;
-        bodyB: Body;
-
-        tick(): void;
-        setOverlapping(bodyA: Body, shapeA: Shape, bodyB: Body, shapeB: Body): void;
-        bodiesAreOverlapping(bodyA: Body, bodyB: Body): boolean;
-        set(bodyA: Body, shapeA: Shape, bodyB: Body, shapeB: Shape): void;
-
-    }
-
-    export class TupleDictionary {
-
-        data: number[];
-        keys: number[];
-
-        getKey(id1: number, id2: number): string;
-        getByKey(key: number): number;
-        get(i: number, j: number): number;
-        set(i: number, j: number, value: number): number;
-        reset(): void;
-        copy(dict: TupleDictionary): void;
-
-    }
-
-    export class Utils {
-
-        static appendArray<T>(a: Array<T>, b: Array<T>): Array<T>;
-        static splice<T>(array: Array<T>, index: number, howMany: number): void;
-        static extend(a: any, b: any): void;
-        static defaults(options: any, defaults: any): any;
-
-    }
-
-    export class Island {
-
-        equations: Equation[];
-        bodies: Body[];
-
-        reset(): void;
-        getBodies(result: any): Body[];
-        wantsToSleep(): boolean;
-        sleep(): boolean;
-
-    }
-
-    export class IslandManager extends Solver {
-
-        static getUnvisitedNode(nodes: IslandNode[]): IslandNode; // IslandNode | boolean
-
-        equations: Equation[];
-        islands: Island[];
-        nodes: IslandNode[];
-
-        visit(node: IslandNode, bds: Body[], eqs: Equation[]): void;
-        bfs(root: IslandNode, bds: Body[], eqs: Equation[]): void;
-        split(world: World): Island[];
-
-    }
-
-    export class IslandNode {
-
-        constructor(body: Body);
-
-        body: Body;
-        neighbors: IslandNode[];
-        equations: Equation[];
-        visited: boolean;
-
-        reset(): void;
-
-    }
-
-    export class World extends EventEmitter {
-
-        postStepEvent: {
-            type: string;
-        };
-
-        addBodyEvent: {
-            type: string;
-        };
-
-        removeBodyEvent: {
-            type: string;
-        };
-
-        addSpringEvent: {
-            type: string;
-        };
-
-        impactEvent: {
-            type: string;
-            bodyA: Body;
-            bodyB: Body;
-            shapeA: Shape;
-            shapeB: Shape;
-            contactEquation: ContactEquation;
-        };
-
-        postBroadphaseEvent: {
-            type: string;
-            pairs: Body[];
-        };
-
-        beginContactEvent: {
-            type: string;
-            shapeA: Shape;
-            shapeB: Shape;
-            bodyA: Body;
-            bodyB: Body;
-            contactEquations: ContactEquation[];
-        };
-
-        endContactEvent: {
-            type: string;
-            shapeA: Shape;
-            shapeB: Shape;
-            bodyA: Body;
-            bodyB: Body;
-        };
-
-        preSolveEvent: {
-            type: string;
-            contactEquations: ContactEquation[];
-            frictionEquations: FrictionEquation[];
-        };
-
-        static NO_SLEEPING: number;
-        static BODY_SLEEPING: number;
-        static ISLAND_SLEEPING: number;
-
-        static integrateBody(body: Body, dy: number): void;
-
-        constructor(options?: {
-            solver?: Solver;
-            gravity?: number[];
-            broadphase?: Broadphase;
-            islandSplit?: boolean;
-            doProfiling?: boolean;
-        });
-
-        springs: Spring[];
-        bodies: Body[];
-        solver: Solver;
-        narrowphase: Narrowphase;
-        islandManager: IslandManager;
-        gravity: number[];
-        frictionGravity: number;
-        useWorldGravityAsFrictionGravity: boolean;
-        useFrictionGravityOnZeroGravity: boolean;
-        doProfiling: boolean;
-        lastStepTime: number;
-        broadphase: Broadphase;
-        constraints: Constraint[];
-        defaultMaterial: Material;
-        defaultContactMaterial: ContactMaterial;
-        lastTimeStep: number;
-        applySpringForces: boolean;
-        applyDamping: boolean;
-        applyGravity: boolean;
-        solveConstraints: boolean;
-        contactMaterials: ContactMaterial[];
-        time: number;
-        stepping: boolean;
-        islandSplit: boolean;
-        emitImpactEvent: boolean;
-        sleepMode: number;
-
-        addConstraint(c: Constraint): void;
-        addContactMaterial(contactMaterial: ContactMaterial): void;
-        removeContactMaterial(cm: ContactMaterial): void;
-        getContactMaterial(materialA: Material, materialB: Material): ContactMaterial; // ContactMaterial | boolean
-        removeConstraint(c: Constraint): void;
-        step(dy: number, timeSinceLastCalled?: number, maxSubSteps?: number): void;
-        runNarrowphase(np: Narrowphase, bi: Body, si: Shape, xi: any[], ai: number, bj: Body, sj: Shape, xj: any[], aj: number, cm: number, glen: number): void;
-        addSpring(s: Spring): void;
-        removeSpring(s: Spring): void;
-        addBody(body: Body): void;
-        removeBody(body: Body): void;
-        getBodyByID(id: number): Body; //Body | boolean
-        disableBodyCollision(bodyA: Body, bodyB: Body): void;
-        enableBodyCollision(bodyA: Body, bodyB: Body): void;
-        clear(): void;
-        clone(): World;
-        hitTest(worldPoint: number[], bodies: Body[], precision: number): Body[];
-        setGlobalEquationParameters(parameters: {
-            relaxation?: number;
-            stiffness?: number;
-        }): void;
-        setGlobalStiffness(stiffness: number): void;
-        setGlobalRelaxation(relaxation: number): void;
-    }
-
-}
diff --git a/p2/tsconfig.json b/p2/tsconfig.json
new file mode 100644
index 0000000000..c5509f1e01
--- /dev/null
+++ b/p2/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "p2-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index a22eeda245..a38ab0b124 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,6 @@
   },
   "devDependencies": {
     "definition-tester": "0.5.2",
-    "typescript": "1.8.7"
+    "typescript": "next"
   }
 }
diff --git a/packery/index.d.ts b/packery/index.d.ts
new file mode 100644
index 0000000000..9141bbfd52
--- /dev/null
+++ b/packery/index.d.ts
@@ -0,0 +1,293 @@
+// Type definitions for Packery v1.4.1
+// Project: http://packery.metafizzy.co
+// Definitions by: Piraveen Kamalathas from Kilix <https://github.com/piraveen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface PackeryOptions {
+    /**
+     * [itemSelector Specifies which child elements to be used as item elements. Setting itemSelector is always recommended. itemSelector is useful to exclude sizing elements]
+     * @type {string}
+     */
+    itemSelector?: string;
+
+    /**
+     * [columnWidth The width of a column of a horizontal grid. When set, Packery will align item elements horizontally to this grid]
+     * @type {number}
+     */
+    columnWidth?: number;
+
+    /**
+     * [rowHeight Height of a row of a vertical grid. When set, Packery will align item elements vertically to this grid]
+     * @type {number}
+     */
+    rowHeight?: number;
+
+    /**
+     * [gutter The space between item elements, both vertically and horizontally]
+     * @type {number}
+     */
+    gutter?: number;
+
+    /**
+     * [percentPosition Will set item position in percent values, rather than pixel values. percentPosition works well with percent-width items, as items will not transition their position on resize]
+     * @type {boolean}
+     */
+    percentPosition?: boolean;
+
+    /**
+     * [stamp Specifies which elements are stamped within the layout. These are special layout elements which will not be laid out by Packery. Rather, Packery will layout item elements around stamped elements]
+     * @type {string}
+     */
+    stamp?: string;
+
+    /**
+     * [isHorizontal Arranges items horizontally instead of vertically]
+     * @type {boolean}
+     */
+    isHorizontal?: boolean;
+
+    /**
+     * [isOriginLeft Controls the horizontal flow of the layout. By default, item elements start positioning at the left. Set to false for right-to-left layouts]
+     * @type {boolean}
+     */
+    isOriginLeft?: boolean;
+
+    /**
+     * [isOriginTop Controls the vertical flow of the layout. By default, item elements start positioning at the top. Set to false for bottom-up layouts. It’s like Tetris!]
+     * @type {boolean}
+     */
+    isOriginTop?: boolean;
+
+    /**
+     * [transitionDuration The time duration of transitions for item elements]
+     * @type {string}
+     */
+    transitionDuration?: string;
+
+    /**
+     * [containerStyle CSS styles that are applied to the container element. To disable Packery from setting any CSS to the container element, set containerStyle: null]
+     * @type {Object}
+     */
+    containerStyle?: Object;
+
+    /**
+     * [isResizeBound Binds layout to window resizing]
+     * @type {boolean}
+     */
+    isResizeBound?: boolean;
+
+    /**
+     * [isInitLayout Enables layout on initialization. Set this to false to disable layout on initialization, so you can use methods or add events before the initial layout]
+     * @type {boolean}
+     */
+    isInitLayout?: boolean;
+}
+
+declare class Packery {
+    constructor(element: Element, options?: Object);
+
+    /**
+     * [addItems Add item elements to the Packery instance]
+     * @param {Element} elements [description]
+     */
+    addItems(elements: Element): void;
+
+    /**
+     * [addItems Add item elements to the Packery instance]
+     * @param {NodeList} elements [description]
+     */
+    addItems(elements: NodeList): void;
+
+    /**
+     * [addItems Add item elements to the Packery instance]
+     * @param {Array<Element>} elements [description]
+     */
+    addItems(elements: Array<Element>): void;
+
+    /**
+     * [appended Add and lay out newly appended item elements]
+     * @param {Element} elements [description]
+     */
+    appended(elements: Element): void;
+
+    /**
+     * [appended Add and lay out newly appended item elements]
+     * @param {NodeList} elements [description]
+     */
+    appended(elements: NodeList): void;
+
+    /**
+     * [appended Add and lay out newly appended item elements]
+     * @param {Array<Element>} elements [description]
+     */
+    appended(elements: Array<Element>): void;
+
+    /**
+     * [bindDraggabillyEvents Bind Draggabilly events, so that the Packery instance will layout around the dragged element]
+     * @param {any} draggie [description]
+     */
+    bindDraggabillyEvents(draggie: any): void;
+
+    /**
+     * [bindResize Binds event listener to window resize, so layout is triggered when the browser window is resized]
+     */
+    bindResize(): void;
+
+    /**
+     * [bindUIDraggableEvents Bind jQuery UI Draggable events, so that the Packery instance will layout around the dragged element]
+     * @param {any} elements [jQuery UI]
+     */
+    bindUIDraggableEvents($element: any): void;
+
+    /**
+     * [data Get the Packery instance from an element. Note this method is of Packery, rather than of a Packery instance]
+     * @param  {Element} element [description]
+     * @return {Packery}         [description]
+     */
+    data(element: Element): Packery;
+
+    /**
+     * [destroy Removes the Packery functionality completely. This will return the element back to its pre-initialized state]
+     */
+    destroy(): void;
+
+    /**
+     * [fit Fit an item element within the layout, and have other item elements laid out around it. This method is useful when expanding an element, and keeping it in its same position.]
+     * @param {any}    element [description]
+     * @param {number} x       [description]
+     * @param {number} y       [description]
+     */
+    fit(element: Element, x?: number, y?: number): void;
+
+    /**
+     * [getItemElements Get an array of elements used as the Packery instance's items.]
+     * @return {Array<Element>}      [description]
+     */
+    getItemElements(): Array<Element>;
+
+    /**
+     * [getItem Get a Packery.Item from an element]
+     * @param  {Element} element [description]
+     * @return {any}             [Packery.item]
+     */
+    getItem(element: Element): any;
+
+    /**
+     * [layout Lay out all item elements.]
+     */
+    layout(): void;
+
+    /**
+     * [layoutItems Lay out specified items]
+     * @param {Array<Packery.items>} items [description]
+     */
+    layoutItems(items: Array<any>): void;
+
+    /**
+     * [off Remove an event listener]
+     * @param  {string}   eventName [description]
+     * @param  {Function} listener  [description]
+     * @return {Packery}            [description]
+     */
+    off(eventName: string, listener: Function): Packery;
+
+    /**
+     * [on Add an event listener for certain events]
+     * @param  {string}   eventName [description]
+     * @param  {Function} listener  [description]
+     * @return {Packery}            [description]
+     */
+    on(eventName: string, listener: Function): Packery;
+
+    /**
+     * [once Add an event listener for certain events, to be triggered once]
+     * @param {string}   eventName [description]
+     * @param {Function} listener  [description]
+     */
+    once(eventName: string, listener: Function): void;
+
+    /**
+     * [prepended Add and lay out newly prepended item elements at the beginning of layout]
+     * @param {Element} elements [description]
+     */
+    prepended(elements: Element): void;
+
+    /**
+     * [prepended Add and lay out newly prepended item elements at the beginning of layout]
+     * @param {NodeList} elements [description]
+     */
+    prepended(elements: NodeList): void;
+
+    /**
+     * [prepended Add and lay out newly prepended item elements at the beginning of layout]
+     * @param {Array<Element>} elements [description]
+     */
+    prepended(elements: Array<Element>): void;
+
+    /**
+     * [reloadItems Recollect all item elements]
+     */
+    reloadItems(): void;
+
+    /**
+     * [remove Remove elements from the Packery instance, then from the DOM]
+     * @param {Element} elements [description]
+     */
+    remove(elements: Element): void;
+
+    /**
+     * [remove Remove elements from the Packery instance, then from the DOM]
+     * @param {NodeList} elements [description]
+     */
+    remove(elements: NodeList): void;
+
+    /**
+     * [remove Remove elements from the Packery instance, then from the DOM]
+     * @param {Array<Element>} elements [description]
+     */
+    remove(elements: Array<Element>): void;
+
+    /**
+     * [stamp Stamp the elements in the layout. Packery will lay out item elements around stamped element]
+     * @param {Element} elements [description]
+     */
+    stamp(elements: Element): void;
+
+    /**
+     * [stamp Stamp the elements in the layout. Packery will lay out item elements around stamped element]
+     * @param {NodeList} elements [description]
+     */
+    stamp(elements: NodeList): void;
+
+    /**
+     * [stamp Stamp the elements in the layout. Packery will lay out item elements around stamped element]
+     * @param {Array<Element>} elements [description]
+     */
+    stamp(elements: Array<Element>): void;
+
+    /**
+     * [unbindResize Un-bind layout to window resize event]
+     */
+    unbindResize(): void;
+
+    /**
+     * [unstamp Un-stamp the elements, so that Packery will no longer layout item elements around them]
+     * @param {Element} element [description]
+     */
+    unstamp(element: Element): void;
+
+    /**
+     * [unstamp Un-stamp the elements, so that Packery will no longer layout item elements around them]
+     * @param {NodeList} element [description]
+     */
+    unstamp(element: NodeList): void;
+
+    /**
+     * [unstamp Un-stamp the elements, so that Packery will no longer layout item elements around them]
+     * @param {Array<Element>} element [description]
+     */
+    unstamp(element: Array<Element>): void;
+}
+
+export = Packery;
diff --git a/packery/packery-tests.ts b/packery/packery-tests.ts
index f8cad75923..e8faff1b3f 100644
--- a/packery/packery-tests.ts
+++ b/packery/packery-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="packery.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+
+/// <reference types="jquery" />
 
 import Packery = require('packery');
 
diff --git a/packery/packery.d.ts b/packery/packery.d.ts
deleted file mode 100644
index 553d45b514..0000000000
--- a/packery/packery.d.ts
+++ /dev/null
@@ -1,294 +0,0 @@
-// Type definitions for Packery v1.4.1
-// Project: http://packery.metafizzy.co
-// Definitions by: Piraveen Kamalathas from Kilix <https://github.com/piraveen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "packery" {
-	interface PackeryOptions {
-		/**
-		 * [itemSelector Specifies which child elements to be used as item elements. Setting itemSelector is always recommended. itemSelector is useful to exclude sizing elements]
-		 * @type {string}
-		 */
-		itemSelector?: string;
-		
-		/**
-		 * [columnWidth The width of a column of a horizontal grid. When set, Packery will align item elements horizontally to this grid]
-		 * @type {number}
-		 */
-		columnWidth?: number;
-		
-		/**
-		 * [rowHeight Height of a row of a vertical grid. When set, Packery will align item elements vertically to this grid]
-		 * @type {number}
-		 */
-		rowHeight?: number;
-
-		/**
-		 * [gutter The space between item elements, both vertically and horizontally]
-		 * @type {number}
-		 */
-		gutter?: number;
-		
-		/**
-		 * [percentPosition Will set item position in percent values, rather than pixel values. percentPosition works well with percent-width items, as items will not transition their position on resize]
-		 * @type {boolean}
-		 */
-		percentPosition?: boolean;
-		
-		/**
-		 * [stamp Specifies which elements are stamped within the layout. These are special layout elements which will not be laid out by Packery. Rather, Packery will layout item elements around stamped elements]
-		 * @type {string}
-		 */
-		stamp?: string;
-		
-		/**
-		 * [isHorizontal Arranges items horizontally instead of vertically]
-		 * @type {boolean}
-		 */
-		isHorizontal?: boolean;
-		
-		/**
-		 * [isOriginLeft Controls the horizontal flow of the layout. By default, item elements start positioning at the left. Set to false for right-to-left layouts]
-		 * @type {boolean}
-		 */
-		isOriginLeft?: boolean;
-
-		/**
-		 * [isOriginTop Controls the vertical flow of the layout. By default, item elements start positioning at the top. Set to false for bottom-up layouts. It’s like Tetris!]
-		 * @type {boolean}
-		 */
-		isOriginTop?: boolean;
-
-		/**
-		 * [transitionDuration The time duration of transitions for item elements]
-		 * @type {string}
-		 */
-		transitionDuration?: string;
-
-		/**
-		 * [containerStyle CSS styles that are applied to the container element. To disable Packery from setting any CSS to the container element, set containerStyle: null]
-		 * @type {Object}
-		 */
-		containerStyle?: Object;
-		
-		/**
-		 * [isResizeBound Binds layout to window resizing]
-		 * @type {boolean}
-		 */
-		isResizeBound?: boolean;
-
-		/**
-		 * [isInitLayout Enables layout on initialization. Set this to false to disable layout on initialization, so you can use methods or add events before the initial layout]
-		 * @type {boolean}
-		 */
-		isInitLayout?: boolean;
-	}
-
-	class Packery {
-		constructor(element: Element, options?: Object);
-
-		/**
-		 * [addItems Add item elements to the Packery instance]
-		 * @param {Element} elements [description]
-		 */
-		addItems(elements: Element): void;
-
-		/**
-		 * [addItems Add item elements to the Packery instance]
-		 * @param {NodeList} elements [description]
-		 */
-		addItems(elements: NodeList): void;
-
-		/**
-		 * [addItems Add item elements to the Packery instance]
-		 * @param {Array<Element>} elements [description]
-		 */
-		addItems(elements: Array<Element>): void;
-
-		/**
-		 * [appended Add and lay out newly appended item elements]
-		 * @param {Element} elements [description]
-		 */
-		appended(elements: Element): void;
-
-		/**
-		 * [appended Add and lay out newly appended item elements]
-		 * @param {NodeList} elements [description]
-		 */
-		appended(elements: NodeList): void;
-
-		/**
-		 * [appended Add and lay out newly appended item elements]
-		 * @param {Array<Element>} elements [description]
-		 */
-		appended(elements: Array<Element>): void;
-
-		/**
-		 * [bindDraggabillyEvents Bind Draggabilly events, so that the Packery instance will layout around the dragged element]
-		 * @param {any} draggie [description]
-		 */
-		bindDraggabillyEvents(draggie: any): void;
-
-		/**
-		 * [bindResize Binds event listener to window resize, so layout is triggered when the browser window is resized]
-		 */
-		bindResize(): void;
-
-		/**
-		 * [bindUIDraggableEvents Bind jQuery UI Draggable events, so that the Packery instance will layout around the dragged element]
-		 * @param {any} elements [jQuery UI]
-		 */
-		bindUIDraggableEvents($element: any): void;
-
-		/**
-		 * [data Get the Packery instance from an element. Note this method is of Packery, rather than of a Packery instance]
-		 * @param  {Element} element [description]
-		 * @return {Packery}         [description]
-		 */
-		data(element: Element): Packery;
-
-		/**
-		 * [destroy Removes the Packery functionality completely. This will return the element back to its pre-initialized state]
-		 */
-		destroy(): void;
-
-		/**
-		 * [fit Fit an item element within the layout, and have other item elements laid out around it. This method is useful when expanding an element, and keeping it in its same position.]
-		 * @param {any}    element [description]
-		 * @param {number} x       [description]
-		 * @param {number} y       [description]
-		 */
-		fit(element: Element, x ?: number, y ?: number): void;
-
-		/**
-		 * [getItemElements Get an array of elements used as the Packery instance's items.]
-		 * @return {Array<Element>}      [description]
-		 */
-		getItemElements(): Array<Element>;
-
-		/**
-		 * [getItem Get a Packery.Item from an element]
-		 * @param  {Element} element [description]
-		 * @return {any}             [Packery.item]
-		 */
-		getItem(element: Element): any;
-
-		/**
-		 * [layout Lay out all item elements.]
-		 */
-		layout(): void;
-
-		/**
-		 * [layoutItems Lay out specified items]
-		 * @param {Array<Packery.items>} items [description]
-		 */
-		layoutItems(items: Array<any>): void;
-
-		/**
-		 * [off Remove an event listener]
-		 * @param  {string}   eventName [description]
-		 * @param  {Function} listener  [description]
-		 * @return {Packery}            [description]
-		 */
-		off(eventName: string, listener: Function): Packery;
-
-		/**
-		 * [on Add an event listener for certain events]
-		 * @param  {string}   eventName [description]
-		 * @param  {Function} listener  [description]
-		 * @return {Packery}            [description]
-		 */
-		on(eventName: string, listener: Function): Packery;
-
-		/**
-		 * [once Add an event listener for certain events, to be triggered once]
-		 * @param {string}   eventName [description]
-		 * @param {Function} listener  [description]
-		 */
-		once(eventName: string, listener: Function): void;
-
-		/**
-		 * [prepended Add and lay out newly prepended item elements at the beginning of layout]
-		 * @param {Element} elements [description]
-		 */
-		prepended(elements: Element): void;
-		
-		/**
-		 * [prepended Add and lay out newly prepended item elements at the beginning of layout]
-		 * @param {NodeList} elements [description]
-		 */
-		prepended(elements: NodeList): void;
-		
-		/**
-		 * [prepended Add and lay out newly prepended item elements at the beginning of layout]
-		 * @param {Array<Element>} elements [description]
-		 */
-		prepended(elements: Array<Element>): void;
-		
-		/**
-		 * [reloadItems Recollect all item elements]
-		 */
-		reloadItems(): void;
-
-		/**
-		 * [remove Remove elements from the Packery instance, then from the DOM]
-		 * @param {Element} elements [description]
-		 */
-		remove(elements: Element): void;
-
-		/**
-		 * [remove Remove elements from the Packery instance, then from the DOM]
-		 * @param {NodeList} elements [description]
-		 */
-		remove(elements: NodeList): void;
-
-		/**
-		 * [remove Remove elements from the Packery instance, then from the DOM]
-		 * @param {Array<Element>} elements [description]
-		 */
-		remove(elements: Array<Element>): void;
-
-		/**
-		 * [stamp Stamp the elements in the layout. Packery will lay out item elements around stamped element]
-		 * @param {Element} elements [description]
-		 */
-		stamp(elements: Element): void;
-
-		/**
-		 * [stamp Stamp the elements in the layout. Packery will lay out item elements around stamped element]
-		 * @param {NodeList} elements [description]
-		 */
-		stamp(elements: NodeList): void;
-
-		/**
-		 * [stamp Stamp the elements in the layout. Packery will lay out item elements around stamped element]
-		 * @param {Array<Element>} elements [description]
-		 */
-		stamp(elements: Array<Element>): void;
-
-		/**
-		 * [unbindResize Un-bind layout to window resize event]
-		 */
-		unbindResize(): void;
-
-		/**
-		 * [unstamp Un-stamp the elements, so that Packery will no longer layout item elements around them]
-		 * @param {Element} element [description]
-		 */
-		unstamp(element: Element): void;
-
-		/**
-		 * [unstamp Un-stamp the elements, so that Packery will no longer layout item elements around them]
-		 * @param {NodeList} element [description]
-		 */
-		unstamp(element: NodeList): void;
-
-		/**
-		 * [unstamp Un-stamp the elements, so that Packery will no longer layout item elements around them]
-		 * @param {Array<Element>} element [description]
-		 */
-		unstamp(element: Array<Element>): void;
-	}
-
-	export = Packery;
-}
diff --git a/packery/tsconfig.json b/packery/tsconfig.json
new file mode 100644
index 0000000000..f422cc9508
--- /dev/null
+++ b/packery/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "packery-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/page/page.d.ts b/page/index.d.ts
similarity index 100%
rename from page/page.d.ts
rename to page/index.d.ts
diff --git a/page/page-tests.ts b/page/page-tests.ts
index 49fedad73c..1bd45991b3 100644
--- a/page/page-tests.ts
+++ b/page/page-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="page.d.ts" />
+
 
 import page = require("page");
 
diff --git a/page/tsconfig.json b/page/tsconfig.json
new file mode 100644
index 0000000000..20190f51d5
--- /dev/null
+++ b/page/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "page-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pako/index.d.ts b/pako/index.d.ts
new file mode 100644
index 0000000000..572fe99c9f
--- /dev/null
+++ b/pako/index.d.ts
@@ -0,0 +1,62 @@
+// Type definitions for pako 0.2.8
+// Project: https://github.com/nodeca/pako
+// Definitions by: Denis Cappellin <http://github.com/cappellin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = Pako;
+export as namespace pako;
+
+declare namespace Pako {
+
+	/**
+	 * Compress data with deflate algorithm and options.
+	 */
+	export function deflate( data: Uint8Array | Array<number> | string, options?: any ): string;
+	/**
+	 * The same as deflate, but creates raw data, without wrapper (header and adler32 crc).
+	 */
+	export function deflateRaw( data: Uint8Array | Array<number> | string, options?: any ): string;
+	/**
+	 * The same as deflate, but create gzip wrapper instead of deflate one.
+	 */
+	export function gzip( data: Uint8Array | Array<number> | string, options?: any ): string;
+	/**
+	 * Decompress data with inflate/ungzip and options. Autodetect format via wrapper header
+	 * by default. That's why we don't provide separate ungzip method.
+	 */
+	export function inflate( data: Uint8Array | Array<number> | string, options?: any ): Uint8Array;
+	export function inflate( data: Uint8Array | Array<number> | string, options?: any ): Array<number>;
+	export function inflate( data: Uint8Array | Array<number> | string, options?: any ): String;
+	/**
+	 * The same as inflate, but creates raw data, without wrapper (header and adler32 crc).
+	 */
+	export function inflateRaw( data: Uint8Array | Array<number> | string, options?: any ): Uint8Array;
+	export function inflateRaw( data: Uint8Array | Array<number> | string, options?: any ): Array<number>;
+	export function inflateRaw( data: Uint8Array | Array<number> | string, options?: any ): string;
+	/**
+	 * Just shortcut to inflate, because it autodetects format by header.content. Done for convenience.
+	 */
+	export function ungzip( data: Uint8Array | Array<number> | string, options?: any ): Uint8Array;
+	export function ungzip( data: Uint8Array | Array<number> | string, options?: any ): Array<number>;
+	export function ungzip( data: Uint8Array | Array<number> | string, options?: any ): string;
+
+	export class Deflate {
+		constructor( options?: any );
+		err: number;
+		msg: string;
+		result: Uint8Array | Array<number>;
+		onData( chunk: Uint8Array | Array<number> | string ): void;
+		onEnd( status: number ): void;
+		push( data: Uint8Array | Array<number> | ArrayBuffer | string, mode?: number | boolean ): boolean;
+	}
+
+	export class Inflate {
+		constructor( options?: any );
+		err: number;
+		msg: string;
+		result: Uint8Array | Array<number> | string;
+		onData( chunk: Uint8Array | Array<number> | string ): void;
+		onEnd( status: number ): void;
+		push( data: Uint8Array | Array<number> | ArrayBuffer | string, mode?: number | boolean ): boolean;
+	}
+}
diff --git a/pako/pako-tests.ts b/pako/pako-tests.ts
index b364d971ff..e928fba9dc 100644
--- a/pako/pako-tests.ts
+++ b/pako/pako-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="pako.d.ts" />
+
 
 import pako = require("pako");
 
diff --git a/pako/pako.d.ts b/pako/pako.d.ts
deleted file mode 100644
index 9f7d84df39..0000000000
--- a/pako/pako.d.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-// Type definitions for pako 0.2.8
-// Project: https://github.com/nodeca/pako
-// Definitions by: Denis Cappellin <http://github.com/cappellin>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace Pako {
-
-	/**
-	 * Compress data with deflate algorithm and options.
-	 */
-	export function deflate( data: Uint8Array | Array<number> | string, options?: any ): string;
-	/**
-	 * The same as deflate, but creates raw data, without wrapper (header and adler32 crc).
-	 */
-	export function deflateRaw( data: Uint8Array | Array<number> | string, options?: any ): string;
-	/**
-	 * The same as deflate, but create gzip wrapper instead of deflate one.
-	 */
-	export function gzip( data: Uint8Array | Array<number> | string, options?: any ): string;
-	/**
-	 * Decompress data with inflate/ungzip and options. Autodetect format via wrapper header
-	 * by default. That's why we don't provide separate ungzip method.
-	 */
-	export function inflate( data: Uint8Array | Array<number> | string, options?: any ): Uint8Array;
-	export function inflate( data: Uint8Array | Array<number> | string, options?: any ): Array<number>;
-	export function inflate( data: Uint8Array | Array<number> | string, options?: any ): String;
-	/**
-	 * The same as inflate, but creates raw data, without wrapper (header and adler32 crc).
-	 */
-	export function inflateRaw( data: Uint8Array | Array<number> | string, options?: any ): Uint8Array;
-	export function inflateRaw( data: Uint8Array | Array<number> | string, options?: any ): Array<number>;
-	export function inflateRaw( data: Uint8Array | Array<number> | string, options?: any ): string;
-	/**
-	 * Just shortcut to inflate, because it autodetects format by header.content. Done for convenience.
-	 */
-	export function ungzip( data: Uint8Array | Array<number> | string, options?: any ): Uint8Array;
-	export function ungzip( data: Uint8Array | Array<number> | string, options?: any ): Array<number>;
-	export function ungzip( data: Uint8Array | Array<number> | string, options?: any ): string;
-
-	export class Deflate {
-		constructor( options?: any );
-		err: number;
-		msg: string;
-		result: Uint8Array | Array<number>;
-		onData( chunk: Uint8Array | Array<number> | string ): void;
-		onEnd( status: number ): void;
-		push( data: Uint8Array | Array<number> | ArrayBuffer | string, mode?: number | boolean ): boolean;
-	}
-
-	export class Inflate {
-		constructor( options?: any );
-		err: number;
-		msg: string;
-		result: Uint8Array | Array<number> | string;
-		onData( chunk: Uint8Array | Array<number> | string ): void;
-		onEnd( status: number ): void;
-		push( data: Uint8Array | Array<number> | ArrayBuffer | string, mode?: number | boolean ): boolean;
-	}
-}
-
-declare module 'pako' {
-	export = Pako;
-}
diff --git a/pako/tsconfig.json b/pako/tsconfig.json
new file mode 100644
index 0000000000..b1725a112d
--- /dev/null
+++ b/pako/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pako-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/papaparse/papaparse.d.ts b/papaparse/index.d.ts
similarity index 100%
rename from papaparse/papaparse.d.ts
rename to papaparse/index.d.ts
diff --git a/papaparse/papaparse-tests.ts b/papaparse/papaparse-tests.ts
index 8ae3f91672..32de7e109f 100644
--- a/papaparse/papaparse-tests.ts
+++ b/papaparse/papaparse-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="papaparse.d.ts" />
+
 
 import Papa = require("papaparse");
 
diff --git a/papaparse/tsconfig.json b/papaparse/tsconfig.json
new file mode 100644
index 0000000000..67bad63174
--- /dev/null
+++ b/papaparse/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "papaparse-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/parallel/parallel-tests.ts.tscparams b/parallel/parallel-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/parallel/parallel-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/parallel/parallel.d.ts b/paralleljs/index.d.ts
similarity index 100%
rename from parallel/parallel.d.ts
rename to paralleljs/index.d.ts
diff --git a/parallel/parallel-tests.ts b/paralleljs/parallel-tests.ts
similarity index 89%
rename from parallel/parallel-tests.ts
rename to paralleljs/parallel-tests.ts
index e0c9cb7a80..b58d08dadd 100644
--- a/parallel/parallel-tests.ts
+++ b/paralleljs/parallel-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="parallel.d.ts" />
+
 
 interface String {
 	reverse(): string;
@@ -35,7 +35,7 @@ p3.map(fib).then(log);
 var p4 = new Parallel([0, 1, 2, 3, 4, 5, 6, 7, 8]);
 
 function add(d: number[]) { return d[0] + d[1]; }
-function factorial(n: number) { return n < 2 ? 1 : n * factorial(n - 1); }
+function factorial(n: number): number { return n < 2 ? 1 : n * factorial(n - 1); }
 
 p4.require(factorial);
 
@@ -44,7 +44,7 @@ p4.map(function (n: number) { return Math.pow(10, n); }).reduce(add).then(log);
 
 var p5 = new Parallel([1, 2, 3]);
 
-function dbl(n) { return n * 2; }
+function dbl(n: number) { return n * 2; }
 
 p5.map(dbl).map(dbl).map(dbl).then(function (data) {
 	console.log(data); // logs [8, 16, 24]
diff --git a/paralleljs/tsconfig.json b/paralleljs/tsconfig.json
new file mode 100644
index 0000000000..fc511657c3
--- /dev/null
+++ b/paralleljs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "parallel-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/param-case/index.d.ts b/param-case/index.d.ts
new file mode 100644
index 0000000000..848acf0ac8
--- /dev/null
+++ b/param-case/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for param-case
+// Project: https://github.com/blakeembrey/param-case
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function paramCase(string: string, locale?: string): string;
+export = paramCase;
diff --git a/param-case/param-case-tests.ts b/param-case/param-case-tests.ts
index 1ac68a3d18..c7440a6bd1 100644
--- a/param-case/param-case-tests.ts
+++ b/param-case/param-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="param-case.d.ts" />
 
 import paramCase = require('param-case');
 
diff --git a/param-case/param-case.d.ts b/param-case/param-case.d.ts
deleted file mode 100644
index 7fd8c31638..0000000000
--- a/param-case/param-case.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for param-case
-// Project: https://github.com/blakeembrey/param-case
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "param-case" {
-	function paramCase(string: string, locale?: string): string;
-	export = paramCase;
-}
diff --git a/param-case/tsconfig.json b/param-case/tsconfig.json
new file mode 100644
index 0000000000..6c7fe086ca
--- /dev/null
+++ b/param-case/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "param-case-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/parse-glob/index.d.ts b/parse-glob/index.d.ts
new file mode 100644
index 0000000000..d7577faf1d
--- /dev/null
+++ b/parse-glob/index.d.ts
@@ -0,0 +1,91 @@
+// Type definitions for parse-glob 3.0.4
+// Project: https://github.com/jonschlinkert/parse-glob
+// Definitions by: glen-84 <https://github.com/glen-84>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare namespace parseGlob {
+    interface Result {
+        /**
+         * A copy of the original, unmodified glob pattern.
+         */
+        orig: string;
+        /**
+         * An object with boolean information about the glob.
+         */
+        is: {
+            /**
+             * True if the pattern actually is a glob pattern.
+             */
+            glob: boolean;
+            /**
+             * True if it's a negation pattern (!/foo.js).
+             */
+            negated: boolean;
+            /**
+             * True if it has extglobs (@(foo|bar)).
+             */
+            extglob: boolean;
+            /**
+             * True if it has braces ({1..2} or .{txt,md}).
+             */
+            braces: boolean;
+            /**
+             * True if it has POSIX brackets ([[:alpha:]]).
+             */
+            brackets: boolean;
+            /**
+             * True if the pattern has a globstar (double star, **).
+             */
+            globstar: boolean;
+            /**
+             * True if the pattern should match dotfiles.
+             */
+            dotfile: boolean;
+            /**
+             * True if the pattern should match dot-directories (like .git).
+             */
+            dotdir: boolean;
+        };
+        /**
+         * The glob pattern part of the string, if any.
+         */
+        glob: string;
+        /**
+         * The non-glob part of the string, if any.
+         */
+        base: string;
+        /**
+         * File path segments.
+         */
+        path: {
+            /**
+             * Directory.
+             */
+            dirname: string;
+            /**
+             * File name with extension.
+             */
+            basename: string;
+            /**
+             * File name without extension.
+             */
+            filename: string;
+            /**
+             * File extension with dot.
+             */
+            extname: string;
+            /**
+             * File extension without dot.
+             */
+            ext: string;
+        };
+    }
+}
+
+interface ParseGlob {
+    (glob: string): parseGlob.Result;
+}
+
+declare const parseGlob: ParseGlob;
+export = parseGlob;
diff --git a/parse-glob/parse-glob-tests.ts b/parse-glob/parse-glob-tests.ts
index 267f2b4ed7..da176bf042 100644
--- a/parse-glob/parse-glob-tests.ts
+++ b/parse-glob/parse-glob-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./parse-glob.d.ts" />
+
 import parseGlob = require('parse-glob');
 
 var result: parseGlob.Result = parseGlob('a/b/c/**/*.{yml,json}');
diff --git a/parse-glob/parse-glob.d.ts b/parse-glob/parse-glob.d.ts
deleted file mode 100644
index b3bb7e85df..0000000000
--- a/parse-glob/parse-glob.d.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-// Type definitions for parse-glob 3.0.4
-// Project: https://github.com/jonschlinkert/parse-glob
-// Definitions by: glen-84 <https://github.com/glen-84>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'parse-glob' {
-    namespace parseGlob {
-        interface Result {
-            /**
-             * A copy of the original, unmodified glob pattern.
-             */
-            orig: string;
-            /**
-             * An object with boolean information about the glob.
-             */
-            is: {
-                /**
-                 * True if the pattern actually is a glob pattern.
-                 */
-                glob: boolean;
-                /**
-                 * True if it's a negation pattern (!/foo.js).
-                 */
-                negated: boolean;
-                /**
-                 * True if it has extglobs (@(foo|bar)).
-                 */
-                extglob: boolean;
-                /**
-                 * True if it has braces ({1..2} or .{txt,md}).
-                 */
-                braces: boolean;
-                /**
-                 * True if it has POSIX brackets ([[:alpha:]]).
-                 */
-                brackets: boolean;
-                /**
-                 * True if the pattern has a globstar (double star, **).
-                 */
-                globstar: boolean;
-                /**
-                 * True if the pattern should match dotfiles.
-                 */
-                dotfile: boolean;
-                /**
-                 * True if the pattern should match dot-directories (like .git).
-                 */
-                dotdir: boolean;
-            };
-            /**
-             * The glob pattern part of the string, if any.
-             */
-            glob: string;
-            /**
-             * The non-glob part of the string, if any.
-             */
-            base: string;
-            /**
-             * File path segments.
-             */
-            path: {
-                /**
-                 * Directory.
-                 */
-                dirname: string;
-                /**
-                 * File name with extension.
-                 */
-                basename: string;
-                /**
-                 * File name without extension.
-                 */
-                filename: string;
-                /**
-                 * File extension with dot.
-                 */
-                extname: string;
-                /**
-                 * File extension without dot.
-                 */
-                ext: string;
-            };
-        }
-    }
-
-    interface ParseGlob {
-        (glob: string): parseGlob.Result;
-    }
-
-    const parseGlob: ParseGlob;
-    export = parseGlob;
-}
diff --git a/parse-glob/tsconfig.json b/parse-glob/tsconfig.json
new file mode 100644
index 0000000000..4280832b76
--- /dev/null
+++ b/parse-glob/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "parse-glob-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/parse-torrent/index.d.ts b/parse-torrent/index.d.ts
new file mode 100644
index 0000000000..b27d911026
--- /dev/null
+++ b/parse-torrent/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for parse-torrent
+// Project: https://github.com/feross/parse-torrent
+// Definitions by: Bazyli Brzóska <https://invent.life>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare var parseTorrentStatic:ParseTorrent.StaticInstance;
+export = parseTorrentStatic;
+
+declare namespace ParseTorrent {
+  export interface ParsedTorrent {
+    infoHash:string;
+    xt?:string;
+    info?: { length:number, name:Buffer, 'piece length':number, pieces:Buffer };
+    infoBuffer?:Buffer;
+    name?:string;
+    private?:boolean;
+    created?:Date;
+    comment?:string;
+    announce?:Array<string>;
+    urlList?:Array<string>;
+    files?:Array<{path:string, name:string, length: number, offset:number}>;
+    length?:number;
+    pieceLength?:number;
+    lastPieceLength?:number;
+    pieces?:Array<string>;
+  }
+
+  interface StaticInstance {
+    (magnetUriOrInfoHash:string):ParsedTorrent;
+    (torrentFileOrInfoHash:Buffer):{ info:ParsedTorrent };
+
+    toMagnetURI(parsedTorrent:ParsedTorrent):string;
+    toTorrentFile(parsedTorrent:{ info:ParsedTorrent }):Buffer;
+
+    remote(remoteURLorLocalTorrentPath:string, onTorrentCallback?:(err:Error, parsedTorrent:ParsedTorrent)=>void):void;
+    remote(torrentBlob:Blob, onTorrentCallback?:(err:Error, parsedTorrent:ParsedTorrent)=>void):void;
+  }
+}
diff --git a/parse-torrent/parse-torrent-tests.ts b/parse-torrent/parse-torrent-tests.ts
index 99fa9be86f..0b00888c9b 100644
--- a/parse-torrent/parse-torrent-tests.ts
+++ b/parse-torrent/parse-torrent-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="parse-torrent.d.ts" />
+
 
 import parseTorrent = require('parse-torrent');
 import * as fs from 'fs';
diff --git a/parse-torrent/parse-torrent.d.ts b/parse-torrent/parse-torrent.d.ts
deleted file mode 100644
index cbc21c1cac..0000000000
--- a/parse-torrent/parse-torrent.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// Type definitions for parse-torrent
-// Project: https://github.com/feross/parse-torrent
-// Definitions by: Bazyli Brzóska <https://invent.life>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path='../node/node.d.ts' />
-
-declare namespace ParseTorrent {
-  export interface ParsedTorrent {
-    infoHash:string;
-    xt?:string;
-    info?: { length:number, name:Buffer, 'piece length':number, pieces:Buffer };
-    infoBuffer?:Buffer;
-    name?:string;
-    private?:boolean;
-    created?:Date;
-    comment?:string;
-    announce?:Array<string>;
-    urlList?:Array<string>;
-    files?:Array<{path:string, name:string, length: number, offset:number}>;
-    length?:number;
-    pieceLength?:number;
-    lastPieceLength?:number;
-    pieces?:Array<string>;
-  }
-
-  interface StaticInstance {
-    (magnetUriOrInfoHash:string):ParsedTorrent;
-    (torrentFileOrInfoHash:Buffer):{ info:ParsedTorrent };
-
-    toMagnetURI(parsedTorrent:ParsedTorrent):string;
-    toTorrentFile(parsedTorrent:{ info:ParsedTorrent }):Buffer;
-
-    remote(remoteURLorLocalTorrentPath:string, onTorrentCallback?:(err:Error, parsedTorrent:ParsedTorrent)=>void):void;
-    remote(torrentBlob:Blob, onTorrentCallback?:(err:Error, parsedTorrent:ParsedTorrent)=>void):void;
-  }
-}
-
-declare module "parse-torrent" {
-  const parseTorrentStatic:ParseTorrent.StaticInstance;
-  export = parseTorrentStatic;
-}
diff --git a/parse-torrent/tsconfig.json b/parse-torrent/tsconfig.json
new file mode 100644
index 0000000000..2da2a99c2c
--- /dev/null
+++ b/parse-torrent/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "parse-torrent-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/parse/index.d.ts b/parse/index.d.ts
new file mode 100644
index 0000000000..1e8bdab69e
--- /dev/null
+++ b/parse/index.d.ts
@@ -0,0 +1,1060 @@
+// Type definitions for Parse v1.2.19
+// Project: https://parse.com/
+// Definitions by: Ullisen Media Group <http://ullisenmedia.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+/// <reference types="jquery" />
+/// <reference types="underscore" />
+
+declare namespace Parse {
+
+    var applicationId: string;
+    var javaScriptKey: string;
+    var masterKey: string;
+    var serverURL: string;
+    var VERSION: string;
+
+    interface SuccessOption {
+        success?: Function;
+    }
+
+    interface ErrorOption {
+        error?: Function;
+    }
+
+    interface SuccessFailureOptions extends SuccessOption, ErrorOption {
+    }
+
+    interface WaitOption {
+        /**
+         * Set to true to wait for the server to confirm success
+         * before triggering an event.
+         */
+        wait?: boolean;
+    }
+
+    interface UseMasterKeyOption {
+        /**
+         * In Cloud Code and Node only, causes the Master Key to be used for this request.
+         */
+        useMasterKey?: boolean;
+    }
+
+    interface SilentOption {
+        /**
+         * Set to true to avoid firing the event.
+         */
+        silent?: boolean;
+    }
+
+    /**
+     * A Promise is returned by async methods as a hook to provide callbacks to be
+     * called when the async task is fulfilled.
+     *
+     * <p>Typical usage would be like:<pre>
+     *    query.find().then(function(results) {
+     *      results[0].set("foo", "bar");
+     *      return results[0].saveAsync();
+     *    }).then(function(result) {
+     *      console.log("Updated " + result.id);
+     *    });
+     * </pre></p>
+     *
+     * @see Parse.Promise.prototype.then
+     * @class
+     */
+
+    interface IPromise<T> {
+
+        then<U>(resolvedCallback: (value: T) => IPromise<U>, rejectedCallback?: (reason: any) => IPromise<U>): IPromise<T>;
+        then<U>(resolvedCallback: (value: T) => U, rejectedCallback?: (reason: any) => IPromise<U>): IPromise<U>;
+        then<U>(resolvedCallback: (value: T) => U, rejectedCallback?: (reason: any) => U): IPromise<U>;
+    }
+
+    class Promise<T> {
+
+        static as<U>(resolvedValue: U): Promise<U>;
+        static error<U>(error: U): Promise<U>;
+        static is(possiblePromise: any): Boolean;
+        static when(promises: Promise<any>[]): Promise<any>;
+
+        always(callback: Function): Promise<T>;
+        done(callback: Function): Promise<T>;
+        fail(callback: Function): Promise<T>;
+        reject(error: any): void;
+        resolve(result: any): void;
+        then<U>(resolvedCallback: (value: T) => Promise<U>,
+                rejectedCallback?: (reason: any) => Promise<U>): IPromise<T>;
+        then<U>(resolvedCallback: (value: T) => U,
+            rejectedCallback?: (reason: any) => IPromise<U>): IPromise<T>;
+        then<U>(resolvedCallback: (value: T) => U,
+            rejectedCallback?: (reason: any) => U): IPromise<T>;
+    }
+
+    interface IBaseObject {
+        toJSON(): any;
+    }
+
+    class BaseObject implements IBaseObject {
+        toJSON(): any;
+    }
+
+    /**
+     * Creates a new ACL.
+     * If no argument is given, the ACL has no permissions for anyone.
+     * If the argument is a Parse.User, the ACL will have read and write
+     *   permission for only that user.
+     * If the argument is any other JSON object, that object will be interpretted
+     *   as a serialized ACL created with toJSON().
+     * @see Parse.Object#setACL
+     * @class
+     *
+     * <p>An ACL, or Access Control List can be added to any
+     * <code>Parse.Object</code> to restrict access to only a subset of users
+     * of your application.</p>
+     */
+    class ACL extends BaseObject {
+
+        permissionsById: any;
+
+        constructor(arg1?: any);
+
+        setPublicReadAccess(allowed: boolean): void;
+        getPublicReadAccess(): boolean;
+
+        setPublicWriteAccess(allowed: boolean): void;
+        getPublicWriteAccess(): boolean;
+
+        setReadAccess(userId: User, allowed: boolean): void;
+        getReadAccess(userId: User): boolean;
+
+        setReadAccess(userId: string, allowed: boolean): void;
+        getReadAccess(userId: string): boolean;
+
+        setRoleReadAccess(role: Role, allowed: boolean): void;
+        setRoleReadAccess(role: string, allowed: boolean): void;
+        getRoleReadAccess(role: Role): boolean;
+        getRoleReadAccess(role: string): boolean;
+
+        setRoleWriteAccess(role: Role, allowed: boolean): void;
+        setRoleWriteAccess(role: string, allowed: boolean): void;
+        getRoleWriteAccess(role: Role): boolean;
+        getRoleWriteAccess(role: string): boolean;
+
+        setWriteAccess(userId: User, allowed: boolean): void;
+        setWriteAccess(userId: string, allowed: boolean): void;
+        getWriteAccess(userId: User): boolean;
+        getWriteAccess(userId: string): boolean;
+    }
+
+
+    /**
+     * A Parse.File is a local representation of a file that is saved to the Parse
+     * cloud.
+     * @class
+     * @param name {String} The file's name. This will be prefixed by a unique
+     *     value once the file has finished saving. The file name must begin with
+     *     an alphanumeric character, and consist of alphanumeric characters,
+     *     periods, spaces, underscores, or dashes.
+     * @param data {Array} The data for the file, as either:
+     *     1. an Array of byte value Numbers, or
+     *     2. an Object like { base64: "..." } with a base64-encoded String.
+     *     3. a File object selected with a file upload control. (3) only works
+     *        in Firefox 3.6+, Safari 6.0.2+, Chrome 7+, and IE 10+.
+     *        For example:<pre>
+     * var fileUploadControl = $("#profilePhotoFileUpload")[0];
+     * if (fileUploadControl.files.length > 0) {
+     *   var file = fileUploadControl.files[0];
+     *   var name = "photo.jpg";
+     *   var parseFile = new Parse.File(name, file);
+     *   parseFile.save().then(function() {
+     *     // The file has been saved to Parse.
+     *   }, function(error) {
+     *     // The file either could not be read, or could not be saved to Parse.
+     *   });
+     * }</pre>
+     * @param type {String} Optional Content-Type header to use for the file. If
+     *     this is omitted, the content type will be inferred from the name's
+     *     extension.
+     */
+     class File {
+
+        constructor(name: string, data: any, type?: string);
+        name(): string;
+        url(): string;
+        save<T>(options?: SuccessFailureOptions): Promise<T>;
+
+    }
+
+    /**
+     * Creates a new GeoPoint with any of the following forms:<br>
+     *   <pre>
+     *   new GeoPoint(otherGeoPoint)
+     *   new GeoPoint(30, 30)
+     *   new GeoPoint([30, 30])
+     *   new GeoPoint({latitude: 30, longitude: 30})
+     *   new GeoPoint()  // defaults to (0, 0)
+     *   </pre>
+     * @class
+     *
+     * <p>Represents a latitude / longitude point that may be associated
+     * with a key in a ParseObject or used as a reference point for geo queries.
+     * This allows proximity-based queries on the key.</p>
+     *
+     * <p>Only one key in a class may contain a GeoPoint.</p>
+     *
+     * <p>Example:<pre>
+     *   var point = new Parse.GeoPoint(30.0, -20.0);
+     *   var object = new Parse.Object("PlaceObject");
+     *   object.set("location", point);
+     *   object.save();</pre></p>
+     */
+    class GeoPoint extends BaseObject {
+
+        latitude: number;
+        longitude: number;
+
+        constructor(arg1?: any, arg2?: any);
+
+        current(options?: SuccessFailureOptions): GeoPoint;
+        radiansTo(point: GeoPoint): number;
+        kilometersTo(point: GeoPoint): number;
+        milesTo(point: GeoPoint): number;
+    }
+
+    /**
+     * History serves as a global router (per frame) to handle hashchange
+     * events or pushState, match the appropriate route, and trigger
+     * callbacks. You shouldn't ever have to create one of these yourself
+     * — you should use the reference to <code>Parse.history</code>
+     * that will be created for you automatically if you make use of
+     * Routers with routes.
+     * @class
+     *
+     * <p>A fork of Backbone.History, provided for your convenience.  If you
+     * use this class, you must also include jQuery, or another library
+     * that provides a jQuery-compatible $ function.  For more information,
+     * see the <a href="http://documentcloud.github.com/backbone/#History">
+     * Backbone documentation</a>.</p>
+     * <p><strong><em>Available in the client SDK only.</em></strong></p>
+     */
+    class History {
+
+        handlers: any[];
+        interval: number;
+        fragment: string;
+
+        checkUrl(e?: any): void;
+        getFragment(fragment?: string, forcePushState?: boolean): string;
+        getHash(windowOverride: Window): string;
+        loadUrl(fragmentOverride: any): boolean;
+        navigate(fragment: string, options?: any): any;
+        route(route: any, callback: Function): void;
+        start(options: any): boolean;
+        stop(): void;
+    }
+
+    /**
+     * A class that is used to access all of the children of a many-to-many relationship.
+     * Each instance of Parse.Relation is associated with a particular parent object and key.
+     */
+    class Relation extends BaseObject {
+
+        parent: Object;
+        key: string;
+        targetClassName: string;
+
+        constructor(parent?: Object, key?: string);
+
+        //Adds a Parse.Object or an array of Parse.Objects to the relation.
+        add(object: Object): void;
+
+        // Returns a Parse.Query that is limited to objects in this relation.
+        query(): Query;
+
+        // Removes a Parse.Object or an array of Parse.Objects from this relation.
+        remove(object: Object): void;
+    }
+
+    /**
+     * Creates a new model with defined attributes. A client id (cid) is
+     * automatically generated and assigned for you.
+     *
+     * <p>You won't normally call this method directly.  It is recommended that
+     * you use a subclass of <code>Parse.Object</code> instead, created by calling
+     * <code>extend</code>.</p>
+     *
+     * <p>However, if you don't want to use a subclass, or aren't sure which
+     * subclass is appropriate, you can use this form:<pre>
+     *     var object = new Parse.Object("ClassName");
+     * </pre>
+     * That is basically equivalent to:<pre>
+     *     var MyClass = Parse.Object.extend("ClassName");
+     *     var object = new MyClass();
+     * </pre></p>
+     *
+     * @param {Object} attributes The initial set of data to store in the object.
+     * @param {Object} options A set of Backbone-like options for creating the
+     *     object.  The only option currently supported is "collection".
+     * @see Parse.Object.extend
+     *
+     * @class
+     *
+     * <p>The fundamental unit of Parse data, which implements the Backbone Model
+     * interface.</p>
+     */
+    class Object extends BaseObject {
+
+        id: any;
+        attributes: any;
+        cid: string;
+        changed: boolean;
+        className: string;
+
+        constructor(className?: string, options?: any);
+        constructor(attributes?: string[], options?: any);
+
+        static extend(className: string, protoProps?: any, classProps?: any): any;
+        static fetchAll<T>(list: Object[], options: SuccessFailureOptions): Promise<T>;
+        static fetchAllIfNeeded<T>(list: Object[], options: SuccessFailureOptions): Promise<T>;
+        static destroyAll<T>(list: Object[], options?: Object.DestroyAllOptions): Promise<T>;
+        static saveAll<T>(list: Object[], options?: Object.SaveAllOptions): Promise<T>;
+
+        initialize(): void;
+        add(attr: string, item: any): Object;
+        addUnique(attr: string, item: any): any;
+        change(options: any): Object;
+        changedAttributes(diff: any): boolean;
+        clear(options: any): any;
+        clone(): Object;
+        destroy<T>(options?: Object.DestroyOptions): Promise<T>;
+        dirty(attr: String): boolean;
+        dirtyKeys(): string[];
+        escape(attr: string): string;
+        existed(): boolean;
+        fetch<T>(options?: Object.FetchOptions): Promise<T>;
+        get(attr: string): any;
+        getACL(): ACL;
+        has(attr: string): boolean;
+        hasChanged(attr: string): boolean;
+        increment(attr: string, amount?: number): any;
+        isValid(): boolean;
+        op(attr: string): any;
+        previous(attr: string): any;
+        previousAttributes(): any;
+        relation(attr: string): Relation;
+        remove(attr: string, item: any): any;
+        save<T>(options?: Object.SaveOptions, arg2?: any, arg3?: any): Promise<T>;
+        set(key: string, value: any, options?: Object.SetOptions): boolean;
+        setACL(acl: ACL, options?: SuccessFailureOptions): boolean;
+        unset(attr: string, options?: any): any;
+        validate(attrs: any, options?: SuccessFailureOptions): boolean;
+    }
+
+    namespace Object {
+        interface DestroyOptions extends SuccessFailureOptions, WaitOption, UseMasterKeyOption { }
+
+        interface DestroyAllOptions extends SuccessFailureOptions, UseMasterKeyOption { }
+
+        interface FetchOptions extends SuccessFailureOptions, UseMasterKeyOption { }
+
+        interface SaveOptions extends SuccessFailureOptions, SilentOption, UseMasterKeyOption, WaitOption { }
+
+        interface SaveAllOptions extends SuccessFailureOptions, UseMasterKeyOption { }
+
+        interface SetOptions extends ErrorOption, SilentOption {
+            promise?: any;
+        }
+    }
+
+    /**
+     * Every Parse application installed on a device registered for
+     * push notifications has an associated Installation object.
+     */
+    class Installation extends Object {
+
+        badge: any;
+        channels: string[];
+        timeZone: any;
+        deviceType: string;
+        pushType: string;
+        installationId: string;
+        deviceToken: string;
+        channelUris: string;
+        appName: string;
+        appVersion: string;
+        parseVersion: string;
+        appIdentifier: string;
+
+    }
+
+    /**
+     * Creates a new instance with the given models and options.  Typically, you
+     * will not call this method directly, but will instead make a subclass using
+     * <code>Parse.Collection.extend</code>.
+     *
+     * @param {Array} models An array of instances of <code>Parse.Object</code>.
+     *
+     * @param {Object} options An optional object with Backbone-style options.
+     * Valid options are:<ul>
+     *   <li>model: The Parse.Object subclass that this collection contains.
+     *   <li>query: An instance of Parse.Query to use when fetching items.
+     *   <li>comparator: A string property name or function to sort by.
+     * </ul>
+     *
+     * @see Parse.Collection.extend
+     *
+     * @class
+     *
+     * <p>Provides a standard collection class for our sets of models, ordered
+     * or unordered.  For more information, see the
+     * <a href="http://documentcloud.github.com/backbone/#Collection">Backbone
+     * documentation</a>.</p>
+     */
+    class Collection<T> extends Events implements IBaseObject {
+
+        model: Object;
+        models: Object[];
+        query: Query;
+        comparator: (object: Object) => any;
+
+        constructor(models?: Object[], options?: Collection.Options);
+        static extend(instanceProps: any, classProps: any): any;
+
+        initialize(): void;
+        add(models: any[], options?: Collection.AddOptions): Collection<T>;
+        at(index: number): Object;
+        chain(): _._Chain<Collection<T>>;
+        fetch(options?: Collection.FetchOptions): Promise<T>;
+        create(model: Object, options?: Collection.CreateOptions): Object;
+        get(id: string): Object;
+        getByCid(cid: any): any;
+        pluck(attr: string): any[];
+        remove(model: any, options?: Collection.RemoveOptions): Collection<T>;
+        remove(models: any[], options?: Collection.RemoveOptions): Collection<T>;
+        reset(models: any[], options?: Collection.ResetOptions): Collection<T>;
+        sort(options?: Collection.SortOptions): Collection<T>;
+        toJSON(): any;
+    }
+
+    namespace Collection {
+        interface Options {
+            model?: Object;
+            query?: Query;
+            comparator?: string;
+        }
+
+        interface AddOptions extends SilentOption {
+            /**
+             * The index at which to add the models.
+             */
+            at?: number;
+        }
+
+        interface CreateOptions extends SuccessFailureOptions, WaitOption, SilentOption, UseMasterKeyOption {
+        }
+
+        interface FetchOptions extends SuccessFailureOptions, SilentOption, UseMasterKeyOption { }
+
+        interface RemoveOptions extends SilentOption { }
+
+        interface ResetOptions extends SilentOption { }
+
+        interface SortOptions extends SilentOption { }
+    }
+
+    /**
+     * @class
+     *
+     * <p>Parse.Events is a fork of Backbone's Events module, provided for your
+     * convenience.</p>
+     *
+     * <p>A module that can be mixed in to any object in order to provide
+     * it with custom events. You may bind callback functions to an event
+     * with `on`, or remove these functions with `off`.
+     * Triggering an event fires all callbacks in the order that `on` was
+     * called.
+     *
+     * <pre>
+     *     var object = {};
+     *     _.extend(object, Parse.Events);
+     *     object.on('expand', function(){ alert('expanded'); });
+     *     object.trigger('expand');</pre></p>
+     *
+     * <p>For more information, see the
+     * <a href="http://documentcloud.github.com/backbone/#Events">Backbone
+     * documentation</a>.</p>
+     */
+    class Events {
+
+        static off(events: string[], callback?: Function, context?: any): Events;
+        static on(events: string[], callback?: Function, context?: any): Events;
+        static trigger(events: string[]): Events;
+        static bind(): Events;
+        static unbind(): Events;
+
+        on(eventName: string, callback?: Function, context?: any): Events;
+        off(eventName?: string, callback?: Function, context?: any): Events;
+        trigger(eventName: string, ...args: any[]): Events;
+        bind(eventName: string, callback: Function, context?: any): Events;
+        unbind(eventName?: string, callback?: Function, context?: any): Events;
+
+    }
+
+    /**
+     * Creates a new parse Parse.Query for the given Parse.Object subclass.
+     * @param objectClass -
+     *   An instance of a subclass of Parse.Object, or a Parse className string.
+     * @class
+     *
+     * <p>Parse.Query defines a query that is used to fetch Parse.Objects. The
+     * most common use case is finding all objects that match a query through the
+     * <code>find</code> method. For example, this sample code fetches all objects
+     * of class <code>MyClass</code>. It calls a different function depending on
+     * whether the fetch succeeded or not.
+     *
+     * <pre>
+     * var query = new Parse.Query(MyClass);
+     * query.find({
+     *   success: function(results) {
+     *     // results is an array of Parse.Object.
+     *   },
+     *
+     *   error: function(error) {
+     *     // error is an instance of Parse.Error.
+     *   }
+     * });</pre></p>
+     *
+     * <p>A Parse.Query can also be used to retrieve a single object whose id is
+     * known, through the get method. For example, this sample code fetches an
+     * object of class <code>MyClass</code> and id <code>myId</code>. It calls a
+     * different function depending on whether the fetch succeeded or not.
+     *
+     * <pre>
+     * var query = new Parse.Query(MyClass);
+     * query.get(myId, {
+     *   success: function(object) {
+     *     // object is an instance of Parse.Object.
+     *   },
+     *
+     *   error: function(object, error) {
+     *     // error is an instance of Parse.Error.
+     *   }
+     * });</pre></p>
+     *
+     * <p>A Parse.Query can also be used to count the number of objects that match
+     * the query without retrieving all of those objects. For example, this
+     * sample code counts the number of objects of the class <code>MyClass</code>
+     * <pre>
+     * var query = new Parse.Query(MyClass);
+     * query.count({
+     *   success: function(number) {
+     *     // There are number instances of MyClass.
+     *   },
+     *
+     *   error: function(error) {
+     *     // error is an instance of Parse.Error.
+     *   }
+     * });</pre></p>
+     */
+    class Query extends BaseObject {
+
+        objectClass: any;
+        className: string;
+
+        constructor(objectClass: any);
+
+        static or(...var_args: Query[]): Query;
+
+        addAscending(key: string): Query;
+        addAscending(key: string[]): Query;
+        addDescending(key: string): Query;
+        addDescending(key: string[]): Query;
+        ascending(key: string): Query;
+        ascending(key: string[]): Query;
+        collection(items?: Object[], options?: Collection.Options): Collection<Object>;
+        containedIn(key: string, values: any[]): Query;
+        contains(key: string, substring: string): Query;
+        containsAll(key: string, values: any[]): Query;
+        count<T>(options?: Query.CountOptions): Promise<T>;
+        descending(key: string): Query;
+        descending(key: string[]): Query;
+        doesNotExist(key: string): Query;
+        doesNotMatchKeyInQuery(key: string, queryKey: string, query: Query): Query;
+        doesNotMatchQuery(key: string, query: Query): Query;
+        each<T>(callback: Function, options?: SuccessFailureOptions): Promise<T>;
+        endsWith(key: string, suffix: string): Query;
+        equalTo(key: string, value: any): Query;
+        exists(key: string): Query;
+        find<T>(options?: Query.FindOptions): Promise<T>;
+        first<T>(options?: Query.FirstOptions): Promise<T>;
+        get(objectId: string, options?: Query.GetOptions): Promise<any>;
+        greaterThan(key: string, value: any): Query;
+        greaterThanOrEqualTo(key: string, value: any): Query;
+        include(key: string): Query;
+        include(keys: string[]): Query;
+        lessThan(key: string, value: any): Query;
+        lessThanOrEqualTo(key: string, value: any): Query;
+        limit(n: number): Query;
+        matches(key: string, regex: RegExp, modifiers: any): Query;
+        matchesKeyInQuery(key: string, queryKey: string, query: Query): Query;
+        matchesQuery(key: string, query: Query): Query;
+        near(key: string, point: GeoPoint): Query;
+        notContainedIn(key: string, values: any[]): Query;
+        notEqualTo(key: string, value: any): Query;
+        select(...keys: string[]): Query;
+        skip(n: number): Query;
+        startsWith(key: string, prefix: string): Query;
+        withinGeoBox(key: string, southwest: GeoPoint, northeast: GeoPoint): Query;
+        withinKilometers(key: string, point: GeoPoint, maxDistance: number): Query;
+        withinMiles(key: string, point: GeoPoint, maxDistance: number): Query;
+        withinRadians(key: string, point: GeoPoint, maxDistance: number): Query;
+    }
+
+    namespace Query {
+        interface CountOptions extends SuccessFailureOptions, UseMasterKeyOption { }
+        interface FindOptions extends SuccessFailureOptions, UseMasterKeyOption { }
+        interface FirstOptions extends SuccessFailureOptions, UseMasterKeyOption { }
+        interface GetOptions extends SuccessFailureOptions, UseMasterKeyOption { }
+    }
+
+    /**
+     * Represents a Role on the Parse server. Roles represent groupings of
+     * Users for the purposes of granting permissions (e.g. specifying an ACL
+     * for an Object). Roles are specified by their sets of child users and
+     * child roles, all of which are granted any permissions that the parent
+     * role has.
+     *
+     * <p>Roles must have a name (which cannot be changed after creation of the
+     * role), and must specify an ACL.</p>
+     * @class
+     * A Parse.Role is a local representation of a role persisted to the Parse
+     * cloud.
+     */
+    class Role extends Object {
+
+        constructor(name: string, acl: ACL);
+
+        getRoles(): Relation;
+        getUsers(): Relation;
+        getName(): string;
+        setName(name: string, options?: SuccessFailureOptions): any;
+    }
+
+    /**
+     * Routers map faux-URLs to actions, and fire events when routes are
+     * matched. Creating a new one sets its `routes` hash, if not set statically.
+     * @class
+     *
+     * <p>A fork of Backbone.Router, provided for your convenience.
+     * For more information, see the
+     * <a href="http://documentcloud.github.com/backbone/#Router">Backbone
+     * documentation</a>.</p>
+     * <p><strong><em>Available in the client SDK only.</em></strong></p>
+     */
+    class Router extends Events {
+
+        routes: Router.RouteMap;
+
+        constructor(options?: Router.Options);
+        static extend(instanceProps: any, classProps: any): any;
+
+        initialize(): void;
+        navigate(fragment: string, options?: Router.NavigateOptions): Router;
+        navigate(fragment: string, trigger?: boolean): Router;
+        route(route: string, name: string, callback: Function): Router;
+    }
+
+    namespace Router {
+        interface Options {
+            routes: RouteMap;
+        }
+
+        interface RouteMap {
+            [url: string]: string;
+        }
+
+        interface NavigateOptions {
+            trigger?: boolean;
+        }
+    }
+
+    /**
+     * @class
+     *
+     * <p>A Parse.User object is a local representation of a user persisted to the
+     * Parse cloud. This class is a subclass of a Parse.Object, and retains the
+     * same functionality of a Parse.Object, but also extends it with various
+     * user specific methods, like authentication, signing up, and validation of
+     * uniqueness.</p>
+     */
+    class User extends Object {
+
+        static current(): User;
+        static signUp<T>(username: string, password: string, attrs: any, options?: SuccessFailureOptions): Promise<T>;
+        static logIn<T>(username: string, password: string, options?: SuccessFailureOptions): Promise<T>;
+        static logOut<T>(): Promise<T>;
+        static allowCustomUserClass(isAllowed: boolean): void;
+        static become<T>(sessionToken: string, options?: SuccessFailureOptions): Promise<T>;
+        static requestPasswordReset<T>(email: string, options?: SuccessFailureOptions): Promise<T>;
+
+        signUp<T>(attrs: any, options?: SuccessFailureOptions): Promise<T>;
+        logIn<T>(options?: SuccessFailureOptions): Promise<T>;
+        fetch<T>(options?: SuccessFailureOptions): Promise<T>;
+        save<T>(arg1: any, arg2: any, arg3: any): Promise<T>;
+        authenticated(): boolean;
+        isCurrent(): boolean;
+
+        getEmail(): string;
+        setEmail(email: string, options: SuccessFailureOptions): boolean;
+
+        getUsername(): string;
+        setUsername(username: string, options?: SuccessFailureOptions): boolean;
+
+        setPassword(password: string, options?: SuccessFailureOptions): boolean;
+        getSessionToken(): string;
+    }
+
+    /**
+     * Creating a Parse.View creates its initial element outside of the DOM,
+     * if an existing element is not provided...
+     * @class
+     *
+     * <p>A fork of Backbone.View, provided for your convenience.  If you use this
+     * class, you must also include jQuery, or another library that provides a
+     * jQuery-compatible $ function.  For more information, see the
+     * <a href="http://documentcloud.github.com/backbone/#View">Backbone
+     * documentation</a>.</p>
+     * <p><strong><em>Available in the client SDK only.</em></strong></p>
+     */
+    class View<T> extends Events {
+
+        model: any;
+        collection: any;
+        id: string;
+        cid: string;
+        className: string;
+        tagName: string;
+        el: any;
+        $el: JQuery;
+        attributes: any;
+
+        constructor(options?: View.Options);
+
+        static extend(properties: any, classProperties?: any): any;
+
+        $(selector?: string): JQuery;
+        setElement(element: HTMLElement, delegate?: boolean): View<T>;
+        setElement(element: JQuery, delegate?: boolean): View<T>;
+        render(): View<T>;
+        remove(): View<T>;
+        make(tagName: any, attributes?: View.Attribute[], content?: any): any;
+        delegateEvents(events?: any): any;
+        undelegateEvents(): any;
+
+    }
+
+    namespace View {
+        interface Options {
+            model?: any;
+            collection?: any;
+            el?: any;
+            id?: string;
+            className?: string;
+            tagName?: string;
+            attributes?: Attribute[];
+        }
+
+        interface Attribute {
+            [attributeName: string]: string | number | boolean;
+        }
+    }
+
+    namespace Analytics {
+
+        function track<T>(name: string, dimensions: any):Promise<T>;
+    }
+
+    /**
+     * Provides a set of utilities for using Parse with Facebook.
+     * @namespace
+     * Provides a set of utilities for using Parse with Facebook.
+     */
+    namespace FacebookUtils {
+
+        function init(options?: any): void;
+        function isLinked(user: User): boolean;
+        function link(user: User, permissions: any, options?: SuccessFailureOptions): void;
+        function logIn(permissions: any, options?: SuccessFailureOptions): void;
+        function unlink(user: User, options?: SuccessFailureOptions): void;
+    }
+
+    /**
+     * @namespace Contains functions for calling and declaring
+     * <a href="/docs/cloud_code_guide#functions">cloud functions</a>.
+     * <p><strong><em>
+     *   Some functions are only available from Cloud Code.
+     * </em></strong></p>
+     */
+    namespace Cloud {
+
+        interface CookieOptions {
+            domain?: string;
+            expires?: Date;
+            httpOnly?: boolean;
+            maxAge?: number;
+            path?: string;
+            secure?: boolean;
+        }
+
+        interface HttpResponse {
+            buffer?: Buffer;
+            cookies?: any;
+            data?: any;
+            headers?: any;
+            status?: number;
+            text?: string;
+        }
+
+        interface JobRequest {
+            params: any;
+        }
+
+        interface JobStatus {
+            error?: Function;
+            message?: Function;
+            success?: Function;
+        }
+
+        interface FunctionRequest {
+            installationId?: String;
+            master?: boolean;
+            params?: any;
+            user?: User;
+        }
+
+        interface FunctionResponse {
+            success?: (response: HttpResponse) => void;
+            error?: (response: HttpResponse) => void;
+        }
+
+        interface Cookie {
+            name?: string;
+            options?: CookieOptions;
+            value?: string;
+        }
+
+        interface AfterSaveRequest extends FunctionRequest {}
+        interface AfterDeleteRequest extends FunctionRequest {}
+        interface BeforeDeleteRequest extends FunctionRequest {}
+        interface BeforeDeleteResponse extends FunctionResponse {}
+        interface BeforeSaveRequest extends FunctionRequest {}
+        interface BeforeSaveResponse extends FunctionResponse {}
+
+        function afterDelete(arg1: any, func?: (request: AfterDeleteRequest) => void): void;
+        function afterSave(arg1: any, func?: (request: AfterSaveRequest) => void): void;
+        function beforeDelete(arg1: any, func?: (request: BeforeDeleteRequest, response: BeforeDeleteResponse) => void): void;
+        function beforeSave(arg1: any, func?: (request: BeforeSaveRequest, response: BeforeSaveResponse) => void): void;
+        function define(name: string, func?: (request: FunctionRequest, response: FunctionResponse) => void): void;
+        function httpRequest(options: HTTPOptions): Promise<HttpResponse>;
+        function job(name: string, func?: (request: JobRequest, status: JobStatus) => void): HttpResponse;
+        function run<T>(name: string, data?: any, options?: SuccessFailureOptions): Promise<T>;
+        function useMasterKey(): void;
+
+        /**
+         * To use this Cloud Module in Cloud Code, you must require 'buffer' in your JavaScript file.
+         *
+         *     import Buffer = require("buffer").Buffer;
+         */
+        var HTTPOptions: new () => HTTPOptions;
+        interface HTTPOptions extends FunctionResponse {
+            /**
+             * The body of the request.
+             * If it is a JSON object, then the Content-Type set in the headers must be application/x-www-form-urlencoded or application/json.
+             * You can also set this to a Buffer object to send raw bytes.
+             * If you use a Buffer, you should also set the Content-Type header explicitly to describe what these bytes represent.
+             */
+            body?: string | Buffer | Object;
+            /**
+             * Defaults to 'false'.
+             */
+            followRedirects?: boolean;
+            /**
+             * The headers for the request.
+             */
+            headers?: {
+                [headerName: string]: string | number | boolean;
+            };
+            /**
+             *The method of the request (i.e GET, POST, etc).
+             */
+            method?: string;
+            /**
+             * The query portion of the url.
+             */
+            params?: any;
+            /**
+             * The url to send the request to.
+             */
+            url: string;
+        }
+    }
+
+
+    class Error {
+
+        code: ErrorCode;
+        message: string;
+
+        constructor(code: ErrorCode, message: string);
+
+    }
+
+    enum ErrorCode {
+
+        OTHER_CAUSE = -1,
+        INTERNAL_SERVER_ERROR = 1,
+        CONNECTION_FAILED =  100,
+        OBJECT_NOT_FOUND =  101,
+        INVALID_QUERY =  102,
+        INVALID_CLASS_NAME =  103,
+        MISSING_OBJECT_ID =  104,
+        INVALID_KEY_NAME =  105,
+        INVALID_POINTER =  106,
+        INVALID_JSON =  107,
+        COMMAND_UNAVAILABLE =  108,
+        NOT_INITIALIZED =  109,
+        INCORRECT_TYPE =  111,
+        INVALID_CHANNEL_NAME =  112,
+        PUSH_MISCONFIGURED =  115,
+        OBJECT_TOO_LARGE =  116,
+        OPERATION_FORBIDDEN =  119,
+        CACHE_MISS =  120,
+        INVALID_NESTED_KEY =  121,
+        INVALID_FILE_NAME =  122,
+        INVALID_ACL =  123,
+        TIMEOUT =  124,
+        INVALID_EMAIL_ADDRESS =  125,
+        MISSING_CONTENT_TYPE =  126,
+        MISSING_CONTENT_LENGTH =  127,
+        INVALID_CONTENT_LENGTH =  128,
+        FILE_TOO_LARGE =  129,
+        FILE_SAVE_ERROR =  130,
+        DUPLICATE_VALUE =  137,
+        INVALID_ROLE_NAME =  139,
+        EXCEEDED_QUOTA =  140,
+        SCRIPT_FAILED =  141,
+        VALIDATION_ERROR =  142,
+        INVALID_IMAGE_DATA =  150,
+        UNSAVED_FILE_ERROR =  151,
+        INVALID_PUSH_TIME_ERROR = 152,
+        FILE_DELETE_ERROR = 153,
+        REQUEST_LIMIT_EXCEEDED = 155,
+        INVALID_EVENT_NAME = 160,
+        USERNAME_MISSING =  200,
+        PASSWORD_MISSING =  201,
+        USERNAME_TAKEN =  202,
+        EMAIL_TAKEN =  203,
+        EMAIL_MISSING =  204,
+        EMAIL_NOT_FOUND =  205,
+        SESSION_MISSING =  206,
+        MUST_CREATE_USER_THROUGH_SIGNUP =  207,
+        ACCOUNT_ALREADY_LINKED =  208,
+        INVALID_SESSION_TOKEN = 209,
+        LINKED_ID_MISSING =  250,
+        INVALID_LINKED_SESSION =  251,
+        UNSUPPORTED_SERVICE =  252,
+        AGGREGATE_ERROR = 600,
+        FILE_READ_ERROR = 601,
+        X_DOMAIN_REQUEST = 602
+    }
+
+    /**
+     * @class
+     * A Parse.Op is an atomic operation that can be applied to a field in a
+     * Parse.Object. For example, calling <code>object.set("foo", "bar")</code>
+     * is an example of a Parse.Op.Set. Calling <code>object.unset("foo")</code>
+     * is a Parse.Op.Unset. These operations are stored in a Parse.Object and
+     * sent to the server as part of <code>object.save()</code> operations.
+     * Instances of Parse.Op should be immutable.
+     *
+     * You should not create subclasses of Parse.Op or instantiate Parse.Op
+     * directly.
+     */
+    namespace Op {
+
+        interface BaseOperation extends IBaseObject {
+            objects(): any[];
+        }
+
+        interface Add extends BaseOperation {
+        }
+
+        interface AddUnique extends BaseOperation {
+        }
+
+        interface Increment extends IBaseObject {
+            amount: number;
+        }
+
+        interface Relation extends IBaseObject {
+            added(): Object[];
+            removed: Object[];
+        }
+
+        interface Set extends IBaseObject {
+            value(): any;
+        }
+
+        interface Unset extends IBaseObject {
+        }
+
+    }
+
+    /**
+     * Contains functions to deal with Push in Parse
+     * @name Parse.Push
+     * @namespace
+     */
+    namespace Push {
+        function send<T>(data: PushData, options?: SendOptions): Promise<T>;
+
+        interface PushData {
+            channels?: string[];
+            push_time?: Date;
+            expiration_time?: Date;
+            expiration_interval?: number;
+            where?: Query;
+            data?: any;
+            alert?: string;
+            badge?: string;
+            sound?: string;
+            title?: string;
+        }
+
+        interface SendOptions {
+            success?: () => void;
+            error?: (error: Error) => void;
+        }
+    }
+
+    /**
+     * Call this method first to set up your authentication tokens for Parse.
+     * You can get your keys from the Data Browser on parse.com.
+     * @param {String} applicationId Your Parse Application ID.
+     * @param {String} javaScriptKey Your Parse JavaScript Key.
+     * @param {String} masterKey (optional) Your Parse Master Key. (Node.js only!)
+     */
+    function initialize(applicationId: string, javaScriptKey: string, masterKey?: string): void;
+
+}
+
+declare module "parse/node" {
+    export = { Parse };
+}
+
+declare module "parse" {
+    import parse = require("parse/node");
+    export = parse
+}
diff --git a/parse/parse-tests.ts b/parse/parse-tests.ts
index d3af6be5c5..7e6c163913 100644
--- a/parse/parse-tests.ts
+++ b/parse/parse-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="parse.d.ts" />
+
 
 function test_events() {
 
diff --git a/parse/parse.d.ts b/parse/parse.d.ts
deleted file mode 100644
index e624b2ebcd..0000000000
--- a/parse/parse.d.ts
+++ /dev/null
@@ -1,1060 +0,0 @@
-// Type definitions for Parse v1.2.19
-// Project: https://parse.com/
-// Definitions by: Ullisen Media Group <http://ullisenmedia.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../underscore/underscore.d.ts" />
-
-declare namespace Parse {
-
-    var applicationId: string;
-    var javaScriptKey: string;
-    var masterKey: string;
-    var serverURL: string;
-    var VERSION: string;
-
-    interface SuccessOption {
-        success?: Function;
-    }
-
-    interface ErrorOption {
-        error?: Function;
-    }
-
-    interface SuccessFailureOptions extends SuccessOption, ErrorOption {
-    }
-
-    interface WaitOption {
-        /**
-         * Set to true to wait for the server to confirm success
-         * before triggering an event.
-         */
-        wait?: boolean;
-    }
-
-    interface UseMasterKeyOption {
-        /**
-         * In Cloud Code and Node only, causes the Master Key to be used for this request.
-         */
-        useMasterKey?: boolean;
-    }
-
-    interface SilentOption {
-        /**
-         * Set to true to avoid firing the event.
-         */
-        silent?: boolean;
-    }
-
-    /**
-     * A Promise is returned by async methods as a hook to provide callbacks to be
-     * called when the async task is fulfilled.
-     *
-     * <p>Typical usage would be like:<pre>
-     *    query.find().then(function(results) {
-     *      results[0].set("foo", "bar");
-     *      return results[0].saveAsync();
-     *    }).then(function(result) {
-     *      console.log("Updated " + result.id);
-     *    });
-     * </pre></p>
-     *
-     * @see Parse.Promise.prototype.then
-     * @class
-     */
-
-    interface IPromise<T> {
-
-        then<U>(resolvedCallback: (value: T) => IPromise<U>, rejectedCallback?: (reason: any) => IPromise<U>): IPromise<T>;
-        then<U>(resolvedCallback: (value: T) => U, rejectedCallback?: (reason: any) => IPromise<U>): IPromise<U>;
-        then<U>(resolvedCallback: (value: T) => U, rejectedCallback?: (reason: any) => U): IPromise<U>;
-    }
-
-    class Promise<T> {
-
-        static as<U>(resolvedValue: U): Promise<U>;
-        static error<U>(error: U): Promise<U>;
-        static is(possiblePromise: any): Boolean;
-        static when(promises: Promise<any>[]): Promise<any>;
-
-        always(callback: Function): Promise<T>;
-        done(callback: Function): Promise<T>;
-        fail(callback: Function): Promise<T>;
-        reject(error: any): void;
-        resolve(result: any): void;
-        then<U>(resolvedCallback: (value: T) => Promise<U>,
-                rejectedCallback?: (reason: any) => Promise<U>): IPromise<T>;
-        then<U>(resolvedCallback: (value: T) => U,
-            rejectedCallback?: (reason: any) => IPromise<U>): IPromise<T>;
-        then<U>(resolvedCallback: (value: T) => U,
-            rejectedCallback?: (reason: any) => U): IPromise<T>;
-    }
-
-    interface IBaseObject {
-        toJSON(): any;
-    }
-
-    class BaseObject implements IBaseObject {
-        toJSON(): any;
-    }
-
-    /**
-     * Creates a new ACL.
-     * If no argument is given, the ACL has no permissions for anyone.
-     * If the argument is a Parse.User, the ACL will have read and write
-     *   permission for only that user.
-     * If the argument is any other JSON object, that object will be interpretted
-     *   as a serialized ACL created with toJSON().
-     * @see Parse.Object#setACL
-     * @class
-     *
-     * <p>An ACL, or Access Control List can be added to any
-     * <code>Parse.Object</code> to restrict access to only a subset of users
-     * of your application.</p>
-     */
-    class ACL extends BaseObject {
-
-        permissionsById: any;
-
-        constructor(arg1?: any);
-
-        setPublicReadAccess(allowed: boolean): void;
-        getPublicReadAccess(): boolean;
-
-        setPublicWriteAccess(allowed: boolean): void;
-        getPublicWriteAccess(): boolean;
-
-        setReadAccess(userId: User, allowed: boolean): void;
-        getReadAccess(userId: User): boolean;
-
-        setReadAccess(userId: string, allowed: boolean): void;
-        getReadAccess(userId: string): boolean;
-
-        setRoleReadAccess(role: Role, allowed: boolean): void;
-        setRoleReadAccess(role: string, allowed: boolean): void;
-        getRoleReadAccess(role: Role): boolean;
-        getRoleReadAccess(role: string): boolean;
-
-        setRoleWriteAccess(role: Role, allowed: boolean): void;
-        setRoleWriteAccess(role: string, allowed: boolean): void;
-        getRoleWriteAccess(role: Role): boolean;
-        getRoleWriteAccess(role: string): boolean;
-
-        setWriteAccess(userId: User, allowed: boolean): void;
-        setWriteAccess(userId: string, allowed: boolean): void;
-        getWriteAccess(userId: User): boolean;
-        getWriteAccess(userId: string): boolean;
-    }
-
-
-    /**
-     * A Parse.File is a local representation of a file that is saved to the Parse
-     * cloud.
-     * @class
-     * @param name {String} The file's name. This will be prefixed by a unique
-     *     value once the file has finished saving. The file name must begin with
-     *     an alphanumeric character, and consist of alphanumeric characters,
-     *     periods, spaces, underscores, or dashes.
-     * @param data {Array} The data for the file, as either:
-     *     1. an Array of byte value Numbers, or
-     *     2. an Object like { base64: "..." } with a base64-encoded String.
-     *     3. a File object selected with a file upload control. (3) only works
-     *        in Firefox 3.6+, Safari 6.0.2+, Chrome 7+, and IE 10+.
-     *        For example:<pre>
-     * var fileUploadControl = $("#profilePhotoFileUpload")[0];
-     * if (fileUploadControl.files.length > 0) {
-     *   var file = fileUploadControl.files[0];
-     *   var name = "photo.jpg";
-     *   var parseFile = new Parse.File(name, file);
-     *   parseFile.save().then(function() {
-     *     // The file has been saved to Parse.
-     *   }, function(error) {
-     *     // The file either could not be read, or could not be saved to Parse.
-     *   });
-     * }</pre>
-     * @param type {String} Optional Content-Type header to use for the file. If
-     *     this is omitted, the content type will be inferred from the name's
-     *     extension.
-     */
-     class File {
-
-        constructor(name: string, data: any, type?: string);
-        name(): string;
-        url(): string;
-        save<T>(options?: SuccessFailureOptions): Promise<T>;
-
-    }
-
-    /**
-     * Creates a new GeoPoint with any of the following forms:<br>
-     *   <pre>
-     *   new GeoPoint(otherGeoPoint)
-     *   new GeoPoint(30, 30)
-     *   new GeoPoint([30, 30])
-     *   new GeoPoint({latitude: 30, longitude: 30})
-     *   new GeoPoint()  // defaults to (0, 0)
-     *   </pre>
-     * @class
-     *
-     * <p>Represents a latitude / longitude point that may be associated
-     * with a key in a ParseObject or used as a reference point for geo queries.
-     * This allows proximity-based queries on the key.</p>
-     *
-     * <p>Only one key in a class may contain a GeoPoint.</p>
-     *
-     * <p>Example:<pre>
-     *   var point = new Parse.GeoPoint(30.0, -20.0);
-     *   var object = new Parse.Object("PlaceObject");
-     *   object.set("location", point);
-     *   object.save();</pre></p>
-     */
-    class GeoPoint extends BaseObject {
-
-        latitude: number;
-        longitude: number;
-
-        constructor(arg1?: any, arg2?: any);
-
-        current(options?: SuccessFailureOptions): GeoPoint;
-        radiansTo(point: GeoPoint): number;
-        kilometersTo(point: GeoPoint): number;
-        milesTo(point: GeoPoint): number;
-    }
-
-    /**
-     * History serves as a global router (per frame) to handle hashchange
-     * events or pushState, match the appropriate route, and trigger
-     * callbacks. You shouldn't ever have to create one of these yourself
-     * — you should use the reference to <code>Parse.history</code>
-     * that will be created for you automatically if you make use of
-     * Routers with routes.
-     * @class
-     *
-     * <p>A fork of Backbone.History, provided for your convenience.  If you
-     * use this class, you must also include jQuery, or another library
-     * that provides a jQuery-compatible $ function.  For more information,
-     * see the <a href="http://documentcloud.github.com/backbone/#History">
-     * Backbone documentation</a>.</p>
-     * <p><strong><em>Available in the client SDK only.</em></strong></p>
-     */
-    class History {
-
-        handlers: any[];
-        interval: number;
-        fragment: string;
-
-        checkUrl(e?: any): void;
-        getFragment(fragment?: string, forcePushState?: boolean): string;
-        getHash(windowOverride: Window): string;
-        loadUrl(fragmentOverride: any): boolean;
-        navigate(fragment: string, options?: any): any;
-        route(route: any, callback: Function): void;
-        start(options: any): boolean;
-        stop(): void;
-    }
-
-    /**
-     * A class that is used to access all of the children of a many-to-many relationship.
-     * Each instance of Parse.Relation is associated with a particular parent object and key.
-     */
-    class Relation extends BaseObject {
-
-        parent: Object;
-        key: string;
-        targetClassName: string;
-
-        constructor(parent?: Object, key?: string);
-
-        //Adds a Parse.Object or an array of Parse.Objects to the relation.
-        add(object: Object): void;
-
-        // Returns a Parse.Query that is limited to objects in this relation.
-        query(): Query;
-
-        // Removes a Parse.Object or an array of Parse.Objects from this relation.
-        remove(object: Object): void;
-    }
-
-    /**
-     * Creates a new model with defined attributes. A client id (cid) is
-     * automatically generated and assigned for you.
-     *
-     * <p>You won't normally call this method directly.  It is recommended that
-     * you use a subclass of <code>Parse.Object</code> instead, created by calling
-     * <code>extend</code>.</p>
-     *
-     * <p>However, if you don't want to use a subclass, or aren't sure which
-     * subclass is appropriate, you can use this form:<pre>
-     *     var object = new Parse.Object("ClassName");
-     * </pre>
-     * That is basically equivalent to:<pre>
-     *     var MyClass = Parse.Object.extend("ClassName");
-     *     var object = new MyClass();
-     * </pre></p>
-     *
-     * @param {Object} attributes The initial set of data to store in the object.
-     * @param {Object} options A set of Backbone-like options for creating the
-     *     object.  The only option currently supported is "collection".
-     * @see Parse.Object.extend
-     *
-     * @class
-     *
-     * <p>The fundamental unit of Parse data, which implements the Backbone Model
-     * interface.</p>
-     */
-    class Object extends BaseObject {
-
-        id: any;
-        attributes: any;
-        cid: string;
-        changed: boolean;
-        className: string;
-
-        constructor(className?: string, options?: any);
-        constructor(attributes?: string[], options?: any);
-
-        static extend(className: string, protoProps?: any, classProps?: any): any;
-        static fetchAll<T>(list: Object[], options: SuccessFailureOptions): Promise<T>;
-        static fetchAllIfNeeded<T>(list: Object[], options: SuccessFailureOptions): Promise<T>;
-        static destroyAll<T>(list: Object[], options?: Object.DestroyAllOptions): Promise<T>;
-        static saveAll<T>(list: Object[], options?: Object.SaveAllOptions): Promise<T>;
-
-        initialize(): void;
-        add(attr: string, item: any): Object;
-        addUnique(attr: string, item: any): any;
-        change(options: any): Object;
-        changedAttributes(diff: any): boolean;
-        clear(options: any): any;
-        clone(): Object;
-        destroy<T>(options?: Object.DestroyOptions): Promise<T>;
-        dirty(attr: String): boolean;
-        dirtyKeys(): string[];
-        escape(attr: string): string;
-        existed(): boolean;
-        fetch<T>(options?: Object.FetchOptions): Promise<T>;
-        get(attr: string): any;
-        getACL(): ACL;
-        has(attr: string): boolean;
-        hasChanged(attr: string): boolean;
-        increment(attr: string, amount?: number): any;
-        isValid(): boolean;
-        op(attr: string): any;
-        previous(attr: string): any;
-        previousAttributes(): any;
-        relation(attr: string): Relation;
-        remove(attr: string, item: any): any;
-        save<T>(options?: Object.SaveOptions, arg2?: any, arg3?: any): Promise<T>;
-        set(key: string, value: any, options?: Object.SetOptions): boolean;
-        setACL(acl: ACL, options?: SuccessFailureOptions): boolean;
-        unset(attr: string, options?: any): any;
-        validate(attrs: any, options?: SuccessFailureOptions): boolean;
-    }
-
-    namespace Object {
-        interface DestroyOptions extends SuccessFailureOptions, WaitOption, UseMasterKeyOption { }
-
-        interface DestroyAllOptions extends SuccessFailureOptions, UseMasterKeyOption { }
-
-        interface FetchOptions extends SuccessFailureOptions, UseMasterKeyOption { }
-
-        interface SaveOptions extends SuccessFailureOptions, SilentOption, UseMasterKeyOption, WaitOption { }
-
-        interface SaveAllOptions extends SuccessFailureOptions, UseMasterKeyOption { }
-
-        interface SetOptions extends ErrorOption, SilentOption {
-            promise?: any;
-        }
-    }
-
-    /**
-     * Every Parse application installed on a device registered for
-     * push notifications has an associated Installation object.
-     */
-    class Installation extends Object {
-
-        badge: any;
-        channels: string[];
-        timeZone: any;
-        deviceType: string;
-        pushType: string;
-        installationId: string;
-        deviceToken: string;
-        channelUris: string;
-        appName: string;
-        appVersion: string;
-        parseVersion: string;
-        appIdentifier: string;
-
-    }
-
-    /**
-     * Creates a new instance with the given models and options.  Typically, you
-     * will not call this method directly, but will instead make a subclass using
-     * <code>Parse.Collection.extend</code>.
-     *
-     * @param {Array} models An array of instances of <code>Parse.Object</code>.
-     *
-     * @param {Object} options An optional object with Backbone-style options.
-     * Valid options are:<ul>
-     *   <li>model: The Parse.Object subclass that this collection contains.
-     *   <li>query: An instance of Parse.Query to use when fetching items.
-     *   <li>comparator: A string property name or function to sort by.
-     * </ul>
-     *
-     * @see Parse.Collection.extend
-     *
-     * @class
-     *
-     * <p>Provides a standard collection class for our sets of models, ordered
-     * or unordered.  For more information, see the
-     * <a href="http://documentcloud.github.com/backbone/#Collection">Backbone
-     * documentation</a>.</p>
-     */
-    class Collection<T> extends Events implements IBaseObject {
-
-        model: Object;
-        models: Object[];
-        query: Query;
-        comparator: (object: Object) => any;
-
-        constructor(models?: Object[], options?: Collection.Options);
-        static extend(instanceProps: any, classProps: any): any;
-
-        initialize(): void;
-        add(models: any[], options?: Collection.AddOptions): Collection<T>;
-        at(index: number): Object;
-        chain(): _Chain<Collection<T>>;
-        fetch(options?: Collection.FetchOptions): Promise<T>;
-        create(model: Object, options?: Collection.CreateOptions): Object;
-        get(id: string): Object;
-        getByCid(cid: any): any;
-        pluck(attr: string): any[];
-        remove(model: any, options?: Collection.RemoveOptions): Collection<T>;
-        remove(models: any[], options?: Collection.RemoveOptions): Collection<T>;
-        reset(models: any[], options?: Collection.ResetOptions): Collection<T>;
-        sort(options?: Collection.SortOptions): Collection<T>;
-        toJSON(): any;
-    }
-
-    namespace Collection {
-        interface Options {
-            model?: Object;
-            query?: Query;
-            comparator?: string;
-        }
-
-        interface AddOptions extends SilentOption {
-            /**
-             * The index at which to add the models.
-             */
-            at?: number;
-        }
-
-        interface CreateOptions extends SuccessFailureOptions, WaitOption, SilentOption, UseMasterKeyOption {
-        }
-
-        interface FetchOptions extends SuccessFailureOptions, SilentOption, UseMasterKeyOption { }
-
-        interface RemoveOptions extends SilentOption { }
-
-        interface ResetOptions extends SilentOption { }
-
-        interface SortOptions extends SilentOption { }
-    }
-
-    /**
-     * @class
-     *
-     * <p>Parse.Events is a fork of Backbone's Events module, provided for your
-     * convenience.</p>
-     *
-     * <p>A module that can be mixed in to any object in order to provide
-     * it with custom events. You may bind callback functions to an event
-     * with `on`, or remove these functions with `off`.
-     * Triggering an event fires all callbacks in the order that `on` was
-     * called.
-     *
-     * <pre>
-     *     var object = {};
-     *     _.extend(object, Parse.Events);
-     *     object.on('expand', function(){ alert('expanded'); });
-     *     object.trigger('expand');</pre></p>
-     *
-     * <p>For more information, see the
-     * <a href="http://documentcloud.github.com/backbone/#Events">Backbone
-     * documentation</a>.</p>
-     */
-    class Events {
-
-        static off(events: string[], callback?: Function, context?: any): Events;
-        static on(events: string[], callback?: Function, context?: any): Events;
-        static trigger(events: string[]): Events;
-        static bind(): Events;
-        static unbind(): Events;
-
-        on(eventName: string, callback?: Function, context?: any): Events;
-        off(eventName?: string, callback?: Function, context?: any): Events;
-        trigger(eventName: string, ...args: any[]): Events;
-        bind(eventName: string, callback: Function, context?: any): Events;
-        unbind(eventName?: string, callback?: Function, context?: any): Events;
-
-    }
-
-    /**
-     * Creates a new parse Parse.Query for the given Parse.Object subclass.
-     * @param objectClass -
-     *   An instance of a subclass of Parse.Object, or a Parse className string.
-     * @class
-     *
-     * <p>Parse.Query defines a query that is used to fetch Parse.Objects. The
-     * most common use case is finding all objects that match a query through the
-     * <code>find</code> method. For example, this sample code fetches all objects
-     * of class <code>MyClass</code>. It calls a different function depending on
-     * whether the fetch succeeded or not.
-     *
-     * <pre>
-     * var query = new Parse.Query(MyClass);
-     * query.find({
-     *   success: function(results) {
-     *     // results is an array of Parse.Object.
-     *   },
-     *
-     *   error: function(error) {
-     *     // error is an instance of Parse.Error.
-     *   }
-     * });</pre></p>
-     *
-     * <p>A Parse.Query can also be used to retrieve a single object whose id is
-     * known, through the get method. For example, this sample code fetches an
-     * object of class <code>MyClass</code> and id <code>myId</code>. It calls a
-     * different function depending on whether the fetch succeeded or not.
-     *
-     * <pre>
-     * var query = new Parse.Query(MyClass);
-     * query.get(myId, {
-     *   success: function(object) {
-     *     // object is an instance of Parse.Object.
-     *   },
-     *
-     *   error: function(object, error) {
-     *     // error is an instance of Parse.Error.
-     *   }
-     * });</pre></p>
-     *
-     * <p>A Parse.Query can also be used to count the number of objects that match
-     * the query without retrieving all of those objects. For example, this
-     * sample code counts the number of objects of the class <code>MyClass</code>
-     * <pre>
-     * var query = new Parse.Query(MyClass);
-     * query.count({
-     *   success: function(number) {
-     *     // There are number instances of MyClass.
-     *   },
-     *
-     *   error: function(error) {
-     *     // error is an instance of Parse.Error.
-     *   }
-     * });</pre></p>
-     */
-    class Query extends BaseObject {
-
-        objectClass: any;
-        className: string;
-
-        constructor(objectClass: any);
-
-        static or(...var_args: Query[]): Query;
-
-        addAscending(key: string): Query;
-        addAscending(key: string[]): Query;
-        addDescending(key: string): Query;
-        addDescending(key: string[]): Query;
-        ascending(key: string): Query;
-        ascending(key: string[]): Query;
-        collection(items?: Object[], options?: Collection.Options): Collection<Object>;
-        containedIn(key: string, values: any[]): Query;
-        contains(key: string, substring: string): Query;
-        containsAll(key: string, values: any[]): Query;
-        count<T>(options?: Query.CountOptions): Promise<T>;
-        descending(key: string): Query;
-        descending(key: string[]): Query;
-        doesNotExist(key: string): Query;
-        doesNotMatchKeyInQuery(key: string, queryKey: string, query: Query): Query;
-        doesNotMatchQuery(key: string, query: Query): Query;
-        each<T>(callback: Function, options?: SuccessFailureOptions): Promise<T>;
-        endsWith(key: string, suffix: string): Query;
-        equalTo(key: string, value: any): Query;
-        exists(key: string): Query;
-        find<T>(options?: Query.FindOptions): Promise<T>;
-        first<T>(options?: Query.FirstOptions): Promise<T>;
-        get(objectId: string, options?: Query.GetOptions): Promise<any>;
-        greaterThan(key: string, value: any): Query;
-        greaterThanOrEqualTo(key: string, value: any): Query;
-        include(key: string): Query;
-        include(keys: string[]): Query;
-        lessThan(key: string, value: any): Query;
-        lessThanOrEqualTo(key: string, value: any): Query;
-        limit(n: number): Query;
-        matches(key: string, regex: RegExp, modifiers: any): Query;
-        matchesKeyInQuery(key: string, queryKey: string, query: Query): Query;
-        matchesQuery(key: string, query: Query): Query;
-        near(key: string, point: GeoPoint): Query;
-        notContainedIn(key: string, values: any[]): Query;
-        notEqualTo(key: string, value: any): Query;
-        select(...keys: string[]): Query;
-        skip(n: number): Query;
-        startsWith(key: string, prefix: string): Query;
-        withinGeoBox(key: string, southwest: GeoPoint, northeast: GeoPoint): Query;
-        withinKilometers(key: string, point: GeoPoint, maxDistance: number): Query;
-        withinMiles(key: string, point: GeoPoint, maxDistance: number): Query;
-        withinRadians(key: string, point: GeoPoint, maxDistance: number): Query;
-    }
-
-    namespace Query {
-        interface CountOptions extends SuccessFailureOptions, UseMasterKeyOption { }
-        interface FindOptions extends SuccessFailureOptions, UseMasterKeyOption { }
-        interface FirstOptions extends SuccessFailureOptions, UseMasterKeyOption { }
-        interface GetOptions extends SuccessFailureOptions, UseMasterKeyOption { }
-    }
-
-    /**
-     * Represents a Role on the Parse server. Roles represent groupings of
-     * Users for the purposes of granting permissions (e.g. specifying an ACL
-     * for an Object). Roles are specified by their sets of child users and
-     * child roles, all of which are granted any permissions that the parent
-     * role has.
-     *
-     * <p>Roles must have a name (which cannot be changed after creation of the
-     * role), and must specify an ACL.</p>
-     * @class
-     * A Parse.Role is a local representation of a role persisted to the Parse
-     * cloud.
-     */
-    class Role extends Object {
-
-        constructor(name: string, acl: ACL);
-
-        getRoles(): Relation;
-        getUsers(): Relation;
-        getName(): string;
-        setName(name: string, options?: SuccessFailureOptions): any;
-    }
-
-    /**
-     * Routers map faux-URLs to actions, and fire events when routes are
-     * matched. Creating a new one sets its `routes` hash, if not set statically.
-     * @class
-     *
-     * <p>A fork of Backbone.Router, provided for your convenience.
-     * For more information, see the
-     * <a href="http://documentcloud.github.com/backbone/#Router">Backbone
-     * documentation</a>.</p>
-     * <p><strong><em>Available in the client SDK only.</em></strong></p>
-     */
-    class Router extends Events {
-
-        routes: Router.RouteMap;
-
-        constructor(options?: Router.Options);
-        static extend(instanceProps: any, classProps: any): any;
-
-        initialize(): void;
-        navigate(fragment: string, options?: Router.NavigateOptions): Router;
-        navigate(fragment: string, trigger?: boolean): Router;
-        route(route: string, name: string, callback: Function): Router;
-    }
-
-    namespace Router {
-        interface Options {
-            routes: RouteMap;
-        }
-
-        interface RouteMap {
-            [url: string]: string;
-        }
-
-        interface NavigateOptions {
-            trigger?: boolean;
-        }
-    }
-
-    /**
-     * @class
-     *
-     * <p>A Parse.User object is a local representation of a user persisted to the
-     * Parse cloud. This class is a subclass of a Parse.Object, and retains the
-     * same functionality of a Parse.Object, but also extends it with various
-     * user specific methods, like authentication, signing up, and validation of
-     * uniqueness.</p>
-     */
-    class User extends Object {
-
-        static current(): User;
-        static signUp<T>(username: string, password: string, attrs: any, options?: SuccessFailureOptions): Promise<T>;
-        static logIn<T>(username: string, password: string, options?: SuccessFailureOptions): Promise<T>;
-        static logOut<T>(): Promise<T>;
-        static allowCustomUserClass(isAllowed: boolean): void;
-        static become<T>(sessionToken: string, options?: SuccessFailureOptions): Promise<T>;
-        static requestPasswordReset<T>(email: string, options?: SuccessFailureOptions): Promise<T>;
-
-        signUp<T>(attrs: any, options?: SuccessFailureOptions): Promise<T>;
-        logIn<T>(options?: SuccessFailureOptions): Promise<T>;
-        fetch<T>(options?: SuccessFailureOptions): Promise<T>;
-        save<T>(arg1: any, arg2: any, arg3: any): Promise<T>;
-        authenticated(): boolean;
-        isCurrent(): boolean;
-
-        getEmail(): string;
-        setEmail(email: string, options: SuccessFailureOptions): boolean;
-
-        getUsername(): string;
-        setUsername(username: string, options?: SuccessFailureOptions): boolean;
-
-        setPassword(password: string, options?: SuccessFailureOptions): boolean;
-        getSessionToken(): string;
-    }
-
-    /**
-     * Creating a Parse.View creates its initial element outside of the DOM,
-     * if an existing element is not provided...
-     * @class
-     *
-     * <p>A fork of Backbone.View, provided for your convenience.  If you use this
-     * class, you must also include jQuery, or another library that provides a
-     * jQuery-compatible $ function.  For more information, see the
-     * <a href="http://documentcloud.github.com/backbone/#View">Backbone
-     * documentation</a>.</p>
-     * <p><strong><em>Available in the client SDK only.</em></strong></p>
-     */
-    class View<T> extends Events {
-
-        model: any;
-        collection: any;
-        id: string;
-        cid: string;
-        className: string;
-        tagName: string;
-        el: any;
-        $el: JQuery;
-        attributes: any;
-
-        constructor(options?: View.Options);
-
-        static extend(properties: any, classProperties?: any): any;
-
-        $(selector?: string): JQuery;
-        setElement(element: HTMLElement, delegate?: boolean): View<T>;
-        setElement(element: JQuery, delegate?: boolean): View<T>;
-        render(): View<T>;
-        remove(): View<T>;
-        make(tagName: any, attributes?: View.Attribute[], content?: any): any;
-        delegateEvents(events?: any): any;
-        undelegateEvents(): any;
-
-    }
-
-    namespace View {
-        interface Options {
-            model?: any;
-            collection?: any;
-            el?: any;
-            id?: string;
-            className?: string;
-            tagName?: string;
-            attributes?: Attribute[];
-        }
-
-        interface Attribute {
-            [attributeName: string]: string | number | boolean;
-        }
-    }
-
-    namespace Analytics {
-
-        function track<T>(name: string, dimensions: any):Promise<T>;
-    }
-
-    /**
-     * Provides a set of utilities for using Parse with Facebook.
-     * @namespace
-     * Provides a set of utilities for using Parse with Facebook.
-     */
-    namespace FacebookUtils {
-
-        function init(options?: any): void;
-        function isLinked(user: User): boolean;
-        function link(user: User, permissions: any, options?: SuccessFailureOptions): void;
-        function logIn(permissions: any, options?: SuccessFailureOptions): void;
-        function unlink(user: User, options?: SuccessFailureOptions): void;
-    }
-
-    /**
-     * @namespace Contains functions for calling and declaring
-     * <a href="/docs/cloud_code_guide#functions">cloud functions</a>.
-     * <p><strong><em>
-     *   Some functions are only available from Cloud Code.
-     * </em></strong></p>
-     */
-    namespace Cloud {
-
-        interface CookieOptions {
-            domain?: string;
-            expires?: Date;
-            httpOnly?: boolean;
-            maxAge?: number;
-            path?: string;
-            secure?: boolean;
-        }
-
-        interface HttpResponse {
-            buffer?: Buffer;
-            cookies?: any;
-            data?: any;
-            headers?: any;
-            status?: number;
-            text?: string;
-        }
-
-        interface JobRequest {
-            params: any;
-        }
-
-        interface JobStatus {
-            error?: Function;
-            message?: Function;
-            success?: Function;
-        }
-
-        interface FunctionRequest {
-            installationId?: String;
-            master?: boolean;
-            params?: any;
-            user?: User;
-        }
-
-        interface FunctionResponse {
-            success?: (response: HttpResponse) => void;
-            error?: (response: HttpResponse) => void;
-        }
-
-        interface Cookie {
-            name?: string;
-            options?: CookieOptions;
-            value?: string;
-        }
-
-        interface AfterSaveRequest extends FunctionRequest {}
-        interface AfterDeleteRequest extends FunctionRequest {}
-        interface BeforeDeleteRequest extends FunctionRequest {}
-        interface BeforeDeleteResponse extends FunctionResponse {}
-        interface BeforeSaveRequest extends FunctionRequest {}
-        interface BeforeSaveResponse extends FunctionResponse {}
-
-        function afterDelete(arg1: any, func?: (request: AfterDeleteRequest) => void): void;
-        function afterSave(arg1: any, func?: (request: AfterSaveRequest) => void): void;
-        function beforeDelete(arg1: any, func?: (request: BeforeDeleteRequest, response: BeforeDeleteResponse) => void): void;
-        function beforeSave(arg1: any, func?: (request: BeforeSaveRequest, response: BeforeSaveResponse) => void): void;
-        function define(name: string, func?: (request: FunctionRequest, response: FunctionResponse) => void): void;
-        function httpRequest(options: HTTPOptions): Promise<HttpResponse>;
-        function job(name: string, func?: (request: JobRequest, status: JobStatus) => void): HttpResponse;
-        function run<T>(name: string, data?: any, options?: SuccessFailureOptions): Promise<T>;
-        function useMasterKey(): void;
-
-        /**
-         * To use this Cloud Module in Cloud Code, you must require 'buffer' in your JavaScript file.
-         *
-         *     import Buffer = require("buffer").Buffer;
-         */
-        var HTTPOptions: new () => HTTPOptions;
-        interface HTTPOptions extends FunctionResponse {
-            /**
-             * The body of the request.
-             * If it is a JSON object, then the Content-Type set in the headers must be application/x-www-form-urlencoded or application/json.
-             * You can also set this to a Buffer object to send raw bytes.
-             * If you use a Buffer, you should also set the Content-Type header explicitly to describe what these bytes represent.
-             */
-            body?: string | Buffer | Object;
-            /**
-             * Defaults to 'false'.
-             */
-            followRedirects?: boolean;
-            /**
-             * The headers for the request.
-             */
-            headers?: {
-                [headerName: string]: string | number | boolean;
-            };
-            /**
-             *The method of the request (i.e GET, POST, etc).
-             */
-            method?: string;
-            /**
-             * The query portion of the url.
-             */
-            params?: any;
-            /**
-             * The url to send the request to.
-             */
-            url: string;
-        }
-    }
-
-
-    class Error {
-
-        code: ErrorCode;
-        message: string;
-
-        constructor(code: ErrorCode, message: string);
-
-    }
-
-    enum ErrorCode {
-
-        OTHER_CAUSE = -1,
-        INTERNAL_SERVER_ERROR = 1,
-        CONNECTION_FAILED =  100,
-        OBJECT_NOT_FOUND =  101,
-        INVALID_QUERY =  102,
-        INVALID_CLASS_NAME =  103,
-        MISSING_OBJECT_ID =  104,
-        INVALID_KEY_NAME =  105,
-        INVALID_POINTER =  106,
-        INVALID_JSON =  107,
-        COMMAND_UNAVAILABLE =  108,
-        NOT_INITIALIZED =  109,
-        INCORRECT_TYPE =  111,
-        INVALID_CHANNEL_NAME =  112,
-        PUSH_MISCONFIGURED =  115,
-        OBJECT_TOO_LARGE =  116,
-        OPERATION_FORBIDDEN =  119,
-        CACHE_MISS =  120,
-        INVALID_NESTED_KEY =  121,
-        INVALID_FILE_NAME =  122,
-        INVALID_ACL =  123,
-        TIMEOUT =  124,
-        INVALID_EMAIL_ADDRESS =  125,
-        MISSING_CONTENT_TYPE =  126,
-        MISSING_CONTENT_LENGTH =  127,
-        INVALID_CONTENT_LENGTH =  128,
-        FILE_TOO_LARGE =  129,
-        FILE_SAVE_ERROR =  130,
-        DUPLICATE_VALUE =  137,
-        INVALID_ROLE_NAME =  139,
-        EXCEEDED_QUOTA =  140,
-        SCRIPT_FAILED =  141,
-        VALIDATION_ERROR =  142,
-        INVALID_IMAGE_DATA =  150,
-        UNSAVED_FILE_ERROR =  151,
-        INVALID_PUSH_TIME_ERROR = 152,
-        FILE_DELETE_ERROR = 153,
-        REQUEST_LIMIT_EXCEEDED = 155,
-        INVALID_EVENT_NAME = 160,
-        USERNAME_MISSING =  200,
-        PASSWORD_MISSING =  201,
-        USERNAME_TAKEN =  202,
-        EMAIL_TAKEN =  203,
-        EMAIL_MISSING =  204,
-        EMAIL_NOT_FOUND =  205,
-        SESSION_MISSING =  206,
-        MUST_CREATE_USER_THROUGH_SIGNUP =  207,
-        ACCOUNT_ALREADY_LINKED =  208,
-        INVALID_SESSION_TOKEN = 209,
-        LINKED_ID_MISSING =  250,
-        INVALID_LINKED_SESSION =  251,
-        UNSUPPORTED_SERVICE =  252,
-        AGGREGATE_ERROR = 600,
-        FILE_READ_ERROR = 601,
-        X_DOMAIN_REQUEST = 602
-    }
-
-    /**
-     * @class
-     * A Parse.Op is an atomic operation that can be applied to a field in a
-     * Parse.Object. For example, calling <code>object.set("foo", "bar")</code>
-     * is an example of a Parse.Op.Set. Calling <code>object.unset("foo")</code>
-     * is a Parse.Op.Unset. These operations are stored in a Parse.Object and
-     * sent to the server as part of <code>object.save()</code> operations.
-     * Instances of Parse.Op should be immutable.
-     *
-     * You should not create subclasses of Parse.Op or instantiate Parse.Op
-     * directly.
-     */
-    namespace Op {
-
-        interface BaseOperation extends IBaseObject {
-            objects(): any[];
-        }
-
-        interface Add extends BaseOperation {
-        }
-
-        interface AddUnique extends BaseOperation {
-        }
-
-        interface Increment extends IBaseObject {
-            amount: number;
-        }
-
-        interface Relation extends IBaseObject {
-            added(): Object[];
-            removed: Object[];
-        }
-
-        interface Set extends IBaseObject {
-            value(): any;
-        }
-
-        interface Unset extends IBaseObject {
-        }
-
-    }
-
-    /**
-     * Contains functions to deal with Push in Parse
-     * @name Parse.Push
-     * @namespace
-     */
-    namespace Push {
-        function send<T>(data: PushData, options?: SendOptions): Promise<T>;
-
-        interface PushData {
-            channels?: string[];
-            push_time?: Date;
-            expiration_time?: Date;
-            expiration_interval?: number;
-            where?: Query;
-            data?: any;
-            alert?: string;
-            badge?: string;
-            sound?: string;
-            title?: string;
-        }
-
-        interface SendOptions {
-            success?: () => void;
-            error?: (error: Error) => void;
-        }
-    }
-
-    /**
-     * Call this method first to set up your authentication tokens for Parse.
-     * You can get your keys from the Data Browser on parse.com.
-     * @param {String} applicationId Your Parse Application ID.
-     * @param {String} javaScriptKey Your Parse JavaScript Key.
-     * @param {String} masterKey (optional) Your Parse Master Key. (Node.js only!)
-     */
-    function initialize(applicationId: string, javaScriptKey: string, masterKey?: string): void;
-
-}
-
-declare module "parse/node" {
-    export = { Parse };
-}
-
-declare module "parse" {
-    import parse = require("parse/node");
-    export = parse
-}
diff --git a/parse/tsconfig.json b/parse/tsconfig.json
new file mode 100644
index 0000000000..628e8d41a0
--- /dev/null
+++ b/parse/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "parse-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/parse5/index.d.ts b/parse5/index.d.ts
new file mode 100644
index 0000000000..f65b68f521
--- /dev/null
+++ b/parse5/index.d.ts
@@ -0,0 +1,261 @@
+// Type definitions for parse5 2.1.5
+// Project: https://github.com/inikulin/parse5
+// Definitions by: Nico Jansen <https://github.com/nicojs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import * as stream from "stream";
+import * as events from "events";
+
+/**
+ * Parses an HTML string.
+ * @function
+ * @param {string} html - Input HTML string.
+ * @param {ParserOptions} html - Parsing options.
+ * 
+ * @example
+ * var parse5 = require('parse5');
+ * var document = parse5.parse('<!DOCTYPE html><html><head></head><body>Hi there!</body></html>');
+ */
+export declare function parse(html: string, options?: ParserOptions): ASTNode;
+
+/**
+ * Parses an HTML fragment.
+ * 
+ * @param {string} html - Input html fragment
+ * @param {ParserOptions} - Parsign options
+ * @example
+ * var parse5 = require('parse5');
+ * var documentFragment = parse5.parseFragment('<table></table>');
+ * // Parses the html fragment in the context of the parsed <table> element.
+ * var trFragment = parser.parseFragment(documentFragment.childNodes[0], '<tr><td>Shake it, baby</td></tr>');
+ */
+export declare function parseFragment(html: string, options?: ParserOptions): ASTNode;
+export declare function parseFragment(fragmentContext: any, html: string, options?: ParserOptions): ASTNode;
+
+/**
+ * Serializes an AST node to an HTML string.
+ * @param node Node to serialize.
+ * @param options Serialization options
+ */
+export declare function serialize(node: ASTNode, options?: SerializerOptions): string;
+
+export interface ASTAttribute {
+    name: string;
+    value: string;
+}
+
+export interface Attribute {
+    key: string;
+    value: string;
+}
+
+export interface ASTNode {
+    attrs: ASTAttribute[];
+    childNodes?: ASTNode[];
+    namespaceURI?: string;
+    parentNode?: ASTNode;
+    nodeName: string;
+    quirksMode?: boolean;
+    value?: string;
+    __location: LocationInfo | ElementLocationInfo;
+}
+
+export interface LocationInfo {
+    /**
+     * One-based line index
+     */
+    line: number;
+    /**
+     * Zero-based first character index
+     */
+    col: number;
+    /**
+     * Zero-based first character index
+     */
+    startOffset: number;
+    /**
+     * Zero-based last character index
+     */
+    endOffset: number;
+}
+
+
+/**
+ * Streaming AST node to an HTML serializer. A readable stream.
+ */
+export declare class SerializerStream extends stream.Readable {
+    /**
+     * Streaming AST node to an HTML serializer. A readable stream.
+     * 
+     * @param Node to serialize.
+     * @param options Serialization options.
+     */
+    constructor(node: ASTNode, options: SerializerOptions);
+}
+
+/**
+ * Streaming HTML parser with scripting support. A writable stream.
+ */
+export declare class ParserStream extends stream.Writable {
+    /**
+     * @param options Parsing options.
+     */
+    constructor(options?: ParserOptions);
+    /**
+     * The resulting document node.
+     */
+    document: ASTNode;
+    on(event: string, listener: Function): this;
+    /**
+     * Raised then parser encounters a <script> element. If this event has listeners, parsing will be suspended
+     *  once it is emitted. So, if <script> has the src attribute, 
+     * you can fetch it, execute and then resume parsing just like browsers do.
+     * The listener will have 3 parameters:
+     * The script element that caused the event, a function for writing additional html at the current parsing position. Suitable for implementing the DOM document.write and document.writeln methods.
+     * And finally a resume function as a callback to signal the continuation of the parsing
+     */
+    on(event: 'script', listener: (scriptElement: ASTNode, documentWrite: (html: string) => void, resume: Function) => void): this;
+}
+
+export declare class SAXParser extends stream.Transform {
+    constructor(options?: SAXParserOptions);
+    on(event: string, listener: Function): this;
+    /**
+     * Raised when the parser encounters a start tag.
+     * Listener function has 4 parameters:
+     * Tag name, List of attributes in the { key: String, value: String } form, selfClosing boolean 
+     * and start tag source code location info. Available if location info is enabled in SAXParserOptions.
+     */
+    on(event: 'startTag', listener: (name: string, attrs: Attribute[], selfClosing: boolean, location?: StartTagLocationInfo) => void): this;
+    /**
+     * Raised when parser encounters an end tag.
+     * Listener function has 2 parameters:
+     * Tag name and location End tag source code location info. Available if location info is enabled in SAXParserOptions. 
+     */
+    on(event: 'endTag', listener: (name: string, location?: LocationInfo) => void): this;
+    /**
+     * Raised then parser encounters a comment.
+     * Listener function has 2 parameters:
+     * The comment text and the source code location info. Available if location info is enabled in SAXParserOptions.
+     */
+    on(event: 'comment', listener: (text: string, location?: LocationInfo) => void): this;
+    /**
+     * Raised then parser encounters text content.
+     * Listener function has 2 parameters:
+     * The text content and location info. Available if location info is enabled in SAXParserOptions.
+     */
+    on(event: 'text', listener: (text: string, location?: LocationInfo) => void): this;
+    /**
+     * Raised then parser encounters a document type declaration.
+     * Listener function has 4 parameters:
+     * The document type name, document type public identifier, document type system identifier and
+     * location info. Available if location info is enabled in SAXParserOptions.
+     */
+    on(event: 'doctype', listener: (name: string, publicId: string, systemId: string, location?: LocationInfo) => void): this;
+    /**
+     * Stops parsing. Useful if you want the parser to stop consuming CPU time once you've obtained the desired info from the input stream. 
+     * Doesn't prevent piping, so that data will flow through the parser as usual.
+     */
+    stop(): void;
+}
+
+export interface TreeAdapter {
+    createDocument(): ASTNode;
+    createDocumentFragment(): ASTNode;
+    createElement(tagName: string, namespaceURI: string, attrs: Attribute[]): ASTNode;
+    createCommentNode(data: string): ASTNode;
+    appendChild(parentNode: ASTNode, newNode: ASTNode): void;
+    insertBefore(parentNode: ASTNode, newNode: ASTNode, referenceNode: ASTNode): void;
+    setTemplateContent(templateElement: ASTNode, contentTemplate: ASTNode): void;
+    getTemplateContent(templateElement: ASTNode): ASTNode;
+    setDocumentType(document: ASTNode, name: string, publicId: string, systemId: string): void;
+    setQuirksMode(document: ASTNode): void;
+    isQuirksMode(document: ASTNode): boolean;
+    detachNode(node: ASTNode): void;
+    insertText(parentNode: ASTNode, text: string): void;
+    insertTextBefore(parentNode: ASTNode, text: string, referenceNode: ASTNode): void;
+    adoptAttributes(recipientNode: ASTNode, attrs: Attribute[]): void;
+    getFirstChild(node: ASTNode): ASTNode;
+    getChildNodes(node: ASTNode): ASTNode[];
+    getParentNode(node: ASTNode): ASTNode;
+    getAttrList(node: ASTNode): Attribute[];
+    getTagName(element: ASTNode): string;
+    getNamespaceURI(element: ASTNode): string;
+    getTextNodeContent(textNode: ASTNode): string;
+    getCommentNodeContent(commentNode: ASTNode): string;
+    getDocumentTypeNodeName(doctypeNode: ASTNode): string;
+    getDocumentTypeNodePublicId(doctypeNode: ASTNode): string;
+    getDocumentTypeNodeSystemId(doctypeNode: ASTNode): string;
+    isTextNode(node: ASTNode): boolean;
+    isCommentNode(node: ASTNode): boolean;
+    isDocumentTypeNode(node: ASTNode): boolean;
+    isElementNode(node: ASTNode): boolean;
+}
+
+export interface AttributesLocationInfo {
+    [attributeName: string]: LocationInfo;
+}
+
+export interface StartTagLocationInfo extends LocationInfo {
+    /**
+     * Start tag attributes' location info
+     */
+    attrs: AttributesLocationInfo
+}
+
+export interface ElementLocationInfo {
+    /**
+     * Element's start tag location info.
+     */
+    startTag: StartTagLocationInfo;
+    /**
+     * Element's end tag location info.
+     */
+    endTag: LocationInfo;
+}
+
+/**
+ * Provides built-in tree adapters that can be used for parsing and serialization.
+ */
+export declare var treeAdapters: {
+    /**
+     * Default tree format for parse5.
+     */
+    default: TreeAdapter,
+    /**
+     * Quite popular htmlparser2 tree format (e.g. used by cheerio and jsdom).
+     */
+    htmlparser2: TreeAdapter
+};
+
+export interface ParserOptions {
+    /**
+     * Enables source code location information for the nodes. When enabled, each node (except root node) has the __location property. 
+     * In case the node is not an empty element, __location will be ElementLocationInfo object, otherwise it's LocationInfo.
+     * If the element was implicitly created by *the parser it's __location property will be null.
+     */
+    locationInfo?: boolean;
+    /**
+     * Specifies the resulting tree format.
+     */
+    treeAdapter?: TreeAdapter;
+}
+
+export interface SerializerOptions {
+    /***
+     * Specifies input tree format.
+     */
+    treeAdapter: TreeAdapter;
+}
+
+/**
+ * Enables source code location information for the tokens.
+ *  When enabled, each token event handler will receive LocationInfo 
+ * (or StartTagLocationInfo) object as its last argument.
+ */
+export interface SAXParserOptions {
+    locationInfo?: boolean;
+}
diff --git a/parse5/parse5-tests.ts b/parse5/parse5-tests.ts
index 420fda5992..af2f5b7703 100644
--- a/parse5/parse5-tests.ts
+++ b/parse5/parse5-tests.ts
@@ -3,7 +3,6 @@
 // Definitions by: Nico Jansen <https://github.com/nicojs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./parse5.d.ts" />
 
 import * as parse5 from 'parse5';
 
diff --git a/parse5/parse5.d.ts b/parse5/parse5.d.ts
deleted file mode 100644
index 5b2557053e..0000000000
--- a/parse5/parse5.d.ts
+++ /dev/null
@@ -1,263 +0,0 @@
-// Type definitions for parse5 2.1.5
-// Project: https://github.com/inikulin/parse5
-// Definitions by: Nico Jansen <https://github.com/nicojs>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'parse5' {
-    import * as stream from "stream";
-    import * as events from "events";
-  
-    /**
-     * Parses an HTML string.
-     * @function
-     * @param {string} html - Input HTML string.
-     * @param {ParserOptions} html - Parsing options.
-     * 
-     * @example
-     * var parse5 = require('parse5');
-     * var document = parse5.parse('<!DOCTYPE html><html><head></head><body>Hi there!</body></html>');
-     */
-    export function parse(html: string, options?: ParserOptions): ASTNode;
-    
-    /**
-     * Parses an HTML fragment.
-     * 
-     * @param {string} html - Input html fragment
-     * @param {ParserOptions} - Parsign options
-     * @example
-     * var parse5 = require('parse5');
-     * var documentFragment = parse5.parseFragment('<table></table>');
-     * // Parses the html fragment in the context of the parsed <table> element.
-     * var trFragment = parser.parseFragment(documentFragment.childNodes[0], '<tr><td>Shake it, baby</td></tr>');
-     */
-    export function parseFragment(html: string, options?: ParserOptions): ASTNode;
-    export function parseFragment(fragmentContext: any, html: string, options?: ParserOptions): ASTNode;
-
-    /**
-     * Serializes an AST node to an HTML string.
-     * @param node Node to serialize.
-     * @param options Serialization options
-     */
-    export function serialize(node: ASTNode, options?: SerializerOptions): string;
-
-    export interface ASTAttribute {
-        name: string;
-        value: string;
-    }
-
-    export interface Attribute {
-        key: string;
-        value: string;
-    }
-
-    export interface ASTNode {
-        attrs: ASTAttribute[];
-        childNodes?: ASTNode[];
-        namespaceURI?: string;
-        parentNode?: ASTNode;
-        nodeName: string;
-        quirksMode?: boolean;
-        value?: string;
-        __location: LocationInfo | ElementLocationInfo;
-    }
-
-    export interface LocationInfo {
-        /**
-         * One-based line index
-         */
-        line: number;
-        /**
-         * Zero-based first character index
-         */
-        col: number;
-        /**
-         * Zero-based first character index
-         */
-        startOffset: number;
-        /**
-         * Zero-based last character index
-         */
-        endOffset: number;
-    }
-    
-        
-    /**
-     * Streaming AST node to an HTML serializer. A readable stream.
-     */
-    export class SerializerStream extends stream.Readable {
-        /**
-         * Streaming AST node to an HTML serializer. A readable stream.
-         * 
-         * @param Node to serialize.
-         * @param options Serialization options.
-         */
-        constructor(node: ASTNode, options: SerializerOptions);
-    }
-    
-    /**
-     * Streaming HTML parser with scripting support. A writable stream.
-     */
-    export class ParserStream extends stream.Writable {
-        /**
-         * @param options Parsing options.
-         */
-        constructor(options?: ParserOptions);
-        /**
-         * The resulting document node.
-         */
-        document: ASTNode;
-        on(event: string, listener: Function): this;
-        /**
-         * Raised then parser encounters a <script> element. If this event has listeners, parsing will be suspended
-         *  once it is emitted. So, if <script> has the src attribute, 
-         * you can fetch it, execute and then resume parsing just like browsers do.
-         * The listener will have 3 parameters:
-         * The script element that caused the event, a function for writing additional html at the current parsing position. Suitable for implementing the DOM document.write and document.writeln methods.
-         * And finally a resume function as a callback to signal the continuation of the parsing
-         */
-        on(event: 'script', listener: (scriptElement: ASTNode, documentWrite: (html: string) => void, resume: Function) => void): this;
-    }
-
-    export class SAXParser extends stream.Transform {
-        constructor(options?: SAXParserOptions);
-        on(event: string, listener: Function): this;
-        /**
-         * Raised when the parser encounters a start tag.
-         * Listener function has 4 parameters:
-         * Tag name, List of attributes in the { key: String, value: String } form, selfClosing boolean 
-         * and start tag source code location info. Available if location info is enabled in SAXParserOptions.
-         */
-        on(event: 'startTag', listener: (name: string, attrs: Attribute[], selfClosing: boolean, location?: StartTagLocationInfo) => void): this;
-        /**
-         * Raised when parser encounters an end tag.
-         * Listener function has 2 parameters:
-         * Tag name and location End tag source code location info. Available if location info is enabled in SAXParserOptions. 
-         */
-        on(event: 'endTag', listener: (name: string, location?: LocationInfo) => void): this;
-        /**
-         * Raised then parser encounters a comment.
-         * Listener function has 2 parameters:
-         * The comment text and the source code location info. Available if location info is enabled in SAXParserOptions.
-         */
-        on(event: 'comment', listener: (text: string, location?: LocationInfo) => void): this;
-        /**
-         * Raised then parser encounters text content.
-         * Listener function has 2 parameters:
-         * The text content and location info. Available if location info is enabled in SAXParserOptions.
-         */
-        on(event: 'text', listener: (text: string, location?: LocationInfo) => void): this;
-        /**
-         * Raised then parser encounters a document type declaration.
-         * Listener function has 4 parameters:
-         * The document type name, document type public identifier, document type system identifier and
-         * location info. Available if location info is enabled in SAXParserOptions.
-         */
-        on(event: 'doctype', listener: (name: string, publicId: string, systemId: string, location?: LocationInfo) => void): this;
-        /**
-         * Stops parsing. Useful if you want the parser to stop consuming CPU time once you've obtained the desired info from the input stream. 
-         * Doesn't prevent piping, so that data will flow through the parser as usual.
-         */
-        stop(): void;
-    }
-
-    export interface TreeAdapter {
-        createDocument(): ASTNode;
-        createDocumentFragment(): ASTNode;
-        createElement(tagName: string, namespaceURI: string, attrs: Attribute[]): ASTNode;
-        createCommentNode(data: string): ASTNode;
-        appendChild(parentNode: ASTNode, newNode: ASTNode): void;
-        insertBefore(parentNode: ASTNode, newNode: ASTNode, referenceNode: ASTNode): void;
-        setTemplateContent(templateElement: ASTNode, contentTemplate: ASTNode): void;
-        getTemplateContent(templateElement: ASTNode): ASTNode;
-        setDocumentType(document: ASTNode, name: string, publicId: string, systemId: string): void;
-        setQuirksMode(document: ASTNode): void;
-        isQuirksMode(document: ASTNode): boolean;
-        detachNode(node: ASTNode): void;
-        insertText(parentNode: ASTNode, text: string): void;
-        insertTextBefore(parentNode: ASTNode, text: string, referenceNode: ASTNode): void;
-        adoptAttributes(recipientNode: ASTNode, attrs: Attribute[]): void;
-        getFirstChild(node: ASTNode): ASTNode;
-        getChildNodes(node: ASTNode): ASTNode[];
-        getParentNode(node: ASTNode): ASTNode;
-        getAttrList(node: ASTNode): Attribute[];
-        getTagName(element: ASTNode): string;
-        getNamespaceURI(element: ASTNode): string;
-        getTextNodeContent(textNode: ASTNode): string;
-        getCommentNodeContent(commentNode: ASTNode): string;
-        getDocumentTypeNodeName(doctypeNode: ASTNode): string;
-        getDocumentTypeNodePublicId(doctypeNode: ASTNode): string;
-        getDocumentTypeNodeSystemId(doctypeNode: ASTNode): string;
-        isTextNode(node: ASTNode): boolean;
-        isCommentNode(node: ASTNode): boolean;
-        isDocumentTypeNode(node: ASTNode): boolean;
-        isElementNode(node: ASTNode): boolean;
-    }
-
-    export interface AttributesLocationInfo {
-        [attributeName: string]: LocationInfo;
-    }
-
-    export interface StartTagLocationInfo extends LocationInfo {
-        /**
-         * Start tag attributes' location info
-         */
-        attrs: AttributesLocationInfo
-    }
-
-    export interface ElementLocationInfo {
-        /**
-         * Element's start tag location info.
-         */
-        startTag: StartTagLocationInfo;
-        /**
-         * Element's end tag location info.
-         */
-        endTag: LocationInfo;
-    }
-    
-    /**
-     * Provides built-in tree adapters that can be used for parsing and serialization.
-     */
-    export var treeAdapters: {
-        /**
-         * Default tree format for parse5.
-         */
-        default: TreeAdapter, 
-        /**
-         * Quite popular htmlparser2 tree format (e.g. used by cheerio and jsdom).
-         */
-        htmlparser2: TreeAdapter
-    };
-
-    export interface ParserOptions {
-        /**
-         * Enables source code location information for the nodes. When enabled, each node (except root node) has the __location property. 
-         * In case the node is not an empty element, __location will be ElementLocationInfo object, otherwise it's LocationInfo.
-         * If the element was implicitly created by *the parser it's __location property will be null.
-         */
-        locationInfo?: boolean;
-        /**
-         * Specifies the resulting tree format.
-         */
-        treeAdapter?: TreeAdapter;
-    }
-
-    export interface SerializerOptions {
-        /***
-         * Specifies input tree format.
-         */
-        treeAdapter: TreeAdapter;
-    }
-    
-    /**
-     * Enables source code location information for the tokens.
-     *  When enabled, each token event handler will receive LocationInfo 
-     * (or StartTagLocationInfo) object as its last argument.
-     */
-    export interface SAXParserOptions {
-        locationInfo?: boolean;
-    }
-}
-
diff --git a/parse5/tsconfig.json b/parse5/tsconfig.json
new file mode 100644
index 0000000000..4c8fedafce
--- /dev/null
+++ b/parse5/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "parse5-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/parsimmon/index.d.ts b/parsimmon/index.d.ts
new file mode 100644
index 0000000000..aec8aae203
--- /dev/null
+++ b/parsimmon/index.d.ts
@@ -0,0 +1,176 @@
+// Type definitions for Parsimmon 0.5.0
+// Project: https://github.com/jneen/parsimmon
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Mizunashi Mana <https://github.com/mizunashi-mana>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// TODO convert to generics
+
+
+declare namespace Parsimmon {
+
+    export type StreamType = string;
+
+    export interface Mark<T> {
+        start: number;
+        end: number;
+        value: T;
+    }
+
+    export interface Result<T> {
+        status: boolean;
+        value?: T;
+        expected?: string;
+        index?: number;
+    }
+
+    export interface Parser<T> {
+        /*
+         parse the string
+         */
+        parse(input: string): Result<T>;
+        /*
+         returns a new parser which tries parser, and if it fails uses otherParser.
+         */
+        or(otherParser: Parser<T>): Parser<T>;
+        or<U>(otherParser: Parser<U>): Parser<any>;
+        /*
+         returns a new parser which tries parser, and on success calls the given function with the result of the parse, which is expected to return another parser, which will be tried next
+         */
+        chain<U>(next: (result: T) => Parser<U>): Parser<U>;
+        /*
+         returns a new parser which tries parser, and on success calls the given function with the result of the parse, which is expected to return another parser.
+         */
+        then<U>(call: (result: T) => Parser<U>): Parser<U>;
+        /*
+         expects anotherParser to follow parser, and yields the result of anotherParser. NB: the result of parser here is ignored.
+         */
+        then<U>(anotherParser: Parser<U>): Parser<U>;
+        /*
+         transforms the output of parser with the given function.
+         */
+        map<U>(call: (result: T) => U): Parser<U>;
+        /*
+         expects otherParser after parser, but preserves the yield value of parser.
+         */
+        skip<U>(otherParser: Parser<U>): Parser<T>;
+        /*
+         returns a new parser with the same behavior, but which yields aResult.
+         */
+        result<U>(aResult: U): Parser<U>;
+        /*
+         expects parser zero or more times, and yields an array of the results.
+         */
+        many(): Parser<T[]>;
+        /*
+         expects parser exactly n times, and yields an array of the results.
+         */
+        times(n: number): Parser<T[]>;
+        /*
+         expects parser between min and max times, and yields an array of the results.
+         */
+        times(min: number, max: number): Parser<T[]>;
+        /*
+         expects parser at most n times. Yields an array of the results.
+         */
+        atMost(n: number): Parser<T[]>;
+        /*
+         expects parser at least n times. Yields an array of the results.
+         */
+        atLeast(n: number): Parser<T[]>;
+        /*
+         returns a new parser whose failure message is the passed description.
+         */
+        mark(): Parser<Mark<T>>;
+
+        desc(description: string): Parser<T>;
+    }
+    /*
+     is a parser that expects to find "my-string", and will yield the same.
+     */
+    export function string(mystring: string): Parser<string>;
+
+    /*
+     is a parser that expects the stream to match the given regex.
+     */
+    export function regex(myregex: RegExp): Parser<string>;
+
+    /*
+     is a parser that doesn't consume any of the string, and yields result.
+     */
+    export function succeed<U>(result: U): Parser<U>;
+
+    /*
+     accepts a variable number of parsers that it expects to find in order, yielding an array of the results.
+     */
+    export function seq<U>(...parsers: Parser<U>[]): Parser<U[]>;
+    export function seq(...parsers: Parser<any>[]): Parser<any[]>;
+
+    export type SuccessFunctionType<U> = (index: number, result: U) => Result<U>;
+    export type FailureFunctionType<U> = (index: number, msg: string) => Result<U>;
+    export type ParseFunctionType<U> = (stream: StreamType, index: number) => Result<U>;
+    /*
+     allows to add custom primitive parsers.
+     */
+    export function custom<U>(parsingFunction: (success: SuccessFunctionType<U>, failure: FailureFunctionType<U>) => ParseFunctionType<U>): Parser<U>;
+
+    /*
+     accepts a variable number of parsers, and yields the value of the first one that succeeds, backtracking in between.
+     */
+    export function alt<U>(...parsers: Parser<U>[]): Parser<U>;
+    export function alt(...parsers: Parser<any>[]): Parser<any>;
+
+    /*
+     accepts a function that returns a parser, which is evaluated the first time the parser is used. This is useful for referencing parsers that haven't yet been defined.
+     */
+    export function lazy<U>(f: () => Parser<U>): Parser<U>;
+    export function lazy<U>(description: string, f: () => Parser<U>): Parser<U>;
+
+    /*
+     fail paring with a message
+     */
+    export function fail(message: string): Parser<void>;
+    export function fail<U>(message: string): Parser<U>;
+
+    /*
+     is equivalent to Parsimmon.regex(/[a-z]/i)
+     */
+    export var letter: Parser<string>;
+    /*
+     is equivalent to Parsimmon.regex(/[a-z]*`/i)
+     */
+    export var letters: Parser<string>;
+    /*
+     is equivalent to Parsimmon.regex(/[0-9]/)
+     */
+    export var digit: Parser<string>;
+    /*
+     is equivalent to Parsimmon.regex(/[0-9]*`/)
+     */
+    export var digits: Parser<string>;
+    /*
+     is equivalent to Parsimmon.regex(/\s+/)
+     */
+    export var whitespace: Parser<string>;
+    /*
+     is equivalent to Parsimmon.regex(/\s*`/)
+     */
+    export var optWhitespace: Parser<string>;
+    /*
+     consumes and yields the next character of the stream.
+     */
+    export var any: Parser<string>;
+    /*
+     consumes and yields the entire remainder of the stream.
+     */
+    export var all: Parser<string>;
+    /*
+     expects the end of the stream.
+     */
+    export var eof: Parser<void>;
+    /*
+     is a parser that yields the current index of the parse.
+     */
+    export var index: Parser<number>;
+}
+
+export = Parsimmon;
diff --git a/parsimmon/parsimmon-tests.ts b/parsimmon/parsimmon-tests.ts
index 569328296f..5a0ac1203e 100644
--- a/parsimmon/parsimmon-tests.ts
+++ b/parsimmon/parsimmon-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="parsimmon.d.ts" />
 
 import P = require('parsimmon');
 import Parser = P.Parser;
diff --git a/parsimmon/parsimmon.d.ts b/parsimmon/parsimmon.d.ts
deleted file mode 100644
index ab6ceab4df..0000000000
--- a/parsimmon/parsimmon.d.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-// Type definitions for Parsimmon 0.5.0
-// Project: https://github.com/jneen/parsimmon
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Mizunashi Mana <https://github.com/mizunashi-mana>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// TODO convert to generics
-
-declare module 'parsimmon' {
-	namespace Parsimmon {
-
-		export type StreamType = string;
-
-		export interface Mark<T> {
-			start: number;
-			end: number;
-			value: T;
-		}
-
-		export interface Result<T> {
-			status: boolean;
-			value?: T;
-			expected?: string;
-			index?: number;
-		}
-
-		export interface Parser<T> {
-			/*
-			 parse the string
-			 */
-			parse(input: string): Result<T>;
-			/*
-			 returns a new parser which tries parser, and if it fails uses otherParser.
-			 */
-			or(otherParser: Parser<T>): Parser<T>;
-			or<U>(otherParser: Parser<U>): Parser<any>;
-			/*
-			 returns a new parser which tries parser, and on success calls the given function with the result of the parse, which is expected to return another parser, which will be tried next
-			 */
-			chain<U>(next: (result: T) => Parser<U>): Parser<U>;
-			/*
-			 returns a new parser which tries parser, and on success calls the given function with the result of the parse, which is expected to return another parser.
-			 */
-			then<U>(call: (result: T) => Parser<U>): Parser<U>;
-			/*
-			 expects anotherParser to follow parser, and yields the result of anotherParser. NB: the result of parser here is ignored.
-			 */
-			then<U>(anotherParser: Parser<U>): Parser<U>;
-			/*
-			 transforms the output of parser with the given function.
-			 */
-			map<U>(call: (result: T) => U): Parser<U>;
-			/*
-			 expects otherParser after parser, but preserves the yield value of parser.
-			 */
-			skip<U>(otherParser: Parser<U>): Parser<T>;
-			/*
-			 returns a new parser with the same behavior, but which yields aResult.
-			 */
-			result<U>(aResult: U): Parser<U>;
-			/*
-			 expects parser zero or more times, and yields an array of the results.
-			 */
-			many(): Parser<T[]>;
-			/*
-			 expects parser exactly n times, and yields an array of the results.
-			 */
-			times(n: number): Parser<T[]>;
-			/*
-			 expects parser between min and max times, and yields an array of the results.
-			 */
-			times(min: number, max: number): Parser<T[]>;
-			/*
-			 expects parser at most n times. Yields an array of the results.
-			 */
-			atMost(n: number): Parser<T[]>;
-			/*
-			 expects parser at least n times. Yields an array of the results.
-			 */
-			atLeast(n: number): Parser<T[]>;
-			/*
-			 returns a new parser whose failure message is the passed description.
-			 */
-			mark(): Parser<Mark<T>>;
-
-			desc(description: string): Parser<T>;
-		}
-		/*
-		 is a parser that expects to find "my-string", and will yield the same.
-		 */
-		export function string(mystring: string): Parser<string>;
-
-		/*
-		 is a parser that expects the stream to match the given regex.
-		 */
-		export function regex(myregex: RegExp): Parser<string>;
-
-		/*
-		 is a parser that doesn't consume any of the string, and yields result.
-		 */
-		export function succeed<U>(result: U): Parser<U>;
-
-		/*
-		 accepts a variable number of parsers that it expects to find in order, yielding an array of the results.
-		 */
-		export function seq<U>(...parsers: Parser<U>[]): Parser<U[]>;
-		export function seq(...parsers: Parser<any>[]): Parser<any[]>;
-
-		export type SuccessFunctionType<U> = (index: number, result: U) => Result<U>;
-		export type FailureFunctionType<U> = (index: number, msg: string) => Result<U>;
-		export type ParseFunctionType<U> = (stream: StreamType, index: number) => Result<U>;
-		/*
-		 allows to add custom primitive parsers.
-		 */
-		export function custom<U>(parsingFunction: (success: SuccessFunctionType<U>, failure: FailureFunctionType<U>) => ParseFunctionType<U>): Parser<U>;
-
-		/*
-		 accepts a variable number of parsers, and yields the value of the first one that succeeds, backtracking in between.
-		 */
-		export function alt<U>(...parsers: Parser<U>[]): Parser<U>;
-		export function alt(...parsers: Parser<any>[]): Parser<any>;
-
-		/*
-		 accepts a function that returns a parser, which is evaluated the first time the parser is used. This is useful for referencing parsers that haven't yet been defined.
-		 */
-		export function lazy<U>(f: () => Parser<U>): Parser<U>;
-		export function lazy<U>(description: string, f: () => Parser<U>): Parser<U>;
-
-		/*
-		 fail paring with a message
-		 */
-		export function fail(message: string): Parser<void>;
-		export function fail<U>(message: string): Parser<U>;
-
-		/*
-		 is equivalent to Parsimmon.regex(/[a-z]/i)
-		 */
-		export var letter: Parser<string>;
-		/*
-		 is equivalent to Parsimmon.regex(/[a-z]*`/i)
-		 */
-		export var letters: Parser<string>;
-		/*
-		 is equivalent to Parsimmon.regex(/[0-9]/)
-		 */
-		export var digit: Parser<string>;
-		/*
-		 is equivalent to Parsimmon.regex(/[0-9]*`/)
-		 */
-		export var digits: Parser<string>;
-		/*
-		 is equivalent to Parsimmon.regex(/\s+/)
-		 */
-		export var whitespace: Parser<string>;
-		/*
-		 is equivalent to Parsimmon.regex(/\s*`/)
-		 */
-		export var optWhitespace: Parser<string>;
-		/*
-		 consumes and yields the next character of the stream.
-		 */
-		export var any: Parser<string>;
-		/*
-		 consumes and yields the entire remainder of the stream.
-		 */
-		export var all: Parser<string>;
-		/*
-		 expects the end of the stream.
-		 */
-		export var eof: Parser<void>;
-		/*
-		 is a parser that yields the current index of the parse.
-		 */
-		export var index: Parser<number>;
-	}
-
-	export = Parsimmon;
-}
diff --git a/parsimmon/tsconfig.json b/parsimmon/tsconfig.json
new file mode 100644
index 0000000000..5609564ad3
--- /dev/null
+++ b/parsimmon/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "parsimmon-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pascal-case/index.d.ts b/pascal-case/index.d.ts
new file mode 100644
index 0000000000..2b9ce7ea84
--- /dev/null
+++ b/pascal-case/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for pascal-case
+// Project: https://github.com/blakeembrey/pascal-case
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function pascalCase(string: string, locale?: string): string;
+export = pascalCase;
diff --git a/pascal-case/pascal-case-tests.ts b/pascal-case/pascal-case-tests.ts
index b13ed26657..cf0f39847b 100644
--- a/pascal-case/pascal-case-tests.ts
+++ b/pascal-case/pascal-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="pascal-case.d.ts" />
 
 import pascalCase = require('pascal-case');
 
diff --git a/pascal-case/pascal-case.d.ts b/pascal-case/pascal-case.d.ts
deleted file mode 100644
index 004bdc1a60..0000000000
--- a/pascal-case/pascal-case.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for pascal-case
-// Project: https://github.com/blakeembrey/pascal-case
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "pascal-case" {
-	function pascalCase(string: string, locale?: string): string;
-	export = pascalCase;
-}
diff --git a/pascal-case/tsconfig.json b/pascal-case/tsconfig.json
new file mode 100644
index 0000000000..11cd8dd31a
--- /dev/null
+++ b/pascal-case/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pascal-case-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/passport-facebook-token/index.d.ts b/passport-facebook-token/index.d.ts
new file mode 100644
index 0000000000..173992a701
--- /dev/null
+++ b/passport-facebook-token/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for passport-facebook-token 0.4.0
+// Project: https://github.com/drudge/passport-facebook-token
+// Definitions by: Ray Martone <https://github.com/rmartone>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="passport"/>
+
+
+
+import passport = require('passport');
+import express = require('express');
+
+interface Profile extends passport.Profile {
+    gender: string;
+    profileUrl: string;
+}
+
+interface StrategyOptions {
+    clientID: string;
+    clientSecret: string;
+    authorizationURL?: string;
+    tokenURL?: string;
+    scopeSeparator?: string;
+    passReqToCallback?: Function;
+    enableProof?: boolean;
+    profileFields?: any[];
+}
+
+declare class Strategy implements passport.Strategy {
+    constructor(options: StrategyOptions,
+        verify: (accessToken: string,
+            refreshToken: string,
+            profile: Profile,
+            done: (err: any, user?: any) => void) => void);
+    name: string;
+    authenticate: (req: express.Request, options?: any) => void;
+}
diff --git a/passport-facebook-token/passport-facebook-token-tests.ts b/passport-facebook-token/passport-facebook-token-tests.ts
index 531b7bdce2..e44100ca7d 100644
--- a/passport-facebook-token/passport-facebook-token-tests.ts
+++ b/passport-facebook-token/passport-facebook-token-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path='./passport-facebook-token.d.ts' />
+
 import passport = require('passport');
 import facebook = require('passport-facebook-token');
 
diff --git a/passport-facebook-token/passport-facebook-token.d.ts b/passport-facebook-token/passport-facebook-token.d.ts
deleted file mode 100644
index 08fd306219..0000000000
--- a/passport-facebook-token/passport-facebook-token.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// Type definitions for passport-facebook-token 0.4.0
-// Project: https://github.com/drudge/passport-facebook-token
-// Definitions by: Ray Martone <https://github.com/rmartone>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../passport/passport.d.ts"/>
-
-declare module 'passport-facebook-token' {
-
-    import passport = require('passport');
-    import express = require('express');
-
-    interface Profile extends passport.Profile {
-        gender: string;
-        profileUrl: string;
-    }
-
-    interface StrategyOptions {
-        clientID: string;
-        clientSecret: string;
-        authorizationURL?: string;
-        tokenURL?: string;
-        scopeSeparator?: string;
-        passReqToCallback?: Function;
-        enableProof?: boolean;
-        profileFields?: any[];
-    }
-
-    class Strategy implements passport.Strategy {
-        constructor(options: StrategyOptions,
-                    verify: (accessToken: string,
-                             refreshToken: string,
-                             profile: Profile,
-                             done: (err: any, user?: any) => void) => void);
-        name: string;
-        authenticate: (req: express.Request, options?: any) => void;
-    }
-}
diff --git a/passport-facebook-token/tsconfig.json b/passport-facebook-token/tsconfig.json
new file mode 100644
index 0000000000..577ebf4d81
--- /dev/null
+++ b/passport-facebook-token/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "passport-facebook-token-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/passport-facebook/index.d.ts b/passport-facebook/index.d.ts
new file mode 100644
index 0000000000..f614c98b8d
--- /dev/null
+++ b/passport-facebook/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for passport-facebook 1.0.3
+// Project: https://github.com/jaredhanson/passport-facebook
+// Definitions by: James Roland Cabresos <https://github.com/staticfunction>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="passport"/>
+
+
+
+import passport = require('passport');
+import express = require('express');
+
+interface Profile extends passport.Profile {
+    gender: string;
+    profileUrl: string;
+    username: string;
+
+    _raw: string;
+    _json: any;
+}
+
+interface IStrategyOption {
+    clientID: string;
+    clientSecret: string;
+    callbackURL: string;
+
+    scopeSeparator?: string;
+    enableProof?: boolean;
+    profileFields?: string[];
+}
+
+declare class Strategy implements passport.Strategy {
+    constructor(options: IStrategyOption,
+        verify: (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
+    name: string;
+    authenticate: (req: express.Request, options?: Object) => void;
+}
diff --git a/passport-facebook/passport-facebook-tests.ts b/passport-facebook/passport-facebook-tests.ts
index 8accf57c07..d8d781ff19 100644
--- a/passport-facebook/passport-facebook-tests.ts
+++ b/passport-facebook/passport-facebook-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./passport-facebook.d.ts" />
 
 /**
  * Created by jcabresos on 4/19/2014.
diff --git a/passport-facebook/passport-facebook.d.ts b/passport-facebook/passport-facebook.d.ts
deleted file mode 100644
index 059c3253cd..0000000000
--- a/passport-facebook/passport-facebook.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// Type definitions for passport-facebook 1.0.3
-// Project: https://github.com/jaredhanson/passport-facebook
-// Definitions by: James Roland Cabresos <https://github.com/staticfunction>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../passport/passport.d.ts"/>
-
-declare module 'passport-facebook' {
-
-    import passport = require('passport');
-    import express = require('express');
-
-    interface Profile extends passport.Profile {
-        gender: string;
-        profileUrl: string;
-        username: string;
-
-        _raw: string;
-        _json: any;
-    }
-
-    interface IStrategyOption {
-        clientID: string;
-        clientSecret: string;
-        callbackURL: string;
-
-        scopeSeparator?: string;
-        enableProof?: boolean;
-        profileFields?: string[];
-    }
-
-    class Strategy implements passport.Strategy {
-        constructor(options: IStrategyOption,
-                    verify: (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
-        name: string;
-        authenticate: (req: express.Request, options?: Object) => void;
-    }
-}
diff --git a/passport-facebook/tsconfig.json b/passport-facebook/tsconfig.json
new file mode 100644
index 0000000000..2173024e9d
--- /dev/null
+++ b/passport-facebook/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "passport-facebook-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/passport-google-oauth/index.d.ts b/passport-google-oauth/index.d.ts
new file mode 100644
index 0000000000..ca263d4095
--- /dev/null
+++ b/passport-google-oauth/index.d.ts
@@ -0,0 +1,62 @@
+// Type definitions for passport-facebook 1.0.3
+// Project: https://github.com/jaredhanson/passport-facebook
+// Definitions by: James Roland Cabresos <https://github.com/staticfunction>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="passport"/>
+
+
+
+import passport = require('passport');
+import express = require('express');
+
+interface Profile extends passport.Profile {
+    gender: string;
+
+    _raw: string;
+    _json: any;
+}
+
+interface IOAuthStrategyOption {
+    consumerKey: string;
+    consumerSecret: string;
+    callbackURL: string;
+
+    reguestTokenURL?: string;
+    accessTokenURL?: string;
+    userAuthorizationURL?: string;
+    sessionKey?: string;
+}
+
+declare class OAuthStrategy implements passport.Strategy {
+    constructor(options: IOAuthStrategyOption,
+        verify: (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
+    name: string;
+    authenticate: (req: express.Request, options?: Object) => void;
+}
+
+interface IOAuth2StrategyOption {
+    clientID: string;
+    clientSecret: string;
+    callbackURL: string;
+
+    authorizationURL?: string;
+    tokenURL?: string;
+
+    accessType?: string;
+    approval_prompt?: string;
+    prompt?: string;
+    loginHint?: string;
+    userID?: string;
+    hostedDomain?: string;
+    display?: string;
+    requestVisibleActions?: string;
+    openIDRealm?: string;
+}
+
+declare class OAuth2Strategy implements passport.Strategy {
+    constructor(options: IOAuth2StrategyOption,
+        verify: (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
+    name: string;
+    authenticate: (req: express.Request, options?: Object) => void;
+}
diff --git a/passport-google-oauth/passport-google-oauth-tests.ts b/passport-google-oauth/passport-google-oauth-tests.ts
index ef7a4e9ef9..d216df6e2c 100644
--- a/passport-google-oauth/passport-google-oauth-tests.ts
+++ b/passport-google-oauth/passport-google-oauth-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./passport-google-oauth.d.ts" />
 
 /**
  * Created by jcabresos on 4/19/2014.
diff --git a/passport-google-oauth/passport-google-oauth.d.ts b/passport-google-oauth/passport-google-oauth.d.ts
deleted file mode 100644
index 11645c4411..0000000000
--- a/passport-google-oauth/passport-google-oauth.d.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-// Type definitions for passport-facebook 1.0.3
-// Project: https://github.com/jaredhanson/passport-facebook
-// Definitions by: James Roland Cabresos <https://github.com/staticfunction>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../passport/passport.d.ts"/>
-
-declare module 'passport-google-oauth' {
-
-    import passport = require('passport');
-    import express = require('express');
-
-    interface Profile extends passport.Profile {
-        gender: string;
-
-        _raw: string;
-        _json: any;
-    }
-
-    interface IOAuthStrategyOption {
-        consumerKey: string;
-        consumerSecret: string;
-        callbackURL: string;
-
-        reguestTokenURL?: string;
-        accessTokenURL?: string;
-        userAuthorizationURL?: string;
-        sessionKey?: string;
-    }
-
-    class OAuthStrategy implements passport.Strategy {
-        constructor(options: IOAuthStrategyOption,
-                    verify: (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
-        name: string;
-        authenticate: (req: express.Request, options?: Object) => void;
-    }
-
-    interface IOAuth2StrategyOption {
-        clientID: string;
-        clientSecret: string;
-        callbackURL: string;
-
-        authorizationURL?: string;
-        tokenURL?: string;
-
-        accessType?: string;
-        approval_prompt?: string;
-        prompt?: string;
-        loginHint?: string;
-        userID?: string;
-        hostedDomain?: string;
-        display?: string;
-        requestVisibleActions?: string;
-        openIDRealm?: string;
-    }
-
-    class OAuth2Strategy implements passport.Strategy {
-        constructor(options: IOAuth2StrategyOption,
-                    verify: (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
-        name: string;
-        authenticate: (req: express.Request, options?: Object) => void;
-    }
-}
diff --git a/passport-google-oauth/tsconfig.json b/passport-google-oauth/tsconfig.json
new file mode 100644
index 0000000000..b4232e3305
--- /dev/null
+++ b/passport-google-oauth/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "passport-google-oauth-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/passport-http-bearer/index.d.ts b/passport-http-bearer/index.d.ts
new file mode 100644
index 0000000000..4c720554fc
--- /dev/null
+++ b/passport-http-bearer/index.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for passport-http-bearer 1.0.1
+// Project: https://github.com/jaredhanson/passport-http-bearer
+// Definitions by: Isman Usoh <https://github.com/isman-usoh>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="passport"/>
+
+import passport = require("passport");
+import express = require("../express");
+
+interface IStrategyOptions {
+    scope: string | Array<string>;
+    realm: string;
+    passReqToCallback: boolean;
+}
+interface IVerifyOptions {
+    message: string;
+    scope: string | Array<string>;
+}
+
+interface VerifyFunction {
+    (token: string, done: (error: any, user?: any, options?: IVerifyOptions | string) => void): void;
+}
+
+interface VerifyFunctionWithRequest {
+    (req: express.Request, token: string, done: (error: any, user?: any, options?: IVerifyOptions | string) => void): void;
+}
+
+declare class Strategy implements passport.Strategy {
+    constructor(verify: VerifyFunction);
+    constructor(options: IStrategyOptions, verify: VerifyFunction);
+    constructor(options: IStrategyOptions, verify: VerifyFunctionWithRequest);
+
+    name: string;
+    authenticate: (req: express.Request, options?: Object) => void;
+}
diff --git a/passport-http-bearer/passport-http-bearer-tests.ts b/passport-http-bearer/passport-http-bearer-tests.ts
index b776bbbbd7..7b7407b48c 100644
--- a/passport-http-bearer/passport-http-bearer-tests.ts
+++ b/passport-http-bearer/passport-http-bearer-tests.ts
@@ -1,10 +1,8 @@
-/// <reference path="./passport-http-bearer.d.ts"/>
-
 /**
  * Created by Isman Usoh <https://github.com/isman-usoh>.
  */
 
-import express = require("express");
+import express = require("../express");
 import passport = require("passport");
 import httpBearer = require("passport-http-bearer");
 
diff --git a/passport-http-bearer/passport-http-bearer.d.ts b/passport-http-bearer/passport-http-bearer.d.ts
deleted file mode 100644
index cb02742b8d..0000000000
--- a/passport-http-bearer/passport-http-bearer.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// Type definitions for passport-http-bearer 1.0.1
-// Project: https://github.com/jaredhanson/passport-http-bearer
-// Definitions by: Isman Usoh <https://github.com/isman-usoh>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../passport/passport.d.ts"/>
-/// <reference path="../express/express.d.ts"/>
-
-declare module "passport-http-bearer" {
-
-    import passport = require("passport");
-    import express = require("express");
-
-    interface IStrategyOptions {
-        scope: string | Array<string>;
-        realm: string;
-        passReqToCallback: boolean;
-    }
-    interface IVerifyOptions {
-        message: string;
-        scope: string | Array<string>;
-    }
-
-    interface VerifyFunction {
-        (token: string, done: (error: any, user?: any, options?: IVerifyOptions | string) => void): void;
-    }
-
-    interface VerifyFunctionWithRequest {
-        (req: express.Request, token: string, done: (error: any, user?: any, options?: IVerifyOptions | string) => void): void;
-    }
-
-    class Strategy implements passport.Strategy {
-        constructor(verify: VerifyFunction);
-        constructor(options: IStrategyOptions, verify: VerifyFunction);
-        constructor(options: IStrategyOptions, verify: VerifyFunctionWithRequest);
-
-        name: string;
-        authenticate: (req: express.Request, options?: Object) => void;
-    }
-}
diff --git a/passport-http-bearer/tsconfig.json b/passport-http-bearer/tsconfig.json
new file mode 100644
index 0000000000..bbe01010c6
--- /dev/null
+++ b/passport-http-bearer/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "passport-http-bearer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/passport-jwt/index.d.ts b/passport-jwt/index.d.ts
new file mode 100644
index 0000000000..e73bc89391
--- /dev/null
+++ b/passport-jwt/index.d.ts
@@ -0,0 +1,46 @@
+// Type definitions for passport-jwt 2.0
+// Project: https://github.com/themikenicholson/passport-jwt
+// Definitions by: TANAKA Koichi <https://github.com/mugeso/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import {Strategy as PassportStrategy} from 'passport-strategy';
+import {Request} from 'express';
+
+export declare class Strategy extends PassportStrategy {
+    constructor(opt: StrategyOptions, verify: VerifyCallback);
+    constructor(opt: StrategyOptions, verify: VerifyCallbackWithRequest);
+}
+
+export interface StrategyOptions {
+    secretOrKey: string;
+    jwtFromRequest: JwtFromRequestFunction;
+    issuer?: string;
+    audience?: string;
+    algorithms?: string[];
+    ignoreExpiration?: boolean;
+    passReqToCallback?: boolean;
+}
+
+export interface VerifyCallback {
+    (payload: any, done: VerifiedCallback): void;
+}
+
+export interface VerifyCallbackWithRequest {
+    (req: Request, payload: any, done: VerifiedCallback): void;
+}
+
+export interface VerifiedCallback {
+    (error: any, user?: any, info?: any): void;
+}
+
+export interface JwtFromRequestFunction {
+    (req: Request): string;
+}
+
+export declare namespace ExtractJwt {
+    export function fromHeader(header_name: string): JwtFromRequestFunction;
+    export function fromBodyField(field_name: string): JwtFromRequestFunction;
+    export function fromUrlQueryParameter(param_name: string): JwtFromRequestFunction;
+    export function fromAuthHeaderWithScheme(auth_scheme: string): JwtFromRequestFunction;
+    export function fromAuthHeader(): JwtFromRequestFunction;
+}
diff --git a/passport-jwt/passport-jwt-tests.ts b/passport-jwt/passport-jwt-tests.ts
index ea173f3e07..c8989af54d 100644
--- a/passport-jwt/passport-jwt-tests.ts
+++ b/passport-jwt/passport-jwt-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="passport-jwt.d.ts" />
-/// <reference path="../passport/passport.d.ts" />
+
+/// <reference types="passport" />
 'use strict';
 
 import {Strategy as JwtStrategy, ExtractJwt, StrategyOptions} from 'passport-jwt';
diff --git a/passport-jwt/passport-jwt.d.ts b/passport-jwt/passport-jwt.d.ts
deleted file mode 100644
index 9f6d91cc41..0000000000
--- a/passport-jwt/passport-jwt.d.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-// Type definitions for passport-jwt 2.0
-// Project: https://github.com/themikenicholson/passport-jwt
-// Definitions by: TANAKA Koichi <https://github.com/mugeso/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/// <reference path="../passport-strategy/passport-strategy.d.ts" />
-/// <reference path="../express/express.d.ts" />
-
-declare module 'passport-jwt' {
-    import {Strategy as PassportStrategy} from 'passport-strategy';
-    import {Request} from 'express';
-
-    export class Strategy extends PassportStrategy {
-        constructor(opt: StrategyOptions, verify: VerifyCallback);
-        constructor(opt: StrategyOptions, verify: VerifyCallbackWithRequest);
-    }
-
-    export interface StrategyOptions {
-        secretOrKey: string;
-        jwtFromRequest: JwtFromRequestFunction;
-        issuer?: string;
-        audience?: string;
-        algorithms?: string[];
-        ignoreExpiration?: boolean;
-        passReqToCallback?: boolean;
-    }
-
-    export interface VerifyCallback {
-        (payload: any, done: VerifiedCallback): void;
-    }
-
-    export interface VerifyCallbackWithRequest {
-        (req: Request, payload: any, done: VerifiedCallback): void;
-    }
-
-    export interface VerifiedCallback {
-        (error: any, user?: any, info?: any): void;
-    }
-
-    export interface JwtFromRequestFunction {
-        (req: Request): string;
-    }
-
-    export namespace ExtractJwt {
-        export function fromHeader(header_name: string): JwtFromRequestFunction;
-        export function fromBodyField(field_name: string): JwtFromRequestFunction;
-        export function fromUrlQueryParameter(param_name: string): JwtFromRequestFunction;
-        export function fromAuthHeaderWithScheme(auth_scheme: string): JwtFromRequestFunction;
-        export function fromAuthHeader(): JwtFromRequestFunction;
-    }
-}
diff --git a/passport-jwt/tsconfig.json b/passport-jwt/tsconfig.json
new file mode 100644
index 0000000000..54c3285dd8
--- /dev/null
+++ b/passport-jwt/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "passport-jwt-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/passport-local/index.d.ts b/passport-local/index.d.ts
new file mode 100644
index 0000000000..d711b086e6
--- /dev/null
+++ b/passport-local/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for passport-local 1.0.0
+// Project: https://github.com/jaredhanson/passport-local
+// Definitions by: Maxime LUCE <https://github.com/SomaticIT>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="passport"/>
+
+
+
+import passport = require('passport');
+import express = require('express');
+
+interface IStrategyOptions {
+    usernameField?: string;
+    passwordField?: string;
+    passReqToCallback?: boolean;
+}
+
+interface IStrategyOptionsWithRequest {
+    usernameField?: string;
+    passwordField?: string;
+    passReqToCallback: boolean;
+}
+
+interface IVerifyOptions {
+    message: string;
+}
+
+interface VerifyFunctionWithRequest {
+    (req: express.Request, username: string, password: string, done: (error: any, user?: any, options?: IVerifyOptions) => void): void;
+}
+
+interface VerifyFunction {
+    (username: string, password: string, done: (error: any, user?: any, options?: IVerifyOptions) => void): void;
+}
+
+declare class Strategy implements passport.Strategy {
+    constructor(options: IStrategyOptionsWithRequest, verify: VerifyFunctionWithRequest);
+    constructor(options: IStrategyOptions, verify: VerifyFunction);
+    constructor(verify: VerifyFunction);
+
+    name: string;
+    authenticate: (req: express.Request, options?: Object) => void;
+}
diff --git a/passport-local/passport-local-tests.ts b/passport-local/passport-local-tests.ts
index 68056db49b..c4ea2fac2c 100644
--- a/passport-local/passport-local-tests.ts
+++ b/passport-local/passport-local-tests.ts
@@ -1,10 +1,9 @@
-/// <reference path="./passport-local.d.ts" />
 
 /**
  * Created by Maxime LUCE <https://github.com/SomaticIT>.
  */
 
-import express = require("express");
+import express = require("../express");
 import passport = require('passport');
 import local = require('passport-local');
 
diff --git a/passport-local/passport-local.d.ts b/passport-local/passport-local.d.ts
deleted file mode 100644
index b230af34cf..0000000000
--- a/passport-local/passport-local.d.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-// Type definitions for passport-local 1.0.0
-// Project: https://github.com/jaredhanson/passport-local
-// Definitions by: Maxime LUCE <https://github.com/SomaticIT>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../passport/passport.d.ts"/>
-
-declare module 'passport-local' {
-
-    import passport = require('passport');
-    import express = require('express');
-
-    interface IStrategyOptions {
-        usernameField?: string;
-        passwordField?: string;
-        passReqToCallback?: boolean;
-    }
-
-    interface IStrategyOptionsWithRequest {
-        usernameField?: string;
-        passwordField?: string;
-        passReqToCallback: boolean;
-    }
-
-    interface IVerifyOptions {
-        message: string;
-    }
-
-    interface VerifyFunctionWithRequest {
-        (req: express.Request, username: string, password: string, done: (error: any, user?: any, options?: IVerifyOptions) => void): void;
-    }
-
-    interface VerifyFunction {
-        (username: string, password: string, done: (error: any, user?: any, options?: IVerifyOptions) => void): void;
-    }
-
-    class Strategy implements passport.Strategy {
-        constructor(options: IStrategyOptionsWithRequest, verify: VerifyFunctionWithRequest);
-        constructor(options: IStrategyOptions, verify: VerifyFunction);
-        constructor(verify: VerifyFunction);
-
-        name: string;
-        authenticate: (req: express.Request, options?: Object) => void;
-    }
-}
diff --git a/passport-local/tsconfig.json b/passport-local/tsconfig.json
new file mode 100644
index 0000000000..acc167c398
--- /dev/null
+++ b/passport-local/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "passport-local-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/passport-strategy/index.d.ts b/passport-strategy/index.d.ts
new file mode 100644
index 0000000000..5e48ce24f8
--- /dev/null
+++ b/passport-strategy/index.d.ts
@@ -0,0 +1,96 @@
+// Type definitions for Passport Strategy module v0.2.0
+// Project: https://github.com/jaredhanson/passport-strategy
+// Definitions by: Lior Mualem <https://github.com/liorm/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="passport"/>
+
+/**
+ * Using this module, one can easily implement a strategy using typescript by
+ * inheriting the 'Strategy' class and reimplementing the 'authenticate' method.
+ */
+
+
+
+import passport = require('passport');
+import express = require('../express');
+
+declare class Strategy implements passport.Strategy {
+    /**
+     * Performs authentication for the request.
+     * Note: Virtual function - re-implement in the strategy.
+     * @param req The request to authenticate.
+     * @param options Options passed to the strategy.
+     */
+    authenticate(req: express.Request, options?: any): void;
+
+    //
+    // Augmented strategy functions.
+    // These are available only from the 'authenticate' function.
+    // They are added manually by the passport framework.
+    //
+
+    /**
+     * Authenticate `user`, with optional `info`.
+     *
+     * Strategies should call this function to successfully authenticate a
+     * user.  `user` should be an object supplied by the application after it
+     * has been given an opportunity to verify credentials.  `info` is an
+     * optional argument containing additional user information.  This is
+     * useful for third-party authentication strategies to pass profile
+     * details.
+     *
+     * @param {Object} user
+     * @param {Object} info
+     * @api public
+     */
+    success(user: any, info: any): void;
+
+    /**
+     * Fail authentication, with optional `challenge` and `status`, defaulting
+     * to 401.
+     *
+     * Strategies should call this function to fail an authentication attempt.
+     *
+     * @param {String} challenge (Can also be an object with 'message' and 'type' fields).
+     * @param {Number} status
+     * @api public
+     */
+    fail(challenge: any, status: number): void;
+    fail(status: number): void;
+
+    /**
+     * Redirect to `url` with optional `status`, defaulting to 302.
+     *
+     * Strategies should call this function to redirect the user (via their
+     * user agent) to a third-party website for authentication.
+     *
+     * @param {String} url
+     * @param {Number} status
+     * @api public
+     */
+    redirect(url: string, status?: number): void;
+
+    /**
+     * Pass without making a success or fail decision.
+     *
+     * Under most circumstances, Strategies should not need to call this
+     * function.  It exists primarily to allow previous authentication state
+     * to be restored, for example from an HTTP session.
+     *
+     * @api public
+     */
+    pass(): void;
+
+    /**
+     * Internal error while performing authentication.
+     *
+     * Strategies should call this function when an internal error occurs
+     * during the process of performing authentication; for example, if the
+     * user directory is not available.
+     *
+     * @param {Error} err
+     * @api public
+     */
+    error(err: Error): void;
+}
diff --git a/passport-strategy/passport-strategy-tests.ts b/passport-strategy/passport-strategy-tests.ts
index ad5a9a38d3..e9c6fd604f 100644
--- a/passport-strategy/passport-strategy-tests.ts
+++ b/passport-strategy/passport-strategy-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./passport-strategy.d.ts" />
 
 import express = require('express');
 import passport = require('passport-strategy');
diff --git a/passport-strategy/passport-strategy.d.ts b/passport-strategy/passport-strategy.d.ts
deleted file mode 100644
index 0a83017e14..0000000000
--- a/passport-strategy/passport-strategy.d.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-// Type definitions for Passport Strategy module v0.2.0
-// Project: https://github.com/jaredhanson/passport-strategy
-// Definitions by: Lior Mualem <https://github.com/liorm/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts"/>
-/// <reference path="../passport/passport.d.ts"/>
-
-/**
- * Using this module, one can easily implement a strategy using typescript by
- * inheriting the 'Strategy' class and reimplementing the 'authenticate' method.
- */
-
-declare module 'passport-strategy' {
-
-    import passport = require('passport');
-    import express = require('express');
-
-    class Strategy implements passport.Strategy {
-        /**
-         * Performs authentication for the request.
-         * Note: Virtual function - re-implement in the strategy.
-         * @param req The request to authenticate.
-         * @param options Options passed to the strategy.
-         */
-        authenticate(req: express.Request, options?: any): void;
-
-        //
-        // Augmented strategy functions.
-        // These are available only from the 'authenticate' function.
-        // They are added manually by the passport framework.
-        //
-
-        /**
-         * Authenticate `user`, with optional `info`.
-         *
-         * Strategies should call this function to successfully authenticate a
-         * user.  `user` should be an object supplied by the application after it
-         * has been given an opportunity to verify credentials.  `info` is an
-         * optional argument containing additional user information.  This is
-         * useful for third-party authentication strategies to pass profile
-         * details.
-         *
-         * @param {Object} user
-         * @param {Object} info
-         * @api public
-         */
-        success(user: any, info: any): void;
-
-        /**
-         * Fail authentication, with optional `challenge` and `status`, defaulting
-         * to 401.
-         *
-         * Strategies should call this function to fail an authentication attempt.
-         *
-         * @param {String} challenge (Can also be an object with 'message' and 'type' fields).
-         * @param {Number} status
-         * @api public
-         */
-        fail(challenge: any, status: number): void;
-        fail(status: number): void;
-
-        /**
-         * Redirect to `url` with optional `status`, defaulting to 302.
-         *
-         * Strategies should call this function to redirect the user (via their
-         * user agent) to a third-party website for authentication.
-         *
-         * @param {String} url
-         * @param {Number} status
-         * @api public
-         */
-        redirect(url: string, status?: number): void;
-
-        /**
-         * Pass without making a success or fail decision.
-         *
-         * Under most circumstances, Strategies should not need to call this
-         * function.  It exists primarily to allow previous authentication state
-         * to be restored, for example from an HTTP session.
-         *
-         * @api public
-         */
-        pass(): void;
-
-        /**
-         * Internal error while performing authentication.
-         *
-         * Strategies should call this function when an internal error occurs
-         * during the process of performing authentication; for example, if the
-         * user directory is not available.
-         *
-         * @param {Error} err
-         * @api public
-         */
-        error(err: Error): void;
-    }
-}
diff --git a/passport-strategy/tsconfig.json b/passport-strategy/tsconfig.json
new file mode 100644
index 0000000000..2564a50487
--- /dev/null
+++ b/passport-strategy/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "passport-strategy-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/passport-twitter/index.d.ts b/passport-twitter/index.d.ts
new file mode 100644
index 0000000000..ee0ad9ea4b
--- /dev/null
+++ b/passport-twitter/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for passport-facebook 1.0.3
+// Project: https://github.com/jaredhanson/passport-facebook
+// Definitions by: James Roland Cabresos <https://github.com/staticfunction>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="passport"/>
+
+
+
+import passport = require('passport');
+import express = require('express');
+
+interface Profile extends passport.Profile {
+    gender: string;
+    username: string;
+
+    _raw: string;
+    _json: any;
+    _accessLevel: string;
+}
+
+interface IStrategyOption {
+    consumerKey: string;
+    consumerSecret: string;
+    callbackURL: string;
+
+    reguestTokenURL?: string;
+    accessTokenURL?: string;
+    userAuthorizationURL?: string;
+    sessionKey?: string;
+
+    userProfileURL?: string;
+    skipExtendedUserProfile?: boolean;
+}
+
+declare class Strategy implements passport.Strategy {
+    constructor(options: IStrategyOption,
+        verify: (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
+    name: string;
+    authenticate: (req: express.Request, options?: Object) => void;
+}
diff --git a/passport-twitter/passport-twitter-tests.ts b/passport-twitter/passport-twitter-tests.ts
index f7d539f16b..815d490610 100644
--- a/passport-twitter/passport-twitter-tests.ts
+++ b/passport-twitter/passport-twitter-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./passport-twitter.d.ts" />
 
 /**
  * Created by jcabresos on 4/19/2014.
diff --git a/passport-twitter/passport-twitter.d.ts b/passport-twitter/passport-twitter.d.ts
deleted file mode 100644
index c128ef5ab0..0000000000
--- a/passport-twitter/passport-twitter.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// Type definitions for passport-facebook 1.0.3
-// Project: https://github.com/jaredhanson/passport-facebook
-// Definitions by: James Roland Cabresos <https://github.com/staticfunction>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../passport/passport.d.ts"/>
-
-declare module 'passport-twitter' {
-
-    import passport = require('passport');
-    import express = require('express');
-
-    interface Profile extends passport.Profile {
-        gender: string;
-        username: string;
-
-        _raw: string;
-        _json: any;
-        _accessLevel: string;
-    }
-
-    interface IStrategyOption {
-        consumerKey: string;
-        consumerSecret: string;
-        callbackURL: string;
-
-        reguestTokenURL?: string;
-        accessTokenURL?: string;
-        userAuthorizationURL?: string;
-        sessionKey?: string;
-
-        userProfileURL?: string;
-        skipExtendedUserProfile?: boolean;
-    }
-
-    class Strategy implements passport.Strategy {
-        constructor(options: IStrategyOption,
-                    verify: (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
-        name: string;
-        authenticate: (req: express.Request, options?: Object) => void;
-    }
-}
diff --git a/passport-twitter/tsconfig.json b/passport-twitter/tsconfig.json
new file mode 100644
index 0000000000..936f24a1a0
--- /dev/null
+++ b/passport-twitter/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "passport-twitter-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/passport/index.d.ts b/passport/index.d.ts
new file mode 100644
index 0000000000..de0d4d8e03
--- /dev/null
+++ b/passport/index.d.ts
@@ -0,0 +1,92 @@
+// Type definitions for Passport v0.2.0
+// Project: http://passportjs.org
+// Definitions by: Horiuchi_H <https://github.com/horiuchi/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare namespace Express {
+    export interface Request {
+        authInfo?: any;
+
+        // These declarations are merged into express's Request type
+        login(user: any, done: (err: any) => void): void;
+        login(user: any, options: Object, done: (err: any) => void): void;
+        logIn(user: any, done: (err: any) => void): void;
+        logIn(user: any, options: Object, done: (err: any) => void): void;
+
+        logout(): void;
+        logOut(): void;
+
+        isAuthenticated(): boolean;
+        isUnauthenticated(): boolean;
+    }
+}
+
+declare module 'passport' {
+    import express = require('express');
+
+    function use(strategy: Strategy): Passport;
+    function use(name: string, strategy: Strategy): Passport;
+    function unuse(name: string): Passport;
+    function framework(fw: string): Passport;
+    function initialize(options?: { userProperty: string; }): express.Handler;
+    function session(options?: { pauseStream: boolean; }): express.Handler;
+
+    function authenticate(strategy: string, callback?: Function): express.Handler;
+    function authenticate(strategy: string, options: Object, callback?: Function): express.Handler;
+    function authenticate(strategies: string[], callback?: Function): express.Handler;
+    function authenticate(strategies: string[], options: Object, callback?: Function): express.Handler;
+    function authorize(strategy: string, callback?: Function): express.Handler;
+    function authorize(strategy: string, options: Object, callback?: Function): express.Handler;
+    function authorize(strategies: string[], callback?: Function): express.Handler;
+    function authorize(strategies: string[], options: Object, callback?: Function): express.Handler;
+    function serializeUser(fn: (user: any, done: (err: any, id: any) => void) => void): void;
+    function deserializeUser(fn: (id: any, done: (err: any, user: any) => void) => void): void;
+    function transformAuthInfo(fn: (info: any, done: (err: any, info: any) => void) => void): void;
+
+    interface Passport {
+        use(strategy: Strategy): Passport;
+        use(name: string, strategy: Strategy): Passport;
+        unuse(name: string): Passport;
+        framework(fw: string): Passport;
+        initialize(options?: { userProperty: string; }): express.Handler;
+        session(options?: { pauseStream: boolean; }): express.Handler;
+
+        authenticate(strategy: string, callback?: Function): express.Handler;
+        authenticate(strategy: string, options: Object, callback?: Function): express.Handler;
+        authenticate(strategies: string[], callback?: Function): express.Handler;
+        authenticate(strategies: string[], options: Object, callback?: Function): express.Handler;
+        authorize(strategy: string, callback?: Function): express.Handler;
+        authorize(strategy: string, options: Object, callback?: Function): express.Handler;
+        authorize(strategies: string[], callback?: Function): express.Handler;
+        authorize(strategies: string[], options: Object, callback?: Function): express.Handler;
+        serializeUser(fn: (user: any, done: (err: any, id: any) => void) => void): void;
+        deserializeUser(fn: (id: any, done: (err: any, user: any) => void) => void): void;
+        transformAuthInfo(fn: (info: any, done: (err: any, info: any) => void) => void): void;
+    }
+
+    interface Strategy {
+        name?: string;
+        authenticate(req: express.Request, options?: Object): void;
+    }
+
+    interface Profile {
+        provider: string;
+        id: string;
+        displayName: string;
+        name? : {
+            familyName: string;
+            givenName: string;
+            middleName?: string;
+        };
+        emails?: {
+            value: string;
+            type?: string;
+        }[];
+        photos?: {
+            value: string;
+        }[];
+    }
+}
+
diff --git a/passport/passport-tests.ts b/passport/passport-tests.ts
index 423d925b4c..89e7c6ad8d 100644
--- a/passport/passport-tests.ts
+++ b/passport/passport-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="passport.d.ts" />
-/// <reference path="../express/express.d.ts" />
-/// <reference path="../express-session/express-session.d.ts" />
+
+
+/// <reference types="express-session" />
 
 import express = require('express');
 import passport = require('passport');
diff --git a/passport/passport.d.ts b/passport/passport.d.ts
deleted file mode 100644
index c49299daa1..0000000000
--- a/passport/passport.d.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-// Type definitions for Passport v0.2.0
-// Project: http://passportjs.org
-// Definitions by: Horiuchi_H <https://github.com/horiuchi/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare namespace Express {
-    export interface Request {
-        authInfo?: any;
-
-        // These declarations are merged into express's Request type
-        login(user: any, done: (err: any) => void): void;
-        login(user: any, options: Object, done: (err: any) => void): void;
-        logIn(user: any, done: (err: any) => void): void;
-        logIn(user: any, options: Object, done: (err: any) => void): void;
-
-        logout(): void;
-        logOut(): void;
-
-        isAuthenticated(): boolean;
-        isUnauthenticated(): boolean;
-    }
-}
-
-declare module 'passport' {
-    import express = require('express');
-
-    function use(strategy: Strategy): Passport;
-    function use(name: string, strategy: Strategy): Passport;
-    function unuse(name: string): Passport;
-    function framework(fw: string): Passport;
-    function initialize(options?: { userProperty: string; }): express.Handler;
-    function session(options?: { pauseStream: boolean; }): express.Handler;
-
-    function authenticate(strategy: string, callback?: Function): express.Handler;
-    function authenticate(strategy: string, options: Object, callback?: Function): express.Handler;
-    function authenticate(strategies: string[], callback?: Function): express.Handler;
-    function authenticate(strategies: string[], options: Object, callback?: Function): express.Handler;
-    function authorize(strategy: string, callback?: Function): express.Handler;
-    function authorize(strategy: string, options: Object, callback?: Function): express.Handler;
-    function authorize(strategies: string[], callback?: Function): express.Handler;
-    function authorize(strategies: string[], options: Object, callback?: Function): express.Handler;
-    function serializeUser(fn: (user: any, done: (err: any, id: any) => void) => void): void;
-    function deserializeUser(fn: (id: any, done: (err: any, user: any) => void) => void): void;
-    function transformAuthInfo(fn: (info: any, done: (err: any, info: any) => void) => void): void;
-
-    interface Passport {
-        use(strategy: Strategy): Passport;
-        use(name: string, strategy: Strategy): Passport;
-        unuse(name: string): Passport;
-        framework(fw: string): Passport;
-        initialize(options?: { userProperty: string; }): express.Handler;
-        session(options?: { pauseStream: boolean; }): express.Handler;
-
-        authenticate(strategy: string, callback?: Function): express.Handler;
-        authenticate(strategy: string, options: Object, callback?: Function): express.Handler;
-        authenticate(strategies: string[], callback?: Function): express.Handler;
-        authenticate(strategies: string[], options: Object, callback?: Function): express.Handler;
-        authorize(strategy: string, callback?: Function): express.Handler;
-        authorize(strategy: string, options: Object, callback?: Function): express.Handler;
-        authorize(strategies: string[], callback?: Function): express.Handler;
-        authorize(strategies: string[], options: Object, callback?: Function): express.Handler;
-        serializeUser(fn: (user: any, done: (err: any, id: any) => void) => void): void;
-        deserializeUser(fn: (id: any, done: (err: any, user: any) => void) => void): void;
-        transformAuthInfo(fn: (info: any, done: (err: any, info: any) => void) => void): void;
-    }
-
-    interface Strategy {
-        name?: string;
-        authenticate(req: express.Request, options?: Object): void;
-    }
-
-    interface Profile {
-        provider: string;
-        id: string;
-        displayName: string;
-        name? : {
-            familyName: string;
-            givenName: string;
-            middleName?: string;
-        };
-        emails?: {
-            value: string;
-            type?: string;
-        }[];
-        photos?: {
-            value: string;
-        }[];
-    }
-}
-
diff --git a/passport/tsconfig.json b/passport/tsconfig.json
new file mode 100644
index 0000000000..5ab74d0737
--- /dev/null
+++ b/passport/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "passport-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/password-hash/index.d.ts b/password-hash/index.d.ts
new file mode 100644
index 0000000000..7388f82c39
--- /dev/null
+++ b/password-hash/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for password-hash 1.2.x
+// Project: https://github.com/davidwood/node-password-hash
+// Definitions by: TANAKA Koichi <https://github.com/mugeso/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export declare function generate(password: string, options?: Options): string;
+export declare function verify(password: string, hashedPassword: string): boolean;
+export declare function isHashed(password: string): boolean;
+
+export interface Options {
+    algorithm?: string;
+    saltLength?: number;
+    iterations?: number;
+}
diff --git a/password-hash/password-hash-tests.ts b/password-hash/password-hash-tests.ts
index a36db4e8b4..92f7a93f17 100644
--- a/password-hash/password-hash-tests.ts
+++ b/password-hash/password-hash-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="password-hash.d.ts" />
+
 'use strict';
 
 import {generate, verify, isHashed} from 'password-hash';
diff --git a/password-hash/password-hash.d.ts b/password-hash/password-hash.d.ts
deleted file mode 100644
index d2a90abdb2..0000000000
--- a/password-hash/password-hash.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Type definitions for password-hash 1.2.x
-// Project: https://github.com/davidwood/node-password-hash
-// Definitions by: TANAKA Koichi <https://github.com/mugeso/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'password-hash' {
-    export function generate(password: string, options?: Options): string;
-    export function verify(password: string, hashedPassword: string): boolean;
-    export function isHashed(password: string): boolean;
-
-    export interface Options {
-        algorithm?: string;
-        saltLength?: number;
-        iterations?: number;
-    }
-}
diff --git a/password-hash/tsconfig.json b/password-hash/tsconfig.json
new file mode 100644
index 0000000000..d6756e2e7c
--- /dev/null
+++ b/password-hash/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "password-hash-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/path-case/index.d.ts b/path-case/index.d.ts
new file mode 100644
index 0000000000..246dcbb038
--- /dev/null
+++ b/path-case/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for path-case
+// Project: https://github.com/blakeembrey/path-case
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function pathCase(string: string, locale?: string): string;
+export = pathCase;
diff --git a/path-case/path-case-tests.ts b/path-case/path-case-tests.ts
index 8c17cbd44b..a7d30a5db8 100644
--- a/path-case/path-case-tests.ts
+++ b/path-case/path-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="path-case.d.ts" />
 
 import pathCase = require('path-case');
 
diff --git a/path-case/path-case.d.ts b/path-case/path-case.d.ts
deleted file mode 100644
index c3735c7dd9..0000000000
--- a/path-case/path-case.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for path-case
-// Project: https://github.com/blakeembrey/path-case
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "path-case" {
-	function pathCase(string: string, locale?: string): string;
-	export = pathCase;
-}
diff --git a/path-case/tsconfig.json b/path-case/tsconfig.json
new file mode 100644
index 0000000000..e1d2a7235f
--- /dev/null
+++ b/path-case/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "path-case-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/path-exists/index.d.ts b/path-exists/index.d.ts
new file mode 100644
index 0000000000..f82d5ba870
--- /dev/null
+++ b/path-exists/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for path-exists 1.0.0
+// Project: https://github.com/sindresorhus/path-exists
+// Definitions by: Shogo Iwano <https://github.com/shiwano>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface PathExists {
+    (path: string, callback: (error: Error, exists: boolean) => void): void;
+    sync(path: string): boolean;
+}
+
+declare var pathExists: PathExists;
+export = pathExists;
diff --git a/path-exists/path-exists-tests.ts b/path-exists/path-exists-tests.ts
index bb9bdc321e..69aeb2ecd4 100644
--- a/path-exists/path-exists-tests.ts
+++ b/path-exists/path-exists-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="path-exists.d.ts" />
 
 import pathExists = require("path-exists");
 
diff --git a/path-exists/path-exists.d.ts b/path-exists/path-exists.d.ts
deleted file mode 100644
index 90d4d0412c..0000000000
--- a/path-exists/path-exists.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// Type definitions for path-exists 1.0.0
-// Project: https://github.com/sindresorhus/path-exists
-// Definitions by: Shogo Iwano <https://github.com/shiwano>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "path-exists" {
-    interface PathExists {
-        (path: string, callback: (error: Error, exists: boolean) => void): void;
-        sync(path: string): boolean;
-    }
-
-    var pathExists: PathExists;
-    export = pathExists;
-}
diff --git a/path-exists/tsconfig.json b/path-exists/tsconfig.json
new file mode 100644
index 0000000000..cdde582e3d
--- /dev/null
+++ b/path-exists/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "path-exists-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/path-parse/index.d.ts b/path-parse/index.d.ts
new file mode 100644
index 0000000000..5aa151b921
--- /dev/null
+++ b/path-parse/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for path-parse v1.0.5
+// Project: https://github.com/jbgutierrez/path-parse
+// Definitions by: Dan Chao <http://dchao.co>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+import { ParsedPath } from "path";
+declare const parse: (src: string) => ParsedPath;
+export = parse;
diff --git a/path-parse/path-parse-tests.ts b/path-parse/path-parse-tests.ts
index 05c583ca31..da2b63f6b4 100644
--- a/path-parse/path-parse-tests.ts
+++ b/path-parse/path-parse-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./path-parse.d.ts"/>
-
 import * as parse from "path-parse";
 
 const parsed = parse("/foo/bar.img");
diff --git a/path-parse/path-parse.d.ts b/path-parse/path-parse.d.ts
deleted file mode 100644
index d25eff112b..0000000000
--- a/path-parse/path-parse.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for path-parse v1.0.5
-// Project: https://github.com/jbgutierrez/path-parse
-// Definitions by: Dan Chao <http://dchao.co>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare module "path-parse" {
-  import { ParsedPath } from "path";
-  const parse: (src: string) => ParsedPath;
-  export = parse;
-}
diff --git a/path-parse/tsconfig.json b/path-parse/tsconfig.json
new file mode 100644
index 0000000000..0b43d148ac
--- /dev/null
+++ b/path-parse/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "path-parse-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/path-to-regexp/index.d.ts b/path-to-regexp/index.d.ts
new file mode 100644
index 0000000000..3ca0d48fb0
--- /dev/null
+++ b/path-to-regexp/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for path-to-regexp v1.0.3
+// Project: https://github.com/pillarjs/path-to-regexp
+// Definitions by: xica <https://github.com/xica>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare function pathToRegexp(path: string, keys?: string[], options?: pathToRegexp.Options): RegExp;
+
+declare namespace pathToRegexp {
+
+    interface Options {
+        sensitive?: boolean;
+        strict?: boolean;
+        end?: boolean;
+    }
+
+}
+
+export = pathToRegexp;
diff --git a/path-to-regexp/path-to-regexp-tests.ts b/path-to-regexp/path-to-regexp-tests.ts
index ef622c6027..784016f225 100644
--- a/path-to-regexp/path-to-regexp-tests.ts
+++ b/path-to-regexp/path-to-regexp-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path='path-to-regexp.d.ts' />
 
 import pathToRegexp = require('path-to-regexp');
 
diff --git a/path-to-regexp/path-to-regexp.d.ts b/path-to-regexp/path-to-regexp.d.ts
deleted file mode 100644
index 3cf902b5c1..0000000000
--- a/path-to-regexp/path-to-regexp.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// Type definitions for path-to-regexp v1.0.3
-// Project: https://github.com/pillarjs/path-to-regexp
-// Definitions by: xica <https://github.com/xica>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "path-to-regexp" {
-
-    function pathToRegexp(path: string, keys?: string[], options?: pathToRegexp.Options): RegExp;
-
-    namespace pathToRegexp {
-
-        interface Options {
-            sensitive?: boolean;
-            strict?: boolean;
-            end?: boolean;
-        }
-
-    }
-
-    export = pathToRegexp;
-
-}
diff --git a/path-to-regexp/tsconfig.json b/path-to-regexp/tsconfig.json
new file mode 100644
index 0000000000..b3472104c3
--- /dev/null
+++ b/path-to-regexp/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "path-to-regexp-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pathjs/index.d.ts b/pathjs/index.d.ts
new file mode 100644
index 0000000000..6b6193b222
--- /dev/null
+++ b/pathjs/index.d.ts
@@ -0,0 +1,53 @@
+// Type definitions for Pathjs v0.8.4
+// Project: https://github.com/mtrpcic/pathjs
+// Definitions by: Lokesh Peta <https://github.com/lokeshpeta/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface IPathHistory{
+	initial: any;
+	pushState(state: any, title: string, path: string):void;
+	popState(event: any): void;	
+	listen(fallback: any): void;
+}
+
+interface IPathRoute{
+	to(fn: () => void): IPathRoute;
+	enter(fns: Function|Function[]): IPathRoute;
+	exit(fn: () => void): IPathRoute;
+	partition(): string[];
+	run():void;
+}
+
+interface IPathRoutes{
+	current: IPathRoute,
+    root: IPathRoute,
+	rescue: Function,
+	previous: IPathRoute,
+	defined: {}
+}
+
+interface IPathCore{
+	route(path: string): IPathRoute;
+}
+
+interface IPath {
+    map(path: string): IPathRoute;
+	
+	root(path: string): void;
+	
+	rescue(fn: Function): void;
+	
+	history: IPathHistory;
+	
+	match(path: string, parameterize: boolean): IPathRoute;
+	
+	dispatch(passed_route: string): void;
+	
+    listen(): void;
+	
+	core: IPathCore;
+	
+	routes: IPathRoutes
+}
+
+declare var Path: IPath;
diff --git a/pathjs/pathjs-tests.ts b/pathjs/pathjs-tests.ts
index 5ff4ce5da2..ffbc4842a0 100644
--- a/pathjs/pathjs-tests.ts
+++ b/pathjs/pathjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="pathjs.d.ts" />
+
 
 Path.map("/test/:id")
 .to(()=>{ });
diff --git a/pathjs/pathjs.d.ts b/pathjs/pathjs.d.ts
deleted file mode 100644
index dd81115df7..0000000000
--- a/pathjs/pathjs.d.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-// Type definitions for Pathjs v0.8.4
-// Project: https://github.com/mtrpcic/pathjs
-// Definitions by: Lokesh Peta <https://github.com/lokeshpeta/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface IPathHistory{
-	initial: any;
-	pushState(state: any, title: string, path: string):void;
-	popState(event: any): void;	
-	listen(fallback: any): void;
-}
-
-interface IPathRoute{
-	to(fn: () => void): IPathRoute;
-	enter(fns: Function|Function[]): IPathRoute;
-	exit(fn: () => void): IPathRoute;
-	partition(): string[];
-	run():void;
-}
-
-interface IPathRoutes{
-	current: IPathRoute,
-    root: IPathRoute,
-	rescue: Function,
-	previous: IPathRoute,
-	defined: {}
-}
-
-interface IPathCore{
-	route(path: string): IPathRoute;
-}
-
-interface IPath {
-    map(path: string): IPathRoute;
-	
-	root(path: string): void;
-	
-	rescure(fn: Function): void;
-	
-	history: IPathHistory;
-	
-	match(path: string, parameterize: boolean): IPathRoute;
-	
-	dispatch(passed_route: string): void;
-	
-    listen(): void;
-	
-	core: IPathCore;
-	
-	routes: IPathRoutes
-}
-
-declare var Path: IPath;
\ No newline at end of file
diff --git a/pathjs/tsconfig.json b/pathjs/tsconfig.json
new file mode 100644
index 0000000000..b2a4ccc8dc
--- /dev/null
+++ b/pathjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pathjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pathwatcher/index.d.ts b/pathwatcher/index.d.ts
new file mode 100644
index 0000000000..93aea6806b
--- /dev/null
+++ b/pathwatcher/index.d.ts
@@ -0,0 +1,88 @@
+// Type definitions for pathwatcher
+// Project: https://github.com/atom/node-pathwatcher
+// Definitions by: vvakame <https://github.com/vvakame/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+/// <reference types="Q" />
+
+declare namespace PathWatcher {
+	interface IFileStatic {
+		new (path:string, symlink?:boolean):IFile;
+	}
+
+	interface IFile {
+		realPath:string;
+		path:string;
+		symlink:boolean;
+		cachedContents:string;
+		digest:string;
+
+		handleEventSubscriptions():void;
+		setPath(path:string):void;
+		getPath():string;
+		getRealPathSync():string;
+		getBaseName():string;
+		write(text:string):void;
+		readSync(flushCache:boolean):string;
+		read(flushCache?:boolean):Q.Promise<string>;
+		// exists():boolean;
+		existsSync():boolean;
+		setDigest(contents:string):void;
+		getDigest():string;
+		writeFileWithPrivilegeEscalationSync (filePath:string, text:string):void;
+		handleNativeChangeEvent(eventType:string, eventPath:string):void;
+		detectResurrectionAfterDelay():void;
+		detectResurrection():void;
+		subscribeToNativeChangeEvents():void;
+		unsubscribeFromNativeChangeEvents():void;
+	}
+
+	interface IDirectoryStatic {
+		new (path:string, symlink?:boolean):IDirectory;
+	}
+
+	interface IDirectory {
+		realPath:string;
+		path:string;
+		symlink:boolean;
+
+		getBaseName():string;
+		getPath():void;
+		getRealPathSync():string;
+		contains(pathToCheck:string):boolean;
+		relativize(fullPath:string):string;
+		getEntriesSync():any[]; // return type are {File | Directory}[]
+		getEntries(callback:Function):void;
+		subscribeToNativeChangeEvents():void;
+		unsubscribeFromNativeChangeEvents():void;
+		isPathPrefixOf(prefix:string, fullPath:string):boolean;
+	}
+}
+
+import events = require("events");
+
+export interface IHandleWatcher extends events.EventEmitter {
+	onEvent(event:any, filePath:any, oldFilePath:any):any;
+	start():void;
+	closeIfNoListener():void;
+	close():void;
+}
+
+export interface IPathWatcher {
+	isWatchingParent:boolean;
+	path:any;
+	handleWatcher:IHandleWatcher;
+
+	close():void;
+}
+
+export function watch(path:string, callback:Function):IPathWatcher;
+
+export function closeAllWatchers():void;
+
+export function getWatchedPaths():string[];
+
+export var File:PathWatcher.IFileStatic;
+export var Directory:PathWatcher.IDirectoryStatic;
+
diff --git a/pathwatcher/pathwatcher-tests.ts b/pathwatcher/pathwatcher-tests.ts
index 4cefea3a76..0e080abbfd 100644
--- a/pathwatcher/pathwatcher-tests.ts
+++ b/pathwatcher/pathwatcher-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./pathwatcher.d.ts" />
+
 
 import pathwatcher = require("pathwatcher");
 var File = pathwatcher.File;
diff --git a/pathwatcher/pathwatcher.d.ts b/pathwatcher/pathwatcher.d.ts
deleted file mode 100644
index 19a63f81af..0000000000
--- a/pathwatcher/pathwatcher.d.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-// Type definitions for pathwatcher
-// Project: https://github.com/atom/node-pathwatcher
-// Definitions by: vvakame <https://github.com/vvakame/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../q/Q.d.ts" />
-
-declare namespace PathWatcher {
-	interface IFileStatic {
-		new (path:string, symlink?:boolean):IFile;
-	}
-
-	interface IFile {
-		realPath:string;
-		path:string;
-		symlink:boolean;
-		cachedContents:string;
-		digest:string;
-
-		handleEventSubscriptions():void;
-		setPath(path:string):void;
-		getPath():string;
-		getRealPathSync():string;
-		getBaseName():string;
-		write(text:string):void;
-		readSync(flushCache:boolean):string;
-		read(flushCache?:boolean):Q.Promise<string>;
-		// exists():boolean;
-		existsSync():boolean;
-		setDigest(contents:string):void;
-		getDigest():string;
-		writeFileWithPrivilegeEscalationSync (filePath:string, text:string):void;
-		handleNativeChangeEvent(eventType:string, eventPath:string):void;
-		detectResurrectionAfterDelay():void;
-		detectResurrection():void;
-		subscribeToNativeChangeEvents():void;
-		unsubscribeFromNativeChangeEvents():void;
-	}
-
-	interface IDirectoryStatic {
-		new (path:string, symlink?:boolean):IDirectory;
-	}
-
-	interface IDirectory {
-		realPath:string;
-		path:string;
-		symlink:boolean;
-
-		getBaseName():string;
-		getPath():void;
-		getRealPathSync():string;
-		contains(pathToCheck:string):boolean;
-		relativize(fullPath:string):string;
-		getEntriesSync():any[]; // return type are {File | Directory}[]
-		getEntries(callback:Function):void;
-		subscribeToNativeChangeEvents():void;
-		unsubscribeFromNativeChangeEvents():void;
-		isPathPrefixOf(prefix:string, fullPath:string):boolean;
-	}
-}
-
-declare module "pathwatcher" {
-
-	import events = require("events");
-
-	interface IHandleWatcher extends events.EventEmitter {
-		onEvent(event:any, filePath:any, oldFilePath:any):any;
-		start():void;
-		closeIfNoListener():void;
-		close():void;
-	}
-
-	interface IPathWatcher {
-		isWatchingParent:boolean;
-		path:any;
-		handleWatcher:IHandleWatcher;
-
-		close():void;
-	}
-
-	function watch(path:string, callback:Function):IPathWatcher;
-
-	function closeAllWatchers():void;
-
-	function getWatchedPaths():string[];
-
-	var File:PathWatcher.IFileStatic;
-	var Directory:PathWatcher.IDirectoryStatic;
-}
diff --git a/pathwatcher/tsconfig.json b/pathwatcher/tsconfig.json
new file mode 100644
index 0000000000..d8f383ad41
--- /dev/null
+++ b/pathwatcher/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pathwatcher-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pdf/index.d.ts b/pdf/index.d.ts
new file mode 100644
index 0000000000..2b121117db
--- /dev/null
+++ b/pdf/index.d.ts
@@ -0,0 +1,462 @@
+// Type definitions for PDF.js
+// Project: https://github.com/mozilla/pdf.js
+// Definitions by: Josh Baldwin <https://github.com/jbaldwin/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*
+Copyright (c) 2013 Josh Baldwin https://github.com/jbaldwin/pdf.d.ts
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+interface PDFPromise<T> {
+	isResolved(): boolean;
+	isRejected(): boolean;
+	resolve(value: T): void;
+	reject(reason: string): void;
+	then(onResolve: (promise: T) => void, onReject?: (reason: string) => void): PDFPromise<T>;
+}
+
+interface PDFTreeNode {
+	title: string;
+	bold: boolean;
+	italic: boolean;
+	color: number[]; // [r,g,b]
+	dest: any;
+	items: PDFTreeNode[];
+}
+
+interface PDFInfo {
+	PDFFormatVersion: string;
+	IsAcroFormPresent: boolean;
+	IsXFAPresent: boolean;
+	[key: string]: any;	// return type is string, typescript chokes
+}
+
+interface PDFMetadata {
+	parse(): void;
+	get(name: string): string;
+	has(name: string): boolean;
+}
+
+interface PDFSource {
+	url?: string;
+	data?: Uint8Array;
+	httpHeaders?: any;
+	password?: string;
+}
+
+interface PDFProgressData {
+	loaded: number;
+	total: number;
+}
+
+interface PDFDocumentProxy {
+
+	/**
+	 * Total number of pages the PDF contains.
+	 **/
+	numPages: number;
+
+	/**
+	 * A unique ID to identify a PDF.  Not guaranteed to be unique.  [jbaldwin: haha what]
+	 **/
+	fingerprint: string;
+
+	/**
+	 * True if embedded document fonts are in use.  Will be set during rendering of the pages.
+	 **/
+	embeddedFontsUsed(): boolean;
+
+	/**
+	 * @param number The page number to get.  The first page is 1.
+	 * @return A promise that is resolved with a PDFPageProxy.
+	 **/
+	getPage(number: number): PDFPromise<PDFPageProxy>;
+
+	/**
+	 * TODO: return type of Promise<???>
+	 *  A promise that is resolved with a lookup table for mapping named destinations to reference numbers.
+	 **/
+	getDestinations(): PDFPromise<any[]>;
+
+	/**
+	 *  A promise that is resolved with an array of all the JavaScript strings in the name tree.
+	 **/
+	getJavaScript(): PDFPromise<string[]>;
+
+	/**
+	 *  A promise that is resolved with an array that is a tree outline (if it has one) of the PDF.  @see PDFTreeNode
+	 **/
+	getOutline(): PDFPromise<PDFTreeNode[]>;
+
+	/**
+	 * A promise that is resolved with the info and metadata of the PDF.
+	 **/
+	getMetadata(): PDFPromise<{ info: PDFInfo; metadata: PDFMetadata }>;
+
+	/**
+	 * Is the PDF encrypted?
+	 **/
+	isEncrypted(): PDFPromise<boolean>;
+
+	/**
+	 * A promise that is resolved with Uint8Array that has the raw PDF data.
+	 **/
+	getData(): PDFPromise<Uint8Array>;
+
+	/**
+	 * TODO: return type of Promise<???>
+	 * A promise that is resolved when the document's data is loaded.
+	 **/
+	dataLoaded(): PDFPromise<any[]>;
+
+	/**
+	 *
+	 **/
+	destroy(): void;
+}
+
+interface PDFRef {
+	num: number;
+	gen: any; // todo
+}
+
+interface PDFPageViewportOptions {
+	viewBox: any;
+	scale: number;
+	rotation: number;
+	offsetX: number;
+	offsetY: number;
+	dontFlip: boolean;
+}
+
+interface PDFPageViewport {
+	width: number;
+	height: number;
+	fontScale: number;
+	transforms: number[];
+
+	clone(options: PDFPageViewportOptions): PDFPageViewport;
+	convertToViewportPoint(): number[]; // [x, y]
+	convertToViewportRectangle(): number[]; // [x1, y1, x2, y2]
+	convertToPdfPoint(): number[]; // [x, y]
+}
+
+interface PDFAnnotationData {
+	subtype: string;
+	rect: number[]; // [x1, y1, x2, y2]
+	annotationFlags: any; // todo
+	color: number[]; // [r,g,b]
+	borderWidth: number;
+	hasAppearance: boolean;
+}
+
+interface PDFAnnotations {
+	getData(): PDFAnnotationData;
+	hasHtml(): boolean; // always false
+	getHtmlElement(commonOjbs: any): HTMLElement; // throw new NotImplementedException()
+	getEmptyContainer(tagName: string, rect: number[]): HTMLElement; // deprecated
+	isViewable(): boolean;
+	loadResources(keys: any): PDFPromise<any>;
+	getOperatorList(evaluator: any): PDFPromise<any>;
+	// ... todo
+}
+
+interface PDFRenderTextLayer {
+	beginLayout(): void;
+	endLayout(): void;
+	appendText(): void;
+}
+
+interface PDFRenderImageLayer {
+	beginLayout(): void;
+	endLayout(): void;
+	appendImage(): void;
+}
+
+interface PDFRenderParams {
+	canvasContext: CanvasRenderingContext2D;
+	viewport?: PDFPageViewport;
+	textLayer?: PDFRenderTextLayer;
+	imageLayer?: PDFRenderImageLayer;
+	continueCallback?: (_continue: () => void) => void;
+}
+
+interface PDFViewerParams {
+	container: HTMLElement;
+	viewer?: HTMLElement;
+}
+
+/**
+ * RenderTask is basically a promise but adds a cancel function to termiate it.
+ **/
+interface PDFRenderTask extends PDFPromise<PDFPageProxy> {
+
+	/**
+	 * Cancel the rendering task.  If the task is currently rendering it will not be cancelled until graphics pauses with a timeout.  The promise that this object extends will resolve when cancelled.
+	 **/
+	cancel(): void;
+}
+
+interface PDFPageProxy {
+
+	/**
+	 * Page number of the page.  First page is 1.
+	 **/
+	pageNumber: number;
+
+	/**
+	 * The number of degrees the page is rotated clockwise.
+	 **/
+	rotate: number;
+
+	/**
+	 * The reference that points to this page.
+	 **/
+	ref: PDFRef;
+
+	/**
+	 * @return An array of the visible portion of the PDF page in the user space units - [x1, y1, x2, y2].
+	 **/
+	view: number[];
+
+	/**
+	 * @param scale The desired scale of the viewport.
+	 * @param rotate Degrees to rotate the viewport.  If omitted this defaults to the page rotation.
+	 * @return
+	 **/
+	getViewport(scale: number, rotate?: number): PDFPageViewport;
+
+	/**
+	 * A promise that is resolved with an array of the annotation objects.
+	 **/
+	getAnnotations(): PDFPromise<PDFAnnotations>;
+
+	/**
+	 * Begins the process of rendering a page to the desired context.
+	 * @param params Rendering options.
+	 * @return An extended promise that is resolved when the page finishes rendering.
+	 **/
+	render(params: PDFRenderParams): PDFRenderTask;
+
+	/**
+	 * A promise that is resolved with the string that is the text content frm the page.
+	 **/
+	getTextContent(): PDFPromise<TextContent>;
+
+	/**
+	 * marked as future feature
+	 **/
+	//getOperationList(): PDFPromise<>;
+
+	/**
+	 * Destroyes resources allocated by the page.
+	 **/
+	destroy(): void;
+}
+
+interface TextContentItem {
+	str: string;
+	transform: number[]; // [0..5]   4=x, 5=y
+	width: number;
+	height: number;
+	dir: string; // Left-to-right (ltr), etc
+	fontName: string; // A lookup into the styles map of the owning TextContent
+}
+
+interface TextContent {
+	items: TextContentItem[];
+	styles: any;
+}
+
+/**
+ * A PDF document and page is built of many objects.  E.g. there are objects for fonts, images, rendering code and such.  These objects might get processed inside of a worker.  The `PDFObjects` implements some basic functions to manage these objects.
+ **/
+interface PDFObjects {
+	get(objId: number, callback?: any): any;
+	resolve(objId: number, data: any): any;
+	isResolved(objId: number): boolean;
+	hasData(objId: number): boolean;
+	getData(objId: number): any;
+	clear(): void;
+}
+
+interface PDFJSStatic {
+
+	/**
+	 * The maximum allowed image size in total pixels e.g. width * height.  Images above this value will not be drawn.  Use -1 for no limit.
+	 **/
+	maxImageSize: number;
+
+	/**
+	 * The url of where the predefined Adobe CMaps are located. Include trailing
+	 * slash.
+	 */
+	cMapUrl: string;
+
+	/**
+	 * Specifies if CMaps are binary packed.
+	 */
+	cMapPacked: boolean;
+
+	/**
+	 * By default fonts are converted to OpenType fonts and loaded via font face rules.  If disabled, the font will be rendered using a built in font renderer that constructs the glyphs with primitive path commands.
+	 **/
+	disableFontFace: boolean;
+
+	/**
+	 * Path for image resources, mainly for annotation icons. Include trailing
+	 * slash.
+	 */
+	imageResourcesPath: string;
+
+	/**
+	 * Disable the web worker and run all code on the main thread. This will happen
+	 * automatically if the browser doesn't support workers or sending typed arrays
+	 * to workers.
+	 */
+	disableWorker: boolean;
+
+	/**
+	 * Path and filename of the worker file. Required when the worker is enabled in
+	 * development mode. If unspecified in the production build, the worker will be
+	 * loaded based on the location of the pdf.js file.
+	 */
+	workerSrc: string;
+
+	/**
+	 * Disable range request loading of PDF files. When enabled and if the server
+	 * supports partial content requests then the PDF will be fetched in chunks.
+	 * Enabled (false) by default.
+	 */
+	disableRange: boolean;
+
+	/**
+	 * Disable streaming of PDF file data. By default PDF.js attempts to load PDF
+	 * in chunks. This default behavior can be disabled.
+	 */
+	disableStream: boolean;
+
+	/**
+	 * Disable pre-fetching of PDF file data. When range requests are enabled PDF.js
+	 * will automatically keep fetching more data even if it isn't needed to display
+	 * the current page. This default behavior can be disabled.
+	 *
+	 * NOTE: It is also necessary to disable streaming, see above,
+	 *       in order for disabling of pre-fetching to work correctly.
+	 */
+	disableAutoFetch: boolean;
+
+	/**
+	 * Enables special hooks for debugging PDF.js.
+	 */
+	pdfBug: boolean;
+
+	/**
+	 * Enables transfer usage in postMessage for ArrayBuffers.
+	 */
+	postMessageTransfers: boolean;
+
+	/**
+	 * Disables URL.createObjectURL usage.
+	 */
+	disableCreateObjectURL: boolean;
+
+	/**
+	 * Disables WebGL usage.
+	 */
+	disableWebGL: boolean;
+
+	/**
+	 * Disables fullscreen support, and by extension Presentation Mode,
+	 * in browsers which support the fullscreen API.
+	 */
+	disableFullscreen: boolean;
+
+	/**
+	 * Enables CSS only zooming.
+	 */
+	useOnlyCssZoom: boolean;
+
+	/**
+	 * Controls the logging level.
+	 * The constants from PDFJS.VERBOSITY_LEVELS should be used:
+	 * - errors
+	 * - warnings [default]
+	 * - infos
+	 */
+	verbosity: number;
+
+	/**
+	 * The maximum supported canvas size in total pixels e.g. width * height.
+	 * The default value is 4096 * 4096. Use -1 for no limit.
+	 */
+	maxCanvasPixels: number;
+
+	/**
+	 * Opens external links in a new window if enabled. The default behavior opens
+	 * external links in the PDF.js window.
+	 */
+	openExternalLinksInNewWindow: boolean;
+
+	/**
+	 * Determines if we can eval strings as JS. Primarily used to improve
+	 * performance for font rendering.
+	 */
+	isEvalSupported: boolean;
+
+	/**
+	 * This is the main entry point for loading a PDF and interacting with it.
+	 * NOTE: If a URL is used to fetch the PDF data a standard XMLHttpRequest(XHR)
+	 * is used, which means it must follow the same origin rules that any XHR does
+	 * e.g. No corss domain requests without CORS.
+	 * @param source
+	 * @param pdfDataRangeTransport Used if you want to manually server range requests for data in the PDF.  @ee viewer.js for an example of pdfDataRangeTransport's interface.
+	 * @param passwordCallback Used to request a password if wrong or no password was provided.  The callback receives two parameters: function that needs to be called with new password and the reason.
+	 * @param progressCallback Progress callback.
+	 * @return A promise that is resolved with PDFDocumentProxy object.
+	 **/
+	getDocument(
+			source: string,
+			pdfDataRangeTransport?: any,
+			passwordCallback?: (fn: (password: string) => void, reason: string) => string,
+			progressCallback?: (progressData: PDFProgressData) => void)
+			: PDFPromise<PDFDocumentProxy>;
+
+	getDocument(
+			source: Uint8Array,
+			pdfDataRangeTransport?: any,
+			passwordCallback?: (fn: (password: string) => void, reason: string) => string,
+			progressCallback?: (progressData: PDFProgressData) => void)
+			: PDFPromise<PDFDocumentProxy>;
+
+	getDocument(
+			source: PDFSource,
+			pdfDataRangeTransport?: any,
+			passwordCallback?: (fn: (password: string) => void, reason: string) => string,
+			progressCallback?: (progressData: PDFProgressData) => void)
+			: PDFPromise<PDFDocumentProxy>;
+
+	PDFViewer(params: PDFViewerParams): void;
+}
+
+declare var PDFJS: PDFJSStatic;
diff --git a/pdf/pdf-tests.ts b/pdf/pdf-tests.ts
index 6157307808..b19f05a535 100644
--- a/pdf/pdf-tests.ts
+++ b/pdf/pdf-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="pdf.d.ts" />
+
 
 //
 // Fetch the PDF document from the URL using promises
diff --git a/pdf/pdf.d.ts b/pdf/pdf.d.ts
deleted file mode 100644
index cf74bb658c..0000000000
--- a/pdf/pdf.d.ts
+++ /dev/null
@@ -1,466 +0,0 @@
-// Type definitions for PDF.js
-// Project: https://github.com/mozilla/pdf.js
-// Definitions by: Josh Baldwin <https://github.com/jbaldwin/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/*
-Copyright (c) 2013 Josh Baldwin https://github.com/jbaldwin/pdf.d.ts
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-interface PDFPromise<T> {
-	isResolved(): boolean;
-	isRejected(): boolean;
-	resolve(value: T): void;
-	reject(reason: string): void;
-	then(onResolve: (promise: T) => void, onReject?: (reason: string) => void): PDFPromise<T>;
-}
-
-interface PDFTreeNode {
-	title: string;
-	bold: boolean;
-	italic: boolean;
-	color: number[]; // [r,g,b]
-	dest: any;
-	items: PDFTreeNode[];
-}
-
-interface PDFInfo {
-	PDFFormatVersion: string;
-	IsAcroFormPresent: boolean;
-	IsXFAPresent: boolean;
-	[key: string]: any;	// return type is string, typescript chokes
-}
-
-interface PDFMetadata {
-	parse(): void;
-	get(name: string): string;
-	has(name: string): boolean;
-}
-
-interface PDFSource {
-	url?: string;
-	data?: Uint8Array;
-	httpHeaders?: any;
-	password?: string;
-}
-
-interface PDFProgressData {
-	loaded: number;
-	total: number;
-}
-
-interface PDFDocumentProxy {
-
-	/**
-	 * Total number of pages the PDF contains.
-	 **/
-	numPages: number;
-
-	/**
-	 * A unique ID to identify a PDF.  Not guaranteed to be unique.  [jbaldwin: haha what]
-	 **/
-	fingerprint: string;
-
-	/**
-	 * True if embedded document fonts are in use.  Will be set during rendering of the pages.
-	 **/
-	embeddedFontsUsed(): boolean;
-
-	/**
-	 * @param number The page number to get.  The first page is 1.
-	 * @return A promise that is resolved with a PDFPageProxy.
-	 **/
-	getPage(number: number): PDFPromise<PDFPageProxy>;
-
-	/**
-	 * TODO: return type of Promise<???>
-	 *  A promise that is resolved with a lookup table for mapping named destinations to reference numbers.
-	 **/
-	getDestinations(): PDFPromise<any[]>;
-
-	/**
-	 *  A promise that is resolved with an array of all the JavaScript strings in the name tree.
-	 **/
-	getJavaScript(): PDFPromise<string[]>;
-
-	/**
-	 *  A promise that is resolved with an array that is a tree outline (if it has one) of the PDF.  @see PDFTreeNode
-	 **/
-	getOutline(): PDFPromise<PDFTreeNode[]>;
-
-	/**
-	 * A promise that is resolved with the info and metadata of the PDF.
-	 **/
-	getMetadata(): PDFPromise<{ info: PDFInfo; metadata: PDFMetadata }>;
-
-	/**
-	 * Is the PDF encrypted?
-	 **/
-	isEncrypted(): PDFPromise<boolean>;
-
-	/**
-	 * A promise that is resolved with Uint8Array that has the raw PDF data.
-	 **/
-	getData(): PDFPromise<Uint8Array>;
-
-	/**
-	 * TODO: return type of Promise<???>
-	 * A promise that is resolved when the document's data is loaded.
-	 **/
-	dataLoaded(): PDFPromise<any[]>;
-
-	/**
-	 *
-	 **/
-	destroy(): void;
-}
-
-interface PDFRef {
-	num: number;
-	gen: any; // todo
-}
-
-interface PDFPageViewportOptions {
-	viewBox: any;
-	scale: number;
-	rotation: number;
-	offsetX: number;
-	offsetY: number;
-	dontFlip: boolean;
-}
-
-interface PDFPageViewport {
-	width: number;
-	height: number;
-	fontScale: number;
-	transforms: number[];
-
-	clone(options: PDFPageViewportOptions): PDFPageViewport;
-	convertToViewportPoint(): number[]; // [x, y]
-	convertToViewportRectangle(): number[]; // [x1, y1, x2, y2]
-	convertToPdfPoint(): number[]; // [x, y]
-}
-
-interface PDFAnnotationData {
-	subtype: string;
-	rect: number[]; // [x1, y1, x2, y2]
-	annotationFlags: any; // todo
-	color: number[]; // [r,g,b]
-	borderWidth: number;
-	hasAppearance: boolean;
-}
-
-interface PDFAnnotations {
-	getData(): PDFAnnotationData;
-	hasHtml(): boolean; // always false
-	getHtmlElement(commonOjbs: any): HTMLElement; // throw new NotImplementedException()
-	getEmptyContainer(tagName: string, rect: number[]): HTMLElement; // deprecated
-	isViewable(): boolean;
-	loadResources(keys: any): PDFPromise<any>;
-	getOperatorList(evaluator: any): PDFPromise<any>;
-	// ... todo
-}
-
-interface PDFRenderTextLayer {
-	beginLayout(): void;
-	endLayout(): void;
-	appendText(): void;
-}
-
-interface PDFRenderImageLayer {
-	beginLayout(): void;
-	endLayout(): void;
-	appendImage(): void;
-}
-
-interface PDFRenderParams {
-	canvasContext: CanvasRenderingContext2D;
-	viewport?: PDFPageViewport;
-	textLayer?: PDFRenderTextLayer;
-	imageLayer?: PDFRenderImageLayer;
-	continueCallback?: (_continue: () => void) => void;
-}
-
-interface PDFViewerParams {
-	container: HTMLElement;
-	viewer?: HTMLElement;
-}
-
-/**
- * RenderTask is basically a promise but adds a cancel function to termiate it.
- **/
-interface PDFRenderTask extends PDFPromise<PDFPageProxy> {
-
-	/**
-	 * Cancel the rendering task.  If the task is currently rendering it will not be cancelled until graphics pauses with a timeout.  The promise that this object extends will resolve when cancelled.
-	 **/
-	cancel(): void;
-}
-
-interface PDFPageProxy {
-
-	/**
-	 * Page number of the page.  First page is 1.
-	 **/
-	pageNumber: number;
-
-	/**
-	 * The number of degrees the page is rotated clockwise.
-	 **/
-	rotate: number;
-
-	/**
-	 * The reference that points to this page.
-	 **/
-	ref: PDFRef;
-
-	/**
-	 * @return An array of the visible portion of the PDF page in the user space units - [x1, y1, x2, y2].
-	 **/
-	view: number[];
-
-	/**
-	 * @param scale The desired scale of the viewport.
-	 * @param rotate Degrees to rotate the viewport.  If omitted this defaults to the page rotation.
-	 * @return
-	 **/
-	getViewport(scale: number, rotate?: number): PDFPageViewport;
-
-	/**
-	 * A promise that is resolved with an array of the annotation objects.
-	 **/
-	getAnnotations(): PDFPromise<PDFAnnotations>;
-
-	/**
-	 * Begins the process of rendering a page to the desired context.
-	 * @param params Rendering options.
-	 * @return An extended promise that is resolved when the page finishes rendering.
-	 **/
-	render(params: PDFRenderParams): PDFRenderTask;
-
-	/**
-	 * A promise that is resolved with the string that is the text content frm the page.
-	 **/
-	getTextContent(): PDFPromise<TextContent>;
-
-	/**
-	 * marked as future feature
-	 **/
-	//getOperationList(): PDFPromise<>;
-
-	/**
-	 * Destroyes resources allocated by the page.
-	 **/
-	destroy(): void;
-}
-
-interface TextContentItem {
-	str: string;
-	transform: number[]; // [0..5]   4=x, 5=y
-	width: number;
-	height: number;
-	dir: string; // Left-to-right (ltr), etc
-	fontName: string; // A lookup into the styles map of the owning TextContent
-}
-
-interface TextContent {
-	items: TextContentItem[];
-	styles: any;
-}
-
-/**
- * A PDF document and page is built of many objects.  E.g. there are objects for fonts, images, rendering code and such.  These objects might get processed inside of a worker.  The `PDFObjects` implements some basic functions to manage these objects.
- **/
-interface PDFObjects {
-	get(objId: number, callback?: any): any;
-	resolve(objId: number, data: any): any;
-	isResolved(objId: number): boolean;
-	hasData(objId: number): boolean;
-	getData(objId: number): any;
-	clear(): void;
-}
-
-interface PDFJSStatic {
-
-	/**
-	 * The maximum allowed image size in total pixels e.g. width * height.  Images above this value will not be drawn.  Use -1 for no limit.
-	 **/
-	maxImageSize: number;
-
-	/**
-	 * The url of where the predefined Adobe CMaps are located. Include trailing
-	 * slash.
-	 */
-	cMapUrl: string;
-
-	/**
-	 * Specifies if CMaps are binary packed.
-	 */
-	cMapPacked: boolean;
-
-	/**
-	 * By default fonts are converted to OpenType fonts and loaded via font face rules.  If disabled, the font will be rendered using a built in font renderer that constructs the glyphs with primitive path commands.
-	 **/
-	disableFontFace: boolean;
-
-	/**
-	 * Path for image resources, mainly for annotation icons. Include trailing
-	 * slash.
-	 */
-	imageResourcesPath: string;
-
-	/**
-	 * Disable the web worker and run all code on the main thread. This will happen
-	 * automatically if the browser doesn't support workers or sending typed arrays
-	 * to workers.
-	 */
-	disableWorker: boolean;
-
-	/**
-	 * Path and filename of the worker file. Required when the worker is enabled in
-	 * development mode. If unspecified in the production build, the worker will be
-	 * loaded based on the location of the pdf.js file.
-	 */
-	workerSrc: string;
-
-	/**
-	 * Disable range request loading of PDF files. When enabled and if the server
-	 * supports partial content requests then the PDF will be fetched in chunks.
-	 * Enabled (false) by default.
-	 */
-	disableRange: boolean;
-
-	/**
-	 * Disable streaming of PDF file data. By default PDF.js attempts to load PDF
-	 * in chunks. This default behavior can be disabled.
-	 */
-	disableStream: boolean;
-
-	/**
-	 * Disable pre-fetching of PDF file data. When range requests are enabled PDF.js
-	 * will automatically keep fetching more data even if it isn't needed to display
-	 * the current page. This default behavior can be disabled.
-	 *
-	 * NOTE: It is also necessary to disable streaming, see above,
-	 *       in order for disabling of pre-fetching to work correctly.
-	 */
-	disableAutoFetch: boolean;
-
-	/**
-	 * Enables special hooks for debugging PDF.js.
-	 */
-	pdfBug: boolean;
-
-	/**
-	 * Enables transfer usage in postMessage for ArrayBuffers.
-	 */
-	postMessageTransfers: boolean;
-
-	/**
-	 * Disables URL.createObjectURL usage.
-	 */
-	disableCreateObjectURL: boolean;
-
-	/**
-	 * Disables WebGL usage.
-	 */
-	disableWebGL: boolean;
-
-	/**
-	 * Disables fullscreen support, and by extension Presentation Mode,
-	 * in browsers which support the fullscreen API.
-	 */
-	disableFullscreen: boolean;
-
-	/**
-	 * Enables CSS only zooming.
-	 */
-	useOnlyCssZoom: boolean;
-
-	/**
-	 * Controls the logging level.
-	 * The constants from PDFJS.VERBOSITY_LEVELS should be used:
-	 * - errors
-	 * - warnings [default]
-	 * - infos
-	 */
-	verbosity: number;
-
-	/**
-	 * The maximum supported canvas size in total pixels e.g. width * height.
-	 * The default value is 4096 * 4096. Use -1 for no limit.
-	 */
-	maxCanvasPixels: number;
-
-	/**
-	 * Opens external links in a new window if enabled. The default behavior opens
-	 * external links in the PDF.js window.
-	 */
-	openExternalLinksInNewWindow: boolean;
-
-	/**
-	 * Determines if we can eval strings as JS. Primarily used to improve
-	 * performance for font rendering.
-	 */
-	isEvalSupported: boolean;
-
-	/**
-	 * This is the main entry point for loading a PDF and interacting with it.
-	 * NOTE: If a URL is used to fetch the PDF data a standard XMLHttpRequest(XHR)
-	 * is used, which means it must follow the same origin rules that any XHR does
-	 * e.g. No corss domain requests without CORS.
-	 * @param source
-	 * @param pdfDataRangeTransport Used if you want to manually server range requests for data in the PDF.  @ee viewer.js for an example of pdfDataRangeTransport's interface.
-	 * @param passwordCallback Used to request a password if wrong or no password was provided.  The callback receives two parameters: function that needs to be called with new password and the reason.
-	 * @param progressCallback Progress callback.
-	 * @return A promise that is resolved with PDFDocumentProxy object.
-	 **/
-	getDocument(
-			source: string,
-			pdfDataRangeTransport?: any,
-			passwordCallback?: (fn: (password: string) => void, reason: string) => string,
-			progressCallback?: (progressData: PDFProgressData) => void)
-			: PDFPromise<PDFDocumentProxy>;
-
-	getDocument(
-			source: Uint8Array,
-			pdfDataRangeTransport?: any,
-			passwordCallback?: (fn: (password: string) => void, reason: string) => string,
-			progressCallback?: (progressData: PDFProgressData) => void)
-			: PDFPromise<PDFDocumentProxy>;
-
-	getDocument(
-			source: PDFSource,
-			pdfDataRangeTransport?: any,
-			passwordCallback?: (fn: (password: string) => void, reason: string) => string,
-			progressCallback?: (progressData: PDFProgressData) => void)
-			: PDFPromise<PDFDocumentProxy>;
-
-	PDFViewer(params: PDFViewerParams): void;
-}
-
-declare var PDFJS: PDFJSStatic;
-
-declare module "PDFJS" {
-	export = PDFJS;
-}
diff --git a/pdf/tsconfig.json b/pdf/tsconfig.json
new file mode 100644
index 0000000000..0a198fd493
--- /dev/null
+++ b/pdf/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pdf-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pdfkit/index.d.ts b/pdfkit/index.d.ts
new file mode 100644
index 0000000000..f14be3175f
--- /dev/null
+++ b/pdfkit/index.d.ts
@@ -0,0 +1,390 @@
+// Type definitions for Pdfkit v0.7.1
+// Project: http://pdfkit.org
+// Definitions by: Eric Hillah <https://github.com/erichillah>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare namespace PDFKit {
+    interface PDFGradient {
+        new(document: any): PDFGradient ;
+        stop(pos: number, color?: string|PDFKit.PDFGradient, opacity?: number): PDFGradient;
+        embed(): void;
+        apply(): void;
+    }
+
+    interface PDFLinearGradient extends PDFGradient {
+        new(document: any, x1: number, y1: number, x2: number, y2: number): PDFLinearGradient;
+        shader(fn: () => any): any;
+        opacityGradient(): PDFLinearGradient;
+    }
+
+    interface PDFRadialGradient extends PDFGradient {
+        new(document: any, x1: number, y1: number, x2: number, y2: number): PDFRadialGradient;
+        shader(fn: () => any): any;
+        opacityGradient(): PDFRadialGradient;
+    }
+}
+
+declare namespace PDFKit.Mixins {
+
+    interface AnnotationOption {
+        Type?: string;
+        Rect?: any;
+        Border?: Array<number>;
+        SubType?: string;
+        Contents?: string;
+        Name?: string;
+        color?: string;
+        QuadPoints?: Array<number>;
+
+        A?: any;
+        B?: any;
+        C?: any;
+        L?: any;
+        DA?: string;
+    }
+
+    interface PDFAnnotation<TDocument> {
+        annotate(x: number, y: number, w: number, h: number, option: AnnotationOption): TDocument;
+        note(x: number, y: number, w: number, h: number, content: string, option?: AnnotationOption): TDocument;
+        link(x: number, y: number, w: number, h: number, url: string, option?: AnnotationOption): TDocument;
+        highlight(x: number, y: number, w: number, h: number, option?: AnnotationOption): TDocument;
+        underline(x: number, y: number, w: number, h: number, option?: AnnotationOption): TDocument;
+        strike(x: number, y: number, w: number, h: number, option?: AnnotationOption): TDocument;
+        lineAnnotation(x1: number, y1: number, x2: number, y2: number, option?: AnnotationOption): TDocument;
+        rectAnnotation(x: number, y: number, w: number, h: number, option?: AnnotationOption): TDocument;
+        ellipseAnnotation(x: number, y: number, w: number, h: number, option?: AnnotationOption): TDocument;
+        textAnnotation(x: number, y: number, w: number, h: number, text: string, option?: AnnotationOption): TDocument;
+    }
+
+    interface PDFColor<TDocument> {
+        fillColor(color: string|PDFGradient, opacity?: number): TDocument;
+        strokeColor(color: string, opacity?: number): TDocument;
+        opacity(opacity: number): TDocument;
+        fillOpacity(opacity: number): TDocument;
+        strokeOpacity(opacity: number): TDocument;
+        linearGradient(x1: number, y1: number, x2: number, y2: number): PDFLinearGradient;
+        radialGradient(x1: number, y1: number, r1: number, x2: number, y2: number, r2: number): PDFRadialGradient;
+    }
+
+    interface PDFFont<TDocument> {
+        font(src: string, family?: string, size?: number): TDocument;
+        fontSize(size: number): TDocument;
+        currentLineHeight(includeGap?: boolean): number;
+        registerFont(name: string, src?: string, family?: string): TDocument;
+    }
+
+    interface ImageOption {
+        width?: number;
+        height?: number;
+        /** Scale percentage */
+        scale?: number;
+        /** Two elements array specifying dimensions(w,h)  */
+        fit?: number[];
+    }
+
+    interface PDFImage {
+    /**
+     * Draw an image in PDFKit document.
+     * No need chainning capabilities
+     */
+        image(src: any, x: number, y: number, options: ImageOption): any;
+    }
+
+    interface TextOptions {
+        /**  Set to false to disable line wrapping all together */
+        lineBreak?: boolean;
+        /** The width that text should be wrapped to (by default, the page width minus the left and right margin) */
+        width?: number;
+        /**  The maximum height that text should be clipped to */
+        height?: number;
+        /** The character to display at the end of the text when it is too long. Set to true to use the default character. */
+        ellipsis?: boolean|string;
+        /**  the number of columns to flow the text into */
+        columns?: number;
+        /** the amount of space between each column (1/4 inch by default) */
+        columnGap?: number;
+        /** The amount in PDF points (72 per inch) to indent each paragraph of text */
+        indent?: number;
+        /** the amount of space between each paragraph of text */
+        paragrahGap?: number;
+        /** the amount of space between each line of text */
+        lineGap?: number;
+        /** the amount of space between each word in the text */
+        wordSpacing?: number;
+        /** the amount of space between each character in the text */
+        characterSpacing?: number;
+        /** whether to fill the text (true by default) */
+        fill?: boolean;
+        /**  whether to stroke the text */
+        stroke?: boolean;
+        /** A URL to link this text to (shortcut to create an annotation) */
+        link?: string;
+        /** whether to underline the text */
+        underline?: boolean;
+        /** whether to strike out the text */
+        strike?: boolean;
+        /**whether the text segment will be followed immediately by another segment. Useful for changing styling in the middle of a paragraph. */
+        continued?: boolean;
+    }
+
+    interface PDFText<TDocument> {
+        lineGap(lineGap: number): TDocument;
+        moveDown(line?: number): TDocument;
+        moveUp(line?: number): TDocument;
+        text(text: string, x?: number, y?: number, options?: TextOptions): TDocument;
+        text(text: string, options?: TextOptions): TDocument;
+        widthOfString(text: string, options?: TextOptions): number;
+        heightOfString(text: string, options?: TextOptions): number;
+        list(list: Array<string|any>, x?: number, y?: number, options?: TextOptions): TDocument;
+        list(list: Array<string|any>, options?: TextOptions): TDocument;
+    }
+
+    interface PDFVector<TDocument> {
+
+        save(): TDocument;
+        restore(): TDocument;
+        closePath(): TDocument;
+        lineWidth(w: number): TDocument;
+        lineCap(c: string): TDocument;
+        lineJoin(j: string): TDocument;
+        miterLimit(m: any): TDocument;
+        dash(length: number, option: any): TDocument;
+        undash(): TDocument;
+        moveTo(x: number, y: number): TDocument;
+        lineTo(x: number, y: number): TDocument;
+        bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): TDocument;
+        quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): TDocument;
+        rect(x: number, y: number, w: number, h: number): TDocument;
+        roundRect(x: number, y: number, w: number, h: number, r?: number): TDocument;
+        ellipse(x: number, y: number, r1: number, r2?: number): TDocument;
+        circle(x: number, y: number, raduis: number): TDocument;
+        polygon(...points: number[][]): TDocument;
+        path(path: string): TDocument;
+        fill(color: string|PDFKit.PDFGradient, rule?: string): TDocument;
+        stroke(color?: string|PDFKit.PDFGradient): TDocument;
+        fillAndStroke(fillColor: string, strokeColor?: string, rule?: string): TDocument;
+        clip(rule?: string): TDocument;
+        transform(m11: number, m12: number, m21: number, m22: number, dx: number, dy: number): TDocument;
+        translate(x: number, y: number): TDocument;
+        rotate(angle: number, options?: { origin?: number[] }): TDocument;
+        scale(xFactor: number, yFactor?: number, options?: { origin?: number[] }): TDocument;
+    }
+}
+
+declare namespace PDFKit {
+    /**
+    * PDFKit data
+    */
+    interface PDFData {
+        new (data: any[]): PDFData;
+        readByte(): any;
+        writeByte(byte: any): void;
+        byteAt(index: number): any;
+        readBool(): boolean;
+        writeBool(val: boolean): boolean;
+        readUInt32(): number;
+        writeUInt32(val: number): void;
+        readInt32(): number;
+        writeInt32(val: number): void;
+        readUInt16(): number;
+        writeUInt16(val: number): void;
+        readInt16(): number;
+        writeInt16(val: number): void;
+        readString(length: number): string;
+        writeString(val: string): void;
+        stringAt(pos: number, length: number): string;
+        readShort(): number;
+        writeShort(val: number): void;
+        readLongLong(): number;
+        writeLongLong(val: number): void;
+        readInt(): number;
+        writeInt(val: number): void;
+        slice(start: number, end: number): any[];
+        read(length: number): any[];
+        write(bytes: any[]): void;
+    }
+}
+
+declare module "pdfkit/js/data" {
+    var PDFKitData: PDFKit.PDFData;
+    export = PDFKitData;
+}
+
+declare namespace PDFKit {
+    interface DocumentInfo {
+        Producer?: string;
+        Creator?: string;
+        CreationDate?: Date;
+        Title?: string;
+        Author?: string;
+        Keywords?: string;
+        ModDate?: Date;
+    }
+
+    interface PDFDocumentOptions {
+        compress?: boolean;
+        info?: DocumentInfo;
+        autoFirstPage?: boolean;
+        sizes?: number[];
+        margin?: { top: number; left: number; bottom: number; right: number }|number;
+
+        bufferPages?: boolean;
+    }
+
+    interface PDFDocument extends NodeJS.ReadableStream,
+        Mixins.PDFAnnotation<PDFDocument>, Mixins.PDFColor<PDFDocument>, Mixins.PDFImage,
+        Mixins.PDFText<PDFDocument>, Mixins.PDFVector<PDFDocument>, Mixins.PDFFont<PDFDocument> {
+        /**
+        * PDF Version
+        */
+        version: number;
+        /**
+        * Wheter streams should be compressed
+        */
+        compress: boolean;
+        /**
+        * PDF document Metadata
+        */
+        info: DocumentInfo;
+        /**
+        * Options for the document
+        */
+        options: PDFDocumentOptions;
+        /**
+        * Represent the current page.
+        */
+        page: PDFPage;
+
+        x: number;
+        y: number;
+
+        new (options?: PDFDocumentOptions): PDFDocument;
+
+        addPage(options?: PDFDocumentOptions): PDFDocument;
+        bufferedPageRanges(): { start: number; count: number };
+        switchToPage(n?: number): PDFPage;
+        flushPages(): void;
+        ref(data: {}): PDFKitReference;
+        addContent(data: any): PDFDocument
+        /**
+        * Deprecated
+        */
+        write(fileName: string, fn: any): void;
+        /**
+        * Deprecated. Throws exception
+        */
+        output(fn: any): void;
+        end(): void;
+        toString(): string;
+    }
+}
+
+declare module "pdfkit" {
+    var doc: PDFKit.PDFDocument;
+    export = doc;
+}
+
+declare module "pdfkit/js/gradient" {
+    var gradient : {
+        PDFGradient: PDFKit.PDFGradient;
+        PDFLinearGradient: PDFKit.PDFLinearGradient;
+        PDFRadialGradiant: PDFKit.PDFRadialGradient;
+    }
+
+    export = gradient;
+}
+
+declare namespace PDFKit {
+    /**
+   * Represent a single page in the PDF document
+   */
+    interface PDFPage {
+        size: string;
+        layout: string;
+        margin: { top: number; left: number; bottom: number; right: number }|number;
+        width: number;
+        height: number;
+        document: PDFDocument;
+        content: PDFKitReference;
+
+    /**
+     * The page dictionnary
+     */
+        dictionary: PDFKitReference;
+
+        fonts: any;
+        xobjects: any;
+        ext_gstates: any;
+        patterns: any;
+        annotations: any;
+
+        maxY(): number;
+        write(chunk: any): void;
+        end(): void;
+    }
+}
+
+declare module "pdfkit/js/page" {
+  var PDFKitPage: PDFKit.PDFPage
+
+    export = PDFKitPage
+}
+
+declare namespace PDFKit {
+    /** PDFReference - represents a reference to another object in the PDF object heirarchy */
+    class PDFKitReference {
+        id: number;
+        gen: number;
+        deflate:any;
+        compress: boolean;
+        uncompressedLength: number;
+        chunks: any[];
+        data: { Font?: any; XObject?: any; ExtGState?: any; Pattern: any; Annots: any };
+        document: PDFDocument;
+
+        constructor(document: PDFDocument, id: number, data: {});
+        initDeflate(): void;
+        write(chunk: any): void;
+        end(chunk: any): void;
+        finalize(): void;
+        toString(): string;
+    }
+}
+
+declare module "pdfkit/js/reference" {
+    var PDFKitReference: PDFKit.PDFKitReference;
+
+    export = PDFKitReference;
+}
+
+declare module "pdfkit/js/mixins/annotations" {
+    var PDFKitAnnotation: PDFKit.Mixins.PDFAnnotation<void>;
+    export = PDFKitAnnotation;
+}
+
+declare module "pdfkit/js/mixins/color" {
+    var PDFKitColor: PDFKit.Mixins.PDFColor<void>;
+    export = PDFKitColor;
+}
+
+declare module "pdfkit/js/mixins/fonts" {
+    var PDFKitFont: PDFKit.Mixins.PDFFont<void>;
+    export = PDFKitFont;
+}
+
+declare module "pdfkit/js/mixins/images" {
+    var PDFKitImage: PDFKit.Mixins.PDFImage;
+    export = PDFKitImage;
+}
+
+declare module "pdfkit/js/mixins/text" {
+    var PDFKitText: PDFKit.Mixins.PDFText<void>;
+    export = PDFKitText;
+}
+
+declare module "pdfkit/js/mixins/vector" {
+    var PDFKitVector: PDFKit.Mixins.PDFVector<void>;
+    export = PDFKitVector;
+}
diff --git a/pdfkit/pdfkit-tests.ts b/pdfkit/pdfkit-tests.ts
index 87263e932d..ca66f6f2c7 100644
--- a/pdfkit/pdfkit-tests.ts
+++ b/pdfkit/pdfkit-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="pdfkit.d.ts" />
+
 
 import PDFGradient = require("pdfkit/js/gradient");
 
diff --git a/pdfkit/pdfkit.d.ts b/pdfkit/pdfkit.d.ts
deleted file mode 100644
index 030e467d69..0000000000
--- a/pdfkit/pdfkit.d.ts
+++ /dev/null
@@ -1,390 +0,0 @@
-// Type definitions for Pdfkit v0.7.1
-// Project: http://pdfkit.org
-// Definitions by: Eric Hillah <https://github.com/erichillah>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare namespace PDFKit {
-    interface PDFGradient {
-        new(document: any): PDFGradient ;
-        stop(pos: number, color?: string|PDFKit.PDFGradient, opacity?: number): PDFGradient;
-        embed(): void;
-        apply(): void;
-    }
-
-    interface PDFLinearGradient extends PDFGradient {
-        new(document: any, x1: number, y1: number, x2: number, y2: number): PDFLinearGradient;
-        shader(fn: () => any): any;
-        opacityGradient(): PDFLinearGradient;
-    }
-
-    interface PDFRadialGradient extends PDFGradient {
-        new(document: any, x1: number, y1: number, x2: number, y2: number): PDFRadialGradient;
-        shader(fn: () => any): any;
-        opacityGradient(): PDFRadialGradient;
-    }
-}
-
-declare namespace PDFKit.Mixins {
-
-    interface AnnotationOption {
-        Type?: string;
-        Rect?: any;
-        Border?: Array<number>;
-        SubType?: string;
-        Contents?: string;
-        Name?: string;
-        color?: string;
-        QuadPoints?: Array<number>;
-
-        A?: any;
-        B?: any;
-        C?: any;
-        L?: any;
-        DA?: string;
-    }
-
-    interface PDFAnnotation<TDocument> {
-        annotate(x: number, y: number, w: number, h: number, option: AnnotationOption): TDocument;
-        note(x: number, y: number, w: number, h: number, content: string, option?: AnnotationOption): TDocument;
-        link(x: number, y: number, w: number, h: number, url: string, option?: AnnotationOption): TDocument;
-        highlight(x: number, y: number, w: number, h: number, option?: AnnotationOption): TDocument;
-        underline(x: number, y: number, w: number, h: number, option?: AnnotationOption): TDocument;
-        strike(x: number, y: number, w: number, h: number, option?: AnnotationOption): TDocument;
-        lineAnnotation(x1: number, y1: number, x2: number, y2: number, option?: AnnotationOption): TDocument;
-        rectAnnotation(x: number, y: number, w: number, h: number, option?: AnnotationOption): TDocument;
-        ellipseAnnotation(x: number, y: number, w: number, h: number, option?: AnnotationOption): TDocument;
-        textAnnotation(x: number, y: number, w: number, h: number, text: string, option?: AnnotationOption): TDocument;
-    }
-
-    interface PDFColor<TDocument> {
-        fillColor(color: string|PDFGradient, opacity?: number): TDocument;
-        strokeColor(color: string, opacity?: number): TDocument;
-        opacity(opacity: number): TDocument;
-        fillOpacity(opacity: number): TDocument;
-        strokeOpacity(opacity: number): TDocument;
-        linearGradient(x1: number, y1: number, x2: number, y2: number): PDFLinearGradient;
-        radialGradient(x1: number, y1: number, r1: number, x2: number, y2: number, r2: number): PDFRadialGradient;
-    }
-
-    interface PDFFont<TDocument> {
-        font(src: string, family?: string, size?: number): TDocument;
-        fontSize(size: number): TDocument;
-        currentLineHeight(includeGap?: boolean): number;
-        registerFont(name: string, src?: string, family?: string): TDocument;
-    }
-
-    interface ImageOption {
-        width?: number;
-        height?: number;
-        /** Scale percentage */
-        scale?: number;
-        /** Two elements array specifying dimensions(w,h)  */
-        fit?: number[];
-    }
-
-    interface PDFImage {
-    /**
-     * Draw an image in PDFKit document.
-     * No need chainning capabilities
-     */
-        image(src: any, x: number, y: number, options: ImageOption): any;
-    }
-
-    interface TextOptions {
-        /**  Set to false to disable line wrapping all together */
-        lineBreak?: boolean;
-        /** The width that text should be wrapped to (by default, the page width minus the left and right margin) */
-        width?: number;
-        /**  The maximum height that text should be clipped to */
-        height?: number;
-        /** The character to display at the end of the text when it is too long. Set to true to use the default character. */
-        ellipsis?: boolean|string;
-        /**  the number of columns to flow the text into */
-        columns?: number;
-        /** the amount of space between each column (1/4 inch by default) */
-        columnGap?: number;
-        /** The amount in PDF points (72 per inch) to indent each paragraph of text */
-        indent?: number;
-        /** the amount of space between each paragraph of text */
-        paragrahGap?: number;
-        /** the amount of space between each line of text */
-        lineGap?: number;
-        /** the amount of space between each word in the text */
-        wordSpacing?: number;
-        /** the amount of space between each character in the text */
-        characterSpacing?: number;
-        /** whether to fill the text (true by default) */
-        fill?: boolean;
-        /**  whether to stroke the text */
-        stroke?: boolean;
-        /** A URL to link this text to (shortcut to create an annotation) */
-        link?: string;
-        /** whether to underline the text */
-        underline?: boolean;
-        /** whether to strike out the text */
-        strike?: boolean;
-        /**whether the text segment will be followed immediately by another segment. Useful for changing styling in the middle of a paragraph. */
-        continued?: boolean;
-    }
-
-    interface PDFText<TDocument> {
-        lineGap(lineGap: number): TDocument;
-        moveDown(line?: number): TDocument;
-        moveUp(line?: number): TDocument;
-        text(text: string, x?: number, y?: number, options?: TextOptions): TDocument;
-        text(text: string, options?: TextOptions): TDocument;
-        widthOfString(text: string, options?: TextOptions): number;
-        heightOfString(text: string, options?: TextOptions): number;
-        list(list: Array<string|any>, x?: number, y?: number, options?: TextOptions): TDocument;
-        list(list: Array<string|any>, options?: TextOptions): TDocument;
-    }
-
-    interface PDFVector<TDocument> {
-
-        save(): TDocument;
-        restore(): TDocument;
-        closePath(): TDocument;
-        lineWidth(w: number): TDocument;
-        lineCap(c: string): TDocument;
-        lineJoin(j: string): TDocument;
-        miterLimit(m: any): TDocument;
-        dash(length: number, option: any): TDocument;
-        undash(): TDocument;
-        moveTo(x: number, y: number): TDocument;
-        lineTo(x: number, y: number): TDocument;
-        bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): TDocument;
-        quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): TDocument;
-        rect(x: number, y: number, w: number, h: number): TDocument;
-        roundRect(x: number, y: number, w: number, h: number, r?: number): TDocument;
-        ellipse(x: number, y: number, r1: number, r2?: number): TDocument;
-        circle(x: number, y: number, raduis: number): TDocument;
-        polygon(...points: number[][]): TDocument;
-        path(path: string): TDocument;
-        fill(color: string|PDFKit.PDFGradient, rule?: string): TDocument;
-        stroke(color?: string|PDFKit.PDFGradient): TDocument;
-        fillAndStroke(fillColor: string, strokeColor?: string, rule?: string): TDocument;
-        clip(rule?: string): TDocument;
-        transform(m11: number, m12: number, m21: number, m22: number, dx: number, dy: number): TDocument;
-        translate(x: number, y: number): TDocument;
-        rotate(angle: number, options?: { origin?: number[] }): TDocument;
-        scale(xFactor: number, yFactor?: number, options?: { origin?: number[] }): TDocument;
-    }
-}
-
-declare namespace PDFKit {
-    /**
-    * PDFKit data
-    */
-    interface PDFData {
-        new (data: any[]): PDFData;
-        readByte(): any;
-        writeByte(byte: any): void;
-        byteAt(index: number): any;
-        readBool(): boolean;
-        writeBool(val: boolean): boolean;
-        readUInt32(): number;
-        writeUInt32(val: number): void;
-        readInt32(): number;
-        writeInt32(val: number): void;
-        readUInt16(): number;
-        writeUInt16(val: number): void;
-        readInt16(): number;
-        writeInt16(val: number): void;
-        readString(length: number): string;
-        writeString(val: string): void;
-        stringAt(pos: number, length: number): string;
-        readShort(): number;
-        writeShort(val: number): void;
-        readLongLong(): number;
-        writeLongLong(val: number): void;
-        readInt(): number;
-        writeInt(val: number): void;
-        slice(start: number, end: number): any[];
-        read(length: number): any[];
-        write(bytes: any[]): void;
-    }
-}
-
-declare module "pdfkit/js/data" {
-    var PDFKitData: PDFKit.PDFData;
-    export = PDFKitData;
-}
-
-declare namespace PDFKit {
-    interface DocumentInfo {
-        Producer?: string;
-        Creator?: string;
-        CreationDate?: Date;
-        Title?: string;
-        Author?: string;
-        Keywords?: string;
-        ModDate?: Date;
-    }
-
-    interface PDFDocumentOptions {
-        compress?: boolean;
-        info?: DocumentInfo;
-        autoFirstPage?: boolean;
-        sizes?: number[];
-        margin?: { top: number; left: number; bottom: number; right: number }|number;
-
-        bufferPages?: boolean;
-    }
-
-    interface PDFDocument extends NodeJS.ReadableStream,
-        Mixins.PDFAnnotation<PDFDocument>, Mixins.PDFColor<PDFDocument>, Mixins.PDFImage,
-        Mixins.PDFText<PDFDocument>, Mixins.PDFVector<PDFDocument>, Mixins.PDFFont<PDFDocument> {
-        /**
-        * PDF Version
-        */
-        version: number;
-        /**
-        * Wheter streams should be compressed
-        */
-        compress: boolean;
-        /**
-        * PDF document Metadata
-        */
-        info: DocumentInfo;
-        /**
-        * Options for the document
-        */
-        options: PDFDocumentOptions;
-        /**
-        * Represent the current page.
-        */
-        page: PDFPage;
-
-        x: number;
-        y: number;
-
-        new (options?: PDFDocumentOptions): PDFDocument;
-
-        addPage(options?: PDFDocumentOptions): PDFDocument;
-        bufferedPageRanges(): { start: number; count: number };
-        switchToPage(n?: number): PDFPage;
-        flushPages(): void;
-        ref(data: {}): PDFKitReference;
-        addContent(data: any): PDFDocument
-        /**
-        * Deprecated
-        */
-        write(fileName: string, fn: any): void;
-        /**
-        * Deprecated. Throws exception
-        */
-        output(fn: any): void;
-        end(): void;
-        toString(): string;
-    }
-}
-
-declare module "pdfkit" {
-    var doc: PDFKit.PDFDocument;
-    export = doc;
-}
-
-declare module "pdfkit/js/gradient" {
-    var gradient : {
-        PDFGradient: PDFKit.PDFGradient;
-        PDFLinearGradient: PDFKit.PDFLinearGradient;
-        PDFRadialGradiant: PDFKit.PDFRadialGradient;
-    }
-
-    export = gradient;
-}
-
-declare namespace PDFKit {
-    /**
-   * Represent a single page in the PDF document
-   */
-    interface PDFPage {
-        size: string;
-        layout: string;
-        margin: { top: number; left: number; bottom: number; right: number }|number;
-        width: number;
-        height: number;
-        document: PDFDocument;
-        content: PDFKitReference;
-
-    /**
-     * The page dictionnary
-     */
-        dictionary: PDFKitReference;
-
-        fonts: any;
-        xobjects: any;
-        ext_gstates: any;
-        patterns: any;
-        annotations: any;
-
-        maxY(): number;
-        write(chunk: any): void;
-        end(): void;
-    }
-}
-
-declare module "pdfkit/js/page" {
-  var PDFKitPage: PDFKit.PDFPage
-
-    export = PDFKitPage
-}
-
-declare namespace PDFKit {
-    /** PDFReference - represents a reference to another object in the PDF object heirarchy */
-    class PDFKitReference {
-        id: number;
-        gen: number;
-        deflate:any;
-        compress: boolean;
-        uncompressedLength: number;
-        chunks: any[];
-        data: { Font?: any; XObject?: any; ExtGState?: any; Pattern: any; Annots: any };
-        document: PDFDocument;
-
-        constructor(document: PDFDocument, id: number, data: {});
-        initDeflate(): void;
-        write(chunk: any): void;
-        end(chunk: any): void;
-        finalize(): void;
-        toString(): string;
-    }
-}
-
-declare module "pdfkit/js/reference" {
-    var PDFKitReference: PDFKit.PDFKitReference;
-
-    export = PDFKitReference;
-}
-
-declare module "pdfkit/js/mixins/annotations" {
-    var PDFKitAnnotation: PDFKit.Mixins.PDFAnnotation<void>;
-    export = PDFKitAnnotation;
-}
-
-declare module "pdfkit/js/mixins/color" {
-    var PDFKitColor: PDFKit.Mixins.PDFColor<void>;
-    export = PDFKitColor;
-}
-
-declare module "pdfkit/js/mixins/fonts" {
-    var PDFKitFont: PDFKit.Mixins.PDFFont<void>;
-    export = PDFKitFont;
-}
-
-declare module "pdfkit/js/mixins/images" {
-    var PDFKitImage: PDFKit.Mixins.PDFImage;
-    export = PDFKitImage;
-}
-
-declare module "pdfkit/js/mixins/text" {
-    var PDFKitText: PDFKit.Mixins.PDFText<void>;
-    export = PDFKitText;
-}
-
-declare module "pdfkit/js/mixins/vector" {
-    var PDFKitVector: PDFKit.Mixins.PDFVector<void>;
-    export = PDFKitVector;
-}
diff --git a/pdfkit/tsconfig.json b/pdfkit/tsconfig.json
new file mode 100644
index 0000000000..1da74d6be4
--- /dev/null
+++ b/pdfkit/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pdfkit-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pebblekitjs/pebblekitjs.d.ts b/pebblekitjs/index.d.ts
similarity index 100%
rename from pebblekitjs/pebblekitjs.d.ts
rename to pebblekitjs/index.d.ts
diff --git a/pebblekitjs/pebblekitjs-tests.ts b/pebblekitjs/pebblekitjs-tests.ts
index f822e00434..a682f32208 100644
--- a/pebblekitjs/pebblekitjs-tests.ts
+++ b/pebblekitjs/pebblekitjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./pebblekitjs.d.ts" />
+
 
 var transactionId = Pebble.sendAppMessage({'0': 42, '1': 'String value'},
     function (e) {
diff --git a/pebblekitjs/tsconfig.json b/pebblekitjs/tsconfig.json
new file mode 100644
index 0000000000..1fbd71e315
--- /dev/null
+++ b/pebblekitjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pebblekitjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/peerjs/index.d.ts b/peerjs/index.d.ts
new file mode 100644
index 0000000000..5d41837bc7
--- /dev/null
+++ b/peerjs/index.d.ts
@@ -0,0 +1,196 @@
+// Type definitions for PeerJS
+// Project: http://peerjs.com/
+// Definitions by: Toshiya Nakakura <https://github.com/nakakura>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="webrtc" />
+
+declare namespace PeerJs{
+    interface PeerJSOption{
+        key?: string;
+        host?: string;
+        port?: number;
+        path?: string;
+        secure?: boolean;
+        config?: RTCPeerConnectionConfig;
+        debug?: number;
+    }
+
+    interface PeerConnectOption{
+        label?: string;
+        metadata?: any;
+        serialization?: string;
+        reliable?: boolean;
+
+    }
+
+    interface DataConnection{
+        send(data: any): void;
+        close(): void;
+        on(event: string, cb: ()=>void): void;
+        on(event: 'data', cb: (data: any)=>void): void;
+        on(event: 'open', cb: ()=>void): void;
+        on(event: 'close', cb: ()=>void): void;
+        on(event: 'error', cb: (err: any)=>void): void;
+        off(event: string, fn: Function, once?: boolean): void;
+        dataChannel: RTCDataChannel;
+        label: string;
+        metadata: any;
+        open: boolean;
+        peerConnection: any;
+        peer: string;
+        reliable: boolean;
+        serialization: string;
+        type: string;
+        buffSize: number;
+    }
+
+    interface MediaConnection{
+        answer(stream?: any): void;
+        close(): void;
+        on(event: string, cb: ()=>void): void;
+        on(event: 'stream', cb: (stream: any)=>void): void;
+        on(event: 'close', cb: ()=>void): void;
+        on(event: 'error', cb: (err: any)=>void): void;
+        off(event: string, fn: Function, once?: boolean): void;
+        open: boolean;
+        metadata: any;
+        peer: string;
+        type: string;
+    }
+
+    interface utilSupportsObj {
+        audioVideo: boolean;
+        data: boolean;
+        binary: boolean;
+        reliable: boolean;
+    }
+
+    interface util{
+        browser: string;
+        supports: utilSupportsObj;
+    }
+
+    export interface Peer{
+        /**
+         *
+         * @param id The brokering ID of the remote peer (their peer.id).
+         * @param options for specifying details about Peer Connection
+         */
+        connect(id: string, options?: PeerJs.PeerConnectOption): PeerJs.DataConnection;
+        /**
+         * Connects to the remote peer specified by id and returns a data connection.
+         * @param id The brokering ID of the remote peer (their peer.id).
+         * @param stream The caller's media stream
+         * @param options Metadata associated with the connection, passed in by whoever initiated the connection.
+         */
+        call(id: string, stream: any, options?: any): PeerJs.MediaConnection;
+        /**
+         * Calls the remote peer specified by id and returns a media connection.
+         * @param event Event name
+         * @param cb Callback Function
+         */
+        on(event: string, cb: ()=>void): void;
+        /**
+         * Emitted when a connection to the PeerServer is established.
+         * @param event Event name
+         * @param cb id is the brokering ID of the peer
+         */
+        on(event: 'open', cb: (id: string)=>void): void;
+        /**
+         * Emitted when a new data connection is established from a remote peer.
+         * @param event Event name
+         * @param cb Callback Function
+         */
+        on(event: 'connection', cb: (dataConnection: PeerJs.DataConnection)=>void): void;
+        /**
+         * Emitted when a remote peer attempts to call you.
+         * @param event Event name
+         * @param cb Callback Function
+         */
+        on(event: 'call', cb: (mediaConnection: PeerJs.MediaConnection)=>void): void;
+        /**
+         * Emitted when the peer is destroyed and can no longer accept or create any new connections.
+         * @param event Event name
+         * @param cb Callback Function
+         */
+        on(event: 'close', cb: ()=>void): void;
+        /**
+         * Emitted when the peer is disconnected from the signalling server
+         * @param event Event name
+         * @param cb Callback Function
+         */
+        on(event: 'disconnected', cb: ()=>void): void;
+        /**
+         * Errors on the peer are almost always fatal and will destroy the peer.
+         * @param event Event name
+         * @param cb Callback Function
+         */
+        on(event: 'error', cb: (err: any)=>void): void;
+        /**
+         * Remove event listeners.(EventEmitter3)
+         * @param {String} event The event we want to remove.
+         * @param {Function} fn The listener that we need to find.
+         * @param {Boolean} once Only remove once listeners.
+         */
+        off(event: string, fn: Function, once?: boolean): void;
+        /**
+         * Close the connection to the server, leaving all existing data and media connections intact.
+         */
+        disconnect(): void;
+        /**
+         * Attempt to reconnect to the server with the peer's old ID
+         */
+        reconnect(): void;
+        /**
+         * Close the connection to the server and terminate all existing connections.
+         */
+        destroy(): void;
+
+        /**
+         * Retrieve a data/media connection for this peer.
+         * @param peer
+         * @param id
+         */
+        getConnection(peer: Peer, id: string): any;
+
+        /**
+         * Get a list of available peer IDs
+         * @param callback
+         */
+        listAllPeers(callback: (peerIds: Array<string>)=>void): void;
+        /**
+         * The brokering ID of this peer
+         */
+        id: string;
+        /**
+         * A hash of all connections associated with this peer, keyed by the remote peer's ID.
+         */
+        connections: any;
+        /**
+         * false if there is an active connection to the PeerServer.
+         */
+        disconnected: boolean;
+        /**
+         * true if this peer and all of its connections can no longer be used.
+         */
+        destroyed: boolean;
+    }
+}
+
+declare var Peer: {
+    prototype: RTCIceServer;
+    /**
+     * A peer can connect to other peers and listen for connections.
+     * @param id Other peers can connect to this peer using the provided ID.
+     *     If no ID is given, one will be generated by the brokering server.
+     * @param options for specifying details about PeerServer
+     */
+    new (id: string, options?: PeerJs.PeerJSOption): PeerJs.Peer;
+
+    /**
+     * A peer can connect to other peers and listen for connections.
+     * @param options for specifying details about PeerServer
+     */
+    new (options: PeerJs.PeerJSOption): PeerJs.Peer;
+};
diff --git a/peerjs/peerjs-tests.ts b/peerjs/peerjs-tests.ts
index dee76d9e2f..373df3ba2f 100644
--- a/peerjs/peerjs-tests.ts
+++ b/peerjs/peerjs-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="./peerjs.d.ts" />
-/// <reference path="../webrtc/RTCPeerConnection.d.ts" />
+/// <reference types="webrtc" />
 
 var peerByOption: PeerJs.Peer = new Peer({
     key: 'peerKey',
diff --git a/peerjs/peerjs.d.ts b/peerjs/peerjs.d.ts
deleted file mode 100644
index bd0ed82ebd..0000000000
--- a/peerjs/peerjs.d.ts
+++ /dev/null
@@ -1,197 +0,0 @@
-// Type definitions for PeerJS
-// Project: http://peerjs.com/
-// Definitions by: Toshiya Nakakura <https://github.com/nakakura>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path='../webrtc/RTCPeerConnection.d.ts' />
-
-declare namespace PeerJs{
-    interface PeerJSOption{
-        key?: string;
-        host?: string;
-        port?: number;
-        path?: string;
-        secure?: boolean;
-        config?: RTCPeerConnectionConfig;
-        debug?: number;
-    }
-
-    interface PeerConnectOption{
-        label?: string;
-        metadata?: any;
-        serialization?: string;
-        reliable?: boolean;
-
-    }
-
-    interface DataConnection{
-        send(data: any): void;
-        close(): void;
-        on(event: string, cb: ()=>void): void;
-        on(event: 'data', cb: (data: any)=>void): void;
-        on(event: 'open', cb: ()=>void): void;
-        on(event: 'close', cb: ()=>void): void;
-        on(event: 'error', cb: (err: any)=>void): void;
-        off(event: string, fn: Function, once?: boolean): void;
-        dataChannel: RTCDataChannel;
-        label: string;
-        metadata: any;
-        open: boolean;
-        peerConnection: any;
-        peer: string;
-        reliable: boolean;
-        serialization: string;
-        type: string;
-        buffSize: number;
-    }
-
-    interface MediaConnection{
-        answer(stream?: any): void;
-        close(): void;
-        on(event: string, cb: ()=>void): void;
-        on(event: 'stream', cb: (stream: any)=>void): void;
-        on(event: 'close', cb: ()=>void): void;
-        on(event: 'error', cb: (err: any)=>void): void;
-        off(event: string, fn: Function, once?: boolean): void;
-        open: boolean;
-        metadata: any;
-        peer: string;
-        type: string;
-    }
-
-    interface utilSupportsObj {
-        audioVideo: boolean;
-        data: boolean;
-        binary: boolean;
-        reliable: boolean;
-    }
-
-    interface util{
-        browser: string;
-        supports: utilSupportsObj;
-    }
-
-    export interface Peer{
-        /**
-         *
-         * @param id The brokering ID of the remote peer (their peer.id).
-         * @param options for specifying details about Peer Connection
-         */
-        connect(id: string, options?: PeerJs.PeerConnectOption): PeerJs.DataConnection;
-        /**
-         * Connects to the remote peer specified by id and returns a data connection.
-         * @param id The brokering ID of the remote peer (their peer.id).
-         * @param stream The caller's media stream
-         * @param options Metadata associated with the connection, passed in by whoever initiated the connection.
-         */
-        call(id: string, stream: any, options?: any): PeerJs.MediaConnection;
-        /**
-         * Calls the remote peer specified by id and returns a media connection.
-         * @param event Event name
-         * @param cb Callback Function
-         */
-        on(event: string, cb: ()=>void): void;
-        /**
-         * Emitted when a connection to the PeerServer is established.
-         * @param event Event name
-         * @param cb id is the brokering ID of the peer
-         */
-        on(event: 'open', cb: (id: string)=>void): void;
-        /**
-         * Emitted when a new data connection is established from a remote peer.
-         * @param event Event name
-         * @param cb Callback Function
-         */
-        on(event: 'connection', cb: (dataConnection: PeerJs.DataConnection)=>void): void;
-        /**
-         * Emitted when a remote peer attempts to call you.
-         * @param event Event name
-         * @param cb Callback Function
-         */
-        on(event: 'call', cb: (mediaConnection: PeerJs.MediaConnection)=>void): void;
-        /**
-         * Emitted when the peer is destroyed and can no longer accept or create any new connections.
-         * @param event Event name
-         * @param cb Callback Function
-         */
-        on(event: 'close', cb: ()=>void): void;
-        /**
-         * Emitted when the peer is disconnected from the signalling server
-         * @param event Event name
-         * @param cb Callback Function
-         */
-        on(event: 'disconnected', cb: ()=>void): void;
-        /**
-         * Errors on the peer are almost always fatal and will destroy the peer.
-         * @param event Event name
-         * @param cb Callback Function
-         */
-        on(event: 'error', cb: (err: any)=>void): void;
-        /**
-         * Remove event listeners.(EventEmitter3)
-         * @param {String} event The event we want to remove.
-         * @param {Function} fn The listener that we need to find.
-         * @param {Boolean} once Only remove once listeners.
-         */
-        off(event: string, fn: Function, once?: boolean): void;
-        /**
-         * Close the connection to the server, leaving all existing data and media connections intact.
-         */
-        disconnect(): void;
-        /**
-         * Attempt to reconnect to the server with the peer's old ID
-         */
-        reconnect(): void;
-        /**
-         * Close the connection to the server and terminate all existing connections.
-         */
-        destroy(): void;
-
-        /**
-         * Retrieve a data/media connection for this peer.
-         * @param peer
-         * @param id
-         */
-        getConnection(peer: Peer, id: string): any;
-
-        /**
-         * Get a list of available peer IDs
-         * @param callback
-         */
-        listAllPeers(callback: (peerIds: Array<string>)=>void): void;
-        /**
-         * The brokering ID of this peer
-         */
-        id: string;
-        /**
-         * A hash of all connections associated with this peer, keyed by the remote peer's ID.
-         */
-        connections: any;
-        /**
-         * false if there is an active connection to the PeerServer.
-         */
-        disconnected: boolean;
-        /**
-         * true if this peer and all of its connections can no longer be used.
-         */
-        destroyed: boolean;
-    }
-}
-
-declare var Peer: {
-    prototype: RTCIceServer;
-    /**
-     * A peer can connect to other peers and listen for connections.
-     * @param id Other peers can connect to this peer using the provided ID.
-     *     If no ID is given, one will be generated by the brokering server.
-     * @param options for specifying details about PeerServer
-     */
-    new (id: string, options?: PeerJs.PeerJSOption): PeerJs.Peer;
-
-    /**
-     * A peer can connect to other peers and listen for connections.
-     * @param options for specifying details about PeerServer
-     */
-    new (options: PeerJs.PeerJSOption): PeerJs.Peer;
-};
diff --git a/peerjs/tsconfig.json b/peerjs/tsconfig.json
new file mode 100644
index 0000000000..4c7851004a
--- /dev/null
+++ b/peerjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "peerjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pegjs/index.d.ts b/pegjs/index.d.ts
new file mode 100644
index 0000000000..cf375cd32c
--- /dev/null
+++ b/pegjs/index.d.ts
@@ -0,0 +1,83 @@
+// Type definitions for PEG.js
+// Project: http://pegjs.org/
+// Definitions by: vvakame <https://github.com/vvakame>, Tobias Kahlert <https://github.com/SrTobi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace PEG {
+	function parse(input:string):any;
+
+	interface Location {
+		line: number;
+		column: number;
+		offset: number;
+	}
+
+	interface LocationRange {
+		start: Location,
+		end: Location
+	}
+
+	class SyntaxError {
+		line: number;
+		column: number;
+		offset: number;
+		location: LocationRange;
+		expected:any[];
+		found:any;
+		name:string;
+		message:string;
+	}
+}
+
+export type Location = PEG.Location;
+export type LocationRange = PEG.LocationRange;
+
+export interface ExpectedItem {
+    type: string;
+    value?: string;
+    description: string;
+}
+
+export interface PegjsError extends Error {
+    name: string;
+    message: string;
+    location: LocationRange;
+    found?: any;
+    expected?: ExpectedItem[];
+    stack?: any;
+}
+
+export type GrammarError = PegjsError;
+export var GrammarError: any;
+
+export interface ParserOptions {
+    startRule: string;
+    tracer: any;
+}
+
+export interface Parser {
+    parse(input: string, options?:ParserOptions): any;
+
+    SyntaxError: any;
+}
+
+export interface BuildOptions {
+    cache?: boolean;
+    allowedStartRules?: string[];
+    optimize?: string;
+    plugins?: any[];
+}
+
+export interface OutputBuildOptions extends BuildOptions {
+    output?: string;
+}
+
+export function buildParser(grammar: string, options?: BuildOptions): Parser;
+export function buildParser(grammar: string, options?: OutputBuildOptions): Parser | string;
+
+export namespace parser {
+    type SyntaxError = PegjsError;
+    var SyntaxError: any;
+}
+export as namespace PEG;
+
diff --git a/pegjs/pegjs-tests.ts b/pegjs/pegjs-tests.ts
index 082836e74f..74f74ae80f 100644
--- a/pegjs/pegjs-tests.ts
+++ b/pegjs/pegjs-tests.ts
@@ -1,12 +1,10 @@
-/// <reference path="./pegjs.d.ts" />
+import * as pegjs from 'pegjs';
 {
     let input: string;
-    let result = PEG.parse(input);
+    let result = pegjs.PEG.parse(input);
     console.log(result);
 }
 
-import * as pegjs from 'pegjs';
-
 {
     let pegparser: pegjs.Parser = pegjs.buildParser("start = ('a' / 'b')+");
 
diff --git a/pegjs/pegjs.d.ts b/pegjs/pegjs.d.ts
deleted file mode 100644
index 8dae497cfa..0000000000
--- a/pegjs/pegjs.d.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-// Type definitions for PEG.js
-// Project: http://pegjs.org/
-// Definitions by: vvakame <https://github.com/vvakame>, Tobias Kahlert <https://github.com/SrTobi>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace PEG {
-	function parse(input:string):any;
-
-	interface Location {
-		line: number;
-		column: number;
-		offset: number;
-	}
-
-	interface LocationRange {
-		start: Location,
-		end: Location
-	}
-
-	class SyntaxError {
-		line: number;
-		column: number;
-		offset: number;
-		location: LocationRange;
-		expected:any[];
-		found:any;
-		name:string;
-		message:string;
-	}
-}
-
-declare module "pegjs" {
-
-    type Location = PEG.Location;
-    type LocationRange = PEG.LocationRange;
-
-    interface ExpectedItem {
-        type: string;
-        value?: string;
-        description: string;
-    }
-
-    interface PegjsError extends Error {
-        name: string;
-        message: string;
-        location: LocationRange;
-        found?: any;
-        expected?: ExpectedItem[];
-        stack?: any;
-    }
-
-    type GrammarError = PegjsError;
-    var GrammarError: any;
-
-    interface ParserOptions {
-        startRule: string;
-        tracer: any;
-    }
-
-    interface Parser {
-        parse(input: string, options?:ParserOptions): any;
-
-        SyntaxError: any;
-    }
-
-    interface BuildOptions {
-        cache?: boolean;
-        allowedStartRules?: string[];
-        optimize?: string;
-        plugins?: any[];
-    }
-
-    interface OutputBuildOptions extends BuildOptions {
-        output?: string;
-    }
-
-    function buildParser(grammar: string, options?: BuildOptions): Parser;
-    function buildParser(grammar: string, options?: OutputBuildOptions): Parser | string;
-
-    namespace parser {
-        type SyntaxError = PegjsError;
-        var SyntaxError: any;
-    }
-}
diff --git a/pegjs/tsconfig.json b/pegjs/tsconfig.json
new file mode 100644
index 0000000000..18c580e78d
--- /dev/null
+++ b/pegjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pegjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/persona/index.d.ts b/persona/index.d.ts
new file mode 100644
index 0000000000..8c49f80e43
--- /dev/null
+++ b/persona/index.d.ts
@@ -0,0 +1,47 @@
+// Type definitions for Persona
+// Project: http://www.mozilla.org/en-US/persona
+// Definitions by: James Frasca <https://github.com/Nycto>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace Persona {
+
+    export interface WatchOptions {
+        loggedInUser: string;
+        onlogin: (s: string) => void;
+        onlogout: () => void;
+        onready?: () => void;
+    }
+
+    export interface RequestOptions {
+        backgroundColor?: string;
+        siteName?: string;
+        siteLogo?: string;
+        termsOfService?: string;
+        privacyPolicy?: string;
+        returnTo?: string;
+        oncancel?: () => void;
+    }
+
+    export interface GetOptions {
+        backgroundColor?: string;
+        siteName?: string;
+        siteLogo?: string;
+        termsOfService?: string;
+        privacyPolicy?: string;
+    }
+
+    export interface Persona {
+        watch(options: WatchOptions): void;
+        request(options: RequestOptions): void;
+        request(): void;
+        logout(): void;
+        get(gotAssertion: (s: string) => void): void;
+        get(gotAssertion: (s: string) => void, options: GetOptions): void;
+    }
+
+}
+
+interface Navigator {
+    id: Persona.Persona;
+}
+
diff --git a/persona/persona-tests.ts b/persona/persona-tests.ts
index 1a62f1bc29..8eecfdbf86 100644
--- a/persona/persona-tests.ts
+++ b/persona/persona-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="persona.d.ts" />
+
 
 
 // https://developer.mozilla.org/en-US/docs/Web/API/navigator.id.watch
diff --git a/persona/persona-tests.ts.tscparams b/persona/persona-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/persona/persona-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/persona/persona.d.ts b/persona/persona.d.ts
deleted file mode 100644
index 3d27487892..0000000000
--- a/persona/persona.d.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-// Type definitions for Persona
-// Project: http://www.mozilla.org/en-US/persona
-// Definitions by: James Frasca <https://github.com/Nycto>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace Persona {
-
-    export interface WatchOptions {
-        loggedInUser: String
-        onlogin: (String) => void
-        onlogout: () => void
-        onready?: () => void
-    }
-
-    export interface RequestOptions {
-        backgroundColor?: String
-        siteName?: String
-        siteLogo?: String
-        termsOfService?: String
-        privacyPolicy?: String
-        returnTo?: String
-        oncancel?: () => void
-    }
-
-    export interface GetOptions {
-        backgroundColor?: String
-        siteName?: String
-        siteLogo?: String
-        termsOfService?: String
-        privacyPolicy?: String
-    }
-
-    export interface Persona {
-        watch( options: WatchOptions ): void
-        request( options: RequestOptions ): void
-        request(): void
-        logout(): void
-        get( gotAssertion: (String) => void ): void
-        get( gotAssertion: (String) => void, options: GetOptions ): void
-    }
-
-}
-
-interface Navigator {
-    id: Persona.Persona
-}
-
diff --git a/persona/persona.d.ts.tscparams b/persona/persona.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/persona/persona.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/persona/tsconfig.json b/persona/tsconfig.json
new file mode 100644
index 0000000000..052807d16b
--- /dev/null
+++ b/persona/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "persona-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pg-promise/index.d.ts b/pg-promise/index.d.ts
new file mode 100644
index 0000000000..978b31c934
--- /dev/null
+++ b/pg-promise/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for pg-promise
+// Project: https://github.com/vitaly-t/pg-promise
+// Definitions by: vvakame <https://github.com/vvakame>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// deprecated. see https://github.com/vitaly-t/pg-promise/tree/master/typescript
+// NOTE https://github.com/DefinitelyTyped/DefinitelyTyped/issues/8956
diff --git a/pg-promise/pg-promise-tests.ts b/pg-promise/pg-promise-tests.ts
deleted file mode 100644
index dcfcea6c9e..0000000000
--- a/pg-promise/pg-promise-tests.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/// <reference path="./pg-promise.d.ts" />
-
-import * as pgpromise from "pg-promise";
-
-let db: pgpromise.PromiseClient;
-let pgp: pgpromise.PgPromise;
-
-db.one('sql', { 'values': 'values' });
-db.oneOrNone('sql', { 'values': 'values' });
-db.many('sql', { 'values': 'values' });
-db.many('sql', { 'values': 'values' }, { 'optional': 'optional' });
-
-// All functions
-db.none('sql');
-db.one('sql');
-db.many('sql');
-db.query('sql');
-
-
-db.any('sql');
-db.oneOrNone('sql');
-db.manyOrNone('sql');
-
-db.func('sql');
-db.proc('sql');
-
-db.task(() => {});
-db.tx(() => {});
-
-// Optional values
-db.none('sql', { 'values': 'values' });
-
-// QRM parameter
-db.none('sql', { 'values': 'values' }, { 'QRM': 'QRM' });
diff --git a/pg-promise/pg-promise-tests.ts.tscparams b/pg-promise/pg-promise-tests.ts.tscparams
deleted file mode 100644
index 14fce22a5c..0000000000
--- a/pg-promise/pg-promise-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target ES6
diff --git a/pg-promise/pg-promise.d.ts b/pg-promise/pg-promise.d.ts
deleted file mode 100644
index db96344b4d..0000000000
--- a/pg-promise/pg-promise.d.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-// Type definitions for pg-promise
-// Project: https://github.com/vitaly-t/pg-promise
-// Definitions by: Jörg Dotzki <https://github.com/ISO50>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// tsc --noImplicitAny --module commonjs --target ES6 pg-promise/pg-promise-tests.ts
-
-/// <reference path="../pg/pg.d.ts" />
-
-
-declare namespace PgPromise {
-}
-
-
-declare module "pg-promise" {
-
-  import * as pg from "pg";
-
-  function e(options?: {
-
-    pgFormatting?: Object;
-    promiseLib?: Object;
-    connect?: Function;
-    disconnect?: Function;
-    query?: Function;
-    task?: Function;
-    transact?: Function;
-    error?: Function;
-    extend?: Function;
-    noLocking?: Function;
-  }): e.PgPromise;
-
-
-
-  namespace e {
-
-    export interface PromiseClient {
-
-      none(queryText: string, values?: any[] | any, qrm?: any): Promise<any>;
-      one(queryText: string, values?: any[] | any, qrm?: any): Promise<any>;
-      many(queryText: string, values?: any[] | any, qrm?: any): Promise<any>;
-      query(queryText: string, values?: any[] | any, qrm?: any): Promise<any>;
-
-
-      any(queryText: string, values?: any[] | any, qrm?: any): Promise<any>;
-      oneOrNone(queryText: string, values?: any[] | any, qrm?: any): Promise<any>;
-      manyOrNone(queryText: string, values?: any[] | any, qrm?: any): Promise<any>;
-
-      func(queryText: string, values?: any[] | any, qrm?: any): Promise<any>;
-      proc(queryText: string, values?: any[] | any): Promise<any>;
-
-      task(func: Function): Promise<any>;
-      tx(func: Function): Promise<any>;
-    }
-
-    export interface PgPromise {
-      connect(callback?: (err: Error) => void): void;
-      end(): void;
-      (connectionString: string): PromiseClient;
-
-      as: convert;
-    }
-
-    export interface convert {
-
-      bool(value: any): boolean;
-      number(value: any): number;
-      text(value: any, raw: any): string;
-      name(value: any): string;
-      date(value: any, raw: any): string;
-      json(value: any, raw: any): string;
-      array(value: any): Array<any>;
-      csv(value: any): string;
-      func(func: Function, raw: any, obj: any): Function;
-      format(query: string, values: any): any;
-    }
-  }
-
-  export = e;
-}
diff --git a/pg-promise/tsconfig.json b/pg-promise/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/pg-promise/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pg/index.d.ts b/pg/index.d.ts
new file mode 100644
index 0000000000..38d2643343
--- /dev/null
+++ b/pg/index.d.ts
@@ -0,0 +1,91 @@
+// Type definitions for pg
+// Project: https://github.com/brianc/node-postgres
+// Definitions by: Phips Peter <http://pspeter3.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import events = require("events");
+import stream = require("stream");
+
+export declare function connect(connection: string, callback: (err: Error, client: Client, done: (err?: any) => void) => void): void;
+export declare function connect(config: ClientConfig, callback: (err: Error, client: Client, done: (err?: any) => void) => void): void;
+export declare function end(): void;
+
+export interface ConnectionConfig {
+    user?: string;
+    database?: string;
+    password?: string;
+    port?: number;
+    host?: string;
+}
+
+export interface Defaults extends ConnectionConfig {
+    poolSize?: number;
+    poolIdleTimeout?: number;
+    reapIntervalMillis?: number;
+    binary?: boolean;
+    parseInt8?: boolean;
+}
+
+export interface ClientConfig extends ConnectionConfig {
+    ssl?: boolean;
+}
+
+export interface QueryConfig {
+    name?: string;
+    text: string;
+    values?: any[];
+}
+
+export interface QueryResult {
+    rows: any[];
+}
+
+export interface ResultBuilder extends QueryResult {
+    command: string;
+    rowCount: number;
+    oid: number;
+    addRow(row: any): void;
+}
+
+export declare class Client extends events.EventEmitter {
+    constructor(connection: string);
+    constructor(config: ClientConfig);
+
+    connect(callback?: (err: Error) => void): void;
+    end(): void;
+
+    query(queryText: string, callback?: (err: Error, result: QueryResult) => void): Query;
+    query(config: QueryConfig, callback?: (err: Error, result: QueryResult) => void): Query;
+    query(queryText: string, values: any[], callback?: (err: Error, result: QueryResult) => void): Query;
+
+    copyFrom(queryText: string): stream.Writable;
+    copyTo(queryText: string): stream.Readable;
+
+    pauseDrain(): void;
+    resumeDrain(): void;
+
+    public on(event: "drain", listener: () => void): this;
+    public on(event: "error", listener: (err: Error) => void): this;
+    public on(event: "notification", listener: (message: any) => void): this;
+    public on(event: "notice", listener: (message: any) => void): this;
+    public on(event: string, listener: Function): this;
+}
+
+export declare class Query extends events.EventEmitter {
+    public on(event: "row", listener: (row: any, result?: ResultBuilder) => void): this;
+    public on(event: "error", listener: (err: Error) => void): this;
+    public on(event: "end", listener: (result: ResultBuilder) => void): this;
+    public on(event: string, listener: Function): this;
+}
+
+export declare class Events extends events.EventEmitter {
+    public on(event: "error", listener: (err: Error, client: Client) => void): this;
+    public on(event: string, listener: Function): this;
+}
+
+declare namespace types {
+    function setTypeParser<T>(typeId: number, parser: (value: string) => T): void;
+}
diff --git a/pg/pg-tests.ts b/pg/pg-tests.ts
index 99d1fac9ba..c88c9c7f7f 100644
--- a/pg/pg-tests.ts
+++ b/pg/pg-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="pg.d.ts" />
+
 import * as pg from "pg";
 
 var conString = "postgres://username:password@localhost/database";
diff --git a/pg/pg.d.ts b/pg/pg.d.ts
deleted file mode 100644
index 64a92d96b9..0000000000
--- a/pg/pg.d.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-// Type definitions for pg
-// Project: https://github.com/brianc/node-postgres
-// Definitions by: Phips Peter <http://pspeter3.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "pg" {
-    import events = require("events");
-    import stream = require("stream");
-
-    export function connect(connection: string, callback: (err: Error, client: Client, done: (err?: any) => void) => void): void;
-    export function connect(config: ClientConfig, callback: (err: Error, client: Client, done: (err?: any) => void) => void): void;
-    export function end(): void;
-
-    export interface ConnectionConfig {
-        user?: string;
-        database?: string;
-        password?: string;
-        port?: number;
-        host?: string;
-    }
-
-    export interface Defaults extends ConnectionConfig {
-        poolSize?: number;
-        poolIdleTimeout?: number;
-        reapIntervalMillis?: number;
-        binary?: boolean;
-        parseInt8?: boolean;
-    }
-
-    export interface ClientConfig extends ConnectionConfig {
-        ssl?: boolean;
-    }
-
-    export interface QueryConfig {
-        name?: string;
-        text: string;
-        values?: any[];
-    }
-
-    export interface QueryResult {
-        rows: any[];
-    }
-
-    export interface ResultBuilder extends QueryResult {
-        command: string;
-        rowCount: number;
-        oid: number;
-        addRow(row: any): void;
-    }
-
-    export class Client extends events.EventEmitter {
-        constructor(connection: string);
-        constructor(config: ClientConfig);
-
-        connect(callback?: (err:Error) => void): void;
-        end(): void;
-
-        query(queryText: string, callback?: (err: Error, result: QueryResult) => void): Query;
-        query(config: QueryConfig, callback?: (err: Error, result: QueryResult) => void): Query;
-        query(queryText: string, values: any[], callback?: (err: Error, result: QueryResult) => void): Query;
-
-        copyFrom(queryText: string): stream.Writable;
-        copyTo(queryText: string): stream.Readable;
-
-        pauseDrain(): void;
-        resumeDrain(): void;
-
-        public on(event: "drain", listener: () => void): this;
-        public on(event: "error", listener: (err: Error) => void): this;
-        public on(event: "notification", listener: (message: any) => void): this;
-        public on(event: "notice", listener: (message: any) => void): this;
-        public on(event: string, listener: Function): this;
-    }
-
-    export class Query extends events.EventEmitter {
-        public on(event: "row", listener: (row: any, result?: ResultBuilder) => void): this;
-        public on(event: "error", listener: (err: Error) => void): this;
-        public on(event: "end", listener: (result: ResultBuilder) => void): this;
-        public on(event: string, listener: Function): this;
-    }
-
-    export class Events extends events.EventEmitter {
-        public on(event: "error", listener: (err: Error, client: Client) => void): this;
-        public on(event: string, listener: Function): this;
-    }
-
-    namespace types {
-        function setTypeParser<T>(typeId: number, parser: (value: string) => T): void;
-    }
-}
diff --git a/pg/tsconfig.json b/pg/tsconfig.json
new file mode 100644
index 0000000000..256d85aa16
--- /dev/null
+++ b/pg/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pg-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pgwmodal/pgwmodal.d.ts b/pgwmodal/index.d.ts
similarity index 100%
rename from pgwmodal/pgwmodal.d.ts
rename to pgwmodal/index.d.ts
diff --git a/pgwmodal/pgwmodal-tests.ts b/pgwmodal/pgwmodal-tests.ts
index 0fd19bcea5..5148b42c0b 100644
--- a/pgwmodal/pgwmodal-tests.ts
+++ b/pgwmodal/pgwmodal-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="pgwmodal.d.ts" />
+
 
 var $j: JQueryStatic;
 var $z: ZeptoStatic;
diff --git a/pgwmodal/tsconfig.json b/pgwmodal/tsconfig.json
new file mode 100644
index 0000000000..2d6da5b967
--- /dev/null
+++ b/pgwmodal/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pgwmodal-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/phantom/index.d.ts b/phantom/index.d.ts
new file mode 100644
index 0000000000..1fd45260a2
--- /dev/null
+++ b/phantom/index.d.ts
@@ -0,0 +1,60 @@
+// Type definitions for PhantomJS bridge for NodeJS
+// Project: https://github.com/sgentle/phantomjs-node
+// Definitions by: horiuchi <https://github.com/horiuchi/>, Random <https://github.com/llRandom/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function create(args?: string[]): Promise<PhantomJS>;
+
+export interface PhantomJS {
+    createPage(): Promise<WebPage>;
+    exit(returnValue?: number): void;
+}
+
+export interface WebPage {
+    open(url: string): Promise<string>;
+    close(): Promise<void>;
+
+    evaluate<R>(callback: () => R): Promise<R>;
+    evaluate<T>(callback: (arg: T) => void, arg: T): Promise<void>;
+    evaluate<T, R>(callback: (arg: T) => R, arg: T): Promise<R>;
+    evaluate<T1, T2, R>(callback: (arg1: T1, arg2: T2) => R, arg1: T1, arg2: T2): Promise<R>;
+    evaluate<T1, T2, T3, R>(callback: (arg1: T1, arg2: T2, arg3: T3) => R, arg1: T1, arg2: T2, arg3: T3): Promise<R>;
+    evaluate<R>(callback: (...args: any[]) => R, ...args: any[]): Promise<R>;
+    includeJs(url: string): Promise<void>;
+    injectJs(filename: string): Promise<boolean>;
+    sendEvent(mouseEventType: string, mouseX?: number, mouseY?: number, button?: string): Promise<void>;
+    sendEvent(keyboardEventType: string, key: string, null1?: void, null2?: void, modifier?: number): Promise<void>;
+
+    render(filename: string): Promise<void>;
+    render(filename: string, options?: { format?: string; quality?: string; }): Promise<void>;
+    renderBase64(type: string): Promise<string>;
+
+    setContent(html: string, url: string): Promise<string>;
+
+    property<T>(key: string): Promise<T>;
+    property<T>(key: string, value: T): Promise<void>;
+
+    setting<T>(key: string): Promise<T>;
+
+    addCookie(cookie: ICookie): Promise<boolean>;
+    deleteCookie(cookieName: string): Promise<boolean>;
+    clearCookies(): Promise<void>;
+}
+
+export interface ICookie {
+    name: string,
+    value: string,
+    domain?: string,
+    path: string,
+    httponly?: boolean,
+    secure?: boolean,
+    expires?: Date
+}
+
+export interface IPaperSizeOptions {
+    width?: string;
+    height?: string;
+    format?: string;
+    orientation?: string;
+    margin?: any; // string | { top?: string; left?: string; bottom?: string; right?: string;  }
+}
diff --git a/phantom/phantom-1.0.0-tests.ts b/phantom/phantom-1.0.0-tests.ts
index c0563fd150..b502171e59 100644
--- a/phantom/phantom-1.0.0-tests.ts
+++ b/phantom/phantom-1.0.0-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./phantom-1.0.0.d.ts" />
+
 
 import phantom = require("phantom");
 
diff --git a/phantom/phantom-1.0.0.d.ts b/phantom/phantom-1.0.0.d.ts
index ed20d9a79a..5e96bf963c 100644
--- a/phantom/phantom-1.0.0.d.ts
+++ b/phantom/phantom-1.0.0.d.ts
@@ -3,18 +3,18 @@
 // Definitions by: horiuchi <https://github.com/horiuchi/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "phantom" {
 
-  function create(callback: (ph: PhantomJS) => void): void;
-  function create(options: ICreateOptions, callback: (ph: PhantomJS) => void): void;
-  function create(arg: string, callback: (ph: PhantomJS) => void): void;
-  function create(arg: string, options: ICreateOptions, callback: (ph: PhantomJS) => void): void;
-  function create(arg1: string, arg2: string, callback: (ph: PhantomJS) => void): void;
-  function create(arg1: string, arg2: string, options: ICreateOptions, callback: (ph: PhantomJS) => void): void;
-  function create(arg1: string, arg2: string, arg3: string, callback: (ph: PhantomJS) => void): void;
-  function create(arg1: string, arg2: string, arg3: string, options: ICreateOptions, callback: (ph: PhantomJS) => void): void;
 
-  interface PhantomJS {
+declare function create(callback: (ph: PhantomJS) => void): void;
+declare function create(options: ICreateOptions, callback: (ph: PhantomJS) => void): void;
+declare function create(arg: string, callback: (ph: PhantomJS) => void): void;
+declare function create(arg: string, options: ICreateOptions, callback: (ph: PhantomJS) => void): void;
+declare function create(arg1: string, arg2: string, callback: (ph: PhantomJS) => void): void;
+declare function create(arg1: string, arg2: string, options: ICreateOptions, callback: (ph: PhantomJS) => void): void;
+declare function create(arg1: string, arg2: string, arg3: string, callback: (ph: PhantomJS) => void): void;
+declare function create(arg1: string, arg2: string, arg3: string, options: ICreateOptions, callback: (ph: PhantomJS) => void): void;
+
+interface PhantomJS {
     createPage(callback: (page: WebPage) => void): void;
     exit(returnValue?: number): void;
     injectJs(filename: string, callback?: (result: boolean) => void): void;
@@ -22,9 +22,9 @@ declare module "phantom" {
     addCookie(name: string, value: string, domain: string, callback?: (res: boolean) => void): void;
     clearCookies(callback?: () => void): void;
     getCookies(callback: (cookies: { name: string; value: string; domain?: string; }[]) => void): void;
-  }
+}
 
-  interface WebPage {
+interface WebPage {
     open(url: string, callback: (status: string) => void): void;
     close(): void;
 
@@ -58,21 +58,18 @@ declare module "phantom" {
     getContent(callback: (content: string) => void): void;
     setContent(html: string, url: string, callback?: (status: string) => void): void;
     getCookies(callback: (cookies: { name: string; value: string; domain?: string; }[]) => void): void;
-  }
+}
 
-  interface ICreateOptions {
+interface ICreateOptions {
     binary?: string;
     hostname?: string;
     path?: string;
     port?: number;
-  }
-  interface IPaperSizeOptions {
+}
+interface IPaperSizeOptions {
     width?: string;
     height?: string;
     format?: string;
     orientation?: string;
     margin?: any; // string | { top?: string; left?: string; bottom?: string; right?: string;  }
-  }
-
 }
-
diff --git a/phantom/phantom-tests.ts b/phantom/phantom-tests.ts
index e53b7a1ffa..2842f1e543 100644
--- a/phantom/phantom-tests.ts
+++ b/phantom/phantom-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./phantom.d.ts" />
-
 import phantom = require("phantom");
 
 phantom.create().then((ph: phantom.PhantomJS): void => {
diff --git a/phantom/phantom.d.ts b/phantom/phantom.d.ts
deleted file mode 100644
index f87f25782d..0000000000
--- a/phantom/phantom.d.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-// Type definitions for PhantomJS bridge for NodeJS
-// Project: https://github.com/sgentle/phantomjs-node
-// Definitions by: horiuchi <https://github.com/horiuchi/>, Random <https://github.com/llRandom/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "phantom" {
-
-  function create(args?: string[]): Promise<PhantomJS>;
-
-  interface PhantomJS {
-    createPage(): Promise<WebPage>;
-    exit(returnValue?: number): void;
-  }
-
-  interface WebPage {
-    open(url: string): Promise<string>;
-    close(): Promise<void>;
-
-    evaluate<R>(callback: () => R): Promise<R>;
-    evaluate<T>(callback: (arg: T) => void, arg: T): Promise<void>;
-    evaluate<T, R>(callback: (arg: T) => R, arg: T): Promise<R>;
-    evaluate<T1, T2, R>(callback: (arg1: T1, arg2: T2) => R, arg1: T1, arg2: T2): Promise<R>;
-    evaluate<T1, T2, T3, R>(callback: (arg1: T1, arg2: T2, arg3: T3) => R, arg1: T1, arg2: T2, arg3: T3): Promise<R>;
-    evaluate<R>(callback: (...args: any[]) => R, ...args: any[]): Promise<R>;
-    includeJs(url: string): Promise<void>;
-    injectJs(filename: string): Promise<boolean>;
-    sendEvent(mouseEventType: string, mouseX?: number, mouseY?: number, button?: string): Promise<void>;
-    sendEvent(keyboardEventType: string, key: string, null1?: void, null2?: void, modifier?: number): Promise<void>;
-
-    render(filename: string): Promise<void>;
-    render(filename: string, options?: { format?: string; quality?: string; }): Promise<void>;
-    renderBase64(type: string): Promise<string>;
-
-    setContent(html: string, url: string): Promise<string>;
-    
-    property<T>(key: string): Promise<T>;
-    property<T>(key: string, value: T): Promise<void>;
-    
-    setting<T>(key: string): Promise<T>;
-    
-    addCookie(cookie: ICookie): Promise<boolean>;
-    deleteCookie(cookieName: string): Promise<boolean>;
-    clearCookies(): Promise<void>;
-  }
-
-  interface ICookie {
-      name: string,
-      value: string,
-      domain?: string,
-      path: string,
-      httponly?: boolean,
-      secure?: boolean,
-      expires?: Date
-  }
-
-  interface IPaperSizeOptions {
-    width?: string;
-    height?: string;
-    format?: string;
-    orientation?: string;
-    margin?: any; // string | { top?: string; left?: string; bottom?: string; right?: string;  }
-  }
-}
\ No newline at end of file
diff --git a/phantom/tsconfig.json b/phantom/tsconfig.json
new file mode 100644
index 0000000000..86652ba393
--- /dev/null
+++ b/phantom/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "phantom-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/phantomcss/index.d.ts b/phantomcss/index.d.ts
new file mode 100644
index 0000000000..48829a1bbe
--- /dev/null
+++ b/phantomcss/index.d.ts
@@ -0,0 +1,144 @@
+// Type definitions for PhantomCSS 0.11.1
+// Project: https://github.com/Huddle/PhantomCSS
+// Definitions by: Amaury Bauzac <https://github.com/abauzac>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="casperjs" />
+/// <reference types="resemblejs" />
+declare namespace PhantomCSS {
+    interface PhantomCSS {
+        init(options: PhantomCSSOptions): void;
+        update(options: PhantomCSSOptions): void;
+
+        /**
+         * Take a screenshot of the targeted HTML element
+         * FileName is required if addIteratorToImage option is set to false
+         */
+        screenshot(target: string, fileName?: string): void;
+
+        /**
+         * Take a screenshot of the targeted HTML element
+         * FileName is required if addIteratorToImage option is set to false
+         */
+        screenshot(target: ClipRect, fileName?: string): void;
+        /**
+         * Take a screenshot of the targeted HTML element
+         * FileName is required if addIteratorToImage option is set to false
+         */
+        screenshot(target: string, timeToWait: number, hideSelector: string, fileName?: string): void;
+
+        compareAll(exclude: string): void;
+        compareAll(exclude: string, diffList: string[], include: string): void;
+        compareMatched(match: string, exclude: string): void;
+        compareMatched(match: RegExp, exclude: RegExp): void;
+        /**
+         * Explicitly define what files you want to compare
+         */
+        compareExplicit(list: string[]): void;
+        /**
+         * Compare image diffs generated in this test run only
+         */
+        compareSession(list?: any[]): void;
+        compareFiles(baseFile: string, diffFiles: string): PhantomCSSTest;
+        waitForTests(tests: PhantomCSSTest[]): void;
+        done(): void;
+        /**
+         * Turn off CSS transitions and jQuery animations
+         */
+        turnOffAnimations(): void;
+        getExitStatus(): number;
+        /**
+         * Get a list of image diffs generated in this test run
+         */
+        getCreatedDiffFiles(): Array<string>;
+    }
+
+    interface PhantomCSSTest {
+        filename?: string;
+        error?: boolean;
+        fail?: boolean;
+        success?: boolean;
+        failFile?: string;
+        mismatch?: any;
+    }
+
+    interface PhantomCSSOptions {
+		/**
+			Rebase is useful when you want to create new baseline
+			images without manually deleting the files
+			casperjs demo/test.js --rebase
+		*/
+        rebase?: any;
+		/**
+		  A reference to a particular Casper instance. Required for SlimerJS.
+		 */
+        casper?: Casper;
+		/**
+        libraryRoot is relative to this file and must point to your phantomcss folder (not lib or node_modules). If you are using NPM, this will be './node_modules/phantomcss'.
+    	*/
+        libraryRoot?: string;
+
+        screenshotRoot?: string;
+		/**
+        By default, failure images are put in the './failures' folder.
+        If failedComparisonsRoot is set to false a separate folder will
+        not be created but failure images can still be found alongside
+        the original and new images.
+    	*/
+        failedComparisonsRoot?: string;
+
+		/**
+        You might want to keep master/baseline images in a completely
+        different folder to the diffs/failures.  Useful when working
+        with version control systems. By default this resolves to the
+        screenshotRoot folder.
+		*/
+        comparisonResultRoot?: string;
+
+        /**
+        Don't add count number to images. If set to false (default), a filename is
+        required when capturing screenshots.
+        */
+        addIteratorToImage: boolean;
+
+		/**
+        Remove results directory tree after run.  Use in conjunction
+        with failedComparisonsRoot to see failed comparisons.
+		*/
+        cleanupComparisonImages?: boolean;
+
+		/**
+		 * Don't add label to generated failure image
+		 */
+        addLabelToFailedImage?: boolean;
+		/**
+        * Change the output screenshot filenames for your specific
+        * integration
+    	*/
+        fileNameGetter?: (rootPath: string, fileName?: string) => string;
+
+		/**
+        Mismatch tolerance defaults to  0.05%. Increasing this value
+        will decrease test coverage
+    	*/
+        mismatchTolerance?: number;
+
+        onPass?: (test: PhantomCSSTest) => void;
+        onFail?: (test: PhantomCSSTest) => void;
+        onTimeout?: (test: PhantomCSSTest) => void;
+        onComplete?: (tests: PhantomCSSTest[], noOfFails: number, noOfErrors: number) => void;
+		/**
+        Called when creating new baseline images
+		*/
+        onNewImage?: (test: PhantomCSSTest) => void;
+
+        /**
+       Prefix the screenshot number to the filename, instead of suffixing it
+       */
+        prefixCount?: boolean;
+
+        hideElements?: string;
+        outputSettings?: Resemble.OutputSettings;
+    }
+
+}
diff --git a/phantomcss/phantomcss-tests.ts b/phantomcss/phantomcss-tests.ts
index d555017edf..8478bbd323 100644
--- a/phantomcss/phantomcss-tests.ts
+++ b/phantomcss/phantomcss-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="phantomcss.d.ts" />
-/// <reference path="../casperjs/casperjs.d.ts" />
-/// <reference path="../resemblejs/resemblejs.d.ts" />
+
+/// <reference types="casperjs" />
+/// <reference types="resemblejs" />
 
 // phantomCSS 0.11.1 is based on resemblejs 1.2.1, phantomJS 1.9.2 , casperJS 1.1.0-DEV
 
diff --git a/phantomcss/phantomcss.d.ts b/phantomcss/phantomcss.d.ts
deleted file mode 100644
index ade62de9cd..0000000000
--- a/phantomcss/phantomcss.d.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-// Type definitions for PhantomCSS 0.11.1
-// Project: https://github.com/Huddle/PhantomCSS
-// Definitions by: Amaury Bauzac <https://github.com/abauzac>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../casperjs/casperjs.d.ts" />
-/// <reference path="../resemblejs/resemblejs.d.ts" />
-declare namespace PhantomCSS {
-    interface PhantomCSS {
-        init(options: PhantomCSSOptions): void;
-        update(options: PhantomCSSOptions): void;
-
-        /**
-         * Take a screenshot of the targeted HTML element
-         * FileName is required if addIteratorToImage option is set to false
-         */
-        screenshot(target: string, fileName?: string): void;
-
-        /**
-         * Take a screenshot of the targeted HTML element
-         * FileName is required if addIteratorToImage option is set to false
-         */
-        screenshot(target: ClipRect, fileName?: string): void;
-        /**
-         * Take a screenshot of the targeted HTML element
-         * FileName is required if addIteratorToImage option is set to false
-         */
-        screenshot(target: string, timeToWait: number, hideSelector: string, fileName?: string): void;
-
-        compareAll(exclude: string): void;
-        compareAll(exclude: string, diffList: string[], include: string): void;
-        compareMatched(match: string, exclude: string): void;
-        compareMatched(match: RegExp, exclude: RegExp): void;
-        /**
-         * Explicitly define what files you want to compare
-         */
-        compareExplicit(list: string[]): void;
-        /**
-         * Compare image diffs generated in this test run only
-         */
-        compareSession(list?: any[]): void;
-        compareFiles(baseFile: string, diffFiles: string): PhantomCSSTest;
-        waitForTests(tests: PhantomCSSTest[]): void;
-        done(): void;
-        /**
-         * Turn off CSS transitions and jQuery animations
-         */
-        turnOffAnimations(): void;
-        getExitStatus(): number;
-        /**
-         * Get a list of image diffs generated in this test run
-         */
-        getCreatedDiffFiles(): Array<string>;
-    }
-
-    interface PhantomCSSTest {
-        filename?: string;
-        error?: boolean;
-        fail?: boolean;
-        success?: boolean;
-        failFile?: string;
-        mismatch?: any;
-    }
-
-    interface PhantomCSSOptions {
-		/**
-			Rebase is useful when you want to create new baseline
-			images without manually deleting the files
-			casperjs demo/test.js --rebase
-		*/
-        rebase?: any;
-		/**
-		  A reference to a particular Casper instance. Required for SlimerJS.
-		 */
-        casper?: Casper;
-		/**
-        libraryRoot is relative to this file and must point to your phantomcss folder (not lib or node_modules). If you are using NPM, this will be './node_modules/phantomcss'.
-    	*/
-        libraryRoot?: string;
-
-        screenshotRoot?: string;
-		/**
-        By default, failure images are put in the './failures' folder.
-        If failedComparisonsRoot is set to false a separate folder will
-        not be created but failure images can still be found alongside
-        the original and new images.
-    	*/
-        failedComparisonsRoot?: string;
-
-		/**
-        You might want to keep master/baseline images in a completely
-        different folder to the diffs/failures.  Useful when working
-        with version control systems. By default this resolves to the
-        screenshotRoot folder.
-		*/
-        comparisonResultRoot?: string;
-
-        /**
-        Don't add count number to images. If set to false (default), a filename is
-        required when capturing screenshots.
-        */
-        addIteratorToImage: boolean;
-
-		/**
-        Remove results directory tree after run.  Use in conjunction
-        with failedComparisonsRoot to see failed comparisons.
-		*/
-        cleanupComparisonImages?: boolean;
-
-		/**
-		 * Don't add label to generated failure image
-		 */
-        addLabelToFailedImage?: boolean;
-		/**
-        * Change the output screenshot filenames for your specific
-        * integration
-    	*/
-        fileNameGetter?: (rootPath: string, fileName?: string) => string;
-
-		/**
-        Mismatch tolerance defaults to  0.05%. Increasing this value
-        will decrease test coverage
-    	*/
-        mismatchTolerance?: number;
-
-        onPass?: (test: PhantomCSSTest) => void;
-        onFail?: (test: PhantomCSSTest) => void;
-        onTimeout?: (test: PhantomCSSTest) => void;
-        onComplete?: (tests: PhantomCSSTest[], noOfFails: number, noOfErrors: number) => void;
-		/**
-        Called when creating new baseline images
-		*/
-        onNewImage?: (test: PhantomCSSTest) => void;
-
-        /**
-       Prefix the screenshot number to the filename, instead of suffixing it
-       */
-        prefixCount?: boolean;
-
-        hideElements?: string;
-        outputSettings?: Resemble.OutputSettings;
-    }
-
-}
diff --git a/phantomcss/tsconfig.json b/phantomcss/tsconfig.json
new file mode 100644
index 0000000000..f0436e4c45
--- /dev/null
+++ b/phantomcss/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "phantomcss-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/phantomjs/phantomjs.d.ts b/phantomjs/index.d.ts
similarity index 100%
rename from phantomjs/phantomjs.d.ts
rename to phantomjs/index.d.ts
diff --git a/phantomjs/tsconfig.json b/phantomjs/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/phantomjs/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/phonegap-facebook-plugin/phonegap-facebook-plugin.d.ts b/phonegap-facebook-plugin/index.d.ts
similarity index 100%
rename from phonegap-facebook-plugin/phonegap-facebook-plugin.d.ts
rename to phonegap-facebook-plugin/index.d.ts
diff --git a/phonegap-facebook-plugin/phonegap-facebook-plugin-tests.ts b/phonegap-facebook-plugin/phonegap-facebook-plugin-tests.ts
index 4053255108..c97be8a698 100644
--- a/phonegap-facebook-plugin/phonegap-facebook-plugin-tests.ts
+++ b/phonegap-facebook-plugin/phonegap-facebook-plugin-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="phonegap-facebook-plugin.d.ts" />
+
 
 facebookConnectPlugin.api("a", ["b", "c"]);
 facebookConnectPlugin.api("a", ["b", "c"], (result: any) => {});
diff --git a/phonegap-facebook-plugin/tsconfig.json b/phonegap-facebook-plugin/tsconfig.json
new file mode 100644
index 0000000000..82bede0c8f
--- /dev/null
+++ b/phonegap-facebook-plugin/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "phonegap-facebook-plugin-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/phonegap-nfc/phonegap-nfc.d.ts b/phonegap-nfc/index.d.ts
similarity index 100%
rename from phonegap-nfc/phonegap-nfc.d.ts
rename to phonegap-nfc/index.d.ts
diff --git a/phonegap-nfc/phonegap-nfc-tests.ts b/phonegap-nfc/phonegap-nfc-tests.ts
index ddaabebce7..d203c949d9 100644
--- a/phonegap-nfc/phonegap-nfc-tests.ts
+++ b/phonegap-nfc/phonegap-nfc-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="phonegap-nfc.d.ts"/>
-
 import nfc = require('nfc');
 import ndef = require('ndef');
 import NdefRecord = PhoneGapNfc.NdefRecord;
diff --git a/phonegap-nfc/tsconfig.json b/phonegap-nfc/tsconfig.json
new file mode 100644
index 0000000000..811d7c56b7
--- /dev/null
+++ b/phonegap-nfc/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "phonegap-nfc-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/phonegap-plugin-push/phonegap-plugin-push.d.ts b/phonegap-plugin-push/index.d.ts
similarity index 100%
rename from phonegap-plugin-push/phonegap-plugin-push.d.ts
rename to phonegap-plugin-push/index.d.ts
diff --git a/phonegap-plugin-push/phonegap-plugin-push-tests.ts b/phonegap-plugin-push/phonegap-plugin-push-tests.ts
index 339c7e8e14..de112d49ff 100644
--- a/phonegap-plugin-push/phonegap-plugin-push-tests.ts
+++ b/phonegap-plugin-push/phonegap-plugin-push-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="phonegap-plugin-push.d.ts" />
+
 
 function test() {
 	let options: PhonegapPluginPush.InitOptions = {
diff --git a/phonegap-plugin-push/tsconfig.json b/phonegap-plugin-push/tsconfig.json
new file mode 100644
index 0000000000..3a81943e81
--- /dev/null
+++ b/phonegap-plugin-push/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "phonegap-plugin-push-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/phonegap/phonegap.d.ts b/phonegap/index.d.ts
similarity index 100%
rename from phonegap/phonegap.d.ts
rename to phonegap/index.d.ts
diff --git a/phonegap/phonegap-tests.ts b/phonegap/phonegap-tests.ts
index 8a639d2f49..f507e3bd71 100644
--- a/phonegap/phonegap-tests.ts
+++ b/phonegap/phonegap-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="phonegap.d.ts" />
+
 
 function test_accelerometer() {
     var watchID = null;
diff --git a/phonegap/phonegap-tests.ts.tscparams b/phonegap/phonegap-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/phonegap/phonegap-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/phonegap/tsconfig.json b/phonegap/tsconfig.json
new file mode 100644
index 0000000000..352fe6bf42
--- /dev/null
+++ b/phonegap/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "phonegap-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/photonui/photonui.d.ts b/photonui/index.d.ts
similarity index 100%
rename from photonui/photonui.d.ts
rename to photonui/index.d.ts
diff --git a/photonui/photonui-tests.ts b/photonui/photonui-tests.ts
index 3242d3a925..7fddf0b189 100644
--- a/photonui/photonui-tests.ts
+++ b/photonui/photonui-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./photonui.d.ts" />
+
 
 // All exemple scripts from PhotonUI documentation:
 
diff --git a/photonui/tsconfig.json b/photonui/tsconfig.json
new file mode 100644
index 0000000000..7671266466
--- /dev/null
+++ b/photonui/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "photonui-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/photoswipe/photoswipe.d.ts b/photoswipe/index.d.ts
similarity index 100%
rename from photoswipe/photoswipe.d.ts
rename to photoswipe/index.d.ts
diff --git a/photoswipe/photoswipe-tests.ts b/photoswipe/photoswipe-tests.ts
index e4006d5c13..ef480d8581 100644
--- a/photoswipe/photoswipe-tests.ts
+++ b/photoswipe/photoswipe-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="photoswipe.d.ts" />
+
 
 function test_defaultUI() {
     var items: PhotoSwipeUI_Default.Item[] = [
diff --git a/photoswipe/tsconfig.json b/photoswipe/tsconfig.json
new file mode 100644
index 0000000000..7a1aacfe6a
--- /dev/null
+++ b/photoswipe/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "photoswipe-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/physijs/index.d.ts b/physijs/index.d.ts
new file mode 100644
index 0000000000..86ea3b9f38
--- /dev/null
+++ b/physijs/index.d.ts
@@ -0,0 +1,249 @@
+// Type definitions for Physijs
+// Project: http://chandlerprall.github.io/Physijs/
+// Definitions by: Satoru Kimura <https://github.com/gyohk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="three" />
+
+declare namespace Physijs {
+    export function noConflict():Object;
+    export function createMaterial(material: THREE.Material, friction?: number, restitution?: number): Material;
+
+    export interface Material extends THREE.Material{
+        _physijs: {
+            id: number;
+            friction: number;
+            restriction: number
+        };
+    }
+
+    export interface Constraint {
+        getDefinition(): any;
+    }
+
+    export interface PointConstraintDefinition {
+            type: string;
+            id: number;
+            objecta: THREE.Object3D;
+            objectb: THREE.Object3D;
+            positiona: THREE.Vector3;
+            positionb: THREE.Vector3;
+    }
+
+    export class PointConstraint implements Constraint {
+        constructor(objecta: THREE.Object3D, objectb: THREE.Object3D, position?: THREE.Vector3);
+
+        getDefinition(): PointConstraintDefinition;
+    }
+
+    export interface HingeConstraintDefinition {
+        type: string;
+        id: number;
+        objecta: THREE.Object3D;
+        objectb: THREE.Object3D;
+        positiona: THREE.Vector3;
+        positionb: THREE.Vector3;
+        axis: THREE.Vector3;
+    }
+
+    export class HingeConstraint implements Constraint {
+        constructor(objecta: THREE.Object3D, objectb: THREE.Object3D, position: THREE.Vector3, axis?: THREE.Vector3);
+
+        getDefinition(): HingeConstraintDefinition;
+        setLimits( low: number, high: number, bias_factor: number, relaxation_factor: number ): void;
+        enableAngularMotor( velocity: number, acceleration: number ): void;
+        disableMotor(): void;
+    }
+
+    export interface SliderConstraintDefinition {
+        type: string;
+        id: number;
+        objecta: THREE.Object3D;
+        objectb: THREE.Object3D;
+        positiona: THREE.Vector3;
+        positionb: THREE.Vector3;
+        axis: THREE.Vector3;
+    }
+
+    export class SliderConstraint implements Constraint {
+        constructor(objecta: THREE.Object3D, objectb: THREE.Object3D, position: THREE.Vector3, axis?: THREE.Vector3);
+
+        getDefinition(): SliderConstraintDefinition;
+        setLimits( lin_lower: number, lin_upper: number, ang_lower: number, ang_upper: number ): void;
+        setRestitution( linear: number, angular: number ): void;
+        enableLinearMotor( velocity: number, acceleration: number): void;
+        disableLinearMotor(): void;
+        enableAngularMotor( velocity: number, acceleration: number ): void;
+        disableAngularMotor(): void;
+    }
+
+    export interface ConeTwistConstraintDefinition {
+        type: string;
+        id: number;
+        objecta: THREE.Object3D;
+        objectb: THREE.Object3D;
+        positiona: THREE.Vector3;
+        positionb: THREE.Vector3;
+        axisa: THREE.Vector3;
+        axisb: THREE.Vector3;
+    }
+
+    export class ConeTwistConstraint implements Constraint {
+        constructor(objecta: THREE.Object3D, objectb: THREE.Object3D, position: THREE.Vector3);
+
+        getDefinition(): ConeTwistConstraintDefinition;
+        setLimit( x: number, y: number, z: number ): void;
+        enableMotor(): void;
+        setMaxMotorImpulse( max_impulse: number ): void;
+        setMotorTarget( target: THREE.Vector3 ): void;
+        setMotorTarget( target: THREE.Euler ): void;
+        setMotorTarget( target: THREE.Matrix4 ): void;
+        disableMotor(): void;
+
+    }
+
+    export interface DOFConstraintDefinition {
+        type: string;
+        id: number;
+        objecta: THREE.Object3D;
+        objectb: THREE.Object3D;
+        positiona: THREE.Vector3;
+        positionb: THREE.Vector3;
+        axisa: THREE.Vector3;
+        axisb: THREE.Vector3;
+    }
+
+    export class DOFConstraint implements Constraint {
+        constructor(objecta: THREE.Object3D, objectb: THREE.Object3D, position?: THREE.Vector3);
+
+        getDefinition(): DOFConstraintDefinition;
+        setLinearLowerLimit(limit: THREE.Vector3): void;
+        setLinearUpperLimit(limit: THREE.Vector3): void;
+        setAngularLowerLimit(limit: THREE.Vector3): void;
+        setAngularUpperLimit(limit: THREE.Vector3): void;
+        enableAngularMotor( which: number ): void;
+        configureAngularMotor( which: number, low_angle: number, high_angle: number, velocity: number, max_force: number ): void;
+        disableAngularMotor( which: number ): void;
+    }
+    export var scripts: {
+        worker: string;
+        ammo: string;
+    };
+
+    export interface SceneParameters {
+        ammo?: string;
+        fixedTimeStep?: number;
+        rateLimit?: boolean;
+    }
+
+    export class Scene extends THREE.Scene {
+        constructor(param?: SceneParameters);
+
+        addConstraint(constraint:Constraint, show_marker?:boolean):void;
+        onSimulationResume():void;
+        removeConstraint(constraint:Constraint):void;
+        execute(cmd:string, params:any):void;
+        add(object:THREE.Object3D):void;
+        remove(object:THREE.Object3D):void;
+        setFixedTimeStep(fixedTimeStep:number):void;
+        setGravity(gravity:THREE.Vector3):void;
+        simulate(timeStep?:number, maxSubSteps?:number):boolean;
+
+
+        // Eventable mixins
+        addEventListener( event_name: string, callback: (event: any) => void ): void;
+        removeEventListener( event_name: string, callback: (event: any) => void): void;
+        dispatchEvent( event_name: string ): void;
+
+        // (extends from Object3D)
+        dispatchEvent( event: { type: string; target: any; } ): void;
+    }
+
+    export class Mesh extends THREE.Mesh {
+        constructor(geometry:THREE.Geometry, material?:THREE.Material, mass?:number);
+
+        applyCentralImpulse(force:THREE.Vector3):void;
+        applyImpulse(force:THREE.Vector3, offset:THREE.Vector3):void;
+        applyCentralForce(force:THREE.Vector3):void;
+        applyForce(force:THREE.Vector3, offset:THREE.Vector3):void;
+        getAngularVelocity():THREE.Vector3;
+        setAngularVelocity(velocity:THREE.Vector3):void;
+        getLinearVelocity():THREE.Vector3;
+        setLinearVelocity(velocity:THREE.Vector3):void;
+        setAngularFactor(factor:THREE.Vector3):void;
+        setLinearFactor(factor:THREE.Vector3):void;
+        setDamping(linear:number, angular:number):void;
+        setCcdMotionThreshold(threshold:number):void;
+        setCcdSweptSphereRadius(radius:number):void;
+
+
+        // Eventable mixins
+        addEventListener( event_name: string, callback: (event: any) => void ): void;
+        removeEventListener( event_name: string, callback: (event: any) => void): void;
+        dispatchEvent( event_name: string ): void;
+
+        // (extends from Object3D)
+        dispatchEvent( event: { type: string; target: any; } ): void;
+    }
+
+    export class PlaneMesh extends Mesh {
+        constructor(geometry:THREE.Geometry, material:THREE.Material, mass?:number);
+
+    }
+
+    export class HeightfieldMesh extends Mesh {
+        constructor(geometry:THREE.Geometry, material:THREE.Material, mass?:number, xdiv?:number, ydiv?:number);
+    }
+
+    export class BoxMesh extends Mesh {
+        constructor(geometry:THREE.Geometry, material:THREE.Material, mass?:number);
+    }
+
+    export class SphereMesh extends Mesh {
+        constructor(geometry:THREE.Geometry, material:THREE.Material, mass?:number);
+    }
+
+    export class CylinderMesh extends Mesh {
+        constructor(geometry:THREE.Geometry, material:THREE.Material, mass?:number);
+    }
+
+    export class CapsuleMesh extends Mesh {
+        constructor(geometry:THREE.Geometry, material:THREE.Material, mass?:number);
+    }
+
+    export class ConeMesh extends Mesh {
+        constructor(geometry:THREE.Geometry, material:THREE.Material, mass?:number);
+    }
+
+    export class ConcaveMesh extends Mesh {
+        constructor(geometry:THREE.Geometry, material:THREE.Material, mass?:number);
+    }
+
+    export class ConvexMesh extends Mesh {
+        constructor(geometry:THREE.Geometry, material:THREE.Material, mass?:number);
+    }
+
+    export class Vehicle {
+        constructor(mesh:Mesh, tuning?:VehicleTuning);
+
+        mesh:THREE.Mesh;
+        wheels:THREE.Mesh[];
+
+        addWheel(wheel_geometry:THREE.Geometry, wheel_material:THREE.Material, connection_point:THREE.Vector3, wheel_direction:THREE.Vector3, wheel_axle:THREE.Vector3, suspension_rest_length:number, wheel_radius:number, is_front_wheel:boolean, tuning?:VehicleTuning): void;
+        setSteering(amount: number, wheel?: THREE.Mesh): void;
+        setBrake(amount: number, wheel?: THREE.Mesh): void;
+        applyEngineForce(amount: number, wheel?: THREE.Mesh): void;
+    }
+
+    export class VehicleTuning {
+        constructor(suspension_stiffness?:number, suspension_compression?:number, suspension_damping?:number, max_suspension_travel?:number, friction_slip?:number, max_suspension_force?:number);
+
+        suspension_stiffness:number;
+        suspension_compression:number;
+        suspension_damping:number;
+        max_suspension_travel:number;
+        friction_slip:number;
+        max_suspension_force:number;
+    }
+}
+
diff --git a/physijs/physijs-tests.ts.tscparams b/physijs/physijs-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/physijs/physijs-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/physijs/physijs.d.ts b/physijs/physijs.d.ts
deleted file mode 100644
index 035f1da389..0000000000
--- a/physijs/physijs.d.ts
+++ /dev/null
@@ -1,250 +0,0 @@
-// Type definitions for Physijs
-// Project: http://chandlerprall.github.io/Physijs/
-// Definitions by: Satoru Kimura <https://github.com/gyohk>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../threejs/three.d.ts" />
-
-declare namespace Physijs {
-    export function noConflict():Object;
-    export function createMaterial(material: THREE.Material, friction?: number, restitution?: number): Material;
-
-    export interface Material extends THREE.Material{
-        _physijs: {
-            id: number;
-            friction: number;
-            restriction: number
-        };
-    }
-
-    export interface Constraint {
-        getDefinition(): any;
-    }
-
-    export interface PointConstraintDefinition {
-            type: string;
-            id: number;
-            objecta: THREE.Object3D;
-            objectb: THREE.Object3D;
-            positiona: THREE.Vector3;
-            positionb: THREE.Vector3;
-    }
-
-    export class PointConstraint implements Constraint {
-        constructor(objecta: THREE.Object3D, objectb: THREE.Object3D, position?: THREE.Vector3);
-
-        getDefinition(): PointConstraintDefinition;
-    }
-
-    export interface HingeConstraintDefinition {
-        type: string;
-        id: number;
-        objecta: THREE.Object3D;
-        objectb: THREE.Object3D;
-        positiona: THREE.Vector3;
-        positionb: THREE.Vector3;
-        axis: THREE.Vector3;
-    }
-
-    export class HingeConstraint implements Constraint {
-        constructor(objecta: THREE.Object3D, objectb: THREE.Object3D, position: THREE.Vector3, axis?: THREE.Vector3);
-
-        getDefinition(): HingeConstraintDefinition;
-        setLimits( low: number, high: number, bias_factor: number, relaxation_factor: number ): void;
-        enableAngularMotor( velocity: number, acceleration: number ): void;
-        disableMotor(): void;
-    }
-
-    export interface SliderConstraintDefinition {
-        type: string;
-        id: number;
-        objecta: THREE.Object3D;
-        objectb: THREE.Object3D;
-        positiona: THREE.Vector3;
-        positionb: THREE.Vector3;
-        axis: THREE.Vector3;
-    }
-
-    export class SliderConstraint implements Constraint {
-        constructor(objecta: THREE.Object3D, objectb: THREE.Object3D, position: THREE.Vector3, axis?: THREE.Vector3);
-
-        getDefinition(): SliderConstraintDefinition;
-        setLimits( lin_lower: number, lin_upper: number, ang_lower: number, ang_upper: number ): void;
-        setRestitution( linear: number, angular: number ): void;
-        enableLinearMotor( velocity: number, acceleration: number): void;
-        disableLinearMotor(): void;
-        enableAngularMotor( velocity: number, acceleration: number ): void;
-        disableAngularMotor(): void;
-    }
-
-    export interface ConeTwistConstraintDefinition {
-        type: string;
-        id: number;
-        objecta: THREE.Object3D;
-        objectb: THREE.Object3D;
-        positiona: THREE.Vector3;
-        positionb: THREE.Vector3;
-        axisa: THREE.Vector3;
-        axisb: THREE.Vector3;
-    }
-
-    export class ConeTwistConstraint implements Constraint {
-        constructor(objecta: THREE.Object3D, objectb: THREE.Object3D, position: THREE.Vector3);
-
-        getDefinition(): ConeTwistConstraintDefinition;
-        setLimit( x: number, y: number, z: number ): void;
-        enableMotor(): void;
-        setMaxMotorImpulse( max_impulse: number ): void;
-        setMotorTarget( target: THREE.Vector3 ): void;
-        setMotorTarget( target: THREE.Euler ): void;
-        setMotorTarget( target: THREE.Matrix4 ): void;
-        disableMotor(): void;
-
-    }
-
-    export interface DOFConstraintDefinition {
-        type: string;
-        id: number;
-        objecta: THREE.Object3D;
-        objectb: THREE.Object3D;
-        positiona: THREE.Vector3;
-        positionb: THREE.Vector3;
-        axisa: THREE.Vector3;
-        axisb: THREE.Vector3;
-    }
-
-    export class DOFConstraint implements Constraint {
-        constructor(objecta: THREE.Object3D, objectb: THREE.Object3D, position?: THREE.Vector3);
-
-        getDefinition(): DOFConstraintDefinition;
-        setLinearLowerLimit(limit: THREE.Vector3): void;
-        setLinearUpperLimit(limit: THREE.Vector3): void;
-        setAngularLowerLimit(limit: THREE.Vector3): void;
-        setAngularUpperLimit(limit: THREE.Vector3): void;
-        enableAngularMotor( which: number ): void;
-        configureAngularMotor( which: number, low_angle: number, high_angle: number, velocity: number, max_force: number ): void;
-        disableAngularMotor( which: number ): void;
-    }
-    export var scripts: {
-        worker: string;
-        ammo: string;
-    };
-
-    export interface SceneParameters {
-        ammo?: string;
-        fixedTimeStep?: number;
-        rateLimit?: boolean;
-    }
-
-    export class Scene extends THREE.Scene {
-        constructor(param?: SceneParameters);
-
-        addConstraint(constraint:Constraint, show_marker?:boolean):void;
-        onSimulationResume():void;
-        removeConstraint(constraint:Constraint):void;
-        execute(cmd:string, params:any):void;
-        add(object:THREE.Object3D):void;
-        remove(object:THREE.Object3D):void;
-        setFixedTimeStep(fixedTimeStep:number):void;
-        setGravity(gravity:number):void;
-        simulate(timeStep?:number, maxSubSteps?:number):boolean;
-
-
-        // Eventable mixins
-        addEventListener( event_name: string, callback: (event: any) => void ): void;
-        removeEventListener( event_name: string, callback: (event: any) => void): void;
-        dispatchEvent( event_name: string ): void;
-
-        // (extends from Object3D)
-        dispatchEvent( event: { type: string; target: any; } ): void;
-    }
-
-    export class Mesh extends THREE.Mesh {
-        constructor(geometry:THREE.Geometry, material?:THREE.Material, mass?:number);
-
-        applyCentralImpulse(force:THREE.Vector3):void;
-        applyImpulse(force:THREE.Vector3, offset:THREE.Vector3):void;
-        applyCentralForce(force:THREE.Vector3):void;
-        applyForce(force:THREE.Vector3, offset:THREE.Vector3):void;
-        getAngularVelocity():THREE.Vector3;
-        setAngularVelocity(velocity:THREE.Vector3):void;
-        getLinearVelocity():THREE.Vector3;
-        setLinearVelocity(velocity:THREE.Vector3):void;
-        setAngularFactor(factor:THREE.Vector3):void;
-        setLinearFactor(factor:THREE.Vector3):void;
-        setDamping(linear:number, angular:number):void;
-        setCcdMotionThreshold(threshold:number):void;
-        setCcdSweptSphereRadius(radius:number):void;
-
-
-        // Eventable mixins
-        addEventListener( event_name: string, callback: (event: any) => void ): void;
-        removeEventListener( event_name: string, callback: (event: any) => void): void;
-        dispatchEvent( event_name: string ): void;
-
-        // (extends from Object3D)
-        dispatchEvent( event: { type: string; target: any; } ): void;
-    }
-
-    export class PlaneMesh extends Mesh {
-        constructor(geometry:THREE.Geometry, material:THREE.Material, mass?:number);
-
-    }
-
-    export class HeightfieldMesh extends Mesh {
-        constructor(geometry:THREE.Geometry, material:THREE.Material, mass?:number, xdiv?:number, ydiv?:number);
-    }
-
-    export class BoxMesh extends Mesh {
-        constructor(geometry:THREE.Geometry, material:THREE.Material, mass?:number);
-    }
-
-    export class SphereMesh extends Mesh {
-        constructor(geometry:THREE.Geometry, material:THREE.Material, mass?:number);
-    }
-
-    export class CylinderMesh extends Mesh {
-        constructor(geometry:THREE.Geometry, material:THREE.Material, mass?:number);
-    }
-
-    export class CapsuleMesh extends Mesh {
-        constructor(geometry:THREE.Geometry, material:THREE.Material, mass?:number);
-    }
-
-    export class ConeMesh extends Mesh {
-        constructor(geometry:THREE.Geometry, material:THREE.Material, mass?:number);
-    }
-
-    export class ConcaveMesh extends Mesh {
-        constructor(geometry:THREE.Geometry, material:THREE.Material, mass?:number);
-    }
-
-    export class ConvexMesh extends Mesh {
-        constructor(geometry:THREE.Geometry, material:THREE.Material, mass?:number);
-    }
-
-    export class Vehicle {
-        constructor(mesh:Mesh, tuning?:VehicleTuning);
-
-        mesh:THREE.Mesh;
-        wheels:THREE.Mesh[];
-
-        addWheel(wheel_geometry:THREE.Geometry, wheel_material:THREE.Material, connection_point:THREE.Vector3, wheel_direction:THREE.Vector3, wheel_axle:THREE.Vector3, suspension_rest_length:number, wheel_radius:number, is_front_wheel:boolean, tuning?:VehicleTuning): void;
-        setSteering(amount: number, wheel?: THREE.Mesh): void;
-        setBrake(amount: number, wheel?: THREE.Mesh): void;
-        applyEngineForce(amount: number, wheel?: THREE.Mesh): void;
-    }
-
-    export class VehicleTuning {
-        constructor(suspension_stiffness?:number, suspension_compression?:number, suspension_damping?:number, max_suspension_travel?:number, friction_slip?:number, max_suspension_force?:number);
-
-        suspension_stiffness:number;
-        suspension_compression:number;
-        suspension_damping:number;
-        max_suspension_travel:number;
-        friction_slip:number;
-        max_suspension_force:number;
-    }
-}
-
diff --git a/physijs/tests/body.ts b/physijs/tests/body.ts
index 649805c035..83924a9a4d 100644
--- a/physijs/tests/body.ts
+++ b/physijs/tests/body.ts
@@ -1,6 +1,4 @@
-/// <reference path="../../stats/stats.d.ts" />
-/// <reference path="../physijs.d.ts" />
-/// <reference path="../../threejs/three-projector.d.ts" />
+/// <reference types="stats" />
 
 Physijs.scripts.worker = '../physijs_worker.js';
 Physijs.scripts.ammo = 'examples/js/ammo.js';
diff --git a/physijs/tests/collisions.ts b/physijs/tests/collisions.ts
index bc43a60d67..82cb9f9589 100644
--- a/physijs/tests/collisions.ts
+++ b/physijs/tests/collisions.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../stats/stats.d.ts" />
-/// <reference path="../physijs.d.ts" />
+/// <reference types="stats" />
+
 
 
 Physijs.scripts.worker = '../physijs_worker.js';
diff --git a/physijs/tests/compound.ts b/physijs/tests/compound.ts
index bfd103ca76..36e4a48e1a 100644
--- a/physijs/tests/compound.ts
+++ b/physijs/tests/compound.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../stats/stats.d.ts" />
-/// <reference path="../physijs.d.ts" />
+/// <reference types="stats" />
+
 
 
 Physijs.scripts.worker = '../physijs_worker.js';
diff --git a/physijs/tests/constraints_car.ts b/physijs/tests/constraints_car.ts
index 4202b0c041..4e343c06d1 100644
--- a/physijs/tests/constraints_car.ts
+++ b/physijs/tests/constraints_car.ts
@@ -1,6 +1,4 @@
-/// <reference path="../../stats/stats.d.ts" />
-/// <reference path="../physijs.d.ts" />
-/// <reference path="../../threejs/three-projector.d.ts" />
+/// <reference types="stats" />
 
 Physijs.scripts.worker = '../physijs_worker.js';
 Physijs.scripts.ammo = 'examples/js/ammo.js';
diff --git a/physijs/tests/heightfield.ts b/physijs/tests/heightfield.ts
index 19d0e8c789..30caf48398 100644
--- a/physijs/tests/heightfield.ts
+++ b/physijs/tests/heightfield.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../stats/stats.d.ts" />
-/// <reference path="../physijs.d.ts" />
+/// <reference types="stats" />
+
 
 var TWEEN: any;
 var SimplexNoise: any;
diff --git a/physijs/tests/jenga.ts b/physijs/tests/jenga.ts
index 77b9c6cd6a..43a4d924de 100644
--- a/physijs/tests/jenga.ts
+++ b/physijs/tests/jenga.ts
@@ -1,6 +1,4 @@
-/// <reference path="../../stats/stats.d.ts" />
-/// <reference path="../physijs.d.ts" />
-/// <reference path="../../threejs/three-projector.d.ts" />
+/// <reference types="stats" />
 
 Physijs.scripts.worker = '../physijs_worker.js';
 Physijs.scripts.ammo = 'examples/js/ammo.js';
diff --git a/physijs/tests/memorytest-compound.ts b/physijs/tests/memorytest-compound.ts
index 0455b71f21..b755092ac2 100644
--- a/physijs/tests/memorytest-compound.ts
+++ b/physijs/tests/memorytest-compound.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../stats/stats.d.ts" />
-/// <reference path="../physijs.d.ts" />
+/// <reference types="stats" />
+
 
 
 Physijs.scripts.worker = '../physijs_worker.js';
diff --git a/physijs/tests/memorytest-convex.ts b/physijs/tests/memorytest-convex.ts
index ba5605e9fa..4a73bd6130 100644
--- a/physijs/tests/memorytest-convex.ts
+++ b/physijs/tests/memorytest-convex.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../stats/stats.d.ts" />
-/// <reference path="../physijs.d.ts" />
+/// <reference types="stats" />
+
 
 
 Physijs.scripts.worker = '../physijs_worker.js';
diff --git a/physijs/tests/memorytest.ts b/physijs/tests/memorytest.ts
index 27151953dc..4b5d6ac325 100644
--- a/physijs/tests/memorytest.ts
+++ b/physijs/tests/memorytest.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../stats/stats.d.ts" />
-/// <reference path="../physijs.d.ts" />
+/// <reference types="stats" />
+
 
 
 Physijs.scripts.worker = '../physijs_worker.js';
diff --git a/physijs/tests/shapes.ts b/physijs/tests/shapes.ts
index c9c2242262..b5cecd0262 100644
--- a/physijs/tests/shapes.ts
+++ b/physijs/tests/shapes.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../stats/stats.d.ts" />
-/// <reference path="../physijs.d.ts" />
+/// <reference types="stats" />
+
 
 
 var TWEEN: any;
diff --git a/physijs/tests/vehicle.ts b/physijs/tests/vehicle.ts
index ef064f0387..b133299a5b 100644
--- a/physijs/tests/vehicle.ts
+++ b/physijs/tests/vehicle.ts
@@ -1,6 +1,4 @@
-/// <reference path="../../stats/stats.d.ts" />
-/// <reference path="../physijs.d.ts" />
-/// <reference path="../../threejs/three-projector.d.ts" />
+/// <reference types="stats" />
 
 var TWEEN: any;
 var SimplexNoise: any;
diff --git a/physijs/tsconfig.json b/physijs/tsconfig.json
new file mode 100644
index 0000000000..fa468084a2
--- /dev/null
+++ b/physijs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "physijs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pi-spi/index.d.ts b/pi-spi/index.d.ts
new file mode 100644
index 0000000000..00d02e3865
--- /dev/null
+++ b/pi-spi/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for pi-spi
+// Project: https://github.com/natevw/pi-spi
+// Definitions by: Marcel Ernst <https://github.com/marcel-ernst>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export = __PI_SPI;
+
+declare namespace __PI_SPI {
+    
+    enum mode {
+        CPHA = 0x01,
+        CPOL = 0x02
+    }
+
+    enum order {
+        MSB_FIRST = 0,
+        LSB_FIRST = 1
+    }
+
+    function initialize(device:string):__PI_SPI.SPI;
+
+    class SPI {
+        clockSpeed():number;
+        clockSpeed(speed:number):void;
+
+        dataMode():number;
+        dataMode(mode:mode):void;
+
+        bitOrder():number;
+        bitOrder(order:order):void;
+
+
+        write(writebuf:Buffer, cb:(error:Error,data:Buffer) => void):void;
+        read(readcount:number, cb:(error:Error,data:Buffer) => void):void;
+
+        transfer(writebuf:Buffer, cb:(error:Error,data:Buffer) => void ):void;
+        transfer(writebuf:Buffer, readcount:number, cb:(error:Error,data:Buffer) => void ):void;
+
+        close():void;
+    }
+}
\ No newline at end of file
diff --git a/pi-spi/pi-spi-tests.ts b/pi-spi/pi-spi-tests.ts
index 9ec08f1ba3..62c8bdf95d 100644
--- a/pi-spi/pi-spi-tests.ts
+++ b/pi-spi/pi-spi-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="pi-spi" />
 
 import * as piSPI from 'pi-spi';
 
diff --git a/pi-spi/pi-spi.d.ts b/pi-spi/pi-spi.d.ts
deleted file mode 100644
index c535bd0bba..0000000000
--- a/pi-spi/pi-spi.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// Type definitions for pi-spi
-// Project: https://github.com/natevw/pi-spi
-// Definitions by: Marcel Ernst <https://github.com/marcel-ernst>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare namespace __PI_SPI {
-    
-    enum mode {
-        CPHA = 0x01,
-        CPOL = 0x02
-    }
-
-    enum order {
-        MSB_FIRST = 0,
-        LSB_FIRST = 1
-    }
-
-    function initialize(device:string):__PI_SPI.SPI;
-
-    class SPI {
-        clockSpeed():number;
-        clockSpeed(speed:number):void;
-
-        dataMode():number;
-        dataMode(mode:mode):void;
-
-        bitOrder():number;
-        bitOrder(order:order):void;
-
-
-        write(writebuf:Buffer, cb:(error:Error,data:Buffer) => void):void;
-        read(readcount:number, cb:(error:Error,data:Buffer) => void):void;
-
-        transfer(writebuf:Buffer, cb:(error:Error,data:Buffer) => void ):void;
-        transfer(writebuf:Buffer, readcount:number, cb:(error:Error,data:Buffer) => void ):void;
-
-        close():void;
-    }
-}
-
-
-declare module "pi-spi" {
-    export = __PI_SPI;
-}
\ No newline at end of file
diff --git a/pi-spi/tsconfig.json b/pi-spi/tsconfig.json
new file mode 100644
index 0000000000..828f42f401
--- /dev/null
+++ b/pi-spi/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pi-spi-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pickadate/index.d.ts b/pickadate/index.d.ts
new file mode 100644
index 0000000000..18c9924461
--- /dev/null
+++ b/pickadate/index.d.ts
@@ -0,0 +1,545 @@
+// Type definitions for pickadate.js 3.5.5
+// Project: https://github.com/amsul/pickadate.js
+// Definitions by: Theodore Brown <https://github.com/theodorejb/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="jquery" />
+
+declare namespace Pickadate {
+    // KlassOptions shared between date and time pickers
+    interface KlassOptions {
+        // The element states
+        input?: string; // default 'picker__input'
+        active?: string; // default 'picker__input--active'
+
+        // The root picker and states
+        picker?: string; // default 'picker' or 'picker picker--time'
+        opened?: string; // default 'picker--opened'
+        focused?: string; // default 'picker--focused'
+
+        // The picker holder
+        holder?: string; // default 'picker__holder'
+
+        // The picker frame, wrapper, and box
+        frame?: string; // default 'picker__frame'
+        wrap?: string; // default 'picker__wrap'
+        box?: string; // default 'picker__box'
+
+        // Day/Time states
+        disabled?: string; // default 'picker__day--disabled' or 'picker__list-item--disabled'
+        selected?: string // default 'picker__day--selected' or 'picker__list-item--selected'
+        highlighted?: string // default 'picker__day--highlighted' or 'picker__list-item--highlighted'
+        now?: string; // default 'picker__day--today' or 'picker__list-item--now'
+
+        // Clear button
+        buttonClear?: string; // default 'picker__button--clear'
+    }
+
+    interface DateKlassOptions extends KlassOptions {
+        // The picker header
+        header?: string; // default 'picker__header'
+
+        // Month navigation
+        navPrev?: string; // default 'picker__nav--prev'
+        navNext?: string; // default 'picker__nav--next'
+        navDisabled?: string; // default 'picker__nav--disabled'
+
+        // Month & year labels
+        month?: string; // default 'picker__month'
+        year?: string; // default 'picker__year'
+
+        // Month & year dropdowns
+        selectMonth?: string; // default 'picker__select--month'
+        selectYear?: string; // default 'picker__select--year'
+
+        // Table of dates
+        table?: string; // default 'picker__table'
+
+        // Weekday labels
+        weekdays?: string; // default 'picker__weekday'
+
+        // Day states
+        day?: string; // default 'picker__day'
+        infocus?: string; // default 'picker__day--infocus'
+        outfocus?: string; // default 'picker__day--outfocus'
+
+        // The picker footer
+        footer?: string; // default 'picker__footer'
+
+        // Today & close buttons
+        buttonClose?: string; // default 'picker__button--close'
+        buttonToday?: string; // default 'picker__button--today'
+    }
+
+    interface TimeKlassOptions extends KlassOptions {
+        // The root picker
+        picker?: string; // default 'picker picker--time'
+
+        // List of times
+        list?: string; // default 'picker__list'
+        listItem?: string; // default 'picker__list-item'
+
+        // Time states
+        viewset?: string; // default 'picker__list-item--viewset'
+    }
+
+    // options shared between date and time pickers
+    interface Options {
+        /**
+         * Set the clear button text.
+         * Defaults to 'Clear'
+         */
+        clear?: string;
+
+        /**
+         * The human-friendly display format.
+         * Escape any "rule" characters with an exclamation mark (!).
+         * Defaults to 'd mmmm, yyyy'
+         */
+        format?: string;
+
+        /**
+         * An alternate format to submit to the server.
+         * Defaults to undefined.
+         */
+        formatSubmit?: string;
+
+        /**
+         * An optional name prefix for the new hidden input element used
+         * when a custom human-friendly display format is specified.
+         * Defaults to undefined.
+         */
+        hiddenPrefix?: string;
+
+        /**
+         * An optional name suffix for the new hidden input element used
+         * when a custom human-friendly display format is specified.
+         * Defaults to '_submit'
+         */
+        hiddenSuffix?: string;
+
+        /**
+         * A majority of the time, the value that needs to be sent to the server
+         * is just the hidden value and not the visible one. To make this happen,
+         * use the hiddenName option. This essentially nullifies the hiddenPrefix
+         * and hiddenSuffix, strips the name attribute from the source input, and
+         * then sets it as the name of the hidden input. Defaults to undefined.
+         */
+        hiddenName?: boolean;
+
+        /**
+         * By default, typing into the input is disabled by giving it a readOnly
+         * attribute. Setting the editable option to true allows the input field
+         * to be edited directly.
+         */
+        editable?: boolean;
+
+        /**
+         * Specify where to insert the picker's root element by passing any
+         * valid CSS selector to this option. Defaults to undefined.
+         */
+        container?: string;
+
+        /**
+         * The hidden input container.
+         * Defaults to undefined.
+         */
+        containerHidden?: string;
+
+        /**
+         * Whether or not to close the picker when a date is selected.
+         * Defaults to `true`.
+         */
+        closeOnSelect?: boolean;
+
+        /**
+         * Whether or not to close the picker when the "clear" button is pressed.
+         * Defaults to `true`.
+         */
+        closeOnClear?: boolean;
+
+        // Events
+        onStart?: (event: any) => void;
+        onRender?: (event: any) => void;
+        onOpen?: (event: any) => void;
+        onClose?: (event: any) => void;
+        onSet?: (event: any) => void;
+        onStop?: (event: any) => void;
+    }
+
+    type MinOrMaxDateOption = Date | [number, number, number] | number | boolean;
+    type MinOrMaxTimeOption = Date | [number, number] | number | boolean;
+
+    export interface DateOptions extends Options {
+        // Strings and translations
+        monthsFull?: string[]; // default 'January' through 'December'
+        monthsShort?: string[]; // default 'Jan' through 'Dec'
+        weekdaysFull?: string[]; // default 'Sunday' through 'Saturday'
+        weekdaysShort?: string[]; // default 'Sun' through 'Sat'
+        showMonthsShort?: boolean;
+        showWeekdaysFull?: boolean;
+
+        // Buttons
+        today?: string; // default 'Today'
+        close?: string; // default 'Close'
+
+        // Accessibility labels
+        labelMonthNext?: string; // default 'Next month'
+        labelMonthPrev?: string; // default 'Previous month'
+        labelMonthSelect?: string; // default 'Select a month'
+        labelYearSelect?: string; //default 'Select a year'
+
+        /**
+         * True enables the dropdown selector and false replaces it with text.
+         * You can also specify the number of years to show in the dropdown
+         * using an even integer - half before and half after the year in focus.
+         * If true the value will default to 10.
+         */
+        selectYears?: boolean | number;
+
+        /**
+         * True enables the dropdown selector and false replaces it with text
+         */
+        selectMonths?: boolean;
+
+        /**
+         * The first day of the week can be set to either Sunday or Monday.
+         * True or 1 sets it as Monday and false or 0 as Sunday.
+         */
+        firstDay?: boolean | number;
+
+        /**
+         * Set the minimum selectable date on the picker. Accepts a Date object,
+         * array formatted as [YEAR, MONTH, DATE], a positive or negative integer
+         * for a date relative to today, or a boolean (`true` sets it to today,
+         * `false` removes any limit).
+         */
+        min?: MinOrMaxDateOption;
+
+        /**
+         * Set the maximum selectable date on the picker.
+         * Accepts the same values as the `min` property.
+         */
+        max?: MinOrMaxDateOption;
+
+        /**
+         * Disable a specific or arbitrary set of dates selectable on the
+         * picker. Accepts an array of Date objects, arrays formatted as
+         * [YEAR, MONTH, DATE], integers representing days of the week
+         * (from 1 to 7), or objects with a range of dates. Switch to a
+         * whitelist by setting `true` as the first item in the collection.
+         * Enable dates that fall within a range of disabled dates by
+         * adding an `inverted` parameter to the item within the collection.
+         */
+        disable?: any[];
+
+        // Classes
+        klass?: DateKlassOptions;
+    }
+
+    export interface TimeOptions extends Options {
+        /**
+         * The formatLabel option is unique. It can contain HTML and it can
+         * also be a function if you want to create the label during run-time.
+         */
+        formatLabel?: string | ((time: TimeItem) => string);
+
+        /**
+         * Choose the interval in minutes between each time in the list.
+         * Default is 30.
+         */
+        interval?: number;
+
+        /**
+         * Set the minimum selectable time on the picker. Accepts a Date object,
+         * array formatted as [HOUR, MINUTE], a positive or negative integer
+         * for a time relative to now, or a boolean (`true` sets it to now, and
+         * `false` removes any limit).
+         */
+        min?: MinOrMaxTimeOption;
+
+        /**
+         * Set the maximum selectable time on the picker.
+         * Accepts the same values as the `min` property.
+         */
+        max?: MinOrMaxTimeOption;
+
+        /**
+         * Disable a specific or arbitrary set of times selectable on the picker.
+         * Accepts an array of Date objects, arrays formatted as [HOUR, MINUTE],
+         * integers representing hours (from 0 to 23), or objects with a range of
+         * times. Switch to a whitelist by setting `true` as the first item in the
+         * collection. Enable times that fall within a range of disabled times by
+         * adding an `inverted` parameter to the item within the collection.
+         */
+        disable?: any[];
+
+        // Classes
+        klass?: TimeKlassOptions;
+    }
+
+    interface Item {
+        /**
+         * The "pick" value used for comparisons.
+         */
+        pick: number;
+    }
+
+    export interface DateItem extends Item {
+        /**
+         * The full year.
+         */
+        year: number;
+
+        /**
+         * The month with zero-as-index.
+         */
+        month: number;
+
+        /**
+         * The date of the month.
+         */
+        date: number;
+
+        /**
+         * The day of the week with zero-as-index.
+         */
+        day: number;
+
+        /**
+         * The underlying JavaScript Date object.
+         */
+        obj: Date;
+    }
+
+    export interface TimeItem extends Item {
+        /**
+         * Hour of the day from 0 to 23.
+         */
+        hour: number;
+
+        /**
+         * The minutes of the hour from 0 to 59 (based on the interval).
+         */
+        mins: number;
+    }
+
+    export interface CallbackObject {
+        open?: () => void;
+        close?: () => void;
+        render?: () => void;
+        start?: () => void;
+        stop?: () => void;
+        set?: (thingSet: any) => void;
+    }
+
+    export interface SetObject {
+        clear?: any;
+        select?: any;
+        highlight?: any;
+        view?: any;
+        min?: any;
+        max?: any;
+        disable?: any;
+        enable?: any;
+    }
+
+    export interface TimeSetObject extends SetObject {
+        /**
+         * Choose the minutes interval between each time in the list.
+         * Defaults to 30.
+         */
+        interval?: number;
+    }
+
+    export interface SetOptions {
+        /**
+         * By default, any callbacks bound with the on method will be fired
+         * when its relevant thing is set. To silently set a thing, pass an
+         * options object with the muted parameter set to true.
+         */
+        muted?: boolean;
+        format?: string;
+    }
+
+    interface Picker<TPickerObject, TItemObject extends Item, TOptions extends SetObject> {
+        /**
+         * The picker's relative input element wrapped as a jQuery object.
+         */
+        $node: JQuery;
+
+        /**
+         * The picker's relative root holder element wrapped as a jQuery object.
+         */
+        $root: JQuery;
+
+        /**
+         * This is the picker’s relative hidden element, which is undefined if
+         * there’s no formatSubmit option. There should be no reason to use this
+         * – it's mostly for internal use. If you have a valid reason for using
+         * this, please mention it in the issues.
+         */
+        _hidden: HTMLInputElement;
+
+        open(withoutFocus?: boolean): TPickerObject;
+        close(withFocus?: boolean): TPickerObject;
+
+        /**
+         * Rebuild the picker.
+         */
+        start(): TPickerObject;
+
+        /**
+         * Destroy the picker.
+         */
+        stop(): TPickerObject;
+
+        /**
+         * Refresh the picker box after adding something to the holder.
+         * By default, only the "face" of the picker (i.e. the box element)
+         * has it’s contents re-rendered. To render the entire picker from
+         * the root up, pass true as the first argument.
+         */
+        render(entirePicker?: boolean): TPickerObject;
+
+        /**
+         * Clear the value in the picker's input element.
+         */
+        clear(): TPickerObject;
+
+        /**
+         * Short for picker.get('value')
+         */
+        get(): string;
+
+        /**
+         * Get the properties, objects, and states that make up the current
+         * state of the picker.
+         */
+        get(thing: string): any;
+
+        /**
+         * Returns the string value of the picker's input element.
+         */
+        get(thing: 'value'): string;
+
+        /**
+         * Returns the item object that is visually selected.
+         */
+        get(thing: 'select'): TItemObject;
+
+        /**
+         * Returns the item object that is visually highlighted.
+         */
+        get(thing: 'highlight'): TItemObject;
+
+        /**
+         * Returns the item object that sets the current view.
+         */
+        get(thing: 'view'): TItemObject;
+
+        /**
+         * Returns the item object that limits the picker's lower range.
+         */
+        get(thing: 'min'): TItemObject;
+
+        /**
+         * Returns the item object that limits the picker's upper range.
+         */
+        get(thing: 'max'): TItemObject;
+
+        /**
+         * Returns a boolean value of whether the picker is open or not.
+         */
+        get(thing: 'open'): boolean;
+
+        /**
+         * Returns a boolean value of whether the picker has started or not.
+         */
+        get(thing: 'start'): boolean;
+
+        /**
+         * Returns a unique 9-digit integer that is the ID of the picker.
+         */
+        get(thing: 'id'): number;
+
+        /**
+         * Returns an array of items that determine which item objects to
+         * disable on the picker.
+         */
+        get(thing: 'disable'): any[];
+
+        /**
+         * Returns a formatted string for the item object specified by `thing`
+         */
+        get(thing: string, format: string): string;
+
+        /**
+         * Set the properties, objects, and states to change the state of the picker.
+         */
+        set(thing: string, value?: any, options?: SetOptions): TPickerObject;
+        set(things: TOptions, options?: SetOptions): TPickerObject;
+
+        /**
+         * Bind callbacks to get fired off when the relative picker method is called.
+         */
+        on(methodName: string, callback: (data?: any) => void): TPickerObject;
+
+        /**
+         * Bind multiple callbacks at once to get fired off when the relative
+         * picker method is called.
+         */
+        on(callbackObject: CallbackObject): TPickerObject;
+
+        /**
+         * Unbind callbacks that are bound using the on method.
+         */
+        off(...methodName: string[]): TPickerObject;
+
+        /**
+         * Trigger callbacks that have been queued up using the the on method.
+         */
+        trigger(event: string, data?: any): TPickerObject;
+    }
+
+    export interface DatePicker extends Picker<DatePicker, DateItem, SetObject> { }
+    export interface TimePicker extends Picker<TimePicker, TimeItem, TimeSetObject> { }
+}
+
+interface JQuery {
+    /**
+     * Access the API object on an initialized date picker element.
+     */
+    pickadate(keyword: "picker"): Pickadate.DatePicker;
+    pickadate(objectName: "$node"): JQuery;
+    pickadate(objectName: "$root"): JQuery;
+    pickadate(objectName: "_hidden"): HTMLInputElement;
+
+    /**
+     * Invoke API methods after date picker initialization.
+     */
+    pickadate(methodName: string, ...arguments: any[]): any;
+
+    /**
+     * Initialize a date picker.
+     */
+    pickadate(options?: Pickadate.DateOptions): JQuery;
+
+    /**
+     * Access the API object on an initialized time picker element.
+     */
+    pickatime(keyword: "picker"): Pickadate.TimePicker;
+    pickatime(objectName: "$node"): JQuery;
+    pickatime(objectName: "$root"): JQuery;
+    pickatime(objectName: "_hidden"): HTMLInputElement;
+
+    /**
+     * Invoke API methods after time picker initialization.
+     */
+    pickatime(methodName: string, ...arguments: any[]): any;
+
+    /**
+     * Initialize a time picker.
+     */
+    pickatime(options?: Pickadate.TimeOptions): JQuery;
+}
diff --git a/pickadate/pickadate-tests.ts b/pickadate/pickadate-tests.ts
index 21bc5b074f..837b69511f 100644
--- a/pickadate/pickadate-tests.ts
+++ b/pickadate/pickadate-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="pickadate.d.ts" />
-
 // Date picker tests from http://amsul.ca/pickadate.js/date/
 
 $('.datepicker').pickadate();
diff --git a/pickadate/pickadate.d.ts b/pickadate/pickadate.d.ts
deleted file mode 100644
index 53b8c583d0..0000000000
--- a/pickadate/pickadate.d.ts
+++ /dev/null
@@ -1,545 +0,0 @@
-// Type definitions for pickadate.js 3.5.5
-// Project: https://github.com/amsul/pickadate.js
-// Definitions by: Theodore Brown <https://github.com/theodorejb/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../jquery/jquery.d.ts" />
-
-declare namespace Pickadate {
-    // KlassOptions shared between date and time pickers
-    interface KlassOptions {
-        // The element states
-        input?: string; // default 'picker__input'
-        active?: string; // default 'picker__input--active'
-
-        // The root picker and states
-        picker?: string; // default 'picker' or 'picker picker--time'
-        opened?: string; // default 'picker--opened'
-        focused?: string; // default 'picker--focused'
-
-        // The picker holder
-        holder?: string; // default 'picker__holder'
-
-        // The picker frame, wrapper, and box
-        frame?: string; // default 'picker__frame'
-        wrap?: string; // default 'picker__wrap'
-        box?: string; // default 'picker__box'
-
-        // Day/Time states
-        disabled?: string; // default 'picker__day--disabled' or 'picker__list-item--disabled'
-        selected?: string // default 'picker__day--selected' or 'picker__list-item--selected'
-        highlighted?: string // default 'picker__day--highlighted' or 'picker__list-item--highlighted'
-        now?: string; // default 'picker__day--today' or 'picker__list-item--now'
-
-        // Clear button
-        buttonClear?: string; // default 'picker__button--clear'
-    }
-
-    interface DateKlassOptions extends KlassOptions {
-        // The picker header
-        header?: string; // default 'picker__header'
-
-        // Month navigation
-        navPrev?: string; // default 'picker__nav--prev'
-        navNext?: string; // default 'picker__nav--next'
-        navDisabled?: string; // default 'picker__nav--disabled'
-
-        // Month & year labels
-        month?: string; // default 'picker__month'
-        year?: string; // default 'picker__year'
-
-        // Month & year dropdowns
-        selectMonth?: string; // default 'picker__select--month'
-        selectYear?: string; // default 'picker__select--year'
-
-        // Table of dates
-        table?: string; // default 'picker__table'
-
-        // Weekday labels
-        weekdays?: string; // default 'picker__weekday'
-
-        // Day states
-        day?: string; // default 'picker__day'
-        infocus?: string; // default 'picker__day--infocus'
-        outfocus?: string; // default 'picker__day--outfocus'
-
-        // The picker footer
-        footer?: string; // default 'picker__footer'
-
-        // Today & close buttons
-        buttonClose?: string; // default 'picker__button--close'
-        buttonToday?: string; // default 'picker__button--today'
-    }
-
-    interface TimeKlassOptions extends KlassOptions {
-        // The root picker
-        picker?: string; // default 'picker picker--time'
-
-        // List of times
-        list?: string; // default 'picker__list'
-        listItem?: string; // default 'picker__list-item'
-
-        // Time states
-        viewset?: string; // default 'picker__list-item--viewset'
-    }
-
-    // options shared between date and time pickers
-    interface Options {
-        /**
-         * Set the clear button text.
-         * Defaults to 'Clear'
-         */
-        clear?: string;
-
-        /**
-         * The human-friendly display format.
-         * Escape any "rule" characters with an exclamation mark (!).
-         * Defaults to 'd mmmm, yyyy'
-         */
-        format?: string;
-
-        /**
-         * An alternate format to submit to the server.
-         * Defaults to undefined.
-         */
-        formatSubmit?: string;
-
-        /**
-         * An optional name prefix for the new hidden input element used
-         * when a custom human-friendly display format is specified.
-         * Defaults to undefined.
-         */
-        hiddenPrefix?: string;
-
-        /**
-         * An optional name suffix for the new hidden input element used
-         * when a custom human-friendly display format is specified.
-         * Defaults to '_submit'
-         */
-        hiddenSuffix?: string;
-
-        /**
-         * A majority of the time, the value that needs to be sent to the server
-         * is just the hidden value and not the visible one. To make this happen,
-         * use the hiddenName option. This essentially nullifies the hiddenPrefix
-         * and hiddenSuffix, strips the name attribute from the source input, and
-         * then sets it as the name of the hidden input. Defaults to undefined.
-         */
-        hiddenName?: boolean;
-
-        /**
-         * By default, typing into the input is disabled by giving it a readOnly
-         * attribute. Setting the editable option to true allows the input field
-         * to be edited directly.
-         */
-        editable?: boolean;
-
-        /**
-         * Specify where to insert the picker's root element by passing any
-         * valid CSS selector to this option. Defaults to undefined.
-         */
-        container?: string;
-
-        /**
-         * The hidden input container.
-         * Defaults to undefined.
-         */
-        containerHidden?: string;
-
-        /**
-         * Whether or not to close the picker when a date is selected.
-         * Defaults to `true`.
-         */
-        closeOnSelect?: boolean;
-
-        /**
-         * Whether or not to close the picker when the "clear" button is pressed.
-         * Defaults to `true`.
-         */
-        closeOnClear?: boolean;
-
-        // Events
-        onStart?: (event: any) => void;
-        onRender?: (event: any) => void;
-        onOpen?: (event: any) => void;
-        onClose?: (event: any) => void;
-        onSet?: (event: any) => void;
-        onStop?: (event: any) => void;
-    }
-
-    type MinOrMaxDateOption = Date | [number, number, number] | number | boolean;
-    type MinOrMaxTimeOption = Date | [number, number] | number | boolean;
-
-    export interface DateOptions extends Options {
-        // Strings and translations
-        monthsFull?: string[]; // default 'January' through 'December'
-        monthsShort?: string[]; // default 'Jan' through 'Dec'
-        weekdaysFull?: string[]; // default 'Sunday' through 'Saturday'
-        weekdaysShort?: string[]; // default 'Sun' through 'Sat'
-        showMonthsShort?: boolean;
-        showWeekdaysFull?: boolean;
-
-        // Buttons
-        today?: string; // default 'Today'
-        close?: string; // default 'Close'
-
-        // Accessibility labels
-        labelMonthNext?: string; // default 'Next month'
-        labelMonthPrev?: string; // default 'Previous month'
-        labelMonthSelect?: string; // default 'Select a month'
-        labelYearSelect?: string; //default 'Select a year'
-
-        /**
-         * True enables the dropdown selector and false replaces it with text.
-         * You can also specify the number of years to show in the dropdown
-         * using an even integer - half before and half after the year in focus.
-         * If true the value will default to 10.
-         */
-        selectYears?: boolean | number;
-
-        /**
-         * True enables the dropdown selector and false replaces it with text
-         */
-        selectMonths?: boolean;
-
-        /**
-         * The first day of the week can be set to either Sunday or Monday.
-         * True or 1 sets it as Monday and false or 0 as Sunday.
-         */
-        firstDay?: boolean | number;
-
-        /**
-         * Set the minimum selectable date on the picker. Accepts a Date object,
-         * array formatted as [YEAR, MONTH, DATE], a positive or negative integer
-         * for a date relative to today, or a boolean (`true` sets it to today,
-         * `false` removes any limit).
-         */
-        min?: MinOrMaxDateOption;
-
-        /**
-         * Set the maximum selectable date on the picker.
-         * Accepts the same values as the `min` property.
-         */
-        max?: MinOrMaxDateOption;
-
-        /**
-         * Disable a specific or arbitrary set of dates selectable on the
-         * picker. Accepts an array of Date objects, arrays formatted as
-         * [YEAR, MONTH, DATE], integers representing days of the week
-         * (from 1 to 7), or objects with a range of dates. Switch to a
-         * whitelist by setting `true` as the first item in the collection.
-         * Enable dates that fall within a range of disabled dates by
-         * adding an `inverted` parameter to the item within the collection.
-         */
-        disable?: any[];
-
-        // Classes
-        klass?: DateKlassOptions;
-    }
-
-    export interface TimeOptions extends Options {
-        /**
-         * The formatLabel option is unique. It can contain HTML and it can
-         * also be a function if you want to create the label during run-time.
-         */
-        formatLabel?: string | ((time: TimeItem) => string);
-
-        /**
-         * Choose the interval in minutes between each time in the list.
-         * Default is 30.
-         */
-        interval?: number;
-
-        /**
-         * Set the minimum selectable time on the picker. Accepts a Date object,
-         * array formatted as [HOUR, MINUTE], a positive or negative integer
-         * for a time relative to now, or a boolean (`true` sets it to now, and
-         * `false` removes any limit).
-         */
-        min?: MinOrMaxTimeOption;
-
-        /**
-         * Set the maximum selectable time on the picker.
-         * Accepts the same values as the `min` property.
-         */
-        max?: MinOrMaxTimeOption;
-
-        /**
-         * Disable a specific or arbitrary set of times selectable on the picker.
-         * Accepts an array of Date objects, arrays formatted as [HOUR, MINUTE],
-         * integers representing hours (from 0 to 23), or objects with a range of
-         * times. Switch to a whitelist by setting `true` as the first item in the
-         * collection. Enable times that fall within a range of disabled times by
-         * adding an `inverted` parameter to the item within the collection.
-         */
-        disable?: any[];
-
-        // Classes
-        klass?: TimeKlassOptions;
-    }
-
-    interface Item {
-        /**
-         * The "pick" value used for comparisons.
-         */
-        pick: number;
-    }
-
-    export interface DateItem extends Item {
-        /**
-         * The full year.
-         */
-        year: number;
-
-        /**
-         * The month with zero-as-index.
-         */
-        month: number;
-
-        /**
-         * The date of the month.
-         */
-        date: number;
-
-        /**
-         * The day of the week with zero-as-index.
-         */
-        day: number;
-
-        /**
-         * The underlying JavaScript Date object.
-         */
-        obj: Date;
-    }
-
-    export interface TimeItem extends Item {
-        /**
-         * Hour of the day from 0 to 23.
-         */
-        hour: number;
-
-        /**
-         * The minutes of the hour from 0 to 59 (based on the interval).
-         */
-        mins: number;
-    }
-
-    export interface CallbackObject {
-        open?: () => void;
-        close?: () => void;
-        render?: () => void;
-        start?: () => void;
-        stop?: () => void;
-        set?: (thingSet: any) => void;
-    }
-
-    export interface SetObject {
-        clear?: any;
-        select?: any;
-        highlight?: any;
-        view?: any;
-        min?: any;
-        max?: any;
-        disable?: any;
-        enable?: any;
-    }
-
-    export interface TimeSetObject extends SetObject {
-        /**
-         * Choose the minutes interval between each time in the list.
-         * Defaults to 30.
-         */
-        interval?: number;
-    }
-
-    export interface SetOptions {
-        /**
-         * By default, any callbacks bound with the on method will be fired
-         * when its relevant thing is set. To silently set a thing, pass an
-         * options object with the muted parameter set to true.
-         */
-        muted?: boolean;
-        format?: string;
-    }
-
-    interface Picker<TPickerObject, TItemObject extends Item, TOptions extends SetObject> {
-        /**
-         * The picker's relative input element wrapped as a jQuery object.
-         */
-        $node: JQuery;
-
-        /**
-         * The picker's relative root holder element wrapped as a jQuery object.
-         */
-        $root: JQuery;
-
-        /**
-         * This is the picker’s relative hidden element, which is undefined if
-         * there’s no formatSubmit option. There should be no reason to use this
-         * – it's mostly for internal use. If you have a valid reason for using
-         * this, please mention it in the issues.
-         */
-        _hidden: HTMLInputElement;
-
-        open(withoutFocus?: boolean): TPickerObject;
-        close(withFocus?: boolean): TPickerObject;
-
-        /**
-         * Rebuild the picker.
-         */
-        start(): TPickerObject;
-
-        /**
-         * Destroy the picker.
-         */
-        stop(): TPickerObject;
-
-        /**
-         * Refresh the picker box after adding something to the holder.
-         * By default, only the "face" of the picker (i.e. the box element)
-         * has it’s contents re-rendered. To render the entire picker from
-         * the root up, pass true as the first argument.
-         */
-        render(entirePicker?: boolean): TPickerObject;
-
-        /**
-         * Clear the value in the picker's input element.
-         */
-        clear(): TPickerObject;
-
-        /**
-         * Short for picker.get('value')
-         */
-        get(): string;
-
-        /**
-         * Get the properties, objects, and states that make up the current
-         * state of the picker.
-         */
-        get(thing: string): any;
-
-        /**
-         * Returns the string value of the picker's input element.
-         */
-        get(thing: 'value'): string;
-
-        /**
-         * Returns the item object that is visually selected.
-         */
-        get(thing: 'select'): TItemObject;
-
-        /**
-         * Returns the item object that is visually highlighted.
-         */
-        get(thing: 'highlight'): TItemObject;
-
-        /**
-         * Returns the item object that sets the current view.
-         */
-        get(thing: 'view'): TItemObject;
-
-        /**
-         * Returns the item object that limits the picker's lower range.
-         */
-        get(thing: 'min'): TItemObject;
-
-        /**
-         * Returns the item object that limits the picker's upper range.
-         */
-        get(thing: 'max'): TItemObject;
-
-        /**
-         * Returns a boolean value of whether the picker is open or not.
-         */
-        get(thing: 'open'): boolean;
-
-        /**
-         * Returns a boolean value of whether the picker has started or not.
-         */
-        get(thing: 'start'): boolean;
-
-        /**
-         * Returns a unique 9-digit integer that is the ID of the picker.
-         */
-        get(thing: 'id'): number;
-
-        /**
-         * Returns an array of items that determine which item objects to
-         * disable on the picker.
-         */
-        get(thing: 'disable'): any[];
-
-        /**
-         * Returns a formatted string for the item object specified by `thing`
-         */
-        get(thing: string, format: string): string;
-
-        /**
-         * Set the properties, objects, and states to change the state of the picker.
-         */
-        set(thing: string, value?: any, options?: SetOptions): TPickerObject;
-        set(things: TOptions, options?: SetOptions): TPickerObject;
-
-        /**
-         * Bind callbacks to get fired off when the relative picker method is called.
-         */
-        on(methodName: string, callback: (data?: any) => void): TPickerObject;
-
-        /**
-         * Bind multiple callbacks at once to get fired off when the relative
-         * picker method is called.
-         */
-        on(callbackObject: CallbackObject): TPickerObject;
-
-        /**
-         * Unbind callbacks that are bound using the on method.
-         */
-        off(...methodName: string[]): TPickerObject;
-
-        /**
-         * Trigger callbacks that have been queued up using the the on method.
-         */
-        trigger(event: string, data?: any): TPickerObject;
-    }
-
-    export interface DatePicker extends Picker<DatePicker, DateItem, SetObject> { }
-    export interface TimePicker extends Picker<TimePicker, TimeItem, TimeSetObject> { }
-}
-
-interface JQuery {
-    /**
-     * Access the API object on an initialized date picker element.
-     */
-    pickadate(keyword: "picker"): Pickadate.DatePicker;
-    pickadate(objectName: "$node"): JQuery;
-    pickadate(objectName: "$root"): JQuery;
-    pickadate(objectName: "_hidden"): HTMLInputElement;
-
-    /**
-     * Invoke API methods after date picker initialization.
-     */
-    pickadate(methodName: string, ...arguments: any[]): any;
-
-    /**
-     * Initialize a date picker.
-     */
-    pickadate(options?: Pickadate.DateOptions): JQuery;
-
-    /**
-     * Access the API object on an initialized time picker element.
-     */
-    pickatime(keyword: "picker"): Pickadate.TimePicker;
-    pickatime(objectName: "$node"): JQuery;
-    pickatime(objectName: "$root"): JQuery;
-    pickatime(objectName: "_hidden"): HTMLInputElement;
-
-    /**
-     * Invoke API methods after time picker initialization.
-     */
-    pickatime(methodName: string, ...arguments: any[]): any;
-
-    /**
-     * Initialize a time picker.
-     */
-    pickatime(options?: Pickadate.TimeOptions): JQuery;
-}
diff --git a/pickadate/tsconfig.json b/pickadate/tsconfig.json
new file mode 100644
index 0000000000..f61a134f17
--- /dev/null
+++ b/pickadate/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pickadate-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pify/index.d.ts b/pify/index.d.ts
new file mode 100644
index 0000000000..b7cdad5332
--- /dev/null
+++ b/pify/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for pify
+// Project: https://github.com/sindresorhus/pify
+// Definitions by: Sam Verschueren <https://github.com/samverschueren>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface PifyOptions {
+    multiArgs?: boolean,
+    include?: [string | RegExp],
+    exclude?: [string | RegExp],
+    excludeMain?: boolean
+}
+
+declare function pify(input: Function, promiseModule?: Function, options?: PifyOptions): (...args: any[]) => Promise<any>;
+declare function pify(input: any, promiseModule?: Function, options?: PifyOptions): any;
+declare function pify(input: Function, options?: PifyOptions): (...args: any[]) => Promise<any>;
+declare function pify(input: any, options?: PifyOptions): any;
+
+declare namespace pify { }
+export = pify;
diff --git a/pify/pify-tests.ts b/pify/pify-tests.ts
index b80657df76..2252005b85 100644
--- a/pify/pify-tests.ts
+++ b/pify/pify-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="pify.d.ts" />
-/// <reference path="../bluebird/bluebird.d.ts" />
+
+/// <reference types="bluebird" />
 
 import * as pify from 'pify';
 import * as Bluebird from 'bluebird';
diff --git a/pify/pify.d.ts b/pify/pify.d.ts
deleted file mode 100644
index a7a3eccab8..0000000000
--- a/pify/pify.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Type definitions for pify
-// Project: https://github.com/sindresorhus/pify
-// Definitions by: Sam Verschueren <https://github.com/samverschueren>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "pify" {
-    interface PifyOptions {
-        multiArgs?: boolean,
-        include?: [string | RegExp],
-        exclude?: [string | RegExp],
-        excludeMain?: boolean
-    }
-
-    function pify(input: Function, promiseModule?: Function, options?: PifyOptions): (...args:any[]) => Promise<any>;
-    function pify(input: any, promiseModule?: Function, options?: PifyOptions): any;
-    function pify(input: Function, options?: PifyOptions): (...args:any[]) => Promise<any>;
-    function pify(input: any, options?: PifyOptions): any;
-
-	namespace pify {}
-	export = pify;
-}
\ No newline at end of file
diff --git a/pify/tsconfig.json b/pify/tsconfig.json
new file mode 100644
index 0000000000..2f868fd8b6
--- /dev/null
+++ b/pify/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pikaday/index.d.ts b/pikaday/index.d.ts
new file mode 100644
index 0000000000..9f7131954e
--- /dev/null
+++ b/pikaday/index.d.ts
@@ -0,0 +1,293 @@
+// Type definitions for pikaday
+// Project: https://github.com/dbushell/Pikaday
+// Definitions by: Rudolph Gottesheim <http://midnight-design.at/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as moment from 'moment';
+
+export as namespace Pikaday;
+
+export = Pikaday;
+
+declare class Pikaday {
+    el: HTMLElement;
+
+    constructor(options: Pikaday.PikadayOptions);
+
+    /**
+     * Returns the selected date in a string format. If Moment.js exists
+     * (recommended) then Pikaday can return any format that Moment
+     * understands, otherwise you're stuck with JavaScript's default.
+     */
+    toString(format?: string): string;
+
+    /**
+     * Returns a JavaScript Date object for the selected day, or null if
+     * no date is selected.
+     */
+    getDate(): Date;
+
+    /**
+     * Set the current selection. This will be restricted within the bounds
+     * of minDate and maxDate options if they're specified. A boolean (true)
+     * can optionally be passed as the second parameter to prevent triggering
+     * of the onSelect callback, allowing the date to be set silently.
+     */
+    setDate(date: string | Date, triggerOnSelect?: boolean): void;
+
+    /**
+     * Returns a Moment.js object for the selected date (Moment must be
+     * loaded before Pikaday).
+     */
+    getMoment(): moment.Moment;
+
+    /**
+     * Set the current selection with a Moment.js object (see setDate).
+     */
+    setMoment(moment: any): void;
+
+    /**
+     * Change the current view to see a specific date.
+     */
+    gotoDate(date: Date): void;
+
+    /**
+     * Shortcut for picker.gotoDate(new Date())
+     */
+    gotoToday(): void;
+
+    /**
+     * Change the current view by month (0: January, 1: Februrary, etc).
+     */
+    gotoMonth(monthIndex: number): void;
+
+    /**
+     * Go to the next month (this will change year if necessary).
+     */
+    nextMonth(): void;
+
+    /**
+     * Go to the previous month (this will change year if necessary).
+     */
+    prevMonth(): void;
+
+    /**
+     * Change the year being viewed.
+     */
+    gotoYear(year: number): void;
+
+    /**
+     * Update the minimum/earliest date that can be selected.
+     */
+    setMinDate(date: Date): void;
+
+    /**
+     * Update the maximum/latest date that can be selected.
+     */
+    setMaxDate(date: Date): void;
+
+    /**
+     * Update the range start date. For using two Pikaday instances to
+     * select a date range.
+     */
+    setStartRange(date: Date): void;
+
+    /**
+     * Update the range end date. For using two Pikaday instances to select
+     * a date range.
+     */
+    setEndRange(date: Date): void;
+
+    /**
+     * Returns true if the picker is visible.
+     */
+    isVisible(): boolean;
+
+    /**
+     * Make the picker visible.
+     */
+    show(): void;
+
+    /**
+     * Hide the picker making it invisible.
+     */
+    hide(): void;
+
+    /**
+     * Recalculate and change the position of the picker.
+     */
+    adjustPosition(): void;
+
+    /**
+     * Hide the picker and remove all event listeners - no going back!
+     */
+    destroy(): void;
+}
+
+// merge the Pikaday class declaration with a module
+declare namespace Pikaday {
+    interface PikadayI18nConfig {
+        previousMonth: string;
+        nextMonth: string;
+        months: string[];
+        weekdays: string[];
+        weekdaysShort: string[];
+    }
+
+    interface PikadayOptions {
+        /**
+         * Bind the datepicker to a form field.
+         */
+        field?: HTMLElement;
+
+        /**
+         * The default output format for toString() and field value.
+         * Requires Moment.js for custom formatting.
+         */
+        format?: string;
+
+        /**
+         * Use a different element to trigger opening the datepicker.
+         * Default: field element.
+         */
+        trigger?: HTMLElement;
+
+        /**
+         * Automatically show/hide the datepicker on field focus.
+         * Default: true if field is set.
+         */
+        bound?: boolean;
+
+        /**
+         * Preferred position of the datepicker relative to the form field
+         * (e.g. 'top right'). Automatic adjustment may occur to avoid
+         * displaying outside the viewport. Default: 'bottom left'.
+         */
+        position?: string;
+
+        /**
+         * Can be set to false to not reposition the datepicker within the
+         * viewport, forcing it to take the configured position. Default: true.
+         */
+        reposition?: boolean;
+
+        /**
+         * DOM node to render calendar into, see container example.
+         * Default: undefined.
+         */
+        container?: HTMLElement;
+
+        /**
+         * The initial date to view when first opened.
+         */
+        defaultDate?: Date;
+
+        /**
+         * Make the defaultDate the initial selected value.
+         */
+        setDefaultDate?: boolean;
+
+        /**
+         * First day of the week (0: Sunday, 1: Monday, etc).
+         */
+        firstDay?: number;
+
+        /**
+         * The earliest date that can be selected (this should be a native
+         * Date object - e.g. new Date() or moment().toDate()).
+         */
+        minDate?: Date;
+
+        /**
+         * The latest date that can be selected (this should be a native
+         * Date object - e.g. new Date() or moment().toDate()).
+         */
+        maxDate?: Date;
+
+        /**
+         * Disallow selection of Saturdays and Sundays.
+         */
+        disableWeekends?: boolean;
+
+        /**
+         * Callback function that gets passed a Date object for each day
+         * in view. Should return true to disable selection of that day.
+         */
+        disableDayFn?: (date: Date) => boolean;
+
+        /**
+         * Number of years either side (e.g. 10) or array of upper/lower range
+         * (e.g. [1900, 2015]).
+         */
+        yearRange?: number | number[];
+
+        /**
+         * Show the ISO week number at the head of the row. Default: false.
+         */
+        showWeekNumber?: boolean;
+
+        /**
+         * Reverse the calendar for right-to-left languages. Default: false.
+         */
+        isRTL?: boolean;
+
+        /**
+         * Language defaults for month and weekday names.
+         */
+        i18n?: PikadayI18nConfig;
+
+        /**
+         * Additional text to append to the year in the title.
+         */
+        yearSuffix?: string;
+
+        /**
+         * Render the month after the year in the title. Default: false.
+         */
+        showMonthAfterYear?: boolean;
+		
+        /**
+         * Render days of the calendar grid that fall in the next or previous months to the current month instead of rendering an empty table cell. Default: false.
+         */
+        showDaysInNextAndPreviousMonths?: boolean;
+
+        /**
+         * Number of visible calendars.
+         */
+        numberOfMonths?: number;
+
+        /**
+         * When numberOfMonths is used, this will help you to choose where the
+         * main calendar will be (default left, can be set to right). Only used
+         * for the first display or when a selected date is not already visible.
+         */
+        mainCalendar?: string;
+
+        /**
+         * Define a class name that can be used as a hook for styling different
+         * themes. Default: null.
+         */
+        theme?: string;
+
+        /**
+         * Callback function for when a date is selected.
+         */
+        onSelect?: (date: Date) => void;
+
+        /**
+         * Callback function for when the picker becomes visible.
+         */
+        onOpen?: () => void;
+
+        /**
+         * Callback function for when the picker is hidden.
+         */
+        onClose?: () => void;
+
+        /**
+         * Callback function for when the picker draws a new month.
+         */
+        onDraw?: () => void;
+    }
+}
+
diff --git a/pikaday/pikaday-tests.ts b/pikaday/pikaday-tests.ts
index f98d4afcee..2c92bf6a22 100644
--- a/pikaday/pikaday-tests.ts
+++ b/pikaday/pikaday-tests.ts
@@ -1,8 +1,7 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../moment/moment.d.ts" />
-/// <reference path="pikaday.d.ts" />
+/// <reference types="jquery" />
 
-import * as Pikaday from "pikaday";
+import * as Pikaday from "./";
+import * as moment from "../moment";
 
 new Pikaday({field: document.getElementById('datepicker')});
 new Pikaday({field: $('#datepicker')[0]});
@@ -71,3 +70,14 @@ new Pikaday({field: $('#datepicker')[0]});
             yearRange: [2000, 2020]
         });
 })();
+
+(() => {
+    new Pikaday(
+        {
+            field: document.getElementById('datepicker'),
+            firstDay: 1,
+            minDate: new Date('2000-01-01'),
+            maxDate: new Date('2020-12-31'),
+            showDaysInNextAndPreviousMonths: true
+        });
+})();
diff --git a/pikaday/pikaday.d.ts b/pikaday/pikaday.d.ts
deleted file mode 100644
index 0025561f54..0000000000
--- a/pikaday/pikaday.d.ts
+++ /dev/null
@@ -1,287 +0,0 @@
-// Type definitions for pikaday
-// Project: https://github.com/dbushell/Pikaday
-// Definitions by: Rudolph Gottesheim <http://midnight-design.at/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../moment/moment.d.ts" />
-
-declare class Pikaday {
-    el: HTMLElement;
-
-    constructor(options: Pikaday.PikadayOptions);
-
-    /**
-     * Returns the selected date in a string format. If Moment.js exists
-     * (recommended) then Pikaday can return any format that Moment
-     * understands, otherwise you're stuck with JavaScript's default.
-     */
-    toString(format?: string): string;
-
-    /**
-     * Returns a JavaScript Date object for the selected day, or null if
-     * no date is selected.
-     */
-    getDate(): Date;
-
-    /**
-     * Set the current selection. This will be restricted within the bounds
-     * of minDate and maxDate options if they're specified. A boolean (true)
-     * can optionally be passed as the second parameter to prevent triggering
-     * of the onSelect callback, allowing the date to be set silently.
-     */
-    setDate(date: string | Date, triggerOnSelect?: boolean): void;
-
-    /**
-     * Returns a Moment.js object for the selected date (Moment must be
-     * loaded before Pikaday).
-     */
-    getMoment(): moment.Moment;
-
-    /**
-     * Set the current selection with a Moment.js object (see setDate).
-     */
-    setMoment(moment: any): void;
-
-    /**
-     * Change the current view to see a specific date.
-     */
-    gotoDate(date: Date): void;
-
-    /**
-     * Shortcut for picker.gotoDate(new Date())
-     */
-    gotoToday(): void;
-
-    /**
-     * Change the current view by month (0: January, 1: Februrary, etc).
-     */
-    gotoMonth(monthIndex: number): void;
-
-    /**
-     * Go to the next month (this will change year if necessary).
-     */
-    nextMonth(): void;
-
-    /**
-     * Go to the previous month (this will change year if necessary).
-     */
-    prevMonth(): void;
-
-    /**
-     * Change the year being viewed.
-     */
-    gotoYear(year: number): void;
-
-    /**
-     * Update the minimum/earliest date that can be selected.
-     */
-    setMinDate(date: Date): void;
-
-    /**
-     * Update the maximum/latest date that can be selected.
-     */
-    setMaxDate(date: Date): void;
-
-    /**
-     * Update the range start date. For using two Pikaday instances to
-     * select a date range.
-     */
-    setStartRange(date: Date): void;
-
-    /**
-     * Update the range end date. For using two Pikaday instances to select
-     * a date range.
-     */
-    setEndRange(date: Date): void;
-
-    /**
-     * Returns true if the picker is visible.
-     */
-    isVisible(): boolean;
-
-    /**
-     * Make the picker visible.
-     */
-    show(): void;
-
-    /**
-     * Hide the picker making it invisible.
-     */
-    hide(): void;
-
-    /**
-     * Recalculate and change the position of the picker.
-     */
-    adjustPosition(): void;
-
-    /**
-     * Hide the picker and remove all event listeners - no going back!
-     */
-    destroy(): void;
-}
-
-// merge the Pikaday class declaration with a module
-declare namespace Pikaday {
-    interface PikadayI18nConfig {
-        previousMonth: string;
-        nextMonth: string;
-        months: string[];
-        weekdays: string[];
-        weekdaysShort: string[];
-    }
-
-    interface PikadayOptions {
-        /**
-         * Bind the datepicker to a form field.
-         */
-        field?: HTMLElement;
-
-        /**
-         * The default output format for toString() and field value.
-         * Requires Moment.js for custom formatting.
-         */
-        format?: string;
-
-        /**
-         * Use a different element to trigger opening the datepicker.
-         * Default: field element.
-         */
-        trigger?: HTMLElement;
-
-        /**
-         * Automatically show/hide the datepicker on field focus.
-         * Default: true if field is set.
-         */
-        bound?: boolean;
-
-        /**
-         * Preferred position of the datepicker relative to the form field
-         * (e.g. 'top right'). Automatic adjustment may occur to avoid
-         * displaying outside the viewport. Default: 'bottom left'.
-         */
-        position?: string;
-
-        /**
-         * Can be set to false to not reposition the datepicker within the
-         * viewport, forcing it to take the configured position. Default: true.
-         */
-        reposition?: boolean;
-
-        /**
-         * DOM node to render calendar into, see container example.
-         * Default: undefined.
-         */
-        container?: HTMLElement;
-
-        /**
-         * The initial date to view when first opened.
-         */
-        defaultDate?: Date;
-
-        /**
-         * Make the defaultDate the initial selected value.
-         */
-        setDefaultDate?: boolean;
-
-        /**
-         * First day of the week (0: Sunday, 1: Monday, etc).
-         */
-        firstDay?: number;
-
-        /**
-         * The earliest date that can be selected (this should be a native
-         * Date object - e.g. new Date() or moment().toDate()).
-         */
-        minDate?: Date;
-
-        /**
-         * The latest date that can be selected (this should be a native
-         * Date object - e.g. new Date() or moment().toDate()).
-         */
-        maxDate?: Date;
-
-        /**
-         * Disallow selection of Saturdays and Sundays.
-         */
-        disableWeekends?: boolean;
-
-        /**
-         * Callback function that gets passed a Date object for each day
-         * in view. Should return true to disable selection of that day.
-         */
-        disableDayFn?: (date: Date) => boolean;
-
-        /**
-         * Number of years either side (e.g. 10) or array of upper/lower range
-         * (e.g. [1900, 2015]).
-         */
-        yearRange?: number | number[];
-
-        /**
-         * Show the ISO week number at the head of the row. Default: false.
-         */
-        showWeekNumber?: boolean;
-
-        /**
-         * Reverse the calendar for right-to-left languages. Default: false.
-         */
-        isRTL?: boolean;
-
-        /**
-         * Language defaults for month and weekday names.
-         */
-        i18n?: PikadayI18nConfig;
-
-        /**
-         * Additional text to append to the year in the title.
-         */
-        yearSuffix?: string;
-
-        /**
-         * Render the month after the year in the title. Default: false.
-         */
-        showMonthAfterYear?: boolean;
-
-        /**
-         * Number of visible calendars.
-         */
-        numberOfMonths?: number;
-
-        /**
-         * When numberOfMonths is used, this will help you to choose where the
-         * main calendar will be (default left, can be set to right). Only used
-         * for the first display or when a selected date is not already visible.
-         */
-        mainCalendar?: string;
-
-        /**
-         * Define a class name that can be used as a hook for styling different
-         * themes. Default: null.
-         */
-        theme?: string;
-
-        /**
-         * Callback function for when a date is selected.
-         */
-        onSelect?: (date: Date) => void;
-
-        /**
-         * Callback function for when the picker becomes visible.
-         */
-        onOpen?: () => void;
-
-        /**
-         * Callback function for when the picker is hidden.
-         */
-        onClose?: () => void;
-
-        /**
-         * Callback function for when the picker draws a new month.
-         */
-        onDraw?: () => void;
-    }
-}
-
-declare module "pikaday" {
-    export = Pikaday;
-}
diff --git a/pikaday/tsconfig.json b/pikaday/tsconfig.json
new file mode 100644
index 0000000000..70322ecfae
--- /dev/null
+++ b/pikaday/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pikaday-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pinkyswear/pinkyswear.d.ts b/pinkyswear/index.d.ts
similarity index 100%
rename from pinkyswear/pinkyswear.d.ts
rename to pinkyswear/index.d.ts
diff --git a/pinkyswear/pinkyswear-tests.ts b/pinkyswear/pinkyswear-tests.ts
index 14709dda4d..88b52a0df4 100644
--- a/pinkyswear/pinkyswear-tests.ts
+++ b/pinkyswear/pinkyswear-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="pinkyswear.d.ts" />
+
 
 var promise: PinkySwear.Promise = pinkySwear();
 
diff --git a/pinkyswear/tsconfig.json b/pinkyswear/tsconfig.json
new file mode 100644
index 0000000000..8a7797bbb0
--- /dev/null
+++ b/pinkyswear/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pinkyswear-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pinterest-sdk/index.d.ts b/pinterest-sdk/index.d.ts
new file mode 100644
index 0000000000..b24e4bee7b
--- /dev/null
+++ b/pinterest-sdk/index.d.ts
@@ -0,0 +1,146 @@
+// Type definitions for pinterest-sdk
+// Project: https://assets.pinterest.com/sdk/sdk.js
+// Definitions by: Adam Burmister <https://github.com/adamburmister>
+// Definitions: https://github.com/adamburmister/DefinitelyTyped
+
+export = PDK;
+export as namespace PDK;
+
+declare namespace PDK {
+
+  enum OAuthScopes { 'read_public', 'write_public', 'read_relationships', 'write_relationships' }
+
+  enum HttpMethod { 'get', 'put', 'post', 'delete' }
+
+  type OauthSession = {
+    accessToken?: string;
+    scope?: string;
+    error?: string;
+  }
+
+  interface LoginOptions {
+    scope: string|OAuthScopes;
+    method?: string;
+    appId?: string;
+    cookie?: boolean;
+    logging?: boolean;
+    session?: OauthSession;
+  }
+
+  interface OAuthRequestParams {
+    accessToken?: string;
+    data?: any;
+  }
+
+  interface InitOptions {
+    /** Your application ID from developer.pinterest.com */
+    appId?: string;
+    cookie?: boolean;
+    logging?: boolean;
+    session?: OauthSession;
+  }
+
+  /**
+   * Get information on the currently authenticated user
+   * @param cb     the callback export function to handle the response
+   */
+  export function me(callback: Function): void;
+
+  /**
+   * Get information on the currently authenticated user
+   * @param path   the url path
+   * @param cb     the callback export function to handle the response
+   */
+  export function me(path: string, callback: Function): void;
+
+  /**
+   * Get information on the currently authenticated user
+   * @param path   the url path
+   * @param params the parameters for the request
+   * @param cb     the callback export function to handle the response
+   */
+  export function me(path: string, params: Object, callback: Function): void;
+
+  /**
+   * Make an API call to the server
+   *
+   * The path is the only required argument.
+   *
+   * @param path   URL path
+   * @param httpMethod HTTP verb
+   */
+  export function request(path: string, httpMethod?: string|HttpMethod, params?: OAuthRequestParams, callback?: Function): void;
+
+  /**
+   * Show user login dialog, and save access token
+   */
+  export function login(options: LoginOptions, callback: Function): void;
+
+  /**
+   * Remove the session of the current user.
+   *
+   * Need to call login to re-connect, unless session is saved on server.
+   */
+  export function logout(callback?: (session: OauthSession) => any): void;
+
+  /**
+   * Get the active session for the current user
+   */
+  export function getSession(): OauthSession;
+
+  /**
+   * Save the user specified session
+   */
+  export function setSession(session: OauthSession, callback?: (session: OauthSession) => any): void;
+
+  /**
+   * Initialize the library.
+   *
+   * Typical initialization enabling all optional features:
+   * ```
+    *      <script src="pin-sdk.js"></script>
+    *      <script>
+    *        PDK.init({
+    *          appId  : 'YOUR APP ID',
+    *          cookie : true // enable cookies to allow the server to access the session
+    *        });
+    *      </script>
+    * ```
+    * The best place to put this code is right before the closing
+    * `</body>` tag.
+    *
+    * - Asynchronous Loading -
+    *
+    * The library makes non-blocking loading of the script easy to use by
+    * providing the `pAsyncInit` hook. If this global export function is defined, it
+    * will be executed when the library is loaded:
+    * ```
+    *     <div id="p-root"></div>
+    *     <script>
+    *       window.pAsyncInit = function() {
+    *         PDK.init({
+    *           appId  : 'YOUR APP ID',
+    *           cookie : true // enable cookies to allow the server to access the session
+    *         });
+    *       };
+    *
+    *       (function() {
+    *         var e = document.createElement('script');
+    *         e.src = 'pin-sdk.js';
+    *         e.async = true;
+    *         document.getElementById('p-root').appendChild(e);
+    *       }());
+    *     </script>
+    * ```
+    */
+  export function init(options: InitOptions): void;
+
+  /**
+   * Allow an unauthenticated user to pin using a popup
+   *
+   * @param imageUrl URL for image that you want to Pin.
+   * @param note     The Pin's description.
+   * @param url      The URL the Pin will link to when you click through.
+   */
+  export function pin(imageUrl: string, note: string, url: string, callback: Function): void;
+}
diff --git a/pinterest-sdk/pinterest-sdk-tests.ts b/pinterest-sdk/pinterest-sdk-tests.ts
index ea1e2d438e..8846abb20c 100644
--- a/pinterest-sdk/pinterest-sdk-tests.ts
+++ b/pinterest-sdk/pinterest-sdk-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="pinterest-sdk.d.ts" />
+import PDK = require("pinterest-sdk");
 
 // Examples from https://github.com/pinterest/pinterest-api-demo
 
diff --git a/pinterest-sdk/pinterest-sdk.d.ts b/pinterest-sdk/pinterest-sdk.d.ts
deleted file mode 100644
index 3a52e37a6f..0000000000
--- a/pinterest-sdk/pinterest-sdk.d.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-// Type definitions for pinterest-sdk
-// Project: https://assets.pinterest.com/sdk/sdk.js
-// Definitions by: Adam Burmister <https://github.com/adamburmister>
-// Definitions: https://github.com/adamburmister/DefinitelyTyped
-declare namespace PDK {
-
-  enum OAuthScopes { 'read_public', 'write_public', 'read_relationships', 'write_relationships' }
-
-  enum HttpMethod { 'get', 'put', 'post', 'delete' }
-
-  type OauthSession = {
-    accessToken?: string;
-    scope?: string;
-    error?: string;
-  }
-
-  interface LoginOptions {
-    scope: string|OAuthScopes;
-    method?: string;
-    appId?: string;
-    cookie?: boolean;
-    logging?: boolean;
-    session?: OauthSession;
-  }
-
-  interface OAuthRequestParams {
-    accessToken?: string;
-    data?: any;
-  }
-
-  interface InitOptions {
-    /** Your application ID from developer.pinterest.com */
-    appId?: string;
-    cookie?: boolean;
-    logging?: boolean;
-    session?: OauthSession;
-  }
-
-  /**
-   * Get information on the currently authenticated user
-   * @param cb     the callback export function to handle the response
-   */
-  export function me(callback: Function): void;
-
-  /**
-   * Get information on the currently authenticated user
-   * @param path   the url path
-   * @param cb     the callback export function to handle the response
-   */
-  export function me(path: string, callback: Function): void;
-
-  /**
-   * Get information on the currently authenticated user
-   * @param path   the url path
-   * @param params the parameters for the request
-   * @param cb     the callback export function to handle the response
-   */
-  export function me(path: string, params: Object, callback: Function): void;
-
-  /**
-   * Make an API call to the server
-   *
-   * The path is the only required argument.
-   *
-   * @param path   URL path
-   * @param httpMethod HTTP verb
-   */
-  export function request(path: string, httpMethod?: string|HttpMethod, params?: OAuthRequestParams, callback?: Function): void;
-
-  /**
-   * Show user login dialog, and save access token
-   */
-  export function login(options: LoginOptions, callback: Function): void;
-
-  /**
-   * Remove the session of the current user.
-   *
-   * Need to call login to re-connect, unless session is saved on server.
-   */
-  export function logout(callback?: (session: OauthSession) => any): void;
-
-  /**
-   * Get the active session for the current user
-   */
-  export function getSession(): OauthSession;
-
-  /**
-   * Save the user specified session
-   */
-  export function setSession(session: OauthSession, callback?: (session: OauthSession) => any): void;
-
-  /**
-   * Initialize the library.
-   *
-   * Typical initialization enabling all optional features:
-   * ```
-    *      <script src="pin-sdk.js"></script>
-    *      <script>
-    *        PDK.init({
-    *          appId  : 'YOUR APP ID',
-    *          cookie : true // enable cookies to allow the server to access the session
-    *        });
-    *      </script>
-    * ```
-    * The best place to put this code is right before the closing
-    * `</body>` tag.
-    *
-    * - Asynchronous Loading -
-    *
-    * The library makes non-blocking loading of the script easy to use by
-    * providing the `pAsyncInit` hook. If this global export function is defined, it
-    * will be executed when the library is loaded:
-    * ```
-    *     <div id="p-root"></div>
-    *     <script>
-    *       window.pAsyncInit = function() {
-    *         PDK.init({
-    *           appId  : 'YOUR APP ID',
-    *           cookie : true // enable cookies to allow the server to access the session
-    *         });
-    *       };
-    *
-    *       (function() {
-    *         var e = document.createElement('script');
-    *         e.src = 'pin-sdk.js';
-    *         e.async = true;
-    *         document.getElementById('p-root').appendChild(e);
-    *       }());
-    *     </script>
-    * ```
-    */
-  export function init(options: InitOptions): void;
-
-  /**
-   * Allow an unauthenticated user to pin using a popup
-   *
-   * @param imageUrl URL for image that you want to Pin.
-   * @param note     The Pin's description.
-   * @param url      The URL the Pin will link to when you click through.
-   */
-  export function pin(imageUrl: string, note: string, url: string, callback: Function): void;
-}
-
-declare module 'pinterest-sdk' {
-   export = PDK;
-}
diff --git a/pinterest-sdk/tsconfig.json b/pinterest-sdk/tsconfig.json
new file mode 100644
index 0000000000..7882de39d7
--- /dev/null
+++ b/pinterest-sdk/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pinterest-sdk-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/piwik-tracker/index.d.ts b/piwik-tracker/index.d.ts
new file mode 100644
index 0000000000..12c2a548fc
--- /dev/null
+++ b/piwik-tracker/index.d.ts
@@ -0,0 +1,93 @@
+// Type definitions for PiwikTracker v0.1.1
+// Project: https://www.npmjs.com/package/piwik-tracker
+// Definitions by: Guilherme Bernal <https://github.com/lbguilherme>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+import events = require('events');
+
+export = PiwikTracker;
+
+// refer to http://developer.piwik.org/api-reference/tracking-api
+interface PiwikTrackOptions {
+    // Required parameters
+    url: string;
+
+    // Recommended parameters
+    action_name?: string;
+    _id?: string;
+    rand?: string;
+    apiv?: number;
+
+    // Optional User info
+    urlref?: string;
+    _cvar?: string;
+    _idvc?: string;
+    _viewts?: string;
+    _idts?: string;
+    _rcn?: string;
+    _rck?: string;
+    res?: string;
+    h?: number;
+    m?: number;
+    s?: number;
+    ua?: string;
+    lang?: string;
+    uid?: string;
+    cid?: string;
+    new_visit?: number;
+
+    // Optional Action info
+    cvar?: string;
+    link?: string;
+    download?: string;
+    search?: string;
+    search_cat?: string;
+    search_count?: number;
+    idgoal?: number;
+    revenue?: number;
+    gt_ms?: number;
+    cs?: string;
+
+    // Optional Event Tracking info
+    e_c?: string;
+    e_a?: string;
+    e_n?: string;
+    e_v?: string;
+
+    // Optional Content Tracking info
+    c_n?: string;
+    c_p?: string;
+    c_t?: string;
+    c_i?: string;
+
+    // Optional Ecommerce info
+    ec_id?: string;
+    ec_items?: string;
+    ec_st?: number;
+    ec_tx?: number;
+    ec_sh?: number;
+    ec_dt?: number;
+    _ects?: number;
+
+    // Other parameters (require authentication via token_auth)
+    token_auth?: string;
+    cip?: string;
+    cdt?: string;
+    country?: string;
+    region?: string;
+    city?: string;
+    lat?: string;
+    long?: string;
+
+    // Other parameters
+    send_image?: number;
+}
+
+declare class PiwikTracker extends events.EventEmitter {
+    constructor(siteId: number, trackerUrl: string);
+    track(options: PiwikTrackOptions): void;
+}
diff --git a/piwik-tracker/piwik-tracker-tests.ts b/piwik-tracker/piwik-tracker-tests.ts
index 7d06d6bdc4..3e7506d5fd 100644
--- a/piwik-tracker/piwik-tracker-tests.ts
+++ b/piwik-tracker/piwik-tracker-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../node/node.d.ts" />
-/// <reference path="piwik-tracker.d.ts" />
+/// <reference types="node" />
 
 // Example code taken from https://www.npmjs.com/package/piwik-tracker
 
diff --git a/piwik-tracker/piwik-tracker.d.ts b/piwik-tracker/piwik-tracker.d.ts
deleted file mode 100644
index 6ef01fbc58..0000000000
--- a/piwik-tracker/piwik-tracker.d.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-// Type definitions for PiwikTracker v0.1.1
-// Project: https://www.npmjs.com/package/piwik-tracker
-// Definitions by: Guilherme Bernal <https://github.com/lbguilherme>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "piwik-tracker" {
-	
-	import events = require('events');
-	
-	export = PiwikTracker;
-	
-	// refer to http://developer.piwik.org/api-reference/tracking-api
-	interface PiwikTrackOptions {
-		// Required parameters
-		url : string;
-		
-		// Recommended parameters
-		action_name? : string;
-		_id? : string;
-		rand? : string;
-		apiv? : number;
-		
-		// Optional User info
-		urlref? : string;
-		_cvar? : string;
-		_idvc? : string;
-		_viewts? : string;
-		_idts? : string;
-		_rcn? : string;
-		_rck? : string;
-		res? : string;
-		h? : number;
-		m? : number;
-		s? : number;
-		ua? : string;
-		lang? : string;
-		uid? : string;
-		cid? : string;
-		new_visit? : number;
-		
-		// Optional Action info
-		cvar? : string;
-		link? : string;
-		download? : string;
-		search? : string;
-		search_cat? : string;
-		search_count? : number;
-		idgoal? : number;
-		revenue? : number;
-		gt_ms? : number;
-		cs? : string;
-		
-		// Optional Event Tracking info
-		e_c? : string;
-		e_a? : string;
-		e_n? : string;
-		e_v? : string;
-		
-		// Optional Content Tracking info
-		c_n? : string;
-		c_p? : string;
-		c_t? : string;
-		c_i? : string;
-		
-		// Optional Ecommerce info
-		ec_id? : string;
-		ec_items? : string;
-		ec_st? : number;
-		ec_tx? : number;
-		ec_sh? : number;
-		ec_dt? : number;
-		_ects? : number;
-		
-		// Other parameters (require authentication via token_auth)
-		token_auth? : string;
-		cip? : string;
-		cdt? : string;
-		country? : string;
-		region? : string;
-		city? : string;
-		lat? : string;
-		long? : string;
-		
-		// Other parameters
-		send_image? : number;
-	}
-	
-	class PiwikTracker extends events.EventEmitter {
-		constructor(siteId : number, trackerUrl : string);
-		track(options : PiwikTrackOptions) : void;
-	}
-	
-}
diff --git a/piwik-tracker/tsconfig.json b/piwik-tracker/tsconfig.json
new file mode 100644
index 0000000000..62d74c4f14
--- /dev/null
+++ b/piwik-tracker/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "piwik-tracker-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pixi-spine/index.d.ts b/pixi-spine/index.d.ts
new file mode 100644
index 0000000000..2cba21ee3d
--- /dev/null
+++ b/pixi-spine/index.d.ts
@@ -0,0 +1,812 @@
+// Type definitions for pixi-spine 1.0.4
+// Project: https://github.com/pixijs/pixi-spine/
+// Definitions by: martijncroezen <https://github.com/pixijs/pixi-typescript>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="pixi.js" />
+declare namespace PIXI {
+
+    export module spine {
+
+        export interface Timeline {
+
+            frames: number[];
+
+            getFrameCount(): number;
+            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
+
+        }
+
+        export interface Attachment {
+
+            name: string;
+            type: number;
+
+        }
+
+        export class Animation {
+
+            constructor(name: string, timelines?: Timeline[], duration?: number);
+
+            apply(skeleton: Skeleton, lastTime: number, time: number, loop?: boolean, events?: Event[]): void;
+            mix(skeleton: Skeleton, lastTime: number, time: number, loop?: boolean, events?: any[], alpha?: number): void;
+            binarySearch(values: number[], target: number, step: number): number;
+            binarySearch1(values: number[], target: number): number;
+            linearSearch(values: number[], target: number, step: number): number;
+
+            name: string;
+            timelines: Timeline[];
+            duration: number;
+
+        }
+
+        export class AnimationState {
+
+            data: AnimationStateData;
+            tracks: TrackEntry[];
+            events: Event[];
+            onStart: (index: number) => void;
+            onEnd: (trackIndex: number) => void;
+            onComplete: (i: number, count: number) => void;
+            onEvent: (i: number, event: Event) => void;
+            timeScale: number;
+
+            constructor(stateData: AnimationStateData);
+
+            update(delta: number): void;
+            apply(skeleton: Skeleton): void;
+            clearTracks(): void;
+            clearTrack(trackIndex: number): void;
+            private _expandToIndex(index: number): TrackEntry;
+            setCurrent(index: number, entry: TrackEntry): void;
+            setAnimationByName(trackIndex: number, animationName: string, loop: boolean): TrackEntry;
+            setAnimation(trackIndex: number, animation: Animation, loop: boolean): TrackEntry;
+            addAnimationByName(trackIndex: number, animationName: string, loop: boolean, delay: number): TrackEntry;
+            addAnimation(trackIndex: number, animation: Animation, loop: boolean, delay: number): TrackEntry;
+            getCurrent(trackIndex: number): TrackEntry;
+
+        }
+
+        export class Spine extends PIXI.Container {
+
+            constructor(spineData: any);
+
+            static fromAtlas(resourceName: string): Spine;
+
+            update(dt: number): void;
+
+            private autoUpdateTransform(): void;
+            private createSprite(slot: Slot, attachment: Attachment): Sprite;
+            private createMesh(slot, attachment)
+
+            spineData: any;
+            skeleton: Skeleton;
+            stateData: AnimationStateData;
+            state: AnimationState;
+            slotContainers: PIXI.Container[];
+            autoUpdate: boolean;
+
+        }
+
+        export class AnimationStateData {
+
+            constructor(skeletonData: SkeletonData);
+
+            private _skelentonData: SkeletonData;
+            private animationToMixTime: number;
+            defaultMix: number;
+            skeletonData: SkeletonData;
+            setMixByName(fromName: string, toName: string, duration: number): void;
+            setMix(from: Animation, to: Animation, duration: number): void;
+            getMix(from: Animation, to: Animation): number;
+
+        }
+
+        export class AttachmentType {
+
+            static region: number;
+            static boundingbox: number;
+            static mesh: number;
+            static skinnedmesh: number;
+
+        }
+
+        export class Bone {
+
+            data: BoneData;
+            skeleton: Skeleton;
+            parent: Bone;
+
+            constructor(boneData: BoneData, skeleton: Skeleton, parent: Bone);
+
+            x: number;
+            y: number;
+            rotation: number;
+            rotationIK: number;
+            scaleX: number;
+            scaleY: number;
+            flipX: boolean;
+            flipY: boolean;
+            m00: number;
+            m01: number;
+            worldX: number;
+            m10: number;
+            m11: number;
+            worldY: number;
+            worldRotation: number;;
+            worldScaleX: number;
+            worldScaleY: number;
+            worldFlipX: boolean;
+            worldFlipY: boolean;
+
+            updateWorldTransform(): void;
+            setToSetupPose(): void;
+            worldToLocal(world: number[]): void;
+            localToWorld(local: number[]): void;
+
+        }
+
+        export class BoneData {
+
+            name: string;
+            parent: Bone;
+
+            constructor(name: string, parent: Bone);
+
+            length: number;
+            x: number;
+            y: number;
+            rotation: number;
+            scaleX: number;
+            scaleY: number;
+            inheritScale: boolean;
+            inheritRotation: boolean;
+            flipX: boolean;
+            flipY: boolean;
+
+        }
+
+        export class BoundingBoxAttachment implements Attachment {
+
+            constructor(name: string);
+
+            name: string;
+            vertices: number[];
+            type: number;
+
+            computeWorldVertices(x: number, y: number, bone: Bone, worldVertices: number[]): void;
+
+        }
+
+        export class ColorTimeline implements Timeline {
+
+            constructor(frameCount: number);
+
+            curves: Curves;
+            frames: number[];
+            slotIndex: number;
+
+            getFrameCount(): number;
+            setFrame(frameIndex: number, time: number, r: number, g: number, b: number, a: number): void;
+            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
+
+        }
+
+        export class Curves {
+
+            constructor(frameCount: number[]);
+
+            curves: number[];
+
+            setLinear(frameIndex: number): void;
+            setStepped(frameIndex: number): void;
+            setCurve(frameIndex: number, cx1: number, cy1: number, cx2: number, cy2: number): void;
+            getCurvePercent(frameIndex: number, percent: number): number;
+
+        }
+
+        export class DrawOrderTimeline implements Timeline {
+
+            constructor(frameCount: number);
+
+            frames: number[];
+            drawOrders: number[];
+
+            getFrameCount(): number;
+            setFrame(frameIndex: number, time: number, drawOrder: number[]): void;
+            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
+
+        }
+
+        export class Event {
+
+            constructor(data: any);
+
+            data: any;
+            intValue: number;
+            floatValue: number;
+            stringValue: string;
+
+        }
+
+        export class EventData {
+
+            constructor(name: string);
+
+            name: string;
+
+            intValue: number;
+            floatValue: number;
+            stringValue: string;
+
+        }
+
+        export class EventTimeline implements Timeline {
+
+            constructor(frameCount: number);
+
+            frames: number[];
+            events: Event[];
+
+            getFrameCount(): number;
+            setFrame(frameIndex: number, time: number, event: Event): void;
+            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
+
+        }
+
+
+        export class FfdTimeline implements Timeline {
+
+            constructor(frameCount: number);
+
+            curves: Curves;
+            frames: number[];
+            frameVertices: number[];
+            slotIndex: number;
+            attachment: number;
+
+            getFrameCount(): number;
+            setFrame(frameIndex: number, time: number, vertices: number[]): void;
+            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
+
+        }
+
+        export class FlipXTimeline implements Timeline {
+
+            constructor(frameCount: number);
+
+            curves: Curves;
+            frames: number[];
+            boneIndex: number;
+
+            getFrameCount(): number;
+            setFrame(frameIndex: number, time: number, vertices: number[]): void;
+            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
+
+        }
+
+        export class FlipYTimeline implements Timeline {
+
+            constructor(frameCount: number);
+
+            curves: Curves;
+            frames: number[];
+            boneIndex: number;
+
+            getFrameCount(): number;
+            setFrame(frameIndex: number, time: number, vertices: number[]): void;
+            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
+
+        }
+
+        export class IkConstraint {
+
+            constructor(data: IkConstraintData, skeleton: Skeleton);
+
+            data: IkConstraintData;
+            mix: number;
+            bendDirection: number;
+            bones: Bone[];
+            target: Bone;
+
+            apply(): void;
+            apply1(bone: Bone, targetX: number, targetY: number, alpha: number): void;
+            apply2(parent: Bone, child: Bone, targetX: number, targetY: number, bendDirection: number, alpha: number): void;
+
+        }
+
+        export class IkConstraintData {
+
+            constructor(name: string);
+
+            name: string;
+            bones: Bone[];
+            target: Bone;
+            bendDirection: number;
+            mix: number;
+
+        }
+
+        export class IkConstraintTimeline implements Timeline {
+            constructor(frameCount: number);
+
+            curves: Curves;
+            frames: number[];
+            ikConstraintIndex: number;
+
+            getFrameCount(): number;
+            setFrame(frameIndex: number, time: number, mix: number, bendDirection: number): void;
+            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
+
+        }
+
+        export class MeshAttachment implements Attachment {
+
+            constructor(name: string);
+
+            name: string;
+            type: number;
+            vertices: number[];
+            uvs: number[]
+            regionUVs: number[]
+            triangles: number[]
+            hullLength: number;
+            r: number;
+            g: number;
+            b: number;
+            a: number;
+            path: string;
+            rendererObject: any;
+            regionU: number;
+            regionV: number;
+            regionU2: number;
+            regionV2: number;
+            regionRotate: boolean;
+            regionOffsetX: number;
+            regionOffsetY: number;
+            regionWidth: number;
+            regionHeight: number;
+            regionOriginalWidth: number;
+            regionOriginalHeight: number;
+            edges: number[];
+            width: number;
+            height: number;
+
+            updateUVs(): void;
+            computeWorldVertices(x: number, y: number, slot: Slot, worldVertices: number[]): void;
+
+        }
+
+        export class RegionAttachment implements Attachment {
+
+            constructor(name: string);
+
+            name: string;
+            offset: number[];
+            uvs: number[]
+            type: number;
+            x: number;
+            y: number;
+            rotation: number;
+            scaleX: number;
+            scaleY: number;
+            width: number;
+            height: number;
+            r: number;
+            g: number;
+            b: number;
+            a: number;
+            path: string;
+            rendererObject: any;
+            regionOffsetX: number;
+            regionOffsetY: number;
+            regionWidth: number;
+            regionHeight: number;
+            regionOriginalWidth: number;
+            regionOriginalHeight: number;
+
+            updateOffset(): void;
+            setUVs(u: number, v: number, u2: number, v2: number, rotate: number): void;
+            computeVertices(x: number, y: number, bone: Bone, vertices: number[]): void;
+
+        }
+
+        export class RotateTimeline implements Timeline {
+
+            constructor(frameCount: number);
+
+            curves: Curves;
+            frames: number[];
+            boneIndex: number;
+
+            getFrameCount(): number;
+            setFrame(frameIndex: number, time: number, mix: number, bendDirection: number): void;
+            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
+
+        }
+
+        export class ScaleTimeline implements Timeline {
+
+            constructor(frameCount: number);
+
+            curves: Curves;
+            frames: number[];
+            boneIndex: number;
+
+            getFrameCount(): number;
+            setFrame(frameIndex: number, time: number, mix: number, bendDirection: number): void;
+            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
+
+        }
+
+        export class Skeleton {
+
+            constructor(skeletonData: SkeletonData);
+
+            data: SkeletonData;
+            bones: Bone[];
+            slots: Slot[];
+            drawOrder: Slot[];
+            ikConstraints: IkConstraint[];
+            boneCache: Bone[][];
+            x: number;
+            y: number;
+            skin: Skin;
+            r: number;
+            g: number;
+            b: number;
+            a: number;
+            time: number;
+            flipX: boolean;
+            flipY: boolean;
+
+            updateCache(): void;
+            updateWorldTransform(): void;
+            setToSetupPose(): void;
+            setBonesToSetupPose(): void;
+            setSlotsToSetupPose(): void;
+            getRootBone(): Bone;
+            findBone(boneName: string): Bone;
+            findBoneIndex(boneName: string): number;
+            findSlot(slotName: string): Slot;
+            findSlotIndex(slotName: string): number;
+            setSkinByName(skinName: string): Skin;
+            setSkin(newSkin: Skin): void;
+            getAttachmentBySlotName(slotName: string, attachmentName: string): Attachment;
+            getAttachmentBySlotIndex(slotIndex: number, attachmentName: string): Attachment
+            setAttachment(slotName: string, attachmentName: string): void;
+            findIkConstraint(ikConstraintName: string): IkConstraint;
+            update(delta: number): void;
+            resetDrawOrder(): void;
+
+        }
+
+        export class SkeletonBounds {
+
+            polygonPool: Polygon[];
+            polygons: Polygon[];
+            boundingBoxes: BoundingBoxAttachment[];
+            minX: number;
+            minY: number;
+            maxX: number;
+            maxY: number;
+
+            update(skeleton: Skeleton, updateAabb: boolean): void;
+            aabbCompute(): void;
+            aabbContainsPoint(x: number, y: number): void;
+            aabbIntersectsSegment(x1: number, y1: number, x2: number, y2: number): boolean;
+            aabbIntersectsSkeleton(bounds: SkeletonBounds): boolean;
+            containsPoint(x: number, y: number): BoundingBoxAttachment;
+            intersectsSegment(x1: number, y1: number, x2: number, y2: number): BoundingBoxAttachment;
+            polygonContainsPoint(polygon: Polygon, x: number, y: number): boolean;
+            polygonIntersectsSegment(polygon: Polygon, x1: number, y1: number, x2: number, y2: number): boolean;
+            getPolygon(attachment: Attachment): Polygon;
+            getWidth(): number;
+            getHeight(): number;
+
+        }
+
+        export class SkeletonData {
+
+            bones: Bone[];
+            slots: Slot[];
+            skins: Skin[];
+            events: Event[];
+            animations: Animation[];
+            ikConstraints: IkConstraint[];
+            name: string;
+            defaultSkin: Skin;
+            width: number;
+            height: number;
+            version: any;
+            hash: any;
+
+            findBone(boneName: string): Bone;
+            findBoneIndex(boneName: string): number;
+            findSlot(slotName: string): Slot;
+            findSlotIndex(slotName: string): number;
+            findSkin(skinName: string): Skin;
+            findEvent(eventName: string): Event;
+            findAnimation(animationName: string): Animation
+            findIkConstraint(ikConstraintName: string): IkConstraint;
+
+        }
+
+        export class SkeletonJsonParser {
+
+            constructor(attachmentLoader: any);
+
+            attachmentLoader: any;
+            scale: number;
+
+            readSkeletonData(root: Bone, name: string): void;
+            readAttachment(skin: Skin, name: string, map: any): void;
+            readAnimation(name: string, map: any, skeletonData: SkeletonData): void;
+            readCurve(timeline: Timeline, frameIndex: number, valueMap: any): void;
+            toColor(hexString: string, colorIndex: string): number;
+            getFloatArray(map: any, name: string, scale: number): number[];
+            getIntArray(map: any, name: string): number[];
+
+        }
+
+        export class Skin {
+
+            constructor(name: string);
+
+            name: string;
+            attachments: Attachment[];
+            addAttachment(slotIndex: number, name: string, attachment: Attachment): void;
+            getAttachment(slotIndex: number, name: string): Attachment;
+
+            protected _attachAll(skeleton: Skeleton, oldSkin: Skin): void;
+
+        }
+
+        export class SkinnedMeshAttachment implements Attachment {
+
+            constructor(name: string);
+
+            name: string;
+            type: number;
+            bones: number[];
+            weights: number[];
+            uvs: number[];
+            regionUVs: number[];
+            triangles: number[];
+            hullLength: number;
+            r: number;
+            g: number;
+            b: number;
+            a: number;
+            path: string;
+            rendererObject: any;
+            regionU: number;
+            regionV: number;
+            regionU2: number;
+            regionV2: number;
+            regionRotate: boolean;
+            regionOffsetX: number;
+            regionOffsetY: number;
+            regionWidth: number;
+            regionHeight: number;
+            regionOriginalWidth: number;
+            regionOriginalHeight: number;
+            edges: number[];
+            width: number;
+            height: number;
+
+            updateUVs(u: number, v: number, u2: number, v2: number, rotate: boolean): void;
+            computeWorldVertices(x: number, y: number, slot: Slot, worldVertices: number[]): void;
+
+        }
+
+        export class Slot {
+
+            constructor(slotData: SlotData, bone: Bone);
+
+            data: SlotData;
+            bone: Bone;
+            r: number;
+            g: number;
+            b: number;
+            a: number;
+            _attachmentTime: number;
+            attachment: Attachment;
+            attachmentVertices: number[];
+            setAttachment(attachment: Attachment): void;
+            setAttachmentTime(time: number): void;
+            getAttachmentTime(): number;
+            setToSetupPose(): void;
+
+        }
+
+        export class SlotData {
+
+            constructor(name: string, boneData: BoneData);
+
+            name: string;
+            boneData: BoneData;
+
+            static PIXI_BLEND_MODE_MAP: {
+                multiply: number;
+                screen: number;
+                additive: number;
+                normal: number;
+            };
+            r: number;
+            g: number;
+            b: number;
+            a: number;
+            attachmentName: string;
+            blendMode: number;
+
+        }
+
+        export class TrackEntry {
+
+            next: TrackEntry;
+            previous: TrackEntry;
+            animation: Animation;
+            loop: boolean;
+            delay: number;
+            time: number;
+            lastTime: number;
+            endTime: number;
+            timeScale: number;
+            mixTime: number;
+            mixDuration: number;
+            mix: number;
+            onStart: (index: number) => void;
+            onEnd: (trackIndex: number) => void;
+            onComplete: (i: number, count: number) => void;
+            onEvent: (i: number, event: Event) => void;
+
+        }
+
+        export class TranslateTimeline implements Timeline {
+
+            constructor(frameCount: number);
+
+            curves: Curves[];
+            frames: number[];
+            boneIndex: number;
+
+            getFrameCount(): number;
+            setFrame(frameIndex: number, time: number, x: number, y: number): void;
+            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
+
+        }
+
+        export class Atlas {
+
+            constructor(atlasText: string, baseUrl: string, crossOrigin: any);
+
+            pages: AtlasPage[];
+            regions: AtlasRegion[];
+            texturesLoading: number;
+
+            findRegion(name: string): AtlasRegion;
+            dispose(): void;
+            updateUVs(page: AtlasPage): void;
+
+            Format: {
+
+                alpha: number;
+                intensity: number;
+                luminanceAlpha: number;
+                rgb565: number;
+                rgba4444: number;
+                rgb888: number;
+                rgba8888: number;
+
+            };
+
+            TextureFilter: {
+
+                nearest: number;
+                linear: number;
+                mipMap: number;
+                mipMapNearestNearest: number;
+                mipMapLinearNearest: number;
+                mipMapNearestLinear: number;
+                mipMapLinearLinear: number;
+
+            };
+
+            TextureWrap: {
+
+                mirroredRepeat: number;
+                clampToEdge: number;
+                repeat: number;
+
+            };
+
+        }
+
+        export class AtlasAttachmentParser {
+
+            constructor(atlas: Atlas);
+
+            newRegionAttachment(skin: Skin, name: string, path: string): RegionAttachment;
+            newMeshAttachment(skin: Skin, name: string, path: string): SkinnedMeshAttachment;
+            newSkinnedMeshAttachment(skin: Skin, name: string, path: string): SkinnedMeshAttachment;
+            newBoundingBoxAttachment(skin: Skin, name: string): BoundingBoxAttachment;
+
+        }
+
+        export class AtlasPage {
+            name: string;
+            format: any;
+            minFilter: any;
+            magFilter: any;
+            uWrap: any;
+            vWrap: any;
+            rendererObject: any;
+            width: number;
+            height: number;
+
+        }
+
+        export class AtlasReader {
+            constructor(text: string);
+
+            lines: string[];
+            index: number;
+
+            trim(value: string): string;
+            readLine(): string;
+            readValue(): string;
+            readTuple(tuple: number): number;
+
+        }
+
+        export class AtlasRegion {
+
+            page: AtlasPage;
+            name: string;
+            x: number;
+            y: number;
+            width: number;
+            height: number;
+            u: number;
+            v: number;
+            u2: number;
+            v2: number;
+            offsetX: number;
+            offsetY: number;
+            originalWidth: number;
+            originalHeight: number;
+            index: number;
+            rotate: boolean;
+            splits: any;
+            pads: any;
+
+
+        }
+
+        export class AttachmentTimeline implements Timeline {
+
+            constructor(frameCount: number);
+
+            slotIndex: number;
+            frames: number[];
+            attachmentNames: string[];
+
+            getFrameCount(): number;
+            setFrame(frameIndex: number, time: number, attachmentName: string): void;
+            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
+
+        }
+
+        export class atlasParser {
+
+            constructor(resource: any, next: any);
+
+            AnimCache: any;
+            enableCaching: boolean;
+
+        }
+
+    }
+
+}
diff --git a/pixi-spine/pixi-spine-tests.ts b/pixi-spine/pixi-spine-tests.ts
index b75e63e266..473e49ae29 100644
--- a/pixi-spine/pixi-spine-tests.ts
+++ b/pixi-spine/pixi-spine-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../pixi.js/pixi.js.d.ts" />
-/// <reference path="pixi-spine.d.ts" />
+/// <reference types="pixi.js" />
+
 
 namespace Spine {
 
diff --git a/pixi-spine/pixi-spine.d.ts b/pixi-spine/pixi-spine.d.ts
deleted file mode 100644
index 7b6887b2fd..0000000000
--- a/pixi-spine/pixi-spine.d.ts
+++ /dev/null
@@ -1,812 +0,0 @@
-// Type definitions for pixi-spine 1.0.4
-// Project: https://github.com/pixijs/pixi-spine/
-// Definitions by: martijncroezen <https://github.com/pixijs/pixi-typescript>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../pixi.js/pixi.js.d.ts" />
-declare namespace PIXI {
-
-    export module spine {
-
-        export interface Timeline {
-
-            frames: number[];
-
-            getFrameCount(): number;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-        export interface Attachment {
-
-            name: string;
-            type: number;
-
-        }
-
-        export class Animation {
-
-            constructor(name: string, timelines?: Timeline[], duration?: number);
-
-            apply(skeleton: Skeleton, lastTime: number, time: number, loop?: boolean, events?: Event[]): void;
-            mix(skeleton: Skeleton, lastTime: number, time: number, loop?: boolean, events?: any[], alpha?: number): void;
-            binarySearch(values: number[], target: number, step: number): number;
-            binarySearch1(values: number[], target: number): number;
-            linearSearch(values: number[], target: number, step: number): number;
-
-            name: string;
-            timelines: Timeline[];
-            duration: number;
-
-        }
-
-        export class AnimationState {
-
-            data: AnimationStateData;
-            tracks: TrackEntry[];
-            events: Event[];
-            onStart: (index: number) => void;
-            onEnd: (trackIndex: number) => void;
-            onComplete: (i: number, count: number) => void;
-            onEvent: (i: number, event: Event) => void;
-            timeScale: number;
-
-            constructor(stateData: AnimationStateData);
-
-            update(delta: number): void;
-            apply(skeleton: Skeleton): void;
-            clearTracks(): void;
-            clearTrack(trackIndex: number): void;
-            private _expandToIndex(index: number): TrackEntry;
-            setCurrent(index: number, entry: TrackEntry): void;
-            setAnimationByName(trackIndex: number, animationName: string, loop: boolean): TrackEntry;
-            setAnimation(trackIndex: number, animation: Animation, loop: boolean): TrackEntry;
-            addAnimationByName(trackIndex: number, animationName: string, loop: boolean, delay: number): TrackEntry;
-            addAnimation(trackIndex: number, animation: Animation, loop: boolean, delay: number): TrackEntry;
-            getCurrent(trackIndex: number): TrackEntry;
-
-        }
-
-        export class Spine extends PIXI.Container {
-
-            constructor(spineData: any);
-
-            static fromAtlas(resourceName: string): Spine;
-
-            update(dt: number): void;
-
-            private autoUpdateTransform(): void;
-            private createSprite(slot: Slot, attachment: Attachment): Sprite;
-            private createMesh(slot, attachment)
-
-            spineData: any;
-            skeleton: Skeleton;
-            stateData: AnimationStateData;
-            state: AnimationState;
-            slotContainers: PIXI.Container[];
-            autoUpdate: boolean;
-
-        }
-
-        export class AnimationStateData {
-
-            constructor(skeletonData: SkeletonData);
-
-            private _skelentonData: SkeletonData;
-            private animationToMixTime: number;
-            defaultMix: number;
-            skeletonData: SkeletonData;
-            setMixByName(fromName: string, toName: string, duration: number): void;
-            setMix(from: Animation, to: Animation, duration: number): void;
-            getMix(from: Animation, to: Animation): number;
-
-        }
-
-        export class AttachmentType {
-
-            static region: number;
-            static boundingbox: number;
-            static mesh: number;
-            static skinnedmesh: number;
-
-        }
-
-        export class Bone {
-
-            data: BoneData;
-            skeleton: Skeleton;
-            parent: Bone;
-
-            constructor(boneData: BoneData, skeleton: Skeleton, parent: Bone);
-
-            x: number;
-            y: number;
-            rotation: number;
-            rotationIK: number;
-            scaleX: number;
-            scaleY: number;
-            flipX: boolean;
-            flipY: boolean;
-            m00: number;
-            m01: number;
-            worldX: number;
-            m10: number;
-            m11: number;
-            worldY: number;
-            worldRotation: number;;
-            worldScaleX: number;
-            worldScaleY: number;
-            worldFlipX: boolean;
-            worldFlipY: boolean;
-
-            updateWorldTransform(): void;
-            setToSetupPose(): void;
-            worldToLocal(world: number[]): void;
-            localToWorld(local: number[]): void;
-
-        }
-
-        export class BoneData {
-
-            name: string;
-            parent: Bone;
-
-            constructor(name: string, parent: Bone);
-
-            length: number;
-            x: number;
-            y: number;
-            rotation: number;
-            scaleX: number;
-            scaleY: number;
-            inheritScale: boolean;
-            inheritRotation: boolean;
-            flipX: boolean;
-            flipY: boolean;
-
-        }
-
-        export class BoundingBoxAttachment implements Attachment {
-
-            constructor(name: string);
-
-            name: string;
-            vertices: number[];
-            type: number;
-
-            computeWorldVertices(x: number, y: number, bone: Bone, worldVertices: number[]): void;
-
-        }
-
-        export class ColorTimeline implements Timeline {
-
-            constructor(frameCount: number);
-
-            curves: Curves;
-            frames: number[];
-            slotIndex: number;
-
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, r: number, g: number, b: number, a: number): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-        export class Curves {
-
-            constructor(frameCount: number[]);
-
-            curves: number[];
-
-            setLinear(frameIndex: number): void;
-            setStepped(frameIndex: number): void;
-            setCurve(frameIndex: number, cx1: number, cy1: number, cx2: number, cy2: number): void;
-            getCurvePercent(frameIndex: number, percent: number): number;
-
-        }
-
-        export class DrawOrderTimeline implements Timeline {
-
-            constructor(frameCount: number);
-
-            frames: number[];
-            drawOrders: number[];
-
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, drawOrder: number[]): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-        export class Event {
-
-            constructor(data: any);
-
-            data: any;
-            intValue: number;
-            floatValue: number;
-            stringValue: string;
-
-        }
-
-        export class EventData {
-
-            constructor(name: string);
-
-            name: string;
-
-            intValue: number;
-            floatValue: number;
-            stringValue: string;
-
-        }
-
-        export class EventTimeline implements Timeline {
-
-            constructor(frameCount: number);
-
-            frames: number[];
-            events: Event[];
-
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, event: Event): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-
-        export class FfdTimeline implements Timeline {
-
-            constructor(frameCount: number);
-
-            curves: Curves;
-            frames: number[];
-            frameVertices: number[];
-            slotIndex: number;
-            attachment: number;
-
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, vertices: number[]): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-        export class FlipXTimeline implements Timeline {
-
-            constructor(frameCount: number);
-
-            curves: Curves;
-            frames: number[];
-            boneIndex: number;
-
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, vertices: number[]): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-        export class FlipYTimeline implements Timeline {
-
-            constructor(frameCount: number);
-
-            curves: Curves;
-            frames: number[];
-            boneIndex: number;
-
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, vertices: number[]): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-        export class IkConstraint {
-
-            constructor(data: IkConstraintData, skeleton: Skeleton);
-
-            data: IkConstraintData;
-            mix: number;
-            bendDirection: number;
-            bones: Bone[];
-            target: Bone;
-
-            apply(): void;
-            apply1(bone: Bone, targetX: number, targetY: number, alpha: number): void;
-            apply2(parent: Bone, child: Bone, targetX: number, targetY: number, bendDirection: number, alpha: number): void;
-
-        }
-
-        export class IkConstraintData {
-
-            constructor(name: string);
-
-            name: string;
-            bones: Bone[];
-            target: Bone;
-            bendDirection: number;
-            mix: number;
-
-        }
-
-        export class IkConstraintTimeline implements Timeline {
-            constructor(frameCount: number);
-
-            curves: Curves;
-            frames: number[];
-            ikConstraintIndex: number;
-
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, mix: number, bendDirection: number): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-        export class MeshAttachment implements Attachment {
-
-            constructor(name: string);
-
-            name: string;
-            type: number;
-            vertices: number[];
-            uvs: number[]
-            regionUVs: number[]
-            triangles: number[]
-            hullLength: number;
-            r: number;
-            g: number;
-            b: number;
-            a: number;
-            path: string;
-            rendererObject: any;
-            regionU: number;
-            regionV: number;
-            regionU2: number;
-            regionV2: number;
-            regionRotate: boolean;
-            regionOffsetX: number;
-            regionOffsetY: number;
-            regionWidth: number;
-            regionHeight: number;
-            regionOriginalWidth: number;
-            regionOriginalHeight: number;
-            edges: number[];
-            width: number;
-            height: number;
-
-            updateUVs(): void;
-            computeWorldVertices(x: number, y: number, slot: Slot, worldVertices: number[]): void;
-
-        }
-
-        export class RegionAttachment implements Attachment {
-
-            constructor(name: string);
-
-            name: string;
-            offset: number[];
-            uvs: number[]
-            type: number;
-            x: number;
-            y: number;
-            rotation: number;
-            scaleX: number;
-            scaleY: number;
-            width: number;
-            height: number;
-            r: number;
-            g: number;
-            b: number;
-            a: number;
-            path: string;
-            rendererObject: any;
-            regionOffsetX: number;
-            regionOffsetY: number;
-            regionWidth: number;
-            regionHeight: number;
-            regionOriginalWidth: number;
-            regionOriginalHeight: number;
-
-            updateOffset(): void;
-            setUVs(u: number, v: number, u2: number, v2: number, rotate: number): void;
-            computeVertices(x: number, y: number, bone: Bone, vertices: number[]): void;
-
-        }
-
-        export class RotateTimeline implements Timeline {
-
-            constructor(frameCount: number);
-
-            curves: Curves;
-            frames: number[];
-            boneIndex: number;
-
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, mix: number, bendDirection: number): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-        export class ScaleTimeline implements Timeline {
-
-            constructor(frameCount: number);
-
-            curves: Curves;
-            frames: number[];
-            boneIndex: number;
-
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, mix: number, bendDirection: number): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-        export class Skeleton {
-
-            constructor(skeletonData: SkeletonData);
-
-            data: SkeletonData;
-            bones: Bone[];
-            slots: Slot[];
-            drawOrder: Slot[];
-            ikConstraints: IkConstraint[];
-            boneCache: Bone[][];
-            x: number;
-            y: number;
-            skin: Skin;
-            r: number;
-            g: number;
-            b: number;
-            a: number;
-            time: number;
-            flipX: boolean;
-            flipY: boolean;
-
-            updateCache(): void;
-            updateWorldTransform(): void;
-            setToSetupPose(): void;
-            setBonesToSetupPose(): void;
-            setSlotsToSetupPose(): void;
-            getRootBone(): Bone;
-            findBone(boneName: string): Bone;
-            findBoneIndex(boneName: string): number;
-            findSlot(slotName: string): Slot;
-            findSlotIndex(slotName: string): number;
-            setSkinByName(skinName: string): Skin;
-            setSkin(newSkin: Skin): void;
-            getAttachmentBySlotName(slotName: string, attachmentName: string): Attachment;
-            getAttachmentBySlotIndex(slotIndex: number, attachmentName: string): Attachment
-            setAttachment(slotName: string, attachmentName: string): void;
-            findIkConstraint(ikConstraintName: string): IkConstraint;
-            update(delta: number): void;
-            resetDrawOrder(): void;
-
-        }
-
-        export class SkeletonBounds {
-
-            polygonPool: Polygon[];
-            polygons: Polygon[];
-            boundingBoxes: BoundingBoxAttachment[];
-            minX: number;
-            minY: number;
-            maxX: number;
-            maxY: number;
-
-            update(skeleton: Skeleton, updateAabb: boolean): void;
-            aabbCompute(): void;
-            aabbContainsPoint(x: number, y: number): void;
-            aabbIntersectsSegment(x1: number, y1: number, x2: number, y2: number): boolean;
-            aabbIntersectsSkeleton(bounds: SkeletonBounds): boolean;
-            containsPoint(x: number, y: number): BoundingBoxAttachment;
-            intersectsSegment(x1: number, y1: number, x2: number, y2: number): BoundingBoxAttachment;
-            polygonContainsPoint(polygon: Polygon, x: number, y: number): boolean;
-            polygonIntersectsSegment(polygon: Polygon, x1: number, y1: number, x2: number, y2: number): boolean;
-            getPolygon(attachment: Attachment): Polygon;
-            getWidth(): number;
-            getHeight(): number;
-
-        }
-
-        export class SkeletonData {
-
-            bones: Bone[];
-            slots: Slot[];
-            skins: Skin[];
-            events: Event[];
-            animations: Animation[];
-            ikConstraints: IkConstraint[];
-            name: string;
-            defaultSkin: Skin;
-            width: number;
-            height: number;
-            version: any;
-            hash: any;
-
-            findBone(boneName: string): Bone;
-            findBoneIndex(boneName: string): number;
-            findSlot(slotName: string): Slot;
-            findSlotIndex(slotName: string): number;
-            findSkin(skinName: string): Skin;
-            findEvent(eventName: string): Event;
-            findAnimation(animationName: string): Animation
-            findIkConstraint(ikConstraintName: string): IkConstraint;
-
-        }
-
-        export class SkeletonJsonParser {
-
-            constructor(attachmentLoader: any);
-
-            attachmentLoader: any;
-            scale: number;
-
-            readSkeletonData(root: Bone, name: string): void;
-            readAttachment(skin: Skin, name: string, map: any): void;
-            readAnimation(name: string, map: any, skeletonData: SkeletonData): void;
-            readCurve(timeline: Timeline, frameIndex: number, valueMap: any): void;
-            toColor(hexString: string, colorIndex: string): number;
-            getFloatArray(map: any, name: string, scale: number): number[];
-            getIntArray(map: any, name: string): number[];
-
-        }
-
-        export class Skin {
-
-            constructor(name: string);
-
-            name: string;
-            attachments: Attachment[];
-            addAttachment(slotIndex: number, name: string, attachment: Attachment): void;
-            getAttachment(slotIndex: number, name: string): Attachment;
-
-            protected _attachAll(skeleton: Skeleton, oldSkin: Skin): void;
-
-        }
-
-        export class SkinnedMeshAttachment implements Attachment {
-
-            constructor(name: string);
-
-            name: string;
-            type: number;
-            bones: number[];
-            weights: number[];
-            uvs: number[];
-            regionUVs: number[];
-            triangles: number[];
-            hullLength: number;
-            r: number;
-            g: number;
-            b: number;
-            a: number;
-            path: string;
-            rendererObject: any;
-            regionU: number;
-            regionV: number;
-            regionU2: number;
-            regionV2: number;
-            regionRotate: boolean;
-            regionOffsetX: number;
-            regionOffsetY: number;
-            regionWidth: number;
-            regionHeight: number;
-            regionOriginalWidth: number;
-            regionOriginalHeight: number;
-            edges: number[];
-            width: number;
-            height: number;
-
-            updateUVs(u: number, v: number, u2: number, v2: number, rotate: boolean): void;
-            computeWorldVertices(x: number, y: number, slot: Slot, worldVertices: number[]): void;
-
-        }
-
-        export class Slot {
-
-            constructor(slotData: SlotData, bone: Bone);
-
-            data: SlotData;
-            bone: Bone;
-            r: number;
-            g: number;
-            b: number;
-            a: number;
-            _attachmentTime: number;
-            attachment: Attachment;
-            attachmentVertices: number[];
-            setAttachment(attachment: Attachment): void;
-            setAttachmentTime(time: number): void;
-            getAttachmentTime(): number;
-            setToSetupPose(): void;
-
-        }
-
-        export class SlotData {
-
-            constructor(name: string, boneData: BoneData);
-
-            name: string;
-            boneData: BoneData;
-
-            static PIXI_BLEND_MODE_MAP: {
-                multiply: number;
-                screen: number;
-                additive: number;
-                normal: number;
-            };
-            r: number;
-            g: number;
-            b: number;
-            a: number;
-            attachmentName: string;
-            blendMode: number;
-
-        }
-
-        export class TrackEntry {
-
-            next: TrackEntry;
-            previous: TrackEntry;
-            animation: Animation;
-            loop: boolean;
-            delay: number;
-            time: number;
-            lastTime: number;
-            endTime: number;
-            timeScale: number;
-            mixTime: number;
-            mixDuration: number;
-            mix: number;
-            onStart: (index: number) => void;
-            onEnd: (trackIndex: number) => void;
-            onComplete: (i: number, count: number) => void;
-            onEvent: (i: number, event: Event) => void;
-
-        }
-
-        export class TranslateTimeline implements Timeline {
-
-            constructor(frameCount: number);
-
-            curves: Curves[];
-            frames: number[];
-            boneIndex: number;
-
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, x: number, y: number): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-        export class Atlas {
-
-            constructor(atlasText: string, baseUrl: string, crossOrigin: any);
-
-            pages: AtlasPage[];
-            regions: AtlasRegion[];
-            texturesLoading: number;
-
-            findRegion(name: string): AtlasRegion;
-            dispose(): void;
-            updateUVs(page: AtlasPage): void;
-
-            Format: {
-
-                alpha: number;
-                intensity: number;
-                luminanceAlpha: number;
-                rgb565: number;
-                rgba4444: number;
-                rgb888: number;
-                rgba8888: number;
-
-            };
-
-            TextureFilter: {
-
-                nearest: number;
-                linear: number;
-                mipMap: number;
-                mipMapNearestNearest: number;
-                mipMapLinearNearest: number;
-                mipMapNearestLinear: number;
-                mipMapLinearLinear: number;
-
-            };
-
-            TextureWrap: {
-
-                mirroredRepeat: number;
-                clampToEdge: number;
-                repeat: number;
-
-            };
-
-        }
-
-        export class AtlasAttachmentParser {
-
-            constructor(atlas: Atlas);
-
-            newRegionAttachment(skin: Skin, name: string, path: string): RegionAttachment;
-            newMeshAttachment(skin: Skin, name: string, path: string): SkinnedMeshAttachment;
-            newSkinnedMeshAttachment(skin: Skin, name: string, path: string): SkinnedMeshAttachment;
-            newBoundingBoxAttachment(skin: Skin, name: string): BoundingBoxAttachment;
-
-        }
-
-        export class AtlasPage {
-            name: string;
-            format: any;
-            minFilter: any;
-            magFilter: any;
-            uWrap: any;
-            vWrap: any;
-            rendererObject: any;
-            width: number;
-            height: number;
-
-        }
-
-        export class AtlasReader {
-            constructor(text: string);
-
-            lines: string[];
-            index: number;
-
-            trim(value: string): string;
-            readLine(): string;
-            readValue(): string;
-            readTuple(tuple: number): number;
-
-        }
-
-        export class AtlasRegion {
-
-            page: AtlasPage;
-            name: string;
-            x: number;
-            y: number;
-            width: number;
-            height: number;
-            u: number;
-            v: number;
-            u2: number;
-            v2: number;
-            offsetX: number;
-            offsetY: number;
-            originalWidth: number;
-            originalHeight: number;
-            index: number;
-            rotate: boolean;
-            splits: any;
-            pads: any;
-
-
-        }
-
-        export class AttachmentTimeline implements Timeline {
-
-            constructor(frameCount: number);
-
-            slotIndex: number;
-            frames: number[];
-            attachmentNames: string[];
-
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, attachmentName: string): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-        export class atlasParser {
-
-            constructor(resource: any, next: any);
-
-            AnimCache: any;
-            enableCaching: boolean;
-
-        }
-
-    }
-
-}
diff --git a/pixi-spine/tsconfig.json b/pixi-spine/tsconfig.json
new file mode 100644
index 0000000000..abdcd18ebd
--- /dev/null
+++ b/pixi-spine/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pixi-spine-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pixi.js/index.d.ts b/pixi.js/index.d.ts
new file mode 100644
index 0000000000..28c367f816
--- /dev/null
+++ b/pixi.js/index.d.ts
@@ -0,0 +1,1745 @@
+// Type definitions for Pixi.js 3.0.9 dev
+// Project: https://github.com/GoodBoyDigital/pixi.js/
+// Definitions by: clark-stevenson <https://github.com/pixijs/pixi-typescript>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = PIXI;
+export as namespace PIXI;
+
+declare class PIXI {
+
+    static VERSION: string;
+    static PI_2: number;
+    static RAD_TO_DEG: number;
+    static DEG_TO_RAD: number;
+    static TARGET_FPMS: number;
+    static RENDERER_TYPE: {
+        UNKNOWN: number;
+        WEBGL: number;
+        CANVAS: number;
+    };
+    static BLEND_MODES: {
+        NORMAL: number;
+        ADD: number;
+        MULTIPLY: number;
+        SCREEN: number;
+        OVERLAY: number;
+        DARKEN: number;
+        LIGHTEN: number;
+        COLOR_DODGE: number;
+        COLOR_BURN: number;
+        HARD_LIGHT: number;
+        SOFT_LIGHT: number;
+        DIFFERENCE: number;
+        EXCLUSION: number;
+        HUE: number;
+        SATURATION: number;
+        COLOR: number;
+        LUMINOSITY: number;
+
+    };
+    static DRAW_MODES: {
+        POINTS: number;
+        LINES: number;
+        LINE_LOOP: number;
+        LINE_STRIP: number;
+        TRIANGLES: number;
+        TRIANGLE_STRIP: number;
+        TRIANGLE_FAN: number;
+    };
+    static SCALE_MODES: {
+        DEFAULT: number;
+        LINEAR: number;
+        NEAREST: number;
+    };
+    static RETINA_PREFIX: string;
+    static RESOLUTION: number;
+    static FILTER_RESOLUTION: number;
+    static DEFAULT_RENDER_OPTIONS: {
+        view: HTMLCanvasElement;
+        resolution: number;
+        antialias: boolean;
+        forceFXAA: boolean;
+        autoResize: boolean;
+        transparent: boolean;
+        backgroundColor: number;
+        clearBeforeRender: boolean;
+        preserveDrawingBuffer: boolean;
+        roundPixels: boolean;
+    };
+    static SHAPES: {
+        POLY: number;
+        RECT: number;
+        CIRC: number;
+        ELIP: number;
+        RREC: number;
+    };
+    static SPRITE_BATCH_SIZE: number;
+
+}
+
+declare namespace PIXI {
+
+    export function autoDetectRenderer(width: number, height: number, options?: PIXI.RendererOptions, noWebGL?: boolean): PIXI.WebGLRenderer | PIXI.CanvasRenderer;
+    export var loader: PIXI.loaders.Loader;
+
+    //https://github.com/primus/eventemitter3
+    export class EventEmitter {
+
+        listeners(event: string): Function[];
+        emit(event: string, ...args: any[]): boolean;
+        on(event: string, fn: Function, context?: any): EventEmitter;
+        once(event: string, fn: Function, context?: any): EventEmitter;
+        removeListener(event: string, fn: Function, context?: any, once?: boolean): EventEmitter;
+        removeAllListeners(event: string): EventEmitter;
+
+        off(event: string, fn: Function, context?: any, once?: boolean): EventEmitter;
+        addListener(event: string, fn: Function, context?: any): EventEmitter;
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////////CORE//////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    //display
+
+    export class DisplayObject extends EventEmitter implements interaction.InteractiveTarget {
+
+        //begin extras.cacheAsBitmap see https://github.com/pixijs/pixi-typescript/commit/1207b7f4752d79a088d6a9a465a3ec799906b1db
+        protected _originalRenderWebGL: WebGLRenderer;
+        protected _originalRenderCanvas: CanvasRenderer;
+        protected _originalUpdateTransform: boolean;
+        protected _originalHitTest: any;
+        protected _cachedSprite: any;
+        protected _originalDestroy: any;
+
+        cacheAsBitmap: boolean;
+
+        protected _renderCachedWebGL(renderer: WebGLRenderer): void;
+        protected _initCachedDisplayObject(renderer: WebGLRenderer): void;
+        protected _renderCachedCanvas(renderer: CanvasRenderer): void;
+        protected _initCachedDisplayObjectCanvas(renderer: CanvasRenderer): void;
+        protected _getCachedBounds(): Rectangle;
+        protected _destroyCachedDisplayObject(): void;
+        protected _cacheAsBitmapDestroy(): void;
+        //end extras.cacheAsBitmap
+
+        protected _sr: number;
+        protected _cr: number;
+        protected _bounds: Rectangle;
+        protected _currentBounds: Rectangle;
+        protected _mask: Rectangle;
+        protected _cachedObject: any;
+
+        updateTransform(): void;
+
+        position: Point;
+        scale: Point;
+        pivot: Point;
+        rotation: number;
+        renderable: boolean;
+        alpha: number;
+        visible: boolean;
+        parent: Container;
+        worldAlpha: number;
+        worldTransform: Matrix;
+        filterArea: Rectangle;
+
+        x: number;
+        y: number;
+        worldVisible: boolean;
+        mask: Graphics | Sprite;
+        filters: AbstractFilter[];
+        name: string;
+
+        getBounds(matrix?: Matrix): Rectangle;
+        getLocalBounds(): Rectangle;
+        toGlobal(position: Point): Point;
+        toLocal(position: Point, from?: DisplayObject): Point;
+        generateTexture(renderer: CanvasRenderer | WebGLRenderer, scaleMode: number, resolution: number): Texture;
+        setParent(container: Container): Container;
+        setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, pivotX?: number, pivotY?: number): DisplayObject;
+        destroy(): void;
+        getChildByName(name: string): DisplayObject;
+        getGlobalPosition(point: Point): Point;
+
+        interactive: boolean;
+        buttonMode: boolean;
+        interactiveChildren: boolean;
+        defaultCursor: string;
+        hitArea: HitArea;
+
+        on(event: 'click', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'mousedown', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'mouseout', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'mouseover', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'mouseup', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'mouseclick', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'mouseupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'rightclick', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'rightdown', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'rightup', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'rightupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'tap', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'touchend', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'touchendoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'touchmove', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'touchstart', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: string, fn: Function, context?: any): EventEmitter;
+
+        once(event: 'click', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'mousedown', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'mouseout', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'mouseover', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'mouseup', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'mouseclick', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'mouseupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'rightclick', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'rightdown', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'rightup', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'rightupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'tap', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'touchend', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'touchendoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'touchmove', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'touchstart', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: string, fn: Function, context?: any): EventEmitter;
+
+    }
+
+    export class Container extends DisplayObject {
+
+        protected _renderWebGL(renderer: WebGLRenderer): void;
+        protected _renderCanvas(renderer: CanvasRenderer): void;
+
+        protected onChildrenChange: () => void;
+
+        children: DisplayObject[];
+
+        width: number;
+        height: number;
+
+        addChild(...child: DisplayObject[]): DisplayObject;
+        addChildAt(child: DisplayObject, index: number): DisplayObject;
+        swapChildren(child: DisplayObject, child2: DisplayObject): void;
+        getChildIndex(child: DisplayObject): number;
+        setChildIndex(child: DisplayObject, index: number): void;
+        getChildAt(index: number): DisplayObject;
+        removeChild(child: DisplayObject): DisplayObject;
+        removeChildAt(index: number): DisplayObject;
+        removeChildren(beginIndex?: number, endIndex?: number): DisplayObject[];
+        destroy(destroyChildren?: boolean): void;
+        generateTexture(renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer, resolution?: number, scaleMode?: number): Texture;
+
+        renderWebGL(renderer: WebGLRenderer): void;
+        renderCanvas(renderer: CanvasRenderer): void;
+
+        once(event: 'added', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: string, fn: Function, context?: any): EventEmitter;
+        once(event: 'removed', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: string, fn: Function, context?: any): EventEmitter;
+        on(event: 'added', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: string, fn: Function, context?: any): EventEmitter;
+        on(event: 'removed', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: string, fn: Function, context?: any): EventEmitter;
+
+    }
+
+    //graphics
+
+    export class GraphicsData {
+
+        constructor(lineWidth: number, lineColor: number, lineAlpha: number, fillColor: number, fillAlpha: number, fill: boolean, shape: Circle | Rectangle | Ellipse | Polygon);
+
+        lineWidth: number;
+        lineColor: number;
+        lineAlpha: number;
+        fillColor: number;
+        fillAlpha: number;
+        fill: boolean;
+        shape: Circle | Rectangle | Ellipse | Polygon;
+        type: number;
+
+        clone(): GraphicsData;
+
+        protected _lineTint: number;
+        protected _fillTint: number;
+
+    }
+    export class Graphics extends Container {
+
+        protected boundsDirty: boolean;
+        protected dirty: boolean;
+        protected glDirty: boolean;
+
+        fillAlpha: number;
+        lineWidth: number;
+        lineColor: number;
+        tint: number;
+        blendMode: number;
+        isMask: boolean;
+        boundsPadding: number;
+
+        clone(): Graphics;
+        lineStyle(lineWidth?: number, color?: number, alpha?: number): Graphics;
+        moveTo(x: number, y: number): Graphics;
+        lineTo(x: number, y: number): Graphics;
+        quadraticCurveTo(cpX: number, cpY: number, toX: number, toY: number): Graphics;
+        bezierCurveTo(cpX: number, cpY: number, cpX2: number, cpY2: number, toX: number, toY: number): Graphics;
+        arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): Graphics;
+        arc(cx: number, cy: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): Graphics;
+        beginFill(color: number, alpha?: number): Graphics;
+        endFill(): Graphics;
+        drawRect(x: number, y: number, width: number, height: number): Graphics;
+        drawRoundedRect(x: number, y: number, width: number, height: number, radius: number): Graphics;
+        drawCircle(x: number, y: number, radius: number): Graphics;
+        drawEllipse(x: number, y: number, width: number, height: number): Graphics;
+        drawPolygon(path: number[] | Point[]): Graphics;
+        clear(): Graphics;
+        //todo
+        generateTexture(renderer: WebGLRenderer | CanvasRenderer, resolution?: number, scaleMode?: number): Texture;
+        getBounds(matrix?: Matrix): Rectangle;
+        containsPoint(point: Point): boolean;
+        updateLocalBounds(): void;
+        drawShape(shape: Circle | Rectangle | Ellipse | Polygon): GraphicsData;
+
+    }
+    export interface GraphicsRenderer extends ObjectRenderer {
+        //yikes todo
+    }
+    export interface WebGLGraphicsData {
+        //yikes todo!
+    }
+
+    //math
+
+    export class Point {
+
+        x: number;
+        y: number;
+
+        constructor(x?: number, y?: number);
+
+        clone(): Point;
+        copy(p: Point): void;
+        equals(p: Point): boolean;
+        set(x?: number, y?: number): void;
+
+    }
+    export class Matrix {
+
+        a: number;
+        b: number;
+        c: number;
+        d: number;
+        tx: number;
+        ty: number;
+
+        fromArray(array: number[]): void;
+        toArray(transpose?: boolean, out?: number[]): number[];
+        apply(pos: Point, newPos?: Point): Point;
+        applyInverse(pos: Point, newPos?: Point): Point;
+        translate(x: number, y: number): Matrix;
+        scale(x: number, y: number): Matrix;
+        rotate(angle: number): Matrix;
+        append(matrix: Matrix): Matrix;
+        prepend(matrix: Matrix): Matrix;
+        invert(): Matrix;
+        identity(): Matrix;
+        clone(): Matrix;
+        copy(matrix: Matrix): Matrix;
+        set(a: number, b: number, c: number, d: number, tx: number, ty: number): Matrix;
+        setTransform(a: number, b: number, c: number, d: number, sr: number, cr: number, cy: number, sy: number, nsx: number, cs: number): PIXI.Matrix;
+
+        static IDENTITY: Matrix;
+        static TEMP_MATRIX: Matrix;
+
+    }
+
+    export interface HitArea {
+
+        contains(x: number, y: number): boolean;
+
+    }
+
+    export class Circle implements HitArea {
+
+        constructor(x?: number, y?: number, radius?: number);
+
+        x: number;
+        y: number;
+        radius: number;
+        type: number;
+
+        clone(): Circle;
+        contains(x: number, y: number): boolean;
+        getBounds(): Rectangle;
+
+    }
+    export class Ellipse implements HitArea {
+
+        constructor(x?: number, y?: number, width?: number, height?: number);
+
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+        type: number;
+
+        clone(): Ellipse;
+        contains(x: number, y: number): boolean;
+        getBounds(): Rectangle;
+
+    }
+    export class Polygon implements HitArea {
+
+        constructor(points: Point[]);
+        constructor(points: number[]);
+        constructor(...points: Point[]);
+        constructor(...points: number[]);
+
+        closed: boolean;
+        points: number[];
+        type: number;
+
+        clone(): Polygon;
+        contains(x: number, y: number): boolean;
+
+
+    }
+    export class Rectangle implements HitArea {
+
+        constructor(x?: number, y?: number, width?: number, height?: number);
+
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+        type: number;
+
+        static EMPTY: Rectangle;
+
+        clone(): Rectangle;
+        contains(x: number, y: number): boolean;
+
+    }
+    export class RoundedRectangle implements HitArea {
+
+        constructor(x?: number, y?: number, width?: number, height?: number, radius?: number);
+
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+        radius: number;
+        type: number;
+
+        static EMPTY: Rectangle;
+
+        clone(): Rectangle;
+        contains(x: number, y: number): boolean;
+
+    }
+
+    //particles
+
+    export interface ParticleContainerProperties {
+
+        scale?: boolean;
+        position?: boolean;
+        rotation?: boolean;
+        uvs?: boolean;
+        alpha?: boolean;
+
+    }
+    export class ParticleContainer extends Container {
+
+        constructor(size?: number, properties?: ParticleContainerProperties, batchSize?: number);
+
+        protected _maxSize: number;
+        protected _batchSize: number;
+        protected _properties: boolean[];
+        protected _buffers: WebGLBuffer[];
+        protected _bufferToUpdate: number;
+
+        protected onChildrenChange: (smallestChildIndex?: number) => void;
+
+        interactiveChildren: boolean;
+        blendMode: number;
+        roundPixels: boolean;
+
+        setProperties(properties: ParticleContainerProperties): void;
+
+    }
+    export interface ParticleBuffer {
+
+        gl: WebGLRenderingContext;
+        vertSize: number;
+        vertByteSize: number;
+        size: number;
+        dynamicProperties: any[];
+        staticProperties: any[];
+
+        staticStride: number;
+        staticBuffer: any;
+        staticData: any;
+        dynamicStride: number;
+        dynamicBuffer: any;
+        dynamicData: any;
+
+        initBuffers(): void;
+        bind(): void;
+        destroy(): void;
+
+    }
+    export interface ParticleRenderer {
+
+    }
+    export interface ParticleShader {
+
+    }
+
+    //renderers
+
+    export interface RendererOptions {
+
+        view?: HTMLCanvasElement;
+        transparent?: boolean;
+        antialias?: boolean;
+        resolution?: number;
+        clearBeforeRendering?: boolean;
+        preserveDrawingBuffer?: boolean;
+        forceFXAA?: boolean;
+        roundPixels?: boolean;
+        backgroundColor?: number;
+
+    }
+    export class SystemRenderer extends EventEmitter {
+
+        protected _backgroundColor: number;
+        protected _backgroundColorRgb: number[];
+        protected _backgroundColorString: string;
+        protected _tempDisplayObjectParent: any;
+        protected _lastObjectRendered: DisplayObject;
+
+        constructor(system: string, width?: number, height?: number, options?: RendererOptions);
+
+        type: number;
+        width: number;
+        height: number;
+        view: HTMLCanvasElement;
+        resolution: number;
+        transparent: boolean;
+        autoResize: boolean;
+        blendModes: any; //todo?
+        preserveDrawingBuffer: boolean;
+        clearBeforeRender: boolean;
+        roundPixels: boolean;
+        backgroundColor: number;
+
+        render(object: DisplayObject): void;
+        resize(width: number, height: number): void;
+        destroy(removeView?: boolean): void;
+
+    }
+    export class CanvasRenderer extends SystemRenderer {
+
+        protected renderDisplayObject(displayObject: DisplayObject, context: CanvasRenderingContext2D): void;
+        protected _mapBlendModes(): void;
+
+        constructor(width?: number, height?: number, options?: RendererOptions);
+
+        context: CanvasRenderingContext2D;
+        refresh: boolean;
+        maskManager: CanvasMaskManager;
+        roundPixels: boolean;
+        smoothProperty: string;
+
+        render(object: DisplayObject): void;
+        resize(w: number, h: number): void;
+
+    }
+    export class CanvasBuffer {
+
+        protected clear(): void;
+
+        constructor(width: number, height: number);
+
+        canvas: HTMLCanvasElement;
+        context: CanvasRenderingContext2D;
+
+        width: number;
+        height: number;
+
+        resize(width: number, height: number): void;
+        destroy(): void;
+
+    }
+    export class CanvasGraphics {
+
+        static renderGraphicsMask(graphics: Graphics, context: CanvasRenderingContext2D): void;
+        static updateGraphicsTint(graphics: Graphics): void;
+
+        static renderGraphics(graphics: Graphics, context: CanvasRenderingContext2D): void;
+
+    }
+    export class CanvasMaskManager {
+
+        pushMask(maskData: any, renderer: WebGLRenderer | CanvasRenderer): void;
+        popMask(renderer: WebGLRenderer | CanvasRenderer): void;
+        destroy(): void;
+
+    }
+    export class CanvasTinter {
+
+        static getTintedTexture(sprite: DisplayObject, color: number): HTMLCanvasElement;
+        static tintWithMultiply(texture: Texture, color: number, canvas: HTMLDivElement): void;
+        static tintWithOverlay(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
+        static tintWithPerPixel(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
+        static roundColor(color: number): number;
+        static cacheStepsPerColorChannel: number;
+        static convertTintToImage: boolean;
+        static vanUseMultiply: boolean;
+        static tintMethod: Function;
+
+    }
+    export class WebGLRenderer extends SystemRenderer {
+
+        protected _useFXAA: boolean;
+        protected _FXAAFilter: filters.FXAAFilter;
+        protected _contextOptions: {
+            alpha: boolean;
+            antiAlias: boolean;
+            premultipliedAlpha: boolean;
+            stencil: boolean;
+            preseveDrawingBuffer: boolean;
+        };
+        protected _renderTargetStack: RenderTarget[];
+
+        protected _initContext(): void;
+        protected _createContext(): void;
+        protected handleContextLost: (event: WebGLContextEvent) => void;
+        protected _mapGlModes(): void;
+        protected _managedTextures: Texture[];
+
+        constructor(width?: number, height?: number, options?: RendererOptions);
+
+        drawCount: number;
+        shaderManager: ShaderManager;
+        maskManager: MaskManager;
+        stencilManager: StencilManager;
+        filterManager: FilterManager;
+        blendModeManager: BlendModeManager;
+        currentRenderTarget: RenderTarget;
+        currentRenderer: ObjectRenderer;
+
+        render(object: DisplayObject): void;
+        renderDisplayObject(displayObject: DisplayObject, renderTarget: RenderTarget, clear: boolean): void;
+        setObjectRenderer(objectRenderer: ObjectRenderer): void;
+        setRenderTarget(renderTarget: RenderTarget): void;
+        updateTexture(texture: BaseTexture | Texture): BaseTexture | Texture;
+        destroyTexture(texture: BaseTexture | Texture, _skipRemove?: boolean): void;
+
+    }
+    export class AbstractFilter {
+
+        protected vertexSrc: string[];
+        protected fragmentSrc: string[];
+
+        constructor(vertexSrc?: string | string[], fragmentSrc?: string | string[], uniforms?: any);
+
+        uniforms: any;
+
+        padding: number;
+
+        getShader(renderer: WebGLRenderer): Shader;
+        applyFilter(renderer: WebGLRenderer, input: RenderTarget, output: RenderTarget, clear?: boolean): void;
+        syncUniform(uniform: WebGLUniformLocation): void;
+
+    }
+    export class SpriteMaskFilter extends AbstractFilter {
+
+        constructor(sprite: Sprite);
+
+        maskSprite: Sprite;
+        maskMatrix: Matrix;
+
+        applyFilter(renderer: WebGLRenderbuffer, input: RenderTarget, output: RenderTarget): void;
+        map: Texture;
+        offset: Point;
+
+    }
+    export class BlendModeManager extends WebGLManager {
+
+        constructor(renderer: WebGLRenderer);
+
+        setBlendMode(blendMode: number): boolean;
+
+    }
+
+    export class FilterManager extends WebGLManager {
+
+        constructor(renderer: WebGLRenderer);
+
+        filterStack: any[];
+        renderer: WebGLRenderer;
+        texturePool: any[];
+
+        onContextChange: () => void;
+        setFilterStack(filterStack: any[]): void;
+        pushFilter(target: RenderTarget, filters: any[]): void;
+        popFilter(): AbstractFilter;
+        getRenderTarget(clear?: boolean): RenderTarget;
+        protected returnRenderTarget(renderTarget: RenderTarget): void;
+        applyFilter(shader: Shader | AbstractFilter, inputTarget: RenderTarget, outputTarget: RenderTarget, clear?: boolean): void;
+        calculateMappedMatrix(filterArea: Rectangle, sprite: Sprite, outputMatrix?: Matrix): Matrix;
+        capFilterArea(filterArea: Rectangle): void;
+        resize(width: number, height: number): void;
+        destroy(): void;
+
+    }
+
+    export class MaskManager extends WebGLManager {
+
+        stencilStack: StencilMaskStack;
+        reverse: boolean;
+        count: number;
+        alphaMaskPool: any[];
+
+        pushMask(target: RenderTarget, maskData: any): void;
+        popMask(target: RenderTarget, maskData: any): void;
+        pushSpriteMask(target: RenderTarget, maskData: any): void;
+        popSpriteMask(): void;
+        pushStencilMask(target: RenderTarget, maskData: any): void;
+        popStencilMask(target: RenderTarget, maskData: any): void;
+
+    }
+    export class ShaderManager extends WebGLManager {
+
+        protected _currentId: number;
+        protected currentShader: Shader;
+
+        constructor(renderer: WebGLRenderer);
+
+        maxAttibs: number;
+        attribState: any[];
+        tempAttribState: any[];
+        stack: any[];
+
+        setAttribs(attribs: any[]): void;
+        setShader(shader: Shader): boolean;
+        destroy(): void;
+
+    }
+    export class StencilManager extends WebGLManager {
+
+        constructor(renderer: WebGLRenderer);
+
+        setMaskStack(stencilMaskStack: StencilMaskStack): void;
+        pushStencil(graphics: Graphics, webGLData: WebGLGraphicsData): void;
+        bindGraphics(graphics: Graphics, webGLData: WebGLGraphicsData): void;
+        popStencil(graphics: Graphics, webGLData: WebGLGraphicsData): void;
+        destroy(): void;
+        pushMask(maskData: any[]): void;
+        popMask(maskData: any[]): void;
+
+    }
+    export class WebGLManager {
+
+        protected onContextChange: () => void;
+
+        constructor(renderer: WebGLRenderer);
+
+        renderer: WebGLRenderer;
+
+        destroy(): void;
+
+    }
+    export class Shader {
+
+        protected attributes: any;
+        protected textureCount: number;
+        protected uniforms: any;
+
+        protected _glCompile(type: any, src: any): Shader;
+
+        constructor(shaderManager: ShaderManager, vertexSrc: string, fragmentSrc: string, uniforms: any, attributes: any);
+
+        uuid: number;
+        gl: WebGLRenderingContext;
+        shaderManager: ShaderManager;
+        program: WebGLProgram;
+        vertexSrc: string;
+        fragmentSrc: string;
+
+        init(): void;
+        cacheUniformLocations(keys: string[]): void;
+        cacheAttributeLocations(keys: string[]): void;
+        compile(): WebGLProgram;
+        syncUniform(uniform: any): void;
+        syncUniforms(): void;
+        initSampler2D(uniform: any): void;
+        destroy(): void;
+
+    }
+    export class ComplexPrimitiveShader extends Shader {
+
+        constructor(shaderManager: ShaderManager);
+
+    }
+    export class PrimitiveShader extends Shader {
+
+        constructor(shaderManager: ShaderManager);
+
+    }
+    export class TextureShader extends Shader {
+
+        constructor(shaderManager: ShaderManager, vertexSrc?: string, fragmentSrc?: string, customUniforms?: any, customAttributes?: any);
+
+    }
+    export interface StencilMaskStack {
+
+        stencilStack: any[];
+        reverse: boolean;
+        count: number;
+
+    }
+    export class ObjectRenderer extends WebGLManager {
+
+        start(): void;
+        stop(): void;
+        flush(): void;
+        render(object?: any): void;
+
+    }
+    export class RenderTarget {
+
+        constructor(gl: WebGLRenderingContext, width: number, height: number, scaleMode: number, resolution: number, root: boolean);
+
+        gl: WebGLRenderingContext;
+        frameBuffer: WebGLFramebuffer;
+        texture: Texture;
+        size: Rectangle;
+        resolution: number;
+        projectionMatrix: Matrix;
+        transform: Matrix;
+        frame: Rectangle;
+        stencilBuffer: WebGLRenderbuffer;
+        stencilMaskStack: StencilMaskStack;
+        filterStack: any[];
+        scaleMode: number;
+        root: boolean;
+
+        clear(bind?: boolean): void;
+        attachStencilBuffer(): void;
+        activate(): void;
+        calculateProjection(protectionFrame: Matrix): void;
+        resize(width: number, height: number): void;
+        destroy(): void;
+
+    }
+    export interface Quad {
+
+        gl: WebGLRenderingContext;
+        vertices: number[];
+        uvs: number[];
+        colors: number[];
+        indices: number[];
+        vertexBuffer: WebGLBuffer;
+        indexBuffer: WebGLBuffer;
+
+        map(rect: Rectangle, rect2: Rectangle): void;
+        upload(): void;
+        destroy(): void;
+
+    }
+
+    //sprites
+
+    export class Sprite extends Container {
+
+        static fromFrame(frameId: string): Sprite;
+        static fromImage(imageId: string, crossorigin?: boolean, scaleMode?: number): Sprite;
+
+        protected _texture: Texture;
+        protected _width: number;
+        protected _height: number;
+        protected cachedTint: number;
+
+        protected _onTextureUpdate(): void;
+
+        constructor(texture?: Texture);
+
+        anchor: Point;
+        tint: number;
+        blendMode: number;
+        shader: Shader | AbstractFilter;
+        texture: Texture;
+
+        width: number;
+        height: number;
+
+        getBounds(matrix?: Matrix): Rectangle;
+        getLocalBounds(): Rectangle;
+        containsPoint(point: Point): boolean;
+        destroy(destroyTexture?: boolean, destroyBaseTexture?: boolean): void;
+
+    }
+    export class SpriteRenderer extends ObjectRenderer {
+
+        protected renderBatch(texture: Texture, size: number, startIndex: number): void;
+
+        vertSize: number;
+        vertByteSize: number;
+        size: number;
+        vertices: number[];
+        positions: number[];
+        colors: number[];
+        indices: number[];
+        currentBatchSize: number;
+        sprites: Sprite[];
+        shader: Shader | AbstractFilter;
+
+        render(sprite: Sprite): void;
+        flush(): void;
+        start(): void;
+        destroy(): void;
+
+    }
+
+    //text
+
+    export interface TextStyle {
+
+        font?: string;
+        fill?: string | number;
+        align?: string;
+        stroke?: string | number;
+        strokeThickness?: number;
+        wordWrap?: boolean;
+        wordWrapWidth?: number;
+        lineHeight?: number;
+        dropShadow?: boolean;
+        dropShadowColor?: string | number;
+        dropShadowAngle?: number;
+        dropShadowDistance?: number;
+        padding?: number;
+        textBaseline?: string;
+        lineJoin?: string;
+        miterLimit?: number;
+
+    }
+    export class Text extends Sprite {
+
+        static fontPropertiesCache: any;
+        static fontPropertiesCanvas: HTMLCanvasElement;
+        static fontPropertiesContext: CanvasRenderingContext2D;
+
+        protected _text: string;
+        protected _style: TextStyle;
+
+        protected updateText(): void;
+        protected updateTexture(): void;
+        protected determineFontProperties(fontStyle: TextStyle): TextStyle;
+        protected wordWrap(text: string): boolean;
+
+        constructor(text?: string, style?: TextStyle, resolution?: number);
+
+        canvas: HTMLCanvasElement;
+        context: CanvasRenderingContext2D;
+        dirty: boolean;
+        resolution: number;
+        text: string;
+        style: TextStyle;
+
+        width: number;
+        height: number;
+
+    }
+
+    //textures
+
+    export class BaseTexture extends EventEmitter {
+
+        static fromImage(imageUrl: string, crossorigin?: boolean, scaleMode?: number): BaseTexture;
+        static fromCanvas(canvas: HTMLCanvasElement, scaleMode?: number): BaseTexture;
+
+        protected _glTextures: any;
+
+        protected _sourceLoaded(): void;
+
+        constructor(source: HTMLImageElement | HTMLCanvasElement, scaleMode?: number, resolution?: number);
+
+        uuid: number;
+        resolution: number;
+        width: number;
+        height: number;
+        realWidth: number;
+        realHeight: number;
+        scaleMode: number;
+        hasLoaded: boolean;
+        isLoading: boolean;
+        source: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement;
+        premultipliedAlpha: boolean;
+        imageUrl: string;
+        isPowerOfTwo: boolean;
+        mipmap: boolean;
+
+        update(): void;
+        loadSource(source: HTMLImageElement | HTMLCanvasElement): void;
+        destroy(): void;
+        dispose(): void;
+        updateSourceImage(newSrc: string): void;
+
+        on(event: 'dispose', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
+        on(event: 'error', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
+        on(event: 'loaded', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
+        on(event: 'update', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
+        on(event: string, fn: Function, context?: any): EventEmitter;
+
+        once(event: 'dispose', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
+        once(event: 'error', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
+        once(event: 'loaded', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
+        once(event: 'update', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
+        once(event: string, fn: Function, context?: any): EventEmitter;
+
+    }
+    export class RenderTexture extends Texture {
+
+        protected renderWebGL(displayObject: DisplayObject, matrix?: Matrix, clear?: boolean, updateTransform?: boolean): void;
+        protected renderCanvas(displayObject: DisplayObject, matrix?: Matrix, clear?: boolean, updateTransform?: boolean): void;
+
+        constructor(renderer: CanvasRenderer | WebGLRenderer, width?: number, height?: number, scaleMode?: number, resolution?: number);
+
+        width: number;
+        height: number;
+        resolution: number;
+        renderer: CanvasRenderer | WebGLRenderer;
+        valid: boolean;
+
+        render(displayObject: DisplayObject, matrix?: Matrix, clear?: boolean, updateTransform?: boolean): void;
+        resize(width: number, height: number, updateBase?: boolean): void;
+        clear(): void;
+        destroy(): void;
+        getImage(): HTMLImageElement;
+        getPixels(): number[];
+        getPixel(x: number, y: number): number[];
+        getBase64(): string;
+        getCanvas(): HTMLCanvasElement;
+
+    }
+    export class Texture extends BaseTexture {
+
+        static fromImage(imageUrl: string, crossOrigin?: boolean, scaleMode?: number): Texture;
+        static fromFrame(frameId: string): Texture;
+        static fromCanvas(canvas: HTMLCanvasElement, scaleMode?: number): Texture;
+        static fromVideo(video: HTMLVideoElement | string, scaleMode?: number): Texture;
+        static fromVideoUrl(videoUrl: string, scaleMode?: number): Texture;
+        static addTextureToCache(texture: Texture, id: string): void;
+        static removeTextureFromCache(id: string): Texture;
+        static EMPTY: Texture;
+
+        protected _frame: Rectangle;
+        protected _uvs: TextureUvs;
+
+        protected onBaseTextureUpdated(baseTexture: BaseTexture): void;
+        protected onBaseTextureLoaded(baseTexture: BaseTexture): void;
+        protected _updateUvs(): void;
+
+        constructor(baseTexture: BaseTexture, frame?: Rectangle, crop?: Rectangle, trim?: Rectangle, rotate?: boolean);
+
+        noFrame: boolean;
+        baseTexture: BaseTexture;
+        trim: Rectangle;
+        valid: boolean;
+        requiresUpdate: boolean;
+        width: number;
+        height: number;
+        crop: Rectangle;
+        rotate: boolean;
+
+        frame: Rectangle;
+
+        update(): void;
+        destroy(destroyBase?: boolean): void;
+        clone(): Texture;
+
+    }
+    export class TextureUvs {
+
+        x0: number;
+        y0: number;
+        x1: number;
+        y1: number;
+        x2: number;
+        y2: number;
+        x3: number;
+        y3: number;
+
+        set(frame: Rectangle, baseFrame: Rectangle, rotate: boolean): void;
+
+    }
+    export class VideoBaseTexture extends BaseTexture {
+
+        static fromVideo(video: HTMLVideoElement, scaleMode?: number): VideoBaseTexture;
+        static fromUrl(videoSrc: string | any | string[] | any[]): VideoBaseTexture;
+
+        protected _loaded: boolean;
+        protected _onUpdate(): void;
+        protected _onPlayStart(): void;
+        protected _onPlayStop(): void;
+        protected _onCanPlay(): void;
+
+        constructor(source: HTMLVideoElement, scaleMode?: number);
+
+        autoUpdate: boolean;
+
+        destroy(): void;
+
+    }
+
+    //utils
+
+    export class utils {
+
+        static uuid(): number;
+        static hex2rgb(hex: number, out?: number[]): number[];
+        static hex2String(hex: number): string;
+        static rgb2hex(rgb: Number[]): number;
+        static canUseNewCanvasBlendModel(): boolean;
+        static getNextPowerOfTwo(number: number): number;
+        static isPowerOfTwo(width: number, height: number): boolean;
+        static getResolutionOfUrl(url: string): number;
+        static sayHello(type: string): void;
+        static isWebGLSupported(): boolean;
+        static sign(n: number): number;
+        static TextureCache: any;
+        static BaseTextureCache: any;
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////EXTRAS////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    export module extras {
+
+        export interface BitmapTextStyle {
+
+            font?: string | {
+
+                name?: string;
+                size?: number;
+
+            };
+            align?: string;
+            tint?: number;
+
+        }
+        export class BitmapText extends Container {
+
+            static fonts: any;
+
+            protected _glyphs: Sprite[];
+            protected _font: string | {
+                tint: number;
+                align: string;
+                name: string;
+                size: number;
+            };
+            protected _text: string;
+
+            protected updateText(): void;
+
+            constructor(text: string, style?: BitmapTextStyle);
+
+            textWidth: number;
+            textHeight: number;
+            maxWidth: number;
+            maxLineHeight: number;
+            dirty: boolean;
+
+            tint: number;
+            align: string;
+            font: string | {
+                tint: number;
+                align: string;
+                name: string;
+                size: number;
+            };
+            text: string;
+
+        }
+        export class MovieClip extends Sprite {
+
+            static fromFrames(frame: string[]): MovieClip;
+            static fromImages(images: string[]): MovieClip;
+
+            protected _textures: Texture[];
+            protected _durations: number[];
+            protected _currentTime: number;
+
+            protected update(deltaTime: number): void;
+
+            constructor(textures: Texture[]);
+
+            animationSpeed: number;
+            loop: boolean;
+            onComplete: () => void;
+            currentFrame: number;
+            playing: boolean;
+
+            totalFrames: number;
+            textures: Texture[];
+
+            stop(): void;
+            play(): void;
+            gotoAndStop(frameName: number): void;
+            gotoAndPlay(frameName: number): void;
+            destroy(): void;
+
+        }
+        export class TilingSprite extends Sprite {
+
+            //This is really unclean but is the only way :(
+            //See http://stackoverflow.com/questions/29593905/typescript-declaration-extending-class-with-static-method/29595798#29595798
+            //Thanks bas!
+            static fromFrame(frameId: string): Sprite;
+            static fromImage(imageId: string, crossorigin?: boolean, scaleMode?: number): Sprite;
+
+            static fromFrame(frameId: string, width?: number, height?: number): TilingSprite;
+            static fromImage(imageId: string, width?: number, height?: number, crossorigin?: boolean, scaleMode?: number): TilingSprite;
+
+            protected _tileScaleOffset: Point;
+            protected _tilingTexture: boolean;
+            protected _refreshTexture: boolean;
+            protected _uvs: TextureUvs[];
+
+            constructor(texture: Texture, width: number, height: number);
+
+            tileScale: Point;
+            tilePosition: Point;
+
+            width: number;
+            height: number;
+            originalTexture: Texture;
+
+            getBounds(): Rectangle;
+            generateTilingTexture(renderer: WebGLRenderer | CanvasRenderer, texture: Texture, forcePowerOfTwo?: boolean): Texture;
+            containsPoint(point: Point): boolean;
+            destroy(): void;
+
+        }
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////FILTERS////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    namespace filters {
+
+        export class AsciiFilter extends AbstractFilter {
+            size: number;
+        }
+        export class BloomFilter extends AbstractFilter {
+
+            blur: number;
+            blurX: number;
+            blurY: number;
+
+        }
+        export class BlurFilter extends AbstractFilter {
+
+            protected blurXFilter: BlurXFilter;
+            protected blurYFilter: BlurYFilter;
+
+            blur: number;
+            passes: number;
+            blurX: number;
+            blurY: number;
+
+        }
+        export class BlurXFilter extends AbstractFilter {
+
+            passes: number;
+            strength: number;
+            blur: number;
+
+        }
+        export class BlurYFilter extends AbstractFilter {
+
+            passes: number;
+            strength: number;
+            blur: number;
+
+        }
+        export class SmartBlurFilter extends AbstractFilter {
+
+        }
+        export class ColorMatrixFilter extends AbstractFilter {
+
+            protected _loadMatrix(matrix: number[], multiply: boolean): void;
+            protected _multiply(out: number[], a: number[], b: number[]): void;
+            protected _colorMatrix(matrix: number[]): void;
+
+            matrix: number[];
+
+            brightness(b: number, multiply?: boolean): void;
+            greyscale(scale: number, multiply?: boolean): void;
+            blackAndWhite(multiply?: boolean): void;
+            hue(rotation: number, multiply?: boolean): void;
+            contrast(amount: number, multiply?: boolean): void;
+            saturate(amount: number, multiply?: boolean): void;
+            desaturate(multiply?: boolean): void;
+            negative(multiply?: boolean): void;
+            sepia(multiply?: boolean): void;
+            technicolor(multiply?: boolean): void;
+            polaroid(multiply?: boolean): void;
+            toBGR(multiply?: boolean): void;
+            kodachrome(multiply?: boolean): void;
+            browni(multiply?: boolean): void;
+            vintage(multiply?: boolean): void;
+            colorTone(desaturation: number, toned: number, lightColor: string, darkColor: string, multiply?: boolean): void;
+            night(intensity: number, multiply?: boolean): void;
+            predator(amount: number, multiply?: boolean): void;
+            lsd(multiply?: boolean): void;
+            reset(): void;
+
+        }
+        export class ColorStepFilter extends AbstractFilter {
+
+            step: number;
+
+        }
+        export class ConvolutionFilter extends AbstractFilter {
+
+            constructor(matrix: number[], width: number, height: number);
+
+            matrix: number[];
+            width: number;
+            height: number;
+
+        }
+        export class CrossHatchFilter extends AbstractFilter {
+
+        }
+        export class DisplacementFilter extends AbstractFilter {
+
+            constructor(sprite: Sprite, scale?: number);
+
+            map: Texture;
+
+            scale: Point;
+
+        }
+        export class DotScreenFilter extends AbstractFilter {
+
+            scale: number;
+            angle: number;
+
+        }
+        export class BlurYTintFilter extends AbstractFilter {
+
+            blur: number;
+
+        }
+        export class DropShadowFilter extends AbstractFilter {
+
+            blur: number;
+            blurX: number;
+            blurY: number;
+            color: number;
+            alpha: number;
+            distance: number;
+            angle: number;
+
+        }
+        export class GrayFilter extends AbstractFilter {
+
+            gray: number;
+
+        }
+        export class InvertFilter extends AbstractFilter {
+
+            invert: number;
+
+        }
+        export class NoiseFilter extends AbstractFilter {
+
+            noise: number;
+
+        }
+        export class PixelateFilter extends AbstractFilter {
+
+            size: Point;
+
+        }
+        export class RGBSplitFilter extends AbstractFilter {
+
+            red: number;
+            green: number;
+            blue: number;
+
+        }
+        export class SepiaFilter extends AbstractFilter {
+
+            sepia: number;
+
+        }
+        export class ShockwaveFilter extends AbstractFilter {
+
+            center: number[];
+            params: any;
+            time: number;
+
+        }
+        export class TiltShiftAxisFilter extends AbstractFilter {
+
+            blur: number;
+            gradientBlur: number;
+            start: number;
+            end: number;
+
+            updateDelta(): void;
+
+        }
+        export class TiltShiftFilter extends AbstractFilter {
+
+            blur: number;
+            gradientBlur: number;
+            start: number;
+            end: number;
+
+        }
+        export class TiltShiftXFilter extends AbstractFilter {
+
+            updateDelta(): void;
+
+        }
+        export class TiltShiftYFilter extends AbstractFilter {
+
+            updateDelta(): void;
+
+        }
+        export class TwistFilter extends AbstractFilter {
+
+            offset: Point;
+            radius: number;
+            angle: number;
+
+        }
+        export class FXAAFilter extends AbstractFilter {
+
+            applyFilter(renderer: WebGLRenderer, input: RenderTarget, output: RenderTarget): void;
+
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////INTERACTION///////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    export module interaction {
+
+        export interface InteractionEvent {
+
+            stopped: boolean;
+            target: any;
+            type: string;
+            data: InteractionData;
+            stopPropagation(): void;
+
+        }
+
+        export class InteractionData {
+
+            global: Point;
+            target: DisplayObject;
+            originalEvent: Event;
+
+            getLocalPosition(displayObject: DisplayObject, point?: Point, globalPos?: Point): Point;
+
+        }
+
+        export class InteractionManager {
+
+            protected interactionDOMElement: HTMLElement;
+            protected eventsAdded: boolean;
+            protected _tempPoint: Point;
+
+            protected setTargetElement(element: HTMLElement, resolution: number): void;
+            protected addEvents(): void;
+            protected removeEvents(): void;
+            protected dispatchEvent(displayObject: DisplayObject, eventString: string, eventData: any): void;
+            protected onMouseDown: (event: Event) => void;
+            protected processMouseDown: (displayObject: DisplayObject, hit: boolean) => void;
+            protected onMouseUp: (event: Event) => void;
+            protected processMouseUp: (displayObject: DisplayObject, hit: boolean) => void;
+            protected onMouseMove: (event: Event) => void;
+            protected processMouseMove: (displayObject: DisplayObject, hit: boolean) => void;
+            protected onMouseOut: (event: Event) => void;
+            protected processMouseOverOut: (displayObject: DisplayObject, hit: boolean) => void;
+            protected onTouchStart: (event: Event) => void;
+            protected processTouchStart: (DisplayObject: DisplayObject, hit: boolean) => void;
+            protected onTouchEnd: (event: Event) => void;
+            protected processTouchEnd: (displayObject: DisplayObject, hit: boolean) => void;
+            protected onTouchMove: (event: Event) => void;
+            protected processTouchMove: (displayObject: DisplayObject, hit: boolean) => void;
+            protected getTouchData(touchEvent: InteractionData): InteractionData;
+            protected returnTouchData(touchData: InteractionData): void;
+
+            constructor(renderer: CanvasRenderer | WebGLRenderer, options?: { autoPreventDefault?: boolean; interactionFrequence?: number; });
+
+            renderer: CanvasRenderer | WebGLRenderer;
+            autoPreventDefault: boolean;
+            interactionFrequency: number;
+            mouse: InteractionData;
+            eventData: {
+                stopped: boolean;
+                target: any;
+                type: any;
+                data: InteractionData;
+            };
+            interactiveDataPool: InteractionData[];
+            last: number;
+            currentCursorStyle: string;
+            resolution: number;
+            update(deltaTime: number): void;
+
+            mapPositionToPoint(point: Point, x: number, y: number): void;
+            processInteractive(point: Point, displayObject: DisplayObject, func: (displayObject: DisplayObject, hit: boolean) => void, hitTest: boolean, interactive: boolean): boolean;
+            destroy(): void;
+
+        }
+
+        export interface InteractiveTarget {
+
+            interactive: boolean;
+            buttonMode: boolean;
+            interactiveChildren: boolean;
+            defaultCursor: string;
+            hitArea: HitArea;
+
+        }
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////LOADER/////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+    //https://github.com/englercj/resource-loader/blob/master/src/Loader.js
+
+    export module loaders {
+        export interface LoaderOptions {
+
+            crossOrigin?: boolean;
+            loadType?: number;
+            xhrType?: string;
+
+        }
+        export interface ResourceDictionary {
+
+            [index: string]: PIXI.loaders.Resource;
+        }
+        export class Loader extends EventEmitter {
+
+            constructor(baseUrl?: string, concurrency?: number);
+
+            baseUrl: string;
+            progress: number;
+            loading: boolean;
+            resources: ResourceDictionary;
+
+            add(name: string, url: string, options?: LoaderOptions, cb?: () => void): Loader;
+            add(url: string, options?: LoaderOptions, cb?: () => void): Loader;
+            //todo I am not sure of object literal notional (or its options) so just allowing any but would love to improve this
+            add(obj: any, options?: LoaderOptions, cb?: () => void): Loader;
+
+            on(event: 'complete', fn: (loader: loaders.Loader, object: any) => void, context?: any): EventEmitter;
+            on(event: 'error', fn: (error: Error, loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
+            on(event: 'load', fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
+            on(event: 'progress', fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
+            on(event: 'start', fn: (loader: loaders.Loader) => void, context?: any): EventEmitter;
+            on(event: string, fn: Function, context?: any): EventEmitter;
+
+            once(event: 'complete', fn: (loader: loaders.Loader, object: any) => void, context?: any): EventEmitter;
+            once(event: 'error', fn: (error: Error, loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
+            once(event: 'load', fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
+            once(event: 'progress', fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
+            once(event: 'start', fn: (loader: loaders.Loader) => void, context?: any): EventEmitter;
+            once(event: string, fn: Function, context?: any): EventEmitter;
+
+            before(fn: Function): Loader;
+            pre(fn: Function): Loader;
+
+            after(fn: Function): Loader;
+            use(fn: Function): Loader;
+
+            reset(): void;
+
+            load(cb?: (loader: loaders.Loader, object: any) => void): Loader;
+
+        }
+        export class Resource extends EventEmitter {
+
+            static LOAD_TYPE: {
+                XHR: number;
+                IMAGE: number;
+                AUDIO: number;
+                VIDEO: number;
+            };
+
+            static XHR_READ_STATE: {
+                UNSENT: number;
+                OPENED: number;
+                HEADERS_RECIEVED: number;
+                LOADING: number;
+                DONE: number;
+            };
+
+            static XHR_RESPONSE_TYPE: {
+                DEFAULT: number;
+                BUFFER: number;
+                BLOB: number;
+                DOCUMENT: number;
+                JSON: number;
+                TEXT: number;
+            };
+
+            constructor(name?: string, url?: string | string[], options?: LoaderOptions);
+
+            name: string;
+            texture: Texture;
+			textures: Texture[];
+            url: string;
+            data: any;
+            crossOrigin: string;
+            loadType: number;
+            xhrType: string;
+            error: Error;
+            xhr: XMLHttpRequest;
+
+            complete(): void;
+            load(cb?: () => void): void;
+
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////MESH///////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    export module mesh {
+
+        export class Mesh extends Container {
+
+            static DRAW_MODES: {
+                TRIANGLE_MESH: number;
+                TRIANGLES: number;
+            };
+
+            constructor(texture: Texture, vertices?: number[], uvs?: number[], indices?: number[], drawMode?: number);
+
+            texture: Texture;
+            uvs: number[];
+            vertices: number[];
+            indices: number[];
+            dirty: boolean;
+            blendMode: number;
+            canvasPadding: number;
+            drawMode: number;
+            shader: Shader | AbstractFilter;
+
+            getBounds(matrix?: Matrix): Rectangle;
+            containsPoint(point: Point): boolean;
+
+            protected _texture: Texture;
+
+            protected _renderCanvasTriangleMesh(context: CanvasRenderingContext2D): void;
+            protected _renderCanvasTriangles(context: CanvasRenderingContext2D): void;
+            protected _renderCanvasDrawTriangle(context: CanvasRenderingContext2D, vertices: number, uvs: number, index0: number, index1: number, index2: number): void;
+            protected renderMeshFlat(Mesh: Mesh): void;
+            protected _onTextureUpdate(): void;
+
+        }
+        export class Rope extends Mesh {
+
+            protected _ready: boolean;
+
+            protected getTextureUvs(): TextureUvs;
+
+            constructor(texture: Texture, points: Point[]);
+
+            points: Point[];
+            colors: number[];
+
+            refresh(): void;
+
+        }
+        export class Plane extends Mesh {
+
+            segmentsX: number;
+            segmentsY: number;
+
+            constructor(texture: Texture, segmentsX?: number, segmentsY?: number);
+
+        }
+
+
+        export class MeshRenderer extends ObjectRenderer {
+
+            protected _initWebGL(mesh: Mesh): void;
+
+            indices: number[];
+
+            constructor(renderer: WebGLRenderer);
+
+            render(mesh: Mesh): void;
+            flush(): void;
+            start(): void;
+            destroy(): void;
+
+        }
+
+        export interface MeshShader extends Shader { }
+
+    }
+
+    namespace ticker {
+
+        export var shared: Ticker;
+
+        export class Ticker {
+
+            protected _tick(time: number): void;
+            protected _emitter: EventEmitter;
+            protected _requestId: number;
+            protected _maxElapsedMS: number;
+
+            protected _requestIfNeeded(): void;
+            protected _cancelIfNeeded(): void;
+            protected _startIfPossible(): void;
+
+            autoStart: boolean;
+            deltaTime: number;
+            elapsedMS: number;
+            lastTime: number;
+            speed: number;
+            started: boolean;
+
+            FPS: number;
+            minFPS: number;
+
+            add(fn: (deltaTime: number) => void, context?: any): Ticker;
+            addOnce(fn: (deltaTime: number) => void, context?: any): Ticker;
+            remove(fn: (deltaTime: number) => void, context?: any): Ticker;
+            start(): void;
+            stop(): void;
+            update(): void;
+
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/pixi.js/pixi.js-tests.ts b/pixi.js/pixi.js-tests.ts
index ac50d9d955..c40bdc1bd2 100644
--- a/pixi.js/pixi.js-tests.ts
+++ b/pixi.js/pixi.js-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="pixi.js.d.ts" />
+import PIXI = require("pixi.js");
 namespace basics {
 
     export class Basics {
diff --git a/pixi.js/pixi.js.d.ts b/pixi.js/pixi.js.d.ts
deleted file mode 100644
index 179bf381ce..0000000000
--- a/pixi.js/pixi.js.d.ts
+++ /dev/null
@@ -1,1746 +0,0 @@
-// Type definitions for Pixi.js 3.0.9 dev
-// Project: https://github.com/GoodBoyDigital/pixi.js/
-// Definitions by: clark-stevenson <https://github.com/pixijs/pixi-typescript>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare class PIXI {
-
-    static VERSION: string;
-    static PI_2: number;
-    static RAD_TO_DEG: number;
-    static DEG_TO_RAD: number;
-    static TARGET_FPMS: number;
-    static RENDERER_TYPE: {
-        UNKNOWN: number;
-        WEBGL: number;
-        CANVAS: number;
-    };
-    static BLEND_MODES: {
-        NORMAL: number;
-        ADD: number;
-        MULTIPLY: number;
-        SCREEN: number;
-        OVERLAY: number;
-        DARKEN: number;
-        LIGHTEN: number;
-        COLOR_DODGE: number;
-        COLOR_BURN: number;
-        HARD_LIGHT: number;
-        SOFT_LIGHT: number;
-        DIFFERENCE: number;
-        EXCLUSION: number;
-        HUE: number;
-        SATURATION: number;
-        COLOR: number;
-        LUMINOSITY: number;
-
-    };
-    static DRAW_MODES: {
-        POINTS: number;
-        LINES: number;
-        LINE_LOOP: number;
-        LINE_STRIP: number;
-        TRIANGLES: number;
-        TRIANGLE_STRIP: number;
-        TRIANGLE_FAN: number;
-    };
-    static SCALE_MODES: {
-        DEFAULT: number;
-        LINEAR: number;
-        NEAREST: number;
-    };
-    static RETINA_PREFIX: string;
-    static RESOLUTION: number;
-    static FILTER_RESOLUTION: number;
-    static DEFAULT_RENDER_OPTIONS: {
-        view: HTMLCanvasElement;
-        resolution: number;
-        antialias: boolean;
-        forceFXAA: boolean;
-        autoResize: boolean;
-        transparent: boolean;
-        backgroundColor: number;
-        clearBeforeRender: boolean;
-        preserveDrawingBuffer: boolean;
-        roundPixels: boolean;
-    };
-    static SHAPES: {
-        POLY: number;
-        RECT: number;
-        CIRC: number;
-        ELIP: number;
-        RREC: number;
-    };
-    static SPRITE_BATCH_SIZE: number;
-
-}
-
-declare namespace PIXI {
-
-    export function autoDetectRenderer(width: number, height: number, options?: PIXI.RendererOptions, noWebGL?: boolean): PIXI.WebGLRenderer | PIXI.CanvasRenderer;
-    export var loader: PIXI.loaders.Loader;
-
-    //https://github.com/primus/eventemitter3
-    export class EventEmitter {
-
-        listeners(event: string): Function[];
-        emit(event: string, ...args: any[]): boolean;
-        on(event: string, fn: Function, context?: any): EventEmitter;
-        once(event: string, fn: Function, context?: any): EventEmitter;
-        removeListener(event: string, fn: Function, context?: any, once?: boolean): EventEmitter;
-        removeAllListeners(event: string): EventEmitter;
-
-        off(event: string, fn: Function, context?: any, once?: boolean): EventEmitter;
-        addListener(event: string, fn: Function, context?: any): EventEmitter;
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////
-    ////////////////////////////////CORE//////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////////
-
-    //display
-
-    export class DisplayObject extends EventEmitter implements interaction.InteractiveTarget {
-
-        //begin extras.cacheAsBitmap see https://github.com/pixijs/pixi-typescript/commit/1207b7f4752d79a088d6a9a465a3ec799906b1db
-        protected _originalRenderWebGL: WebGLRenderer;
-        protected _originalRenderCanvas: CanvasRenderer;
-        protected _originalUpdateTransform: boolean;
-        protected _originalHitTest: any;
-        protected _cachedSprite: any;
-        protected _originalDestroy: any;
-
-        cacheAsBitmap: boolean;
-
-        protected _renderCachedWebGL(renderer: WebGLRenderer): void;
-        protected _initCachedDisplayObject(renderer: WebGLRenderer): void;
-        protected _renderCachedCanvas(renderer: CanvasRenderer): void;
-        protected _initCachedDisplayObjectCanvas(renderer: CanvasRenderer): void;
-        protected _getCachedBounds(): Rectangle;
-        protected _destroyCachedDisplayObject(): void;
-        protected _cacheAsBitmapDestroy(): void;
-        //end extras.cacheAsBitmap
-
-        protected _sr: number;
-        protected _cr: number;
-        protected _bounds: Rectangle;
-        protected _currentBounds: Rectangle;
-        protected _mask: Rectangle;
-        protected _cachedObject: any;
-
-        updateTransform(): void;
-
-        position: Point;
-        scale: Point;
-        pivot: Point;
-        rotation: number;
-        renderable: boolean;
-        alpha: number;
-        visible: boolean;
-        parent: Container;
-        worldAlpha: number;
-        worldTransform: Matrix;
-        filterArea: Rectangle;
-
-        x: number;
-        y: number;
-        worldVisible: boolean;
-        mask: Graphics | Sprite;
-        filters: AbstractFilter[];
-        name: string;
-
-        getBounds(matrix?: Matrix): Rectangle;
-        getLocalBounds(): Rectangle;
-        toGlobal(position: Point): Point;
-        toLocal(position: Point, from?: DisplayObject): Point;
-        generateTexture(renderer: CanvasRenderer | WebGLRenderer, scaleMode: number, resolution: number): Texture;
-        setParent(container: Container): Container;
-        setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, pivotX?: number, pivotY?: number): DisplayObject;
-        destroy(): void;
-        getChildByName(name: string): DisplayObject;
-        getGlobalPosition(point: Point): Point;
-
-        interactive: boolean;
-        buttonMode: boolean;
-        interactiveChildren: boolean;
-        defaultCursor: string;
-        hitArea: HitArea;
-
-        on(event: 'click', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'mousedown', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'mouseout', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'mouseover', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'mouseup', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'mouseclick', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'mouseupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'rightclick', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'rightdown', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'rightup', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'rightupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'tap', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'touchend', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'touchendoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'touchmove', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'touchstart', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: string, fn: Function, context?: any): EventEmitter;
-
-        once(event: 'click', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'mousedown', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'mouseout', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'mouseover', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'mouseup', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'mouseclick', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'mouseupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'rightclick', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'rightdown', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'rightup', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'rightupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'tap', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'touchend', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'touchendoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'touchmove', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'touchstart', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: string, fn: Function, context?: any): EventEmitter;
-
-    }
-
-    export class Container extends DisplayObject {
-
-        protected _renderWebGL(renderer: WebGLRenderer): void;
-        protected _renderCanvas(renderer: CanvasRenderer): void;
-
-        protected onChildrenChange: () => void;
-
-        children: DisplayObject[];
-
-        width: number;
-        height: number;
-
-        addChild(...child: DisplayObject[]): DisplayObject;
-        addChildAt(child: DisplayObject, index: number): DisplayObject;
-        swapChildren(child: DisplayObject, child2: DisplayObject): void;
-        getChildIndex(child: DisplayObject): number;
-        setChildIndex(child: DisplayObject, index: number): void;
-        getChildAt(index: number): DisplayObject;
-        removeChild(child: DisplayObject): DisplayObject;
-        removeChildAt(index: number): DisplayObject;
-        removeChildren(beginIndex?: number, endIndex?: number): DisplayObject[];
-        destroy(destroyChildren?: boolean): void;
-        generateTexture(renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer, resolution?: number, scaleMode?: number): Texture;
-
-        renderWebGL(renderer: WebGLRenderer): void;
-        renderCanvas(renderer: CanvasRenderer): void;
-
-        once(event: 'added', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: string, fn: Function, context?: any): EventEmitter;
-        once(event: 'removed', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: string, fn: Function, context?: any): EventEmitter;
-        on(event: 'added', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: string, fn: Function, context?: any): EventEmitter;
-        on(event: 'removed', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: string, fn: Function, context?: any): EventEmitter;
-
-    }
-
-    //graphics
-
-    export class GraphicsData {
-
-        constructor(lineWidth: number, lineColor: number, lineAlpha: number, fillColor: number, fillAlpha: number, fill: boolean, shape: Circle | Rectangle | Ellipse | Polygon);
-
-        lineWidth: number;
-        lineColor: number;
-        lineAlpha: number;
-        fillColor: number;
-        fillAlpha: number;
-        fill: boolean;
-        shape: Circle | Rectangle | Ellipse | Polygon;
-        type: number;
-
-        clone(): GraphicsData;
-
-        protected _lineTint: number;
-        protected _fillTint: number;
-
-    }
-    export class Graphics extends Container {
-
-        protected boundsDirty: boolean;
-        protected dirty: boolean;
-        protected glDirty: boolean;
-
-        fillAlpha: number;
-        lineWidth: number;
-        lineColor: number;
-        tint: number;
-        blendMode: number;
-        isMask: boolean;
-        boundsPadding: number;
-
-        clone(): Graphics;
-        lineStyle(lineWidth?: number, color?: number, alpha?: number): Graphics;
-        moveTo(x: number, y: number): Graphics;
-        lineTo(x: number, y: number): Graphics;
-        quadraticCurveTo(cpX: number, cpY: number, toX: number, toY: number): Graphics;
-        bezierCurveTo(cpX: number, cpY: number, cpX2: number, cpY2: number, toX: number, toY: number): Graphics;
-        arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): Graphics;
-        arc(cx: number, cy: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): Graphics;
-        beginFill(color: number, alpha?: number): Graphics;
-        endFill(): Graphics;
-        drawRect(x: number, y: number, width: number, height: number): Graphics;
-        drawRoundedRect(x: number, y: number, width: number, height: number, radius: number): Graphics;
-        drawCircle(x: number, y: number, radius: number): Graphics;
-        drawEllipse(x: number, y: number, width: number, height: number): Graphics;
-        drawPolygon(path: number[] | Point[]): Graphics;
-        clear(): Graphics;
-        //todo
-        generateTexture(renderer: WebGLRenderer | CanvasRenderer, resolution?: number, scaleMode?: number): Texture;
-        getBounds(matrix?: Matrix): Rectangle;
-        containsPoint(point: Point): boolean;
-        updateLocalBounds(): void;
-        drawShape(shape: Circle | Rectangle | Ellipse | Polygon): GraphicsData;
-
-    }
-    export interface GraphicsRenderer extends ObjectRenderer {
-        //yikes todo
-    }
-    export interface WebGLGraphicsData {
-        //yikes todo!
-    }
-
-    //math
-
-    export class Point {
-
-        x: number;
-        y: number;
-
-        constructor(x?: number, y?: number);
-
-        clone(): Point;
-        copy(p: Point): void;
-        equals(p: Point): boolean;
-        set(x?: number, y?: number): void;
-
-    }
-    export class Matrix {
-
-        a: number;
-        b: number;
-        c: number;
-        d: number;
-        tx: number;
-        ty: number;
-
-        fromArray(array: number[]): void;
-        toArray(transpose?: boolean, out?: number[]): number[];
-        apply(pos: Point, newPos?: Point): Point;
-        applyInverse(pos: Point, newPos?: Point): Point;
-        translate(x: number, y: number): Matrix;
-        scale(x: number, y: number): Matrix;
-        rotate(angle: number): Matrix;
-        append(matrix: Matrix): Matrix;
-        prepend(matrix: Matrix): Matrix;
-        invert(): Matrix;
-        identity(): Matrix;
-        clone(): Matrix;
-        copy(matrix: Matrix): Matrix;
-        set(a: number, b: number, c: number, d: number, tx: number, ty: number): Matrix;
-        setTransform(a: number, b: number, c: number, d: number, sr: number, cr: number, cy: number, sy: number, nsx: number, cs: number): PIXI.Matrix;
-
-        static IDENTITY: Matrix;
-        static TEMP_MATRIX: Matrix;
-
-    }
-
-    export interface HitArea {
-
-        contains(x: number, y: number): boolean;
-
-    }
-
-    export class Circle implements HitArea {
-
-        constructor(x?: number, y?: number, radius?: number);
-
-        x: number;
-        y: number;
-        radius: number;
-        type: number;
-
-        clone(): Circle;
-        contains(x: number, y: number): boolean;
-        getBounds(): Rectangle;
-
-    }
-    export class Ellipse implements HitArea {
-
-        constructor(x?: number, y?: number, width?: number, height?: number);
-
-        x: number;
-        y: number;
-        width: number;
-        height: number;
-        type: number;
-
-        clone(): Ellipse;
-        contains(x: number, y: number): boolean;
-        getBounds(): Rectangle;
-
-    }
-    export class Polygon implements HitArea {
-
-        constructor(points: Point[]);
-        constructor(points: number[]);
-        constructor(...points: Point[]);
-        constructor(...points: number[]);
-
-        closed: boolean;
-        points: number[];
-        type: number;
-
-        clone(): Polygon;
-        contains(x: number, y: number): boolean;
-
-
-    }
-    export class Rectangle implements HitArea {
-
-        constructor(x?: number, y?: number, width?: number, height?: number);
-
-        x: number;
-        y: number;
-        width: number;
-        height: number;
-        type: number;
-
-        static EMPTY: Rectangle;
-
-        clone(): Rectangle;
-        contains(x: number, y: number): boolean;
-
-    }
-    export class RoundedRectangle implements HitArea {
-
-        constructor(x?: number, y?: number, width?: number, height?: number, radius?: number);
-
-        x: number;
-        y: number;
-        width: number;
-        height: number;
-        radius: number;
-        type: number;
-
-        static EMPTY: Rectangle;
-
-        clone(): Rectangle;
-        contains(x: number, y: number): boolean;
-
-    }
-
-    //particles
-
-    export interface ParticleContainerProperties {
-
-        scale?: boolean;
-        position?: boolean;
-        rotation?: boolean;
-        uvs?: boolean;
-        alpha?: boolean;
-
-    }
-    export class ParticleContainer extends Container {
-
-        constructor(size?: number, properties?: ParticleContainerProperties, batchSize?: number);
-
-        protected _maxSize: number;
-        protected _batchSize: number;
-        protected _properties: boolean[];
-        protected _buffers: WebGLBuffer[];
-        protected _bufferToUpdate: number;
-
-        protected onChildrenChange: (smallestChildIndex?: number) => void;
-
-        interactiveChildren: boolean;
-        blendMode: number;
-        roundPixels: boolean;
-
-        setProperties(properties: ParticleContainerProperties): void;
-
-    }
-    export interface ParticleBuffer {
-
-        gl: WebGLRenderingContext;
-        vertSize: number;
-        vertByteSize: number;
-        size: number;
-        dynamicProperties: any[];
-        staticProperties: any[];
-
-        staticStride: number;
-        staticBuffer: any;
-        staticData: any;
-        dynamicStride: number;
-        dynamicBuffer: any;
-        dynamicData: any;
-
-        initBuffers(): void;
-        bind(): void;
-        destroy(): void;
-
-    }
-    export interface ParticleRenderer {
-
-    }
-    export interface ParticleShader {
-
-    }
-
-    //renderers
-
-    export interface RendererOptions {
-
-        view?: HTMLCanvasElement;
-        transparent?: boolean;
-        antialias?: boolean;
-        resolution?: number;
-        clearBeforeRendering?: boolean;
-        preserveDrawingBuffer?: boolean;
-        forceFXAA?: boolean;
-        roundPixels?: boolean;
-        backgroundColor?: number;
-
-    }
-    export class SystemRenderer extends EventEmitter {
-
-        protected _backgroundColor: number;
-        protected _backgroundColorRgb: number[];
-        protected _backgroundColorString: string;
-        protected _tempDisplayObjectParent: any;
-        protected _lastObjectRendered: DisplayObject;
-
-        constructor(system: string, width?: number, height?: number, options?: RendererOptions);
-
-        type: number;
-        width: number;
-        height: number;
-        view: HTMLCanvasElement;
-        resolution: number;
-        transparent: boolean;
-        autoResize: boolean;
-        blendModes: any; //todo?
-        preserveDrawingBuffer: boolean;
-        clearBeforeRender: boolean;
-        roundPixels: boolean;
-        backgroundColor: number;
-
-        render(object: DisplayObject): void;
-        resize(width: number, height: number): void;
-        destroy(removeView?: boolean): void;
-
-    }
-    export class CanvasRenderer extends SystemRenderer {
-
-        protected renderDisplayObject(displayObject: DisplayObject, context: CanvasRenderingContext2D): void;
-        protected _mapBlendModes(): void;
-
-        constructor(width?: number, height?: number, options?: RendererOptions);
-
-        context: CanvasRenderingContext2D;
-        refresh: boolean;
-        maskManager: CanvasMaskManager;
-        roundPixels: boolean;
-        smoothProperty: string;
-
-        render(object: DisplayObject): void;
-        resize(w: number, h: number): void;
-
-    }
-    export class CanvasBuffer {
-
-        protected clear(): void;
-
-        constructor(width: number, height: number);
-
-        canvas: HTMLCanvasElement;
-        context: CanvasRenderingContext2D;
-
-        width: number;
-        height: number;
-
-        resize(width: number, height: number): void;
-        destroy(): void;
-
-    }
-    export class CanvasGraphics {
-
-        static renderGraphicsMask(graphics: Graphics, context: CanvasRenderingContext2D): void;
-        static updateGraphicsTint(graphics: Graphics): void;
-
-        static renderGraphics(graphics: Graphics, context: CanvasRenderingContext2D): void;
-
-    }
-    export class CanvasMaskManager {
-
-        pushMask(maskData: any, renderer: WebGLRenderer | CanvasRenderer): void;
-        popMask(renderer: WebGLRenderer | CanvasRenderer): void;
-        destroy(): void;
-
-    }
-    export class CanvasTinter {
-
-        static getTintedTexture(sprite: DisplayObject, color: number): HTMLCanvasElement;
-        static tintWithMultiply(texture: Texture, color: number, canvas: HTMLDivElement): void;
-        static tintWithOverlay(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
-        static tintWithPerPixel(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
-        static roundColor(color: number): number;
-        static cacheStepsPerColorChannel: number;
-        static convertTintToImage: boolean;
-        static vanUseMultiply: boolean;
-        static tintMethod: Function;
-
-    }
-    export class WebGLRenderer extends SystemRenderer {
-
-        protected _useFXAA: boolean;
-        protected _FXAAFilter: filters.FXAAFilter;
-        protected _contextOptions: {
-            alpha: boolean;
-            antiAlias: boolean;
-            premultipliedAlpha: boolean;
-            stencil: boolean;
-            preseveDrawingBuffer: boolean;
-        };
-        protected _renderTargetStack: RenderTarget[];
-
-        protected _initContext(): void;
-        protected _createContext(): void;
-        protected handleContextLost: (event: WebGLContextEvent) => void;
-        protected _mapGlModes(): void;
-        protected _managedTextures: Texture[];
-
-        constructor(width?: number, height?: number, options?: RendererOptions);
-
-        drawCount: number;
-        shaderManager: ShaderManager;
-        maskManager: MaskManager;
-        stencilManager: StencilManager;
-        filterManager: FilterManager;
-        blendModeManager: BlendModeManager;
-        currentRenderTarget: RenderTarget;
-        currentRenderer: ObjectRenderer;
-
-        render(object: DisplayObject): void;
-        renderDisplayObject(displayObject: DisplayObject, renderTarget: RenderTarget, clear: boolean): void;
-        setObjectRenderer(objectRenderer: ObjectRenderer): void;
-        setRenderTarget(renderTarget: RenderTarget): void;
-        updateTexture(texture: BaseTexture | Texture): BaseTexture | Texture;
-        destroyTexture(texture: BaseTexture | Texture, _skipRemove?: boolean): void;
-
-    }
-    export class AbstractFilter {
-
-        protected vertexSrc: string[];
-        protected fragmentSrc: string[];
-
-        constructor(vertexSrc?: string | string[], fragmentSrc?: string | string[], uniforms?: any);
-
-        uniforms: any;
-
-        padding: number;
-
-        getShader(renderer: WebGLRenderer): Shader;
-        applyFilter(renderer: WebGLRenderer, input: RenderTarget, output: RenderTarget, clear?: boolean): void;
-        syncUniform(uniform: WebGLUniformLocation): void;
-
-    }
-    export class SpriteMaskFilter extends AbstractFilter {
-
-        constructor(sprite: Sprite);
-
-        maskSprite: Sprite;
-        maskMatrix: Matrix;
-
-        applyFilter(renderer: WebGLRenderbuffer, input: RenderTarget, output: RenderTarget): void;
-        map: Texture;
-        offset: Point;
-
-    }
-    export class BlendModeManager extends WebGLManager {
-
-        constructor(renderer: WebGLRenderer);
-
-        setBlendMode(blendMode: number): boolean;
-
-    }
-
-    export class FilterManager extends WebGLManager {
-
-        constructor(renderer: WebGLRenderer);
-
-        filterStack: any[];
-        renderer: WebGLRenderer;
-        texturePool: any[];
-
-        onContextChange: () => void;
-        setFilterStack(filterStack: any[]): void;
-        pushFilter(target: RenderTarget, filters: any[]): void;
-        popFilter(): AbstractFilter;
-        getRenderTarget(clear?: boolean): RenderTarget;
-        protected returnRenderTarget(renderTarget: RenderTarget): void;
-        applyFilter(shader: Shader | AbstractFilter, inputTarget: RenderTarget, outputTarget: RenderTarget, clear?: boolean): void;
-        calculateMappedMatrix(filterArea: Rectangle, sprite: Sprite, outputMatrix?: Matrix): Matrix;
-        capFilterArea(filterArea: Rectangle): void;
-        resize(width: number, height: number): void;
-        destroy(): void;
-
-    }
-
-    export class MaskManager extends WebGLManager {
-
-        stencilStack: StencilMaskStack;
-        reverse: boolean;
-        count: number;
-        alphaMaskPool: any[];
-
-        pushMask(target: RenderTarget, maskData: any): void;
-        popMask(target: RenderTarget, maskData: any): void;
-        pushSpriteMask(target: RenderTarget, maskData: any): void;
-        popSpriteMask(): void;
-        pushStencilMask(target: RenderTarget, maskData: any): void;
-        popStencilMask(target: RenderTarget, maskData: any): void;
-
-    }
-    export class ShaderManager extends WebGLManager {
-
-        protected _currentId: number;
-        protected currentShader: Shader;
-
-        constructor(renderer: WebGLRenderer);
-
-        maxAttibs: number;
-        attribState: any[];
-        tempAttribState: any[];
-        stack: any[];
-
-        setAttribs(attribs: any[]): void;
-        setShader(shader: Shader): boolean;
-        destroy(): void;
-
-    }
-    export class StencilManager extends WebGLManager {
-
-        constructor(renderer: WebGLRenderer);
-
-        setMaskStack(stencilMaskStack: StencilMaskStack): void;
-        pushStencil(graphics: Graphics, webGLData: WebGLGraphicsData): void;
-        bindGraphics(graphics: Graphics, webGLData: WebGLGraphicsData): void;
-        popStencil(graphics: Graphics, webGLData: WebGLGraphicsData): void;
-        destroy(): void;
-        pushMask(maskData: any[]): void;
-        popMask(maskData: any[]): void;
-
-    }
-    export class WebGLManager {
-
-        protected onContextChange: () => void;
-
-        constructor(renderer: WebGLRenderer);
-
-        renderer: WebGLRenderer;
-
-        destroy(): void;
-
-    }
-    export class Shader {
-
-        protected attributes: any;
-        protected textureCount: number;
-        protected uniforms: any;
-
-        protected _glCompile(type: any, src: any): Shader;
-
-        constructor(shaderManager: ShaderManager, vertexSrc: string, fragmentSrc: string, uniforms: any, attributes: any);
-
-        uuid: number;
-        gl: WebGLRenderingContext;
-        shaderManager: ShaderManager;
-        program: WebGLProgram;
-        vertexSrc: string;
-        fragmentSrc: string;
-
-        init(): void;
-        cacheUniformLocations(keys: string[]): void;
-        cacheAttributeLocations(keys: string[]): void;
-        compile(): WebGLProgram;
-        syncUniform(uniform: any): void;
-        syncUniforms(): void;
-        initSampler2D(uniform: any): void;
-        destroy(): void;
-
-    }
-    export class ComplexPrimitiveShader extends Shader {
-
-        constructor(shaderManager: ShaderManager);
-
-    }
-    export class PrimitiveShader extends Shader {
-
-        constructor(shaderManager: ShaderManager);
-
-    }
-    export class TextureShader extends Shader {
-
-        constructor(shaderManager: ShaderManager, vertexSrc?: string, fragmentSrc?: string, customUniforms?: any, customAttributes?: any);
-
-    }
-    export interface StencilMaskStack {
-
-        stencilStack: any[];
-        reverse: boolean;
-        count: number;
-
-    }
-    export class ObjectRenderer extends WebGLManager {
-
-        start(): void;
-        stop(): void;
-        flush(): void;
-        render(object?: any): void;
-
-    }
-    export class RenderTarget {
-
-        constructor(gl: WebGLRenderingContext, width: number, height: number, scaleMode: number, resolution: number, root: boolean);
-
-        gl: WebGLRenderingContext;
-        frameBuffer: WebGLFramebuffer;
-        texture: Texture;
-        size: Rectangle;
-        resolution: number;
-        projectionMatrix: Matrix;
-        transform: Matrix;
-        frame: Rectangle;
-        stencilBuffer: WebGLRenderbuffer;
-        stencilMaskStack: StencilMaskStack;
-        filterStack: any[];
-        scaleMode: number;
-        root: boolean;
-
-        clear(bind?: boolean): void;
-        attachStencilBuffer(): void;
-        activate(): void;
-        calculateProjection(protectionFrame: Matrix): void;
-        resize(width: number, height: number): void;
-        destroy(): void;
-
-    }
-    export interface Quad {
-
-        gl: WebGLRenderingContext;
-        vertices: number[];
-        uvs: number[];
-        colors: number[];
-        indices: number[];
-        vertexBuffer: WebGLBuffer;
-        indexBuffer: WebGLBuffer;
-
-        map(rect: Rectangle, rect2: Rectangle): void;
-        upload(): void;
-        destroy(): void;
-
-    }
-
-    //sprites
-
-    export class Sprite extends Container {
-
-        static fromFrame(frameId: string): Sprite;
-        static fromImage(imageId: string, crossorigin?: boolean, scaleMode?: number): Sprite;
-
-        protected _texture: Texture;
-        protected _width: number;
-        protected _height: number;
-        protected cachedTint: number;
-
-        protected _onTextureUpdate(): void;
-
-        constructor(texture?: Texture);
-
-        anchor: Point;
-        tint: number;
-        blendMode: number;
-        shader: Shader | AbstractFilter;
-        texture: Texture;
-
-        width: number;
-        height: number;
-
-        getBounds(matrix?: Matrix): Rectangle;
-        getLocalBounds(): Rectangle;
-        containsPoint(point: Point): boolean;
-        destroy(destroyTexture?: boolean, destroyBaseTexture?: boolean): void;
-
-    }
-    export class SpriteRenderer extends ObjectRenderer {
-
-        protected renderBatch(texture: Texture, size: number, startIndex: number): void;
-
-        vertSize: number;
-        vertByteSize: number;
-        size: number;
-        vertices: number[];
-        positions: number[];
-        colors: number[];
-        indices: number[];
-        currentBatchSize: number;
-        sprites: Sprite[];
-        shader: Shader | AbstractFilter;
-
-        render(sprite: Sprite): void;
-        flush(): void;
-        start(): void;
-        destroy(): void;
-
-    }
-
-    //text
-
-    export interface TextStyle {
-
-        font?: string;
-        fill?: string | number;
-        align?: string;
-        stroke?: string | number;
-        strokeThickness?: number;
-        wordWrap?: boolean;
-        wordWrapWidth?: number;
-        lineHeight?: number;
-        dropShadow?: boolean;
-        dropShadowColor?: string | number;
-        dropShadowAngle?: number;
-        dropShadowDistance?: number;
-        padding?: number;
-        textBaseline?: string;
-        lineJoin?: string;
-        miterLimit?: number;
-
-    }
-    export class Text extends Sprite {
-
-        static fontPropertiesCache: any;
-        static fontPropertiesCanvas: HTMLCanvasElement;
-        static fontPropertiesContext: CanvasRenderingContext2D;
-
-        protected _text: string;
-        protected _style: TextStyle;
-
-        protected updateText(): void;
-        protected updateTexture(): void;
-        protected determineFontProperties(fontStyle: TextStyle): TextStyle;
-        protected wordWrap(text: string): boolean;
-
-        constructor(text?: string, style?: TextStyle, resolution?: number);
-
-        canvas: HTMLCanvasElement;
-        context: CanvasRenderingContext2D;
-        dirty: boolean;
-        resolution: number;
-        text: string;
-        style: TextStyle;
-
-        width: number;
-        height: number;
-
-    }
-
-    //textures
-
-    export class BaseTexture extends EventEmitter {
-
-        static fromImage(imageUrl: string, crossorigin?: boolean, scaleMode?: number): BaseTexture;
-        static fromCanvas(canvas: HTMLCanvasElement, scaleMode?: number): BaseTexture;
-
-        protected _glTextures: any;
-
-        protected _sourceLoaded(): void;
-
-        constructor(source: HTMLImageElement | HTMLCanvasElement, scaleMode?: number, resolution?: number);
-
-        uuid: number;
-        resolution: number;
-        width: number;
-        height: number;
-        realWidth: number;
-        realHeight: number;
-        scaleMode: number;
-        hasLoaded: boolean;
-        isLoading: boolean;
-        source: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement;
-        premultipliedAlpha: boolean;
-        imageUrl: string;
-        isPowerOfTwo: boolean;
-        mipmap: boolean;
-
-        update(): void;
-        loadSource(source: HTMLImageElement | HTMLCanvasElement): void;
-        destroy(): void;
-        dispose(): void;
-        updateSourceImage(newSrc: string): void;
-
-        on(event: 'dispose', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        on(event: 'error', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        on(event: 'loaded', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        on(event: 'update', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        on(event: string, fn: Function, context?: any): EventEmitter;
-
-        once(event: 'dispose', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        once(event: 'error', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        once(event: 'loaded', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        once(event: 'update', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        once(event: string, fn: Function, context?: any): EventEmitter;
-
-    }
-    export class RenderTexture extends Texture {
-
-        protected renderWebGL(displayObject: DisplayObject, matrix?: Matrix, clear?: boolean, updateTransform?: boolean): void;
-        protected renderCanvas(displayObject: DisplayObject, matrix?: Matrix, clear?: boolean, updateTransform?: boolean): void;
-
-        constructor(renderer: CanvasRenderer | WebGLRenderer, width?: number, height?: number, scaleMode?: number, resolution?: number);
-
-        width: number;
-        height: number;
-        resolution: number;
-        renderer: CanvasRenderer | WebGLRenderer;
-        valid: boolean;
-
-        render(displayObject: DisplayObject, matrix?: Matrix, clear?: boolean, updateTransform?: boolean): void;
-        resize(width: number, height: number, updateBase?: boolean): void;
-        clear(): void;
-        destroy(): void;
-        getImage(): HTMLImageElement;
-        getPixels(): number[];
-        getPixel(x: number, y: number): number[];
-        getBase64(): string;
-        getCanvas(): HTMLCanvasElement;
-
-    }
-    export class Texture extends BaseTexture {
-
-        static fromImage(imageUrl: string, crossOrigin?: boolean, scaleMode?: number): Texture;
-        static fromFrame(frameId: string): Texture;
-        static fromCanvas(canvas: HTMLCanvasElement, scaleMode?: number): Texture;
-        static fromVideo(video: HTMLVideoElement | string, scaleMode?: number): Texture;
-        static fromVideoUrl(videoUrl: string, scaleMode?: number): Texture;
-        static addTextureToCache(texture: Texture, id: string): void;
-        static removeTextureFromCache(id: string): Texture;
-        static EMPTY: Texture;
-
-        protected _frame: Rectangle;
-        protected _uvs: TextureUvs;
-
-        protected onBaseTextureUpdated(baseTexture: BaseTexture): void;
-        protected onBaseTextureLoaded(baseTexture: BaseTexture): void;
-        protected _updateUvs(): void;
-
-        constructor(baseTexture: BaseTexture, frame?: Rectangle, crop?: Rectangle, trim?: Rectangle, rotate?: boolean);
-
-        noFrame: boolean;
-        baseTexture: BaseTexture;
-        trim: Rectangle;
-        valid: boolean;
-        requiresUpdate: boolean;
-        width: number;
-        height: number;
-        crop: Rectangle;
-        rotate: boolean;
-
-        frame: Rectangle;
-
-        update(): void;
-        destroy(destroyBase?: boolean): void;
-        clone(): Texture;
-
-    }
-    export class TextureUvs {
-
-        x0: number;
-        y0: number;
-        x1: number;
-        y1: number;
-        x2: number;
-        y2: number;
-        x3: number;
-        y3: number;
-
-        set(frame: Rectangle, baseFrame: Rectangle, rotate: boolean): void;
-
-    }
-    export class VideoBaseTexture extends BaseTexture {
-
-        static fromVideo(video: HTMLVideoElement, scaleMode?: number): VideoBaseTexture;
-        static fromUrl(videoSrc: string | any | string[] | any[]): VideoBaseTexture;
-
-        protected _loaded: boolean;
-        protected _onUpdate(): void;
-        protected _onPlayStart(): void;
-        protected _onPlayStop(): void;
-        protected _onCanPlay(): void;
-
-        constructor(source: HTMLVideoElement, scaleMode?: number);
-
-        autoUpdate: boolean;
-
-        destroy(): void;
-
-    }
-
-    //utils
-
-    export class utils {
-
-        static uuid(): number;
-        static hex2rgb(hex: number, out?: number[]): number[];
-        static hex2String(hex: number): string;
-        static rgb2hex(rgb: Number[]): number;
-        static canUseNewCanvasBlendModel(): boolean;
-        static getNextPowerOfTwo(number: number): number;
-        static isPowerOfTwo(width: number, height: number): boolean;
-        static getResolutionOfUrl(url: string): number;
-        static sayHello(type: string): void;
-        static isWebGLSupported(): boolean;
-        static sign(n: number): number;
-        static TextureCache: any;
-        static BaseTextureCache: any;
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////
-    ////////////////////////////EXTRAS////////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////////
-
-    export module extras {
-
-        export interface BitmapTextStyle {
-
-            font?: string | {
-
-                name?: string;
-                size?: number;
-
-            };
-            align?: string;
-            tint?: number;
-
-        }
-        export class BitmapText extends Container {
-
-            static fonts: any;
-
-            protected _glyphs: Sprite[];
-            protected _font: string | {
-                tint: number;
-                align: string;
-                name: string;
-                size: number;
-            };
-            protected _text: string;
-
-            protected updateText(): void;
-
-            constructor(text: string, style?: BitmapTextStyle);
-
-            textWidth: number;
-            textHeight: number;
-            maxWidth: number;
-            maxLineHeight: number;
-            dirty: boolean;
-
-            tint: number;
-            align: string;
-            font: string | {
-                tint: number;
-                align: string;
-                name: string;
-                size: number;
-            };
-            text: string;
-
-        }
-        export class MovieClip extends Sprite {
-
-            static fromFrames(frame: string[]): MovieClip;
-            static fromImages(images: string[]): MovieClip;
-
-            protected _textures: Texture[];
-            protected _durations: number[];
-            protected _currentTime: number;
-
-            protected update(deltaTime: number): void;
-
-            constructor(textures: Texture[]);
-
-            animationSpeed: number;
-            loop: boolean;
-            onComplete: () => void;
-            currentFrame: number;
-            playing: boolean;
-
-            totalFrames: number;
-            textures: Texture[];
-
-            stop(): void;
-            play(): void;
-            gotoAndStop(frameName: number): void;
-            gotoAndPlay(frameName: number): void;
-            destroy(): void;
-
-        }
-        export class TilingSprite extends Sprite {
-
-            //This is really unclean but is the only way :(
-            //See http://stackoverflow.com/questions/29593905/typescript-declaration-extending-class-with-static-method/29595798#29595798
-            //Thanks bas!
-            static fromFrame(frameId: string): Sprite;
-            static fromImage(imageId: string, crossorigin?: boolean, scaleMode?: number): Sprite;
-
-            static fromFrame(frameId: string, width?: number, height?: number): TilingSprite;
-            static fromImage(imageId: string, width?: number, height?: number, crossorigin?: boolean, scaleMode?: number): TilingSprite;
-
-            protected _tileScaleOffset: Point;
-            protected _tilingTexture: boolean;
-            protected _refreshTexture: boolean;
-            protected _uvs: TextureUvs[];
-
-            constructor(texture: Texture, width: number, height: number);
-
-            tileScale: Point;
-            tilePosition: Point;
-
-            width: number;
-            height: number;
-            originalTexture: Texture;
-
-            getBounds(): Rectangle;
-            generateTilingTexture(renderer: WebGLRenderer | CanvasRenderer, texture: Texture, forcePowerOfTwo?: boolean): Texture;
-            containsPoint(point: Point): boolean;
-            destroy(): void;
-
-        }
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////FILTERS////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////////
-
-    namespace filters {
-
-        export class AsciiFilter extends AbstractFilter {
-            size: number;
-        }
-        export class BloomFilter extends AbstractFilter {
-
-            blur: number;
-            blurX: number;
-            blurY: number;
-
-        }
-        export class BlurFilter extends AbstractFilter {
-
-            protected blurXFilter: BlurXFilter;
-            protected blurYFilter: BlurYFilter;
-
-            blur: number;
-            passes: number;
-            blurX: number;
-            blurY: number;
-
-        }
-        export class BlurXFilter extends AbstractFilter {
-
-            passes: number;
-            strength: number;
-            blur: number;
-
-        }
-        export class BlurYFilter extends AbstractFilter {
-
-            passes: number;
-            strength: number;
-            blur: number;
-
-        }
-        export class SmartBlurFilter extends AbstractFilter {
-
-        }
-        export class ColorMatrixFilter extends AbstractFilter {
-
-            protected _loadMatrix(matrix: number[], multiply: boolean): void;
-            protected _multiply(out: number[], a: number[], b: number[]): void;
-            protected _colorMatrix(matrix: number[]): void;
-
-            matrix: number[];
-
-            brightness(b: number, multiply?: boolean): void;
-            greyscale(scale: number, multiply?: boolean): void;
-            blackAndWhite(multiply?: boolean): void;
-            hue(rotation: number, multiply?: boolean): void;
-            contrast(amount: number, multiply?: boolean): void;
-            saturate(amount: number, multiply?: boolean): void;
-            desaturate(multiply?: boolean): void;
-            negative(multiply?: boolean): void;
-            sepia(multiply?: boolean): void;
-            technicolor(multiply?: boolean): void;
-            polaroid(multiply?: boolean): void;
-            toBGR(multiply?: boolean): void;
-            kodachrome(multiply?: boolean): void;
-            browni(multiply?: boolean): void;
-            vintage(multiply?: boolean): void;
-            colorTone(desaturation: number, toned: number, lightColor: string, darkColor: string, multiply?: boolean): void;
-            night(intensity: number, multiply?: boolean): void;
-            predator(amount: number, multiply?: boolean): void;
-            lsd(multiply?: boolean): void;
-            reset(): void;
-
-        }
-        export class ColorStepFilter extends AbstractFilter {
-
-            step: number;
-
-        }
-        export class ConvolutionFilter extends AbstractFilter {
-
-            constructor(matrix: number[], width: number, height: number);
-
-            matrix: number[];
-            width: number;
-            height: number;
-
-        }
-        export class CrossHatchFilter extends AbstractFilter {
-
-        }
-        export class DisplacementFilter extends AbstractFilter {
-
-            constructor(sprite: Sprite, scale?: number);
-
-            map: Texture;
-
-            scale: Point;
-
-        }
-        export class DotScreenFilter extends AbstractFilter {
-
-            scale: number;
-            angle: number;
-
-        }
-        export class BlurYTintFilter extends AbstractFilter {
-
-            blur: number;
-
-        }
-        export class DropShadowFilter extends AbstractFilter {
-
-            blur: number;
-            blurX: number;
-            blurY: number;
-            color: number;
-            alpha: number;
-            distance: number;
-            angle: number;
-
-        }
-        export class GrayFilter extends AbstractFilter {
-
-            gray: number;
-
-        }
-        export class InvertFilter extends AbstractFilter {
-
-            invert: number;
-
-        }
-        export class NoiseFilter extends AbstractFilter {
-
-            noise: number;
-
-        }
-        export class PixelateFilter extends AbstractFilter {
-
-            size: Point;
-
-        }
-        export class RGBSplitFilter extends AbstractFilter {
-
-            red: number;
-            green: number;
-            blue: number;
-
-        }
-        export class SepiaFilter extends AbstractFilter {
-
-            sepia: number;
-
-        }
-        export class ShockwaveFilter extends AbstractFilter {
-
-            center: number[];
-            params: any;
-            time: number;
-
-        }
-        export class TiltShiftAxisFilter extends AbstractFilter {
-
-            blur: number;
-            gradientBlur: number;
-            start: number;
-            end: number;
-
-            updateDelta(): void;
-
-        }
-        export class TiltShiftFilter extends AbstractFilter {
-
-            blur: number;
-            gradientBlur: number;
-            start: number;
-            end: number;
-
-        }
-        export class TiltShiftXFilter extends AbstractFilter {
-
-            updateDelta(): void;
-
-        }
-        export class TiltShiftYFilter extends AbstractFilter {
-
-            updateDelta(): void;
-
-        }
-        export class TwistFilter extends AbstractFilter {
-
-            offset: Point;
-            radius: number;
-            angle: number;
-
-        }
-        export class FXAAFilter extends AbstractFilter {
-
-            applyFilter(renderer: WebGLRenderer, input: RenderTarget, output: RenderTarget): void;
-
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////////
-    ////////////////////////////INTERACTION///////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////////
-
-    export module interaction {
-
-        export interface InteractionEvent {
-
-            stopped: boolean;
-            target: any;
-            type: string;
-            data: InteractionData;
-            stopPropagation(): void;
-
-        }
-
-        export class InteractionData {
-
-            global: Point;
-            target: DisplayObject;
-            originalEvent: Event;
-
-            getLocalPosition(displayObject: DisplayObject, point?: Point, globalPos?: Point): Point;
-
-        }
-
-        export class InteractionManager {
-
-            protected interactionDOMElement: HTMLElement;
-            protected eventsAdded: boolean;
-            protected _tempPoint: Point;
-
-            protected setTargetElement(element: HTMLElement, resolution: number): void;
-            protected addEvents(): void;
-            protected removeEvents(): void;
-            protected dispatchEvent(displayObject: DisplayObject, eventString: string, eventData: any): void;
-            protected onMouseDown: (event: Event) => void;
-            protected processMouseDown: (displayObject: DisplayObject, hit: boolean) => void;
-            protected onMouseUp: (event: Event) => void;
-            protected processMouseUp: (displayObject: DisplayObject, hit: boolean) => void;
-            protected onMouseMove: (event: Event) => void;
-            protected processMouseMove: (displayObject: DisplayObject, hit: boolean) => void;
-            protected onMouseOut: (event: Event) => void;
-            protected processMouseOverOut: (displayObject: DisplayObject, hit: boolean) => void;
-            protected onTouchStart: (event: Event) => void;
-            protected processTouchStart: (DisplayObject: DisplayObject, hit: boolean) => void;
-            protected onTouchEnd: (event: Event) => void;
-            protected processTouchEnd: (displayObject: DisplayObject, hit: boolean) => void;
-            protected onTouchMove: (event: Event) => void;
-            protected processTouchMove: (displayObject: DisplayObject, hit: boolean) => void;
-            protected getTouchData(touchEvent: InteractionData): InteractionData;
-            protected returnTouchData(touchData: InteractionData): void;
-
-            constructor(renderer: CanvasRenderer | WebGLRenderer, options?: { autoPreventDefault?: boolean; interactionFrequence?: number; });
-
-            renderer: CanvasRenderer | WebGLRenderer;
-            autoPreventDefault: boolean;
-            interactionFrequency: number;
-            mouse: InteractionData;
-            eventData: {
-                stopped: boolean;
-                target: any;
-                type: any;
-                data: InteractionData;
-            };
-            interactiveDataPool: InteractionData[];
-            last: number;
-            currentCursorStyle: string;
-            resolution: number;
-            update(deltaTime: number): void;
-
-            mapPositionToPoint(point: Point, x: number, y: number): void;
-            processInteractive(point: Point, displayObject: DisplayObject, func: (displayObject: DisplayObject, hit: boolean) => void, hitTest: boolean, interactive: boolean): boolean;
-            destroy(): void;
-
-        }
-
-        export interface InteractiveTarget {
-
-            interactive: boolean;
-            buttonMode: boolean;
-            interactiveChildren: boolean;
-            defaultCursor: string;
-            hitArea: HitArea;
-
-        }
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////LOADER/////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////////
-    //https://github.com/englercj/resource-loader/blob/master/src/Loader.js
-
-    export module loaders {
-        export interface LoaderOptions {
-
-            crossOrigin?: boolean;
-            loadType?: number;
-            xhrType?: string;
-
-        }
-        export interface ResourceDictionary {
-
-            [index: string]: PIXI.loaders.Resource;
-        }
-        export class Loader extends EventEmitter {
-
-            constructor(baseUrl?: string, concurrency?: number);
-
-            baseUrl: string;
-            progress: number;
-            loading: boolean;
-            resources: ResourceDictionary;
-
-            add(name: string, url: string, options?: LoaderOptions, cb?: () => void): Loader;
-            add(url: string, options?: LoaderOptions, cb?: () => void): Loader;
-            //todo I am not sure of object literal notional (or its options) so just allowing any but would love to improve this
-            add(obj: any, options?: LoaderOptions, cb?: () => void): Loader;
-
-            on(event: 'complete', fn: (loader: loaders.Loader, object: any) => void, context?: any): EventEmitter;
-            on(event: 'error', fn: (error: Error, loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
-            on(event: 'load', fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
-            on(event: 'progress', fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
-            on(event: 'start', fn: (loader: loaders.Loader) => void, context?: any): EventEmitter;
-            on(event: string, fn: Function, context?: any): EventEmitter;
-
-            once(event: 'complete', fn: (loader: loaders.Loader, object: any) => void, context?: any): EventEmitter;
-            once(event: 'error', fn: (error: Error, loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
-            once(event: 'load', fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
-            once(event: 'progress', fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
-            once(event: 'start', fn: (loader: loaders.Loader) => void, context?: any): EventEmitter;
-            once(event: string, fn: Function, context?: any): EventEmitter;
-
-            before(fn: Function): Loader;
-            pre(fn: Function): Loader;
-
-            after(fn: Function): Loader;
-            use(fn: Function): Loader;
-
-            reset(): void;
-
-            load(cb?: (loader: loaders.Loader, object: any) => void): Loader;
-
-        }
-        export class Resource extends EventEmitter {
-
-            static LOAD_TYPE: {
-                XHR: number;
-                IMAGE: number;
-                AUDIO: number;
-                VIDEO: number;
-            };
-
-            static XHR_READ_STATE: {
-                UNSENT: number;
-                OPENED: number;
-                HEADERS_RECIEVED: number;
-                LOADING: number;
-                DONE: number;
-            };
-
-            static XHR_RESPONSE_TYPE: {
-                DEFAULT: number;
-                BUFFER: number;
-                BLOB: number;
-                DOCUMENT: number;
-                JSON: number;
-                TEXT: number;
-            };
-
-            constructor(name?: string, url?: string | string[], options?: LoaderOptions);
-
-            name: string;
-            texture: Texture;
-			textures: Texture[];
-            url: string;
-            data: any;
-            crossOrigin: string;
-            loadType: number;
-            xhrType: string;
-            error: Error;
-            xhr: XMLHttpRequest;
-
-            complete(): void;
-            load(cb?: () => void): void;
-
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////MESH///////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////////
-
-    export module mesh {
-
-        export class Mesh extends Container {
-
-            static DRAW_MODES: {
-                TRIANGLE_MESH: number;
-                TRIANGLES: number;
-            };
-
-            constructor(texture: Texture, vertices?: number[], uvs?: number[], indices?: number[], drawMode?: number);
-
-            texture: Texture;
-            uvs: number[];
-            vertices: number[];
-            indices: number[];
-            dirty: boolean;
-            blendMode: number;
-            canvasPadding: number;
-            drawMode: number;
-            shader: Shader | AbstractFilter;
-
-            getBounds(matrix?: Matrix): Rectangle;
-            containsPoint(point: Point): boolean;
-
-            protected _texture: Texture;
-
-            protected _renderCanvasTriangleMesh(context: CanvasRenderingContext2D): void;
-            protected _renderCanvasTriangles(context: CanvasRenderingContext2D): void;
-            protected _renderCanvasDrawTriangle(context: CanvasRenderingContext2D, vertices: number, uvs: number, index0: number, index1: number, index2: number): void;
-            protected renderMeshFlat(Mesh: Mesh): void;
-            protected _onTextureUpdate(): void;
-
-        }
-        export class Rope extends Mesh {
-
-            protected _ready: boolean;
-
-            protected getTextureUvs(): TextureUvs;
-
-            constructor(texture: Texture, points: Point[]);
-
-            points: Point[];
-            colors: number[];
-
-            refresh(): void;
-
-        }
-        export class Plane extends Mesh {
-
-            segmentsX: number;
-            segmentsY: number;
-
-            constructor(texture: Texture, segmentsX?: number, segmentsY?: number);
-
-        }
-
-
-        export class MeshRenderer extends ObjectRenderer {
-
-            protected _initWebGL(mesh: Mesh): void;
-
-            indices: number[];
-
-            constructor(renderer: WebGLRenderer);
-
-            render(mesh: Mesh): void;
-            flush(): void;
-            start(): void;
-            destroy(): void;
-
-        }
-
-        export interface MeshShader extends Shader { }
-
-    }
-
-    namespace ticker {
-
-        export var shared: Ticker;
-
-        export class Ticker {
-
-            protected _tick(time: number): void;
-            protected _emitter: EventEmitter;
-            protected _requestId: number;
-            protected _maxElapsedMS: number;
-
-            protected _requestIfNeeded(): void;
-            protected _cancelIfNeeded(): void;
-            protected _startIfPossible(): void;
-
-            autoStart: boolean;
-            deltaTime: number;
-            elapsedMS: number;
-            lastTime: number;
-            speed: number;
-            started: boolean;
-
-            FPS: number;
-            minFPS: number;
-
-            add(fn: (deltaTime: number) => void, context?: any): Ticker;
-            addOnce(fn: (deltaTime: number) => void, context?: any): Ticker;
-            remove(fn: (deltaTime: number) => void, context?: any): Ticker;
-            start(): void;
-            stop(): void;
-            update(): void;
-
-        }
-
-    }
-}
-
-declare module 'pixi.js' {
-    export = PIXI;
-}
diff --git a/pixi.js/tsconfig.json b/pixi.js/tsconfig.json
new file mode 100644
index 0000000000..b82cf44197
--- /dev/null
+++ b/pixi.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pixi.js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/platform/platform.d.ts b/platform/index.d.ts
similarity index 100%
rename from platform/platform.d.ts
rename to platform/index.d.ts
diff --git a/platform/platform-tests.ts b/platform/platform-tests.ts
index 9309e7b668..ce24ada335 100644
--- a/platform/platform-tests.ts
+++ b/platform/platform-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="platform.d.ts" />
+
 
 interface ITestContainer {
     [name: string]: PlatformStatic;
diff --git a/platform/tsconfig.json b/platform/tsconfig.json
new file mode 100644
index 0000000000..0f0284673a
--- /dev/null
+++ b/platform/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "platform-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/playerframework/index.d.ts b/playerframework/index.d.ts
new file mode 100644
index 0000000000..f01a9b3c0d
--- /dev/null
+++ b/playerframework/index.d.ts
@@ -0,0 +1,1965 @@
+// Type definitions for Player Framework (MMPPF)
+// Project: https://playerframework.codeplex.com/
+// Definitions by: Ricardo Sabino <https://github.com/ricardosabino>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+///<reference types="winrt"/>
+
+declare namespace PlayerFramework {
+
+	// Enumerations
+	enum AdvertisingState {
+		/**
+		* No ad is loading or playing.
+		**/
+		none = 0,
+		/**
+		* An ad is loading.
+		**/
+		loading = 1,
+		/**
+		* A linear ad is playing.
+		**/
+		linear = 2,
+		/**
+		* A non-linear ad is playing.
+		**/
+		nonLinear = 3
+	}
+
+
+	enum AutohideBehavior {
+		/**
+		* No behaviors are applied to the autohide feature.
+		**/
+		none = 0,
+		/**
+		* Autohide is allowed during media playback only.
+		**/
+		allowDuringPlaybackOnly = 1,
+		/**
+		* Autohide is prevented when the pointer is over interactive components such as the control panel.
+		**/
+		preventDuringInteractiveHover = 2,
+		/**
+		* All behaviors are applied to the autohide feature.
+		**/
+		all = 3
+	}
+
+	enum InteractionType {
+		/**
+		* Indicates no interaction.
+		**/
+		none = 0,
+		/**
+		* Indicates a "soft" interaction such as mouse movement or a timeout occurring.
+		**/
+		soft = 1,
+		/**
+		* Indicates a "hard" interaction such as a tap, click, or a key is pressed.
+		**/
+		hard = 2,
+		/**
+		* Indicates both "soft" and "hard" interactions.
+		**/
+		all = 3
+	}
+
+	enum NetworkState {
+		/**
+		* The player has not yet initialized any audio/video.
+		**/
+		empty = 0,
+		/**
+		* The player has active audio/video and has selected a resource, but is not using the network.
+		**/
+		idle = 1,
+		/**
+		* The player is downloading data.
+		**/
+		loading = 2,
+		/**
+		* The player has no audio/video source.
+		**/
+		noSource = 3
+	}
+
+	enum MediaQuality {
+		/**
+		* Typically indicates less than 720p media quality.
+		**/
+		standardDefinition = 0,
+		/**
+		* Typically indicates greater than or equal to 720p media quality.
+		**/
+		highDefinition = 1
+	}
+
+	enum PlayerState {
+		/**
+		* The player is unloaded and no media source is set.
+		**/
+		unloaded = 0,
+		/**
+		* The media source is set and the player is waiting to load the media (e.g. autoload is false).
+		**/
+		pending = 1,
+		/**
+		* The media source is set, but the player is still executing loading operations.
+		**/
+		loading = 2,
+		/**
+		* The media has finished loading, but has not been opened yet.
+		**/
+		loaded = 3,
+		/**
+		* The media can be played.
+		**/
+		opened = 4,
+		/**
+		* The media has been told to start playing, but the player is still executing starting operations.
+		**/
+		starting = 5,
+		/**
+		* The media has been started and the player is either playing or paused.
+		**/
+		started = 6,
+		/**
+		* The media has finished, but the player is still executing ending operations.
+		**/
+		ending = 7,
+		/**
+		* The media has ended.
+		**/
+		ended = 8,
+		/**
+		* The media has failed and the player must be reloaded.
+		**/
+		failed = 9,
+	}
+
+	enum ReadyState  {
+		/**
+		* The player has no information for the audio/video
+		**/
+		nothing = 0,
+		/**
+		* The player has metadata for the audio/video.
+		**/
+		metadata = 1,
+		/**
+		* The player has data for the current playback position, but not enough data to play the next frame.
+		**/
+		currentData = 2,
+		/**
+		* The player has data for the current playback position and at least the next frame.
+		**/
+		futureData = 3,
+		/**
+		* The player has enough data available to start playing.
+		**/
+		enoughData = 4
+	}
+
+	enum MediaErrorCode {
+		/**
+		* An unknown media error occurred.
+		**/
+		unknown = 0,
+		/**
+		* Media playback was aborted.
+		**/
+		aborted = 1,
+		/**
+		* Media download failed due to a network error.
+		**/
+		network = 2,
+		/**
+		* Media playback was aborted due to a corruption problem or because unsupported features were used.
+		**/
+		decode = 3,
+		/**
+		* Media source could not be loaded either because the server or network failed or because the format is not supported.
+		**/
+		notSupported = 4
+	}
+
+	enum ImageErrorCode {
+		/**
+		* An unknown image error occurred.
+		**/
+		unknown = 0,
+		/**
+		* Image download was aborted.
+		**/
+		aborted = 1
+	}
+
+	class TextTrackMode {
+		/**
+		* The track is disabled.
+		**/
+		static off: string;
+		/**
+        * The track is active, but the player is not actively displaying cues.
+		**/
+        static hidden: string;
+		/**
+		* The track is active and the player is actively displaying cues.
+		**/
+		static showing: string;
+	}
+
+	enum TextTrackDisplayMode {
+		/**
+		* Indicates tracks should not be displayed.
+		*/
+		none = 0,
+		/**
+		* Indicates tracks should be displayed using custom UI.
+		*/
+		custom = 1,
+		/**
+		* Indicates tracks should be displayed using native UI.
+		*/
+		native = 2,
+		/**
+		* Indicates tracks should be displayed using both custom and native UI. This is useful for debugging.
+		*/
+		all = 3
+	}
+
+	enum TextTrackReadyState {
+		/**
+		* The track is unloaded.
+		*/
+		none = 0,
+		/**
+		* The track is currently loading.
+		*/
+		loading = 1,
+		/**
+		* The track is loaded.
+		*/
+		loaded = 2,
+		/**
+		* The track failed to load.
+		*/
+		error = 3
+	}
+
+	enum ViewModelState {
+		/**
+		* No media is loaded.
+		*/
+		unloaded = 0,
+		/**
+		* The media is loading.
+		*/
+		loading = 1,
+		/**
+		* The media is paused.
+		*/
+		paused = 2,
+		/**
+		* The media is playing.
+		*/
+		playing = 3
+	}
+
+
+
+	interface PlaylistItem {
+		src: string;
+		tracks?: Array<any>; //TODO
+	}
+
+	class PluginBase {
+		isEnabled: boolean;
+		isLoaded: boolean;
+		isActive: boolean;
+		mediaPlayer: MediaPlayer;
+		currentMediaSource: MediaSource;
+
+		load(): void;
+		unload(): void;
+		update(mediaSource: MediaSource): void;
+	}
+
+	namespace Plugins {
+
+		class TrackingPluginBase extends PluginBase {
+			trackingEvents: Array<any>;
+
+		}
+
+		class BufferingPlugin extends PluginBase {
+			hide(): void;
+			show(): void;
+		}
+
+		class ControlPlugin extends PluginBase {
+			compactThresholdInInches(): number;
+			hide(): void;
+			isCompact(): boolean;
+			orientation(): string;
+			show(): void;
+		}
+
+		class ErrorPlugin extends PluginBase {
+			hide(): void;
+			show(): void;
+		}
+
+		class LoaderPlugin extends PluginBase {
+			hide(): void;
+			show(): void;
+		}
+
+		/**
+		*
+		**/
+		class PlaylistPlugin extends PluginBase {
+			/**
+			*
+			**/
+			autoAdvance: boolean;
+			/**
+			*
+			**/
+			currentPlaylistItem: PlaylistItem;
+			/**
+			*
+			**/
+			currentPlaylistItemIndex: number;
+			/**
+			*
+			**/
+			playlist: Array<PlaylistItem>;
+			/**
+			*
+			**/
+			startupPlaylistItemIndex: number;
+			/**
+			*
+			**/
+			skipBackThreshold: number;
+
+			// Methods
+			goToPreviousPlaylistItem(): void;
+			goToNextPlaylistItem(): void;
+			canGoToPreviousPlaylistItem(): boolean;
+			canGoToNextPlaylistItem(): boolean;
+		}
+
+		class PlayTimeTrackingPlugin extends PluginBase {
+			playTime: number;
+			playTimePercentage: number;
+		}
+
+		class PositionTrackingPlugin extends PluginBase {
+			evaluateOnForwardOnly: boolean;
+			position: number;
+			positionPercentage: number;
+		}
+
+		class SystemTransportControlsPlugin extends PluginBase {
+			isPreviousTrackEnabled: boolean;
+			isNextTrackEnabled: boolean;
+			nextTrackExists: boolean;
+			previousTrackExists: boolean;
+		}
+
+		class ChaptersPlugin extends PluginBase {
+			defaultChapterCount: number;
+			autoCreateDefaultChapters: boolean;
+			autoCreateChaptersFromTextTracks: boolean;
+			visualMarkerClass: string;
+		}
+
+		class DisplayRequestPlugin extends PluginBase {
+			isRequestActive: boolean;
+		}
+
+		class CaptionSelectorPlugin extends PluginBase {
+			hide(): void;
+			show(): void;
+
+			/**
+			* Not available in phone.
+			**/
+			alignment: string;
+			/**
+			* Not available in phone.
+			**/
+			anchor: HTMLElement;
+			/**
+			* Not available in phone.
+			**/
+			placement: string;
+		}
+
+		class AudioSelectorPlugin extends PluginBase {
+			hide(): void;
+			show(): void;
+
+			/**
+			* Not available in phone.
+			**/
+			alignment: string;
+			/**
+			* Not available in phone.
+			**/
+			anchor: HTMLElement;
+			/**
+			* Not available in phone.
+			**/
+			placement: string;
+		}
+	}
+
+	/**
+	*
+	**/
+	class InteractiveViewModel {
+		/**
+		* TODO
+		**/
+		state: ViewModelState;
+		/**
+		* TODO
+		**/
+		startTime: number;
+		/**
+		* TODO
+		**/
+		maxTime: number;
+		/**
+		* TODO
+		**/
+		endTime: number;
+		/**
+		* TODO
+		**/
+		currentItem: number;
+		/**
+		* TODO
+		**/
+		bufferedPercentage: number;
+		/**
+		* TODO
+		**/
+		playPouseIcon: string;
+		/**
+		* TODO
+		**/
+		playPauseLabel: string;
+		/**
+		* TODO
+		**/
+		playPauseTooltip: string;
+		/**
+		* TODO
+		**/
+		isPlayPauseDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isPlayPauseHidden: boolean;
+		/**
+		* TODO
+		**/
+		playResumeIcon: string;
+		/**
+		* TODO
+		**/
+		playResumeLabel: string;
+		/**
+		* TODO
+		**/
+		playResumeTooltip: string;
+		/**
+		* TODO
+		**/
+		isPlayResumeDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isPlayResumeHidden: boolean;
+		/**
+		* TODO
+		**/
+		pauseIcon: string;
+		/**
+		* TODO
+		**/
+		pauseLabel: string;
+		/**
+		* TODO
+		**/
+		pauseTooltip: string;
+		/**
+		* TODO
+		**/
+		isPauseDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isPauseHidden: boolean;
+		/**
+		* TODO
+		**/
+		replayIcon: string;
+		/**
+		* TODO
+		**/
+		replayLabel: string;
+		/**
+		* TODO
+		**/
+		replayTooltip: string;
+		/**
+		* TODO
+		**/
+		isReplayDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isReplayHidden: boolean;
+		/**
+		* TODO
+		**/
+		rewindIcon: string;
+		/**
+		* TODO
+		**/
+		rewindLabel: string;
+		/**
+		* TODO
+		**/
+		rewindTooltip: string;
+		/**
+		* TODO
+		**/
+		isRewindDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isRewindHidden: boolean;
+		/**
+		* TODO
+		**/
+		fastForwardIcon: string;
+		/**
+		* TODO
+		**/
+		fastForwardLabel: string;
+		/**
+		* TODO
+		**/
+		fastForwardTooltip: string;
+		/**
+		* TODO
+		**/
+		isFastForwardDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isFastForwardHidden: boolean;
+		/**
+		* TODO
+		**/
+		slowMotionIcon: string;
+		/**
+		* TODO
+		**/
+		slowMotionLabel: string;
+		/**
+		* TODO
+		**/
+		slowMotionTooltip: string;
+		/**
+		* TODO
+		**/
+		isSlowMotionDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isSlowMotionHidden: boolean;
+		/**
+		* TODO
+		**/
+		skipPreviousIcon: string;
+		/**
+		* TODO
+		**/
+		skipPreviousLabel: string;
+		/**
+		* TODO
+		**/
+		skipPreviousTooltip: string;
+		/**
+		* TODO
+		**/
+		isSkipPreviousDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isSkipPreviousHidden: boolean;
+		/**
+		* TODO
+		**/
+		skipNextIcon: string;
+		/**
+		* TODO
+		**/
+		skipNextLabel: string;
+		/**
+		* TODO
+		**/
+		skipNextTooltip: string;
+		/**
+		* TODO
+		**/
+		isSkipNextDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isSkipNextHidden: boolean;
+		/**
+		* TODO
+		**/
+		skipBackIcon: string;
+		/**
+		* TODO
+		**/
+		skipBackLabel: string;
+		/**
+		* TODO
+		**/
+		skipBackTooltip: string;
+		/**
+		* TODO
+		**/
+		isSkipBackDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isSkipBackHidden: boolean;
+		/**
+		* TODO
+		**/
+		skipAheadIcon: string;
+		/**
+		* TODO
+		**/
+		skipAheadLabel: string;
+		/**
+		* TODO
+		**/
+		skipAheadTooltip: string;
+		/**
+		* TODO
+		**/
+		isSkipAheadDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isSkipAheadHidden: boolean;
+		/**
+		* TODO
+		**/
+		elapsedTime: number;
+		/**
+		* TODO
+		**/
+		elapsedTimeText: string;
+		/**
+		* TODO
+		**/
+		elapsedTimeLabel: string;
+		/**
+		* TODO
+		**/
+		elapsedTimeTooltip: string;
+		/**
+		* TODO
+		**/
+		isElapsedTimeDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isElapsedTimeHidden: boolean;
+		/**
+		* TODO
+		**/
+		remainingTime: number;
+		/**
+		* TODO
+		**/
+		remainingTimeText: string;
+		/**
+		* TODO
+		**/
+		remainingTimeLabel: string;
+		/**
+		* TODO
+		**/
+		remainingTimeTooltip: string;
+		/**
+		* TODO
+		**/
+		isRemainingTimeDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isRemainingTimeHidden: boolean;
+		/**
+		* TODO
+		**/
+		totalTime: number;
+		/**
+		* TODO
+		**/
+		totalTimeText: string;
+		/**
+		* TODO
+		**/
+		totalTimeLabel: string;
+		/**
+		* TODO
+		**/
+		totalTimeTooltip: string;
+		/**
+		* TODO
+		**/
+		isTotalTimeDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isTotalTimeHidden: boolean;
+		/**
+		* TODO
+		**/
+		timelineLabel: string;
+		/**
+		* TODO
+		**/
+		timelineTooltip: string;
+		/**
+		* TODO
+		**/
+		isTimelineDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isTimelineHidden: boolean;
+		/**
+		* TODO
+		**/
+		goLiveText: string;
+		/**
+		* TODO
+		**/
+		goLiveLabel: string;
+		/**
+		* TODO
+		**/
+		goLiveTooltip: string;
+		/**
+		* TODO
+		**/
+		isGoLiveDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isGoLiveHidden: boolean;
+		/**
+		* TODO
+		**/
+		captionsIcon: string;
+		/**
+		* TODO
+		**/
+		captionsLabel: string;
+		/**
+		* TODO
+		**/
+		captionsTooltip: string;
+		/**
+		* TODO
+		**/
+		isCaptionsDisabled: boolean;
+		/**
+		* TODO
+		**/
+		audioIcon: string;
+		/**
+		* TODO
+		**/
+		audioLabel: string;
+		/**
+		* TODO
+		**/
+		audioTooltip: string;
+		/**
+		* TODO
+		**/
+		isAudioDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isAudioHidden: boolean;
+		/**
+		* TODO
+		**/
+		volume: number;
+		/**
+		* TODO
+		**/
+		volumeMuteIcon: string;
+		/**
+		* TODO
+		**/
+		volumeMuteLabel: string;
+		/**
+		* TODO
+		**/
+		volumeMuteTooltip: string;
+		/**
+		* TODO
+		**/
+		isVolumeMuteDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isVolumeMuteHidden: boolean;
+		/**
+		* TODO
+		**/
+		volumeIcon: string;
+		/**
+		* TODO
+		**/
+		volumeLabel: string;
+		/**
+		* TODO
+		**/
+		volumeTooltip: string;
+		/**
+		* TODO
+		**/
+		isVolumeDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isVolumeHidden: boolean;
+		/**
+		* TODO
+		**/
+		muteIcon: string;
+		/**
+		* TODO
+		**/
+		muteLabel: string;
+		/**
+		* TODO
+		**/
+		muteTooltip: string;
+		/**
+		* TODO
+		**/
+		isMuteDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isMuteHidden: boolean;
+		/**
+		* TODO
+		**/
+		fullScreenIcon: string;
+		/**
+		* TODO
+		**/
+		fullScreenLabel: string;
+		/**
+		* TODO
+		**/
+		fullScreenTooltip: string;
+		/**
+		* TODO
+		**/
+		isFullScreenDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isFullScreenHidden: boolean;
+		/**
+		* TODO
+		**/
+		stopIcon: string;
+		/**
+		* TODO
+		**/
+		stopLabel: string;
+		/**
+		* TODO
+		**/
+		stopTooltip: string;
+		/**
+		* TODO
+		**/
+		isStopDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isStopHidden: boolean;
+		/**
+		* TODO
+		**/
+		infoIcon: string;
+		/**
+		* TODO
+		**/
+		infoLabel: string;
+		/**
+		* TODO
+		**/
+		infoTooltip: string;
+		/**
+		* TODO
+		**/
+		isInfoDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isInfoHidden: boolean;
+		/**
+		* TODO
+		**/
+		moreIcon: string;
+		/**
+		* TODO
+		**/
+		moreLabel: string;
+		/**
+		* TODO
+		**/
+		moreTooltip: string;
+		/**
+		* TODO
+		**/
+		isMoreDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isMoreHidden: boolean;
+		/**
+		* TODO
+		**/
+		zoomIcon: string;
+		/**
+		* TODO
+		**/
+		zoomLabel: string;
+		/**
+		* TODO
+		**/
+		zoomTooltip: string;
+		/**
+		* TODO
+		**/
+		isZoomDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isZoomHidden: boolean;
+		/**
+		* TODO
+		**/
+		signalStrength: number;
+		/**
+		* TODO
+		**/
+		signalStrengthLabel: string;
+		/**
+		* TODO
+		**/
+		signalStrengthTooltip: string;
+		/**
+		* TODO
+		**/
+		isSignalStrengthDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isSignalStrengthHidden: boolean;
+		/**
+		* TODO
+		**/
+		mediaQuality: MediaQuality;
+		/**
+		* TODO
+		**/
+		mediaQualityLabel: string;
+		/**
+		* TODO
+		**/
+		mediaQualityTooltip: string;
+		/**
+		* TODO
+		**/
+		isMediaQualityDisabled: boolean;
+		/**
+		* TODO
+		**/
+		isMediaQualityHidden: boolean;
+		/**
+		* TODO
+		**/
+		visualMarkers: Array<any>;
+		/**
+		* TODO
+		**/
+		thumbnailImageSrc: string;
+		/**
+		* TODO
+		**/
+		isThumbnailVisible: boolean;
+		/**
+		* TODO
+		**/
+		mediaMetadata: Object;
+
+
+		uninitialize(): void;
+		playPause(e?: any): void;
+		playResume(): void;
+		pause(): void;
+		replay(): void;
+		rewind(): void;
+		fastForward(): void;
+		slowMotion(): void;
+		skipPrevious(): void;
+		skipNext(): void;
+		skipBack(): void;
+		skipAhead(): void;
+		startScrub(time: number): void;
+		updateScrub(time: number): void;
+		completeScrub(time: number): void;
+		goLive(): void;
+		setVolume(volume: number): void;
+		toggleMutted(): void;
+		toggleFullScreen(): void;
+		stop(): void;
+		info(): void;
+		more(): void;
+		toggleZoom(): void;
+		captions(): void;
+		audio(): void;
+		onTimelineSliderStart(e: any): void;
+		onTimelineSliderUpdate(e: any): void;
+		onTimelineSliderComplete(e: any): void;
+		onTimelineSliderSkipToMarker(e: any): void;
+		onVolumeSliderUpdate(e: any): void;
+		onVolumeMuteClick(e: any): void;
+		onVolumeMuteFocus(e: any): void;
+		onVolumeMuteSliderUpdate(e: any): void;
+		onVolumeMuteSliderFocusIn(e: any): void;
+		onVolumeMuteSliderFocusOut(e: any): void;
+		onVolumeMuteSliderMSPointerOver(e: any): void;
+		onVolumeMuteSliderMSPointerOut(e: any): void;
+		onVolumeMuteSliderTransitionEnd(e: any): void;
+	}
+
+	/**
+	*
+	**/
+	class MediaPlayer {
+		constructor(element: HTMLElement, options?: any);
+		/**
+		* Gets or sets the current advertising state of the player.
+		**/
+		advertisingState: AdvertisingState;
+		/**
+		* Gets the audio tracks for the current media source.
+		**/
+		audioTracks: Array<any>;
+
+		/**
+		* Gets or sets a value that indicates whether to automatically start buffering the current media source.
+		**/
+		autobuffer: boolean;
+		/**
+		* Gets or sets a value that specifies whether interactive elements(e.g.the control panel) will be hidden automatically.
+		**/
+		autohide: boolean;
+		/**
+		* Gets or sets the behavior of the autohide feature.
+		**/
+		autohideBehavior: AutohideBehavior;
+		/**
+		* Gets or sets the amount of time (in seconds) before interactive elements(e.g.the control panel) will be hidden automatically.
+		**/
+		autohideTime: number;
+		/**
+		* Gets or sets a value that specifies whether to start loading the current media source automatically.
+		**/
+		autoload: boolean;
+		/**
+		* Gets or sets a value that specifies whether to automatically start playing the current media source.
+		**/
+		autoplay: boolean;
+		/**
+		* Gets the buffered time ranges for the current media source.
+		**/
+		buffered: Array<any>; //TODO: (type: TimeRanges, read - only)
+		/**
+		* Gets the caption and subtitle tracks for the current media source.
+		**/
+		captionTracks: Array<any>;
+		/**
+		* Gets or sets a value that specifies whether to display the native controls for the current media source.
+		**/
+		controls: boolean;
+		/**
+		* Gets or sets the current audio track.
+		**/
+		currentAudioTrack: any; //TODO: (type: AudioTrack, read / write)
+		/**
+		* Gets or sets the current caption / subtitle track.
+		**/
+		currentCaptionTrack: any; //TODO: (type: TextTrack, read / write)
+		/**
+		* Gets the URL of the current media source.
+		**/
+		currentSrc: string;
+		/**
+		* Gets or sets the current playback position (in seconds).
+		**/
+		currentTime: number;
+		/**
+		* Gets the view model that will be restored following a temporary change to the current interactive view model(e.g.during an ad).
+		**/
+		defaultInteractiveViewModel: InteractiveViewModel;
+		/**
+		* Gets or sets the playback rate to use when play is resumed.
+		**/
+		defaultPlaybackRate: number;
+		/**
+		* Gets the duration (in seconds) of the current media source.
+		**/
+		duration: number;
+		/**
+		* Gets the host element for the control.
+		**/
+		element: HTMLElement;
+		/**
+		* Gets a value that specifies whether playback has ended.
+		**/
+		ended: boolean;
+		/**
+		* Gets or sets the end time (in seconds) of the current media source.This is useful in live streaming scenarios.
+		**/
+		endTime: number;
+		/**
+		* Gets the current error state of the player.
+		**/
+		error: MediaError;
+		/**
+		* Gets or sets the height of the host element.
+		**/
+		height: string;
+		/**
+		* Gets the earliest possible position (in seconds) that playback can begin.
+		**/
+		initialTime: number;
+		/**
+		* Gets or sets the type of interactions that will cause interactive elements(e.g.the control panel) to be shown.
+		**/
+		interactiveActivationMode: InteractionType;
+		/**
+		* Gets or sets the type of interactions that will cause interactive elements(e.g.the control panel) to be hidden.
+		**/
+		interactiveDeactivationMode: InteractionType;
+		/**
+		* Gets or sets the view model that interactive elements are bound to(e.g.the control panel).
+		**/
+		interactiveViewModel: InteractiveViewModel;
+		/**
+		* Gets a value that specifies whether interaction with the audio control is allowed based on the current state of the player.
+		**/
+		isAudioAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the audio control is enabled.
+		**/
+		isAudioEnabled: boolean;
+		/**
+		* Gets or sets a value that specifies whether the audio control is visible.
+		**/
+		isAudioVisible: boolean;
+		/**
+		* Gets a value that specifies whether interaction with the captions control is allowed based on the current state of the player.
+		**/
+		isCaptionsAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the captions control is enabled.
+		**/
+		isCaptionsEnabled: boolean; //TODO: READ-ONLY
+		/**
+		* Gets or sets a value that specifies whether the captions control is visible.
+		**/
+		isCaptionsVisible: boolean;
+		/**
+		* Gets a value that specifies whether the current playback position is "live".
+		**/
+		isCurrentTimeLive: boolean;
+		/**
+		* Gets a value that specifies whether interaction with the elapsed time control is allowed based on the current state of the player.
+		**/
+		isElapsedTimeAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the elapsed time control is enabled.
+		**/
+		isElapsedTimeEnabled: boolean;
+		/**
+		* Gets or sets a value that specifies whether the elapsed time control is visible.
+		**/
+		isElapsedTimeVisible: boolean;
+		/**
+		* Gets a value that specifies whether interaction with the fast forward control is allowed based on the current state of the player.
+		**/
+		isFastForwardAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the fast forward control is enabled.
+		**/
+		isFastForwardEnabled: boolean;
+		/**
+		* Gets or sets a value that specifies whether the fast forward control is visible.
+		**/
+		isFastForwardVisible: boolean;
+		/**
+		* Gets or sets a value that specifies whether the player is in full screen mode.
+		**/
+		isFullScreen: boolean;
+		/**
+		* Gets a value that specifies whether interaction with the full screen control is allowed based on the current state of the player.
+		**/
+		isFullScreenAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the full screen control is enabled.
+		**/
+		isFullScreenEnabled: boolean;
+		/**
+		* Gets or sets a value that specifies whether the full screen control is visible.
+		**/
+		isFullScreenVisible: boolean;
+		/**
+		* Gets a value that specifies whether interaction with the go live control is allowed based on the current state of the player.
+		**/
+		isGoLiveAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the go live control is enabled.
+		**/
+		isGoLiveEnabled: boolean;
+		/**
+		* Gets or sets a value that specifies whether the go live control is visible.
+		**/
+		isGoLiveVisible: boolean;
+		/**
+		* Gets or sets a value that specifies whether the player is currently in interactive mode(e.g.showing the control panel).
+		**/
+		isInteractive: boolean;
+		/**
+		* Gets a value that specifies whether the current media source is a live stream.
+		**/
+		isLive: boolean;
+		/**
+		* Gets a value that specifies whether interaction with the media quality control is allowed based on the current state of the player.
+		**/
+		isMediaQualityAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the media quality control is enabled.
+		**/
+		isMediaQualityEnabled: boolean;
+		/**
+		* Gets or sets a value that specifies whether the media quality control is visible.
+		**/
+		isMediaQualityVisible: boolean;
+		/**
+		* Gets a value that specifies whether interaction with the mute control is allowed based on the current state of the player.
+		**/
+		isMuteAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the mute control is enabled.
+		**/
+		isMuteEnabled: boolean;
+		/**
+		* Gets or sets a value that specifies whether the mute control is visible.
+		**/
+		isMuteVisible: boolean;
+		/**
+		* Gets a value that specifies whether interaction with the pause control is allowed based on the current state of the player.
+		**/
+		isPauseAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the pause control is enabled.
+		**/
+		isPauseEnabled: boolean;
+		/**
+		* Gets or sets a value that specifies whether the pause control is visible.
+		**/
+		isPauseVisible: boolean;
+		/**
+		* Gets a value that specifies whether interaction with the play / pause control is allowed based on the current state of the player.
+		**/
+		isPlayPauseAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the play / pause control is enabled.
+		**/
+		isPlayPauseEnabled: boolean;
+		/**
+		* Gets or sets a value that specifies whether the play / pause control is visible.
+		**/
+		isPlayPauseVisible: boolean;
+		/**
+		* Gets a value that specifies whether interaction with the play / resume control is allowed based on the current state of the player.
+		**/
+		isPlayResumeAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the play / resume control is enabled.
+		**/
+		isPlayResumeEnabled: boolean;
+		/**
+		* Gets or sets a value that specifies whether the play / resume control is visible.
+		**/
+		isPlayResumeVisible: boolean;
+		/**
+		* Gets a value that specifies whether interaction with the remaining time control is allowed based on the current state of the player.
+		**/
+		isRemainingTimeAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the remaining time control is enabled.
+		**/
+		isRemainingTimeEnabled: boolean;
+		/**
+		* Gets or sets a value that specifies whether the remaining time control is visible.
+		**/
+		isRemainingTimeVisible: boolean;
+		/**
+		* Gets a value that specifies whether interaction with the replay control is allowed based on the current state of the player.
+		**/
+		isReplayAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the replay control is enabled.
+		**/
+		isReplayEnabled: boolean;
+		/**
+		* Gets or sets a value that specifies whether the replay control is visible.
+		**/
+		isReplayVisible: boolean;
+		/**
+		* Gets a value that specifies whether interaction with the rewind control is allowed based on the current state of the player.
+		**/
+		isRewindAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the rewind control is enabled.
+		**/
+		isRewindEnabled: boolean;
+		/**
+		* Gets or sets a value that specifies whether the rewind control is visible.
+		**/
+		isRewindVisible: boolean;
+		/**
+		* Gets a value that specifies whether interaction with the signal strength control is allowed based on the current state of the player.
+		**/
+		isSignalStrengthAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the signal strength control is enabled.
+		**/
+		isSignalStrengthEnabled: boolean;
+		/**
+		* Gets or sets a value that specifies whether the signal strength control is visible.
+		**/
+		isSignalStrengthVisible: boolean;
+		/**
+		* Gets a value that specifies whether interaction with the skip ahead control is allowed based on the current state of the player.
+		**/
+		isSkipAheadAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the skip ahead control is enabled.
+		**/
+		isSkipAheadEnabled: boolean;
+		/**
+		* Gets or sets a value that specifies whether the skip ahead control is visible.
+		**/
+		isSkipAheadVisible: boolean;
+		/**
+		* Gets a value that specifies whether interaction with the skip back control is allowed based on the current state of the player.
+		**/
+		isSkipBackAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the skip back control is enabled.
+		**/
+		isSkipBackEnabled: boolean;
+		/**
+		* Gets or sets a value that specifies whether the skip back control is visible.
+		**/
+		isSkipBackVisible: boolean;
+		/**
+		* Gets a value that specifies whether interaction with the skip next control is allowed based on the current state of the player.
+		**/
+		isSkipNextAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the skip next control is enabled.
+		**/
+		isSkipNextEnabled: boolean;
+		/**
+		* Gets or sets a value that specifies whether the skip next control is visible.
+		**/
+		isSkipNextVisible: boolean;
+		/**
+		* Gets a value that specifies whether interaction with the skip previous control is allowed based on the current state of the player.
+		**/
+		isSkipPreviousAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the skip previous control is enabled.
+		**/
+		isSkipPreviousEnabled: boolean;
+		/**
+		* Gets or sets a value that specifies whether the skip previous control is visible.
+		**/
+		isSkipPreviousVisible: boolean;
+		/**
+		* Gets or sets a value that specifies whether the player is playing in slow motion.
+		**/
+		isSlowMotion: boolean;
+		/**
+		* Gets a value that specifies whether interaction with the slow motion control is allowed based on the current state of the player.
+		**/
+		isSlowMotionAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the slow motion control is enabled.
+		**/
+		isSlowMotionEnabled: boolean;
+		/**
+		* Gets or sets a value that specifies whether the slow motion control is visible.
+		**/
+		isSlowMotionVisible: boolean;
+		/**
+		* Gets or sets a value that specifies whether the start time is offset.
+		**/
+		isStartTimeOffset: boolean;
+		/**
+		* Gets a value that specifies whether interaction with the timeline control is allowed based on the current state of the player.
+		**/
+		isTimelineAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the timeline control is enabled.
+		**/
+		isTimelineEnabled: boolean;
+		/**
+		* Gets or sets a value that specifies whether the timeline control is visible.
+		**/
+		isTimelineVisible: boolean;
+		/**
+		* Gets a value that specifies whether interaction with the volume control is allowed based on the current state of the player.
+		**/
+		isVolumeAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the volume control is enabled.
+		**/
+		isVolumeEnabled: boolean;
+		/**
+		* Gets a value that specifies whether interaction with the volume / mute control is allowed based on the current state of the player.
+		**/
+		isVolumeMuteAllowed: boolean;
+		/**
+		* Gets or sets a value that specifies whether the volume / mute control is enabled.
+		**/
+		isVolumeMuteEnabled: boolean;
+		/**
+		* Gets or sets a value that specifies whether the volume / mute control is visible.
+		**/
+		isVolumeMuteVisible: boolean;
+		/**
+		* Gets or sets a value that specifies whether the volume control is visible.
+		**/
+		isVolumeVisible: boolean;
+		/**
+		* Gets or sets the live position (in seconds).
+		**/
+		liveTime: number;
+		/**
+		* Gets or sets the live buffer time (in seconds) for the current playback position to be considered "live".
+		**/
+		liveTimeBuffer: number;
+		/**
+		* Gets or sets a value that specifies whether playback should be restarted after it ends.
+		**/
+		loop: boolean;
+		/**
+		* Gets the media element associated with the player.
+		**/
+		mediaElement: HTMLMediaElement;
+		/**
+		* Gets or sets the media extension manager to be used by the player and its plugins.A new instance will be created on first use if one is not already set.
+		**/
+		mediaExtensionManager: Windows.Media.MediaExtensionManager;
+		/**
+		* Gets or sets the quality of the current media source.
+		**/
+		mediaQuality: MediaQuality;
+		/**
+		* Gets or sets a value that specifies the purpose of the media, such as background audio or alerts.
+		**/
+		msAudioCategory: string;
+		/**
+		* Gets or sets a value that specifies the output device ID that the audio will be sent to.
+		**/
+		msAudioDeviceType: string;
+		/**
+		* Gets or sets a value that specifies whether the media is flipped horizontally.
+		**/
+		msHorizontalMirror: boolean;
+		/**
+		* Gets a value that specifies whether the media can be rendered more efficiently.
+		**/
+		msIsLayoutOptimalForPlayback: boolean;
+		/**
+		* Gets a value that specifies whether the system considers the media to be stereo 3D.
+		**/
+		msIsStereo3D: boolean;
+		/**
+		* Gets or sets a value that specifies whether the DLNA PlayTo device is available.
+		**/
+		msPlayToDisabled: boolean;
+		/**
+		* Gets or sets the primary DLNA PlayTo device.
+		**/
+		msPlayToPrimary: boolean;
+		/**
+		* Gets the media source for use by the PlayToManager.
+		**/
+		msPlayToSource: Object;
+		/**
+		* Gets or sets a value that specifies whether or not to enable low - latency playback.
+		**/
+		msRealTime: boolean;
+		/**
+		* Gets or sets the frame - packing mode for stereo 3D video content.
+		**/
+		msStereo3DPackingMode: string;
+		/**
+		* Gets or sets a value that specifies whether the system display is set to stereo display.
+		**/
+		msStereo3DRenderMode: string;
+		/**
+		* Gets or sets a value that specifies whether the video frame is trimmed to fit the display.
+		**/
+		msZoom: boolean;
+		/**
+		* Gets or sets a value that indicates whether the audio is muted.
+		**/
+		muted: boolean;
+		/**
+		* Gets the current network state for the player.
+		**/
+		networkState: NetworkState;
+		/**
+		* Gets a value that specifies whether playback is paused.
+		**/
+		paused: boolean;
+		/**
+		* Gets or sets the playback rate for the current media source.
+		**/
+		playbackRate: number;
+		/**
+		* Gets the played time ranges for the current media source.
+		**/
+		played: Array<any>; //TODO: (type: TimeRanges, read - only)
+		/**
+		* Gets the playlist plugin.
+		**/
+		playlistPlugin: Plugins.PlaylistPlugin;
+		/**
+		* Gets or sets the current state of the player.
+		**/
+		playerState: PlayerState;
+		/*
+		* Gets the plugins associated with the player.
+		**/
+		plugins: Array<any>; //TODO: (type: ?, read - only)
+		/*
+		* Gets or sets the URL of an image to display while the current media source is loading.
+		**/
+		poster: string;
+		/**
+		** Gets or sets a hint to how much buffering is advisable for the current media source.
+		**/
+		preload: string;
+		/**
+		* Gets the current readiness state of the player.
+		**/
+		readyState: ReadyState;
+		/**
+		* Gets or sets the amount of time (in seconds) to offset the current playback position during replay.
+		**/
+		replayOffset: number;
+		/**
+		* Gets a value that specifies whether the player is currently moving to a new playback position due to a scrub operation.
+		**/
+		scrubbing: boolean; //TODO: (type: Boolean, read - only)
+		/**
+		* Gets the seekable time ranges of the current media source.
+		**/
+		seekable: any; //TODO: (type: TimeRanges, read - only)
+		/**
+		* Gets a value that specifies whether the player is currently moving to a new playback position due to a seek operation.
+		**/
+		seeking: boolean; //TODO: (type: Boolean, read - only)
+		/**
+		* Gets or sets a value that specifies whether the current video frame should be updated during a scrub operation.
+		**/
+		seekWhileScrubbing: boolean;
+		/**
+		* Gets or sets the signal strength of the current media source.This is useful in adaptive streaming scenarios.
+		**/
+		signalStrength: number;
+		/**
+		* Gets or sets the amount of time (in seconds) that the skip ahead control will seek forward.
+		**/
+		skipAheadInterval: number;
+		/**
+		* Gets or sets the amount of time (in seconds) that the skip back control will seek backward.
+		**/
+		skipBackInterval: number;
+		/**
+		* Gets or sets the playback rate to use when in slow motion.
+		**/
+		slowMotionPlaybackRate: number;
+		/**
+		* Gets or sets the media sources to be considered.
+		**/
+		sources: Array<any>; //TODO: (type: Array, read / write)
+		/**
+		* Gets or sets the URL of the current media source to be considered.
+		**/
+		src: string;
+		/**
+		* Gets or sets the start time (in seconds) of the current media source.This is useful in live streaming scenarios.
+		**/
+		startTime: number;
+		/**
+		* Gets or sets the position (in seconds) where playback should start.This is useful for resuming a video where the user left off in a previous session.
+		**/
+		startupTime: number;
+		/**
+		* Gets or sets whether a test for the media feature pack should be performed prior to allowing content to be laoded.This is useful to enable if Windows 8 N / KN users will be using this app.
+		**/
+		testForMediaPack: boolean;
+		/**
+		* Gets the text tracks for the current media source.
+		**/
+		textTracks: any; // TODO: (type: TextTrackList, read - only)
+		/**
+		* Gets or sets the tracks for the player.
+		**/
+		tracks: Array<any>; // TODO: (type: Array, read / write)
+		/**
+		* Gets the intrinsic height of the current video (in pixels).
+		**/
+		videoHeight: number;
+		/**
+		* Gets the intrinsic width of the current video (in pixels).
+		**/
+		videoWidth: number;
+		/**
+		* Gets or sets the volume level(from 0 to 1) for the audio portions of media playback.
+		**/
+		volume: number;
+		/**
+		* Gets or sets the width of the host element.
+		**/
+		width: string;
+
+		/* Methods */
+
+		/**
+		* Adds the specified CSS class to the host element.
+		* @param name The name of the class to add. Multiple classes can be added using space-delimited names.
+		**/
+		addClass(name: string): void;
+		/**
+		* Adds an event listener for the MediaPlayer events.
+		* //TODO
+		* @param type The type (name) of the event. You can use any of the following: "".
+		* @param listener The listener to invoke when the event is raised.
+		* @param capture true to initiate capture, otherwise false.
+		**/
+		addEventListener(type: string, listener: Function, capture?: boolean): void;
+		/**
+		* Create a new TextTrack object to add to an HTML5 video.
+		* @param kind String The type of text track
+		* @param label String A user readable title for a text track
+		* @param language String The BCP47 language tag of the track. For example "en" for English or "fr" for French
+		**/
+		addTextTrack(kind: string, label?: string, language?: string): void;
+		/**
+		* Raises the audioinvoked event used to indicate that an audio selection dialog should be presented to the user (usually in the form of a flyout).
+		**/
+		audio(): void;
+		/**
+		* Returns a value that specifies whether the player can play a given media type.
+		* @param type The type of media to be played.
+		* @returns One of the following values: "probably", "maybe", or an empty string if the media cannot be rendered.
+		**/
+		canPlayType(type: string): string;
+		/**
+		* Raises the captionsinvoked event used to indicate that closed options should be toggled on/off or that a caption selection dialog should be presented to the user (usually in the form of a flyout).
+		**/
+		captions(): void;
+		/**
+		* Decreases the current playback rate by a factor of two.After the rate reaches 1(normal speed), it will flip to - 1, and then begins to rewind.
+		**/
+		decreasePlaybackRate(): void;
+		/**
+		* Shuts down and releases all resources.
+		**/
+		dispose(): void;
+		/**
+		* Gives focus to the host element.
+		**/
+		focus(): void;
+		/**
+		* Increases the current playback rate by a factor of two.After the rate reaches - 1, it flips to 1(normal speed), and then begins to fast forward.
+		**/
+		increasePlaybackRate(): void;
+		/**
+		* Raises the infoinvoked event used to indicate that more information about the current media should be displayed to the user.
+		**/
+		info(): void;
+		/**
+		* Reloads the current media source.
+		**/
+		load(): void;
+		/**
+		* Raises the moreinvoked event typically used to indicate that more options that were unable to fit in the control panel should be presented to the user (usually in the form of a flyout).
+		**/
+		more(): void;
+		/**
+		* Clears all effects from the media pipeline.
+		**/
+		msClearEffects(): void;
+		/**
+		* Steps the video forward or backward by one frame.
+		* @param forward If true, the video is stepped forward, otherwise the video is stepped backward.
+		**/
+		msFrameStep(forward: boolean): void;
+		/**
+		* Inserts the specified audio effect into the media pipeline.
+		* @param activatableClassId The audio effects class.
+		* @param effectRequired
+		* @param config
+		**/
+		msInsertAudioEffect(activatableClassId: string, effectRequired: boolean, config: Object): void;
+		/**
+		* Inserts the specified video effect into the media pipeline.
+		* @param activatableClassId The video effects class.
+		* @param effectRequired
+		* @param config
+		**/
+		msInsertVideoEffect(activatableClassId: string, effectRequired: boolean, config: Object): void
+		/**
+		* Sets the MSMediaKeys to be used for decrypting media data.
+		* @param mediaKeys The media keys to use for decrypting media data.
+		**/
+		msSetMediaKeys(mediaKeys: MSMediaKeys): void;
+		/**
+		* Sets the media protection manager for a given media pipeline.
+		* @param mediaProtectionManager
+		**/
+		msSetMediaProtectionManager(mediaProtectionManager: Windows.Media.Protection.MediaProtectionManager): void;
+		/**
+		* Sets the dimensions of a sub - rectangle within a video.
+		* @param left The left position of the rectangle.
+		* @param top The top position of the rectangle.
+		* @param right The right position of the rectangle.
+		* @param bottom The bottom position of the rectangle.
+		**/
+		msSetVideoRectangle(left: number, top: number, right: number, bottom: number): void;
+		/**
+		* Pauses playback of the current media source.
+		**/
+		pause(): void;
+		/**
+		* Loads and starts playback of the current media source.
+		**/
+		play(): void;
+		/**
+		* Resets the playback rate and resumes playing the current media source.
+		**/
+		playResume(): void;
+		/**
+		* Removes the specified CSS class from the host element.
+		* @param name The name of the class to remove. Multiple classes can be removed using space-delimited names.
+		**/
+		removeClass(name: string): void;
+		/**
+		* Removes an event listener from the media player control.
+		* @param type The type (name) of the event. You can use any of the following: "". //TODO
+		* @param eventHandler The listener to remove.
+		**/
+		removeEventListener(eventName: string, eventHandler: Function): void;
+		/**
+		* Supports instant replay by applying an offset to the current playback position.
+		**/
+		replay(): void;
+		/**
+		* Reloads the current media source and resumes where playback was left off.
+		**/
+		retry(): void;
+		/**
+		* Stops playback and raises the stopped event.
+		**/
+		stop(): void;
+		/**
+		* Updates the player and its plugins with the specified media source(e.g.the current playlist item).
+		* @param mediaSource A JSON object containing the set of options that represent a media source.
+		**/
+		update(mediaSource: Object): void;
+	}
+
+	class DynamicTextTrack {
+		stream: any;
+		label: string;
+		language: string;
+		augmentPayload(payload: any, startTime: number, endTime: number): void;
+	}
+
+	namespace UI {
+		class Button {
+			element: HTMLElement;
+			type: string;
+			content: string;
+			hoverContent: string;
+			label: string;
+			tooltip: string;
+			disabled: boolean;
+			hidden: boolean;
+			flyout: Element;
+		}
+
+		class ControlPanel {
+			element: HTMLElement;
+			hidden: boolean;
+			isPlayPauseHidden: boolean;
+			isPlayResumeHidden: boolean;
+			isPauseHidden: boolean;
+			isReplayHidden: boolean;
+			isRewindHidden: boolean;
+			isFastForwardHidden: boolean;
+			isSlowMotionHidden: boolean;
+			isSkipPreviousHidden: boolean;
+			isSkipNextHidden: boolean;
+			isSkipBackHidden: boolean;
+			isSkipAheadHidden: boolean;
+			isElapsedTimeHidden: boolean;
+			isRemainingTimeHidden: boolean;
+			isTotalTimeHidden: boolean;
+			isTimelineHidden: boolean;
+			isGoLiveHidden: boolean;
+			isCaptionsHidden: boolean;
+			isAudioHidden: boolean;
+			isVolumeMuteHidden: boolean;
+			isVolumeHidden: boolean;
+			isMuteHidden: boolean;
+			isFullScreenHidden: boolean;
+			isStopHidden: boolean;
+			isInfoHidden: boolean;
+			isMoreHidden: boolean;
+			isZoomHidden: boolean;
+			isSignalStrengthHidden: boolean;
+			isMediaQualityHidden: boolean;
+			flyoutContainerElement: HTMLElement;
+		}
+
+		class Indicator {
+			element: HTMLElement;
+			value: string;
+			label: string;
+			tooltip: string;
+			disabled: boolean;
+			hidden: boolean;
+		}
+
+		class Meter {
+			element: HTMLElement;
+			value: number;
+			label: string;
+			tooltip: string;
+			disabled: boolean;
+			hidden: boolean;
+		}
+
+		class Slider {
+			element: HTMLElement;
+			min: number;
+			max: number;
+			value: number;
+			progress: number;
+			step: number;
+			altStep1: number;
+			altStep2: number;
+			altStep3: number;
+			label: string;
+			tooltip: string;
+			vertical: boolean;
+			disabled: boolean;
+			hidden: boolean;
+			markers: Array<any>;
+			thumbnailImageSrc: string;
+			isThumbnailVisible: boolean;
+		}
+
+
+	}
+}
+
+declare namespace PlayerFramework.Advertising {
+	interface AdvertisementBase {
+		source: any;
+	}
+
+	class PrerollAdvertisement implements AdvertisementBase {
+		source: any;
+	}
+
+	class MidrollAdvertisement implements AdvertisementBase {
+		source: any;
+		time: number;
+		timePercentage: number;
+	}
+}
+
+
+declare namespace Microsoft.VideoAdvertising {
+	class VastAdPayloadHandler {
+		static adType: string;
+	}
+
+	class Extensions {
+		static defaultUserAgent: string;
+	}
+}
+
+declare namespace Microsoft.PlayerFramework.Js.Advertising {
+	/**
+	* Provides an ad source that requires a Url to be downloaded and turned into a stream before passing to the ad handler.
+	**/
+	class RemoteAdSource {
+
+	}
+}
diff --git a/playerframework/playerFramework-tests.ts b/playerframework/playerFramework-tests.ts
index 9d1d7921a9..dd146e19b3 100644
--- a/playerframework/playerFramework-tests.ts
+++ b/playerframework/playerFramework-tests.ts
@@ -1,6 +1,4 @@
-///<reference path="playerFramework.d.ts" />
-
-var el = document.createElement("div");
+var el = document.createElement("div");
 var player = new PlayerFramework.MediaPlayer(el);
 
 // Getters
diff --git a/playerframework/playerFramework.d.ts b/playerframework/playerFramework.d.ts
deleted file mode 100644
index 98b9ae67b9..0000000000
--- a/playerframework/playerFramework.d.ts
+++ /dev/null
@@ -1,1965 +0,0 @@
-// Type definitions for Player Framework (MMPPF)
-// Project: https://playerframework.codeplex.com/
-// Definitions by: Ricardo Sabino <https://github.com/ricardosabino>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-///<reference path="../winrt/winrt.d.ts"/>
-
-declare namespace PlayerFramework {
-
-	// Enumerations
-	enum AdvertisingState {
-		/**
-		* No ad is loading or playing.
-		**/
-		none = 0,
-		/**
-		* An ad is loading.
-		**/
-		loading = 1,
-		/**
-		* A linear ad is playing.
-		**/
-		linear = 2,
-		/**
-		* A non-linear ad is playing.
-		**/
-		nonLinear = 3
-	}
-
-
-	enum AutohideBehavior {
-		/**
-		* No behaviors are applied to the autohide feature.
-		**/
-		none = 0,
-		/**
-		* Autohide is allowed during media playback only.
-		**/
-		allowDuringPlaybackOnly = 1,
-		/**
-		* Autohide is prevented when the pointer is over interactive components such as the control panel.
-		**/
-		preventDuringInteractiveHover = 2,
-		/**
-		* All behaviors are applied to the autohide feature.
-		**/
-		all = 3
-	}
-
-	enum InteractionType {
-		/**
-		* Indicates no interaction.
-		**/
-		none = 0,
-		/**
-		* Indicates a "soft" interaction such as mouse movement or a timeout occurring.
-		**/
-		soft = 1,
-		/**
-		* Indicates a "hard" interaction such as a tap, click, or a key is pressed.
-		**/
-		hard = 2,
-		/**
-		* Indicates both "soft" and "hard" interactions.
-		**/
-		all = 3
-	}
-
-	enum NetworkState {
-		/**
-		* The player has not yet initialized any audio/video.
-		**/
-		empty = 0,
-		/**
-		* The player has active audio/video and has selected a resource, but is not using the network.
-		**/
-		idle = 1,
-		/**
-		* The player is downloading data.
-		**/
-		loading = 2,
-		/**
-		* The player has no audio/video source.
-		**/
-		noSource = 3
-	}
-
-	enum MediaQuality {
-		/**
-		* Typically indicates less than 720p media quality.
-		**/
-		standardDefinition = 0,
-		/**
-		* Typically indicates greater than or equal to 720p media quality.
-		**/
-		highDefinition = 1
-	}
-
-	enum PlayerState {
-		/**
-		* The player is unloaded and no media source is set.
-		**/
-		unloaded = 0,
-		/**
-		* The media source is set and the player is waiting to load the media (e.g. autoload is false).
-		**/
-		pending = 1,
-		/**
-		* The media source is set, but the player is still executing loading operations.
-		**/
-		loading = 2,
-		/**
-		* The media has finished loading, but has not been opened yet.
-		**/
-		loaded = 3,
-		/**
-		* The media can be played.
-		**/
-		opened = 4,
-		/**
-		* The media has been told to start playing, but the player is still executing starting operations.
-		**/
-		starting = 5,
-		/**
-		* The media has been started and the player is either playing or paused.
-		**/
-		started = 6,
-		/**
-		* The media has finished, but the player is still executing ending operations.
-		**/
-		ending = 7,
-		/**
-		* The media has ended.
-		**/
-		ended = 8,
-		/**
-		* The media has failed and the player must be reloaded.
-		**/
-		failed = 9,
-	}
-
-	enum ReadyState  {
-		/**
-		* The player has no information for the audio/video
-		**/
-		nothing = 0,
-		/**
-		* The player has metadata for the audio/video.
-		**/
-		metadata = 1,
-		/**
-		* The player has data for the current playback position, but not enough data to play the next frame.
-		**/
-		currentData = 2,
-		/**
-		* The player has data for the current playback position and at least the next frame.
-		**/
-		futureData = 3,
-		/**
-		* The player has enough data available to start playing.
-		**/
-		enoughData = 4
-	}
-
-	enum MediaErrorCode {
-		/**
-		* An unknown media error occurred.
-		**/
-		unknown = 0,
-		/**
-		* Media playback was aborted.
-		**/
-		aborted = 1,
-		/**
-		* Media download failed due to a network error.
-		**/
-		network = 2,
-		/**
-		* Media playback was aborted due to a corruption problem or because unsupported features were used.
-		**/
-		decode = 3,
-		/**
-		* Media source could not be loaded either because the server or network failed or because the format is not supported.
-		**/
-		notSupported = 4
-	}
-
-	enum ImageErrorCode {
-		/**
-		* An unknown image error occurred.
-		**/
-		unknown = 0,
-		/**
-		* Image download was aborted.
-		**/
-		aborted = 1
-	}
-
-	class TextTrackMode {
-		/**
-		* The track is disabled.
-		**/
-		static off: string;
-		/**
-        * The track is active, but the player is not actively displaying cues.
-		**/
-        static hidden: string;
-		/**
-		* The track is active and the player is actively displaying cues.
-		**/
-		static showing: string;
-	}
-
-	enum TextTrackDisplayMode {
-		/**
-		* Indicates tracks should not be displayed.
-		*/
-		none = 0,
-		/**
-		* Indicates tracks should be displayed using custom UI.
-		*/
-		custom = 1,
-		/**
-		* Indicates tracks should be displayed using native UI.
-		*/
-		native = 2,
-		/**
-		* Indicates tracks should be displayed using both custom and native UI. This is useful for debugging.
-		*/
-		all = 3
-	}
-
-	enum TextTrackReadyState {
-		/**
-		* The track is unloaded.
-		*/
-		none = 0,
-		/**
-		* The track is currently loading.
-		*/
-		loading = 1,
-		/**
-		* The track is loaded.
-		*/
-		loaded = 2,
-		/**
-		* The track failed to load.
-		*/
-		error = 3
-	}
-
-	enum ViewModelState {
-		/**
-		* No media is loaded.
-		*/
-		unloaded = 0,
-		/**
-		* The media is loading.
-		*/
-		loading = 1,
-		/**
-		* The media is paused.
-		*/
-		paused = 2,
-		/**
-		* The media is playing.
-		*/
-		playing = 3
-	}
-
-
-
-	interface PlaylistItem {
-		src: string;
-		tracks?: Array<any>; //TODO
-	}
-
-	class PluginBase {
-		isEnabled: boolean;
-		isLoaded: boolean;
-		isActive: boolean;
-		mediaPlayer: MediaPlayer;
-		currentMediaSource: MediaSource;
-
-		load(): void;
-		unload(): void;
-		update(mediaSource: MediaSource): void;
-	}
-
-	namespace Plugins {
-
-		class TrackingPluginBase extends PluginBase {
-			trackingEvents: Array<any>;
-
-		}
-
-		class BufferingPlugin extends PluginBase {
-			hide(): void;
-			show(): void;
-		}
-
-		class ControlPlugin extends PluginBase {
-			compactThresholdInInches(): number;
-			hide(): void;
-			isCompact(): boolean;
-			orientation(): string;
-			show(): void;
-		}
-
-		class ErrorPlugin extends PluginBase {
-			hide(): void;
-			show(): void;
-		}
-
-		class LoaderPlugin extends PluginBase {
-			hide(): void;
-			show(): void;
-		}
-
-		/**
-		*
-		**/
-		class PlaylistPlugin extends PluginBase {
-			/**
-			*
-			**/
-			autoAdvance: boolean;
-			/**
-			*
-			**/
-			currentPlaylistItem: PlaylistItem;
-			/**
-			*
-			**/
-			currentPlaylistItemIndex: number;
-			/**
-			*
-			**/
-			playlist: Array<PlaylistItem>;
-			/**
-			*
-			**/
-			startupPlaylistItemIndex: number;
-			/**
-			*
-			**/
-			skipBackThreshold: number;
-
-			// Methods
-			goToPreviousPlaylistItem(): void;
-			goToNextPlaylistItem(): void;
-			canGoToPreviousPlaylistItem(): boolean;
-			canGoToNextPlaylistItem(): boolean;
-		}
-
-		class PlayTimeTrackingPlugin extends PluginBase {
-			playTime: number;
-			playTimePercentage: number;
-		}
-
-		class PositionTrackingPlugin extends PluginBase {
-			evaluateOnForwardOnly: boolean;
-			position: number;
-			positionPercentage: number;
-		}
-
-		class SystemTransportControlsPlugin extends PluginBase {
-			isPreviousTrackEnabled: boolean;
-			isNextTrackEnabled: boolean;
-			nextTrackExists: boolean;
-			previousTrackExists: boolean;
-		}
-
-		class ChaptersPlugin extends PluginBase {
-			defaultChapterCount: number;
-			autoCreateDefaultChapters: boolean;
-			autoCreateChaptersFromTextTracks: boolean;
-			visualMarkerClass: string;
-		}
-
-		class DisplayRequestPlugin extends PluginBase {
-			isRequestActive: boolean;
-		}
-
-		class CaptionSelectorPlugin extends PluginBase {
-			hide(): void;
-			show(): void;
-
-			/**
-			* Not available in phone.
-			**/
-			alignment: string;
-			/**
-			* Not available in phone.
-			**/
-			anchor: HTMLElement;
-			/**
-			* Not available in phone.
-			**/
-			placement: string;
-		}
-
-		class AudioSelectorPlugin extends PluginBase {
-			hide(): void;
-			show(): void;
-
-			/**
-			* Not available in phone.
-			**/
-			alignment: string;
-			/**
-			* Not available in phone.
-			**/
-			anchor: HTMLElement;
-			/**
-			* Not available in phone.
-			**/
-			placement: string;
-		}
-	}
-
-	/**
-	*
-	**/
-	class InteractiveViewModel {
-		/**
-		* TODO
-		**/
-		state: ViewModelState;
-		/**
-		* TODO
-		**/
-		startTime: number;
-		/**
-		* TODO
-		**/
-		maxTime: number;
-		/**
-		* TODO
-		**/
-		endTime: number;
-		/**
-		* TODO
-		**/
-		currentItem: number;
-		/**
-		* TODO
-		**/
-		bufferedPercentage: number;
-		/**
-		* TODO
-		**/
-		playPouseIcon: string;
-		/**
-		* TODO
-		**/
-		playPauseLabel: string;
-		/**
-		* TODO
-		**/
-		playPauseTooltip: string;
-		/**
-		* TODO
-		**/
-		isPlayPauseDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isPlayPauseHidden: boolean;
-		/**
-		* TODO
-		**/
-		playResumeIcon: string;
-		/**
-		* TODO
-		**/
-		playResumeLabel: string;
-		/**
-		* TODO
-		**/
-		playResumeTooltip: string;
-		/**
-		* TODO
-		**/
-		isPlayResumeDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isPlayResumeHidden: boolean;
-		/**
-		* TODO
-		**/
-		pauseIcon: string;
-		/**
-		* TODO
-		**/
-		pauseLabel: string;
-		/**
-		* TODO
-		**/
-		pauseTooltip: string;
-		/**
-		* TODO
-		**/
-		isPauseDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isPauseHidden: boolean;
-		/**
-		* TODO
-		**/
-		replayIcon: string;
-		/**
-		* TODO
-		**/
-		replayLabel: string;
-		/**
-		* TODO
-		**/
-		replayTooltip: string;
-		/**
-		* TODO
-		**/
-		isReplayDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isReplayHidden: boolean;
-		/**
-		* TODO
-		**/
-		rewindIcon: string;
-		/**
-		* TODO
-		**/
-		rewindLabel: string;
-		/**
-		* TODO
-		**/
-		rewindTooltip: string;
-		/**
-		* TODO
-		**/
-		isRewindDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isRewindHidden: boolean;
-		/**
-		* TODO
-		**/
-		fastForwardIcon: string;
-		/**
-		* TODO
-		**/
-		fastForwardLabel: string;
-		/**
-		* TODO
-		**/
-		fastForwardTooltip: string;
-		/**
-		* TODO
-		**/
-		isFastForwardDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isFastForwardHidden: boolean;
-		/**
-		* TODO
-		**/
-		slowMotionIcon: string;
-		/**
-		* TODO
-		**/
-		slowMotionLabel: string;
-		/**
-		* TODO
-		**/
-		slowMotionTooltip: string;
-		/**
-		* TODO
-		**/
-		isSlowMotionDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isSlowMotionHidden: boolean;
-		/**
-		* TODO
-		**/
-		skipPreviousIcon: string;
-		/**
-		* TODO
-		**/
-		skipPreviousLabel: string;
-		/**
-		* TODO
-		**/
-		skipPreviousTooltip: string;
-		/**
-		* TODO
-		**/
-		isSkipPreviousDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isSkipPreviousHidden: boolean;
-		/**
-		* TODO
-		**/
-		skipNextIcon: string;
-		/**
-		* TODO
-		**/
-		skipNextLabel: string;
-		/**
-		* TODO
-		**/
-		skipNextTooltip: string;
-		/**
-		* TODO
-		**/
-		isSkipNextDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isSkipNextHidden: boolean;
-		/**
-		* TODO
-		**/
-		skipBackIcon: string;
-		/**
-		* TODO
-		**/
-		skipBackLabel: string;
-		/**
-		* TODO
-		**/
-		skipBackTooltip: string;
-		/**
-		* TODO
-		**/
-		isSkipBackDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isSkipBackHidden: boolean;
-		/**
-		* TODO
-		**/
-		skipAheadIcon: string;
-		/**
-		* TODO
-		**/
-		skipAheadLabel: string;
-		/**
-		* TODO
-		**/
-		skipAheadTooltip: string;
-		/**
-		* TODO
-		**/
-		isSkipAheadDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isSkipAheadHidden: boolean;
-		/**
-		* TODO
-		**/
-		elapsedTime: number;
-		/**
-		* TODO
-		**/
-		elapsedTimeText: string;
-		/**
-		* TODO
-		**/
-		elapsedTimeLabel: string;
-		/**
-		* TODO
-		**/
-		elapsedTimeTooltip: string;
-		/**
-		* TODO
-		**/
-		isElapsedTimeDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isElapsedTimeHidden: boolean;
-		/**
-		* TODO
-		**/
-		remainingTime: number;
-		/**
-		* TODO
-		**/
-		remainingTimeText: string;
-		/**
-		* TODO
-		**/
-		remainingTimeLabel: string;
-		/**
-		* TODO
-		**/
-		remainingTimeTooltip: string;
-		/**
-		* TODO
-		**/
-		isRemainingTimeDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isRemainingTimeHidden: boolean;
-		/**
-		* TODO
-		**/
-		totalTime: number;
-		/**
-		* TODO
-		**/
-		totalTimeText: string;
-		/**
-		* TODO
-		**/
-		totalTimeLabel: string;
-		/**
-		* TODO
-		**/
-		totalTimeTooltip: string;
-		/**
-		* TODO
-		**/
-		isTotalTimeDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isTotalTimeHidden: boolean;
-		/**
-		* TODO
-		**/
-		timelineLabel: string;
-		/**
-		* TODO
-		**/
-		timelineTooltip: string;
-		/**
-		* TODO
-		**/
-		isTimelineDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isTimelineHidden: boolean;
-		/**
-		* TODO
-		**/
-		goLiveText: string;
-		/**
-		* TODO
-		**/
-		goLiveLabel: string;
-		/**
-		* TODO
-		**/
-		goLiveTooltip: string;
-		/**
-		* TODO
-		**/
-		isGoLiveDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isGoLiveHidden: boolean;
-		/**
-		* TODO
-		**/
-		captionsIcon: string;
-		/**
-		* TODO
-		**/
-		captionsLabel: string;
-		/**
-		* TODO
-		**/
-		captionsTooltip: string;
-		/**
-		* TODO
-		**/
-		isCaptionsDisabled: boolean;
-		/**
-		* TODO
-		**/
-		audioIcon: string;
-		/**
-		* TODO
-		**/
-		audioLabel: string;
-		/**
-		* TODO
-		**/
-		audioTooltip: string;
-		/**
-		* TODO
-		**/
-		isAudioDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isAudioHidden: boolean;
-		/**
-		* TODO
-		**/
-		volume: number;
-		/**
-		* TODO
-		**/
-		volumeMuteIcon: string;
-		/**
-		* TODO
-		**/
-		volumeMuteLabel: string;
-		/**
-		* TODO
-		**/
-		volumeMuteTooltip: string;
-		/**
-		* TODO
-		**/
-		isVolumeMuteDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isVolumeMuteHidden: boolean;
-		/**
-		* TODO
-		**/
-		volumeIcon: string;
-		/**
-		* TODO
-		**/
-		volumeLabel: string;
-		/**
-		* TODO
-		**/
-		volumeTooltip: string;
-		/**
-		* TODO
-		**/
-		isVolumeDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isVolumeHidden: boolean;
-		/**
-		* TODO
-		**/
-		muteIcon: string;
-		/**
-		* TODO
-		**/
-		muteLabel: string;
-		/**
-		* TODO
-		**/
-		muteTooltip: string;
-		/**
-		* TODO
-		**/
-		isMuteDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isMuteHidden: boolean;
-		/**
-		* TODO
-		**/
-		fullScreenIcon: string;
-		/**
-		* TODO
-		**/
-		fullScreenLabel: string;
-		/**
-		* TODO
-		**/
-		fullScreenTooltip: string;
-		/**
-		* TODO
-		**/
-		isFullScreenDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isFullScreenHidden: boolean;
-		/**
-		* TODO
-		**/
-		stopIcon: string;
-		/**
-		* TODO
-		**/
-		stopLabel: string;
-		/**
-		* TODO
-		**/
-		stopTooltip: string;
-		/**
-		* TODO
-		**/
-		isStopDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isStopHidden: boolean;
-		/**
-		* TODO
-		**/
-		infoIcon: string;
-		/**
-		* TODO
-		**/
-		infoLabel: string;
-		/**
-		* TODO
-		**/
-		infoTooltip: string;
-		/**
-		* TODO
-		**/
-		isInfoDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isInfoHidden: boolean;
-		/**
-		* TODO
-		**/
-		moreIcon: string;
-		/**
-		* TODO
-		**/
-		moreLabel: string;
-		/**
-		* TODO
-		**/
-		moreTooltip: string;
-		/**
-		* TODO
-		**/
-		isMoreDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isMoreHidden: boolean;
-		/**
-		* TODO
-		**/
-		zoomIcon: string;
-		/**
-		* TODO
-		**/
-		zoomLabel: string;
-		/**
-		* TODO
-		**/
-		zoomTooltip: string;
-		/**
-		* TODO
-		**/
-		isZoomDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isZoomHidden: boolean;
-		/**
-		* TODO
-		**/
-		signalStrength: number;
-		/**
-		* TODO
-		**/
-		signalStrengthLabel: string;
-		/**
-		* TODO
-		**/
-		signalStrengthTooltip: string;
-		/**
-		* TODO
-		**/
-		isSignalStrengthDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isSignalStrengthHidden: boolean;
-		/**
-		* TODO
-		**/
-		mediaQuality: MediaQuality;
-		/**
-		* TODO
-		**/
-		mediaQualityLabel: string;
-		/**
-		* TODO
-		**/
-		mediaQualityTooltip: string;
-		/**
-		* TODO
-		**/
-		isMediaQualityDisabled: boolean;
-		/**
-		* TODO
-		**/
-		isMediaQualityHidden: boolean;
-		/**
-		* TODO
-		**/
-		visualMarkers: Array<any>;
-		/**
-		* TODO
-		**/
-		thumbnailImageSrc: string;
-		/**
-		* TODO
-		**/
-		isThumbnailVisible: boolean;
-		/**
-		* TODO
-		**/
-		mediaMetadata: Object;
-
-
-		uninitialize(): void;
-		playPause(e?: any): void;
-		playResume(): void;
-		pause(): void;
-		replay(): void;
-		rewind(): void;
-		fastForward(): void;
-		slowMotion(): void;
-		skipPrevious(): void;
-		skipNext(): void;
-		skipBack(): void;
-		skipAhead(): void;
-		startScrub(time: number): void;
-		updateScrub(time: number): void;
-		completeScrub(time: number): void;
-		goLive(): void;
-		setVolume(volume: number): void;
-		toggleMutted(): void;
-		toggleFullScreen(): void;
-		stop(): void;
-		info(): void;
-		more(): void;
-		toggleZoom(): void;
-		captions(): void;
-		audio(): void;
-		onTimelineSliderStart(e: any): void;
-		onTimelineSliderUpdate(e: any): void;
-		onTimelineSliderComplete(e: any): void;
-		onTimelineSliderSkipToMarker(e: any): void;
-		onVolumeSliderUpdate(e: any): void;
-		onVolumeMuteClick(e: any): void;
-		onVolumeMuteFocus(e: any): void;
-		onVolumeMuteSliderUpdate(e: any): void;
-		onVolumeMuteSliderFocusIn(e: any): void;
-		onVolumeMuteSliderFocusOut(e: any): void;
-		onVolumeMuteSliderMSPointerOver(e: any): void;
-		onVolumeMuteSliderMSPointerOut(e: any): void;
-		onVolumeMuteSliderTransitionEnd(e: any): void;
-	}
-
-	/**
-	*
-	**/
-	class MediaPlayer {
-		constructor(element: HTMLElement, options?: any);
-		/**
-		* Gets or sets the current advertising state of the player.
-		**/
-		advertisingState: AdvertisingState;
-		/**
-		* Gets the audio tracks for the current media source.
-		**/
-		audioTracks: Array<any>;
-
-		/**
-		* Gets or sets a value that indicates whether to automatically start buffering the current media source.
-		**/
-		autobuffer: boolean;
-		/**
-		* Gets or sets a value that specifies whether interactive elements(e.g.the control panel) will be hidden automatically.
-		**/
-		autohide: boolean;
-		/**
-		* Gets or sets the behavior of the autohide feature.
-		**/
-		autohideBehavior: AutohideBehavior;
-		/**
-		* Gets or sets the amount of time (in seconds) before interactive elements(e.g.the control panel) will be hidden automatically.
-		**/
-		autohideTime: number;
-		/**
-		* Gets or sets a value that specifies whether to start loading the current media source automatically.
-		**/
-		autoload: boolean;
-		/**
-		* Gets or sets a value that specifies whether to automatically start playing the current media source.
-		**/
-		autoplay: boolean;
-		/**
-		* Gets the buffered time ranges for the current media source.
-		**/
-		buffered: Array<any>; //TODO: (type: TimeRanges, read - only)
-		/**
-		* Gets the caption and subtitle tracks for the current media source.
-		**/
-		captionTracks: Array<any>;
-		/**
-		* Gets or sets a value that specifies whether to display the native controls for the current media source.
-		**/
-		controls: boolean;
-		/**
-		* Gets or sets the current audio track.
-		**/
-		currentAudioTrack: any; //TODO: (type: AudioTrack, read / write)
-		/**
-		* Gets or sets the current caption / subtitle track.
-		**/
-		currentCaptionTrack: any; //TODO: (type: TextTrack, read / write)
-		/**
-		* Gets the URL of the current media source.
-		**/
-		currentSrc: string;
-		/**
-		* Gets or sets the current playback position (in seconds).
-		**/
-		currentTime: number;
-		/**
-		* Gets the view model that will be restored following a temporary change to the current interactive view model(e.g.during an ad).
-		**/
-		defaultInteractiveViewModel: InteractiveViewModel;
-		/**
-		* Gets or sets the playback rate to use when play is resumed.
-		**/
-		defaultPlaybackRate: number;
-		/**
-		* Gets the duration (in seconds) of the current media source.
-		**/
-		duration: number;
-		/**
-		* Gets the host element for the control.
-		**/
-		element: HTMLElement;
-		/**
-		* Gets a value that specifies whether playback has ended.
-		**/
-		ended: boolean;
-		/**
-		* Gets or sets the end time (in seconds) of the current media source.This is useful in live streaming scenarios.
-		**/
-		endTime: number;
-		/**
-		* Gets the current error state of the player.
-		**/
-		error: MediaError;
-		/**
-		* Gets or sets the height of the host element.
-		**/
-		height: string;
-		/**
-		* Gets the earliest possible position (in seconds) that playback can begin.
-		**/
-		initialTime: number;
-		/**
-		* Gets or sets the type of interactions that will cause interactive elements(e.g.the control panel) to be shown.
-		**/
-		interactiveActivationMode: InteractionType;
-		/**
-		* Gets or sets the type of interactions that will cause interactive elements(e.g.the control panel) to be hidden.
-		**/
-		interactiveDeactivationMode: InteractionType;
-		/**
-		* Gets or sets the view model that interactive elements are bound to(e.g.the control panel).
-		**/
-		interactiveViewModel: InteractiveViewModel;
-		/**
-		* Gets a value that specifies whether interaction with the audio control is allowed based on the current state of the player.
-		**/
-		isAudioAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the audio control is enabled.
-		**/
-		isAudioEnabled: boolean;
-		/**
-		* Gets or sets a value that specifies whether the audio control is visible.
-		**/
-		isAudioVisible: boolean;
-		/**
-		* Gets a value that specifies whether interaction with the captions control is allowed based on the current state of the player.
-		**/
-		isCaptionsAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the captions control is enabled.
-		**/
-		isCaptionsEnabled: boolean; //TODO: READ-ONLY
-		/**
-		* Gets or sets a value that specifies whether the captions control is visible.
-		**/
-		isCaptionsVisible: boolean;
-		/**
-		* Gets a value that specifies whether the current playback position is "live".
-		**/
-		isCurrentTimeLive: boolean;
-		/**
-		* Gets a value that specifies whether interaction with the elapsed time control is allowed based on the current state of the player.
-		**/
-		isElapsedTimeAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the elapsed time control is enabled.
-		**/
-		isElapsedTimeEnabled: boolean;
-		/**
-		* Gets or sets a value that specifies whether the elapsed time control is visible.
-		**/
-		isElapsedTimeVisible: boolean;
-		/**
-		* Gets a value that specifies whether interaction with the fast forward control is allowed based on the current state of the player.
-		**/
-		isFastForwardAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the fast forward control is enabled.
-		**/
-		isFastForwardEnabled: boolean;
-		/**
-		* Gets or sets a value that specifies whether the fast forward control is visible.
-		**/
-		isFastForwardVisible: boolean;
-		/**
-		* Gets or sets a value that specifies whether the player is in full screen mode.
-		**/
-		isFullScreen: boolean;
-		/**
-		* Gets a value that specifies whether interaction with the full screen control is allowed based on the current state of the player.
-		**/
-		isFullScreenAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the full screen control is enabled.
-		**/
-		isFullScreenEnabled: boolean;
-		/**
-		* Gets or sets a value that specifies whether the full screen control is visible.
-		**/
-		isFullScreenVisible: boolean;
-		/**
-		* Gets a value that specifies whether interaction with the go live control is allowed based on the current state of the player.
-		**/
-		isGoLiveAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the go live control is enabled.
-		**/
-		isGoLiveEnabled: boolean;
-		/**
-		* Gets or sets a value that specifies whether the go live control is visible.
-		**/
-		isGoLiveVisible: boolean;
-		/**
-		* Gets or sets a value that specifies whether the player is currently in interactive mode(e.g.showing the control panel).
-		**/
-		isInteractive: boolean;
-		/**
-		* Gets a value that specifies whether the current media source is a live stream.
-		**/
-		isLive: boolean;
-		/**
-		* Gets a value that specifies whether interaction with the media quality control is allowed based on the current state of the player.
-		**/
-		isMediaQualityAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the media quality control is enabled.
-		**/
-		isMediaQualityEnabled: boolean;
-		/**
-		* Gets or sets a value that specifies whether the media quality control is visible.
-		**/
-		isMediaQualityVisible: boolean;
-		/**
-		* Gets a value that specifies whether interaction with the mute control is allowed based on the current state of the player.
-		**/
-		isMuteAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the mute control is enabled.
-		**/
-		isMuteEnabled: boolean;
-		/**
-		* Gets or sets a value that specifies whether the mute control is visible.
-		**/
-		isMuteVisible: boolean;
-		/**
-		* Gets a value that specifies whether interaction with the pause control is allowed based on the current state of the player.
-		**/
-		isPauseAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the pause control is enabled.
-		**/
-		isPauseEnabled: boolean;
-		/**
-		* Gets or sets a value that specifies whether the pause control is visible.
-		**/
-		isPauseVisible: boolean;
-		/**
-		* Gets a value that specifies whether interaction with the play / pause control is allowed based on the current state of the player.
-		**/
-		isPlayPauseAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the play / pause control is enabled.
-		**/
-		isPlayPauseEnabled: boolean;
-		/**
-		* Gets or sets a value that specifies whether the play / pause control is visible.
-		**/
-		isPlayPauseVisible: boolean;
-		/**
-		* Gets a value that specifies whether interaction with the play / resume control is allowed based on the current state of the player.
-		**/
-		isPlayResumeAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the play / resume control is enabled.
-		**/
-		isPlayResumeEnabled: boolean;
-		/**
-		* Gets or sets a value that specifies whether the play / resume control is visible.
-		**/
-		isPlayResumeVisible: boolean;
-		/**
-		* Gets a value that specifies whether interaction with the remaining time control is allowed based on the current state of the player.
-		**/
-		isRemainingTimeAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the remaining time control is enabled.
-		**/
-		isRemainingTimeEnabled: boolean;
-		/**
-		* Gets or sets a value that specifies whether the remaining time control is visible.
-		**/
-		isRemainingTimeVisible: boolean;
-		/**
-		* Gets a value that specifies whether interaction with the replay control is allowed based on the current state of the player.
-		**/
-		isReplayAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the replay control is enabled.
-		**/
-		isReplayEnabled: boolean;
-		/**
-		* Gets or sets a value that specifies whether the replay control is visible.
-		**/
-		isReplayVisible: boolean;
-		/**
-		* Gets a value that specifies whether interaction with the rewind control is allowed based on the current state of the player.
-		**/
-		isRewindAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the rewind control is enabled.
-		**/
-		isRewindEnabled: boolean;
-		/**
-		* Gets or sets a value that specifies whether the rewind control is visible.
-		**/
-		isRewindVisible: boolean;
-		/**
-		* Gets a value that specifies whether interaction with the signal strength control is allowed based on the current state of the player.
-		**/
-		isSignalStrengthAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the signal strength control is enabled.
-		**/
-		isSignalStrengthEnabled: boolean;
-		/**
-		* Gets or sets a value that specifies whether the signal strength control is visible.
-		**/
-		isSignalStrengthVisible: boolean;
-		/**
-		* Gets a value that specifies whether interaction with the skip ahead control is allowed based on the current state of the player.
-		**/
-		isSkipAheadAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the skip ahead control is enabled.
-		**/
-		isSkipAheadEnabled: boolean;
-		/**
-		* Gets or sets a value that specifies whether the skip ahead control is visible.
-		**/
-		isSkipAheadVisible: boolean;
-		/**
-		* Gets a value that specifies whether interaction with the skip back control is allowed based on the current state of the player.
-		**/
-		isSkipBackAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the skip back control is enabled.
-		**/
-		isSkipBackEnabled: boolean;
-		/**
-		* Gets or sets a value that specifies whether the skip back control is visible.
-		**/
-		isSkipBackVisible: boolean;
-		/**
-		* Gets a value that specifies whether interaction with the skip next control is allowed based on the current state of the player.
-		**/
-		isSkipNextAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the skip next control is enabled.
-		**/
-		isSkipNextEnabled: boolean;
-		/**
-		* Gets or sets a value that specifies whether the skip next control is visible.
-		**/
-		isSkipNextVisible: boolean;
-		/**
-		* Gets a value that specifies whether interaction with the skip previous control is allowed based on the current state of the player.
-		**/
-		isSkipPreviousAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the skip previous control is enabled.
-		**/
-		isSkipPreviousEnabled: boolean;
-		/**
-		* Gets or sets a value that specifies whether the skip previous control is visible.
-		**/
-		isSkipPreviousVisible: boolean;
-		/**
-		* Gets or sets a value that specifies whether the player is playing in slow motion.
-		**/
-		isSlowMotion: boolean;
-		/**
-		* Gets a value that specifies whether interaction with the slow motion control is allowed based on the current state of the player.
-		**/
-		isSlowMotionAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the slow motion control is enabled.
-		**/
-		isSlowMotionEnabled: boolean;
-		/**
-		* Gets or sets a value that specifies whether the slow motion control is visible.
-		**/
-		isSlowMotionVisible: boolean;
-		/**
-		* Gets or sets a value that specifies whether the start time is offset.
-		**/
-		isStartTimeOffset: boolean;
-		/**
-		* Gets a value that specifies whether interaction with the timeline control is allowed based on the current state of the player.
-		**/
-		isTimelineAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the timeline control is enabled.
-		**/
-		isTimelineEnabled: boolean;
-		/**
-		* Gets or sets a value that specifies whether the timeline control is visible.
-		**/
-		isTimelineVisible: boolean;
-		/**
-		* Gets a value that specifies whether interaction with the volume control is allowed based on the current state of the player.
-		**/
-		isVolumeAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the volume control is enabled.
-		**/
-		isVolumeEnabled: boolean;
-		/**
-		* Gets a value that specifies whether interaction with the volume / mute control is allowed based on the current state of the player.
-		**/
-		isVolumeMuteAllowed: boolean;
-		/**
-		* Gets or sets a value that specifies whether the volume / mute control is enabled.
-		**/
-		isVolumeMuteEnabled: boolean;
-		/**
-		* Gets or sets a value that specifies whether the volume / mute control is visible.
-		**/
-		isVolumeMuteVisible: boolean;
-		/**
-		* Gets or sets a value that specifies whether the volume control is visible.
-		**/
-		isVolumeVisible: boolean;
-		/**
-		* Gets or sets the live position (in seconds).
-		**/
-		liveTime: number;
-		/**
-		* Gets or sets the live buffer time (in seconds) for the current playback position to be considered "live".
-		**/
-		liveTimeBuffer: number;
-		/**
-		* Gets or sets a value that specifies whether playback should be restarted after it ends.
-		**/
-		loop: boolean;
-		/**
-		* Gets the media element associated with the player.
-		**/
-		mediaElement: HTMLMediaElement;
-		/**
-		* Gets or sets the media extension manager to be used by the player and its plugins.A new instance will be created on first use if one is not already set.
-		**/
-		mediaExtensionManager: Windows.Media.MediaExtensionManager;
-		/**
-		* Gets or sets the quality of the current media source.
-		**/
-		mediaQuality: MediaQuality;
-		/**
-		* Gets or sets a value that specifies the purpose of the media, such as background audio or alerts.
-		**/
-		msAudioCategory: string;
-		/**
-		* Gets or sets a value that specifies the output device ID that the audio will be sent to.
-		**/
-		msAudioDeviceType: string;
-		/**
-		* Gets or sets a value that specifies whether the media is flipped horizontally.
-		**/
-		msHorizontalMirror: boolean;
-		/**
-		* Gets a value that specifies whether the media can be rendered more efficiently.
-		**/
-		msIsLayoutOptimalForPlayback: boolean;
-		/**
-		* Gets a value that specifies whether the system considers the media to be stereo 3D.
-		**/
-		msIsStereo3D: boolean;
-		/**
-		* Gets or sets a value that specifies whether the DLNA PlayTo device is available.
-		**/
-		msPlayToDisabled: boolean;
-		/**
-		* Gets or sets the primary DLNA PlayTo device.
-		**/
-		msPlayToPrimary: boolean;
-		/**
-		* Gets the media source for use by the PlayToManager.
-		**/
-		msPlayToSource: Object;
-		/**
-		* Gets or sets a value that specifies whether or not to enable low - latency playback.
-		**/
-		msRealTime: boolean;
-		/**
-		* Gets or sets the frame - packing mode for stereo 3D video content.
-		**/
-		msStereo3DPackingMode: string;
-		/**
-		* Gets or sets a value that specifies whether the system display is set to stereo display.
-		**/
-		msStereo3DRenderMode: string;
-		/**
-		* Gets or sets a value that specifies whether the video frame is trimmed to fit the display.
-		**/
-		msZoom: boolean;
-		/**
-		* Gets or sets a value that indicates whether the audio is muted.
-		**/
-		muted: boolean;
-		/**
-		* Gets the current network state for the player.
-		**/
-		networkState: NetworkState;
-		/**
-		* Gets a value that specifies whether playback is paused.
-		**/
-		paused: boolean;
-		/**
-		* Gets or sets the playback rate for the current media source.
-		**/
-		playbackRate: number;
-		/**
-		* Gets the played time ranges for the current media source.
-		**/
-		played: Array<any>; //TODO: (type: TimeRanges, read - only)
-		/**
-		* Gets the playlist plugin.
-		**/
-		playlistPlugin: Plugins.PlaylistPlugin;
-		/**
-		* Gets or sets the current state of the player.
-		**/
-		playerState: PlayerState;
-		/*
-		* Gets the plugins associated with the player.
-		**/
-		plugins: Array<any>; //TODO: (type: ?, read - only)
-		/*
-		* Gets or sets the URL of an image to display while the current media source is loading.
-		**/
-		poster: string;
-		/**
-		** Gets or sets a hint to how much buffering is advisable for the current media source.
-		**/
-		preload: string;
-		/**
-		* Gets the current readiness state of the player.
-		**/
-		readyState: ReadyState;
-		/**
-		* Gets or sets the amount of time (in seconds) to offset the current playback position during replay.
-		**/
-		replayOffset: number;
-		/**
-		* Gets a value that specifies whether the player is currently moving to a new playback position due to a scrub operation.
-		**/
-		scrubbing: boolean; //TODO: (type: Boolean, read - only)
-		/**
-		* Gets the seekable time ranges of the current media source.
-		**/
-		seekable: any; //TODO: (type: TimeRanges, read - only)
-		/**
-		* Gets a value that specifies whether the player is currently moving to a new playback position due to a seek operation.
-		**/
-		seeking: boolean; //TODO: (type: Boolean, read - only)
-		/**
-		* Gets or sets a value that specifies whether the current video frame should be updated during a scrub operation.
-		**/
-		seekWhileScrubbing: boolean;
-		/**
-		* Gets or sets the signal strength of the current media source.This is useful in adaptive streaming scenarios.
-		**/
-		signalStrength: number;
-		/**
-		* Gets or sets the amount of time (in seconds) that the skip ahead control will seek forward.
-		**/
-		skipAheadInterval: number;
-		/**
-		* Gets or sets the amount of time (in seconds) that the skip back control will seek backward.
-		**/
-		skipBackInterval: number;
-		/**
-		* Gets or sets the playback rate to use when in slow motion.
-		**/
-		slowMotionPlaybackRate: number;
-		/**
-		* Gets or sets the media sources to be considered.
-		**/
-		sources: Array<any>; //TODO: (type: Array, read / write)
-		/**
-		* Gets or sets the URL of the current media source to be considered.
-		**/
-		src: string;
-		/**
-		* Gets or sets the start time (in seconds) of the current media source.This is useful in live streaming scenarios.
-		**/
-		startTime: number;
-		/**
-		* Gets or sets the position (in seconds) where playback should start.This is useful for resuming a video where the user left off in a previous session.
-		**/
-		startupTime: number;
-		/**
-		* Gets or sets whether a test for the media feature pack should be performed prior to allowing content to be laoded.This is useful to enable if Windows 8 N / KN users will be using this app.
-		**/
-		testForMediaPack: boolean;
-		/**
-		* Gets the text tracks for the current media source.
-		**/
-		textTracks: any; // TODO: (type: TextTrackList, read - only)
-		/**
-		* Gets or sets the tracks for the player.
-		**/
-		tracks: Array<any>; // TODO: (type: Array, read / write)
-		/**
-		* Gets the intrinsic height of the current video (in pixels).
-		**/
-		videoHeight: number;
-		/**
-		* Gets the intrinsic width of the current video (in pixels).
-		**/
-		videoWidth: number;
-		/**
-		* Gets or sets the volume level(from 0 to 1) for the audio portions of media playback.
-		**/
-		volume: number;
-		/**
-		* Gets or sets the width of the host element.
-		**/
-		width: string;
-
-		/* Methods */
-
-		/**
-		* Adds the specified CSS class to the host element.
-		* @param name The name of the class to add. Multiple classes can be added using space-delimited names.
-		**/
-		addClass(name: string): void;
-		/**
-		* Adds an event listener for the MediaPlayer events.
-		* //TODO
-		* @param type The type (name) of the event. You can use any of the following: "".
-		* @param listener The listener to invoke when the event is raised.
-		* @param capture true to initiate capture, otherwise false.
-		**/
-		addEventListener(type: string, listener: Function, capture?: boolean): void;
-		/**
-		* Create a new TextTrack object to add to an HTML5 video.
-		* @param kind String The type of text track
-		* @param label String A user readable title for a text track
-		* @param language String The BCP47 language tag of the track. For example "en" for English or "fr" for French
-		**/
-		addTextTrack(kind: string, label?: string, language?: string): void;
-		/**
-		* Raises the audioinvoked event used to indicate that an audio selection dialog should be presented to the user (usually in the form of a flyout).
-		**/
-		audio(): void;
-		/**
-		* Returns a value that specifies whether the player can play a given media type.
-		* @param type The type of media to be played.
-		* @returns One of the following values: "probably", "maybe", or an empty string if the media cannot be rendered.
-		**/
-		canPlayType(type: string): string;
-		/**
-		* Raises the captionsinvoked event used to indicate that closed options should be toggled on/off or that a caption selection dialog should be presented to the user (usually in the form of a flyout).
-		**/
-		captions(): void;
-		/**
-		* Decreases the current playback rate by a factor of two.After the rate reaches 1(normal speed), it will flip to - 1, and then begins to rewind.
-		**/
-		decreasePlaybackRate(): void;
-		/**
-		* Shuts down and releases all resources.
-		**/
-		dispose(): void;
-		/**
-		* Gives focus to the host element.
-		**/
-		focus(): void;
-		/**
-		* Increases the current playback rate by a factor of two.After the rate reaches - 1, it flips to 1(normal speed), and then begins to fast forward.
-		**/
-		increasePlaybackRate(): void;
-		/**
-		* Raises the infoinvoked event used to indicate that more information about the current media should be displayed to the user.
-		**/
-		info(): void;
-		/**
-		* Reloads the current media source.
-		**/
-		load(): void;
-		/**
-		* Raises the moreinvoked event typically used to indicate that more options that were unable to fit in the control panel should be presented to the user (usually in the form of a flyout).
-		**/
-		more(): void;
-		/**
-		* Clears all effects from the media pipeline.
-		**/
-		msClearEffects(): void;
-		/**
-		* Steps the video forward or backward by one frame.
-		* @param forward If true, the video is stepped forward, otherwise the video is stepped backward.
-		**/
-		msFrameStep(forward: boolean): void;
-		/**
-		* Inserts the specified audio effect into the media pipeline.
-		* @param activatableClassId The audio effects class.
-		* @param effectRequired
-		* @param config
-		**/
-		msInsertAudioEffect(activatableClassId: string, effectRequired: boolean, config: Object): void;
-		/**
-		* Inserts the specified video effect into the media pipeline.
-		* @param activatableClassId The video effects class.
-		* @param effectRequired
-		* @param config
-		**/
-		msInsertVideoEffect(activatableClassId: string, effectRequired: boolean, config: Object): void
-		/**
-		* Sets the MSMediaKeys to be used for decrypting media data.
-		* @param mediaKeys The media keys to use for decrypting media data.
-		**/
-		msSetMediaKeys(mediaKeys: MSMediaKeys): void;
-		/**
-		* Sets the media protection manager for a given media pipeline.
-		* @param mediaProtectionManager
-		**/
-		msSetMediaProtectionManager(mediaProtectionManager: Windows.Media.Protection.MediaProtectionManager): void;
-		/**
-		* Sets the dimensions of a sub - rectangle within a video.
-		* @param left The left position of the rectangle.
-		* @param top The top position of the rectangle.
-		* @param right The right position of the rectangle.
-		* @param bottom The bottom position of the rectangle.
-		**/
-		msSetVideoRectangle(left: number, top: number, right: number, bottom: number): void;
-		/**
-		* Pauses playback of the current media source.
-		**/
-		pause(): void;
-		/**
-		* Loads and starts playback of the current media source.
-		**/
-		play(): void;
-		/**
-		* Resets the playback rate and resumes playing the current media source.
-		**/
-		playResume(): void;
-		/**
-		* Removes the specified CSS class from the host element.
-		* @param name The name of the class to remove. Multiple classes can be removed using space-delimited names.
-		**/
-		removeClass(name: string): void;
-		/**
-		* Removes an event listener from the media player control.
-		* @param type The type (name) of the event. You can use any of the following: "". //TODO
-		* @param eventHandler The listener to remove.
-		**/
-		removeEventListener(eventName: string, eventHandler: Function): void;
-		/**
-		* Supports instant replay by applying an offset to the current playback position.
-		**/
-		replay(): void;
-		/**
-		* Reloads the current media source and resumes where playback was left off.
-		**/
-		retry(): void;
-		/**
-		* Stops playback and raises the stopped event.
-		**/
-		stop(): void;
-		/**
-		* Updates the player and its plugins with the specified media source(e.g.the current playlist item).
-		* @param mediaSource A JSON object containing the set of options that represent a media source.
-		**/
-		update(mediaSource: Object): void;
-	}
-
-	class DynamicTextTrack {
-		stream: any;
-		label: string;
-		language: string;
-		augmentPayload(payload: any, startTime: number, endTime: number): void;
-	}
-
-	namespace UI {
-		class Button {
-			element: HTMLElement;
-			type: string;
-			content: string;
-			hoverContent: string;
-			label: string;
-			tooltip: string;
-			disabled: boolean;
-			hidden: boolean;
-			flyout: Element;
-		}
-
-		class ControlPanel {
-			element: HTMLElement;
-			hidden: boolean;
-			isPlayPauseHidden: boolean;
-			isPlayResumeHidden: boolean;
-			isPauseHidden: boolean;
-			isReplayHidden: boolean;
-			isRewindHidden: boolean;
-			isFastForwardHidden: boolean;
-			isSlowMotionHidden: boolean;
-			isSkipPreviousHidden: boolean;
-			isSkipNextHidden: boolean;
-			isSkipBackHidden: boolean;
-			isSkipAheadHidden: boolean;
-			isElapsedTimeHidden: boolean;
-			isRemainingTimeHidden: boolean;
-			isTotalTimeHidden: boolean;
-			isTimelineHidden: boolean;
-			isGoLiveHidden: boolean;
-			isCaptionsHidden: boolean;
-			isAudioHidden: boolean;
-			isVolumeMuteHidden: boolean;
-			isVolumeHidden: boolean;
-			isMuteHidden: boolean;
-			isFullScreenHidden: boolean;
-			isStopHidden: boolean;
-			isInfoHidden: boolean;
-			isMoreHidden: boolean;
-			isZoomHidden: boolean;
-			isSignalStrengthHidden: boolean;
-			isMediaQualityHidden: boolean;
-			flyoutContainerElement: HTMLElement;
-		}
-
-		class Indicator {
-			element: HTMLElement;
-			value: string;
-			label: string;
-			tooltip: string;
-			disabled: boolean;
-			hidden: boolean;
-		}
-
-		class Meter {
-			element: HTMLElement;
-			value: number;
-			label: string;
-			tooltip: string;
-			disabled: boolean;
-			hidden: boolean;
-		}
-
-		class Slider {
-			element: HTMLElement;
-			min: number;
-			max: number;
-			value: number;
-			progress: number;
-			step: number;
-			altStep1: number;
-			altStep2: number;
-			altStep3: number;
-			label: string;
-			tooltip: string;
-			vertical: boolean;
-			disabled: boolean;
-			hidden: boolean;
-			markers: Array<any>;
-			thumbnailImageSrc: string;
-			isThumbnailVisible: boolean;
-		}
-
-
-	}
-}
-
-declare namespace PlayerFramework.Advertising {
-	interface AdvertisementBase {
-		source: any;
-	}
-
-	class PrerollAdvertisement implements AdvertisementBase {
-		source: any;
-	}
-
-	class MidrollAdvertisement implements AdvertisementBase {
-		source: any;
-		time: number;
-		timePercentage: number;
-	}
-}
-
-
-declare namespace Microsoft.VideoAdvertising {
-	class VastAdPayloadHandler {
-		static adType: string;
-	}
-
-	class Extensions {
-		static defaultUserAgent: string;
-	}
-}
-
-declare namespace Microsoft.PlayerFramework.Js.Advertising {
-	/**
-	* Provides an ad source that requires a Url to be downloaded and turned into a stream before passing to the ad handler.
-	**/
-	class RemoteAdSource {
-
-	}
-}
diff --git a/playerframework/tsconfig.json b/playerframework/tsconfig.json
new file mode 100644
index 0000000000..49e6373873
--- /dev/null
+++ b/playerframework/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "playerframework-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pleasejs/please.d.ts b/pleasejs/index.d.ts
similarity index 100%
rename from pleasejs/please.d.ts
rename to pleasejs/index.d.ts
diff --git a/pleasejs/please-tests.ts b/pleasejs/please-tests.ts
index 36e5f2d3e4..d4e5db9e50 100644
--- a/pleasejs/please-tests.ts
+++ b/pleasejs/please-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="please.d.ts" />
-
 Please.make_color();
 
 Please.make_color({
diff --git a/pleasejs/tsconfig.json b/pleasejs/tsconfig.json
new file mode 100644
index 0000000000..89461beaea
--- /dev/null
+++ b/pleasejs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "please-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/plottable/index.d.ts b/plottable/index.d.ts
new file mode 100644
index 0000000000..91f8447c03
--- /dev/null
+++ b/plottable/index.d.ts
@@ -0,0 +1,4119 @@
+// Type definitions for Plottable v1.4.0
+// Project: http://plottablejs.org/
+// Definitions by: Plottable Team <https://github.com/palantir/plottable>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="d3" />
+
+declare namespace Plottable {
+    namespace Utils {
+        namespace Math {
+            /**
+             * Checks if x is between a and b.
+             *
+             * @param {number} x The value to test if in range
+             * @param {number} a The beginning of the (inclusive) range
+             * @param {number} b The ending of the (inclusive) range
+             * @return {boolean} Whether x is in [a, b]
+             */
+            function inRange(x: number, a: number, b: number): boolean;
+            /**
+             * Clamps x to the range [min, max].
+             *
+             * @param {number} x The value to be clamped.
+             * @param {number} min The minimum value.
+             * @param {number} max The maximum value.
+             * @return {number} A clamped value in the range [min, max].
+             */
+            function clamp(x: number, min: number, max: number): number;
+            /**
+             * Applies the accessor, if provided, to each element of `array` and returns the maximum value.
+             * If no maximum value can be computed, returns defaultValue.
+             */
+            function max<C>(array: C[], defaultValue: C): C;
+            function max<T, C>(array: T[], accessor: (t?: T, i?: number) => C, defaultValue: C): C;
+            /**
+             * Applies the accessor, if provided, to each element of `array` and returns the minimum value.
+             * If no minimum value can be computed, returns defaultValue.
+             */
+            function min<C>(array: C[], defaultValue: C): C;
+            function min<T, C>(array: T[], accessor: (t?: T, i?: number) => C, defaultValue: C): C;
+            /**
+             * Returns true **only** if x is NaN
+             */
+            function isNaN(n: any): boolean;
+            /**
+             * Returns true if the argument is a number, which is not NaN
+             * Numbers represented as strings do not pass this function
+             */
+            function isValidNumber(n: any): boolean;
+            /**
+             * Generates an array of consecutive, strictly increasing numbers
+             * in the range [start, stop) separeted by step
+             */
+            function range(start: number, stop: number, step?: number): number[];
+            /**
+             * Returns the square of the distance between two points
+             *
+             * @param {Point} p1
+             * @param {Point} p2
+             * @return {number} dist(p1, p2)^2
+             */
+            function distanceSquared(p1: Point, p2: Point): number;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Utils {
+        /**
+         * Shim for ES6 map.
+         * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map
+         */
+        class Map<K, V> {
+            constructor();
+            set(key: K, value: V): Map<K, V>;
+            get(key: K): V;
+            has(key: K): boolean;
+            forEach(callbackFn: (value: V, key: K, map: Map<K, V>) => void, thisArg?: any): void;
+            delete(key: K): boolean;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Utils {
+        /**
+         * Shim for ES6 set.
+         * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Set
+         */
+        class Set<T> {
+            size: number;
+            constructor();
+            add(value: T): Set<T>;
+            delete(value: T): boolean;
+            has(value: T): boolean;
+            forEach(callback: (value: T, value2: T, set: Set<T>) => void, thisArg?: any): void;
+        }
+    }
+}
+
+declare namespace Plottable {
+    namespace Utils {
+        namespace DOM {
+            /**
+             * Gets the bounding box of an element.
+             * @param {d3.Selection} element
+             * @returns {SVGRed} The bounding box.
+             */
+            function elementBBox(element: d3.Selection<any>): SVGRect;
+            /**
+             * Screen refresh rate which is assumed to be 60fps
+             */
+            var SCREEN_REFRESH_RATE_MILLISECONDS: number;
+            /**
+             * Polyfill for `window.requestAnimationFrame`.
+             * If the function exists, then we use the function directly.
+             * Otherwise, we set a timeout on `SCREEN_REFRESH_RATE_MILLISECONDS` and then perform the function.
+             *
+             * @param {() => void} callback The callback to call in the next animation frame
+             */
+            function requestAnimationFramePolyfill(callback: () => void): void;
+            /**
+             * Calculates the width of the element.
+             * The width includes the padding and the border on the element's left and right sides.
+             *
+             * @param {Element} element The element to query
+             * @returns {number} The width of the element.
+             */
+            function elementWidth(element: Element): number;
+            /**
+             * Calculates the height of the element.
+             * The height includes the padding the and the border on the element's top and bottom sides.
+             *
+             * @param {Element} element The element to query
+             * @returns {number} The height of the element
+             */
+            function elementHeight(element: Element): number;
+            /**
+             * Retrieves the number array representing the translation for the selection
+             *
+             * @param {d3.Selection<any>} selection The selection to query
+             * @returns {[number, number]} The number array representing the translation
+             */
+            function translate(selection: d3.Selection<any>): [number, number];
+            /**
+             * Translates the given selection by the input x / y pixel amounts.
+             *
+             * @param {d3.Selection<any>} selection The selection to translate
+             * @param {number} x The amount to translate in the x direction
+             * @param {number} y The amount to translate in the y direction
+             * @returns {d3.Selection<any>} The input selection
+             */
+            function translate(selection: d3.Selection<any>, x: number, y: number): d3.Selection<any>;
+            /**
+             * Checks if the first ClientRect overlaps the second.
+             *
+             * @param {ClientRect} clientRectA The first ClientRect
+             * @param {ClientRect} clientRectB The second ClientRect
+             * @returns {boolean} If the ClientRects overlap each other.
+             */
+            function clientRectsOverlap(clientRectA: ClientRect, clientRectB: ClientRect): boolean;
+            /**
+             * Returns true if and only if innerClientRect is inside outerClientRect.
+             *
+             * @param {ClientRect} innerClientRect The first ClientRect
+             * @param {ClientRect} outerClientRect The second ClientRect
+             * @returns {boolean} If and only if the innerClientRect is inside outerClientRect.
+             */
+            function clientRectInside(innerClientRect: ClientRect, outerClientRect: ClientRect): boolean;
+            /**
+             * Retrieves the bounding svg of the input element
+             *
+             * @param {SVGElement} element The element to query
+             * @returns {SVGElement} The bounding svg
+             */
+            function boundingSVG(element: SVGElement): SVGElement;
+            /**
+             * Generates a ClipPath ID that is unique for this instance of Plottable
+             */
+            function generateUniqueClipPathId(): string;
+            /**
+             * Returns true if the supplied coordinates or Ranges intersect or are contained by bbox.
+             *
+             * @param {number | Range} xValOrRange The x coordinate or Range to test
+             * @param {number | Range} yValOrRange The y coordinate or Range to test
+             * @param {SVGRect} bbox The bbox
+             * @param {number} tolerance Amount by which to expand bbox, in each dimension, before
+             * testing intersection
+             *
+             * @returns {boolean} True if the supplied coordinates or Ranges intersect or are
+             * contained by bbox, false otherwise.
+             */
+            function intersectsBBox(xValOrRange: number | Range, yValOrRange: number | Range, bbox: SVGRect, tolerance?: number): boolean;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Utils {
+        namespace Color {
+            /**
+             * Return contrast ratio between two colors
+             * Based on implementation from chroma.js by Gregor Aisch (gka) (licensed under BSD)
+             * chroma.js may be found here: https://github.com/gka/chroma.js
+             * License may be found here: https://github.com/gka/chroma.js/blob/master/LICENSE
+             * see http://www.w3.org/TR/2008/REC-WCAG20-20081211/#contrast-ratiodef
+             */
+            function contrast(a: string, b: string): number;
+            /**
+             * Returns a brighter copy of this color. Each channel is multiplied by 0.7 ^ -factor.
+             * Channel values are capped at the maximum value of 255, and the minimum value of 30.
+             */
+            function lightenColor(color: string, factor: number): string;
+            /**
+             * Gets the Hex Code of the color resulting by applying the className CSS class to the
+             * colorTester selection. Returns null if the tester is transparent.
+             *
+             * @param {d3.Selection<void>} colorTester The d3 selection to apply the CSS class to
+             * @param {string} className The name of the class to be applied
+             * @return {string} The hex code of the computed color
+             */
+            function colorTest(colorTester: d3.Selection<void>, className: string): string;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Utils {
+        namespace Array {
+            /**
+             * Takes two arrays of numbers and adds them together
+             *
+             * @param {number[]} aList The first array of numbers
+             * @param {number[]} bList The second array of numbers
+             * @return {number[]} An array of numbers where x[i] = aList[i] + bList[i]
+             */
+            function add(aList: number[], bList: number[]): number[];
+            /**
+             * Take an array of values, and return the unique values.
+             * Will work iff ∀ a, b, a.toString() == b.toString() => a == b; will break on Object inputs
+             *
+             * @param {T[]} values The values to find uniqueness for
+             * @return {T[]} The unique values
+             */
+            function uniq<T>(arr: T[]): T[];
+            /**
+             * @param {T[][]} a The 2D array that will have its elements joined together.
+             * @return {T[]} Every array in a, concatenated together in the order they appear.
+             */
+            function flatten<T>(a: T[][]): T[];
+            /**
+             * Creates an array of length `count`, filled with value or (if value is a function), value()
+             *
+             * @param {T | ((index?: number) => T)} value The value to fill the array with or a value generator (called with index as arg)
+             * @param {number} count The length of the array to generate
+             * @return {any[]}
+             */
+            function createFilledArray<T>(value: T | ((index?: number) => T), count: number): T[];
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Utils {
+        /**
+         * A set of callbacks which can be all invoked at once.
+         * Each callback exists at most once in the set (based on reference equality).
+         * All callbacks should have the same signature.
+         */
+        class CallbackSet<CB extends Function> extends Set<CB> {
+            callCallbacks(...args: any[]): CallbackSet<CB>;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Utils {
+        namespace Stacking {
+            type StackedDatum = {
+                value: number;
+                offset: number;
+            };
+            type StackingResult = Utils.Map<Dataset, Utils.Map<string, StackedDatum>>;
+            /**
+             * Computes the StackingResult (value and offset) for each data point in each Dataset.
+             *
+             * @param {Dataset[]} datasets The Datasets to be stacked on top of each other in the order of stacking
+             * @param {Accessor<any>} keyAccessor Accessor for the key of the data
+             * @param {Accessor<number>} valueAccessor Accessor for the value of the data
+             * @return {StackingResult} value and offset for each datapoint in each Dataset
+             */
+            function stack(datasets: Dataset[], keyAccessor: Accessor<any>, valueAccessor: Accessor<number>): StackingResult;
+            /**
+             * Computes the total extent over all data points in all Datasets, taking stacking into consideration.
+             *
+             * @param {StackingResult} stackingResult The value and offset information for each datapoint in each dataset
+             * @oaram {Accessor<any>} keyAccessor Accessor for the key of the data existent in the stackingResult
+             * @param {Accessor<boolean>} filter A filter for data to be considered when computing the total extent
+             * @return {[number, number]} The total extent
+             */
+            function stackedExtent(stackingResult: StackingResult, keyAccessor: Accessor<any>, filter: Accessor<boolean>): number[];
+            /**
+             * Normalizes a key used for stacking
+             *
+             * @param {any} key The key to be normalized
+             * @return {string} The stringified key
+             */
+            function normalizeKey(key: any): string;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Utils {
+        namespace Window {
+            /**
+             * Print a warning message to the console, if it is available.
+             *
+             * @param {string} The warnings to print
+             */
+            function warn(warning: string): void;
+            /**
+             * Is like setTimeout, but activates synchronously if time=0
+             * We special case 0 because of an observed issue where calling setTimeout causes visible flickering.
+             * We believe this is because when requestAnimationFrame calls into the paint function, as soon as that function finishes
+             * evaluating, the results are painted to the screen. As a result, if we want something to occur immediately but call setTimeout
+             * with time=0, then it is pushed to the call stack and rendered in the next frame, so the component that was rendered via
+             * setTimeout appears out-of-sync with the rest of the plot.
+             */
+            function setTimeout(f: Function, time: number, ...args: any[]): number;
+            /**
+             * Sends a deprecation warning to the console. The warning includes the name of the deprecated method,
+             * version number of the deprecation, and an optional message.
+             *
+             * To be used in the first line of a deprecated method.
+             *
+             * @param {string} callingMethod The name of the method being deprecated
+             * @param {string} version The version when the tagged method became obsolete
+             * @param {string?} message Optional message to be shown with the warning
+             */
+            function deprecated(callingMethod: string, version: string, message?: string): void;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Utils {
+        class ClientToSVGTranslator {
+            /**
+             * Returns the ClientToSVGTranslator for the <svg> containing elem.
+             * If one already exists on that <svg>, it will be returned; otherwise, a new one will be created.
+             */
+            static getTranslator(elem: SVGElement): ClientToSVGTranslator;
+            constructor(svg: SVGElement);
+            /**
+             * Computes the position relative to the <svg> in svg-coordinate-space.
+             */
+            computePosition(clientX: number, clientY: number): Point;
+            /**
+             * Checks whether event happened inside <svg> element.
+             */
+            insideSVG(e: Event): boolean;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Configs {
+        /**
+         * Specifies if Plottable should show warnings.
+         */
+        var SHOW_WARNINGS: boolean;
+    }
+}
+
+
+declare namespace Plottable {
+    var version: string;
+}
+
+
+declare namespace Plottable {
+    type DatasetCallback = (dataset: Dataset) => void;
+    class Dataset {
+        /**
+         * A Dataset contains an array of data and some metadata.
+         * Changes to the data or metadata will cause anything subscribed to the Dataset to update.
+         *
+         * @constructor
+         * @param {any[]} [data=[]] The data for this Dataset.
+         * @param {any} [metadata={}] An object containing additional information.
+         */
+        constructor(data?: any[], metadata?: any);
+        /**
+         * Adds a callback to be called when the Dataset updates.
+         *
+         * @param {DatasetCallback} callback.
+         * @returns {Dataset} The calling Dataset.
+         */
+        onUpdate(callback: DatasetCallback): Dataset;
+        /**
+         * Removes a callback that would be called when the Dataset updates.
+         *
+         * @param {DatasetCallback} callback
+         * @returns {Dataset} The calling Dataset.
+         */
+        offUpdate(callback: DatasetCallback): Dataset;
+        /**
+         * Gets the data.
+         *
+         * @returns {any[]}
+         */
+        data(): any[];
+        /**
+         * Sets the data.
+         *
+         * @param {any[]} data
+         * @returns {Dataset} The calling Dataset.
+         */
+        data(data: any[]): Dataset;
+        /**
+         * Gets the metadata.
+         *
+         * @returns {any}
+         */
+        metadata(): any;
+        /**
+         * Sets the metadata.
+         *
+         * @param {any} metadata
+         * @returns {Dataset} The calling Dataset.
+         */
+        metadata(metadata: any): Dataset;
+    }
+}
+
+
+declare namespace Plottable {
+    namespace RenderPolicies {
+        /**
+         * A policy for rendering Components.
+         */
+        interface RenderPolicy {
+            render(): any;
+        }
+        /**
+         * Renders Components immediately after they are enqueued.
+         * Useful for debugging, horrible for performance.
+         */
+        class Immediate implements RenderPolicy {
+            render(): void;
+        }
+        /**
+         * The default way to render, which only tries to render every frame
+         * (usually, 1/60th of a second).
+         */
+        class AnimationFrame implements RenderPolicy {
+            render(): void;
+        }
+        /**
+         * Renders with `setTimeout()`.
+         * Generally an inferior way to render compared to `requestAnimationFrame`,
+         * but useful for browsers that don't suppoort `requestAnimationFrame`.
+         */
+        class Timeout implements RenderPolicy {
+            render(): void;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    /**
+     * The RenderController is responsible for enqueueing and synchronizing
+     * layout and render calls for Components.
+     *
+     * Layout and render calls occur inside an animation callback
+     * (window.requestAnimationFrame if available).
+     *
+     * RenderController.flush() immediately lays out and renders all Components currently enqueued.
+     *
+     * To always have immediate rendering (useful for debugging), call
+     * ```typescript
+     * Plottable.RenderController.setRenderPolicy(
+     *   new Plottable.RenderPolicies.Immediate()
+     * );
+     * ```
+     */
+    namespace RenderController {
+        namespace Policy {
+            var IMMEDIATE: string;
+            var ANIMATION_FRAME: string;
+            var TIMEOUT: string;
+        }
+        function renderPolicy(): RenderPolicies.RenderPolicy;
+        function renderPolicy(renderPolicy: string): void;
+        /**
+         * Enqueues the Component for rendering.
+         *
+         * @param {Component} component
+         */
+        function registerToRender(component: Component): void;
+        /**
+         * Enqueues the Component for layout and rendering.
+         *
+         * @param {Component} component
+         */
+        function registerToComputeLayout(component: Component): void;
+        /**
+         * Renders all Components waiting to be rendered immediately
+         * instead of waiting until the next frame.
+         *
+         * Useful to call when debugging.
+         */
+        function flush(): void;
+    }
+}
+
+declare namespace Plottable {
+    /**
+     * Accesses a specific datum property.
+     */
+    interface Accessor<T> {
+        (datum: any, index: number, dataset: Dataset): T;
+    }
+    /**
+     * Retrieves a scaled datum property.
+     * Essentially passes the result of an Accessor through a Scale.
+     */
+    type Projector = (datum: any, index: number, dataset: Dataset) => any;
+    /**
+     * A mapping from attributes ("x", "fill", etc.) to the functions that get
+     * that information out of the data.
+     */
+    type AttributeToProjector = {
+        [attr: string]: Projector;
+    };
+    /**
+     * A function that generates attribute values from the datum and index.
+     * Essentially a Projector with a particular Dataset rolled in.
+     */
+    type AppliedProjector = (datum: any, index: number) => any;
+    /**
+     * A mapping from attributes to the AppliedProjectors used to generate them.
+     */
+    type AttributeToAppliedProjector = {
+        [attr: string]: AppliedProjector;
+    };
+    /**
+     * Space request used during layout negotiation.
+     *
+     * @member {number} minWidth The minimum acceptable width given the offered space.
+     * @member {number} minHeight the minimum acceptable height given the offered space.
+     */
+    type SpaceRequest = {
+        minWidth: number;
+        minHeight: number;
+    };
+    /**
+     * Min and max values for a particular property.
+     */
+    type Range = {
+        min: number;
+        max: number;
+    };
+    /**
+     * A location in pixel-space.
+     */
+    type Point = {
+        x: number;
+        y: number;
+    };
+    /**
+     * The corners of a box.
+     */
+    type Bounds = {
+        topLeft: Point;
+        bottomRight: Point;
+    };
+    /**
+     * An object representing a data-backed visual entity inside a Component.
+     */
+    interface Entity<C extends Component> {
+        datum: any;
+        position: Point;
+        selection: d3.Selection<any>;
+        component: C;
+    }
+}
+
+
+declare namespace Plottable {
+    type Formatter = (d: any) => string;
+    /**
+     * This field is deprecated and will be removed in v2.0.0.
+     *
+     * The number of milliseconds between midnight one day and the next is
+     * not a fixed quantity.
+     *
+     * Use date.setDate(date.getDate() + number_of_days) instead.
+     *
+     */
+    var MILLISECONDS_IN_ONE_DAY: number;
+    namespace Formatters {
+        /**
+         * Creates a formatter for currency values.
+         *
+         * @param {number} [precision] The number of decimal places to show (default 2).
+         * @param {string} [symbol] The currency symbol to use (default "$").
+         * @param {boolean} [prefix] Whether to prepend or append the currency symbol (default true).
+         * @param {boolean} [onlyShowUnchanged] Whether to return a value if value changes after formatting (default true).
+         *
+         * @returns {Formatter} A formatter for currency values.
+         */
+        function currency(precision?: number, symbol?: string, prefix?: boolean): (d: any) => string;
+        /**
+         * Creates a formatter that displays exactly [precision] decimal places.
+         *
+         * @param {number} [precision] The number of decimal places to show (default 3).
+         * @param {boolean} [onlyShowUnchanged] Whether to return a value if value changes after formatting (default true).
+         *
+         * @returns {Formatter} A formatter that displays exactly [precision] decimal places.
+         */
+        function fixed(precision?: number): (d: any) => string;
+        /**
+         * Creates a formatter that formats numbers to show no more than
+         * [precision] decimal places. All other values are stringified.
+         *
+         * @param {number} [precision] The number of decimal places to show (default 3).
+         * @param {boolean} [onlyShowUnchanged] Whether to return a value if value changes after formatting (default true).
+         *
+         * @returns {Formatter} A formatter for general values.
+         */
+        function general(precision?: number): (d: any) => string;
+        /**
+         * Creates a formatter that stringifies its input.
+         *
+         * @returns {Formatter} A formatter that stringifies its input.
+         */
+        function identity(): (d: any) => string;
+        /**
+         * Creates a formatter for percentage values.
+         * Multiplies the input by 100 and appends "%".
+         *
+         * @param {number} [precision] The number of decimal places to show (default 0).
+         * @param {boolean} [onlyShowUnchanged] Whether to return a value if value changes after formatting (default true).
+         *
+         * @returns {Formatter} A formatter for percentage values.
+         */
+        function percentage(precision?: number): (d: any) => string;
+        /**
+         * Creates a formatter for values that displays [precision] significant figures
+         * and puts SI notation.
+         *
+         * @param {number} [precision] The number of significant figures to show (default 3).
+         *
+         * @returns {Formatter} A formatter for SI values.
+         */
+        function siSuffix(precision?: number): (d: any) => string;
+        /**
+         * Creates a multi time formatter that displays dates.
+         *
+         * @returns {Formatter} A formatter for time/date values.
+         */
+        function multiTime(): (d: any) => string;
+        /**
+         * Creates a time formatter that displays time/date using given specifier.
+         *
+         * List of directives can be found on: https://github.com/mbostock/d3/wiki/Time-Formatting#format
+         *
+         * @param {string} [specifier] The specifier for the formatter.
+         *
+         * @returns {Formatter} A formatter for time/date values.
+         */
+        function time(specifier: string): Formatter;
+        /**
+         * Creates a formatter for relative dates.
+         *
+         * @param {number} baseValue The start date (as epoch time) used in computing relative dates (default 0)
+         * @param {number} increment The unit used in calculating relative date values (default MILLISECONDS_IN_ONE_DAY)
+         * @param {string} label The label to append to the formatted string (default "")
+         *
+         * @returns {Formatter} A formatter for time/date values.
+         */
+        function relativeDate(baseValue?: number, increment?: number, label?: string): (d: any) => string;
+    }
+}
+
+
+declare namespace Plottable {
+    /**
+     * A SymbolFactory is a function that takes in a symbolSize which is the edge length of the render area
+     * and returns a string representing the 'd' attribute of the resultant 'path' element
+     */
+    type SymbolFactory = (symbolSize: number) => string;
+    namespace SymbolFactories {
+        function circle(): SymbolFactory;
+        function square(): SymbolFactory;
+        function cross(): SymbolFactory;
+        function diamond(): SymbolFactory;
+        function triangleUp(): SymbolFactory;
+        function triangleDown(): SymbolFactory;
+    }
+}
+
+
+declare namespace Plottable {
+    interface ScaleCallback<S extends Scale<any, any>> {
+        (scale: S): any;
+    }
+    namespace Scales {
+        /**
+         * A function that supplies domain values to be included into a Scale.
+         *
+         * @param {Scale} scale
+         * @returns {D[]} An array of values that should be included in the Scale.
+         */
+        interface IncludedValuesProvider<D> {
+            (scale: Scale<D, any>): D[];
+        }
+        /**
+         * A function that supplies padding exception values for the Scale.
+         * If one end of the domain is set to an excepted value as a result of autoDomain()-ing,
+         * that end of the domain will not be padded.
+         *
+         * @param {QuantitativeScale} scale
+         * @returns {D[]} An array of values that should not be padded.
+         */
+        interface PaddingExceptionsProvider<D> {
+            (scale: QuantitativeScale<D>): D[];
+        }
+    }
+    class Scale<D, R> {
+        /**
+         * A Scale is a function (in the mathematical sense) that maps values from a domain to a range.
+         *
+         * @constructor
+         */
+        constructor();
+        /**
+         * Given an array of potential domain values, computes the extent of those values.
+         *
+         * @param {D[]} values
+         * @returns {D[]} The extent of the input values.
+         */
+        extentOfValues(values: D[]): D[];
+        protected _getAllIncludedValues(): D[];
+        protected _getExtent(): D[];
+        /**
+         * Adds a callback to be called when the Scale updates.
+         *
+         * @param {ScaleCallback} callback.
+         * @returns {Scale} The calling Scale.
+         */
+        onUpdate(callback: ScaleCallback<Scale<D, R>>): Scale<D, R>;
+        /**
+         * Removes a callback that would be called when the Scale updates.
+         *
+         * @param {ScaleCallback} callback.
+         * @returns {Scale} The calling Scale.
+         */
+        offUpdate(callback: ScaleCallback<Scale<D, R>>): Scale<D, R>;
+        protected _dispatchUpdate(): void;
+        /**
+         * Sets the Scale's domain so that it spans the Extents of all its ExtentsProviders.
+         *
+         * @returns {Scale} The calling Scale.
+         */
+        autoDomain(): Scale<D, R>;
+        protected _autoDomainIfAutomaticMode(): void;
+        /**
+         * Computes the range value corresponding to a given domain value.
+         *
+         * @param {D} value
+         * @returns {R} The range value corresponding to the supplied domain value.
+         */
+        scale(value: D): R;
+        /**
+         * Gets the domain.
+         *
+         * @returns {D[]} The current domain.
+         */
+        domain(): D[];
+        /**
+         * Sets the domain.
+         *
+         * @param {D[]} values
+         * @returns {Scale} The calling Scale.
+         */
+        domain(values: D[]): Scale<D, R>;
+        protected _getDomain(): void;
+        protected _setDomain(values: D[]): void;
+        protected _setBackingScaleDomain(values: D[]): void;
+        /**
+         * Gets the range.
+         *
+         * @returns {R[]} The current range.
+         */
+        range(): R[];
+        /**
+         * Sets the range.
+         *
+         * @param {R[]} values
+         * @returns {Scale} The calling Scale.
+         */
+        range(values: R[]): Scale<D, R>;
+        protected _getRange(): void;
+        protected _setRange(values: R[]): void;
+        /**
+         * Adds an IncludedValuesProvider to the Scale.
+         *
+         * @param {Scales.IncludedValuesProvider} provider
+         * @returns {Scale} The calling Scale.
+         */
+        addIncludedValuesProvider(provider: Scales.IncludedValuesProvider<D>): Scale<D, R>;
+        /**
+         * Removes the IncludedValuesProvider from the Scale.
+         *
+         * @param {Scales.IncludedValuesProvider} provider
+         * @returns {Scale} The calling Scale.
+         */
+        removeIncludedValuesProvider(provider: Scales.IncludedValuesProvider<D>): Scale<D, R>;
+    }
+}
+
+
+declare namespace Plottable {
+    class QuantitativeScale<D> extends Scale<D, number> {
+        protected static _DEFAULT_NUM_TICKS: number;
+        /**
+         * A QuantitativeScale is a Scale that maps number-like values to numbers.
+         * It is invertible and continuous.
+         *
+         * @constructor
+         */
+        constructor();
+        autoDomain(): QuantitativeScale<D>;
+        protected _autoDomainIfAutomaticMode(): void;
+        protected _getExtent(): D[];
+        /**
+         * Adds a padding exception provider.
+         * If one end of the domain is set to an excepted value as a result of autoDomain()-ing,
+         * that end of the domain will not be padded.
+         *
+         * @param {Scales.PaddingExceptionProvider<D>} provider The provider function.
+         * @returns {QuantitativeScale} The calling QuantitativeScale.
+         */
+        addPaddingExceptionsProvider(provider: Scales.PaddingExceptionsProvider<D>): QuantitativeScale<D>;
+        /**
+         * Removes the padding exception provider.
+         *
+         * @param {Scales.PaddingExceptionProvider<D>} provider The provider function.
+         * @returns {QuantitativeScale} The calling QuantitativeScale.
+         */
+        removePaddingExceptionsProvider(provider: Scales.PaddingExceptionsProvider<D>): QuantitativeScale<D>;
+        /**
+         * Gets the padding proportion.
+         */
+        padProportion(): number;
+        /**
+         * Sets the padding porportion.
+         * When autoDomain()-ing, the computed domain will be expanded by this proportion,
+         * then rounded to human-readable values.
+         *
+         * @param {number} padProportion The padding proportion. Passing 0 disables padding.
+         * @returns {QuantitativeScale} The calling QuantitativeScale.
+         */
+        padProportion(padProportion: number): QuantitativeScale<D>;
+        protected _expandSingleValueDomain(singleValueDomain: D[]): D[];
+        /**
+         * Computes the domain value corresponding to a supplied range value.
+         *
+         * @param {number} value: A value from the Scale's range.
+         * @returns {D} The domain value corresponding to the supplied range value.
+         */
+        invert(value: number): D;
+        domain(): D[];
+        domain(values: D[]): QuantitativeScale<D>;
+        /**
+         * Gets the lower end of the domain.
+         *
+         * @return {D}
+         */
+        domainMin(): D;
+        /**
+         * Sets the lower end of the domain.
+         *
+         * @return {QuantitativeScale} The calling QuantitativeScale.
+         */
+        domainMin(domainMin: D): QuantitativeScale<D>;
+        /**
+         * Gets the upper end of the domain.
+         *
+         * @return {D}
+         */
+        domainMax(): D;
+        /**
+         * Sets the upper end of the domain.
+         *
+         * @return {QuantitativeScale} The calling QuantitativeScale.
+         */
+        domainMax(domainMax: D): QuantitativeScale<D>;
+        extentOfValues(values: D[]): D[];
+        protected _setDomain(values: D[]): void;
+        /**
+         * Gets the array of tick values generated by the default algorithm.
+         */
+        defaultTicks(): D[];
+        /**
+         * Gets an array of tick values spanning the domain.
+         *
+         * @returns {D[]}
+         */
+        ticks(): D[];
+        /**
+         * Given a domain, expands its domain onto "nice" values, e.g. whole
+         * numbers.
+         */
+        protected _niceDomain(domain: D[], count?: number): D[];
+        protected _defaultExtent(): D[];
+        /**
+         * Gets the TickGenerator.
+         */
+        tickGenerator(): Scales.TickGenerators.TickGenerator<D>;
+        /**
+         * Sets the TickGenerator
+         *
+         * @param {TickGenerator} generator
+         * @return {QuantitativeScale} The calling QuantitativeScale.
+         */
+        tickGenerator(generator: Scales.TickGenerators.TickGenerator<D>): QuantitativeScale<D>;
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Scales {
+        class Linear extends QuantitativeScale<number> {
+            /**
+             * @constructor
+             */
+            constructor();
+            protected _defaultExtent(): number[];
+            protected _expandSingleValueDomain(singleValueDomain: number[]): number[];
+            scale(value: number): number;
+            protected _getDomain(): number[];
+            protected _setBackingScaleDomain(values: number[]): void;
+            protected _getRange(): number[];
+            protected _setRange(values: number[]): void;
+            invert(value: number): number;
+            defaultTicks(): number[];
+            protected _niceDomain(domain: number[], count?: number): number[];
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Scales {
+        class ModifiedLog extends QuantitativeScale<number> {
+            /**
+             * A ModifiedLog Scale acts as a regular log scale for large numbers.
+             * As it approaches 0, it gradually becomes linear.
+             * Consequently, a ModifiedLog Scale can process 0 and negative numbers.
+             *
+             * @constructor
+             * @param {number} [base=10]
+             *        The base of the log. Must be > 1.
+             *
+             *        For x <= base, scale(x) = log(x).
+             *
+             *        For 0 < x < base, scale(x) will become more and more
+             *        linear as it approaches 0.
+             *
+             *        At x == 0, scale(x) == 0.
+             *
+             *        For negative values, scale(-x) = -scale(x).
+             */
+            constructor(base?: number);
+            scale(x: number): number;
+            invert(x: number): number;
+            protected _getDomain(): number[];
+            protected _setDomain(values: number[]): void;
+            protected _setBackingScaleDomain(values: number[]): void;
+            ticks(): number[];
+            protected _niceDomain(domain: number[], count?: number): number[];
+            protected _defaultExtent(): number[];
+            protected _expandSingleValueDomain(singleValueDomain: number[]): number[];
+            protected _getRange(): number[];
+            protected _setRange(values: number[]): void;
+            defaultTicks(): number[];
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Scales {
+        class Category extends Scale<string, number> {
+            /**
+             * A Category Scale maps strings to numbers.
+             *
+             * @constructor
+             */
+            constructor();
+            extentOfValues(values: string[]): string[];
+            protected _getExtent(): string[];
+            domain(): string[];
+            domain(values: string[]): Category;
+            protected _setDomain(values: string[]): void;
+            range(): [number, number];
+            range(values: [number, number]): Category;
+            /**
+             * Returns the width of the range band.
+             *
+             * @returns {number} The range band width
+             */
+            rangeBand(): number;
+            /**
+             * Returns the step width of the scale.
+             *
+             * The step width is the pixel distance between adjacent values in the domain.
+             *
+             * @returns {number}
+             */
+            stepWidth(): number;
+            /**
+             * Gets the inner padding.
+             *
+             * The inner padding is defined as the padding in between bands on the scale,
+             * expressed as a multiple of the rangeBand().
+             *
+             * @returns {number}
+             */
+            innerPadding(): number;
+            /**
+             * Sets the inner padding.
+             *
+             * The inner padding is defined as the padding in between bands on the scale,
+             * expressed as a multiple of the rangeBand().
+             *
+             * @returns {Category} The calling Category Scale.
+             */
+            innerPadding(innerPadding: number): Category;
+            /**
+             * Gets the outer padding.
+             *
+             * The outer padding is the padding in between the outer bands and the edges of the range,
+             * expressed as a multiple of the rangeBand().
+             *
+             * @returns {number}
+             */
+            outerPadding(): number;
+            /**
+             * Sets the outer padding.
+             *
+             * The outer padding is the padding in between the outer bands and the edges of the range,
+             * expressed as a multiple of the rangeBand().
+             *
+             * @returns {Category} The calling Category Scale.
+             */
+            outerPadding(outerPadding: number): Category;
+            scale(value: string): number;
+            protected _getDomain(): string[];
+            protected _setBackingScaleDomain(values: string[]): void;
+            protected _getRange(): number[];
+            protected _setRange(values: number[]): void;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Scales {
+        class Color extends Scale<string, string> {
+            /**
+             * A Color Scale maps string values to color hex values expressed as a string.
+             *
+             * @constructor
+             * @param {string} [scaleType] One of "Category10"/"Category20"/"Category20b"/"Category20c".
+             *   (see https://github.com/mbostock/d3/wiki/Ordinal-Scales#categorical-colors)
+             *   If not supplied, reads the colors defined using CSS -- see plottable.css.
+             */
+            constructor(scaleType?: string);
+            extentOfValues(values: string[]): string[];
+            protected _getExtent(): string[];
+            static invalidateColorCache(): void;
+            /**
+             * Returns the color-string corresponding to a given string.
+             * If there are not enough colors in the range(), a lightened version of an existing color will be used.
+             *
+             * @param {string} value
+             * @returns {string}
+             */
+            scale(value: string): string;
+            protected _getDomain(): string[];
+            protected _setBackingScaleDomain(values: string[]): void;
+            protected _getRange(): string[];
+            protected _setRange(values: string[]): void;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Scales {
+        class Time extends QuantitativeScale<Date> {
+            /**
+             * A Time Scale maps Date objects to numbers.
+             *
+             * @constructor
+             */
+            constructor();
+            /**
+             * Returns an array of ticks values separated by the specified interval.
+             *
+             * @param {string} interval A string specifying the interval unit.
+             * @param {number?} [step] The number of multiples of the interval between consecutive ticks.
+             * @return {Date[]}
+             */
+            tickInterval(interval: string, step?: number): Date[];
+            protected _setDomain(values: Date[]): void;
+            protected _defaultExtent(): Date[];
+            protected _expandSingleValueDomain(singleValueDomain: Date[]): Date[];
+            scale(value: Date): number;
+            protected _getDomain(): Date[];
+            protected _setBackingScaleDomain(values: Date[]): void;
+            protected _getRange(): number[];
+            protected _setRange(values: number[]): void;
+            invert(value: number): Date;
+            defaultTicks(): Date[];
+            protected _niceDomain(domain: Date[]): Date[];
+            /**
+             * Transforms the Plottable TimeInterval string into a d3 time interval equivalent.
+             * If the provided TimeInterval is incorrect, the default is d3.time.year
+             */
+            static timeIntervalToD3Time(timeInterval: string): d3.time.Interval;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Scales {
+        class InterpolatedColor extends Scale<number, string> {
+            static REDS: string[];
+            static BLUES: string[];
+            static POSNEG: string[];
+            /**
+             * An InterpolatedColor Scale maps numbers to color hex values, expressed as strings.
+             *
+             * @param {string} [scaleType="linear"] One of "linear"/"log"/"sqrt"/"pow".
+             */
+            constructor(scaleType?: string);
+            extentOfValues(values: number[]): number[];
+            autoDomain(): InterpolatedColor;
+            scale(value: number): string;
+            protected _getDomain(): number[];
+            protected _setBackingScaleDomain(values: number[]): void;
+            protected _getRange(): string[];
+            protected _setRange(range: string[]): void;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Scales {
+        namespace TickGenerators {
+            /**
+             * Generates an array of tick values for the specified scale.
+             *
+             * @param {QuantitativeScale} scale
+             * @returns {D[]}
+             */
+            interface TickGenerator<D> {
+                (scale: Plottable.QuantitativeScale<D>): D[];
+            }
+            /**
+             * Creates a TickGenerator using the specified interval.
+             *
+             * Generates ticks at multiples of the interval while also including the domain boundaries.
+             *
+             * @param {number} interval
+             * @returns {TickGenerator}
+             */
+            function intervalTickGenerator(interval: number): TickGenerator<number>;
+            /**
+             * Creates a TickGenerator returns only integer tick values.
+             *
+             * @returns {TickGenerator}
+             */
+            function integerTickGenerator(): TickGenerator<number>;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Drawers {
+        /**
+         * A step for the drawer to draw.
+         *
+         * Specifies how AttributeToProjector needs to be animated.
+         */
+        type DrawStep = {
+            attrToProjector: AttributeToProjector;
+            animator: Animator;
+        };
+        /**
+         * A DrawStep that carries an AttributeToAppliedProjector map.
+         */
+        type AppliedDrawStep = {
+            attrToAppliedProjector: AttributeToAppliedProjector;
+            animator: Animator;
+        };
+    }
+    class Drawer {
+        protected _svgElementName: string;
+        protected _className: string;
+        /**
+         * A Drawer draws svg elements based on the input Dataset.
+         *
+         * @constructor
+         * @param {Dataset} dataset The dataset associated with this Drawer
+         */
+        constructor(dataset: Dataset);
+        /**
+         * Retrieves the renderArea selection for the Drawer.
+         */
+        renderArea(): d3.Selection<void>;
+        /**
+         * Sets the renderArea selection for the Drawer.
+         *
+         * @param {d3.Selection} Selection containing the <g> to render to.
+         * @returns {Drawer} The calling Drawer.
+         */
+        renderArea(area: d3.Selection<void>): Drawer;
+        /**
+         * Removes the Drawer and its renderArea
+         */
+        remove(): void;
+        protected _applyDefaultAttributes(selection: d3.Selection<any>): void;
+        /**
+         * Calculates the total time it takes to use the input drawSteps to draw the input data
+         *
+         * @param {any[]} data The data that would have been drawn
+         * @param {Drawers.DrawStep[]} drawSteps The DrawSteps to use
+         * @returns {number} The total time it takes to draw
+         */
+        totalDrawTime(data: any[], drawSteps: Drawers.DrawStep[]): number;
+        /**
+         * Draws the data into the renderArea using the spefic steps and metadata
+         *
+         * @param{any[]} data The data to be drawn
+         * @param{DrawStep[]} drawSteps The list of steps, which needs to be drawn
+         */
+        draw(data: any[], drawSteps: Drawers.DrawStep[]): Drawer;
+        selection(): d3.Selection<any>;
+        /**
+         * Returns the CSS selector for this Drawer's visual elements.
+         */
+        selector(): string;
+        /**
+         * Returns the D3 selection corresponding to the datum with the specified index.
+         */
+        selectionForIndex(index: number): d3.Selection<any>;
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Drawers {
+        class Line extends Drawer {
+            constructor(dataset: Dataset);
+            protected _applyDefaultAttributes(selection: d3.Selection<any>): void;
+            selectionForIndex(index: number): d3.Selection<any>;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Drawers {
+        class Area extends Drawer {
+            constructor(dataset: Dataset);
+            protected _applyDefaultAttributes(selection: d3.Selection<any>): void;
+            selectionForIndex(index: number): d3.Selection<any>;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Drawers {
+        class Rectangle extends Drawer {
+            constructor(dataset: Dataset);
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Drawers {
+        class Arc extends Drawer {
+            constructor(dataset: Dataset);
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Drawers {
+        class Symbol extends Drawer {
+            constructor(dataset: Dataset);
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Drawers {
+        class Segment extends Drawer {
+            constructor(dataset: Dataset);
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    type ComponentCallback = (component: Component) => void;
+    namespace Components {
+        class Alignment {
+            static TOP: string;
+            static BOTTOM: string;
+            static LEFT: string;
+            static RIGHT: string;
+            static CENTER: string;
+        }
+    }
+    class Component {
+        protected _boundingBox: d3.Selection<void>;
+        protected _clipPathEnabled: boolean;
+        protected _isSetup: boolean;
+        protected _isAnchored: boolean;
+        constructor();
+        /**
+         * Attaches the Component as a child of a given d3 Selection.
+         *
+         * @param {d3.Selection} selection.
+         * @returns {Component} The calling Component.
+         */
+        anchor(selection: d3.Selection<void>): Component;
+        /**
+         * Adds a callback to be called on anchoring the Component to the DOM.
+         * If the Component is already anchored, the callback is called immediately.
+         *
+         * @param {ComponentCallback} callback
+         * @return {Component}
+         */
+        onAnchor(callback: ComponentCallback): Component;
+        /**
+         * Removes a callback that would be called on anchoring the Component to the DOM.
+         * The callback is identified by reference equality.
+         *
+         * @param {ComponentCallback} callback
+         * @return {Component}
+         */
+        offAnchor(callback: ComponentCallback): Component;
+        /**
+         * Creates additional elements as necessary for the Component to function.
+         * Called during anchor() if the Component's element has not been created yet.
+         * Override in subclasses to provide additional functionality.
+         */
+        protected _setup(): void;
+        /**
+         * Given available space in pixels, returns the minimum width and height this Component will need.
+         *
+         * @param {number} availableWidth
+         * @param {number} availableHeight
+         * @returns {SpaceRequest}
+         */
+        requestedSpace(availableWidth: number, availableHeight: number): SpaceRequest;
+        /**
+         * Computes and sets the size, position, and alignment of the Component from the specified values.
+         * If no parameters are supplied and the Component is a root node,
+         * they are inferred from the size of the Component's element.
+         *
+         * @param {Point} [origin] Origin of the space offered to the Component.
+         * @param {number} [availableWidth] Available width in pixels.
+         * @param {number} [availableHeight] Available height in pixels.
+         * @returns {Component} The calling Component.
+         */
+        computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): Component;
+        protected _sizeFromOffer(availableWidth: number, availableHeight: number): {
+            width: number;
+            height: number;
+        };
+        /**
+         * Queues the Component for rendering.
+         *
+         * @returns {Component} The calling Component.
+         */
+        render(): Component;
+        /**
+         * Renders the Component without waiting for the next frame.
+         */
+        renderImmediately(): Component;
+        /**
+         * Causes the Component to re-layout and render.
+         *
+         * This function should be called when a CSS change has occured that could
+         * influence the layout of the Component, such as changing the font size.
+         *
+         * @returns {Component} The calling Component.
+         */
+        redraw(): Component;
+        /**
+         * Renders the Component to a given <svg>.
+         *
+         * @param {String|d3.Selection} element A selector-string for the <svg>, or a d3 selection containing an <svg>.
+         * @returns {Component} The calling Component.
+         */
+        renderTo(element: String | d3.Selection<void>): Component;
+        /**
+         * Gets the x alignment of the Component.
+         */
+        xAlignment(): string;
+        /**
+         * Sets the x alignment of the Component.
+         *
+         * @param {string} xAlignment The x alignment of the Component ("left"/"center"/"right").
+         * @returns {Component} The calling Component.
+         */
+        xAlignment(xAlignment: string): Component;
+        /**
+         * Gets the y alignment of the Component.
+         */
+        yAlignment(): string;
+        /**
+         * Sets the y alignment of the Component.
+         *
+         * @param {string} yAlignment The y alignment of the Component ("top"/"center"/"bottom").
+         * @returns {Component} The calling Component.
+         */
+        yAlignment(yAlignment: string): Component;
+        /**
+         * Checks if the Component has a given CSS class.
+         *
+         * @param {string} cssClass The CSS class to check for.
+         */
+        hasClass(cssClass: string): boolean;
+        /**
+         * Adds a given CSS class to the Component.
+         *
+         * @param {string} cssClass The CSS class to add.
+         * @returns {Component} The calling Component.
+         */
+        addClass(cssClass: string): Component;
+        /**
+         * Removes a given CSS class from the Component.
+         *
+         * @param {string} cssClass The CSS class to remove.
+         * @returns {Component} The calling Component.
+         */
+        removeClass(cssClass: string): Component;
+        /**
+         * Checks if the Component has a fixed width or if it grows to fill available space.
+         * Returns false by default on the base Component class.
+         */
+        fixedWidth(): boolean;
+        /**
+         * Checks if the Component has a fixed height or if it grows to fill available space.
+         * Returns false by default on the base Component class.
+         */
+        fixedHeight(): boolean;
+        /**
+         * Detaches a Component from the DOM. The Component can be reused.
+         *
+         * This should only be used if you plan on reusing the calling Component. Otherwise, use destroy().
+         *
+         * @returns The calling Component.
+         */
+        detach(): Component;
+        /**
+         * Adds a callback to be called when the Component is detach()-ed.
+         *
+         * @param {ComponentCallback} callback
+         * @return {Component} The calling Component.
+         */
+        onDetach(callback: ComponentCallback): Component;
+        /**
+         * Removes a callback to be called when the Component is detach()-ed.
+         * The callback is identified by reference equality.
+         *
+         * @param {ComponentCallback} callback
+         * @return {Component} The calling Component.
+         */
+        offDetach(callback: ComponentCallback): Component;
+        /**
+         * Gets the parent ComponentContainer for this Component.
+         */
+        parent(): ComponentContainer;
+        /**
+         * Sets the parent ComponentContainer for this Component.
+         * An error will be thrown if the parent does not contain this Component.
+         * Adding a Component to a ComponentContainer should be done
+         * using the appropriate method on the ComponentContainer.
+         */
+        parent(parent: ComponentContainer): Component;
+        /**
+         * Removes a Component from the DOM and disconnects all listeners.
+         */
+        destroy(): void;
+        /**
+         * Gets the width of the Component in pixels.
+         */
+        width(): number;
+        /**
+         * Gets the height of the Component in pixels.
+         */
+        height(): number;
+        /**
+         * Gets the origin of the Component relative to its parent.
+         *
+         * @return {Point}
+         */
+        origin(): Point;
+        /**
+         * Gets the origin of the Component relative to the root <svg>.
+         *
+         * @return {Point}
+         */
+        originToSVG(): Point;
+        /**
+         * Gets the Selection containing the <g> in front of the visual elements of the Component.
+         *
+         * Will return undefined if the Component has not been anchored.
+         *
+         * @return {d3.Selection}
+         */
+        foreground(): d3.Selection<void>;
+        /**
+         * Gets a Selection containing a <g> that holds the visual elements of the Component.
+         *
+         * Will return undefined if the Component has not been anchored.
+         *
+         * @return {d3.Selection} content selection for the Component
+         */
+        content(): d3.Selection<void>;
+        /**
+         * Gets the Selection containing the <g> behind the visual elements of the Component.
+         *
+         * Will return undefined if the Component has not been anchored.
+         *
+         * @return {d3.Selection} background selection for the Component
+         */
+        background(): d3.Selection<void>;
+    }
+}
+
+
+declare namespace Plottable {
+    class ComponentContainer extends Component {
+        constructor();
+        anchor(selection: d3.Selection<void>): ComponentContainer;
+        render(): ComponentContainer;
+        /**
+         * Checks whether the specified Component is in the ComponentContainer.
+         */
+        has(component: Component): boolean;
+        protected _adoptAndAnchor(component: Component): void;
+        /**
+         * Removes the specified Component from the ComponentContainer.
+         */
+        remove(component: Component): ComponentContainer;
+        /**
+         * Carry out the actual removal of a Component.
+         * Implementation dependent on the type of container.
+         *
+         * @return {boolean} true if the Component was successfully removed, false otherwise.
+         */
+        protected _remove(component: Component): boolean;
+        /**
+         * Invokes a callback on each Component in the ComponentContainer.
+         */
+        protected _forEach(callback: (component: Component) => void): void;
+        /**
+         * Destroys the ComponentContainer and all Components within it.
+         */
+        destroy(): void;
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Components {
+        class Group extends ComponentContainer {
+            /**
+             * Constructs a Group.
+             *
+             * A Group contains Components that will be rendered on top of each other.
+             * Components added later will be rendered above Components already in the Group.
+             *
+             * @constructor
+             * @param {Component[]} [components=[]] Components to be added to the Group.
+             */
+            constructor(components?: Component[]);
+            protected _forEach(callback: (component: Component) => any): void;
+            /**
+             * Checks whether the specified Component is in the Group.
+             */
+            has(component: Component): boolean;
+            requestedSpace(offeredWidth: number, offeredHeight: number): SpaceRequest;
+            computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): Group;
+            protected _sizeFromOffer(availableWidth: number, availableHeight: number): {
+                width: number;
+                height: number;
+            };
+            fixedWidth(): boolean;
+            fixedHeight(): boolean;
+            /**
+             * @return {Component[]} The Components in this Group.
+             */
+            components(): Component[];
+            /**
+             * Adds a Component to this Group.
+             * The added Component will be rendered above Components already in the Group.
+             */
+            append(component: Component): Group;
+            protected _remove(component: Component): boolean;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    class Axis<D> extends Component {
+        /**
+         * The css class applied to each end tick mark (the line on the end tick).
+         */
+        static END_TICK_MARK_CLASS: string;
+        /**
+         * The css class applied to each tick mark (the line on the tick).
+         */
+        static TICK_MARK_CLASS: string;
+        /**
+         * The css class applied to each tick label (the text associated with the tick).
+         */
+        static TICK_LABEL_CLASS: string;
+        protected _tickMarkContainer: d3.Selection<void>;
+        protected _tickLabelContainer: d3.Selection<void>;
+        protected _baseline: d3.Selection<void>;
+        protected _scale: Scale<D, number>;
+        protected _computedWidth: number;
+        protected _computedHeight: number;
+        /**
+         * Constructs an Axis.
+         * An Axis is a visual representation of a Scale.
+         *
+         * @constructor
+         * @param {Scale} scale
+         * @param {string} orientation One of "top"/"bottom"/"left"/"right".
+         */
+        constructor(scale: Scale<D, number>, orientation: string);
+        destroy(): void;
+        protected _isHorizontal(): boolean;
+        protected _computeWidth(): number;
+        protected _computeHeight(): number;
+        requestedSpace(offeredWidth: number, offeredHeight: number): SpaceRequest;
+        fixedHeight(): boolean;
+        fixedWidth(): boolean;
+        protected _rescale(): void;
+        computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): Axis<D>;
+        protected _setup(): void;
+        protected _getTickValues(): D[];
+        renderImmediately(): Axis<D>;
+        protected _generateBaselineAttrHash(): {
+            [key: string]: number;
+        };
+        protected _generateTickMarkAttrHash(isEndTickMark?: boolean): {
+            [key: string]: number | ((d: any) => number);
+        };
+        redraw(): Component;
+        protected _setDefaultAlignment(): void;
+        /**
+         * Gets the Formatter on the Axis. Tick values are passed through the
+         * Formatter before being displayed.
+         */
+        formatter(): Formatter;
+        /**
+         * Sets the Formatter on the Axis. Tick values are passed through the
+         * Formatter before being displayed.
+         *
+         * @param {Formatter} formatter
+         * @returns {Axis} The calling Axis.
+         */
+        formatter(formatter: Formatter): Axis<D>;
+        /**
+         * @deprecated As of release 1.3, replaced by innerTickLength()
+         *
+         * Gets the tick mark length in pixels.
+         */
+        tickLength(): number;
+        /**
+         * Sets the tick mark length in pixels.
+         *
+         * @param {number} length
+         * @returns {Axis} The calling Axis.
+         */
+        tickLength(length: number): Axis<D>;
+        /**
+         * Gets the tick mark length in pixels.
+         */
+        innerTickLength(): number;
+        /**
+         * Sets the tick mark length in pixels.
+         *
+         * @param {number} length
+         * @returns {Axis} The calling Axis.
+         */
+        innerTickLength(length: number): Axis<D>;
+        /**
+         * Gets the end tick mark length in pixels.
+         */
+        endTickLength(): number;
+        /**
+         * Sets the end tick mark length in pixels.
+         *
+         * @param {number} length
+         * @returns {Axis} The calling Axis.
+         */
+        endTickLength(length: number): Axis<D>;
+        protected _maxLabelTickLength(): number;
+        /**
+         * Gets the padding between each tick mark and its associated label in pixels.
+         */
+        tickLabelPadding(): number;
+        /**
+         * Sets the padding between each tick mark and its associated label in pixels.
+         *
+         * @param {number} padding
+         * @returns {Axis} The calling Axis.
+         */
+        tickLabelPadding(padding: number): Axis<D>;
+        /**
+         * Gets the margin in pixels.
+         * The margin is the amount of space between the tick labels and the outer edge of the Axis.
+         */
+        margin(): number;
+        /**
+         * Sets the margin in pixels.
+         * The margin is the amount of space between the tick labels and the outer edge of the Axis.
+         *
+         * @param {number} size
+         * @returns {Axis} The calling Axis.
+         */
+        margin(size: number): Axis<D>;
+        /**
+         * Gets the orientation of the Axis.
+         */
+        orientation(): string;
+        /**
+         * Sets the orientation of the Axis.
+         *
+         * @param {number} orientation One of "top"/"bottom"/"left"/"right".
+         * @returns {Axis} The calling Axis.
+         */
+        orientation(orientation: string): Axis<D>;
+        /**
+         * Gets whether the Axis shows the end tick labels.
+         */
+        showEndTickLabels(): boolean;
+        /**
+         * Sets whether the Axis shows the end tick labels.
+         *
+         * @param {boolean} show
+         * @returns {Axis} The calling Axis.
+         */
+        showEndTickLabels(show: boolean): Axis<D>;
+    }
+}
+
+
+declare namespace Plottable {
+    namespace TimeInterval {
+        var second: string;
+        var minute: string;
+        var hour: string;
+        var day: string;
+        var week: string;
+        var month: string;
+        var year: string;
+    }
+    namespace Axes {
+        /**
+         * Defines a configuration for a Time Axis tier.
+         * For details on how ticks are generated see: https://github.com/mbostock/d3/wiki/Time-Scales#ticks
+         * interval - A time unit associated with this configuration (seconds, minutes, hours, etc).
+         * step - number of intervals between each tick.
+         * formatter - formatter used to format tick labels.
+         */
+        type TimeAxisTierConfiguration = {
+            interval: string;
+            step: number;
+            formatter: Formatter;
+        };
+        /**
+         * An array of linked TimeAxisTierConfigurations.
+         * Each configuration will be shown on a different tier.
+         * Currently, up to two tiers are supported.
+         */
+        type TimeAxisConfiguration = TimeAxisTierConfiguration[];
+        class Time extends Axis<Date> {
+            /**
+             * The CSS class applied to each Time Axis tier
+             */
+            static TIME_AXIS_TIER_CLASS: string;
+            /**
+             * Constructs a Time Axis.
+             *
+             * A Time Axis is a visual representation of a Time Scale.
+             *
+             * @constructor
+             * @param {Scales.Time} scale
+             * @param {string} orientation One of "top"/"bottom".
+             */
+            constructor(scale: Scales.Time, orientation: string);
+            /**
+             * Gets the label positions for each tier.
+             */
+            tierLabelPositions(): string[];
+            /**
+             * Sets the label positions for each tier.
+             *
+             * @param {string[]} newPositions The positions for each tier. "bottom" and "center" are the only supported values.
+             * @returns {Axes.Time} The calling Time Axis.
+             */
+            tierLabelPositions(newPositions: string[]): Time;
+            /**
+             * Gets the possible TimeAxisConfigurations.
+             */
+            axisConfigurations(): TimeAxisConfiguration[];
+            /**
+             * Sets the possible TimeAxisConfigurations.
+             * The Time Axis will choose the most precise configuration that will display in the available space.
+             *
+             * @param {TimeAxisConfiguration[]} configurations
+             * @returns {Axes.Time} The calling Time Axis.
+             */
+            axisConfigurations(configurations: TimeAxisConfiguration[]): Time;
+            orientation(): string;
+            orientation(orientation: string): Time;
+            protected _computeHeight(): number;
+            protected _sizeFromOffer(availableWidth: number, availableHeight: number): {
+                width: number;
+                height: number;
+            };
+            protected _setup(): void;
+            protected _getTickValues(): any[];
+            renderImmediately(): Time;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Axes {
+        class Numeric extends Axis<number> {
+            /**
+             * Constructs a Numeric Axis.
+             *
+             * A Numeric Axis is a visual representation of a QuantitativeScale.
+             *
+             * @constructor
+             * @param {QuantitativeScale} scale
+             * @param {string} orientation One of "top"/"bottom"/"left"/"right".
+             */
+            constructor(scale: QuantitativeScale<number>, orientation: string);
+            protected _setup(): void;
+            protected _computeWidth(): number;
+            protected _computeHeight(): number;
+            protected _getTickValues(): number[];
+            protected _rescale(): void;
+            renderImmediately(): Numeric;
+            /**
+             * Gets the tick label position relative to the tick marks.
+             *
+             * @returns {string} The current tick label position.
+             */
+            tickLabelPosition(): string;
+            /**
+             * Sets the tick label position relative to the tick marks.
+             *
+             * @param {string} position "top"/"center"/"bottom" for a vertical Numeric Axis,
+             *                          "left"/"center"/"right" for a horizontal Numeric Axis.
+             * @returns {Numeric} The calling Numeric Axis.
+             */
+            tickLabelPosition(position: string): Numeric;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Axes {
+        class Category extends Axis<string> {
+            /**
+             * Constructs a Category Axis.
+             *
+             * A Category Axis is a visual representation of a Category Scale.
+             *
+             * @constructor
+             * @param {Scales.Category} scale
+             * @param {string} [orientation="bottom"] One of "top"/"bottom"/"left"/"right".
+             */
+            constructor(scale: Scales.Category, orientation: string);
+            protected _setup(): void;
+            protected _rescale(): Component;
+            requestedSpace(offeredWidth: number, offeredHeight: number): SpaceRequest;
+            protected _getTickValues(): string[];
+            /**
+             * Gets the tick label angle in degrees.
+             */
+            tickLabelAngle(): number;
+            /**
+             * Sets the tick label angle in degrees.
+             * Right now only -90/0/90 are supported. 0 is horizontal.
+             *
+             * @param {number} angle
+             * @returns {Category} The calling Category Axis.
+             */
+            tickLabelAngle(angle: number): Category;
+            renderImmediately(): Category;
+            computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): Axis<string>;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Components {
+        class Label extends Component {
+            /**
+             * A Label is a Component that displays a single line of text.
+             *
+             * @constructor
+             * @param {string} [displayText=""] The text of the Label.
+             * @param {number} [angle=0] The angle of the Label in degrees (-90/0/90). 0 is horizontal.
+             */
+            constructor(displayText?: string, angle?: number);
+            requestedSpace(offeredWidth: number, offeredHeight: number): SpaceRequest;
+            protected _setup(): void;
+            /**
+             * Gets the Label's text.
+             */
+            text(): string;
+            /**
+             * Sets the Label's text.
+             *
+             * @param {string} displayText
+             * @returns {Label} The calling Label.
+             */
+            text(displayText: string): Label;
+            /**
+             * Gets the angle of the Label in degrees.
+             */
+            angle(): number;
+            /**
+             * Sets the angle of the Label in degrees.
+             *
+             * @param {number} angle One of -90/0/90. 0 is horizontal.
+             * @returns {Label} The calling Label.
+             */
+            angle(angle: number): Label;
+            /**
+             * Gets the amount of padding around the Label in pixels.
+             */
+            padding(): number;
+            /**
+             * Sets the amount of padding around the Label in pixels.
+             *
+             * @param {number} padAmount
+             * @returns {Label} The calling Label.
+             */
+            padding(padAmount: number): Label;
+            fixedWidth(): boolean;
+            fixedHeight(): boolean;
+            renderImmediately(): Label;
+        }
+        class TitleLabel extends Label {
+            static TITLE_LABEL_CLASS: string;
+            /**
+             * @constructor
+             * @param {string} [text]
+             * @param {number} [angle] One of -90/0/90. 0 is horizontal.
+             */
+            constructor(text?: string, angle?: number);
+        }
+        class AxisLabel extends Label {
+            static AXIS_LABEL_CLASS: string;
+            /**
+             * @constructor
+             * @param {string} [text]
+             * @param {number} [angle] One of -90/0/90. 0 is horizontal.
+             */
+            constructor(text?: string, angle?: number);
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Components {
+        class Legend extends Component {
+            /**
+             * The css class applied to each legend row
+             */
+            static LEGEND_ROW_CLASS: string;
+            /**
+             * The css class applied to each legend entry
+             */
+            static LEGEND_ENTRY_CLASS: string;
+            /**
+             * The css class applied to each legend symbol
+             */
+            static LEGEND_SYMBOL_CLASS: string;
+            /**
+             * The Legend consists of a series of entries, each with a color and label taken from the Color Scale.
+             *
+             * @constructor
+             * @param {Scale.Color} scale
+             */
+            constructor(colorScale: Scales.Color);
+            protected _setup(): void;
+            /**
+             * Gets the maximum number of entries per row.
+             *
+             * @returns {number}
+             */
+            maxEntriesPerRow(): number;
+            /**
+             * Sets the maximum number of entries perrow.
+             *
+             * @param {number} maxEntriesPerRow
+             * @returns {Legend} The calling Legend.
+             */
+            maxEntriesPerRow(maxEntriesPerRow: number): Legend;
+            /**
+             * Gets the current comparator for the Legend's entries.
+             *
+             * @returns {(a: string, b: string) => number}
+             */
+            comparator(): (a: string, b: string) => number;
+            /**
+             * Sets a new comparator for the Legend's entries.
+             * The comparator is used to set the display order of the entries.
+             *
+             * @param {(a: string, b: string) => number} comparator
+             * @returns {Legend} The calling Legend.
+             */
+            comparator(comparator: (a: string, b: string) => number): Legend;
+            /**
+             * Gets the Color Scale.
+             *
+             * @returns {Scales.Color}
+             */
+            colorScale(): Scales.Color;
+            /**
+             * Sets the Color Scale.
+             *
+             * @param {Scales.Color} scale
+             * @returns {Legend} The calling Legend.
+             */
+            colorScale(colorScale: Scales.Color): Legend;
+            destroy(): void;
+            requestedSpace(offeredWidth: number, offeredHeight: number): SpaceRequest;
+            /**
+             * Gets the Entities (representing Legend entries) at a particular point.
+             * Returns an empty array if no Entities are present at that location.
+             *
+             * @param {Point} p
+             * @returns {Entity<Legend>[]}
+             */
+            entitiesAt(p: Point): Entity<Legend>[];
+            renderImmediately(): Legend;
+            /**
+             * Gets the function determining the symbols of the Legend.
+             *
+             * @returns {(datum: any, index: number) => symbolFactory}
+             */
+            symbol(): (datum: any, index: number) => SymbolFactory;
+            /**
+             * Sets the function determining the symbols of the Legend.
+             *
+             * @param {(datum: any, index: number) => SymbolFactory} symbol
+             * @returns {Legend} The calling Legend
+             */
+            symbol(symbol: (datum: any, index: number) => SymbolFactory): Legend;
+            fixedWidth(): boolean;
+            fixedHeight(): boolean;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Components {
+        class InterpolatedColorLegend extends Component {
+            /**
+             * The css class applied to the legend labels.
+             */
+            static LEGEND_LABEL_CLASS: string;
+            /**
+             * Creates an InterpolatedColorLegend.
+             *
+             * The InterpolatedColorLegend consists of a sequence of swatches that show the
+             * associated InterpolatedColor Scale sampled at various points.
+             * Two labels show the maximum and minimum values of the InterpolatedColor Scale.
+             *
+             * @constructor
+             * @param {Scales.InterpolatedColor} interpolatedColorScale
+             */
+            constructor(interpolatedColorScale: Scales.InterpolatedColor);
+            destroy(): void;
+            /**
+             * Gets the Formatter for the labels.
+             */
+            formatter(): Formatter;
+            /**
+             * Sets the Formatter for the labels.
+             *
+             * @param {Formatter} formatter
+             * @returns {InterpolatedColorLegend} The calling InterpolatedColorLegend.
+             */
+            formatter(formatter: Formatter): InterpolatedColorLegend;
+            /**
+             * Gets the orientation.
+             */
+            orientation(): string;
+            /**
+             * Sets the orientation.
+             *
+             * @param {string} orientation One of "horizontal"/"left"/"right".
+             * @returns {InterpolatedColorLegend} The calling InterpolatedColorLegend.
+             */
+            orientation(orientation: string): InterpolatedColorLegend;
+            fixedWidth(): boolean;
+            fixedHeight(): boolean;
+            protected _setup(): void;
+            requestedSpace(offeredWidth: number, offeredHeight: number): SpaceRequest;
+            renderImmediately(): InterpolatedColorLegend;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Components {
+        class Gridlines extends Component {
+            /**
+             * @constructor
+             * @param {QuantitativeScale} xScale The scale to base the x gridlines on. Pass null if no gridlines are desired.
+             * @param {QuantitativeScale} yScale The scale to base the y gridlines on. Pass null if no gridlines are desired.
+             */
+            constructor(xScale: QuantitativeScale<any>, yScale: QuantitativeScale<any>);
+            destroy(): Gridlines;
+            protected _setup(): void;
+            renderImmediately(): Gridlines;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Components {
+        class Table extends ComponentContainer {
+            /**
+             * A Table combines Components in the form of a grid. A
+             * common case is combining a y-axis, x-axis, and the plotted data via
+             * ```typescript
+             * new Table([[yAxis, plot],
+             *            [null,  xAxis]]);
+             * ```
+             *
+             * @constructor
+             * @param {Component[][]} [rows=[]] A 2-D array of Components to be added to the Table.
+             *   null can be used if a cell is empty.
+             */
+            constructor(rows?: Component[][]);
+            protected _forEach(callback: (component: Component) => any): void;
+            /**
+             * Checks whether the specified Component is in the Table.
+             */
+            has(component: Component): boolean;
+            /**
+             * Adds a Component in the specified row and column position.
+             *
+             * For example, instead of calling `new Table([[a, b], [null, c]])`, you
+             * could call
+             * ```typescript
+             * var table = new Table();
+             * table.add(a, 0, 0);
+             * table.add(b, 0, 1);
+             * table.add(c, 1, 1);
+             * ```
+             *
+             * @param {Component} component The Component to be added.
+             * @param {number} row
+             * @param {number} col
+             * @returns {Table} The calling Table.
+             */
+            add(component: Component, row: number, col: number): Table;
+            protected _remove(component: Component): boolean;
+            requestedSpace(offeredWidth: number, offeredHeight: number): SpaceRequest;
+            computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): Table;
+            /**
+             * Gets the padding above and below each row in pixels.
+             */
+            rowPadding(): number;
+            /**
+             * Sets the padding above and below each row in pixels.
+             *
+             * @param {number} rowPadding
+             * @returns {Table} The calling Table.
+             */
+            rowPadding(rowPadding: number): Table;
+            /**
+             * Gets the padding to the left and right of each column in pixels.
+             */
+            columnPadding(): number;
+            /**
+             * Sets the padding to the left and right of each column in pixels.
+             *
+             * @param {number} columnPadding
+             * @returns {Table} The calling Table.
+             */
+            columnPadding(columnPadding: number): Table;
+            /**
+             * Gets the weight of the specified row.
+             *
+             * @param {number} index
+             */
+            rowWeight(index: number): number;
+            /**
+             * Sets the weight of the specified row.
+             * Space is allocated to rows based on their weight. Rows with higher weights receive proportionally more space.
+             *
+             * A common case would be to have one row take up 2/3rds of the space,
+             * and the other row take up 1/3rd.
+             *
+             * Example:
+             *
+             * ```JavaScript
+             * plot = new Plottable.Component.Table([
+             *  [row1],
+             *  [row2]
+             * ]);
+             *
+             * // assign twice as much space to the first row
+             * plot
+             *  .rowWeight(0, 2)
+             *  .rowWeight(1, 1)
+             * ```
+             *
+             * @param {number} index
+             * @param {number} weight
+             * @returns {Table} The calling Table.
+             */
+            rowWeight(index: number, weight: number): Table;
+            /**
+             * Gets the weight of the specified column.
+             *
+             * @param {number} index
+             */
+            columnWeight(index: number): number;
+            /**
+             * Sets the weight of the specified column.
+             * Space is allocated to columns based on their weight. Columns with higher weights receive proportionally more space.
+             *
+             * Please see `rowWeight` docs for an example.
+             *
+             * @param {number} index
+             * @param {number} weight
+             * @returns {Table} The calling Table.
+             */
+            columnWeight(index: number, weight: number): Table;
+            fixedWidth(): boolean;
+            fixedHeight(): boolean;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Components {
+        class SelectionBoxLayer extends Component {
+            protected _box: d3.Selection<void>;
+            constructor();
+            protected _setup(): void;
+            protected _sizeFromOffer(availableWidth: number, availableHeight: number): {
+                width: number;
+                height: number;
+            };
+            /**
+             * Gets the Bounds of the box.
+             */
+            bounds(): Bounds;
+            /**
+             * Sets the Bounds of the box.
+             *
+             * @param {Bounds} newBounds
+             * @return {SelectionBoxLayer} The calling SelectionBoxLayer.
+             */
+            bounds(newBounds: Bounds): SelectionBoxLayer;
+            protected _setBounds(newBounds: Bounds): void;
+            renderImmediately(): SelectionBoxLayer;
+            /**
+             * Gets whether the box is being shown.
+             */
+            boxVisible(): boolean;
+            /**
+             * Shows or hides the selection box.
+             *
+             * @param {boolean} show Whether or not to show the box.
+             * @return {SelectionBoxLayer} The calling SelectionBoxLayer.
+             */
+            boxVisible(show: boolean): SelectionBoxLayer;
+            fixedWidth(): boolean;
+            fixedHeight(): boolean;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Plots {
+        interface PlotEntity extends Entity<Plot> {
+            dataset: Dataset;
+            index: number;
+            component: Plot;
+        }
+        interface AccessorScaleBinding<D, R> {
+            accessor: Accessor<any>;
+            scale?: Scale<D, R>;
+        }
+        namespace Animator {
+            var MAIN: string;
+            var RESET: string;
+        }
+    }
+    class Plot extends Component {
+        protected static _ANIMATION_MAX_DURATION: number;
+        protected _renderArea: d3.Selection<void>;
+        protected _renderCallback: ScaleCallback<Scale<any, any>>;
+        protected _propertyExtents: d3.Map<any[]>;
+        protected _propertyBindings: d3.Map<Plots.AccessorScaleBinding<any, any>>;
+        /**
+         * A Plot draws some visualization of the inputted Datasets.
+         *
+         * @constructor
+         */
+        constructor();
+        anchor(selection: d3.Selection<void>): Plot;
+        protected _setup(): void;
+        destroy(): void;
+        /**
+         * Adds a Dataset to the Plot.
+         *
+         * @param {Dataset} dataset
+         * @returns {Plot} The calling Plot.
+         */
+        addDataset(dataset: Dataset): Plot;
+        protected _createNodesForDataset(dataset: Dataset): Drawer;
+        protected _createDrawer(dataset: Dataset): Drawer;
+        protected _getAnimator(key: string): Animator;
+        protected _onDatasetUpdate(): void;
+        /**
+         * Gets the AccessorScaleBinding for a particular attribute.
+         *
+         * @param {string} attr
+         */
+        attr<A>(attr: string): Plots.AccessorScaleBinding<A, number | string>;
+        /**
+         * Sets a particular attribute to a constant value or the result of an Accessor.
+         *
+         * @param {string} attr
+         * @param {number|string|Accessor<number>|Accessor<string>} attrValue
+         * @returns {Plot} The calling Plot.
+         */
+        attr(attr: string, attrValue: number | string | Accessor<number> | Accessor<string>): Plot;
+        /**
+         * Sets a particular attribute to a scaled constant value or scaled result of an Accessor.
+         * The provided Scale will account for the attribute values when autoDomain()-ing.
+         *
+         * @param {string} attr
+         * @param {A|Accessor<A>} attrValue
+         * @param {Scale<A, number | string>} scale The Scale used to scale the attrValue.
+         * @returns {Plot} The calling Plot.
+         */
+        attr<A>(attr: string, attrValue: A | Accessor<A>, scale: Scale<A, number | string>): Plot;
+        protected _bindProperty(property: string, value: any, scale: Scale<any, any>): void;
+        protected _generateAttrToProjector(): AttributeToProjector;
+        renderImmediately(): Plot;
+        /**
+         * Returns whether the plot will be animated.
+         */
+        animated(): boolean;
+        /**
+         * Enables or disables animation.
+         */
+        animated(willAnimate: boolean): Plot;
+        detach(): Plot;
+        /**
+         * Updates the extents associated with each attribute, then autodomains all scales the Plot uses.
+         */
+        protected _updateExtents(): void;
+        protected _updateExtentsForProperty(property: string): void;
+        protected _filterForProperty(property: string): Accessor<boolean>;
+        /**
+         * Override in subclass to add special extents, such as included values
+         */
+        protected _extentsForProperty(property: string): any[];
+        /**
+         * Get the Animator associated with the specified Animator key.
+         *
+         * @return {Animator}
+         */
+        animator(animatorKey: string): Animator;
+        /**
+         * Set the Animator associated with the specified Animator key.
+         *
+         * @param {string} animatorKey
+         * @param {Animator} animator
+         * @returns {Plot} The calling Plot.
+         */
+        animator(animatorKey: string, animator: Animator): Plot;
+        /**
+         * Removes a Dataset from the Plot.
+         *
+         * @param {Dataset} dataset
+         * @returns {Plot} The calling Plot.
+         */
+        removeDataset(dataset: Dataset): Plot;
+        protected _removeDatasetNodes(dataset: Dataset): void;
+        datasets(): Dataset[];
+        datasets(datasets: Dataset[]): Plot;
+        protected _getDrawersInOrder(): Drawer[];
+        protected _generateDrawSteps(): Drawers.DrawStep[];
+        protected _additionalPaint(time: number): void;
+        protected _getDataToDraw(): Utils.Map<Dataset, any[]>;
+        /**
+         * Retrieves Selections of this Plot for the specified Datasets.
+         *
+         * @param {Dataset[]} [datasets] The Datasets to retrieve the Selections for.
+         *   If not provided, Selections will be retrieved for all Datasets on the Plot.
+         * @returns {d3.Selection}
+         */
+        selections(datasets?: Dataset[]): d3.Selection<any>;
+        /**
+         * Gets the Entities associated with the specified Datasets.
+         *
+         * @param {dataset[]} datasets The Datasets to retrieve the Entities for.
+         *   If not provided, returns defaults to all Datasets on the Plot.
+         * @return {Plots.PlotEntity[]}
+         */
+        entities(datasets?: Dataset[]): Plots.PlotEntity[];
+        /**
+         * Returns the PlotEntity nearest to the query point by the Euclidian norm, or undefined if no PlotEntity can be found.
+         *
+         * @param {Point} queryPoint
+         * @returns {Plots.PlotEntity} The nearest PlotEntity, or undefined if no PlotEntity can be found.
+         */
+        entityNearest(queryPoint: Point): Plots.PlotEntity;
+        protected _visibleOnPlot(datum: any, pixelPoint: Point, selection: d3.Selection<void>): boolean;
+        protected _entityVisibleOnPlot(pixelPoint: Point, datum: any, index: number, dataset: Dataset): boolean;
+        protected _uninstallScaleForKey(scale: Scale<any, any>, key: string): void;
+        protected _installScaleForKey(scale: Scale<any, any>, key: string): void;
+        protected _propertyProjectors(): AttributeToProjector;
+        protected static _scaledAccessor<D, R>(binding: Plots.AccessorScaleBinding<D, R>): Accessor<any>;
+        protected _pixelPoint(datum: any, index: number, dataset: Dataset): Point;
+        protected _animateOnNextRender(): boolean;
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Plots {
+        class Pie extends Plot {
+            /**
+             * @constructor
+             */
+            constructor();
+            computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): Pie;
+            addDataset(dataset: Dataset): Pie;
+            removeDataset(dataset: Dataset): Pie;
+            protected _onDatasetUpdate(): void;
+            protected _createDrawer(dataset: Dataset): Drawers.Arc;
+            entities(datasets?: Dataset[]): PlotEntity[];
+            /**
+             * Gets the AccessorScaleBinding for the sector value.
+             */
+            sectorValue<S>(): AccessorScaleBinding<S, number>;
+            /**
+             * Sets the sector value to a constant number or the result of an Accessor<number>.
+             *
+             * @param {number|Accessor<number>} sectorValue
+             * @returns {Pie} The calling Pie Plot.
+             */
+            sectorValue(sectorValue: number | Accessor<number>): Plots.Pie;
+            /**
+             * Sets the sector value to a scaled constant value or scaled result of an Accessor.
+             * The provided Scale will account for the values when autoDomain()-ing.
+             *
+             * @param {S|Accessor<S>} sectorValue
+             * @param {Scale<S, number>} scale
+             * @returns {Pie} The calling Pie Plot.
+             */
+            sectorValue<S>(sectorValue: S | Accessor<S>, scale: Scale<S, number>): Plots.Pie;
+            /**
+             * Gets the AccessorScaleBinding for the inner radius.
+             */
+            innerRadius<R>(): AccessorScaleBinding<R, number>;
+            /**
+             * Sets the inner radius to a constant number or the result of an Accessor<number>.
+             *
+             * @param {number|Accessor<number>} innerRadius
+             * @returns {Pie} The calling Pie Plot.
+             */
+            innerRadius(innerRadius: number | Accessor<number>): Plots.Pie;
+            /**
+             * Sets the inner radius to a scaled constant value or scaled result of an Accessor.
+             * The provided Scale will account for the values when autoDomain()-ing.
+             *
+             * @param {R|Accessor<R>} innerRadius
+             * @param {Scale<R, number>} scale
+             * @returns {Pie} The calling Pie Plot.
+             */
+            innerRadius<R>(innerRadius: R | Accessor<R>, scale: Scale<R, number>): Plots.Pie;
+            /**
+             * Gets the AccessorScaleBinding for the outer radius.
+             */
+            outerRadius<R>(): AccessorScaleBinding<R, number>;
+            /**
+             * Sets the outer radius to a constant number or the result of an Accessor<number>.
+             *
+             * @param {number|Accessor<number>} outerRadius
+             * @returns {Pie} The calling Pie Plot.
+             */
+            outerRadius(outerRadius: number | Accessor<number>): Plots.Pie;
+            /**
+             * Sets the outer radius to a scaled constant value or scaled result of an Accessor.
+             * The provided Scale will account for the values when autoDomain()-ing.
+             *
+             * @param {R|Accessor<R>} outerRadius
+             * @param {Scale<R, number>} scale
+             * @returns {Pie} The calling Pie Plot.
+             */
+            outerRadius<R>(outerRadius: R | Accessor<R>, scale: Scale<R, number>): Plots.Pie;
+            /**
+             * Get whether slice labels are enabled.
+             *
+             * @returns {boolean} Whether slices should display labels or not.
+             */
+            labelsEnabled(): boolean;
+            /**
+             * Sets whether labels are enabled.
+             *
+             * @param {boolean} labelsEnabled
+             * @returns {Pie} The calling Pie Plot.
+             */
+            labelsEnabled(enabled: boolean): Pie;
+            /**
+             * Gets the Formatter for the labels.
+             */
+            labelFormatter(): Formatter;
+            /**
+             * Sets the Formatter for the labels.
+             *
+             * @param {Formatter} formatter
+             * @returns {Pie} The calling Pie Plot.
+             */
+            labelFormatter(formatter: Formatter): Pie;
+            entitiesAt(queryPoint: Point): PlotEntity[];
+            protected _propertyProjectors(): AttributeToProjector;
+            protected _getDataToDraw(): Utils.Map<Dataset, any[]>;
+            protected _pixelPoint(datum: any, index: number, dataset: Dataset): {
+                x: number;
+                y: number;
+            };
+            protected _additionalPaint(time: number): void;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    class XYPlot<X, Y> extends Plot {
+        protected static _X_KEY: string;
+        protected static _Y_KEY: string;
+        /**
+         * An XYPlot is a Plot that displays data along two primary directions, X and Y.
+         *
+         * @constructor
+         * @param {Scale} xScale The x scale to use.
+         * @param {Scale} yScale The y scale to use.
+         */
+        constructor();
+        /**
+         * Returns the whether or not the rendering is deferred for performance boost.
+         * @return {boolean} The deferred rendering option
+         */
+        deferredRendering(): boolean;
+        /**
+         * Sets / unsets the deferred rendering option
+         * Activating this option improves the performance of plot interaction (pan / zoom) by
+         * performing lazy renders, only after the interaction has stopped. Because re-rendering
+         * is no longer performed during the interaction, the zooming might experience a small
+         * resolution degradation, before the lazy re-render is performed.
+         *
+         * This option is intended for cases where performance is an issue.
+         */
+        deferredRendering(deferredRendering: boolean): XYPlot<X, Y>;
+        /**
+         * Gets the AccessorScaleBinding for X.
+         */
+        x(): Plots.AccessorScaleBinding<X, number>;
+        /**
+         * Sets X to a constant number or the result of an Accessor<number>.
+         *
+         * @param {number|Accessor<number>} x
+         * @returns {XYPlot} The calling XYPlot.
+         */
+        x(x: number | Accessor<number>): XYPlot<X, Y>;
+        /**
+         * Sets X to a scaled constant value or scaled result of an Accessor.
+         * The provided Scale will account for the values when autoDomain()-ing.
+         *
+         * @param {X|Accessor<X>} x
+         * @param {Scale<X, number>} xScale
+         * @returns {XYPlot} The calling XYPlot.
+         */
+        x(x: X | Accessor<X>, xScale: Scale<X, number>): XYPlot<X, Y>;
+        /**
+         * Gets the AccessorScaleBinding for Y.
+         */
+        y(): Plots.AccessorScaleBinding<Y, number>;
+        /**
+         * Sets Y to a constant number or the result of an Accessor<number>.
+         *
+         * @param {number|Accessor<number>} y
+         * @returns {XYPlot} The calling XYPlot.
+         */
+        y(y: number | Accessor<number>): XYPlot<X, Y>;
+        /**
+         * Sets Y to a scaled constant value or scaled result of an Accessor.
+         * The provided Scale will account for the values when autoDomain()-ing.
+         *
+         * @param {Y|Accessor<Y>} y
+         * @param {Scale<Y, number>} yScale
+         * @returns {XYPlot} The calling XYPlot.
+         */
+        y(y: Y | Accessor<Y>, yScale: Scale<Y, number>): XYPlot<X, Y>;
+        protected _filterForProperty(property: string): (datum: any, index: number, dataset: Dataset) => boolean;
+        protected _uninstallScaleForKey(scale: Scale<any, any>, key: string): void;
+        protected _installScaleForKey(scale: Scale<any, any>, key: string): void;
+        destroy(): XYPlot<X, Y>;
+        /**
+         * Gets the automatic domain adjustment mode for visible points.
+         */
+        autorangeMode(): string;
+        /**
+         * Sets the automatic domain adjustment mode for visible points to operate against the X Scale, Y Scale, or neither.
+         * If "x" or "y" is specified the adjustment is immediately performed.
+         *
+         * @param {string} autorangeMode One of "x"/"y"/"none".
+         *   "x" will adjust the x Scale in relation to changes in the y domain.
+         *   "y" will adjust the y Scale in relation to changes in the x domain.
+         *   "none" means neither Scale will change automatically.
+         * @returns {XYPlot} The calling XYPlot.
+         */
+        autorangeMode(autorangeMode: string): XYPlot<X, Y>;
+        computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): XYPlot<X, Y>;
+        /**
+         * Adjusts the domains of both X and Y scales to show all data.
+         * This call does not override the autorange() behavior.
+         *
+         * @returns {XYPlot} The calling XYPlot.
+         */
+        showAllData(): XYPlot<X, Y>;
+        protected _projectorsReady(): boolean;
+        protected _pixelPoint(datum: any, index: number, dataset: Dataset): Point;
+        protected _getDataToDraw(): Utils.Map<Dataset, any[]>;
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Plots {
+        class Rectangle<X, Y> extends XYPlot<X, Y> {
+            /**
+             * A Rectangle Plot displays rectangles based on the data.
+             * The left and right edges of each rectangle can be set with x() and x2().
+             *   If only x() is set the Rectangle Plot will attempt to compute the correct left and right edge positions.
+             * The top and bottom edges of each rectangle can be set with y() and y2().
+             *   If only y() is set the Rectangle Plot will attempt to compute the correct top and bottom edge positions.
+             *
+             * @constructor
+             * @param {Scale.Scale} xScale
+             * @param {Scale.Scale} yScale
+             */
+            constructor();
+            protected _createDrawer(dataset: Dataset): Drawers.Rectangle;
+            protected _generateAttrToProjector(): {
+                [attr: string]: (datum: any, index: number, dataset: Dataset) => any;
+            };
+            protected _generateDrawSteps(): Drawers.DrawStep[];
+            protected _updateExtentsForProperty(property: string): void;
+            protected _filterForProperty(property: string): (datum: any, index: number, dataset: Dataset) => boolean;
+            /**
+             * Gets the AccessorScaleBinding for X.
+             */
+            x(): AccessorScaleBinding<X, number>;
+            /**
+             * Sets X to a constant number or the result of an Accessor<number>.
+             *
+             * @param {number|Accessor<number>} x
+             * @returns {Plots.Rectangle} The calling Rectangle Plot.
+             */
+            x(x: number | Accessor<number>): Plots.Rectangle<X, Y>;
+            /**
+             * Sets X to a scaled constant value or scaled result of an Accessor.
+             * The provided Scale will account for the values when autoDomain()-ing.
+             *
+             * @param {X|Accessor<X>} x
+             * @param {Scale<X, number>} xScale
+             * @returns {Plots.Rectangle} The calling Rectangle Plot.
+             */
+            x(x: X | Accessor<X>, xScale: Scale<X, number>): Plots.Rectangle<X, Y>;
+            /**
+             * Gets the AccessorScaleBinding for X2.
+             */
+            x2(): AccessorScaleBinding<X, number>;
+            /**
+             * Sets X2 to a constant number or the result of an Accessor.
+             * If a Scale has been set for X, it will also be used to scale X2.
+             *
+             * @param {number|Accessor<number>|X|Accessor<X>} x2
+             * @returns {Plots.Rectangle} The calling Rectangle Plot.
+             */
+            x2(x2: number | Accessor<number> | X | Accessor<X>): Plots.Rectangle<X, Y>;
+            /**
+             * Gets the AccessorScaleBinding for Y.
+             */
+            y(): AccessorScaleBinding<Y, number>;
+            /**
+             * Sets Y to a constant number or the result of an Accessor<number>.
+             *
+             * @param {number|Accessor<number>} y
+             * @returns {Plots.Rectangle} The calling Rectangle Plot.
+             */
+            y(y: number | Accessor<number>): Plots.Rectangle<X, Y>;
+            /**
+             * Sets Y to a scaled constant value or scaled result of an Accessor.
+             * The provided Scale will account for the values when autoDomain()-ing.
+             *
+             * @param {Y|Accessor<Y>} y
+             * @param {Scale<Y, number>} yScale
+             * @returns {Plots.Rectangle} The calling Rectangle Plot.
+             */
+            y(y: Y | Accessor<Y>, yScale: Scale<Y, number>): Plots.Rectangle<X, Y>;
+            /**
+             * Gets the AccessorScaleBinding for Y2.
+             */
+            y2(): AccessorScaleBinding<Y, number>;
+            /**
+             * Sets Y2 to a constant number or the result of an Accessor.
+             * If a Scale has been set for Y, it will also be used to scale Y2.
+             *
+             * @param {number|Accessor<number>|Y|Accessor<Y>} y2
+             * @returns {Plots.Rectangle} The calling Rectangle Plot.
+             */
+            y2(y2: number | Accessor<number> | Y | Accessor<Y>): Plots.Rectangle<X, Y>;
+            protected _propertyProjectors(): AttributeToProjector;
+            protected _pixelPoint(datum: any, index: number, dataset: Dataset): {
+                x: any;
+                y: any;
+            };
+            protected _getDataToDraw(): Utils.Map<Dataset, any[]>;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Plots {
+        class Scatter<X, Y> extends XYPlot<X, Y> {
+            /**
+             * A Scatter Plot draws a symbol at each data point.
+             *
+             * @constructor
+             */
+            constructor();
+            protected _createDrawer(dataset: Dataset): Drawers.Symbol;
+            /**
+             * Gets the AccessorScaleBinding for the size property of the plot.
+             * The size property corresponds to the area of the symbol.
+             */
+            size<S>(): AccessorScaleBinding<S, number>;
+            /**
+             * Sets the size property to a constant number or the result of an Accessor<number>.
+             *
+             * @param {number|Accessor<number>} size
+             * @returns {Plots.Scatter} The calling Scatter Plot.
+             */
+            size(size: number | Accessor<number>): Plots.Scatter<X, Y>;
+            /**
+             * Sets the size property to a scaled constant value or scaled result of an Accessor.
+             * The provided Scale will account for the values when autoDomain()-ing.
+             *
+             * @param {S|Accessor<S>} sectorValue
+             * @param {Scale<S, number>} scale
+             * @returns {Plots.Scatter} The calling Scatter Plot.
+             */
+            size<S>(size: S | Accessor<S>, scale: Scale<S, number>): Plots.Scatter<X, Y>;
+            /**
+             * Gets the AccessorScaleBinding for the symbol property of the plot.
+             * The symbol property corresponds to how the symbol will be drawn.
+             */
+            symbol(): AccessorScaleBinding<any, any>;
+            /**
+             * Sets the symbol property to an Accessor<SymbolFactory>.
+             *
+             * @param {Accessor<SymbolFactory>} symbol
+             * @returns {Plots.Scatter} The calling Scatter Plot.
+             */
+            symbol(symbol: Accessor<SymbolFactory>): Plots.Scatter<X, Y>;
+            protected _generateDrawSteps(): Drawers.DrawStep[];
+            protected _visibleOnPlot(datum: any, pixelPoint: Point, selection: d3.Selection<void>): boolean;
+            protected _entityVisibleOnPlot(pixelPoint: Point, datum: any, index: number, dataset: Dataset): boolean;
+            protected _propertyProjectors(): AttributeToProjector;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Plots {
+        class Bar<X, Y> extends XYPlot<X, Y> {
+            static ORIENTATION_VERTICAL: string;
+            static ORIENTATION_HORIZONTAL: string;
+            protected _isVertical: boolean;
+            /**
+             * A Bar Plot draws bars growing out from a baseline to some value
+             *
+             * @constructor
+             * @param {string} [orientation="vertical"] One of "vertical"/"horizontal".
+             */
+            constructor(orientation?: string);
+            x(): Plots.AccessorScaleBinding<X, number>;
+            x(x: number | Accessor<number>): Bar<X, Y>;
+            x(x: X | Accessor<X>, xScale: Scale<X, number>): Bar<X, Y>;
+            y(): Plots.AccessorScaleBinding<Y, number>;
+            y(y: number | Accessor<number>): Bar<X, Y>;
+            y(y: Y | Accessor<Y>, yScale: Scale<Y, number>): Bar<X, Y>;
+            /**
+             * Gets the orientation of the plot
+             *
+             * @return "vertical" | "horizontal"
+             */
+            orientation(): string;
+            render(): Bar<X, Y>;
+            protected _createDrawer(dataset: Dataset): Drawers.Rectangle;
+            protected _setup(): void;
+            /**
+             * Gets the baseline value.
+             * The baseline is the line that the bars are drawn from.
+             *
+             * @returns {X|Y}
+             */
+            baselineValue(): X | Y;
+            /**
+             * Sets the baseline value.
+             * The baseline is the line that the bars are drawn from.
+             *
+             * @param {X|Y} value
+             * @returns {Bar} The calling Bar Plot.
+             */
+            baselineValue(value: X | Y): Bar<X, Y>;
+            addDataset(dataset: Dataset): Bar<X, Y>;
+            removeDataset(dataset: Dataset): Bar<X, Y>;
+            /**
+             * Get whether bar labels are enabled.
+             *
+             * @returns {boolean} Whether bars should display labels or not.
+             */
+            labelsEnabled(): boolean;
+            /**
+             * Sets whether labels are enabled.
+             *
+             * @param {boolean} labelsEnabled
+             * @returns {Bar} The calling Bar Plot.
+             */
+            labelsEnabled(enabled: boolean): Bar<X, Y>;
+            /**
+             * Gets the Formatter for the labels.
+             */
+            labelFormatter(): Formatter;
+            /**
+             * Sets the Formatter for the labels.
+             *
+             * @param {Formatter} formatter
+             * @returns {Bar} The calling Bar Plot.
+             */
+            labelFormatter(formatter: Formatter): Bar<X, Y>;
+            protected _createNodesForDataset(dataset: Dataset): Drawer;
+            protected _removeDatasetNodes(dataset: Dataset): void;
+            /**
+             * Returns the PlotEntity nearest to the query point according to the following algorithm:
+             *   - If the query point is inside a bar, returns the PlotEntity for that bar.
+             *   - Otherwise, gets the nearest PlotEntity by the primary direction (X for vertical, Y for horizontal),
+             *     breaking ties with the secondary direction.
+             * Returns undefined if no PlotEntity can be found.
+             *
+             * @param {Point} queryPoint
+             * @returns {PlotEntity} The nearest PlotEntity, or undefined if no PlotEntity can be found.
+             */
+            entityNearest(queryPoint: Point): PlotEntity;
+            protected _visibleOnPlot(datum: any, pixelPoint: Point, selection: d3.Selection<void>): boolean;
+            protected _entityVisibleOnPlot(pixelPoint: Point, datum: any, index: number, dataset: Dataset): boolean;
+            /**
+             * Gets the Entities at a particular Point.
+             *
+             * @param {Point} p
+             * @returns {PlotEntity[]}
+             */
+            entitiesAt(p: Point): PlotEntity[];
+            /**
+             * Gets the Entities that intersect the Bounds.
+             *
+             * @param {Bounds} bounds
+             * @returns {PlotEntity[]}
+             */
+            entitiesIn(bounds: Bounds): PlotEntity[];
+            /**
+             * Gets the Entities that intersect the area defined by the ranges.
+             *
+             * @param {Range} xRange
+             * @param {Range} yRange
+             * @returns {PlotEntity[]}
+             */
+            entitiesIn(xRange: Range, yRange: Range): PlotEntity[];
+            protected _additionalPaint(time: number): void;
+            protected _generateDrawSteps(): Drawers.DrawStep[];
+            protected _generateAttrToProjector(): {
+                [attr: string]: (datum: any, index: number, dataset: Dataset) => any;
+            };
+            /**
+             * Computes the barPixelWidth of all the bars in the plot.
+             *
+             * If the position scale of the plot is a CategoryScale and in bands mode, then the rangeBands function will be used.
+             * If the position scale of the plot is a CategoryScale and in points mode, then
+             *   from https://github.com/mbostock/d3/wiki/Ordinal-Scales#ordinal_rangePoints, the max barPixelWidth is step * padding
+             * If the position scale of the plot is a QuantitativeScale, then _getMinimumDataWidth is scaled to compute the barPixelWidth
+             */
+            protected _getBarPixelWidth(): number;
+            entities(datasets?: Dataset[]): PlotEntity[];
+            protected _pixelPoint(datum: any, index: number, dataset: Dataset): {
+                x: any;
+                y: any;
+            };
+            protected _uninstallScaleForKey(scale: Scale<any, number>, key: string): void;
+            protected _getDataToDraw(): Utils.Map<Dataset, any[]>;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Plots {
+        class Line<X> extends XYPlot<X, number> {
+            /**
+             * A Line Plot draws line segments starting from the first data point to the next.
+             *
+             * @constructor
+             */
+            constructor();
+            protected _createDrawer(dataset: Dataset): Drawer;
+            protected _getResetYFunction(): (d: any, i: number, dataset: Dataset) => number;
+            protected _generateDrawSteps(): Drawers.DrawStep[];
+            protected _generateAttrToProjector(): {
+                [attr: string]: (datum: any, index: number, dataset: Dataset) => any;
+            };
+            /**
+             * Returns the PlotEntity nearest to the query point by X then by Y, or undefined if no PlotEntity can be found.
+             *
+             * @param {Point} queryPoint
+             * @returns {PlotEntity} The nearest PlotEntity, or undefined if no PlotEntity can be found.
+             */
+            entityNearest(queryPoint: Point): PlotEntity;
+            protected _propertyProjectors(): AttributeToProjector;
+            protected _constructLineProjector(xProjector: Projector, yProjector: Projector): (datum: any, index: number, dataset: Dataset) => string;
+            protected _getDataToDraw(): Utils.Map<Dataset, any[]>;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Plots {
+        class Area<X> extends Line<X> {
+            /**
+             * An Area Plot draws a filled region (area) between Y and Y0.
+             *
+             * @constructor
+             */
+            constructor();
+            protected _setup(): void;
+            y(): Plots.AccessorScaleBinding<number, number>;
+            y(y: number | Accessor<number>): Area<X>;
+            y(y: number | Accessor<number>, yScale: QuantitativeScale<number>): Area<X>;
+            /**
+             * Gets the AccessorScaleBinding for Y0.
+             */
+            y0(): Plots.AccessorScaleBinding<number, number>;
+            /**
+             * Sets Y0 to a constant number or the result of an Accessor<number>.
+             * If a Scale has been set for Y, it will also be used to scale Y0.
+             *
+             * @param {number|Accessor<number>} y0
+             * @returns {Area} The calling Area Plot.
+             */
+            y0(y0: number | Accessor<number>): Area<X>;
+            protected _onDatasetUpdate(): void;
+            addDataset(dataset: Dataset): Area<X>;
+            protected _removeDatasetNodes(dataset: Dataset): void;
+            protected _additionalPaint(): void;
+            protected _createDrawer(dataset: Dataset): Drawers.Area;
+            protected _generateDrawSteps(): Drawers.DrawStep[];
+            protected _updateYScale(): void;
+            protected _getResetYFunction(): Accessor<any>;
+            protected _propertyProjectors(): AttributeToProjector;
+            selections(datasets?: Dataset[]): d3.Selection<any>;
+            protected _constructAreaProjector(xProjector: Projector, yProjector: Projector, y0Projector: Projector): (datum: any[], index: number, dataset: Dataset) => string;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Plots {
+        class ClusteredBar<X, Y> extends Bar<X, Y> {
+            /**
+             * A ClusteredBar Plot groups bars across Datasets based on the primary value of the bars.
+             *   On a vertical ClusteredBar Plot, the bars with the same X value are grouped.
+             *   On a horizontal ClusteredBar Plot, the bars with the same Y value are grouped.
+             *
+             * @constructor
+             * @param {string} [orientation="vertical"] One of "vertical"/"horizontal".
+             */
+            constructor(orientation?: string);
+            protected _generateAttrToProjector(): {
+                [attr: string]: (datum: any, index: number, dataset: Dataset) => any;
+            };
+            protected _getDataToDraw(): Utils.Map<Dataset, any[]>;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Plots {
+        class StackedArea<X> extends Area<X> {
+            /**
+             * @constructor
+             */
+            constructor();
+            protected _getAnimator(key: string): Animator;
+            protected _setup(): void;
+            x(): Plots.AccessorScaleBinding<X, number>;
+            x(x: number | Accessor<number>): StackedArea<X>;
+            x(x: X | Accessor<X>, xScale: Scale<X, number>): StackedArea<X>;
+            y(): Plots.AccessorScaleBinding<number, number>;
+            y(y: number | Accessor<number>): StackedArea<X>;
+            y(y: number | Accessor<number>, yScale: QuantitativeScale<number>): StackedArea<X>;
+            protected _additionalPaint(): void;
+            protected _updateYScale(): void;
+            protected _onDatasetUpdate(): StackedArea<X>;
+            protected _updateExtentsForProperty(property: string): void;
+            protected _extentsForProperty(attr: string): any[];
+            protected _propertyProjectors(): AttributeToProjector;
+            protected _pixelPoint(datum: any, index: number, dataset: Dataset): Point;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Plots {
+        class StackedBar<X, Y> extends Bar<X, Y> {
+            /**
+             * A StackedBar Plot stacks bars across Datasets based on the primary value of the bars.
+             *   On a vertical StackedBar Plot, the bars with the same X value are stacked.
+             *   On a horizontal StackedBar Plot, the bars with the same Y value are stacked.
+             *
+             * @constructor
+             * @param {Scale} xScale
+             * @param {Scale} yScale
+             * @param {string} [orientation="vertical"] One of "vertical"/"horizontal".
+             */
+            constructor(orientation?: string);
+            x(): Plots.AccessorScaleBinding<X, number>;
+            x(x: number | Accessor<number>): StackedBar<X, Y>;
+            x(x: X | Accessor<X>, xScale: Scale<X, number>): StackedBar<X, Y>;
+            y(): Plots.AccessorScaleBinding<Y, number>;
+            y(y: number | Accessor<number>): StackedBar<X, Y>;
+            y(y: Y | Accessor<Y>, yScale: Scale<Y, number>): StackedBar<X, Y>;
+            protected _generateAttrToProjector(): {
+                [attr: string]: (datum: any, index: number, dataset: Dataset) => any;
+            };
+            protected _onDatasetUpdate(): StackedBar<X, Y>;
+            protected _updateExtentsForProperty(property: string): void;
+            protected _extentsForProperty(attr: string): any[];
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Plots {
+        class Segment<X, Y> extends XYPlot<X, Y> {
+            /**
+             * A Segment Plot displays line segments based on the data.
+             *
+             * @constructor
+             */
+            constructor();
+            protected _createDrawer(dataset: Dataset): Drawers.Segment;
+            protected _generateDrawSteps(): Drawers.DrawStep[];
+            protected _updateExtentsForProperty(property: string): void;
+            protected _filterForProperty(property: string): (datum: any, index: number, dataset: Dataset) => boolean;
+            /**
+             * Gets the AccessorScaleBinding for X
+             */
+            x(): AccessorScaleBinding<X, number>;
+            /**
+             * Sets X to a constant value or the result of an Accessor.
+             *
+             * @param {X|Accessor<X>} x
+             * @returns {Plots.Segment} The calling Segment Plot.
+             */
+            x(x: number | Accessor<number>): Plots.Segment<X, Y>;
+            /**
+             * Sets X to a scaled constant value or scaled result of an Accessor.
+             * The provided Scale will account for the values when autoDomain()-ing.
+             *
+             * @param {X|Accessor<X>} x
+             * @param {Scale<X, number>} xScale
+             * @returns {Plots.Segment} The calling Segment Plot.
+             */
+            x(x: X | Accessor<X>, xScale: Scale<X, number>): Plots.Segment<X, Y>;
+            /**
+             * Gets the AccessorScaleBinding for X2
+             */
+            x2(): AccessorScaleBinding<X, number>;
+            /**
+             * Sets X2 to a constant number or the result of an Accessor.
+             * If a Scale has been set for X, it will also be used to scale X2.
+             *
+             * @param {number|Accessor<number>|Y|Accessor<Y>} y2
+             * @returns {Plots.Segment} The calling Segment Plot
+             */
+            x2(x2: number | Accessor<number> | X | Accessor<X>): Plots.Segment<X, Y>;
+            /**
+             * Gets the AccessorScaleBinding for Y
+             */
+            y(): AccessorScaleBinding<Y, number>;
+            /**
+             * Sets Y to a constant value or the result of an Accessor.
+             *
+             * @param {Y|Accessor<Y>} y
+             * @returns {Plots.Segment} The calling Segment Plot.
+             */
+            y(y: number | Accessor<number>): Plots.Segment<X, Y>;
+            /**
+             * Sets Y to a scaled constant value or scaled result of an Accessor.
+             * The provided Scale will account for the values when autoDomain()-ing.
+             *
+             * @param {Y|Accessor<Y>} y
+             * @param {Scale<Y, number>} yScale
+             * @returns {Plots.Segment} The calling Segment Plot.
+             */
+            y(y: Y | Accessor<Y>, yScale: Scale<Y, number>): Plots.Segment<X, Y>;
+            /**
+             * Gets the AccessorScaleBinding for Y2.
+             */
+            y2(): AccessorScaleBinding<Y, number>;
+            /**
+             * Sets Y2 to a constant number or the result of an Accessor.
+             * If a Scale has been set for Y, it will also be used to scale Y2.
+             *
+             * @param {number|Accessor<number>|Y|Accessor<Y>} y2
+             * @returns {Plots.Segment} The calling Segment Plot.
+             */
+            y2(y2: number | Accessor<number> | Y | Accessor<Y>): Plots.Segment<X, Y>;
+            protected _propertyProjectors(): AttributeToProjector;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Plots {
+        class Waterfall<X, Y> extends Bar<X, number> {
+            constructor();
+            /**
+             * Gets whether connectors are enabled.
+             *
+             * @returns {boolean} Whether connectors should be shown or not.
+             */
+            connectorsEnabled(): boolean;
+            /**
+             * Sets whether connectors are enabled.
+             *
+             * @param {boolean} enabled
+             * @returns {Plots.Waterfall} The calling Waterfall Plot.
+             */
+            connectorsEnabled(enabled: boolean): Waterfall<X, Y>;
+            /**
+             * Gets the AccessorScaleBinding for whether a bar represents a total or a delta.
+             */
+            total<T>(): Plots.AccessorScaleBinding<T, boolean>;
+            /**
+             * Sets total to a constant number or the result of an Accessor
+             *
+             * @param {Accessor<boolean>}
+             * @returns {Plots.Waterfall} The calling Waterfall Plot.
+             */
+            total(total: Accessor<boolean>): Waterfall<X, Y>;
+            protected _additionalPaint(time: number): void;
+            protected _createNodesForDataset(dataset: Dataset): Drawer;
+            protected _extentsForProperty(attr: string): any[];
+            protected _generateAttrToProjector(): {
+                [attr: string]: (datum: any, index: number, dataset: Dataset) => any;
+            };
+            protected _onDatasetUpdate(): Waterfall<X, Y>;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    interface Animator {
+        /**
+         * Applies the supplied attributes to a d3.Selection with some animation.
+         *
+         * @param {d3.Selection} selection The update selection or transition selection that we wish to animate.
+         * @param {AttributeToAppliedProjector} attrToAppliedProjector The set of
+         *     AppliedProjectors that we will use to set attributes on the selection.
+         * @return {any} Animators should return the selection or
+         *     transition object so that plots may chain the transitions between
+         *     animators.
+         */
+        animate(selection: d3.Selection<any>, attrToAppliedProjector: AttributeToAppliedProjector): d3.Selection<any> | d3.Transition<any>;
+        /**
+         * Given the number of elements, return the total time the animation requires
+         *
+         * @param {number} numberofIterations The number of elements that will be drawn
+         * @returns {number}
+         */
+        totalTime(numberOfIterations: number): number;
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Animators {
+        /**
+         * An animator implementation with no animation. The attributes are
+         * immediately set on the selection.
+         */
+        class Null implements Animator {
+            totalTime(selection: any): number;
+            animate(selection: d3.Selection<any>, attrToAppliedProjector: AttributeToAppliedProjector): d3.Selection<any>;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Animators {
+        /**
+         * An Animator with easing and configurable durations and delays.
+         */
+        class Easing implements Animator {
+            /**
+             * Constructs the default animator
+             *
+             * @constructor
+             */
+            constructor();
+            totalTime(numberOfSteps: number): number;
+            animate(selection: d3.Selection<any>, attrToAppliedProjector: AttributeToAppliedProjector): d3.Transition<any>;
+            /**
+             * Gets the start delay of the animation in milliseconds.
+             *
+             * @returns {number} The current start delay.
+             */
+            startDelay(): number;
+            /**
+             * Sets the start delay of the animation in milliseconds.
+             *
+             * @param {number} startDelay The start delay in milliseconds.
+             * @returns {Easing} The calling Easing Animator.
+             */
+            startDelay(startDelay: number): Easing;
+            /**
+             * Gets the duration of one animation step in milliseconds.
+             *
+             * @returns {number} The current duration.
+             */
+            stepDuration(): number;
+            /**
+             * Sets the duration of one animation step in milliseconds.
+             *
+             * @param {number} stepDuration The duration in milliseconds.
+             * @returns {Easing} The calling Easing Animator.
+             */
+            stepDuration(stepDuration: number): Easing;
+            /**
+             * Gets the maximum start delay between animation steps in milliseconds.
+             *
+             * @returns {number} The current maximum iterative delay.
+             */
+            stepDelay(): number;
+            /**
+             * Sets the maximum start delay between animation steps in milliseconds.
+             *
+             * @param {number} stepDelay The maximum iterative delay in milliseconds.
+             * @returns {Easing} The calling Easing Animator.
+             */
+            stepDelay(stepDelay: number): Easing;
+            /**
+             * Gets the maximum total animation duration constraint in milliseconds.
+             *
+             * If the animation time would exceed the specified time, the duration of each step
+             * and the delay between each step will be reduced until the animation fits within
+             * the specified time.
+             *
+             * @returns {number} The current maximum total animation duration.
+             */
+            maxTotalDuration(): number;
+            /**
+             * Sets the maximum total animation duration constraint in miliseconds.
+             *
+             * If the animation time would exceed the specified time, the duration of each step
+             * and the delay between each step will be reduced until the animation fits within
+             * the specified time.
+             *
+             * @param {number} maxTotalDuration The maximum total animation duration in milliseconds.
+             * @returns {Easing} The calling Easing Animator.
+             */
+            maxTotalDuration(maxTotalDuration: number): Easing;
+            /**
+             * Gets the current easing mode of the animation.
+             *
+             * @returns {string} the current easing mode.
+             */
+            easingMode(): string;
+            /**
+             * Sets the easing mode of the animation.
+             *
+             * @param {string} easingMode The desired easing mode.
+             * @returns {Easing} The calling Easing Animator.
+             */
+            easingMode(easingMode: string): Easing;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    class Dispatcher {
+        protected _eventToCallback: {
+            [eventName: string]: (e: Event) => any;
+        };
+        protected _callbacks: Utils.CallbackSet<Function>[];
+        protected _setCallback(callbackSet: Utils.CallbackSet<Function>, callback: Function): void;
+        protected _unsetCallback(callbackSet: Utils.CallbackSet<Function>, callback: Function): void;
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Dispatchers {
+        type MouseCallback = (p: Point, event: MouseEvent) => void;
+        class Mouse extends Dispatcher {
+            /**
+             * Get a Mouse Dispatcher for the <svg> containing elem.
+             * If one already exists on that <svg>, it will be returned; otherwise, a new one will be created.
+             *
+             * @param {SVGElement} elem
+             * @return {Dispatchers.Mouse}
+             */
+            static getDispatcher(elem: SVGElement): Dispatchers.Mouse;
+            /**
+             * This constructor not be invoked directly.
+             *
+             * @constructor
+             * @param {SVGElement} svg The root <svg> to attach to.
+             */
+            constructor(svg: SVGElement);
+            /**
+             * Registers a callback to be called when the mouse position changes.
+             *
+             * @param {MouseCallback} callback
+             * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
+             */
+            onMouseMove(callback: MouseCallback): Dispatchers.Mouse;
+            /**
+             * Removes a callback that would be called when the mouse position changes.
+             *
+             * @param {MouseCallback} callback
+             * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
+             */
+            offMouseMove(callback: MouseCallback): Dispatchers.Mouse;
+            /**
+             * Registers a callback to be called when a mousedown occurs.
+             *
+             * @param {MouseCallback} callback
+             * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
+             */
+            onMouseDown(callback: MouseCallback): Dispatchers.Mouse;
+            /**
+             * Removes a callback that would be called when a mousedown occurs.
+             *
+             * @param {MouseCallback} callback
+             * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
+             */
+            offMouseDown(callback: MouseCallback): Dispatchers.Mouse;
+            /**
+             * Registers a callback to be called when a mouseup occurs.
+             *
+             * @param {MouseCallback} callback
+             * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
+             */
+            onMouseUp(callback: MouseCallback): Dispatchers.Mouse;
+            /**
+             * Removes a callback that would be called when a mouseup occurs.
+             *
+             * @param {MouseCallback} callback
+             * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
+             */
+            offMouseUp(callback: MouseCallback): Dispatchers.Mouse;
+            /**
+             * Registers a callback to be called when a wheel event occurs.
+             *
+             * @param {MouseCallback} callback
+             * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
+             */
+            onWheel(callback: MouseCallback): Dispatchers.Mouse;
+            /**
+             * Removes a callback that would be called when a wheel event occurs.
+             *
+             * @param {MouseCallback} callback
+             * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
+             */
+            offWheel(callback: MouseCallback): Dispatchers.Mouse;
+            /**
+             * Registers a callback to be called when a dblClick occurs.
+             *
+             * @param {MouseCallback} callback
+             * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
+             */
+            onDblClick(callback: MouseCallback): Dispatchers.Mouse;
+            /**
+             * Removes a callback that would be called when a dblClick occurs.
+             *
+             * @param {MouseCallback} callback
+             * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
+             */
+            offDblClick(callback: MouseCallback): Dispatchers.Mouse;
+            /**
+             * Returns the last computed mouse position in <svg> coordinate space.
+             *
+             * @return {Point}
+             */
+            lastMousePosition(): Point;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Dispatchers {
+        type TouchCallback = (ids: number[], idToPoint: {
+            [id: number]: Point;
+        }, event: TouchEvent) => void;
+        class Touch extends Dispatcher {
+            /**
+             * Gets a Touch Dispatcher for the <svg> containing elem.
+             * If one already exists on that <svg>, it will be returned; otherwise, a new one will be created.
+             *
+             * @param {SVGElement} elem
+             * @return {Dispatchers.Touch}
+             */
+            static getDispatcher(elem: SVGElement): Dispatchers.Touch;
+            /**
+             * This constructor should not be invoked directly.
+             *
+             * @constructor
+             * @param {SVGElement} svg The root <svg> to attach to.
+             */
+            constructor(svg: SVGElement);
+            /**
+             * Registers a callback to be called when a touch starts.
+             *
+             * @param {TouchCallback} callback
+             * @return {Dispatchers.Touch} The calling Touch Dispatcher.
+             */
+            onTouchStart(callback: TouchCallback): Dispatchers.Touch;
+            /**
+             * Removes a callback that would be called when a touch starts.
+             *
+             * @param {TouchCallback} callback
+             * @return {Dispatchers.Touch} The calling Touch Dispatcher.
+             */
+            offTouchStart(callback: TouchCallback): Dispatchers.Touch;
+            /**
+             * Registers a callback to be called when the touch position changes.
+             *
+             * @param {TouchCallback} callback
+             * @return {Dispatchers.Touch} The calling Touch Dispatcher.
+             */
+            onTouchMove(callback: TouchCallback): Dispatchers.Touch;
+            /**
+             * Removes a callback that would be called when the touch position changes.
+             *
+             * @param {TouchCallback} callback
+             * @return {Dispatchers.Touch} The calling Touch Dispatcher.
+             */
+            offTouchMove(callback: TouchCallback): Dispatchers.Touch;
+            /**
+             * Registers a callback to be called when a touch ends.
+             *
+             * @param {TouchCallback} callback
+             * @return {Dispatchers.Touch} The calling Touch Dispatcher.
+             */
+            onTouchEnd(callback: TouchCallback): Dispatchers.Touch;
+            /**
+             * Removes a callback that would be called when a touch ends.
+             *
+             * @param {TouchCallback} callback
+             * @return {Dispatchers.Touch} The calling Touch Dispatcher.
+             */
+            offTouchEnd(callback: TouchCallback): Dispatchers.Touch;
+            /**
+             * Registers a callback to be called when a touch is cancelled.
+             *
+             * @param {TouchCallback} callback
+             * @return {Dispatchers.Touch} The calling Touch Dispatcher.
+             */
+            onTouchCancel(callback: TouchCallback): Dispatchers.Touch;
+            /**
+             * Removes a callback that would be called when a touch is cancelled.
+             *
+             * @param {TouchCallback} callback
+             * @return {Dispatchers.Touch} The calling Touch Dispatcher.
+             */
+            offTouchCancel(callback: TouchCallback): Dispatchers.Touch;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Dispatchers {
+        type KeyCallback = (keyCode: number, event: KeyboardEvent) => void;
+        class Key extends Dispatcher {
+            /**
+             * Gets a Key Dispatcher. If one already exists it will be returned;
+             * otherwise, a new one will be created.
+             *
+             * @return {Dispatchers.Key}
+             */
+            static getDispatcher(): Dispatchers.Key;
+            /**
+             * This constructor should not be invoked directly.
+             *
+             * @constructor
+             */
+            constructor();
+            /**
+             * Registers a callback to be called whenever a key is pressed.
+             *
+             * @param {KeyCallback} callback
+             * @return {Dispatchers.Key} The calling Key Dispatcher.
+             */
+            onKeyDown(callback: KeyCallback): Key;
+            /**
+             * Removes the callback to be called whenever a key is pressed.
+             *
+             * @param {KeyCallback} callback
+             * @return {Dispatchers.Key} The calling Key Dispatcher.
+             */
+            offKeyDown(callback: KeyCallback): Key;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    class Interaction {
+        protected _componentAttachedTo: Component;
+        protected _anchor(component: Component): void;
+        protected _unanchor(): void;
+        /**
+         * Attaches this Interaction to a Component.
+         * If the Interaction was already attached to a Component, it first detaches itself from the old Component.
+         *
+         * @param {Component} component
+         * @returns {Interaction} The calling Interaction.
+         */
+        attachTo(component: Component): Interaction;
+        /**
+         * Detaches this Interaction from the Component.
+         * This Interaction can be reused.
+         *
+         * @param {Component} component
+         * @returns {Interaction} The calling Interaction.
+         */
+        detachFrom(component: Component): Interaction;
+        /**
+         * Gets whether this Interaction is enabled.
+         */
+        enabled(): boolean;
+        /**
+         * Enables or disables this Interaction.
+         *
+         * @param {boolean} enabled Whether the Interaction should be enabled.
+         * @return {Interaction} The calling Interaction.
+         */
+        enabled(enabled: boolean): Interaction;
+        /**
+         * Translates an <svg>-coordinate-space point to Component-space coordinates.
+         *
+         * @param {Point} p A Point in <svg>-space coordinates.
+         * @return {Point} The same location in Component-space coordinates.
+         */
+        protected _translateToComponentSpace(p: Point): Point;
+        /**
+         * Checks whether a Component-coordinate-space Point is inside the Component.
+         *
+         * @param {Point} p A Point in Compoennt-space coordinates.
+         * @return {boolean} Whether or not the point is inside the Component.
+         */
+        protected _isInsideComponent(p: Point): boolean;
+    }
+}
+
+
+declare namespace Plottable {
+    type ClickCallback = (point: Point) => void;
+    namespace Interactions {
+        class Click extends Interaction {
+            protected _anchor(component: Component): void;
+            protected _unanchor(): void;
+            /**
+             * Adds a callback to be called when the Component is clicked.
+             *
+             * @param {ClickCallback} callback
+             * @return {Interactions.Click} The calling Click Interaction.
+             */
+            onClick(callback: ClickCallback): Click;
+            /**
+             * Removes a callback that would be called when the Component is clicked.
+             *
+             * @param {ClickCallback} callback
+             * @return {Interactions.Click} The calling Click Interaction.
+             */
+            offClick(callback: ClickCallback): Click;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Interactions {
+        class DoubleClick extends Interaction {
+            protected _anchor(component: Component): void;
+            protected _unanchor(): void;
+            /**
+             * Adds a callback to be called when the Component is double-clicked.
+             *
+             * @param {ClickCallback} callback
+             * @return {Interactions.DoubleClick} The calling DoubleClick Interaction.
+             */
+            onDoubleClick(callback: ClickCallback): DoubleClick;
+            /**
+             * Removes a callback that would be called when the Component is double-clicked.
+             *
+             * @param {ClickCallback} callback
+             * @return {Interactions.DoubleClick} The calling DoubleClick Interaction.
+             */
+            offDoubleClick(callback: ClickCallback): DoubleClick;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    type KeyCallback = (keyCode: number) => void;
+    namespace Interactions {
+        class Key extends Interaction {
+            protected _anchor(component: Component): void;
+            protected _unanchor(): void;
+            /**
+             * Adds a callback to be called when the key with the given keyCode is
+             * pressed and the user is moused over the Component.
+             *
+             * @param {number} keyCode
+             * @param {KeyCallback} callback
+             * @returns {Interactions.Key} The calling Key Interaction.
+             */
+            onKeyPress(keyCode: number, callback: KeyCallback): Key;
+            /**
+             * Removes a callback that would be called when the key with the given keyCode is
+             * pressed and the user is moused over the Component.
+             *
+             * @param {number} keyCode
+             * @param {KeyCallback} callback
+             * @returns {Interactions.Key} The calling Key Interaction.
+             */
+            offKeyPress(keyCode: number, callback: KeyCallback): Key;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    type PointerCallback = (point: Point) => void;
+    namespace Interactions {
+        class Pointer extends Interaction {
+            protected _anchor(component: Component): void;
+            protected _unanchor(): void;
+            /**
+             * Adds a callback to be called when the pointer enters the Component.
+             *
+             * @param {PointerCallback} callback
+             * @return {Interactions.Pointer} The calling Pointer Interaction.
+             */
+            onPointerEnter(callback: PointerCallback): Pointer;
+            /**
+             * Removes a callback that would be called when the pointer enters the Component.
+             *
+             * @param {PointerCallback} callback
+             * @return {Interactions.Pointer} The calling Pointer Interaction.
+             */
+            offPointerEnter(callback: PointerCallback): Pointer;
+            /**
+             * Adds a callback to be called when the pointer moves within the Component.
+             *
+             * @param {PointerCallback} callback
+             * @return {Interactions.Pointer} The calling Pointer Interaction.
+             */
+            onPointerMove(callback: PointerCallback): Pointer;
+            /**
+             * Removes a callback that would be called when the pointer moves within the Component.
+             *
+             * @param {PointerCallback} callback
+             * @return {Interactions.Pointer} The calling Pointer Interaction.
+             */
+            offPointerMove(callback: PointerCallback): Pointer;
+            /**
+             * Adds a callback to be called when the pointer exits the Component.
+             *
+             * @param {PointerCallback} callback
+             * @return {Interactions.Pointer} The calling Pointer Interaction.
+             */
+            onPointerExit(callback: PointerCallback): Pointer;
+            /**
+             * Removes a callback that would be called when the pointer exits the Component.
+             *
+             * @param {PointerCallback} callback
+             * @return {Interactions.Pointer} The calling Pointer Interaction.
+             */
+            offPointerExit(callback: PointerCallback): Pointer;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Interactions {
+        class PanZoom extends Interaction {
+            /**
+             * A PanZoom Interaction updates the domains of an x-scale and/or a y-scale
+             * in response to the user panning or zooming.
+             *
+             * @constructor
+             * @param {QuantitativeScale} [xScale] The x-scale to update on panning/zooming.
+             * @param {QuantitativeScale} [yScale] The y-scale to update on panning/zooming.
+             */
+            constructor(xScale?: QuantitativeScale<any>, yScale?: QuantitativeScale<any>);
+            protected _anchor(component: Component): void;
+            protected _unanchor(): void;
+            /**
+             * Gets the x scales for this PanZoom Interaction.
+             */
+            xScales(): QuantitativeScale<any>[];
+            /**
+             * Sets the x scales for this PanZoom Interaction.
+             *
+             * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
+             */
+            xScales(xScales: QuantitativeScale<any>[]): Interactions.PanZoom;
+            /**
+             * Gets the y scales for this PanZoom Interaction.
+             */
+            yScales(): QuantitativeScale<any>[];
+            /**
+             * Sets the y scales for this PanZoom Interaction.
+             *
+             * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
+             */
+            yScales(yScales: QuantitativeScale<any>[]): Interactions.PanZoom;
+            /**
+             * Adds an x scale to this PanZoom Interaction
+             *
+             * @param {QuantitativeScale<any>} An x scale to add
+             * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
+             */
+            addXScale(xScale: QuantitativeScale<any>): PanZoom;
+            /**
+             * Removes an x scale from this PanZoom Interaction
+             *
+             * @param {QuantitativeScale<any>} An x scale to remove
+             * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
+             */
+            removeXScale(xScale: QuantitativeScale<any>): PanZoom;
+            /**
+             * Adds a y scale to this PanZoom Interaction
+             *
+             * @param {QuantitativeScale<any>} A y scale to add
+             * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
+             */
+            addYScale(yScale: QuantitativeScale<any>): PanZoom;
+            /**
+             * Removes a y scale from this PanZoom Interaction
+             *
+             * @param {QuantitativeScale<any>} A y scale to remove
+             * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
+             */
+            removeYScale(yScale: QuantitativeScale<any>): PanZoom;
+            /**
+             * Gets the minimum domain extent for the scale, specifying the minimum allowable amount
+             * between the ends of the domain.
+             *
+             * Note that extents will mainly work on scales that work linearly like Linear Scale and Time Scale
+             *
+             * @param {QuantitativeScale<any>} quantitativeScale The scale to query
+             * @returns {D} The minimum domain extent for the scale.
+             */
+            minDomainExtent<D>(quantitativeScale: QuantitativeScale<D>): D;
+            /**
+             * Sets the minimum domain extent for the scale, specifying the minimum allowable amount
+             * between the ends of the domain.
+             *
+             * Note that extents will mainly work on scales that work linearly like Linear Scale and Time Scale
+             *
+             * @param {QuantitativeScale<any>} quantitativeScale The scale to query
+             * @param {D} minDomainExtent The minimum domain extent for the scale.
+             * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
+             */
+            minDomainExtent<D>(quantitativeScale: QuantitativeScale<D>, minDomainExtent: D): Interactions.PanZoom;
+            /**
+             * Gets the maximum domain extent for the scale, specifying the maximum allowable amount
+             * between the ends of the domain.
+             *
+             * Note that extents will mainly work on scales that work linearly like Linear Scale and Time Scale
+             *
+             * @param {QuantitativeScale<any>} quantitativeScale The scale to query
+             * @returns {D} The maximum domain extent for the scale.
+             */
+            maxDomainExtent<D>(quantitativeScale: QuantitativeScale<D>): D;
+            /**
+             * Sets the maximum domain extent for the scale, specifying the maximum allowable amount
+             * between the ends of the domain.
+             *
+             * Note that extents will mainly work on scales that work linearly like Linear Scale and Time Scale
+             *
+             * @param {QuantitativeScale<any>} quantitativeScale The scale to query
+             * @param {D} minDomainExtent The maximum domain extent for the scale.
+             * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
+             */
+            maxDomainExtent<D>(quantitativeScale: QuantitativeScale<D>, maxDomainExtent: D): Interactions.PanZoom;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    type DragCallback = (start: Point, end: Point) => void;
+    namespace Interactions {
+        class Drag extends Interaction {
+            protected _anchor(component: Component): void;
+            protected _unanchor(): void;
+            /**
+             * Gets whether the Drag Interaction constrains Points passed to its
+             * callbacks to lie inside its Component.
+             *
+             * If true, when the user drags outside of the Component, the closest Point
+             * inside the Component will be passed to the callback instead of the actual
+             * cursor position.
+             *
+             * @return {boolean}
+             */
+            constrainedToComponent(): boolean;
+            /**
+             * Sets whether the Drag Interaction constrains Points passed to its
+             * callbacks to lie inside its Component.
+             *
+             * If true, when the user drags outside of the Component, the closest Point
+             * inside the Component will be passed to the callback instead of the actual
+             * cursor position.
+             *
+             * @param {boolean}
+             * @return {Interactions.Drag} The calling Drag Interaction.
+             */
+            constrainedToComponent(constrainedToComponent: boolean): Drag;
+            /**
+             * Adds a callback to be called when dragging starts.
+             *
+             * @param {DragCallback} callback
+             * @returns {Drag} The calling Drag Interaction.
+             */
+            onDragStart(callback: DragCallback): Drag;
+            /**
+             * Removes a callback that would be called when dragging starts.
+             *
+             * @param {DragCallback} callback
+             * @returns {Drag} The calling Drag Interaction.
+             */
+            offDragStart(callback: DragCallback): Drag;
+            /**
+             * Adds a callback to be called during dragging.
+             *
+             * @param {DragCallback} callback
+             * @returns {Drag} The calling Drag Interaction.
+             */
+            onDrag(callback: DragCallback): Drag;
+            /**
+             * Removes a callback that would be called during dragging.
+             *
+             * @param {DragCallback} callback
+             * @returns {Drag} The calling Drag Interaction.
+             */
+            offDrag(callback: DragCallback): Drag;
+            /**
+             * Adds a callback to be called when dragging ends.
+             *
+             * @param {DragCallback} callback
+             * @returns {Drag} The calling Drag Interaction.
+             */
+            onDragEnd(callback: DragCallback): Drag;
+            /**
+             * Removes a callback that would be called when dragging ends.
+             *
+             * @param {DragCallback} callback
+             * @returns {Drag} The calling Drag Interaction.
+             */
+            offDragEnd(callback: DragCallback): Drag;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    type DragBoxCallback = (bounds: Bounds) => void;
+    namespace Components {
+        class DragBoxLayer extends Components.SelectionBoxLayer {
+            protected _hasCorners: boolean;
+            /**
+             * Constructs a DragBoxLayer.
+             *
+             * A DragBoxLayer is a SelectionBoxLayer with a built-in Drag Interaction.
+             * A drag gesture will set the Bounds of the box.
+             * If resizing is enabled using resizable(true), the edges of box can be repositioned.
+             *
+             * @constructor
+             */
+            constructor();
+            protected _setup(): void;
+            renderImmediately(): DragBoxLayer;
+            /**
+             * Gets the detection radius of the drag box in pixels.
+             */
+            detectionRadius(): number;
+            /**
+             * Sets the detection radius of the drag box in pixels.
+             *
+             * @param {number} r
+             * @return {DragBoxLayer} The calling DragBoxLayer.
+             */
+            detectionRadius(r: number): DragBoxLayer;
+            /**
+             * Gets whether or not the drag box is resizable.
+             */
+            resizable(): boolean;
+            /**
+             * Sets whether or not the drag box is resizable.
+             *
+             * @param {boolean} canResize
+             * @return {DragBoxLayer} The calling DragBoxLayer.
+             */
+            resizable(canResize: boolean): DragBoxLayer;
+            protected _setResizableClasses(canResize: boolean): void;
+            /**
+             * Sets the callback to be called when dragging starts.
+             *
+             * @param {DragBoxCallback} callback
+             * @returns {DragBoxLayer} The calling DragBoxLayer.
+             */
+            onDragStart(callback: DragBoxCallback): DragBoxLayer;
+            /**
+             * Removes a callback to be called when dragging starts.
+             *
+             * @param {DragBoxCallback} callback
+             * @returns {DragBoxLayer} The calling DragBoxLayer.
+             */
+            offDragStart(callback: DragBoxCallback): DragBoxLayer;
+            /**
+             * Sets a callback to be called during dragging.
+             *
+             * @param {DragBoxCallback} callback
+             * @returns {DragBoxLayer} The calling DragBoxLayer.
+             */
+            onDrag(callback: DragBoxCallback): DragBoxLayer;
+            /**
+             * Removes a callback to be called during dragging.
+             *
+             * @param {DragBoxCallback} callback
+             * @returns {DragBoxLayer} The calling DragBoxLayer.
+             */
+            offDrag(callback: DragBoxCallback): DragBoxLayer;
+            /**
+             * Sets a callback to be called when dragging ends.
+             *
+             * @param {DragBoxCallback} callback
+             * @returns {DragBoxLayer} The calling DragBoxLayer.
+             */
+            onDragEnd(callback: DragBoxCallback): DragBoxLayer;
+            /**
+             * Removes a callback to be called when dragging ends.
+             *
+             * @param {DragBoxCallback} callback
+             * @returns {DragBoxLayer} The calling DragBoxLayer.
+             */
+            offDragEnd(callback: DragBoxCallback): DragBoxLayer;
+            /**
+             * Gets the internal Interactions.Drag of the DragBoxLayer.
+             */
+            dragInteraction(): Interactions.Drag;
+            /**
+             * Enables or disables the interaction and drag box.
+             */
+            enabled(enabled: boolean): DragBoxLayer;
+            /**
+             * Gets the enabled state.
+             */
+            enabled(): boolean;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Components {
+        class XDragBoxLayer extends DragBoxLayer {
+            /**
+             * An XDragBoxLayer is a DragBoxLayer whose size can only be set in the X-direction.
+             * The y-values of the bounds() are always set to 0 and the height() of the XDragBoxLayer.
+             *
+             * @constructor
+             */
+            constructor();
+            computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): XDragBoxLayer;
+            protected _setBounds(newBounds: Bounds): void;
+            protected _setResizableClasses(canResize: boolean): void;
+        }
+    }
+}
+
+
+declare namespace Plottable {
+    namespace Components {
+        class YDragBoxLayer extends DragBoxLayer {
+            /**
+             * A YDragBoxLayer is a DragBoxLayer whose size can only be set in the Y-direction.
+             * The x-values of the bounds() are always set to 0 and the width() of the YDragBoxLayer.
+             *
+             * @constructor
+             */
+            constructor();
+            computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): YDragBoxLayer;
+            protected _setBounds(newBounds: Bounds): void;
+            protected _setResizableClasses(canResize: boolean): void;
+        }
+    }
+}
diff --git a/plottable/plottable-tests.ts b/plottable/plottable-tests.ts
index d1b3589fd8..1dbc306eb7 100644
--- a/plottable/plottable-tests.ts
+++ b/plottable/plottable-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="plottable.d.ts" />
+
 
 var data = [
   { x: 1, y: 1, x2: 2, y2: 2 },
diff --git a/plottable/plottable.d.ts b/plottable/plottable.d.ts
deleted file mode 100644
index f7c0d7d4b7..0000000000
--- a/plottable/plottable.d.ts
+++ /dev/null
@@ -1,4119 +0,0 @@
-// Type definitions for Plottable v1.4.0
-// Project: http://plottablejs.org/
-// Definitions by: Plottable Team <https://github.com/palantir/plottable>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../d3/d3.d.ts" />
-
-declare namespace Plottable {
-    namespace Utils {
-        namespace Math {
-            /**
-             * Checks if x is between a and b.
-             *
-             * @param {number} x The value to test if in range
-             * @param {number} a The beginning of the (inclusive) range
-             * @param {number} b The ending of the (inclusive) range
-             * @return {boolean} Whether x is in [a, b]
-             */
-            function inRange(x: number, a: number, b: number): boolean;
-            /**
-             * Clamps x to the range [min, max].
-             *
-             * @param {number} x The value to be clamped.
-             * @param {number} min The minimum value.
-             * @param {number} max The maximum value.
-             * @return {number} A clamped value in the range [min, max].
-             */
-            function clamp(x: number, min: number, max: number): number;
-            /**
-             * Applies the accessor, if provided, to each element of `array` and returns the maximum value.
-             * If no maximum value can be computed, returns defaultValue.
-             */
-            function max<C>(array: C[], defaultValue: C): C;
-            function max<T, C>(array: T[], accessor: (t?: T, i?: number) => C, defaultValue: C): C;
-            /**
-             * Applies the accessor, if provided, to each element of `array` and returns the minimum value.
-             * If no minimum value can be computed, returns defaultValue.
-             */
-            function min<C>(array: C[], defaultValue: C): C;
-            function min<T, C>(array: T[], accessor: (t?: T, i?: number) => C, defaultValue: C): C;
-            /**
-             * Returns true **only** if x is NaN
-             */
-            function isNaN(n: any): boolean;
-            /**
-             * Returns true if the argument is a number, which is not NaN
-             * Numbers represented as strings do not pass this function
-             */
-            function isValidNumber(n: any): boolean;
-            /**
-             * Generates an array of consecutive, strictly increasing numbers
-             * in the range [start, stop) separeted by step
-             */
-            function range(start: number, stop: number, step?: number): number[];
-            /**
-             * Returns the square of the distance between two points
-             *
-             * @param {Point} p1
-             * @param {Point} p2
-             * @return {number} dist(p1, p2)^2
-             */
-            function distanceSquared(p1: Point, p2: Point): number;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Utils {
-        /**
-         * Shim for ES6 map.
-         * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map
-         */
-        class Map<K, V> {
-            constructor();
-            set(key: K, value: V): Map<K, V>;
-            get(key: K): V;
-            has(key: K): boolean;
-            forEach(callbackFn: (value: V, key: K, map: Map<K, V>) => void, thisArg?: any): void;
-            delete(key: K): boolean;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Utils {
-        /**
-         * Shim for ES6 set.
-         * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Set
-         */
-        class Set<T> {
-            size: number;
-            constructor();
-            add(value: T): Set<T>;
-            delete(value: T): boolean;
-            has(value: T): boolean;
-            forEach(callback: (value: T, value2: T, set: Set<T>) => void, thisArg?: any): void;
-        }
-    }
-}
-
-declare namespace Plottable {
-    namespace Utils {
-        namespace DOM {
-            /**
-             * Gets the bounding box of an element.
-             * @param {d3.Selection} element
-             * @returns {SVGRed} The bounding box.
-             */
-            function elementBBox(element: d3.Selection<any>): SVGRect;
-            /**
-             * Screen refresh rate which is assumed to be 60fps
-             */
-            var SCREEN_REFRESH_RATE_MILLISECONDS: number;
-            /**
-             * Polyfill for `window.requestAnimationFrame`.
-             * If the function exists, then we use the function directly.
-             * Otherwise, we set a timeout on `SCREEN_REFRESH_RATE_MILLISECONDS` and then perform the function.
-             *
-             * @param {() => void} callback The callback to call in the next animation frame
-             */
-            function requestAnimationFramePolyfill(callback: () => void): void;
-            /**
-             * Calculates the width of the element.
-             * The width includes the padding and the border on the element's left and right sides.
-             *
-             * @param {Element} element The element to query
-             * @returns {number} The width of the element.
-             */
-            function elementWidth(element: Element): number;
-            /**
-             * Calculates the height of the element.
-             * The height includes the padding the and the border on the element's top and bottom sides.
-             *
-             * @param {Element} element The element to query
-             * @returns {number} The height of the element
-             */
-            function elementHeight(element: Element): number;
-            /**
-             * Retrieves the number array representing the translation for the selection
-             *
-             * @param {d3.Selection<any>} selection The selection to query
-             * @returns {[number, number]} The number array representing the translation
-             */
-            function translate(selection: d3.Selection<any>): [number, number];
-            /**
-             * Translates the given selection by the input x / y pixel amounts.
-             *
-             * @param {d3.Selection<any>} selection The selection to translate
-             * @param {number} x The amount to translate in the x direction
-             * @param {number} y The amount to translate in the y direction
-             * @returns {d3.Selection<any>} The input selection
-             */
-            function translate(selection: d3.Selection<any>, x: number, y: number): d3.Selection<any>;
-            /**
-             * Checks if the first ClientRect overlaps the second.
-             *
-             * @param {ClientRect} clientRectA The first ClientRect
-             * @param {ClientRect} clientRectB The second ClientRect
-             * @returns {boolean} If the ClientRects overlap each other.
-             */
-            function clientRectsOverlap(clientRectA: ClientRect, clientRectB: ClientRect): boolean;
-            /**
-             * Returns true if and only if innerClientRect is inside outerClientRect.
-             *
-             * @param {ClientRect} innerClientRect The first ClientRect
-             * @param {ClientRect} outerClientRect The second ClientRect
-             * @returns {boolean} If and only if the innerClientRect is inside outerClientRect.
-             */
-            function clientRectInside(innerClientRect: ClientRect, outerClientRect: ClientRect): boolean;
-            /**
-             * Retrieves the bounding svg of the input element
-             *
-             * @param {SVGElement} element The element to query
-             * @returns {SVGElement} The bounding svg
-             */
-            function boundingSVG(element: SVGElement): SVGElement;
-            /**
-             * Generates a ClipPath ID that is unique for this instance of Plottable
-             */
-            function generateUniqueClipPathId(): string;
-            /**
-             * Returns true if the supplied coordinates or Ranges intersect or are contained by bbox.
-             *
-             * @param {number | Range} xValOrRange The x coordinate or Range to test
-             * @param {number | Range} yValOrRange The y coordinate or Range to test
-             * @param {SVGRect} bbox The bbox
-             * @param {number} tolerance Amount by which to expand bbox, in each dimension, before
-             * testing intersection
-             *
-             * @returns {boolean} True if the supplied coordinates or Ranges intersect or are
-             * contained by bbox, false otherwise.
-             */
-            function intersectsBBox(xValOrRange: number | Range, yValOrRange: number | Range, bbox: SVGRect, tolerance?: number): boolean;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Utils {
-        namespace Color {
-            /**
-             * Return contrast ratio between two colors
-             * Based on implementation from chroma.js by Gregor Aisch (gka) (licensed under BSD)
-             * chroma.js may be found here: https://github.com/gka/chroma.js
-             * License may be found here: https://github.com/gka/chroma.js/blob/master/LICENSE
-             * see http://www.w3.org/TR/2008/REC-WCAG20-20081211/#contrast-ratiodef
-             */
-            function contrast(a: string, b: string): number;
-            /**
-             * Returns a brighter copy of this color. Each channel is multiplied by 0.7 ^ -factor.
-             * Channel values are capped at the maximum value of 255, and the minimum value of 30.
-             */
-            function lightenColor(color: string, factor: number): string;
-            /**
-             * Gets the Hex Code of the color resulting by applying the className CSS class to the
-             * colorTester selection. Returns null if the tester is transparent.
-             *
-             * @param {d3.Selection<void>} colorTester The d3 selection to apply the CSS class to
-             * @param {string} className The name of the class to be applied
-             * @return {string} The hex code of the computed color
-             */
-            function colorTest(colorTester: d3.Selection<void>, className: string): string;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Utils {
-        namespace Array {
-            /**
-             * Takes two arrays of numbers and adds them together
-             *
-             * @param {number[]} aList The first array of numbers
-             * @param {number[]} bList The second array of numbers
-             * @return {number[]} An array of numbers where x[i] = aList[i] + bList[i]
-             */
-            function add(aList: number[], bList: number[]): number[];
-            /**
-             * Take an array of values, and return the unique values.
-             * Will work iff ∀ a, b, a.toString() == b.toString() => a == b; will break on Object inputs
-             *
-             * @param {T[]} values The values to find uniqueness for
-             * @return {T[]} The unique values
-             */
-            function uniq<T>(arr: T[]): T[];
-            /**
-             * @param {T[][]} a The 2D array that will have its elements joined together.
-             * @return {T[]} Every array in a, concatenated together in the order they appear.
-             */
-            function flatten<T>(a: T[][]): T[];
-            /**
-             * Creates an array of length `count`, filled with value or (if value is a function), value()
-             *
-             * @param {T | ((index?: number) => T)} value The value to fill the array with or a value generator (called with index as arg)
-             * @param {number} count The length of the array to generate
-             * @return {any[]}
-             */
-            function createFilledArray<T>(value: T | ((index?: number) => T), count: number): T[];
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Utils {
-        /**
-         * A set of callbacks which can be all invoked at once.
-         * Each callback exists at most once in the set (based on reference equality).
-         * All callbacks should have the same signature.
-         */
-        class CallbackSet<CB extends Function> extends Set<CB> {
-            callCallbacks(...args: any[]): CallbackSet<CB>;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Utils {
-        namespace Stacking {
-            type StackedDatum = {
-                value: number;
-                offset: number;
-            };
-            type StackingResult = Utils.Map<Dataset, Utils.Map<string, StackedDatum>>;
-            /**
-             * Computes the StackingResult (value and offset) for each data point in each Dataset.
-             *
-             * @param {Dataset[]} datasets The Datasets to be stacked on top of each other in the order of stacking
-             * @param {Accessor<any>} keyAccessor Accessor for the key of the data
-             * @param {Accessor<number>} valueAccessor Accessor for the value of the data
-             * @return {StackingResult} value and offset for each datapoint in each Dataset
-             */
-            function stack(datasets: Dataset[], keyAccessor: Accessor<any>, valueAccessor: Accessor<number>): StackingResult;
-            /**
-             * Computes the total extent over all data points in all Datasets, taking stacking into consideration.
-             *
-             * @param {StackingResult} stackingResult The value and offset information for each datapoint in each dataset
-             * @oaram {Accessor<any>} keyAccessor Accessor for the key of the data existent in the stackingResult
-             * @param {Accessor<boolean>} filter A filter for data to be considered when computing the total extent
-             * @return {[number, number]} The total extent
-             */
-            function stackedExtent(stackingResult: StackingResult, keyAccessor: Accessor<any>, filter: Accessor<boolean>): number[];
-            /**
-             * Normalizes a key used for stacking
-             *
-             * @param {any} key The key to be normalized
-             * @return {string} The stringified key
-             */
-            function normalizeKey(key: any): string;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Utils {
-        namespace Window {
-            /**
-             * Print a warning message to the console, if it is available.
-             *
-             * @param {string} The warnings to print
-             */
-            function warn(warning: string): void;
-            /**
-             * Is like setTimeout, but activates synchronously if time=0
-             * We special case 0 because of an observed issue where calling setTimeout causes visible flickering.
-             * We believe this is because when requestAnimationFrame calls into the paint function, as soon as that function finishes
-             * evaluating, the results are painted to the screen. As a result, if we want something to occur immediately but call setTimeout
-             * with time=0, then it is pushed to the call stack and rendered in the next frame, so the component that was rendered via
-             * setTimeout appears out-of-sync with the rest of the plot.
-             */
-            function setTimeout(f: Function, time: number, ...args: any[]): number;
-            /**
-             * Sends a deprecation warning to the console. The warning includes the name of the deprecated method,
-             * version number of the deprecation, and an optional message.
-             *
-             * To be used in the first line of a deprecated method.
-             *
-             * @param {string} callingMethod The name of the method being deprecated
-             * @param {string} version The version when the tagged method became obsolete
-             * @param {string?} message Optional message to be shown with the warning
-             */
-            function deprecated(callingMethod: string, version: string, message?: string): void;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Utils {
-        class ClientToSVGTranslator {
-            /**
-             * Returns the ClientToSVGTranslator for the <svg> containing elem.
-             * If one already exists on that <svg>, it will be returned; otherwise, a new one will be created.
-             */
-            static getTranslator(elem: SVGElement): ClientToSVGTranslator;
-            constructor(svg: SVGElement);
-            /**
-             * Computes the position relative to the <svg> in svg-coordinate-space.
-             */
-            computePosition(clientX: number, clientY: number): Point;
-            /**
-             * Checks whether event happened inside <svg> element.
-             */
-            insideSVG(e: Event): boolean;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Configs {
-        /**
-         * Specifies if Plottable should show warnings.
-         */
-        var SHOW_WARNINGS: boolean;
-    }
-}
-
-
-declare namespace Plottable {
-    var version: string;
-}
-
-
-declare namespace Plottable {
-    type DatasetCallback = (dataset: Dataset) => void;
-    class Dataset {
-        /**
-         * A Dataset contains an array of data and some metadata.
-         * Changes to the data or metadata will cause anything subscribed to the Dataset to update.
-         *
-         * @constructor
-         * @param {any[]} [data=[]] The data for this Dataset.
-         * @param {any} [metadata={}] An object containing additional information.
-         */
-        constructor(data?: any[], metadata?: any);
-        /**
-         * Adds a callback to be called when the Dataset updates.
-         *
-         * @param {DatasetCallback} callback.
-         * @returns {Dataset} The calling Dataset.
-         */
-        onUpdate(callback: DatasetCallback): Dataset;
-        /**
-         * Removes a callback that would be called when the Dataset updates.
-         *
-         * @param {DatasetCallback} callback
-         * @returns {Dataset} The calling Dataset.
-         */
-        offUpdate(callback: DatasetCallback): Dataset;
-        /**
-         * Gets the data.
-         *
-         * @returns {any[]}
-         */
-        data(): any[];
-        /**
-         * Sets the data.
-         *
-         * @param {any[]} data
-         * @returns {Dataset} The calling Dataset.
-         */
-        data(data: any[]): Dataset;
-        /**
-         * Gets the metadata.
-         *
-         * @returns {any}
-         */
-        metadata(): any;
-        /**
-         * Sets the metadata.
-         *
-         * @param {any} metadata
-         * @returns {Dataset} The calling Dataset.
-         */
-        metadata(metadata: any): Dataset;
-    }
-}
-
-
-declare namespace Plottable {
-    namespace RenderPolicies {
-        /**
-         * A policy for rendering Components.
-         */
-        interface RenderPolicy {
-            render(): any;
-        }
-        /**
-         * Renders Components immediately after they are enqueued.
-         * Useful for debugging, horrible for performance.
-         */
-        class Immediate implements RenderPolicy {
-            render(): void;
-        }
-        /**
-         * The default way to render, which only tries to render every frame
-         * (usually, 1/60th of a second).
-         */
-        class AnimationFrame implements RenderPolicy {
-            render(): void;
-        }
-        /**
-         * Renders with `setTimeout()`.
-         * Generally an inferior way to render compared to `requestAnimationFrame`,
-         * but useful for browsers that don't suppoort `requestAnimationFrame`.
-         */
-        class Timeout implements RenderPolicy {
-            render(): void;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    /**
-     * The RenderController is responsible for enqueueing and synchronizing
-     * layout and render calls for Components.
-     *
-     * Layout and render calls occur inside an animation callback
-     * (window.requestAnimationFrame if available).
-     *
-     * RenderController.flush() immediately lays out and renders all Components currently enqueued.
-     *
-     * To always have immediate rendering (useful for debugging), call
-     * ```typescript
-     * Plottable.RenderController.setRenderPolicy(
-     *   new Plottable.RenderPolicies.Immediate()
-     * );
-     * ```
-     */
-    namespace RenderController {
-        namespace Policy {
-            var IMMEDIATE: string;
-            var ANIMATION_FRAME: string;
-            var TIMEOUT: string;
-        }
-        function renderPolicy(): RenderPolicies.RenderPolicy;
-        function renderPolicy(renderPolicy: string): void;
-        /**
-         * Enqueues the Component for rendering.
-         *
-         * @param {Component} component
-         */
-        function registerToRender(component: Component): void;
-        /**
-         * Enqueues the Component for layout and rendering.
-         *
-         * @param {Component} component
-         */
-        function registerToComputeLayout(component: Component): void;
-        /**
-         * Renders all Components waiting to be rendered immediately
-         * instead of waiting until the next frame.
-         *
-         * Useful to call when debugging.
-         */
-        function flush(): void;
-    }
-}
-
-declare namespace Plottable {
-    /**
-     * Accesses a specific datum property.
-     */
-    interface Accessor<T> {
-        (datum: any, index: number, dataset: Dataset): T;
-    }
-    /**
-     * Retrieves a scaled datum property.
-     * Essentially passes the result of an Accessor through a Scale.
-     */
-    type Projector = (datum: any, index: number, dataset: Dataset) => any;
-    /**
-     * A mapping from attributes ("x", "fill", etc.) to the functions that get
-     * that information out of the data.
-     */
-    type AttributeToProjector = {
-        [attr: string]: Projector;
-    };
-    /**
-     * A function that generates attribute values from the datum and index.
-     * Essentially a Projector with a particular Dataset rolled in.
-     */
-    type AppliedProjector = (datum: any, index: number) => any;
-    /**
-     * A mapping from attributes to the AppliedProjectors used to generate them.
-     */
-    type AttributeToAppliedProjector = {
-        [attr: string]: AppliedProjector;
-    };
-    /**
-     * Space request used during layout negotiation.
-     *
-     * @member {number} minWidth The minimum acceptable width given the offered space.
-     * @member {number} minHeight the minimum acceptable height given the offered space.
-     */
-    type SpaceRequest = {
-        minWidth: number;
-        minHeight: number;
-    };
-    /**
-     * Min and max values for a particular property.
-     */
-    type Range = {
-        min: number;
-        max: number;
-    };
-    /**
-     * A location in pixel-space.
-     */
-    type Point = {
-        x: number;
-        y: number;
-    };
-    /**
-     * The corners of a box.
-     */
-    type Bounds = {
-        topLeft: Point;
-        bottomRight: Point;
-    };
-    /**
-     * An object representing a data-backed visual entity inside a Component.
-     */
-    interface Entity<C extends Component> {
-        datum: any;
-        position: Point;
-        selection: d3.Selection<any>;
-        component: C;
-    }
-}
-
-
-declare namespace Plottable {
-    type Formatter = (d: any) => string;
-    /**
-     * This field is deprecated and will be removed in v2.0.0.
-     *
-     * The number of milliseconds between midnight one day and the next is
-     * not a fixed quantity.
-     *
-     * Use date.setDate(date.getDate() + number_of_days) instead.
-     *
-     */
-    var MILLISECONDS_IN_ONE_DAY: number;
-    namespace Formatters {
-        /**
-         * Creates a formatter for currency values.
-         *
-         * @param {number} [precision] The number of decimal places to show (default 2).
-         * @param {string} [symbol] The currency symbol to use (default "$").
-         * @param {boolean} [prefix] Whether to prepend or append the currency symbol (default true).
-         * @param {boolean} [onlyShowUnchanged] Whether to return a value if value changes after formatting (default true).
-         *
-         * @returns {Formatter} A formatter for currency values.
-         */
-        function currency(precision?: number, symbol?: string, prefix?: boolean): (d: any) => string;
-        /**
-         * Creates a formatter that displays exactly [precision] decimal places.
-         *
-         * @param {number} [precision] The number of decimal places to show (default 3).
-         * @param {boolean} [onlyShowUnchanged] Whether to return a value if value changes after formatting (default true).
-         *
-         * @returns {Formatter} A formatter that displays exactly [precision] decimal places.
-         */
-        function fixed(precision?: number): (d: any) => string;
-        /**
-         * Creates a formatter that formats numbers to show no more than
-         * [precision] decimal places. All other values are stringified.
-         *
-         * @param {number} [precision] The number of decimal places to show (default 3).
-         * @param {boolean} [onlyShowUnchanged] Whether to return a value if value changes after formatting (default true).
-         *
-         * @returns {Formatter} A formatter for general values.
-         */
-        function general(precision?: number): (d: any) => string;
-        /**
-         * Creates a formatter that stringifies its input.
-         *
-         * @returns {Formatter} A formatter that stringifies its input.
-         */
-        function identity(): (d: any) => string;
-        /**
-         * Creates a formatter for percentage values.
-         * Multiplies the input by 100 and appends "%".
-         *
-         * @param {number} [precision] The number of decimal places to show (default 0).
-         * @param {boolean} [onlyShowUnchanged] Whether to return a value if value changes after formatting (default true).
-         *
-         * @returns {Formatter} A formatter for percentage values.
-         */
-        function percentage(precision?: number): (d: any) => string;
-        /**
-         * Creates a formatter for values that displays [precision] significant figures
-         * and puts SI notation.
-         *
-         * @param {number} [precision] The number of significant figures to show (default 3).
-         *
-         * @returns {Formatter} A formatter for SI values.
-         */
-        function siSuffix(precision?: number): (d: any) => string;
-        /**
-         * Creates a multi time formatter that displays dates.
-         *
-         * @returns {Formatter} A formatter for time/date values.
-         */
-        function multiTime(): (d: any) => string;
-        /**
-         * Creates a time formatter that displays time/date using given specifier.
-         *
-         * List of directives can be found on: https://github.com/mbostock/d3/wiki/Time-Formatting#format
-         *
-         * @param {string} [specifier] The specifier for the formatter.
-         *
-         * @returns {Formatter} A formatter for time/date values.
-         */
-        function time(specifier: string): Formatter;
-        /**
-         * Creates a formatter for relative dates.
-         *
-         * @param {number} baseValue The start date (as epoch time) used in computing relative dates (default 0)
-         * @param {number} increment The unit used in calculating relative date values (default MILLISECONDS_IN_ONE_DAY)
-         * @param {string} label The label to append to the formatted string (default "")
-         *
-         * @returns {Formatter} A formatter for time/date values.
-         */
-        function relativeDate(baseValue?: number, increment?: number, label?: string): (d: any) => string;
-    }
-}
-
-
-declare namespace Plottable {
-    /**
-     * A SymbolFactory is a function that takes in a symbolSize which is the edge length of the render area
-     * and returns a string representing the 'd' attribute of the resultant 'path' element
-     */
-    type SymbolFactory = (symbolSize: number) => string;
-    namespace SymbolFactories {
-        function circle(): SymbolFactory;
-        function square(): SymbolFactory;
-        function cross(): SymbolFactory;
-        function diamond(): SymbolFactory;
-        function triangleUp(): SymbolFactory;
-        function triangleDown(): SymbolFactory;
-    }
-}
-
-
-declare namespace Plottable {
-    interface ScaleCallback<S extends Scale<any, any>> {
-        (scale: S): any;
-    }
-    namespace Scales {
-        /**
-         * A function that supplies domain values to be included into a Scale.
-         *
-         * @param {Scale} scale
-         * @returns {D[]} An array of values that should be included in the Scale.
-         */
-        interface IncludedValuesProvider<D> {
-            (scale: Scale<D, any>): D[];
-        }
-        /**
-         * A function that supplies padding exception values for the Scale.
-         * If one end of the domain is set to an excepted value as a result of autoDomain()-ing,
-         * that end of the domain will not be padded.
-         *
-         * @param {QuantitativeScale} scale
-         * @returns {D[]} An array of values that should not be padded.
-         */
-        interface PaddingExceptionsProvider<D> {
-            (scale: QuantitativeScale<D>): D[];
-        }
-    }
-    class Scale<D, R> {
-        /**
-         * A Scale is a function (in the mathematical sense) that maps values from a domain to a range.
-         *
-         * @constructor
-         */
-        constructor();
-        /**
-         * Given an array of potential domain values, computes the extent of those values.
-         *
-         * @param {D[]} values
-         * @returns {D[]} The extent of the input values.
-         */
-        extentOfValues(values: D[]): D[];
-        protected _getAllIncludedValues(): D[];
-        protected _getExtent(): D[];
-        /**
-         * Adds a callback to be called when the Scale updates.
-         *
-         * @param {ScaleCallback} callback.
-         * @returns {Scale} The calling Scale.
-         */
-        onUpdate(callback: ScaleCallback<Scale<D, R>>): Scale<D, R>;
-        /**
-         * Removes a callback that would be called when the Scale updates.
-         *
-         * @param {ScaleCallback} callback.
-         * @returns {Scale} The calling Scale.
-         */
-        offUpdate(callback: ScaleCallback<Scale<D, R>>): Scale<D, R>;
-        protected _dispatchUpdate(): void;
-        /**
-         * Sets the Scale's domain so that it spans the Extents of all its ExtentsProviders.
-         *
-         * @returns {Scale} The calling Scale.
-         */
-        autoDomain(): Scale<D, R>;
-        protected _autoDomainIfAutomaticMode(): void;
-        /**
-         * Computes the range value corresponding to a given domain value.
-         *
-         * @param {D} value
-         * @returns {R} The range value corresponding to the supplied domain value.
-         */
-        scale(value: D): R;
-        /**
-         * Gets the domain.
-         *
-         * @returns {D[]} The current domain.
-         */
-        domain(): D[];
-        /**
-         * Sets the domain.
-         *
-         * @param {D[]} values
-         * @returns {Scale} The calling Scale.
-         */
-        domain(values: D[]): Scale<D, R>;
-        protected _getDomain(): void;
-        protected _setDomain(values: D[]): void;
-        protected _setBackingScaleDomain(values: D[]): void;
-        /**
-         * Gets the range.
-         *
-         * @returns {R[]} The current range.
-         */
-        range(): R[];
-        /**
-         * Sets the range.
-         *
-         * @param {R[]} values
-         * @returns {Scale} The calling Scale.
-         */
-        range(values: R[]): Scale<D, R>;
-        protected _getRange(): void;
-        protected _setRange(values: R[]): void;
-        /**
-         * Adds an IncludedValuesProvider to the Scale.
-         *
-         * @param {Scales.IncludedValuesProvider} provider
-         * @returns {Scale} The calling Scale.
-         */
-        addIncludedValuesProvider(provider: Scales.IncludedValuesProvider<D>): Scale<D, R>;
-        /**
-         * Removes the IncludedValuesProvider from the Scale.
-         *
-         * @param {Scales.IncludedValuesProvider} provider
-         * @returns {Scale} The calling Scale.
-         */
-        removeIncludedValuesProvider(provider: Scales.IncludedValuesProvider<D>): Scale<D, R>;
-    }
-}
-
-
-declare namespace Plottable {
-    class QuantitativeScale<D> extends Scale<D, number> {
-        protected static _DEFAULT_NUM_TICKS: number;
-        /**
-         * A QuantitativeScale is a Scale that maps number-like values to numbers.
-         * It is invertible and continuous.
-         *
-         * @constructor
-         */
-        constructor();
-        autoDomain(): QuantitativeScale<D>;
-        protected _autoDomainIfAutomaticMode(): void;
-        protected _getExtent(): D[];
-        /**
-         * Adds a padding exception provider.
-         * If one end of the domain is set to an excepted value as a result of autoDomain()-ing,
-         * that end of the domain will not be padded.
-         *
-         * @param {Scales.PaddingExceptionProvider<D>} provider The provider function.
-         * @returns {QuantitativeScale} The calling QuantitativeScale.
-         */
-        addPaddingExceptionsProvider(provider: Scales.PaddingExceptionsProvider<D>): QuantitativeScale<D>;
-        /**
-         * Removes the padding exception provider.
-         *
-         * @param {Scales.PaddingExceptionProvider<D>} provider The provider function.
-         * @returns {QuantitativeScale} The calling QuantitativeScale.
-         */
-        removePaddingExceptionsProvider(provider: Scales.PaddingExceptionsProvider<D>): QuantitativeScale<D>;
-        /**
-         * Gets the padding proportion.
-         */
-        padProportion(): number;
-        /**
-         * Sets the padding porportion.
-         * When autoDomain()-ing, the computed domain will be expanded by this proportion,
-         * then rounded to human-readable values.
-         *
-         * @param {number} padProportion The padding proportion. Passing 0 disables padding.
-         * @returns {QuantitativeScale} The calling QuantitativeScale.
-         */
-        padProportion(padProportion: number): QuantitativeScale<D>;
-        protected _expandSingleValueDomain(singleValueDomain: D[]): D[];
-        /**
-         * Computes the domain value corresponding to a supplied range value.
-         *
-         * @param {number} value: A value from the Scale's range.
-         * @returns {D} The domain value corresponding to the supplied range value.
-         */
-        invert(value: number): D;
-        domain(): D[];
-        domain(values: D[]): QuantitativeScale<D>;
-        /**
-         * Gets the lower end of the domain.
-         *
-         * @return {D}
-         */
-        domainMin(): D;
-        /**
-         * Sets the lower end of the domain.
-         *
-         * @return {QuantitativeScale} The calling QuantitativeScale.
-         */
-        domainMin(domainMin: D): QuantitativeScale<D>;
-        /**
-         * Gets the upper end of the domain.
-         *
-         * @return {D}
-         */
-        domainMax(): D;
-        /**
-         * Sets the upper end of the domain.
-         *
-         * @return {QuantitativeScale} The calling QuantitativeScale.
-         */
-        domainMax(domainMax: D): QuantitativeScale<D>;
-        extentOfValues(values: D[]): D[];
-        protected _setDomain(values: D[]): void;
-        /**
-         * Gets the array of tick values generated by the default algorithm.
-         */
-        defaultTicks(): D[];
-        /**
-         * Gets an array of tick values spanning the domain.
-         *
-         * @returns {D[]}
-         */
-        ticks(): D[];
-        /**
-         * Given a domain, expands its domain onto "nice" values, e.g. whole
-         * numbers.
-         */
-        protected _niceDomain(domain: D[], count?: number): D[];
-        protected _defaultExtent(): D[];
-        /**
-         * Gets the TickGenerator.
-         */
-        tickGenerator(): Scales.TickGenerators.TickGenerator<D>;
-        /**
-         * Sets the TickGenerator
-         *
-         * @param {TickGenerator} generator
-         * @return {QuantitativeScale} The calling QuantitativeScale.
-         */
-        tickGenerator(generator: Scales.TickGenerators.TickGenerator<D>): QuantitativeScale<D>;
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Scales {
-        class Linear extends QuantitativeScale<number> {
-            /**
-             * @constructor
-             */
-            constructor();
-            protected _defaultExtent(): number[];
-            protected _expandSingleValueDomain(singleValueDomain: number[]): number[];
-            scale(value: number): number;
-            protected _getDomain(): number[];
-            protected _setBackingScaleDomain(values: number[]): void;
-            protected _getRange(): number[];
-            protected _setRange(values: number[]): void;
-            invert(value: number): number;
-            defaultTicks(): number[];
-            protected _niceDomain(domain: number[], count?: number): number[];
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Scales {
-        class ModifiedLog extends QuantitativeScale<number> {
-            /**
-             * A ModifiedLog Scale acts as a regular log scale for large numbers.
-             * As it approaches 0, it gradually becomes linear.
-             * Consequently, a ModifiedLog Scale can process 0 and negative numbers.
-             *
-             * @constructor
-             * @param {number} [base=10]
-             *        The base of the log. Must be > 1.
-             *
-             *        For x <= base, scale(x) = log(x).
-             *
-             *        For 0 < x < base, scale(x) will become more and more
-             *        linear as it approaches 0.
-             *
-             *        At x == 0, scale(x) == 0.
-             *
-             *        For negative values, scale(-x) = -scale(x).
-             */
-            constructor(base?: number);
-            scale(x: number): number;
-            invert(x: number): number;
-            protected _getDomain(): number[];
-            protected _setDomain(values: number[]): void;
-            protected _setBackingScaleDomain(values: number[]): void;
-            ticks(): number[];
-            protected _niceDomain(domain: number[], count?: number): number[];
-            protected _defaultExtent(): number[];
-            protected _expandSingleValueDomain(singleValueDomain: number[]): number[];
-            protected _getRange(): number[];
-            protected _setRange(values: number[]): void;
-            defaultTicks(): number[];
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Scales {
-        class Category extends Scale<string, number> {
-            /**
-             * A Category Scale maps strings to numbers.
-             *
-             * @constructor
-             */
-            constructor();
-            extentOfValues(values: string[]): string[];
-            protected _getExtent(): string[];
-            domain(): string[];
-            domain(values: string[]): Category;
-            protected _setDomain(values: string[]): void;
-            range(): [number, number];
-            range(values: [number, number]): Category;
-            /**
-             * Returns the width of the range band.
-             *
-             * @returns {number} The range band width
-             */
-            rangeBand(): number;
-            /**
-             * Returns the step width of the scale.
-             *
-             * The step width is the pixel distance between adjacent values in the domain.
-             *
-             * @returns {number}
-             */
-            stepWidth(): number;
-            /**
-             * Gets the inner padding.
-             *
-             * The inner padding is defined as the padding in between bands on the scale,
-             * expressed as a multiple of the rangeBand().
-             *
-             * @returns {number}
-             */
-            innerPadding(): number;
-            /**
-             * Sets the inner padding.
-             *
-             * The inner padding is defined as the padding in between bands on the scale,
-             * expressed as a multiple of the rangeBand().
-             *
-             * @returns {Category} The calling Category Scale.
-             */
-            innerPadding(innerPadding: number): Category;
-            /**
-             * Gets the outer padding.
-             *
-             * The outer padding is the padding in between the outer bands and the edges of the range,
-             * expressed as a multiple of the rangeBand().
-             *
-             * @returns {number}
-             */
-            outerPadding(): number;
-            /**
-             * Sets the outer padding.
-             *
-             * The outer padding is the padding in between the outer bands and the edges of the range,
-             * expressed as a multiple of the rangeBand().
-             *
-             * @returns {Category} The calling Category Scale.
-             */
-            outerPadding(outerPadding: number): Category;
-            scale(value: string): number;
-            protected _getDomain(): string[];
-            protected _setBackingScaleDomain(values: string[]): void;
-            protected _getRange(): number[];
-            protected _setRange(values: number[]): void;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Scales {
-        class Color extends Scale<string, string> {
-            /**
-             * A Color Scale maps string values to color hex values expressed as a string.
-             *
-             * @constructor
-             * @param {string} [scaleType] One of "Category10"/"Category20"/"Category20b"/"Category20c".
-             *   (see https://github.com/mbostock/d3/wiki/Ordinal-Scales#categorical-colors)
-             *   If not supplied, reads the colors defined using CSS -- see plottable.css.
-             */
-            constructor(scaleType?: string);
-            extentOfValues(values: string[]): string[];
-            protected _getExtent(): string[];
-            static invalidateColorCache(): void;
-            /**
-             * Returns the color-string corresponding to a given string.
-             * If there are not enough colors in the range(), a lightened version of an existing color will be used.
-             *
-             * @param {string} value
-             * @returns {string}
-             */
-            scale(value: string): string;
-            protected _getDomain(): string[];
-            protected _setBackingScaleDomain(values: string[]): void;
-            protected _getRange(): string[];
-            protected _setRange(values: string[]): void;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Scales {
-        class Time extends QuantitativeScale<Date> {
-            /**
-             * A Time Scale maps Date objects to numbers.
-             *
-             * @constructor
-             */
-            constructor();
-            /**
-             * Returns an array of ticks values separated by the specified interval.
-             *
-             * @param {string} interval A string specifying the interval unit.
-             * @param {number?} [step] The number of multiples of the interval between consecutive ticks.
-             * @return {Date[]}
-             */
-            tickInterval(interval: string, step?: number): Date[];
-            protected _setDomain(values: Date[]): void;
-            protected _defaultExtent(): Date[];
-            protected _expandSingleValueDomain(singleValueDomain: Date[]): Date[];
-            scale(value: Date): number;
-            protected _getDomain(): Date[];
-            protected _setBackingScaleDomain(values: Date[]): void;
-            protected _getRange(): number[];
-            protected _setRange(values: number[]): void;
-            invert(value: number): Date;
-            defaultTicks(): Date[];
-            protected _niceDomain(domain: Date[]): Date[];
-            /**
-             * Transforms the Plottable TimeInterval string into a d3 time interval equivalent.
-             * If the provided TimeInterval is incorrect, the default is d3.time.year
-             */
-            static timeIntervalToD3Time(timeInterval: string): d3.time.Interval;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Scales {
-        class InterpolatedColor extends Scale<number, string> {
-            static REDS: string[];
-            static BLUES: string[];
-            static POSNEG: string[];
-            /**
-             * An InterpolatedColor Scale maps numbers to color hex values, expressed as strings.
-             *
-             * @param {string} [scaleType="linear"] One of "linear"/"log"/"sqrt"/"pow".
-             */
-            constructor(scaleType?: string);
-            extentOfValues(values: number[]): number[];
-            autoDomain(): InterpolatedColor;
-            scale(value: number): string;
-            protected _getDomain(): number[];
-            protected _setBackingScaleDomain(values: number[]): void;
-            protected _getRange(): string[];
-            protected _setRange(range: string[]): void;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Scales {
-        namespace TickGenerators {
-            /**
-             * Generates an array of tick values for the specified scale.
-             *
-             * @param {QuantitativeScale} scale
-             * @returns {D[]}
-             */
-            interface TickGenerator<D> {
-                (scale: Plottable.QuantitativeScale<D>): D[];
-            }
-            /**
-             * Creates a TickGenerator using the specified interval.
-             *
-             * Generates ticks at multiples of the interval while also including the domain boundaries.
-             *
-             * @param {number} interval
-             * @returns {TickGenerator}
-             */
-            function intervalTickGenerator(interval: number): TickGenerator<number>;
-            /**
-             * Creates a TickGenerator returns only integer tick values.
-             *
-             * @returns {TickGenerator}
-             */
-            function integerTickGenerator(): TickGenerator<number>;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Drawers {
-        /**
-         * A step for the drawer to draw.
-         *
-         * Specifies how AttributeToProjector needs to be animated.
-         */
-        type DrawStep = {
-            attrToProjector: AttributeToProjector;
-            animator: Animator;
-        };
-        /**
-         * A DrawStep that carries an AttributeToAppliedProjector map.
-         */
-        type AppliedDrawStep = {
-            attrToAppliedProjector: AttributeToAppliedProjector;
-            animator: Animator;
-        };
-    }
-    class Drawer {
-        protected _svgElementName: string;
-        protected _className: string;
-        /**
-         * A Drawer draws svg elements based on the input Dataset.
-         *
-         * @constructor
-         * @param {Dataset} dataset The dataset associated with this Drawer
-         */
-        constructor(dataset: Dataset);
-        /**
-         * Retrieves the renderArea selection for the Drawer.
-         */
-        renderArea(): d3.Selection<void>;
-        /**
-         * Sets the renderArea selection for the Drawer.
-         *
-         * @param {d3.Selection} Selection containing the <g> to render to.
-         * @returns {Drawer} The calling Drawer.
-         */
-        renderArea(area: d3.Selection<void>): Drawer;
-        /**
-         * Removes the Drawer and its renderArea
-         */
-        remove(): void;
-        protected _applyDefaultAttributes(selection: d3.Selection<any>): void;
-        /**
-         * Calculates the total time it takes to use the input drawSteps to draw the input data
-         *
-         * @param {any[]} data The data that would have been drawn
-         * @param {Drawers.DrawStep[]} drawSteps The DrawSteps to use
-         * @returns {number} The total time it takes to draw
-         */
-        totalDrawTime(data: any[], drawSteps: Drawers.DrawStep[]): number;
-        /**
-         * Draws the data into the renderArea using the spefic steps and metadata
-         *
-         * @param{any[]} data The data to be drawn
-         * @param{DrawStep[]} drawSteps The list of steps, which needs to be drawn
-         */
-        draw(data: any[], drawSteps: Drawers.DrawStep[]): Drawer;
-        selection(): d3.Selection<any>;
-        /**
-         * Returns the CSS selector for this Drawer's visual elements.
-         */
-        selector(): string;
-        /**
-         * Returns the D3 selection corresponding to the datum with the specified index.
-         */
-        selectionForIndex(index: number): d3.Selection<any>;
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Drawers {
-        class Line extends Drawer {
-            constructor(dataset: Dataset);
-            protected _applyDefaultAttributes(selection: d3.Selection<any>): void;
-            selectionForIndex(index: number): d3.Selection<any>;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Drawers {
-        class Area extends Drawer {
-            constructor(dataset: Dataset);
-            protected _applyDefaultAttributes(selection: d3.Selection<any>): void;
-            selectionForIndex(index: number): d3.Selection<any>;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Drawers {
-        class Rectangle extends Drawer {
-            constructor(dataset: Dataset);
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Drawers {
-        class Arc extends Drawer {
-            constructor(dataset: Dataset);
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Drawers {
-        class Symbol extends Drawer {
-            constructor(dataset: Dataset);
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Drawers {
-        class Segment extends Drawer {
-            constructor(dataset: Dataset);
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    type ComponentCallback = (component: Component) => void;
-    namespace Components {
-        class Alignment {
-            static TOP: string;
-            static BOTTOM: string;
-            static LEFT: string;
-            static RIGHT: string;
-            static CENTER: string;
-        }
-    }
-    class Component {
-        protected _boundingBox: d3.Selection<void>;
-        protected _clipPathEnabled: boolean;
-        protected _isSetup: boolean;
-        protected _isAnchored: boolean;
-        constructor();
-        /**
-         * Attaches the Component as a child of a given d3 Selection.
-         *
-         * @param {d3.Selection} selection.
-         * @returns {Component} The calling Component.
-         */
-        anchor(selection: d3.Selection<void>): Component;
-        /**
-         * Adds a callback to be called on anchoring the Component to the DOM.
-         * If the Component is already anchored, the callback is called immediately.
-         *
-         * @param {ComponentCallback} callback
-         * @return {Component}
-         */
-        onAnchor(callback: ComponentCallback): Component;
-        /**
-         * Removes a callback that would be called on anchoring the Component to the DOM.
-         * The callback is identified by reference equality.
-         *
-         * @param {ComponentCallback} callback
-         * @return {Component}
-         */
-        offAnchor(callback: ComponentCallback): Component;
-        /**
-         * Creates additional elements as necessary for the Component to function.
-         * Called during anchor() if the Component's element has not been created yet.
-         * Override in subclasses to provide additional functionality.
-         */
-        protected _setup(): void;
-        /**
-         * Given available space in pixels, returns the minimum width and height this Component will need.
-         *
-         * @param {number} availableWidth
-         * @param {number} availableHeight
-         * @returns {SpaceRequest}
-         */
-        requestedSpace(availableWidth: number, availableHeight: number): SpaceRequest;
-        /**
-         * Computes and sets the size, position, and alignment of the Component from the specified values.
-         * If no parameters are supplied and the Component is a root node,
-         * they are inferred from the size of the Component's element.
-         *
-         * @param {Point} [origin] Origin of the space offered to the Component.
-         * @param {number} [availableWidth] Available width in pixels.
-         * @param {number} [availableHeight] Available height in pixels.
-         * @returns {Component} The calling Component.
-         */
-        computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): Component;
-        protected _sizeFromOffer(availableWidth: number, availableHeight: number): {
-            width: number;
-            height: number;
-        };
-        /**
-         * Queues the Component for rendering.
-         *
-         * @returns {Component} The calling Component.
-         */
-        render(): Component;
-        /**
-         * Renders the Component without waiting for the next frame.
-         */
-        renderImmediately(): Component;
-        /**
-         * Causes the Component to re-layout and render.
-         *
-         * This function should be called when a CSS change has occured that could
-         * influence the layout of the Component, such as changing the font size.
-         *
-         * @returns {Component} The calling Component.
-         */
-        redraw(): Component;
-        /**
-         * Renders the Component to a given <svg>.
-         *
-         * @param {String|d3.Selection} element A selector-string for the <svg>, or a d3 selection containing an <svg>.
-         * @returns {Component} The calling Component.
-         */
-        renderTo(element: String | d3.Selection<void>): Component;
-        /**
-         * Gets the x alignment of the Component.
-         */
-        xAlignment(): string;
-        /**
-         * Sets the x alignment of the Component.
-         *
-         * @param {string} xAlignment The x alignment of the Component ("left"/"center"/"right").
-         * @returns {Component} The calling Component.
-         */
-        xAlignment(xAlignment: string): Component;
-        /**
-         * Gets the y alignment of the Component.
-         */
-        yAlignment(): string;
-        /**
-         * Sets the y alignment of the Component.
-         *
-         * @param {string} yAlignment The y alignment of the Component ("top"/"center"/"bottom").
-         * @returns {Component} The calling Component.
-         */
-        yAlignment(yAlignment: string): Component;
-        /**
-         * Checks if the Component has a given CSS class.
-         *
-         * @param {string} cssClass The CSS class to check for.
-         */
-        hasClass(cssClass: string): boolean;
-        /**
-         * Adds a given CSS class to the Component.
-         *
-         * @param {string} cssClass The CSS class to add.
-         * @returns {Component} The calling Component.
-         */
-        addClass(cssClass: string): Component;
-        /**
-         * Removes a given CSS class from the Component.
-         *
-         * @param {string} cssClass The CSS class to remove.
-         * @returns {Component} The calling Component.
-         */
-        removeClass(cssClass: string): Component;
-        /**
-         * Checks if the Component has a fixed width or if it grows to fill available space.
-         * Returns false by default on the base Component class.
-         */
-        fixedWidth(): boolean;
-        /**
-         * Checks if the Component has a fixed height or if it grows to fill available space.
-         * Returns false by default on the base Component class.
-         */
-        fixedHeight(): boolean;
-        /**
-         * Detaches a Component from the DOM. The Component can be reused.
-         *
-         * This should only be used if you plan on reusing the calling Component. Otherwise, use destroy().
-         *
-         * @returns The calling Component.
-         */
-        detach(): Component;
-        /**
-         * Adds a callback to be called when the Component is detach()-ed.
-         *
-         * @param {ComponentCallback} callback
-         * @return {Component} The calling Component.
-         */
-        onDetach(callback: ComponentCallback): Component;
-        /**
-         * Removes a callback to be called when the Component is detach()-ed.
-         * The callback is identified by reference equality.
-         *
-         * @param {ComponentCallback} callback
-         * @return {Component} The calling Component.
-         */
-        offDetach(callback: ComponentCallback): Component;
-        /**
-         * Gets the parent ComponentContainer for this Component.
-         */
-        parent(): ComponentContainer;
-        /**
-         * Sets the parent ComponentContainer for this Component.
-         * An error will be thrown if the parent does not contain this Component.
-         * Adding a Component to a ComponentContainer should be done
-         * using the appropriate method on the ComponentContainer.
-         */
-        parent(parent: ComponentContainer): Component;
-        /**
-         * Removes a Component from the DOM and disconnects all listeners.
-         */
-        destroy(): void;
-        /**
-         * Gets the width of the Component in pixels.
-         */
-        width(): number;
-        /**
-         * Gets the height of the Component in pixels.
-         */
-        height(): number;
-        /**
-         * Gets the origin of the Component relative to its parent.
-         *
-         * @return {Point}
-         */
-        origin(): Point;
-        /**
-         * Gets the origin of the Component relative to the root <svg>.
-         *
-         * @return {Point}
-         */
-        originToSVG(): Point;
-        /**
-         * Gets the Selection containing the <g> in front of the visual elements of the Component.
-         *
-         * Will return undefined if the Component has not been anchored.
-         *
-         * @return {d3.Selection}
-         */
-        foreground(): d3.Selection<void>;
-        /**
-         * Gets a Selection containing a <g> that holds the visual elements of the Component.
-         *
-         * Will return undefined if the Component has not been anchored.
-         *
-         * @return {d3.Selection} content selection for the Component
-         */
-        content(): d3.Selection<void>;
-        /**
-         * Gets the Selection containing the <g> behind the visual elements of the Component.
-         *
-         * Will return undefined if the Component has not been anchored.
-         *
-         * @return {d3.Selection} background selection for the Component
-         */
-        background(): d3.Selection<void>;
-    }
-}
-
-
-declare namespace Plottable {
-    class ComponentContainer extends Component {
-        constructor();
-        anchor(selection: d3.Selection<void>): ComponentContainer;
-        render(): ComponentContainer;
-        /**
-         * Checks whether the specified Component is in the ComponentContainer.
-         */
-        has(component: Component): boolean;
-        protected _adoptAndAnchor(component: Component): void;
-        /**
-         * Removes the specified Component from the ComponentContainer.
-         */
-        remove(component: Component): ComponentContainer;
-        /**
-         * Carry out the actual removal of a Component.
-         * Implementation dependent on the type of container.
-         *
-         * @return {boolean} true if the Component was successfully removed, false otherwise.
-         */
-        protected _remove(component: Component): boolean;
-        /**
-         * Invokes a callback on each Component in the ComponentContainer.
-         */
-        protected _forEach(callback: (component: Component) => void): void;
-        /**
-         * Destroys the ComponentContainer and all Components within it.
-         */
-        destroy(): void;
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Components {
-        class Group extends ComponentContainer {
-            /**
-             * Constructs a Group.
-             *
-             * A Group contains Components that will be rendered on top of each other.
-             * Components added later will be rendered above Components already in the Group.
-             *
-             * @constructor
-             * @param {Component[]} [components=[]] Components to be added to the Group.
-             */
-            constructor(components?: Component[]);
-            protected _forEach(callback: (component: Component) => any): void;
-            /**
-             * Checks whether the specified Component is in the Group.
-             */
-            has(component: Component): boolean;
-            requestedSpace(offeredWidth: number, offeredHeight: number): SpaceRequest;
-            computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): Group;
-            protected _sizeFromOffer(availableWidth: number, availableHeight: number): {
-                width: number;
-                height: number;
-            };
-            fixedWidth(): boolean;
-            fixedHeight(): boolean;
-            /**
-             * @return {Component[]} The Components in this Group.
-             */
-            components(): Component[];
-            /**
-             * Adds a Component to this Group.
-             * The added Component will be rendered above Components already in the Group.
-             */
-            append(component: Component): Group;
-            protected _remove(component: Component): boolean;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    class Axis<D> extends Component {
-        /**
-         * The css class applied to each end tick mark (the line on the end tick).
-         */
-        static END_TICK_MARK_CLASS: string;
-        /**
-         * The css class applied to each tick mark (the line on the tick).
-         */
-        static TICK_MARK_CLASS: string;
-        /**
-         * The css class applied to each tick label (the text associated with the tick).
-         */
-        static TICK_LABEL_CLASS: string;
-        protected _tickMarkContainer: d3.Selection<void>;
-        protected _tickLabelContainer: d3.Selection<void>;
-        protected _baseline: d3.Selection<void>;
-        protected _scale: Scale<D, number>;
-        protected _computedWidth: number;
-        protected _computedHeight: number;
-        /**
-         * Constructs an Axis.
-         * An Axis is a visual representation of a Scale.
-         *
-         * @constructor
-         * @param {Scale} scale
-         * @param {string} orientation One of "top"/"bottom"/"left"/"right".
-         */
-        constructor(scale: Scale<D, number>, orientation: string);
-        destroy(): void;
-        protected _isHorizontal(): boolean;
-        protected _computeWidth(): number;
-        protected _computeHeight(): number;
-        requestedSpace(offeredWidth: number, offeredHeight: number): SpaceRequest;
-        fixedHeight(): boolean;
-        fixedWidth(): boolean;
-        protected _rescale(): void;
-        computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): Axis<D>;
-        protected _setup(): void;
-        protected _getTickValues(): D[];
-        renderImmediately(): Axis<D>;
-        protected _generateBaselineAttrHash(): {
-            [key: string]: number;
-        };
-        protected _generateTickMarkAttrHash(isEndTickMark?: boolean): {
-            [key: string]: number | ((d: any) => number);
-        };
-        redraw(): Component;
-        protected _setDefaultAlignment(): void;
-        /**
-         * Gets the Formatter on the Axis. Tick values are passed through the
-         * Formatter before being displayed.
-         */
-        formatter(): Formatter;
-        /**
-         * Sets the Formatter on the Axis. Tick values are passed through the
-         * Formatter before being displayed.
-         *
-         * @param {Formatter} formatter
-         * @returns {Axis} The calling Axis.
-         */
-        formatter(formatter: Formatter): Axis<D>;
-        /**
-         * @deprecated As of release 1.3, replaced by innerTickLength()
-         *
-         * Gets the tick mark length in pixels.
-         */
-        tickLength(): number;
-        /**
-         * Sets the tick mark length in pixels.
-         *
-         * @param {number} length
-         * @returns {Axis} The calling Axis.
-         */
-        tickLength(length: number): Axis<D>;
-        /**
-         * Gets the tick mark length in pixels.
-         */
-        innerTickLength(): number;
-        /**
-         * Sets the tick mark length in pixels.
-         *
-         * @param {number} length
-         * @returns {Axis} The calling Axis.
-         */
-        innerTickLength(length: number): Axis<D>;
-        /**
-         * Gets the end tick mark length in pixels.
-         */
-        endTickLength(): number;
-        /**
-         * Sets the end tick mark length in pixels.
-         *
-         * @param {number} length
-         * @returns {Axis} The calling Axis.
-         */
-        endTickLength(length: number): Axis<D>;
-        protected _maxLabelTickLength(): number;
-        /**
-         * Gets the padding between each tick mark and its associated label in pixels.
-         */
-        tickLabelPadding(): number;
-        /**
-         * Sets the padding between each tick mark and its associated label in pixels.
-         *
-         * @param {number} padding
-         * @returns {Axis} The calling Axis.
-         */
-        tickLabelPadding(padding: number): Axis<D>;
-        /**
-         * Gets the margin in pixels.
-         * The margin is the amount of space between the tick labels and the outer edge of the Axis.
-         */
-        margin(): number;
-        /**
-         * Sets the margin in pixels.
-         * The margin is the amount of space between the tick labels and the outer edge of the Axis.
-         *
-         * @param {number} size
-         * @returns {Axis} The calling Axis.
-         */
-        margin(size: number): Axis<D>;
-        /**
-         * Gets the orientation of the Axis.
-         */
-        orientation(): string;
-        /**
-         * Sets the orientation of the Axis.
-         *
-         * @param {number} orientation One of "top"/"bottom"/"left"/"right".
-         * @returns {Axis} The calling Axis.
-         */
-        orientation(orientation: string): Axis<D>;
-        /**
-         * Gets whether the Axis shows the end tick labels.
-         */
-        showEndTickLabels(): boolean;
-        /**
-         * Sets whether the Axis shows the end tick labels.
-         *
-         * @param {boolean} show
-         * @returns {Axis} The calling Axis.
-         */
-        showEndTickLabels(show: boolean): Axis<D>;
-    }
-}
-
-
-declare namespace Plottable {
-    namespace TimeInterval {
-        var second: string;
-        var minute: string;
-        var hour: string;
-        var day: string;
-        var week: string;
-        var month: string;
-        var year: string;
-    }
-    namespace Axes {
-        /**
-         * Defines a configuration for a Time Axis tier.
-         * For details on how ticks are generated see: https://github.com/mbostock/d3/wiki/Time-Scales#ticks
-         * interval - A time unit associated with this configuration (seconds, minutes, hours, etc).
-         * step - number of intervals between each tick.
-         * formatter - formatter used to format tick labels.
-         */
-        type TimeAxisTierConfiguration = {
-            interval: string;
-            step: number;
-            formatter: Formatter;
-        };
-        /**
-         * An array of linked TimeAxisTierConfigurations.
-         * Each configuration will be shown on a different tier.
-         * Currently, up to two tiers are supported.
-         */
-        type TimeAxisConfiguration = TimeAxisTierConfiguration[];
-        class Time extends Axis<Date> {
-            /**
-             * The CSS class applied to each Time Axis tier
-             */
-            static TIME_AXIS_TIER_CLASS: string;
-            /**
-             * Constructs a Time Axis.
-             *
-             * A Time Axis is a visual representation of a Time Scale.
-             *
-             * @constructor
-             * @param {Scales.Time} scale
-             * @param {string} orientation One of "top"/"bottom".
-             */
-            constructor(scale: Scales.Time, orientation: string);
-            /**
-             * Gets the label positions for each tier.
-             */
-            tierLabelPositions(): string[];
-            /**
-             * Sets the label positions for each tier.
-             *
-             * @param {string[]} newPositions The positions for each tier. "bottom" and "center" are the only supported values.
-             * @returns {Axes.Time} The calling Time Axis.
-             */
-            tierLabelPositions(newPositions: string[]): Time;
-            /**
-             * Gets the possible TimeAxisConfigurations.
-             */
-            axisConfigurations(): TimeAxisConfiguration[];
-            /**
-             * Sets the possible TimeAxisConfigurations.
-             * The Time Axis will choose the most precise configuration that will display in the available space.
-             *
-             * @param {TimeAxisConfiguration[]} configurations
-             * @returns {Axes.Time} The calling Time Axis.
-             */
-            axisConfigurations(configurations: TimeAxisConfiguration[]): Time;
-            orientation(): string;
-            orientation(orientation: string): Time;
-            protected _computeHeight(): number;
-            protected _sizeFromOffer(availableWidth: number, availableHeight: number): {
-                width: number;
-                height: number;
-            };
-            protected _setup(): void;
-            protected _getTickValues(): any[];
-            renderImmediately(): Time;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Axes {
-        class Numeric extends Axis<number> {
-            /**
-             * Constructs a Numeric Axis.
-             *
-             * A Numeric Axis is a visual representation of a QuantitativeScale.
-             *
-             * @constructor
-             * @param {QuantitativeScale} scale
-             * @param {string} orientation One of "top"/"bottom"/"left"/"right".
-             */
-            constructor(scale: QuantitativeScale<number>, orientation: string);
-            protected _setup(): void;
-            protected _computeWidth(): number;
-            protected _computeHeight(): number;
-            protected _getTickValues(): number[];
-            protected _rescale(): void;
-            renderImmediately(): Numeric;
-            /**
-             * Gets the tick label position relative to the tick marks.
-             *
-             * @returns {string} The current tick label position.
-             */
-            tickLabelPosition(): string;
-            /**
-             * Sets the tick label position relative to the tick marks.
-             *
-             * @param {string} position "top"/"center"/"bottom" for a vertical Numeric Axis,
-             *                          "left"/"center"/"right" for a horizontal Numeric Axis.
-             * @returns {Numeric} The calling Numeric Axis.
-             */
-            tickLabelPosition(position: string): Numeric;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Axes {
-        class Category extends Axis<string> {
-            /**
-             * Constructs a Category Axis.
-             *
-             * A Category Axis is a visual representation of a Category Scale.
-             *
-             * @constructor
-             * @param {Scales.Category} scale
-             * @param {string} [orientation="bottom"] One of "top"/"bottom"/"left"/"right".
-             */
-            constructor(scale: Scales.Category, orientation: string);
-            protected _setup(): void;
-            protected _rescale(): Component;
-            requestedSpace(offeredWidth: number, offeredHeight: number): SpaceRequest;
-            protected _getTickValues(): string[];
-            /**
-             * Gets the tick label angle in degrees.
-             */
-            tickLabelAngle(): number;
-            /**
-             * Sets the tick label angle in degrees.
-             * Right now only -90/0/90 are supported. 0 is horizontal.
-             *
-             * @param {number} angle
-             * @returns {Category} The calling Category Axis.
-             */
-            tickLabelAngle(angle: number): Category;
-            renderImmediately(): Category;
-            computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): Axis<string>;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Components {
-        class Label extends Component {
-            /**
-             * A Label is a Component that displays a single line of text.
-             *
-             * @constructor
-             * @param {string} [displayText=""] The text of the Label.
-             * @param {number} [angle=0] The angle of the Label in degrees (-90/0/90). 0 is horizontal.
-             */
-            constructor(displayText?: string, angle?: number);
-            requestedSpace(offeredWidth: number, offeredHeight: number): SpaceRequest;
-            protected _setup(): void;
-            /**
-             * Gets the Label's text.
-             */
-            text(): string;
-            /**
-             * Sets the Label's text.
-             *
-             * @param {string} displayText
-             * @returns {Label} The calling Label.
-             */
-            text(displayText: string): Label;
-            /**
-             * Gets the angle of the Label in degrees.
-             */
-            angle(): number;
-            /**
-             * Sets the angle of the Label in degrees.
-             *
-             * @param {number} angle One of -90/0/90. 0 is horizontal.
-             * @returns {Label} The calling Label.
-             */
-            angle(angle: number): Label;
-            /**
-             * Gets the amount of padding around the Label in pixels.
-             */
-            padding(): number;
-            /**
-             * Sets the amount of padding around the Label in pixels.
-             *
-             * @param {number} padAmount
-             * @returns {Label} The calling Label.
-             */
-            padding(padAmount: number): Label;
-            fixedWidth(): boolean;
-            fixedHeight(): boolean;
-            renderImmediately(): Label;
-        }
-        class TitleLabel extends Label {
-            static TITLE_LABEL_CLASS: string;
-            /**
-             * @constructor
-             * @param {string} [text]
-             * @param {number} [angle] One of -90/0/90. 0 is horizontal.
-             */
-            constructor(text?: string, angle?: number);
-        }
-        class AxisLabel extends Label {
-            static AXIS_LABEL_CLASS: string;
-            /**
-             * @constructor
-             * @param {string} [text]
-             * @param {number} [angle] One of -90/0/90. 0 is horizontal.
-             */
-            constructor(text?: string, angle?: number);
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Components {
-        class Legend extends Component {
-            /**
-             * The css class applied to each legend row
-             */
-            static LEGEND_ROW_CLASS: string;
-            /**
-             * The css class applied to each legend entry
-             */
-            static LEGEND_ENTRY_CLASS: string;
-            /**
-             * The css class applied to each legend symbol
-             */
-            static LEGEND_SYMBOL_CLASS: string;
-            /**
-             * The Legend consists of a series of entries, each with a color and label taken from the Color Scale.
-             *
-             * @constructor
-             * @param {Scale.Color} scale
-             */
-            constructor(colorScale: Scales.Color);
-            protected _setup(): void;
-            /**
-             * Gets the maximum number of entries per row.
-             *
-             * @returns {number}
-             */
-            maxEntriesPerRow(): number;
-            /**
-             * Sets the maximum number of entries perrow.
-             *
-             * @param {number} maxEntriesPerRow
-             * @returns {Legend} The calling Legend.
-             */
-            maxEntriesPerRow(maxEntriesPerRow: number): Legend;
-            /**
-             * Gets the current comparator for the Legend's entries.
-             *
-             * @returns {(a: string, b: string) => number}
-             */
-            comparator(): (a: string, b: string) => number;
-            /**
-             * Sets a new comparator for the Legend's entries.
-             * The comparator is used to set the display order of the entries.
-             *
-             * @param {(a: string, b: string) => number} comparator
-             * @returns {Legend} The calling Legend.
-             */
-            comparator(comparator: (a: string, b: string) => number): Legend;
-            /**
-             * Gets the Color Scale.
-             *
-             * @returns {Scales.Color}
-             */
-            colorScale(): Scales.Color;
-            /**
-             * Sets the Color Scale.
-             *
-             * @param {Scales.Color} scale
-             * @returns {Legend} The calling Legend.
-             */
-            colorScale(colorScale: Scales.Color): Legend;
-            destroy(): void;
-            requestedSpace(offeredWidth: number, offeredHeight: number): SpaceRequest;
-            /**
-             * Gets the Entities (representing Legend entries) at a particular point.
-             * Returns an empty array if no Entities are present at that location.
-             *
-             * @param {Point} p
-             * @returns {Entity<Legend>[]}
-             */
-            entitiesAt(p: Point): Entity<Legend>[];
-            renderImmediately(): Legend;
-            /**
-             * Gets the function determining the symbols of the Legend.
-             *
-             * @returns {(datum: any, index: number) => symbolFactory}
-             */
-            symbol(): (datum: any, index: number) => SymbolFactory;
-            /**
-             * Sets the function determining the symbols of the Legend.
-             *
-             * @param {(datum: any, index: number) => SymbolFactory} symbol
-             * @returns {Legend} The calling Legend
-             */
-            symbol(symbol: (datum: any, index: number) => SymbolFactory): Legend;
-            fixedWidth(): boolean;
-            fixedHeight(): boolean;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Components {
-        class InterpolatedColorLegend extends Component {
-            /**
-             * The css class applied to the legend labels.
-             */
-            static LEGEND_LABEL_CLASS: string;
-            /**
-             * Creates an InterpolatedColorLegend.
-             *
-             * The InterpolatedColorLegend consists of a sequence of swatches that show the
-             * associated InterpolatedColor Scale sampled at various points.
-             * Two labels show the maximum and minimum values of the InterpolatedColor Scale.
-             *
-             * @constructor
-             * @param {Scales.InterpolatedColor} interpolatedColorScale
-             */
-            constructor(interpolatedColorScale: Scales.InterpolatedColor);
-            destroy(): void;
-            /**
-             * Gets the Formatter for the labels.
-             */
-            formatter(): Formatter;
-            /**
-             * Sets the Formatter for the labels.
-             *
-             * @param {Formatter} formatter
-             * @returns {InterpolatedColorLegend} The calling InterpolatedColorLegend.
-             */
-            formatter(formatter: Formatter): InterpolatedColorLegend;
-            /**
-             * Gets the orientation.
-             */
-            orientation(): string;
-            /**
-             * Sets the orientation.
-             *
-             * @param {string} orientation One of "horizontal"/"left"/"right".
-             * @returns {InterpolatedColorLegend} The calling InterpolatedColorLegend.
-             */
-            orientation(orientation: string): InterpolatedColorLegend;
-            fixedWidth(): boolean;
-            fixedHeight(): boolean;
-            protected _setup(): void;
-            requestedSpace(offeredWidth: number, offeredHeight: number): SpaceRequest;
-            renderImmediately(): InterpolatedColorLegend;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Components {
-        class Gridlines extends Component {
-            /**
-             * @constructor
-             * @param {QuantitativeScale} xScale The scale to base the x gridlines on. Pass null if no gridlines are desired.
-             * @param {QuantitativeScale} yScale The scale to base the y gridlines on. Pass null if no gridlines are desired.
-             */
-            constructor(xScale: QuantitativeScale<any>, yScale: QuantitativeScale<any>);
-            destroy(): Gridlines;
-            protected _setup(): void;
-            renderImmediately(): Gridlines;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Components {
-        class Table extends ComponentContainer {
-            /**
-             * A Table combines Components in the form of a grid. A
-             * common case is combining a y-axis, x-axis, and the plotted data via
-             * ```typescript
-             * new Table([[yAxis, plot],
-             *            [null,  xAxis]]);
-             * ```
-             *
-             * @constructor
-             * @param {Component[][]} [rows=[]] A 2-D array of Components to be added to the Table.
-             *   null can be used if a cell is empty.
-             */
-            constructor(rows?: Component[][]);
-            protected _forEach(callback: (component: Component) => any): void;
-            /**
-             * Checks whether the specified Component is in the Table.
-             */
-            has(component: Component): boolean;
-            /**
-             * Adds a Component in the specified row and column position.
-             *
-             * For example, instead of calling `new Table([[a, b], [null, c]])`, you
-             * could call
-             * ```typescript
-             * var table = new Table();
-             * table.add(a, 0, 0);
-             * table.add(b, 0, 1);
-             * table.add(c, 1, 1);
-             * ```
-             *
-             * @param {Component} component The Component to be added.
-             * @param {number} row
-             * @param {number} col
-             * @returns {Table} The calling Table.
-             */
-            add(component: Component, row: number, col: number): Table;
-            protected _remove(component: Component): boolean;
-            requestedSpace(offeredWidth: number, offeredHeight: number): SpaceRequest;
-            computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): Table;
-            /**
-             * Gets the padding above and below each row in pixels.
-             */
-            rowPadding(): number;
-            /**
-             * Sets the padding above and below each row in pixels.
-             *
-             * @param {number} rowPadding
-             * @returns {Table} The calling Table.
-             */
-            rowPadding(rowPadding: number): Table;
-            /**
-             * Gets the padding to the left and right of each column in pixels.
-             */
-            columnPadding(): number;
-            /**
-             * Sets the padding to the left and right of each column in pixels.
-             *
-             * @param {number} columnPadding
-             * @returns {Table} The calling Table.
-             */
-            columnPadding(columnPadding: number): Table;
-            /**
-             * Gets the weight of the specified row.
-             *
-             * @param {number} index
-             */
-            rowWeight(index: number): number;
-            /**
-             * Sets the weight of the specified row.
-             * Space is allocated to rows based on their weight. Rows with higher weights receive proportionally more space.
-             *
-             * A common case would be to have one row take up 2/3rds of the space,
-             * and the other row take up 1/3rd.
-             *
-             * Example:
-             *
-             * ```JavaScript
-             * plot = new Plottable.Component.Table([
-             *  [row1],
-             *  [row2]
-             * ]);
-             *
-             * // assign twice as much space to the first row
-             * plot
-             *  .rowWeight(0, 2)
-             *  .rowWeight(1, 1)
-             * ```
-             *
-             * @param {number} index
-             * @param {number} weight
-             * @returns {Table} The calling Table.
-             */
-            rowWeight(index: number, weight: number): Table;
-            /**
-             * Gets the weight of the specified column.
-             *
-             * @param {number} index
-             */
-            columnWeight(index: number): number;
-            /**
-             * Sets the weight of the specified column.
-             * Space is allocated to columns based on their weight. Columns with higher weights receive proportionally more space.
-             *
-             * Please see `rowWeight` docs for an example.
-             *
-             * @param {number} index
-             * @param {number} weight
-             * @returns {Table} The calling Table.
-             */
-            columnWeight(index: number, weight: number): Table;
-            fixedWidth(): boolean;
-            fixedHeight(): boolean;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Components {
-        class SelectionBoxLayer extends Component {
-            protected _box: d3.Selection<void>;
-            constructor();
-            protected _setup(): void;
-            protected _sizeFromOffer(availableWidth: number, availableHeight: number): {
-                width: number;
-                height: number;
-            };
-            /**
-             * Gets the Bounds of the box.
-             */
-            bounds(): Bounds;
-            /**
-             * Sets the Bounds of the box.
-             *
-             * @param {Bounds} newBounds
-             * @return {SelectionBoxLayer} The calling SelectionBoxLayer.
-             */
-            bounds(newBounds: Bounds): SelectionBoxLayer;
-            protected _setBounds(newBounds: Bounds): void;
-            renderImmediately(): SelectionBoxLayer;
-            /**
-             * Gets whether the box is being shown.
-             */
-            boxVisible(): boolean;
-            /**
-             * Shows or hides the selection box.
-             *
-             * @param {boolean} show Whether or not to show the box.
-             * @return {SelectionBoxLayer} The calling SelectionBoxLayer.
-             */
-            boxVisible(show: boolean): SelectionBoxLayer;
-            fixedWidth(): boolean;
-            fixedHeight(): boolean;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Plots {
-        interface PlotEntity extends Entity<Plot> {
-            dataset: Dataset;
-            index: number;
-            component: Plot;
-        }
-        interface AccessorScaleBinding<D, R> {
-            accessor: Accessor<any>;
-            scale?: Scale<D, R>;
-        }
-        namespace Animator {
-            var MAIN: string;
-            var RESET: string;
-        }
-    }
-    class Plot extends Component {
-        protected static _ANIMATION_MAX_DURATION: number;
-        protected _renderArea: d3.Selection<void>;
-        protected _renderCallback: ScaleCallback<Scale<any, any>>;
-        protected _propertyExtents: d3.Map<any[]>;
-        protected _propertyBindings: d3.Map<Plots.AccessorScaleBinding<any, any>>;
-        /**
-         * A Plot draws some visualization of the inputted Datasets.
-         *
-         * @constructor
-         */
-        constructor();
-        anchor(selection: d3.Selection<void>): Plot;
-        protected _setup(): void;
-        destroy(): void;
-        /**
-         * Adds a Dataset to the Plot.
-         *
-         * @param {Dataset} dataset
-         * @returns {Plot} The calling Plot.
-         */
-        addDataset(dataset: Dataset): Plot;
-        protected _createNodesForDataset(dataset: Dataset): Drawer;
-        protected _createDrawer(dataset: Dataset): Drawer;
-        protected _getAnimator(key: string): Animator;
-        protected _onDatasetUpdate(): void;
-        /**
-         * Gets the AccessorScaleBinding for a particular attribute.
-         *
-         * @param {string} attr
-         */
-        attr<A>(attr: string): Plots.AccessorScaleBinding<A, number | string>;
-        /**
-         * Sets a particular attribute to a constant value or the result of an Accessor.
-         *
-         * @param {string} attr
-         * @param {number|string|Accessor<number>|Accessor<string>} attrValue
-         * @returns {Plot} The calling Plot.
-         */
-        attr(attr: string, attrValue: number | string | Accessor<number> | Accessor<string>): Plot;
-        /**
-         * Sets a particular attribute to a scaled constant value or scaled result of an Accessor.
-         * The provided Scale will account for the attribute values when autoDomain()-ing.
-         *
-         * @param {string} attr
-         * @param {A|Accessor<A>} attrValue
-         * @param {Scale<A, number | string>} scale The Scale used to scale the attrValue.
-         * @returns {Plot} The calling Plot.
-         */
-        attr<A>(attr: string, attrValue: A | Accessor<A>, scale: Scale<A, number | string>): Plot;
-        protected _bindProperty(property: string, value: any, scale: Scale<any, any>): void;
-        protected _generateAttrToProjector(): AttributeToProjector;
-        renderImmediately(): Plot;
-        /**
-         * Returns whether the plot will be animated.
-         */
-        animated(): boolean;
-        /**
-         * Enables or disables animation.
-         */
-        animated(willAnimate: boolean): Plot;
-        detach(): Plot;
-        /**
-         * Updates the extents associated with each attribute, then autodomains all scales the Plot uses.
-         */
-        protected _updateExtents(): void;
-        protected _updateExtentsForProperty(property: string): void;
-        protected _filterForProperty(property: string): Accessor<boolean>;
-        /**
-         * Override in subclass to add special extents, such as included values
-         */
-        protected _extentsForProperty(property: string): any[];
-        /**
-         * Get the Animator associated with the specified Animator key.
-         *
-         * @return {Animator}
-         */
-        animator(animatorKey: string): Animator;
-        /**
-         * Set the Animator associated with the specified Animator key.
-         *
-         * @param {string} animatorKey
-         * @param {Animator} animator
-         * @returns {Plot} The calling Plot.
-         */
-        animator(animatorKey: string, animator: Animator): Plot;
-        /**
-         * Removes a Dataset from the Plot.
-         *
-         * @param {Dataset} dataset
-         * @returns {Plot} The calling Plot.
-         */
-        removeDataset(dataset: Dataset): Plot;
-        protected _removeDatasetNodes(dataset: Dataset): void;
-        datasets(): Dataset[];
-        datasets(datasets: Dataset[]): Plot;
-        protected _getDrawersInOrder(): Drawer[];
-        protected _generateDrawSteps(): Drawers.DrawStep[];
-        protected _additionalPaint(time: number): void;
-        protected _getDataToDraw(): Utils.Map<Dataset, any[]>;
-        /**
-         * Retrieves Selections of this Plot for the specified Datasets.
-         *
-         * @param {Dataset[]} [datasets] The Datasets to retrieve the Selections for.
-         *   If not provided, Selections will be retrieved for all Datasets on the Plot.
-         * @returns {d3.Selection}
-         */
-        selections(datasets?: Dataset[]): d3.Selection<any>;
-        /**
-         * Gets the Entities associated with the specified Datasets.
-         *
-         * @param {dataset[]} datasets The Datasets to retrieve the Entities for.
-         *   If not provided, returns defaults to all Datasets on the Plot.
-         * @return {Plots.PlotEntity[]}
-         */
-        entities(datasets?: Dataset[]): Plots.PlotEntity[];
-        /**
-         * Returns the PlotEntity nearest to the query point by the Euclidian norm, or undefined if no PlotEntity can be found.
-         *
-         * @param {Point} queryPoint
-         * @returns {Plots.PlotEntity} The nearest PlotEntity, or undefined if no PlotEntity can be found.
-         */
-        entityNearest(queryPoint: Point): Plots.PlotEntity;
-        protected _visibleOnPlot(datum: any, pixelPoint: Point, selection: d3.Selection<void>): boolean;
-        protected _entityVisibleOnPlot(pixelPoint: Point, datum: any, index: number, dataset: Dataset): boolean;
-        protected _uninstallScaleForKey(scale: Scale<any, any>, key: string): void;
-        protected _installScaleForKey(scale: Scale<any, any>, key: string): void;
-        protected _propertyProjectors(): AttributeToProjector;
-        protected static _scaledAccessor<D, R>(binding: Plots.AccessorScaleBinding<D, R>): Accessor<any>;
-        protected _pixelPoint(datum: any, index: number, dataset: Dataset): Point;
-        protected _animateOnNextRender(): boolean;
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Plots {
-        class Pie extends Plot {
-            /**
-             * @constructor
-             */
-            constructor();
-            computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): Pie;
-            addDataset(dataset: Dataset): Pie;
-            removeDataset(dataset: Dataset): Pie;
-            protected _onDatasetUpdate(): void;
-            protected _createDrawer(dataset: Dataset): Drawers.Arc;
-            entities(datasets?: Dataset[]): PlotEntity[];
-            /**
-             * Gets the AccessorScaleBinding for the sector value.
-             */
-            sectorValue<S>(): AccessorScaleBinding<S, number>;
-            /**
-             * Sets the sector value to a constant number or the result of an Accessor<number>.
-             *
-             * @param {number|Accessor<number>} sectorValue
-             * @returns {Pie} The calling Pie Plot.
-             */
-            sectorValue(sectorValue: number | Accessor<number>): Plots.Pie;
-            /**
-             * Sets the sector value to a scaled constant value or scaled result of an Accessor.
-             * The provided Scale will account for the values when autoDomain()-ing.
-             *
-             * @param {S|Accessor<S>} sectorValue
-             * @param {Scale<S, number>} scale
-             * @returns {Pie} The calling Pie Plot.
-             */
-            sectorValue<S>(sectorValue: S | Accessor<S>, scale: Scale<S, number>): Plots.Pie;
-            /**
-             * Gets the AccessorScaleBinding for the inner radius.
-             */
-            innerRadius<R>(): AccessorScaleBinding<R, number>;
-            /**
-             * Sets the inner radius to a constant number or the result of an Accessor<number>.
-             *
-             * @param {number|Accessor<number>} innerRadius
-             * @returns {Pie} The calling Pie Plot.
-             */
-            innerRadius(innerRadius: number | Accessor<number>): Plots.Pie;
-            /**
-             * Sets the inner radius to a scaled constant value or scaled result of an Accessor.
-             * The provided Scale will account for the values when autoDomain()-ing.
-             *
-             * @param {R|Accessor<R>} innerRadius
-             * @param {Scale<R, number>} scale
-             * @returns {Pie} The calling Pie Plot.
-             */
-            innerRadius<R>(innerRadius: R | Accessor<R>, scale: Scale<R, number>): Plots.Pie;
-            /**
-             * Gets the AccessorScaleBinding for the outer radius.
-             */
-            outerRadius<R>(): AccessorScaleBinding<R, number>;
-            /**
-             * Sets the outer radius to a constant number or the result of an Accessor<number>.
-             *
-             * @param {number|Accessor<number>} outerRadius
-             * @returns {Pie} The calling Pie Plot.
-             */
-            outerRadius(outerRadius: number | Accessor<number>): Plots.Pie;
-            /**
-             * Sets the outer radius to a scaled constant value or scaled result of an Accessor.
-             * The provided Scale will account for the values when autoDomain()-ing.
-             *
-             * @param {R|Accessor<R>} outerRadius
-             * @param {Scale<R, number>} scale
-             * @returns {Pie} The calling Pie Plot.
-             */
-            outerRadius<R>(outerRadius: R | Accessor<R>, scale: Scale<R, number>): Plots.Pie;
-            /**
-             * Get whether slice labels are enabled.
-             *
-             * @returns {boolean} Whether slices should display labels or not.
-             */
-            labelsEnabled(): boolean;
-            /**
-             * Sets whether labels are enabled.
-             *
-             * @param {boolean} labelsEnabled
-             * @returns {Pie} The calling Pie Plot.
-             */
-            labelsEnabled(enabled: boolean): Pie;
-            /**
-             * Gets the Formatter for the labels.
-             */
-            labelFormatter(): Formatter;
-            /**
-             * Sets the Formatter for the labels.
-             *
-             * @param {Formatter} formatter
-             * @returns {Pie} The calling Pie Plot.
-             */
-            labelFormatter(formatter: Formatter): Pie;
-            entitiesAt(queryPoint: Point): PlotEntity[];
-            protected _propertyProjectors(): AttributeToProjector;
-            protected _getDataToDraw(): Utils.Map<Dataset, any[]>;
-            protected _pixelPoint(datum: any, index: number, dataset: Dataset): {
-                x: number;
-                y: number;
-            };
-            protected _additionalPaint(time: number): void;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    class XYPlot<X, Y> extends Plot {
-        protected static _X_KEY: string;
-        protected static _Y_KEY: string;
-        /**
-         * An XYPlot is a Plot that displays data along two primary directions, X and Y.
-         *
-         * @constructor
-         * @param {Scale} xScale The x scale to use.
-         * @param {Scale} yScale The y scale to use.
-         */
-        constructor();
-        /**
-         * Returns the whether or not the rendering is deferred for performance boost.
-         * @return {boolean} The deferred rendering option
-         */
-        deferredRendering(): boolean;
-        /**
-         * Sets / unsets the deferred rendering option
-         * Activating this option improves the performance of plot interaction (pan / zoom) by
-         * performing lazy renders, only after the interaction has stopped. Because re-rendering
-         * is no longer performed during the interaction, the zooming might experience a small
-         * resolution degradation, before the lazy re-render is performed.
-         *
-         * This option is intended for cases where performance is an issue.
-         */
-        deferredRendering(deferredRendering: boolean): XYPlot<X, Y>;
-        /**
-         * Gets the AccessorScaleBinding for X.
-         */
-        x(): Plots.AccessorScaleBinding<X, number>;
-        /**
-         * Sets X to a constant number or the result of an Accessor<number>.
-         *
-         * @param {number|Accessor<number>} x
-         * @returns {XYPlot} The calling XYPlot.
-         */
-        x(x: number | Accessor<number>): XYPlot<X, Y>;
-        /**
-         * Sets X to a scaled constant value or scaled result of an Accessor.
-         * The provided Scale will account for the values when autoDomain()-ing.
-         *
-         * @param {X|Accessor<X>} x
-         * @param {Scale<X, number>} xScale
-         * @returns {XYPlot} The calling XYPlot.
-         */
-        x(x: X | Accessor<X>, xScale: Scale<X, number>): XYPlot<X, Y>;
-        /**
-         * Gets the AccessorScaleBinding for Y.
-         */
-        y(): Plots.AccessorScaleBinding<Y, number>;
-        /**
-         * Sets Y to a constant number or the result of an Accessor<number>.
-         *
-         * @param {number|Accessor<number>} y
-         * @returns {XYPlot} The calling XYPlot.
-         */
-        y(y: number | Accessor<number>): XYPlot<X, Y>;
-        /**
-         * Sets Y to a scaled constant value or scaled result of an Accessor.
-         * The provided Scale will account for the values when autoDomain()-ing.
-         *
-         * @param {Y|Accessor<Y>} y
-         * @param {Scale<Y, number>} yScale
-         * @returns {XYPlot} The calling XYPlot.
-         */
-        y(y: Y | Accessor<Y>, yScale: Scale<Y, number>): XYPlot<X, Y>;
-        protected _filterForProperty(property: string): (datum: any, index: number, dataset: Dataset) => boolean;
-        protected _uninstallScaleForKey(scale: Scale<any, any>, key: string): void;
-        protected _installScaleForKey(scale: Scale<any, any>, key: string): void;
-        destroy(): XYPlot<X, Y>;
-        /**
-         * Gets the automatic domain adjustment mode for visible points.
-         */
-        autorangeMode(): string;
-        /**
-         * Sets the automatic domain adjustment mode for visible points to operate against the X Scale, Y Scale, or neither.
-         * If "x" or "y" is specified the adjustment is immediately performed.
-         *
-         * @param {string} autorangeMode One of "x"/"y"/"none".
-         *   "x" will adjust the x Scale in relation to changes in the y domain.
-         *   "y" will adjust the y Scale in relation to changes in the x domain.
-         *   "none" means neither Scale will change automatically.
-         * @returns {XYPlot} The calling XYPlot.
-         */
-        autorangeMode(autorangeMode: string): XYPlot<X, Y>;
-        computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): XYPlot<X, Y>;
-        /**
-         * Adjusts the domains of both X and Y scales to show all data.
-         * This call does not override the autorange() behavior.
-         *
-         * @returns {XYPlot} The calling XYPlot.
-         */
-        showAllData(): XYPlot<X, Y>;
-        protected _projectorsReady(): boolean;
-        protected _pixelPoint(datum: any, index: number, dataset: Dataset): Point;
-        protected _getDataToDraw(): Utils.Map<Dataset, any[]>;
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Plots {
-        class Rectangle<X, Y> extends XYPlot<X, Y> {
-            /**
-             * A Rectangle Plot displays rectangles based on the data.
-             * The left and right edges of each rectangle can be set with x() and x2().
-             *   If only x() is set the Rectangle Plot will attempt to compute the correct left and right edge positions.
-             * The top and bottom edges of each rectangle can be set with y() and y2().
-             *   If only y() is set the Rectangle Plot will attempt to compute the correct top and bottom edge positions.
-             *
-             * @constructor
-             * @param {Scale.Scale} xScale
-             * @param {Scale.Scale} yScale
-             */
-            constructor();
-            protected _createDrawer(dataset: Dataset): Drawers.Rectangle;
-            protected _generateAttrToProjector(): {
-                [attr: string]: (datum: any, index: number, dataset: Dataset) => any;
-            };
-            protected _generateDrawSteps(): Drawers.DrawStep[];
-            protected _updateExtentsForProperty(property: string): void;
-            protected _filterForProperty(property: string): (datum: any, index: number, dataset: Dataset) => boolean;
-            /**
-             * Gets the AccessorScaleBinding for X.
-             */
-            x(): AccessorScaleBinding<X, number>;
-            /**
-             * Sets X to a constant number or the result of an Accessor<number>.
-             *
-             * @param {number|Accessor<number>} x
-             * @returns {Plots.Rectangle} The calling Rectangle Plot.
-             */
-            x(x: number | Accessor<number>): Plots.Rectangle<X, Y>;
-            /**
-             * Sets X to a scaled constant value or scaled result of an Accessor.
-             * The provided Scale will account for the values when autoDomain()-ing.
-             *
-             * @param {X|Accessor<X>} x
-             * @param {Scale<X, number>} xScale
-             * @returns {Plots.Rectangle} The calling Rectangle Plot.
-             */
-            x(x: X | Accessor<X>, xScale: Scale<X, number>): Plots.Rectangle<X, Y>;
-            /**
-             * Gets the AccessorScaleBinding for X2.
-             */
-            x2(): AccessorScaleBinding<X, number>;
-            /**
-             * Sets X2 to a constant number or the result of an Accessor.
-             * If a Scale has been set for X, it will also be used to scale X2.
-             *
-             * @param {number|Accessor<number>|X|Accessor<X>} x2
-             * @returns {Plots.Rectangle} The calling Rectangle Plot.
-             */
-            x2(x2: number | Accessor<number> | X | Accessor<X>): Plots.Rectangle<X, Y>;
-            /**
-             * Gets the AccessorScaleBinding for Y.
-             */
-            y(): AccessorScaleBinding<Y, number>;
-            /**
-             * Sets Y to a constant number or the result of an Accessor<number>.
-             *
-             * @param {number|Accessor<number>} y
-             * @returns {Plots.Rectangle} The calling Rectangle Plot.
-             */
-            y(y: number | Accessor<number>): Plots.Rectangle<X, Y>;
-            /**
-             * Sets Y to a scaled constant value or scaled result of an Accessor.
-             * The provided Scale will account for the values when autoDomain()-ing.
-             *
-             * @param {Y|Accessor<Y>} y
-             * @param {Scale<Y, number>} yScale
-             * @returns {Plots.Rectangle} The calling Rectangle Plot.
-             */
-            y(y: Y | Accessor<Y>, yScale: Scale<Y, number>): Plots.Rectangle<X, Y>;
-            /**
-             * Gets the AccessorScaleBinding for Y2.
-             */
-            y2(): AccessorScaleBinding<Y, number>;
-            /**
-             * Sets Y2 to a constant number or the result of an Accessor.
-             * If a Scale has been set for Y, it will also be used to scale Y2.
-             *
-             * @param {number|Accessor<number>|Y|Accessor<Y>} y2
-             * @returns {Plots.Rectangle} The calling Rectangle Plot.
-             */
-            y2(y2: number | Accessor<number> | Y | Accessor<Y>): Plots.Rectangle<X, Y>;
-            protected _propertyProjectors(): AttributeToProjector;
-            protected _pixelPoint(datum: any, index: number, dataset: Dataset): {
-                x: any;
-                y: any;
-            };
-            protected _getDataToDraw(): Utils.Map<Dataset, any[]>;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Plots {
-        class Scatter<X, Y> extends XYPlot<X, Y> {
-            /**
-             * A Scatter Plot draws a symbol at each data point.
-             *
-             * @constructor
-             */
-            constructor();
-            protected _createDrawer(dataset: Dataset): Drawers.Symbol;
-            /**
-             * Gets the AccessorScaleBinding for the size property of the plot.
-             * The size property corresponds to the area of the symbol.
-             */
-            size<S>(): AccessorScaleBinding<S, number>;
-            /**
-             * Sets the size property to a constant number or the result of an Accessor<number>.
-             *
-             * @param {number|Accessor<number>} size
-             * @returns {Plots.Scatter} The calling Scatter Plot.
-             */
-            size(size: number | Accessor<number>): Plots.Scatter<X, Y>;
-            /**
-             * Sets the size property to a scaled constant value or scaled result of an Accessor.
-             * The provided Scale will account for the values when autoDomain()-ing.
-             *
-             * @param {S|Accessor<S>} sectorValue
-             * @param {Scale<S, number>} scale
-             * @returns {Plots.Scatter} The calling Scatter Plot.
-             */
-            size<S>(size: S | Accessor<S>, scale: Scale<S, number>): Plots.Scatter<X, Y>;
-            /**
-             * Gets the AccessorScaleBinding for the symbol property of the plot.
-             * The symbol property corresponds to how the symbol will be drawn.
-             */
-            symbol(): AccessorScaleBinding<any, any>;
-            /**
-             * Sets the symbol property to an Accessor<SymbolFactory>.
-             *
-             * @param {Accessor<SymbolFactory>} symbol
-             * @returns {Plots.Scatter} The calling Scatter Plot.
-             */
-            symbol(symbol: Accessor<SymbolFactory>): Plots.Scatter<X, Y>;
-            protected _generateDrawSteps(): Drawers.DrawStep[];
-            protected _visibleOnPlot(datum: any, pixelPoint: Point, selection: d3.Selection<void>): boolean;
-            protected _entityVisibleOnPlot(pixelPoint: Point, datum: any, index: number, dataset: Dataset): boolean;
-            protected _propertyProjectors(): AttributeToProjector;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Plots {
-        class Bar<X, Y> extends XYPlot<X, Y> {
-            static ORIENTATION_VERTICAL: string;
-            static ORIENTATION_HORIZONTAL: string;
-            protected _isVertical: boolean;
-            /**
-             * A Bar Plot draws bars growing out from a baseline to some value
-             *
-             * @constructor
-             * @param {string} [orientation="vertical"] One of "vertical"/"horizontal".
-             */
-            constructor(orientation?: string);
-            x(): Plots.AccessorScaleBinding<X, number>;
-            x(x: number | Accessor<number>): Bar<X, Y>;
-            x(x: X | Accessor<X>, xScale: Scale<X, number>): Bar<X, Y>;
-            y(): Plots.AccessorScaleBinding<Y, number>;
-            y(y: number | Accessor<number>): Bar<X, Y>;
-            y(y: Y | Accessor<Y>, yScale: Scale<Y, number>): Bar<X, Y>;
-            /**
-             * Gets the orientation of the plot
-             *
-             * @return "vertical" | "horizontal"
-             */
-            orientation(): string;
-            render(): Bar<X, Y>;
-            protected _createDrawer(dataset: Dataset): Drawers.Rectangle;
-            protected _setup(): void;
-            /**
-             * Gets the baseline value.
-             * The baseline is the line that the bars are drawn from.
-             *
-             * @returns {X|Y}
-             */
-            baselineValue(): X | Y;
-            /**
-             * Sets the baseline value.
-             * The baseline is the line that the bars are drawn from.
-             *
-             * @param {X|Y} value
-             * @returns {Bar} The calling Bar Plot.
-             */
-            baselineValue(value: X | Y): Bar<X, Y>;
-            addDataset(dataset: Dataset): Bar<X, Y>;
-            removeDataset(dataset: Dataset): Bar<X, Y>;
-            /**
-             * Get whether bar labels are enabled.
-             *
-             * @returns {boolean} Whether bars should display labels or not.
-             */
-            labelsEnabled(): boolean;
-            /**
-             * Sets whether labels are enabled.
-             *
-             * @param {boolean} labelsEnabled
-             * @returns {Bar} The calling Bar Plot.
-             */
-            labelsEnabled(enabled: boolean): Bar<X, Y>;
-            /**
-             * Gets the Formatter for the labels.
-             */
-            labelFormatter(): Formatter;
-            /**
-             * Sets the Formatter for the labels.
-             *
-             * @param {Formatter} formatter
-             * @returns {Bar} The calling Bar Plot.
-             */
-            labelFormatter(formatter: Formatter): Bar<X, Y>;
-            protected _createNodesForDataset(dataset: Dataset): Drawer;
-            protected _removeDatasetNodes(dataset: Dataset): void;
-            /**
-             * Returns the PlotEntity nearest to the query point according to the following algorithm:
-             *   - If the query point is inside a bar, returns the PlotEntity for that bar.
-             *   - Otherwise, gets the nearest PlotEntity by the primary direction (X for vertical, Y for horizontal),
-             *     breaking ties with the secondary direction.
-             * Returns undefined if no PlotEntity can be found.
-             *
-             * @param {Point} queryPoint
-             * @returns {PlotEntity} The nearest PlotEntity, or undefined if no PlotEntity can be found.
-             */
-            entityNearest(queryPoint: Point): PlotEntity;
-            protected _visibleOnPlot(datum: any, pixelPoint: Point, selection: d3.Selection<void>): boolean;
-            protected _entityVisibleOnPlot(pixelPoint: Point, datum: any, index: number, dataset: Dataset): boolean;
-            /**
-             * Gets the Entities at a particular Point.
-             *
-             * @param {Point} p
-             * @returns {PlotEntity[]}
-             */
-            entitiesAt(p: Point): PlotEntity[];
-            /**
-             * Gets the Entities that intersect the Bounds.
-             *
-             * @param {Bounds} bounds
-             * @returns {PlotEntity[]}
-             */
-            entitiesIn(bounds: Bounds): PlotEntity[];
-            /**
-             * Gets the Entities that intersect the area defined by the ranges.
-             *
-             * @param {Range} xRange
-             * @param {Range} yRange
-             * @returns {PlotEntity[]}
-             */
-            entitiesIn(xRange: Range, yRange: Range): PlotEntity[];
-            protected _additionalPaint(time: number): void;
-            protected _generateDrawSteps(): Drawers.DrawStep[];
-            protected _generateAttrToProjector(): {
-                [attr: string]: (datum: any, index: number, dataset: Dataset) => any;
-            };
-            /**
-             * Computes the barPixelWidth of all the bars in the plot.
-             *
-             * If the position scale of the plot is a CategoryScale and in bands mode, then the rangeBands function will be used.
-             * If the position scale of the plot is a CategoryScale and in points mode, then
-             *   from https://github.com/mbostock/d3/wiki/Ordinal-Scales#ordinal_rangePoints, the max barPixelWidth is step * padding
-             * If the position scale of the plot is a QuantitativeScale, then _getMinimumDataWidth is scaled to compute the barPixelWidth
-             */
-            protected _getBarPixelWidth(): number;
-            entities(datasets?: Dataset[]): PlotEntity[];
-            protected _pixelPoint(datum: any, index: number, dataset: Dataset): {
-                x: any;
-                y: any;
-            };
-            protected _uninstallScaleForKey(scale: Scale<any, number>, key: string): void;
-            protected _getDataToDraw(): Utils.Map<Dataset, any[]>;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Plots {
-        class Line<X> extends XYPlot<X, number> {
-            /**
-             * A Line Plot draws line segments starting from the first data point to the next.
-             *
-             * @constructor
-             */
-            constructor();
-            protected _createDrawer(dataset: Dataset): Drawer;
-            protected _getResetYFunction(): (d: any, i: number, dataset: Dataset) => number;
-            protected _generateDrawSteps(): Drawers.DrawStep[];
-            protected _generateAttrToProjector(): {
-                [attr: string]: (datum: any, index: number, dataset: Dataset) => any;
-            };
-            /**
-             * Returns the PlotEntity nearest to the query point by X then by Y, or undefined if no PlotEntity can be found.
-             *
-             * @param {Point} queryPoint
-             * @returns {PlotEntity} The nearest PlotEntity, or undefined if no PlotEntity can be found.
-             */
-            entityNearest(queryPoint: Point): PlotEntity;
-            protected _propertyProjectors(): AttributeToProjector;
-            protected _constructLineProjector(xProjector: Projector, yProjector: Projector): (datum: any, index: number, dataset: Dataset) => string;
-            protected _getDataToDraw(): Utils.Map<Dataset, any[]>;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Plots {
-        class Area<X> extends Line<X> {
-            /**
-             * An Area Plot draws a filled region (area) between Y and Y0.
-             *
-             * @constructor
-             */
-            constructor();
-            protected _setup(): void;
-            y(): Plots.AccessorScaleBinding<number, number>;
-            y(y: number | Accessor<number>): Area<X>;
-            y(y: number | Accessor<number>, yScale: QuantitativeScale<number>): Area<X>;
-            /**
-             * Gets the AccessorScaleBinding for Y0.
-             */
-            y0(): Plots.AccessorScaleBinding<number, number>;
-            /**
-             * Sets Y0 to a constant number or the result of an Accessor<number>.
-             * If a Scale has been set for Y, it will also be used to scale Y0.
-             *
-             * @param {number|Accessor<number>} y0
-             * @returns {Area} The calling Area Plot.
-             */
-            y0(y0: number | Accessor<number>): Area<X>;
-            protected _onDatasetUpdate(): void;
-            addDataset(dataset: Dataset): Area<X>;
-            protected _removeDatasetNodes(dataset: Dataset): void;
-            protected _additionalPaint(): void;
-            protected _createDrawer(dataset: Dataset): Drawers.Area;
-            protected _generateDrawSteps(): Drawers.DrawStep[];
-            protected _updateYScale(): void;
-            protected _getResetYFunction(): Accessor<any>;
-            protected _propertyProjectors(): AttributeToProjector;
-            selections(datasets?: Dataset[]): d3.Selection<any>;
-            protected _constructAreaProjector(xProjector: Projector, yProjector: Projector, y0Projector: Projector): (datum: any[], index: number, dataset: Dataset) => string;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Plots {
-        class ClusteredBar<X, Y> extends Bar<X, Y> {
-            /**
-             * A ClusteredBar Plot groups bars across Datasets based on the primary value of the bars.
-             *   On a vertical ClusteredBar Plot, the bars with the same X value are grouped.
-             *   On a horizontal ClusteredBar Plot, the bars with the same Y value are grouped.
-             *
-             * @constructor
-             * @param {string} [orientation="vertical"] One of "vertical"/"horizontal".
-             */
-            constructor(orientation?: string);
-            protected _generateAttrToProjector(): {
-                [attr: string]: (datum: any, index: number, dataset: Dataset) => any;
-            };
-            protected _getDataToDraw(): Utils.Map<Dataset, any[]>;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Plots {
-        class StackedArea<X> extends Area<X> {
-            /**
-             * @constructor
-             */
-            constructor();
-            protected _getAnimator(key: string): Animator;
-            protected _setup(): void;
-            x(): Plots.AccessorScaleBinding<X, number>;
-            x(x: number | Accessor<number>): StackedArea<X>;
-            x(x: X | Accessor<X>, xScale: Scale<X, number>): StackedArea<X>;
-            y(): Plots.AccessorScaleBinding<number, number>;
-            y(y: number | Accessor<number>): StackedArea<X>;
-            y(y: number | Accessor<number>, yScale: QuantitativeScale<number>): StackedArea<X>;
-            protected _additionalPaint(): void;
-            protected _updateYScale(): void;
-            protected _onDatasetUpdate(): StackedArea<X>;
-            protected _updateExtentsForProperty(property: string): void;
-            protected _extentsForProperty(attr: string): any[];
-            protected _propertyProjectors(): AttributeToProjector;
-            protected _pixelPoint(datum: any, index: number, dataset: Dataset): Point;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Plots {
-        class StackedBar<X, Y> extends Bar<X, Y> {
-            /**
-             * A StackedBar Plot stacks bars across Datasets based on the primary value of the bars.
-             *   On a vertical StackedBar Plot, the bars with the same X value are stacked.
-             *   On a horizontal StackedBar Plot, the bars with the same Y value are stacked.
-             *
-             * @constructor
-             * @param {Scale} xScale
-             * @param {Scale} yScale
-             * @param {string} [orientation="vertical"] One of "vertical"/"horizontal".
-             */
-            constructor(orientation?: string);
-            x(): Plots.AccessorScaleBinding<X, number>;
-            x(x: number | Accessor<number>): StackedBar<X, Y>;
-            x(x: X | Accessor<X>, xScale: Scale<X, number>): StackedBar<X, Y>;
-            y(): Plots.AccessorScaleBinding<Y, number>;
-            y(y: number | Accessor<number>): StackedBar<X, Y>;
-            y(y: Y | Accessor<Y>, yScale: Scale<Y, number>): StackedBar<X, Y>;
-            protected _generateAttrToProjector(): {
-                [attr: string]: (datum: any, index: number, dataset: Dataset) => any;
-            };
-            protected _onDatasetUpdate(): StackedBar<X, Y>;
-            protected _updateExtentsForProperty(property: string): void;
-            protected _extentsForProperty(attr: string): any[];
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Plots {
-        class Segment<X, Y> extends XYPlot<X, Y> {
-            /**
-             * A Segment Plot displays line segments based on the data.
-             *
-             * @constructor
-             */
-            constructor();
-            protected _createDrawer(dataset: Dataset): Drawers.Segment;
-            protected _generateDrawSteps(): Drawers.DrawStep[];
-            protected _updateExtentsForProperty(property: string): void;
-            protected _filterForProperty(property: string): (datum: any, index: number, dataset: Dataset) => boolean;
-            /**
-             * Gets the AccessorScaleBinding for X
-             */
-            x(): AccessorScaleBinding<X, number>;
-            /**
-             * Sets X to a constant value or the result of an Accessor.
-             *
-             * @param {X|Accessor<X>} x
-             * @returns {Plots.Segment} The calling Segment Plot.
-             */
-            x(x: number | Accessor<number>): Plots.Segment<X, Y>;
-            /**
-             * Sets X to a scaled constant value or scaled result of an Accessor.
-             * The provided Scale will account for the values when autoDomain()-ing.
-             *
-             * @param {X|Accessor<X>} x
-             * @param {Scale<X, number>} xScale
-             * @returns {Plots.Segment} The calling Segment Plot.
-             */
-            x(x: X | Accessor<X>, xScale: Scale<X, number>): Plots.Segment<X, Y>;
-            /**
-             * Gets the AccessorScaleBinding for X2
-             */
-            x2(): AccessorScaleBinding<X, number>;
-            /**
-             * Sets X2 to a constant number or the result of an Accessor.
-             * If a Scale has been set for X, it will also be used to scale X2.
-             *
-             * @param {number|Accessor<number>|Y|Accessor<Y>} y2
-             * @returns {Plots.Segment} The calling Segment Plot
-             */
-            x2(x2: number | Accessor<number> | X | Accessor<X>): Plots.Segment<X, Y>;
-            /**
-             * Gets the AccessorScaleBinding for Y
-             */
-            y(): AccessorScaleBinding<Y, number>;
-            /**
-             * Sets Y to a constant value or the result of an Accessor.
-             *
-             * @param {Y|Accessor<Y>} y
-             * @returns {Plots.Segment} The calling Segment Plot.
-             */
-            y(y: number | Accessor<number>): Plots.Segment<X, Y>;
-            /**
-             * Sets Y to a scaled constant value or scaled result of an Accessor.
-             * The provided Scale will account for the values when autoDomain()-ing.
-             *
-             * @param {Y|Accessor<Y>} y
-             * @param {Scale<Y, number>} yScale
-             * @returns {Plots.Segment} The calling Segment Plot.
-             */
-            y(y: Y | Accessor<Y>, yScale: Scale<Y, number>): Plots.Segment<X, Y>;
-            /**
-             * Gets the AccessorScaleBinding for Y2.
-             */
-            y2(): AccessorScaleBinding<Y, number>;
-            /**
-             * Sets Y2 to a constant number or the result of an Accessor.
-             * If a Scale has been set for Y, it will also be used to scale Y2.
-             *
-             * @param {number|Accessor<number>|Y|Accessor<Y>} y2
-             * @returns {Plots.Segment} The calling Segment Plot.
-             */
-            y2(y2: number | Accessor<number> | Y | Accessor<Y>): Plots.Segment<X, Y>;
-            protected _propertyProjectors(): AttributeToProjector;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Plots {
-        class Waterfall<X, Y> extends Bar<X, number> {
-            constructor();
-            /**
-             * Gets whether connectors are enabled.
-             *
-             * @returns {boolean} Whether connectors should be shown or not.
-             */
-            connectorsEnabled(): boolean;
-            /**
-             * Sets whether connectors are enabled.
-             *
-             * @param {boolean} enabled
-             * @returns {Plots.Waterfall} The calling Waterfall Plot.
-             */
-            connectorsEnabled(enabled: boolean): Waterfall<X, Y>;
-            /**
-             * Gets the AccessorScaleBinding for whether a bar represents a total or a delta.
-             */
-            total<T>(): Plots.AccessorScaleBinding<T, boolean>;
-            /**
-             * Sets total to a constant number or the result of an Accessor
-             *
-             * @param {Accessor<boolean>}
-             * @returns {Plots.Waterfall} The calling Waterfall Plot.
-             */
-            total(total: Accessor<boolean>): Waterfall<X, Y>;
-            protected _additionalPaint(time: number): void;
-            protected _createNodesForDataset(dataset: Dataset): Drawer;
-            protected _extentsForProperty(attr: string): any[];
-            protected _generateAttrToProjector(): {
-                [attr: string]: (datum: any, index: number, dataset: Dataset) => any;
-            };
-            protected _onDatasetUpdate(): Waterfall<X, Y>;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    interface Animator {
-        /**
-         * Applies the supplied attributes to a d3.Selection with some animation.
-         *
-         * @param {d3.Selection} selection The update selection or transition selection that we wish to animate.
-         * @param {AttributeToAppliedProjector} attrToAppliedProjector The set of
-         *     AppliedProjectors that we will use to set attributes on the selection.
-         * @return {any} Animators should return the selection or
-         *     transition object so that plots may chain the transitions between
-         *     animators.
-         */
-        animate(selection: d3.Selection<any>, attrToAppliedProjector: AttributeToAppliedProjector): d3.Selection<any> | d3.Transition<any>;
-        /**
-         * Given the number of elements, return the total time the animation requires
-         *
-         * @param {number} numberofIterations The number of elements that will be drawn
-         * @returns {number}
-         */
-        totalTime(numberOfIterations: number): number;
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Animators {
-        /**
-         * An animator implementation with no animation. The attributes are
-         * immediately set on the selection.
-         */
-        class Null implements Animator {
-            totalTime(selection: any): number;
-            animate(selection: d3.Selection<any>, attrToAppliedProjector: AttributeToAppliedProjector): d3.Selection<any>;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Animators {
-        /**
-         * An Animator with easing and configurable durations and delays.
-         */
-        class Easing implements Animator {
-            /**
-             * Constructs the default animator
-             *
-             * @constructor
-             */
-            constructor();
-            totalTime(numberOfSteps: number): number;
-            animate(selection: d3.Selection<any>, attrToAppliedProjector: AttributeToAppliedProjector): d3.Transition<any>;
-            /**
-             * Gets the start delay of the animation in milliseconds.
-             *
-             * @returns {number} The current start delay.
-             */
-            startDelay(): number;
-            /**
-             * Sets the start delay of the animation in milliseconds.
-             *
-             * @param {number} startDelay The start delay in milliseconds.
-             * @returns {Easing} The calling Easing Animator.
-             */
-            startDelay(startDelay: number): Easing;
-            /**
-             * Gets the duration of one animation step in milliseconds.
-             *
-             * @returns {number} The current duration.
-             */
-            stepDuration(): number;
-            /**
-             * Sets the duration of one animation step in milliseconds.
-             *
-             * @param {number} stepDuration The duration in milliseconds.
-             * @returns {Easing} The calling Easing Animator.
-             */
-            stepDuration(stepDuration: number): Easing;
-            /**
-             * Gets the maximum start delay between animation steps in milliseconds.
-             *
-             * @returns {number} The current maximum iterative delay.
-             */
-            stepDelay(): number;
-            /**
-             * Sets the maximum start delay between animation steps in milliseconds.
-             *
-             * @param {number} stepDelay The maximum iterative delay in milliseconds.
-             * @returns {Easing} The calling Easing Animator.
-             */
-            stepDelay(stepDelay: number): Easing;
-            /**
-             * Gets the maximum total animation duration constraint in milliseconds.
-             *
-             * If the animation time would exceed the specified time, the duration of each step
-             * and the delay between each step will be reduced until the animation fits within
-             * the specified time.
-             *
-             * @returns {number} The current maximum total animation duration.
-             */
-            maxTotalDuration(): number;
-            /**
-             * Sets the maximum total animation duration constraint in miliseconds.
-             *
-             * If the animation time would exceed the specified time, the duration of each step
-             * and the delay between each step will be reduced until the animation fits within
-             * the specified time.
-             *
-             * @param {number} maxTotalDuration The maximum total animation duration in milliseconds.
-             * @returns {Easing} The calling Easing Animator.
-             */
-            maxTotalDuration(maxTotalDuration: number): Easing;
-            /**
-             * Gets the current easing mode of the animation.
-             *
-             * @returns {string} the current easing mode.
-             */
-            easingMode(): string;
-            /**
-             * Sets the easing mode of the animation.
-             *
-             * @param {string} easingMode The desired easing mode.
-             * @returns {Easing} The calling Easing Animator.
-             */
-            easingMode(easingMode: string): Easing;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    class Dispatcher {
-        protected _eventToCallback: {
-            [eventName: string]: (e: Event) => any;
-        };
-        protected _callbacks: Utils.CallbackSet<Function>[];
-        protected _setCallback(callbackSet: Utils.CallbackSet<Function>, callback: Function): void;
-        protected _unsetCallback(callbackSet: Utils.CallbackSet<Function>, callback: Function): void;
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Dispatchers {
-        type MouseCallback = (p: Point, event: MouseEvent) => void;
-        class Mouse extends Dispatcher {
-            /**
-             * Get a Mouse Dispatcher for the <svg> containing elem.
-             * If one already exists on that <svg>, it will be returned; otherwise, a new one will be created.
-             *
-             * @param {SVGElement} elem
-             * @return {Dispatchers.Mouse}
-             */
-            static getDispatcher(elem: SVGElement): Dispatchers.Mouse;
-            /**
-             * This constructor not be invoked directly.
-             *
-             * @constructor
-             * @param {SVGElement} svg The root <svg> to attach to.
-             */
-            constructor(svg: SVGElement);
-            /**
-             * Registers a callback to be called when the mouse position changes.
-             *
-             * @param {MouseCallback} callback
-             * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
-             */
-            onMouseMove(callback: MouseCallback): Dispatchers.Mouse;
-            /**
-             * Removes a callback that would be called when the mouse position changes.
-             *
-             * @param {MouseCallback} callback
-             * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
-             */
-            offMouseMove(callback: MouseCallback): Dispatchers.Mouse;
-            /**
-             * Registers a callback to be called when a mousedown occurs.
-             *
-             * @param {MouseCallback} callback
-             * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
-             */
-            onMouseDown(callback: MouseCallback): Dispatchers.Mouse;
-            /**
-             * Removes a callback that would be called when a mousedown occurs.
-             *
-             * @param {MouseCallback} callback
-             * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
-             */
-            offMouseDown(callback: MouseCallback): Dispatchers.Mouse;
-            /**
-             * Registers a callback to be called when a mouseup occurs.
-             *
-             * @param {MouseCallback} callback
-             * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
-             */
-            onMouseUp(callback: MouseCallback): Dispatchers.Mouse;
-            /**
-             * Removes a callback that would be called when a mouseup occurs.
-             *
-             * @param {MouseCallback} callback
-             * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
-             */
-            offMouseUp(callback: MouseCallback): Dispatchers.Mouse;
-            /**
-             * Registers a callback to be called when a wheel event occurs.
-             *
-             * @param {MouseCallback} callback
-             * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
-             */
-            onWheel(callback: MouseCallback): Dispatchers.Mouse;
-            /**
-             * Removes a callback that would be called when a wheel event occurs.
-             *
-             * @param {MouseCallback} callback
-             * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
-             */
-            offWheel(callback: MouseCallback): Dispatchers.Mouse;
-            /**
-             * Registers a callback to be called when a dblClick occurs.
-             *
-             * @param {MouseCallback} callback
-             * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
-             */
-            onDblClick(callback: MouseCallback): Dispatchers.Mouse;
-            /**
-             * Removes a callback that would be called when a dblClick occurs.
-             *
-             * @param {MouseCallback} callback
-             * @return {Dispatchers.Mouse} The calling Mouse Dispatcher.
-             */
-            offDblClick(callback: MouseCallback): Dispatchers.Mouse;
-            /**
-             * Returns the last computed mouse position in <svg> coordinate space.
-             *
-             * @return {Point}
-             */
-            lastMousePosition(): Point;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Dispatchers {
-        type TouchCallback = (ids: number[], idToPoint: {
-            [id: number]: Point;
-        }, event: TouchEvent) => void;
-        class Touch extends Dispatcher {
-            /**
-             * Gets a Touch Dispatcher for the <svg> containing elem.
-             * If one already exists on that <svg>, it will be returned; otherwise, a new one will be created.
-             *
-             * @param {SVGElement} elem
-             * @return {Dispatchers.Touch}
-             */
-            static getDispatcher(elem: SVGElement): Dispatchers.Touch;
-            /**
-             * This constructor should not be invoked directly.
-             *
-             * @constructor
-             * @param {SVGElement} svg The root <svg> to attach to.
-             */
-            constructor(svg: SVGElement);
-            /**
-             * Registers a callback to be called when a touch starts.
-             *
-             * @param {TouchCallback} callback
-             * @return {Dispatchers.Touch} The calling Touch Dispatcher.
-             */
-            onTouchStart(callback: TouchCallback): Dispatchers.Touch;
-            /**
-             * Removes a callback that would be called when a touch starts.
-             *
-             * @param {TouchCallback} callback
-             * @return {Dispatchers.Touch} The calling Touch Dispatcher.
-             */
-            offTouchStart(callback: TouchCallback): Dispatchers.Touch;
-            /**
-             * Registers a callback to be called when the touch position changes.
-             *
-             * @param {TouchCallback} callback
-             * @return {Dispatchers.Touch} The calling Touch Dispatcher.
-             */
-            onTouchMove(callback: TouchCallback): Dispatchers.Touch;
-            /**
-             * Removes a callback that would be called when the touch position changes.
-             *
-             * @param {TouchCallback} callback
-             * @return {Dispatchers.Touch} The calling Touch Dispatcher.
-             */
-            offTouchMove(callback: TouchCallback): Dispatchers.Touch;
-            /**
-             * Registers a callback to be called when a touch ends.
-             *
-             * @param {TouchCallback} callback
-             * @return {Dispatchers.Touch} The calling Touch Dispatcher.
-             */
-            onTouchEnd(callback: TouchCallback): Dispatchers.Touch;
-            /**
-             * Removes a callback that would be called when a touch ends.
-             *
-             * @param {TouchCallback} callback
-             * @return {Dispatchers.Touch} The calling Touch Dispatcher.
-             */
-            offTouchEnd(callback: TouchCallback): Dispatchers.Touch;
-            /**
-             * Registers a callback to be called when a touch is cancelled.
-             *
-             * @param {TouchCallback} callback
-             * @return {Dispatchers.Touch} The calling Touch Dispatcher.
-             */
-            onTouchCancel(callback: TouchCallback): Dispatchers.Touch;
-            /**
-             * Removes a callback that would be called when a touch is cancelled.
-             *
-             * @param {TouchCallback} callback
-             * @return {Dispatchers.Touch} The calling Touch Dispatcher.
-             */
-            offTouchCancel(callback: TouchCallback): Dispatchers.Touch;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Dispatchers {
-        type KeyCallback = (keyCode: number, event: KeyboardEvent) => void;
-        class Key extends Dispatcher {
-            /**
-             * Gets a Key Dispatcher. If one already exists it will be returned;
-             * otherwise, a new one will be created.
-             *
-             * @return {Dispatchers.Key}
-             */
-            static getDispatcher(): Dispatchers.Key;
-            /**
-             * This constructor should not be invoked directly.
-             *
-             * @constructor
-             */
-            constructor();
-            /**
-             * Registers a callback to be called whenever a key is pressed.
-             *
-             * @param {KeyCallback} callback
-             * @return {Dispatchers.Key} The calling Key Dispatcher.
-             */
-            onKeyDown(callback: KeyCallback): Key;
-            /**
-             * Removes the callback to be called whenever a key is pressed.
-             *
-             * @param {KeyCallback} callback
-             * @return {Dispatchers.Key} The calling Key Dispatcher.
-             */
-            offKeyDown(callback: KeyCallback): Key;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    class Interaction {
-        protected _componentAttachedTo: Component;
-        protected _anchor(component: Component): void;
-        protected _unanchor(): void;
-        /**
-         * Attaches this Interaction to a Component.
-         * If the Interaction was already attached to a Component, it first detaches itself from the old Component.
-         *
-         * @param {Component} component
-         * @returns {Interaction} The calling Interaction.
-         */
-        attachTo(component: Component): Interaction;
-        /**
-         * Detaches this Interaction from the Component.
-         * This Interaction can be reused.
-         *
-         * @param {Component} component
-         * @returns {Interaction} The calling Interaction.
-         */
-        detachFrom(component: Component): Interaction;
-        /**
-         * Gets whether this Interaction is enabled.
-         */
-        enabled(): boolean;
-        /**
-         * Enables or disables this Interaction.
-         *
-         * @param {boolean} enabled Whether the Interaction should be enabled.
-         * @return {Interaction} The calling Interaction.
-         */
-        enabled(enabled: boolean): Interaction;
-        /**
-         * Translates an <svg>-coordinate-space point to Component-space coordinates.
-         *
-         * @param {Point} p A Point in <svg>-space coordinates.
-         * @return {Point} The same location in Component-space coordinates.
-         */
-        protected _translateToComponentSpace(p: Point): Point;
-        /**
-         * Checks whether a Component-coordinate-space Point is inside the Component.
-         *
-         * @param {Point} p A Point in Compoennt-space coordinates.
-         * @return {boolean} Whether or not the point is inside the Component.
-         */
-        protected _isInsideComponent(p: Point): boolean;
-    }
-}
-
-
-declare namespace Plottable {
-    type ClickCallback = (point: Point) => void;
-    namespace Interactions {
-        class Click extends Interaction {
-            protected _anchor(component: Component): void;
-            protected _unanchor(): void;
-            /**
-             * Adds a callback to be called when the Component is clicked.
-             *
-             * @param {ClickCallback} callback
-             * @return {Interactions.Click} The calling Click Interaction.
-             */
-            onClick(callback: ClickCallback): Click;
-            /**
-             * Removes a callback that would be called when the Component is clicked.
-             *
-             * @param {ClickCallback} callback
-             * @return {Interactions.Click} The calling Click Interaction.
-             */
-            offClick(callback: ClickCallback): Click;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Interactions {
-        class DoubleClick extends Interaction {
-            protected _anchor(component: Component): void;
-            protected _unanchor(): void;
-            /**
-             * Adds a callback to be called when the Component is double-clicked.
-             *
-             * @param {ClickCallback} callback
-             * @return {Interactions.DoubleClick} The calling DoubleClick Interaction.
-             */
-            onDoubleClick(callback: ClickCallback): DoubleClick;
-            /**
-             * Removes a callback that would be called when the Component is double-clicked.
-             *
-             * @param {ClickCallback} callback
-             * @return {Interactions.DoubleClick} The calling DoubleClick Interaction.
-             */
-            offDoubleClick(callback: ClickCallback): DoubleClick;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    type KeyCallback = (keyCode: number) => void;
-    namespace Interactions {
-        class Key extends Interaction {
-            protected _anchor(component: Component): void;
-            protected _unanchor(): void;
-            /**
-             * Adds a callback to be called when the key with the given keyCode is
-             * pressed and the user is moused over the Component.
-             *
-             * @param {number} keyCode
-             * @param {KeyCallback} callback
-             * @returns {Interactions.Key} The calling Key Interaction.
-             */
-            onKeyPress(keyCode: number, callback: KeyCallback): Key;
-            /**
-             * Removes a callback that would be called when the key with the given keyCode is
-             * pressed and the user is moused over the Component.
-             *
-             * @param {number} keyCode
-             * @param {KeyCallback} callback
-             * @returns {Interactions.Key} The calling Key Interaction.
-             */
-            offKeyPress(keyCode: number, callback: KeyCallback): Key;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    type PointerCallback = (point: Point) => void;
-    namespace Interactions {
-        class Pointer extends Interaction {
-            protected _anchor(component: Component): void;
-            protected _unanchor(): void;
-            /**
-             * Adds a callback to be called when the pointer enters the Component.
-             *
-             * @param {PointerCallback} callback
-             * @return {Interactions.Pointer} The calling Pointer Interaction.
-             */
-            onPointerEnter(callback: PointerCallback): Pointer;
-            /**
-             * Removes a callback that would be called when the pointer enters the Component.
-             *
-             * @param {PointerCallback} callback
-             * @return {Interactions.Pointer} The calling Pointer Interaction.
-             */
-            offPointerEnter(callback: PointerCallback): Pointer;
-            /**
-             * Adds a callback to be called when the pointer moves within the Component.
-             *
-             * @param {PointerCallback} callback
-             * @return {Interactions.Pointer} The calling Pointer Interaction.
-             */
-            onPointerMove(callback: PointerCallback): Pointer;
-            /**
-             * Removes a callback that would be called when the pointer moves within the Component.
-             *
-             * @param {PointerCallback} callback
-             * @return {Interactions.Pointer} The calling Pointer Interaction.
-             */
-            offPointerMove(callback: PointerCallback): Pointer;
-            /**
-             * Adds a callback to be called when the pointer exits the Component.
-             *
-             * @param {PointerCallback} callback
-             * @return {Interactions.Pointer} The calling Pointer Interaction.
-             */
-            onPointerExit(callback: PointerCallback): Pointer;
-            /**
-             * Removes a callback that would be called when the pointer exits the Component.
-             *
-             * @param {PointerCallback} callback
-             * @return {Interactions.Pointer} The calling Pointer Interaction.
-             */
-            offPointerExit(callback: PointerCallback): Pointer;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Interactions {
-        class PanZoom extends Interaction {
-            /**
-             * A PanZoom Interaction updates the domains of an x-scale and/or a y-scale
-             * in response to the user panning or zooming.
-             *
-             * @constructor
-             * @param {QuantitativeScale} [xScale] The x-scale to update on panning/zooming.
-             * @param {QuantitativeScale} [yScale] The y-scale to update on panning/zooming.
-             */
-            constructor(xScale?: QuantitativeScale<any>, yScale?: QuantitativeScale<any>);
-            protected _anchor(component: Component): void;
-            protected _unanchor(): void;
-            /**
-             * Gets the x scales for this PanZoom Interaction.
-             */
-            xScales(): QuantitativeScale<any>[];
-            /**
-             * Sets the x scales for this PanZoom Interaction.
-             *
-             * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
-             */
-            xScales(xScales: QuantitativeScale<any>[]): Interactions.PanZoom;
-            /**
-             * Gets the y scales for this PanZoom Interaction.
-             */
-            yScales(): QuantitativeScale<any>[];
-            /**
-             * Sets the y scales for this PanZoom Interaction.
-             *
-             * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
-             */
-            yScales(yScales: QuantitativeScale<any>[]): Interactions.PanZoom;
-            /**
-             * Adds an x scale to this PanZoom Interaction
-             *
-             * @param {QuantitativeScale<any>} An x scale to add
-             * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
-             */
-            addXScale(xScale: QuantitativeScale<any>): PanZoom;
-            /**
-             * Removes an x scale from this PanZoom Interaction
-             *
-             * @param {QuantitativeScale<any>} An x scale to remove
-             * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
-             */
-            removeXScale(xScale: QuantitativeScale<any>): PanZoom;
-            /**
-             * Adds a y scale to this PanZoom Interaction
-             *
-             * @param {QuantitativeScale<any>} A y scale to add
-             * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
-             */
-            addYScale(yScale: QuantitativeScale<any>): PanZoom;
-            /**
-             * Removes a y scale from this PanZoom Interaction
-             *
-             * @param {QuantitativeScale<any>} A y scale to remove
-             * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
-             */
-            removeYScale(yScale: QuantitativeScale<any>): PanZoom;
-            /**
-             * Gets the minimum domain extent for the scale, specifying the minimum allowable amount
-             * between the ends of the domain.
-             *
-             * Note that extents will mainly work on scales that work linearly like Linear Scale and Time Scale
-             *
-             * @param {QuantitativeScale<any>} quantitativeScale The scale to query
-             * @returns {D} The minimum domain extent for the scale.
-             */
-            minDomainExtent<D>(quantitativeScale: QuantitativeScale<D>): D;
-            /**
-             * Sets the minimum domain extent for the scale, specifying the minimum allowable amount
-             * between the ends of the domain.
-             *
-             * Note that extents will mainly work on scales that work linearly like Linear Scale and Time Scale
-             *
-             * @param {QuantitativeScale<any>} quantitativeScale The scale to query
-             * @param {D} minDomainExtent The minimum domain extent for the scale.
-             * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
-             */
-            minDomainExtent<D>(quantitativeScale: QuantitativeScale<D>, minDomainExtent: D): Interactions.PanZoom;
-            /**
-             * Gets the maximum domain extent for the scale, specifying the maximum allowable amount
-             * between the ends of the domain.
-             *
-             * Note that extents will mainly work on scales that work linearly like Linear Scale and Time Scale
-             *
-             * @param {QuantitativeScale<any>} quantitativeScale The scale to query
-             * @returns {D} The maximum domain extent for the scale.
-             */
-            maxDomainExtent<D>(quantitativeScale: QuantitativeScale<D>): D;
-            /**
-             * Sets the maximum domain extent for the scale, specifying the maximum allowable amount
-             * between the ends of the domain.
-             *
-             * Note that extents will mainly work on scales that work linearly like Linear Scale and Time Scale
-             *
-             * @param {QuantitativeScale<any>} quantitativeScale The scale to query
-             * @param {D} minDomainExtent The maximum domain extent for the scale.
-             * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
-             */
-            maxDomainExtent<D>(quantitativeScale: QuantitativeScale<D>, maxDomainExtent: D): Interactions.PanZoom;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    type DragCallback = (start: Point, end: Point) => void;
-    namespace Interactions {
-        class Drag extends Interaction {
-            protected _anchor(component: Component): void;
-            protected _unanchor(): void;
-            /**
-             * Gets whether the Drag Interaction constrains Points passed to its
-             * callbacks to lie inside its Component.
-             *
-             * If true, when the user drags outside of the Component, the closest Point
-             * inside the Component will be passed to the callback instead of the actual
-             * cursor position.
-             *
-             * @return {boolean}
-             */
-            constrainedToComponent(): boolean;
-            /**
-             * Sets whether the Drag Interaction constrains Points passed to its
-             * callbacks to lie inside its Component.
-             *
-             * If true, when the user drags outside of the Component, the closest Point
-             * inside the Component will be passed to the callback instead of the actual
-             * cursor position.
-             *
-             * @param {boolean}
-             * @return {Interactions.Drag} The calling Drag Interaction.
-             */
-            constrainedToComponent(constrainedToComponent: boolean): Drag;
-            /**
-             * Adds a callback to be called when dragging starts.
-             *
-             * @param {DragCallback} callback
-             * @returns {Drag} The calling Drag Interaction.
-             */
-            onDragStart(callback: DragCallback): Drag;
-            /**
-             * Removes a callback that would be called when dragging starts.
-             *
-             * @param {DragCallback} callback
-             * @returns {Drag} The calling Drag Interaction.
-             */
-            offDragStart(callback: DragCallback): Drag;
-            /**
-             * Adds a callback to be called during dragging.
-             *
-             * @param {DragCallback} callback
-             * @returns {Drag} The calling Drag Interaction.
-             */
-            onDrag(callback: DragCallback): Drag;
-            /**
-             * Removes a callback that would be called during dragging.
-             *
-             * @param {DragCallback} callback
-             * @returns {Drag} The calling Drag Interaction.
-             */
-            offDrag(callback: DragCallback): Drag;
-            /**
-             * Adds a callback to be called when dragging ends.
-             *
-             * @param {DragCallback} callback
-             * @returns {Drag} The calling Drag Interaction.
-             */
-            onDragEnd(callback: DragCallback): Drag;
-            /**
-             * Removes a callback that would be called when dragging ends.
-             *
-             * @param {DragCallback} callback
-             * @returns {Drag} The calling Drag Interaction.
-             */
-            offDragEnd(callback: DragCallback): Drag;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    type DragBoxCallback = (bounds: Bounds) => void;
-    namespace Components {
-        class DragBoxLayer extends Components.SelectionBoxLayer {
-            protected _hasCorners: boolean;
-            /**
-             * Constructs a DragBoxLayer.
-             *
-             * A DragBoxLayer is a SelectionBoxLayer with a built-in Drag Interaction.
-             * A drag gesture will set the Bounds of the box.
-             * If resizing is enabled using resizable(true), the edges of box can be repositioned.
-             *
-             * @constructor
-             */
-            constructor();
-            protected _setup(): void;
-            renderImmediately(): DragBoxLayer;
-            /**
-             * Gets the detection radius of the drag box in pixels.
-             */
-            detectionRadius(): number;
-            /**
-             * Sets the detection radius of the drag box in pixels.
-             *
-             * @param {number} r
-             * @return {DragBoxLayer} The calling DragBoxLayer.
-             */
-            detectionRadius(r: number): DragBoxLayer;
-            /**
-             * Gets whether or not the drag box is resizable.
-             */
-            resizable(): boolean;
-            /**
-             * Sets whether or not the drag box is resizable.
-             *
-             * @param {boolean} canResize
-             * @return {DragBoxLayer} The calling DragBoxLayer.
-             */
-            resizable(canResize: boolean): DragBoxLayer;
-            protected _setResizableClasses(canResize: boolean): void;
-            /**
-             * Sets the callback to be called when dragging starts.
-             *
-             * @param {DragBoxCallback} callback
-             * @returns {DragBoxLayer} The calling DragBoxLayer.
-             */
-            onDragStart(callback: DragBoxCallback): DragBoxLayer;
-            /**
-             * Removes a callback to be called when dragging starts.
-             *
-             * @param {DragBoxCallback} callback
-             * @returns {DragBoxLayer} The calling DragBoxLayer.
-             */
-            offDragStart(callback: DragBoxCallback): DragBoxLayer;
-            /**
-             * Sets a callback to be called during dragging.
-             *
-             * @param {DragBoxCallback} callback
-             * @returns {DragBoxLayer} The calling DragBoxLayer.
-             */
-            onDrag(callback: DragBoxCallback): DragBoxLayer;
-            /**
-             * Removes a callback to be called during dragging.
-             *
-             * @param {DragBoxCallback} callback
-             * @returns {DragBoxLayer} The calling DragBoxLayer.
-             */
-            offDrag(callback: DragBoxCallback): DragBoxLayer;
-            /**
-             * Sets a callback to be called when dragging ends.
-             *
-             * @param {DragBoxCallback} callback
-             * @returns {DragBoxLayer} The calling DragBoxLayer.
-             */
-            onDragEnd(callback: DragBoxCallback): DragBoxLayer;
-            /**
-             * Removes a callback to be called when dragging ends.
-             *
-             * @param {DragBoxCallback} callback
-             * @returns {DragBoxLayer} The calling DragBoxLayer.
-             */
-            offDragEnd(callback: DragBoxCallback): DragBoxLayer;
-            /**
-             * Gets the internal Interactions.Drag of the DragBoxLayer.
-             */
-            dragInteraction(): Interactions.Drag;
-            /**
-             * Enables or disables the interaction and drag box.
-             */
-            enabled(enabled: boolean): DragBoxLayer;
-            /**
-             * Gets the enabled state.
-             */
-            enabled(): boolean;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Components {
-        class XDragBoxLayer extends DragBoxLayer {
-            /**
-             * An XDragBoxLayer is a DragBoxLayer whose size can only be set in the X-direction.
-             * The y-values of the bounds() are always set to 0 and the height() of the XDragBoxLayer.
-             *
-             * @constructor
-             */
-            constructor();
-            computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): XDragBoxLayer;
-            protected _setBounds(newBounds: Bounds): void;
-            protected _setResizableClasses(canResize: boolean): void;
-        }
-    }
-}
-
-
-declare namespace Plottable {
-    namespace Components {
-        class YDragBoxLayer extends DragBoxLayer {
-            /**
-             * A YDragBoxLayer is a DragBoxLayer whose size can only be set in the Y-direction.
-             * The x-values of the bounds() are always set to 0 and the width() of the YDragBoxLayer.
-             *
-             * @constructor
-             */
-            constructor();
-            computeLayout(origin?: Point, availableWidth?: number, availableHeight?: number): YDragBoxLayer;
-            protected _setBounds(newBounds: Bounds): void;
-            protected _setResizableClasses(canResize: boolean): void;
-        }
-    }
-}
diff --git a/plottable/tsconfig.json b/plottable/tsconfig.json
new file mode 100644
index 0000000000..576b847fcc
--- /dev/null
+++ b/plottable/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "plottable-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pluralize/pluralize.d.ts b/pluralize/index.d.ts
similarity index 100%
rename from pluralize/pluralize.d.ts
rename to pluralize/index.d.ts
diff --git a/pluralize/pluralize-tests.ts b/pluralize/pluralize-tests.ts
index 07d5a3dccf..951fe0b91a 100644
--- a/pluralize/pluralize-tests.ts
+++ b/pluralize/pluralize-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="pluralize.d.ts" />
+
 
 import pluralize = require('pluralize');
 
diff --git a/pluralize/tsconfig.json b/pluralize/tsconfig.json
new file mode 100644
index 0000000000..ff419465b6
--- /dev/null
+++ b/pluralize/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pluralize-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/png-async/index.d.ts b/png-async/index.d.ts
new file mode 100644
index 0000000000..cef8207ae2
--- /dev/null
+++ b/png-async/index.d.ts
@@ -0,0 +1,52 @@
+// Type definitions for png-async
+// Project: https://github.com/kanreisa/node-png-async
+// Definitions by: Yuki KAN <https://github.com/kanreisa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import stream = require('stream');
+
+export interface IImageOptions {
+    width?: number;
+    height?: number;
+    fill?: boolean;
+    checkCRC?: boolean;
+    deflateChunkSize?: number;
+    deflateLevel?: number;
+    deflateStrategy?: EDeflateStrategy;
+    filterType?: EFilterType;
+}
+
+export declare enum EDeflateStrategy {
+    DEFAULT_STRATEGY = 0,
+    FILTERED = 1,
+    HUFFMAN_ONLY = 2,
+    RLE = 3,
+    FIXED = 4,
+}
+
+export declare enum EFilterType {
+    Auto = -1,
+    None = 0,
+    Sub = 1,
+    Up = 2,
+    Average = 3,
+    Paeth = 4,
+}
+
+export declare function createImage(option?: IImageOptions): Image;
+
+export declare class Image extends stream.Duplex {
+    width: number;
+    height: number;
+    gamma: number;
+    data: Buffer;
+    constructor(option?: IImageOptions);
+    pack(): Image;
+    parse(data: Buffer, callback?: (err: Error, image: Image) => void): Image;
+    write(data: any, cb?: any): boolean;
+    end(data?: any): void;
+    bitblt(dst: Image, sx: number, sy: number, w: number, h: number, dx: number, dy: number): Image;
+}
diff --git a/png-async/png-async-tests.ts b/png-async/png-async-tests.ts
index 6523089a2b..f108fe66b8 100644
--- a/png-async/png-async-tests.ts
+++ b/png-async/png-async-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="png-async.d.ts" />
 
 import fs = require('fs');
 import png = require('png-async');
diff --git a/png-async/png-async.d.ts b/png-async/png-async.d.ts
deleted file mode 100644
index b64172c361..0000000000
--- a/png-async/png-async.d.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-// Type definitions for png-async
-// Project: https://github.com/kanreisa/node-png-async
-// Definitions by: Yuki KAN <https://github.com/kanreisa>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'png-async' {
-    import stream = require('stream');
-
-    export interface IImageOptions {
-        width?: number;
-        height?: number;
-        fill?: boolean;
-        checkCRC?: boolean;
-        deflateChunkSize?: number;
-        deflateLevel?: number;
-        deflateStrategy?: EDeflateStrategy;
-        filterType?: EFilterType;
-    }
-
-    export enum EDeflateStrategy {
-        DEFAULT_STRATEGY = 0,
-        FILTERED = 1,
-        HUFFMAN_ONLY = 2,
-        RLE = 3,
-        FIXED = 4,
-    }
-
-    export enum EFilterType {
-        Auto = -1,
-        None = 0,
-        Sub = 1,
-        Up = 2,
-        Average = 3,
-        Paeth = 4,
-    }
-
-    export function createImage(option?: IImageOptions): Image;
-
-    export class Image extends stream.Duplex {
-        width: number;
-        height: number;
-        gamma: number;
-        data: Buffer;
-        constructor(option?: IImageOptions);
-        pack(): Image;
-        parse(data: Buffer, callback?: (err: Error, image: Image) => void): Image;
-        write(data: any, cb?: any): boolean;
-        end(data?: any): void;
-        bitblt(dst: Image, sx: number, sy: number, w: number, h: number, dx: number, dy: number): Image;
-    }
-}
diff --git a/png-async/tsconfig.json b/png-async/tsconfig.json
new file mode 100644
index 0000000000..f64fdac7e3
--- /dev/null
+++ b/png-async/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "png-async-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pngjs2/index.d.ts b/pngjs2/index.d.ts
new file mode 100644
index 0000000000..436f055295
--- /dev/null
+++ b/pngjs2/index.d.ts
@@ -0,0 +1,63 @@
+// Type definitions for pngjs2 2.0.0
+// Project: https://www.npmjs.com/package/pngjs2
+// Definitions by: Elisée Maurer <https://sparklinlabs.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import fs = require("fs");
+import events = require("events");
+import stream = require("stream");
+
+interface PNGOptions {
+    width?: number;
+    height?: number;
+    checkCRC?: boolean;
+    deflateChunkSize?: number;
+    deflateLevel?: number;
+    deflateStrategy?: number;
+    deflateFactory?: any;
+    filterType?: number | number[];
+    colorType?: number;
+    inputHasAlpha?: boolean;
+}
+
+interface PNGMetadata {
+    width: number;
+    height: number;
+    palette: boolean;
+    color: boolean;
+    alpha: boolean;
+    interlace: boolean;
+}
+
+export declare class PNG extends stream.Writable {
+    constructor(options?: PNGOptions);
+
+    width: number;
+    height: number;
+    data: Buffer;
+    gamma: number;
+
+    on(event: string, callback: Function): this;
+    on(event: "metadata", callback: (metadata: PNGMetadata) => void): this;
+    on(event: "parsed", callback: (data: Buffer) => void): this;
+    on(event: "error", callback: (err: Error) => void): this;
+
+    parse(data: string | Buffer, callback?: (err: Error, data: Buffer) => void): PNG;
+    pack(): PNG;
+    pipe(destination: fs.WriteStream): PNG;
+
+    static bitblt(src: PNG, dst: PNG, srcX: number, srcY: number,
+        width: number, height: number, deltaX: number, deltaY: number): void;
+
+    bitblt(dst: PNG, srcX: number, srcY: number,
+        width: number, height: number, deltaX: number, deltaY: number): PNG;
+}
+
+export declare namespace PNG {
+    namespace sync {
+        function read(buffer: string | Buffer, options?: PNGOptions): PNG;
+    }
+}
diff --git a/pngjs2/pngjs2-tests.ts b/pngjs2/pngjs2-tests.ts
index ae2d73e7b3..9993622b88 100644
--- a/pngjs2/pngjs2-tests.ts
+++ b/pngjs2/pngjs2-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="pngjs2.d.ts" />
 
 import * as fs from "fs";
 import { PNG } from "pngjs2";
diff --git a/pngjs2/pngjs2.d.ts b/pngjs2/pngjs2.d.ts
deleted file mode 100644
index ae868ea654..0000000000
--- a/pngjs2/pngjs2.d.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-// Type definitions for pngjs2 2.0.0
-// Project: https://www.npmjs.com/package/pngjs2
-// Definitions by: Elisée Maurer <https://sparklinlabs.com/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "pngjs2" {
-  import fs = require("fs");
-  import events = require("events");
-  import stream = require("stream");
-
-  interface PNGOptions {
-    width?: number;
-    height?: number;
-    checkCRC?: boolean;
-    deflateChunkSize?: number;
-    deflateLevel?: number;
-    deflateStrategy?: number;
-    deflateFactory?: any;
-    filterType?: number|number[];
-    colorType?: number;
-    inputHasAlpha?: boolean;
-  }
-
-  interface PNGMetadata {
-    width: number;
-    height: number;
-    palette: boolean;
-    color: boolean;
-    alpha: boolean;
-    interlace: boolean;
-  }
-
-  export class PNG extends stream.Writable {
-    constructor(options?: PNGOptions);
-
-    width: number;
-    height: number;
-    data: Buffer;
-    gamma: number;
-
-    on(event: string, callback: Function): this;
-    on(event: "metadata", callback: (metadata: PNGMetadata) => void): this;
-    on(event: "parsed", callback: (data: Buffer) => void): this;
-    on(event: "error", callback: (err: Error) => void): this;
-
-    parse(data: string|Buffer, callback?: (err: Error, data: Buffer) => void): PNG;
-    pack(): PNG;
-    pipe(destination: fs.WriteStream): PNG;
-
-    static bitblt(src: PNG, dst: PNG, srcX: number, srcY: number,
-                  width: number, height: number, deltaX: number, deltaY: number): void;
-
-    bitblt(dst: PNG, srcX: number, srcY: number,
-           width: number, height: number, deltaX: number, deltaY: number): PNG;
-  }
-
-  export namespace PNG {
-    namespace sync {
-      function read(buffer: string|Buffer, options?: PNGOptions): PNG;
-    }
-  }
-}
diff --git a/pngjs2/tsconfig.json b/pngjs2/tsconfig.json
new file mode 100644
index 0000000000..e20cfd117d
--- /dev/null
+++ b/pngjs2/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pngjs2-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/podcast/podcast.d.ts b/podcast/index.d.ts
similarity index 100%
rename from podcast/podcast.d.ts
rename to podcast/index.d.ts
diff --git a/podcast/podcast-tests.ts b/podcast/podcast-tests.ts
index c8989d7a86..8b19ac631f 100644
--- a/podcast/podcast-tests.ts
+++ b/podcast/podcast-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="podcast.d.ts" />
-
 import Podcast = require('podcast');
 
 /* lets create an rss feed */
diff --git a/podcast/tsconfig.json b/podcast/tsconfig.json
new file mode 100644
index 0000000000..febbbc9228
--- /dev/null
+++ b/podcast/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "podcast-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/poly2tri/poly2tri.d.ts b/poly2tri/index.d.ts
similarity index 100%
rename from poly2tri/poly2tri.d.ts
rename to poly2tri/index.d.ts
diff --git a/poly2tri/poly2tri-tests.ts b/poly2tri/poly2tri-tests.ts
index 2f062b3bee..aa780e0d30 100644
--- a/poly2tri/poly2tri-tests.ts
+++ b/poly2tri/poly2tri-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="poly2tri.d.ts" />
+
 
 function initializeCDT(): poly2tri.SweepContext {
     var contour = [
diff --git a/poly2tri/tsconfig.json b/poly2tri/tsconfig.json
new file mode 100644
index 0000000000..2e27058cdc
--- /dev/null
+++ b/poly2tri/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "poly2tri-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/polyline/index.d.ts b/polyline/index.d.ts
new file mode 100644
index 0000000000..bead8d9e5e
--- /dev/null
+++ b/polyline/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for Polyline 0.1.0
+// Project: https://github.com/mapbox/polyline
+// Definitions by: Arseniy Maximov <https://github.com/Kern0>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="geojson" />
+
+interface Polyline {
+  decode(string: string, precision?: number): number[][];
+  encode(coordinate: number[][], precision?: number): string;
+  fromGeoJSON(geojson: GeoJSON.LineString | GeoJSON.Feature<GeoJSON.LineString>, precision?: number): string;
+}
+
+declare var polyline: Polyline;
+
+declare module "polyline" {
+    export = polyline;
+}
\ No newline at end of file
diff --git a/polyline/polyline-tests.ts b/polyline/polyline-tests.ts
index 888d15f91a..4e499b7fc0 100644
--- a/polyline/polyline-tests.ts
+++ b/polyline/polyline-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./polyline.d.ts" />
+
 
 // returns an array of lat, lon pairs
 polyline.decode('_p~iF~ps|U_ulLnnqC_mqNvxq`@');
diff --git a/polyline/polyline.d.ts b/polyline/polyline.d.ts
deleted file mode 100644
index 17389ed7e9..0000000000
--- a/polyline/polyline.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Type definitions for Polyline 0.1.0
-// Project: https://github.com/mapbox/polyline
-// Definitions by: Arseniy Maximov <https://github.com/Kern0>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../geojson/geojson.d.ts" />
-
-interface Polyline {
-  decode(string: string, precision?: number): number[][];
-  encode(coordinate: number[][], precision?: number): string;
-  fromGeoJSON(geojson: GeoJSON.LineString | GeoJSON.Feature<GeoJSON.LineString>, precision?: number): string;
-}
-
-declare var polyline: Polyline;
-
-declare module "polyline" {
-    export = polyline;
-}
\ No newline at end of file
diff --git a/polyline/tsconfig.json b/polyline/tsconfig.json
new file mode 100644
index 0000000000..d5135b0ceb
--- /dev/null
+++ b/polyline/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "polyline-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/polymer-ts/polymer-ts.d.ts b/polymer-ts/index.d.ts
similarity index 100%
rename from polymer-ts/polymer-ts.d.ts
rename to polymer-ts/index.d.ts
diff --git a/polymer-ts/polymer-ts-tests.ts b/polymer-ts/polymer-ts-tests.ts
index 1347b3bb71..3a9baf0e54 100644
--- a/polymer-ts/polymer-ts-tests.ts
+++ b/polymer-ts/polymer-ts-tests.ts
@@ -1,7 +1,4 @@
-/// <reference path="./polymer-ts.d.ts"/>
-
 namespace Components {
-
 	export class TestComponent extends polymer.Base {
 
 		public field: string = 'foo';
diff --git a/polymer-ts/tsconfig.json b/polymer-ts/tsconfig.json
new file mode 100644
index 0000000000..1882e2b207
--- /dev/null
+++ b/polymer-ts/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "polymer-ts-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/polymer/index.d.ts b/polymer/index.d.ts
new file mode 100644
index 0000000000..e8288361a8
--- /dev/null
+++ b/polymer/index.d.ts
@@ -0,0 +1,317 @@
+// Type definitions for polymer v1.1.6
+// Project: https://github.com/Polymer/polymer
+// Definitions by: Louis Grignon <https://github.com/lgrignon>, Suguru Inatomi <https://github.com/laco0416>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="webcomponents.js"/>
+
+declare namespace polymer {
+
+  type PropConstructorType = StringConstructor|ObjectConstructor|BooleanConstructor|NumberConstructor|DateConstructor|ArrayConstructor;
+
+  interface PropObjectType {
+    type: PropConstructorType;
+    value?: boolean | number | string | Function | Object;
+    reflectToAttribute?: boolean;
+    readOnly?: boolean;
+    notify?: boolean;
+    computed?: string;
+    observer?: string;
+  }
+
+  interface Base {
+    /** Need to allow all properties for callback methods. */
+    [prop: string]: any;
+
+    /* polymer-micro */
+
+    // Attributes
+
+    hostAttributes?: {[name:string]:any};
+
+    reflectPropertiesToAttribute?(name: string): void;
+
+    serializeValueToAttribute?(value: any, attribute: string, node?: Element): void;
+
+    deserialize?(value: string, type: NumberConstructor): number;
+    deserialize?(value: string, type: BooleanConstructor): boolean;
+    deserialize?(value: string, type: ObjectConstructor): Object;
+    deserialize?(value: string, type: ArrayConstructor): any[];
+    deserialize?(value: string, type: DateConstructor): Date;
+    deserialize?(value: string, type: StringConstructor): string;
+
+    serialize?(value: any): string;
+
+    // Behaviors
+
+    behaviors?:Object[];
+
+    // Constructors
+
+    factoryImpl?(...args: any[]): void;
+
+    // Debouncer
+
+    debounce?(jobName: string, callback: Function, wait: number): void;
+
+    isDebouncerActive?(jobName: string): boolean;
+
+    flushDebouncer?(jobName: string): void;
+
+    cancelDebouncer?(jobName: string): void;
+
+    // Extends
+
+    extends?: string;
+
+    getNativePrototype?(tag: string): Object;
+
+    // Properties
+
+    properties?:{[prop:string]:(PropConstructorType|PropObjectType);};
+
+    getPropertyInfo?(property: string): Object;
+
+    // Tag
+
+    is: string;
+
+    /* polymer-mini */
+
+    // Ready
+
+    ready?(): void;
+
+    attachedCallback?(): void;
+
+    // Shady
+
+    domHost?(): Element;
+
+    distributeContent?(): void;
+
+    elementMatches?(selector: string, node?: Element): boolean;
+
+    // Template {
+
+    instanceTemplate?(template: HTMLElement): DocumentFragment;
+
+    /* polymer-standard */
+
+
+    // Annotations
+
+    $?: any;
+
+    // Events
+
+    listeners?: {[key:string]:string;};
+
+    listen?(node: Element, eventName: string, methodName: string): void;
+
+    unlisten?(node: Element, eventName: string, methodName: string): void;
+
+    // Gestures
+
+    setScrollDirection?(direction: string, node?: HTMLElement): void;
+
+    // NotifyPath
+
+    notifyPath?(path: string, value: any, fromAbove: any): void;
+
+    set?(path: string|(string|number)[], value: any, root?: Object): void;
+
+    get?(path: string|(string|number)[], root?: Object): any;
+
+    linkPaths?(to: string, from?: string): void;
+
+    unlinkPaths?(path: string): void;
+
+    push?(path: string): number;
+
+    pop?(path: string): any;
+
+    splice?(path: string, start: number, deleteCount: number): number;
+
+    shift?(path: string): any;
+
+    unshift?(path: string): number;
+
+    // ResolveUrl
+
+    resolveUrl?(url: string): string;
+
+    // Styling
+
+    scopeSubtree?(container: Element, shouldObserve: boolean): void;
+
+    // Utils
+
+    $$?(selector: string): Element;
+
+    toggleClass?(name: string, bool?: boolean, node?: HTMLElement): void;
+
+    toggleAttribute?(name: string, bool?: boolean, node?: HTMLElement): void;
+
+    classFollows?(name: string, toElement: HTMLElement, fromElement: HTMLElement): void;
+
+    attributeFollows?(name: string, toElement: HTMLElement, fromElement: HTMLElement): void;
+
+    getContentChildNodes?(selector: string): Node[];
+
+    getContentChildren?(selector: string): HTMLElement[];
+
+    fire?(type: string, detail?: any, options?: Object): CustomEvent;
+
+    async?(callback: ()=>void, waitTime?: number): number;
+
+    cancelAsync?(handle: number): void;
+
+    arrayDelete?(path: string|any[], item: any): any[];
+
+    transform?(transform: string, node?: HTMLElement): void;
+
+    translate3d?(x: number, y: number, z: number, node?: HTMLElement): void;
+
+    importHref?(href: string, onload?: Function, onerror?: Function): HTMLLinkElement;
+
+    create?(tag: string, props: Object): Element;
+
+    isLightDescendant?(node: HTMLElement): boolean;
+
+    isLocalDescendant?(node: HTMLElement): boolean
+
+    // XStyling
+
+    updateStyles?(): void;
+
+    /* common api */
+
+    registerCallback?():void;
+
+    createdCallback?():void;
+
+    attachedCallback?():void;
+
+    detachedCallback?():void;
+
+    attributeChangedCallback?(name: string):void;
+
+    extend?(prototype: Object, api: Object):Object;
+
+    mixin?(target: Object, source: Object):Object;
+
+    copyOwnProperty?(name: string, source: Object, target: Object):void;
+
+    observers?: string[];
+
+    beforeRegister?(): void;
+
+    registered?(): void;
+
+    created?(): void;
+
+    attached?(): void;
+
+    detached?(): void;
+
+    attributeChanged?(name: string, oldValue: any, newValue: any): void;
+
+  }
+
+  interface DomApiStatic {
+
+    (obj: Node|Base):DomApi;
+
+    (obj: Event):EventApi;
+
+    flush():void;
+  }
+
+  interface DomApi {
+
+    appendChild(node: Node): Node;
+
+    insertBefore(node: Node, refNode?: Node):Node;
+
+    removeChild(node: Node):Node;
+
+    replaceChild(node: Node, refNode: Node):Node;
+
+    getOwnerRoot():Node;
+
+    querySelector(selector: string):Node;
+
+    querySelectorAll(selector: string):Node[];
+
+    getDestinationInsertionPoints():Node[];
+
+    getDistributedNodes():Node[];
+
+    queryDistributedElements(selector: string):Node[];
+
+    setAttribute(name: string, value: any):void;
+
+    removeAttribute(name: string):void;
+
+    childNodes:Node[];
+
+    children:Element[];
+
+    parentNode:Node;
+
+    firstChild:Node;
+
+    lastChild:Node;
+
+    nextSibling:Node;
+
+    previousSibling:Node;
+
+    firstElementChild:Element;
+
+    lastElementChild:Element;
+
+    nextElementSibling:Element;
+
+    previousElementSibling:Element;
+
+    textContent:string;
+
+    innerHTML:string;
+  }
+
+  interface EventApi {
+
+    rootTarget:EventTarget;
+
+    localTarget:EventTarget;
+
+    path:Node[];
+  }
+
+  interface Settings {
+
+    wantShadow:boolean;
+    hasShadow:boolean;
+    nativeShadow:boolean;
+    useShadow:boolean;
+    useNativeShadow:boolean;
+    useNativeImports:boolean;
+    useNativeCustomElements:boolean;
+  }
+
+  interface PolymerStatic {
+
+    Settings: Settings;
+
+    dom:DomApiStatic;
+
+    (prototype: Base|{new ():Base}):webcomponents.CustomElementConstructor;
+
+    Class(prototype: Base|{new ():Base}):webcomponents.CustomElementConstructor;
+  }
+}
+
+declare var Polymer: polymer.PolymerStatic;
+
diff --git a/polymer/polymer-tests.ts b/polymer/polymer-tests.ts
index e7d2706c58..dcad66f871 100644
--- a/polymer/polymer-tests.ts
+++ b/polymer/polymer-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="polymer.d.ts"/>
-
 Polymer({
   is: "my-element",
 
diff --git a/polymer/polymer.d.ts b/polymer/polymer.d.ts
deleted file mode 100644
index 0daecee079..0000000000
--- a/polymer/polymer.d.ts
+++ /dev/null
@@ -1,317 +0,0 @@
-// Type definitions for polymer v1.1.6
-// Project: https://github.com/Polymer/polymer
-// Definitions by: Louis Grignon <https://github.com/lgrignon>, Suguru Inatomi <https://github.com/laco0416>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../webcomponents.js/webcomponents.js.d.ts"/>
-
-declare namespace polymer {
-
-  type PropConstructorType = StringConstructor|ObjectConstructor|BooleanConstructor|NumberConstructor|DateConstructor|ArrayConstructor;
-
-  interface PropObjectType {
-    type: PropConstructorType;
-    value?: boolean | number | string | Function | Object;
-    reflectToAttribute?: boolean;
-    readOnly?: boolean;
-    notify?: boolean;
-    computed?: string;
-    observer?: string;
-  }
-
-  interface Base {
-    /** Need to allow all properties for callback methods. */
-    [prop: string]: any;
-
-    /* polymer-micro */
-
-    // Attributes
-
-    hostAttributes?: {[name:string]:any};
-
-    reflectPropertiesToAttribute?(name: string): void;
-
-    serializeValueToAttribute?(value: any, attribute: string, node?: Element): void;
-
-    deserialize?(value: string, type: NumberConstructor): number;
-    deserialize?(value: string, type: BooleanConstructor): boolean;
-    deserialize?(value: string, type: ObjectConstructor): Object;
-    deserialize?(value: string, type: ArrayConstructor): any[];
-    deserialize?(value: string, type: DateConstructor): Date;
-    deserialize?(value: string, type: StringConstructor): string;
-
-    serialize?(value: any): string;
-
-    // Behaviors
-
-    behaviors?:Object[];
-
-    // Constructors
-
-    factoryImpl?(...args: any[]): void;
-
-    // Debouncer
-
-    debounce?(jobName: string, callback: Function, wait: number): void;
-
-    isDebouncerActive?(jobName: string): boolean;
-
-    flushDebouncer?(jobName: string): void;
-
-    cancelDebouncer?(jobName: string): void;
-
-    // Extends
-
-    extends?: string;
-
-    getNativePrototype?(tag: string): Object;
-
-    // Properties
-
-    properties?:{[prop:string]:(PropConstructorType|PropObjectType);};
-
-    getPropertyInfo?(property: string): Object;
-
-    // Tag
-
-    is: string;
-
-    /* polymer-mini */
-
-    // Ready
-
-    ready?(): void;
-
-    attachedCallback?(): void;
-
-    // Shady
-
-    domHost?(): Element;
-
-    distributeContent?(): void;
-
-    elementMatches?(selector: string, node?: Element): boolean;
-
-    // Template {
-
-    instanceTemplate?(template: HTMLElement): DocumentFragment;
-
-    /* polymer-standard */
-
-
-    // Annotations
-
-    $?: any;
-
-    // Events
-
-    listeners?: {[key:string]:string;};
-
-    listen?(node: Element, eventName: string, methodName: string): void;
-
-    unlisten?(node: Element, eventName: string, methodName: string): void;
-
-    // Gestures
-
-    setScrollDirection?(direction: string, node?: HTMLElement): void;
-
-    // NotifyPath
-
-    notifyPath?(path: string, value: any, fromAbove: any): void;
-
-    set?(path: string|(string|number)[], value: any, root?: Object): void;
-
-    get?(path: string|(string|number)[], root?: Object): any;
-
-    linkPaths?(to: string, from?: string): void;
-
-    unlinkPaths?(path: string): void;
-
-    push?(path: string): number;
-
-    pop?(path: string): any;
-
-    splice?(path: string, start: number, deleteCount: number): number;
-
-    shift?(path: string): any;
-
-    unshift?(path: string): number;
-
-    // ResolveUrl
-
-    resolveUrl?(url: string): string;
-
-    // Styling
-
-    scopeSubtree?(container: Element, shouldObserve: boolean): void;
-
-    // Utils
-
-    $$?(selector: string): Element;
-
-    toggleClass?(name: string, bool?: boolean, node?: HTMLElement): void;
-
-    toggleAttribute?(name: string, bool?: boolean, node?: HTMLElement): void;
-
-    classFollows?(name: string, toElement: HTMLElement, fromElement: HTMLElement): void;
-
-    attributeFollows?(name: string, toElement: HTMLElement, fromElement: HTMLElement): void;
-
-    getContentChildNodes?(selector: string): Node[];
-
-    getContentChildren?(selector: string): HTMLElement[];
-
-    fire?(type: string, detail?: any, options?: Object): CustomEvent;
-
-    async?(callback: ()=>void, waitTime?: number): number;
-
-    cancelAsync?(handle: number): void;
-
-    arrayDelete?(path: string|any[], item: any): any[];
-
-    transform?(transform: string, node?: HTMLElement): void;
-
-    translate3d?(x: number, y: number, z: number, node?: HTMLElement): void;
-
-    importHref?(href: string, onload?: Function, onerror?: Function): HTMLLinkElement;
-
-    create?(tag: string, props: Object): Element;
-
-    isLightDescendant?(node: HTMLElement): boolean;
-
-    isLocalDescendant?(node: HTMLElement): boolean
-
-    // XStyling
-
-    updateStyles?(): void;
-
-    /* common api */
-
-    registerCallback?():void;
-
-    createdCallback?():void;
-
-    attachedCallback?():void;
-
-    detachedCallback?():void;
-
-    attributeChangedCallback?(name: string):void;
-
-    extend?(prototype: Object, api: Object):Object;
-
-    mixin?(target: Object, source: Object):Object;
-
-    copyOwnProperty?(name: string, source: Object, target: Object):void;
-
-    observers?: string[];
-
-    beforeRegister?(): void;
-
-    registered?(): void;
-
-    created?(): void;
-
-    attached?(): void;
-
-    detached?(): void;
-
-    attributeChanged?(name: string, oldValue: any, newValue: any): void;
-
-  }
-
-  interface DomApiStatic {
-
-    (obj: Node|Base):DomApi;
-
-    (obj: Event):EventApi;
-
-    flush():void;
-  }
-
-  interface DomApi {
-
-    appendChild(node: Node): Node;
-
-    insertBefore(node: Node, refNode?: Node):Node;
-
-    removeChild(node: Node):Node;
-
-    replaceChild(node: Node, refNode: Node):Node;
-
-    getOwnerRoot():Node;
-
-    querySelector(selector: string):Node;
-
-    querySelectorAll(selector: string):Node[];
-
-    getDestinationInsertionPoints():Node[];
-
-    getDistributedNodes():Node[];
-
-    queryDistributedElements(selector: string):Node[];
-
-    setAttribute(name: string, value: any):void;
-
-    removeAttribute(name: string):void;
-
-    childNodes:Node[];
-
-    children:Element[];
-
-    parentNode:Node;
-
-    firstChild:Node;
-
-    lastChild:Node;
-
-    nextSibling:Node;
-
-    previousSibling:Node;
-
-    firstElementChild:Element;
-
-    lastElementChild:Element;
-
-    nextElementSibling:Element;
-
-    previousElementSibling:Element;
-
-    textContent:string;
-
-    innerHTML:string;
-  }
-
-  interface EventApi {
-
-    rootTarget:EventTarget;
-
-    localTarget:EventTarget;
-
-    path:Node[];
-  }
-
-  interface Settings {
-
-    wantShadow:boolean;
-    hasShadow:boolean;
-    nativeShadow:boolean;
-    useShadow:boolean;
-    useNativeShadow:boolean;
-    useNativeImports:boolean;
-    useNativeCustomElements:boolean;
-  }
-
-  interface PolymerStatic {
-
-    Settings: Settings;
-
-    dom:DomApiStatic;
-
-    (prototype: Base|{new ():Base}):webcomponents.CustomElementConstructor;
-
-    Class(prototype: Base|{new ():Base}):webcomponents.CustomElementConstructor;
-  }
-}
-
-declare var Polymer: polymer.PolymerStatic;
-
diff --git a/polymer/tsconfig.json b/polymer/tsconfig.json
new file mode 100644
index 0000000000..de1ce21980
--- /dev/null
+++ b/polymer/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "polymer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/popcorn/popcorn.d.ts b/popcorn/index.d.ts
similarity index 100%
rename from popcorn/popcorn.d.ts
rename to popcorn/index.d.ts
diff --git a/popcorn/popcorn.d.ts.tscparams b/popcorn/popcorn.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/popcorn/popcorn.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/popcorn/tsconfig.json b/popcorn/tsconfig.json
new file mode 100644
index 0000000000..af6755830c
--- /dev/null
+++ b/popcorn/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/postal/index.d.ts b/postal/index.d.ts
new file mode 100644
index 0000000000..62caad6c1d
--- /dev/null
+++ b/postal/index.d.ts
@@ -0,0 +1,94 @@
+// Type definitions for Postal v1.0.8
+// Project: https://github.com/postaljs/postal.js
+// Definitions by: Lokesh Peta <https://github.com/lokeshpeta/>, Paul Jolly <https://github.com/myitcv>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface IConfiguration {
+	SYSTEM_CHANNEL: string;
+	DEFAULT_CHANNEL: string;
+	resolver: IResolver;
+}
+
+interface IResolver {
+	compare(binding: string, topic: string, headerOptions: {}): boolean;
+	reset(): void;
+	purge(options?: {topic?: string, binding?: string, compact?: boolean}): void;
+}
+
+interface ICallback<T> {
+	(data: T, envelope: IEnvelope<T>): void
+}
+
+interface ISubscriptionDefinition<T> {
+	channel: string;
+	topic: string;
+	callback: ICallback<T>;
+
+	// after and before lack documentation
+
+	constraint(predicateFn: (data: T, envelope: IEnvelope<T>) => boolean): ISubscriptionDefinition<T>;
+	constraints(predicateFns: ((data: T, envelope: IEnvelope<T>) => boolean)[]): ISubscriptionDefinition<T>;
+	context(theContext: any): ISubscriptionDefinition<T>;
+	debounce(interval: number): ISubscriptionDefinition<T>;
+	defer(): ISubscriptionDefinition<T>;
+	delay(waitTime: number): ISubscriptionDefinition<T>;
+	disposeAfter(maxCalls: number): ISubscriptionDefinition<T>;
+	distinct(): ISubscriptionDefinition<T>;
+	distinctUntilChanged(): ISubscriptionDefinition<T>;
+	logError(): ISubscriptionDefinition<T>;
+	once(): ISubscriptionDefinition<T>;
+	throttle(interval: number): ISubscriptionDefinition<T>;
+	subscribe(callback: ICallback<T>): ISubscriptionDefinition<T>;
+	unsubscribe(): void;
+}
+
+interface IEnvelope<T> {
+	topic: string;
+	data?: T;
+
+	/*Uses DEFAULT_CHANNEL if no channel is provided*/
+	channel?: string;
+
+	timeStamp?: string;
+}
+
+
+interface IChannelDefinition<T> {
+	subscribe(topic: string, callback: ICallback<T>): ISubscriptionDefinition<T>;
+
+	publish(topic: string, data?: T): void;
+
+	channel: string;
+}
+
+interface IPostal {
+	subscriptions: {};
+	wireTaps: ICallback<any>[];
+
+	addWireTap(callback: ICallback<any>): () => void;
+
+	channel<T>(name?: string): IChannelDefinition<T>;
+
+	getSubscribersFor(): ISubscriptionDefinition<any>[];
+	getSubscribersFor(options: {channel?: string, topic?: string, context?: any}): ISubscriptionDefinition<any>[];
+	getSubscribersFor(predicateFn: (sub: ISubscriptionDefinition<any>) => boolean): ISubscriptionDefinition<any>[];
+
+	publish(envelope: IEnvelope<any>): void;
+
+	reset(): void;
+
+	subscribe(options: {channel?: string, topic: string, callback: ICallback<any>}): ISubscriptionDefinition<any>;
+	unsubscribe(sub: ISubscriptionDefinition<any>): void;
+	unsubscribeFor(): void;
+	unsubscribeFor(options: {channel?: string, topic?: string, context?: any}): void;
+
+	configuration: IConfiguration;
+}
+
+declare var postal: IPostal;
+
+declare module "postal" {
+	var postal: IPostal;
+	export = postal;
+}
+
diff --git a/postal/postal-0.8.9.d.ts b/postal/postal-0.8.9.d.ts
index de9b7b5682..5f4cfd62f2 100644
--- a/postal/postal-0.8.9.d.ts
+++ b/postal/postal-0.8.9.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Lokesh Peta <https://github.com/lokeshpeta/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../underscore/underscore.d.ts" />
-
 interface IConfiguration{
 	SYSTEM_CHANNEL: string;
 	DEFAULT_CHANNEL: string;
diff --git a/postal/postal-tests.ts b/postal/postal-tests.ts
index e83a3666a7..8823bc1ac7 100644
--- a/postal/postal-tests.ts
+++ b/postal/postal-tests.ts
@@ -1,5 +1,5 @@
 
-/// <reference path="postal.d.ts" />
+
 
 var channel = postal.channel("test");
 
diff --git a/postal/postal.d.ts b/postal/postal.d.ts
deleted file mode 100644
index d476c3710a..0000000000
--- a/postal/postal.d.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-// Type definitions for Postal v1.0.6
-// Project: https://github.com/postaljs/postal.js
-// Definitions by: Lokesh Peta <https://github.com/lokeshpeta/>, Paul Jolly <https://github.com/myitcv>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface IConfiguration {
-	SYSTEM_CHANNEL: string;
-	DEFAULT_CHANNEL: string;
-	resolver: IResolver;
-}
-
-interface IResolver {
-	compare(binding: string, topic: string, headerOptions: {}): boolean;
-	reset(): void;
-	purge(options?: {topic?: string, binding?: string, compact?: boolean}): void;
-}
-
-interface ICallback<T> {
-	(data: T, envelope: IEnvelope<T>): void
-}
-
-interface ISubscriptionDefinition<T> {
-	channel: string;
-	topic: string;
-	callback: ICallback<T>;
-
-	// after and before lack documentation
-
-	constraint(predicateFn: (data: T, envelope: IEnvelope<T>) => boolean): ISubscriptionDefinition<T>;
-	constraints(predicateFns: ((data: T, envelope: IEnvelope<T>) => boolean)[]): ISubscriptionDefinition<T>;
-	context(theContext: any): ISubscriptionDefinition<T>;
-	debounce(interval: number): ISubscriptionDefinition<T>;
-	defer(): ISubscriptionDefinition<T>;
-	delay(waitTime: number): ISubscriptionDefinition<T>;
-	disposeAfter(maxCalls: number): ISubscriptionDefinition<T>;
-	distinct(): ISubscriptionDefinition<T>;
-	distinctUntilChanged(): ISubscriptionDefinition<T>;
-	logError(): ISubscriptionDefinition<T>;
-	once(): ISubscriptionDefinition<T>;
-	throttle(interval: number): ISubscriptionDefinition<T>;
-	subscribe(callback: ICallback<T>): ISubscriptionDefinition<T>;
-	unsubscribe(): void;
-}
-
-interface IEnvelope<T> {
-	topic: string;
-	data?: T;
-
-	/*Uses DEFAULT_CHANNEL if no channel is provided*/
-	channel?: string;
-
-	timeStamp?: string;
-}
-
-
-interface IChannelDefinition<T> {
-	subscribe(topic: string, callback: ICallback<T>): ISubscriptionDefinition<T>;
-
-	publish(topic: string, data?: T): void;
-
-	channel: string;
-}
-
-interface ISourceArg {
-	topic: string;
-	channel?: string;
-}
-
-interface IDestinationArg {
-	topic: string | ((topic: string) => string);
-	channel?: string;
-}
-
-interface IPostal {
-	subscriptions: {};
-	wiretaps: ICallback<any>[];
-
-	addWireTap(callback: ICallback<any>): () => void;
-
-	channel<T>(name?: string): IChannelDefinition<T>;
-
-	getSubscribersFor(): ISubscriptionDefinition<any>[];
-	getSubscribersFor(options: {channel?: string, topic?: string, context?: any}): ISubscriptionDefinition<any>[];
-	getSubscribersFor(predicateFn: (sub: ISubscriptionDefinition<any>) => boolean): ISubscriptionDefinition<any>[];
-
-	linkChannels(source: ISourceArg | ISourceArg[], destination: IDestinationArg | IDestinationArg[]): void;
-
-	publish(envelope: IEnvelope<any>): void;
-
-	reset(): void;
-
-	subscribe(options: {channel?: string, topic: string, callback: ICallback<any>}): ISubscriptionDefinition<any>;
-	unsubscribe(sub: ISubscriptionDefinition<any>): void;
-	unsubscribeFor(): void;
-	unsubscribeFor(options: {channel?: string, topic?: string, context?: any}): void;
-
-	configuration: IConfiguration;
-}
-
-declare var postal: IPostal;
-
-declare module "postal" {
-	var postal: IPostal;
-	export = postal;
-}
-
diff --git a/postal/tsconfig.json b/postal/tsconfig.json
new file mode 100644
index 0000000000..2a4ce02743
--- /dev/null
+++ b/postal/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "postal-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/pouchDB/index.d.ts b/pouchDB/index.d.ts
new file mode 100644
index 0000000000..7640aedbb0
--- /dev/null
+++ b/pouchDB/index.d.ts
@@ -0,0 +1,232 @@
+// Type definitions for Pouch 0.1
+// Project: http://pouchdb.com
+// Definitions by: Bill Sears <https://github.com/MrBigDog2U/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface PouchError {
+	status: number;
+	error: string;
+	reason: string;
+}
+
+interface PouchApi {
+	type(): string;
+	id(): string;
+	close(callback: () => void): void;
+}
+
+interface PouchInfoResponse {
+	db_name: string;
+	doc_count: number;
+	update_seq: string;
+}
+
+interface PouchApi {
+	info(callback: (err: PouchError, res: PouchInfoResponse) => void): void;
+}
+
+interface PouchGetOptions {
+	rev?: string;
+	revs?: boolean;
+	revs_info?: boolean;
+	conflicts?: boolean;
+	attachments?: boolean;
+}
+
+interface PouchGetResponse {
+	_id: string;
+	_rev: string;
+	_attachments: any;
+}
+
+interface PouchAllDocsOptions {
+	startkey?: string;
+	endKey?: string;
+	descending?: boolean;
+	include_docs?: boolean;
+	conflicts?: boolean;
+}
+
+interface PouchAllDocsItem {
+	id: string;
+	key: string;
+	value: any;
+	doc: any;
+}
+
+interface PouchAllDocsResponse {
+	total_rows: number;
+	rows: PouchAllDocsItem[];
+}
+
+interface PouchApi {
+	//
+	// get == select by id
+	//
+	get(id: string, opts: PouchGetOptions, callback: (err: PouchError, res: PouchGetResponse) => void): void;
+	get(id: string, callback: (err: PouchError, res: PouchGetResponse) => void): void;
+	allDocs(opts: PouchAllDocsOptions, callback: (err: PouchError, res: PouchAllDocsResponse) => void): void;
+	allDocs(callback: (err: PouchError, res: PouchAllDocsResponse) => void): void;
+}
+
+interface PouchBulkDocsRequest {
+	docs: any[];
+}
+
+interface PouchUpdateOptions {
+	new_edits?: boolean;
+}
+
+interface PouchUpdateResponse {
+	ok: boolean;
+	id: string;
+	rev: string;
+}
+
+interface PouchApi {
+	bulkDocs(req: PouchBulkDocsRequest, opts: PouchUpdateOptions, callback: (err: PouchError, res: PouchUpdateResponse[]) => void): void;
+	bulkDocs(req: PouchBulkDocsRequest, callback: (err: PouchError, res: PouchUpdateResponse[]) => void): void;
+	//
+	// post == insert (doc does not contain an _id)
+	//
+	post(doc: any, opts: PouchUpdateOptions, callback: (err: PouchError, res: PouchUpdateResponse) => void): void;
+	post(doc: any, callback: (err: PouchError, res: PouchUpdateResponse) => void): void;
+	//
+	// put == update (doc DOES contain an _id)
+	//
+	put(doc: any, opts: PouchUpdateOptions, callback: (err: PouchError, res: PouchUpdateResponse) => void): void;
+	put(doc: any, callback: (err: PouchError, res: PouchUpdateResponse) => void): void;
+	//
+	// remove == delete
+	//
+	remove(doc: any, opts: PouchUpdateOptions, callback: (err: PouchError, res: PouchUpdateResponse) => void): void;
+	remove(doc: any, callback: (err: PouchError, res: PouchUpdateResponse) => void): void;
+}
+
+interface PouchFilter {
+	map: (doc: any) => void;
+	reduce?: (key: string, value: any) => any;
+}
+
+interface PouchQueryOptions {
+	complete?: any;
+	include_docs?: boolean;
+	error?: (err: PouchError) => void;
+	descending?: boolean;
+	reduce?: boolean;
+}
+
+interface PouchQueryResponse {
+	rows: any[];
+}
+
+interface PouchApi {
+	//
+	// query == select by other criteria
+	//
+	query(fun: string, opts: PouchQueryOptions, callback: (err: PouchError, res: PouchQueryResponse) => void): void;
+	query(fun: string, callback: (err: PouchError, res: PouchQueryResponse) => void): void;
+	query(fun: PouchFilter, opts: PouchQueryOptions, callback: (err: PouchError, res: PouchQueryResponse) => void): void;
+	query(fun: PouchFilter, callback: (err: PouchError, res: PouchQueryResponse) => void): void;
+}
+
+interface PouchAttachmentOptions {
+	decode?: boolean;
+}
+
+interface PouchApi {
+	getAttachment(id: string, opts: PouchAttachmentOptions, callback: (err: PouchError, res: any) => void): void;
+	getAttachment(id: string, callback: (err: PouchError, res: any) => void): void;
+	putAttachment(id: string, rev: string, doc: any, type: string, callback: (err: PouchError, res: PouchUpdateResponse) => void): void;
+	removeAttachment(id: string, rev: string, callback: (err: PouchError, res: PouchUpdateResponse) => void): void;
+}
+
+interface PouchCancellable {
+	cancel: () => void;
+}
+
+interface PouchChangesOptions {
+	onChange: (change: PouchChange) => void;
+	complete?: (err: PouchError, res: PouchChanges) => void;
+	seq?: number;
+	since?: number;
+	descending?: boolean;
+	filter?: PouchFilter;
+	continuous?: boolean;
+	include_docs?: boolean;
+	conflicts?: boolean;
+}
+
+interface PouchChange {
+	changes: any;
+	doc: PouchGetResponse;
+	id: string;
+	seq: number;
+}
+
+interface PouchChanges {
+	results: PouchChange[];
+}
+
+interface PouchApi {
+	changes(opts: PouchChangesOptions, callback: (err: PouchError, res: PouchChanges) => void): PouchCancellable;
+	changes(callback: (err: PouchError, res: PouchChanges) => void): PouchCancellable;
+}
+
+interface PouchRevsDiffOptions {
+}
+
+interface PouchReplicateOptions {
+	continuous?: boolean;
+	onChange?: (a: any) => void;
+	filter?: any;			// Can be either string or PouchFilter
+	complete?: (err: PouchError, res: PouchChanges) => void;
+}
+
+interface PouchReplicateResponse {
+	ok: boolean;
+	start_time: Date;
+	end_time: Date;
+	docs_read: number;
+	docs_written: number;
+}
+
+interface PouchReplicate {
+	from(url: string, opts: PouchReplicateOptions, callback: (err: PouchError, res: PouchReplicateResponse) => void): PouchCancellable;
+	from(url: string, callback: (err: PouchError, res: PouchReplicateResponse) => void): PouchCancellable;
+	to(dbName: string, opts: PouchReplicateOptions, callback: (err: PouchError, res: PouchReplicateResponse) => void): PouchCancellable;
+	to(dbName: string, callback: (err: PouchError, res: PouchReplicateResponse) => void): PouchCancellable;
+}
+
+interface PouchApi {
+	revsDiff(req: any, opts: PouchRevsDiffOptions, callback: (missing: any) => void): void;
+	revsDiff(req: any, callback: (missing: any) => void): void;
+	replicate: PouchReplicate;
+}
+
+interface PouchOptions {
+	name?: string;
+	adapter?: string;
+	skip_setup?: boolean;
+}
+
+interface PouchDB extends PouchApi {
+    new (name: string, opts: PouchOptions, callback: (err: PouchError, res: PouchDB) => void): PouchDB;
+    new (name: string, callback: (err: PouchError, res: PouchDB) => void): PouchDB;
+    new (name: string, opts: PouchOptions): PouchDB;
+    new (name: string): PouchDB;
+	destroy(name: string, callback: (err: PouchError) => void): void;
+}
+
+declare var PouchDB: PouchDB;
+
+// Support AMD require
+declare module 'pouchdb' {
+  export = PouchDB;
+}
+
+//
+// emit is the function that the PouchFilter.map function should call in order to add a particular item to
+// a filter view.
+//
+declare function emit(key: any, value: any): any;
diff --git a/pouchDB/pouch-tests.ts b/pouchDB/pouch-tests.ts
index 976a8b0e5f..dcbdd5c03b 100644
--- a/pouchDB/pouch-tests.ts
+++ b/pouchDB/pouch-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="pouch.d.ts" />
+
 
 window.alert = function (thing?: string) {    
     var div = document.createElement('div');
diff --git a/pouchDB/pouch-tests.ts.tscparams b/pouchDB/pouch-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/pouchDB/pouch-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/pouchDB/pouch.d.ts b/pouchDB/pouch.d.ts
deleted file mode 100644
index d3097a4099..0000000000
--- a/pouchDB/pouch.d.ts
+++ /dev/null
@@ -1,230 +0,0 @@
-// Type definitions for Pouch 0.1
-// Project: http://pouchdb.com
-// Definitions by: Bill Sears <https://github.com/MrBigDog2U/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface PouchError {
-	status: number;
-	error: string;
-	reason: string;
-}
-
-interface PouchApi {
-	type(): string;
-	id(): string;
-	close(callback: () => void): void;
-}
-
-interface PouchInfoResponse {
-	db_name: string;
-	doc_count: number;
-	update_seq: string;
-}
-
-interface PouchApi {
-	info(callback: (err: PouchError, res: PouchInfoResponse) => void): void;
-}
-
-interface PouchGetOptions {
-	rev?: string;
-	revs?: boolean;
-	revs_info?: boolean;
-	conflicts?: boolean;
-	attachments?: boolean;
-}
-
-interface PouchGetResponse {
-	_id: string;
-	_rev: string;
-	_attachments: any;
-}
-
-interface PouchAllDocsOptions {
-	startkey?: string;
-	endKey?: string;
-	descending?: boolean;
-	include_docs?: boolean;
-	conflicts?: boolean;
-}
-
-interface PouchAllDocsItem {
-	id: string;
-	key: string;
-	value: any;
-	doc: any;
-}
-
-interface PouchAllDocsResponse {
-	total_rows: number;
-	rows: PouchAllDocsItem[];
-}
-
-interface PouchApi {
-	//
-	// get == select by id
-	//
-	get(id: string, opts: PouchGetOptions, callback: (err: PouchError, res: PouchGetResponse) => void): void;
-	get(id: string, callback: (err: PouchError, res: PouchGetResponse) => void): void;
-	allDocs(opts: PouchAllDocsOptions, callback: (err: PouchError, res: PouchAllDocsResponse) => void): void;
-	allDocs(callback: (err: PouchError, res: PouchAllDocsResponse) => void): void;
-}
-
-interface PouchBulkDocsRequest {
-	docs: any[];
-}
-
-interface PouchUpdateOptions {
-	new_edits?: boolean;
-}
-
-interface PouchUpdateResponse {
-	ok: boolean;
-	id: string;
-	rev: string;
-}
-
-interface PouchApi {
-	bulkDocs(req: PouchBulkDocsRequest, opts: PouchUpdateOptions, callback: (err: PouchError, res: PouchUpdateResponse[]) => void): void;
-	bulkDocs(req: PouchBulkDocsRequest, callback: (err: PouchError, res: PouchUpdateResponse[]) => void): void;
-	//
-	// post == insert (doc does not contain an _id)
-	//
-	post(doc: any, opts: PouchUpdateOptions, callback: (err: PouchError, res: PouchUpdateResponse) => void): void;
-	post(doc: any, callback: (err: PouchError, res: PouchUpdateResponse) => void): void;
-	//
-	// put == update (doc DOES contain an _id)
-	//
-	put(doc: any, opts: PouchUpdateOptions, callback: (err: PouchError, res: PouchUpdateResponse) => void): void;
-	put(doc: any, callback: (err: PouchError, res: PouchUpdateResponse) => void): void;
-	//
-	// remove == delete
-	//
-	remove(doc: any, opts: PouchUpdateOptions, callback: (err: PouchError, res: PouchUpdateResponse) => void): void;
-	remove(doc: any, callback: (err: PouchError, res: PouchUpdateResponse) => void): void;
-}
-
-interface PouchFilter {
-	map: (doc: any) => void;
-	reduce?: (key: string, value: any) => any;
-}
-
-interface PouchQueryOptions {
-	complete?: any;
-	include_docs?: boolean;
-	error?: (err: PouchError) => void;
-	descending?: boolean;
-	reduce?: boolean;
-}
-
-interface PouchQueryResponse {
-	rows: any[];
-}
-
-interface PouchApi {
-	//
-	// query == select by other criteria
-	//
-	query(fun: string, opts: PouchQueryOptions, callback: (err: PouchError, res: PouchQueryResponse) => void): void;
-	query(fun: string, callback: (err: PouchError, res: PouchQueryResponse) => void): void;
-	query(fun: PouchFilter, opts: PouchQueryOptions, callback: (err: PouchError, res: PouchQueryResponse) => void): void;
-	query(fun: PouchFilter, callback: (err: PouchError, res: PouchQueryResponse) => void): void;
-}
-
-interface PouchAttachmentOptions {
-	decode?: boolean;
-}
-
-interface PouchApi {
-	getAttachment(id: string, opts: PouchAttachmentOptions, callback: (err: PouchError, res: any) => void): void;
-	getAttachment(id: string, callback: (err: PouchError, res: any) => void): void;
-	putAttachment(id: string, rev: string, doc: any, type: string, callback: (err: PouchError, res: PouchUpdateResponse) => void): void;
-	removeAttachment(id: string, rev: string, callback: (err: PouchError, res: PouchUpdateResponse) => void): void;
-}
-
-interface PouchCancellable {
-	cancel: () => void;
-}
-
-interface PouchChangesOptions {
-	onChange: (change: PouchChange) => void;
-	complete?: (err: PouchError, res: PouchChanges) => void;
-	seq?: number;
-	since?: number;
-	descending?: boolean;
-	filter?: PouchFilter;
-	continuous?: boolean;
-	include_docs?: boolean;
-	conflicts?: boolean;
-}
-
-interface PouchChange {
-	changes: any;
-	doc: PouchGetResponse;
-	id: string;
-	seq: number;
-}
-
-interface PouchChanges {
-	results: PouchChange[];
-}
-
-interface PouchApi {
-	changes(opts: PouchChangesOptions, callback: (err: PouchError, res: PouchChanges) => void): PouchCancellable;
-	changes(callback: (err: PouchError, res: PouchChanges) => void): PouchCancellable;
-}
-
-interface PouchRevsDiffOptions {
-}
-
-interface PouchReplicateOptions {
-	continuous?: boolean;
-	onChange?: (any) => void;
-	filter?: any;			// Can be either string or PouchFilter
-	complete?: (err: PouchError, res: PouchChanges) => void;
-}
-
-interface PouchReplicateResponse {
-	ok: boolean;
-	start_time: Date;
-	end_time: Date;
-	docs_read: number;
-	docs_written: number;
-}
-
-interface PouchReplicate {
-	from(url: string, opts: PouchReplicateOptions, callback: (err: PouchError, res: PouchReplicateResponse) => void): PouchCancellable;
-	from(url: string, callback: (err: PouchError, res: PouchReplicateResponse) => void): PouchCancellable;
-	to(dbName: string, opts: PouchReplicateOptions, callback: (err: PouchError, res: PouchReplicateResponse) => void): PouchCancellable;
-	to(dbName: string, callback: (err: PouchError, res: PouchReplicateResponse) => void): PouchCancellable;
-}
-
-interface PouchApi {
-	revsDiff(req: any, opts: PouchRevsDiffOptions, callback: (missing: any) => void): void;
-	revsDiff(req: any, callback: (missing: any) => void): void;
-	replicate: PouchReplicate;
-}
-
-interface PouchOptions {
-	name?: string;
-	adapter?: string;
-}
-
-interface PouchDB extends PouchApi {
-    new (name: string, opts: PouchOptions, callback: (err: PouchError, res: PouchDB) => void): PouchDB;
-    new (name: string, callback: (err: PouchError, res: PouchDB) => void): PouchDB;
-    new (name: string): PouchDB;
-	destroy(name: string, callback: (err: PouchError) => void): void;
-}
-
-declare var PouchDB: PouchDB;
-
-// Support AMD require
-declare module 'pouchdb' {
-  export = PouchDB;
-}
-
-//
-// emit is the function that the PouchFilter.map function should call in order to add a particular item to
-// a filter view.
-//
-declare function emit(key: any, value: any);
diff --git a/pouchDB/pouch.d.ts.tscparams b/pouchDB/pouch.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/pouchDB/pouch.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/pouchDB/tsconfig.json b/pouchDB/tsconfig.json
new file mode 100644
index 0000000000..6df5498011
--- /dev/null
+++ b/pouchDB/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pouch-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/power-assert-formatter/power-assert-formatter.d.ts b/power-assert-formatter/index.d.ts
similarity index 100%
rename from power-assert-formatter/power-assert-formatter.d.ts
rename to power-assert-formatter/index.d.ts
diff --git a/power-assert-formatter/power-assert-formatter-tests.ts b/power-assert-formatter/power-assert-formatter-tests.ts
index cd5a2680d9..1ab49f3a96 100644
--- a/power-assert-formatter/power-assert-formatter-tests.ts
+++ b/power-assert-formatter/power-assert-formatter-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./power-assert-formatter.d.ts" />
+
 
 powerAssertFormatter();
 
diff --git a/power-assert-formatter/tsconfig.json b/power-assert-formatter/tsconfig.json
new file mode 100644
index 0000000000..0b707fc6f1
--- /dev/null
+++ b/power-assert-formatter/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "power-assert-formatter-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/power-assert/index.d.ts b/power-assert/index.d.ts
new file mode 100644
index 0000000000..dc636b2d6f
--- /dev/null
+++ b/power-assert/index.d.ts
@@ -0,0 +1,69 @@
+// Type definitions for power-assert
+// Project: https://github.com/twada/power-assert
+// Definitions by: vvakame <https://github.com/vvakame>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// copy from assert external module in node.d.ts
+
+/// <reference types="empower" />
+/// <reference types="power-assert-formatter" />
+
+export = assert;
+export as namespace assert;
+
+declare function assert(value:any, message?:string):void;
+declare namespace assert {
+    export class AssertionError implements Error {
+        name:string;
+        message:string;
+        actual:any;
+        expected:any;
+        operator:string;
+        generatedMessage:boolean;
+
+        constructor(options?:{message?: string; actual?: any; expected?: any; operator?: string; stackStartFunction?: Function});
+    }
+
+    export function fail(actual?:any, expected?:any, message?:string, operator?:string):void;
+
+    export function ok(value:any, message?:string):void;
+
+    export function equal(actual:any, expected:any, message?:string):void;
+
+    export function notEqual(actual:any, expected:any, message?:string):void;
+
+    export function deepEqual(actual:any, expected:any, message?:string):void;
+
+    export function notDeepEqual(acutal:any, expected:any, message?:string):void;
+
+    export function strictEqual(actual:any, expected:any, message?:string):void;
+
+    export function notStrictEqual(actual:any, expected:any, message?:string):void;
+
+    export function deepStrictEqual(actual:any, expected:any, message?:string):void;
+
+    export function notDeepStrictEqual(actual:any, expected:any, message?:string):void;
+
+    export var throws:{
+        (block:Function, message?:string): void;
+        (block:Function, error:Function, message?:string): void;
+        (block:Function, error:RegExp, message?:string): void;
+        (block:Function, error:(err:any) => boolean, message?:string): void;
+    };
+
+    export var doesNotThrow:{
+        (block:Function, message?:string): void;
+        (block:Function, error:Function, message?:string): void;
+        (block:Function, error:RegExp, message?:string): void;
+        (block:Function, error:(err:any) => boolean, message?:string): void;
+    };
+
+    export function ifError(value:any):void;
+
+    export interface Options {
+        assertion?: empower.Options;
+        output?: powerAssertFormatter.Options;
+    }
+
+    export function customize(options:Options):typeof assert;
+}
diff --git a/power-assert/power-assert-tests.ts b/power-assert/power-assert-tests.ts
index 465e73afc0..0ec099b32c 100644
--- a/power-assert/power-assert-tests.ts
+++ b/power-assert/power-assert-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./power-assert.d.ts" />
+
 
 import assert = require("power-assert");
 
@@ -19,7 +19,7 @@ assert.throws(() => {
 }, undefined, "DODGED IT");
 
 assert.doesNotThrow(() => {
-    if (false) {
+    if (!!false) {
         throw "a hammer at your face";
     }
 }, undefined, "What the...*crunch*");
@@ -44,7 +44,7 @@ customizedAssert1.throws(() => {
 }, undefined, "DODGED IT");
 
 customizedAssert1.doesNotThrow(() => {
-    if (false) {
+    if (!!false) {
         throw "a hammer at your face";
     }
 }, undefined, "What the...*crunch*");
diff --git a/power-assert/power-assert.d.ts b/power-assert/power-assert.d.ts
deleted file mode 100644
index 66c4740eae..0000000000
--- a/power-assert/power-assert.d.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-// Type definitions for power-assert
-// Project: https://github.com/twada/power-assert
-// Definitions by: vvakame <https://github.com/vvakame>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// copy from assert external module in node.d.ts
-
-/// <reference path="../empower/empower.d.ts" />
-/// <reference path="../power-assert-formatter/power-assert-formatter.d.ts" />
-
-declare function assert(value:any, message?:string):void;
-declare namespace assert {
-    export class AssertionError implements Error {
-        name:string;
-        message:string;
-        actual:any;
-        expected:any;
-        operator:string;
-        generatedMessage:boolean;
-
-        constructor(options?:{message?: string; actual?: any; expected?: any; operator?: string; stackStartFunction?: Function});
-    }
-
-    export function fail(actual?:any, expected?:any, message?:string, operator?:string):void;
-
-    export function ok(value:any, message?:string):void;
-
-    export function equal(actual:any, expected:any, message?:string):void;
-
-    export function notEqual(actual:any, expected:any, message?:string):void;
-
-    export function deepEqual(actual:any, expected:any, message?:string):void;
-
-    export function notDeepEqual(acutal:any, expected:any, message?:string):void;
-
-    export function strictEqual(actual:any, expected:any, message?:string):void;
-
-    export function notStrictEqual(actual:any, expected:any, message?:string):void;
-
-    export function deepStrictEqual(actual:any, expected:any, message?:string):void;
-
-    export function notDeepStrictEqual(actual:any, expected:any, message?:string):void;
-
-    export var throws:{
-        (block:Function, message?:string): void;
-        (block:Function, error:Function, message?:string): void;
-        (block:Function, error:RegExp, message?:string): void;
-        (block:Function, error:(err:any) => boolean, message?:string): void;
-    };
-
-    export var doesNotThrow:{
-        (block:Function, message?:string): void;
-        (block:Function, error:Function, message?:string): void;
-        (block:Function, error:RegExp, message?:string): void;
-        (block:Function, error:(err:any) => boolean, message?:string): void;
-    };
-
-    export function ifError(value:any):void;
-
-    export interface Options {
-        assertion?: empower.Options;
-        output?: powerAssertFormatter.Options;
-    }
-
-    export function customize(options:Options):typeof assert;
-}
-
-declare module "power-assert" {
-    export = assert;
-}
diff --git a/power-assert/tsconfig.json b/power-assert/tsconfig.json
new file mode 100644
index 0000000000..b8c59bffe2
--- /dev/null
+++ b/power-assert/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "power-assert-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/precise/index.d.ts b/precise/index.d.ts
new file mode 100644
index 0000000000..80d443aad1
--- /dev/null
+++ b/precise/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for precise
+// Project: https://www.npmjs.org/package/precise
+// Definitions by: Peter Harris <https://github.com/codeanimal>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/**
+ * Precise factory
+ */
+declare function _precise(): _precise.Precise;
+
+declare module _precise {
+    class Precise {
+        constructor();
+
+        /**
+         * Starts a timer
+         */
+        start(): Precise;
+
+        /**
+         * Stops a timer
+         */
+        stop(): Precise;
+
+        /**
+         * Returns the nanoseconds from `start()` to `stop()`
+         */
+        diff(): number;
+    }
+}
+
+export = _precise;
diff --git a/precise/precise-tests.ts b/precise/precise-tests.ts
index 029a69a3ea..1e6da8608f 100644
--- a/precise/precise-tests.ts
+++ b/precise/precise-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="precise.d.ts" />
 
 import precise = require("precise");
 
diff --git a/precise/precise.d.ts b/precise/precise.d.ts
deleted file mode 100644
index 19428a201d..0000000000
--- a/precise/precise.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// Type definitions for precise
-// Project: https://www.npmjs.org/package/precise
-// Definitions by: Peter Harris <https://github.com/codeanimal>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "precise" {
-  /**
-   * Precise factory
-   */
-  function _precise(): _precise.Precise;
-
-  module _precise {
-    class Precise {
-      constructor();
-
-      /**
-       * Starts a timer
-       */
-      start(): Precise;
-
-      /**
-       * Stops a timer
-       */
-      stop(): Precise;
-
-      /**
-       * Returns the nanoseconds from `start()` to `stop()`
-       */
-      diff(): number;
-    }
-  }
-
-  export = _precise;
-}
diff --git a/precise/tsconfig.json b/precise/tsconfig.json
new file mode 100644
index 0000000000..c635a7986e
--- /dev/null
+++ b/precise/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "precise-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/precond/index.d.ts b/precond/index.d.ts
new file mode 100644
index 0000000000..de0bfb3d21
--- /dev/null
+++ b/precond/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for precond 0.2.3
+// Project: https://github.com/MathieuTurcotte/node-precond
+// Definitions by: Oliver Schneider <https://github.com/olsio>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export declare function checkArgument(value: any, message?: string, ...formatArgs: any[]): void;
+export declare function checkState(value: any, message?: string, ...formatArgs: any[]): void;
+export declare function checkIsDef(value: any, message?: string, ...formatArgs: any[]): any;
+export declare function checkIsDefAndNotNull(value: any, message?: string, ...formatArgs: any[]): any;
+export declare function checkIsString(value: any, message?: string, ...formatArgs: any[]): any;
+export declare function checkIsArray(value: any, message?: string, ...formatArgs: any[]): any;
+export declare function checkIsNumber(value: any, message?: string, ...formatArgs: any[]): any;
+export declare function checkIsBoolean(value: any, message?: string, ...formatArgs: any[]): any;
+export declare function checkIsFunction(value: any, message?: string, ...formatArgs: any[]): any;
+export declare function checkIsObject(value: any, message?: string, ...formatArgs: any[]): any;
diff --git a/precond/precond-tests.ts b/precond/precond-tests.ts
index dc843e99f4..f7212d4bda 100644
--- a/precond/precond-tests.ts
+++ b/precond/precond-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./precond.d.ts" />
 
 import precond = require('precond');
 
diff --git a/precond/precond.d.ts b/precond/precond.d.ts
deleted file mode 100644
index 27a190482d..0000000000
--- a/precond/precond.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for precond 0.2.3
-// Project: https://github.com/MathieuTurcotte/node-precond
-// Definitions by: Oliver Schneider <https://github.com/olsio>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "precond" {
-    export function checkArgument(value: any, message?: string, ...formatArgs: any[]): void;
-    export function checkState(value: any, message?: string, ...formatArgs: any[]): void;
-    export function checkIsDef(value: any, message?: string, ...formatArgs: any[]): any;
-    export function checkIsDefAndNotNull(value: any, message?: string, ...formatArgs: any[]): any;
-    export function checkIsString(value: any, message?: string, ...formatArgs: any[]): any;
-    export function checkIsArray(value: any, message?: string, ...formatArgs: any[]): any;
-    export function checkIsNumber(value: any, message?: string, ...formatArgs: any[]): any;
-    export function checkIsBoolean(value: any, message?: string, ...formatArgs: any[]): any;
-    export function checkIsFunction(value: any, message?: string, ...formatArgs: any[]): any;
-    export function checkIsObject(value: any, message?: string, ...formatArgs: any[]): any;
-}
\ No newline at end of file
diff --git a/precond/tsconfig.json b/precond/tsconfig.json
new file mode 100644
index 0000000000..6f7ee22aeb
--- /dev/null
+++ b/precond/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "precond-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/preloadjs/index.d.ts b/preloadjs/index.d.ts
new file mode 100644
index 0000000000..bc9f434506
--- /dev/null
+++ b/preloadjs/index.d.ts
@@ -0,0 +1,286 @@
+// Type definitions for PreloadJS 0.6.0
+// Project: http://www.createjs.com/#!/PreloadJS
+// Definitions by: Pedro Ferreira <https://bitbucket.org/drk4>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*
+    Copyright (c) 2012 Pedro Ferreira
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+// Library documentation : http://www.createjs.com/Docs/PreloadJS/modules/PreloadJS.html
+
+/// <reference types="createjs-lib" />
+
+declare namespace createjs {
+    export class AbstractLoader extends EventDispatcher {
+        // properties
+        static BINARY: string;
+        canceled: boolean;
+        static CSS: string;
+        GET: string;
+        static IMAGE: string;
+        static JAVASCRIPT: string;
+        static JSON: string;
+        static JSONP: string;
+        loaded: boolean;
+        static MANIFEST: string;
+        POST: string;
+        progress: number;
+        resultFormatter: () => any;
+        static SOUND: string;
+        static SPRITESHEET: string;
+        static SVG: string;
+        static TEXT: string;
+        type: string;
+        static VIDEO: string;
+        static XML: string;
+
+        // methods
+        cancel(): void;
+        destroy(): void;
+        getItem(value?: string): Object;
+        getLoadedItems(): Object[];
+        getResult(value?: any, rawResult?: boolean): Object;
+        getTag(): Object;
+        load(): void;
+        setTag(tag: Object): void;
+        toString(): string;
+    }
+
+    export class AbstractMediaLoader
+        {
+        constructor(loadItem: Object, preferXHR: boolean, type: string);
+        }
+
+    export class AbstractRequest
+        {
+        constructor(item: LoadItem);
+
+        cancel(): void;
+        destroy(): void;
+        load(): void;
+        }
+
+    export class BinaryLoader
+        {
+        constructor(loadItem: Object);
+
+        // methods
+        static canLoadItem(item: Object): boolean;
+        }
+
+    export class CSSLoader
+        {
+        constructor(loadItem: Object, preferXHR: boolean);
+
+        // methods
+        canLoadItem(item: Object): boolean;
+        }
+
+    export module DataUtils
+        {
+        export function parseJSON(value: string): Object;
+        export function parseXML(text: string, type: string): XMLDocument;
+        }
+
+    export class ErrorEvent
+        {
+        constructor(title?: string, message?: string, data?: Object);
+
+        // properties
+        data: Object;
+        message: string;
+        title: string;
+        }
+
+    export class ImageLoader
+        {
+        constructor(loadItem: Object, preferXHR: boolean);
+
+        static canLoadItem(item: Object): boolean;
+        }
+
+    export class JavaScriptLoader
+        {
+        constructor(loadItem: Object, preferXHR: boolean);
+
+        static canLoadItem(item: Object): boolean;
+        }
+
+    export class JSONLoader
+        {
+        constructor(loadItem: Object);
+
+        static canLoadItem(item: Object): boolean;
+        }
+
+    export class JSONPLoader
+        {
+        constructor(loadItem: Object);
+
+        static canLoadItem(item: Object): boolean;
+        }
+
+    export class LoadItem
+        {
+        // properties
+        callback: string;
+        crossOrigin: boolean;
+        data: Object;
+        headers: Object;
+        id: string;
+        loadTimeout: number;
+        maintainOrder: boolean;
+        method: string;
+        mimeType: string;
+        src: string;
+        type: string;
+        values: Object;
+        withCredentials: boolean;
+
+        // methods
+        static create(value: LoadItem | string | Object): Object | LoadItem;
+        set(props: Object): LoadItem;
+        }
+
+    export class LoadQueue extends AbstractLoader
+        {
+        constructor(preferXHR?: boolean, basePath?: string, crossOrigin?: string | boolean);
+
+        // properties
+        maintainScriptOrder: boolean;
+        next: LoadQueue;
+        stopOnError: boolean;
+
+        // methods
+        close(): void;
+        getItems(loaded: boolean): Object[];
+        installPlugin(plugin: () => any): void;
+        loadFile(file: Object | string, loadNow?: boolean, basePath?: string): void;
+        loadManifest(manifest: Object | string | any[], loadNow?: boolean, basePath?: string): void;
+        registerLoader(loader: AbstractLoader): void;
+        remove(idsOrUrls: string | any[]): void;
+        removeAll(): void;
+        reset(): void;
+        setMaxConnections(value: number): void;
+        setPaused(value: boolean): void;
+        setPreferXHR(value: boolean): boolean;
+        /**
+         * @deprecated - use 'preferXHR' property instead (or setUseXHR())
+         */
+        setUseXHR(value: boolean): void;
+        unregisterLoader(loader: AbstractLoader): void;
+    }
+
+    export class ManifestLoader
+        {
+        constructor(loadItem: LoadItem | Object);
+
+        // methods
+        static canLoadItem(item: LoadItem | Object): boolean;
+        }
+
+    export class MediaTagRequest
+        {
+        constructor(loadItem: LoadItem, tag: HTMLAudioElement | HTMLVideoElement, srcAttribute: string);
+        }
+
+    export class PreloadJS
+        {
+        static buildDate: string;
+        static version: string;
+        }
+
+    export class ProgressEvent
+        {
+        constructor(loaded: number, total?: number);
+
+        // properties
+        loaded: number;
+        progress: number;
+        total: number;
+
+        // methods
+        clone(): ProgressEvent;
+        }
+
+    export class RequestUtils
+        {
+        // properties
+        static ABSOLUTE_PATH: RegExp;
+        static EXTENSION_PATT: RegExp;
+        static RELATIVE_PATH: RegExp;
+
+        // methods
+        static buildPath(src: string, data?: Object): string;
+        static formatQueryString(data: Object, query?: Object[]): string;
+        static getTypeByExtension(extension: string): string;
+        static isAudioTag(item: Object): boolean;
+        static isBinary(type: string): boolean;
+        static isCrossDomain(item: Object): boolean;
+        static isImageTag(item: Object): boolean;
+        static isLocal(item: Object): boolean;
+        static isText(type: string): boolean;
+        static isVideoTag(item: Object): boolean;
+        static parseURI(path: string): Object;
+        }
+
+    export class SoundLoader
+        {
+        constructor(loadItem: Object, preferXHR: boolean);
+
+        static canLoadItem(item: Object): boolean;
+        }
+
+    export class SpriteSheetLoader
+        {
+        constructor(loadItem: Object);
+
+        static canLoadItem(item: Object): boolean;
+        }
+
+    export class SVGLoader
+        {
+        constructor(loadItem: Object, preferXHR: boolean);
+
+        static canLoadItem(item: Object): boolean;
+        }
+
+    export class TagRequest
+        {
+
+        }
+
+    export class TextLoader
+        {
+        constructor(loadItem: Object);
+
+        static canLoadItem(item: Object): boolean;
+        }
+
+    export class VideoLoader
+        {
+        constructor(loadItem: Object, preferXHR: boolean);
+
+        static canLoadItem(item: Object): boolean;
+        }
+
+    export class XHRRequest extends AbstractLoader
+        {
+        constructor(item: Object);
+
+        // methods
+        getAllResponseHeaders(): string;
+        getResponseHeader(header: string): string;
+        }
+
+    export class XMLLoader
+        {
+        constructor(loadItem: Object);
+
+        static canLoadItem(item: Object): boolean;
+        }
+}
diff --git a/preloadjs/preloadjs.d.ts b/preloadjs/preloadjs.d.ts
deleted file mode 100644
index 1585842356..0000000000
--- a/preloadjs/preloadjs.d.ts
+++ /dev/null
@@ -1,286 +0,0 @@
-// Type definitions for PreloadJS 0.6.0
-// Project: http://www.createjs.com/#!/PreloadJS
-// Definitions by: Pedro Ferreira <https://bitbucket.org/drk4>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/*
-    Copyright (c) 2012 Pedro Ferreira
-    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-// Library documentation : http://www.createjs.com/Docs/PreloadJS/modules/PreloadJS.html
-
-/// <reference path="../createjs-lib/createjs-lib.d.ts" />
-
-declare namespace createjs {
-    export class AbstractLoader extends EventDispatcher {
-        // properties
-        static BINARY: string;
-        canceled: boolean;
-        static CSS: string;
-        GET: string;
-        static IMAGE: string;
-        static JAVASCRIPT: string;
-        static JSON: string;
-        static JSONP: string;
-        loaded: boolean;
-        static MANIFEST: string;
-        POST: string;
-        progress: number;
-        resultFormatter: () => any;
-        static SOUND: string;
-        static SPRITESHEET: string;
-        static SVG: string;
-        static TEXT: string;
-        type: string;
-        static VIDEO: string;
-        static XML: string;
-
-        // methods
-        cancel(): void;
-        destroy(): void;
-        getItem(value?: string): Object;
-        getLoadedItems(): Object[];
-        getResult(value?: any, rawResult?: boolean): Object;
-        getTag(): Object;
-        load(): void;
-        setTag(tag: Object): void;
-        toString(): string;
-    }
-
-    export class AbstractMediaLoader
-        {
-        constructor(loadItem: Object, preferXHR: boolean, type: string);
-        }
-
-    export class AbstractRequest
-        {
-        constructor(item: LoadItem);
-
-        cancel(): void;
-        destroy(): void;
-        load(): void;
-        }
-
-    export class BinaryLoader
-        {
-        constructor(loadItem: Object);
-
-        // methods
-        static canLoadItem(item: Object): boolean;
-        }
-
-    export class CSSLoader
-        {
-        constructor(loadItem: Object, preferXHR: boolean);
-
-        // methods
-        canLoadItem(item: Object): boolean;
-        }
-
-    export module DataUtils
-        {
-        export function parseJSON(value: string): Object;
-        export function parseXML(text: string, type: string): XMLDocument;
-        }
-
-    export class ErrorEvent
-        {
-        constructor(title?: string, message?: string, data?: Object);
-
-        // properties
-        data: Object;
-        message: string;
-        title: string;
-        }
-
-    export class ImageLoader
-        {
-        constructor(loadItem: Object, preferXHR: boolean);
-
-        static canLoadItem(item: Object): boolean;
-        }
-
-    export class JavaScriptLoader
-        {
-        constructor(loadItem: Object, preferXHR: boolean);
-
-        static canLoadItem(item: Object): boolean;
-        }
-
-    export class JSONLoader
-        {
-        constructor(loadItem: Object);
-
-        static canLoadItem(item: Object): boolean;
-        }
-
-    export class JSONPLoader
-        {
-        constructor(loadItem: Object);
-
-        static canLoadItem(item: Object): boolean;
-        }
-
-    export class LoadItem
-        {
-        // properties
-        callback: string;
-        crossOrigin: boolean;
-        data: Object;
-        headers: Object;
-        id: string;
-        loadTimeout: number;
-        maintainOrder: boolean;
-        method: string;
-        mimeType: string;
-        src: string;
-        type: string;
-        values: Object;
-        withCredentials: boolean;
-
-        // methods
-        static create(value: LoadItem | string | Object): Object | LoadItem;
-        set(props: Object): LoadItem;
-        }
-
-    export class LoadQueue extends AbstractLoader
-        {
-        constructor(preferXHR?: boolean, basePath?: string, crossOrigin?: string | boolean);
-
-        // properties
-        maintainScriptOrder: boolean;
-        next: LoadQueue;
-        stopOnError: boolean;
-
-        // methods
-        close(): void;
-        getItems(loaded: boolean): Object[];
-        installPlugin(plugin: () => any): void;
-        loadFile(file: Object | string, loadNow?: boolean, basePath?: string): void;
-        loadManifest(manifest: Object | string | any[], loadNow?: boolean, basePath?: string): void;
-        registerLoader(loader: AbstractLoader): void;
-        remove(idsOrUrls: string | any[]): void;
-        removeAll(): void;
-        reset(): void;
-        setMaxConnections(value: number): void;
-        setPaused(value: boolean): void;
-        setPreferXHR(value: boolean): boolean;
-        /**
-         * @deprecated - use 'preferXHR' property instead (or setUseXHR())
-         */
-        setUseXHR(value: boolean): void;
-        unregisterLoader(loader: AbstractLoader): void;
-    }
-
-    export class ManifestLoader
-        {
-        constructor(loadItem: LoadItem | Object);
-
-        // methods
-        static canLoadItem(item: LoadItem | Object): boolean;
-        }
-
-    export class MediaTagRequest
-        {
-        constructor(loadItem: LoadItem, tag: HTMLAudioElement | HTMLVideoElement, srcAttribute: string);
-        }
-
-    export class PreloadJS
-        {
-        static buildDate: string;
-        static version: string;
-        }
-
-    export class ProgressEvent
-        {
-        constructor(loaded: number, total?: number);
-
-        // properties
-        loaded: number;
-        progress: number;
-        total: number;
-
-        // methods
-        clone(): ProgressEvent;
-        }
-
-    export class RequestUtils
-        {
-        // properties
-        static ABSOLUTE_PATH: RegExp;
-        static EXTENSION_PATT: RegExp;
-        static RELATIVE_PATH: RegExp;
-
-        // methods
-        static buildPath(src: string, data?: Object): string;
-        static formatQueryString(data: Object, query?: Object[]): string;
-        static getTypeByExtension(extension: string): string;
-        static isAudioTag(item: Object): boolean;
-        static isBinary(type: string): boolean;
-        static isCrossDomain(item: Object): boolean;
-        static isImageTag(item: Object): boolean;
-        static isLocal(item: Object): boolean;
-        static isText(type: string): boolean;
-        static isVideoTag(item: Object): boolean;
-        static parseURI(path: string): Object;
-        }
-
-    export class SoundLoader
-        {
-        constructor(loadItem: Object, preferXHR: boolean);
-
-        static canLoadItem(item: Object): boolean;
-        }
-
-    export class SpriteSheetLoader
-        {
-        constructor(loadItem: Object);
-
-        static canLoadItem(item: Object): boolean;
-        }
-
-    export class SVGLoader
-        {
-        constructor(loadItem: Object, preferXHR: boolean);
-
-        static canLoadItem(item: Object): boolean;
-        }
-
-    export class TagRequest
-        {
-
-        }
-
-    export class TextLoader
-        {
-        constructor(loadItem: Object);
-
-        static canLoadItem(item: Object): boolean;
-        }
-
-    export class VideoLoader
-        {
-        constructor(loadItem: Object, preferXHR: boolean);
-
-        static canLoadItem(item: Object): boolean;
-        }
-
-    export class XHRRequest extends AbstractLoader
-        {
-        constructor(item: Object);
-
-        // methods
-        getAllResponseHeaders(): string;
-        getResponseHeader(header: string): string;
-        }
-
-    export class XMLLoader
-        {
-        constructor(loadItem: Object);
-
-        static canLoadItem(item: Object): boolean;
-        }
-}
diff --git a/preloadjs/tsconfig.json b/preloadjs/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/preloadjs/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/prelude-ls/index.d.ts b/prelude-ls/index.d.ts
new file mode 100644
index 0000000000..bfa85c9bfa
--- /dev/null
+++ b/prelude-ls/index.d.ts
@@ -0,0 +1,339 @@
+// Type definitions for prelude.ls 1.1.1
+// Project: http://www.preludels.com
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Change [0]: 2015/06/14 - Marcelo Camargo <https://github.com/haskellcamargo>
+
+
+declare namespace PreludeLS {
+    export function id<A>(x: A): A;
+    export function isType<A>(type: string): (x: A) => boolean;
+    export function isType<A>(type: string, x: A): boolean;
+    export function replicate<A>(n: number): (x: A) => A[];
+    export function replicate<A>(n: number, x: A): A[];
+
+
+    // List
+
+    export function each<A>(f: (x: A) => void): (xs: A[]) => A[];
+    export function each<A>(f: (x: A) => void, xs: A[]): A[];
+    export function map<A, B>(f: (x: A) => B): (xs: A[]) => B[];
+    export function map<A, B>(f: (x: A) => B, xs: A[]): B[];
+    export function compact<A>(xs: A[]): A[];
+    export function filter<A>(f: (x: A) => boolean): (xs: A[]) => A[];
+    export function filter<A>(f: (x: A) => boolean, xs: A[]): A[];
+    export function reject<A>(f: (x: A) => boolean): (xs: A[]) => A[];
+    export function reject<A>(f: (x: A) => boolean, xs: A[]): A[];
+    export function partition<A>(f: (x: A) => Boolean): (xs: A[]) => [A[], A[]];
+    export function partition<A>(f: (x: A) => Boolean, xs: A[]): [A[], A[]];
+    export function find<A>(f: (x: A) => Boolean): (xs: A[]) => A;
+    export function find<A>(f: (x: A) => Boolean, xs: A[]): A;
+    export function head<A>(xs: A[]): A;
+    export function tail<A>(xs: A[]): A[];
+    export function last<A>(xs: A[]): A;
+    export function initial<A>(xs: A[]): A[];
+    export function empty<A>(xs: A[]): boolean;
+    export function reverse<A>(xs: A[]): A[];
+    export function unique<A>(xs: A[]): A[];
+    export function uniqueBy<A, B>(f: (x: A) => B): (xs: A[]) => A[];
+    export function uniqueBy<A, B>(f: (x: A) => B, xs: A[]): A[];
+    export function fold<A, B>(f: (x: A) => (y: B) => A): (memo: A) => (xs: B[]) => A;
+    export function fold<A, B>(f: (x: A) => (y: B) => A, memo: A): (xs: B[]) => A;
+    export function fold<A, B>(f: (x: A) => (y: B) => A, memo: A, xs: B[]): A;
+    export function foldl<A, B>(f: (x: A) => (y: B) => A): (memo: A) => (xs: B[]) => A;
+    export function foldl<A, B>(f: (x: A) => (y: B) => A, memo: A): (xs: B[]) => A;
+    export function foldl<A, B>(f: (x: A) => (y: B) => A, memo: A, xs: B[]): A;
+    export function fold1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A;
+    export function fold1<A>(f: (x: A) => (y: A) => A, xs: A[]): A;
+    export function foldl1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A;
+    export function foldl1<A>(f: (x: A) => (y: A) => A, xs: A[]): A;
+    export function foldr<A, B>(f: (x: A) => (y: B) => B): (memo: B) => (xs: A[]) => B;
+    export function foldr<A, B>(f: (x: A) => (y: B) => B, memo: B): (xs: A[]) => B;
+    export function foldr<A, B>(f: (x: A) => (y: B) => B, memo: B, xs: A[]): B;
+    export function foldr1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A;
+    export function foldr1<A>(f: (x: A) => (y: A) => A, xs: A[]): A;
+    export function unfoldr<A, B>(f: (x: B) => ([A, B] | void)): (x: B) => A[];
+    export function unfoldr<A, B>(f: (x: B) => ([A, B] | void), x: B): A[];
+    export function concat<A>(xss: A[][]): A[];
+    export function concatMap<A, B>(f: (x: A) => B[]): (xs: A[]) => B[];
+    export function concatMap<A, B>(f: (x: A) => B[], xs: A[]): B[];
+    export function flatten(xs: any[]): any[];
+    export function difference<A>(...xss: A[][]): A[];
+    export function intersection<A>(...xss: A[][]): A[];
+    export function union<A>(...xss: A[][]): A[];
+    export function countBy<A, B>(f: (x: A) => B): (xs: A[]) => any;
+    export function countBy<A, B>(f: (x: A) => B, xs: A[]): any;
+    export function groupBy<A, B>(f: (x: A) => B): (xs: A[]) => any;
+    export function groupBy<A, B>(f: (x: A) => B, xs: A[]): any;
+    export function andList<A>(xs: A[]): boolean;
+    export function orList<A>(xs: A[]): boolean;
+    export function any<A>(f: (x: A) => boolean): (xs: A[]) => boolean;
+    export function any<A>(f: (x: A) => boolean, xs: A[]): boolean;
+    export function all<A>(f: (x: A) => boolean): (xs: A[]) => boolean;
+    export function all<A>(f: (x: A) => boolean, xs: A[]): boolean;
+    export function sort<A>(xs: A[]): A[];
+    export function sortWith<A>(f: (x: A) => (y: A) => number): (xs: A[]) => A[];
+    export function sortWith<A>(f: (x: A) => (y: A) => number, xs: A[]): A[];
+    export function sortBy<A, B>(f: (x: A) => B): (xs: A[]) => A[];
+    export function sortBy<A, B>(f: (x: A) => B, xs: A[]): A[];
+    export function sum(xs: number[]): number;
+    export function product(xs: number[]): number;
+    export function mean(xs: number[]): number;
+    export function maximum<A>(xs: A[]): A;
+    export function minimum<A>(xs: A[]): A;
+    export function maximumBy<A, B>(f: (x: A) => B): (xs: A[]) => A;
+    export function maximumBy<A, B>(f: (x: A) => B, xs: A[]): A;
+    export function minimumBy<A, B>(f: (x: A) => B): (xs: A[]) => A;
+    export function minimumBy<A, B>(f: (x: A) => B, xs: A[]): A;
+    export function scan<A, B>(f: (x: A) => (y: B) => A): (memo: A) => (xs: B[]) => A[];
+    export function scan<A, B>(f: (x: A) => (y: B) => A, memo: A): (xs: B[]) => A[];
+    export function scan<A, B>(f: (x: A) => (y: B) => A, memo: A, xs: B[]): A[];
+    export function scanl<A, B>(f: (x: A) => (y: B) => A): (memo: A) => (xs: B[]) => A[];
+    export function scanl<A, B>(f: (x: A) => (y: B) => A, memo: A): (xs: B[]) => A[];
+    export function scanl<A, B>(f: (x: A) => (y: B) => A, memo: A, xs: B[]): A[];
+    export function scan1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A[];
+    export function scan1<A>(f: (x: A) => (y: A) => A, xs: A[]): A[];
+    export function scanl1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A[];
+    export function scanl1<A>(f: (x: A) => (y: A) => A, xs: A[]): A[];
+    export function scanr<A, B>(f: (x: A) => (y: B) => B): (memo: B) => (xs: A[]) => B[];
+    export function scanr<A, B>(f: (x: A) => (y: B) => B, memo: B): (xs: A[]) => B[];
+    export function scanr<A, B>(f: (x: A) => (y: B) => B, memo: B, xs: A[]): B[];
+    export function scanr1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A[];
+    export function scanr1<A>(f: (x: A) => (y: A) => A, xs: A[]): A[];
+    export function slice<A>(x: number): (y: number) => (xs: A[]) => A[];
+    export function slice<A>(x: number, y: number): (xs: A[]) => A[];
+    export function slice<A>(x: number, y: number, xs: A[]): A[];
+    export function take<A>(n: number): (xs: A[]) => A[];
+    export function take<A>(n: number, xs: A[]): A[];
+    export function drop<A>(n: number): (xs: A[]) => A[];
+    export function drop<A>(n: number, xs: A[]): A[];
+    export function splitAt<A>(n: number): (xs: A[]) => [A[], A[]];
+    export function splitAt<A>(n: number, xs: A[]): [A[], A[]];
+    export function takeWhile<A>(p: (x: A) => boolean): (xs: A[]) => A[];
+    export function takeWhile<A>(p: (x: A) => boolean, xs: A[]): A[];
+    export function dropWhile<A>(p: (x: A) => boolean): (xs: A[]) => A[];
+    export function dropWhile<A>(p: (x: A) => boolean, xs: A[]): A[];
+    export function span<A>(p: (x: A) => boolean): (xs: A[]) => [A[], A[]];
+    export function span<A>(p: (x: A) => boolean, xs: A[]): [A[], A[]];
+    export function breakList<A>(p: (x: A) => boolean): (xs: A[]) => [A[], A[]];
+    export function breakList<A>(p: (x: A) => boolean, xs: A[]): [A[], A[]];
+    export function zip<A, B>(xs: A[]): (ys: B[]) => [A, B][];
+    export function zip<A, B>(xs: A[], ys: B[]): [A, B][];
+    export function zipWith<A, B, C>(f: (x: A) => (y: B) => C): (xs: A[]) => (ys: B[]) => C[];
+    export function zipWith<A, B, C>(f: (x: A) => (y: B) => C, xs: A[]): (ys: B[]) => C[];
+    export function zipWith<A, B, C>(f: (x: A) => (y: B) => C, xs: A[], ys: B[]): C[];
+    export function zipAll<A>(...xss: A[][]): A[][];
+    export function zipAllWith<A, B>(f: (...xs: A[]) => B, ...xss: A[][]): B[];
+    export function at<A>(n: number): (xs: A[]) => A;
+    export function at<A>(n: number, xs: A[]): A;
+    export function elemIndex<A>(x: A): (xs: A[]) => number;
+    export function elemIndex<A>(x: A, xs: A[]): number;
+    export function elemIndices<A>(x: A): (xs: A[]) => number[];
+    export function elemIndices<A>(x: A, xs: A[]): number[];
+    export function findIndex<A>(f: (x: A) => boolean): (xs: A[]) => number;
+    export function findIndex<A>(f: (x: A) => boolean, xs: A[]): number;
+    export function findIndices<A>(f: (x: A) => boolean): (xs: A[]) => number[];
+    export function findIndices<A>(f: (x: A) => boolean, xs: A[]): number[];
+
+
+    // Obj
+
+    export function keys<A>(object: { [key: string]: A }): string[];
+    export function keys<A>(object: { [key: number]: A }): number[];
+    export function values<A>(object: { [key: string]: A }): A[];
+    export function values<A>(object: { [key: number]: A }): A[];
+    export function pairsToObj<A>(object: [string, A][]): { [key: string]: A };
+    export function pairsToObj<A>(object: [number, A][]): { [key: number]: A };
+    export function objToPairs<A>(object: { [key: string]: A }): [string, A][];
+    export function objToPairs<A>(object: { [key: number]: A }): [number, A][];
+    export function listsToObj<A>(keys: string[]): (values: A[]) => { [key: string]: A };
+    export function listsToObj<A>(keys: string[], values: A[]): { [key: string]: A };
+    export function listsToObj<A>(keys: number[]): (values: A[]) => { [key: number]: A };
+    export function listsToObj<A>(keys: number[], values: A[]): { [key: number]: A };
+    export function objToLists<A>(object: { [key: string]: A }): [string[], A[]];
+    export function objToLists<A>(object: { [key: number]: A }): [number[], A[]];
+    export function empty<A>(object: any): boolean;
+    export function each<A>(f: (x: A) => void): (object: { [key: string]: A }) => { [key: string]: A };
+    export function each<A>(f: (x: A) => void, object: { [key: string]: A }): { [key: string]: A };
+    export function each<A>(f: (x: A) => void): (object: { [key: number]: A }) => { [key: number]: A };
+    export function each<A>(f: (x: A) => void, object: { [key: number]: A }): { [key: number]: A };
+    export function map<A, B>(f: (x: A) => B): (object: { [key: string]: A }) => { [key: string]: B };
+    export function map<A, B>(f: (x: A) => B, object: { [key: string]: A }): { [key: string]: B };
+    export function map<A, B>(f: (x: A) => B): (object: { [key: number]: A }) => { [key: number]: B };
+    export function map<A, B>(f: (x: A) => B, object: { [key: number]: A }): { [key: number]: B };
+    export function compact<A>(object: { [key: string]: A }): { [key: string]: A };
+    export function compact<A>(object: { [key: number]: A }): { [key: number]: A };
+    export function filter<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => { [key: string]: A };
+    export function filter<A>(f: (x: A) => boolean, object: { [key: string]: A }): { [key: string]: A };
+    export function filter<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => { [key: number]: A };
+    export function filter<A>(f: (x: A) => boolean, object: { [key: number]: A }): { [key: number]: A };
+    export function reject<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => { [key: string]: A };
+    export function reject<A>(f: (x: A) => boolean, object: { [key: string]: A }): { [key: string]: A };
+    export function reject<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => { [key: number]: A };
+    export function reject<A>(f: (x: A) => boolean, object: { [key: number]: A }): { [key: number]: A };
+    export function partition<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => [{ [key: string]: A }, { [key: string]: A }];
+    export function partition<A>(f: (x: A) => boolean, object: { [key: string]: A }): [{ [key: string]: A }, { [key: string]: A }];
+    export function partition<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => [{ [key: number]: A }, { [key: number]: A }];
+    export function partition<A>(f: (x: A) => boolean, object: { [key: number]: A }): [{ [key: number]: A }, { [key: number]: A }];
+    export function find<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => A;
+    export function find<A>(f: (x: A) => boolean, object: { [key: string]: A }): A;
+    export function find<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => A;
+    export function find<A>(f: (x: A) => boolean, object: { [key: number]: A }): A;
+
+    export module Obj {
+        export function empty<A>(object: any): boolean;
+        export function each<A>(f: (x: A) => void): (object: { [key: string]: A }) => { [key: string]: A };
+        export function each<A>(f: (x: A) => void, object: { [key: string]: A }): { [key: string]: A };
+        export function each<A>(f: (x: A) => void): (object: { [key: number]: A }) => { [key: number]: A };
+        export function each<A>(f: (x: A) => void, object: { [key: number]: A }): { [key: number]: A };
+        export function map<A, B>(f: (x: A) => B): (object: { [key: string]: A }) => { [key: string]: B };
+        export function map<A, B>(f: (x: A) => B, object: { [key: string]: A }): { [key: string]: B };
+        export function map<A, B>(f: (x: A) => B): (object: { [key: number]: A }) => { [key: number]: B };
+        export function map<A, B>(f: (x: A) => B, object: { [key: number]: A }): { [key: number]: B };
+        export function compact<A>(object: { [key: string]: A }): { [key: string]: A };
+        export function compact<A>(object: { [key: number]: A }): { [key: number]: A };
+        export function filter<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => { [key: string]: A };
+        export function filter<A>(f: (x: A) => boolean, object: { [key: string]: A }): { [key: string]: A };
+        export function filter<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => { [key: number]: A };
+        export function filter<A>(f: (x: A) => boolean, object: { [key: number]: A }): { [key: number]: A };
+        export function reject<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => { [key: string]: A };
+        export function reject<A>(f: (x: A) => boolean, object: { [key: string]: A }): { [key: string]: A };
+        export function reject<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => { [key: number]: A };
+        export function reject<A>(f: (x: A) => boolean, object: { [key: number]: A }): { [key: number]: A };
+        export function partition<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => [{ [key: string]: A }, { [key: string]: A }];
+        export function partition<A>(f: (x: A) => boolean, object: { [key: string]: A }): [{ [key: string]: A }, { [key: string]: A }];
+        export function partition<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => [{ [key: number]: A }, { [key: number]: A }];
+        export function partition<A>(f: (x: A) => boolean, object: { [key: number]: A }): [{ [key: number]: A }, { [key: number]: A }];
+        export function find<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => A;
+        export function find<A>(f: (x: A) => boolean, object: { [key: string]: A }): A;
+        export function find<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => A;
+        export function find<A>(f: (x: A) => boolean, object: { [key: number]: A }): A;
+    }
+
+
+    // Str
+
+    export function split(separator: string): (str: string) => string[];
+    export function split(separator: string, str: string): string[];
+    export function join(separator: string): (xs: string[]) => string;
+    export function join(separator: string, xs: string[]): string;
+    export function lines(str: string): string[];
+    export function unlines(xs: string[]): string;
+    export function words(str: string): string[];
+    export function unwords(xs: string[]): string;
+    export function chars(str: string): string[];
+    export function unchars(xs: string[]): string;
+    export function repeat(n: number): (str: string) => string;
+    export function repeat(n: number, str: string): string;
+    export function capitalize(str: string): string;
+    export function camelize(str: string): string;
+    export function dasherize(str: string): string;
+    export function empty(str: string): boolean;
+    export function reverse(str: string): string;
+    export function slice(x: number): (y: number) => (str: string) => string;
+    export function slice(x: number, y: number): (str: string) => string;
+    export function slice(x: number, y: number, str: string): string;
+    export function take(n: number): (str: string) => string;
+    export function take(n: number, str: string): string;
+    export function drop(n: number): (str: string) => string;
+    export function drop(n: number, str: string): string;
+    export function splitAt(n: number): (str: string) => [string, string];
+    export function splitAt(n: number, str: string): [string, string];
+    export function takeWhile(f: (str: string) => boolean): (str: string) => string;
+    export function takeWhile(f: (str: string) => boolean, str: string): string;
+    export function dropWhile(f: (str: string) => boolean): (str: string) => string;
+    export function dropWhile(f: (str: string) => boolean, str: string): string;
+    export function span(f: (str: string) => boolean): (str: string) => [string, string];
+    export function span(f: (str: string) => boolean, str: string): [string, string];
+    export function breakStr(f: (str: string) => boolean): (str: string) => [string, string];
+    export function breakStr(f: (str: string) => boolean, str: string): [string, string];
+
+    export module Str {
+        export function empty(str: string): boolean;
+        export function reverse(str: string): string;
+        export function slice(x: number): (y: number) => (str: string) => string;
+        export function slice(x: number, y: number): (str: string) => string;
+        export function slice(x: number, y: number, str: string): string;
+        export function take(n: number): (str: string) => string;
+        export function take(n: number, str: string): string;
+        export function drop(n: number): (str: string) => string;
+        export function drop(n: number, str: string): string;
+        export function splitAt(n: number): (str: string) => [string, string];
+        export function splitAt(n: number, str: string): [string, string];
+        export function takeWhile(f: (str: string) => boolean): (str: string) => string;
+        export function takeWhile(f: (str: string) => boolean, str: string): string;
+        export function dropWhile(f: (str: string) => boolean): (str: string) => string;
+        export function dropWhile(f: (str: string) => boolean, str: string): string;
+        export function span(f: (str: string) => boolean): (str: string) => [string, string];
+        export function span(f: (str: string) => boolean, str: string): [string, string];
+        export function breakStr(f: (str: string) => boolean): (str: string) => [string, string];
+        export function breakStr(f: (str: string) => boolean, str: string): [string, string];
+    }
+
+
+    // Func
+
+    export function apply<A, B>(f: (...args: A[]) => B): (args: A[]) => B;
+    export function apply<A, B>(f: (...args: A[]) => B, args: A[]): B;
+    export function curry(f: Function): Function;
+    export function flip<A, B, C>(f: (x: A) => (y: B) => C): (y: B) => (x: A) => C;
+    export function flip<A, B, C>(f: (x: A) => (y: B) => C, y: B): (x: A) => C;
+    export function flip<A, B, C>(f: (x: A) => (y: B) => C, y: B, x: A): C;
+    export function fix(f: Function): Function;
+    export function over<A, B, C>(f: (x: B) => (y: B) => C): (g: (x: A) => B) => (x: A) => (y: A) => C;
+    export function over<A, B, C>(f: (x: B, y: B) => C): (g: (x: A) => B) => (x: A, y: A) => C;
+    export function over<A, B, C>(f: (x: B) => (y: B) => C, g: (x: A) => B): (x: A) => (y: A) => C;
+    export function over<A, B, C>(f: (x: B, y: B) => C, g: (x: A) => B): (x: A, y: A) => C;
+    export function over<A, B, C>(f: (x: B) => (y: B) => C, g: (x: A) => B, x: A): (y: A) => C;
+    export function over<A, B, C>(f: (x: B, y: B) => C, g: (x: A) => B, x: A): (y: A) => C;
+    export function over<A, B, C>(f: (x: B) => (y: B) => C, g: (x: A) => B, x: A, y: A): C;
+    export function over<A, B, C>(f: (x: B, y: B) => C, g: (x: A) => B, x: A, y: A): C;
+
+
+    // Num
+
+    export function max<Comparable>(x: Comparable): (y: Comparable) => Comparable;
+    export function max<Comparable>(x: Comparable, y: Comparable): Comparable;
+    export function min<Comparable>(x: Comparable): (y: Comparable) => Comparable;
+    export function min<Comparable>(x: Comparable, y: Comparable): Comparable;
+    export function negate(x: number): number;
+    export function abs(x: number): number;
+    export function signum(x: number): number;
+    export function quot(x: number): (y: number) => number;
+    export function quot(x: number, y: number): number;
+    export function rem(x: number): (y: number) => number;
+    export function rem(x: number, y: number): number;
+    export function div(x: number): (y: number) => number;
+    export function div(x: number, y: number): number;
+    export function mod(x: number): (y: number) => number;
+    export function mod(x: number, y: number): number;
+    export function recip(x: number): number;
+    export var pi: number;
+    export var tau: number;
+    export function exp(x: number): number;
+    export function sqrt(x: number): number;
+    export function ln(x: number): number;
+    export function pow(x: number): (y: number) => number;
+    export function pow(x: number, y: number): number;
+    export function sin(x: number): number;
+    export function cos(x: number): number;
+    export function tan(x: number): number;
+    export function asin(x: number): number;
+    export function acos(x: number): number;
+    export function atan(x: number): number;
+    export function atan2(x: number, y: number): number;
+    export function truncate(x: number): number;
+    export function round(x: number): number;
+    export function ceiling(x: number): number;
+    export function floor(x: number): number;
+    export function isItNaN(x: number): boolean;
+    export function even(x: number): boolean;
+    export function odd(x: number): boolean;
+    export function gcd(x: number): (y: number) => number;
+    export function gcd(x: number, y: number): number;
+    export function lcm(x: number): (y: number) => number;
+    export function lcm(x: number, y: number): number;
+}
+
+export = PreludeLS;
diff --git a/prelude-ls/prelude-ls-tests.ts b/prelude-ls/prelude-ls-tests.ts
index dc36e9913b..7074d6c70c 100644
--- a/prelude-ls/prelude-ls-tests.ts
+++ b/prelude-ls/prelude-ls-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./prelude-ls.d.ts" />
 
 import prelude = require("prelude-ls");
 
diff --git a/prelude-ls/prelude-ls.d.ts b/prelude-ls/prelude-ls.d.ts
deleted file mode 100644
index 66efe916f7..0000000000
--- a/prelude-ls/prelude-ls.d.ts
+++ /dev/null
@@ -1,340 +0,0 @@
-// Type definitions for prelude.ls 1.1.1
-// Project: http://www.preludels.com
-// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Change [0]: 2015/06/14 - Marcelo Camargo <https://github.com/haskellcamargo>
-
-declare module "prelude-ls" {
-	namespace PreludeLS {
-		export function id<A>(x: A): A;
-		export function isType<A>(type: string): (x: A) => boolean;
-		export function isType<A>(type: string, x: A): boolean;
-		export function replicate<A>(n: number): (x: A) => A[];
-		export function replicate<A>(n: number, x: A): A[];
-
-
-		// List
-
-		export function each<A>(f: (x: A) => void): (xs: A[]) => A[];
-		export function each<A>(f: (x: A) => void, xs: A[]): A[];
-		export function map<A, B>(f: (x: A) => B): (xs: A[]) => B[];
-		export function map<A, B>(f: (x: A) => B, xs: A[]): B[];
-		export function compact<A>(xs: A[]): A[];
-		export function filter<A>(f: (x: A) => boolean): (xs: A[]) => A[];
-		export function filter<A>(f: (x: A) => boolean, xs: A[]): A[];
-		export function reject<A>(f: (x: A) => boolean): (xs: A[]) => A[];
-		export function reject<A>(f: (x: A) => boolean, xs: A[]): A[];
-		export function partition<A>(f: (x: A) => Boolean): (xs: A[]) => [A[], A[]];
-		export function partition<A>(f: (x: A) => Boolean, xs: A[]): [A[], A[]];
-		export function find<A>(f: (x: A) => Boolean): (xs: A[]) => A;
-		export function find<A>(f: (x: A) => Boolean, xs: A[]): A;
-		export function head<A>(xs: A[]): A;
-		export function tail<A>(xs: A[]): A[];
-		export function last<A>(xs: A[]): A;
-		export function initial<A>(xs: A[]): A[];
-		export function empty<A>(xs: A[]): boolean;
-		export function reverse<A>(xs: A[]): A[];
-		export function unique<A>(xs: A[]): A[];
-		export function uniqueBy<A, B>(f: (x: A) => B): (xs: A[]) => A[];
-		export function uniqueBy<A, B>(f: (x: A) => B, xs: A[]): A[];
-		export function fold<A, B>(f: (x: A) => (y: B) => A): (memo: A) => (xs: B[]) => A;
-		export function fold<A, B>(f: (x: A) => (y: B) => A, memo: A): (xs: B[]) => A;
-		export function fold<A, B>(f: (x: A) => (y: B) => A, memo: A, xs: B[]): A;
-		export function foldl<A, B>(f: (x: A) => (y: B) => A): (memo: A) => (xs: B[]) => A;
-		export function foldl<A, B>(f: (x: A) => (y: B) => A, memo: A): (xs: B[]) => A;
-		export function foldl<A, B>(f: (x: A) => (y: B) => A, memo: A, xs: B[]): A;
-		export function fold1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A;
-		export function fold1<A>(f: (x: A) => (y: A) => A, xs: A[]): A;
-		export function foldl1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A;
-		export function foldl1<A>(f: (x: A) => (y: A) => A, xs: A[]): A;
-		export function foldr<A, B>(f: (x: A) => (y: B) => B): (memo: B) => (xs: A[]) => B;
-		export function foldr<A, B>(f: (x: A) => (y: B) => B, memo: B): (xs: A[]) => B;
-		export function foldr<A, B>(f: (x: A) => (y: B) => B, memo: B, xs: A[]): B;
-		export function foldr1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A;
-		export function foldr1<A>(f: (x: A) => (y: A) => A, xs: A[]): A;
-		export function unfoldr<A, B>(f: (x: B) => ([A, B] | void)): (x: B) => A[];
-		export function unfoldr<A, B>(f: (x: B) => ([A, B] | void), x: B): A[];
-		export function concat<A>(xss: A[][]): A[];
-		export function concatMap<A, B>(f: (x: A) => B[]): (xs: A[]) => B[];
-		export function concatMap<A, B>(f: (x: A) => B[], xs: A[]): B[];
-		export function flatten(xs: any[]): any[];
-		export function difference<A>(...xss: A[][]): A[];
-		export function intersection<A>(...xss: A[][]): A[];
-		export function union<A>(...xss: A[][]): A[];
-		export function countBy<A, B>(f: (x: A) => B): (xs: A[]) => any;
-		export function countBy<A, B>(f: (x: A) => B, xs: A[]): any;
-		export function groupBy<A, B>(f: (x: A) => B): (xs: A[]) => any;
-		export function groupBy<A, B>(f: (x: A) => B, xs: A[]): any;
-		export function andList<A>(xs: A[]): boolean;
-		export function orList<A>(xs: A[]): boolean;
-		export function any<A>(f: (x: A) => boolean): (xs: A[]) => boolean;
-		export function any<A>(f: (x: A) => boolean, xs: A[]): boolean;
-		export function all<A>(f: (x: A) => boolean): (xs: A[]) => boolean;
-		export function all<A>(f: (x: A) => boolean, xs: A[]): boolean;
-		export function sort<A>(xs: A[]): A[];
-		export function sortWith<A>(f: (x: A) => (y: A) => number): (xs: A[]) => A[];
-		export function sortWith<A>(f: (x: A) => (y: A) => number, xs: A[]): A[];
-		export function sortBy<A, B>(f: (x: A) => B): (xs: A[]) => A[];
-		export function sortBy<A, B>(f: (x: A) => B, xs: A[]): A[];
-		export function sum(xs: number[]): number;
-		export function product(xs: number[]): number;
-		export function mean(xs: number[]): number;
-		export function maximum<A>(xs: A[]): A;
-		export function minimum<A>(xs: A[]): A;
-		export function maximumBy<A, B>(f: (x: A) => B): (xs: A[]) => A;
-		export function maximumBy<A, B>(f: (x: A) => B, xs: A[]): A;
-		export function minimumBy<A, B>(f: (x: A) => B): (xs: A[]) => A;
-		export function minimumBy<A, B>(f: (x: A) => B, xs: A[]): A;
-		export function scan<A, B>(f: (x: A) => (y: B) => A): (memo: A) => (xs: B[]) => A[];
-		export function scan<A, B>(f: (x: A) => (y: B) => A, memo: A): (xs: B[]) => A[];
-		export function scan<A, B>(f: (x: A) => (y: B) => A, memo: A, xs: B[]): A[];
-		export function scanl<A, B>(f: (x: A) => (y: B) => A): (memo: A) => (xs: B[]) => A[];
-		export function scanl<A, B>(f: (x: A) => (y: B) => A, memo: A): (xs: B[]) => A[];
-		export function scanl<A, B>(f: (x: A) => (y: B) => A, memo: A, xs: B[]): A[];
-		export function scan1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A[];
-		export function scan1<A>(f: (x: A) => (y: A) => A, xs: A[]): A[];
-		export function scanl1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A[];
-		export function scanl1<A>(f: (x: A) => (y: A) => A, xs: A[]): A[];
-		export function scanr<A, B>(f: (x: A) => (y: B) => B): (memo: B) => (xs: A[]) => B[];
-		export function scanr<A, B>(f: (x: A) => (y: B) => B, memo: B): (xs: A[]) => B[];
-		export function scanr<A, B>(f: (x: A) => (y: B) => B, memo: B, xs: A[]): B[];
-		export function scanr1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A[];
-		export function scanr1<A>(f: (x: A) => (y: A) => A, xs: A[]): A[];
-		export function slice<A>(x: number): (y: number) => (xs: A[]) => A[];
-		export function slice<A>(x: number, y: number): (xs: A[]) => A[];
-		export function slice<A>(x: number, y: number, xs: A[]): A[];
-		export function take<A>(n: number): (xs: A[]) => A[];
-		export function take<A>(n: number, xs: A[]): A[];
-		export function drop<A>(n: number): (xs: A[]) => A[];
-		export function drop<A>(n: number, xs: A[]): A[];
-		export function splitAt<A>(n: number): (xs: A[]) => [A[], A[]];
-		export function splitAt<A>(n: number, xs: A[]): [A[], A[]];
-		export function takeWhile<A>(p: (x: A) => boolean): (xs: A[]) => A[];
-		export function takeWhile<A>(p: (x: A) => boolean, xs: A[]): A[];
-		export function dropWhile<A>(p: (x: A) => boolean): (xs: A[]) => A[];
-		export function dropWhile<A>(p: (x: A) => boolean, xs: A[]): A[];
-		export function span<A>(p: (x: A) => boolean): (xs: A[]) => [A[], A[]];
-		export function span<A>(p: (x: A) => boolean, xs: A[]): [A[], A[]];
-		export function breakList<A>(p: (x: A) => boolean): (xs: A[]) => [A[], A[]];
-		export function breakList<A>(p: (x: A) => boolean, xs: A[]): [A[], A[]];
-		export function zip<A, B>(xs: A[]): (ys: B[]) => [A, B][];
-		export function zip<A, B>(xs: A[], ys: B[]): [A, B][];
-		export function zipWith<A, B, C>(f: (x: A) => (y: B) => C): (xs: A[]) => (ys: B[]) => C[];
-		export function zipWith<A, B, C>(f: (x: A) => (y: B) => C, xs: A[]): (ys: B[]) => C[];
-		export function zipWith<A, B, C>(f: (x: A) => (y: B) => C, xs: A[], ys: B[]): C[];
-		export function zipAll<A>(...xss: A[][]): A[][];
-		export function zipAllWith<A, B>(f: (...xs: A[]) => B, ...xss: A[][]): B[];
-		export function at<A>(n: number): (xs: A[]) => A;
-		export function at<A>(n: number, xs: A[]): A;
-		export function elemIndex<A>(x: A): (xs: A[]) => number;
-		export function elemIndex<A>(x: A, xs: A[]): number;
-		export function elemIndices<A>(x: A): (xs: A[]) => number[];
-		export function elemIndices<A>(x: A, xs: A[]): number[];
-		export function findIndex<A>(f: (x: A) => boolean): (xs: A[]) => number;
-		export function findIndex<A>(f: (x: A) => boolean, xs: A[]): number;
-		export function findIndices<A>(f: (x: A) => boolean): (xs: A[]) => number[];
-		export function findIndices<A>(f: (x: A) => boolean, xs: A[]): number[];
-
-
-		// Obj
-
-		export function keys<A>(object: { [key: string]: A }): string[];
-		export function keys<A>(object: { [key: number]: A }): number[];
-		export function values<A>(object: { [key: string]: A }): A[];
-		export function values<A>(object: { [key: number]: A }): A[];
-		export function pairsToObj<A>(object: [string, A][]): { [key: string]: A };
-		export function pairsToObj<A>(object: [number, A][]): { [key: number]: A };
-		export function objToPairs<A>(object: { [ key: string]: A }): [string, A][];
-		export function objToPairs<A>(object: { [ key: number]: A }): [number, A][];
-		export function listsToObj<A>(keys: string[]): (values: A[]) => { [key: string]: A };
-		export function listsToObj<A>(keys: string[], values: A[]): { [key: string]: A };
-		export function listsToObj<A>(keys: number[]): (values: A[]) => { [key: number]: A };
-		export function listsToObj<A>(keys: number[], values: A[]): { [key: number]: A };
-		export function objToLists<A>(object: { [key: string]: A }): [string[], A[]];
-		export function objToLists<A>(object: { [key: number]: A }): [number[], A[]];
-		export function empty<A>(object: any): boolean;
-		export function each<A>(f: (x: A) => void): (object: { [key: string]: A }) => { [key: string]: A };
-		export function each<A>(f: (x: A) => void, object: { [key: string]: A }): { [key: string]: A };
-		export function each<A>(f: (x: A) => void): (object: { [key: number]: A }) => { [key: number]: A };
-		export function each<A>(f: (x: A) => void, object: { [key: number]: A }): { [key: number]: A };
-		export function map<A, B>(f: (x: A) => B): (object: { [key: string]: A }) => { [key: string]: B };
-		export function map<A, B>(f: (x: A) => B, object: { [key: string]: A }): { [key: string]: B };
-		export function map<A, B>(f: (x: A) => B): (object: { [key: number]: A }) => { [key: number]: B };
-		export function map<A, B>(f: (x: A) => B, object: { [key: number]: A }): { [key: number]: B };
-		export function compact<A>(object: { [key: string]: A }): { [key: string]: A };
-		export function compact<A>(object: { [key: number]: A }): { [key: number]: A };
-		export function filter<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => { [key: string]: A };
-		export function filter<A>(f: (x: A) => boolean, object: { [key: string]: A }): { [key: string]: A };
-		export function filter<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => { [key: number]: A };
-		export function filter<A>(f: (x: A) => boolean, object: { [key: number]: A }): { [key: number]: A };
-		export function reject<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => { [key: string]: A };
-		export function reject<A>(f: (x: A) => boolean, object: { [key: string]: A }): { [key: string]: A };
-		export function reject<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => { [key: number]: A };
-		export function reject<A>(f: (x: A) => boolean, object: { [key: number]: A }): { [key: number]: A };
-		export function partition<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => [{ [key: string]: A }, { [key: string]: A}];
-		export function partition<A>(f: (x: A) => boolean, object: { [key: string]: A }): [{ [key: string]: A }, { [key: string]: A}];
-		export function partition<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => [{ [key: number]: A }, { [key: number]: A}];
-		export function partition<A>(f: (x: A) => boolean, object: { [key: number]: A }): [{ [key: number]: A }, { [key: number]: A}];
-		export function find<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => A;
-		export function find<A>(f: (x: A) => boolean, object: { [key: string]: A }): A;
-		export function find<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => A;
-		export function find<A>(f: (x: A) => boolean, object: { [key: number]: A }): A;
-
-		export module Obj {
-			export function empty<A>(object: any): boolean;
-			export function each<A>(f: (x: A) => void): (object: { [key: string]: A }) => { [key: string]: A };
-			export function each<A>(f: (x: A) => void, object: { [key: string]: A }): { [key: string]: A };
-			export function each<A>(f: (x: A) => void): (object: { [key: number]: A }) => { [key: number]: A };
-			export function each<A>(f: (x: A) => void, object: { [key: number]: A }): { [key: number]: A };
-			export function map<A, B>(f: (x: A) => B): (object: { [key: string]: A }) => { [key: string]: B };
-			export function map<A, B>(f: (x: A) => B, object: { [key: string]: A }): { [key: string]: B };
-			export function map<A, B>(f: (x: A) => B): (object: { [key: number]: A }) => { [key: number]: B };
-			export function map<A, B>(f: (x: A) => B, object: { [key: number]: A }): { [key: number]: B };
-			export function compact<A>(object: { [key: string]: A }): { [key: string]: A };
-			export function compact<A>(object: { [key: number]: A }): { [key: number]: A };
-			export function filter<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => { [key: string]: A };
-			export function filter<A>(f: (x: A) => boolean, object: { [key: string]: A }): { [key: string]: A };
-			export function filter<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => { [key: number]: A };
-			export function filter<A>(f: (x: A) => boolean, object: { [key: number]: A }): { [key: number]: A };
-			export function reject<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => { [key: string]: A };
-			export function reject<A>(f: (x: A) => boolean, object: { [key: string]: A }): { [key: string]: A };
-			export function reject<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => { [key: number]: A };
-			export function reject<A>(f: (x: A) => boolean, object: { [key: number]: A }): { [key: number]: A };
-			export function partition<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => [{ [key: string]: A }, { [key: string]: A}];
-			export function partition<A>(f: (x: A) => boolean, object: { [key: string]: A }): [{ [key: string]: A }, { [key: string]: A}];
-			export function partition<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => [{ [key: number]: A }, { [key: number]: A}];
-			export function partition<A>(f: (x: A) => boolean, object: { [key: number]: A }): [{ [key: number]: A }, { [key: number]: A}];
-			export function find<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => A;
-			export function find<A>(f: (x: A) => boolean, object: { [key: string]: A }): A;
-			export function find<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => A;
-			export function find<A>(f: (x: A) => boolean, object: { [key: number]: A }): A;
-		}
-
-
-		// Str
-
-		export function split(separator: string): (str: string) => string[];
-		export function split(separator: string, str: string): string[];
-		export function join(separator: string): (xs: string[]) => string;
-		export function join(separator: string, xs: string[]): string;
-		export function lines(str: string): string[];
-		export function unlines(xs: string[]): string;
-		export function words(str: string): string[];
-		export function unwords(xs: string[]): string;
-		export function chars(str: string): string[];
-		export function unchars(xs: string[]): string;
-		export function repeat(n: number): (str: string) => string;
-		export function repeat(n: number, str: string): string;
-		export function capitalize(str: string): string;
-		export function camelize(str: string): string;
-		export function dasherize(str: string): string;
-		export function empty(str: string): boolean;
-		export function reverse(str: string): string;
-		export function slice(x: number): (y: number) => (str: string) => string;
-		export function slice(x: number, y: number): (str: string) => string;
-		export function slice(x: number, y: number, str: string): string;
-		export function take(n: number): (str: string) => string;
-		export function take(n: number, str: string): string;
-		export function drop(n: number): (str: string) => string;
-		export function drop(n: number, str: string): string;
-		export function splitAt(n: number): (str: string) => [string, string];
-		export function splitAt(n: number, str: string): [string, string];
-		export function takeWhile(f: (str: string) => boolean): (str: string) => string;
-		export function takeWhile(f: (str: string) => boolean, str: string): string;
-		export function dropWhile(f: (str: string) => boolean): (str: string) => string;
-		export function dropWhile(f: (str: string) => boolean, str: string): string;
-		export function span(f: (str: string) => boolean): (str: string) => [string, string];
-		export function span(f: (str: string) => boolean, str: string): [string, string];
-		export function breakStr(f: (str: string) => boolean): (str: string) => [string, string];
-		export function breakStr(f: (str: string) => boolean, str: string): [string, string];
-
-		export module Str {
-			export function empty(str: string): boolean;
-			export function reverse(str: string): string;
-			export function slice(x: number): (y: number) => (str: string) => string;
-			export function slice(x: number, y: number): (str: string) => string;
-			export function slice(x: number, y: number, str: string): string;
-			export function take(n: number): (str: string) => string;
-			export function take(n: number, str: string): string;
-			export function drop(n: number): (str: string) => string;
-			export function drop(n: number, str: string): string;
-			export function splitAt(n: number): (str: string) => [string, string];
-			export function splitAt(n: number, str: string): [string, string];
-			export function takeWhile(f: (str: string) => boolean): (str: string) => string;
-			export function takeWhile(f: (str: string) => boolean, str: string): string;
-			export function dropWhile(f: (str: string) => boolean): (str: string) => string;
-			export function dropWhile(f: (str: string) => boolean, str: string): string;
-			export function span(f: (str: string) => boolean): (str: string) => [string, string];
-			export function span(f: (str: string) => boolean, str: string): [string, string];
-			export function breakStr(f: (str: string) => boolean): (str: string) => [string, string];
-			export function breakStr(f: (str: string) => boolean, str: string): [string, string];
-		}
-
-
-		// Func
-
-		export function apply<A, B>(f: (...args: A[]) => B): (args: A[]) => B;
-		export function apply<A, B>(f: (...args: A[]) => B, args: A[]): B;
-		export function curry(f: Function): Function;
-		export function flip<A, B, C>(f: (x: A) => (y: B) => C): (y: B) => (x: A) => C;
-		export function flip<A, B, C>(f: (x: A) => (y: B) => C, y: B): (x: A) => C;
-		export function flip<A, B, C>(f: (x: A) => (y: B) => C, y: B, x: A): C;
-		export function fix(f: Function): Function;
-		export function over<A, B, C>(f: (x: B) => (y: B) => C): (g: (x: A) => B) => (x: A) => (y: A) => C;
-		export function over<A, B, C>(f: (x: B, y: B) => C): (g: (x: A) => B) => (x: A, y: A) => C;
-		export function over<A, B, C>(f: (x: B) => (y: B) => C, g: (x: A) => B): (x: A) => (y: A) => C;
-		export function over<A, B, C>(f: (x: B, y: B) => C, g: (x: A) => B): (x: A, y: A) => C;
-		export function over<A, B, C>(f: (x: B) => (y: B) => C, g: (x: A) => B, x: A): (y: A) => C;
-		export function over<A, B, C>(f: (x: B, y: B) => C, g: (x: A) => B, x: A): (y: A) => C;
-		export function over<A, B, C>(f: (x: B) => (y: B) => C, g: (x: A) => B, x: A, y: A): C;
-		export function over<A, B, C>(f: (x: B, y: B) => C, g: (x: A) => B, x: A, y: A): C;
-
-
-		// Num
-
-		export function max<Comparable>(x: Comparable): (y: Comparable) => Comparable;
-		export function max<Comparable>(x: Comparable, y: Comparable): Comparable;
-		export function min<Comparable>(x: Comparable): (y: Comparable) => Comparable;
-		export function min<Comparable>(x: Comparable, y: Comparable): Comparable;
-		export function negate(x: number): number;
-		export function abs(x: number): number;
-		export function signum(x: number): number;
-		export function quot(x: number): (y: number) => number;
-		export function quot(x: number, y: number): number;
-		export function rem(x: number): (y: number) => number;
-		export function rem(x: number, y: number): number;
-		export function div(x: number): (y: number) => number;
-		export function div(x: number, y: number): number;
-		export function mod(x: number): (y: number) => number;
-		export function mod(x: number, y: number): number;
-		export function recip(x: number): number;
-		export var pi: number;
-		export var tau: number;
-		export function exp(x: number): number;
-		export function sqrt(x: number): number;
-		export function ln(x: number): number;
-		export function pow(x: number): (y: number) => number;
-		export function pow(x: number, y: number): number;
-		export function sin(x: number): number;
-		export function cos(x: number): number;
-		export function tan(x: number): number;
-		export function asin(x: number): number;
-		export function acos(x: number): number;
-		export function atan(x: number): number;
-		export function atan2(x: number, y: number): number;
-		export function truncate(x: number): number;
-		export function round(x: number): number;
-		export function ceiling(x: number): number;
-		export function floor(x: number): number;
-		export function isItNaN(x: number): boolean;
-		export function even(x: number): boolean;
-		export function odd(x: number): boolean;
-		export function gcd(x: number): (y: number) => number;
-		export function gcd(x: number, y: number): number;
-		export function lcm(x: number): (y: number) => number;
-		export function lcm(x: number, y: number): number;
-	}
-
-	export = PreludeLS;
-}
diff --git a/prelude-ls/tsconfig.json b/prelude-ls/tsconfig.json
new file mode 100644
index 0000000000..b3315b8e85
--- /dev/null
+++ b/prelude-ls/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "prelude-ls-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/prettyjson/index.d.ts b/prettyjson/index.d.ts
new file mode 100644
index 0000000000..71df6ea359
--- /dev/null
+++ b/prettyjson/index.d.ts
@@ -0,0 +1,54 @@
+// Type definitions for prettyjson
+// Project: https://github.com/rafeca/prettyjson
+// Definitions by: Wael BEN ZID EL GUEBSI <https://github.com/benzid-wael/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+
+/**
+ * Defines prettyjson version
+ */
+export declare var version: string;
+
+/**
+ * Render pretty json.
+ *
+ * @param data {any} Data to prettify.
+ * @param options {IOptions} Hash with different options to configure the renderer.
+ * @param indentation {number} Indentation size.
+ *
+ * @return {string} pretty serialized json data ready to display.
+   */
+export declare function render(data: any, options?: RendererOptions, indentation?: number): string;
+
+/**
+ * Render pretty json from a string.
+ *
+ * @param data {string} Serialized JSON data to prettify.
+ * @param options {IOptions} Hash with different options to configure the renderer.
+ * @param indentation {number} Indentation size.
+ *
+ * @return {string} pretty serialized json data ready to display.
+   */
+export declare function renderString(data: string, options?: RendererOptions, indentation?: number): string;
+
+export interface RendererOptions {
+
+    /**
+     * Define behavior for Array objects
+     */
+    emptyArrayMsg?: string;  // default: (empty)
+    inlineArrays?: boolean;
+
+    /**
+     * Color definition
+     */
+    noColor?: boolean;
+    keysColor?: string;
+    dashColor?: string;
+    numberColor?: string;
+    stringColor?: string;
+
+    defaultIndentation?: number;
+}
diff --git a/prettyjson/prettyjson-tests.ts b/prettyjson/prettyjson-tests.ts
index 5f83a1c1a1..3ad20218b2 100644
--- a/prettyjson/prettyjson-tests.ts
+++ b/prettyjson/prettyjson-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="prettyjson.d.ts" />
+
 import prettyjson = require("prettyjson");
 
 var options: prettyjson.RendererOptions,
diff --git a/prettyjson/prettyjson.d.ts b/prettyjson/prettyjson.d.ts
deleted file mode 100644
index 252fccf334..0000000000
--- a/prettyjson/prettyjson.d.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-// Type definitions for prettyjson
-// Project: https://github.com/rafeca/prettyjson
-// Definitions by: Wael BEN ZID EL GUEBSI <https://github.com/benzid-wael/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-declare module "prettyjson" {
-
-  /**
-   * Defines prettyjson version
-   */
-  export var version: string;
-
-  /**
-   * Render pretty json.
-   *
-   * @param data {any} Data to prettify.
-   * @param options {IOptions} Hash with different options to configure the renderer.
-   * @param indentation {number} Indentation size.
-   *
-   * @return {string} pretty serialized json data ready to display.
-     */
-  export function render(data: any, options?: RendererOptions, indentation?: number): string;
-
-  /**
-   * Render pretty json from a string.
-   *
-   * @param data {string} Serialized JSON data to prettify.
-   * @param options {IOptions} Hash with different options to configure the renderer.
-   * @param indentation {number} Indentation size.
-   *
-   * @return {string} pretty serialized json data ready to display.
-     */
-  export function renderString(data: string, options?: RendererOptions, indentation?: number): string;
-
-  export interface RendererOptions {
-
-    /**
-     * Define behavior for Array objects
-     */
-    emptyArrayMsg ?: string;  // default: (empty)
-    inlineArrays ?: boolean;
-
-    /**
-     * Color definition
-     */
-    noColor ?: boolean;
-    keysColor ?: string;
-    dashColor ?: string;
-    numberColor ?: string;
-    stringColor ?: string;
-
-    defaultIndentation ?: number;
-  }
-}
diff --git a/prettyjson/tsconfig.json b/prettyjson/tsconfig.json
new file mode 100644
index 0000000000..beef8960c4
--- /dev/null
+++ b/prettyjson/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "prettyjson-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/prismjs/prism.d.ts b/prismjs/index.d.ts
similarity index 100%
rename from prismjs/prism.d.ts
rename to prismjs/index.d.ts
diff --git a/prismjs/prism-tests.ts b/prismjs/prism-tests.ts
index 3b89dd14ec..6d87b9b217 100644
--- a/prismjs/prism-tests.ts
+++ b/prismjs/prism-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./prism.d.ts" />
+
 
 var element = document.createElement("code");
 var callback = (element: Element) => console.log(element);
diff --git a/prismjs/tsconfig.json b/prismjs/tsconfig.json
new file mode 100644
index 0000000000..9cc7f94d4f
--- /dev/null
+++ b/prismjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "prism-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/progress/index.d.ts b/progress/index.d.ts
new file mode 100644
index 0000000000..d801991403
--- /dev/null
+++ b/progress/index.d.ts
@@ -0,0 +1,117 @@
+// Type definitions for node-progress v1.1.8
+// Project: https://github.com/tj/node-progress
+// Definitions by: Sebastian Lenz <https://github.com/sebastian-lenz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+
+/**
+ * These are keys in the options object you can pass to the progress bar along with total as seen in the example above.
+ */
+interface ProgressBarOptions {
+    /**
+     * Total number of ticks to complete.
+     */
+    total: number;
+
+    /**
+     * The displayed width of the progress bar defaulting to total.
+     */
+    width?: number;
+
+    /**
+     * The output stream defaulting to stderr.
+     */
+    stream?: NodeJS.WritableStream;
+
+    /**
+     * Completion character defaulting to "=".
+     */
+    complete?: string;
+
+    /**
+     * Incomplete character defaulting to "-".
+     */
+    incomplete?: string;
+
+    /**
+     * Option to clear the bar on completion defaulting to false.
+     */
+    clear?: boolean;
+
+    /**
+     * Optional function to call when the progress bar completes.
+     */
+    callback?: Function;
+}
+
+
+/**
+ * Flexible ascii progress bar.
+ */
+declare class ProgressBar {
+    /**
+     * Initialize a `ProgressBar` with the given `fmt` string and `options` or
+     * `total`.
+     *
+     * Options:
+     *   - `total` total number of ticks to complete
+     *   - `width` the displayed width of the progress bar defaulting to total
+     *   - `stream` the output stream defaulting to stderr
+     *   - `complete` completion character defaulting to "="
+     *   - `incomplete` incomplete character defaulting to "-"
+     *   - `renderThrottle` minimum time between updates in milliseconds defaulting to 16
+     *   - `callback` optional function to call when the progress bar completes
+     *   - `clear` will clear the progress bar upon termination
+     *
+     * Tokens:
+     *   - `:bar` the progress bar itself
+     *   - `:current` current tick number
+     *   - `:total` total ticks
+     *   - `:elapsed` time elapsed in seconds
+     *   - `:percent` completion percentage
+     *   - `:eta` eta in seconds
+     */
+    constructor(format: string, total: number);
+    constructor(format: string, options: ProgressBarOptions);
+
+
+    /**
+     * "tick" the progress bar with optional `len` and optional `tokens`.
+     */
+    tick(tokens?: any): void;
+    tick(count?: number, tokens?: any): void;
+
+
+    /**
+     * Method to render the progress bar with optional `tokens` to place in the
+     * progress bar's `fmt` field.
+     */
+    render(tokens?: any): void;
+
+
+    /**
+     * "update" the progress bar to represent an exact percentage.
+     * The ratio (between 0 and 1) specified will be multiplied by `total` and
+     * floored, representing the closest available "tick." For example, if a
+     * progress bar has a length of 3 and `update(0.5)` is called, the progress
+     * will be set to 1.
+     *
+     * A ratio of 0.5 will attempt to set the progress to halfway.
+     *
+     * @param ratio The ratio (between 0 and 1 inclusive) to set the
+     *   overall completion to.
+     */
+    update(ratio: number, tokens?: any): void;
+
+
+    /**
+     * Terminates a progress bar.
+     */
+    terminate(): void;
+}
+declare namespace ProgressBar { }
+
+export = ProgressBar;
diff --git a/progress/progress-tests.ts b/progress/progress-tests.ts
index 699c20b057..12774e7183 100644
--- a/progress/progress-tests.ts
+++ b/progress/progress-tests.ts
@@ -1,8 +1,5 @@
-/// <reference path="progress.d.ts"/>
-
 var ProgressBar = require('progress');
 
-
 /**
  * Usage example from https://github.com/tj/node-progress
  */
diff --git a/progress/progress.d.ts b/progress/progress.d.ts
deleted file mode 100644
index 6eb55a917e..0000000000
--- a/progress/progress.d.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-// Type definitions for node-progress v1.1.8
-// Project: https://github.com/tj/node-progress
-// Definitions by: Sebastian Lenz <https://github.com/sebastian-lenz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-
-declare module "progress"
-{
-    /**
-     * These are keys in the options object you can pass to the progress bar along with total as seen in the example above.
-     */
-    interface ProgressBarOptions
-    {
-        /**
-         * Total number of ticks to complete.
-         */
-        total:number;
-
-        /**
-         * The displayed width of the progress bar defaulting to total.
-         */
-        width?:number;
-
-        /**
-         * The output stream defaulting to stderr.
-         */
-        stream?:NodeJS.WritableStream;
-
-        /**
-         * Completion character defaulting to "=".
-         */
-        complete?:string;
-
-        /**
-         * Incomplete character defaulting to "-".
-         */
-        incomplete?:string;
-
-        /**
-         * Option to clear the bar on completion defaulting to false.
-         */
-        clear?:boolean;
-
-        /**
-         * Optional function to call when the progress bar completes.
-         */
-        callback?:Function;
-    }
-
-
-    /**
-     * Flexible ascii progress bar.
-     */
-    class ProgressBar
-    {
-        /**
-         * Initialize a `ProgressBar` with the given `fmt` string and `options` or
-         * `total`.
-         *
-         * Options:
-         *   - `total` total number of ticks to complete
-         *   - `width` the displayed width of the progress bar defaulting to total
-         *   - `stream` the output stream defaulting to stderr
-         *   - `complete` completion character defaulting to "="
-         *   - `incomplete` incomplete character defaulting to "-"
-         *   - `renderThrottle` minimum time between updates in milliseconds defaulting to 16
-         *   - `callback` optional function to call when the progress bar completes
-         *   - `clear` will clear the progress bar upon termination
-         *
-         * Tokens:
-         *   - `:bar` the progress bar itself
-         *   - `:current` current tick number
-         *   - `:total` total ticks
-         *   - `:elapsed` time elapsed in seconds
-         *   - `:percent` completion percentage
-         *   - `:eta` eta in seconds
-         */
-        constructor(format:string, total:number);
-        constructor(format:string, options:ProgressBarOptions);
-
-
-        /**
-         * "tick" the progress bar with optional `len` and optional `tokens`.
-         */
-        tick(tokens?:any):void;
-        tick(count?:number, tokens?:any):void;
-
-
-        /**
-         * Method to render the progress bar with optional `tokens` to place in the
-         * progress bar's `fmt` field.
-         */
-        render(tokens?:any):void;
-
-
-        /**
-         * "update" the progress bar to represent an exact percentage.
-         * The ratio (between 0 and 1) specified will be multiplied by `total` and
-         * floored, representing the closest available "tick." For example, if a
-         * progress bar has a length of 3 and `update(0.5)` is called, the progress
-         * will be set to 1.
-         *
-         * A ratio of 0.5 will attempt to set the progress to halfway.
-         *
-         * @param ratio The ratio (between 0 and 1 inclusive) to set the
-         *   overall completion to.
-         */
-        update(ratio:number, tokens?:any):void;
-
-
-        /**
-         * Terminates a progress bar.
-         */
-        terminate():void;
-    }
-    namespace ProgressBar { }
-
-    export = ProgressBar;
-}
diff --git a/progress/tsconfig.json b/progress/tsconfig.json
new file mode 100644
index 0000000000..800628f367
--- /dev/null
+++ b/progress/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "progress-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/progressjs/progress.d.ts b/progressjs/index.d.ts
similarity index 100%
rename from progressjs/progress.d.ts
rename to progressjs/index.d.ts
diff --git a/progressjs/progress-tests.ts b/progressjs/progress-tests.ts
index e2ab62f9af..ac450a33ed 100644
--- a/progressjs/progress-tests.ts
+++ b/progressjs/progress-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="progress.d.ts"/>
-
 progressJs(); //without selector, set progress-bar for whole page
 progressJs("#targetElement"); //start progress-bar for element id='targetElement'
 
diff --git a/progressjs/tsconfig.json b/progressjs/tsconfig.json
new file mode 100644
index 0000000000..800628f367
--- /dev/null
+++ b/progressjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "progress-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/project-oxford/index.d.ts b/project-oxford/index.d.ts
new file mode 100644
index 0000000000..11c543a582
--- /dev/null
+++ b/project-oxford/index.d.ts
@@ -0,0 +1,521 @@
+// Type definitions for project-oxford v0.1.3
+// Project: https://github.com/felixrieseberg/project-oxford
+// Definitions by: Scott Southwood <https://github.com/scsouthw/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+
+
+import Promise = require("bluebird");
+import stream = require("stream");
+
+export declare class Client {
+    constructor(apiKey: string);
+    private _key: string;
+    public face: FaceAPI;
+    public vision: VisionAPI;
+}
+
+export declare class FaceAPI {
+
+    /**
+     * Call the Face Detected API
+     * Detects human faces in an image and returns face locations, face landmarks, and
+     * optional attributes including head-pose, gender, and age. Detection is an essential
+     * API that provides faceId to other APIs like Identification, Verification,
+     * and Find Similar.
+     *
+     * @param  {object}  options                        - Options object
+     * @param  {string}  options.url                    - URL to image to be used
+     * @param  {string}  options.path                   - Path to image to be used
+     * @param  {stream}  options.stream                 - Stream for image to be used
+     * @param  {boolean} options.analyzesFaceLandmarks  - Analyze face landmarks?
+     * @param  {boolean} options.analyzesAge            - Analyze age?
+     * @param  {boolean} options.analyzesGender         - Analyze gender?
+     * @param  {boolean} options.analyzesHeadPose       - Analyze headpose?
+     * @return {Promise}                                - Promise resolving with the resulting JSON
+     */
+    public detect(options: Options.Detect): Promise<[FaceResponses.Detect]>;
+
+    /**
+     * Detect similar faces using faceIds (as returned from the detect API)
+     * @param  {string} sourceFace          - String of faceId for the source face
+     * @param  {string[]} candidateFaces    - Array of faceIds to use as candidates
+     * @return {Promise}                    - Promise resolving with the resulting JSON
+     */
+    public similar(sourceFaceId: string, candidateFacesIds: string[]): Promise<FaceResponses.Similar>;
+
+    /**
+     * Divides candidate faces into groups based on face similarity using faceIds.
+     * The output is one or more disjointed face groups and a MessyGroup.
+     * A face group contains the faces that have similar looking, often of the same person.
+     * There will be one or more face groups ranked by group size, i.e. number of face.
+     * Faces belonging to the same person might be split into several groups in the result.
+     * The MessyGroup is a special face group that each face is not similar to any other
+     * faces in original candidate faces. The messyGroup will not appear in the result if
+     * all faces found their similar counterparts. The candidate face list has a
+     * limit of 100 faces.
+     *
+     * @param  {string[]} faces     - Array of faceIds to use
+     * @return {Promise}            - Promise resolving with the resulting JSON
+     */
+    public grouping(faces: string[]): Promise<FaceResponses.Grouping>;
+
+    /**
+     * Identifies persons from a person group by one or more input faces.
+     * To recognize which person a face belongs to, Face Identification needs a person group
+     * that contains number of persons. Each person contains one or more faces. After a person
+     * group prepared, it should be trained to make it ready for identification. Then the
+     * identification API compares the input face to those persons' faces in person group and
+     * returns the best-matched candidate persons, ranked by confidence.
+     *
+     * @param  {string[]} faces     - Array of faceIds to use
+     * @return {Promise}            - Promise resolving with the resulting JSON
+     */
+    public identify(faceIDs: string[], options: Options.Identify): Promise<FaceResponses.Identify[]>;
+
+    /**
+     * Analyzes two faces and determine whether they are from the same person.
+     * Verification works well for frontal and near-frontal faces.
+     * For the scenarios that are sensitive to accuracy please use with own judgment.
+     * @param  {string[]} faces     - Array containing two faceIds to use
+     * @return {Promise}            - Promise resolving with the resulting JSON
+     */
+    public verify(faces: string[]): Promise<FaceResponses.Verify>;
+
+    /**
+     * @namespace
+     * @memberof face
+     */
+    public personGroup: PersonGroup;
+    public person: Person;
+}
+
+export declare class VisionAPI {
+    /**
+     * This operation does a deep analysis on the given image and then extracts a
+     * set of rich visual features based on the image content.
+     *
+     * @param  {Object}  options                - Options object describing features to extract
+     * @param  {string}  options.url            - Url to image to be analyzed
+     * @param  {string}  options.path           - Path to image to be analyzed
+     * @param  {boolean} options.ImageType      - Detects if image is clipart or a line drawing.
+     * @param  {boolean} options.Color          - Determines the accent color, dominant color, if image is black&white.
+     * @param  {boolean} options.Faces          - Detects if faces are present. If present, generate coordinates, gender and age.
+     * @param  {boolean} options.Adult          - Detects if image is pornographic in nature (nudity or sex act). Sexually suggestive content is also detected.
+     * @param  {boolean} options.Categories     - Image categorization; taxonomy defined in documentation.
+     * @return {Promise}                        - Promise resolving with the resulting JSON
+     */
+    public analyzeImage(options: Options.Analyze): Promise<VisionResponses.Analyze>;
+
+    /**
+     * Generate a thumbnail image to the user-specified width and height. By default, the
+     * service analyzes the image, identifies the region of interest (ROI), and generates
+     * smart crop coordinates based on the ROI. Smart cropping is designed to help when you
+     * specify an aspect ratio that differs from the input image.
+     *
+     * @param  {Object}  options                - Options object describing features to extract
+     * @param  {string}  options.url            - Url to image to be thumbnailed
+     * @param  {string}  options.path           - Path to image to be thumbnailed
+     * @param  {number}  options.width          - Width of the thumb in pixels
+     * @param  {number}  options.height         - Height of the thumb in pixels
+     * @param  {boolean} options.smartCropping  - Should SmartCropping be enabled?
+     * @param  {Object}  options.pipe           - We'll pipe the returned image to this object
+     * @return {Promise}                        - Promise resolving with the resulting JSON
+     */
+    public thumbnail(options: Options.Thumbnail): Promise<stream.Stream>;
+
+    /**
+     * Optical Character Recognition (OCR) detects text in an image and extracts the recognized
+     * characters into a machine-usable character stream.
+     *
+     * @param  {Object}  options                    - Options object describing features to extract
+     * @param  {string}  options.url                - Url to image to be analyzed
+     * @param  {string}  options.path               - Path to image to be analyzed
+     * @param  {string}  options.language           - BCP-47 language code of the text to be detected in the image. Default value is "unk", then the service will auto detect the language of the text in the image.
+     * @param  {string}  options.detectOrientation  - Detect orientation of text in the image
+     * @return {Promise}                            - Promise resolving with the resulting JSON
+     */
+    public ocr(options: Options.Ocr): Promise<VisionResponses.Ocr>;
+}
+
+export declare class PersonGroup {
+    /**
+     * Creates a new person group with a user-specified ID.
+     * A person group is one of the most important parameters for the Identification API.
+     * The Identification searches person faces in a specified person group.
+     *
+     * @param  {string} personGroupId       - Numbers, en-us letters in lower case, '-', '_'. Max length: 64
+     * @param  {string} name                - Person group display name. The maximum length is 128.
+     * @param  {string} userData            - User-provided data attached to the group. The size limit is 16KB.
+     * @return {Promise}                    - Promise resolving with the resulting JSON
+     */
+    public create(personGroupId: string, name: string, userData: string): Promise<void>;
+
+    /**
+     * Deletes an existing person group.
+     *
+     * @param  {string} personGroupId       - Name of person group to delete
+     * @return {Promise}                    - Promise resolving with the resulting JSON
+     */
+    public delete(personGroupId: string): Promise<void>;
+
+    /**
+     * Gets an existing person group.
+     *
+     * @param  {string} personGroupId       - Name of person group to get
+     * @return {Promise}                    - Promise resolving with the resulting JSON
+     */
+    public get(personGroupId: string): Promise<PersonGroupResponses.PersonGroup>;
+
+    /**
+     * Retrieves the training status of a person group. Training is triggered by the Train PersonGroup API.
+     * The training will process for a while on the server side. This API can query whether the training
+     * is completed or ongoing.
+     *
+     * @param  {string} personGroupId       - Name of person group to get
+     * @return {Promise}                    - Promise resolving with the resulting JSON
+     */
+    public trainingStatus(personGroupId: string): Promise<PersonGroupResponses.TrainingStatus>;
+
+    /**
+     * Starts a person group training.
+         * Training is a necessary preparation process of a person group before identification.
+     * Each person group needs to be trained in order to call Identification. The training
+     * will process for a while on the server side even after this API has responded.
+     *
+     * @param  {string} personGroupId       - Name of person group to get
+     * @return {Promise}                    - Promise resolving with the resulting JSON
+     */
+    public trainingStart(personGroupId: string): Promise<PersonGroupResponses.TrainingStatus>;
+
+    /**
+     * Updates an existing person group's display name and userData.
+     *
+     * @param  {string} personGroupId       - Numbers, en-us letters in lower case, '-', '_'. Max length: 64
+     * @param  {string} name                - Person group display name. The maximum length is 128.
+     * @param  {string} userData            - User-provided data attached to the group. The size limit is 16KB.
+     * @return {Promise}                    - Promise resolving with the resulting JSON
+     */
+    public update(personGroupId: string, name: string, userData: string): Promise<void>;
+
+    /**
+     * Lists all person groups in the current subscription.
+     * @return {Promise}                    - Promise resolving with the resulting JSON
+     */
+    public list(): Promise<PersonGroupResponses.PersonGroup[]>;
+}
+
+export declare class Person {
+    /**
+     * Adds a face to a person for identification. The maximum face count for each person is 32.
+     * The face ID must be added to a person before its expiration. Typically a face ID expires
+     * 24 hours after detection.
+     *
+     * @param {string} personGroupId     - The target person's person group.
+     * @param {string} personId          - The target person that the face is added to.
+     * @param {string} faceId            - The ID of the face to be added. The maximum face amount for each person is 32.
+     * @param {string} userData          - Optional. Attach user data to person's face. The maximum length is 1024.
+     * @return {Promise}                 - Promise resolving with the resulting JSON
+     */
+    public addFace(personGroupId: string, personId: string, faceId: string, userData?: string): Promise<void>;
+
+    /**
+     * Deletes a face from a person.
+     *
+     * @param {string} personGroupId     - The target person's person group.
+     * @param {string} personId          - The target person that the face is removed from.
+     * @param {string} faceId            - The ID of the face to be deleted.
+     * @return {Promise}                 - Promise resolving with the resulting JSON
+     */
+    public deleteFace(personGroupId: string, personId: string, faceId: string): Promise<void>;
+
+    /**
+     * Updates a face for a person.
+     *
+     * @param {string} personGroupId     - The target person's person group.
+     * @param {string} personId          - The target person that the face is updated on.
+     * @param {string} faceId            - The ID of the face to be updated.
+     * @param {string} userData          - Optional. Attach user data to person's face. The maximum length is 1024.
+     * @return {Promise}                 - Promise resolving with the resulting JSON
+     */
+    public updateFace(personGroupId: string, personId: string, faceId: string, userData: string): Promise<void>;
+
+    /**
+     * Get a face for a person.
+     *
+     * @param {string} personGroupId     - The target person's person group.
+     * @param {string} personId          - The target person that the face is to get from.
+     * @param {string} faceId            - The ID of the face to get.
+     * @return {Promise}                 - Promise resolving with the resulting JSON
+     */
+    public getFace(personGroupId: string, personId: string, faceId: string): Promise<PersonResponses.Face>;
+
+    /**
+     * Creates a new person in a specified person group for identification.
+     * The number of persons has a subscription limit. Free subscription amount is 1000 persons.
+     * The maximum face count for each person is 32.
+     *
+     * @param {string} personGroupId     - The target person's person group.
+     * @param {string[]} faces           - Array of face id's for the target person
+     * @param {string} name              - Target person's display name. The maximum length is 128.
+     * @param {string} userData          - Optional fields for user-provided data attached to a person. Size limit is 16KB.
+     * @return {Promise}                 - Promise resolving with the resulting JSON
+     */
+    public create(personGroupId: string, faces: string[], name: string, userData: string): Promise<{ personId: string }>;
+
+    /**
+     * Deletes an existing person from a person group.
+     *
+     * @param {string} personGroupId     - The target person's person group.
+     * @param {string} personId          - The target person to delete.
+     * @return {Promise}                 - Promise resolving with the resulting JSON
+     */
+    public delete(personGroupId: string, personId: string): Promise<void>;
+
+    /**
+     * Gets an existing person from a person group.
+     *
+     * @param {string} personGroupId     - The target person's person group.
+     * @param {string} personId          - The target person to get.
+     * @return {Promise}                 - Promise resolving with the resulting JSON
+     */
+    public get(personGroupId: string, personId: string): Promise<PersonResponses.Person>;
+
+    /**
+     * Updates a person's information.
+     *
+     * @param {string} personGroupId     - The target person's person group.
+     * @param {string[]} faces           - Array of face id's for the target person
+     * @param {string} name              - Target person's display name. The maximum length is 128.
+     * @param {string} userData          - Optional fields for user-provided data attached to a person. Size limit is 16KB.
+     * @return {Promise}                 - Promise resolving with the resulting JSON
+     */
+    public update(personGroupId: string, personId: string, faces: string[], name: string, userData: string): Promise<void>;
+
+    /**
+     * Lists all persons in a person group, with the person information.
+     *
+     * @param {string} personGroupId     - The target person's person group.
+     * @return {Promise}                 - Promise resolving with the resulting JSON
+     */
+    public list(personGroupId: string): Promise<PersonResponses.Person[]>;
+}
+
+declare namespace Options {
+    interface Detect {
+        url?: string; // URL to image to be used
+        path?: string; // Path to image to be used
+        stream?: stream.Stream; // Stream of an image to be used
+        analyzesFaceLandmarks?: boolean; // Analyze face landmarks?
+        analyzesAge?: boolean; // Analyze age?
+        analyzesGender?: boolean; // Analyze gender?
+        analyzesHeadPose?: boolean; //Analyze headpose?
+    }
+
+    interface Identify {
+        personGroupId: string;
+        maxNumOfCandidatesReturned: number; // range is 1-10
+    }
+
+    interface Analyze {
+        url?: string; // Url to image to be analyzed
+        path?: string; // Path to image to be analyzed
+        ImageType?: boolean; // Detects if image is clipart or a line drawing.
+        Color?: boolean; // Determines the accent color, dominant color, if image is black& white.
+        Faces?: boolean; // Detects if faces are present.If present, generate coordinates, gender and age.
+        Adult?: boolean; // Detects if image is pornographic in nature(nudity or sex act).Sexually suggestive content is also detected.
+        Categories?: boolean; // Image categorization; taxonomy defined in documentation.
+    }
+
+    interface Thumbnail {
+        url?: string; // Url to image to be thumbnailed
+        path?: string; // Path to image to be thumbnailed
+        width?: number; // Width of the thumb in pixels
+        height?: number; // Height of the thumb in pixels
+        smartCropping?: boolean; // Should SmartCropping be enabled?
+        pipe?: stream.Writable; // We'll pipe the returned image to this object
+    }
+
+    interface Ocr {
+        url?: string; // URL to image to be analyzed
+        path?: string; // Path to image to be analyzed
+        language?: string; //BCP - 47 language code of the text to be detected in the image.Default value is "unk", then the service will auto detect the language of the text in the image.
+        detectOrientation?: boolean; // Detect orientation of text in the image
+    }
+}
+
+declare namespace FaceResponses {
+    interface FaceRectangle {
+        top: number;
+        left: number;
+        width: number;
+        height: number;
+    }
+
+    interface point {
+        x: number;
+        y: number;
+    }
+
+    interface FaceLandmarks {
+        "pupilLeft": point;
+        "pupilRight": point;
+        "noseTip": point;
+        "mouthLeft": point;
+        "mouthRight": point;
+        "eyebrowLeftOuter": point;
+        "eyebrowLeftInner": point;
+        "eyeLeftOuter": point;
+        "eyeLeftTop": point;
+        "eyeLeftBottom": point;
+        "eyeLeftInner": point;
+        "eyebrowRightInner": point;
+        "eyebrowRightOuter": point;
+        "eyeRightInner": point;
+        "eyeRightTop": point;
+        "eyeRightBottom": point;
+        "eyeRightOuter": point;
+        "noseRootLeft": point;
+        "noseRootRight": point;
+        "noseLeftAlarTop": point;
+        "noseRightAlarTop": point;
+        "noseLeftAlarOutTip": point;
+        "noseRightAlarOutTip": point;
+        "upperLipTop": point;
+        "upperLipBottom": point;
+        "underLipTop": point;
+        "underLipBottom": point;
+    }
+
+    interface Attributes {
+        "headPose": { "pitch": number, "roll": number, "yaw": number };
+        "gender": string;
+        "age": number;
+    }
+
+    export interface Detect {
+        "faceId": string;
+        "faceRectangle": FaceRectangle;
+        "faceLandmarks": FaceLandmarks;
+        "attributes": Attributes;
+    }
+
+    export interface Similar {
+        "faceIds": string[];
+    }
+
+    export interface Grouping {
+        "groups": string[];
+        "messyGroup": string[];
+    }
+
+    export interface Identify {
+        "faceId": string;
+        "candidates": [{
+            personId: string;
+            confidence: number;
+        }];
+    }
+
+    export interface Verify {
+        "isIdentical": boolean;
+        "confidence": number;
+    }
+}
+
+declare namespace PersonGroupResponses {
+
+    export interface PersonGroup {
+        "personGroupId": string;
+        "name": string;
+        "userData": string;
+    }
+
+    export interface TrainingStatus {
+        "personGroupId": string;
+        "status": string;
+        "startTime": string;
+        "endTime": string;
+    }
+}
+
+declare namespace PersonResponses {
+    export interface Create {
+        "personId": string;
+    }
+
+    export interface Person {
+        "personId": string;
+        "faceIds": string[];
+        "name": string;
+        "userData": string;
+    }
+
+    export interface Face {
+        "faceId": string;
+        "userData": string;
+    }
+}
+
+declare namespace VisionResponses {
+    export interface Analyze {
+        "categories": [{
+            "name": string;
+            "score": number;
+        }],
+        "adult": {
+            "isAdultContent": boolean;
+            "isRacyContent": boolean;
+            "adultScore": number;
+            "racyScore": number;
+        },
+        "requestId": string;
+        "metadata": {
+            "width": number;
+            "height": number;
+            "format": string;
+        },
+        "faces": [
+            {
+                "age": number;
+                "gender": string;
+                "faceRectangle": {
+                    "left": number;
+                    "top": number;
+                    "width": number;
+                    "height": number;
+                }
+            }
+        ],
+        "color": {
+            "dominantColorForeground": string;
+            "dominantColorBackground": string;
+            "dominantColors": string[];
+            "accentColor": string;
+            "isBWImg": boolean;
+        },
+        "imageType": {
+            "clipArtType": number;
+            "lineDrawingType": number;
+        }
+    }
+
+
+    export interface Ocr {
+        "language": string;
+        "textAngle": number;
+        "orientation": string;
+        "regions": [{
+            "boundingBox": string;
+            "lines": [{
+                "boundingBox": string;
+                "words": [{
+                    "boundingBox": string;
+                    "text": string;
+                }]
+            }]
+        }]
+    }
+}
diff --git a/project-oxford/project-oxford-tests.ts b/project-oxford/project-oxford-tests.ts
index 896d407b8d..d04a77a762 100644
--- a/project-oxford/project-oxford-tests.ts
+++ b/project-oxford/project-oxford-tests.ts
@@ -1,7 +1,7 @@
-///<reference path='project-oxford.d.ts' />
-/// <reference path="../bluebird/bluebird.d.ts" />
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../mocha/mocha.d.ts" />
+
+/// <reference types="bluebird" />
+/// <reference types="node" />
+/// <reference types="mocha" />
 
 import oxford = require("project-oxford");
 
diff --git a/project-oxford/project-oxford.d.ts b/project-oxford/project-oxford.d.ts
deleted file mode 100644
index 012ec82113..0000000000
--- a/project-oxford/project-oxford.d.ts
+++ /dev/null
@@ -1,522 +0,0 @@
-// Type definitions for project-oxford v0.1.3
-// Project: https://github.com/felixrieseberg/project-oxford
-// Definitions by: Scott Southwood <https://github.com/scsouthw/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="..\bluebird\bluebird.d.ts" />
-/// <reference path="..\node\node.d.ts" />
-
-declare module "project-oxford" {
-    import Promise = require("bluebird");
-    import stream = require("stream");
-
-    export class Client {
-        constructor(apiKey: string);
-        private _key: string;
-        public face: FaceAPI;
-        public vision: VisionAPI;
-    }
-
-    export class FaceAPI {
-
-        /**
-         * Call the Face Detected API
-         * Detects human faces in an image and returns face locations, face landmarks, and
-         * optional attributes including head-pose, gender, and age. Detection is an essential
-         * API that provides faceId to other APIs like Identification, Verification,
-         * and Find Similar.
-         *
-         * @param  {object}  options                        - Options object
-         * @param  {string}  options.url                    - URL to image to be used
-         * @param  {string}  options.path                   - Path to image to be used
-         * @param  {stream}  options.stream                 - Stream for image to be used
-         * @param  {boolean} options.analyzesFaceLandmarks  - Analyze face landmarks?
-         * @param  {boolean} options.analyzesAge            - Analyze age?
-         * @param  {boolean} options.analyzesGender         - Analyze gender?
-         * @param  {boolean} options.analyzesHeadPose       - Analyze headpose?
-         * @return {Promise}                                - Promise resolving with the resulting JSON
-         */
-        public detect(options: Options.Detect): Promise<[FaceResponses.Detect]>;
-
-        /**
-         * Detect similar faces using faceIds (as returned from the detect API)
-         * @param  {string} sourceFace          - String of faceId for the source face
-         * @param  {string[]} candidateFaces    - Array of faceIds to use as candidates
-         * @return {Promise}                    - Promise resolving with the resulting JSON
-         */
-        public similar(sourceFaceId: string, candidateFacesIds: string[]): Promise<FaceResponses.Similar>;
-
-        /**
-         * Divides candidate faces into groups based on face similarity using faceIds.
-         * The output is one or more disjointed face groups and a MessyGroup.
-         * A face group contains the faces that have similar looking, often of the same person.
-         * There will be one or more face groups ranked by group size, i.e. number of face.
-         * Faces belonging to the same person might be split into several groups in the result.
-         * The MessyGroup is a special face group that each face is not similar to any other
-         * faces in original candidate faces. The messyGroup will not appear in the result if
-         * all faces found their similar counterparts. The candidate face list has a
-         * limit of 100 faces.
-         *
-         * @param  {string[]} faces     - Array of faceIds to use
-         * @return {Promise}            - Promise resolving with the resulting JSON
-         */
-        public grouping(faces: string[]): Promise<FaceResponses.Grouping>;
-
-        /**
-         * Identifies persons from a person group by one or more input faces.
-         * To recognize which person a face belongs to, Face Identification needs a person group
-         * that contains number of persons. Each person contains one or more faces. After a person
-         * group prepared, it should be trained to make it ready for identification. Then the
-         * identification API compares the input face to those persons' faces in person group and
-         * returns the best-matched candidate persons, ranked by confidence.
-         *
-         * @param  {string[]} faces     - Array of faceIds to use
-         * @return {Promise}            - Promise resolving with the resulting JSON
-         */
-        public identify(faceIDs: string[], options: Options.Identify): Promise<FaceResponses.Identify[]>;
-
-        /**
-         * Analyzes two faces and determine whether they are from the same person.
-         * Verification works well for frontal and near-frontal faces.
-         * For the scenarios that are sensitive to accuracy please use with own judgment.
-         * @param  {string[]} faces     - Array containing two faceIds to use
-         * @return {Promise}            - Promise resolving with the resulting JSON
-         */
-        public verify(faces: string[]): Promise<FaceResponses.Verify>;
-
-        /**
-         * @namespace
-         * @memberof face
-         */
-        public personGroup: PersonGroup;
-        public person: Person;
-    }
-
-    export class VisionAPI {
-        /**
-         * This operation does a deep analysis on the given image and then extracts a
-         * set of rich visual features based on the image content.
-         *
-         * @param  {Object}  options                - Options object describing features to extract
-         * @param  {string}  options.url            - Url to image to be analyzed
-         * @param  {string}  options.path           - Path to image to be analyzed
-         * @param  {boolean} options.ImageType      - Detects if image is clipart or a line drawing.
-         * @param  {boolean} options.Color          - Determines the accent color, dominant color, if image is black&white.
-         * @param  {boolean} options.Faces          - Detects if faces are present. If present, generate coordinates, gender and age.
-         * @param  {boolean} options.Adult          - Detects if image is pornographic in nature (nudity or sex act). Sexually suggestive content is also detected.
-         * @param  {boolean} options.Categories     - Image categorization; taxonomy defined in documentation.
-         * @return {Promise}                        - Promise resolving with the resulting JSON
-         */
-        public analyzeImage(options: Options.Analyze): Promise<VisionResponses.Analyze>;
-
-        /**
-         * Generate a thumbnail image to the user-specified width and height. By default, the
-         * service analyzes the image, identifies the region of interest (ROI), and generates
-         * smart crop coordinates based on the ROI. Smart cropping is designed to help when you
-         * specify an aspect ratio that differs from the input image.
-         *
-         * @param  {Object}  options                - Options object describing features to extract
-         * @param  {string}  options.url            - Url to image to be thumbnailed
-         * @param  {string}  options.path           - Path to image to be thumbnailed
-         * @param  {number}  options.width          - Width of the thumb in pixels
-         * @param  {number}  options.height         - Height of the thumb in pixels
-         * @param  {boolean} options.smartCropping  - Should SmartCropping be enabled?
-         * @param  {Object}  options.pipe           - We'll pipe the returned image to this object
-         * @return {Promise}                        - Promise resolving with the resulting JSON
-         */
-        public thumbnail(options: Options.Thumbnail): Promise<stream.Stream>;
-
-        /**
-         * Optical Character Recognition (OCR) detects text in an image and extracts the recognized
-         * characters into a machine-usable character stream.
-         *
-         * @param  {Object}  options                    - Options object describing features to extract
-         * @param  {string}  options.url                - Url to image to be analyzed
-         * @param  {string}  options.path               - Path to image to be analyzed
-         * @param  {string}  options.language           - BCP-47 language code of the text to be detected in the image. Default value is "unk", then the service will auto detect the language of the text in the image.
-         * @param  {string}  options.detectOrientation  - Detect orientation of text in the image
-         * @return {Promise}                            - Promise resolving with the resulting JSON
-         */
-        public ocr(options: Options.Ocr): Promise<VisionResponses.Ocr>;
-    }
-
-    export class PersonGroup {
-        /**
-         * Creates a new person group with a user-specified ID.
-         * A person group is one of the most important parameters for the Identification API.
-         * The Identification searches person faces in a specified person group.
-         *
-         * @param  {string} personGroupId       - Numbers, en-us letters in lower case, '-', '_'. Max length: 64
-         * @param  {string} name                - Person group display name. The maximum length is 128.
-         * @param  {string} userData            - User-provided data attached to the group. The size limit is 16KB.
-         * @return {Promise}                    - Promise resolving with the resulting JSON
-         */
-        public create(personGroupId: string, name: string, userData: string): Promise<void>;
-
-        /**
-         * Deletes an existing person group.
-         *
-         * @param  {string} personGroupId       - Name of person group to delete
-         * @return {Promise}                    - Promise resolving with the resulting JSON
-         */
-        public delete(personGroupId: string): Promise<void>;
-
-        /**
-         * Gets an existing person group.
-         *
-         * @param  {string} personGroupId       - Name of person group to get
-         * @return {Promise}                    - Promise resolving with the resulting JSON
-         */
-        public get(personGroupId: string): Promise<PersonGroupResponses.PersonGroup>;
-
-        /**
-         * Retrieves the training status of a person group. Training is triggered by the Train PersonGroup API.
-         * The training will process for a while on the server side. This API can query whether the training
-         * is completed or ongoing.
-         *
-         * @param  {string} personGroupId       - Name of person group to get
-         * @return {Promise}                    - Promise resolving with the resulting JSON
-         */
-        public trainingStatus(personGroupId: string): Promise<PersonGroupResponses.TrainingStatus>;
-
-        /**
-         * Starts a person group training.
-             * Training is a necessary preparation process of a person group before identification.
-         * Each person group needs to be trained in order to call Identification. The training
-         * will process for a while on the server side even after this API has responded.
-         *
-         * @param  {string} personGroupId       - Name of person group to get
-         * @return {Promise}                    - Promise resolving with the resulting JSON
-         */
-        public trainingStart(personGroupId: string): Promise<PersonGroupResponses.TrainingStatus>;
-
-        /**
-         * Updates an existing person group's display name and userData.
-         *
-         * @param  {string} personGroupId       - Numbers, en-us letters in lower case, '-', '_'. Max length: 64
-         * @param  {string} name                - Person group display name. The maximum length is 128.
-         * @param  {string} userData            - User-provided data attached to the group. The size limit is 16KB.
-         * @return {Promise}                    - Promise resolving with the resulting JSON
-         */
-        public update(personGroupId: string, name: string, userData: string): Promise<void>;
-
-        /**
-         * Lists all person groups in the current subscription.
-         * @return {Promise}                    - Promise resolving with the resulting JSON
-         */
-        public list(): Promise<PersonGroupResponses.PersonGroup[]>;
-    }
-
-    export class Person {
-        /**
-         * Adds a face to a person for identification. The maximum face count for each person is 32.
-         * The face ID must be added to a person before its expiration. Typically a face ID expires
-         * 24 hours after detection.
-         *
-         * @param {string} personGroupId     - The target person's person group.
-         * @param {string} personId          - The target person that the face is added to.
-         * @param {string} faceId            - The ID of the face to be added. The maximum face amount for each person is 32.
-         * @param {string} userData          - Optional. Attach user data to person's face. The maximum length is 1024.
-         * @return {Promise}                 - Promise resolving with the resulting JSON
-         */
-        public addFace(personGroupId: string, personId: string, faceId: string, userData?: string): Promise<void>;
-
-        /**
-         * Deletes a face from a person.
-         *
-         * @param {string} personGroupId     - The target person's person group.
-         * @param {string} personId          - The target person that the face is removed from.
-         * @param {string} faceId            - The ID of the face to be deleted.
-         * @return {Promise}                 - Promise resolving with the resulting JSON
-         */
-        public deleteFace(personGroupId: string, personId: string, faceId: string): Promise<void>;
-
-        /**
-         * Updates a face for a person.
-         *
-         * @param {string} personGroupId     - The target person's person group.
-         * @param {string} personId          - The target person that the face is updated on.
-         * @param {string} faceId            - The ID of the face to be updated.
-         * @param {string} userData          - Optional. Attach user data to person's face. The maximum length is 1024.
-         * @return {Promise}                 - Promise resolving with the resulting JSON
-         */
-        public updateFace(personGroupId: string, personId: string, faceId: string, userData: string): Promise<void>;
-
-        /**
-         * Get a face for a person.
-         *
-         * @param {string} personGroupId     - The target person's person group.
-         * @param {string} personId          - The target person that the face is to get from.
-         * @param {string} faceId            - The ID of the face to get.
-         * @return {Promise}                 - Promise resolving with the resulting JSON
-         */
-        public getFace(personGroupId: string, personId: string, faceId: string): Promise<PersonResponses.Face>;
-
-        /**
-         * Creates a new person in a specified person group for identification.
-         * The number of persons has a subscription limit. Free subscription amount is 1000 persons.
-         * The maximum face count for each person is 32.
-         *
-         * @param {string} personGroupId     - The target person's person group.
-         * @param {string[]} faces           - Array of face id's for the target person
-         * @param {string} name              - Target person's display name. The maximum length is 128.
-         * @param {string} userData          - Optional fields for user-provided data attached to a person. Size limit is 16KB.
-         * @return {Promise}                 - Promise resolving with the resulting JSON
-         */
-        public create(personGroupId: string, faces: string[], name: string, userData: string): Promise<{ personId: string }>;
-
-        /**
-         * Deletes an existing person from a person group.
-         *
-         * @param {string} personGroupId     - The target person's person group.
-         * @param {string} personId          - The target person to delete.
-         * @return {Promise}                 - Promise resolving with the resulting JSON
-         */
-        public delete(personGroupId: string, personId: string): Promise<void>;
-
-        /**
-         * Gets an existing person from a person group.
-         *
-         * @param {string} personGroupId     - The target person's person group.
-         * @param {string} personId          - The target person to get.
-         * @return {Promise}                 - Promise resolving with the resulting JSON
-         */
-        public get(personGroupId: string, personId: string): Promise<PersonResponses.Person>;
-
-        /**
-         * Updates a person's information.
-         *
-         * @param {string} personGroupId     - The target person's person group.
-         * @param {string[]} faces           - Array of face id's for the target person
-         * @param {string} name              - Target person's display name. The maximum length is 128.
-         * @param {string} userData          - Optional fields for user-provided data attached to a person. Size limit is 16KB.
-         * @return {Promise}                 - Promise resolving with the resulting JSON
-         */
-        public update(personGroupId: string, personId: string, faces: string[], name: string, userData: string): Promise<void>;
-
-        /**
-         * Lists all persons in a person group, with the person information.
-         *
-         * @param {string} personGroupId     - The target person's person group.
-         * @return {Promise}                 - Promise resolving with the resulting JSON
-         */
-        public list(personGroupId: string): Promise<PersonResponses.Person[]>;
-    }
-
-    namespace Options {
-        interface Detect {
-            url?: string; // URL to image to be used
-            path?: string; // Path to image to be used
-            stream?: stream.Stream; // Stream of an image to be used
-            analyzesFaceLandmarks?: boolean; // Analyze face landmarks?
-            analyzesAge?: boolean; // Analyze age?
-            analyzesGender?: boolean; // Analyze gender?
-            analyzesHeadPose?: boolean; //Analyze headpose?
-        }
-
-        interface Identify {
-            personGroupId: string;
-            maxNumOfCandidatesReturned: number; // range is 1-10
-        }
-
-        interface Analyze {
-            url?: string; // Url to image to be analyzed
-            path?: string; // Path to image to be analyzed
-            ImageType?: boolean; // Detects if image is clipart or a line drawing.
-            Color?: boolean; // Determines the accent color, dominant color, if image is black& white.
-            Faces?: boolean; // Detects if faces are present.If present, generate coordinates, gender and age.
-            Adult?: boolean; // Detects if image is pornographic in nature(nudity or sex act).Sexually suggestive content is also detected.
-            Categories?: boolean; // Image categorization; taxonomy defined in documentation.
-        }
-
-        interface Thumbnail {
-            url?: string; // Url to image to be thumbnailed
-            path?: string; // Path to image to be thumbnailed
-            width?: number; // Width of the thumb in pixels
-            height?: number; // Height of the thumb in pixels
-            smartCropping?: boolean; // Should SmartCropping be enabled?
-            pipe?: stream.Writable; // We'll pipe the returned image to this object
-        }
-
-        interface Ocr {
-            url?: string; // URL to image to be analyzed
-            path?: string; // Path to image to be analyzed
-            language?: string; //BCP - 47 language code of the text to be detected in the image.Default value is "unk", then the service will auto detect the language of the text in the image.
-            detectOrientation?: boolean; // Detect orientation of text in the image
-        }
-    }
-
-    namespace FaceResponses {
-        interface FaceRectangle {
-            top: number;
-            left: number;
-            width: number;
-            height: number;
-        }
-
-        interface point {
-            x: number;
-            y: number;
-        }
-
-        interface FaceLandmarks {
-            "pupilLeft": point;
-            "pupilRight": point;
-            "noseTip": point;
-            "mouthLeft": point;
-            "mouthRight": point;
-            "eyebrowLeftOuter": point;
-            "eyebrowLeftInner": point;
-            "eyeLeftOuter": point;
-            "eyeLeftTop": point;
-            "eyeLeftBottom": point;
-            "eyeLeftInner": point;
-            "eyebrowRightInner": point;
-            "eyebrowRightOuter": point;
-            "eyeRightInner": point;
-            "eyeRightTop": point;
-            "eyeRightBottom": point;
-            "eyeRightOuter": point;
-            "noseRootLeft": point;
-            "noseRootRight": point;
-            "noseLeftAlarTop": point;
-            "noseRightAlarTop": point;
-            "noseLeftAlarOutTip": point;
-            "noseRightAlarOutTip": point;
-            "upperLipTop": point;
-            "upperLipBottom": point;
-            "underLipTop": point;
-            "underLipBottom": point;
-        }
-
-        interface Attributes {
-            "headPose": { "pitch": number, "roll": number, "yaw": number };
-            "gender": string;
-            "age": number;
-        }
-
-        export interface Detect {
-            "faceId": string;
-            "faceRectangle": FaceRectangle;
-            "faceLandmarks": FaceLandmarks;
-            "attributes": Attributes;
-        }
-
-        export interface Similar {
-            "faceIds": string[];
-        }
-
-        export interface Grouping {
-            "groups": string[];
-            "messyGroup": string[];
-        }
-
-        export interface Identify {
-            "faceId": string;
-            "candidates": [{
-                personId: string;
-                confidence: number;
-            }];
-        }
-
-        export interface Verify {
-            "isIdentical": boolean;
-            "confidence": number;
-        }
-    }
-
-    namespace PersonGroupResponses {
-
-        export interface PersonGroup {
-            "personGroupId": string;
-            "name": string;
-            "userData": string;
-        }
-
-        export interface TrainingStatus {
-            "personGroupId": string;
-            "status": string;
-            "startTime": string;
-            "endTime": string;
-        }
-    }
-
-    namespace PersonResponses {
-        export interface Create {
-            "personId": string;
-        }
-
-        export interface Person {
-            "personId": string;
-            "faceIds": string[];
-            "name": string;
-            "userData": string;
-        }
-
-        export interface Face {
-            "faceId": string;
-            "userData": string;
-        }
-    }
-
-    namespace VisionResponses {
-        export interface Analyze {
-            "categories": [{
-                "name": string;
-                "score": number;
-            }],
-            "adult": {
-                "isAdultContent": boolean;
-                "isRacyContent": boolean;
-                "adultScore": number;
-                "racyScore": number;
-            },
-            "requestId": string;
-            "metadata": {
-                "width": number;
-                "height": number;
-                "format": string;
-            },
-            "faces": [
-                {
-                    "age": number;
-                    "gender": string;
-                    "faceRectangle": {
-                        "left": number;
-                        "top": number;
-                        "width": number;
-                        "height": number;
-                    }
-                }
-            ],
-            "color": {
-                "dominantColorForeground": string;
-                "dominantColorBackground": string;
-                "dominantColors": string[];
-                "accentColor": string;
-                "isBWImg": boolean;
-            },
-            "imageType": {
-                "clipArtType": number;
-                "lineDrawingType": number;
-            }
-        }
-
-
-        export interface Ocr {
-            "language": string;
-            "textAngle": number;
-            "orientation": string;
-            "regions": [{
-                "boundingBox": string;
-                "lines": [{
-                    "boundingBox": string;
-                    "words": [{
-                        "boundingBox": string;
-                        "text": string;
-                    }]
-                }]
-            }]
-        }
-    }
-}
diff --git a/project-oxford/tsconfig.json b/project-oxford/tsconfig.json
new file mode 100644
index 0000000000..7b8f68e81b
--- /dev/null
+++ b/project-oxford/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "project-oxford-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/promise-pg/index.d.ts b/promise-pg/index.d.ts
new file mode 100644
index 0000000000..ede16f8276
--- /dev/null
+++ b/promise-pg/index.d.ts
@@ -0,0 +1,58 @@
+// Type definitions for promise-pg
+// Project: https://bitbucket.org/lplabs/promise-pg
+// Definitions by: Chris Charabaruk <http://github.com/coldacid>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+/// <reference types="Q" />
+
+import * as stream from 'stream';
+import * as pg from 'pg';
+
+export {pg as raw};
+
+export interface ClientConfig extends pg.ClientConfig { }
+
+export declare function connect(connection: string): Q.Promise<Client>;
+export declare function connect(connection: pg.ClientConfig): Q.Promise<Client>;
+
+export declare function end(): Q.Promise<void>;
+
+export interface QueryConfig extends pg.QueryConfig {
+    buffer?: boolean;
+}
+
+export declare class Client {
+    constructor(connection: string);
+    constructor(config: ClientConfig);
+
+    raw: pg.Client;
+
+    connect(): Q.Promise<void>;
+    end(): Q.Promise<void>;
+
+    query(queryText: string): Query;
+    query(config: QueryConfig): Query;
+    query(queryText: string, values: any[]): Query;
+
+    copyFrom(queryText: string): stream.Writable;
+    copyTo(queryText: string): stream.Readable;
+
+    pauseDrain(): void;
+    resumeDrain(): void;
+
+    public on(event: "drain", listener: () => void): Client;
+    public on(event: "error", listener: (err: Error) => void): Client;
+    public on(event: "notification", listener: (message: any) => void): Client;
+    public on(event: "notice", listener: (message: any) => void): Client;
+    public on(event: string, listener: Function): Client;
+
+    transaction(task: () => Q.Promise<any>): Q.Promise<any>;
+}
+
+export interface QueryResult extends pg.QueryResult { }
+export interface ResultBuilder extends pg.ResultBuilder { }
+
+export declare class Query extends pg.Query {
+    promise: Q.Promise<QueryResult>;
+}
diff --git a/promise-pg/promise-pg-tests.ts b/promise-pg/promise-pg-tests.ts
new file mode 100644
index 0000000000..5c962a3c09
--- /dev/null
+++ b/promise-pg/promise-pg-tests.ts
@@ -0,0 +1,95 @@
+
+/// <reference types="Q" />
+
+import * as pg from 'promise-pg';
+
+var conString = "postgres://username:password@localhost/database";
+
+// https://github.com/brianc/node-pg-types
+pg.raw.types.setTypeParser(20, (val) => Number(val));
+
+// Client pooling
+pg.connect(conString)
+  .spread(function (client: pg.Client, done: () => void) {
+    client.query("SELECT $1::int AS number", ["1"]).promise
+      .then(function (result) {
+        // done
+      }, function (err) {
+        console.error("Error running query", err);
+      })
+      .finally(done);
+  }, function (err) {
+    return console.error("Error fetching client from pool", err);
+  }).done();
+
+// Simple
+var client = new pg.Client(conString);
+client.connect()
+  .spread(function (client: pg.Client, done: () => void) {
+    client.query("SELECT NOW() AS 'theTime'").promise
+      .then(function (result) {
+        console.log(result.rows[0]["theTime"]);
+        client.end();
+        return null;
+      }, function (err) {
+        return console.error("Error running query", err);
+      });
+  }, function (err) {
+    return console.error("Could not connect to postgres", err);
+  }).done();
+
+// Using buffer query option
+pg.connect(conString)
+  .spread(function (client: pg.Client, done: () => void) {
+    client.query({
+      text: "SELECT * FROM users",
+      buffer: true
+    }).promise.then(
+      function (result) { console.log(result.rows.length + " rows returned"); },
+      function (err) { console.error("Error running query", err); throw err; },
+      function (user: any) {} // called for each returned row
+    ).finally(done);
+  }).done();
+
+// Transactions
+pg.connect(conString)
+  .spread(function (client: pg.Client, done: () => void) {
+    var INSERT = "INSERT INTO users(name, t_birth, country) VALUES ($1, $2, $3)";
+
+    console.log("Transaction I:");
+    var trans = client.transaction(function () {
+      return Q.all([{
+          text: INSERT,
+          values: ["Jake1", "now()", "Oo"]
+        }, {
+          text: INSERT,
+          values: ["Cake2", null, "Küche"]
+        }, {
+          text: INSERT,
+          values: ["Mike3", "now()", null]
+        }].map(function (q) { return client.query(q).promise; }));
+    }).then(function() {
+      console.log("Good - Committed Transaction I.");
+    }, function (err) {
+      console.log("Bad  - Rolled back Transaction I.", err);
+    });
+
+    trans.finally(function () {
+      client.transaction(function () {
+        return Q.all([{
+          text: INSERT,
+          values: ["Jake", "now()", "Oo"]
+        }, {
+          text: INSERT, // Bad, name is NOT NULL
+          values: [null, null, "Küche"]
+        }, {
+          text: INSERT,
+          values: ["Mike", "now()", null]
+        }].map(function (q) { return client.query(q).promise; }));
+      }).then(function () {
+        console.log("Bad  - Committed Transaction II.");
+      }, function (err) {
+        console.log("Good - Rolled back Transaction II.", err.message);
+      }).finally(done).done();
+    });
+  }).done();
diff --git a/promise-pg/tsconfig.json b/promise-pg/tsconfig.json
new file mode 100644
index 0000000000..db3c46a804
--- /dev/null
+++ b/promise-pg/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "promise-pg-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/promise-pool/index.d.ts b/promise-pool/index.d.ts
new file mode 100644
index 0000000000..bc4de6be46
--- /dev/null
+++ b/promise-pool/index.d.ts
@@ -0,0 +1,123 @@
+// Type definitions for promise-pool
+// Project: https://github.com/vilic/promise-pool
+// Definitions by: VILIC VANE <https://github.com/vilic>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="q-retry" />
+
+
+/**
+* interface for the final result.
+*/
+export interface IResult {
+    fulfilled: number;
+    rejected: number;
+    total: number;
+}
+/**
+* interface for progress data.
+*/
+export interface IProgress {
+    index: number;
+    success: boolean;
+    error: any;
+    retries: number;
+    fulfilled: number;
+    rejected: number;
+    pending: number;
+    total: number;
+}
+/**
+* tasks pool that manages concurrency.
+*/
+export declare class Pool<T> {
+    /**
+    * (get/set) the max concurrency of this task pool.
+    */
+    public concurrency: number;
+    private _tasksData;
+    /**
+    * (get/set) the processor function that handles tasks data.
+    */
+    public processor: (data: T, index: number) => Q.IPromise<void>;
+    private _deferred;
+    private _pauseDeferred;
+    /**
+    * (get) the number of successful tasks.
+    */
+    public fulfilled: number;
+    /**
+    * (get) the number of failed tasks.
+    */
+    public rejected: number;
+    /**
+    * (get) the number of pending tasks.
+    */
+    public pending: number;
+    /**
+    * (get) the number of completed tasks and pending tasks in total.
+    */
+    public total: number;
+    /**
+    * (get/set) indicates whether this task pool is endless, if so, tasks can still be added even after all previous tasks have been fulfilled.
+    */
+    public endless: boolean;
+    /**
+    * (get/set) defaults to 0, the number or retries that this task pool will take for every single task, could be Infinity.
+    */
+    public retries: number;
+    /**
+    * (get/set) defaults to 0, interval (milliseconds) between each retries.
+    */
+    public retryInterval: number;
+    /**
+    * (get/set) defaults to Infinity, max retry interval when retry interval multiplier applied.
+    */
+    public maxRetryInterval: number;
+    /**
+    * (get/set) defaults to 1, the multiplier applies to interval after every retry.
+    */
+    public retryIntervalMultiplier: number;
+    private _index;
+    private _currentConcurrency;
+    public onProgress: (progress: IProgress) => void;
+    /**
+    * initialize a task pool.
+    * @param processor a function takes the data and index as parameters and returns a promise.
+    * @param concurrency the concurrency of this task pool.
+    * @param endless defaults to false. indicates whether this task pool is endless, if so, tasks can still be added even after all previous tasks have been fulfilled.
+    * @param tasksData an initializing array of task data.
+    */
+    constructor(processor: (data: T, index: number) => Q.IPromise<void>, concurrency: number, endless?: boolean, tasksData?: T[]);
+    /**
+    * add a data item.
+    * @param taskData task data to add.
+    */
+    public add(taskData: T): void;
+    /**
+    * add data items.
+    * @param tasskData tasks data to add.
+    */
+    public add(tasksData: T[]): void;
+    /**
+    * start tasks, return a promise that will be fulfilled after all tasks accomplish if endless is false.
+    * @param onProgress a callback that will be triggered every time when a single task is fulfilled.
+    */
+    public start(onProgress?: (progress: IProgress) => void): Q.Promise<IResult>;
+    private _start();
+    private _process(data, index);
+    private _notifyProgress(index, success, err, retries);
+    private _next();
+    /**
+    * pause tasks and return a promise that will be fulfilled after the running tasks accomplish. this will wait for running tasks to complete instead of aborting them.
+    */
+    public pause(): Q.Promise<void>;
+    /**
+    * resume tasks.
+    */
+    public resume(): void;
+    /**
+    * pause tasks, then clear pending tasks data and reset counters. return a promise that will be fulfilled after resetting accomplish.
+    */
+    public reset(): Q.Promise<void>;
+}
diff --git a/promise-pool/promise-pool-tests.ts b/promise-pool/promise-pool-tests.ts
index a9cc160bea..4b5164525b 100644
--- a/promise-pool/promise-pool-tests.ts
+++ b/promise-pool/promise-pool-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./promise-pool.d.ts" />
 
 import Q = require('q');
 import promisePool = require('promise-pool');
diff --git a/promise-pool/promise-pool.d.ts b/promise-pool/promise-pool.d.ts
deleted file mode 100644
index 37272b409f..0000000000
--- a/promise-pool/promise-pool.d.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-// Type definitions for promise-pool
-// Project: https://github.com/vilic/promise-pool
-// Definitions by: VILIC VANE <https://github.com/vilic>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../q-retry/q-retry.d.ts" />
-
-declare module "promise-pool" {
-    /**
-    * interface for the final result.
-    */
-    export interface IResult {
-        fulfilled: number;
-        rejected: number;
-        total: number;
-    }
-    /**
-    * interface for progress data.
-    */
-    export interface IProgress {
-        index: number;
-        success: boolean;
-        error: any;
-        retries: number;
-        fulfilled: number;
-        rejected: number;
-        pending: number;
-        total: number;
-    }
-    /**
-    * tasks pool that manages concurrency.
-    */
-    export class Pool<T> {
-        /**
-        * (get/set) the max concurrency of this task pool.
-        */
-        public concurrency: number;
-        private _tasksData;
-        /**
-        * (get/set) the processor function that handles tasks data.
-        */
-        public processor: (data: T, index: number) => Q.IPromise<void>;
-        private _deferred;
-        private _pauseDeferred;
-        /**
-        * (get) the number of successful tasks.
-        */
-        public fulfilled: number;
-        /**
-        * (get) the number of failed tasks.
-        */
-        public rejected: number;
-        /**
-        * (get) the number of pending tasks.
-        */
-        public pending: number;
-        /**
-        * (get) the number of completed tasks and pending tasks in total.
-        */
-        public total: number;
-        /**
-        * (get/set) indicates whether this task pool is endless, if so, tasks can still be added even after all previous tasks have been fulfilled.
-        */
-        public endless: boolean;
-        /**
-        * (get/set) defaults to 0, the number or retries that this task pool will take for every single task, could be Infinity.
-        */
-        public retries: number;
-        /**
-        * (get/set) defaults to 0, interval (milliseconds) between each retries.
-        */
-        public retryInterval: number;
-        /**
-        * (get/set) defaults to Infinity, max retry interval when retry interval multiplier applied.
-        */
-        public maxRetryInterval: number;
-        /**
-        * (get/set) defaults to 1, the multiplier applies to interval after every retry.
-        */
-        public retryIntervalMultiplier: number;
-        private _index;
-        private _currentConcurrency;
-        public onProgress: (progress: IProgress) => void;
-        /**
-        * initialize a task pool.
-        * @param processor a function takes the data and index as parameters and returns a promise.
-        * @param concurrency the concurrency of this task pool.
-        * @param endless defaults to false. indicates whether this task pool is endless, if so, tasks can still be added even after all previous tasks have been fulfilled.
-        * @param tasksData an initializing array of task data.
-        */
-        constructor(processor: (data: T, index: number) => Q.IPromise<void>, concurrency: number, endless?: boolean, tasksData?: T[]);
-        /**
-        * add a data item.
-        * @param taskData task data to add.
-        */
-        public add(taskData: T): void;
-        /**
-        * add data items.
-        * @param tasskData tasks data to add.
-        */
-        public add(tasksData: T[]): void;
-        /**
-        * start tasks, return a promise that will be fulfilled after all tasks accomplish if endless is false.
-        * @param onProgress a callback that will be triggered every time when a single task is fulfilled.
-        */
-        public start(onProgress?: (progress: IProgress) => void): Q.Promise<IResult>;
-        private _start();
-        private _process(data, index);
-        private _notifyProgress(index, success, err, retries);
-        private _next();
-        /**
-        * pause tasks and return a promise that will be fulfilled after the running tasks accomplish. this will wait for running tasks to complete instead of aborting them.
-        */
-        public pause(): Q.Promise<void>;
-        /**
-        * resume tasks.
-        */
-        public resume(): void;
-        /**
-        * pause tasks, then clear pending tasks data and reset counters. return a promise that will be fulfilled after resetting accomplish.
-        */
-        public reset(): Q.Promise<void>;
-    }
-}
\ No newline at end of file
diff --git a/promise-pool/tsconfig.json b/promise-pool/tsconfig.json
new file mode 100644
index 0000000000..85905cde96
--- /dev/null
+++ b/promise-pool/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "promise-pool-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/promise/index.d.ts b/promise/index.d.ts
new file mode 100644
index 0000000000..3a273d44cd
--- /dev/null
+++ b/promise/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for promise v7.1.1
+// Project: https://www.promisejs.org/
+// Definitions by: Manuel Rueda <https://github.com/ManRueda>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace Promise;
+
+export = Promise;
+declare var Promise: Promise.IPromise;
+
+declare namespace Promise {
+	export interface IPromise {
+		new <T>(resolver: (resolve: (value: T) => void, reject: (reason: any) => void) => void): IThenable<T>;
+
+		resolve: <T>(value: T) => IThenable<T>;
+		reject: <T>(value: T) => IThenable<T>;
+		all: (array: Array<IThenable<any>>) => IThenable<Array<any>>;
+		denodeify: (fn: Function) => IThenable<any>;
+		nodeify: (fn: Function) => Function;
+	}
+
+	export interface IThenable<T> {
+		then<R>(onFulfilled?: (value: T) => IThenable<R>|R, onRejected?: (error: any) => IThenable<R>|R): IThenable<R>;
+		catch<R>(onRejected?: (error: any) => IThenable<R>|R): IThenable<R>;
+		done<R>(onFulfilled?: (value: T) => IThenable<R>|R, onRejected?: (error: any) => IThenable<R>|R): IThenable<R>;
+		nodeify<R>(callback: Function): IThenable<R>;
+	}
+}
diff --git a/promise/promise-tests.ts b/promise/promise-tests.ts
index 140d170b1a..7920069e2f 100644
--- a/promise/promise-tests.ts
+++ b/promise/promise-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="promise.d.ts"/>
-
 var prom = new Promise<Boolean>((resolve, reject) => {
 	resolve(true);
 });
diff --git a/promise/promise-tests.ts.tscparams b/promise/promise-tests.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/promise/promise-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/promise/promise.d.ts b/promise/promise.d.ts
deleted file mode 100644
index b771f67893..0000000000
--- a/promise/promise.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-// Type definitions for promise v7.1.1
-// Project: https://www.promisejs.org/
-// Definitions by: Manuel Rueda <https://github.com/ManRueda>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Support AMD require
-declare module 'promise' {
-		export = Promise;
-}
-
-declare var Promise: Promise.Ipromise;
-
-declare namespace Promise {
-
-	export interface Ipromise {
-		new <T>(resolver: (resolve: (value: T) => void, reject: (reason: any) => void) => void): IThenable<T>;
-
-		resolve: <T>(value: T) => IThenable<T>;
-		reject: <T>(value: T) => IThenable<T>;
-		all: (array: Array<IThenable<any>>) => IThenable<Array<any>>;
-		denodeify: (fn: Function) => IThenable<any>;
-		nodeify: (fn: Function) => Function;
-	}
-
-	export interface IThenable<T> {
-		then<R>(onFulfilled?: (value: T) => IThenable<R>|R, onRejected?: (error: any) => IThenable<R>|R): IThenable<R>;
-		catch<R>(onRejected?: (error: any) => IThenable<R>|R): IThenable<R>;
-		done<R>(onFulfilled?: (value: T) => IThenable<R>|R, onRejected?: (error: any) => IThenable<R>|R): IThenable<R>;
-		nodeify<R>(callback: Function): IThenable<R>;
-	}
-}
diff --git a/promise/promise.d.ts.tscparams b/promise/promise.d.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/promise/promise.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/promise/tsconfig.json b/promise/tsconfig.json
new file mode 100644
index 0000000000..851c105dfe
--- /dev/null
+++ b/promise/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "promise-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/promises-a-plus/promises-a-plus.d.ts b/promises-a-plus/index.d.ts
similarity index 100%
rename from promises-a-plus/promises-a-plus.d.ts
rename to promises-a-plus/index.d.ts
diff --git a/promises-a-plus/promises-a-plus-tests.ts b/promises-a-plus/promises-a-plus-tests.ts
index 2887700d93..b6c4060758 100644
--- a/promises-a-plus/promises-a-plus-tests.ts
+++ b/promises-a-plus/promises-a-plus-tests.ts
@@ -1,7 +1,6 @@
-/// <reference path="promises-a-plus.d.ts"/>
-/// <reference path="../rx/rx.async.d.ts"/>
-/// <reference path="../q/Q.d.ts"/>
-/// <reference path="../when/when"/>
+/// <reference types="rx"/>
+/// <reference types="Q"/>
+/// <reference types="when"/>
 
 var thenNum: PromisesAPlus.Thenable<number>;
 var thenStr: PromisesAPlus.Thenable<string>;
diff --git a/promises-a-plus/tsconfig.json b/promises-a-plus/tsconfig.json
new file mode 100644
index 0000000000..290c020279
--- /dev/null
+++ b/promises-a-plus/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "promises-a-plus-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/promisify-supertest/index.d.ts b/promisify-supertest/index.d.ts
new file mode 100644
index 0000000000..d0c57e3029
--- /dev/null
+++ b/promisify-supertest/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for promisify-supertest v1.0.0
+// Project: https://www.npmjs.com/package/promisify-supertest
+// Definitions by: Leo Liang <https://github.com/aleung/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+// Mostly copy-pasted from supertest.d.ts
+
+import * as superagent from 'superagent';
+import * as express from 'express';
+
+type CallbackHandler = (err: any, res: supertest.Response) => void;
+
+declare function supertest(app: express.Express): supertest.SuperTest;
+
+declare namespace supertest {
+    function agent(app?: any): supertest.SuperTest;
+
+    interface SuperTest extends superagent.SuperAgent<Test> {
+    }
+
+    interface Test extends superagent.Request<Test> {
+        url: string;
+        serverAddress(app: any, path: string): string;
+        expect(status: number, callback?: CallbackHandler): Test;
+        expect(status: number, body: string, callback?: CallbackHandler): Test;
+        expect(body: string, callback?: CallbackHandler): Test;
+        expect(body: RegExp, callback?: CallbackHandler): Test;
+        expect(body: Object, callback?: CallbackHandler): Test;
+        expect(field: string, val: string, callback?: CallbackHandler): Test;
+        expect(field: string, val: RegExp, callback?: CallbackHandler): Test;
+        expect(checker: (res: Response) => any): Test;
+        end(callback: CallbackHandler): Test;
+        end(): Promise<Response>;
+    }
+
+    interface Response extends superagent.Response {
+    }
+}
+
+export = supertest;
diff --git a/promisify-supertest/promisify-supertest-tests.ts b/promisify-supertest/promisify-supertest-tests.ts
index cef9173b18..7fa6de147d 100644
--- a/promisify-supertest/promisify-supertest-tests.ts
+++ b/promisify-supertest/promisify-supertest-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="promisify-supertest.d.ts" />
-/// <reference path="../express/express.d.ts" />
 
 import * as request from 'promisify-supertest';
 import * as express from 'express';
diff --git a/promisify-supertest/promisify-supertest.d.ts b/promisify-supertest/promisify-supertest.d.ts
deleted file mode 100644
index 54a03f198f..0000000000
--- a/promisify-supertest/promisify-supertest.d.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-// Type definitions for promisify-supertest v1.0.0
-// Project: https://www.npmjs.com/package/promisify-supertest
-// Definitions by: Leo Liang <https://github.com/aleung/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path='../superagent/superagent.d.ts' />
-/// <reference path="../express/express.d.ts" />
-
-declare module 'promisify-supertest' {
-  // Mostly copy-pasted from supertest.d.ts
-
-  import * as superagent from 'superagent';
-  import * as express from 'express';
-
-  type CallbackHandler = (err: any, res: supertest.Response) => void;
-
-  function supertest(app: express.Express): supertest.SuperTest;
-
-  namespace supertest {
-    function agent(app?: any): supertest.SuperTest;
-
-    interface SuperTest extends superagent.SuperAgent<Test> {
-    }
-
-    interface Test extends superagent.Request<Test> {
-      url: string;
-      serverAddress(app: any, path: string): string;
-      expect(status: number, callback?: CallbackHandler): Test;
-      expect(status: number, body: string, callback?: CallbackHandler): Test;
-      expect(body: string, callback?: CallbackHandler): Test;
-      expect(body: RegExp, callback?: CallbackHandler): Test;
-      expect(body: Object, callback?: CallbackHandler): Test;
-      expect(field: string, val: string, callback?: CallbackHandler): Test;
-      expect(field: string, val: RegExp, callback?: CallbackHandler): Test;
-      expect(checker: (res: Response) => any): Test;
-      end(callback: CallbackHandler): Test;
-      end(): Promise<Response>;
-    }
-
-    interface Response extends superagent.Response {
-    }
-  }
-
-  export = supertest;
-}
diff --git a/promisify-supertest/tsconfig.json b/promisify-supertest/tsconfig.json
new file mode 100644
index 0000000000..c0337ee2aa
--- /dev/null
+++ b/promisify-supertest/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "promisify-supertest-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/promptly/index.d.ts b/promptly/index.d.ts
new file mode 100644
index 0000000000..299e4852cb
--- /dev/null
+++ b/promptly/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for node-promptly 1.1.1
+// Project: https://github.com/IndigoUnited/node-promptly
+// Definitions by: Dan Spencer <https://github.com/danrspencer>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="node"/>
+
+
+import stream = require('stream');
+
+interface Callback {
+    (err: Error, value: string): void;
+}
+
+export interface Options {
+    default?: string;
+    trim?: boolean;
+    validator?: any;
+    retry?: boolean;
+    silent?: boolean;
+    input?: NodeJS.ReadableStream;
+    output?: NodeJS.WritableStream;
+}
+
+export declare function prompt(message: string, fn?: Callback): any;
+export declare function prompt(message: string, opts: Options, fn?: Callback): any;
+
+export declare function password(message: string, fn?: Callback): any;
+export declare function password(message: string, opts: Options, fn?: Callback): any;
+
+export declare function confirm(message: string, fn?: Callback): any;
+export declare function confirm(message: string, opts: Options, fn?: Callback): any;
+
+export declare function choose(message: string, choices: string[], fn?: Callback): any;
+export declare function choose(message: string, choices: string[], opts: Options, fn?: Callback): any;
diff --git a/promptly/promptly-tests.ts b/promptly/promptly-tests.ts
index b18578be53..05b8bf70ed 100644
--- a/promptly/promptly-tests.ts
+++ b/promptly/promptly-tests.ts
@@ -1,5 +1,4 @@
-///<reference path="../node/node.d.ts"/>
-///<reference path="promptly.d.ts"/>
+///<reference types="node"/>
 
 import promptly = require('promptly');
 
diff --git a/promptly/promptly.d.ts b/promptly/promptly.d.ts
deleted file mode 100644
index d0b68a3f23..0000000000
--- a/promptly/promptly.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-// Type definitions for node-promptly 1.1.1
-// Project: https://github.com/IndigoUnited/node-promptly
-// Definitions by: Dan Spencer <https://github.com/danrspencer>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../node/node.d.ts"/>
-
-declare module "promptly" {
-  import stream = require('stream');
-
-  interface Callback {
-    (err: Error, value: string): void;
-  }
-
-  export interface Options {
-    default?: string;
-    trim?: boolean;
-    validator?: any;
-    retry?: boolean;
-    silent?: boolean;
-    input?: NodeJS.ReadableStream;
-    output?: NodeJS.WritableStream;
-  }
-
-  export function prompt(message: string, fn?: Callback):any;
-  export function prompt(message: string, opts: Options, fn?: Callback):any;
-
-  export function password(message: string, fn?: Callback):any;
-  export function password(message: string, opts: Options, fn?: Callback):any;
-
-  export function confirm(message: string, fn?: Callback):any;
-  export function confirm(message: string, opts: Options, fn?: Callback):any;
-
-  export function choose(message: string, choices: string[], fn?: Callback):any;
-  export function choose(message: string, choices: string[], opts: Options, fn?: Callback):any;
-
-}
diff --git a/promptly/tsconfig.json b/promptly/tsconfig.json
new file mode 100644
index 0000000000..d1a17720d5
--- /dev/null
+++ b/promptly/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "promptly-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/protobufjs/index.d.ts b/protobufjs/index.d.ts
new file mode 100644
index 0000000000..75d507f7f9
--- /dev/null
+++ b/protobufjs/index.d.ts
@@ -0,0 +1,389 @@
+// Type definitions for ProtoBuf.js
+// Project: https://github.com/dcodeIO/ProtoBuf.js
+// Definitions by: Panu Horsmalahti <https://github.com/panuhorsmalahti>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare namespace ProtoBuf {
+    // ==========
+    // protobufjs/src/ProtoBuf.js
+
+    var Builder: Builder;
+    var ByteBuffer: Buffer;
+    var Long: LongStatic;
+    var DotProto: DotProto;
+    var Reflect: Reflect;
+
+    // var Lang: Lang; TODO: implement interface Lang
+    // var Util: Util; TODO: implement interface Util
+
+    export function loadJson(json: string, builder?: ProtoBuilder,
+        filename?: string): ProtoBuilder;
+
+    export function loadJsonFile(filename: string,
+        callback?: (error: any, builder: ProtoBuilder) => void,
+        builder?: ProtoBuilder): ProtoBuilder;
+
+    export function loadProto(proto: string, builder?: ProtoBuilder,
+        filename?: string): ProtoBuilder;
+
+    export function loadProtoFile(filePath: string,
+        callback?: (error: any, builder: ProtoBuilder) => void,
+        builder?: ProtoBuilder): ProtoBuilder;
+
+    export function newBuilder(options?: {[key: string]: any}): ProtoBuilder;
+
+    export interface LongStatic {
+      new(low?: number, high?: number, unsigned?:boolean): Long;
+
+      MAX_UNSIGNED_VALUE: Long;
+      MAX_VALUE: Long;
+      MIN_VALUE: Long;
+      NEG_ONE: Long;
+      ONE: Long;
+      UONE: Long;
+      UZERO: Long;
+      ZERO: Long;
+
+      fromBits(lowBits: number, highBits: number, unsigned?: boolean): Long;
+      fromInt(value: number, unsigned?: boolean): Long;
+      fromNumber(value: number, unsigned?: boolean): Long;
+      fromString(str: string, unsigned?: boolean | number, radix?: number): Long;
+      fromValue(val: Long | number | string): Long;
+
+      isLong(obj: any): boolean;
+    }
+
+    // Based on https://github.com/dcodeIO/Long.js and https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/long/long.d.ts
+    export interface Long {
+      high: number;
+      low: number;
+      unsigned :boolean;
+
+      add(other: Long | number | string): Long;
+      and(other: Long | number | string): Long;
+      compare(other: Long | number | string): number;
+      div(divisor: Long | number | string): Long;
+      equals(other: Long | number | string): boolean;
+      getHighBits(): number;
+      getHighBitsUnsigned(): number;
+      getLowBits(): number;
+      getLowBitsUnsigned(): number;
+      getNumBitsAbs(): number;
+      greaterThan(other: Long | number | string): boolean;
+      greaterThanOrEqual(other: Long | number | string): boolean;
+      isEven(): boolean;
+      isNegative(): boolean;
+      isOdd(): boolean;
+      isPositive(): boolean;
+      isZero(): boolean;
+      lessThan(other: Long | number | string): boolean;
+      lessThanOrEqual(other: Long | number | string): boolean;
+      modulo(divisor: Long | number | string): Long;
+      multiply(multiplier: Long | number | string): Long;
+      negate(): Long;
+      not(): Long;
+      notEquals(other: Long | number | string): boolean;
+      or(other: Long | number | string): Long;
+      shiftLeft(numBits: number | Long): Long;
+      shiftRight(numBits: number | Long): Long;
+      shiftRightUnsigned(numBits: number | Long): Long;
+      subtract(other: Long | number | string): Long;
+      toInt(): number;
+      toNumber(): number;
+      toSigned(): Long;
+      toString(radix?: number): string;
+      toUnsigned(): Long;
+      xor(other: Long | number | string): Long;
+    }
+
+    // ==========
+    // protobufjs/src/ProtoBuf/Builder.js
+
+    export interface Builder {
+        new(options?: {[key: string]: any}): ProtoBuilder;
+        Message: Message;
+        Service: Service;
+        isValidMessage(def: {[key: string]: any}): boolean;
+        isValidMessageField(def: {[key: string]: any}): boolean;
+        isValidEnum(def: {[key: string]: any}): boolean;
+        isValidService(def: {[key: string]: any}): boolean;
+        isValidExtend(def: {[key: string]: any}): boolean;
+    }
+
+    /**
+     * TODO: Confirm that message needs no further implementation
+     */
+    export interface Message {
+        new(values?: {[key: string]: any}, var_args?: string[]): Message;
+        [field: string]: any;
+  	}
+
+    /**
+     * TODO: Implement service interface
+     */
+    export interface Service {
+        new(rpcImpl?: Function): Service;
+    }
+
+
+    // ==========
+    // meta objects for constructing protobufs
+
+    export interface ProtoBuilder {
+        ns: ReflectNamespace;
+        ptr: ReflectNamespace;
+        resolved: boolean;
+        result: ProtoBuf;
+        files: string[];
+        importRoot: string;
+        options: {[key: string]: any};
+        syntax: string;
+        reset(): void;
+        define(pkg: string, options?: {[key: string]: any}): ProtoBuilder;
+        create(defs?: {[key: string]: any}[]): ProtoBuilder;
+        resolveAll(): void;
+    		build(path?: string): ProtoBuf;
+        lookup(path?: string): ReflectT;
+  	}
+
+    export interface ProtoBuf {
+        [package: string]: {[key: string]: MetaMessage | any};
+    }
+
+    export interface MetaMessage {
+        new(values?: {[key: string]: any}, var_args?: string[]): Message;
+        decode(buffer?: Buffer, enc?: string): Message;
+        decodeDelimited(buffer?: Buffer, enc?: string): Message;
+        decode64(str: string): Message;
+        decodeHex(str: string): Message;
+    }
+
+    // ==========
+    // protobufjs/src/ProtoBuf/DotProto.js
+
+    export interface DotProto {
+        Parser: Parser;
+        Tokenizer: Tokenizer;
+    }
+
+    export interface Parser {
+        new(proto: string): Parser;
+        tn: Tokenizer;
+        parse(): MetaProto;
+        toString(): string;
+    }
+
+    export interface Tokenizer {
+        new(proto: string): Tokenizer;
+        source: string;
+        index: number;
+        line: number;
+        stack: string[];
+        readingString: boolean;
+        stringEndsWith: string;
+        next(): string;
+        peek(): string;
+        toString(): string;
+    }
+
+    // ==========
+    // proto meta information returned by the Parser
+
+    export interface MetaProto {
+        package: string;
+        messages: ProtoMessage[];
+        enums: ProtoEnum[];
+        imports: string[];
+        options: {[key: string]: any};
+        services: ProtoService[];
+    }
+
+    export interface ProtoEnum {
+        name: string;
+        values: ProtoEnumValue;
+        options: {[key: string]: any};
+    }
+
+    export interface ProtoEnumValue {
+        name: string;
+        id: string;
+    }
+
+    export interface ProtoField {
+        rule: string;
+        options: {[key: string]: any};
+        type: string;
+        name: string;
+        id: number;
+        oneof?: string;
+    }
+
+    export interface ProtoMessage {
+        name: string;
+        isGroup?: boolean;
+        fields: ProtoField[];
+        enums: ProtoEnum[];
+        messages: ProtoMessage[];
+        options: {[key: string]: any};
+        oneofs: {[key: string]:number[]};
+    }
+
+    export interface ProtoRpcService {
+        request: string;
+        response: string;
+        options: {[key: string]: any};
+    }
+
+    export interface ProtoService {
+        name: string;
+        rpc: {[key: string]:ProtoRpcService};
+        options: {[key: string]: any};
+    }
+
+
+    // ==========
+    // protobufjs/src/ProtoBuf/Reflect.js
+
+    export interface Reflect {
+        T: ReflectT;
+        Namespace: ReflectNamespace;
+        Message: ReflectMessage;
+        Enum: ReflectEnum;
+        Extension: ReflectExtension;
+        Service: ReflectService;
+    }
+
+    export interface ReflectT {
+        new(builder?: ProtoBuilder, parent?: ReflectT, name?: string): ReflectT;
+        builder: ProtoBuilder;
+        parent: ReflectT;
+        name: string;
+        fqn(): string;
+        toString(includeClass?: boolean): string;
+    }
+
+    export interface ReflectNamespace extends ReflectT {
+        new(builder?: ProtoBuilder, parent?: ReflectNamespace, name?: string,
+            options?: {[key: string]: any}): ReflectNamespace;
+        className: string;
+        children: ReflectT[];
+        options: {[key: string]: any};
+        syntax: string;
+        getChildren(type?: ReflectT): ReflectT[];
+        addChild(child: ReflectT): void;
+        getChild(nameOrId?: string | number): ReflectT;
+        resolve(qn: string, excludeFields?: boolean): ReflectNamespace;
+        build(): ProtoBuf;
+        buildOpt(): {[key: string]: any};
+        getOption(name?: string): any;
+    }
+
+    export interface ReflectMessage extends ReflectNamespace {
+        new(builder?: ProtoBuilder, parent?: ReflectNamespace, name?: string,
+            options?: {[key: string]: any}, isGroup?: boolean): ReflectMessage;
+        Field: ReflectField; // NOTE: only for new ProtoBuf.Reflect.Message.Field();
+        ExtensionField: ReflectExtensionField; // NOTE: only for
+                                          // new ProtoBuf.Reflect.Message.ExtensionField();
+        OneOf: ReflectOneOf; // NOTE: only for new ProtoBuf.Reflect.Message.OneOf();
+        extensions: number[];
+        clazz(): MetaMessage;
+        isGroup: boolean;
+        build(rebuild?: boolean): MetaMessage|any;
+        encode(message: Message, buffer: Buffer, noVerify?: boolean): Buffer;
+        calculate(message: Message): number;
+        decode(buffer: Buffer, length?: number, expectedGroupEndId?: number): Message;
+    }
+
+    export interface ReflectEnum extends ReflectNamespace {
+        new(builder?: ProtoBuilder, parent?: ReflectT, name?: string,
+            options?: {[key: string]: any}): ReflectEnum;
+        Value: ReflectValue; // NOTE: only for new ProtoBuf.Reflect.Enum.Value();
+        object: {[key: string]:number};
+        build(): {[key: string]: any};
+    }
+
+    export interface ReflectExtension extends ReflectT {
+        new(builder?: ProtoBuilder, parent?: ReflectT, name?: string,
+            field?: ReflectField): ReflectExtension;
+        field: ReflectField;
+    }
+
+    export interface ReflectService extends ReflectNamespace {
+        new(): ReflectService;
+        Method: ReflectMethod; // NOTE: only for new ProtoBuf.Reflect.Service.Method();
+        RPCMethod: ReflectRPCMethod; // NOTE: only for new ProtoBuf.Reflect.Service.RPCMethod();
+        clazz(): Function;
+        build(rebuild?: boolean): Function|any;
+    }
+
+    // TODO: check that the runtime instance of this type reflects this definition
+    export interface ReflectField extends ReflectT {
+        new(builder: ProtoBuilder, message: ReflectMessage, rule: string, type: string,
+            name: string, id: number, options: {[key: string]: any}, oneof: ReflectOneOf): ReflectField;
+        className: string;
+        required: boolean;
+        repeated: boolean;
+        type: string | WireTuple;
+        resolvedType: ReflectT;
+        id: number;
+        options: {[key: string]: any};
+        defaultValue: any;
+        oneof: ReflectOneOf;
+        originalName: string;
+        build(): {[key: string]: any};
+        mkLong(value: any, unsigned?: boolean): number;
+        verifyValue(value: any, skipRepeated?: boolean): any;
+        encode(value: any, buffer: Buffer): Buffer;
+        encodeValue(value: any, buffer: Buffer): Buffer;
+        calculate(value: any): number;
+        calculateValue(value: any): number;
+        decode(wireType: number, buffer: Buffer, skipRepeated?: boolean): any;
+    }
+
+    export interface WireTuple {
+      name: string;
+      wireType: number;
+    }
+
+    // TODO: check that the runtime instance of this type reflects this definition
+    export interface ReflectExtensionField extends ReflectField {
+        new(builder: ProtoBuilder, message: ReflectMessage, rule: string, type: string,
+            name: string, id: number, options: {[key: string]: any}): ReflectExtensionField;
+        extension: ReflectExtension;
+    }
+
+    export interface ReflectOneOf extends ReflectT {
+        new(builder?: ProtoBuilder, message?: ReflectMessage, name?: string): ReflectOneOf;
+        fields: ReflectField[];
+    }
+
+    export interface ReflectValue extends ReflectT {
+        new(builder?: ProtoBuilder, enm?: ReflectEnum, name?: string, id?: number): ReflectValue;
+        className: string;
+        id: number;
+    }
+
+    export interface ReflectMethod extends ReflectT {
+        new(builder?: ProtoBuilder, svc?: ReflectService, name?: string,
+            options?: {[key: string]: any}): ReflectMethod;
+        className: string;
+        options: {[key: string]: any};
+        buildOpt(): {[key: string]: any};
+    }
+
+    export interface ReflectRPCMethod extends ReflectMethod {
+        new(builder?: ProtoBuilder, svc?: ReflectService, name?: string, request?: string,
+            response?: string, options?: {[key: string]: any}): ReflectRPCMethod;
+        requestName: string;
+        responseName: string;
+        resolvedRequestType: ReflectMessage;
+        resolvedResponseType: ReflectMessage;
+    }
+
+}
+
+declare module "protobufjs" {
+    export = ProtoBuf;
+}
diff --git a/protobufjs/protobufjs-tests.ts b/protobufjs/protobufjs-tests.ts
index 94afba0a8e..98080c1aec 100644
--- a/protobufjs/protobufjs-tests.ts
+++ b/protobufjs/protobufjs-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../chai/chai.d.ts" />
-/// <reference path="protobufjs.d.ts" />
+/// <reference types="chai" />
+
 
 var assert = require('chai').assert;
 var readFileSync = require('fs').readFileSync;
diff --git a/protobufjs/protobufjs.d.ts b/protobufjs/protobufjs.d.ts
deleted file mode 100644
index 96d9a932de..0000000000
--- a/protobufjs/protobufjs.d.ts
+++ /dev/null
@@ -1,389 +0,0 @@
-// Type definitions for ProtoBuf.js
-// Project: https://github.com/dcodeIO/ProtoBuf.js
-// Definitions by: Panu Horsmalahti <https://github.com/panuhorsmalahti>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare namespace ProtoBuf {
-    // ==========
-    // protobufjs/src/ProtoBuf.js
-
-    var Builder: Builder;
-    var ByteBuffer: Buffer;
-    var Long: LongStatic;
-    var DotProto: DotProto;
-    var Reflect: Reflect;
-
-    // var Lang: Lang; TODO: implement interface Lang
-    // var Util: Util; TODO: implement interface Util
-
-    export function loadJson(json: string, builder?: ProtoBuilder,
-        filename?: string): ProtoBuilder;
-
-    export function loadJsonFile(filename: string,
-        callback?: (error: any, builder: ProtoBuilder) => void,
-        builder?: ProtoBuilder): ProtoBuilder;
-
-    export function loadProto(proto: string, builder?: ProtoBuilder,
-        filename?: string): ProtoBuilder;
-
-    export function loadProtoFile(filePath: string,
-        callback?: (error: any, builder: ProtoBuilder) => void,
-        builder?: ProtoBuilder): ProtoBuilder;
-
-    export function newBuilder(options?: {[key: string]: any}): ProtoBuilder;
-
-    export interface LongStatic {
-      new(low?: number, high?: number, unsigned?:boolean): Long;
-
-      MAX_UNSIGNED_VALUE: Long;
-      MAX_VALUE: Long;
-      MIN_VALUE: Long;
-      NEG_ONE: Long;
-      ONE: Long;
-      UONE: Long;
-      UZERO: Long;
-      ZERO: Long;
-
-      fromBits(lowBits: number, highBits: number, unsigned?: boolean): Long;
-      fromInt(value: number, unsigned?: boolean): Long;
-      fromNumber(value: number, unsigned?: boolean): Long;
-      fromString(str: string, unsigned?: boolean | number, radix?: number): Long;
-      fromValue(val: Long | number | string): Long;
-
-      isLong(obj: any): boolean;
-    }
-
-    // Based on https://github.com/dcodeIO/Long.js and https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/long/long.d.ts
-    export interface Long {
-      high: number;
-      low: number;
-      unsigned :boolean;
-
-      add(other: Long | number | string): Long;
-      and(other: Long | number | string): Long;
-      compare(other: Long | number | string): number;
-      div(divisor: Long | number | string): Long;
-      equals(other: Long | number | string): boolean;
-      getHighBits(): number;
-      getHighBitsUnsigned(): number;
-      getLowBits(): number;
-      getLowBitsUnsigned(): number;
-      getNumBitsAbs(): number;
-      greaterThan(other: Long | number | string): boolean;
-      greaterThanOrEqual(other: Long | number | string): boolean;
-      isEven(): boolean;
-      isNegative(): boolean;
-      isOdd(): boolean;
-      isPositive(): boolean;
-      isZero(): boolean;
-      lessThan(other: Long | number | string): boolean;
-      lessThanOrEqual(other: Long | number | string): boolean;
-      modulo(divisor: Long | number | string): Long;
-      multiply(multiplier: Long | number | string): Long;
-      negate(): Long;
-      not(): Long;
-      notEquals(other: Long | number | string): boolean;
-      or(other: Long | number | string): Long;
-      shiftLeft(numBits: number | Long): Long;
-      shiftRight(numBits: number | Long): Long;
-      shiftRightUnsigned(numBits: number | Long): Long;
-      subtract(other: Long | number | string): Long;
-      toInt(): number;
-      toNumber(): number;
-      toSigned(): Long;
-      toString(radix?: number): string;
-      toUnsigned(): Long;
-      xor(other: Long | number | string): Long;
-    }
-
-    // ==========
-    // protobufjs/src/ProtoBuf/Builder.js
-
-    export interface Builder {
-        new(options?: {[key: string]: any}): ProtoBuilder;
-        Message: Message;
-        Service: Service;
-        isValidMessage(def: {[key: string]: any}): boolean;
-        isValidMessageField(def: {[key: string]: any}): boolean;
-        isValidEnum(def: {[key: string]: any}): boolean;
-        isValidService(def: {[key: string]: any}): boolean;
-        isValidExtend(def: {[key: string]: any}): boolean;
-    }
-
-    /**
-     * TODO: Confirm that message needs no further implementation
-     */
-    export interface Message {
-        new(values?: {[key: string]: any}, var_args?: string[]): Message;
-        [field: string]: any;
-  	}
-
-    /**
-     * TODO: Implement service interface
-     */
-    export interface Service {
-        new(rpcImpl?: Function): Service;
-    }
-
-
-    // ==========
-    // meta objects for constructing protobufs
-
-    export interface ProtoBuilder {
-        ns: ReflectNamespace;
-        ptr: ReflectNamespace;
-        resolved: boolean;
-        result: ProtoBuf;
-        files: string[];
-        importRoot: string;
-        options: {[key: string]: any};
-        syntax: string;
-        reset(): void;
-        define(pkg: string, options?: {[key: string]: any}): ProtoBuilder;
-        create(defs?: {[key: string]: any}[]): ProtoBuilder;
-        resolveAll(): void;
-    		build(path?: string): ProtoBuf;
-        lookup(path?: string): ReflectT;
-  	}
-
-    export interface ProtoBuf {
-        [package: string]: {[key: string]: MetaMessage | any};
-    }
-
-    export interface MetaMessage {
-        new(values?: {[key: string]: any}, var_args?: string[]): Message;
-        decode(buffer?: Buffer, enc?: string): Message;
-        decodeDelimited(buffer?: Buffer, enc?: string): Message;
-        decode64(str: string): Message;
-        decodeHex(str: string): Message;
-    }
-
-    // ==========
-    // protobufjs/src/ProtoBuf/DotProto.js
-
-    export interface DotProto {
-        Parser: Parser;
-        Tokenizer: Tokenizer;
-    }
-
-    export interface Parser {
-        new(proto: string): Parser;
-        tn: Tokenizer;
-        parse(): MetaProto;
-        toString(): string;
-    }
-
-    export interface Tokenizer {
-        new(proto: string): Tokenizer;
-        source: string;
-        index: number;
-        line: number;
-        stack: string[];
-        readingString: boolean;
-        stringEndsWith: string;
-        next(): string;
-        peek(): string;
-        toString(): string;
-    }
-
-    // ==========
-    // proto meta information returned by the Parser
-
-    export interface MetaProto {
-        package: string;
-        messages: ProtoMessage[];
-        enums: ProtoEnum[];
-        imports: string[];
-        options: {[key: string]: any};
-        services: ProtoService[];
-    }
-
-    export interface ProtoEnum {
-        name: string;
-        values: ProtoEnumValue;
-        options: {[key: string]: any};
-    }
-
-    export interface ProtoEnumValue {
-        name: string;
-        id: string;
-    }
-
-    export interface ProtoField {
-        rule: string;
-        options: {[key: string]: any};
-        type: string;
-        name: string;
-        id: number;
-        oneof?: string;
-    }
-
-    export interface ProtoMessage {
-        name: string;
-        isGroup?: boolean;
-        fields: ProtoField[];
-        enums: ProtoEnum[];
-        messages: ProtoMessage[];
-        options: {[key: string]: any};
-        oneofs: {[key: string]:number[]};
-    }
-
-    export interface ProtoRpcService {
-        request: string;
-        response: string;
-        options: {[key: string]: any};
-    }
-
-    export interface ProtoService {
-        name: string;
-        rpc: {[key: string]:ProtoRpcService};
-        options: {[key: string]: any};
-    }
-
-
-    // ==========
-    // protobufjs/src/ProtoBuf/Reflect.js
-
-    export interface Reflect {
-        T: ReflectT;
-        Namespace: ReflectNamespace;
-        Message: ReflectMessage;
-        Enum: ReflectEnum;
-        Extension: ReflectExtension;
-        Service: ReflectService;
-    }
-
-    export interface ReflectT {
-        new(builder?: ProtoBuilder, parent?: ReflectT, name?: string): ReflectT;
-        builder: ProtoBuilder;
-        parent: ReflectT;
-        name: string;
-        fqn(): string;
-        toString(includeClass?: boolean): string;
-    }
-
-    export interface ReflectNamespace extends ReflectT {
-        new(builder?: ProtoBuilder, parent?: ReflectNamespace, name?: string,
-            options?: {[key: string]: any}): ReflectNamespace;
-        className: string;
-        children: ReflectT[];
-        options: {[key: string]: any};
-        syntax: string;
-        getChildren(type?: ReflectT): ReflectT[];
-        addChild(child: ReflectT): void;
-        getChild(nameOrId?: string | number): ReflectT;
-        resolve(qn: string, excludeFields?: boolean): ReflectNamespace;
-        build(): ProtoBuf;
-        buildOpt(): {[key: string]: any};
-        getOption(name?: string): any;
-    }
-
-    export interface ReflectMessage extends ReflectNamespace {
-        new(builder?: ProtoBuilder, parent?: ReflectNamespace, name?: string,
-            options?: {[key: string]: any}, isGroup?: boolean): ReflectMessage;
-        Field: ReflectField; // NOTE: only for new ProtoBuf.Reflect.Message.Field();
-        ExtensionField: ReflectExtensionField; // NOTE: only for
-                                          // new ProtoBuf.Reflect.Message.ExtensionField();
-        OneOf: ReflectOneOf; // NOTE: only for new ProtoBuf.Reflect.Message.OneOf();
-        extensions: number[];
-        clazz(): MetaMessage;
-        isGroup: boolean;
-        build(rebuild?: boolean): MetaMessage|any;
-        encode(message: Message, buffer: Buffer, noVerify?: boolean): Buffer;
-        calculate(message: Message): number;
-        decode(buffer: Buffer, length?: number, expectedGroupEndId?: number): Message;
-    }
-
-    export interface ReflectEnum extends ReflectNamespace {
-        new(builder?: ProtoBuilder, parent?: ReflectT, name?: string,
-            options?: {[key: string]: any}): ReflectEnum;
-        Value: ReflectValue; // NOTE: only for new ProtoBuf.Reflect.Enum.Value();
-        object: {[key: string]:number};
-        build(): {[key: string]: any};
-    }
-
-    export interface ReflectExtension extends ReflectT {
-        new(builder?: ProtoBuilder, parent?: ReflectT, name?: string,
-            field?: ReflectField): ReflectExtension;
-        field: ReflectField;
-    }
-
-    export interface ReflectService extends ReflectNamespace {
-        new(): ReflectService;
-        Method: ReflectMethod; // NOTE: only for new ProtoBuf.Reflect.Service.Method();
-        RPCMethod: ReflectRPCMethod; // NOTE: only for new ProtoBuf.Reflect.Service.RPCMethod();
-        clazz(): Function;
-        build(rebuild?: boolean): Function|any;
-    }
-
-    // TODO: check that the runtime instance of this type reflects this definition
-    export interface ReflectField extends ReflectT {
-        new(builder: ProtoBuilder, message: ReflectMessage, rule: string, type: string,
-            name: string, id: number, options: {[key: string]: any}, oneof: ReflectOneOf): ReflectField;
-        className: string;
-        required: boolean;
-        repeated: boolean;
-        type: string | WireTuple;
-        resolvedType: ReflectT;
-        id: number;
-        options: {[key: string]: any};
-        defaultValue: any;
-        oneof: ReflectOneOf;
-        originalName: string;
-        build(): {[key: string]: any};
-        mkLong(value: any, unsigned?: boolean): number;
-        verifyValue(value: any, skipRepeated?: boolean): any;
-        encode(value: any, buffer: Buffer): Buffer;
-        encodeValue(value: any, buffer: Buffer): Buffer;
-        calculate(value: any): number;
-        calculateValue(value: any): number;
-        decode(wireType: number, buffer: Buffer, skipRepeated?: boolean): any;
-    }
-
-    export interface WireTuple {
-      name: string;
-      wireType: number;
-    }
-
-    // TODO: check that the runtime instance of this type reflects this definition
-    export interface ReflectExtensionField extends ReflectField {
-        new(builder: ProtoBuilder, message: ReflectMessage, rule: string, type: string,
-            name: string, id: number, options: {[key: string]: any}): ReflectExtensionField;
-        extension: ReflectExtension;
-    }
-
-    export interface ReflectOneOf extends ReflectT {
-        new(builder?: ProtoBuilder, message?: ReflectMessage, name?: string): ReflectOneOf;
-        fields: ReflectField[];
-    }
-
-    export interface ReflectValue extends ReflectT {
-        new(builder?: ProtoBuilder, enm?: ReflectEnum, name?: string, id?: number): ReflectValue;
-        className: string;
-        id: number;
-    }
-
-    export interface ReflectMethod extends ReflectT {
-        new(builder?: ProtoBuilder, svc?: ReflectService, name?: string,
-            options?: {[key: string]: any}): ReflectMethod;
-        className: string;
-        options: {[key: string]: any};
-        buildOpt(): {[key: string]: any};
-    }
-
-    export interface ReflectRPCMethod extends ReflectMethod {
-        new(builder?: ProtoBuilder, svc?: ReflectService, name?: string, request?: string,
-            response?: string, options?: {[key: string]: any}): ReflectRPCMethod;
-        requestName: string;
-        responseName: string;
-        resolvedRequestType: ReflectMessage;
-        resolvedResponseType: ReflectMessage;
-    }
-
-}
-
-declare module "protobufjs" {
-    export = ProtoBuf;
-}
diff --git a/protobufjs/tsconfig.json b/protobufjs/tsconfig.json
new file mode 100644
index 0000000000..7fa7655a83
--- /dev/null
+++ b/protobufjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "protobufjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/protractor-helpers/index.d.ts b/protractor-helpers/index.d.ts
new file mode 100644
index 0000000000..00df7cff98
--- /dev/null
+++ b/protractor-helpers/index.d.ts
@@ -0,0 +1,111 @@
+// Type definitions for protractor-helpers v1.0.0
+// Project: https://github.com/wix/protractor-helpers
+// Definitions by: John Cant <https://github.com/johncant/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="jasmine" />
+/// <reference types="selenium-webdriver" />
+
+// ElementArrayFinder
+
+declare namespace protractor {
+  interface ElementArrayFinder {
+    getByText(text: string) : protractor.ElementFinder;
+    $$data(hook: string) : protractor.ElementArrayFinder;
+  }
+
+  interface ElementFinder {
+    $data(hook: string) : protractor.ElementFinder;
+  }
+}
+
+// Globals
+
+declare function $data(hook: string) : protractor.ElementFinder;
+declare function $$data(hook: string) : protractor.ElementArrayFinder;
+
+
+// Locators
+
+// TODO - find out about result of querySelector and querySelector all.
+//        Are they Locator s?
+declare namespace protractor {
+	interface IProtractorLocatorStrategy {
+		dataHook(hook: string, optParentElement?: protractor.ElementFinder, optRootSelector?: string) : webdriver.Locator;
+		dataHookAll(hook: string, optParentElement?: protractor.ElementFinder, optRootSelector?: string) : webdriver.Locator;
+	}
+}
+
+// Matchers
+// TODO - Typescript doesn't really help much here
+//        we don't know what type is being tested.
+//        Fixing this would require modifying the
+//        jasmine d.ts.
+
+declare namespace jasmine {
+  interface Matchers {
+    toBePresent() : boolean;
+    toBeDisplayed() : boolean;
+    toHaveCountOf(expectedCount : number) : boolean;
+    toHaveText(expectedText : string) : boolean;
+    toMatchRegex(regex : RegExp) : boolean;
+    toMatchMoney(expectedValue : number, currencySymbol? : string) : boolean;
+    toMatchMoneyWithFraction(expectedValue : number, currencySymbol?: string) : boolean;
+    toHaveValue(actual: string | number) : boolean;
+    toHaveClass(className : string) : boolean;
+    toHaveUrl(url : string) : boolean;
+    toBeDisabled() : boolean;
+    toBeChecked() : boolean;
+    toBeValid() : boolean;
+    toBeInvalid() : boolean;
+    toBeInvalidRequired() : boolean;
+    // Copied definitions from angular-translate.
+    toMatchTranslated(translationId : string, interpolateParams? : any) : boolean;
+    toMatchTranslated(translationId : string[], interpolateParams? : any) : boolean;
+  }
+}
+
+
+declare module "protractor-helpers" {
+
+  function not(arg: webdriver.promise.IThenable<any>) : webdriver.promise.IThenable<boolean>;
+
+  // Copied definitions from angular-translate.
+  function translate(translationId: string, interpolateParams?: any): webdriver.promise.IThenable<string>;
+  function translate(translationId: string[], interpolateParams?: any): webdriver.promise.IThenable<{ [key: string]: string }>;
+
+  function safeGet(url: string) : void;
+
+  function maximizeWindow(width?: number, height?: number) : void; // TODO
+  function resetPosition() : void;
+  function moveToElement(hook: string) : void;
+  function displayHover(element: protractor.ElementFinder) : void;
+
+  function waitForElement(element: protractor.ElementFinder, timeout?: number) : void;
+  function waitForElementToDisappear(element: protractor.ElementFinder, timeout?: number) : void;
+
+  function selectOptionByText(select: protractor.ElementFinder, text: string) : void;
+  function selectOptionByIndex(select: protractor.ElementFinder, index: number) : void;
+
+  function selectOption(option: protractor.ElementFinder) : void
+
+  function isFirefox() : boolean;
+  function isIE() : boolean;
+
+  function createMessage(actual : string, message : string, isNot : any) : string; // isNot : boolean too inflexible
+  function createMessage(actual : protractor.ElementFinder, message : string, isNot : any) : string; // isNot : boolean too inflexible
+  function createMessage(actual : protractor.ElementArrayFinder, message : string, isNot : any) : string; // isNot : boolean too inflexible
+
+  function clearAndSetValue(input : protractor.ElementFinder, value : string) : void; // TODO - sendKeys(value)
+
+  function hasClass(element: protractor.ElementFinder, className: string) : webdriver.promise.IThenable<boolean>;
+  function hasValue(element: protractor.ElementFinder, expectedValue: string) : webdriver.promise.IThenable<boolean>;
+  function hasValue(element: protractor.ElementFinder, expectedValue: number) : webdriver.promise.IThenable<boolean>;
+  function hasLink(element: protractor.ElementFinder, url: string) : webdriver.promise.IThenable<boolean>;
+  function isDisabled(element: protractor.ElementFinder) : webdriver.promise.IThenable<boolean>;
+  function isChecked(element: protractor.ElementFinder) : webdriver.promise.IThenable<boolean>;
+  function getFilteredConsoleErrors() : webdriver.promise.IThenable<string[]>; // TODO - discuss handling in IE
+
+}
+
diff --git a/protractor-helpers/protractor-helpers-tests.ts b/protractor-helpers/protractor-helpers-tests.ts
index b80c57c537..269390080e 100644
--- a/protractor-helpers/protractor-helpers-tests.ts
+++ b/protractor-helpers/protractor-helpers-tests.ts
@@ -1,7 +1,9 @@
-/// <reference path="./protractor-helpers.d.ts" />
+
 
 import helpers = require('protractor-helpers');
 
+declare var $$: any, $: any, by: any, element: any; // ??
+
 function testElementArrayFinder() {
 
   var single1 : protractor.ElementFinder = $$('.foo').getByText('Hello');
diff --git a/protractor-helpers/protractor-helpers.d.ts b/protractor-helpers/protractor-helpers.d.ts
deleted file mode 100644
index 20aad94c54..0000000000
--- a/protractor-helpers/protractor-helpers.d.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-// Type definitions for protractor-helpers v1.0.0
-// Project: https://github.com/wix/protractor-helpers
-// Definitions by: John Cant <https://github.com/johncant/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angular-protractor/angular-protractor.d.ts" />
-/// <reference path="../jasmine/jasmine.d.ts" />
-/// <reference path="../selenium-webdriver/selenium-webdriver.d.ts" />
-
-// ElementArrayFinder
-
-declare namespace protractor {
-  interface ElementArrayFinder {
-    getByText(text: string) : protractor.ElementFinder;
-    $$data(hook: string) : protractor.ElementArrayFinder;
-  }
-
-  interface ElementFinder {
-    $data(hook: string) : protractor.ElementFinder;
-  }
-}
-
-// Globals
-
-declare function $data(hook: string) : protractor.ElementFinder;
-declare function $$data(hook: string) : protractor.ElementArrayFinder;
-
-
-// Locators
-
-// TODO - find out about result of querySelector and querySelector all.
-//        Are they Locator s?
-declare namespace protractor {
-	interface IProtractorLocatorStrategy {
-		dataHook(hook: string, optParentElement?: protractor.ElementFinder, optRootSelector?: string) : webdriver.Locator;
-		dataHookAll(hook: string, optParentElement?: protractor.ElementFinder, optRootSelector?: string) : webdriver.Locator;
-	}
-}
-
-// Matchers
-// TODO - Typescript doesn't really help much here
-//        we don't know what type is being tested.
-//        Fixing this would require modifying the
-//        jasmine d.ts.
-
-declare namespace jasmine {
-  interface Matchers {
-    toBePresent() : boolean;
-    toBeDisplayed() : boolean;
-    toHaveCountOf(expectedCount : number) : boolean;
-    toHaveText(expectedText : string) : boolean;
-    toMatchRegex(regex : RegExp) : boolean;
-    toMatchMoney(expectedValue : number, currencySymbol? : string) : boolean;
-    toMatchMoneyWithFraction(expectedValue : number, currencySymbol?: string) : boolean;
-    toHaveValue(actual: string | number) : boolean;
-    toHaveClass(className : string) : boolean;
-    toHaveUrl(url : string) : boolean;
-    toBeDisabled() : boolean;
-    toBeChecked() : boolean;
-    toBeValid() : boolean;
-    toBeInvalid() : boolean;
-    toBeInvalidRequired() : boolean;
-    // Copied definitions from angular-translate.
-    toMatchTranslated(translationId : string, interpolateParams? : any) : boolean;
-    toMatchTranslated(translationId : string[], interpolateParams? : any) : boolean;
-  }
-}
-
-
-declare module "protractor-helpers" {
-
-  function not(arg: webdriver.promise.IThenable<any>) : webdriver.promise.IThenable<boolean>;
-
-  // Copied definitions from angular-translate.
-  function translate(translationId: string, interpolateParams?: any): webdriver.promise.IThenable<string>;
-  function translate(translationId: string[], interpolateParams?: any): webdriver.promise.IThenable<{ [key: string]: string }>;
-
-  function safeGet(url: string) : void;
-
-  function maximizeWindow(width?: number, height?: number) : void; // TODO
-  function resetPosition() : void;
-  function moveToElement(hook: string) : void;
-  function displayHover(element: protractor.ElementFinder) : void;
-
-  function waitForElement(element: protractor.ElementFinder, timeout?: number) : void;
-  function waitForElementToDisappear(element: protractor.ElementFinder, timeout?: number) : void;
-
-  function selectOptionByText(select: protractor.ElementFinder, text: string) : void;
-  function selectOptionByIndex(select: protractor.ElementFinder, index: number) : void;
-
-  function selectOption(option: protractor.ElementFinder) : void
-
-  function isFirefox() : boolean;
-  function isIE() : boolean;
-
-  function createMessage(actual : string, message : string, isNot : any) : string; // isNot : boolean too inflexible
-  function createMessage(actual : protractor.ElementFinder, message : string, isNot : any) : string; // isNot : boolean too inflexible
-  function createMessage(actual : protractor.ElementArrayFinder, message : string, isNot : any) : string; // isNot : boolean too inflexible
-
-  function clearAndSetValue(input : protractor.ElementFinder, value : string) : void; // TODO - sendKeys(value)
-
-  function hasClass(element: protractor.ElementFinder, className: string) : webdriver.promise.IThenable<boolean>;
-  function hasValue(element: protractor.ElementFinder, expectedValue: string) : webdriver.promise.IThenable<boolean>;
-  function hasValue(element: protractor.ElementFinder, expectedValue: number) : webdriver.promise.IThenable<boolean>;
-  function hasLink(element: protractor.ElementFinder, url: string) : webdriver.promise.IThenable<boolean>;
-  function isDisabled(element: protractor.ElementFinder) : webdriver.promise.IThenable<boolean>;
-  function isChecked(element: protractor.ElementFinder) : webdriver.promise.IThenable<boolean>;
-  function getFilteredConsoleErrors() : webdriver.promise.IThenable<string[]>; // TODO - discuss handling in IE
-
-}
-
diff --git a/protractor-helpers/tsconfig.json b/protractor-helpers/tsconfig.json
new file mode 100644
index 0000000000..873e42bc31
--- /dev/null
+++ b/protractor-helpers/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "protractor-helpers-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/protractor-http-mock/index.d.ts b/protractor-http-mock/index.d.ts
new file mode 100644
index 0000000000..79e07067ee
--- /dev/null
+++ b/protractor-http-mock/index.d.ts
@@ -0,0 +1,229 @@
+// Type definitions for protractor-http-mock
+// Project: https://github.com/atecarlos/protractor-http-mock
+// Definitions by: Crevil <https://github.com/Crevil>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="selenium-webdriver" />
+
+declare namespace mock {
+    interface ProtractorHttpMock {
+        /**
+         * Instantiate mock module. This must be done before the browser connects.
+         *
+         * @param mocks An array of mock modules to load into the application.
+         * @param skipDefaults Set true to skip loading of default mocks.
+         */
+        <T>(mocks?: Array<requests.BaseRequest<T>>, skipDefaults?: boolean): ProtractorHttpMock;
+
+        /**
+         * Instantiate mock modules from files. This must be done before the browser connects.
+         *
+         * @param mocks An array of mock module names relative to the rootDirectory configuration.
+         */
+        (mocks: Array<string>): ProtractorHttpMock;
+
+        /**
+         * Clean up.
+         * Typically done in the afterEach call to ensure the teardown
+         * is executed regardless of what happens in the test execution.
+         */
+        teardown(): void;
+
+        /**
+         * Returns a promise that will be resolved with an array of
+         * all matched HTTP requests.
+         */
+        requestsMade(): webdriver.promise.Promise<Array<ReceivedRequest>>;
+
+        /**
+         * Returns a promise that will be resolved with a true boolean
+         * when all matched HTTP requests are cleared.
+         */
+        clearRequests(): webdriver.promise.Promise<boolean>;
+
+        /**
+         * Module configuration to setup
+         */
+        config: {
+            /**
+             * Mocks directory where mock files are located.
+             * Default: process.cwd()
+             */
+            rootDirectory?: string;
+
+            /**
+             * Path to protractor configuration file.
+             * Default: protractor.conf
+             */
+            protractorConfig?: string;
+        };
+
+        /**
+         * Add mock dynamically.
+         * Returns a promise that will be resolved with a true boolean
+         * when mocks have been added.
+         *
+         * @param mocks An array of mock modules to load into the application.
+         */
+        add<T>(mocks: Array<requests.BaseRequest<T>>): webdriver.promise.Promise<boolean>;
+
+        /**
+         * Remove mock dynamically.
+         * Returns a promise that will be resolved with a true boolean
+         * when mocks have been removed.
+         *
+         * @param mocks An array of mock modules to remove from the application.
+         */
+        remove<T>(mocks: Array<requests.BaseRequest<T>>): webdriver.promise.Promise<boolean>;
+    }
+
+    /**
+     * Matched request.
+     */
+    interface ReceivedRequest {
+        url: string;
+        method: string;
+    }
+
+    namespace requests {
+        /**
+         * Request methods type
+         */
+        type Method = "GET" | "POST" | "DELETE" | "PUT" | "HEAD" | "PATCH" | "JSONP";
+
+        /**
+         * Base request mock used for all mocks.
+         */
+        interface BaseRequest<TResponse> {
+            request: {
+                method: Method;
+                path: string;
+            };
+            response: {
+                status: number;
+                data: TResponse;
+            };
+        }
+
+        /**
+         * GET request mock.
+         */
+        interface Get<TResponse> extends BaseRequest<TResponse> {
+            request: {
+                method: Method;
+                path: string;
+                params?: Object;
+                queryString?: Object;
+                headers?: Object;
+                interceptedRequest?: boolean;
+                interceptedAnonymousRequest?: boolean;
+            };
+            response: {
+                status: number;
+                data: TResponse;
+            };
+        }
+
+        /**
+         * POST request mock with payload.
+         */
+        interface PostData<TResponse, TPayload> extends BaseRequest<TResponse> {
+            request: {
+                path: string;
+                method: Method;
+                data: TPayload;
+            };
+            response: {
+                status: number;
+                data: TResponse;
+            };
+        }
+
+        /**
+         * POST request mock.
+         */
+        interface Post<TResponse> extends BaseRequest<TResponse> {
+            request: {
+                path: string;
+                method: Method;
+            };
+            response: {
+                status: number;
+                data: TResponse;
+            };
+        }
+
+        /**
+         * HEAD request mock.
+         */
+        interface Head<TResponse> extends BaseRequest<TResponse> {
+            request: {
+                path: string;
+                method: Method;
+            };
+            response: {
+                status: number;
+                data: TResponse;
+            };
+        }
+
+        /**
+         * HTTP Delete request mock.
+         */
+        interface Delete<TResponse> extends BaseRequest<TResponse> {
+            request: {
+                path: string;
+                method: Method;
+            };
+            response: {
+                status: number;
+                data: TResponse;
+            };
+        }
+
+        /**
+         * PUT request mock.
+         */
+        interface Put<TResponse> extends BaseRequest<TResponse> {
+            request: {
+                path: string;
+                method: Method;
+            };
+            response: {
+                status: number;
+                data: TResponse;
+            };
+        }
+
+        /**
+         * PATCH request mock.
+         */
+        interface Patch<TResponse> extends BaseRequest<TResponse> {
+            request: {
+                path: string;
+                method: Method;
+            };
+            response: {
+                status: number;
+                data: TResponse;
+            };
+        }
+
+        /**
+         * JSONP request mock.
+         */
+        interface Jsonp<TResponse> extends BaseRequest<TResponse> {
+            request: {
+                path: string;
+                method: Method;
+            };
+            response: {
+                status: number;
+                data: TResponse;
+            };
+        }
+    }
+}
+
+declare var mock: mock.ProtractorHttpMock;
+export = mock;
diff --git a/protractor-http-mock/protractor-http-mock-tests.ts b/protractor-http-mock/protractor-http-mock-tests.ts
index e6620d015f..f556c49985 100644
--- a/protractor-http-mock/protractor-http-mock-tests.ts
+++ b/protractor-http-mock/protractor-http-mock-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./protractor-http-mock.d.ts" />
+import mock = require("protractor-http-mock");
 
 function TestConfig() {
     mock.config = {
diff --git a/protractor-http-mock/protractor-http-mock.d.ts b/protractor-http-mock/protractor-http-mock.d.ts
deleted file mode 100644
index b953d8eb22..0000000000
--- a/protractor-http-mock/protractor-http-mock.d.ts
+++ /dev/null
@@ -1,232 +0,0 @@
-// Type definitions for protractor-http-mock
-// Project: https://github.com/atecarlos/protractor-http-mock
-// Definitions by: Crevil <https://github.com/Crevil>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../selenium-webdriver/selenium-webdriver.d.ts" />
-
-declare namespace mock {
-    interface ProtractorHttpMock {
-        /**
-         * Instantiate mock module. This must be done before the browser connects.
-         *
-         * @param mocks An array of mock modules to load into the application.
-         * @param skipDefaults Set true to skip loading of default mocks.
-         */
-        <T>(mocks?: Array<requests.BaseRequest<T>>, skipDefaults?: boolean): ProtractorHttpMock;
-
-        /**
-         * Instantiate mock modules from files. This must be done before the browser connects.
-         *
-         * @param mocks An array of mock module names relative to the rootDirectory configuration.
-         */
-        (mocks: Array<string>): ProtractorHttpMock;
-
-        /**
-         * Clean up.
-         * Typically done in the afterEach call to ensure the teardown
-         * is executed regardless of what happens in the test execution.
-         */
-        teardown(): void;
-
-        /**
-         * Returns a promise that will be resolved with an array of
-         * all matched HTTP requests.
-         */
-        requestsMade(): webdriver.promise.Promise<Array<ReceivedRequest>>;
-
-        /**
-         * Returns a promise that will be resolved with a true boolean
-         * when all matched HTTP requests are cleared.
-         */
-        clearRequests(): webdriver.promise.Promise<boolean>;
-
-        /**
-         * Module configuration to setup
-         */
-        config: {
-            /**
-             * Mocks directory where mock files are located.
-             * Default: process.cwd()
-             */
-            rootDirectory?: string;
-
-            /**
-             * Path to protractor configuration file.
-             * Default: protractor.conf
-             */
-            protractorConfig?: string;
-        };
-
-        /**
-         * Add mock dynamically.
-         * Returns a promise that will be resolved with a true boolean
-         * when mocks have been added.
-         *
-         * @param mocks An array of mock modules to load into the application.
-         */
-        add<T>(mocks: Array<requests.BaseRequest<T>>): webdriver.promise.Promise<boolean>;
-
-        /**
-         * Remove mock dynamically.
-         * Returns a promise that will be resolved with a true boolean
-         * when mocks have been removed.
-         *
-         * @param mocks An array of mock modules to remove from the application.
-         */
-        remove<T>(mocks: Array<requests.BaseRequest<T>>): webdriver.promise.Promise<boolean>;
-    }
-
-    /**
-     * Matched request.
-     */
-    interface ReceivedRequest {
-        url: string;
-        method: string;
-    }
-
-    namespace requests {
-        /**
-         * Request methods type
-         */
-        type Method = "GET" | "POST" | "DELETE" | "PUT" | "HEAD" | "PATCH" | "JSONP";
-
-        /**
-         * Base request mock used for all mocks.
-         */
-        interface BaseRequest<TResponse> {
-            request: {
-                method: Method;
-                path: string;
-            };
-            response: {
-                status: number;
-                data: TResponse;
-            };
-        }
-
-        /**
-         * GET request mock.
-         */
-        interface Get<TResponse> extends BaseRequest<TResponse> {
-            request: {
-                method: Method;
-                path: string;
-                params?: Object;
-                queryString?: Object;
-                headers?: Object;
-                interceptedRequest?: boolean;
-                interceptedAnonymousRequest?: boolean;
-            };
-            response: {
-                status: number;
-                data: TResponse;
-            };
-        }
-
-        /**
-         * POST request mock with payload.
-         */
-        interface PostData<TResponse, TPayload> extends BaseRequest<TResponse> {
-            request: {
-                path: string;
-                method: Method;
-                data: TPayload;
-            };
-            response: {
-                status: number;
-                data: TResponse;
-            };
-        }
-
-        /**
-         * POST request mock.
-         */
-        interface Post<TResponse> extends BaseRequest<TResponse> {
-            request: {
-                path: string;
-                method: Method;
-            };
-            response: {
-                status: number;
-                data: TResponse;
-            };
-        }
-
-        /**
-         * HEAD request mock.
-         */
-        interface Head<TResponse> extends BaseRequest<TResponse> {
-            request: {
-                path: string;
-                method: Method;
-            };
-            response: {
-                status: number;
-                data: TResponse;
-            };
-        }
-
-        /**
-         * HTTP Delete request mock.
-         */
-        interface Delete<TResponse> extends BaseRequest<TResponse> {
-            request: {
-                path: string;
-                method: Method;
-            };
-            response: {
-                status: number;
-                data: TResponse;
-            };
-        }
-
-        /**
-         * PUT request mock.
-         */
-        interface Put<TResponse> extends BaseRequest<TResponse> {
-            request: {
-                path: string;
-                method: Method;
-            };
-            response: {
-                status: number;
-                data: TResponse;
-            };
-        }
-
-        /**
-         * PATCH request mock.
-         */
-        interface Patch<TResponse> extends BaseRequest<TResponse> {
-            request: {
-                path: string;
-                method: Method;
-            };
-            response: {
-                status: number;
-                data: TResponse;
-            };
-        }
-
-        /**
-         * JSONP request mock.
-         */
-        interface Jsonp<TResponse> extends BaseRequest<TResponse> {
-            request: {
-                path: string;
-                method: Method;
-            };
-            response: {
-                status: number;
-                data: TResponse;
-            };
-        }
-    }
-}
-
-declare var mock: mock.ProtractorHttpMock;
-
-declare module "protractor-http-mock" {
-    export = mock;
-}
diff --git a/protractor-http-mock/tsconfig.json b/protractor-http-mock/tsconfig.json
new file mode 100644
index 0000000000..2a6ae2098d
--- /dev/null
+++ b/protractor-http-mock/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "protractor-http-mock-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/angular-protractor/angular-protractor-tests.ts b/protractor/angular-protractor-tests.ts
similarity index 99%
rename from angular-protractor/angular-protractor-tests.ts
rename to protractor/angular-protractor-tests.ts
index 64bf8d6d6b..0a7ae85357 100644
--- a/angular-protractor/angular-protractor-tests.ts
+++ b/protractor/angular-protractor-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="angular-protractor.d.ts" />
+
 
 function TestWebDriverExports() {
     var button: number = protractor.Button.LEFT;
diff --git a/protractor/index.d.ts b/protractor/index.d.ts
new file mode 100644
index 0000000000..86f00898a1
--- /dev/null
+++ b/protractor/index.d.ts
@@ -0,0 +1,1849 @@
+// Type definitions for Angular Protractor 1.5.0
+// Project: https://github.com/angular/protractor
+// Definitions by: Bill Armstrong <https://github.com/BillArmstrong>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="selenium-webdriver" />
+
+declare namespace protractor {
+    //region Wrapped webdriver Items
+
+    class ActionSequence extends webdriver.ActionSequence {}
+    class Builder extends webdriver.Builder {}
+    class Capabilities extends webdriver.Capabilities {}
+    class Command extends webdriver.Command {}
+    class EventEmitter extends webdriver.EventEmitter {}
+    class Session extends webdriver.Session {}
+    class WebDriver extends webdriver.WebDriver {}
+    class WebElement extends webdriver.WebElement {}
+    class WebElementPromise extends webdriver.WebElementPromise { }
+
+    var Browser: webdriver.IBrowser;
+    var Button: webdriver.IButton;
+    var Capability: webdriver.ICapability;
+    var CommandName: webdriver.ICommandName;
+    var Key: webdriver.IKey;
+
+    namespace error {
+        class Error extends webdriver.error.Error {}
+        var ErrorCode: webdriver.error.IErrorCode;
+    }
+
+    namespace logging {
+        class Preferences extends webdriver.logging.Preferences { }
+        class Entry extends webdriver.logging.Entry { }
+
+        var Type: webdriver.logging.IType;
+        var Level: webdriver.logging.ILevelValues;
+
+        function getLevel(nameOrValue: string): webdriver.logging.ILevel;
+        function getLevel(nameOrValue: number): webdriver.logging.ILevel;
+    }
+
+    namespace promise {
+        class Thenable<T> extends webdriver.promise.Thenable<T> { }
+        class Promise<T> extends webdriver.promise.Promise<T> { }
+        class Deferred<T> extends webdriver.promise.Deferred<T> { }
+        class ControlFlow extends webdriver.promise.ControlFlow { }
+        class CancellationError extends webdriver.promise.CancellationError { }
+
+        /**
+         * Given an array of promises, will return a promise that will be fulfilled
+         * with the fulfillment values of the input array's values. If any of the
+         * input array's promises are rejected, the returned promise will be rejected
+         * with the same reason.
+         *
+         * @param {!Array.<(T|!webdriver.promise.Promise.<T>)>} arr An array of
+         *     promises to wait on.
+         * @return {!webdriver.promise.Promise.<!Array.<T>>} A promise that is
+         *     fulfilled with an array containing the fulfilled values of the
+         *     input array, or rejected with the same reason as the first
+         *     rejected value.
+         * @template T
+         */
+        function all(arr: webdriver.promise.Promise<any>[]): webdriver.promise.Promise<any[]>;
+
+        /**
+         * Invokes the appropriate callback function as soon as a promised
+         * {@code value} is resolved. This function is similar to
+         * {@link webdriver.promise.when}, except it does not return a new promise.
+         * @param {*} value The value to observe.
+         * @param {Function} callback The function to call when the value is
+         *     resolved successfully.
+         * @param {Function=} opt_errback The function to call when the value is
+         *     rejected.
+         */
+        function asap(value: any, callback: Function, opt_errback?: Function): void;
+
+        /**
+         * @return {!webdriver.promise.ControlFlow} The currently active control flow.
+         */
+        function controlFlow(): webdriver.promise.ControlFlow;
+
+        /**
+         * Creates a new control flow. The provided callback will be invoked as the
+         * first task within the new flow, with the flow as its sole argument. Returns
+         * a promise that resolves to the callback result.
+         * @param {function(!webdriver.promise.ControlFlow)} callback The entry point
+         *     to the newly created flow.
+         * @return {!webdriver.promise.Promise} A promise that resolves to the callback
+         *     result.
+         */
+        function createFlow<R>(callback: (flow: webdriver.promise.ControlFlow) => R): webdriver.promise.Promise<R>;
+
+        /**
+         * Determines whether a {@code value} should be treated as a promise.
+         * Any object whose "then" property is a function will be considered a promise.
+         *
+         * @param {*} value The value to test.
+         * @return {boolean} Whether the value is a promise.
+         */
+        function isPromise(value: any): boolean;
+
+        /**
+         * Tests is a function is a generator.
+         * @param {!Function} fn The function to test.
+         * @return {boolean} Whether the function is a generator.
+         */
+        function isGenerator(fn: Function): boolean;
+
+        /**
+         * Creates a promise that will be resolved at a set time in the future.
+         * @param {number} ms The amount of time, in milliseconds, to wait before
+         *     resolving the promise.
+         * @return {!webdriver.promise.Promise} The promise.
+         */
+        function delayed(ms: number): webdriver.promise.Promise<void>;
+
+        /**
+         * Calls a function for each element in an array, and if the function returns
+         * true adds the element to a new array.
+         *
+         * <p>If the return value of the filter function is a promise, this function
+         * will wait for it to be fulfilled before determining whether to insert the
+         * element into the new array.
+         *
+         * <p>If the filter function throws or returns a rejected promise, the promise
+         * returned by this function will be rejected with the same reason. Only the
+         * first failure will be reported; all subsequent errors will be silently
+         * ignored.
+         *
+         * @param {!(Array.<TYPE>|webdriver.promise.Promise.<!Array.<TYPE>>)} arr The
+         *     array to iterator over, or a promise that will resolve to said array.
+         * @param {function(this: SELF, TYPE, number, !Array.<TYPE>): (
+         *             boolean|webdriver.promise.Promise.<boolean>)} fn The function
+         *     to call for each element in the array.
+         * @param {SELF=} opt_self The object to be used as the value of 'this' within
+         *     {@code fn}.
+         * @template TYPE, SELF
+         */
+        function filter<T>(arr: T[], fn: (element: T, index: number, array: T[]) => any, opt_self?: any): webdriver.promise.Promise<T[]>;
+        function filter<T>(arr: webdriver.promise.Promise<T[]>, fn: (element: T, index: number, array: T[]) => any, opt_self?: any): webdriver.promise.Promise<T[]>
+
+        /**
+         * Creates a new deferred object.
+         * @return {!webdriver.promise.Deferred} The new deferred object.
+         */
+        function defer<T>(): webdriver.promise.Deferred<T>;
+
+        /**
+         * Creates a promise that has been resolved with the given value.
+         * @param {*=} opt_value The resolved value.
+         * @return {!webdriver.promise.Promise} The resolved promise.
+         */
+        function fulfilled<T>(opt_value?: T): webdriver.promise.Promise<T>;
+
+        /**
+         * Calls a function for each element in an array and inserts the result into a
+         * new array, which is used as the fulfillment value of the promise returned
+         * by this function.
+         *
+         * <p>If the return value of the mapping function is a promise, this function
+         * will wait for it to be fulfilled before inserting it into the new array.
+         *
+         * <p>If the mapping function throws or returns a rejected promise, the
+         * promise returned by this function will be rejected with the same reason.
+         * Only the first failure will be reported; all subsequent errors will be
+         * silently ignored.
+         *
+         * @param {!(Array.<TYPE>|webdriver.promise.Promise.<!Array.<TYPE>>)} arr The
+         *     array to iterator over, or a promise that will resolve to said array.
+         * @param {function(this: SELF, TYPE, number, !Array.<TYPE>): ?} fn The
+         *     function to call for each element in the array. This function should
+         *     expect three arguments (the element, the index, and the array itself.
+         * @param {SELF=} opt_self The object to be used as the value of 'this' within
+         *     {@code fn}.
+         * @template TYPE, SELF
+         */
+        function map<T>(arr: T[], fn: (element: T, index: number, array: T[]) => any, opt_self?: any): webdriver.promise.Promise<T[]>
+        function map<T>(arr: webdriver.promise.Promise<T[]>, fn: (element: T, index: number, array: T[]) => any, opt_self?: any): webdriver.promise.Promise<T[]>
+
+        /**
+         * Creates a promise that has been rejected with the given reason.
+         * @param {*=} opt_reason The rejection reason; may be any value, but is
+         *     usually an Error or a string.
+         * @return {!webdriver.promise.Promise} The rejected promise.
+         */
+        function rejected(opt_reason?: any): webdriver.promise.Promise<void>;
+
+        /**
+         * Wraps a function that is assumed to be a node-style callback as its final
+         * argument. This callback takes two arguments: an error value (which will be
+         * null if the call succeeded), and the success value as the second argument.
+         * If the call fails, the returned promise will be rejected, otherwise it will
+         * be resolved with the result.
+         * @param {!Function} fn The function to wrap.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
+         *     result of the provided function's callback.
+         */
+        function checkedNodeCall<T>(fn: Function, ...var_args: any[]): webdriver.promise.Promise<T>;
+
+        /**
+         * Consumes a {@code GeneratorFunction}. Each time the generator yields a
+         * promise, this function will wait for it to be fulfilled before feeding the
+         * fulfilled value back into {@code next}. Likewise, if a yielded promise is
+         * rejected, the rejection error will be passed to {@code throw}.
+         *
+         * <p>Example 1: the Fibonacci Sequence.
+         * <pre><code>
+         * webdriver.promise.consume(function* fibonacci() {
+         *   var n1 = 1, n2 = 1;
+         *   for (var i = 0; i < 4; ++i) {
+         *     var tmp = yield n1 + n2;
+         *     n1 = n2;
+         *     n2 = tmp;
+         *   }
+         *   return n1 + n2;
+         * }).then(function(result) {
+         *   console.log(result);  // 13
+         * });
+         * </code></pre>
+         *
+         * <p>Example 2: a generator that throws.
+         * <pre><code>
+         * webdriver.promise.consume(function* () {
+         *   yield webdriver.promise.delayed(250).then(function() {
+         *     throw Error('boom');
+         *   });
+         * }).thenCatch(function(e) {
+         *   console.log(e.toString());  // Error: boom
+         * });
+         * </code></pre>
+         *
+         * @param {!Function} generatorFn The generator function to execute.
+         * @param {Object=} opt_self The object to use as "this" when invoking the
+         *     initial generator.
+         * @param {...*} var_args Any arguments to pass to the initial generator.
+         * @return {!webdriver.promise.Promise.<?>} A promise that will resolve to the
+         *     generator's final result.
+         * @throws {TypeError} If the given function is not a generator.
+         */
+        function consume<T>(generatorFn: Function, opt_self?: any, ...var_args: any[]): webdriver.promise.Promise<T>;
+
+        /**
+         * Registers an observer on a promised {@code value}, returning a new promise
+         * that will be resolved when the value is. If {@code value} is not a promise,
+         * then the return promise will be immediately resolved.
+         * @param {*} value The value to observe.
+         * @param {Function=} opt_callback The function to call when the value is
+         *     resolved successfully.
+         * @param {Function=} opt_errback The function to call when the value is
+         *     rejected.
+         * @return {!webdriver.promise.Promise} A new promise.
+         */
+        function when<T, R>(value: T, opt_callback?: (value: T) => any, opt_errback?: (error: any) => any): webdriver.promise.Promise<R>;
+        function when<T, R>(value: webdriver.promise.Promise<T>, opt_callback?: (value: T) => any, opt_errback?: (error: any) => any): webdriver.promise.Promise<R>;
+
+        /**
+         * Returns a promise that will be resolved with the input value in a
+         * fully-resolved state. If the value is an array, each element will be fully
+         * resolved. Likewise, if the value is an object, all keys will be fully
+         * resolved. In both cases, all nested arrays and objects will also be
+         * fully resolved.  All fields are resolved in place; the returned promise will
+         * resolve on {@code value} and not a copy.
+         *
+         * Warning: This function makes no checks against objects that contain
+         * cyclical references:
+         *
+         *   var value = {};
+         *   value['self'] = value;
+         *   webdriver.promise.fullyResolved(value);  // Stack overflow.
+         *
+         * @param {*} value The value to fully resolve.
+         * @return {!webdriver.promise.Promise} A promise for a fully resolved version
+         *     of the input value.
+         */
+        function fullyResolved<T>(value: any): webdriver.promise.Promise<T>;
+
+        /**
+         * Changes the default flow to use when no others are active.
+         * @param {!webdriver.promise.ControlFlow} flow The new default flow.
+         * @throws {Error} If the default flow is not currently active.
+         */
+        function setDefaultFlow(flow: webdriver.promise.ControlFlow): void;
+    }
+
+    namespace stacktrace {
+        class Frame extends webdriver.stacktrace.Frame { }
+        class Snapshot extends webdriver.stacktrace.Snapshot { }
+
+        /**
+         * Formats an error's stack trace.
+         * @param {!(Error|goog.testing.JsUnitException)} error The error to format.
+         * @return {!(Error|goog.testing.JsUnitException)} The formatted error.
+         */
+        function format(error: any): any;
+
+        /**
+         * Gets the native stack trace if available otherwise follows the call chain.
+         * The generated trace will exclude all frames up to and including the call to
+         * this function.
+         * @return {!Array.<!webdriver.stacktrace.Frame>} The frames of the stack trace.
+         */
+        function get(): webdriver.stacktrace.Frame[];
+
+        /**
+         * Whether the current browser supports stack traces.
+         *
+         * @type {boolean}
+         * @const
+         */
+        var BROWSER_SUPPORTED: boolean;
+    }
+
+    namespace until {
+        class Condition<T> extends webdriver.until.Condition<T> { }
+
+        /**
+         * Creates a condition that will wait until the input driver is able to switch
+         * to the designated frame. The target frame may be specified as:
+         * <ol>
+         *   <li>A numeric index into {@code window.frames} for the currently selected
+         *       frame.
+         *   <li>A {@link webdriver.WebElement}, which must reference a FRAME or IFRAME
+         *       element on the current page.
+         *   <li>A locator which may be used to first locate a FRAME or IFRAME on the
+         *       current page before attempting to switch to it.
+         * </ol>
+         *
+         * <p>Upon successful resolution of this condition, the driver will be left
+         * focused on the new frame.
+         *
+         * @param {!(number|webdriver.WebElement|
+         *           webdriver.Locator|webdriver.By.Hash|
+         *           function(!webdriver.WebDriver): !webdriver.WebElement)} frame
+         *     The frame identifier.
+         * @return {!until.Condition.<boolean>} A new condition.
+         */
+        function ableToSwitchToFrame(frame: number): webdriver.until.Condition<boolean>;
+        function ableToSwitchToFrame(frame: webdriver.IWebElement): webdriver.until.Condition<boolean>;
+        function ableToSwitchToFrame(frame: webdriver.Locator): webdriver.until.Condition<boolean>;
+        function ableToSwitchToFrame(frame: (webdriver: webdriver.WebDriver) => webdriver.IWebElement): webdriver.until.Condition<boolean>;
+        function ableToSwitchToFrame(frame: any): webdriver.until.Condition<boolean>;
+
+        /**
+         * Creates a condition that waits for an alert to be opened. Upon success, the
+         * returned promise will be fulfilled with the handle for the opened alert.
+         *
+         * @return {!until.Condition.<!webdriver.Alert>} The new condition.
+         */
+        function alertIsPresent(): webdriver.until.Condition<webdriver.Alert>;
+
+        /**
+         * Creates a condition that will wait for the given element to be disabled.
+         *
+         * @param {!webdriver.WebElement} element The element to test.
+         * @return {!until.Condition.<boolean>} The new condition.
+         * @see webdriver.WebDriver#isEnabled
+         */
+        function elementIsDisabled(element: webdriver.IWebElement): webdriver.until.Condition<boolean>;
+
+        /**
+         * Creates a condition that will wait for the given element to be enabled.
+         *
+         * @param {!webdriver.WebElement} element The element to test.
+         * @return {!until.Condition.<boolean>} The new condition.
+         * @see webdriver.WebDriver#isEnabled
+         */
+        function elementIsEnabled(element: webdriver.IWebElement): webdriver.until.Condition<boolean>;
+
+        /**
+         * Creates a condition that will wait for the given element to be deselected.
+         *
+         * @param {!webdriver.WebElement} element The element to test.
+         * @return {!until.Condition.<boolean>} The new condition.
+         * @see webdriver.WebDriver#isSelected
+         */
+        function elementIsNotSelected(element: webdriver.IWebElement): webdriver.until.Condition<boolean>;
+
+        /**
+         * Creates a condition that will wait for the given element to be in the DOM,
+         * yet not visible to the user.
+         *
+         * @param {!webdriver.WebElement} element The element to test.
+         * @return {!until.Condition.<boolean>} The new condition.
+         * @see webdriver.WebDriver#isDisplayed
+         */
+        function elementIsNotVisible(element: webdriver.IWebElement): webdriver.until.Condition<boolean>;
+
+        /**
+         * Creates a condition that will wait for the given element to be selected.
+         * @param {!webdriver.WebElement} element The element to test.
+         * @return {!until.Condition.<boolean>} The new condition.
+         * @see webdriver.WebDriver#isSelected
+         */
+        function elementIsSelected(element: webdriver.IWebElement): webdriver.until.Condition<boolean>;
+
+        /**
+         * Creates a condition that will wait for the given element to become visible.
+         *
+         * @param {!webdriver.WebElement} element The element to test.
+         * @return {!until.Condition.<boolean>} The new condition.
+         * @see webdriver.WebDriver#isDisplayed
+         */
+        function elementIsVisible(element: webdriver.IWebElement): webdriver.until.Condition<boolean>;
+
+        /**
+         * Creates a condition that will loop until an element is
+         * {@link webdriver.WebDriver#findElement found} with the given locator.
+         *
+         * @param {!(webdriver.Locator|webdriver.By.Hash|Function)} locator The locator
+         *     to use.
+         * @return {!until.Condition.<!webdriver.WebElement>} The new condition.
+         */
+        function elementLocated(locator: webdriver.Locator): webdriver.until.Condition<webdriver.IWebElement>;
+        function elementLocated(locator: any): webdriver.until.Condition<webdriver.IWebElement>;
+
+        /**
+         * Creates a condition that will wait for the given element's
+         * {@link webdriver.WebDriver#getText visible text} to contain the given
+         * substring.
+         *
+         * @param {!webdriver.WebElement} element The element to test.
+         * @param {string} substr The substring to search for.
+         * @return {!until.Condition.<boolean>} The new condition.
+         * @see webdriver.WebDriver#getText
+         */
+        function elementTextContains(element: webdriver.IWebElement, substr: string): webdriver.until.Condition<boolean>;
+
+        /**
+         * Creates a condition that will wait for the given element's
+         * {@link webdriver.WebDriver#getText visible text} to match the given
+         * {@code text} exactly.
+         *
+         * @param {!webdriver.WebElement} element The element to test.
+         * @param {string} text The expected text.
+         * @return {!until.Condition.<boolean>} The new condition.
+         * @see webdriver.WebDriver#getText
+         */
+        function elementTextIs(element: webdriver.IWebElement, text: string): webdriver.until.Condition<boolean>;
+
+        /**
+         * Creates a condition that will wait for the given element's
+         * {@link webdriver.WebDriver#getText visible text} to match a regular
+         * expression.
+         *
+         * @param {!webdriver.WebElement} element The element to test.
+         * @param {!RegExp} regex The regular expression to test against.
+         * @return {!until.Condition.<boolean>} The new condition.
+         * @see webdriver.WebDriver#getText
+         */
+        function elementTextMatches(element: webdriver.IWebElement, regex: RegExp): webdriver.until.Condition<boolean>;
+
+        /**
+         * Creates a condition that will loop until at least one element is
+         * {@link webdriver.WebDriver#findElement found} with the given locator.
+         *
+         * @param {!(webdriver.Locator|webdriver.By.Hash|Function)} locator The locator
+         *     to use.
+         * @return {!until.Condition.<!Array.<!webdriver.WebElement>>} The new
+         *     condition.
+         */
+        function elementsLocated(locator: webdriver.Locator): webdriver.until.Condition<webdriver.IWebElement[]>;
+        function elementsLocated(locator: any): webdriver.until.Condition<webdriver.IWebElement[]>;
+
+        /**
+         * Creates a condition that will wait for the given element to become stale. An
+         * element is considered stale once it is removed from the DOM, or a new page
+         * has loaded.
+         *
+         * @param {!webdriver.WebElement} element The element that should become stale.
+         * @return {!until.Condition.<boolean>} The new condition.
+         */
+        function stalenessOf(element: webdriver.IWebElement): webdriver.until.Condition<boolean>;
+
+        /**
+         * Creates a condition that will wait for the current page's title to contain
+         * the given substring.
+         *
+         * @param {string} substr The substring that should be present in the page
+         *     title.
+         * @return {!until.Condition.<boolean>} The new condition.
+         */
+        function titleContains(substr: string): webdriver.until.Condition<boolean>;
+
+        /**
+         * Creates a condition that will wait for the current page's title to match the
+         * given value.
+         *
+         * @param {string} title The expected page title.
+         * @return {!until.Condition.<boolean>} The new condition.
+         */
+        function titleIs(title: string): webdriver.until.Condition<boolean>;
+
+        /**
+         * Creates a condition that will wait for the current page's title to match the
+         * given regular expression.
+         *
+         * @param {!RegExp} regex The regular expression to test against.
+         * @return {!until.Condition.<boolean>} The new condition.
+         */
+        function titleMatches(regex: RegExp): webdriver.until.Condition<boolean>;
+    }
+
+    namespace ExpectedConditions {
+        /**
+         * Negates the result of a promise.
+         *
+         * @param {webdriver.until.Condition<boolean>} expectedCondition
+         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns the negated value.
+         */
+        function not<T>(expectedCondition: webdriver.until.Condition<T>): webdriver.until.Condition<T>;
+
+        /**
+         * Chain a number of expected conditions using logical_and, short circuiting at the
+         * first expected condition that evaluates to false.
+         *
+         * @param {...webdriver.until.Condition<boolean>[]} fns An array of expected conditions to 'and' together.
+         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise which evaluates
+         * to the result of the logical and.
+         */
+        function and<T>(...fns: webdriver.until.Condition<T>[]): webdriver.until.Condition<T>;
+
+        /**
+         * Chain a number of expected conditions using logical_or, short circuiting at the
+         * first expected condition that evaluates to true.
+         *
+         * @param {...webdriver.until.Condition<boolean>[]} fns An array of expected conditions to 'or' together.
+         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise which
+         * evaluates to the result of the logical or.
+         */
+        function or<T>(...fns: webdriver.until.Condition<T>[]): webdriver.until.Condition<T>;
+
+        /**
+         * Expect an alert to be present.
+         *
+         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise representing
+         * whether an alert is present.
+         */
+        function alertIsPresent<T>(): webdriver.until.Condition<T>;
+
+        /**
+         * An Expectation for checking an element is visible and enabled such that you can click it.
+         *
+         * @param {ElementFinder} element The element to check
+         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise representing
+         * whether the element is clickable.
+         */
+        function elementToBeClickable<T>(element: ElementFinder): webdriver.until.Condition<T>;
+
+        /**
+         * An expectation for checking if the given text is present in the element.
+         * Returns false if the elementFinder does not find an element.
+         *
+         * @param {ElementFinder} element The element to check
+         * @param {string} text The text to verify against
+         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise representing
+         * whether the text is present in the element.
+         */
+        function textToBePresentInElement<T>(element: ElementFinder, text: string): webdriver.until.Condition<T>;
+
+        /**
+         * An expectation for checking if the given text is present in the element’s value.
+         * Returns false if the elementFinder does not find an element.
+         *
+         * @param {ElementFinder} element The element to check
+         * @param {string} text The text to verify against
+         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise representing
+         * whether the text is present in the element's value.
+         */
+        function textToBePresentInElementValue<T>(
+          element: ElementFinder, text: string
+        ): webdriver.until.Condition<T>;
+
+        /**
+         * An expectation for checking that the title contains a case-sensitive substring.
+         *
+         * @param {string} title The fragment of title expected
+         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise representing
+         * whether the title contains the string.
+         */
+        function titleContains<T>(title: string): webdriver.until.Condition<T>;
+
+        /**
+         * An expectation for checking the title of a page.
+         *
+         * @param {string} title The expected title, which must be an exact match.
+         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise representing
+         * whether the title equals the string.
+         */
+        function titleIs<T>(title: string): webdriver.until.Condition<T>;
+
+        /**
+         * An expectation for checking that an element is present on the DOM of a page. This does not necessarily
+         * mean that the element is visible. This is the opposite of 'stalenessOf'.
+         *
+         * @param {ElementFinder} elementFinder The element to check
+         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise
+         * representing whether the element is present.
+         */
+        function presenceOf<T>(element: ElementFinder): webdriver.until.Condition<T>;
+
+        /**
+         * An expectation for checking that an element is not attached to the DOM of a page.
+         * This is the opposite of 'presenceOf'.
+         *
+         * @param {ElementFinder} elementFinder The element to check
+         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise representing
+         * whether the element is stale.
+         */
+        function stalenessOf<T>(element: ElementFinder): webdriver.until.Condition<T>;
+
+        /**
+         * An expectation for checking that an element is present on the DOM of a page and visible.
+         * Visibility means that the element is not only displayed but also has a height and width that is
+         * greater than 0. This is the opposite of 'invisibilityOf'.
+         *
+         * @param {ElementFinder} elementFinder The element to check
+         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise representing
+         * whether the element is visible.
+         */
+        function visibilityOf<T>(element: ElementFinder): webdriver.until.Condition<T>;
+
+        /**
+         * An expectation for checking that an element is present on the DOM of a page. This does not necessarily
+         * mean that the element is visible. This is the opposite of 'stalenessOf'.
+         *
+         * @param {ElementFinder} elementFinder The element to check
+         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise representing
+         * whether the element is invisible.
+         */
+        function invisibilityOf<T>(element: ElementFinder): webdriver.until.Condition<T>;
+
+        /**
+         * An expectation for checking the selection is selected.
+         *
+         * @param {ElementFinder} elementFinder The element to check
+         * @return {!webdriver.until.Condition<boolean>} An expected condition that returns a promise representing
+         * whether the element is selected.
+         */
+        function elementToBeSelected<T>(element: ElementFinder): webdriver.until.Condition<T>;
+    }
+
+    //endregion
+
+    /**
+    * Use as: element(locator)
+    *
+    * The ElementFinder can be treated as a WebElement for most purposes, in
+    * particular, you may perform actions (i.e. click, getText) on them as you
+    * would a WebElement. ElementFinders extend Promise, and once an action
+    * is performed on an ElementFinder, the latest result from the chain can be
+    * accessed using then. Unlike a WebElement, an ElementFinder will wait for
+    * angular to settle before performing finds or actions.
+    *
+    * ElementFinder can be used to build a chain of locators that is used to find
+    * an element. An ElementFinder does not actually attempt to find the element
+    * until an action is called, which means they can be set up in helper files
+    * before the page is available.
+    *
+    * @param {webdriver.Locator} locator An element locator.
+    * @return {ElementFinder}
+    */
+    interface Element {
+        (locator: webdriver.Locator): ElementFinder;
+
+         /**
+          * ElementArrayFinder is used for operations on an array of elements (as opposed
+          * to a single element).
+          *
+          * @param {webdriver.Locator} locator An element locator.
+          * @return {ElementArrayFinder}
+          */
+        all(locator: webdriver.Locator): ElementArrayFinder;
+    }
+
+    interface ElementFinder extends webdriver.IWebElement, webdriver.promise.IThenable<any> {
+        /**
+        * Calls to element may be chained to find elements within a parent.
+        *
+        * @alias element(locator).element(locator)
+        * @view
+        * <div class="parent">
+        *   <div class="child">
+        *     Child text
+        *     <div>{{person.phone}}</div>
+        *   </div>
+        * </div>
+        *
+        * @example
+        * // Chain 2 element calls.
+        * var child = element(by.css('.parent')).
+        *     element(by.css('.child'));
+        * expect(child.getText()).toBe('Child text\n555-123-4567');
+        *
+        * // Chain 3 element calls.
+        * var triple = element(by.css('.parent')).
+        *     element(by.css('.child')).
+        *     element(by.binding('person.phone'));
+        * expect(triple.getText()).toBe('555-123-4567');
+        *
+        * @param {webdriver.Locator} subLocator
+        * @return {ElementFinder}
+        */
+        element(subLocator: webdriver.Locator): ElementFinder;
+
+        /**
+        * Calls to element may be chained to find an array of elements within a parent.
+        *
+        * @alias element(locator).all(locator)
+        * @view
+        * <div class="parent">
+        *   <ul>
+        *     <li class="one">First</li>
+        *     <li class="two">Second</li>
+        *     <li class="three">Third</li>
+        *   </ul>
+        * </div>
+        *
+        * @example
+        * var items = element(by.css('.parent')).all(by.tagName('li'))
+        *
+        * @param {webdriver.Locator} subLocator
+        * @return {ElementArrayFinder}
+        */
+        all(subLocator: webdriver.Locator): ElementArrayFinder;
+
+        /**
+        * Shortcut for querying the document directly with css.
+        *
+        * @alias $(cssSelector)
+        * @view
+        * <div class="count">
+        *   <span class="one">First</span>
+        *   <span class="two">Second</span>
+        * </div>
+        *
+        * @example
+        * var item = $('.count .two');
+        * expect(item.getText()).toBe('Second');
+        *
+        * @param {string} selector A css selector
+        * @return {ElementFinder} which identifies the located
+        *     {@link webdriver.WebElement}
+        */
+        $(selector: string): ElementFinder;
+
+        /**
+        * Shortcut for querying the document directly with css.
+        *
+        * @alias $$(cssSelector)
+        * @view
+        * <div class="count">
+        *   <span class="one">First</span>
+        *   <span class="two">Second</span>
+        * </div>
+        *
+        * @example
+        * // The following protractor expressions are equivalent.
+        * var list = element.all(by.css('.count span'));
+        * expect(list.count()).toBe(2);
+        *
+        * list = $$('.count span');
+        * expect(list.count()).toBe(2);
+        * expect(list.get(0).getText()).toBe('First');
+        * expect(list.get(1).getText()).toBe('Second');
+        *
+        * @param {string} selector a css selector
+        * @return {ElementArrayFinder} which identifies the
+        *     array of the located {@link webdriver.WebElement}s.
+        */
+        $$(selector: string): ElementArrayFinder;
+
+        /**
+        * Determine whether the element is present on the page.
+        *
+        * @view
+        * <span>{{person.name}}</span>
+        *
+        * @example
+        * // Element exists.
+        * expect(element(by.binding('person.name')).isPresent()).toBe(true);
+        *
+        * // Element not present.
+        * expect(element(by.binding('notPresent')).isPresent()).toBe(false);
+        *
+        * @return {ElementFinder} which resolves to whether
+        *     the element is present on the page.
+        */
+        isPresent(): webdriver.promise.Promise<boolean>;
+
+        /**
+        * Override for WebElement.prototype.isElementPresent so that protractor waits
+        * for Angular to settle before making the check.
+        *
+        * @see ElementFinder.isPresent
+        *
+        * @param {webdriver.Locator} subLocator Locator for element to look for.
+        * @return {ElementFinder} which resolves to whether
+        *     the element is present on the page.
+        */
+        isElementPresent(subLocator: webdriver.Locator): webdriver.promise.Promise<boolean>;
+
+        /**
+        * @see ElementArrayFinder.prototype.locator
+        *
+        * @return {webdriver.Locator}
+        */
+        locator(): webdriver.Locator;
+
+        /**
+        * Returns the WebElement represented by this ElementFinder.
+        * Throws the WebDriver error if the element doesn't exist.
+        *
+        * @example
+        *  The following three expressions are equivalent.
+        *  element(by.css('.parent')).getWebElement();
+        *  browser.waitForAngular(); browser.driver.findElement(by.css('.parent'));
+        *  browser.findElement(by.css('.parent'));
+        *
+        * @alias element(locator).getWebElement()
+        * @return {webdriver.WebElement}
+        */
+        getWebElement(): webdriver.WebElement;
+
+        /**
+        * Evaluates the input as if it were on the scope of the current element.
+        * @see ElementArrayFinder.evaluate
+        *
+        * @param {string} expression
+        *
+        * @return {ElementFinder} which resolves to the evaluated expression.
+        */
+        evaluate(expression: string): ElementFinder;
+
+        /**
+        * @see ElementArrayFinder.prototype.allowAnimations.
+        * @param {string} value
+        *
+        * @return {ElementFinder} which resolves to whether animation is allowed.
+        */
+        allowAnimations(value: string): ElementFinder;
+
+        /**
+        * Create a shallow copy of ElementFinder.
+        *
+        * @return {!ElementFinder} A shallow copy of this.
+        */
+        clone(): ElementFinder;
+    }
+
+    interface ElementArrayFinder extends webdriver.promise.IThenable<ElementFinder[]> {
+        /**
+         * Returns the elements as an array of WebElements.
+         */
+        getWebElements(): webdriver.WebElement[];
+
+
+        /**
+        * Get an element within the ElementArrayFinder by index. The index starts at 0.
+        * Negative indices are wrapped (i.e. -i means ith element from last)
+        * This does not actually retrieve the underlying element.
+        *
+        * @alias element.all(locator).get(index)
+        * @view
+        * <ul class="items">
+        *   <li>First</li>
+        *   <li>Second</li>
+        *   <li>Third</li>
+        * </ul>
+        *
+        * @example
+        * var list = element.all(by.css('.items li'));
+        * expect(list.get(0).getText()).toBe('First');
+        * expect(list.get(1).getText()).toBe('Second');
+        *
+        * @param {number} index Element index.
+        * @return {ElementFinder} finder representing element at the given index.
+        */
+        get(index: number): ElementFinder;
+
+        /**
+        * Get the first matching element for the ElementArrayFinder. This does not
+        * actually retrieve the underlying element.
+        *
+        * @alias element.all(locator).first()
+        * @view
+        * <ul class="items">
+        *   <li>First</li>
+        *   <li>Second</li>
+        *   <li>Third</li>
+        * </ul>
+        *
+        * @example
+        * var first = element.all(by.css('.items li')).first();
+        * expect(first.getText()).toBe('First');
+        *
+        * @return {ElementFinder} finder representing the first matching element
+        */
+        first(): ElementFinder;
+
+        /**
+        * Get the last matching element for the ElementArrayFinder. This does not
+        * actually retrieve the underlying element.
+        *
+        * @alias element.all(locator).last()
+        * @view
+        * <ul class="items">
+        *   <li>First</li>
+        *   <li>Second</li>
+        *   <li>Third</li>
+        * </ul>
+        *
+        * @example
+        * var last = element.all(by.css('.items li')).last();
+        * expect(last.getText()).toBe('Third');
+        *
+        * @return {ElementFinder} finder representing the last matching element
+        */
+        last(): ElementFinder;
+
+        /**
+        * Count the number of elements represented by the ElementArrayFinder.
+        *
+        * @alias element.all(locator).count()
+        * @view
+        * <ul class="items">
+        *   <li>First</li>
+        *   <li>Second</li>
+        *   <li>Third</li>
+        * </ul>
+        *
+        * @example
+        * var list = element.all(by.css('.items li'));
+        * expect(list.count()).toBe(3);
+        *
+        * @return {!webdriver.promise.Promise} A promise which resolves to the
+        *     number of elements matching the locator.
+        */
+        count(): webdriver.promise.Promise<number>;
+
+        /**
+        * Calls the input function on each ElementFinder represented by the ElementArrayFinder.
+        *
+        * @alias element.all(locator).each(eachFunction)
+        * @view
+        * <ul class="items">
+        *   <li>First</li>
+        *   <li>Second</li>
+        *   <li>Third</li>
+        * </ul>
+        *
+        * @example
+        * element.all(by.css('.items li')).each(function(element) {
+        *   // Will print First, Second, Third.
+        *   element.getText().then(console.log);
+        * });
+        *
+        * @param {function(ElementFinder)} fn Input function
+        */
+        each(fn: (element: ElementFinder, index: number) => void): void;
+
+        /**
+        * Apply a map function to each element within the ElementArrayFinder. The
+        * callback receives the ElementFinder as the first argument and the index as
+        * a second arg.
+        *
+        * @alias element.all(locator).map(mapFunction)
+        * @view
+        * <ul class="items">
+        *   <li class="one">First</li>
+        *   <li class="two">Second</li>
+        *   <li class="three">Third</li>
+        * </ul>
+        *
+        * @example
+        * var items = element.all(by.css('.items li')).map(function(elm, index) {
+        *   return {
+        *     index: index,
+        *     text: elm.getText(),
+        *     class: elm.getAttribute('class')
+        *   };
+        * });
+        * expect(items).toEqual([
+        *   {index: 0, text: 'First', class: 'one'},
+        *   {index: 1, text: 'Second', class: 'two'},
+        *   {index: 2, text: 'Third', class: 'three'}
+        * ]);
+        *
+        * @param {function(ElementFinder, number)} mapFn Map function that
+        *     will be applied to each element.
+        * @return {!webdriver.promise.Promise} A promise that resolves to an array
+        *     of values returned by the map function.
+        */
+        map<T>(mapFn: (element: ElementFinder, index: number) => T): webdriver.promise.Promise<T[]>;
+        map<T, T2>(mapFn: (element: ElementFinder, index: number) => T2): webdriver.promise.Promise<T[]>;
+
+        /**
+        * Apply a filter function to each element within the ElementArrayFinder. Returns
+        * a new ElementArrayFinder with all elements that pass the filter function. The
+        * filter function receives the ElementFinder as the first argument
+        * and the index as a second arg.
+        * This does not actually retrieve the underlying list of elements, so it can
+        * be used in page objects.
+        *
+        * @alias element.all(locator).filter(filterFn)
+        * @view
+        * <ul class="items">
+        *   <li class="one">First</li>
+        *   <li class="two">Second</li>
+        *   <li class="three">Third</li>
+        * </ul>
+        *
+        * @example
+        * element.all(by.css('.items li')).filter(function(elem, index) {
+        *   return elem.getText().then(function(text) {
+        *     return text === 'Third';
+        *   });
+        * }).then(function(filteredElements) {
+        *   filteredElements[0].click();
+        * });
+        *
+        * @param {function(ElementFinder, number): webdriver.WebElement.Promise} filterFn
+        *     Filter function that will test if an element should be returned.
+        *     filterFn can either return a boolean or a promise that resolves to a boolean.
+        * @return {!ElementArrayFinder} A ElementArrayFinder that represents an array
+        *     of element that satisfy the filter function.
+        */
+        filter(filterFn: (element: ElementFinder, index: number) => any): ElementArrayFinder;
+
+        /**
+        * Apply a reduce function against an accumulator and every element found
+        * using the locator (from left-to-right). The reduce function has to reduce
+        * every element into a single value (the accumulator). Returns promise of
+        * the accumulator. The reduce function receives the accumulator, current
+        * ElementFinder, the index, and the entire array of ElementFinders,
+        * respectively.
+        *
+        * @alias element.all(locator).reduce(reduceFn)
+        * @view
+        * <ul class="items">
+        *   <li class="one">First</li>
+        *   <li class="two">Second</li>
+        *   <li class="three">Third</li>
+        * </ul>
+        *
+        * @example
+        * var value = element.all(by.css('.items li')).reduce(function(acc, elem) {
+        *   return elem.getText().then(function(text) {
+        *     return acc + text + ' ';
+        *   });
+        * });
+        *
+        * expect(value).toEqual('First Second Third ');
+        *
+        * @param {function(number, ElementFinder, number, Array.<ElementFinder>)}
+        *     reduceFn Reduce function that reduces every element into a single value.
+        * @param {*} initialValue Initial value of the accumulator.
+        * @return {!webdriver.promise.Promise} A promise that resolves to the final
+        *     value of the accumulator.
+        */
+        reduce<T>(reduceFn: (acc: T, element: ElementFinder, index: number, arr: ElementFinder[]) => webdriver.promise.Promise<T>, initialValue: T): webdriver.promise.Promise<T>;
+        reduce<T>(reduceFn: (acc: T, element: ElementFinder, index: number, arr: ElementFinder[]) => T, initialValue: T): webdriver.promise.Promise<T>;
+
+        /**
+        * Represents the ElementArrayFinder as an array of ElementFinders.
+        *
+        * @return {Array.<ElementFinder>} Return a promise, which resolves to a list
+        *     of ElementFinders specified by the locator.
+        */
+        asElementFinders_(): webdriver.promise.Promise<ElementFinder[]>;
+
+        /**
+        * Create a shallow copy of ElementArrayFinder.
+        *
+        * @return {!ElementArrayFinder} A shallow copy of this.
+        */
+        clone(): ElementArrayFinder;
+
+        /**
+        * Calls to ElementArrayFinder may be chained to find an array of elements
+        * using the current elements in this ElementArrayFinder as the starting point.
+        * This function returns a new ElementArrayFinder which would contain the
+        * children elements found (and could also be empty).
+        *
+        * @alias element.all(locator).all(locator)
+        * @view
+        * <div id='id1' class="parent">
+        *   <ul>
+        *     <li class="foo">1a</li>
+        *     <li class="baz">1b</li>
+        *   </ul>
+        * </div>
+        * <div id='id2' class="parent">
+        *   <ul>
+        *     <li class="foo">2a</li>
+        *     <li class="bar">2b</li>
+        *   </ul>
+        * </div>
+        *
+        * @example
+        * var foo = element.all(by.css('.parent')).all(by.css('.foo'))
+        * expect(foo.getText()).toEqual(['1a', '2a'])
+        * var baz = element.all(by.css('.parent')).all(by.css('.baz'))
+        * expect(baz.getText()).toEqual(['1b'])
+        * var nonexistent = element.all(by.css('.parent')).all(by.css('.NONEXISTENT'))
+        * expect(nonexistent.getText()).toEqual([''])
+        *
+        * @param {webdriver.Locator} subLocator
+        * @return {ElementArrayFinder}
+        */
+        all(locator: webdriver.Locator): ElementArrayFinder;
+
+        /**
+        * Shorthand function for finding arrays of elements by css.
+        *
+        * @type {function(string): ElementArrayFinder}
+        */
+        $$(selector: string): ElementArrayFinder;
+
+        /**
+        * Returns an ElementFinder representation of ElementArrayFinder. It ensures
+        * that the ElementArrayFinder resolves to one and only one underlying element.
+        *
+        * @return {ElementFinder} An ElementFinder representation
+        * @private
+        */
+        toElementFinder_(): ElementFinder;
+
+        /**
+        * Returns the most relevant locator.
+        *
+        * @example
+        * $('#ID1').locator() // returns by.css('#ID1')
+        * $('#ID1').$('#ID2').locator() // returns by.css('#ID2')
+        * $$('#ID1').filter(filterFn).get(0).click().locator() // returns by.css('#ID1')
+        *
+        * @return {webdriver.Locator}
+        */
+        locator(): webdriver.Locator;
+
+        /**
+         * Evaluates the input as if it were on the scope of the current underlying
+         * elements.
+         *
+         * @view
+         * <span id="foo">{{variableInScope}}</span>
+         *
+         * @example
+         * var value = element(by.id('foo')).evaluate('variableInScope');
+         *
+         * @param {string} expression
+         *
+         * @return {ElementArrayFinder} which resolves to the
+         *     evaluated expression for each underlying element.
+         *     The result will be resolved as in
+         *     {@link webdriver.WebDriver.executeScript}. In summary - primitives will
+         *     be resolved as is, functions will be converted to string, and elements
+         *     will be returned as a WebElement.
+         */
+        evaluate(expression: string): ElementArrayFinder;
+
+        /**
+         * Determine if animation is allowed on the current underlying elements.
+         * @param {string} value
+         *
+         * @example
+         * // Turns off ng-animate animations for all elements in the <body>
+         * element(by.css('body')).allowAnimations(false);
+         *
+         * @return {ElementArrayFinder} which resolves to whether animation is allowed.
+         */
+        allowAnimations(value: boolean): ElementArrayFinder;
+
+        /**
+         * Schedules a command to click on this element.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved when
+         *     the click command has completed.
+         */
+        click(): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to type a sequence on the DOM element represented by this
+         * instance.
+         * <p/>
+         * Modifier keys (SHIFT, CONTROL, ALT, META) are stateful; once a modifier is
+         * processed in the keysequence, that key state is toggled until one of the
+         * following occurs:
+         * <ul>
+         * <li>The modifier key is encountered again in the sequence. At this point the
+         * state of the key is toggled (along with the appropriate keyup/down events).
+         * </li>
+         * <li>The {@code webdriver.Key.NULL} key is encountered in the sequence. When
+         * this key is encountered, all modifier keys current in the down state are
+         * released (with accompanying keyup events). The NULL key can be used to
+         * simulate common keyboard shortcuts:
+         * <code>
+         *     element.sendKeys("text was",
+         *                      webdriver.Key.CONTROL, "a", webdriver.Key.NULL,
+         *                      "now text is");
+         *     // Alternatively:
+         *     element.sendKeys("text was",
+         *                      webdriver.Key.chord(webdriver.Key.CONTROL, "a"),
+         *                      "now text is");
+         * </code></li>
+         * <li>The end of the keysequence is encountered. When there are no more keys
+         * to type, all depressed modifier keys are released (with accompanying keyup
+         * events).
+         * </li>
+         * </ul>
+         * <strong>Note:</strong> On browsers where native keyboard events are not yet
+         * supported (e.g. Firefox on OS X), key events will be synthesized. Special
+         * punctionation keys will be synthesized according to a standard QWERTY en-us
+         * keyboard layout.
+         *
+         * @param {...string} var_args The sequence of keys to
+         *     type. All arguments will be joined into a single sequence (var_args is
+         *     permitted for convenience).
+         * @return {!webdriver.promise.Promise} A promise that will be resolved when all
+         *     keys have been typed.
+         */
+        sendKeys(...var_args: string[]): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to query for the tag/node name of this element.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
+         *     element's tag name.
+         */
+        getTagName(): webdriver.promise.Promise<string[]>;
+
+        /**
+         * Schedules a command to query for the computed style of the element
+         * represented by this instance. If the element inherits the named style from
+         * its parent, the parent will be queried for its value.  Where possible, color
+         * values will be converted to their hex representation (e.g. #00ff00 instead of
+         * rgb(0, 255, 0)).
+         * <p/>
+         * <em>Warning:</em> the value returned will be as the browser interprets it, so
+         * it may be tricky to form a proper assertion.
+         *
+         * @param {string} cssStyleProperty The name of the CSS style property to look
+         *     up.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
+         *     requested CSS value.
+         */
+        getCssValue(cssStyleProperty: string): webdriver.promise.Promise<string[]>;
+
+        /**
+         * Schedules a command to query for the value of the given attribute of the
+         * element. Will return the current value even if it has been modified after the
+         * page has been loaded. More exactly, this method will return the value of the
+         * given attribute, unless that attribute is not present, in which case the
+         * value of the property with the same name is returned. If neither value is
+         * set, null is returned. The "style" attribute is converted as best can be to a
+         * text representation with a trailing semi-colon. The following are deemed to
+         * be "boolean" attributes and will be returned as thus:
+         *
+         * <p>async, autofocus, autoplay, checked, compact, complete, controls, declare,
+         * defaultchecked, defaultselected, defer, disabled, draggable, ended,
+         * formnovalidate, hidden, indeterminate, iscontenteditable, ismap, itemscope,
+         * loop, multiple, muted, nohref, noresize, noshade, novalidate, nowrap, open,
+         * paused, pubdate, readonly, required, reversed, scoped, seamless, seeking,
+         * selected, spellcheck, truespeed, willvalidate
+         *
+         * <p>Finally, the following commonly mis-capitalized attribute/property names
+         * are evaluated as expected:
+         * <ul>
+         *   <li>"class"
+         *   <li>"readonly"
+         * </ul>
+         * @param {string} attributeName The name of the attribute to query.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
+         *     attribute's value.
+         */
+        getAttribute(attributeName: string): webdriver.promise.Promise<string[]>;
+
+        /**
+         * Get the visible (i.e. not hidden by CSS) innerText of this element, including
+         * sub-elements, without any leading or trailing whitespace.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
+         *     element's visible text.
+         */
+        getText(): webdriver.promise.Promise<string[]>;
+
+        /**
+         * Schedules a command to compute the size of this element's bounding box, in
+         * pixels.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
+         *     element's size as a {@code {width:number, height:number}} object.
+         */
+        getSize(): webdriver.promise.Promise<webdriver.ISize[]>;
+
+        /**
+         * Schedules a command to compute the location of this element in page space.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved to the
+         *     element's location as a {@code {x:number, y:number}} object.
+         */
+        getLocation(): webdriver.promise.Promise<webdriver.ILocation[]>;
+
+        /**
+         * Schedules a command to query whether the DOM element represented by this
+         * instance is enabled, as dicted by the {@code disabled} attribute.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with
+         *     whether this element is currently enabled.
+         */
+        isEnabled(): webdriver.promise.Promise<boolean[]>;
+
+        /**
+         * Schedules a command to query whether this element is selected.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with
+         *     whether this element is currently selected.
+         */
+        isSelected(): webdriver.promise.Promise<boolean[]>;
+
+        /**
+         * Schedules a command to submit the form containing this element (or this
+         * element if it is a FORM element). This command is a no-op if the element is
+         * not contained in a form.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved when
+         *     the form has been submitted.
+         */
+        submit(): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to clear the {@code value} of this element. This command
+         * has no effect if the underlying DOM element is neither a text INPUT element
+         * nor a TEXTAREA element.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved when
+         *     the element has been cleared.
+         */
+        clear(): webdriver.promise.Promise<void>;
+
+        /**
+         * Schedules a command to test whether this element is currently displayed.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with
+         *     whether this element is currently visible on the page.
+         */
+        isDisplayed(): webdriver.promise.Promise<boolean[]>;
+
+        /**
+         * Schedules a command to retrieve the outer HTML of this element.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with
+         *     the element's outer HTML.
+         */
+        getOuterHtml(): webdriver.promise.Promise<string[]>;
+
+        /**
+         * @return {!webdriver.promise.Promise.<webdriver.WebElement.Id>} A promise
+         *     that resolves to this element's JSON representation as defined by the
+         *     WebDriver wire protocol.
+         * @see http://code.google.com/p/selenium/wiki/JsonWireProtocol
+         */
+        getId(): webdriver.promise.Promise<webdriver.IWebElementId[]>
+
+        /**
+         * Schedules a command to retrieve the inner HTML of this element.
+         * @return {!webdriver.promise.Promise} A promise that will be resolved with the
+         *     element's inner HTML.
+         */
+        getInnerHtml(): webdriver.promise.Promise<string[]>;
+    }
+
+    interface LocatorWithColumn extends webdriver.Locator {
+        column(index: number): webdriver.Locator;
+        column(name: string): webdriver.Locator;
+    }
+
+    interface RepeaterLocator extends LocatorWithColumn {
+        row(index: number): LocatorWithColumn;
+    }
+
+    interface IProtractorLocatorStrategy {
+        /**
+         * webdriver's By is an enum of locator functions, so we must set it to
+         * a prototype before inheriting from it.
+         */
+        className: typeof webdriver.By.className;
+        css: typeof webdriver.By.css;
+        id: typeof webdriver.By.id;
+        linkText: typeof webdriver.By.linkText;
+        js: typeof webdriver.By.js;
+        name: typeof webdriver.By.name;
+        partialLinkText: typeof webdriver.By.partialLinkText;
+        tagName: typeof webdriver.By.tagName;
+        xpath: typeof webdriver.By.xpath;
+
+        /**
+         * Add a locator to this instance of ProtractorBy. This locator can then be
+         * used with element(by.locatorName(args)).
+         *
+         * @view
+         * <button ng-click="doAddition()">Go!</button>
+         *
+         * @example
+         * // Add the custom locator.
+         * by.addLocator('buttonTextSimple',
+         *     function(buttonText, opt_parentElement, opt_rootSelector) {
+         *   // This function will be serialized as a string and will execute in the
+         *   // browser. The first argument is the text for the button. The second
+         *   // argument is the parent element, if any.
+         *   var using = opt_parentElement,
+         *       buttons = using.querySelectorAll('button');
+         *
+         *   // Return an array of buttons with the text.
+         *   return Array.prototype.filter.call(buttons, function(button) {
+         *     return button.textContent === buttonText;
+         *   });
+         * });
+         *
+         * // Use the custom locator.
+         * element(by.buttonTextSimple('Go!')).click();
+         *
+         * @alias by.addLocator(locatorName, functionOrScript)
+         * @param {string} name The name of the new locator.
+         * @param {Function|string} script A script to be run in the context of
+         *     the browser. This script will be passed an array of arguments
+         *     that contains any args passed into the locator followed by the
+         *     element scoping the search and the css selector for the root angular
+         *     element. It should return an array of elements.
+         */
+        addLocator(name: string, script: string): void;
+        addLocator(name: string, script: Function): void;
+
+        /**
+         * Find an element by binding.
+         *
+         * @view
+         * <span>{{person.name}}</span>
+         * <span ng-bind="person.email"></span>
+         *
+         * @example
+         * var span1 = element(by.binding('person.name'));
+         * expect(span1.getText()).toBe('Foo');
+         *
+         * var span2 = element(by.binding('person.email'));
+         * expect(span2.getText()).toBe('foo@bar.com');
+         *
+         * @param {string} bindingDescriptor
+         * @return {{findElementsOverride: findElementsOverride, toString: Function|string}}
+         */
+        binding(bindingDescriptor: string): webdriver.Locator;
+
+        /**
+         * Find an element by exact binding.
+         *
+         * @view
+         * <span>{{ person.name }}</span>
+         * <span ng-bind="person-email"></span>
+         * <span>{{person_phone|uppercase}}</span>
+         *
+         * @example
+         * expect(element(by.exactBinding('person.name')).isPresent()).toBe(true);
+         * expect(element(by.exactBinding('person-email')).isPresent()).toBe(true);
+         * expect(element(by.exactBinding('person')).isPresent()).toBe(false);
+         * expect(element(by.exactBinding('person_phone')).isPresent()).toBe(true);
+         * expect(element(by.exactBinding('person_phone|uppercase')).isPresent()).toBe(true);
+         * expect(element(by.exactBinding('phone')).isPresent()).toBe(false);
+         *
+         * @param {string} bindingDescriptor
+         * @return {{findElementsOverride: findElementsOverride, toString: Function|string}}
+         */
+        exactBinding(bindingDescriptor: string): webdriver.Locator;
+
+        /**
+         * Find an element by ng-model expression.
+         *
+         * @alias by.model(modelName)
+         * @view
+         * <input type="text" ng-model="person.name"/>
+         *
+         * @example
+         * var input = element(by.model('person.name'));
+         * input.sendKeys('123');
+         * expect(input.getAttribute('value')).toBe('Foo123');
+         *
+         * @param {string} model ng-model expression.
+         */
+        model(model: string): webdriver.Locator;
+
+        /**
+         * Find a button by text.
+         *
+         * @view
+         * <button>Save</button>
+         *
+         * @example
+         * element(by.buttonText('Save'));
+         *
+         * @param {string} searchText
+         * @return {{findElementsOverride: findElementsOverride, toString: Function|string}}
+         */
+        buttonText(searchText: string): webdriver.Locator;
+
+        /**
+         * Find a button by partial text.
+         *
+         * @view
+         * <button>Save my file</button>
+         *
+         * @example
+         * element(by.partialButtonText('Save'));
+         *
+         * @param {string} searchText
+         * @return {{findElementsOverride: findElementsOverride, toString: Function|string}}
+         */
+        partialButtonText(searchText: string): webdriver.Locator;
+
+
+        /**
+         * Find elements inside an ng-repeat.
+         *
+         * @view
+         * <div ng-repeat="cat in pets">
+         *   <span>{{cat.name}}</span>
+         *   <span>{{cat.age}}</span>
+         * </div>
+         *
+         * <div class="book-img" ng-repeat-start="book in library">
+         *   <span>{{$index}}</span>
+         * </div>
+         * <div class="book-info" ng-repeat-end>
+         *   <h4>{{book.name}}</h4>
+         *   <p>{{book.blurb}}</p>
+         * </div>
+         *
+         * @example
+         * // Returns the DIV for the second cat.
+         * var secondCat = element(by.repeater('cat in pets').row(1));
+         *
+         * // Returns the SPAN for the first cat's name.
+         * var firstCatName = element(by.repeater('cat in pets').
+         *     row(0).column('{{cat.name}}'));
+         *
+         * // Returns a promise that resolves to an array of WebElements from a column
+         * var ages = element.all(
+         *     by.repeater('cat in pets').column('{{cat.age}}'));
+         *
+         * // Returns a promise that resolves to an array of WebElements containing
+         * // all top level elements repeated by the repeater. For 2 pets rows resolves
+         * // to an array of 2 elements.
+         * var rows = element.all(by.repeater('cat in pets'));
+         *
+         * // Returns a promise that resolves to an array of WebElements containing all
+         * // the elements with a binding to the book's name.
+         * var divs = element.all(by.repeater('book in library').column('book.name'));
+         *
+         * // Returns a promise that resolves to an array of WebElements containing
+         * // the DIVs for the second book.
+         * var bookInfo = element.all(by.repeater('book in library').row(1));
+         *
+         * // Returns the H4 for the first book's name.
+         * var firstBookName = element(by.repeater('book in library').
+         *     row(0).column('{{book.name}}'));
+         *
+         * // Returns a promise that resolves to an array of WebElements containing
+         * // all top level elements repeated by the repeater. For 2 books divs
+         * // resolves to an array of 4 elements.
+         * var divs = element.all(by.repeater('book in library'));
+         */
+        repeater(repeatDescriptor: string): RepeaterLocator;
+
+        /**
+         * Find elements by CSS which contain a certain string.
+         *
+         * @view
+         * <ul>
+         *   <li class="pet">Dog</li>
+         *   <li class="pet">Cat</li>
+         * </ul>
+         *
+         * @example
+         * // Returns the DIV for the dog, but not cat.
+         * var dog = element(by.cssContainingText('.pet', 'Dog'));
+         */
+        cssContainingText(cssSelector: string, searchText: string): webdriver.Locator;
+
+        /**
+         * Find an element by ng-options expression.
+         *
+         * @alias by.options(optionsDescriptor)
+         * @view
+         * <select ng-model="color" ng-options="c for c in colors">
+         *   <option value="0" selected="selected">red</option>
+         *   <option value="1">green</option>
+         * </select>
+         *
+         * @example
+         * var allOptions = element.all(by.options('c for c in colors'));
+         * expect(allOptions.count()).toEqual(2);
+         * var firstOption = allOptions.first();
+         * expect(firstOption.getText()).toEqual('red');
+         *
+         * @param {string} optionsDescriptor ng-options expression.
+         */
+        options(optionsDescriptor: string): webdriver.Locator;
+    }
+
+    var By: IProtractorLocatorStrategy;
+
+    interface Protractor extends webdriver.WebDriver {
+
+        /**
+        * The wrapped webdriver instance. Use this to interact with pages that do
+        * not contain Angular (such as a log-in screen).
+        *
+        * @type {webdriver.WebDriver}
+        */
+        driver: webdriver.WebDriver;
+
+        /**
+        * Helper function for finding elements.
+        *
+        * @type {function(webdriver.Locator): ElementFinder}
+        */
+        element(locator: webdriver.Locator): ElementFinder;
+
+        /**
+        * Shorthand function for finding elements by css.
+        *
+        * @type {function(string): ElementFinder}
+        */
+        $(selector: string): ElementFinder;
+
+        /**
+        * Shorthand function for finding arrays of elements by css.
+        *
+        * @type {function(string): ElementArrayFinder}
+        */
+        $$(selector: string): ElementArrayFinder;
+
+        /**
+        * All get methods will be resolved against this base URL. Relative URLs are =
+        * resolved the way anchor tags resolve.
+        *
+        * @type {string}
+        */
+        baseUrl: string;
+
+        /**
+        * The css selector for an element on which to find Angular. This is usually
+        * 'body' but if your ng-app is on a subsection of the page it may be
+        * a subelement.
+        *
+        * @type {string}
+        */
+        rootEl: string;
+
+        /**
+        * If true, Protractor will not attempt to synchronize with the page before
+        * performing actions. This can be harmful because Protractor will not wait
+        * until $timeouts and $http calls have been processed, which can cause
+        * tests to become flaky. This should be used only when necessary, such as
+        * when a page continuously polls an API using $timeout.
+        *
+        * @type {boolean}
+        */
+        ignoreSynchronization: boolean;
+
+        /**
+        * Timeout in milliseconds to wait for pages to load when calling `get`.
+        *
+        * @type {number}
+        */
+        getPageTimeout: number;
+
+        /**
+        * An object that holds custom test parameters.
+        *
+        * @type {Object}
+        */
+        params: any;
+
+        /**
+        * The reset URL to use between page loads.
+        *
+        * @type {string}
+        */
+        resetUrl: string;
+
+        /**
+         * Instruct webdriver to wait until Angular has finished rendering and has
+         * no outstanding $http calls before continuing.
+         *
+         * @return {!webdriver.promise.Promise} A promise that will resolve to the
+         *    scripts return value.
+         */
+        waitForAngular(): webdriver.promise.Promise<any>;
+
+        /**
+         * Add a module to load before Angular whenever Protractor.get is called.
+         * Modules will be registered after existing modules already on the page,
+         * so any module registered here will override preexisting modules with the same
+         * name.
+         *
+         * @example
+         * browser.addMockModule('modName', function() {
+         *   angular.module('modName', []).value('foo', 'bar');
+         * });
+         *
+         * @param {!string} name The name of the module to load or override.
+         * @param {!string|Function} script The JavaScript to load the module.
+         * @param {...*} varArgs Any additional arguments will be provided to
+         *     the script and may be referenced using the `arguments` object.
+         */
+        addMockModule(name: string, script: string, ...varArgs: any[]): void;
+        addMockModule(name: string, script: Function, ...varArgs: any[]): void;
+
+        /**
+         * Clear the list of registered mock modules.
+         */
+        clearMockModules(): void;
+
+        /**
+         * Remove a registered mock module.
+         *
+         * @example
+         * browser.removeMockModule('modName');
+         *
+         * @param {!string} name The name of the module to remove.
+         */
+        removeMockModule(name: string): void;
+
+        /**
+         * @see webdriver.WebDriver.get
+         *
+         * Navigate to the given destination and loads mock modules before
+         * Angular. Assumes that the page being loaded uses Angular.
+         * If you need to access a page which does not have Angular on load, use
+         * the wrapped webdriver directly.
+         *
+         * @param {string} destination Destination URL.
+         * @param {number=} opt_timeout Number of milliseconds to wait for Angular to
+         *     start.
+         */
+        get(destination: string, opt_timeout?: number): webdriver.promise.Promise<void>;
+
+        /**
+         * See webdriver.WebDriver.refresh
+         *
+         * Makes a full reload of the current page and loads mock modules before
+         * Angular. Assumes that the page being loaded uses Angular.
+         * If you need to access a page which does not have Angular on load, use
+         * the wrapped webdriver directly.
+         *
+         * @param {number=} opt_timeout Number of seconds to wait for Angular to start.
+         */
+        refresh(opt_timeout?: number): webdriver.promise.Promise<void>;
+
+        /**
+         * Browse to another page using in-page navigation.
+         *
+         * @param {string} url In page URL using the same syntax as $location.url()
+         * @returns {!webdriver.promise.Promise} A promise that will resolve once
+         *    page has been changed.
+         */
+        setLocation(url: string): webdriver.promise.Promise<void>;
+
+        /**
+         * Returns the current absolute url from AngularJS.
+         */
+        getLocationAbsUrl(): webdriver.promise.Promise<string>;
+
+        /**
+         * Pauses the test and injects some helper functions into the browser, so that
+         * debugging may be done in the browser console.
+         *
+         * This should be used under node in debug mode, i.e. with
+         * protractor debug <configuration.js>
+         *
+         * @example
+         * While in the debugger, commands can be scheduled through webdriver by
+         * entering the repl:
+         *   debug> repl
+         *   Press Ctrl + C to leave rdebug repl
+         *   > ptor.findElement(protractor.By.input('user').sendKeys('Laura'));
+         *   > ptor.debugger();
+         *   debug> c
+         *
+         * This will run the sendKeys command as the next task, then re-enter the
+         * debugger.
+         */
+        debugger(): void;
+
+        /**
+         * Beta (unstable) pause function for debugging webdriver tests. Use
+         * browser.pause() in your test to enter the protractor debugger from that
+         * point in the control flow.
+         * Does not require changes to the command line (no need to add 'debug').
+         *
+         * @example
+         * element(by.id('foo')).click();
+         * browser.pause();
+         * // Execution will stop before the next click action.
+         * element(by.id('bar')).click();
+         *
+         * @param {number=} opt_debugPort Optional port to use for the debugging process
+         */
+        pause(opt_debugPort?: number): void;
+    }
+
+    // Interface for the global browser object.
+    interface IBrowser extends Protractor {
+        /**
+        * Fork another instance of protractor for use in interactive tests.
+        *
+        * @param {boolean} opt_useSameUrl Whether to navigate to current url on creation
+        * @param {boolean} opt_copyMockModules Whether to apply same mock modules on creation
+        * @return {Protractor} a protractor instance.
+        */
+        forkNewDriverInstance(opt_useSameUrl?: boolean, opt_copyMockModules?: boolean): Protractor;
+
+        /**
+        * Get the processed configuration object that is currently being run. This will contain
+        * the specs and capabilities properties of the current runner instance.
+        *
+        * Set by the runner.
+        *
+        * @return {webdriver.promise.Promise<any>} A promise which resolves to the capabilities object.
+        */
+        getProcessedConfig(): webdriver.promise.Promise<any>;
+    }
+
+    /**
+     * Create a new instance of Protractor by wrapping a webdriver instance.
+     *
+     * @param {webdriver.WebDriver} webdriver The configured webdriver instance.
+     * @param {string=} opt_baseUrl A URL to prepend to relative gets.
+     * @return {Protractor}
+     */
+    function wrapDriver(webdriver: webdriver.WebDriver, opt_baseUrl?: string, opt_rootElement?: string): Protractor;
+}
+
+interface cssSelectorHelper {
+    (cssLocator: string): protractor.ElementFinder;
+}
+
+interface cssArraySelectorHelper {
+    (cssLocator: string): protractor.ElementArrayFinder;
+}
+
+declare var browser: protractor.IBrowser;
+declare var by: protractor.IProtractorLocatorStrategy;
+declare var By: protractor.IProtractorLocatorStrategy;
+declare var element: protractor.Element;
+declare var $: cssSelectorHelper;
+declare var $$: cssArraySelectorHelper;
+
+declare module 'protractor' {
+    export = protractor;
+}
diff --git a/protractor/tsconfig.json b/protractor/tsconfig.json
new file mode 100644
index 0000000000..e53e48864f
--- /dev/null
+++ b/protractor/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-protractor-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/proxyquire/index.d.ts b/proxyquire/index.d.ts
new file mode 100644
index 0000000000..c6c38cb85f
--- /dev/null
+++ b/proxyquire/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for Proxyquire 1.3.0
+// Project: https://github.com/thlorenz/proxyquire
+// Definitions by: jt000 <https://github.com/jt000/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var p: Proxyquire;
+export = p;
+
+interface Proxyquire {
+
+    (request: string, stubs: any): any;
+    <T>(request: string, stubs: any): T;
+
+    load(request: string, stubs: any): any;
+    load<T>(request: string, stubs: any): T;
+
+    noCallThru(): Proxyquire;
+    callThru(): Proxyquire;
+
+    noPreserveCache(): Proxyquire;
+    preserveCache(): Proxyquire;
+}
diff --git a/proxyquire/proxyquire-tests.ts b/proxyquire/proxyquire-tests.ts
index b1985de58f..f74b0e3853 100644
--- a/proxyquire/proxyquire-tests.ts
+++ b/proxyquire/proxyquire-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./proxyquire.d.ts" />
+
 
 import proxyquire = require('proxyquire');
 
diff --git a/proxyquire/proxyquire.d.ts b/proxyquire/proxyquire.d.ts
deleted file mode 100644
index 5127592b87..0000000000
--- a/proxyquire/proxyquire.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-// Type definitions for Proxyquire 1.3.0
-// Project: https://github.com/thlorenz/proxyquire
-// Definitions by: jt000 <https://github.com/jt000/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface Proxyquire {
-
-    (request: string, stubs: any): any;
-    <T>(request: string, stubs: any): T;
-
-    load(request: string, stubs: any): any;
-    load<T>(request: string, stubs: any): T;
-
-    noCallThru(): Proxyquire;
-    callThru(): Proxyquire;
-
-    noPreserveCache(): Proxyquire;
-    preserveCache(): Proxyquire;
-}
-
-declare module 'proxyquire' {
-
-    var p: Proxyquire;
-    export = p;
-}
diff --git a/proxyquire/tsconfig.json b/proxyquire/tsconfig.json
new file mode 100644
index 0000000000..95822c6b22
--- /dev/null
+++ b/proxyquire/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "proxyquire-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pty.js/index.d.ts b/pty.js/index.d.ts
new file mode 100644
index 0000000000..98876953b2
--- /dev/null
+++ b/pty.js/index.d.ts
@@ -0,0 +1,132 @@
+// Type definitions for pty.js 0.2.7-1
+// Project: https://github.com/chjj/pty.js
+// Definitions by: Vadim Macagon <https://github.com/enlight/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+/** Options that can be used when creating a new pseudo-terminal. */
+interface TerminalOptions {
+    name?: string;
+    cols?: number;
+    rows?: number;
+    cwd?: string;
+    env?: any;
+    uid?: number;
+    gid?: number;
+}
+
+import stream = require('stream');
+import net = require('net');
+
+export declare class Terminal implements stream.Stream {
+    /** Read-only name of the terminal. */
+    name: string;
+    /** Read-only number of columns in the terminal. */
+    cols: number;
+    /** Read-only number of rows in the terminal. */
+    rows: number;
+    /**
+     * Read-only identifier of the spawned process associated with the slave end of the 
+     * pseudo-terminal. This will be null if the terminal was created via [[Terminal.open]].
+     */
+    pid: number;
+    /** Read-only file descriptor of the master end of the pseudo-terminal. */
+    fd: number;
+    /** Read-only name of the slave end of the pseudo-terminal. */
+    pty: string;
+    /** Read-only filename of the executable associated with the slave end of the pseudo-terminal. */
+    file: string;
+    /** Read-only name of the process associated with the slave end of the pseudo-terminal. */
+    process: string;
+    stdout: Terminal;
+    /** Note that an exception will be thrown if an attempt is made to access this property. */
+    stderr: Terminal;
+    stdin: Terminal;
+    socket: net.Socket;
+
+    /** 
+     * Creates a new pseudo-terminal, spawns a child process, and associates it with the slave 
+     * end of the pseudo-terminal.
+     */
+    constructor(file?: string, args?: string[], opt?: TerminalOptions);
+
+    resize(cols?: number, rows?: number): void;
+    /** 
+     * Sends a signal to the spawned process associated with the slave end of the
+     * pseudo-terminal (this only works if [[pid]] is not null).
+     */
+    kill(signal?: string): void;
+    redraw(): void;
+
+    // NodeJS Socket-like interface (wrappers for this.socket)
+      write(data: any): boolean;
+    end(data: any): void;
+    pause(): void;
+    resume(): void;
+    setEncoding(encoding: string): void;
+    /** 
+     * Closes the master end of the pseudo-terminal, and attempts to kill the spawned process
+     * associated with the slave end of the pseudo-terminal (but only if [[pid]] is not null).
+     */
+    destroy(): void;
+
+    // NodeJS Stream interface
+      pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
+
+    // NodeJS EventEmitter interface
+
+    addListener(event: string, listener: Function): this;
+    on(event: string, listener: Function): this;
+    once(event: string, listener: Function): this;
+    removeListener(event: string, listener: Function): this;
+    removeAllListeners(event?: string): this;
+    // NOTE: this method is not actually defined in pty.js
+    setMaxListeners(n: number): this;
+    getMaxListeners(): number;
+    listeners(event: string): Function[];
+    emit(event: string, ...args: any[]): boolean;
+    listenerCount(type: string): number;
+}
+
+/** 
+ * Creates a new pseudo-terminal, spawns a child process, and associates it with the slave 
+ * end of the pseudo-terminal.
+ */
+export declare function createTerminal(file?: string, args?: string[], opt?: TerminalOptions): Terminal;
+/** Alias for [[createTerminal]]. */
+export declare function fork(file?: string, args?: string[], opt?: TerminalOptions): Terminal;
+/** Alias for [[createTerminal]]. */
+export declare function spawn(file?: string, args?: string[], opt?: TerminalOptions): Terminal;
+/** 
+ * Creates a new pseudo-terminal.
+ * This function is not available on Windows, use [[fork]] there instead.
+ */
+export declare function open(opt?: { cols?: number; rows?: number }): Terminal;
+
+// Internal stuff that probably isn't very useful but is exported by pty.js
+export declare module native {
+    /** Unix-only. */
+    export function fork(
+        file: string, args: string[], env: any, cwd: string, cols: number, rows: number,
+        uid?: number, gid?: number
+    ): { fd: number; pid: number; pty: string };
+    /** Unix-only. */
+    export function open(
+        cols: number, rows: number
+    ): { master: number; slave: number; pty: string };
+    /** Unix-only. */
+    export function process(fd: number, tty: string): string;
+    /** Windows-only. */
+    export function open(
+        dataPipe: string, cols: number, rows: number, debug: boolean
+    ): { pid: number; pty: number; fd: number };
+    /** Windows-only. */
+    export function startProcess(
+        pid: number, file: string, cmdline: string, env: string[], cwd: string
+    ): void;
+    /** Windows-only. */
+    export function kill(pid: number): void;
+    export function resize(fd: number, cols: number, rows: number): void;
+}
diff --git a/pty.js/pty.js-tests.ts b/pty.js/pty.js-tests.ts
index cf73af384e..606ecf32a1 100644
--- a/pty.js/pty.js-tests.ts
+++ b/pty.js/pty.js-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="pty.js.d.ts" />
 
 import pty = require('pty.js');
 
diff --git a/pty.js/pty.js.d.ts b/pty.js/pty.js.d.ts
deleted file mode 100644
index 957134e466..0000000000
--- a/pty.js/pty.js.d.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-// Type definitions for pty.js 0.2.7-1
-// Project: https://github.com/chjj/pty.js
-// Definitions by: Vadim Macagon <https://github.com/enlight/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'pty.js' {
-    /** Options that can be used when creating a new pseudo-terminal. */
-    interface TerminalOptions {
-        name?: string;
-        cols?: number;
-        rows?: number;
-        cwd?: string;
-        env?: any;
-        uid?: number;
-        gid?: number;
-    }
-
-    import stream = require('stream');
-    import net = require('net');
-
-    export class Terminal implements stream.Stream {
-        /** Read-only name of the terminal. */
-        name: string;
-        /** Read-only number of columns in the terminal. */
-        cols: number;
-        /** Read-only number of rows in the terminal. */
-        rows: number;
-        /**
-         * Read-only identifier of the spawned process associated with the slave end of the 
-         * pseudo-terminal. This will be null if the terminal was created via [[Terminal.open]].
-         */
-        pid: number;
-        /** Read-only file descriptor of the master end of the pseudo-terminal. */
-        fd: number;
-        /** Read-only name of the slave end of the pseudo-terminal. */
-        pty: string;
-        /** Read-only filename of the executable associated with the slave end of the pseudo-terminal. */
-        file: string;
-        /** Read-only name of the process associated with the slave end of the pseudo-terminal. */
-        process: string;
-        stdout: Terminal;
-        /** Note that an exception will be thrown if an attempt is made to access this property. */
-        stderr: Terminal;
-        stdin: Terminal;
-        socket: net.Socket;
-
-        /** 
-         * Creates a new pseudo-terminal, spawns a child process, and associates it with the slave 
-         * end of the pseudo-terminal.
-         */
-        constructor(file?: string, args?: string[], opt?: TerminalOptions);
-
-        resize(cols?: number, rows?: number): void;
-        /** 
-         * Sends a signal to the spawned process associated with the slave end of the
-         * pseudo-terminal (this only works if [[pid]] is not null).
-         */
-        kill(signal?: string): void;
-        redraw(): void;
-    
-        // NodeJS Socket-like interface (wrappers for this.socket)
-        
-        write(data: any): boolean;
-        end(data: any): void;
-        pause(): void;
-        resume(): void;
-        setEncoding(encoding: string): void;
-        /** 
-         * Closes the master end of the pseudo-terminal, and attempts to kill the spawned process
-         * associated with the slave end of the pseudo-terminal (but only if [[pid]] is not null).
-         */
-        destroy(): void;
-
-        // NodeJS Stream interface
-    
-        pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
-    
-        // NodeJS EventEmitter interface
-
-        addListener(event: string, listener: Function): this;
-        on(event: string, listener: Function): this;
-        once(event: string, listener: Function): this;
-        removeListener(event: string, listener: Function): this;
-        removeAllListeners(event?: string): this;
-        // NOTE: this method is not actually defined in pty.js
-        setMaxListeners(n: number): this;
-        getMaxListeners(): number;
-        listeners(event: string): Function[];
-        emit(event: string, ...args: any[]): boolean;
-        listenerCount(type: string): number;
-    }
-
-    /** 
-     * Creates a new pseudo-terminal, spawns a child process, and associates it with the slave 
-     * end of the pseudo-terminal.
-     */
-    export function createTerminal(file?: string, args?: string[], opt?: TerminalOptions): Terminal;
-    /** Alias for [[createTerminal]]. */
-    export function fork(file?: string, args?: string[], opt?: TerminalOptions): Terminal;
-    /** Alias for [[createTerminal]]. */
-    export function spawn(file?: string, args?: string[], opt?: TerminalOptions): Terminal;
-    /** 
-     * Creates a new pseudo-terminal.
-     * This function is not available on Windows, use [[fork]] there instead.
-     */
-    export function open(opt?: { cols?: number; rows?: number }): Terminal;
-    
-    // Internal stuff that probably isn't very useful but is exported by pty.js
-    export module native {
-        /** Unix-only. */
-        export function fork(
-            file: string, args: string[], env: any, cwd: string, cols: number, rows: number,
-            uid?: number, gid?: number
-        ): { fd: number; pid: number; pty: string };
-        /** Unix-only. */
-        export function open(
-            cols: number, rows: number
-        ): { master: number; slave: number; pty: string };
-        /** Unix-only. */
-        export function process(fd: number, tty: string): string;
-        /** Windows-only. */
-        export function open(
-            dataPipe: string, cols: number, rows: number, debug: boolean
-        ): { pid: number; pty: number; fd: number };
-        /** Windows-only. */
-        export function startProcess(
-            pid: number, file: string, cmdline: string, env: string[], cwd: string
-        ): void;
-        /** Windows-only. */
-        export function kill(pid: number): void;
-        export function resize(fd: number, cols: number, rows: number): void;
-    }
-}
diff --git a/pty.js/tsconfig.json b/pty.js/tsconfig.json
new file mode 100644
index 0000000000..d4aa24863f
--- /dev/null
+++ b/pty.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pty.js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pubsubjs/PubSub-tests.ts b/pubsub-js/PubSub-tests.ts
similarity index 98%
rename from pubsubjs/PubSub-tests.ts
rename to pubsub-js/PubSub-tests.ts
index 0a452d08e3..67a23001bb 100644
--- a/pubsubjs/PubSub-tests.ts
+++ b/pubsub-js/PubSub-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="pubsub.d.ts" />
+
 
 /// Tests are taken from the PubSubJs Basic Examples https://github.com/mroderick/PubSubJS
 function test_Subscribe() {
diff --git a/pubsubjs/pubsub.d.ts b/pubsub-js/index.d.ts
similarity index 100%
rename from pubsubjs/pubsub.d.ts
rename to pubsub-js/index.d.ts
diff --git a/pubsub-js/tsconfig.json b/pubsub-js/tsconfig.json
new file mode 100644
index 0000000000..b751488674
--- /dev/null
+++ b/pubsub-js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "PubSub-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pure-render-decorator/index.d.ts b/pure-render-decorator/index.d.ts
new file mode 100644
index 0000000000..7cc6832040
--- /dev/null
+++ b/pure-render-decorator/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for pure-render-decorator v0.2.0
+// Project: https://github.com/felixgirault/pure-render-decorator
+// Definitions by: Sean Kelley <https://github.com/seansfkelley/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare var PureRender: ClassDecorator;
+export = PureRender;
diff --git a/pure-render-decorator/pure-render-decorator-tests.ts b/pure-render-decorator/pure-render-decorator-tests.ts
index e509fe508b..4598d60b41 100644
--- a/pure-render-decorator/pure-render-decorator-tests.ts
+++ b/pure-render-decorator/pure-render-decorator-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="pure-render-decorator.d.ts"/>
-
 import * as PureRender from 'pure-render-decorator';
 
 @PureRender
diff --git a/pure-render-decorator/pure-render-decorator.d.ts b/pure-render-decorator/pure-render-decorator.d.ts
deleted file mode 100644
index d24e842b60..0000000000
--- a/pure-render-decorator/pure-render-decorator.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for pure-render-decorator v0.2.0
-// Project: https://github.com/felixgirault/pure-render-decorator
-// Definitions by: Sean Kelley <https://github.com/seansfkelley/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'pure-render-decorator' {
-  var PureRender: ClassDecorator;
-  export = PureRender;
-}
diff --git a/pure-render-decorator/tsconfig.json b/pure-render-decorator/tsconfig.json
new file mode 100644
index 0000000000..89a06a5724
--- /dev/null
+++ b/pure-render-decorator/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "experimentalDecorators": true,
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pure-render-decorator-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/purl/index.d.ts b/purl/index.d.ts
new file mode 100644
index 0000000000..2849b17a8c
--- /dev/null
+++ b/purl/index.d.ts
@@ -0,0 +1,59 @@
+// Type definitions for Purl 2.3.1
+// Project: https://github.com/allmarkedup/purl
+// Definitions by: Daniel Ferreira Monteiro Alves <https://github.com/danfma>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace purl {
+
+    interface ParameterMap {
+        [parameterName: string]: string;
+    }
+
+    export interface Url {
+
+        /**
+         * The .attr() method is used to return information on various parts of the URL.
+         */
+        attr(option: string): string;
+
+        /**
+         * The .param() method is used to return the values of querystring parameters.
+         */
+        param(): ParameterMap;
+        param(parameterName: string): string;
+
+        /**
+         * The .segment() method is used to return values of individual segments from the URL's path.
+         * Pass in an integer value to get the value of that segment - note however that the count is not zero-indexed like an array - i.e. .segment(1) returns the first segment, not the second one.
+         * You can also pass in negative values, in which case it will count back from the end of the path rather than forwards from the start.
+         */
+        segment(position: number): string;
+
+        /**
+         * Gets a parameter from the fragment segment
+         */
+        fparam(): ParameterMap;
+        fparam(parameterName: string): string;
+
+        /**
+         * Gets the fragment segment at the especified position.
+         */
+        fsegment(position: number): string;
+    }
+
+}
+
+/**
+ * Parse the current page URL
+ */
+declare function purl(): purl.Url;
+
+/**
+ * Pass in a URI as a string and parse that
+ *
+ * @param someUrl the url to be parsed
+ */
+declare function purl(someUrl: string): purl.Url;
+
+export = purl;
+export as namespace purl;
diff --git a/purl/purl-jquery.d.ts b/purl/purl-jquery.d.ts
index cedbf8042f..64b258d9e0 100644
--- a/purl/purl-jquery.d.ts
+++ b/purl/purl-jquery.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Daniel Ferreira Monteiro Alves <https://github.com/danfma>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="purl.d.ts" />
+/// <reference types="jquery" />
+
 
 interface JQueryStatic {
 
diff --git a/purl/purl.d.ts b/purl/purl.d.ts
deleted file mode 100644
index 8b4d06fca4..0000000000
--- a/purl/purl.d.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-// Type definitions for Purl 2.3.1
-// Project: https://github.com/allmarkedup/purl
-// Definitions by: Daniel Ferreira Monteiro Alves <https://github.com/danfma>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace purl {
-
-    interface ParameterMap {
-        [parameterName: string]: string;
-    }
-
-    export interface Url {
-
-        /**
-         * The .attr() method is used to return information on various parts of the URL.
-         */
-        attr(option: string): string;
-
-        /**
-         * The .param() method is used to return the values of querystring parameters.
-         */
-        param(): ParameterMap;
-        param(parameterName: string): string;
-
-        /**
-         * The .segment() method is used to return values of individual segments from the URL's path.
-         * Pass in an integer value to get the value of that segment - note however that the count is not zero-indexed like an array - i.e. .segment(1) returns the first segment, not the second one.
-         * You can also pass in negative values, in which case it will count back from the end of the path rather than forwards from the start.
-         */
-        segment(position: number): string;
-
-        /**
-         * Gets a parameter from the fragment segment
-         */
-        fparam(): ParameterMap;
-        fparam(parameterName: string): string;
-
-        /**
-         * Gets the fragment segment at the especified position.
-         */
-        fsegment(position: number): string;
-    }
-
-}
-
-/**
- * Parse the current page URL
- */
-declare function purl(): purl.Url;
-
-/**
- * Pass in a URI as a string and parse that
- *
- * @param someUrl the url to be parsed
- */
-declare function purl(someUrl: string): purl.Url;
-
-declare module "purl" {
-    export = purl;
-}
diff --git a/purl/tsconfig.json b/purl/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/purl/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/pusher-js/index.d.ts b/pusher-js/index.d.ts
new file mode 100644
index 0000000000..e4ebfee975
--- /dev/null
+++ b/pusher-js/index.d.ts
@@ -0,0 +1,230 @@
+// Type definitions for pusher-js 3.0.0
+// Project: https://github.com/pusher/pusher-js
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare namespace pusher {
+    interface PusherStatic {
+        new (apiKey: string, config?: Config): Pusher;
+    }
+
+    interface Pusher {
+        subscribe(name: string): Channel;
+        subscribeAll(): void;
+        unsubscribe(name: string): void;
+        channel(name: string): Channel;
+        allChannels(): Channel[];
+        bind(eventName: string, callback: Function): Pusher;
+        bind_all(callback: Function): Pusher;
+        disconnect(): void;
+        key: string;
+        config: Config; //TODO: add GlobalConfig typings
+        channels: any; //TODO: Type this
+        global_emitter: EventsDispatcher;
+        sessionId: number;
+        timeline: any; //TODO: Type this
+        connection: ConnectionManager;
+    }
+
+    interface Config {
+        /**
+         * Forces the connection to use encrypted transports.
+         */
+        encrypted?: boolean;
+
+        /**
+         * Endpoint on your server that will return the authentication signature needed for private channels.
+         */
+        authEndpoint?: string;
+
+        /**
+         * Defines how the authentication endpoint, defined using authEndpoint, will be called.
+         * There are two options available: ajax and jsonp.
+         */
+        authTransport?: string;
+
+        /**
+         * Allows passing additional data to authorizers. Supports query string params and headers (AJAX only).
+         * For example, following will pass foo=bar via the query string and baz: boo via headers:
+         */
+        auth?: AuthConfig;
+
+
+        /**
+         * Allows connecting to a different datacenter by setting up correct hostnames and ports for the connection.
+         */
+        cluster?: string;
+
+
+        /**
+         * Disables stats collection, so that connection metrics are not submitted to Pusher’s servers.
+         */
+        disableStats?: boolean;
+
+        /**
+         * Specifies which transports should be used by Pusher to establish a connection.
+         * Useful for applications running in controlled, well-behaving environments.
+         * Available transports: ws, wss, xhr_streaming, xhr_polling, sockjs.
+         * Additional transports may be added in the future and without adding them to this list, they will be disabled.
+         */
+        enabledTransports?: string[];
+
+
+        /**
+         * Specified which transports must not be used by Pusher to establish a connection.
+         * This settings overwrites transports whitelisted via the enabledTransports options.
+         * Available transports: ws, wss, xhr_streaming, xhr_polling, sockjs.
+         * Additional transports may be added in the future and without adding them to this list, they will be enabled.
+         */
+        disabledTransports?: string[];
+
+        /**
+         * Ignores null origin checks for HTTP fallbacks. Use with care, it should be disabled only if necessary (i.e. PhoneGap).
+         */
+        ignoreNullOrigin?: boolean;
+
+        /**
+         * After this time (in miliseconds) without any messages received from the server,
+         * a ping message will be sent to check if the connection is still working.
+         * Default value is is supplied by the server, low values will result in unnecessary traffic.
+         */
+        activityTimeout?: number;
+
+        /**
+         * Time before the connection is terminated after sending a ping message.
+         * Default is 30000 (30s). Low values will cause false disconnections, if latency is high.
+         */
+        pongTimeout?: number;
+
+        wsHost?: string;
+        wsPort?: number;
+        wssPort?: number;
+        httpHost?: string;
+        httpPort?: number;
+        httpsPort?: number;
+    }
+
+    interface AuthConfig {
+        params?: { [key: string]: any };
+        headers?: { [key: string]: any };
+    }
+
+    interface GenericEventsDispatcher<Self extends EventsDispatcher> extends EventsDispatcher {
+        bind(eventName: string, callback: Function, context?: any): Self;
+        bind_all(callback: Function): Self;
+        unbind(eventName?: string, callback?: Function, context?: any): Self;
+        unbind_all(eventName?: string, callback?: Function): Self;
+        emit(eventName: string, data?: any): Self;
+    }
+
+    interface Channel extends GenericEventsDispatcher<Channel> {
+        /** Triggers an event */
+        trigger(eventName: string, data?: any): boolean;
+        pusher: Pusher;
+        name: string;
+        subscribed: boolean;
+        /**
+         * Authenticates the connection as a member of the channel.
+         * @param  {String} socketId
+         * @param  {Function} callback
+         */
+        authorize(socketId: string, callback: (data: any) => void): void;
+    }
+
+    interface EventsDispatcher {
+        bind(eventName: string, callback: Function, context?: any): EventsDispatcher;
+        bind_all(callback: Function): EventsDispatcher;
+        unbind(eventName?: string, callback?: Function, context?: any): EventsDispatcher;
+        unbind_all(eventName?: string, callback?: Function): EventsDispatcher;
+        emit(eventName: string, data?: any): EventsDispatcher;
+    }
+
+    interface ConnectionManager extends GenericEventsDispatcher<ConnectionManager> {
+        key: string;
+        options: any; //TODO: Timeline.js
+        state: string;
+        connection: any; //TODO: Type this
+        encrypted: boolean;
+        timeline: any; //TODO: Type this
+        connectionCallbacks: {
+            message: (message: string) => void;
+            ping: () => void;
+            activity: () => void;
+            error: (error: any) => void;
+            closed: () => void;
+        };
+        errorCallbacks: {
+            ssl_only: () => void;
+            refused: () => void;
+            backoff: () => void;
+            retry: () => void;
+        };
+        handshakeCallbacks: {
+            ssl_only: () => void;
+            refused: () => void;
+            backoff: () => void;
+            retry: () => void;
+            connected: (handshake: any) => void; //TODO: Type this
+        };
+        /**
+         * Establishes a connection to Pusher.
+         *
+         * Does nothing when connection is already established. See top-level doc
+         * to find events emitted on connection attempts.
+         */
+        connect(): void;
+        /**
+         * Sends raw data.
+         * @param {String} data
+         */
+        send(data: string): boolean;
+        /** Sends an event.
+         *
+         * @param {String} name
+         * @param {String} data
+         * @param {String} [channel]
+         * @returns {Boolean} whether message was sent or not
+         */
+        send_event(name: string, data: string, channel: string): boolean;
+        /** Closes the connection. */
+        disconnect(): void;
+        isEncrypted(): boolean;
+    }
+
+    interface PresenceChannel<T> extends Channel {
+        members: Members<T>;
+    }
+
+    interface Members<T> {
+        /**
+         * Returns member's info for given id.
+         *
+         * Resulting object containts two fields - id and info.
+         *
+         * @param {Number} id
+         * @return {Object} member's info or null
+         */
+        get(id: number): T;
+        /**
+         * Calls back for each member in unspecified order.
+         *
+         * @param  {Function} callback
+         */
+        each(callback: (member: any) => void): void;
+        members: { [id: number]: UserInfo<T> };
+        count: number;
+        myID: number;
+        me: UserInfo<T>;
+    }
+
+    interface UserInfo<T> {
+        id: number;
+        info: T;
+    }
+}
+
+declare var pusher: pusher.PusherStatic;
+
+export = pusher;
diff --git a/pusher-js/pusher-js-tests.ts b/pusher-js/pusher-js-tests.ts
index c672ff58e0..b393d6cb75 100644
--- a/pusher-js/pusher-js-tests.ts
+++ b/pusher-js/pusher-js-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="pusher-js.d.ts" />
 
 import Pusher = require('pusher-js');
 import { PresenceChannel } from "pusher-js";
diff --git a/pusher-js/pusher-js.d.ts b/pusher-js/pusher-js.d.ts
deleted file mode 100644
index 0a6dc18d24..0000000000
--- a/pusher-js/pusher-js.d.ts
+++ /dev/null
@@ -1,231 +0,0 @@
-// Type definitions for pusher-js 3.0.0
-// Project: https://github.com/pusher/pusher-js
-// Definitions by: Qubo <https://github.com/tkqubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "pusher-js" {
-
-    namespace pusher {
-        interface PusherStatic {
-            new(apiKey: string, config?: Config): Pusher;
-        }
-
-        interface Pusher {
-            subscribe(name: string): Channel;
-            subscribeAll(): void;
-            unsubscribe(name: string): void;
-            channel(name: string): Channel;
-            allChannels(): Channel[];
-            bind(eventName: string, callback: Function): Pusher;
-            bind_all(callback: Function): Pusher;
-            disconnect(): void;
-            key: string;
-            config: Config; //TODO: add GlobalConfig typings
-            channels: any; //TODO: Type this
-            global_emitter: EventsDispatcher;
-            sessionId: number;
-            timeline: any; //TODO: Type this
-            connection: ConnectionManager;
-        }
-
-        interface Config {
-            /**
-             * Forces the connection to use encrypted transports.
-             */
-            encrypted?: boolean;
-
-            /**
-             * Endpoint on your server that will return the authentication signature needed for private channels.
-             */
-            authEndpoint?: string;
-
-            /**
-             * Defines how the authentication endpoint, defined using authEndpoint, will be called.
-             * There are two options available: ajax and jsonp.
-             */
-            authTransport?: string;
-
-            /**
-             * Allows passing additional data to authorizers. Supports query string params and headers (AJAX only).
-             * For example, following will pass foo=bar via the query string and baz: boo via headers:
-             */
-            auth?: AuthConfig;
-
-
-            /**
-             * Allows connecting to a different datacenter by setting up correct hostnames and ports for the connection.
-             */
-            cluster?: string;
-
-
-            /**
-             * Disables stats collection, so that connection metrics are not submitted to Pusher’s servers.
-             */
-            disableStats?: boolean;
-
-            /**
-             * Specifies which transports should be used by Pusher to establish a connection.
-             * Useful for applications running in controlled, well-behaving environments.
-             * Available transports: ws, wss, xhr_streaming, xhr_polling, sockjs.
-             * Additional transports may be added in the future and without adding them to this list, they will be disabled.
-             */
-            enabledTransports?: string[];
-
-
-            /**
-             * Specified which transports must not be used by Pusher to establish a connection.
-             * This settings overwrites transports whitelisted via the enabledTransports options.
-             * Available transports: ws, wss, xhr_streaming, xhr_polling, sockjs.
-             * Additional transports may be added in the future and without adding them to this list, they will be enabled.
-             */
-            disabledTransports?: string[];
-
-            /**
-             * Ignores null origin checks for HTTP fallbacks. Use with care, it should be disabled only if necessary (i.e. PhoneGap).
-             */
-            ignoreNullOrigin?: boolean;
-
-            /**
-             * After this time (in miliseconds) without any messages received from the server,
-             * a ping message will be sent to check if the connection is still working.
-             * Default value is is supplied by the server, low values will result in unnecessary traffic.
-             */
-            activityTimeout?: number;
-
-            /**
-             * Time before the connection is terminated after sending a ping message.
-             * Default is 30000 (30s). Low values will cause false disconnections, if latency is high.
-             */
-            pongTimeout?: number;
-
-            wsHost?: string;
-            wsPort?: number;
-            wssPort?: number;
-            httpHost?: string;
-            httpPort?: number;
-            httpsPort?: number;
-        }
-
-        interface AuthConfig {
-            params?: { [key: string]: any };
-            headers?: { [key: string]: any };
-        }
-
-        interface GenericEventsDispatcher<Self extends EventsDispatcher> extends EventsDispatcher {
-            bind(eventName: string, callback: Function, context?: any): Self;
-            bind_all(callback: Function): Self;
-            unbind(eventName?: string, callback?: Function, context?: any): Self;
-            unbind_all(eventName?: string, callback?: Function): Self;
-            emit(eventName: string, data?: any): Self;
-        }
-
-        interface Channel extends GenericEventsDispatcher<Channel> {
-            /** Triggers an event */
-            trigger(eventName: string, data?: any): boolean;
-            pusher: Pusher;
-            name: string;
-            subscribed: boolean;
-            /**
-             * Authenticates the connection as a member of the channel.
-             * @param  {String} socketId
-             * @param  {Function} callback
-             */
-            authorize(socketId: string, callback: (data: any) => void): void;
-        }
-
-        interface EventsDispatcher {
-            bind(eventName: string, callback: Function, context?: any): EventsDispatcher;
-            bind_all(callback: Function): EventsDispatcher;
-            unbind(eventName?: string, callback?: Function, context?: any): EventsDispatcher;
-            unbind_all(eventName?: string, callback?: Function): EventsDispatcher;
-            emit(eventName: string, data?: any): EventsDispatcher;
-        }
-
-        interface ConnectionManager extends GenericEventsDispatcher<ConnectionManager> {
-            key: string;
-            options: any; //TODO: Timeline.js
-            state: string;
-            connection: any; //TODO: Type this
-            encrypted: boolean;
-            timeline: any; //TODO: Type this
-            connectionCallbacks: {
-                message: (message: string) => void;
-                ping: () => void;
-                activity: () => void;
-                error: (error: any) => void;
-                closed: () => void;
-            };
-            errorCallbacks: {
-                ssl_only: () => void;
-                refused: () => void;
-                backoff: () => void;
-                retry: () => void;
-            };
-            handshakeCallbacks: {
-                ssl_only: () => void;
-                refused: () => void;
-                backoff: () => void;
-                retry: () => void;
-                connected: (handshake: any) => void; //TODO: Type this
-            };
-            /**
-             * Establishes a connection to Pusher.
-             *
-             * Does nothing when connection is already established. See top-level doc
-             * to find events emitted on connection attempts.
-             */
-            connect(): void;
-            /**
-             * Sends raw data.
-             * @param {String} data
-             */
-            send(data: string): boolean;
-            /** Sends an event.
-             *
-             * @param {String} name
-             * @param {String} data
-             * @param {String} [channel]
-             * @returns {Boolean} whether message was sent or not
-             */
-            send_event(name: string, data: string, channel: string): boolean;
-            /** Closes the connection. */
-            disconnect(): void;
-            isEncrypted(): boolean;
-        }
-
-        interface PresenceChannel<T> extends Channel {
-            members: Members<T>;
-        }
-
-        interface Members<T> {
-            /**
-             * Returns member's info for given id.
-             *
-             * Resulting object containts two fields - id and info.
-             *
-             * @param {Number} id
-             * @return {Object} member's info or null
-             */
-            get(id: number): T;
-            /**
-             * Calls back for each member in unspecified order.
-             *
-             * @param  {Function} callback
-             */
-            each(callback: (member: any) => void): void;
-            members: { [id: number]: UserInfo<T> };
-            count: number;
-            myID: number;
-            me: UserInfo<T>;
-        }
-
-        interface UserInfo<T> {
-            id: number;
-            info: T;
-        }
-    }
-
-    var pusher: pusher.PusherStatic;
-
-    export = pusher;
-}
diff --git a/pusher-js/tsconfig.json b/pusher-js/tsconfig.json
new file mode 100644
index 0000000000..873e68d745
--- /dev/null
+++ b/pusher-js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "pusher-js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/q-io/Q-io-tests.ts b/q-io/Q-io-tests.ts
index 21b8969884..f0dfe8e01e 100644
--- a/q-io/Q-io-tests.ts
+++ b/q-io/Q-io-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../q/Q.d.ts" />
-/// <reference path="Q-io.d.ts" />
+/// <reference types="Q" />
+
 
 var fs:typeof QioFS = require('q-io/fs');
 var http:typeof QioHTTP = require('q-io/http');
diff --git a/q-io/Q-io.d.ts b/q-io/Q-io.d.ts
deleted file mode 100644
index 66bffa7577..0000000000
--- a/q-io/Q-io.d.ts
+++ /dev/null
@@ -1,257 +0,0 @@
-// Type definitions for Q-io
-// Project: https://github.com/kriskowal/q-io
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../node/node.d.ts" />
-///<reference path="../q/Q.d.ts" />
-
-//TODO add support for q-io/http-apps
-//TODO add verified support for q-io/fs-mock
-//TODO fix Readers/Writers properly
-//TODO find solution for overloaded return types (QioFS.open/QioFS.read)
-//     for some ideas see https://typescript.codeplex.com/discussions/461587#post1105930
-
-declare namespace QioFS {
-
-	//TODO how to define the multiple return types? use any for now?
-	export function open(path:string, options?:any):Q.Promise<any>;
-	//export function open(path:string, options?:any):Q.Promise<Qio.Reader>;
-	//export function open(path:string, options?:any):Q.Promise<Qio.Writer>;
-	//export function open(path:string, options?:any):Q.Promise<Buffer>;
-
-	//TODO how to define the multiple return types? use any for now?
-	export function read(path:string, options?:any):Q.Promise<any>;
-	//export function read(path:string, options?:any):Q.Promise<string>;
-	//export function read(path:string, options?:any):Q.Promise<Buffer>;
-
-	export function write(path:string, content:Buffer, options?:any):Q.Promise<void>;
-	export function write(path:string, content:string, options?:any):Q.Promise<void>;
-
-	export function append(path:string, content:Buffer, options?:any):Q.Promise<void>;
-	export function append(path:string, content:string, options?:any):Q.Promise<void>;
-
-	export function copy(source:string, target:string):Q.Promise<void>;
-	export function copyTree(source:string, target:string):Q.Promise<void>;
-
-	export function list(path:string):Q.Promise<string[]>;
-	export function listTree(path:string, guard?:(path:string, stat:any) => boolean):Q.Promise<string[]>;
-	export function listDirectoryTree(path:string):Q.Promise<string[]>;
-
-	export function makeDirectory(path:string, mode?:string):Q.Promise<void>;
-	export function makeDirectory(path:string, mode?:number):Q.Promise<void>;
-	export function makeTree(path:string, mode?:string):Q.Promise<void>;
-	export function makeTree(path:string, mode?:number):Q.Promise<void>;
-
-	export function remove(path:string):Q.Promise<void>;
-	export function removeTree(path:string):Q.Promise<void>;
-
-	export function rename(source:string, target:string):Q.Promise<void>;
-	export function move(source:string, target:string):Q.Promise<void>;
-
-	export function link(source:string, target:any):Q.Promise<void>;
-
-	export function symbolicCopy(source:string, target:string, type:string):Q.Promise<void>;
-	export function symbolicLink(target:string, link:string, type:string):Q.Promise<void>;
-
-	export function chown(path:string, uid:number, gid:number):Q.Promise<void>;
-	export function chmod(path:string, mode?:string):Q.Promise<void>;
-	export function chmod(path:string, mode?:number):Q.Promise<void>;
-
-	export function stat(path:string):Q.Promise<Stats>;
-	export function statLink(path:string):Q.Promise<Stats>;
-	export function statFd(fd:number):Q.Promise<Stats>;
-
-	export function exists(path:string):Q.Promise<boolean>;
-
-	export function isFile(path:string):Q.Promise<boolean>;
-	export function isDirectory(path:string):Q.Promise<boolean>;
-	export function isSymbolicLink(path:string):Q.Promise<boolean>;
-
-	export function lastModified(path:string):Q.Promise<Date>;
-	export function lastAccessed(path:string):Q.Promise<Date>;
-
-	export function split(path:string):string[];
-	export function join(...paths:string[]):string;
-	export function join(paths:string[]):string;
-	export function resolve(...path:string[]):string;
-	export function resolve(paths:string[]):string;
-	export function normal(...path:string[]):string;
-	export function normal(paths:string[]):string;
-	export function absolute(path:string):string;
-
-	export function canonical(path:string):Q.Promise<string>;
-	export function readLink(path:string):Q.Promise<string>;
-
-	export function contains(parent:string, child:string):boolean;
-
-	export function relative(source:string, target:string):Q.Promise<string>;
-
-	export function relativeFromFile(source:string, target:string):string;
-	export function relativeFromDirectory(source:string, target:string):string;
-
-	export function isAbsolute(path:string):boolean;
-	export function isRelative(path:string):boolean;
-	export function isRoot(path:string):boolean;
-
-	export function root(path:string):string;
-	export function directory(path:string):string;
-	export function base(path:string, extension:string):string;
-	export function extension(path:string):string;
-
-	//this should return a q-io/fs-mock MockFS
-	export function reroot(path:string):typeof QioFS;
-
-	export function toObject(path:string):{[path:string]:Buffer};
-
-	//listed but not implemented by Q-io
-	//export function glob(pattern):Q.Promise<string[]>;
-	//export function match(pattern, path:string):Q.Promise<string[]>;
-
-	//TODO link this to node.js FS module (no lazy clones)
-	interface Stats {
-		node:NodeStats;
-		size:number;
-	}
-	interface NodeStats {
-		isFile():boolean;
-		isDirectory():boolean;
-		isBlockDevice():boolean;
-		isCharacterDevice():boolean;
-		isSymbolicLink():boolean;
-		isFIFO():boolean;
-		isSocket():boolean;
-		node:NodeStats;
-		dev:number;
-		ino:number;
-		mode:number;
-		nlink:number;
-		uid:number;
-		gid:number;
-		rdev:number;
-		size:number;
-		blksize:number;
-		blocks:number;
-		atime:Date;
-		mtime:Date;
-		ctime:Date;
-	}
-}
-
-declare namespace QioHTTP {
-	export function request(request:Request):Q.Promise<Response>;
-	export function request(url:string):Q.Promise<Response>;
-
-	export function read(request:Request):Q.Promise<string>;
-	export function read(url:string):Q.Promise<string >;
-
-	export function normalizeRequest(request:Request):Request;
-	export function normalizeRequest(url:string):Request;
-	export function normalizeResponse(response:Response):Response;
-
-	interface Request {
-		url:string;
-		path:string;
-		scriptName:string;
-		pathInfo:string;
-		version:string[];
-		method:string;
-		scheme:string;
-
-		host:string;
-		port:number;
-		remoteHost:string;
-		remotePort:number;
-
-		headers:Headers;
-		agent:any;
-		body:any;
-		node:any;
-	}
-	interface Response {
-		status:number;
-		headers:Headers;
-		body:Qio.Reader
-		onclose:() => void;
-		node:any;
-	}
-	interface Headers {
-		[name:string]:any;
-		// [name:string]:any[];
-	}
-	interface Body extends Qio.Stream {
-
-	}
-	interface Application {
-		(req:Request):Q.Promise<any>;
-	}
-}
-
-declare namespace Qio {
-	interface ForEachCallback {
-		(chunk:Buffer):Q.Promise<any>;
-		(chunk:string):Q.Promise<any>;
-	}
-	interface ForEach {
-		forEach(callback:ForEachCallback):Q.Promise<void>;
-	}
-
-	interface Reader extends ForEach {
-		read(charset:string):Q.Promise<string>;
-		read():Q.Promise<Buffer>;
-		close():void;
-		node: NodeJS.ReadableStream;
-	}
-	interface Writer {
-		write(content:string):void;
-		write(content:Buffer):void;
-		flush():Q.Promise<void>;
-		close():void;
-		destroy():void;
-		node: NodeJS.WritableStream;
-	}
-
-	interface Stream {
-        read(charset:string):Q.Promise<string>;
-        read():Q.Promise<Buffer>;
-        write(content:string):void;
-        write(content:Buffer):void;
-        flush():Q.Promise<void>;
-        close():void;
-        destroy():void;
-        node:any;
-	}
-
-	interface BufferReader extends QioBufferReader {
-
-	}
-}
-interface QioBufferReader {
-	new ():Qio.Reader;
-	read(stream:Qio.Reader, charset:string):string;
-	read(stream:Qio.Reader):Buffer;
-	join(buffers:Buffer[]):Buffer;
-}
-interface QioBufferWriter {
-	(writer:Buffer):Qio.Writer;
-	Writer:Qio.Writer;
-}
-interface QioBufferStream {
-	(buffer:Buffer, encoding:string):Qio.Stream
-}
-
-declare module "q-io/http" {
-export = QioHTTP;
-}
-declare module "q-io/fs" {
-export = QioFS;
-}
-declare module "q-io/reader" {
-export = QioBufferReader;
-}
-declare module "q-io/writer" {
-export = QioBufferWriter;
-}
-declare module "q-io/buffer-stream" {
-export = QioBufferStream;
-}
diff --git a/q-io/index.d.ts b/q-io/index.d.ts
new file mode 100644
index 0000000000..fa19ef3fd5
--- /dev/null
+++ b/q-io/index.d.ts
@@ -0,0 +1,257 @@
+// Type definitions for Q-io
+// Project: https://github.com/kriskowal/q-io
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="node" />
+///<reference types="Q" />
+
+//TODO add support for q-io/http-apps
+//TODO add verified support for q-io/fs-mock
+//TODO fix Readers/Writers properly
+//TODO find solution for overloaded return types (QioFS.open/QioFS.read)
+//     for some ideas see https://typescript.codeplex.com/discussions/461587#post1105930
+
+declare namespace QioFS {
+
+	//TODO how to define the multiple return types? use any for now?
+	export function open(path:string, options?:any):Q.Promise<any>;
+	//export function open(path:string, options?:any):Q.Promise<Qio.Reader>;
+	//export function open(path:string, options?:any):Q.Promise<Qio.Writer>;
+	//export function open(path:string, options?:any):Q.Promise<Buffer>;
+
+	//TODO how to define the multiple return types? use any for now?
+	export function read(path:string, options?:any):Q.Promise<any>;
+	//export function read(path:string, options?:any):Q.Promise<string>;
+	//export function read(path:string, options?:any):Q.Promise<Buffer>;
+
+	export function write(path:string, content:Buffer, options?:any):Q.Promise<void>;
+	export function write(path:string, content:string, options?:any):Q.Promise<void>;
+
+	export function append(path:string, content:Buffer, options?:any):Q.Promise<void>;
+	export function append(path:string, content:string, options?:any):Q.Promise<void>;
+
+	export function copy(source:string, target:string):Q.Promise<void>;
+	export function copyTree(source:string, target:string):Q.Promise<void>;
+
+	export function list(path:string):Q.Promise<string[]>;
+	export function listTree(path:string, guard?:(path:string, stat:any) => boolean):Q.Promise<string[]>;
+	export function listDirectoryTree(path:string):Q.Promise<string[]>;
+
+	export function makeDirectory(path:string, mode?:string):Q.Promise<void>;
+	export function makeDirectory(path:string, mode?:number):Q.Promise<void>;
+	export function makeTree(path:string, mode?:string):Q.Promise<void>;
+	export function makeTree(path:string, mode?:number):Q.Promise<void>;
+
+	export function remove(path:string):Q.Promise<void>;
+	export function removeTree(path:string):Q.Promise<void>;
+
+	export function rename(source:string, target:string):Q.Promise<void>;
+	export function move(source:string, target:string):Q.Promise<void>;
+
+	export function link(source:string, target:any):Q.Promise<void>;
+
+	export function symbolicCopy(source:string, target:string, type:string):Q.Promise<void>;
+	export function symbolicLink(target:string, link:string, type:string):Q.Promise<void>;
+
+	export function chown(path:string, uid:number, gid:number):Q.Promise<void>;
+	export function chmod(path:string, mode?:string):Q.Promise<void>;
+	export function chmod(path:string, mode?:number):Q.Promise<void>;
+
+	export function stat(path:string):Q.Promise<Stats>;
+	export function statLink(path:string):Q.Promise<Stats>;
+	export function statFd(fd:number):Q.Promise<Stats>;
+
+	export function exists(path:string):Q.Promise<boolean>;
+
+	export function isFile(path:string):Q.Promise<boolean>;
+	export function isDirectory(path:string):Q.Promise<boolean>;
+	export function isSymbolicLink(path:string):Q.Promise<boolean>;
+
+	export function lastModified(path:string):Q.Promise<Date>;
+	export function lastAccessed(path:string):Q.Promise<Date>;
+
+	export function split(path:string):string[];
+	export function join(...paths:string[]):string;
+	export function join(paths:string[]):string;
+	export function resolve(...path:string[]):string;
+	export function resolve(paths:string[]):string;
+	export function normal(...path:string[]):string;
+	export function normal(paths:string[]):string;
+	export function absolute(path:string):string;
+
+	export function canonical(path:string):Q.Promise<string>;
+	export function readLink(path:string):Q.Promise<string>;
+
+	export function contains(parent:string, child:string):boolean;
+
+	export function relative(source:string, target:string):Q.Promise<string>;
+
+	export function relativeFromFile(source:string, target:string):string;
+	export function relativeFromDirectory(source:string, target:string):string;
+
+	export function isAbsolute(path:string):boolean;
+	export function isRelative(path:string):boolean;
+	export function isRoot(path:string):boolean;
+
+	export function root(path:string):string;
+	export function directory(path:string):string;
+	export function base(path:string, extension:string):string;
+	export function extension(path:string):string;
+
+	//this should return a q-io/fs-mock MockFS
+	export function reroot(path:string):typeof QioFS;
+
+	export function toObject(path:string):{[path:string]:Buffer};
+
+	//listed but not implemented by Q-io
+	//export function glob(pattern):Q.Promise<string[]>;
+	//export function match(pattern, path:string):Q.Promise<string[]>;
+
+	//TODO link this to node.js FS module (no lazy clones)
+	interface Stats {
+		node:NodeStats;
+		size:number;
+	}
+	interface NodeStats {
+		isFile():boolean;
+		isDirectory():boolean;
+		isBlockDevice():boolean;
+		isCharacterDevice():boolean;
+		isSymbolicLink():boolean;
+		isFIFO():boolean;
+		isSocket():boolean;
+		node:NodeStats;
+		dev:number;
+		ino:number;
+		mode:number;
+		nlink:number;
+		uid:number;
+		gid:number;
+		rdev:number;
+		size:number;
+		blksize:number;
+		blocks:number;
+		atime:Date;
+		mtime:Date;
+		ctime:Date;
+	}
+}
+
+declare namespace QioHTTP {
+	export function request(request:Request):Q.Promise<Response>;
+	export function request(url:string):Q.Promise<Response>;
+
+	export function read(request:Request):Q.Promise<string>;
+	export function read(url:string):Q.Promise<string >;
+
+	export function normalizeRequest(request:Request):Request;
+	export function normalizeRequest(url:string):Request;
+	export function normalizeResponse(response:Response):Response;
+
+	interface Request {
+		url:string;
+		path:string;
+		scriptName:string;
+		pathInfo:string;
+		version:string[];
+		method:string;
+		scheme:string;
+
+		host:string;
+		port:number;
+		remoteHost:string;
+		remotePort:number;
+
+		headers:Headers;
+		agent:any;
+		body:any;
+		node:any;
+	}
+	interface Response {
+		status:number;
+		headers:Headers;
+		body:Qio.Reader
+		onclose:() => void;
+		node:any;
+	}
+	interface Headers {
+		[name:string]:any;
+		// [name:string]:any[];
+	}
+	interface Body extends Qio.Stream {
+
+	}
+	interface Application {
+		(req:Request):Q.Promise<any>;
+	}
+}
+
+declare namespace Qio {
+	interface ForEachCallback {
+		(chunk:Buffer):Q.Promise<any>;
+		(chunk:string):Q.Promise<any>;
+	}
+	interface ForEach {
+		forEach(callback:ForEachCallback):Q.Promise<void>;
+	}
+
+	interface Reader extends ForEach {
+		read(charset:string):Q.Promise<string>;
+		read():Q.Promise<Buffer>;
+		close():void;
+		node: NodeJS.ReadableStream;
+	}
+	interface Writer {
+		write(content:string):void;
+		write(content:Buffer):void;
+		flush():Q.Promise<void>;
+		close():void;
+		destroy():void;
+		node: NodeJS.WritableStream;
+	}
+
+	interface Stream {
+        read(charset:string):Q.Promise<string>;
+        read():Q.Promise<Buffer>;
+        write(content:string):void;
+        write(content:Buffer):void;
+        flush():Q.Promise<void>;
+        close():void;
+        destroy():void;
+        node:any;
+	}
+
+	interface BufferReader extends QioBufferReader {
+
+	}
+}
+interface QioBufferReader {
+	new ():Qio.Reader;
+	read(stream:Qio.Reader, charset:string):string;
+	read(stream:Qio.Reader):Buffer;
+	join(buffers:Buffer[]):Buffer;
+}
+interface QioBufferWriter {
+	(writer:Buffer):Qio.Writer;
+	Writer:Qio.Writer;
+}
+interface QioBufferStream {
+	(buffer:Buffer, encoding:string):Qio.Stream
+}
+
+declare module "q-io/http" {
+export = QioHTTP;
+}
+declare module "q-io/fs" {
+export = QioFS;
+}
+declare module "q-io/reader" {
+export = QioBufferReader;
+}
+declare module "q-io/writer" {
+export = QioBufferWriter;
+}
+declare module "q-io/buffer-stream" {
+export = QioBufferStream;
+}
diff --git a/q-io/tsconfig.json b/q-io/tsconfig.json
new file mode 100644
index 0000000000..47cc97955c
--- /dev/null
+++ b/q-io/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "q-io-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/q-retry/index.d.ts b/q-retry/index.d.ts
new file mode 100644
index 0000000000..851f5fabe3
--- /dev/null
+++ b/q-retry/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for q-retry
+// Project: https://github.com/vilic/q-retry
+// Definitions by: VILIC VANE <https://github.com/vilic>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="Q" />
+
+export = Q;
+
+declare namespace Q {
+    export interface IRetryOptions {
+        limit?: number;
+        interval?: number;
+        maxInterval?: number;
+        intervalMultiplier?: number;
+    }
+
+    export function retry<U>(process: () => IPromise<U>, onFail: (reason: any, retries: number) => void, limit: number): Promise<U>;
+    export function retry<U>(process: () => IPromise<U>, onFail: (reason: any, retries: number) => void, options?: IRetryOptions): Promise<U>;
+    export function retry<U>(process: () => IPromise<U>, limit: number): Promise<U>;
+    export function retry<U>(process: () => IPromise<U>, options?: IRetryOptions): Promise<U>;
+    export function retry<U>(process: () => U, onFail: (reason: any, retries: number) => void, limit: number): Promise<U>;
+    export function retry<U>(process: () => U, onFail: (reason: any, retries: number) => void, options?: IRetryOptions): Promise<U>;
+    export function retry<U>(process: () => U, limit: number): Promise<U>;
+    export function retry<U>(process: () => U, options?: IRetryOptions): Promise<U>;
+
+    interface Promise<T> {
+        retry<U>(process: (value: T) => IPromise<U>, onFail: (reason: any, retries: number) => void, limit: number): Promise<U>;
+        retry<U>(process: (value: T) => IPromise<U>, onFail: (reason: any, retries: number) => void, options?: IRetryOptions): Promise<U>;
+        retry<U>(process: (value: T) => IPromise<U>, limit: number): Promise<U>;
+        retry<U>(process: (value: T) => IPromise<U>, options?: IRetryOptions): Promise<U>;
+        retry<U>(process: (value: T) => U, onFail: (reason: any, retries: number) => void, limit: number): Promise<U>;
+        retry<U>(process: (value: T) => U, onFail: (reason: any, retries: number) => void, options?: IRetryOptions): Promise<U>;
+        retry<U>(process: (value: T) => U, limit: number): Promise<U>;
+        retry<U>(process: (value: T) => U, options?: IRetryOptions): Promise<U>;
+    }
+}
diff --git a/q-retry/q-retry-tests.ts b/q-retry/q-retry-tests.ts
index fc33d7ba97..e22ab7ed03 100644
--- a/q-retry/q-retry-tests.ts
+++ b/q-retry/q-retry-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./q-retry.d.ts" />
+
 
 import Q = require('q-retry');
 
diff --git a/q-retry/q-retry.d.ts b/q-retry/q-retry.d.ts
deleted file mode 100644
index ada36a59a4..0000000000
--- a/q-retry/q-retry.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-// Type definitions for q-retry
-// Project: https://github.com/vilic/q-retry
-// Definitions by: VILIC VANE <https://github.com/vilic>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../q/Q.d.ts" />
-
-declare namespace Q {
-    export interface IRetryOptions {
-        limit?: number;
-        interval?: number;
-        maxInterval?: number;
-        intervalMultiplier?: number;
-    }
-
-    export function retry<U>(process: () => IPromise<U>, onFail: (reason: any, retries: number) => void, limit: number): Promise<U>;
-    export function retry<U>(process: () => IPromise<U>, onFail: (reason: any, retries: number) => void, options?: IRetryOptions): Promise<U>;
-    export function retry<U>(process: () => IPromise<U>, limit: number): Promise<U>;
-    export function retry<U>(process: () => IPromise<U>, options?: IRetryOptions): Promise<U>;
-    export function retry<U>(process: () => U, onFail: (reason: any, retries: number) => void, limit: number): Promise<U>;
-    export function retry<U>(process: () => U, onFail: (reason: any, retries: number) => void, options?: IRetryOptions): Promise<U>;
-    export function retry<U>(process: () => U, limit: number): Promise<U>;
-    export function retry<U>(process: () => U, options?: IRetryOptions): Promise<U>;
-
-    interface Promise<T> {
-        retry<U>(process: (value: T) => IPromise<U>, onFail: (reason: any, retries: number) => void, limit: number): Promise<U>;
-        retry<U>(process: (value: T) => IPromise<U>, onFail: (reason: any, retries: number) => void, options?: IRetryOptions): Promise<U>;
-        retry<U>(process: (value: T) => IPromise<U>, limit: number): Promise<U>;
-        retry<U>(process: (value: T) => IPromise<U>, options?: IRetryOptions): Promise<U>;
-        retry<U>(process: (value: T) => U, onFail: (reason: any, retries: number) => void, limit: number): Promise<U>;
-        retry<U>(process: (value: T) => U, onFail: (reason: any, retries: number) => void, options?: IRetryOptions): Promise<U>;
-        retry<U>(process: (value: T) => U, limit: number): Promise<U>;
-        retry<U>(process: (value: T) => U, options?: IRetryOptions): Promise<U>;
-    }
-}
-
-declare module "q-retry" {
-    export = Q;
-}
diff --git a/q-retry/tsconfig.json b/q-retry/tsconfig.json
new file mode 100644
index 0000000000..e68cbe8c18
--- /dev/null
+++ b/q-retry/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "q-retry-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/q/Q-tests.ts b/q/Q-tests.ts
index ab613f8aa4..efd32d4b98 100644
--- a/q/Q-tests.ts
+++ b/q/Q-tests.ts
@@ -1,7 +1,7 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="Q.d.ts" />
+/// <reference types="jquery" />
 
-import q = require('q');
+
+import Q = require('q');
 
 Q(8).then(x => console.log(x.toExponential()));
 
diff --git a/q/Q.d.ts b/q/Q.d.ts
deleted file mode 100644
index bd9cdb8ca5..0000000000
--- a/q/Q.d.ts
+++ /dev/null
@@ -1,336 +0,0 @@
-// Type definitions for Q
-// Project: https://github.com/kriskowal/q
-// Definitions by: Barrie Nemetchek <https://github.com/bnemetchek>, Andrew Gaspar <https://github.com/AndrewGaspar/>, John Reilly <https://github.com/johnnyreilly>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/**
- * If value is a Q promise, returns the promise.
- * If value is a promise from another library it is coerced into a Q promise (where possible).
- */
-declare function Q<T>(promise: Q.IPromise<T>): Q.Promise<T>;
-/**
- * If value is not a promise, returns a promise that is fulfilled with value.
- */
-declare function Q<T>(value: T): Q.Promise<T>;
-
-declare namespace Q {
-    interface IPromise<T> {
-        then<U>(onFulfill?: (value: T) => U | IPromise<U>, onReject?: (error: any) => U | IPromise<U>): IPromise<U>;
-    }
-
-    interface Deferred<T> {
-        promise: Promise<T>;
-        resolve(value?: T): void;
-        resolve(value?: IPromise<T>): void;
-        reject(reason: any): void;
-        notify(value: any): void;
-        makeNodeResolver(): (reason: any, value: T) => void;
-    }
-
-    interface Promise<T> {
-        /**
-         * Like a finally clause, allows you to observe either the fulfillment or rejection of a promise, but to do so without modifying the final value. This is useful for collecting resources regardless of whether a job succeeded, like closing a database connection, shutting a server down, or deleting an unneeded key from an object.
-
-         * finally returns a promise, which will become resolved with the same fulfillment value or rejection reason as promise. However, if callback returns a promise, the resolution of the returned promise will be delayed until the promise returned from callback is finished.
-         */
-        fin(finallyCallback: () => any): Promise<T>;
-        /**
-         * Like a finally clause, allows you to observe either the fulfillment or rejection of a promise, but to do so without modifying the final value. This is useful for collecting resources regardless of whether a job succeeded, like closing a database connection, shutting a server down, or deleting an unneeded key from an object.
-
-         * finally returns a promise, which will become resolved with the same fulfillment value or rejection reason as promise. However, if callback returns a promise, the resolution of the returned promise will be delayed until the promise returned from callback is finished.
-         */
-        finally(finallyCallback: () => any): Promise<T>;
-
-        /**
-         * The then method from the Promises/A+ specification, with an additional progress handler.
-         */
-        then<U>(onFulfill?: (value: T) => U | IPromise<U>, onReject?: (error: any) => U | IPromise<U>, onProgress?: Function): Promise<U>;
-
-        /**
-         * Like then, but "spreads" the array into a variadic fulfillment handler. If any of the promises in the array are rejected, instead calls onRejected with the first rejected promise's rejection reason.
-         *
-         * This is especially useful in conjunction with all
-         */
-        spread<U>(onFulfill: (...args: any[]) => IPromise<U> | U, onReject?: (reason: any) => IPromise<U> | U): Promise<U>;
-
-        fail<U>(onRejected: (reason: any) => U | IPromise<U>): Promise<U>;
-
-        /**
-         * A sugar method, equivalent to promise.then(undefined, onRejected).
-         */
-        catch<U>(onRejected: (reason: any) => U | IPromise<U>): Promise<U>;
-
-        /**
-         * A sugar method, equivalent to promise.then(undefined, undefined, onProgress).
-         */
-        progress(onProgress: (progress: any) => any): Promise<T>;
-
-        /**
-         * Much like then, but with different behavior around unhandled rejection. If there is an unhandled rejection, either because promise is rejected and no onRejected callback was provided, or because onFulfilled or onRejected threw an error or returned a rejected promise, the resulting rejection reason is thrown as an exception in a future turn of the event loop.
-         *
-         * This method should be used to terminate chains of promises that will not be passed elsewhere. Since exceptions thrown in then callbacks are consumed and transformed into rejections, exceptions at the end of the chain are easy to accidentally, silently ignore. By arranging for the exception to be thrown in a future turn of the event loop, so that it won't be caught, it causes an onerror event on the browser window, or an uncaughtException event on Node.js's process object.
-         *
-         * Exceptions thrown by done will have long stack traces, if Q.longStackSupport is set to true. If Q.onerror is set, exceptions will be delivered there instead of thrown in a future turn.
-         *
-         * The Golden Rule of done vs. then usage is: either return your promise to someone else, or if the chain ends with you, call done to terminate it.
-         */
-        done(onFulfilled?: (value: T) => any, onRejected?: (reason: any) => any, onProgress?: (progress: any) => any): void;
-
-        /**
-         * If callback is a function, assumes it's a Node.js-style callback, and calls it as either callback(rejectionReason) when/if promise becomes rejected, or as callback(null, fulfillmentValue) when/if promise becomes fulfilled. If callback is not a function, simply returns promise.
-         */
-        nodeify(callback: (reason: any, value: any) => void): Promise<T>;
-
-        /**
-         * Returns a promise to get the named property of an object. Essentially equivalent to
-         *
-         * promise.then(function (o) {
-         *     return o[propertyName];
-         * });
-         */
-        get<U>(propertyName: String): Promise<U>;
-        set<U>(propertyName: String, value: any): Promise<U>;
-        delete<U>(propertyName: String): Promise<U>;
-        /**
-         * Returns a promise for the result of calling the named method of an object with the given array of arguments. The object itself is this in the function, just like a synchronous method call. Essentially equivalent to
-         *
-         * promise.then(function (o) {
-         *     return o[methodName].apply(o, args);
-         * });
-         */
-        post<U>(methodName: String, args: any[]): Promise<U>;
-        /**
-         * Returns a promise for the result of calling the named method of an object with the given variadic arguments. The object itself is this in the function, just like a synchronous method call.
-         */
-        invoke<U>(methodName: String, ...args: any[]): Promise<U>;
-        fapply<U>(args: any[]): Promise<U>;
-        fcall<U>(...args: any[]): Promise<U>;
-
-        /**
-         * Returns a promise for an array of the property names of an object. Essentially equivalent to
-         *
-         * promise.then(function (o) {
-         *     return Object.keys(o);
-         * });
-         */
-        keys(): Promise<string[]>;
-
-        /**
-         * A sugar method, equivalent to promise.then(function () { return value; }).
-         */
-        thenResolve<U>(value: U): Promise<U>;
-        /**
-         * A sugar method, equivalent to promise.then(function () { throw reason; }).
-         */
-        thenReject(reason: any): Promise<T>;
-
-        /**
-         * Attaches a handler that will observe the value of the promise when it becomes fulfilled, returning a promise for that same value, perhaps deferred but not replaced by the promise returned by the onFulfilled handler.
-         */
-        tap(onFulfilled: (value: T) => any): Promise<T>;
-
-        timeout(ms: number, message?: string): Promise<T>;
-        /**
-         * Returns a promise that will have the same result as promise, but will only be fulfilled or rejected after at least ms milliseconds have passed.
-         */
-        delay(ms: number): Promise<T>;
-
-        /**
-         * Returns whether a given promise is in the fulfilled state. When the static version is used on non-promises, the result is always true.
-         */
-        isFulfilled(): boolean;
-        /**
-         * Returns whether a given promise is in the rejected state. When the static version is used on non-promises, the result is always false.
-         */
-        isRejected(): boolean;
-        /**
-         * Returns whether a given promise is in the pending state. When the static version is used on non-promises, the result is always false.
-         */
-        isPending(): boolean;
-
-        valueOf(): any;
-
-        /**
-         * Returns a "state snapshot" object, which will be in one of three forms:
-         *
-         * - { state: "pending" }
-         * - { state: "fulfilled", value: <fulfllment value> }
-         * - { state: "rejected", reason: <rejection reason> }
-         */
-        inspect(): PromiseState<T>;
-    }
-
-    interface PromiseState<T> {
-        /**
-         * "fulfilled", "rejected", "pending"
-         */
-        state: string;
-        value?: T;
-        reason?: any;
-    }
-
-    // If no value provided, returned promise will be of void type
-    export function when(): Promise<void>;
-
-    // if no fulfill, reject, or progress provided, returned promise will be of same type
-    export function when<T>(value: T | IPromise<T>): Promise<T>;
-
-    // If a non-promise value is provided, it will not reject or progress
-    export function when<T, U>(value: T | IPromise<T>, onFulfilled: (val: T) => U | IPromise<U>, onRejected?: (reason: any) => U | IPromise<U>, onProgress?: (progress: any) => any): Promise<U>;
-
-    /**
-     * Currently "impossible" (and I use the term loosely) to implement due to TypeScript limitations as it is now.
-     * See: https://github.com/Microsoft/TypeScript/issues/1784 for discussion on it.
-     */
-    // export function try(method: Function, ...args: any[]): Promise<any>;
-
-    export function fbind<T>(method: (...args: any[]) => T | IPromise<T>, ...args: any[]): (...args: any[]) => Promise<T>;
-
-    export function fcall<T>(method: (...args: any[]) => T, ...args: any[]): Promise<T>;
-
-    export function send<T>(obj: any, functionName: string, ...args: any[]): Promise<T>;
-    export function invoke<T>(obj: any, functionName: string, ...args: any[]): Promise<T>;
-    export function mcall<T>(obj: any, functionName: string, ...args: any[]): Promise<T>;
-
-    export function denodeify<T>(nodeFunction: Function, ...args: any[]): (...args: any[]) => Promise<T>;
-    export function nbind<T>(nodeFunction: Function, thisArg: any, ...args: any[]): (...args: any[]) => Promise<T>;
-    export function nfbind<T>(nodeFunction: Function, ...args: any[]): (...args: any[]) => Promise<T>;
-    export function nfcall<T>(nodeFunction: Function, ...args: any[]): Promise<T>;
-    export function nfapply<T>(nodeFunction: Function, args: any[]): Promise<T>;
-
-    export function ninvoke<T>(nodeModule: any, functionName: string, ...args: any[]): Promise<T>;
-    export function npost<T>(nodeModule: any, functionName: string, args: any[]): Promise<T>;
-    export function nsend<T>(nodeModule: any, functionName: string, ...args: any[]): Promise<T>;
-    export function nmcall<T>(nodeModule: any, functionName: string, ...args: any[]): Promise<T>;
-
-    /**
-     * Returns a promise that is fulfilled with an array containing the fulfillment value of each promise, or is rejected with the same rejection reason as the first promise to be rejected.
-     */
-    export function all<T>(promises: IPromise<T>[]): Promise<T[]>;
-
-    /**
-    * Returns a promise for the first of an array of promises to become settled.
-    */
-    export function race<T>(promises: IPromise<T>[]): Promise<T>;
-
-    /**
-     * Returns a promise that is fulfilled with an array of promise state snapshots, but only after all the original promises have settled, i.e. become either fulfilled or rejected.
-     */
-    export function allSettled<T>(promises: IPromise<T>[]): Promise<PromiseState<T>[]>;
-
-    export function allResolved<T>(promises: IPromise<T>[]): Promise<Promise<T>[]>;
-
-    /**
-     * Like then, but "spreads" the array into a variadic fulfillment handler. If any of the promises in the array are rejected, instead calls onRejected with the first rejected promise's rejection reason.
-     * This is especially useful in conjunction with all.
-     */
-    export function spread<T, U>(promises: IPromise<T>[], onFulfilled: (...args: T[]) => U | IPromise<U>, onRejected?: (reason: any) => U | IPromise<U>): Promise<U>;
-
-    /**
-     * Returns a promise that will have the same result as promise, except that if promise is not fulfilled or rejected before ms milliseconds, the returned promise will be rejected with an Error with the given message. If message is not supplied, the message will be "Timed out after " + ms + " ms".
-     */
-    export function timeout<T>(promise: Promise<T>, ms: number, message?: string): Promise<T>;
-
-    /**
-     * Returns a promise that will have the same result as promise, but will only be fulfilled or rejected after at least ms milliseconds have passed.
-     */
-    export function delay<T>(promise: Promise<T>, ms: number): Promise<T>;
-    /**
-     * Returns a promise that will have the same result as promise, but will only be fulfilled or rejected after at least ms milliseconds have passed.
-     */
-    export function delay<T>(value: T, ms: number): Promise<T>;
-    /**
-     * Returns a promise that will be fulfilled with undefined after at least ms milliseconds have passed.
-     */
-    export function delay(ms: number): Promise <void>;
-    /**
-     * Returns whether a given promise is in the fulfilled state. When the static version is used on non-promises, the result is always true.
-     */
-    export function isFulfilled(promise: Promise<any>): boolean;
-    /**
-     * Returns whether a given promise is in the rejected state. When the static version is used on non-promises, the result is always false.
-     */
-    export function isRejected(promise: Promise<any>): boolean;
-    /**
-     * Returns whether a given promise is in the pending state. When the static version is used on non-promises, the result is always false.
-     */
-    export function isPending(promise: Promise<any>): boolean;
-
-    /**
-     * Returns a "deferred" object with a:
-     * promise property
-     * resolve(value) method
-     * reject(reason) method
-     * notify(value) method
-     * makeNodeResolver() method
-     */
-    export function defer<T>(): Deferred<T>;
-
-    /**
-     * Returns a promise that is rejected with reason.
-     */
-    export function reject<T>(reason?: any): Promise<T>;
-
-    export function Promise<T>(resolver: (resolve: (val: T | IPromise<T>) => void , reject: (reason: any) => void , notify: (progress: any) => void ) => void ): Promise<T>;
-
-    /**
-     * Creates a new version of func that accepts any combination of promise and non-promise values, converting them to their fulfillment values before calling the original func. The returned version also always returns a promise: if func does a return or throw, then Q.promised(func) will return fulfilled or rejected promise, respectively.
-     *
-     * This can be useful for creating functions that accept either promises or non-promise values, and for ensuring that the function always returns a promise even in the face of unintentional thrown exceptions.
-     */
-    export function promised<T>(callback: (...args: any[]) => T): (...args: any[]) => Promise<T>;
-
-    /**
-     * Returns whether the given value is a Q promise.
-     */
-    export function isPromise(object: any): boolean;
-    /**
-     * Returns whether the given value is a promise (i.e. it's an object with a then function).
-     */
-    export function isPromiseAlike(object: any): boolean;
-    /**
-     * Returns whether a given promise is in the pending state. When the static version is used on non-promises, the result is always false.
-     */
-    export function isPending(object: any): boolean;
-
-    /**
-     * This is an experimental tool for converting a generator function into a deferred function. This has the potential of reducing nested callbacks in engines that support yield.
-     */
-    export function async<T>(generatorFunction: any): (...args: any[]) => Promise<T>;
-    export function nextTick(callback: Function): void;
-
-    /**
-     * A settable property that will intercept any uncaught errors that would otherwise be thrown in the next tick of the event loop, usually as a result of done. Can be useful for getting the full stack trace of an error in browsers, which is not usually possible with window.onerror.
-     */
-    export var onerror: (reason: any) => void;
-    /**
-     * A settable property that lets you turn on long stack trace support. If turned on, "stack jumps" will be tracked across asynchronous promise operations, so that if an uncaught error is thrown by done or a rejection reason's stack property is inspected in a rejection callback, a long stack trace is produced.
-     */
-    export var longStackSupport: boolean;
-
-    /**
-     * Calling resolve with a pending promise causes promise to wait on the passed promise, becoming fulfilled with its fulfillment value or rejected with its rejection reason (or staying pending forever, if the passed promise does).
-     * Calling resolve with a rejected promise causes promise to be rejected with the passed promise's rejection reason.
-     * Calling resolve with a fulfilled promise causes promise to be fulfilled with the passed promise's fulfillment value.
-     * Calling resolve with a non-promise value causes promise to be fulfilled with that value.
-     */
-    export function resolve<T>(object: IPromise<T>): Promise<T>;
-    /**
-     * Calling resolve with a pending promise causes promise to wait on the passed promise, becoming fulfilled with its fulfillment value or rejected with its rejection reason (or staying pending forever, if the passed promise does).
-     * Calling resolve with a rejected promise causes promise to be rejected with the passed promise's rejection reason.
-     * Calling resolve with a fulfilled promise causes promise to be fulfilled with the passed promise's fulfillment value.
-     * Calling resolve with a non-promise value causes promise to be fulfilled with that value.
-     */
-    export function resolve<T>(object: T): Promise<T>;
-
-	/**
-	 * Resets the global "Q" variable to the value it has before Q was loaded.
-	 * This will either be undefined if there was no version or the version of Q which was already loaded before.
-	 * @returns { The last version of Q. }
-	 */
-	export function noConflict(): typeof Q;
-}
-
-declare module "q" {
-    export = Q;
-}
diff --git a/q/index.d.ts b/q/index.d.ts
new file mode 100644
index 0000000000..f96774b791
--- /dev/null
+++ b/q/index.d.ts
@@ -0,0 +1,343 @@
+// Type definitions for Q
+// Project: https://github.com/kriskowal/q
+// Definitions by: Barrie Nemetchek <https://github.com/bnemetchek>, Andrew Gaspar <https://github.com/AndrewGaspar/>, John Reilly <https://github.com/johnnyreilly>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = Q;
+export as namespace Q;
+
+/**
+ * If value is a Q promise, returns the promise.
+ * If value is a promise from another library it is coerced into a Q promise (where possible).
+ */
+declare function Q<T>(promise: Q.IPromise<T>): Q.Promise<T>;
+/**
+ * If value is not a promise, returns a promise that is fulfilled with value.
+ */
+declare function Q<T>(value: T): Q.Promise<T>;
+
+declare namespace Q {
+    interface IPromise<T> {
+        then<U>(onFulfill?: (value: T) => U | IPromise<U>, onReject?: (error: any) => U | IPromise<U>): IPromise<U>;
+    }
+
+    interface Deferred<T> {
+        promise: Promise<T>;
+        resolve(value?: T): void;
+        resolve(value?: IPromise<T>): void;
+        reject(reason: any): void;
+        notify(value: any): void;
+        makeNodeResolver(): (reason: any, value: T) => void;
+    }
+
+    interface Promise<T> {
+        /**
+         * Like a finally clause, allows you to observe either the fulfillment or rejection of a promise, but to do so without modifying the final value. This is useful for collecting resources regardless of whether a job succeeded, like closing a database connection, shutting a server down, or deleting an unneeded key from an object.
+
+         * finally returns a promise, which will become resolved with the same fulfillment value or rejection reason as promise. However, if callback returns a promise, the resolution of the returned promise will be delayed until the promise returned from callback is finished.
+         */
+        fin(finallyCallback: () => any): Promise<T>;
+        /**
+         * Like a finally clause, allows you to observe either the fulfillment or rejection of a promise, but to do so without modifying the final value. This is useful for collecting resources regardless of whether a job succeeded, like closing a database connection, shutting a server down, or deleting an unneeded key from an object.
+
+         * finally returns a promise, which will become resolved with the same fulfillment value or rejection reason as promise. However, if callback returns a promise, the resolution of the returned promise will be delayed until the promise returned from callback is finished.
+         */
+        finally(finallyCallback: () => any): Promise<T>;
+
+        /**
+         * The then method from the Promises/A+ specification, with an additional progress handler.
+         */
+        then<U>(onFulfill?: (value: T) => U | IPromise<U>, onReject?: (error: any) => U | IPromise<U>, onProgress?: Function): Promise<U>;
+
+        /**
+         * Like then, but "spreads" the array into a variadic fulfillment handler. If any of the promises in the array are rejected, instead calls onRejected with the first rejected promise's rejection reason.
+         *
+         * This is especially useful in conjunction with all
+         */
+        spread<U>(onFulfill: (...args: any[]) => IPromise<U> | U, onReject?: (reason: any) => IPromise<U> | U): Promise<U>;
+
+        fail<U>(onRejected: (reason: any) => U | IPromise<U>): Promise<U>;
+
+        /**
+         * A sugar method, equivalent to promise.then(undefined, onRejected).
+         */
+        catch<U>(onRejected: (reason: any) => U | IPromise<U>): Promise<U>;
+
+        /**
+         * A sugar method, equivalent to promise.then(undefined, undefined, onProgress).
+         */
+        progress(onProgress: (progress: any) => any): Promise<T>;
+
+        /**
+         * Much like then, but with different behavior around unhandled rejection. If there is an unhandled rejection, either because promise is rejected and no onRejected callback was provided, or because onFulfilled or onRejected threw an error or returned a rejected promise, the resulting rejection reason is thrown as an exception in a future turn of the event loop.
+         *
+         * This method should be used to terminate chains of promises that will not be passed elsewhere. Since exceptions thrown in then callbacks are consumed and transformed into rejections, exceptions at the end of the chain are easy to accidentally, silently ignore. By arranging for the exception to be thrown in a future turn of the event loop, so that it won't be caught, it causes an onerror event on the browser window, or an uncaughtException event on Node.js's process object.
+         *
+         * Exceptions thrown by done will have long stack traces, if Q.longStackSupport is set to true. If Q.onerror is set, exceptions will be delivered there instead of thrown in a future turn.
+         *
+         * The Golden Rule of done vs. then usage is: either return your promise to someone else, or if the chain ends with you, call done to terminate it.
+         */
+        done(onFulfilled?: (value: T) => any, onRejected?: (reason: any) => any, onProgress?: (progress: any) => any): void;
+
+        /**
+         * If callback is a function, assumes it's a Node.js-style callback, and calls it as either callback(rejectionReason) when/if promise becomes rejected, or as callback(null, fulfillmentValue) when/if promise becomes fulfilled. If callback is not a function, simply returns promise.
+         */
+        nodeify(callback: (reason: any, value: any) => void): Promise<T>;
+
+        /**
+         * Returns a promise to get the named property of an object. Essentially equivalent to
+         *
+         * promise.then(function (o) {
+         *     return o[propertyName];
+         * });
+         */
+        get<U>(propertyName: String): Promise<U>;
+        set<U>(propertyName: String, value: any): Promise<U>;
+        delete<U>(propertyName: String): Promise<U>;
+        /**
+         * Returns a promise for the result of calling the named method of an object with the given array of arguments. The object itself is this in the function, just like a synchronous method call. Essentially equivalent to
+         *
+         * promise.then(function (o) {
+         *     return o[methodName].apply(o, args);
+         * });
+         */
+        post<U>(methodName: String, args: any[]): Promise<U>;
+        /**
+         * Returns a promise for the result of calling the named method of an object with the given variadic arguments. The object itself is this in the function, just like a synchronous method call.
+         */
+        invoke<U>(methodName: String, ...args: any[]): Promise<U>;
+        fapply<U>(args: any[]): Promise<U>;
+        fcall<U>(...args: any[]): Promise<U>;
+
+        /**
+         * Returns a promise for an array of the property names of an object. Essentially equivalent to
+         *
+         * promise.then(function (o) {
+         *     return Object.keys(o);
+         * });
+         */
+        keys(): Promise<string[]>;
+
+        /**
+         * A sugar method, equivalent to promise.then(function () { return value; }).
+         */
+        thenResolve<U>(value: U): Promise<U>;
+        /**
+         * A sugar method, equivalent to promise.then(function () { throw reason; }).
+         */
+        thenReject(reason: any): Promise<T>;
+
+        /**
+         * Attaches a handler that will observe the value of the promise when it becomes fulfilled, returning a promise for that same value, perhaps deferred but not replaced by the promise returned by the onFulfilled handler.
+         */
+        tap(onFulfilled: (value: T) => any): Promise<T>;
+
+        timeout(ms: number, message?: string): Promise<T>;
+        /**
+         * Returns a promise that will have the same result as promise, but will only be fulfilled or rejected after at least ms milliseconds have passed.
+         */
+        delay(ms: number): Promise<T>;
+
+        /**
+         * Returns whether a given promise is in the fulfilled state. When the static version is used on non-promises, the result is always true.
+         */
+        isFulfilled(): boolean;
+        /**
+         * Returns whether a given promise is in the rejected state. When the static version is used on non-promises, the result is always false.
+         */
+        isRejected(): boolean;
+        /**
+         * Returns whether a given promise is in the pending state. When the static version is used on non-promises, the result is always false.
+         */
+        isPending(): boolean;
+
+        valueOf(): any;
+
+        /**
+         * Returns a "state snapshot" object, which will be in one of three forms:
+         *
+         * - { state: "pending" }
+         * - { state: "fulfilled", value: <fulfllment value> }
+         * - { state: "rejected", reason: <rejection reason> }
+         */
+        inspect(): PromiseState<T>;
+    }
+
+    interface PromiseState<T> {
+        /**
+         * "fulfilled", "rejected", "pending"
+         */
+        state: string;
+        value?: T;
+        reason?: any;
+    }
+
+    // If no value provided, returned promise will be of void type
+    export function when(): Promise<void>;
+
+    // if no fulfill, reject, or progress provided, returned promise will be of same type
+    export function when<T>(value: T | IPromise<T>): Promise<T>;
+
+    // If a non-promise value is provided, it will not reject or progress
+    export function when<T, U>(value: T | IPromise<T>, onFulfilled: (val: T) => U | IPromise<U>, onRejected?: (reason: any) => U | IPromise<U>, onProgress?: (progress: any) => any): Promise<U>;
+
+    /**
+     * Currently "impossible" (and I use the term loosely) to implement due to TypeScript limitations as it is now.
+     * See: https://github.com/Microsoft/TypeScript/issues/1784 for discussion on it.
+     */
+    // export function try(method: Function, ...args: any[]): Promise<any>;
+
+    export function fbind<T>(method: (...args: any[]) => T | IPromise<T>, ...args: any[]): (...args: any[]) => Promise<T>;
+
+    export function fcall<T>(method: (...args: any[]) => T, ...args: any[]): Promise<T>;
+
+    export function send<T>(obj: any, functionName: string, ...args: any[]): Promise<T>;
+    export function invoke<T>(obj: any, functionName: string, ...args: any[]): Promise<T>;
+    export function mcall<T>(obj: any, functionName: string, ...args: any[]): Promise<T>;
+
+    export function denodeify<T>(nodeFunction: Function, ...args: any[]): (...args: any[]) => Promise<T>;
+    export function nbind<T>(nodeFunction: Function, thisArg: any, ...args: any[]): (...args: any[]) => Promise<T>;
+    export function nfbind<T>(nodeFunction: Function, ...args: any[]): (...args: any[]) => Promise<T>;
+    export function nfcall<T>(nodeFunction: Function, ...args: any[]): Promise<T>;
+    export function nfapply<T>(nodeFunction: Function, args: any[]): Promise<T>;
+
+    export function ninvoke<T>(nodeModule: any, functionName: string, ...args: any[]): Promise<T>;
+    export function npost<T>(nodeModule: any, functionName: string, args: any[]): Promise<T>;
+    export function nsend<T>(nodeModule: any, functionName: string, ...args: any[]): Promise<T>;
+    export function nmcall<T>(nodeModule: any, functionName: string, ...args: any[]): Promise<T>;
+
+    /**
+     * Returns a promise that is fulfilled with an array containing the fulfillment value of each promise, or is rejected with the same rejection reason as the first promise to be rejected.
+     */
+    export function all<T>(promises: IPromise<T>[]): Promise<T[]>;
+
+    /**
+    * Returns a promise for the first of an array of promises to become settled.
+    */
+    export function race<T>(promises: IPromise<T>[]): Promise<T>;
+
+    /**
+     * Returns a promise that is fulfilled with an array of promise state snapshots, but only after all the original promises have settled, i.e. become either fulfilled or rejected.
+     */
+    export function allSettled<T>(promises: IPromise<T>[]): Promise<PromiseState<T>[]>;
+
+    export function allResolved<T>(promises: IPromise<T>[]): Promise<Promise<T>[]>;
+
+    /**
+     * Like then, but "spreads" the array into a variadic fulfillment handler. If any of the promises in the array are rejected, instead calls onRejected with the first rejected promise's rejection reason.
+     * This is especially useful in conjunction with all.
+     */
+    export function spread<T, U>(promises: IPromise<T>[], onFulfilled: (...args: T[]) => U | IPromise<U>, onRejected?: (reason: any) => U | IPromise<U>): Promise<U>;
+
+    /**
+     * Returns a promise that will have the same result as promise, except that if promise is not fulfilled or rejected before ms milliseconds, the returned promise will be rejected with an Error with the given message. If message is not supplied, the message will be "Timed out after " + ms + " ms".
+     */
+    export function timeout<T>(promise: Promise<T>, ms: number, message?: string): Promise<T>;
+
+    /**
+     * Returns a promise that will have the same result as promise, but will only be fulfilled or rejected after at least ms milliseconds have passed.
+     */
+    export function delay<T>(promise: Promise<T>, ms: number): Promise<T>;
+    /**
+     * Returns a promise that will have the same result as promise, but will only be fulfilled or rejected after at least ms milliseconds have passed.
+     */
+    export function delay<T>(value: T, ms: number): Promise<T>;
+    /**
+     * Returns a promise that will be fulfilled with undefined after at least ms milliseconds have passed.
+     */
+    export function delay(ms: number): Promise <void>;
+    /**
+     * Returns whether a given promise is in the fulfilled state. When the static version is used on non-promises, the result is always true.
+     */
+    export function isFulfilled(promise: Promise<any>): boolean;
+    /**
+     * Returns whether a given promise is in the rejected state. When the static version is used on non-promises, the result is always false.
+     */
+    export function isRejected(promise: Promise<any>): boolean;
+    /**
+     * Returns whether a given promise is in the pending state. When the static version is used on non-promises, the result is always false.
+     */
+    export function isPending(promise: Promise<any>): boolean;
+
+    /**
+     * Returns a "deferred" object with a:
+     * promise property
+     * resolve(value) method
+     * reject(reason) method
+     * notify(value) method
+     * makeNodeResolver() method
+     */
+    export function defer<T>(): Deferred<T>;
+
+    /**
+     * Returns a promise that is rejected with reason.
+     */
+    export function reject<T>(reason?: any): Promise<T>;
+
+    export function Promise<T>(resolver: (resolve: (val: T | IPromise<T>) => void , reject: (reason: any) => void , notify: (progress: any) => void ) => void ): Promise<T>;
+
+    /**
+     * Creates a new version of func that accepts any combination of promise and non-promise values, converting them to their fulfillment values before calling the original func. The returned version also always returns a promise: if func does a return or throw, then Q.promised(func) will return fulfilled or rejected promise, respectively.
+     *
+     * This can be useful for creating functions that accept either promises or non-promise values, and for ensuring that the function always returns a promise even in the face of unintentional thrown exceptions.
+     */
+    export function promised<T>(callback: (...args: any[]) => T): (...args: any[]) => Promise<T>;
+
+    /**
+     * Returns whether the given value is a Q promise.
+     */
+    export function isPromise(object: any): boolean;
+    /**
+     * Returns whether the given value is a promise (i.e. it's an object with a then function).
+     */
+    export function isPromiseAlike(object: any): boolean;
+    /**
+     * Returns whether a given promise is in the pending state. When the static version is used on non-promises, the result is always false.
+     */
+    export function isPending(object: any): boolean;
+    /**
+     * If an object is not a promise, it is as "near" as possible.
+     * If a promise is rejected, it is as "near" as possible too.
+     * If it’s a fulfilled promise, the fulfillment value is nearer.
+     * If it’s a deferred promise and the deferred has been resolved, the
+     * resolution is "nearer".
+     */
+    export function nearer<T>(promise: Promise<T>): T;
+
+    /**
+     * This is an experimental tool for converting a generator function into a deferred function. This has the potential of reducing nested callbacks in engines that support yield.
+     */
+    export function async<T>(generatorFunction: any): (...args: any[]) => Promise<T>;
+    export function nextTick(callback: Function): void;
+
+    /**
+     * A settable property that will intercept any uncaught errors that would otherwise be thrown in the next tick of the event loop, usually as a result of done. Can be useful for getting the full stack trace of an error in browsers, which is not usually possible with window.onerror.
+     */
+    export var onerror: (reason: any) => void;
+    /**
+     * A settable property that lets you turn on long stack trace support. If turned on, "stack jumps" will be tracked across asynchronous promise operations, so that if an uncaught error is thrown by done or a rejection reason's stack property is inspected in a rejection callback, a long stack trace is produced.
+     */
+    export var longStackSupport: boolean;
+
+    /**
+     * Calling resolve with a pending promise causes promise to wait on the passed promise, becoming fulfilled with its fulfillment value or rejected with its rejection reason (or staying pending forever, if the passed promise does).
+     * Calling resolve with a rejected promise causes promise to be rejected with the passed promise's rejection reason.
+     * Calling resolve with a fulfilled promise causes promise to be fulfilled with the passed promise's fulfillment value.
+     * Calling resolve with a non-promise value causes promise to be fulfilled with that value.
+     */
+    export function resolve<T>(object: IPromise<T>): Promise<T>;
+    /**
+     * Calling resolve with a pending promise causes promise to wait on the passed promise, becoming fulfilled with its fulfillment value or rejected with its rejection reason (or staying pending forever, if the passed promise does).
+     * Calling resolve with a rejected promise causes promise to be rejected with the passed promise's rejection reason.
+     * Calling resolve with a fulfilled promise causes promise to be fulfilled with the passed promise's fulfillment value.
+     * Calling resolve with a non-promise value causes promise to be fulfilled with that value.
+     */
+    export function resolve<T>(object: T): Promise<T>;
+
+	/**
+	 * Resets the global "Q" variable to the value it has before Q was loaded.
+	 * This will either be undefined if there was no version or the version of Q which was already loaded before.
+	 * @returns { The last version of Q. }
+	 */
+	export function noConflict(): typeof Q;
+}
diff --git a/q/tsconfig.json b/q/tsconfig.json
new file mode 100644
index 0000000000..8abd56d69b
--- /dev/null
+++ b/q/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "q-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/qajax/index.d.ts b/qajax/index.d.ts
new file mode 100644
index 0000000000..31fa32d1f0
--- /dev/null
+++ b/qajax/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for Qajax
+// Project: https://github.com/gre/qajax
+// Definitions by: Boltmade <https://github.com/Boltmade>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="Q" />
+export = Qajax;
+export as namespace Qajax;
+
+declare function Qajax(url : string) : Q.Promise<XMLHttpRequest>;
+declare function Qajax(options : any) : Q.Promise<XMLHttpRequest>;
+declare function Qajax(url : string, options : any) : Q.Promise<XMLHttpRequest>;
+
+declare namespace Qajax {
+	export var defaults : any;
+	export function filterStatus(validStatus : number) : (xhr : XMLHttpRequest) => Q.Promise<XMLHttpRequest>;
+	export function filterStatus(validStatus : (status : number) => boolean) : (xhr : XMLHttpRequest) => Q.Promise<XMLHttpRequest>;
+	export function filterSuccess() : Q.Promise<XMLHttpRequest>;
+
+	export function toJSON(xhr : XMLHttpRequest) : Q.Promise<any>;
+
+	export function getJSON(url : string) : Q.Promise<any>;
+
+	export function serialize(paramsObj : any) : string;
+}
\ No newline at end of file
diff --git a/qajax/qajax-tests.ts b/qajax/qajax-tests.ts
index 820dce4554..0307bf4d0c 100644
--- a/qajax/qajax-tests.ts
+++ b/qajax/qajax-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="qajax.d.ts" />
+import Qajax = require("qajax");
 
 // Based on https://github.com/gre/qajax/blob/master/test/qajax.js
 
diff --git a/qajax/qajax.d.ts b/qajax/qajax.d.ts
deleted file mode 100644
index 7b7f9678d9..0000000000
--- a/qajax/qajax.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// Type definitions for Qajax
-// Project: https://github.com/gre/qajax
-// Definitions by: Boltmade <https://github.com/Boltmade>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../q/Q.d.ts" />
-
-declare function Qajax(url : string) : Q.Promise<XMLHttpRequest>;
-declare function Qajax(options : any) : Q.Promise<XMLHttpRequest>;
-declare function Qajax(url : string, options : any) : Q.Promise<XMLHttpRequest>;
-
-declare namespace Qajax {
-	export var defaults : any;
-	export function filterStatus(validStatus : number) : (xhr : XMLHttpRequest) => Q.Promise<XMLHttpRequest>;
-	export function filterStatus(validStatus : (status : number) => boolean) : (xhr : XMLHttpRequest) => Q.Promise<XMLHttpRequest>;
-	export function filterSuccess() : Q.Promise<XMLHttpRequest>;
-
-	export function toJSON(xhr : XMLHttpRequest) : Q.Promise<any>;
-
-	export function getJSON(url : string) : Q.Promise<any>;
-
-	export function serialize(paramsObj : any) : string;
-}
-
-declare module "qajax" {
-	export = Qajax;
-}
diff --git a/qajax/tsconfig.json b/qajax/tsconfig.json
new file mode 100644
index 0000000000..6715c8a836
--- /dev/null
+++ b/qajax/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "qajax-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/qrcode-generator/index.d.ts b/qrcode-generator/index.d.ts
new file mode 100644
index 0000000000..f4517b56d4
--- /dev/null
+++ b/qrcode-generator/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for grcode-generator
+// Project: https://github.com/kazuhikoarase/qrcode-generator
+// Definitions by: Stefan Huber <https://github.com/stefanhuber/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function qrcode(type: number, errorCorrectionLevel: string) : QRCode;
+export = qrcode;
+export as namespace qrcode;
+
+interface QRCode {
+    addData(data: string) : void;
+    make() : void;
+    
+    createTableTag(cellSize: number, margin: number) : string;
+    createSvgTag(cellSize: number, margin: number) : string;
+    createImageTag(cellSize: number, margin: number) : string;    
+}
diff --git a/qrcode-generator/qrcode-generator-tests.ts b/qrcode-generator/qrcode-generator-tests.ts
new file mode 100644
index 0000000000..55a3fe372b
--- /dev/null
+++ b/qrcode-generator/qrcode-generator-tests.ts
@@ -0,0 +1,10 @@
+import qrcode = require('qrcode-generator');
+
+let qr = qrcode(4,'M');
+
+qr.addData('some arbitrary data');
+qr.make();
+
+let imgHtml = qr.createImageTag(5,5);
+let svgHtml = qr.createSvgTag(5,5);
+let tableHtml = qr.createTableTag(5,5);
\ No newline at end of file
diff --git a/qrcode-generator/tsconfig.json b/qrcode-generator/tsconfig.json
new file mode 100644
index 0000000000..7df378fe8c
--- /dev/null
+++ b/qrcode-generator/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "qrcode-generator-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/qs/index.d.ts b/qs/index.d.ts
new file mode 100644
index 0000000000..41c7b0da6a
--- /dev/null
+++ b/qs/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for qs
+// Project: https://github.com/hapijs/qs
+// Definitions by: Roman Korneev <https://github.com/RWander>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = QueryString;
+export as namespace qs;
+
+declare namespace QueryString {
+    interface IStringifyOptions {
+        delimiter?: string;
+        strictNullHandling?: boolean;
+        skipNulls?: boolean;
+        encode?: boolean;
+        filter?: any;
+        arrayFormat?: any;
+        indices?: string;
+    }
+
+    interface IParseOptions {
+        delimiter?: string;
+        depth?: number;
+        arrayLimit?: number;
+        parseArrays?: boolean;
+        allowDots?: boolean;
+        plainObjects?: boolean;
+        allowPrototypes?: boolean;
+        parameterLimit?: number;
+        strictNullHandling?: boolean;
+    }
+
+    function stringify(obj: any, options?: IStringifyOptions): string;
+    function parse(str: string, options?: IParseOptions): any;
+}
diff --git a/qs/qs-tests.ts b/qs/qs-tests.ts
index 04be4f266b..aef2ecd2db 100644
--- a/qs/qs-tests.ts
+++ b/qs/qs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./qs.d.ts" />
+
 
 import qs = require('qs');
 
diff --git a/qs/qs.d.ts b/qs/qs.d.ts
deleted file mode 100644
index af18fcdb4d..0000000000
--- a/qs/qs.d.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// Type definitions for qs
-// Project: https://github.com/hapijs/qs
-// Definitions by: Roman Korneev <https://github.com/RWander>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace QueryString {
-    interface IStringifyOptions {
-        delimiter?: string;
-        strictNullHandling?: boolean;
-        skipNulls?: boolean;
-        encode?: boolean;
-        filter?: any;
-        arrayFormat?: any;
-        indices?: string;
-    }
-
-    interface IParseOptions {
-        delimiter?: string;
-        depth?: number;
-        arrayLimit?: number;
-        parseArrays?: boolean;
-        allowDots?: boolean;
-        plainObjects?: boolean;
-        allowPrototypes?: boolean;
-        parameterLimit?: number;
-        strictNullHandling?: boolean;
-    }
-
-    function stringify(obj: any, options?: IStringifyOptions): string;
-    function parse(str: string, options?: IParseOptions): any;
-}
-
-declare module "qs" {
-	export = QueryString;
-}
diff --git a/qs/tsconfig.json b/qs/tsconfig.json
new file mode 100644
index 0000000000..72c76a45f4
--- /dev/null
+++ b/qs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "qs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/qtip2/index.d.ts b/qtip2/index.d.ts
new file mode 100644
index 0000000000..40e6cd0bf6
--- /dev/null
+++ b/qtip2/index.d.ts
@@ -0,0 +1,409 @@
+// Type definitions for qtip2 v2.2.1
+// Project: http://qtip2.com/
+// Definitions by: Nathan Pitman <https://github.com/Seltzer>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Notes:
+//   - Type bindings for the QTip2 API and options are included. Bindings for global settings aren't required.
+//   - Deprecated functionality is not supported.
+//   - Where possible, things are strongly typed and 'any' is avoided.
+//   - QTip2 includes a lot of shorthand notation for various expressions. These bindings support it all.
+
+/// <reference types="jquery" />
+
+declare namespace QTip2 {
+	type EventApiFunc = (event: Event, api: Api) => void;
+
+
+	/**
+	 * Content property
+	 */
+	type Title = string | JQuery | EventApiFunc | boolean | JQueryGenericPromise<any>;
+	type Text = string | JQuery | EventApiFunc | boolean | JQueryGenericPromise<any>;
+
+	interface Content {
+		title?: Title | { text: Title };
+		text?: Text;
+		attr?: string;
+		button?: string | JQuery | boolean;
+	}
+
+
+	/**
+	 * Position property
+	 */
+	interface PositionAdjust {
+		x?: number;
+		y?: number;
+		mouse?: boolean;
+		resize?: boolean;
+		scroll?: boolean;
+		method?: string;
+	}
+
+	type Target = JQuery | number[] | string;
+
+	interface Position {
+		my?: string | boolean;
+		at?: string | boolean;
+		target?: Target | boolean;
+		container?: JQuery | boolean;
+		viewport?: JQuery | boolean;
+		effect?: boolean | ((api: Api, pos: any, viewport: any) => void);
+		adjust?: PositionAdjust;
+	}
+
+
+	/**
+	 * Show property
+	 */
+	interface Show {
+		target?: JQuery | boolean;
+		event?: string | boolean;
+		delay?: number;
+		solo?: JQuery | string | boolean;
+		ready?: boolean;
+		effect?: boolean | ((offset: any) => void);
+		modal?: boolean | Modal;
+	}
+
+	interface Modal
+	{
+		on?: boolean;
+		blur?: boolean;
+		escape?: boolean;
+		stealfocus?: boolean;
+		effect?: boolean | ((state: any) => void);
+	}
+
+
+	/**
+	 * Hide property
+	 */
+	interface Hide {
+		target?: JQuery | boolean;
+		event?: string | boolean;
+		delay?: number;
+		inactive?: number | boolean;
+		fixed?: boolean;
+		leave?: string | boolean;
+		distance?: number | boolean;
+		effect?: boolean | ((offset: any) => void);
+	}
+
+
+	/**
+	 * Style property
+	 */
+	interface Style {
+		classes?: string | boolean;
+		def?: boolean;
+		widget?: boolean;
+		width?: string | number | boolean;
+		height?: string | number | boolean;
+		tip?: string | boolean | Tip;
+	}
+
+	interface Tip {
+		corner?: string | boolean;
+		mimic?: string | boolean;
+		border?: number | boolean;
+		width?: number;
+		height?: number;
+		offset?: number;
+	}
+
+
+	/**
+	 * Events property
+	 */
+	interface Events {
+		render?: EventApiFunc;
+		show?: EventApiFunc;
+		hide?: EventApiFunc;
+		toggle?: EventApiFunc;
+		visible?: EventApiFunc;
+		hidden?: EventApiFunc;
+		move?: EventApiFunc;
+		focus?: EventApiFunc;
+		blur?: EventApiFunc;
+	}
+
+
+	/**
+	 * Options
+	 */
+	interface QTipOptions {
+		id?: string | boolean;
+		prerender?: boolean;
+		overwrite?: boolean;
+		suppress?: boolean;
+		metadata?: any;
+		content?: Text | Content;
+		position?: string | Position;
+		style?: string | Style;
+		show?: string | boolean | JQuery | Show;
+		hide?: string | JQuery | Hide;
+		events?: Events;
+	}
+
+
+	/**
+	 * API
+	 */
+	interface Api {
+		get(propertyName: 'id'): string | boolean;
+		get(propertyName: 'prerender'): boolean;
+		get(propertyName: 'overwrite'): boolean;
+		get(propertyName: 'suppress'): boolean;
+		get(propertyName: 'metadata'): any;
+		get(propertyName: 'content'): Content;
+		get(propertyName: 'content.text'): Text;
+		get(propertyName: 'content.attr'): string;
+		get(propertyName: 'content.title'): Title;
+		get(propertyName: 'content.button'): string | JQuery | boolean;
+		get(propertyName: 'position'): Position;
+		get(propertyName: 'position.my'): string | boolean;
+		get(propertyName: 'position.at'): string | boolean;
+		get(propertyName: 'position.target'): Target | boolean;
+		get(propertyName: 'position.container'): JQuery | boolean;
+		get(propertyName: 'position.viewport'): JQuery | boolean;
+		get(propertyName: 'position.effect'): boolean | ((api: any, pos: any, viewport: any) => void);
+		get(propertyName: 'position.adjust'): PositionAdjust;
+		get(propertyName: 'show'): Show;
+		get(propertyName: 'show.target'): JQuery | boolean;
+		get(propertyName: 'show.event'): string | boolean;
+		get(propertyName: 'show.delay'): number;
+		get(propertyName: 'show.solo'): JQuery | string | boolean;
+		get(propertyName: 'show.ready'): boolean;
+		get(propertyName: 'show.effect'): boolean | ((offset: any) => void);
+		get(propertyName: 'show.modal'): boolean | Modal;
+		get(propertyName: 'hide'): Hide;
+		get(propertyName: 'hide.target'): JQuery | boolean;
+		get(propertyName: 'hide.event'): string | boolean;
+		get(propertyName: 'hide.delay'): number;
+		get(propertyName: 'hide.leave'): string | boolean;
+		get(propertyName: 'hide.distance'): number | boolean;
+		get(propertyName: 'hide.effect'): boolean | ((offset: any) => void);
+		get(propertyName: 'style'): Style;
+		get(propertyName: 'style.classes'): string | boolean;
+		get(propertyName: 'style.def'): boolean;
+		get(propertyName: 'style.widget'): boolean;
+		get(propertyName: 'style.width'): string | number | boolean;
+		get(propertyName: 'style.height'): string | number | boolean;
+		get(propertyName: 'style.tip'): string | boolean | Tip;
+		get(propertyName: 'events'): Events;
+		get(propertyName: 'events.render'): EventApiFunc;
+		get(propertyName: 'events.show'): EventApiFunc;
+		get(propertyName: 'events.hide'): EventApiFunc;
+		get(propertyName: 'events.toggle'): EventApiFunc;
+		get(propertyName: 'events.visible'): EventApiFunc;
+		get(propertyName: 'events.hidden'): EventApiFunc;
+		get(propertyName: 'events.move'): EventApiFunc;
+		get(propertyName: 'events.focus'): EventApiFunc;
+		get(propertyName: 'events.blur'): EventApiFunc;
+		get(propertyName: string): any;
+
+		set(properties: QTipOptions): Api;
+		set(propertyName: 'id', value: string | boolean): Api;
+		set(propertyName: 'prerender', value: boolean): Api;
+		set(propertyName: 'overwrite', value: boolean): Api;
+		set(propertyName: 'suppress', value: boolean): Api;
+		set(propertyName: 'metadata', value: any): Api;
+		set(propertyName: 'content', value: Text | Content): Api;
+		set(propertyName: 'content.title', value: Title | { text: Title }): Api;
+		set(propertyName: 'content.text', value: Text): Api;
+		set(propertyName: 'content.attr', value: string): Api;
+		set(propertyName: 'content.button', value: string | JQuery | boolean): Api;
+		set(propertyName: 'position', value: Position): Api;
+		set(propertyName: 'position.my', value: string | boolean): Api;
+		set(propertyName: 'position.at', value: string | boolean): Api;
+		set(propertyName: 'position.target', value: Target | boolean): Api;
+		set(propertyName: 'position.container', value: JQuery | boolean): Api;
+		set(propertyName: 'position.viewport', value: JQuery | boolean): Api;
+		set(propertyName: 'position.effect', value: boolean | ((api: Api, pos: any, viewport: any) => void) ): Api;
+		set(propertyName: 'position.adjust', value: PositionAdjust): Api;
+		set(propertyName: 'show', value: Show): Api;
+		set(propertyName: 'show.target', value: JQuery | boolean): Api;
+		set(propertyName: 'show.event', value: string | boolean): Api;
+		set(propertyName: 'show.delay', value: number): Api;
+		set(propertyName: 'show.solo', value: JQuery | string | boolean): Api;
+		set(propertyName: 'show.ready', value: boolean): Api;
+		set(propertyName: 'show.effect', value: boolean | ((offset: any) => void)): Api;
+		set(propertyName: 'show.modal', value: boolean | Modal): Api;
+		set(propertyName: 'hide', value: Hide): Api;
+		set(propertyName: 'hide.target', value: JQuery | boolean): Api;
+		set(propertyName: 'hide.event', value: string | boolean): Api;
+		set(propertyName: 'hide.inactive', value: number | boolean): Api;
+		set(propertyName: 'hide.fixed', value: boolean): Api;
+		set(propertyName: 'hide.leave', value: string | boolean): Api;
+		set(propertyName: 'hide.distance', value: number | boolean): Api;
+		set(propertyName: 'hide.effect', value: boolean | ((offset: any) => void)): Api
+		set(propertyName: 'style', value: Style): Api;
+		set(propertyName: 'style.classes', value: string | boolean): Api;
+		set(propertyName: 'style.def', value: boolean): Api;
+		set(propertyName: 'style.widget', value: boolean): Api;
+		set(propertyName: 'style.width', value: string | number | boolean): Api;
+		set(propertyName: 'style.height', value: string | number | boolean): Api;
+		set(propertyName: 'style.tip', value: string | boolean | Tip): Api;
+		set(propertyName: 'events', value: Events): Api;
+		set(propertyName: 'events.render', value: EventApiFunc): Api;
+		set(propertyName: 'events.show', value: EventApiFunc): Api;
+		set(propertyName: 'events.hide', value: EventApiFunc): Api;
+		set(propertyName: 'events.toggle', value: EventApiFunc): Api;
+		set(propertyName: 'events.visible', value: EventApiFunc): Api;
+		set(propertyName: 'events.hidden', value: EventApiFunc): Api;
+		set(propertyName: 'events.move', value: EventApiFunc): Api;
+		set(propertyName: 'events.focus', value: EventApiFunc): Api;
+		set(propertyName: 'events.blur', value: EventApiFunc): Api;
+		set(propertyName: string, value: any): Api;
+
+		toggle(state?: boolean, event?: Event): Api;
+
+		show(event?: Event): Api;
+
+		hide(event?: Event): Api;
+
+		disable(state?: boolean): Api;
+
+		enable(): Api;
+
+		reposition(event?: Event, effect?: boolean): Api;
+
+		focus(event?: Event): Api;
+
+		blur(event?: Event): Api;
+
+		destroy(immediate?: boolean): Api;
+	}
+}
+
+
+interface JQuery {
+	qtip(options?: QTip2.QTipOptions): JQuery;
+
+	qtip(methodName: 'api'): QTip2.Api;
+
+	qtip(methodName: 'option', propertyName: 'id'): string | boolean;
+	qtip(methodName: 'option', propertyName: 'prerender'): boolean;
+	qtip(methodName: 'option', propertyName: 'overwrite'): boolean;
+	qtip(methodName: 'option', propertyName: 'suppress'): boolean;
+	qtip(methodName: 'option', propertyName: 'metadata'): any;
+	qtip(methodName: 'option', propertyName: 'content'): QTip2.Content;
+	qtip(methodName: 'option', propertyName: 'content.text'): QTip2.Text;
+	qtip(methodName: 'option', propertyName: 'content.attr'): string;
+	qtip(methodName: 'option', propertyName: 'content.title'): QTip2.Title;
+	qtip(methodName: 'option', propertyName: 'content.button'): string | JQuery | boolean;
+	qtip(methodName: 'option', propertyName: 'position'): QTip2.Position;
+	qtip(methodName: 'option', propertyName: 'position.my'): string | boolean;
+	qtip(methodName: 'option', propertyName: 'position.at'): string | boolean;
+	qtip(methodName: 'option', propertyName: 'position.target'): QTip2.Target | boolean;
+	qtip(methodName: 'option', propertyName: 'position.container'): JQuery | boolean;
+	qtip(methodName: 'option', propertyName: 'position.viewport'): JQuery | boolean;
+	qtip(methodName: 'option', propertyName: 'position.effect'): boolean | ((api: QTip2.Api, pos: any, viewport: any) => void);
+	qtip(methodName: 'option', propertyName: 'position.adjust'): QTip2.PositionAdjust;
+	qtip(methodName: 'option', propertyName: 'show'): QTip2.Show;
+	qtip(methodName: 'option', propertyName: 'show.target'): JQuery | boolean;
+	qtip(methodName: 'option', propertyName: 'show.event'): string | boolean;
+	qtip(methodName: 'option', propertyName: 'show.delay'): number;
+	qtip(methodName: 'option', propertyName: 'show.solo'): JQuery | string | boolean;
+	qtip(methodName: 'option', propertyName: 'show.ready'): boolean;
+	qtip(methodName: 'option', propertyName: 'show.effect'): boolean | ((offset: any) => void);
+	qtip(methodName: 'option', propertyName: 'show.modal'): boolean | QTip2.Modal;
+	qtip(methodName: 'option', propertyName: 'hide'): QTip2.Hide;
+	qtip(methodName: 'option', propertyName: 'hide.target'): JQuery | boolean;
+	qtip(methodName: 'option', propertyName: 'hide.event'): string | boolean;
+	qtip(methodName: 'option', propertyName: 'hide.delay'): number;
+	qtip(methodName: 'option', propertyName: 'hide.leave'): string | boolean;
+	qtip(methodName: 'option', propertyName: 'hide.distance'): number | boolean;
+	qtip(methodName: 'option', propertyName: 'hide.effect'): boolean | ((offset: any) => void);
+	qtip(methodName: 'option', propertyName: 'style'): QTip2.Style;
+	qtip(methodName: 'option', propertyName: 'style.classes'): string | boolean;
+	qtip(methodName: 'option', propertyName: 'style.def'): boolean;
+	qtip(methodName: 'option', propertyName: 'style.widget'): boolean;
+	qtip(methodName: 'option', propertyName: 'style.width'): string | number | boolean;
+	qtip(methodName: 'option', propertyName: 'style.height'): string | number | boolean;
+	qtip(methodName: 'option', propertyName: 'style.tip'): string | boolean | QTip2.Tip;
+	qtip(methodName: 'option', propertyName: 'events'): QTip2.Events;
+	qtip(methodName: 'option', propertyName: 'events.render'): QTip2.EventApiFunc;
+	qtip(methodName: 'option', propertyName: 'events.show'): QTip2.EventApiFunc;
+	qtip(methodName: 'option', propertyName: 'events.hide'): QTip2.EventApiFunc;
+	qtip(methodName: 'option', propertyName: 'events.toggle'): QTip2.EventApiFunc;
+	qtip(methodName: 'option', propertyName: 'events.visible'): QTip2.EventApiFunc;
+	qtip(methodName: 'option', propertyName: 'events.hidden'): QTip2.EventApiFunc;
+	qtip(methodName: 'option', propertyName: 'events.move'): QTip2.EventApiFunc;
+	qtip(methodName: 'option', propertyName: 'events.focus'): QTip2.EventApiFunc;
+	qtip(methodName: 'option', propertyName: 'events.blur'): QTip2.EventApiFunc;
+
+	qtip(methodName: 'option', properties: QTip2.QTipOptions): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'id', value: string | boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'prerender', value: boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'overwrite', value: boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'suppress', value: boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'metadata', value: any): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'content', value: QTip2.Text | QTip2.Content): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'content.title', value: QTip2.Title | { text: QTip2.Title }): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'content.text', value: QTip2.Text): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'content.attr', value: string): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'content.button', value: string | JQuery | boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'position', value: QTip2.Position): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'position.my', value: string | boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'position.at', value: string | boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'position.target', value: QTip2.Target | boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'position.container', value: JQuery | boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'position.viewport', value: JQuery | boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'position.effect', value: boolean | ((api: QTip2.Api, pos: any, viewport: any) => void) ): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'position.adjust', value: QTip2.PositionAdjust): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'show', value: QTip2.Show): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'show.target', value: JQuery | boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'show.event', value: string | boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'show.delay', value: number): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'show.solo', value: JQuery | string | boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'show.ready', value: boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'show.effect', value: boolean | ((offset: any) => void)): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'show.modal', value: boolean | QTip2.Modal): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'hide', value: QTip2.Hide): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'hide.target', value: JQuery | boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'hide.event', value: string | boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'hide.inactive', value: number | boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'hide.fixed', value: boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'hide.leave', value: string | boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'hide.distance', value: number | boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'hide.effect', value: boolean | ((offset: any) => void)): QTip2.Api
+	qtip(methodName: 'option', propertyName: 'style', value: QTip2.Style): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'style.classes', value: string | boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'style.def', value: boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'style.widget', value: boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'style.width', value: string | number | boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'style.height', value: string | number | boolean): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'style.tip', value: string | boolean | QTip2.Tip): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'events', value: QTip2.Events): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'events.render', value: QTip2.EventApiFunc): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'events.show', value: QTip2.EventApiFunc): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'events.hide', value: QTip2.EventApiFunc): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'events.toggle', value: QTip2.EventApiFunc): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'events.visible', value: QTip2.EventApiFunc): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'events.hidden', value: QTip2.EventApiFunc): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'events.move', value: QTip2.EventApiFunc): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'events.focus', value: QTip2.EventApiFunc): QTip2.Api;
+	qtip(methodName: 'option', propertyName: 'events.blur', value: QTip2.EventApiFunc): QTip2.Api;
+
+	qtip(methodName: 'toggle', state?: boolean, event?: Event): JQuery;
+
+	qtip(methodName: 'show', event?: Event): JQuery;
+
+	qtip(methodName: 'hide', event?: Event): JQuery;
+
+	qtip(methodName: 'disable', state?: boolean): JQuery;
+
+	qtip(methodName: 'enable'): JQuery
+
+	qtip(methodName: 'reposition', event?: Event, effect?: boolean): JQuery;
+
+	qtip(methodName: 'focus', event?: Event): JQuery;
+
+	qtip(methodName: 'blur', event?: Event): JQuery;
+
+	qtip(methodName: 'destroy', immediate?: boolean): JQuery;
+
+	qtip(methodName: string, p1?: any, p2?: any, p3?: any): any;
+}
diff --git a/qtip2/qtip2-tests.ts b/qtip2/qtip2-tests.ts
index 9b0f9abcb2..9bea1e3b0c 100644
--- a/qtip2/qtip2-tests.ts
+++ b/qtip2/qtip2-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="qtip2.d.ts" />
+
 
 var $a = $('_');
 
diff --git a/qtip2/qtip2.d.ts b/qtip2/qtip2.d.ts
deleted file mode 100644
index f75ac72c21..0000000000
--- a/qtip2/qtip2.d.ts
+++ /dev/null
@@ -1,409 +0,0 @@
-// Type definitions for qtip2 v2.2.1
-// Project: http://qtip2.com/
-// Definitions by: Nathan Pitman <https://github.com/Seltzer>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Notes:
-//   - Type bindings for the QTip2 API and options are included. Bindings for global settings aren't required.
-//   - Deprecated functionality is not supported.
-//   - Where possible, things are strongly typed and 'any' is avoided.
-//   - QTip2 includes a lot of shorthand notation for various expressions. These bindings support it all.
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace QTip2 {
-	type EventApiFunc = (event: Event, api: Api) => void;
-
-
-	/**
-	 * Content property
-	 */
-	type Title = string | JQuery | EventApiFunc | boolean | JQueryGenericPromise<any>;
-	type Text = string | JQuery | EventApiFunc | boolean | JQueryGenericPromise<any>;
-
-	interface Content {
-		title?: Title | { text: Title };
-		text?: Text;
-		attr?: string;
-		button?: string | JQuery | boolean;
-	}
-
-
-	/**
-	 * Position property
-	 */
-	interface PositionAdjust {
-		x?: number;
-		y?: number;
-		mouse?: boolean;
-		resize?: boolean;
-		scroll?: boolean;
-		method?: string;
-	}
-
-	type Target = JQuery | number[] | string;
-
-	interface Position {
-		my?: string | boolean;
-		at?: string | boolean;
-		target?: Target | boolean;
-		container?: JQuery | boolean;
-		viewport?: JQuery | boolean;
-		effect?: boolean | ((api: Api, pos: any, viewport: any) => void);
-		adjust?: PositionAdjust;
-	}
-
-
-	/**
-	 * Show property
-	 */
-	interface Show {
-		target?: JQuery | boolean;
-		event?: string | boolean;
-		delay?: number;
-		solo?: JQuery | string | boolean;
-		ready?: boolean;
-		effect?: boolean | ((offset: any) => void);
-		modal?: boolean | Modal;
-	}
-
-	interface Modal
-	{
-		on?: boolean;
-		blur?: boolean;
-		escape?: boolean;
-		stealfocus?: boolean;
-		effect?: boolean | ((state: any) => void);
-	}
-
-
-	/**
-	 * Hide property
-	 */
-	interface Hide {
-		target?: JQuery | boolean;
-		event?: string | boolean;
-		delay?: number;
-		inactive?: number | boolean;
-		fixed?: boolean;
-		leave?: string | boolean;
-		distance?: number | boolean;
-		effect?: boolean | ((offset: any) => void);
-	}
-
-
-	/**
-	 * Style property
-	 */
-	interface Style {
-		classes?: string | boolean;
-		def?: boolean;
-		widget?: boolean;
-		width?: string | number | boolean;
-		height?: string | number | boolean;
-		tip?: string | boolean | Tip;
-	}
-
-	interface Tip {
-		corner?: string | boolean;
-		mimic?: string | boolean;
-		border?: number | boolean;
-		width?: number;
-		height?: number;
-		offset?: number;
-	}
-
-
-	/**
-	 * Events property
-	 */
-	interface Events {
-		render?: EventApiFunc;
-		show?: EventApiFunc;
-		hide?: EventApiFunc;
-		toggle?: EventApiFunc;
-		visible?: EventApiFunc;
-		hidden?: EventApiFunc;
-		move?: EventApiFunc;
-		focus?: EventApiFunc;
-		blur?: EventApiFunc;
-	}
-
-
-	/**
-	 * Options
-	 */
-	interface QTipOptions {
-		id?: string | boolean;
-		prerender?: boolean;
-		overwrite?: boolean;
-		suppress?: boolean;
-		metadata?: any;
-		content?: Text | Content;
-		position?: string | Position;
-		style?: string | Style;
-		show?: string | boolean | JQuery | Show;
-		hide?: string | JQuery | Hide;
-		events?: Events;
-	}
-
-
-	/**
-	 * API
-	 */
-	interface Api {
-		get(propertyName: 'id'): string | boolean;
-		get(propertyName: 'prerender'): boolean;
-		get(propertyName: 'overwrite'): boolean;
-		get(propertyName: 'suppress'): boolean;
-		get(propertyName: 'metadata'): any;
-		get(propertyName: 'content'): Content;
-		get(propertyName: 'content.text'): Text;
-		get(propertyName: 'content.attr'): string;
-		get(propertyName: 'content.title'): Title;
-		get(propertyName: 'content.button'): string | JQuery | boolean;
-		get(propertyName: 'position'): Position;
-		get(propertyName: 'position.my'): string | boolean;
-		get(propertyName: 'position.at'): string | boolean;
-		get(propertyName: 'position.target'): Target | boolean;
-		get(propertyName: 'position.container'): JQuery | boolean;
-		get(propertyName: 'position.viewport'): JQuery | boolean;
-		get(propertyName: 'position.effect'): boolean | ((api: any, pos: any, viewport: any) => void);
-		get(propertyName: 'position.adjust'): PositionAdjust;
-		get(propertyName: 'show'): Show;
-		get(propertyName: 'show.target'): JQuery | boolean;
-		get(propertyName: 'show.event'): string | boolean;
-		get(propertyName: 'show.delay'): number;
-		get(propertyName: 'show.solo'): JQuery | string | boolean;
-		get(propertyName: 'show.ready'): boolean;
-		get(propertyName: 'show.effect'): boolean | ((offset: any) => void);
-		get(propertyName: 'show.modal'): boolean | Modal;
-		get(propertyName: 'hide'): Hide;
-		get(propertyName: 'hide.target'): JQuery | boolean;
-		get(propertyName: 'hide.event'): string | boolean;
-		get(propertyName: 'hide.delay'): number;
-		get(propertyName: 'hide.leave'): string | boolean;
-		get(propertyName: 'hide.distance'): number | boolean;
-		get(propertyName: 'hide.effect'): boolean | ((offset: any) => void);
-		get(propertyName: 'style'): Style;
-		get(propertyName: 'style.classes'): string | boolean;
-		get(propertyName: 'style.def'): boolean;
-		get(propertyName: 'style.widget'): boolean;
-		get(propertyName: 'style.width'): string | number | boolean;
-		get(propertyName: 'style.height'): string | number | boolean;
-		get(propertyName: 'style.tip'): string | boolean | Tip;
-		get(propertyName: 'events'): Events;
-		get(propertyName: 'events.render'): EventApiFunc;
-		get(propertyName: 'events.show'): EventApiFunc;
-		get(propertyName: 'events.hide'): EventApiFunc;
-		get(propertyName: 'events.toggle'): EventApiFunc;
-		get(propertyName: 'events.visible'): EventApiFunc;
-		get(propertyName: 'events.hidden'): EventApiFunc;
-		get(propertyName: 'events.move'): EventApiFunc;
-		get(propertyName: 'events.focus'): EventApiFunc;
-		get(propertyName: 'events.blur'): EventApiFunc;
-		get(propertyName: string): any;
-
-		set(properties: QTipOptions): Api;
-		set(propertyName: 'id', value: string | boolean): Api;
-		set(propertyName: 'prerender', value: boolean): Api;
-		set(propertyName: 'overwrite', value: boolean): Api;
-		set(propertyName: 'suppress', value: boolean): Api;
-		set(propertyName: 'metadata', value: any): Api;
-		set(propertyName: 'content', value: Text | Content): Api;
-		set(propertyName: 'content.title', value: Title | { text: Title }): Api;
-		set(propertyName: 'content.text', value: Text): Api;
-		set(propertyName: 'content.attr', value: string): Api;
-		set(propertyName: 'content.button', value: string | JQuery | boolean): Api;
-		set(propertyName: 'position', value: Position): Api;
-		set(propertyName: 'position.my', value: string | boolean): Api;
-		set(propertyName: 'position.at', value: string | boolean): Api;
-		set(propertyName: 'position.target', value: Target | boolean): Api;
-		set(propertyName: 'position.container', value: JQuery | boolean): Api;
-		set(propertyName: 'position.viewport', value: JQuery | boolean): Api;
-		set(propertyName: 'position.effect', value: boolean | ((api: Api, pos: any, viewport: any) => void) ): Api;
-		set(propertyName: 'position.adjust', value: PositionAdjust): Api;
-		set(propertyName: 'show', value: Show): Api;
-		set(propertyName: 'show.target', value: JQuery | boolean): Api;
-		set(propertyName: 'show.event', value: string | boolean): Api;
-		set(propertyName: 'show.delay', value: number): Api;
-		set(propertyName: 'show.solo', value: JQuery | string | boolean): Api;
-		set(propertyName: 'show.ready', value: boolean): Api;
-		set(propertyName: 'show.effect', value: boolean | ((offset: any) => void)): Api;
-		set(propertyName: 'show.modal', value: boolean | Modal): Api;
-		set(propertyName: 'hide', value: Hide): Api;
-		set(propertyName: 'hide.target', value: JQuery | boolean): Api;
-		set(propertyName: 'hide.event', value: string | boolean): Api;
-		set(propertyName: 'hide.inactive', value: number | boolean): Api;
-		set(propertyName: 'hide.fixed', value: boolean): Api;
-		set(propertyName: 'hide.leave', value: string | boolean): Api;
-		set(propertyName: 'hide.distance', value: number | boolean): Api;
-		set(propertyName: 'hide.effect', value: boolean | ((offset: any) => void)): Api
-		set(propertyName: 'style', value: Style): Api;
-		set(propertyName: 'style.classes', value: string | boolean): Api;
-		set(propertyName: 'style.def', value: boolean): Api;
-		set(propertyName: 'style.widget', value: boolean): Api;
-		set(propertyName: 'style.width', value: string | number | boolean): Api;
-		set(propertyName: 'style.height', value: string | number | boolean): Api;
-		set(propertyName: 'style.tip', value: string | boolean | Tip): Api;
-		set(propertyName: 'events', value: Events): Api;
-		set(propertyName: 'events.render', value: EventApiFunc): Api;
-		set(propertyName: 'events.show', value: EventApiFunc): Api;
-		set(propertyName: 'events.hide', value: EventApiFunc): Api;
-		set(propertyName: 'events.toggle', value: EventApiFunc): Api;
-		set(propertyName: 'events.visible', value: EventApiFunc): Api;
-		set(propertyName: 'events.hidden', value: EventApiFunc): Api;
-		set(propertyName: 'events.move', value: EventApiFunc): Api;
-		set(propertyName: 'events.focus', value: EventApiFunc): Api;
-		set(propertyName: 'events.blur', value: EventApiFunc): Api;
-		set(propertyName: string, value: any): Api;
-
-		toggle(state?: boolean, event?: Event): Api;
-
-		show(event?: Event): Api;
-
-		hide(event?: Event): Api;
-
-		disable(state?: boolean): Api;
-
-		enable(): Api;
-
-		reposition(event?: Event, effect?: boolean): Api;
-
-		focus(event?: Event): Api;
-
-		blur(event?: Event): Api;
-
-		destroy(immediate?: boolean): Api;
-	}
-}
-
-
-interface JQuery {
-	qtip(options?: QTip2.QTipOptions): JQuery;
-
-	qtip(methodName: 'api'): QTip2.Api;
-
-	qtip(methodName: 'option', propertyName: 'id'): string | boolean;
-	qtip(methodName: 'option', propertyName: 'prerender'): boolean;
-	qtip(methodName: 'option', propertyName: 'overwrite'): boolean;
-	qtip(methodName: 'option', propertyName: 'suppress'): boolean;
-	qtip(methodName: 'option', propertyName: 'metadata'): any;
-	qtip(methodName: 'option', propertyName: 'content'): QTip2.Content;
-	qtip(methodName: 'option', propertyName: 'content.text'): QTip2.Text;
-	qtip(methodName: 'option', propertyName: 'content.attr'): string;
-	qtip(methodName: 'option', propertyName: 'content.title'): QTip2.Title;
-	qtip(methodName: 'option', propertyName: 'content.button'): string | JQuery | boolean;
-	qtip(methodName: 'option', propertyName: 'position'): QTip2.Position;
-	qtip(methodName: 'option', propertyName: 'position.my'): string | boolean;
-	qtip(methodName: 'option', propertyName: 'position.at'): string | boolean;
-	qtip(methodName: 'option', propertyName: 'position.target'): QTip2.Target | boolean;
-	qtip(methodName: 'option', propertyName: 'position.container'): JQuery | boolean;
-	qtip(methodName: 'option', propertyName: 'position.viewport'): JQuery | boolean;
-	qtip(methodName: 'option', propertyName: 'position.effect'): boolean | ((api: QTip2.Api, pos: any, viewport: any) => void);
-	qtip(methodName: 'option', propertyName: 'position.adjust'): QTip2.PositionAdjust;
-	qtip(methodName: 'option', propertyName: 'show'): QTip2.Show;
-	qtip(methodName: 'option', propertyName: 'show.target'): JQuery | boolean;
-	qtip(methodName: 'option', propertyName: 'show.event'): string | boolean;
-	qtip(methodName: 'option', propertyName: 'show.delay'): number;
-	qtip(methodName: 'option', propertyName: 'show.solo'): JQuery | string | boolean;
-	qtip(methodName: 'option', propertyName: 'show.ready'): boolean;
-	qtip(methodName: 'option', propertyName: 'show.effect'): boolean | ((offset: any) => void);
-	qtip(methodName: 'option', propertyName: 'show.modal'): boolean | QTip2.Modal;
-	qtip(methodName: 'option', propertyName: 'hide'): QTip2.Hide;
-	qtip(methodName: 'option', propertyName: 'hide.target'): JQuery | boolean;
-	qtip(methodName: 'option', propertyName: 'hide.event'): string | boolean;
-	qtip(methodName: 'option', propertyName: 'hide.delay'): number;
-	qtip(methodName: 'option', propertyName: 'hide.leave'): string | boolean;
-	qtip(methodName: 'option', propertyName: 'hide.distance'): number | boolean;
-	qtip(methodName: 'option', propertyName: 'hide.effect'): boolean | ((offset: any) => void);
-	qtip(methodName: 'option', propertyName: 'style'): QTip2.Style;
-	qtip(methodName: 'option', propertyName: 'style.classes'): string | boolean;
-	qtip(methodName: 'option', propertyName: 'style.def'): boolean;
-	qtip(methodName: 'option', propertyName: 'style.widget'): boolean;
-	qtip(methodName: 'option', propertyName: 'style.width'): string | number | boolean;
-	qtip(methodName: 'option', propertyName: 'style.height'): string | number | boolean;
-	qtip(methodName: 'option', propertyName: 'style.tip'): string | boolean | QTip2.Tip;
-	qtip(methodName: 'option', propertyName: 'events'): QTip2.Events;
-	qtip(methodName: 'option', propertyName: 'events.render'): QTip2.EventApiFunc;
-	qtip(methodName: 'option', propertyName: 'events.show'): QTip2.EventApiFunc;
-	qtip(methodName: 'option', propertyName: 'events.hide'): QTip2.EventApiFunc;
-	qtip(methodName: 'option', propertyName: 'events.toggle'): QTip2.EventApiFunc;
-	qtip(methodName: 'option', propertyName: 'events.visible'): QTip2.EventApiFunc;
-	qtip(methodName: 'option', propertyName: 'events.hidden'): QTip2.EventApiFunc;
-	qtip(methodName: 'option', propertyName: 'events.move'): QTip2.EventApiFunc;
-	qtip(methodName: 'option', propertyName: 'events.focus'): QTip2.EventApiFunc;
-	qtip(methodName: 'option', propertyName: 'events.blur'): QTip2.EventApiFunc;
-
-	qtip(methodName: 'option', properties: QTip2.QTipOptions): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'id', value: string | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'prerender', value: boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'overwrite', value: boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'suppress', value: boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'metadata', value: any): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'content', value: QTip2.Text | QTip2.Content): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'content.title', value: QTip2.Title | { text: QTip2.Title }): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'content.text', value: QTip2.Text): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'content.attr', value: string): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'content.button', value: string | JQuery | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'position', value: QTip2.Position): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'position.my', value: string | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'position.at', value: string | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'position.target', value: QTip2.Target | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'position.container', value: JQuery | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'position.viewport', value: JQuery | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'position.effect', value: boolean | ((api: QTip2.Api, pos: any, viewport: any) => void) ): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'position.adjust', value: QTip2.PositionAdjust): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'show', value: QTip2.Show): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'show.target', value: JQuery | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'show.event', value: string | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'show.delay', value: number): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'show.solo', value: JQuery | string | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'show.ready', value: boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'show.effect', value: boolean | ((offset: any) => void)): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'show.modal', value: boolean | QTip2.Modal): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'hide', value: QTip2.Hide): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'hide.target', value: JQuery | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'hide.event', value: string | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'hide.inactive', value: number | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'hide.fixed', value: boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'hide.leave', value: string | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'hide.distance', value: number | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'hide.effect', value: boolean | ((offset: any) => void)): QTip2.Api
-	qtip(methodName: 'option', propertyName: 'style', value: QTip2.Style): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'style.classes', value: string | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'style.def', value: boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'style.widget', value: boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'style.width', value: string | number | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'style.height', value: string | number | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'style.tip', value: string | boolean | QTip2.Tip): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'events', value: QTip2.Events): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'events.render', value: QTip2.EventApiFunc): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'events.show', value: QTip2.EventApiFunc): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'events.hide', value: QTip2.EventApiFunc): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'events.toggle', value: QTip2.EventApiFunc): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'events.visible', value: QTip2.EventApiFunc): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'events.hidden', value: QTip2.EventApiFunc): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'events.move', value: QTip2.EventApiFunc): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'events.focus', value: QTip2.EventApiFunc): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'events.blur', value: QTip2.EventApiFunc): QTip2.Api;
-
-	qtip(methodName: 'toggle', state?: boolean, event?: Event): JQuery;
-
-	qtip(methodName: 'show', event?: Event): JQuery;
-
-	qtip(methodName: 'hide', event?: Event): JQuery;
-
-	qtip(methodName: 'disable', state?: boolean): JQuery;
-
-	qtip(methodName: 'enable'): JQuery
-
-	qtip(methodName: 'reposition', event?: Event, effect?: boolean): JQuery;
-
-	qtip(methodName: 'focus', event?: Event): JQuery;
-
-	qtip(methodName: 'blur', event?: Event): JQuery;
-
-	qtip(methodName: 'destroy', immediate?: boolean): JQuery;
-
-	qtip(methodName: string, p1?: any, p2?: any, p3?: any): any;
-}
diff --git a/qtip2/tsconfig.json b/qtip2/tsconfig.json
new file mode 100644
index 0000000000..6b4bd06cd3
--- /dev/null
+++ b/qtip2/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "qtip2-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/query-string/index.d.ts b/query-string/index.d.ts
new file mode 100644
index 0000000000..f2da7fef73
--- /dev/null
+++ b/query-string/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for query-string v3.0.0
+// Project: https://github.com/sindresorhus/query-string
+// Definitions by: Sam Verschueren <https://github.com/SamVerschueren>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/**
+ * Parse a query string into an object.
+ * Leading ? or # are ignored, so you can pass location.search or location.hash directly.
+ * @param str
+ */
+export declare function parse(str: string): any;
+
+/**
+ * Stringify an object into a query string, sorting the keys.
+ *
+ * @param obj
+ */
+export declare function stringify(obj: any, options?: { strict: boolean }): string;
+
+/**
+ * Extract a query string from a URL that can be passed into .parse().
+ *
+ * @param str
+ */
+export declare function extract(str: string): string;
diff --git a/query-string/query-string-tests.ts b/query-string/query-string-tests.ts
index e270786004..b9a6d56075 100644
--- a/query-string/query-string-tests.ts
+++ b/query-string/query-string-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./query-string.d.ts" />
 
 import qs = require('query-string');
 
diff --git a/query-string/query-string.d.ts b/query-string/query-string.d.ts
deleted file mode 100644
index 807b38935a..0000000000
--- a/query-string/query-string.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// Type definitions for query-string v3.0.0
-// Project: https://github.com/sindresorhus/query-string
-// Definitions by: Sam Verschueren <https://github.com/SamVerschueren>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "query-string" {
-    /**
-     * Parse a query string into an object.
-     * Leading ? or # are ignored, so you can pass location.search or location.hash directly.
-     * @param str
-     */
-    export function parse(str: string): any;
-
-    /**
-     * Stringify an object into a query string, sorting the keys.
-     *
-     * @param obj
-     */
-    export function stringify(obj: any, options?: {strict: boolean}): string;
-
-    /**
-     * Extract a query string from a URL that can be passed into .parse().
-     *
-     * @param str
-     */
-    export function extract(str: string): string;
-}
diff --git a/query-string/tsconfig.json b/query-string/tsconfig.json
new file mode 100644
index 0000000000..40413cab21
--- /dev/null
+++ b/query-string/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "query-string-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/quill/index.d.ts b/quill/index.d.ts
new file mode 100644
index 0000000000..95ed5ca2c6
--- /dev/null
+++ b/quill/index.d.ts
@@ -0,0 +1,119 @@
+// Type definitions for Quill
+// Project: http://quilljs.com
+// Definitions by: Sumit <https://github.com/sumitkm>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="eventemitter2" />
+
+declare interface DeltaStatic {
+    ops?: Array<any>;
+    retain?: any,
+    delete?: any,
+    insert?: any,
+    attributes?: any
+}
+
+declare interface RangeStatic {
+    new (): RangeStatic;
+    start: number;
+    end: number;
+}
+
+declare interface QuillStatic {
+    new (selector: string, options?: Object): QuillStatic;
+
+    on(eventName: string, callback: (delta: DeltaStatic, source: string) => void): EventEmitter2;
+    addModule(id: string, options: any): Object;
+
+    getText(): string;
+    getText(start: number): string;
+    getText(start: number, end: number): string;
+
+    getLength(): number;
+
+    getContents(): DeltaStatic;
+    getContents(start: number): DeltaStatic;
+    getContents(start: number, end: number): DeltaStatic;
+
+    getHTML(): string;
+
+    insertText(index: number, text: string): void;
+    insertText(index: number, text: string, name: string, value: string): void;
+    insertText(index: number, text: string, formats: any): void;
+    insertText(index: number, text: string, source: string): void;
+    insertText(index: number, text: string, name: string, value: string, source: string): void;
+    insertText(index: number, text: string, formats: any, source: string): void;
+
+    deleteText(start: number, end: number): void;
+    deleteText(start: number, end: number, source: string): void;
+
+    formatText(start: number, end: number): void;
+    formatText(start: number, end: number, name: string, value: boolean): void;
+    formatText(start: number, end: number, formats: any): void;
+    formatText(start: number, end: number, source: string): void;
+    formatText(start: number, end: number, name: string, value: string, source: string): void;
+    formatText(start: number, end: number, formats: string, source: string): void;
+
+
+    formatLine(start: number, end: number): void;
+    formatLine(start: number, end: number, name: string, value: boolean): void;
+    formatLine(start: number, end: number, formats: any): void;
+    formatLine(start: number, end: number, source: string): void;
+    formatLine(start: number, end: number, name: string, value: string, source: string): void;
+    formatLine(start: number, end: number, formats: any, source: string): void;
+
+
+    insertEmbed(index: number, type: string, url: string): void;
+    insertEmbed(index: number, type: string, url: string, source: string): void;
+
+    updateContents(delta: DeltaStatic): void;
+
+    setContents(delta: DeltaStatic): void;
+
+    setHTML(html: string): void;
+
+    setText(text: string): void;
+
+    getSelection(): RangeStatic;
+
+    setSelection(start: number, end: number): void;
+    setSelection(start: number, end: number, source: string): void;
+    setSelection(range: RangeStatic): void;
+    setSelection(range: RangeStatic, source: string): void;
+
+    prepareFormat(format: string, value: boolean): void;
+
+    focus(): void;
+
+    getBounds(index: number): any;
+
+    registerModule(name: string, callback: (quill: QuillStatic, options: any) => {}): any;
+
+    addModule(name: string, options: any): any;
+
+    getModule(name: string): any;
+
+    onModuleLoad(name: string, callback: (input: any) => {}): void;
+
+    addFormat(name: string, config: any): void;
+
+    addContainer(cssClass: string, before?: number): HTMLDivElement;
+}
+
+declare module "Range"
+{
+    var Range: RangeStatic;
+    export = Range;
+}
+
+declare var Delta: DeltaStatic;
+
+declare module "Delta" {
+    export = Delta;
+}
+
+declare var Quill: QuillStatic;
+
+declare module "Quill" {
+    export = Quill;
+}
diff --git a/quill/quill-tests.ts b/quill/quill-tests.ts
index 3a87bd5948..3935149349 100644
--- a/quill/quill-tests.ts
+++ b/quill/quill-tests.ts
@@ -1,8 +1,3 @@
-/// <reference path="quill.d.ts" />
-/// <reference path="../requirejs/require.d.ts"/>
-
-//export var Quill = require("quill");
-
 function test_quill() {
 
     var quillEditor = new Quill('#editor', {
diff --git a/quill/quill.d.ts b/quill/quill.d.ts
deleted file mode 100644
index 3cef088442..0000000000
--- a/quill/quill.d.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-// Type definitions for Quill
-// Project: http://quilljs.com
-// Definitions by: Sumit <https://github.com/sumitkm>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../eventemitter2/eventemitter2.d.ts" />
-
-declare interface  DeltaStatic{
-	ops? : Array<any>;
-	retain?: any,
-	delete?: any,
-	insert?: any,
-	attributes?: any
-}
-
-declare interface RangeStatic{
-	new(): RangeStatic;
-	start: number;
-	end: number;
-}
-
-declare interface QuillStatic {
-	new(selector: string, options?: Object):QuillStatic;
-
-    on(eventName: string, callback: (delta: DeltaStatic, source: string) => void): EventEmitter2;
-    addModule(id: string, options: any) : Object;
-
-    getText(): string;
-    getText(start: number): string;
-    getText(start: number, end: number): string;
-
-    getLength(): number;
-
-    getContents(): DeltaStatic;
-    getContents(start: number): DeltaStatic;
-    getContents(start: number, end: number): DeltaStatic;
-
-    getHTML(): string;
-
-    insertText(index: number, text: string): void;
-    insertText(index: number, text: string, name: string, value: string): void;
-    insertText(index: number, text: string, formats: any): void;
-    insertText(index: number, text: string, source: string) : void;
-    insertText(index: number, text: string, name: string, value: string, source: string): void;
-    insertText(index: number, text: string, formats: any, source: string): void;
-
-    deleteText(start: number, end: number): void;
-    deleteText(start: number, end: number, source: string): void;
-
-    formatText(start: number, end: number): void;
-    formatText(start: number, end: number, name: string, value: boolean): void;
-    formatText(start: number, end: number, formats: any): void;
-    formatText(start: number, end: number, source: string): void;
-    formatText(start: number, end: number, name: string, value: string, source: string): void;
-    formatText(start: number, end: number, formats: string, source: string): void;
-
-
-    formatLine(start: number, end: number): void;
-    formatLine(start: number, end: number, name: string, value: boolean): void;
-    formatLine(start: number, end: number, formats: any): void;
-    formatLine(start: number, end: number, source: string): void;
-    formatLine(start: number, end: number, name: string, value: string, source: string): void;
-    formatLine(start: number, end: number, formats: any, source: string): void;
-
-
-    insertEmbed(index: number, type: string, url: string): void;
-    insertEmbed(index: number, type: string, url: string, source: string): void;
-
-    updateContents(delta: DeltaStatic): void;
-
-    setContents(delta: DeltaStatic): void;
-
-    setHTML(html: string): void;
-
-    setText(text: string): void;
-
-    getSelection(): RangeStatic;
-
-    setSelection(start: number, end: number): void;
-    setSelection(start: number, end: number, source: string): void;
-    setSelection(range: RangeStatic): void;
-    setSelection(range: RangeStatic, source: string): void;
-
-    prepareFormat(format: string, value: boolean): void;
-
-    focus(): void;
-
-    getBounds(index: number): any;
-
-    registerModule(name: string, callback: (quill: QuillStatic, options: any) => {}): any;
-
-    addModule(name: string, options: any): any;
-
-    getModule(name: string): any;
-
-    onModuleLoad(name: string, callback: (input: any) => {}): void;
-
-    addFormat(name: string, config: any): void;
-
-    addContainer(cssClass: string, before?: number): HTMLDivElement;
-}
-
-declare module "Range"
-{
-	var Range: RangeStatic;
-	export = Range;
-}
-
-declare var Delta: DeltaStatic;
-
-declare module "Delta"{
-	export = Delta;
-}
-
-declare var Quill: QuillStatic;
-
-declare module "Quill" {
-    export = Quill;
-}
diff --git a/quill/tsconfig.json b/quill/tsconfig.json
new file mode 100644
index 0000000000..8098844c78
--- /dev/null
+++ b/quill/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "quill-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/quixote/quixote.d.ts b/quixote/index.d.ts
similarity index 100%
rename from quixote/quixote.d.ts
rename to quixote/index.d.ts
diff --git a/quixote/quixote-tests.ts b/quixote/quixote-tests.ts
index 0f2d051f24..5ee9905ac0 100644
--- a/quixote/quixote-tests.ts
+++ b/quixote/quixote-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../mocha/mocha.d.ts" />
-/// <reference path="quixote.d.ts" />
+/// <reference types="mocha" />
+
 
 function test_createFrame() {
     var frame: QFrame;
diff --git a/quixote/tsconfig.json b/quixote/tsconfig.json
new file mode 100644
index 0000000000..fcec319290
--- /dev/null
+++ b/quixote/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "quixote-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/qunit/qunit.d.ts b/qunit/index.d.ts
similarity index 100%
rename from qunit/qunit.d.ts
rename to qunit/index.d.ts
diff --git a/qunit/qunit-tests.ts b/qunit/qunit-tests.ts
index 20285e8022..23570cb9dd 100644
--- a/qunit/qunit-tests.ts
+++ b/qunit/qunit-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="qunit.d.ts" />
+
 
 QUnit.test("assert.async() test", function (assert) {
     var done = assert.async();
diff --git a/qunit/qunit-tests.ts.tscparams b/qunit/qunit-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/qunit/qunit-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/qunit/tsconfig.json b/qunit/tsconfig.json
new file mode 100644
index 0000000000..2db99e6bbe
--- /dev/null
+++ b/qunit/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "qunit-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/qwest/qwest.d.ts b/qwest/index.d.ts
similarity index 100%
rename from qwest/qwest.d.ts
rename to qwest/index.d.ts
diff --git a/qwest/qwest-tests.ts b/qwest/qwest-tests.ts
index 67e2de21b8..a8a22ffcf2 100644
--- a/qwest/qwest-tests.ts
+++ b/qwest/qwest-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="qwest.d.ts" />
+
 
 // Examples taken from https://github.com/pyrsmk/qwest/blob/master/README.md
 
diff --git a/qwest/tsconfig.json b/qwest/tsconfig.json
new file mode 100644
index 0000000000..b370724605
--- /dev/null
+++ b/qwest/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "qwest-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rabbit.js/index.d.ts b/rabbit.js/index.d.ts
new file mode 100644
index 0000000000..ce745a38d0
--- /dev/null
+++ b/rabbit.js/index.d.ts
@@ -0,0 +1,107 @@
+// Type definitions for rabbit.js v0.4.2
+// Project: https://github.com/squaremo/rabbit.js
+// Definitions by: Wonshik Kim <https://github.com/wokim>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import events = require('events');
+import stream = require('stream');
+
+export declare function createContext(url?: string): Context;
+
+export declare class Context extends events.EventEmitter {
+    public socket<T>(type: string, options?: SocketOptions): T;
+    public close(callback: Function): any;
+}
+
+export interface SocketOptions {
+    prefetch?: any;
+    expiration?: any;
+    persistent?: any;
+    topic?: any;
+    task?: any;
+}
+
+export interface Socket {
+    connect(destination: string, callback?: Function): any;
+    setsockopt(opt: string, value: string): any;
+    close(): any;
+}
+
+export declare class PubSocket extends stream.Writable implements Socket {
+    constructor(channel: string, opts: SocketOptions);
+    connect(destination: string, callback?: Function): any;
+    setsockopt(opt: string, value: string): any;
+    close(): any;
+
+    publish(topic: string, chunk: string, encoding?: string): any;
+    publish(topic: string, chunk: Buffer, encoding?: string): any;
+}
+
+export declare class SubSocket extends stream.Readable implements Socket {
+    constructor(channel: string, opts: SocketOptions);
+    connect(source: string, callback?: Function): any;
+    setsockopt(opt: string, value: string): any;
+    close(): any;
+}
+
+export declare class PushSocket extends stream.Writable implements Socket {
+    constructor(channel: string, opts: SocketOptions);
+    connect(destination: string, callback?: Function): any;
+    setsockopt(opt: string, value: string): any;
+    close(): any;
+}
+
+export declare class PullSocket extends stream.Readable implements Socket {
+    constructor(channel: string, opts: SocketOptions);
+    connect(source: string, callback?: Function): any;
+    setsockopt(opt: string, value: string): any;
+    close(): any;
+}
+
+export declare class WorkerSocket extends stream.Readable implements Socket {
+    constructor(channel: string, opts: SocketOptions);
+    connect(source: string, callback?: Function): any;
+    setsockopt(opt: string, value: string): any;
+    close(): any;
+
+    ack(): any;
+    requeue(): any;
+    discard(): any;
+}
+
+export interface RequestMessage {
+    properties: { correlationId: number };
+    content: any;
+}
+
+export declare class ReqSocket extends stream.Duplex implements Socket {
+    constructor(channel: string, opts: SocketOptions);
+    connect(destination: string, callback?: Function): any;
+    setsockopt(opt: string, value: string): any;
+    close(): any;
+
+    handleReply(msg: RequestMessage): any;
+}
+
+export declare class RepSocket extends stream.Duplex implements Socket {
+    constructor(channel: string, opts: SocketOptions);
+    connect(source: string, callback?: Function): any;
+    setsockopt(opt: string, value: string): any;
+    close(): any;
+
+    requeue(): any;
+    discard(): any;
+}
+
+export declare class TaskSocket extends stream.Writable implements Socket {
+    constructor(channel: string, opts: SocketOptions);
+    connect(destination: string, callback?: Function): any;
+    setsockopt(opt: string, value: string): any;
+    close(): any;
+
+    post(task: string, chunk: string, encoding?: string): any;
+    post(task: string, chunk: Buffer, encoding?: string): any;
+}
diff --git a/rabbit.js/rabbit.js-tests.ts b/rabbit.js/rabbit.js-tests.ts
index 3e5a4d6d21..c9256f9a3a 100644
--- a/rabbit.js/rabbit.js-tests.ts
+++ b/rabbit.js/rabbit.js-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./rabbit.js.d.ts" />
 
 import rabbit = require('rabbit.js');
 var context = rabbit.createContext();
diff --git a/rabbit.js/rabbit.js.d.ts b/rabbit.js/rabbit.js.d.ts
deleted file mode 100644
index 7e09cfe14a..0000000000
--- a/rabbit.js/rabbit.js.d.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-// Type definitions for rabbit.js v0.4.2
-// Project: https://github.com/squaremo/rabbit.js
-// Definitions by: Wonshik Kim <https://github.com/wokim>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "rabbit.js" {
-  import events = require('events');
-  import stream = require('stream');
-
-  export function createContext(url?: string): Context;
-
-  export class Context extends events.EventEmitter {
-    public socket<T>(type: string, options?: SocketOptions):T;
-    public close(callback: Function): any;
-  }
-
-  export interface SocketOptions {
-    prefetch?: any;
-    expiration?: any;
-    persistent?: any;
-    topic?: any;
-    task?: any;
-  }
-
-  export interface Socket {
-    connect(destination: string, callback?: Function): any;
-    setsockopt(opt: string, value: string): any;
-    close(): any;
-  }
-
-  export class PubSocket extends stream.Writable implements Socket {
-    constructor(channel: string, opts: SocketOptions);
-    connect(destination: string, callback?: Function): any;
-    setsockopt(opt: string, value: string): any;
-    close(): any;
-
-    publish(topic: string, chunk: string, encoding?: string): any;
-    publish(topic: string, chunk: Buffer, encoding?: string): any;
-  }
-
-  export class SubSocket extends stream.Readable implements Socket {
-    constructor(channel: string, opts: SocketOptions);
-    connect(source: string, callback?: Function): any;
-    setsockopt(opt: string, value: string): any;
-    close(): any;
-  }
-
-  export class PushSocket extends stream.Writable implements Socket {
-    constructor(channel: string, opts: SocketOptions);
-    connect(destination: string, callback?: Function): any;
-    setsockopt(opt: string, value: string): any;
-    close(): any;
-  }
-
-  export class PullSocket extends stream.Readable implements Socket {
-    constructor(channel: string, opts: SocketOptions);
-    connect(source: string, callback?: Function): any;
-    setsockopt(opt: string, value: string): any;
-    close(): any;
-  }
-
-  export class WorkerSocket extends stream.Readable implements Socket {
-    constructor(channel: string, opts: SocketOptions);
-    connect(source: string, callback?: Function): any;
-    setsockopt(opt: string, value: string): any;
-    close(): any;
-
-    ack(): any;
-    requeue(): any;
-    discard(): any;
-  }
-
-  export interface RequestMessage {
-    properties: { correlationId: number };
-    content: any;
-  }
-
-  export class ReqSocket extends stream.Duplex implements Socket {
-    constructor(channel: string, opts: SocketOptions);
-    connect(destination: string, callback?: Function): any;
-    setsockopt(opt: string, value: string): any;
-    close(): any;
-
-    handleReply(msg: RequestMessage): any;
-  }
-
-  export class RepSocket extends stream.Duplex implements Socket {
-    constructor(channel: string, opts: SocketOptions);
-    connect(source: string, callback?: Function): any;
-    setsockopt(opt: string, value: string): any;
-    close(): any;
-
-    requeue(): any;
-    discard(): any;
-  }
-
-  export class TaskSocket extends stream.Writable implements Socket {
-    constructor(channel: string, opts: SocketOptions);
-    connect(destination: string, callback?: Function): any;
-    setsockopt(opt: string, value: string): any;
-    close(): any;
-
-    post(task: string, chunk: string, encoding?: string): any;
-    post(task: string, chunk: Buffer, encoding?: string): any;
-  }
-}
diff --git a/rabbit.js/tsconfig.json b/rabbit.js/tsconfig.json
new file mode 100644
index 0000000000..4c8f03d0ff
--- /dev/null
+++ b/rabbit.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "rabbit.js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ractive/ractive.d.ts b/ractive/index.d.ts
similarity index 100%
rename from ractive/ractive.d.ts
rename to ractive/index.d.ts
diff --git a/ractive/ractive-tests.ts b/ractive/ractive-tests.ts
index df97190c93..5c5eac127b 100644
--- a/ractive/ractive-tests.ts
+++ b/ractive/ractive-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="ractive.d.ts" />
+
 
 function test_transition() {
 	var plugin: Ractive.TransitionPlugin = (t: Ractive.Transition, params: Object) => {
diff --git a/ractive/tsconfig.json b/ractive/tsconfig.json
new file mode 100644
index 0000000000..58f4abe8fa
--- /dev/null
+++ b/ractive/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ractive-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/radium/index.d.ts b/radium/index.d.ts
new file mode 100644
index 0000000000..fccdb78f5f
--- /dev/null
+++ b/radium/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for radium 0.17.1
+// Project: https://github.com/formidablelabs/radium
+// Definitions by: Alex Gorbatchev <https://github.com/alexgorbatchev/>, Philipp Holzer <https://github.com/nupplaphil/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react"/>
+
+
+import React = require('react');
+
+interface ReactComponent<P, S> {
+    new (p: P): React.Component<P, S>;
+}
+
+declare var Radium: {
+    <T extends ReactComponent<any, any>>(comp: T): T;
+};
+
+export = Radium;
diff --git a/radium/radium-tests.tsx b/radium/radium-tests.tsx
new file mode 100644
index 0000000000..cc734155d5
--- /dev/null
+++ b/radium/radium-tests.tsx
@@ -0,0 +1,17 @@
+
+/// <reference types="react" />
+
+import * as React from "react";
+import * as Radium from 'radium';
+
+@Radium
+export default class TestComponent extends React.Component<any, any> {
+
+	render() {
+		return (
+			<div >
+				Test with Radium
+			</div>
+		);
+	}
+}
diff --git a/radium/tsconfig.json b/radium/tsconfig.json
new file mode 100644
index 0000000000..cc416f1eda
--- /dev/null
+++ b/radium/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "experimentalDecorators": true,
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "radium-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/radius/index.d.ts b/radius/index.d.ts
new file mode 100644
index 0000000000..ccca0e4543
--- /dev/null
+++ b/radius/index.d.ts
@@ -0,0 +1,105 @@
+// Type definitions for node-radius
+// Project: https://github.com/retailnext/node-radius
+// Definitions by: Peter Harris <https://github.com/codeanimal>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+/**
+ * {@link https://github.com/retailnext/node-radius#radiusdecodeargs} for more info.
+ **/
+export declare function decode(args: DecodeArgsWithSecret): RadiusPacket;
+
+/**
+ * {@link https://github.com/retailnext/node-radius#radiusdecode_without_secretargs} for more info.
+ **/
+export declare function decode_without_secret(args: DecodeArgs): RadiusPacket;
+
+/**
+ * {@link https://github.com/retailnext/node-radius#radiusencodeargs} for more info.
+ **/
+export declare function encode(args: EncodeArgs): Buffer;
+
+/**
+ * {@link https://github.com/retailnext/node-radius#radiusencode_responseargs} for more info.
+ **/
+export declare function encode_response(args: EncodeResponseArgs): Buffer;
+
+/**
+ * {@link https://github.com/retailnext/node-radius#radiusverify_responseargs} for more info.
+ **/
+export declare function verify_response(args: VerifyResponseArgs): boolean;
+
+/**
+ * {@link https://github.com/retailnext/node-radius#radiusadd_dictionarypath} for more info.
+ * 
+ * @param path Can be either a path to a file or a directory.
+ **/
+export declare function add_dictionary(path: string): void;
+
+export declare function unload_dictionaries(): void;
+
+
+
+
+
+
+/**
+ * {@link https://github.com/retailnext/node-radius#radiusdecode_without_secretargs} for more info.
+ **/
+interface DecodeArgs {
+    packet: Buffer;
+}
+
+/**
+ * {@link https://github.com/retailnext/node-radius#radiusdecodeargs} for more info.
+ **/
+interface DecodeArgsWithSecret extends DecodeArgs {
+    secret: string;
+}
+
+/**
+ * {@link https://github.com/retailnext/node-radius#radiusencodeargs} for more info.
+ **/
+interface EncodeArgs {
+    code: string;
+    secret: string;
+    identifier?: number;
+    /**
+     * This can be an object: { attribute_name: attribute_value, ... }, 
+     * an array within an array: [ [ attribute_name, attribute_value ], ... ],
+     * or if you haven't loaded a dictionary for the attributes: [ [ attribute_id, Buffer ], ... ].
+     * 
+     * Tag field-attributes can be specified like so: [ [ attribute_name, tag_number, attribute_value ] ... ]
+     **/
+    attributes?: any;
+    add_message_authenticator?: boolean;
+}
+
+/**
+ * {@link https://github.com/retailnext/node-radius#radiusencode_responseargs} for more info.
+ **/
+interface EncodeResponseArgs {
+    packet: RadiusPacket;
+    code: string;
+    secret: string;
+    attributes?: any;
+}
+
+/**
+ * {@link https://github.com/retailnext/node-radius#radiusverify_responseargs} for more info.
+ **/
+interface VerifyResponseArgs {
+    request: Buffer;
+    response: Buffer;
+    secret: string;
+}
+
+interface RadiusPacket {
+    code: string;
+    identifier: number;
+    length: number;
+    attributes: any;
+    raw_attributes: Array<Array<any>>
+}
diff --git a/radius/radius-tests.ts b/radius/radius-tests.ts
index 2ce4d2c0d3..c3b50db8ec 100644
--- a/radius/radius-tests.ts
+++ b/radius/radius-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="radius.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import radius = require('radius');
 
diff --git a/radius/radius.d.ts b/radius/radius.d.ts
deleted file mode 100644
index 4e4b41c048..0000000000
--- a/radius/radius.d.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-// Type definitions for node-radius
-// Project: https://github.com/retailnext/node-radius
-// Definitions by: Peter Harris <https://github.com/codeanimal>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "radius" {
-    /**
-     * {@link https://github.com/retailnext/node-radius#radiusdecodeargs} for more info.
-     **/
-    export function decode(args: DecodeArgsWithSecret): RadiusPacket;
-
-    /**
-     * {@link https://github.com/retailnext/node-radius#radiusdecode_without_secretargs} for more info.
-     **/
-    export function decode_without_secret(args: DecodeArgs): RadiusPacket;
-
-    /**
-     * {@link https://github.com/retailnext/node-radius#radiusencodeargs} for more info.
-     **/
-    export function encode(args: EncodeArgs): Buffer;
-
-    /**
-     * {@link https://github.com/retailnext/node-radius#radiusencode_responseargs} for more info.
-     **/
-    export function encode_response(args: EncodeResponseArgs): Buffer;
-
-    /**
-     * {@link https://github.com/retailnext/node-radius#radiusverify_responseargs} for more info.
-     **/
-    export function verify_response(args: VerifyResponseArgs):boolean;
-
-    /**
-     * {@link https://github.com/retailnext/node-radius#radiusadd_dictionarypath} for more info.
-     * 
-     * @param path Can be either a path to a file or a directory.
-     **/
-    export function add_dictionary(path:string): void;
-
-    export function unload_dictionaries(): void;
-
-
-
-
-
-
-    /**
-     * {@link https://github.com/retailnext/node-radius#radiusdecode_without_secretargs} for more info.
-     **/
-    interface DecodeArgs {
-        packet: Buffer;
-    }
-
-    /**
-     * {@link https://github.com/retailnext/node-radius#radiusdecodeargs} for more info.
-     **/
-    interface DecodeArgsWithSecret extends DecodeArgs {
-        secret: string;
-    }
-
-    /**
-     * {@link https://github.com/retailnext/node-radius#radiusencodeargs} for more info.
-     **/
-    interface EncodeArgs {
-        code: string;
-        secret: string;
-        identifier?: number;
-        /**
-         * This can be an object: { attribute_name: attribute_value, ... }, 
-         * an array within an array: [ [ attribute_name, attribute_value ], ... ],
-         * or if you haven't loaded a dictionary for the attributes: [ [ attribute_id, Buffer ], ... ].
-         * 
-         * Tag field-attributes can be specified like so: [ [ attribute_name, tag_number, attribute_value ] ... ]
-         **/
-        attributes?: any;
-        add_message_authenticator?: boolean;
-    }
-
-    /**
-     * {@link https://github.com/retailnext/node-radius#radiusencode_responseargs} for more info.
-     **/
-    interface EncodeResponseArgs {
-        packet: RadiusPacket;
-        code: string;
-        secret: string;
-        attributes?: any;
-    }
-
-    /**
-     * {@link https://github.com/retailnext/node-radius#radiusverify_responseargs} for more info.
-     **/
-    interface VerifyResponseArgs {
-        request: Buffer;
-        response: Buffer;
-        secret: string;
-    }
-
-    interface RadiusPacket {
-        code: string;
-        identifier: number;
-        length: number;
-        attributes: any;
-        raw_attributes: Array<Array<any>>
-    }
-}
\ No newline at end of file
diff --git a/radius/tsconfig.json b/radius/tsconfig.json
new file mode 100644
index 0000000000..4c609c67a3
--- /dev/null
+++ b/radius/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "radius-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rails-actioncable/rails-actioncable.d.ts b/rails-actioncable/index.d.ts
similarity index 100%
rename from rails-actioncable/rails-actioncable.d.ts
rename to rails-actioncable/index.d.ts
diff --git a/rails-actioncable/rails-actioncable-tests.ts b/rails-actioncable/rails-actioncable-tests.ts
index e7a04f338e..a3fd305cc1 100644
--- a/rails-actioncable/rails-actioncable-tests.ts
+++ b/rails-actioncable/rails-actioncable-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./rails-actioncable.d.ts" />
+
 App = {};
 App.cable = ActionCable.createConsumer();
 App.cable.subscriptions.create("NetworkChannel", {});
diff --git a/rails-actioncable/tsconfig.json b/rails-actioncable/tsconfig.json
new file mode 100644
index 0000000000..9afbd54713
--- /dev/null
+++ b/rails-actioncable/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "rails-actioncable-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/random-js/random-js.d.ts b/random-js/index.d.ts
similarity index 100%
rename from random-js/random-js.d.ts
rename to random-js/index.d.ts
diff --git a/random-js/random-js-tests.ts b/random-js/random-js-tests.ts
index 9ee80883b6..77c698e321 100644
--- a/random-js/random-js-tests.ts
+++ b/random-js/random-js-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="random-js.d.ts"/>
-/// <reference path="../node/node.d.ts"/>
+/// <reference types="node"/>
 
 // Examples taken from the documentation at https://github.com/ckknight/random-js
 // create a Mersenne Twister-19937 that is auto-seeded based on time and other random values
diff --git a/random-js/tsconfig.json b/random-js/tsconfig.json
new file mode 100644
index 0000000000..463bc7c395
--- /dev/null
+++ b/random-js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "random-js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/random-string/index.d.ts b/random-string/index.d.ts
new file mode 100644
index 0000000000..0297e67ce1
--- /dev/null
+++ b/random-string/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for random-string
+// Project: https://github.com/valiton/node-random-string
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function randomString(opts?: Object): string;
+export = randomString;
diff --git a/random-string/random-string-tests.ts b/random-string/random-string-tests.ts
index 2b278a4f5e..4a6c3c5f12 100644
--- a/random-string/random-string-tests.ts
+++ b/random-string/random-string-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="random-string.d.ts" />
 
 import randomString = require('random-string');
 
diff --git a/random-string/random-string.d.ts b/random-string/random-string.d.ts
deleted file mode 100644
index 5fc955adfa..0000000000
--- a/random-string/random-string.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for random-string
-// Project: https://github.com/valiton/node-random-string
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "random-string" {
-	function randomString(opts?: Object): string;
-	export = randomString;
-}
diff --git a/random-string/tsconfig.json b/random-string/tsconfig.json
new file mode 100644
index 0000000000..a3b40678a6
--- /dev/null
+++ b/random-string/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "random-string-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rangy/index.d.ts b/rangy/index.d.ts
new file mode 100644
index 0000000000..1edb9c3c23
--- /dev/null
+++ b/rangy/index.d.ts
@@ -0,0 +1,66 @@
+// Type definitions for Rangy
+// Project: https://github.com/timdown/rangy
+// Definitions by: Rudolph Gottesheim <http://www.midnight-design.at/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface RangyRange extends Range {
+    setStartAndEnd(startNode:Node, startOffset:number, endNode?:Node, endOffset?:number):any;
+    setStartAndEnd(startNode:Node, startOffset:number, endOffset:number):any;
+    canSurroundContents():boolean;
+    isValid():boolean;
+    toHtml():string;
+    compareNode(node:Node):any;
+    intersectsOrTouchesRange(range:RangyRange):boolean;
+    intersectsRange(range:RangyRange):boolean;
+    intersection(range:RangyRange):RangyRange;
+    union(range:RangyRange):RangyRange;
+    containsNode(node:Node, partial:boolean):boolean;
+    containsNodeContents(node:Node):boolean;
+    containsNodeText(node:Node):boolean;
+    containsRange(range:RangyRange):boolean;
+    splitBoundaries():any;
+    normalizeBoundaries():any;
+    collapseToPoint(node:Node, offset:number):any;
+    collapseBefore(node:Node):any;
+    collapseAfter(node:Node):any;
+    getNodes(nodeTypes?:any[], filter?:(node:Node) => boolean):Node[];
+    getBookmark(containerNode?:Node):{start:number, end:number};
+    moveToBookmark(bookmark:Object):any;
+    getDocument():Document;
+    inspect():string;
+    equals(range:RangyRange):boolean;
+    refresh():any;
+    select():any;
+}
+
+interface RangySelection extends Selection {
+    nativeSelection:Selection;
+    isBackwards():boolean;
+    refresh(checkForChanges?:boolean):any;
+    toHtml():string;
+    getAllRanges():RangyRange[];
+    getNativeTextRange():any;
+    setSingleRange(range:RangyRange):any;
+    setRanges(ranges:RangyRange[]):any;
+    getBookmark(containerNode:Node):any;
+    moveToBookmark(bookmark:Object):any;
+    saveRanges():Object;
+    restoreRanges(saved:Object):any;
+    detach():any;
+    inspect():string;
+}
+
+interface RangyStatic {
+    createNativeRange(doc?:Document|Window|HTMLIFrameElement):Range;
+    createRange(doc?:Document|Window|HTMLIFrameElement):RangyRange;
+    createRangyRange(doc?:Document|Window|HTMLIFrameElement):RangyRange;
+    getNativeSelection(win?:Window):Selection;
+    getSelection():RangySelection;
+    addInitListener(listener:(rangy:RangyStatic) => void):any;
+    shim():any;
+    createMissingNativeApi():any;
+    initialized:boolean;
+    supported:boolean;
+}
+
+declare var rangy:RangyStatic;
diff --git a/rangy/rangy-tests.ts b/rangy/rangy-tests.ts
index b0c6c1cc27..fac44c868c 100644
--- a/rangy/rangy-tests.ts
+++ b/rangy/rangy-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="rangy.d.ts" />
+
 
 declare function assertAny(a:any):any;
 declare function assertBoolean(b:boolean):any;
@@ -6,6 +6,8 @@ declare function assertString(s:string):any;
 declare function assertRangyRange(r:RangyRange):any;
 declare function getRangyRange():RangyRange;
 
+type TextRange = any; // ?
+
 function testRangyStatic() {
     rangy.addInitListener((rangy:RangyStatic) => {
     });
diff --git a/rangy/rangy.d.ts b/rangy/rangy.d.ts
deleted file mode 100644
index 3b385a8b63..0000000000
--- a/rangy/rangy.d.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-// Type definitions for Rangy
-// Project: https://github.com/timdown/rangy
-// Definitions by: Rudolph Gottesheim <http://www.midnight-design.at/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface RangyRange extends Range {
-    setStartAndEnd(startNode:Node, startOffset:number, endNode?:Node, endOffset?:number):any;
-    setStartAndEnd(startNode:Node, startOffset:number, endOffset:number):any;
-    canSurroundContents():boolean;
-    isValid():boolean;
-    toHtml():string;
-    compareNode(node:Node):any;
-    intersectsOrTouchesRange(range:RangyRange):boolean;
-    intersectsRange(range:RangyRange):boolean;
-    intersection(range:RangyRange):RangyRange;
-    union(range:RangyRange):RangyRange;
-    containsNode(node:Node, partial:boolean):boolean;
-    containsNodeContents(node:Node):boolean;
-    containsNodeText(node:Node):boolean;
-    containsRange(range:RangyRange):boolean;
-    splitBoundaries():any;
-    normalizeBoundaries():any;
-    collapseToPoint(node:Node, offset:number):any;
-    collapseBefore(node:Node):any;
-    collapseAfter(node:Node):any;
-    getNodes(nodeTypes?:any[], filter?:(node:Node) => boolean):Node[];
-    getBookmark(containerNode?:Node):{start:number, end:number};
-    moveToBookmark(bookmark:Object):any;
-    getDocument():Document;
-    inspect():string;
-    equals(range:RangyRange):boolean;
-    refresh():any;
-    select():any;
-}
-
-interface RangySelection extends Selection {
-    nativeSelection:Selection;
-    isBackwards():boolean;
-    refresh(checkForChanges?:boolean):any;
-    toHtml():string;
-    getAllRanges():RangyRange[];
-    getNativeTextRange():TextRange;
-    setSingleRange(range:RangyRange):any;
-    setRanges(ranges:RangyRange[]):any;
-    getBookmark(containerNode:Node):any;
-    moveToBookmark(bookmark:Object):any;
-    saveRanges():Object;
-    restoreRanges(saved:Object):any;
-    detach():any;
-    inspect():string;
-}
-
-interface RangyStatic {
-    createNativeRange(doc?:Document|Window|HTMLIFrameElement):TextRange|Range;
-    createRange(doc?:Document|Window|HTMLIFrameElement):RangyRange;
-    createRangyRange(doc?:Document|Window|HTMLIFrameElement):RangyRange;
-    getNativeSelection(win?:Window):Selection;
-    getSelection():RangySelection;
-    addInitListener(listener:(rangy:RangyStatic) => void):any;
-    shim():any;
-    createMissingNativeApi():any;
-    initialized:boolean;
-    supported:boolean;
-}
-
-declare var rangy:RangyStatic;
diff --git a/rangy/tsconfig.json b/rangy/tsconfig.json
new file mode 100644
index 0000000000..0f11098f32
--- /dev/null
+++ b/rangy/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "rangy-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/raphael/raphael.d.ts b/raphael/index.d.ts
similarity index 100%
rename from raphael/raphael.d.ts
rename to raphael/index.d.ts
diff --git a/raphael/raphael-tests.ts b/raphael/raphael-tests.ts
index 4fcc7c357e..ea8dd7f742 100644
--- a/raphael/raphael-tests.ts
+++ b/raphael/raphael-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="raphael.d.ts" />
+
 
 var paper = Raphael(10, 50, 320, 200);
 var circle = paper.circle(50, 40, 10);
diff --git a/raphael/raphael-tests.ts.tscparams b/raphael/raphael-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/raphael/raphael-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/raphael/tsconfig.json b/raphael/tsconfig.json
new file mode 100644
index 0000000000..ff983b9550
--- /dev/null
+++ b/raphael/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "raphael-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rappid/index.d.ts b/rappid/index.d.ts
new file mode 100644
index 0000000000..5cbf07b995
--- /dev/null
+++ b/rappid/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for Rappid 1.5
+// Project: http://jointjs.com/about-rappid
+// Definitions by: Ewout Van Gossum <https://github.com/DenEwout>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jointjs" />
+
+declare namespace joint {
+    namespace ui {
+        interface Handle {
+            name: string;
+            position: string;
+            icon: string;
+        }
+
+        class SelectionView extends Backbone.Model {
+            paper: joint.dia.Paper;
+            graph: joint.dia.Graph;
+            model: Backbone.Collection<joint.dia.Cell>;
+
+            constructor(opt: {
+                paper: joint.dia.Paper;
+                graph: joint.dia.Graph;
+                model: Backbone.Collection<joint.dia.Cell>
+            });
+
+            createSelectionBox(cellView: joint.dia.CellView): void;
+            destroySelectionBox(cellView: joint.dia.CellView): void;
+            startSelecting(evt: any): void;
+            cancelSelection(): void;
+
+            addHandle(handle: Handle): void;
+            removeHandle(name: string): void;
+            changeHandle(name: string, handle: Handle): void;
+        }
+    }
+}
diff --git a/rappid/rappid.d.ts b/rappid/rappid.d.ts
deleted file mode 100644
index 2922228759..0000000000
--- a/rappid/rappid.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// Type definitions for Rappid 1.5
-// Project: http://jointjs.com/about-rappid
-// Definitions by: Ewout Van Gossum <https://github.com/DenEwout>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jointjs/jointjs.d.ts" />
-/// <reference path="../backbone/backbone.d.ts" />
-
-declare namespace joint{
-    namespace ui{
-        interface Handle {
-            name : string;
-            position : string;
-            icon: string;
-        }
-
-        class SelectionView extends Backbone.Model {
-            paper:joint.dia.Paper;
-            graph:joint.dia.Graph;
-            model:Backbone.Collection<joint.dia.Cell>;
-
-            constructor(opt:{
-                paper : joint.dia.Paper;
-                graph  : joint.dia.Graph;
-                model : Backbone.Collection<joint.dia.Cell>
-            });
-
-            createSelectionBox(cellView:joint.dia.CellView) : void;
-            destroySelectionBox(cellView:joint.dia.CellView) : void;
-            startSelecting(evt:any) : void;
-            cancelSelection() : void;
-
-            addHandle(handle:Handle) : void;
-            removeHandle(name:string) : void;
-            changeHandle(name:string, handle:Handle) : void;
-        }
-    }
-}
diff --git a/rappid/tsconfig.json b/rappid/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/rappid/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ratelimiter/index.d.ts b/ratelimiter/index.d.ts
new file mode 100644
index 0000000000..5bf3e33bbb
--- /dev/null
+++ b/ratelimiter/index.d.ts
@@ -0,0 +1,58 @@
+// Type definitions for ratelimiter 2.1.1
+// Project: https://github.com/tj/node-ratelimiter
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+import { RedisClient } from 'redis';
+
+interface LimiterOption {
+    /**
+     * The identifier to limit against (typically a user id)
+     */
+    id: string;
+
+    /**
+     * Redis connection instance
+     */
+    db: RedisClient;
+
+    /**
+     * Max requests within duration
+     */
+    max?: number;
+
+    /**
+     * Duration of limit in milliseconds
+     */
+    duration?: number;
+}
+
+interface LimiterInfo {
+    /**
+     * max value
+     */
+    total: number;
+
+    /**
+     * Number of calls left in current duration without decreasing current get
+     */
+    remaining: number;
+
+    /**
+     * Time in milliseconds until the end of current duration
+     */
+    reset: number;
+}
+
+declare class Limiter {
+    constructor(opts: LimiterOption);
+
+    inspect(): string;
+
+    get(fn: (err: any, info: LimiterInfo) => void): void;
+}
+
+declare namespace Limiter { }
+
+export = Limiter;
diff --git a/ratelimiter/ratelimiter-tests.ts b/ratelimiter/ratelimiter-tests.ts
index 7c2f03eec2..4face1baa9 100644
--- a/ratelimiter/ratelimiter-tests.ts
+++ b/ratelimiter/ratelimiter-tests.ts
@@ -1,11 +1,9 @@
-/// <reference path="../redis/redis.d.ts" />
-/// <reference path="./ratelimiter.d.ts" />
 
 import * as redis from 'redis';
 import * as Limiter from 'ratelimiter';
 
-let id: string;
-let db: redis.RedisClient;
+declare let id: string;
+declare let db: redis.RedisClient;
 let limit = new Limiter({ id: id, db: db });
 
 const str: string = limit.inspect();
diff --git a/ratelimiter/ratelimiter.d.ts b/ratelimiter/ratelimiter.d.ts
deleted file mode 100644
index 4ea3a43fa1..0000000000
--- a/ratelimiter/ratelimiter.d.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-// Type definitions for ratelimiter 2.1.1
-// Project: https://github.com/tj/node-ratelimiter
-// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../redis/redis.d.ts" />
-
-declare module "ratelimiter" {
-	import { RedisClient } from 'redis';
-
-	interface LimiterOption {
-		/**
-		 * The identifier to limit against (typically a user id)
-		 */
-		id: string;
-
-		/**
-		 * Redis connection instance
-		 */
-		db: RedisClient;
-
-		/**
-		 * Max requests within duration
-		 */
-		max?: number;
-
-		/**
-		 * Duration of limit in milliseconds
-		 */
-		duration?: number;
-	}
-
-	interface LimiterInfo {
-		/**
-		 * max value
-		 */
-		total: number;
-
-		/**
-		 * Number of calls left in current duration without decreasing current get
-		 */
-		remaining: number;
-
-		/**
-		 * Time in milliseconds until the end of current duration
-		 */
-		reset: number;
-	}
-
-	class Limiter {
-		constructor(opts: LimiterOption);
-
-		inspect(): string;
-
-		get(fn: (err: any, info: LimiterInfo) => void): void;
-	}
-
-	namespace Limiter {}
-
-	export = Limiter;
-}
diff --git a/ratelimiter/tsconfig.json b/ratelimiter/tsconfig.json
new file mode 100644
index 0000000000..3b88bfba3e
--- /dev/null
+++ b/ratelimiter/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ratelimiter-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/raty/index.d.ts b/raty/index.d.ts
new file mode 100644
index 0000000000..146671e3f9
--- /dev/null
+++ b/raty/index.d.ts
@@ -0,0 +1,64 @@
+// Type definitions for jQuery.raty 2.7.0
+// Project: https://github.com/wbotelhos/raty
+// Definitions by: Matt Wheatley <http://github.com/terrawheat>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface JQuery {
+  raty(): JQuery;
+  raty(options: JQueryRatyOptions): JQuery;
+  raty(method: string, parameter: any): any;
+  raty(method: 'score'): number;
+  raty(method: 'score', score: number): void;
+  raty(method: 'click', star: number): void;
+  raty(method: 'readonly', on: boolean): void;
+  raty(method: 'cancel', on: boolean): void;
+  raty(method: 'reload'): void;
+  raty(method: 'set', options: JQueryRatyOptions): void;
+  raty(method: 'destroy'): JQuery;
+  raty(method: 'move', number: number): void;
+}
+
+interface JQueryRatyOptions {
+  cancel?: boolean,
+  cancelClass?: string,
+  cancelHint?: string,
+  cancelOff?: string,
+  cancelOn?: string,
+  cancelPlace?: string,
+  click?: (score: number, event: JQueryEventObject) => void,
+  half?: boolean,
+  halfShow?: boolean,
+  hints?: string[],
+  iconRange?: any[][],
+  mouseout?: (score: number, event: JQueryEventObject) => void,
+  mouseover?: (score: number, event: JQueryEventObject) => void,
+  noRatedMsg?: string,
+  number?: number,
+  numberMax?: number,
+  path?: string,
+  precision?: boolean,
+  readOnly?: boolean,
+  round?: JQueryRatyRoundingOptions,
+  score?: number,
+  scoreName?: string,
+  single?: boolean,
+  space?: boolean,
+  starHalf?: string,
+  starOff?: string,
+  starOn?: string,
+  target?: string,
+  targetFormat?: string,
+  targetKeep?: boolean,
+  targetScore?: string,
+  targetText?: string,
+  targetType?: string,
+  starType?: string,
+}
+
+interface JQueryRatyRoundingOptions {
+  down: number,
+  full: number,
+  up: number,
+}
diff --git a/raty/raty-tests.ts b/raty/raty-tests.ts
index 8e5cec93ca..bb2f731038 100644
--- a/raty/raty-tests.ts
+++ b/raty/raty-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="raty.d.ts" />
+/// <reference types="jquery" />
+
 
 
 var $element: JQuery = $('<div></div>');
diff --git a/raty/raty.d.ts b/raty/raty.d.ts
deleted file mode 100644
index c9999589c1..0000000000
--- a/raty/raty.d.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-// Type definitions for jQuery.raty 2.7.0
-// Project: https://github.com/wbotelhos/raty
-// Definitions by: Matt Wheatley <http://github.com/terrawheat>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface JQuery {
-  raty(): JQuery;
-  raty(options: JQueryRatyOptions): JQuery;
-  raty(method: string, parameter: any): any;
-  raty(method: 'score'): number;
-  raty(method: 'score', score: number): void;
-  raty(method: 'click', star: number): void;
-  raty(method: 'readonly', on: boolean): void;
-  raty(method: 'cancel', on: boolean): void;
-  raty(method: 'reload'): void;
-  raty(method: 'set', options: JQueryRatyOptions): void;
-  raty(method: 'destroy'): JQuery;
-  raty(method: 'move', number: number): void;
-}
-
-interface JQueryRatyOptions {
-  cancel?: boolean,
-  cancelClass?: string,
-  cancelHint?: string,
-  cancelOff?: string,
-  cancelOn?: string,
-  cancelPlace?: string,
-  click?: (score: number, event: JQueryEventObject) => void,
-  half?: boolean,
-  halfShow?: boolean,
-  hints?: string[],
-  iconRange?: any[][],
-  mouseout?: (score: number, event: JQueryEventObject) => void,
-  mouseover?: (score: number, event: JQueryEventObject) => void,
-  noRatedMsg?: string,
-  number?: number,
-  numberMax?: number,
-  path?: string,
-  precision?: boolean,
-  readOnly?: boolean,
-  round?: JQueryRatyRoundingOptions,
-  score?: number,
-  scoreName?: string,
-  single?: boolean,
-  space?: boolean,
-  starHalf?: string,
-  starOff?: string,
-  starOn?: string,
-  target?: string,
-  targetFormat?: string,
-  targetKeep?: boolean,
-  targetScore?: string,
-  targetText?: string,
-  targetType?: string,
-  starType?: string,
-}
-
-interface JQueryRatyRoundingOptions {
-  down: number,
-  full: number,
-  up: number,
-}
diff --git a/raty/tsconfig.json b/raty/tsconfig.json
new file mode 100644
index 0000000000..0332a04a33
--- /dev/null
+++ b/raty/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "raty-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ravenjs/ravenjs.d.ts b/raven-js/index.d.ts
similarity index 100%
rename from ravenjs/ravenjs.d.ts
rename to raven-js/index.d.ts
diff --git a/ravenjs/ravenjs-tests.ts b/raven-js/ravenjs-tests.ts
similarity index 96%
rename from ravenjs/ravenjs-tests.ts
rename to raven-js/ravenjs-tests.ts
index db0ddd6932..89dbf1f00d 100644
--- a/ravenjs/ravenjs-tests.ts
+++ b/raven-js/ravenjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="ravenjs.d.ts" />
+
 
 import RavenJS from 'raven-js';
 
diff --git a/raven-js/tsconfig.json b/raven-js/tsconfig.json
new file mode 100644
index 0000000000..8a2ae823dd
--- /dev/null
+++ b/raven-js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ravenjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/raygun4js/index.d.ts b/raygun4js/index.d.ts
new file mode 100644
index 0000000000..b75684474e
--- /dev/null
+++ b/raygun4js/index.d.ts
@@ -0,0 +1,97 @@
+// Type definitions for raygun4js 1.18.3
+// Project: https://github.com/MindscapeHQ/raygun4js
+// Definitions by: Brian Surowiec <https://github.com/xt0rted>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace raygun {
+
+    // https://github.com/MindscapeHQ/raygun4js/blob/c7d8880045214ab6d403d5cc613c207f696a3cdd/src/raygun.js#L533-539
+    interface IStackTrace {
+        LineNumber: number;
+        ColumnNumber: number;
+        ClassName: string;
+        FileName: string;
+        MethodName: string;
+    }
+
+    // https://github.com/MindscapeHQ/raygun4js/blob/c7d8880045214ab6d403d5cc613c207f696a3cdd/src/raygun.js#L598-637
+    interface IPayload {
+        OccurredOn: Date;
+        Details: {
+            Error: {
+                ClassName: string;
+                Message: string;
+                StackTrace: IStackTrace[];
+            };
+            Environment: {
+                UtcOffset: number;
+                'User-Language': string;
+                'Document-Mode': number;
+                'Browser-Width': number;
+                'Browser-Height': number;
+                'Screen-Width': number;
+                'Screen-Height': number;
+                'Color-Depth': number;
+                Browser: string;
+                'Browser-Name': string;
+                'Browser-Version': string;
+                Platform: string;
+            };
+            Client: {
+                Name: string;
+                Version: string;
+            };
+            UserCustomData: any;
+            Tags: string[];
+            Request: {
+                Url: string;
+                QueryString: string;
+                Headers: {
+                    'User-Agent': string;
+                    Referer: string;
+                    Host: string;
+                };
+            };
+            Version: string;
+        };
+    }
+
+    // https://github.com/MindscapeHQ/raygun4js/blob/c7d8880045214ab6d403d5cc613c207f696a3cdd/src/raygun.js#L61-82
+    interface IRaygunOptions {
+        allowInsecureSubmissions?: boolean;
+        ignoreAjaxAbort?: boolean;
+        ignoreAjaxError?: boolean;
+        disableAnonymousUserTracking?: boolean;
+        excludedHostnames?: boolean;
+        excludedUserAgents?: boolean;
+        wrapAsynchronousCallbacks?: boolean;
+        debugMode?: boolean;
+        ignore3rdPartyErrors?: boolean;
+    }
+
+    interface RaygunStatic {
+        noConflict(): RaygunStatic;
+        constructNewRaygun(): RaygunStatic;
+        init(apiKey: string, options?: IRaygunOptions, customdata?: any): RaygunStatic;
+        withCustomData(customdata: any): RaygunStatic;
+        withTags(tags: string[]): RaygunStatic;
+        attach(): RaygunStatic;
+        detach(): RaygunStatic;
+        send(e: Error, customData?: any, tags?: string[]): RaygunStatic;
+        setUser(user: string, isAnonymous?: boolean, email?: string, fullName?: string, firstName?: string, uuid?: string): RaygunStatic;
+        resetAnonymousUser(): void;
+        setVersion(version: string): RaygunStatic;
+        saveIfOffline(enableOffline: boolean): RaygunStatic;
+        filterSensitiveData(filteredKeys: string[]): RaygunStatic;
+        setFilterScope(scope: string): RaygunStatic;
+        whitelistCrossOriginDomains(whitelist: string[]): RaygunStatic;
+        onBeforeSend(callback: (payload: IPayload) => IPayload): RaygunStatic;
+    }
+
+}
+
+declare var Raygun: raygun.RaygunStatic;
+
+declare module 'raygun4js' {
+    export = Raygun;
+}
diff --git a/raygun4js/raygun4js-tests.ts b/raygun4js/raygun4js-tests.ts
index 56577765ce..f3c3c9c1ed 100644
--- a/raygun4js/raygun4js-tests.ts
+++ b/raygun4js/raygun4js-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="raygun4js.d.ts"/>
-
-var client: raygun.RaygunStatic = Raygun.noConflict();
+var client: raygun.RaygunStatic = Raygun.noConflict();
 
 var newClient: raygun.RaygunStatic = client.constructNewRaygun();
 
diff --git a/raygun4js/raygun4js.d.ts b/raygun4js/raygun4js.d.ts
deleted file mode 100644
index c1a294bb31..0000000000
--- a/raygun4js/raygun4js.d.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-// Type definitions for raygun4js 1.18.3
-// Project: https://github.com/MindscapeHQ/raygun4js
-// Definitions by: Brian Surowiec <https://github.com/xt0rted>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace raygun {
-
-    // https://github.com/MindscapeHQ/raygun4js/blob/c7d8880045214ab6d403d5cc613c207f696a3cdd/src/raygun.js#L533-539
-    interface IStackTrace {
-        LineNumber: number;
-        ColumnNumber: number;
-        ClassName: string;
-        FileName: string;
-        MethodName: string;
-    }
-
-    // https://github.com/MindscapeHQ/raygun4js/blob/c7d8880045214ab6d403d5cc613c207f696a3cdd/src/raygun.js#L598-637
-    interface IPayload {
-        OccurredOn: Date;
-        Details: {
-            Error: {
-                ClassName: string;
-                Message: string;
-                StackTrace: IStackTrace[];
-            };
-            Environment: {
-                UtcOffset: number;
-                'User-Language': string;
-                'Document-Mode': number;
-                'Browser-Width': number;
-                'Browser-Height': number;
-                'Screen-Width': number;
-                'Screen-Height': number;
-                'Color-Depth': number;
-                Browser: string;
-                'Browser-Name': string;
-                'Browser-Version': string;
-                Platform: string;
-            };
-            Client: {
-                Name: string;
-                Version: string;
-            };
-            UserCustomData: any;
-            Tags: string[];
-            Request: {
-                Url: string;
-                QueryString: string;
-                Headers: {
-                    'User-Agent': string;
-                    Referer: string;
-                    Host: string;
-                };
-            };
-            Version: string;
-        };
-    }
-
-    // https://github.com/MindscapeHQ/raygun4js/blob/c7d8880045214ab6d403d5cc613c207f696a3cdd/src/raygun.js#L61-82
-    interface IRaygunOptions {
-        allowInsecureSubmissions?: boolean;
-        ignoreAjaxAbort?: boolean;
-        ignoreAjaxError?: boolean;
-        disableAnonymousUserTracking?: boolean;
-        excludedHostnames?: boolean;
-        excludedUserAgents?: boolean;
-        wrapAsynchronousCallbacks?: boolean;
-        debugMode?: boolean;
-        ignore3rdPartyErrors?: boolean;
-    }
-
-    interface RaygunStatic {
-        noConflict(): RaygunStatic;
-        constructNewRaygun(): RaygunStatic;
-        init(apiKey: string, options?: IRaygunOptions, customdata?: any): RaygunStatic;
-        withCustomData(customdata: any): RaygunStatic;
-        withTags(tags: string[]): RaygunStatic;
-        attach(): RaygunStatic;
-        detach(): RaygunStatic;
-        send(e: Error, customData?: any, tags?: string[]): RaygunStatic;
-        setUser(user: string, isAnonymous?: boolean, email?: string, fullName?: string, firstName?: string, uuid?: string): RaygunStatic;
-        resetAnonymousUser(): void;
-        setVersion(version: string): RaygunStatic;
-        saveIfOffline(enableOffline: boolean): RaygunStatic;
-        filterSensitiveData(filteredKeys: string[]): RaygunStatic;
-        setFilterScope(scope: string): RaygunStatic;
-        whitelistCrossOriginDomains(whitelist: string[]): RaygunStatic;
-        onBeforeSend(callback: (payload: IPayload) => IPayload): RaygunStatic;
-    }
-
-}
-
-declare var Raygun: raygun.RaygunStatic;
-
-declare module 'Raygun' {
-    export = Raygun;
-}
diff --git a/raygun4js/tsconfig.json b/raygun4js/tsconfig.json
new file mode 100644
index 0000000000..b14fff0f31
--- /dev/null
+++ b/raygun4js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "raygun4js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rc-select/index.d.ts b/rc-select/index.d.ts
new file mode 100644
index 0000000000..b3decc23d8
--- /dev/null
+++ b/rc-select/index.d.ts
@@ -0,0 +1,65 @@
+// Type definitions for React Select v5.9.0
+// Project: https://github.com/react-component/select 
+// Definitions by: Denis Tirilis <https://github.com/DenisTirilis>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react" />
+
+import Select = RcSelect.Select;
+import Option = RcSelect.Option;
+import OptGroup = RcSelect.OptGroup;
+
+export default Select;
+export {
+    Option,
+    OptGroup
+};
+
+declare namespace RcSelect {
+    interface SelectProps {
+        className?: string;
+        prefixCls?: string;
+        animation?: string;
+        transitionName?: string;
+        choiceTransitionName?: string;
+        dropdownMatchSelectWidth?: boolean;
+        dropdownClassName?: string;
+        dropdownStyle?: { [key: string]: string };
+        dropdownMenuStyle?: { [key: string]: string };
+        notFoundContent?: string;
+        showSearch?: boolean;
+        allowClear?: boolean;
+        tags?: boolean;
+        maxTagTextLength?: number;
+        combobox?: boolean;
+        multiple?: boolean;
+        disabled?: boolean;
+        filterOption?: boolean;
+        optionFilterProp?: string;
+        optionLabelProp?: string;
+        defaultValue?: string | Array<string>;
+        value?: string | Array<string>;
+        onChange?: (value: string, label: string) => void;
+        onSearch?: Function;
+        onSelect?: (value: string, ontion: Option) => void;
+        onDeselect?: Function;
+        defaultLabel?: string | Array<string>;
+        defaultActiveFirstOption?: boolean;
+        getPopupContainer?: (trigger: Node) => Node;
+    }
+    export class Select extends React.Component<SelectProps, any> { }
+    interface OptionProps {
+        className?: string;
+        disabled?: boolean;
+        key?: string;
+        value?: string;
+    }
+    export class Option extends React.Component<OptionProps, any> { }
+
+    interface OptGroupProps {
+        label?: string | React.ReactElement<any>;
+        key?: string;
+        value?: string;
+    }
+    export class OptGroup extends React.Component<OptGroupProps, any> { }
+}
diff --git a/rc-select/rc-select-tests.ts b/rc-select/rc-select-tests.ts
index 94cb1541e8..f2ec85ae09 100644
--- a/rc-select/rc-select-tests.ts
+++ b/rc-select/rc-select-tests.ts
@@ -1,8 +1,8 @@
-/// <reference path="rc-select.d.ts" />
-/// <reference path="../react/react.d.ts" />
+
+/// <reference types="react" />
 
 import React = require('react');
-import Select = require('rc-select');
+import RcSelect = require('rc-select');
 
 class Component extends React.Component<any, any> {    
 
@@ -19,7 +19,7 @@ class Component extends React.Component<any, any> {
         console.log('input changed');
     }
 
-    private defaultSelectProps: RcSelect.SelectProps = {
+    private defaultSelectProps = {
         className: "my-select",
         prefixCls: "prefix",
         animation: "slide-up",
@@ -44,28 +44,28 @@ class Component extends React.Component<any, any> {
         defaultActiveFirstOption: false
     };
 
-    private defaultOptGroupProps: RcSelect.OptGroupProps = {
+    private defaultOptGroupProps = {
         label: "Option group",
         key: "option-group-0",
         value: "option-group-0"
     };
 
-    private defaultOptionProps: RcSelect.OptionProps = {
+    private defaultOptionProps = {
         className: "option",
         disabled: true,
         key: "option-0",
         value: "option-0"        
     };
 
-    private createOptions(count: number): React.ReactElement<RcSelect.OptionProps>[] {
-        let options: React.ReactElement<RcSelect.OptionProps>[] = [];
+    private createOptions(count: number) {
+        let options : any = [];
 
         for (let i = 0; i < count; i++) {
             let props = this.defaultOptionProps;
             props.key = `option-${i}`;
             props.value = `option-${i}`;
 
-            options.push(React.createElement(Select.Option, props));
+            options.push(React.createElement(RcSelect.Option, props));
         }
 
         return options;
@@ -73,11 +73,11 @@ class Component extends React.Component<any, any> {
 
     render() {
 
-        let options: React.ReactElement<RcSelect.OptionProps>[] = this.createOptions(10);
+        let options = this.createOptions(10);
 
-        let optionGroup: React.ReactElement<RcSelect.OptGroupProps> = React.createElement(Select.OptGroup, this.defaultOptGroupProps, options);        
+        let optionGroup = React.createElement(RcSelect.OptGroup, this.defaultOptGroupProps, options);        
 
-        let select: React.ReactElement<RcSelect.SelectProps> = React.createElement(Select.default, this.defaultSelectProps, optionGroup);
+        let select = React.createElement(RcSelect.default, this.defaultSelectProps, optionGroup);
 
         return select;
     }
diff --git a/rc-select/rc-select.d.ts b/rc-select/rc-select.d.ts
deleted file mode 100644
index 8b9ca6978c..0000000000
--- a/rc-select/rc-select.d.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-// Type definitions for React Select v5.9.0
-// Project: https://github.com/react-component/select 
-// Definitions by: Denis Tirilis <https://github.com/DenisTirilis>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts" />
-
-declare namespace RcSelect {
-    import React = __React;
-    interface SelectProps {
-        className?: string;
-        prefixCls?: string;
-        animation?: string;
-        transitionName?: string;
-        choiceTransitionName?: string;
-        dropdownMatchSelectWidth?: boolean;
-        dropdownClassName?: string;
-        dropdownStyle?: { [key: string]: string };
-        dropdownMenuStyle?: { [key: string]: string };
-        notFoundContent?: string;
-        showSearch?: boolean;
-        allowClear?: boolean;
-        tags?: boolean;
-        maxTagTextLength?: number;
-        combobox?: boolean;
-        multiple?: boolean;
-        disabled?: boolean;
-        filterOption?: boolean;
-        optionFilterProp?: string;
-        optionLabelProp?: string;
-        defaultValue?: string | Array<string>;
-        value?: string | Array<string>;
-        onChange?: (value: string, label: string) => void;
-        onSearch?: Function;
-        onSelect?: (value: string, ontion: Option) => void;
-        onDeselect?: Function;
-        defaultLabel?: string | Array<string>;
-        defaultActiveFirstOption?: boolean;
-        getPopupContainer?: (trigger: Node) => Node;
-    }
-    export class Select extends React.Component<SelectProps, any> { }
-    interface OptionProps {
-        className?: string;
-        disabled?: boolean;
-        key?: string;
-        value?: string;
-    }
-    export class Option extends React.Component<OptionProps, any> { }
-
-    interface OptGroupProps {
-        label?: string | React.ReactElement<any>;
-        key?: string;
-        value?: string;
-    }
-    export class OptGroup extends React.Component<OptGroupProps, any> { }
-}
-declare module 'rc-select' {
-    import Select = RcSelect.Select;
-    import Option = RcSelect.Option;
-    import OptGroup = RcSelect.OptGroup;
-
-    export default Select;
-    export {
-        Option,
-        OptGroup
-    };
-} 
diff --git a/rc-select/tsconfig.json b/rc-select/tsconfig.json
new file mode 100644
index 0000000000..e98b9fea45
--- /dev/null
+++ b/rc-select/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "rc-select-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rcloader/index.d.ts b/rcloader/index.d.ts
new file mode 100644
index 0000000000..72e3f1f8cc
--- /dev/null
+++ b/rcloader/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for rcloader
+// Project: https://github.com/spalger/rcloader
+// Definitions by: Panu Horsmalahti <https://github.com/panuhorsmalahti>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface Options {
+    [property: string]: any;
+    lookup?: boolean;
+}
+
+declare class RcLoader {
+    constructor(configfilename: string, options: string | Options);
+    for(path: string, callback?: (error: any, fileOpts: any) => void): void;
+}
+
+export = RcLoader;
diff --git a/rcloader/rcloader-tests.ts b/rcloader/rcloader-tests.ts
index 16ade8c555..f36f61c025 100644
--- a/rcloader/rcloader-tests.ts
+++ b/rcloader/rcloader-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./rcloader.d.ts" />
 
 import RcLoader = require("rcloader");
 
diff --git a/rcloader/rcloader.d.ts b/rcloader/rcloader.d.ts
deleted file mode 100644
index edba798419..0000000000
--- a/rcloader/rcloader.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Type definitions for rcloader
-// Project: https://github.com/spalger/rcloader
-// Definitions by: Panu Horsmalahti <https://github.com/panuhorsmalahti>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "rcloader" {
-    interface Options {
-        [property: string]: any;
-        lookup?: boolean;
-    }
-
-    class RcLoader {
-        constructor(configfilename: string, options: string | Options);
-        for(path: string, callback?: (error: any, fileOpts: any) => void): void;
-    }
-
-    export = RcLoader;
-}
diff --git a/rcloader/tsconfig.json b/rcloader/tsconfig.json
new file mode 100644
index 0000000000..1b5d8e4e1d
--- /dev/null
+++ b/rcloader/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "rcloader-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/react-addons-create-fragment/index.d.ts b/react-addons-create-fragment/index.d.ts
new file mode 100644
index 0000000000..c060e67715
--- /dev/null
+++ b/react-addons-create-fragment/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for React v0.14 (react-addons-create-fragment)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as React from 'react';
+
+export = createFragment;
+
+declare function createFragment(object: { [key: string]: React.ReactNode }): React.ReactFragment;
diff --git a/react-addons-create-fragment/tsconfig.json b/react-addons-create-fragment/tsconfig.json
new file mode 100644
index 0000000000..98c460c2f5
--- /dev/null
+++ b/react-addons-create-fragment/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "files": [
+        "index.d.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/react-addons-css-transition-group/index.d.ts b/react-addons-css-transition-group/index.d.ts
new file mode 100644
index 0000000000..ce1f155979
--- /dev/null
+++ b/react-addons-css-transition-group/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for React v0.14 (react-addons-css-transition-group)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { ComponentClass } from 'react';
+import { TransitionGroupProps } from 'react-addons-transition-group';
+
+declare var CSSTransitionGroup: CSSTransitionGroup;
+type CSSTransitionGroup = ComponentClass<CSSTransitionGroupProps>;
+export = CSSTransitionGroup;
+
+interface CSSTransitionGroupTransitionName {
+    enter: string;
+    enterActive?: string;
+    leave: string;
+    leaveActive?: string;
+    appear?: string;
+    appearActive?: string;
+}
+
+interface CSSTransitionGroupProps extends TransitionGroupProps {
+    transitionName: string | CSSTransitionGroupTransitionName;
+    transitionAppear?: boolean;
+    transitionAppearTimeout?: number;
+    transitionEnter?: boolean;
+    transitionEnterTimeout?: number;
+    transitionLeave?: boolean;
+    transitionLeaveTimeout?: number;
+}
diff --git a/react-addons-css-transition-group/tsconfig.json b/react-addons-css-transition-group/tsconfig.json
new file mode 100644
index 0000000000..98c460c2f5
--- /dev/null
+++ b/react-addons-css-transition-group/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "files": [
+        "index.d.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/react-addons-linked-state-mixin/index.d.ts b/react-addons-linked-state-mixin/index.d.ts
new file mode 100644
index 0000000000..a7ec5ab123
--- /dev/null
+++ b/react-addons-linked-state-mixin/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for React v0.14 (react-addons-linked-state-mixin)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Mixin } from 'react';
+
+declare var LinkedStateMixin: LinkedStateMixin.LinkedStateMixin;
+type LinkedStateMixin = LinkedStateMixin.LinkedStateMixin;
+export = LinkedStateMixin;
+
+declare namespace LinkedStateMixin {
+	export interface ReactLink<T> {
+	    value: T;
+	    requestChange(newValue: T): void;
+	}
+
+	export interface LinkedStateMixin extends Mixin<any, any> {
+	    linkState<T>(key: string): ReactLink<T>;
+	}
+}
+
+declare module 'react' {
+    interface HTMLAttributes {
+        checkedLink?: LinkedStateMixin.ReactLink<boolean>;
+        valueLink?: LinkedStateMixin.ReactLink<boolean | string | number>;
+    }
+}
diff --git a/react-addons-linked-state-mixin/tsconfig.json b/react-addons-linked-state-mixin/tsconfig.json
new file mode 100644
index 0000000000..98c460c2f5
--- /dev/null
+++ b/react-addons-linked-state-mixin/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "files": [
+        "index.d.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/react-addons-perf/index.d.ts b/react-addons-perf/index.d.ts
new file mode 100644
index 0000000000..c3499e9a52
--- /dev/null
+++ b/react-addons-perf/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for React v0.14 (react-addons-perf)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = Perf;
+
+interface ComponentPerfContext {
+    current: string;
+    owner: string;
+}
+
+interface NumericPerfContext {
+    [key: string]: number;
+}
+
+interface Measurements {
+    exclusive: NumericPerfContext;
+    inclusive: NumericPerfContext;
+    render: NumericPerfContext;
+    counts: NumericPerfContext;
+    writes: NumericPerfContext;
+    displayNames: {
+        [key: string]: ComponentPerfContext;
+    };
+    totalTime: number;
+}
+
+declare namespace Perf {
+    export function start(): void;
+    export function stop(): void;
+    export function printInclusive(measurements: Measurements[]): void;
+    export function printExclusive(measurements: Measurements[]): void;
+    export function printWasted(measurements: Measurements[]): void;
+    export function printDOM(measurements: Measurements[]): void;
+    export function getLastMeasurements(): Measurements[];
+}
diff --git a/react-addons-perf/tsconfig.json b/react-addons-perf/tsconfig.json
new file mode 100644
index 0000000000..98c460c2f5
--- /dev/null
+++ b/react-addons-perf/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "files": [
+        "index.d.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/react-addons-pure-render-mixin/index.d.ts b/react-addons-pure-render-mixin/index.d.ts
new file mode 100644
index 0000000000..7e732b583b
--- /dev/null
+++ b/react-addons-pure-render-mixin/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for React v0.14 (react-addons-pure-render-mixin)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Mixin } from 'react';
+
+declare var PureRenderMixin: PureRenderMixin;
+export = PureRenderMixin;
+
+interface PureRenderMixin extends Mixin<any, any> { }
diff --git a/react-addons-pure-render-mixin/tsconfig.json b/react-addons-pure-render-mixin/tsconfig.json
new file mode 100644
index 0000000000..98c460c2f5
--- /dev/null
+++ b/react-addons-pure-render-mixin/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "files": [
+        "index.d.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/react-addons-shallow-compare/index.d.ts b/react-addons-shallow-compare/index.d.ts
new file mode 100644
index 0000000000..eeb4935176
--- /dev/null
+++ b/react-addons-shallow-compare/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for React v0.14 (react-addons-css-transition-group)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Component } from 'react';
+
+declare function shallowCompare<P, S>(
+    component: Component<P, S>,
+    nextProps: P,
+    nextState: S): boolean;
+
+export = shallowCompare;
diff --git a/react-addons-shallow-compare/tsconfig.json b/react-addons-shallow-compare/tsconfig.json
new file mode 100644
index 0000000000..98c460c2f5
--- /dev/null
+++ b/react-addons-shallow-compare/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "files": [
+        "index.d.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/react-addons-test-utils/index.d.ts b/react-addons-test-utils/index.d.ts
new file mode 100644
index 0000000000..091c5d5df7
--- /dev/null
+++ b/react-addons-test-utils/index.d.ts
@@ -0,0 +1,168 @@
+// Type definitions for React v0.14 (react-addons-test-utils)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { AbstractView, Component, ComponentClass,
+    ReactElement, ReactInstance, ClassType,
+    DOMElement, SFCElement, CElement,
+    ReactHTMLElement, DOMAttributes, SFC } from 'react';
+
+export = TestUtils;
+
+declare namespace TestUtils {
+    export interface OptionalEventProperties {
+        bubbles?: boolean;
+        cancelable?: boolean;
+        currentTarget?: EventTarget;
+        defaultPrevented?: boolean;
+        eventPhase?: number;
+        isTrusted?: boolean;
+        nativeEvent?: Event;
+        preventDefault?(): void;
+        stopPropagation?(): void;
+        target?: EventTarget;
+        timeStamp?: Date;
+        type?: string;
+    }
+
+    export interface SyntheticEventData extends OptionalEventProperties {
+        altKey?: boolean;
+        button?: number;
+        buttons?: number;
+        clientX?: number;
+        clientY?: number;
+        changedTouches?: TouchList;
+        charCode?: boolean;
+        clipboardData?: DataTransfer;
+        ctrlKey?: boolean;
+        deltaMode?: number;
+        deltaX?: number;
+        deltaY?: number;
+        deltaZ?: number;
+        detail?: number;
+        getModifierState?(key: string): boolean;
+        key?: string;
+        keyCode?: number;
+        locale?: string;
+        location?: number;
+        metaKey?: boolean;
+        pageX?: number;
+        pageY?: number;
+        relatedTarget?: EventTarget;
+        repeat?: boolean;
+        screenX?: number;
+        screenY?: number;
+        shiftKey?: boolean;
+        targetTouches?: TouchList;
+        touches?: TouchList;
+        view?: AbstractView;
+        which?: number;
+    }
+
+    export interface EventSimulator {
+        (element: Element | Component<any, any>, eventData?: SyntheticEventData): void;
+    }
+
+    export interface MockedComponentClass {
+        new(): any;
+    }
+
+    export interface ShallowRenderer {
+        getRenderOutput<E extends ReactElement<any>>(): E;
+        getRenderOutput(): ReactElement<any>;
+        render(element: ReactElement<any>, context?: any): void;
+        unmount(): void;
+    }
+
+    export namespace Simulate {
+        export var blur: EventSimulator;
+        export var change: EventSimulator;
+        export var click: EventSimulator;
+        export var copy: EventSimulator;
+        export var cut: EventSimulator;
+        export var doubleClick: EventSimulator;
+        export var drag: EventSimulator;
+        export var dragEnd: EventSimulator;
+        export var dragEnter: EventSimulator;
+        export var dragExit: EventSimulator;
+        export var dragLeave: EventSimulator;
+        export var dragOver: EventSimulator;
+        export var dragStart: EventSimulator;
+        export var drop: EventSimulator;
+        export var focus: EventSimulator;
+        export var input: EventSimulator;
+        export var keyDown: EventSimulator;
+        export var keyPress: EventSimulator;
+        export var keyUp: EventSimulator;
+        export var mouseDown: EventSimulator;
+        export var mouseEnter: EventSimulator;
+        export var mouseLeave: EventSimulator;
+        export var mouseMove: EventSimulator;
+        export var mouseOut: EventSimulator;
+        export var mouseOver: EventSimulator;
+        export var mouseUp: EventSimulator;
+        export var paste: EventSimulator;
+        export var scroll: EventSimulator;
+        export var submit: EventSimulator;
+        export var touchCancel: EventSimulator;
+        export var touchEnd: EventSimulator;
+        export var touchMove: EventSimulator;
+        export var touchStart: EventSimulator;
+        export var wheel: EventSimulator;
+    }
+
+    export function renderIntoDocument<T extends Element>(
+        element: DOMElement<any, T>): T;
+    export function renderIntoDocument(
+        element: SFCElement<any>): void;
+    export function renderIntoDocument<T extends Component<any, any>>(
+        element: CElement<any, T>): T;
+    export function renderIntoDocument<P>(
+        element: ReactElement<P>): Component<P, {}> | Element | void;
+
+    export function mockComponent(
+        mocked: MockedComponentClass, mockTagName?: string): typeof TestUtils;
+
+    export function isElementOfType<T extends HTMLElement>(
+        element: ReactElement<any>, type: string): element is ReactHTMLElement<T>;
+    export function isElementOfType<P extends DOMAttributes, T extends Element>(
+        element: ReactElement<any>, type: string): element is DOMElement<P, T>;
+    export function isElementOfType<P>(
+        element: ReactElement<any>, type: SFC<P>): element is SFCElement<P>;
+    export function isElementOfType<P, T extends Component<P, {}>, C extends ComponentClass<P>>(
+        element: ReactElement<any>, type: ClassType<P, T, C>): element is CElement<P, T>;
+
+    export function isDOMComponent(instance: ReactInstance): instance is Element;
+    export function isCompositeComponent(instance: ReactInstance): instance is Component<any, any>;
+    export function isCompositeComponentWithType<T extends Component<any, any>, C extends ComponentClass<any>>(
+        instance: ReactInstance, type: ClassType<any, T, C>): T;
+
+    export function findAllInRenderedTree(
+        root: Component<any, any>,
+        fn: (i: ReactInstance) => boolean): ReactInstance[];
+
+    export function scryRenderedDOMComponentsWithClass(
+        root: Component<any, any>,
+        className: string): Element[];
+    export function findRenderedDOMComponentWithClass(
+        root: Component<any, any>,
+        className: string): Element;
+
+    export function scryRenderedDOMComponentsWithTag(
+        root: Component<any, any>,
+        tagName: string): Element[];
+    export function findRenderedDOMComponentWithTag(
+        root: Component<any, any>,
+        tagName: string): Element;
+
+    export function scryRenderedComponentsWithType<T extends Component<{}, {}>, C extends ComponentClass<{}>>(
+        root: Component<any, any>,
+        type: ClassType<any, T, C>): T[];
+
+    export function findRenderedComponentWithType<T extends Component<{}, {}>, C extends ComponentClass<{}>>(
+        root: Component<any, any>,
+        type: ClassType<any, T, C>): T;
+
+    export function createRenderer(): ShallowRenderer;
+}
diff --git a/react-addons-test-utils/tsconfig.json b/react-addons-test-utils/tsconfig.json
new file mode 100644
index 0000000000..98c460c2f5
--- /dev/null
+++ b/react-addons-test-utils/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "files": [
+        "index.d.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/react-addons-transition-group/index.d.ts b/react-addons-transition-group/index.d.ts
new file mode 100644
index 0000000000..79dcd7cf3f
--- /dev/null
+++ b/react-addons-transition-group/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for React v0.14 (react-addons-transition-group)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { ReactElement, ComponentClass, ReactType } from 'react';
+
+declare namespace ReactCSSTransitionGroup {
+    export interface TransitionGroupProps {
+        component?: ReactType;
+        className?: string;
+        childFactory?: (child: ReactElement<any>) => ReactElement<any>;
+    }
+}
+declare var ReactCSSTransitionGroup : ComponentClass<ReactCSSTransitionGroup.TransitionGroupProps>;
+export = ReactCSSTransitionGroup;
diff --git a/react-addons-transition-group/tsconfig.json b/react-addons-transition-group/tsconfig.json
new file mode 100644
index 0000000000..98c460c2f5
--- /dev/null
+++ b/react-addons-transition-group/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "files": [
+        "index.d.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/react-addons-update/index.d.ts b/react-addons-update/index.d.ts
new file mode 100644
index 0000000000..bc65dcbfa7
--- /dev/null
+++ b/react-addons-update/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for React v0.14 (react-addons-update)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as React from 'react';
+
+export = React.__Addons.update;
+
+declare module 'react' {
+    interface UpdateSpecCommand {
+        $set?: any;
+        $merge?: {};
+        $apply?(value: any): any;
+    }
+
+    interface UpdateSpecPath {
+        [key: string]: UpdateSpec;
+    }
+
+    type UpdateSpec = UpdateSpecCommand | UpdateSpecPath;
+
+    interface UpdateArraySpec extends UpdateSpecCommand {
+        $push?: any[];
+        $unshift?: any[];
+        $splice?: any[][];
+    }
+
+    namespace __Addons {
+        export function update(value: any[], spec: UpdateArraySpec): any[];
+        export function update(value: {}, spec: UpdateSpec): any;
+    }
+}
+
diff --git a/react-addons-update/tsconfig.json b/react-addons-update/tsconfig.json
new file mode 100644
index 0000000000..98c460c2f5
--- /dev/null
+++ b/react-addons-update/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "files": [
+        "index.d.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/react-bootstrap-daterangepicker/index.d.ts b/react-bootstrap-daterangepicker/index.d.ts
new file mode 100644
index 0000000000..e7d58f3747
--- /dev/null
+++ b/react-bootstrap-daterangepicker/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for react-bootstrap-daterangepicker
+// Project: https://github.com/skratchdot/react-bootstrap-daterangepicker
+// Definitions by: Ian Ker-Seymer https://github.com/ianks
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react" />
+/// <reference types="bootstrap.datepicker" />
+
+declare namespace ReactBootstrapDaterangepicker {
+    export interface EventHandler { (event?: any, picker?: any): any; }
+
+    export interface Props extends DatepickerOptions {
+        onShow?: EventHandler;
+        onHide?: EventHandler;
+        onShowCalendar?: EventHandler;
+        onHideCalendar?: EventHandler;
+        onApply?: EventHandler;
+        onCancel?: EventHandler;
+        onEvent?: EventHandler;
+    }
+
+    export class DateRangePicker extends React.Component<Props, {}> {}
+}
+
+declare var DateRangePicker: typeof ReactBootstrapDaterangepicker.DateRangePicker;
+
+declare module "react-bootstrap-daterangepicker" {
+    export = DateRangePicker;
+}
diff --git a/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.tsx b/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.tsx
index a18e430130..b34646031d 100644
--- a/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.tsx
+++ b/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.tsx
@@ -1,6 +1,3 @@
-/// <reference path="./react-bootstrap-daterangepicker.d.tsx" />
-/// <reference path="./../react/react.d.ts" />
-
 import * as DateRangePicker from "react-bootstrap-daterangepicker";
 import * as React from "react";
 
diff --git a/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker.d.tsx b/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker.d.tsx
deleted file mode 100644
index 723a35aeaa..0000000000
--- a/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker.d.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-// Type definitions for react-bootstrap-daterangepicker
-// Project: https://github.com/skratchdot/react-bootstrap-daterangepicker
-// Definitions by: Ian Ker-Seymer https://github.com/ianks
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts" />
-/// <reference path="../bootstrap.datepicker/bootstrap.datepicker.d.ts" />
-
-declare namespace ReactBootstrapDaterangepicker {
-    export interface EventHandler { (event?: any, picker?: any): any; }
-
-    export interface Props extends DatepickerOptions {
-        onShow?: EventHandler;
-        onHide?: EventHandler;
-        onShowCalendar?: EventHandler;
-        onHideCalendar?: EventHandler;
-        onApply?: EventHandler;
-        onCancel?: EventHandler;
-        onEvent?: EventHandler;
-    }
-
-    export class DateRangePicker extends __React.Component<Props, {}> {}
-}
-
-declare var DateRangePicker: typeof ReactBootstrapDaterangepicker.DateRangePicker;
-
-declare module "react-bootstrap-daterangepicker" {
-    export = DateRangePicker;
-}
diff --git a/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker.tsx.tscparams b/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker.tsx.tscparams
deleted file mode 100644
index 36c3b9323c..0000000000
--- a/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker.tsx.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---noImplicitAny --module commonjs --jsx react
diff --git a/react-bootstrap-daterangepicker/tsconfig.json b/react-bootstrap-daterangepicker/tsconfig.json
new file mode 100644
index 0000000000..616a4a0f62
--- /dev/null
+++ b/react-bootstrap-daterangepicker/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-bootstrap-daterangepicker-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/react-bootstrap-table/index.d.ts b/react-bootstrap-table/index.d.ts
new file mode 100644
index 0000000000..f2c06f776b
--- /dev/null
+++ b/react-bootstrap-table/index.d.ts
@@ -0,0 +1,114 @@
+// Type definitions for react-bootstrap-table v1.4.6
+// Project: https://github.com/AllenFang/react-bootstrap-table
+// Definitions by: Frank Laub <https://github.com/flaub>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react" />
+/// <reference types="node" />
+
+
+import { ComponentClass, Props, ReactElement } from 'react';
+import { EventEmitter } from 'events';
+
+interface SelectRow {
+    mode?: string;
+    bgColor?: string;
+    selected?: any[];
+    onSelect?: Function;
+    onSelectAll?: Function;
+    clickToSelect?: boolean;
+    hideSelectColumn?: boolean;
+    clickToSelectAndEditCell?: boolean;
+    showOnlySelected?: boolean;
+}
+
+interface CellEdit {
+    mode?: string;
+    blurToSave?: boolean;
+    afterSaveCell?: Function;
+}
+
+interface Options {
+    sortName?: string;
+    sortOrder?: string;
+    afterTableComplete?: Function;
+    afterDeleteRow?: Function;
+    afterInsertRow?: Function;
+    afterSearch?: Function;
+    afterColumnFilter?: Function;
+    onRowClick?: Function;
+    page?: number;
+    sizePerPageList?: number[];
+    sizePerPage?: number;
+    paginationSize?: number;
+    onSortChange?: Function;
+    onPageChange?: Function;
+    onSizePerPageList?: Function;
+    noDataText?: string;
+    handleConfirmDeleteRow?: Function;
+}
+
+interface FetchInfo {
+    dataTotalSize?: number;
+}
+
+interface BootstrapTableProps extends Props<BootstrapTable> {
+    keyField?: string;
+    height?: string;
+    maxHeight?: string;
+    data?: any;
+    remote?: boolean;
+    striped?: boolean;
+    bordered?: boolean;
+    hover?: boolean;
+    condensed?: boolean;
+    pagination?: boolean;
+    searchPlaceholder?: string;
+    selectRow?: SelectRow;
+    cellEdit?: CellEdit;
+    insertRow?: boolean;
+    deleteRow?: boolean;
+    search?: boolean;
+    columnFilter?: boolean;
+    trClassName?: any;
+    options?: Options;
+    fetchInfo?: FetchInfo;
+    exportCSV?: boolean;
+    csvFileName?: string;
+}
+
+interface BootstrapTable extends ComponentClass<BootstrapTableProps> { }
+declare const BootstrapTable: BootstrapTable;
+
+interface TableHeaderColumnProps extends Props<TableHeaderColumn> {
+    dataField?: string;
+    dataAlign?: string;
+    dataSort?: boolean;
+    onSort?: Function;
+    dataFormat?: Function;
+    isKey?: boolean;
+    editable?: any;
+    hidden?: boolean;
+    className?: string;
+    width?: string;
+    sortFunc?: Function;
+    columnClassName?: any;
+    filterFormatted?: boolean;
+    sort?: string;
+}
+
+interface TableHeaderColumn extends ComponentClass<TableHeaderColumnProps> { }
+declare const TableHeaderColumn: TableHeaderColumn;
+
+declare class TableDataSet extends EventEmitter {
+    constructor(data: any);
+    setData(data: any): void;
+    clear(): void;
+    getData(): any;
+}
+
+export {
+BootstrapTable,
+TableHeaderColumn,
+TableDataSet
+}
diff --git a/react-bootstrap-table/react-bootstrap-table-tests.tsx b/react-bootstrap-table/react-bootstrap-table-tests.tsx
index 9a22bf9df4..2998c92b3c 100644
--- a/react-bootstrap-table/react-bootstrap-table-tests.tsx
+++ b/react-bootstrap-table/react-bootstrap-table-tests.tsx
@@ -1,5 +1,4 @@
-/// <reference path="react-bootstrap-table.d.ts"/>
-/// <reference path="../react/react-dom.d.ts"/>
+/// <reference types="react-dom"/>
 
 import * as React from 'react';
 import { render } from 'react-dom';
diff --git a/react-bootstrap-table/react-bootstrap-table.d.ts b/react-bootstrap-table/react-bootstrap-table.d.ts
deleted file mode 100644
index a93b716fbb..0000000000
--- a/react-bootstrap-table/react-bootstrap-table.d.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-// Type definitions for react-bootstrap-table v1.4.6
-// Project: https://github.com/AllenFang/react-bootstrap-table
-// Definitions by: Frank Laub <https://github.com/flaub>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts" />
-/// <reference path="../node/node.d.ts" />
-
-declare module "react-bootstrap-table" {
-	import { ComponentClass, Props, ReactElement } from 'react';
-	import { EventEmitter } from 'events';
-
-	interface SelectRow {
-		mode?: string;
-		bgColor?: string;
-		selected?: any[];
-		onSelect?: Function;
-		onSelectAll?: Function;
-		clickToSelect?: boolean;
-		hideSelectColumn?: boolean;
-		clickToSelectAndEditCell?: boolean;
-		showOnlySelected?: boolean;
-	}
-
-	interface CellEdit {
-		mode?: string;
-		blurToSave?: boolean;
-		afterSaveCell?: Function;
-	}
-
-	interface Options {
-		sortName?: string;
-		sortOrder?: string;
-		afterTableComplete?: Function;
-		afterDeleteRow?: Function;
-		afterInsertRow?: Function;
-		afterSearch?: Function;
-		afterColumnFilter?: Function;
-		onRowClick?: Function;
-		page?: number;
-		sizePerPageList?: number[];
-		sizePerPage?: number;
-		paginationSize?: number;
-		onSortChange?: Function;
-		onPageChange?: Function;
-		onSizePerPageList?: Function;
-		noDataText?: string;
-		handleConfirmDeleteRow?: Function;
-	}
-
-	interface FetchInfo {
-		dataTotalSize?: number;
-	}
-
-	interface BootstrapTableProps extends Props<BootstrapTable> {
-		keyField?: string;
-		height?: string;
-		maxHeight?: string;
-		data?: any;
-		remote?: boolean;
-		striped?: boolean;
-		bordered?: boolean;
-		hover?: boolean;
-		condensed?: boolean;
-		pagination?: boolean;
-		searchPlaceholder?: string;
-		selectRow?: SelectRow;
-		cellEdit?: CellEdit;
-		insertRow?: boolean;
-		deleteRow?: boolean;
-		search?: boolean;
-		columnFilter?: boolean;
-		trClassName?: any;
-		options?: Options;
-		fetchInfo?: FetchInfo;
-		exportCSV?: boolean;
-		csvFileName?: string;
-	}
-
-	interface BootstrapTable extends ComponentClass<BootstrapTableProps> { }
-	const BootstrapTable: BootstrapTable;
-
-	interface TableHeaderColumnProps extends Props<TableHeaderColumn> {
-		dataField?: string;
-		dataAlign?: string;
-		dataSort?: boolean;
-		onSort?: Function;
-		dataFormat?: Function;
-		isKey?: boolean;
-		editable?: any;
-		hidden?: boolean;
-		className?: string;
-		width?: string;
-		sortFunc?: Function;
-		columnClassName?: any;
-		filterFormatted?: boolean;
-		sort?: string;
-	}
-
-	interface TableHeaderColumn extends ComponentClass<TableHeaderColumnProps> { }
-	const TableHeaderColumn: TableHeaderColumn;
-
-	class TableDataSet extends EventEmitter {
-		constructor(data: any);
-		setData(data: any): void;
-		clear(): void;
-		getData(): any;
-	}
-
-	export {
-		BootstrapTable,
-		TableHeaderColumn,
-		TableDataSet
-	}
-}
diff --git a/react-bootstrap-table/tsconfig.json b/react-bootstrap-table/tsconfig.json
new file mode 100644
index 0000000000..a4fac3ad18
--- /dev/null
+++ b/react-bootstrap-table/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-bootstrap-table-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/react-bootstrap/index.d.ts b/react-bootstrap/index.d.ts
new file mode 100644
index 0000000000..d98ef3c963
--- /dev/null
+++ b/react-bootstrap/index.d.ts
@@ -0,0 +1,770 @@
+// Type definitions for react-bootstrap
+// Project: https://github.com/react-bootstrap/react-bootstrap
+// Definitions by: Walker Burgin <https://github.com/walkerburgin>, Vincent Siao <https://github.com/vsiao>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="react"/>
+
+declare module "react-bootstrap" {
+    // Import React
+    import React = require("react");
+
+
+    // <Button />
+    // ----------------------------------------
+    interface ButtonProps extends React.HTMLAttributes {
+
+        // Optional
+        active?: boolean;
+        block?: boolean;
+        bsStyle?: string;
+        bsSize?: string;
+        navItem?: boolean;
+        navDropdown?: boolean;
+        componentClass?: string;
+    }
+    type Button = React.ClassicComponent<ButtonProps, {}>;
+    var Button: React.ClassicComponentClass<ButtonProps>;
+
+    // <ButtonToolbar />
+    // ----------------------------------------
+    interface ButtonToolbarProps extends React.HTMLAttributes {
+
+        // Optional
+        block?: boolean;
+        bsSize?: string;
+        bsStyle?: string;
+        justified?: boolean;
+        vertical?: boolean;
+    }
+    type ButtonToolbar = React.ClassicComponent<ButtonToolbarProps, {}>;
+    var ButtonToolbar: React.ClassicComponentClass<ButtonToolbarProps>;
+
+    // <ButtonGroup />
+    // ----------------------------------------
+    interface ButtonGroupProps extends React.HTMLAttributes {
+        // Optional
+        block?: boolean;
+        bsSize?: string;
+        bsStyle?: string;
+        justified?: boolean;
+        vertical?: boolean;
+    }
+    type ButtonGroup = React.ClassicComponent<ButtonGroupProps, {}>;
+    var ButtonGroup: React.ClassicComponentClass<ButtonGroupProps>;
+
+    // <DropdownButton />
+    // ----------------------------------------
+    interface DropdownButtonProps extends React.HTMLAttributes {
+        bsStyle?: string;
+        bsSize?: string;
+        buttonClassName?: string;
+        dropup?: boolean;
+        navItem?: boolean;
+        noCaret?: boolean;
+        pullRight?: boolean;
+    }
+    class DropdownButton extends React.Component<DropdownButtonProps, {}> {
+    }
+
+    // <SplitButton />
+    // ----------------------------------------
+    interface SplitButtonProps extends React.HTMLAttributes {
+        bsStyle?: string;
+        bsSize?: string;
+        dropdownTitle?: any; // TODO: Add more specific type
+        dropup?: boolean;
+        pullRight?: boolean;
+    }
+    class SplitButton extends React.Component<SplitButtonProps, {}> {
+    }
+
+    // <MenuItem />
+    // ----------------------------------------
+    interface MenuItemProps extends React.HTMLAttributes {
+        active?: boolean;
+        divider?: boolean;
+        eventKey?: any;
+        header?: boolean;
+    }
+    class MenuItem extends React.Component<MenuItemProps, {}> {
+    }
+
+    // <Panel />
+    // ----------------------------------------
+    interface PanelProps extends React.HTMLAttributes {
+        bsSize?: string;
+        bsStyle?: string;
+        collapsible?: boolean;
+        defaultExpanded?: boolean;
+        eventKey?: any;
+        expanded?: boolean;
+        footer?: any; // TODO: Add more specific type
+        header?: any; // TODO: Add more specific type
+    }
+    type Panel = React.ClassicComponent<PanelProps, {}>;
+    var Panel: React.ClassicComponentClass<PanelProps>;
+
+    // <Accordion />
+    // ----------------------------------------
+    interface AccordionProps extends React.HTMLAttributes {
+        bsSize?: string;
+        bsStyle?: string;
+        collapsible?: boolean;
+        defaultExpanded?: boolean;
+        eventKey?: any;
+        expanded?: boolean;
+        footer?: any; // TODO: Add more specific type
+        header?: any; // TODO: Add more specific type
+    }
+    type Accordion = React.ClassicComponent<AccordionProps, {}>;
+    var Accordion: React.ClassicComponentClass<AccordionProps>;
+
+    // <PanelGroup />
+    // ----------------------------------------
+    interface PanelGroupProps extends React.HTMLAttributes {
+        accordion?: boolean;
+        activeKey?: any;
+        bsSize?: string;
+        bsStyle?: string;
+        defaultActiveKey?: any;
+    }
+    type PanelGroup = React.ClassicComponent<PanelGroupProps, {}>;
+    var PanelGroup: React.ClassicComponentClass<PanelGroupProps>;
+
+    // <Modal.Dialog />
+    // ----------------------------------------
+    interface ModalDialogProps extends React.HTMLAttributes {
+        // TODO: Add more specific type
+    }
+    type ModalDialog = React.ClassicComponent<ModalDialogProps, {}>;
+    var ModalDialog: React.ClassicComponentClass<ModalDialogProps>;
+
+    // <Modal.Header />
+    // ----------------------------------------
+  interface ModalHeaderProps extends React.HTMLAttributes {
+        closeButton?: boolean;
+        modalClassName?: string;
+        onHide?: Function;
+        // undefined?: string;
+    }
+    class ModalHeader extends React.Component<ModalHeaderProps, {}> {
+    }
+
+    // <Modal.Title/>
+    // ----------------------------------------
+    interface ModalTitleProps extends React.HTMLAttributes {
+        modalClassName?: string;
+    }
+    class ModalTitle extends React.Component<ModalTitleProps, {}> {
+    }
+
+    // <Modal.Body />
+    // ----------------------------------------
+    interface ModalBodyProps extends React.HTMLAttributes {
+        modalClassName?: string;
+    }
+    class ModalBody extends React.Component<ModalBodyProps, {}> {
+    }
+
+    // <Modal.Footer />
+    // ----------------------------------------
+    interface ModalFooterProps extends React.HTMLAttributes {
+        modalClassName?: string;
+    }
+    class ModalFooter extends React.Component<ModalFooterProps, {}> {
+    }
+
+    // <Modal />
+    // ----------------------------------------
+    interface ModalProps extends React.HTMLAttributes {
+        // Required
+        onHide: Function;
+
+        // Optional
+        animation?: boolean;
+        backdrop?: boolean|string;
+        bsSize?: string;
+        container?: any; // TODO: Add more specific type
+        dialogClassName?: string;
+        dialogComponent?: any; // TODO: Add more specific type
+        enforceFocus?: boolean;
+        keyboard?: boolean;
+        onEnter?: (node: HTMLElement) => any;
+        onEntered?: (node: HTMLElement) => any;
+        onEntering?: (node: HTMLElement) => any;
+        onExit?: (node: HTMLElement) => any;
+        onExited?: (node: HTMLElement) => any;
+        onExiting?: (node: HTMLElement) => any;
+        show?: boolean;
+    }
+    interface ModalClass extends React.ClassicComponentClass<ModalProps> {
+        Body: typeof ModalBody;
+        Header: typeof ModalHeader;
+        Title: typeof ModalTitle;
+        Footer: typeof ModalFooter;
+        Dialog: typeof ModalDialog;
+    }
+    type Modal = React.ClassicComponent<ModalProps, {}>;
+    var Modal: ModalClass;
+
+
+    // <OverlayTrigger />
+    // ----------------------------------------
+    interface OverlayTriggerProps {
+        // Required
+        overlay: any; // TODO: Add more specific type
+
+        // Optional
+        animation?: any; // TODO: Add more specific type
+        container?: any; // TODO: Add more specific type
+        containerPadding?: number;
+        defaultOverlayShown?: boolean;
+        delay?: number;
+        delayHide?: number;
+        delayShow?: number;
+        onEnter?: Function;
+        onEntered?: Function;
+        onEntering?: Function;
+        onExit?: Function;
+        onExited?: Function;
+        onExiting?: Function;
+        placement?: string;
+        rootClose?: boolean;
+        trigger?: string | string[];
+    }
+    type OverlayTrigger = React.ClassicComponent<OverlayTriggerProps, {}>;
+    var OverlayTrigger: React.ClassicComponentClass<OverlayTriggerProps>;
+
+    // <Tooltip />
+    // ----------------------------------------
+    interface TooltipProps extends React.HTMLAttributes {
+        // Optional
+        arrowOffsetLeft?: number | string;
+        arrowOffsetTop?: number | string;
+        bsSize?: string;
+        bsStyle?: string;
+        placement?: string;
+        positionLeft?: number;
+        positionTop?: number;
+    }
+    type Tooltip = React.ClassicComponent<TooltipProps, {}>;
+    var Tooltip: React.ClassicComponentClass<TooltipProps>;
+
+    // <Popover/>
+    // ----------------------------------------
+    interface PopoverProps  extends React.HTMLAttributes {
+        // Optional
+        arrowOffsetLeft?: number | string;
+        arrowOffsetTop?: number | string;
+        bsSize?: string;
+        bsStyle?: string;
+        placement?: string;
+        positionLeft?: number;
+        positionTop?: number;
+    }
+    type Popover = React.ClassicComponent<PopoverProps, {}>;
+    var Popover: React.ClassicComponentClass<PopoverProps>;
+
+    // <Overlay />
+    // ----------------------------------------
+    interface OverlayProps {
+        // Optional
+        animation?: any; // TODO: Add more specific type
+        container?: any; // TODO: Add more specific type
+        containerPadding?: number; // TODO: Add more specific type
+        onEnter?: Function;
+        onEntered?: Function;
+        onEntering?: Function;
+        onExit?: Function;
+        onExited?: Function;
+        onExiting?: Function;
+        onHide?: Function;
+        placement?: string;
+        rootClose?: boolean;
+        show?: boolean;
+        target?: Function;
+    }
+    class Overlay extends React.Component<OverlayProps, {}> {
+    }
+
+    // <ProgressBar />
+    // ----------------------------------------
+    interface ProgressBarProps extends React.HTMLAttributes {
+        // Optional
+        active?: boolean;
+        bsSize?: string;
+        bsStyle?: string;
+        interpolatedClass?: any; // TODO: Add more specific type
+        max?: number;
+        min?: number;
+        now?: number;
+        srOnly?: boolean;
+        striped?: boolean;
+    }
+    class ProgressBar extends React.Component<ProgressBarProps, {}> {
+    }
+
+    // <Nav />
+    // ----------------------------------------
+    // TODO: This one turned into a union of two different types
+    interface NavProps extends React.HTMLAttributes {
+        // Optional
+        activeHref?: string;
+        activeKey?: any;
+        bsSize?: string;
+        bsStyle?: string;
+        collapsible?: boolean;
+        eventKey?: any;
+        expanded?: boolean;
+        justified?: boolean;
+        navbar?: boolean;
+        pullRight?: boolean;
+        right?: boolean;
+        stacked?: boolean;
+        ulClassName?: string;
+        ulId?: string;
+    }
+    class Nav extends React.Component<NavProps, {}> {
+    }
+
+    // <NavItem />
+    // ----------------------------------------
+    interface NavItemProps extends React.HTMLAttributes {
+        active?: boolean;
+        brand?: any; // TODO: Add more specific type
+        bsSize?: string;
+        bsStyle?: string;
+        componentClass?: any; // TODO: Add more specific type
+        defaultNavExpanded?: boolean;
+        eventKey?: any;
+        fixedBottom?: boolean;
+        fixedTop?: boolean;
+        fluid?: boolean;
+        inverse?: boolean;
+        linkId?: string;
+        navExpanded?: boolean;
+        onToggle?: Function;
+        staticTop?: boolean;
+        toggleButton?: any; // TODO: Add more specific type
+        toggleNavKey?: string | number;
+    }
+    type NavItem = React.ClassicComponent<NavItemProps, {}>;
+    var NavItem: React.ClassicComponentClass<NavItemProps>;
+
+    // <Navbar.Brand />
+    // ----------------------------------------
+    interface NavbarBrandProps extends React.HTMLAttributes {
+    }
+    class NavbarBrand extends React.Component<NavbarBrandProps, {}> {
+    }
+
+    // <Navbar.Collapse />
+    // ----------------------------------------
+    interface NavbarCollapseProps {
+    }
+    type NavbarCollapse = React.ClassicComponent<NavbarCollapseProps, {}>;
+    var NavbarCollapse: React.ClassicComponentClass<NavbarCollapseProps>;
+
+    // <Navbar.Header />
+    // ----------------------------------------
+    interface NavbarHeaderProps extends React.HTMLAttributes {
+    }
+    type NavbarHeader = React.ClassicComponent<NavbarHeaderProps, {}>;
+    var NavbarHeader: React.ClassicComponentClass<NavbarHeaderProps>;
+
+    // <Navbar.Toggle />
+    // ----------------------------------------
+    interface NavbarToggleProps {
+    }
+    type NavbarToggle = React.ClassicComponent<NavbarToggleProps, {}>;
+    var NavbarToggle: React.ClassicComponentClass<NavbarToggleProps>;
+
+    // <Navbar />
+    // ----------------------------------------
+    interface NavbarProps extends React.HTMLAttributes {
+        brand?: any; // TODO: Add more specific type
+        bsSize?: string;
+        bsStyle?: string;
+        componentClass?: any; // TODO: Add more specific type
+        defaultNavExpanded?: boolean;
+        fixedBottom?: boolean;
+        fixedTop?: boolean;
+        fluid?: boolean;
+        inverse?: boolean;
+        navExpanded?: boolean;
+        onToggle?: Function;
+        staticTop?: boolean;
+        toggleButton?: any; // TODO: Add more specific type
+        toggleNavKey?: string | number;
+    }
+    interface NavbarClass extends React.ClassicComponentClass<NavbarProps> {
+        Brand: typeof NavbarBrand;
+        Collapse: typeof NavbarCollapse;
+        Header: typeof NavbarHeader;
+        Toggle: typeof NavbarToggle;
+    }
+    type Navbar = React.ClassicComponent<NavbarProps, {}>;
+    var Navbar: NavbarClass;
+
+    // <NavDropdown />
+    // ----------------------------------------
+    interface NavDropdownProps extends React.HTMLAttributes {
+        eventKey?: any;
+    }
+    class NavDropdown extends React.Component<NavDropdownProps, {}> {
+    }
+
+    // <Tabs />
+    // ----------------------------------------
+    interface TabsProps extends React.HTMLAttributes {
+        activeKey?: any;
+        animation?: boolean;
+        bsStyle?: string;
+        defaultActiveKey?: any;
+        paneWidth?: any; // TODO: Add more specific type
+        position?: string;
+        tabWidth?: any; // TODO: Add more specific type
+    }
+    type Tabs = React.ClassicComponent<TabsProps, {}>;
+    var Tabs: React.ClassicComponentClass<TabsProps>;
+
+    // <Tab />
+    // ----------------------------------------
+    interface TabProps extends React.HTMLAttributes {
+        animation?: boolean;
+        eventKey?: any; // TODO: Add more specific type
+    }
+    type Tab = React.ClassicComponent<TabProps, {}>;
+    var Tab: React.ClassicComponentClass<TabProps>;
+
+    // <Pager />
+    // ----------------------------------------
+    interface PagerProps extends React.HTMLAttributes {
+    }
+    type Pager = React.ClassicComponent<PagerProps, {}>;
+    var Pager: React.ClassicComponentClass<PagerProps>;
+
+    // <PageItem />
+    // ----------------------------------------
+    interface PageItemProps extends React.HTMLAttributes {
+        eventKey?: any;
+        next?: boolean;
+        previous?: boolean;
+    }
+    type PageItem = React.ClassicComponent<PageItemProps, {}>;
+    var PageItem: React.ClassicComponentClass<PageItemProps>;
+
+    // <Pagination />
+    // ----------------------------------------
+    interface PaginationProps extends React.HTMLAttributes {
+        activePage?: number;
+        bsSize?: string;
+        bsStyle?: string;
+        buttonComponentClass?: any; // TODO: Add more specific type
+        ellipsis?: boolean;
+        first?: boolean;
+        items?: number;
+        last?: boolean;
+        maxButtons?: number;
+        next?: boolean;
+        prev?: boolean;
+    }
+    type Pagination = React.ClassicComponent<PaginationProps, {}>;
+    var Pagination: React.ClassicComponentClass<PaginationProps>;
+
+    // <Alert />
+    // ----------------------------------------
+    interface AlertProps extends React.HTMLAttributes {
+        bsSize?: string;
+        bsStyle?: string;
+        closeLabel?: string;
+        dismissAfter?: number;
+        onDismiss?: Function;
+    }
+    type Alert = React.ClassicComponent<AlertProps, {}>;
+    var Alert: React.ClassicComponentClass<AlertProps>;
+
+    // <Carousel />
+    // ----------------------------------------
+    interface CarouselProps extends React.HTMLAttributes {
+        activeIndex?: number;
+        bsSize?: string;
+        bsStyle?: string;
+        controls?: boolean;
+        defaultActiveIndex?: number;
+        direction?: string;
+        indicators?: boolean;
+        interval?: number;
+        nextIcon?: any; // TODO: Add more specific type
+        onSlideEnd?: Function;
+        pauseOnHover?: boolean;
+        prevIcon?: any; // TODO: Add more specific type
+        slide?: boolean;
+    }
+    type Carousel = React.ClassicComponent<CarouselProps, {}>;
+    var Carousel: React.ClassicComponentClass<CarouselProps>;
+
+    // <CarouselItem />
+    // ----------------------------------------
+    interface CarouselItemProps extends React.HTMLAttributes {
+        active?: boolean;
+        animtateIn?: boolean;
+        animateOut?: boolean;
+        caption?: any; // TODO: Add more specific type
+        direction?: string;
+        index?: number;
+        onAnimateOutEnd?: Function;
+    }
+    type CarouselItem = React.ClassicComponent<CarouselItemProps, {}>;
+    var CarouselItem: React.ClassicComponentClass<CarouselItemProps>;
+
+    // <Grid />
+    // ----------------------------------------
+    interface GridProps extends React.HTMLAttributes {
+        componentClass?: any; // TODO: Add more specific type
+        fluid?: boolean;
+    }
+    type Grid = React.ClassicComponent<GridProps, {}>;
+    var Grid: React.ClassicComponentClass<GridProps>;
+
+    // <Row />
+    // ----------------------------------------
+    interface RowProps extends React.HTMLAttributes {
+        componentClass?: any; // TODO: Add more specific type
+    }
+    type Row = React.ClassicComponent<RowProps, {}>;
+    var Row: React.ClassicComponentClass<RowProps>;
+
+    // <Col />
+    // ----------------------------------------
+    interface ColProps extends React.HTMLAttributes {
+        componentClass?: any; // TODO: Add more specific type
+        lg?: number;
+        lgHidden?: boolean;
+        lgOffset?: number;
+        lgPull?: number;
+        lgPush?: number;
+        md?: number;
+        mdHidden?: boolean;
+        mdOffset?: number;
+        mdPull?: number;
+        mdPush?: number;
+        sm?: number;
+        smHidden?: boolean;
+        smOffset?: number;
+        smPull?: number;
+        smPush?: number;
+        xs?: number;
+        xsHidden?: boolean;
+        xsOffset?: number;
+        xsPull?: number;
+        xsPush?: number;
+    }
+    type Col = React.ClassicComponent<ColProps, {}>;
+    var Col: React.ClassicComponentClass<ColProps>;
+
+    // <Thumbnail />
+    // ----------------------------------------
+    interface ThumbnailProps extends React.HTMLAttributes {
+        bsSize?: string;
+        bsStyle?: string;
+    }
+    type Thumbnail = React.ClassicComponent<ThumbnailProps, {}>;
+    var Thumbnail: React.ClassicComponentClass<ThumbnailProps>;
+
+    // <ListGroup />
+    // ----------------------------------------
+    interface ListGroupProps extends React.HTMLAttributes {
+        fill?: boolean; // TODO: Add more specific type
+    }
+    class ListGroup extends React.Component<ListGroupProps, {}> {
+    }
+
+    // <ListGroupItem />
+    // ----------------------------------------
+    interface ListGroupItemProps extends React.HTMLAttributes {
+        active?: any;
+        bsSize?: string;
+        bsStyle?: string;
+        eventKey?: any;
+        header?: any; // TODO: Add more specific type
+        key?: any; // TODO: Add more specific type
+        listItem?: boolean;
+    }
+    class ListGroupItem extends React.Component<ListGroupItemProps, {}> {
+    }
+
+    // <Label />
+    // ----------------------------------------
+    interface LabelProps extends React.HTMLAttributes {
+        bsSize?: string;
+        bsStyle?: string;
+    }
+    class Label extends React.Component<LabelProps, {}> {
+    }
+
+    // <Badge />
+    // ----------------------------------------
+    interface BadgeProps extends React.HTMLAttributes {
+        pullRight?: boolean;
+    }
+    type Badge = React.ClassicComponent<BadgeProps, {}>;
+    var Badge: React.ClassicComponentClass<BadgeProps>;
+
+    // <Jumbotron />
+    // ----------------------------------------
+    interface JumbotronProps extends React.HTMLAttributes {
+        componentClass?: any; // TODO: Add more specific type
+    }
+    type Jumbotron = React.ClassicComponent<JumbotronProps, {}>;
+    var Jumbotron: React.ClassicComponentClass<JumbotronProps>;
+
+    // <PageHeader />
+    // ----------------------------------------
+    interface PageHeaderProps extends React.HTMLAttributes {
+    }
+    class PageHeader extends React.Component<PageHeaderProps, {}> {
+    }
+
+    // <Well />
+    // ----------------------------------------
+    interface WellProps extends React.HTMLAttributes {
+        bsSize?: string;
+        bsStyle?: string;
+    }
+    class Well extends React.Component<WellProps, {}> {
+    }
+
+    // <Glyphicon />
+    // ----------------------------------------
+    interface GlyphiconProps extends React.HTMLAttributes {
+        // Required
+        glyph: string;
+    }
+    type Glyphicon = React.ClassicComponent<GlyphiconProps, {}>;
+    var Glyphicon: React.ClassicComponentClass<GlyphiconProps>;
+
+    // <Table />
+    // ----------------------------------------
+    interface TableProps extends React.HTMLAttributes {
+        bordered?: boolean;
+        condensed?: boolean;
+        hover?: boolean;
+        responsive?: boolean;
+        striped?: boolean;
+    }
+    type Table = React.ClassicComponent<TableProps, {}>;
+    var Table: React.ClassicComponentClass<TableProps>;
+
+    // <Input />
+    // ----------------------------------------
+    interface InputProps extends React.HTMLAttributes {
+        defaultValue?:string;
+        addonAfter?: any; // TODO: Add more specific type
+        addonBefore?: any; // TODO: Add more specific type
+        bsSize?: string;
+        bsStyle?: string;
+        buttonAfter?: any; // TODO: Add more specific type
+        buttonBefore?: any; // TODO: Add more specific type
+        feedbackIcon?: any; // TODO: Add more specific type
+        groupClassName?: string;
+        hasFeedback?: boolean;
+        help?: any; // TODO: Add more specific type
+        labelClassName?: string;
+        wrapperClassName?: string;
+    }
+    // TODO: extends InputBase
+    class Input extends React.Component<InputProps, {}> {
+    }
+
+    // <ButtonInput />
+    // ----------------------------------------
+    interface ButtonInputProps extends React.HTMLAttributes {
+        addonAfter?: any; // TODO: Add more specific type
+        addonBefore?: any; // TODO: Add more specific type
+        bsSize?: string;
+        bsStyle?: string;
+        buttonAfter?: any; // TODO: Add more specific type
+        buttonBefore?: any; // TODO: Add more specific type
+        feedbackIcon?: any; // TODO: Add more specific type
+        groupClassName?: string;
+        hasFeedback?: boolean;
+        help?: any; // TODO: Add more specific type
+        labelClassName?: string;
+        wrapperClassName?: string;
+    }
+    // TODO: extends InputBase
+    class ButtonInput extends React.Component<ButtonInputProps, {}> {
+    }
+
+
+    // <FormControls.Static />
+    // ----------------------------------------
+
+    interface StaticProps extends React.HTMLAttributes {}
+    interface Static extends React.ReactElement<StaticProps> { }
+    interface StaticClass extends React.ComponentClass<StaticProps> { }
+    interface FormControlsClass {
+      Static: StaticClass;
+    }
+    var FormControls: FormControlsClass;
+
+
+    // <Portal />
+    // ----------------------------------------
+    interface PortalProps {
+        dimension?: string | Function;
+        getDimensionValue?: Function;
+        in?: boolean;
+        onEnter?: Function;
+        onEntered?: Function;
+        onEntering?: Function;
+        onExit?: Function;
+        onExited?: Function;
+        onExiting?: Function;
+        role?: string;
+        timeout?: number;
+        transitionAppear?: boolean;
+        unmountOnExit?: boolean;
+    }
+    type Portal = React.ClassicComponent<PortalProps, {}>;
+    var Portal: React.ClassicComponentClass<PortalProps>;
+
+    // <Position />
+    // ----------------------------------------
+    interface PositionProps {
+        dimension?: string | Function;
+        getDimensionValue?: Function;
+        in?: boolean;
+        onEnter?: Function;
+        onEntered?: Function;
+        onEntering?: Function;
+        onExit?: Function;
+        onExited?: Function;
+        onExiting?: Function;
+        role?: string;
+        timeout?: number;
+        transitionAppear?: boolean;
+        unmountOnExit?: boolean;
+    }
+    class Position extends React.Component<PositionProps, {}> {
+    }
+
+    // <Fade />
+    // ----------------------------------------
+    interface FadeProps {
+        in?: boolean;
+        onEnter?: Function;
+        onEntered?: Function;
+        onEntering?: Function;
+        onExit?: Function;
+        onExited?: Function;
+        onExiting?: Function;
+        timeout?: number;
+        transitionAppear?: boolean;
+        unmountOnExit?: boolean;
+    }
+    class Fade extends React.Component<FadeProps, {}> {
+    }
+}
diff --git a/react-bootstrap/react-bootstrap-tests.tsx b/react-bootstrap/react-bootstrap-tests.tsx
index 4198e62320..e10d6754a2 100644
--- a/react-bootstrap/react-bootstrap-tests.tsx
+++ b/react-bootstrap/react-bootstrap-tests.tsx
@@ -1,7 +1,6 @@
 // React-Bootstrap Test
 // ================================================================================
-///<reference path="react-bootstrap.d.ts"/>
-///<reference path="../react/react.d.ts"/>
+///<reference types="react"/>
 
 // Imports
 // --------------------------------------------------------------------------------
@@ -281,7 +280,7 @@ export class ReactBootstrapTest extends Component<any, any> {
 
                 <div style={style}>
                   <div className='static-modal'>
-                    <Modal.Dialog>
+                    <Modal.Dialog onHide={this.callback} onEnter={this.callback} onEntered={this.callback} onEntering={this.callback} onExit={this.callback} onExited={this.callback} onExiting={this.callback}>
                       <Modal.Header>
                         <Modal.Title>Modal title</Modal.Title>
                       </Modal.Header>
diff --git a/react-bootstrap/react-bootstrap.d.ts b/react-bootstrap/react-bootstrap.d.ts
deleted file mode 100644
index e64f831de5..0000000000
--- a/react-bootstrap/react-bootstrap.d.ts
+++ /dev/null
@@ -1,764 +0,0 @@
-// Type definitions for react-bootstrap
-// Project: https://github.com/react-bootstrap/react-bootstrap
-// Definitions by: Walker Burgin <https://github.com/walkerburgin>, Vincent Siao <https://github.com/vsiao>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../react/react.d.ts"/>
-
-declare module "react-bootstrap" {
-    // Import React
-    import React = require("react");
-
-
-    // <Button />
-    // ----------------------------------------
-    interface ButtonProps extends React.HTMLAttributes {
-
-        // Optional
-        active?: boolean;
-        block?: boolean;
-        bsStyle?: string;
-        bsSize?: string;
-        navItem?: boolean;
-        navDropdown?: boolean;
-        componentClass?: string;
-    }
-    type Button = React.ClassicComponent<ButtonProps, {}>;
-    var Button: React.ClassicComponentClass<ButtonProps>;
-
-    // <ButtonToolbar />
-    // ----------------------------------------
-    interface ButtonToolbarProps extends React.HTMLAttributes {
-
-        // Optional
-        block?: boolean;
-        bsSize?: string;
-        bsStyle?: string;
-        justified?: boolean;
-        vertical?: boolean;
-    }
-    type ButtonToolbar = React.ClassicComponent<ButtonToolbarProps, {}>;
-    var ButtonToolbar: React.ClassicComponentClass<ButtonToolbarProps>;
-
-    // <ButtonGroup />
-    // ----------------------------------------
-    interface ButtonGroupProps extends React.HTMLAttributes {
-        // Optional
-        block?: boolean;
-        bsSize?: string;
-        bsStyle?: string;
-        justified?: boolean;
-        vertical?: boolean;
-    }
-    type ButtonGroup = React.ClassicComponent<ButtonGroupProps, {}>;
-    var ButtonGroup: React.ClassicComponentClass<ButtonGroupProps>;
-
-    // <DropdownButton />
-    // ----------------------------------------
-    interface DropdownButtonProps extends React.HTMLAttributes {
-        bsStyle?: string;
-        bsSize?: string;
-        buttonClassName?: string;
-        dropup?: boolean;
-        navItem?: boolean;
-        noCaret?: boolean;
-        pullRight?: boolean;
-    }
-    class DropdownButton extends React.Component<DropdownButtonProps, {}> {
-    }
-
-    // <SplitButton />
-    // ----------------------------------------
-    interface SplitButtonProps extends React.HTMLAttributes {
-        bsStyle?: string;
-        bsSize?: string;
-        dropdownTitle?: any; // TODO: Add more specific type
-        dropup?: boolean;
-        pullRight?: boolean;
-    }
-    class SplitButton extends React.Component<SplitButtonProps, {}> {
-    }
-
-    // <MenuItem />
-    // ----------------------------------------
-    interface MenuItemProps extends React.HTMLAttributes {
-        active?: boolean;
-        divider?: boolean;
-        eventKey?: any;
-        header?: boolean;
-    }
-    class MenuItem extends React.Component<MenuItemProps, {}> {
-    }
-
-    // <Panel />
-    // ----------------------------------------
-    interface PanelProps extends React.HTMLAttributes {
-        bsSize?: string;
-        bsStyle?: string;
-        collapsible?: boolean;
-        defaultExpanded?: boolean;
-        eventKey?: any;
-        expanded?: boolean;
-        footer?: any; // TODO: Add more specific type
-        header?: any; // TODO: Add more specific type
-    }
-    type Panel = React.ClassicComponent<PanelProps, {}>;
-    var Panel: React.ClassicComponentClass<PanelProps>;
-
-    // <Accordion />
-    // ----------------------------------------
-    interface AccordionProps extends React.HTMLAttributes {
-        bsSize?: string;
-        bsStyle?: string;
-        collapsible?: boolean;
-        defaultExpanded?: boolean;
-        eventKey?: any;
-        expanded?: boolean;
-        footer?: any; // TODO: Add more specific type
-        header?: any; // TODO: Add more specific type
-    }
-    type Accordion = React.ClassicComponent<AccordionProps, {}>;
-    var Accordion: React.ClassicComponentClass<AccordionProps>;
-
-    // <PanelGroup />
-    // ----------------------------------------
-    interface PanelGroupProps extends React.HTMLAttributes {
-        accordion?: boolean;
-        activeKey?: any;
-        bsSize?: string;
-        bsStyle?: string;
-        defaultActiveKey?: any;
-    }
-    type PanelGroup = React.ClassicComponent<PanelGroupProps, {}>;
-    var PanelGroup: React.ClassicComponentClass<PanelGroupProps>;
-
-    // <Modal.Dialog />
-    // ----------------------------------------
-    interface ModalDialogProps extends React.HTMLAttributes {
-        // TODO: Add more specific type
-    }
-    type ModalDialog = React.ClassicComponent<ModalDialogProps, {}>;
-    var ModalDialog: React.ClassicComponentClass<ModalDialogProps>;
-
-    // <Modal.Header />
-    // ----------------------------------------
-  interface ModalHeaderProps extends React.HTMLAttributes {
-        closeButton?: boolean;
-        modalClassName?: string;
-        onHide?: Function;
-        // undefined?: string;
-    }
-    class ModalHeader extends React.Component<ModalHeaderProps, {}> {
-    }
-
-    // <Modal.Title/>
-    // ----------------------------------------
-    interface ModalTitleProps extends React.HTMLAttributes {
-        modalClassName?: string;
-    }
-    class ModalTitle extends React.Component<ModalTitleProps, {}> {
-    }
-
-    // <Modal.Body />
-    // ----------------------------------------
-    interface ModalBodyProps extends React.HTMLAttributes {
-        modalClassName?: string;
-    }
-    class ModalBody extends React.Component<ModalBodyProps, {}> {
-    }
-
-    // <Modal.Footer />
-    // ----------------------------------------
-    interface ModalFooterProps extends React.HTMLAttributes {
-        modalClassName?: string;
-    }
-    class ModalFooter extends React.Component<ModalFooterProps, {}> {
-    }
-
-    // <Modal />
-    // ----------------------------------------
-    interface ModalProps extends React.HTMLAttributes {
-        // Required
-        onHide: Function;
-
-        // Optional
-        animation?: boolean;
-        backdrop?: boolean|string;
-        bsSize?: string;
-        container?: any; // TODO: Add more specific type
-        dialogClassName?: string;
-        dialogComponent?: any; // TODO: Add more specific type
-        enforceFocus?: boolean;
-        keyboard?: boolean;
-        show?: boolean;
-    }
-    interface ModalClass extends React.ClassicComponentClass<ModalProps> {
-        Body: typeof ModalBody;
-        Header: typeof ModalHeader;
-        Title: typeof ModalTitle;
-        Footer: typeof ModalFooter;
-        Dialog: typeof ModalDialog;
-    }
-    type Modal = React.ClassicComponent<ModalProps, {}>;
-    var Modal: ModalClass;
-
-
-    // <OverlayTrigger />
-    // ----------------------------------------
-    interface OverlayTriggerProps {
-        // Required
-        overlay: any; // TODO: Add more specific type
-
-        // Optional
-        animation?: any; // TODO: Add more specific type
-        container?: any; // TODO: Add more specific type
-        containerPadding?: number;
-        defaultOverlayShown?: boolean;
-        delay?: number;
-        delayHide?: number;
-        delayShow?: number;
-        onEnter?: Function;
-        onEntered?: Function;
-        onEntering?: Function;
-        onExit?: Function;
-        onExited?: Function;
-        onExiting?: Function;
-        placement?: string;
-        rootClose?: boolean;
-        trigger?: string | string[];
-    }
-    type OverlayTrigger = React.ClassicComponent<OverlayTriggerProps, {}>;
-    var OverlayTrigger: React.ClassicComponentClass<OverlayTriggerProps>;
-
-    // <Tooltip />
-    // ----------------------------------------
-    interface TooltipProps extends React.HTMLAttributes {
-        // Optional
-        arrowOffsetLeft?: number | string;
-        arrowOffsetTop?: number | string;
-        bsSize?: string;
-        bsStyle?: string;
-        placement?: string;
-        positionLeft?: number;
-        positionTop?: number;
-    }
-    type Tooltip = React.ClassicComponent<TooltipProps, {}>;
-    var Tooltip: React.ClassicComponentClass<TooltipProps>;
-
-    // <Popover/>
-    // ----------------------------------------
-    interface PopoverProps  extends React.HTMLAttributes {
-        // Optional
-        arrowOffsetLeft?: number | string;
-        arrowOffsetTop?: number | string;
-        bsSize?: string;
-        bsStyle?: string;
-        placement?: string;
-        positionLeft?: number;
-        positionTop?: number;
-    }
-    type Popover = React.ClassicComponent<PopoverProps, {}>;
-    var Popover: React.ClassicComponentClass<PopoverProps>;
-
-    // <Overlay />
-    // ----------------------------------------
-    interface OverlayProps {
-        // Optional
-        animation?: any; // TODO: Add more specific type
-        container?: any; // TODO: Add more specific type
-        containerPadding?: number; // TODO: Add more specific type
-        onEnter?: Function;
-        onEntered?: Function;
-        onEntering?: Function;
-        onExit?: Function;
-        onExited?: Function;
-        onExiting?: Function;
-        onHide?: Function;
-        placement?: string;
-        rootClose?: boolean;
-        show?: boolean;
-        target?: Function;
-    }
-    class Overlay extends React.Component<OverlayProps, {}> {
-    }
-
-    // <ProgressBar />
-    // ----------------------------------------
-    interface ProgressBarProps extends React.HTMLAttributes {
-        // Optional
-        active?: boolean;
-        bsSize?: string;
-        bsStyle?: string;
-        interpolatedClass?: any; // TODO: Add more specific type
-        max?: number;
-        min?: number;
-        now?: number;
-        srOnly?: boolean;
-        striped?: boolean;
-    }
-    class ProgressBar extends React.Component<ProgressBarProps, {}> {
-    }
-
-    // <Nav />
-    // ----------------------------------------
-    // TODO: This one turned into a union of two different types
-    interface NavProps extends React.HTMLAttributes {
-        // Optional
-        activeHref?: string;
-        activeKey?: any;
-        bsSize?: string;
-        bsStyle?: string;
-        collapsible?: boolean;
-        eventKey?: any;
-        expanded?: boolean;
-        justified?: boolean;
-        navbar?: boolean;
-        pullRight?: boolean;
-        right?: boolean;
-        stacked?: boolean;
-        ulClassName?: string;
-        ulId?: string;
-    }
-    class Nav extends React.Component<NavProps, {}> {
-    }
-
-    // <NavItem />
-    // ----------------------------------------
-    interface NavItemProps extends React.HTMLAttributes {
-        active?: boolean;
-        brand?: any; // TODO: Add more specific type
-        bsSize?: string;
-        bsStyle?: string;
-        componentClass?: any; // TODO: Add more specific type
-        defaultNavExpanded?: boolean;
-        eventKey?: any;
-        fixedBottom?: boolean;
-        fixedTop?: boolean;
-        fluid?: boolean;
-        inverse?: boolean;
-        linkId?: string;
-        navExpanded?: boolean;
-        onToggle?: Function;
-        staticTop?: boolean;
-        toggleButton?: any; // TODO: Add more specific type
-        toggleNavKey?: string | number;
-    }
-    type NavItem = React.ClassicComponent<NavItemProps, {}>;
-    var NavItem: React.ClassicComponentClass<NavItemProps>;
-
-    // <Navbar.Brand />
-    // ----------------------------------------
-    interface NavbarBrandProps extends React.HTMLAttributes {
-    }
-    class NavbarBrand extends React.Component<NavbarBrandProps, {}> {
-    }
-
-    // <Navbar.Collapse />
-    // ----------------------------------------
-    interface NavbarCollapseProps {
-    }
-    type NavbarCollapse = React.ClassicComponent<NavbarCollapseProps, {}>;
-    var NavbarCollapse: React.ClassicComponentClass<NavbarCollapseProps>;
-
-    // <Navbar.Header />
-    // ----------------------------------------
-    interface NavbarHeaderProps extends React.HTMLAttributes {
-    }
-    type NavbarHeader = React.ClassicComponent<NavbarHeaderProps, {}>;
-    var NavbarHeader: React.ClassicComponentClass<NavbarHeaderProps>;
-
-    // <Navbar.Toggle />
-    // ----------------------------------------
-    interface NavbarToggleProps {
-    }
-    type NavbarToggle = React.ClassicComponent<NavbarToggleProps, {}>;
-    var NavbarToggle: React.ClassicComponentClass<NavbarToggleProps>;
-
-    // <Navbar />
-    // ----------------------------------------
-    interface NavbarProps extends React.HTMLAttributes {
-        brand?: any; // TODO: Add more specific type
-        bsSize?: string;
-        bsStyle?: string;
-        componentClass?: any; // TODO: Add more specific type
-        defaultNavExpanded?: boolean;
-        fixedBottom?: boolean;
-        fixedTop?: boolean;
-        fluid?: boolean;
-        inverse?: boolean;
-        navExpanded?: boolean;
-        onToggle?: Function;
-        staticTop?: boolean;
-        toggleButton?: any; // TODO: Add more specific type
-        toggleNavKey?: string | number;
-    }
-    interface NavbarClass extends React.ClassicComponentClass<NavbarProps> {
-        Brand: typeof NavbarBrand;
-        Collapse: typeof NavbarCollapse;
-        Header: typeof NavbarHeader;
-        Toggle: typeof NavbarToggle;
-    }
-    type Navbar = React.ClassicComponent<NavbarProps, {}>;
-    var Navbar: NavbarClass;
-
-    // <NavDropdown />
-    // ----------------------------------------
-    interface NavDropdownProps extends React.HTMLAttributes {
-        eventKey?: any;
-    }
-    class NavDropdown extends React.Component<NavDropdownProps, {}> {
-    }
-
-    // <Tabs />
-    // ----------------------------------------
-    interface TabsProps extends React.HTMLAttributes {
-        activeKey?: any;
-        animation?: boolean;
-        bsStyle?: string;
-        defaultActiveKey?: any;
-        paneWidth?: any; // TODO: Add more specific type
-        position?: string;
-        tabWidth?: any; // TODO: Add more specific type
-    }
-    type Tabs = React.ClassicComponent<TabsProps, {}>;
-    var Tabs: React.ClassicComponentClass<TabsProps>;
-
-    // <Tab />
-    // ----------------------------------------
-    interface TabProps extends React.HTMLAttributes {
-        animation?: boolean;
-        eventKey?: any; // TODO: Add more specific type
-    }
-    type Tab = React.ClassicComponent<TabProps, {}>;
-    var Tab: React.ClassicComponentClass<TabProps>;
-
-    // <Pager />
-    // ----------------------------------------
-    interface PagerProps extends React.HTMLAttributes {
-    }
-    type Pager = React.ClassicComponent<PagerProps, {}>;
-    var Pager: React.ClassicComponentClass<PagerProps>;
-
-    // <PageItem />
-    // ----------------------------------------
-    interface PageItemProps extends React.HTMLAttributes {
-        eventKey?: any;
-        next?: boolean;
-        previous?: boolean;
-    }
-    type PageItem = React.ClassicComponent<PageItemProps, {}>;
-    var PageItem: React.ClassicComponentClass<PageItemProps>;
-
-    // <Pagination />
-    // ----------------------------------------
-    interface PaginationProps extends React.HTMLAttributes {
-        activePage?: number;
-        bsSize?: string;
-        bsStyle?: string;
-        buttonComponentClass?: any; // TODO: Add more specific type
-        ellipsis?: boolean;
-        first?: boolean;
-        items?: number;
-        last?: boolean;
-        maxButtons?: number;
-        next?: boolean;
-        prev?: boolean;
-    }
-    type Pagination = React.ClassicComponent<PaginationProps, {}>;
-    var Pagination: React.ClassicComponentClass<PaginationProps>;
-
-    // <Alert />
-    // ----------------------------------------
-    interface AlertProps extends React.HTMLAttributes {
-        bsSize?: string;
-        bsStyle?: string;
-        closeLabel?: string;
-        dismissAfter?: number;
-        onDismiss?: Function;
-    }
-    type Alert = React.ClassicComponent<AlertProps, {}>;
-    var Alert: React.ClassicComponentClass<AlertProps>;
-
-    // <Carousel />
-    // ----------------------------------------
-    interface CarouselProps extends React.HTMLAttributes {
-        activeIndex?: number;
-        bsSize?: string;
-        bsStyle?: string;
-        controls?: boolean;
-        defaultActiveIndex?: number;
-        direction?: string;
-        indicators?: boolean;
-        interval?: number;
-        nextIcon?: any; // TODO: Add more specific type
-        onSlideEnd?: Function;
-        pauseOnHover?: boolean;
-        prevIcon?: any; // TODO: Add more specific type
-        slide?: boolean;
-    }
-    type Carousel = React.ClassicComponent<CarouselProps, {}>;
-    var Carousel: React.ClassicComponentClass<CarouselProps>;
-
-    // <CarouselItem />
-    // ----------------------------------------
-    interface CarouselItemProps extends React.HTMLAttributes {
-        active?: boolean;
-        animtateIn?: boolean;
-        animateOut?: boolean;
-        caption?: any; // TODO: Add more specific type
-        direction?: string;
-        index?: number;
-        onAnimateOutEnd?: Function;
-    }
-    type CarouselItem = React.ClassicComponent<CarouselItemProps, {}>;
-    var CarouselItem: React.ClassicComponentClass<CarouselItemProps>;
-
-    // <Grid />
-    // ----------------------------------------
-    interface GridProps extends React.HTMLAttributes {
-        componentClass?: any; // TODO: Add more specific type
-        fluid?: boolean;
-    }
-    type Grid = React.ClassicComponent<GridProps, {}>;
-    var Grid: React.ClassicComponentClass<GridProps>;
-
-    // <Row />
-    // ----------------------------------------
-    interface RowProps extends React.HTMLAttributes {
-        componentClass?: any; // TODO: Add more specific type
-    }
-    type Row = React.ClassicComponent<RowProps, {}>;
-    var Row: React.ClassicComponentClass<RowProps>;
-
-    // <Col />
-    // ----------------------------------------
-    interface ColProps extends React.HTMLAttributes {
-        componentClass?: any; // TODO: Add more specific type
-        lg?: number;
-        lgHidden?: boolean;
-        lgOffset?: number;
-        lgPull?: number;
-        lgPush?: number;
-        md?: number;
-        mdHidden?: boolean;
-        mdOffset?: number;
-        mdPull?: number;
-        mdPush?: number;
-        sm?: number;
-        smHidden?: boolean;
-        smOffset?: number;
-        smPull?: number;
-        smPush?: number;
-        xs?: number;
-        xsHidden?: boolean;
-        xsOffset?: number;
-        xsPull?: number;
-        xsPush?: number;
-    }
-    type Col = React.ClassicComponent<ColProps, {}>;
-    var Col: React.ClassicComponentClass<ColProps>;
-
-    // <Thumbnail />
-    // ----------------------------------------
-    interface ThumbnailProps extends React.HTMLAttributes {
-        bsSize?: string;
-        bsStyle?: string;
-    }
-    type Thumbnail = React.ClassicComponent<ThumbnailProps, {}>;
-    var Thumbnail: React.ClassicComponentClass<ThumbnailProps>;
-
-    // <ListGroup />
-    // ----------------------------------------
-    interface ListGroupProps extends React.HTMLAttributes {
-        fill?: boolean; // TODO: Add more specific type
-    }
-    class ListGroup extends React.Component<ListGroupProps, {}> {
-    }
-
-    // <ListGroupItem />
-    // ----------------------------------------
-    interface ListGroupItemProps extends React.HTMLAttributes {
-        active?: any;
-        bsSize?: string;
-        bsStyle?: string;
-        eventKey?: any;
-        header?: any; // TODO: Add more specific type
-        key?: any; // TODO: Add more specific type
-        listItem?: boolean;
-    }
-    class ListGroupItem extends React.Component<ListGroupItemProps, {}> {
-    }
-
-    // <Label />
-    // ----------------------------------------
-    interface LabelProps extends React.HTMLAttributes {
-        bsSize?: string;
-        bsStyle?: string;
-    }
-    class Label extends React.Component<LabelProps, {}> {
-    }
-
-    // <Badge />
-    // ----------------------------------------
-    interface BadgeProps extends React.HTMLAttributes {
-        pullRight?: boolean;
-    }
-    type Badge = React.ClassicComponent<BadgeProps, {}>;
-    var Badge: React.ClassicComponentClass<BadgeProps>;
-
-    // <Jumbotron />
-    // ----------------------------------------
-    interface JumbotronProps extends React.HTMLAttributes {
-        componentClass?: any; // TODO: Add more specific type
-    }
-    type Jumbotron = React.ClassicComponent<JumbotronProps, {}>;
-    var Jumbotron: React.ClassicComponentClass<JumbotronProps>;
-
-    // <PageHeader />
-    // ----------------------------------------
-    interface PageHeaderProps extends React.HTMLAttributes {
-    }
-    class PageHeader extends React.Component<PageHeaderProps, {}> {
-    }
-
-    // <Well />
-    // ----------------------------------------
-    interface WellProps extends React.HTMLAttributes {
-        bsSize?: string;
-        bsStyle?: string;
-    }
-    class Well extends React.Component<WellProps, {}> {
-    }
-
-    // <Glyphicon />
-    // ----------------------------------------
-    interface GlyphiconProps extends React.HTMLAttributes {
-        // Required
-        glyph: string;
-    }
-    type Glyphicon = React.ClassicComponent<GlyphiconProps, {}>;
-    var Glyphicon: React.ClassicComponentClass<GlyphiconProps>;
-
-    // <Table />
-    // ----------------------------------------
-    interface TableProps extends React.HTMLAttributes {
-        bordered?: boolean;
-        condensed?: boolean;
-        hover?: boolean;
-        responsive?: boolean;
-        striped?: boolean;
-    }
-    type Table = React.ClassicComponent<TableProps, {}>;
-    var Table: React.ClassicComponentClass<TableProps>;
-
-    // <Input />
-    // ----------------------------------------
-    interface InputProps extends React.HTMLAttributes {
-        defaultValue?:string;
-        addonAfter?: any; // TODO: Add more specific type
-        addonBefore?: any; // TODO: Add more specific type
-        bsSize?: string;
-        bsStyle?: string;
-        buttonAfter?: any; // TODO: Add more specific type
-        buttonBefore?: any; // TODO: Add more specific type
-        feedbackIcon?: any; // TODO: Add more specific type
-        groupClassName?: string;
-        hasFeedback?: boolean;
-        help?: any; // TODO: Add more specific type
-        labelClassName?: string;
-        wrapperClassName?: string;
-    }
-    // TODO: extends InputBase
-    class Input extends React.Component<InputProps, {}> {
-    }
-
-    // <ButtonInput />
-    // ----------------------------------------
-    interface ButtonInputProps extends React.HTMLAttributes {
-        addonAfter?: any; // TODO: Add more specific type
-        addonBefore?: any; // TODO: Add more specific type
-        bsSize?: string;
-        bsStyle?: string;
-        buttonAfter?: any; // TODO: Add more specific type
-        buttonBefore?: any; // TODO: Add more specific type
-        feedbackIcon?: any; // TODO: Add more specific type
-        groupClassName?: string;
-        hasFeedback?: boolean;
-        help?: any; // TODO: Add more specific type
-        labelClassName?: string;
-        wrapperClassName?: string;
-    }
-    // TODO: extends InputBase
-    class ButtonInput extends React.Component<ButtonInputProps, {}> {
-    }
-
-
-    // <FormControls.Static />
-    // ----------------------------------------
-
-    interface StaticProps extends React.HTMLAttributes {}
-    interface Static extends React.ReactElement<StaticProps> { }
-    interface StaticClass extends React.ComponentClass<StaticProps> { }
-    interface FormControlsClass {
-      Static: StaticClass;
-    }
-    var FormControls: FormControlsClass;
-
-
-    // <Portal />
-    // ----------------------------------------
-    interface PortalProps {
-        dimension?: string | Function;
-        getDimensionValue?: Function;
-        in?: boolean;
-        onEnter?: Function;
-        onEntered?: Function;
-        onEntering?: Function;
-        onExit?: Function;
-        onExited?: Function;
-        onExiting?: Function;
-        role?: string;
-        timeout?: number;
-        transitionAppear?: boolean;
-        unmountOnExit?: boolean;
-    }
-    type Portal = React.ClassicComponent<PortalProps, {}>;
-    var Portal: React.ClassicComponentClass<PortalProps>;
-
-    // <Position />
-    // ----------------------------------------
-    interface PositionProps {
-        dimension?: string | Function;
-        getDimensionValue?: Function;
-        in?: boolean;
-        onEnter?: Function;
-        onEntered?: Function;
-        onEntering?: Function;
-        onExit?: Function;
-        onExited?: Function;
-        onExiting?: Function;
-        role?: string;
-        timeout?: number;
-        transitionAppear?: boolean;
-        unmountOnExit?: boolean;
-    }
-    class Position extends React.Component<PositionProps, {}> {
-    }
-
-    // <Fade />
-    // ----------------------------------------
-    interface FadeProps {
-        in?: boolean;
-        onEnter?: Function;
-        onEntered?: Function;
-        onEntering?: Function;
-        onExit?: Function;
-        onExited?: Function;
-        onExiting?: Function;
-        timeout?: number;
-        transitionAppear?: boolean;
-        unmountOnExit?: boolean;
-    }
-    class Fade extends React.Component<FadeProps, {}> {
-    }
-}
diff --git a/react-bootstrap/tsconfig.json b/react-bootstrap/tsconfig.json
new file mode 100644
index 0000000000..9ca42d8d33
--- /dev/null
+++ b/react-bootstrap/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-bootstrap-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/react-cropper/index.d.ts b/react-cropper/index.d.ts
new file mode 100644
index 0000000000..86484b962e
--- /dev/null
+++ b/react-cropper/index.d.ts
@@ -0,0 +1,152 @@
+// Type definitions for react-cropper
+// Project: https://github.com/roadmanfong/react-cropper
+// Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react"/>
+/// <reference types="cropperjs"/>
+
+
+import Data = cropperjs.Data;
+import ContainerData = cropperjs.ContainerData;
+import ImageData = cropperjs.ImageData;
+import CanvasData = cropperjs.CanvasData;
+import CropBoxData = cropperjs.CropBoxData;
+import CroppedCanvasOptions = cropperjs.CroppedCanvasOptions;
+type ReactCropperProps = cropperjs.CropperOptions & React.HTMLProps<HTMLImageElement>;
+
+declare class ReactCropper extends React.Component<ReactCropperProps, {}> implements cropperjs.Cropper {
+
+    /**
+     * Show the crop box manually.
+     */
+    crop(): void;
+
+    /**
+    * Clear the crop box.
+    */
+    reset(): void;
+
+    /**
+    * Replace the image's src and rebuild the cropper.
+    * @param url A new image url
+    */
+    replace(url: string): void;
+
+    /**
+    * Enable (unfreeze) the cropper.
+    */
+    enable(): void;
+
+    /**
+    * Disable (freeze) the cropper
+    */
+    disable(): void;
+
+    /**
+    * Destroy the cropper and remove the instance from the image.
+    */
+    destroy(): void;
+
+    /**
+    * Move the canvas (image wrapper) with relative offsets.
+    * @param offsetX Moving size (px) in the horizontal direction.
+    * @param offsetY Moving size (px) in the vertical direction.
+    * If not present, its default value is offsetX.
+    */
+    move(offsetX: number, offsetY?: number): void;
+
+    /**
+    * Move the canvas (image wrapper) to an absolute point.
+    * @param x The left value of the canvas
+    * @param y The top value of the canvas
+    * If not present, its default value is x.
+    */
+    moveTo(x: number, y?: number): void;
+
+    /**
+    * Zoom the canvas (image wrapper) with a relative ratio.
+    * Zoom in: requires a positive number (ratio > 0)
+    * Zoom out: requires a negative number (ratio < 0)
+    */
+    zoom(ratio: number): void;
+
+    /**
+    * Rotate the canvas (image wrapper) with a relative degree.
+    * Rotate right: requires a positive number (degree > 0)
+    * Rotate left: requires a negative number (degree < 0)
+    */
+    rotate(degree: number): void;
+
+    /**
+    * Clear the crop box.
+    */
+    clear(): void;
+
+    /**
+    * Output the cropped area position and size data (base on the original image).
+    */
+    getData(rounded?: boolean): Data;
+
+    /**
+    * Change the cropped area position and size with new data (base on the original image).
+    */
+    setData(data: Data): void;
+
+    /**
+    * Output the container size data.
+    */
+    getContainerData(): ContainerData;
+
+    /**
+    * Output the image position, size and other related data.
+    */
+    getImageData(): ImageData;
+
+    /**
+    * Output the canvas (image wrapper) position and size data.
+    */
+    getCanvasData(): CanvasData & {
+        /**
+        * the natural width of the canvas (read only)
+        */
+        naturalWidth: number;
+        /**
+        * the natural height of the canvas (read only)
+        */
+        naturalHeight: number;
+    };
+
+    /**
+    * Change the canvas (image wrapper) position and size with new data.
+    */
+    setCanvasData(data: CanvasData): void;
+
+    /**
+    * Output the crop box position and size data.
+    */
+    getCropBoxData(): CropBoxData;
+
+    /**
+    * Change the crop box position and size with new data.
+    */
+    setCropBoxData(data: CropBoxData): void;
+
+    /**
+    * Get a canvas drawn the cropped image.
+    */
+    getCroppedCanvas(options?: CroppedCanvasOptions): HTMLCanvasElement;
+
+    /**
+    * Change the aspect ratio of the crop box.
+    */
+    setAspectRatio(aspectRatio: number): void;
+
+    /**
+    * Change the drag mode.
+    */
+    setDragMode(mode?: 'none' | 'crop' | 'move'): void;
+
+    on(eventname: string, callback: () => void): void;
+}
+export default ReactCropper;
diff --git a/react-cropper/react-cropper-tests.tsx b/react-cropper/react-cropper-tests.tsx
index 4aef0fbefb..aa46343b36 100644
--- a/react-cropper/react-cropper-tests.tsx
+++ b/react-cropper/react-cropper-tests.tsx
@@ -1,7 +1,3 @@
-/// <reference path="../react/react.d.ts"/>
-/// <reference path="./react-cropper.d.ts"/>
-
-
 import * as React from 'react';
 import Cropper from 'react-cropper';
 // If you choose not to use import, you need to assign Cropper to default
diff --git a/react-cropper/react-cropper.d.ts b/react-cropper/react-cropper.d.ts
deleted file mode 100644
index 11775d0187..0000000000
--- a/react-cropper/react-cropper.d.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-// Type definitions for react-cropper
-// Project: https://github.com/roadmanfong/react-cropper
-// Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts"/>
-/// <reference path="../cropperjs/cropperjs.d.ts"/>
-
-declare module 'react-cropper' {
-    import Data = cropperjs.Data;
-    import ContainerData = cropperjs.ContainerData;
-    import ImageData = cropperjs.ImageData;
-    import CanvasData = cropperjs.CanvasData;
-    import CropBoxData = cropperjs.CropBoxData;
-    import CroppedCanvasOptions = cropperjs.CroppedCanvasOptions;
-    type ReactCropperProps = cropperjs.CropperOptions & __React.HTMLProps<HTMLImageElement>;
-
-    class ReactCropper extends __React.Component<ReactCropperProps, {}> implements cropperjs.Cropper {
-
-        /**
-         * Show the crop box manually.
-         */
-        crop(): void;
-
-        /**
-        * Clear the crop box.
-        */
-        reset(): void;
-
-        /**
-        * Replace the image's src and rebuild the cropper.
-        * @param url A new image url
-        */
-        replace(url: string): void;
-
-        /**
-        * Enable (unfreeze) the cropper.
-        */
-        enable(): void;
-
-        /**
-        * Disable (freeze) the cropper
-        */
-        disable(): void;
-
-        /**
-        * Destroy the cropper and remove the instance from the image.
-        */
-        destroy(): void;
-
-        /**
-        * Move the canvas (image wrapper) with relative offsets.
-        * @param offsetX Moving size (px) in the horizontal direction.
-        * @param offsetY Moving size (px) in the vertical direction.
-        * If not present, its default value is offsetX.
-        */
-        move(offsetX: number, offsetY?: number): void;
-
-        /**
-        * Move the canvas (image wrapper) to an absolute point.
-        * @param x The left value of the canvas
-        * @param y The top value of the canvas
-        * If not present, its default value is x.
-        */
-        moveTo(x: number, y?: number): void;
-
-        /**
-        * Zoom the canvas (image wrapper) with a relative ratio.
-        * Zoom in: requires a positive number (ratio > 0)
-        * Zoom out: requires a negative number (ratio < 0)
-        */
-        zoom(ratio: number): void;
-
-        /**
-        * Rotate the canvas (image wrapper) with a relative degree.
-        * Rotate right: requires a positive number (degree > 0)
-        * Rotate left: requires a negative number (degree < 0)
-        */
-        rotate(degree: number): void;
-
-        /**
-        * Clear the crop box.
-        */
-        clear(): void;
-
-        /**
-        * Output the cropped area position and size data (base on the original image).
-        */
-        getData(rounded?: boolean): Data;
-
-        /**
-        * Change the cropped area position and size with new data (base on the original image).
-        */
-        setData(data: Data): void;
-
-        /**
-        * Output the container size data.
-        */
-        getContainerData(): ContainerData;
-
-        /**
-        * Output the image position, size and other related data.
-        */
-        getImageData(): ImageData;
-
-        /**
-        * Output the canvas (image wrapper) position and size data.
-        */
-        getCanvasData(): CanvasData & {
-            /**
-            * the natural width of the canvas (read only)
-            */
-            naturalWidth: number;
-            /**
-            * the natural height of the canvas (read only)
-            */
-            naturalHeight: number;
-        };
-
-        /**
-        * Change the canvas (image wrapper) position and size with new data.
-        */
-        setCanvasData(data: CanvasData): void;
-
-        /**
-        * Output the crop box position and size data.
-        */
-        getCropBoxData(): CropBoxData;
-
-        /**
-        * Change the crop box position and size with new data.
-        */
-        setCropBoxData(data: CropBoxData): void;
-
-        /**
-        * Get a canvas drawn the cropped image.
-        */
-        getCroppedCanvas(options?: CroppedCanvasOptions): HTMLCanvasElement;
-
-        /**
-        * Change the aspect ratio of the crop box.
-        */
-        setAspectRatio(aspectRatio: number): void;
-
-        /**
-        * Change the drag mode.
-        */
-        setDragMode(mode?: 'none' | 'crop' | 'move'): void;
-
-        on(eventname: string, callback: () => void): void;
-    }
-    export default ReactCropper;
-}
diff --git a/react-cropper/tsconfig.json b/react-cropper/tsconfig.json
new file mode 100644
index 0000000000..b15aa0b97b
--- /dev/null
+++ b/react-cropper/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-cropper-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/react-datagrid/index.d.ts b/react-datagrid/index.d.ts
new file mode 100644
index 0000000000..91daf5e522
--- /dev/null
+++ b/react-datagrid/index.d.ts
@@ -0,0 +1,306 @@
+// Type definitions for react-datagrid 1.2.15
+// Project: https://github.com/zippyui/react-datagrid.git
+// Definitions by: Stephen Jelfs <https://github.com/stephenjelfs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react"/>
+
+import DataGrid = ReactDataGrid.DataGrid;
+export = DataGrid;
+
+declare namespace ReactDataGrid {
+    interface DataGridProps extends React.Props<DataGrid> {
+        /**
+          * Array/String/Function/Promise - for local data, an array of object
+          * to render in the grid. For remote data, a string url, or a function
+          * that returns a promise.
+          */
+        dataSource: any[] | string | ((query: {pageSize: number, skip: number}) => Promise<any[]>);
+
+        dataSourceCount?: number;
+
+        /**
+          * String - the name of the property where the id is found for each
+          * object in the data array.
+          */
+        idProperty: string;
+
+        /**
+          * Array - an array of columns that are going to be rendered in the
+          * grid.
+          */
+        columns: Column[];
+
+        /**
+          * Sorting the data array is not done by the grid. You can however
+          * pass in sort info so the grid renders with sorting icons as needed.
+          */
+        onSortChange?: (sortInfo: SortInfo[]) => void;
+
+        /**
+          * Array - an array with sorting information.
+          */
+        sortInfo?: SortInfo[];
+
+        style?: React.CSSProperties;
+
+        /**
+          * Object/Function - you can specify either a style object to be
+          * applied to all rows, or a function. The function is called with
+          * (data, props) (so you have access to props.index for example) and
+          * is expected to return a style object.
+          */
+        rowStyle?: React.CSSProperties | ((data: any, props: RowProps) => React.CSSProperties);
+
+        /**
+          * Boolean - show a column menu to show/hide columns.
+          */
+        withColumnMenu?: boolean;
+
+        /**
+          * If you want to enable column reordering, just specify the
+          * onColumnOrderChange prop on the grid:
+          */
+        onColumnOrderChange?: (index: number, dropIndex: number) => void;
+
+        /**
+          * If you want to enable column resized, just specify the
+          * onColumnResize prop on the grid:
+          */
+        onColumnResize?: (firstCol: Column, firstSize: number,
+                          secondCol: Column, secondSize: number) => void;
+
+        /**
+          * If you want to enable selection, just specify the
+          * onSelectionChange prop on the grid:
+          */
+        onSelectionChange?: (newSelected: {}, data: any) => void;
+
+        /**
+          * When a column is shown/hidden, you can be notified using the
+          * onColumnVisibilityChange callback prop.
+          */
+        onColumnVisibilityChange?: (column: Column, visibility: boolean) => void;
+
+        /**
+          * The current selection.
+          */
+        selected?: {};
+
+        /**
+          * Group rows by matching values.
+          */
+        groupBy?: any[];
+
+        /**
+          * If you want to enable filter, just specify the
+          * onFilter prop on the grid:
+          */
+        onFilter?: (column: Column, value: any, allFilterValues: any[]) => void;
+
+        /**
+          * To apply the filter while typing.
+          */
+        liveFilter?: boolean;
+
+        /**
+          * Empty text for no records.
+          */
+        emptyText?: string;
+
+        /**
+          * Loading grid.
+          */
+        loading?: boolean;
+
+        /**
+          * If you dont want loadMask over header, specify
+          */
+        loadMaskOverHeader?: boolean;
+
+        /**
+         * Show cell borders. Other valid values: 'horizontal', 'vertical'.
+         */
+        showCellBorders?: boolean | string;
+
+        /**
+          * Custom row height.
+          */
+        rowHeight?: number;
+
+        /**
+          * When you have remote data, pagination is setup by default. If you
+          * want to disable pagination, specify the pagination prop with a false
+          * value.
+          */
+        pagination?: boolean;
+        defaultPageSize?: number;
+        defaultPage?: number;
+
+        /**
+          * Number - controlled alternative for defaultPageSize. When pageSize
+          * changes, onPageSizeChange(pageSize) is called.
+          */
+        pageSize?: number;
+
+        /**
+          * Number - controlled alternative for defaultPage. When page changes,
+          * onPageChange(page) is called.
+          */
+        page?: number;
+
+        /**
+          * Customize the pagination toolbar.
+          */
+        paginationToolbarProps?: PaginationToolbarProps;
+
+        /**
+          * handle page changes.
+          */
+        onPageChange?: (page: number) => void;
+
+        /**
+          * handle page size changes.
+          */
+        onPageSizeChange?: (pageSize: number, props: DataGridProps) => void;
+    }
+
+    interface SortInfo {
+        name: string;
+        dir: string;
+    }
+
+    interface Column {
+        /**
+          * String - each column should have a name property.
+          */
+        name: string;
+
+        /**
+          * String/ReactElement - a title to show in the header. If not
+          * specified, a humanized version of name will be used. Can be a string
+          * or anything that React can render, so you can customize it as you
+          * please.
+          */
+        title?: string | React.ReactElement<any>;
+
+        /**
+          * Function - if you want custom rendering, specify this property.
+          *
+          * The column.render function is called with 3 args:
+          *   value - the default value to be rendered (equals to data[column.name])
+          *   data - the corresponding data object for the current row
+              cellProps - an object with props for the current cell
+          */
+        render?: (value: any, data: any, cellProps: CellProps) => any;
+
+        /**
+          * Object - if you want cells in this column to be have a custom
+          * style.
+          */
+        style?: React.CSSProperties;
+
+        /**
+          * String - one of 'left', 'right', 'center'.
+          */
+        textAlign?: string;
+
+        /**
+          * String - a className to be applied to all cells in this column
+          */
+        className?: string;
+
+        width?: number;
+
+        minWidth?: number;
+
+        /**
+          * Columns are flexible via flexbox. Specify a flex property for this.
+          * Unless a column specifies a flex or a width property, it is assumed
+          * to have flex: 1.
+          */
+        flex?: number;
+
+        /**
+          * Specify a column as visible/hidden.
+          */
+        defaultVisible?: boolean;
+        defaultHidden?: boolean;
+
+        /**
+          * Boolean - controlled (which means you have to manually set column
+          * visibility when it changes, by using onColumnVisibilityChange).
+          */
+        visible?: boolean;
+    }
+
+    interface CellProps {
+        /**
+          * the index of the row
+          */
+        rowIndex: number;
+
+        /**
+          * the index of the column
+          */
+        index: number;
+
+        /**
+          * a style for the cell
+          */
+        style: React.CSSProperties;
+
+        /**
+          * a class name for the cell
+          */
+        className: string;
+    }
+
+    interface RowProps {
+        /**
+          * the index of the row
+          */
+        index: number;
+
+        /**
+          * a class name for the row when the mouse is over it
+          */
+        overClassName: string;
+
+        /**
+          * a class name for the row when selected
+          */
+        selectedClassName: string;
+
+        /**
+          * a class name for the row
+          */
+        className: string;
+    }
+
+    interface PaginationToolbarProps {
+        /**
+          * Available page sizes.
+          */
+        pageSizes: number[];
+
+        /**
+          * Hide/show page sizes.
+          */
+        showPageSize: boolean;
+
+        /**
+          * Customize icons.
+          */
+        showRefreshIcon: boolean;
+				iconSize: number;
+				iconProps: {
+  					style: React.SVGAttributes,
+  					overStyle: React.SVGAttributes,
+  					disabledStyle: React.SVGAttributes
+				}
+    }
+
+    export class DataGrid extends React.Component<DataGridProps, {}> {
+    }
+}
diff --git a/react-datagrid/react-datagrid-tests.tsx b/react-datagrid/react-datagrid-tests.tsx
index ec8459c625..061be471f4 100644
--- a/react-datagrid/react-datagrid-tests.tsx
+++ b/react-datagrid/react-datagrid-tests.tsx
@@ -1,20 +1,20 @@
-/// <reference path="./react-datagrid.d.ts" />
-/// <reference path="../react/react.d.ts" />
+
+/// <reference types="react" />
 
 import * as React from "react";
 import ReactDataGrid = require("react-datagrid");
 
 var data: any[] = [];
 
-var columns: ReactDataGrid.Column[] = [
+var columns = [
   { name: 'index', title: '#', width: 50 },
 	{ name: 'firstName', style: { color: 'red' }, visible: true},
-	{ name: 'lastName', render: (v) => {return v + " Phd"}},
+	{ name: 'lastName', render: (v: any) => {return v + " Phd"}},
 	{ name: 'city', textAlign: 'right', defaultVisible: true},
 	{ name: 'email', defaultHidden: true }
 ];
 var selected = {};
-var sortInfo: ReactDataGrid.SortInfo[] = [ { name: 'country', dir: 'asc'}]
+var sortInfo = [ { name: 'country', dir: 'asc'}]
 
 export module X {
 export class ExampleBasic extends React.Component<{},{}> {
@@ -69,12 +69,12 @@ class ExampleFull extends React.Component<{},{}> {
               page={1}
 				      pageSize={100}
               onPageChange={(page: number) => {}}
-              onPageSizeChange={(pageSize: number, props: ReactDataGrid.DataGridProps) => {}}
+              onPageSizeChange={(pageSize: number, props: any) => {}}
               onColumnOrderChange={(index: number, dropIndex: number) => {}}
-              onColumnResize={(firstCol: ReactDataGrid.Column, firstSize: number, secondCol: ReactDataGrid.Column, secondSize: number) => {}}
+              onColumnResize={(firstCol: any, firstSize: number, secondCol: any, secondSize: number) => {}}
               onSelectionChange={(newSelectedId: string, data: any) => {}}
-              onSortChange={(sortInfo: ReactDataGrid.SortInfo[]) => {}}
-              onFilter={(column: ReactDataGrid.Column, value: any, allFilterValues: any[]) => {} }
+              onSortChange={(sortInfo: any) => {}}
+              onFilter={(column: any, value: any, allFilterValues: any[]) => {} }
               />
             );
    }
diff --git a/react-datagrid/react-datagrid.d.ts b/react-datagrid/react-datagrid.d.ts
deleted file mode 100644
index 9ff2b18868..0000000000
--- a/react-datagrid/react-datagrid.d.ts
+++ /dev/null
@@ -1,310 +0,0 @@
-// Type definitions for react-datagrid 1.2.15
-// Project: https://github.com/zippyui/react-datagrid.git
-// Definitions by: Stephen Jelfs <https://github.com/stephenjelfs>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts"/>
-
-declare module "react-datagrid" {
-    import DataGrid = ReactDataGrid.DataGrid;
-    export = DataGrid;
-}
-
-declare namespace ReactDataGrid {
-    import React = __React;
-
-    interface DataGridProps extends React.Props<DataGrid> {
-        /**
-          * Array/String/Function/Promise - for local data, an array of object
-          * to render in the grid. For remote data, a string url, or a function
-          * that returns a promise.
-          */
-        dataSource: any[] | string | ((query: {pageSize: number, skip: number}) => Promise<any[]>);
-
-        dataSourceCount?: number;
-
-        /**
-          * String - the name of the property where the id is found for each
-          * object in the data array.
-          */
-        idProperty: string;
-
-        /**
-          * Array - an array of columns that are going to be rendered in the
-          * grid.
-          */
-        columns: Column[];
-
-        /**
-          * Sorting the data array is not done by the grid. You can however
-          * pass in sort info so the grid renders with sorting icons as needed.
-          */
-        onSortChange?: (sortInfo: SortInfo[]) => void;
-
-        /**
-          * Array - an array with sorting information.
-          */
-        sortInfo?: SortInfo[];
-
-        style?: __React.CSSProperties;
-
-        /**
-          * Object/Function - you can specify either a style object to be
-          * applied to all rows, or a function. The function is called with
-          * (data, props) (so you have access to props.index for example) and
-          * is expected to return a style object.
-          */
-        rowStyle?: __React.CSSProperties | ((data: any, props: RowProps) => React.CSSProperties);
-
-        /**
-          * Boolean - show a column menu to show/hide columns.
-          */
-        withColumnMenu?: boolean;
-
-        /**
-          * If you want to enable column reordering, just specify the
-          * onColumnOrderChange prop on the grid:
-          */
-        onColumnOrderChange?: (index: number, dropIndex: number) => void;
-
-        /**
-          * If you want to enable column resized, just specify the
-          * onColumnResize prop on the grid:
-          */
-        onColumnResize?: (firstCol: Column, firstSize: number,
-                          secondCol: Column, secondSize: number) => void;
-
-        /**
-          * If you want to enable selection, just specify the
-          * onSelectionChange prop on the grid:
-          */
-        onSelectionChange?: (newSelected: {}, data: any) => void;
-
-        /**
-          * When a column is shown/hidden, you can be notified using the
-          * onColumnVisibilityChange callback prop.
-          */
-        onColumnVisibilityChange?: (column: Column, visibility: boolean) => void;
-
-        /**
-          * The current selection.
-          */
-        selected?: {};
-
-        /**
-          * Group rows by matching values.
-          */
-        groupBy?: any[];
-
-        /**
-          * If you want to enable filter, just specify the
-          * onFilter prop on the grid:
-          */
-        onFilter?: (column: Column, value: any, allFilterValues: any[]) => void;
-
-        /**
-          * To apply the filter while typing.
-          */
-        liveFilter?: boolean;
-
-        /**
-          * Empty text for no records.
-          */
-        emptyText?: string;
-
-        /**
-          * Loading grid.
-          */
-        loading?: boolean;
-
-        /**
-          * If you dont want loadMask over header, specify
-          */
-        loadMaskOverHeader?: boolean;
-
-        /**
-         * Show cell borders. Other valid values: 'horizontal', 'vertical'.
-         */
-        showCellBorders?: boolean | string;
-
-        /**
-          * Custom row height.
-          */
-        rowHeight?: number;
-
-        /**
-          * When you have remote data, pagination is setup by default. If you
-          * want to disable pagination, specify the pagination prop with a false
-          * value.
-          */
-        pagination?: boolean;
-        defaultPageSize?: number;
-        defaultPage?: number;
-
-        /**
-          * Number - controlled alternative for defaultPageSize. When pageSize
-          * changes, onPageSizeChange(pageSize) is called.
-          */
-        pageSize?: number;
-
-        /**
-          * Number - controlled alternative for defaultPage. When page changes,
-          * onPageChange(page) is called.
-          */
-        page?: number;
-
-        /**
-          * Customize the pagination toolbar.
-          */
-        paginationToolbarProps?: PaginationToolbarProps;
-
-        /**
-          * handle page changes.
-          */
-        onPageChange?: (page: number) => void;
-
-        /**
-          * handle page size changes.
-          */
-        onPageSizeChange?: (pageSize: number, props: DataGridProps) => void;
-    }
-
-    interface SortInfo {
-        name: string;
-        dir: string;
-    }
-
-    interface Column {
-        /**
-          * String - each column should have a name property.
-          */
-        name: string;
-
-        /**
-          * String/ReactElement - a title to show in the header. If not
-          * specified, a humanized version of name will be used. Can be a string
-          * or anything that React can render, so you can customize it as you
-          * please.
-          */
-        title?: string | React.ReactElement<any>;
-
-        /**
-          * Function - if you want custom rendering, specify this property.
-          *
-          * The column.render function is called with 3 args:
-          *   value - the default value to be rendered (equals to data[column.name])
-          *   data - the corresponding data object for the current row
-              cellProps - an object with props for the current cell
-          */
-        render?: (value: any, data: any, cellProps: CellProps) => any;
-
-        /**
-          * Object - if you want cells in this column to be have a custom
-          * style.
-          */
-        style?: __React.CSSProperties;
-
-        /**
-          * String - one of 'left', 'right', 'center'.
-          */
-        textAlign?: string;
-
-        /**
-          * String - a className to be applied to all cells in this column
-          */
-        className?: string;
-
-        width?: number;
-
-        minWidth?: number;
-
-        /**
-          * Columns are flexible via flexbox. Specify a flex property for this.
-          * Unless a column specifies a flex or a width property, it is assumed
-          * to have flex: 1.
-          */
-        flex?: number;
-
-        /**
-          * Specify a column as visible/hidden.
-          */
-        defaultVisible?: boolean;
-        defaultHidden?: boolean;
-
-        /**
-          * Boolean - controlled (which means you have to manually set column
-          * visibility when it changes, by using onColumnVisibilityChange).
-          */
-        visible?: boolean;
-    }
-
-    interface CellProps {
-        /**
-          * the index of the row
-          */
-        rowIndex: number;
-
-        /**
-          * the index of the column
-          */
-        index: number;
-
-        /**
-          * a style for the cell
-          */
-        style: React.CSSProperties;
-
-        /**
-          * a class name for the cell
-          */
-        className: string;
-    }
-
-    interface RowProps {
-        /**
-          * the index of the row
-          */
-        index: number;
-
-        /**
-          * a class name for the row when the mouse is over it
-          */
-        overClassName: string;
-
-        /**
-          * a class name for the row when selected
-          */
-        selectedClassName: string;
-
-        /**
-          * a class name for the row
-          */
-        className: string;
-    }
-
-    interface PaginationToolbarProps {
-        /**
-          * Available page sizes.
-          */
-        pageSizes: number[];
-
-        /**
-          * Hide/show page sizes.
-          */
-        showPageSize: boolean;
-
-        /**
-          * Customize icons.
-          */
-        showRefreshIcon: boolean;
-				iconSize: number;
-				iconProps: {
-  					style: React.SVGAttributes,
-  					overStyle: React.SVGAttributes,
-  					disabledStyle: React.SVGAttributes
-				}
-    }
-
-    export class DataGrid extends __React.Component<DataGridProps, {}> {
-    }
-}
diff --git a/react-datagrid/tsconfig.json b/react-datagrid/tsconfig.json
new file mode 100644
index 0000000000..28318a8e51
--- /dev/null
+++ b/react-datagrid/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-datagrid-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/react-day-picker/index.d.ts b/react-day-picker/index.d.ts
new file mode 100644
index 0000000000..cdc0280ba1
--- /dev/null
+++ b/react-day-picker/index.d.ts
@@ -0,0 +1,76 @@
+// Type definitions for react-day-picker v1.2.0
+// Project: https://github.com/gpbl/react-day-picker
+// Definitions by: Giampaolo Bellavite <https://github.com/gpbl>, Jason Killian <https://github.com/jkillian>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react" />
+
+declare module "react-day-picker" {
+    import DayPicker = ReactDayPicker.DayPicker;
+    export = DayPicker;
+}
+
+declare var DayPicker: typeof ReactDayPicker.DayPicker;
+
+declare namespace ReactDayPicker {
+    interface LocaleUtils {
+        formatMonthTitle: (month: Date, locale: string) => string;
+        formatWeekdayShort: (weekday: number, locale: string) => string;
+        formatWeekdayLong: (weekday: number, locale: string) => string;
+        getFirstDayOfWeek: (locale: string) => number;
+        getMonths: (locale: string) => string[];
+    }
+
+    interface Modifiers {
+        [name: string]: (date: Date) => boolean;
+    }
+
+    interface CaptionElementProps extends React.Props<any> {
+        date?: Date;
+        localeUtils?: LocaleUtils;
+        locale?: string;
+        onClick?: React.MouseEventHandler;
+    }
+
+    interface Props extends React.Props<DayPicker>{
+        modifiers?: Modifiers;
+        initialMonth?: Date;
+        numberOfMonths?: number;
+        renderDay?: (date: Date) => number | string | JSX.Element;
+        enableOutsideDays?: boolean;
+        canChangeMonth?: boolean;
+        fromMonth?: Date;
+        toMonth?: Date;
+        localeUtils?: LocaleUtils;
+        locale?: string;
+        captionElement?: React.ReactElement<CaptionElementProps>;
+        onDayClick?: (e: React.SyntheticEvent, day: Date, modifiers: string[]) => any;
+        onDayTouchTap?: (e: React.SyntheticEvent, day: Date, modifiers: string[]) => any;
+        onDayMouseEnter?: (e: React.SyntheticEvent, day: Date, modifiers: string[]) => any;
+        onDayMouseLeave?: (e: React.SyntheticEvent, day: Date, modifiers: string[]) => any;
+        onMonthChange?: (month: Date) => any;
+        onCaptionClick?: (e: React.SyntheticEvent, month: Date) => any;
+        className?: string;
+        style?: React.CSSProperties;
+        tabIndex?: number;
+    }
+
+    class DayPicker extends React.Component<Props, {}> {
+        showMonth(month: Date): void;
+        showPreviousMonth(): void;
+        showNextMonth(): void;
+    }
+
+    namespace DayPicker {
+        var LocaleUtils: LocaleUtils;
+        namespace DateUtils {
+            function addMonths(d: Date, n: number): Date;
+            function clone(d: Date): Date;
+            function isSameDay(d1?: Date, d2?: Date): boolean;
+            function isPastDay(d: Date): boolean;
+            function isDayBetween(day: Date, startDate: Date, endDate: Date): boolean;
+            function addDayToRange(day: Date, range: { from?: Date, to?: Date }): { from?: Date, to?: Date };
+            function isDayInRange(day: Date, range: { from?: Date, to?: Date }): boolean;
+        }  
+    }
+}
diff --git a/react-day-picker/react-day-picker-tests.tsx b/react-day-picker/react-day-picker-tests.tsx
index 3afdf07343..6709dd00eb 100644
--- a/react-day-picker/react-day-picker-tests.tsx
+++ b/react-day-picker/react-day-picker-tests.tsx
@@ -1,5 +1,4 @@
-/// <reference path="react-day-picker.d.ts" />
-/// <reference path="../react/react-global.d.ts" />
+/// <reference types="react" />
 
 import * as DayPicker2 from "react-day-picker";
 
diff --git a/react-day-picker/react-day-picker.d.ts b/react-day-picker/react-day-picker.d.ts
deleted file mode 100644
index e20f670184..0000000000
--- a/react-day-picker/react-day-picker.d.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-// Type definitions for react-day-picker v1.2.0
-// Project: https://github.com/gpbl/react-day-picker
-// Definitions by: Giampaolo Bellavite <https://github.com/gpbl>, Jason Killian <https://github.com/jkillian>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts" />
-
-declare module "react-day-picker" {
-    import DayPicker = ReactDayPicker.DayPicker;
-    export = DayPicker;
-}
-
-declare var DayPicker: typeof ReactDayPicker.DayPicker;
-
-declare namespace ReactDayPicker {
-    import React = __React;
-
-    interface LocaleUtils {
-        formatMonthTitle: (month: Date, locale: string) => string;
-        formatWeekdayShort: (weekday: number, locale: string) => string;
-        formatWeekdayLong: (weekday: number, locale: string) => string;
-        getFirstDayOfWeek: (locale: string) => number;
-        getMonths: (locale: string) => string[];
-    }
-
-    interface Modifiers {
-        [name: string]: (date: Date) => boolean;
-    }
-
-    interface CaptionElementProps extends React.Props<any> {
-        date?: Date;
-        localeUtils?: LocaleUtils;
-        locale?: string;
-        onClick?: React.MouseEventHandler;
-    }
-
-    interface Props extends React.Props<DayPicker>{
-        modifiers?: Modifiers;
-        initialMonth?: Date;
-        numberOfMonths?: number;
-        renderDay?: (date: Date) => number | string | JSX.Element;
-        enableOutsideDays?: boolean;
-        canChangeMonth?: boolean;
-        fromMonth?: Date;
-        toMonth?: Date;
-        localeUtils?: LocaleUtils;
-        locale?: string;
-        captionElement?: React.ReactElement<CaptionElementProps>;
-        onDayClick?: (e: React.SyntheticEvent, day: Date, modifiers: string[]) => any;
-        onDayTouchTap?: (e: React.SyntheticEvent, day: Date, modifiers: string[]) => any;
-        onDayMouseEnter?: (e: React.SyntheticEvent, day: Date, modifiers: string[]) => any;
-        onDayMouseLeave?: (e: React.SyntheticEvent, day: Date, modifiers: string[]) => any;
-        onMonthChange?: (month: Date) => any;
-        onCaptionClick?: (e: React.SyntheticEvent, month: Date) => any;
-        className?: string;
-        style?: React.CSSProperties;
-        tabIndex?: number;
-    }
-
-    class DayPicker extends React.Component<Props, {}> {
-        showMonth(month: Date): void;
-        showPreviousMonth(): void;
-        showNextMonth(): void;
-    }
-
-    namespace DayPicker {
-        var LocaleUtils: LocaleUtils;
-        namespace DateUtils {
-            function addMonths(d: Date, n: number): Date;
-            function clone(d: Date): Date;
-            function isSameDay(d1?: Date, d2?: Date): boolean;
-            function isPastDay(d: Date): boolean;
-            function isDayBetween(day: Date, startDate: Date, endDate: Date): boolean;
-            function addDayToRange(day: Date, range: { from?: Date, to?: Date }): { from?: Date, to?: Date };
-            function isDayInRange(day: Date, range: { from?: Date, to?: Date }): boolean;
-        }  
-    }
-}
diff --git a/react-day-picker/tsconfig.json b/react-day-picker/tsconfig.json
new file mode 100644
index 0000000000..037343e0dd
--- /dev/null
+++ b/react-day-picker/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-day-picker-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/react-dnd/index.d.ts b/react-dnd/index.d.ts
new file mode 100644
index 0000000000..a133aeed06
--- /dev/null
+++ b/react-dnd/index.d.ts
@@ -0,0 +1,200 @@
+// Type definitions for React DnD v1.1.4
+// Project: https://github.com/gaearon/react-dnd
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="react" />
+
+declare module __ReactDnd {
+    // Decorated React Components
+    // ----------------------------------------------------------------------
+
+    class ContextComponent<P, S> extends React.Component<P, S> {
+        getDecoratedComponentInstance(): React.Component<P, S>;
+        // Note: getManager is not yet documented on the React DnD docs.
+        getManager(): any;
+    }
+
+    class DndComponent<P, S> extends React.Component<P, S> {
+        getDecoratedComponentInstance(): React.Component<P, S>;
+        getHandlerId(): Identifier;
+    }
+
+    interface ContextComponentClass<P> extends React.ComponentClass<P> {
+        new(props?: P, context?: any): ContextComponent<P, any>;
+        DecoratedComponent: React.ComponentClass<P>;
+    }
+
+    interface DndComponentClass<P> extends React.ComponentClass<P> {
+        new(props?: P, context?: any): DndComponent<P, any>;
+        DecoratedComponent: React.ComponentClass<P>;
+    }
+
+    // Top-level API
+    // ----------------------------------------------------------------------
+
+    export function DragSource<P>(
+        type: Identifier | ((props: P) => Identifier),
+        spec: DragSourceSpec<P>,
+        collect: DragSourceCollector,
+        options?: DndOptions<P>
+    ): (componentClass: React.ComponentClass<P>) => DndComponentClass<P>;
+
+    export function DropTarget<P>(
+        types: Identifier | Identifier[] | ((props: P) => Identifier | Identifier[]),
+        spec: DropTargetSpec<P>,
+        collect: DropTargetCollector,
+        options?: DndOptions<P>
+    ): (componentClass: React.ComponentClass<P>) => DndComponentClass<P>;
+
+    export function DragDropContext<P>(
+        backend: Backend
+    ): (componentClass: React.ComponentClass<P>) => ContextComponentClass<P>;
+
+    export function DragLayer<P>(
+        collect: DragLayerCollector,
+        options?: DndOptions<P>
+    ): (componentClass: React.ComponentClass<P>) => DndComponentClass<P>;
+
+    type DragSourceCollector = (connect: DragSourceConnector, monitor: DragSourceMonitor) => Object;
+    type DropTargetCollector = (connect: DropTargetConnector, monitor: DropTargetMonitor) => Object;
+    type DragLayerCollector = (monitor: DragLayerMonitor) => Object;
+
+    // Shared
+    // ----------------------------------------------------------------------
+
+    // The React DnD docs say that this can also be the ES6 Symbol.
+    type Identifier = string;
+
+    interface ClientOffset {
+        x: number;
+        y: number;
+    }
+
+    interface DndOptions<P> {
+        arePropsEqual?(props: P, otherProps: P): boolean;
+    }
+
+    // DragSource
+    // ----------------------------------------------------------------------
+
+    interface DragSourceSpec<P> {
+        beginDrag(props: P, monitor?: DragSourceMonitor, component?: React.Component<P, any>): Object;
+        endDrag?(props: P, monitor?: DragSourceMonitor, component?: React.Component<P, any>): void;
+        canDrag?(props: P, monitor?: DragSourceMonitor): boolean;
+        isDragging?(props: P, monitor?: DragSourceMonitor): boolean;
+    }
+
+    class DragSourceMonitor {
+        canDrag(): boolean;
+        isDragging(): boolean;
+        getItemType(): Identifier;
+        getItem(): Object;
+        getDropResult(): Object;
+        didDrop(): boolean;
+        getInitialClientOffset(): ClientOffset;
+        getInitialSourceClientOffset(): ClientOffset;
+        getClientOffset(): ClientOffset;
+        getDifferenceFromInitialOffset(): ClientOffset;
+        getSourceClientOffset(): ClientOffset;
+    }
+
+    class DragSourceConnector {
+        dragSource(): ConnectDragSource;
+        dragPreview(): ConnectDragPreview;
+    }
+
+    interface DragElementWrapper<O> {
+        <P>(elementOrNode: React.ReactElement<P>, options?: O): React.ReactElement<P>;
+    }
+
+    interface DragSourceOptions {
+        dropEffect?: string;
+    }
+
+    interface DragPreviewOptions {
+        captureDraggingState?: boolean;
+        anchorX?: number;
+        anchorY?: number;
+    }
+
+    type ConnectDragSource = DragElementWrapper<DragSourceOptions>;
+    type ConnectDragPreview = DragElementWrapper<DragPreviewOptions>;
+
+    /// DropTarget
+    // ----------------------------------------------------------------------
+
+    interface DropTargetSpec<P> {
+        drop?(props: P, monitor?: DropTargetMonitor, component?: React.Component<P, any>): Object|void;
+        hover?(props: P, monitor?: DropTargetMonitor, component?: React.Component<P, any>): void;
+        canDrop?(props: P, monitor?: DropTargetMonitor): boolean;
+    }
+
+    class DropTargetMonitor {
+        canDrop(): boolean;
+        isOver(options?: { shallow: boolean }): boolean;
+        getItemType(): Identifier;
+        getItem(): Object;
+        getDropResult(): Object;
+        didDrop(): boolean;
+        getInitialClientOffset(): ClientOffset;
+        getInitialSourceClientOffset(): ClientOffset;
+        getClientOffset(): ClientOffset;
+        getDifferenceFromInitialOffset(): ClientOffset;
+        getSourceClientOffset(): ClientOffset;
+    }
+
+    class DropTargetConnector {
+        dropTarget(): ConnectDropTarget;
+    }
+
+    type ConnectDropTarget = <P>(elementOrNode: React.ReactElement<P>) => React.ReactElement<P>;
+
+    /// DragLayerMonitor
+    // ----------------------------------------------------------------------
+
+    class DragLayerMonitor {
+        isDragging(): boolean;
+        getItemType(): Identifier;
+        getItem(): Object;
+        getInitialClientOffset(): ClientOffset;
+        getInitialSourceClientOffset(): ClientOffset;
+        getClientOffset(): ClientOffset;
+        getDifferenceFromInitialOffset(): ClientOffset;
+        getSourceClientOffset(): ClientOffset;
+    }
+
+    /// Backend
+    /// ---------------------------------------------------------------------
+
+    // TODO: Fill in the Backend interface.
+    // The React DnD docs do not cover this, and this is only needed for
+    // creating custom backends (i.e. not using the built-in HTML5Backend).
+    interface Backend {}
+}
+
+declare module "react-dnd" {
+    export = __ReactDnd;
+}
+
+declare module "react-dnd/modules/backends/HTML5" {
+    export enum NativeTypes { FILE, URL, TEXT }
+    export function getEmptyImage(): any; // Image
+    export default class HTML5Backend implements __ReactDnd.Backend {}
+}
+
+declare module "react-dnd/modules/backends/Test" {
+    class TestBackend {
+        setup(): void;
+        teardown(): void;
+        connectDragSource(): void;
+        connectDropTarget(): void;
+        simulateBeginDrag(sourceIds: __ReactDnd.Identifier[], options?: {}): void;
+        simulatePublishDragSource(): void;
+        simulateHover(targetIds: __ReactDnd.Identifier[], options?: {}): void;
+        simulateDrop(): void;
+        simulateEndDrag(): void;
+    }
+
+    export = TestBackend;
+}
diff --git a/react-dnd/react-dnd-tests.ts b/react-dnd/react-dnd-tests.ts
index 59c0566664..d8ab201126 100644
--- a/react-dnd/react-dnd-tests.ts
+++ b/react-dnd/react-dnd-tests.ts
@@ -1,4 +1,3 @@
-///<reference path="react-dnd.d.ts" />
 "use strict";
 
 // Test adapted from the ReactDnD chess game tutorial:
diff --git a/react-dnd/react-dnd.d.ts b/react-dnd/react-dnd.d.ts
deleted file mode 100644
index cfe5506afb..0000000000
--- a/react-dnd/react-dnd.d.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-// Type definitions for React DnD v1.1.4
-// Project: https://github.com/gaearon/react-dnd
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path='../react/react.d.ts' />
-
-declare module __ReactDnd {
-    import React = __React;
-
-    // Decorated React Components
-    // ----------------------------------------------------------------------
-
-    class ContextComponent<P, S> extends React.Component<P, S> {
-        getDecoratedComponentInstance(): React.Component<P, S>;
-        // Note: getManager is not yet documented on the React DnD docs.
-        getManager(): any;
-    }
-
-    class DndComponent<P, S> extends React.Component<P, S> {
-        getDecoratedComponentInstance(): React.Component<P, S>;
-        getHandlerId(): Identifier;
-    }
-
-    interface ContextComponentClass<P> extends React.ComponentClass<P> {
-        new(props?: P, context?: any): ContextComponent<P, any>;
-        DecoratedComponent: React.ComponentClass<P>;
-    }
-
-    interface DndComponentClass<P> extends React.ComponentClass<P> {
-        new(props?: P, context?: any): DndComponent<P, any>;
-        DecoratedComponent: React.ComponentClass<P>;
-    }
-
-    // Top-level API
-    // ----------------------------------------------------------------------
-
-    export function DragSource<P>(
-        type: Identifier | ((props: P) => Identifier),
-        spec: DragSourceSpec<P>,
-        collect: DragSourceCollector,
-        options?: DndOptions<P>
-    ): (componentClass: React.ComponentClass<P>) => DndComponentClass<P>;
-
-    export function DropTarget<P>(
-        types: Identifier | Identifier[] | ((props: P) => Identifier | Identifier[]),
-        spec: DropTargetSpec<P>,
-        collect: DropTargetCollector,
-        options?: DndOptions<P>
-    ): (componentClass: React.ComponentClass<P>) => DndComponentClass<P>;
-
-    export function DragDropContext<P>(
-        backend: Backend
-    ): (componentClass: React.ComponentClass<P>) => ContextComponentClass<P>;
-
-    export function DragLayer<P>(
-        collect: DragLayerCollector,
-        options?: DndOptions<P>
-    ): (componentClass: React.ComponentClass<P>) => DndComponentClass<P>;
-
-    type DragSourceCollector = (connect: DragSourceConnector, monitor: DragSourceMonitor) => Object;
-    type DropTargetCollector = (connect: DropTargetConnector, monitor: DropTargetMonitor) => Object;
-    type DragLayerCollector = (monitor: DragLayerMonitor) => Object;
-
-    // Shared
-    // ----------------------------------------------------------------------
-
-    // The React DnD docs say that this can also be the ES6 Symbol.
-    type Identifier = string;
-
-    interface ClientOffset {
-        x: number;
-        y: number;
-    }
-
-    interface DndOptions<P> {
-        arePropsEqual?(props: P, otherProps: P): boolean;
-    }
-
-    // DragSource
-    // ----------------------------------------------------------------------
-
-    interface DragSourceSpec<P> {
-        beginDrag(props: P, monitor?: DragSourceMonitor, component?: React.Component<P, any>): Object;
-        endDrag?(props: P, monitor?: DragSourceMonitor, component?: React.Component<P, any>): void;
-        canDrag?(props: P, monitor?: DragSourceMonitor): boolean;
-        isDragging?(props: P, monitor?: DragSourceMonitor): boolean;
-    }
-
-    class DragSourceMonitor {
-        canDrag(): boolean;
-        isDragging(): boolean;
-        getItemType(): Identifier;
-        getItem(): Object;
-        getDropResult(): Object;
-        didDrop(): boolean;
-        getInitialClientOffset(): ClientOffset;
-        getInitialSourceClientOffset(): ClientOffset;
-        getClientOffset(): ClientOffset;
-        getDifferenceFromInitialOffset(): ClientOffset;
-        getSourceClientOffset(): ClientOffset;
-    }
-
-    class DragSourceConnector {
-        dragSource(): ConnectDragSource;
-        dragPreview(): ConnectDragPreview;
-    }
-
-    interface DragElementWrapper<O> {
-        <P>(elementOrNode: React.ReactElement<P>, options?: O): React.ReactElement<P>;
-    }
-
-    interface DragSourceOptions {
-        dropEffect?: string;
-    }
-
-    interface DragPreviewOptions {
-        captureDraggingState?: boolean;
-        anchorX?: number;
-        anchorY?: number;
-    }
-
-    type ConnectDragSource = DragElementWrapper<DragSourceOptions>;
-    type ConnectDragPreview = DragElementWrapper<DragPreviewOptions>;
-
-    /// DropTarget
-    // ----------------------------------------------------------------------
-
-    interface DropTargetSpec<P> {
-        drop?(props: P, monitor?: DropTargetMonitor, component?: React.Component<P, any>): Object|void;
-        hover?(props: P, monitor?: DropTargetMonitor, component?: React.Component<P, any>): void;
-        canDrop?(props: P, monitor?: DropTargetMonitor): boolean;
-    }
-
-    class DropTargetMonitor {
-        canDrop(): boolean;
-        isOver(options?: { shallow: boolean }): boolean;
-        getItemType(): Identifier;
-        getItem(): Object;
-        getDropResult(): Object;
-        didDrop(): boolean;
-        getInitialClientOffset(): ClientOffset;
-        getInitialSourceClientOffset(): ClientOffset;
-        getClientOffset(): ClientOffset;
-        getDifferenceFromInitialOffset(): ClientOffset;
-        getSourceClientOffset(): ClientOffset;
-    }
-
-    class DropTargetConnector {
-        dropTarget(): ConnectDropTarget;
-    }
-
-    type ConnectDropTarget = <P>(elementOrNode: React.ReactElement<P>) => React.ReactElement<P>;
-
-    /// DragLayerMonitor
-    // ----------------------------------------------------------------------
-
-    class DragLayerMonitor {
-        isDragging(): boolean;
-        getItemType(): Identifier;
-        getItem(): Object;
-        getInitialClientOffset(): ClientOffset;
-        getInitialSourceClientOffset(): ClientOffset;
-        getClientOffset(): ClientOffset;
-        getDifferenceFromInitialOffset(): ClientOffset;
-        getSourceClientOffset(): ClientOffset;
-    }
-
-    /// Backend
-    /// ---------------------------------------------------------------------
-
-    // TODO: Fill in the Backend interface.
-    // The React DnD docs do not cover this, and this is only needed for
-    // creating custom backends (i.e. not using the built-in HTML5Backend).
-    interface Backend {}
-}
-
-declare module "react-dnd" {
-    export = __ReactDnd;
-}
-
-declare module "react-dnd/modules/backends/HTML5" {
-    export enum NativeTypes { FILE, URL, TEXT }
-    export function getEmptyImage(): any; // Image
-    export default class HTML5Backend implements __ReactDnd.Backend {}
-}
-
-declare module "react-dnd/modules/backends/Test" {
-    class TestBackend {
-        setup(): void;
-        teardown(): void;
-        connectDragSource(): void;
-        connectDropTarget(): void;
-        simulateBeginDrag(sourceIds: __ReactDnd.Identifier[], options?: {}): void;
-        simulatePublishDragSource(): void;
-        simulateHover(targetIds: __ReactDnd.Identifier[], options?: {}): void;
-        simulateDrop(): void;
-        simulateEndDrag(): void;
-    }
-
-    export = TestBackend;
-}
diff --git a/react-dnd/tsconfig.json b/react-dnd/tsconfig.json
new file mode 100644
index 0000000000..2cebe2cb73
--- /dev/null
+++ b/react-dnd/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-dnd-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/react-dom/index.d.ts b/react-dom/index.d.ts
new file mode 100644
index 0000000000..7587458e31
--- /dev/null
+++ b/react-dom/index.d.ts
@@ -0,0 +1,64 @@
+// Type definitions for React v0.14 (react-dom)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="react-dom.server.d.ts" />
+
+export as namespace ReactDOM;
+export = ReactDOM;
+
+import { ReactInstance, Component, ComponentState,
+        ReactElement, SFCElement, CElement,
+         DOMAttributes, DOMElement } from 'react';
+
+declare namespace ReactDOM {
+    function findDOMNode<E extends Element>(instance: ReactInstance): E;
+    function findDOMNode(instance: ReactInstance): Element;
+
+    function render<P extends DOMAttributes, T extends Element>(
+        element: DOMElement<P, T>,
+        container: Element,
+        callback?: (element: T) => any): T;
+    function render<P>(
+        element: SFCElement<P>,
+        container: Element,
+        callback?: () => any): void;
+    function render<P, T extends Component<P, ComponentState>>(
+        element: CElement<P, T>,
+        container: Element,
+        callback?: (component: T) => any): T;
+    function render<P>(
+        element: ReactElement<P>,
+        container: Element,
+        callback?: (component?: Component<P, ComponentState> | Element) => any): Component<P, ComponentState> | Element | void;
+
+    function unmountComponentAtNode(container: Element): boolean;
+
+    var version: string;
+
+    function unstable_batchedUpdates<A, B>(callback: (a: A, b: B) => any, a: A, b: B): void;
+    function unstable_batchedUpdates<A>(callback: (a: A) => any, a: A): void;
+    function unstable_batchedUpdates(callback: () => any): void;
+
+    function unstable_renderSubtreeIntoContainer<P extends DOMAttributes, T extends Element>(
+        parentComponent: Component<any, any>,
+        element: DOMElement<P, T>,
+        container: Element,
+        callback?: (element: T) => any): T;
+    function unstable_renderSubtreeIntoContainer<P, T extends Component<P, ComponentState>>(
+        parentComponent: Component<any, any>,
+        element: CElement<P, T>,
+        container: Element,
+        callback?: (component: T) => any): T;
+    function render<P>(
+        parentComponent: Component<any, any>,
+        element: SFCElement<P>,
+        container: Element,
+        callback?: () => any): void;
+    function unstable_renderSubtreeIntoContainer<P>(
+        parentComponent: Component<any, any>,
+        element: ReactElement<P>,
+        container: Element,
+        callback?: (component?: Component<P, ComponentState> | Element) => any): Component<P, ComponentState> | Element | void;
+}
diff --git a/react-dom/react-dom.server.d.ts b/react-dom/react-dom.server.d.ts
new file mode 100644
index 0000000000..673c163c2a
--- /dev/null
+++ b/react-dom/react-dom.server.d.ts
@@ -0,0 +1,7 @@
+declare module "react-dom/server" {
+	import { ReactElement } from 'react';
+	
+    function renderToString(element: ReactElement<any>): string;
+    function renderToStaticMarkup(element: ReactElement<any>): string;
+    var version: string;
+}
diff --git a/react-dom/tsconfig.json b/react-dom/tsconfig.json
new file mode 100644
index 0000000000..9016249c67
--- /dev/null
+++ b/react-dom/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "react-dom-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/react-dropzone/index.d.ts b/react-dropzone/index.d.ts
new file mode 100644
index 0000000000..2228e3a06a
--- /dev/null
+++ b/react-dropzone/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for react-dropzone
+// Project: https://github.com/paramaggarwal/react-dropzone
+// Definitions by: Mathieu Larouche Dube <https://github.com/matdube>
+// Definitions: https://github.com/Vooban/DefinitelyTyped
+
+///<reference types="react" />
+
+declare var Dropzone: typeof ReactDropzone.Dropzone;
+export = Dropzone;
+
+declare namespace ReactDropzone {
+    interface DropzoneProps {
+        onDrop?: Function;
+        onDropAccepted?: Function;
+        onDropRejected?: Function;
+        onDragEnter?: Function;
+        onDragLeave?: Function;
+        style?: Object;
+        activeStyle?: Object;
+        className?: string;
+        activeClassName?: string;
+        rejectClassName?: string;
+        /**
+        * Clicking the <Dropzone> brings up the browser file picker. To disable, set to true.
+        */
+        disableClick?: boolean;
+        /**
+        * To accept only a single file, set this to false.
+        */
+        multiple?: boolean;
+        /**
+        * Filters the file types that are valid. It should have a valid MIME type according to input element, for example:
+        * application/pdf
+        * image/*
+        * audio/aiff,audio/midi
+        */
+        accept?: string;
+    }
+
+    export class Dropzone extends React.Component<DropzoneProps, {}> {
+    }
+
+}
diff --git a/react-dropzone/react-dropzone-tests.tsx b/react-dropzone/react-dropzone-tests.tsx
index 6216b5f20e..51dab0b367 100644
--- a/react-dropzone/react-dropzone-tests.tsx
+++ b/react-dropzone/react-dropzone-tests.tsx
@@ -1,5 +1,5 @@
-///<reference path='../react/react.d.ts' />
-///<reference path='../react-dropzone/react-dropzone.d.ts' />
+///<reference types="react" />
+///<reference types="react-dropzone" />
 import * as React from 'react';
 import Dropzone = require('react-dropzone');
 
diff --git a/react-dropzone/react-dropzone.d.ts b/react-dropzone/react-dropzone.d.ts
deleted file mode 100644
index a8198524de..0000000000
--- a/react-dropzone/react-dropzone.d.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-// Type definitions for react-dropzone
-// Project: https://github.com/paramaggarwal/react-dropzone
-// Definitions by: Mathieu Larouche Dube <https://github.com/matdube>
-// Definitions: https://github.com/Vooban/DefinitelyTyped
-
-///<reference path='../react/react.d.ts' />
-
-declare namespace ReactDropzone {
-    import React = __React;
-    interface DropzoneProps {
-        onDrop?: Function;
-        onDropAccepted?: Function;
-        onDropRejected?: Function;
-        onDragEnter?: Function;
-        onDragLeave?: Function;
-        style?: Object;
-        activeStyle?: Object;
-        className?: string;
-        activeClassName?: string;
-        rejectClassName?: string;
-        /**
-        * Clicking the <Dropzone> brings up the browser file picker. To disable, set to true.
-        */
-        disableClick?: boolean;
-        /**
-        * To accept only a single file, set this to false.
-        */
-        multiple?: boolean;
-        /**
-        * Filters the file types that are valid. It should have a valid MIME type according to input element, for example:
-        * application/pdf
-        * image/*
-        * audio/aiff,audio/midi
-        */
-        accept?: string;
-    }
-
-    export class Dropzone extends React.Component<DropzoneProps, {}> {
-    }
-
-}
-
-declare module "react-dropzone" {
-    const Dropzone: typeof ReactDropzone.Dropzone;
-    export = Dropzone;
-}
-
diff --git a/react-dropzone/tsconfig.json b/react-dropzone/tsconfig.json
new file mode 100644
index 0000000000..d0808f2707
--- /dev/null
+++ b/react-dropzone/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-dropzone-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/react-fa/index.d.ts b/react-fa/index.d.ts
new file mode 100644
index 0000000000..725686c0f3
--- /dev/null
+++ b/react-fa/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for react-fa v4.0.0
+// Project: https://github.com/andreypopp/react-fa
+// Definitions by: Frank Laub <https://github.com/flaub>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react" />
+
+
+import { ComponentClass, Props } from 'react';
+
+interface IconProps extends Props<Icon> {
+    name: string;
+    className?: string;
+    size?: string;
+    spin?: boolean;
+    rotate?: string;
+    flip?: string;
+    fixedWidth?: boolean;
+    pulse?: boolean;
+    stack?: string;
+    inverse?: boolean;
+}
+
+interface Icon extends ComponentClass<IconProps> { }
+declare const Icon: Icon;
+
+export = Icon;
diff --git a/react-fa/react-fa-tests.tsx b/react-fa/react-fa-tests.tsx
index 778c6b16ac..1f94758b7d 100644
--- a/react-fa/react-fa-tests.tsx
+++ b/react-fa/react-fa-tests.tsx
@@ -1,5 +1,4 @@
-/// <reference path="react-fa.d.ts"/>
-/// <reference path="../react/react-dom.d.ts"/>
+/// <reference types="react-dom"/>
 
 import * as React from "react";
 import { render } from 'react-dom';
diff --git a/react-fa/react-fa.d.ts b/react-fa/react-fa.d.ts
deleted file mode 100644
index 0b6b166a22..0000000000
--- a/react-fa/react-fa.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Type definitions for react-fa v4.0.0
-// Project: https://github.com/andreypopp/react-fa
-// Definitions by: Frank Laub <https://github.com/flaub>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts" />
-
-declare module "react-fa" {
-	import { ComponentClass, Props } from 'react';
-
-	interface IconProps extends Props<Icon> {
-		name: string;
-		className?: string;
-		size?: string;
-		spin?: boolean;
-		rotate?: string;
-		flip?: string;
-		fixedWidth?: boolean;
-		pulse?: boolean;
-		stack?: string;
-		inverse?: boolean;
-	}
-
-	interface Icon extends ComponentClass<IconProps> { }
-	const Icon: Icon;
-
-	export = Icon;
-}
diff --git a/react-fa/tsconfig.json b/react-fa/tsconfig.json
new file mode 100644
index 0000000000..1d9925c2dd
--- /dev/null
+++ b/react-fa/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-fa-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/react-helmet/index.d.ts b/react-helmet/index.d.ts
new file mode 100644
index 0000000000..1a11567ff6
--- /dev/null
+++ b/react-helmet/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for react-helmet
+// Project: https://github.com/nfl/react-helmet
+// Definitions by: Evan Bremer <https://github.com/evanbb>, Isman Usoh <https://github.com/isman-usoh>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react" />
+
+declare var Helmet: {
+    (): ReactHelmet.HelmetComponent
+    rewind(): ReactHelmet.HelmetData
+    }
+
+export = Helmet;
+
+declare namespace ReactHelmet {
+    interface HelmetProps {
+        title?: string;
+        titleTemplate?: string;
+        base?: any;
+        link?: Array<any>;
+        meta?: Array<any>;
+        script?: Array<any>;
+        onChangeClientState?: (newState: any) => void;
+    }
+
+    interface HelmetData {
+        title: HelmetDatum;
+        base: HelmetDatum;
+        link: HelmetDatum;
+        meta: HelmetDatum;
+        script: HelmetDatum;
+    }
+    
+    interface HelmetDatum {
+        toString(): string;
+        toComponent(): React.Component<any, any>;
+    }
+
+    class HelmetComponent extends React.Component<HelmetProps, any> {}
+}
diff --git a/react-helmet/react-helmet-tests.tsx b/react-helmet/react-helmet-tests.tsx
index c50bdf2e17..2db79eb547 100644
--- a/react-helmet/react-helmet-tests.tsx
+++ b/react-helmet/react-helmet-tests.tsx
@@ -1,8 +1,8 @@
-/// <reference path="react-helmet.d.ts" />
-/// <reference path="../react/react.d.ts" />
+
+/// <reference types="react" />
 
 import * as React from 'react';
-import Helmet from 'react-helmet';
+import * as Helmet from 'react-helmet';
 
 <Helmet title="My Title" />
 
diff --git a/react-helmet/react-helmet.d.ts b/react-helmet/react-helmet.d.ts
deleted file mode 100644
index 8cae272f98..0000000000
--- a/react-helmet/react-helmet.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-// Type definitions for react-helmet
-// Project: https://github.com/nfl/react-helmet
-// Definitions by: Evan Bremer <https://github.com/evanbb>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts" />
-
-declare module 'react-helmet' {
-    import { Component } from 'react';
-
-    interface HelmetProps {
-        title?: string;
-        titleTemplate?: string;
-        base?: any;
-        link?: Array<any>;
-        meta?: Array<any>;
-        script?: Array<any>;
-        onChangeClientState?: (newState: any) => void;
-    }
-
-    interface HelmetData {
-        title: HelmetDatum;
-        base: HelmetDatum;
-        link: HelmetDatum;
-        meta: HelmetDatum;
-        script: HelmetDatum;
-    }
-
-    interface HelmetDatum {
-        toString(): string;
-        toComponent(): Component<any, any>;
-    }
-
-    class Helmet extends Component<HelmetProps, any> {
-        static rewind(): HelmetData
-    }
-
-    export default Helmet;
-}
diff --git a/react-helmet/tsconfig.json b/react-helmet/tsconfig.json
new file mode 100644
index 0000000000..314b38a070
--- /dev/null
+++ b/react-helmet/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-helmet-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/react-holder/index.d.ts b/react-holder/index.d.ts
new file mode 100644
index 0000000000..6d61bd540d
--- /dev/null
+++ b/react-holder/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for react-holder 1.0.0
+// Project: https://github.com/Moeriki/react-holder
+// Definitions by: Isman Usoh <https://github.com/isman-usoh>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="react"/>
+
+interface ReactHolderProp extends React.HTMLAttributes {
+    width: string | number;
+    height: string | number;
+    updateOnResize: boolean;
+
+    // config args
+    theme?: string;
+    random?: boolean;
+    bg?: string
+    fg?: string;
+    text?: string;
+    size?: number;
+    font?: string;
+    align?: string;
+    outline?: boolean;
+    lineWrap?: number;
+}
+
+declare class ReactHolder extends React.Component<ReactHolderProp, any> {
+
+}
+export default ReactHolder;
diff --git a/react-holder/react-holder-tests.tsx b/react-holder/react-holder-tests.tsx
index 9b4f3a9a0a..93b009eaa5 100644
--- a/react-holder/react-holder-tests.tsx
+++ b/react-holder/react-holder-tests.tsx
@@ -1,8 +1,3 @@
-// react-holder test
-
-///<reference path="react-holder.d.ts"/>
-///<reference path="../react/react.d.ts"/>
-
 import * as React from "react";
 import Holder from "react-holder";
 
diff --git a/react-holder/react-holder.d.ts b/react-holder/react-holder.d.ts
deleted file mode 100644
index 126734c973..0000000000
--- a/react-holder/react-holder.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// Type definitions for react-holder 1.0.0
-// Project: https://github.com/Moeriki/react-holder
-// Definitions by: Isman Usoh <https://github.com/isman-usoh>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../react/react.d.ts"/>
-
-declare module "react-holder" {
-
-  import React = __React;
-
-  interface ReactHolderProp extends React.HTMLAttributes {
-    width: string | number;
-    height: string | number;
-    updateOnResize: boolean;
-
-    // config args
-    theme?: string;
-    random?: boolean;
-    bg?: string
-    fg?: string;
-    text?: string;
-    size?: number;
-    font?: string;
-    align?: string;
-    outline?: boolean;
-    lineWrap?: number;
-  }
-
-  class ReactHolder extends React.Component<ReactHolderProp, any> {
-
-  }
-  export default ReactHolder;
-}
diff --git a/react-holder/tsconfig.json b/react-holder/tsconfig.json
new file mode 100644
index 0000000000..0689cefa79
--- /dev/null
+++ b/react-holder/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-holder-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/react-infinite/index.d.ts b/react-infinite/index.d.ts
new file mode 100644
index 0000000000..696e0a5c7f
--- /dev/null
+++ b/react-infinite/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for react-infinite
+// Project: https://github.com/seatgeek/react-infinite
+// Definitions by: rhysd <https://github.com/rhysd>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="react" />
+
+import Infinite = ReactInfinite.Infinite;
+export = Infinite;
+
+declare namespace ReactInfinite {
+	interface InfiniteProps extends React.Props<Infinite> {
+		elementHeight: number | number[];
+		containerHeight?: number;
+		preloadBatchSize?: number | Object;
+		preloadAdditionalHeight?: number | Object;
+		handleScroll?: (node: React.ReactElement<any>) => void;
+		infiniteLoadBeginBottomOffset?: number;
+		infiniteLoadBeginEdgeOffset?: number;
+		onInfiniteLoad?: () => void;
+		loadingSpinnerDelegate?: React.ReactElement<any>;
+		isInfiniteLoading?: boolean;
+		timeScrollStateLastsForAfterUserScrolls?: number;
+		className?: string;
+		useWindowAsScrollContainer?: boolean;
+		displayBottomUpwards?: boolean;
+	}
+
+	export class Infinite extends React.Component<InfiniteProps, {}> {
+		static containerHeightScaleFactor(n: number): any;
+	}
+}
diff --git a/react-infinite/react-infinite-tests.tsx b/react-infinite/react-infinite-tests.tsx
index 91a86abce2..807fc67498 100644
--- a/react-infinite/react-infinite-tests.tsx
+++ b/react-infinite/react-infinite-tests.tsx
@@ -1,5 +1,5 @@
-///<reference path='../react/react.d.ts' />
-///<reference path='../react-infinite/react-infinite.d.ts' />
+///<reference types="react" />
+///<reference types="react-infinite" />
 
 import * as React from 'react';
 import Infinite = require('react-infinite');
diff --git a/react-infinite/react-infinite.d.ts b/react-infinite/react-infinite.d.ts
deleted file mode 100644
index 123883a0e0..0000000000
--- a/react-infinite/react-infinite.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Type definitions for react-infinite
-// Project: https://github.com/seatgeek/react-infinite
-// Definitions by: rhysd <https://github.com/rhysd>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path='../react/react.d.ts' />
-
-declare module "react-infinite" {
-	import Infinite = ReactInfinite.Infinite;
-	export = Infinite;
-}
-
-declare namespace ReactInfinite {
-	import React = __React;
-
-	interface InfiniteProps extends React.Props<Infinite> {
-		elementHeight: number | number[];
-		containerHeight?: number;
-		preloadBatchSize?: number | Object;
-		preloadAdditionalHeight?: number | Object;
-		handleScroll?: (node: React.ReactElement<any>) => void;
-		infiniteLoadBeginBottomOffset?: number;
-		infiniteLoadBeginEdgeOffset?: number;
-		onInfiniteLoad?: () => void;
-		loadingSpinnerDelegate?: React.ReactElement<any>;
-		isInfiniteLoading?: boolean;
-		timeScrollStateLastsForAfterUserScrolls?: number;
-		className?: string;
-		useWindowAsScrollContainer?: boolean;
-		displayBottomUpwards?: boolean;
-	}
-
-	export class Infinite extends React.Component<InfiniteProps, {}> {
-		static containerHeightScaleFactor(n: number): any;
-	}
-}
diff --git a/react-infinite/tsconfig.json b/react-infinite/tsconfig.json
new file mode 100644
index 0000000000..dd19ed63b0
--- /dev/null
+++ b/react-infinite/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-infinite-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/react-input-calendar/index.d.ts b/react-input-calendar/index.d.ts
new file mode 100644
index 0000000000..ba3772cd5b
--- /dev/null
+++ b/react-input-calendar/index.d.ts
@@ -0,0 +1,84 @@
+// Type definitions for react-input-calendar
+// Project: https://github.com/Rudeg/react-input-calendar
+// Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react"/>
+declare namespace reactInputCalendar {
+    export interface ReactInputCalendarProps {
+        /**
+        * Format of date, which display in input and set in date property.
+        * Allowed Keys: All formats supported by moment.js
+        * @default 'MM-DD-YYYY'
+        */
+        format?: string;
+        /**
+        * Set initial date value
+        * @default current date
+        */
+        date?: string | Date;
+        /**
+        * Set the selectable minimum date
+        * @default null
+        */
+        minDate?: string | Date;
+        /**
+        * Set the selectable maximum date
+        * @default null
+        */
+        maxDate?: string | Date;
+        /**
+        * Set minimal view. Values:
+        * 0 - days
+        * 1 - months
+        * 2 - years.
+        * @default 0 (DaysView)
+        */
+        minView?: number;
+        /**
+        * Format of date for the onChange event. Default on the date format (ISO 8601) to ease the save of data.
+        * Allowed Keys: All formats supported by moment.js
+        * @default 'MM-DD-YYYY'
+        */
+        computableFormat?: string;
+        /**
+        * Set a function that will be triggered whenever there is a change in the selected date. It will return the date in the props.computableFormat format.
+        */
+        onChange?: (computableDate: string) => void;
+        /**
+        * Set a function that will be triggered the when input field is blurred. It will return the event and the date in the props.computableFormat format.
+        */
+        onBlur?: (event: React.SyntheticEvent, computableDate: string) => void;
+        /**
+        * Define state when date picker would close once the user has clicked on a date.
+        */
+        closeOnSelect?: boolean;
+        /**
+        * Setting this value to true makes the calendar widget open when the iput field is focused.
+        */
+        openOnInputFocus?: boolean;
+        /**
+        * Value to show in the input text box if no date is set.
+        */
+        placeholder?: string;
+        /**
+        * Id that should be applied to the input field. Useful when using it with a label element.
+        */
+        inputFieldId?: string;
+        /**
+        * Define the class name of the input field where the date picker represents its value.
+        */
+        inputFieldClass?: string;
+        /**
+        * If true, the input field gets disabled and the icon next to it disappears.
+        */
+        disabled?: boolean;
+    }
+    interface ReactInputCalendarState { }
+    export class ReactInputCalendar extends React.Component<ReactInputCalendarProps, ReactInputCalendarState> {
+    }
+}
+declare var ReactInputCalendar: typeof reactInputCalendar.ReactInputCalendar
+declare module "react-input-calendar" {
+    export = ReactInputCalendar;
+}
diff --git a/react-input-calendar/react-input-calendar-tests.tsx b/react-input-calendar/react-input-calendar-tests.tsx
index 9cc4963fb8..aaab1dc398 100644
--- a/react-input-calendar/react-input-calendar-tests.tsx
+++ b/react-input-calendar/react-input-calendar-tests.tsx
@@ -1,6 +1,5 @@
-/// <reference path="./react-input-calendar.d.ts"/>
-/// <reference path="../react/react.d.ts"/>
-/// <reference path="../react/react-dom.d.ts"/>
+/// <reference types="react"/>
+/// <reference types="react-dom"/>
 
 import * as ReactInputCalendar from 'react-input-calendar';
 import * as React from 'react';
diff --git a/react-input-calendar/react-input-calendar.d.ts b/react-input-calendar/react-input-calendar.d.ts
deleted file mode 100644
index 5dac6aff5d..0000000000
--- a/react-input-calendar/react-input-calendar.d.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-// Type definitions for react-input-calendar
-// Project: https://github.com/Rudeg/react-input-calendar
-// Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts"/>
-declare namespace reactInputCalendar {
-    export interface ReactInputCalendarProps {
-        /**
-        * Format of date, which display in input and set in date property.
-        * Allowed Keys: All formats supported by moment.js
-        * @default 'MM-DD-YYYY'
-        */
-        format?: string;
-        /**
-        * Set initial date value
-        * @default current date
-        */
-        date?: string | Date;
-        /**
-        * Set the selectable minimum date
-        * @default null
-        */
-        minDate?: string | Date;
-        /**
-        * Set the selectable maximum date
-        * @default null
-        */
-        maxDate?: string | Date;
-        /**
-        * Set minimal view. Values:
-        * 0 - days
-        * 1 - months
-        * 2 - years.
-        * @default 0 (DaysView)
-        */
-        minView?: number;
-        /**
-        * Format of date for the onChange event. Default on the date format (ISO 8601) to ease the save of data.
-        * Allowed Keys: All formats supported by moment.js
-        * @default 'MM-DD-YYYY'
-        */
-        computableFormat?: string;
-        /**
-        * Set a function that will be triggered whenever there is a change in the selected date. It will return the date in the props.computableFormat format.
-        */
-        onChange?: (computableDate: string) => void;
-        /**
-        * Set a function that will be triggered the when input field is blurred. It will return the event and the date in the props.computableFormat format.
-        */
-        onBlur?: (event: __React.SyntheticEvent, computableDate: string) => void;
-        /**
-        * Define state when date picker would close once the user has clicked on a date.
-        */
-        closeOnSelect?: boolean;
-        /**
-        * Setting this value to true makes the calendar widget open when the iput field is focused.
-        */
-        openOnInputFocus?: boolean;
-        /**
-        * Value to show in the input text box if no date is set.
-        */
-        placeholder?: string;
-        /**
-        * Id that should be applied to the input field. Useful when using it with a label element.
-        */
-        inputFieldId?: string;
-        /**
-        * Define the class name of the input field where the date picker represents its value.
-        */
-        inputFieldClass?: string;
-        /**
-        * If true, the input field gets disabled and the icon next to it disappears.
-        */
-        disabled?: boolean;
-    }
-    interface ReactInputCalendarState { }
-    export class ReactInputCalendar extends __React.Component<ReactInputCalendarProps, ReactInputCalendarState> {
-    }
-}
-declare var ReactInputCalendar: typeof reactInputCalendar.ReactInputCalendar
-declare module "react-input-calendar" {
-    export = ReactInputCalendar;
-}
diff --git a/react-input-calendar/tsconfig.json b/react-input-calendar/tsconfig.json
new file mode 100644
index 0000000000..b1625f1e8e
--- /dev/null
+++ b/react-input-calendar/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-input-calendar-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/react-intl/index.d.ts b/react-intl/index.d.ts
new file mode 100644
index 0000000000..76df84469e
--- /dev/null
+++ b/react-intl/index.d.ts
@@ -0,0 +1,1397 @@
+// Type definitions for react-intl 2.0.0
+// Project: http://formatjs.io/react/
+// Definitions by: Bruno Grieder <https://github.com/bgrieder>, Christian Droulers <https://github.com/cdroulers>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="react" />
+
+declare namespace ReactIntl {
+    interface Locale {
+        locale: string;
+        fields?: { [key: string]: string },
+        pluralRuleFunction?: (n: number, ord: boolean) => string;
+    }
+
+    function injectIntl<T>(clazz: T): T;
+
+    function addLocaleData(data: Locale[] | Locale): void;
+
+    function hasLocaleData(localeName: string): boolean;
+
+    interface Messages {
+        [key: string]: FormattedMessage.MessageDescriptor
+    }
+
+    function defineMessages<T extends Messages>(messages: T): T;
+
+    interface IntlShape extends React.Requireable<any> {
+    }
+
+    var intlShape: IntlShape;
+
+    interface FormatConfig {
+        locale?: string;
+        formats?: any;
+    }
+
+    interface InjectedIntlProps {
+        formatDate?: (date: Date, options?: FormattedDate.PropsBase) => string;
+        formatTime?: (date: Date, options?: FormattedTime.PropsBase) => string;
+        formatRelative?: (value: number, options?: FormattedRelative.PropsBase) => string;
+        formatNumber?: (value: number, options?: FormattedNumber.PropsBase) => string;
+        formatPlural?: (value: number, options?: FormattedPlural.PropsBase) => string;
+        formatMessage?: (messageDescriptor: FormattedMessage.MessageDescriptor, values?: Object) => string;
+        formatHTMLMessage?: (messageDescriptor: FormattedMessage.MessageDescriptor, values?: Object) => string;
+    }
+
+    namespace IntlComponent {
+        interface DateTimeFormatProps {
+            /*
+            * one of "best fit" (default) | "lookup"
+            */
+            localeMatcher?: string;
+            /*
+            * one of "basic" (default) | "best fit"
+            */
+            formatMatcher?: string;
+            timeZone?: string,
+            hour12?: boolean;
+            /*
+            * one of "narrow" (default) | "short" | "long"
+            */
+            weekday?: string;
+            /*
+            * one of "narrow" (default) | "short" | "long"
+            */
+            era?: string;
+            /*
+            * one of "numeric" (default) | "2-digit"
+            */
+            year?: string;
+            /*
+            * one of "numeric" (default) | "2-digit" | "narrow" | "short" | "long"
+            */
+            month?: string;
+            /*
+            * one of "numeric" (default) | "2-digit"
+            */
+            day?: string;
+            /*
+            * one of "numeric" (default) | "2-digit"
+            */
+            hour?: string;
+            /*
+            * one of "numeric" (default) | "2-digit"
+            */
+            minute?: string;
+            /*
+            * one of "numeric" (default) | "2-digit"
+            */
+            second?: string;
+            /*
+            * one of "short" (default) | "long"
+            */
+            timeZoneName?: string;
+        }
+    }
+
+
+    namespace FormattedDate {
+        export interface PropsBase extends IntlComponent.DateTimeFormatProps {
+            format?: string;
+        }
+
+        export interface Props extends PropsBase {
+            value: Date;
+        }
+    }
+    class FormattedDate extends React.Component<FormattedDate.Props, any> { }
+
+
+    namespace FormattedTime {
+        export interface PropsBase extends IntlComponent.DateTimeFormatProps {
+            format?: string;
+        }
+
+        export interface Props extends PropsBase {
+            value: Date;
+        }
+    }
+    class FormattedTime extends React.Component<FormattedTime.Props, any> { }
+
+
+    namespace FormattedRelative {
+        export interface PropsBase {
+            /*
+            * one of "second", "minute", "hour", "day", "month" or "year"
+            */
+            units?: string;
+            /*
+            * one of "best fit" (default) | "numeric"
+            */
+            style?: string;
+            format?: string;
+            updateInterval?: number;
+            initialNow?: any;
+        }
+
+        export interface Props extends PropsBase {
+            value: number;
+        }
+    }
+    class FormattedRelative extends React.Component<FormattedRelative.Props, any> { }
+
+
+    namespace FormattedMessage {
+        export interface MessageDescriptor {
+            id: string;
+            description?: string;
+            defaultMessage?: string;
+        }
+
+        export interface Props extends MessageDescriptor {
+            values?: Object;
+            tagName?: string;
+        }
+    }
+    class FormattedMessage extends React.Component<FormattedMessage.Props, any> { }
+
+
+    class FormattedHTMLMessage extends React.Component<FormattedMessage.Props, any> { }
+
+
+    namespace FormattedNumber {
+        export interface PropsBase {
+            format?: string;
+            /*
+            * one of "best fit" (default) | "lookup"
+            */
+            localeMatcher?: string;
+            /*
+            * one of "decimal" (default) | "currency" | "percent"
+            */
+            style?: string;
+            currency?: string,
+            /*
+            * one of "symbol" (default) | "code" | "name"
+            */
+            currencyDisplay?: string;
+            useGrouping?: boolean;
+            minimumIntegerDigits?: number;
+            minimumFractionDigits?: number;
+            maximumFractionDigits?: number;
+            minimumSignificantDigits?: number;
+            maximumSignificantDigits?: number;
+        }
+
+        export interface Props extends PropsBase {
+            value: number;
+        }
+    }
+    class FormattedNumber extends React.Component<FormattedNumber.Props, any> { }
+
+
+    namespace FormattedPlural {
+        export interface PropsBase {
+            /*
+            * one of "cardinal" (default) | "ordinal"
+            */
+            style?: string;
+            other?: any;
+            zero?: any;
+            one?: any;
+            two?: any;
+            few?: any;
+            many?: any;
+        }
+
+        export interface Props extends PropsBase {
+            value: number;
+        }
+    }
+    class FormattedPlural extends React.Component<FormattedPlural.Props, any> { }
+
+
+    namespace IntlProvider {
+        export interface Props {
+            locale?: string;
+            formats?: Object;
+            messages?: Object;
+            defaultLocale?: string;
+            defaultFormats?: Object;
+        }
+    }
+    class IntlProvider extends React.Component<IntlProvider.Props, any> { }
+
+    class LocaleData extends Array<Locale> {
+    }
+}
+
+declare module "react-intl" {
+    export = ReactIntl
+}
+
+declare module "react-intl/locale-data/af" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/agq" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ak" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/am" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ar" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/as" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/asa" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ast" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/az" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/bas" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/be" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/bem" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/bez" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/bg" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/bh" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/bm" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/bn" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/bo" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/br" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/brx" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/bs" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ca" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ce" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/cgg" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/chr" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ckb" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/cs" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/cu" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/cy" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/da" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/dav" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/de" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/dje" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/dsb" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/dua" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/dv" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/dyo" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/dz" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ebu" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ee" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/el" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/en" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/eo" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/es" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/et" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/eu" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ewo" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/fa" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ff" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/fi" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/fil" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/fo" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/fr" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/fur" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/fy" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ga" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/gd" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/gl" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/gsw" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/gu" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/guw" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/guz" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/gv" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ha" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/haw" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/he" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/hi" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/hr" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/hsb" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/hu" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/hy" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/id" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ig" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ii" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/in" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/is" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/it" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/iu" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/iw" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ja" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/jbo" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/jgo" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ji" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/jmc" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/jv" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/jw" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ka" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/kab" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/kaj" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/kam" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/kcg" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/kde" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/kea" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/khq" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ki" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/kk" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/kkj" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/kl" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/kln" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/km" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/kn" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ko" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/kok" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ks" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ksb" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ksf" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ksh" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ku" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/kw" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ky" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/lag" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/lb" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/lg" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/lkt" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ln" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/lo" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/lrc" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/lt" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/lu" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/luo" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/luy" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/lv" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/mas" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/mer" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/mfe" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/mg" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/mgh" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/mgo" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/mk" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ml" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/mn" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/mo" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/mr" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ms" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/mt" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/mua" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/my" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/mzn" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/nah" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/naq" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/nb" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/nd" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ne" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/nl" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/nmg" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/nn" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/nnh" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/no" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/nqo" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/nr" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/nso" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/nus" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ny" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/nyn" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/om" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/or" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/os" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/pa" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/pap" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/pl" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/prg" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ps" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/pt" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/qu" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/rm" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/rn" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ro" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/rof" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ru" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/rw" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/rwk" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/sah" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/saq" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/sbp" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/sdh" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/se" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/seh" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ses" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/sg" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/sh" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/shi" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/si" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/sk" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/sl" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/sma" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/smi" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/smj" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/smn" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/sms" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/sn" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/so" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/sq" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/sr" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ss" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ssy" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/st" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/sv" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/sw" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/syr" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ta" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/te" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/teo" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/th" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ti" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/tig" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/tk" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/tl" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/tn" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/to" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/tr" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ts" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/twq" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/tzm" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ug" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/uk" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ur" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/uz" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/vai" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/ve" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/vi" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/vo" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/vun" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/wa" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/wae" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/wo" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/xh" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/xog" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/yav" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/yi" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/yo" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/zgh" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/zh" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
+
+declare module "react-intl/locale-data/zu" {
+    var data: ReactIntl.LocaleData;
+    export = data;
+}
diff --git a/react-intl/react-intl-1.2.0.d.ts b/react-intl/react-intl-1.2.0.d.ts
index ea1f4df948..1ba7481a84 100644
--- a/react-intl/react-intl-1.2.0.d.ts
+++ b/react-intl/react-intl-1.2.0.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Bruno Grieder <https://github.com/bgrieder>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference path='../react/react.d.ts' />
+///<reference types="react" />
 
 declare module "react-intl" {
 
diff --git a/react-intl/react-intl-tests-1.2.0.tsx b/react-intl/react-intl-tests-1.2.0.tsx
index 3560e55545..8138e579c3 100644
--- a/react-intl/react-intl-tests-1.2.0.tsx
+++ b/react-intl/react-intl-tests-1.2.0.tsx
@@ -2,9 +2,9 @@
  * Created by Bruno Grieder
  */
 
-///<reference path='../react/react.d.ts' />
-///<reference path='../react-mixin/react-mixin.d.ts' />
-///<reference path='../react-intl/react-intl-1.2.0.d.ts' />
+///<reference types="react" />
+
+///<reference types="react-intl-1.2.0" />
 
 import * as React from 'react'
 
diff --git a/react-intl/react-intl-tests.tsx b/react-intl/react-intl-tests.tsx
index c7907214c4..f140dd95d1 100644
--- a/react-intl/react-intl-tests.tsx
+++ b/react-intl/react-intl-tests.tsx
@@ -2,14 +2,11 @@
  * Created by Bruno Grieder and Christian Droulers
  */
 
-///<reference path="../react/react.d.ts" />
-///<reference path="../react-mixin/react-mixin.d.ts" />
-///<reference path="./react-intl.d.ts" />
-
+///<reference types="react" />
 
 import * as React from "react"
-
 import * as reactMixin from "react-mixin"
+
 import {
 IntlProvider,
 InjectedIntlProps,
@@ -26,7 +23,8 @@ FormattedPlural,
 FormattedDate,
 FormattedTime
 } from "react-intl"
-import reactIntlEn = require("react-intl/lib/locale-data/en");
+
+import reactIntlEn = require("react-intl/locale-data/en");
 
 addLocaleData(reactIntlEn);
 console.log(hasLocaleData("en"));
@@ -165,4 +163,4 @@ class TestApp extends React.Component<{}, {}> {
 export default {
     TestApp,
     SomeComponent: injectIntl(SomeComponent)
-}
\ No newline at end of file
+}
diff --git a/react-intl/react-intl.d.ts b/react-intl/react-intl.d.ts
deleted file mode 100644
index c45c57a38a..0000000000
--- a/react-intl/react-intl.d.ts
+++ /dev/null
@@ -1,239 +0,0 @@
-// Type definitions for react-intl 2.0.0-beta1
-// Project: http://formatjs.io/react/
-// Definitions by: Bruno Grieder <https://github.com/bgrieder>, Christian Droulers <https://github.com/cdroulers>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path='../react/react.d.ts' />
-
-declare namespace ReactIntl {
-    import React = __React;
-
-    interface Locale {
-        locale: string;
-        fields?: { [key: string]: string },
-        pluralRuleFunction?: (n: number, ord: boolean) => string;
-    }
-
-    function injectIntl<T>(clazz: T): T;
-
-    function addLocaleData(data: Locale[] | Locale): void;
-
-    function hasLocaleData(localeName: string): boolean;
-
-    interface Messages {
-        [key: string]: FormattedMessage.MessageDescriptor
-    }
-
-    function defineMessages<T extends Messages>(messages: T): T;
-
-    interface IntlShape extends React.Requireable<any> {
-    }
-
-    var intlShape: IntlShape;
-
-    interface FormatConfig {
-        locale?: string;
-        formats?: any;
-    }
-
-    interface InjectedIntlProps {
-        formatDate?: (date: Date, options?: FormattedDate.PropsBase) => string;
-        formatTime?: (date: Date, options?: FormattedTime.PropsBase) => string;
-        formatRelative?: (value: number, options?: FormattedRelative.PropsBase) => string;
-        formatNumber?: (value: number, options?: FormattedNumber.PropsBase) => string;
-        formatPlural?: (value: number, options?: FormattedPlural.PropsBase) => string;
-        formatMessage?: (messageDescriptor: FormattedMessage.MessageDescriptor, values?: Object) => string;
-        formatHTMLMessage?: (messageDescriptor: FormattedMessage.MessageDescriptor, values?: Object) => string;
-    }
-
-    namespace IntlComponent {
-        interface DateTimeFormatProps {
-            /*
-            * one of "best fit" (default) | "lookup"
-            */
-            localeMatcher?: string;
-            /*
-            * one of "basic" (default) | "best fit"
-            */
-            formatMatcher?: string;
-            timeZone?: string,
-            hour12?: boolean;
-            /*
-            * one of "narrow" (default) | "short" | "long"
-            */
-            weekday?: string;
-            /*
-            * one of "narrow" (default) | "short" | "long"
-            */
-            era?: string;
-            /*
-            * one of "numeric" (default) | "2-digit"
-            */
-            year?: string;
-            /*
-            * one of "numeric" (default) | "2-digit" | "narrow" | "short" | "long"
-            */
-            month?: string;
-            /*
-            * one of "numeric" (default) | "2-digit"
-            */
-            day?: string;
-            /*
-            * one of "numeric" (default) | "2-digit"
-            */
-            hour?: string;
-            /*
-            * one of "numeric" (default) | "2-digit"
-            */
-            minute?: string;
-            /*
-            * one of "numeric" (default) | "2-digit"
-            */
-            second?: string;
-            /*
-            * one of "short" (default) | "long"
-            */
-            timeZoneName?: string;
-        }
-    }
-
-
-    namespace FormattedDate {
-        export interface PropsBase extends IntlComponent.DateTimeFormatProps {
-            format?: string;
-        }
-
-        export interface Props extends PropsBase {
-            value: Date;
-        }
-    }
-    class FormattedDate extends React.Component<FormattedDate.Props, any> { }
-
-
-    namespace FormattedTime {
-        export interface PropsBase extends IntlComponent.DateTimeFormatProps {
-            format?: string;
-        }
-
-        export interface Props extends PropsBase {
-            value: Date;
-        }
-    }
-    class FormattedTime extends React.Component<FormattedTime.Props, any> { }
-
-
-    namespace FormattedRelative {
-        export interface PropsBase {
-            /*
-            * one of "second", "minute", "hour", "day", "month" or "year"
-            */
-            units?: string;
-            /*
-            * one of "best fit" (default) | "numeric"
-            */
-            style?: string;
-            format?: string;
-            updateInterval?: number;
-            initialNow?: any;
-        }
-
-        export interface Props extends PropsBase {
-            value: number;
-        }
-    }
-    class FormattedRelative extends React.Component<FormattedRelative.Props, any> { }
-
-
-    namespace FormattedMessage {
-        export interface MessageDescriptor {
-            id: string;
-            description?: string;
-            defaultMessage?: string;
-        }
-
-        export interface Props extends MessageDescriptor {
-            values?: Object;
-            tagName?: string;
-        }
-    }
-    class FormattedMessage extends React.Component<FormattedMessage.Props, any> { }
-
-
-    class FormattedHTMLMessage extends React.Component<FormattedMessage.Props, any> { }
-
-
-    namespace FormattedNumber {
-        export interface PropsBase {
-            format?: string;
-            /*
-            * one of "best fit" (default) | "lookup"
-            */
-            localeMatcher?: string;
-            /*
-            * one of "decimal" (default) | "currency" | "percent"
-            */
-            style?: string;
-            currency?: string,
-            /*
-            * one of "symbol" (default) | "code" | "name"
-            */
-            currencyDisplay?: string;
-            useGrouping?: boolean;
-            minimumIntegerDigits?: number;
-            minimumFractionDigits?: number;
-            maximumFractionDigits?: number;
-            minimumSignificantDigits?: number;
-            maximumSignificantDigits?: number;
-        }
-
-        export interface Props extends PropsBase {
-            value: number;
-        }
-    }
-    class FormattedNumber extends React.Component<FormattedNumber.Props, any> { }
-
-
-    namespace FormattedPlural {
-        export interface PropsBase {
-            /*
-            * one of "cardinal" (default) | "ordinal"
-            */
-            style?: string;
-            other?: any;
-            zero?: any;
-            one?: any;
-            two?: any;
-            few?: any;
-            many?: any;
-        }
-
-        export interface Props extends PropsBase {
-            value: number;
-        }
-    }
-    class FormattedPlural extends React.Component<FormattedPlural.Props, any> { }
-
-
-    namespace IntlProvider {
-        export interface Props {
-            locale?: string;
-            formats?: Object;
-            messages?: Object;
-            defaultLocale?: string;
-            defaultFormats?: Object;
-        }
-    }
-    class IntlProvider extends React.Component<IntlProvider.Props, any> { }
-
-    class LocaleData extends Array<Locale> {
-    }
-}
-
-declare module "react-intl" {
-    export = ReactIntl
-}
-
-declare module "react-intl/lib/locale-data/en" {
-    var data: ReactIntl.LocaleData;
-    export = data;
-}
diff --git a/react-intl/tsconfig.json b/react-intl/tsconfig.json
new file mode 100644
index 0000000000..815a5928c5
--- /dev/null
+++ b/react-intl/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "files": [
+        "index.d.ts",
+        "react-intl-tests.tsx"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/react-mdl/index.d.ts b/react-mdl/index.d.ts
new file mode 100644
index 0000000000..8581c07cb8
--- /dev/null
+++ b/react-mdl/index.d.ts
@@ -0,0 +1,602 @@
+// Type definitions for react-mdl 1.5.3
+// Project: https://github.com/tleunen/react-mdl
+// Definitions by: Brad Zacher <https://github.com/bradzacher>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as React from 'react';
+
+export = __ReactMDL;
+
+declare namespace __ReactMDL {
+    type __MDLClassProps = React.ClassAttributes<any>;
+    type __MDLOtherProps = React.HTMLProps<any>;
+    class __MDLComponent<P extends __MDLClassProps> extends React.Component<P, {}> {}
+    class __MDLBasicComponent extends __MDLComponent<__MDLOtherProps> {}
+    
+    interface ShadowedComponent {
+        shadow ?: number;
+    }
+    interface RippleComponent {
+        ripple ?: boolean;
+    }
+    interface CustomRenderedComponent {
+        component ?: string | JSX.Element | Function;
+    }
+    
+    
+    // HTMLAttributes (minus the 'data', 'icon', 'label', 'name', 'rows', 'size', 'title', 'value' attributes)
+    interface MDLHTMLAttributes {
+        // React-specific Attributes
+        defaultChecked?: boolean;
+        defaultValue?: string | string[];
+
+        // Standard HTML Attributes
+        accept?: string;
+        acceptCharset?: string;
+        accessKey?: string;
+        action?: string;
+        allowFullScreen?: boolean;
+        allowTransparency?: boolean;
+        alt?: string;
+        async?: boolean;
+        autoComplete?: string;
+        autoFocus?: boolean;
+        autoPlay?: boolean;
+        capture?: boolean;
+        cellPadding?: number | string;
+        cellSpacing?: number | string;
+        charSet?: string;
+        challenge?: string;
+        checked?: boolean;
+        classID?: string;
+        className?: string;
+        cols?: number;
+        colSpan?: number;
+        content?: string;
+        contentEditable?: boolean;
+        contextMenu?: string;
+        controls?: boolean;
+        coords?: string;
+        crossOrigin?: string;
+        dateTime?: string;
+        default?: boolean;
+        defer?: boolean;
+        dir?: string;
+        disabled?: boolean;
+        download?: any;
+        draggable?: boolean;
+        encType?: string;
+        form?: string;
+        formAction?: string;
+        formEncType?: string;
+        formMethod?: string;
+        formNoValidate?: boolean;
+        formTarget?: string;
+        frameBorder?: number | string;
+        headers?: string;
+        height?: number | string;
+        hidden?: boolean;
+        high?: number;
+        href?: string;
+        hrefLang?: string;
+        htmlFor?: string;
+        httpEquiv?: string;
+        id?: string;
+        inputMode?: string;
+        integrity?: string;
+        is?: string;
+        keyParams?: string;
+        keyType?: string;
+        kind?: string;
+        lang?: string;
+        list?: string;
+        loop?: boolean;
+        low?: number;
+        manifest?: string;
+        marginHeight?: number;
+        marginWidth?: number;
+        max?: number | string;
+        maxLength?: number;
+        media?: string;
+        mediaGroup?: string;
+        method?: string;
+        min?: number | string;
+        minLength?: number;
+        multiple?: boolean;
+        muted?: boolean;
+        nonce?: string;
+        noValidate?: boolean;
+        open?: boolean;
+        optimum?: number;
+        pattern?: string;
+        placeholder?: string;
+        poster?: string;
+        preload?: string;
+        radioGroup?: string;
+        readOnly?: boolean;
+        rel?: string;
+        required?: boolean;
+        reversed?: boolean;
+        role?: string;
+        rowSpan?: number;
+        sandbox?: string;
+        scope?: string;
+        scoped?: boolean;
+        scrolling?: string;
+        seamless?: boolean;
+        selected?: boolean;
+        shape?: string;
+        sizes?: string;
+        span?: number;
+        spellCheck?: boolean;
+        src?: string;
+        srcDoc?: string;
+        srcLang?: string;
+        srcSet?: string;
+        start?: number;
+        step?: number | string;
+        style?: React.CSSProperties;
+        summary?: string;
+        tabIndex?: number;
+        target?: string;
+        type?: string;
+        useMap?: string;
+        width?: number | string;
+        wmode?: string;
+        wrap?: string;
+
+        // RDFa Attributes
+        about?: string;
+        datatype?: string;
+        inlist?: any;
+        prefix?: string;
+        property?: string;
+        resource?: string;
+        typeof?: string;
+        vocab?: string;
+
+        // Non-standard Attributes
+        autoCapitalize?: string;
+        autoCorrect?: string;
+        autoSave?: string;
+        color?: string;
+        itemProp?: string;
+        itemScope?: boolean;
+        itemType?: string;
+        itemID?: string;
+        itemRef?: string;
+        results?: number;
+        security?: string;
+        unselectable?: boolean;
+
+        // Allows aria- and data- Attributes
+        [key: string]: any;
+    }
+    // DOMAttributes (minus 'onClick', 'onChange')
+    interface MDLDOMAttributes {
+        // DOMAttributes (minus onClick)
+        children?: React.ReactNode;
+        dangerouslySetInnerHTML?: {
+            __html: string;
+        };
+
+        // Clipboard Events
+        onCopy?: React.ClipboardEventHandler;
+        onCut?: React.ClipboardEventHandler;
+        onPaste?: React.ClipboardEventHandler;
+
+        // Composition Events
+        onCompositionEnd?: React.CompositionEventHandler;
+        onCompositionStart?: React.CompositionEventHandler;
+        onCompositionUpdate?: React.CompositionEventHandler;
+
+        // Focus Events
+        onFocus?: React.FocusEventHandler;
+        onBlur?: React.FocusEventHandler;
+
+        // Form Events
+        onInput?: React.FormEventHandler;
+        onSubmit?: React.FormEventHandler;
+
+        // Image Events
+        onLoad?: React.ReactEventHandler;
+        onError?: React.ReactEventHandler; // also a Media Event
+
+        // Keyboard Events
+        onKeyDown?: React.KeyboardEventHandler;
+        onKeyPress?: React.KeyboardEventHandler;
+        onKeyUp?: React.KeyboardEventHandler;
+
+        // Media Events
+        onAbort?: React.ReactEventHandler;
+        onCanPlay?: React.ReactEventHandler;
+        onCanPlayThrough?: React.ReactEventHandler;
+        onDurationChange?: React.ReactEventHandler;
+        onEmptied?: React.ReactEventHandler;
+        onEncrypted?: React.ReactEventHandler;
+        onEnded?: React.ReactEventHandler;
+        onLoadedData?: React.ReactEventHandler;
+        onLoadedMetadata?: React.ReactEventHandler;
+        onLoadStart?: React.ReactEventHandler;
+        onPause?: React.ReactEventHandler;
+        onPlay?: React.ReactEventHandler;
+        onPlaying?: React.ReactEventHandler;
+        onProgress?: React.ReactEventHandler;
+        onRateChange?: React.ReactEventHandler;
+        onSeeked?: React.ReactEventHandler;
+        onSeeking?: React.ReactEventHandler;
+        onStalled?: React.ReactEventHandler;
+        onSuspend?: React.ReactEventHandler;
+        onTimeUpdate?: React.ReactEventHandler;
+        onVolumeChange?: React.ReactEventHandler;
+        onWaiting?: React.ReactEventHandler;
+
+        // MouseEvents
+        onContextMenu?: React.MouseEventHandler;
+        onDoubleClick?: React.MouseEventHandler;
+        onDrag?: React.DragEventHandler;
+        onDragEnd?: React.DragEventHandler;
+        onDragEnter?: React.DragEventHandler;
+        onDragExit?: React.DragEventHandler;
+        onDragLeave?: React.DragEventHandler;
+        onDragOver?: React.DragEventHandler;
+        onDragStart?: React.DragEventHandler;
+        onDrop?: React.DragEventHandler;
+        onMouseDown?: React.MouseEventHandler;
+        onMouseEnter?: React.MouseEventHandler;
+        onMouseLeave?: React.MouseEventHandler;
+        onMouseMove?: React.MouseEventHandler;
+        onMouseOut?: React.MouseEventHandler;
+        onMouseOver?: React.MouseEventHandler;
+        onMouseUp?: React.MouseEventHandler;
+
+        // Selection Events
+        onSelect?: React.ReactEventHandler;
+
+        // Touch Events
+        onTouchCancel?: React.TouchEventHandler;
+        onTouchEnd?: React.TouchEventHandler;
+        onTouchMove?: React.TouchEventHandler;
+        onTouchStart?: React.TouchEventHandler;
+
+        // UI Events
+        onScroll?: React.UIEventHandler;
+
+        // Wheel Events
+        onWheel?: React.WheelEventHandler;
+    }
+    
+    
+    
+    interface BadgeProps extends __MDLClassProps {
+        text: string | number;
+        className ?: string;
+        noBackground ?: boolean;
+        overlap ?: boolean;
+    }
+    class Badge extends __MDLComponent<BadgeProps> {}
+    
+    
+    interface ButtonProps extends __MDLOtherProps, RippleComponent, CustomRenderedComponent {
+        accent ?: boolean;
+        colored ?: boolean;
+        primary ?: boolean;
+    }
+    interface StandardButtonProps extends ButtonProps {
+        raised ?: boolean;
+    }
+    interface FABButtonProps extends ButtonProps {
+        mini ?: boolean;
+    }
+    interface IconButtonProps extends ButtonProps {
+        name ?: string;
+        raised ?: boolean;
+    }
+    class Button extends __MDLComponent<StandardButtonProps> {}
+    class FABButton extends __MDLComponent<FABButtonProps> {}
+    class IconButton extends __MDLComponent<IconButtonProps> {}
+    
+    
+    interface CardProps extends __MDLOtherProps, ShadowedComponent {}
+    interface CardActionProps extends __MDLOtherProps {
+        border ?: boolean;
+    }
+    interface CardTitleProps extends __MDLOtherProps {
+        expand ?: boolean;
+    }
+    class Card extends __MDLComponent<CardProps> {}
+    class CardActions extends __MDLComponent<CardActionProps> {}
+    class CardTitle extends __MDLComponent<CardTitleProps> {}
+    class CardText extends __MDLBasicComponent {}
+    class CardMenu extends __MDLBasicComponent {}
+    class CardMedia extends __MDLBasicComponent {}
+    
+    
+    interface CheckboxProps extends __MDLOtherProps, RippleComponent {
+        checked ?: boolean;
+        disabled ?: boolean;
+        label ?: string;
+    }
+    class Checkbox extends __MDLComponent<CheckboxProps> {}
+    
+    interface UndecoratedTableProps extends __MDLClassProps, MDLHTMLAttributes, React.DOMAttributes, ShadowedComponent {
+        rows: Array<any>;
+        rowKeyColumn ?: string;
+        
+        name ?: string;
+        title ?: string;
+    }
+    interface TableProps extends UndecoratedTableProps {
+        sortable ?: boolean;
+        selectable ?: boolean;
+        onSelectionChanged ?: (row : any) => any;
+    }
+    interface TableHeaderProps extends __MDLClassProps, MDLHTMLAttributes, MDLDOMAttributes {
+        name : string;
+        title ?: string;
+        cellFormatter ?: (value : any, row : any, index : number) => React.ReactNode;
+        numeric ?: boolean;
+        nosort ?: boolean;
+        onClick ?: (e : React.MouseEvent, name : string) => any;
+        sortFn ?: (a : any, b : any, isAsc : boolean) => number;
+        tooltip ?: React.ReactNode;
+    }
+    class Table extends __MDLComponent<TableProps> {}
+    class TableHeader extends __MDLComponent<TableHeaderProps> {}
+    class UndecoratedTable extends __MDLComponent<UndecoratedTableProps> {}
+    class DataTable extends Table {}
+    
+    
+    interface DialogProps extends __MDLOtherProps {
+        open ?: boolean;
+    }
+    interface DialogActionsProps extends __MDLOtherProps {
+        fullWidth ?: boolean;
+    }
+    interface DialogTitleProps extends __MDLOtherProps, CustomRenderedComponent {}
+    class Dialog extends __MDLComponent<DialogProps> {}
+    class DialogActions extends __MDLComponent<DialogActionsProps> {}
+    class DialogTitle extends __MDLComponent<DialogTitleProps> {}
+    class DialogContent extends __MDLBasicComponent {}
+    
+    
+    interface GridProps extends __MDLOtherProps, CustomRenderedComponent, ShadowedComponent {
+        noSpacing ?: boolean;
+    }
+    interface CellProps extends __MDLOtherProps, CustomRenderedComponent, ShadowedComponent {
+        col : number;
+        align ?: string;
+        phone ?: number;
+        tablet ?: number;
+        hideDesktop ?: boolean;
+        hidePhone ?: boolean;
+        hideTablet ?: boolean;
+    }
+    class Grid extends __MDLComponent<GridProps> {}
+    class Cell extends __MDLComponent<CellProps> {}
+    
+    
+    interface IconProps extends __MDLOtherProps {
+        name : string;
+    }
+    class Icon extends __MDLComponent<IconProps> {}
+    
+    
+    interface IconToggleProps extends __MDLOtherProps, RippleComponent {
+        name : string;
+        checked ?: boolean;
+        disabled ?: boolean;
+    }
+    class IconToggle extends __MDLComponent<IconToggleProps> {}
+    
+    
+    interface ContentProps extends __MDLOtherProps, CustomRenderedComponent {}
+    interface DrawerProps extends __MDLOtherProps {
+        title ?: string;
+    }
+    interface HeaderProps extends __MDLOtherProps {
+        title ?: string;
+        scroll ?: boolean;
+        seamed ?: boolean;
+        transparent ?: boolean;
+        waterfall ?: boolean;
+        hideTop ?: boolean;
+    }
+    interface HeaderRowProps extends __MDLOtherProps {
+        title ?: string;
+    }
+    interface HeaderTabsProps extends __MDLOtherProps, RippleComponent {
+        activeTab ?: number;
+        onChange ?: React.FormEventHandler;
+    }
+    interface LayoutProps extends __MDLOtherProps {
+        fixedDrawer ?: boolean;
+        fixedHeader ?: boolean;
+        fixedTabse ?: boolean;
+    }
+    interface NavigationProps extends __MDLOtherProps {}
+    class Content extends __MDLComponent<ContentProps> {}
+    class Drawer extends __MDLComponent<DrawerProps> {}
+    class Header extends __MDLComponent<HeaderProps> {}
+    class HeaderRow extends __MDLComponent<HeaderRowProps> {}
+    class HeaderTabs extends __MDLComponent<HeaderTabsProps> {}
+    class Layout extends __MDLComponent<LayoutProps> {}
+    class Navigation extends __MDLComponent<NavigationProps> {}
+    class Spacer extends __MDLBasicComponent {}
+    
+    interface FooterProps extends MDLHTMLAttributes, React.DOMAttributes {
+        size ?: string;
+        
+        title ?: string;
+    }
+    interface FooterDropDownSectionProps extends MDLHTMLAttributes, React.DOMAttributes {
+        size ?: string;
+        title : React.ReactNode;
+    }
+    interface FooterLinkListProps extends MDLHTMLAttributes, React.DOMAttributes {
+        size ?: string;
+        
+        title ?: string;
+    }
+    interface FooterSectionProps extends MDLHTMLAttributes, React.DOMAttributes {
+        size ?: string;
+        type ?: string;
+        logo ?: React.ReactNode;
+        
+        title ?: string;
+    }
+    class Footer extends __MDLComponent<FooterProps> {}
+    class FooterDropDownSection extends __MDLComponent<FooterDropDownSectionProps> {}
+    class FooterLinkList extends __MDLComponent<FooterLinkListProps> {}
+    class FooterSection extends __MDLComponent<FooterSectionProps> {}
+    
+    interface ListItemProps extends __MDLOtherProps {
+        twoLine ?: boolean;
+        threeLine ?: boolean;
+    }
+    interface ListItemActionProps extends __MDLOtherProps {
+        info ?: string;
+    }
+    interface ListItemContentProps extends MDLHTMLAttributes, React.DOMAttributes {
+        avatar ?: string | JSX.Element;
+        icon ?: string | JSX.Element;
+        subtitle ?: React.ReactNode;
+        useBodyClass ?: boolean;
+    }
+    class List extends __MDLBasicComponent {}
+    class ListItem extends __MDLComponent<ListItemProps> {}
+    class ListItemAction extends __MDLComponent<ListItemActionProps> {}
+    class ListItemContent extends __MDLComponent<ListItemContentProps> {}
+    
+    
+    interface MenuProps extends __MDLOtherProps, RippleComponent {
+        target : string;
+        align ?: string;
+        valign ?: string;
+    }
+    class Menu extends __MDLComponent<MenuProps> {}
+    class MenuItem extends __MDLBasicComponent {}
+    
+    
+    interface ProgressBarProps extends __MDLOtherProps {
+        buffer ?: number;
+        indeterminate ?: boolean;
+        progress ?: number;
+    }
+    class ProgressBar extends __MDLComponent<ProgressBarProps> {}
+    
+    
+    interface RadioProps extends MDLHTMLAttributes, React.DOMAttributes, RippleComponent {
+        value : string | number;
+        checked ?: boolean;
+        disabled ?: boolean;
+        name ?: string;
+        onChange ?: React.FormEventHandler;
+        label ?: string;
+    }
+    interface RadioGroupProps extends MDLHTMLAttributes, React.DOMAttributes {
+        name : string;
+        value : string | number;
+        childContainer ?: string;
+        container ?: string;
+        onChange ?: React.FormEventHandler;
+        label ?: string;
+    }
+    class Radio extends __MDLComponent<RadioProps> {}
+    class RadioGroup extends __MDLComponent<RadioGroupProps> {}
+    
+    
+    interface SliderProps extends MDLHTMLAttributes, React.DOMAttributes {
+        max : number;
+        min : number;
+        onChange ?: React.FormEventHandler;
+        value ?: number;
+    }
+    class Slider extends __MDLComponent<SliderProps> {}
+    
+    
+    interface SnackbarProps extends __MDLOtherProps {
+        active : boolean;
+        onTimeout : () => any;
+        action ?: string;
+        onActionClick ?: React.MouseEventHandler;
+        timeout ?: number;
+    }
+    class Snackbar extends __MDLComponent<SnackbarProps> {}
+    
+    
+    interface SpinnerProps extends __MDLOtherProps {
+        singleColor ?: boolean;
+    }
+    class Spinner extends __MDLComponent<SpinnerProps> {}
+    
+    
+    interface SwitchProps extends __MDLOtherProps, RippleComponent {
+        checked ?: boolean;
+        disabled ?: boolean;
+        onChange ?: React.FormEventHandler;
+    }
+    class Switch extends __MDLComponent<SwitchProps> {}
+    
+    
+    interface TabProps extends __MDLOtherProps, CustomRenderedComponent {
+        active ?: boolean;
+        cssPrefix ?: string;
+        onTabClick ?: (tabId : number) => any;
+        tabId ?: number;
+    }
+    interface TabBarProps extends MDLHTMLAttributes, MDLDOMAttributes {
+        cssPrefix : string;
+        activeTab ?: number;
+        onChange ?: (tabId : number) => any;
+        
+        name ?: string;
+        title ?: string;        
+        onClick ?: React.MouseEventHandler;
+    }
+    interface TabsProps extends MDLHTMLAttributes, MDLDOMAttributes {
+        activeTab ?: number;
+        onChange ?: (tabId : number) => any;
+        tabBarProps ?: TabBarProps;
+        
+        name ?: string;
+        title ?: string;        
+        onClick ?: React.MouseEventHandler;
+    }
+    class Tab extends __MDLComponent<TabProps> {}
+    class TabBar extends __MDLComponent<TabBarProps> {}
+    class Tabs extends __MDLComponent<TabsProps> {}
+    
+    
+    interface TextfieldProps extends MDLHTMLAttributes, React.DOMAttributes {
+        label : string;
+        disabled ?: boolean;
+        error ?: React.ReactNode;
+        expandable ?: boolean;
+        expandableIcon ?: string;
+        floatingLabel ?: boolean;
+        id ?: string;
+        inputClassName ?: string;
+        maxRows ?: number;
+        onChange ?: React.FormEventHandler;
+        pattern ?: string;
+        required ?: boolean;
+        rows ?: number;
+        value ?: string | number;
+        
+        name ?: string;
+        title ?: string;
+    }
+    class Textfield extends __MDLComponent<TextfieldProps> {}
+    
+    
+    interface TooltipProps extends MDLHTMLAttributes, React.DOMAttributes {
+        label : React.ReactNode;
+        large ?: boolean;
+        position ?: string;
+        
+        name ?: string;
+        title ?: string;
+    }
+    class Tooltip extends __MDLComponent<TooltipProps> {}
+}
diff --git a/react-mdl/react-mdl-tests.tsx b/react-mdl/react-mdl-tests.tsx
new file mode 100644
index 0000000000..8956f25b27
--- /dev/null
+++ b/react-mdl/react-mdl-tests.tsx
@@ -0,0 +1,1044 @@
+// Test file for react-mdl Definition file
+
+
+import * as React from 'react';
+import {Badge,
+    FABButton, Button, IconButton,
+    Card, CardActions, CardTitle, CardText, CardMenu, CardMedia,
+    Checkbox,
+    DataTable, TableHeader, Table,
+    Dialog, DialogTitle, DialogContent, DialogActions,
+    Grid, Cell,
+    Icon, IconToggle,
+    Layout, Header, Navigation, Drawer, Content, HeaderRow, HeaderTabs, Footer, FooterDropDownSection, FooterLinkList, FooterSection,
+    List, ListItem, ListItemContent, ListItemAction,
+    Menu, MenuItem,
+    ProgressBar,
+    RadioGroup, Radio,
+    Slider,
+    Snackbar,
+    Spinner,
+    Switch,
+    Tabs, Tab,
+    Textfield,
+    Tooltip} from 'react-mdl';
+
+// all tests are from the examples provided here: https://tleunen.github.io/react-mdl/
+
+// Badge tests
+React.createClass({
+    render: function() {
+        return (
+            <div>
+                {/* Number badge on icon */}
+                <Badge text="1" overlap>
+                    <Icon name="account_box" />
+                </Badge>
+
+                {/* Icon badge on icon */}
+                <Badge text="♥" overlap>
+                    <Icon name="account_box" />
+                </Badge>
+                
+                {/* Number badge on text */}
+                <Badge text="4">Inbox</Badge>
+
+                {/* Icon badge without background on text */}
+                <Badge text="♥" noBackground>Mood</Badge>
+            </div>
+        );
+    }
+});
+
+// Button tests
+React.createClass({
+    render: function() {
+        return (
+            <div>
+                {/* Colored FAB button */}
+                <FABButton colored>
+                    <Icon name="add" />
+                </FABButton>
+
+                {/* Colored FAB button with ripple */}
+                <FABButton colored ripple>
+                    <Icon name="add" />
+                </FABButton>
+
+                {/* FAB button */}
+                <FABButton>
+                    <Icon name="add" />
+                </FABButton>
+
+                {/* FAB button with ripple */}
+                <FABButton ripple>
+                    <Icon name="add" />
+                </FABButton>
+
+                {/* Disabled FAB button */}
+                <FABButton disabled>
+                    <Icon name="add" />
+                </FABButton>
+
+                {/* Mini FAB button */}
+                <FABButton mini>
+                    <Icon name="add" />
+                </FABButton>
+
+                {/* Colored Mini FAB button */}
+                <FABButton mini colored>
+                    <Icon name="add" />
+                </FABButton>
+
+                {/* Raised button */}
+                <Button raised>Button</Button>
+
+                {/* Raised button with ripple */}
+                <Button raised ripple>Button</Button>
+
+                {/* Disabled Raised button */}
+                <Button raised disabled>Button</Button>
+
+                {/* Colored Raised button */}
+                <Button raised colored>Button</Button>
+
+                {/* Accent-colored button without ripple */}
+                <Button raised accent>Button</Button>
+
+                {/* Accent-colored button with ripple */}
+                <Button raised accent ripple>Button</Button>
+
+                {/* Flat button */}
+                <Button>Button</Button>
+
+                {/* Flat button with ripple */}
+                <Button ripple>Button</Button>
+
+                {/* Disabled flat button */}
+                <Button disabled>Button</Button>
+
+                {/* Primary colored flat button */}
+                <Button primary>Button</Button>
+
+                {/* Accent-colored flat button */}
+                <Button accent>Button</Button>
+
+                {/* Icon button */}
+                <IconButton name="mood" />
+
+                {/* Colored Icon button */}
+                <IconButton name="mood" colored />
+            </div>
+        );
+    }
+})
+
+// Card tests
+React.createClass({
+    render: function() {
+        return (
+            <div>
+                <Card shadow={0} style={{width: '512px', margin: 'auto'}}>
+                    <CardTitle style={{color: '#fff', height: '176px', background: 'url(http://www.getmdl.io/assets/demos/welcome_card.jpg) center / cover'}}>Welcome</CardTitle>
+                    <CardText>
+                        Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+                        Mauris sagittis pellentesque lacus eleifend lacinia...
+                    </CardText>
+                    <CardActions border>
+                        <Button colored>Get Started</Button>
+                    </CardActions>
+                    <CardMenu style={{color: '#fff'}}>
+                        <IconButton name="share" />
+                    </CardMenu>
+                </Card>
+                
+                <Card shadow={0} style={{width: '320px', height: '320px', margin: 'auto'}}>
+                    <CardTitle expand style={{color: '#fff', background: 'url(http://www.getmdl.io/assets/demos/dog.png) bottom right 15% no-repeat #46B6AC'}}>Update</CardTitle>
+                    <CardText>
+                        Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+                        Aenan convallis.
+                    </CardText>
+                    <CardActions border>
+                        <Button colored>View Updates</Button>
+                    </CardActions>
+                </Card>
+                
+                <Card shadow={0} style={{width: '256px', height: '256px', background: 'url(http://www.getmdl.io/assets/demos/image_card.jpg) center / cover', margin: 'auto'}}>
+                    <CardTitle expand />
+                    <CardActions style={{height: '52px', padding: '16px', background: 'rgba(0,0,0,0.2)'}}>
+                        <span style={{color: '#fff', fontSize: '14px', fontWeight: '500'}}>
+                            Image.jpg
+                        </span>
+                    </CardActions>
+                </Card>
+                
+                <Card shadow={0} style={{width: '256px', height: '256px', background: '#3E4EB8'}}>
+                    <CardTitle expand style={{alignItems: 'flex-start', color: '#fff'}}>
+                        <h4 style={{marginTop: '0'}}>
+                            Featured event:<br />
+                            May 24, 2016<br />
+                            7-11pm
+                        </h4>
+                    </CardTitle>
+                    <CardActions border style={{borderColor: 'rgba(255, 255, 255, 0.2)', display: 'flex', boxSizing: 'border-box', alignItems: 'center', color: '#fff'}}>
+                        <Button colored style={{color: '#fff'}}>Add to Calendar</Button>
+                        <div className="mdl-layout-spacer"></div>
+                        <Icon name="event" />
+                    </CardActions>
+                </Card>
+            </div>
+        );
+    }
+});
+
+// Checkbox tests
+React.createClass({
+    render: function() {
+        return (
+            <div>
+                <Checkbox label="With ripple" ripple defaultChecked />
+
+                <Checkbox label="Without ripple" />
+            </div>
+        );
+    }
+});
+
+// DataTable tests
+React.createClass({
+    render: function() {
+        return (
+            <div>
+                <DataTable
+                    shadow={0}
+                    rows={[
+                        {material: 'Acrylic (Transparent)', quantity: 25, price: 2.90},
+                        {material: 'Plywood (Birch)', quantity: 50, price: 1.25},
+                        {material: 'Laminate (Gold on Blue)', quantity: 10, price: 2.35}
+                    ]}
+                >
+                    <TableHeader name="material" tooltip="The amazing material name">Material</TableHeader>
+                    <TableHeader numeric name="quantity" tooltip="Number of materials">Quantity</TableHeader>
+                    <TableHeader numeric name="price" cellFormatter={(price) => `\$${price.toFixed(2)}`} tooltip="Price pet unit">Price</TableHeader>
+                </DataTable>
+
+                <DataTable
+                    selectable
+                    shadow={0}
+                    rowKeyColumn="id"
+                    rows={[
+                        {id: 1001, material: 'Acrylic (Transparent)', quantity: 25, price: 2.90},
+                        {id: 1002, material: 'Plywood (Birch)', quantity: 50, price: 1.25},
+                        {id: 1003, material: 'Laminate (Gold on Blue)', quantity: 10, price: 2.35}
+                    ]}
+                >
+                    <TableHeader name="material" tooltip="The amazing material name">Material</TableHeader>
+                    <TableHeader numeric name="quantity" tooltip="Number of materials">Quantity</TableHeader>
+                    <TableHeader numeric name="price" cellFormatter={(price) => `\$${price.toFixed(2)}`} tooltip="Price pet unit">Price</TableHeader>
+                </DataTable>
+
+                <Table
+                    sortable
+                    shadow={0}
+                    rows={[
+                        {material: 'Acrylic (Transparent)', quantity: 25, price: 2.90},
+                        {material: 'Plywood (Birch)', quantity: 50, price: 1.25},
+                        {material: 'Laminate (Gold on Blue)', quantity: 10, price: 2.35}
+                    ]}
+                >
+                    <TableHeader
+                        name="material"
+                        sortable
+                        sortFn={(a, b, isAsc) => (isAsc ? a : b).match(/\((.*)\)/)[1].localeCompare((isAsc ? b : a).match(/\((.*)\)/)[1])}
+                        tooltip="The amazing material name"
+                    >
+                        Material
+                    </TableHeader>
+                    <TableHeader
+                        numeric
+                        name="quantity"
+                        tooltip="Number of materials"
+                    >
+                        Quantity
+                    </TableHeader>
+                    <TableHeader
+                        numeric
+                        sortable
+                        name="price"
+                        cellFormatter={(price) => `\$${price.toFixed(2)}`}
+                        tooltip="Price pet unit"
+                    >
+                        Price
+                    </TableHeader>
+                </Table>
+            </div>
+        );
+    }
+});
+
+// Dialog tests
+React.createClass({
+    render: function() {
+        return (
+            <div>
+                <div>
+                    <Button colored onClick={this.handleOpenDialog} raised ripple>Show Dialog</Button>
+                    <Dialog open={this.state.openDialog}>
+                    <DialogTitle>Allow data collection?</DialogTitle>
+                    <DialogContent>
+                        <p>Allowing us to collect data will let us get you the information you want faster.</p>
+                    </DialogContent>
+                    <DialogActions>
+                        <Button type='button'>Agree</Button>
+                        <Button type='button' onClick={this.handleCloseDialog}>Disagree</Button>
+                    </DialogActions>
+                    </Dialog>
+                </div>
+                
+                <div>
+                    <Button colored onClick={this.handleOpenDialog} raised ripple>Show Modal</Button>
+                    <Dialog open={this.state.openDialog}>
+                    <DialogTitle>Allow this site to collect usage data to improve your experience?</DialogTitle>
+                    <DialogContent>
+                        <p>Allowing us to collect data will let us get you the information you want faster.</p>
+                    </DialogContent>
+                    <DialogActions fullWidth>
+                        <Button type='button'>Agree</Button>
+                        <Button type='button' onClick={this.handleCloseDialog}>Disagree</Button>
+                    </DialogActions>
+                    </Dialog>
+                </div>
+                
+                <div>
+                    <Button colored onClick={this.handleOpenDialog} onCancel={this.handleCloseDialog} raised ripple>Show Dialog</Button>
+                    <Dialog open={this.state.openDialog} onCancel={this.handleCloseDialog}>
+                    <DialogTitle>Allow data collection?</DialogTitle>
+                    <DialogContent>
+                        <p>Allowing us to collect data will let us get you the information you want faster.</p>
+                    </DialogContent>
+                    <DialogActions>
+                        <Button type='button'>Agree</Button>
+                        <Button type='button' onClick={this.handleCloseDialog}>Disagree</Button>
+                    </DialogActions>
+                    </Dialog>
+                </div>
+            </div>
+        );
+    }
+});
+
+// Grid tests
+React.createClass({
+    render: function() {
+        return (
+            <div>
+                <div style={{width: '80%', margin: 'auto'}}>
+                    <Grid className="demo-grid-ruler">
+                        <Cell col={1}>1</Cell>
+                        <Cell col={1}>1</Cell>
+                        <Cell col={1}>1</Cell>
+                        <Cell col={1}>1</Cell>
+                        <Cell col={1}>1</Cell>
+                        <Cell col={1}>1</Cell>
+                        <Cell col={1}>1</Cell>
+                        <Cell col={1}>1</Cell>
+                        <Cell col={1}>1</Cell>
+                        <Cell col={1}>1</Cell>
+                        <Cell col={1}>1</Cell>
+                        <Cell col={1}>1</Cell>
+                    </Grid>
+                    <Grid className="demo-grid-1">
+                        <Cell col={4}>4</Cell>
+                        <Cell col={4}>4</Cell>
+                        <Cell col={4}>4</Cell>
+                    </Grid>
+                    <Grid className="demo-grid-2">
+                        <Cell col={6}>6</Cell>
+                        <Cell col={4}>4</Cell>
+                        <Cell col={2}>2</Cell>
+                    </Grid>
+                    <Grid className="demo-grid-3">
+                        <Cell col={6} tablet={8}>6 (8 tablet)</Cell>
+                        <Cell col={4} tablet={6}>4 (6 tablet)</Cell>
+                        <Cell col={2} phone={4}>2 (4 phone)</Cell>
+                    </Grid>
+                </div>
+            </div>
+        );
+    }
+});
+
+// IconToggle tests
+React.createClass({
+    render: function() {
+        return (
+            <div>
+                <IconToggle ripple id="bold" name="format_bold" defaultChecked />
+
+                <IconToggle id="italic" name="format_italic" />
+            </div>
+        );
+    }
+});
+
+// Layout tests
+React.createClass({
+    render: function() {
+        return (
+            <div>
+                {/* Uses a transparent header that draws on top of the layout's background */}
+                <div style={{height: '300px', position: 'relative'}}>
+                    <Layout style={{background: 'url(http://www.getmdl.io/assets/demos/transparent.jpg) center / cover'}}>
+                        <Header transparent title="Title" style={{color: 'white'}}>
+                            <Navigation>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                            </Navigation>
+                        </Header>
+                        <Drawer title="Title">
+                            <Navigation>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                            </Navigation>
+                        </Drawer>
+                        <Content />
+                    </Layout>
+                </div>
+
+                {/* No header, and the drawer stays open on larger screens (fixed drawer). */}
+                <div style={{height: '300px', position: 'relative'}}>
+                    <Layout fixedDrawer>
+                        <Drawer title="Title">
+                            <Navigation>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                            </Navigation>
+                        </Drawer>
+                        <Content />
+                    </Layout>
+                </div>
+
+                {/* Always shows a header, even in smaller screens. */}
+                <div style={{height: '300px', position: 'relative'}}>
+                    <Layout fixedHeader>
+                        <Header title={<span><span style={{ color: '#ddd' }}>Area / </span><strong>The Title</strong></span>}>
+                            <Navigation>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                            </Navigation>
+                        </Header>
+                        <Drawer title="Title">
+                            <Navigation>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                            </Navigation>
+                        </Drawer>
+                        <Content />
+                    </Layout>
+                </div>
+
+                {/* The drawer is always open in large screens. The header is always shown, even in small screens. */}
+                <div style={{height: '300px', position: 'relative'}}>
+                    <Layout fixedHeader fixedDrawer>
+                        <Header title="Title">
+                            <Textfield
+                                value=""
+                                onChange={() => {}}
+                                label="Search"
+                                expandable
+                                expandableIcon="search"
+                            />
+                        </Header>
+                        <Drawer title="Title">
+                            <Navigation>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                            </Navigation>
+                        </Drawer>
+                        <Content />
+                    </Layout>
+                </div>
+
+                {/* Uses a header that scrolls with the text, rather than staying locked at the top */}
+                <div className="demo-big-content">
+                    <Layout>
+                        <Header title="Title" scroll>
+                            <Navigation>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                            </Navigation>
+                        </Header>
+                        <Drawer title="Title">
+                            <Navigation>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                            </Navigation>
+                        </Drawer>
+                        <Content>
+                            <div className="page-content" />
+                        </Content>
+                    </Layout>
+                </div>
+
+                {/* Uses a header that contracts as the page scrolls down. */}
+                <div className="demo-big-content">
+                    <Layout>
+                        <Header waterfall>
+                            <HeaderRow title="Title">
+                                <Textfield
+                                    value=""
+                                    onChange={() => {}}
+                                    label="Search"
+                                    expandable
+                                    expandableIcon="search"
+                                />
+                            </HeaderRow>
+                            <HeaderRow>
+                                <Navigation>
+                                    <a href="">Link</a>
+                                    <a href="">Link</a>
+                                    <a href="">Link</a>
+                                    <a href="">Link</a>
+                                </Navigation>
+                            </HeaderRow>
+                        </Header>
+                        <Drawer title="Title">
+                            <Navigation>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                            </Navigation>
+                        </Drawer>
+                        <Content>
+                            <div className="page-content" />
+                        </Content>
+                    </Layout>
+                </div>
+
+                {/* Hide the top part of the header when scrolling down */}
+                <div className="demo-big-content">
+                    <Layout>
+                        <Header waterfall hideTop>
+                            <HeaderRow title="Title">
+                                <Textfield
+                                    value=""
+                                    onChange={() => {}}
+                                    label="Search"
+                                    expandable
+                                    expandableIcon="search"
+                                />
+                            </HeaderRow>
+                            <HeaderRow>
+                                <Navigation>
+                                    <a href="">Link</a>
+                                    <a href="">Link</a>
+                                    <a href="">Link</a>
+                                    <a href="">Link</a>
+                                </Navigation>
+                            </HeaderRow>
+                        </Header>
+                        <Drawer title="Title">
+                            <Navigation>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                                <a href="">Link</a>
+                            </Navigation>
+                        </Drawer>
+                        <Content>
+                            <div className="page-content" />
+                        </Content>
+                    </Layout>
+                </div>
+
+                <div style={{height: '300px', position: 'relative'}}>
+                    <Layout fixedHeader>
+                        <Header>
+                            <HeaderRow title="Title" />
+                            <HeaderTabs activeTab={this.state.activeTab} onChange={(tabId) => this.setState({ activeTab: tabId })}>
+                                <Tab>Tab1</Tab>
+                                <Tab>Tab2</Tab>
+                                <Tab>Tab3</Tab>
+                                <Tab>Tab4</Tab>
+                                <Tab>Tab5</Tab>
+                                <Tab>Tab6</Tab>
+                            </HeaderTabs>
+                        </Header>
+                        <Drawer title="Title" />
+                        <Content>
+                            <div className="page-content">Content for the tab: {this.state.activeTab}</div>
+                        </Content>
+                    </Layout>
+                </div>
+
+                {/* Simple header with fixed tabs. */}
+                <div style={{height: '300px', position: 'relative'}}>
+                    <Layout fixedHeader fixedTabs>
+                        <Header>
+                            <HeaderRow title="Title" />
+                            <HeaderTabs activeTab={1} onChange={(tabId) => {}}>
+                                <Tab>Tab1</Tab>
+                                <Tab>Tab2</Tab>
+                                <Tab>Tab3</Tab>
+                            </HeaderTabs>
+                        </Header>
+                        <Drawer title="Title" />
+                        <Content>
+                            <div className="page-content">You can add logic to update the content of this container based on the "activeTab" receive in the `onChange` callback.</div>
+                        </Content>
+                    </Layout>
+                </div>
+
+                <Footer size="mega">
+                    <FooterSection type="middle">
+                        <FooterDropDownSection title="Features">
+                            <FooterLinkList>
+                                <a href="#">About</a>
+                                <a href="#">Terms</a>
+                                <a href="#">Partners</a>
+                                <a href="#">Updates</a>
+                            </FooterLinkList>
+                        </FooterDropDownSection>
+                        <FooterDropDownSection title="Details">
+                            <FooterLinkList>
+                                <a href="#">Specs</a>
+                                <a href="#">Tools</a>
+                                <a href="#">Resources</a>
+                            </FooterLinkList>
+                        </FooterDropDownSection>
+                        <FooterDropDownSection title="Technology">
+                            <FooterLinkList>
+                                <a href="#">How it works</a>
+                                <a href="#">Patterns</a>
+                                <a href="#">Usage</a>
+                                <a href="#">Products</a>
+                                <a href="#">Contracts</a>
+                            </FooterLinkList>
+                        </FooterDropDownSection>
+                        <FooterDropDownSection title="FAQ">
+                            <FooterLinkList>
+                                <a href="#">Questions</a>
+                                <a href="#">Answers</a>
+                                <a href="#">Contact Us</a>
+                            </FooterLinkList>
+                        </FooterDropDownSection>
+                    </FooterSection>
+                    <FooterSection type="bottom" logo="Title">
+                        <FooterLinkList>
+                            <a href="#">Help</a>
+                            <a href="#">Privacy & Terms</a>
+                        </FooterLinkList>
+                    </FooterSection>
+                </Footer>
+
+                <Footer size="mini">
+                    <FooterSection type="left" logo="Title">
+                        <FooterLinkList>
+                            <a href="#">Help</a>
+                            <a href="#">Privacy & Terms</a>
+                        </FooterLinkList>
+                    </FooterSection>
+                </Footer>
+            </div>
+        );
+    }
+});
+
+// List tests
+React.createClass({
+    render: function() {
+        return (
+            <div>
+                <List>
+                <ListItem>Bryan Cranston</ListItem>
+                <ListItem>Aaron Paul</ListItem>
+                <ListItem>Bob Odenkirk</ListItem>
+                </List>
+
+                <List>
+                <ListItem>
+                    <ListItemContent icon="person">Bryan Cranston</ListItemContent>
+                </ListItem>
+                <ListItem>
+                    <ListItemContent icon="person">Aaron Paul</ListItemContent>
+                </ListItem>
+                <ListItem>
+                    <ListItemContent icon="person">Bob Odenkirk</ListItemContent>
+                </ListItem>
+                </List>
+
+                <List style={{width: '300px'}}>
+                <ListItem>
+                    <ListItemContent avatar="person">Bryan Cranston</ListItemContent>
+                    <ListItemAction>
+                    <a href="#"><Icon name="star" /></a>
+                    </ListItemAction>
+                </ListItem>
+                <ListItem>
+                    <ListItemContent avatar="person">Aaron Paul</ListItemContent>
+                    <ListItemAction>
+                    <a href="#"><Icon name="star" /></a>
+                    </ListItemAction>
+                </ListItem>
+                <ListItem>
+                    <ListItemContent avatar="person">Bob Odenkirk</ListItemContent>
+                    <ListItemAction>
+                    <a href="#"><Icon name="star" /></a>
+                    </ListItemAction>
+                </ListItem>
+                </List>
+
+                <List style={{width: '300px'}}>
+                <ListItem>
+                    <ListItemContent avatar="person">Bryan Cranston</ListItemContent>
+                    <ListItemAction>
+                    <Checkbox defaultChecked />
+                    </ListItemAction>
+                </ListItem>
+                <ListItem>
+                    <ListItemContent avatar="person">Aaron Paul</ListItemContent>
+                    <ListItemAction>
+                    <Radio value={1} />
+                    </ListItemAction>
+                </ListItem>
+                <ListItem>
+                    <ListItemContent avatar="person">Bob Odenkirk</ListItemContent>
+                    <ListItemAction>
+                    <Switch defaultChecked />
+                    </ListItemAction>
+                </ListItem>
+                </List>
+
+                <List style={{width: '300px'}}>
+                <ListItem twoLine>
+                    <ListItemContent avatar="person" subtitle="62 episodes">Bryan Cranston</ListItemContent>
+                    <ListItemAction info="Actor">
+                    <a href="#"><Icon name="star" /></a>
+                    </ListItemAction>
+                </ListItem>
+                <ListItem twoLine>
+                    <ListItemContent avatar="person" subtitle="62 episodes">Aaron Paul</ListItemContent>
+                    <ListItemAction>
+                    <a href="#"><Icon name="star" /></a>
+                    </ListItemAction>
+                </ListItem>
+                <ListItem twoLine>
+                    <ListItemContent avatar="person" subtitle="62 episodes">Bob Odenkirk</ListItemContent>
+                    <ListItemAction>
+                    <a href="#"><Icon name="star" /></a>
+                    </ListItemAction>
+                </ListItem>
+                </List>
+
+                <List style={{width: '650px'}}>
+                <ListItem threeLine>
+                    <ListItemContent avatar="person" subtitle="Bryan Cranston played the role of Walter in Breaking Bad. He is also known for playing Hal in Malcom in the Middle.">Bryan Cranston</ListItemContent>
+                    <ListItemAction>
+                    <a href="#"><Icon name="star" /></a>
+                    </ListItemAction>
+                </ListItem>
+                <ListItem threeLine>
+                    <ListItemContent avatar="person" subtitle="Aaron Paul played the role of Jesse in Breaking Bad. He also featured in the Need For Speed Movie.">Aaron Paul</ListItemContent>
+                    <ListItemAction>
+                    <a href="#"><Icon name="star" /></a>
+                    </ListItemAction>
+                </ListItem>
+                <ListItem threeLine>
+                    <ListItemContent avatar="person" subtitle="Bob Odinkrik played the role of Saul in Breaking Bad. Due to public fondness for the character, Bob stars in his own show now, called Better Call Saul.">Bob Odenkirk</ListItemContent>
+                    <ListItemAction>
+                    <a href="#"><Icon name="star" /></a>
+                    </ListItemAction>
+                </ListItem>
+                </List>
+            </div>
+        );
+    }
+});
+
+// Menu tests
+React.createClass({
+    render: function() {
+        return (
+            <div>
+                {/* Lower left */}
+                <div style={{position: 'relative'}}>
+                    <IconButton name="more_vert" id="demo-menu-lower-left" />
+                    <Menu target="demo-menu-lower-left">
+                        <MenuItem>Some Action</MenuItem>
+                        <MenuItem>Another Action</MenuItem>
+                        <MenuItem disabled>Disabled Action</MenuItem>
+                        <MenuItem>Yet Another Action</MenuItem>
+                    </Menu>
+                </div>
+
+                {/* Lower right */}
+                <div style={{position: 'relative'}}>
+                    <IconButton name="more_vert" id="demo-menu-lower-right" />
+                    <Menu target="demo-menu-lower-right" align="right">
+                        <MenuItem>Some Action</MenuItem>
+                        <MenuItem>Another Action</MenuItem>
+                        <MenuItem disabled>Disabled Action</MenuItem>
+                        <MenuItem>Yet Another Action</MenuItem>
+                    </Menu>
+                </div>
+
+                {/* Top left */}
+                <div style={{position: 'relative'}}>
+                    <IconButton name="more_vert" id="demo-menu-top-left" />
+                    <Menu target="demo-menu-top-left" valign="top">
+                        <MenuItem>Some Action</MenuItem>
+                        <MenuItem>Another Action</MenuItem>
+                        <MenuItem disabled>Disabled Action</MenuItem>
+                        <MenuItem>Yet Another Action</MenuItem>
+                    </Menu>
+                </div>
+
+                {/* Top right */}
+                <div style={{position: 'relative'}}>
+                    <IconButton name="more_vert" id="demo-menu-top-right" />
+                    <Menu target="demo-menu-top-right" valign="top" align="right">
+                        <MenuItem>Some Action</MenuItem>
+                        <MenuItem>Another Action</MenuItem>
+                        <MenuItem disabled>Disabled Action</MenuItem>
+                        <MenuItem>Yet Another Action</MenuItem>
+                    </Menu>
+                </div>
+            </div>
+        );
+    }
+});
+
+// ProgressBar tests
+React.createClass({
+    render: function() {
+        return (
+            <div>
+                {/* Simple Progress Bar */}
+                <ProgressBar progress={44} />
+
+                {/* Progress Bar with Indeterminate Progress */}
+                <ProgressBar indeterminate />
+
+                {/* Progress Bar with Buffering */}
+                <ProgressBar progress={33} buffer={87} />
+            </div>
+        );
+    }
+});
+
+// Radio tests
+React.createClass({
+    render: function() {
+        return (
+            <div>
+                <RadioGroup name="demo" value="opt1">
+                    <Radio value="opt1" ripple>Ripple option</Radio>
+                    <Radio value="opt2">Other option</Radio>
+                </RadioGroup>
+
+                <RadioGroup container="ul" childContainer="li" name="demo2" value="opt2">
+                    <Radio value="opt1" ripple>Ripple option</Radio>
+                    <Radio value="opt2">Other option</Radio>
+                </RadioGroup>
+            </div>
+        );
+    }
+});
+
+// Slider tests
+React.createClass({
+    render: function() {
+        return (
+            <div>
+                {/* Default slider */}
+                <Slider min={0} max={100} defaultValue={0} />
+
+                {/* Slider with initial value */}
+                <Slider min={0} max={100} defaultValue={25} />
+            </div>
+        );
+    }
+});
+
+// Snackbar tests
+React.createClass({
+    render: function() {
+        return (
+            <div>
+                <div>
+                    <Button raised style={{backgroundColor: '#FF00FF'}} onClick={this.handleShowSnackbar}>Show a Snackbar</Button>
+                    <Snackbar
+                        active={false}
+                        onClick={this.handleClickActionSnackbar}
+                        onTimeout={this.handleTimeoutSnackbar}
+                        action="Undo">Button color changed.</Snackbar>
+                </div>
+                
+                <div>
+                    <Button raised onClick={this.handleShowSnackbar}>Show a Toast</Button>
+                    <Snackbar
+                        active={true}
+                        onTimeout={this.handleTimeoutSnackbar}>
+                        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce varius luctus quam. Fusce quis blandit libero. Donec accumsan nunc lectus, vel blandit diam bibendum ac. Integer faucibus, lorem et convallis fermentum, diam dolor imperdiet mi, nec iaculis risus mauris id elit. Vivamus vel eros dapibus, molestie ante ut, vestibulum sem.
+                    </Snackbar>
+                </div>
+            </div>
+        );
+    }
+});
+
+// Spinner tests
+React.createClass({
+    render: function() {
+        return (
+            <div>
+                {/* Simple spinner */}
+                <Spinner />
+
+                {/* Single color spinner */}
+                <Spinner singleColor />
+            </div>
+        );
+    }
+});
+
+// Switch tests
+React.createClass({
+    render: function() {
+        return (
+            <div>
+                <Switch ripple id="switch1" defaultChecked>Ripple switch</Switch>
+
+                <Switch id="switch2">Switch</Switch>
+            </div>
+        );
+    }
+});
+
+// Tab tests
+React.createClass({
+    render: function() {
+        return (
+            <div>
+                <div className="demo-tabs">
+                    <Tabs activeTab={this.state.activeTab} onChange={(tabId) => this.setState({ activeTab: tabId })} ripple>
+                        <Tab>Starks</Tab>
+                        <Tab>Lannisters</Tab>
+                        <Tab>Targaryens</Tab>
+                    </Tabs>
+                    <section>
+                        <div className="content">Content for the tab: {this.state.activeTab}</div>
+                    </section>
+                </div> 
+            </div>
+        );
+    }
+});
+
+// Textfield tests
+React.createClass({
+    render: function() {
+        return (
+            <div>
+                {/* Simple textfield */}
+                <Textfield
+                    onChange={() => {}}
+                    label="Text..."
+                    style={{width: '200px'}}
+                />
+
+                {/* Numeric textfield */}
+                <Textfield
+                    onChange={() => {}}
+                    pattern="-?[0-9]*(\.[0-9]+)?"
+                    error="Input is not a number!"
+                    label="Number..."
+                    style={{width: '200px'}}
+                />
+
+                {/* Textfield with floating label */}
+                <Textfield
+                    onChange={() => {}}
+                    label="Text..."
+                    floatingLabel
+                    style={{width: '200px'}}
+                />
+
+                {/* Numeric Textfield with floating label */}
+                <Textfield
+                    onChange={() => {}}
+                    pattern="-?[0-9]*(\.[0-9]+)?"
+                    error="Input is not a number!"
+                    label="Number..."
+                    floatingLabel
+                />
+            </div>
+        );
+    }
+});
+
+// Tooltip tests
+React.createClass({
+    render: function() {
+        return (
+            <div>
+                {/* Simple tooltip */}
+                <Tooltip label="Follow">
+                    <Icon name="add" />
+                </Tooltip>
+
+                {/* Large Tooltip */}
+                <Tooltip label="Print" large>
+                    <Icon name="print" />
+                </Tooltip>
+
+                {/* Rich Tooltip */}
+                <Tooltip label={<span>Upload <strong>file.zip</strong></span>}>
+                    <Icon name="cloud_upload" />
+                </Tooltip>
+
+                {/* Multiline Tooltip */}
+                <Tooltip label={<span>Share your content<br />via social media</span>}>
+                    <Icon name="share" />
+                </Tooltip>
+
+                {/* Right Tooltip */}
+                <Tooltip label="Follow" position="right">
+                    <Icon name="arrow_forward" />
+                </Tooltip>
+
+                {/* Left Tooltip */}
+                <Tooltip label="Follow" position="left">
+                    <Icon name="arrow_back" />
+                </Tooltip>
+
+                {/* Top Tooltip */}
+                <Tooltip label="Follow" position="top">
+                    <Icon name="arrow_upward" />
+                </Tooltip>
+
+                {/* Bottom Tooltip */}
+                <Tooltip label="Follow" position="bottom">
+                    <Icon name="arrow_downward" />
+                </Tooltip>
+            </div>
+        );
+    }
+});
diff --git a/react-mdl/tsconfig.json b/react-mdl/tsconfig.json
new file mode 100644
index 0000000000..3187e297d4
--- /dev/null
+++ b/react-mdl/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-mdl-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/react-mixin/index.d.ts b/react-mixin/index.d.ts
new file mode 100644
index 0000000000..64bcd99869
--- /dev/null
+++ b/react-mixin/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for react-mixin 2.0.2
+// Project: https://github.com/brigand/react-mixin
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react" />
+
+
+import * as React from 'react';
+
+declare namespace reactMixin {
+    export interface ClassDecorator {
+        <TFunction extends Function>(target: TFunction): TFunction | void;
+    }
+
+    interface ReactMixin {
+        decorate(mixin: React.Mixin<any, any>): ClassDecorator;
+        onClass<S>(clazz: any, mixin: React.Mixin<any, any>): React.ComponentClass<S>;
+        <S>(clazz: any, mixin: React.Mixin<any, any>): React.ComponentClass<S>;
+    }
+}
+
+declare var reactMixin: reactMixin.ReactMixin;
+
+export = reactMixin;
diff --git a/react-mixin/react-mixin-tests.tsx b/react-mixin/react-mixin-tests.tsx
index 32532b1339..04f6f4b202 100644
--- a/react-mixin/react-mixin-tests.tsx
+++ b/react-mixin/react-mixin-tests.tsx
@@ -1,5 +1,5 @@
-/// <reference path="react-mixin.d.ts" />
-/// <reference path="../react/react.d.ts" />
+
+/// <reference types="react" />
 
 import reactMixin = require('react-mixin');
 import * as React from 'react';
diff --git a/react-mixin/react-mixin.d.ts b/react-mixin/react-mixin.d.ts
deleted file mode 100644
index 6285ad02ec..0000000000
--- a/react-mixin/react-mixin.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// Type definitions for react-mixin 2.0.2
-// Project: https://github.com/brigand/react-mixin
-// Definitions by: Qubo <https://github.com/tkqubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts" />
-
-declare module "react-mixin" {
-    import * as React from 'react';
-
-    namespace reactMixin {
-        export interface ClassDecorator {
-            <TFunction extends Function>(target: TFunction): TFunction|void;
-        }
-
-        interface ReactMixin {
-            decorate(mixin: React.Mixin<any, any>): ClassDecorator;
-            onClass<S>(clazz: any, mixin: React.Mixin<any, any>): React.ComponentClass<S>;
-            <S>(clazz: any, mixin: React.Mixin<any, any>): React.ComponentClass<S>;
-        }
-    }
-
-    var reactMixin: reactMixin.ReactMixin;
-
-    export = reactMixin;
-}
-
diff --git a/react-mixin/tsconfig.json b/react-mixin/tsconfig.json
new file mode 100644
index 0000000000..1770b4f1d2
--- /dev/null
+++ b/react-mixin/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "experimentalDecorators": true,
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-mixin-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/react-motion/index.d.ts b/react-motion/index.d.ts
new file mode 100644
index 0000000000..93837fc113
--- /dev/null
+++ b/react-motion/index.d.ts
@@ -0,0 +1,85 @@
+// Type definitions for react-motion
+// Project: https://github.com/chenglou/react-motion
+// Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference types="react" />
+
+import { Component } from 'react';
+
+// your typical style object given in props. Maps to a number or a spring config
+export type Style = { [key: string]: number | OpaqueConfig };
+// the interpolating style object, with the same keys as the above Style object,
+// with the values mapped to numbers, naturally
+export type PlainStyle = { [key: string]: number };
+// internal velocity object. Similar to PlainStyle, but whose numbers represent
+// speed. Might be exposed one day.
+export type Velocity = { [key: string]: number };
+interface SpringHelperConfig {
+    stiffness: number;
+    damping: number;
+    /**
+    * Specifies both the rounding of the interpolated value and the speed (internal).
+    */
+    precision?: number;
+    // TODO: add onRest. Not public yet
+}
+
+export interface OpaqueConfig {
+    val: number;
+    stiffness: number;
+    damping: number;
+    precision: number;
+    // TODO: add onRest. Not public yet
+}
+
+interface MotionProps {
+    defaultStyle?: any;
+    style: any;
+}
+
+export declare class Motion extends Component<MotionProps, any> { }
+
+// === TransitionMotion ===
+interface TransitionStyle {
+    key: any; // unique ID to identify component across render animations
+    data?: any; // optional data you want to carry along the style, e.g. itemText
+    style: Style; // actual style you're passing
+}
+interface TransitionPlainStyle {
+    key: any;
+    data?: any;
+    // same as TransitionStyle, passed as argument to style/children function
+    style: PlainStyle;
+}
+type InterpolateFunction = (previousInterpolatedStyles?: Array<TransitionPlainStyle>) => Array<TransitionStyle>;
+type Styles = Array<TransitionStyle> | InterpolateFunction;
+interface TransitionProps {
+    defaultStyles?: Array<TransitionPlainStyle>;
+    styles: Styles;
+    children: (interpolatedStyles: Array<TransitionPlainStyle>) => React.ReactElement<any>;
+    willEnter?: (styleThatEntered: TransitionStyle) => PlainStyle;
+    willLeave?: (styleThatLeft: TransitionStyle) => Style;
+}
+export declare class TransitionMotion extends Component<any, any> { }
+
+interface StaggeredMotionProps {
+    defaultStyles?: Array<PlainStyle>;
+    styles: (previousInterpolatedStyles?: Array<PlainStyle>) => Array<Style>;
+}
+export declare class StaggeredMotion extends Component<StaggeredMotionProps, any> { }
+
+
+/**
+* Used in conjunction with the components below. Specifies the how to animate to the destination value, e.g. spring(10, {stiffness: 120, damping: 17}) means "animate to value 10, with a spring of stiffness 120 and damping 17".
+*/
+export declare function spring(val: number, config?: SpringHelperConfig): OpaqueConfig;
+
+export declare class Presets {
+    noWobble: OpaqueConfig; // the default, if nothing provided
+    gentle: OpaqueConfig;
+    wobbly: OpaqueConfig;
+    stiff: OpaqueConfig;
+}
+
+export declare const presets: Presets;
diff --git a/react-motion/react-motion-tests.tsx b/react-motion/react-motion-tests.tsx
index 0ff53dae4a..27698b0d97 100644
--- a/react-motion/react-motion-tests.tsx
+++ b/react-motion/react-motion-tests.tsx
@@ -1,11 +1,6 @@
-
-/// <reference path="../react/react.d.ts" />
-/// <reference path="./react-motion.d.ts"/>
-
 import * as React from 'react';
 import {Motion, spring} from 'react-motion';
 
-
 class Root extends React.Component<{}, {}> {
     render() {
         return (
diff --git a/react-motion/react-motion.d.ts b/react-motion/react-motion.d.ts
deleted file mode 100644
index f868d084d2..0000000000
--- a/react-motion/react-motion.d.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-// Type definitions for react-motion
-// Project: https://github.com/chenglou/react-motion
-// Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts" />
-
-declare module "react-motion" {
-    import { Component } from 'react';
-
-    // your typical style object given in props. Maps to a number or a spring config
-    export type Style = { [key: string]: number | OpaqueConfig };
-    // the interpolating style object, with the same keys as the above Style object,
-    // with the values mapped to numbers, naturally
-    export type PlainStyle = { [key: string]: number };
-    // internal velocity object. Similar to PlainStyle, but whose numbers represent
-    // speed. Might be exposed one day.
-    export type Velocity = { [key: string]: number };
-    interface SpringHelperConfig {
-        stiffness: number;
-        damping: number;
-        /**
-        * Specifies both the rounding of the interpolated value and the speed (internal).
-        */
-        precision?: number;
-        // TODO: add onRest. Not public yet
-    }
-
-    export interface OpaqueConfig {
-        val: number;
-        stiffness: number;
-        damping: number;
-        precision: number;
-        // TODO: add onRest. Not public yet
-    }
-
-    interface MotionProps {
-        defaultStyle?: any;
-        style: any;
-    }
-
-    export class Motion extends Component<MotionProps, any> { }
-
-    // === TransitionMotion ===
-    interface TransitionStyle {
-        key: any; // unique ID to identify component across render animations
-        data?: any; // optional data you want to carry along the style, e.g. itemText
-        style: Style; // actual style you're passing
-    }
-    interface TransitionPlainStyle {
-        key: any;
-        data?: any;
-        // same as TransitionStyle, passed as argument to style/children function
-        style: PlainStyle;
-    }
-    type InterpolateFunction = (previousInterpolatedStyles?: Array<TransitionPlainStyle>) => Array<TransitionStyle>;
-    type Styles = Array<TransitionStyle> | InterpolateFunction;
-    interface TransitionProps {
-        defaultStyles?: Array<TransitionPlainStyle>;
-        styles: Styles;
-        children: (interpolatedStyles: Array<TransitionPlainStyle>) => __React.ReactElement<any>;
-        willEnter?: (styleThatEntered: TransitionStyle) => PlainStyle;
-        willLeave?: (styleThatLeft: TransitionStyle) => Style;
-    }
-    export class TransitionMotion extends Component<any, any> { }
-
-    interface StaggeredMotionProps {
-        defaultStyles?: Array<PlainStyle>;
-        styles: (previousInterpolatedStyles?: Array<PlainStyle>) => Array<Style>;
-    }
-    export class StaggeredMotion extends Component<StaggeredMotionProps, any> { }
-
-
-    /**
-    * Used in conjunction with the components below. Specifies the how to animate to the destination value, e.g. spring(10, {stiffness: 120, damping: 17}) means "animate to value 10, with a spring of stiffness 120 and damping 17".
-    */
-    export function spring(val: number, config?: SpringHelperConfig): OpaqueConfig;
-
-    export class Presets {
-        noWobble: OpaqueConfig; // the default, if nothing provided
-        gentle: OpaqueConfig;
-        wobbly: OpaqueConfig;
-        stiff: OpaqueConfig;
-    }
-
-    export const presets: Presets;
-}
diff --git a/react-motion/tsconfig.json b/react-motion/tsconfig.json
new file mode 100644
index 0000000000..cdbc1ea70c
--- /dev/null
+++ b/react-motion/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-motion-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/react-native/index.d.ts b/react-native/index.d.ts
new file mode 100644
index 0000000000..4700fd166f
--- /dev/null
+++ b/react-native/index.d.ts
@@ -0,0 +1,3920 @@
+// Type definitions for react-native 0.19
+// Project: https://github.com/facebook/react-native
+// Definitions by: Bruno Grieder <https://github.com/bgrieder>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//
+// USING: these definitions are meant to be used with the TSC compiler target set to ES6
+//
+// USAGE EXAMPLES: check the RNTSExplorer project at https://github.com/bgrieder/RNTSExplorer
+//
+// CONTRIBUTING: please open pull requests and make sure that the changes do not break RNTSExplorer (they should not)
+// Do not hesitate to open a pull request against RNTSExplorer to provide an example for a case not covered by the current App
+//
+// CREDITS: This work is based on an original work made by Bernd Paradies: https://github.com/bparadie
+//
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/// <reference types="react" />
+
+//react-native "extends" react
+declare module "react-native" {
+
+
+    /**
+     * Represents the completion of an asynchronous operation
+     * @see lib.es6.d.ts
+     */
+    export interface Promise<T> {
+        /**
+         * Attaches callbacks for the resolution and/or rejection of the Promise.
+         * @param onfulfilled The callback to execute when the Promise is resolved.
+         * @param onrejected The callback to execute when the Promise is rejected.
+         * @returns A Promise for the completion of which ever callback is executed.
+         */
+        then<TResult>( onfulfilled?: ( value: T ) => TResult | Promise<TResult>, onrejected?: ( reason: any ) => TResult | Promise<TResult> ): Promise<TResult>;
+
+        /**
+         * Attaches a callback for only the rejection of the Promise.
+         * @param onrejected The callback to execute when the Promise is rejected.
+         * @returns A Promise for the completion of the callback.
+         */
+        catch( onrejected?: ( reason: any ) => T | Promise<T> ): Promise<T>;
+
+
+        // not in lib.es6.d.ts but called by react-native
+        done( callback?: ( value: T ) => void ): void;
+    }
+
+    export interface PromiseConstructor {
+        /**
+         * A reference to the prototype.
+         */
+        prototype: Promise<any>;
+
+        /**
+         * Creates a new Promise.
+         * @param init A callback used to initialize the promise. This callback is passed two arguments:
+         * a resolve callback used resolve the promise with a value or the result of another promise,
+         * and a reject callback used to reject the promise with a provided reason or error.
+         */
+        new <T>( init: ( resolve: ( value?: T | Promise<T> ) => void, reject: ( reason?: any ) => void ) => void ): Promise<T>;
+
+        <T>( init: ( resolve: ( value?: T | Promise<T> ) => void, reject: ( reason?: any ) => void ) => void ): Promise<T>;
+
+        /**
+         * Creates a Promise that is resolved with an array of results when all of the provided Promises
+         * resolve, or rejected when any Promise is rejected.
+         * @param values An array of Promises.
+         * @returns A new Promise.
+         */
+        all<T>( values: (T | Promise<T>)[] ): Promise<T[]>;
+
+        /**
+         * Creates a Promise that is resolved with an array of results when all of the provided Promises
+         * resolve, or rejected when any Promise is rejected.
+         * @param values An array of values.
+         * @returns A new Promise.
+         */
+        all( values: Promise<void>[] ): Promise<void>;
+
+        /**
+         * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
+         * or rejected.
+         * @param values An array of Promises.
+         * @returns A new Promise.
+         */
+        race<T>( values: (T | Promise<T>)[] ): Promise<T>;
+
+        /**
+         * Creates a new rejected promise for the provided reason.
+         * @param reason The reason the promise was rejected.
+         * @returns A new rejected Promise.
+         */
+        reject( reason: any ): Promise<void>;
+
+        /**
+         * Creates a new rejected promise for the provided reason.
+         * @param reason The reason the promise was rejected.
+         * @returns A new rejected Promise.
+         */
+        reject<T>( reason: any ): Promise<T>;
+
+        /**
+         * Creates a new resolved promise for the provided value.
+         * @param value A promise.
+         * @returns A promise whose internal state matches the provided promise.
+         */
+        resolve<T>( value: T | Promise<T> ): Promise<T>;
+
+        /**
+         * Creates a new resolved promise .
+         * @returns A resolved promise.
+         */
+        resolve(): Promise<void>;
+    }
+
+    // @see lib.es6.d.ts
+    export var Promise: PromiseConstructor;
+
+    module NativeMethodsMixin {
+      type MeasureOnSuccessCallback = (
+        x: number,
+        y: number,
+        width: number,
+        height: number,
+        pageX: number,
+        pageY: number
+      ) => void
+
+      type MeasureInWindowOnSuccessCallback = (
+        x: number,
+        y: number,
+        width: number,
+        height: number
+      ) => void
+
+      type MeasureLayoutOnSuccessCallback = (
+        left: number,
+        top: number,
+        width: number,
+        height: number
+      ) => void
+    }
+
+    /**
+     * @see https://github.com/facebook/react-native/blob/master/Libraries/ReactIOS/NativeMethodsMixin.js
+     */
+    export class Component<P, S> extends React.Component<P, S> {
+      /**
+       * Determines the location on screen, width, and height of the given view and
+       * returns the values via an async callback. If successful, the callback will
+       * be called with the following arguments:
+       *
+       *  - x
+       *  - y
+       *  - width
+       *  - height
+       *  - pageX
+       *  - pageY
+       *
+       * Note that these measurements are not available until after the rendering
+       * has been completed in native. If you need the measurements as soon as
+       * possible, consider using the [`onLayout`
+       * prop](docs/view.html#onlayout) instead.
+       */
+      measure(callback: NativeMethodsMixin.MeasureOnSuccessCallback): void;
+
+      /**
+       * Determines the location of the given view in the window and returns the
+       * values via an async callback. If the React root view is embedded in
+       * another native view, this will give you the absolute coordinates. If
+       * successful, the callback will be called with the following
+       * arguments:
+       *
+       *  - x
+       *  - y
+       *  - width
+       *  - height
+       *
+       * Note that these measurements are not available until after the rendering
+       * has been completed in native.
+       */
+      measureInWindow(callback: NativeMethodsMixin.MeasureInWindowOnSuccessCallback): void;
+
+      /**
+       * Like [`measure()`](#measure), but measures the view relative an ancestor,
+       * specified as `relativeToNativeNode`. This means that the returned x, y
+       * are relative to the origin x, y of the ancestor view.
+       *
+       * As always, to obtain a native node handle for a component, you can use
+       * `React.findNodeHandle(component)`.
+       */
+      measureLayout(
+        relativeToNativeNode: number,
+        onSuccess: NativeMethodsMixin.MeasureLayoutOnSuccessCallback,
+        onFail: () => void /* currently unused */
+      ): void;
+
+       /**
+        * This function sends props straight to native. They will not participate in
+        * future diff process - this means that if you do not include them in the
+        * next render, they will remain active (see [Direct
+        * Manipulation](docs/direct-manipulation.html)).
+        */
+      setNativeProps(nativeProps: Object): void;
+
+      /**
+       * Requests focus for the given input or view. The exact behavior triggered
+       * will depend on the platform and type of view.
+       */
+      focus(): void;
+
+      /**
+       * Removes focus from an input or view. This is the opposite of `focus()`.
+       */
+      blur(): void;
+
+      refs: {
+        [key: string]: Component<any, any>
+      };
+    }
+
+    //TODO: BGR: Replace with ComponentClass ?
+    // node_modules/react-tools/src/classic/class/ReactClass.js
+    export interface ReactClass<D, P, S> {
+        // TODO:
+    }
+
+    // see react-jsx.d.ts
+    export function createElement<P>( type: React.ReactType,
+                                      props?: P,
+                                      ...children: React.ReactNode[] ): React.ReactElement<P>;
+
+
+    export type Runnable = ( appParameters: any ) => void;
+
+
+    // Similar to React.SyntheticEvent except for nativeEvent
+    interface NativeSyntheticEvent<T> {
+        bubbles: boolean
+        cancelable: boolean
+        currentTarget: EventTarget
+        defaultPrevented: boolean
+        eventPhase: number
+        isTrusted: boolean
+        nativeEvent: T
+        preventDefault(): void
+        stopPropagation(): void
+        target: EventTarget
+        timeStamp: Date
+        type: string
+    }
+
+    export interface NativeTouchEvent {
+        /**
+         * Array of all touch events that have changed since the last event
+         */
+        changedTouches: NativeTouchEvent[]
+
+        /**
+         * The ID of the touch
+         */
+        identifier: string
+
+        /**
+         * The X position of the touch, relative to the element
+         */
+        locationX: number
+
+        /**
+         * The Y position of the touch, relative to the element
+         */
+        locationY: number
+
+        /**
+         * The X position of the touch, relative to the screen
+         */
+        pageX: number
+
+        /**
+         * The Y position of the touch, relative to the screen
+         */
+        pageY: number
+
+        /**
+         * The node id of the element receiving the touch event
+         */
+        target: string
+
+        /**
+         * A time identifier for the touch, useful for velocity calculation
+         */
+        timestamp: number
+
+        /**
+         * Array of all current touches on the screen
+         */
+        touches : NativeTouchEvent[]
+    }
+
+    export interface GestureResponderEvent extends NativeSyntheticEvent<NativeTouchEvent> {
+    }
+
+
+    export interface  PointProperties {
+        x: number
+        y: number
+    }
+
+    export interface Insets {
+        top?: number
+        left?: number
+        bottom?: number
+        right?: number
+    }
+
+    /**
+     * //FIXME: need to find documentation on which compoenent is a native (i.e. non composite component)
+     */
+    export interface NativeComponent {
+    }
+
+    /**
+     * //FIXME: need to find documentation on which component is a TTouchable and can implement that interface
+     * @see React.DOMAtributes
+     */
+    export interface Touchable {
+        onTouchStart?: ( event: GestureResponderEvent ) => void
+        onTouchMove?: ( event: GestureResponderEvent ) => void
+        onTouchEnd?: ( event: GestureResponderEvent ) => void
+        onTouchCancel?: ( event: GestureResponderEvent ) => void
+        onTouchEndCapture?: ( event: GestureResponderEvent ) => void
+    }
+
+    export type AppConfig = {
+        appKey: string;
+        component: ReactClass<any, any, any>;
+        run?: Runnable;
+    }
+
+    // https://github.com/facebook/react-native/blob/master/Libraries/AppRegistry/AppRegistry.js
+    export class AppRegistry {
+        static registerConfig( config: AppConfig[] ): void;
+
+        static registerComponent( appKey: string, getComponentFunc: () => React.ComponentClass<any> ): string;
+
+        static registerRunnable( appKey: string, func: Runnable ): string;
+
+        static runApplication( appKey: string, appParameters: any ): void;
+    }
+
+    export interface LayoutAnimationTypes {
+        spring: string
+        linear: string
+        easeInEaseOut: string
+        easeIn: string
+        easeOut: string
+    }
+
+    export interface LayoutAnimationProperties {
+        opacity: string
+        scaleXY: string
+    }
+
+    export interface LayoutAnimationAnim {
+        duration?: number
+        delay?: number
+        springDamping?: number
+        initialVelocity?: number
+        type?: string //LayoutAnimationTypes
+        property?: string //LayoutAnimationProperties
+    }
+
+    export interface LayoutAnimationConfig {
+        duration: number
+        create?: LayoutAnimationAnim
+        update?: LayoutAnimationAnim
+        delete?: LayoutAnimationAnim
+    }
+
+    export interface LayoutAnimationStatic {
+
+        configureNext: ( config: LayoutAnimationConfig, onAnimationDidEnd?: () => void, onError?: ( error?: any ) => void ) => void
+        create: ( duration: number, type?: string, creationProp?: string ) => LayoutAnimationConfig
+        Types: LayoutAnimationTypes
+        Properties: LayoutAnimationProperties
+        configChecker: ( conf: {config: LayoutAnimationConfig}, name: string, next: string ) => void
+        Presets : {
+            easeInEaseOut: LayoutAnimationConfig
+            linear:LayoutAnimationConfig
+            spring: LayoutAnimationConfig
+        }
+    }
+
+
+    /**
+     * Flex Prop Types
+     * @see https://facebook.github.io/react-native/docs/flexbox.html#proptypes
+     * @see LayoutPropTypes.js
+     */
+    export interface FlexStyle {
+
+        alignItems?: string;  //enum('flex-start', 'flex-end', 'center', 'stretch')
+        alignSelf?: string// enum('auto', 'flex-start', 'flex-end', 'center', 'stretch')
+        borderBottomWidth?: number
+        borderLeftWidth?: number
+        borderRightWidth?: number
+        borderTopWidth?: number
+        borderWidth?: number
+        bottom?: number
+        flex?: number
+        flexDirection?: string // enum('row', 'column')
+        flexWrap?: string // enum('wrap', 'nowrap')
+        height?: number
+        justifyContent?: string // enum('flex-start', 'flex-end', 'center', 'space-between', 'space-around')
+        left?: number
+        margin?: number
+        marginBottom?: number
+        marginHorizontal?: number
+        marginLeft?: number
+        marginRight?: number
+        marginTop?: number
+        marginVertical?: number
+        padding?: number
+        paddingBottom?: number
+        paddingHorizontal?: number
+        paddingLeft?: number
+        paddingRight?: number
+        paddingTop?: number
+        paddingVertical?: number
+        position?: string // enum('absolute', 'relative')
+        right?: number
+        top?: number
+        width?: number
+    }
+
+
+    export interface TransformsStyle {
+
+        transform?: [{perspective: number}, {rotate: string}, {rotateX: string}, {rotateY: string}, {rotateZ: string}, {scale: number}, {scaleX: number}, {scaleY: number}, {translateX: number}, {translateY: number}, {skewX: string}, {skewY: string}]
+        transformMatrix?: Array<number>
+        rotation?: number
+        scaleX?: number
+        scaleY?: number
+        translateX?: number
+        translateY?: number
+    }
+
+
+    export interface StyleSheetProperties {
+        // TODO:
+    }
+
+    export interface LayoutRectangle {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    }
+
+    // @see TextProperties.onLayout
+    export interface LayoutChangeEvent {
+        nativeEvent: {
+            layout: LayoutRectangle
+        }
+    }
+
+    // @see https://facebook.github.io/react-native/docs/text.html#style
+    export interface TextStyle extends ViewStyle {
+        color?: string
+        fontFamily?: string
+        fontSize?: number
+        fontStyle?: string // 'normal' | 'italic';
+        fontWeight?: string // enum("normal", 'bold', '100', '200', '300', '400', '500', '600', '700', '800', '900')
+        letterSpacing?: number
+        lineHeight?: number
+        textAlign?: string // enum("auto", 'left', 'right', 'center')
+        textDecorationLine?: string // enum("none", 'underline', 'line-through', 'underline line-through')
+        textDecorationStyle?: string // enum("solid", 'double', 'dotted', 'dashed')
+        textDecorationColor?: string
+        writingDirection?: string; //enum("auto", 'ltr', 'rtl')
+        //containerBackgroundColor?: string
+    }
+
+    export interface TextPropertiesIOS {
+
+        /**
+         * When true, no visual change is made when text is pressed down.
+         * By default, a gray oval highlights the text on press down.
+         */
+        suppressHighlighting?: boolean
+    }
+
+    // https://facebook.github.io/react-native/docs/text.html#props
+    export interface TextProperties extends React.Props<TextProperties> {
+
+        /**
+         * Specifies should fonts scale to respect Text Size accessibility setting on iOS.
+         */
+        allowFontScaling?: boolean
+
+        /**
+         * Used to truncate the text with an elipsis after computing the text layout, including line wrapping, such that the total number of lines does not exceed this number.
+         */
+        numberOfLines?: number
+
+        /**
+         * Invoked on mount and layout changes with
+         *
+         * {nativeEvent: { layout: {x, y, width, height}}}.
+         */
+        onLayout?: ( event: LayoutChangeEvent ) => void
+
+        /**
+         * This function is called on press.
+         * Text intrinsically supports press handling with a default highlight state (which can be disabled with suppressHighlighting).
+         */
+        onPress?: () => void
+
+        /**
+         * @see https://facebook.github.io/react-native/docs/text.html#style
+         */
+        style?: TextStyle
+
+        /**
+         * Used to locate this view in end-to-end tests.
+         */
+        testID?: string
+    }
+
+    /**
+     * A React component for displaying text which supports nesting, styling, and touch handling.
+     */
+    export interface TextStatic extends React.ComponentClass<TextProperties> {
+
+    }
+
+
+    /**
+     * IOS Specific properties for TextInput
+     * @see https://facebook.github.io/react-native/docs/textinput.html#props
+     */
+    export interface TextInputIOSProperties {
+
+        /**
+         * If true, the text field will blur when submitted.
+         * The default value is true.
+         */
+        blurOnSubmit?: boolean
+
+        /**
+         * enum('never', 'while-editing', 'unless-editing', 'always')
+         * When the clear button should appear on the right side of the text view
+         */
+        clearButtonMode?: string
+
+        /**
+         * If true, clears the text field automatically when editing begins
+         */
+        clearTextOnFocus?: boolean
+
+        /**
+         * If true, the keyboard disables the return key when there is no text and automatically enables it when there is text.
+         * The default value is false.
+         */
+        enablesReturnKeyAutomatically?: boolean
+
+        /**
+         * Callback that is called when a key is pressed.
+         * Pressed key value is passed as an argument to the callback handler.
+         * Fires before onChange callbacks.
+         */
+        onKeyPress?: () => void
+
+        /**
+         * enum('default', 'go', 'google', 'join', 'next', 'route', 'search', 'send', 'yahoo', 'done', 'emergency-call')
+         * Determines how the return key should look.
+         */
+        returnKeyType?: string
+
+        /**
+         * If true, all text will automatically be selected on focus
+         */
+        selectTextOnFocus?: boolean
+
+        /**
+         * //FIXME: requires typing
+         * See DocumentSelectionState.js, some state that is responsible for maintaining selection information for a document
+         */
+        selectionState?: any
+
+
+    }
+
+    /**
+     * Android Specific properties for TextInput
+     * @see https://facebook.github.io/react-native/docs/textinput.html#props
+     */
+    export interface TextInputAndroidProperties {
+
+        /**
+         * Sets the number of lines for a TextInput.
+         * Use it with multiline set to true to be able to fill the lines.
+         */
+        numberOfLines?: number
+
+        /**
+         * enum('start', 'center', 'end')
+         * Set the position of the cursor from where editing will begin.
+         */
+        textAlign?: string
+
+        /**
+         * enum('top', 'center', 'bottom')
+         * Aligns text vertically within the TextInput.
+         */
+        textAlignVertical?: string
+
+        /**
+         * The color of the textInput underline.
+         */
+        underlineColorAndroid?: string
+    }
+
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/textinput.html#props
+     */
+    export interface TextInputProperties extends TextInputIOSProperties, TextInputAndroidProperties, React.Props<TextInputStatic> {
+
+        /**
+         * Can tell TextInput to automatically capitalize certain characters.
+         *      characters: all characters,
+         *      words: first letter of each word
+         *      sentences: first letter of each sentence (default)
+         *      none: don't auto capitalize anything
+         *
+         * https://facebook.github.io/react-native/docs/textinput.html#autocapitalize
+         */
+        autoCapitalize?: string
+
+        /**
+         * If false, disables auto-correct.
+         * The default value is true.
+         */
+        autoCorrect?: boolean
+
+        /**
+         * If true, focuses the input on componentDidMount.
+         * The default value is false.
+         */
+        autoFocus?: boolean
+
+        /**
+         * Provides an initial value that will change when the user starts typing.
+         * Useful for simple use-cases where you don't want to deal with listening to events
+         * and updating the value prop to keep the controlled state in sync.
+         */
+        defaultValue?: string
+
+        /**
+         * If false, text is not editable. The default value is true.
+         */
+        editable?: boolean
+
+        /**
+         * enum("default", 'numeric', 'email-address', "ascii-capable", 'numbers-and-punctuation', 'url', 'number-pad', 'phone-pad', 'name-phone-pad', 'decimal-pad', 'twitter', 'web-search')
+         * Determines which keyboard to open, e.g.numeric.
+         * The following values work across platforms: - default - numeric - email-address
+         */
+        keyboardType?: string
+
+        /**
+         * Limits the maximum number of characters that can be entered.
+         * Use this instead of implementing the logic in JS to avoid flicker.
+         */
+        maxLength?: number
+
+        /**
+         * If true, the text input can be multiple lines. The default value is false.
+         */
+        multiline?: boolean
+
+        /**
+         * Callback that is called when the text input is blurred
+         */
+        onBlur?: () => void
+
+        /**
+         * Callback that is called when the text input's text changes.
+         */
+        onChange?: ( event: {nativeEvent: {text: string}} ) => void
+
+        /**
+         * Callback that is called when the text input's text changes.
+         * Changed text is passed as an argument to the callback handler.
+         */
+        onChangeText?: ( text: string ) => void
+
+        /**
+         * Callback that is called when text input ends.
+         */
+        onEndEditing?: ( event: {nativeEvent: {text: string}} ) => void
+
+        /**
+         * Callback that is called when the text input is focused
+         */
+        onFocus?: () => void
+
+        /**
+         * Invoked on mount and layout changes with {x, y, width, height}.
+         */
+        onLayout?: ( event: {nativeEvent: {x: number, y: number, width: number, height: number}} ) => void
+
+        /**
+         * Callback that is called when the text input's submit button is pressed.
+         */
+        onSubmitEditing?: ( event: {nativeEvent: {text: string}} ) => void
+
+        /**
+         * //FIXME: Not part of the doc but found in examples
+         */
+        password?: boolean
+
+        /**
+         * The string that will be rendered before text input has been entered
+         */
+        placeholder?: string
+
+        /**
+         * The text color of the placeholder string
+         */
+        placeholderTextColor?: string
+
+        /**
+         * If true, the text input obscures the text entered so that sensitive text like passwords stay secure.
+         * The default value is false.
+         */
+        secureTextEntry?: boolean
+
+        /**
+         * Styles
+         */
+        style?: TextStyle
+
+        /**
+         * Used to locate this view in end-to-end tests
+         */
+        testID?: string
+
+        /**
+         * The value to show for the text input. TextInput is a controlled component,
+         * which means the native value will be forced to match this value prop if provided.
+         * For most uses this works great, but in some cases this may cause flickering - one common cause is preventing edits by keeping value the same.
+         * In addition to simply setting the same value, either set editable={false},
+         * or set/update maxLength to prevent unwanted edits without flicker.
+         */
+        value?: string
+    }
+
+    export interface TextInputStatic extends NativeComponent, React.ComponentClass<TextInputProperties> {
+        blur: () => void
+        focus: () => void
+    }
+
+
+    /**
+     * Gesture recognition on mobile devices is much more complicated than web.
+     * A touch can go through several phases as the app determines what the user's intention is.
+     * For example, the app needs to determine if the touch is scrolling, sliding on a widget, or tapping.
+     * This can even change during the duration of a touch. There can also be multiple simultaneous touches.
+     *
+     * The touch responder system is needed to allow components to negotiate these touch interactions
+     * without any additional knowledge about their parent or child components.
+     * This system is implemented in ResponderEventPlugin.js, which contains further details and documentation.
+     *
+     * Best Practices
+     * Users can feel huge differences in the usability of web apps vs. native, and this is one of the big causes.
+     * Every action should have the following attributes:
+     *      Feedback/highlighting- show the user what is handling their touch, and what will happen when they release the gesture
+     *      Cancel-ability- when making an action, the user should be able to abort it mid-touch by dragging their finger away
+     *
+     * These features make users more comfortable while using an app,
+     * because it allows people to experiment and interact without fear of making mistakes.
+     *
+     * TouchableHighlight and Touchable*
+     * The responder system can be complicated to use.
+     * So we have provided an abstract Touchable implementation for things that should be "tappable".
+     * This uses the responder system and allows you to easily configure tap interactions declaratively.
+     * Use TouchableHighlight anywhere where you would use a button or link on web.
+     */
+    export interface GestureResponderHandlers {
+
+        /**
+         * A view can become the touch responder by implementing the correct negotiation methods.
+         * There are two methods to ask the view if it wants to become responder:
+         */
+
+        /**
+         * Does this view want to become responder on the start of a touch?
+         */
+        onStartShouldSetResponder?: ( event: GestureResponderEvent ) => boolean
+
+        /**
+         * Called for every touch move on the View when it is not the responder: does this view want to "claim" touch responsiveness?
+         */
+        onMoveShouldSetResponder?: ( event: GestureResponderEvent ) => boolean
+
+        /**
+         * If the View returns true and attempts to become the responder, one of the following will happen:
+         */
+
+        /**
+         * The View is now responding for touch events.
+         * This is the time to highlight and show the user what is happening
+         */
+        onResponderGrant?: ( event: GestureResponderEvent ) => void
+
+        /**
+         * Something else is the responder right now and will not release it
+         */
+        onResponderReject?: ( event: GestureResponderEvent ) => void
+
+        /**
+         * If the view is responding, the following handlers can be called:
+         */
+
+        /**
+         * The user is moving their finger
+         */
+        onResponderMove?: ( event: GestureResponderEvent ) => void
+
+        /**
+         * Fired at the end of the touch, ie "touchUp"
+         */
+        onResponderRelease?: ( event: GestureResponderEvent ) => void
+
+        /**
+         *  Something else wants to become responder.
+         *  Should this view release the responder? Returning true allows release
+         */
+        onResponderTerminationRequest?: ( event: GestureResponderEvent ) => boolean
+
+        /**
+         * The responder has been taken from the View.
+         * Might be taken by other views after a call to onResponderTerminationRequest,
+         * or might be taken by the OS without asking (happens with control center/ notification center on iOS)
+         */
+        onResponderTerminate?: ( event: GestureResponderEvent ) => void
+
+        /**
+         * onStartShouldSetResponder and onMoveShouldSetResponder are called with a bubbling pattern,
+         * where the deepest node is called first.
+         * That means that the deepest component will become responder when multiple Views return true for *ShouldSetResponder handlers.
+         * This is desirable in most cases, because it makes sure all controls and buttons are usable.
+         *
+         * However, sometimes a parent will want to make sure that it becomes responder.
+         * This can be handled by using the capture phase.
+         * Before the responder system bubbles up from the deepest component,
+         * it will do a capture phase, firing on*ShouldSetResponderCapture.
+         * So if a parent View wants to prevent the child from becoming responder on a touch start,
+         * it should have a onStartShouldSetResponderCapture handler which returns true.
+         */
+        onStartShouldSetResponderCapture?: ( event: GestureResponderEvent ) => boolean
+
+        /**
+         * onStartShouldSetResponder and onMoveShouldSetResponder are called with a bubbling pattern,
+         * where the deepest node is called first.
+         * That means that the deepest component will become responder when multiple Views return true for *ShouldSetResponder handlers.
+         * This is desirable in most cases, because it makes sure all controls and buttons are usable.
+         *
+         * However, sometimes a parent will want to make sure that it becomes responder.
+         * This can be handled by using the capture phase.
+         * Before the responder system bubbles up from the deepest component,
+         * it will do a capture phase, firing on*ShouldSetResponderCapture.
+         * So if a parent View wants to prevent the child from becoming responder on a touch start,
+         * it should have a onStartShouldSetResponderCapture handler which returns true.
+         */
+        onMoveShouldSetResponderCapture?: () => void;
+
+    }
+
+    // @see https://facebook.github.io/react-native/docs/view.html#style
+    export interface ViewStyle extends FlexStyle, TransformsStyle {
+        backgroundColor?: string;
+        borderBottomColor?: string;
+        borderBottomLeftRadius?: number;
+        borderBottomRightRadius?: number;
+        borderColor?: string;
+        borderLeftColor?: string;
+        borderRadius?: number;
+        borderRightColor?: string;
+        borderTopColor?: string;
+        borderTopLeftRadius?: number;
+        borderTopRightRadius?: number;
+        opacity?: number;
+        overflow?: string; // enum('visible', 'hidden')
+        shadowColor?: string;
+        shadowOffset?: {width: number, height: number};
+        shadowOpacity?: number;
+        shadowRadius?: number;
+    }
+
+
+    export interface ViewPropertiesIOS {
+
+        /**
+         * Provides additional traits to screen reader.
+         * By default no traits are provided unless specified otherwise in element
+         *
+         * @enum('none', 'button', 'link', 'header', 'search', 'image', 'selected', 'plays', 'key', 'text','summary', 'disabled', 'frequentUpdates', 'startsMedia', 'adjustable', 'allowsDirectInteraction', 'pageTurn')
+         */
+        accessibilityTraits?: string | string[];
+
+        /**
+         * Whether this view should be rendered as a bitmap before compositing.
+         *
+         * On iOS, this is useful for animations and interactions that do not modify this component's dimensions nor its children;
+         * for example, when translating the position of a static view, rasterization allows the renderer to reuse a cached bitmap of a static view
+         * and quickly composite it during each frame.
+         *
+         * Rasterization incurs an off-screen drawing pass and the bitmap consumes memory.
+         * Test and measure when using this property.
+         */
+        shouldRasterizeIOS?: boolean
+    }
+
+    export interface ViewPropertiesAndroid {
+
+        /**
+         * Indicates to accessibility services to treat UI component like a native one.
+         * Works for Android only.
+         *
+         * @enum('none', 'button', 'radiobutton_checked', 'radiobutton_unchecked' )
+         */
+        accessibilityComponentType?: string
+
+
+        /**
+         * Indicates to accessibility services whether the user should be notified when this view changes.
+         * Works for Android API >= 19 only.
+         * See http://developer.android.com/reference/android/view/View.html#attr_android:accessibilityLiveRegion for references.
+         */
+        accessibilityLiveRegion?: string
+
+        /**
+         * Views that are only used to layout their children or otherwise don't draw anything
+         * may be automatically removed from the native hierarchy as an optimization.
+         * Set this property to false to disable this optimization and ensure that this View exists in the native view hierarchy.
+         */
+        collapsable?: boolean
+
+
+        /**
+         * Controls how view is important for accessibility which is if it fires accessibility events
+         * and if it is reported to accessibility services that query the screen.
+         * Works for Android only. See http://developer.android.com/reference/android/R.attr.html#importantForAccessibility for references.
+         *
+         * Possible values:
+         *      'auto' - The system determines whether the view is important for accessibility - default (recommended).
+         *      'yes' - The view is important for accessibility.
+         *      'no' - The view is not important for accessibility.
+         *      'no-hide-descendants' - The view is not important for accessibility, nor are any of its descendant views.
+         */
+        importantForAccessibility?: string
+
+
+        /**
+         * Whether this view needs to rendered offscreen and composited with an alpha in order to preserve 100% correct colors and blending behavior.
+         * The default (false) falls back to drawing the component and its children
+         * with an alpha applied to the paint used to draw each element instead of rendering the full component offscreen and compositing it back with an alpha value.
+         * This default may be noticeable and undesired in the case where the View you are setting an opacity on
+         * has multiple overlapping elements (e.g. multiple overlapping Views, or text and a background).
+         *
+         * Rendering offscreen to preserve correct alpha behavior is extremely expensive
+         * and hard to debug for non-native developers, which is why it is not turned on by default.
+         * If you do need to enable this property for an animation,
+         * consider combining it with renderToHardwareTextureAndroid if the view contents are static (i.e. it doesn't need to be redrawn each frame).
+         * If that property is enabled, this View will be rendered off-screen once,
+         * saved in a hardware texture, and then composited onto the screen with an alpha each frame without having to switch rendering targets on the GPU.
+         */
+        needsOffscreenAlphaCompositing?: boolean
+
+
+        /**
+         * Whether this view should render itself (and all of its children) into a single hardware texture on the GPU.
+         *
+         * On Android, this is useful for animations and interactions that only modify opacity, rotation, translation, and/or scale:
+         * in those cases, the view doesn't have to be redrawn and display lists don't need to be re-executed. The texture can just be
+         * re-used and re-composited with different parameters. The downside is that this can use up limited video memory, so this prop should be set back to false at the end of the interaction/animation.
+         */
+        renderToHardwareTextureAndroid?: boolean;
+
+    }
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/view.html#props
+     */
+    export interface ViewProperties extends ViewPropertiesAndroid, ViewPropertiesIOS, GestureResponderHandlers, Touchable, React.Props<ViewStatic> {
+
+        /**
+         * Overrides the text that's read by the screen reader when the user interacts with the element. By default, the label is constructed by traversing all the children and accumulating all the Text nodes separated by space.
+         */
+        accessibilityLabel?: string;
+
+        /**
+         * When true, indicates that the view is an accessibility element.
+         * By default, all the touchable elements are accessible.
+         */
+        accessible?: boolean;
+
+        /**
+         * When `accessible` is true, the system will try to invoke this function when the user performs accessibility tap gesture.
+         */
+        onAcccessibilityTap?: () => void;
+
+        /**
+         * Invoked on mount and layout changes with
+         *
+         * {nativeEvent: { layout: {x, y, width, height}}}.
+         */
+        onLayout?: ( event: LayoutChangeEvent ) => void;
+
+        /**
+         * When accessible is true, the system will invoke this function when the user performs the magic tap gesture.
+         */
+        onMagicTap?: () => void;
+
+        /**
+         *
+         * In the absence of auto property, none is much like CSS's none value. box-none is as if you had applied the CSS class:
+         *
+         * .box-none {
+         *   pointer-events: none;
+         * }
+         * .box-none * {
+         *   pointer-events: all;
+         * }
+         *
+         * box-only is the equivalent of
+         *
+         * .box-only {
+         *   pointer-events: all;
+         * }
+         * .box-only * {
+         *   pointer-events: none;
+         * }
+         *
+         * But since pointerEvents does not affect layout/appearance, and we are already deviating from the spec by adding additional modes,
+         * we opt to not include pointerEvents on style. On some platforms, we would need to implement it as a className anyways. Using style or not is an implementation detail of the platform.
+         */
+        pointerEvents?: string;
+
+        /**
+         *
+         * This is a special performance property exposed by RCTView and is useful for scrolling content when there are many subviews,
+         * most of which are offscreen. For this property to be effective, it must be applied to a view that contains many subviews that extend outside its bound.
+         * The subviews must also have overflow: hidden, as should the containing view (or one of its superviews).
+         */
+        removeClippedSubviews?: boolean
+
+        style?: ViewStyle;
+
+        /**
+         * Used to locate this view in end-to-end tests.
+         */
+        testID?: string;
+    }
+
+    /**
+     * The most fundamental component for building UI, View is a container that supports layout with flexbox, style, some touch handling,
+     * and accessibility controls, and is designed to be nested inside other views and to have 0 to many children of any type.
+     * View maps directly to the native view equivalent on whatever platform React is running on,
+     * whether that is a UIView, <div>, android.view, etc.
+     */
+    export interface ViewStatic extends NativeComponent, React.ComponentClass<ViewProperties> {
+
+    }
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/viewpagerandroid.html#props
+     */
+
+
+    export interface ViewPagerAndroidOnPageScrollEventData {
+        position: number;
+        offset: number;
+    }
+
+    export interface ViewPagerAndroidOnPageSelectedEventData {
+        position: number;
+    }
+
+    export interface ViewPagerAndroidProperties extends ViewProperties {
+        initialPage?: number;
+        onPageScroll?: ( event: NativeSyntheticEvent<ViewPagerAndroidOnPageScrollEventData> ) => void;
+        onPageSelected?: ( event: NativeSyntheticEvent<ViewPagerAndroidOnPageSelectedEventData> ) => void;
+        keyboardDismissMode?: string; /* enum('none', 'on-drag') */
+    }
+
+    export interface ViewPagerAndroidStatic extends NativeComponent, React.ComponentClass<ViewPagerAndroidProperties> {
+
+    }
+
+    /**
+     * //FIXME: No documentation extracted from code comment on WebView.ios.js
+     */
+    export interface NavState {
+
+        url?: string
+        title?: string
+        loading?: boolean
+        canGoBack?: boolean
+        canGoForward?: boolean;
+
+        [key: string]: any
+    }
+
+    export interface WebViewPropertiesAndroid {
+
+        /**
+         * Used for android only, JS is enabled by default for WebView on iOS
+         */
+        javaScriptEnabledAndroid?: boolean
+    }
+
+    export interface WebViewPropertiesIOS {
+
+        /**
+         * Used for iOS only, sets whether the webpage scales to fit the view and the user can change the scale
+         */
+        scalesPageToFit?: boolean
+    }
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/webview.html#props
+     */
+    export interface WebViewProperties extends WebViewPropertiesAndroid, WebViewPropertiesIOS, React.Props<WebViewStatic> {
+
+        automaticallyAdjustContentInsets?: boolean
+
+        bounces?: boolean
+
+        contentInset?: Insets
+
+        html?: string
+
+        /**
+         * Sets the JS to be injected when the webpage loads.
+         */
+        injectedJavaScript?: string
+
+        onNavigationStateChange?: ( event: NavState ) => void
+
+        /**
+         * Allows custom handling of any webview requests by a JS handler.
+         * Return true or false from this method to continue loading the request.
+         */
+        onShouldStartLoadWithRequest?: () => boolean
+
+        /**
+         * view to show if there's an error
+         */
+        renderError?: () => ViewStatic
+
+        /**
+         * loading indicator to show
+         */
+        renderLoading?: () => ViewStatic
+
+        scrollEnabled?: boolean
+
+        startInLoadingState?: boolean
+
+        style?: ViewStyle
+
+        url: string
+    }
+
+
+    export interface WebViewStatic extends React.ComponentClass<WebViewProperties> {
+
+        goBack: () => void
+        goForward: () => void
+        reload: () => void
+    }
+
+
+    /**
+     * @see
+     */
+    export interface SegmentedControlIOSProperties {
+        /// TODO
+    }
+
+
+    export interface NavigatorIOSProperties extends React.Props<NavigatorIOSStatic> {
+
+        /**
+         * NavigatorIOS uses "route" objects to identify child views, their props, and navigation bar configuration.
+         * "push" and all the other navigation operations expect routes to be like this
+         */
+        initialRoute?: Route
+
+        /**
+         * The default wrapper style for components in the navigator.
+         * A common use case is to set the backgroundColor for every page
+         */
+        itemWrapperStyle?: ViewStyle
+
+        /**
+         * A Boolean value that indicates whether the navigation bar is hidden
+         */
+        navigationBarHidden?: boolean
+
+        /**
+         * A Boolean value that indicates whether to hide the 1px hairline shadow
+         */
+        shadowHidden?: boolean
+
+        /**
+         * The color used for buttons in the navigation bar
+         */
+        tintColor?: string
+
+        /**
+         * The text color of the navigation bar title
+         */
+        titleTextColor?: string
+
+        /**
+         * A Boolean value that indicates whether the navigation bar is translucent
+         */
+        translucent?: boolean
+
+        /**
+         * NOT IN THE DOC BUT IN THE EXAMPLES
+         */
+        style?: ViewStyle
+    }
+
+    /**
+     * A navigator is an object of navigation functions that a view can call.
+     * It is passed as a prop to any component rendered by NavigatorIOS.
+     *
+     * Navigator functions are also available on the NavigatorIOS component:
+     *
+     * @see https://facebook.github.io/react-native/docs/navigatorios.html#navigator
+     */
+    export interface NavigationIOS {
+        /**
+         * Navigate forward to a new route
+         */
+        push: ( route: Route ) => void
+
+        /**
+         * Go back one page
+         */
+        pop: () => void
+
+        /**
+         * Go back N pages at once. When N=1, behavior matches pop()
+         */
+        popN: ( n: number ) => void
+
+        /**
+         * Replace the route for the current page and immediately load the view for the new route
+         */
+        replace: ( route: Route ) => void
+
+        /**
+         * Replace the route/view for the previous page
+         */
+        replacePrevious: ( route: Route ) => void
+
+        /**
+         * Replaces the previous route/view and transitions back to it
+         */
+        replacePreviousAndPop: ( route: Route ) => void
+
+        /**
+         * Replaces the top item and popToTop
+         */
+        resetTo: ( route: Route ) => void
+
+        /**
+         * Go back to the item for a particular route object
+         */
+        popToRoute( route: Route ): void
+
+        /**
+         * Go back to the top item
+         */
+        popToTop(): void
+    }
+
+    export interface NavigatorIOSStatic extends NavigationIOS, React.ComponentClass<NavigatorIOSProperties> {
+    }
+
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/activityindicatorios.html#props
+     */
+    export interface ActivityIndicatorIOSProperties extends React.Props<ActivityIndicatorIOSStatic> {
+
+        /**
+         * Whether to show the indicator (true, the default) or hide it (false).
+         */
+        animating?: boolean
+
+        /**
+         * The foreground color of the spinner (default is gray).
+         */
+        color?: string
+
+        /**
+         * Whether the indicator should hide when not animating (true by default).
+         */
+        hidesWhenStopped?: boolean
+
+        /**
+         * Invoked on mount and layout changes with
+         */
+        onLayout?: ( event: {nativeEvent: { layout: {x: number, y: number , width: number, height: number}}} ) => void
+
+        /**
+         * Size of the indicator.
+         * Small has a height of 20, large has a height of 36.
+         *
+         * enum('small', 'large')
+         */
+        size?: string
+
+        style?: ViewStyle
+    }
+
+    export interface ActivityIndicatorIOSStatic extends React.ComponentClass<ActivityIndicatorIOSProperties> {
+    }
+
+
+    export interface DatePickerIOSProperties extends React.Props<DatePickerIOSStatic> {
+
+        /**
+         * The currently selected date.
+         */
+        date?: Date
+
+
+        /**
+         * Maximum date.
+         * Restricts the range of possible date/time values.
+         */
+        maximumDate?: Date
+
+        /**
+         * Maximum date.
+         * Restricts the range of possible date/time values.
+         */
+        minimumDate?: Date
+
+        /**
+         *  enum(1, 2, 3, 4, 5, 6, 10, 12, 15, 20, 30)
+         *  The interval at which minutes can be selected.
+         */
+        minuteInterval?: number
+
+        /**
+         *  enum('date', 'time', 'datetime')
+         *  The date picker mode.
+         */
+        mode?: string
+
+        /**
+         * Date change handler.
+         * This is called when the user changes the date or time in the UI.
+         * The first and only argument is a Date object representing the new date and time.
+         */
+        onDateChange?: ( newDate: Date ) => void
+
+        /**
+         * Timezone offset in minutes.
+         * By default, the date picker will use the device's timezone. With this parameter, it is possible to force a certain timezone offset.
+         * For instance, to show times in Pacific Standard Time, pass -7 * 60.
+         */
+        timeZoneOffsetInMinutes?: number
+
+    }
+
+    export interface DatePickerIOSStatic extends React.ComponentClass<DatePickerIOSProperties> {
+    }
+
+
+    /**
+     * @see PickerIOS.ios.js
+     */
+    export interface PickerIOSItemProperties extends React.Props<PickerIOSItemStatic> {
+        value?: string | number
+        label?: string
+    }
+
+    /**
+     * @see PickerIOS.ios.js
+     */
+    export interface PickerIOSItemStatic extends React.ComponentClass<PickerIOSItemProperties> {
+    }
+
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/pickerios.html
+     * @see PickerIOS.ios.js
+     */
+    export interface PickerIOSProperties extends React.Props<PickerIOSStatic> {
+
+        onValueChange?: ( value: string | number ) => void
+
+        selectedValue?: string | number
+
+        style?: ViewStyle
+    }
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/pickerios.html
+     * @see PickerIOS.ios.js
+     */
+    export interface PickerIOSStatic extends React.ComponentClass<PickerIOSProperties> {
+
+        Item: PickerIOSItemStatic
+    }
+
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/sliderios.html
+     */
+    export interface SliderIOSProperties extends React.Props<SliderIOSStatic> {
+
+        /**
+         * If true the user won't be able to move the slider. Default value is false.
+         */
+        disabled?: boolean
+
+        /**
+         * Initial maximum value of the slider. Default value is 1.
+         */
+        maximumValue?: number
+
+        /**
+         * The color used for the track to the right of the button. Overrides the default blue gradient image.
+         */
+        maximumTrackTintColor?: string
+
+        /**
+         * Initial minimum value of the slider. Default value is 0.
+         */
+        minimumValue?: number
+
+        /**
+         * The color used for the track to the left of the button. Overrides the default blue gradient image.
+         */
+        minimumTrackTintColor?: string
+
+        /**
+         * Callback called when the user finishes changing the value (e.g. when the slider is released).
+         */
+        onSlidingComplete?: () => void
+
+        /**
+         * Callback continuously called while the user is dragging the slider.
+         */
+        onValueChange?: ( value: number ) => void
+
+        /**
+         * Step value of the slider.
+         * The value should be between 0 and (maximumValue - minimumValue).
+         * Default value is 0.
+         */
+        step?: number
+
+        /**
+         * Used to style and layout the Slider.
+         * @see StyleSheet.js and ViewStylePropTypes.js for more info.
+         */
+        style?: ViewStyle
+
+        /**
+         * Initial value of the slider.
+         * The value should be between minimumValue and maximumValue, which default to 0 and 1 respectively.
+         * Default value is 0.
+         *
+         * This is not a controlled component, e.g. if you don't update the value, the component won't be reset to its inital value.
+         */
+        value?: number
+    }
+
+    export interface SliderIOSStatic extends React.ComponentClass<SliderIOSProperties> {
+
+    }
+
+    /**
+     * //FIXME: no dcumentation, inferred
+     * @see SwitchIOS.ios.js
+     */
+    export interface SwitchIOSStyle extends ViewStyle {
+        height?: number
+        width?: number
+    }
+
+
+    /**
+     * https://facebook.github.io/react-native/docs/switchios.html#props
+     */
+    export interface SwitchIOSProperties extends React.Props<SwitchIOSStatic> {
+
+        /**
+         * If true the user won't be able to toggle the switch. Default value is false.
+         */
+        disabled?: boolean
+
+        /**
+         * Background color when the switch is turned on.
+         */
+        onTintColor?: string
+
+        /**
+         * Callback that is called when the user toggles the switch.
+         */
+        onValueChange?: ( value: boolean ) => void
+
+        /**
+         * Background color for the switch round button.
+         */
+        thumbTintColor?: string
+
+        /**
+         * Background color when the switch is turned off.
+         */
+        tintColor?: string
+
+        /**
+         * The value of the switch, if true the switch will be turned on. Default value is false.
+         */
+        value?: boolean
+
+        style?: SwitchIOSStyle
+    }
+
+    /**
+     *
+     * Use SwitchIOS to render a boolean input on iOS.
+     *
+     * This is a controlled component, so you must hook in to the onValueChange callback and update the value prop in order for the component to update,
+     * otherwise the user's change will be reverted immediately to reflect props.value as the source of truth.
+     *
+     * @see https://facebook.github.io/react-native/docs/switchios.html
+     */
+    export interface SwitchIOSStatic extends React.ComponentClass<SwitchIOSProperties> {
+
+    }
+
+
+    /**
+     * @see ImageResizeMode.js
+     */
+    export interface ImageResizeModeStatic {
+        /**
+         * contain - The image will be resized such that it will be completely
+         * visible, contained within the frame of the View.
+         */
+        contain: string
+        /**
+         * cover - The image will be resized such that the entire area of the view
+         * is covered by the image, potentially clipping parts of the image.
+         */
+        cover: string
+        /**
+         * stretch - The image will be stretched to fill the entire frame of the
+         * view without clipping.  This may change the aspect ratio of the image,
+         * distoring it.  Only supported on iOS.
+         */
+        stretch: string
+    }
+
+    /**
+     * Image style
+     * @see https://facebook.github.io/react-native/docs/image.html#style
+     */
+    export interface ImageStyle extends FlexStyle, TransformsStyle {
+        resizeMode?: string //Object.keys(ImageResizeMode)
+        backgroundColor?: string
+        borderColor?: string
+        borderWidth?: number
+        borderRadius?: number
+        overflow?: string // enum('visible', 'hidden')
+        tintColor?: string
+        opacity?: number
+    }
+
+    export interface ImagePropertiesIOS {
+        /**
+         * The text that's read by the screen reader when the user interacts with the image.
+         */
+        accessibilityLabel?: string;
+
+        /**
+         * When true, indicates the image is an accessibility element.
+         */
+        accessible?: boolean;
+
+        /**
+         * When the image is resized, the corners of the size specified by capInsets will stay a fixed size,
+         * but the center content and borders of the image will be stretched.
+         * This is useful for creating resizable rounded buttons, shadows, and other resizable assets.
+         * More info on Apple documentation
+         */
+        capInsets?: Insets
+
+        /**
+         * A static image to display while downloading the final image off the network.
+         */
+        defaultSource?: {uri: string}
+
+        /**
+         * Invoked on load error with {nativeEvent: {error}}
+         */
+        onError?: ( error: {nativeEvent: any} ) => void
+
+        /**
+         * Invoked when load completes successfully
+         */
+        onLoad?: () => void
+
+        /**
+         * Invoked when load either succeeds or fails
+         */
+        onLoadEnd?: () => void
+
+        /**
+         * Invoked on load start
+         */
+        onLoadStart?: () => void
+
+        /**
+         * Invoked on download progress with {nativeEvent: {loaded, total}}
+         */
+        onProgress?: ()=> void
+    }
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/image.html
+     */
+    export interface ImageProperties extends ImagePropertiesIOS, React.Props<Image> {
+        /**
+         * onLayout function
+         *
+         * Invoked on mount and layout changes with
+         *
+         * {nativeEvent: { layout: {x, y, width, height}}}.
+         */
+        onLayout?: ( event: LayoutChangeEvent ) => void;
+
+
+        /**
+         * Determines how to resize the image when the frame doesn't match the raw image dimensions.
+         *
+         * enum('cover', 'contain', 'stretch')
+         */
+        resizeMode?: string;
+
+        /**
+         * uri is a string representing the resource identifier for the image,
+         * which could be an http address, a local file path,
+         * or the name of a static image resource (which should be wrapped in the require('image!name') function).
+         */
+        source: {uri: string} | string;
+
+        /**
+         *
+         * Style
+         */
+        style?:  ImageStyle;
+
+        /**
+         * A unique identifier for this element to be used in UI Automation testing scripts.
+         */
+        testID?: string;
+
+    }
+
+    export interface ImageStatic extends React.ComponentClass<ImageProperties> {
+        uri: string;
+        resizeMode: ImageResizeModeStatic
+    }
+
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/listview.html#props
+     */
+    export interface ListViewProperties extends ScrollViewProperties, React.Props<ListViewStatic> {
+
+        dataSource?: ListViewDataSource
+
+        /**
+         * How many rows to render on initial component mount.  Use this to make
+         * it so that the first screen worth of data apears at one time instead of
+         * over the course of multiple frames.
+         */
+        initialListSize?: number
+
+        /**
+         * (visibleRows, changedRows) => void
+         *
+         * Called when the set of visible rows changes.  `visibleRows` maps
+         * { sectionID: { rowID: true }} for all the visible rows, and
+         * `changedRows` maps { sectionID: { rowID: true | false }} for the rows
+         * that have changed their visibility, with true indicating visible, and
+         * false indicating the view has moved out of view.
+         */
+        onChangeVisibleRows?: ( visibleRows: Array<{[sectionId: string]: {[rowID: string]: boolean}}>, changedRows: Array<{[sectionId: string]: {[rowID: string]: boolean}}> ) => void
+
+        /**
+         * Called when all rows have been rendered and the list has been scrolled
+         * to within onEndReachedThreshold of the bottom.  The native scroll
+         * event is provided.
+         */
+        onEndReached?: () => void
+
+        /**
+         * Threshold in pixels for onEndReached.
+         */
+        onEndReachedThreshold?: number
+
+        /**
+         * Number of rows to render per event loop.
+         */
+        pageSize?: number
+
+        /**
+         * An experimental performance optimization for improving scroll perf of
+         * large lists, used in conjunction with overflow: 'hidden' on the row
+         * containers.  Use at your own risk.
+         */
+        removeClippedSubviews?: boolean
+
+        /**
+         * () => renderable
+         *
+         * The header and footer are always rendered (if these props are provided)
+         * on every render pass.  If they are expensive to re-render, wrap them
+         * in StaticContainer or other mechanism as appropriate.  Footer is always
+         * at the bottom of the list, and header at the top, on every render pass.
+         */
+        renderFooter?: () => React.ReactElement<any>
+
+        /**
+         * () => renderable
+         *
+         * The header and footer are always rendered (if these props are provided)
+         * on every render pass.  If they are expensive to re-render, wrap them
+         * in StaticContainer or other mechanism as appropriate.  Footer is always
+         * at the bottom of the list, and header at the top, on every render pass.
+         */
+        renderHeader?: () => React.ReactElement<any>
+
+        /**
+         * (rowData, sectionID, rowID) => renderable
+         * Takes a data entry from the data source and its ids and should return
+         * a renderable component to be rendered as the row.  By default the data
+         * is exactly what was put into the data source, but it's also possible to
+         * provide custom extractors.
+         */
+        renderRow?: ( rowData: any, sectionID: string | number, rowID: string | number, highlightRow?: boolean ) => React.ReactElement<any>
+
+
+        /**
+         * A function that returns the scrollable component in which the list rows are rendered.
+         * Defaults to returning a ScrollView with the given props.
+         */
+        renderScrollComponent?: ( props: ScrollViewProperties ) => React.ReactElement<ScrollViewProperties>
+
+        /**
+         * (sectionData, sectionID) => renderable
+         *
+         * If provided, a sticky header is rendered for this section.  The sticky
+         * behavior means that it will scroll with the content at the top of the
+         * section until it reaches the top of the screen, at which point it will
+         * stick to the top until it is pushed off the screen by the next section
+         * header.
+         */
+        renderSectionHeader?: ( sectionData: any, sectionId: string | number ) => React.ReactElement<any>
+
+
+        /**
+         * (sectionID, rowID, adjacentRowHighlighted) => renderable
+         * If provided, a renderable component to be rendered as the separator below each row
+         * but not the last row if there is a section header below.
+         * Take a sectionID and rowID of the row above and whether its adjacent row is highlighted.
+         */
+        renderSeparator?: ( sectionID: string | number, rowID: string | number, adjacentRowHighlighted?: boolean ) => React.ReactElement<any>
+
+        /**
+         * How early to start rendering rows before they come on screen, in
+         * pixels.
+         */
+        scrollRenderAheadDistance?: number
+    }
+
+    export interface ListViewStatic extends React.ComponentClass<ListViewProperties> {
+        DataSource: ListViewDataSource;
+    }
+
+
+    export interface MapViewAnnotation {
+        latitude?: number
+        longitude?: number
+        animateDrop?: boolean
+        title?: string
+        subtitle?: string
+        hasLeftCallout?: boolean
+        hasRightCallout?: boolean
+        onLeftCalloutPress?: () => void
+        onRightCalloutPress?: () => void
+        id?: string
+    }
+
+    export interface MapViewRegion {
+        latitude: number
+        longitude: number
+        latitudeDelta: number
+        longitudeDelta: number
+    }
+
+    export interface MapViewPropertiesIOS {
+
+        /**
+         * If false points of interest won't be displayed on the map.
+         * Default value is true.
+         */
+        showsPointsOfInterest?: boolean
+    }
+
+    export interface MapViewProperties extends MapViewPropertiesIOS, Touchable, React.Props<MapViewStatic> {
+
+        /**
+         * Map annotations with title/subtitle.
+         */
+        annotations?: MapViewAnnotation[]
+
+        /**
+         * Insets for the map's legal label, originally at bottom left of the map. See EdgeInsetsPropType.js for more information.
+         */
+        legalLabelInsets?: Insets
+
+        /**
+         * The map type to be displayed.
+         *     standard: standard road map (default)
+         *     satellite: satellite view
+         *     hybrid: satellite view with roads and points of interest overlayed
+         *
+         * enum('standard', 'satellite', 'hybrid')
+         */
+        mapType?: string
+
+        /**
+         * Maximum size of area that can be displayed.
+         */
+        maxDelta?: number
+
+        /**
+         * Minimum size of area that can be displayed.
+         */
+        minDelta?: number
+
+        /**
+         * Callback that is called once, when the user taps an annotation.
+         */
+        onAnnotationPress?: () => void
+
+        /**
+         * Callback that is called continuously when the user is dragging the map.
+         */
+        onRegionChange?: ( region: MapViewRegion ) => void
+
+        /**
+         * Callback that is called once, when the user is done moving the map.
+         */
+        onRegionChangeComplete?: ( region: MapViewRegion ) => void
+
+        /**
+         * When this property is set to true and a valid camera is associated with the map,
+         * the camera’s pitch angle is used to tilt the plane of the map.
+         *
+         * When this property is set to false, the camera’s pitch angle is ignored and
+         * the map is always displayed as if the user is looking straight down onto it.
+         */
+        pitchEnabled?: boolean
+
+        /**
+         * The region to be displayed by the map.
+         * The region is defined by the center coordinates and the span of coordinates to display.
+         */
+        region?: MapViewRegion
+
+        /**
+         * When this property is set to true and a valid camera is associated with the map,
+         * the camera’s heading angle is used to rotate the plane of the map around its center point.
+         *
+         * When this property is set to false, the camera’s heading angle is ignored and the map is always oriented
+         * so that true north is situated at the top of the map view
+         */
+        rotateEnabled?: boolean
+
+        /**
+         * If false the user won't be able to change the map region being displayed.
+         * Default value is true.
+         */
+        scrollEnabled?: boolean
+
+        /**
+         * If true the app will ask for the user's location and focus on it.
+         * Default value is false.
+         *
+         * NOTE: You need to add NSLocationWhenInUseUsageDescription key in Info.plist to enable geolocation,
+         * otherwise it is going to fail silently!
+         */
+        showsUserLocation?: boolean
+
+        /**
+         * Used to style and layout the MapView.
+         * See StyleSheet.js and ViewStylePropTypes.js for more info.
+         */
+        style?: ViewStyle
+
+        /**
+         * If false the user won't be able to pinch/zoom the map.
+         * Default value is true.
+         */
+        zoomEnabled?: boolean
+    }
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/mapview.html#content
+     */
+    export interface MapViewStatic extends React.ComponentClass<MapViewProperties> {
+    }
+
+
+    export interface TouchableWithoutFeedbackAndroidProperties {
+
+        /**
+         * Indicates to accessibility services to treat UI component like a native one.
+         * Works for Android only.
+         *
+         * @enum('none', 'button', 'radiobutton_checked', 'radiobutton_unchecked' )
+         */
+        accessibilityComponentType?: string
+    }
+
+    export interface TouchableWithoutFeedbackIOSProperties {
+
+        /**
+         * Provides additional traits to screen reader.
+         * By default no traits are provided unless specified otherwise in element
+         *
+         * @enum('none', 'button', 'link', 'header', 'search', 'image', 'selected', 'plays', 'key', 'text','summary', 'disabled', 'frequentUpdates', 'startsMedia', 'adjustable', 'allowsDirectInteraction', 'pageTurn')
+         */
+        accessibilityTraits?: string | string[];
+
+    }
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/touchablewithoutfeedback.html#props
+     */
+    export interface TouchableWithoutFeedbackProperties extends TouchableWithoutFeedbackAndroidProperties, TouchableWithoutFeedbackIOSProperties {
+
+
+        /**
+         * Called when the touch is released, but not if cancelled (e.g. by a scroll that steals the responder lock).
+         */
+        accessible?: boolean
+
+        /**
+         * Delay in ms, from onPressIn, before onLongPress is called.
+         */
+        delayLongPress?: number;
+
+        /**
+         * Delay in ms, from the start of the touch, before onPressIn is called.
+         */
+        delayPressIn?: number;
+
+        /**
+         * Delay in ms, from the release of the touch, before onPressOut is called.
+         */
+        delayPressOut?: number;
+
+        /**
+         * Invoked on mount and layout changes with
+         * {nativeEvent: {layout: {x, y, width, height}}}
+         */
+        onLayout?: ( event: LayoutChangeEvent ) => void
+
+        onLongPress?: () => void;
+
+        /**
+         * Called when the touch is released,
+         * but not if cancelled (e.g. by a scroll that steals the responder lock).
+         */
+        onPress?: () => void;
+
+        onPressIn?: () => void;
+
+        onPressOut?: () => void;
+
+        /**
+         * //FIXME: not in doc but available in exmaples
+         */
+        style?: ViewStyle
+    }
+
+
+    export interface TouchableWithoutFeedbackProps extends TouchableWithoutFeedbackProperties, React.Props<TouchableWithoutFeedbackStatic> {
+
+    }
+
+    /**
+     * Do not use unless you have a very good reason.
+     * All the elements that respond to press should have a visual feedback when touched.
+     * This is one of the primary reason a "web" app doesn't feel "native".
+     *
+     * @see https://facebook.github.io/react-native/docs/touchablewithoutfeedback.html
+     */
+    export interface TouchableWithoutFeedbackStatic extends React.ComponentClass<TouchableWithoutFeedbackProps> {
+
+    }
+
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/touchablehighlight.html#props
+     */
+    export interface TouchableHighlightProperties extends TouchableWithoutFeedbackProperties, React.Props<TouchableHighlightStatic> {
+
+        /**
+         * Determines what the opacity of the wrapped view should be when touch is active.
+         */
+        activeOpacity?: number
+
+        /**
+         *
+         * Called immediately after the underlay is hidden
+         */
+        onHideUnderlay?: () => void
+
+        /**
+         * Called immediately after the underlay is shown
+         */
+        onShowUnderlay?: () => void
+
+        /**
+         * @see https://facebook.github.io/react-native/docs/view.html#style
+         */
+        style?: ViewStyle
+
+
+        /**
+         * The color of the underlay that will show through when the touch is active.
+         */
+        underlayColor?: string
+    }
+
+    /**
+     * A wrapper for making views respond properly to touches.
+     * On press down, the opacity of the wrapped view is decreased,
+     * which allows the underlay color to show through, darkening or tinting the view.
+     * The underlay comes from adding a view to the view hierarchy,
+     * which can sometimes cause unwanted visual artifacts if not used correctly,
+     * for example if the backgroundColor of the wrapped view isn't explicitly set to an opaque color.
+     *
+     * NOTE: TouchableHighlight supports only one child
+     * If you wish to have several child components, wrap them in a View.
+     *
+     * @see https://facebook.github.io/react-native/docs/touchablehighlight.html
+     */
+    export interface TouchableHighlightStatic extends React.ComponentClass<TouchableHighlightProperties> {
+    }
+
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/touchableopacity.html#props
+     */
+    export interface TouchableOpacityProperties extends TouchableWithoutFeedbackProperties, React.Props<TouchableOpacityStatic> {
+        /**
+         * Determines what the opacity of the wrapped view should be when touch is active.
+         * Defaults to 0.2
+         */
+        activeOpacity?: number
+    }
+
+    /**
+     * A wrapper for making views respond properly to touches.
+     * On press down, the opacity of the wrapped view is decreased, dimming it.
+     * This is done without actually changing the view hierarchy,
+     * and in general is easy to add to an app without weird side-effects.
+     *
+     * @see https://facebook.github.io/react-native/docs/touchableopacity.html
+     */
+    export interface TouchableOpacityStatic extends React.ComponentClass<TouchableOpacityProperties> {
+    }
+
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/touchableopacity.html#props
+     */
+    export interface TouchableNativeFeedbackProperties extends TouchableWithoutFeedbackProperties, React.Props<TouchableNativeFeedbackStatic> {
+        /**
+         * Determines the type of background drawable that's going to be used to display feedback.
+         * It takes an object with type property and extra data depending on the type.
+         * It's recommended to use one of the following static methods to generate that dictionary:
+         *      1) TouchableNativeFeedback.SelectableBackground() - will create object that represents android theme's default background for selectable elements (?android:attr/selectableItemBackground)
+         *      2) TouchableNativeFeedback.SelectableBackgroundBorderless() - will create object that represent android theme's default background for borderless selectable elements (?android:attr/selectableItemBackgroundBorderless). Available on android API level 21+
+         *      3) TouchableNativeFeedback.Ripple(color, borderless) - will create object that represents ripple drawable with specified color (as a string). If property borderless evaluates to true the ripple will render outside of the view bounds (see native actionbar buttons as an example of that behavior). This background type is available on Android API level 21+
+         */
+        background?: any
+    }
+
+    /**
+     * A wrapper for making views respond properly to touches (Android only).
+     * On Android this component uses native state drawable to display touch feedback.
+     * At the moment it only supports having a single View instance as a child node,
+     * as it's implemented by replacing that View with another instance of RCTView node with some additional properties set.
+     *
+     * Background drawable of native feedback touchable can be customized with background property.
+     *
+     * @see https://facebook.github.io/react-native/docs/touchablenativefeedback.html#content
+     */
+    export interface TouchableNativeFeedbackStatic extends React.ComponentClass<TouchableNativeFeedbackProperties> {
+        SelectableBackground: () => TouchableNativeFeedbackStatic
+        SelectableBackgroundBorderless: () => TouchableNativeFeedbackStatic
+        Ripple: ( color: string, borderless?: boolean ) => TouchableNativeFeedbackStatic
+    }
+
+
+    export interface LeftToRightGesture {
+        //TODO:
+    }
+
+    export interface AnimationInterpolator {
+        //TODO:
+    }
+
+    // see /NavigatorSceneConfigs.js
+    export interface SceneConfig {
+        // A list of all gestures that are enabled on this scene
+        gestures: {
+            pop: LeftToRightGesture,
+        },
+
+        // Rebound spring parameters when transitioning FROM this scene
+        springFriction: number;
+        springTension: number;
+
+        // Velocity to start at when transitioning without gesture
+        defaultTransitionVelocity: number;
+
+        // Animation interpolators for horizontal transitioning:
+        animationInterpolators: {
+            into: AnimationInterpolator,
+            out: AnimationInterpolator
+        };
+
+    }
+
+    // see /NavigatorSceneConfigs.js
+    export interface SceneConfigs {
+        FloatFromBottom: SceneConfig;
+        FloatFromRight: SceneConfig;
+        PushFromRight: SceneConfig;
+        FloatFromLeft: SceneConfig;
+        HorizontalSwipeJump: SceneConfig;
+    }
+
+    export interface Route {
+        component?: React.ComponentClass<ViewProperties>
+        id?: string
+        title?: string
+        passProps?: Object;
+
+        //anything else
+        [key: string]: any
+
+        //Commonly found properties
+        backButtonTitle?: string
+        content?: string
+        message?: string;
+        index?: number
+        onRightButtonPress?: () => void
+        rightButtonTitle?: string
+        sceneConfig?: SceneConfig
+        wrapperStyle?: any
+    }
+
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/navigator.html#content
+     */
+    export interface NavigatorProperties extends React.Props<Navigator> {
+        /**
+         * Optional function that allows configuration about scene animations and gestures.
+         * Will be invoked with the route and should return a scene configuration object
+         * @param route
+         */
+        configureScene?: ( route: Route ) => SceneConfig
+        /**
+         * Specify a route to start on.
+         * A route is an object that the navigator will use to identify each scene to render.
+         * initialRoute must be a route in the initialRouteStack if both props are provided.
+         * The initialRoute will default to the last item in the initialRouteStack.
+         */
+        initialRoute?: Route
+        /**
+         * Provide a set of routes to initially mount.
+         * Required if no initialRoute is provided.
+         * Otherwise, it will default to an array containing only the initialRoute
+         */
+        initialRouteStack?: Route[]
+
+        /**
+         * Optionally provide a navigation bar that persists across scene transitions
+         */
+        navigationBar?: React.ReactElement<NavigatorStatic.NavigationBarProperties>
+
+        /**
+         * Optionally provide the navigator object from a parent Navigator
+         */
+        navigator?: Navigator
+
+        /**
+         * @deprecated Use navigationContext.addListener('willfocus', callback) instead.
+         */
+        onDidFocus?: Function
+
+        /**
+         * @deprecated Use navigationContext.addListener('willfocus', callback) instead.
+         */
+        onWillFocus?: Function
+
+        /**
+         * Required function which renders the scene for a given route.
+         * Will be invoked with the route and the navigator object
+         * @param route
+         * @param navigator
+         */
+        renderScene?: ( route: Route, navigator: Navigator ) => React.ReactElement<ViewProperties>
+
+        /**
+         * Styles to apply to the container of each scene
+         */
+        sceneStyle?: ViewStyle
+
+        /**
+         * //FIXME: not found in doc but found in examples
+         */
+        debugOverlay?: boolean
+
+    }
+
+    /**
+     * Use Navigator to transition between different scenes in your app.
+     * To accomplish this, provide route objects to the navigator to identify each scene,
+     * and also a renderScene function that the navigator can use to render the scene for a given route.
+     *
+     * To change the animation or gesture properties of the scene, provide a configureScene prop to get the config object for a given route.
+     * See Navigator.SceneConfigs for default animations and more info on scene config options.
+     * @see https://facebook.github.io/react-native/docs/navigator.html
+     */
+    export interface NavigatorStatic extends React.ComponentClass<NavigatorProperties> {
+        SceneConfigs: SceneConfigs;
+        NavigationBar: NavigatorStatic.NavigationBarStatic;
+        BreadcrumbNavigationBar: NavigatorStatic.BreadcrumbNavigationBarStatic
+
+        getContext( self: any ): NavigatorStatic;
+
+        /**
+         * returns the current list of routes
+         */
+        getCurrentRoutes(): Route[];
+
+        /**
+         * Jump backward without unmounting the current scen
+         */
+        jumpBack(): void;
+
+        /**
+         * Jump forward to the next scene in the route stack
+         */
+        jumpForward(): void;
+
+        /**
+         * Transition to an existing scene without unmounting
+         */
+        jumpTo( route: Route ): void;
+
+        /**
+         * Navigate forward to a new scene, squashing any scenes that you could jumpForward to
+         */
+        push( route: Route ): void;
+
+        /**
+         * Transition back and unmount the current scene
+         */
+        pop(): void;
+
+        /**
+         * Replace the current scene with a new route
+         */
+        replace( route: Route ): void;
+
+        /**
+         * Replace a scene as specified by an index
+         */
+        replaceAtIndex( route: Route, index: number ): void;
+
+        /**
+         *  Replace the previous scene
+         */
+        replacePrevious( route: Route ): void;
+
+        /**
+         * Reset every scene with an array of routes
+         */
+        immediatelyResetRouteStack( routes: Route[] ): void;
+
+        /**
+         * Pop to a particular scene, as specified by its route. All scenes after it will be unmounted
+         */
+        popToRoute( route: Route ): void;
+
+        /**
+         * Pop to the first scene in the stack, unmounting every other scene
+         */
+        popToTop(): void;
+
+    }
+
+    namespace NavigatorStatic {
+
+
+        export interface NavState {
+            routeStack: Route[]
+            idStack: number[]
+            presentedIndex: number
+        }
+
+        export interface NavigationBarStyle {
+            //TODO @see NavigationBarStyle.ios.js
+        }
+
+
+        export interface NavigationBarRouteMapper {
+            Title: ( route: Route, nav: Navigator, index: number, navState: NavState ) => React.ReactElement<any>;
+            LeftButton: ( route: Route, nav: Navigator, index: number, navState: NavState )=> React.ReactElement<any>;
+            RightButton: ( route: Route, nav: Navigator, index: number, navState: NavState )=> React.ReactElement<any>;
+        }
+
+        /**
+         * @see NavigatorNavigationBar.js
+         */
+        export interface NavigationBarProperties extends React.Props<NavigationBarStatic> {
+            navigator?: Navigator
+            routeMapper?: NavigationBarRouteMapper
+            navState?: NavState
+            style?: ViewStyle
+        }
+
+        export interface NavigationBarStatic extends React.ComponentClass<NavigationBarProperties> {
+            Styles: NavigationBarStyle
+
+        }
+
+        export type NavigationBar = NavigationBarStatic
+        export var NavigationBar: NavigationBarStatic
+
+
+        export interface BreadcrumbNavigationBarStyle {
+            //TODO &see NavigatorBreadcrumbNavigationBar.js
+        }
+
+        export interface BreadcrumbNavigationBarRouteMapper {
+            rightContentForRoute: ( route: Route, navigator: Navigator ) => React.ReactElement<any>
+            titleContentForRoute: ( route: Route, navigator: Navigator ) => React.ReactElement<any>
+            iconForRoute: ( route: Route, navigator: Navigator ) => React.ReactElement<any>
+            //in samples...
+            separatorForRoute: ( route: Route, navigator: Navigator ) => React.ReactElement<any>
+        }
+
+        /**
+         * @see NavigatorNavigationBar.js
+         */
+        export interface BreadcrumbNavigationBarProperties extends React.Props<BreadcrumbNavigationBarStatic> {
+            navigator?: Navigator
+            routeMapper?: BreadcrumbNavigationBarRouteMapper
+            navState?: NavState
+            style?: ViewStyle
+        }
+
+        export interface BreadcrumbNavigationBarStatic extends React.ComponentClass<BreadcrumbNavigationBarProperties> {
+            Styles: BreadcrumbNavigationBarStyle
+        }
+
+        export type BreadcrumbNavigationBar = BreadcrumbNavigationBarStatic
+        var BreadcrumbNavigationBar: BreadcrumbNavigationBarStatic
+
+    }
+
+
+    export interface StyleSheetStatic extends React.ComponentClass<StyleSheetProperties> {
+        create<T>( styles: T ): T;
+    }
+
+    /**
+     * //FIXME: Could not find docs. Inferred from examples and jscode : ListViewDataSource.js
+     */
+    export interface DataSourceAssetCallback {
+        rowHasChanged?: ( r1: any, r2: any ) => boolean
+        sectionHeaderHasChanged?: ( h1: any, h2: any ) => boolean
+        getRowData?: <T>( dataBlob: any, sectionID: number | string, rowID: number | string ) => T
+        getSectionHeaderData?: <T>( dataBlob: any, sectionID: number | string ) => T
+    }
+
+    /**
+     * //FIXME: Could not find docs. Inferred from examples and js code: ListViewDataSource.js
+     */
+    export interface ListViewDataSource {
+        new( onAsset: DataSourceAssetCallback ): ListViewDataSource;
+        /**
+         * Clones this `ListViewDataSource` with the specified `dataBlob` and
+         * `rowIdentities`. The `dataBlob` is just an aribitrary blob of data. At
+         * construction an extractor to get the interesting informatoin was defined
+         * (or the default was used).
+         *
+         * The `rowIdentities` is is a 2D array of identifiers for rows.
+         * ie. [['a1', 'a2'], ['b1', 'b2', 'b3'], ...].  If not provided, it's
+         * assumed that the keys of the section data are the row identities.
+         *
+         * Note: This function does NOT clone the data in this data source. It simply
+         * passes the functions defined at construction to a new data source with
+         * the data specified. If you wish to maintain the existing data you must
+         * handle merging of old and new data separately and then pass that into
+         * this function as the `dataBlob`.
+         */
+        cloneWithRows<T>( dataBlob: Array<any> | {[key: string ]: any}, rowIdentities?: Array<string | number> ): ListViewDataSource
+
+        /**
+         * This performs the same function as the `cloneWithRows` function but here
+         * you also specify what your `sectionIdentities` are. If you don't care
+         * about sections you should safely be able to use `cloneWithRows`.
+         *
+         * `sectionIdentities` is an array of identifiers for  sections.
+         * ie. ['s1', 's2', ...].  If not provided, it's assumed that the
+         * keys of dataBlob are the section identities.
+         *
+         * Note: this returns a new object!
+         */
+        cloneWithRowsAndSections( dataBlob: Array<any> | {[key: string]: any}, sectionIdentities?: Array<string | number>, rowIdentities?: Array<Array<string | number>> ): ListViewDataSource
+
+        getRowCount(): number
+
+        /**
+         * Gets the data required to render the row.
+         */
+        getRowData( sectionIndex: number, rowIndex: number ): any
+
+        /**
+         * Gets the rowID at index provided if the dataSource arrays were flattened,
+         * or null of out of range indexes.
+         */
+        getRowIDForFlatIndex( index: number ): string
+
+        /**
+         * Gets the sectionID at index provided if the dataSource arrays were flattened,
+         * or null for out of range indexes.
+         */
+        getSectionIDForFlatIndex( index: number ): string
+
+        /**
+         * Returns an array containing the number of rows in each section
+         */
+        getSectionLengths(): Array<number>
+
+        /**
+         * Returns if the section header is dirtied and needs to be rerendered
+         */
+        sectionHeaderShouldUpdate( sectionIndex: number ): boolean
+
+        /**
+         * Gets the data required to render the section header
+         */
+        getSectionHeaderData( sectionIndex: number ): any
+    }
+
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/tabbarios-item.html#props
+     */
+    export interface TabBarItemProperties extends React.Props<TabBarItemStatic> {
+
+        /**
+         * Little red bubble that sits at the top right of the icon.
+         */
+        badge?:  string | number
+
+        /**
+         * A custom icon for the tab. It is ignored when a system icon is defined.
+         */
+        icon?: {uri: string} | string
+
+        /**
+         * Callback when this tab is being selected,
+         * you should change the state of your component to set selected={true}.
+         */
+        onPress?: () => void
+
+        /**
+         * It specifies whether the children are visible or not. If you see a blank content, you probably forgot to add a selected one.
+         */
+        selected?: boolean
+
+        /**
+         * A custom icon when the tab is selected.
+         * It is ignored when a system icon is defined. If left empty, the icon will be tinted in blue.
+         */
+        selectedIcon?: {uri: string} | string;
+
+        /**
+         * React style object.
+         */
+        style?: ViewStyle
+
+        /**
+         * Items comes with a few predefined system icons.
+         * Note that if you are using them, the title and selectedIcon will be overriden with the system ones.
+         *
+         *  enum('bookmarks', 'contacts', 'downloads', 'favorites', 'featured', 'history', 'more', 'most-recent', 'most-viewed', 'recents', 'search', 'top-rated')
+         */
+        systemIcon: string
+
+        /**
+         * Text that appears under the icon. It is ignored when a system icon is defined.
+         */
+        title?: string
+
+    }
+
+    export interface TabBarItemStatic extends React.ComponentClass<TabBarItemProperties> {
+    }
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/tabbarios.html#props
+     */
+    export interface TabBarIOSProperties extends React.Props<TabBarIOSStatic> {
+
+        /**
+         * Background color of the tab bar
+         */
+        barTintColor?: string
+
+        style?: ViewStyle
+
+        /**
+         * Color of the currently selected tab icon
+         */
+        tintColor?: string
+
+        /**
+         * A Boolean value that indicates whether the tab bar is translucent
+         */
+        translucent?: boolean
+    }
+
+    export interface TabBarIOSStatic extends React.ComponentClass<TabBarIOSProperties> {
+        Item: TabBarItemStatic;
+    }
+
+
+    export interface PixelRatioStatic {
+        get(): number;
+    }
+
+    export interface DeviceEventSubscriptionStatic {
+        remove(): void;
+    }
+
+    export interface DeviceEventEmitterStatic {
+        addListener<T>( type: string, onReceived: ( data: T ) => void ): DeviceEventSubscription;
+    }
+
+    // Used by Dimensions below
+    export interface ScaledSize {
+        width: number;
+        height: number;
+        scale: number;
+        fontScale: number;
+    }
+
+    /**
+     * Initial dimensions are set before `runApplication` is called so they should
+     * be available before any other require's are run, but may be updated later.
+     *
+     * Note: Although dimensions are available immediately, they may change (e.g
+     * due to device rotation) so any rendering logic or styles that depend on
+     * these constants should try to call this function on every render, rather
+     * than caching the value (for example, using inline styles rather than
+     * setting a value in a `StyleSheet`).
+     *
+     * Example: `var {height, width} = Dimensions.get('window');`
+     *
+     * @param {string} dim Name of dimension as defined when calling `set`.
+     * @returns {Object?} Value for the dimension.
+     * @see https://facebook.github.io/react-native/docs/dimensions.html#content
+     */
+    export interface Dimensions {
+      get( what: "window" | "screen" ): ScaledSize;
+    }
+
+    export interface InteractionManagerStatic {
+        runAfterInteractions( fn: () => void ): void;
+    }
+
+
+    export interface ScrollViewStyle extends FlexStyle, TransformsStyle {
+
+        backfaceVisibility?:string //enum('visible', 'hidden')
+        backgroundColor?: string
+        borderColor?: string
+        borderTopColor?: string
+        borderRightColor?: string
+        borderBottomColor?: string
+        borderLeftColor?: string
+        borderRadius?: number
+        borderTopLeftRadius?: number
+        borderTopRightRadius?: number
+        borderBottomLeftRadius?: number
+        borderBottomRightRadius?: number
+        borderStyle?: string //enum('solid', 'dotted', 'dashed')
+        borderWidth?: number
+        borderTopWidth?: number
+        borderRightWidth?: number
+        borderBottomWidth?: number
+        borderLeftWidth?: number
+        opacity?: number
+        overflow?: string //enum('visible', 'hidden')
+        shadowColor?: string
+        shadowOffset?: {width: number; height: number}
+        shadowOpacity?: number
+        shadowRadius?: number
+    }
+
+
+    export interface ScrollViewIOSProperties {
+
+        /**
+         * When true the scroll view bounces horizontally when it reaches the end
+         * even if the content is smaller than the scroll view itself. The default
+         * value is true when `horizontal={true}` and false otherwise.
+         */
+        alwaysBounceHorizontal?: boolean
+        /**
+         * When true the scroll view bounces vertically when it reaches the end
+         * even if the content is smaller than the scroll view itself. The default
+         * value is false when `horizontal={true}` and true otherwise.
+         */
+        alwaysBounceVertical?: boolean
+
+        /**
+         * Controls whether iOS should automatically adjust the content inset for scroll views that are placed behind a navigation bar or tab bar/ toolbar.
+         * The default value is true.
+         */
+        automaticallyAdjustContentInsets?: boolean // true
+
+        /**
+         * When true the scroll view bounces when it reaches the end of the
+         * content if the content is larger then the scroll view along the axis of
+         * the scroll direction. When false it disables all bouncing even if
+         * the `alwaysBounce*` props are true. The default value is true.
+         */
+        bounces?: boolean
+        /**
+         * When true gestures can drive zoom past min/max and the zoom will animate
+         * to the min/max value at gesture end otherwise the zoom will not exceed
+         * the limits.
+         */
+        bouncesZoom?: boolean
+
+        /**
+         * When false once tracking starts won't try to drag if the touch moves.
+         * The default value is true.
+         */
+        canCancelContentTouches?: boolean
+
+        /**
+         * When true the scroll view automatically centers the content when the
+         * content is smaller than the scroll view bounds; when the content is
+         * larger than the scroll view this property has no effect. The default
+         * value is false.
+         */
+        centerContent?: boolean
+
+
+        /**
+         * The amount by which the scroll view content is inset from the edges of the scroll view.
+         * Defaults to {0, 0, 0, 0}.
+         */
+        contentInset?: Insets // zeros
+
+        /**
+         * Used to manually set the starting scroll offset.
+         * The default value is {x: 0, y: 0}
+         */
+        contentOffset?: PointProperties // zeros
+
+        /**
+         * A floating-point number that determines how quickly the scroll view
+         * decelerates after the user lifts their finger. Reasonable choices include
+         *   - Normal: 0.998 (the default)
+         *   - Fast: 0.9
+         */
+        decelerationRate?: number
+
+        /**
+         * When true the ScrollView will try to lock to only vertical or horizontal
+         * scrolling while dragging.  The default value is false.
+         */
+        directionalLockEnabled?: boolean
+
+        /**
+         * The maximum allowed zoom scale. The default value is 1.0.
+         */
+        maximumZoomScale?: number
+
+        /**
+         * The minimum allowed zoom scale. The default value is 1.0.
+         */
+        minimumZoomScale?: number
+
+        /**
+         * Called when a scrolling animation ends.
+         */
+        onScrollAnimationEnd?: () => void
+
+        /**
+         * When true the scroll view stops on multiples of the scroll view's size
+         * when scrolling. This can be used for horizontal pagination. The default
+         * value is false.
+         */
+        pagingEnabled?: boolean
+
+        /**
+         * When false, the content does not scroll. The default value is true
+         */
+        scrollEnabled?: boolean // true
+
+        /**
+         * This controls how often the scroll event will be fired while scrolling (in events per seconds).
+         * A higher number yields better accuracy for code that is tracking the scroll position,
+         * but can lead to scroll performance problems due to the volume of information being send over the bridge.
+         * The default value is zero, which means the scroll event will be sent only once each time the view is scrolled.
+         */
+        scrollEventThrottle?: number // null
+
+        /**
+         * The amount by which the scroll view indicators are inset from the edges of the scroll view.
+         * This should normally be set to the same value as the contentInset.
+         * Defaults to {0, 0, 0, 0}.
+         */
+        scrollIndicatorInsets?: Insets //zeroes
+
+        /**
+         * When true the scroll view scrolls to top when the status bar is tapped.
+         * The default value is true.
+         */
+        scrollsToTop?: boolean
+
+        /**
+         * When snapToInterval is set, snapToAlignment will define the relationship of the the snapping to the scroll view.
+         *      - start (the default) will align the snap at the left (horizontal) or top (vertical)
+         *      - center will align the snap in the center
+         *      - end will align the snap at the right (horizontal) or bottom (vertical)
+         */
+        snapToAlignment?: string
+
+        /**
+         * When set, causes the scroll view to stop at multiples of the value of snapToInterval.
+         * This can be used for paginating through children that have lengths smaller than the scroll view.
+         * Used in combination with snapToAlignment.
+         */
+        snapToInterval?: number
+
+        /**
+         * An array of child indices determining which children get docked to the
+         * top of the screen when scrolling. For example passing
+         * `stickyHeaderIndices={[0]}` will cause the first child to be fixed to the
+         * top of the scroll view. This property is not supported in conjunction
+         * with `horizontal={true}`.
+         */
+        stickyHeaderIndices?: number[]
+
+        /**
+         * The current scale of the scroll view content. The default value is 1.0.
+         */
+        zoomScale?: number
+    }
+
+    export interface ScrollViewProperties extends ScrollViewIOSProperties, Touchable {
+
+        /**
+         * These styles will be applied to the scroll view content container which
+         * wraps all of the child views. Example:
+         *
+         *   return (
+         *     <ScrollView contentContainerStyle={styles.contentContainer}>
+         *     </ScrollView>
+         *   );
+         *   ...
+         *   var styles = StyleSheet.create({
+         *     contentContainer: {
+         *       paddingVertical: 20
+         *     }
+         *   });
+         */
+        contentContainerStyle?: ViewStyle
+
+        /**
+         * When true the scroll view's children are arranged horizontally in a row
+         * instead of vertically in a column. The default value is false.
+         */
+        horizontal?: boolean
+
+        /**
+         * Determines whether the keyboard gets dismissed in response to a drag.
+         *   - 'none' (the default) drags do not dismiss the keyboard.
+         *   - 'onDrag' the keyboard is dismissed when a drag begins.
+         *   - 'interactive' the keyboard is dismissed interactively with the drag
+         *     and moves in synchrony with the touch; dragging upwards cancels the
+         *     dismissal.
+         */
+        keyboardDismissMode?: string
+
+        /**
+         * When false tapping outside of the focused text input when the keyboard
+         * is up dismisses the keyboard. When true the scroll view will not catch
+         * taps and the keyboard will not dismiss automatically. The default value
+         * is false.
+         */
+        keyboardShouldPersistTaps?: boolean
+
+        /**
+         * Fires at most once per frame during scrolling.
+         * The frequency of the events can be contolled using the scrollEventThrottle prop.
+         */
+        onScroll?: (event?: { nativeEvent: NativeScrollEvent }) => void
+
+        /**
+         * Experimental: When true offscreen child views (whose `overflow` value is
+         * `hidden`) are removed from their native backing superview when offscreen.
+         * This canimprove scrolling performance on long lists. The default value is
+         * false.
+         */
+        removeClippedSubviews?: boolean
+
+        /**
+         * When true, shows a horizontal scroll indicator.
+         */
+        showsHorizontalScrollIndicator?: boolean
+
+        /**
+         * When true, shows a vertical scroll indicator.
+         */
+        showsVerticalScrollIndicator?: boolean
+
+        /**
+         * Style
+         */
+        style?: ScrollViewStyle
+    }
+
+    export interface ScrollViewProps extends ScrollViewProperties, React.Props<ScrollViewStatic> {
+
+    }
+
+    interface ScrollViewStatic extends React.ComponentClass<ScrollViewProps> {
+        /**
+         * Scrolls to a given x, y offset, either immediately or with a smooth animation.
+         * Syntax:
+         *
+         * scrollTo(options: {x: number = 0; y: number = 0; animated: boolean = true})
+         *
+         * Note: The weird argument signature is due to the fact that, for historical reasons,
+         * the function also accepts separate arguments as as alternative to the options object.
+         * This is deprecated due to ambiguity (y before x), and SHOULD NOT BE USED.
+         */
+        scrollTo(
+            y?: number | { x?: number, y?: number, animated?: boolean },
+            x?: number,
+            animated?: boolean
+        ): void;
+    }
+
+
+    export interface NativeScrollRectangle {
+        left: number;
+        top: number;
+        bottom: number;
+        right: number;
+    }
+
+    export interface NativeScrollPoint {
+        x: number;
+        y: number;
+    }
+
+    export interface NativeScrollSize {
+        height: number;
+        width: number;
+    }
+
+    export interface NativeScrollEvent {
+        contentInset: NativeScrollRectangle;
+        contentOffset: NativeScrollPoint;
+        contentSize: NativeScrollSize;
+        layoutMeasurement: NativeScrollSize;
+        zoomScale: number;
+    }
+
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // A P I s
+    //
+    //////////////////////////////////////////////////////////////////////////
+
+    /**
+     * //FIXME: no documentation - inferred from RCTACtionSheetManager.m
+     */
+    export interface ActionSheetIOSOptions {
+        title?: string
+        options?: string[]
+        cancelButtonIndex?: number
+        destructiveButtonIndex?: number
+    }
+
+    /**
+     * //FIXME: no documentation - inferred from RCTACtionSheetManager.m
+     */
+    export interface ShareActionSheetIOSOptions {
+        message?: string
+        url?: string
+    }
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/actionsheetios.html#content
+     * //FIXME: no documentation - inferred from RCTACtionSheetManager.m
+     */
+    export interface ActionSheetIOSStatic {
+        showActionSheetWithOptions: ( options: ActionSheetIOSOptions, callback: ( buttonIndex: number ) => void ) => void
+        showShareActionSheetWithOptions: ( options: ShareActionSheetIOSOptions, failureCallback: ( error: Error ) => void, successCallback: ( success: boolean, method: string ) => void ) => void
+    }
+
+
+    /**
+     * //FIXME: No documentation - inferred from RCTAdSupport.m
+     */
+    export interface AdSupportIOSStatic {
+        getAdvertisingId: ( onSuccess: ( deviceId: string ) => void, onFailure: ( err: Error ) => void ) => void
+        getAdvertisingTrackingEnabled: ( onSuccess: ( hasTracking: boolean ) => void, onFailure: ( err: Error ) => void ) => void
+    }
+
+    interface AlertIOSButton {
+        text: string
+        onPress?: () => void
+    }
+
+    /**
+     * Launches an alert dialog with the specified title and message.
+     *
+     * Optionally provide a list of buttons.
+     * Tapping any button will fire the respective onPress callback and dismiss the alert.
+     * By default, the only button will be an 'OK' button
+     *
+     * The last button in the list will be considered the 'Primary' button and it will appear bold.
+     *
+     * @see https://facebook.github.io/react-native/docs/alertios.html#content
+     */
+    export interface AlertIOSStatic {
+        alert: ( title: string, message?: string, buttons?: Array<AlertIOSButton>, type?: string ) => void
+        prompt: ( title: string, value?: string, buttons?: Array<AlertIOSButton>, callback?: ( value?: string ) => void ) => void
+    }
+
+
+    /**
+     * AppStateIOS can tell you if the app is in the foreground or background,
+     * and notify you when the state changes.
+     *
+     * AppStateIOS is frequently used to determine the intent and proper behavior
+     * when handling push notifications.
+     *
+     * iOS App States
+     *      active - The app is running in the foreground
+     *      background - The app is running in the background. The user is either in another app or on the home screen
+     *      inactive - This is a transition state that currently never happens for typical React Native apps.
+     *
+     * For more information, see Apple's documentation: https://developer.apple.com/library/ios/documentation/iPhone/Conceptual/iPhoneOSProgrammingGuide/TheAppLifeCycle/TheAppLifeCycle.html
+     *
+     * @see https://facebook.github.io/react-native/docs/appstateios.html#content
+     */
+    export interface AppStateStatic {
+        currentState: string
+        addEventListener( type: string, listener: ( state: string ) => void ): void
+        removeEventListener( type: string, listener: ( state: string ) => void ): void
+    }
+
+    /**
+     * AsyncStorage is a simple, asynchronous, persistent, key-value storage system that is global to the app.
+     * It should be used instead of LocalStorage.
+     *
+     * It is recommended that you use an abstraction on top of AsyncStorage
+     * instead of AsyncStorage directly for anything more than light usage since it operates globally.
+     *
+     * @see https://facebook.github.io/react-native/docs/asyncstorage.html#content
+     */
+    export interface AsyncStorageStatic {
+
+        /**
+         * Fetches key and passes the result to callback, along with an Error if there is any.
+         */
+        getItem( key: string, callback?: ( error?: Error, result?: string ) => void ): Promise<string>
+
+        /**
+         * Sets value for key and calls callback on completion, along with an Error if there is any
+         */
+        setItem( key: string, value: string, callback?: ( error?: Error ) => void ): Promise<string>
+
+        removeItem( key: string, callback?: ( error?: Error ) => void ): Promise<string>
+
+        /**
+         * Merges existing value with input value, assuming they are stringified json. Returns a Promise object.
+         * Not supported by all native implementation
+         */
+        mergeItem( key: string, value: string, callback?: ( error?: Error ) => void ): Promise<string>
+
+        /**
+         * Erases all AsyncStorage for all clients, libraries, etc. You probably don't want to call this.
+         * Use removeItem or multiRemove to clear only your own keys instead.
+         */
+        clear( callback?: ( error?: Error ) => void ): Promise<string>
+
+        /**
+         * Gets all keys known to the app, for all callers, libraries, etc
+         */
+        getAllKeys( callback?: ( error?: Error, keys?: string[] ) => void ): Promise<string>
+
+        /**
+         * multiGet invokes callback with an array of key-value pair arrays that matches the input format of multiSet
+         */
+        multiGet( keys: string[], callback?: ( errors?: Error[], result?: string[][] ) => void ): Promise<string>
+
+        /**
+         * multiSet and multiMerge take arrays of key-value array pairs that match the output of multiGet,
+         *
+         * multiSet([['k1', 'val1'], ['k2', 'val2']], cb);
+         */
+        multiSet( keyValuePairs: string[][], callback?: ( errors?: Error[] ) => void ): Promise<string>
+
+        /**
+         * Delete all the keys in the keys array.
+         */
+        multiRemove( keys: string[], callback?: ( errors?: Error[] ) => void ): Promise<string>
+
+        /**
+         * Merges existing values with input values, assuming they are stringified json.
+         * Returns a Promise object.
+         *
+         * Not supported by all native implementations.
+         */
+        multiMerge( keyValuePairs: string[][], callback?: ( errors?: Error[] ) => void ): Promise<string>
+    }
+
+
+    export interface CameraRollFetchParams {
+        first: number;
+        after?: string;
+        groupTypes: string; //  'Album','All','Event','Faces','Library','PhotoStream','SavedPhotos'
+        groupName?: string
+        assetType?: string
+    }
+
+    export interface CameraRollNodeInfo {
+        image: Image;
+        group_name: string;
+        timestamp: number;
+        location: any;
+    }
+
+    export interface CameraRollEdgeInfo {
+        node: CameraRollNodeInfo;
+    }
+
+    export interface CameraRollAssetInfo {
+        edges: CameraRollEdgeInfo[];
+        page_info: {
+            has_next_page: boolean;
+            end_cursor: string;
+        };
+    }
+
+    /**
+     * CameraRoll provides access to the local camera roll / gallery.
+     */
+    export interface CameraRollStatic {
+
+        GroupTypesOptions: string[] //'Album','All','Event','Faces','Library','PhotoStream','SavedPhotos'
+
+        /**
+         * Saves the image to the camera roll / gallery.
+         *
+         * The CameraRoll API is not yet implemented for Android.
+         *
+         * @tag On Android, this is a local URI, such as "file:///sdcard/img.png".
+         * On iOS, the tag can be one of the following:
+         *      local URI
+         *      assets-library tag
+         *      a tag not maching any of the above, which means the image data will be stored in memory (and consume memory as long as the process is alive)
+         *
+         * @param successCallback Invoked with the value of tag on success.
+         * @param errorCallback Invoked with error message on error.
+         */
+        saveImageWithTag( tag: string, successCallback: ( tag?: string ) => void, errorCallback: ( error: Error ) => void ): void
+
+        /**
+         * Invokes callback with photo identifier objects from the local camera roll of the device matching shape defined by getPhotosReturnChecker.
+         *
+         * @param {object} params See getPhotosParamChecker.
+         * @param {function} callback Invoked with arg of shape defined by getPhotosReturnChecker on success.
+         * @param {function} errorCallback Invoked with error message on error.
+         */
+        getPhotos( fetch: CameraRollFetchParams,
+                   callback: ( assetInfo: CameraRollAssetInfo ) => void,
+                   errorCallback: ( error: Error )=> void ): void;
+    }
+
+    export interface FetchableListenable<T> {
+        fetch: () => Promise<T>
+
+        /**
+         * eventName is expected to be `change`
+         * //FIXME: No doc - inferred from NetInfo.js
+         */
+        addEventListener: ( eventName: string, listener: ( result: T ) => void ) => void
+
+        /**
+         * eventName is expected to be `change`
+         * //FIXME: No doc - inferred from NetInfo.js
+         */
+        removeEventListener: ( eventName: string, listener: ( result: T ) => void ) => void
+    }
+
+    /**
+     * NetInfo exposes info about online/offline status
+     *
+     * Asynchronously determine if the device is online and on a cellular network.
+     *
+     * - `none` - device is offline
+     * - `wifi` - device is online and connected via wifi, or is the iOS simulator
+     * - `cell` - device is connected via Edge, 3G, WiMax, or LTE
+     * - `unknown` - error case and the network status is unknown
+
+     * @see https://facebook.github.io/react-native/docs/netinfo.html#content
+     */
+    export interface NetInfoStatic extends FetchableListenable<string> {
+
+        /**
+         *
+         * Available on all platforms.
+         * Asynchronously fetch a boolean to determine internet connectivity.
+         */
+        isConnected: FetchableListenable<boolean>
+
+        //FIXME: Documentation missing
+        isConnectionMetered: any
+    }
+
+
+    export interface PanResponderGestureState {
+
+        /**
+         *  ID of the gestureState- persisted as long as there at least one touch on
+         */
+        stateID: number
+
+        /**
+         *  the latest screen coordinates of the recently-moved touch
+         */
+        moveX: number
+
+        /**
+         *  the latest screen coordinates of the recently-moved touch
+         */
+        moveY: number
+
+        /**
+         * the screen coordinates of the responder grant
+         */
+        x0: number
+
+        /**
+         * the screen coordinates of the responder grant
+         */
+        y0: number
+
+        /**
+         * accumulated distance of the gesture since the touch started
+         */
+        dx: number
+
+        /**
+         * accumulated distance of the gesture since the touch started
+         */
+        dy: number
+
+        /**
+         * current velocity of the gesture
+         */
+        vx: number
+
+        /**
+         * current velocity of the gesture
+         */
+        vy: number
+
+        /**
+         * Number of touches currently on screeen
+         */
+        numberActiveTouches: number
+
+
+        // All `gestureState` accounts for timeStamps up until:
+        _accountsForMovesUpTo: number
+    }
+
+
+    /**
+     * @see documentation of GestureResponderHandlers
+     */
+    export interface PanResponderCallbacks {
+        onMoveShouldSetPanResponder?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => boolean
+        onStartShouldSetPanResponder?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
+        onPanResponderGrant?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
+        onPanResponderMove?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
+        onPanResponderRelease?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
+        onPanResponderTerminate?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
+
+        onMoveShouldSetPanResponderCapture?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => boolean
+        onStartShouldSetPanResponderCapture?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => boolean
+        onPanResponderReject?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
+        onPanResponderStart?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
+        onPanResponderEnd?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
+        onPanResponderTerminationRequest?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => boolean
+    }
+
+    export interface PanResponderInstance {
+        panHandlers: GestureResponderHandlers
+    }
+
+    /**
+     * PanResponder reconciles several touches into a single gesture.
+     * It makes single-touch gestures resilient to extra touches,
+     * and can be used to recognize simple multi-touch gestures.
+     *
+     * It provides a predictable wrapper of the responder handlers provided by the gesture responder system.
+     * For each handler, it provides a new gestureState object alongside the normal event.
+     */
+    export interface PanResponderStatic {
+        /**
+         * @param config Enhanced versions of all of the responder callbacks
+         * that provide not only the typical `ResponderSyntheticEvent`, but also the
+         * `PanResponder` gesture state.  Simply replace the word `Responder` with
+         * `PanResponder` in each of the typical `onResponder*` callbacks. For
+         * example, the `config` object would look like:
+         *
+         *  - `onMoveShouldSetPanResponder: (e, gestureState) => {...}`
+         *  - `onMoveShouldSetPanResponderCapture: (e, gestureState) => {...}`
+         *  - `onStartShouldSetPanResponder: (e, gestureState) => {...}`
+         *  - `onStartShouldSetPanResponderCapture: (e, gestureState) => {...}`
+         *  - `onPanResponderReject: (e, gestureState) => {...}`
+         *  - `onPanResponderGrant: (e, gestureState) => {...}`
+         *  - `onPanResponderStart: (e, gestureState) => {...}`
+         *  - `onPanResponderEnd: (e, gestureState) => {...}`
+         *  - `onPanResponderRelease: (e, gestureState) => {...}`
+         *  - `onPanResponderMove: (e, gestureState) => {...}`
+         *  - `onPanResponderTerminate: (e, gestureState) => {...}`
+         *  - `onPanResponderTerminationRequest: (e, gestureState) => {...}`
+         *
+         *  In general, for events that have capture equivalents, we update the
+         *  gestureState once in the capture phase and can use it in the bubble phase
+         *  as well.
+         *
+         *  Be careful with onStartShould* callbacks. They only reflect updated
+         *  `gestureState` for start/end events that bubble/capture to the Node.
+         *  Once the node is the responder, you can rely on every start/end event
+         *  being processed by the gesture and `gestureState` being updated
+         *  accordingly. (numberActiveTouches) may not be totally accurate unless you
+         *  are the responder.
+         */
+        create( config: PanResponderCallbacks ): PanResponderInstance
+    }
+
+    export interface PushNotificationPermissions {
+        alert?: boolean
+        badge?: boolean
+        sound?: boolean
+    }
+
+    export interface PushNotification {
+
+
+        /**
+         * An alias for `getAlert` to get the notification's main message string
+         */
+        getMessage(): string | Object
+
+        /**
+         * Gets the sound string from the `aps` object
+         */
+        getSound(): string
+
+        /**
+         * Gets the notification's main message from the `aps` object
+         */
+        getAlert(): string | Object
+
+        /**
+         * Gets the badge count number from the `aps` object
+         */
+        getBadgeCount(): number
+
+        /**
+         * Gets the data object on the notif
+         */
+        getData(): Object
+
+    }
+
+
+    /**
+     * Handle push notifications for your app, including permission handling and icon badge number.
+     * @see https://facebook.github.io/react-native/docs/pushnotificationios.html#content
+     *
+     * //FIXME: BGR: The documentation seems completely off compared to the actual js implementation. I could never get the example to run
+     */
+    export interface PushNotificationIOSStatic {
+
+        /**
+         * Sets the badge number for the app icon on the home screen
+         */
+        setApplicationIconBadgeNumber( number: number ): void
+
+        /**
+         * Gets the current badge number for the app icon on the home screen
+         */
+        getApplicationIconBadgeNumber( callback: ( badge: number ) => void ): void
+
+        /**
+         * Attaches a listener to remote notifications while the app is running in the
+         * foreground or the background.
+         *
+         * The handler will get be invoked with an instance of `PushNotificationIOS`
+         *
+         * The type MUST be 'notification'
+         */
+        addEventListener( type: string, handler: ( notification: PushNotification ) => void ):void
+
+        /**
+         * Requests all notification permissions from iOS, prompting the user's
+         * dialog box.
+         */
+        requestPermissions(): void
+
+        /**
+         * See what push permissions are currently enabled. `callback` will be
+         * invoked with a `permissions` object:
+         *
+         *  - `alert` :boolean
+         *  - `badge` :boolean
+         *  - `sound` :boolean
+         */
+        checkPermissions( callback: ( permissions: PushNotificationPermissions ) => void ): void
+
+        /**
+         * Removes the event listener. Do this in `componentWillUnmount` to prevent
+         * memory leaks
+         */
+        removeEventListener( type: string, handler: ( notification: PushNotification ) => void ): void
+
+        /**
+         * An initial notification will be available if the app was cold-launched
+         * from a notification.
+         *
+         * The first caller of `popInitialNotification` will get the initial
+         * notification object, or `null`. Subsequent invocations will return null.
+         */
+        popInitialNotification(): PushNotification
+    }
+
+
+    /**
+     * @enum('default', 'light-content')
+     */
+    export type StatusBarStyle = string
+
+    /**
+     * @enum('none','fade', 'slide')
+     */
+    type StatusBarAnimation = string
+
+
+    /**
+     * //FIXME: No documentation is available (although this is self explanatory)
+     *
+     * @see https://facebook.github.io/react-native/docs/statusbarios.html#content
+     */
+    export interface StatusBarIOSStatic {
+
+        setStyle(style: StatusBarStyle, animated?: boolean): void
+
+        setHidden(hidden: boolean, animation?: StatusBarAnimation): void
+
+        setNetworkActivityIndicatorVisible(visible: boolean): void
+    }
+
+    /**
+     * The Vibration API is exposed at VibrationIOS.vibrate().
+     * On iOS, calling this function will trigger a one second vibration.
+     * The vibration is asynchronous so this method will return immediately.
+     *
+     * There will be no effect on devices that do not support Vibration, eg. the iOS simulator.
+     *
+     * Vibration patterns are currently unsupported.
+     *
+     * @see https://facebook.github.io/react-native/docs/vibrationios.html#content
+     */
+    export interface VibrationIOSStatic {
+        vibrate(): void
+    }
+
+    export module Animated {
+      // Most (all?) functions where AnimatedValue is used any subclass of Animated can be used as well.
+      type AnimatedValue = Animated;
+      type AnimatedValueXY = ValueXY;
+
+      type Base = Animated;
+
+      class Animated {
+        // Internal class, no public API.
+      }
+
+      class AnimatedWithChildren extends Animated {
+        // Internal class, no public API.
+      }
+
+      class AnimatedInterpolation extends AnimatedWithChildren {
+        interpolate(config: InterpolationConfigType): AnimatedInterpolation;
+      }
+
+      type ExtrapolateType = 'extend' | 'identity' | 'clamp';
+
+      type InterpolationConfigType = {
+        inputRange: number[];
+        outputRange: (number[] | string[]);
+        easing?: ((input: number) => number);
+        extrapolate?: ExtrapolateType;
+        extrapolateLeft?: ExtrapolateType;
+        extrapolateRight?: ExtrapolateType;
+      };
+
+      type ValueListenerCallback = (state: {value: number}) => void;
+
+      /**
+       * Standard value for driving animations.  One `Animated.Value` can drive
+       * multiple properties in a synchronized fashion, but can only be driven by one
+       * mechanism at a time.  Using a new mechanism (e.g. starting a new animation,
+       * or calling `setValue`) will stop any previous ones.
+       */
+      export class Value extends AnimatedWithChildren {
+        constructor(value: number);
+
+        setValue(value: number): void;
+
+        /**
+         * Sets an offset that is applied on top of whatever value is set, whether via
+         * `setValue`, an animation, or `Animated.event`.  Useful for compensating
+         * things like the start of a pan gesture.
+         */
+        setOffset(offset: number): void;
+
+        /**
+         * Merges the offset value into the base value and resets the offset to zero.
+         * The final output of the value is unchanged.
+         */
+        flattenOffset(): void;
+
+        /**
+         * Adds an asynchronous listener to the value so you can observe updates from
+         * animations.  This is useful because there is no way to
+         * synchronously read the value because it might be driven natively.
+         */
+        addListener(callback: ValueListenerCallback): string;
+
+        removeListener(id: string): void;
+
+        removeAllListeners(): void;
+
+        /**
+         * Stops any running animation or tracking.  `callback` is invoked with the
+         * final value after stopping the animation, which is useful for updating
+         * state to match the animation position with layout.
+         */
+        stopAnimation(callback?: (value: number) => void): void;
+
+        /**
+         * Interpolates the value before updating the property, e.g. mapping 0-1 to
+         * 0-10.
+         */
+        interpolate(config: InterpolationConfigType): AnimatedInterpolation;
+      }
+
+      type ValueXYListenerCallback = (value: {x: number; y: number}) => void;
+
+      /**
+       * 2D Value for driving 2D animations, such as pan gestures.  Almost identical
+       * API to normal `Animated.Value`, but multiplexed.  Contains two regular
+       * `Animated.Value`s under the hood.
+       */
+      export class ValueXY extends AnimatedWithChildren {
+        x: AnimatedValue;
+        y: AnimatedValue;
+
+        constructor(valueIn?: {x: number | AnimatedValue; y: number | AnimatedValue});
+
+        setValue(value: {x: number; y: number}): void;
+
+        setOffset(offset: {x: number; y: number}): void;
+
+        flattenOffset(): void
+
+        stopAnimation(callback?: () => number): void;
+
+        addListener(callback: ValueXYListenerCallback): string;
+
+        removeListener(id: string): void;
+
+        /**
+         * Converts `{x, y}` into `{left, top}` for use in style, e.g.
+         *
+         *```javascript
+         *  style={this.state.anim.getLayout()}
+         *```
+         */
+        getLayout(): { left: AnimatedValue, top: AnimatedValue };
+
+        /**
+         * Converts `{x, y}` into a useable translation transform, e.g.
+         *
+         *```javascript
+         *  style={{
+         *    transform: this.state.anim.getTranslateTransform()
+         *  }}
+         *```
+         */
+        getTranslateTransform(): {[key: string]: AnimatedValue}[];
+
+      }
+
+      type EndResult = {finished: boolean};
+      type EndCallback = (result: EndResult) => void;
+
+      interface CompositeAnimation {
+        start: (callback?: EndCallback) => void;
+        stop: () => void;
+      }
+
+      interface AnimationConfig {
+        isInteraction?: boolean;
+        useNativeDriver?: boolean;
+      }
+
+      /**
+       * Animates a value from an initial velocity to zero based on a decay
+       * coefficient.
+       */
+      export function decay(
+        value: AnimatedValue | AnimatedValueXY,
+        config: DecayAnimationConfig
+      ): CompositeAnimation;
+
+      interface DecayAnimationConfig extends AnimationConfig {
+        velocity: number | {x: number, y: number};
+        deceleration?: number;
+      }
+
+      /**
+       * Animates a value along a timed easing curve.  The `Easing` module has tons
+       * of pre-defined curves, or you can use your own function.
+       */
+      export var timing: (
+        value: AnimatedValue | AnimatedValueXY,
+        config: TimingAnimationConfig
+      ) => CompositeAnimation;
+
+      interface TimingAnimationConfig extends AnimationConfig {
+        toValue: number | AnimatedValue | {x: number, y: number} | AnimatedValueXY;
+        easing?: (value: number) => number;
+        duration?: number;
+        delay?: number;
+      }
+
+      interface SpringAnimationConfig extends AnimationConfig {
+        toValue: number | AnimatedValue | {x: number, y: number} | AnimatedValueXY;
+        overshootClamping?: boolean;
+        restDisplacementThreshold?: number;
+        restSpeedThreshold?: number;
+        velocity?: number | {x: number, y: number};
+        bounciness?: number;
+        speed?: number;
+        tension?: number;
+        friction?: number;
+      }
+
+      /**
+       * Creates a new Animated value composed from two Animated values added
+       * together.
+       */
+      export function add(
+        a: Animated,
+        b: Animated
+      ): AnimatedAddition;
+
+      class AnimatedAddition extends AnimatedInterpolation {}
+
+      /**
+       * Creates a new Animated value composed from two Animated values multiplied
+       * together.
+       */
+       export function multiply(
+        a: Animated,
+        b: Animated
+      ): AnimatedMultiplication;
+
+      class AnimatedMultiplication extends AnimatedInterpolation {}
+
+      /**
+       * Creates a new Animated value that is the (non-negative) modulo of the
+       * provided Animated value
+       */
+      export function modulo(
+        a: Animated,
+        modulus: number
+      ): AnimatedModulo;
+
+      class AnimatedModulo extends AnimatedInterpolation {}
+
+      /**
+       * Starts an animation after the given delay.
+       */
+      export function delay(time: number): CompositeAnimation;
+
+      /**
+       * Starts an array of animations in order, waiting for each to complete
+       * before starting the next.  If the current running animation is stopped, no
+       * following animations will be started.
+       */
+      export function sequence(
+        animations: Array<CompositeAnimation>
+      ): CompositeAnimation;
+
+      /**
+       * Array of animations may run in parallel (overlap), but are started in
+       * sequence with successive delays.  Nice for doing trailing effects.
+       */
+
+      export function stagger(
+        time: number,
+        animations: Array<CompositeAnimation>
+      ): CompositeAnimation
+
+      /**
+       * Spring animation based on Rebound and Origami.  Tracks velocity state to
+       * create fluid motions as the `toValue` updates, and can be chained together.
+       */
+      export var spring: (
+        value: AnimatedValue | AnimatedValueXY,
+        config: SpringAnimationConfig
+      ) => CompositeAnimation;
+
+      type ParallelConfig = {
+        stopTogether?: boolean; // If one is stopped, stop all.  default: true
+      }
+
+      /**
+       * Starts an array of animations all at the same time.  By default, if one
+       * of the animations is stopped, they will all be stopped.  You can override
+       * this with the `stopTogether` flag.
+       */
+      var parallel: (
+        animations: Array<CompositeAnimation>,
+        config?: ParallelConfig
+      ) => CompositeAnimation;
+
+      type Mapping = {[key: string]: Mapping} | AnimatedValue;
+      interface EventConfig {
+        listener?: Function
+      }
+
+      /**
+       *  Takes an array of mappings and extracts values from each arg accordingly,
+       *  then calls `setValue` on the mapped outputs.  e.g.
+       *
+       *```javascript
+       *  onScroll={Animated.event(
+       *    [{nativeEvent: {contentOffset: {x: this._scrollX}}}]
+       *    {listener},          // Optional async listener
+       *  )
+       *  ...
+       *  onPanResponderMove: Animated.event([
+       *    null,                // raw event arg ignored
+       *    {dx: this._panX},    // gestureState arg
+       *  ]),
+       *```
+       */
+      var event: (
+        argMapping: Mapping[],
+        config?: EventConfig
+      ) => (...args: any[]) => void;
+
+      /**
+       * Animated variants of the basic native views. Accepts Animated.Value for
+       * props and style.
+       */
+      export var View: any;
+      export var Image: any;
+      export var Text: any;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    //  R E - E X P O R T S
+    //
+    //////////////////////////////////////////////////////////////////////////
+
+    // export var AppRegistry: AppRegistryStatic;
+
+
+    export var ActivityIndicatorIOS: ActivityIndicatorIOSStatic
+    export type ActivityIndicatorIOS = ActivityIndicatorIOSStatic
+
+    export var DatePickerIOS: DatePickerIOSStatic
+    export type DatePickerIOS = DatePickerIOSStatic
+
+    export var Image: ImageStatic
+    export type Image = ImageStatic
+
+    export var LayoutAnimation: LayoutAnimationStatic
+    export type LayoutAnimation = LayoutAnimationStatic
+
+    export var ListView: ListViewStatic
+    export type ListView = ListViewStatic
+
+    export var MapView: MapViewStatic
+    export type MapView = MapViewStatic
+
+    export var Navigator: NavigatorStatic
+    export type Navigator = NavigatorStatic
+
+    export var NavigatorIOS: NavigatorIOSStatic
+    export type NavigatorIOS = NavigatorIOSStatic
+
+    export var PickerIOS: PickerIOSStatic
+    export type PickerIOS = PickerIOSStatic
+
+    export var SliderIOS: SliderIOSStatic
+    export type SliderIOS = SliderIOSStatic
+
+    export var ScrollView: ScrollViewStatic
+    export type ScrollView = ScrollViewStatic
+
+    export var StyleSheet: StyleSheetStatic
+    export type StyleSheet = StyleSheetStatic
+
+    export var SwitchIOS: SwitchIOSStatic
+    export type SwitchIOS = SwitchIOSStatic
+
+    export var TabBarIOS: TabBarIOSStatic
+    export type TabBarIOS = TabBarIOSStatic
+
+    export var Text: TextStatic
+    export type Text = TextStatic
+
+    export var TextInput: TextInputStatic
+    export type TextInput = TextInputStatic
+
+    export var TouchableHighlight: TouchableHighlightStatic
+    export type TouchableHighlight = TouchableHighlightStatic
+
+    export var TouchableNativeFeedback: TouchableNativeFeedbackStatic
+    export type TouchableNativeFeedback = TouchableNativeFeedbackStatic
+
+    export var TouchableOpacity: TouchableOpacityStatic
+    export type TouchableOpacity = TouchableOpacityStatic
+
+    export var TouchableWithoutFeedback: TouchableWithoutFeedbackStatic
+    export type TouchableWithoutFeedback= TouchableWithoutFeedbackStatic
+
+    export var View: ViewStatic
+    export type View = ViewStatic
+
+    export var ViewPagerAndroid: ViewPagerAndroidStatic
+    export type ViewPagerAndroid = ViewPagerAndroidStatic
+
+    export var WebView: WebViewStatic
+    export type WebView = WebViewStatic
+
+
+    //////////// APIS //////////////
+    export var ActionSheetIOS: ActionSheetIOSStatic
+    export type ActionSheetIOS = ActionSheetIOSStatic
+
+    export var AdSupportIOS: AdSupportIOSStatic
+    export type AdSupportIOS = AdSupportIOSStatic
+
+    export var AlertIOS: AlertIOSStatic
+    export type AlertIOS = AlertIOSStatic
+
+    export var AppState : AppStateStatic;
+    export type AppState = AppStateStatic;
+
+    export var AppStateIOS: AppStateStatic
+    export type AppStateIOS = AppStateStatic
+
+    export var AsyncStorage: AsyncStorageStatic
+    export type AsyncStorage = AsyncStorageStatic
+
+    export var CameraRoll: CameraRollStatic
+    export type CameraRoll = CameraRollStatic
+
+    export var NetInfo: NetInfoStatic
+    export type NetInfo = NetInfoStatic
+
+    export var PanResponder: PanResponderStatic
+    export type PanResponder = PanResponderStatic
+
+    export var PushNotificationIOS: PushNotificationIOSStatic
+    export type PushNotificationIOS = PushNotificationIOSStatic
+
+    export var StatusBarIOS: StatusBarIOSStatic
+    export type StatusBarIOS = StatusBarIOSStatic
+
+    export var VibrationIOS: VibrationIOSStatic
+    export type VibrationIOS = VibrationIOSStatic
+
+    export var Dimensions: Dimensions;
+
+    //
+    // /TODO: BGR: These are leftovers of the initial port that must be revisited
+    //
+
+    export var SegmentedControlIOS: React.ComponentClass<SegmentedControlIOSProperties>
+
+    export var PixelRatio: PixelRatioStatic
+    export var DeviceEventEmitter: DeviceEventEmitterStatic
+    export var DeviceEventSubscription: DeviceEventSubscriptionStatic
+    export type DeviceEventSubscription = DeviceEventSubscriptionStatic
+    export var InteractionManager: InteractionManagerStatic
+
+    //////////////////////////////////////////////////////////////////////////
+    //
+    // Additional ( and controversial)
+    //
+    //////////////////////////////////////////////////////////////////////////
+
+    export function __spread( target: any, ...sources: any[] ): any;
+
+    //
+    // Add-Ons
+    //
+    namespace addons {
+
+        //FIXME: Documentation ?
+        export interface TestModuleStatic {
+
+            verifySnapshot: ( done: ( indicator?: any ) => void ) => void
+            markTestPassed: ( indicator: any ) => void
+            markTestCompleted: () => void
+        }
+
+        export var TestModule: TestModuleStatic
+        export type TestModule = TestModuleStatic
+    }
+}
+
+declare interface ReactNativeGlobalStatic {
+  /**
+   * Accepts a function as its only argument and calls that function before the next repaint.
+   * It is an essential building block for animations that underlies all of the JavaScript-based animation APIs.
+   * In general, you shouldn't need to call this yourself - the animation API's will manage frame updates for you.
+   * @see https://facebook.github.io/react-native/docs/animations.html#requestanimationframe
+   */
+  requestAnimationFrame( fn: () => void ) : void;
+}
+
+
+declare var global: ReactNativeGlobalStatic;
+
+declare function require( name: string ): any
\ No newline at end of file
diff --git a/react-native/react-native-animated-tests.tsx b/react-native/react-native-animated-tests.tsx
new file mode 100644
index 0000000000..632f2c0151
--- /dev/null
+++ b/react-native/react-native-animated-tests.tsx
@@ -0,0 +1,95 @@
+///<reference types="react-native" />
+
+import * as React from 'react-native'
+
+import {
+  Animated,
+  View,
+} from 'react-native';
+
+function TestAnimatedAPI() {
+  // Value
+  const v1 = new Animated.Value(0);
+  const v2 = new Animated.Value(0);
+
+  v1.setValue(0.1);
+
+  v1.addListener(e => {
+    let n: number = e.value;
+  });
+
+  const v200 = v1.interpolate({
+    inputRange: [0, 1],
+    outputRange: [0, 200],
+  });
+
+  // ValueXY
+  const position = new Animated.ValueXY({ x: 0, y: 0 });
+
+  // Animation functions
+  const spring1 = Animated.spring(v1, {
+    toValue: 0.5,
+    tension: 10,
+  });
+
+  const springXY =  Animated.spring(position, {
+    toValue: {
+      x: 1,
+      y: 2,
+    }
+  });
+
+  spring1.start();
+  spring1.stop();
+
+  Animated.parallel([
+    Animated.spring(v1, { toValue: 1 }),
+    Animated.spring(v2, { toValue: 1 }),
+  ], {
+    stopTogether: true,
+  });
+
+  Animated.decay(v1, {
+    velocity: 2,
+  });
+
+  Animated.timing(v1, {
+    toValue: 1,
+    duration: 100,
+    delay: 100,
+    easing: v => v,
+  });
+
+  Animated.add(v1, v2);
+  Animated.multiply(v1, v2);
+  Animated.modulo(v1, 2);
+
+  Animated.delay(100);
+
+  Animated.sequence([
+    spring1,
+    springXY,
+  ]);
+
+  Animated.stagger(100, [
+    spring1,
+    springXY,
+  ]);
+
+  return (
+    <View>
+      <Animated.View
+        style={[
+          position.getLayout(),
+          {
+            opacity: v1,
+          }]}>
+      </Animated.View>
+
+      <Animated.Image
+        style={position.getTranslateTransform()}
+        >
+      </Animated.Image>
+    </View>
+  );
+}
\ No newline at end of file
diff --git a/react-native/react-native-tests.tsx b/react-native/react-native-tests.tsx
index ffb127b6cc..a789e945c4 100644
--- a/react-native/react-native-tests.tsx
+++ b/react-native/react-native-tests.tsx
@@ -17,7 +17,7 @@ For a list of complete Typescript examples: check https://github.com/bgrieder/RN
 
  */
 
-///<reference path="../react-native/react-native.d.ts" />
+///<reference types="react-native" />
 
 
 import * as React from 'react-native'
@@ -27,9 +27,27 @@ import {
     View,
     AppState,
     AppStateIOS,
-    ViewPagerAndroid
+    ViewPagerAndroid,
+    Dimensions,
 } from 'react-native';
 
+function testDimensions() {
+  var {
+    width,
+    height,
+    scale,
+    fontScale,
+  } = Dimensions.get("window");
+
+  var {
+    width,
+    height,
+    scale,
+    fontScale,
+  } = Dimensions.get("screen");
+}
+
+
 var styles = StyleSheet.create(
     {
         container:    {
@@ -54,11 +72,19 @@ var styles = StyleSheet.create(
 
 class Welcome extends React.Component<any,any> {
 
+    testNativeMethods() {
+      this.setNativeProps({});
+
+      const { rootView } = this.refs;
+
+      rootView.measure((x, y, width, height) => {
+      });
+    }
 
     render() {
 
         return (
-            <View style={styles.container}>
+            <View ref="rootView" style={styles.container}>
                 <Text style={styles.welcome}>
                     Welcome to React Native
                 </Text>
diff --git a/react-native/react-native.d.ts b/react-native/react-native.d.ts
deleted file mode 100644
index b7f19c4489..0000000000
--- a/react-native/react-native.d.ts
+++ /dev/null
@@ -1,3525 +0,0 @@
-// Type definitions for react-native 0.19
-// Project: https://github.com/facebook/react-native
-// Definitions by: Bruno Grieder <https://github.com/bgrieder>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// USING: these definitions are meant to be used with the TSC compiler target set to ES6
-//
-// USAGE EXAMPLES: check the RNTSExplorer project at https://github.com/bgrieder/RNTSExplorer
-//
-// CONTRIBUTING: please open pull requests and make sure that the changes do not break RNTSExplorer (they should not)
-// Do not hesitate to open a pull request against RNTSExplorer to provide an example for a case not covered by the current App
-//
-// CREDITS: This work is based on an original work made by Bernd Paradies: https://github.com/bparadie
-//
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/// <reference path="../react/react.d.ts" />
-
-//so we know what is "original" React
-import React = __React;
-
-//react-native "extends" react
-declare namespace  __React {
-
-
-    /**
-     * Represents the completion of an asynchronous operation
-     * @see lib.es6.d.ts
-     */
-    export interface Promise<T> {
-        /**
-         * Attaches callbacks for the resolution and/or rejection of the Promise.
-         * @param onfulfilled The callback to execute when the Promise is resolved.
-         * @param onrejected The callback to execute when the Promise is rejected.
-         * @returns A Promise for the completion of which ever callback is executed.
-         */
-        then<TResult>( onfulfilled?: ( value: T ) => TResult | Promise<TResult>, onrejected?: ( reason: any ) => TResult | Promise<TResult> ): Promise<TResult>;
-
-        /**
-         * Attaches a callback for only the rejection of the Promise.
-         * @param onrejected The callback to execute when the Promise is rejected.
-         * @returns A Promise for the completion of the callback.
-         */
-        catch( onrejected?: ( reason: any ) => T | Promise<T> ): Promise<T>;
-
-
-        // not in lib.es6.d.ts but called by react-native
-        done( callback?: ( value: T ) => void ): void;
-    }
-
-    export interface PromiseConstructor {
-        /**
-         * A reference to the prototype.
-         */
-        prototype: Promise<any>;
-
-        /**
-         * Creates a new Promise.
-         * @param init A callback used to initialize the promise. This callback is passed two arguments:
-         * a resolve callback used resolve the promise with a value or the result of another promise,
-         * and a reject callback used to reject the promise with a provided reason or error.
-         */
-        new <T>( init: ( resolve: ( value?: T | Promise<T> ) => void, reject: ( reason?: any ) => void ) => void ): Promise<T>;
-
-        <T>( init: ( resolve: ( value?: T | Promise<T> ) => void, reject: ( reason?: any ) => void ) => void ): Promise<T>;
-
-        /**
-         * Creates a Promise that is resolved with an array of results when all of the provided Promises
-         * resolve, or rejected when any Promise is rejected.
-         * @param values An array of Promises.
-         * @returns A new Promise.
-         */
-        all<T>( values: (T | Promise<T>)[] ): Promise<T[]>;
-
-        /**
-         * Creates a Promise that is resolved with an array of results when all of the provided Promises
-         * resolve, or rejected when any Promise is rejected.
-         * @param values An array of values.
-         * @returns A new Promise.
-         */
-        all( values: Promise<void>[] ): Promise<void>;
-
-        /**
-         * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
-         * or rejected.
-         * @param values An array of Promises.
-         * @returns A new Promise.
-         */
-        race<T>( values: (T | Promise<T>)[] ): Promise<T>;
-
-        /**
-         * Creates a new rejected promise for the provided reason.
-         * @param reason The reason the promise was rejected.
-         * @returns A new rejected Promise.
-         */
-        reject( reason: any ): Promise<void>;
-
-        /**
-         * Creates a new rejected promise for the provided reason.
-         * @param reason The reason the promise was rejected.
-         * @returns A new rejected Promise.
-         */
-        reject<T>( reason: any ): Promise<T>;
-
-        /**
-         * Creates a new resolved promise for the provided value.
-         * @param value A promise.
-         * @returns A promise whose internal state matches the provided promise.
-         */
-        resolve<T>( value: T | Promise<T> ): Promise<T>;
-
-        /**
-         * Creates a new resolved promise .
-         * @returns A resolved promise.
-         */
-        resolve(): Promise<void>;
-    }
-
-    // @see lib.es6.d.ts
-    export var Promise: PromiseConstructor;
-
-    //TODO: BGR: Replace with ComponentClass ?
-    // node_modules/react-tools/src/classic/class/ReactClass.js
-    export interface ReactClass<D, P, S> {
-        // TODO:
-    }
-
-    // see react-jsx.d.ts
-    export function createElement<P>( type: React.ReactType,
-                                      props?: P,
-                                      ...children: React.ReactNode[] ): React.ReactElement<P>;
-
-
-    export type Runnable = ( appParameters: any ) => void;
-
-
-    // Similar to React.SyntheticEvent except for nativeEvent
-    interface NativeSyntheticEvent<T> {
-        bubbles: boolean
-        cancelable: boolean
-        currentTarget: EventTarget
-        defaultPrevented: boolean
-        eventPhase: number
-        isTrusted: boolean
-        nativeEvent: T
-        preventDefault(): void
-        stopPropagation(): void
-        target: EventTarget
-        timeStamp: Date
-        type: string
-    }
-
-    export interface NativeTouchEvent {
-        /**
-         * Array of all touch events that have changed since the last event
-         */
-        changedTouches: NativeTouchEvent[]
-
-        /**
-         * The ID of the touch
-         */
-        identifier: string
-
-        /**
-         * The X position of the touch, relative to the element
-         */
-        locationX: number
-
-        /**
-         * The Y position of the touch, relative to the element
-         */
-        locationY: number
-
-        /**
-         * The X position of the touch, relative to the screen
-         */
-        pageX: number
-
-        /**
-         * The Y position of the touch, relative to the screen
-         */
-        pageY: number
-
-        /**
-         * The node id of the element receiving the touch event
-         */
-        target: string
-
-        /**
-         * A time identifier for the touch, useful for velocity calculation
-         */
-        timestamp: number
-
-        /**
-         * Array of all current touches on the screen
-         */
-        touches : NativeTouchEvent[]
-    }
-
-    export interface GestureResponderEvent extends NativeSyntheticEvent<NativeTouchEvent> {
-    }
-
-
-    export interface  PointProperties {
-        x: number
-        y: number
-    }
-
-    export interface Insets {
-        top?: number
-        left?: number
-        bottom?: number
-        right?: number
-    }
-
-    /**
-     * //FIXME: need to find documentation on which compoenent is a native (i.e. non composite component)
-     */
-    export interface NativeComponent {
-        setNativeProps: ( props: Object ) => void
-    }
-
-    /**
-     * //FIXME: need to find documentation on which component is a TTouchable and can implement that interface
-     * @see React.DOMAtributes
-     */
-    export interface Touchable {
-        onTouchStart?: ( event: GestureResponderEvent ) => void
-        onTouchMove?: ( event: GestureResponderEvent ) => void
-        onTouchEnd?: ( event: GestureResponderEvent ) => void
-        onTouchCancel?: ( event: GestureResponderEvent ) => void
-        onTouchEndCapture?: ( event: GestureResponderEvent ) => void
-    }
-
-    export type AppConfig = {
-        appKey: string;
-        component: ReactClass<any, any, any>;
-        run?: Runnable;
-    }
-
-    // https://github.com/facebook/react-native/blob/master/Libraries/AppRegistry/AppRegistry.js
-    export class AppRegistry {
-        static registerConfig( config: AppConfig[] ): void;
-
-        static registerComponent( appKey: string, getComponentFunc: () => React.ComponentClass<any> ): string;
-
-        static registerRunnable( appKey: string, func: Runnable ): string;
-
-        static runApplication( appKey: string, appParameters: any ): void;
-    }
-
-    export interface LayoutAnimationTypes {
-        spring: string
-        linear: string
-        easeInEaseOut: string
-        easeIn: string
-        easeOut: string
-    }
-
-    export interface LayoutAnimationProperties {
-        opacity: string
-        scaleXY: string
-    }
-
-    export interface LayoutAnimationAnim {
-        duration?: number
-        delay?: number
-        springDamping?: number
-        initialVelocity?: number
-        type?: string //LayoutAnimationTypes
-        property?: string //LayoutAnimationProperties
-    }
-
-    export interface LayoutAnimationConfig {
-        duration: number
-        create?: LayoutAnimationAnim
-        update?: LayoutAnimationAnim
-        delete?: LayoutAnimationAnim
-    }
-
-    export interface LayoutAnimationStatic {
-
-        configureNext: ( config: LayoutAnimationConfig, onAnimationDidEnd?: () => void, onError?: ( error?: any ) => void ) => void
-        create: ( duration: number, type?: string, creationProp?: string ) => LayoutAnimationConfig
-        Types: LayoutAnimationTypes
-        Properties: LayoutAnimationProperties
-        configChecker: ( conf: {config: LayoutAnimationConfig}, name: string, next: string ) => void
-        Presets : {
-            easeInEaseOut: LayoutAnimationConfig
-            linear:LayoutAnimationConfig
-            spring: LayoutAnimationConfig
-        }
-    }
-
-
-    /**
-     * Flex Prop Types
-     * @see https://facebook.github.io/react-native/docs/flexbox.html#proptypes
-     * @see LayoutPropTypes.js
-     */
-    export interface FlexStyle {
-
-        alignItems?: string;  //enum('flex-start', 'flex-end', 'center', 'stretch')
-        alignSelf?: string// enum('auto', 'flex-start', 'flex-end', 'center', 'stretch')
-        borderBottomWidth?: number
-        borderLeftWidth?: number
-        borderRightWidth?: number
-        borderTopWidth?: number
-        borderWidth?: number
-        bottom?: number
-        flex?: number
-        flexDirection?: string // enum('row', 'column')
-        flexWrap?: string // enum('wrap', 'nowrap')
-        height?: number
-        justifyContent?: string // enum('flex-start', 'flex-end', 'center', 'space-between', 'space-around')
-        left?: number
-        margin?: number
-        marginBottom?: number
-        marginHorizontal?: number
-        marginLeft?: number
-        marginRight?: number
-        marginTop?: number
-        marginVertical?: number
-        padding?: number
-        paddingBottom?: number
-        paddingHorizontal?: number
-        paddingLeft?: number
-        paddingRight?: number
-        paddingTop?: number
-        paddingVertical?: number
-        position?: string // enum('absolute', 'relative')
-        right?: number
-        top?: number
-        width?: number
-    }
-
-
-    export interface TransformsStyle {
-
-        transform?: [{perspective: number}, {rotate: string}, {rotateX: string}, {rotateY: string}, {rotateZ: string}, {scale: number}, {scaleX: number}, {scaleY: number}, {translateX: number}, {translateY: number}, {skewX: string}, {skewY: string}]
-        transformMatrix?: Array<number>
-        rotation?: number
-        scaleX?: number
-        scaleY?: number
-        translateX?: number
-        translateY?: number
-    }
-
-
-    export interface StyleSheetProperties {
-        // TODO:
-    }
-
-    export interface LayoutRectangle {
-        x: number;
-        y: number;
-        width: number;
-        height: number;
-    }
-
-    // @see TextProperties.onLayout
-    export interface LayoutChangeEvent {
-        nativeEvent: {
-            layout: LayoutRectangle
-        }
-    }
-
-    // @see https://facebook.github.io/react-native/docs/text.html#style
-    export interface TextStyle extends ViewStyle {
-        color?: string
-        fontFamily?: string
-        fontSize?: number
-        fontStyle?: string // 'normal' | 'italic';
-        fontWeight?: string // enum("normal", 'bold', '100', '200', '300', '400', '500', '600', '700', '800', '900')
-        letterSpacing?: number
-        lineHeight?: number
-        textAlign?: string // enum("auto", 'left', 'right', 'center')
-        textDecorationLine?: string // enum("none", 'underline', 'line-through', 'underline line-through')
-        textDecorationStyle?: string // enum("solid", 'double', 'dotted', 'dashed')
-        textDecorationColor?: string
-        writingDirection?: string; //enum("auto", 'ltr', 'rtl')
-        //containerBackgroundColor?: string
-    }
-
-    export interface TextPropertiesIOS {
-
-        /**
-         * When true, no visual change is made when text is pressed down.
-         * By default, a gray oval highlights the text on press down.
-         */
-        suppressHighlighting?: boolean
-    }
-
-    // https://facebook.github.io/react-native/docs/text.html#props
-    export interface TextProperties extends React.Props<TextProperties> {
-
-        /**
-         * Specifies should fonts scale to respect Text Size accessibility setting on iOS.
-         */
-        allowFontScaling?: boolean
-
-        /**
-         * Used to truncate the text with an elipsis after computing the text layout, including line wrapping, such that the total number of lines does not exceed this number.
-         */
-        numberOfLines?: number
-
-        /**
-         * Invoked on mount and layout changes with
-         *
-         * {nativeEvent: { layout: {x, y, width, height}}}.
-         */
-        onLayout?: ( event: LayoutChangeEvent ) => void
-
-        /**
-         * This function is called on press.
-         * Text intrinsically supports press handling with a default highlight state (which can be disabled with suppressHighlighting).
-         */
-        onPress?: () => void
-
-        /**
-         * @see https://facebook.github.io/react-native/docs/text.html#style
-         */
-        style?: TextStyle
-
-        /**
-         * Used to locate this view in end-to-end tests.
-         */
-        testID?: string
-    }
-
-    /**
-     * A React component for displaying text which supports nesting, styling, and touch handling.
-     */
-    export interface TextStatic extends React.ComponentClass<TextProperties> {
-
-    }
-
-
-    /**
-     * IOS Specific properties for TextInput
-     * @see https://facebook.github.io/react-native/docs/textinput.html#props
-     */
-    export interface TextInputIOSProperties {
-
-        /**
-         * If true, the text field will blur when submitted.
-         * The default value is true.
-         */
-        blurOnSubmit?: boolean
-
-        /**
-         * enum('never', 'while-editing', 'unless-editing', 'always')
-         * When the clear button should appear on the right side of the text view
-         */
-        clearButtonMode?: string
-
-        /**
-         * If true, clears the text field automatically when editing begins
-         */
-        clearTextOnFocus?: boolean
-
-        /**
-         * If true, the keyboard disables the return key when there is no text and automatically enables it when there is text.
-         * The default value is false.
-         */
-        enablesReturnKeyAutomatically?: boolean
-
-        /**
-         * Callback that is called when a key is pressed.
-         * Pressed key value is passed as an argument to the callback handler.
-         * Fires before onChange callbacks.
-         */
-        onKeyPress?: () => void
-
-        /**
-         * enum('default', 'go', 'google', 'join', 'next', 'route', 'search', 'send', 'yahoo', 'done', 'emergency-call')
-         * Determines how the return key should look.
-         */
-        returnKeyType?: string
-
-        /**
-         * If true, all text will automatically be selected on focus
-         */
-        selectTextOnFocus?: boolean
-
-        /**
-         * //FIXME: requires typing
-         * See DocumentSelectionState.js, some state that is responsible for maintaining selection information for a document
-         */
-        selectionState?: any
-
-
-    }
-
-    /**
-     * Android Specific properties for TextInput
-     * @see https://facebook.github.io/react-native/docs/textinput.html#props
-     */
-    export interface TextInputAndroidProperties {
-
-        /**
-         * Sets the number of lines for a TextInput.
-         * Use it with multiline set to true to be able to fill the lines.
-         */
-        numberOfLines?: number
-
-        /**
-         * enum('start', 'center', 'end')
-         * Set the position of the cursor from where editing will begin.
-         */
-        textAlign?: string
-
-        /**
-         * enum('top', 'center', 'bottom')
-         * Aligns text vertically within the TextInput.
-         */
-        textAlignVertical?: string
-
-        /**
-         * The color of the textInput underline.
-         */
-        underlineColorAndroid?: string
-    }
-
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/textinput.html#props
-     */
-    export interface TextInputProperties extends TextInputIOSProperties, TextInputAndroidProperties, React.Props<TextInputStatic> {
-
-        /**
-         * Can tell TextInput to automatically capitalize certain characters.
-         *      characters: all characters,
-         *      words: first letter of each word
-         *      sentences: first letter of each sentence (default)
-         *      none: don't auto capitalize anything
-         *
-         * https://facebook.github.io/react-native/docs/textinput.html#autocapitalize
-         */
-        autoCapitalize?: string
-
-        /**
-         * If false, disables auto-correct.
-         * The default value is true.
-         */
-        autoCorrect?: boolean
-
-        /**
-         * If true, focuses the input on componentDidMount.
-         * The default value is false.
-         */
-        autoFocus?: boolean
-
-        /**
-         * Provides an initial value that will change when the user starts typing.
-         * Useful for simple use-cases where you don't want to deal with listening to events
-         * and updating the value prop to keep the controlled state in sync.
-         */
-        defaultValue?: string
-
-        /**
-         * If false, text is not editable. The default value is true.
-         */
-        editable?: boolean
-
-        /**
-         * enum("default", 'numeric', 'email-address', "ascii-capable", 'numbers-and-punctuation', 'url', 'number-pad', 'phone-pad', 'name-phone-pad', 'decimal-pad', 'twitter', 'web-search')
-         * Determines which keyboard to open, e.g.numeric.
-         * The following values work across platforms: - default - numeric - email-address
-         */
-        keyboardType?: string
-
-        /**
-         * Limits the maximum number of characters that can be entered.
-         * Use this instead of implementing the logic in JS to avoid flicker.
-         */
-        maxLength?: number
-
-        /**
-         * If true, the text input can be multiple lines. The default value is false.
-         */
-        multiline?: boolean
-
-        /**
-         * Callback that is called when the text input is blurred
-         */
-        onBlur?: () => void
-
-        /**
-         * Callback that is called when the text input's text changes.
-         */
-        onChange?: ( event: {nativeEvent: {text: string}} ) => void
-
-        /**
-         * Callback that is called when the text input's text changes.
-         * Changed text is passed as an argument to the callback handler.
-         */
-        onChangeText?: ( text: string ) => void
-
-        /**
-         * Callback that is called when text input ends.
-         */
-        onEndEditing?: ( event: {nativeEvent: {text: string}} ) => void
-
-        /**
-         * Callback that is called when the text input is focused
-         */
-        onFocus?: () => void
-
-        /**
-         * Invoked on mount and layout changes with {x, y, width, height}.
-         */
-        onLayout?: ( event: {nativeEvent: {x: number, y: number, width: number, height: number}} ) => void
-
-        /**
-         * Callback that is called when the text input's submit button is pressed.
-         */
-        onSubmitEditing?: ( event: {nativeEvent: {text: string}} ) => void
-
-        /**
-         * //FIXME: Not part of the doc but found in examples
-         */
-        password?: boolean
-
-        /**
-         * The string that will be rendered before text input has been entered
-         */
-        placeholder?: string
-
-        /**
-         * The text color of the placeholder string
-         */
-        placeholderTextColor?: string
-
-        /**
-         * If true, the text input obscures the text entered so that sensitive text like passwords stay secure.
-         * The default value is false.
-         */
-        secureTextEntry?: boolean
-
-        /**
-         * Styles
-         */
-        style?: TextStyle
-
-        /**
-         * Used to locate this view in end-to-end tests
-         */
-        testID?: string
-
-        /**
-         * The value to show for the text input. TextInput is a controlled component,
-         * which means the native value will be forced to match this value prop if provided.
-         * For most uses this works great, but in some cases this may cause flickering - one common cause is preventing edits by keeping value the same.
-         * In addition to simply setting the same value, either set editable={false},
-         * or set/update maxLength to prevent unwanted edits without flicker.
-         */
-        value?: string
-    }
-
-    export interface TextInputStatic extends NativeComponent, React.ComponentClass<TextInputProperties> {
-        blur: () => void
-        focus: () => void
-    }
-
-
-    /**
-     * Gesture recognition on mobile devices is much more complicated than web.
-     * A touch can go through several phases as the app determines what the user's intention is.
-     * For example, the app needs to determine if the touch is scrolling, sliding on a widget, or tapping.
-     * This can even change during the duration of a touch. There can also be multiple simultaneous touches.
-     *
-     * The touch responder system is needed to allow components to negotiate these touch interactions
-     * without any additional knowledge about their parent or child components.
-     * This system is implemented in ResponderEventPlugin.js, which contains further details and documentation.
-     *
-     * Best Practices
-     * Users can feel huge differences in the usability of web apps vs. native, and this is one of the big causes.
-     * Every action should have the following attributes:
-     *      Feedback/highlighting- show the user what is handling their touch, and what will happen when they release the gesture
-     *      Cancel-ability- when making an action, the user should be able to abort it mid-touch by dragging their finger away
-     *
-     * These features make users more comfortable while using an app,
-     * because it allows people to experiment and interact without fear of making mistakes.
-     *
-     * TouchableHighlight and Touchable*
-     * The responder system can be complicated to use.
-     * So we have provided an abstract Touchable implementation for things that should be "tappable".
-     * This uses the responder system and allows you to easily configure tap interactions declaratively.
-     * Use TouchableHighlight anywhere where you would use a button or link on web.
-     */
-    export interface GestureResponderHandlers {
-
-        /**
-         * A view can become the touch responder by implementing the correct negotiation methods.
-         * There are two methods to ask the view if it wants to become responder:
-         */
-
-        /**
-         * Does this view want to become responder on the start of a touch?
-         */
-        onStartShouldSetResponder?: ( event: GestureResponderEvent ) => boolean
-
-        /**
-         * Called for every touch move on the View when it is not the responder: does this view want to "claim" touch responsiveness?
-         */
-        onMoveShouldSetResponder?: ( event: GestureResponderEvent ) => boolean
-
-        /**
-         * If the View returns true and attempts to become the responder, one of the following will happen:
-         */
-
-        /**
-         * The View is now responding for touch events.
-         * This is the time to highlight and show the user what is happening
-         */
-        onResponderGrant?: ( event: GestureResponderEvent ) => void
-
-        /**
-         * Something else is the responder right now and will not release it
-         */
-        onResponderReject?: ( event: GestureResponderEvent ) => void
-
-        /**
-         * If the view is responding, the following handlers can be called:
-         */
-
-        /**
-         * The user is moving their finger
-         */
-        onResponderMove?: ( event: GestureResponderEvent ) => void
-
-        /**
-         * Fired at the end of the touch, ie "touchUp"
-         */
-        onResponderRelease?: ( event: GestureResponderEvent ) => void
-
-        /**
-         *  Something else wants to become responder.
-         *  Should this view release the responder? Returning true allows release
-         */
-        onResponderTerminationRequest?: ( event: GestureResponderEvent ) => boolean
-
-        /**
-         * The responder has been taken from the View.
-         * Might be taken by other views after a call to onResponderTerminationRequest,
-         * or might be taken by the OS without asking (happens with control center/ notification center on iOS)
-         */
-        onResponderTerminate?: ( event: GestureResponderEvent ) => void
-
-        /**
-         * onStartShouldSetResponder and onMoveShouldSetResponder are called with a bubbling pattern,
-         * where the deepest node is called first.
-         * That means that the deepest component will become responder when multiple Views return true for *ShouldSetResponder handlers.
-         * This is desirable in most cases, because it makes sure all controls and buttons are usable.
-         *
-         * However, sometimes a parent will want to make sure that it becomes responder.
-         * This can be handled by using the capture phase.
-         * Before the responder system bubbles up from the deepest component,
-         * it will do a capture phase, firing on*ShouldSetResponderCapture.
-         * So if a parent View wants to prevent the child from becoming responder on a touch start,
-         * it should have a onStartShouldSetResponderCapture handler which returns true.
-         */
-        onStartShouldSetResponderCapture?: ( event: GestureResponderEvent ) => boolean
-
-        /**
-         * onStartShouldSetResponder and onMoveShouldSetResponder are called with a bubbling pattern,
-         * where the deepest node is called first.
-         * That means that the deepest component will become responder when multiple Views return true for *ShouldSetResponder handlers.
-         * This is desirable in most cases, because it makes sure all controls and buttons are usable.
-         *
-         * However, sometimes a parent will want to make sure that it becomes responder.
-         * This can be handled by using the capture phase.
-         * Before the responder system bubbles up from the deepest component,
-         * it will do a capture phase, firing on*ShouldSetResponderCapture.
-         * So if a parent View wants to prevent the child from becoming responder on a touch start,
-         * it should have a onStartShouldSetResponderCapture handler which returns true.
-         */
-        onMoveShouldSetResponderCapture?: () => void;
-
-    }
-
-    // @see https://facebook.github.io/react-native/docs/view.html#style
-    export interface ViewStyle extends FlexStyle, TransformsStyle {
-        backgroundColor?: string;
-        borderBottomColor?: string;
-        borderBottomLeftRadius?: number;
-        borderBottomRightRadius?: number;
-        borderColor?: string;
-        borderLeftColor?: string;
-        borderRadius?: number;
-        borderRightColor?: string;
-        borderTopColor?: string;
-        borderTopLeftRadius?: number;
-        borderTopRightRadius?: number;
-        opacity?: number;
-        overflow?: string; // enum('visible', 'hidden')
-        shadowColor?: string;
-        shadowOffset?: {width: number, height: number};
-        shadowOpacity?: number;
-        shadowRadius?: number;
-    }
-
-
-    export interface ViewPropertiesIOS {
-
-        /**
-         * Provides additional traits to screen reader.
-         * By default no traits are provided unless specified otherwise in element
-         *
-         * @enum('none', 'button', 'link', 'header', 'search', 'image', 'selected', 'plays', 'key', 'text','summary', 'disabled', 'frequentUpdates', 'startsMedia', 'adjustable', 'allowsDirectInteraction', 'pageTurn')
-         */
-        accessibilityTraits?: string | string[];
-
-        /**
-         * Whether this view should be rendered as a bitmap before compositing.
-         *
-         * On iOS, this is useful for animations and interactions that do not modify this component's dimensions nor its children;
-         * for example, when translating the position of a static view, rasterization allows the renderer to reuse a cached bitmap of a static view
-         * and quickly composite it during each frame.
-         *
-         * Rasterization incurs an off-screen drawing pass and the bitmap consumes memory.
-         * Test and measure when using this property.
-         */
-        shouldRasterizeIOS?: boolean
-    }
-
-    export interface ViewPropertiesAndroid {
-
-        /**
-         * Indicates to accessibility services to treat UI component like a native one.
-         * Works for Android only.
-         *
-         * @enum('none', 'button', 'radiobutton_checked', 'radiobutton_unchecked' )
-         */
-        accessibilityComponentType?: string
-
-
-        /**
-         * Indicates to accessibility services whether the user should be notified when this view changes.
-         * Works for Android API >= 19 only.
-         * See http://developer.android.com/reference/android/view/View.html#attr_android:accessibilityLiveRegion for references.
-         */
-        accessibilityLiveRegion?: string
-
-        /**
-         * Views that are only used to layout their children or otherwise don't draw anything
-         * may be automatically removed from the native hierarchy as an optimization.
-         * Set this property to false to disable this optimization and ensure that this View exists in the native view hierarchy.
-         */
-        collapsable?: boolean
-
-
-        /**
-         * Controls how view is important for accessibility which is if it fires accessibility events
-         * and if it is reported to accessibility services that query the screen.
-         * Works for Android only. See http://developer.android.com/reference/android/R.attr.html#importantForAccessibility for references.
-         *
-         * Possible values:
-         *      'auto' - The system determines whether the view is important for accessibility - default (recommended).
-         *      'yes' - The view is important for accessibility.
-         *      'no' - The view is not important for accessibility.
-         *      'no-hide-descendants' - The view is not important for accessibility, nor are any of its descendant views.
-         */
-        importantForAccessibility?: string
-
-
-        /**
-         * Whether this view needs to rendered offscreen and composited with an alpha in order to preserve 100% correct colors and blending behavior.
-         * The default (false) falls back to drawing the component and its children
-         * with an alpha applied to the paint used to draw each element instead of rendering the full component offscreen and compositing it back with an alpha value.
-         * This default may be noticeable and undesired in the case where the View you are setting an opacity on
-         * has multiple overlapping elements (e.g. multiple overlapping Views, or text and a background).
-         *
-         * Rendering offscreen to preserve correct alpha behavior is extremely expensive
-         * and hard to debug for non-native developers, which is why it is not turned on by default.
-         * If you do need to enable this property for an animation,
-         * consider combining it with renderToHardwareTextureAndroid if the view contents are static (i.e. it doesn't need to be redrawn each frame).
-         * If that property is enabled, this View will be rendered off-screen once,
-         * saved in a hardware texture, and then composited onto the screen with an alpha each frame without having to switch rendering targets on the GPU.
-         */
-        needsOffscreenAlphaCompositing?: boolean
-
-
-        /**
-         * Whether this view should render itself (and all of its children) into a single hardware texture on the GPU.
-         *
-         * On Android, this is useful for animations and interactions that only modify opacity, rotation, translation, and/or scale:
-         * in those cases, the view doesn't have to be redrawn and display lists don't need to be re-executed. The texture can just be
-         * re-used and re-composited with different parameters. The downside is that this can use up limited video memory, so this prop should be set back to false at the end of the interaction/animation.
-         */
-        renderToHardwareTextureAndroid?: boolean;
-
-    }
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/view.html#props
-     */
-    export interface ViewProperties extends ViewPropertiesAndroid, ViewPropertiesIOS, GestureResponderHandlers, Touchable, React.Props<ViewStatic> {
-
-        /**
-         * Overrides the text that's read by the screen reader when the user interacts with the element. By default, the label is constructed by traversing all the children and accumulating all the Text nodes separated by space.
-         */
-        accessibilityLabel?: string;
-
-        /**
-         * When true, indicates that the view is an accessibility element.
-         * By default, all the touchable elements are accessible.
-         */
-        accessible?: boolean;
-
-        /**
-         * When `accessible` is true, the system will try to invoke this function when the user performs accessibility tap gesture.
-         */
-        onAcccessibilityTap?: () => void;
-
-        /**
-         * Invoked on mount and layout changes with
-         *
-         * {nativeEvent: { layout: {x, y, width, height}}}.
-         */
-        onLayout?: ( event: LayoutChangeEvent ) => void;
-
-        /**
-         * When accessible is true, the system will invoke this function when the user performs the magic tap gesture.
-         */
-        onMagicTap?: () => void;
-
-        /**
-         *
-         * In the absence of auto property, none is much like CSS's none value. box-none is as if you had applied the CSS class:
-         *
-         * .box-none {
-         *   pointer-events: none;
-         * }
-         * .box-none * {
-         *   pointer-events: all;
-         * }
-         *
-         * box-only is the equivalent of
-         *
-         * .box-only {
-         *   pointer-events: all;
-         * }
-         * .box-only * {
-         *   pointer-events: none;
-         * }
-         *
-         * But since pointerEvents does not affect layout/appearance, and we are already deviating from the spec by adding additional modes,
-         * we opt to not include pointerEvents on style. On some platforms, we would need to implement it as a className anyways. Using style or not is an implementation detail of the platform.
-         */
-        pointerEvents?: string;
-
-        /**
-         *
-         * This is a special performance property exposed by RCTView and is useful for scrolling content when there are many subviews,
-         * most of which are offscreen. For this property to be effective, it must be applied to a view that contains many subviews that extend outside its bound.
-         * The subviews must also have overflow: hidden, as should the containing view (or one of its superviews).
-         */
-        removeClippedSubviews?: boolean
-
-        style?: ViewStyle;
-
-        /**
-         * Used to locate this view in end-to-end tests.
-         */
-        testID?: string;
-    }
-
-    /**
-     * The most fundamental component for building UI, View is a container that supports layout with flexbox, style, some touch handling,
-     * and accessibility controls, and is designed to be nested inside other views and to have 0 to many children of any type.
-     * View maps directly to the native view equivalent on whatever platform React is running on,
-     * whether that is a UIView, <div>, android.view, etc.
-     */
-    export interface ViewStatic extends NativeComponent, React.ComponentClass<ViewProperties> {
-
-    }
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/viewpagerandroid.html#props
-     */
-
-
-    export interface ViewPagerAndroidOnPageScrollEventData {
-        position: number;
-        offset: number;
-    }
-
-    export interface ViewPagerAndroidOnPageSelectedEventData {
-        position: number;
-    }
-
-    export interface ViewPagerAndroidProperties extends ViewProperties {
-        initialPage?: number;
-        onPageScroll?: ( event: NativeSyntheticEvent<ViewPagerAndroidOnPageScrollEventData> ) => void;
-        onPageSelected?: ( event: NativeSyntheticEvent<ViewPagerAndroidOnPageSelectedEventData> ) => void;
-        keyboardDismissMode?: string; /* enum('none', 'on-drag') */
-    }
-
-    export interface ViewPagerAndroidStatic extends NativeComponent, React.ComponentClass<ViewPagerAndroidProperties> {
-
-    }
-
-    /**
-     * //FIXME: No documentation extracted from code comment on WebView.ios.js
-     */
-    export interface NavState {
-
-        url?: string
-        title?: string
-        loading?: boolean
-        canGoBack?: boolean
-        canGoForward?: boolean;
-
-        [key: string]: any
-    }
-
-    export interface WebViewPropertiesAndroid {
-
-        /**
-         * Used for android only, JS is enabled by default for WebView on iOS
-         */
-        javaScriptEnabledAndroid?: boolean
-    }
-
-    export interface WebViewPropertiesIOS {
-
-        /**
-         * Used for iOS only, sets whether the webpage scales to fit the view and the user can change the scale
-         */
-        scalesPageToFit?: boolean
-    }
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/webview.html#props
-     */
-    export interface WebViewProperties extends WebViewPropertiesAndroid, WebViewPropertiesIOS, React.Props<WebViewStatic> {
-
-        automaticallyAdjustContentInsets?: boolean
-
-        bounces?: boolean
-
-        contentInset?: Insets
-
-        html?: string
-
-        /**
-         * Sets the JS to be injected when the webpage loads.
-         */
-        injectedJavaScript?: string
-
-        onNavigationStateChange?: ( event: NavState ) => void
-
-        /**
-         * Allows custom handling of any webview requests by a JS handler.
-         * Return true or false from this method to continue loading the request.
-         */
-        onShouldStartLoadWithRequest?: () => boolean
-
-        /**
-         * view to show if there's an error
-         */
-        renderError?: () => ViewStatic
-
-        /**
-         * loading indicator to show
-         */
-        renderLoading?: () => ViewStatic
-
-        scrollEnabled?: boolean
-
-        startInLoadingState?: boolean
-
-        style?: ViewStyle
-
-        url: string
-    }
-
-
-    export interface WebViewStatic extends React.ComponentClass<WebViewProperties> {
-
-        goBack: () => void
-        goForward: () => void
-        reload: () => void
-    }
-
-
-    /**
-     * @see
-     */
-    export interface SegmentedControlIOSProperties {
-        /// TODO
-    }
-
-
-    export interface NavigatorIOSProperties extends React.Props<NavigatorIOSStatic> {
-
-        /**
-         * NavigatorIOS uses "route" objects to identify child views, their props, and navigation bar configuration.
-         * "push" and all the other navigation operations expect routes to be like this
-         */
-        initialRoute?: Route
-
-        /**
-         * The default wrapper style for components in the navigator.
-         * A common use case is to set the backgroundColor for every page
-         */
-        itemWrapperStyle?: ViewStyle
-
-        /**
-         * A Boolean value that indicates whether the navigation bar is hidden
-         */
-        navigationBarHidden?: boolean
-
-        /**
-         * A Boolean value that indicates whether to hide the 1px hairline shadow
-         */
-        shadowHidden?: boolean
-
-        /**
-         * The color used for buttons in the navigation bar
-         */
-        tintColor?: string
-
-        /**
-         * The text color of the navigation bar title
-         */
-        titleTextColor?: string
-
-        /**
-         * A Boolean value that indicates whether the navigation bar is translucent
-         */
-        translucent?: boolean
-
-        /**
-         * NOT IN THE DOC BUT IN THE EXAMPLES
-         */
-        style?: ViewStyle
-    }
-
-    /**
-     * A navigator is an object of navigation functions that a view can call.
-     * It is passed as a prop to any component rendered by NavigatorIOS.
-     *
-     * Navigator functions are also available on the NavigatorIOS component:
-     *
-     * @see https://facebook.github.io/react-native/docs/navigatorios.html#navigator
-     */
-    export interface NavigationIOS {
-        /**
-         * Navigate forward to a new route
-         */
-        push: ( route: Route ) => void
-
-        /**
-         * Go back one page
-         */
-        pop: () => void
-
-        /**
-         * Go back N pages at once. When N=1, behavior matches pop()
-         */
-        popN: ( n: number ) => void
-
-        /**
-         * Replace the route for the current page and immediately load the view for the new route
-         */
-        replace: ( route: Route ) => void
-
-        /**
-         * Replace the route/view for the previous page
-         */
-        replacePrevious: ( route: Route ) => void
-
-        /**
-         * Replaces the previous route/view and transitions back to it
-         */
-        replacePreviousAndPop: ( route: Route ) => void
-
-        /**
-         * Replaces the top item and popToTop
-         */
-        resetTo: ( route: Route ) => void
-
-        /**
-         * Go back to the item for a particular route object
-         */
-        popToRoute( route: Route ): void
-
-        /**
-         * Go back to the top item
-         */
-        popToTop(): void
-    }
-
-    export interface NavigatorIOSStatic extends NavigationIOS, React.ComponentClass<NavigatorIOSProperties> {
-    }
-
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/activityindicatorios.html#props
-     */
-    export interface ActivityIndicatorIOSProperties extends React.Props<ActivityIndicatorIOSStatic> {
-
-        /**
-         * Whether to show the indicator (true, the default) or hide it (false).
-         */
-        animating?: boolean
-
-        /**
-         * The foreground color of the spinner (default is gray).
-         */
-        color?: string
-
-        /**
-         * Whether the indicator should hide when not animating (true by default).
-         */
-        hidesWhenStopped?: boolean
-
-        /**
-         * Invoked on mount and layout changes with
-         */
-        onLayout?: ( event: {nativeEvent: { layout: {x: number, y: number , width: number, height: number}}} ) => void
-
-        /**
-         * Size of the indicator.
-         * Small has a height of 20, large has a height of 36.
-         *
-         * enum('small', 'large')
-         */
-        size?: string
-
-        style?: ViewStyle
-    }
-
-    export interface ActivityIndicatorIOSStatic extends React.ComponentClass<ActivityIndicatorIOSProperties> {
-    }
-
-
-    export interface DatePickerIOSProperties extends React.Props<DatePickerIOSStatic> {
-
-        /**
-         * The currently selected date.
-         */
-        date?: Date
-
-
-        /**
-         * Maximum date.
-         * Restricts the range of possible date/time values.
-         */
-        maximumDate?: Date
-
-        /**
-         * Maximum date.
-         * Restricts the range of possible date/time values.
-         */
-        minimumDate?: Date
-
-        /**
-         *  enum(1, 2, 3, 4, 5, 6, 10, 12, 15, 20, 30)
-         *  The interval at which minutes can be selected.
-         */
-        minuteInterval?: number
-
-        /**
-         *  enum('date', 'time', 'datetime')
-         *  The date picker mode.
-         */
-        mode?: string
-
-        /**
-         * Date change handler.
-         * This is called when the user changes the date or time in the UI.
-         * The first and only argument is a Date object representing the new date and time.
-         */
-        onDateChange?: ( newDate: Date ) => void
-
-        /**
-         * Timezone offset in minutes.
-         * By default, the date picker will use the device's timezone. With this parameter, it is possible to force a certain timezone offset.
-         * For instance, to show times in Pacific Standard Time, pass -7 * 60.
-         */
-        timeZoneOffsetInMinutes?: number
-
-    }
-
-    export interface DatePickerIOSStatic extends React.ComponentClass<DatePickerIOSProperties> {
-    }
-
-
-    /**
-     * @see PickerIOS.ios.js
-     */
-    export interface PickerIOSItemProperties extends React.Props<PickerIOSItemStatic> {
-        value?: string | number
-        label?: string
-    }
-
-    /**
-     * @see PickerIOS.ios.js
-     */
-    export interface PickerIOSItemStatic extends React.ComponentClass<PickerIOSItemProperties> {
-    }
-
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/pickerios.html
-     * @see PickerIOS.ios.js
-     */
-    export interface PickerIOSProperties extends React.Props<PickerIOSStatic> {
-
-        onValueChange?: ( value: string | number ) => void
-
-        selectedValue?: string | number
-
-        style?: ViewStyle
-    }
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/pickerios.html
-     * @see PickerIOS.ios.js
-     */
-    export interface PickerIOSStatic extends React.ComponentClass<PickerIOSProperties> {
-
-        Item: PickerIOSItemStatic
-    }
-
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/sliderios.html
-     */
-    export interface SliderIOSProperties extends React.Props<SliderIOSStatic> {
-
-        /**
-         * If true the user won't be able to move the slider. Default value is false.
-         */
-        disabled?: boolean
-
-        /**
-         * Initial maximum value of the slider. Default value is 1.
-         */
-        maximumValue?: number
-
-        /**
-         * The color used for the track to the right of the button. Overrides the default blue gradient image.
-         */
-        maximumTrackTintColor?: string
-
-        /**
-         * Initial minimum value of the slider. Default value is 0.
-         */
-        minimumValue?: number
-
-        /**
-         * The color used for the track to the left of the button. Overrides the default blue gradient image.
-         */
-        minimumTrackTintColor?: string
-
-        /**
-         * Callback called when the user finishes changing the value (e.g. when the slider is released).
-         */
-        onSlidingComplete?: () => void
-
-        /**
-         * Callback continuously called while the user is dragging the slider.
-         */
-        onValueChange?: ( value: number ) => void
-
-        /**
-         * Step value of the slider.
-         * The value should be between 0 and (maximumValue - minimumValue).
-         * Default value is 0.
-         */
-        step?: number
-
-        /**
-         * Used to style and layout the Slider.
-         * @see StyleSheet.js and ViewStylePropTypes.js for more info.
-         */
-        style?: ViewStyle
-
-        /**
-         * Initial value of the slider.
-         * The value should be between minimumValue and maximumValue, which default to 0 and 1 respectively.
-         * Default value is 0.
-         *
-         * This is not a controlled component, e.g. if you don't update the value, the component won't be reset to its inital value.
-         */
-        value?: number
-    }
-
-    export interface SliderIOSStatic extends React.ComponentClass<SliderIOSProperties> {
-
-    }
-
-    /**
-     * //FIXME: no dcumentation, inferred
-     * @see SwitchIOS.ios.js
-     */
-    export interface SwitchIOSStyle extends ViewStyle {
-        height?: number
-        width?: number
-    }
-
-
-    /**
-     * https://facebook.github.io/react-native/docs/switchios.html#props
-     */
-    export interface SwitchIOSProperties extends React.Props<SwitchIOSStatic> {
-
-        /**
-         * If true the user won't be able to toggle the switch. Default value is false.
-         */
-        disabled?: boolean
-
-        /**
-         * Background color when the switch is turned on.
-         */
-        onTintColor?: string
-
-        /**
-         * Callback that is called when the user toggles the switch.
-         */
-        onValueChange?: ( value: boolean ) => void
-
-        /**
-         * Background color for the switch round button.
-         */
-        thumbTintColor?: string
-
-        /**
-         * Background color when the switch is turned off.
-         */
-        tintColor?: string
-
-        /**
-         * The value of the switch, if true the switch will be turned on. Default value is false.
-         */
-        value?: boolean
-
-        style?: SwitchIOSStyle
-    }
-
-    /**
-     *
-     * Use SwitchIOS to render a boolean input on iOS.
-     *
-     * This is a controlled component, so you must hook in to the onValueChange callback and update the value prop in order for the component to update,
-     * otherwise the user's change will be reverted immediately to reflect props.value as the source of truth.
-     *
-     * @see https://facebook.github.io/react-native/docs/switchios.html
-     */
-    export interface SwitchIOSStatic extends React.ComponentClass<SwitchIOSProperties> {
-
-    }
-
-
-    /**
-     * @see ImageResizeMode.js
-     */
-    export interface ImageResizeModeStatic {
-        /**
-         * contain - The image will be resized such that it will be completely
-         * visible, contained within the frame of the View.
-         */
-        contain: string
-        /**
-         * cover - The image will be resized such that the entire area of the view
-         * is covered by the image, potentially clipping parts of the image.
-         */
-        cover: string
-        /**
-         * stretch - The image will be stretched to fill the entire frame of the
-         * view without clipping.  This may change the aspect ratio of the image,
-         * distoring it.  Only supported on iOS.
-         */
-        stretch: string
-    }
-
-    /**
-     * Image style
-     * @see https://facebook.github.io/react-native/docs/image.html#style
-     */
-    export interface ImageStyle extends FlexStyle, TransformsStyle {
-        resizeMode?: string //Object.keys(ImageResizeMode)
-        backgroundColor?: string
-        borderColor?: string
-        borderWidth?: number
-        borderRadius?: number
-        overflow?: string // enum('visible', 'hidden')
-        tintColor?: string
-        opacity?: number
-    }
-
-    export interface ImagePropertiesIOS {
-        /**
-         * The text that's read by the screen reader when the user interacts with the image.
-         */
-        accessibilityLabel?: string;
-
-        /**
-         * When true, indicates the image is an accessibility element.
-         */
-        accessible?: boolean;
-
-        /**
-         * When the image is resized, the corners of the size specified by capInsets will stay a fixed size,
-         * but the center content and borders of the image will be stretched.
-         * This is useful for creating resizable rounded buttons, shadows, and other resizable assets.
-         * More info on Apple documentation
-         */
-        capInsets?: Insets
-
-        /**
-         * A static image to display while downloading the final image off the network.
-         */
-        defaultSource?: {uri: string}
-
-        /**
-         * Invoked on load error with {nativeEvent: {error}}
-         */
-        onError?: ( error: {nativeEvent: any} ) => void
-
-        /**
-         * Invoked when load completes successfully
-         */
-        onLoad?: () => void
-
-        /**
-         * Invoked when load either succeeds or fails
-         */
-        onLoadEnd?: () => void
-
-        /**
-         * Invoked on load start
-         */
-        onLoadStart?: () => void
-
-        /**
-         * Invoked on download progress with {nativeEvent: {loaded, total}}
-         */
-        onProgress?: ()=> void
-    }
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/image.html
-     */
-    export interface ImageProperties extends ImagePropertiesIOS, React.Props<Image> {
-        /**
-         * onLayout function
-         *
-         * Invoked on mount and layout changes with
-         *
-         * {nativeEvent: { layout: {x, y, width, height}}}.
-         */
-        onLayout?: ( event: LayoutChangeEvent ) => void;
-
-
-        /**
-         * Determines how to resize the image when the frame doesn't match the raw image dimensions.
-         *
-         * enum('cover', 'contain', 'stretch')
-         */
-        resizeMode?: string;
-
-        /**
-         * uri is a string representing the resource identifier for the image,
-         * which could be an http address, a local file path,
-         * or the name of a static image resource (which should be wrapped in the require('image!name') function).
-         */
-        source: {uri: string} | string;
-
-        /**
-         *
-         * Style
-         */
-        style?:  ImageStyle;
-
-        /**
-         * A unique identifier for this element to be used in UI Automation testing scripts.
-         */
-        testID?: string;
-
-    }
-
-    export interface ImageStatic extends React.ComponentClass<ImageProperties> {
-        uri: string;
-        resizeMode: ImageResizeModeStatic
-    }
-
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/listview.html#props
-     */
-    export interface ListViewProperties extends ScrollViewProperties, React.Props<ListViewStatic> {
-
-        dataSource?: ListViewDataSource
-
-        /**
-         * How many rows to render on initial component mount.  Use this to make
-         * it so that the first screen worth of data apears at one time instead of
-         * over the course of multiple frames.
-         */
-        initialListSize?: number
-
-        /**
-         * (visibleRows, changedRows) => void
-         *
-         * Called when the set of visible rows changes.  `visibleRows` maps
-         * { sectionID: { rowID: true }} for all the visible rows, and
-         * `changedRows` maps { sectionID: { rowID: true | false }} for the rows
-         * that have changed their visibility, with true indicating visible, and
-         * false indicating the view has moved out of view.
-         */
-        onChangeVisibleRows?: ( visibleRows: Array<{[sectionId: string]: {[rowID: string]: boolean}}>, changedRows: Array<{[sectionId: string]: {[rowID: string]: boolean}}> ) => void
-
-        /**
-         * Called when all rows have been rendered and the list has been scrolled
-         * to within onEndReachedThreshold of the bottom.  The native scroll
-         * event is provided.
-         */
-        onEndReached?: () => void
-
-        /**
-         * Threshold in pixels for onEndReached.
-         */
-        onEndReachedThreshold?: number
-
-        /**
-         * Number of rows to render per event loop.
-         */
-        pageSize?: number
-
-        /**
-         * An experimental performance optimization for improving scroll perf of
-         * large lists, used in conjunction with overflow: 'hidden' on the row
-         * containers.  Use at your own risk.
-         */
-        removeClippedSubviews?: boolean
-
-        /**
-         * () => renderable
-         *
-         * The header and footer are always rendered (if these props are provided)
-         * on every render pass.  If they are expensive to re-render, wrap them
-         * in StaticContainer or other mechanism as appropriate.  Footer is always
-         * at the bottom of the list, and header at the top, on every render pass.
-         */
-        renderFooter?: () => React.ReactElement<any>
-
-        /**
-         * () => renderable
-         *
-         * The header and footer are always rendered (if these props are provided)
-         * on every render pass.  If they are expensive to re-render, wrap them
-         * in StaticContainer or other mechanism as appropriate.  Footer is always
-         * at the bottom of the list, and header at the top, on every render pass.
-         */
-        renderHeader?: () => React.ReactElement<any>
-
-        /**
-         * (rowData, sectionID, rowID) => renderable
-         * Takes a data entry from the data source and its ids and should return
-         * a renderable component to be rendered as the row.  By default the data
-         * is exactly what was put into the data source, but it's also possible to
-         * provide custom extractors.
-         */
-        renderRow?: ( rowData: any, sectionID: string | number, rowID: string | number, highlightRow?: boolean ) => React.ReactElement<any>
-
-
-        /**
-         * A function that returns the scrollable component in which the list rows are rendered.
-         * Defaults to returning a ScrollView with the given props.
-         */
-        renderScrollComponent?: ( props: ScrollViewProperties ) => React.ReactElement<ScrollViewProperties>
-
-        /**
-         * (sectionData, sectionID) => renderable
-         *
-         * If provided, a sticky header is rendered for this section.  The sticky
-         * behavior means that it will scroll with the content at the top of the
-         * section until it reaches the top of the screen, at which point it will
-         * stick to the top until it is pushed off the screen by the next section
-         * header.
-         */
-        renderSectionHeader?: ( sectionData: any, sectionId: string | number ) => React.ReactElement<any>
-
-
-        /**
-         * (sectionID, rowID, adjacentRowHighlighted) => renderable
-         * If provided, a renderable component to be rendered as the separator below each row
-         * but not the last row if there is a section header below.
-         * Take a sectionID and rowID of the row above and whether its adjacent row is highlighted.
-         */
-        renderSeparator?: ( sectionID: string | number, rowID: string | number, adjacentRowHighlighted?: boolean ) => React.ReactElement<any>
-
-        /**
-         * How early to start rendering rows before they come on screen, in
-         * pixels.
-         */
-        scrollRenderAheadDistance?: number
-    }
-
-    export interface ListViewStatic extends React.ComponentClass<ListViewProperties> {
-        DataSource: ListViewDataSource;
-    }
-
-
-    export interface MapViewAnnotation {
-        latitude?: number
-        longitude?: number
-        animateDrop?: boolean
-        title?: string
-        subtitle?: string
-        hasLeftCallout?: boolean
-        hasRightCallout?: boolean
-        onLeftCalloutPress?: () => void
-        onRightCalloutPress?: () => void
-        id?: string
-    }
-
-    export interface MapViewRegion {
-        latitude: number
-        longitude: number
-        latitudeDelta: number
-        longitudeDelta: number
-    }
-
-    export interface MapViewPropertiesIOS {
-
-        /**
-         * If false points of interest won't be displayed on the map.
-         * Default value is true.
-         */
-        showsPointsOfInterest?: boolean
-    }
-
-    export interface MapViewProperties extends MapViewPropertiesIOS, Touchable, React.Props<MapViewStatic> {
-
-        /**
-         * Map annotations with title/subtitle.
-         */
-        annotations?: MapViewAnnotation[]
-
-        /**
-         * Insets for the map's legal label, originally at bottom left of the map. See EdgeInsetsPropType.js for more information.
-         */
-        legalLabelInsets?: Insets
-
-        /**
-         * The map type to be displayed.
-         *     standard: standard road map (default)
-         *     satellite: satellite view
-         *     hybrid: satellite view with roads and points of interest overlayed
-         *
-         * enum('standard', 'satellite', 'hybrid')
-         */
-        mapType?: string
-
-        /**
-         * Maximum size of area that can be displayed.
-         */
-        maxDelta?: number
-
-        /**
-         * Minimum size of area that can be displayed.
-         */
-        minDelta?: number
-
-        /**
-         * Callback that is called once, when the user taps an annotation.
-         */
-        onAnnotationPress?: () => void
-
-        /**
-         * Callback that is called continuously when the user is dragging the map.
-         */
-        onRegionChange?: ( region: MapViewRegion ) => void
-
-        /**
-         * Callback that is called once, when the user is done moving the map.
-         */
-        onRegionChangeComplete?: ( region: MapViewRegion ) => void
-
-        /**
-         * When this property is set to true and a valid camera is associated with the map,
-         * the camera’s pitch angle is used to tilt the plane of the map.
-         *
-         * When this property is set to false, the camera’s pitch angle is ignored and
-         * the map is always displayed as if the user is looking straight down onto it.
-         */
-        pitchEnabled?: boolean
-
-        /**
-         * The region to be displayed by the map.
-         * The region is defined by the center coordinates and the span of coordinates to display.
-         */
-        region?: MapViewRegion
-
-        /**
-         * When this property is set to true and a valid camera is associated with the map,
-         * the camera’s heading angle is used to rotate the plane of the map around its center point.
-         *
-         * When this property is set to false, the camera’s heading angle is ignored and the map is always oriented
-         * so that true north is situated at the top of the map view
-         */
-        rotateEnabled?: boolean
-
-        /**
-         * If false the user won't be able to change the map region being displayed.
-         * Default value is true.
-         */
-        scrollEnabled?: boolean
-
-        /**
-         * If true the app will ask for the user's location and focus on it.
-         * Default value is false.
-         *
-         * NOTE: You need to add NSLocationWhenInUseUsageDescription key in Info.plist to enable geolocation,
-         * otherwise it is going to fail silently!
-         */
-        showsUserLocation?: boolean
-
-        /**
-         * Used to style and layout the MapView.
-         * See StyleSheet.js and ViewStylePropTypes.js for more info.
-         */
-        style?: ViewStyle
-
-        /**
-         * If false the user won't be able to pinch/zoom the map.
-         * Default value is true.
-         */
-        zoomEnabled?: boolean
-    }
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/mapview.html#content
-     */
-    export interface MapViewStatic extends React.ComponentClass<MapViewProperties> {
-    }
-
-
-    export interface TouchableWithoutFeedbackAndroidProperties {
-
-        /**
-         * Indicates to accessibility services to treat UI component like a native one.
-         * Works for Android only.
-         *
-         * @enum('none', 'button', 'radiobutton_checked', 'radiobutton_unchecked' )
-         */
-        accessibilityComponentType?: string
-    }
-
-    export interface TouchableWithoutFeedbackIOSProperties {
-
-        /**
-         * Provides additional traits to screen reader.
-         * By default no traits are provided unless specified otherwise in element
-         *
-         * @enum('none', 'button', 'link', 'header', 'search', 'image', 'selected', 'plays', 'key', 'text','summary', 'disabled', 'frequentUpdates', 'startsMedia', 'adjustable', 'allowsDirectInteraction', 'pageTurn')
-         */
-        accessibilityTraits?: string | string[];
-
-    }
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/touchablewithoutfeedback.html#props
-     */
-    export interface TouchableWithoutFeedbackProperties extends TouchableWithoutFeedbackAndroidProperties, TouchableWithoutFeedbackIOSProperties {
-
-
-        /**
-         * Called when the touch is released, but not if cancelled (e.g. by a scroll that steals the responder lock).
-         */
-        accessible?: boolean
-
-        /**
-         * Delay in ms, from onPressIn, before onLongPress is called.
-         */
-        delayLongPress?: number;
-
-        /**
-         * Delay in ms, from the start of the touch, before onPressIn is called.
-         */
-        delayPressIn?: number;
-
-        /**
-         * Delay in ms, from the release of the touch, before onPressOut is called.
-         */
-        delayPressOut?: number;
-
-        /**
-         * Invoked on mount and layout changes with
-         * {nativeEvent: {layout: {x, y, width, height}}}
-         */
-        onLayout?: ( event: LayoutChangeEvent ) => void
-
-        onLongPress?: () => void;
-
-        /**
-         * Called when the touch is released,
-         * but not if cancelled (e.g. by a scroll that steals the responder lock).
-         */
-        onPress?: () => void;
-
-        onPressIn?: () => void;
-
-        onPressOut?: () => void;
-
-        /**
-         * //FIXME: not in doc but available in exmaples
-         */
-        style?: ViewStyle
-    }
-
-
-    export interface TouchableWithoutFeedbackProps extends TouchableWithoutFeedbackProperties, React.Props<TouchableWithoutFeedbackStatic> {
-
-    }
-
-    /**
-     * Do not use unless you have a very good reason.
-     * All the elements that respond to press should have a visual feedback when touched.
-     * This is one of the primary reason a "web" app doesn't feel "native".
-     *
-     * @see https://facebook.github.io/react-native/docs/touchablewithoutfeedback.html
-     */
-    export interface TouchableWithoutFeedbackStatic extends React.ComponentClass<TouchableWithoutFeedbackProps> {
-
-    }
-
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/touchablehighlight.html#props
-     */
-    export interface TouchableHighlightProperties extends TouchableWithoutFeedbackProperties, React.Props<TouchableHighlightStatic> {
-
-        /**
-         * Determines what the opacity of the wrapped view should be when touch is active.
-         */
-        activeOpacity?: number
-
-        /**
-         *
-         * Called immediately after the underlay is hidden
-         */
-        onHideUnderlay?: () => void
-
-        /**
-         * Called immediately after the underlay is shown
-         */
-        onShowUnderlay?: () => void
-
-        /**
-         * @see https://facebook.github.io/react-native/docs/view.html#style
-         */
-        style?: ViewStyle
-
-
-        /**
-         * The color of the underlay that will show through when the touch is active.
-         */
-        underlayColor?: string
-    }
-
-    /**
-     * A wrapper for making views respond properly to touches.
-     * On press down, the opacity of the wrapped view is decreased,
-     * which allows the underlay color to show through, darkening or tinting the view.
-     * The underlay comes from adding a view to the view hierarchy,
-     * which can sometimes cause unwanted visual artifacts if not used correctly,
-     * for example if the backgroundColor of the wrapped view isn't explicitly set to an opaque color.
-     *
-     * NOTE: TouchableHighlight supports only one child
-     * If you wish to have several child components, wrap them in a View.
-     *
-     * @see https://facebook.github.io/react-native/docs/touchablehighlight.html
-     */
-    export interface TouchableHighlightStatic extends React.ComponentClass<TouchableHighlightProperties> {
-    }
-
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/touchableopacity.html#props
-     */
-    export interface TouchableOpacityProperties extends TouchableWithoutFeedbackProperties, React.Props<TouchableOpacityStatic> {
-        /**
-         * Determines what the opacity of the wrapped view should be when touch is active.
-         * Defaults to 0.2
-         */
-        activeOpacity?: number
-    }
-
-    /**
-     * A wrapper for making views respond properly to touches.
-     * On press down, the opacity of the wrapped view is decreased, dimming it.
-     * This is done without actually changing the view hierarchy,
-     * and in general is easy to add to an app without weird side-effects.
-     *
-     * @see https://facebook.github.io/react-native/docs/touchableopacity.html
-     */
-    export interface TouchableOpacityStatic extends React.ComponentClass<TouchableOpacityProperties> {
-    }
-
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/touchableopacity.html#props
-     */
-    export interface TouchableNativeFeedbackProperties extends TouchableWithoutFeedbackProperties, React.Props<TouchableNativeFeedbackStatic> {
-        /**
-         * Determines the type of background drawable that's going to be used to display feedback.
-         * It takes an object with type property and extra data depending on the type.
-         * It's recommended to use one of the following static methods to generate that dictionary:
-         *      1) TouchableNativeFeedback.SelectableBackground() - will create object that represents android theme's default background for selectable elements (?android:attr/selectableItemBackground)
-         *      2) TouchableNativeFeedback.SelectableBackgroundBorderless() - will create object that represent android theme's default background for borderless selectable elements (?android:attr/selectableItemBackgroundBorderless). Available on android API level 21+
-         *      3) TouchableNativeFeedback.Ripple(color, borderless) - will create object that represents ripple drawable with specified color (as a string). If property borderless evaluates to true the ripple will render outside of the view bounds (see native actionbar buttons as an example of that behavior). This background type is available on Android API level 21+
-         */
-        background?: any
-    }
-
-    /**
-     * A wrapper for making views respond properly to touches (Android only).
-     * On Android this component uses native state drawable to display touch feedback.
-     * At the moment it only supports having a single View instance as a child node,
-     * as it's implemented by replacing that View with another instance of RCTView node with some additional properties set.
-     *
-     * Background drawable of native feedback touchable can be customized with background property.
-     *
-     * @see https://facebook.github.io/react-native/docs/touchablenativefeedback.html#content
-     */
-    export interface TouchableNativeFeedbackStatic extends React.ComponentClass<TouchableNativeFeedbackProperties> {
-        SelectableBackground: () => TouchableNativeFeedbackStatic
-        SelectableBackgroundBorderless: () => TouchableNativeFeedbackStatic
-        Ripple: ( color: string, borderless?: boolean ) => TouchableNativeFeedbackStatic
-    }
-
-
-    export interface LeftToRightGesture {
-        //TODO:
-    }
-
-    export interface AnimationInterpolator {
-        //TODO:
-    }
-
-    // see /NavigatorSceneConfigs.js
-    export interface SceneConfig {
-        // A list of all gestures that are enabled on this scene
-        gestures: {
-            pop: LeftToRightGesture,
-        },
-
-        // Rebound spring parameters when transitioning FROM this scene
-        springFriction: number;
-        springTension: number;
-
-        // Velocity to start at when transitioning without gesture
-        defaultTransitionVelocity: number;
-
-        // Animation interpolators for horizontal transitioning:
-        animationInterpolators: {
-            into: AnimationInterpolator,
-            out: AnimationInterpolator
-        };
-
-    }
-
-    // see /NavigatorSceneConfigs.js
-    export interface SceneConfigs {
-        FloatFromBottom: SceneConfig;
-        FloatFromRight: SceneConfig;
-        PushFromRight: SceneConfig;
-        FloatFromLeft: SceneConfig;
-        HorizontalSwipeJump: SceneConfig;
-    }
-
-    export interface Route {
-        component?: ComponentClass<ViewProperties>
-        id?: string
-        title?: string
-        passProps?: Object;
-
-        //anything else
-        [key: string]: any
-
-        //Commonly found properties
-        backButtonTitle?: string
-        content?: string
-        message?: string;
-        index?: number
-        onRightButtonPress?: () => void
-        rightButtonTitle?: string
-        sceneConfig?: SceneConfig
-        wrapperStyle?: any
-    }
-
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/navigator.html#content
-     */
-    export interface NavigatorProperties extends React.Props<Navigator> {
-        /**
-         * Optional function that allows configuration about scene animations and gestures.
-         * Will be invoked with the route and should return a scene configuration object
-         * @param route
-         */
-        configureScene?: ( route: Route ) => SceneConfig
-        /**
-         * Specify a route to start on.
-         * A route is an object that the navigator will use to identify each scene to render.
-         * initialRoute must be a route in the initialRouteStack if both props are provided.
-         * The initialRoute will default to the last item in the initialRouteStack.
-         */
-        initialRoute?: Route
-        /**
-         * Provide a set of routes to initially mount.
-         * Required if no initialRoute is provided.
-         * Otherwise, it will default to an array containing only the initialRoute
-         */
-        initialRouteStack?: Route[]
-
-        /**
-         * Optionally provide a navigation bar that persists across scene transitions
-         */
-        navigationBar?: React.ReactElement<NavigatorStatic.NavigationBarProperties>
-
-        /**
-         * Optionally provide the navigator object from a parent Navigator
-         */
-        navigator?: Navigator
-
-        /**
-         * @deprecated Use navigationContext.addListener('willfocus', callback) instead.
-         */
-        onDidFocus?: Function
-
-        /**
-         * @deprecated Use navigationContext.addListener('willfocus', callback) instead.
-         */
-        onWillFocus?: Function
-
-        /**
-         * Required function which renders the scene for a given route.
-         * Will be invoked with the route and the navigator object
-         * @param route
-         * @param navigator
-         */
-        renderScene?: ( route: Route, navigator: Navigator ) => React.ReactElement<ViewProperties>
-
-        /**
-         * Styles to apply to the container of each scene
-         */
-        sceneStyle?: ViewStyle
-
-        /**
-         * //FIXME: not found in doc but found in examples
-         */
-        debugOverlay?: boolean
-
-    }
-
-    /**
-     * Use Navigator to transition between different scenes in your app.
-     * To accomplish this, provide route objects to the navigator to identify each scene,
-     * and also a renderScene function that the navigator can use to render the scene for a given route.
-     *
-     * To change the animation or gesture properties of the scene, provide a configureScene prop to get the config object for a given route.
-     * See Navigator.SceneConfigs for default animations and more info on scene config options.
-     * @see https://facebook.github.io/react-native/docs/navigator.html
-     */
-    export interface NavigatorStatic extends React.ComponentClass<NavigatorProperties> {
-        SceneConfigs: SceneConfigs;
-        NavigationBar: NavigatorStatic.NavigationBarStatic;
-        BreadcrumbNavigationBar: NavigatorStatic.BreadcrumbNavigationBarStatic
-
-        getContext( self: any ): NavigatorStatic;
-
-        /**
-         * returns the current list of routes
-         */
-        getCurrentRoutes(): Route[];
-
-        /**
-         * Jump backward without unmounting the current scen
-         */
-        jumpBack(): void;
-
-        /**
-         * Jump forward to the next scene in the route stack
-         */
-        jumpForward(): void;
-
-        /**
-         * Transition to an existing scene without unmounting
-         */
-        jumpTo( route: Route ): void;
-
-        /**
-         * Navigate forward to a new scene, squashing any scenes that you could jumpForward to
-         */
-        push( route: Route ): void;
-
-        /**
-         * Transition back and unmount the current scene
-         */
-        pop(): void;
-
-        /**
-         * Replace the current scene with a new route
-         */
-        replace( route: Route ): void;
-
-        /**
-         * Replace a scene as specified by an index
-         */
-        replaceAtIndex( route: Route, index: number ): void;
-
-        /**
-         *  Replace the previous scene
-         */
-        replacePrevious( route: Route ): void;
-
-        /**
-         * Reset every scene with an array of routes
-         */
-        immediatelyResetRouteStack( routes: Route[] ): void;
-
-        /**
-         * Pop to a particular scene, as specified by its route. All scenes after it will be unmounted
-         */
-        popToRoute( route: Route ): void;
-
-        /**
-         * Pop to the first scene in the stack, unmounting every other scene
-         */
-        popToTop(): void;
-
-    }
-
-    namespace NavigatorStatic {
-
-
-        export interface NavState {
-            routeStack: Route[]
-            idStack: number[]
-            presentedIndex: number
-        }
-
-        export interface NavigationBarStyle {
-            //TODO @see NavigationBarStyle.ios.js
-        }
-
-
-        export interface NavigationBarRouteMapper {
-            Title: ( route: Route, nav: Navigator, index: number, navState: NavState ) => React.ReactElement<any>;
-            LeftButton: ( route: Route, nav: Navigator, index: number, navState: NavState )=> React.ReactElement<any>;
-            RightButton: ( route: Route, nav: Navigator, index: number, navState: NavState )=> React.ReactElement<any>;
-        }
-
-        /**
-         * @see NavigatorNavigationBar.js
-         */
-        export interface NavigationBarProperties extends React.Props<NavigationBarStatic> {
-            navigator?: Navigator
-            routeMapper?: NavigationBarRouteMapper
-            navState?: NavState
-            style?: ViewStyle
-        }
-
-        export interface NavigationBarStatic extends React.ComponentClass<NavigationBarProperties> {
-            Styles: NavigationBarStyle
-
-        }
-
-        export type NavigationBar = NavigationBarStatic
-        export var NavigationBar: NavigationBarStatic
-
-
-        export interface BreadcrumbNavigationBarStyle {
-            //TODO &see NavigatorBreadcrumbNavigationBar.js
-        }
-
-        export interface BreadcrumbNavigationBarRouteMapper {
-            rightContentForRoute: ( route: Route, navigator: Navigator ) => React.ReactElement<any>
-            titleContentForRoute: ( route: Route, navigator: Navigator ) => React.ReactElement<any>
-            iconForRoute: ( route: Route, navigator: Navigator ) => React.ReactElement<any>
-            //in samples...
-            separatorForRoute: ( route: Route, navigator: Navigator ) => React.ReactElement<any>
-        }
-
-        /**
-         * @see NavigatorNavigationBar.js
-         */
-        export interface BreadcrumbNavigationBarProperties extends React.Props<BreadcrumbNavigationBarStatic> {
-            navigator?: Navigator
-            routeMapper?: BreadcrumbNavigationBarRouteMapper
-            navState?: NavState
-            style?: ViewStyle
-        }
-
-        export interface BreadcrumbNavigationBarStatic extends React.ComponentClass<BreadcrumbNavigationBarProperties> {
-            Styles: BreadcrumbNavigationBarStyle
-        }
-
-        export type BreadcrumbNavigationBar = BreadcrumbNavigationBarStatic
-        var BreadcrumbNavigationBar: BreadcrumbNavigationBarStatic
-
-    }
-
-
-    export interface StyleSheetStatic extends React.ComponentClass<StyleSheetProperties> {
-        create<T>( styles: T ): T;
-    }
-
-    /**
-     * //FIXME: Could not find docs. Inferred from examples and jscode : ListViewDataSource.js
-     */
-    export interface DataSourceAssetCallback {
-        rowHasChanged?: ( r1: any, r2: any ) => boolean
-        sectionHeaderHasChanged?: ( h1: any, h2: any ) => boolean
-        getRowData?: <T>( dataBlob: any, sectionID: number | string, rowID: number | string ) => T
-        getSectionHeaderData?: <T>( dataBlob: any, sectionID: number | string ) => T
-    }
-
-    /**
-     * //FIXME: Could not find docs. Inferred from examples and js code: ListViewDataSource.js
-     */
-    export interface ListViewDataSource {
-        new( onAsset: DataSourceAssetCallback ): ListViewDataSource;
-        /**
-         * Clones this `ListViewDataSource` with the specified `dataBlob` and
-         * `rowIdentities`. The `dataBlob` is just an aribitrary blob of data. At
-         * construction an extractor to get the interesting informatoin was defined
-         * (or the default was used).
-         *
-         * The `rowIdentities` is is a 2D array of identifiers for rows.
-         * ie. [['a1', 'a2'], ['b1', 'b2', 'b3'], ...].  If not provided, it's
-         * assumed that the keys of the section data are the row identities.
-         *
-         * Note: This function does NOT clone the data in this data source. It simply
-         * passes the functions defined at construction to a new data source with
-         * the data specified. If you wish to maintain the existing data you must
-         * handle merging of old and new data separately and then pass that into
-         * this function as the `dataBlob`.
-         */
-        cloneWithRows<T>( dataBlob: Array<any> | {[key: string ]: any}, rowIdentities?: Array<string | number> ): ListViewDataSource
-
-        /**
-         * This performs the same function as the `cloneWithRows` function but here
-         * you also specify what your `sectionIdentities` are. If you don't care
-         * about sections you should safely be able to use `cloneWithRows`.
-         *
-         * `sectionIdentities` is an array of identifiers for  sections.
-         * ie. ['s1', 's2', ...].  If not provided, it's assumed that the
-         * keys of dataBlob are the section identities.
-         *
-         * Note: this returns a new object!
-         */
-        cloneWithRowsAndSections( dataBlob: Array<any> | {[key: string]: any}, sectionIdentities?: Array<string | number>, rowIdentities?: Array<Array<string | number>> ): ListViewDataSource
-
-        getRowCount(): number
-
-        /**
-         * Gets the data required to render the row.
-         */
-        getRowData( sectionIndex: number, rowIndex: number ): any
-
-        /**
-         * Gets the rowID at index provided if the dataSource arrays were flattened,
-         * or null of out of range indexes.
-         */
-        getRowIDForFlatIndex( index: number ): string
-
-        /**
-         * Gets the sectionID at index provided if the dataSource arrays were flattened,
-         * or null for out of range indexes.
-         */
-        getSectionIDForFlatIndex( index: number ): string
-
-        /**
-         * Returns an array containing the number of rows in each section
-         */
-        getSectionLengths(): Array<number>
-
-        /**
-         * Returns if the section header is dirtied and needs to be rerendered
-         */
-        sectionHeaderShouldUpdate( sectionIndex: number ): boolean
-
-        /**
-         * Gets the data required to render the section header
-         */
-        getSectionHeaderData( sectionIndex: number ): any
-    }
-
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/tabbarios-item.html#props
-     */
-    export interface TabBarItemProperties extends React.Props<TabBarItemStatic> {
-
-        /**
-         * Little red bubble that sits at the top right of the icon.
-         */
-        badge?:  string | number
-
-        /**
-         * A custom icon for the tab. It is ignored when a system icon is defined.
-         */
-        icon?: {uri: string} | string
-
-        /**
-         * Callback when this tab is being selected,
-         * you should change the state of your component to set selected={true}.
-         */
-        onPress?: () => void
-
-        /**
-         * It specifies whether the children are visible or not. If you see a blank content, you probably forgot to add a selected one.
-         */
-        selected?: boolean
-
-        /**
-         * A custom icon when the tab is selected.
-         * It is ignored when a system icon is defined. If left empty, the icon will be tinted in blue.
-         */
-        selectedIcon?: {uri: string} | string;
-
-        /**
-         * React style object.
-         */
-        style?: ViewStyle
-
-        /**
-         * Items comes with a few predefined system icons.
-         * Note that if you are using them, the title and selectedIcon will be overriden with the system ones.
-         *
-         *  enum('bookmarks', 'contacts', 'downloads', 'favorites', 'featured', 'history', 'more', 'most-recent', 'most-viewed', 'recents', 'search', 'top-rated')
-         */
-        systemIcon: string
-
-        /**
-         * Text that appears under the icon. It is ignored when a system icon is defined.
-         */
-        title?: string
-
-    }
-
-    export interface TabBarItemStatic extends React.ComponentClass<TabBarItemProperties> {
-    }
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/tabbarios.html#props
-     */
-    export interface TabBarIOSProperties extends React.Props<TabBarIOSStatic> {
-
-        /**
-         * Background color of the tab bar
-         */
-        barTintColor?: string
-
-        style?: ViewStyle
-
-        /**
-         * Color of the currently selected tab icon
-         */
-        tintColor?: string
-
-        /**
-         * A Boolean value that indicates whether the tab bar is translucent
-         */
-        translucent?: boolean
-    }
-
-    export interface TabBarIOSStatic extends React.ComponentClass<TabBarIOSProperties> {
-        Item: TabBarItemStatic;
-    }
-
-
-    export interface PixelRatioStatic {
-        get(): number;
-    }
-
-    export interface DeviceEventSubscriptionStatic {
-        remove(): void;
-    }
-
-    export interface DeviceEventEmitterStatic {
-        addListener<T>( type: string, onReceived: ( data: T ) => void ): DeviceEventSubscription;
-    }
-
-    // Used by Dimensions below
-    export interface ScaledSize {
-        width: number;
-        height: number;
-        scale: number;
-    }
-
-
-    export interface InteractionManagerStatic {
-        runAfterInteractions( fn: () => void ): void;
-    }
-
-
-    export interface ScrollViewStyle extends FlexStyle, TransformsStyle {
-
-        backfaceVisibility?:string //enum('visible', 'hidden')
-        backgroundColor?: string
-        borderColor?: string
-        borderTopColor?: string
-        borderRightColor?: string
-        borderBottomColor?: string
-        borderLeftColor?: string
-        borderRadius?: number
-        borderTopLeftRadius?: number
-        borderTopRightRadius?: number
-        borderBottomLeftRadius?: number
-        borderBottomRightRadius?: number
-        borderStyle?: string //enum('solid', 'dotted', 'dashed')
-        borderWidth?: number
-        borderTopWidth?: number
-        borderRightWidth?: number
-        borderBottomWidth?: number
-        borderLeftWidth?: number
-        opacity?: number
-        overflow?: string //enum('visible', 'hidden')
-        shadowColor?: string
-        shadowOffset?: {width: number; height: number}
-        shadowOpacity?: number
-        shadowRadius?: number
-    }
-
-
-    export interface ScrollViewIOSProperties {
-
-        /**
-         * When true the scroll view bounces horizontally when it reaches the end
-         * even if the content is smaller than the scroll view itself. The default
-         * value is true when `horizontal={true}` and false otherwise.
-         */
-        alwaysBounceHorizontal?: boolean
-        /**
-         * When true the scroll view bounces vertically when it reaches the end
-         * even if the content is smaller than the scroll view itself. The default
-         * value is false when `horizontal={true}` and true otherwise.
-         */
-        alwaysBounceVertical?: boolean
-
-        /**
-         * Controls whether iOS should automatically adjust the content inset for scroll views that are placed behind a navigation bar or tab bar/ toolbar.
-         * The default value is true.
-         */
-        automaticallyAdjustContentInsets?: boolean // true
-
-        /**
-         * When true the scroll view bounces when it reaches the end of the
-         * content if the content is larger then the scroll view along the axis of
-         * the scroll direction. When false it disables all bouncing even if
-         * the `alwaysBounce*` props are true. The default value is true.
-         */
-        bounces?: boolean
-        /**
-         * When true gestures can drive zoom past min/max and the zoom will animate
-         * to the min/max value at gesture end otherwise the zoom will not exceed
-         * the limits.
-         */
-        bouncesZoom?: boolean
-
-        /**
-         * When false once tracking starts won't try to drag if the touch moves.
-         * The default value is true.
-         */
-        canCancelContentTouches?: boolean
-
-        /**
-         * When true the scroll view automatically centers the content when the
-         * content is smaller than the scroll view bounds; when the content is
-         * larger than the scroll view this property has no effect. The default
-         * value is false.
-         */
-        centerContent?: boolean
-
-
-        /**
-         * The amount by which the scroll view content is inset from the edges of the scroll view.
-         * Defaults to {0, 0, 0, 0}.
-         */
-        contentInset?: Insets // zeros
-
-        /**
-         * Used to manually set the starting scroll offset.
-         * The default value is {x: 0, y: 0}
-         */
-        contentOffset?: PointProperties // zeros
-
-        /**
-         * A floating-point number that determines how quickly the scroll view
-         * decelerates after the user lifts their finger. Reasonable choices include
-         *   - Normal: 0.998 (the default)
-         *   - Fast: 0.9
-         */
-        decelerationRate?: number
-
-        /**
-         * When true the ScrollView will try to lock to only vertical or horizontal
-         * scrolling while dragging.  The default value is false.
-         */
-        directionalLockEnabled?: boolean
-
-        /**
-         * The maximum allowed zoom scale. The default value is 1.0.
-         */
-        maximumZoomScale?: number
-
-        /**
-         * The minimum allowed zoom scale. The default value is 1.0.
-         */
-        minimumZoomScale?: number
-
-        /**
-         * Called when a scrolling animation ends.
-         */
-        onScrollAnimationEnd?: () => void
-
-        /**
-         * When true the scroll view stops on multiples of the scroll view's size
-         * when scrolling. This can be used for horizontal pagination. The default
-         * value is false.
-         */
-        pagingEnabled?: boolean
-
-        /**
-         * When false, the content does not scroll. The default value is true
-         */
-        scrollEnabled?: boolean // true
-
-        /**
-         * This controls how often the scroll event will be fired while scrolling (in events per seconds).
-         * A higher number yields better accuracy for code that is tracking the scroll position,
-         * but can lead to scroll performance problems due to the volume of information being send over the bridge.
-         * The default value is zero, which means the scroll event will be sent only once each time the view is scrolled.
-         */
-        scrollEventThrottle?: number // null
-
-        /**
-         * The amount by which the scroll view indicators are inset from the edges of the scroll view.
-         * This should normally be set to the same value as the contentInset.
-         * Defaults to {0, 0, 0, 0}.
-         */
-        scrollIndicatorInsets?: Insets //zeroes
-
-        /**
-         * When true the scroll view scrolls to top when the status bar is tapped.
-         * The default value is true.
-         */
-        scrollsToTop?: boolean
-
-        /**
-         * When snapToInterval is set, snapToAlignment will define the relationship of the the snapping to the scroll view.
-         *      - start (the default) will align the snap at the left (horizontal) or top (vertical)
-         *      - center will align the snap in the center
-         *      - end will align the snap at the right (horizontal) or bottom (vertical)
-         */
-        snapToAlignment?: string
-
-        /**
-         * When set, causes the scroll view to stop at multiples of the value of snapToInterval.
-         * This can be used for paginating through children that have lengths smaller than the scroll view.
-         * Used in combination with snapToAlignment.
-         */
-        snapToInterval?: number
-
-        /**
-         * An array of child indices determining which children get docked to the
-         * top of the screen when scrolling. For example passing
-         * `stickyHeaderIndices={[0]}` will cause the first child to be fixed to the
-         * top of the scroll view. This property is not supported in conjunction
-         * with `horizontal={true}`.
-         */
-        stickyHeaderIndices?: number[]
-
-        /**
-         * The current scale of the scroll view content. The default value is 1.0.
-         */
-        zoomScale?: number
-    }
-
-    export interface ScrollViewProperties extends ScrollViewIOSProperties, Touchable {
-
-        /**
-         * These styles will be applied to the scroll view content container which
-         * wraps all of the child views. Example:
-         *
-         *   return (
-         *     <ScrollView contentContainerStyle={styles.contentContainer}>
-         *     </ScrollView>
-         *   );
-         *   ...
-         *   var styles = StyleSheet.create({
-         *     contentContainer: {
-         *       paddingVertical: 20
-         *     }
-         *   });
-         */
-        contentContainerStyle?: ViewStyle
-
-        /**
-         * When true the scroll view's children are arranged horizontally in a row
-         * instead of vertically in a column. The default value is false.
-         */
-        horizontal?: boolean
-
-        /**
-         * Determines whether the keyboard gets dismissed in response to a drag.
-         *   - 'none' (the default) drags do not dismiss the keyboard.
-         *   - 'onDrag' the keyboard is dismissed when a drag begins.
-         *   - 'interactive' the keyboard is dismissed interactively with the drag
-         *     and moves in synchrony with the touch; dragging upwards cancels the
-         *     dismissal.
-         */
-        keyboardDismissMode?: string
-
-        /**
-         * When false tapping outside of the focused text input when the keyboard
-         * is up dismisses the keyboard. When true the scroll view will not catch
-         * taps and the keyboard will not dismiss automatically. The default value
-         * is false.
-         */
-        keyboardShouldPersistTaps?: boolean
-
-        /**
-         * Fires at most once per frame during scrolling.
-         * The frequency of the events can be contolled using the scrollEventThrottle prop.
-         */
-        onScroll?: (event?: { nativeEvent: NativeScrollEvent }) => void
-
-        /**
-         * Experimental: When true offscreen child views (whose `overflow` value is
-         * `hidden`) are removed from their native backing superview when offscreen.
-         * This canimprove scrolling performance on long lists. The default value is
-         * false.
-         */
-        removeClippedSubviews?: boolean
-
-        /**
-         * When true, shows a horizontal scroll indicator.
-         */
-        showsHorizontalScrollIndicator?: boolean
-
-        /**
-         * When true, shows a vertical scroll indicator.
-         */
-        showsVerticalScrollIndicator?: boolean
-
-        /**
-         * Style
-         */
-        style?: ScrollViewStyle
-    }
-
-    export interface ScrollViewProps extends ScrollViewProperties, React.Props<ScrollViewStatic> {
-
-    }
-
-    interface ScrollViewStatic extends React.ComponentClass<ScrollViewProps> {
-        /**
-         * Scrolls to a given x, y offset, either immediately or with a smooth animation.
-         * Syntax:
-         *
-         * scrollTo(options: {x: number = 0; y: number = 0; animated: boolean = true})
-         *
-         * Note: The weird argument signature is due to the fact that, for historical reasons,
-         * the function also accepts separate arguments as as alternative to the options object.
-         * This is deprecated due to ambiguity (y before x), and SHOULD NOT BE USED.
-         */
-        scrollTo(
-            y?: number | { x?: number, y?: number, animated?: boolean },
-            x?: number,
-            animated?: boolean
-        ): void;
-    }
-
-
-    export interface NativeScrollRectangle {
-        left: number;
-        top: number;
-        bottom: number;
-        right: number;
-    }
-
-    export interface NativeScrollPoint {
-        x: number;
-        y: number;
-    }
-
-    export interface NativeScrollSize {
-        height: number;
-        width: number;
-    }
-
-    export interface NativeScrollEvent {
-        contentInset: NativeScrollRectangle;
-        contentOffset: NativeScrollPoint;
-        contentSize: NativeScrollSize;
-        layoutMeasurement: NativeScrollSize;
-        zoomScale: number;
-    }
-
-
-    //////////////////////////////////////////////////////////////////////////
-    //
-    // A P I s
-    //
-    //////////////////////////////////////////////////////////////////////////
-
-    /**
-     * //FIXME: no documentation - inferred from RCTACtionSheetManager.m
-     */
-    export interface ActionSheetIOSOptions {
-        title?: string
-        options?: string[]
-        cancelButtonIndex?: number
-        destructiveButtonIndex?: number
-    }
-
-    /**
-     * //FIXME: no documentation - inferred from RCTACtionSheetManager.m
-     */
-    export interface ShareActionSheetIOSOptions {
-        message?: string
-        url?: string
-    }
-
-    /**
-     * @see https://facebook.github.io/react-native/docs/actionsheetios.html#content
-     * //FIXME: no documentation - inferred from RCTACtionSheetManager.m
-     */
-    export interface ActionSheetIOSStatic {
-        showActionSheetWithOptions: ( options: ActionSheetIOSOptions, callback: ( buttonIndex: number ) => void ) => void
-        showShareActionSheetWithOptions: ( options: ShareActionSheetIOSOptions, failureCallback: ( error: Error ) => void, successCallback: ( success: boolean, method: string ) => void ) => void
-    }
-
-
-    /**
-     * //FIXME: No documentation - inferred from RCTAdSupport.m
-     */
-    export interface AdSupportIOSStatic {
-        getAdvertisingId: ( onSuccess: ( deviceId: string ) => void, onFailure: ( err: Error ) => void ) => void
-        getAdvertisingTrackingEnabled: ( onSuccess: ( hasTracking: boolean ) => void, onFailure: ( err: Error ) => void ) => void
-    }
-
-    interface AlertIOSButton {
-        text: string
-        onPress?: () => void
-    }
-
-    /**
-     * Launches an alert dialog with the specified title and message.
-     *
-     * Optionally provide a list of buttons.
-     * Tapping any button will fire the respective onPress callback and dismiss the alert.
-     * By default, the only button will be an 'OK' button
-     *
-     * The last button in the list will be considered the 'Primary' button and it will appear bold.
-     *
-     * @see https://facebook.github.io/react-native/docs/alertios.html#content
-     */
-    export interface AlertIOSStatic {
-        alert: ( title: string, message?: string, buttons?: Array<AlertIOSButton>, type?: string ) => void
-        prompt: ( title: string, value?: string, buttons?: Array<AlertIOSButton>, callback?: ( value?: string ) => void ) => void
-    }
-
-
-    /**
-     * AppStateIOS can tell you if the app is in the foreground or background,
-     * and notify you when the state changes.
-     *
-     * AppStateIOS is frequently used to determine the intent and proper behavior
-     * when handling push notifications.
-     *
-     * iOS App States
-     *      active - The app is running in the foreground
-     *      background - The app is running in the background. The user is either in another app or on the home screen
-     *      inactive - This is a transition state that currently never happens for typical React Native apps.
-     *
-     * For more information, see Apple's documentation: https://developer.apple.com/library/ios/documentation/iPhone/Conceptual/iPhoneOSProgrammingGuide/TheAppLifeCycle/TheAppLifeCycle.html
-     *
-     * @see https://facebook.github.io/react-native/docs/appstateios.html#content
-     */
-    export interface AppStateStatic {
-        currentState: string
-        addEventListener( type: string, listener: ( state: string ) => void ): void
-        removeEventListener( type: string, listener: ( state: string ) => void ): void
-    }
-
-    /**
-     * AsyncStorage is a simple, asynchronous, persistent, key-value storage system that is global to the app.
-     * It should be used instead of LocalStorage.
-     *
-     * It is recommended that you use an abstraction on top of AsyncStorage
-     * instead of AsyncStorage directly for anything more than light usage since it operates globally.
-     *
-     * @see https://facebook.github.io/react-native/docs/asyncstorage.html#content
-     */
-    export interface AsyncStorageStatic {
-
-        /**
-         * Fetches key and passes the result to callback, along with an Error if there is any.
-         */
-        getItem( key: string, callback?: ( error?: Error, result?: string ) => void ): Promise<string>
-
-        /**
-         * Sets value for key and calls callback on completion, along with an Error if there is any
-         */
-        setItem( key: string, value: string, callback?: ( error?: Error ) => void ): Promise<string>
-
-        removeItem( key: string, callback?: ( error?: Error ) => void ): Promise<string>
-
-        /**
-         * Merges existing value with input value, assuming they are stringified json. Returns a Promise object.
-         * Not supported by all native implementation
-         */
-        mergeItem( key: string, value: string, callback?: ( error?: Error ) => void ): Promise<string>
-
-        /**
-         * Erases all AsyncStorage for all clients, libraries, etc. You probably don't want to call this.
-         * Use removeItem or multiRemove to clear only your own keys instead.
-         */
-        clear( callback?: ( error?: Error ) => void ): Promise<string>
-
-        /**
-         * Gets all keys known to the app, for all callers, libraries, etc
-         */
-        getAllKeys( callback?: ( error?: Error, keys?: string[] ) => void ): Promise<string>
-
-        /**
-         * multiGet invokes callback with an array of key-value pair arrays that matches the input format of multiSet
-         */
-        multiGet( keys: string[], callback?: ( errors?: Error[], result?: string[][] ) => void ): Promise<string>
-
-        /**
-         * multiSet and multiMerge take arrays of key-value array pairs that match the output of multiGet,
-         *
-         * multiSet([['k1', 'val1'], ['k2', 'val2']], cb);
-         */
-        multiSet( keyValuePairs: string[][], callback?: ( errors?: Error[] ) => void ): Promise<string>
-
-        /**
-         * Delete all the keys in the keys array.
-         */
-        multiRemove( keys: string[], callback?: ( errors?: Error[] ) => void ): Promise<string>
-
-        /**
-         * Merges existing values with input values, assuming they are stringified json.
-         * Returns a Promise object.
-         *
-         * Not supported by all native implementations.
-         */
-        multiMerge( keyValuePairs: string[][], callback?: ( errors?: Error[] ) => void ): Promise<string>
-    }
-
-
-    export interface CameraRollFetchParams {
-        first: number;
-        after?: string;
-        groupTypes: string; //  'Album','All','Event','Faces','Library','PhotoStream','SavedPhotos'
-        groupName?: string
-        assetType?: string
-    }
-
-    export interface CameraRollNodeInfo {
-        image: Image;
-        group_name: string;
-        timestamp: number;
-        location: any;
-    }
-
-    export interface CameraRollEdgeInfo {
-        node: CameraRollNodeInfo;
-    }
-
-    export interface CameraRollAssetInfo {
-        edges: CameraRollEdgeInfo[];
-        page_info: {
-            has_next_page: boolean;
-            end_cursor: string;
-        };
-    }
-
-    /**
-     * CameraRoll provides access to the local camera roll / gallery.
-     */
-    export interface CameraRollStatic {
-
-        GroupTypesOptions: string[] //'Album','All','Event','Faces','Library','PhotoStream','SavedPhotos'
-
-        /**
-         * Saves the image to the camera roll / gallery.
-         *
-         * The CameraRoll API is not yet implemented for Android.
-         *
-         * @tag On Android, this is a local URI, such as "file:///sdcard/img.png".
-         * On iOS, the tag can be one of the following:
-         *      local URI
-         *      assets-library tag
-         *      a tag not maching any of the above, which means the image data will be stored in memory (and consume memory as long as the process is alive)
-         *
-         * @param successCallback Invoked with the value of tag on success.
-         * @param errorCallback Invoked with error message on error.
-         */
-        saveImageWithTag( tag: string, successCallback: ( tag?: string ) => void, errorCallback: ( error: Error ) => void ): void
-
-        /**
-         * Invokes callback with photo identifier objects from the local camera roll of the device matching shape defined by getPhotosReturnChecker.
-         *
-         * @param {object} params See getPhotosParamChecker.
-         * @param {function} callback Invoked with arg of shape defined by getPhotosReturnChecker on success.
-         * @param {function} errorCallback Invoked with error message on error.
-         */
-        getPhotos( fetch: CameraRollFetchParams,
-                   callback: ( assetInfo: CameraRollAssetInfo ) => void,
-                   errorCallback: ( error: Error )=> void ): void;
-    }
-
-    export interface FetchableListenable<T> {
-        fetch: () => Promise<T>
-
-        /**
-         * eventName is expected to be `change`
-         * //FIXME: No doc - inferred from NetInfo.js
-         */
-        addEventListener: ( eventName: string, listener: ( result: T ) => void ) => void
-
-        /**
-         * eventName is expected to be `change`
-         * //FIXME: No doc - inferred from NetInfo.js
-         */
-        removeEventListener: ( eventName: string, listener: ( result: T ) => void ) => void
-    }
-
-    /**
-     * NetInfo exposes info about online/offline status
-     *
-     * Asynchronously determine if the device is online and on a cellular network.
-     *
-     * - `none` - device is offline
-     * - `wifi` - device is online and connected via wifi, or is the iOS simulator
-     * - `cell` - device is connected via Edge, 3G, WiMax, or LTE
-     * - `unknown` - error case and the network status is unknown
-
-     * @see https://facebook.github.io/react-native/docs/netinfo.html#content
-     */
-    export interface NetInfoStatic extends FetchableListenable<string> {
-
-        /**
-         *
-         * Available on all platforms.
-         * Asynchronously fetch a boolean to determine internet connectivity.
-         */
-        isConnected: FetchableListenable<boolean>
-
-        //FIXME: Documentation missing
-        isConnectionMetered: any
-    }
-
-
-    export interface PanResponderGestureState {
-
-        /**
-         *  ID of the gestureState- persisted as long as there at least one touch on
-         */
-        stateID: number
-
-        /**
-         *  the latest screen coordinates of the recently-moved touch
-         */
-        moveX: number
-
-        /**
-         *  the latest screen coordinates of the recently-moved touch
-         */
-        moveY: number
-
-        /**
-         * the screen coordinates of the responder grant
-         */
-        x0: number
-
-        /**
-         * the screen coordinates of the responder grant
-         */
-        y0: number
-
-        /**
-         * accumulated distance of the gesture since the touch started
-         */
-        dx: number
-
-        /**
-         * accumulated distance of the gesture since the touch started
-         */
-        dy: number
-
-        /**
-         * current velocity of the gesture
-         */
-        vx: number
-
-        /**
-         * current velocity of the gesture
-         */
-        vy: number
-
-        /**
-         * Number of touches currently on screeen
-         */
-        numberActiveTouches: number
-
-
-        // All `gestureState` accounts for timeStamps up until:
-        _accountsForMovesUpTo: number
-    }
-
-
-    /**
-     * @see documentation of GestureResponderHandlers
-     */
-    export interface PanResponderCallbacks {
-        onMoveShouldSetPanResponder?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => boolean
-        onStartShouldSetPanResponder?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
-        onPanResponderGrant?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
-        onPanResponderMove?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
-        onPanResponderRelease?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
-        onPanResponderTerminate?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
-
-        onMoveShouldSetPanResponderCapture?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => boolean
-        onStartShouldSetPanResponderCapture?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => boolean
-        onPanResponderReject?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
-        onPanResponderStart?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
-        onPanResponderEnd?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => void
-        onPanResponderTerminationRequest?: ( e: GestureResponderEvent, gestureState: PanResponderGestureState ) => boolean
-    }
-
-    export interface PanResponderInstance {
-        panHandlers: GestureResponderHandlers
-    }
-
-    /**
-     * PanResponder reconciles several touches into a single gesture.
-     * It makes single-touch gestures resilient to extra touches,
-     * and can be used to recognize simple multi-touch gestures.
-     *
-     * It provides a predictable wrapper of the responder handlers provided by the gesture responder system.
-     * For each handler, it provides a new gestureState object alongside the normal event.
-     */
-    export interface PanResponderStatic {
-        /**
-         * @param config Enhanced versions of all of the responder callbacks
-         * that provide not only the typical `ResponderSyntheticEvent`, but also the
-         * `PanResponder` gesture state.  Simply replace the word `Responder` with
-         * `PanResponder` in each of the typical `onResponder*` callbacks. For
-         * example, the `config` object would look like:
-         *
-         *  - `onMoveShouldSetPanResponder: (e, gestureState) => {...}`
-         *  - `onMoveShouldSetPanResponderCapture: (e, gestureState) => {...}`
-         *  - `onStartShouldSetPanResponder: (e, gestureState) => {...}`
-         *  - `onStartShouldSetPanResponderCapture: (e, gestureState) => {...}`
-         *  - `onPanResponderReject: (e, gestureState) => {...}`
-         *  - `onPanResponderGrant: (e, gestureState) => {...}`
-         *  - `onPanResponderStart: (e, gestureState) => {...}`
-         *  - `onPanResponderEnd: (e, gestureState) => {...}`
-         *  - `onPanResponderRelease: (e, gestureState) => {...}`
-         *  - `onPanResponderMove: (e, gestureState) => {...}`
-         *  - `onPanResponderTerminate: (e, gestureState) => {...}`
-         *  - `onPanResponderTerminationRequest: (e, gestureState) => {...}`
-         *
-         *  In general, for events that have capture equivalents, we update the
-         *  gestureState once in the capture phase and can use it in the bubble phase
-         *  as well.
-         *
-         *  Be careful with onStartShould* callbacks. They only reflect updated
-         *  `gestureState` for start/end events that bubble/capture to the Node.
-         *  Once the node is the responder, you can rely on every start/end event
-         *  being processed by the gesture and `gestureState` being updated
-         *  accordingly. (numberActiveTouches) may not be totally accurate unless you
-         *  are the responder.
-         */
-        create( config: PanResponderCallbacks ): PanResponderInstance
-    }
-
-    export interface PushNotificationPermissions {
-        alert?: boolean
-        badge?: boolean
-        sound?: boolean
-    }
-
-    export interface PushNotification {
-
-
-        /**
-         * An alias for `getAlert` to get the notification's main message string
-         */
-        getMessage(): string | Object
-
-        /**
-         * Gets the sound string from the `aps` object
-         */
-        getSound(): string
-
-        /**
-         * Gets the notification's main message from the `aps` object
-         */
-        getAlert(): string | Object
-
-        /**
-         * Gets the badge count number from the `aps` object
-         */
-        getBadgeCount(): number
-
-        /**
-         * Gets the data object on the notif
-         */
-        getData(): Object
-
-    }
-
-
-    /**
-     * Handle push notifications for your app, including permission handling and icon badge number.
-     * @see https://facebook.github.io/react-native/docs/pushnotificationios.html#content
-     *
-     * //FIXME: BGR: The documentation seems completely off compared to the actual js implementation. I could never get the example to run
-     */
-    export interface PushNotificationIOSStatic {
-
-        /**
-         * Sets the badge number for the app icon on the home screen
-         */
-        setApplicationIconBadgeNumber( number: number ): void
-
-        /**
-         * Gets the current badge number for the app icon on the home screen
-         */
-        getApplicationIconBadgeNumber( callback: ( badge: number ) => void ): void
-
-        /**
-         * Attaches a listener to remote notifications while the app is running in the
-         * foreground or the background.
-         *
-         * The handler will get be invoked with an instance of `PushNotificationIOS`
-         *
-         * The type MUST be 'notification'
-         */
-        addEventListener( type: string, handler: ( notification: PushNotification ) => void ):void
-
-        /**
-         * Requests all notification permissions from iOS, prompting the user's
-         * dialog box.
-         */
-        requestPermissions(): void
-
-        /**
-         * See what push permissions are currently enabled. `callback` will be
-         * invoked with a `permissions` object:
-         *
-         *  - `alert` :boolean
-         *  - `badge` :boolean
-         *  - `sound` :boolean
-         */
-        checkPermissions( callback: ( permissions: PushNotificationPermissions ) => void ): void
-
-        /**
-         * Removes the event listener. Do this in `componentWillUnmount` to prevent
-         * memory leaks
-         */
-        removeEventListener( type: string, handler: ( notification: PushNotification ) => void ): void
-
-        /**
-         * An initial notification will be available if the app was cold-launched
-         * from a notification.
-         *
-         * The first caller of `popInitialNotification` will get the initial
-         * notification object, or `null`. Subsequent invocations will return null.
-         */
-        popInitialNotification(): PushNotification
-    }
-
-
-    /**
-     * @enum('default', 'light-content')
-     */
-    export type StatusBarStyle = string
-
-    /**
-     * @enum('none','fade', 'slide')
-     */
-    type StatusBarAnimation = string
-
-
-    /**
-     * //FIXME: No documentation is available (although this is self explanatory)
-     *
-     * @see https://facebook.github.io/react-native/docs/statusbarios.html#content
-     */
-    export interface StatusBarIOSStatic {
-
-        setStyle(style: StatusBarStyle, animated?: boolean): void
-
-        setHidden(hidden: boolean, animation?: StatusBarAnimation): void
-
-        setNetworkActivityIndicatorVisible(visible: boolean): void
-    }
-
-    /**
-     * The Vibration API is exposed at VibrationIOS.vibrate().
-     * On iOS, calling this function will trigger a one second vibration.
-     * The vibration is asynchronous so this method will return immediately.
-     *
-     * There will be no effect on devices that do not support Vibration, eg. the iOS simulator.
-     *
-     * Vibration patterns are currently unsupported.
-     *
-     * @see https://facebook.github.io/react-native/docs/vibrationios.html#content
-     */
-    export interface VibrationIOSStatic {
-        vibrate(): void
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    //
-    //  R E - E X P O R T S
-    //
-    //////////////////////////////////////////////////////////////////////////
-
-    // export var AppRegistry: AppRegistryStatic;
-
-
-    export var ActivityIndicatorIOS: ActivityIndicatorIOSStatic
-    export type ActivityIndicatorIOS = ActivityIndicatorIOSStatic
-
-    export var DatePickerIOS: DatePickerIOSStatic
-    export type DatePickerIOS = DatePickerIOSStatic
-
-    export var Image: ImageStatic
-    export type Image = ImageStatic
-
-    export var LayoutAnimation: LayoutAnimationStatic
-    export type LayoutAnimation = LayoutAnimationStatic
-
-    export var ListView: ListViewStatic
-    export type ListView = ListViewStatic
-
-    export var MapView: MapViewStatic
-    export type MapView = MapViewStatic
-
-    export var Navigator: NavigatorStatic
-    export type Navigator = NavigatorStatic
-
-    export var NavigatorIOS: NavigatorIOSStatic
-    export type NavigatorIOS = NavigatorIOSStatic
-
-    export var PickerIOS: PickerIOSStatic
-    export type PickerIOS = PickerIOSStatic
-
-    export var SliderIOS: SliderIOSStatic
-    export type SliderIOS = SliderIOSStatic
-
-    export var ScrollView: ScrollViewStatic
-    export type ScrollView = ScrollViewStatic
-
-    export var StyleSheet: StyleSheetStatic
-    export type StyleSheet = StyleSheetStatic
-
-    export var SwitchIOS: SwitchIOSStatic
-    export type SwitchIOS = SwitchIOSStatic
-
-    export var TabBarIOS: TabBarIOSStatic
-    export type TabBarIOS = TabBarIOSStatic
-
-    export var Text: TextStatic
-    export type Text = TextStatic
-
-    export var TextInput: TextInputStatic
-    export type TextInput = TextInputStatic
-
-    export var TouchableHighlight: TouchableHighlightStatic
-    export type TouchableHighlight = TouchableHighlightStatic
-
-    export var TouchableNativeFeedback: TouchableNativeFeedbackStatic
-    export type TouchableNativeFeedback = TouchableNativeFeedbackStatic
-
-    export var TouchableOpacity: TouchableOpacityStatic
-    export type TouchableOpacity = TouchableOpacityStatic
-
-    export var TouchableWithoutFeedback: TouchableWithoutFeedbackStatic
-    export type TouchableWithoutFeedback= TouchableWithoutFeedbackStatic
-
-    export var View: ViewStatic
-    export type View = ViewStatic
-
-    export var ViewPagerAndroid: ViewPagerAndroidStatic
-    export type ViewPagerAndroid = ViewPagerAndroidStatic
-
-    export var WebView: WebViewStatic
-    export type WebView = WebViewStatic
-
-
-    //////////// APIS //////////////
-    export var ActionSheetIOS: ActionSheetIOSStatic
-    export type ActionSheetIOS = ActionSheetIOSStatic
-
-    export var AdSupportIOS: AdSupportIOSStatic
-    export type AdSupportIOS = AdSupportIOSStatic
-
-    export var AlertIOS: AlertIOSStatic
-    export type AlertIOS = AlertIOSStatic
-
-    export var AppState : AppStateStatic;
-    export type AppState = AppStateStatic;
-
-    export var AppStateIOS: AppStateStatic
-    export type AppStateIOS = AppStateStatic
-
-    export var AsyncStorage: AsyncStorageStatic
-    export type AsyncStorage = AsyncStorageStatic
-
-    export var CameraRoll: CameraRollStatic
-    export type CameraRoll = CameraRollStatic
-
-    export var NetInfo: NetInfoStatic
-    export type NetInfo = NetInfoStatic
-
-    export var PanResponder: PanResponderStatic
-    export type PanResponder = PanResponderStatic
-
-    export var PushNotificationIOS: PushNotificationIOSStatic
-    export type PushNotificationIOS = PushNotificationIOSStatic
-
-    export var StatusBarIOS: StatusBarIOSStatic
-    export type StatusBarIOS = StatusBarIOSStatic
-
-    export var VibrationIOS: VibrationIOSStatic
-    export type VibrationIOS = VibrationIOSStatic
-
-
-    //
-    // /TODO: BGR: These are leftovers of the initial port that must be revisited
-    //
-
-    export var SegmentedControlIOS: React.ComponentClass<SegmentedControlIOSProperties>
-
-    export var PixelRatio: PixelRatioStatic
-    export var DeviceEventEmitter: DeviceEventEmitterStatic
-    export var DeviceEventSubscription: DeviceEventSubscriptionStatic
-    export type DeviceEventSubscription = DeviceEventSubscriptionStatic
-    export var InteractionManager: InteractionManagerStatic
-
-    //////////////////////////////////////////////////////////////////////////
-    //
-    // Additional ( and controversial)
-    //
-    //////////////////////////////////////////////////////////////////////////
-
-    export function __spread( target: any, ...sources: any[] ): any;
-
-
-    export interface GlobalStatic {
-
-        /**
-         * Accepts a function as its only argument and calls that function before the next repaint.
-         * It is an essential building block for animations that underlies all of the JavaScript-based animation APIs.
-         * In general, you shouldn't need to call this yourself - the animation API's will manage frame updates for you.
-         * @see https://facebook.github.io/react-native/docs/animations.html#requestanimationframe
-         */
-        requestAnimationFrame( fn: () => void ) : void;
-
-    }
-
-    //
-    // Add-Ons
-    //
-    namespace addons {
-
-        //FIXME: Documentation ?
-        export interface TestModuleStatic {
-
-            verifySnapshot: ( done: ( indicator?: any ) => void ) => void
-            markTestPassed: ( indicator: any ) => void
-            markTestCompleted: () => void
-        }
-
-        export var TestModule: TestModuleStatic
-        export type TestModule = TestModuleStatic
-    }
-
-
-}
-
-declare module "react-native" {
-
-    import ReactNative = __React
-    export = ReactNative
-}
-
-declare var global: __React.GlobalStatic
-
-declare function require( name: string ): any
-
-
-//TODO: BGR: this is a left-over from the initial port. Not sure it makes any sense
-declare module "Dimensions" {
-    import * as React from 'react-native';
-
-    interface Dimensions {
-        get( what: string ): React.ScaledSize;
-    }
-
-    var ExportDimensions: Dimensions;
-    export = ExportDimensions;
-}
diff --git a/react-native/tsconfig.json b/react-native/tsconfig.json
new file mode 100644
index 0000000000..3ce43ea411
--- /dev/null
+++ b/react-native/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-animated-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/react-notification-system/index.d.ts b/react-notification-system/index.d.ts
new file mode 100644
index 0000000000..b7b7438bca
--- /dev/null
+++ b/react-notification-system/index.d.ts
@@ -0,0 +1,80 @@
+// Type definitions for React Notification System v0.2.6
+// Project: https://www.npmjs.com/package/react-notification-system
+// Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>, Deividas Bakanas <https://github.com/DeividasBakanas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react" />
+
+declare namespace NotificationSystem {
+
+    export interface System extends React.Component<any, any> {
+        addNotification(notification: Notification): Notification;
+        removeNotification(notification: Notification): void;
+        removeNotification(uid: string): void;
+    }
+
+    export interface CallBackFunction {
+        (notification: Notification): void;
+    }
+
+    export interface Notification {
+        title?: string;
+        message?: string;
+        level?: "error" | "warning" | "info" | "success";
+        position?: "tr" | "tl" | "tc" | "br" | "bl" | "bc";
+        autoDismiss?: number;
+        dismissible?: boolean;
+        action?: ActionObject;
+        onAdd?: CallBackFunction;
+        onRemove?: CallBackFunction;
+        uid?: number | string;
+    }
+
+    export interface ActionObject {
+        label: string;
+        callback?: () => void;
+    }
+
+    export interface ContainersStyle {
+        DefaultStyle: React.CSSProperties;
+        tl?: React.CSSProperties;
+        tr?: React.CSSProperties;
+        tc?: React.CSSProperties;
+        bl?: React.CSSProperties;
+        br?: React.CSSProperties;
+        bc?: React.CSSProperties;
+    }
+
+    export interface ItemStyle {
+        DefaultStyle?: React.CSSProperties;
+        success?: React.CSSProperties;
+        error?: React.CSSProperties;
+        warning?: React.CSSProperties;
+        info?: React.CSSProperties;
+    }
+
+    export interface WrapperStyle {
+        DefaultStyle?: React.CSSProperties;
+    }
+
+    export interface Style {
+        Wrapper?: any;
+        Containers?: ContainersStyle;
+        NotificationItem?: ItemStyle;
+        Title?: ItemStyle;
+        MessageWrapper?: WrapperStyle;
+        Dismiss?: ItemStyle;
+        Action?: ItemStyle;
+        ActionWrapper?: WrapperStyle;
+    }
+
+    export interface Attributes {
+        noAnimation?: boolean;
+        ref?: string;
+        style?: Style | boolean;
+    }
+}
+
+
+declare var NotificationSystem: React.ClassicComponentClass<NotificationSystem.Attributes>;
+export = NotificationSystem;
diff --git a/react-notification-system/react-notification-system-tests.ts b/react-notification-system/react-notification-system-tests.ts
index 07cd8ff2c9..908758a7af 100644
--- a/react-notification-system/react-notification-system-tests.ts
+++ b/react-notification-system/react-notification-system-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="react-notification-system.d.ts" />
-/// <reference path="../react/react.d.ts" />
+
+/// <reference types="react" />
 
 import React = require('react');
 import NotificationSystem = require('react-notification-system');
diff --git a/react-notification-system/react-notification-system.d.ts b/react-notification-system/react-notification-system.d.ts
deleted file mode 100644
index 4f51314680..0000000000
--- a/react-notification-system/react-notification-system.d.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-// Type definitions for React Notification System v0.2.6
-// Project: https://www.npmjs.com/package/react-notification-system
-// Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>, Deividas Bakanas <https://github.com/DeividasBakanas>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts" />
-
-declare namespace NotificationSystem {
-
-    import React = __React;
-
-    export interface System extends React.Component<any, any> {
-        addNotification(notification: Notification): Notification;
-        removeNotification(notification: Notification): void;
-        removeNotification(uid: string): void;
-    }
-
-    export interface CallBackFunction {
-        (notification: Notification): void;
-    }
-
-    export interface Notification {
-        title?: string;
-        message?: string;
-        level?: "error" | "warning" | "info" | "success";
-        position?: "tr" | "tl" | "tc" | "br" | "bl" | "bc";
-        autoDismiss?: number;
-        dismissible?: boolean;
-        action?: ActionObject;
-        onAdd?: CallBackFunction;
-        onRemove?: CallBackFunction;
-        uid?: number | string;
-    }
-
-    export interface ActionObject {
-        label: string;
-        callback?: () => void;
-    }
-
-    export interface ContainersStyle {
-        DefaultStyle: React.CSSProperties;
-        tl?: React.CSSProperties;
-        tr?: React.CSSProperties;
-        tc?: React.CSSProperties;
-        bl?: React.CSSProperties;
-        br?: React.CSSProperties;
-        bc?: React.CSSProperties;
-    }
-
-    export interface ItemStyle {
-        DefaultStyle?: React.CSSProperties;
-        success?: React.CSSProperties;
-        error?: React.CSSProperties;
-        warning?: React.CSSProperties;
-        info?: React.CSSProperties;
-    }
-
-    export interface WrapperStyle {
-        DefaultStyle?: React.CSSProperties;
-    }
-
-    export interface Style {
-        Wrapper?: any;
-        Containers?: ContainersStyle;
-        NotificationItem?: ItemStyle;
-        Title?: ItemStyle;
-        MessageWrapper?: WrapperStyle;
-        Dismiss?: ItemStyle;
-        Action?: ItemStyle;
-        ActionWrapper?: WrapperStyle;
-    }
-
-    export interface Attributes {
-        noAnimation?: boolean;
-        ref?: string;
-        style?: Style | boolean;
-    }
-}
-
-
-declare module 'react-notification-system' {
-    var component: __React.ClassicComponentClass<NotificationSystem.Attributes>;
-    export = component;
-}
diff --git a/react-notification-system/tsconfig.json b/react-notification-system/tsconfig.json
new file mode 100644
index 0000000000..61c12e303f
--- /dev/null
+++ b/react-notification-system/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-notification-system-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/react-props-decorators/index.d.ts b/react-props-decorators/index.d.ts
new file mode 100644
index 0000000000..96280fd86b
--- /dev/null
+++ b/react-props-decorators/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for react-props-decorators 0.1.0
+// Project: https://github.com/popkirby/react-props-decorators
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react" />
+
+
+import * as React from 'react';
+
+export interface ClassDecorator {
+    <TFunction extends Function>(target: TFunction): TFunction | void;
+}
+
+declare var propTypes: (map: React.ValidationMap<any>) => ClassDecorator;
+declare var defaultProps: (defaultProps: any) => ClassDecorator;
+
+export {
+propTypes,
+defaultProps
+}
diff --git a/react-props-decorators/react-props-decorators-tests.ts b/react-props-decorators/react-props-decorators-tests.ts
index 33691834c3..562d4f3d12 100644
--- a/react-props-decorators/react-props-decorators-tests.ts
+++ b/react-props-decorators/react-props-decorators-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="react-props-decorators.d.ts" />
-/// <reference path="../react/react.d.ts" />
+
+/// <reference types="react" />
 
 import * as React from 'react';
 import { propTypes, defaultProps } from 'react-props-decorators';
diff --git a/react-props-decorators/react-props-decorators.d.ts b/react-props-decorators/react-props-decorators.d.ts
deleted file mode 100644
index c5233af400..0000000000
--- a/react-props-decorators/react-props-decorators.d.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-// Type definitions for react-props-decorators 0.1.0
-// Project: https://github.com/popkirby/react-props-decorators
-// Definitions by: Qubo <https://github.com/tkqubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts" />
-
-declare module "react-props-decorators" {
-    import * as React from 'react';
-
-    export interface ClassDecorator {
-        <TFunction extends Function>(target:TFunction): TFunction|void;
-    }
-
-    var propTypes: (map: React.ValidationMap<any>) => ClassDecorator;
-    var defaultProps: (defaultProps: any) => ClassDecorator;
-
-    export {
-        propTypes,
-        defaultProps
-    }
-}
-
diff --git a/react-props-decorators/tsconfig.json b/react-props-decorators/tsconfig.json
new file mode 100644
index 0000000000..e6f5e599f3
--- /dev/null
+++ b/react-props-decorators/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "experimentalDecorators": true,
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-props-decorators-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/react-redux/index.d.ts b/react-redux/index.d.ts
new file mode 100644
index 0000000000..5c2592bf09
--- /dev/null
+++ b/react-redux/index.d.ts
@@ -0,0 +1,96 @@
+// Type definitions for react-redux 4.4.0
+// Project: https://github.com/rackt/react-redux
+// Definitions by: Qubo <https://github.com/tkqubo>, Sean Kelley <https://github.com/seansfkelley>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react" />
+/// <reference types="redux" />
+
+import { ComponentClass, Component, StatelessComponent, ReactNode } from 'react';
+import { Store, Dispatch, ActionCreator } from 'redux';
+
+interface ComponentDecorator<TOriginalProps, TOwnProps> {
+    (component: ComponentClass<TOriginalProps> | StatelessComponent<TOriginalProps>): ComponentClass<TOwnProps>;
+}
+
+/**
+ * Decorator that infers the type from the original component
+ *
+ * Can't use the above decorator because it would default the type to {}
+ */
+export interface InferableComponentDecorator {
+    <P, TComponentConstruct extends (ComponentClass<P> | StatelessComponent<P>)>(component: TComponentConstruct): TComponentConstruct;
+}
+
+/**
+ * Connects a React component to a Redux store.
+ *
+ * - Without arguments, just wraps the component, without changing the behavior / props
+ *
+ * - If 2 params are passed (3rd param, mergeProps, is skipped), default behavior
+ * is to override ownProps (as stated in the docs), so what remains is everything that's
+ * not a state or dispatch prop
+ *
+ * - When 3rd param is passed, we don't know if ownProps propagate and whether they
+ * should be valid component props, because it depends on mergeProps implementation.
+ * As such, it is the user's responsibility to extend ownProps interface from state or
+ * dispatch props or both when applicable
+ *
+ * @param mapStateToProps
+ * @param mapDispatchToProps
+ * @param mergeProps
+ * @param options
+ */
+export declare function connect(): InferableComponentDecorator;
+
+export declare function connect<TStateProps, TDispatchProps, TOwnProps>(
+    mapStateToProps: MapStateToProps<TStateProps, TOwnProps>,
+    mapDispatchToProps?: MapDispatchToPropsFunction<TDispatchProps, TOwnProps> | MapDispatchToPropsObject
+): ComponentDecorator<TStateProps & TDispatchProps, TOwnProps>;
+
+export declare function connect<TStateProps, TDispatchProps, TOwnProps>(
+    mapStateToProps: MapStateToProps<TStateProps, TOwnProps>,
+    mapDispatchToProps: MapDispatchToPropsFunction<TDispatchProps, TOwnProps> | MapDispatchToPropsObject,
+    mergeProps: MergeProps<TStateProps, TDispatchProps, TOwnProps>,
+    options?: Options
+): ComponentDecorator<TStateProps & TDispatchProps, TOwnProps>;
+
+interface MapStateToProps<TStateProps, TOwnProps> {
+    (state: any, ownProps?: TOwnProps): TStateProps;
+}
+
+interface MapDispatchToPropsFunction<TDispatchProps, TOwnProps> {
+    (dispatch: Dispatch, ownProps?: TOwnProps): TDispatchProps;
+}
+
+interface MapDispatchToPropsObject {
+    [name: string]: ActionCreator;
+}
+
+interface MergeProps<TStateProps, TDispatchProps, TOwnProps> {
+    (stateProps: TStateProps, dispatchProps: TDispatchProps, ownProps: TOwnProps): TStateProps & TDispatchProps;
+}
+
+interface Options {
+    /**
+     * If true, implements shouldComponentUpdate and shallowly compares the result of mergeProps,
+     * preventing unnecessary updates, assuming that the component is a “pure” component
+     * and does not rely on any input or state other than its props and the selected Redux store’s state.
+     * Defaults to true.
+     * @default true
+     */
+    pure: boolean;
+}
+
+export interface ProviderProps {
+    /**
+     * The single Redux store in your application.
+     */
+    store?: Store;
+    children?: ReactNode;
+}
+
+/**
+ * Makes the Redux store available to the connect() calls in the component hierarchy below.
+ */
+export declare class Provider extends Component<ProviderProps, {}> { }
diff --git a/react-redux/react-redux-2.1.2-tests.tsx b/react-redux/react-redux-2.1.2-tests.tsx
index cb791a3d8e..e7942c154f 100644
--- a/react-redux/react-redux-2.1.2-tests.tsx
+++ b/react-redux/react-redux-2.1.2-tests.tsx
@@ -1,9 +1,4 @@
-/// <reference path="react-redux-2.1.2.d.ts" />
-/// <reference path="../react/react.d.ts"/>
-/// <reference path="../react/react-dom.d.ts"/>
-/// <reference path="../redux/redux.d.ts" />
-/// <reference path="../react-router/react-router-0.13.3.d.ts" />
-/// <reference path="../object-assign/object-assign.d.ts" />
+/// <reference types="redux" />
 
 import { Component, ReactElement } from 'react';
 import * as React from 'react';
diff --git a/react-redux/react-redux-2.1.2.d.ts b/react-redux/react-redux-2.1.2.d.ts
index fa67b1b2e9..c50fe04a47 100644
--- a/react-redux/react-redux-2.1.2.d.ts
+++ b/react-redux/react-redux-2.1.2.d.ts
@@ -3,47 +3,47 @@
 // Definitions by: Qubo <https://github.com/tkqubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../react/react.d.ts" />
-/// <reference path="../redux/redux.d.ts" />
+/// <reference types="react" />
+/// <reference types="redux" />
 
-declare module "react-redux" {
-  import { Component } from 'react';
-  import { Store, Dispatch, ActionCreator } from 'redux';
 
-  export class ElementClass extends Component<any, any> { }
-  export interface ClassDecorator {
+import { Component } from 'react';
+import { Store, Dispatch, ActionCreator } from 'redux';
+
+export declare class ElementClass extends Component<any, any> { }
+export interface ClassDecorator {
     <T extends (typeof ElementClass)>(component: T): T
-  }
+}
 
-  /**
-   * Connects a React component to a Redux store.
-   * @param mapStateToProps
-   * @param mapDispatchToProps
-   * @param mergeProps
-   * @param options
-     */
-  export function connect(mapStateToProps?: MapStateToProps,
-                          mapDispatchToProps?: MapDispatchToPropsFunction|MapDispatchToPropsObject,
-                          mergeProps?: MergeProps,
-                          options?: Options): ClassDecorator;
+/**
+ * Connects a React component to a Redux store.
+ * @param mapStateToProps
+ * @param mapDispatchToProps
+ * @param mergeProps
+ * @param options
+   */
+export declare function connect(mapStateToProps?: MapStateToProps,
+    mapDispatchToProps?: MapDispatchToPropsFunction | MapDispatchToPropsObject,
+    mergeProps?: MergeProps,
+    options?: Options): ClassDecorator;
 
-  interface MapStateToProps {
+interface MapStateToProps {
     (state: any, ownProps?: any): any;
-  }
+}
 
-  interface MapDispatchToPropsFunction {
+interface MapDispatchToPropsFunction {
     (dispatch: Dispatch, ownProps?: any): any;
-  }
+}
 
-  interface MapDispatchToPropsObject {
+interface MapDispatchToPropsObject {
     [name: string]: ActionCreator;
-  }
+}
 
-  interface MergeProps {
+interface MergeProps {
     (stateProps: any, dispatchProps: any, ownProps: any): any;
-  }
+}
 
-  interface Options {
+interface Options {
     /**
      * If true, implements shouldComponentUpdate and shallowly compares the result of mergeProps,
      * preventing unnecessary updates, assuming that the component is a “pure” component
@@ -52,18 +52,17 @@ declare module "react-redux" {
      * @default true
      */
     pure: boolean;
-  }
+}
 
-  export interface Property {
+export interface Property {
     /**
      * The single Redux store in your application.
      */
     store?: Store;
     children?: Function;
-  }
-
-  /**
-   * Makes the Redux store available to the connect() calls in the component hierarchy below.
-   */
-  export class Provider extends Component<Property, {}> { }
 }
+
+/**
+ * Makes the Redux store available to the connect() calls in the component hierarchy below.
+ */
+export declare class Provider extends Component<Property, {}> { }
diff --git a/react-redux/react-redux-tests.tsx b/react-redux/react-redux-tests.tsx
index d22f3aef46..47bdba76ce 100644
--- a/react-redux/react-redux-tests.tsx
+++ b/react-redux/react-redux-tests.tsx
@@ -1,10 +1,8 @@
-/// <reference path="react-redux.d.ts" />
-/// <reference path="../react/react.d.ts"/>
-/// <reference path="../react/react-dom.d.ts"/>
-/// <reference path="../redux/redux.d.ts" />
-/// <reference path="../history/history.d.ts" />
-/// <reference path="../react-router/react-router.d.ts" />
-/// <reference path="../object-assign/object-assign.d.ts" />
+/// <reference types="react"/>
+/// <reference types="react-dom"/>
+/// <reference types="redux" />
+/// <reference types="history" />
+/// <reference types="react-router" />
 
 import { Component, ReactElement } from 'react';
 import * as React from 'react';
@@ -79,7 +77,7 @@ ReactDOM.render((
 //
 declare var store: Store;
 declare var routerState: RouterState;
-declare var history: HistoryModule.History;
+declare var history: History.History;
 class MyRootComponent extends Component<any, any> {
 
 }
diff --git a/react-redux/react-redux.d.ts b/react-redux/react-redux.d.ts
deleted file mode 100644
index 2e3e69dc68..0000000000
--- a/react-redux/react-redux.d.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-// Type definitions for react-redux 4.4.0
-// Project: https://github.com/rackt/react-redux
-// Definitions by: Qubo <https://github.com/tkqubo>, Sean Kelley <https://github.com/seansfkelley>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts" />
-/// <reference path="../redux/redux.d.ts" />
-
-declare module "react-redux" {
-  import { ComponentClass, Component, StatelessComponent, ReactNode } from 'react';
-  import { Store, Dispatch, ActionCreator } from 'redux';
-
-  interface ComponentDecorator<TOriginalProps, TOwnProps> {
-    (component: ComponentClass<TOriginalProps>|StatelessComponent<TOriginalProps>): ComponentClass<TOwnProps>;
-  }
-
-  /**
-   * Decorator that infers the type from the original component
-   *
-   * Can't use the above decorator because it would default the type to {}
-   */
-  export interface InferableComponentDecorator {
-    <P, TComponentConstruct extends (ComponentClass<P>|StatelessComponent<P>)>(component: TComponentConstruct): TComponentConstruct;
-  }
-
-  /**
-   * Connects a React component to a Redux store.
-   *
-   * - Without arguments, just wraps the component, without changing the behavior / props
-   *
-   * - If 2 params are passed (3rd param, mergeProps, is skipped), default behavior
-   * is to override ownProps (as stated in the docs), so what remains is everything that's
-   * not a state or dispatch prop
-   *
-   * - When 3rd param is passed, we don't know if ownProps propagate and whether they
-   * should be valid component props, because it depends on mergeProps implementation.
-   * As such, it is the user's responsibility to extend ownProps interface from state or
-   * dispatch props or both when applicable
-   *
-   * @param mapStateToProps
-   * @param mapDispatchToProps
-   * @param mergeProps
-   * @param options
-   */
-  export function connect(): InferableComponentDecorator;
-
-  export function connect<TStateProps, TDispatchProps, TOwnProps>(
-    mapStateToProps: MapStateToProps<TStateProps, TOwnProps>,
-    mapDispatchToProps?: MapDispatchToPropsFunction<TDispatchProps, TOwnProps>|MapDispatchToPropsObject
-  ): ComponentDecorator<TStateProps & TDispatchProps, TOwnProps>;
-
-  export function connect<TStateProps, TDispatchProps, TOwnProps>(
-    mapStateToProps: MapStateToProps<TStateProps, TOwnProps>,
-    mapDispatchToProps: MapDispatchToPropsFunction<TDispatchProps, TOwnProps>|MapDispatchToPropsObject,
-    mergeProps: MergeProps<TStateProps, TDispatchProps, TOwnProps>,
-    options?: Options
-  ): ComponentDecorator<TStateProps & TDispatchProps, TOwnProps>;
-
-  interface MapStateToProps<TStateProps, TOwnProps> {
-    (state: any, ownProps?: TOwnProps): TStateProps;
-  }
-
-  interface MapDispatchToPropsFunction<TDispatchProps, TOwnProps> {
-    (dispatch: Dispatch, ownProps?: TOwnProps): TDispatchProps;
-  }
-
-  interface MapDispatchToPropsObject {
-    [name: string]: ActionCreator;
-  }
-
-  interface MergeProps<TStateProps, TDispatchProps, TOwnProps> {
-    (stateProps: TStateProps, dispatchProps: TDispatchProps, ownProps: TOwnProps): TStateProps & TDispatchProps;
-  }
-
-  interface Options {
-    /**
-     * If true, implements shouldComponentUpdate and shallowly compares the result of mergeProps,
-     * preventing unnecessary updates, assuming that the component is a “pure” component
-     * and does not rely on any input or state other than its props and the selected Redux store’s state.
-     * Defaults to true.
-     * @default true
-     */
-    pure: boolean;
-  }
-
-  export interface ProviderProps {
-    /**
-     * The single Redux store in your application.
-     */
-    store?: Store;
-    children?: ReactNode;
-  }
-
-  /**
-   * Makes the Redux store available to the connect() calls in the component hierarchy below.
-   */
-  export class Provider extends Component<ProviderProps, {}> { }
-}
diff --git a/react-redux/tsconfig.json b/react-redux/tsconfig.json
new file mode 100644
index 0000000000..bddd1f1fa9
--- /dev/null
+++ b/react-redux/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "files": [
+        "index.d.ts",
+        "react-redux-tests.tsx"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "experimentalDecorators": true,
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/react-router-bootstrap/index.d.ts b/react-router-bootstrap/index.d.ts
new file mode 100644
index 0000000000..b4b36006ec
--- /dev/null
+++ b/react-router-bootstrap/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for react-router-bootstrap
+// Project: https://github.com/react-bootstrap/react-router-bootstrap
+// Definitions by: Vincent Lesierse <https://github.com/vlesierse>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react"/>
+/// <reference types="react-router"/>
+
+declare namespace ReactRouterBootstrap {
+    interface LinkContainerProps extends ReactRouter.LinkProps {
+        disabled?: boolean
+    }
+    interface LinkContainer extends React.ComponentClass<LinkContainerProps> {}
+    interface LinkContainerElement extends React.ReactElement<LinkContainerProps> {}
+    const LinkContainer: LinkContainer
+
+    const IndexLinkContainer: LinkContainer
+}
+
+declare module "react-router-bootstrap/lib/LinkContainer" {
+
+    export default ReactRouterBootstrap.LinkContainer
+
+}
+
+declare module "react-router-bootstrap/lib/IndexLinkContainer" {
+
+    export default ReactRouterBootstrap.IndexLinkContainer
+
+}
+
+declare module "react-router-bootstrap" {
+
+    import LinkContainer from "react-router-bootstrap/lib/LinkContainer"
+    
+    import IndexLinkContainer from "react-router-bootstrap/lib/IndexLinkContainer"
+
+    export {
+        LinkContainer,
+        IndexLinkContainer
+    }
+
+}
diff --git a/react-router-bootstrap/react-router-bootstrap-tests.tsx b/react-router-bootstrap/react-router-bootstrap-tests.tsx
index 0211e97e7e..d4f8733c03 100644
--- a/react-router-bootstrap/react-router-bootstrap-tests.tsx
+++ b/react-router-bootstrap/react-router-bootstrap-tests.tsx
@@ -1,8 +1,7 @@
 // React-Router-Bootstrap Test
 // ================================================================================
-///<reference path="../react/react.d.ts"/>
-///<reference path="../react-bootstrap/react-bootstrap.d.ts"/>
-///<reference path="react-router-bootstrap.d.ts"/>
+///<reference types="react"/>
+///<reference types="react-bootstrap"/>
 
 // Imports
 // --------------------------------------------------------------------------------
diff --git a/react-router-bootstrap/react-router-bootstrap.d.ts b/react-router-bootstrap/react-router-bootstrap.d.ts
deleted file mode 100644
index a1724f5aae..0000000000
--- a/react-router-bootstrap/react-router-bootstrap.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// Type definitions for react-router-bootstrap
-// Project: https://github.com/react-bootstrap/react-router-bootstrap
-// Definitions by: Vincent Lesierse <https://github.com/vlesierse>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../react/react.d.ts"/>
-///<reference path="../react-router/react-router.d.ts"/>
-
-declare namespace ReactRouterBootstrap {
-    // Import React
-    import React = __React;
-
-    interface LinkContainerProps extends ReactRouter.LinkProps {
-        disabled?: boolean
-    }
-    interface LinkContainer extends React.ComponentClass<LinkContainerProps> {}
-    interface LinkContainerElement extends React.ReactElement<LinkContainerProps> {}
-    const LinkContainer: LinkContainer
-
-    const IndexLinkContainer: LinkContainer
-}
-
-declare module "react-router-bootstrap/lib/LinkContainer" {
-
-    export default ReactRouterBootstrap.LinkContainer
-
-}
-
-declare module "react-router-bootstrap/lib/IndexLinkContainer" {
-
-    export default ReactRouterBootstrap.IndexLinkContainer
-
-}
-
-declare module "react-router-bootstrap" {
-
-    import LinkContainer from "react-router-bootstrap/lib/LinkContainer"
-    
-    import IndexLinkContainer from "react-router-bootstrap/lib/IndexLinkContainer"
-
-    export {
-        LinkContainer,
-        IndexLinkContainer
-    }
-
-}
diff --git a/react-router-bootstrap/tsconfig.json b/react-router-bootstrap/tsconfig.json
new file mode 100644
index 0000000000..cc2258ac83
--- /dev/null
+++ b/react-router-bootstrap/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "preserve",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-router-bootstrap-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/react-router-redux/index.d.ts b/react-router-redux/index.d.ts
new file mode 100644
index 0000000000..78c9f70c6c
--- /dev/null
+++ b/react-router-redux/index.d.ts
@@ -0,0 +1,60 @@
+// Type definitions for react-router-redux v4.0.0
+// Project: https://github.com/rackt/react-router-redux
+// Definitions by: Isman Usoh <http://github.com/isman-usoh>, Noah Shipley <https://github.com/noah79>, Dimitri Rosenberg <https://github.com/rosendi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="redux" />
+/// <reference types="react-router"/>
+/// <reference types="history"/>
+
+export = ReactRouterRedux;
+
+declare namespace ReactRouterRedux {
+    import R = Redux;
+
+    const CALL_HISTORY_METHOD: string;
+    const LOCATION_CHANGE: string;
+
+    const push: PushAction;
+    const replace: ReplaceAction;
+    const go: GoAction;
+    const goBack: GoForwardAction;
+    const goForward: GoBackAction;
+    const routerActions: RouteActions;
+
+    type LocationDescriptor = History.Location | History.Path;
+    type PushAction = (nextLocation: LocationDescriptor) => RouterAction;
+    type ReplaceAction = (nextLocation: LocationDescriptor) => RouterAction;
+    type GoAction = (n: number) => RouterAction;
+    type GoForwardAction = () => RouterAction;
+    type GoBackAction = () => RouterAction;
+
+    type RouterAction = {
+        type: string
+        payload?: any
+    }
+    
+    interface RouteActions {
+        push: PushAction;
+        replace: ReplaceAction;
+        go: GoAction;
+        goForward: GoForwardAction;
+        goBack: GoBackAction;
+    }
+    interface ReactRouterReduxHistory extends History.History {
+        unsubscribe(): void;
+    }
+    
+    interface DefaultSelectLocationState extends Function {
+        (state: any): any;
+    }
+
+    interface SyncHistoryWithStoreOptions {
+        selectLocationState?: DefaultSelectLocationState;
+        adjustUrlOnReplay?: boolean;
+    }
+
+    function routerReducer(state?: any, options?: any): R.Reducer;
+    function syncHistoryWithStore(history: History.History, store: R.Store, options?: SyncHistoryWithStoreOptions): ReactRouterReduxHistory;
+    function routerMiddleware(history: History.History): R.Middleware;
+}
diff --git a/react-router-redux/react-router-redux-2.x-tests.ts b/react-router-redux/react-router-redux-2.x-tests.ts
index 9b3d59fbb1..b92af315b2 100644
--- a/react-router-redux/react-router-redux-2.x-tests.ts
+++ b/react-router-redux/react-router-redux-2.x-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="./react-router-redux-2.x.d.ts" />
-/// <reference path="../redux/redux.d.ts" />
-/// <reference path="../react-router/react-router.d.ts" />
+
+/// <reference types="redux" />
+/// <reference types="react-router" />
 
 
 
diff --git a/react-router-redux/react-router-redux-2.x.d.ts b/react-router-redux/react-router-redux-2.x.d.ts
index a526208612..fbd788a95b 100644
--- a/react-router-redux/react-router-redux-2.x.d.ts
+++ b/react-router-redux/react-router-redux-2.x.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Isman Usoh <http://github.com/isman-usoh>, Noah Shipley <https://github.com/noah79>, Dimitri Rosenberg <https://github.com/rosendi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../redux/redux.d.ts" />
-/// <reference path="../react-router/react-router.d.ts"/>
+/// <reference types="redux" />
+/// <reference types="react-router"/>
 
 declare namespace ReactRouterRedux {
     import R = Redux;
diff --git a/react-router-redux/react-router-redux-tests.ts b/react-router-redux/react-router-redux-tests.ts
index baaec2a9c5..1d73706c4e 100644
--- a/react-router-redux/react-router-redux-tests.ts
+++ b/react-router-redux/react-router-redux-tests.ts
@@ -1,8 +1,5 @@
-/// <reference path="./react-router-redux.d.ts" />
-/// <reference path="../redux/redux.d.ts" />
-/// <reference path="../react-router/react-router.d.ts" />
-
-
+/// <reference types="redux" />
+/// <reference types="react-router" />
 
 import { createStore, combineReducers, applyMiddleware } from 'redux';
 import { browserHistory } from 'react-router';
diff --git a/react-router-redux/react-router-redux.d.ts b/react-router-redux/react-router-redux.d.ts
deleted file mode 100644
index b2c993132a..0000000000
--- a/react-router-redux/react-router-redux.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-// Type definitions for react-router-redux v4.0.0
-// Project: https://github.com/rackt/react-router-redux
-// Definitions by: Isman Usoh <http://github.com/isman-usoh>, Noah Shipley <https://github.com/noah79>, Dimitri Rosenberg <https://github.com/rosendi>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../redux/redux.d.ts" />
-/// <reference path="../react-router/react-router.d.ts"/>
-
-declare namespace ReactRouterRedux {
-    import R = Redux;
-    import H = HistoryModule;
-
-    const CALL_HISTORY_METHOD: string;
-    const LOCATION_CHANGE: string;
-
-    const push: PushAction;
-    const replace: ReplaceAction;
-    const go: GoAction;
-    const goBack: GoForwardAction;
-    const goForward: GoBackAction;
-    const routerActions: RouteActions;
-
-    type LocationDescriptor = H.Location | H.Path;
-    type PushAction = (nextLocation: LocationDescriptor) => RouterAction;
-    type ReplaceAction = (nextLocation: LocationDescriptor) => RouterAction;
-    type GoAction = (n: number) => RouterAction;
-    type GoForwardAction = () => RouterAction;
-    type GoBackAction = () => RouterAction;
-
-    type RouterAction = {
-        type: string
-        payload?: any
-    }
-    
-    interface RouteActions {
-        push: PushAction;
-        replace: ReplaceAction;
-        go: GoAction;
-        goForward: GoForwardAction;
-        goBack: GoBackAction;
-    }
-    interface ReactRouterReduxHistory extends H.History {
-        unsubscribe(): void;
-    }
-    
-    interface DefaultSelectLocationState extends Function {
-        (state: any): any;
-    }
-
-    interface SyncHistoryWithStoreOptions {
-        selectLocationState?: DefaultSelectLocationState;
-        adjustUrlOnReplay?: boolean;
-    }
-
-    function routerReducer(state?: any, options?: any): R.Reducer;
-    function syncHistoryWithStore(history: H.History, store: R.Store, options?: SyncHistoryWithStoreOptions): ReactRouterReduxHistory;
-    function routerMiddleware(history: H.History): R.Middleware;
-}
-
-declare module "react-router-redux" {
-    export = ReactRouterRedux;
-}
diff --git a/react-router-redux/tsconfig.json b/react-router-redux/tsconfig.json
new file mode 100644
index 0000000000..886f5b6d77
--- /dev/null
+++ b/react-router-redux/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "react-router-redux-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/react-router/history-tests.ts b/react-router/history-tests.ts
deleted file mode 100644
index 92b3794e18..0000000000
--- a/react-router/history-tests.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-/// <reference path="./history.d.ts" />
-
-import { createHistory, createLocation, useBeforeUnload, useQueries, useBasename } from 'history'
-import { getUserConfirmation } from 'history/lib/DOMUtils'
-
-interface Promise<T> {
-    then<TResult>(onfulfilled?: (value: T) => TResult): Promise<TResult>;
-}
-
-let doSomethingAsync: () => Promise<Function>;
-let input = { value: "" };
-
-{
-    let history = createHistory()
-
-    // Listen for changes to the current location. The
-    // listener is called once immediately.
-    let unlisten = history.listen(function(location) {
-        console.log(location.pathname)
-    })
-
-    // When you're finished, stop the listener.
-    unlisten()
-
-    // Push a new entry onto the history stack.
-    history.push('/home')
-
-    // Replace the current entry on the history stack.
-    history.replace('/profile')
-
-    // Push a new entry with state onto the history stack.
-    history.push({
-        pathname: '/about',
-        search: '?the=search',
-        state: { some: 'state' }
-    });
-
-    // Change just the search on an existing location.
-    //history.push({ ...location, search: '?the=other+search' })
-
-    // Go back to the previous history entry. The following
-    // two lines are synonymous.
-    history.go(-1)
-    history.goBack()
-
-    let href = history.createHref('/the/path')
-}
-
-{
-    let history = createHistory()
-
-    // Pushing a path string.
-    history.push('/the/path')
-
-    // Omitting location state when pushing a location descriptor.
-    history.push({ pathname: '/the/path', search: '?the=search' })
-
-    // Extending an existing location object.
-    //history.push({ ...location, search: '?other=search' })
-
-    let location = createLocation('/a/path?a=query', { the: 'state' })
-
-    location = history.createLocation('/a/path?a=query', { the: 'state' })
-}
-
-{
-    let history = createHistory()
-    history.listenBefore(function(location) {
-        if (input.value !== '')
-            return 'Are you sure you want to leave this page?'
-    })
-
-    history.listenBefore(function(location, callback) {
-        doSomethingAsync().then(callback)
-    })
-}
-
-{
-    let history = createHistory({
-        getUserConfirmation(message, callback) {
-            callback(window.confirm(message)) // The default behavior
-        }
-    })
-}
-
-{
-    let history = useBeforeUnload(createHistory)()
-
-    history.listenBeforeUnload(function() {
-        return 'Are you sure you want to leave this page?'
-    })
-}
-
-{
-    let history = useQueries(createHistory)()
-
-    history.listen(function(location) {
-        console.log(location.query)
-    })
-}
-
-{
-    let history = useQueries(createHistory)({
-        parseQueryString: function(queryString) {
-            // TODO: return a parsed version of queryString
-            return {};
-        },
-        stringifyQuery: function(query) {
-            // TODO: return a query string created from query
-            return "";
-        }
-    })
-
-    history.createPath({ pathname: '/the/path', query: { the: 'query' } })
-    history.push({ pathname: '/the/path', query: { the: 'query' } })
-}
-
-{
-    // Run our app under the /base URL.
-    let history = useBasename(createHistory)({
-        basename: '/base'
-    })
-
-    // At the /base/hello/world URL:
-    history.listen(function(location) {
-        console.log(location.pathname) // /hello/world
-        console.log(location.basename) // /base
-    })
-
-    history.createPath('/the/path') // /base/the/path
-    history.push('/the/path') // push /base/the/path
-}
\ No newline at end of file
diff --git a/react-router/history.d.ts b/react-router/history.d.ts
deleted file mode 100644
index 1af2d26993..0000000000
--- a/react-router/history.d.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-// Type definitions for history v2.0.0
-// Project: https://github.com/rackt/history
-// Definitions by: Sergey Buturlakin <https://github.com/sergey-buturlakin>, Nathan Brown <https://github.com/ngbrown>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-declare namespace HistoryModule {
-
-    // types based on https://github.com/rackt/history/blob/master/docs/Terms.md
-
-    type Action = string
-
-    type BeforeUnloadHook = () => string | boolean
-
-    type CreateHistory<T> = (options?: HistoryOptions) => T
-
-    type CreateHistoryEnhancer<T, E> = (createHistory: CreateHistory<T>) => CreateHistory<T & E>
-
-    interface History {
-        listenBefore(hook: TransitionHook): () => void
-        listen(listener: LocationListener): () => void
-        transitionTo(location: Location): void
-        push(path: LocationDescriptor): void
-        replace(path: LocationDescriptor): void
-        go(n: number): void
-        goBack(): void
-        goForward(): void
-        createKey(): LocationKey
-        createPath(path: LocationDescriptor): Path
-        createHref(path: LocationDescriptor): Href
-        createLocation(path?: LocationDescriptor, action?: Action, key?: LocationKey): Location
-
-        /** @deprecated use a location descriptor instead */
-        createLocation(path?: Path, state?: LocationState, action?: Action, key?: LocationKey): Location
-        /** @deprecated use location.key to save state instead */
-        pushState(state: LocationState, path: Path): void
-        /** @deprecated use location.key to save state instead */
-        replaceState(state: LocationState, path: Path): void
-        /** @deprecated use location.key to save state instead */
-        setState(state: LocationState): void
-        /** @deprecated use listenBefore instead */
-        registerTransitionHook(hook: TransitionHook): void
-        /** @deprecated use the callback returned from listenBefore instead */
-        unregisterTransitionHook(hook: TransitionHook): void
-    }
-
-    type HistoryOptions = {
-        getCurrentLocation?: () => Location
-        finishTransition?: (nextLocation: Location) => boolean
-        saveState?: (key: LocationKey, state: LocationState) => void
-        go?: (n: number) => void
-        getUserConfirmation?: (message: string, callback: (result: boolean) => void) => void
-        keyLength?: number
-        queryKey?: string | boolean
-        stringifyQuery?: (obj: any) => string
-        parseQueryString?: (str: string) => any
-        basename?: string
-        entries?: string | [any]
-        current?: number
-    }
-
-    type Href = string
-
-    type Location = {
-        pathname: Pathname
-        search: Search
-        query: Query
-        state: LocationState
-        action: Action
-        key: LocationKey
-        basename?: string
-    }
-
-    type LocationDescriptorObject = {
-        pathname?: Pathname
-        search?: Search
-        query?: Query
-        state?: LocationState
-    }
-
-    type LocationDescriptor = LocationDescriptorObject | Path
-
-    type LocationKey = string
-
-    type LocationListener = (location: Location) => void
-
-    type LocationState = Object
-
-    type Path = string // Pathname + QueryString
-
-    type Pathname = string
-
-    type Query = Object
-
-    type QueryString = string
-
-    type Search = string
-
-    type TransitionHook = (location: Location, callback: (result: any) => void) => any
-
-
-    interface HistoryBeforeUnload {
-        listenBeforeUnload(hook: BeforeUnloadHook): () => void
-    }
-
-    interface HistoryQueries {
-        pushState(state: LocationState, pathname: Pathname | Path, query?: Query): void
-        replaceState(state: LocationState, pathname: Pathname | Path, query?: Query): void
-        createPath(path: Path, query?: Query): Path
-        createHref(path: Path, query?: Query): Href
-    }
-
-
-    // Global usage, without modules, needs the small trick, because lib.d.ts
-    // already has `history` and `History` global definitions:
-    // var createHistory = ((window as any).History as HistoryModule.Module).createHistory;
-    interface Module {
-        createHistory: CreateHistory<History>
-        createHashHistory: CreateHistory<History>
-        createMemoryHistory: CreateHistory<History>
-        createLocation(path?: Path, state?: LocationState, action?: Action, key?: LocationKey): Location
-        useBasename<T>(createHistory: CreateHistory<T>): CreateHistory<T>
-        useBeforeUnload<T>(createHistory: CreateHistory<T>): CreateHistory<T & HistoryBeforeUnload>
-        useQueries<T>(createHistory: CreateHistory<T>): CreateHistory<T & HistoryQueries>
-        actions: {
-            PUSH: string
-            REPLACE: string
-            POP: string
-        }
-    }
-
-}
-
-
-declare module "history/lib/createBrowserHistory" {
-
-    export default function createBrowserHistory(options?: HistoryModule.HistoryOptions): HistoryModule.History
-
-}
-
-
-declare module "history/lib/createHashHistory" {
-
-    export default function createHashHistory(options?: HistoryModule.HistoryOptions): HistoryModule.History
-
-}
-
-
-declare module "history/lib/createMemoryHistory" {
-
-    export default function createMemoryHistory(options?: HistoryModule.HistoryOptions): HistoryModule.History
-
-}
-
-
-declare module "history/lib/createLocation" {
-
-    export default function createLocation(path?: HistoryModule.Path, state?: HistoryModule.LocationState, action?: HistoryModule.Action, key?: HistoryModule.LocationKey): HistoryModule.Location
-
-}
-
-
-declare module "history/lib/useBasename" {
-
-    export default function useBasename<T>(createHistory: HistoryModule.CreateHistory<T>): HistoryModule.CreateHistory<T>
-
-}
-
-
-declare module "history/lib/useBeforeUnload" {
-
-    export default function useBeforeUnload<T>(createHistory: HistoryModule.CreateHistory<T>): HistoryModule.CreateHistory<T & HistoryModule.HistoryBeforeUnload>
-
-}
-
-
-declare module "history/lib/useQueries" {
-
-    export default function useQueries<T>(createHistory: HistoryModule.CreateHistory<T>): HistoryModule.CreateHistory<T & HistoryModule.HistoryQueries>
-
-}
-
-
-declare module "history/lib/actions" {
-
-    export const PUSH: string
-
-    export const REPLACE: string
-
-    export const POP: string
-
-    export default {
-        PUSH,
-        REPLACE,
-        POP
-    }
-
-}
-
-declare module "history/lib/DOMUtils" {
-    export function addEventListener(node: EventTarget, event: string, listener: EventListenerOrEventListenerObject): void;
-    export function removeEventListener(node: EventTarget, event: string, listener: EventListenerOrEventListenerObject): void;
-    export function getHashPath(): string;
-    export function replaceHashPath(path: string): void;
-    export function getWindowPath(): string;
-    export function go(n: number): void;
-    export function getUserConfirmation(message: string, callback: (result: boolean) => void): void;
-    export function supportsHistory(): boolean;
-    export function supportsGoWithoutReloadUsingHash(): boolean;
-}
-
-
-declare module "history" {
-
-    export { default as createHistory } from "history/lib/createBrowserHistory"
-
-    export { default as createHashHistory } from "history/lib/createHashHistory"
-
-    export { default as createMemoryHistory } from "history/lib/createMemoryHistory"
-
-    export { default as createLocation } from "history/lib/createLocation"
-
-    export { default as useBasename } from "history/lib/useBasename"
-
-    export { default as useBeforeUnload } from "history/lib/useBeforeUnload"
-
-    export { default as useQueries } from "history/lib/useQueries"
-
-    import * as Actions from "history/lib/actions"
-
-    export { Actions }
-
-}
diff --git a/react-router/index.d.ts b/react-router/index.d.ts
new file mode 100644
index 0000000000..8098c489fa
--- /dev/null
+++ b/react-router/index.d.ts
@@ -0,0 +1,75 @@
+// Type definitions for react-router v2.0.0
+// Project: https://github.com/rackt/react-router
+// Definitions by: Sergey Buturlakin <https://github.com/sergey-buturlakin>, Yuichi Murata <https://github.com/mrk21>, Václav Ostrožlík <https://github.com/vasek17>, Nathan Brown <https://github.com/ngbrown>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace ReactRouter;
+
+import * as React from 'react';
+
+import Router from "./lib/Router";
+import Link from "./lib/Link";
+import IndexLink from "./lib/IndexLink";
+import IndexRedirect from "./lib/IndexRedirect";
+import IndexRoute from "./lib/IndexRoute";
+import Redirect from "./lib/Redirect";
+import Route from "./lib/Route";
+import * as History from "./lib/History";
+import Lifecycle from "./lib/Lifecycle";
+import RouteContext from "./lib/RouteContext";
+import browserHistory from "./lib/browserHistory";
+import hashHistory from "./lib/hashHistory";
+import useRoutes from "./lib/useRoutes";
+import { createRoutes } from "./lib/RouteUtils";
+import { formatPattern } from "./lib/PatternUtils";
+import RouterContext from "./lib/RouterContext";
+import PropTypes from "./lib/PropTypes";
+import match from "./lib/match";
+import useRouterHistory from "./lib/useRouterHistory";
+import createMemoryHistory from "./lib/createMemoryHistory";
+
+// PlainRoute is defined in the API documented at:
+// https://github.com/rackt/react-router/blob/master/docs/API.md
+// but not included in any of the .../lib modules above.
+export type PlainRoute = Router.PlainRoute;
+
+// The following definitions are also very useful to export
+// because by using these types lots of potential type errors
+// can be exposed:
+export type EnterHook = Router.EnterHook;
+export type LeaveHook = Router.LeaveHook;
+export type ParseQueryString = Router.ParseQueryString;
+export type RedirectFunction = Router.RedirectFunction;
+export type RouteComponentProps<P,R> = Router.RouteComponentProps<P,R>;
+export type RouteHook = Router.RouteHook;
+export type StringifyQuery = Router.StringifyQuery;
+export type RouterListener = Router.RouterListener;
+export type RouterState = Router.RouterState;
+export type HistoryBase = History.HistoryBase;
+export type RouterOnContext = Router.RouterOnContext;
+export type LinkProps = Link.LinkProps;
+
+export {
+    Router,
+    Link,
+    IndexLink,
+    IndexRedirect,
+    IndexRoute,
+    Redirect,
+    Route,
+    History,
+    browserHistory,
+    hashHistory,
+    Lifecycle,
+    RouteContext,
+    useRoutes,
+    createRoutes,
+    formatPattern,
+    RouterContext,
+    PropTypes,
+    match,
+    useRouterHistory,
+    createMemoryHistory
+};
+
+export default Router;
diff --git a/react-router/lib/History.d.ts b/react-router/lib/History.d.ts
new file mode 100644
index 0000000000..660af424b4
--- /dev/null
+++ b/react-router/lib/History.d.ts
@@ -0,0 +1,22 @@
+import Router from './Router';
+import * as H from 'history';
+
+export default History;
+
+export interface HistoryRoutes {
+    listen(listener: Router.RouterListener): Function
+    listenBeforeLeavingRoute(route: Router.PlainRoute, hook: Router.RouteHook): void
+    match(location: H.Location, callback: (error: any, nextState: Router.RouterState, nextLocation: H.Location) => void): void
+    isActive(pathname: H.Pathname, query?: H.Query, indexOnly?: boolean): boolean
+    setRouteLeaveHook(route: Router.PlainRoute, callback: Router.RouteHook): void
+}
+
+export interface HistoryBase extends H.History {
+    routes: Router.PlainRoute[];
+    parseQueryString?: Router.ParseQueryString;
+    stringifyQuery?: Router.StringifyQuery;
+}
+
+export type History = HistoryBase & H.HistoryQueries & HistoryRoutes;
+export declare const browserHistory: History;
+export declare const hashHistory: History;
diff --git a/react-router/lib/IndexLink.d.ts b/react-router/lib/IndexLink.d.ts
new file mode 100644
index 0000000000..56ecf82c1d
--- /dev/null
+++ b/react-router/lib/IndexLink.d.ts
@@ -0,0 +1,5 @@
+import Link from './Link';
+
+declare const IndexLink: Link;
+export default IndexLink;
+
diff --git a/react-router/lib/IndexRedirect.d.ts b/react-router/lib/IndexRedirect.d.ts
new file mode 100644
index 0000000000..41dab299c8
--- /dev/null
+++ b/react-router/lib/IndexRedirect.d.ts
@@ -0,0 +1,17 @@
+import Router from './Router';
+import * as React from 'react';
+import * as H from 'history';
+
+declare const self: self.IndexRedirect;
+type self = self.IndexRedirect;
+export default self;
+
+declare namespace self {
+	interface IndexRedirectProps extends React.Props<self> {
+	    to: Router.RoutePattern;
+	    query?: H.Query;
+	    state?: H.LocationState;
+	}
+	interface IndexRedirectElement extends React.ReactElement<IndexRedirectProps> { }
+	interface IndexRedirect extends React.ComponentClass<self.IndexRedirectProps> { }
+}
diff --git a/react-router/lib/IndexRoute.d.ts b/react-router/lib/IndexRoute.d.ts
new file mode 100644
index 0000000000..b11b16d0e2
--- /dev/null
+++ b/react-router/lib/IndexRoute.d.ts
@@ -0,0 +1,20 @@
+import * as React from 'react';
+import Router from './Router';
+import * as H from 'history';
+
+declare const self: self.IndexRoute;
+type self = self.IndexRoute;
+export default self;
+
+declare namespace self {
+    interface IndexRouteProps extends React.Props<IndexRoute> {
+        component?: Router.RouteComponent;
+        components?: Router.RouteComponents;
+        getComponent?: (location: H.Location, cb: (error: any, component?: Router.RouteComponent) => void) => void;
+        getComponents?: (location: H.Location, cb: (error: any, components?: Router.RouteComponents) => void) => void;
+        onEnter?: Router.EnterHook;
+        onLeave?: Router.LeaveHook;
+    }
+    interface IndexRoute extends React.ComponentClass<IndexRouteProps> { }
+    interface IndexRouteElement extends React.ReactElement<IndexRouteProps> { }
+}
\ No newline at end of file
diff --git a/react-router/lib/Lifecycle.d.ts b/react-router/lib/Lifecycle.d.ts
new file mode 100644
index 0000000000..3db1e726b4
--- /dev/null
+++ b/react-router/lib/Lifecycle.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+
+declare const Lifecycle: React.Mixin<any, any>;
+export default Lifecycle;
diff --git a/react-router/lib/Link.d.ts b/react-router/lib/Link.d.ts
new file mode 100644
index 0000000000..2375724ebc
--- /dev/null
+++ b/react-router/lib/Link.d.ts
@@ -0,0 +1,22 @@
+import * as React from 'react';
+import Router from './Router';
+import * as H from 'history';
+
+declare const Link: Link;
+type Link = Link.Link;
+
+export default Link;
+
+declare namespace Link {
+    interface LinkProps extends React.HTMLAttributes, React.Props<Link> {
+        activeStyle?: React.CSSProperties;
+        activeClassName?: string;
+        onlyActiveOnIndex?: boolean;
+        to: Router.RoutePattern | H.LocationDescriptor;
+        query?: H.Query;
+        state?: H.LocationState;
+    }
+
+    interface Link extends React.ComponentClass<LinkProps> {}
+    interface LinkElement extends React.ReactElement<LinkProps> {}
+}
diff --git a/react-router/lib/PatternUtils.d.ts b/react-router/lib/PatternUtils.d.ts
new file mode 100644
index 0000000000..50e90f6e49
--- /dev/null
+++ b/react-router/lib/PatternUtils.d.ts
@@ -0,0 +1 @@
+export function formatPattern(pattern: string, params: {}): string;
diff --git a/react-router/lib/PropTypes.d.ts b/react-router/lib/PropTypes.d.ts
new file mode 100644
index 0000000000..bbd6431070
--- /dev/null
+++ b/react-router/lib/PropTypes.d.ts
@@ -0,0 +1,19 @@
+import * as React from 'react';
+
+export function falsy(props: any, propName: string, componentName: string): Error;
+export const history: React.Requireable<any>;
+export const location: React.Requireable<any>;
+export const component: React.Requireable<any>;
+export const components: React.Requireable<any>;
+export const route: React.Requireable<any>;
+export const routes: React.Requireable<any>;
+
+export default {
+    falsy,
+    history,
+    location,
+    component,
+    components,
+    route
+};
+
diff --git a/react-router/lib/Redirect.d.ts b/react-router/lib/Redirect.d.ts
new file mode 100644
index 0000000000..e09b576d53
--- /dev/null
+++ b/react-router/lib/Redirect.d.ts
@@ -0,0 +1,19 @@
+import * as React from 'react';
+import Router from './Router';
+import * as H from 'history';
+
+declare const self: self.Redirect;
+type self = typeof self;
+export default self;
+
+declare namespace self {
+    interface RedirectProps extends React.Props<Redirect> {
+        path?: Router.RoutePattern;
+        from?: Router.RoutePattern; // alias for path
+        to: Router.RoutePattern;
+        query?: H.Query;
+        state?: H.LocationState;
+    }
+    interface Redirect extends React.ComponentClass<RedirectProps> { }
+    interface RedirectElement extends React.ReactElement<RedirectProps> { }
+}
diff --git a/react-router/lib/Route.d.ts b/react-router/lib/Route.d.ts
new file mode 100644
index 0000000000..682f74f1ac
--- /dev/null
+++ b/react-router/lib/Route.d.ts
@@ -0,0 +1,25 @@
+import * as React from 'react';
+import Router from './Router';
+import { Location } from 'history';
+
+declare const self: self.Route;
+type self = self.Route;
+export default self;
+
+declare namespace self {
+
+    interface RouteProps extends React.Props<Route> {
+        path?: Router.RoutePattern;
+        component?: Router.RouteComponent;
+        components?: Router.RouteComponents;
+        getComponent?: (location: Location, cb: (error: any, component?: Router.RouteComponent) => void) => void;
+        getComponents?: (location: Location, cb: (error: any, components?: Router.RouteComponents) => void) => void;
+        onEnter?: Router.EnterHook;
+        onLeave?: Router.LeaveHook;
+        onChange?: Router.ChangeHook;
+        getIndexRoute?: (location: Location, cb: (error: any, indexRoute: Router.RouteConfig) => void) => void;
+        getChildRoutes?: (location: Location, cb: (error: any, childRoutes: Router.RouteConfig) => void) => void;
+    }
+    interface Route extends React.ComponentClass<RouteProps> {}
+    interface RouteElement extends React.ReactElement<RouteProps> {}
+}
\ No newline at end of file
diff --git a/react-router/lib/RouteContext.d.ts b/react-router/lib/RouteContext.d.ts
new file mode 100644
index 0000000000..c35ab92a80
--- /dev/null
+++ b/react-router/lib/RouteContext.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+
+declare const RouteContext: React.Mixin<any, any>
+export default RouteContext;
+
diff --git a/react-router/lib/RouteUtils.d.ts b/react-router/lib/RouteUtils.d.ts
new file mode 100644
index 0000000000..7065056ff5
--- /dev/null
+++ b/react-router/lib/RouteUtils.d.ts
@@ -0,0 +1,8 @@
+import * as React from 'react';
+import Router from './Router';
+
+type E = React.ReactElement<any>;
+export function isReactChildren(object: E | E[]): boolean;
+export function createRouteFromReactElement(element: E): Router.PlainRoute;
+export function createRoutesFromReactChildren(children: E | E[], parentRoute: Router.PlainRoute): Router.PlainRoute[];
+export function createRoutes(routes: Router.RouteConfig): Router.PlainRoute[];
diff --git a/react-router/lib/Router.d.ts b/react-router/lib/Router.d.ts
new file mode 100644
index 0000000000..c6eb38379d
--- /dev/null
+++ b/react-router/lib/Router.d.ts
@@ -0,0 +1,89 @@
+import * as React from 'react';
+import {
+    QueryString, Query,
+    Location, LocationDescriptor, LocationState,
+    History,
+    Pathname, Path } from 'history';
+
+declare const Router: Router;
+interface Router extends React.ComponentClass<Router.RouterProps> { }
+
+export default Router;
+
+// types based on https://github.com/rackt/react-router/blob/master/docs/Glossary.md
+
+declare namespace Router {
+    type RouteConfig = React.ReactNode | PlainRoute | PlainRoute[];
+    type RoutePattern = string;
+    type RouteComponents = { [key: string]: RouteComponent };
+
+    type ParseQueryString = (queryString: QueryString) => Query;
+    type StringifyQuery = (queryObject: Query) => QueryString;
+
+    type Component = React.ReactType;
+    type RouteComponent = Component;
+
+    type EnterHook = (nextState: RouterState, replace: RedirectFunction, callback?: Function) => void;
+    type LeaveHook = () => void;
+    type ChangeHook = (prevState: RouterState, nextState: RouterState, replace: RedirectFunction, callback: Function) => void;
+    type RouteHook = (nextLocation?: Location) => any;
+
+    type Params = { [param: string]: string };
+
+    type RouterListener = (error: Error, nextState: RouterState) => void;
+
+
+    interface RedirectFunction {
+        (location: LocationDescriptor): void;
+        /**
+        * @deprecated `replaceState(state, pathname, query) is deprecated; Use `replace(location)` with a location descriptor instead. http://tiny.cc/router-isActivedeprecated
+        */
+        (state: LocationState, pathname: Pathname | Path, query?: Query): void;
+    }
+
+    interface RouterState {
+        location: Location;
+        routes: PlainRoute[];
+        params: Params;
+        components: RouteComponent[];
+    }
+
+	interface RouterProps extends React.Props<Router> {
+	    history?: History;
+	    routes?: RouteConfig; // alias for children
+	    createElement?: (component: RouteComponent, props: Object) => any;
+	    onError?: (error: any) => any;
+	    onUpdate?: () => any;
+	    parseQueryString?: ParseQueryString;
+	    stringifyQuery?: StringifyQuery;
+	}
+
+    interface PlainRoute {
+        path?: RoutePattern;
+        component?: RouteComponent;
+        components?: RouteComponents;
+        getComponent?: (location: Location, cb: (error: any, component?: RouteComponent) => void) => void;
+        getComponents?: (location: Location, cb: (error: any, components?: RouteComponents) => void) => void;
+        onEnter?: EnterHook;
+        onLeave?: LeaveHook;
+        indexRoute?: PlainRoute;
+        getIndexRoute?: (location: Location, cb: (error: any, indexRoute: RouteConfig) => void) => void;
+        childRoutes?: PlainRoute[];
+        getChildRoutes?: (location: Location, cb: (error: any, childRoutes: RouteConfig) => void) => void;
+    }
+
+    interface RouteComponentProps<P, R> {
+        history?: History;
+        location?: Location;
+        params?: P;
+        route?: PlainRoute;
+        routeParams?: R;
+        routes?: PlainRoute[];
+        children?: React.ReactElement<any>;
+    }
+
+    interface RouterOnContext extends History {
+        setRouteLeaveHook(route: PlainRoute, hook?: RouteHook): () => void;
+        isActive(pathOrLoc: LocationDescriptor, indexOnly?: boolean): boolean;
+    }
+}
diff --git a/react-router/lib/RouterContext.d.ts b/react-router/lib/RouterContext.d.ts
new file mode 100644
index 0000000000..b6eab5831c
--- /dev/null
+++ b/react-router/lib/RouterContext.d.ts
@@ -0,0 +1,25 @@
+import * as React from 'react';
+import * as H from 'history';
+import Router from './Router';
+
+declare const self: self.RouterContext;
+type self = self.RouterContext;
+export default self;
+
+declare namespace self {
+    interface RouterContextProps extends React.Props<RouterContext> {
+        history?: H.History;
+        router: Router;
+        createElement: (component: Router.RouteComponent, props: Object) => any;
+        location: H.Location;
+        routes: Router.RouteConfig;
+        params: Router.Params;
+        components?: Router.RouteComponent[];
+    }
+    interface RouterContext extends React.ComponentClass<RouterContextProps> {}
+    interface RouterContextElement extends React.ReactElement<RouterContextProps> {
+        history?: H.History;
+        location: H.Location;
+        router?: Router;
+    }
+}
\ No newline at end of file
diff --git a/react-router/lib/browserHistory.d.ts b/react-router/lib/browserHistory.d.ts
new file mode 100644
index 0000000000..e486255b72
--- /dev/null
+++ b/react-router/lib/browserHistory.d.ts
@@ -0,0 +1,3 @@
+import { History } from './History';
+declare const browserHistory: History;
+export default browserHistory;
diff --git a/react-router/lib/createMemoryHistory.d.ts b/react-router/lib/createMemoryHistory.d.ts
new file mode 100644
index 0000000000..5df481bfa1
--- /dev/null
+++ b/react-router/lib/createMemoryHistory.d.ts
@@ -0,0 +1,3 @@
+import * as H from 'history';
+
+export default function createMemoryHistory(options?: H.HistoryOptions): H.History;
\ No newline at end of file
diff --git a/react-router/lib/hashHistory.d.ts b/react-router/lib/hashHistory.d.ts
new file mode 100644
index 0000000000..34b6f7113d
--- /dev/null
+++ b/react-router/lib/hashHistory.d.ts
@@ -0,0 +1,3 @@
+import { History } from './History';
+declare const hashHistory: History;
+export default hashHistory;
diff --git a/react-router/lib/match.d.ts b/react-router/lib/match.d.ts
new file mode 100644
index 0000000000..3a353367ed
--- /dev/null
+++ b/react-router/lib/match.d.ts
@@ -0,0 +1,15 @@
+import * as H from 'history';
+import Router from './Router';
+
+interface MatchArgs {
+    routes?: Router.RouteConfig;
+    history?: H.History;
+    location?: H.Location | string;
+    parseQueryString?: Router.ParseQueryString;
+    stringifyQuery?: Router.StringifyQuery;
+}
+interface MatchState extends Router.RouterState {
+    history: History;
+}
+export default function match(args: MatchArgs, cb: (error: any, nextLocation: H.Location, nextState: MatchState) => void): void;
+
diff --git a/react-router/lib/useRouterHistory.d.ts b/react-router/lib/useRouterHistory.d.ts
new file mode 100644
index 0000000000..d3e043b609
--- /dev/null
+++ b/react-router/lib/useRouterHistory.d.ts
@@ -0,0 +1,7 @@
+import { History, HistoryOptions, HistoryQueries, CreateHistory } from 'history';
+
+interface CreateRouterHistory {
+    (options?: HistoryOptions): History & HistoryQueries;
+}
+
+export default function useRouterHistory<T>(createHistory: CreateHistory<T>): CreateRouterHistory;
diff --git a/react-router/lib/useRoutes.d.ts b/react-router/lib/useRoutes.d.ts
new file mode 100644
index 0000000000..47f47a7c2f
--- /dev/null
+++ b/react-router/lib/useRoutes.d.ts
@@ -0,0 +1,5 @@
+import * as H from 'history';
+import { HistoryRoutes } from './History';
+
+declare function useRoutes<T>(createHistory: H.CreateHistory<T>): H.CreateHistory<T & HistoryRoutes>;
+export default useRoutes;
diff --git a/react-router/react-router-0.13.3.d.ts b/react-router/react-router-0.13.3.d.ts
index 1152a32e8d..3c02dedc54 100644
--- a/react-router/react-router-0.13.3.d.ts
+++ b/react-router/react-router-0.13.3.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Yuichi Murata <https://github.com/mrk21>, Václav Ostrožlík <https://github.com/vasek17>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference path='../react/react.d.ts' />
+///<reference types="react" />
 
 declare namespace ReactRouter {
     import React = __React;
diff --git a/react-router/react-router-1.0.0.d.ts b/react-router/react-router-1.0.0.d.ts
index 07b326f275..63c070d17b 100644
--- a/react-router/react-router-1.0.0.d.ts
+++ b/react-router/react-router-1.0.0.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="../react/react.d.ts" />
+/// <reference types="react" />
 /// <reference path="./history.d.ts"/>
 
 
diff --git a/react-router/react-router-tests.tsx b/react-router/react-router-tests.tsx
index 703ce4a9f6..6da334bffb 100644
--- a/react-router/react-router-tests.tsx
+++ b/react-router/react-router-tests.tsx
@@ -1,17 +1,10 @@
-
-/// <reference path="../react/react.d.ts" />
-/// <reference path="../react/react-dom.d.ts" />
-/// <reference path="./history.d.ts" />
-/// <reference path="./react-router.d.ts" />
-
-
 import * as React from "react"
 import * as ReactDOM from "react-dom"
 
-import { browserHistory, hashHistory, Router, Route, IndexRoute, Link } from "react-router"
+import { browserHistory, hashHistory, createMemoryHistory, Router, Route, IndexRoute, Link, RouterOnContext } from "react-router"
 
 interface MasterContext {
-	router: ReactRouter.RouterOnContext;
+	router: RouterOnContext;
 }
 
 class Master extends React.Component<React.Props<{}>, {}> {
diff --git a/react-router/react-router.d.ts b/react-router/react-router.d.ts
deleted file mode 100644
index 357490e603..0000000000
--- a/react-router/react-router.d.ts
+++ /dev/null
@@ -1,500 +0,0 @@
-// Type definitions for react-router v2.0.0
-// Project: https://github.com/rackt/react-router
-// Definitions by: Sergey Buturlakin <https://github.com/sergey-buturlakin>, Yuichi Murata <https://github.com/mrk21>, Václav Ostrožlík <https://github.com/vasek17>, Nathan Brown <https://github.com/ngbrown>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../react/react.d.ts" />
-/// <reference path="./history.d.ts"/>
-
-
-declare namespace ReactRouter {
-
-    import React = __React
-
-    import H = HistoryModule
-
-    // types based on https://github.com/rackt/react-router/blob/master/docs/Glossary.md
-
-    type Component = React.ReactType
-
-    type EnterHook = (nextState: RouterState, replace: RedirectFunction, callback?: Function) => void
-
-    type LeaveHook = () => void
-    
-    type ChangeHook = (prevState: RouterState, nextState: RouterState, replace: RedirectFunction, callback: Function) => void;
-
-    type Params = { [param: string]: string }
-
-    type ParseQueryString = (queryString: H.QueryString) => H.Query
-
-    interface RedirectFunction {
-        (location: H.LocationDescriptor): void;
-        /**
-        * @deprecated `replaceState(state, pathname, query) is deprecated; Use `replace(location)` with a location descriptor instead. http://tiny.cc/router-isActivedeprecated
-        */
-        (state: H.LocationState, pathname: H.Pathname | H.Path, query?: H.Query): void;
-    }
-
-    type RouteComponent = Component
-
-    // use the following interface in an app code to get access to route param values, history, location...
-    // interface MyComponentProps extends ReactRouter.RouteComponentProps<{}, { id: number }> {}
-    // somewhere in MyComponent
-    // ...
-    //   let id = this.props.routeParams.id
-    // ...
-    //   this.props.history. ...
-    // ...
-    interface RouteComponentProps<P, R> {
-        history?: History
-        location?: H.Location
-        params?: P
-        route?: PlainRoute
-        routeParams?: R
-        routes?: PlainRoute[]
-        children?: React.ReactElement<any>
-    }
-
-    type RouteComponents = { [key: string]: RouteComponent }
-
-    type RouteConfig = React.ReactNode | PlainRoute | PlainRoute[]
-
-    type RouteHook = (nextLocation?: H.Location) => any
-
-    type RoutePattern = string
-
-    type StringifyQuery = (queryObject: H.Query) => H.QueryString
-
-    type RouterListener = (error: Error, nextState: RouterState) => void
-
-    interface RouterState {
-        location: H.Location
-        routes: PlainRoute[]
-        params: Params
-        components: RouteComponent[]
-    }
-
-
-    interface HistoryBase extends H.History {
-        routes: PlainRoute[]
-        parseQueryString?: ParseQueryString
-        stringifyQuery?: StringifyQuery
-    }
-
-    type History = HistoryBase & H.HistoryQueries & HistoryRoutes
-    const browserHistory: History;
-    const hashHistory: History;
-
-    /* components */
-
-    interface RouterProps extends React.Props<Router> {
-        history?: H.History
-        routes?: RouteConfig // alias for children
-        createElement?: (component: RouteComponent, props: Object) => any
-        onError?: (error: any) => any
-        onUpdate?: () => any
-        parseQueryString?: ParseQueryString
-        stringifyQuery?: StringifyQuery
-    }
-    interface Router extends React.ComponentClass<RouterProps> {}
-    interface RouterElement extends React.ReactElement<RouterProps> {}
-    const Router: Router
-
-
-    interface LinkProps extends React.HTMLAttributes, React.Props<Link> {
-        activeStyle?: React.CSSProperties
-        activeClassName?: string
-        onlyActiveOnIndex?: boolean
-        to: RoutePattern | H.LocationDescriptor
-        query?: H.Query
-        state?: H.LocationState
-    }
-    interface Link extends React.ComponentClass<LinkProps> {}
-    interface LinkElement extends React.ReactElement<LinkProps> {}
-    const Link: Link
-
-
-    const IndexLink: Link
-
-
-    interface RouterContextProps extends React.Props<RouterContext> {
-        history?: H.History
-        router: Router
-        createElement: (component: RouteComponent, props: Object) => any
-        location: H.Location
-        routes: RouteConfig
-        params: Params
-        components?: RouteComponent[]
-    }
-    interface RouterContext extends React.ComponentClass<RouterContextProps> {}
-    interface RouterContextElement extends React.ReactElement<RouterContextProps> {
-        history?: H.History
-        location: H.Location
-        router?: Router
-    }
-    const RouterContext: RouterContext
-
-
-    /* components (configuration) */
-
-    interface RouteProps extends React.Props<Route> {
-        path?: RoutePattern
-        component?: RouteComponent
-        components?: RouteComponents
-        getComponent?: (location: H.Location, cb: (error: any, component?: RouteComponent) => void) => void
-        getComponents?: (location: H.Location, cb: (error: any, components?: RouteComponents) => void) => void
-        onEnter?: EnterHook
-        onLeave?: LeaveHook
-        onChange?: ChangeHook
-        getIndexRoute?: (location: H.Location, cb: (error: any, indexRoute: RouteConfig) => void) => void
-        getChildRoutes?: (location: H.Location, cb: (error: any, childRoutes: RouteConfig) => void) => void
-    }
-    interface Route extends React.ComponentClass<RouteProps> {}
-    interface RouteElement extends React.ReactElement<RouteProps> {}
-    const Route: Route
-
-
-    interface PlainRoute {
-        path?: RoutePattern
-        component?: RouteComponent
-        components?: RouteComponents
-        getComponent?: (location: H.Location, cb: (error: any, component?: RouteComponent) => void) => void
-        getComponents?: (location: H.Location, cb: (error: any, components?: RouteComponents) => void) => void
-        onEnter?: EnterHook
-        onLeave?: LeaveHook
-        indexRoute?: PlainRoute
-        getIndexRoute?: (location: H.Location, cb: (error: any, indexRoute: RouteConfig) => void) => void
-        childRoutes?: PlainRoute[]
-        getChildRoutes?: (location: H.Location, cb: (error: any, childRoutes: RouteConfig) => void) => void
-    }
-
-
-    interface RedirectProps extends React.Props<Redirect> {
-        path?: RoutePattern
-        from?: RoutePattern // alias for path
-        to: RoutePattern
-        query?: H.Query
-        state?: H.LocationState
-    }
-    interface Redirect extends React.ComponentClass<RedirectProps> {}
-    interface RedirectElement extends React.ReactElement<RedirectProps> {}
-    const Redirect: Redirect
-
-
-    interface IndexRouteProps extends React.Props<IndexRoute> {
-        component?: RouteComponent
-        components?: RouteComponents
-        getComponent?: (location: H.Location, cb: (error: any, component?: RouteComponent) => void) => void
-        getComponents?: (location: H.Location, cb: (error: any, components?: RouteComponents) => void) => void
-        onEnter?: EnterHook
-        onLeave?: LeaveHook
-    }
-    interface IndexRoute extends React.ComponentClass<IndexRouteProps> {}
-    interface IndexRouteElement extends React.ReactElement<IndexRouteProps> {}
-    const IndexRoute: IndexRoute
-
-
-    interface IndexRedirectProps extends React.Props<IndexRedirect> {
-        to: RoutePattern
-        query?: H.Query
-        state?: H.LocationState
-    }
-    interface IndexRedirect extends React.ComponentClass<IndexRedirectProps> {}
-    interface IndexRedirectElement extends React.ReactElement<IndexRedirectProps> {}
-    const IndexRedirect: IndexRedirect
-
-    interface RouterOnContext extends H.History {
-        setRouteLeaveHook(route: PlainRoute, hook?: RouteHook): () => void;
-        isActive(pathOrLoc: H.LocationDescriptor, indexOnly?: boolean): boolean;
-    }
-
-    /* mixins */
-
-    interface HistoryMixin {
-        history: History
-    }
-    const History: React.Mixin<any, any>
-
-
-    interface LifecycleMixin {
-        routerWillLeave(nextLocation: H.Location): string | boolean
-    }
-    const Lifecycle: React.Mixin<any, any>
-
-
-    const RouteContext: React.Mixin<any, any>
-
-
-    /* utils */
-
-    interface HistoryRoutes {
-        listen(listener: RouterListener): Function
-        listenBeforeLeavingRoute(route: PlainRoute, hook: RouteHook): void
-        match(location: H.Location, callback: (error: any, nextState: RouterState, nextLocation: H.Location) => void): void
-        isActive(pathname: H.Pathname, query?: H.Query, indexOnly?: boolean): boolean
-        setRouteLeaveHook(route: PlainRoute, callback: RouteHook): void
-    }
-
-    function useRoutes<T>(createHistory: HistoryModule.CreateHistory<T>): HistoryModule.CreateHistory<T & HistoryRoutes>
-
-
-    function createRoutes(routes: RouteConfig): PlainRoute[]
-
-
-    interface MatchArgs {
-        routes?: RouteConfig
-        history?: H.History
-        location?: H.Location
-        parseQueryString?: ParseQueryString
-        stringifyQuery?: StringifyQuery
-    }
-    interface MatchState extends RouterState {
-        history: History
-    }
-    function match(args: MatchArgs, cb: (error: any, nextLocation: H.Location, nextState: MatchState) => void): void
-
-}
-
-
-declare module "react-router/lib/Router" {
-
-    export default ReactRouter.Router
-
-}
-
-
-declare module "react-router/lib/Link" {
-
-    export default ReactRouter.Link
-
-}
-
-
-declare module "react-router/lib/IndexLink" {
-
-    export default ReactRouter.IndexLink
-
-}
-
-
-declare module "react-router/lib/IndexRedirect" {
-
-    export default ReactRouter.IndexRedirect
-
-}
-
-
-declare module "react-router/lib/IndexRoute" {
-
-    export default ReactRouter.IndexRoute
-
-}
-
-
-declare module "react-router/lib/Redirect" {
-
-    export default ReactRouter.Redirect
-
-}
-
-
-declare module "react-router/lib/Route" {
-
-    export default ReactRouter.Route
-
-}
-
-
-declare module "react-router/lib/History" {
-
-    export default ReactRouter.History
-
-}
-
-
-declare module "react-router/lib/Lifecycle" {
-
-    export default ReactRouter.Lifecycle
-
-}
-
-
-declare module "react-router/lib/RouteContext" {
-
-    export default ReactRouter.RouteContext
-
-}
-
-
-declare module "react-router/lib/useRoutes" {
-
-    export default ReactRouter.useRoutes
-
-}
-
-declare module "react-router/lib/PatternUtils" {
-
-	export function formatPattern(pattern: string, params: {}): string;
-
-}
-
-declare module "react-router/lib/RouteUtils" {
-
-    type E = __React.ReactElement<any>
-
-    export function isReactChildren(object: E | E[]): boolean
-
-    export function createRouteFromReactElement(element: E): ReactRouter.PlainRoute
-
-    export function createRoutesFromReactChildren(children: E | E[], parentRoute: ReactRouter.PlainRoute): ReactRouter.PlainRoute[]
-
-    export import createRoutes = ReactRouter.createRoutes
-
-}
-
-
-declare module "react-router/lib/RouterContext" {
-
-    export default ReactRouter.RouterContext
-
-}
-
-
-declare module "react-router/lib/PropTypes" {
-
-    import React = __React
-
-    export function falsy(props: any, propName: string, componentName: string): Error;
-
-    export const history: React.Requireable<any>
-
-    export const location: React.Requireable<any>
-
-    export const component: React.Requireable<any>
-
-    export const components: React.Requireable<any>
-
-    export const route: React.Requireable<any>
-
-    export const routes: React.Requireable<any>
-
-    export default {
-        falsy,
-        history,
-        location,
-        component,
-        components,
-        route
-    }
-
-}
-
-declare module "react-router/lib/browserHistory" {
-  export default ReactRouter.browserHistory;
-}
-
-declare module "react-router/lib/hashHistory" {
-  export default ReactRouter.hashHistory;
-}
-
-declare module "react-router/lib/match" {
-
-    export default ReactRouter.match
-
-}
-
-declare module "react-router/lib/useRouterHistory" {
-    interface CreateRouterHistory {
-        (options?: HistoryModule.HistoryOptions): HistoryModule.History & HistoryModule.HistoryQueries;
-    }
-
-    export default function useRouterHistory<T>(createHistory: HistoryModule.CreateHistory<T>): CreateRouterHistory;
-}
-
-
-declare module "react-router" {
-
-    import Router from "react-router/lib/Router"
-
-    import Link from "react-router/lib/Link"
-
-    import IndexLink from "react-router/lib/IndexLink"
-
-    import IndexRedirect from "react-router/lib/IndexRedirect"
-
-    import IndexRoute from "react-router/lib/IndexRoute"
-
-    import Redirect from "react-router/lib/Redirect"
-
-    import Route from "react-router/lib/Route"
-
-    import History from "react-router/lib/History"
-
-    import Lifecycle from "react-router/lib/Lifecycle"
-
-    import RouteContext from "react-router/lib/RouteContext"
-
-    import browserHistory from "react-router/lib/browserHistory"
-
-    import hashHistory from "react-router/lib/hashHistory"
-
-    import useRoutes from "react-router/lib/useRoutes"
-
-    import { createRoutes } from "react-router/lib/RouteUtils"
-
-    import { formatPattern } from "react-router/lib/PatternUtils"
-
-    import RouterContext from "react-router/lib/RouterContext"
-
-    import PropTypes from "react-router/lib/PropTypes"
-
-    import match from "react-router/lib/match"
-
-    import useRouterHistory from "react-router/lib/useRouterHistory";
-
-    // PlainRoute is defined in the API documented at:
-    // https://github.com/rackt/react-router/blob/master/docs/API.md
-    // but not included in any of the .../lib modules above.
-    export type PlainRoute = ReactRouter.PlainRoute
-
-    // The following definitions are also very useful to export
-    // because by using these types lots of potential type errors
-    // can be exposed:
-    export type EnterHook = ReactRouter.EnterHook
-    export type LeaveHook = ReactRouter.LeaveHook
-    export type ParseQueryString = ReactRouter.ParseQueryString
-    export type RedirectFunction = ReactRouter.RedirectFunction
-    export type RouteComponentProps<P,R> = ReactRouter.RouteComponentProps<P,R>;
-    export type RouteHook = ReactRouter.RouteHook
-    export type StringifyQuery = ReactRouter.StringifyQuery
-    export type RouterListener = ReactRouter.RouterListener
-    export type RouterState = ReactRouter.RouterState
-    export type HistoryBase = ReactRouter.HistoryBase
-    export type RouterOnContext = ReactRouter.RouterOnContext
-
-    export {
-        Router,
-        Link,
-        IndexLink,
-        IndexRedirect,
-        IndexRoute,
-        Redirect,
-        Route,
-        History,
-        browserHistory,
-        hashHistory,
-        Lifecycle,
-        RouteContext,
-        useRoutes,
-        createRoutes,
-        formatPattern,
-        RouterContext,
-        PropTypes,
-        match,
-        useRouterHistory
-    }
-
-    export default Router
-
-}
diff --git a/react-router/tsconfig.json b/react-router/tsconfig.json
new file mode 100644
index 0000000000..aba47c37f0
--- /dev/null
+++ b/react-router/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "files": [
+        "index.d.ts",
+        "react-router-tests.tsx"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/react-scroll/index.d.ts b/react-scroll/index.d.ts
new file mode 100644
index 0000000000..0e81894402
--- /dev/null
+++ b/react-scroll/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for redux-immutable v3.0.5
+// Project: https://github.com/fisshy/react-scroll
+// Definitions by: Pedro Pereira <https://github.com/oizie>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as React from 'react';
+
+interface Link extends React.ClassicComponentClass<any> { }
+interface Element extends React.ClassicComponentClass<any> { }
+
+interface scrollEvnt {
+    register(evtName: string, callback: Function): void,
+    remove(evtName: string): void
+}
+
+interface Events {
+    scrollEvent: scrollEvnt
+}
+
+interface scroller {
+    scrollTo(to: any, animate?: any, duration?: any, offset?: any): void
+}
+
+declare const Link: Link;
+declare const Element: Element;
+declare const Events: Events;
+declare const scroller: scroller;
+
+export {
+Link,
+Element,
+Events,
+scroller
+}
diff --git a/react-scroll/react-scroll-tests.tsx b/react-scroll/react-scroll-tests.tsx
index b39b9681f5..b5d2fb2245 100644
--- a/react-scroll/react-scroll-tests.tsx
+++ b/react-scroll/react-scroll-tests.tsx
@@ -1,5 +1,4 @@
-/// <reference path="../react/react.d.ts" />
-/// <reference path="./react-scroll.d.ts" />
+/// <reference types="react" />
 
 import * as React from 'react';
 import { Link, Element, scroller } from 'react-scroll';
diff --git a/react-scroll/react-scroll.d.ts b/react-scroll/react-scroll.d.ts
deleted file mode 100644
index 27d7dd2104..0000000000
--- a/react-scroll/react-scroll.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// Type definitions for redux-immutable v3.0.5
-// Project: https://github.com/fisshy/react-scroll
-// Definitions by: Pedro Pereira <https://github.com/oizie>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts" />
-
-declare module "react-scroll" {
-    import React = __React
-
-    interface Link extends React.ClassicComponentClass<any> {}
-    interface Element extends React.ClassicComponentClass<any> {}
-
-    interface scrollEvnt {
-        register(evtName: string, callback: Function) : void,
-        remove(evtName: string) : void
-    }
-
-    interface Events {
-        scrollEvent: scrollEvnt
-    }
-
-    interface scroller {
-        scrollTo(to: any, animate?: any, duration?: any, offset?: any) : void
-    }
-
-    const Link: Link;
-    const Element: Element;
-    const Events: Events;
-    const scroller: scroller;
-
-    export {
-        Link,
-        Element,
-        Events,
-        scroller
-    }
-}
\ No newline at end of file
diff --git a/react-scroll/tsconfig.json b/react-scroll/tsconfig.json
new file mode 100644
index 0000000000..080362374f
--- /dev/null
+++ b/react-scroll/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-scroll-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/react-select/index.d.ts b/react-select/index.d.ts
new file mode 100644
index 0000000000..3a91090076
--- /dev/null
+++ b/react-select/index.d.ts
@@ -0,0 +1,302 @@
+// Type definitions for react-select v1.0.0
+// Project: https://github.com/JedWatson/react-select
+// Definitions by: ESQUIBET Hugo <https://github.com/Hesquibet/>, Gilad Gray <https://github.com/giladgray/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as React from 'react';
+
+export as namespace ReactSelect;
+
+declare const select: ReactSelectClass;
+export default select;
+
+export interface Option {
+    /** Text for rendering */
+    label: string;
+    /** Value for searching */
+    value: string | number;
+    /**
+     * Allow this option to be cleared
+     * @default true
+     */
+    clearableValue?: boolean;
+}
+
+export interface ReactSelectProps extends React.Props<ReactSelect> {
+    /**
+     * text to display when `allowCreate` is true.
+     * @default 'Add "{label}"?'
+     */
+    addLabelText?: string;
+    /**
+     * blurs the input element after a selection has been made. Handy for lowering the keyboard on mobile devices.
+     * @default false
+     */
+    autoBlur?: boolean;
+    /**
+     * allow new options to be created in multi mode (displays an "Add <option> ?" item
+     * when a value not already in the options array is entered)
+     * @default false
+     */
+    allowCreate?: boolean;
+    /**
+     * whether to auto-load the default async options set
+     * @default true
+     */
+    autoload?: boolean;
+    /**
+     * whether pressing backspace removes the last item when there is no input value
+     * @default true
+     */
+    backspaceRemoves?: boolean;
+    /**
+     * enables the options cache for `asyncOptions`
+     * @default true
+     */
+    cacheAsyncResults?: boolean;
+    /**
+     * CSS className for the outer element
+     */
+    className?: string;
+    /**
+     * whether it is possible to reset value. if enabled, an X button will appear at the right side.
+     * @default true
+     */
+    clearable?: boolean;
+    /**
+     * title for the "clear" control when `multi` is true
+     * @default "Clear all"
+     */
+    clearAllText?: string;
+    /**
+     * title for the "clear" control
+     * @default "Clear value"
+     */
+    clearValueText?: string;
+    /**
+     * delimiter to use to join multiple values
+     * @default ","
+     */
+    delimiter?: string;
+    /**
+     * whether the Select is disabled or not
+     * @default false
+     */
+    disabled?: boolean;
+    /**
+     * method to filter a single option
+     */
+    filterOption?: (option: Option, filter: string) => Option;
+    /**
+     * method to filter the options array
+     */
+    filterOptions?: (options: Array<Option>, filter: string, currentValues: (string | number)[]) => Array<Option>;
+    /**
+     * whether to perform case-insensitive filtering
+     * @default true
+     */
+    ignoreCase?: boolean;
+    /**
+     * custom attributes for the Input (in the Select-control) e.g: {'data-foo': 'bar'}
+     * @default {}
+     */
+    inputProps?: Object;
+    /**
+     * whether the Select is loading externally or not (such as options being loaded).
+     * if true, a loading spinner will be shown at the right side.
+     * @default false
+     */
+    isLoading?: boolean;
+    /**
+     * the option property to use for the label
+     * @default "label"
+     */
+    labelKey?: string;
+    /**
+     * function that calls a callback with the options
+     */
+    loadOptions?: (input: string, callback: (options: Option[]) => any) => any;
+    /**
+     * (any, start) match the start or entire string when filtering
+     * @default "any"
+     */
+    matchPos?: string;
+    /**
+     * (any, label, value) which option property to filter on
+     * @default "any"
+     */
+    matchProp?: string;
+    /**
+     * buffer of px between the base of the dropdown and the viewport to shift if menu doesnt fit in viewport
+     * @default 0
+     */
+    menuBuffer?: number;
+    /**
+     * multi-value input
+     * @default false
+     */
+    multi?: boolean;
+    /**
+     * field name, for hidden `<input>` tag
+     */
+    name?: string;
+    /**
+     * factory to create new options when `allowCreate` is true
+     * @default false
+     */
+    newOptionCreator?: (input: string) => Option;
+    /**
+     * placeholder displayed when there are no matching search results or a falsy value to hide it
+     * @default "No results found"
+     */
+    noResultsText?: string;
+    onBlur?: React.FocusEventHandler;
+    /**
+     * whether to clear input on blur or not
+     * @default true
+     */
+    onBlurResetsInput?: boolean;
+    onChange?: (newValue: Option | Option[]) => void;
+    onClose?: () => void;
+    onFocus?: React.FocusEventHandler;
+    onInputChange?: (inputValue: string) => void;
+    onOpen?: () => void;
+    onOptionLabelClick?: (value: string, event: Event) => void;
+
+    /**
+     * function which returns a custom way to render the options in the menu
+     */
+    optionRenderer?: (option: Option) => JSX.Element;
+    /**
+     * array of Select options
+     * @default false
+     */
+    options?: Array<Option>;
+    /**
+     * field placeholder, displayed when there's no value
+     * @default "Select..."
+     */
+    placeholder?: string | React.ReactElement<any>;
+    /**
+     * whether to enable searching feature or not
+     * @default true;
+     */
+    searchable?: boolean;
+    /**
+     * message to display whilst options are loading via asyncOptions, or when `isLoading` is true
+     * @default "Searching..."
+     */
+    searchingText?: string;
+    /**
+     * label to prompt for search input
+     * @default "Type to search"
+     */
+    searchPromptText?: string;
+    /**
+     * initial field value
+     */
+    value?: Option | Option[];
+    /**
+     * the option property to use for the value
+     * @default "value"
+     */
+    valueKey?: string;
+    /**
+     * function which returns a custom way to render the value selected
+     * @default false
+     */
+    valueRenderer?: () => void;
+    /**
+     *  optional style to apply to the control
+     */
+    style?: any;
+
+    /**
+     *  optional tab index of the control
+     */
+    tabIndex?: string;
+
+    /**
+     *  value component to render
+     */
+    valueComponent?: Function;
+
+    /**
+     *  optional style to apply to the component wrapper
+     */
+    wrapperStyle?: any;
+
+    /**
+     * onClick handler for value labels: function (value, event) {}
+     */
+    onValueClick?: Function;
+
+    /**
+     *  pass the value to onChange as a simple value (legacy pre 1.0 mode), defaults to false
+     */
+    simpleValue?: boolean;
+}
+
+export interface ReactAsyncSelectProps extends ReactSelectProps {
+    /**
+     *  object to use to cache results; can be null to disable cache
+     */
+    cache?: any;
+
+    /**
+     *  whether to strip diacritics when filtering (shared with Select)
+     */
+    ignoreAccents?: boolean;
+
+    /**
+     *  whether to perform case-insensitive filtering (shared with Select)
+     */
+    ignoreCase?: boolean;
+
+    /**
+     *  overrides the isLoading state when set to true
+     */
+    isLoading?: boolean;
+
+    /**
+     *  function to call to load options asynchronously
+     */
+    loadOptions: (input: string, callback: (options: Option[]) => any) => any;
+
+    /**
+     *  replaces the placeholder while options are loading
+     */
+    loadingPlaceholder?: string;
+
+    /**
+     *  the minimum number of characters that trigger loadOptions
+     */
+    minimumInput?: number;
+
+    /**
+     *  placeholder displayed when there are no matching search results (shared with Select)
+     */
+    noResultsText?: string;
+    /**
+     *  field placeholder; displayed when there's no value (shared with Select)
+     */
+    placeholder?: string;
+
+    /**
+     *  label to prompt for search input
+     */
+    searchPromptText?: string;
+
+    /**
+     *  message to display while options are loading
+     */
+    searchingText?: string;
+}
+
+export interface ReactSelect extends  React.ReactElement<ReactSelectProps> { }
+export interface ReactSelectAsyncClass extends React.ComponentClass<ReactAsyncSelectProps> {
+}
+export declare const Async: ReactSelectAsyncClass;
+export interface ReactSelectClass extends React.ComponentClass<ReactSelectProps> {
+    Async: ReactSelectAsyncClass;
+}
diff --git a/react-select/react-select-0.9.10-tests.tsx b/react-select/react-select-0.9.10-tests.tsx
index e0a25b2034..abfd8d564c 100644
--- a/react-select/react-select-0.9.10-tests.tsx
+++ b/react-select/react-select-0.9.10-tests.tsx
@@ -1,7 +1,7 @@
 
-/// <reference path="../react/react.d.ts" />
-/// <reference path="../react/react-dom.d.ts" />
-/// <reference path="./react-select-0.9.10.d.ts" />
+/// <reference types="react" />
+/// <reference types="react-dom" />
+
 
 import * as React from "react"
 import * as ReactDOM from "react-dom"
diff --git a/react-select/react-select-0.9.10.d.ts b/react-select/react-select-0.9.10.d.ts
index 60e6bff5f7..b569fb7419 100644
--- a/react-select/react-select-0.9.10.d.ts
+++ b/react-select/react-select-0.9.10.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: ESQUIBET Hugo <https://github.com/Hesquibet/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference path="../react/react.d.ts"/>
+///<reference types="react"/>
 
 // Typings for https://github.com/JedWatson/react-select
 //***Usage***
diff --git a/react-select/react-select-tests.tsx b/react-select/react-select-tests.tsx
index 444551a675..acd21186e1 100644
--- a/react-select/react-select-tests.tsx
+++ b/react-select/react-select-tests.tsx
@@ -1,30 +1,66 @@
+import * as React from "react";
+import * as ReactDOM from "react-dom";
 
-/// <reference path="../react/react.d.ts" />
-/// <reference path="../react/react-dom.d.ts" />
-/// <reference path="./react-select.d.ts" />
-
-import * as React from "react"
-import * as ReactDOM from "react-dom"
-
-import * as Select from "react-select"
+import Select from "react-select";
 
 class SelectTest extends React.Component<React.Props<{}>, {}> {
 
     render() {
-        const options: ReactSelect.Option[] = [{ label: "Foo", value: "bar" }]
+        const options: ReactSelect.Option[] = [{ label: "Foo", value: "bar" }];
+        const onChange = (value: any) => console.log(value);
+        const onOpen = () => { return; };
+        const onClose = () => { return; };
+        const optionRenderer = (option: ReactSelect.Option) => <span>{option.label}</span>
         return <div>
-           <Select options={options} />
-        </div>
+            <Select
+                name="test-select"
+                className="test-select"
+                key="1"
+                options={options}
+                optionRenderer={optionRenderer}
+                matchPos={"any"}
+                matchProp={"any"}
+                multi={true}
+                onValueClick={onChange}
+                onOpen={onOpen}
+                onClose={onClose}
+                valueKey="github"
+                labelKey="name"
+                onChange={onChange}
+                simpleValue
+                value={options}
+                 />
+        </div>;
     }
-
 }
 
 class SelectAsyncTest extends React.Component<React.Props<{}>, {}> {
 
     render() {
+        const getOptions = (input: string, callback: Function) => {
+            setTimeout(function() {
+                callback(null, options);
+            }, 500);
+        };
+        const options: ReactSelect.Option[] = [{ label: "Foo", value: "bar" }];
+        const onChange = (value: any) => console.log(value);
         return <div>
-           <Select.Async />
-        </div>
+            <Select.Async
+                name="test-select"
+                className="test-select"
+                key="1"
+                matchPos={"any"}
+                matchProp={"any"}
+                multi={true}
+                onValueClick={onChange}
+                valueKey="github"
+                labelKey="name"
+                onChange={onChange}
+                simpleValue
+                value={options}
+                loadOptions={getOptions}
+            />
+        </div>;
     }
 
 }
diff --git a/react-select/react-select.d.ts b/react-select/react-select.d.ts
deleted file mode 100644
index c9e385a159..0000000000
--- a/react-select/react-select.d.ts
+++ /dev/null
@@ -1,221 +0,0 @@
-// Type definitions for react-select v1.0.0
-// Project: https://github.com/JedWatson/react-select
-// Definitions by: ESQUIBET Hugo <https://github.com/Hesquibet/>, Gilad Gray <https://github.com/giladgray/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts"/>
-
-declare namespace ReactSelect {
-    interface Option {
-        /** Text for rendering */
-        label: string;
-        /** Value for searching */
-        value: string | number;
-        /**
-         * Allow this option to be cleared
-         * @default true
-         */
-        clearableValue?: boolean;
-    }
-
-    interface ReactSelectProps extends __React.Props<ReactSelect> {
-        /**
-         * text to display when `allowCreate` is true.
-         * @default 'Add "{label}"?'
-         */
-        addLabelText?: string;
-        /**
-         * blurs the input element after a selection has been made. Handy for lowering the keyboard on mobile devices.
-         * @default false
-         */
-        autoBlur?: boolean;
-        /**
-         * allow new options to be created in multi mode (displays an "Add <option> ?" item
-         * when a value not already in the options array is entered)
-         * @default false
-         */
-        allowCreate?: boolean;
-        /**
-         * whether to auto-load the default async options set
-         * @default true
-         */
-        autoload?: boolean;
-        /**
-         * whether pressing backspace removes the last item when there is no input value
-         * @default true
-         */
-        backspaceRemoves?: boolean;
-        /**
-         * enables the options cache for `asyncOptions`
-         * @default true
-         */
-        cacheAsyncResults?: boolean;
-        /**
-         * CSS className for the outer element
-         */
-        className?: string;
-        /**
-         * whether it is possible to reset value. if enabled, an X button will appear at the right side.
-         * @default true
-         */
-        clearable?: boolean;
-        /**
-         * title for the "clear" control when `multi` is true
-         * @default "Clear all"
-         */
-        clearAllText?: string;
-        /**
-         * title for the "clear" control
-         * @default "Clear value"
-         */
-        clearValueText?: string;
-        /**
-         * delimiter to use to join multiple values
-         * @default ","
-         */
-        delimiter?: string;
-        /**
-         * whether the Select is disabled or not
-         * @default false
-         */
-        disabled?: boolean;
-        /**
-         * method to filter a single option
-         */
-        filterOption?: (option: Option, filter: string) => Option;
-        /**
-         * method to filter the options array
-         */
-        filterOptions?: (options: Array<Option>, filter: string, currentValues: (string | number)[]) => Array<Option>;
-        /**
-         * whether to perform case-insensitive filtering
-         * @default true
-         */
-        ignoreCase?: boolean;
-        /**
-         * custom attributes for the Input (in the Select-control) e.g: {'data-foo': 'bar'}
-         * @default {}
-         */
-        inputProps?: Object;
-        /**
-         * whether the Select is loading externally or not (such as options being loaded).
-         * if true, a loading spinner will be shown at the right side.
-         * @default false
-         */
-        isLoading?: boolean;
-        /**
-         * the option property to use for the label
-         * @default "label"
-         */
-        labelKey?: string;
-        /**
-         * function that calls a callback with the options
-         */
-        loadOptions?: (input: string, callback: (options: Option[]) => any) => any;
-        /**
-         * (any, start) match the start or entire string when filtering
-         * @default "any"
-         */
-        matchPos?: string;
-        /**
-         * (any, label, value) which option property to filter on
-         * @default "any"
-         */
-        matchProp?: string;
-        /**
-         * buffer of px between the base of the dropdown and the viewport to shift if menu doesnt fit in viewport
-         * @default 0
-         */
-        menuBuffer?: number;
-        /**
-         * multi-value input
-         * @default false
-         */
-        multi?: boolean;
-        /**
-         * field name, for hidden `<input>` tag
-         */
-        name?: string;
-        /**
-         * factory to create new options when `allowCreate` is true
-         * @default false
-         */
-        newOptionCreator?: (input: string) => Option;
-        /**
-         * placeholder displayed when there are no matching search results or a falsy value to hide it
-         * @default "No results found"
-         */
-        noResultsText?: string;
-        onBlur?: __React.FocusEventHandler;
-        /**
-         * whether to clear input on blur or not
-         * @default true
-         */
-        onBlurResetsInput?: boolean;
-        onChange?: (newValue: Option | Option[]) => void;
-        onFocus?: __React.FocusEventHandler;
-        onInputChange?: (inputValue: string) => void;
-        onOptionLabelClick?: (value: string, event: Event) => void;
-        /**
-         * function which returns a custom way to render the options in the menu
-         */
-        optionRenderer?: () => void;
-        /**
-         * array of Select options
-         * @default false
-         */
-        options?: Array<Option>;
-        /**
-         * field placeholder, displayed when there's no value
-         * @default "Select..."
-         */
-        placeholder?: string;
-        /**
-         * whether to enable searching feature or not
-         * @default true;
-         */
-        searchable?: boolean;
-        /**
-         * message to display whilst options are loading via asyncOptions, or when `isLoading` is true
-         * @default "Searching..."
-         */
-        searchingText?: string;
-        /**
-         * label to prompt for search input
-         * @default "Type to search"
-         */
-        searchPromptText?: string;
-        /**
-         * initial field value
-         */
-        value?: Option | Option[];
-        /**
-         * the option property to use for the value
-         * @default "value"
-         */
-        valueKey?: string;
-        /**
-         * function which returns a custom way to render the value selected
-         * @default false
-         */
-        valueRenderer?: () => void;
-    }
-
-    interface ReactAsyncSelectProps extends __React.Props<ReactSelect> {
-        cache?: any;
-        loadOptions?: () => void;
-        ignoreAccents?: boolean;
-        isLoading?: boolean;
-        loadingPlaceholder?: string;
-    }
-
-    interface ReactSelect extends  __React.ReactElement<ReactSelectProps> { }
-    interface ReactSelectClass extends __React.ComponentClass<ReactSelectProps> {
-        Async: __React.ComponentClass<ReactAsyncSelectProps>;
-    }
-}
-
-declare module "react-select" {
-    var select: ReactSelect.ReactSelectClass;
-    export = select;
-}
diff --git a/react-select/tsconfig.json b/react-select/tsconfig.json
new file mode 100644
index 0000000000..1c76706d8e
--- /dev/null
+++ b/react-select/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "files": [
+        "index.d.ts",
+        "react-select-tests.tsx"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/react-spinkit/index.d.ts b/react-spinkit/index.d.ts
new file mode 100644
index 0000000000..13c3542af6
--- /dev/null
+++ b/react-spinkit/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for react-spinkit 1.1.4
+// Project: https://github.com/KyleAMathews/react-spinkit
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react" />
+
+
+import { Component } from 'react';
+
+interface Props {
+    spinnerName?: string;
+}
+
+declare class Spinner extends Component<Props, {}> { }
+
+export default Spinner;
diff --git a/react-spinkit/react-spinkit-tests.tsx b/react-spinkit/react-spinkit-tests.tsx
index eb84781e42..e8467a95da 100644
--- a/react-spinkit/react-spinkit-tests.tsx
+++ b/react-spinkit/react-spinkit-tests.tsx
@@ -1,5 +1,5 @@
-/// <reference path="react-spinkit.d.ts" />
-/// <reference path="../react/react.d.ts" />
+
+/// <reference types="react" />
 
 import Spinner from 'react-spinkit';
 import * as React from 'react';
diff --git a/react-spinkit/react-spinkit.d.ts b/react-spinkit/react-spinkit.d.ts
deleted file mode 100644
index 25f28625f5..0000000000
--- a/react-spinkit/react-spinkit.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Type definitions for react-spinkit 1.1.4
-// Project: https://github.com/KyleAMathews/react-spinkit
-// Definitions by: Qubo <https://github.com/tkqubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts" />
-
-declare module "react-spinkit" {
-    import { Component } from 'react';
-
-    interface Props {
-        spinnerName?: string;
-    }
-
-    class Spinner extends Component<Props, {}> { }
-
-    export default Spinner;
-}
-
diff --git a/react-spinkit/tsconfig.json b/react-spinkit/tsconfig.json
new file mode 100644
index 0000000000..711c165422
--- /dev/null
+++ b/react-spinkit/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-spinkit-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/react-swf/index.d.ts b/react-swf/index.d.ts
new file mode 100644
index 0000000000..c63f86a9c1
--- /dev/null
+++ b/react-swf/index.d.ts
@@ -0,0 +1,134 @@
+// Type definitions for react-swf
+// Project: https://github.com/syranide/react-swf
+// Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as React from 'react';
+export as namespace ReactSWF;
+declare const self: typeof rswf.ReactSWF;
+export = self;
+
+declare namespace rswf {
+    interface State {
+
+    }
+    interface Props {
+        /**
+        * Specifies the source location (URL) of the SWF file to load.
+        */
+        src: string;
+        /**
+        *  Identifies the location of the Flash Player plug-in so that the user can download it if it is not already installed.
+        */
+        pluginspage?:string
+        /**
+        * Specifies the width of the SWF content in either pixels or percentage of browser window.
+        */
+        width?: number;
+        /**
+        * Specifies the height of the SWF content in either pixels or percentage of browser window.
+        */
+        height?: number;
+        /**
+        * (attribute for OBJECT tag) and name (attribute for EMBED tag) - SWF file identifier. Identifies the SWF file to the web browser, allowing browser scripting languages (for example, JavaScript) to reference the SWF content. For cross-browser compatibility, make sure that the id and name are set to the same value.
+        */
+        id?: string;
+        /**
+        * Specifies whether a timeline-based SWF file begins playing immediately on loading in the browser. If this attribute is omitted, the default value is true.
+        */
+        play?: boolean;
+        /**
+        * Specifies whether a timeline-based SWF file repeats indefinitely or stops when it reaches the last frame. If this attribute is omitted, the default value is true.
+        */
+        loop?: boolean;
+        /**
+        * Specifies if movie playback controls are available in the Flash Player context menu.
+        * true displays a full menu that provides expanded movie playback controls (for example, Zoom, Quality, Play, Loop, Rewind, Forward, Back).
+        * false displays a menu that hides movie playback controls (for example, Zoom, Quality, Play, Loop, Rewind, Forward, Back). This attribute is useful for SWF content that does not rely on the Timeline, such as content controlled entirely by ActionScript. The short menu includes "Settings" and "About Flash Player" menu items.
+        */
+        menu?: boolean;
+        /**
+        * Possible values: low, autolow, autohigh, medium, high, best. Specifies the display list Stage rendering quality. Setting the Stage.quality property via ActionScript overrides this value.
+        * low favors playback speed over appearance and never uses anti-aliasing.
+        * autolow emphasizes speed at first but improves appearance whenever possible. Playback begins with anti-aliasing turned off. If Flash Player detects that the processor can handle it, anti-aliasing is turned on.
+        * autohigh emphasizes playback speed and appearance equally at first but sacrifices appearance for playback speed if necessary. Playback begins with anti-aliasing turned on. If the actual frame rate drops below the specified frame rate, anti-aliasing is turned off to improve playback speed. Use this setting to emulate the View > Antialias setting in Flash Professional.
+        * medium applies some anti-aliasing and does not smooth bitmaps. It produces a better quality than the Low setting, but lower quality than the High setting.
+        * high favors appearance over playback speed and always applies anti-aliasing. If the movie does not contain animation, bitmaps are smoothed; if the movie has animation, bitmaps are not smoothed.
+        * best provides the best display quality and does not consider playback speed. All output is anti-aliased and all bitmaps are smoothed.
+        */
+        quality?: string;
+        /**
+        *  Possible values: showall, noborder, exactfit, noscale. Specifies how Flash Player scales SWF content to fit the pixel area specified by the OBJECT or EMBED tag.
+        *  default (Show all) makes the entire SWF file visible in the specified area without distortion, while maintaining the original aspect ratio of the movie. Borders can appear on two sides of the movie.
+        *  noborder scales the SWF file to fill the specified area, while maintaining the original aspect ratio of the file. Flash Player can crop the content, but no distortion occurs.
+        *  exactfit makes the entire SWF file visible in the specified area without trying to preserve the original aspect ratio. Distortion can occur.
+        *  noscale prevents the SWF file from scaling to fit the area of the OBJECT or EMBED tag. Cropping can occur.
+        */
+        scale?: string;
+        /**
+        * (attribute for Object) - Possible values: l, t, r.
+        * Default centers the movie in the browser window and crops edges if the browser window is smaller than the movie.
+        * l (left), r (right), and t (top) align the movie along the corresponding edge of the browser window and crop the remaining three sides as needed.
+        */
+        align?: string;
+        /**
+        * Possible values: l, t, r, tl, tr.
+        * l, r, and t align the movie along the left, right, or top edge of the browser window and crop the remaining sides as needed.
+        * tl and tr align the movie to the upper-left and top upper-corner of the browser window and crop the bottom and remaining side as necessary.
+        */
+        salign?: string;
+        /**
+        * Possible values: window, direct, opaque, transparent, gpu. Sets the Window Mode property of the SWF file for transparency, layering, positioning, and rendering in the browser. If this attribute is omitted, the default value is "window". For more information, see Using Window Mode (wmode) values below.
+        * window - The SWF content plays in its own rectangle ("window") on a web page. The browser determines how the SWF content is layered against other HTML elements. With this value, you cannot explicitly specify if SWF content appears above or below other HTML elements on the page.
+        * direct - Use direct to path rendering. This attribute bypasses compositing in the screen buffer and renders the SWF content directly to the screen. This wmode value is recommended to provide the best performance for content playback. It enables hardware accelerated presentation of SWF content that uses Stage Video or Stage 3D.
+        * opaque - The SWF content is layered together with other HTML elements on the page. The SWF file is opaque and hides everything layered behind it on the page. This option reduces playback performance compared to wmode=window or wmode=direct.
+        * transparent - The SWF content is layered together with other HTML elements on the page. The SWF file background color (Stage color) is transparent. HTML elements beneath the SWF file are visible through any transparent areas of the SWF, with alpha blending. This option reduces playback performance compared to wmode=window or wmode=direct.
+        * gpu - Use additional hardware acceleration on some Internet-connected TVs and mobile devices. In contrast to other wmode values, pixel fidelity for display list graphics is not guaranteed. Otherwise, this value is similar to wmode=direct.
+        */
+        wmode?: string;
+        /**
+        * [hexadecimal RGB value] in the format #RRGGBB. Specifies the background color of the SWF content. Use this attribute to override the background color (Stage color) setting specified in the SWF file. (This attribute does not affect the background color of the HTML page.)
+        */
+        bgcolor?: string;
+        /**
+        * [base directory] or [URL]. Specifies the base directory or URL used to resolve all relative path statements in the SWF file. This attribute is helpful when your SWF file is kept in a different directory from your other files.
+        */
+        base?: string;
+        /**
+        * Setting this value to true allows the SWF file to enter full screen mode via ActionScript. For more information, see Exploring full screen mode in Flash Player. If this attribute is omitted, the default value is false.
+        */
+        allowFullScreen?: boolean;
+        /**
+        *  Possible values: portrait or landscape. Used to control how full screen SWF content appears on mobile devices that support automatic screen rotation, such as phones and tablets. If this attribute is specified, Flash Player uses the specified screen orientation (portrait or landscape) when the SWF is viewed in full screen mode. It doesn't matter how the device is oriented. If this attribute is not specified, orientation of content in full screen mode follows the screen orientation used by the browser.
+        */
+        fullScreenAspectRatio?: string;
+        /**
+        * Variables, defined as a string of key=value pairs, that are passed to the SWF file.
+        * Use flashvars to specify root-level variables in the SWF file. The format of the string is a set of key=value combinations separated by the '&' character.
+        * Browsers support string sizes of up to 64 KB (65535 bytes) in length.
+        * For more information on using flashvars, see Using FlashVars to pass variables to a SWF (tn_16417).
+        */
+        flashvars?: Object | string
+    }
+    export class ReactSWF extends React.Component<Props, State>{
+        /**
+        * Returns the Flash Player object DOM node.
+        * Should be prefered over `React.findDOMNode`.
+        * @return {?DOMNode} Flash Player object DOM node.
+        */
+        getFPDOMNode(): Node
+        /**
+        * Returns installed Flash Player version. Result is cached.
+        * Must not be called in a non-browser environment.
+        * @return {?string} 'X.Y.Z'-version or null.
+        */
+        static getFPVersion(): string
+        /**
+        * Returns if installed Flash Player meets version requirement.
+        * Must not be called in a non-browser environment.
+        * @return {boolean} true if supported
+        */
+        static isFPVersionSupported(versionString: string): boolean
+    }
+
+}
diff --git a/react-swf/react-swf-tests.ts b/react-swf/react-swf-tests.ts
index 174aa29616..11c79c9940 100644
--- a/react-swf/react-swf-tests.ts
+++ b/react-swf/react-swf-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./react-swf.d.ts"/>
-/// <reference path="../react/react.d.ts"/>
 var version = ReactSWF.getFPVersion();
 var isFPVersionSupported = ReactSWF.isFPVersionSupported('5');
 var reactSWF = new ReactSWF();
diff --git a/react-swf/react-swf.d.ts b/react-swf/react-swf.d.ts
deleted file mode 100644
index a323a4d309..0000000000
--- a/react-swf/react-swf.d.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-// Type definitions for react-swf
-// Project: https://github.com/syranide/react-swf
-// Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts"/>
-
-
-declare module "react-swf" {
-    export = ReactSWF;
-}
-declare var ReactSWF: typeof rswf.ReactSWF
-declare namespace rswf {
-    interface State {
-
-    }
-    interface Props {
-        /**
-        * Specifies the source location (URL) of the SWF file to load.
-        */
-        src: string;
-        /**
-        *  Identifies the location of the Flash Player plug-in so that the user can download it if it is not already installed.
-        */
-        pluginspage?:string
-        /**
-        * Specifies the width of the SWF content in either pixels or percentage of browser window.
-        */
-        width?: number;
-        /**
-        * Specifies the height of the SWF content in either pixels or percentage of browser window.
-        */
-        height?: number;
-        /**
-        * (attribute for OBJECT tag) and name (attribute for EMBED tag) - SWF file identifier. Identifies the SWF file to the web browser, allowing browser scripting languages (for example, JavaScript) to reference the SWF content. For cross-browser compatibility, make sure that the id and name are set to the same value.
-        */
-        id?: string;
-        /**
-        * Specifies whether a timeline-based SWF file begins playing immediately on loading in the browser. If this attribute is omitted, the default value is true.
-        */
-        play?: boolean;
-        /**
-        * Specifies whether a timeline-based SWF file repeats indefinitely or stops when it reaches the last frame. If this attribute is omitted, the default value is true.
-        */
-        loop?: boolean;
-        /**
-        * Specifies if movie playback controls are available in the Flash Player context menu.
-        * true displays a full menu that provides expanded movie playback controls (for example, Zoom, Quality, Play, Loop, Rewind, Forward, Back).
-        * false displays a menu that hides movie playback controls (for example, Zoom, Quality, Play, Loop, Rewind, Forward, Back). This attribute is useful for SWF content that does not rely on the Timeline, such as content controlled entirely by ActionScript. The short menu includes "Settings" and "About Flash Player" menu items.
-        */
-        menu?: boolean;
-        /**
-        * Possible values: low, autolow, autohigh, medium, high, best. Specifies the display list Stage rendering quality. Setting the Stage.quality property via ActionScript overrides this value.
-        * low favors playback speed over appearance and never uses anti-aliasing.
-        * autolow emphasizes speed at first but improves appearance whenever possible. Playback begins with anti-aliasing turned off. If Flash Player detects that the processor can handle it, anti-aliasing is turned on.
-        * autohigh emphasizes playback speed and appearance equally at first but sacrifices appearance for playback speed if necessary. Playback begins with anti-aliasing turned on. If the actual frame rate drops below the specified frame rate, anti-aliasing is turned off to improve playback speed. Use this setting to emulate the View > Antialias setting in Flash Professional.
-        * medium applies some anti-aliasing and does not smooth bitmaps. It produces a better quality than the Low setting, but lower quality than the High setting.
-        * high favors appearance over playback speed and always applies anti-aliasing. If the movie does not contain animation, bitmaps are smoothed; if the movie has animation, bitmaps are not smoothed.
-        * best provides the best display quality and does not consider playback speed. All output is anti-aliased and all bitmaps are smoothed.
-        */
-        quality?: string;
-        /**
-        *  Possible values: showall, noborder, exactfit, noscale. Specifies how Flash Player scales SWF content to fit the pixel area specified by the OBJECT or EMBED tag.
-        *  default (Show all) makes the entire SWF file visible in the specified area without distortion, while maintaining the original aspect ratio of the movie. Borders can appear on two sides of the movie.
-        *  noborder scales the SWF file to fill the specified area, while maintaining the original aspect ratio of the file. Flash Player can crop the content, but no distortion occurs.
-        *  exactfit makes the entire SWF file visible in the specified area without trying to preserve the original aspect ratio. Distortion can occur.
-        *  noscale prevents the SWF file from scaling to fit the area of the OBJECT or EMBED tag. Cropping can occur.
-        */
-        scale?: string;
-        /**
-        * (attribute for Object) - Possible values: l, t, r.
-        * Default centers the movie in the browser window and crops edges if the browser window is smaller than the movie.
-        * l (left), r (right), and t (top) align the movie along the corresponding edge of the browser window and crop the remaining three sides as needed.
-        */
-        align?: string;
-        /**
-        * Possible values: l, t, r, tl, tr.
-        * l, r, and t align the movie along the left, right, or top edge of the browser window and crop the remaining sides as needed.
-        * tl and tr align the movie to the upper-left and top upper-corner of the browser window and crop the bottom and remaining side as necessary.
-        */
-        salign?: string;
-        /**
-        * Possible values: window, direct, opaque, transparent, gpu. Sets the Window Mode property of the SWF file for transparency, layering, positioning, and rendering in the browser. If this attribute is omitted, the default value is "window". For more information, see Using Window Mode (wmode) values below.
-        * window - The SWF content plays in its own rectangle ("window") on a web page. The browser determines how the SWF content is layered against other HTML elements. With this value, you cannot explicitly specify if SWF content appears above or below other HTML elements on the page.
-        * direct - Use direct to path rendering. This attribute bypasses compositing in the screen buffer and renders the SWF content directly to the screen. This wmode value is recommended to provide the best performance for content playback. It enables hardware accelerated presentation of SWF content that uses Stage Video or Stage 3D.
-        * opaque - The SWF content is layered together with other HTML elements on the page. The SWF file is opaque and hides everything layered behind it on the page. This option reduces playback performance compared to wmode=window or wmode=direct.
-        * transparent - The SWF content is layered together with other HTML elements on the page. The SWF file background color (Stage color) is transparent. HTML elements beneath the SWF file are visible through any transparent areas of the SWF, with alpha blending. This option reduces playback performance compared to wmode=window or wmode=direct.
-        * gpu - Use additional hardware acceleration on some Internet-connected TVs and mobile devices. In contrast to other wmode values, pixel fidelity for display list graphics is not guaranteed. Otherwise, this value is similar to wmode=direct.
-        */
-        wmode?: string;
-        /**
-        * [hexadecimal RGB value] in the format #RRGGBB. Specifies the background color of the SWF content. Use this attribute to override the background color (Stage color) setting specified in the SWF file. (This attribute does not affect the background color of the HTML page.)
-        */
-        bgcolor?: string;
-        /**
-        * [base directory] or [URL]. Specifies the base directory or URL used to resolve all relative path statements in the SWF file. This attribute is helpful when your SWF file is kept in a different directory from your other files.
-        */
-        base?: string;
-        /**
-        * Setting this value to true allows the SWF file to enter full screen mode via ActionScript. For more information, see Exploring full screen mode in Flash Player. If this attribute is omitted, the default value is false.
-        */
-        allowFullScreen?: boolean;
-        /**
-        *  Possible values: portrait or landscape. Used to control how full screen SWF content appears on mobile devices that support automatic screen rotation, such as phones and tablets. If this attribute is specified, Flash Player uses the specified screen orientation (portrait or landscape) when the SWF is viewed in full screen mode. It doesn't matter how the device is oriented. If this attribute is not specified, orientation of content in full screen mode follows the screen orientation used by the browser.
-        */
-        fullScreenAspectRatio?: string;
-        /**
-        * Variables, defined as a string of key=value pairs, that are passed to the SWF file.
-        * Use flashvars to specify root-level variables in the SWF file. The format of the string is a set of key=value combinations separated by the '&' character.
-        * Browsers support string sizes of up to 64 KB (65535 bytes) in length.
-        * For more information on using flashvars, see Using FlashVars to pass variables to a SWF (tn_16417).
-        */
-        flashvars?: Object | string
-    }
-    export class ReactSWF extends __React.Component<Props, State>{
-        /**
-        * Returns the Flash Player object DOM node.
-        * Should be prefered over `React.findDOMNode`.
-        * @return {?DOMNode} Flash Player object DOM node.
-        */
-        getFPDOMNode(): Node
-        /**
-        * Returns installed Flash Player version. Result is cached.
-        * Must not be called in a non-browser environment.
-        * @return {?string} 'X.Y.Z'-version or null.
-        */
-        static getFPVersion(): string
-        /**
-        * Returns if installed Flash Player meets version requirement.
-        * Must not be called in a non-browser environment.
-        * @return {boolean} true if supported
-        */
-        static isFPVersionSupported(versionString: string): boolean
-    }
-
-}
diff --git a/react-swf/tsconfig.json b/react-swf/tsconfig.json
new file mode 100644
index 0000000000..ce9cf695c5
--- /dev/null
+++ b/react-swf/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-swf-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/react-swipeable-views/index.d.ts b/react-swipeable-views/index.d.ts
new file mode 100644
index 0000000000..745ebb4582
--- /dev/null
+++ b/react-swipeable-views/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for react-swipeable-views
+// Project: https://github.com/oliviertassinari/react-swipeable-views
+// Definitions by: Michael Ledin <https://github.com/mxl>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as React from 'react';
+
+export as namespace ReactSwipeableViews;
+
+declare namespace ReactSwipeableViews {
+    export interface SwipeableViewsProps extends React.Props<SwipeableViews> {
+        containerStyle?: React.CSSProperties;
+        disabled?: boolean;
+        index?: number;
+        onChangeIndex?: (indexNew:number, indexLatest:number) => void;
+        onSwitching?: (index:number) => void;
+        resistance?: boolean;
+        slideStyle?: React.CSSProperties;
+        style?: React.CSSProperties;
+        threshold?: number;
+    }
+
+    interface SwipeableViewsState {
+        indexCurrent?: number;
+        indexLatest?: number;
+        isDragging?: boolean;
+        isFirstRender?: boolean;
+        heightLatest?: number;
+    }
+
+    export class SwipeableViews extends React.Component<SwipeableViewsProps, SwipeableViewsState> {
+    }
+}
+
+export default ReactSwipeableViews.SwipeableViews;
diff --git a/react-swipeable-views/react-swipeable-views-tests.ts b/react-swipeable-views/react-swipeable-views-tests.ts
index ada49577af..c608f065f4 100644
--- a/react-swipeable-views/react-swipeable-views-tests.ts
+++ b/react-swipeable-views/react-swipeable-views-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="react-swipeable-views.d.ts"/>
-
 import * as React from 'react';
 import SwipeableViews from 'react-swipeable-views';
 
diff --git a/react-swipeable-views/react-swipeable-views.d.ts b/react-swipeable-views/react-swipeable-views.d.ts
deleted file mode 100644
index 9c85ad0df8..0000000000
--- a/react-swipeable-views/react-swipeable-views.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-// Type definitions for react-swipeable-views
-// Project: https://github.com/oliviertassinari/react-swipeable-views
-// Definitions by: Michael Ledin <https://github.com/mxl>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path='../react/react.d.ts' />
-
-declare namespace ReactSwipeableViews {
-    import React = __React;
-
-    export interface SwipeableViewsProps extends React.Props<SwipeableViews> {
-        containerStyle?: React.CSSProperties;
-        disabled?: boolean;
-        index?: number;
-        onChangeIndex?: (indexNew:number, indexLatest:number) => void;
-        onSwitching?: (index:number) => void;
-        resistance?: boolean;
-        slideStyle?: React.CSSProperties;
-        style?: React.CSSProperties;
-        threshold?: number;
-    }
-
-    interface SwipeableViewsState {
-        indexCurrent?: number;
-        indexLatest?: number;
-        isDragging?: boolean;
-        isFirstRender?: boolean;
-        heightLatest?: number;
-    }
-
-    export class SwipeableViews extends React.Component<SwipeableViewsProps, SwipeableViewsState> {
-    }
-}
-
-declare module 'react-swipeable-views' {
-    export default ReactSwipeableViews.SwipeableViews;
-}
diff --git a/react-swipeable-views/tsconfig.json b/react-swipeable-views/tsconfig.json
new file mode 100644
index 0000000000..90626a14a1
--- /dev/null
+++ b/react-swipeable-views/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-swipeable-views-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/react-tabs/index.d.ts b/react-tabs/index.d.ts
new file mode 100644
index 0000000000..cfaa26171b
--- /dev/null
+++ b/react-tabs/index.d.ts
@@ -0,0 +1,58 @@
+// Type definitions for react-tabs 0.5.3
+// Project: https://github.com/reactjs/react-tabs/
+// Definitions by: Yuu Igarashi <https://github.com/yu-i9/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as React from 'react';
+
+export as namespace ReactTabs;
+
+declare namespace ReactTabs {
+
+    interface TabsProps {
+        className?: string;
+        selectedIndex?: number;
+        focus?: boolean;
+        forceRenderTabPanel?: boolean;
+        onSelect?: (index: number, last: number) => void;
+    }
+
+    interface Tabs extends React.ComponentClass<TabsProps> {}
+
+    interface TabListProps {
+        className?: string;
+    }
+
+    interface TabList extends React.ComponentClass<TabListProps> {}
+
+    interface TabProps {
+        className?: string;
+        focus?: boolean;
+        selected?: boolean;
+        id?: string;
+        panelId?: string;
+    }
+
+    interface Tab extends React.ComponentClass<TabProps> {}
+
+    interface TabPanelProps {
+        className?: string;
+        selected?: boolean;
+        id?: string;
+        tabId?: string;
+    }
+
+    interface TabPanel extends React.ComponentClass<TabPanelProps> {}
+}
+
+declare const Tabs: ReactTabs.Tabs;
+declare const TabList: ReactTabs.TabList;
+declare const Tab: ReactTabs.Tab;
+declare const TabPanel: ReactTabs.TabPanel;
+
+export {
+    Tabs,
+    TabList,
+    Tab,
+    TabPanel
+};
diff --git a/react-tabs/react-tabs-tests.ts b/react-tabs/react-tabs-tests.ts
index f953b5001b..b067987518 100644
--- a/react-tabs/react-tabs-tests.ts
+++ b/react-tabs/react-tabs-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="react-tabs.d.ts" />
-/// <reference path="../react/react.d.ts" />
-/// <reference path="../react/react-dom.d.ts" />
+
+/// <reference types="react" />
+/// <reference types="react-dom" />
 
 import React = require("react");
 import ReactDOM = require("react-dom");
diff --git a/react-tabs/react-tabs.d.ts b/react-tabs/react-tabs.d.ts
deleted file mode 100644
index cb292a8f72..0000000000
--- a/react-tabs/react-tabs.d.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-// Type definitions for react-tabs 0.5.3
-// Project: https://github.com/reactjs/react-tabs/
-// Definitions by: Yuu Igarashi <https://github.com/yu-i9/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts" />
-
-declare namespace ReactTabs {
-
-    interface TabsProps {
-        className?: string;
-        selectedIndex?: number;
-        focus?: boolean;
-        forceRenderTabPanel?: boolean;
-        onSelect?: (index: number, last: number) => void;
-    }
-
-    interface Tabs extends __React.ComponentClass<TabsProps> {}
-
-    interface TabListProps {
-        className?: string;
-    }
-
-    interface TabList extends __React.ComponentClass<TabListProps> {}
-
-    interface TabProps {
-        className?: string;
-        focus?: boolean;
-        selected?: boolean;
-        id?: string;
-        panelId?: string;
-    }
-
-    interface Tab extends __React.ComponentClass<TabProps> {}
-
-    interface TabPanelProps {
-        className?: string;
-        selected?: boolean;
-        id?: string;
-        tabId?: string;
-    }
-
-    interface TabPanel extends __React.ComponentClass<TabPanelProps> {}
-}
-
-
-declare module "react-tabs" {
-
-    var Tabs: ReactTabs.Tabs;
-    var TabList: ReactTabs.TabList;
-    var Tab: ReactTabs.Tab;
-    var TabPanel: ReactTabs.TabPanel;
-
-    export {
-        Tabs,
-        TabList,
-        Tab,
-        TabPanel
-    }
-
-}
diff --git a/react-tabs/tsconfig.json b/react-tabs/tsconfig.json
new file mode 100644
index 0000000000..b5ac61e14d
--- /dev/null
+++ b/react-tabs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-tabs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/react-tagcloud/index.d.ts b/react-tagcloud/index.d.ts
new file mode 100644
index 0000000000..9759e99094
--- /dev/null
+++ b/react-tagcloud/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for react-tagcloud v0.4.0
+// Project: https://github.com/madox2/react-tagcloud
+// Definitions by: wassname <https://github.com/wassname/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="react"/>
+
+declare namespace ReactTagCloud {
+    interface TagCloudProps extends React.Props<void> {
+        tags: any[];
+        maxSize: number;
+        minSize: number;
+        shuffle?: boolean;
+        renderer?: Function;
+        className?: string;
+        onClick?: Function;
+    }
+    interface TagCloudClass extends React.ComponentClass<TagCloudProps> { }
+
+    interface DefaultRendererFactoryOptions {
+        tagRenderer?: Function;
+        colorOptions?: any;
+        props?: any;
+    }
+    interface RendererFunction {
+        (tag: any, size: number, key: string | number, handlers: any): any;
+    }
+    interface DefaultRendererFactory {
+        new (_ref?: DefaultRendererFactoryOptions): RendererFunction;
+        (_ref?: DefaultRendererFactoryOptions): RendererFunction;
+    }
+}
+
+
+// export = TagCloud
+declare module reactTagCloud {
+    const TagCloud: ReactTagCloud.TagCloudClass;
+    const DefaultRenderer: ReactTagCloud.DefaultRendererFactory;
+}
+
+declare module "react-tagcloud" {
+    export = reactTagCloud
+}
diff --git a/react-tagcloud/react-tagcloud-tests.tsx b/react-tagcloud/react-tagcloud-tests.tsx
new file mode 100644
index 0000000000..d0594314bc
--- /dev/null
+++ b/react-tagcloud/react-tagcloud-tests.tsx
@@ -0,0 +1,102 @@
+/// <reference types="react" />
+/// <reference types="react-dom" />
+
+
+
+// simple cloud
+import * as React from "react";
+import * as ReactDOM from "react-dom";
+import {TagCloud, DefaultRenderer} from "react-tagcloud";
+
+let data = [
+    { value: "jQuery", count: 25 }, { value: "MongoDB", count: 18 },
+    { value: "JavaScript", count: 38 }, { value: "React", count: 30 },
+    { value: "Nodejs", count: 28 }, { value: "Express.js", count: 25 },
+    { value: "HTML5", count: 33 }, { value: "CSS3", count: 20 }
+];
+
+ReactDOM.render(
+    // minSize, maxSize - font size in px
+    // tags - array of objects with properties value and count
+    // shuffle - indicates if data should be shuffled (true by default)
+    // onClick event handler has `tag` and `event` parameter
+    <TagCloud minSize={12}
+              maxSize={35}
+              tags={data}
+              shuffle={false}
+              onClick={(tag:string) => console.log("clicking on tag:", tag)} />,
+    document.getElementById("simple-cloud")
+);
+
+
+
+// default-renderer
+
+// DefaultRenderer creates default renderer implementation with custom options
+// usage of tagRenderer option is described in ./custom-tag-renderer.js
+
+// custom props will be applied on each tag component
+const props = {
+    style: {border: "1px solid silver", padding: "5px"},
+    className: "my-tag-class"
+};
+
+// custom random color options
+// see randomColor package: https://github.com/davidmerfield/randomColor
+const colorOptions = {
+    luminosity: "light",
+    hue: "blue"
+};
+
+let customizedDefaultRenderer = new DefaultRenderer({ props, colorOptions });
+
+ReactDOM.render(
+    <TagCloud minSize={12}
+              maxSize={35}
+              tags={data}
+              renderer={customizedDefaultRenderer} />,
+    document.getElementById("default-renderer")
+);
+//
+// custom-renderer.js
+// using custom renderer the default renderer will be overriden
+
+// custom renderer is function which takes tag, computed font size and
+// elemnt key as arguments, and returns react component
+let customRenderer2 = (tag: any, size: number, key: string|number) => {
+    return <span key={key} className={`tag-${size}`}>{tag.value}</span>;
+};
+
+ReactDOM.render(
+    <TagCloud tags={data}
+              minSize={1}
+              maxSize={5}
+              renderer={customRenderer2} />,
+    document.getElementById("custom-renderer")
+);
+
+
+// example from custom-tag-renderer.js
+let data2 = [
+    { value: { name: "google", link: "http://google.com" }, count: 25 },
+    { value: { name: "yahoo", link: "http://yahoo.com" }, count: 18 },
+    { value: { name: "facebook", link: "http://facebook.com" }, count: 38 },
+    { value: { name: "twitter", link: "http://twitter.com" }, count: 30 },
+    { value: { name: "github", link: "http://github.com" }, count: 28 },
+    { value: { name: "npmjs", link: "http://npmjs.com" }, count: 25 },
+    { value: { name: "stackoverflow", link: "http://stackoverflow.com" }, count: 33 }
+];
+
+// with tagRenderer option it is possible to customize rendering of each tag
+// tagRender is a function which takes tag as argument and returns react component or simple string
+const tagRenderer = (tag: any) => (<a href={tag.value.link}>{tag.value.name}</a>);
+
+const customizedDefaultRenderer4 = new DefaultRenderer({ tagRenderer });
+
+ReactDOM.render(
+    <TagCloud minSize={12}
+              maxSize={35}
+              tags={data2}
+              renderer={customizedDefaultRenderer4} />,
+    document.getElementById("custom-tag-renderer")
+);
diff --git a/react-tagcloud/tsconfig.json b/react-tagcloud/tsconfig.json
new file mode 100644
index 0000000000..7e27ac621f
--- /dev/null
+++ b/react-tagcloud/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-tagcloud-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/react-tap-event-plugin/index.d.ts b/react-tap-event-plugin/index.d.ts
new file mode 100644
index 0000000000..25ec13d43d
--- /dev/null
+++ b/react-tap-event-plugin/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for react-tap-event-plugin
+// Project: https://github.com/zilverline/react-tap-event-plugin
+// Definitions by: Michael Ledin <https://github.com/mxl>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare var exports: () => any;
+export = exports;
diff --git a/react-tap-event-plugin/react-tap-event-plugin-tests.ts b/react-tap-event-plugin/react-tap-event-plugin-tests.ts
index 7c3bc299ab..424222a8f6 100644
--- a/react-tap-event-plugin/react-tap-event-plugin-tests.ts
+++ b/react-tap-event-plugin/react-tap-event-plugin-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="react-tap-event-plugin.d.ts"/>
-
 import * as injectTapEventPlugin from 'react-tap-event-plugin';
 
 injectTapEventPlugin();
diff --git a/react-tap-event-plugin/react-tap-event-plugin.d.ts b/react-tap-event-plugin/react-tap-event-plugin.d.ts
deleted file mode 100644
index 073164f5bf..0000000000
--- a/react-tap-event-plugin/react-tap-event-plugin.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for react-tap-event-plugin
-// Project: https://github.com/zilverline/react-tap-event-plugin
-// Definitions by: Michael Ledin <https://github.com/mxl>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'react-tap-event-plugin'{
-    var exports:()=>any;
-    export = exports;
-}
diff --git a/react-tap-event-plugin/tsconfig.json b/react-tap-event-plugin/tsconfig.json
new file mode 100644
index 0000000000..e09ca90e29
--- /dev/null
+++ b/react-tap-event-plugin/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-tap-event-plugin-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/react-widgets/index.d.ts b/react-widgets/index.d.ts
new file mode 100644
index 0000000000..04b63d8a95
--- /dev/null
+++ b/react-widgets/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for react-widgets v3.2.1
+// Project: https://github.com/jquense/react-widgets
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as React from 'react';
+
+export import Calendar = require('./lib/Calendar');
+export import Combobox = require('./lib/Combobox');
+export import DateTimePicker = require('./lib/DateTimePicker');
+export import DropdownList = require('./lib/DropdownList');
+export import Multiselect = require('./lib/Multiselect');
+export import NumberPicker = require('./lib/NumberPicker');
+export import SelectList = require('./lib/SelectList');
diff --git a/react-widgets/lib/Calendar.d.ts b/react-widgets/lib/Calendar.d.ts
new file mode 100644
index 0000000000..16922ca797
--- /dev/null
+++ b/react-widgets/lib/Calendar.d.ts
@@ -0,0 +1,125 @@
+import * as React from 'react';
+
+interface CalendarProps extends React.Props<CalendarClass>{
+    /**
+     * The current selected date, should be a Date object or null.
+     */
+    value?: Date;
+    /**
+     * Default value.
+     */
+    defaultValue?: Date;
+    /**
+     * Change event Handler that is called when the value is changed. The handler is called with
+     * the Date object
+     */
+    onChange?: (date?: Date) => void;
+    /**
+     * Callback fired when the Calendar navigates between views, or forward and backwards in
+     * time.
+     */
+    onNavigate?: (date: Date, direction: string, view: string ) => void;
+    /**
+     * The minimum date that the Calendar can navigate from.
+     */
+    min?: Date;
+    /**
+     * The maximum date that the Calendar can navigate to.
+     */
+    max?: Date;
+    /**
+     * Default current date at which the calendar opens. If none is provided, opens at today's
+     * date or the value date (if any).
+     * @default Date()
+     */
+    currentDate?: Date;
+    /**
+     * Change event Handler that is called when the currentDate is changed. The handler is
+     * called with the currentDate object.
+     */
+    onCurrentDateChange?: (date?: Date) => void;
+    /**
+     * Show or hide the Calendar footer.
+     * @default false
+     */
+    footer?: boolean;
+    /**
+     * Provide a custom component to render the days of the month.
+     * The Component is provided the following props
+     * - date: a Date object for the day of the month to render
+     * - label: a formatted String of the date to render. To adjust the format of the label
+     *          string use the dateFormat prop, listed below.
+     */
+    dayComponent?: React.ReactType;
+    /**
+     * The starting and lowest level view the calendar can navigate down to.
+     * @enum "month" "year" "decade" "century"
+     */
+    initialView?: "month" | "year" | "decade" | "century";
+    /**
+     * The highest level view the calendar can navigate up to. This value should be higher than
+     * initialView
+     * @enum "month" "year" "decade" "century"
+     */
+    finalView?: "month" | "year" | "decade" | "century";
+    /**
+     * A formatter for the header button of the month view
+     */
+    headerFormat?: string | ((day: Date) => string);
+    /**
+     * A formatter for the Calendar footer, formats Today's Date as a string.
+     */
+    footerFormat?: string | ((day: Date) => string);
+    /**
+     * A formatter calendar days of the week, the default formats each day as a Narrow name:
+     * "Mo", "Tu", etc.
+     */
+    dayFormat?: string | ((day: Date) => string);
+    /**
+     * A formatter for day of the month.
+     */
+    dateFormat?: string | ((day: Date) => string);
+    /**
+     * A formatter for month name.
+     */
+    monthFormat?: string | ((day: Date) => string);
+    /**
+     * A formatter for the year.
+     */
+    yearFormat?: string | ((day: Date) => string);
+    /**
+     * A formatter for decade, the default formats the first and last year of the decade like:
+     * 2000 - 2009.
+     */
+    decadeFormat?: string | ((day: Date) => string);
+    /**
+     * A formatter for century, the default formats the first and last year of the century like:
+     * 1900 - 1999.
+     */
+    centuryFormat?: string | ((day: Date) => string);
+    /**
+     * Mark whether the widget should render right-to-left. This property can also be implicitly
+     * passed to the widget through a childContext prop (isRtl) this allows higher level
+     * application components to specify the direction.
+     */
+    isRtl?: boolean;
+    messages?: CalendarMessages;
+}
+
+interface CalendarMessages {
+    /**
+     * Title and screen reader text for the left arrow button.
+     * @default: "navigate back"
+     */
+    moveBack?: string;
+    /**
+     * Title and screen reader text for the right arrow button.
+     * @default: "navigate forward"
+     */
+    moveForward?: string;
+}
+
+interface Calendar extends React.ReactElement<CalendarProps> {}
+interface CalendarClass extends React.ComponentClass<CalendarProps> {}
+declare var Calendar: CalendarClass;
+export = Calendar;
diff --git a/react-widgets/lib/Combobox.d.ts b/react-widgets/lib/Combobox.d.ts
new file mode 100644
index 0000000000..279420fb78
--- /dev/null
+++ b/react-widgets/lib/Combobox.d.ts
@@ -0,0 +1,146 @@
+import * as React from 'react';
+
+interface ComboBoxMessages {
+    /**
+     * Combobox button text for screen readers
+     */
+    open: string | ((props: ComboBoxProps) => string);
+    /**
+     * text to display when the data prop array is empty
+     */
+    emptyList: string | ((props: ComboBoxProps) => string);
+    /**
+     * text to display when the the current filter does not return any results
+     */
+    emptyFilter: string | ((props: ComboBoxProps) => string);
+}
+
+interface ComboBoxProps extends React.Props<ComboBoxClass> {
+    /**
+     * The current value of the Combobox. This can be an object (such as a member of the data
+     * array) or a primitive value, hinted to by the valueField. The widget value does not need
+     * to be in the data, widgets can have values that are not in their list.
+     */
+    value?: any;
+    /**
+     * Default value.
+     */
+    defaultValue?: any;
+    /**
+     * Called when the value is changed. If the value is one of the data members that item will
+     * be returned. In the case of a value not being found in the data array the string value of
+     * the Combobox will be returned.
+     */
+    onChange?: (value: any) => void;
+    /**
+     * This handler fires when an item has been selected from the list. It fires before the
+     * onChange handler, and fires regardless of whether the value has actually changed.
+     */
+    onSelect?: (value: any) => void;
+    /**
+     * An array of possible values for the Combobox. If an array of objects is provided you
+     * should use the valueField and textField props, to specify which object properties
+     * comprise the value field (such as an id) and the field used to label the item.
+     */
+    data?: any[];
+    /**
+     * A dataItem field name for uniquely identifying items in the data list. A valueField is
+     * required when the value prop is not itself a dataItem. A valueField is useful when
+     * specifying the selected item, by its id instead of using the model as the value. When a
+     * valueField is not provided, the Combobox will use strict equality checks (===) to locate
+     * the value in the data list.
+     */
+    valueField?: string;
+    /**
+     * Specify which data item field to display in the Combobox and selected item. The
+     * textField` prop may also also used as to find an item in the list as you type. Providing
+     * an accessor function allows for computed text values
+     */
+    textField?: string;
+    /**
+     * This component is used to render each possible item in the Combobox. The default
+     * component renders the text of the selected item (specified by textfield)
+     */
+    itemComponent?: React.ReactType;
+    /**
+     * Disable the widget, if an Array of values is passed in only those values will be
+     * disabled.
+     */
+    disabled?: boolean | any[];
+    /**
+     * Place the Combobox in a read-only mode, If an Array of values is passed in only those
+     * values will be read-only.
+     */
+    readOnly?: boolean | any[];
+    /**
+     * Determines how to group the Combobox. Providing a string will group the data array by
+     * that property. You can also provide a function which should return the group value.
+     */
+    groupBy?: string | ((dataItem: any) => any);
+    /**
+     * This component is used to render each option group, when groupBy is specified. By default
+     * the groupBy value will be used.
+     */
+    groupComponent?: React.ReactType;
+    /**
+     * When true the Combobox will suggest, or fill in, values as you type. The suggestions are
+     * always "startsWith", meaning it will search from the start of the textField property
+     */
+    suggest?: boolean;
+    /**
+     * Specify a filtering method used to reduce the items in the dropdown as you type. It can
+     * be used in conjunction with the suggest prop or instead of it. There are a few built-in
+     * filtering methods that can be specified by passing the String name. You can explicitly
+     * opt out of filtering by setting filter to false To handle custom filtering techniques
+     * provide a function that returns true or false for each passed in item (analogous to the
+     * array.filter builtin) Acceptable values for filter are: false "startsWith" "endsWith"
+     * "contains" function(String item)
+     */
+    filter?: boolean | string | ((dataItem: any, searchItem: any) => boolean);
+    /**
+     * Use in conjunction with the filter prop. Filter the list without regard for case. This
+     * only applies to non function values for filter
+     */
+    caseSensitive?: boolean;
+    /**
+     * Use in conjunction with the filter prop. Start filtering the list only after the value
+     * has reached a minimum length.
+     */
+    minLength?: number;
+    /**
+     * Whether or not the Combobox is open. When unset (undefined) the Combobox will handle the
+     * opening and closing internally. The defaultOpen prop can be used to set an initialization
+     * value for uncontrolled widgets.
+     */
+    open?: boolean;
+    /**
+     * Called fires when the Combobox is about to open or close. onToggle should be used when
+     * the open prop is set otherwise the widget will never open or close.
+     */
+    onToggle?: (isOpen: boolean) => void;
+    /**
+     * Mark whether the widget is in a busy or loading state. If true the widget will display a
+     * spinner gif, useful when loading data via an ajax call.
+     */
+    busy?: boolean;
+    /**
+     * The speed, in milliseconds, of the dropdown animation.
+     */
+    duration?: number;
+    /**
+     * mark whether the widget should render right-to-left. This property can also be implicitly
+     * passed to the widget through a childContext prop (isRtl) this allows higher level
+     * application components to specify the direction.
+     */
+    isRtl?: boolean;
+    /**
+     * Object hash containing display text and/or text for screen readers. Use the messages
+     * object to localize widget text and increase accessibility.
+     */
+    messages?: ComboBoxMessages;
+}
+
+interface ComboBox extends React.ReactElement<ComboBoxProps> {}
+interface ComboBoxClass extends React.ComponentClass<ComboBoxProps> {}
+declare var ComboBox: ComboBoxClass;
+export = ComboBox;
diff --git a/react-widgets/lib/DateTimePicker.d.ts b/react-widgets/lib/DateTimePicker.d.ts
new file mode 100644
index 0000000000..20e5d2eb8c
--- /dev/null
+++ b/react-widgets/lib/DateTimePicker.d.ts
@@ -0,0 +1,139 @@
+import * as React from 'react';
+
+interface DateTimePickerProps extends React.Props<DateTimePickerClass> {
+    /**
+     * Whether to show the date picker button. 
+     * @default true
+     */
+    calendar?: boolean;
+    /**
+     * Whether to show the time picker button.
+     * @default true
+     */
+    time?: boolean;
+    /**
+     * The minimum Date that can be selected. Min only limits selection, it doesn't constrain
+     * the date values that can be typed or pasted into the widget. If you need this behavior
+     * you can constrain values via the onChange handler.
+     * @default Date(1900, 0, 1)
+     */
+    min?: Date;
+    /**
+     * The maximum Date that can be selected. Max only limits selection, it doesn't constrain
+     * the date values that can be typed or pasted into the widget. If you need this behavior
+     * you can constrain values via the onChange handler.
+     * @default Date(2099, 11, 31)
+     */
+    max?: Date;
+    /**
+     * Default current date at which the calendar opens. If none is provided, opens at today's
+     * date or the value date (if any).
+     * @default Date()
+     */
+    currentDate?: Date;
+    /**
+     * Change event Handler that is called when the currentDate is changed. The handler is
+     * called with the currentDate object.
+     */
+    onCurrentDateChange?: (date?: Date) => void;
+    /**
+     * A string format used to display the date value.
+     */
+    format?: string;
+    /**
+     * A string format to be used while the date input has focus. Useful for showing a simpler
+     * format for inputing.
+     */
+    editFormat?: string;
+    /**
+     * A string format used by the time dropdown to render times.
+     */
+    timeFormat?: string;
+    /**
+     * The amount of minutes between each entry in the time list.
+     */
+    step?: number | boolean;
+    /**
+     * Determines how the widget parses the typed date string into a Date object. You can
+     * provide an array of formats to try, or provide a function that returns a date to handle
+     * parsing yourself. When parse is unspecified and the format prop is a String parse will
+     * automatically use that format as its default
+     */
+    parse?: (str: string) => Date | string[];
+    /**
+     * The starting and lowest level view the calendar can navigate down to.
+     * @enum "month" "year" "decade" "century"
+     */
+    initialView?: "month" | "year" | "decade" | "century";
+    /**
+     * The highest level view the calendar can navigate up to. This value should be higher than
+     * initialView.
+     * @enum "month" "year" "decade" "century"
+     */
+    finalView?: "month" | "year" | "decade" | "century";
+    /**
+     * The current selected date, should be a Date instance or null.
+     */
+    value?: Date;
+    /**
+     * Default value.
+     */
+    defaultValue?: Date;
+    /**
+     * Change event Handler that is called when the value is changed. The handler is called with
+     * both the current Date object (or null if it was not parseable), and the second argument
+     * is a string representation of the date value, formated by the format prop.
+     */
+    onChange?: (date?: Date, dateStr?: string) => void;
+    /**
+     * This handler fires when an item has been selected from the list or calendar. It fires
+     * before the onChange handler, and fires regardless of whether the value has actually
+     * changed.
+     */
+    onSelect?: (date?: Date) => void;
+    /**
+     * Whether or not the DateTimePicker is open. When unset (undefined) the DateTimePicker will
+     * handle the opening and closing internally. The defaultOpen prop can be used to set an
+     * initialization value for uncontrolled widgets.
+     * @enum false "calendar" "time"
+     */
+    open?: boolean | "calendar" | "time";
+    /**
+     * Called when the DateTimePicker is about to open or close. onToggle should be used when
+     * the open prop is set otherwise the widget will never open or close.
+     */
+    onToggle?: (isOpen: boolean) => void;
+    /**
+     * The speed, in milliseconds, of the either dropdown animation.
+     */
+    duration?: number;
+    /**
+     * Mark whether the widget should render right-to-left. This property can also be implicitly
+     * passed to the widget through a childContext prop (isRtl) this allows higher level
+     * application components to specify the direction.
+     */
+    isRtl?: boolean;
+    /**
+     * Object hash containing display text and/or text for screen readers. Use the messages
+     * object to localize widget text and increase accessibility.
+     */
+    messages?: DateTimePickerMessages;
+}
+
+interface DateTimePickerMessages {
+    /**
+     * Title and screen reader text for the left arrow button.
+     * @default "Select Date"
+     */
+    calendarButton?: string;
+    /**
+     * Title and screen reader text for the right arrow button.
+     * @default "Select Time"
+     */
+    timeButton?: string;
+}
+
+interface DateTimePicker extends React.ReactElement<DateTimePickerProps> {}
+interface DateTimePickerClass extends React.ComponentClass<DateTimePickerProps> {}
+declare var DateTimePicker: DateTimePickerClass;
+export = DateTimePicker;
diff --git a/react-widgets/lib/DropdownList.d.ts b/react-widgets/lib/DropdownList.d.ts
new file mode 100644
index 0000000000..665f5601ab
--- /dev/null
+++ b/react-widgets/lib/DropdownList.d.ts
@@ -0,0 +1,168 @@
+import * as React from 'react';
+
+interface DropdownListProps extends React.Props<DropdownListClass> {
+    /**
+     * The current value of the DropdownList. This can be an object (such as a member of the
+     * data array) or a primitive value, hinted to by the valueField. The widget value does not
+     * need to be in the data array; widgets can have values that are not in their list.
+     */
+    value?: any;
+      /**
+     * Default value.
+     */
+    defaultValue?: any;
+    /**
+     * Change event Handler that is called when the value is changed.
+     */
+    onChange?: (value: any) => void;
+    /**
+     * This handler fires when an item has been selected from the list. It fires before the
+     * onChange handler, and fires regardless of whether the value has actually changed.
+     */
+    onSelect?: (value: any) => void;
+    /**
+     * Provide an array of possible values for the DropdownList. If an array of objects is
+     * provided you should use the valueField and textField props, to specify which object
+     * properties comprise the value field (such as an id) and the field used to label the item.
+     */
+    data?: any[];
+    /**
+     * A dataItem field name for uniquely identifying items in the data list. A valueField is
+     * required when the value prop is not itself a dataItem. A valueField is useful when
+     * specifying the selected item, by its id instead of using the model as the value.
+     * When a valueField is not provided, the DropdownList will use strict equality checks (===)
+     * to locate the value in the data list.
+     */
+    valueField?: string;
+    /**
+     * Specify which data item field to display in the DropdownList and selected item.
+     * ThetextFieldprop may also also used as to find an item in the list as you type. Providing
+     * an accessor function allows for computed text values
+     */
+    textField?: string;
+    /**
+     * This component is used to render the selected value of the DropdownList. The default
+     * component renders the text of the selected item (specified by textfield)
+     */
+    valueComponent?: React.ReactType;
+    /**
+     * This component is used to render each possible item in the DropdownList. The default
+     * component renders the text of the selected item (specified by textfield)
+     */
+    itemComponent?: React.ReactType;
+    /**
+     * Disable the widget, if an Array of values is passed in only those values will be disabled.
+     */
+    disabled?: boolean | any[];
+    /**
+     * Place the DropdownList in a read-only mode, If an Array of values is passed in only those
+     * values will be read-only.
+     */
+    readOnly?: boolean | any[];
+    /**
+     * Determines how to group the DropdownList. Providing a string will group the data array by
+     * that property. You can also provide a function which should return the group value.
+     */
+    groupBy?: string | ((dataItem: any) => any);
+    /**
+     * This component is used to render each option group, when groupBy is specified. By default
+     * the groupBy value will be used.
+     */
+    groupComponent?: React.ReactType;
+    /**
+     * Text to display when the value is empty.
+     */
+    placeholder?: string;
+    /**
+     * The string value of the current search being typed into the DropdownList. When unset
+     * (undefined) the DropdownList will handle the filtering internally. The defaultSearchTerm
+     * prop can be used to set an initialization value for uncontrolled widgets. searchTerm is
+     * only relevant when the filter prop is set.
+     */
+    searchTerm?: string;
+    /**
+     * Called when the value of the filter input changes either from typing or a pasted value.
+     * onSearch should be used when the searchTerm prop is set.
+     */
+    onSearch?: (searchTerm: string) => void;
+    /**
+     * Whether or not the DropdownList is open. When unset (undefined) the DropdownList will
+     * handle the opening and closing internally. The defaultOpen prop can be used to set an
+     * initialization value for uncontrolled widgets.
+     */
+    open?: boolean;
+    /**
+     * Called when the DropdownList is about to open or close. onToggle should be used when the
+     * open prop is set otherwise the widget open buttons won't work.
+     */
+    onToggle?: (isOpen: boolean) => void;
+    /**
+     * Specify a filtering method used to reduce the items in the dropdown as you type. 
+     * There are a few built-in filtering methods that can be specified by passing the String name.
+     * To handle custom filtering techniques provide a function that returns true or false 
+     * for each passed in item (analogous to the array.filter builtin)
+     * @enum false "startsWith" "endsWith" "contains"
+     */
+    filter?: boolean | "startsWith" | "endsWith" | "contains" | ((dataItem: any, str: string) => boolean);
+    /**
+     * Use in conjunction with the filter prop. Filter the list without regard for case. This
+     * only applies to non function values for filter
+     * @default false
+     */
+    caseSensitive?: boolean;
+    /**
+     * Use in conjunction with the filter prop. Start filtering the list only after the value
+     * has reached a minimum length.
+     * @default 1
+     */
+    minLength?: number;
+    /**
+     * Mark whether the widget is in a busy or loading state. If true the widget will display a
+     * spinner gif, useful when loading data via an ajax call.
+     * @default false
+     */
+    busy?: boolean;
+    /**
+     * The speed, in milliseconds, of the dropdown animation.
+     * @default 250
+     */
+    duration?: number;
+    /**
+     * Mark whether the widget should render right-to-left. This property can also be implicitly
+     * passed to the widget through a childContext prop (isRtl) this allows higher level
+     * application components to specify the direction.
+     */
+    isRtl?: boolean;
+    /**
+     * Object hash containing display text and/or text for screen readers. Use the messages
+     * object to localize widget text and increase accessibility.
+     */
+    messages?: DropdownListMessages;
+}
+
+interface DropdownListMessages {
+    /**
+     * Dropdown button text for screen readers.
+     * @default: "Open Dropdown"
+     */
+    open?: string | ((props: DropdownListProps) => string);
+    /**
+     * The placeholder text for the filter input.
+     */
+    filterPlaceholder?: string | ((props: DropdownListProps) => string);
+    /**
+     * Text to display when the data prop array is empty.
+     * @default: "There are no items in this list"
+     */
+    emptyList?: string | ((props: DropdownListProps) => string);
+    /**
+     * Text to display when the the current filter does not return any results.
+     * @default: "The filter returned no results"
+     */
+    emptyFilter?: string | ((props: DropdownListProps) => string);
+}
+
+interface DropdownList extends React.ReactElement<DropdownListProps> {}
+interface DropdownListClass extends React.ComponentClass<DropdownListProps> {}
+declare var DropdownList: DropdownListClass;
+export = DropdownList;
diff --git a/react-widgets/lib/Multiselect.d.ts b/react-widgets/lib/Multiselect.d.ts
new file mode 100644
index 0000000000..3a0f0a527a
--- /dev/null
+++ b/react-widgets/lib/Multiselect.d.ts
@@ -0,0 +1,175 @@
+import * as React from 'react';
+
+interface MultiselectProps extends React.Props<MultiselectClass> {
+    /**
+     * The current values of the Multiselect. The value should can null, or an array of
+     * valueField values, or an array of objects (such as a few items in the data array)
+     */
+    value?: any[];
+    /**
+     * Default Value.
+     */
+    defaultValue?: any[];
+    /**
+     * Change event Handler that is called when the value is changed. The handler is called with
+     * an array of values.
+     */
+    onChange?: (values: any[]) => void;
+    /**
+     * This handler fires when an item has been selected from the list. It fires before the
+     * onChange handler, and fires regardless of whether the value has actually changed
+     */
+    onSelect?: (value: any) => void;
+    /**
+     * This handler fires when the user chooses to create a new tag, not in the data list. It is
+     * up to the widget parent to implement creation logic, a common implementation is shown
+     * below, where the new tag is selected and added to the data list.
+     */
+    onCreate?: (searchTerm: string) => void;
+    /**
+     * Provide an array of possible values for the Multiselect. If an array of objects is
+     * provided you should use the valueField and textField props, to specify which object
+     * properties comprise the value field (such as an id) and the field used to label the item.
+     */
+    data?: any[];
+    /**
+     * A dataItem field name for uniquely identifying items in the data list. A valueField is
+     * required when the value prop is not itself a dataItem. A valueField is useful when
+     * specifying the selected item, by its id instead of using the model as the value. 
+     * When a valueField is not provided, the Multiselect will use strict equality checks (===) 
+     * to locate the value in the data list.
+     */
+    valueField?: string;
+    /**
+     * Specify which data item field to display in the Multiselect and selected item. The
+     * textField prop may also also used as to find an item in the list as you type. Providing
+     * an accessor function allows for computed text values.
+     */
+    textField?: string | ((dataItem: any) => string);
+    /**
+     * This component is used to render each selected item. The default component renders the
+     * text of the selected item (specified by textfield).
+     */
+    tagComponent?: React.ReactType;
+    /**
+     * This component is used to render each possible item in the list. The default component
+     * renders the text of the selected item (specified by textfield).
+     */
+    itemComponent?: React.ReactType;
+    /**
+     * Determines how to group the Multiselect values. Providing a string will group the data
+     * array by that property. You can also provide a 'function' which should return the group
+     * value.
+     */
+    groupBy?: string | ((dataItem: any) => any);
+    /**
+     * This component is used to render each option group, when groupBy is specified. By default
+     * the groupBy value will be used.
+     */
+    groupComponent?: React.ReactType;
+    /**
+     * The same as an input placeholder, only works in browsers that support the placeholder
+     * attribute for inputs
+     */
+    placeholder?: string;
+    /**
+     * The string value of the current search being typed into the Multiselect. When unset
+     * (undefined) the Multiselect will handle the filtering internally. The defaultSearchTerm
+     * prop can be used to set an initialization value for uncontrolled widgets.
+     */
+    searchTerm?: string;
+    /**
+     * Called when the value of the text box changes either from typing or a pasted value.
+     * onSearch should be used when the searchTerm prop is set.
+     */
+    onSearch?: (searchTerm: string) => void;
+    /**
+     * Whether or not the Multiselect is open. When unset (undefined) the Multiselect will
+     * handle the opening and closing internally. The defaultOpen prop can be used to set an
+     * initialization value for uncontrolled widgets.
+     */
+    open?: boolean;
+    /**
+     * Called when the Multiselect is about to open or close. onToggle should be used when the
+     * open prop is set otherwise the widget will never open or close.
+     */
+    onToggle?: (isOpen: boolean) => void;
+    /**
+     * Specify a filtering method used to reduce the items in the dropdown as you type. There
+     * are a few built-in filtering methods that can be specified by passing the String name.
+     * You can explicitly opt out of filtering by setting filter to false. To handle custom
+     * filtering techniques provide a function that returns true or false for each passed in
+     * item (analogous to the array.filter builtin)
+     * @enum false "startsWith" "endsWith" "contains" function(String item)
+     * @default startsWith
+     */
+    filter?: boolean | "startsWith" | "endsWith" | "contains" | ((dataItem: any, searchTerm: string) => boolean);
+    /**
+     * Use in conjunction with the filter prop. Filter the list without regard for case. This
+     * only applies to non function values for filter.
+     * @default false
+     */
+    caseSensitive?: boolean;
+    /**
+     * Use in conjunction with the filter prop. Start filtering the list only after the value
+     * has reached a minimum length.
+     * @default 1
+     */
+    minLength?: number;
+    /**
+     * mark whether the widget is in a busy or loading state. If true the widget will display a
+     * spinner gif, useful when loading data via an ajax call.
+     * @default false
+     */
+    busy?: boolean;
+    /**
+     * The speed, in milliseconds, of the dropdown animation.
+     * @default 250
+     */
+    duration?: number;
+    /**
+     * Disable the widget, If an Array of values is passed in only the tags specified will be
+     * disabled.
+     */
+    disabled?: boolean | any[];
+    /**
+     * Place the widget in a readonly mode, If an Array of values is passed in only the tags
+     * specified will be readonly.
+     */
+    readOnly?: boolean | any[];
+    /**
+     * Mark whether the widget should render right-to-left. This property can also be implicitly
+     * passed to the widget through a childContext prop (isRtl) this allows higher level
+     * application components to specify the direction.
+     * @default false
+     */
+    isRtl?: boolean;
+    /**
+     * Object hash containing display text and/or text for screen readers. Use the messages
+     * object to localize widget text and increase accessibility.
+     */
+    messages?: MultiselectMessages;
+}
+
+interface MultiselectMessages {
+    /**
+     * The text label for creating new tags.
+     * @default "(create new tag)"
+     */
+    createNew?: string | ((props: MultiselectProps) => string);
+    /**
+     * Text to display when the data prop array is empty.
+     * @default "There are no items in this list"
+     */
+    emptyList?: string | ((props: MultiselectProps) => string);
+    /**
+     * Text to display when the the current filter does not return any results.
+     * @default "The filter returned no results"
+     */
+    emptyFilter?: string | ((props: MultiselectProps) => string);
+}
+
+interface Multiselect extends React.ReactElement<MultiselectProps> {}
+interface MultiselectClass extends React.ComponentClass<MultiselectProps> {}
+declare var Multiselect: MultiselectClass;
+export = Multiselect;
diff --git a/react-widgets/lib/NumberPicker.d.ts b/react-widgets/lib/NumberPicker.d.ts
new file mode 100644
index 0000000000..b66dcdeeca
--- /dev/null
+++ b/react-widgets/lib/NumberPicker.d.ts
@@ -0,0 +1,78 @@
+import * as React from 'react';
+
+interface NumberPickerProps extends React.Props<NumberPickerClass>{
+    /**
+     * The current value of the NumberPicker.
+     */
+    value?: number;
+    /**
+     * Default Value.
+     */
+    defaultValue?: number;
+    /**
+     * Change event Handler that is called when the value is changed. The handler is called with
+     * the current numeric value or null.
+     */
+    onChange?: (value?: number) => void;
+    /**
+     * A format string used to display the number value. Localizer dependent, read localization
+     * for more info.
+     * @see http://jquense.github.io/react-widgets/docs/#i18n
+     */
+    format?: any;
+    /**
+     * Determines how the NumberPicker parses a number from the localized string representation.
+     * You can also provide a parser Function to pair with a custom format.
+     */
+    parse?: string[] | ((str: string, culture: string) => number);
+    /**
+     * The minimum number that the NumberPicker value.
+     * @default -Infinity
+     */
+    min?: number;
+    /**
+     * The maximum number that the NumberPicker value.
+     * @default Infinity
+     */
+    max?: number;
+    /**
+     * Amount to increase or decrease value when using the spinner buttons.
+     * @default 1
+     */
+    step?: number;
+    /**
+     * Specify how precise the value should be when typing, incrementing, or decrementing the
+     * value. When empty, precision is parsed from the current format and culture.
+     */
+    precision?: number;
+    /**
+     * Mark whether the widget should render right-to-left. This property can also be implicitly
+     * passed to the widget through a childContext prop (isRtl) this allows higher level
+     * application components to specify the direction.
+     * @default false
+     */
+    isRtl?: boolean;
+    /**
+     * Object hash containing display text and/or text for screen readers. Use the messages
+     * object to localize widget text and increase accessibility.
+     */
+    messages?: NumberPickerMessages;
+}
+
+interface NumberPickerMessages {
+    /**
+     * Number picker spinner up button text for screen readers.
+     * @default "increment value"
+     */
+    increment?: string;
+    /**
+     * Number picker spinner down button text for screen readers.
+     * @default "decrement value"
+     */
+    decrement?: string;
+}
+
+interface NumberPicker extends React.ReactElement<NumberPickerProps> {}
+interface NumberPickerClass extends React.ComponentClass<NumberPickerProps> {}
+declare var NumberPicker: NumberPickerClass;
+export = NumberPicker;
diff --git a/react-widgets/lib/SelectList.d.ts b/react-widgets/lib/SelectList.d.ts
new file mode 100644
index 0000000000..a425589b12
--- /dev/null
+++ b/react-widgets/lib/SelectList.d.ts
@@ -0,0 +1,107 @@
+import * as React from 'react';
+
+interface SelectListProps extends React.Props<SelectListClass>{
+    /**
+     * The current value or values of the SelectList. This can be an object (such as a member of
+     * the data array) or a primitive value, hinted to by the valueField. The widget value does
+     * not need to be in the data array; widgets can have values that are not in their list.
+     */
+    value?: any | any[];
+    /**
+     * Default Value.
+     */
+    defaultValue?: any | any[];
+    /**
+     * Change event handler that is called when the value is changed. values will be an array
+     * when multiple prop is set.
+     */
+    onChange?: (values: any | any[]) => void;
+    /**
+     * Provide an array of possible values for the SelectList. If an array of objects is
+     * provided you should use the valueField and textField props, to specify which object
+     * properties comprise the value field (such as an id) and the field used to label the item.
+     */
+    data?: any[];
+    /**
+     * A dataItem field name for uniquely identifying items in the data list. A valueField is
+     * required when the value prop is not itself a dataItem. A valueField is useful when
+     * specifying the selected item, by its id instead of using the model as the value.
+     * When a valueField is not provided, the SelectList will use strict equality checks (===)
+     * to locate the value in the data list.
+     */
+    valueField?: string;
+    /**
+     * Specify which data item field to display in the SelectList and selected item. The
+     * textField prop may also also used as to find an item in the list as you type. Providing
+     * an accessor function allows for computed text values.
+     */
+    textField?: string | ((dataItem: any) => string);
+    /**
+     * Whether or not the SelectList allows multiple selection or not. when false the SelectList
+     * will render as a list of radio buttons, and checkboxes when true.
+     */
+    multiple?: boolean;
+    /**
+     * This component is used to render each item in the SelectList. The default component
+     * renders the text of the selected item (specified by textfield)
+     */
+    itemComponent?: React.ReactType;
+    /**
+     * Determines how to group the SelectList dropdown list. Providing a string will group the
+     * data array by that property. You can also provide a 'function' which should return the
+     * group value.
+     */
+    groupBy?: string | ((dataItem: any) => any);
+    /**
+     * This component is used to render each option group, when groupBy is specified. By default
+     * the groupBy value will be used.
+     */
+    groupComponent?: React.ReactType;
+    /**
+     * A handler called when focus shifts on the SelectList. Internally this is used to ensure
+     * the focused item is in view. If you want to define your own "scrollTo" behavior or just
+     * disable the default one specify an onMove handler. The handler is called with the
+     * relevant DOM nodes needed to implement scroll behavior: the list element, the element
+     * that is currently focused, and a focused value.
+     */
+    onMove?: (list: HTMLElement, focusedNode: HTMLElement, focusedItem: any) => void;
+    /**
+     * Mark whether the widget is in a busy or loading state. If true the widget will display a
+     * spinner gif, useful when loading data via an ajax call.
+     * @default false
+     */
+    busy?: boolean;
+    /**
+     * Disable the widget, if an Array of values is passed in only those values will be
+     * disabled.
+     */
+    disabled?: boolean | any[];
+    /**
+     * Place the SelectList in a read-only mode, If an Array of values is passed in only those
+     * values will be read-only.
+     */
+    readOnly?: boolean | any[];
+    /**
+     * Mark whether the SelectList should render right-to-left. This property can also be
+     * implicitly passed to the widget through a childContext prop (isRtl) this allows higher
+     * level application components to specify the direction.
+     * @default false
+     */
+    isRtl?: boolean;
+    /**
+     * Object hash containing display text and/or text for screen readers. Use the messages
+     * object to localize widget text and increase accessibility.
+     */
+    messages?: SelectListMessages;
+}
+interface SelectListMessages {
+    /**
+     * @default: "There are no items in this list"
+     */
+    emptyList?: string | ((props: SelectListProps) => string)
+}
+
+interface SelectList extends React.ReactElement<SelectListProps> {}
+interface SelectListClass extends React.ComponentClass<SelectListProps> {}
+declare var SelectList: SelectListClass;
+export = SelectList;
diff --git a/react-widgets/react-widgets-tests.tsx b/react-widgets/react-widgets-tests.tsx
new file mode 100644
index 0000000000..a108d8e513
--- /dev/null
+++ b/react-widgets/react-widgets-tests.tsx
@@ -0,0 +1,58 @@
+
+/// <reference types="react" />
+/// <reference types="react-dom" />
+
+
+import * as React from "react"
+import * as ReactDOM from "react-dom"
+
+import { Calendar, Combobox, DateTimePicker, DropdownList, Multiselect, NumberPicker, SelectList } from "react-widgets"
+
+function tagComponent(props: { value: string }) {
+    return <span>{props.value}</span>;
+}
+
+function itemComponent(props: { value: string }) {
+    return <span>{props.value}</span>;
+}
+
+class Test extends React.Component<React.Props<{}>, {}> {
+
+    render() {
+        return (
+        <div>
+            <div>
+                <Calendar />
+                <Combobox />
+                <DateTimePicker />
+                <DropdownList />
+                <Multiselect />
+                <NumberPicker />
+                <SelectList />
+            </div>
+            <div>
+                <Calendar defaultValue={new Date()} />
+                <Combobox defaultValue={'foo'}/>
+                <DateTimePicker defaultValue={new Date()}/>
+                <DropdownList defaultValue={'foo'}/>
+                <Multiselect defaultValue={['foo']}/>
+                <NumberPicker defaultValue={1}/>
+                <SelectList defaultValue={'foo'}/>
+            </div>
+            <div>
+                <Multiselect
+                    tagComponent={tagComponent}
+                    itemComponent={itemComponent}
+                 />
+                 <Combobox
+                    itemComponent={itemComponent} 
+                 />
+                 <DropdownList
+                    itemComponent={itemComponent} 
+                 />
+            </div>
+        </div>
+        )
+    }
+
+}
\ No newline at end of file
diff --git a/react-widgets/tsconfig.json b/react-widgets/tsconfig.json
new file mode 100644
index 0000000000..5add05fab7
--- /dev/null
+++ b/react-widgets/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-widgets-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/react/index.d.ts b/react/index.d.ts
new file mode 100644
index 0000000000..9e00e19d82
--- /dev/null
+++ b/react/index.d.ts
@@ -0,0 +1,2473 @@
+// Type definitions for React v0.14
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = React;
+export as namespace React;
+
+declare namespace React {
+
+    //
+    // React Elements
+    // ----------------------------------------------------------------------
+
+    type ReactType = string | ComponentClass<any> | StatelessComponent<any>;
+
+    type Key = string | number;
+    type Ref<T> = string | ((instance: T) => any);
+    type ComponentState = {} | void;
+
+    interface Attributes {
+        key?: Key;
+    }
+    interface ClassAttributes<T> extends Attributes {
+        ref?: Ref<T>;
+    }
+
+    interface ReactElement<P> {
+        type: string | ComponentClass<P> | SFC<P>;
+        props: P;
+        key?: Key;
+    }
+
+    interface SFCElement<P> extends ReactElement<P> {
+        type: SFC<P>;
+    }
+
+    type CElement<P, T extends Component<P, ComponentState>> = ComponentElement<P, T>;
+    interface ComponentElement<P, T extends Component<P, ComponentState>> extends ReactElement<P> {
+        type: ComponentClass<P>;
+        ref?: Ref<T>;
+    }
+
+    type ClassicElement<P> = CElement<P, ClassicComponent<P, ComponentState>>;
+
+    interface DOMElement<P extends DOMAttributes, T extends Element> extends ReactElement<P> {
+        type: string;
+        ref: Ref<T>;
+    }
+
+    interface ReactHTMLElement<T extends HTMLElement> extends DOMElement<HTMLAttributes, T> {
+    }
+
+    interface ReactSVGElement extends DOMElement<SVGAttributes, SVGElement> {
+    }
+
+    //
+    // Factories
+    // ----------------------------------------------------------------------
+
+    interface Factory<P> {
+        (props?: P & Attributes, ...children: ReactNode[]): ReactElement<P>;
+    }
+
+    interface SFCFactory<P> {
+        (props?: P & Attributes, ...children: ReactNode[]): SFCElement<P>;
+    }
+
+    interface ComponentFactory<P, T extends Component<P, ComponentState>> {
+        (props?: P & ClassAttributes<T>, ...children: ReactNode[]): CElement<P, T>;
+    }
+
+    type CFactory<P, T extends Component<P, ComponentState>> = ComponentFactory<P, T>;
+    type ClassicFactory<P> = CFactory<P, ClassicComponent<P, ComponentState>>;
+
+    interface DOMFactory<P extends DOMAttributes, T extends Element> {
+        (props?: P & ClassAttributes<T>, ...children: ReactNode[]): DOMElement<P, T>;
+    }
+
+    interface HTMLFactory<T extends HTMLElement> extends DOMFactory<HTMLAttributes, T> {
+    }
+
+    interface SVGFactory extends DOMFactory<SVGAttributes, SVGElement> {
+    }
+
+    //
+    // React Nodes
+    // http://facebook.github.io/react/docs/glossary.html
+    // ----------------------------------------------------------------------
+
+    type ReactText = string | number;
+    type ReactChild = ReactElement<any> | ReactText;
+
+    // Should be Array<ReactNode> but type aliases cannot be recursive
+    type ReactFragment = {} | Array<ReactChild | any[] | boolean>;
+    type ReactNode = ReactChild | ReactFragment | boolean;
+
+    //
+    // Top Level API
+    // ----------------------------------------------------------------------
+
+    function createClass<P, S>(spec: ComponentSpec<P, S>): ClassicComponentClass<P>;
+
+    function createFactory<P extends DOMAttributes, T extends Element>(
+        type: string): DOMFactory<P, T>;
+    function createFactory<P>(type: SFC<P>): SFCFactory<P>;
+    function createFactory<P>(
+        type: ClassType<P, ClassicComponent<P, ComponentState>, ClassicComponentClass<P>>): CFactory<P, ClassicComponent<P, ComponentState>>;
+    function createFactory<P, T extends Component<P, ComponentState>, C extends ComponentClass<P>>(
+        type: ClassType<P, T, C>): CFactory<P, T>;
+    function createFactory<P>(type: ComponentClass<P> | SFC<P>): Factory<P>;
+
+    function createElement<P extends DOMAttributes, T extends Element>(
+        type: string,
+        props?: P & ClassAttributes<T>,
+        ...children: ReactNode[]): DOMElement<P, T>;
+    function createElement<P>(
+        type: SFC<P>,
+        props?: P & Attributes,
+        ...children: ReactNode[]): SFCElement<P>;
+    function createElement<P>(
+        type: ClassType<P, ClassicComponent<P, ComponentState>, ClassicComponentClass<P>>,
+        props?: P & ClassAttributes<ClassicComponent<P, ComponentState>>,
+        ...children: ReactNode[]): CElement<P, ClassicComponent<P, ComponentState>>;
+    function createElement<P, T extends Component<P, ComponentState>, C extends ComponentClass<P>>(
+        type: ClassType<P, T, C>,
+        props?: P & ClassAttributes<T>,
+        ...children: ReactNode[]): CElement<P, T>;
+    function createElement<P>(
+        type: ComponentClass<P> | SFC<P>,
+        props?: P & Attributes,
+        ...children: ReactNode[]): ReactElement<P>;
+
+    function cloneElement<P extends DOMAttributes, T extends Element>(
+        element: DOMElement<P, T>,
+        props?: P & ClassAttributes<T>,
+        ...children: ReactNode[]): DOMElement<P, T>;
+    function cloneElement<P extends Q, Q>(
+        element: SFCElement<P>,
+        props?: Q, // should be Q & Attributes, but then Q is inferred as {}
+        ...children: ReactNode[]): SFCElement<P>;
+    function cloneElement<P extends Q, Q, T extends Component<P, ComponentState>>(
+        element: CElement<P, T>,
+        props?: Q, // should be Q & ClassAttributes<T>
+        ...children: ReactNode[]): CElement<P, T>;
+    function cloneElement<P extends Q, Q>(
+        element: ReactElement<P>,
+        props?: Q, // should be Q & Attributes
+        ...children: ReactNode[]): ReactElement<P>;
+
+    function isValidElement<P>(object: {}): object is ReactElement<P>;
+
+    var DOM: ReactDOM;
+    var PropTypes: ReactPropTypes;
+    var Children: ReactChildren;
+
+    //
+    // Component API
+    // ----------------------------------------------------------------------
+
+    type ReactInstance = Component<any, any> | Element;
+
+    // Base component for plain JS classes
+    class Component<P, S> implements ComponentLifecycle<P, S> {
+        constructor(props?: P, context?: any);
+        setState(f: (prevState: S, props: P) => S, callback?: () => any): void;
+        setState(state: S, callback?: () => any): void;
+        forceUpdate(callBack?: () => any): void;
+        render(): JSX.Element;
+
+        // React.Props<T> is now deprecated, which means that the `children`
+        // property is not available on `P` by default, even though you can
+        // always pass children as variadic arguments to `createElement`.
+        // In the future, if we can define its call signature conditionally
+        // on the existence of `children` in `P`, then we should remove this.
+        props: P & { children?: ReactNode };
+        state: S;
+        context: {};
+        refs: {
+            [key: string]: ReactInstance
+        };
+    }
+
+    interface ClassicComponent<P, S> extends Component<P, S> {
+        replaceState(nextState: S, callback?: () => any): void;
+        isMounted(): boolean;
+        getInitialState?(): S;
+    }
+
+    interface ChildContextProvider<CC> {
+        getChildContext(): CC;
+    }
+
+    //
+    // Class Interfaces
+    // ----------------------------------------------------------------------
+
+    type SFC<P> = StatelessComponent<P>;
+    interface StatelessComponent<P> {
+        (props?: P, context?: any): ReactElement<any>;
+        propTypes?: ValidationMap<P>;
+        contextTypes?: ValidationMap<any>;
+        defaultProps?: P;
+        displayName?: string;
+    }
+
+    interface ComponentClass<P> {
+        new(props?: P, context?: any): Component<P, ComponentState>;
+        propTypes?: ValidationMap<P>;
+        contextTypes?: ValidationMap<any>;
+        childContextTypes?: ValidationMap<any>;
+        defaultProps?: P;
+        displayName?: string;
+    }
+
+    interface ClassicComponentClass<P> extends ComponentClass<P> {
+        new(props?: P, context?: any): ClassicComponent<P, ComponentState>;
+        getDefaultProps?(): P;
+    }
+
+    /**
+     * We use an intersection type to infer multiple type parameters from
+     * a single argument, which is useful for many top-level API defs.
+     * See https://github.com/Microsoft/TypeScript/issues/7234 for more info.
+     */
+    type ClassType<P, T extends Component<P, ComponentState>, C extends ComponentClass<P>> =
+        C &
+        (new() => T) &
+        (new() => { props: P });
+
+    //
+    // Component Specs and Lifecycle
+    // ----------------------------------------------------------------------
+
+    interface ComponentLifecycle<P, S> {
+        componentWillMount?(): void;
+        componentDidMount?(): void;
+        componentWillReceiveProps?(nextProps: P, nextContext: any): void;
+        shouldComponentUpdate?(nextProps: P, nextState: S, nextContext: any): boolean;
+        componentWillUpdate?(nextProps: P, nextState: S, nextContext: any): void;
+        componentDidUpdate?(prevProps: P, prevState: S, prevContext: any): void;
+        componentWillUnmount?(): void;
+    }
+
+    interface Mixin<P, S> extends ComponentLifecycle<P, S> {
+        mixins?: Mixin<P, S>;
+        statics?: {
+            [key: string]: any;
+        };
+
+        displayName?: string;
+        propTypes?: ValidationMap<any>;
+        contextTypes?: ValidationMap<any>;
+        childContextTypes?: ValidationMap<any>;
+
+        getDefaultProps?(): P;
+        getInitialState?(): S;
+    }
+
+    interface ComponentSpec<P, S> extends Mixin<P, S> {
+        render(): ReactElement<any>;
+
+        [propertyName: string]: any;
+    }
+
+    //
+    // Event System
+    // ----------------------------------------------------------------------
+
+    interface SyntheticEvent {
+        bubbles: boolean;
+        cancelable: boolean;
+        currentTarget: EventTarget;
+        defaultPrevented: boolean;
+        eventPhase: number;
+        isTrusted: boolean;
+        nativeEvent: Event;
+        preventDefault(): void;
+        stopPropagation(): void;
+        target: EventTarget;
+        timeStamp: Date;
+        type: string;
+    }
+
+    interface ClipboardEvent extends SyntheticEvent {
+        clipboardData: DataTransfer;
+    }
+
+    interface CompositionEvent extends SyntheticEvent {
+        data: string;
+    }
+
+    interface DragEvent extends SyntheticEvent {
+        dataTransfer: DataTransfer;
+    }
+
+    interface FocusEvent extends SyntheticEvent {
+        relatedTarget: EventTarget;
+    }
+
+    interface FormEvent extends SyntheticEvent {
+    }
+
+    interface KeyboardEvent extends SyntheticEvent {
+        altKey: boolean;
+        charCode: number;
+        ctrlKey: boolean;
+        getModifierState(key: string): boolean;
+        key: string;
+        keyCode: number;
+        locale: string;
+        location: number;
+        metaKey: boolean;
+        repeat: boolean;
+        shiftKey: boolean;
+        which: number;
+    }
+
+    interface MouseEvent extends SyntheticEvent {
+        altKey: boolean;
+        button: number;
+        buttons: number;
+        clientX: number;
+        clientY: number;
+        ctrlKey: boolean;
+        getModifierState(key: string): boolean;
+        metaKey: boolean;
+        pageX: number;
+        pageY: number;
+        relatedTarget: EventTarget;
+        screenX: number;
+        screenY: number;
+        shiftKey: boolean;
+    }
+
+    interface TouchEvent extends SyntheticEvent {
+        altKey: boolean;
+        changedTouches: TouchList;
+        ctrlKey: boolean;
+        getModifierState(key: string): boolean;
+        metaKey: boolean;
+        shiftKey: boolean;
+        targetTouches: TouchList;
+        touches: TouchList;
+    }
+
+    interface UIEvent extends SyntheticEvent {
+        detail: number;
+        view: AbstractView;
+    }
+
+    interface WheelEvent extends SyntheticEvent {
+        deltaMode: number;
+        deltaX: number;
+        deltaY: number;
+        deltaZ: number;
+    }
+
+    //
+    // Event Handler Types
+    // ----------------------------------------------------------------------
+
+    interface EventHandler<E extends SyntheticEvent> {
+        (event: E): void;
+    }
+
+    type ReactEventHandler = EventHandler<SyntheticEvent>;
+
+    type ClipboardEventHandler = EventHandler<ClipboardEvent>;
+    type CompositionEventHandler = EventHandler<CompositionEvent>;
+    type DragEventHandler = EventHandler<DragEvent>;
+    type FocusEventHandler = EventHandler<FocusEvent>;
+    type FormEventHandler = EventHandler<FormEvent>;
+    type KeyboardEventHandler = EventHandler<KeyboardEvent>;
+    type MouseEventHandler = EventHandler<MouseEvent>;
+    type TouchEventHandler = EventHandler<TouchEvent>;
+    type UIEventHandler = EventHandler<UIEvent>;
+    type WheelEventHandler = EventHandler<WheelEvent>;
+
+    //
+    // Props / DOM Attributes
+    // ----------------------------------------------------------------------
+
+    /**
+     * @deprecated. This was used to allow clients to pass `ref` and `key`
+     * to `createElement`, which is no longer necessary due to intersection
+     * types. If you need to declare a props object before passing it to
+     * `createElement` or a factory, use `ClassAttributes<T>`:
+     *
+     * ```ts
+     * var b: Button;
+     * var props: ButtonProps & ClassAttributes<Button> = {
+     *     ref: b => button = b, // ok!
+     *     label: "I'm a Button"
+     * };
+     * ```
+     */
+    interface Props<T> {
+        children?: ReactNode;
+        key?: Key;
+        ref?: Ref<T>;
+    }
+
+    interface HTMLProps<T> extends HTMLAttributes, ClassAttributes<T> {
+    }
+
+    interface SVGProps extends SVGAttributes, ClassAttributes<SVGElement> {
+    }
+
+    interface DOMAttributes {
+        children?: ReactNode;
+        dangerouslySetInnerHTML?: {
+            __html: string;
+        };
+
+        // Clipboard Events
+        onCopy?: ClipboardEventHandler;
+        onCut?: ClipboardEventHandler;
+        onPaste?: ClipboardEventHandler;
+
+        // Composition Events
+        onCompositionEnd?: CompositionEventHandler;
+        onCompositionStart?: CompositionEventHandler;
+        onCompositionUpdate?: CompositionEventHandler;
+
+        // Focus Events
+        onFocus?: FocusEventHandler;
+        onBlur?: FocusEventHandler;
+
+        // Form Events
+        onChange?: FormEventHandler;
+        onInput?: FormEventHandler;
+        onSubmit?: FormEventHandler;
+
+        // Image Events
+        onLoad?: ReactEventHandler;
+        onError?: ReactEventHandler; // also a Media Event
+
+        // Keyboard Events
+        onKeyDown?: KeyboardEventHandler;
+        onKeyPress?: KeyboardEventHandler;
+        onKeyUp?: KeyboardEventHandler;
+
+        // Media Events
+        onAbort?: ReactEventHandler;
+        onCanPlay?: ReactEventHandler;
+        onCanPlayThrough?: ReactEventHandler;
+        onDurationChange?: ReactEventHandler;
+        onEmptied?: ReactEventHandler;
+        onEncrypted?: ReactEventHandler;
+        onEnded?: ReactEventHandler;
+        onLoadedData?: ReactEventHandler;
+        onLoadedMetadata?: ReactEventHandler;
+        onLoadStart?: ReactEventHandler;
+        onPause?: ReactEventHandler;
+        onPlay?: ReactEventHandler;
+        onPlaying?: ReactEventHandler;
+        onProgress?: ReactEventHandler;
+        onRateChange?: ReactEventHandler;
+        onSeeked?: ReactEventHandler;
+        onSeeking?: ReactEventHandler;
+        onStalled?: ReactEventHandler;
+        onSuspend?: ReactEventHandler;
+        onTimeUpdate?: ReactEventHandler;
+        onVolumeChange?: ReactEventHandler;
+        onWaiting?: ReactEventHandler;
+
+        // MouseEvents
+        onClick?: MouseEventHandler;
+        onContextMenu?: MouseEventHandler;
+        onDoubleClick?: MouseEventHandler;
+        onDrag?: DragEventHandler;
+        onDragEnd?: DragEventHandler;
+        onDragEnter?: DragEventHandler;
+        onDragExit?: DragEventHandler;
+        onDragLeave?: DragEventHandler;
+        onDragOver?: DragEventHandler;
+        onDragStart?: DragEventHandler;
+        onDrop?: DragEventHandler;
+        onMouseDown?: MouseEventHandler;
+        onMouseEnter?: MouseEventHandler;
+        onMouseLeave?: MouseEventHandler;
+        onMouseMove?: MouseEventHandler;
+        onMouseOut?: MouseEventHandler;
+        onMouseOver?: MouseEventHandler;
+        onMouseUp?: MouseEventHandler;
+
+        // Selection Events
+        onSelect?: ReactEventHandler;
+
+        // Touch Events
+        onTouchCancel?: TouchEventHandler;
+        onTouchEnd?: TouchEventHandler;
+        onTouchMove?: TouchEventHandler;
+        onTouchStart?: TouchEventHandler;
+
+        // UI Events
+        onScroll?: UIEventHandler;
+
+        // Wheel Events
+        onWheel?: WheelEventHandler;
+    }
+
+    // This interface is not complete. Only properties accepting
+    // unitless numbers are listed here (see CSSProperty.js in React)
+    interface CSSProperties {
+
+        /**
+         * Aligns a flex container's lines within the flex container when there is extra space in the cross-axis, similar to how justify-content aligns individual items within the main-axis.
+         */
+        alignContent?: any;
+
+        /**
+         * Sets the default alignment in the cross axis for all of the flex container's items, including anonymous flex items, similarly to how justify-content aligns items along the main axis.
+         */
+        alignItems?: any;
+
+        /**
+         * Allows the default alignment to be overridden for individual flex items.
+         */
+        alignSelf?: any;
+
+        /**
+         * This property allows precise alignment of elements, such as graphics, that do not have a baseline-table or lack the desired baseline in their baseline-table. With the alignment-adjust property, the position of the baseline identified by the alignment-baseline can be explicitly determined. It also determines precisely the alignment point for each glyph within a textual element.
+         */
+        alignmentAdjust?: any;
+
+        alignmentBaseline?: any;
+
+        /**
+         * Defines a length of time to elapse before an animation starts, allowing an animation to begin execution some time after it is applied.
+         */
+        animationDelay?: any;
+
+        /**
+         * Defines whether an animation should run in reverse on some or all cycles.
+         */
+        animationDirection?: any;
+
+        /**
+         * Specifies how many times an animation cycle should play.
+         */
+        animationIterationCount?: any;
+
+        /**
+         * Defines the list of animations that apply to the element.
+         */
+        animationName?: any;
+
+        /**
+         * Defines whether an animation is running or paused.
+         */
+        animationPlayState?: any;
+
+        /**
+         * Allows changing the style of any element to platform-based interface elements or vice versa.
+         */
+        appearance?: any;
+
+        /**
+         * Determines whether or not the “back” side of a transformed element is visible when facing the viewer.
+         */
+        backfaceVisibility?: any;
+
+        /**
+         * Shorthand property to set the values for one or more of:
+         * background-clip, background-color, background-image,
+         * background-origin, background-position, background-repeat,
+         * background-size, and background-attachment.
+         */
+        background?: any;
+
+        /**
+         * If a background-image is specified, this property determines
+         * whether that image's position is fixed within the viewport,
+         * or scrolls along with its containing block.
+         */
+        backgroundAttachment?: "scroll" | "fixed" | "local";
+
+        /**
+         * This property describes how the element's background images should blend with each other and the element's background color.
+         * The value is a list of blend modes that corresponds to each background image. Each element in the list will apply to the corresponding element of background-image. If a property doesn’t have enough comma-separated values to match the number of layers, the UA must calculate its used value by repeating the list of values until there are enough.
+         */
+        backgroundBlendMode?: any;
+
+        /**
+         * Sets the background color of an element.
+         */
+        backgroundColor?: any;
+
+        backgroundComposite?: any;
+
+        /**
+         * Applies one or more background images to an element. These can be any valid CSS image, including url() paths to image files or CSS gradients.
+         */
+        backgroundImage?: any;
+
+        /**
+         * Specifies what the background-position property is relative to.
+         */
+        backgroundOrigin?: any;
+
+        /**
+         * Sets the position of a background image.
+         */
+        backgroundPosition?: any;
+
+        /**
+         * Background-repeat defines if and how background images will be repeated after they have been sized and positioned
+         */
+        backgroundRepeat?: any;
+
+        /**
+         * Obsolete - spec retired, not implemented.
+         */
+        baselineShift?: any;
+
+        /**
+         * Non standard. Sets or retrieves the location of the Dynamic HTML (DHTML) behavior.
+         */
+        behavior?: any;
+
+        /**
+         * Shorthand property that defines the different properties of all four sides of an element's border in a single declaration. It can be used to set border-width, border-style and border-color, or a subset of these.
+         */
+        border?: any;
+
+        /**
+         * Shorthand that sets the values of border-bottom-color,
+         * border-bottom-style, and border-bottom-width.
+         */
+        borderBottom?: any;
+
+        /**
+         * Sets the color of the bottom border of an element.
+         */
+        borderBottomColor?: any;
+
+        /**
+         * Defines the shape of the border of the bottom-left corner.
+         */
+        borderBottomLeftRadius?: any;
+
+        /**
+         * Defines the shape of the border of the bottom-right corner.
+         */
+        borderBottomRightRadius?: any;
+
+        /**
+         * Sets the line style of the bottom border of a box.
+         */
+        borderBottomStyle?: any;
+
+        /**
+         * Sets the width of an element's bottom border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
+         */
+        borderBottomWidth?: any;
+
+        /**
+         * Border-collapse can be used for collapsing the borders between table cells
+         */
+        borderCollapse?: any;
+
+        /**
+         * The CSS border-color property sets the color of an element's four borders. This property can have from one to four values, made up of the elementary properties:     •       border-top-color
+         *      •       border-right-color
+         *      •       border-bottom-color
+         *      •       border-left-color The default color is the currentColor of each of these values.
+         * If you provide one value, it sets the color for the element. Two values set the horizontal and vertical values, respectively. Providing three values sets the top, vertical, and bottom values, in that order. Four values set all for sides: top, right, bottom, and left, in that order.
+         */
+        borderColor?: any;
+
+        /**
+         * Specifies different corner clipping effects, such as scoop (inner curves), bevel (straight cuts) or notch (cut-off rectangles). Works along with border-radius to specify the size of each corner effect.
+         */
+        borderCornerShape?: any;
+
+        /**
+         * The property border-image-source is used to set the image to be used instead of the border style. If this is set to none the border-style is used instead.
+         */
+        borderImageSource?: any;
+
+        /**
+         * The border-image-width CSS property defines the offset to use for dividing the border image in nine parts, the top-left corner, central top edge, top-right-corner, central right edge, bottom-right corner, central bottom edge, bottom-left corner, and central right edge. They represent inward distance from the top, right, bottom, and left edges.
+         */
+        borderImageWidth?: any;
+
+        /**
+         * Shorthand property that defines the border-width, border-style and border-color of an element's left border in a single declaration. Note that you can use the corresponding longhand properties to set specific individual properties of the left border — border-left-width, border-left-style and border-left-color.
+         */
+        borderLeft?: any;
+
+        /**
+         * The CSS border-left-color property sets the color of an element's left border. This page explains the border-left-color value, but often you will find it more convenient to fix the border's left color as part of a shorthand set, either border-left or border-color.
+         * Colors can be defined several ways. For more information, see Usage.
+         */
+        borderLeftColor?: any;
+
+        /**
+         * Sets the style of an element's left border. To set all four borders, use the shorthand property, border-style. Otherwise, you can set the borders individually with border-top-style, border-right-style, border-bottom-style, border-left-style.
+         */
+        borderLeftStyle?: any;
+
+        /**
+         * Sets the width of an element's left border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
+         */
+        borderLeftWidth?: any;
+
+        /**
+         * Shorthand property that defines the border-width, border-style and border-color of an element's right border in a single declaration. Note that you can use the corresponding longhand properties to set specific individual properties of the right border — border-right-width, border-right-style and border-right-color.
+         */
+        borderRight?: any;
+
+        /**
+         * Sets the color of an element's right border. This page explains the border-right-color value, but often you will find it more convenient to fix the border's right color as part of a shorthand set, either border-right or border-color.
+         * Colors can be defined several ways. For more information, see Usage.
+         */
+        borderRightColor?: any;
+
+        /**
+         * Sets the style of an element's right border. To set all four borders, use the shorthand property, border-style. Otherwise, you can set the borders individually with border-top-style, border-right-style, border-bottom-style, border-left-style.
+         */
+        borderRightStyle?: any;
+
+        /**
+         * Sets the width of an element's right border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
+         */
+        borderRightWidth?: any;
+
+        /**
+         * Specifies the distance between the borders of adjacent cells.
+         */
+        borderSpacing?: any;
+
+        /**
+         * Sets the style of an element's four borders. This property can have from one to four values. With only one value, the value will be applied to all four borders; otherwise, this works as a shorthand property for each of border-top-style, border-right-style, border-bottom-style, border-left-style, where each border style may be assigned a separate value.
+         */
+        borderStyle?: any;
+
+        /**
+         * Shorthand property that defines the border-width, border-style and border-color of an element's top border in a single declaration. Note that you can use the corresponding longhand properties to set specific individual properties of the top border — border-top-width, border-top-style and border-top-color.
+         */
+        borderTop?: any;
+
+        /**
+         * Sets the color of an element's top border. This page explains the border-top-color value, but often you will find it more convenient to fix the border's top color as part of a shorthand set, either border-top or border-color.
+         * Colors can be defined several ways. For more information, see Usage.
+         */
+        borderTopColor?: any;
+
+        /**
+         * Sets the rounding of the top-left corner of the element.
+         */
+        borderTopLeftRadius?: any;
+
+        /**
+         * Sets the rounding of the top-right corner of the element.
+         */
+        borderTopRightRadius?: any;
+
+        /**
+         * Sets the style of an element's top border. To set all four borders, use the shorthand property, border-style. Otherwise, you can set the borders individually with border-top-style, border-right-style, border-bottom-style, border-left-style.
+         */
+        borderTopStyle?: any;
+
+        /**
+         * Sets the width of an element's top border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
+         */
+        borderTopWidth?: any;
+
+        /**
+         * Sets the width of an element's four borders. This property can have from one to four values. This is a shorthand property for setting values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
+         */
+        borderWidth?: any;
+
+        /**
+         * This property specifies how far an absolutely positioned box's bottom margin edge is offset above the bottom edge of the box's containing block. For relatively positioned boxes, the offset is with respect to the bottom edges of the box itself (i.e., the box is given a position in the normal flow, then offset from that position according to these properties).
+         */
+        bottom?: any;
+
+        /**
+         * Obsolete.
+         */
+        boxAlign?: any;
+
+        /**
+         * Breaks a box into fragments creating new borders, padding and repeating backgrounds or lets it stay as a continuous box on a page break, column break, or, for inline elements, at a line break.
+         */
+        boxDecorationBreak?: any;
+
+        /**
+         * Deprecated
+         */
+        boxDirection?: any;
+
+        /**
+         * Do not use. This property has been replaced by the flex-wrap property.
+         * Gets or sets a value that specifies the direction to add successive rows or columns when the value of box-lines is set to multiple.
+         */
+        boxLineProgression?: any;
+
+        /**
+         * Do not use. This property has been replaced by the flex-wrap property.
+         * Gets or sets a value that specifies whether child elements wrap onto multiple lines or columns based on the space available in the object.
+         */
+        boxLines?: any;
+
+        /**
+         * Do not use. This property has been replaced by flex-order.
+         * Specifies the ordinal group that a child element of the object belongs to. This ordinal value identifies the display order (along the axis defined by the box-orient property) for the group.
+         */
+        boxOrdinalGroup?: any;
+
+        /**
+         * Deprecated.
+         */
+        boxFlex?: number;
+
+        /**
+         * Deprecated.
+         */
+        boxFlexGroup?: number;
+
+        /**
+         * The CSS break-after property allows you to force a break on multi-column layouts. More specifically, it allows you to force a break after an element. It allows you to determine if a break should occur, and what type of break it should be. The break-after CSS property describes how the page, column or region break behaves after the generated box. If there is no generated box, the property is ignored.
+         */
+        breakAfter?: any;
+
+        /**
+         * Control page/column/region breaks that fall above a block of content
+         */
+        breakBefore?: any;
+
+        /**
+         * Control page/column/region breaks that fall within a block of content
+         */
+        breakInside?: any;
+
+        /**
+         * The clear CSS property specifies if an element can be positioned next to or must be positioned below the floating elements that precede it in the markup.
+         */
+        clear?: any;
+
+        /**
+         * Deprecated; see clip-path.
+         * Lets you specify the dimensions of an absolutely positioned element that should be visible, and the element is clipped into this shape, and displayed.
+         */
+        clip?: any;
+
+        /**
+         * Clipping crops an graphic, so that only a portion of the graphic is rendered, or filled. This clip-rule property, when used with the clip-path property, defines which clip rule, or algorithm, to use when filling the different parts of a graphics.
+         */
+        clipRule?: any;
+
+        /**
+         * The color property sets the color of an element's foreground content (usually text), accepting any standard CSS color from keywords and hex values to RGB(a) and HSL(a).
+         */
+        color?: any;
+
+        /**
+         * Describes the number of columns of the element.
+         */
+        columnCount?: number;
+
+        /**
+         * Specifies how to fill columns (balanced or sequential).
+         */
+        columnFill?: any;
+
+        /**
+         * The column-gap property controls the width of the gap between columns in multi-column elements.
+         */
+        columnGap?: any;
+
+        /**
+         * Sets the width, style, and color of the rule between columns.
+         */
+        columnRule?: any;
+
+        /**
+         * Specifies the color of the rule between columns.
+         */
+        columnRuleColor?: any;
+
+        /**
+         * Specifies the width of the rule between columns.
+         */
+        columnRuleWidth?: any;
+
+        /**
+         * The column-span CSS property makes it possible for an element to span across all columns when its value is set to all. An element that spans more than one column is called a spanning element.
+         */
+        columnSpan?: any;
+
+        /**
+         * Specifies the width of columns in multi-column elements.
+         */
+        columnWidth?: any;
+
+        /**
+         * This property is a shorthand property for setting column-width and/or column-count.
+         */
+        columns?: any;
+
+        /**
+         * The counter-increment property accepts one or more names of counters (identifiers), each one optionally followed by an integer which specifies the value by which the counter should be incremented (e.g. if the value is 2, the counter increases by 2 each time it is invoked).
+         */
+        counterIncrement?: any;
+
+        /**
+         * The counter-reset property contains a list of one or more names of counters, each one optionally followed by an integer (otherwise, the integer defaults to 0.) Each time the given element is invoked, the counters specified by the property are set to the given integer.
+         */
+        counterReset?: any;
+
+        /**
+         * The cue property specifies sound files (known as an "auditory icon") to be played by speech media agents before and after presenting an element's content; if only one file is specified, it is played both before and after. The volume at which the file(s) should be played, relative to the volume of the main element, may also be specified. The icon files may also be set separately with the cue-before and cue-after properties.
+         */
+        cue?: any;
+
+        /**
+         * The cue-after property specifies a sound file (known as an "auditory icon") to be played by speech media agents after presenting an element's content; the volume at which the file should be played may also be specified. The shorthand property cue sets cue sounds for both before and after the element is presented.
+         */
+        cueAfter?: any;
+
+        /**
+         * Specifies the mouse cursor displayed when the mouse pointer is over an element.
+         */
+        cursor?: any;
+
+        /**
+         * The direction CSS property specifies the text direction/writing direction. The rtl is used for Hebrew or Arabic text, the ltr is for other languages.
+         */
+        direction?: any;
+
+        /**
+         * This property specifies the type of rendering box used for an element. It is a shorthand property for many other display properties.
+         */
+        display?: any;
+
+        /**
+         * The ‘fill’ property paints the interior of the given graphical element. The area to be painted consists of any areas inside the outline of the shape. To determine the inside of the shape, all subpaths are considered, and the interior is determined according to the rules associated with the current value of the ‘fill-rule’ property. The zero-width geometric outline of a shape is included in the area to be painted.
+         */
+        fill?: any;
+
+        /**
+         * SVG: Specifies the opacity of the color or the content the current object is filled with.
+         */
+        fillOpacity?: number;
+
+        /**
+         * The ‘fill-rule’ property indicates the algorithm which is to be used to determine what parts of the canvas are included inside the shape. For a simple, non-intersecting path, it is intuitively clear what region lies "inside"; however, for a more complex path, such as a path that intersects itself or where one subpath encloses another, the interpretation of "inside" is not so obvious.
+         * The ‘fill-rule’ property provides two options for how the inside of a shape is determined:
+         */
+        fillRule?: any;
+
+        /**
+         * Applies various image processing effects. This property is largely unsupported. See Compatibility section for more information.
+         */
+        filter?: any;
+
+        /**
+         * Shorthand for `flex-grow`, `flex-shrink`, and `flex-basis`.
+         */
+        flex?: number | string;
+
+        /**
+         * Obsolete, do not use. This property has been renamed to align-items.
+         * Specifies the alignment (perpendicular to the layout axis defined by the flex-direction property) of child elements of the object.
+         */
+        flexAlign?: any;
+
+        /**
+         * The flex-basis CSS property describes the initial main size of the flex item before any free space is distributed according to the flex factors described in the flex property (flex-grow and flex-shrink).
+         */
+        flexBasis?: any;
+
+        /**
+         * The flex-direction CSS property describes how flex items are placed in the flex container, by setting the direction of the flex container's main axis.
+         */
+        flexDirection?: any;
+
+        /**
+         * The flex-flow CSS property defines the flex container's main and cross axis. It is a shorthand property for the flex-direction and flex-wrap properties.
+         */
+        flexFlow?: any;
+
+        /**
+         * Specifies the flex grow factor of a flex item.
+         */
+        flexGrow?: number;
+
+        /**
+         * Do not use. This property has been renamed to align-self
+         * Specifies the alignment (perpendicular to the layout axis defined by flex-direction) of child elements of the object.
+         */
+        flexItemAlign?: any;
+
+        /**
+         * Do not use. This property has been renamed to align-content.
+         * Specifies how a flexbox's lines align within the flexbox when there is extra space along the axis that is perpendicular to the axis defined by the flex-direction property.
+         */
+        flexLinePack?: any;
+
+        /**
+         * Gets or sets a value that specifies the ordinal group that a flexbox element belongs to. This ordinal value identifies the display order for the group.
+         */
+        flexOrder?: any;
+
+        /**
+         * Specifies the flex shrink factor of a flex item.
+         */
+        flexShrink?: number;
+
+        /**
+         * Elements which have the style float are floated horizontally. These elements can move as far to the left or right of the containing element. All elements after the floating element will flow around it, but elements before the floating element are not impacted. If several floating elements are placed after each other, they will float next to each other as long as there is room.
+         */
+        float?: any;
+
+        /**
+         * Flows content from a named flow (specified by a corresponding flow-into) through selected elements to form a dynamic chain of layout regions.
+         */
+        flowFrom?: any;
+
+        /**
+         * The font property is shorthand that allows you to do one of two things: you can either set up six of the most mature font properties in one line, or you can set one of a choice of keywords to adopt a system font setting.
+         */
+        font?: any;
+
+        /**
+         * The font-family property allows one or more font family names and/or generic family names to be specified for usage on the selected element(s)' text. The browser then goes through the list; for each character in the selection it applies the first font family that has an available glyph for that character.
+         */
+        fontFamily?: any;
+
+        /**
+         * The font-kerning property allows contextual adjustment of inter-glyph spacing, i.e. the spaces between the characters in text. This property controls <bold>metric kerning</bold> - that utilizes adjustment data contained in the font. Optical Kerning is not supported as yet.
+         */
+        fontKerning?: any;
+
+        /**
+         * Specifies the size of the font. Used to compute em and ex units.
+         */
+        fontSize?: number | string;
+
+        /**
+         * The font-size-adjust property adjusts the font-size of the fallback fonts defined with font-family, so that the x-height is the same no matter what font is used. This preserves the readability of the text when fallback happens.
+         */
+        fontSizeAdjust?: any;
+
+        /**
+         * Allows you to expand or condense the widths for a normal, condensed, or expanded font face.
+         */
+        fontStretch?: any;
+
+        /**
+         * The font-style property allows normal, italic, or oblique faces to be selected. Italic forms are generally cursive in nature while oblique faces are typically sloped versions of the regular face. Oblique faces can be simulated by artificially sloping the glyphs of the regular face.
+         */
+        fontStyle?: any;
+
+        /**
+         * This value specifies whether the user agent is allowed to synthesize bold or oblique font faces when a font family lacks bold or italic faces.
+         */
+        fontSynthesis?: any;
+
+        /**
+         * The font-variant property enables you to select the small-caps font within a font family.
+         */
+        fontVariant?: any;
+
+        /**
+         * Fonts can provide alternate glyphs in addition to default glyph for a character. This property provides control over the selection of these alternate glyphs.
+         */
+        fontVariantAlternates?: any;
+
+        /**
+         * Specifies the weight or boldness of the font.
+         */
+        fontWeight?: "normal" | "bold" | "lighter" | "bolder" | number;
+
+        /**
+         * Lays out one or more grid items bound by 4 grid lines. Shorthand for setting grid-column-start, grid-column-end, grid-row-start, and grid-row-end in a single declaration.
+         */
+        gridArea?: any;
+
+        /**
+         * Controls a grid item's placement in a grid area, particularly grid position and a grid span. Shorthand for setting grid-column-start and grid-column-end in a single declaration.
+         */
+        gridColumn?: any;
+
+        /**
+         * Controls a grid item's placement in a grid area as well as grid position and a grid span. The grid-column-end property (with grid-row-start, grid-row-end, and grid-column-start) determines a grid item's placement by specifying the grid lines of a grid item's grid area.
+         */
+        gridColumnEnd?: any;
+
+        /**
+         * Determines a grid item's placement by specifying the starting grid lines of a grid item's grid area . A grid item's placement in a grid area consists of a grid position and a grid span. See also ( grid-row-start, grid-row-end, and grid-column-end)
+         */
+        gridColumnStart?: any;
+
+        /**
+         * Gets or sets a value that indicates which row an element within a Grid should appear in. Shorthand for setting grid-row-start and grid-row-end in a single declaration.
+         */
+        gridRow?: any;
+
+        /**
+         * Determines a grid item’s placement by specifying the block-end. A grid item's placement in a grid area consists of a grid position and a grid span. The grid-row-end property (with grid-row-start, grid-column-start, and grid-column-end) determines a grid item's placement by specifying the grid lines of a grid item's grid area.
+         */
+        gridRowEnd?: any;
+
+        /**
+         * Specifies a row position based upon an integer location, string value, or desired row size.
+         * css/properties/grid-row is used as short-hand for grid-row-position and grid-row-position
+         */
+        gridRowPosition?: any;
+
+        gridRowSpan?: any;
+
+        /**
+         * Specifies named grid areas which are not associated with any particular grid item, but can be referenced from the grid-placement properties. The syntax of the grid-template-areas property also provides a visualization of the structure of the grid, making the overall layout of the grid container easier to understand.
+         */
+        gridTemplateAreas?: any;
+
+        /**
+         * Specifies (with grid-template-rows) the line names and track sizing functions of the grid. Each sizing function can be specified as a length, a percentage of the grid container’s size, a measurement of the contents occupying the column or row, or a fraction of the free space in the grid.
+         */
+        gridTemplateColumns?: any;
+
+        /**
+         * Specifies (with grid-template-columns) the line names and track sizing functions of the grid. Each sizing function can be specified as a length, a percentage of the grid container’s size, a measurement of the contents occupying the column or row, or a fraction of the free space in the grid.
+         */
+        gridTemplateRows?: any;
+
+        /**
+         * Sets the height of an element. The content area of the element height does not include the padding, border, and margin of the element.
+         */
+        height?: any;
+
+        /**
+         * Specifies the minimum number of characters in a hyphenated word
+         */
+        hyphenateLimitChars?: any;
+
+        /**
+         * Indicates the maximum number of successive hyphenated lines in an element. The ‘no-limit’ value means that there is no limit.
+         */
+        hyphenateLimitLines?: any;
+
+        /**
+         * Specifies the maximum amount of trailing whitespace (before justification) that may be left in a line before hyphenation is triggered to pull part of a word from the next line back up into the current one.
+         */
+        hyphenateLimitZone?: any;
+
+        /**
+         * Specifies whether or not words in a sentence can be split by the use of a manual or automatic hyphenation mechanism.
+         */
+        hyphens?: any;
+
+        imeMode?: any;
+
+        layoutGrid?: any;
+
+        layoutGridChar?: any;
+
+        layoutGridLine?: any;
+
+        layoutGridMode?: any;
+
+        layoutGridType?: any;
+
+        /**
+         * Sets the left edge of an element
+         */
+        left?: any;
+
+        /**
+         * The letter-spacing CSS property specifies the spacing behavior between text characters.
+         */
+        letterSpacing?: any;
+
+        /**
+         * Deprecated. Gets or sets line-breaking rules for text in selected languages such as Japanese, Chinese, and Korean.
+         */
+        lineBreak?: any;
+
+        lineClamp?: number;
+
+        /**
+         * Specifies the height of an inline block level element.
+         */
+        lineHeight?: number | string;
+
+        /**
+         * Shorthand property that sets the list-style-type, list-style-position and list-style-image properties in one declaration.
+         */
+        listStyle?: any;
+
+        /**
+         * This property sets the image that will be used as the list item marker. When the image is available, it will replace the marker set with the 'list-style-type' marker. That also means that if the image is not available, it will show the style specified by list-style-property
+         */
+        listStyleImage?: any;
+
+        /**
+         * Specifies if the list-item markers should appear inside or outside the content flow.
+         */
+        listStylePosition?: any;
+
+        /**
+         * Specifies the type of list-item marker in a list.
+         */
+        listStyleType?: any;
+
+        /**
+         * The margin property is shorthand to allow you to set all four margins of an element at once. Its equivalent longhand properties are margin-top, margin-right, margin-bottom and margin-left. Negative values are also allowed.
+         */
+        margin?: any;
+
+        /**
+         * margin-bottom sets the bottom margin of an element.
+         */
+        marginBottom?: any;
+
+        /**
+         * margin-left sets the left margin of an element.
+         */
+        marginLeft?: any;
+
+        /**
+         * margin-right sets the right margin of an element.
+         */
+        marginRight?: any;
+
+        /**
+         * margin-top sets the top margin of an element.
+         */
+        marginTop?: any;
+
+        /**
+         * The marquee-direction determines the initial direction in which the marquee content moves.
+         */
+        marqueeDirection?: any;
+
+        /**
+         * The 'marquee-style' property determines a marquee's scrolling behavior.
+         */
+        marqueeStyle?: any;
+
+        /**
+         * This property is shorthand for setting mask-image, mask-mode, mask-repeat, mask-position, mask-clip, mask-origin, mask-composite and mask-size. Omitted values are set to their original properties' initial values.
+         */
+        mask?: any;
+
+        /**
+         * This property is shorthand for setting mask-border-source, mask-border-slice, mask-border-width, mask-border-outset, and mask-border-repeat. Omitted values are set to their original properties' initial values.
+         */
+        maskBorder?: any;
+
+        /**
+         * This property specifies how the images for the sides and the middle part of the mask image are scaled and tiled. The first keyword applies to the horizontal sides, the second one applies to the vertical ones. If the second keyword is absent, it is assumed to be the same as the first, similar to the CSS border-image-repeat property.
+         */
+        maskBorderRepeat?: any;
+
+        /**
+         * This property specifies inward offsets from the top, right, bottom, and left edges of the mask image, dividing it into nine regions: four corners, four edges, and a middle. The middle image part is discarded and treated as fully transparent black unless the fill keyword is present. The four values set the top, right, bottom and left offsets in that order, similar to the CSS border-image-slice property.
+         */
+        maskBorderSlice?: any;
+
+        /**
+         * Specifies an image to be used as a mask. An image that is empty, fails to download, is non-existent, or cannot be displayed is ignored and does not mask the element.
+         */
+        maskBorderSource?: any;
+
+        /**
+         * This property sets the width of the mask box image, similar to the CSS border-image-width property.
+         */
+        maskBorderWidth?: any;
+
+        /**
+         * Determines the mask painting area, which defines the area that is affected by the mask. The painted content of an element may be restricted to this area.
+         */
+        maskClip?: any;
+
+        /**
+         * For elements rendered as a single box, specifies the mask positioning area. For elements rendered as multiple boxes (e.g., inline boxes on several lines, boxes on several pages) specifies which boxes box-decoration-break operates on to determine the mask positioning area(s).
+         */
+        maskOrigin?: any;
+
+        /**
+         * This property must not be used. It is no longer included in any standard or standard track specification, nor is it implemented in any browser. It is only used when the text-align-last property is set to size. It controls allowed adjustments of font-size to fit line content.
+         */
+        maxFontSize?: any;
+
+        /**
+         * Sets the maximum height for an element. It prevents the height of the element to exceed the specified value. If min-height is specified and is greater than max-height, max-height is overridden.
+         */
+        maxHeight?: any;
+
+        /**
+         * Sets the maximum width for an element. It limits the width property to be larger than the value specified in max-width.
+         */
+        maxWidth?: any;
+
+        /**
+         * Sets the minimum height for an element. It prevents the height of the element to be smaller than the specified value. The value of min-height overrides both max-height and height.
+         */
+        minHeight?: any;
+
+        /**
+         * Sets the minimum width of an element. It limits the width property to be not smaller than the value specified in min-width.
+         */
+        minWidth?: any;
+
+        /**
+         * Specifies the transparency of an element.
+         */
+        opacity?: number;
+
+        /**
+         * Specifies the order used to lay out flex items in their flex container.
+         * Elements are laid out in the ascending order of the order value.
+         */
+        order?: number;
+
+        /**
+         * In paged media, this property defines the minimum number of lines in
+         * a block container that must be left at the bottom of the page.
+         */
+        orphans?: number;
+
+        /**
+         * The CSS outline property is a shorthand property for setting one or more of the individual outline properties outline-style, outline-width and outline-color in a single rule. In most cases the use of this shortcut is preferable and more convenient.
+         * Outlines differ from borders in the following ways:  •       Outlines do not take up space, they are drawn above the content.
+         *      •       Outlines may be non-rectangular. They are rectangular in Gecko/Firefox. Internet Explorer attempts to place the smallest contiguous outline around all elements or shapes that are indicated to have an outline. Opera draws a non-rectangular shape around a construct.
+         */
+        outline?: any;
+
+        /**
+         * The outline-color property sets the color of the outline of an element. An outline is a line that is drawn around elements, outside the border edge, to make the element stand out.
+         */
+        outlineColor?: any;
+
+        /**
+         * The outline-offset property offsets the outline and draw it beyond the border edge.
+         */
+        outlineOffset?: any;
+
+        /**
+         * The overflow property controls how extra content exceeding the bounding box of an element is rendered. It can be used in conjunction with an element that has a fixed width and height, to eliminate text-induced page distortion.
+         */
+        overflow?: any;
+
+        /**
+         * Specifies the preferred scrolling methods for elements that overflow.
+         */
+        overflowStyle?: any;
+
+        /**
+         * Controls how extra content exceeding the x-axis of the bounding box of an element is rendered.
+         */
+        overflowX?: any;
+
+        /**
+         * Controls how extra content exceeding the y-axis of the bounding box of an element is rendered.
+         */
+        overflowY?: any;
+
+        /**
+         * The padding optional CSS property sets the required padding space on one to four sides of an element. The padding area is the space between an element and its border. Negative values are not allowed but decimal values are permitted. The element size is treated as fixed, and the content of the element shifts toward the center as padding is increased.
+         * The padding property is a shorthand to avoid setting each side separately (padding-top, padding-right, padding-bottom, padding-left).
+         */
+        padding?: any;
+
+        /**
+         * The padding-bottom CSS property of an element sets the padding space required on the bottom of an element. The padding area is the space between the content of the element and its border. Contrary to margin-bottom values, negative values of padding-bottom are invalid.
+         */
+        paddingBottom?: any;
+
+        /**
+         * The padding-left CSS property of an element sets the padding space required on the left side of an element. The padding area is the space between the content of the element and its border. Contrary to margin-left values, negative values of padding-left are invalid.
+         */
+        paddingLeft?: any;
+
+        /**
+         * The padding-right CSS property of an element sets the padding space required on the right side of an element. The padding area is the space between the content of the element and its border. Contrary to margin-right values, negative values of padding-right are invalid.
+         */
+        paddingRight?: any;
+
+        /**
+         * The padding-top CSS property of an element sets the padding space required on the top of an element. The padding area is the space between the content of the element and its border. Contrary to margin-top values, negative values of padding-top are invalid.
+         */
+        paddingTop?: any;
+
+        /**
+         * The page-break-after property is supported in all major browsers. With CSS3, page-break-* properties are only aliases of the break-* properties. The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
+         */
+        pageBreakAfter?: any;
+
+        /**
+         * The page-break-before property sets the page-breaking behavior before an element. With CSS3, page-break-* properties are only aliases of the break-* properties. The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
+         */
+        pageBreakBefore?: any;
+
+        /**
+         * Sets the page-breaking behavior inside an element. With CSS3, page-break-* properties are only aliases of the break-* properties. The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
+         */
+        pageBreakInside?: any;
+
+        /**
+         * The pause property determines how long a speech media agent should pause before and after presenting an element. It is a shorthand for the pause-before and pause-after properties.
+         */
+        pause?: any;
+
+        /**
+         * The pause-after property determines how long a speech media agent should pause after presenting an element. It may be replaced by the shorthand property pause, which sets pause time before and after.
+         */
+        pauseAfter?: any;
+
+        /**
+         * The pause-before property determines how long a speech media agent should pause before presenting an element. It may be replaced by the shorthand property pause, which sets pause time before and after.
+         */
+        pauseBefore?: any;
+
+        /**
+         * The perspective property defines how far an element is placed from the view on the z-axis, from the screen to the viewer.
+         * Perspective defines how an object is viewed. In graphic arts, perspective is the representation on a flat surface of what the viewer's eye would see in a 3D space. (See Wikipedia for more information about graphical perspective and for related illustrations.)
+         * The illusion of perspective on a flat surface, such as a computer screen, is created by projecting points on the flat surface as they would appear if the flat surface were a window through which the viewer was looking at the object. In discussion of virtual environments, this flat surface is called a projection plane.
+         */
+        perspective?: any;
+
+        /**
+         * The perspective-origin property establishes the origin for the perspective property. It effectively sets the X and Y position at which the viewer appears to be looking at the children of the element.
+         * When used with perspective, perspective-origin changes the appearance of an object, as if a viewer were looking at it from a different origin. An object appears differently if a viewer is looking directly at it versus looking at it from below, above, or from the side. Thus, the perspective-origin is like a vanishing point.
+         * The default value of perspective-origin is 50% 50%. This displays an object as if the viewer's eye were positioned directly at the center of the screen, both top-to-bottom and left-to-right. A value of 0% 0% changes the object as if the viewer was looking toward the top left angle. A value of 100% 100% changes the appearance as if viewed toward the bottom right angle.
+         */
+        perspectiveOrigin?: any;
+
+        /**
+         * The pointer-events property allows you to control whether an element can be the target for the pointing device (e.g, mouse, pen) events.
+         */
+        pointerEvents?: any;
+
+        /**
+         * The position property controls the type of positioning used by an element within its parent elements. The effect of the position property depends on a lot of factors, for example the position property of parent elements.
+         */
+        position?: any;
+
+        /**
+         * Obsolete: unsupported.
+         * This property determines whether or not a full-width punctuation mark character should be trimmed if it appears at the beginning of a line, so that its "ink" lines up with the first glyph in the line above and below.
+         */
+        punctuationTrim?: any;
+
+        /**
+         * Sets the type of quotation marks for embedded quotations.
+         */
+        quotes?: any;
+
+        /**
+         * Controls whether the last region in a chain displays additional 'overset' content according its default overflow property, or if it displays a fragment of content as if it were flowing into a subsequent region.
+         */
+        regionFragment?: any;
+
+        /**
+         * The rest-after property determines how long a speech media agent should pause after presenting an element's main content, before presenting that element's exit cue sound. It may be replaced by the shorthand property rest, which sets rest time before and after.
+         */
+        restAfter?: any;
+
+        /**
+         * The rest-before property determines how long a speech media agent should pause after presenting an intro cue sound for an element, before presenting that element's main content. It may be replaced by the shorthand property rest, which sets rest time before and after.
+         */
+        restBefore?: any;
+
+        /**
+         * Specifies the position an element in relation to the right side of the containing element.
+         */
+        right?: any;
+
+        rubyAlign?: any;
+
+        rubyPosition?: any;
+
+        /**
+         * Defines the alpha channel threshold used to extract a shape from an image. Can be thought of as a "minimum opacity" threshold; that is, a value of 0.5 means that the shape will enclose all the pixels that are more than 50% opaque.
+         */
+        shapeImageThreshold?: any;
+
+        /**
+         * A future level of CSS Shapes will define a shape-inside property, which will define a shape to wrap content within the element. See Editor's Draft <http://dev.w3.org/csswg/css-shapes/> and CSSWG wiki page on next-level plans <http://wiki.csswg.org/spec/css-shapes>
+         */
+        shapeInside?: any;
+
+        /**
+         * Adds a margin to a shape-outside. In effect, defines a new shape that is the smallest contour around all the points that are the shape-margin distance outward perpendicular to each point on the underlying shape. For points where a perpendicular direction is not defined (e.g., a triangle corner), takes all points on a circle centered at the point and with a radius of the shape-margin distance. This property accepts only non-negative values.
+         */
+        shapeMargin?: any;
+
+        /**
+         * Declares a shape around which text should be wrapped, with possible modifications from the shape-margin property. The shape defined by shape-outside and shape-margin changes the geometry of a float element's float area.
+         */
+        shapeOutside?: any;
+
+        /**
+         * The speak property determines whether or not a speech synthesizer will read aloud the contents of an element.
+         */
+        speak?: any;
+
+        /**
+         * The speak-as property determines how the speech synthesizer interprets the content: words as whole words or as a sequence of letters, numbers as a numerical value or a sequence of digits, punctuation as pauses in speech or named punctuation characters.
+         */
+        speakAs?: any;
+
+        /**
+         * SVG: Specifies the opacity of the outline on the current object.
+         */
+        strokeOpacity?: number;
+
+        /**
+         * SVG: Specifies the width of the outline on the current object.
+         */
+        strokeWidth?: number;
+
+        /**
+         * The tab-size CSS property is used to customise the width of a tab (U+0009) character.
+         */
+        tabSize?: any;
+
+        /**
+         * The 'table-layout' property controls the algorithm used to lay out the table cells, rows, and columns.
+         */
+        tableLayout?: any;
+
+        /**
+         * The text-align CSS property describes how inline content like text is aligned in its parent block element. text-align does not control the alignment of block elements itself, only their inline content.
+         */
+        textAlign?: any;
+
+        /**
+         * The text-align-last CSS property describes how the last line of a block element or a line before line break is aligned in its parent block element.
+         */
+        textAlignLast?: any;
+
+        /**
+         * The text-decoration CSS property is used to set the text formatting to underline, overline, line-through or blink.
+         * underline and overline decorations are positioned under the text, line-through over it.
+         */
+        textDecoration?: any;
+
+        /**
+         * Sets the color of any text decoration, such as underlines, overlines, and strike throughs.
+         */
+        textDecorationColor?: any;
+
+        /**
+         * Sets what kind of line decorations are added to an element, such as underlines, overlines, etc.
+         */
+        textDecorationLine?: any;
+
+        textDecorationLineThrough?: any;
+
+        textDecorationNone?: any;
+
+        textDecorationOverline?: any;
+
+        /**
+         * Specifies what parts of an element’s content are skipped over when applying any text decoration.
+         */
+        textDecorationSkip?: any;
+
+        /**
+         * This property specifies the style of the text decoration line drawn on the specified element. The intended meaning for the values are the same as those of the border-style-properties.
+         */
+        textDecorationStyle?: any;
+
+        textDecorationUnderline?: any;
+
+        /**
+         * The text-emphasis property will apply special emphasis marks to the elements text. Slightly similar to the text-decoration property only that this property can have affect on the line-height. It also is noted that this is shorthand for text-emphasis-style and for text-emphasis-color.
+         */
+        textEmphasis?: any;
+
+        /**
+         * The text-emphasis-color property specifies the foreground color of the emphasis marks.
+         */
+        textEmphasisColor?: any;
+
+        /**
+         * The text-emphasis-style property applies special emphasis marks to an element's text.
+         */
+        textEmphasisStyle?: any;
+
+        /**
+         * This property helps determine an inline box's block-progression dimension, derived from the text-height and font-size properties for non-replaced elements, the height or the width for replaced elements, and the stacked block-progression dimension for inline-block elements. The block-progression dimension determines the position of the padding, border and margin for the element.
+         */
+        textHeight?: any;
+
+        /**
+         * Specifies the amount of space horizontally that should be left on the first line of the text of an element. This horizontal spacing is at the beginning of the first line and is in respect to the left edge of the containing block box.
+         */
+        textIndent?: any;
+
+        textJustifyTrim?: any;
+
+        textKashidaSpace?: any;
+
+        /**
+         * The text-line-through property is a shorthand property for text-line-through-style, text-line-through-color and text-line-through-mode. (Considered obsolete; use text-decoration instead.)
+         */
+        textLineThrough?: any;
+
+        /**
+         * Specifies the line colors for the line-through text decoration.
+         * (Considered obsolete; use text-decoration-color instead.)
+         */
+        textLineThroughColor?: any;
+
+        /**
+         * Sets the mode for the line-through text decoration, determining whether the text decoration affects the space characters or not.
+         * (Considered obsolete; use text-decoration-skip instead.)
+         */
+        textLineThroughMode?: any;
+
+        /**
+         * Specifies the line style for line-through text decoration.
+         * (Considered obsolete; use text-decoration-style instead.)
+         */
+        textLineThroughStyle?: any;
+
+        /**
+         * Specifies the line width for the line-through text decoration.
+         */
+        textLineThroughWidth?: any;
+
+        /**
+         * The text-overflow shorthand CSS property determines how overflowed content that is not displayed is signaled to the users. It can be clipped, display an ellipsis ('…', U+2026 HORIZONTAL ELLIPSIS) or a Web author-defined string. It covers the two long-hand properties text-overflow-mode and text-overflow-ellipsis
+         */
+        textOverflow?: any;
+
+        /**
+         * The text-overline property is the shorthand for the text-overline-style, text-overline-width, text-overline-color, and text-overline-mode properties.
+         */
+        textOverline?: any;
+
+        /**
+         * Specifies the line color for the overline text decoration.
+         */
+        textOverlineColor?: any;
+
+        /**
+         * Sets the mode for the overline text decoration, determining whether the text decoration affects the space characters or not.
+         */
+        textOverlineMode?: any;
+
+        /**
+         * Specifies the line style for overline text decoration.
+         */
+        textOverlineStyle?: any;
+
+        /**
+         * Specifies the line width for the overline text decoration.
+         */
+        textOverlineWidth?: any;
+
+        /**
+         * The text-rendering CSS property provides information to the browser about how to optimize when rendering text. Options are: legibility, speed or geometric precision.
+         */
+        textRendering?: any;
+
+        /**
+         * Obsolete: unsupported.
+         */
+        textScript?: any;
+
+        /**
+         * The CSS text-shadow property applies one or more drop shadows to the text and <text-decorations> of an element. Each shadow is specified as an offset from the text, along with optional color and blur radius values.
+         */
+        textShadow?: any;
+
+        /**
+         * This property transforms text for styling purposes. (It has no effect on the underlying content.)
+         */
+        textTransform?: any;
+
+        /**
+         * Unsupported.
+         * This property will add a underline position value to the element that has an underline defined.
+         */
+        textUnderlinePosition?: any;
+
+        /**
+         * After review this should be replaced by text-decoration should it not?
+         * This property will set the underline style for text with a line value for underline, overline, and line-through.
+         */
+        textUnderlineStyle?: any;
+
+        /**
+         * This property specifies how far an absolutely positioned box's top margin edge is offset below the top edge of the box's containing block. For relatively positioned boxes, the offset is with respect to the top edges of the box itself (i.e., the box is given a position in the normal flow, then offset from that position according to these properties).
+         */
+        top?: any;
+
+        /**
+         * Determines whether touch input may trigger default behavior supplied by the user agent, such as panning or zooming.
+         */
+        touchAction?: any;
+
+        /**
+         * CSS transforms allow elements styled with CSS to be transformed in two-dimensional or three-dimensional space. Using this property, elements can be translated, rotated, scaled, and skewed. The value list may consist of 2D and/or 3D transform values.
+         */
+        transform?: any;
+
+        /**
+         * This property defines the origin of the transformation axes relative to the element to which the transformation is applied.
+         */
+        transformOrigin?: any;
+
+        /**
+         * This property allows you to define the relative position of the origin of the transformation grid along the z-axis.
+         */
+        transformOriginZ?: any;
+
+        /**
+         * This property specifies how nested elements are rendered in 3D space relative to their parent.
+         */
+        transformStyle?: any;
+
+        /**
+         * The transition CSS property is a shorthand property for transition-property, transition-duration, transition-timing-function, and transition-delay. It allows to define the transition between two states of an element.
+         */
+        transition?: any;
+
+        /**
+         * Defines when the transition will start. A value of ‘0s’ means the transition will execute as soon as the property is changed. Otherwise, the value specifies an offset from the moment the property is changed, and the transition will delay execution by that offset.
+         */
+        transitionDelay?: any;
+
+        /**
+         * The 'transition-duration' property specifies the length of time a transition animation takes to complete.
+         */
+        transitionDuration?: any;
+
+        /**
+         * The 'transition-property' property specifies the name of the CSS property to which the transition is applied.
+         */
+        transitionProperty?: any;
+
+        /**
+         * Sets the pace of action within a transition
+         */
+        transitionTimingFunction?: any;
+
+        /**
+         * The unicode-bidi CSS property specifies the level of embedding with respect to the bidirectional algorithm.
+         */
+        unicodeBidi?: any;
+
+        /**
+         * unicode-range allows you to set a specific range of characters to be downloaded from a font (embedded using @font-face) and made available for use on the current page.
+         */
+        unicodeRange?: any;
+
+        /**
+         * This is for all the high level UX stuff.
+         */
+        userFocus?: any;
+
+        /**
+         * For inputing user content
+         */
+        userInput?: any;
+
+        /**
+         * The vertical-align property controls how inline elements or text are vertically aligned compared to the baseline. If this property is used on table-cells it controls the vertical alignment of content of the table cell.
+         */
+        verticalAlign?: any;
+
+        /**
+         * The visibility property specifies whether the boxes generated by an element are rendered.
+         */
+        visibility?: any;
+
+        /**
+         * The voice-balance property sets the apparent position (in stereo sound) of the synthesized voice for spoken media.
+         */
+        voiceBalance?: any;
+
+        /**
+         * The voice-duration property allows the author to explicitly set the amount of time it should take a speech synthesizer to read an element's content, for example to allow the speech to be synchronized with other media. With a value of auto (the default) the length of time it takes to read the content is determined by the content itself and the voice-rate property.
+         */
+        voiceDuration?: any;
+
+        /**
+         * The voice-family property sets the speaker's voice used by a speech media agent to read an element. The speaker may be specified as a named character (to match a voice option in the speech reading software) or as a generic description of the age and gender of the voice. Similar to the font-family property for visual media, a comma-separated list of fallback options may be given in case the speech reader does not recognize the character name or cannot synthesize the requested combination of generic properties.
+         */
+        voiceFamily?: any;
+
+        /**
+         * The voice-pitch property sets pitch or tone (high or low) for the synthesized speech when reading an element; the pitch may be specified absolutely or relative to the normal pitch for the voice-family used to read the text.
+         */
+        voicePitch?: any;
+
+        /**
+         * The voice-range property determines how much variation in pitch or tone will be created by the speech synthesize when reading an element. Emphasized text, grammatical structures and punctuation may all be rendered as changes in pitch, this property determines how strong or obvious those changes are; large ranges are associated with enthusiastic or emotional speech, while small ranges are associated with flat or mechanical speech.
+         */
+        voiceRange?: any;
+
+        /**
+         * The voice-rate property sets the speed at which the voice synthesized by a speech media agent will read content.
+         */
+        voiceRate?: any;
+
+        /**
+         * The voice-stress property sets the level of vocal emphasis to be used for synthesized speech reading the element.
+         */
+        voiceStress?: any;
+
+        /**
+         * The voice-volume property sets the volume for spoken content in speech media. It replaces the deprecated volume property.
+         */
+        voiceVolume?: any;
+
+        /**
+         * The white-space property controls whether and how white space inside the element is collapsed, and whether lines may wrap at unforced "soft wrap" opportunities.
+         */
+        whiteSpace?: any;
+
+        /**
+         * Obsolete: unsupported.
+         */
+        whiteSpaceTreatment?: any;
+
+        /**
+         * In paged media, this property defines the mimimum number of lines
+         * that must be left at the top of the second page.
+         */
+        widows?: number;
+
+        /**
+         * Specifies the width of the content area of an element. The content area of the element width does not include the padding, border, and margin of the element.
+         */
+        width?: any;
+
+        /**
+         * The word-break property is often used when there is long generated content that is strung together without and spaces or hyphens to beak apart. A common case of this is when there is a long URL that does not have any hyphens. This case could potentially cause the breaking of the layout as it could extend past the parent element.
+         */
+        wordBreak?: any;
+
+        /**
+         * The word-spacing CSS property specifies the spacing behavior between "words".
+         */
+        wordSpacing?: any;
+
+        /**
+         * An alias of css/properties/overflow-wrap, word-wrap defines whether to break words when the content exceeds the boundaries of its container.
+         */
+        wordWrap?: any;
+
+        /**
+         * Specifies how exclusions affect inline content within block-level elements. Elements lay out their inline content in their content area but wrap around exclusion areas.
+         */
+        wrapFlow?: any;
+
+        /**
+         * Set the value that is used to offset the inner wrap shape from other shapes. Inline content that intersects a shape with this property will be pushed by this shape's margin.
+         */
+        wrapMargin?: any;
+
+        /**
+         * Obsolete and unsupported. Do not use.
+         * This CSS property controls the text when it reaches the end of the block in which it is enclosed.
+         */
+        wrapOption?: any;
+
+        /**
+         * writing-mode specifies if lines of text are laid out horizontally or vertically, and the direction which lines of text and blocks progress.
+         */
+        writingMode?: any;
+
+        /**
+         * The z-index property specifies the z-order of an element and its descendants.
+         * When elements overlap, z-order determines which one covers the other.
+         */
+        zIndex?: "auto" | number;
+
+        /**
+         * Sets the initial zoom factor of a document defined by @viewport.
+         */
+        zoom?: "auto" | number;
+
+        [propertyName: string]: any;
+    }
+
+    interface HTMLAttributes extends DOMAttributes {
+        // React-specific Attributes
+        defaultChecked?: boolean;
+        defaultValue?: string | string[];
+
+        // Standard HTML Attributes
+        accept?: string;
+        acceptCharset?: string;
+        accessKey?: string;
+        action?: string;
+        allowFullScreen?: boolean;
+        allowTransparency?: boolean;
+        alt?: string;
+        async?: boolean;
+        autoComplete?: string;
+        autoFocus?: boolean;
+        autoPlay?: boolean;
+        capture?: boolean;
+        cellPadding?: number | string;
+        cellSpacing?: number | string;
+        charSet?: string;
+        challenge?: string;
+        checked?: boolean;
+        classID?: string;
+        className?: string;
+        cols?: number;
+        colSpan?: number;
+        content?: string;
+        contentEditable?: boolean;
+        contextMenu?: string;
+        controls?: boolean;
+        coords?: string;
+        crossOrigin?: string;
+        data?: string;
+        dateTime?: string;
+        default?: boolean;
+        defer?: boolean;
+        dir?: string;
+        disabled?: boolean;
+        download?: any;
+        draggable?: boolean;
+        encType?: string;
+        form?: string;
+        formAction?: string;
+        formEncType?: string;
+        formMethod?: string;
+        formNoValidate?: boolean;
+        formTarget?: string;
+        frameBorder?: number | string;
+        headers?: string;
+        height?: number | string;
+        hidden?: boolean;
+        high?: number;
+        href?: string;
+        hrefLang?: string;
+        htmlFor?: string;
+        httpEquiv?: string;
+        icon?: string;
+        id?: string;
+        inputMode?: string;
+        integrity?: string;
+        is?: string;
+        keyParams?: string;
+        keyType?: string;
+        kind?: string;
+        label?: string;
+        lang?: string;
+        list?: string;
+        loop?: boolean;
+        low?: number;
+        manifest?: string;
+        marginHeight?: number;
+        marginWidth?: number;
+        max?: number | string;
+        maxLength?: number;
+        media?: string;
+        mediaGroup?: string;
+        method?: string;
+        min?: number | string;
+        minLength?: number;
+        multiple?: boolean;
+        muted?: boolean;
+        name?: string;
+        nonce?: string;
+        noValidate?: boolean;
+        open?: boolean;
+        optimum?: number;
+        pattern?: string;
+        placeholder?: string;
+        poster?: string;
+        preload?: string;
+        radioGroup?: string;
+        readOnly?: boolean;
+        rel?: string;
+        required?: boolean;
+        reversed?: boolean;
+        role?: string;
+        rows?: number;
+        rowSpan?: number;
+        sandbox?: string;
+        scope?: string;
+        scoped?: boolean;
+        scrolling?: string;
+        seamless?: boolean;
+        selected?: boolean;
+        shape?: string;
+        size?: number;
+        sizes?: string;
+        span?: number;
+        spellCheck?: boolean;
+        src?: string;
+        srcDoc?: string;
+        srcLang?: string;
+        srcSet?: string;
+        start?: number;
+        step?: number | string;
+        style?: CSSProperties;
+        summary?: string;
+        tabIndex?: number;
+        target?: string;
+        title?: string;
+        type?: string;
+        useMap?: string;
+        value?: string | string[];
+        width?: number | string;
+        wmode?: string;
+        wrap?: string;
+
+        // RDFa Attributes
+        about?: string;
+        datatype?: string;
+        inlist?: any;
+        prefix?: string;
+        property?: string;
+        resource?: string;
+        typeof?: string;
+        vocab?: string;
+
+        // Non-standard Attributes
+        autoCapitalize?: string;
+        autoCorrect?: string;
+        autoSave?: string;
+        color?: string;
+        itemProp?: string;
+        itemScope?: boolean;
+        itemType?: string;
+        itemID?: string;
+        itemRef?: string;
+        results?: number;
+        security?: string;
+        unselectable?: boolean;
+
+        // Allows aria- and data- Attributes
+        [key: string]: any;
+    }
+
+    interface SVGAttributes extends HTMLAttributes {
+        clipPath?: string;
+        cx?: number | string;
+        cy?: number | string;
+        d?: string;
+        dx?: number | string;
+        dy?: number | string;
+        fill?: string;
+        fillOpacity?: number | string;
+        fontFamily?: string;
+        fontSize?: number | string;
+        fx?: number | string;
+        fy?: number | string;
+        gradientTransform?: string;
+        gradientUnits?: string;
+        markerEnd?: string;
+        markerMid?: string;
+        markerStart?: string;
+        offset?: number | string;
+        opacity?: number | string;
+        patternContentUnits?: string;
+        patternUnits?: string;
+        points?: string;
+        preserveAspectRatio?: string;
+        r?: number | string;
+        rx?: number | string;
+        ry?: number | string;
+        spreadMethod?: string;
+        stopColor?: string;
+        stopOpacity?: number | string;
+        stroke?: string;
+        strokeDasharray?: string;
+        strokeLinecap?: string;
+        strokeMiterlimit?: string;
+        strokeOpacity?: number | string;
+        strokeWidth?: number | string;
+        textAnchor?: string;
+        transform?: string;
+        version?: string;
+        viewBox?: string;
+        x1?: number | string;
+        x2?: number | string;
+        x?: number | string;
+        xlinkActuate?: string;
+        xlinkArcrole?: string;
+        xlinkHref?: string;
+        xlinkRole?: string;
+        xlinkShow?: string;
+        xlinkTitle?: string;
+        xlinkType?: string;
+        xmlBase?: string;
+        xmlLang?: string;
+        xmlSpace?: string;
+        y1?: number | string;
+        y2?: number | string;
+        y?: number | string;
+    }
+
+    //
+    // React.DOM
+    // ----------------------------------------------------------------------
+
+    interface ReactDOM {
+        // HTML
+        a: HTMLFactory<HTMLAnchorElement>;
+        abbr: HTMLFactory<HTMLElement>;
+        address: HTMLFactory<HTMLElement>;
+        area: HTMLFactory<HTMLAreaElement>;
+        article: HTMLFactory<HTMLElement>;
+        aside: HTMLFactory<HTMLElement>;
+        audio: HTMLFactory<HTMLAudioElement>;
+        b: HTMLFactory<HTMLElement>;
+        base: HTMLFactory<HTMLBaseElement>;
+        bdi: HTMLFactory<HTMLElement>;
+        bdo: HTMLFactory<HTMLElement>;
+        big: HTMLFactory<HTMLElement>;
+        blockquote: HTMLFactory<HTMLElement>;
+        body: HTMLFactory<HTMLBodyElement>;
+        br: HTMLFactory<HTMLBRElement>;
+        button: HTMLFactory<HTMLButtonElement>;
+        canvas: HTMLFactory<HTMLCanvasElement>;
+        caption: HTMLFactory<HTMLElement>;
+        cite: HTMLFactory<HTMLElement>;
+        code: HTMLFactory<HTMLElement>;
+        col: HTMLFactory<HTMLTableColElement>;
+        colgroup: HTMLFactory<HTMLTableColElement>;
+        data: HTMLFactory<HTMLElement>;
+        datalist: HTMLFactory<HTMLDataListElement>;
+        dd: HTMLFactory<HTMLElement>;
+        del: HTMLFactory<HTMLElement>;
+        details: HTMLFactory<HTMLElement>;
+        dfn: HTMLFactory<HTMLElement>;
+        dialog: HTMLFactory<HTMLElement>;
+        div: HTMLFactory<HTMLDivElement>;
+        dl: HTMLFactory<HTMLDListElement>;
+        dt: HTMLFactory<HTMLElement>;
+        em: HTMLFactory<HTMLElement>;
+        embed: HTMLFactory<HTMLEmbedElement>;
+        fieldset: HTMLFactory<HTMLFieldSetElement>;
+        figcaption: HTMLFactory<HTMLElement>;
+        figure: HTMLFactory<HTMLElement>;
+        footer: HTMLFactory<HTMLElement>;
+        form: HTMLFactory<HTMLFormElement>;
+        h1: HTMLFactory<HTMLHeadingElement>;
+        h2: HTMLFactory<HTMLHeadingElement>;
+        h3: HTMLFactory<HTMLHeadingElement>;
+        h4: HTMLFactory<HTMLHeadingElement>;
+        h5: HTMLFactory<HTMLHeadingElement>;
+        h6: HTMLFactory<HTMLHeadingElement>;
+        head: HTMLFactory<HTMLHeadElement>;
+        header: HTMLFactory<HTMLElement>;
+        hgroup: HTMLFactory<HTMLElement>;
+        hr: HTMLFactory<HTMLHRElement>;
+        html: HTMLFactory<HTMLHtmlElement>;
+        i: HTMLFactory<HTMLElement>;
+        iframe: HTMLFactory<HTMLIFrameElement>;
+        img: HTMLFactory<HTMLImageElement>;
+        input: HTMLFactory<HTMLInputElement>;
+        ins: HTMLFactory<HTMLModElement>;
+        kbd: HTMLFactory<HTMLElement>;
+        keygen: HTMLFactory<HTMLElement>;
+        label: HTMLFactory<HTMLLabelElement>;
+        legend: HTMLFactory<HTMLLegendElement>;
+        li: HTMLFactory<HTMLLIElement>;
+        link: HTMLFactory<HTMLLinkElement>;
+        main: HTMLFactory<HTMLElement>;
+        map: HTMLFactory<HTMLMapElement>;
+        mark: HTMLFactory<HTMLElement>;
+        menu: HTMLFactory<HTMLElement>;
+        menuitem: HTMLFactory<HTMLElement>;
+        meta: HTMLFactory<HTMLMetaElement>;
+        meter: HTMLFactory<HTMLElement>;
+        nav: HTMLFactory<HTMLElement>;
+        noscript: HTMLFactory<HTMLElement>;
+        object: HTMLFactory<HTMLObjectElement>;
+        ol: HTMLFactory<HTMLOListElement>;
+        optgroup: HTMLFactory<HTMLOptGroupElement>;
+        option: HTMLFactory<HTMLOptionElement>;
+        output: HTMLFactory<HTMLElement>;
+        p: HTMLFactory<HTMLParagraphElement>;
+        param: HTMLFactory<HTMLParamElement>;
+        picture: HTMLFactory<HTMLElement>;
+        pre: HTMLFactory<HTMLPreElement>;
+        progress: HTMLFactory<HTMLProgressElement>;
+        q: HTMLFactory<HTMLQuoteElement>;
+        rp: HTMLFactory<HTMLElement>;
+        rt: HTMLFactory<HTMLElement>;
+        ruby: HTMLFactory<HTMLElement>;
+        s: HTMLFactory<HTMLElement>;
+        samp: HTMLFactory<HTMLElement>;
+        script: HTMLFactory<HTMLElement>;
+        section: HTMLFactory<HTMLElement>;
+        select: HTMLFactory<HTMLSelectElement>;
+        small: HTMLFactory<HTMLElement>;
+        source: HTMLFactory<HTMLSourceElement>;
+        span: HTMLFactory<HTMLSpanElement>;
+        strong: HTMLFactory<HTMLElement>;
+        style: HTMLFactory<HTMLStyleElement>;
+        sub: HTMLFactory<HTMLElement>;
+        summary: HTMLFactory<HTMLElement>;
+        sup: HTMLFactory<HTMLElement>;
+        table: HTMLFactory<HTMLTableElement>;
+        tbody: HTMLFactory<HTMLTableSectionElement>;
+        td: HTMLFactory<HTMLTableDataCellElement>;
+        textarea: HTMLFactory<HTMLTextAreaElement>;
+        tfoot: HTMLFactory<HTMLTableSectionElement>;
+        th: HTMLFactory<HTMLTableHeaderCellElement>;
+        thead: HTMLFactory<HTMLTableSectionElement>;
+        time: HTMLFactory<HTMLElement>;
+        title: HTMLFactory<HTMLTitleElement>;
+        tr: HTMLFactory<HTMLTableRowElement>;
+        track: HTMLFactory<HTMLTrackElement>;
+        u: HTMLFactory<HTMLElement>;
+        ul: HTMLFactory<HTMLUListElement>;
+        "var": HTMLFactory<HTMLElement>;
+        video: HTMLFactory<HTMLVideoElement>;
+        wbr: HTMLFactory<HTMLElement>;
+
+        // SVG
+        svg: SVGFactory;
+        circle: SVGFactory;
+        defs: SVGFactory;
+        ellipse: SVGFactory;
+        g: SVGFactory;
+        image: SVGFactory;
+        line: SVGFactory;
+        linearGradient: SVGFactory;
+        mask: SVGFactory;
+        path: SVGFactory;
+        pattern: SVGFactory;
+        polygon: SVGFactory;
+        polyline: SVGFactory;
+        radialGradient: SVGFactory;
+        rect: SVGFactory;
+        stop: SVGFactory;
+        symbol: SVGFactory;
+        text: SVGFactory;
+        tspan: SVGFactory;
+        use: SVGFactory;
+    }
+
+    //
+    // React.PropTypes
+    // ----------------------------------------------------------------------
+
+    interface Validator<T> {
+        (object: T, key: string, componentName: string): Error;
+    }
+
+    interface Requireable<T> extends Validator<T> {
+        isRequired: Validator<T>;
+    }
+
+    interface ValidationMap<T> {
+        [key: string]: Validator<T>;
+    }
+
+    interface ReactPropTypes {
+        any: Requireable<any>;
+        array: Requireable<any>;
+        bool: Requireable<any>;
+        func: Requireable<any>;
+        number: Requireable<any>;
+        object: Requireable<any>;
+        string: Requireable<any>;
+        node: Requireable<any>;
+        element: Requireable<any>;
+        instanceOf(expectedClass: {}): Requireable<any>;
+        oneOf(types: any[]): Requireable<any>;
+        oneOfType(types: Validator<any>[]): Requireable<any>;
+        arrayOf(type: Validator<any>): Requireable<any>;
+        objectOf(type: Validator<any>): Requireable<any>;
+        shape(type: ValidationMap<any>): Requireable<any>;
+    }
+
+    //
+    // React.Children
+    // ----------------------------------------------------------------------
+
+    interface ReactChildren {
+        map<T>(children: ReactNode, fn: (child: ReactChild, index: number) => T): T[];
+        forEach(children: ReactNode, fn: (child: ReactChild, index: number) => any): void;
+        count(children: ReactNode): number;
+        only(children: ReactNode): ReactElement<any>;
+        toArray(children: ReactNode): ReactChild[];
+    }
+
+    //
+    // Browser Interfaces
+    // https://github.com/nikeee/2048-typescript/blob/master/2048/js/touch.d.ts
+    // ----------------------------------------------------------------------
+
+    interface AbstractView {
+        styleMedia: StyleMedia;
+        document: Document;
+    }
+
+    interface Touch {
+        identifier: number;
+        target: EventTarget;
+        screenX: number;
+        screenY: number;
+        clientX: number;
+        clientY: number;
+        pageX: number;
+        pageY: number;
+    }
+
+    interface TouchList {
+        [index: number]: Touch;
+        length: number;
+        item(index: number): Touch;
+        identifiedTouch(identifier: number): Touch;
+    }
+}
+
+declare global {
+    namespace JSX {
+        interface Element extends React.ReactElement<any> { }
+        interface ElementClass extends React.Component<any, any> {
+            render(): JSX.Element;
+        }
+        interface ElementAttributesProperty { props: {}; }
+
+        interface IntrinsicAttributes extends React.Attributes { }
+        interface IntrinsicClassAttributes<T> extends React.ClassAttributes<T> { }
+
+        interface IntrinsicElements {
+            // HTML
+            a: React.HTMLProps<HTMLAnchorElement>;
+            abbr: React.HTMLProps<HTMLElement>;
+            address: React.HTMLProps<HTMLElement>;
+            area: React.HTMLProps<HTMLAreaElement>;
+            article: React.HTMLProps<HTMLElement>;
+            aside: React.HTMLProps<HTMLElement>;
+            audio: React.HTMLProps<HTMLAudioElement>;
+            b: React.HTMLProps<HTMLElement>;
+            base: React.HTMLProps<HTMLBaseElement>;
+            bdi: React.HTMLProps<HTMLElement>;
+            bdo: React.HTMLProps<HTMLElement>;
+            big: React.HTMLProps<HTMLElement>;
+            blockquote: React.HTMLProps<HTMLElement>;
+            body: React.HTMLProps<HTMLBodyElement>;
+            br: React.HTMLProps<HTMLBRElement>;
+            button: React.HTMLProps<HTMLButtonElement>;
+            canvas: React.HTMLProps<HTMLCanvasElement>;
+            caption: React.HTMLProps<HTMLElement>;
+            cite: React.HTMLProps<HTMLElement>;
+            code: React.HTMLProps<HTMLElement>;
+            col: React.HTMLProps<HTMLTableColElement>;
+            colgroup: React.HTMLProps<HTMLTableColElement>;
+            data: React.HTMLProps<HTMLElement>;
+            datalist: React.HTMLProps<HTMLDataListElement>;
+            dd: React.HTMLProps<HTMLElement>;
+            del: React.HTMLProps<HTMLElement>;
+            details: React.HTMLProps<HTMLElement>;
+            dfn: React.HTMLProps<HTMLElement>;
+            dialog: React.HTMLProps<HTMLElement>;
+            div: React.HTMLProps<HTMLDivElement>;
+            dl: React.HTMLProps<HTMLDListElement>;
+            dt: React.HTMLProps<HTMLElement>;
+            em: React.HTMLProps<HTMLElement>;
+            embed: React.HTMLProps<HTMLEmbedElement>;
+            fieldset: React.HTMLProps<HTMLFieldSetElement>;
+            figcaption: React.HTMLProps<HTMLElement>;
+            figure: React.HTMLProps<HTMLElement>;
+            footer: React.HTMLProps<HTMLElement>;
+            form: React.HTMLProps<HTMLFormElement>;
+            h1: React.HTMLProps<HTMLHeadingElement>;
+            h2: React.HTMLProps<HTMLHeadingElement>;
+            h3: React.HTMLProps<HTMLHeadingElement>;
+            h4: React.HTMLProps<HTMLHeadingElement>;
+            h5: React.HTMLProps<HTMLHeadingElement>;
+            h6: React.HTMLProps<HTMLHeadingElement>;
+            head: React.HTMLProps<HTMLHeadElement>;
+            header: React.HTMLProps<HTMLElement>;
+            hgroup: React.HTMLProps<HTMLElement>;
+            hr: React.HTMLProps<HTMLHRElement>;
+            html: React.HTMLProps<HTMLHtmlElement>;
+            i: React.HTMLProps<HTMLElement>;
+            iframe: React.HTMLProps<HTMLIFrameElement>;
+            img: React.HTMLProps<HTMLImageElement>;
+            input: React.HTMLProps<HTMLInputElement>;
+            ins: React.HTMLProps<HTMLModElement>;
+            kbd: React.HTMLProps<HTMLElement>;
+            keygen: React.HTMLProps<HTMLElement>;
+            label: React.HTMLProps<HTMLLabelElement>;
+            legend: React.HTMLProps<HTMLLegendElement>;
+            li: React.HTMLProps<HTMLLIElement>;
+            link: React.HTMLProps<HTMLLinkElement>;
+            main: React.HTMLProps<HTMLElement>;
+            map: React.HTMLProps<HTMLMapElement>;
+            mark: React.HTMLProps<HTMLElement>;
+            menu: React.HTMLProps<HTMLElement>;
+            menuitem: React.HTMLProps<HTMLElement>;
+            meta: React.HTMLProps<HTMLMetaElement>;
+            meter: React.HTMLProps<HTMLElement>;
+            nav: React.HTMLProps<HTMLElement>;
+            noscript: React.HTMLProps<HTMLElement>;
+            object: React.HTMLProps<HTMLObjectElement>;
+            ol: React.HTMLProps<HTMLOListElement>;
+            optgroup: React.HTMLProps<HTMLOptGroupElement>;
+            option: React.HTMLProps<HTMLOptionElement>;
+            output: React.HTMLProps<HTMLElement>;
+            p: React.HTMLProps<HTMLParagraphElement>;
+            param: React.HTMLProps<HTMLParamElement>;
+            picture: React.HTMLProps<HTMLElement>;
+            pre: React.HTMLProps<HTMLPreElement>;
+            progress: React.HTMLProps<HTMLProgressElement>;
+            q: React.HTMLProps<HTMLQuoteElement>;
+            rp: React.HTMLProps<HTMLElement>;
+            rt: React.HTMLProps<HTMLElement>;
+            ruby: React.HTMLProps<HTMLElement>;
+            s: React.HTMLProps<HTMLElement>;
+            samp: React.HTMLProps<HTMLElement>;
+            script: React.HTMLProps<HTMLElement>;
+            section: React.HTMLProps<HTMLElement>;
+            select: React.HTMLProps<HTMLSelectElement>;
+            small: React.HTMLProps<HTMLElement>;
+            source: React.HTMLProps<HTMLSourceElement>;
+            span: React.HTMLProps<HTMLSpanElement>;
+            strong: React.HTMLProps<HTMLElement>;
+            style: React.HTMLProps<HTMLStyleElement>;
+            sub: React.HTMLProps<HTMLElement>;
+            summary: React.HTMLProps<HTMLElement>;
+            sup: React.HTMLProps<HTMLElement>;
+            table: React.HTMLProps<HTMLTableElement>;
+            tbody: React.HTMLProps<HTMLTableSectionElement>;
+            td: React.HTMLProps<HTMLTableDataCellElement>;
+            textarea: React.HTMLProps<HTMLTextAreaElement>;
+            tfoot: React.HTMLProps<HTMLTableSectionElement>;
+            th: React.HTMLProps<HTMLTableHeaderCellElement>;
+            thead: React.HTMLProps<HTMLTableSectionElement>;
+            time: React.HTMLProps<HTMLElement>;
+            title: React.HTMLProps<HTMLTitleElement>;
+            tr: React.HTMLProps<HTMLTableRowElement>;
+            track: React.HTMLProps<HTMLTrackElement>;
+            u: React.HTMLProps<HTMLElement>;
+            ul: React.HTMLProps<HTMLUListElement>;
+            "var": React.HTMLProps<HTMLElement>;
+            video: React.HTMLProps<HTMLVideoElement>;
+            wbr: React.HTMLProps<HTMLElement>;
+
+            // SVG
+            svg: React.SVGProps;
+
+            circle: React.SVGProps;
+            clipPath: React.SVGProps;
+            defs: React.SVGProps;
+            ellipse: React.SVGProps;
+            g: React.SVGProps;
+            image: React.SVGProps;
+            line: React.SVGProps;
+            linearGradient: React.SVGProps;
+            mask: React.SVGProps;
+            path: React.SVGProps;
+            pattern: React.SVGProps;
+            polygon: React.SVGProps;
+            polyline: React.SVGProps;
+            radialGradient: React.SVGProps;
+            rect: React.SVGProps;
+            stop: React.SVGProps;
+            symbol: React.SVGProps;
+            text: React.SVGProps;
+            tspan: React.SVGProps;
+            use: React.SVGProps;
+        }
+    }
+}
\ No newline at end of file
diff --git a/react/react-0.13.3.d.ts b/react/react-0.13.3.d.ts
deleted file mode 100644
index a723320141..0000000000
--- a/react/react-0.13.3.d.ts
+++ /dev/null
@@ -1,2038 +0,0 @@
-// Type definitions for React v0.13.3
-// Project: http://facebook.github.io/react/
-// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace __React {
-    //
-    // React Elements
-    // ----------------------------------------------------------------------
-
-    type ReactType = ComponentClass<any> | string;
-
-    interface ReactElement<P> {
-        type: string | ComponentClass<P>;
-        props: P;
-        key: string | number;
-        ref: string | ((component: Component<P, any>) => any);
-    }
-
-    interface ClassicElement<P> extends ReactElement<P> {
-        type: string | ClassicComponentClass<P>;
-        ref: string | ((component: ClassicComponent<P, any>) => any);
-    }
-
-    interface DOMElement<P> extends ClassicElement<P> {
-        type: string;
-        ref: string | ((component: DOMComponent<P>) => any);
-    }
-
-    type HTMLElement = DOMElement<HTMLAttributes>;
-    type SVGElement = DOMElement<SVGAttributes>;
-
-    //
-    // Factories
-    // ----------------------------------------------------------------------
-
-    interface Factory<P> {
-        (props?: P, ...children: ReactNode[]): ReactElement<P>;
-    }
-
-    interface ClassicFactory<P> extends Factory<P> {
-        (props?: P, ...children: ReactNode[]): ClassicElement<P>;
-    }
-
-    interface DOMFactory<P> extends ClassicFactory<P> {
-        (props?: P, ...children: ReactNode[]): DOMElement<P>;
-    }
-
-    type HTMLFactory = DOMFactory<HTMLAttributes>;
-    type SVGFactory = DOMFactory<SVGAttributes>;
-    type SVGElementFactory = DOMFactory<SVGElementAttributes>;
-
-    //
-    // React Nodes
-    // http://facebook.github.io/react/docs/glossary.html
-    // ----------------------------------------------------------------------
-
-    type ReactText = string | number;
-    type ReactChild = ReactElement<any> | ReactText;
-
-    // Should be Array<ReactNode> but type aliases cannot be recursive
-    type ReactFragment = {} | Array<ReactChild | any[] | boolean>;
-    type ReactNode = ReactChild | ReactFragment | boolean;
-
-    //
-    // Top Level API
-    // ----------------------------------------------------------------------
-
-    function createClass<P, S>(spec: ComponentSpec<P, S>): ClassicComponentClass<P>;
-
-    function createFactory<P>(type: string): DOMFactory<P>;
-    function createFactory<P>(type: ClassicComponentClass<P> | string): ClassicFactory<P>;
-    function createFactory<P>(type: ComponentClass<P>): Factory<P>;
-
-    function createElement<P>(
-        type: string,
-        props?: P,
-        ...children: ReactNode[]): DOMElement<P>;
-    function createElement<P>(
-        type: ClassicComponentClass<P> | string,
-        props?: P,
-        ...children: ReactNode[]): ClassicElement<P>;
-    function createElement<P>(
-        type: ComponentClass<P>,
-        props?: P,
-        ...children: ReactNode[]): ReactElement<P>;
-
-    function cloneElement<P>(
-        element: DOMElement<P>,
-        props?: P,
-        ...children: ReactNode[]): DOMElement<P>;
-    function cloneElement<P>(
-        element: ClassicElement<P>,
-        props?: P,
-        ...children: ReactNode[]): ClassicElement<P>;
-    function cloneElement<P>(
-        element: ReactElement<P>,
-        props?: P,
-        ...children: ReactNode[]): ReactElement<P>;
-
-    function render<P>(
-        element: DOMElement<P>,
-        container: Element,
-        callback?: () => any): DOMComponent<P>;
-    function render<P, S>(
-        element: ClassicElement<P>,
-        container: Element,
-        callback?: () => any): ClassicComponent<P, S>;
-    function render<P, S>(
-        element: ReactElement<P>,
-        container: Element,
-        callback?: () => any): Component<P, S>;
-
-    function unmountComponentAtNode(container: Element): boolean;
-    function renderToString(element: ReactElement<any>): string;
-    function renderToStaticMarkup(element: ReactElement<any>): string;
-    function isValidElement(object: {}): boolean;
-    function initializeTouchEvents(shouldUseTouch: boolean): void;
-
-    function findDOMNode<TElement extends Element>(
-        componentOrElement: Component<any, any> | Element): TElement;
-    function findDOMNode(
-        componentOrElement: Component<any, any> | Element): Element;
-
-    var DOM: ReactDOM;
-    var PropTypes: ReactPropTypes;
-    var Children: ReactChildren;
-
-    //
-    // Component API
-    // ----------------------------------------------------------------------
-
-    // Base component for plain JS classes
-    class Component<P, S> implements ComponentLifecycle<P, S> {
-        static propTypes: ValidationMap<any>;
-        static contextTypes: ValidationMap<any>;
-        static childContextTypes: ValidationMap<any>;
-        static defaultProps: Props<any>;
-
-        constructor(props?: P, context?: any);
-        setState(f: (prevState: S, props: P) => S, callback?: () => any): void;
-        setState(state: S, callback?: () => any): void;
-        forceUpdate(callBack?: () => any): void;
-        render(): JSX.Element;
-        props: P;
-        state: S;
-        context: {};
-        refs: {
-            [key: string]: Component<any, any>
-        };
-    }
-
-    interface ClassicComponent<P, S> extends Component<P, S> {
-        replaceState(nextState: S, callback?: () => any): void;
-        getDOMNode<TElement extends Element>(): TElement;
-        getDOMNode(): Element;
-        isMounted(): boolean;
-        getInitialState?(): S;
-        setProps(nextProps: P, callback?: () => any): void;
-        replaceProps(nextProps: P, callback?: () => any): void;
-    }
-
-    interface DOMComponent<P> extends ClassicComponent<P, any> {
-        tagName: string;
-    }
-
-    type HTMLComponent = DOMComponent<HTMLAttributes>;
-    type SVGComponent = DOMComponent<SVGAttributes>;
-
-    interface ChildContextProvider<CC> {
-        getChildContext(): CC;
-    }
-
-    //
-    // Class Interfaces
-    // ----------------------------------------------------------------------
-
-    interface ComponentClass<P> {
-        new(props?: P, context?: any): Component<P, any>;
-        propTypes?: ValidationMap<P>;
-        contextTypes?: ValidationMap<any>;
-        childContextTypes?: ValidationMap<any>;
-        defaultProps?: P;
-    }
-
-    interface ClassicComponentClass<P> extends ComponentClass<P> {
-        new(props?: P, context?: any): ClassicComponent<P, any>;
-        getDefaultProps?(): P;
-        displayName?: string;
-    }
-
-    //
-    // Component Specs and Lifecycle
-    // ----------------------------------------------------------------------
-
-    interface ComponentLifecycle<P, S> {
-        componentWillMount?(): void;
-        componentDidMount?(): void;
-        componentWillReceiveProps?(nextProps: P, nextContext: any): void;
-        shouldComponentUpdate?(nextProps: P, nextState: S, nextContext: any): boolean;
-        componentWillUpdate?(nextProps: P, nextState: S, nextContext: any): void;
-        componentDidUpdate?(prevProps: P, prevState: S, prevContext: any): void;
-        componentWillUnmount?(): void;
-    }
-
-    interface Mixin<P, S> extends ComponentLifecycle<P, S> {
-        mixins?: Mixin<P, S>;
-        statics?: {
-            [key: string]: any;
-        };
-
-        displayName?: string;
-        propTypes?: ValidationMap<any>;
-        contextTypes?: ValidationMap<any>;
-        childContextTypes?: ValidationMap<any>;
-
-        getDefaultProps?(): P;
-        getInitialState?(): S;
-    }
-
-    interface ComponentSpec<P, S> extends Mixin<P, S> {
-        render(): ReactElement<any>;
-
-        [propertyName: string]: any;
-    }
-
-    //
-    // Event System
-    // ----------------------------------------------------------------------
-
-    interface SyntheticEvent {
-        bubbles: boolean;
-        cancelable: boolean;
-        currentTarget: EventTarget;
-        defaultPrevented: boolean;
-        eventPhase: number;
-        isTrusted: boolean;
-        nativeEvent: Event;
-        preventDefault(): void;
-        stopPropagation(): void;
-        target: EventTarget;
-        timeStamp: Date;
-        type: string;
-    }
-
-    interface DragEvent extends SyntheticEvent {
-        dataTransfer: DataTransfer;
-    }
-
-    interface ClipboardEvent extends SyntheticEvent {
-        clipboardData: DataTransfer;
-    }
-
-    interface KeyboardEvent extends SyntheticEvent {
-        altKey: boolean;
-        charCode: number;
-        ctrlKey: boolean;
-        getModifierState(key: string): boolean;
-        key: string;
-        keyCode: number;
-        locale: string;
-        location: number;
-        metaKey: boolean;
-        repeat: boolean;
-        shiftKey: boolean;
-        which: number;
-    }
-
-    interface FocusEvent extends SyntheticEvent {
-        relatedTarget: EventTarget;
-    }
-
-    interface FormEvent extends SyntheticEvent {
-    }
-
-    interface MouseEvent extends SyntheticEvent {
-        altKey: boolean;
-        button: number;
-        buttons: number;
-        clientX: number;
-        clientY: number;
-        ctrlKey: boolean;
-        getModifierState(key: string): boolean;
-        metaKey: boolean;
-        pageX: number;
-        pageY: number;
-        relatedTarget: EventTarget;
-        screenX: number;
-        screenY: number;
-        shiftKey: boolean;
-    }
-
-    interface TouchEvent extends SyntheticEvent {
-        altKey: boolean;
-        changedTouches: TouchList;
-        ctrlKey: boolean;
-        getModifierState(key: string): boolean;
-        metaKey: boolean;
-        shiftKey: boolean;
-        targetTouches: TouchList;
-        touches: TouchList;
-    }
-
-    interface UIEvent extends SyntheticEvent {
-        detail: number;
-        view: AbstractView;
-    }
-
-    interface WheelEvent extends SyntheticEvent {
-        deltaMode: number;
-        deltaX: number;
-        deltaY: number;
-        deltaZ: number;
-    }
-
-    //
-    // Event Handler Types
-    // ----------------------------------------------------------------------
-
-    interface EventHandler<E extends SyntheticEvent> {
-        (event: E): void;
-    }
-
-    interface DragEventHandler extends EventHandler<DragEvent> {}
-    interface ClipboardEventHandler extends EventHandler<ClipboardEvent> {}
-    interface KeyboardEventHandler extends EventHandler<KeyboardEvent> {}
-    interface FocusEventHandler extends EventHandler<FocusEvent> {}
-    interface FormEventHandler extends EventHandler<FormEvent> {}
-    interface MouseEventHandler extends EventHandler<MouseEvent> {}
-    interface TouchEventHandler extends EventHandler<TouchEvent> {}
-    interface UIEventHandler extends EventHandler<UIEvent> {}
-    interface WheelEventHandler extends EventHandler<WheelEvent> {}
-
-    //
-    // Props / DOM Attributes
-    // ----------------------------------------------------------------------
-
-    interface Props<T> {
-        children?: ReactNode;
-        key?: string | number;
-        ref?: string | ((component: T) => any);
-    }
-
-    interface DOMAttributesBase<T> extends Props<T> {
-        onCopy?: ClipboardEventHandler;
-        onCut?: ClipboardEventHandler;
-        onPaste?: ClipboardEventHandler;
-        onKeyDown?: KeyboardEventHandler;
-        onKeyPress?: KeyboardEventHandler;
-        onKeyUp?: KeyboardEventHandler;
-        onFocus?: FocusEventHandler;
-        onBlur?: FocusEventHandler;
-        onChange?: FormEventHandler;
-        onInput?: FormEventHandler;
-        onSubmit?: FormEventHandler;
-        onClick?: MouseEventHandler;
-        onContextMenu?: MouseEventHandler;
-        onDoubleClick?: MouseEventHandler;
-        onDrag?: DragEventHandler;
-        onDragEnd?: DragEventHandler;
-        onDragEnter?: DragEventHandler;
-        onDragExit?: DragEventHandler;
-        onDragLeave?: DragEventHandler;
-        onDragOver?: DragEventHandler;
-        onDragStart?: DragEventHandler;
-        onDrop?: DragEventHandler;
-        onMouseDown?: MouseEventHandler;
-        onMouseEnter?: MouseEventHandler;
-        onMouseLeave?: MouseEventHandler;
-        onMouseMove?: MouseEventHandler;
-        onMouseOut?: MouseEventHandler;
-        onMouseOver?: MouseEventHandler;
-        onMouseUp?: MouseEventHandler;
-        onTouchCancel?: TouchEventHandler;
-        onTouchEnd?: TouchEventHandler;
-        onTouchMove?: TouchEventHandler;
-        onTouchStart?: TouchEventHandler;
-        onScroll?: UIEventHandler;
-        onWheel?: WheelEventHandler;
-
-        className?: string;
-        id?: string;
-
-        dangerouslySetInnerHTML?: {
-            __html: string;
-        };
-    }
-
-    interface DOMAttributes extends DOMAttributesBase<DOMComponent<any>> {
-    }
-
-    // This interface is not complete. Only properties accepting
-    // unitless numbers are listed here (see CSSProperty.js in React)
-    interface CSSProperties {
-        boxFlex?: number;
-        boxFlexGroup?: number;
-        columnCount?: number;
-        flex?: number | string;
-        flexGrow?: number;
-        flexShrink?: number;
-        fontWeight?: number | string;
-        lineClamp?: number;
-        lineHeight?: number | string;
-        opacity?: number;
-        order?: number;
-        orphans?: number;
-        widows?: number;
-        zIndex?: number;
-        zoom?: number;
-
-        fontSize?: number | string;
-
-        // SVG-related properties
-        fillOpacity?: number;
-        strokeOpacity?: number;
-        strokeWidth?: number;
-
-        [propertyName: string]: any;
-    }
-
-    interface HTMLAttributesBase<T> extends DOMAttributesBase<T> {
-        accept?: string;
-        acceptCharset?: string;
-        accessKey?: string;
-        action?: string;
-        allowFullScreen?: boolean;
-        allowTransparency?: boolean;
-        alt?: string;
-        async?: boolean;
-        autoComplete?: boolean;
-        autoFocus?: boolean;
-        autoPlay?: boolean;
-        cellPadding?: number | string;
-        cellSpacing?: number | string;
-        charSet?: string;
-        checked?: boolean;
-        classID?: string;
-        cols?: number;
-        colSpan?: number;
-        content?: string;
-        contentEditable?: boolean;
-        contextMenu?: string;
-        controls?: any;
-        coords?: string;
-        crossOrigin?: string;
-        data?: string;
-        dateTime?: string;
-        defaultChecked?: boolean;
-        defaultValue?: string;
-        defer?: boolean;
-        dir?: string;
-        disabled?: boolean;
-        download?: any;
-        draggable?: boolean;
-        encType?: string;
-        form?: string;
-        formAction?: string;
-        formEncType?: string;
-        formMethod?: string;
-        formNoValidate?: boolean;
-        formTarget?: string;
-        frameBorder?: number | string;
-        headers?: string;
-        height?: number | string;
-        hidden?: boolean;
-        high?: number;
-        href?: string;
-        hrefLang?: string;
-        htmlFor?: string;
-        httpEquiv?: string;
-        icon?: string;
-        label?: string;
-        lang?: string;
-        list?: string;
-        loop?: boolean;
-        low?: number;
-        manifest?: string;
-        marginHeight?: number;
-        marginWidth?: number;
-        max?: number | string;
-        maxLength?: number;
-        media?: string;
-        mediaGroup?: string;
-        method?: string;
-        min?: number | string;
-        multiple?: boolean;
-        muted?: boolean;
-        name?: string;
-        noValidate?: boolean;
-        open?: boolean;
-        optimum?: number;
-        pattern?: string;
-        placeholder?: string;
-        poster?: string;
-        preload?: string;
-        radioGroup?: string;
-        readOnly?: boolean;
-        rel?: string;
-        required?: boolean;
-        role?: string;
-        rows?: number;
-        rowSpan?: number;
-        sandbox?: string;
-        scope?: string;
-        scoped?: boolean;
-        scrolling?: string;
-        seamless?: boolean;
-        selected?: boolean;
-        shape?: string;
-        size?: number;
-        sizes?: string;
-        span?: number;
-        spellCheck?: boolean;
-        src?: string;
-        srcDoc?: string;
-        srcSet?: string;
-        start?: number;
-        step?: number | string;
-        style?: CSSProperties;
-        tabIndex?: number;
-        target?: string;
-        title?: string;
-        type?: string;
-        useMap?: string;
-        value?: string;
-        width?: number | string;
-        wmode?: string;
-
-        // Non-standard Attributes
-        autoCapitalize?: boolean;
-        autoCorrect?: boolean;
-        property?: string;
-        itemProp?: string;
-        itemScope?: boolean;
-        itemType?: string;
-        unselectable?: boolean;
-    }
-
-    interface HTMLAttributes extends HTMLAttributesBase<HTMLComponent> {
-    }
-
-    interface SVGElementAttributes extends HTMLAttributes {
-        viewBox?: string;
-        preserveAspectRatio?: string;
-    }
-
-    interface SVGAttributes extends DOMAttributes {
-        ref?: string | ((component: SVGComponent) => void);
-
-        cx?: number | string;
-        cy?: number | string;
-        d?: string;
-        dx?: number | string;
-        dy?: number | string;
-        fill?: string;
-        fillOpacity?: number | string;
-        fontFamily?: string;
-        fontSize?: number | string;
-        fx?: number | string;
-        fy?: number | string;
-        gradientTransform?: string;
-        gradientUnits?: string;
-        height?: number | string;
-        markerEnd?: string;
-        markerMid?: string;
-        markerStart?: string;
-        offset?: number | string;
-        opacity?: number | string;
-        patternContentUnits?: string;
-        patternUnits?: string;
-        points?: string;
-        preserveAspectRatio?: string;
-        r?: number | string;
-        rx?: number | string;
-        ry?: number | string;
-        spreadMethod?: string;
-        stopColor?: string;
-        stopOpacity?: number | string;
-        stroke?: string;
-        strokeDasharray?: string;
-        strokeLinecap?: string;
-        strokeMiterlimit?: string;
-        strokeOpacity?: number | string;
-        strokeWidth?: number | string;
-        textAnchor?: string;
-        transform?: string;
-        version?: string;
-        viewBox?: string;
-        width?: number | string;
-        x1?: number | string;
-        x2?: number | string;
-        x?: number | string;
-        y1?: number | string;
-        y2?: number | string;
-        y?: number | string;
-    }
-
-    //
-    // React.DOM
-    // ----------------------------------------------------------------------
-
-    interface ReactDOM {
-        // HTML
-        a: HTMLFactory;
-        abbr: HTMLFactory;
-        address: HTMLFactory;
-        area: HTMLFactory;
-        article: HTMLFactory;
-        aside: HTMLFactory;
-        audio: HTMLFactory;
-        b: HTMLFactory;
-        base: HTMLFactory;
-        bdi: HTMLFactory;
-        bdo: HTMLFactory;
-        big: HTMLFactory;
-        blockquote: HTMLFactory;
-        body: HTMLFactory;
-        br: HTMLFactory;
-        button: HTMLFactory;
-        canvas: HTMLFactory;
-        caption: HTMLFactory;
-        cite: HTMLFactory;
-        code: HTMLFactory;
-        col: HTMLFactory;
-        colgroup: HTMLFactory;
-        data: HTMLFactory;
-        datalist: HTMLFactory;
-        dd: HTMLFactory;
-        del: HTMLFactory;
-        details: HTMLFactory;
-        dfn: HTMLFactory;
-        dialog: HTMLFactory;
-        div: HTMLFactory;
-        dl: HTMLFactory;
-        dt: HTMLFactory;
-        em: HTMLFactory;
-        embed: HTMLFactory;
-        fieldset: HTMLFactory;
-        figcaption: HTMLFactory;
-        figure: HTMLFactory;
-        footer: HTMLFactory;
-        form: HTMLFactory;
-        h1: HTMLFactory;
-        h2: HTMLFactory;
-        h3: HTMLFactory;
-        h4: HTMLFactory;
-        h5: HTMLFactory;
-        h6: HTMLFactory;
-        head: HTMLFactory;
-        header: HTMLFactory;
-        hr: HTMLFactory;
-        html: HTMLFactory;
-        i: HTMLFactory;
-        iframe: HTMLFactory;
-        img: HTMLFactory;
-        input: HTMLFactory;
-        ins: HTMLFactory;
-        kbd: HTMLFactory;
-        keygen: HTMLFactory;
-        label: HTMLFactory;
-        legend: HTMLFactory;
-        li: HTMLFactory;
-        link: HTMLFactory;
-        main: HTMLFactory;
-        map: HTMLFactory;
-        mark: HTMLFactory;
-        menu: HTMLFactory;
-        menuitem: HTMLFactory;
-        meta: HTMLFactory;
-        meter: HTMLFactory;
-        nav: HTMLFactory;
-        noscript: HTMLFactory;
-        object: HTMLFactory;
-        ol: HTMLFactory;
-        optgroup: HTMLFactory;
-        option: HTMLFactory;
-        output: HTMLFactory;
-        p: HTMLFactory;
-        param: HTMLFactory;
-        picture: HTMLFactory;
-        pre: HTMLFactory;
-        progress: HTMLFactory;
-        q: HTMLFactory;
-        rp: HTMLFactory;
-        rt: HTMLFactory;
-        ruby: HTMLFactory;
-        s: HTMLFactory;
-        samp: HTMLFactory;
-        script: HTMLFactory;
-        section: HTMLFactory;
-        select: HTMLFactory;
-        small: HTMLFactory;
-        source: HTMLFactory;
-        span: HTMLFactory;
-        strong: HTMLFactory;
-        style: HTMLFactory;
-        sub: HTMLFactory;
-        summary: HTMLFactory;
-        sup: HTMLFactory;
-        table: HTMLFactory;
-        tbody: HTMLFactory;
-        td: HTMLFactory;
-        textarea: HTMLFactory;
-        tfoot: HTMLFactory;
-        th: HTMLFactory;
-        thead: HTMLFactory;
-        time: HTMLFactory;
-        title: HTMLFactory;
-        tr: HTMLFactory;
-        track: HTMLFactory;
-        u: HTMLFactory;
-        ul: HTMLFactory;
-        "var": HTMLFactory;
-        video: HTMLFactory;
-        wbr: HTMLFactory;
-
-        // SVG
-        svg: SVGElementFactory;
-        circle: SVGFactory;
-        defs: SVGFactory;
-        ellipse: SVGFactory;
-        g: SVGFactory;
-        line: SVGFactory;
-        linearGradient: SVGFactory;
-        mask: SVGFactory;
-        path: SVGFactory;
-        pattern: SVGFactory;
-        polygon: SVGFactory;
-        polyline: SVGFactory;
-        radialGradient: SVGFactory;
-        rect: SVGFactory;
-        stop: SVGFactory;
-        text: SVGFactory;
-        tspan: SVGFactory;
-    }
-
-    //
-    // React.PropTypes
-    // ----------------------------------------------------------------------
-
-    interface Validator<T> {
-        (object: T, key: string, componentName: string): Error;
-    }
-
-    interface Requireable<T> extends Validator<T> {
-        isRequired: Validator<T>;
-    }
-
-    interface ValidationMap<T> {
-        [key: string]: Validator<T>;
-    }
-
-    interface ReactPropTypes {
-        any: Requireable<any>;
-        array: Requireable<any>;
-        bool: Requireable<any>;
-        func: Requireable<any>;
-        number: Requireable<any>;
-        object: Requireable<any>;
-        string: Requireable<any>;
-        node: Requireable<any>;
-        element: Requireable<any>;
-        instanceOf(expectedClass: {}): Requireable<any>;
-        oneOf(types: any[]): Requireable<any>;
-        oneOfType(types: Validator<any>[]): Requireable<any>;
-        arrayOf(type: Validator<any>): Requireable<any>;
-        objectOf(type: Validator<any>): Requireable<any>;
-        shape(type: ValidationMap<any>): Requireable<any>;
-    }
-
-    //
-    // React.Children
-    // ----------------------------------------------------------------------
-
-    interface ReactChildren {
-        map<T>(children: ReactNode, fn: (child: ReactChild, index: number) => T): { [key:string]: T };
-        forEach(children: ReactNode, fn: (child: ReactChild, index: number) => any): void;
-        count(children: ReactNode): number;
-        only(children: ReactNode): ReactChild;
-    }
-
-    //
-    // Browser Interfaces
-    // https://github.com/nikeee/2048-typescript/blob/master/2048/js/touch.d.ts
-    // ----------------------------------------------------------------------
-
-    interface AbstractView {
-        styleMedia: StyleMedia;
-        document: Document;
-    }
-
-    interface Touch {
-        identifier: number;
-        target: EventTarget;
-        screenX: number;
-        screenY: number;
-        clientX: number;
-        clientY: number;
-        pageX: number;
-        pageY: number;
-    }
-
-    interface TouchList {
-        [index: number]: Touch;
-        length: number;
-        item(index: number): Touch;
-        identifiedTouch(identifier: number): Touch;
-    }
-}
-
-declare module "react" {
-    export = __React;
-}
-
-declare module "react/addons" {
-    //
-    // React Elements
-    // ----------------------------------------------------------------------
-
-    type ReactType = ComponentClass<any> | string;
-
-    interface ReactElement<P> {
-        type: string | ComponentClass<P>;
-        props: P;
-        key: string | number;
-        ref: string | ((component: Component<P, any>) => any);
-    }
-
-    interface ClassicElement<P> extends ReactElement<P> {
-        type: string | ClassicComponentClass<P>;
-        ref: string | ((component: ClassicComponent<P, any>) => any);
-    }
-
-    interface DOMElement<P> extends ClassicElement<P> {
-        type: string;
-        ref: string | ((component: DOMComponent<P>) => any);
-    }
-
-    type HTMLElement = DOMElement<HTMLAttributes>;
-    type SVGElement = DOMElement<SVGAttributes>;
-
-    //
-    // Factories
-    // ----------------------------------------------------------------------
-
-    interface Factory<P> {
-        (props?: P, ...children: ReactNode[]): ReactElement<P>;
-    }
-
-    interface ClassicFactory<P> extends Factory<P> {
-        (props?: P, ...children: ReactNode[]): ClassicElement<P>;
-    }
-
-    interface DOMFactory<P> extends ClassicFactory<P> {
-        (props?: P, ...children: ReactNode[]): DOMElement<P>;
-    }
-
-    type HTMLFactory = DOMFactory<HTMLAttributes>;
-    type SVGFactory = DOMFactory<SVGAttributes>;
-    type SVGElementFactory = DOMFactory<SVGElementAttributes>;
-
-    //
-    // React Nodes
-    // http://facebook.github.io/react/docs/glossary.html
-    // ----------------------------------------------------------------------
-
-    type ReactText = string | number;
-    type ReactChild = ReactElement<any> | ReactText;
-
-    // Should be Array<ReactNode> but type aliases cannot be recursive
-    type ReactFragment = {} | Array<ReactChild | any[] | boolean>;
-    type ReactNode = ReactChild | ReactFragment | boolean;
-
-    //
-    // Top Level API
-    // ----------------------------------------------------------------------
-
-    function createClass<P, S>(spec: ComponentSpec<P, S>): ClassicComponentClass<P>;
-
-    function createFactory<P>(type: string): DOMFactory<P>;
-    function createFactory<P>(type: ClassicComponentClass<P> | string): ClassicFactory<P>;
-    function createFactory<P>(type: ComponentClass<P>): Factory<P>;
-
-    function createElement<P>(
-        type: string,
-        props?: P,
-        ...children: ReactNode[]): DOMElement<P>;
-    function createElement<P>(
-        type: ClassicComponentClass<P> | string,
-        props?: P,
-        ...children: ReactNode[]): ClassicElement<P>;
-    function createElement<P>(
-        type: ComponentClass<P>,
-        props?: P,
-        ...children: ReactNode[]): ReactElement<P>;
-
-    function cloneElement<P>(
-        element: DOMElement<P>,
-        props?: P,
-        ...children: ReactNode[]): DOMElement<P>;
-    function cloneElement<P>(
-        element: ClassicElement<P>,
-        props?: P,
-        ...children: ReactNode[]): ClassicElement<P>;
-    function cloneElement<P>(
-        element: ReactElement<P>,
-        props?: P,
-        ...children: ReactNode[]): ReactElement<P>;
-
-    function render<P>(
-        element: DOMElement<P>,
-        container: Element,
-        callback?: () => any): DOMComponent<P>;
-    function render<P, S>(
-        element: ClassicElement<P>,
-        container: Element,
-        callback?: () => any): ClassicComponent<P, S>;
-    function render<P, S>(
-        element: ReactElement<P>,
-        container: Element,
-        callback?: () => any): Component<P, S>;
-
-    function unmountComponentAtNode(container: Element): boolean;
-    function renderToString(element: ReactElement<any>): string;
-    function renderToStaticMarkup(element: ReactElement<any>): string;
-    function isValidElement(object: {}): boolean;
-    function initializeTouchEvents(shouldUseTouch: boolean): void;
-
-    function findDOMNode<TElement extends Element>(
-        componentOrElement: Component<any, any> | Element): TElement;
-    function findDOMNode(
-        componentOrElement: Component<any, any> | Element): Element;
-
-    var DOM: ReactDOM;
-    var PropTypes: ReactPropTypes;
-    var Children: ReactChildren;
-
-    //
-    // Component API
-    // ----------------------------------------------------------------------
-
-    // Base component for plain JS classes
-    class Component<P, S> implements ComponentLifecycle<P, S> {
-        static propTypes: ValidationMap<any>;
-        static contextTypes: ValidationMap<any>;
-        static childContextTypes: ValidationMap<any>;
-        static defaultProps: Props<any>;
-
-        constructor(props?: P, context?: any);
-        setState(f: (prevState: S, props: P) => S, callback?: () => any): void;
-        setState(state: S, callback?: () => any): void;
-        forceUpdate(callBack?: () => any): void;
-        render(): JSX.Element;
-        props: P;
-        state: S;
-        context: {};
-        refs: {
-            [key: string]: Component<any, any>
-        };
-    }
-
-    interface ClassicComponent<P, S> extends Component<P, S> {
-        replaceState(nextState: S, callback?: () => any): void;
-        getDOMNode<TElement extends Element>(): TElement;
-        getDOMNode(): Element;
-        isMounted(): boolean;
-        getInitialState?(): S;
-        setProps(nextProps: P, callback?: () => any): void;
-        replaceProps(nextProps: P, callback?: () => any): void;
-    }
-
-    interface DOMComponent<P> extends ClassicComponent<P, any> {
-        tagName: string;
-    }
-
-    type HTMLComponent = DOMComponent<HTMLAttributes>;
-    type SVGComponent = DOMComponent<SVGAttributes>;
-
-    interface ChildContextProvider<CC> {
-        getChildContext(): CC;
-    }
-
-    //
-    // Class Interfaces
-    // ----------------------------------------------------------------------
-
-    interface ComponentClass<P> {
-        new(props?: P, context?: any): Component<P, any>;
-        propTypes?: ValidationMap<P>;
-        contextTypes?: ValidationMap<any>;
-        childContextTypes?: ValidationMap<any>;
-        defaultProps?: P;
-    }
-
-    interface ClassicComponentClass<P> extends ComponentClass<P> {
-        new(props?: P, context?: any): ClassicComponent<P, any>;
-        getDefaultProps?(): P;
-        displayName?: string;
-    }
-
-    //
-    // Component Specs and Lifecycle
-    // ----------------------------------------------------------------------
-
-    interface ComponentLifecycle<P, S> {
-        componentWillMount?(): void;
-        componentDidMount?(): void;
-        componentWillReceiveProps?(nextProps: P, nextContext: any): void;
-        shouldComponentUpdate?(nextProps: P, nextState: S, nextContext: any): boolean;
-        componentWillUpdate?(nextProps: P, nextState: S, nextContext: any): void;
-        componentDidUpdate?(prevProps: P, prevState: S, prevContext: any): void;
-        componentWillUnmount?(): void;
-    }
-
-    interface Mixin<P, S> extends ComponentLifecycle<P, S> {
-        mixins?: Mixin<P, S>;
-        statics?: {
-            [key: string]: any;
-        };
-
-        displayName?: string;
-        propTypes?: ValidationMap<any>;
-        contextTypes?: ValidationMap<any>;
-        childContextTypes?: ValidationMap<any>;
-
-        getDefaultProps?(): P;
-        getInitialState?(): S;
-    }
-
-    interface ComponentSpec<P, S> extends Mixin<P, S> {
-        render(): ReactElement<any>;
-
-        [propertyName: string]: any;
-    }
-
-    //
-    // Event System
-    // ----------------------------------------------------------------------
-
-    interface SyntheticEvent {
-        bubbles: boolean;
-        cancelable: boolean;
-        currentTarget: EventTarget;
-        defaultPrevented: boolean;
-        eventPhase: number;
-        isTrusted: boolean;
-        nativeEvent: Event;
-        preventDefault(): void;
-        stopPropagation(): void;
-        target: EventTarget;
-        timeStamp: Date;
-        type: string;
-    }
-
-    interface DragEvent extends SyntheticEvent {
-        dataTransfer: DataTransfer;
-    }
-
-    interface ClipboardEvent extends SyntheticEvent {
-        clipboardData: DataTransfer;
-    }
-
-    interface KeyboardEvent extends SyntheticEvent {
-        altKey: boolean;
-        charCode: number;
-        ctrlKey: boolean;
-        getModifierState(key: string): boolean;
-        key: string;
-        keyCode: number;
-        locale: string;
-        location: number;
-        metaKey: boolean;
-        repeat: boolean;
-        shiftKey: boolean;
-        which: number;
-    }
-
-    interface FocusEvent extends SyntheticEvent {
-        relatedTarget: EventTarget;
-    }
-
-    interface FormEvent extends SyntheticEvent {
-    }
-
-    interface MouseEvent extends SyntheticEvent {
-        altKey: boolean;
-        button: number;
-        buttons: number;
-        clientX: number;
-        clientY: number;
-        ctrlKey: boolean;
-        getModifierState(key: string): boolean;
-        metaKey: boolean;
-        pageX: number;
-        pageY: number;
-        relatedTarget: EventTarget;
-        screenX: number;
-        screenY: number;
-        shiftKey: boolean;
-    }
-
-    interface TouchEvent extends SyntheticEvent {
-        altKey: boolean;
-        changedTouches: TouchList;
-        ctrlKey: boolean;
-        getModifierState(key: string): boolean;
-        metaKey: boolean;
-        shiftKey: boolean;
-        targetTouches: TouchList;
-        touches: TouchList;
-    }
-
-    interface UIEvent extends SyntheticEvent {
-        detail: number;
-        view: AbstractView;
-    }
-
-    interface WheelEvent extends SyntheticEvent {
-        deltaMode: number;
-        deltaX: number;
-        deltaY: number;
-        deltaZ: number;
-    }
-
-    //
-    // Event Handler Types
-    // ----------------------------------------------------------------------
-
-    interface EventHandler<E extends SyntheticEvent> {
-        (event: E): void;
-    }
-
-    interface DragEventHandler extends EventHandler<DragEvent> {}
-    interface ClipboardEventHandler extends EventHandler<ClipboardEvent> {}
-    interface KeyboardEventHandler extends EventHandler<KeyboardEvent> {}
-    interface FocusEventHandler extends EventHandler<FocusEvent> {}
-    interface FormEventHandler extends EventHandler<FormEvent> {}
-    interface MouseEventHandler extends EventHandler<MouseEvent> {}
-    interface TouchEventHandler extends EventHandler<TouchEvent> {}
-    interface UIEventHandler extends EventHandler<UIEvent> {}
-    interface WheelEventHandler extends EventHandler<WheelEvent> {}
-
-    //
-    // Props / DOM Attributes
-    // ----------------------------------------------------------------------
-
-    interface Props<T> {
-        children?: ReactNode;
-        key?: string | number;
-        ref?: string | ((component: T) => any);
-    }
-
-    interface DOMAttributesBase<T> extends Props<T> {
-        onCopy?: ClipboardEventHandler;
-        onCut?: ClipboardEventHandler;
-        onPaste?: ClipboardEventHandler;
-        onKeyDown?: KeyboardEventHandler;
-        onKeyPress?: KeyboardEventHandler;
-        onKeyUp?: KeyboardEventHandler;
-        onFocus?: FocusEventHandler;
-        onBlur?: FocusEventHandler;
-        onChange?: FormEventHandler;
-        onInput?: FormEventHandler;
-        onSubmit?: FormEventHandler;
-        onClick?: MouseEventHandler;
-        onDoubleClick?: MouseEventHandler;
-        onDrag?: DragEventHandler;
-        onDragEnd?: DragEventHandler;
-        onDragEnter?: DragEventHandler;
-        onDragExit?: DragEventHandler;
-        onDragLeave?: DragEventHandler;
-        onDragOver?: DragEventHandler;
-        onDragStart?: DragEventHandler;
-        onDrop?: DragEventHandler;
-        onMouseDown?: MouseEventHandler;
-        onMouseEnter?: MouseEventHandler;
-        onMouseLeave?: MouseEventHandler;
-        onMouseMove?: MouseEventHandler;
-        onMouseOut?: MouseEventHandler;
-        onMouseOver?: MouseEventHandler;
-        onMouseUp?: MouseEventHandler;
-        onTouchCancel?: TouchEventHandler;
-        onTouchEnd?: TouchEventHandler;
-        onTouchMove?: TouchEventHandler;
-        onTouchStart?: TouchEventHandler;
-        onScroll?: UIEventHandler;
-        onWheel?: WheelEventHandler;
-
-        className?: string;
-        id?: string;
-
-        dangerouslySetInnerHTML?: {
-            __html: string;
-        };
-    }
-
-    interface DOMAttributes extends DOMAttributesBase<DOMComponent<any>> {
-    }
-
-    // This interface is not complete. Only properties accepting
-    // unitless numbers are listed here (see CSSProperty.js in React)
-    interface CSSProperties {
-        boxFlex?: number;
-        boxFlexGroup?: number;
-        columnCount?: number;
-        flex?: number | string;
-        flexGrow?: number;
-        flexShrink?: number;
-        fontWeight?: number | string;
-        lineClamp?: number;
-        lineHeight?: number | string;
-        opacity?: number;
-        order?: number;
-        orphans?: number;
-        widows?: number;
-        zIndex?: number;
-        zoom?: number;
-
-        fontSize?: number | string;
-
-        // SVG-related properties
-        fillOpacity?: number;
-        strokeOpacity?: number;
-        strokeWidth?: number;
-
-        [propertyName: string]: any;
-    }
-
-    interface HTMLAttributesBase<T> extends DOMAttributesBase<T> {
-        accept?: string;
-        acceptCharset?: string;
-        accessKey?: string;
-        action?: string;
-        allowFullScreen?: boolean;
-        allowTransparency?: boolean;
-        alt?: string;
-        async?: boolean;
-        autoComplete?: boolean;
-        autoFocus?: boolean;
-        autoPlay?: boolean;
-        cellPadding?: number | string;
-        cellSpacing?: number | string;
-        charSet?: string;
-        checked?: boolean;
-        classID?: string;
-        cols?: number;
-        colSpan?: number;
-        content?: string;
-        contentEditable?: boolean;
-        contextMenu?: string;
-        controls?: any;
-        coords?: string;
-        crossOrigin?: string;
-        data?: string;
-        dateTime?: string;
-        defaultChecked?: boolean;
-        defaultValue?: string;
-        defer?: boolean;
-        dir?: string;
-        disabled?: boolean;
-        download?: any;
-        draggable?: boolean;
-        encType?: string;
-        form?: string;
-        formAction?: string;
-        formEncType?: string;
-        formMethod?: string;
-        formNoValidate?: boolean;
-        formTarget?: string;
-        frameBorder?: number | string;
-        headers?: string;
-        height?: number | string;
-        hidden?: boolean;
-        high?: number;
-        href?: string;
-        hrefLang?: string;
-        htmlFor?: string;
-        httpEquiv?: string;
-        icon?: string;
-        label?: string;
-        lang?: string;
-        list?: string;
-        loop?: boolean;
-        low?: number;
-        manifest?: string;
-        marginHeight?: number;
-        marginWidth?: number;
-        max?: number | string;
-        maxLength?: number;
-        media?: string;
-        mediaGroup?: string;
-        method?: string;
-        min?: number | string;
-        multiple?: boolean;
-        muted?: boolean;
-        name?: string;
-        noValidate?: boolean;
-        open?: boolean;
-        optimum?: number;
-        pattern?: string;
-        placeholder?: string;
-        poster?: string;
-        preload?: string;
-        radioGroup?: string;
-        readOnly?: boolean;
-        rel?: string;
-        required?: boolean;
-        role?: string;
-        rows?: number;
-        rowSpan?: number;
-        sandbox?: string;
-        scope?: string;
-        scoped?: boolean;
-        scrolling?: string;
-        seamless?: boolean;
-        selected?: boolean;
-        shape?: string;
-        size?: number;
-        sizes?: string;
-        span?: number;
-        spellCheck?: boolean;
-        src?: string;
-        srcDoc?: string;
-        srcSet?: string;
-        start?: number;
-        step?: number | string;
-        style?: CSSProperties;
-        tabIndex?: number;
-        target?: string;
-        title?: string;
-        type?: string;
-        useMap?: string;
-        value?: string;
-        width?: number | string;
-        wmode?: string;
-
-        // Non-standard Attributes
-        autoCapitalize?: boolean;
-        autoCorrect?: boolean;
-        property?: string;
-        itemProp?: string;
-        itemScope?: boolean;
-        itemType?: string;
-        unselectable?: boolean;
-    }
-
-    interface HTMLAttributes extends HTMLAttributesBase<HTMLComponent> {
-    }
-
-    interface SVGElementAttributes extends HTMLAttributes {
-        viewBox?: string;
-        preserveAspectRatio?: string;
-    }
-
-    interface SVGAttributes extends DOMAttributes {
-        ref?: string | ((component: SVGComponent) => void);
-
-        cx?: number | string;
-        cy?: number | string;
-        d?: string;
-        dx?: number | string;
-        dy?: number | string;
-        fill?: string;
-        fillOpacity?: number | string;
-        fontFamily?: string;
-        fontSize?: number | string;
-        fx?: number | string;
-        fy?: number | string;
-        gradientTransform?: string;
-        gradientUnits?: string;
-        height?: number | string;
-        markerEnd?: string;
-        markerMid?: string;
-        markerStart?: string;
-        offset?: number | string;
-        opacity?: number | string;
-        patternContentUnits?: string;
-        patternUnits?: string;
-        points?: string;
-        preserveAspectRatio?: string;
-        r?: number | string;
-        rx?: number | string;
-        ry?: number | string;
-        spreadMethod?: string;
-        stopColor?: string;
-        stopOpacity?: number | string;
-        stroke?: string;
-        strokeDasharray?: string;
-        strokeLinecap?: string;
-        strokeMiterlimit?: string;
-        strokeOpacity?: number | string;
-        strokeWidth?: number | string;
-        textAnchor?: string;
-        transform?: string;
-        version?: string;
-        viewBox?: string;
-        width?: number | string;
-        x1?: number | string;
-        x2?: number | string;
-        x?: number | string;
-        y1?: number | string;
-        y2?: number | string;
-        y?: number | string;
-    }
-
-    //
-    // React.DOM
-    // ----------------------------------------------------------------------
-
-    interface ReactDOM {
-        // HTML
-        a: HTMLFactory;
-        abbr: HTMLFactory;
-        address: HTMLFactory;
-        area: HTMLFactory;
-        article: HTMLFactory;
-        aside: HTMLFactory;
-        audio: HTMLFactory;
-        b: HTMLFactory;
-        base: HTMLFactory;
-        bdi: HTMLFactory;
-        bdo: HTMLFactory;
-        big: HTMLFactory;
-        blockquote: HTMLFactory;
-        body: HTMLFactory;
-        br: HTMLFactory;
-        button: HTMLFactory;
-        canvas: HTMLFactory;
-        caption: HTMLFactory;
-        cite: HTMLFactory;
-        code: HTMLFactory;
-        col: HTMLFactory;
-        colgroup: HTMLFactory;
-        data: HTMLFactory;
-        datalist: HTMLFactory;
-        dd: HTMLFactory;
-        del: HTMLFactory;
-        details: HTMLFactory;
-        dfn: HTMLFactory;
-        dialog: HTMLFactory;
-        div: HTMLFactory;
-        dl: HTMLFactory;
-        dt: HTMLFactory;
-        em: HTMLFactory;
-        embed: HTMLFactory;
-        fieldset: HTMLFactory;
-        figcaption: HTMLFactory;
-        figure: HTMLFactory;
-        footer: HTMLFactory;
-        form: HTMLFactory;
-        h1: HTMLFactory;
-        h2: HTMLFactory;
-        h3: HTMLFactory;
-        h4: HTMLFactory;
-        h5: HTMLFactory;
-        h6: HTMLFactory;
-        head: HTMLFactory;
-        header: HTMLFactory;
-        hr: HTMLFactory;
-        html: HTMLFactory;
-        i: HTMLFactory;
-        iframe: HTMLFactory;
-        img: HTMLFactory;
-        input: HTMLFactory;
-        ins: HTMLFactory;
-        kbd: HTMLFactory;
-        keygen: HTMLFactory;
-        label: HTMLFactory;
-        legend: HTMLFactory;
-        li: HTMLFactory;
-        link: HTMLFactory;
-        main: HTMLFactory;
-        map: HTMLFactory;
-        mark: HTMLFactory;
-        menu: HTMLFactory;
-        menuitem: HTMLFactory;
-        meta: HTMLFactory;
-        meter: HTMLFactory;
-        nav: HTMLFactory;
-        noscript: HTMLFactory;
-        object: HTMLFactory;
-        ol: HTMLFactory;
-        optgroup: HTMLFactory;
-        option: HTMLFactory;
-        output: HTMLFactory;
-        p: HTMLFactory;
-        param: HTMLFactory;
-        picture: HTMLFactory;
-        pre: HTMLFactory;
-        progress: HTMLFactory;
-        q: HTMLFactory;
-        rp: HTMLFactory;
-        rt: HTMLFactory;
-        ruby: HTMLFactory;
-        s: HTMLFactory;
-        samp: HTMLFactory;
-        script: HTMLFactory;
-        section: HTMLFactory;
-        select: HTMLFactory;
-        small: HTMLFactory;
-        source: HTMLFactory;
-        span: HTMLFactory;
-        strong: HTMLFactory;
-        style: HTMLFactory;
-        sub: HTMLFactory;
-        summary: HTMLFactory;
-        sup: HTMLFactory;
-        table: HTMLFactory;
-        tbody: HTMLFactory;
-        td: HTMLFactory;
-        textarea: HTMLFactory;
-        tfoot: HTMLFactory;
-        th: HTMLFactory;
-        thead: HTMLFactory;
-        time: HTMLFactory;
-        title: HTMLFactory;
-        tr: HTMLFactory;
-        track: HTMLFactory;
-        u: HTMLFactory;
-        ul: HTMLFactory;
-        "var": HTMLFactory;
-        video: HTMLFactory;
-        wbr: HTMLFactory;
-
-        // SVG
-        svg: SVGElementFactory;
-        circle: SVGFactory;
-        defs: SVGFactory;
-        ellipse: SVGFactory;
-        g: SVGFactory;
-        line: SVGFactory;
-        linearGradient: SVGFactory;
-        mask: SVGFactory;
-        path: SVGFactory;
-        pattern: SVGFactory;
-        polygon: SVGFactory;
-        polyline: SVGFactory;
-        radialGradient: SVGFactory;
-        rect: SVGFactory;
-        stop: SVGFactory;
-        text: SVGFactory;
-        tspan: SVGFactory;
-    }
-
-    //
-    // React.PropTypes
-    // ----------------------------------------------------------------------
-
-    interface Validator<T> {
-        (object: T, key: string, componentName: string): Error;
-    }
-
-    interface Requireable<T> extends Validator<T> {
-        isRequired: Validator<T>;
-    }
-
-    interface ValidationMap<T> {
-        [key: string]: Validator<T>;
-    }
-
-    interface ReactPropTypes {
-        any: Requireable<any>;
-        array: Requireable<any>;
-        bool: Requireable<any>;
-        func: Requireable<any>;
-        number: Requireable<any>;
-        object: Requireable<any>;
-        string: Requireable<any>;
-        node: Requireable<any>;
-        element: Requireable<any>;
-        instanceOf(expectedClass: {}): Requireable<any>;
-        oneOf(types: any[]): Requireable<any>;
-        oneOfType(types: Validator<any>[]): Requireable<any>;
-        arrayOf(type: Validator<any>): Requireable<any>;
-        objectOf(type: Validator<any>): Requireable<any>;
-        shape(type: ValidationMap<any>): Requireable<any>;
-    }
-
-    //
-    // React.Children
-    // ----------------------------------------------------------------------
-
-    interface ReactChildren {
-        map<T>(children: ReactNode, fn: (child: ReactChild, index: number) => T): { [key:string]: T };
-        forEach(children: ReactNode, fn: (child: ReactChild, index: number) => any): void;
-        count(children: ReactNode): number;
-        only(children: ReactNode): ReactChild;
-    }
-
-    //
-    // Browser Interfaces
-    // https://github.com/nikeee/2048-typescript/blob/master/2048/js/touch.d.ts
-    // ----------------------------------------------------------------------
-
-    interface AbstractView {
-        styleMedia: StyleMedia;
-        document: Document;
-    }
-
-    interface Touch {
-        identifier: number;
-        target: EventTarget;
-        screenX: number;
-        screenY: number;
-        clientX: number;
-        clientY: number;
-        pageX: number;
-        pageY: number;
-    }
-
-    interface TouchList {
-        [index: number]: Touch;
-        length: number;
-        item(index: number): Touch;
-        identifiedTouch(identifier: number): Touch;
-    }
-
-    //
-    // React.addons
-    // ----------------------------------------------------------------------
-
-    export module addons {
-        export var CSSTransitionGroup: CSSTransitionGroup;
-        export var TransitionGroup: TransitionGroup;
-
-        export var LinkedStateMixin: LinkedStateMixin;
-        export var PureRenderMixin: PureRenderMixin;
-
-        export function batchedUpdates<A, B>(
-            callback: (a: A, b: B) => any, a: A, b: B): void;
-        export function batchedUpdates<A>(callback: (a: A) => any, a: A): void;
-        export function batchedUpdates(callback: () => any): void;
-
-        // deprecated: use petehunt/react-classset or JedWatson/classnames
-        export function classSet(cx: { [key: string]: boolean }): string;
-        export function classSet(...classList: string[]): string;
-
-        export function cloneWithProps<P>(
-            element: DOMElement<P>, props: P): DOMElement<P>;
-        export function cloneWithProps<P>(
-            element: ClassicElement<P>, props: P): ClassicElement<P>;
-        export function cloneWithProps<P>(
-            element: ReactElement<P>, props: P): ReactElement<P>;
-
-        export function createFragment(
-            object: { [key: string]: ReactNode }): ReactFragment;
-
-        export function update(value: any[], spec: UpdateArraySpec): any[];
-        export function update(value: {}, spec: UpdateSpec): any;
-
-        // Development tools
-        export import Perf = ReactPerf;
-        export import TestUtils = ReactTestUtils;
-    }
-
-    //
-    // React.addons (Transitions)
-    // ----------------------------------------------------------------------
-
-    interface TransitionGroupProps {
-        component?: ReactType;
-        childFactory?: (child: ReactElement<any>) => ReactElement<any>;
-    }
-
-    interface CSSTransitionGroupProps extends TransitionGroupProps {
-        transitionName: string;
-        transitionAppear?: boolean;
-        transitionEnter?: boolean;
-        transitionLeave?: boolean;
-    }
-
-    type CSSTransitionGroup = ComponentClass<CSSTransitionGroupProps>;
-    type TransitionGroup = ComponentClass<TransitionGroupProps>;
-
-    //
-    // React.addons (Mixins)
-    // ----------------------------------------------------------------------
-
-    interface ReactLink<T> {
-        value: T;
-        requestChange(newValue: T): void;
-    }
-
-    interface LinkedStateMixin extends Mixin<any, any> {
-        linkState<T>(key: string): ReactLink<T>;
-    }
-
-    interface PureRenderMixin extends Mixin<any, any> {
-    }
-
-    //
-    // Reat.addons.update
-    // ----------------------------------------------------------------------
-
-    interface UpdateSpecCommand {
-        $set?: any;
-        $merge?: {};
-        $apply?(value: any): any;
-    }
-
-    interface UpdateSpecPath {
-        [key: string]: UpdateSpec;
-    }
-
-    type UpdateSpec = UpdateSpecCommand | UpdateSpecPath;
-
-    interface UpdateArraySpec extends UpdateSpecCommand {
-        $push?: any[];
-        $unshift?: any[];
-        $splice?: any[][];
-    }
-
-    //
-    // React.addons.Perf
-    // ----------------------------------------------------------------------
-
-    interface ComponentPerfContext {
-        current: string;
-        owner: string;
-    }
-
-    interface NumericPerfContext {
-        [key: string]: number;
-    }
-
-    interface Measurements {
-        exclusive: NumericPerfContext;
-        inclusive: NumericPerfContext;
-        render: NumericPerfContext;
-        counts: NumericPerfContext;
-        writes: NumericPerfContext;
-        displayNames: {
-            [key: string]: ComponentPerfContext;
-        };
-        totalTime: number;
-    }
-
-    namespace ReactPerf {
-        export function start(): void;
-        export function stop(): void;
-        export function printInclusive(measurements: Measurements[]): void;
-        export function printExclusive(measurements: Measurements[]): void;
-        export function printWasted(measurements: Measurements[]): void;
-        export function printDOM(measurements: Measurements[]): void;
-        export function getLastMeasurements(): Measurements[];
-    }
-
-    //
-    // React.addons.TestUtils
-    // ----------------------------------------------------------------------
-
-    interface MockedComponentClass {
-        new(): any;
-    }
-
-    namespace ReactTestUtils {
-        export import Simulate = ReactSimulate;
-
-        export function renderIntoDocument<P>(
-            element: ReactElement<P>): Component<P, any>;
-        export function renderIntoDocument<C extends Component<any, any>>(
-            element: ReactElement<any>): C;
-
-        export function mockComponent(
-            mocked: MockedComponentClass, mockTagName?: string): typeof ReactTestUtils;
-
-        export function isElementOfType(
-            element: ReactElement<any>, type: ReactType): boolean;
-        export function isTextComponent(instance: Component<any, any>): boolean;
-        export function isDOMComponent(instance: Component<any, any>): boolean;
-        export function isCompositeComponent(instance: Component<any, any>): boolean;
-        export function isCompositeComponentWithType(
-            instance: Component<any, any>,
-            type: ComponentClass<any>): boolean;
-
-        export function findAllInRenderedTree(
-            tree: Component<any, any>,
-            fn: (i: Component<any, any>) => boolean): Component<any, any>;
-
-        export function scryRenderedDOMComponentsWithClass(
-            tree: Component<any, any>,
-            className: string): DOMComponent<any>[];
-        export function findRenderedDOMComponentWithClass(
-            tree: Component<any, any>,
-            className: string): DOMComponent<any>;
-
-        export function scryRenderedDOMComponentsWithTag(
-            tree: Component<any, any>,
-            tagName: string): DOMComponent<any>[];
-        export function findRenderedDOMComponentWithTag(
-            tree: Component<any, any>,
-            tagName: string): DOMComponent<any>;
-
-        export function scryRenderedComponentsWithType<P>(
-            tree: Component<any, any>,
-            type: ComponentClass<P>): Component<P, {}>[];
-        export function scryRenderedComponentsWithType<C extends Component<any, any>>(
-            tree: Component<any, any>,
-            type: ComponentClass<any>): C[];
-
-        export function findRenderedComponentWithType<P>(
-            tree: Component<any, any>,
-            type: ComponentClass<P>): Component<P, {}>;
-        export function findRenderedComponentWithType<C extends Component<any, any>>(
-            tree: Component<any, any>,
-            type: ComponentClass<any>): C;
-
-        export function createRenderer(): ShallowRenderer;
-    }
-
-    interface SyntheticEventData {
-        altKey?: boolean;
-        button?: number;
-        buttons?: number;
-        clientX?: number;
-        clientY?: number;
-        changedTouches?: TouchList;
-        charCode?: boolean;
-        clipboardData?: DataTransfer;
-        ctrlKey?: boolean;
-        deltaMode?: number;
-        deltaX?: number;
-        deltaY?: number;
-        deltaZ?: number;
-        detail?: number;
-        getModifierState?(key: string): boolean;
-        key?: string;
-        keyCode?: number;
-        locale?: string;
-        location?: number;
-        metaKey?: boolean;
-        pageX?: number;
-        pageY?: number;
-        relatedTarget?: EventTarget;
-        repeat?: boolean;
-        screenX?: number;
-        screenY?: number;
-        shiftKey?: boolean;
-        targetTouches?: TouchList;
-        touches?: TouchList;
-        view?: AbstractView;
-        which?: number;
-    }
-
-    interface EventSimulator {
-        (element: Element, eventData?: SyntheticEventData): void;
-        (component: Component<any, any>, eventData?: SyntheticEventData): void;
-    }
-
-    namespace ReactSimulate {
-        export var blur: EventSimulator;
-        export var change: EventSimulator;
-        export var click: EventSimulator;
-        export var cut: EventSimulator;
-        export var doubleClick: EventSimulator;
-        export var drag: EventSimulator;
-        export var dragEnd: EventSimulator;
-        export var dragEnter: EventSimulator;
-        export var dragExit: EventSimulator;
-        export var dragLeave: EventSimulator;
-        export var dragOver: EventSimulator;
-        export var dragStart: EventSimulator;
-        export var drop: EventSimulator;
-        export var focus: EventSimulator;
-        export var input: EventSimulator;
-        export var keyDown: EventSimulator;
-        export var keyPress: EventSimulator;
-        export var keyUp: EventSimulator;
-        export var mouseDown: EventSimulator;
-        export var mouseEnter: EventSimulator;
-        export var mouseLeave: EventSimulator;
-        export var mouseMove: EventSimulator;
-        export var mouseOut: EventSimulator;
-        export var mouseOver: EventSimulator;
-        export var mouseUp: EventSimulator;
-        export var paste: EventSimulator;
-        export var scroll: EventSimulator;
-        export var submit: EventSimulator;
-        export var touchCancel: EventSimulator;
-        export var touchEnd: EventSimulator;
-        export var touchMove: EventSimulator;
-        export var touchStart: EventSimulator;
-        export var wheel: EventSimulator;
-    }
-
-    class ShallowRenderer {
-        getRenderOutput<E extends ReactElement<any>>(): E;
-        getRenderOutput(): ReactElement<any>;
-        render(element: ReactElement<any>, context?: any): void;
-        unmount(): void;
-    }
-}
-
-declare namespace JSX {
-    import React = __React;
-
-    interface Element extends React.ReactElement<any> { }
-    interface ElementClass extends React.Component<any, any> {
-        render(): JSX.Element;
-    }
-    interface ElementAttributesProperty { props: {}; }
-
-    interface IntrinsicElements {
-        // HTML
-        a: React.HTMLAttributes;
-        abbr: React.HTMLAttributes;
-        address: React.HTMLAttributes;
-        area: React.HTMLAttributes;
-        article: React.HTMLAttributes;
-        aside: React.HTMLAttributes;
-        audio: React.HTMLAttributes;
-        b: React.HTMLAttributes;
-        base: React.HTMLAttributes;
-        bdi: React.HTMLAttributes;
-        bdo: React.HTMLAttributes;
-        big: React.HTMLAttributes;
-        blockquote: React.HTMLAttributes;
-        body: React.HTMLAttributes;
-        br: React.HTMLAttributes;
-        button: React.HTMLAttributes;
-        canvas: React.HTMLAttributes;
-        caption: React.HTMLAttributes;
-        cite: React.HTMLAttributes;
-        code: React.HTMLAttributes;
-        col: React.HTMLAttributes;
-        colgroup: React.HTMLAttributes;
-        data: React.HTMLAttributes;
-        datalist: React.HTMLAttributes;
-        dd: React.HTMLAttributes;
-        del: React.HTMLAttributes;
-        details: React.HTMLAttributes;
-        dfn: React.HTMLAttributes;
-        dialog: React.HTMLAttributes;
-        div: React.HTMLAttributes;
-        dl: React.HTMLAttributes;
-        dt: React.HTMLAttributes;
-        em: React.HTMLAttributes;
-        embed: React.HTMLAttributes;
-        fieldset: React.HTMLAttributes;
-        figcaption: React.HTMLAttributes;
-        figure: React.HTMLAttributes;
-        footer: React.HTMLAttributes;
-        form: React.HTMLAttributes;
-        h1: React.HTMLAttributes;
-        h2: React.HTMLAttributes;
-        h3: React.HTMLAttributes;
-        h4: React.HTMLAttributes;
-        h5: React.HTMLAttributes;
-        h6: React.HTMLAttributes;
-        head: React.HTMLAttributes;
-        header: React.HTMLAttributes;
-        hr: React.HTMLAttributes;
-        html: React.HTMLAttributes;
-        i: React.HTMLAttributes;
-        iframe: React.HTMLAttributes;
-        img: React.HTMLAttributes;
-        input: React.HTMLAttributes;
-        ins: React.HTMLAttributes;
-        kbd: React.HTMLAttributes;
-        keygen: React.HTMLAttributes;
-        label: React.HTMLAttributes;
-        legend: React.HTMLAttributes;
-        li: React.HTMLAttributes;
-        link: React.HTMLAttributes;
-        main: React.HTMLAttributes;
-        map: React.HTMLAttributes;
-        mark: React.HTMLAttributes;
-        menu: React.HTMLAttributes;
-        menuitem: React.HTMLAttributes;
-        meta: React.HTMLAttributes;
-        meter: React.HTMLAttributes;
-        nav: React.HTMLAttributes;
-        noscript: React.HTMLAttributes;
-        object: React.HTMLAttributes;
-        ol: React.HTMLAttributes;
-        optgroup: React.HTMLAttributes;
-        option: React.HTMLAttributes;
-        output: React.HTMLAttributes;
-        p: React.HTMLAttributes;
-        param: React.HTMLAttributes;
-        picture: React.HTMLAttributes;
-        pre: React.HTMLAttributes;
-        progress: React.HTMLAttributes;
-        q: React.HTMLAttributes;
-        rp: React.HTMLAttributes;
-        rt: React.HTMLAttributes;
-        ruby: React.HTMLAttributes;
-        s: React.HTMLAttributes;
-        samp: React.HTMLAttributes;
-        script: React.HTMLAttributes;
-        section: React.HTMLAttributes;
-        select: React.HTMLAttributes;
-        small: React.HTMLAttributes;
-        source: React.HTMLAttributes;
-        span: React.HTMLAttributes;
-        strong: React.HTMLAttributes;
-        style: React.HTMLAttributes;
-        sub: React.HTMLAttributes;
-        summary: React.HTMLAttributes;
-        sup: React.HTMLAttributes;
-        table: React.HTMLAttributes;
-        tbody: React.HTMLAttributes;
-        td: React.HTMLAttributes;
-        textarea: React.HTMLAttributes;
-        tfoot: React.HTMLAttributes;
-        th: React.HTMLAttributes;
-        thead: React.HTMLAttributes;
-        time: React.HTMLAttributes;
-        title: React.HTMLAttributes;
-        tr: React.HTMLAttributes;
-        track: React.HTMLAttributes;
-        u: React.HTMLAttributes;
-        ul: React.HTMLAttributes;
-        "var": React.HTMLAttributes;
-        video: React.HTMLAttributes;
-        wbr: React.HTMLAttributes;
-
-        // SVG
-        svg: React.SVGElementAttributes;
-
-        circle: React.SVGAttributes;
-        defs: React.SVGAttributes;
-        ellipse: React.SVGAttributes;
-        g: React.SVGAttributes;
-        line: React.SVGAttributes;
-        linearGradient: React.SVGAttributes;
-        mask: React.SVGAttributes;
-        path: React.SVGAttributes;
-        pattern: React.SVGAttributes;
-        polygon: React.SVGAttributes;
-        polyline: React.SVGAttributes;
-        radialGradient: React.SVGAttributes;
-        rect: React.SVGAttributes;
-        stop: React.SVGAttributes;
-        text: React.SVGAttributes;
-        tspan: React.SVGAttributes;
-    }
-}
diff --git a/react/react-addons-create-fragment.d.ts b/react/react-addons-create-fragment.d.ts
deleted file mode 100644
index 9bfa4c33c6..0000000000
--- a/react/react-addons-create-fragment.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Type definitions for React v0.14 (react-addons-create-fragment)
-// Project: http://facebook.github.io/react/
-// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="react.d.ts" />
-
-declare namespace __React {
-    namespace __Addons {
-        export function createFragment(object: { [key: string]: ReactNode }): ReactFragment;
-    }
-}
-
-declare module "react-addons-create-fragment" {
-    export = __React.__Addons.createFragment;
-}
diff --git a/react/react-addons-css-transition-group.d.ts b/react/react-addons-css-transition-group.d.ts
deleted file mode 100644
index a7b385e8a7..0000000000
--- a/react/react-addons-css-transition-group.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// Type definitions for React v0.14 (react-addons-css-transition-group)
-// Project: http://facebook.github.io/react/
-// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="react.d.ts" />
-/// <reference path="react-addons-transition-group.d.ts" />
-
-declare namespace __React {
-    interface CSSTransitionGroupTransitionName {
-        enter: string;
-        enterActive?: string;
-        leave: string;
-        leaveActive?: string;
-        appear?: string;
-        appearActive?: string;
-    }
-
-    interface CSSTransitionGroupProps extends TransitionGroupProps {
-        transitionName: string | CSSTransitionGroupTransitionName;
-        transitionAppear?: boolean;
-        transitionAppearTimeout?: number;
-        transitionEnter?: boolean;
-        transitionEnterTimeout?: number;
-        transitionLeave?: boolean;
-        transitionLeaveTimeout?: number;
-    }
-
-    type CSSTransitionGroup = ComponentClass<CSSTransitionGroupProps>;
-
-    namespace __Addons {
-        export var CSSTransitionGroup: __React.CSSTransitionGroup;
-    }
-}
-
-declare module "react-addons-css-transition-group" {
-    var CSSTransitionGroup: __React.CSSTransitionGroup;
-    type CSSTransitionGroup = __React.CSSTransitionGroup;
-    export = CSSTransitionGroup;
-}
diff --git a/react/react-addons-linked-state-mixin.d.ts b/react/react-addons-linked-state-mixin.d.ts
deleted file mode 100644
index efdf6aa1e2..0000000000
--- a/react/react-addons-linked-state-mixin.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// Type definitions for React v0.14 (react-addons-linked-state-mixin)
-// Project: http://facebook.github.io/react/
-// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="react.d.ts" />
-
-declare namespace __React {
-    interface ReactLink<T> {
-        value: T;
-        requestChange(newValue: T): void;
-    }
-
-    interface LinkedStateMixin extends Mixin<any, any> {
-        linkState<T>(key: string): ReactLink<T>;
-    }
-
-    interface HTMLAttributes {
-        checkedLink?: ReactLink<boolean>;
-        valueLink?: ReactLink<boolean | string | number>;
-    }
-
-    namespace __Addons {
-        export var LinkedStateMixin: LinkedStateMixin;
-    }
-}
-
-declare module "react-addons-linked-state-mixin" {
-    var LinkedStateMixin: __React.LinkedStateMixin;
-    type LinkedStateMixin = __React.LinkedStateMixin;
-    export = LinkedStateMixin;
-}
diff --git a/react/react-addons-perf.d.ts b/react/react-addons-perf.d.ts
deleted file mode 100644
index 6a40a2c402..0000000000
--- a/react/react-addons-perf.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// Type definitions for React v0.14 (react-addons-perf)
-// Project: http://facebook.github.io/react/
-// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="react.d.ts" />
-
-declare namespace __React {
-    interface ComponentPerfContext {
-        current: string;
-        owner: string;
-    }
-
-    interface NumericPerfContext {
-        [key: string]: number;
-    }
-
-    interface Measurements {
-        exclusive: NumericPerfContext;
-        inclusive: NumericPerfContext;
-        render: NumericPerfContext;
-        counts: NumericPerfContext;
-        writes: NumericPerfContext;
-        displayNames: {
-            [key: string]: ComponentPerfContext;
-        };
-        totalTime: number;
-    }
-
-    namespace __Addons {
-        namespace Perf {
-            export function start(): void;
-            export function stop(): void;
-            export function printInclusive(measurements: Measurements[]): void;
-            export function printExclusive(measurements: Measurements[]): void;
-            export function printWasted(measurements: Measurements[]): void;
-            export function printDOM(measurements: Measurements[]): void;
-            export function getLastMeasurements(): Measurements[];
-        }
-    }
-}
-
-declare module "react-addons-perf" {
-    import Perf = __React.__Addons.Perf;
-    export = Perf;
-}
diff --git a/react/react-addons-pure-render-mixin.d.ts b/react/react-addons-pure-render-mixin.d.ts
deleted file mode 100644
index fcd62b7f32..0000000000
--- a/react/react-addons-pure-render-mixin.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Type definitions for React v0.14 (react-addons-pure-render-mixin)
-// Project: http://facebook.github.io/react/
-// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="react.d.ts" />
-
-declare namespace __React {
-    interface PureRenderMixin extends Mixin<any, any> {}
-
-    namespace __Addons {
-        export var PureRenderMixin: PureRenderMixin;
-    }
-}
-
-declare module "react-addons-pure-render-mixin" {
-    var PureRenderMixin: __React.PureRenderMixin;
-    type PureRenderMixin = __React.PureRenderMixin;
-    export = PureRenderMixin;
-}
diff --git a/react/react-addons-shallow-compare.d.ts b/react/react-addons-shallow-compare.d.ts
deleted file mode 100644
index 4fb9aa8462..0000000000
--- a/react/react-addons-shallow-compare.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Type definitions for React v0.14 (react-addons-css-transition-group)
-// Project: http://facebook.github.io/react/
-// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="react.d.ts" />
-
-declare namespace __React {
-    namespace __Addons {
-        export function shallowCompare<P, S>(
-            component: __React.Component<P, S>,
-            nextProps: P,
-            nextState: S): boolean;
-    }
-}
-
-declare module "react-addons-shallow-compare" {
-    export = __React.__Addons.shallowCompare;
-}
diff --git a/react/react-addons-test-utils.d.ts b/react/react-addons-test-utils.d.ts
deleted file mode 100644
index 76056caf30..0000000000
--- a/react/react-addons-test-utils.d.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-// Type definitions for React v0.14 (react-addons-test-utils)
-// Project: http://facebook.github.io/react/
-// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="react.d.ts" />
-
-declare namespace __React {
-    interface SyntheticEventData {
-        altKey?: boolean;
-        button?: number;
-        buttons?: number;
-        clientX?: number;
-        clientY?: number;
-        changedTouches?: TouchList;
-        charCode?: boolean;
-        clipboardData?: DataTransfer;
-        ctrlKey?: boolean;
-        deltaMode?: number;
-        deltaX?: number;
-        deltaY?: number;
-        deltaZ?: number;
-        detail?: number;
-        getModifierState?(key: string): boolean;
-        key?: string;
-        keyCode?: number;
-        locale?: string;
-        location?: number;
-        metaKey?: boolean;
-        pageX?: number;
-        pageY?: number;
-        relatedTarget?: EventTarget;
-        repeat?: boolean;
-        screenX?: number;
-        screenY?: number;
-        shiftKey?: boolean;
-        targetTouches?: TouchList;
-        touches?: TouchList;
-        view?: AbstractView;
-        which?: number;
-    }
-
-    interface EventSimulator {
-        (element: Element, eventData?: SyntheticEventData): void;
-        (component: Component<any, any>, eventData?: SyntheticEventData): void;
-    }
-
-    interface MockedComponentClass {
-        new(): any;
-    }
-
-    class ShallowRenderer {
-        getRenderOutput<E extends ReactElement<any>>(): E;
-        getRenderOutput(): ReactElement<any>;
-        render(element: ReactElement<any>, context?: any): void;
-        unmount(): void;
-    }
-
-    namespace __Addons {
-        namespace TestUtils {
-            namespace Simulate {
-                export var blur: EventSimulator;
-                export var change: EventSimulator;
-                export var click: EventSimulator;
-                export var cut: EventSimulator;
-                export var doubleClick: EventSimulator;
-                export var drag: EventSimulator;
-                export var dragEnd: EventSimulator;
-                export var dragEnter: EventSimulator;
-                export var dragExit: EventSimulator;
-                export var dragLeave: EventSimulator;
-                export var dragOver: EventSimulator;
-                export var dragStart: EventSimulator;
-                export var drop: EventSimulator;
-                export var focus: EventSimulator;
-                export var input: EventSimulator;
-                export var keyDown: EventSimulator;
-                export var keyPress: EventSimulator;
-                export var keyUp: EventSimulator;
-                export var mouseDown: EventSimulator;
-                export var mouseEnter: EventSimulator;
-                export var mouseLeave: EventSimulator;
-                export var mouseMove: EventSimulator;
-                export var mouseOut: EventSimulator;
-                export var mouseOver: EventSimulator;
-                export var mouseUp: EventSimulator;
-                export var paste: EventSimulator;
-                export var scroll: EventSimulator;
-                export var submit: EventSimulator;
-                export var touchCancel: EventSimulator;
-                export var touchEnd: EventSimulator;
-                export var touchMove: EventSimulator;
-                export var touchStart: EventSimulator;
-                export var wheel: EventSimulator;
-            }
-
-            export function renderIntoDocument<T extends Element>(
-                element: DOMElement<any, T>): T;
-            export function renderIntoDocument(
-                element: SFCElement<any>): void;
-            export function renderIntoDocument<T extends Component<any, any>>(
-                element: CElement<any, T>): T;
-            export function renderIntoDocument<P>(
-                element: ReactElement<P>): Component<P, {}> | Element | void;
-
-            export function mockComponent(
-                mocked: MockedComponentClass, mockTagName?: string): typeof TestUtils;
-
-            export function isElementOfType<T extends HTMLElement>(
-                element: ReactElement<any>, type: string): element is ReactHTMLElement<T>;
-            export function isElementOfType<P extends DOMAttributes, T extends Element>(
-                element: ReactElement<any>, type: string): element is DOMElement<P, T>;
-            export function isElementOfType<P>(
-                element: ReactElement<any>, type: SFC<P>): element is SFCElement<P>;
-            export function isElementOfType<P, T extends Component<P, {}>, C extends ComponentClass<P>>(
-                element: ReactElement<any>, type: ClassType<P, T, C>): element is CElement<P, T>;
-
-            export function isDOMComponent(instance: ReactInstance): instance is Element;
-            export function isCompositeComponent(instance: ReactInstance): instance is Component<any, any>;
-            export function isCompositeComponentWithType<T extends Component<any, any>, C extends ComponentClass<any>>(
-                instance: ReactInstance, type: ClassType<any, T, C>): T;
-
-            export function findAllInRenderedTree(
-                root: Component<any, any>,
-                fn: (i: ReactInstance) => boolean): ReactInstance[];
-
-            export function scryRenderedDOMComponentsWithClass(
-                root: Component<any, any>,
-                className: string): Element[];
-            export function findRenderedDOMComponentWithClass(
-                root: Component<any, any>,
-                className: string): Element;
-
-            export function scryRenderedDOMComponentsWithTag(
-                root: Component<any, any>,
-                tagName: string): Element[];
-            export function findRenderedDOMComponentWithTag(
-                root: Component<any, any>,
-                tagName: string): Element;
-
-            export function scryRenderedComponentsWithType<T extends Component<{}, {}>, C extends ComponentClass<{}>>(
-                root: Component<any, any>,
-                type: ClassType<any, T, C>): T[];
-
-            export function findRenderedComponentWithType<T extends Component<{}, {}>, C extends ComponentClass<{}>>(
-                root: Component<any, any>,
-                type: ClassType<any, T, C>): T;
-
-            export function createRenderer(): ShallowRenderer;
-        }
-    }
-}
-
-declare module "react-addons-test-utils" {
-    import TestUtils = __React.__Addons.TestUtils;
-    export = TestUtils;
-}
diff --git a/react/react-addons-transition-group.d.ts b/react/react-addons-transition-group.d.ts
deleted file mode 100644
index ca7bb4c31e..0000000000
--- a/react/react-addons-transition-group.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// Type definitions for React v0.14 (react-addons-transition-group)
-// Project: http://facebook.github.io/react/
-// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="react.d.ts" />
-
-declare namespace __React {
-
-    interface TransitionGroupProps {
-        component?: ReactType;
-        childFactory?: (child: ReactElement<any>) => ReactElement<any>;
-    }
-
-    type TransitionGroup = ComponentClass<TransitionGroupProps>;
-
-    namespace __Addons {
-        export var TransitionGroup: __React.TransitionGroup;
-    }
-}
-
-declare module "react-addons-transition-group" {
-    var TransitionGroup: __React.TransitionGroup;
-    type TransitionGroup = __React.TransitionGroup;
-    export = TransitionGroup;
-}
diff --git a/react/react-addons-update.d.ts b/react/react-addons-update.d.ts
deleted file mode 100644
index f1fe4c24f3..0000000000
--- a/react/react-addons-update.d.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// Type definitions for React v0.14 (react-addons-update)
-// Project: http://facebook.github.io/react/
-// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="react.d.ts" />
-
-declare namespace __React {
-    interface UpdateSpecCommand {
-        $set?: any;
-        $merge?: {};
-        $apply?(value: any): any;
-    }
-
-    interface UpdateSpecPath {
-        [key: string]: UpdateSpec;
-    }
-
-    type UpdateSpec = UpdateSpecCommand | UpdateSpecPath;
-
-    interface UpdateArraySpec extends UpdateSpecCommand {
-        $push?: any[];
-        $unshift?: any[];
-        $splice?: any[][];
-    }
-
-    namespace __Addons {
-        export function update(value: any[], spec: UpdateArraySpec): any[];
-        export function update(value: {}, spec: UpdateSpec): any;
-    }
-}
-
-declare module "react-addons-update" {
-    export = __React.__Addons.update;
-}
diff --git a/react/react-dom.d.ts b/react/react-dom.d.ts
deleted file mode 100644
index c95f64518b..0000000000
--- a/react/react-dom.d.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-// Type definitions for React v0.14 (react-dom)
-// Project: http://facebook.github.io/react/
-// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="react.d.ts" />
-
-declare namespace __React {
-    namespace __DOM {
-        function findDOMNode<E extends Element>(instance: ReactInstance): E;
-        function findDOMNode(instance: ReactInstance): Element;
-
-        function render<P extends DOMAttributes, T extends Element>(
-            element: DOMElement<P, T>,
-            container: Element,
-            callback?: (element: T) => any): T;
-        function render<P>(
-            element: SFCElement<P>,
-            container: Element,
-            callback?: () => any): void;
-        function render<P, T extends Component<P, {}>>(
-            element: CElement<P, T>,
-            container: Element,
-            callback?: (component: T) => any): T;
-        function render<P>(
-            element: ReactElement<P>,
-            container: Element,
-            callback?: (component?: Component<P, {}> | Element) => any): Component<P, {}> | Element | void;
-
-        function unmountComponentAtNode(container: Element): boolean;
-
-        var version: string;
-
-        function unstable_batchedUpdates<A, B>(callback: (a: A, b: B) => any, a: A, b: B): void;
-        function unstable_batchedUpdates<A>(callback: (a: A) => any, a: A): void;
-        function unstable_batchedUpdates(callback: () => any): void;
-
-        function unstable_renderSubtreeIntoContainer<P extends DOMAttributes, T extends Element>(
-            parentComponent: Component<any, any>,
-            element: DOMElement<P, T>,
-            container: Element,
-            callback?: (element: T) => any): T;
-        function unstable_renderSubtreeIntoContainer<P, T extends Component<P, {}>>(
-            parentComponent: Component<any, any>,
-            element: CElement<P, T>,
-            container: Element,
-            callback?: (component: T) => any): T;
-        function render<P>(
-            parentComponent: Component<any, any>,
-            element: SFCElement<P>,
-            container: Element,
-            callback?: () => any): void;
-        function unstable_renderSubtreeIntoContainer<P>(
-            parentComponent: Component<any, any>,
-            element: ReactElement<P>,
-            container: Element,
-            callback?: (component?: Component<P, {}> | Element) => any): Component<P, {}> | Element | void;
-    }
-
-    namespace __DOMServer {
-        function renderToString(element: ReactElement<any>): string;
-        function renderToStaticMarkup(element: ReactElement<any>): string;
-        var version: string;
-    }
-}
-
-declare module "react-dom" {
-    import DOM = __React.__DOM;
-    export = DOM;
-}
-
-declare module "react-dom/server" {
-    import DOMServer = __React.__DOMServer;
-    export = DOMServer;
-}
diff --git a/react/react-global-0.13.3.d.ts b/react/react-global-0.13.3.d.ts
deleted file mode 100644
index 9bed15c991..0000000000
--- a/react/react-global-0.13.3.d.ts
+++ /dev/null
@@ -1,285 +0,0 @@
-// Type definitions for React v0.13.3 (namespace)
-// Project: http://facebook.github.io/react/
-// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="react-0.13.3.d.ts" />
-
-import React = __React;
-
-declare namespace __React {
-    //
-    // React.addons
-    // ----------------------------------------------------------------------
-
-    export module addons {
-        export var CSSTransitionGroup: CSSTransitionGroup;
-        export var TransitionGroup: TransitionGroup;
-
-        export var LinkedStateMixin: LinkedStateMixin;
-        export var PureRenderMixin: PureRenderMixin;
-
-        export function batchedUpdates<A, B>(
-            callback: (a: A, b: B) => any, a: A, b: B): void;
-        export function batchedUpdates<A>(callback: (a: A) => any, a: A): void;
-        export function batchedUpdates(callback: () => any): void;
-
-        // deprecated: use petehunt/react-classset or JedWatson/classnames
-        export function classSet(cx: { [key: string]: boolean }): string;
-        export function classSet(...classList: string[]): string;
-
-        export function cloneWithProps<P>(
-            element: DOMElement<P>, props: P): DOMElement<P>;
-        export function cloneWithProps<P>(
-            element: ClassicElement<P>, props: P): ClassicElement<P>;
-        export function cloneWithProps<P>(
-            element: ReactElement<P>, props: P): ReactElement<P>;
-
-        export function createFragment(
-            object: { [key: string]: ReactNode }): ReactFragment;
-
-        export function update(value: any[], spec: UpdateArraySpec): any[];
-        export function update(value: {}, spec: UpdateSpec): any;
-
-        // Development tools
-        export import Perf = ReactPerf;
-        export import TestUtils = ReactTestUtils;
-    }
-
-    //
-    // React.addons (Transitions)
-    // ----------------------------------------------------------------------
-
-    interface TransitionGroupProps {
-        component?: ReactType;
-        childFactory?: (child: ReactElement<any>) => ReactElement<any>;
-    }
-
-    interface CSSTransitionGroupProps extends TransitionGroupProps {
-        transitionName: string;
-        transitionAppear?: boolean;
-        transitionEnter?: boolean;
-        transitionLeave?: boolean;
-    }
-
-    type CSSTransitionGroup = ComponentClass<CSSTransitionGroupProps>;
-    type TransitionGroup = ComponentClass<TransitionGroupProps>;
-
-    //
-    // React.addons (Mixins)
-    // ----------------------------------------------------------------------
-
-    interface ReactLink<T> {
-        value: T;
-        requestChange(newValue: T): void;
-    }
-
-    interface LinkedStateMixin extends Mixin<any, any> {
-        linkState<T>(key: string): ReactLink<T>;
-    }
-
-    interface PureRenderMixin extends Mixin<any, any> {
-    }
-
-    //
-    // Reat.addons.update
-    // ----------------------------------------------------------------------
-
-    interface UpdateSpecCommand {
-        $set?: any;
-        $merge?: {};
-        $apply?(value: any): any;
-    }
-
-    interface UpdateSpecPath {
-        [key: string]: UpdateSpec;
-    }
-
-    type UpdateSpec = UpdateSpecCommand | UpdateSpecPath;
-
-    interface UpdateArraySpec extends UpdateSpecCommand {
-        $push?: any[];
-        $unshift?: any[];
-        $splice?: any[][];
-    }
-
-    //
-    // React.addons.Perf
-    // ----------------------------------------------------------------------
-
-    interface ComponentPerfContext {
-        current: string;
-        owner: string;
-    }
-
-    interface NumericPerfContext {
-        [key: string]: number;
-    }
-
-    interface Measurements {
-        exclusive: NumericPerfContext;
-        inclusive: NumericPerfContext;
-        render: NumericPerfContext;
-        counts: NumericPerfContext;
-        writes: NumericPerfContext;
-        displayNames: {
-            [key: string]: ComponentPerfContext;
-        };
-        totalTime: number;
-    }
-
-    namespace ReactPerf {
-        export function start(): void;
-        export function stop(): void;
-        export function printInclusive(measurements: Measurements[]): void;
-        export function printExclusive(measurements: Measurements[]): void;
-        export function printWasted(measurements: Measurements[]): void;
-        export function printDOM(measurements: Measurements[]): void;
-        export function getLastMeasurements(): Measurements[];
-    }
-
-    //
-    // React.addons.TestUtils
-    // ----------------------------------------------------------------------
-
-    interface MockedComponentClass {
-        new(): any;
-    }
-
-    namespace ReactTestUtils {
-        export import Simulate = ReactSimulate;
-
-        export function renderIntoDocument<P>(
-            element: ReactElement<P>): Component<P, any>;
-        export function renderIntoDocument<C extends Component<any, any>>(
-            element: ReactElement<any>): C;
-
-        export function mockComponent(
-            mocked: MockedComponentClass, mockTagName?: string): typeof ReactTestUtils;
-
-        export function isElementOfType(
-            element: ReactElement<any>, type: ReactType): boolean;
-        export function isTextComponent(instance: Component<any, any>): boolean;
-        export function isDOMComponent(instance: Component<any, any>): boolean;
-        export function isCompositeComponent(instance: Component<any, any>): boolean;
-        export function isCompositeComponentWithType(
-            instance: Component<any, any>,
-            type: ComponentClass<any>): boolean;
-
-        export function findAllInRenderedTree(
-            tree: Component<any, any>,
-            fn: (i: Component<any, any>) => boolean): Component<any, any>;
-
-        export function scryRenderedDOMComponentsWithClass(
-            tree: Component<any, any>,
-            className: string): DOMComponent<any>[];
-        export function findRenderedDOMComponentWithClass(
-            tree: Component<any, any>,
-            className: string): DOMComponent<any>;
-
-        export function scryRenderedDOMComponentsWithTag(
-            tree: Component<any, any>,
-            tagName: string): DOMComponent<any>[];
-        export function findRenderedDOMComponentWithTag(
-            tree: Component<any, any>,
-            tagName: string): DOMComponent<any>;
-
-        export function scryRenderedComponentsWithType<P>(
-            tree: Component<any, any>,
-            type: ComponentClass<P>): Component<P, {}>[];
-        export function scryRenderedComponentsWithType<C extends Component<any, any>>(
-            tree: Component<any, any>,
-            type: ComponentClass<any>): C[];
-
-        export function findRenderedComponentWithType<P>(
-            tree: Component<any, any>,
-            type: ComponentClass<P>): Component<P, {}>;
-        export function findRenderedComponentWithType<C extends Component<any, any>>(
-            tree: Component<any, any>,
-            type: ComponentClass<any>): C;
-
-        export function createRenderer(): ShallowRenderer;
-    }
-
-    interface SyntheticEventData {
-        altKey?: boolean;
-        button?: number;
-        buttons?: number;
-        clientX?: number;
-        clientY?: number;
-        changedTouches?: TouchList;
-        charCode?: boolean;
-        clipboardData?: DataTransfer;
-        ctrlKey?: boolean;
-        deltaMode?: number;
-        deltaX?: number;
-        deltaY?: number;
-        deltaZ?: number;
-        detail?: number;
-        getModifierState?(key: string): boolean;
-        key?: string;
-        keyCode?: number;
-        locale?: string;
-        location?: number;
-        metaKey?: boolean;
-        pageX?: number;
-        pageY?: number;
-        relatedTarget?: EventTarget;
-        repeat?: boolean;
-        screenX?: number;
-        screenY?: number;
-        shiftKey?: boolean;
-        targetTouches?: TouchList;
-        touches?: TouchList;
-        view?: AbstractView;
-        which?: number;
-    }
-
-    interface EventSimulator {
-        (element: Element, eventData?: SyntheticEventData): void;
-        (component: Component<any, any>, eventData?: SyntheticEventData): void;
-    }
-
-    namespace ReactSimulate {
-        export var blur: EventSimulator;
-        export var change: EventSimulator;
-        export var click: EventSimulator;
-        export var cut: EventSimulator;
-        export var doubleClick: EventSimulator;
-        export var drag: EventSimulator;
-        export var dragEnd: EventSimulator;
-        export var dragEnter: EventSimulator;
-        export var dragExit: EventSimulator;
-        export var dragLeave: EventSimulator;
-        export var dragOver: EventSimulator;
-        export var dragStart: EventSimulator;
-        export var drop: EventSimulator;
-        export var focus: EventSimulator;
-        export var input: EventSimulator;
-        export var keyDown: EventSimulator;
-        export var keyPress: EventSimulator;
-        export var keyUp: EventSimulator;
-        export var mouseDown: EventSimulator;
-        export var mouseEnter: EventSimulator;
-        export var mouseLeave: EventSimulator;
-        export var mouseMove: EventSimulator;
-        export var mouseOut: EventSimulator;
-        export var mouseOver: EventSimulator;
-        export var mouseUp: EventSimulator;
-        export var paste: EventSimulator;
-        export var scroll: EventSimulator;
-        export var submit: EventSimulator;
-        export var touchCancel: EventSimulator;
-        export var touchEnd: EventSimulator;
-        export var touchMove: EventSimulator;
-        export var touchStart: EventSimulator;
-        export var wheel: EventSimulator;
-    }
-
-    class ShallowRenderer {
-        getRenderOutput<E extends ReactElement<any>>(): E;
-        getRenderOutput(): ReactElement<any>;
-        render(element: ReactElement<any>, context?: any): void;
-        unmount(): void;
-    }
-}
diff --git a/react/react-global-tests.ts b/react/react-global-tests.ts
deleted file mode 100644
index 3aaf4b2c1f..0000000000
--- a/react/react-global-tests.ts
+++ /dev/null
@@ -1,455 +0,0 @@
-/// <reference path="react-global.d.ts" />
-
-interface Props {
-    hello: string;
-    world?: string;
-    foo: number;
-    bar: boolean;
-}
-
-interface State {
-    inputValue?: string;
-    seconds?: number;
-}
-
-interface Context {
-    someValue?: string;
-}
-
-interface ChildContext {
-    someOtherValue: string;
-}
-
-interface MyComponent extends React.Component<Props, State> {
-    reset(): void;
-}
-
-var props: Props & React.ClassAttributes<{}> = {
-    key: 42,
-    ref: "myComponent42",
-    hello: "world",
-    foo: 42,
-    bar: true
-};
-
-var container: Element;
-
-//
-// Top-Level API
-// --------------------------------------------------------------------------
-
-var ClassicComponent: React.ClassicComponentClass<Props> =
-    React.createClass<Props, State>({
-        getDefaultProps() {
-            return <Props>{
-                hello: undefined,
-                world: "peace",
-                foo: undefined,
-                bar: undefined,
-            };
-        },
-        getInitialState() {
-            return {
-                inputValue: this.context.someValue,
-                seconds: this.props.foo
-            };
-        },
-        reset() {
-            this.replaceState(this.getInitialState());
-        },
-        render() {
-            return React.DOM.div(null,
-                React.DOM.input({
-                    ref: input => this._input = input,
-                    value: this.state.inputValue
-                }));
-        }
-    });
-
-class ModernComponent extends React.Component<Props, State>
-    implements React.ChildContextProvider<ChildContext> {
-
-    static propTypes: React.ValidationMap<Props> = {
-        foo: React.PropTypes.number
-    };
-
-    static contextTypes: React.ValidationMap<Context> = {
-        someValue: React.PropTypes.string
-    };
-
-    static childContextTypes: React.ValidationMap<ChildContext> = {
-        someOtherValue: React.PropTypes.string
-    };
-
-    static defaultProps: Props;
-
-    context: Context;
-
-    getChildContext() {
-        return {
-            someOtherValue: "foo"
-        };
-    }
-
-    state = {
-        inputValue: this.context.someValue,
-        seconds: this.props.foo
-    };
-
-    reset() {
-        this.setState({
-            inputValue: this.context.someValue,
-            seconds: this.props.foo
-        });
-    }
-
-    private _input: HTMLInputElement;
-
-    render() {
-        return React.DOM.div(null,
-            React.DOM.input({
-                ref: input => this._input = <HTMLInputElement>input,
-                value: this.state.inputValue
-            }));
-    }
-}
-
-// React.createFactory
-var factory: React.CFactory<Props, ModernComponent> =
-    React.createFactory(ModernComponent);
-var factoryElement: React.CElement<Props, ModernComponent> =
-    factory(props);
-
-var classicFactory: React.ClassicFactory<Props> =
-    React.createFactory(ClassicComponent);
-var classicFactoryElement: React.ClassicElement<Props> =
-    classicFactory(props);
-
-var domFactory: React.DOMFactory<React.DOMAttributes, Element> =
-    React.createFactory("foo");
-var domFactoryElement: React.DOMElement<React.DOMAttributes, Element> =
-    domFactory();
-
-// React.createElement
-var element: React.CElement<Props, ModernComponent> =
-    React.createElement(ModernComponent, props);
-var classicElement: React.ClassicElement<Props> =
-    React.createElement(ClassicComponent, props);
-var domElement: React.ReactHTMLElement<HTMLDivElement> =
-    React.createElement("div");
-
-// React.cloneElement
-var clonedElement: React.CElement<Props, ModernComponent> =
-    React.cloneElement(element, props);
-var clonedClassicElement: React.ClassicElement<Props> =
-    React.cloneElement(classicElement, props);
-var clonedDOMElement: React.ReactHTMLElement<HTMLDivElement> =
-    React.cloneElement(domElement);
-
-// React.render
-var component: React.Component<Props, any> =
-    ReactDOM.render(element, container);
-var classicComponent: React.ClassicComponent<Props, any> =
-    ReactDOM.render(classicElement, container);
-var domComponent: Element =
-    ReactDOM.render(domElement, container);
-
-// Other Top-Level API
-var unmounted: boolean = ReactDOM.unmountComponentAtNode(container);
-
-// ReactDOMServer is not supported in global version
-// var str: string = ReactDOMServer.renderToString(element);
-// var markup: string = ReactDOMServer.renderToStaticMarkup(element);
-var notValid: boolean = React.isValidElement(props); // false
-var isValid = React.isValidElement(element); // true
-var domNode: Element = ReactDOM.findDOMNode(component);
-domNode = ReactDOM.findDOMNode(domNode);
-
-//
-// React Elements
-// --------------------------------------------------------------------------
-
-var type = element.type;
-var elementProps: Props = element.props;
-var key = element.key;
-
-//
-// React Components
-// --------------------------------------------------------------------------
-
-var displayName: string = ClassicComponent.displayName;
-var defaultProps: Props = ClassicComponent.getDefaultProps();
-var propTypes: React.ValidationMap<Props> = ClassicComponent.propTypes;
-
-//
-// Component API
-// --------------------------------------------------------------------------
-
-// modern
-var componentState: State = component.state;
-component.setState({ inputValue: "!!!" });
-component.forceUpdate();
-
-// classic
-var isMounted: boolean = classicComponent.isMounted();
-classicComponent.replaceState({ inputValue: "???", seconds: 60 });
-
-var myComponent = <MyComponent>component;
-myComponent.reset();
-
-//
-// Attributes
-// --------------------------------------------------------------------------
-
-var children: any[] = ["Hello world", [null], React.DOM.span(null)];
-var divStyle: React.CSSProperties = { // CSSProperties
-    flex: "1 1 main-size",
-    backgroundImage: "url('hello.png')"
-};
-var htmlAttr: React.HTMLProps<any> = {
-    key: 36,
-    ref: "htmlComponent",
-    children: children,
-    className: "test-attr",
-    style: divStyle,
-    onClick: (event: React.MouseEvent) => {
-        event.preventDefault();
-        event.stopPropagation();
-    },
-    dangerouslySetInnerHTML: {
-        __html: "<strong>STRONG</strong>"
-    }
-};
-React.DOM.div(htmlAttr);
-React.DOM.span(htmlAttr);
-React.DOM.input(htmlAttr);
-
-React.DOM.svg({ viewBox: "0 0 48 48" },
-    React.DOM.rect({
-      x: 22,
-      y: 10,
-      width: 4,
-      height: 28
-    }),
-    React.DOM.rect({
-      x: 10,
-      y: 22,
-      width: 28,
-      height: 4
-    }));
-
-
-//
-// React.PropTypes
-// --------------------------------------------------------------------------
-
-var PropTypesSpecification: React.ComponentSpec<any, any> = {
-    propTypes: {
-        optionalArray: React.PropTypes.array,
-        optionalBool: React.PropTypes.bool,
-        optionalFunc: React.PropTypes.func,
-        optionalNumber: React.PropTypes.number,
-        optionalObject: React.PropTypes.object,
-        optionalString: React.PropTypes.string,
-        optionalNode: React.PropTypes.node,
-        optionalElement: React.PropTypes.element,
-        optionalMessage: React.PropTypes.instanceOf(Date),
-        optionalEnum: React.PropTypes.oneOf(["News", "Photos"]),
-        optionalUnion: React.PropTypes.oneOfType([
-            React.PropTypes.string,
-            React.PropTypes.number,
-            React.PropTypes.instanceOf(Date)
-        ]),
-        optionalArrayOf: React.PropTypes.arrayOf(React.PropTypes.number),
-        optionalObjectOf: React.PropTypes.objectOf(React.PropTypes.number),
-        optionalObjectWithShape: React.PropTypes.shape({
-            color: React.PropTypes.string,
-            fontSize: React.PropTypes.number
-        }),
-        requiredFunc: React.PropTypes.func.isRequired,
-        requiredAny: React.PropTypes.any.isRequired,
-        customProp: function(props: any, propName: string, componentName: string) {
-            if (!/matchme/.test(props[propName])) {
-                return new Error("Validation failed!");
-            }
-            return null;
-        }
-    },
-    render: (): React.ReactElement<any> => {
-        return null;
-    }
-};
-
-//
-// ContextTypes
-// --------------------------------------------------------------------------
-
-var ContextTypesSpecification: React.ComponentSpec<any, any> = {
-    contextTypes: {
-        optionalArray: React.PropTypes.array,
-        optionalBool: React.PropTypes.bool,
-        optionalFunc: React.PropTypes.func,
-        optionalNumber: React.PropTypes.number,
-        optionalObject: React.PropTypes.object,
-        optionalString: React.PropTypes.string,
-        optionalNode: React.PropTypes.node,
-        optionalElement: React.PropTypes.element,
-        optionalMessage: React.PropTypes.instanceOf(Date),
-        optionalEnum: React.PropTypes.oneOf(["News", "Photos"]),
-        optionalUnion: React.PropTypes.oneOfType([
-            React.PropTypes.string,
-            React.PropTypes.number,
-            React.PropTypes.instanceOf(Date)
-        ]),
-        optionalArrayOf: React.PropTypes.arrayOf(React.PropTypes.number),
-        optionalObjectOf: React.PropTypes.objectOf(React.PropTypes.number),
-        optionalObjectWithShape: React.PropTypes.shape({
-            color: React.PropTypes.string,
-            fontSize: React.PropTypes.number
-        }),
-        requiredFunc: React.PropTypes.func.isRequired,
-        requiredAny: React.PropTypes.any.isRequired,
-        customProp: function(props: any, propName: string, componentName: string) {
-            if (!/matchme/.test(props[propName])) {
-                return new Error("Validation failed!");
-            }
-            return null;
-        }
-    },
-    render: (): React.ReactElement<any> => {
-        return null;
-    }
-};
-
-//
-// React.Children
-// --------------------------------------------------------------------------
-
-var mappedChildrenArray: number[] =
-    React.Children.map<number>(children, (child) => { return 42; });
-React.Children.forEach(children, (child) => {});
-var nChildren: number = React.Children.count(children);
-var onlyChild = React.Children.only([null, [[["Hallo"], true]], false]);
-var childrenToArray: React.ReactChild[] = React.Children.toArray(children);
-
-//
-// Example from http://facebook.github.io/react/
-// --------------------------------------------------------------------------
-
-interface TimerState {
-    secondsElapsed: number;
-}
-class Timer extends React.Component<{}, TimerState> {
-    state = {
-        secondsElapsed: 0
-    };
-    private _interval: number;
-    tick() {
-        this.setState((prevState, props) => ({
-            secondsElapsed: prevState.secondsElapsed + 1
-        }));
-    }
-    componentDidMount() {
-        this._interval = setInterval(() => this.tick(), 1000);
-    }
-    componentWillUnmount() {
-        clearInterval(this._interval);
-    }
-    render() {
-        return React.DOM.div(
-            null,
-            "Seconds Elapsed: ",
-            this.state.secondsElapsed
-        );
-    }
-}
-ReactDOM.render(React.createElement(Timer), container);
-
-//
-// createFragment addon
-// --------------------------------------------------------------------------
-React.addons.createFragment({
-    a: React.DOM.div(),
-    b: ["a", false, React.createElement("span")]
-});
-
-//
-// CSSTransitionGroup addon
-// --------------------------------------------------------------------------
-React.createFactory(React.addons.CSSTransitionGroup)({
-    component: React.createClass({
-        render: (): React.ReactElement<any> => null
-    }),
-    childFactory: (c) => c,
-    transitionName: "transition",
-    transitionAppear: false,
-    transitionEnter: true,
-    transitionLeave: true
-});
-
-//
-// LinkedStateMixin addon
-// --------------------------------------------------------------------------
-React.createClass({
-  mixins: [React.addons.LinkedStateMixin],
-  render: function() { return React.DOM.div(null); }
-});
-
-//
-// Perf addon
-// --------------------------------------------------------------------------
-React.addons.Perf.start();
-React.addons.Perf.stop();
-var measurements = React.addons.Perf.getLastMeasurements();
-React.addons.Perf.printInclusive(measurements);
-React.addons.Perf.printExclusive(measurements);
-React.addons.Perf.printWasted(measurements);
-React.addons.Perf.printDOM(measurements);
-
-//
-// PureRenderMixin addon
-// --------------------------------------------------------------------------
-React.createClass({
-  mixins: [React.addons.PureRenderMixin],
-  render: function() { return React.DOM.div(null); }
-});
-
-//
-// TestUtils addon
-// --------------------------------------------------------------------------
-var node: Element;
-React.addons.TestUtils.Simulate.click(node);
-React.addons.TestUtils.Simulate.change(node);
-React.addons.TestUtils.Simulate.keyDown(node, { key: "Enter" });
-
-var renderer: React.ShallowRenderer =
-    React.addons.TestUtils.createRenderer();
-renderer.render(React.createElement(Timer));
-var output: React.ReactElement<React.Props<Timer>> =
-    renderer.getRenderOutput();
-
-//
-// TransitionGroup addon
-// --------------------------------------------------------------------------
-React.createFactory(React.addons.TransitionGroup)({ component: "div" });
-
-//
-// update addon
-// --------------------------------------------------------------------------
-{
-// These are copied from https://facebook.github.io/react/docs/update.html
-let initialArray = [1, 2, 3];
-let newArray = React.addons.update(initialArray, {$push: [4]}); // => [1, 2, 3, 4]
-
-let collection = [1, 2, {a: [12, 17, 15]}];
-let newCollection = React.addons.update(collection, {2: {a: {$splice: [[1, 1, 13, 14]]}}});
-// => [1, 2, {a: [12, 13, 14, 15]}]
-
-let obj = {a: 5, b: 3};
-let newObj = React.addons.update(obj, {b: {$apply: function(x) {return x * 2;}}});
-// => {a: 5, b: 6}
-let newObj2 = React.addons.update(obj, {b: {$set: obj.b * 2}});
-
-let objShallow = {a: 5, b: 3};
-let newObjShallow = React.addons.update(obj, {$merge: {b: 6, c: 7}}); // => {a: 5, b: 6, c: 7}
-}
diff --git a/react/react-global.d.ts b/react/react-global.d.ts
deleted file mode 100644
index 3a4cc07c3a..0000000000
--- a/react/react-global.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// Type definitions for React v0.14 (namespace)
-// Project: http://facebook.github.io/react/
-// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="react.d.ts" />
-/// <reference path="react-dom.d.ts" />
-/// <reference path="react-addons-create-fragment.d.ts" />
-/// <reference path="react-addons-css-transition-group.d.ts" />
-/// <reference path="react-addons-linked-state-mixin.d.ts" />
-/// <reference path="react-addons-perf.d.ts" />
-/// <reference path="react-addons-pure-render-mixin.d.ts" />
-/// <reference path="react-addons-test-utils.d.ts" />
-/// <reference path="react-addons-transition-group.d.ts" />
-/// <reference path="react-addons-update.d.ts" />
-
-import React = __React;
-import ReactDOM = __React.__DOM;
-
-declare namespace __React {
-    export import addons = __React.__Addons;
-}
diff --git a/react/react-tests.ts b/react/react-tests.ts
index e0d9bb7be7..9fc0db1676 100644
--- a/react/react-tests.ts
+++ b/react/react-tests.ts
@@ -1,15 +1,3 @@
-/// <reference path="react.d.ts" />
-/// <reference path="react-dom.d.ts" />
-/// <reference path="react-addons-create-fragment.d.ts" />
-/// <reference path="react-addons-css-transition-group.d.ts" />
-/// <reference path="react-addons-linked-state-mixin.d.ts" />
-/// <reference path="react-addons-perf.d.ts" />
-/// <reference path="react-addons-pure-render-mixin.d.ts" />
-/// <reference path="react-addons-shallow-compare.d.ts" />
-/// <reference path="react-addons-test-utils.d.ts" />
-/// <reference path="react-addons-transition-group.d.ts" />
-/// <reference path="react-addons-update.d.ts" />
-
 import React = require("react");
 import ReactDOM = require("react-dom");
 import ReactDOMServer = require("react-dom/server");
@@ -138,6 +126,8 @@ class ModernComponent extends React.Component<Props, State>
     }
 }
 
+class ModernComponentNoState extends React.Component<Props, void> {}
+
 interface SCProps {
     foo?: number;
 }
@@ -182,6 +172,8 @@ var domFactoryElement: React.DOMElement<React.DOMAttributes, Element> =
 // React.createElement
 var element: React.CElement<Props, ModernComponent> =
     React.createElement(ModernComponent, props);
+var elementNoState: React.CElement<Props, ModernComponentNoState> =
+    React.createElement(ModernComponentNoState, props);
 var statelessElement: React.SFCElement<SCProps> =
     React.createElement(StatelessComponent, props);
 var classicElement: React.ClassicElement<Props> =
@@ -216,6 +208,8 @@ var clonedDOMElement: React.ReactHTMLElement<HTMLDivElement> =
 // React.render
 var component: ModernComponent =
     ReactDOM.render(element, container);
+var componentNoState: ModernComponentNoState =
+    ReactDOM.render(elementNoState, container);
 var classicComponent: React.ClassicComponent<Props, any> =
     ReactDOM.render(classicElement, container);
 var domComponent: Element =
@@ -547,10 +541,9 @@ var node: Element = TestUtils.renderIntoDocument(React.DOM.div());
 
 TestUtils.Simulate.click(node);
 TestUtils.Simulate.change(node);
-TestUtils.Simulate.keyDown(node, { key: "Enter" });
+TestUtils.Simulate.keyDown(node, { key: "Enter", cancelable: false });
 
-var renderer: React.ShallowRenderer =
-    TestUtils.createRenderer();
+var renderer: TestUtils.ShallowRenderer = TestUtils.createRenderer();
 renderer.render(React.createElement(Timer));
 var output: React.ReactElement<React.Props<Timer>> =
     renderer.getRenderOutput();
diff --git a/react/react.d.ts b/react/react.d.ts
deleted file mode 100644
index 04939558b5..0000000000
--- a/react/react.d.ts
+++ /dev/null
@@ -1,2469 +0,0 @@
-// Type definitions for React v0.14
-// Project: http://facebook.github.io/react/
-// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace __React {
-
-    //
-    // React Elements
-    // ----------------------------------------------------------------------
-
-    type ReactType = string | ComponentClass<any> | StatelessComponent<any>;
-
-    type Key = string | number;
-    type Ref<T> = string | ((instance: T) => any);
-
-    interface Attributes {
-        key?: Key;
-    }
-    interface ClassAttributes<T> extends Attributes {
-        ref?: Ref<T>;
-    }
-
-    interface ReactElement<P> {
-        type: string | ComponentClass<P> | SFC<P>;
-        props: P;
-        key?: Key;
-    }
-
-    interface SFCElement<P> extends ReactElement<P> {
-        type: SFC<P>;
-    }
-
-    type CElement<P, T extends Component<P, {}>> = ComponentElement<P, T>;
-    interface ComponentElement<P, T extends Component<P, {}>> extends ReactElement<P> {
-        type: ComponentClass<P>;
-        ref?: Ref<T>;
-    }
-
-    type ClassicElement<P> = CElement<P, ClassicComponent<P, {}>>;
-
-    interface DOMElement<P extends DOMAttributes, T extends Element> extends ReactElement<P> {
-        type: string;
-        ref: Ref<T>;
-    }
-
-    interface ReactHTMLElement<T extends HTMLElement> extends DOMElement<HTMLAttributes, T> {
-    }
-
-    interface ReactSVGElement extends DOMElement<SVGAttributes, SVGElement> {
-    }
-
-    //
-    // Factories
-    // ----------------------------------------------------------------------
-
-    interface Factory<P> {
-        (props?: P & Attributes, ...children: ReactNode[]): ReactElement<P>;
-    }
-
-    interface SFCFactory<P> {
-        (props?: P & Attributes, ...children: ReactNode[]): SFCElement<P>;
-    }
-
-    interface ComponentFactory<P, T extends Component<P, {}>> {
-        (props?: P & ClassAttributes<T>, ...children: ReactNode[]): CElement<P, T>;
-    }
-
-    type CFactory<P, T extends Component<P, {}>> = ComponentFactory<P, T>;
-    type ClassicFactory<P> = CFactory<P, ClassicComponent<P, {}>>;
-
-    interface DOMFactory<P extends DOMAttributes, T extends Element> {
-        (props?: P & ClassAttributes<T>, ...children: ReactNode[]): DOMElement<P, T>;
-    }
-
-    interface HTMLFactory<T extends HTMLElement> extends DOMFactory<HTMLAttributes, T> {
-    }
-
-    interface SVGFactory extends DOMFactory<SVGAttributes, SVGElement> {
-    }
-
-    //
-    // React Nodes
-    // http://facebook.github.io/react/docs/glossary.html
-    // ----------------------------------------------------------------------
-
-    type ReactText = string | number;
-    type ReactChild = ReactElement<any> | ReactText;
-
-    // Should be Array<ReactNode> but type aliases cannot be recursive
-    type ReactFragment = {} | Array<ReactChild | any[] | boolean>;
-    type ReactNode = ReactChild | ReactFragment | boolean;
-
-    //
-    // Top Level API
-    // ----------------------------------------------------------------------
-
-    function createClass<P, S>(spec: ComponentSpec<P, S>): ClassicComponentClass<P>;
-
-    function createFactory<P extends DOMAttributes, T extends Element>(
-        type: string): DOMFactory<P, T>;
-    function createFactory<P>(type: SFC<P>): SFCFactory<P>;
-    function createFactory<P>(
-        type: ClassType<P, ClassicComponent<P, {}>, ClassicComponentClass<P>>): CFactory<P, ClassicComponent<P, {}>>;
-    function createFactory<P, T extends Component<P, {}>, C extends ComponentClass<P>>(
-        type: ClassType<P, T, C>): CFactory<P, T>;
-    function createFactory<P>(type: ComponentClass<P> | SFC<P>): Factory<P>;
-
-    function createElement<P extends DOMAttributes, T extends Element>(
-        type: string,
-        props?: P & ClassAttributes<T>,
-        ...children: ReactNode[]): DOMElement<P, T>;
-    function createElement<P>(
-        type: SFC<P>,
-        props?: P & Attributes,
-        ...children: ReactNode[]): SFCElement<P>;
-    function createElement<P>(
-        type: ClassType<P, ClassicComponent<P, {}>, ClassicComponentClass<P>>,
-        props?: P & ClassAttributes<ClassicComponent<P, {}>>,
-        ...children: ReactNode[]): CElement<P, ClassicComponent<P, {}>>;
-    function createElement<P, T extends Component<P, {}>, C extends ComponentClass<P>>(
-        type: ClassType<P, T, C>,
-        props?: P & ClassAttributes<T>,
-        ...children: ReactNode[]): CElement<P, T>;
-    function createElement<P>(
-        type: ComponentClass<P> | SFC<P>,
-        props?: P & Attributes,
-        ...children: ReactNode[]): ReactElement<P>;
-
-    function cloneElement<P extends DOMAttributes, T extends Element>(
-        element: DOMElement<P, T>,
-        props?: P & ClassAttributes<T>,
-        ...children: ReactNode[]): DOMElement<P, T>;
-    function cloneElement<P extends Q, Q>(
-        element: SFCElement<P>,
-        props?: Q, // should be Q & Attributes, but then Q is inferred as {}
-        ...children: ReactNode[]): SFCElement<P>;
-    function cloneElement<P extends Q, Q, T extends Component<P, {}>>(
-        element: CElement<P, T>,
-        props?: Q, // should be Q & ClassAttributes<T>
-        ...children: ReactNode[]): CElement<P, T>;
-    function cloneElement<P extends Q, Q>(
-        element: ReactElement<P>,
-        props?: Q, // should be Q & Attributes
-        ...children: ReactNode[]): ReactElement<P>;
-
-    function isValidElement<P>(object: {}): object is ReactElement<P>;
-
-    var DOM: ReactDOM;
-    var PropTypes: ReactPropTypes;
-    var Children: ReactChildren;
-
-    //
-    // Component API
-    // ----------------------------------------------------------------------
-
-    type ReactInstance = Component<any, any> | Element;
-
-    // Base component for plain JS classes
-    class Component<P, S> implements ComponentLifecycle<P, S> {
-        constructor(props?: P, context?: any);
-        setState(f: (prevState: S, props: P) => S, callback?: () => any): void;
-        setState(state: S, callback?: () => any): void;
-        forceUpdate(callBack?: () => any): void;
-        render(): JSX.Element;
-
-        // React.Props<T> is now deprecated, which means that the `children`
-        // property is not available on `P` by default, even though you can
-        // always pass children as variadic arguments to `createElement`.
-        // In the future, if we can define its call signature conditionally
-        // on the existence of `children` in `P`, then we should remove this.
-        props: P & { children?: ReactNode };
-        state: S;
-        context: {};
-        refs: {
-            [key: string]: ReactInstance
-        };
-    }
-
-    interface ClassicComponent<P, S> extends Component<P, S> {
-        replaceState(nextState: S, callback?: () => any): void;
-        isMounted(): boolean;
-        getInitialState?(): S;
-    }
-
-    interface ChildContextProvider<CC> {
-        getChildContext(): CC;
-    }
-
-    //
-    // Class Interfaces
-    // ----------------------------------------------------------------------
-
-    type SFC<P> = StatelessComponent<P>;
-    interface StatelessComponent<P> {
-        (props?: P, context?: any): ReactElement<any>;
-        propTypes?: ValidationMap<P>;
-        contextTypes?: ValidationMap<any>;
-        defaultProps?: P;
-        displayName?: string;
-    }
-
-    interface ComponentClass<P> {
-        new(props?: P, context?: any): Component<P, {}>;
-        propTypes?: ValidationMap<P>;
-        contextTypes?: ValidationMap<any>;
-        childContextTypes?: ValidationMap<any>;
-        defaultProps?: P;
-        displayName?: string;
-    }
-
-    interface ClassicComponentClass<P> extends ComponentClass<P> {
-        new(props?: P, context?: any): ClassicComponent<P, {}>;
-        getDefaultProps?(): P;
-    }
-
-    /**
-     * We use an intersection type to infer multiple type parameters from
-     * a single argument, which is useful for many top-level API defs.
-     * See https://github.com/Microsoft/TypeScript/issues/7234 for more info.
-     */
-    type ClassType<P, T extends Component<P, {}>, C extends ComponentClass<P>> =
-        C &
-        (new() => T) &
-        (new() => { props: P });
-
-    //
-    // Component Specs and Lifecycle
-    // ----------------------------------------------------------------------
-
-    interface ComponentLifecycle<P, S> {
-        componentWillMount?(): void;
-        componentDidMount?(): void;
-        componentWillReceiveProps?(nextProps: P, nextContext: any): void;
-        shouldComponentUpdate?(nextProps: P, nextState: S, nextContext: any): boolean;
-        componentWillUpdate?(nextProps: P, nextState: S, nextContext: any): void;
-        componentDidUpdate?(prevProps: P, prevState: S, prevContext: any): void;
-        componentWillUnmount?(): void;
-    }
-
-    interface Mixin<P, S> extends ComponentLifecycle<P, S> {
-        mixins?: Mixin<P, S>;
-        statics?: {
-            [key: string]: any;
-        };
-
-        displayName?: string;
-        propTypes?: ValidationMap<any>;
-        contextTypes?: ValidationMap<any>;
-        childContextTypes?: ValidationMap<any>;
-
-        getDefaultProps?(): P;
-        getInitialState?(): S;
-    }
-
-    interface ComponentSpec<P, S> extends Mixin<P, S> {
-        render(): ReactElement<any>;
-
-        [propertyName: string]: any;
-    }
-
-    //
-    // Event System
-    // ----------------------------------------------------------------------
-
-    interface SyntheticEvent {
-        bubbles: boolean;
-        cancelable: boolean;
-        currentTarget: EventTarget;
-        defaultPrevented: boolean;
-        eventPhase: number;
-        isTrusted: boolean;
-        nativeEvent: Event;
-        preventDefault(): void;
-        stopPropagation(): void;
-        target: EventTarget;
-        timeStamp: Date;
-        type: string;
-    }
-
-    interface ClipboardEvent extends SyntheticEvent {
-        clipboardData: DataTransfer;
-    }
-
-    interface CompositionEvent extends SyntheticEvent {
-        data: string;
-    }
-
-    interface DragEvent extends SyntheticEvent {
-        dataTransfer: DataTransfer;
-    }
-
-    interface FocusEvent extends SyntheticEvent {
-        relatedTarget: EventTarget;
-    }
-
-    interface FormEvent extends SyntheticEvent {
-    }
-
-    interface KeyboardEvent extends SyntheticEvent {
-        altKey: boolean;
-        charCode: number;
-        ctrlKey: boolean;
-        getModifierState(key: string): boolean;
-        key: string;
-        keyCode: number;
-        locale: string;
-        location: number;
-        metaKey: boolean;
-        repeat: boolean;
-        shiftKey: boolean;
-        which: number;
-    }
-
-    interface MouseEvent extends SyntheticEvent {
-        altKey: boolean;
-        button: number;
-        buttons: number;
-        clientX: number;
-        clientY: number;
-        ctrlKey: boolean;
-        getModifierState(key: string): boolean;
-        metaKey: boolean;
-        pageX: number;
-        pageY: number;
-        relatedTarget: EventTarget;
-        screenX: number;
-        screenY: number;
-        shiftKey: boolean;
-    }
-
-    interface TouchEvent extends SyntheticEvent {
-        altKey: boolean;
-        changedTouches: TouchList;
-        ctrlKey: boolean;
-        getModifierState(key: string): boolean;
-        metaKey: boolean;
-        shiftKey: boolean;
-        targetTouches: TouchList;
-        touches: TouchList;
-    }
-
-    interface UIEvent extends SyntheticEvent {
-        detail: number;
-        view: AbstractView;
-    }
-
-    interface WheelEvent extends SyntheticEvent {
-        deltaMode: number;
-        deltaX: number;
-        deltaY: number;
-        deltaZ: number;
-    }
-
-    //
-    // Event Handler Types
-    // ----------------------------------------------------------------------
-
-    interface EventHandler<E extends SyntheticEvent> {
-        (event: E): void;
-    }
-
-    type ReactEventHandler = EventHandler<SyntheticEvent>;
-
-    type ClipboardEventHandler = EventHandler<ClipboardEvent>;
-    type CompositionEventHandler = EventHandler<CompositionEvent>;
-    type DragEventHandler = EventHandler<DragEvent>;
-    type FocusEventHandler = EventHandler<FocusEvent>;
-    type FormEventHandler = EventHandler<FormEvent>;
-    type KeyboardEventHandler = EventHandler<KeyboardEvent>;
-    type MouseEventHandler = EventHandler<MouseEvent>;
-    type TouchEventHandler = EventHandler<TouchEvent>;
-    type UIEventHandler = EventHandler<UIEvent>;
-    type WheelEventHandler = EventHandler<WheelEvent>;
-
-    //
-    // Props / DOM Attributes
-    // ----------------------------------------------------------------------
-
-    /**
-     * @deprecated. This was used to allow clients to pass `ref` and `key`
-     * to `createElement`, which is no longer necessary due to intersection
-     * types. If you need to declare a props object before passing it to
-     * `createElement` or a factory, use `ClassAttributes<T>`:
-     *
-     * ```ts
-     * var b: Button;
-     * var props: ButtonProps & ClassAttributes<Button> = {
-     *     ref: b => button = b, // ok!
-     *     label: "I'm a Button"
-     * };
-     * ```
-     */
-    interface Props<T> {
-        children?: ReactNode;
-        key?: Key;
-        ref?: Ref<T>;
-    }
-
-    interface HTMLProps<T> extends HTMLAttributes, ClassAttributes<T> {
-    }
-
-    interface SVGProps extends SVGAttributes, ClassAttributes<SVGElement> {
-    }
-
-    interface DOMAttributes {
-        children?: ReactNode;
-        dangerouslySetInnerHTML?: {
-            __html: string;
-        };
-
-        // Clipboard Events
-        onCopy?: ClipboardEventHandler;
-        onCut?: ClipboardEventHandler;
-        onPaste?: ClipboardEventHandler;
-
-        // Composition Events
-        onCompositionEnd?: CompositionEventHandler;
-        onCompositionStart?: CompositionEventHandler;
-        onCompositionUpdate?: CompositionEventHandler;
-
-        // Focus Events
-        onFocus?: FocusEventHandler;
-        onBlur?: FocusEventHandler;
-
-        // Form Events
-        onChange?: FormEventHandler;
-        onInput?: FormEventHandler;
-        onSubmit?: FormEventHandler;
-
-        // Image Events
-        onLoad?: ReactEventHandler;
-        onError?: ReactEventHandler; // also a Media Event
-
-        // Keyboard Events
-        onKeyDown?: KeyboardEventHandler;
-        onKeyPress?: KeyboardEventHandler;
-        onKeyUp?: KeyboardEventHandler;
-
-        // Media Events
-        onAbort?: ReactEventHandler;
-        onCanPlay?: ReactEventHandler;
-        onCanPlayThrough?: ReactEventHandler;
-        onDurationChange?: ReactEventHandler;
-        onEmptied?: ReactEventHandler;
-        onEncrypted?: ReactEventHandler;
-        onEnded?: ReactEventHandler;
-        onLoadedData?: ReactEventHandler;
-        onLoadedMetadata?: ReactEventHandler;
-        onLoadStart?: ReactEventHandler;
-        onPause?: ReactEventHandler;
-        onPlay?: ReactEventHandler;
-        onPlaying?: ReactEventHandler;
-        onProgress?: ReactEventHandler;
-        onRateChange?: ReactEventHandler;
-        onSeeked?: ReactEventHandler;
-        onSeeking?: ReactEventHandler;
-        onStalled?: ReactEventHandler;
-        onSuspend?: ReactEventHandler;
-        onTimeUpdate?: ReactEventHandler;
-        onVolumeChange?: ReactEventHandler;
-        onWaiting?: ReactEventHandler;
-
-        // MouseEvents
-        onClick?: MouseEventHandler;
-        onContextMenu?: MouseEventHandler;
-        onDoubleClick?: MouseEventHandler;
-        onDrag?: DragEventHandler;
-        onDragEnd?: DragEventHandler;
-        onDragEnter?: DragEventHandler;
-        onDragExit?: DragEventHandler;
-        onDragLeave?: DragEventHandler;
-        onDragOver?: DragEventHandler;
-        onDragStart?: DragEventHandler;
-        onDrop?: DragEventHandler;
-        onMouseDown?: MouseEventHandler;
-        onMouseEnter?: MouseEventHandler;
-        onMouseLeave?: MouseEventHandler;
-        onMouseMove?: MouseEventHandler;
-        onMouseOut?: MouseEventHandler;
-        onMouseOver?: MouseEventHandler;
-        onMouseUp?: MouseEventHandler;
-
-        // Selection Events
-        onSelect?: ReactEventHandler;
-
-        // Touch Events
-        onTouchCancel?: TouchEventHandler;
-        onTouchEnd?: TouchEventHandler;
-        onTouchMove?: TouchEventHandler;
-        onTouchStart?: TouchEventHandler;
-
-        // UI Events
-        onScroll?: UIEventHandler;
-
-        // Wheel Events
-        onWheel?: WheelEventHandler;
-    }
-
-    // This interface is not complete. Only properties accepting
-    // unitless numbers are listed here (see CSSProperty.js in React)
-    interface CSSProperties {
-
-        /**
-         * Aligns a flex container's lines within the flex container when there is extra space in the cross-axis, similar to how justify-content aligns individual items within the main-axis.
-         */
-        alignContent?: any;
-
-        /**
-         * Sets the default alignment in the cross axis for all of the flex container's items, including anonymous flex items, similarly to how justify-content aligns items along the main axis.
-         */
-        alignItems?: any;
-
-        /**
-         * Allows the default alignment to be overridden for individual flex items.
-         */
-        alignSelf?: any;
-
-        /**
-         * This property allows precise alignment of elements, such as graphics, that do not have a baseline-table or lack the desired baseline in their baseline-table. With the alignment-adjust property, the position of the baseline identified by the alignment-baseline can be explicitly determined. It also determines precisely the alignment point for each glyph within a textual element.
-         */
-        alignmentAdjust?: any;
-
-        alignmentBaseline?: any;
-
-        /**
-         * Defines a length of time to elapse before an animation starts, allowing an animation to begin execution some time after it is applied.
-         */
-        animationDelay?: any;
-
-        /**
-         * Defines whether an animation should run in reverse on some or all cycles.
-         */
-        animationDirection?: any;
-
-        /**
-         * Specifies how many times an animation cycle should play.
-         */
-        animationIterationCount?: any;
-
-        /**
-         * Defines the list of animations that apply to the element.
-         */
-        animationName?: any;
-
-        /**
-         * Defines whether an animation is running or paused.
-         */
-        animationPlayState?: any;
-
-        /**
-         * Allows changing the style of any element to platform-based interface elements or vice versa.
-         */
-        appearance?: any;
-
-        /**
-         * Determines whether or not the “back” side of a transformed element is visible when facing the viewer.
-         */
-        backfaceVisibility?: any;
-
-        /**
-         * Shorthand property to set the values for one or more of:
-         * background-clip, background-color, background-image,
-         * background-origin, background-position, background-repeat,
-         * background-size, and background-attachment.
-         */
-        background?: any;
-
-        /**
-         * If a background-image is specified, this property determines
-         * whether that image's position is fixed within the viewport,
-         * or scrolls along with its containing block.
-         */
-        backgroundAttachment?: "scroll" | "fixed" | "local";
-
-        /**
-         * This property describes how the element's background images should blend with each other and the element's background color.
-         * The value is a list of blend modes that corresponds to each background image. Each element in the list will apply to the corresponding element of background-image. If a property doesn’t have enough comma-separated values to match the number of layers, the UA must calculate its used value by repeating the list of values until there are enough.
-         */
-        backgroundBlendMode?: any;
-
-        /**
-         * Sets the background color of an element.
-         */
-        backgroundColor?: any;
-
-        backgroundComposite?: any;
-
-        /**
-         * Applies one or more background images to an element. These can be any valid CSS image, including url() paths to image files or CSS gradients.
-         */
-        backgroundImage?: any;
-
-        /**
-         * Specifies what the background-position property is relative to.
-         */
-        backgroundOrigin?: any;
-
-        /**
-         * Sets the position of a background image.
-         */
-        backgroundPosition?: any;
-
-        /**
-         * Background-repeat defines if and how background images will be repeated after they have been sized and positioned
-         */
-        backgroundRepeat?: any;
-
-        /**
-         * Obsolete - spec retired, not implemented.
-         */
-        baselineShift?: any;
-
-        /**
-         * Non standard. Sets or retrieves the location of the Dynamic HTML (DHTML) behavior.
-         */
-        behavior?: any;
-
-        /**
-         * Shorthand property that defines the different properties of all four sides of an element's border in a single declaration. It can be used to set border-width, border-style and border-color, or a subset of these.
-         */
-        border?: any;
-
-        /**
-         * Shorthand that sets the values of border-bottom-color,
-         * border-bottom-style, and border-bottom-width.
-         */
-        borderBottom?: any;
-
-        /**
-         * Sets the color of the bottom border of an element.
-         */
-        borderBottomColor?: any;
-
-        /**
-         * Defines the shape of the border of the bottom-left corner.
-         */
-        borderBottomLeftRadius?: any;
-
-        /**
-         * Defines the shape of the border of the bottom-right corner.
-         */
-        borderBottomRightRadius?: any;
-
-        /**
-         * Sets the line style of the bottom border of a box.
-         */
-        borderBottomStyle?: any;
-
-        /**
-         * Sets the width of an element's bottom border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
-         */
-        borderBottomWidth?: any;
-
-        /**
-         * Border-collapse can be used for collapsing the borders between table cells
-         */
-        borderCollapse?: any;
-
-        /**
-         * The CSS border-color property sets the color of an element's four borders. This property can have from one to four values, made up of the elementary properties:     •       border-top-color
-         *      •       border-right-color
-         *      •       border-bottom-color
-         *      •       border-left-color The default color is the currentColor of each of these values.
-         * If you provide one value, it sets the color for the element. Two values set the horizontal and vertical values, respectively. Providing three values sets the top, vertical, and bottom values, in that order. Four values set all for sides: top, right, bottom, and left, in that order.
-         */
-        borderColor?: any;
-
-        /**
-         * Specifies different corner clipping effects, such as scoop (inner curves), bevel (straight cuts) or notch (cut-off rectangles). Works along with border-radius to specify the size of each corner effect.
-         */
-        borderCornerShape?: any;
-
-        /**
-         * The property border-image-source is used to set the image to be used instead of the border style. If this is set to none the border-style is used instead.
-         */
-        borderImageSource?: any;
-
-        /**
-         * The border-image-width CSS property defines the offset to use for dividing the border image in nine parts, the top-left corner, central top edge, top-right-corner, central right edge, bottom-right corner, central bottom edge, bottom-left corner, and central right edge. They represent inward distance from the top, right, bottom, and left edges.
-         */
-        borderImageWidth?: any;
-
-        /**
-         * Shorthand property that defines the border-width, border-style and border-color of an element's left border in a single declaration. Note that you can use the corresponding longhand properties to set specific individual properties of the left border — border-left-width, border-left-style and border-left-color.
-         */
-        borderLeft?: any;
-
-        /**
-         * The CSS border-left-color property sets the color of an element's left border. This page explains the border-left-color value, but often you will find it more convenient to fix the border's left color as part of a shorthand set, either border-left or border-color.
-         * Colors can be defined several ways. For more information, see Usage.
-         */
-        borderLeftColor?: any;
-
-        /**
-         * Sets the style of an element's left border. To set all four borders, use the shorthand property, border-style. Otherwise, you can set the borders individually with border-top-style, border-right-style, border-bottom-style, border-left-style.
-         */
-        borderLeftStyle?: any;
-
-        /**
-         * Sets the width of an element's left border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
-         */
-        borderLeftWidth?: any;
-
-        /**
-         * Shorthand property that defines the border-width, border-style and border-color of an element's right border in a single declaration. Note that you can use the corresponding longhand properties to set specific individual properties of the right border — border-right-width, border-right-style and border-right-color.
-         */
-        borderRight?: any;
-
-        /**
-         * Sets the color of an element's right border. This page explains the border-right-color value, but often you will find it more convenient to fix the border's right color as part of a shorthand set, either border-right or border-color.
-         * Colors can be defined several ways. For more information, see Usage.
-         */
-        borderRightColor?: any;
-
-        /**
-         * Sets the style of an element's right border. To set all four borders, use the shorthand property, border-style. Otherwise, you can set the borders individually with border-top-style, border-right-style, border-bottom-style, border-left-style.
-         */
-        borderRightStyle?: any;
-
-        /**
-         * Sets the width of an element's right border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
-         */
-        borderRightWidth?: any;
-
-        /**
-         * Specifies the distance between the borders of adjacent cells.
-         */
-        borderSpacing?: any;
-
-        /**
-         * Sets the style of an element's four borders. This property can have from one to four values. With only one value, the value will be applied to all four borders; otherwise, this works as a shorthand property for each of border-top-style, border-right-style, border-bottom-style, border-left-style, where each border style may be assigned a separate value.
-         */
-        borderStyle?: any;
-
-        /**
-         * Shorthand property that defines the border-width, border-style and border-color of an element's top border in a single declaration. Note that you can use the corresponding longhand properties to set specific individual properties of the top border — border-top-width, border-top-style and border-top-color.
-         */
-        borderTop?: any;
-
-        /**
-         * Sets the color of an element's top border. This page explains the border-top-color value, but often you will find it more convenient to fix the border's top color as part of a shorthand set, either border-top or border-color.
-         * Colors can be defined several ways. For more information, see Usage.
-         */
-        borderTopColor?: any;
-
-        /**
-         * Sets the rounding of the top-left corner of the element.
-         */
-        borderTopLeftRadius?: any;
-
-        /**
-         * Sets the rounding of the top-right corner of the element.
-         */
-        borderTopRightRadius?: any;
-
-        /**
-         * Sets the style of an element's top border. To set all four borders, use the shorthand property, border-style. Otherwise, you can set the borders individually with border-top-style, border-right-style, border-bottom-style, border-left-style.
-         */
-        borderTopStyle?: any;
-
-        /**
-         * Sets the width of an element's top border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
-         */
-        borderTopWidth?: any;
-
-        /**
-         * Sets the width of an element's four borders. This property can have from one to four values. This is a shorthand property for setting values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
-         */
-        borderWidth?: any;
-
-        /**
-         * This property specifies how far an absolutely positioned box's bottom margin edge is offset above the bottom edge of the box's containing block. For relatively positioned boxes, the offset is with respect to the bottom edges of the box itself (i.e., the box is given a position in the normal flow, then offset from that position according to these properties).
-         */
-        bottom?: any;
-
-        /**
-         * Obsolete.
-         */
-        boxAlign?: any;
-
-        /**
-         * Breaks a box into fragments creating new borders, padding and repeating backgrounds or lets it stay as a continuous box on a page break, column break, or, for inline elements, at a line break.
-         */
-        boxDecorationBreak?: any;
-
-        /**
-         * Deprecated
-         */
-        boxDirection?: any;
-
-        /**
-         * Do not use. This property has been replaced by the flex-wrap property.
-         * Gets or sets a value that specifies the direction to add successive rows or columns when the value of box-lines is set to multiple.
-         */
-        boxLineProgression?: any;
-
-        /**
-         * Do not use. This property has been replaced by the flex-wrap property.
-         * Gets or sets a value that specifies whether child elements wrap onto multiple lines or columns based on the space available in the object.
-         */
-        boxLines?: any;
-
-        /**
-         * Do not use. This property has been replaced by flex-order.
-         * Specifies the ordinal group that a child element of the object belongs to. This ordinal value identifies the display order (along the axis defined by the box-orient property) for the group.
-         */
-        boxOrdinalGroup?: any;
-
-        /**
-         * Deprecated.
-         */
-        boxFlex?: number;
-
-        /**
-         * Deprecated.
-         */
-        boxFlexGroup?: number;
-
-        /**
-         * The CSS break-after property allows you to force a break on multi-column layouts. More specifically, it allows you to force a break after an element. It allows you to determine if a break should occur, and what type of break it should be. The break-after CSS property describes how the page, column or region break behaves after the generated box. If there is no generated box, the property is ignored.
-         */
-        breakAfter?: any;
-
-        /**
-         * Control page/column/region breaks that fall above a block of content
-         */
-        breakBefore?: any;
-
-        /**
-         * Control page/column/region breaks that fall within a block of content
-         */
-        breakInside?: any;
-
-        /**
-         * The clear CSS property specifies if an element can be positioned next to or must be positioned below the floating elements that precede it in the markup.
-         */
-        clear?: any;
-
-        /**
-         * Deprecated; see clip-path.
-         * Lets you specify the dimensions of an absolutely positioned element that should be visible, and the element is clipped into this shape, and displayed.
-         */
-        clip?: any;
-
-        /**
-         * Clipping crops an graphic, so that only a portion of the graphic is rendered, or filled. This clip-rule property, when used with the clip-path property, defines which clip rule, or algorithm, to use when filling the different parts of a graphics.
-         */
-        clipRule?: any;
-
-        /**
-         * The color property sets the color of an element's foreground content (usually text), accepting any standard CSS color from keywords and hex values to RGB(a) and HSL(a).
-         */
-        color?: any;
-
-        /**
-         * Describes the number of columns of the element.
-         */
-        columnCount?: number;
-
-        /**
-         * Specifies how to fill columns (balanced or sequential).
-         */
-        columnFill?: any;
-
-        /**
-         * The column-gap property controls the width of the gap between columns in multi-column elements.
-         */
-        columnGap?: any;
-
-        /**
-         * Sets the width, style, and color of the rule between columns.
-         */
-        columnRule?: any;
-
-        /**
-         * Specifies the color of the rule between columns.
-         */
-        columnRuleColor?: any;
-
-        /**
-         * Specifies the width of the rule between columns.
-         */
-        columnRuleWidth?: any;
-
-        /**
-         * The column-span CSS property makes it possible for an element to span across all columns when its value is set to all. An element that spans more than one column is called a spanning element.
-         */
-        columnSpan?: any;
-
-        /**
-         * Specifies the width of columns in multi-column elements.
-         */
-        columnWidth?: any;
-
-        /**
-         * This property is a shorthand property for setting column-width and/or column-count.
-         */
-        columns?: any;
-
-        /**
-         * The counter-increment property accepts one or more names of counters (identifiers), each one optionally followed by an integer which specifies the value by which the counter should be incremented (e.g. if the value is 2, the counter increases by 2 each time it is invoked).
-         */
-        counterIncrement?: any;
-
-        /**
-         * The counter-reset property contains a list of one or more names of counters, each one optionally followed by an integer (otherwise, the integer defaults to 0.) Each time the given element is invoked, the counters specified by the property are set to the given integer.
-         */
-        counterReset?: any;
-
-        /**
-         * The cue property specifies sound files (known as an "auditory icon") to be played by speech media agents before and after presenting an element's content; if only one file is specified, it is played both before and after. The volume at which the file(s) should be played, relative to the volume of the main element, may also be specified. The icon files may also be set separately with the cue-before and cue-after properties.
-         */
-        cue?: any;
-
-        /**
-         * The cue-after property specifies a sound file (known as an "auditory icon") to be played by speech media agents after presenting an element's content; the volume at which the file should be played may also be specified. The shorthand property cue sets cue sounds for both before and after the element is presented.
-         */
-        cueAfter?: any;
-
-        /**
-         * Specifies the mouse cursor displayed when the mouse pointer is over an element.
-         */
-        cursor?: any;
-
-        /**
-         * The direction CSS property specifies the text direction/writing direction. The rtl is used for Hebrew or Arabic text, the ltr is for other languages.
-         */
-        direction?: any;
-
-        /**
-         * This property specifies the type of rendering box used for an element. It is a shorthand property for many other display properties.
-         */
-        display?: any;
-
-        /**
-         * The ‘fill’ property paints the interior of the given graphical element. The area to be painted consists of any areas inside the outline of the shape. To determine the inside of the shape, all subpaths are considered, and the interior is determined according to the rules associated with the current value of the ‘fill-rule’ property. The zero-width geometric outline of a shape is included in the area to be painted.
-         */
-        fill?: any;
-
-        /**
-         * SVG: Specifies the opacity of the color or the content the current object is filled with.
-         */
-        fillOpacity?: number;
-
-        /**
-         * The ‘fill-rule’ property indicates the algorithm which is to be used to determine what parts of the canvas are included inside the shape. For a simple, non-intersecting path, it is intuitively clear what region lies "inside"; however, for a more complex path, such as a path that intersects itself or where one subpath encloses another, the interpretation of "inside" is not so obvious.
-         * The ‘fill-rule’ property provides two options for how the inside of a shape is determined:
-         */
-        fillRule?: any;
-
-        /**
-         * Applies various image processing effects. This property is largely unsupported. See Compatibility section for more information.
-         */
-        filter?: any;
-
-        /**
-         * Shorthand for `flex-grow`, `flex-shrink`, and `flex-basis`.
-         */
-        flex?: number | string;
-
-        /**
-         * Obsolete, do not use. This property has been renamed to align-items.
-         * Specifies the alignment (perpendicular to the layout axis defined by the flex-direction property) of child elements of the object.
-         */
-        flexAlign?: any;
-
-        /**
-         * The flex-basis CSS property describes the initial main size of the flex item before any free space is distributed according to the flex factors described in the flex property (flex-grow and flex-shrink).
-         */
-        flexBasis?: any;
-
-        /**
-         * The flex-direction CSS property describes how flex items are placed in the flex container, by setting the direction of the flex container's main axis.
-         */
-        flexDirection?: any;
-
-        /**
-         * The flex-flow CSS property defines the flex container's main and cross axis. It is a shorthand property for the flex-direction and flex-wrap properties.
-         */
-        flexFlow?: any;
-
-        /**
-         * Specifies the flex grow factor of a flex item.
-         */
-        flexGrow?: number;
-
-        /**
-         * Do not use. This property has been renamed to align-self
-         * Specifies the alignment (perpendicular to the layout axis defined by flex-direction) of child elements of the object.
-         */
-        flexItemAlign?: any;
-
-        /**
-         * Do not use. This property has been renamed to align-content.
-         * Specifies how a flexbox's lines align within the flexbox when there is extra space along the axis that is perpendicular to the axis defined by the flex-direction property.
-         */
-        flexLinePack?: any;
-
-        /**
-         * Gets or sets a value that specifies the ordinal group that a flexbox element belongs to. This ordinal value identifies the display order for the group.
-         */
-        flexOrder?: any;
-
-        /**
-         * Specifies the flex shrink factor of a flex item.
-         */
-        flexShrink?: number;
-
-        /**
-         * Elements which have the style float are floated horizontally. These elements can move as far to the left or right of the containing element. All elements after the floating element will flow around it, but elements before the floating element are not impacted. If several floating elements are placed after each other, they will float next to each other as long as there is room.
-         */
-        float?: any;
-
-        /**
-         * Flows content from a named flow (specified by a corresponding flow-into) through selected elements to form a dynamic chain of layout regions.
-         */
-        flowFrom?: any;
-
-        /**
-         * The font property is shorthand that allows you to do one of two things: you can either set up six of the most mature font properties in one line, or you can set one of a choice of keywords to adopt a system font setting.
-         */
-        font?: any;
-
-        /**
-         * The font-family property allows one or more font family names and/or generic family names to be specified for usage on the selected element(s)' text. The browser then goes through the list; for each character in the selection it applies the first font family that has an available glyph for that character.
-         */
-        fontFamily?: any;
-
-        /**
-         * The font-kerning property allows contextual adjustment of inter-glyph spacing, i.e. the spaces between the characters in text. This property controls <bold>metric kerning</bold> - that utilizes adjustment data contained in the font. Optical Kerning is not supported as yet.
-         */
-        fontKerning?: any;
-
-        /**
-         * Specifies the size of the font. Used to compute em and ex units.
-         */
-        fontSize?: number | string;
-
-        /**
-         * The font-size-adjust property adjusts the font-size of the fallback fonts defined with font-family, so that the x-height is the same no matter what font is used. This preserves the readability of the text when fallback happens.
-         */
-        fontSizeAdjust?: any;
-
-        /**
-         * Allows you to expand or condense the widths for a normal, condensed, or expanded font face.
-         */
-        fontStretch?: any;
-
-        /**
-         * The font-style property allows normal, italic, or oblique faces to be selected. Italic forms are generally cursive in nature while oblique faces are typically sloped versions of the regular face. Oblique faces can be simulated by artificially sloping the glyphs of the regular face.
-         */
-        fontStyle?: any;
-
-        /**
-         * This value specifies whether the user agent is allowed to synthesize bold or oblique font faces when a font family lacks bold or italic faces.
-         */
-        fontSynthesis?: any;
-
-        /**
-         * The font-variant property enables you to select the small-caps font within a font family.
-         */
-        fontVariant?: any;
-
-        /**
-         * Fonts can provide alternate glyphs in addition to default glyph for a character. This property provides control over the selection of these alternate glyphs.
-         */
-        fontVariantAlternates?: any;
-
-        /**
-         * Specifies the weight or boldness of the font.
-         */
-        fontWeight?: "normal" | "bold" | "lighter" | "bolder" | number;
-
-        /**
-         * Lays out one or more grid items bound by 4 grid lines. Shorthand for setting grid-column-start, grid-column-end, grid-row-start, and grid-row-end in a single declaration.
-         */
-        gridArea?: any;
-
-        /**
-         * Controls a grid item's placement in a grid area, particularly grid position and a grid span. Shorthand for setting grid-column-start and grid-column-end in a single declaration.
-         */
-        gridColumn?: any;
-
-        /**
-         * Controls a grid item's placement in a grid area as well as grid position and a grid span. The grid-column-end property (with grid-row-start, grid-row-end, and grid-column-start) determines a grid item's placement by specifying the grid lines of a grid item's grid area.
-         */
-        gridColumnEnd?: any;
-
-        /**
-         * Determines a grid item's placement by specifying the starting grid lines of a grid item's grid area . A grid item's placement in a grid area consists of a grid position and a grid span. See also ( grid-row-start, grid-row-end, and grid-column-end)
-         */
-        gridColumnStart?: any;
-
-        /**
-         * Gets or sets a value that indicates which row an element within a Grid should appear in. Shorthand for setting grid-row-start and grid-row-end in a single declaration.
-         */
-        gridRow?: any;
-
-        /**
-         * Determines a grid item’s placement by specifying the block-end. A grid item's placement in a grid area consists of a grid position and a grid span. The grid-row-end property (with grid-row-start, grid-column-start, and grid-column-end) determines a grid item's placement by specifying the grid lines of a grid item's grid area.
-         */
-        gridRowEnd?: any;
-
-        /**
-         * Specifies a row position based upon an integer location, string value, or desired row size.
-         * css/properties/grid-row is used as short-hand for grid-row-position and grid-row-position
-         */
-        gridRowPosition?: any;
-
-        gridRowSpan?: any;
-
-        /**
-         * Specifies named grid areas which are not associated with any particular grid item, but can be referenced from the grid-placement properties. The syntax of the grid-template-areas property also provides a visualization of the structure of the grid, making the overall layout of the grid container easier to understand.
-         */
-        gridTemplateAreas?: any;
-
-        /**
-         * Specifies (with grid-template-rows) the line names and track sizing functions of the grid. Each sizing function can be specified as a length, a percentage of the grid container’s size, a measurement of the contents occupying the column or row, or a fraction of the free space in the grid.
-         */
-        gridTemplateColumns?: any;
-
-        /**
-         * Specifies (with grid-template-columns) the line names and track sizing functions of the grid. Each sizing function can be specified as a length, a percentage of the grid container’s size, a measurement of the contents occupying the column or row, or a fraction of the free space in the grid.
-         */
-        gridTemplateRows?: any;
-
-        /**
-         * Sets the height of an element. The content area of the element height does not include the padding, border, and margin of the element.
-         */
-        height?: any;
-
-        /**
-         * Specifies the minimum number of characters in a hyphenated word
-         */
-        hyphenateLimitChars?: any;
-
-        /**
-         * Indicates the maximum number of successive hyphenated lines in an element. The ‘no-limit’ value means that there is no limit.
-         */
-        hyphenateLimitLines?: any;
-
-        /**
-         * Specifies the maximum amount of trailing whitespace (before justification) that may be left in a line before hyphenation is triggered to pull part of a word from the next line back up into the current one.
-         */
-        hyphenateLimitZone?: any;
-
-        /**
-         * Specifies whether or not words in a sentence can be split by the use of a manual or automatic hyphenation mechanism.
-         */
-        hyphens?: any;
-
-        imeMode?: any;
-
-        layoutGrid?: any;
-
-        layoutGridChar?: any;
-
-        layoutGridLine?: any;
-
-        layoutGridMode?: any;
-
-        layoutGridType?: any;
-
-        /**
-         * Sets the left edge of an element
-         */
-        left?: any;
-
-        /**
-         * The letter-spacing CSS property specifies the spacing behavior between text characters.
-         */
-        letterSpacing?: any;
-
-        /**
-         * Deprecated. Gets or sets line-breaking rules for text in selected languages such as Japanese, Chinese, and Korean.
-         */
-        lineBreak?: any;
-
-        lineClamp?: number;
-
-        /**
-         * Specifies the height of an inline block level element. 
-         */
-        lineHeight?: number | string;
-
-        /**
-         * Shorthand property that sets the list-style-type, list-style-position and list-style-image properties in one declaration.
-         */
-        listStyle?: any;
-
-        /**
-         * This property sets the image that will be used as the list item marker. When the image is available, it will replace the marker set with the 'list-style-type' marker. That also means that if the image is not available, it will show the style specified by list-style-property
-         */
-        listStyleImage?: any;
-
-        /**
-         * Specifies if the list-item markers should appear inside or outside the content flow.
-         */
-        listStylePosition?: any;
-
-        /**
-         * Specifies the type of list-item marker in a list.
-         */
-        listStyleType?: any;
-
-        /**
-         * The margin property is shorthand to allow you to set all four margins of an element at once. Its equivalent longhand properties are margin-top, margin-right, margin-bottom and margin-left. Negative values are also allowed.
-         */
-        margin?: any;
-
-        /**
-         * margin-bottom sets the bottom margin of an element.
-         */
-        marginBottom?: any;
-
-        /**
-         * margin-left sets the left margin of an element.
-         */
-        marginLeft?: any;
-
-        /**
-         * margin-right sets the right margin of an element.
-         */
-        marginRight?: any;
-
-        /**
-         * margin-top sets the top margin of an element.
-         */
-        marginTop?: any;
-
-        /**
-         * The marquee-direction determines the initial direction in which the marquee content moves.
-         */
-        marqueeDirection?: any;
-
-        /**
-         * The 'marquee-style' property determines a marquee's scrolling behavior.
-         */
-        marqueeStyle?: any;
-
-        /**
-         * This property is shorthand for setting mask-image, mask-mode, mask-repeat, mask-position, mask-clip, mask-origin, mask-composite and mask-size. Omitted values are set to their original properties' initial values.
-         */
-        mask?: any;
-
-        /**
-         * This property is shorthand for setting mask-border-source, mask-border-slice, mask-border-width, mask-border-outset, and mask-border-repeat. Omitted values are set to their original properties' initial values.
-         */
-        maskBorder?: any;
-
-        /**
-         * This property specifies how the images for the sides and the middle part of the mask image are scaled and tiled. The first keyword applies to the horizontal sides, the second one applies to the vertical ones. If the second keyword is absent, it is assumed to be the same as the first, similar to the CSS border-image-repeat property.
-         */
-        maskBorderRepeat?: any;
-
-        /**
-         * This property specifies inward offsets from the top, right, bottom, and left edges of the mask image, dividing it into nine regions: four corners, four edges, and a middle. The middle image part is discarded and treated as fully transparent black unless the fill keyword is present. The four values set the top, right, bottom and left offsets in that order, similar to the CSS border-image-slice property.
-         */
-        maskBorderSlice?: any;
-
-        /**
-         * Specifies an image to be used as a mask. An image that is empty, fails to download, is non-existent, or cannot be displayed is ignored and does not mask the element.
-         */
-        maskBorderSource?: any;
-
-        /**
-         * This property sets the width of the mask box image, similar to the CSS border-image-width property.
-         */
-        maskBorderWidth?: any;
-
-        /**
-         * Determines the mask painting area, which defines the area that is affected by the mask. The painted content of an element may be restricted to this area.
-         */
-        maskClip?: any;
-
-        /**
-         * For elements rendered as a single box, specifies the mask positioning area. For elements rendered as multiple boxes (e.g., inline boxes on several lines, boxes on several pages) specifies which boxes box-decoration-break operates on to determine the mask positioning area(s).
-         */
-        maskOrigin?: any;
-
-        /**
-         * This property must not be used. It is no longer included in any standard or standard track specification, nor is it implemented in any browser. It is only used when the text-align-last property is set to size. It controls allowed adjustments of font-size to fit line content.
-         */
-        maxFontSize?: any;
-
-        /**
-         * Sets the maximum height for an element. It prevents the height of the element to exceed the specified value. If min-height is specified and is greater than max-height, max-height is overridden.
-         */
-        maxHeight?: any;
-
-        /**
-         * Sets the maximum width for an element. It limits the width property to be larger than the value specified in max-width.
-         */
-        maxWidth?: any;
-
-        /**
-         * Sets the minimum height for an element. It prevents the height of the element to be smaller than the specified value. The value of min-height overrides both max-height and height.
-         */
-        minHeight?: any;
-
-        /**
-         * Sets the minimum width of an element. It limits the width property to be not smaller than the value specified in min-width.
-         */
-        minWidth?: any;
-
-        /**
-         * Specifies the transparency of an element.
-         */
-        opacity?: number;
-
-        /**
-         * Specifies the order used to lay out flex items in their flex container.
-         * Elements are laid out in the ascending order of the order value.
-         */
-        order?: number;
-
-        /**
-         * In paged media, this property defines the minimum number of lines in
-         * a block container that must be left at the bottom of the page.
-         */
-        orphans?: number;
-
-        /**
-         * The CSS outline property is a shorthand property for setting one or more of the individual outline properties outline-style, outline-width and outline-color in a single rule. In most cases the use of this shortcut is preferable and more convenient.
-         * Outlines differ from borders in the following ways:  •       Outlines do not take up space, they are drawn above the content.
-         *      •       Outlines may be non-rectangular. They are rectangular in Gecko/Firefox. Internet Explorer attempts to place the smallest contiguous outline around all elements or shapes that are indicated to have an outline. Opera draws a non-rectangular shape around a construct.
-         */
-        outline?: any;
-
-        /**
-         * The outline-color property sets the color of the outline of an element. An outline is a line that is drawn around elements, outside the border edge, to make the element stand out.
-         */
-        outlineColor?: any;
-
-        /**
-         * The outline-offset property offsets the outline and draw it beyond the border edge.
-         */
-        outlineOffset?: any;
-
-        /**
-         * The overflow property controls how extra content exceeding the bounding box of an element is rendered. It can be used in conjunction with an element that has a fixed width and height, to eliminate text-induced page distortion.
-         */
-        overflow?: any;
-
-        /**
-         * Specifies the preferred scrolling methods for elements that overflow.
-         */
-        overflowStyle?: any;
-
-        /**
-         * Controls how extra content exceeding the x-axis of the bounding box of an element is rendered.
-         */
-        overflowX?: any;
-
-        /**
-         * Controls how extra content exceeding the y-axis of the bounding box of an element is rendered.
-         */
-        overflowY?: any;
-
-        /**
-         * The padding optional CSS property sets the required padding space on one to four sides of an element. The padding area is the space between an element and its border. Negative values are not allowed but decimal values are permitted. The element size is treated as fixed, and the content of the element shifts toward the center as padding is increased.
-         * The padding property is a shorthand to avoid setting each side separately (padding-top, padding-right, padding-bottom, padding-left).
-         */
-        padding?: any;
-
-        /**
-         * The padding-bottom CSS property of an element sets the padding space required on the bottom of an element. The padding area is the space between the content of the element and its border. Contrary to margin-bottom values, negative values of padding-bottom are invalid.
-         */
-        paddingBottom?: any;
-
-        /**
-         * The padding-left CSS property of an element sets the padding space required on the left side of an element. The padding area is the space between the content of the element and its border. Contrary to margin-left values, negative values of padding-left are invalid.
-         */
-        paddingLeft?: any;
-
-        /**
-         * The padding-right CSS property of an element sets the padding space required on the right side of an element. The padding area is the space between the content of the element and its border. Contrary to margin-right values, negative values of padding-right are invalid.
-         */
-        paddingRight?: any;
-
-        /**
-         * The padding-top CSS property of an element sets the padding space required on the top of an element. The padding area is the space between the content of the element and its border. Contrary to margin-top values, negative values of padding-top are invalid.
-         */
-        paddingTop?: any;
-
-        /**
-         * The page-break-after property is supported in all major browsers. With CSS3, page-break-* properties are only aliases of the break-* properties. The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
-         */
-        pageBreakAfter?: any;
-
-        /**
-         * The page-break-before property sets the page-breaking behavior before an element. With CSS3, page-break-* properties are only aliases of the break-* properties. The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
-         */
-        pageBreakBefore?: any;
-
-        /**
-         * Sets the page-breaking behavior inside an element. With CSS3, page-break-* properties are only aliases of the break-* properties. The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
-         */
-        pageBreakInside?: any;
-
-        /**
-         * The pause property determines how long a speech media agent should pause before and after presenting an element. It is a shorthand for the pause-before and pause-after properties.
-         */
-        pause?: any;
-
-        /**
-         * The pause-after property determines how long a speech media agent should pause after presenting an element. It may be replaced by the shorthand property pause, which sets pause time before and after.
-         */
-        pauseAfter?: any;
-
-        /**
-         * The pause-before property determines how long a speech media agent should pause before presenting an element. It may be replaced by the shorthand property pause, which sets pause time before and after.
-         */
-        pauseBefore?: any;
-
-        /**
-         * The perspective property defines how far an element is placed from the view on the z-axis, from the screen to the viewer.
-         * Perspective defines how an object is viewed. In graphic arts, perspective is the representation on a flat surface of what the viewer's eye would see in a 3D space. (See Wikipedia for more information about graphical perspective and for related illustrations.)
-         * The illusion of perspective on a flat surface, such as a computer screen, is created by projecting points on the flat surface as they would appear if the flat surface were a window through which the viewer was looking at the object. In discussion of virtual environments, this flat surface is called a projection plane.
-         */
-        perspective?: any;
-
-        /**
-         * The perspective-origin property establishes the origin for the perspective property. It effectively sets the X and Y position at which the viewer appears to be looking at the children of the element.
-         * When used with perspective, perspective-origin changes the appearance of an object, as if a viewer were looking at it from a different origin. An object appears differently if a viewer is looking directly at it versus looking at it from below, above, or from the side. Thus, the perspective-origin is like a vanishing point.
-         * The default value of perspective-origin is 50% 50%. This displays an object as if the viewer's eye were positioned directly at the center of the screen, both top-to-bottom and left-to-right. A value of 0% 0% changes the object as if the viewer was looking toward the top left angle. A value of 100% 100% changes the appearance as if viewed toward the bottom right angle.
-         */
-        perspectiveOrigin?: any;
-
-        /**
-         * The pointer-events property allows you to control whether an element can be the target for the pointing device (e.g, mouse, pen) events.
-         */
-        pointerEvents?: any;
-
-        /**
-         * The position property controls the type of positioning used by an element within its parent elements. The effect of the position property depends on a lot of factors, for example the position property of parent elements.
-         */
-        position?: any;
-
-        /**
-         * Obsolete: unsupported.
-         * This property determines whether or not a full-width punctuation mark character should be trimmed if it appears at the beginning of a line, so that its "ink" lines up with the first glyph in the line above and below.
-         */
-        punctuationTrim?: any;
-
-        /**
-         * Sets the type of quotation marks for embedded quotations.
-         */
-        quotes?: any;
-
-        /**
-         * Controls whether the last region in a chain displays additional 'overset' content according its default overflow property, or if it displays a fragment of content as if it were flowing into a subsequent region.
-         */
-        regionFragment?: any;
-
-        /**
-         * The rest-after property determines how long a speech media agent should pause after presenting an element's main content, before presenting that element's exit cue sound. It may be replaced by the shorthand property rest, which sets rest time before and after.
-         */
-        restAfter?: any;
-
-        /**
-         * The rest-before property determines how long a speech media agent should pause after presenting an intro cue sound for an element, before presenting that element's main content. It may be replaced by the shorthand property rest, which sets rest time before and after.
-         */
-        restBefore?: any;
-
-        /**
-         * Specifies the position an element in relation to the right side of the containing element.
-         */
-        right?: any;
-
-        rubyAlign?: any;
-
-        rubyPosition?: any;
-
-        /**
-         * Defines the alpha channel threshold used to extract a shape from an image. Can be thought of as a "minimum opacity" threshold; that is, a value of 0.5 means that the shape will enclose all the pixels that are more than 50% opaque.
-         */
-        shapeImageThreshold?: any;
-
-        /**
-         * A future level of CSS Shapes will define a shape-inside property, which will define a shape to wrap content within the element. See Editor's Draft <http://dev.w3.org/csswg/css-shapes/> and CSSWG wiki page on next-level plans <http://wiki.csswg.org/spec/css-shapes>
-         */
-        shapeInside?: any;
-
-        /**
-         * Adds a margin to a shape-outside. In effect, defines a new shape that is the smallest contour around all the points that are the shape-margin distance outward perpendicular to each point on the underlying shape. For points where a perpendicular direction is not defined (e.g., a triangle corner), takes all points on a circle centered at the point and with a radius of the shape-margin distance. This property accepts only non-negative values.
-         */
-        shapeMargin?: any;
-
-        /**
-         * Declares a shape around which text should be wrapped, with possible modifications from the shape-margin property. The shape defined by shape-outside and shape-margin changes the geometry of a float element's float area.
-         */
-        shapeOutside?: any;
-
-        /**
-         * The speak property determines whether or not a speech synthesizer will read aloud the contents of an element.
-         */
-        speak?: any;
-
-        /**
-         * The speak-as property determines how the speech synthesizer interprets the content: words as whole words or as a sequence of letters, numbers as a numerical value or a sequence of digits, punctuation as pauses in speech or named punctuation characters.
-         */
-        speakAs?: any;
-
-        /**
-         * SVG: Specifies the opacity of the outline on the current object.
-         */
-        strokeOpacity?: number;
-
-        /**
-         * SVG: Specifies the width of the outline on the current object.
-         */
-        strokeWidth?: number;
-
-        /**
-         * The tab-size CSS property is used to customise the width of a tab (U+0009) character.
-         */
-        tabSize?: any;
-
-        /**
-         * The 'table-layout' property controls the algorithm used to lay out the table cells, rows, and columns.
-         */
-        tableLayout?: any;
-
-        /**
-         * The text-align CSS property describes how inline content like text is aligned in its parent block element. text-align does not control the alignment of block elements itself, only their inline content.
-         */
-        textAlign?: any;
-
-        /**
-         * The text-align-last CSS property describes how the last line of a block element or a line before line break is aligned in its parent block element.
-         */
-        textAlignLast?: any;
-
-        /**
-         * The text-decoration CSS property is used to set the text formatting to underline, overline, line-through or blink.
-         * underline and overline decorations are positioned under the text, line-through over it.
-         */
-        textDecoration?: any;
-
-        /**
-         * Sets the color of any text decoration, such as underlines, overlines, and strike throughs.
-         */
-        textDecorationColor?: any;
-
-        /**
-         * Sets what kind of line decorations are added to an element, such as underlines, overlines, etc.
-         */
-        textDecorationLine?: any;
-
-        textDecorationLineThrough?: any;
-
-        textDecorationNone?: any;
-
-        textDecorationOverline?: any;
-
-        /**
-         * Specifies what parts of an element’s content are skipped over when applying any text decoration.
-         */
-        textDecorationSkip?: any;
-
-        /**
-         * This property specifies the style of the text decoration line drawn on the specified element. The intended meaning for the values are the same as those of the border-style-properties.
-         */
-        textDecorationStyle?: any;
-
-        textDecorationUnderline?: any;
-
-        /**
-         * The text-emphasis property will apply special emphasis marks to the elements text. Slightly similar to the text-decoration property only that this property can have affect on the line-height. It also is noted that this is shorthand for text-emphasis-style and for text-emphasis-color.
-         */
-        textEmphasis?: any;
-
-        /**
-         * The text-emphasis-color property specifies the foreground color of the emphasis marks.
-         */
-        textEmphasisColor?: any;
-
-        /**
-         * The text-emphasis-style property applies special emphasis marks to an element's text.
-         */
-        textEmphasisStyle?: any;
-
-        /**
-         * This property helps determine an inline box's block-progression dimension, derived from the text-height and font-size properties for non-replaced elements, the height or the width for replaced elements, and the stacked block-progression dimension for inline-block elements. The block-progression dimension determines the position of the padding, border and margin for the element.
-         */
-        textHeight?: any;
-
-        /**
-         * Specifies the amount of space horizontally that should be left on the first line of the text of an element. This horizontal spacing is at the beginning of the first line and is in respect to the left edge of the containing block box.
-         */
-        textIndent?: any;
-
-        textJustifyTrim?: any;
-
-        textKashidaSpace?: any;
-
-        /**
-         * The text-line-through property is a shorthand property for text-line-through-style, text-line-through-color and text-line-through-mode. (Considered obsolete; use text-decoration instead.)
-         */
-        textLineThrough?: any;
-
-        /**
-         * Specifies the line colors for the line-through text decoration.
-         * (Considered obsolete; use text-decoration-color instead.)
-         */
-        textLineThroughColor?: any;
-
-        /**
-         * Sets the mode for the line-through text decoration, determining whether the text decoration affects the space characters or not.
-         * (Considered obsolete; use text-decoration-skip instead.)
-         */
-        textLineThroughMode?: any;
-
-        /**
-         * Specifies the line style for line-through text decoration.
-         * (Considered obsolete; use text-decoration-style instead.)
-         */
-        textLineThroughStyle?: any;
-
-        /**
-         * Specifies the line width for the line-through text decoration.
-         */
-        textLineThroughWidth?: any;
-
-        /**
-         * The text-overflow shorthand CSS property determines how overflowed content that is not displayed is signaled to the users. It can be clipped, display an ellipsis ('…', U+2026 HORIZONTAL ELLIPSIS) or a Web author-defined string. It covers the two long-hand properties text-overflow-mode and text-overflow-ellipsis
-         */
-        textOverflow?: any;
-
-        /**
-         * The text-overline property is the shorthand for the text-overline-style, text-overline-width, text-overline-color, and text-overline-mode properties.
-         */
-        textOverline?: any;
-
-        /**
-         * Specifies the line color for the overline text decoration.
-         */
-        textOverlineColor?: any;
-
-        /**
-         * Sets the mode for the overline text decoration, determining whether the text decoration affects the space characters or not.
-         */
-        textOverlineMode?: any;
-
-        /**
-         * Specifies the line style for overline text decoration.
-         */
-        textOverlineStyle?: any;
-
-        /**
-         * Specifies the line width for the overline text decoration.
-         */
-        textOverlineWidth?: any;
-
-        /**
-         * The text-rendering CSS property provides information to the browser about how to optimize when rendering text. Options are: legibility, speed or geometric precision.
-         */
-        textRendering?: any;
-
-        /**
-         * Obsolete: unsupported.
-         */
-        textScript?: any;
-
-        /**
-         * The CSS text-shadow property applies one or more drop shadows to the text and <text-decorations> of an element. Each shadow is specified as an offset from the text, along with optional color and blur radius values.
-         */
-        textShadow?: any;
-
-        /**
-         * This property transforms text for styling purposes. (It has no effect on the underlying content.)
-         */
-        textTransform?: any;
-
-        /**
-         * Unsupported.
-         * This property will add a underline position value to the element that has an underline defined.
-         */
-        textUnderlinePosition?: any;
-
-        /**
-         * After review this should be replaced by text-decoration should it not?
-         * This property will set the underline style for text with a line value for underline, overline, and line-through.
-         */
-        textUnderlineStyle?: any;
-
-        /**
-         * This property specifies how far an absolutely positioned box's top margin edge is offset below the top edge of the box's containing block. For relatively positioned boxes, the offset is with respect to the top edges of the box itself (i.e., the box is given a position in the normal flow, then offset from that position according to these properties).
-         */
-        top?: any;
-
-        /**
-         * Determines whether touch input may trigger default behavior supplied by the user agent, such as panning or zooming.
-         */
-        touchAction?: any;
-
-        /**
-         * CSS transforms allow elements styled with CSS to be transformed in two-dimensional or three-dimensional space. Using this property, elements can be translated, rotated, scaled, and skewed. The value list may consist of 2D and/or 3D transform values.
-         */
-        transform?: any;
-
-        /**
-         * This property defines the origin of the transformation axes relative to the element to which the transformation is applied.
-         */
-        transformOrigin?: any;
-
-        /**
-         * This property allows you to define the relative position of the origin of the transformation grid along the z-axis.
-         */
-        transformOriginZ?: any;
-
-        /**
-         * This property specifies how nested elements are rendered in 3D space relative to their parent.
-         */
-        transformStyle?: any;
-
-        /**
-         * The transition CSS property is a shorthand property for transition-property, transition-duration, transition-timing-function, and transition-delay. It allows to define the transition between two states of an element.
-         */
-        transition?: any;
-
-        /**
-         * Defines when the transition will start. A value of ‘0s’ means the transition will execute as soon as the property is changed. Otherwise, the value specifies an offset from the moment the property is changed, and the transition will delay execution by that offset.
-         */
-        transitionDelay?: any;
-
-        /**
-         * The 'transition-duration' property specifies the length of time a transition animation takes to complete.
-         */
-        transitionDuration?: any;
-
-        /**
-         * The 'transition-property' property specifies the name of the CSS property to which the transition is applied.
-         */
-        transitionProperty?: any;
-
-        /**
-         * Sets the pace of action within a transition
-         */
-        transitionTimingFunction?: any;
-
-        /**
-         * The unicode-bidi CSS property specifies the level of embedding with respect to the bidirectional algorithm.
-         */
-        unicodeBidi?: any;
-
-        /**
-         * unicode-range allows you to set a specific range of characters to be downloaded from a font (embedded using @font-face) and made available for use on the current page.
-         */
-        unicodeRange?: any;
-
-        /**
-         * This is for all the high level UX stuff.
-         */
-        userFocus?: any;
-
-        /**
-         * For inputing user content
-         */
-        userInput?: any;
-
-        /**
-         * The vertical-align property controls how inline elements or text are vertically aligned compared to the baseline. If this property is used on table-cells it controls the vertical alignment of content of the table cell.
-         */
-        verticalAlign?: any;
-
-        /**
-         * The visibility property specifies whether the boxes generated by an element are rendered.
-         */
-        visibility?: any;
-
-        /**
-         * The voice-balance property sets the apparent position (in stereo sound) of the synthesized voice for spoken media.
-         */
-        voiceBalance?: any;
-
-        /**
-         * The voice-duration property allows the author to explicitly set the amount of time it should take a speech synthesizer to read an element's content, for example to allow the speech to be synchronized with other media. With a value of auto (the default) the length of time it takes to read the content is determined by the content itself and the voice-rate property.
-         */
-        voiceDuration?: any;
-
-        /**
-         * The voice-family property sets the speaker's voice used by a speech media agent to read an element. The speaker may be specified as a named character (to match a voice option in the speech reading software) or as a generic description of the age and gender of the voice. Similar to the font-family property for visual media, a comma-separated list of fallback options may be given in case the speech reader does not recognize the character name or cannot synthesize the requested combination of generic properties.
-         */
-        voiceFamily?: any;
-
-        /**
-         * The voice-pitch property sets pitch or tone (high or low) for the synthesized speech when reading an element; the pitch may be specified absolutely or relative to the normal pitch for the voice-family used to read the text.
-         */
-        voicePitch?: any;
-
-        /**
-         * The voice-range property determines how much variation in pitch or tone will be created by the speech synthesize when reading an element. Emphasized text, grammatical structures and punctuation may all be rendered as changes in pitch, this property determines how strong or obvious those changes are; large ranges are associated with enthusiastic or emotional speech, while small ranges are associated with flat or mechanical speech.
-         */
-        voiceRange?: any;
-
-        /**
-         * The voice-rate property sets the speed at which the voice synthesized by a speech media agent will read content.
-         */
-        voiceRate?: any;
-
-        /**
-         * The voice-stress property sets the level of vocal emphasis to be used for synthesized speech reading the element.
-         */
-        voiceStress?: any;
-
-        /**
-         * The voice-volume property sets the volume for spoken content in speech media. It replaces the deprecated volume property.
-         */
-        voiceVolume?: any;
-
-        /**
-         * The white-space property controls whether and how white space inside the element is collapsed, and whether lines may wrap at unforced "soft wrap" opportunities.
-         */
-        whiteSpace?: any;
-
-        /**
-         * Obsolete: unsupported.
-         */
-        whiteSpaceTreatment?: any;
-
-        /**
-         * In paged media, this property defines the mimimum number of lines
-         * that must be left at the top of the second page.
-         */
-        widows?: number;
-
-        /**
-         * Specifies the width of the content area of an element. The content area of the element width does not include the padding, border, and margin of the element.
-         */
-        width?: any;
-
-        /**
-         * The word-break property is often used when there is long generated content that is strung together without and spaces or hyphens to beak apart. A common case of this is when there is a long URL that does not have any hyphens. This case could potentially cause the breaking of the layout as it could extend past the parent element.
-         */
-        wordBreak?: any;
-
-        /**
-         * The word-spacing CSS property specifies the spacing behavior between "words".
-         */
-        wordSpacing?: any;
-
-        /**
-         * An alias of css/properties/overflow-wrap, word-wrap defines whether to break words when the content exceeds the boundaries of its container.
-         */
-        wordWrap?: any;
-
-        /**
-         * Specifies how exclusions affect inline content within block-level elements. Elements lay out their inline content in their content area but wrap around exclusion areas.
-         */
-        wrapFlow?: any;
-
-        /**
-         * Set the value that is used to offset the inner wrap shape from other shapes. Inline content that intersects a shape with this property will be pushed by this shape's margin.
-         */
-        wrapMargin?: any;
-
-        /**
-         * Obsolete and unsupported. Do not use.
-         * This CSS property controls the text when it reaches the end of the block in which it is enclosed.
-         */
-        wrapOption?: any;
-
-        /**
-         * writing-mode specifies if lines of text are laid out horizontally or vertically, and the direction which lines of text and blocks progress.
-         */
-        writingMode?: any;
-
-        /**
-         * The z-index property specifies the z-order of an element and its descendants.
-         * When elements overlap, z-order determines which one covers the other.
-         */
-        zIndex?: "auto" | number;
-
-        /**
-         * Sets the initial zoom factor of a document defined by @viewport.
-         */
-        zoom?: "auto" | number;
-
-        [propertyName: string]: any;
-    }
-
-    interface HTMLAttributes extends DOMAttributes {
-        // React-specific Attributes
-        defaultChecked?: boolean;
-        defaultValue?: string | string[];
-
-        // Standard HTML Attributes
-        accept?: string;
-        acceptCharset?: string;
-        accessKey?: string;
-        action?: string;
-        allowFullScreen?: boolean;
-        allowTransparency?: boolean;
-        alt?: string;
-        async?: boolean;
-        autoComplete?: string;
-        autoFocus?: boolean;
-        autoPlay?: boolean;
-        capture?: boolean;
-        cellPadding?: number | string;
-        cellSpacing?: number | string;
-        charSet?: string;
-        challenge?: string;
-        checked?: boolean;
-        classID?: string;
-        className?: string;
-        cols?: number;
-        colSpan?: number;
-        content?: string;
-        contentEditable?: boolean;
-        contextMenu?: string;
-        controls?: boolean;
-        coords?: string;
-        crossOrigin?: string;
-        data?: string;
-        dateTime?: string;
-        default?: boolean;
-        defer?: boolean;
-        dir?: string;
-        disabled?: boolean;
-        download?: any;
-        draggable?: boolean;
-        encType?: string;
-        form?: string;
-        formAction?: string;
-        formEncType?: string;
-        formMethod?: string;
-        formNoValidate?: boolean;
-        formTarget?: string;
-        frameBorder?: number | string;
-        headers?: string;
-        height?: number | string;
-        hidden?: boolean;
-        high?: number;
-        href?: string;
-        hrefLang?: string;
-        htmlFor?: string;
-        httpEquiv?: string;
-        icon?: string;
-        id?: string;
-        inputMode?: string;
-        integrity?: string;
-        is?: string;
-        keyParams?: string;
-        keyType?: string;
-        kind?: string;
-        label?: string;
-        lang?: string;
-        list?: string;
-        loop?: boolean;
-        low?: number;
-        manifest?: string;
-        marginHeight?: number;
-        marginWidth?: number;
-        max?: number | string;
-        maxLength?: number;
-        media?: string;
-        mediaGroup?: string;
-        method?: string;
-        min?: number | string;
-        minLength?: number;
-        multiple?: boolean;
-        muted?: boolean;
-        name?: string;
-        nonce?: string;
-        noValidate?: boolean;
-        open?: boolean;
-        optimum?: number;
-        pattern?: string;
-        placeholder?: string;
-        poster?: string;
-        preload?: string;
-        radioGroup?: string;
-        readOnly?: boolean;
-        rel?: string;
-        required?: boolean;
-        reversed?: boolean;
-        role?: string;
-        rows?: number;
-        rowSpan?: number;
-        sandbox?: string;
-        scope?: string;
-        scoped?: boolean;
-        scrolling?: string;
-        seamless?: boolean;
-        selected?: boolean;
-        shape?: string;
-        size?: number;
-        sizes?: string;
-        span?: number;
-        spellCheck?: boolean;
-        src?: string;
-        srcDoc?: string;
-        srcLang?: string;
-        srcSet?: string;
-        start?: number;
-        step?: number | string;
-        style?: CSSProperties;
-        summary?: string;
-        tabIndex?: number;
-        target?: string;
-        title?: string;
-        type?: string;
-        useMap?: string;
-        value?: string | string[];
-        width?: number | string;
-        wmode?: string;
-        wrap?: string;
-
-        // RDFa Attributes
-        about?: string;
-        datatype?: string;
-        inlist?: any;
-        prefix?: string;
-        property?: string;
-        resource?: string;
-        typeof?: string;
-        vocab?: string;
-
-        // Non-standard Attributes
-        autoCapitalize?: string;
-        autoCorrect?: string;
-        autoSave?: string;
-        color?: string;
-        itemProp?: string;
-        itemScope?: boolean;
-        itemType?: string;
-        itemID?: string;
-        itemRef?: string;
-        results?: number;
-        security?: string;
-        unselectable?: boolean;
-        
-        // Allows aria- and data- Attributes
-        [key: string]: any;
-    }
-
-    interface SVGAttributes extends HTMLAttributes {
-        clipPath?: string;
-        cx?: number | string;
-        cy?: number | string;
-        d?: string;
-        dx?: number | string;
-        dy?: number | string;
-        fill?: string;
-        fillOpacity?: number | string;
-        fontFamily?: string;
-        fontSize?: number | string;
-        fx?: number | string;
-        fy?: number | string;
-        gradientTransform?: string;
-        gradientUnits?: string;
-        markerEnd?: string;
-        markerMid?: string;
-        markerStart?: string;
-        offset?: number | string;
-        opacity?: number | string;
-        patternContentUnits?: string;
-        patternUnits?: string;
-        points?: string;
-        preserveAspectRatio?: string;
-        r?: number | string;
-        rx?: number | string;
-        ry?: number | string;
-        spreadMethod?: string;
-        stopColor?: string;
-        stopOpacity?: number | string;
-        stroke?: string;
-        strokeDasharray?: string;
-        strokeLinecap?: string;
-        strokeMiterlimit?: string;
-        strokeOpacity?: number | string;
-        strokeWidth?: number | string;
-        textAnchor?: string;
-        transform?: string;
-        version?: string;
-        viewBox?: string;
-        x1?: number | string;
-        x2?: number | string;
-        x?: number | string;
-        xlinkActuate?: string;
-        xlinkArcrole?: string;
-        xlinkHref?: string;
-        xlinkRole?: string;
-        xlinkShow?: string;
-        xlinkTitle?: string;
-        xlinkType?: string;
-        xmlBase?: string;
-        xmlLang?: string;
-        xmlSpace?: string;
-        y1?: number | string;
-        y2?: number | string;
-        y?: number | string;
-    }
-
-    //
-    // React.DOM
-    // ----------------------------------------------------------------------
-
-    interface ReactDOM {
-        // HTML
-        a: HTMLFactory<HTMLAnchorElement>;
-        abbr: HTMLFactory<HTMLElement>;
-        address: HTMLFactory<HTMLElement>;
-        area: HTMLFactory<HTMLAreaElement>;
-        article: HTMLFactory<HTMLElement>;
-        aside: HTMLFactory<HTMLElement>;
-        audio: HTMLFactory<HTMLAudioElement>;
-        b: HTMLFactory<HTMLElement>;
-        base: HTMLFactory<HTMLBaseElement>;
-        bdi: HTMLFactory<HTMLElement>;
-        bdo: HTMLFactory<HTMLElement>;
-        big: HTMLFactory<HTMLElement>;
-        blockquote: HTMLFactory<HTMLElement>;
-        body: HTMLFactory<HTMLBodyElement>;
-        br: HTMLFactory<HTMLBRElement>;
-        button: HTMLFactory<HTMLButtonElement>;
-        canvas: HTMLFactory<HTMLCanvasElement>;
-        caption: HTMLFactory<HTMLElement>;
-        cite: HTMLFactory<HTMLElement>;
-        code: HTMLFactory<HTMLElement>;
-        col: HTMLFactory<HTMLTableColElement>;
-        colgroup: HTMLFactory<HTMLTableColElement>;
-        data: HTMLFactory<HTMLElement>;
-        datalist: HTMLFactory<HTMLDataListElement>;
-        dd: HTMLFactory<HTMLElement>;
-        del: HTMLFactory<HTMLElement>;
-        details: HTMLFactory<HTMLElement>;
-        dfn: HTMLFactory<HTMLElement>;
-        dialog: HTMLFactory<HTMLElement>;
-        div: HTMLFactory<HTMLDivElement>;
-        dl: HTMLFactory<HTMLDListElement>;
-        dt: HTMLFactory<HTMLElement>;
-        em: HTMLFactory<HTMLElement>;
-        embed: HTMLFactory<HTMLEmbedElement>;
-        fieldset: HTMLFactory<HTMLFieldSetElement>;
-        figcaption: HTMLFactory<HTMLElement>;
-        figure: HTMLFactory<HTMLElement>;
-        footer: HTMLFactory<HTMLElement>;
-        form: HTMLFactory<HTMLFormElement>;
-        h1: HTMLFactory<HTMLHeadingElement>;
-        h2: HTMLFactory<HTMLHeadingElement>;
-        h3: HTMLFactory<HTMLHeadingElement>;
-        h4: HTMLFactory<HTMLHeadingElement>;
-        h5: HTMLFactory<HTMLHeadingElement>;
-        h6: HTMLFactory<HTMLHeadingElement>;
-        head: HTMLFactory<HTMLHeadElement>;
-        header: HTMLFactory<HTMLElement>;
-        hgroup: HTMLFactory<HTMLElement>;
-        hr: HTMLFactory<HTMLHRElement>;
-        html: HTMLFactory<HTMLHtmlElement>;
-        i: HTMLFactory<HTMLElement>;
-        iframe: HTMLFactory<HTMLIFrameElement>;
-        img: HTMLFactory<HTMLImageElement>;
-        input: HTMLFactory<HTMLInputElement>;
-        ins: HTMLFactory<HTMLModElement>;
-        kbd: HTMLFactory<HTMLElement>;
-        keygen: HTMLFactory<HTMLElement>;
-        label: HTMLFactory<HTMLLabelElement>;
-        legend: HTMLFactory<HTMLLegendElement>;
-        li: HTMLFactory<HTMLLIElement>;
-        link: HTMLFactory<HTMLLinkElement>;
-        main: HTMLFactory<HTMLElement>;
-        map: HTMLFactory<HTMLMapElement>;
-        mark: HTMLFactory<HTMLElement>;
-        menu: HTMLFactory<HTMLElement>;
-        menuitem: HTMLFactory<HTMLElement>;
-        meta: HTMLFactory<HTMLMetaElement>;
-        meter: HTMLFactory<HTMLElement>;
-        nav: HTMLFactory<HTMLElement>;
-        noscript: HTMLFactory<HTMLElement>;
-        object: HTMLFactory<HTMLObjectElement>;
-        ol: HTMLFactory<HTMLOListElement>;
-        optgroup: HTMLFactory<HTMLOptGroupElement>;
-        option: HTMLFactory<HTMLOptionElement>;
-        output: HTMLFactory<HTMLElement>;
-        p: HTMLFactory<HTMLParagraphElement>;
-        param: HTMLFactory<HTMLParamElement>;
-        picture: HTMLFactory<HTMLElement>;
-        pre: HTMLFactory<HTMLPreElement>;
-        progress: HTMLFactory<HTMLProgressElement>;
-        q: HTMLFactory<HTMLQuoteElement>;
-        rp: HTMLFactory<HTMLElement>;
-        rt: HTMLFactory<HTMLElement>;
-        ruby: HTMLFactory<HTMLElement>;
-        s: HTMLFactory<HTMLElement>;
-        samp: HTMLFactory<HTMLElement>;
-        script: HTMLFactory<HTMLElement>;
-        section: HTMLFactory<HTMLElement>;
-        select: HTMLFactory<HTMLSelectElement>;
-        small: HTMLFactory<HTMLElement>;
-        source: HTMLFactory<HTMLSourceElement>;
-        span: HTMLFactory<HTMLSpanElement>;
-        strong: HTMLFactory<HTMLElement>;
-        style: HTMLFactory<HTMLStyleElement>;
-        sub: HTMLFactory<HTMLElement>;
-        summary: HTMLFactory<HTMLElement>;
-        sup: HTMLFactory<HTMLElement>;
-        table: HTMLFactory<HTMLTableElement>;
-        tbody: HTMLFactory<HTMLTableSectionElement>;
-        td: HTMLFactory<HTMLTableDataCellElement>;
-        textarea: HTMLFactory<HTMLTextAreaElement>;
-        tfoot: HTMLFactory<HTMLTableSectionElement>;
-        th: HTMLFactory<HTMLTableHeaderCellElement>;
-        thead: HTMLFactory<HTMLTableSectionElement>;
-        time: HTMLFactory<HTMLElement>;
-        title: HTMLFactory<HTMLTitleElement>;
-        tr: HTMLFactory<HTMLTableRowElement>;
-        track: HTMLFactory<HTMLTrackElement>;
-        u: HTMLFactory<HTMLElement>;
-        ul: HTMLFactory<HTMLUListElement>;
-        "var": HTMLFactory<HTMLElement>;
-        video: HTMLFactory<HTMLVideoElement>;
-        wbr: HTMLFactory<HTMLElement>;
-
-        // SVG
-        svg: SVGFactory;
-        circle: SVGFactory;
-        defs: SVGFactory;
-        ellipse: SVGFactory;
-        g: SVGFactory;
-        image: SVGFactory;
-        line: SVGFactory;
-        linearGradient: SVGFactory;
-        mask: SVGFactory;
-        path: SVGFactory;
-        pattern: SVGFactory;
-        polygon: SVGFactory;
-        polyline: SVGFactory;
-        radialGradient: SVGFactory;
-        rect: SVGFactory;
-        stop: SVGFactory;
-        text: SVGFactory;
-        tspan: SVGFactory;
-    }
-
-    //
-    // React.PropTypes
-    // ----------------------------------------------------------------------
-
-    interface Validator<T> {
-        (object: T, key: string, componentName: string): Error;
-    }
-
-    interface Requireable<T> extends Validator<T> {
-        isRequired: Validator<T>;
-    }
-
-    interface ValidationMap<T> {
-        [key: string]: Validator<T>;
-    }
-
-    interface ReactPropTypes {
-        any: Requireable<any>;
-        array: Requireable<any>;
-        bool: Requireable<any>;
-        func: Requireable<any>;
-        number: Requireable<any>;
-        object: Requireable<any>;
-        string: Requireable<any>;
-        node: Requireable<any>;
-        element: Requireable<any>;
-        instanceOf(expectedClass: {}): Requireable<any>;
-        oneOf(types: any[]): Requireable<any>;
-        oneOfType(types: Validator<any>[]): Requireable<any>;
-        arrayOf(type: Validator<any>): Requireable<any>;
-        objectOf(type: Validator<any>): Requireable<any>;
-        shape(type: ValidationMap<any>): Requireable<any>;
-    }
-
-    //
-    // React.Children
-    // ----------------------------------------------------------------------
-
-    interface ReactChildren {
-        map<T>(children: ReactNode, fn: (child: ReactChild, index: number) => T): T[];
-        forEach(children: ReactNode, fn: (child: ReactChild, index: number) => any): void;
-        count(children: ReactNode): number;
-        only(children: ReactNode): ReactElement<any>;
-        toArray(children: ReactNode): ReactChild[];
-    }
-
-    //
-    // Browser Interfaces
-    // https://github.com/nikeee/2048-typescript/blob/master/2048/js/touch.d.ts
-    // ----------------------------------------------------------------------
-
-    interface AbstractView {
-        styleMedia: StyleMedia;
-        document: Document;
-    }
-
-    interface Touch {
-        identifier: number;
-        target: EventTarget;
-        screenX: number;
-        screenY: number;
-        clientX: number;
-        clientY: number;
-        pageX: number;
-        pageY: number;
-    }
-
-    interface TouchList {
-        [index: number]: Touch;
-        length: number;
-        item(index: number): Touch;
-        identifiedTouch(identifier: number): Touch;
-    }
-}
-
-declare module "react" {
-    export = __React;
-}
-
-declare namespace JSX {
-    import React = __React;
-
-    interface Element extends React.ReactElement<any> { }
-    interface ElementClass extends React.Component<any, any> {
-        render(): JSX.Element;
-    }
-    interface ElementAttributesProperty { props: {}; }
-
-    interface IntrinsicAttributes extends React.Attributes { }
-    interface IntrinsicClassAttributes<T> extends React.ClassAttributes<T> { }
-
-    interface IntrinsicElements {
-        // HTML
-        a: React.HTMLProps<HTMLAnchorElement>;
-        abbr: React.HTMLProps<HTMLElement>;
-        address: React.HTMLProps<HTMLElement>;
-        area: React.HTMLProps<HTMLAreaElement>;
-        article: React.HTMLProps<HTMLElement>;
-        aside: React.HTMLProps<HTMLElement>;
-        audio: React.HTMLProps<HTMLAudioElement>;
-        b: React.HTMLProps<HTMLElement>;
-        base: React.HTMLProps<HTMLBaseElement>;
-        bdi: React.HTMLProps<HTMLElement>;
-        bdo: React.HTMLProps<HTMLElement>;
-        big: React.HTMLProps<HTMLElement>;
-        blockquote: React.HTMLProps<HTMLElement>;
-        body: React.HTMLProps<HTMLBodyElement>;
-        br: React.HTMLProps<HTMLBRElement>;
-        button: React.HTMLProps<HTMLButtonElement>;
-        canvas: React.HTMLProps<HTMLCanvasElement>;
-        caption: React.HTMLProps<HTMLElement>;
-        cite: React.HTMLProps<HTMLElement>;
-        code: React.HTMLProps<HTMLElement>;
-        col: React.HTMLProps<HTMLTableColElement>;
-        colgroup: React.HTMLProps<HTMLTableColElement>;
-        data: React.HTMLProps<HTMLElement>;
-        datalist: React.HTMLProps<HTMLDataListElement>;
-        dd: React.HTMLProps<HTMLElement>;
-        del: React.HTMLProps<HTMLElement>;
-        details: React.HTMLProps<HTMLElement>;
-        dfn: React.HTMLProps<HTMLElement>;
-        dialog: React.HTMLProps<HTMLElement>;
-        div: React.HTMLProps<HTMLDivElement>;
-        dl: React.HTMLProps<HTMLDListElement>;
-        dt: React.HTMLProps<HTMLElement>;
-        em: React.HTMLProps<HTMLElement>;
-        embed: React.HTMLProps<HTMLEmbedElement>;
-        fieldset: React.HTMLProps<HTMLFieldSetElement>;
-        figcaption: React.HTMLProps<HTMLElement>;
-        figure: React.HTMLProps<HTMLElement>;
-        footer: React.HTMLProps<HTMLElement>;
-        form: React.HTMLProps<HTMLFormElement>;
-        h1: React.HTMLProps<HTMLHeadingElement>;
-        h2: React.HTMLProps<HTMLHeadingElement>;
-        h3: React.HTMLProps<HTMLHeadingElement>;
-        h4: React.HTMLProps<HTMLHeadingElement>;
-        h5: React.HTMLProps<HTMLHeadingElement>;
-        h6: React.HTMLProps<HTMLHeadingElement>;
-        head: React.HTMLProps<HTMLHeadElement>;
-        header: React.HTMLProps<HTMLElement>;
-        hgroup: React.HTMLProps<HTMLElement>;
-        hr: React.HTMLProps<HTMLHRElement>;
-        html: React.HTMLProps<HTMLHtmlElement>;
-        i: React.HTMLProps<HTMLElement>;
-        iframe: React.HTMLProps<HTMLIFrameElement>;
-        img: React.HTMLProps<HTMLImageElement>;
-        input: React.HTMLProps<HTMLInputElement>;
-        ins: React.HTMLProps<HTMLModElement>;
-        kbd: React.HTMLProps<HTMLElement>;
-        keygen: React.HTMLProps<HTMLElement>;
-        label: React.HTMLProps<HTMLLabelElement>;
-        legend: React.HTMLProps<HTMLLegendElement>;
-        li: React.HTMLProps<HTMLLIElement>;
-        link: React.HTMLProps<HTMLLinkElement>;
-        main: React.HTMLProps<HTMLElement>;
-        map: React.HTMLProps<HTMLMapElement>;
-        mark: React.HTMLProps<HTMLElement>;
-        menu: React.HTMLProps<HTMLElement>;
-        menuitem: React.HTMLProps<HTMLElement>;
-        meta: React.HTMLProps<HTMLMetaElement>;
-        meter: React.HTMLProps<HTMLElement>;
-        nav: React.HTMLProps<HTMLElement>;
-        noscript: React.HTMLProps<HTMLElement>;
-        object: React.HTMLProps<HTMLObjectElement>;
-        ol: React.HTMLProps<HTMLOListElement>;
-        optgroup: React.HTMLProps<HTMLOptGroupElement>;
-        option: React.HTMLProps<HTMLOptionElement>;
-        output: React.HTMLProps<HTMLElement>;
-        p: React.HTMLProps<HTMLParagraphElement>;
-        param: React.HTMLProps<HTMLParamElement>;
-        picture: React.HTMLProps<HTMLElement>;
-        pre: React.HTMLProps<HTMLPreElement>;
-        progress: React.HTMLProps<HTMLProgressElement>;
-        q: React.HTMLProps<HTMLQuoteElement>;
-        rp: React.HTMLProps<HTMLElement>;
-        rt: React.HTMLProps<HTMLElement>;
-        ruby: React.HTMLProps<HTMLElement>;
-        s: React.HTMLProps<HTMLElement>;
-        samp: React.HTMLProps<HTMLElement>;
-        script: React.HTMLProps<HTMLElement>;
-        section: React.HTMLProps<HTMLElement>;
-        select: React.HTMLProps<HTMLSelectElement>;
-        small: React.HTMLProps<HTMLElement>;
-        source: React.HTMLProps<HTMLSourceElement>;
-        span: React.HTMLProps<HTMLSpanElement>;
-        strong: React.HTMLProps<HTMLElement>;
-        style: React.HTMLProps<HTMLStyleElement>;
-        sub: React.HTMLProps<HTMLElement>;
-        summary: React.HTMLProps<HTMLElement>;
-        sup: React.HTMLProps<HTMLElement>;
-        table: React.HTMLProps<HTMLTableElement>;
-        tbody: React.HTMLProps<HTMLTableSectionElement>;
-        td: React.HTMLProps<HTMLTableDataCellElement>;
-        textarea: React.HTMLProps<HTMLTextAreaElement>;
-        tfoot: React.HTMLProps<HTMLTableSectionElement>;
-        th: React.HTMLProps<HTMLTableHeaderCellElement>;
-        thead: React.HTMLProps<HTMLTableSectionElement>;
-        time: React.HTMLProps<HTMLElement>;
-        title: React.HTMLProps<HTMLTitleElement>;
-        tr: React.HTMLProps<HTMLTableRowElement>;
-        track: React.HTMLProps<HTMLTrackElement>;
-        u: React.HTMLProps<HTMLElement>;
-        ul: React.HTMLProps<HTMLUListElement>;
-        "var": React.HTMLProps<HTMLElement>;
-        video: React.HTMLProps<HTMLVideoElement>;
-        wbr: React.HTMLProps<HTMLElement>;
-
-        // SVG
-        svg: React.SVGProps;
-
-        circle: React.SVGProps;
-        clipPath: React.SVGProps;
-        defs: React.SVGProps;
-        ellipse: React.SVGProps;
-        g: React.SVGProps;
-        image: React.SVGProps;
-        line: React.SVGProps;
-        linearGradient: React.SVGProps;
-        mask: React.SVGProps;
-        path: React.SVGProps;
-        pattern: React.SVGProps;
-        polygon: React.SVGProps;
-        polyline: React.SVGProps;
-        radialGradient: React.SVGProps;
-        rect: React.SVGProps;
-        stop: React.SVGProps;
-        text: React.SVGProps;
-        tspan: React.SVGProps;
-    }
-}
diff --git a/react/tsconfig.json b/react/tsconfig.json
new file mode 100644
index 0000000000..a56b4af551
--- /dev/null
+++ b/react/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "react-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/read/index.d.ts b/read/index.d.ts
new file mode 100644
index 0000000000..2a8b26f825
--- /dev/null
+++ b/read/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for read
+// Project: https://github.com/isaacs/read
+// Definitions by: Tim JK <https://github.com/timjk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function Read(options: Read.Options, callback: (error: any, result: string, isDefault: boolean) => any): void;
+
+declare namespace Read {
+    interface Options {
+        prompt?: string;
+        silent?: boolean;
+        replace?: string;
+        timeout?: number;
+        default?: string;
+        edit?: boolean;
+        terminal?: boolean;
+        input?: any;
+        output?: any;
+    }
+}
+
+export = Read;
diff --git a/read/read-tests.ts b/read/read-tests.ts
index 54d2708135..03b8ea83bc 100644
--- a/read/read-tests.ts
+++ b/read/read-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="read.d.ts" />
 
 import read = require('read');
 
diff --git a/read/read.d.ts b/read/read.d.ts
deleted file mode 100644
index 851470d050..0000000000
--- a/read/read.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Type definitions for read
-// Project: https://github.com/isaacs/read
-// Definitions by: Tim JK <https://github.com/timjk>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'read' {
-	function Read(options: Read.Options, callback: (error: any, result: string, isDefault: boolean) => any): void;
-
-	namespace Read {
-		interface Options {
-			prompt?: string;
-			silent?: boolean;
-			replace?: string;
-			timeout?: number;
-			default?: string;
-			edit?: boolean;
-			terminal?: boolean;
-			input?: any;
-			output?: any;
-		}
-	}
-
-	export = Read;
-}
diff --git a/read/tsconfig.json b/read/tsconfig.json
new file mode 100644
index 0000000000..f21740ab52
--- /dev/null
+++ b/read/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "read-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/readdir-stream/index.d.ts b/readdir-stream/index.d.ts
new file mode 100644
index 0000000000..9e7ca63b2d
--- /dev/null
+++ b/readdir-stream/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for readdir-stream v0.1.0
+// Project: https://github.com/logicalparadox/readdir-stream
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+declare function readdir(dir: string): NodeJS.ReadableStream;
+export = readdir;
diff --git a/readdir-stream/readdir-stream-tests.ts b/readdir-stream/readdir-stream-tests.ts
index a731e86ba8..f0a2dba78b 100644
--- a/readdir-stream/readdir-stream-tests.ts
+++ b/readdir-stream/readdir-stream-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="./readdir-stream.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import readdir = require('readdir-stream');
 
diff --git a/readdir-stream/readdir-stream.d.ts b/readdir-stream/readdir-stream.d.ts
deleted file mode 100644
index 9c4f9aef62..0000000000
--- a/readdir-stream/readdir-stream.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Type definitions for readdir-stream v0.1.0
-// Project: https://github.com/logicalparadox/readdir-stream
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'readdir-stream' {
-	function readdir(dir: string): NodeJS.ReadableStream;
-	export = readdir;
-}
diff --git a/readdir-stream/tsconfig.json b/readdir-stream/tsconfig.json
new file mode 100644
index 0000000000..02570192df
--- /dev/null
+++ b/readdir-stream/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "readdir-stream-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rebass/index.d.ts b/rebass/index.d.ts
new file mode 100644
index 0000000000..93fbf7a0cc
--- /dev/null
+++ b/rebass/index.d.ts
@@ -0,0 +1,493 @@
+// Type definitions for Rebass 0.2.5
+// Project: https://github.com/jxnblk/rebass
+// Definitions by: rhysd <https://rhysd.github.io>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="react" />
+
+export interface BaseProps<C> extends React.Props<C> {
+    tagName?: string;
+    className?: string;
+    baseStyle?: Object;
+    style?: Object;
+    m?: number;
+    mt?: number;
+    mr?: number;
+    mb?: number;
+    ml?: number;
+    mx?: number;
+    my?: number;
+    p?: number;
+    pt?: number;
+    pr?: number;
+    pb?: number;
+    pl?: number;
+    px?: number;
+    py?: number;
+    color?: string;
+    backgroundColor?: string;
+    inverted?: boolean;
+    rounded?: boolean | "top" | "right" | "bottom" | "left";
+    circle?: boolean;
+    pill?: boolean;
+}
+
+export interface ArrowProps extends BaseProps<ArrowClass> {
+    direction?: "up" | "down";
+}
+type ArrowClass = React.StatelessComponent<ArrowProps>
+export declare const Arrow: ArrowClass;
+
+export interface AvatarProps extends BaseProps<AvatarClass> {
+    size?: number;
+    src?: string;
+}
+type AvatarClass = React.StatelessComponent<AvatarProps>
+export declare const Avatar: AvatarClass;
+
+export interface BadgeProps extends BaseProps<BadgeClass> {
+    theme?: "primary" | "secondary" | "default" | "info" | "success" | "warning" | "error";
+    rounded?: boolean | "top" | "right" | "bottom" | "left";
+    pill?: boolean;
+    circle?: boolean;
+}
+type BadgeClass = React.StatelessComponent<BadgeProps>
+export declare const Badge: BadgeClass;
+
+export interface BannerProps extends BaseProps<BannerClass> {
+    align?: "left" | "center" | "right";
+    backgroundImage: string;
+}
+type BannerClass = React.StatelessComponent<BannerProps>
+export declare const Banner: BannerClass;
+
+export interface BlockProps extends BaseProps<BlockClass> {
+    m?: number;
+    mt?: number;
+    mr?: number;
+    mb?: number;
+    ml?: number;
+    mx?: number;
+    my?: number;
+    p?: number;
+    pt?: number;
+    pr?: number;
+    pb?: number;
+    pl?: number;
+    px?: number;
+    py?: number;
+    color?: string;
+    backgroundColor?: string;
+    borderColor?: string;
+    border?: boolean;
+    borderTop?: boolean;
+    borderRight?: boolean;
+    borderBottom?: boolean;
+    borderLeft?: boolean;
+    rounded?: boolean | "top" | "right" | "bottom" | "left";
+}
+type BlockClass = React.StatelessComponent<BlockProps>
+export declare const Block: BlockClass;
+
+export interface BlockquoteProps extends BaseProps<BlockquoteClass> {
+    source: string;
+    href: string;
+}
+type BlockquoteClass = React.StatelessComponent<BlockquoteProps>
+export declare const Blockquote: BlockquoteClass;
+
+export interface BreadcrumbsProps extends BaseProps<BreadcrumbsClass> {
+    links: {
+        children: any;
+        href: string;
+    }[];
+}
+type BreadcrumbsClass = React.StatelessComponent<BreadcrumbsProps>
+export declare const Breadcrumbs: BreadcrumbsClass;
+
+export interface ButtonProps extends BaseProps<ButtonClass> {
+    href?: string;
+    color?: string;
+    backgroundColor?: string;
+    rounded?: boolean | "top" | "right" | "bottom" | "left";
+    pill?: boolean;
+    big?: boolean;
+    theme?: "primary" | "secondary" | "default" | "info" | "success" | "warning" | "error";
+}
+type ButtonClass = React.StatelessComponent<ButtonProps>
+export declare const Button: ButtonClass;
+
+export interface ButtonCircleProps extends BaseProps<ButtonCircleClass> {
+    title?: string;
+    href?: string;
+    color?: string;
+    backgroundColor?: string;
+    size?: number;
+}
+type ButtonCircleClass = React.StatelessComponent<ButtonCircleProps>
+export declare const ButtonCircle: ButtonCircleClass;
+
+export interface ButtonOutlineProps extends BaseProps<ButtonOutlineClass> {
+    href?: string;
+    color?: string;
+    rounded?: boolean | "top" | "right" | "bottom" | "left";
+    pill?: boolean;
+    big?: boolean;
+}
+type ButtonOutlineClass = React.StatelessComponent<ButtonOutlineProps>
+export declare const ButtonOutline: ButtonOutlineClass;
+
+export interface CardProps extends BaseProps<CardClass> {
+    width?: number | string;
+}
+type CardClass = React.StatelessComponent<CardProps>
+export declare const Card: CardClass;
+
+export interface CardImageProps extends BaseProps<CardImageClass> {
+    src?: string;
+}
+type CardImageClass = React.StatelessComponent<CardImageProps>
+export declare const CardImage: CardImageClass;
+
+export interface CheckboxProps extends BaseProps<CheckboxClass> {
+    label?: string;
+    checked?: boolean;
+    name?: string;
+    readOnly?: boolean;
+    theme?: "primary" | "secondary" | "default" | "info" | "success" | "warning" | "error";
+}
+type CheckboxClass = React.StatelessComponent<CheckboxProps>
+export declare const Checkbox: CheckboxClass;
+
+export interface CloseProps extends BaseProps<CloseClass> {
+}
+type CloseClass = React.StatelessComponent<CloseProps>
+export declare const Close: CloseClass;
+
+export interface ContainerProps extends BaseProps<ContainerClass> {
+}
+type ContainerClass = React.StatelessComponent<ContainerProps>
+export declare const Container: ContainerClass;
+
+export interface DividerProps extends BaseProps<DividerClass> {
+    width?: number;
+}
+type DividerClass = React.StatelessComponent<DividerProps>
+export declare const Divider: DividerClass;
+
+export interface DonutProps extends BaseProps<DonutClass> {
+    value?: number;
+    size?: number;
+    strokeWidth?: number;
+    color?: string;
+}
+type DonutClass = React.StatelessComponent<DonutProps>
+export declare const Donut: DonutClass;
+
+export interface DotIndicatorProps extends BaseProps<DotIndicatorClass> {
+    length?: number;
+    active?: number;
+    onClick?: Function;
+}
+type DotIndicatorClass = React.StatelessComponent<DotIndicatorProps>
+export declare const DotIndicator: DotIndicatorClass;
+
+export interface DrawerProps extends BaseProps<DrawerClass> {
+    size?: number;
+    open?: boolean;
+    position?: "top" | "right" | "bottom" | "left";
+    onDismiss?: Function;
+}
+type DrawerClass = React.StatelessComponent<DrawerProps>
+export declare const Drawer: DrawerClass;
+
+export interface DropdownProps extends BaseProps<DropdownClass> {
+}
+type DropdownClass = React.StatelessComponent<DropdownProps>
+export declare const Dropdown: DropdownClass;
+
+export interface DropdownMenuProps extends BaseProps<DropdownMenuClass> {
+    open?: boolean;
+    right?: boolean;
+    top?: boolean;
+    onDismiss?: Function;
+}
+type DropdownMenuClass = React.StatelessComponent<DropdownMenuProps>
+export declare const DropdownMenu: DropdownMenuClass;
+
+export interface EmbedProps extends BaseProps<EmbedClass> {
+    ratio?: number;
+}
+type EmbedClass = React.StatelessComponent<EmbedProps>
+export declare const Embed: EmbedClass;
+
+export interface FixedProps extends BaseProps<FixedClass> {
+    top?: boolean;
+    right?: boolean;
+    bottom?: boolean;
+    left?: boolean;
+    zIndex?: number;
+}
+type FixedClass = React.StatelessComponent<FixedProps>
+export declare const Fixed: FixedClass;
+
+export interface FooterProps extends BaseProps<FooterClass> {
+}
+type FooterClass = React.StatelessComponent<FooterProps>
+export declare const Footer: FooterClass;
+
+export interface HeadingProps extends BaseProps<HeadingClass> {
+    big?: boolean;
+    level?: number;
+    size?: number;
+    alt?: boolean;
+}
+type HeadingClass = React.StatelessComponent<HeadingProps>
+export declare const Heading: HeadingClass;
+
+export interface HeadingLinkProps extends BaseProps<HeadingLinkClass> {
+    level?: number;
+    size?: number;
+    href?: string;
+}
+type HeadingLinkClass = React.StatelessComponent<HeadingLinkProps>
+export declare const HeadingLink: HeadingLinkClass;
+
+export interface InlineFormProps extends BaseProps<InlineFormClass> {
+    label?: string;
+    name?: string;
+    value?: number | string;
+    placeholder?: string;
+    onChange?: Function;
+    buttonLabel?: string;
+    onClick?: Function;
+}
+type InlineFormClass = React.StatelessComponent<InlineFormProps>
+export declare const InlineForm: InlineFormClass;
+
+export interface InputProps extends BaseProps<InputClass> {
+    label?: string;
+    name?: string;
+    type?: string;
+    message?: string;
+    hideLabel?: boolean;
+    rounded?: boolean | "top" | "right" | "bottom" | "left";
+    placeholder?: string;
+}
+type InputClass = React.StatelessComponent<InputProps>
+export declare const Input: InputClass;
+
+export interface LabelProps extends BaseProps<LabelClass> {
+    hide?: boolean;
+}
+type LabelClass = React.StatelessComponent<LabelProps>
+export declare const Label: LabelClass;
+
+export interface LinkBlockProps extends BaseProps<LinkBlockClass> {
+    is?: string | Object | Function;
+    href?: string;
+}
+type LinkBlockClass = React.StatelessComponent<LinkBlockProps>
+export declare const LinkBlock: LinkBlockClass;
+
+export interface MediaProps extends BaseProps<MediaClass> {
+    img?: string;
+    right?: boolean;
+    align?: "top" | "center" | "bottom";
+}
+type MediaClass = React.StatelessComponent<MediaProps>
+export declare const Media: MediaClass;
+
+export interface MenuProps extends BaseProps<MenuClass> {
+}
+type MenuClass = React.StatelessComponent<MenuProps>
+export declare const Menu: MenuClass;
+
+export interface MessageProps extends BaseProps<MessageClass> {
+    theme?: "primary" | "secondary" | "default" | "info" | "success" | "warning" | "error";
+}
+type MessageClass = React.StatelessComponent<MessageProps>
+export declare const Message: MessageClass;
+
+export interface NavItemProps extends BaseProps<NavItemClass> {
+    small?: boolean;
+    is?: string | Object | Function;
+}
+type NavItemClass = React.StatelessComponent<NavItemProps>
+export declare const NavItem: NavItemClass;
+
+export interface OverlayProps extends BaseProps<OverlayClass> {
+    open?: boolean;
+    dark?: boolean;
+    box?: boolean;
+    fullWidth?: boolean;
+    onDismiss?: Function;
+}
+type OverlayClass = React.StatelessComponent<OverlayProps>
+export declare const Overlay: OverlayClass;
+
+export interface PageHeaderProps extends BaseProps<PageHeaderClass> {
+    heading?: string;
+    description?: string;
+}
+type PageHeaderClass = React.StatelessComponent<PageHeaderProps>
+export declare const PageHeader: PageHeaderClass;
+
+export interface PanelProps extends BaseProps<PanelClass> {
+    theme?: "primary" | "secondary" | "default" | "info" | "success" | "warning" | "error";
+}
+type PanelClass = React.StatelessComponent<PanelProps>
+export declare const Panel: PanelClass;
+
+export interface PanelFooterProps extends BaseProps<PanelFooterClass> {
+    theme?: "primary" | "secondary" | "default" | "info" | "success" | "warning" | "error";
+}
+type PanelFooterClass = React.StatelessComponent<PanelFooterProps>
+export declare const PanelFooter: PanelFooterClass;
+
+export interface PanelHeaderProps extends BaseProps<PanelHeaderClass> {
+    theme?: "primary" | "secondary" | "default" | "info" | "success" | "warning" | "error";
+}
+type PanelHeaderClass = React.StatelessComponent<PanelHeaderProps>
+export declare const PanelHeader: PanelHeaderClass;
+
+export interface PreProps extends BaseProps<PreClass> {
+}
+type PreClass = React.StatelessComponent<PreProps>
+export declare const Pre: PreClass;
+
+export interface ProgressProps extends BaseProps<ProgressClass> {
+    value?: number;
+    color?: string;
+}
+type ProgressClass = React.StatelessComponent<ProgressProps>
+export declare const Progress: ProgressClass;
+
+export interface RadioProps extends BaseProps<RadioClass> {
+    checked?: boolean;
+    group?: string;
+    label?: string;
+    name?: string;
+    readOnly?: boolean;
+}
+type RadioClass = React.StatelessComponent<RadioProps>
+export declare const Radio: RadioClass;
+
+export interface RatingProps extends BaseProps<RatingClass> {
+    value?: number;
+    onClick?: Function;
+}
+type RatingClass = React.StatelessComponent<RatingProps>
+export declare const Rating: RatingClass;
+
+export interface SectionProps extends BaseProps<SectionClass> {
+}
+type SectionClass = React.StatelessComponent<SectionProps>
+export declare const Section: SectionClass;
+
+export interface SectionHeaderProps extends BaseProps<SectionHeaderClass> {
+    heading?: string;
+    href?: string;
+    description?: string;
+}
+type SectionHeaderClass = React.StatelessComponent<SectionHeaderProps>
+export declare const SectionHeader: SectionHeaderClass;
+
+export interface SelectProps extends BaseProps<SelectClass> {
+    label?: string;
+    name?: string;
+    options?: {
+        children: any;
+        value: any;
+    }[];
+    message?: string;
+    hideLabel?: boolean;
+}
+type SelectClass = React.StatelessComponent<SelectProps>
+export declare const Select: SelectClass;
+
+export interface SequenceMapProps extends BaseProps<SequenceMapClass> {
+    steps?: {
+        children: any;
+        href: string;
+    }[];
+    active?: number;
+}
+type SequenceMapClass = React.StatelessComponent<SequenceMapProps>
+export declare const SequenceMap: SequenceMapClass;
+
+export interface SequenceMapStepProps extends BaseProps<SequenceMapStepClass> {
+    width?: string;
+    first?: boolean;
+    active?: boolean;
+}
+type SequenceMapStepClass = React.StatelessComponent<SequenceMapStepProps>
+export declare const SequenceMapStep: SequenceMapStepClass;
+
+export interface SliderProps extends BaseProps<SliderClass> {
+    label?: string;
+    name?: string;
+    fill?: boolean;
+    hideLabel?: boolean;
+    value?: number;
+    defaultValue?: number;
+    readOnly?: boolean;
+}
+type SliderClass = React.StatelessComponent<SliderProps>
+export declare const Slider: SliderClass;
+
+export interface SpaceProps extends BaseProps<SpaceClass> {
+    x?: number;
+    auto?: boolean;
+}
+type SpaceClass = React.StatelessComponent<SpaceProps>
+export declare const Space: SpaceClass;
+
+export interface StatProps extends BaseProps<StatClass> {
+    value?: number | string;
+    unit?: string;
+    label?: string;
+    topLabel?: boolean;
+}
+type StatClass = React.StatelessComponent<StatProps>
+export declare const Stat: StatClass;
+
+export interface SwitchProps extends BaseProps<SwitchClass> {
+    checked?: boolean;
+}
+type SwitchClass = React.StatelessComponent<SwitchProps>
+export declare const Switch: SwitchClass;
+
+export interface TableProps extends BaseProps<TableClass> {
+    headings?: any[];
+    data?: any[][];
+}
+type TableClass = React.StatelessComponent<TableProps>
+export declare const Table: TableClass;
+
+export interface TextProps extends BaseProps<TextClass> {
+    small?: boolean;
+    bold?: boolean;
+}
+type TextClass = React.StatelessComponent<TextProps>
+export declare const Text: TextClass;
+
+export interface TextareaProps extends BaseProps<TextareaClass> {
+    label?: string;
+    name?: string;
+    message?: string;
+    hideLabel?: boolean;
+}
+type TextareaClass = React.StatelessComponent<TextareaProps>
+export declare const Textarea: TextareaClass;
+
+export interface ToolbarProps extends BaseProps<ToolbarClass> {
+}
+type ToolbarClass = React.StatelessComponent<ToolbarProps>
+export declare const Toolbar: ToolbarClass;
+
+export interface TooltipProps extends BaseProps<TooltipClass> {
+    title?: string;
+}
+type TooltipClass = React.StatelessComponent<TooltipProps>
+export declare const Tooltip: TooltipClass;
diff --git a/rebass/rebass-tests.tsx b/rebass/rebass-tests.tsx
new file mode 100644
index 0000000000..2d20c900db
--- /dev/null
+++ b/rebass/rebass-tests.tsx
@@ -0,0 +1,624 @@
+
+import * as React from "react";
+import {
+    Arrow
+  , Avatar
+  , Badge
+  , Banner
+  , Block
+  , Blockquote
+  , Breadcrumbs
+  , Button
+  , ButtonCircle
+  , ButtonOutline
+  , Card
+  , CardImage
+  , Checkbox
+  , Close
+  , Container
+  , Divider
+  , Donut
+  , DotIndicator
+  , Drawer
+  , Dropdown
+  , DropdownMenu
+  , Embed
+  , Fixed
+  , Footer
+  , Heading
+  , HeadingLink
+  , InlineForm
+  , Input
+  , Label
+  , LinkBlock
+  , Media
+  , Menu
+  , Message
+  , NavItem
+  , Overlay
+  , PageHeader
+  , Panel
+  , PanelFooter
+  , PanelHeader
+  , Pre
+  , Progress
+  , Radio
+  , Rating
+  , Section
+  , SectionHeader
+  , Select
+  , SequenceMap
+  , SequenceMapStep
+  , Slider
+  , Space
+  , Stat
+  , Switch
+  , Table
+  , Text
+  , Textarea
+  , Toolbar
+  , Tooltip
+} from "rebass";
+
+interface IconProps extends React.Props<Icon> {
+  fill: string;
+  height: string;
+  name: string;
+  width: string;
+}
+
+class Icon extends React.Component<IconProps, {}> {
+  render() {
+    return <div></div>;
+  }
+}
+
+class RebassTest extends React.Component<{}, {}> {
+  render() {
+    return <div>
+      <Button
+        backgroundColor="primary"
+        color="white"
+        inverted={true}
+        rounded={true}
+      >
+        Arrow
+        <Arrow direction="down" />
+      </Button>
+
+      <Avatar
+        circle={true}
+        size={48}
+        src="http://lorempixel.com/64/64/cats"
+      />
+
+      <div>
+        <Heading level={4}>
+          Rebass
+        </Heading>
+        <Space x={1} />
+        <Badge
+          rounded={true}
+          theme="info"
+        >
+          0.2.0
+        </Badge>
+        <Space x={2} />
+        <Heading level={4}>
+          Pill
+        </Heading>
+        <Space x={1} />
+        <Badge
+          pill={true}
+          rounded={true}
+          theme="info"
+        >
+          Pill
+        </Badge>
+        <Space x={2} />
+        <Heading level={4}>
+          Circular
+        </Heading>
+        <Space x={1} />
+        <Badge
+          circle={true}
+          rounded={true}
+          theme="error"
+        >
+          4
+        </Badge>
+      </div>
+
+      <Banner
+        align="center"
+        backgroundImage="https://d262ilb51hltx0.cloudfront.net/max/2000/1*DZwdGMaeu-rvTroJYui6Uw.jpeg"
+      >
+        <Heading
+          level={2}
+          size={0}
+        >
+          Rebass
+        </Heading>
+      </Banner>
+
+      <Block
+        borderLeft={true}
+        color="blue"
+        px={2}
+      >
+        <Media img="http://placehold.it/128/08e/fff">
+          <Heading
+            level={2}
+            size={0}
+          >
+            Block
+          </Heading>
+          <Text>
+            Generic box for containing things
+          </Text>
+        </Media>
+      </Block>
+
+      <Blockquote
+        href="http://webtypography.net/3.1.1"
+        source="Robert Bringhurst"
+      >
+        In the sixteenth century, a series of common sizes developed among European typographers, and the series survived with little change and few additions for 400 years. […] Use the old familiar scale, or use new scales of your own devising, but limit yourself, at first, to a modest set of distinct and related intervals.
+      </Blockquote>
+
+      <Breadcrumbs links={[{children: 'Jxnblk', href: '#!'}, {children: 'Rebass', href: '#!'}, {children: 'Breadcrumbs', href: '#!'}]} />
+
+      <div>
+        <Button
+          backgroundColor="primary"
+          color="white"
+          inverted={true}
+          rounded={true}
+        >
+          Button
+        </Button>
+      </div>
+
+      <div>
+        <ButtonCircle title="Like">
+          <Icon
+            fill="currentColor"
+            height="1em"
+            name="heart"
+            width="1em"
+          />
+        </ButtonCircle>
+        <ButtonCircle title="Comment">
+          <Icon
+            fill="currentColor"
+            height="1em"
+            name="chat"
+            width="1em"
+          />
+        </ButtonCircle>
+        <ButtonCircle title="Repost">
+          <Icon
+            fill="currentColor"
+            height="1em"
+            name="repost"
+            width="1em"
+          />
+        </ButtonCircle>
+        <ButtonCircle title="Bookmark">
+          <Icon
+            fill="currentColor"
+            height="1em"
+            name="bookmark"
+            width="1em"
+          />
+        </ButtonCircle>
+        <ButtonCircle title="Tag">
+          <Icon
+            fill="currentColor"
+            height="1em"
+            name="tag"
+            width="1em"
+          />
+        </ButtonCircle>
+        <Text small={true}>
+          Example Icon component from react-geomicons
+        </Text>
+      </div>
+
+      <div>
+        <ButtonOutline
+          color="primary"
+          inverted={false}
+          rounded="left"
+        >
+          Button
+        </ButtonOutline>
+        <ButtonOutline
+          color="primary"
+          inverted={false}
+          rounded={false}
+          style={{marginLeft: -1}}
+        >
+          Group
+        </ButtonOutline>
+        <Button
+          backgroundColor="primary"
+          color="white"
+          inverted={true}
+          rounded="right"
+          style={{marginLeft: -1}}
+        >
+          Button
+        </Button>
+      </div>
+
+      <Card
+        rounded={true}
+        width={256}
+      >
+        <CardImage src="http://placehold.it/320/08e/fff" />
+        <Heading
+          level={2}
+          size={3}
+        >
+          Card
+        </Heading>
+        <Text>
+          Cats like cards too
+        </Text>
+      </Card>
+
+      <div style={{maxWidth: 192}}>
+        <CardImage src="http://placehold.it/320/08e/fff" />
+      </div>
+
+      <div>
+        <Checkbox
+          label="Checkbox"
+          name="checkbox_1"
+        />
+        <Checkbox
+          checked={true}
+          label="Checkbox"
+          name="checkbox_1"
+          readOnly={true}
+          theme="success"
+        />
+      </div>
+
+      <Close />
+
+      <Container>
+        Container
+      </Container>
+
+      <div>
+        <Divider />
+        <Divider
+          ml={0}
+          width={128}
+        />
+      </div>
+
+      <div>
+        <Donut
+          color="primary"
+          size={256}
+          strokeWidth={32}
+          value={0.5625}
+        />
+        <Donut
+          color="primary"
+          size={128}
+          strokeWidth={8}
+          value={0.5625}
+        >
+          9/16
+        </Donut>
+        <Donut
+          color="primary"
+          size={128}
+          strokeWidth={8}
+          value={0.625}
+        />
+        <Donut
+          color="primary"
+          size={128}
+          strokeWidth={8}
+          value={0.125}
+        />
+      </div>
+
+      <div>
+        <DotIndicator
+          active={0}
+          length={3}
+          onClick={function noRefCheck() {}}
+        />
+      </div>
+
+      <Dropdown>
+        <Button
+          backgroundColor="primary"
+          color="white"
+          inverted={true}
+          rounded={true}
+        >
+          Dropdown
+          <Arrow direction="down" />
+        </Button>
+        <DropdownMenu
+          onDismiss={function noRefCheck() {}}
+          open={false}
+        >
+          <NavItem is="a">
+            Hello
+          </NavItem>
+          <NavItem is="a">
+            Hi
+          </NavItem>
+        </DropdownMenu>
+      </Dropdown>
+
+      <Embed ratio={0.5625}>
+        <iframe
+          allowFullScreen={true}
+          src="https://www.youtube.com/embed/KO_3Qgib6RQ"
+        />
+      </Embed>
+
+      <Footer>
+        Footer™ ©2016 Jxnblk
+      </Footer>
+
+      <InlineForm
+        buttonLabel="Go"
+        label="InlineForm"
+        name="inline_form"
+        onChange={function noRefCheck() {}}
+        onClick={function noRefCheck() {}}
+      />
+
+      <Input
+        label="Input"
+        name="input_example"
+        placeholder="Placeholder"
+        rounded={true}
+        type="text"
+      />
+
+      <Label>
+        Label for form elements
+      </Label>
+
+      <LinkBlock
+        href="#LinkBlock"
+        is="a"
+      >
+        <Media
+          align="center"
+          img="http://placehold.it/96/08e/fff"
+        >
+          <Heading level={3}>
+            LinkBlock
+          </Heading>
+        </Media>
+      </LinkBlock>
+
+      <Media
+        align="center"
+        img="http://placehold.it/128/08e/fff"
+      >
+        <Heading level={3}>
+          Media Object
+        </Heading>
+        <Text>
+          With alignment options
+        </Text>
+      </Media>
+
+      <Menu rounded={true}>
+        <NavItem is="a">
+          Menu
+        </NavItem>
+        <NavItem is="a">
+          NavItem
+        </NavItem>
+        <NavItem is="a">
+          NavItem
+        </NavItem>
+      </Menu>
+
+      <Message
+        inverted={true}
+        rounded={true}
+        theme="success"
+      >
+        Hello Message!
+        <Space
+          auto={true}
+          x={1}
+        />
+        <Close />
+      </Message>
+
+      <PageHeader
+        description="Description about the page"
+        heading="Page Header"
+      />
+
+      <Panel theme="info">
+        <PanelHeader
+          inverted={true}
+          theme="default"
+        >
+          Panel
+        </PanelHeader>
+        <Text>
+          Panels are great for visually separating UI, content, or data from the rest of the page.
+        </Text>
+        <PanelFooter theme="default">
+          The footer is a good place for less important information
+        </PanelFooter>
+      </Panel>
+
+      <Pre>
+        this is text
+        this is text
+        this is text
+      </Pre>
+
+      <Progress
+        color="primary"
+        value={0.25}
+      />
+
+      <div>
+        <Radio
+          checked={true}
+          circle={true}
+          group="radios"
+          label="Radio"
+          name="radio_1"
+          readOnly={true}
+        />
+        <Radio
+          circle={true}
+          group="radios"
+          label="Radio"
+          name="radio_2"
+        />
+      </div>
+
+      <Rating
+        color="orange"
+        value={3.5}
+      />
+
+      <Section>
+        Section
+      </Section>
+
+      <Section>
+        <SectionHeader
+          description="With linked header"
+          heading="Section Header"
+        />
+        Section
+      </Section>
+
+      <Select
+        label="Select"
+        name="select_example"
+        options={[{children: 'Two', value: 2}, {children: 'Four', value: 4}, {children: 'Eight', value: 8}, {children: 'Sixteen', value: 16}, {children: 'Thirty-Two', value: 32}, {children: 'Sixty-Four', value: 64}]}
+        rounded={true}
+      />
+
+      <SequenceMap
+        active={1}
+        steps={[{children: 'Sign In', href: '#!'}, {children: 'Shipping Address', href: '#!'}, {children: 'Payment Method', href: '#!'}, {children: 'Place Order', href: '#!'}]}
+      />
+
+      <div>
+        <Slider
+          defaultValue={37.5}
+          label="Slider"
+          name="slider_1"
+        />
+        <Slider
+          color="blue"
+          fill={true}
+          label="Slider with color and fill"
+          name="slider_2"
+          readOnly={true}
+          value={62.5}
+        />
+      </div>
+
+      <div>
+        <Button
+          backgroundColor="primary"
+          color="white"
+          inverted={true}
+          rounded={true}
+        >
+          Button
+        </Button>
+        <Space x={1} />
+        <Button
+          backgroundColor="primary"
+          color="white"
+          inverted={true}
+          rounded={true}
+        >
+          With
+        </Button>
+        <Space x={4} />
+        <Button
+          backgroundColor="primary"
+          color="white"
+          inverted={true}
+          rounded={true}
+        >
+          Space
+        </Button>
+      </div>
+
+      <div>
+        <Stat
+          label="Memory"
+          unit="GB"
+          value="512"
+        />
+        <Stat
+          label="PetaFLOPS"
+          value="32"
+        />
+        <Stat
+          label="Upload"
+          unit="Mbps"
+          value="512"
+        />
+        <Stat
+          label="Download"
+          unit="Mbps"
+          value="1,024"
+        />
+      </div>
+
+      <Switch checked={false}/>
+
+      <Table
+        data={[['Hamburger', 'Beef', 'Onion', 'Bun'], ['Pizza', 'Pork', 'Tomato', 'Crust'], ['Corndog', 'Pork', 'Corn', 'Cornbread'], ['Hot Dog', 'Pork', 'Peppers', 'Bun']]}
+        headings={['Name', 'Meat', 'Vegetable', 'Carb']}
+      />
+
+      <Toolbar>
+        <NavItem is="a">
+          Toolbar
+        </NavItem>
+        <NavItem is="a">
+          NavItem
+        </NavItem>
+        <Space
+          auto={true}
+          x={1}
+        />
+        <NavItem is="a">
+          NavItem
+        </NavItem>
+      </Toolbar>
+
+      <Tooltip
+        inverted={true}
+        rounded={true}
+        title="Hello!"
+      >
+        <Heading level={3}>
+          Tooltip
+        </Heading>
+      </Tooltip>
+    </div>;
+  }
+}
+
diff --git a/rebass/tsconfig.json b/rebass/tsconfig.json
new file mode 100644
index 0000000000..cb5df7c207
--- /dev/null
+++ b/rebass/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "rebass-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/recaptcha/recaptcha.d.ts b/recaptcha/index.d.ts
similarity index 100%
rename from recaptcha/recaptcha.d.ts
rename to recaptcha/index.d.ts
diff --git a/recaptcha/recaptcha-tests.ts b/recaptcha/recaptcha-tests.ts
index 61ef51d9f1..e270966bda 100644
--- a/recaptcha/recaptcha-tests.ts
+++ b/recaptcha/recaptcha-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="recaptcha.d.ts"/> 
-
-var recaptchaOptions: RecaptchaOptions = {
+var recaptchaOptions: RecaptchaOptions = {
     theme : 'custom',
     custom_theme_widget: 'recaptcha_widget'
  };
diff --git a/recaptcha/tsconfig.json b/recaptcha/tsconfig.json
new file mode 100644
index 0000000000..b055c772b9
--- /dev/null
+++ b/recaptcha/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "recaptcha-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/recursive-readdir/index.d.ts b/recursive-readdir/index.d.ts
new file mode 100644
index 0000000000..f1c6214013
--- /dev/null
+++ b/recursive-readdir/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for recursive-readdir v1.2.1
+// Project: https://github.com/jergason/recursive-readdir/
+// Definitions by: Elisée Maurer <https://github.com/elisee/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import * as fs from "fs";
+declare namespace RecursiveReaddir {
+    interface readdir {
+        (path: string, callback: (error: Error, files: string[]) => any): void;
+        // ignorePattern supports glob syntax via https://github.com/isaacs/minimatch
+        (path: string, ignorePattern: (string | ((file: string, stats: fs.Stats) => void))[], callback: (error: Error, files: string[]) => any): void;
+        (path: string, ignoreFunction: (file: string, stats: fs.Stats) => void, callback: (error: Error, files: string[]) => any): void;
+    }
+}
+
+declare var r: RecursiveReaddir.readdir;
+export = r;
diff --git a/recursive-readdir/recursive-readdir-tests.ts b/recursive-readdir/recursive-readdir-tests.ts
index 2d3e1d7c92..813ec80f90 100644
--- a/recursive-readdir/recursive-readdir-tests.ts
+++ b/recursive-readdir/recursive-readdir-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="recursive-readdir.d.ts" />
 
 import recursiveReaddir = require("recursive-readdir");
 
diff --git a/recursive-readdir/recursive-readdir.d.ts b/recursive-readdir/recursive-readdir.d.ts
deleted file mode 100644
index d156911b23..0000000000
--- a/recursive-readdir/recursive-readdir.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Type definitions for recursive-readdir v1.2.1
-// Project: https://github.com/jergason/recursive-readdir/
-// Definitions by: Elisée Maurer <https://github.com/elisee/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "recursive-readdir" {
-    import * as fs from "fs";
-    namespace RecursiveReaddir {
-        interface readdir {
-            (path: string, callback: (error: Error, files: string[]) => any): void;
-            // ignorePattern supports glob syntax via https://github.com/isaacs/minimatch
-            (path: string, ignorePattern: (string | ((file: string, stats: fs.Stats) => void))[], callback: (error: Error, files: string[]) => any): void;
-            (path: string, ignoreFunction: (file: string, stats: fs.Stats) => void, callback: (error: Error, files: string[]) => any): void;
-        }
-    }
-
-    var r: RecursiveReaddir.readdir;
-    export = r;
-}
diff --git a/recursive-readdir/tsconfig.json b/recursive-readdir/tsconfig.json
new file mode 100644
index 0000000000..df842d2c9d
--- /dev/null
+++ b/recursive-readdir/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "recursive-readdir-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/redis/index.d.ts b/redis/index.d.ts
new file mode 100644
index 0000000000..b310e28c10
--- /dev/null
+++ b/redis/index.d.ts
@@ -0,0 +1,640 @@
+// Type definitions for redis 0.12.1
+// Project: https://github.com/mranney/node_redis
+// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>, Peter Harris <https://github.com/CodeAnimal>, TANAKA Koichi <https://github.com/MugeSo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/redis.d.ts
+
+/// <reference types="node" />
+
+export declare function createClient(port_arg: number, host_arg?: string, options?: ClientOpts): RedisClient;
+export declare function createClient(unix_socket: string, options?: ClientOpts): RedisClient;
+export declare function createClient(options?: ClientOpts): RedisClient;
+
+export declare function print(err: Error, reply: any): void;
+
+export declare var debug_mode: boolean;
+
+export interface MessageHandler<M> {
+    (channel: string, message: M): void;
+}
+
+export interface CommandT<R> { //This is a placeholder to be used eventually, to not have to define each command twice, or four times if all caps versions are to be implemented.
+    (args: any[], callback?: ResCallbackT<R>): void;
+    (...args: any[]): void;
+}
+
+export interface ResCallbackT<R> {
+    (err: Error, res: R): void;
+}
+
+export interface ServerInfo {
+    redis_version: string;
+    versions: number[];
+}
+
+export interface ClientOpts {
+    parser?: string;
+    return_buffers?: boolean;
+    detect_buffers?: boolean;
+    socket_nodelay?: boolean;
+    socket_keepalive?: boolean;
+    no_ready_check?: boolean;
+    enable_offline_queue?: boolean;
+    retry_max_delay?: number;
+    connect_timeout?: number;
+    max_attempts?: number;
+    auth_pass?: string;
+    password?: string;
+    family?: string;
+    command_queue_high_water?: number;
+    command_queue_low_water?: number;
+}
+
+export interface RedisClient extends NodeJS.EventEmitter {
+    // event: connect
+    // event: error
+    // event: message
+    // event: pmessage
+    // event: subscribe
+    // event: psubscribe
+    // event: unsubscribe
+    // event: punsubscribe
+
+    connected: boolean;
+    retry_delay: number;
+    retry_backoff: number;
+    command_queue: any[];
+    offline_queue: any[];
+    server_info: ServerInfo;
+
+    end(): void;
+    unref(): void;
+
+    // Low level command execution
+    send_command(command: string, ...args: any[]): boolean;
+
+    // Connection (http://redis.io/commands#connection)
+    auth(password: string, callback?: ResCallbackT<any>): boolean;
+    ping(callback?: ResCallbackT<number>): boolean;
+
+    // Strings (http://redis.io/commands#strings)
+    append(key: string, value: string, callback?: ResCallbackT<number>): boolean;
+    bitcount(key: string, callback?: ResCallbackT<number>): boolean;
+    bitcount(key: string, start: number, end: number, callback?: ResCallbackT<number>): boolean;
+    set(key: string, value: string, callback?: ResCallbackT<string>): boolean;
+    get(key: string, callback?: ResCallbackT<string>): boolean;
+    exists(key: string, value: string, callback?: ResCallbackT<number>): boolean;
+
+    publish(channel: string, value: any): boolean;
+    subscribe(channel: string): boolean;
+
+    /*
+     commands = set_union([
+     "get", "set", "setnx", "setex", "append", "strlen", "del", "exists", "setbit", "getbit", "setrange", "getrange", "substr",
+     "incr", "decr", "mget", "rpush", "lpush", "rpushx", "lpushx", "linsert", "rpop", "lpop", "brpop", "brpoplpush", "blpop", "llen", "lindex",
+     "lset", "lrange", "ltrim", "lrem", "rpoplpush", "sadd", "srem", "smove", "sismember", "scard", "spop", "srandmember", "sinter", "sinterstore",
+     "sunion", "sunionstore", "sdiff", "sdiffstore", "smembers", "zadd", "zincrby", "zrem", "zremrangebyscore", "zremrangebyrank", "zunionstore",
+     "zinterstore", "zrange", "zrangebyscore", "zrevrangebyscore", "zcount", "zrevrange", "zcard", "zscore", "zrank", "zrevrank", "hset", "hsetnx",
+     "hget", "hmset", "hmget", "hincrby", "hdel", "hlen", "hkeys", "hvals", "hgetall", "hexists", "incrby", "decrby", "getset", "mset", "msetnx",
+     "randomkey", "select", "move", "rename", "renamenx", "expire", "expireat", "keys", "dbsize", "auth", "ping", "echo", "save", "bgsave",
+     "bgrewriteaof", "shutdown", "lastsave", "type", "multi", "exec", "discard", "sync", "flushdb", "flushall", "sort", "info", "monitor", "ttl",
+     "persist", "slaveof", "debug", "config", "subscribe", "unsubscribe", "psubscribe", "punsubscribe", "publish", "watch", "unwatch", "cluster",
+     "restore", "migrate", "dump", "object", "client", "eval", "evalsha"], require("./lib/commands"));
+     */
+
+    get(args: any[], callback?: ResCallbackT<string>): boolean;
+    get(...args: any[]): boolean;
+    set(args: any[], callback?: ResCallbackT<string>): boolean;
+    set(...args: any[]): boolean;
+    setnx(args: any[], callback?: ResCallbackT<any>): boolean;
+    setnx(...args: any[]): boolean;
+    setex(args: any[], callback?: ResCallbackT<any>): boolean;
+    setex(...args: any[]): boolean;
+    append(args: any[], callback?: ResCallbackT<any>): boolean;
+    append(...args: any[]): boolean;
+    strlen(args: any[], callback?: ResCallbackT<any>): boolean;
+    strlen(...args: any[]): boolean;
+    del(args: any[], callback?: ResCallbackT<any>): boolean;
+    del(...args: any[]): boolean;
+    exists(args: any[], callback?: ResCallbackT<any>): boolean;
+    exists(...args: any[]): boolean;
+    setbit(args: any[], callback?: ResCallbackT<any>): boolean;
+    setbit(...args: any[]): boolean;
+    getbit(args: any[], callback?: ResCallbackT<any>): boolean;
+    getbit(...args: any[]): boolean;
+    setrange(args: any[], callback?: ResCallbackT<any>): boolean;
+    setrange(...args: any[]): boolean;
+    getrange(args: any[], callback?: ResCallbackT<any>): boolean;
+    getrange(...args: any[]): boolean;
+    substr(args: any[], callback?: ResCallbackT<any>): boolean;
+    substr(...args: any[]): boolean;
+    incr(args: any[], callback?: ResCallbackT<any>): boolean;
+    incr(...args: any[]): boolean;
+    decr(args: any[], callback?: ResCallbackT<any>): boolean;
+    decr(...args: any[]): boolean;
+    mget(args: any[], callback?: ResCallbackT<any>): boolean;
+    mget(...args: any[]): boolean;
+    rpush(...args: any[]): boolean;
+    lpush(args: any[], callback?: ResCallbackT<any>): boolean;
+    lpush(...args: any[]): boolean;
+    rpushx(args: any[], callback?: ResCallbackT<any>): boolean;
+    rpushx(...args: any[]): boolean;
+    lpushx(args: any[], callback?: ResCallbackT<any>): boolean;
+    lpushx(...args: any[]): boolean;
+    linsert(args: any[], callback?: ResCallbackT<any>): boolean;
+    linsert(...args: any[]): boolean;
+    rpop(args: any[], callback?: ResCallbackT<any>): boolean;
+    rpop(...args: any[]): boolean;
+    lpop(args: any[], callback?: ResCallbackT<any>): boolean;
+    lpop(...args: any[]): boolean;
+    brpop(args: any[], callback?: ResCallbackT<any>): boolean;
+    brpop(...args: any[]): boolean;
+    brpoplpush(args: any[], callback?: ResCallbackT<any>): boolean;
+    brpoplpush(...args: any[]): boolean;
+    blpop(args: any[], callback?: ResCallbackT<any>): boolean;
+    blpop(...args: any[]): boolean;
+    llen(args: any[], callback?: ResCallbackT<any>): boolean;
+    llen(...args: any[]): boolean;
+    lindex(args: any[], callback?: ResCallbackT<any>): boolean;
+    lindex(...args: any[]): boolean;
+    lset(args: any[], callback?: ResCallbackT<any>): boolean;
+    lset(...args: any[]): boolean;
+    lrange(args: any[], callback?: ResCallbackT<any>): boolean;
+    lrange(...args: any[]): boolean;
+    ltrim(args: any[], callback?: ResCallbackT<any>): boolean;
+    ltrim(...args: any[]): boolean;
+    lrem(args: any[], callback?: ResCallbackT<any>): boolean;
+    lrem(...args: any[]): boolean;
+    rpoplpush(args: any[], callback?: ResCallbackT<any>): boolean;
+    rpoplpush(...args: any[]): boolean;
+    sadd(args: any[], callback?: ResCallbackT<any>): boolean;
+    sadd(...args: any[]): boolean;
+    srem(args: any[], callback?: ResCallbackT<any>): boolean;
+    srem(...args: any[]): boolean;
+    smove(args: any[], callback?: ResCallbackT<any>): boolean;
+    smove(...args: any[]): boolean;
+    sismember(args: any[], callback?: ResCallbackT<any>): boolean;
+    sismember(...args: any[]): boolean;
+    scard(args: any[], callback?: ResCallbackT<any>): boolean;
+    scard(...args: any[]): boolean;
+    spop(args: any[], callback?: ResCallbackT<any>): boolean;
+    spop(...args: any[]): boolean;
+    srandmember(args: any[], callback?: ResCallbackT<any>): boolean;
+    srandmember(...args: any[]): boolean;
+    sinter(args: any[], callback?: ResCallbackT<any>): boolean;
+    sinter(...args: any[]): boolean;
+    sinterstore(args: any[], callback?: ResCallbackT<any>): boolean;
+    sinterstore(...args: any[]): boolean;
+    sunion(args: any[], callback?: ResCallbackT<any>): boolean;
+    sunion(...args: any[]): boolean;
+    sunionstore(args: any[], callback?: ResCallbackT<any>): boolean;
+    sunionstore(...args: any[]): boolean;
+    sdiff(args: any[], callback?: ResCallbackT<any>): boolean;
+    sdiff(...args: any[]): boolean;
+    sdiffstore(args: any[], callback?: ResCallbackT<any>): boolean;
+    sdiffstore(...args: any[]): boolean;
+    smembers(args: any[], callback?: ResCallbackT<any>): boolean;
+    smembers(...args: any[]): boolean;
+    zadd(args: any[], callback?: ResCallbackT<any>): boolean;
+    zadd(...args: any[]): boolean;
+    zincrby(args: any[], callback?: ResCallbackT<any>): boolean;
+    zincrby(...args: any[]): boolean;
+    zrem(args: any[], callback?: ResCallbackT<any>): boolean;
+    zrem(...args: any[]): boolean;
+    zremrangebyscore(args: any[], callback?: ResCallbackT<any>): boolean;
+    zremrangebyscore(...args: any[]): boolean;
+    zremrangebyrank(args: any[], callback?: ResCallbackT<any>): boolean;
+    zremrangebyrank(...args: any[]): boolean;
+    zunionstore(args: any[], callback?: ResCallbackT<any>): boolean;
+    zunionstore(...args: any[]): boolean;
+    zinterstore(args: any[], callback?: ResCallbackT<any>): boolean;
+    zinterstore(...args: any[]): boolean;
+    zrange(args: any[], callback?: ResCallbackT<any>): boolean;
+    zrange(...args: any[]): boolean;
+    zrangebyscore(args: any[], callback?: ResCallbackT<any>): boolean;
+    zrangebyscore(...args: any[]): boolean;
+    zrevrangebyscore(args: any[], callback?: ResCallbackT<any>): boolean;
+    zrevrangebyscore(...args: any[]): boolean;
+    zcount(args: any[], callback?: ResCallbackT<any>): boolean;
+    zcount(...args: any[]): boolean;
+    zrevrange(args: any[], callback?: ResCallbackT<any>): boolean;
+    zrevrange(...args: any[]): boolean;
+    zcard(args: any[], callback?: ResCallbackT<any>): boolean;
+    zcard(...args: any[]): boolean;
+    zscore(args: any[], callback?: ResCallbackT<any>): boolean;
+    zscore(...args: any[]): boolean;
+    zrank(args: any[], callback?: ResCallbackT<any>): boolean;
+    zrank(...args: any[]): boolean;
+    zrevrank(args: any[], callback?: ResCallbackT<any>): boolean;
+    zrevrank(...args: any[]): boolean;
+    hset(args: any[], callback?: ResCallbackT<any>): boolean;
+    hset(...args: any[]): boolean;
+    hsetnx(args: any[], callback?: ResCallbackT<any>): boolean;
+    hsetnx(...args: any[]): boolean;
+    hget(args: any[], callback?: ResCallbackT<any>): boolean;
+    hget(...args: any[]): boolean;
+    hmset(args: any[], callback?: ResCallbackT<any>): boolean;
+    hmset(key: string, hash: any, callback?: ResCallbackT<any>): boolean;
+    hmset(...args: any[]): boolean;
+    hmget(args: any[], callback?: ResCallbackT<any>): boolean;
+    hmget(...args: any[]): boolean;
+    hincrby(args: any[], callback?: ResCallbackT<any>): boolean;
+    hincrby(...args: any[]): boolean;
+    hdel(args: any[], callback?: ResCallbackT<any>): boolean;
+    hdel(...args: any[]): boolean;
+    hlen(args: any[], callback?: ResCallbackT<any>): boolean;
+    hlen(...args: any[]): boolean;
+    hkeys(args: any[], callback?: ResCallbackT<any>): boolean;
+    hkeys(...args: any[]): boolean;
+    hvals(args: any[], callback?: ResCallbackT<any>): boolean;
+    hvals(...args: any[]): boolean;
+    hgetall(args: any[], callback?: ResCallbackT<any>): boolean;
+    hgetall(...args: any[]): boolean;
+    hgetall(key: string, callback?: ResCallbackT<any>): boolean;
+    hexists(args: any[], callback?: ResCallbackT<any>): boolean;
+    hexists(...args: any[]): boolean;
+    incrby(args: any[], callback?: ResCallbackT<any>): boolean;
+    incrby(...args: any[]): boolean;
+    decrby(args: any[], callback?: ResCallbackT<any>): boolean;
+    decrby(...args: any[]): boolean;
+    getset(args: any[], callback?: ResCallbackT<any>): boolean;
+    getset(...args: any[]): boolean;
+    mset(args: any[], callback?: ResCallbackT<any>): boolean;
+    mset(...args: any[]): boolean;
+    msetnx(args: any[], callback?: ResCallbackT<any>): boolean;
+    msetnx(...args: any[]): boolean;
+    randomkey(args: any[], callback?: ResCallbackT<any>): boolean;
+    randomkey(...args: any[]): boolean;
+    select(args: any[], callback?: ResCallbackT<any>): void;
+    select(...args: any[]): void;
+    move(args: any[], callback?: ResCallbackT<any>): boolean;
+    move(...args: any[]): boolean;
+    rename(args: any[], callback?: ResCallbackT<any>): boolean;
+    rename(...args: any[]): boolean;
+    renamenx(args: any[], callback?: ResCallbackT<any>): boolean;
+    renamenx(...args: any[]): boolean;
+    expire(args: any[], callback?: ResCallbackT<any>): boolean;
+    expire(...args: any[]): boolean;
+    expireat(args: any[], callback?: ResCallbackT<any>): boolean;
+    expireat(...args: any[]): boolean;
+    keys(args: any[], callback?: ResCallbackT<any>): boolean;
+    keys(...args: any[]): boolean;
+    dbsize(args: any[], callback?: ResCallbackT<any>): boolean;
+    dbsize(...args: any[]): boolean;
+    auth(args: any[], callback?: ResCallbackT<any>): void;
+    auth(...args: any[]): void;
+    ping(args: any[], callback?: ResCallbackT<any>): boolean;
+    ping(...args: any[]): boolean;
+    echo(args: any[], callback?: ResCallbackT<any>): boolean;
+    echo(...args: any[]): boolean;
+    save(args: any[], callback?: ResCallbackT<any>): boolean;
+    save(...args: any[]): boolean;
+    bgsave(args: any[], callback?: ResCallbackT<any>): boolean;
+    bgsave(...args: any[]): boolean;
+    bgrewriteaof(args: any[], callback?: ResCallbackT<any>): boolean;
+    bgrewriteaof(...args: any[]): boolean;
+    shutdown(args: any[], callback?: ResCallbackT<any>): boolean;
+    shutdown(...args: any[]): boolean;
+    lastsave(args: any[], callback?: ResCallbackT<any>): boolean;
+    lastsave(...args: any[]): boolean;
+    type(args: any[], callback?: ResCallbackT<any>): boolean;
+    type(...args: any[]): boolean;
+    multi(args: any[], callback?: ResCallbackT<any>): Multi;
+    multi(...args: any[]): Multi;
+    exec(args: any[], callback?: ResCallbackT<any>): boolean;
+    exec(...args: any[]): boolean;
+    discard(args: any[], callback?: ResCallbackT<any>): boolean;
+    discard(...args: any[]): boolean;
+    sync(args: any[], callback?: ResCallbackT<any>): boolean;
+    sync(...args: any[]): boolean;
+    flushdb(args: any[], callback?: ResCallbackT<any>): boolean;
+    flushdb(...args: any[]): boolean;
+    flushall(args: any[], callback?: ResCallbackT<any>): boolean;
+    flushall(...args: any[]): boolean;
+    sort(args: any[], callback?: ResCallbackT<any>): boolean;
+    sort(...args: any[]): boolean;
+    info(args: any[], callback?: ResCallbackT<any>): boolean;
+    info(...args: any[]): boolean;
+    monitor(args: any[], callback?: ResCallbackT<any>): boolean;
+    monitor(...args: any[]): boolean;
+    ttl(args: any[], callback?: ResCallbackT<any>): boolean;
+    ttl(...args: any[]): boolean;
+    persist(args: any[], callback?: ResCallbackT<any>): boolean;
+    persist(...args: any[]): boolean;
+    slaveof(args: any[], callback?: ResCallbackT<any>): boolean;
+    slaveof(...args: any[]): boolean;
+    debug(args: any[], callback?: ResCallbackT<any>): boolean;
+    debug(...args: any[]): boolean;
+    config(args: any[], callback?: ResCallbackT<any>): boolean;
+    config(...args: any[]): boolean;
+    subscribe(args: any[], callback?: ResCallbackT<any>): boolean;
+    subscribe(...args: any[]): boolean;
+    unsubscribe(args: any[], callback?: ResCallbackT<any>): boolean;
+    unsubscribe(...args: any[]): boolean;
+    psubscribe(args: any[], callback?: ResCallbackT<any>): boolean;
+    psubscribe(...args: any[]): boolean;
+    punsubscribe(args: any[], callback?: ResCallbackT<any>): boolean;
+    punsubscribe(...args: any[]): boolean;
+    publish(args: any[], callback?: ResCallbackT<any>): boolean;
+    publish(...args: any[]): boolean;
+    watch(args: any[], callback?: ResCallbackT<any>): boolean;
+    watch(...args: any[]): boolean;
+    unwatch(args: any[], callback?: ResCallbackT<any>): boolean;
+    unwatch(...args: any[]): boolean;
+    cluster(args: any[], callback?: ResCallbackT<any>): boolean;
+    cluster(...args: any[]): boolean;
+    restore(args: any[], callback?: ResCallbackT<any>): boolean;
+    restore(...args: any[]): boolean;
+    migrate(args: any[], callback?: ResCallbackT<any>): boolean;
+    migrate(...args: any[]): boolean;
+    dump(args: any[], callback?: ResCallbackT<any>): boolean;
+    dump(...args: any[]): boolean;
+    object(args: any[], callback?: ResCallbackT<any>): boolean;
+    object(...args: any[]): boolean;
+    client(args: any[], callback?: ResCallbackT<any>): boolean;
+    client(...args: any[]): boolean;
+    eval(args: any[], callback?: ResCallbackT<any>): boolean;
+    eval(...args: any[]): boolean;
+    evalsha(args: any[], callback?: ResCallbackT<any>): boolean;
+    evalsha(...args: any[]): boolean;
+    script(args: any[], callback?: ResCallbackT<any>): boolean;
+    script(...args: any[]): boolean;
+    script(key: string, callback?: ResCallbackT<any>): boolean;
+    quit(args: any[], callback?: ResCallbackT<any>): boolean;
+    quit(...args: any[]): boolean;
+    scan(...args: any[]): boolean;
+    scan(args: any[], callback?: ResCallbackT<any>): boolean;
+    hscan(...args: any[]): boolean;
+    hscan(args: any[], callback?: ResCallbackT<any>): boolean;
+    zscan(...args: any[]): boolean;
+    zscan(args: any[], callback?: ResCallbackT<any>): boolean;
+}
+
+export interface Multi {
+    exec(callback?: ResCallbackT<any[]>): boolean;
+
+    get(args: any[], callback?: ResCallbackT<string>): Multi;
+    get(...args: any[]): Multi;
+    set(args: any[], callback?: ResCallbackT<string>): Multi;
+    set(...args: any[]): Multi;
+    setnx(args: any[], callback?: ResCallbackT<any>): Multi;
+    setnx(...args: any[]): Multi;
+    setex(args: any[], callback?: ResCallbackT<any>): Multi;
+    setex(...args: any[]): Multi;
+    append(args: any[], callback?: ResCallbackT<any>): Multi;
+    append(...args: any[]): Multi;
+    strlen(args: any[], callback?: ResCallbackT<any>): Multi;
+    strlen(...args: any[]): Multi;
+    del(args: any[], callback?: ResCallbackT<any>): Multi;
+    del(...args: any[]): Multi;
+    exists(args: any[], callback?: ResCallbackT<any>): Multi;
+    exists(...args: any[]): Multi;
+    setbit(args: any[], callback?: ResCallbackT<any>): Multi;
+    setbit(...args: any[]): Multi;
+    getbit(args: any[], callback?: ResCallbackT<any>): Multi;
+    getbit(...args: any[]): Multi;
+    setrange(args: any[], callback?: ResCallbackT<any>): Multi;
+    setrange(...args: any[]): Multi;
+    getrange(args: any[], callback?: ResCallbackT<any>): Multi;
+    getrange(...args: any[]): Multi;
+    substr(args: any[], callback?: ResCallbackT<any>): Multi;
+    substr(...args: any[]): Multi;
+    incr(args: any[], callback?: ResCallbackT<any>): Multi;
+    incr(...args: any[]): Multi;
+    decr(args: any[], callback?: ResCallbackT<any>): Multi;
+    decr(...args: any[]): Multi;
+    mget(args: any[], callback?: ResCallbackT<any>): Multi;
+    mget(...args: any[]): Multi;
+    rpush(...args: any[]): Multi;
+    lpush(args: any[], callback?: ResCallbackT<any>): Multi;
+    lpush(...args: any[]): Multi;
+    rpushx(args: any[], callback?: ResCallbackT<any>): Multi;
+    rpushx(...args: any[]): Multi;
+    lpushx(args: any[], callback?: ResCallbackT<any>): Multi;
+    lpushx(...args: any[]): Multi;
+    linsert(args: any[], callback?: ResCallbackT<any>): Multi;
+    linsert(...args: any[]): Multi;
+    rpop(args: any[], callback?: ResCallbackT<any>): Multi;
+    rpop(...args: any[]): Multi;
+    lpop(args: any[], callback?: ResCallbackT<any>): Multi;
+    lpop(...args: any[]): Multi;
+    brpop(args: any[], callback?: ResCallbackT<any>): Multi;
+    brpop(...args: any[]): Multi;
+    brpoplpush(args: any[], callback?: ResCallbackT<any>): Multi;
+    brpoplpush(...args: any[]): Multi;
+    blpop(args: any[], callback?: ResCallbackT<any>): Multi;
+    blpop(...args: any[]): Multi;
+    llen(args: any[], callback?: ResCallbackT<any>): Multi;
+    llen(...args: any[]): Multi;
+    lindex(args: any[], callback?: ResCallbackT<any>): Multi;
+    lindex(...args: any[]): Multi;
+    lset(args: any[], callback?: ResCallbackT<any>): Multi;
+    lset(...args: any[]): Multi;
+    lrange(args: any[], callback?: ResCallbackT<any>): Multi;
+    lrange(...args: any[]): Multi;
+    ltrim(args: any[], callback?: ResCallbackT<any>): Multi;
+    ltrim(...args: any[]): Multi;
+    lrem(args: any[], callback?: ResCallbackT<any>): Multi;
+    lrem(...args: any[]): Multi;
+    rpoplpush(args: any[], callback?: ResCallbackT<any>): Multi;
+    rpoplpush(...args: any[]): Multi;
+    sadd(args: any[], callback?: ResCallbackT<any>): Multi;
+    sadd(...args: any[]): Multi;
+    srem(args: any[], callback?: ResCallbackT<any>): Multi;
+    srem(...args: any[]): Multi;
+    smove(args: any[], callback?: ResCallbackT<any>): Multi;
+    smove(...args: any[]): Multi;
+    sismember(args: any[], callback?: ResCallbackT<any>): Multi;
+    sismember(...args: any[]): Multi;
+    scard(args: any[], callback?: ResCallbackT<any>): Multi;
+    scard(...args: any[]): Multi;
+    spop(args: any[], callback?: ResCallbackT<any>): Multi;
+    spop(...args: any[]): Multi;
+    srandmember(args: any[], callback?: ResCallbackT<any>): Multi;
+    srandmember(...args: any[]): Multi;
+    sinter(args: any[], callback?: ResCallbackT<any>): Multi;
+    sinter(...args: any[]): Multi;
+    sinterstore(args: any[], callback?: ResCallbackT<any>): Multi;
+    sinterstore(...args: any[]): Multi;
+    sunion(args: any[], callback?: ResCallbackT<any>): Multi;
+    sunion(...args: any[]): Multi;
+    sunionstore(args: any[], callback?: ResCallbackT<any>): Multi;
+    sunionstore(...args: any[]): Multi;
+    sdiff(args: any[], callback?: ResCallbackT<any>): Multi;
+    sdiff(...args: any[]): Multi;
+    sdiffstore(args: any[], callback?: ResCallbackT<any>): Multi;
+    sdiffstore(...args: any[]): Multi;
+    smembers(args: any[], callback?: ResCallbackT<any>): Multi;
+    smembers(...args: any[]): Multi;
+    zadd(args: any[], callback?: ResCallbackT<any>): Multi;
+    zadd(...args: any[]): Multi;
+    zincrby(args: any[], callback?: ResCallbackT<any>): Multi;
+    zincrby(...args: any[]): Multi;
+    zrem(args: any[], callback?: ResCallbackT<any>): Multi;
+    zrem(...args: any[]): Multi;
+    zremrangebyscore(args: any[], callback?: ResCallbackT<any>): Multi;
+    zremrangebyscore(...args: any[]): Multi;
+    zremrangebyrank(args: any[], callback?: ResCallbackT<any>): Multi;
+    zremrangebyrank(...args: any[]): Multi;
+    zunionstore(args: any[], callback?: ResCallbackT<any>): Multi;
+    zunionstore(...args: any[]): Multi;
+    zinterstore(args: any[], callback?: ResCallbackT<any>): Multi;
+    zinterstore(...args: any[]): Multi;
+    zrange(args: any[], callback?: ResCallbackT<any>): Multi;
+    zrange(...args: any[]): Multi;
+    zrangebyscore(args: any[], callback?: ResCallbackT<any>): Multi;
+    zrangebyscore(...args: any[]): Multi;
+    zrevrangebyscore(args: any[], callback?: ResCallbackT<any>): Multi;
+    zrevrangebyscore(...args: any[]): Multi;
+    zcount(args: any[], callback?: ResCallbackT<any>): Multi;
+    zcount(...args: any[]): Multi;
+    zrevrange(args: any[], callback?: ResCallbackT<any>): Multi;
+    zrevrange(...args: any[]): Multi;
+    zcard(args: any[], callback?: ResCallbackT<any>): Multi;
+    zcard(...args: any[]): Multi;
+    zscore(args: any[], callback?: ResCallbackT<any>): Multi;
+    zscore(...args: any[]): Multi;
+    zrank(args: any[], callback?: ResCallbackT<any>): Multi;
+    zrank(...args: any[]): Multi;
+    zrevrank(args: any[], callback?: ResCallbackT<any>): Multi;
+    zrevrank(...args: any[]): Multi;
+    hset(args: any[], callback?: ResCallbackT<any>): Multi;
+    hset(...args: any[]): Multi;
+    hsetnx(args: any[], callback?: ResCallbackT<any>): Multi;
+    hsetnx(...args: any[]): Multi;
+    hget(args: any[], callback?: ResCallbackT<any>): Multi;
+    hget(...args: any[]): Multi;
+    hmset(args: any[], callback?: ResCallbackT<any>): Multi;
+    hmset(key: string, hash: any, callback?: ResCallbackT<any>): Multi;
+    hmset(...args: any[]): Multi;
+    hmget(args: any[], callback?: ResCallbackT<any>): Multi;
+    hmget(...args: any[]): Multi;
+    hincrby(args: any[], callback?: ResCallbackT<any>): Multi;
+    hincrby(...args: any[]): Multi;
+    hdel(args: any[], callback?: ResCallbackT<any>): Multi;
+    hdel(...args: any[]): Multi;
+    hlen(args: any[], callback?: ResCallbackT<any>): Multi;
+    hlen(...args: any[]): Multi;
+    hkeys(args: any[], callback?: ResCallbackT<any>): Multi;
+    hkeys(...args: any[]): Multi;
+    hvals(args: any[], callback?: ResCallbackT<any>): Multi;
+    hvals(...args: any[]): Multi;
+    hgetall(args: any[], callback?: ResCallbackT<any>): Multi;
+    hgetall(...args: any[]): Multi;
+    hgetall(key: string, callback?: ResCallbackT<any>): Multi;
+    hexists(args: any[], callback?: ResCallbackT<any>): Multi;
+    hexists(...args: any[]): Multi;
+    incrby(args: any[], callback?: ResCallbackT<any>): Multi;
+    incrby(...args: any[]): Multi;
+    decrby(args: any[], callback?: ResCallbackT<any>): Multi;
+    decrby(...args: any[]): Multi;
+    getset(args: any[], callback?: ResCallbackT<any>): Multi;
+    getset(...args: any[]): Multi;
+    mset(args: any[], callback?: ResCallbackT<any>): Multi;
+    mset(...args: any[]): Multi;
+    msetnx(args: any[], callback?: ResCallbackT<any>): Multi;
+    msetnx(...args: any[]): Multi;
+    randomkey(args: any[], callback?: ResCallbackT<any>): Multi;
+    randomkey(...args: any[]): Multi;
+    select(args: any[], callback?: ResCallbackT<any>): void;
+    select(...args: any[]): Multi;
+    move(args: any[], callback?: ResCallbackT<any>): Multi;
+    move(...args: any[]): Multi;
+    rename(args: any[], callback?: ResCallbackT<any>): Multi;
+    rename(...args: any[]): Multi;
+    renamenx(args: any[], callback?: ResCallbackT<any>): Multi;
+    renamenx(...args: any[]): Multi;
+    expire(args: any[], callback?: ResCallbackT<any>): Multi;
+    expire(...args: any[]): Multi;
+    expireat(args: any[], callback?: ResCallbackT<any>): Multi;
+    expireat(...args: any[]): Multi;
+    keys(args: any[], callback?: ResCallbackT<any>): Multi;
+    keys(...args: any[]): Multi;
+    dbsize(args: any[], callback?: ResCallbackT<any>): Multi;
+    dbsize(...args: any[]): Multi;
+    auth(args: any[], callback?: ResCallbackT<any>): void;
+    auth(...args: any[]): void;
+    ping(args: any[], callback?: ResCallbackT<any>): Multi;
+    ping(...args: any[]): Multi;
+    echo(args: any[], callback?: ResCallbackT<any>): Multi;
+    echo(...args: any[]): Multi;
+    save(args: any[], callback?: ResCallbackT<any>): Multi;
+    save(...args: any[]): Multi;
+    bgsave(args: any[], callback?: ResCallbackT<any>): Multi;
+    bgsave(...args: any[]): Multi;
+    bgrewriteaof(args: any[], callback?: ResCallbackT<any>): Multi;
+    bgrewriteaof(...args: any[]): Multi;
+    shutdown(args: any[], callback?: ResCallbackT<any>): Multi;
+    shutdown(...args: any[]): Multi;
+    lastsave(args: any[], callback?: ResCallbackT<any>): Multi;
+    lastsave(...args: any[]): Multi;
+    type(args: any[], callback?: ResCallbackT<any>): Multi;
+    type(...args: any[]): Multi;
+    multi(args: any[], callback?: ResCallbackT<any>): Multi;
+    multi(...args: any[]): Multi;
+    exec(args: any[], callback?: ResCallbackT<any>): Multi;
+    exec(...args: any[]): Multi;
+    discard(args: any[], callback?: ResCallbackT<any>): Multi;
+    discard(...args: any[]): Multi;
+    sync(args: any[], callback?: ResCallbackT<any>): Multi;
+    sync(...args: any[]): Multi;
+    flushdb(args: any[], callback?: ResCallbackT<any>): Multi;
+    flushdb(...args: any[]): Multi;
+    flushall(args: any[], callback?: ResCallbackT<any>): Multi;
+    flushall(...args: any[]): Multi;
+    sort(args: any[], callback?: ResCallbackT<any>): Multi;
+    sort(...args: any[]): Multi;
+    info(args: any[], callback?: ResCallbackT<any>): Multi;
+    info(...args: any[]): Multi;
+    monitor(args: any[], callback?: ResCallbackT<any>): Multi;
+    monitor(...args: any[]): Multi;
+    ttl(args: any[], callback?: ResCallbackT<any>): Multi;
+    ttl(...args: any[]): Multi;
+    persist(args: any[], callback?: ResCallbackT<any>): Multi;
+    persist(...args: any[]): Multi;
+    slaveof(args: any[], callback?: ResCallbackT<any>): Multi;
+    slaveof(...args: any[]): Multi;
+    debug(args: any[], callback?: ResCallbackT<any>): Multi;
+    debug(...args: any[]): Multi;
+    config(args: any[], callback?: ResCallbackT<any>): Multi;
+    config(...args: any[]): Multi;
+    subscribe(args: any[], callback?: ResCallbackT<any>): Multi;
+    subscribe(...args: any[]): Multi;
+    unsubscribe(args: any[], callback?: ResCallbackT<any>): Multi;
+    unsubscribe(...args: any[]): Multi;
+    psubscribe(args: any[], callback?: ResCallbackT<any>): Multi;
+    psubscribe(...args: any[]): Multi;
+    punsubscribe(args: any[], callback?: ResCallbackT<any>): Multi;
+    punsubscribe(...args: any[]): Multi;
+    publish(args: any[], callback?: ResCallbackT<any>): Multi;
+    publish(...args: any[]): Multi;
+    watch(args: any[], callback?: ResCallbackT<any>): Multi;
+    watch(...args: any[]): Multi;
+    unwatch(args: any[], callback?: ResCallbackT<any>): Multi;
+    unwatch(...args: any[]): Multi;
+    cluster(args: any[], callback?: ResCallbackT<any>): Multi;
+    cluster(...args: any[]): Multi;
+    restore(args: any[], callback?: ResCallbackT<any>): Multi;
+    restore(...args: any[]): Multi;
+    migrate(args: any[], callback?: ResCallbackT<any>): Multi;
+    migrate(...args: any[]): Multi;
+    dump(args: any[], callback?: ResCallbackT<any>): Multi;
+    dump(...args: any[]): Multi;
+    object(args: any[], callback?: ResCallbackT<any>): Multi;
+    object(...args: any[]): Multi;
+    client(args: any[], callback?: ResCallbackT<any>): Multi;
+    client(...args: any[]): Multi;
+    eval(args: any[], callback?: ResCallbackT<any>): Multi;
+    eval(...args: any[]): Multi;
+    evalsha(args: any[], callback?: ResCallbackT<any>): Multi;
+    evalsha(...args: any[]): Multi;
+    quit(args: any[], callback?: ResCallbackT<any>): Multi;
+    quit(...args: any[]): Multi;
+    scan(...args: any[]): Multi;
+    scan(args: any[], callback?: ResCallbackT<any>): Multi;
+    hscan(...args: any[]): Multi;
+    hscan(args: any[], callback?: ResCallbackT<any>): Multi;
+    zscan(...args: any[]): Multi;
+    zscan(args: any[], callback?: ResCallbackT<any>): Multi;
+}
diff --git a/redis/redis-tests.ts b/redis/redis-tests.ts
index 5acb02465e..689e64ba16 100644
--- a/redis/redis-tests.ts
+++ b/redis/redis-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="redis.d.ts" />
 
 import redis = require('redis');
 
diff --git a/redis/redis.d.ts b/redis/redis.d.ts
deleted file mode 100644
index d76b35f501..0000000000
--- a/redis/redis.d.ts
+++ /dev/null
@@ -1,642 +0,0 @@
-// Type definitions for redis 0.12.1
-// Project: https://github.com/mranney/node_redis
-// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>, Peter Harris <https://github.com/CodeAnimal>, TANAKA Koichi <https://github.com/MugeSo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/redis.d.ts
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "redis" {
-    export function createClient(port_arg:number, host_arg?:string, options?:ClientOpts):RedisClient;
-    export function createClient(unix_socket:string, options?:ClientOpts):RedisClient;
-    export function createClient(options?:ClientOpts):RedisClient;
-
-    export function print(err:Error, reply:any):void;
-
-    export var debug_mode:boolean;
-
-    export interface MessageHandler<M> {
-        (channel:string, message:M): void;
-    }
-
-    export interface CommandT<R> { //This is a placeholder to be used eventually, to not have to define each command twice, or four times if all caps versions are to be implemented.
-        (args:any[], callback?:ResCallbackT<R>): void;
-        (...args:any[]): void;
-    }
-
-    export interface ResCallbackT<R> {
-        (err:Error, res:R): void;
-    }
-
-    export interface ServerInfo {
-        redis_version: string;
-        versions: number[];
-    }
-
-    export interface ClientOpts {
-        parser?: string;
-        return_buffers?: boolean;
-        detect_buffers?: boolean;
-        socket_nodelay?: boolean;
-        socket_keepalive?: boolean;
-        no_ready_check?: boolean;
-        enable_offline_queue?: boolean;
-        retry_max_delay?: number;
-        connect_timeout?: number;
-        max_attempts?: number;
-        auth_pass?: string;
-        password?: string;
-        family?: string;
-        command_queue_high_water?: number;
-        command_queue_low_water?: number;
-    }
-
-    export interface RedisClient extends NodeJS.EventEmitter {
-        // event: connect
-        // event: error
-        // event: message
-        // event: pmessage
-        // event: subscribe
-        // event: psubscribe
-        // event: unsubscribe
-        // event: punsubscribe
-
-        connected: boolean;
-        retry_delay: number;
-        retry_backoff: number;
-        command_queue: any[];
-        offline_queue: any[];
-        server_info: ServerInfo;
-
-        end(): void;
-        unref(): void;
-
-        // Low level command execution
-        send_command(command:string, ...args:any[]): boolean;
-
-        // Connection (http://redis.io/commands#connection)
-        auth(password:string, callback?:ResCallbackT<any>): boolean;
-        ping(callback?:ResCallbackT<number>): boolean;
-
-        // Strings (http://redis.io/commands#strings)
-        append(key:string, value:string, callback?:ResCallbackT<number>): boolean;
-        bitcount(key:string, callback?:ResCallbackT<number>): boolean;
-        bitcount(key:string, start:number, end:number, callback?:ResCallbackT<number>): boolean;
-        set(key:string, value:string, callback?:ResCallbackT<string>): boolean;
-        get(key:string, callback?:ResCallbackT<string>): boolean;
-        exists(key:string, value:string, callback?:ResCallbackT<number>): boolean;
-
-        publish(channel:string, value:any): boolean;
-        subscribe(channel:string): boolean;
-
-        /*
-         commands = set_union([
-         "get", "set", "setnx", "setex", "append", "strlen", "del", "exists", "setbit", "getbit", "setrange", "getrange", "substr",
-         "incr", "decr", "mget", "rpush", "lpush", "rpushx", "lpushx", "linsert", "rpop", "lpop", "brpop", "brpoplpush", "blpop", "llen", "lindex",
-         "lset", "lrange", "ltrim", "lrem", "rpoplpush", "sadd", "srem", "smove", "sismember", "scard", "spop", "srandmember", "sinter", "sinterstore",
-         "sunion", "sunionstore", "sdiff", "sdiffstore", "smembers", "zadd", "zincrby", "zrem", "zremrangebyscore", "zremrangebyrank", "zunionstore",
-         "zinterstore", "zrange", "zrangebyscore", "zrevrangebyscore", "zcount", "zrevrange", "zcard", "zscore", "zrank", "zrevrank", "hset", "hsetnx",
-         "hget", "hmset", "hmget", "hincrby", "hdel", "hlen", "hkeys", "hvals", "hgetall", "hexists", "incrby", "decrby", "getset", "mset", "msetnx",
-         "randomkey", "select", "move", "rename", "renamenx", "expire", "expireat", "keys", "dbsize", "auth", "ping", "echo", "save", "bgsave",
-         "bgrewriteaof", "shutdown", "lastsave", "type", "multi", "exec", "discard", "sync", "flushdb", "flushall", "sort", "info", "monitor", "ttl",
-         "persist", "slaveof", "debug", "config", "subscribe", "unsubscribe", "psubscribe", "punsubscribe", "publish", "watch", "unwatch", "cluster",
-         "restore", "migrate", "dump", "object", "client", "eval", "evalsha"], require("./lib/commands"));
-         */
-
-        get(args:any[], callback?:ResCallbackT<string>): boolean;
-        get(...args:any[]): boolean;
-        set(args:any[], callback?:ResCallbackT<string>): boolean;
-        set(...args:any[]): boolean;
-        setnx(args:any[], callback?:ResCallbackT<any>): boolean;
-        setnx(...args:any[]): boolean;
-        setex(args:any[], callback?:ResCallbackT<any>): boolean;
-        setex(...args:any[]): boolean;
-        append(args:any[], callback?:ResCallbackT<any>): boolean;
-        append(...args:any[]): boolean;
-        strlen(args:any[], callback?:ResCallbackT<any>): boolean;
-        strlen(...args:any[]): boolean;
-        del(args:any[], callback?:ResCallbackT<any>): boolean;
-        del(...args:any[]): boolean;
-        exists(args:any[], callback?:ResCallbackT<any>): boolean;
-        exists(...args:any[]): boolean;
-        setbit(args:any[], callback?:ResCallbackT<any>): boolean;
-        setbit(...args:any[]): boolean;
-        getbit(args:any[], callback?:ResCallbackT<any>): boolean;
-        getbit(...args:any[]): boolean;
-        setrange(args:any[], callback?:ResCallbackT<any>): boolean;
-        setrange(...args:any[]): boolean;
-        getrange(args:any[], callback?:ResCallbackT<any>): boolean;
-        getrange(...args:any[]): boolean;
-        substr(args:any[], callback?:ResCallbackT<any>): boolean;
-        substr(...args:any[]): boolean;
-        incr(args:any[], callback?:ResCallbackT<any>): boolean;
-        incr(...args:any[]): boolean;
-        decr(args:any[], callback?:ResCallbackT<any>): boolean;
-        decr(...args:any[]): boolean;
-        mget(args:any[], callback?:ResCallbackT<any>): boolean;
-        mget(...args:any[]): boolean;
-        rpush(...args:any[]): boolean;
-        lpush(args:any[], callback?:ResCallbackT<any>): boolean;
-        lpush(...args:any[]): boolean;
-        rpushx(args:any[], callback?:ResCallbackT<any>): boolean;
-        rpushx(...args:any[]): boolean;
-        lpushx(args:any[], callback?:ResCallbackT<any>): boolean;
-        lpushx(...args:any[]): boolean;
-        linsert(args:any[], callback?:ResCallbackT<any>): boolean;
-        linsert(...args:any[]): boolean;
-        rpop(args:any[], callback?:ResCallbackT<any>): boolean;
-        rpop(...args:any[]): boolean;
-        lpop(args:any[], callback?:ResCallbackT<any>): boolean;
-        lpop(...args:any[]): boolean;
-        brpop(args:any[], callback?:ResCallbackT<any>): boolean;
-        brpop(...args:any[]): boolean;
-        brpoplpush(args:any[], callback?:ResCallbackT<any>): boolean;
-        brpoplpush(...args:any[]): boolean;
-        blpop(args:any[], callback?:ResCallbackT<any>): boolean;
-        blpop(...args:any[]): boolean;
-        llen(args:any[], callback?:ResCallbackT<any>): boolean;
-        llen(...args:any[]): boolean;
-        lindex(args:any[], callback?:ResCallbackT<any>): boolean;
-        lindex(...args:any[]): boolean;
-        lset(args:any[], callback?:ResCallbackT<any>): boolean;
-        lset(...args:any[]): boolean;
-        lrange(args:any[], callback?:ResCallbackT<any>): boolean;
-        lrange(...args:any[]): boolean;
-        ltrim(args:any[], callback?:ResCallbackT<any>): boolean;
-        ltrim(...args:any[]): boolean;
-        lrem(args:any[], callback?:ResCallbackT<any>): boolean;
-        lrem(...args:any[]): boolean;
-        rpoplpush(args:any[], callback?:ResCallbackT<any>): boolean;
-        rpoplpush(...args:any[]): boolean;
-        sadd(args:any[], callback?:ResCallbackT<any>): boolean;
-        sadd(...args:any[]): boolean;
-        srem(args:any[], callback?:ResCallbackT<any>): boolean;
-        srem(...args:any[]): boolean;
-        smove(args:any[], callback?:ResCallbackT<any>): boolean;
-        smove(...args:any[]): boolean;
-        sismember(args:any[], callback?:ResCallbackT<any>): boolean;
-        sismember(...args:any[]): boolean;
-        scard(args:any[], callback?:ResCallbackT<any>): boolean;
-        scard(...args:any[]): boolean;
-        spop(args:any[], callback?:ResCallbackT<any>): boolean;
-        spop(...args:any[]): boolean;
-        srandmember(args:any[], callback?:ResCallbackT<any>): boolean;
-        srandmember(...args:any[]): boolean;
-        sinter(args:any[], callback?:ResCallbackT<any>): boolean;
-        sinter(...args:any[]): boolean;
-        sinterstore(args:any[], callback?:ResCallbackT<any>): boolean;
-        sinterstore(...args:any[]): boolean;
-        sunion(args:any[], callback?:ResCallbackT<any>): boolean;
-        sunion(...args:any[]): boolean;
-        sunionstore(args:any[], callback?:ResCallbackT<any>): boolean;
-        sunionstore(...args:any[]): boolean;
-        sdiff(args:any[], callback?:ResCallbackT<any>): boolean;
-        sdiff(...args:any[]): boolean;
-        sdiffstore(args:any[], callback?:ResCallbackT<any>): boolean;
-        sdiffstore(...args:any[]): boolean;
-        smembers(args:any[], callback?:ResCallbackT<any>): boolean;
-        smembers(...args:any[]): boolean;
-        zadd(args:any[], callback?:ResCallbackT<any>): boolean;
-        zadd(...args:any[]): boolean;
-        zincrby(args:any[], callback?:ResCallbackT<any>): boolean;
-        zincrby(...args:any[]): boolean;
-        zrem(args:any[], callback?:ResCallbackT<any>): boolean;
-        zrem(...args:any[]): boolean;
-        zremrangebyscore(args:any[], callback?:ResCallbackT<any>): boolean;
-        zremrangebyscore(...args:any[]): boolean;
-        zremrangebyrank(args:any[], callback?:ResCallbackT<any>): boolean;
-        zremrangebyrank(...args:any[]): boolean;
-        zunionstore(args:any[], callback?:ResCallbackT<any>): boolean;
-        zunionstore(...args:any[]): boolean;
-        zinterstore(args:any[], callback?:ResCallbackT<any>): boolean;
-        zinterstore(...args:any[]): boolean;
-        zrange(args:any[], callback?:ResCallbackT<any>): boolean;
-        zrange(...args:any[]): boolean;
-        zrangebyscore(args:any[], callback?:ResCallbackT<any>): boolean;
-        zrangebyscore(...args:any[]): boolean;
-        zrevrangebyscore(args:any[], callback?:ResCallbackT<any>): boolean;
-        zrevrangebyscore(...args:any[]): boolean;
-        zcount(args:any[], callback?:ResCallbackT<any>): boolean;
-        zcount(...args:any[]): boolean;
-        zrevrange(args:any[], callback?:ResCallbackT<any>): boolean;
-        zrevrange(...args:any[]): boolean;
-        zcard(args:any[], callback?:ResCallbackT<any>): boolean;
-        zcard(...args:any[]): boolean;
-        zscore(args:any[], callback?:ResCallbackT<any>): boolean;
-        zscore(...args:any[]): boolean;
-        zrank(args:any[], callback?:ResCallbackT<any>): boolean;
-        zrank(...args:any[]): boolean;
-        zrevrank(args:any[], callback?:ResCallbackT<any>): boolean;
-        zrevrank(...args:any[]): boolean;
-        hset(args:any[], callback?:ResCallbackT<any>): boolean;
-        hset(...args:any[]): boolean;
-        hsetnx(args:any[], callback?:ResCallbackT<any>): boolean;
-        hsetnx(...args:any[]): boolean;
-        hget(args:any[], callback?:ResCallbackT<any>): boolean;
-        hget(...args:any[]): boolean;
-        hmset(args:any[], callback?:ResCallbackT<any>): boolean;
-        hmset(key:string, hash:any, callback?:ResCallbackT<any>): boolean;
-        hmset(...args:any[]): boolean;
-        hmget(args:any[], callback?:ResCallbackT<any>): boolean;
-        hmget(...args:any[]): boolean;
-        hincrby(args:any[], callback?:ResCallbackT<any>): boolean;
-        hincrby(...args:any[]): boolean;
-        hdel(args:any[], callback?:ResCallbackT<any>): boolean;
-        hdel(...args:any[]): boolean;
-        hlen(args:any[], callback?:ResCallbackT<any>): boolean;
-        hlen(...args:any[]): boolean;
-        hkeys(args:any[], callback?:ResCallbackT<any>): boolean;
-        hkeys(...args:any[]): boolean;
-        hvals(args:any[], callback?:ResCallbackT<any>): boolean;
-        hvals(...args:any[]): boolean;
-        hgetall(args:any[], callback?:ResCallbackT<any>): boolean;
-        hgetall(...args:any[]): boolean;
-        hgetall(key:string, callback?:ResCallbackT<any>): boolean;
-        hexists(args:any[], callback?:ResCallbackT<any>): boolean;
-        hexists(...args:any[]): boolean;
-        incrby(args:any[], callback?:ResCallbackT<any>): boolean;
-        incrby(...args:any[]): boolean;
-        decrby(args:any[], callback?:ResCallbackT<any>): boolean;
-        decrby(...args:any[]): boolean;
-        getset(args:any[], callback?:ResCallbackT<any>): boolean;
-        getset(...args:any[]): boolean;
-        mset(args:any[], callback?:ResCallbackT<any>): boolean;
-        mset(...args:any[]): boolean;
-        msetnx(args:any[], callback?:ResCallbackT<any>): boolean;
-        msetnx(...args:any[]): boolean;
-        randomkey(args:any[], callback?:ResCallbackT<any>): boolean;
-        randomkey(...args:any[]): boolean;
-        select(args:any[], callback?:ResCallbackT<any>): void;
-        select(...args:any[]): void;
-        move(args:any[], callback?:ResCallbackT<any>): boolean;
-        move(...args:any[]): boolean;
-        rename(args:any[], callback?:ResCallbackT<any>): boolean;
-        rename(...args:any[]): boolean;
-        renamenx(args:any[], callback?:ResCallbackT<any>): boolean;
-        renamenx(...args:any[]): boolean;
-        expire(args:any[], callback?:ResCallbackT<any>): boolean;
-        expire(...args:any[]): boolean;
-        expireat(args:any[], callback?:ResCallbackT<any>): boolean;
-        expireat(...args:any[]): boolean;
-        keys(args:any[], callback?:ResCallbackT<any>): boolean;
-        keys(...args:any[]): boolean;
-        dbsize(args:any[], callback?:ResCallbackT<any>): boolean;
-        dbsize(...args:any[]): boolean;
-        auth(args:any[], callback?:ResCallbackT<any>): void;
-        auth(...args:any[]): void;
-        ping(args:any[], callback?:ResCallbackT<any>): boolean;
-        ping(...args:any[]): boolean;
-        echo(args:any[], callback?:ResCallbackT<any>): boolean;
-        echo(...args:any[]): boolean;
-        save(args:any[], callback?:ResCallbackT<any>): boolean;
-        save(...args:any[]): boolean;
-        bgsave(args:any[], callback?:ResCallbackT<any>): boolean;
-        bgsave(...args:any[]): boolean;
-        bgrewriteaof(args:any[], callback?:ResCallbackT<any>): boolean;
-        bgrewriteaof(...args:any[]): boolean;
-        shutdown(args:any[], callback?:ResCallbackT<any>): boolean;
-        shutdown(...args:any[]): boolean;
-        lastsave(args:any[], callback?:ResCallbackT<any>): boolean;
-        lastsave(...args:any[]): boolean;
-        type(args:any[], callback?:ResCallbackT<any>): boolean;
-        type(...args:any[]): boolean;
-        multi(args:any[], callback?:ResCallbackT<any>): Multi;
-        multi(...args:any[]): Multi;
-        exec(args:any[], callback?:ResCallbackT<any>): boolean;
-        exec(...args:any[]): boolean;
-        discard(args:any[], callback?:ResCallbackT<any>): boolean;
-        discard(...args:any[]): boolean;
-        sync(args:any[], callback?:ResCallbackT<any>): boolean;
-        sync(...args:any[]): boolean;
-        flushdb(args:any[], callback?:ResCallbackT<any>): boolean;
-        flushdb(...args:any[]): boolean;
-        flushall(args:any[], callback?:ResCallbackT<any>): boolean;
-        flushall(...args:any[]): boolean;
-        sort(args:any[], callback?:ResCallbackT<any>): boolean;
-        sort(...args:any[]): boolean;
-        info(args:any[], callback?:ResCallbackT<any>): boolean;
-        info(...args:any[]): boolean;
-        monitor(args:any[], callback?:ResCallbackT<any>): boolean;
-        monitor(...args:any[]): boolean;
-        ttl(args:any[], callback?:ResCallbackT<any>): boolean;
-        ttl(...args:any[]): boolean;
-        persist(args:any[], callback?:ResCallbackT<any>): boolean;
-        persist(...args:any[]): boolean;
-        slaveof(args:any[], callback?:ResCallbackT<any>): boolean;
-        slaveof(...args:any[]): boolean;
-        debug(args:any[], callback?:ResCallbackT<any>): boolean;
-        debug(...args:any[]): boolean;
-        config(args:any[], callback?:ResCallbackT<any>): boolean;
-        config(...args:any[]): boolean;
-        subscribe(args:any[], callback?:ResCallbackT<any>): boolean;
-        subscribe(...args:any[]): boolean;
-        unsubscribe(args:any[], callback?:ResCallbackT<any>): boolean;
-        unsubscribe(...args:any[]): boolean;
-        psubscribe(args:any[], callback?:ResCallbackT<any>): boolean;
-        psubscribe(...args:any[]): boolean;
-        punsubscribe(args:any[], callback?:ResCallbackT<any>): boolean;
-        punsubscribe(...args:any[]): boolean;
-        publish(args:any[], callback?:ResCallbackT<any>): boolean;
-        publish(...args:any[]): boolean;
-        watch(args:any[], callback?:ResCallbackT<any>): boolean;
-        watch(...args:any[]): boolean;
-        unwatch(args:any[], callback?:ResCallbackT<any>): boolean;
-        unwatch(...args:any[]): boolean;
-        cluster(args:any[], callback?:ResCallbackT<any>): boolean;
-        cluster(...args:any[]): boolean;
-        restore(args:any[], callback?:ResCallbackT<any>): boolean;
-        restore(...args:any[]): boolean;
-        migrate(args:any[], callback?:ResCallbackT<any>): boolean;
-        migrate(...args:any[]): boolean;
-        dump(args:any[], callback?:ResCallbackT<any>): boolean;
-        dump(...args:any[]): boolean;
-        object(args:any[], callback?:ResCallbackT<any>): boolean;
-        object(...args:any[]): boolean;
-        client(args:any[], callback?:ResCallbackT<any>): boolean;
-        client(...args:any[]): boolean;
-        eval(args:any[], callback?:ResCallbackT<any>): boolean;
-        eval(...args:any[]): boolean;
-        evalsha(args:any[], callback?:ResCallbackT<any>): boolean;
-        evalsha(...args:any[]): boolean;
-        script(args:any[], callback?:ResCallbackT<any>): boolean;
-        script(...args: any[]): boolean;
-        script(key: string, callback?: ResCallbackT<any>): boolean;
-        quit(args:any[], callback?:ResCallbackT<any>): boolean;
-        quit(...args:any[]): boolean;
-        scan(...args:any[]): boolean;
-        scan(args:any[], callback?:ResCallbackT<any>): boolean;
-        hscan(...args:any[]): boolean;
-        hscan(args:any[], callback?:ResCallbackT<any>): boolean;
-        zscan(...args:any[]): boolean;
-        zscan(args:any[], callback?:ResCallbackT<any>): boolean;
-    }
-
-    export interface Multi {
-        exec(callback?:ResCallbackT<any[]>): boolean;
-
-        get(args:any[], callback?:ResCallbackT<string>): Multi;
-        get(...args:any[]): Multi;
-        set(args:any[], callback?:ResCallbackT<string>): Multi;
-        set(...args:any[]): Multi;
-        setnx(args:any[], callback?:ResCallbackT<any>): Multi;
-        setnx(...args:any[]): Multi;
-        setex(args:any[], callback?:ResCallbackT<any>): Multi;
-        setex(...args:any[]): Multi;
-        append(args:any[], callback?:ResCallbackT<any>): Multi;
-        append(...args:any[]): Multi;
-        strlen(args:any[], callback?:ResCallbackT<any>): Multi;
-        strlen(...args:any[]): Multi;
-        del(args:any[], callback?:ResCallbackT<any>): Multi;
-        del(...args:any[]): Multi;
-        exists(args:any[], callback?:ResCallbackT<any>): Multi;
-        exists(...args:any[]): Multi;
-        setbit(args:any[], callback?:ResCallbackT<any>): Multi;
-        setbit(...args:any[]): Multi;
-        getbit(args:any[], callback?:ResCallbackT<any>): Multi;
-        getbit(...args:any[]): Multi;
-        setrange(args:any[], callback?:ResCallbackT<any>): Multi;
-        setrange(...args:any[]): Multi;
-        getrange(args:any[], callback?:ResCallbackT<any>): Multi;
-        getrange(...args:any[]): Multi;
-        substr(args:any[], callback?:ResCallbackT<any>): Multi;
-        substr(...args:any[]): Multi;
-        incr(args:any[], callback?:ResCallbackT<any>): Multi;
-        incr(...args:any[]): Multi;
-        decr(args:any[], callback?:ResCallbackT<any>): Multi;
-        decr(...args:any[]): Multi;
-        mget(args:any[], callback?:ResCallbackT<any>): Multi;
-        mget(...args:any[]): Multi;
-        rpush(...args:any[]): Multi;
-        lpush(args:any[], callback?:ResCallbackT<any>): Multi;
-        lpush(...args:any[]): Multi;
-        rpushx(args:any[], callback?:ResCallbackT<any>): Multi;
-        rpushx(...args:any[]): Multi;
-        lpushx(args:any[], callback?:ResCallbackT<any>): Multi;
-        lpushx(...args:any[]): Multi;
-        linsert(args:any[], callback?:ResCallbackT<any>): Multi;
-        linsert(...args:any[]): Multi;
-        rpop(args:any[], callback?:ResCallbackT<any>): Multi;
-        rpop(...args:any[]): Multi;
-        lpop(args:any[], callback?:ResCallbackT<any>): Multi;
-        lpop(...args:any[]): Multi;
-        brpop(args:any[], callback?:ResCallbackT<any>): Multi;
-        brpop(...args:any[]): Multi;
-        brpoplpush(args:any[], callback?:ResCallbackT<any>): Multi;
-        brpoplpush(...args:any[]): Multi;
-        blpop(args:any[], callback?:ResCallbackT<any>): Multi;
-        blpop(...args:any[]): Multi;
-        llen(args:any[], callback?:ResCallbackT<any>): Multi;
-        llen(...args:any[]): Multi;
-        lindex(args:any[], callback?:ResCallbackT<any>): Multi;
-        lindex(...args:any[]): Multi;
-        lset(args:any[], callback?:ResCallbackT<any>): Multi;
-        lset(...args:any[]): Multi;
-        lrange(args:any[], callback?:ResCallbackT<any>): Multi;
-        lrange(...args:any[]): Multi;
-        ltrim(args:any[], callback?:ResCallbackT<any>): Multi;
-        ltrim(...args:any[]): Multi;
-        lrem(args:any[], callback?:ResCallbackT<any>): Multi;
-        lrem(...args:any[]): Multi;
-        rpoplpush(args:any[], callback?:ResCallbackT<any>): Multi;
-        rpoplpush(...args:any[]): Multi;
-        sadd(args:any[], callback?:ResCallbackT<any>): Multi;
-        sadd(...args:any[]): Multi;
-        srem(args:any[], callback?:ResCallbackT<any>): Multi;
-        srem(...args:any[]): Multi;
-        smove(args:any[], callback?:ResCallbackT<any>): Multi;
-        smove(...args:any[]): Multi;
-        sismember(args:any[], callback?:ResCallbackT<any>): Multi;
-        sismember(...args:any[]): Multi;
-        scard(args:any[], callback?:ResCallbackT<any>): Multi;
-        scard(...args:any[]): Multi;
-        spop(args:any[], callback?:ResCallbackT<any>): Multi;
-        spop(...args:any[]): Multi;
-        srandmember(args:any[], callback?:ResCallbackT<any>): Multi;
-        srandmember(...args:any[]): Multi;
-        sinter(args:any[], callback?:ResCallbackT<any>): Multi;
-        sinter(...args:any[]): Multi;
-        sinterstore(args:any[], callback?:ResCallbackT<any>): Multi;
-        sinterstore(...args:any[]): Multi;
-        sunion(args:any[], callback?:ResCallbackT<any>): Multi;
-        sunion(...args:any[]): Multi;
-        sunionstore(args:any[], callback?:ResCallbackT<any>): Multi;
-        sunionstore(...args:any[]): Multi;
-        sdiff(args:any[], callback?:ResCallbackT<any>): Multi;
-        sdiff(...args:any[]): Multi;
-        sdiffstore(args:any[], callback?:ResCallbackT<any>): Multi;
-        sdiffstore(...args:any[]): Multi;
-        smembers(args:any[], callback?:ResCallbackT<any>): Multi;
-        smembers(...args:any[]): Multi;
-        zadd(args:any[], callback?:ResCallbackT<any>): Multi;
-        zadd(...args:any[]): Multi;
-        zincrby(args:any[], callback?:ResCallbackT<any>): Multi;
-        zincrby(...args:any[]): Multi;
-        zrem(args:any[], callback?:ResCallbackT<any>): Multi;
-        zrem(...args:any[]): Multi;
-        zremrangebyscore(args:any[], callback?:ResCallbackT<any>): Multi;
-        zremrangebyscore(...args:any[]): Multi;
-        zremrangebyrank(args:any[], callback?:ResCallbackT<any>): Multi;
-        zremrangebyrank(...args:any[]): Multi;
-        zunionstore(args:any[], callback?:ResCallbackT<any>): Multi;
-        zunionstore(...args:any[]): Multi;
-        zinterstore(args:any[], callback?:ResCallbackT<any>): Multi;
-        zinterstore(...args:any[]): Multi;
-        zrange(args:any[], callback?:ResCallbackT<any>): Multi;
-        zrange(...args:any[]): Multi;
-        zrangebyscore(args:any[], callback?:ResCallbackT<any>): Multi;
-        zrangebyscore(...args:any[]): Multi;
-        zrevrangebyscore(args:any[], callback?:ResCallbackT<any>): Multi;
-        zrevrangebyscore(...args:any[]): Multi;
-        zcount(args:any[], callback?:ResCallbackT<any>): Multi;
-        zcount(...args:any[]): Multi;
-        zrevrange(args:any[], callback?:ResCallbackT<any>): Multi;
-        zrevrange(...args:any[]): Multi;
-        zcard(args:any[], callback?:ResCallbackT<any>): Multi;
-        zcard(...args:any[]): Multi;
-        zscore(args:any[], callback?:ResCallbackT<any>): Multi;
-        zscore(...args:any[]): Multi;
-        zrank(args:any[], callback?:ResCallbackT<any>): Multi;
-        zrank(...args:any[]): Multi;
-        zrevrank(args:any[], callback?:ResCallbackT<any>): Multi;
-        zrevrank(...args:any[]): Multi;
-        hset(args:any[], callback?:ResCallbackT<any>): Multi;
-        hset(...args:any[]): Multi;
-        hsetnx(args:any[], callback?:ResCallbackT<any>): Multi;
-        hsetnx(...args:any[]): Multi;
-        hget(args:any[], callback?:ResCallbackT<any>): Multi;
-        hget(...args:any[]): Multi;
-        hmset(args:any[], callback?:ResCallbackT<any>): Multi;
-        hmset(key:string, hash:any, callback?:ResCallbackT<any>): Multi;
-        hmset(...args:any[]): Multi;
-        hmget(args:any[], callback?:ResCallbackT<any>): Multi;
-        hmget(...args:any[]): Multi;
-        hincrby(args:any[], callback?:ResCallbackT<any>): Multi;
-        hincrby(...args:any[]): Multi;
-        hdel(args:any[], callback?:ResCallbackT<any>): Multi;
-        hdel(...args:any[]): Multi;
-        hlen(args:any[], callback?:ResCallbackT<any>): Multi;
-        hlen(...args:any[]): Multi;
-        hkeys(args:any[], callback?:ResCallbackT<any>): Multi;
-        hkeys(...args:any[]): Multi;
-        hvals(args:any[], callback?:ResCallbackT<any>): Multi;
-        hvals(...args:any[]): Multi;
-        hgetall(args:any[], callback?:ResCallbackT<any>): Multi;
-        hgetall(...args:any[]): Multi;
-        hgetall(key:string, callback?:ResCallbackT<any>): Multi;
-        hexists(args:any[], callback?:ResCallbackT<any>): Multi;
-        hexists(...args:any[]): Multi;
-        incrby(args:any[], callback?:ResCallbackT<any>): Multi;
-        incrby(...args:any[]): Multi;
-        decrby(args:any[], callback?:ResCallbackT<any>): Multi;
-        decrby(...args:any[]): Multi;
-        getset(args:any[], callback?:ResCallbackT<any>): Multi;
-        getset(...args:any[]): Multi;
-        mset(args:any[], callback?:ResCallbackT<any>): Multi;
-        mset(...args:any[]): Multi;
-        msetnx(args:any[], callback?:ResCallbackT<any>): Multi;
-        msetnx(...args:any[]): Multi;
-        randomkey(args:any[], callback?:ResCallbackT<any>): Multi;
-        randomkey(...args:any[]): Multi;
-        select(args:any[], callback?:ResCallbackT<any>): void;
-        select(...args:any[]): Multi;
-        move(args:any[], callback?:ResCallbackT<any>): Multi;
-        move(...args:any[]): Multi;
-        rename(args:any[], callback?:ResCallbackT<any>): Multi;
-        rename(...args:any[]): Multi;
-        renamenx(args:any[], callback?:ResCallbackT<any>): Multi;
-        renamenx(...args:any[]): Multi;
-        expire(args:any[], callback?:ResCallbackT<any>): Multi;
-        expire(...args:any[]): Multi;
-        expireat(args:any[], callback?:ResCallbackT<any>): Multi;
-        expireat(...args:any[]): Multi;
-        keys(args:any[], callback?:ResCallbackT<any>): Multi;
-        keys(...args:any[]): Multi;
-        dbsize(args:any[], callback?:ResCallbackT<any>): Multi;
-        dbsize(...args:any[]): Multi;
-        auth(args:any[], callback?:ResCallbackT<any>): void;
-        auth(...args:any[]): void;
-        ping(args:any[], callback?:ResCallbackT<any>): Multi;
-        ping(...args:any[]): Multi;
-        echo(args:any[], callback?:ResCallbackT<any>): Multi;
-        echo(...args:any[]): Multi;
-        save(args:any[], callback?:ResCallbackT<any>): Multi;
-        save(...args:any[]): Multi;
-        bgsave(args:any[], callback?:ResCallbackT<any>): Multi;
-        bgsave(...args:any[]): Multi;
-        bgrewriteaof(args:any[], callback?:ResCallbackT<any>): Multi;
-        bgrewriteaof(...args:any[]): Multi;
-        shutdown(args:any[], callback?:ResCallbackT<any>): Multi;
-        shutdown(...args:any[]): Multi;
-        lastsave(args:any[], callback?:ResCallbackT<any>): Multi;
-        lastsave(...args:any[]): Multi;
-        type(args:any[], callback?:ResCallbackT<any>): Multi;
-        type(...args:any[]): Multi;
-        multi(args:any[], callback?:ResCallbackT<any>): Multi;
-        multi(...args:any[]): Multi;
-        exec(args:any[], callback?:ResCallbackT<any>): Multi;
-        exec(...args:any[]): Multi;
-        discard(args:any[], callback?:ResCallbackT<any>): Multi;
-        discard(...args:any[]): Multi;
-        sync(args:any[], callback?:ResCallbackT<any>): Multi;
-        sync(...args:any[]): Multi;
-        flushdb(args:any[], callback?:ResCallbackT<any>): Multi;
-        flushdb(...args:any[]): Multi;
-        flushall(args:any[], callback?:ResCallbackT<any>): Multi;
-        flushall(...args:any[]): Multi;
-        sort(args:any[], callback?:ResCallbackT<any>): Multi;
-        sort(...args:any[]): Multi;
-        info(args:any[], callback?:ResCallbackT<any>): Multi;
-        info(...args:any[]): Multi;
-        monitor(args:any[], callback?:ResCallbackT<any>): Multi;
-        monitor(...args:any[]): Multi;
-        ttl(args:any[], callback?:ResCallbackT<any>): Multi;
-        ttl(...args:any[]): Multi;
-        persist(args:any[], callback?:ResCallbackT<any>): Multi;
-        persist(...args:any[]): Multi;
-        slaveof(args:any[], callback?:ResCallbackT<any>): Multi;
-        slaveof(...args:any[]): Multi;
-        debug(args:any[], callback?:ResCallbackT<any>): Multi;
-        debug(...args:any[]): Multi;
-        config(args:any[], callback?:ResCallbackT<any>): Multi;
-        config(...args:any[]): Multi;
-        subscribe(args:any[], callback?:ResCallbackT<any>): Multi;
-        subscribe(...args:any[]): Multi;
-        unsubscribe(args:any[], callback?:ResCallbackT<any>): Multi;
-        unsubscribe(...args:any[]): Multi;
-        psubscribe(args:any[], callback?:ResCallbackT<any>): Multi;
-        psubscribe(...args:any[]): Multi;
-        punsubscribe(args:any[], callback?:ResCallbackT<any>): Multi;
-        punsubscribe(...args:any[]): Multi;
-        publish(args:any[], callback?:ResCallbackT<any>): Multi;
-        publish(...args:any[]): Multi;
-        watch(args:any[], callback?:ResCallbackT<any>): Multi;
-        watch(...args:any[]): Multi;
-        unwatch(args:any[], callback?:ResCallbackT<any>): Multi;
-        unwatch(...args:any[]): Multi;
-        cluster(args:any[], callback?:ResCallbackT<any>): Multi;
-        cluster(...args:any[]): Multi;
-        restore(args:any[], callback?:ResCallbackT<any>): Multi;
-        restore(...args:any[]): Multi;
-        migrate(args:any[], callback?:ResCallbackT<any>): Multi;
-        migrate(...args:any[]): Multi;
-        dump(args:any[], callback?:ResCallbackT<any>): Multi;
-        dump(...args:any[]): Multi;
-        object(args:any[], callback?:ResCallbackT<any>): Multi;
-        object(...args:any[]): Multi;
-        client(args:any[], callback?:ResCallbackT<any>): Multi;
-        client(...args:any[]): Multi;
-        eval(args:any[], callback?:ResCallbackT<any>): Multi;
-        eval(...args:any[]): Multi;
-        evalsha(args:any[], callback?:ResCallbackT<any>): Multi;
-        evalsha(...args:any[]): Multi;
-        quit(args:any[], callback?:ResCallbackT<any>): Multi;
-        quit(...args:any[]): Multi;
-        scan(...args:any[]): Multi;
-        scan(args:any[], callback?:ResCallbackT<any>): Multi;
-        hscan(...args:any[]): Multi;
-        hscan(args:any[], callback?:ResCallbackT<any>): Multi;
-        zscan(...args:any[]): Multi;
-        zscan(args:any[], callback?:ResCallbackT<any>): Multi;
-    }
-}
diff --git a/redis/tsconfig.json b/redis/tsconfig.json
new file mode 100644
index 0000000000..623a19c389
--- /dev/null
+++ b/redis/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "redis-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/redlock/index.d.ts b/redlock/index.d.ts
new file mode 100644
index 0000000000..9135b5f762
--- /dev/null
+++ b/redlock/index.d.ts
@@ -0,0 +1,59 @@
+// Type definitions for Redlock
+// Project: https://github.com/mike-marcacci/node-redlock
+// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="bluebird" />
+
+declare namespace Redlock {
+	interface LockError extends Error {}
+
+	interface NodeifyCallback<T> {
+		(err: any, value?: T): void;
+	}
+
+	interface Lock {
+		redlock: Redlock;
+		resource: string;
+		value: any;
+		expiration: number;
+
+		unlock(callback?: NodeifyCallback<void>): Promise<void>;
+
+		extend(ttl: number, callback?: NodeifyCallback<Lock>): Promise<Lock>;
+	}
+
+	interface RedlockOptions {
+		driftFactor?: number;
+		retryCount?: number;
+		retryDelay?: number;
+	}
+}
+
+declare class Redlock {
+	LockError: Redlock.LockError;
+
+	driftFactor: number;
+	retryCount: number;
+	retryDelay: number;
+
+	servers: any[]; // array of redis.RedisClient
+
+	constructor(clients: any[], options?: Redlock.RedlockOptions);
+
+	acquire(resource: string, ttl: number, callback?: Redlock.NodeifyCallback<Redlock.Lock>): Promise<Redlock.Lock>;
+	lock(resource: string, ttl: number, callback?: Redlock.NodeifyCallback<Redlock.Lock>): Promise<Redlock.Lock>;
+
+	disposer(resource: string, ttl: number): any; // return bluebird.Disposer
+
+	release(lock: Redlock.Lock, callback?: Redlock.NodeifyCallback<void>): Promise<void>;
+	unlock(lock: Redlock.Lock, callback?: Redlock.NodeifyCallback<void>): Promise<void>;
+
+	extend(lock: Redlock.Lock, ttl: number, callback?: Redlock.NodeifyCallback<Redlock.Lock>): Promise<Redlock.Lock>;
+
+	_lock(resource: string, value: string, ttl: number, callback?: Redlock.NodeifyCallback<Redlock.Lock>): Promise<Redlock.Lock>;
+
+	_random(): string;
+}
+
+export = Redlock;
diff --git a/redlock/redlock-tests.ts b/redlock/redlock-tests.ts
index 8c05f6441e..a907cfe54b 100644
--- a/redlock/redlock-tests.ts
+++ b/redlock/redlock-tests.ts
@@ -1,10 +1,10 @@
-/// <reference path="./redlock.d.ts" />
+
 
 import Redlock = require('redlock');
 
-import NodeifyCallback = RedlockTypes.NodeifyCallback;
-import Lock = RedlockTypes.Lock;
-import RedlockOptions = RedlockTypes.RedlockOptions;
+import NodeifyCallback = Redlock.NodeifyCallback;
+import Lock = Redlock.Lock;
+import RedlockOptions = Redlock.RedlockOptions;
 
 namespace RedlockTest {
 	// constructor
diff --git a/redlock/redlock.d.ts b/redlock/redlock.d.ts
deleted file mode 100644
index 6db97b9f9e..0000000000
--- a/redlock/redlock.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-// Type definitions for Redlock
-// Project: https://github.com/mike-marcacci/node-redlock
-// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../bluebird/bluebird.d.ts" />
-
-declare namespace RedlockTypes {
-	interface LockError extends Error {}
-
-	interface NodeifyCallback<T> {
-		(err: any, value?: T): void;
-	}
-
-	interface Lock {
-		redlock: Redlock;
-		resource: string;
-		value: any;
-		expiration: number;
-
-		unlock(callback?: NodeifyCallback<void>): Promise<void>;
-
-		extend(ttl: number, callback?: NodeifyCallback<Lock>): Promise<Lock>;
-	}
-
-	interface RedlockOptions {
-		driftFactor?: number;
-		retryCount?: number;
-		retryDelay?: number;
-	}
-
-	class Redlock {
-		LockError: LockError;
-
-		driftFactor: number;
-		retryCount: number;
-		retryDelay: number;
-
-		servers: any[]; // array of redis.RedisClient
-
-		constructor(clients: any[], options?: RedlockOptions);
-
-		acquire(resource: string, ttl: number, callback?: NodeifyCallback<Lock>): Promise<Lock>;
-		lock(resource: string, ttl: number, callback?: NodeifyCallback<Lock>): Promise<Lock>;
-
-		disposer(resource: string, ttl: number): any; // return bluebird.Disposer
-
-		release(lock: Lock, callback?: NodeifyCallback<void>): Promise<void>;
-		unlock(lock: Lock, callback?: NodeifyCallback<void>): Promise<void>;
-
-		extend(lock: Lock, ttl: number, callback?: NodeifyCallback<Lock>): Promise<Lock>;
-
-		_lock(resource: string, value: string, ttl: number, callback?: NodeifyCallback<Lock>): Promise<Lock>;
-
-		_random(): string;
-	}
-}
-
-declare module "redlock" {
-	import Redlock = RedlockTypes.Redlock;
-	export = Redlock;
-}
diff --git a/redlock/tsconfig.json b/redlock/tsconfig.json
new file mode 100644
index 0000000000..6b6b11401c
--- /dev/null
+++ b/redlock/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "redlock-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/redux-action-utils/index.d.ts b/redux-action-utils/index.d.ts
new file mode 100644
index 0000000000..df55765181
--- /dev/null
+++ b/redux-action-utils/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for redux-action-utils 2.0.0
+// Project: https://github.com/insin/redux-action-utils
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export interface Action {
+    type: string;
+}
+
+export interface ActionCreator<T> {
+    (...data: any[]): Action & T;
+}
+
+export interface OptionsActionCreator<T> {
+    (data: T): Action & T;
+}
+
+/**
+ * Creates an action creator which will create an action object with the given type.
+ */
+export declare function actionCreator<T>(type: string, ...props: string[]): ActionCreator<T>;
+/**
+ * Creates an action creator which will create an action object with the given type.
+ */
+export declare function actionCreator<T>(type: string, props: string[]): ActionCreator<T>;
+
+/**
+ * Creates an action creator which takes a single object argument and adds its properties to the action object.
+ */
+export declare function optionsActionCreator<T>(type: string, ...props: string[]): OptionsActionCreator<T>;
+/**
+ * Creates an action creator which takes a single object argument and adds its properties to the action object.
+ */
+export declare function optionsActionCreator<T>(type: string, props: string[]): OptionsActionCreator<T>;
diff --git a/redux-action-utils/redux-action-utils-tests.ts b/redux-action-utils/redux-action-utils-tests.ts
index d3994a1534..9ba117fb1f 100644
--- a/redux-action-utils/redux-action-utils-tests.ts
+++ b/redux-action-utils/redux-action-utils-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="redux-action-utils.d.ts" />
-/// <reference path="../redux/redux.d.ts" />
+
+/// <reference types="redux" />
 
 import { actionCreator, optionsActionCreator } from 'redux-action-utils';
 import { Action, ActionCreator } from 'redux-action-utils';
diff --git a/redux-action-utils/redux-action-utils.d.ts b/redux-action-utils/redux-action-utils.d.ts
deleted file mode 100644
index 50419c2e70..0000000000
--- a/redux-action-utils/redux-action-utils.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-// Type definitions for redux-action-utils 2.0.0
-// Project: https://github.com/insin/redux-action-utils
-// Definitions by: Qubo <https://github.com/tkqubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "redux-action-utils" {
-    export interface Action {
-        type: string;
-    }
-
-    export interface ActionCreator<T> {
-        (...data: any[]): Action & T;
-    }
-
-    export interface OptionsActionCreator<T> {
-        (data: T): Action & T;
-    }
-
-    /**
-     * Creates an action creator which will create an action object with the given type.
-     */
-    export function actionCreator<T>(type: string, ...props: string[]): ActionCreator<T>;
-    /**
-     * Creates an action creator which will create an action object with the given type.
-     */
-    export function actionCreator<T>(type: string, props: string[]): ActionCreator<T>;
-
-    /**
-     * Creates an action creator which takes a single object argument and adds its properties to the action object.
-     */
-    export function optionsActionCreator<T>(type: string, ...props: string[]): OptionsActionCreator<T>;
-    /**
-     * Creates an action creator which takes a single object argument and adds its properties to the action object.
-     */
-    export function optionsActionCreator<T>(type: string, props: string[]): OptionsActionCreator<T>;
-}
-
diff --git a/redux-action-utils/tsconfig.json b/redux-action-utils/tsconfig.json
new file mode 100644
index 0000000000..b2fe07347a
--- /dev/null
+++ b/redux-action-utils/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-action-utils-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/redux-actions/index.d.ts b/redux-actions/index.d.ts
new file mode 100644
index 0000000000..b8859030dd
--- /dev/null
+++ b/redux-actions/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for redux-actions v0.8.0
+// Project: https://github.com/acdlite/redux-actions
+// Definitions by: Jack Hsu <https://github.com/jaysoo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = ReduxActions;
+
+declare namespace ReduxActions {
+    // FSA-compliant action.
+    // See: https://github.com/acdlite/flux-standard-action
+    type Action = {
+        type: string
+        payload?: any
+        error?: boolean
+        meta?: any
+    };
+
+    type PayloadCreator<T> = (...args: any[]) => T;
+    type MetaCreator = (...args: any[]) => any;
+
+    type Reducer<T> = (state: T, action: Action) => T;
+
+    type ReducerMap<T> = {
+        [actionType: string]: Reducer<T>
+    };
+
+    export function createAction<T>(actionType: string, payloadCreator?: PayloadCreator<T>, metaCreator?: MetaCreator): (...args: any[]) => Action;
+
+    export function handleAction<T>(actionType: string, reducer: Reducer<T> | ReducerMap<T>): Reducer<T>;
+
+    export function handleActions<T>(reducerMap: ReducerMap<T>, initialState?: T): Reducer<T>;
+}
+
diff --git a/redux-actions/redux-actions-tests.ts b/redux-actions/redux-actions-tests.ts
index 30dd00a970..e76cbe711a 100644
--- a/redux-actions/redux-actions-tests.ts
+++ b/redux-actions/redux-actions-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./redux-actions.d.ts" />
+import ReduxActions = require("redux-actions");
 
 const minimalAction: ReduxActions.Action = { type: 'INCREMENT' };
 const richerAction: ReduxActions.Action = {
diff --git a/redux-actions/redux-actions.d.ts b/redux-actions/redux-actions.d.ts
deleted file mode 100644
index 8709bd2a02..0000000000
--- a/redux-actions/redux-actions.d.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// Type definitions for redux-actions v0.8.0
-// Project: https://github.com/acdlite/redux-actions
-// Definitions by: Jack Hsu <https://github.com/jaysoo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace ReduxActions {
-    // FSA-compliant action.
-    // See: https://github.com/acdlite/flux-standard-action
-    type Action = {
-        type: string
-        payload?: any
-        error?: boolean
-        meta?: any
-    };
-
-    type PayloadCreator<T> = (...args: any[]) => T;
-    type MetaCreator = (...args: any[]) => any;
-
-    type Reducer<T> = (state: T, action: Action) => T;
-
-    type ReducerMap<T> = {
-        [actionType: string]: Reducer<T>
-    };
-
-    export function createAction<T>(actionType: string, payloadCreator?: PayloadCreator<T>, metaCreator?: MetaCreator): (...args: any[]) => Action;
-
-    export function handleAction<T>(actionType: string, reducer: Reducer<T> | ReducerMap<T>): Reducer<T>;
-
-    export function handleActions<T>(reducerMap: ReducerMap<T>, initialState?: T): Reducer<T>;
-}
-
-declare module 'redux-actions' {
-    export = ReduxActions;
-}
-
diff --git a/redux-actions/tsconfig.json b/redux-actions/tsconfig.json
new file mode 100644
index 0000000000..6c60fd7e07
--- /dev/null
+++ b/redux-actions/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-actions-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/redux-debounced/index.d.ts b/redux-debounced/index.d.ts
new file mode 100644
index 0000000000..1c2ec66016
--- /dev/null
+++ b/redux-debounced/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for redux-debounced v0.2.0
+// Project: https://github.com/ryanseddon/redux-debounced
+// Definitions by: Sean Kelley <https://github.com/seansfkelley>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="redux" />
+
+
+import { Middleware } from 'redux';
+export default function createDebounce(): Middleware;
diff --git a/redux-debounced/redux-debounced-tests.ts b/redux-debounced/redux-debounced-tests.ts
new file mode 100644
index 0000000000..f33050e394
--- /dev/null
+++ b/redux-debounced/redux-debounced-tests.ts
@@ -0,0 +1,6 @@
+/// <reference types="redux"/>
+
+import { applyMiddleware } from 'redux';
+import createDebounce from 'redux-debounced';
+
+applyMiddleware(createDebounce());
diff --git a/redux-debounced/tsconfig.json b/redux-debounced/tsconfig.json
new file mode 100644
index 0000000000..b022e8c44e
--- /dev/null
+++ b/redux-debounced/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-debounced-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/redux-devtools-dock-monitor/index.d.ts b/redux-devtools-dock-monitor/index.d.ts
new file mode 100644
index 0000000000..4158e511ca
--- /dev/null
+++ b/redux-devtools-dock-monitor/index.d.ts
@@ -0,0 +1,57 @@
+// Type definitions for redux-devtools-dock-monitor 1.0.1
+// Project: https://github.com/gaearon/redux-devtools-dock-monitor
+// Definitions by: Petryshyn Sergii <https://github.com/mc-petry>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react" />
+
+import * as React from 'react'
+
+interface IDockMonitorProps {
+    /**
+     * Any valid Redux DevTools monitor.
+     */
+    children?: React.ReactNode
+
+    /**
+     * A key or a key combination that toggles the dock visibility. 
+     * Must be recognizable by parse-key (for example, 'ctrl-h')
+     */
+    toggleVisibilityKey: string
+
+    /**
+     * A key or a key combination that toggles the dock position. 
+     * Must be recognizable by parse-key (for example, 'ctrl-w')
+     */
+    changePositionKey: string
+
+    /**
+     * When true, the dock size is a fraction of the window size, fixed otherwise.
+     * 
+     * @default true
+     */
+    fluid?: boolean
+
+    /**
+     * Size of the dock. When fluid is true, a float (0.5 means half the window size). 
+     * When fluid is false, a width in pixels
+     * 
+     * @default 0.3 (3/10th of the window size)
+     */
+    defaultSize?: number
+
+    /**
+     * Where the dock appears on the screen. 
+     * Valid values: 'left', 'top', 'right', 'bottom'
+     * 
+     * @default 'right'
+     */
+    defaultPosition?: string
+
+    /**
+     * @default true
+     */
+    defaultIsVisible?: boolean
+}
+
+export default class DockMonitor extends React.Component<IDockMonitorProps, any> { }
diff --git a/redux-devtools-dock-monitor/redux-devtools-dock-monitor-tests.tsx b/redux-devtools-dock-monitor/redux-devtools-dock-monitor-tests.tsx
index 00845bdc0a..8951205b72 100644
--- a/redux-devtools-dock-monitor/redux-devtools-dock-monitor-tests.tsx
+++ b/redux-devtools-dock-monitor/redux-devtools-dock-monitor-tests.tsx
@@ -1,5 +1,4 @@
-/// <reference path="../react/react.d.ts" />
-/// <reference path="./redux-devtools-dock-monitor.d.ts" />
+/// <reference types="react" />
 
 import * as React from 'react'
 import DockMonitor from 'redux-devtools-dock-monitor'
diff --git a/redux-devtools-dock-monitor/redux-devtools-dock-monitor.d.ts b/redux-devtools-dock-monitor/redux-devtools-dock-monitor.d.ts
deleted file mode 100644
index 09e3d96036..0000000000
--- a/redux-devtools-dock-monitor/redux-devtools-dock-monitor.d.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-// Type definitions for redux-devtools-dock-monitor 1.0.1
-// Project: https://github.com/gaearon/redux-devtools-dock-monitor
-// Definitions by: Petryshyn Sergii <https://github.com/mc-petry>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts" />
-
-declare module "redux-devtools-dock-monitor" {
-  import * as React from 'react'
-
-  interface IDockMonitorProps {
-    /**
-     * Any valid Redux DevTools monitor.
-     */
-    children?: React.ReactNode
-
-    /**
-     * A key or a key combination that toggles the dock visibility. 
-     * Must be recognizable by parse-key (for example, 'ctrl-h')
-     */
-    toggleVisibilityKey: string
-
-    /**
-     * A key or a key combination that toggles the dock position. 
-     * Must be recognizable by parse-key (for example, 'ctrl-w')
-     */
-    changePositionKey: string
-
-    /**
-     * When true, the dock size is a fraction of the window size, fixed otherwise.
-     * 
-     * @default true
-     */
-    fluid?: boolean
-
-    /**
-     * Size of the dock. When fluid is true, a float (0.5 means half the window size). 
-     * When fluid is false, a width in pixels
-     * 
-     * @default 0.3 (3/10th of the window size)
-     */
-    defaultSize?: number
-
-    /**
-     * Where the dock appears on the screen. 
-     * Valid values: 'left', 'top', 'right', 'bottom'
-     * 
-     * @default 'right'
-     */
-    defaultPosition?: string
-
-    /**
-     * @default true
-     */
-    defaultIsVisible?: boolean
-  }
-
-  export default class DockMonitor extends React.Component<IDockMonitorProps, any> {}
-}
\ No newline at end of file
diff --git a/redux-devtools-dock-monitor/tsconfig.json b/redux-devtools-dock-monitor/tsconfig.json
new file mode 100644
index 0000000000..bc95e3691b
--- /dev/null
+++ b/redux-devtools-dock-monitor/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-devtools-dock-monitor-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/redux-devtools-log-monitor/index.d.ts b/redux-devtools-log-monitor/index.d.ts
new file mode 100644
index 0000000000..d443bc880c
--- /dev/null
+++ b/redux-devtools-log-monitor/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for redux-devtools-log-monitor 1.0.1
+// Project: https://github.com/gaearon/redux-devtools-log-monitor
+// Definitions by: Petryshyn Sergii <https://github.com/mc-petry>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react" />
+
+import * as React from 'react'
+
+interface ILogMonitorProps {
+    /**
+     * Either a string referring to one of the themes provided by 
+     * redux-devtools-themes or a custom object of the same format.
+     * 
+     * @see https://github.com/gaearon/redux-devtools-themes
+     */
+    theme?: string
+
+    /**
+     * A function that selects the slice of the state for DevTools to show.
+     *  
+     * @example state => state.thePart.iCare.about.
+     * @default state => state.
+     */
+    select?: (state: any) => any
+
+    /**
+     * When true, records the current scroll top every second so it 
+     * can be restored on refresh. This only has effect when used together 
+     * with persistState() enhancer from Redux DevTools.
+     * 
+     * @default true
+     */
+    preserveScrollTop?: boolean
+}
+
+export default class LogMonitor extends React.Component<ILogMonitorProps, any> { }
diff --git a/redux-devtools-log-monitor/redux-devtools-log-monitor-tests.tsx b/redux-devtools-log-monitor/redux-devtools-log-monitor-tests.tsx
index dbcdbcf7a2..06015b2f6c 100644
--- a/redux-devtools-log-monitor/redux-devtools-log-monitor-tests.tsx
+++ b/redux-devtools-log-monitor/redux-devtools-log-monitor-tests.tsx
@@ -1,5 +1,4 @@
-/// <reference path="../react/react.d.ts" />
-/// <reference path="./redux-devtools-log-monitor.d.ts" />
+/// <reference types="react" />
 
 import * as React from 'react'
 import LogMonitor from 'redux-devtools-log-monitor'
diff --git a/redux-devtools-log-monitor/redux-devtools-log-monitor.d.ts b/redux-devtools-log-monitor/redux-devtools-log-monitor.d.ts
deleted file mode 100644
index 8c96c804da..0000000000
--- a/redux-devtools-log-monitor/redux-devtools-log-monitor.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-// Type definitions for redux-devtools-log-monitor 1.0.1
-// Project: https://github.com/gaearon/redux-devtools-log-monitor
-// Definitions by: Petryshyn Sergii <https://github.com/mc-petry>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts" />
-
-declare module "redux-devtools-log-monitor" {
-  import * as React from 'react'
-
-  interface ILogMonitorProps {
-    /**
-     * Either a string referring to one of the themes provided by 
-     * redux-devtools-themes or a custom object of the same format.
-     * 
-     * @see https://github.com/gaearon/redux-devtools-themes
-     */
-    theme?: string
-
-    /**
-     * A function that selects the slice of the state for DevTools to show.
-     *  
-     * @example state => state.thePart.iCare.about.
-     * @default state => state.
-     */
-    select?: (state: any) => any
-
-    /**
-     * When true, records the current scroll top every second so it 
-     * can be restored on refresh. This only has effect when used together 
-     * with persistState() enhancer from Redux DevTools.
-     * 
-     * @default true
-     */
-    preserveScrollTop?: boolean
-  }
-
-  export default class LogMonitor extends React.Component<ILogMonitorProps, any> {}
-}
\ No newline at end of file
diff --git a/redux-devtools-log-monitor/tsconfig.json b/redux-devtools-log-monitor/tsconfig.json
new file mode 100644
index 0000000000..9b832feddf
--- /dev/null
+++ b/redux-devtools-log-monitor/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-devtools-log-monitor-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/redux-devtools/index.d.ts b/redux-devtools/index.d.ts
new file mode 100644
index 0000000000..3a9083b1f8
--- /dev/null
+++ b/redux-devtools/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for redux-devtools 3.0.0
+// Project: https://github.com/gaearon/redux-devtools
+// Definitions by: Petryshyn Sergii <https://github.com/mc-petry>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react" />
+
+
+import * as React from 'react';
+
+interface IDevTools {
+    new (): JSX.ElementClass;
+    instrument(): Function;
+}
+
+export declare function createDevTools(el: React.ReactElement<any>): IDevTools;
+export declare function persistState(debugSessionKey: string): Function;
+
+declare var factory: { instrument(): Function };
+
+export default factory;
diff --git a/redux-devtools/redux-devtools-2.1.4-tests.tsx b/redux-devtools/redux-devtools-2.1.4-tests.tsx
index a57811f16b..4382da2ce6 100644
--- a/redux-devtools/redux-devtools-2.1.4-tests.tsx
+++ b/redux-devtools/redux-devtools-2.1.4-tests.tsx
@@ -1,10 +1,9 @@
-/// <reference path="redux-devtools-2.1.4.d.ts" />
-/// <reference path="../redux/redux.d.ts" />
-/// <reference path="../react/react.d.ts" />
+/// <reference types="redux" />
+/// <reference types="react" />
 
 import { compose, createStore, applyMiddleware, Middleware, Reducer } from 'redux';
-import { devTools, persistState } from 'redux-devtools';
-import { DevTools, DebugPanel, LogMonitor } from 'redux-devtools/lib/react';
+import { createDevTools as devTools, persistState } from 'redux-devtools';
+import LogMonitor from 'redux-devtools-log-monitor';
 import * as React from 'react';
 import { Component } from 'react';
 
@@ -19,9 +18,9 @@ const finalCreateStore = compose(
     // Enables your middleware:
     applyMiddleware(m1, m2, m3), // any Redux middleware, e.g. redux-thunk
     // Provides support for DevTools:
-    devTools(),
+    devTools(null),
     // Lets you write ?debug_session=<name> in address bar to persist debug sessions
-    persistState(window.location.href.match(/[?&]debug_session=([^&]+)\b/))
+    persistState(window.location.href.match(/[?&]debug_session=([^&]+)\b/)[0])
 )(createStore);
 const store = finalCreateStore(reducer);
 
@@ -32,9 +31,6 @@ class Root extends Component<any, any> {
                 <Provider store={store}>
                     {() => <CounterApp />}
                 </Provider>
-                <DebugPanel top right bottom>
-                    <DevTools store={store} monitor={LogMonitor} />
-                </DebugPanel>
             </div>
         );
     }
@@ -51,11 +47,6 @@ class App extends Component<any, any> {
                 <Provider store={store}>
                     {() => <CounterApp />}
                 </Provider>
-                <DebugPanel top right bottom>
-                    <DevTools store={store}
-                        monitor={LogMonitor}
-                        visibleOnLoad={true} />
-                </DebugPanel>
             </div>
         );
     }
diff --git a/redux-devtools/redux-devtools-2.1.4.d.ts b/redux-devtools/redux-devtools-2.1.4.d.ts
index cc2aa1d7a0..7c8d1cd9e2 100644
--- a/redux-devtools/redux-devtools-2.1.4.d.ts
+++ b/redux-devtools/redux-devtools-2.1.4.d.ts
@@ -3,107 +3,9 @@
 // Definitions by: Qubo <https://github.com/tkqubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../redux/redux.d.ts" />
-/// <reference path="../react/react.d.ts" />
+/// <reference types="redux" />
+/// <reference types="react" />
 
-declare module "redux-devtools" {
-    export function devTools(): Function;
-    export function persistState(sessionId: any, stateDeserializer?: Function, actionDeserializer?: Function): Function;
-}
-
-declare module "redux-devtools/lib/react" {
-    import * as React from 'react';
-
-    export class DevTools extends React.Component<any, any> {
-
-    }
-
-    export interface DevToolsProps {
-        monitor: Function;
-        store: Store;
-    }
-
-    export interface Store {
-        devToolStore: DevToolStore;
-    }
-
-    export class DevToolStore extends React.Component<any, any> {
-        dispatch: Function;
-    }
-
-    export class DebugPanel extends React.Component<DebugPanelProps, any> { }
-
-    export interface DebugPanelProps {
-        position?: string;
-        zIndex?: number;
-        fontSize?: string;
-        overflow?: string;
-        opacity?: number;
-        color?: string;
-        left?: boolean|number;
-        right?: boolean|number;
-        top?: boolean|number;
-        bottom?: boolean|number;
-        maxHeight?: string;
-        maxWidth?: string;
-        wordWrap?: string;
-        boxSizing?: string;
-        boxShadow?: string;
-        getStyle?: () => DebugPanelProps;
-    }
-
-    export class LogMonitor extends React.Component<LogMonitorProps, any> { }
-
-    export interface LogMonitorProps {
-        computedStates?: ComputedState[];
-        currentStateIndex?: number;
-        monitorState?: MonitorState;
-        stagedActions?: Action[];
-        skippedActions?: boolean[];
-        reset?: Function;
-        commit?: Function;
-        rollback?: Function;
-        sweep?: Function;
-        toggleAction?: Function;
-        jumpToState?: Function;
-        setMonitorState?: Function;
-        select?: Function;
-        visibleOnLoad?: boolean;
-        theme?: Theme|string;
-    }
-
-    export interface ComputedState {
-        state?: any;
-        error?: string;
-    }
-
-    export interface MonitorState {
-        isViaible?: boolean;
-    }
-
-    export interface Action {
-        type: string;
-    }
-
-    export interface Theme {
-        scheme: string;
-        author: string;
-        base00: string;
-        base01: string;
-        base02: string;
-        base03: string;
-        base04: string;
-        base05: string;
-        base06: string;
-        base07: string;
-        base08: string;
-        base09: string;
-        base0A: string;
-        base0B: string;
-        base0C: string;
-        base0D: string;
-        base0E: string;
-        base0F: string;
-    }
-}
 
+export declare function devTools(): Function;
+export declare function persistState(sessionId: any, stateDeserializer?: Function, actionDeserializer?: Function): Function;
diff --git a/redux-devtools/redux-devtools-tests.tsx b/redux-devtools/redux-devtools-tests.tsx
index 2cacd47c7a..002ae5bc8a 100644
--- a/redux-devtools/redux-devtools-tests.tsx
+++ b/redux-devtools/redux-devtools-tests.tsx
@@ -1,7 +1,5 @@
-/// <reference path="../react/react.d.ts" />
-/// <reference path="../redux/redux.d.ts" />
-/// <reference path="../react-redux/react-redux.d.ts" />
-/// <reference path="redux-devtools.d.ts" />
+/// <reference types="react" />
+/// <reference types="redux" />
 
 import * as React from 'react'
 import { createStore, applyMiddleware, compose } from 'redux'
diff --git a/redux-devtools/redux-devtools.d.ts b/redux-devtools/redux-devtools.d.ts
deleted file mode 100644
index 47ad2198d9..0000000000
--- a/redux-devtools/redux-devtools.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// Type definitions for redux-devtools 3.0.0
-// Project: https://github.com/gaearon/redux-devtools
-// Definitions by: Petryshyn Sergii <https://github.com/mc-petry>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts" />
-
-declare module "redux-devtools" {
-  import * as React from 'react'
-
-  interface IDevTools {
-    new (): JSX.ElementClass
-    instrument(): Function
-  }
-
-  export function createDevTools(el: React.ReactElement<any>): IDevTools
-  export function persistState(debugSessionKey: string): Function
-
-  var factory: { instrument(): Function }
-
-  export default factory;
-}
\ No newline at end of file
diff --git a/redux-devtools/tsconfig.json b/redux-devtools/tsconfig.json
new file mode 100644
index 0000000000..b4b159655b
--- /dev/null
+++ b/redux-devtools/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "files": [
+        "index.d.ts",
+        "redux-devtools-2.1.4-tests.tsx"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/redux-form/index.d.ts b/redux-form/index.d.ts
new file mode 100644
index 0000000000..c9b11228ed
--- /dev/null
+++ b/redux-form/index.d.ts
@@ -0,0 +1,460 @@
+// Type definitions for redux-form v4.0.3
+// Project: https://github.com/erikras/redux-form
+// Definitions by: Daniel Lytkin <https://github.com/aikoven>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="react" />
+/// <reference types="redux" />
+
+
+import { Component, SyntheticEvent, FormEventHandler } from 'react';
+import { Dispatch, ActionCreator, Reducer } from 'redux';
+
+export type FieldValue = any;
+
+export type FormData = { [fieldName: string]: FieldValue };
+
+export interface FieldProp {
+    /**
+     * true if this field currently has focus. It will only work if you are
+     * passing onFocus to your input element.
+     */
+    active: boolean;
+
+    /**
+     * An alias for value only when value is a boolean. Provided for
+     * convenience of destructuring the whole field object into the props of a
+     * form element.
+     */
+    checked?: boolean;
+
+    /**
+     * true if the field value has changed from its initialized value.
+     * Opposite of pristine.
+     */
+    dirty: boolean;
+
+    /**
+     * The error for this field if its value is not passing validation. Both
+     * synchronous and asynchronous validation errors will be reported here.
+     */
+    error?: string;
+
+    /**
+     * The value for this field as supplied in initialValues to the form.
+     */
+    initialValue: FieldValue;
+
+    /**
+     * true if the field value fails validation (has a validation error).
+     * Opposite of valid.
+     */
+    invalid: boolean;
+
+    /**
+     * The name of the field. It will be the same as the key in the fields
+     * Object, but useful if bundling up a field to send down to a specialized
+     * input component.
+     */
+    name: string;
+
+    /**
+     * A function to call when the form field loses focus. It expects to
+     * either receive the React SyntheticEvent or the current value of the
+     * field.
+     */
+    onBlur(eventOrValue: SyntheticEvent | FieldValue): void;
+
+    /**
+     * A function to call when the form field is changed. It expects to either
+     * receive the React SyntheticEvent or the new value of the field.
+     * @param eventOrValue
+     */
+    onChange(eventOrValue: SyntheticEvent | FieldValue): void;
+
+    /**
+     * A function to call when the form field receives a 'dragStart' event.
+     * Saves the field value in the event for giving the field it is dropped
+     * into.
+     */
+    onDragStart(): void;
+
+    /**
+     * A function to call when the form field receives a drop event.
+     */
+    onDrop(): void;
+
+    /**
+     * A function to call when the form field receives focus.
+     */
+    onFocus(): void;
+
+    /**
+     * An alias for onChange. Provided for convenience of destructuring the
+     * whole field object into the props of a form element. Added to provide
+     * out-of-the-box support for Belle components' onUpdate API.
+     */
+    onUpdate(): void;
+
+    /**
+     * true if the field value is the same as its initialized value. Opposite
+     * of dirty.
+     */
+    pristine: boolean;
+
+    /**
+     * true if the field has been touched. By default this will be set when
+     * the field is blurred.
+     */
+    touched: boolean;
+
+    /**
+     * true if the field value passes validation (has no validation errors).
+     * Opposite of invalid.
+     */
+    valid: boolean;
+
+    /**
+     * The value of this form field. It will be a boolean for checkboxes, and
+     * a string for all other input types.
+     */
+    value: FieldValue;
+
+    /**
+     * true if this field has ever had focus. It will only work if you are
+     * passing onFocus to your input element.
+     */
+    visited: boolean;
+}
+
+export interface ReduxFormProps {
+    /**
+     * The name of the currently active (with focus) field.
+     */
+    active?: string;
+
+    /**
+     * A function that may be called to initiate asynchronous validation if
+     * asynchronous validation is enabled.
+     */
+    asyncValidate?: Function;
+
+    /**
+     * true if the asynchronous validation function has been called but has not
+     * yet returned.
+     */
+    asyncValidating?: boolean;
+
+    /**
+     * Destroys the form state in the Redux store. By default, this will be
+     * called for you in componentWillUnmount().
+     */
+    destroyForm?(): void;
+
+    /**
+     * true if the form data has changed from its initialized values. Opposite
+     * of pristine.
+     */
+    dirty?: boolean;
+
+    /**
+     * A generic error for the entire form given by the _error key in the
+     * result from the synchronous validation function, the asynchronous
+     * validation, or the rejected promise from onSubmit.
+     */
+    error?: string;
+
+    /**
+     * The form data, in the form { field1: <Object>, field2: <Object> }. The
+     * field objects are meant to be destructured into your input component as
+     * props, e.g. <input type="text" {...field.name}/>. Each field Object has
+     * the following properties:
+     */
+    fields?: { [field: string]: FieldProp };
+
+    /**
+     * A function meant to be passed to <form onSubmit={handleSubmit}> or to
+     * <button onClick={handleSubmit}>. It will run validation, both sync and
+     * async, and, if the form is valid, it will call
+     * this.props.onSubmit(data) with the contents of the form data.
+     * Optionally, you may also pass your onSubmit function to handleSubmit
+     * which will take the place of the onSubmit prop. For example: <form
+     * onSubmit={handleSubmit(this.save.bind(this))}> If your onSubmit
+     * function returns a promise, the submitting property will be set to true
+     * until the promise has been resolved or rejected. If it is rejected with
+     * an object matching { field1: 'error', field2: 'error' } then the
+     * submission errors will be added to each field (to the error prop) just
+     * like async validation errors are. If there is an error that is not
+     * specific to any field, but applicable to the entire form, you may pass
+     * that as if it were the error for a field called _error, and it will be
+     * given as the error prop.
+     */
+    handleSubmit?(event: SyntheticEvent): void;
+
+    handleSubmit?(submit: (data: FormData, dispatch?: Dispatch)
+        => Promise<any> | void): FormEventHandler;
+
+    /**
+     * Initializes the form data to the given values. All dirty and pristine
+     * state will be determined by comparing the current data with these
+     * initialized values.
+     * @param data
+     */
+    initializeForm?(data: FormData): void;
+
+    /**
+     * true if the form has validation errors. Opposite of valid.
+     */
+    invalid?: boolean;
+
+    /**
+     * true if the form data is the same as its initialized values. Opposite
+     * of dirty.
+     */
+    pristine?: boolean;
+
+    /**
+     * Resets all the values in the form to the initialized state, making it
+     * pristine again.
+     */
+    resetForm?(): void;
+
+    /**
+     * The same formKey prop that was passed in. See Editing Multiple Records.
+     */
+    formKey?: string;
+
+    /**
+     * Whether or not your form is currently submitting. This prop will only
+     * work if you have passed an onSubmit function that returns a promise. It
+     * will be true until the promise is resolved or rejected.
+     */
+    submitting?: boolean;
+
+    /**
+     * Starts as false. If onSubmit is called, and fails to submit for any
+     * reason, submitFailed will be set to true. A subsequent successful
+     * submit will set it back to false.
+     */
+    submitFailed?: boolean;
+
+    /**
+     * Marks the given fields as "touched" to show errors.
+     * @param field
+     */
+    touch?(...field: string[]): void;
+
+    /**
+     * Marks all fields as "touched" to show errors. This will automatically
+     * happen on form submission.
+     */
+    touchAll?(): void;
+
+    /**
+     * Clears the "touched" flag for the given fields
+     * @param field
+     */
+    untouch?(...field: string[]): void;
+
+    /**
+     * Clears the "touched" flag for the all fields
+     */
+    untouchAll?(): void;
+
+    /**
+     * true if the form passes validation (has no validation errors). Opposite
+     * of invalid.
+     */
+    valid?: boolean;
+
+    /**
+     * All of your values in the form { field1: <string>, field2: <string> }.
+     */
+    values?: FormData;
+}
+
+declare class ElementClass extends Component<any, any> {
+}
+interface ClassDecorator {
+    <T extends (typeof ElementClass)>(component: T): T;
+}
+
+interface MapStateToProps {
+    (state: any, ownProps?: any): any;
+}
+
+interface MapDispatchToPropsFunction {
+    (dispatch: Dispatch, ownProps?: any): any;
+}
+
+interface MapDispatchToPropsObject {
+    [name: string]: ActionCreator;
+}
+
+export declare function reduxForm(config: ReduxFormConfig,
+    mapStateToProps?: MapStateToProps,
+    mapDispatchToProps?: MapDispatchToPropsFunction | MapDispatchToPropsObject): ClassDecorator;
+
+export interface ReduxFormConfig {
+    /**
+     * a list of all your fields in your form. You may change these dynamically
+     * at runtime.
+     */
+    fields: string[];
+
+    /**
+     * the name of your form and the key to where your form's state will be
+     * mounted under the redux-form reducer
+     */
+    form: string;
+
+    /**
+     * field names for which onBlur should trigger a call to the asyncValidate
+     * function. Defaults to [].
+     *
+     * See Asynchronous Blur Validation Example for more details.
+     */
+    asyncBlurFields?: string[];
+
+    /**
+     * a function that takes all the form values, the dispatch function, and
+     * the props given to your component, and returns a Promise that will
+     * resolve if the validation is passed, or will reject with an object of
+     * validation errors in the form { field1: <String>, field2: <String> }.
+     *
+     * See Asynchronous Blur Validation Example for more details.
+     */
+    asyncValidate?(values: FormData, dispatch: Dispatch, props: Object):
+        Promise<any>;
+
+    /**
+     * Whether or not to automatically destroy your form's state in the Redux
+     * store when your component is unmounted. Defaults to true.
+     */
+    destroyOnUnmount?: boolean;
+
+    /**
+     * The key for your sub-form.
+     *
+     * See Multirecord Example for more details.
+     */
+    formKey?: string;
+
+    /**
+     * A function that takes the entire Redux state and the reduxMountPoint
+     * (which defaults to "form"). It defaults to:
+     * (state, reduxMountPoint) => state[reduxMountPoint].
+     * The only reason you should provide this is if you are keeping your Redux
+     * state as something other than plain javascript objects, e.g. an
+     * Immutable.Map.
+     */
+    getFormState?(state: any, reduxMountPoint: string): any;
+
+    /**
+     * The values with which to initialize your form in componentWillMount().
+     * Particularly useful when Editing Multiple Records, but can also be used
+     * with single-record forms. The values should be in the form
+     * { field1: 'value1', field2: 'value2' }.
+     */
+    initialValues?: { [field: string]: FieldValue };
+
+    /**
+     * The function to call with the form data when the handleSubmit() is fired
+     * from within the form component. If you do not specify it as a prop here,
+     * you must pass it as a parameter to handleSubmit() inside your form
+     * component.
+     */
+    onSubmit?(values: FormData, dispatch?: Dispatch): any;
+
+    /**
+     * If specified, all the props normally passed into your decorated
+     * component directly will be passed under the key specified. Useful if
+     * using other decorator libraries on the same component to avoid prop
+     * namespace collisions.
+     */
+    propNamespace?: string;
+
+    /**
+     * if true, the decorated component will not be passed any of the onX
+     * functions as props that will allow it to mutate the state. Useful for
+     * decorating another component that is not your form, but that needs to
+     * know about the state of your form.
+     */
+    readonly?: boolean;
+
+    /**
+     * The use of this property is highly discouraged, but if you absolutely
+     * need to mount your redux-form reducer at somewhere other than form in
+     * your Redux state, you will need to specify the key you mounted it under
+     * with this property. Defaults to 'form'.
+     *
+     * See Alternate Mount Point Example for more details.
+     */
+    reduxMountPoint?: string;
+
+    /**
+     * If set to true, a failed submit will return a rejected promise. Defaults
+     * to false. Only use this if you need to detect submit failures and run
+     * some code when a submit fails.
+     */
+    returnRejectedSubmitPromise?: boolean;
+
+    /**
+     * marks fields as touched when the blur action is fired. Defaults to true.
+     */
+    touchOnBlur?: boolean;
+
+    /**
+     * marks fields as touched when the change action is fired. Defaults to
+     * false.
+     */
+    touchOnChange?: boolean;
+
+    /**
+     * a synchronous validation function that takes the form values and props
+     * passed into your component. If validation passes, it should return {}.
+     * If validation fails, it should return the validation errors in the form
+     * { field1: <String>, field2: <String> }.
+     * Defaults to (values, props) => ({}).
+     */
+    validate?(values: FormData, props: { [fieldName: string]: FieldProp }): Object;
+}
+
+/**
+ * @param value The current value of the field.
+ * @param previousValue The previous value of the field before the current
+ * action was dispatched.
+ * @param allValues All the values of the current form.
+ * @param previousAllValues All the values of the form before the current
+ * change. Useful to change one field based on a change in another.
+ */
+export type Normalizer =
+    (value: FieldValue, previousValue: FieldValue,
+        allValues: FormData, previousAllValues: FormData) => any;
+
+export declare const reducer: {
+    (state: any, action: any): any;
+
+    /**
+     * Returns a form reducer that will also pass each form value through the
+     * normalizing functions provided. The parameter is an object mapping from
+     * formName to an object mapping from fieldName to a normalizer function.
+     * The normalizer function is given four parameters and expected to return
+     * the normalized value of the field.
+     */
+    normalize(normalizers: {
+        [formName: string]: {
+            [fieldName: string]: Normalizer
+        }
+    }): Reducer;
+
+    /**
+     * Returns a form reducer that will also pass each action through
+     * additional reducers specified. The parameter should be an object mapping
+     * from formName to a (state, action) => nextState reducer. The state
+     * passed to each reducer will only be the slice that pertains to that
+     * form.
+     */
+    plugin(reducers: { [formName: string]: Reducer }): Reducer;
+}
diff --git a/redux-form/redux-form-tests.tsx b/redux-form/redux-form-tests.tsx
index ce4b93380a..1e66391d75 100644
--- a/redux-form/redux-form-tests.tsx
+++ b/redux-form/redux-form-tests.tsx
@@ -1,4 +1,3 @@
-/// <reference path="redux-form.d.ts" />
 
 import * as React from 'react';
 import {Component, PropTypes} from 'react';
diff --git a/redux-form/redux-form.d.ts b/redux-form/redux-form.d.ts
deleted file mode 100644
index 1e631ceac4..0000000000
--- a/redux-form/redux-form.d.ts
+++ /dev/null
@@ -1,461 +0,0 @@
-// Type definitions for redux-form v4.0.3
-// Project: https://github.com/erikras/redux-form
-// Definitions by: Daniel Lytkin <https://github.com/aikoven>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../react/react.d.ts" />
-/// <reference path="../redux/redux.d.ts" />
-
-declare module 'redux-form' {
-  import { Component, SyntheticEvent, FormEventHandler } from 'react';
-  import { Dispatch, ActionCreator, Reducer } from 'redux';
-
-  export type FieldValue = any;
-
-  export type FormData = {[fieldName:string]: FieldValue};
-
-  export interface FieldProp {
-    /**
-     * true if this field currently has focus. It will only work if you are
-     * passing onFocus to your input element.
-     */
-    active: boolean;
-
-    /**
-     * An alias for value only when value is a boolean. Provided for
-     * convenience of destructuring the whole field object into the props of a
-     * form element.
-     */
-    checked?: boolean;
-
-    /**
-     * true if the field value has changed from its initialized value.
-     * Opposite of pristine.
-     */
-    dirty: boolean;
-
-    /**
-     * The error for this field if its value is not passing validation. Both
-     * synchronous and asynchronous validation errors will be reported here.
-     */
-    error?: string;
-
-    /**
-     * The value for this field as supplied in initialValues to the form.
-     */
-    initialValue: FieldValue;
-
-    /**
-     * true if the field value fails validation (has a validation error).
-     * Opposite of valid.
-     */
-    invalid: boolean;
-
-    /**
-     * The name of the field. It will be the same as the key in the fields
-     * Object, but useful if bundling up a field to send down to a specialized
-     * input component.
-     */
-    name: string;
-
-    /**
-     * A function to call when the form field loses focus. It expects to
-     * either receive the React SyntheticEvent or the current value of the
-     * field.
-     */
-    onBlur(eventOrValue:SyntheticEvent|FieldValue):void;
-
-    /**
-     * A function to call when the form field is changed. It expects to either
-     * receive the React SyntheticEvent or the new value of the field.
-     * @param eventOrValue
-     */
-    onChange(eventOrValue:SyntheticEvent|FieldValue):void;
-
-    /**
-     * A function to call when the form field receives a 'dragStart' event.
-     * Saves the field value in the event for giving the field it is dropped
-     * into.
-     */
-    onDragStart():void;
-
-    /**
-     * A function to call when the form field receives a drop event.
-     */
-    onDrop():void;
-
-    /**
-     * A function to call when the form field receives focus.
-     */
-    onFocus():void;
-
-    /**
-     * An alias for onChange. Provided for convenience of destructuring the
-     * whole field object into the props of a form element. Added to provide
-     * out-of-the-box support for Belle components' onUpdate API.
-     */
-    onUpdate():void;
-
-    /**
-     * true if the field value is the same as its initialized value. Opposite
-     * of dirty.
-     */
-    pristine: boolean;
-
-    /**
-     * true if the field has been touched. By default this will be set when
-     * the field is blurred.
-     */
-    touched: boolean;
-
-    /**
-     * true if the field value passes validation (has no validation errors).
-     * Opposite of invalid.
-     */
-    valid: boolean;
-
-    /**
-     * The value of this form field. It will be a boolean for checkboxes, and
-     * a string for all other input types.
-     */
-    value: FieldValue;
-
-    /**
-     * true if this field has ever had focus. It will only work if you are
-     * passing onFocus to your input element.
-     */
-    visited: boolean;
-  }
-
-  export interface ReduxFormProps {
-    /**
-     * The name of the currently active (with focus) field.
-     */
-    active?: string;
-
-    /**
-     * A function that may be called to initiate asynchronous validation if
-     * asynchronous validation is enabled.
-     */
-    asyncValidate?: Function;
-
-    /**
-     * true if the asynchronous validation function has been called but has not
-     * yet returned.
-     */
-    asyncValidating?: boolean;
-
-    /**
-     * Destroys the form state in the Redux store. By default, this will be
-     * called for you in componentWillUnmount().
-     */
-    destroyForm?():void;
-
-    /**
-     * true if the form data has changed from its initialized values. Opposite
-     * of pristine.
-     */
-    dirty?: boolean;
-
-    /**
-     * A generic error for the entire form given by the _error key in the
-     * result from the synchronous validation function, the asynchronous
-     * validation, or the rejected promise from onSubmit.
-     */
-    error?: string;
-
-    /**
-     * The form data, in the form { field1: <Object>, field2: <Object> }. The
-     * field objects are meant to be destructured into your input component as
-     * props, e.g. <input type="text" {...field.name}/>. Each field Object has
-     * the following properties:
-     */
-    fields?: {[field:string]: FieldProp};
-
-    /**
-     * A function meant to be passed to <form onSubmit={handleSubmit}> or to
-     * <button onClick={handleSubmit}>. It will run validation, both sync and
-     * async, and, if the form is valid, it will call
-     * this.props.onSubmit(data) with the contents of the form data.
-     * Optionally, you may also pass your onSubmit function to handleSubmit
-     * which will take the place of the onSubmit prop. For example: <form
-     * onSubmit={handleSubmit(this.save.bind(this))}> If your onSubmit
-     * function returns a promise, the submitting property will be set to true
-     * until the promise has been resolved or rejected. If it is rejected with
-     * an object matching { field1: 'error', field2: 'error' } then the
-     * submission errors will be added to each field (to the error prop) just
-     * like async validation errors are. If there is an error that is not
-     * specific to any field, but applicable to the entire form, you may pass
-     * that as if it were the error for a field called _error, and it will be
-     * given as the error prop.
-     */
-    handleSubmit?(event:SyntheticEvent):void;
-
-    handleSubmit?(submit:(data:FormData, dispatch?:Dispatch)
-      => Promise<any>|void):FormEventHandler;
-
-    /**
-     * Initializes the form data to the given values. All dirty and pristine
-     * state will be determined by comparing the current data with these
-     * initialized values.
-     * @param data
-     */
-    initializeForm?(data:FormData):void;
-
-    /**
-     * true if the form has validation errors. Opposite of valid.
-     */
-    invalid?: boolean;
-
-    /**
-     * true if the form data is the same as its initialized values. Opposite
-     * of dirty.
-     */
-    pristine?: boolean;
-
-    /**
-     * Resets all the values in the form to the initialized state, making it
-     * pristine again.
-     */
-    resetForm?():void;
-
-    /**
-     * The same formKey prop that was passed in. See Editing Multiple Records.
-     */
-    formKey?: string;
-
-    /**
-     * Whether or not your form is currently submitting. This prop will only
-     * work if you have passed an onSubmit function that returns a promise. It
-     * will be true until the promise is resolved or rejected.
-     */
-    submitting?: boolean;
-
-    /**
-     * Starts as false. If onSubmit is called, and fails to submit for any
-     * reason, submitFailed will be set to true. A subsequent successful
-     * submit will set it back to false.
-     */
-    submitFailed?: boolean;
-
-    /**
-     * Marks the given fields as "touched" to show errors.
-     * @param field
-     */
-    touch?(...field:string[]):void;
-
-    /**
-     * Marks all fields as "touched" to show errors. This will automatically
-     * happen on form submission.
-     */
-    touchAll?():void;
-
-    /**
-     * Clears the "touched" flag for the given fields
-     * @param field
-     */
-    untouch?(...field:string[]):void;
-
-    /**
-     * Clears the "touched" flag for the all fields
-     */
-    untouchAll?():void;
-
-    /**
-     * true if the form passes validation (has no validation errors). Opposite
-     * of invalid.
-     */
-    valid?: boolean;
-
-    /**
-     * All of your values in the form { field1: <string>, field2: <string> }.
-     */
-    values?: FormData;
-  }
-
-  class ElementClass extends Component<any, any> {
-  }
-  interface ClassDecorator {
-    <T extends (typeof ElementClass)>(component:T): T;
-  }
-
-  interface MapStateToProps {
-    (state:any, ownProps?:any): any;
-  }
-
-  interface MapDispatchToPropsFunction {
-    (dispatch:Dispatch, ownProps?:any): any;
-  }
-
-  interface MapDispatchToPropsObject {
-    [name: string]: ActionCreator;
-  }
-
-  export function reduxForm(config:ReduxFormConfig,
-                            mapStateToProps?:MapStateToProps,
-                            mapDispatchToProps?:MapDispatchToPropsFunction|MapDispatchToPropsObject):ClassDecorator;
-
-  export interface ReduxFormConfig {
-    /**
-     * a list of all your fields in your form. You may change these dynamically
-     * at runtime.
-     */
-    fields: string[];
-
-    /**
-     * the name of your form and the key to where your form's state will be
-     * mounted under the redux-form reducer
-     */
-    form: string;
-
-    /**
-     * field names for which onBlur should trigger a call to the asyncValidate
-     * function. Defaults to [].
-     *
-     * See Asynchronous Blur Validation Example for more details.
-     */
-    asyncBlurFields?: string[];
-
-    /**
-     * a function that takes all the form values, the dispatch function, and
-     * the props given to your component, and returns a Promise that will
-     * resolve if the validation is passed, or will reject with an object of
-     * validation errors in the form { field1: <String>, field2: <String> }.
-     *
-     * See Asynchronous Blur Validation Example for more details.
-     */
-    asyncValidate?(values:FormData, dispatch:Dispatch, props:Object):
-      Promise<any>;
-
-    /**
-     * Whether or not to automatically destroy your form's state in the Redux
-     * store when your component is unmounted. Defaults to true.
-     */
-    destroyOnUnmount?: boolean;
-
-    /**
-     * The key for your sub-form.
-     *
-     * See Multirecord Example for more details.
-     */
-    formKey?: string;
-
-    /**
-     * A function that takes the entire Redux state and the reduxMountPoint
-     * (which defaults to "form"). It defaults to:
-     * (state, reduxMountPoint) => state[reduxMountPoint].
-     * The only reason you should provide this is if you are keeping your Redux
-     * state as something other than plain javascript objects, e.g. an
-     * Immutable.Map.
-     */
-    getFormState?(state:any, reduxMountPoint:string): any;
-
-    /**
-     * The values with which to initialize your form in componentWillMount().
-     * Particularly useful when Editing Multiple Records, but can also be used
-     * with single-record forms. The values should be in the form
-     * { field1: 'value1', field2: 'value2' }.
-     */
-    initialValues?: {[field:string]: FieldValue};
-
-    /**
-     * The function to call with the form data when the handleSubmit() is fired
-     * from within the form component. If you do not specify it as a prop here,
-     * you must pass it as a parameter to handleSubmit() inside your form
-     * component.
-     */
-    onSubmit?(values:FormData, dispatch?:Dispatch):any;
-
-    /**
-     * If specified, all the props normally passed into your decorated
-     * component directly will be passed under the key specified. Useful if
-     * using other decorator libraries on the same component to avoid prop
-     * namespace collisions.
-     */
-    propNamespace?: string;
-
-    /**
-     * if true, the decorated component will not be passed any of the onX
-     * functions as props that will allow it to mutate the state. Useful for
-     * decorating another component that is not your form, but that needs to
-     * know about the state of your form.
-     */
-    readonly?: boolean;
-
-    /**
-     * The use of this property is highly discouraged, but if you absolutely
-     * need to mount your redux-form reducer at somewhere other than form in
-     * your Redux state, you will need to specify the key you mounted it under
-     * with this property. Defaults to 'form'.
-     *
-     * See Alternate Mount Point Example for more details.
-     */
-    reduxMountPoint?: string;
-
-    /**
-     * If set to true, a failed submit will return a rejected promise. Defaults
-     * to false. Only use this if you need to detect submit failures and run
-     * some code when a submit fails.
-     */
-    returnRejectedSubmitPromise?: boolean;
-
-    /**
-     * marks fields as touched when the blur action is fired. Defaults to true.
-     */
-    touchOnBlur?: boolean;
-
-    /**
-     * marks fields as touched when the change action is fired. Defaults to
-     * false.
-     */
-    touchOnChange?: boolean;
-
-    /**
-     * a synchronous validation function that takes the form values and props
-     * passed into your component. If validation passes, it should return {}.
-     * If validation fails, it should return the validation errors in the form
-     * { field1: <String>, field2: <String> }.
-     * Defaults to (values, props) => ({}).
-     */
-    validate?(values:FormData, props:{[fieldName:string]: FieldProp}):Object;
-  }
-
-  /**
-   * @param value The current value of the field.
-   * @param previousValue The previous value of the field before the current
-   * action was dispatched.
-   * @param allValues All the values of the current form.
-   * @param previousAllValues All the values of the form before the current
-   * change. Useful to change one field based on a change in another.
-   */
-  export type Normalizer =
-    (value:FieldValue, previousValue:FieldValue,
-     allValues:FormData, previousAllValues:FormData) => any;
-
-  export const reducer:{
-    (state:any, action:any): any;
-
-    /**
-     * Returns a form reducer that will also pass each form value through the
-     * normalizing functions provided. The parameter is an object mapping from
-     * formName to an object mapping from fieldName to a normalizer function.
-     * The normalizer function is given four parameters and expected to return
-     * the normalized value of the field.
-     */
-    normalize(normalizers:{
-      [formName:string]: {
-        [fieldName:string]: Normalizer
-      }
-    }):Reducer;
-
-    /**
-     * Returns a form reducer that will also pass each action through
-     * additional reducers specified. The parameter should be an object mapping
-     * from formName to a (state, action) => nextState reducer. The state
-     * passed to each reducer will only be the slice that pertains to that
-     * form.
-     */
-    plugin(reducers:{[formName:string]: Reducer}):Reducer;
-  }
-}
diff --git a/redux-form/tsconfig.json b/redux-form/tsconfig.json
new file mode 100644
index 0000000000..5f6eb6d234
--- /dev/null
+++ b/redux-form/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-form-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/redux-immutable-state-invariant/index.d.ts b/redux-immutable-state-invariant/index.d.ts
new file mode 100644
index 0000000000..f9b34cfc32
--- /dev/null
+++ b/redux-immutable-state-invariant/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for react-router-redux v1.2.0
+// Project: https://github.com/leoasis/redux-immutable-state-invariant
+// Definitions by: Remo H. Jansen <https://github.com/remojansen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="redux" />
+
+
+type isImmutableDefault = (value: any) => boolean;
+type immutableStateInvariantMiddlewareInterface = (isImmutable?: isImmutableDefault) => Redux.Middleware;
+declare let immutableStateInvariantMiddleware: immutableStateInvariantMiddlewareInterface;
+export = immutableStateInvariantMiddleware;
diff --git a/redux-immutable-state-invariant/redux-immutable-state-invariant-tests.ts b/redux-immutable-state-invariant/redux-immutable-state-invariant-tests.ts
index 605c49e9f9..84a8fd5489 100644
--- a/redux-immutable-state-invariant/redux-immutable-state-invariant-tests.ts
+++ b/redux-immutable-state-invariant/redux-immutable-state-invariant-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./redux-immutable-state-invariant.d.ts" />
 
 import { applyMiddleware } from "redux";
 import * as immutableStateInvariantMiddleware from "redux-immutable-state-invariant";
diff --git a/redux-immutable-state-invariant/redux-immutable-state-invariant.d.ts b/redux-immutable-state-invariant/redux-immutable-state-invariant.d.ts
deleted file mode 100644
index 4943d36ce3..0000000000
--- a/redux-immutable-state-invariant/redux-immutable-state-invariant.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Type definitions for react-router-redux v1.2.0
-// Project: https://github.com/leoasis/redux-immutable-state-invariant
-// Definitions by: Remo H. Jansen <https://github.com/remojansen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../redux/redux.d.ts" />
-
-declare module "redux-immutable-state-invariant" {
-    type isImmutableDefault = (value: any) => boolean;
-    type immutableStateInvariantMiddlewareInterface = (isImmutable?: isImmutableDefault) => Redux.Middleware;
-    let immutableStateInvariantMiddleware: immutableStateInvariantMiddlewareInterface;
-    export = immutableStateInvariantMiddleware;
-}
diff --git a/redux-immutable-state-invariant/tsconfig.json b/redux-immutable-state-invariant/tsconfig.json
new file mode 100644
index 0000000000..2184048a08
--- /dev/null
+++ b/redux-immutable-state-invariant/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-immutable-state-invariant-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/redux-immutable/index.d.ts b/redux-immutable/index.d.ts
new file mode 100644
index 0000000000..a1e1211ec8
--- /dev/null
+++ b/redux-immutable/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for redux-immutable v3.0.5
+// Project: https://github.com/gajus/redux-immutable
+// Definitions by: Pedro Pereira <https://github.com/oizie>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export declare function combineReducers(reducers: Object): Object;
diff --git a/redux-immutable/redux-immutable-tests.ts b/redux-immutable/redux-immutable-tests.ts
index 2f92713ae8..8414252299 100644
--- a/redux-immutable/redux-immutable-tests.ts
+++ b/redux-immutable/redux-immutable-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="redux-immutable.d.ts" />
 
 import { combineReducers } from 'redux-immutable';
 
diff --git a/redux-immutable/redux-immutable.d.ts b/redux-immutable/redux-immutable.d.ts
deleted file mode 100644
index 21c9096846..0000000000
--- a/redux-immutable/redux-immutable.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Type definitions for redux-immutable v3.0.5
-// Project: https://github.com/gajus/redux-immutable
-// Definitions by: Pedro Pereira <https://github.com/oizie>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "redux-immutable" {
-    export function combineReducers(reducers : Object): Object;
-}
\ No newline at end of file
diff --git a/redux-immutable/tsconfig.json b/redux-immutable/tsconfig.json
new file mode 100644
index 0000000000..7ed095acbc
--- /dev/null
+++ b/redux-immutable/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-immutable-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/redux-logger/index.d.ts b/redux-logger/index.d.ts
new file mode 100644
index 0000000000..be26dc7d36
--- /dev/null
+++ b/redux-logger/index.d.ts
@@ -0,0 +1,49 @@
+// Type definitions for redux-logger v2.6.0
+// Project: https://github.com/fcomb/redux-logger
+// Definitions by: Alexander Rusakov <https://github.com/arusakov/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="redux" />
+
+
+
+type LoggerPredicate = (getState: () => any, action: any) => boolean;
+
+type StateToString = (state: any) => string;
+type ActionToString = (action: any) => string;
+type ErrorToString = (error: any, prevState: any) => string;
+
+interface ColorsObject {
+    title?: boolean | ActionToString;
+    prevState?: boolean | StateToString;
+    action?: boolean | ActionToString;
+    nextState?: boolean | StateToString;
+    error?: boolean | ErrorToString;
+}
+
+interface LevelObject {
+    prevState?: string | boolean | StateToString;
+    action?: string | boolean | ActionToString;
+    nextState?: string | boolean | StateToString;
+    error?: string | boolean | ErrorToString;
+}
+
+interface ReduxLoggerOptions {
+    level?: string | ActionToString | LevelObject;
+    duration?: boolean;
+    timestamp?: boolean;
+    colors?: ColorsObject;
+    logger?: any;
+    logErrors?: boolean;
+    collapsed?: boolean | LoggerPredicate;
+    predicate?: LoggerPredicate;
+    stateTransformer?: (state: any) => any;
+    actionTransformer?: (action: any) => any;
+    errorTransformer?: (error: any) => any;
+}
+
+// Trickery to get TypeScript to accept that our anonymous, non-default export is a function.
+// see https://github.com/Microsoft/TypeScript/issues/3612 for more
+declare namespace createLogger { }
+declare function createLogger(options?: ReduxLoggerOptions): Redux.Middleware;
+export = createLogger;
diff --git a/redux-logger/redux-logger-tests.ts b/redux-logger/redux-logger-tests.ts
index d93aa7e7da..f20b68b9f2 100644
--- a/redux-logger/redux-logger-tests.ts
+++ b/redux-logger/redux-logger-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./redux-logger.d.ts" />
 
 import * as createLogger from 'redux-logger';
 import { applyMiddleware, createStore } from 'redux'
diff --git a/redux-logger/redux-logger.d.ts b/redux-logger/redux-logger.d.ts
deleted file mode 100644
index f97ff95447..0000000000
--- a/redux-logger/redux-logger.d.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-// Type definitions for redux-logger v2.6.0
-// Project: https://github.com/fcomb/redux-logger
-// Definitions by: Alexander Rusakov <https://github.com/arusakov/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../redux/redux.d.ts" />
-
-declare module 'redux-logger' {
-
-  type LoggerPredicate = (getState: () => any, action: any) => boolean;
-
-  type StateToString = (state: any) => string;
-  type ActionToString = (action: any) => string;
-  type ErrorToString = (error: any, prevState: any) => string;
-
-  interface ColorsObject {
-    title?: boolean | ActionToString;
-    prevState?: boolean | StateToString;
-    action?: boolean | ActionToString;
-    nextState?: boolean | StateToString;
-    error?: boolean | ErrorToString;
-  }
-
-  interface LevelObject {
-    prevState?: string | boolean | StateToString;
-    action?: string | boolean | ActionToString;
-    nextState?: string | boolean | StateToString;
-    error?: string | boolean | ErrorToString;
-  }
-
-  interface ReduxLoggerOptions {
-    level?: string | ActionToString | LevelObject;
-    duration?: boolean;
-    timestamp?: boolean;
-    colors?: ColorsObject;
-    logger?: any;
-    logErrors?: boolean;
-    collapsed?: boolean | LoggerPredicate;
-    predicate?: LoggerPredicate;
-    stateTransformer?: (state: any) => any;
-    actionTransformer?: (action: any) => any;
-    errorTransformer?: (error: any) => any;
-  }
-
-  // Trickery to get TypeScript to accept that our anonymous, non-default export is a function.
-  // see https://github.com/Microsoft/TypeScript/issues/3612 for more
-  namespace createLogger {}
-  function createLogger(options?: ReduxLoggerOptions): Redux.Middleware;
-  export = createLogger;
-}
diff --git a/redux-logger/tsconfig.json b/redux-logger/tsconfig.json
new file mode 100644
index 0000000000..3a423fae4b
--- /dev/null
+++ b/redux-logger/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-logger-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/redux-promise/index.d.ts b/redux-promise/index.d.ts
new file mode 100644
index 0000000000..2233bea641
--- /dev/null
+++ b/redux-promise/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for redux-promise v0.5.3
+// Project: https://github.com/acdlite/redux-promise
+// Definitions by: Rogelio Morrell Caballero <https://github.com/molekilla>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="redux" />
+
+declare var promise: ReduxPromise.Promise;
+export default promise;
+
+declare namespace ReduxPromise {
+    export interface Promise extends Redux.Middleware {}
+    export interface PromiseInterface {
+      <T>(dispatch: Redux.Dispatch, getState?: () => T): any;
+    }
+}
\ No newline at end of file
diff --git a/redux-promise/redux-promise-tests.ts b/redux-promise/redux-promise-tests.ts
index 8859eaac52..8b8762e7b7 100644
--- a/redux-promise/redux-promise-tests.ts
+++ b/redux-promise/redux-promise-tests.ts
@@ -1,11 +1,10 @@
-/// <reference path="redux-promise.d.ts" />
-/// <reference path="../redux/redux.d.ts" />
-/// <reference path="../redux-actions/redux-actions.d.ts" />
+
+/// <reference types="redux" />
+/// <reference types="redux-actions" />
 
 import {createAction} from 'redux-actions';
 import { createStore, applyMiddleware } from 'redux';
 import promise from 'redux-promise';
-import PromiseInterface = ReduxPromise.PromiseInterface;
 
 declare var userReducer: any;
 
@@ -18,7 +17,7 @@ appStore.dispatch(
     listUsers()
 );
 
-function listUsers(): PromiseInterface {
+function listUsers() {
     return createAction('LIST_USERS',
         () => {
             return Promise.resolve([{ email: 'me@definitely.typed' }]);
diff --git a/redux-promise/redux-promise.d.ts b/redux-promise/redux-promise.d.ts
deleted file mode 100644
index 58b6d712a6..0000000000
--- a/redux-promise/redux-promise.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Type definitions for redux-promise v0.5.3
-// Project: https://github.com/acdlite/redux-promise
-// Definitions by: Rogelio Morrell Caballero <https://github.com/molekilla>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../redux/redux.d.ts" />
-
-declare namespace ReduxPromise {
-    export interface Promise extends Redux.Middleware {}
-    export interface PromiseInterface {
-      <T>(dispatch: Redux.Dispatch, getState?: () => T): any;
-    }
-}
-
-declare module "redux-promise" {
-    var promise: ReduxPromise.Promise;
-    export default promise;
-}
\ No newline at end of file
diff --git a/redux-promise/tsconfig.json b/redux-promise/tsconfig.json
new file mode 100644
index 0000000000..783b1b9c5b
--- /dev/null
+++ b/redux-promise/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-promise-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/redux-router/index.d.ts b/redux-router/index.d.ts
new file mode 100644
index 0000000000..144f53c048
--- /dev/null
+++ b/redux-router/index.d.ts
@@ -0,0 +1,42 @@
+// Type definitions for redux-router v1.0.0
+// Project: https://github.com/rackt/redux-router
+// Definitions by: Stepan Mikhaylyuk <http://github.com/stepancar>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as React from 'react';
+import * as ReactRouter from 'react-router';
+import * as Redux from 'redux';
+import * as H from 'history';
+
+import routerStateReducer from "./lib/routerStateReducer";
+import ReduxRouter from "./lib/ReduxRouter";
+import reduxReactRouter from "./lib/client";
+import isActive from "./lib/isActive";
+import {
+    historyAPI,
+    pushState,
+    push,
+    replaceState,
+    replace,
+    setState,
+    go,
+    goBack,
+    goForward
+} from "./lib/actionCreators";
+
+export {
+    ReduxRouter,
+    routerStateReducer,
+    reduxReactRouter,
+    isActive,
+    historyAPI,
+    pushState,
+    push,
+    replaceState,
+    replace,
+    setState,
+    go,
+    goBack,
+    goForward
+};
+
diff --git a/redux-router/lib/ReduxRouter.d.ts b/redux-router/lib/ReduxRouter.d.ts
new file mode 100644
index 0000000000..09b76fe160
--- /dev/null
+++ b/redux-router/lib/ReduxRouter.d.ts
@@ -0,0 +1,3 @@
+import Router from "react-router";
+
+export default Router;
diff --git a/redux-router/lib/actionCreators.d.ts b/redux-router/lib/actionCreators.d.ts
new file mode 100644
index 0000000000..9cd0c4581f
--- /dev/null
+++ b/redux-router/lib/actionCreators.d.ts
@@ -0,0 +1,17 @@
+export interface ReduxRouterAction {
+    type: string,
+    payload: any
+}
+
+export function routerDidChange(state: any): ReduxRouterAction;
+export function initRoutes(routes: any): ReduxRouterAction;
+export function replaceRoutes(routes: any): ReduxRouterAction;
+export function historyAPI(method: any): (...args: Object[]) => ReduxRouterAction;
+export const pushState: (...args: Object[]) => ReduxRouterAction;
+export const push: (...args: Object[]) => ReduxRouterAction;
+export const replaceState: (...args: Object[]) => ReduxRouterAction;
+export const replace: (...args: Object[]) => ReduxRouterAction;
+export const setState: (...args: Object[]) => ReduxRouterAction;
+export const go: (...args: Object[]) => ReduxRouterAction;
+export const goBack: (...args: Object[]) => ReduxRouterAction;
+export const goForward: (...args: Object[]) => ReduxRouterAction;
diff --git a/redux-router/lib/client.d.ts b/redux-router/lib/client.d.ts
new file mode 100644
index 0000000000..b73621f9ef
--- /dev/null
+++ b/redux-router/lib/client.d.ts
@@ -0,0 +1,5 @@
+/**
+* A Redux store enhancer that adds router state to the store.
+*/
+declare const reduxReactRouter: any;
+export default reduxReactRouter;
diff --git a/redux-router/lib/isActive.d.ts b/redux-router/lib/isActive.d.ts
new file mode 100644
index 0000000000..5c54dba949
--- /dev/null
+++ b/redux-router/lib/isActive.d.ts
@@ -0,0 +1,3 @@
+import * as H from 'history';
+
+export default function isActive(pathname: H.Pathname, query?: H.Query, indexOnly?: boolean): boolean;
diff --git a/redux-router/lib/routerStateReducer.d.ts b/redux-router/lib/routerStateReducer.d.ts
new file mode 100644
index 0000000000..f98f3e521f
--- /dev/null
+++ b/redux-router/lib/routerStateReducer.d.ts
@@ -0,0 +1,4 @@
+/**
+* A reducer that keeps track of Router state.
+*/
+export default function routerStateReducer(state: any, action: any): any;
diff --git a/redux-router/redux-router-tests.ts b/redux-router/redux-router-tests.ts
index 24274f4cdf..212c4534dd 100644
--- a/redux-router/redux-router-tests.ts
+++ b/redux-router/redux-router-tests.ts
@@ -1,4 +1,3 @@
-///<reference path="redux-router.d.ts" />
 import { reduxReactRouter, routerStateReducer, ReduxRouter, pushState } from 'redux-router';
 
 export function someAsyncReduxAction(someArg: Object) {
diff --git a/redux-router/redux-router.d.ts b/redux-router/redux-router.d.ts
deleted file mode 100644
index aebc0b7170..0000000000
--- a/redux-router/redux-router.d.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-// Type definitions for redux-router v1.0.0
-// Project: https://github.com/rackt/redux-router
-// Definitions by: Stepan Mikhaylyuk <http://github.com/stepancar>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts" />
-/// <reference path="../react-router/react-router.d.ts" />
-/// <reference path="../redux/redux.d.ts" />
-
-declare namespace __ReduxRouter {
-
-    import React = __React;
-    import H = HistoryModule;
-    /**
-    * A component that renders a React Router app using router state from a Redux store.
-    */
-    export class ReduxRouter extends React.Component<any, any> { }
-    /**
-    * A Redux store enhancer that adds router state to the store.
-    */
-    export var reduxReactRouter: any;
-
-    export function isActive(pathname: H.Pathname, query?: H.Query, indexOnly?: boolean): boolean;
-    /**
-    * A reducer that keeps track of Router state.
-    */
-    export function routerStateReducer(state: any, action: any): any;
-
-    export interface ReduxRouterAction {
-        type: string,
-        payload: any
-    }
-
-    export function routerDidChange(state: any): ReduxRouterAction;
-    export function initRoutes(routes: any): ReduxRouterAction;
-    export function replaceRoutes(routes: any): ReduxRouterAction;
-    export function historyAPI(method: any): (...args: Object[]) => ReduxRouterAction;
-}
-
-declare module "redux-router/lib/routerStateReducer" {
-    export default __ReduxRouter.routerStateReducer;
-}
-
-declare module "redux-router/lib/ReduxRouter" {
-    import Router from "react-router";
-    export default Router;
-}
-
-declare module "redux-router/lib/client" {
-    export default __ReduxRouter.reduxReactRouter;
-}
-
-declare module "redux-router/lib/isActive" {
-    export default __ReduxRouter.isActive;
-}
-
-declare module "redux-router/lib/actionCreators" {
-    export const routerDidChange: typeof __ReduxRouter.routerDidChange;
-    export const initRoutes: typeof __ReduxRouter.initRoutes;
-    export const replaceRoutes: typeof __ReduxRouter.replaceRoutes;
-    export const historyAPI: typeof __ReduxRouter.historyAPI;
-    export const pushState: (...args: Object[]) => __ReduxRouter.ReduxRouterAction;
-    export const push: (...args: Object[]) => __ReduxRouter.ReduxRouterAction;
-    export const replaceState: (...args: Object[]) => __ReduxRouter.ReduxRouterAction;
-    export const replace: (...args: Object[]) => __ReduxRouter.ReduxRouterAction;
-    export const setState: (...args: Object[]) => __ReduxRouter.ReduxRouterAction;
-    export const go: (...args: Object[]) => __ReduxRouter.ReduxRouterAction;
-    export const goBack: (...args: Object[]) => __ReduxRouter.ReduxRouterAction;
-    export const goForward: (...args: Object[]) => __ReduxRouter.ReduxRouterAction;
-}
-
-declare module "redux-router" {
-
-    import routerStateReducer from "redux-router/lib/routerStateReducer";
-    import ReduxRouter from "redux-router/lib/ReduxRouter";
-    import reduxReactRouter from "redux-router/lib/client";
-    import isActive from "redux-router/lib/isActive";
-
-    import {
-    historyAPI,
-    pushState,
-    push,
-    replaceState,
-    replace,
-    setState,
-    go,
-    goBack,
-    goForward
-    } from "redux-router/lib/actionCreators";
-
-    export {
-    routerStateReducer,
-    ReduxRouter,
-    reduxReactRouter,
-    isActive,
-    historyAPI,
-    pushState,
-    push,
-    replaceState,
-    replace,
-    setState,
-    go,
-    goBack,
-    goForward
-    }
-}
diff --git a/redux-router/tsconfig.json b/redux-router/tsconfig.json
new file mode 100644
index 0000000000..43e0c61a6e
--- /dev/null
+++ b/redux-router/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-router-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/redux-saga/index.d.ts b/redux-saga/index.d.ts
new file mode 100644
index 0000000000..3a0ac8ef4e
--- /dev/null
+++ b/redux-saga/index.d.ts
@@ -0,0 +1,137 @@
+// Type definitions for redux-saga 0.9.1
+// Project: https://github.com/yelouafi/redux-saga
+// Definitions by: Daniel Lytkin <https://github.com/aikoven>, Dimitri Rosenberg <https://github.com/rosendi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="redux" />
+
+declare module 'redux-saga' {
+  export class SagaCancellationException {
+  }
+
+  export type Saga = <T>(getState?: () => T) => Iterable<any>;
+  export type Predicate = (action: any) => boolean;
+  export type Pattern = string | string[] | Predicate;
+
+  import {Middleware} from 'redux';
+
+  interface SagaMiddleware extends Middleware {
+    run(saga: Saga, ...args: any[]): void;
+  }
+
+  export default function (...sagas: Saga[]): SagaMiddleware;
+
+  export {
+    CANCEL,
+    RACE_AUTO_CANCEL,
+    PARALLEL_AUTO_CANCEL,
+    MANUAL_CANCEL
+  } from 'redux-saga/lib/proc';
+
+  import * as monitorActions from 'redux-saga/lib/monitorActions';
+  export  {monitorActions}
+
+  export {runSaga, storeIO} from 'redux-saga/lib/runSaga'
+
+  export interface Task<T> {
+    name:string;
+    isRunning():boolean;
+    result():T;
+    error():any;
+    cancel(): void;
+  }
+
+  export function takeEvery(pattern: Pattern, saga: Saga, ...args: any[]): { [Symbol.iterator](): IterableIterator<any> };
+
+  export function takeLatest(pattern: Pattern, saga: Saga, ...args: any[]): { [Symbol.iterator](): IterableIterator<any> };
+
+  export function isCancelError(e: any): boolean;
+}
+
+declare module 'redux-saga/effects' {
+  import {Task} from 'redux-saga';
+  import {Predicate} from 'redux-saga';
+  import {Pattern} from 'redux-saga';
+
+  export type Effect = {};
+
+  type EffectFunction<T1, T2, T3> = (arg1?: T1, arg2?: T2, arg3?: T3, ...rest: any[]) => Promise<any> | Iterable<any>;
+
+  interface EffectFunctionContext<T1, T2, T3> {
+    0: any;
+    1: EffectFunction<T1, T2, T3>;
+  }
+
+  export function take(pattern?: Pattern): Effect;
+
+  export function put(action: any): Effect;
+
+  export function race(effects: {[key:string]: any}): Effect;
+
+  export function call<T1, T2, T3>(fn: EffectFunction<T1, T2, T3>, arg1?: T1, arg2?: T2, arg3?: T3, ...rest: any[]): Effect;
+
+  export function call<T1, T2, T3>(fn: EffectFunctionContext<T1, T2, T3>, arg1?: T1, arg2?: T2, arg3?: T3, ...rest: any[]): Effect;
+
+  export function apply<T1, T2, T3>(context: any, fn: EffectFunction<T1, T2, T3>, arg1?: T1, arg2?: T2, arg3?: T3, ...rest: any[]): Effect;
+
+  export function fork(effect: Effect): Effect;
+
+  export function fork<T1, T2, T3>(fn: EffectFunction<T1, T2, T3>, arg1?: T1, arg2?: T2, arg3?: T3, ...rest: any[]): Effect;
+
+  export function fork<T1, T2, T3>(fn: EffectFunctionContext<T1, T2, T3>, arg1?: T1, arg2?: T2, arg3?: T3, ...rest: any[]): Effect;
+
+  export function join(task: Task<any>): Effect;
+
+  export function select(selector?: (state: any, ...args: any[]) => any, ...args: any[]): Effect;
+
+  export function cancel(task: Task<any>): Effect;
+}
+
+declare module 'redux-saga/lib/proc' {
+  import {Task} from 'redux-saga';
+
+  export const CANCEL: symbol;
+  export const NOT_ITERATOR_ERROR: string;
+  export const PARALLEL_AUTO_CANCEL: string;
+  export const RACE_AUTO_CANCEL: string;
+  export const MANUAL_CANCEL: string;
+
+  export default function proc(iterator: Iterable<any>,
+                               subscribe?: (cb: Function) => Function,
+                               dispatch?: (action: any) => any,
+                               monitor?: (action: any) => void,
+                               parentEffectId?: any,
+                               name?: string): Task<any>;
+}
+
+
+declare module 'redux-saga/lib/runSaga' {
+  import {Store} from 'redux';
+  import {Task} from 'redux-saga';
+
+  interface IO {
+    dispatch: (action: any) => any;
+    subscribe: (cb: Function) => Function;
+  }
+
+  export function storeIO(store: Store): IO;
+
+  export function runSaga(iterator: Iterable<any>,
+                          io: IO,
+                          monitor?: (action: any) => void): Task<any>;
+}
+
+
+declare module 'redux-saga/lib/emitter' {
+  export default function emitter(): {
+    subscribe(cb: Function):Function;
+    emit(item: any):void;
+  }
+}
+
+declare module 'redux-saga/lib/monitorActions' {
+  export const MONITOR_ACTION: string;
+  export const EFFECT_TRIGGERED: string;
+  export const EFFECT_RESOLVED: string;
+  export const EFFECT_REJECTED: string;
+}
diff --git a/redux-saga/redux-saga-tests.ts b/redux-saga/redux-saga-tests.ts
index ce05915490..1165103186 100644
--- a/redux-saga/redux-saga-tests.ts
+++ b/redux-saga/redux-saga-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./redux-saga.d.ts" />
+
 
 
 import sagaMiddleware, {
diff --git a/redux-saga/redux-saga-tests.ts.tscparams b/redux-saga/redux-saga-tests.ts.tscparams
deleted file mode 100644
index 14fce22a5c..0000000000
--- a/redux-saga/redux-saga-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target ES6
diff --git a/redux-saga/redux-saga.d.ts b/redux-saga/redux-saga.d.ts
deleted file mode 100644
index a51e8faee7..0000000000
--- a/redux-saga/redux-saga.d.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-// Type definitions for redux-saga 0.9.1
-// Project: https://github.com/yelouafi/redux-saga
-// Definitions by: Daniel Lytkin <https://github.com/aikoven>, Dimitri Rosenberg <https://github.com/rosendi>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../redux/redux.d.ts" />
-
-declare module 'redux-saga' {
-  export class SagaCancellationException {
-  }
-
-  export type Saga = <T>(getState?: () => T) => Iterable<any>;
-  export type Predicate = (action: any) => boolean;
-  export type Pattern = string | string[] | Predicate;
-
-  import {Middleware} from 'redux';
-
-  interface SagaMiddleware extends Middleware {
-    run(saga: Saga, ...args: any[]): void;
-  }
-
-  export default function (...sagas: Saga[]): SagaMiddleware;
-
-  export {
-    CANCEL,
-    RACE_AUTO_CANCEL,
-    PARALLEL_AUTO_CANCEL,
-    MANUAL_CANCEL
-  } from 'redux-saga/lib/proc';
-
-  import * as monitorActions from 'redux-saga/lib/monitorActions';
-  export  {monitorActions}
-
-  export {runSaga, storeIO} from 'redux-saga/lib/runSaga'
-
-  export interface Task<T> {
-    name:string;
-    isRunning():boolean;
-    result():T;
-    error():any;
-    cancel(): void;
-  }
-
-  export function takeEvery(pattern: Pattern, saga: Saga, ...args: any[]): { [Symbol.iterator](): IterableIterator<any> };
-
-  export function takeLatest(pattern: Pattern, saga: Saga, ...args: any[]): { [Symbol.iterator](): IterableIterator<any> };
-
-  export function isCancelError(e: any): boolean;
-}
-
-declare module 'redux-saga/effects' {
-  import {Task} from 'redux-saga';
-  import {Predicate} from 'redux-saga';
-  import {Pattern} from 'redux-saga';
-
-  export type Effect = {};
-
-  type EffectFunction<T1, T2, T3> = (arg1?: T1, arg2?: T2, arg3?: T3, ...rest: any[]) => Promise<any> | Iterable<any>;
-
-  interface EffectFunctionContext<T1, T2, T3> {
-    0: any;
-    1: EffectFunction<T1, T2, T3>;
-  }
-
-  export function take(pattern?: Pattern): Effect;
-
-  export function put(action: any): Effect;
-
-  export function race(effects: {[key:string]: any}): Effect;
-
-  export function call<T1, T2, T3>(fn: EffectFunction<T1, T2, T3>, arg1?: T1, arg2?: T2, arg3?: T3, ...rest: any[]): Effect;
-
-  export function call<T1, T2, T3>(fn: EffectFunctionContext<T1, T2, T3>, arg1?: T1, arg2?: T2, arg3?: T3, ...rest: any[]): Effect;
-
-  export function apply<T1, T2, T3>(context: any, fn: EffectFunction<T1, T2, T3>, arg1?: T1, arg2?: T2, arg3?: T3, ...rest: any[]): Effect;
-
-  export function fork(effect: Effect): Effect;
-
-  export function fork<T1, T2, T3>(fn: EffectFunction<T1, T2, T3>, arg1?: T1, arg2?: T2, arg3?: T3, ...rest: any[]): Effect;
-
-  export function fork<T1, T2, T3>(fn: EffectFunctionContext<T1, T2, T3>, arg1?: T1, arg2?: T2, arg3?: T3, ...rest: any[]): Effect;
-
-  export function join(task: Task<any>): Effect;
-
-  export function select(selector?: (state: any, ...args: any[]) => any, ...args: any[]): Effect;
-
-  export function cancel(task: Task<any>): Effect;
-}
-
-declare module 'redux-saga/lib/proc' {
-  import {Task} from 'redux-saga';
-
-  export const CANCEL: symbol;
-  export const NOT_ITERATOR_ERROR: string;
-  export const PARALLEL_AUTO_CANCEL: string;
-  export const RACE_AUTO_CANCEL: string;
-  export const MANUAL_CANCEL: string;
-
-  export default function proc(iterator: Iterable<any>,
-                               subscribe?: (cb: Function) => Function,
-                               dispatch?: (action: any) => any,
-                               monitor?: (action: any) => void,
-                               parentEffectId?: any,
-                               name?: string): Task<any>;
-}
-
-
-declare module 'redux-saga/lib/runSaga' {
-  import {Store} from 'redux';
-  import {Task} from 'redux-saga';
-
-  interface IO {
-    dispatch: (action: any) => any;
-    subscribe: (cb: Function) => Function;
-  }
-
-  export function storeIO(store: Store): IO;
-
-  export function runSaga(iterator: Iterable<any>,
-                          io: IO,
-                          monitor?: (action: any) => void): Task<any>;
-}
-
-
-declare module 'redux-saga/lib/emitter' {
-  export default function emitter(): {
-    subscribe(cb: Function):Function;
-    emit(item: any):void;
-  }
-}
-
-declare module 'redux-saga/lib/monitorActions' {
-  export const MONITOR_ACTION: string;
-  export const EFFECT_TRIGGERED: string;
-  export const EFFECT_RESOLVED: string;
-  export const EFFECT_REJECTED: string;
-}
diff --git a/redux-saga/tsconfig.json b/redux-saga/tsconfig.json
new file mode 100644
index 0000000000..d228b272bb
--- /dev/null
+++ b/redux-saga/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-saga-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/redux-thunk/index.d.ts b/redux-thunk/index.d.ts
new file mode 100644
index 0000000000..cf7ee79cc5
--- /dev/null
+++ b/redux-thunk/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for redux-thunk v2.0.1
+// Project: https://github.com/gaearon/redux-thunk
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="redux" />
+
+declare var thunk: ReduxThunk.Thunk;
+export default thunk;
+export as namespace ReduxThunk;
+
+declare namespace ReduxThunk {
+    export interface Thunk extends Redux.Middleware {}
+    export interface ThunkInterface {
+      <T>(dispatch: Redux.Dispatch, getState?: () => T): any;
+    }
+}
diff --git a/redux-thunk/redux-thunk-tests.ts b/redux-thunk/redux-thunk-tests.ts
index f1283bf53c..09e507ee89 100644
--- a/redux-thunk/redux-thunk-tests.ts
+++ b/redux-thunk/redux-thunk-tests.ts
@@ -1,10 +1,9 @@
-/// <reference path="redux-thunk.d.ts" />
-/// <reference path="../redux/redux.d.ts" />
-/// <reference path="../express/express.d.ts" />
+
+/// <reference types="redux" />
+
 
 import { createStore, applyMiddleware, Store, Dispatch } from 'redux';
 import thunk from 'redux-thunk';
-import ThunkInterface = ReduxThunk.ThunkInterface;
 
 declare var rootReducer: Function;
 declare var fetch: any;
@@ -58,7 +57,7 @@ store.dispatch(withdrawMoney(100));
 // A thunk is a function that returns a function.
 // This is a thunk.
 
-function makeASandwichWithSecretSauce(forPerson: any): ThunkInterface {
+function makeASandwichWithSecretSauce(forPerson: any) {
 
     // Invert control!
     // Return a function that accepts `dispatch` so we can dispatch later.
@@ -92,7 +91,7 @@ store.dispatch(
 // actions and async actions from other action creators,
 // and I can build my control flow with Promises.
 
-function makeSandwichesForEverybody(): ThunkInterface {
+function makeSandwichesForEverybody() {
     return function (dispatch: Dispatch, getState: () => any): any {
         if (!getState().sandwiches.isShopOpen) {
 
diff --git a/redux-thunk/redux-thunk.d.ts b/redux-thunk/redux-thunk.d.ts
deleted file mode 100644
index d19d2a2d0c..0000000000
--- a/redux-thunk/redux-thunk.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Type definitions for redux-thunk v2.0.1
-// Project: https://github.com/gaearon/redux-thunk
-// Definitions by: Qubo <https://github.com/tkqubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../redux/redux.d.ts" />
-
-declare namespace ReduxThunk {
-    export interface Thunk extends Redux.Middleware {}
-    export interface ThunkInterface {
-      <T>(dispatch: Redux.Dispatch, getState?: () => T): any;
-    }
-}
-
-declare module "redux-thunk" {
-    var thunk: ReduxThunk.Thunk;
-    export default thunk;
-}
diff --git a/redux-thunk/tsconfig.json b/redux-thunk/tsconfig.json
new file mode 100644
index 0000000000..58455a2ddc
--- /dev/null
+++ b/redux-thunk/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-thunk-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/redux/index.d.ts b/redux/index.d.ts
new file mode 100644
index 0000000000..7d5bdf22e0
--- /dev/null
+++ b/redux/index.d.ts
@@ -0,0 +1,51 @@
+// Type definitions for Redux v3.3.1
+// Project: https://github.com/rackt/redux
+// Definitions by: William Buchwalter <https://github.com/wbuchwalter/>, Vincent Prouillet <https://github.com/Keats/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = Redux;
+export as namespace Redux;
+
+declare namespace Redux {
+
+    interface ActionCreator extends Function {
+        (...args: any[]): any;
+    }
+
+    interface Reducer extends Function {
+        (state: any, action: any): any;
+    }
+
+    interface Dispatch extends Function {
+        (action: any): any;
+    }
+
+    interface StoreMethods {
+        dispatch: Dispatch;
+        getState(): any;
+    }
+
+
+    interface MiddlewareArg {
+        dispatch: Dispatch;
+        getState: Function;
+    }
+
+    interface Middleware extends Function {
+        (obj: MiddlewareArg): Function;
+    }
+
+    class Store {
+        getReducer(): Reducer;
+        replaceReducer(nextReducer: Reducer): void;
+        dispatch(action: any): any;
+        getState(): any;
+        subscribe(listener: Function): Function;
+    }
+
+    function createStore(reducer: Reducer, initialState?: any, enhancer?: Function): Store;
+    function bindActionCreators<T>(actionCreators: T, dispatch: Dispatch): T;
+    function combineReducers(reducers: any): Reducer;
+    function applyMiddleware(...middlewares: Middleware[]): Function;
+    function compose<T extends Function>(...functions: Function[]): T;
+}
\ No newline at end of file
diff --git a/redux/redux-tests.ts b/redux/redux-tests.ts
index cc0c934997..83e56d5e81 100644
--- a/redux/redux-tests.ts
+++ b/redux/redux-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./redux.d.ts" />
+import Redux = require("redux");
 
 function counter(state: any, action: any) {
     if (!state) {
diff --git a/redux/redux.d.ts b/redux/redux.d.ts
deleted file mode 100644
index 3327236c14..0000000000
--- a/redux/redux.d.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// Type definitions for Redux v3.3.1
-// Project: https://github.com/rackt/redux
-// Definitions by: William Buchwalter <https://github.com/wbuchwalter/>, Vincent Prouillet <https://github.com/Keats/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace Redux {
-
-    interface ActionCreator extends Function {
-        (...args: any[]): any;
-    }
-
-    interface Reducer extends Function {
-        (state: any, action: any): any;
-    }
-
-    interface Dispatch extends Function {
-        (action: any): any;
-    }
-
-    interface StoreMethods {
-        dispatch: Dispatch;
-        getState(): any;
-    }
-
-
-    interface MiddlewareArg {
-        dispatch: Dispatch;
-        getState: Function;
-    }
-
-    interface Middleware extends Function {
-        (obj: MiddlewareArg): Function;
-    }
-
-    class Store {
-        getReducer(): Reducer;
-        replaceReducer(nextReducer: Reducer): void;
-        dispatch(action: any): any;
-        getState(): any;
-        subscribe(listener: Function): Function;
-    }
-
-    function createStore(reducer: Reducer, initialState?: any, enhancer?: Function): Store;
-    function bindActionCreators<T>(actionCreators: T, dispatch: Dispatch): T;
-    function combineReducers(reducers: any): Reducer;
-    function applyMiddleware(...middlewares: Middleware[]): Function;
-    function compose<T extends Function>(...functions: Function[]): T;
-}
-
-declare module "redux" {
-    export = Redux;
-}
diff --git a/redux/tsconfig.json b/redux/tsconfig.json
new file mode 100644
index 0000000000..c36a3401bd
--- /dev/null
+++ b/redux/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ref-array/index.d.ts b/ref-array/index.d.ts
new file mode 100644
index 0000000000..bea61616fc
--- /dev/null
+++ b/ref-array/index.d.ts
@@ -0,0 +1,62 @@
+// Type definitions for ref-array
+// Project: https://github.com/TooTallNate/ref-array
+// Definitions by: Paul Loyd <https://github.com/loyd>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import ref = require('ref');
+
+interface ArrayType<T> extends ref.Type {
+    BYTES_PER_ELEMENT: number;
+    fixedLength: number;
+    /** The reference to the base type. */
+    type: ref.Type;
+
+    /**
+     * Accepts a Buffer instance that should be an already-populated with data
+     * for the ArrayType. The "length" of the Array is determined by searching
+     * through the buffer's contents until an aligned NULL pointer is encountered.
+     */
+    untilZeros(buffer: Buffer): {
+        [i: number]: T; length: number; toArray(): T[];
+        toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer;
+    };
+
+    new (length?: number): {
+        [i: number]: T; length: number; toArray(): T[];
+        toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer;
+    };
+    new (data: number[], length?: number): {
+        [i: number]: T; length: number; toArray(): T[];
+        toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer;
+    };
+    new (data: Buffer, length?: number): {
+        [i: number]: T; length: number; toArray(): T[];
+        toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer;
+    };
+    (length?: number): {
+        [i: number]: T; length: number; toArray(): T[];
+        toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer;
+    };
+    (data: number[], length?: number): {
+        [i: number]: T; length: number; toArray(): T[];
+        toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer;
+    };
+    (data: Buffer, length?: number): {
+        [i: number]: T; length: number; toArray(): T[];
+        toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer;
+    };
+}
+
+/**
+ * The array type meta-constructor.
+ * The returned constructor's API is highly influenced by the WebGL
+ * TypedArray API.
+ */
+declare var ArrayType: {
+    new <T>(type: ref.Type, length?: number): ArrayType<T>;
+    new <T>(type: string, length?: number): ArrayType<T>;
+    <T>(type: ref.Type, length?: number): ArrayType<T>;
+    <T>(type: string, length?: number): ArrayType<T>;
+};
+
+export = ArrayType;
diff --git a/ref-array/ref-array.d.ts b/ref-array/ref-array.d.ts
deleted file mode 100644
index 42636573d4..0000000000
--- a/ref-array/ref-array.d.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-// Type definitions for ref-array
-// Project: https://github.com/TooTallNate/ref-array
-// Definitions by: Paul Loyd <https://github.com/loyd>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node-ffi/node-ffi-buffer.d.ts" />
-/// <reference path="../ref/ref.d.ts" />
-
-declare module "ref-array" {
-	import ref = require('ref');
-
-	interface ArrayType<T> extends ref.Type {
-		BYTES_PER_ELEMENT: number;
-		fixedLength: number;
-		/** The reference to the base type. */
-		type: ref.Type;
-
-		/**
-		 * Accepts a Buffer instance that should be an already-populated with data
-		 * for the ArrayType. The "length" of the Array is determined by searching
-		 * through the buffer's contents until an aligned NULL pointer is encountered.
-		 */
-		untilZeros(buffer: Buffer): { [i: number]: T; length: number; toArray(): T[];
-			toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer; };
-
-		new (length?: number): { [i: number]: T; length: number; toArray(): T[];
-			toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer; };
-		new (data: number[], length?: number): { [i: number]: T; length: number; toArray(): T[];
-			toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer; };
-		new (data: Buffer, length?: number): { [i: number]: T; length: number; toArray(): T[];
-			toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer; };
-		(length?: number): { [i: number]: T; length: number; toArray(): T[];
-			toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer; };
-		(data: number[], length?: number): { [i: number]: T; length: number; toArray(): T[];
-			toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer; };
-		(data: Buffer, length?: number): { [i: number]: T; length: number; toArray(): T[];
-			toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer; };
-	}
-
-	/**
-	 * The array type meta-constructor.
-	 * The returned constructor's API is highly influenced by the WebGL
-	 * TypedArray API.
-	 */
-	var ArrayType: {
-		new <T>(type: ref.Type, length?: number): ArrayType<T>;
-		new <T>(type: string, length?: number): ArrayType<T>;
-		<T>(type: ref.Type, length?: number): ArrayType<T>;
-		<T>(type: string, length?: number): ArrayType<T>;
-	};
-
-export = ArrayType;
-}
diff --git a/ref-array/tsconfig.json b/ref-array/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/ref-array/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ref-struct/index.d.ts b/ref-struct/index.d.ts
new file mode 100644
index 0000000000..e0b47b288e
--- /dev/null
+++ b/ref-struct/index.d.ts
@@ -0,0 +1,59 @@
+// Type definitions for ref-struct
+// Project: https://github.com/TooTallNate/ref-struct
+// Definitions by: Paul Loyd <https://github.com/loyd>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import ref = require('ref');
+
+/**
+ * This is the `constructor` of the Struct type that gets returned.
+ *
+ * Invoke it with `new` to create a new Buffer instance backing the struct.
+ * Pass it an existing Buffer instance to use that as the backing buffer.
+ * Pass in an Object containing the struct fields to auto-populate the
+ * struct with the data.
+ *
+ * @constructor
+ */
+interface StructType extends ref.Type {
+    /** Pass it an existing Buffer instance to use that as the backing buffer. */
+    new (arg: Buffer, data?: {}): any;
+    new (data?: {}): any;
+    /** Pass it an existing Buffer instance to use that as the backing buffer. */
+    (arg: Buffer, data?: {}): any;
+    (data?: {}): any;
+
+    fields: { [key: string]: { type: ref.Type } };
+
+    /**
+     * Adds a new field to the struct instance with the given name and type.
+     * Note that this function will throw an Error if any instances of the struct
+     * type have already been created, therefore this function must be called at the
+     * beginning, before any instances are created.
+     */
+    defineProperty(name: string, type: ref.Type): void;
+
+    /**
+     * Adds a new field to the struct instance with the given name and type.
+     * Note that this function will throw an Error if any instances of the struct
+     * type have already been created, therefore this function must be called at the
+     * beginning, before any instances are created.
+     */
+    defineProperty(name: string, type: string): void;
+
+    /**
+     * Custom for struct type instances.
+     * @override
+     */
+    toString(): string;
+}
+
+/** The struct type meta-constructor. */
+declare var StructType: {
+    new (fields?: {}): StructType;
+    new (fields?: any[]): StructType;
+    (fields?: {}): StructType;
+    (fields?: any[]): StructType;
+}
+
+export = StructType;
diff --git a/ref-struct/ref-struct.d.ts b/ref-struct/ref-struct.d.ts
deleted file mode 100644
index 3ba558e993..0000000000
--- a/ref-struct/ref-struct.d.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-// Type definitions for ref-struct
-// Project: https://github.com/TooTallNate/ref-struct
-// Definitions by: Paul Loyd <https://github.com/loyd>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node-ffi/node-ffi-buffer.d.ts" />
-/// <reference path="../ref/ref.d.ts" />
-
-declare module "ref-struct" {
-	import ref = require('ref');
-
-	/**
-	 * This is the `constructor` of the Struct type that gets returned.
-	 *
-	 * Invoke it with `new` to create a new Buffer instance backing the struct.
-	 * Pass it an existing Buffer instance to use that as the backing buffer.
-	 * Pass in an Object containing the struct fields to auto-populate the
-	 * struct with the data.
-	 *
-	 * @constructor
-	 */
-	interface StructType extends ref.Type {
-		/** Pass it an existing Buffer instance to use that as the backing buffer. */
-		new (arg: Buffer, data?: {}): any;
-		new (data?: {}): any;
-		/** Pass it an existing Buffer instance to use that as the backing buffer. */
-		(arg: Buffer, data?: {}): any;
-		(data?: {}): any;
-
-		fields: {[key: string]: {type: ref.Type}};
-
-		/**
-		 * Adds a new field to the struct instance with the given name and type.
-		 * Note that this function will throw an Error if any instances of the struct
-		 * type have already been created, therefore this function must be called at the
-		 * beginning, before any instances are created.
-		 */
-		defineProperty(name: string, type: ref.Type): void;
-
-		/**
-		 * Adds a new field to the struct instance with the given name and type.
-		 * Note that this function will throw an Error if any instances of the struct
-		 * type have already been created, therefore this function must be called at the
-		 * beginning, before any instances are created.
-		 */
-		defineProperty(name: string, type: string): void;
-
-		/**
-		 * Custom for struct type instances.
-		 * @override
-		 */
-		toString(): string;
-	}
-
-	/** The struct type meta-constructor. */
-	var StructType: {
-		new (fields?: {}): StructType;
-		new (fields?: any[]): StructType;
-		(fields?: {}): StructType;
-		(fields?: any[]): StructType;
-	}
-
-export = StructType;
-}
diff --git a/ref-struct/tsconfig.json b/ref-struct/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/ref-struct/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ref-union/index.d.ts b/ref-union/index.d.ts
new file mode 100644
index 0000000000..395925fbdf
--- /dev/null
+++ b/ref-union/index.d.ts
@@ -0,0 +1,59 @@
+// Type definitions for ref-union
+// Project: https://github.com/TooTallNate/ref-union
+// Definitions by: Paul Loyd <https://github.com/loyd>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import ref = require('ref');
+
+/**
+ * This is the `constructor` of the Struct type that gets returned.
+ *
+ * Invoke it with `new` to create a new Buffer instance backing the union.
+ * Pass it an existing Buffer instance to use that as the backing buffer.
+ * Pass in an Object containing the union fields to auto-populate the
+ * union with the data.
+ *
+ * @constructor
+ */
+interface UnionType extends ref.Type {
+    /** Pass it an existing Buffer instance to use that as the backing buffer. */
+    new (arg: Buffer, data?: {}): any;
+    new (data?: {}): any;
+    /** Pass it an existing Buffer instance to use that as the backing buffer. */
+    (arg: Buffer, data?: {}): any;
+    (data?: {}): any;
+
+    fields: { [key: string]: { type: ref.Type } };
+
+    /**
+     * Adds a new field to the union instance with the given name and type.
+     * Note that this function will throw an Error if any instances of the union
+     * type have already been created, therefore this function must be called at the
+     * beginning, before any instances are created.
+     */
+    defineProperty(name: string, type: ref.Type): void;
+
+    /**
+     * Adds a new field to the union instance with the given name and type.
+     * Note that this function will throw an Error if any instances of the union
+     * type have already been created, therefore this function must be called at the
+     * beginning, before any instances are created.
+     */
+    defineProperty(name: string, type: string): void;
+
+    /**
+     * Custom for union type instances.
+     * @override
+     */
+    toString(): string;
+}
+
+/** The union type meta-constructor. */
+declare var UnionType: {
+    new (fields?: {}): UnionType;
+    new (fields?: any[]): UnionType;
+    (fields?: {}): UnionType;
+    (fields?: any[]): UnionType;
+}
+
+export = UnionType;
diff --git a/ref-union/ref-union.d.ts b/ref-union/ref-union.d.ts
deleted file mode 100644
index c26ad1216d..0000000000
--- a/ref-union/ref-union.d.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-// Type definitions for ref-union
-// Project: https://github.com/TooTallNate/ref-union
-// Definitions by: Paul Loyd <https://github.com/loyd>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node-ffi/node-ffi-buffer.d.ts" />
-/// <reference path="../ref/ref.d.ts" />
-
-declare module "ref-union" {
-	import ref = require('ref');
-
-	/**
-	 * This is the `constructor` of the Struct type that gets returned.
-	 *
-	 * Invoke it with `new` to create a new Buffer instance backing the union.
-	 * Pass it an existing Buffer instance to use that as the backing buffer.
-	 * Pass in an Object containing the union fields to auto-populate the
-	 * union with the data.
-	 *
-	 * @constructor
-	 */
-	interface UnionType extends ref.Type {
-		/** Pass it an existing Buffer instance to use that as the backing buffer. */
-		new (arg: Buffer, data?: {}): any;
-		new (data?: {}): any;
-		/** Pass it an existing Buffer instance to use that as the backing buffer. */
-		(arg: Buffer, data?: {}): any;
-		(data?: {}): any;
-
-		fields: {[key: string]: {type: ref.Type}};
-
-		/**
-		 * Adds a new field to the union instance with the given name and type.
-		 * Note that this function will throw an Error if any instances of the union
-		 * type have already been created, therefore this function must be called at the
-		 * beginning, before any instances are created.
-		 */
-		defineProperty(name: string, type: ref.Type): void;
-
-		/**
-		 * Adds a new field to the union instance with the given name and type.
-		 * Note that this function will throw an Error if any instances of the union
-		 * type have already been created, therefore this function must be called at the
-		 * beginning, before any instances are created.
-		 */
-		defineProperty(name: string, type: string): void;
-
-		/**
-		 * Custom for union type instances.
-		 * @override
-		 */
-		toString(): string;
-	}
-
-	/** The union type meta-constructor. */
-	var UnionType: {
-		new (fields?: {}): UnionType;
-		new (fields?: any[]): UnionType;
-		(fields?: {}): UnionType;
-		(fields?: any[]): UnionType;
-	}
-
-export = UnionType;
-}
diff --git a/ref-union/tsconfig.json b/ref-union/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/ref-union/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ref/index.d.ts b/ref/index.d.ts
new file mode 100644
index 0000000000..cfd0c43741
--- /dev/null
+++ b/ref/index.d.ts
@@ -0,0 +1,188 @@
+// Type definitions for ref
+// Project: https://github.com/TooTallNate/ref
+// Definitions by: Paul Loyd <https://github.com/loyd>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export interface Type {
+    /** The size in bytes required to hold this datatype. */
+    size: number;
+    /** The current level of indirection of the buffer. */
+    indirection: number;
+    /** To invoke when `ref.get` is invoked on a buffer of this type. */
+    get(buffer: Buffer, offset: number): any;
+    /** To invoke when `ref.set` is invoked on a buffer of this type. */
+    set(buffer: Buffer, offset: number, value: any): void;
+    /** The name to use during debugging for this datatype. */
+    name?: string;
+    /** The alignment of this datatype when placed inside a struct. */
+    alignment?: number;
+}
+
+/** A Buffer that references the C NULL pointer. */
+export declare var NULL: Buffer;
+/** A pointer-sized buffer pointing to NULL. */
+export declare var NULL_POINTER: Buffer;
+/** Get the memory address of buffer. */
+export declare function address(buffer: Buffer): number;
+/** Allocate the memory with the given value written to it. */
+export declare function alloc(type: Type, value?: any): Buffer;
+/** Allocate the memory with the given value written to it. */
+export declare function alloc(type: string, value?: any): Buffer;
+
+/**
+ * Allocate the memory with the given string written to it with the given
+ * encoding (defaults to utf8). The buffer is 1 byte longer than the
+ * string itself, and is NULL terminated.
+ */
+export declare function allocCString(string: string, encoding?: string): Buffer;
+
+/** Coerce a type.*/
+export declare function coerceType(type: Type): Type;
+/** Coerce a type. String are looked up from the ref.types object. */
+export declare function coerceType(type: string): Type;
+
+/**
+ * Get value after dereferencing buffer.
+ * That is, first it checks the indirection count of buffer's type, and
+ * if it's greater than 1 then it merely returns another Buffer, but with
+ * one level less indirection.
+ */
+export declare function deref(buffer: Buffer): any;
+
+/** Create clone of the type, with decremented indirection level by 1. */
+export declare function derefType(type: Type): Type;
+/** Create clone of the type, with decremented indirection level by 1. */
+export declare function derefType(type: string): Type;
+/** Represents the native endianness of the processor ("LE" or "BE"). */
+export declare var endianness: string;
+/** Check the indirection level and return a dereferenced when necessary. */
+export declare function get(buffer: Buffer, offset?: number, type?: Type): any;
+/** Check the indirection level and return a dereferenced when necessary. */
+export declare function get(buffer: Buffer, offset?: number, type?: string): any;
+/** Get type of the buffer. Create a default type when none exists. */
+export declare function getType(buffer: Buffer): Type;
+/** Check the NULL. */
+export declare function isNull(buffer: Buffer): boolean;
+/** Read C string until the first NULL. */
+export declare function readCString(buffer: Buffer, offset?: number): string;
+
+/**
+ * Read a big-endian signed 64-bit int.
+ * If there is losing precision, then return a string, otherwise a number.
+ * @return {number|string}
+ */
+export declare function readInt64BE(buffer: Buffer, offset?: number): any;
+
+/**
+ * Read a little-endian signed 64-bit int.
+ * If there is losing precision, then return a string, otherwise a number.
+ * @return {number|string}
+ */
+export declare function readInt64LE(buffer: Buffer, offset?: number): any;
+
+/** Read a JS Object that has previously been written. */
+export declare function readObject(buffer: Buffer, offset?: number): Object;
+/** Read data from the pointer. */
+export declare function readPointer(buffer: Buffer, offset?: number,
+    length?: number): Buffer;
+/**
+ * Read a big-endian unsigned 64-bit int.
+ * If there is losing precision, then return a string, otherwise a number.
+ * @return {number|string}
+ */
+export declare function readUInt64BE(buffer: Buffer, offset?: number): any;
+
+/**
+ * Read a little-endian unsigned 64-bit int.
+ * If there is losing precision, then return a string, otherwise a number.
+ * @return {number|string}
+ */
+export declare function readUInt64LE(buffer: Buffer, offset?: number): any;
+
+/** Create pointer to buffer. */
+export declare function ref(buffer: Buffer): Buffer;
+/** Create clone of the type, with incremented indirection level by 1. */
+export declare function refType(type: Type): Type;
+/** Create clone of the type, with incremented indirection level by 1. */
+export declare function refType(type: string): Type;
+
+/**
+ * Create buffer with the specified size, with the same address as source.
+ * This function "attaches" source to the returned buffer to prevent it from
+ * being garbage collected.
+ */
+export declare function reinterpret(buffer: Buffer, size: number,
+    offset?: number): Buffer;
+/**
+ * Scan past the boundary of the buffer's length until it finds size number
+ * of aligned NULL bytes.
+ */
+export declare function reinterpretUntilZeros(buffer: Buffer, size: number,
+    offset?: number): Buffer;
+
+/** Write pointer if the indirection is 1, otherwise write value. */
+export declare function set(buffer: Buffer, offset: number, value: any, type?: Type): void;
+/** Write pointer if the indirection is 1, otherwise write value. */
+export declare function set(buffer: Buffer, offset: number, value: any, type?: string): void;
+/** Write the string as a NULL terminated. Default encoding is utf8. */
+export declare function writeCString(buffer: Buffer, offset: number,
+    string: string, encoding?: string): void;
+/** Write a big-endian signed 64-bit int. */
+export declare function writeInt64BE(buffer: Buffer, offset: number, input: number): void;
+/** Write a big-endian signed 64-bit int. */
+export declare function writeInt64BE(buffer: Buffer, offset: number, input: string): void;
+/** Write a little-endian signed 64-bit int. */
+export declare function writeInt64LE(buffer: Buffer, offset: number, input: number): void;
+/** Write a little-endian signed 64-bit int. */
+export declare function writeInt64LE(buffer: Buffer, offset: number, input: string): void;
+
+/**
+ * Write the JS Object. This function "attaches" object to buffer to prevent
+ * it from being garbage collected.
+ */
+export declare function writeObject(buffer: Buffer, offset: number, object: Object): void;
+
+/**
+ * Write the memory address of pointer to buffer at the specified offset. This
+ * function "attaches" object to buffer to prevent it from being garbage collected.
+ */
+export declare function writePointer(buffer: Buffer, offset: number,
+    pointer: Buffer): void;
+
+/** Write a little-endian unsigned 64-bit int. */
+export declare function writeUInt64BE(buffer: Buffer, offset: number, input: number): void;
+/** Write a little-endian unsigned 64-bit int. */
+export declare function writeUInt64BE(buffer: Buffer, offset: number, input: string): void;
+
+/**
+ * Attach object to buffer such.
+ * It prevents object from being garbage collected until buffer does.
+ */
+export declare function _attach(buffer: Buffer, object: Object): void;
+
+/** Same as ref.reinterpret, except that this version does not attach buffer. */
+export declare function _reinterpret(buffer: Buffer, size: number,
+    offset?: number): Buffer;
+/** Same as ref.reinterpretUntilZeros, except that this version does not attach buffer. */
+export declare function _reinterpretUntilZeros(buffer: Buffer, size: number,
+    offset?: number): Buffer;
+/** Same as ref.writePointer, except that this version does not attach pointer. */
+export declare function _writePointer(buffer: Buffer, offset: number,
+    pointer: Buffer): void;
+/** Same as ref.writeObject, except that this version does not attach object. */
+export declare function _writeObject(buffer: Buffer, offset: number, object: Object): void;
+
+/** Default types. */
+export declare var types: {
+    void: Type; int64: Type; ushort: Type;
+    int: Type; uint64: Type; float: Type;
+    uint: Type; long: Type; double: Type;
+    int8: Type; ulong: Type; Object: Type;
+    uint8: Type; longlong: Type; CString: Type;
+    int16: Type; ulonglong: Type; bool: Type;
+    uint16: Type; char: Type; byte: Type;
+    int32: Type; uchar: Type; size_t: Type;
+    uint32: Type; short: Type;
+};
diff --git a/ref/ref.d.ts b/ref/ref.d.ts
deleted file mode 100644
index 70f2ba7593..0000000000
--- a/ref/ref.d.ts
+++ /dev/null
@@ -1,190 +0,0 @@
-// Type definitions for ref
-// Project: https://github.com/TooTallNate/ref
-// Definitions by: Paul Loyd <https://github.com/loyd>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node-ffi/node-ffi-buffer.d.ts" />
-
-declare module "ref" {
-	export interface Type {
-		/** The size in bytes required to hold this datatype. */
-		size: number;
-		/** The current level of indirection of the buffer. */
-		indirection: number;
-		/** To invoke when `ref.get` is invoked on a buffer of this type. */
-		get(buffer: Buffer, offset: number): any;
-		/** To invoke when `ref.set` is invoked on a buffer of this type. */
-		set(buffer: Buffer, offset: number, value: any): void;
-		/** The name to use during debugging for this datatype. */
-		name?: string;
-		/** The alignment of this datatype when placed inside a struct. */
-		alignment?: number;
-	}
-
-	/** A Buffer that references the C NULL pointer. */
-	export var NULL: Buffer;
-	/** A pointer-sized buffer pointing to NULL. */
-	export var NULL_POINTER: Buffer;
-	/** Get the memory address of buffer. */
-	export function address(buffer: Buffer): number;
-	/** Allocate the memory with the given value written to it. */
-	export function alloc(type: Type, value?: any): Buffer;
-	/** Allocate the memory with the given value written to it. */
-	export function alloc(type: string, value?: any): Buffer;
-
-	/**
-	 * Allocate the memory with the given string written to it with the given
-	 * encoding (defaults to utf8). The buffer is 1 byte longer than the
-	 * string itself, and is NULL terminated.
-	 */
-	export function allocCString(string: string, encoding?: string): Buffer;
-
-	/** Coerce a type.*/
-	export function coerceType(type: Type): Type;
-	/** Coerce a type. String are looked up from the ref.types object. */
-	export function coerceType(type: string): Type;
-
-	/**
-	 * Get value after dereferencing buffer.
-	 * That is, first it checks the indirection count of buffer's type, and
-	 * if it's greater than 1 then it merely returns another Buffer, but with
-	 * one level less indirection.
-	 */
-	export function deref(buffer: Buffer): any;
-
-	/** Create clone of the type, with decremented indirection level by 1. */
-	export function derefType(type: Type): Type;
-	/** Create clone of the type, with decremented indirection level by 1. */
-	export function derefType(type: string): Type;
-	/** Represents the native endianness of the processor ("LE" or "BE"). */
-	export var endianness: string;
-	/** Check the indirection level and return a dereferenced when necessary. */
-	export function get(buffer: Buffer, offset?: number, type?: Type): any;
-	/** Check the indirection level and return a dereferenced when necessary. */
-	export function get(buffer: Buffer, offset?: number, type?: string): any;
-	/** Get type of the buffer. Create a default type when none exists. */
-	export function getType(buffer: Buffer): Type;
-	/** Check the NULL. */
-	export function isNull(buffer: Buffer): boolean;
-	/** Read C string until the first NULL. */
-	export function readCString(buffer: Buffer, offset?: number): string;
-
-	/**
-	 * Read a big-endian signed 64-bit int.
-	 * If there is losing precision, then return a string, otherwise a number.
-	 * @return {number|string}
-	 */
-	export function readInt64BE(buffer: Buffer, offset?: number): any;
-
-	/**
-	 * Read a little-endian signed 64-bit int.
-	 * If there is losing precision, then return a string, otherwise a number.
-	 * @return {number|string}
-	 */
-	export function readInt64LE(buffer: Buffer, offset?: number): any;
-
-	/** Read a JS Object that has previously been written. */
-	export function readObject(buffer: Buffer, offset?: number): Object;
-	/** Read data from the pointer. */
-	export function readPointer(buffer: Buffer, offset?: number,
-								length?: number): Buffer;
-	/**
-	 * Read a big-endian unsigned 64-bit int.
-	 * If there is losing precision, then return a string, otherwise a number.
-	 * @return {number|string}
-	 */
-	export function readUInt64BE(buffer: Buffer, offset?: number): any;
-
-	/**
-	 * Read a little-endian unsigned 64-bit int.
-	 * If there is losing precision, then return a string, otherwise a number.
-	 * @return {number|string}
-	 */
-	export function readUInt64LE(buffer: Buffer, offset?: number): any;
-
-	/** Create pointer to buffer. */
-	export function ref(buffer: Buffer): Buffer;
-	/** Create clone of the type, with incremented indirection level by 1. */
-	export function refType(type: Type): Type;
-	/** Create clone of the type, with incremented indirection level by 1. */
-	export function refType(type: string): Type;
-
-	/**
-	 * Create buffer with the specified size, with the same address as source.
-	 * This function "attaches" source to the returned buffer to prevent it from
-	 * being garbage collected.
-	 */
-	export function reinterpret(buffer: Buffer, size: number,
-								offset?: number): Buffer;
-	/**
-	 * Scan past the boundary of the buffer's length until it finds size number
-	 * of aligned NULL bytes.
-	 */
-	export function reinterpretUntilZeros(buffer: Buffer, size: number,
-										  offset?: number): Buffer;
-
-	/** Write pointer if the indirection is 1, otherwise write value. */
-	export function set(buffer: Buffer, offset: number, value: any, type?: Type): void;
-	/** Write pointer if the indirection is 1, otherwise write value. */
-	export function set(buffer: Buffer, offset: number, value: any, type?: string): void;
-	/** Write the string as a NULL terminated. Default encoding is utf8. */
-	export function writeCString(buffer: Buffer, offset: number,
-								 string: string, encoding?: string): void;
-	/** Write a big-endian signed 64-bit int. */
-	export function writeInt64BE(buffer: Buffer, offset: number, input: number): void;
-	/** Write a big-endian signed 64-bit int. */
-	export function writeInt64BE(buffer: Buffer, offset: number, input: string): void;
-	/** Write a little-endian signed 64-bit int. */
-	export function writeInt64LE(buffer: Buffer, offset: number, input: number): void;
-	/** Write a little-endian signed 64-bit int. */
-	export function writeInt64LE(buffer: Buffer, offset: number, input: string): void;
-
-	/**
-	 * Write the JS Object. This function "attaches" object to buffer to prevent
-	 * it from being garbage collected.
-	 */
-	export function writeObject(buffer: Buffer, offset: number, object: Object): void;
-
-	/**
-	 * Write the memory address of pointer to buffer at the specified offset. This
-	 * function "attaches" object to buffer to prevent it from being garbage collected.
-	 */
-	export function writePointer(buffer: Buffer, offset: number,
-								 pointer: Buffer): void;
-
-	/** Write a little-endian unsigned 64-bit int. */
-	export function writeUInt64BE(buffer: Buffer, offset: number, input: number): void;
-	/** Write a little-endian unsigned 64-bit int. */
-	export function writeUInt64BE(buffer: Buffer, offset: number, input: string): void;
-
-	/**
-	 * Attach object to buffer such.
-	 * It prevents object from being garbage collected until buffer does.
-	 */
-	export function _attach(buffer: Buffer, object: Object): void;
-
-	/** Same as ref.reinterpret, except that this version does not attach buffer. */
-	export function _reinterpret(buffer: Buffer, size: number,
-								 offset?: number): Buffer;
-	/** Same as ref.reinterpretUntilZeros, except that this version does not attach buffer. */
-	export function _reinterpretUntilZeros(buffer: Buffer, size: number,
-										   offset?: number): Buffer;
-	/** Same as ref.writePointer, except that this version does not attach pointer. */
-	export function _writePointer(buffer: Buffer, offset: number,
-								  pointer: Buffer): void;
-	/** Same as ref.writeObject, except that this version does not attach object. */
-	export function _writeObject(buffer: Buffer, offset: number, object: Object): void;
-
-	/** Default types. */
-	export var types: {
-		void: Type;            int64: Type;            ushort: Type;
-		int: Type;             uint64: Type;           float: Type;
-		uint: Type;            long: Type;             double: Type;
-		int8: Type;            ulong: Type;            Object: Type;
-		uint8: Type;           longlong: Type;         CString: Type;
-		int16: Type;           ulonglong: Type;        bool: Type;
-		uint16: Type;          char: Type;             byte: Type;
-		int32: Type;           uchar: Type;            size_t: Type;
-		uint32: Type;          short: Type;
-	};
-}
diff --git a/ref/tsconfig.json b/ref/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/ref/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/reflux/index.d.ts b/reflux/index.d.ts
new file mode 100644
index 0000000000..0da53914bf
--- /dev/null
+++ b/reflux/index.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for RefluxJS
+// Project: https://github.com/reflux/refluxjs
+// Definitions by: Maurice de Beijer <https://github.com/mauricedb>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = RefluxCore;
+export as namespace Reflux;
+
+declare module  RefluxCore {
+
+    interface StoreDefinition {
+        listenables?: any[],
+        init?: Function,
+        getInitialState?: Function,
+        [propertyName: string]: any;
+    }
+
+    interface ListenFn {
+        (...params: any[]):any,
+        completed: Function,
+        failed: Function
+    }
+    interface Listenable {
+        listen: ListenFn
+    }
+
+    interface Subscription {
+        stop: Function,
+        listenable: Listenable
+    }
+
+    interface Store {
+        hasListener(listenable: Listenable): boolean,
+        listenToMany(listenables: Listenable[]): void,
+        validateListening(listenable: Listenable): string,
+        listenTo(listenable: Listenable, callback: Function, defaultCallback?: Function): Subscription,
+        stopListeningTo(listenable: Listenable): boolean,
+        stopListeningToAll(): void,
+        fetchInitialState(listenable: Listenable, defaultCallback: Function): void,
+        trigger(state: any):void;
+    }
+
+    interface ActionsDefinition {
+        [index: string]:any
+    }
+
+    interface Actions {
+        [index: string]: Listenable
+    }
+
+    function createStore(definition: StoreDefinition): Store;
+
+    function createAction(definition: ActionsDefinition): any;
+
+    function createActions(definition: ActionsDefinition): any;
+    function createActions(definitions: string[]): any;
+
+    function connect(store: Store, key?: string):void;
+    function listenTo(store: Store, handler: string):void;
+    function setState(state: any):void;
+}
diff --git a/reflux/reflux-tests.ts b/reflux/reflux-tests.ts
index f626c2900b..c493c57c16 100644
--- a/reflux/reflux-tests.ts
+++ b/reflux/reflux-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="reflux.d.ts" />
-/// <reference path="../react/react.d.ts" />
+
+/// <reference types="react" />
 
 import Reflux = require("reflux");
 import React = require("react");
diff --git a/reflux/reflux.d.ts b/reflux/reflux.d.ts
deleted file mode 100644
index f7395b175e..0000000000
--- a/reflux/reflux.d.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-// Type definitions for RefluxJS
-// Project: https://github.com/reflux/refluxjs
-// Definitions by: Maurice de Beijer <https://github.com/mauricedb>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module  RefluxCore {
-
-    interface StoreDefinition {
-        listenables?: any[],
-        init?: Function,
-        getInitialState?: Function,
-        [propertyName: string]: any;
-    }
-
-    interface ListenFn {
-        (...params: any[]):any,
-        completed: Function,
-        failed: Function
-    }
-    interface Listenable {
-        listen: ListenFn
-    }
-
-    interface Subscription {
-        stop: Function,
-        listenable: Listenable
-    }
-
-    interface Store {
-        hasListener(listenable: Listenable): boolean,
-        listenToMany(listenables: Listenable[]): void,
-        validateListening(listenable: Listenable): string,
-        listenTo(listenable: Listenable, callback: Function, defaultCallback?: Function): Subscription,
-        stopListeningTo(listenable: Listenable): boolean,
-        stopListeningToAll(): void,
-        fetchInitialState(listenable: Listenable, defaultCallback: Function): void,
-        trigger(state: any):void;
-    }
-
-    interface ActionsDefinition {
-        [index: string]:any
-    }
-
-    interface Actions {
-        [index: string]: Listenable
-    }
-
-    function createStore(definition: StoreDefinition): Store;
-
-    function createAction(definition: ActionsDefinition): any;
-
-    function createActions(definition: ActionsDefinition): any;
-    function createActions(definitions: string[]): any;
-
-    function connect(store: Store, key?: string):void;
-    function listenTo(store: Store, handler: string):void;
-    function setState(state: any):void;
-}
-
-declare module "reflux" {
-    export = RefluxCore;
-}
-
diff --git a/reflux/tsconfig.json b/reflux/tsconfig.json
new file mode 100644
index 0000000000..a50b240116
--- /dev/null
+++ b/reflux/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "reflux-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/relateurl/index.d.ts b/relateurl/index.d.ts
new file mode 100644
index 0000000000..88f3342895
--- /dev/null
+++ b/relateurl/index.d.ts
@@ -0,0 +1,124 @@
+// Type definitions for relateurl v0.2.6
+// Project: https://github.com/stevenvachon/relateurl
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare namespace RelateUrl {
+    interface Options {
+        /**
+         * Type: Object
+         * Default value: {ftp:21, http:80, https:443}
+         *
+         * Extend the list with any ports you need. Any URLs containing these default ports will have them removed. Example: http://example.com:80/ will become http://example.com/.
+         */
+        defaultPorts?: Object;
+
+        /**
+         * Type: Array
+         * Default value: ["index.html"]
+         *
+         * Extend the list with any resources you need. Works with options.removeDirectoryIndexes.
+         */
+        directoryIndexes?: Array<string>;
+
+        /**
+         * Type: Boolean
+         * Default value: false
+         *
+         * This will, for example, consider any domains containing http://www.example.com/ to be related to any that contain http://example.com/.
+         */
+        ignore_www?: boolean;
+
+        /**
+         * Type: constant or String
+         * Choices: RelateUrl.ABSOLUTE,RelateUrl.PATH_RELATIVE,RelateUrl.ROOT_RELATIVE,RelateUrl.SHORTEST
+         * Choices: "absolute","pathRelative","rootRelative","shortest"
+         * Default value: RelateUrl.SHORTEST
+         *
+         * RelateUrl.ABSOLUTE will produce an absolute URL. Overrides options.schemeRelative with a value of false.
+         * RelateUrl.PATH_RELATIVE will produce something like ../child-of-parent/etc/.
+         * RelateUrl.ROOT_RELATIVE will produce something like /child-of-root/etc/.
+         * RelateUrl.SHORTEST will choose whichever is shortest between root- and path-relative.
+         */
+        output?: string;
+
+        /**
+         * Type: Array
+         * Default value: ["data","javascript","mailto"]
+         *
+         * Extend the list with any additional schemes. Example: javascript:something will not be modified.
+         */
+        rejectedSchemes?: Array<string>;
+
+        /**
+         * Type: Boolean
+         * Default value: false
+         *
+         * Remove user authentication information from the output URL.
+         */
+        removeAuth?: boolean;
+
+        /**
+         * Type: Boolean
+         * Default value: true
+         *
+         * Remove any resources that match any found in options.directoryIndexes.
+         */
+        removeDirectoryIndexes?: boolean;
+
+        /**
+         * Type: Boolean
+         * Default value: false
+         *
+         * Remove empty query variables. Example: http://domain.com/?var1&var2=&var3=asdf will become http://domain.com/?var3=adsf. This does not apply to unrelated URLs (with other protocols, auths, hosts and/or ports).
+         */
+        removeEmptyQueries?: boolean;
+
+        /**
+         * Type: Boolean
+         * Default value: true
+         *
+         * Remove trailing slashes from root paths. Example: http://domain.com/?var will become http://domain.com?var while http://domain.com/dir/?var will not be modified.
+         */
+        removeRootTrailingSlash?: boolean;
+
+        /**
+         * Type: Boolean
+         * Default value: true
+         *
+         * Output URLs relative to the scheme. Example: http://example.com/ will become //example.com/.
+         */
+        schemeRelative?: boolean;
+
+        /**
+         * Type: String
+         * Default value: undefined
+         *
+         * An options-based version of the from argument. If both are specified, from takes priority.
+         */
+        site?: string;
+
+        /**
+         * Type: Boolean
+         * Default value: true
+         *
+         * Passed to Node's url.parse.
+         */
+        slashesDenoteHost?: boolean;
+    }
+}
+
+declare class RelateUrl {
+    static ABSOLUTE: string;
+    static PATH_RELATIVE: string;
+    static ROOT_RELATIVE: string;
+    static SHORTEST: string;
+
+    static relate(from: string, to: string, options?: RelateUrl.Options): string;
+
+    constructor(from: string, options?: RelateUrl.Options);
+    relate(to: string, options?: RelateUrl.Options): string;
+}
+
+export = RelateUrl;
diff --git a/relateurl/relateurl-tests.ts b/relateurl/relateurl-tests.ts
index 89a647d06e..7285dca153 100644
--- a/relateurl/relateurl-tests.ts
+++ b/relateurl/relateurl-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="relateurl.d.ts" />
 
 import * as RelateUrl from 'relateurl';
 
diff --git a/relateurl/relateurl.d.ts b/relateurl/relateurl.d.ts
deleted file mode 100644
index f8fb44b696..0000000000
--- a/relateurl/relateurl.d.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-// Type definitions for relateurl v0.2.6
-// Project: https://github.com/stevenvachon/relateurl
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'relateurl' {
-  namespace RelateUrl {
-    interface Options {
-      /**
-       * Type: Object
-       * Default value: {ftp:21, http:80, https:443}
-       *
-       * Extend the list with any ports you need. Any URLs containing these default ports will have them removed. Example: http://example.com:80/ will become http://example.com/.
-       */
-      defaultPorts?: Object;
-
-      /**
-       * Type: Array
-       * Default value: ["index.html"]
-       *
-       * Extend the list with any resources you need. Works with options.removeDirectoryIndexes.
-       */
-      directoryIndexes?: Array<string>;
-
-      /**
-       * Type: Boolean
-       * Default value: false
-       *
-       * This will, for example, consider any domains containing http://www.example.com/ to be related to any that contain http://example.com/.
-       */
-      ignore_www?: boolean;
-
-      /**
-       * Type: constant or String
-       * Choices: RelateUrl.ABSOLUTE,RelateUrl.PATH_RELATIVE,RelateUrl.ROOT_RELATIVE,RelateUrl.SHORTEST
-       * Choices: "absolute","pathRelative","rootRelative","shortest"
-       * Default value: RelateUrl.SHORTEST
-       *
-       * RelateUrl.ABSOLUTE will produce an absolute URL. Overrides options.schemeRelative with a value of false.
-       * RelateUrl.PATH_RELATIVE will produce something like ../child-of-parent/etc/.
-       * RelateUrl.ROOT_RELATIVE will produce something like /child-of-root/etc/.
-       * RelateUrl.SHORTEST will choose whichever is shortest between root- and path-relative.
-       */
-      output?: string;
-
-      /**
-       * Type: Array
-       * Default value: ["data","javascript","mailto"]
-       *
-       * Extend the list with any additional schemes. Example: javascript:something will not be modified.
-       */
-      rejectedSchemes?: Array<string>;
-
-      /**
-       * Type: Boolean
-       * Default value: false
-       *
-       * Remove user authentication information from the output URL.
-       */
-      removeAuth?: boolean;
-
-      /**
-       * Type: Boolean
-       * Default value: true
-       *
-       * Remove any resources that match any found in options.directoryIndexes.
-       */
-      removeDirectoryIndexes?: boolean;
-
-      /**
-       * Type: Boolean
-       * Default value: false
-       *
-       * Remove empty query variables. Example: http://domain.com/?var1&var2=&var3=asdf will become http://domain.com/?var3=adsf. This does not apply to unrelated URLs (with other protocols, auths, hosts and/or ports).
-       */
-      removeEmptyQueries?: boolean;
-
-      /**
-       * Type: Boolean
-       * Default value: true
-       *
-       * Remove trailing slashes from root paths. Example: http://domain.com/?var will become http://domain.com?var while http://domain.com/dir/?var will not be modified.
-       */
-      removeRootTrailingSlash?: boolean;
-
-      /**
-       * Type: Boolean
-       * Default value: true
-       *
-       * Output URLs relative to the scheme. Example: http://example.com/ will become //example.com/.
-       */
-      schemeRelative?: boolean;
-
-      /**
-       * Type: String
-       * Default value: undefined
-       *
-       * An options-based version of the from argument. If both are specified, from takes priority.
-       */
-      site?: string;
-
-      /**
-       * Type: Boolean
-       * Default value: true
-       *
-       * Passed to Node's url.parse.
-       */
-      slashesDenoteHost?: boolean;
-    }
-  }
-
-  class RelateUrl {
-    static ABSOLUTE: string;
-    static PATH_RELATIVE: string;
-    static ROOT_RELATIVE: string;
-    static SHORTEST: string;
-
-    static relate(from: string, to: string, options?: RelateUrl.Options): string;
-
-    constructor(from: string, options?: RelateUrl.Options);
-    relate(to: string, options?: RelateUrl.Options): string;
-  }
-
-  export = RelateUrl;
-}
diff --git a/relateurl/tsconfig.json b/relateurl/tsconfig.json
new file mode 100644
index 0000000000..4ac69075cd
--- /dev/null
+++ b/relateurl/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "relateurl-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/replace-ext/index.d.ts b/replace-ext/index.d.ts
new file mode 100644
index 0000000000..f1e4e9806c
--- /dev/null
+++ b/replace-ext/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for replace-ext 0.0.1
+// Project: https://github.com/wearefractal/replace-ext
+// Definitions by: Deividas Bakanas <https://github.com/DeividasBakanas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function replaceExt(npath: string, ext: string): string;
+
+export = replaceExt;
diff --git a/replace-ext/replace-ext-tests.ts b/replace-ext/replace-ext-tests.ts
index 660a0b68b7..fc50ec0a06 100644
--- a/replace-ext/replace-ext-tests.ts
+++ b/replace-ext/replace-ext-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="replace-ext.d.ts" />
+
 import replaceExt = require('replace-ext');
 
 var path: string = '/some/dir/file.js';
diff --git a/replace-ext/replace-ext.d.ts b/replace-ext/replace-ext.d.ts
deleted file mode 100644
index d66680e7ca..0000000000
--- a/replace-ext/replace-ext.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Type definitions for replace-ext 0.0.1
-// Project: https://github.com/wearefractal/replace-ext
-// Definitions by: Deividas Bakanas <https://github.com/DeividasBakanas>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-declare function replaceExt(npath: string, ext: string): string;
-
-declare module 'replace-ext' {
-    export = replaceExt;
-}
diff --git a/replace-ext/tsconfig.json b/replace-ext/tsconfig.json
new file mode 100644
index 0000000000..93f4b988e6
--- /dev/null
+++ b/replace-ext/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "replace-ext-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/request-ip/index.d.ts b/request-ip/index.d.ts
new file mode 100644
index 0000000000..041c39b34a
--- /dev/null
+++ b/request-ip/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for request-ip
+// Project: https://github.com/pbojinov/request-ip
+// Definitions by: Adam Babcock <https://github.com/mrhen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface Request {
+    headers: {
+        'x-client-ip'?: string;
+        'x-forwarded-for'?: string;
+        'x-real-ip'?: string;
+        'x-cluster-client-ip'?: string;
+        'x-forwarded'?: string;
+        'forwarded-for'?: string;
+        'forwarded'?: string;
+    };
+    connection: {
+        remoteAddress?: string;
+        socket?: {
+            remoteAddress?: string
+        };
+    };
+    info?: {
+        remoteAddress?: string
+    };
+    socket?: {
+        remoteAddress?: string
+    };
+}
+
+export declare function getClientIp(req: Request): string;
diff --git a/request-ip/request-ip-tests.ts b/request-ip/request-ip-tests.ts
index 8c5111e331..d597951c38 100644
--- a/request-ip/request-ip-tests.ts
+++ b/request-ip/request-ip-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="../express/express.d.ts" />
-/// <reference path="request-ip.d.ts" />
-
 import express = require('express');
 import requestIp = require('request-ip');
 
diff --git a/request-ip/request-ip.d.ts b/request-ip/request-ip.d.ts
deleted file mode 100644
index 11ed21d63a..0000000000
--- a/request-ip/request-ip.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// Type definitions for request-ip
-// Project: https://github.com/pbojinov/request-ip
-// Definitions by: Adam Babcock <https://github.com/mrhen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "request-ip" {
-    interface Request {
-        headers: {
-            'x-client-ip'?: string;
-            'x-forwarded-for'?: string;
-            'x-real-ip'?: string;
-            'x-cluster-client-ip'?: string;
-            'x-forwarded'?: string;
-            'forwarded-for'?: string;
-            'forwarded'?: string;
-        };
-        connection: {
-            remoteAddress?: string;
-            socket?: {
-                remoteAddress?: string
-            };
-        };
-        info?: {
-            remoteAddress?: string
-        };
-        socket?: {
-            remoteAddress?: string
-        };
-    }
-
-    export function getClientIp(req:Request):string;
-}
diff --git a/request-ip/tsconfig.json b/request-ip/tsconfig.json
new file mode 100644
index 0000000000..75d4d5072b
--- /dev/null
+++ b/request-ip/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "request-ip-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/request-promise/index.d.ts b/request-promise/index.d.ts
new file mode 100644
index 0000000000..8e1f53c577
--- /dev/null
+++ b/request-promise/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for request-promise v0.4.2
+// Project: https://www.npmjs.com/package/request-promise
+// Definitions by: Christopher Glantschnig <https://github.com/cglantschnig/>, Joe Skeen <http://github.com/joeskeen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Change [0]: 2015/08/20 - Aya Morisawa <https://github.com/AyaMorisawa>
+
+
+/// <reference types="bluebird" />
+
+
+import request = require('request');
+import http = require('http');
+
+interface RequestPromise extends request.Request {
+    then<TResult>(onfulfilled?: (value: any) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>;
+    then<TResult>(onfulfilled?: (value: any) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>;
+    catch(onrejected?: (reason: any) => any | PromiseLike<any>): Promise<any>;
+    catch(onrejected?: (reason: any) => void): Promise<any>;
+    finally<TResult>(handler: () => PromiseLike<TResult>): Promise<any>;
+    finally<TResult>(handler: () => TResult): Promise<any>;
+    promise(): Promise<any>;
+}
+
+interface RequestPromiseOptions extends request.CoreOptions {
+    simple?: boolean;
+    transform?: (body: any, response: http.IncomingMessage) => any;
+    resolveWithFullResponse?: boolean;
+}
+
+declare var requestPromise: request.RequestAPI<RequestPromise, RequestPromiseOptions, request.RequiredUriUrl>;
+export = requestPromise;
diff --git a/request-promise/request-promise-tests.ts b/request-promise/request-promise-tests.ts
index 8c7840ad41..a00ab20728 100644
--- a/request-promise/request-promise-tests.ts
+++ b/request-promise/request-promise-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="request-promise.d.ts" />
 
 import rp = require('request-promise');
 import nodeRequest = require('request');
diff --git a/request-promise/request-promise.d.ts b/request-promise/request-promise.d.ts
deleted file mode 100644
index 7c96689f56..0000000000
--- a/request-promise/request-promise.d.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// Type definitions for request-promise v0.4.2
-// Project: https://www.npmjs.com/package/request-promise
-// Definitions by: Christopher Glantschnig <https://github.com/cglantschnig/>, Joe Skeen <http://github.com/joeskeen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Change [0]: 2015/08/20 - Aya Morisawa <https://github.com/AyaMorisawa>
-
-/// <reference path="../request/request.d.ts" />
-/// <reference path="../bluebird/bluebird.d.ts" />
-
-declare module 'request-promise' {
-    import request = require('request');
-    import http = require('http');
-        
-    interface RequestPromise extends request.Request {
-        then<TResult>(onfulfilled?: (value: any) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>;
-        then<TResult>(onfulfilled?: (value: any) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>;
-        catch(onrejected?: (reason: any) => any | PromiseLike<any>): Promise<any>;
-        catch(onrejected?: (reason: any) => void): Promise<any>;
-        finally<TResult>(handler: () => PromiseLike<TResult>): Promise<any>;
-        finally<TResult>(handler: () => TResult): Promise<any>;
-        promise(): Promise<any>;
-    }
-    
-    interface RequestPromiseOptions extends request.CoreOptions {
-        simple?: boolean;
-        transform?: (body: any, response: http.IncomingMessage) => any;
-        resolveWithFullResponse?: boolean;
-    }
-    
-    var requestPromise: request.RequestAPI<RequestPromise, RequestPromiseOptions, request.RequiredUriUrl>;
-	export = requestPromise;
-}
diff --git a/request-promise/tsconfig.json b/request-promise/tsconfig.json
new file mode 100644
index 0000000000..b700d64f2c
--- /dev/null
+++ b/request-promise/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "request-promise-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/request/index.d.ts b/request/index.d.ts
new file mode 100644
index 0000000000..122974f687
--- /dev/null
+++ b/request/index.d.ts
@@ -0,0 +1,259 @@
+// Type definitions for request
+// Project: https://github.com/mikeal/request
+// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>, bonnici <https://github.com/bonnici>, Bart van der Schoor <https://github.com/Bartvds>, Joe Skeen <http://github.com/joeskeen>, Christopher Currens <https://github.com/ccurrens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/d.ts
+
+/// <reference types="node" />
+
+import stream = require('stream');
+import http = require('http');
+import https = require('https');
+import FormData = require('form-data');
+import url = require('url');
+import fs = require('fs');
+
+declare namespace request {
+    export interface RequestAPI<TRequest extends Request,
+        TOptions extends CoreOptions,
+        TUriUrlOptions> {
+
+        defaults(options: TOptions): RequestAPI<TRequest, TOptions, RequiredUriUrl>;
+        defaults(options: RequiredUriUrl & TOptions): DefaultUriUrlRequestApi<TRequest, TOptions, OptionalUriUrl>;
+
+        (uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
+        (uri: string, callback?: RequestCallback): TRequest;
+        (options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
+
+        get(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
+        get(uri: string, callback?: RequestCallback): TRequest;
+        get(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
+
+        post(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
+        post(uri: string, callback?: RequestCallback): TRequest;
+        post(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
+
+        put(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
+        put(uri: string, callback?: RequestCallback): TRequest;
+        put(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
+
+        head(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
+        head(uri: string, callback?: RequestCallback): TRequest;
+        head(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
+
+        patch(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
+        patch(uri: string, callback?: RequestCallback): TRequest;
+        patch(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
+
+        del(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
+        del(uri: string, callback?: RequestCallback): TRequest;
+        del(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
+
+        forever(agentOptions: any, optionsArg: any): TRequest;
+        jar(): CookieJar;
+        cookie(str: string): Cookie;
+
+        initParams: any;
+        debug: boolean;
+    }
+
+    interface DefaultUriUrlRequestApi<TRequest extends Request,
+        TOptions extends CoreOptions,
+        TUriUrlOptions> extends RequestAPI<TRequest, TOptions, TUriUrlOptions> {
+
+        defaults(options: TOptions): DefaultUriUrlRequestApi<TRequest, TOptions, OptionalUriUrl>;
+        (): TRequest;
+        get(): TRequest;
+        post(): TRequest;
+        put(): TRequest;
+        head(): TRequest;
+        patch(): TRequest;
+        del(): TRequest;
+    }
+
+    interface CoreOptions {
+        baseUrl?: string;
+        callback?: (error: any, response: http.IncomingMessage, body: any) => void;
+        jar?: any; // CookieJar
+        formData?: any; // Object
+        form?: any; // Object or string
+        auth?: AuthOptions;
+        oauth?: OAuthOptions;
+        aws?: AWSOptions;
+        hawk?: HawkOptions;
+        qs?: any;
+        json?: any;
+        multipart?: RequestPart[] | Multipart;
+        agent?: http.Agent | https.Agent;
+        agentOptions?: any;
+        agentClass?: any;
+        forever?: any;
+        host?: string;
+        port?: number;
+        method?: string;
+        headers?: Headers;
+        body?: any;
+        followRedirect?: boolean | ((response: http.IncomingMessage) => boolean);
+        followAllRedirects?: boolean;
+        maxRedirects?: number;
+        encoding?: string;
+        pool?: any;
+        timeout?: number;
+        proxy?: any;
+        strictSSL?: boolean;
+        gzip?: boolean;
+        preambleCRLF?: boolean;
+        postambleCRLF?: boolean;
+        key?: Buffer;
+        cert?: Buffer;
+        passphrase?: string;
+        ca?: Buffer;
+        har?: HttpArchiveRequest;
+        useQuerystring?: boolean;
+    }
+
+    interface UriOptions {
+        uri: string;
+    }
+    interface UrlOptions {
+        url: string;
+    }
+    export type RequiredUriUrl = UriOptions | UrlOptions;
+
+    interface OptionalUriUrl {
+        uri?: string;
+        url?: string;
+    }
+
+    export type OptionsWithUri = UriOptions & CoreOptions;
+    export type OptionsWithUrl = UrlOptions & CoreOptions;
+    export type Options = OptionsWithUri | OptionsWithUrl;
+
+    export interface RequestCallback {
+        (error: any, response: http.IncomingMessage, body: any): void;
+    }
+
+    export interface HttpArchiveRequest {
+        url?: string;
+        method?: string;
+        headers?: NameValuePair[];
+        postData?: {
+            mimeType?: string;
+            params?: NameValuePair[];
+        }
+    }
+
+    export interface NameValuePair {
+        name: string;
+        value: string;
+    }
+
+    export interface Multipart {
+        chunked?: boolean;
+        data?: {
+            'content-type'?: string,
+            body: string
+        }[];
+    }
+
+    export interface RequestPart {
+        headers?: Headers;
+        body: any;
+    }
+
+    export interface Request extends stream.Stream {
+        readable: boolean;
+        writable: boolean;
+
+        getAgent(): http.Agent;
+        //start(): void;
+        //abort(): void;
+        pipeDest(dest: any): void;
+        setHeader(name: string, value: string, clobber?: boolean): Request;
+        setHeaders(headers: Headers): Request;
+        qs(q: Object, clobber?: boolean): Request;
+        form(): FormData.FormData;
+        form(form: any): Request;
+        multipart(multipart: RequestPart[]): Request;
+        json(val: any): Request;
+        aws(opts: AWSOptions, now?: boolean): Request;
+        auth(username: string, password: string, sendInmediately?: boolean, bearer?: string): Request;
+        oauth(oauth: OAuthOptions): Request;
+        jar(jar: CookieJar): Request;
+
+        on(event: string, listener: Function): this;
+        on(event: 'request', listener: (req: http.ClientRequest) => void): this;
+        on(event: 'response', listener: (resp: http.IncomingMessage) => void): this;
+        on(event: 'data', listener: (data: Buffer | string) => void): this;
+        on(event: 'error', listener: (e: Error) => void): this;
+        on(event: 'complete', listener: (resp: http.IncomingMessage, body?: string | Buffer) => void): this;
+
+        write(buffer: Buffer, cb?: Function): boolean;
+        write(str: string, cb?: Function): boolean;
+        write(str: string, encoding: string, cb?: Function): boolean;
+        write(str: string, encoding?: string, fd?: string): boolean;
+        end(): void;
+        end(chunk: Buffer, cb?: Function): void;
+        end(chunk: string, cb?: Function): void;
+        end(chunk: string, encoding: string, cb?: Function): void;
+        pause(): void;
+        resume(): void;
+        abort(): void;
+        destroy(): void;
+        toJSON(): Object;
+    }
+
+    export interface Headers {
+        [key: string]: any;
+    }
+
+    export interface AuthOptions {
+        user?: string;
+        username?: string;
+        pass?: string;
+        password?: string;
+        sendImmediately?: boolean;
+        bearer?: string;
+    }
+
+    export interface OAuthOptions {
+        callback?: string;
+        consumer_key?: string;
+        consumer_secret?: string;
+        token?: string;
+        token_secret?: string;
+        verifier?: string;
+    }
+
+    export interface HawkOptions {
+        credentials: any;
+    }
+
+    export interface AWSOptions {
+        secret: string;
+        bucket?: string;
+    }
+
+    export interface CookieJar {
+        setCookie(cookie: Cookie, uri: string | url.Url, options?: any): void
+        getCookieString(uri: string | url.Url): string
+        getCookies(uri: string | url.Url): Cookie[]
+    }
+
+    export interface CookieValue {
+        name: string;
+        value: any;
+        httpOnly: boolean;
+    }
+
+    export interface Cookie extends Array<CookieValue> {
+        constructor(name: string, req: Request): void;
+        str: string;
+        expires: Date;
+        path: string;
+        toString(): string;
+    }
+}
+declare var request: request.RequestAPI<request.Request, request.CoreOptions, request.RequiredUriUrl>;
+export = request;
diff --git a/request/request-tests.ts b/request/request-tests.ts
index 6efeb63c54..c2a06b61ce 100644
--- a/request/request-tests.ts
+++ b/request/request-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="request.d.ts" />
 
 import request = require('request');
 import http = require('http');
diff --git a/request/request.d.ts b/request/request.d.ts
deleted file mode 100644
index aaeba2caca..0000000000
--- a/request/request.d.ts
+++ /dev/null
@@ -1,262 +0,0 @@
-// Type definitions for request
-// Project: https://github.com/mikeal/request
-// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>, bonnici <https://github.com/bonnici>, Bart van der Schoor <https://github.com/Bartvds>, Joe Skeen <http://github.com/joeskeen>, Christopher Currens <https://github.com/ccurrens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/d.ts
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../form-data/form-data.d.ts" />
-
-declare module 'request' {
-	import stream = require('stream');
-	import http = require('http');
-	import https = require('https');
-	import FormData = require('form-data');
-	import url = require('url');
-	import fs = require('fs');
-
-	namespace request {
-		export interface RequestAPI<TRequest extends Request,
-			TOptions extends CoreOptions,
-			TUriUrlOptions> {
-
-			defaults(options: TOptions): RequestAPI<TRequest, TOptions, RequiredUriUrl>;
-			defaults(options: RequiredUriUrl & TOptions): DefaultUriUrlRequestApi<TRequest, TOptions, OptionalUriUrl>;
-
-			(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
-			(uri: string, callback?: RequestCallback): TRequest;
-			(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
-
-			get(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
-			get(uri: string, callback?: RequestCallback): TRequest;
-			get(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
-
-			post(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
-			post(uri: string, callback?: RequestCallback): TRequest;
-			post(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
-
-			put(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
-			put(uri: string, callback?: RequestCallback): TRequest;
-			put(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
-
-			head(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
-			head(uri: string, callback?: RequestCallback): TRequest;
-			head(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
-
-			patch(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
-			patch(uri: string, callback?: RequestCallback): TRequest;
-			patch(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
-
-			del(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
-			del(uri: string, callback?: RequestCallback): TRequest;
-			del(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
-
-			forever(agentOptions: any, optionsArg: any): TRequest;
-			jar(): CookieJar;
-			cookie(str: string): Cookie;
-
-			initParams: any;
-			debug: boolean;
-		}
-
-		interface DefaultUriUrlRequestApi<TRequest extends Request,
-			TOptions extends CoreOptions,
-			TUriUrlOptions>	extends RequestAPI<TRequest, TOptions, TUriUrlOptions> {
-
-			defaults(options: TOptions): DefaultUriUrlRequestApi<TRequest, TOptions, OptionalUriUrl>;
-			(): TRequest;
-			get(): TRequest;
-			post(): TRequest;
-			put(): TRequest;
-			head(): TRequest;
-			patch(): TRequest;
-			del(): TRequest;
-		}
-
-		interface CoreOptions {
-			baseUrl?: string;
-			callback?: (error: any, response: http.IncomingMessage, body: any) => void;
-			jar?: any; // CookieJar
-			formData?: any; // Object
-			form?: any; // Object or string
-			auth?: AuthOptions;
-			oauth?: OAuthOptions;
-			aws?: AWSOptions;
-			hawk?: HawkOptions;
-			qs?: any;
-			json?: any;
-			multipart?: RequestPart[] | Multipart;
-			agent?: http.Agent | https.Agent;
-			agentOptions?: any;
-			agentClass?: any;
-			forever?: any;
-			host?: string;
-			port?: number;
-			method?: string;
-			headers?: Headers;
-			body?: any;
-			followRedirect?: boolean | ((response: http.IncomingMessage) => boolean);
-			followAllRedirects?: boolean;
-			maxRedirects?: number;
-			encoding?: string;
-			pool?: any;
-			timeout?: number;
-			proxy?: any;
-			strictSSL?: boolean;
-			gzip?: boolean;
-			preambleCRLF?: boolean;
-			postambleCRLF?: boolean;
-			key?: Buffer;
-			cert?: Buffer;
-			passphrase?: string;
-			ca?: Buffer;
-			har?: HttpArchiveRequest;
-			useQuerystring?: boolean;
-		}
-
-		interface UriOptions {
-			uri: string;
-		}
-		interface UrlOptions {
-			url: string;
-		}
-		export type RequiredUriUrl = UriOptions | UrlOptions;
-
-		interface OptionalUriUrl {
-			uri?: string;
-			url?: string;
-		}
-
-        export type OptionsWithUri = UriOptions & CoreOptions;
-        export type OptionsWithUrl = UrlOptions & CoreOptions;
-        export type Options = OptionsWithUri | OptionsWithUrl;
-
-		export interface RequestCallback {
-			(error: any, response: http.IncomingMessage, body: any): void;
-		}
-
-		export interface HttpArchiveRequest {
-			url?: string;
-			method?: string;
-			headers?: NameValuePair[];
-			postData?: {
-				mimeType?: string;
-				params?: NameValuePair[];
-			}
-		}
-
-		export interface NameValuePair {
-			name: string;
-			value: string;
-		}
-
-		export interface Multipart {
-			chunked?: boolean;
-			data?: {
-				'content-type'?: string,
-				body: string
-			}[];
-		}
-
-		export interface RequestPart {
-			headers?: Headers;
-			body: any;
-		}
-
-		export interface Request extends stream.Stream {
-			readable: boolean;
-			writable: boolean;
-
-			getAgent(): http.Agent;
-			//start(): void;
-			//abort(): void;
-			pipeDest(dest: any): void;
-			setHeader(name: string, value: string, clobber?: boolean): Request;
-			setHeaders(headers: Headers): Request;
-			qs(q: Object, clobber?: boolean): Request;
-			form(): FormData.FormData;
-			form(form: any): Request;
-			multipart(multipart: RequestPart[]): Request;
-			json(val: any): Request;
-			aws(opts: AWSOptions, now?: boolean): Request;
-			auth(username: string, password: string, sendInmediately?: boolean, bearer?: string): Request;
-			oauth(oauth: OAuthOptions): Request;
-			jar(jar: CookieJar): Request;
-
-			on(event: string, listener: Function): this;
-			on(event: 'request', listener: (req: http.ClientRequest) => void): this;
-			on(event: 'response', listener: (resp: http.IncomingMessage) => void): this;
-			on(event: 'data', listener: (data: Buffer | string) => void): this;
-			on(event: 'error', listener: (e: Error) => void): this;
-			on(event: 'complete', listener: (resp: http.IncomingMessage, body?: string | Buffer) => void): this;
-
-			write(buffer: Buffer, cb?: Function): boolean;
-			write(str: string, cb?: Function): boolean;
-			write(str: string, encoding: string, cb?: Function): boolean;
-			write(str: string, encoding?: string, fd?: string): boolean;
-			end(): void;
-			end(chunk: Buffer, cb?: Function): void;
-			end(chunk: string, cb?: Function): void;
-			end(chunk: string, encoding: string, cb?: Function): void;
-			pause(): void;
-			resume(): void;
-			abort(): void;
-			destroy(): void;
-			toJSON(): Object;
-		}
-
-		export interface Headers {
-			[key: string]: any;
-		}
-
-		export interface AuthOptions {
-			user?: string;
-			username?: string;
-			pass?: string;
-			password?: string;
-			sendImmediately?: boolean;
-			bearer?: string;
-		}
-
-		export interface OAuthOptions {
-			callback?: string;
-			consumer_key?: string;
-			consumer_secret?: string;
-			token?: string;
-			token_secret?: string;
-			verifier?: string;
-		}
-
-		export interface HawkOptions {
-			credentials: any;
-		}
-
-		export interface AWSOptions {
-			secret: string;
-			bucket?: string;
-		}
-
-		export interface CookieJar {
-			setCookie(cookie: Cookie, uri: string | url.Url, options?: any): void
-			getCookieString(uri: string | url.Url): string
-			getCookies(uri: string | url.Url): Cookie[]
-		}
-
-		export interface CookieValue {
-			name: string;
-			value: any;
-			httpOnly: boolean;
-		}
-
-		export interface Cookie extends Array<CookieValue> {
-			constructor(name: string, req: Request): void;
-			str: string;
-			expires: Date;
-			path: string;
-			toString(): string;
-		}
-	}
-	var request: request.RequestAPI<request.Request, request.CoreOptions, request.RequiredUriUrl>;
-	export = request;
-}
diff --git a/request/tsconfig.json b/request/tsconfig.json
new file mode 100644
index 0000000000..b21a178faf
--- /dev/null
+++ b/request/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "request-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/requirejs-domready/domready-tests.ts b/requirejs-domready/domready-tests.ts
index fb7b59acd0..7900e7af36 100644
--- a/requirejs-domready/domready-tests.ts
+++ b/requirejs-domready/domready-tests.ts
@@ -1,6 +1,5 @@
-/// <reference path="domready.d.ts" />
 
-import domReady = require("domReady");
+import domReady = require("requirejs-domready");
 
 domReady(() => {
     return domReady.version;
diff --git a/requirejs-domready/domready.d.ts b/requirejs-domready/domready.d.ts
deleted file mode 100644
index 03d3ef03d8..0000000000
--- a/requirejs-domready/domready.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Type definitions for domReady 2.0.1
-// Project: https://github.com/requirejs/domReady
-// Definitions by: Nobuhiro Nakamura <https://github.com/lefb766>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "domReady" {
-    interface DomReady {
-        (callback: () => any): DomReady;
-        version: string;
-    }
-
-    let domReady: DomReady;
-
-    export = domReady;
-}
diff --git a/requirejs-domready/index.d.ts b/requirejs-domready/index.d.ts
new file mode 100644
index 0000000000..c0f094a869
--- /dev/null
+++ b/requirejs-domready/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for domReady 2.0.1
+// Project: https://github.com/requirejs/domReady
+// Definitions by: Nobuhiro Nakamura <https://github.com/lefb766>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface DomReady {
+    (callback: () => any): DomReady;
+    version: string;
+}
+
+declare var domReady: DomReady;
+
+export = domReady;
+
diff --git a/requirejs-domready/tsconfig.json b/requirejs-domready/tsconfig.json
new file mode 100644
index 0000000000..063b409597
--- /dev/null
+++ b/requirejs-domready/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "domready-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/requirejs/require.d.ts b/requirejs/index.d.ts
similarity index 100%
rename from requirejs/require.d.ts
rename to requirejs/index.d.ts
diff --git a/requirejs/require-tests.ts b/requirejs/require-tests.ts
index 75b24e8a41..c7792338b1 100644
--- a/requirejs/require-tests.ts
+++ b/requirejs/require-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="require.d.ts" />
+
 
 // this test does not actually reference amd module 'main.ts', create one yourself.
 
diff --git a/requirejs/tsconfig.json b/requirejs/tsconfig.json
new file mode 100644
index 0000000000..53d1904574
--- /dev/null
+++ b/requirejs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "require-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/reselect/reselect.d.ts b/reselect/index.d.ts
similarity index 100%
rename from reselect/reselect.d.ts
rename to reselect/index.d.ts
diff --git a/reselect/tsconfig.json b/reselect/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/reselect/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/resemblejs/resemblejs.d.ts b/resemblejs/index.d.ts
similarity index 100%
rename from resemblejs/resemblejs.d.ts
rename to resemblejs/index.d.ts
diff --git a/resemblejs/resemblejs-tests.ts b/resemblejs/resemblejs-tests.ts
index 03140cb42f..1cac634dc3 100644
--- a/resemblejs/resemblejs-tests.ts
+++ b/resemblejs/resemblejs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="resemblejs.d.ts" />
+
 
 resemble.outputSettings({
   errorColor: {
diff --git a/resemblejs/tsconfig.json b/resemblejs/tsconfig.json
new file mode 100644
index 0000000000..77385820c6
--- /dev/null
+++ b/resemblejs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "resemblejs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/resolve-from/index.d.ts b/resolve-from/index.d.ts
new file mode 100644
index 0000000000..e74aa1da2a
--- /dev/null
+++ b/resolve-from/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for resolve-from
+// Project: https://github.com/sindresorhus/resolve-from
+// Definitions by: unional <https://github.com/unional>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+declare function resolveFrom(fromDir: string, moduleId: string): string;
+
+export = resolveFrom;
diff --git a/resolve-from/resolve-from-tests.ts b/resolve-from/resolve-from-tests.ts
index 840a19b861..ed803bd0cf 100644
--- a/resolve-from/resolve-from-tests.ts
+++ b/resolve-from/resolve-from-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="resolve-from.d.ts" />
+import resolveFrom = require("resolve-from");
 
 // Much better testing in https://github.com/typed-typings/typed-resolve-from
 if (typeof resolveFrom !== 'function') {
diff --git a/resolve-from/resolve-from.d.ts b/resolve-from/resolve-from.d.ts
deleted file mode 100644
index a8d0441136..0000000000
--- a/resolve-from/resolve-from.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for resolve-from
-// Project: https://github.com/sindresorhus/resolve-from
-// Definitions by: unional <https://github.com/unional>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-declare function resolveFrom(fromDir: string, moduleId: string): string;
-
-declare module "resolve-from" {
-  export = resolveFrom;
-}
diff --git a/resolve-from/tsconfig.json b/resolve-from/tsconfig.json
new file mode 100644
index 0000000000..933d0e5dc8
--- /dev/null
+++ b/resolve-from/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "resolve-from-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/response-time/index.d.ts b/response-time/index.d.ts
new file mode 100644
index 0000000000..8ab91c86ec
--- /dev/null
+++ b/response-time/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for response-time 2.2.0
+// Project: https://github.com/expressjs/response-time
+// Definitions by: Uros Smolnik <https://github.com/urossmolnik/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* =================== USAGE ===================
+
+    import responseTime = require('response-time');
+    app.use(responseTime());
+
+ =============================================== */
+
+
+
+
+import express = require('express');
+
+/**
+ * Response time header for node.js
+ * Returns middleware that adds a X-Response-Time header to responses.
+ */
+declare function responseTime(options?: {
+    /**
+    * The fixed number of digits to include in the output, which is always in milliseconds, defaults to 3 (ex: 2.300ms).
+    */
+    digits?: number;
+    /**
+     * The name of the header to set, defaults to X-Response-Time.
+     */
+    header?: string;
+    /**
+     * Boolean to indicate if units of measurement suffix should be added to the output, defaults to true (ex: 2.300ms vs 2.300).
+     */
+    suffix?: boolean;
+}): express.RequestHandler;
+
+export = responseTime;
diff --git a/response-time/response-time-tests.ts b/response-time/response-time-tests.ts
index b65b8fd19c..8c5e9595dd 100644
--- a/response-time/response-time-tests.ts
+++ b/response-time/response-time-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="response-time.d.ts" />
 
 import express = require('express');
 import responseTime = require('response-time');
diff --git a/response-time/response-time.d.ts b/response-time/response-time.d.ts
deleted file mode 100644
index c8d569e296..0000000000
--- a/response-time/response-time.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// Type definitions for response-time 2.2.0
-// Project: https://github.com/expressjs/response-time
-// Definitions by: Uros Smolnik <https://github.com/urossmolnik/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/* =================== USAGE ===================
-
-    import responseTime = require('response-time');
-    app.use(responseTime());
-
- =============================================== */
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "response-time" {
-    import express = require('express');
-
-    /**
-     * Response time header for node.js
-     * Returns middleware that adds a X-Response-Time header to responses.
-     */
-    function responseTime(options?: {
-        /**
-        * The fixed number of digits to include in the output, which is always in milliseconds, defaults to 3 (ex: 2.300ms).
-        */
-        digits?: number;
-        /**
-         * The name of the header to set, defaults to X-Response-Time.
-         */
-        header?: string;
-        /**
-         * Boolean to indicate if units of measurement suffix should be added to the output, defaults to true (ex: 2.300ms vs 2.300).
-         */
-        suffix?: boolean;
-    }): express.RequestHandler;
-    
-    export = responseTime;
-}
\ No newline at end of file
diff --git a/response-time/tsconfig.json b/response-time/tsconfig.json
new file mode 100644
index 0000000000..2b1bfa982d
--- /dev/null
+++ b/response-time/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "response-time-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rest-io/index.d.ts b/rest-io/index.d.ts
new file mode 100644
index 0000000000..b9abc74195
--- /dev/null
+++ b/rest-io/index.d.ts
@@ -0,0 +1,144 @@
+// Type definitions for rest-io 4.0
+// Project: https://github.com/EnoF/rest-io
+// Definitions by: Andy Tang <https://github.com/EnoF>, Stefan Schacherl <https://github.com/TheBay0r>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+import {Router, Application, Response, Request} from 'express';
+
+import {Mongoose, Schema, Model, Document, Types, Promise} from 'mongoose';
+
+declare function restIO(app: Application, config?: IRestIOConfig): RestIO;
+
+export interface RestIO {
+    resource: ResourceModule
+}
+
+export interface IRestIOConfig {
+    resources: string;
+    db?: Mongoose;
+}
+
+export interface ResourceModule {
+    Resource: Resource;
+    AuthorizedResource: AuthorizedResource;
+    authorizedResource: AuthorizedResourceModule;
+    UserResource: UserResource;
+    SubResource: SubResource;
+}
+
+export declare class Resource {
+    baseUrl: string;
+    url: string;
+    parameterizedUrl: string;
+    model: Model<Document>;
+    resDef: IResource;
+    parentResource: Resource;
+    router: Router;
+    app: Application;
+    db: Mongoose;
+    paramId: string;
+    parentRef: string;
+    populate: string;
+
+    constructor(resDef: IResource);
+
+    createModel(resDef: IResource): Model<Document>;
+
+    toClassName(name: string): string;
+
+    setupRoutes(): void;
+
+    getAll(req: Request, res: Response): void;
+
+    buildParentSearch(req: Request): any;
+
+    getById(req: Request, res: Response): void;
+
+    create(req: Request, res: Response): void;
+
+    update(req: Request, res: Response): void;
+
+    del(req: Request, res: Response): void;
+
+    errorHandler(err: Error, res: Response): void;
+}
+
+export interface IResource {
+    name: string;
+    model: any;
+    parentRef?: string;
+    populate?: string;
+    plural?: string;
+    parentResource?: Resource;
+}
+
+export interface AuthorizedResourceModule {
+    AuthorizedResource: AuthorizedResource
+    ROLES: Roles
+}
+
+export interface Roles {
+    USER: string;
+    SUPER_USER: string;
+    MODERATOR: string;
+    ADMIN: string;
+}
+
+export declare class AuthorizedResource extends Resource {
+    methodAccess: IMethodAccess;
+
+    maxDays: number;
+
+    permissions: IMethodAccess;
+
+    isTokenExpired(createdAt: Date): boolean;
+
+    getRoles(id: string): Promise<Document>;
+
+    hasAuthorizedRole(roles: Array<any>, authorizedRoles: Array<string>): boolean;
+
+    hasAccessRightsDefined(req: Request, authorizedRoles: Array<string>): boolean;
+
+    isAuthorized(req: Request, authorizedRoles: Array<string>): boolean;
+
+    sendUnauthorized(error: Error, res: Response): void;
+}
+
+export interface IMethodAccess {
+    getAll: Array<string>;
+    getById: Array<string>;
+    create: Array<string>;
+    update: Array<string>;
+    del: Array<string>;
+}
+
+export declare class UserResource extends AuthorizedResource {
+    ensureBaseUserModel(model: any): void;
+
+    createRoleModel(): void;
+
+    isSelf(req: Request): boolean;
+
+    login(req: Request, res: Response): void;
+}
+
+export declare class SubResource extends Resource {
+    constructor(resDef: ISubResource);
+
+    createProjectionQuery(req: Request): any;
+
+    createPullQuery(req: Request): any;
+
+    createFindQuery(req: Request): any;
+
+    createSubUpdateQuery(req: Request): any;
+}
+
+export interface ISubResource {
+    name: string;
+    plural?: string;
+    parentResource: Resource;
+    populate?: string;
+}
diff --git a/rest-io/rest-io-tests.ts b/rest-io/rest-io-tests.ts
index 5f558b77a2..210b46b986 100644
--- a/rest-io/rest-io-tests.ts
+++ b/rest-io/rest-io-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="rest-io.d.ts" />
 
 import express = require('express');
 import restIO = require('rest-io');
diff --git a/rest-io/rest-io.d.ts b/rest-io/rest-io.d.ts
deleted file mode 100644
index 86e663194c..0000000000
--- a/rest-io/rest-io.d.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-// Type definitions for rest-io 4.0
-// Project: https://github.com/EnoF/rest-io
-// Definitions by: Andy Tang <https://github.com/EnoF>, Stefan Schacherl <https://github.com/TheBay0r>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-/// <reference path="../mongoose/mongoose.d.ts" />
-
-
-declare module 'rest-io' {
-import {Router, Application, Response, Request} from 'express';
-
-import {Mongoose, Schema, Model, Document, Types, Promise} from 'mongoose';
-
-  function restIO(app: Application, config?: IRestIOConfig): RestIO;
-
-  export interface RestIO {
-    resource: ResourceModule
-  }
-
-  export interface IRestIOConfig {
-    resources: string;
-    db?: Mongoose;
-  }
-
-  export interface ResourceModule {
-    Resource: Resource;
-    AuthorizedResource: AuthorizedResource;
-    authorizedResource: AuthorizedResourceModule;
-    UserResource: UserResource;
-    SubResource: SubResource;
-  }
-
-  export class Resource {
-    baseUrl: string;
-    url: string;
-    parameterizedUrl: string;
-    model: Model<Document>;
-    resDef: IResource;
-    parentResource: Resource;
-    router: Router;
-    app: Application;
-    db: Mongoose;
-    paramId: string;
-    parentRef: string;
-    populate: string;
-
-    constructor(resDef: IResource);
-
-    createModel(resDef: IResource): Model<Document>;
-
-    toClassName(name: string): string;
-
-    setupRoutes(): void;
-
-    getAll(req: Request, res: Response): void;
-
-    buildParentSearch(req: Request): any;
-
-    getById(req: Request, res: Response): void;
-
-    create(req: Request, res: Response): void;
-
-    update(req: Request, res: Response): void;
-
-    del(req: Request, res: Response): void;
-
-    errorHandler(err: Error, res: Response): void;
-  }
-
-  export interface IResource {
-    name: string;
-    model: any;
-    parentRef?: string;
-    populate?: string;
-    plural?: string;
-    parentResource?: Resource;
-  }
-
-  export interface AuthorizedResourceModule {
-    AuthorizedResource: AuthorizedResource
-    ROLES: Roles
-  }
-
-  export interface Roles {
-    USER: string;
-    SUPER_USER: string;
-    MODERATOR: string;
-    ADMIN: string;
-  }
-
-  export class AuthorizedResource extends Resource {
-    methodAccess: IMethodAccess;
-
-    maxDays: number;
-
-    permissions: IMethodAccess;
-
-    isTokenExpired(createdAt: Date): boolean;
-
-    getRoles(id: string): Promise<Document>;
-
-    hasAuthorizedRole(roles: Array<any>, authorizedRoles: Array<string>): boolean;
-
-    hasAccessRightsDefined(req: Request, authorizedRoles: Array<string>): boolean;
-
-    isAuthorized(req: Request, authorizedRoles: Array<string>): boolean;
-
-    sendUnauthorized(error: Error, res: Response): void;
-  }
-
-  export interface IMethodAccess {
-    getAll: Array<string>;
-    getById: Array<string>;
-    create: Array<string>;
-    update: Array<string>;
-    del: Array<string>;
-  }
-
-  export class UserResource extends AuthorizedResource {
-    ensureBaseUserModel(model: any): void;
-
-    createRoleModel(): void;
-
-    isSelf(req: Request): boolean;
-
-    login(req: Request, res: Response): void;
-  }
-
-  export class SubResource extends Resource {
-    constructor(resDef: ISubResource);
-
-    createProjectionQuery(req: Request): any;
-
-    createPullQuery(req: Request): any;
-
-    createFindQuery(req: Request): any;
-
-    createSubUpdateQuery(req: Request): any;
-  }
-
-  export interface ISubResource {
-    name: string;
-    plural?: string;
-    parentResource: Resource;
-    populate?: string;
-  }
-}
\ No newline at end of file
diff --git a/rest-io/tsconfig.json b/rest-io/tsconfig.json
new file mode 100644
index 0000000000..d372ea3a05
--- /dev/null
+++ b/rest-io/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "rest-io-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rest/index.d.ts b/rest/index.d.ts
new file mode 100644
index 0000000000..4bad0c9d6e
--- /dev/null
+++ b/rest/index.d.ts
@@ -0,0 +1,366 @@
+// Type definitions for rest.js v1.3.1
+// Project: https://github.com/cujojs/rest
+// Definitions by: Wim Looman <https://github.com/Nemo157>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="when" />
+
+declare module "rest" {
+	import when = require("when");
+
+	export = rest;
+
+	function rest(path: string): rest.ResponsePromise;
+	function rest(request: rest.Request): rest.ResponsePromise;
+
+	namespace rest {
+		export function setDefaultClient(client: Client): void;
+		export function getDefaultClient(): Client;
+		export function resetDefaultClient(): void;
+
+		export function wrap<T>(interceptor: Interceptor<T>, config?: T): Client;
+
+		export interface Request {
+			method?: string;
+			path?: string;
+			params?: any;
+			headers?: any;
+			entity?: any;
+		}
+
+		export interface Status {
+			code: number;
+			text?: string;
+		}
+
+		export interface Headers {
+			[index: string]: any // string or string[]
+		}
+
+		export interface Response {
+			request: Request;
+			raw: any;
+			status: Status;
+			headers: Headers;
+			entity: any;
+		}
+
+		export interface ResponsePromise extends when.Promise<Response> {
+			entity(): when.Promise<any>;
+			status(): when.Promise<number>;
+			headers(): when.Promise<Headers>;
+			header(headerName: string): when.Promise<any>; // string or string[]
+		}
+
+		export interface Interceptor<T> {
+			(parent?: Client, config?: T): Client;
+		}
+
+		export interface Client {
+			(path: string): ResponsePromise;
+			(request: Request): ResponsePromise;
+
+			skip(): Client;
+			wrap<T>(interceptor: Interceptor<T>, config?: T): Client;
+		}
+
+		export interface Meta {
+			client: Client;
+			arguments: any;
+		}
+	}
+}
+
+declare module "rest/interceptor" {
+	import when = require("when");
+	import rest = require("rest");
+
+	function interceptor<T, U>(config: interceptor.Config<T, U>): rest.Interceptor<T>;
+
+	namespace interceptor {
+		interface Config<T, U> {
+			init?: (config: T) => U;
+			request?: (request: rest.Request, config: U, meta: rest.Meta) => rest.Request | when.Promise<rest.Request>;
+			response?: (response: rest.Response, config: U, meta: rest.Meta) => rest.Response | when.Promise<rest.Response>;
+			success?: (response: rest.Response, config: U, meta: rest.Meta) => rest.Response | when.Promise<rest.Response>;
+			error?: (response: rest.Response, config: U, meta: rest.Meta) => rest.Response | when.Promise<rest.Response>;
+		}
+	}
+
+	export = interceptor;
+}
+
+declare module "rest/interceptor/defaultRequest" {
+	import rest = require("rest");
+
+	var defaultRequest: rest.Interceptor<defaultRequest.Config>;
+
+	namespace defaultRequest {
+		interface Config {
+			method?: string;
+			path?: string;
+			params?: any;
+			headers?: any;
+			entity?: any;
+			mixin?: any;
+		}
+	}
+
+	export = defaultRequest;
+}
+
+declare module "rest/interceptor/hateoas" {
+	import rest = require("rest");
+
+	var hateoas: rest.Interceptor<hateoas.Config>;
+
+	namespace hateoas {
+		interface Config {
+			target?: string;
+			client?: rest.Client;
+		}
+	}
+
+	export = hateoas;
+}
+
+declare module "rest/interceptor/location" {
+	import rest = require("rest");
+
+	var location: rest.Interceptor<location.Config>;
+
+	namespace location {
+		interface Config {
+			client?: rest.Client;
+			code?: number;
+		}
+	}
+
+	export = location;
+}
+
+declare module "rest/interceptor/mime" {
+	import rest = require("rest");
+	import registry = require("rest/mime/registry");
+
+	var mime: rest.Interceptor<mime.Config>;
+
+	namespace mime {
+		interface Config {
+			mime?: string;
+			accept?: string;
+			registry?: registry.Registry;
+			permissive?: boolean;
+		}
+	}
+
+	export = mime;
+}
+
+declare module "rest/interceptor/pathPrefix" {
+	import rest = require("rest");
+
+	var pathPrefix: rest.Interceptor<pathPrefix.Config>;
+
+	namespace pathPrefix {
+		interface Config {
+			prefix?: string;
+		}
+	}
+
+	export = pathPrefix;
+}
+
+declare module "rest/interceptor/basicAuth" {
+	import rest = require("rest");
+
+	var basicAuth: rest.Interceptor<basicAuth.Config>;
+
+	namespace basicAuth {
+		interface Config {
+			username?: string;
+			password?: string;
+		}
+	}
+
+	export = basicAuth;
+}
+
+declare module "rest/interceptor/oAuth" {
+	import rest = require("rest");
+
+	var oAuth: rest.Interceptor<oAuth.Config>;
+
+	namespace oAuth {
+		interface DismissWindow {
+			(): void;
+		}
+		interface Config {
+			token?: string;
+			clientId?: string;
+			scope?: string;
+			authorizationUrl?: string;
+			redirectUrl?: string;
+			windowStrategy?: (url: string) => DismissWindow;
+			oAuthCallback?: (hash: string) => void;
+			oAuthCallbackName?: string;
+		}
+	}
+
+	export = oAuth;
+}
+
+declare module "rest/interceptor/csrf" {
+	import rest = require("rest");
+
+	var csrf: rest.Interceptor<csrf.Config>;
+
+	namespace csrf {
+		interface Config {
+			name?: string;
+			token?: string;
+		}
+	}
+
+	export = csrf;
+}
+
+declare module "rest/interceptor/errorCode" {
+	import rest = require("rest");
+
+	var errorCode: rest.Interceptor<errorCode.Config>;
+
+	namespace errorCode {
+		interface Config {
+			code?: number;
+		}
+	}
+
+	export = errorCode;
+}
+
+declare module "rest/interceptor/retry" {
+	import rest = require("rest");
+
+	var retry: rest.Interceptor<retry.Config>;
+
+	namespace retry {
+		interface Config {
+			initial?: number;
+			multiplier?: number;
+			max?: number;
+		}
+	}
+
+	export = retry;
+}
+
+declare module "rest/interceptor/template" {
+	import rest = require("rest");
+
+	var template: rest.Interceptor<template.Config>;
+
+	namespace template {
+		interface Config {
+			template?: string;
+			params?: {
+				[name: string]: any;
+			};
+		}
+	}
+
+	export = template;
+}
+
+declare module "rest/interceptor/timeout" {
+	import rest = require("rest");
+
+	var timeout: rest.Interceptor<timeout.Config>;
+
+	namespace timeout {
+		interface Config {
+			timeout?: number;
+			transient?: boolean;
+		}
+	}
+
+	export = timeout;
+}
+
+declare module "rest/interceptor/jsonp" {
+	import rest = require("rest");
+
+	var jsonp: rest.Interceptor<jsonp.Config>;
+
+	namespace jsonp {
+		interface Config {
+			callback?: {
+				param?: string;
+				prefix?: string;
+				name?: string;
+			}
+		}
+	}
+
+	export = jsonp;
+}
+
+declare module "rest/interceptor/ie/xdomain" {
+	import rest = require("rest");
+
+	var xdomain: rest.Interceptor<{}>;
+
+	export = xdomain;
+}
+
+declare module "rest/interceptor/ie/xhr" {
+	import rest = require("rest");
+
+	var xhr: rest.Interceptor<{}>;
+
+	export = xhr;
+}
+
+declare module "rest/mime/registry" {
+	import when = require("when");
+
+	var registry: registry.Registry;
+
+	namespace registry {
+		interface MIMEConverter {
+			read(value: string): any | when.Promise<any>;
+			write(value: any): string | when.Promise<string>;
+		}
+
+		interface Registry {
+			lookup(mimeType: string): when.Promise<MIMEConverter>;
+			register(mimeType: string, converter: MIMEConverter): void;
+		}
+	}
+
+	export = registry;
+}
+
+declare module "rest/client/xhr" {
+	import rest = require("rest");
+	var xhr: rest.Client;
+	export = xhr;
+}
+
+declare module "rest/client/node" {
+	import rest = require("rest");
+	var node: rest.Client;
+	export = node;
+}
+
+declare module "rest/client/jsonp" {
+	import rest = require("rest");
+	var jsonp: rest.Client;
+	export = jsonp;
+}
+
+declare module "rest/client/xdr" {
+	import rest = require("rest");
+	var xdr: rest.Client;
+	export = xdr;
+}
diff --git a/rest/rest-tests.ts b/rest/rest-tests.ts
index 813a067855..bfdfc39dcc 100644
--- a/rest/rest-tests.ts
+++ b/rest/rest-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./rest.d.ts" />
+
 
 import when = require('when');
 import rest = require('rest');
diff --git a/rest/rest.d.ts b/rest/rest.d.ts
deleted file mode 100644
index e444726742..0000000000
--- a/rest/rest.d.ts
+++ /dev/null
@@ -1,366 +0,0 @@
-// Type definitions for rest.js v1.3.1
-// Project: https://github.com/cujojs/rest
-// Definitions by: Wim Looman <https://github.com/Nemo157>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../when/when.d.ts" />
-
-declare module "rest" {
-	import when = require("when");
-
-	export = rest;
-
-	function rest(path: string): rest.ResponsePromise;
-	function rest(request: rest.Request): rest.ResponsePromise;
-
-	namespace rest {
-		export function setDefaultClient(client: Client): void;
-		export function getDefaultClient(): Client;
-		export function resetDefaultClient(): void;
-
-		export function wrap<T>(interceptor: Interceptor<T>, config?: T): Client;
-
-		export interface Request {
-			method?: string;
-			path?: string;
-			params?: any;
-			headers?: any;
-			entity?: any;
-		}
-
-		export interface Status {
-			code: number;
-			text?: string;
-		}
-
-		export interface Headers {
-			[index: string]: any // string or string[]
-		}
-
-		export interface Response {
-			request: Request;
-			raw: any;
-			status: Status;
-			headers: Headers;
-			entity: any;
-		}
-
-		export interface ResponsePromise extends when.Promise<Response> {
-			entity(): when.Promise<any>;
-			status(): when.Promise<number>;
-			headers(): when.Promise<Headers>;
-			header(headerName: string): when.Promise<any>; // string or string[]
-		}
-
-		export interface Interceptor<T> {
-			(parent?: Client, config?: T): Client;
-		}
-
-		export interface Client {
-			(path: string): ResponsePromise;
-			(request: Request): ResponsePromise;
-
-			skip(): Client;
-			wrap<T>(interceptor: Interceptor<T>, config?: T): Client;
-		}
-
-		export interface Meta {
-			client: Client;
-			arguments: any;
-		}
-	}
-}
-
-declare module "rest/interceptor" {
-	import when = require("when");
-	import rest = require("rest");
-
-	function interceptor<T, U>(config: interceptor.Config<T, U>): rest.Interceptor<T>;
-
-	namespace interceptor {
-		interface Config<T, U> {
-			init?: (config: T) => U;
-			request?: (request: rest.Request, config: U, meta: rest.Meta) => rest.Request | when.Promise<rest.Request>;
-			response?: (response: rest.Response, config: U, meta: rest.Meta) => rest.Response | when.Promise<rest.Response>;
-			success?: (response: rest.Response, config: U, meta: rest.Meta) => rest.Response | when.Promise<rest.Response>;
-			error?: (response: rest.Response, config: U, meta: rest.Meta) => rest.Response | when.Promise<rest.Response>;
-		}
-	}
-
-	export = interceptor;
-}
-
-declare module "rest/interceptor/defaultRequest" {
-	import rest = require("rest");
-
-	var defaultRequest: rest.Interceptor<defaultRequest.Config>;
-
-	namespace defaultRequest {
-		interface Config {
-			method?: string;
-			path?: string;
-			params?: any;
-			headers?: any;
-			entity?: any;
-			mixin?: any;
-		}
-	}
-
-	export = defaultRequest;
-}
-
-declare module "rest/interceptor/hateoas" {
-	import rest = require("rest");
-
-	var hateoas: rest.Interceptor<hateoas.Config>;
-
-	namespace hateoas {
-		interface Config {
-			target?: string;
-			client?: rest.Client;
-		}
-	}
-
-	export = hateoas;
-}
-
-declare module "rest/interceptor/location" {
-	import rest = require("rest");
-
-	var location: rest.Interceptor<location.Config>;
-
-	namespace location {
-		interface Config {
-			client?: rest.Client;
-			code?: number;
-		}
-	}
-
-	export = location;
-}
-
-declare module "rest/interceptor/mime" {
-	import rest = require("rest");
-	import registry = require("rest/mime/registry");
-
-	var mime: rest.Interceptor<mime.Config>;
-
-	namespace mime {
-		interface Config {
-			mime?: string;
-			accept?: string;
-			registry?: registry.Registry;
-			permissive?: boolean;
-		}
-	}
-
-	export = mime;
-}
-
-declare module "rest/interceptor/pathPrefix" {
-	import rest = require("rest");
-
-	var pathPrefix: rest.Interceptor<pathPrefix.Config>;
-
-	namespace pathPrefix {
-		interface Config {
-			prefix?: string;
-		}
-	}
-
-	export = pathPrefix;
-}
-
-declare module "rest/interceptor/basicAuth" {
-	import rest = require("rest");
-
-	var basicAuth: rest.Interceptor<basicAuth.Config>;
-
-	namespace basicAuth {
-		interface Config {
-			username?: string;
-			password?: string;
-		}
-	}
-
-	export = basicAuth;
-}
-
-declare module "rest/interceptor/oAuth" {
-	import rest = require("rest");
-
-	var oAuth: rest.Interceptor<oAuth.Config>;
-
-	namespace oAuth {
-		interface DismissWindow {
-			(): void;
-		}
-		interface Config {
-			token?: string;
-			clientId?: string;
-			scope?: string;
-			authorizationUrl?: string;
-			redirectUrl?: string;
-			windowStrategy?: (url: string) => DismissWindow;
-			oAuthCallback?: (hash: string) => void;
-			oAuthCallbackName?: string;
-		}
-	}
-
-	export = oAuth;
-}
-
-declare module "rest/interceptor/csrf" {
-	import rest = require("rest");
-
-	var csrf: rest.Interceptor<csrf.Config>;
-
-	namespace csrf {
-		interface Config {
-			name?: string;
-			token?: string;
-		}
-	}
-
-	export = csrf;
-}
-
-declare module "rest/interceptor/errorCode" {
-	import rest = require("rest");
-
-	var errorCode: rest.Interceptor<errorCode.Config>;
-
-	namespace errorCode {
-		interface Config {
-			code?: number;
-		}
-	}
-
-	export = errorCode;
-}
-
-declare module "rest/interceptor/retry" {
-	import rest = require("rest");
-
-	var retry: rest.Interceptor<retry.Config>;
-
-	namespace retry {
-		interface Config {
-			initial?: number;
-			multiplier?: number;
-			max?: number;
-		}
-	}
-
-	export = retry;
-}
-
-declare module "rest/interceptor/template" {
-	import rest = require("rest");
-
-	var template: rest.Interceptor<template.Config>;
-
-	namespace template {
-		interface Config {
-			template?: string;
-			params?: {
-				[name: string]: any;
-			};
-		}
-	}
-
-	export = template;
-}
-
-declare module "rest/interceptor/timeout" {
-	import rest = require("rest");
-
-	var timeout: rest.Interceptor<timeout.Config>;
-
-	namespace timeout {
-		interface Config {
-			timeout?: number;
-			transient?: boolean;
-		}
-	}
-
-	export = timeout;
-}
-
-declare module "rest/interceptor/jsonp" {
-	import rest = require("rest");
-
-	var jsonp: rest.Interceptor<jsonp.Config>;
-
-	namespace jsonp {
-		interface Config {
-			callback?: {
-				param?: string;
-				prefix?: string;
-				name?: string;
-			}
-		}
-	}
-
-	export = jsonp;
-}
-
-declare module "rest/interceptor/ie/xdomain" {
-	import rest = require("rest");
-
-	var xdomain: rest.Interceptor<{}>;
-
-	export = xdomain;
-}
-
-declare module "rest/interceptor/ie/xhr" {
-	import rest = require("rest");
-
-	var xhr: rest.Interceptor<{}>;
-
-	export = xhr;
-}
-
-declare module "rest/mime/registry" {
-	import when = require("when");
-
-	var registry: registry.Registry;
-
-	namespace registry {
-		interface MIMEConverter {
-			read(value: string): any | when.Promise<any>;
-			write(value: any): string | when.Promise<string>;
-		}
-
-		interface Registry {
-			lookup(mimeType: string): when.Promise<MIMEConverter>;
-			register(mimeType: string, converter: MIMEConverter): void;
-		}
-	}
-
-	export = registry;
-}
-
-declare module "rest/client/xhr" {
-	import rest = require("rest");
-	var xhr: rest.Client;
-	export = xhr;
-}
-
-declare module "rest/client/node" {
-	import rest = require("rest");
-	var node: rest.Client;
-	export = node;
-}
-
-declare module "rest/client/jsonp" {
-	import rest = require("rest");
-	var jsonp: rest.Client;
-	export = jsonp;
-}
-
-declare module "rest/client/xdr" {
-	import rest = require("rest");
-	var xdr: rest.Client;
-	export = xdr;
-}
diff --git a/rest/tsconfig.json b/rest/tsconfig.json
new file mode 100644
index 0000000000..653b3ba285
--- /dev/null
+++ b/rest/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "rest-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/restangular/index.d.ts b/restangular/index.d.ts
new file mode 100644
index 0000000000..0410d32cd1
--- /dev/null
+++ b/restangular/index.d.ts
@@ -0,0 +1,135 @@
+// Type definitions for Restangular v1.5.0
+// Project: https://github.com/mgonto/restangular
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="angularjs" />
+
+// Support AMD require (copying angular.d.ts approach)
+// allows for import {IRequestConfig} from 'restangular' ES6 approach
+import * as angular from 'angularjs';
+export = restangular;
+export as namespace Restangular;
+
+declare namespace restangular {
+
+  interface IPromise<T> extends angular.IPromise<T> {
+    call(methodName: string, params?: any): IPromise<T>;
+    get(fieldName: string): IPromise<T>;
+    $object: T;
+}
+
+  interface ICollectionPromise<T> extends angular.IPromise<T[]> {
+    push(object: any): ICollectionPromise<T>;
+    call(methodName: string, params?: any): ICollectionPromise<T>;
+    get(fieldName: string): ICollectionPromise<T>;
+    $object: T[];
+  }
+
+  interface IResponse {
+    status: number;
+    data: any;
+    headers(name: string): string;
+    config: {
+        method: string;
+        url: string;
+        params: any;
+    }
+  }
+
+  interface IProvider {
+    setBaseUrl(baseUrl: string): void;
+    setExtraFields(fields: string[]): void;
+    setParentless(parentless: boolean, routes: string[]): void;
+    setDefaultHttpFields(httpFields: any): void;
+    addElementTransformer(route: string, transformer: Function): void;
+    addElementTransformer(route: string, isCollection: boolean, transformer: Function): void;
+    setTransformOnlyServerElements(active: boolean): void;
+    setOnElemRestangularized(callback: (elem: any, isCollection: boolean, what: string, restangular: IService) => any): void;
+    setResponseInterceptor(responseInterceptor: (data: any, operation: string, what: string, url: string, response: IResponse, deferred: angular.IDeferred<any>) => any): void;
+    setResponseExtractor(responseInterceptor: (data: any, operation: string, what: string, url: string, response: IResponse, deferred: angular.IDeferred<any>) => any): void;
+    addResponseInterceptor(responseInterceptor: (data: any, operation: string, what: string, url: string, response: IResponse, deferred: angular.IDeferred<any>) => any): void;
+    setRequestInterceptor(requestInterceptor: (element: any, operation: string, what: string, url: string) => any): void;
+    addRequestInterceptor(requestInterceptor: (element: any, operation: string, what: string, url: string) => any): void;
+    setFullRequestInterceptor(fullRequestInterceptor: (element: any, operation: string, what: string, url: string, headers: any, params: any, httpConfig: angular.IRequestShortcutConfig) => {element: any; headers: any; params: any}): void;
+    addFullRequestInterceptor(requestInterceptor: (element: any, operation: string, what: string, url: string, headers: any, params: any, httpConfig: angular.IRequestShortcutConfig) => {headers: any; params: any; element: any; httpConfig: angular.IRequestShortcutConfig}): void;
+    setErrorInterceptor(errorInterceptor: (response: IResponse, deferred: angular.IDeferred<any>, responseHandler: (response: restangular.IResponse) => any) => any): void;
+    setRestangularFields(fields: {[fieldName: string]: string}): void;
+    setMethodOverriders(overriders: string[]): void;
+    setJsonp(jsonp: boolean): void;
+    setDefaultRequestParams(params: any): void;
+    setDefaultRequestParams(method: string, params: any): void;
+    setDefaultRequestParams(methods: string[], params: any): void;
+    setFullResponse(fullResponse: boolean): void;
+    setDefaultHeaders(headers: any): void;
+    setRequestSuffix(suffix: string): void;
+    setUseCannonicalId(useCannonicalId: boolean): void;
+    setEncodeIds(encode: boolean): void;
+  }
+
+  interface ICustom {
+    customGET(path: string, params?: any, headers?: any): IPromise<any>;
+    customGETLIST(path: string, params?: any, headers?: any): ICollectionPromise<any>;
+    customDELETE(path: string, params?: any, headers?: any): IPromise<any>;
+    customPOST(elem?: any, path?: string, params?: any, headers?: any): IPromise<any>;
+    customPUT(elem?: any, path?: string, params?: any, headers?: any): IPromise<any>;
+    customOperation(operation: string, path: string, params?: any, headers?: any, elem?: any): IPromise<any>;
+    addRestangularMethod(name: string, operation: string, path?: string, params?: any, headers?: any, elem?: any): IPromise<any>;
+  }
+
+  interface IService extends ICustom, IProvider {
+    one(route: string, id?: number): IElement;
+    one(route: string, id?: string): IElement;
+    oneUrl(route: string, url: string): IElement;
+    all(route: string): IElement;
+    allUrl(route: string, url: string): IElement;
+    copy(fromElement: any): IElement;
+    withConfig(configurer: (RestangularProvider: IProvider) => any): IService;
+    restangularizeElement(parent: any, element: any, route: string, collection?: any, reqParams?: any): IElement;
+    restangularizeCollection(parent: any, element: any, route: string): ICollection;
+    service(route: string, parent?: any): IService;
+    stripRestangular(element: any): any;
+    extendModel(route: string, extender: (model: IElement) => any): void;
+  }
+
+  interface IElement extends IService {
+    get(queryParams?: any, headers?: any): IPromise<any>;
+    get<T>(queryParams?: any, headers?: any): IPromise<T>;
+    getList(subElement?: any, queryParams?: any, headers?: any): ICollectionPromise<any>;
+    getList<T>(subElement?: any, queryParams?: any, headers?: any): ICollectionPromise<T>;
+    put(queryParams?: any, headers?: any): IPromise<any>;
+    post(subElement: any, elementToPost: any, queryParams?: any, headers?: any): IPromise<any>;
+    post<T>(subElement: any, elementToPost: T, queryParams?: any, headers?: any): IPromise<T>;
+    post(elementToPost: any, queryParams?: any, headers?: any): IPromise<any>;
+    post<T>(elementToPost: T, queryParams?: any, headers?: any): IPromise<T>;
+    remove(queryParams?: any, headers?: any): IPromise<any>;
+    head(queryParams?: any, headers?: any): IPromise<any>;
+    trace(queryParams?: any, headers?: any): IPromise<any>;
+    options(queryParams?: any, headers?: any): IPromise<any>;
+    patch(queryParams?: any, headers?: any): IPromise<any>;
+    clone(): IElement;
+    plain(): any;
+    plain<T>(): T;
+    withHttpConfig(httpConfig: angular.IRequestShortcutConfig): IElement;
+    save(queryParams?: any, headers?: any): IPromise<any>;
+    getRestangularUrl(): string;
+  }
+
+  interface ICollection extends IService, Array<any> {
+    getList(queryParams?: any, headers?: any): ICollectionPromise<any>;
+    getList<T>(queryParams?: any, headers?: any): ICollectionPromise<T>;
+    post(elementToPost: any, queryParams?: any, headers?: any): IPromise<any>;
+    post<T>(elementToPost: T, queryParams?: any, headers?: any): IPromise<T>;
+    head(queryParams?: any, headers?: any): IPromise<any>;
+    trace(queryParams?: any, headers?: any): IPromise<any>;
+    options(queryParams?: any, headers?: any): IPromise<any>;
+    patch(queryParams?: any, headers?: any): IPromise<any>;
+    putElement(idx: any, params: any, headers: any): IPromise<any>;
+    withHttpConfig(httpConfig: angular.IRequestShortcutConfig): ICollection;
+    clone(): ICollection;
+    plain(): any;
+    plain<T>(): T[];
+    getRestangularUrl(): string;
+  }
+}
diff --git a/restangular/restangular-tests.ts b/restangular/restangular-tests.ts
index dba7099dad..8e8893f4fd 100644
--- a/restangular/restangular-tests.ts
+++ b/restangular/restangular-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="restangular.d.ts" />
-
+import restangular = require("restangular");
+import * as angular from 'angularjs';
 
 var myApp = angular.module('testModule');
 
diff --git a/restangular/restangular.d.ts b/restangular/restangular.d.ts
deleted file mode 100644
index d0f7353667..0000000000
--- a/restangular/restangular.d.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-// Type definitions for Restangular v1.4.0
-// Project: https://github.com/mgonto/restangular
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-// Support AMD require (copying angular.d.ts approach)
-// allows for import {IRequestConfig} from 'restangular' ES6 approach
-declare module 'restangular' {
-    export = restangular;
-}
-
-
-
-declare namespace restangular {
-
-  interface IPromise<T> extends angular.IPromise<T> {
-    call(methodName: string, params?: any): IPromise<T>;
-    get(fieldName: string): IPromise<T>;
-    $object: T;
-}
-
-  interface ICollectionPromise<T> extends angular.IPromise<T[]> {
-    push(object: any): ICollectionPromise<T>;
-    call(methodName: string, params?: any): ICollectionPromise<T>;
-    get(fieldName: string): ICollectionPromise<T>;
-    $object: T[];
-  }
-
-  interface IResponse {
-    status: number;
-    data: any;
-    headers(name: string): string;
-    config: {
-        method: string;
-        url: string;
-        params: any;
-    }
-  }
-
-  interface IProvider {
-    setBaseUrl(baseUrl: string): void;
-    setExtraFields(fields: string[]): void;
-    setParentless(parentless: boolean, routes: string[]): void;
-    setDefaultHttpFields(httpFields: any): void;
-    addElementTransformer(route: string, transformer: Function): void;
-    addElementTransformer(route: string, isCollection: boolean, transformer: Function): void;
-    setTransformOnlyServerElements(active: boolean): void;
-    setOnElemRestangularized(callback: (elem: any, isCollection: boolean, what: string, restangular: IService) => any): void;
-    setResponseInterceptor(responseInterceptor: (data: any, operation: string, what: string, url: string, response: IResponse, deferred: angular.IDeferred<any>) => any): void;
-    setResponseExtractor(responseInterceptor: (data: any, operation: string, what: string, url: string, response: IResponse, deferred: angular.IDeferred<any>) => any): void;
-    addResponseInterceptor(responseInterceptor: (data: any, operation: string, what: string, url: string, response: IResponse, deferred: angular.IDeferred<any>) => any): void;
-    setRequestInterceptor(requestInterceptor: (element: any, operation: string, what: string, url: string) => any): void;
-    addRequestInterceptor(requestInterceptor: (element: any, operation: string, what: string, url: string) => any): void;
-    setFullRequestInterceptor(fullRequestInterceptor: (element: any, operation: string, what: string, url: string, headers: any, params: any, httpConfig: angular.IRequestShortcutConfig) => {element: any; headers: any; params: any}): void;
-    addFullRequestInterceptor(requestInterceptor: (element: any, operation: string, what: string, url: string, headers: any, params: any, httpConfig: angular.IRequestShortcutConfig) => {headers: any; params: any; element: any; httpConfig: angular.IRequestShortcutConfig}): void;
-    setErrorInterceptor(errorInterceptor: (response: IResponse, deferred: angular.IDeferred<any>) => any): void;
-    setRestangularFields(fields: {[fieldName: string]: string}): void;
-    setMethodOverriders(overriders: string[]): void;
-    setJsonp(jsonp: boolean): void;
-    setDefaultRequestParams(params: any): void;
-    setDefaultRequestParams(method: string, params: any): void;
-    setDefaultRequestParams(methods: string[], params: any): void;
-    setFullResponse(fullResponse: boolean): void;
-    setDefaultHeaders(headers: any): void;
-    setRequestSuffix(suffix: string): void;
-    setUseCannonicalId(useCannonicalId: boolean): void;
-    setEncodeIds(encode: boolean): void;
-  }
-
-  interface ICustom {
-    customGET(path: string, params?: any, headers?: any): IPromise<any>;
-    customGETLIST(path: string, params?: any, headers?: any): ICollectionPromise<any>;
-    customDELETE(path: string, params?: any, headers?: any): IPromise<any>;
-    customPOST(elem?: any, path?: string, params?: any, headers?: any): IPromise<any>;
-    customPUT(elem?: any, path?: string, params?: any, headers?: any): IPromise<any>;
-    customOperation(operation: string, path: string, params?: any, headers?: any, elem?: any): IPromise<any>;
-    addRestangularMethod(name: string, operation: string, path?: string, params?: any, headers?: any, elem?: any): IPromise<any>;
-  }
-
-  interface IService extends ICustom, IProvider {
-    one(route: string, id?: number): IElement;
-    one(route: string, id?: string): IElement;
-    oneUrl(route: string, url: string): IElement;
-    all(route: string): IElement;
-    allUrl(route: string, url: string): IElement;
-    copy(fromElement: any): IElement;
-    withConfig(configurer: (RestangularProvider: IProvider) => any): IService;
-    restangularizeElement(parent: any, element: any, route: string, collection?: any, reqParams?: any): IElement;
-    restangularizeCollection(parent: any, element: any, route: string): ICollection;
-    service(route: string, parent?: any): IService;
-    stripRestangular(element: any): any;
-    extendModel(route: string, extender: (model: IElement) => any): void;
-  }
-
-  interface IElement extends IService {
-    get(queryParams?: any, headers?: any): IPromise<any>;
-    get<T>(queryParams?: any, headers?: any): IPromise<T>;
-    getList(subElement?: any, queryParams?: any, headers?: any): ICollectionPromise<any>;
-    getList<T>(subElement?: any, queryParams?: any, headers?: any): ICollectionPromise<T>;
-    put(queryParams?: any, headers?: any): IPromise<any>;
-    post(subElement: any, elementToPost: any, queryParams?: any, headers?: any): IPromise<any>;
-    post<T>(subElement: any, elementToPost: T, queryParams?: any, headers?: any): IPromise<T>;
-    post(elementToPost: any, queryParams?: any, headers?: any): IPromise<any>;
-    post<T>(elementToPost: T, queryParams?: any, headers?: any): IPromise<T>;
-    remove(queryParams?: any, headers?: any): IPromise<any>;
-    head(queryParams?: any, headers?: any): IPromise<any>;
-    trace(queryParams?: any, headers?: any): IPromise<any>;
-    options(queryParams?: any, headers?: any): IPromise<any>;
-    patch(queryParams?: any, headers?: any): IPromise<any>;
-    clone(): IElement;
-    plain(): any;
-    plain<T>(): T;
-    withHttpConfig(httpConfig: angular.IRequestShortcutConfig): IElement;
-    save(queryParams?: any, headers?: any): IPromise<any>;
-    getRestangularUrl(): string;
-  }
-
-  interface ICollection extends IService, Array<any> {
-    getList(queryParams?: any, headers?: any): ICollectionPromise<any>;
-    getList<T>(queryParams?: any, headers?: any): ICollectionPromise<T>;
-    post(elementToPost: any, queryParams?: any, headers?: any): IPromise<any>;
-    post<T>(elementToPost: T, queryParams?: any, headers?: any): IPromise<T>;
-    head(queryParams?: any, headers?: any): IPromise<any>;
-    trace(queryParams?: any, headers?: any): IPromise<any>;
-    options(queryParams?: any, headers?: any): IPromise<any>;
-    patch(queryParams?: any, headers?: any): IPromise<any>;
-    putElement(idx: any, params: any, headers: any): IPromise<any>;
-    withHttpConfig(httpConfig: angular.IRequestShortcutConfig): ICollection;
-    clone(): ICollection;
-    plain(): any;
-    plain<T>(): T[];
-    getRestangularUrl(): string;
-  }
-}
diff --git a/restangular/tsconfig.json b/restangular/tsconfig.json
new file mode 100644
index 0000000000..5137c417c5
--- /dev/null
+++ b/restangular/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "restangular-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/restful.js/index.d.ts b/restful.js/index.d.ts
new file mode 100644
index 0000000000..2556dcb863
--- /dev/null
+++ b/restful.js/index.d.ts
@@ -0,0 +1,241 @@
+// Type definitions for restful.js 0.6.2
+// Project: https://github.com/marmelab/restful.js
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export interface Headers {
+    [key: string]: any
+}
+
+export interface Api extends Endpoint<Api> {
+    all(name: string): CollectionEndpoint;
+    allUrl(name: string, url: string): CollectionEndpoint;
+    one(name: string, id: any): MemberEndpoint;
+    oneUrl(name: string, url: string): MemberEndpoint;
+    protocol(protocol: string): Api;
+    protocol(): string;
+    baseUrl(protocol: string): Api;
+    baseUrl(): string;
+    port(port: number): Api;
+    port(): number;
+    prefixUrl(prefix: string): Api;
+    prefixUrl(): string;
+    customUrl(url: string): Api;
+    customUrl(): string;
+}
+
+export interface MemberEndpoint extends Endpoint<MemberEndpoint> {
+    /**
+     * Target a child collection name.
+     * @param name
+     */
+    all(name: string): CollectionEndpoint;
+    allUrl(name: string, url: string): CollectionEndpoint;
+    /**
+     * Target a child member in a collection name.
+     * @param name
+     * @param id
+     */
+    one(name: string, id: any): MemberEndpoint;
+    oneUrl(name: string, url: string): MemberEndpoint;
+    /**
+     * Get a member. Returns a promise with an entity.
+     * @param params
+     * @param headers
+     */
+    get<T>(params?: any, headers?: Headers): Promise<MemberResponse<T>>;
+    /**
+     * Update a member. Returns a promise with the response.
+     * @param data
+     * @param headers
+     */
+    put<T>(data: any, headers?: Headers): Promise<MemberResponse<T>>;
+    /**
+     * Delete a member. Returns a promise with the response.
+     * @param data
+     * @param headers
+     */
+    delete<T>(data?: any, headers?: Headers): Promise<MemberResponse<T>>;
+    /**
+     * Patch a member. Returns a promise with the response.
+     * @param data
+     * @param headers
+     */
+    patch<T>(data: any, headers?: Headers): Promise<MemberResponse<T>>;
+    /**
+     * Perform a HEAD request on a member. Returns a promise with the response.
+     * @param headers
+     */
+    head<T>(headers?: any): Promise<MemberResponse<T>>;
+    customUrl(url: string): MemberEndpoint;
+    customUrl(): string;
+}
+
+export interface CollectionEndpoint extends Endpoint<CollectionEndpoint> {
+    /**
+     * Get a member in a collection. Returns a promise with an entity.
+     * @param id
+     */
+    get<T>(id: any, params?: any, headers?: Headers): Promise<MemberResponse<T>>;
+    /**
+     * Get a full collection. Returns a promise with an array of entities.
+     */
+    getAll<T>(params?: any, headers?: Headers): Promise<CollectionResponse<T>>;
+    /**
+     * Create a member in a collection. Returns a promise with the response.
+     */
+    post<T>(data: any, headers?: Headers): Promise<MemberResponse<T>>;
+    /**
+     * Update a member in a collection. Returns a promise with the response.
+     * @param id
+     * @param data
+     * @param headers
+     */
+    put<T>(id: any, data: any, headers?: Headers): Promise<MemberResponse<T>>;
+    /**
+     * Delete a member in a collection. Returns a promise with the response.
+     * @param id
+     * @param data
+     * @param headers
+     */
+    delete<T>(id: any, data?: any, headers?: Headers): Promise<MemberResponse<T>>;
+    /**
+     * Patch a member in a collection. Returns a promise with the response.
+     * @param id
+     * @param data
+     * @param headers
+     */
+    patch<T>(id: any, data: any, headers?: Headers): Promise<MemberResponse<T>>;
+    /**
+     * Perform a HEAD request on a member in a collection. Returns a promise with the response.
+     * @param id
+     * @param headers
+     */
+    head<T>(id: any, headers?: Headers): Promise<MemberResponse<T>>;
+}
+
+export interface Endpoint<Self> {
+    /**
+     * Get the url.
+     */
+    url(): string;
+    /**
+     * Add a response interceptor. You can only alter data and headers.
+     */
+    addResponseInterceptor(interceptor: ResponseInterceptor): Self;
+    responseInterceptors(): ResponseInterceptor[];
+    /**
+     * Add a request interceptor.
+     */
+    addRequestInterceptor(interceptor: RequestInterceptor): Self;
+    requestInterceptors(): RequestInterceptor[];
+    /**
+     * Add a full response interceptor. You can alter data and headers.
+     */
+    addFullResponseInterceptor(interceptor: ResponseInterceptor): Self;
+    fullResponseInterceptors(): ResponseInterceptor[];
+    /**
+     * Add a full request interceptor. You can alter params, headers, data, method and url.
+     */
+    addFullRequestInterceptor(interceptor: FullRequestInterceptor): Self;
+    fullRequestInterceptors(): FullRequestInterceptor[];
+    /**
+     * Add a header.
+     * @param name
+     * @param value
+     */
+    header(name: string, value: any): Self;
+    headers(): Headers;
+}
+
+export interface MemberResponse<T> extends ResponseBase {
+    (): {
+        data: T;
+        headers: Headers;
+        status: number;
+        statusText: string;
+    }
+    body(): ResponseBody<T>;
+}
+
+export interface CollectionResponse<T> extends ResponseBase {
+    (): {
+        data: T[];
+        headers: Headers;
+        status: number;
+        statusText: string;
+    }
+    body(): ResponseBody<T>[];
+}
+
+export interface ResponseBase {
+    status(): number;
+    headers(): Headers;
+    config(): any;
+}
+
+export interface ResponseBody<T> {
+    /**
+     * Get the JS object unserialized from the response body (which must be in JSON)
+     */
+    data(): T;
+    (): T;
+    /**
+     * Query a collection child of the entity.
+     * @param entity
+     */
+    all(entity: string): CollectionEndpoint;
+    /**
+     * Query a member child of the entity.
+     * @param entity
+     * @param id
+     */
+    one(entity: string, id: any): MemberEndpoint;
+    /**
+     * Update the member link to the entity. Returns a promise with the response.
+     * @param headers
+     */
+    save(headers?: Headers): void;
+    /**
+     * Delete the member link to the entity. Returns a promise with the response.
+     */
+    remove(headers?: Headers): void;
+    /**
+     * Get the entity url.
+     */
+    url(): string;
+    /**
+     * Get the id of the entity.
+     */
+    id(): any;
+}
+
+export interface RequestInterceptor {
+    (data: any, headers: Headers, method: string, url: string): any;
+}
+
+export interface FullRequestInterceptor {
+    (params: any, headers: Headers, data: any, method: string, url: string): FullRequestInterceptorReturnValue;
+}
+
+export interface FullRequestInterceptorReturnValue {
+    params?: any;
+    headers?: Headers;
+    data?: any;
+    method?: string;
+    url?: string;
+}
+
+export interface ResponseInterceptor {
+    (data: any, headers: Headers, method: string, url: string): ResponseInterceptorReturnValue;
+}
+
+export interface ResponseInterceptorReturnValue {
+    headers?: Headers;
+    data?: any;
+    method?: string;
+    url?: string;
+}
+
+export default function restful(endpoint: string): Api;
diff --git a/restful.js/restful.js-tests.ts b/restful.js/restful.js-tests.ts
index 80f3bd1874..7702a2d788 100644
--- a/restful.js/restful.js-tests.ts
+++ b/restful.js/restful.js-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="restful.js.d.ts" />
-
 import restful, {
     Api, MemberResponse, CollectionResponse, ResponseBody, CollectionEndpoint, MemberEndpoint,
 } from 'restful.js';
@@ -97,18 +95,18 @@ articleMember = api.one('articles', 1);  // http://api.example.com/articles/1
 commentMember = articleMember.one('comments', 3);  // http://api.example.com/articles/1/comments/3
 commentMember.get()
     .then((response: MemberResponse<Comment>) => {
-    var commentEntity = response.body();
+        var commentEntity = response.body();
 
-    // You can also call `all` and `one` on an entity
-    return commentEntity.all('authors').getAll(); // http://api.example.com/articles/1/comments/3/authors
-}).then((response: CollectionResponse<Author>) => {
-    var authorEntities = response.body();
+        // You can also call `all` and `one` on an entity
+        return commentEntity.all('authors').getAll(); // http://api.example.com/articles/1/comments/3/authors
+    }).then((response: CollectionResponse<Author>) => {
+        var authorEntities = response.body();
 
-    authorEntities.forEach((authorEntity: ResponseBody<Author>) => {
-        var author = authorEntity.data();
-        console.log(author.name);
+        authorEntities.forEach((authorEntity: ResponseBody<Author>) => {
+            var author = authorEntity.data();
+            console.log(author.name);
+        });
     });
-});
 
 // configure the api
 api.header('AuthToken', 'test');
@@ -145,32 +143,37 @@ resource.addFullRequestInterceptor(function(params, headers, data, method, url)
     //...
 
     // all args had been modified
-    return {
-        params: params,
-        headers: headers,
-        data: data,
-        method: method,
-        url: url
-    };
+    if (resource === null) {
+        return {
+            params: params,
+            headers: headers,
+            data: data,
+            method: method,
+            url: url
+        };
+    } else {
 
-    // just return modified arguments
-    return {
-        headers: headers,
-        data: data
-    };
+        // just return modified arguments
+        return {
+            headers: headers,
+            data: data
+        };
+    }
 });
 
 resource.addFullResponseInterceptor(function(data, headers, method, url) {
     // all args had been modified (method and url is read only)
-    return {
-        headers: headers,
-        data: data
-    };
-
-    // just return modified arguments
-    return {
-        headers: headers
-    };
+    if (url) {
+        return {
+            headers: headers,
+            data: data
+        };
+    } else {
+        // just return modified arguments
+        return {
+            headers: headers
+        };
+    }
 });
 
 //
@@ -194,5 +197,5 @@ commentMember
     .get()
     .then(function(commentEntity) { /*  */ })
     .catch(function(err) {
-    // deal with the error
-});
+        // deal with the error
+    });
diff --git a/restful.js/restful.js.d.ts b/restful.js/restful.js.d.ts
deleted file mode 100644
index a946b6714c..0000000000
--- a/restful.js/restful.js.d.ts
+++ /dev/null
@@ -1,242 +0,0 @@
-// Type definitions for restful.js 0.6.2
-// Project: https://github.com/marmelab/restful.js
-// Definitions by: Qubo <https://github.com/tkqubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "restful.js" {
-    export interface Headers {
-        [key: string]: any
-    }
-
-    export interface Api extends Endpoint<Api> {
-        all(name: string): CollectionEndpoint;
-        allUrl(name: string, url: string): CollectionEndpoint;
-        one(name: string, id: any): MemberEndpoint;
-        oneUrl(name: string, url: string): MemberEndpoint;
-        protocol(protocol: string): Api;
-        protocol(): string;
-        baseUrl(protocol: string): Api;
-        baseUrl(): string;
-        port(port: number): Api;
-        port(): number;
-        prefixUrl(prefix: string): Api;
-        prefixUrl(): string;
-        customUrl(url: string): Api;
-        customUrl(): string;
-    }
-
-    export interface MemberEndpoint extends Endpoint<MemberEndpoint> {
-        /**
-         * Target a child collection name.
-         * @param name
-         */
-        all(name: string): CollectionEndpoint;
-        allUrl(name: string, url: string): CollectionEndpoint;
-        /**
-         * Target a child member in a collection name.
-         * @param name
-         * @param id
-         */
-        one(name: string, id: any): MemberEndpoint;
-        oneUrl(name: string, url: string): MemberEndpoint;
-        /**
-         * Get a member. Returns a promise with an entity.
-         * @param params
-         * @param headers
-         */
-        get<T>(params?: any, headers?: Headers): Promise<MemberResponse<T>>;
-        /**
-         * Update a member. Returns a promise with the response.
-         * @param data
-         * @param headers
-         */
-        put<T>(data: any, headers?: Headers): Promise<MemberResponse<T>>;
-        /**
-         * Delete a member. Returns a promise with the response.
-         * @param data
-         * @param headers
-         */
-        delete<T>(data?: any, headers?: Headers): Promise<MemberResponse<T>>;
-        /**
-         * Patch a member. Returns a promise with the response.
-         * @param data
-         * @param headers
-         */
-        patch<T>(data: any, headers?: Headers): Promise<MemberResponse<T>>;
-        /**
-         * Perform a HEAD request on a member. Returns a promise with the response.
-         * @param headers
-         */
-        head<T>(headers?: any): Promise<MemberResponse<T>>;
-        customUrl(url: string): MemberEndpoint;
-        customUrl(): string;
-    }
-
-    export interface CollectionEndpoint extends Endpoint<CollectionEndpoint> {
-        /**
-         * Get a member in a collection. Returns a promise with an entity.
-         * @param id
-         */
-        get<T>(id: any, params?: any, headers?: Headers): Promise<MemberResponse<T>>;
-        /**
-         * Get a full collection. Returns a promise with an array of entities.
-         */
-        getAll<T>(params?: any, headers?: Headers): Promise<CollectionResponse<T>>;
-        /**
-         * Create a member in a collection. Returns a promise with the response.
-         */
-        post<T>(data: any, headers?: Headers): Promise<MemberResponse<T>>;
-        /**
-         * Update a member in a collection. Returns a promise with the response.
-         * @param id
-         * @param data
-         * @param headers
-         */
-        put<T>(id: any, data: any, headers?: Headers): Promise<MemberResponse<T>>;
-        /**
-         * Delete a member in a collection. Returns a promise with the response.
-         * @param id
-         * @param data
-         * @param headers
-         */
-        delete<T>(id: any, data?: any, headers?: Headers): Promise<MemberResponse<T>>;
-        /**
-         * Patch a member in a collection. Returns a promise with the response.
-         * @param id
-         * @param data
-         * @param headers
-         */
-        patch<T>(id: any, data: any, headers?: Headers): Promise<MemberResponse<T>>;
-        /**
-         * Perform a HEAD request on a member in a collection. Returns a promise with the response.
-         * @param id
-         * @param headers
-         */
-        head<T>(id: any, headers?: Headers): Promise<MemberResponse<T>>;
-    }
-
-    export interface Endpoint<Self> {
-        /**
-         * Get the url.
-         */
-        url(): string;
-        /**
-         * Add a response interceptor. You can only alter data and headers.
-         */
-        addResponseInterceptor(interceptor: ResponseInterceptor): Self;
-        responseInterceptors(): ResponseInterceptor[];
-        /**
-         * Add a request interceptor.
-         */
-        addRequestInterceptor(interceptor: RequestInterceptor): Self;
-        requestInterceptors(): RequestInterceptor[];
-        /**
-         * Add a full response interceptor. You can alter data and headers.
-         */
-        addFullResponseInterceptor(interceptor: ResponseInterceptor): Self;
-        fullResponseInterceptors(): ResponseInterceptor[];
-        /**
-         * Add a full request interceptor. You can alter params, headers, data, method and url.
-         */
-        addFullRequestInterceptor(interceptor: FullRequestInterceptor): Self;
-        fullRequestInterceptors(): FullRequestInterceptor[];
-        /**
-         * Add a header.
-         * @param name
-         * @param value
-         */
-        header(name: string, value: any): Self;
-        headers(): Headers;
-    }
-
-    export interface MemberResponse<T> extends ResponseBase {
-        (): {
-            data: T;
-            headers: Headers;
-            status: number;
-            statusText: string;
-        }
-        body(): ResponseBody<T>;
-    }
-
-    export interface CollectionResponse<T> extends ResponseBase {
-        (): {
-            data: T[];
-            headers: Headers;
-            status: number;
-            statusText: string;
-        }
-        body(): ResponseBody<T>[];
-    }
-
-    export interface ResponseBase {
-        status(): number;
-        headers(): Headers;
-        config(): any;
-    }
-
-    export interface ResponseBody<T> {
-        /**
-         * Get the JS object unserialized from the response body (which must be in JSON)
-         */
-        data(): T;
-        (): T;
-        /**
-         * Query a collection child of the entity.
-         * @param entity
-         */
-        all(entity: string): CollectionEndpoint;
-        /**
-         * Query a member child of the entity.
-         * @param entity
-         * @param id
-         */
-        one(entity: string, id: any): MemberEndpoint;
-        /**
-         * Update the member link to the entity. Returns a promise with the response.
-         * @param headers
-         */
-        save(headers?: Headers): void;
-        /**
-         * Delete the member link to the entity. Returns a promise with the response.
-         */
-        remove(headers?: Headers): void;
-        /**
-         * Get the entity url.
-         */
-        url(): string;
-        /**
-         * Get the id of the entity.
-         */
-        id(): any;
-    }
-
-    export interface RequestInterceptor {
-        (data: any, headers: Headers, method: string, url: string): any;
-    }
-
-    export interface FullRequestInterceptor {
-        (params: any, headers: Headers, data: any, method: string, url: string): FullRequestInterceptorReturnValue;
-    }
-
-    export interface FullRequestInterceptorReturnValue {
-        params?: any;
-        headers?: Headers;
-        data?: any;
-        method?: string;
-        url?: string;
-    }
-
-    export interface ResponseInterceptor {
-        (data: any, headers: Headers, method: string, url: string): ResponseInterceptorReturnValue;
-    }
-
-    export interface ResponseInterceptorReturnValue {
-        headers?: Headers;
-        data?: any;
-        method?: string;
-        url?: string;
-    }
-
-    export default function restful(endpoint: string): Api;
-}
diff --git a/restful.js/tsconfig.json b/restful.js/tsconfig.json
new file mode 100644
index 0000000000..74c7c24ce4
--- /dev/null
+++ b/restful.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "restful.js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/restify/index.d.ts b/restify/index.d.ts
new file mode 100644
index 0000000000..561671d936
--- /dev/null
+++ b/restify/index.d.ts
@@ -0,0 +1,368 @@
+// Type definitions for node.js REST framework 2.0
+// Project: https://github.com/mcavage/node-restify
+// Definitions by: Bret Little <https://github.com/blittle>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import http = require('http');
+import bunyan = require('bunyan');
+
+
+interface addressInterface {
+  port: number;
+  family: string;
+  address: string;
+}
+
+interface requestFileInterface {
+    path: string;
+    type: string;
+}
+
+/**
+ * Comes from authorizationParser plugin
+ */
+interface requestAuthorization {
+    scheme: string;
+    credentials: string;
+    basic?: {
+        username: string;
+        password: string;
+    }
+}
+
+interface Request extends http.ServerRequest {
+  header: (key: string, defaultValue?: string) => any;
+  accepts: (type: string) => boolean;
+  is: (type: string) => boolean;
+  getLogger: (component: string) => any;
+  contentLength: number;
+  contentType: string;
+  href: () => string;
+  log: bunyan.Logger;
+  id: string;
+  path: () => string;
+  query: any;
+  secure: boolean;
+  time: number;
+  params: any;
+  files?: { [name: string]: requestFileInterface };
+  isSecure: () => boolean;
+  /** available when bodyParser plugin is used */
+  body?: any;
+  /** available when authorizationParser plugin is used */
+  username?: string;
+  /** available when authorizationParser plugin is used */
+  authorization?: requestAuthorization;
+}
+
+interface Response extends http.ServerResponse {
+  header: (key: string, value ?: any) => any;
+  cache: (type?: any, options?: Object) => any;
+  status: (code: number) => any;
+  send: (status?: any, body?: any, headers?: { [header: string]: string }) => any;
+  json: (status?: any, body?: any, headers?: { [header: string]: string }) => any;
+  code: number;
+  contentLength: number;
+  charSet(value: string): void;
+  contentType: string;
+  headers: Object;
+  id: string;
+}
+
+interface RouteSpec {
+  method: string;
+  name: string;
+  path: string;
+  versions: string[];
+}
+
+interface Route {
+  name: string;
+  method: string;
+  path: RoutePathRegex;
+  spec: RouteSpec;
+  types: string[];
+  versions: string[];
+}
+
+interface RouteOptions {
+    name: string;
+    method: string;
+    path?: string | RegExp;
+    url?: string | RegExp;
+    urlParamPattern?: RegExp;
+    contentType?: string | string[];
+    versions?: string | string[];
+}
+
+interface RoutePathRegex extends RegExp {
+  restifyParams: string[];
+}
+
+interface Router {
+  name: string;
+  mounts: { [routeName: string]: Route };
+  versions: string[];
+  contentType: string[];
+  routes: {
+    DELETE: Route[];
+    GET: Route[];
+    HEAD: Route[];
+    OPTIONS: Route[];
+    PATCH: Route[];
+    POST: Route[];
+    PUT: Route[];
+  };
+  log?: any;
+  toString: () => string;
+  
+  /**
+   * Takes an object of route params and query params, and 'renders' a URL
+   * @param    {String} routeName the route name
+   * @param    {Object} params    an object of route params
+   * @param    {Object} query     an object of query params
+   * @returns  {String}
+   */
+  render: (routeName: string, params: Object, query?: Object) => string;
+  
+  /**
+   * adds a route.
+   * @param    {Object} options an options object
+   * @returns  {String}         returns the route name if creation is successful.
+   */
+  mount: (options: Object) => string;
+  
+  /**
+   * unmounts a route.
+   * @param    {String} name the route name
+   * @returns  {String}      the name of the deleted route (or false if it was not matched)
+   */
+  unmount: (name: string) => string | boolean;
+}
+
+interface Server extends http.Server {
+  use(handler: RequestHandler, ...handlers: RequestHandler[]): Server;
+  use(handler: RequestHandler[], ...handlers: RequestHandler[]): Server;
+  use(handler: RequestHandler, ...handlers: RequestHandler[][]): Server;
+  use(handler: RequestHandler[], ...handlers: RequestHandler[][]): Server;
+
+  post(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[]): Route;
+  post(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[]): Route;
+  post(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[][]): Route;
+  post(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[][]): Route;
+
+  patch(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[]): Route;
+  patch(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[]): Route;
+  patch(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[][]): Route;
+  patch(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[][]): Route;
+
+  put(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[]): Route;
+  put(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[]): Route;
+  put(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[][]): Route;
+  put(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[][]): Route;
+
+  del(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[]): Route;
+  del(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[]): Route;
+  del(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[][]): Route;
+  del(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[][]): Route;
+
+  get(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[]): Route;
+  get(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[]): Route;
+  get(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[][]): Route;
+  get(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[][]): Route;
+
+  head(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[]): Route;
+  head(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[]): Route;
+  head(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[][]): Route;
+  head(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[][]): Route;
+
+  opts(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[]): Route;
+  opts(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[]): Route;
+  opts(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[][]): Route;
+  opts(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[][]): Route;
+
+  name: string;
+  version: string;
+  log: Object;
+  acceptable: string[];
+  url: string;
+  address: () => addressInterface;
+  listen(... args: any[]): any;
+  close(... args: any[]): any;
+  pre(routeCallBack: RequestHandler): Server;
+  server: http.Server;
+  router: Router;
+  routes: Route[];
+  toString: () => string;
+}
+
+interface ServerOptions {
+  certificate ?: string;
+  key ?: string;
+  formatters ?: Object;
+  log ?: Object;
+  name ?: string;
+  spdy ?: Object;
+  version ?: string;
+  responseTimeHeader ?: string;
+  responseTimeFormatter ?: (durationInMilliseconds: number) => any;
+  handleUpgrades ?: boolean;
+  router ?: Router;
+}
+
+interface ClientOptions {
+  accept?: string;
+  connectTimeout?: number;
+  dtrace?: Object;
+  gzip?: Object;
+  headers?: Object;
+  log?: Object;
+  retry?: Object;
+  signRequest?: Function;
+  url?: string;
+  userAgent?: string;
+  version?: string;
+}
+
+interface Client {
+  get: (path: string, callback?: (err: any, req: Request, res: Response, obj: any) => any) => any;
+  head: (path: string, callback?: (err: any, req: Request, res: Response) => any) => any;
+  post: (path: string, object: any, callback?: (err: any, req: Request, res: Response, obj: any) => any) => any;
+  put: (path: string, object: any, callback?: (err: any, req: Request, res: Response, obj: any) => any) => any;
+  del: (path: string, callback?: (err: any, req: Request, res: Response) => any) => any;
+  basicAuth: (username: string, password: string) => any;
+}
+
+interface HttpClient extends Client {
+  get: (path?: any, callback?: Function) => any;
+  head: (path?:any, callback?: Function) => any;
+  post: (opts?: any, callback?: Function) => any;
+  put: (opts?: any, callback?: Function) => any;
+  del: (opts?: any, callback?: Function) => any;
+}
+
+interface ThrottleOptions {
+  burst?: number;
+  rate?: number;
+  ip?: boolean;
+  xff?: boolean;
+  username?: boolean;
+  tokensTable?: Object;
+  maxKeys?: number;
+  overrides?: Object;
+}
+
+interface Next {
+  (err?: any): any;
+  ifError: (err?: any) => any;
+}
+
+interface RequestHandler {
+  (req: Request, res: Response, next: Next): any;
+}
+
+interface CORS {
+    (cors?: {
+        origins?: string[];
+        credentials?: boolean;
+        headers?: string[];
+    }): RequestHandler;
+    origins: string[];
+    ALLOW_HEADERS: string[];
+    credentials: boolean;
+}
+
+export function createServer(options?: ServerOptions): Server;
+
+export function createJsonClient(options?: ClientOptions): Client;
+export function createStringClient(options?: ClientOptions): Client;
+export function createClient(options?: ClientOptions): HttpClient;
+
+export class HttpError { constructor(cause: any, message?: any); }
+
+declare class DefiniteHttpError {
+  constructor(message?: any);
+  constructor(cause: any, message?: any);
+}
+
+export class BadRequestError extends DefiniteHttpError {}
+export class UnauthorizedError extends DefiniteHttpError {}
+export class PaymentRequiredError extends DefiniteHttpError {}
+export class ForbiddenError extends DefiniteHttpError {}
+export class NotFoundError extends DefiniteHttpError {}
+export class MethodNotAllowedError extends DefiniteHttpError {}
+export class NotAcceptableError extends DefiniteHttpError {}
+export class ProxyAuthenticationRequiredError extends DefiniteHttpError {}
+export class RequestTimeoutError extends DefiniteHttpError {}
+export class ConflictError extends DefiniteHttpError {}
+export class GoneError extends DefiniteHttpError {}
+export class LengthRequiredError extends DefiniteHttpError {}
+export class RequestEntityTooLargeError extends DefiniteHttpError {}
+export class RequesturiTooLargeError extends DefiniteHttpError {}
+export class UnsupportedMediaTypeError extends DefiniteHttpError {}
+export class RequestedRangeNotSatisfiableError extends DefiniteHttpError {}
+export class ExpectationFailedError extends DefiniteHttpError {}
+export class ImATeapotError extends DefiniteHttpError {}
+export class UnprocessableEntityError extends DefiniteHttpError {}
+export class LockedError extends DefiniteHttpError {}
+export class FailedDependencyError extends DefiniteHttpError {}
+export class UnorderedCollectionError extends DefiniteHttpError {}
+export class UpgradeRequiredError extends DefiniteHttpError {}
+export class PreconditionRequiredError extends DefiniteHttpError {}
+export class TooManyRequestsError extends DefiniteHttpError {}
+export class RequestHeaderFieldsTooLargeError extends DefiniteHttpError {}
+export class InternalServerError extends DefiniteHttpError {}
+export class NotImplementedError extends DefiniteHttpError {}
+export class BadGatewayError extends DefiniteHttpError {}
+export class ServiceUnavailableError extends DefiniteHttpError {}
+export class GatewayTimeoutError extends DefiniteHttpError {}
+export class HttpVersionNotSupportedError extends DefiniteHttpError {}
+export class VariantAlsoNegotiatesError extends DefiniteHttpError {}
+export class InsufficientStorageError extends DefiniteHttpError {}
+export class BandwidthLimitExceededError extends DefiniteHttpError {}
+export class NotExtendedError extends DefiniteHttpError {}
+export class NetworkAuthenticationRequiredError extends DefiniteHttpError {}
+export class RestError extends DefiniteHttpError {}
+
+export class PreconditionFailedError extends RestError {}
+export class BadDigestError extends RestError {}
+export class BadMethodError extends RestError {}
+export class InternalError extends RestError {}
+export class InvalidArgumentError extends RestError {}
+export class InvalidContentError extends RestError {}
+export class InvalidCredentialsError extends RestError {}
+export class InvalidHeaderError extends RestError {}
+export class InvalidVersionError extends RestError {}
+export class MissingParameterError extends RestError {}
+export class NotAuthorizedError extends RestError {}
+export class RequestExpiredError extends RestError {}
+export class RequestThrottledError extends RestError {}
+export class ResourceNotFoundError extends RestError {}
+export class WrongAcceptError extends RestError {}
+
+
+export function acceptParser(parser: any): RequestHandler;
+export function authorizationParser(): RequestHandler;
+export function dateParser(skew?: number): RequestHandler;
+export function queryParser(options?: Object): RequestHandler;
+export function urlEncodedBodyParser(options?: Object): RequestHandler[];
+export function jsonp(): RequestHandler;
+export function gzipResponse(options?: Object): RequestHandler;
+export function bodyParser(options?: Object): RequestHandler[];
+export function requestLogger(options?: Object): RequestHandler;
+export function serveStatic(options?: Object): RequestHandler;
+export function throttle(options?: ThrottleOptions): RequestHandler;
+export function conditionalRequest(): RequestHandler[];
+export function auditLogger(options?: Object): Function;
+export function fullResponse(): RequestHandler;
+export var defaultResponseHeaders : any;
+export var CORS: CORS;
+
+export module pre {
+    export function pause(): RequestHandler;
+    export function sanitizePath(options?: any): RequestHandler;
+    export function userAgentConnection(options?: any): RequestHandler;
+}
+
diff --git a/restify/restify-tests.ts b/restify/restify-tests.ts
index ca3c5000ef..a10e7b96e0 100644
--- a/restify/restify-tests.ts
+++ b/restify/restify-tests.ts
@@ -1,10 +1,10 @@
-/// <reference path="restify.d.ts" />
+
 
 import restify = require("restify");
 
 var server = restify.createServer({
   formatters: {
-    'application/foo': function formatFoo(req, res, body) {
+    'application/foo': function formatFoo(req: restify.Request, res: restify.Response, body: any) {
         if (body instanceof Error)
             return body.stack;
 
@@ -37,7 +37,7 @@ server.use((req, res, next)=>{});
 server.use([(req, res, next)=>{}]);
 server.use((req, res, next)=>{}, (req, res, next)=>{});
 
-function send(req, res, next) {
+function send(req: restify.Request, res: restify.Response, next: restify.Next) {
     req.header('key', 'val');
     req.header('key') === 'val';
     
@@ -77,7 +77,7 @@ function send(req, res, next) {
 
     res.code === 50;
     res.contentLength === 50;
-    res.charSet === 'test';
+    res.charSet('test');
     res.contentType === 'test';
     res.headers;
     res.id === 'test';
@@ -249,7 +249,15 @@ server.on('after', restify.auditLogger({
     log: ()=>{}
 }));
 
-restify.defaultResponseHeaders = function(data) {
+server.on('after', (req: restify.Request, res: restify.Response, route: restify.Route, err: any) => {
+    route.spec.method === 'GET';
+    route.spec.name === 'routeName';
+    route.spec.path === '/some/path';
+    route.spec.versions === ['v1'];
+    restify.auditLogger({ log: ()=>{} })(req, res, route, err);
+});
+
+restify.defaultResponseHeaders = function(data: any) {
   this.header('Server', 'helloworld');
 };
 
@@ -276,18 +284,16 @@ client = restify.createStringClient({
     version: ""
 });
 
-client.get("test", send);
-client.head('test', send);
-client.post('path', {}, send);
-client.put('path', {}, send);
-client.del('path', send);
+client.head('test', function(err: any, req: restify.Request, res: restify.Response) { });
+client.put('path', {}, function(err: any, req: restify.Request, res: restify.Response, obj: any) { });
+client.del('path', function(err: any, req: restify.Request, res: restify.Response) { });
 
-client.post('/foo', { hello: 'world' }, function(err, req, res, obj) {
+client.post('/foo', { hello: 'world' }, function(err: any, req: restify.Request, res: restify.Response, obj: any) {
     console.log('%d -> %j', res.statusCode, res.headers);
     console.log('%j', obj);
 });
 
-client.get('/foo/bar', function(err, req, res, data) {
+client.get('/foo/bar', function(err: any, req: restify.Request, res: restify.Response, data: string) {
     console.log('%s', data);
 });
 
@@ -295,13 +301,13 @@ var client2 = restify.createClient({
   url: 'http://127.0.0.1'
 });
 
-client2.get('/str/mcavage', function(err, req) {
+client2.get('/str/mcavage', function(err: any, req: any) {
 
-    req.on('result', function(err, res) {
+    req.on('result', function(err: any, res: any) {
 
         res.body = '';
         res.setEncoding('utf8');
-        res.on('data', function(chunk) {
+        res.on('data', function(chunk: string) {
             res.body += chunk;
         });
 
diff --git a/restify/restify-tests.ts.tscparams b/restify/restify-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/restify/restify-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/restify/restify.d.ts b/restify/restify.d.ts
deleted file mode 100644
index ec6fd26b6e..0000000000
--- a/restify/restify.d.ts
+++ /dev/null
@@ -1,363 +0,0 @@
-// Type definitions for node.js REST framework 2.0
-// Project: https://github.com/mcavage/node-restify
-// Definitions by: Bret Little <https://github.com/blittle>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../bunyan/bunyan.d.ts" />
-
-declare module "restify" {
-  import http = require('http');
-  import bunyan = require('bunyan');
-
-
-  interface addressInterface {
-    port: number;
-    family: string;
-    address: string;
-  }
-  
-  interface requestFileInterface {
-      path: string;
-      type: string;
-  }
-  
-  /**
-   * Comes from authorizationParser plugin
-   */
-  interface requestAuthorization {
-      scheme: string;
-      credentials: string;
-      basic?: {
-          username: string;
-          password: string;
-      }
-  }
-
-  interface Request extends http.ServerRequest {
-    header: (key: string, defaultValue?: string) => any;
-    accepts: (type: string) => boolean;
-    is: (type: string) => boolean;
-    getLogger: (component: string) => any;
-    contentLength: number;
-    contentType: string;
-    href: () => string;
-    log: bunyan.Logger;
-    id: string;
-    path: () => string;
-    query: any;
-    secure: boolean;
-    time: number;
-    params: any;
-    files?: { [name: string]: requestFileInterface };
-    isSecure: () => boolean;
-    /** available when bodyParser plugin is used */
-    body?: any;
-    /** available when authorizationParser plugin is used */
-    username?: string;
-    /** available when authorizationParser plugin is used */
-    authorization?: requestAuthorization;
-  }
-
-  interface Response extends http.ServerResponse {
-    header: (key: string, value ?: any) => any;
-    cache: (type?: any, options?: Object) => any;
-    status: (code: number) => any;
-    send: (status?: any, body?: any, headers?: { [header: string]: string }) => any;
-    json: (status?: any, body?: any, headers?: { [header: string]: string }) => any;
-    code: number;
-    contentLength: number;
-    charSet(value: string): void;
-    contentType: string;
-    headers: Object;
-    id: string;
-  }
-  
-  interface Route {
-    name: string;
-    method: string;
-    path: RoutePathRegex;
-    spec: Object;
-    types: string[];
-    versions: string[];
-  }
-  
-  interface RouteOptions {
-      name: string;
-      method: string;
-      path?: string | RegExp;
-      url?: string | RegExp;
-      urlParamPattern?: RegExp;
-      contentType?: string | string[];
-      versions?: string | string[];
-  }
-  
-  interface RoutePathRegex extends RegExp {
-    restifyParams: string[];
-  }
-  
-  interface Router {
-    name: string;
-    mounts: { [routeName: string]: Route };
-    versions: string[];
-    contentType: string[];
-    routes: {
-      DELETE: Route[];
-      GET: Route[];
-      HEAD: Route[];
-      OPTIONS: Route[];
-      PATCH: Route[];
-      POST: Route[];
-      PUT: Route[];
-    };
-    log?: any;
-    toString: () => string;
-    
-    /**
-     * Takes an object of route params and query params, and 'renders' a URL
-     * @param    {String} routeName the route name
-     * @param    {Object} params    an object of route params
-     * @param    {Object} query     an object of query params
-     * @returns  {String}
-     */
-    render: (routeName: string, params: Object, query?: Object) => string;
-    
-    /**
-     * adds a route.
-     * @param    {Object} options an options object
-     * @returns  {String}         returns the route name if creation is successful.
-     */
-    mount: (options: Object) => string;
-    
-    /**
-     * unmounts a route.
-     * @param    {String} name the route name
-     * @returns  {String}      the name of the deleted route (or false if it was not matched)
-     */
-    unmount: (name: string) => string | boolean;
-  }
-
-  interface Server extends http.Server {
-    use(handler: RequestHandler, ...handlers: RequestHandler[]): Server;
-    use(handler: RequestHandler[], ...handlers: RequestHandler[]): Server;
-    use(handler: RequestHandler, ...handlers: RequestHandler[][]): Server;
-    use(handler: RequestHandler[], ...handlers: RequestHandler[][]): Server;
-
-    post(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[]): Route;
-    post(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[]): Route;
-    post(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[][]): Route;
-    post(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[][]): Route;
-
-    patch(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[]): Route;
-    patch(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[]): Route;
-    patch(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[][]): Route;
-    patch(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[][]): Route;
-
-    put(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[]): Route;
-    put(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[]): Route;
-    put(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[][]): Route;
-    put(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[][]): Route;
-
-    del(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[]): Route;
-    del(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[]): Route;
-    del(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[][]): Route;
-    del(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[][]): Route;
-
-    get(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[]): Route;
-    get(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[]): Route;
-    get(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[][]): Route;
-    get(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[][]): Route;
-
-    head(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[]): Route;
-    head(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[]): Route;
-    head(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[][]): Route;
-    head(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[][]): Route;
-
-    opts(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[]): Route;
-    opts(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[]): Route;
-    opts(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[][]): Route;
-    opts(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[][]): Route;
-	
-    name: string;
-    version: string;
-    log: Object;
-    acceptable: string[];
-    url: string;
-    address: () => addressInterface;
-    listen(... args: any[]): any;
-    close(... args: any[]): any;
-    pre(routeCallBack: RequestHandler): Server;
-    server: http.Server;
-    router: Router;
-    routes: Route[];
-    toString: () => string;
-  }
-
-  interface ServerOptions {
-    certificate ?: string;
-    key ?: string;
-    formatters ?: Object;
-    log ?: Object;
-    name ?: string;
-    spdy ?: Object;
-    version ?: string;
-    responseTimeHeader ?: string;
-    responseTimeFormatter ?: (durationInMilliseconds: number) => any;
-    handleUpgrades ?: boolean;
-    router ?: Router;
-  }
-
-  interface ClientOptions {
-    accept?: string;
-    connectTimeout?: number;
-    dtrace?: Object;
-    gzip?: Object;
-    headers?: Object;
-    log?: Object;
-    retry?: Object;
-    signRequest?: Function;
-    url?: string;
-    userAgent?: string;
-    version?: string;
-  }
-
-  interface Client {
-    get: (path: string, callback?: (err: any, req: Request, res: Response, obj: any) => any) => any;
-    head: (path: string, callback?: (err: any, req: Request, res: Response) => any) => any;
-    post: (path: string, object: any, callback?: (err: any, req: Request, res: Response, obj: any) => any) => any;
-    put: (path: string, object: any, callback?: (err: any, req: Request, res: Response, obj: any) => any) => any;
-    del: (path: string, callback?: (err: any, req: Request, res: Response) => any) => any;
-    basicAuth: (username: string, password: string) => any;
-  }
-
-  interface HttpClient extends Client {
-    get: (path?: any, callback?: Function) => any;
-    head: (path?:any, callback?: Function) => any;
-    post: (opts?: any, callback?: Function) => any;
-    put: (opts?: any, callback?: Function) => any;
-    del: (opts?: any, callback?: Function) => any;
-  }
-
-  interface ThrottleOptions {
-    burst?: number;
-    rate?: number;
-    ip?: boolean;
-    xff?: boolean;
-    username?: boolean;
-    tokensTable?: Object;
-    maxKeys?: number;
-    overrides?: Object;
-  }
-
-  interface Next {
-    (err?: any): any;
-    ifError: (err?: any) => any;
-  }
-
-  interface RequestHandler {
-    (req: Request, res: Response, next: Next): any;
-  }
-
-  interface CORS {
-      (cors?: {
-          origins?: string[];
-          credentials?: boolean;
-          headers?: string[];
-      }): RequestHandler;
-      origins: string[];
-      ALLOW_HEADERS: string[];
-      credentials: boolean;
-  }
-
-  export function createServer(options?: ServerOptions): Server;
-
-  export function createJsonClient(options?: ClientOptions): Client;
-  export function createStringClient(options?: ClientOptions): Client;
-  export function createClient(options?: ClientOptions): HttpClient;
-
-  export class HttpError { constructor(cause: any, message?: any); }
-
-  class DefiniteHttpError {
-    constructor(message?: any);
-    constructor(cause: any, message?: any);
-  }
-
-  export class BadRequestError extends DefiniteHttpError {}
-  export class UnauthorizedError extends DefiniteHttpError {}
-  export class PaymentRequiredError extends DefiniteHttpError {}
-  export class ForbiddenError extends DefiniteHttpError {}
-  export class NotFoundError extends DefiniteHttpError {}
-  export class MethodNotAllowedError extends DefiniteHttpError {}
-  export class NotAcceptableError extends DefiniteHttpError {}
-  export class ProxyAuthenticationRequiredError extends DefiniteHttpError {}
-  export class RequestTimeoutError extends DefiniteHttpError {}
-  export class ConflictError extends DefiniteHttpError {}
-  export class GoneError extends DefiniteHttpError {}
-  export class LengthRequiredError extends DefiniteHttpError {}
-  export class RequestEntityTooLargeError extends DefiniteHttpError {}
-  export class RequesturiTooLargeError extends DefiniteHttpError {}
-  export class UnsupportedMediaTypeError extends DefiniteHttpError {}
-  export class RequestedRangeNotSatisfiableError extends DefiniteHttpError {}
-  export class ExpectationFailedError extends DefiniteHttpError {}
-  export class ImATeapotError extends DefiniteHttpError {}
-  export class UnprocessableEntityError extends DefiniteHttpError {}
-  export class LockedError extends DefiniteHttpError {}
-  export class FailedDependencyError extends DefiniteHttpError {}
-  export class UnorderedCollectionError extends DefiniteHttpError {}
-  export class UpgradeRequiredError extends DefiniteHttpError {}
-  export class PreconditionRequiredError extends DefiniteHttpError {}
-  export class TooManyRequestsError extends DefiniteHttpError {}
-  export class RequestHeaderFieldsTooLargeError extends DefiniteHttpError {}
-  export class InternalServerError extends DefiniteHttpError {}
-  export class NotImplementedError extends DefiniteHttpError {}
-  export class BadGatewayError extends DefiniteHttpError {}
-  export class ServiceUnavailableError extends DefiniteHttpError {}
-  export class GatewayTimeoutError extends DefiniteHttpError {}
-  export class HttpVersionNotSupportedError extends DefiniteHttpError {}
-  export class VariantAlsoNegotiatesError extends DefiniteHttpError {}
-  export class InsufficientStorageError extends DefiniteHttpError {}
-  export class BandwidthLimitExceededError extends DefiniteHttpError {}
-  export class NotExtendedError extends DefiniteHttpError {}
-  export class NetworkAuthenticationRequiredError extends DefiniteHttpError {}
-  export class RestError extends DefiniteHttpError {}
-
-  export class PreconditionFailedError extends RestError {}
-  export class BadDigestError extends RestError {}
-  export class BadMethodError extends RestError {}
-  export class InternalError extends RestError {}
-  export class InvalidArgumentError extends RestError {}
-  export class InvalidContentError extends RestError {}
-  export class InvalidCredentialsError extends RestError {}
-  export class InvalidHeaderError extends RestError {}
-  export class InvalidVersionError extends RestError {}
-  export class MissingParameterError extends RestError {}
-  export class NotAuthorizedError extends RestError {}
-  export class RequestExpiredError extends RestError {}
-  export class RequestThrottledError extends RestError {}
-  export class ResourceNotFoundError extends RestError {}
-  export class WrongAcceptError extends RestError {}
-
-
-  export function acceptParser(parser: any): RequestHandler;
-  export function authorizationParser(): RequestHandler;
-  export function dateParser(skew?: number): RequestHandler;
-  export function queryParser(options?: Object): RequestHandler;
-  export function urlEncodedBodyParser(options?: Object): RequestHandler[];
-  export function jsonp(): RequestHandler;
-  export function gzipResponse(options?: Object): RequestHandler;
-  export function bodyParser(options?: Object): RequestHandler[];
-  export function requestLogger(options?: Object): RequestHandler;
-  export function serveStatic(options?: Object): RequestHandler;
-  export function throttle(options?: ThrottleOptions): RequestHandler;
-  export function conditionalRequest(): RequestHandler[];
-  export function auditLogger(options?: Object): Function;
-  export function fullResponse(): RequestHandler;
-  export var defaultResponseHeaders : any;
-  export var CORS: CORS;
-
-  export module pre {
-      export function pause(): RequestHandler;
-      export function sanitizePath(options?: any): RequestHandler;
-      export function userAgentConnection(options?: any): RequestHandler;
-  }
-}
diff --git a/restify/tsconfig.json b/restify/tsconfig.json
new file mode 100644
index 0000000000..87c7b1dd21
--- /dev/null
+++ b/restify/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "restify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rethinkdb/index.d.ts b/rethinkdb/index.d.ts
new file mode 100644
index 0000000000..8194905556
--- /dev/null
+++ b/rethinkdb/index.d.ts
@@ -0,0 +1,231 @@
+// Type definitions for Rethinkdb 1.10.0
+// Project: http://rethinkdb.com/
+// Definitions by: Sean Hess <https://seanhess.github.io/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Reference: http://www.rethinkdb.com/api/#js
+// TODO: Document manipulation and below
+///<reference types="bluebird"/>
+
+
+
+export declare function connect(host: ConnectionOptions, cb?: (err: Error, conn: Connection) => void): Promise<Connection>;
+
+export declare function dbCreate(name: string): Operation<CreateResult>;
+export declare function dbDrop(name: string): Operation<DropResult>;
+export declare function dbList(): Operation<string[]>;
+
+export declare function db(name: string): Db;
+export declare function table(name: string, options?: { useOutdated: boolean }): Table;
+
+export declare function asc(property: string): Sort;
+export declare function desc(property: string): Sort;
+
+export declare var count: Aggregator;
+export declare function sum(prop: string): Aggregator;
+export declare function avg(prop: string): Aggregator;
+
+export declare function row(name: string): Expression<any>;
+export declare function expr(stuff: any): Expression<any>;
+
+export declare function now(): Time;
+
+// Control Structures
+export declare function branch(test: Expression<boolean>, trueBranch: Expression<any>, falseBranch: Expression<any>): Expression<any>;
+
+
+export declare class Cursor {
+    hasNext(): boolean;
+    each(cb: (err: Error, row: any) => void, done?: () => void);
+    each(cb: (err: Error, row: any) => boolean, done?: () => void); // returning false stops iteration
+    next(cb: (err: Error, row: any) => void);
+    toArray(cb: (err: Error, rows: any[]) => void);
+    close();
+}
+
+interface ConnectionOptions {
+    host: string;
+    port: number;
+    db?: string;
+    authKey?: string;
+}
+
+interface Connection {
+    close();
+    reconnect(cb?: (err: Error, conn: Connection) => void): Promise<Connection>;
+    use(dbName: string);
+    addListener(event: string, cb: Function);
+    on(event: string, cb: Function);
+}
+
+interface Db {
+    tableCreate(name: string, options?: TableOptions): Operation<CreateResult>;
+    tableDrop(name: string): Operation<DropResult>;
+    tableList(): Operation<string[]>;
+    table(name: string, options?: GetTableOptions): Table;
+}
+
+interface TableOptions {
+    primary_key?: string; // 'id'
+    durability?: string; // 'soft'
+    cache_size?: number;
+    datacenter?: string;
+}
+
+interface GetTableOptions {
+    useOutdated: boolean;
+}
+
+interface Writeable {
+    update(obj: Object, options?: UpdateOptions): Operation<WriteResult>;
+    replace(obj: Object, options?: UpdateOptions): Operation<WriteResult>;
+    replace(expr: ExpressionFunction<any>): Operation<WriteResult>;
+    delete(options?: UpdateOptions): Operation<WriteResult>;
+}
+
+interface Table extends Sequence {
+    indexCreate(name: string, index?: ExpressionFunction<any>): Operation<CreateResult>;
+    indexDrop(name: string): Operation<DropResult>;
+    indexList(): Operation<string[]>;
+
+    insert(obj: any[], options?: InsertOptions): Operation<WriteResult>;
+    insert(obj: any, options?: InsertOptions): Operation<WriteResult>;
+
+    get(key: string): Sequence; // primary key
+    getAll(key: string, index?: Index): Sequence; // without index defaults to primary key
+    getAll(...keys: string[]): Sequence;
+}
+
+interface Sequence extends Operation<Cursor>, Writeable {
+
+    between(lower: any, upper: any, index?: Index): Sequence;
+    filter(rql: ExpressionFunction<boolean>): Sequence;
+    filter(rql: Expression<boolean>): Sequence;
+    filter(obj: { [key: string]: any }): Sequence;
+
+
+    // Join
+    // these return left, right
+    innerJoin(sequence: Sequence, join: JoinFunction<boolean>): Sequence;
+    outerJoin(sequence: Sequence, join: JoinFunction<boolean>): Sequence;
+    eqJoin(leftAttribute: string, rightSequence: Sequence, index?: Index): Sequence;
+    eqJoin(leftAttribute: ExpressionFunction<any>, rightSequence: Sequence, index?: Index): Sequence;
+    zip(): Sequence;
+
+    // Transform
+    map(transform: ExpressionFunction<any>): Sequence;
+    withFields(...selectors: any[]): Sequence;
+    concatMap(transform: ExpressionFunction<any>): Sequence;
+    orderBy(...keys: string[]): Sequence;
+    orderBy(...sorts: Sort[]): Sequence;
+    skip(n: number): Sequence;
+    limit(n: number): Sequence;
+    slice(start: number, end?: number): Sequence;
+    nth(n: number): Expression<any>;
+    indexesOf(obj: any): Sequence;
+    isEmpty(): Expression<boolean>;
+    union(sequence: Sequence): Sequence;
+    sample(n: number): Sequence;
+
+    // Aggregate
+    reduce(r: ReduceFunction<any>, base?: any): Expression<any>;
+    count(): Expression<number>;
+    distinct(): Sequence;
+    groupedMapReduce(group: ExpressionFunction<any>, map: ExpressionFunction<any>, reduce: ReduceFunction<any>, base?: any): Sequence;
+    groupBy(...aggregators: Aggregator[]): Expression<Object>; // TODO: reduction object
+    contains(prop: string): Expression<boolean>;
+
+    // Manipulation
+    pluck(...props: string[]): Sequence;
+    without(...props: string[]): Sequence;
+}
+
+interface ExpressionFunction<U> {
+    (doc: Expression<any>): Expression<U>;
+}
+
+interface JoinFunction<U> {
+    (left: Expression<any>, right: Expression<any>): Expression<U>;
+}
+
+interface ReduceFunction<U> {
+    (acc: Expression<any>, val: Expression<any>): Expression<U>;
+}
+
+interface InsertOptions {
+    upsert: boolean; // true
+    durability: string; // 'soft'
+    return_vals: boolean; // false
+}
+
+interface UpdateOptions {
+    non_atomic: boolean;
+    durability: string; // 'soft'
+    return_vals: boolean; // false
+}
+
+interface WriteResult {
+    inserted: number;
+    replaced: number;
+    unchanged: number;
+    errors: number;
+    deleted: number;
+    skipped: number;
+    first_error: Error;
+    generated_keys: string[]; // only for insert
+}
+
+interface JoinResult {
+    left: any;
+    right: any;
+}
+
+interface CreateResult {
+    created: number;
+}
+
+interface DropResult {
+    dropped: number;
+}
+
+interface Index {
+    index: string;
+    left_bound?: string; // 'closed'
+    right_bound?: string; // 'open'
+}
+
+interface Expression<T> extends Writeable, Operation<T> {
+    (prop: string): Expression<any>;
+    merge(query: Expression<Object>): Expression<Object>;
+    append(prop: string): Expression<Object>;
+    contains(prop: string): Expression<boolean>;
+
+    and(b: boolean): Expression<boolean>;
+    or(b: boolean): Expression<boolean>;
+    eq(v: any): Expression<boolean>;
+    ne(v: any): Expression<boolean>;
+    not(): Expression<boolean>;
+
+    gt(value: T): Expression<boolean>;
+    ge(value: T): Expression<boolean>;
+    lt(value: T): Expression<boolean>;
+    le(value: T): Expression<boolean>;
+
+    add(n: number): Expression<number>;
+    sub(n: number): Expression<number>;
+    mul(n: number): Expression<number>;
+    div(n: number): Expression<number>;
+    mod(n: number): Expression<number>;
+
+    hasFields(...fields: string[]): Expression<boolean>;
+
+    default(value: T): Expression<T>;
+}
+
+interface Operation<T> {
+    run(conn: Connection, cb?: (err: Error, result: T) => void): Promise<T>;
+}
+
+interface Aggregator { }
+interface Sort { }
+
+interface Time { }
diff --git a/rethinkdb/rethinkdb-tests.ts b/rethinkdb/rethinkdb-tests.ts
index a6911e3021..c2df9d5d2a 100644
--- a/rethinkdb/rethinkdb-tests.ts
+++ b/rethinkdb/rethinkdb-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="rethinkdb.d.ts" />
 
 import r = require("rethinkdb")
 
diff --git a/rethinkdb/rethinkdb-tests.ts.tscparams b/rethinkdb/rethinkdb-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/rethinkdb/rethinkdb-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/rethinkdb/rethinkdb.d.ts b/rethinkdb/rethinkdb.d.ts
deleted file mode 100644
index 7161e42060..0000000000
--- a/rethinkdb/rethinkdb.d.ts
+++ /dev/null
@@ -1,236 +0,0 @@
-// Type definitions for Rethinkdb 1.10.0
-// Project: http://rethinkdb.com/
-// Definitions by: Sean Hess <https://seanhess.github.io/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Reference: http://www.rethinkdb.com/api/#js
-// TODO: Document manipulation and below
-///<reference path="../bluebird/bluebird.d.ts"/>
-
-declare module "rethinkdb" {
-
-  export function connect(host:ConnectionOptions, cb?:(err:Error, conn:Connection)=>void):Promise<Connection>;
-
-  export function dbCreate(name:string):Operation<CreateResult>;
-  export function dbDrop(name:string):Operation<DropResult>;
-  export function dbList():Operation<string[]>;
-
-  export function db(name:string):Db;
-  export function table(name:string, options?:{useOutdated:boolean}):Table;
-
-  export function asc(property:string):Sort;
-  export function desc(property:string):Sort;
-
-  export var count:Aggregator;
-  export function sum(prop:string):Aggregator;
-  export function avg(prop:string):Aggregator;
-
-  export function row(name:string):Expression<any>;
-  export function expr(stuff:any):Expression<any>;
-
-  export function now():Time;
-
-  // Control Structures
-  export function branch(test:Expression<boolean>, trueBranch:Expression<any>, falseBranch:Expression<any>):Expression<any>;
-
-
-  export class Cursor {
-    hasNext():boolean;
-    each(cb:(err:Error, row:any)=>void, done?:()=>void);
-    each(cb:(err:Error, row:any)=>boolean, done?:()=>void); // returning false stops iteration
-    next(cb:(err:Error, row:any) => void);
-    toArray(cb:(err:Error, rows:any[]) => void);
-    close();
-  }
-
-  interface ConnectionOptions {
-    host:string;
-    port:number;
-    db?:string;
-    authKey?:string;
-  }
-
-  interface Connection {
-    close();
-    reconnect(cb?:(err:Error, conn:Connection)=>void):Promise<Connection>;
-    use(dbName:string);
-    addListener(event:string, cb:Function);
-    on(event:string, cb:Function);
-  }
-
-  interface Db {
-    tableCreate(name:string, options?:TableOptions):Operation<CreateResult>;
-    tableDrop(name:string):Operation<DropResult>;
-    tableList():Operation<string[]>;
-    table(name:string, options?:GetTableOptions):Table;
-  }
-
-  interface TableOptions {
-    primary_key?:string; // 'id'
-    durability?:string; // 'soft'
-    cache_size?:number;
-    datacenter?:string;
-  }
-
-  interface GetTableOptions {
-    useOutdated: boolean;
-  }
-
-  interface Writeable {
-    update(obj:Object, options?:UpdateOptions):Operation<WriteResult>;
-    replace(obj:Object, options?:UpdateOptions):Operation<WriteResult>;
-    replace(expr:ExpressionFunction<any>):Operation<WriteResult>;
-    delete(options?:UpdateOptions):Operation<WriteResult>;
-  }
-
-  interface Table extends Sequence {
-    indexCreate(name:string, index?:ExpressionFunction<any>):Operation<CreateResult>;
-    indexDrop(name:string):Operation<DropResult>;
-    indexList():Operation<string[]>;
-
-    insert(obj:any[], options?:InsertOptions):Operation<WriteResult>;
-    insert(obj:any, options?:InsertOptions):Operation<WriteResult>;
-
-    get(key:string):Sequence; // primary key
-    getAll(key:string, index?:Index):Sequence; // without index defaults to primary key
-    getAll(...keys:string[]):Sequence;
-  }
-
-  interface Sequence extends Operation<Cursor>, Writeable {
-
-    between(lower:any, upper:any, index?:Index):Sequence;
-    filter(rql:ExpressionFunction<boolean>):Sequence;
-    filter(rql:Expression<boolean>):Sequence;
-    filter(obj:{[key:string]:any}):Sequence;
-
-
-    // Join
-    // these return left, right
-    innerJoin(sequence:Sequence, join:JoinFunction<boolean>):Sequence;
-    outerJoin(sequence:Sequence, join:JoinFunction<boolean>):Sequence;
-    eqJoin(leftAttribute:string, rightSequence:Sequence, index?:Index):Sequence;
-    eqJoin(leftAttribute:ExpressionFunction<any>, rightSequence:Sequence, index?:Index):Sequence;
-    zip():Sequence;
-
-    // Transform
-    map(transform:ExpressionFunction<any>):Sequence;
-    withFields(...selectors:any[]):Sequence;
-    concatMap(transform:ExpressionFunction<any>):Sequence;
-    orderBy(...keys:string[]):Sequence;
-    orderBy(...sorts:Sort[]):Sequence;
-    skip(n:number):Sequence;
-    limit(n:number):Sequence;
-    slice(start:number, end?:number):Sequence;
-    nth(n:number):Expression<any>;
-    indexesOf(obj:any):Sequence;
-    isEmpty():Expression<boolean>;
-    union(sequence:Sequence):Sequence;
-    sample(n:number):Sequence;
-
-    // Aggregate
-    reduce(r:ReduceFunction<any>, base?:any):Expression<any>;
-    count():Expression<number>;
-    distinct():Sequence;
-    groupedMapReduce(group:ExpressionFunction<any>, map:ExpressionFunction<any>, reduce:ReduceFunction<any>, base?:any):Sequence;
-    groupBy(...aggregators:Aggregator[]):Expression<Object>; // TODO: reduction object
-    contains(prop:string):Expression<boolean>;
-
-    // Manipulation
-    pluck(...props:string[]):Sequence;
-    without(...props:string[]):Sequence;
-  }
-
-  interface ExpressionFunction<U> {
-    (doc:Expression<any>):Expression<U>;
-  }
-
-  interface JoinFunction<U> {
-    (left:Expression<any>, right:Expression<any>):Expression<U>;
-  }
-
-  interface ReduceFunction<U> {
-    (acc:Expression<any>, val:Expression<any>):Expression<U>;
-  }
-
-  interface InsertOptions {
-    upsert: boolean; // true
-    durability: string; // 'soft'
-    return_vals: boolean; // false
-  }
-
-  interface UpdateOptions {
-    non_atomic: boolean;
-    durability: string; // 'soft'
-    return_vals: boolean; // false
-  }
-
-  interface WriteResult {
-    inserted: number;
-    replaced: number;
-    unchanged: number;
-    errors: number;
-    deleted: number;
-    skipped: number;
-    first_error: Error;
-    generated_keys: string[]; // only for insert
-  }
-
-  interface JoinResult {
-    left:any;
-    right:any;
-  }
-
-  interface CreateResult {
-    created: number;
-  }
-
-  interface DropResult {
-    dropped: number;
-  }
-
-  interface Index {
-    index: string;
-    left_bound?: string; // 'closed'
-    right_bound?: string; // 'open'
-  }
-
-  interface Expression<T> extends Writeable, Operation<T> {
-      (prop:string):Expression<any>;
-      merge(query:Expression<Object>):Expression<Object>;
-      append(prop:string):Expression<Object>;
-      contains(prop:string):Expression<boolean>;
-
-      and(b:boolean):Expression<boolean>;
-      or(b:boolean):Expression<boolean>;
-      eq(v:any):Expression<boolean>;
-      ne(v:any):Expression<boolean>;
-      not():Expression<boolean>;
-
-      gt(value:T):Expression<boolean>;
-      ge(value:T):Expression<boolean>;
-      lt(value:T):Expression<boolean>;
-      le(value:T):Expression<boolean>;
-
-      add(n:number):Expression<number>;
-      sub(n:number):Expression<number>;
-      mul(n:number):Expression<number>;
-      div(n:number):Expression<number>;
-      mod(n:number):Expression<number>;
-
-      hasFields(...fields:string[]):Expression<boolean>;
-
-      default(value:T):Expression<T>;
-  }
-
-  interface Operation<T> {
-   run(conn:Connection, cb?:(err:Error, result:T)=>void):Promise<T>;
-  }
-
-  interface Aggregator {}
-  interface Sort {}
-
-  interface Time {}
-
-
-  // http://www.rethinkdb.com/api/#js
-  // TODO control structures
-}
diff --git a/rethinkdb/rethinkdb.d.ts.tscparams b/rethinkdb/rethinkdb.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/rethinkdb/rethinkdb.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/rethinkdb/tsconfig.json b/rethinkdb/tsconfig.json
new file mode 100644
index 0000000000..094cbd0bd3
--- /dev/null
+++ b/rethinkdb/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "rethinkdb-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/reveal/reveal.d.ts b/reveal/index.d.ts
similarity index 100%
rename from reveal/reveal.d.ts
rename to reveal/index.d.ts
diff --git a/reveal/reveal-tests.ts b/reveal/reveal-tests.ts
index f71c74318d..2de9b596ef 100644
--- a/reveal/reveal-tests.ts
+++ b/reveal/reveal-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="reveal.d.ts" />
+
 
 Reveal.initialize({
     controls: true,
diff --git a/reveal/tsconfig.json b/reveal/tsconfig.json
new file mode 100644
index 0000000000..febada03a8
--- /dev/null
+++ b/reveal/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "reveal-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rewire/index.d.ts b/rewire/index.d.ts
new file mode 100644
index 0000000000..eca8d7b322
--- /dev/null
+++ b/rewire/index.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for rewire v2.5.1
+// Project: https://github.com/jhnns/rewire
+// Definitions by: Borislav Zhivkov <https://github.com/borislavjivkov>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace RewireInterfaces {
+    interface Rewire {
+        /**
+         * Returns a rewired version of the module found at filename. Use rewire() exactly like require().
+         */
+        (filename: string): RewiredModule;
+    }
+
+    interface RewiredModule {
+        /**
+         * Takes all enumerable keys of obj as variable names and sets the values respectively. Returns a function which can be called to revert the change.
+         */
+        __set__(obj: Object): Function;
+        /**
+         * Sets the internal variable name to the given value. Returns a function which can be called to revert the change.
+         */
+        __set__(name: string, value: any): Function;
+        /**
+         * Returns the private variable with the given name.
+         */
+        __get__(name: string): any;
+        /**
+         * Returns a function which - when being called - sets obj, executes the given callback and reverts obj. If callback returns a promise, obj is only reverted after
+         * the promise has been resolved or rejected. For your convenience the returned function passes the received promise through.
+         */
+        __with__(obj: Object): (callback: Function) => any;
+    }
+}
+
+declare var rewire: RewireInterfaces.Rewire;
+export = rewire;
diff --git a/rewire/rewire-tests.ts b/rewire/rewire-tests.ts
index 3e81050e41..3815ceb873 100644
--- a/rewire/rewire-tests.ts
+++ b/rewire/rewire-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="rewire.d.ts" />
+import rewire = require("rewire");
 
 var myModule = rewire("../lib/myModule.js");
 
diff --git a/rewire/rewire.d.ts b/rewire/rewire.d.ts
deleted file mode 100644
index 8644b3df88..0000000000
--- a/rewire/rewire.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// Type definitions for rewire v2.5.1
-// Project: https://github.com/jhnns/rewire
-// Definitions by: Borislav Zhivkov <https://github.com/borislavjivkov>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace RewireInterfaces {
-    interface Rewire {
-        /**
-         * Returns a rewired version of the module found at filename. Use rewire() exactly like require().
-         */
-        (filename: string): RewiredModule;
-    }
-
-    interface RewiredModule {
-        /**
-         * Takes all enumerable keys of obj as variable names and sets the values respectively. Returns a function which can be called to revert the change.
-         */
-        __set__(obj: Object): Function;
-        /**
-         * Sets the internal variable name to the given value. Returns a function which can be called to revert the change.
-         */
-        __set__(name: string, value: any): Function;
-        /**
-         * Returns the private variable with the given name.
-         */
-        __get__(name: string): any;
-        /**
-         * Returns a function which - when being called - sets obj, executes the given callback and reverts obj. If callback returns a promise, obj is only reverted after
-         * the promise has been resolved or rejected. For your convenience the returned function passes the received promise through.
-         */
-        __with__(obj: Object): (callback: Function) => any;
-    }
-}
-
-declare var rewire: RewireInterfaces.Rewire;
-declare module "rewire" {
-    export = rewire;
-}
diff --git a/rewire/tsconfig.json b/rewire/tsconfig.json
new file mode 100644
index 0000000000..3ac269b9b8
--- /dev/null
+++ b/rewire/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "rewire-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rickshaw/rickshaw.d.ts b/rickshaw/index.d.ts
similarity index 100%
rename from rickshaw/rickshaw.d.ts
rename to rickshaw/index.d.ts
diff --git a/rickshaw/tsconfig.json b/rickshaw/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/rickshaw/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rimraf/index.d.ts b/rimraf/index.d.ts
new file mode 100644
index 0000000000..1fb95f79cd
--- /dev/null
+++ b/rimraf/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for rimraf
+// Project: https://github.com/isaacs/rimraf
+// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/rimraf.d.ts
+
+
+declare function rimraf(path: string, callback: (error: Error) => void): void;
+declare namespace rimraf {
+    export function sync(path: string): void;
+    export var EMFILE_MAX: number;
+    export var BUSYTRIES_MAX: number;
+}
+export = rimraf;
diff --git a/rimraf/rimraf-tests.ts b/rimraf/rimraf-tests.ts
index 74e33ce678..5827549f61 100644
--- a/rimraf/rimraf-tests.ts
+++ b/rimraf/rimraf-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="rimraf.d.ts" />
 
 import rimraf = require('rimraf');
 
diff --git a/rimraf/rimraf.d.ts b/rimraf/rimraf.d.ts
deleted file mode 100644
index 5df8b9b8ad..0000000000
--- a/rimraf/rimraf.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Type definitions for rimraf
-// Project: https://github.com/isaacs/rimraf
-// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/rimraf.d.ts
-
-declare module "rimraf" {
-	function rimraf(path: string, callback: (error: Error) => void): void;
-	namespace rimraf {
-		export function sync(path: string): void;
-		export var EMFILE_MAX: number;
-		export var BUSYTRIES_MAX: number;
-	}
-	export = rimraf;
-}
diff --git a/rimraf/tsconfig.json b/rimraf/tsconfig.json
new file mode 100644
index 0000000000..c2ff412cfb
--- /dev/null
+++ b/rimraf/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "rimraf-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/riot-api-nodejs/index.d.ts b/riot-api-nodejs/index.d.ts
new file mode 100644
index 0000000000..9500e3ac96
--- /dev/null
+++ b/riot-api-nodejs/index.d.ts
@@ -0,0 +1,411 @@
+// Type definitions for Riot Games API
+// Project: https://developer.riotgames.com/
+// Definitions by: Luca Laissue <https://github.com/zafixlrp/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="riot-games-api" />
+
+
+
+export declare enum region_e {
+    BR = 0,
+    EUNE = 1,
+    EUW = 2,
+    KR = 3,
+    LAN = 4,
+    LAS = 5,
+    NA = 6,
+    OCE = 7,
+    TR = 8,
+    RU = 9,
+    PBE = 10,
+}
+/**
+    * Tournament API
+    */
+export declare class TournamentAPI {
+    private ApiKeys;
+    private ApiKey;
+    /**
+        * TournamentAPI Constructor
+        */
+    constructor(...ApiKeys: string[]);
+    /**
+        * Change the Api Key for the next requests
+        */
+    private switchApiKey();
+    /**
+        * Send a request to the Riot Games Api and return a formatted json via a callback
+        * @param     {string}    url         request url
+        * @param     {string}    method      method(post / put / get)
+        * @param     {[type]}    data        body parameters
+        * @param     {(JSON}     callback    callback function with formatted JSON
+        */
+    private getJSON(url, method, data, callback);
+    /**
+        * get tournament Codes for a given tournament
+        * @param     {number}                                                      tournamentId    the ID of the tournament
+        * @param     {number}                                                      count           Number of codes you want
+        * @param     {RiotGamesAPI.TournamentProvider.TournamentCodeParameters}    params          Tournament Code parameters
+        * @param     {number[]}                                                    callback        Tournaments Codes                                                                    [description]
+        */
+    getTournamentCodes(tournamentId: number, count: number, params: RiotGamesAPI.TournamentProvider.TournamentCodeParameters, callback: (tournamentCodes: number[]) => void): any;
+    /**
+        * get tournament infos for a given tournament code
+        * @param     {string}                                               tournamentCode    Tournament Code
+        * @param     {RiotGamesAPI.TournamentProvider.TournamentCodeDto}    callback          Tournament Infos
+        */
+    getTournamentByCode(tournamentCode: string, callback: (tournament: RiotGamesAPI.TournamentProvider.TournamentCodeDto) => void): any;
+    /**
+        * edit the tournament Code parameters for a given tournament Code
+        * @param     {string}                                                            tournamentCode    Tournament Code to update
+        * @param     {RiotGamesAPI.TournamentProvider.TournamentCodeUpdateParameters}    params            parameters to edit
+        * @param     {(}                                                                 callback          callback if succes
+        */
+    editTournamentByCode(tournamentCode: string, params: RiotGamesAPI.TournamentProvider.TournamentCodeUpdateParameters, callback: () => void): any;
+    /**
+        * get the lobby envents for a given tournament Code
+        * @param     {string}                                           tournamentCode    the tournament code to get the lobby events
+        * @param     {RiotGamesAPI.TournamentProvider.LobbyEventDto}    callback          lobby events
+        */
+    getLobbyEventByCode(tournamentCode: string, callback: (lobbyEventDto: RiotGamesAPI.TournamentProvider.LobbyEventDto) => void): any;
+    /**
+        * Register a new tournament provider
+        * @param     {region_e}    region      region where you want to register the provider
+        * @param     {string}      url         url of callback for the POST notifications
+        * @param     {number}      callback    returns  the tounament provider ID
+        */
+    registerProvider(region: region_e, url: string, callback: (providerId: number) => void): any;
+    /**
+        * Register a new tournament
+        * @param     {string}    name          Name of tournament
+        * @param     {number}    providerId    Provider ID
+        * @param     {number}    callback      returns the tournament ID
+        */
+    registerTournament(name: string, providerId: number, callback: (tournamentId: number) => void): any;
+}
+export declare class ClassicAPI {
+    private ApiKeys;
+    private ApiKey;
+    private region;
+    /**
+        * ClassicAPI Constructor
+        * @param     {string[]}    ApiKeys    API Keys for the requests
+        * @param     {region_e}    region     region where you want to send requests
+        */
+    constructor(ApiKeys: string[], region: region_e);
+    /**
+        * change the API Key for the next requests
+        */
+    private switchApiKey();
+    /**
+        * get the JSON response code for a given URL
+        * @param     {string}      url         Request url
+        * @param     {Function}    callback    JSON formatted data
+        */
+    private getJSON(url, callback);
+    /**
+        * Edit the consts for a valid url for the riot games api
+        * @param     {string}    unparsedURL    the URL to parse
+        * @return    {string}                   the Parsed URL
+        */
+    private parseURL(unparsedURL);
+    /**
+        * get the API Key that is used for the requests
+        * @return    {string}    the current API Key
+        */
+    getCurrentApiKey(): string;
+    /**
+        * get the region where send send request
+        * @return    {region_e}    the current region
+        */
+    getRegion(): region_e;
+    /**
+        * set the API Keys
+        * @param    {string[]}    ApiKeys    the API Keys
+        */
+    setApikeys(ApiKeys: string[]): void;
+    /**
+        * set the region where you want to send requests
+        * @param    {region_e}    region    the region
+        */
+    setRegion(region: region_e): void;
+    /**
+        * get all champions of league of legends
+        * @param     {RiotGamesAPI.Champion.ChampionListDto}    callback    data callback
+        */
+    getChampions(callback: (championListDto: RiotGamesAPI.Champion.ChampionListDto) => void): any;
+    /**
+        * get the champion for a given id
+        * @param     {number}                               id          the champion id
+        * @param     {RiotGamesAPI.Champion.ChampionDto}    callback    data callback
+        */
+    getChampionById(id: number, callback: (ChampionDto: RiotGamesAPI.Champion.ChampionDto) => void): any;
+    /**
+        * get the free to play champions
+        * @param     {RiotGamesAPI.Champion.ChampionListDto}    callback    data callback
+        */
+    getFreeToPlayChampions(callback: (championsListDto: RiotGamesAPI.Champion.ChampionListDto) => void): any;
+    /**
+        * get Champion mastery of a player for a given champion ID
+        * @param     {number}                                             summonerId    summoner ID
+        * @param     {number}                                             championId    Champion ID
+        * @param     {RiotGamesAPI.ChampionMastery.ChampionMasteryDto}    callback      data callback
+        */
+    getChampionMastery(summonerId: number, championId: number, callback: (championMastery: RiotGamesAPI.ChampionMastery.ChampionMasteryDto) => void): any;
+    /**
+        * get all champion masteries for a given summoner
+        * @param     {number}                                               summonerId    Summoner ID
+        * @param     {[RiotGamesAPI.ChampionMastery.ChampionMasteryDto]}    callback      data callback
+        */
+    getChampionMasteryBySummoner(summonerId: number, callback: (championsMastery: [RiotGamesAPI.ChampionMastery.ChampionMasteryDto]) => void): any;
+    /**
+        * get the mastery score of a summoner
+        * @param     {number}    summonerId    Summoner ID
+        * @param     {number}    callback      Mastery Score
+        */
+    getChampionMasteryScore(summonerId: number, callback: (score: number) => void): any;
+    /**
+        * get The 3 best champion masteries
+        * @param     {[type]}                                               summonerId    Summoner ID
+        * @param     {[RiotGamesAPI.ChampionMastery.ChampionMasteryDto]}    callback      data callback
+        */
+    getTopChampionMastery(summonerId: any, callback: (championsMastery: [RiotGamesAPI.ChampionMastery.ChampionMasteryDto]) => void): any;
+    /**
+        * get the current game infos for a given summoner ID
+        * @param     {number}                                      summonerId    Summoner ID
+        * @param     {RiotGamesAPI.CurrentGame.CurrentGameInfo}    callback      data callback
+        */
+    getCurrentGame(summonerId: number, callback: (gameInfoDto: RiotGamesAPI.CurrentGame.CurrentGameInfo) => void): any;
+    /**
+        * get the featured games
+        * @param     {RiotGamesAPI.FeaturedGames.FeaturedGames}    callback    data callback
+        */
+    getFeaturedGame(callback: (featuredGamesInfos: RiotGamesAPI.FeaturedGames.FeaturedGames) => void): any;
+    /**
+        * get the recents games for a given Summoner ID
+        * @param     {number}                              summonerId    Summoner ID
+        * @param     {RiotGamesAPI.Game.RecentGamesDto}    callback      data callback
+        */
+    getRecentGames(summonerId: number, callback: (RecentGamesDto: RiotGamesAPI.Game.RecentGamesDto) => void): any;
+    /**
+        * Get League infos of a summoner
+        * @param     {number}                             summonerId    Summoner ID
+        * @param     {RiotGamesAPI.League.LeagueDto[]}    callback      data callback
+        */
+    getLeagueBySummonerId(summonerId: number, callback: (LeagueDto: RiotGamesAPI.League.LeagueDto[]) => void): any;
+    /**
+        * get League infos of a summoner
+        * @param     {number}                             summonerId    Summoner ID
+        * @param     {RiotGamesAPI.League.LeagueDto[]}    callback      data callback
+        */
+    getLeagueBySummonerIdEntry(summonerId: number, callback: (LeagueDto: RiotGamesAPI.League.LeagueDto[]) => void): any;
+    /**
+        * get league infos by team
+        * @param     {string}                             teamId      Team ID
+        * @param     {RiotGamesAPI.League.LeagueDto[]}    callback    data callback
+        */
+    getLeagueByTeamId(teamId: string, callback: (LeagueDto: RiotGamesAPI.League.LeagueDto[]) => void): any;
+    /**
+        * get league infos by team
+        * @param     {string}                             teamId      Team ID
+        * @param     {RiotGamesAPI.League.LeagueDto[]}    callback    data callback
+        */
+    getLeagueByTeamIdEntry(teamId: string, callback: (LeagueDto: RiotGamesAPI.League.LeagueDto[]) => void): any;
+    /**
+        * get Challengers in SOLO Queue
+        * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
+        */
+    getChallengers_SOLO(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
+    /**
+        * get Challengers Teams in 3x3
+        * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
+        */
+    getChallengers_3x3(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
+    /**
+        * get Challengers Teams in 5x5
+        * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
+        */
+    getChallengers_5x5(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
+    /**
+        * get Masters in Solo Queue
+        * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
+        */
+    getMasters_SOLO(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
+    /**
+        * get Master Teams in 3x3
+        * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
+        */
+    getMasters_3x3(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
+    /**
+        * get Master Teams in 5x5
+        * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
+        */
+    getMasters_5x5(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
+    /**
+        * get Champions (static data)
+        * @param     {RiotGamesAPI.LolStaticData.ChampionListDto}    callback    data callback
+        */
+    staticDataChampions(callback: (championListDto: RiotGamesAPI.LolStaticData.ChampionListDto) => void): any;
+    /**
+        * get data by champion ID
+        * @param     {number}                                    championsId    Champion ID
+        * @param     {RiotGamesAPI.LolStaticData.ChampionDto}    callback       data callback
+        */
+    staticDataChampionById(championsId: number, callback: (championDto: RiotGamesAPI.LolStaticData.ChampionDto) => void): any;
+    /**
+        * get League of Legends Items
+        * @param     {RiotGamesAPI.LolStaticData.ItemListDto}    callback    data callback
+        */
+    staticDataItems(callback: (itemsDto: RiotGamesAPI.LolStaticData.ItemListDto) => void): any;
+    /**
+        * Get item infos by ID
+        * @param     {number}                                itemId      item ID
+        * @param     {RiotGamesAPI.LolStaticData.ItemDto}    callback    data callback
+        */
+    staticDataItemById(itemId: number, callback: (itemDto: RiotGamesAPI.LolStaticData.ItemDto) => void): any;
+    /**
+        * get league of legends languages
+        * @param     {RiotGamesAPI.LolStaticData.LanguageStringsDto}    callback    data callback
+        */
+    staticDataLanguagesStrings(callback: (languageStringsDto: RiotGamesAPI.LolStaticData.LanguageStringsDto) => void): any;
+    /**
+        * get league of legends languages
+        * @param     {string[]}    callback    data callback
+        */
+    staticDataLanguages(callback: (languages: string[]) => void): any;
+    /**
+        * get Map data
+        * @param     {RiotGamesAPI.LolStaticData.MapDataDto}    callback    data callback
+        */
+    staticDataMap(callback: (mapDataDto: RiotGamesAPI.LolStaticData.MapDataDto) => void): any;
+    /**
+        * get all masteries
+        * @param     {RiotGamesAPI.LolStaticData.MasteryListDto}    callback    data callback
+        */
+    staticDataMastery(callback: (masteryListDto: RiotGamesAPI.LolStaticData.MasteryListDto) => void): any;
+    /**
+        * get data by mastery ID
+        * @param     {number}                                   masteryId    Mastery ID
+        * @param     {RiotGamesAPI.LolStaticData.MasteryDto}    callback     data callback
+        */
+    staticDataMasteryById(masteryId: number, callback: (masteryDto: RiotGamesAPI.LolStaticData.MasteryDto) => void): any;
+    staticDataRealm(callback: (realmDto: RiotGamesAPI.LolStaticData.RealmDto) => void): any;
+    /**
+        * get all runes
+        * @param     {RiotGamesAPI.LolStaticData.RuneListDto}    callback    data callback
+        */
+    staticDataRunes(callback: (runeListDto: RiotGamesAPI.LolStaticData.RuneListDto) => void): any;
+    /**
+        * get rune by Rune ID
+        * @param     {number}                                runeId      Rune ID
+        * @param     {RiotGamesAPI.LolStaticData.RuneDto}    callback    data callback
+        */
+    staticDataRuneById(runeId: number, callback: (runeDto: RiotGamesAPI.LolStaticData.RuneDto) => void): any;
+    /**
+        * get all summoner spells
+        * @param     {RiotGamesAPI.LolStaticData.SummonerSpellListDto}    callback    data callback
+        */
+    staticDataSummonerSpells(callback: (summonerSpellListDto: RiotGamesAPI.LolStaticData.SummonerSpellListDto) => void): any;
+    /**
+        * get summoner spell by summoner spell ID
+        * @param     {number}                                         summonerSpellId    Summoner spell ID
+        * @param     {RiotGamesAPI.LolStaticData.SummonerSpellDto}    callback           data callback
+        */
+    staticDataSummonSpellById(summonerSpellId: number, callback: (runeDto: RiotGamesAPI.LolStaticData.SummonerSpellDto) => void): any;
+    /**
+        * get league of legends  versions
+        * @param     {string[]}    callback    data callback
+        */
+    staticDataVersion(callback: (versions: string[]) => void): any;
+    /**
+        * get league of legends status
+        * @param     {RiotGamesAPI.LolStatus.Shard[]}    callback    data callback
+        */
+    getSatus(callback: (shardList: RiotGamesAPI.LolStatus.Shard[]) => void): any;
+    /**
+        * get status for a given region
+        * @param     {region_e}                        region      region
+        * @param     {RiotGamesAPI.LolStatus.Shard}    callback    data callback
+        */
+    getSatusByRegion(region: region_e, callback: (shard: RiotGamesAPI.LolStatus.Shard) => void): any;
+    /**
+        * get match infos for a given match ID
+        * @param     {number}                            matchId     Match ID
+        * @param     {RiotGamesAPI.Match.MatchDetail}    callback    data callback
+        */
+    getMatch(matchId: number, callback: (matchDetails: RiotGamesAPI.Match.MatchDetail) => void): any;
+    /**
+        * get all matches for a given tournament code
+        * @param     {string}      tournamentCode    Tournament Code
+        * @param     {number[]}    callback          data callback
+        */
+    getMatchIdsByTournamentCode(tournamentCode: string, callback: (matchIds: number[]) => void): any;
+    /**
+        * get match by ID in a tournament
+        * @param     {number}                            matchId     Match ID
+        * @param     {RiotGamesAPI.Match.MatchDetail}    callback    data callback
+        */
+    getMatchForTournament(matchId: number, callback: (matchDetails: RiotGamesAPI.Match.MatchDetail) => void): any;
+    /**
+        * get match list of a summoner
+        * @param     {number}                              summonerId    Summoner ID
+        * @param     {RiotGamesAPI.MatchList.MatchList}    callback      data callback
+        */
+    getMatchList(summonerId: number, callback: (matchList: RiotGamesAPI.MatchList.MatchList) => void): any;
+    /**
+        * get ranked stats of summoner
+        * @param     {number}                               summonerId    Summoner ID
+        * @param     {RiotGamesAPI.Stats.RankedStatsDto}    callback      data callback
+        */
+    getStatsRanked(summonerId: number, callback: (rankedStatsDto: RiotGamesAPI.Stats.RankedStatsDto) => void): any;
+    /**
+        * get summary ranked stats of summoner
+        * @param     {number}                                          summonerId    Summoner ID
+        * @param     {RiotGamesAPI.Stats.PlayerStatsSummaryListDto}    callback      data callback
+        */
+    getStatsSummary(summonerId: number, callback: (playerStatsSummaryListDto: RiotGamesAPI.Stats.PlayerStatsSummaryListDto) => void): any;
+    /**
+        * get summoner infos by Summoner Name
+        * @param     {string}                               summonerName    Summoner Name
+        * @param     {RiotGamesAPI.Summoner.SummonerDto}    callback        data callback
+        */
+    getSummonerByName(summonerName: string, callback: (summonerDto: RiotGamesAPI.Summoner.SummonerDto) => void): any;
+    /**
+        * get summoner infos by summoner ID
+        * @param     {number}                               summonerId    Summoner ID
+        * @param     {RiotGamesAPI.Summoner.SummonerDto}    callback      data callback
+        */
+    getSummonerById(summonerId: number, callback: (summonerDto: RiotGamesAPI.Summoner.SummonerDto) => void): any;
+    /**
+        * get masteries of a summoner
+        * @param     {number}                                   summonerId    Summoner ID
+        * @param     {RiotGamesAPI.Summoner.MasteryPagesDto}    callback      data callback
+        */
+    getSummonerMasteries(summonerId: number, callback: (masteryPagesDto: RiotGamesAPI.Summoner.MasteryPagesDto) => void): any;
+    /**
+        * get the Summoner Name of a summoner ID
+        * @param     {number}    summonerId    Summoner ID
+        * @param     {string}    callback      data callback
+        */
+    getSummonerName(summonerId: number, callback: (summonerName: string) => void): any;
+    /**
+        * get the runes of a summoner
+        * @param     {number}                                summonerId    Summoner ID
+        * @param     {RiotGamesAPI.Summoner.RunePagesDto}    callback      data callback
+        */
+    getSummonerRunes(summonerId: number, callback: (runePagesDto: RiotGamesAPI.Summoner.RunePagesDto) => void): any;
+    /**
+        * get teams of a summoner
+        * @param     {number}                         summonerId    Summoner ID
+        * @param     {RiotGamesAPI.Team.TeamDto[]}    callback      data callback
+        */
+    getTeamsBySummoner(summonerId: number, callback: (teamsList: RiotGamesAPI.Team.TeamDto[]) => void): any;
+    /**
+        * get Team infos by Team ID
+        * @param     {string}                       teamId      Team ID
+        * @param     {RiotGamesAPI.Team.TeamDto}    callback    data callback
+        */
+    getTeamById(teamId: string, callback: (teamDto: RiotGamesAPI.Team.TeamDto) => void): any;
+}
diff --git a/riot-api-nodejs/riot-api-nodejs-tests.ts b/riot-api-nodejs/riot-api-nodejs-tests.ts
index a531f52ee0..fcc0fa6a84 100644
--- a/riot-api-nodejs/riot-api-nodejs-tests.ts
+++ b/riot-api-nodejs/riot-api-nodejs-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./riot-api-nodejs.d.ts"/>
-
 import * as Api from "riot-api-nodejs";
 
 let ClassicApi = new Api.ClassicAPI([""], Api.region_e.EUW);
diff --git a/riot-api-nodejs/riot-api-nodejs.d.ts b/riot-api-nodejs/riot-api-nodejs.d.ts
deleted file mode 100644
index cb4c88766a..0000000000
--- a/riot-api-nodejs/riot-api-nodejs.d.ts
+++ /dev/null
@@ -1,412 +0,0 @@
-// Type definitions for Riot Games API
-// Project: https://developer.riotgames.com/
-// Definitions by: Luca Laissue <https://github.com/zafixlrp/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../request/request.d.ts" />
-/// <reference path="../riot-games-api/riot-games-api.d.ts" />
-
-declare module "riot-api-nodejs"{
-
-    export enum region_e {
-        BR = 0,
-        EUNE = 1,
-        EUW = 2,
-        KR = 3,
-        LAN = 4,
-        LAS = 5,
-        NA = 6,
-        OCE = 7,
-        TR = 8,
-        RU = 9,
-        PBE = 10,
-    }
-    /**
-        * Tournament API
-        */
-    export class TournamentAPI {
-        private ApiKeys;
-        private ApiKey;
-        /**
-            * TournamentAPI Constructor
-            */
-        constructor(...ApiKeys: string[]);
-        /**
-            * Change the Api Key for the next requests
-            */
-        private switchApiKey();
-        /**
-            * Send a request to the Riot Games Api and return a formatted json via a callback
-            * @param     {string}    url         request url
-            * @param     {string}    method      method(post / put / get)
-            * @param     {[type]}    data        body parameters
-            * @param     {(JSON}     callback    callback function with formatted JSON
-            */
-        private getJSON(url, method, data, callback);
-        /**
-            * get tournament Codes for a given tournament
-            * @param     {number}                                                      tournamentId    the ID of the tournament
-            * @param     {number}                                                      count           Number of codes you want
-            * @param     {RiotGamesAPI.TournamentProvider.TournamentCodeParameters}    params          Tournament Code parameters
-            * @param     {number[]}                                                    callback        Tournaments Codes                                                                    [description]
-            */
-        getTournamentCodes(tournamentId: number, count: number, params: RiotGamesAPI.TournamentProvider.TournamentCodeParameters, callback: (tournamentCodes: number[]) => void): any;
-        /**
-            * get tournament infos for a given tournament code
-            * @param     {string}                                               tournamentCode    Tournament Code
-            * @param     {RiotGamesAPI.TournamentProvider.TournamentCodeDto}    callback          Tournament Infos
-            */
-        getTournamentByCode(tournamentCode: string, callback: (tournament: RiotGamesAPI.TournamentProvider.TournamentCodeDto) => void): any;
-        /**
-            * edit the tournament Code parameters for a given tournament Code
-            * @param     {string}                                                            tournamentCode    Tournament Code to update
-            * @param     {RiotGamesAPI.TournamentProvider.TournamentCodeUpdateParameters}    params            parameters to edit
-            * @param     {(}                                                                 callback          callback if succes
-            */
-        editTournamentByCode(tournamentCode: string, params: RiotGamesAPI.TournamentProvider.TournamentCodeUpdateParameters, callback: () => void): any;
-        /**
-            * get the lobby envents for a given tournament Code
-            * @param     {string}                                           tournamentCode    the tournament code to get the lobby events
-            * @param     {RiotGamesAPI.TournamentProvider.LobbyEventDto}    callback          lobby events
-            */
-        getLobbyEventByCode(tournamentCode: string, callback: (lobbyEventDto: RiotGamesAPI.TournamentProvider.LobbyEventDto) => void): any;
-        /**
-            * Register a new tournament provider
-            * @param     {region_e}    region      region where you want to register the provider
-            * @param     {string}      url         url of callback for the POST notifications
-            * @param     {number}      callback    returns  the tounament provider ID
-            */
-        registerProvider(region: region_e, url: string, callback: (providerId: number) => void): any;
-        /**
-            * Register a new tournament
-            * @param     {string}    name          Name of tournament
-            * @param     {number}    providerId    Provider ID
-            * @param     {number}    callback      returns the tournament ID
-            */
-        registerTournament(name: string, providerId: number, callback: (tournamentId: number) => void): any;
-    }
-    export class ClassicAPI {
-        private ApiKeys;
-        private ApiKey;
-        private region;
-        /**
-            * ClassicAPI Constructor
-            * @param     {string[]}    ApiKeys    API Keys for the requests
-            * @param     {region_e}    region     region where you want to send requests
-            */
-        constructor(ApiKeys: string[], region: region_e);
-        /**
-            * change the API Key for the next requests
-            */
-        private switchApiKey();
-        /**
-            * get the JSON response code for a given URL
-            * @param     {string}      url         Request url
-            * @param     {Function}    callback    JSON formatted data
-            */
-        private getJSON(url, callback);
-        /**
-            * Edit the consts for a valid url for the riot games api
-            * @param     {string}    unparsedURL    the URL to parse
-            * @return    {string}                   the Parsed URL
-            */
-        private parseURL(unparsedURL);
-        /**
-            * get the API Key that is used for the requests
-            * @return    {string}    the current API Key
-            */
-        getCurrentApiKey(): string;
-        /**
-            * get the region where send send request
-            * @return    {region_e}    the current region
-            */
-        getRegion(): region_e;
-        /**
-            * set the API Keys
-            * @param    {string[]}    ApiKeys    the API Keys
-            */
-        setApikeys(ApiKeys: string[]): void;
-        /**
-            * set the region where you want to send requests
-            * @param    {region_e}    region    the region
-            */
-        setRegion(region: region_e): void;
-        /**
-            * get all champions of league of legends
-            * @param     {RiotGamesAPI.Champion.ChampionListDto}    callback    data callback
-            */
-        getChampions(callback: (championListDto: RiotGamesAPI.Champion.ChampionListDto) => void): any;
-        /**
-            * get the champion for a given id
-            * @param     {number}                               id          the champion id
-            * @param     {RiotGamesAPI.Champion.ChampionDto}    callback    data callback
-            */
-        getChampionById(id: number, callback: (ChampionDto: RiotGamesAPI.Champion.ChampionDto) => void): any;
-        /**
-            * get the free to play champions
-            * @param     {RiotGamesAPI.Champion.ChampionListDto}    callback    data callback
-            */
-        getFreeToPlayChampions(callback: (championsListDto: RiotGamesAPI.Champion.ChampionListDto) => void): any;
-        /**
-            * get Champion mastery of a player for a given champion ID
-            * @param     {number}                                             summonerId    summoner ID
-            * @param     {number}                                             championId    Champion ID
-            * @param     {RiotGamesAPI.ChampionMastery.ChampionMasteryDto}    callback      data callback
-            */
-        getChampionMastery(summonerId: number, championId: number, callback: (championMastery: RiotGamesAPI.ChampionMastery.ChampionMasteryDto) => void): any;
-        /**
-            * get all champion masteries for a given summoner
-            * @param     {number}                                               summonerId    Summoner ID
-            * @param     {[RiotGamesAPI.ChampionMastery.ChampionMasteryDto]}    callback      data callback
-            */
-        getChampionMasteryBySummoner(summonerId: number, callback: (championsMastery: [RiotGamesAPI.ChampionMastery.ChampionMasteryDto]) => void): any;
-        /**
-            * get the mastery score of a summoner
-            * @param     {number}    summonerId    Summoner ID
-            * @param     {number}    callback      Mastery Score
-            */
-        getChampionMasteryScore(summonerId: number, callback: (score: number) => void): any;
-        /**
-            * get The 3 best champion masteries
-            * @param     {[type]}                                               summonerId    Summoner ID
-            * @param     {[RiotGamesAPI.ChampionMastery.ChampionMasteryDto]}    callback      data callback
-            */
-        getTopChampionMastery(summonerId: any, callback: (championsMastery: [RiotGamesAPI.ChampionMastery.ChampionMasteryDto]) => void): any;
-        /**
-            * get the current game infos for a given summoner ID
-            * @param     {number}                                      summonerId    Summoner ID
-            * @param     {RiotGamesAPI.CurrentGame.CurrentGameInfo}    callback      data callback
-            */
-        getCurrentGame(summonerId: number, callback: (gameInfoDto: RiotGamesAPI.CurrentGame.CurrentGameInfo) => void): any;
-        /**
-            * get the featured games
-            * @param     {RiotGamesAPI.FeaturedGames.FeaturedGames}    callback    data callback
-            */
-        getFeaturedGame(callback: (featuredGamesInfos: RiotGamesAPI.FeaturedGames.FeaturedGames) => void): any;
-        /**
-            * get the recents games for a given Summoner ID
-            * @param     {number}                              summonerId    Summoner ID
-            * @param     {RiotGamesAPI.Game.RecentGamesDto}    callback      data callback
-            */
-        getRecentGames(summonerId: number, callback: (RecentGamesDto: RiotGamesAPI.Game.RecentGamesDto) => void): any;
-        /**
-            * Get League infos of a summoner
-            * @param     {number}                             summonerId    Summoner ID
-            * @param     {RiotGamesAPI.League.LeagueDto[]}    callback      data callback
-            */
-        getLeagueBySummonerId(summonerId: number, callback: (LeagueDto: RiotGamesAPI.League.LeagueDto[]) => void): any;
-        /**
-            * get League infos of a summoner
-            * @param     {number}                             summonerId    Summoner ID
-            * @param     {RiotGamesAPI.League.LeagueDto[]}    callback      data callback
-            */
-        getLeagueBySummonerIdEntry(summonerId: number, callback: (LeagueDto: RiotGamesAPI.League.LeagueDto[]) => void): any;
-        /**
-            * get league infos by team
-            * @param     {string}                             teamId      Team ID
-            * @param     {RiotGamesAPI.League.LeagueDto[]}    callback    data callback
-            */
-        getLeagueByTeamId(teamId: string, callback: (LeagueDto: RiotGamesAPI.League.LeagueDto[]) => void): any;
-        /**
-            * get league infos by team
-            * @param     {string}                             teamId      Team ID
-            * @param     {RiotGamesAPI.League.LeagueDto[]}    callback    data callback
-            */
-        getLeagueByTeamIdEntry(teamId: string, callback: (LeagueDto: RiotGamesAPI.League.LeagueDto[]) => void): any;
-        /**
-            * get Challengers in SOLO Queue
-            * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
-            */
-        getChallengers_SOLO(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
-        /**
-            * get Challengers Teams in 3x3
-            * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
-            */
-        getChallengers_3x3(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
-        /**
-            * get Challengers Teams in 5x5
-            * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
-            */
-        getChallengers_5x5(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
-        /**
-            * get Masters in Solo Queue
-            * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
-            */
-        getMasters_SOLO(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
-        /**
-            * get Master Teams in 3x3
-            * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
-            */
-        getMasters_3x3(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
-        /**
-            * get Master Teams in 5x5
-            * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
-            */
-        getMasters_5x5(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
-        /**
-            * get Champions (static data)
-            * @param     {RiotGamesAPI.LolStaticData.ChampionListDto}    callback    data callback
-            */
-        staticDataChampions(callback: (championListDto: RiotGamesAPI.LolStaticData.ChampionListDto) => void): any;
-        /**
-            * get data by champion ID
-            * @param     {number}                                    championsId    Champion ID
-            * @param     {RiotGamesAPI.LolStaticData.ChampionDto}    callback       data callback
-            */
-        staticDataChampionById(championsId: number, callback: (championDto: RiotGamesAPI.LolStaticData.ChampionDto) => void): any;
-        /**
-            * get League of Legends Items
-            * @param     {RiotGamesAPI.LolStaticData.ItemListDto}    callback    data callback
-            */
-        staticDataItems(callback: (itemsDto: RiotGamesAPI.LolStaticData.ItemListDto) => void): any;
-        /**
-            * Get item infos by ID
-            * @param     {number}                                itemId      item ID
-            * @param     {RiotGamesAPI.LolStaticData.ItemDto}    callback    data callback
-            */
-        staticDataItemById(itemId: number, callback: (itemDto: RiotGamesAPI.LolStaticData.ItemDto) => void): any;
-        /**
-            * get league of legends languages
-            * @param     {RiotGamesAPI.LolStaticData.LanguageStringsDto}    callback    data callback
-            */
-        staticDataLanguagesStrings(callback: (languageStringsDto: RiotGamesAPI.LolStaticData.LanguageStringsDto) => void): any;
-        /**
-            * get league of legends languages
-            * @param     {string[]}    callback    data callback
-            */
-        staticDataLanguages(callback: (languages: string[]) => void): any;
-        /**
-            * get Map data
-            * @param     {RiotGamesAPI.LolStaticData.MapDataDto}    callback    data callback
-            */
-        staticDataMap(callback: (mapDataDto: RiotGamesAPI.LolStaticData.MapDataDto) => void): any;
-        /**
-            * get all masteries
-            * @param     {RiotGamesAPI.LolStaticData.MasteryListDto}    callback    data callback
-            */
-        staticDataMastery(callback: (masteryListDto: RiotGamesAPI.LolStaticData.MasteryListDto) => void): any;
-        /**
-            * get data by mastery ID
-            * @param     {number}                                   masteryId    Mastery ID
-            * @param     {RiotGamesAPI.LolStaticData.MasteryDto}    callback     data callback
-            */
-        staticDataMasteryById(masteryId: number, callback: (masteryDto: RiotGamesAPI.LolStaticData.MasteryDto) => void): any;
-        staticDataRealm(callback: (realmDto: RiotGamesAPI.LolStaticData.RealmDto) => void): any;
-        /**
-            * get all runes
-            * @param     {RiotGamesAPI.LolStaticData.RuneListDto}    callback    data callback
-            */
-        staticDataRunes(callback: (runeListDto: RiotGamesAPI.LolStaticData.RuneListDto) => void): any;
-        /**
-            * get rune by Rune ID
-            * @param     {number}                                runeId      Rune ID
-            * @param     {RiotGamesAPI.LolStaticData.RuneDto}    callback    data callback
-            */
-        staticDataRuneById(runeId: number, callback: (runeDto: RiotGamesAPI.LolStaticData.RuneDto) => void): any;
-        /**
-            * get all summoner spells
-            * @param     {RiotGamesAPI.LolStaticData.SummonerSpellListDto}    callback    data callback
-            */
-        staticDataSummonerSpells(callback: (summonerSpellListDto: RiotGamesAPI.LolStaticData.SummonerSpellListDto) => void): any;
-        /**
-            * get summoner spell by summoner spell ID
-            * @param     {number}                                         summonerSpellId    Summoner spell ID
-            * @param     {RiotGamesAPI.LolStaticData.SummonerSpellDto}    callback           data callback
-            */
-        staticDataSummonSpellById(summonerSpellId: number, callback: (runeDto: RiotGamesAPI.LolStaticData.SummonerSpellDto) => void): any;
-        /**
-            * get league of legends  versions
-            * @param     {string[]}    callback    data callback
-            */
-        staticDataVersion(callback: (versions: string[]) => void): any;
-        /**
-            * get league of legends status
-            * @param     {RiotGamesAPI.LolStatus.Shard[]}    callback    data callback
-            */
-        getSatus(callback: (shardList: RiotGamesAPI.LolStatus.Shard[]) => void): any;
-        /**
-            * get status for a given region
-            * @param     {region_e}                        region      region
-            * @param     {RiotGamesAPI.LolStatus.Shard}    callback    data callback
-            */
-        getSatusByRegion(region: region_e, callback: (shard: RiotGamesAPI.LolStatus.Shard) => void): any;
-        /**
-            * get match infos for a given match ID
-            * @param     {number}                            matchId     Match ID
-            * @param     {RiotGamesAPI.Match.MatchDetail}    callback    data callback
-            */
-        getMatch(matchId: number, callback: (matchDetails: RiotGamesAPI.Match.MatchDetail) => void): any;
-        /**
-            * get all matches for a given tournament code
-            * @param     {string}      tournamentCode    Tournament Code
-            * @param     {number[]}    callback          data callback
-            */
-        getMatchIdsByTournamentCode(tournamentCode: string, callback: (matchIds: number[]) => void): any;
-        /**
-            * get match by ID in a tournament
-            * @param     {number}                            matchId     Match ID
-            * @param     {RiotGamesAPI.Match.MatchDetail}    callback    data callback
-            */
-        getMatchForTournament(matchId: number, callback: (matchDetails: RiotGamesAPI.Match.MatchDetail) => void): any;
-        /**
-            * get match list of a summoner
-            * @param     {number}                              summonerId    Summoner ID
-            * @param     {RiotGamesAPI.MatchList.MatchList}    callback      data callback
-            */
-        getMatchList(summonerId: number, callback: (matchList: RiotGamesAPI.MatchList.MatchList) => void): any;
-        /**
-            * get ranked stats of summoner
-            * @param     {number}                               summonerId    Summoner ID
-            * @param     {RiotGamesAPI.Stats.RankedStatsDto}    callback      data callback
-            */
-        getStatsRanked(summonerId: number, callback: (rankedStatsDto: RiotGamesAPI.Stats.RankedStatsDto) => void): any;
-        /**
-            * get summary ranked stats of summoner
-            * @param     {number}                                          summonerId    Summoner ID
-            * @param     {RiotGamesAPI.Stats.PlayerStatsSummaryListDto}    callback      data callback
-            */
-        getStatsSummary(summonerId: number, callback: (playerStatsSummaryListDto: RiotGamesAPI.Stats.PlayerStatsSummaryListDto) => void): any;
-        /**
-            * get summoner infos by Summoner Name
-            * @param     {string}                               summonerName    Summoner Name
-            * @param     {RiotGamesAPI.Summoner.SummonerDto}    callback        data callback
-            */
-        getSummonerByName(summonerName: string, callback: (summonerDto: RiotGamesAPI.Summoner.SummonerDto) => void): any;
-        /**
-            * get summoner infos by summoner ID
-            * @param     {number}                               summonerId    Summoner ID
-            * @param     {RiotGamesAPI.Summoner.SummonerDto}    callback      data callback
-            */
-        getSummonerById(summonerId: number, callback: (summonerDto: RiotGamesAPI.Summoner.SummonerDto) => void): any;
-        /**
-            * get masteries of a summoner
-            * @param     {number}                                   summonerId    Summoner ID
-            * @param     {RiotGamesAPI.Summoner.MasteryPagesDto}    callback      data callback
-            */
-        getSummonerMasteries(summonerId: number, callback: (masteryPagesDto: RiotGamesAPI.Summoner.MasteryPagesDto) => void): any;
-        /**
-            * get the Summoner Name of a summoner ID
-            * @param     {number}    summonerId    Summoner ID
-            * @param     {string}    callback      data callback
-            */
-        getSummonerName(summonerId: number, callback: (summonerName: string) => void): any;
-        /**
-            * get the runes of a summoner
-            * @param     {number}                                summonerId    Summoner ID
-            * @param     {RiotGamesAPI.Summoner.RunePagesDto}    callback      data callback
-            */
-        getSummonerRunes(summonerId: number, callback: (runePagesDto: RiotGamesAPI.Summoner.RunePagesDto) => void): any;
-        /**
-            * get teams of a summoner
-            * @param     {number}                         summonerId    Summoner ID
-            * @param     {RiotGamesAPI.Team.TeamDto[]}    callback      data callback
-            */
-        getTeamsBySummoner(summonerId: number, callback: (teamsList: RiotGamesAPI.Team.TeamDto[]) => void): any;
-        /**
-            * get Team infos by Team ID
-            * @param     {string}                       teamId      Team ID
-            * @param     {RiotGamesAPI.Team.TeamDto}    callback    data callback
-            */
-        getTeamById(teamId: string, callback: (teamDto: RiotGamesAPI.Team.TeamDto) => void): any;
-    }
-}
diff --git a/riot-api-nodejs/tsconfig.json b/riot-api-nodejs/tsconfig.json
new file mode 100644
index 0000000000..4877e32745
--- /dev/null
+++ b/riot-api-nodejs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "riot-api-nodejs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/riot-games-api/riot-games-api.d.ts b/riot-games-api/index.d.ts
similarity index 100%
rename from riot-games-api/riot-games-api.d.ts
rename to riot-games-api/index.d.ts
diff --git a/riot-games-api/riot-games-api-tests.ts b/riot-games-api/riot-games-api-tests.ts
index 32815f2ca8..1ce28ced43 100644
--- a/riot-games-api/riot-games-api-tests.ts
+++ b/riot-games-api/riot-games-api-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="riot-games-api.d.ts" />
+
 
 let champion: RiotGamesAPI.Champion.ChampionDto = {
 	active: true,
diff --git a/riot-games-api/tsconfig.json b/riot-games-api/tsconfig.json
new file mode 100644
index 0000000000..1bef25afdb
--- /dev/null
+++ b/riot-games-api/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "riot-games-api-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/riotcontrol/index.d.ts b/riotcontrol/index.d.ts
new file mode 100644
index 0000000000..2f32739ddb
--- /dev/null
+++ b/riotcontrol/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for RiotControl
+// Project: https://github.com/jimsparkman/RiotControl
+// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = RiotControl;
+export as namespace RiotControl;
+
+declare namespace RiotControl {
+	interface Store {
+		on(events: string, fn: Function): Store;
+		one(name: string, fn: Function): Store;
+		off(events: string, fn?: Function): Store;
+		trigger(name: string, ...args: any[]): Store;
+	}
+
+	var _stores: Store[];
+
+	function addStore(store: Store): void;
+
+	function on(events: string, fn: Function): void;
+	function one(name: string, fn: Function): void;
+	function off(events: string, fn?: Function): void;
+	function trigger(name: string, ...args: any[]): void;
+}
diff --git a/riotcontrol/riotcontrol-tests.ts b/riotcontrol/riotcontrol-tests.ts
index b3eee8b2e0..5a31bd0e66 100644
--- a/riotcontrol/riotcontrol-tests.ts
+++ b/riotcontrol/riotcontrol-tests.ts
@@ -1,9 +1,9 @@
-/// <reference path="./riotcontrol.d.ts" />
+
 
 import riotcontrol = require('riotcontrol');
 
 {
-	let store: RiotControl.Store;
+	let store: riotcontrol.Store;
 	let result: void;
 	result = riotcontrol.addStore(store);
 }
diff --git a/riotcontrol/riotcontrol.d.ts b/riotcontrol/riotcontrol.d.ts
deleted file mode 100644
index 64c397ffcf..0000000000
--- a/riotcontrol/riotcontrol.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// Type definitions for RiotControl
-// Project: https://github.com/jimsparkman/RiotControl
-// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace RiotControl {
-	interface Store {
-		on(events: string, fn: Function): Store;
-		one(name: string, fn: Function): Store;
-		off(events: string, fn?: Function): Store;
-		trigger(name: string, ...args: any[]): Store;
-	}
-
-	var _stores: Store[];
-
-	function addStore(store: Store): void;
-
-	function on(events: string, fn: Function): void;
-	function one(name: string, fn: Function): void;
-	function off(events: string, fn?: Function): void;
-	function trigger(name: string, ...args: any[]): void;
-}
-
-declare module "riotcontrol" {
-	export = RiotControl;
-}
diff --git a/riotcontrol/tsconfig.json b/riotcontrol/tsconfig.json
new file mode 100644
index 0000000000..7e7b32af57
--- /dev/null
+++ b/riotcontrol/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "riotcontrol-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/riotjs/index.d.ts b/riotjs/index.d.ts
new file mode 100644
index 0000000000..e86634ad11
--- /dev/null
+++ b/riotjs/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for riot.js
+// Project: https://github.com/moot/riotjs
+// Definitions by: vvakame <https://github.com/vvakame>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+/// <reference path="riotjs-render.d.ts" />
+
+interface JQueryStatic {
+    riot: string;
+    observable(el:any):any;
+    route(to:any):void;
+}
diff --git a/riotjs/riotjs-render.d.ts b/riotjs/riotjs-render.d.ts
index 0fc45c140b..7f01bb64a0 100644
--- a/riotjs/riotjs-render.d.ts
+++ b/riotjs/riotjs-render.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: vvakame <https://github.com/vvakame>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../jquery/jquery.d.ts" />
+/// <reference types="jquery" />
 
 interface JQueryStatic {
     render(template?:string, data?:any):string;
diff --git a/riotjs/riotjs-tests.ts b/riotjs/riotjs-tests.ts
index 2dbd723fa8..ea8a1d11ae 100644
--- a/riotjs/riotjs-tests.ts
+++ b/riotjs/riotjs-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="riotjs.d.ts" />
-/// <reference path="riotjs-render.d.ts" />
-
 function describe(msg:any, fn:Function) {
     if (console.group) {
         console.group(msg);
diff --git a/riotjs/riotjs.d.ts b/riotjs/riotjs.d.ts
deleted file mode 100644
index bf02bfff1a..0000000000
--- a/riotjs/riotjs.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for riot.js
-// Project: https://github.com/moot/riotjs
-// Definitions by: vvakame <https://github.com/vvakame>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface JQueryStatic {
-    riot: string;
-    observable(el:any):any;
-    route(to:any):void;
-}
diff --git a/riotjs/tsconfig.json b/riotjs/tsconfig.json
new file mode 100644
index 0000000000..081703009e
--- /dev/null
+++ b/riotjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "riotjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rivets/index.d.ts b/rivets/index.d.ts
new file mode 100644
index 0000000000..4dbf02c128
--- /dev/null
+++ b/rivets/index.d.ts
@@ -0,0 +1,67 @@
+// Type definitions for rivets
+// Project: http://rivetsjs.com/
+// Definitions by: Trevor Baron <https://github.com/TrevorDev>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace Rivets {
+
+    interface View {
+        build(): void;
+        bind(): void;
+        unbind(): void;
+    }
+
+    interface Rivets {
+        // Global binders.
+        binders: Object;
+
+        // Global components.
+        components: Object;
+
+        // Global formatters.
+        formatters: Object;
+
+        // Global sightglass adapters.
+        adapters: Object;
+
+        // Default attribute prefix.
+        prefix: string;
+
+        // Default template delimiters.
+        templateDelimiters: Array<string>;
+
+        // Default sightglass root interface.
+        rootInterface: string;
+
+        // Preload data by default.
+        preloadData: boolean;
+
+        handler(context: any, ev: Event, biding: any): void;
+
+        configure(options?: {
+
+            // Attribute prefix in templates
+            prefix?: string;
+
+            //Preload templates with initial data on bind
+            preloadData?: boolean;
+
+            //Root sightglass interface for keypaths
+            rootInterface?: string;
+
+            // Template delimiters for text bindings
+            templateDelimiters?: Array<string>
+
+            // Augment the event handler of the on-* binder
+            handler?: Function;
+        }): void;
+
+        bind(element: HTMLElement, models: Object, options?: Object): View;
+        bind(element: JQuery, models: Object, options?: Object): View;
+        bind(element: Array<HTMLElement>, models: Object, options?: Object): View;
+    }
+}
+
+declare var rivets: Rivets.Rivets;
diff --git a/rivets/rivets-tests.ts b/rivets/rivets-tests.ts
index f237720947..47a645981e 100644
--- a/rivets/rivets-tests.ts
+++ b/rivets/rivets-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="rivets.d.ts" />
+
 
 rivets.configure({
     // Attribute prefix in templates
diff --git a/rivets/rivets.d.ts b/rivets/rivets.d.ts
deleted file mode 100644
index e255261bdf..0000000000
--- a/rivets/rivets.d.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-// Type definitions for rivets
-// Project: http://rivetsjs.com/
-// Definitions by: Trevor Baron <https://github.com/TrevorDev>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace Rivets {
-
-    interface View {
-        build(): void;
-        bind(): void;
-        unbind(): void;
-    }
-
-    interface Rivets {
-        // Global binders.
-        binders: Object;
-
-        // Global components.
-        components: Object;
-
-        // Global formatters.
-        formatters: Object;
-
-        // Global sightglass adapters.
-        adapters: Object;
-
-        // Default attribute prefix.
-        prefix: string;
-
-        // Default template delimiters.
-        templateDelimiters: Array<string>;
-
-        // Default sightglass root interface.
-        rootInterface: string;
-
-        // Preload data by default.
-        preloadData: boolean;
-
-        handler(context: any, ev: Event, biding: any): void;
-
-        configure(options?: {
-
-            // Attribute prefix in templates
-            prefix?: string;
-
-            //Preload templates with initial data on bind
-            preloadData?: boolean;
-
-            //Root sightglass interface for keypaths
-            rootInterface?: string;
-
-            // Template delimiters for text bindings
-            templateDelimiters?: Array<string>
-
-            // Augment the event handler of the on-* binder
-            handler?: Function;
-        }): void;
-
-        bind(element: HTMLElement, models: Object, options?: Object): View;
-        bind(element: JQuery, models: Object, options?: Object): View;
-        bind(element: Array<HTMLElement>, models: Object, options?: Object): View;
-    }
-}
-
-declare var rivets: Rivets.Rivets;
diff --git a/rivets/tsconfig.json b/rivets/tsconfig.json
new file mode 100644
index 0000000000..314ee36d0b
--- /dev/null
+++ b/rivets/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "rivets-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rosie/index.d.ts b/rosie/index.d.ts
new file mode 100644
index 0000000000..86adc245ca
--- /dev/null
+++ b/rosie/index.d.ts
@@ -0,0 +1,201 @@
+// Type definitions for rosie
+// Project: https://github.com/rosiejs/rosie
+// Definitions by: Abner Oliveira <https://github.com/abner/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace rosie {
+  interface IFactoryStatic {
+
+
+    /**
+     * Defines a factory by name and constructor function. Call #attr and #option
+     * on the result to define the properties of this factory.
+     *
+     * @param {!string} name
+     * @param {function(object): *=} constructor
+     * @return {Factory}
+     */
+    define(name: String, constructor?: Function):  IFactory;
+
+    /**
+     * Locates a factory by name and calls #build on it.
+     *
+     * @param {string} name
+     * @param {object=} attributes
+     * @param {object=} options
+     * @return {*}
+     */
+    build(name: string, attributes?: any, options?: Object): Object;
+
+    /**
+     * Builds a collection of objects using the named factory.
+     *
+     * @param {string} name
+     * @param {number} size
+     * @param {object=} attributes
+     * @param {object=} options
+     * @return {Array.<*>}
+     */
+    buildList(name: string, size: number, attributes?: any, options?: Object): Object[];
+
+    /**
+     * Locates a factory by name and calls #attributes on it.
+     *
+     * @param {string} name
+     * @param {object} attributes
+     * @param {object} options
+     * @return {object}
+     */
+    attributes(name: string, attributes: Object, options?: Object): Object;
+  }
+
+  interface IFactory {
+    /**
+      * Define an attribute on this factory. Attributes can optionally define a
+      * default value, either as a value (e.g. a string or number) or as a builder
+      * function. For example:
+      *
+      *   // no default value for age
+      *   Factory.define('Person').attr('age')
+      *
+      *   // static default value for age
+      *   Factory.define('Person').attr('age', 18)
+      *
+      *   // dynamic default value for age
+      *   Factory.define('Person').attr('age', function() {
+      *      return Math.random() * 100;
+      *   })
+      *
+      * Attributes with dynamic default values can depend on options or other
+      * attributes:
+      *
+      *   Factory.define('Person').attr('age', ['name'], function(name) {
+      *     return name === 'Brian' ? 30 : 18;
+      *   });
+      *
+      * By default if the consumer of your factory provides a value for an
+      * attribute your builder function will not be called. You can override this
+      * behavior by declaring that your attribute depends on itself:
+      *
+      *   Factory.define('Person').attr('spouse', ['spouse'], function(spouse) {
+      *     return Factory.build('Person', spouse);
+      *   });
+      *
+      * As in the example above, this can be a useful way to fill in
+      * partially-specified child objects.
+      *
+      * @param {string} attr
+      * @param {Array.<string>=} | any dependenciesOrValue
+      * @param any
+      * @return {Factory}
+      */
+    attr(name: string, dependenciesOrValue: any | string[], value?: any): IFactory;
+
+    /**
+     * Define an option for this factory. Options are values that may inform
+     * dynamic attribute behavior but are not included in objects built by the
+     * factory. Like attributes, options may have dependencies. Unlike
+     * attributes, options may only depend on other options.
+     *
+     *   Factory.define('Person')
+     *     .option('includeRelationships', false)
+     *     .attr(
+     *       'spouse',
+     *       ['spouse', 'includeRelationships'],
+     *       function(spouse, includeRelationships) {
+     *         return includeRelationships ?
+     *           Factory.build('Person', spouse) :
+     *           null;
+     *       });
+     *
+     *   Factory.build('Person', null, { includeRelationships: true });
+     *
+     * Options may have either static or dynamic default values, just like
+     * attributes. Options without default values must have a value specified
+     * when building.
+     *
+     * @param {string} opt
+     * @param {Array.<string>=} | any dependencies or value
+     * @param {*=} value
+     * @return {Factory}
+     */
+    option(name: string, dependenciesOrValue: any | string[], value?: any): IFactory;
+
+    /**
+     * Defines an attribute that, by default, simply has an auto-incrementing
+     * numeric value starting at 1. You can provide your own builder function
+     * that accepts the number of the sequence and returns whatever value you'd
+     * like it to be.
+     *
+     * Sequence values are inherited such that a factory derived from another
+     * with a sequence will share the state of that sequence and they will never
+     * conflict.
+     *
+     *   Factory.define('Person').sequence('id');
+     *
+     * @param {string} attr
+     * @param {Array.<string>=} dependencies
+     * @param {function(number): *=} builder
+     * @return {Factory}
+     */
+    sequence(name: string, dependencies?: string[], builder?: Function) : IFactory;
+
+    /**
+     * Sets a post-processor callback that will receive built objects and the
+     * options for the build just before they are returned from the #build
+     * function.
+     *
+     * @param {function(object, ?object)} callback
+     * @return {Factory}
+     */
+    after(functionArg: Function): IFactory;
+
+    /**
+     * Sets the constructor for this factory to be another factory. This can be
+     * used to create more specific sub-types of factories.
+     *
+     * @param {Factory} parentFactory
+     * @return {Factory}
+     */
+    inherits(functionArg: Function): IFactory;
+
+    /**
+     * Builds a plain object containing values for each of the declared
+     * attributes. The result of this is the same as the result when using #build
+     * when there is no constructor registered.
+     *
+     * @param {object=} attributes
+     * @param {object=} options
+     * @return {object}
+     */
+    attributes(attributes:Object, options: Object): Object;
+
+    /**
+     * Generates values for all the registered options using the values given.
+     *
+     * @private
+     * @param {object} options
+     * @return {object}
+     */
+    options(options: Object): Object;
+
+    /**
+     * Builds objects by getting values for all attributes and optionally passing
+     * the result to a constructor function.
+     *
+     * @param {object=} attributes
+     * @param {object=} options
+     * @return {*}
+     */
+    build(attributes: Object, options: Object): Object;
+
+    buildList(size: number, attributes: Object, options: Object): Object[];
+
+  }
+
+}
+
+declare var rosie: { Factory: rosie.IFactoryStatic };
+
+export = rosie;
+export as namespace Factory;
diff --git a/rosie/rosie-tests.ts b/rosie/rosie-tests.ts
index 740f1e40c5..60c22a1bc6 100644
--- a/rosie/rosie-tests.ts
+++ b/rosie/rosie-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="./rosie.d.ts" />
-
 let resultObj: Object;
 let resultFactory: rosie.IFactory;
 
diff --git a/rosie/rosie.d.ts b/rosie/rosie.d.ts
deleted file mode 100644
index a92359c3d9..0000000000
--- a/rosie/rosie.d.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-// Type definitions for rosie
-// Project: https://github.com/rosiejs/rosie
-// Definitions by: Abner Oliveira <https://github.com/abner/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace rosie {
-  interface IFactoryStatic {
-
-
-    /**
-     * Defines a factory by name and constructor function. Call #attr and #option
-     * on the result to define the properties of this factory.
-     *
-     * @param {!string} name
-     * @param {function(object): *=} constructor
-     * @return {Factory}
-     */
-    define(name: String, constructor?: Function):  IFactory;
-
-    /**
-     * Locates a factory by name and calls #build on it.
-     *
-     * @param {string} name
-     * @param {object=} attributes
-     * @param {object=} options
-     * @return {*}
-     */
-    build(name: string, attributes?: any, options?: Object): Object;
-
-    /**
-     * Builds a collection of objects using the named factory.
-     *
-     * @param {string} name
-     * @param {number} size
-     * @param {object=} attributes
-     * @param {object=} options
-     * @return {Array.<*>}
-     */
-    buildList(name: string, size: number, attributes?: any, options?: Object): Object[];
-
-    /**
-     * Locates a factory by name and calls #attributes on it.
-     *
-     * @param {string} name
-     * @param {object} attributes
-     * @param {object} options
-     * @return {object}
-     */
-    attributes(name: string, attributes: Object, options?: Object): Object;
-  }
-
-  interface IFactory {
-    /**
-      * Define an attribute on this factory. Attributes can optionally define a
-      * default value, either as a value (e.g. a string or number) or as a builder
-      * function. For example:
-      *
-      *   // no default value for age
-      *   Factory.define('Person').attr('age')
-      *
-      *   // static default value for age
-      *   Factory.define('Person').attr('age', 18)
-      *
-      *   // dynamic default value for age
-      *   Factory.define('Person').attr('age', function() {
-      *      return Math.random() * 100;
-      *   })
-      *
-      * Attributes with dynamic default values can depend on options or other
-      * attributes:
-      *
-      *   Factory.define('Person').attr('age', ['name'], function(name) {
-      *     return name === 'Brian' ? 30 : 18;
-      *   });
-      *
-      * By default if the consumer of your factory provides a value for an
-      * attribute your builder function will not be called. You can override this
-      * behavior by declaring that your attribute depends on itself:
-      *
-      *   Factory.define('Person').attr('spouse', ['spouse'], function(spouse) {
-      *     return Factory.build('Person', spouse);
-      *   });
-      *
-      * As in the example above, this can be a useful way to fill in
-      * partially-specified child objects.
-      *
-      * @param {string} attr
-      * @param {Array.<string>=} | any dependenciesOrValue
-      * @param any
-      * @return {Factory}
-      */
-    attr(name: string, dependenciesOrValue: any | string[], value?: any): IFactory;
-
-    /**
-     * Define an option for this factory. Options are values that may inform
-     * dynamic attribute behavior but are not included in objects built by the
-     * factory. Like attributes, options may have dependencies. Unlike
-     * attributes, options may only depend on other options.
-     *
-     *   Factory.define('Person')
-     *     .option('includeRelationships', false)
-     *     .attr(
-     *       'spouse',
-     *       ['spouse', 'includeRelationships'],
-     *       function(spouse, includeRelationships) {
-     *         return includeRelationships ?
-     *           Factory.build('Person', spouse) :
-     *           null;
-     *       });
-     *
-     *   Factory.build('Person', null, { includeRelationships: true });
-     *
-     * Options may have either static or dynamic default values, just like
-     * attributes. Options without default values must have a value specified
-     * when building.
-     *
-     * @param {string} opt
-     * @param {Array.<string>=} | any dependencies or value
-     * @param {*=} value
-     * @return {Factory}
-     */
-    option(name: string, dependenciesOrValue: any | string[], value?: any): IFactory;
-
-    /**
-     * Defines an attribute that, by default, simply has an auto-incrementing
-     * numeric value starting at 1. You can provide your own builder function
-     * that accepts the number of the sequence and returns whatever value you'd
-     * like it to be.
-     *
-     * Sequence values are inherited such that a factory derived from another
-     * with a sequence will share the state of that sequence and they will never
-     * conflict.
-     *
-     *   Factory.define('Person').sequence('id');
-     *
-     * @param {string} attr
-     * @param {Array.<string>=} dependencies
-     * @param {function(number): *=} builder
-     * @return {Factory}
-     */
-    sequence(name: string, dependencies?: string[], builder?: Function) : IFactory;
-
-    /**
-     * Sets a post-processor callback that will receive built objects and the
-     * options for the build just before they are returned from the #build
-     * function.
-     *
-     * @param {function(object, ?object)} callback
-     * @return {Factory}
-     */
-    after(functionArg: Function): IFactory;
-
-    /**
-     * Sets the constructor for this factory to be another factory. This can be
-     * used to create more specific sub-types of factories.
-     *
-     * @param {Factory} parentFactory
-     * @return {Factory}
-     */
-    inherits(functionArg: Function): IFactory;
-
-    /**
-     * Builds a plain object containing values for each of the declared
-     * attributes. The result of this is the same as the result when using #build
-     * when there is no constructor registered.
-     *
-     * @param {object=} attributes
-     * @param {object=} options
-     * @return {object}
-     */
-    attributes(attributes:Object, options: Object): Object;
-
-    /**
-     * Generates values for all the registered options using the values given.
-     *
-     * @private
-     * @param {object} options
-     * @return {object}
-     */
-    options(options: Object): Object;
-
-    /**
-     * Builds objects by getting values for all attributes and optionally passing
-     * the result to a constructor function.
-     *
-     * @param {object=} attributes
-     * @param {object=} options
-     * @return {*}
-     */
-    build(attributes: Object, options: Object): Object;
-
-    buildList(size: number, attributes: Object, options: Object): Object[];
-
-  }
-
-}
-
-declare var rosie: { Factory: rosie.IFactoryStatic };
-
-declare module 'rosie' {
-    export = rosie;
-}
diff --git a/rosie/tsconfig.json b/rosie/tsconfig.json
new file mode 100644
index 0000000000..4dc5a74d5d
--- /dev/null
+++ b/rosie/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "rosie-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/roslib/index.d.ts b/roslib/index.d.ts
new file mode 100644
index 0000000000..58d3292533
--- /dev/null
+++ b/roslib/index.d.ts
@@ -0,0 +1,421 @@
+// Type definitions for roslib.js
+// Project: http://wiki.ros.org/roslibjs
+// Definitions by: Stefan Profanter <https://github.com/Pro/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/* ----------------------------------
+
+ NOTE: This typescript definition is not yet complete. I should be extended if definitions are missing.
+
+ ---------------------------------- */
+
+export = ROSLIB;
+
+declare namespace ROSLIB {
+	export class Ros {
+		/**
+		 * Manages connection to the server and all interactions with ROS.
+		 *
+		 * Emits the following events:
+		 *  * 'error' - there was an error with ROS
+		 *  * 'connection' - connected to the WebSocket server
+		 *  * 'close' - disconnected to the WebSocket server
+		 *  * <topicName> - a message came from rosbridge with the given topic name
+		 *  * <serviceID> - a service response came from rosbridge with the given ID
+		 *
+		 * @constructor
+		 * @param options - possible keys include:
+		 *   * url (optional) - the WebSocket URL for rosbridge (can be specified later with `connect`)
+		 */
+		constructor(options:{
+			url?: string
+		});
+
+		on(eventName:string, callback:(event:any) => void):void;
+
+		/**
+		 * Connect to the specified WebSocket.
+		 *
+		 * @param url - WebSocket URL for Rosbridge
+		 */
+		connect(url:string):void;
+
+		/**
+		 * Disconnect from the WebSocket server.
+		 */
+		close():void;
+
+		/**
+		 * Sends an authorization request to the server.
+		 *
+		 * @param mac - MAC (hash) string given by the trusted source.
+		 * @param client - IP of the client.
+		 * @param dest - IP of the destination.
+		 * @param rand - Random string given by the trusted source.
+		 * @param t - Time of the authorization request.
+		 * @param level - User level as a string given by the client.
+		 * @param end - End time of the client's session.
+		 */
+		authenticate(mac:string, client:string, dest:string, rand:string, t:number, level:string, end:string):void;
+
+
+		/**
+		 * Sends the message over the WebSocket, but queues the message up if not yet
+		 * connected.
+		 */
+		callOnConnection(message:any):void;
+
+		/**
+		 * Retrieves list of topics in ROS as an array.
+		 *
+		 * @param callback function with params:
+		 *   * topics - Array of topic names
+		 * @param failedCallback - the callback function when the ros call failed (optional). Params:
+		 *   * error - the error message reported by ROS
+		 */
+		getTopics(callback:(topics:string[]) => void, failedCallback?:(error:any)=>void):void;
+
+		/**
+		 * Retrieves Topics in ROS as an array as specific type
+		 *
+		 * @param topicType topic type to find:
+		 * @param callback function with params:
+		 *   * topics - Array of topic names
+		 * @param failedCallback - the callback function when the ros call failed (optional). Params:
+		 *   * error - the error message reported by ROS
+		 */
+		getTopicsForType(topicType:string, callback:(topics:string[]) => void, failedCallback?:(error:any)=>void):void;
+
+		/**
+		 * Retrieves list of active service names in ROS.
+		 *
+		 * @param callback - function with the following params:
+		 *   * services - array of service names
+		 * @param failedCallback - the callback function when the ros call failed (optional). Params:
+		 *   * error - the error message reported by ROS
+		 */
+		getServices(callback:(services:string[]) => void, failedCallback?:(error:any)=>void):void;
+
+		/**
+		 * Retrieves list of services in ROS as an array as specific type
+		 *
+		 * @param serviceType service type to find:
+		 * @param callback function with params:
+		 *   * topics - Array of service names
+		 * @param failedCallback - the callback function when the ros call failed (optional). Params:
+		 *   * error - the error message reported by ROS
+		 */
+		getServicesForType(serviceType:string, callback:(services:string[]) => void, failedCallback?:(error:any)=>void):void;
+
+		/**
+		 * Retrieves list of active node names in ROS.
+		 *
+		 * @param callback - function with the following params:
+		 *   * nodes - array of node names
+		 * @param failedCallback - the callback function when the ros call failed (optional). Params:
+		 *   * error - the error message reported by ROS
+		 */
+		getNodes(callback:(nodes:string[]) => void, failedCallback?:(error:any)=>void):void;
+
+		/**
+		 * Retrieves list of param names from the ROS Parameter Server.
+		 *
+		 * @param callback function with params:
+		 *  * params - array of param names.
+		 * @param failedCallback - the callback function when the ros call failed (optional). Params:
+		 *   * error - the error message reported by ROS
+		 */
+		getParams(callback:(params:string[]) => void, failedCallback?:(error:any)=>void):void;
+
+		/**
+		 * Retrieves a type of ROS topic.
+		 *
+		 * @param topic name of the topic:
+		 * @param callback - function with params:
+		 *   * type - String of the topic type
+		 * @param failedCallback - the callback function when the ros call failed (optional). Params:
+		 *   * error - the error message reported by ROS
+		 */
+		getTopicType(topic:string, callback:(type:string) => void, failedCallback?:(error:any)=>void):void;
+
+		/**
+		 * Retrieves a type of ROS service.
+		 *
+		 * @param service name of service:
+		 * @param callback - function with params:
+		 *   * type - String of the service type
+		 * @param failedCallback - the callback function when the ros call failed (optional). Params:
+		 *   * error - the error message reported by ROS
+		 */
+		getServiceType(service:string, callback:(type:string) => void, failedCallback?:(error:any)=>void):void;
+
+		/**
+		 * Retrieves a detail of ROS message.
+		 *
+		 * @param callback - function with params:
+		 *   * details - Array of the message detail
+		 * @param message - String of a topic type
+		 * @param failedCallback - the callback function when the ros call failed (optional). Params:
+		 *   * error - the error message reported by ROS
+		 */
+		getMessageDetails(message:Message, callback:(detail:any) => void, failedCallback?:(error:any)=>void):void;
+
+		/**
+		 * Decode a typedefs into a dictionary like `rosmsg show foo/bar`
+		 *
+		 * @param defs - array of type_def dictionary
+		 */
+		decodeTypeDefs(defs:any):void;
+	}
+
+	export class Message {
+		/**
+		 * Message objects are used for publishing and subscribing to and from topics.
+		 *
+		 * @constructor
+		 * @param values - object matching the fields defined in the .msg definition file
+		 */
+		constructor(values:any);
+	}
+
+	export class Param {
+		/**
+		 * A ROS parameter.
+		 *
+		 * @constructor
+		 * @param options - possible keys include:
+		 *   * ros - the ROSLIB.Ros connection handle
+		 *   * name - the param name, like max_vel_x
+		 */
+		constructor(options:{
+			ros: Ros,
+			name: string
+		});
+
+		/**
+		 * Fetches the value of the param.
+		 *
+		 * @param callback - function with the following params:
+		 *  * value - the value of the param from ROS.
+		 */
+		get(callback:(response:any) => void):void;
+
+		/**
+		 * Sets the value of the param in ROS.
+		 *
+		 * @param value - value to set param to.
+		 * @param callback - function with params:
+		 *   * response - the response from the service request
+		 */
+		set(value:any, callback?:(response:any) => void):void;
+
+		/**
+		 * Delete this parameter on the ROS server.
+		 */
+		delete(callback:(response:any) => void):void;
+
+	}
+
+
+	export class Service {
+		/**
+		 * A ROS service client.
+		 *
+		 * @constructor
+		 * @params options - possible keys include:
+		 *   * ros - the ROSLIB.Ros connection handle
+		 *   * name - the service name, like /add_two_ints
+		 *   * serviceType - the service type, like 'rospy_tutorials/AddTwoInts'
+		 */
+		constructor(data:{
+			ros: Ros,
+			name: string,
+			serviceType: string
+		});
+
+
+		// getter
+		public name:string;
+		// getter
+		public serviceType:string;
+
+		/**
+		 * Calls the service. Returns the service response in the callback.
+		 *
+		 * @param request - the ROSLIB.ServiceRequest to send
+		 * @param callback - function with params:
+		 *   * response - the response from the service request
+		 * @param failedCallback - the callback function when the service call failed (optional). Params:
+		 *   * error - the error message reported by ROS
+		 */
+		callService(request:ServiceRequest, callback:(response:any) => void, failedCallback?:(error:any) => void):void;
+
+		/**
+		 * Advertise this service and call the callback each time a client calls it.
+		 *
+		 * @param callback - function with the following params:
+		 *   * request - the service request data
+		 *   * response - the data which should be sent back to the caller
+		 */
+		advertise(callback:(request:any, response:any) => void):void;
+
+		/**
+		 * Unadvertise a previously advertised service
+		 */
+		unadvertise():void;
+	}
+
+	export class ServiceRequest {
+		/**
+		 * A ServiceRequest is passed into the service call.
+		 *
+		 * @constructor
+		 * @param values - object matching the fields defined in the .srv definition file
+		 */
+		constructor(values?:any);
+	}
+
+	export class ServiceResponse {
+		/**
+		 * A ServiceResponse is returned from the service call.
+		 *
+		 * @constructor
+		 * @param values - object matching the fields defined in the .srv definition file
+		 */
+		constructor(values?:any);
+	}
+
+	export class Topic {
+		/**
+		 * Publish and/or subscribe to a topic in ROS.
+		 *
+		 * Emits the following events:
+		 *  * 'warning' - if there are any warning during the Topic creation
+		 *  * 'message' - the message data from rosbridge
+		 *
+		 * @constructor
+		 * @param options - object with following keys:
+		 *   * ros - the ROSLIB.Ros connection handle
+		 *   * name - the topic name, like /cmd_vel
+		 *   * messageType - the message type, like 'std_msgs/String'
+		 *   * compression - the type of compression to use, like 'png'
+		 *   * throttle_rate - the rate (in ms in between messages) at which to throttle the topics
+		 *   * queue_size - the queue created at bridge side for re-publishing webtopics (defaults to 100)
+		 *   * latch - latch the topic when publishing
+		 *   * queue_length - the queue length at bridge side used when subscribing (defaults to 0, no queueing).
+		 */
+		constructor(options:{
+			ros: Ros,
+			name: string,
+			messageType: string,
+			compression?: string,
+			throttle_rate?: number,
+			queue_size?: number,
+			latch?: number,
+			queue_length?: number
+		});
+
+		// getter
+		public name:string;
+		// getter
+		public messageType:string;
+
+		/**
+		 * Every time a message is published for the given topic, the callback
+		 * will be called with the message object.
+		 *
+		 * @param callback - function with the following params:
+		 *   * message - the published message
+		 */
+		subscribe(callback:(message:Message) => void):void;
+
+		/**
+		 * Unregisters as a subscriber for the topic. Unsubscribing stop remove
+		 * all subscribe callbacks. To remove a call back, you must explicitly
+		 * pass the callback function in.
+		 *
+		 * @param callback - the optional callback to unregister, if
+		 *     * provided and other listeners are registered the topic won't
+		 *     * unsubscribe, just stop emitting to the passed listener
+		 */
+		unsubscribe(callback?:() => void):void;
+
+		/**
+		 * Registers as a publisher for the topic.
+		 */
+		advertise():void;
+
+		/**
+		 * Unregisters as a publisher for the topic.
+		 */
+		unadvertise():void;
+
+		/**
+		 * Publish the message.
+		 *
+		 * @param message - A ROSLIB.Message object.
+		 */
+		publish(message:Message):void;
+	}
+
+	class ActionClient {
+		/**
+		 * An actionlib action client.
+		 *
+		 * Emits the following events:
+		 *  * 'timeout' - if a timeout occurred while sending a goal
+		 *  * 'status' - the status messages received from the action server
+		 *  * 'feedback' -  the feedback messages received from the action server
+		 *  * 'result' - the result returned from the action server
+		 *
+		 *  @constructor
+		 *  @param options - object with following keys:
+		 *   * ros - the ROSLIB.Ros connection handle
+		 *   * serverName - the action server name, like /fibonacci
+		 *   * actionName - the action message name, like 'actionlib_tutorials/FibonacciAction'
+		 *   * timeout - the timeout length when connecting to the action server
+		 */
+		constructor(options:{
+			ros: Ros,
+			serverName: string,
+			actionName: string,
+			timeout: number
+		});
+
+		/**
+		 * Cancel all goals associated with this ActionClient.
+		 */
+		cancel():void;
+	}
+
+	class Goal {
+		/**
+		 * An actionlib goal goal is associated with an action server.
+		 *
+		 * Emits the following events:
+		 *  * 'timeout' - if a timeout occurred while sending a goal
+		 *
+		 *  @constructor
+		 *  @param options with following keys:
+		 *   * actionClient - the ROSLIB.ActionClient to use with this goal
+		 *   * goalMessage - The JSON object containing the goal for the action server
+		 */
+		constructor(options:{
+			actionClient: ActionClient,
+			goalMessage: any
+		});
+
+		/**
+		 * Send the goal to the action server.
+		 *
+		 * @param timeout (optional) - a timeout length for the goal's result
+		 */
+		send(timeout?:number):void;
+
+		/**
+		 * Cancel the current goal.
+		 */
+		cancel():void;
+	}
+}
diff --git a/roslib/roslib-tests.ts b/roslib/roslib-tests.ts
index 63eb73d855..b67578536a 100644
--- a/roslib/roslib-tests.ts
+++ b/roslib/roslib-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="roslib.d.ts" />
+import ROSLIB = require("roslib");
 
 var ros = new ROSLIB.Ros({
 	url: 'ws://localhost:9090'
diff --git a/roslib/roslib.d.ts b/roslib/roslib.d.ts
deleted file mode 100644
index 72af3a60ab..0000000000
--- a/roslib/roslib.d.ts
+++ /dev/null
@@ -1,423 +0,0 @@
-// Type definitions for roslib.js
-// Project: http://wiki.ros.org/roslibjs
-// Definitions by: Stefan Profanter <https://github.com/Pro/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/* ----------------------------------
-
- NOTE: This typescript definition is not yet complete. I should be extended if definitions are missing.
-
- ---------------------------------- */
-
-declare namespace ROSLIB {
-	export class Ros {
-		/**
-		 * Manages connection to the server and all interactions with ROS.
-		 *
-		 * Emits the following events:
-		 *  * 'error' - there was an error with ROS
-		 *  * 'connection' - connected to the WebSocket server
-		 *  * 'close' - disconnected to the WebSocket server
-		 *  * <topicName> - a message came from rosbridge with the given topic name
-		 *  * <serviceID> - a service response came from rosbridge with the given ID
-		 *
-		 * @constructor
-		 * @param options - possible keys include:
-		 *   * url (optional) - the WebSocket URL for rosbridge (can be specified later with `connect`)
-		 */
-		constructor(options:{
-			url?: string
-		});
-
-		on(eventName:string, callback:(event:any) => void):void;
-
-		/**
-		 * Connect to the specified WebSocket.
-		 *
-		 * @param url - WebSocket URL for Rosbridge
-		 */
-		connect(url:string):void;
-
-		/**
-		 * Disconnect from the WebSocket server.
-		 */
-		close():void;
-
-		/**
-		 * Sends an authorization request to the server.
-		 *
-		 * @param mac - MAC (hash) string given by the trusted source.
-		 * @param client - IP of the client.
-		 * @param dest - IP of the destination.
-		 * @param rand - Random string given by the trusted source.
-		 * @param t - Time of the authorization request.
-		 * @param level - User level as a string given by the client.
-		 * @param end - End time of the client's session.
-		 */
-		authenticate(mac:string, client:string, dest:string, rand:string, t:number, level:string, end:string):void;
-
-
-		/**
-		 * Sends the message over the WebSocket, but queues the message up if not yet
-		 * connected.
-		 */
-		callOnConnection(message:any):void;
-
-		/**
-		 * Retrieves list of topics in ROS as an array.
-		 *
-		 * @param callback function with params:
-		 *   * topics - Array of topic names
-		 * @param failedCallback - the callback function when the ros call failed (optional). Params:
-		 *   * error - the error message reported by ROS
-		 */
-		getTopics(callback:(topics:string[]) => void, failedCallback?:(error:any)=>void):void;
-
-		/**
-		 * Retrieves Topics in ROS as an array as specific type
-		 *
-		 * @param topicType topic type to find:
-		 * @param callback function with params:
-		 *   * topics - Array of topic names
-		 * @param failedCallback - the callback function when the ros call failed (optional). Params:
-		 *   * error - the error message reported by ROS
-		 */
-		getTopicsForType(topicType:string, callback:(topics:string[]) => void, failedCallback?:(error:any)=>void):void;
-
-		/**
-		 * Retrieves list of active service names in ROS.
-		 *
-		 * @param callback - function with the following params:
-		 *   * services - array of service names
-		 * @param failedCallback - the callback function when the ros call failed (optional). Params:
-		 *   * error - the error message reported by ROS
-		 */
-		getServices(callback:(services:string[]) => void, failedCallback?:(error:any)=>void):void;
-
-		/**
-		 * Retrieves list of services in ROS as an array as specific type
-		 *
-		 * @param serviceType service type to find:
-		 * @param callback function with params:
-		 *   * topics - Array of service names
-		 * @param failedCallback - the callback function when the ros call failed (optional). Params:
-		 *   * error - the error message reported by ROS
-		 */
-		getServicesForType(serviceType:string, callback:(services:string[]) => void, failedCallback?:(error:any)=>void):void;
-
-		/**
-		 * Retrieves list of active node names in ROS.
-		 *
-		 * @param callback - function with the following params:
-		 *   * nodes - array of node names
-		 * @param failedCallback - the callback function when the ros call failed (optional). Params:
-		 *   * error - the error message reported by ROS
-		 */
-		getNodes(callback:(nodes:string[]) => void, failedCallback?:(error:any)=>void):void;
-
-		/**
-		 * Retrieves list of param names from the ROS Parameter Server.
-		 *
-		 * @param callback function with params:
-		 *  * params - array of param names.
-		 * @param failedCallback - the callback function when the ros call failed (optional). Params:
-		 *   * error - the error message reported by ROS
-		 */
-		getParams(callback:(params:string[]) => void, failedCallback?:(error:any)=>void):void;
-
-		/**
-		 * Retrieves a type of ROS topic.
-		 *
-		 * @param topic name of the topic:
-		 * @param callback - function with params:
-		 *   * type - String of the topic type
-		 * @param failedCallback - the callback function when the ros call failed (optional). Params:
-		 *   * error - the error message reported by ROS
-		 */
-		getTopicType(topic:string, callback:(type:string) => void, failedCallback?:(error:any)=>void):void;
-
-		/**
-		 * Retrieves a type of ROS service.
-		 *
-		 * @param service name of service:
-		 * @param callback - function with params:
-		 *   * type - String of the service type
-		 * @param failedCallback - the callback function when the ros call failed (optional). Params:
-		 *   * error - the error message reported by ROS
-		 */
-		getServiceType(service:string, callback:(type:string) => void, failedCallback?:(error:any)=>void):void;
-
-		/**
-		 * Retrieves a detail of ROS message.
-		 *
-		 * @param callback - function with params:
-		 *   * details - Array of the message detail
-		 * @param message - String of a topic type
-		 * @param failedCallback - the callback function when the ros call failed (optional). Params:
-		 *   * error - the error message reported by ROS
-		 */
-		getMessageDetails(message:Message, callback:(detail:any) => void, failedCallback?:(error:any)=>void):void;
-
-		/**
-		 * Decode a typedefs into a dictionary like `rosmsg show foo/bar`
-		 *
-		 * @param defs - array of type_def dictionary
-		 */
-		decodeTypeDefs(defs:any):void;
-	}
-
-	export class Message {
-		/**
-		 * Message objects are used for publishing and subscribing to and from topics.
-		 *
-		 * @constructor
-		 * @param values - object matching the fields defined in the .msg definition file
-		 */
-		constructor(values:any);
-	}
-
-	export class Param {
-		/**
-		 * A ROS parameter.
-		 *
-		 * @constructor
-		 * @param options - possible keys include:
-		 *   * ros - the ROSLIB.Ros connection handle
-		 *   * name - the param name, like max_vel_x
-		 */
-		constructor(options:{
-			ros: Ros,
-			name: string
-		});
-
-		/**
-		 * Fetches the value of the param.
-		 *
-		 * @param callback - function with the following params:
-		 *  * value - the value of the param from ROS.
-		 */
-		get(callback:(response:any) => void):void;
-
-		/**
-		 * Sets the value of the param in ROS.
-		 *
-		 * @param value - value to set param to.
-		 * @param callback - function with params:
-		 *   * response - the response from the service request
-		 */
-		set(value:any, callback?:(response:any) => void):void;
-
-		/**
-		 * Delete this parameter on the ROS server.
-		 */
-		delete(callback:(response:any) => void):void;
-
-	}
-
-
-	export class Service {
-		/**
-		 * A ROS service client.
-		 *
-		 * @constructor
-		 * @params options - possible keys include:
-		 *   * ros - the ROSLIB.Ros connection handle
-		 *   * name - the service name, like /add_two_ints
-		 *   * serviceType - the service type, like 'rospy_tutorials/AddTwoInts'
-		 */
-		constructor(data:{
-			ros: Ros,
-			name: string,
-			serviceType: string
-		});
-
-
-		// getter
-		public name:string;
-		// getter
-		public serviceType:string;
-
-		/**
-		 * Calls the service. Returns the service response in the callback.
-		 *
-		 * @param request - the ROSLIB.ServiceRequest to send
-		 * @param callback - function with params:
-		 *   * response - the response from the service request
-		 * @param failedCallback - the callback function when the service call failed (optional). Params:
-		 *   * error - the error message reported by ROS
-		 */
-		callService(request:ServiceRequest, callback:(response:any) => void, failedCallback?:(error:any) => void):void;
-
-		/**
-		 * Advertise this service and call the callback each time a client calls it.
-		 *
-		 * @param callback - function with the following params:
-		 *   * request - the service request data
-		 *   * response - the data which should be sent back to the caller
-		 */
-		advertise(callback:(request:any, response:any) => void):void;
-
-		/**
-		 * Unadvertise a previously advertised service
-		 */
-		unadvertise():void;
-	}
-
-	export class ServiceRequest {
-		/**
-		 * A ServiceRequest is passed into the service call.
-		 *
-		 * @constructor
-		 * @param values - object matching the fields defined in the .srv definition file
-		 */
-		constructor(values?:any);
-	}
-
-	export class ServiceResponse {
-		/**
-		 * A ServiceResponse is returned from the service call.
-		 *
-		 * @constructor
-		 * @param values - object matching the fields defined in the .srv definition file
-		 */
-		constructor(values?:any);
-	}
-
-	export class Topic {
-		/**
-		 * Publish and/or subscribe to a topic in ROS.
-		 *
-		 * Emits the following events:
-		 *  * 'warning' - if there are any warning during the Topic creation
-		 *  * 'message' - the message data from rosbridge
-		 *
-		 * @constructor
-		 * @param options - object with following keys:
-		 *   * ros - the ROSLIB.Ros connection handle
-		 *   * name - the topic name, like /cmd_vel
-		 *   * messageType - the message type, like 'std_msgs/String'
-		 *   * compression - the type of compression to use, like 'png'
-		 *   * throttle_rate - the rate (in ms in between messages) at which to throttle the topics
-		 *   * queue_size - the queue created at bridge side for re-publishing webtopics (defaults to 100)
-		 *   * latch - latch the topic when publishing
-		 *   * queue_length - the queue length at bridge side used when subscribing (defaults to 0, no queueing).
-		 */
-		constructor(options:{
-			ros: Ros,
-			name: string,
-			messageType: string,
-			compression?: string,
-			throttle_rate?: number,
-			queue_size?: number,
-			latch?: number,
-			queue_length?: number
-		});
-
-		// getter
-		public name:string;
-		// getter
-		public messageType:string;
-
-		/**
-		 * Every time a message is published for the given topic, the callback
-		 * will be called with the message object.
-		 *
-		 * @param callback - function with the following params:
-		 *   * message - the published message
-		 */
-		subscribe(callback:(message:Message) => void):void;
-
-		/**
-		 * Unregisters as a subscriber for the topic. Unsubscribing stop remove
-		 * all subscribe callbacks. To remove a call back, you must explicitly
-		 * pass the callback function in.
-		 *
-		 * @param callback - the optional callback to unregister, if
-		 *     * provided and other listeners are registered the topic won't
-		 *     * unsubscribe, just stop emitting to the passed listener
-		 */
-		unsubscribe(callback?:() => void):void;
-
-		/**
-		 * Registers as a publisher for the topic.
-		 */
-		advertise():void;
-
-		/**
-		 * Unregisters as a publisher for the topic.
-		 */
-		unadvertise():void;
-
-		/**
-		 * Publish the message.
-		 *
-		 * @param message - A ROSLIB.Message object.
-		 */
-		publish(message:Message):void;
-	}
-
-	class ActionClient {
-		/**
-		 * An actionlib action client.
-		 *
-		 * Emits the following events:
-		 *  * 'timeout' - if a timeout occurred while sending a goal
-		 *  * 'status' - the status messages received from the action server
-		 *  * 'feedback' -  the feedback messages received from the action server
-		 *  * 'result' - the result returned from the action server
-		 *
-		 *  @constructor
-		 *  @param options - object with following keys:
-		 *   * ros - the ROSLIB.Ros connection handle
-		 *   * serverName - the action server name, like /fibonacci
-		 *   * actionName - the action message name, like 'actionlib_tutorials/FibonacciAction'
-		 *   * timeout - the timeout length when connecting to the action server
-		 */
-		constructor(options:{
-			ros: Ros,
-			serverName: string,
-			actionName: string,
-			timeout: number
-		});
-
-		/**
-		 * Cancel all goals associated with this ActionClient.
-		 */
-		cancel():void;
-	}
-
-	class Goal {
-		/**
-		 * An actionlib goal goal is associated with an action server.
-		 *
-		 * Emits the following events:
-		 *  * 'timeout' - if a timeout occurred while sending a goal
-		 *
-		 *  @constructor
-		 *  @param options with following keys:
-		 *   * actionClient - the ROSLIB.ActionClient to use with this goal
-		 *   * goalMessage - The JSON object containing the goal for the action server
-		 */
-		constructor(options:{
-			actionClient: ActionClient,
-			goalMessage: any
-		});
-
-		/**
-		 * Send the goal to the action server.
-		 *
-		 * @param timeout (optional) - a timeout length for the goal's result
-		 */
-		send(timeout?:number):void;
-
-		/**
-		 * Cancel the current goal.
-		 */
-		cancel():void;
-	}
-}
-
-declare module "ROSLIB" {
-    export = ROSLIB;
-}
diff --git a/roslib/tsconfig.json b/roslib/tsconfig.json
new file mode 100644
index 0000000000..8580ab19fe
--- /dev/null
+++ b/roslib/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "roslib-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/route-recognizer/index.d.ts b/route-recognizer/index.d.ts
new file mode 100644
index 0000000000..0d47c4818e
--- /dev/null
+++ b/route-recognizer/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for route-recognizer
+// Project: https://github.com/tildeio/route-recognizer
+// Definitions by: Dave Keen <http://www.keendevelopment.ch>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class RouteRecognizer<H> {
+constructor()
+	add: (routes: Route<H>[]) => void
+	recognize: (path: string) => MatchedRoute<H>[]
+}
+
+interface Route<H> {
+	path: string
+	handler: H
+}
+
+export = RouteRecognizer;
+export as namespace RouteRecognizer;
+
+interface MatchedRoute<H> {
+	handler: H
+	params: { [key: string]: string }
+}
\ No newline at end of file
diff --git a/route-recognizer/route-recognizer-tests.ts b/route-recognizer/route-recognizer-tests.ts
index 4072cbefab..e2fdfbf036 100644
--- a/route-recognizer/route-recognizer-tests.ts
+++ b/route-recognizer/route-recognizer-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="route-recognizer.d.ts" />
+
 
 import RouteRecognizer = require('route-recognizer')
 
diff --git a/route-recognizer/route-recognizer.d.ts b/route-recognizer/route-recognizer.d.ts
deleted file mode 100644
index a7dd48107b..0000000000
--- a/route-recognizer/route-recognizer.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-// Type definitions for route-recognizer
-// Project: https://github.com/tildeio/route-recognizer
-// Definitions by: Dave Keen <http://www.keendevelopment.ch>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "route-recognizer" {
-	
-	class RouteRecognizer<H> {
-		constructor()
-		add: (routes: Route<H>[]) => void
-		recognize: (path: string) => MatchedRoute<H>[]
-	}
-	
-	interface Route<H> {
-		path: string
-		handler: H
-	}
-	
-	export = RouteRecognizer
-}
-
-interface MatchedRoute<H> {
-	handler: H
-	params: { [key: string]: string }
-}
\ No newline at end of file
diff --git a/route-recognizer/tsconfig.json b/route-recognizer/tsconfig.json
new file mode 100644
index 0000000000..f701794df4
--- /dev/null
+++ b/route-recognizer/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "route-recognizer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/router5/index.d.ts b/router5/index.d.ts
new file mode 100644
index 0000000000..dcfbd60bec
--- /dev/null
+++ b/router5/index.d.ts
@@ -0,0 +1,89 @@
+// Type definitions for router5
+// Project: https://github.com/router5/router5
+// Definitions by: Matthew Dahl <https://github.com/sandersky>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface constants {
+    ROUTER_NOT_STARTED: String;
+    ROUTER_ALREADY_STARTED: String;
+    ROUTE_NOT_FOUND: String;
+    SAME_STATES: String;
+    CANNOT_DEACTIVATE: String;
+    CANNOT_ACTIVATE: String;
+    TRANSITION_ERR: String;
+    TRANSITION_CANCELLED: String;
+}
+
+interface State {
+    _meta: Array<Object>;
+    name: String;
+    params: Object;
+}
+
+interface RouteNode {
+    add(route: any, cb?: Function): RouteNode;
+    addNode(name?: any, params?: any): RouteNode;
+    buildPath(routeName: String, params?: Object): String;
+    buildPathFromSegments(segment: Array<Object>, params?: Object): String;
+    buildState(name: String, params?: Object): State;
+    buildStateFromSegments(segments: Array<Object>): State;
+    getMetaFromSegments(segments: Array<Object>): Array<Object>;
+    getPath(routeName: String): String;
+    getPathFromSegments(segments: Array<Object>): String;
+    getSegmentsByName(routeName: String): Array<Object>;
+    getSegmentsMatchingPath(path: any, options: Object): Array<any>;
+    matchPath(path: any, options?: Object): State;
+    setPath(path?: any): void;
+}
+
+interface RouteNodeFactory {
+    new (name?: any, path?: any, childRoutes?: any, cb?: Function): RouteNode;
+    (name?: any, path?: any, childRoutes?: any, cb?: Function): RouteNode;
+}
+
+interface Router5 {
+    add(routes: any): Router5;
+    addNode(name: String, path: String, canActivate?: Function): Router5;
+    areStatesDescendants(parentState: any, childState: any): Boolean;
+    areStatesEqual(state1: any, state2: any): Boolean;
+    buildPath(route: String, params: Object): String;
+    buildState(route: String, params: Object): String;
+    buildUrl(route: String, params: Object): String;
+    canActivate(name: String, canActivate: Function): Router5;
+    canDeactivate(name: String, canDeactivate: Boolean): any;
+    cancel(): void;
+    getAdditionalArgs(): Array<any>;
+    getState(): Object;
+    isActive(name: String, params?: Object, strictEquality?: Boolean, ignoreQueryParams?: Boolean): Boolean;
+    matchPath(path: String): Object;
+    matchUrl(url: String): Object;
+    navigate(name: String, ...args: Array<Object | Function>): Function;
+    setAdditionalArgs(args: Array<any>): void;
+    setOption(opt: String, val: any): Router5;
+    start(...args: Array<any>): Router5;
+    stop(): Router5;
+    urlToPath(path: String): String;
+    useMiddleware(...args: Array<Function>): Router5;
+    usePlugin(pluginFactory: Function): Router5;
+}
+
+interface Router5Factory {
+    new (routes?: any, opts?: Object): Router5;
+    (routes?: any, opts?: Object): Router5;
+}
+
+declare var errCodes: constants;
+declare var loggerPlugin: () => Function;
+declare var RouteNode: RouteNodeFactory;
+declare var Router5: Router5Factory;
+declare var transitionPath: (toState: any, fromState: any) => any;
+
+export default Router5;
+export {
+errCodes,
+loggerPlugin,
+RouteNode,
+Router5,
+transitionPath
+};
diff --git a/router5/router5-tests.ts b/router5/router5-tests.ts
index bc1bfba9a2..3e94724f54 100644
--- a/router5/router5-tests.ts
+++ b/router5/router5-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="router5.d.ts" />
 
 import Router5, {loggerPlugin, RouteNode, Router5 as _Router5} from 'router5';
 
diff --git a/router5/router5.d.ts b/router5/router5.d.ts
deleted file mode 100644
index bfeb68b6be..0000000000
--- a/router5/router5.d.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-// Type definitions for router5
-// Project: https://github.com/router5/router5
-// Definitions by: Matthew Dahl <https://github.com/sandersky>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'router5' {
-    interface constants {
-      ROUTER_NOT_STARTED: String;
-      ROUTER_ALREADY_STARTED: String;
-      ROUTE_NOT_FOUND: String;
-      SAME_STATES: String;
-      CANNOT_DEACTIVATE: String;
-      CANNOT_ACTIVATE: String;
-      TRANSITION_ERR: String;
-      TRANSITION_CANCELLED: String;
-    }
-
-    interface State {
-        _meta: Array<Object>;
-        name: String;
-        params: Object;
-    }
-
-    interface RouteNode {
-        add(route: any, cb?: Function): RouteNode;
-        addNode(name?: any, params?: any): RouteNode;
-        buildPath(routeName: String, params?: Object): String;
-        buildPathFromSegments(segment: Array<Object>, params?: Object): String;
-        buildState(name: String, params?: Object): State;
-        buildStateFromSegments(segments: Array<Object>): State;
-        getMetaFromSegments(segments: Array<Object>): Array<Object>;
-        getPath(routeName: String): String;
-        getPathFromSegments(segments: Array<Object>): String;
-        getSegmentsByName(routeName: String): Array<Object>;
-        getSegmentsMatchingPath(path: any, options: Object): Array<any>;
-        matchPath(path: any, options?: Object): State;
-        setPath(path?: any): void;
-    }
-
-    interface RouteNodeFactory {
-        new(name?: any, path?: any, childRoutes?: any, cb?: Function): RouteNode;
-        (name?: any, path?: any, childRoutes?: any, cb?: Function): RouteNode;
-    }
-
-    interface Router5 {
-        add(routes: any): Router5;
-        addNode(name: String, path: String, canActivate?: Function): Router5;
-        areStatesDescendants(parentState: any, childState: any): Boolean;
-        areStatesEqual(state1: any, state2: any): Boolean;
-        buildPath(route: String, params: Object): String;
-        buildState(route: String, params: Object): String;
-        buildUrl(route: String, params: Object): String;
-        canActivate(name: String, canActivate: Function): Router5;
-        canDeactivate(name: String, canDeactivate: Boolean): any;
-        cancel(): void;
-        getAdditionalArgs(): Array<any>;
-        getState(): Object;
-        isActive(name: String, params?: Object, strictEquality?: Boolean, ignoreQueryParams?: Boolean): Boolean;
-        matchPath(path: String): Object;
-        matchUrl(url: String): Object;
-        navigate(name: String, ...args: Array<Object|Function>): Function;
-        setAdditionalArgs(args: Array<any>): void;
-        setOption(opt: String, val: any): Router5;
-        start(...args: Array<any>): Router5;
-        stop(): Router5;
-        urlToPath(path: String): String;
-        useMiddleware(...args: Array<Function>): Router5;
-        usePlugin(pluginFactory: Function): Router5;
-    }
-
-    interface Router5Factory {
-        new(routes?: any, opts?: Object): Router5;
-        (routes?: any, opts?: Object): Router5;
-    }
-
-    var errCodes: constants;
-    var loggerPlugin: () => Function;
-    var RouteNode: RouteNodeFactory;
-    var Router5: Router5Factory;
-    var transitionPath: (toState: any, fromState: any) => any;
-
-    export default Router5;
-    export {
-      errCodes,
-      loggerPlugin,
-      RouteNode,
-      Router5,
-      transitionPath
-    };
-}
diff --git a/router5/tsconfig.json b/router5/tsconfig.json
new file mode 100644
index 0000000000..4c6093ae63
--- /dev/null
+++ b/router5/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "router5-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/routie/routie.d.ts b/routie/index.d.ts
similarity index 100%
rename from routie/routie.d.ts
rename to routie/index.d.ts
diff --git a/routie/routie-tests.ts b/routie/routie-tests.ts
index 12ee397c4a..34fba382d7 100644
--- a/routie/routie-tests.ts
+++ b/routie/routie-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="routie.d.ts" />
+
 
 // BASIC
 
diff --git a/routie/tsconfig.json b/routie/tsconfig.json
new file mode 100644
index 0000000000..a6abda4c03
--- /dev/null
+++ b/routie/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "routie-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/royalslider/index.d.ts b/royalslider/index.d.ts
new file mode 100644
index 0000000000..c7fdb6f284
--- /dev/null
+++ b/royalslider/index.d.ts
@@ -0,0 +1,496 @@
+// Type definitions for jQuery royal-slider v9.4.0
+// Project: http://dimsemenov.com/plugins/royal-slider/documentation/
+// Definitions by: Christiaan Rakowski <https://github.com/csrakowski/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace RoyalSlider {
+    export interface RoyalSliderThumbsOptions {
+        /**
+         * Thumbnails mouse drag. (default: true)
+         */
+        drag?: boolean;
+        /**
+         * Thumbnails touch. (default: true)
+         */
+        touch?: boolean;
+        /**
+         * 'horizontal' or 'vertical'. (default: 'horizontal')
+         */
+        orientation?: string;
+        /**
+         * Thumbnails arrows. (default: true)
+         */
+        arrows?: boolean;
+        /**
+         * Spacing between thumbs. (default: 4)
+         */
+        spacing?: number;
+        /**
+         * Auto hide thumbnails arrows on hover. (default: false)
+         */
+        arrowsAutoHide?: boolean;
+        /**
+         * Automatically centers container with thumbs if there are small number of items (default: true)
+         */
+        autoCenter?: boolean;
+        /**
+         * Thumbnails transition speed. (default: 600)
+         */
+        transitionSpeed?: number;
+        /**
+         * Reduces size of main viewport area by thumbnails width or height, use it when you set 100 % width to slider.This option is always true, when slider is in fullscreen mode. (default: true)
+         */
+        fitInViewport?: boolean;
+        /**
+         * Margin that equals thumbs spacing for first and last item. (default: true)
+         */
+        firstMargin?: boolean;
+        /**
+         * Replaces default thumbnail arrow. You have to add it to DOM manually. (default: null)
+         */
+        arrowLeft?: JQuery;
+        /**
+         * Replaces default thumbnail arrow. You have to add it to DOM manually. (default: null)
+         */
+        arrowRight?: JQuery;
+        /**
+         * Adds span element with class thumbIco to every thumbnail. Useful for styling (default: false)
+         */
+        appendSpan?: boolean;
+    }
+
+    export interface RoyalSliderFullscreenOptions {
+        /**
+         * Fullscreen functions enabled. (default: false)
+         */
+        enabled?: boolean;
+        /**
+         * Force keyboard arrows nav in fullscreen. (default: true)
+         */
+        keyboardNav?: boolean;
+        /**
+         * Fullscreen button at top right. (default: true)
+         */
+        buttonFS?: boolean;
+        /**
+         * Native browser fullscreen. (default: false)
+         */
+        nativeFS?: boolean;
+    }
+
+    export interface RoyalSliderDeeplinkingOptions {
+        /**
+         * Linking to slides by appending #SLIDE_INDEX to url.Slides count starts from 1. If change is set to false hash is only read once, after page load. (default: false)
+         */
+        enabled?: boolean;
+        /**
+         * Automatically change URL after transition and listen for hash change. (default: false)
+         */
+        change?: boolean;
+        /**
+         * Prefix that will be added to hash. For example if you set it to 'gallery-', hash would look like this: #gallery-5 (default: '')
+         */
+        prefix?: string;
+    }
+
+    export interface RoyalSliderAutoplayOptions {
+        /**
+         * Enable autoplay or not. (default: false)
+         */
+        enabled?: boolean;
+        /**
+         * Stop autoplay at first user action. (default: true)
+         */
+        stopAtAction?: boolean;
+        /**
+         * Pause autoplay on hover. (default: true)
+         */
+        pauseOnHover?: boolean;
+        /**
+         * Delay between items in ms. (default: 300)
+         */
+        delay?: number;
+    }
+
+    export interface RoyalSliderVideoOptions {
+        /**
+         * Auto hide arrows when video is playing  (default: true)
+         */
+        autoHideArrows?: boolean;
+        /**
+         * Auto hide navigation when video is playing. (default: false)
+         */
+        autoHideControlNav?: boolean;
+        /**
+         * Auto hide animated blocks when video is playing. (default: false)
+         */
+        autoHideBlocks?: boolean;
+        /**
+         * Youtube embed code. %id% is replaced by video id. (default: '<iframe src="http://www.youtube.com/embed/%id%?rel=1&autoplay=1&showinfo=0" frameborder="no"></iframe>')
+         */
+        youTubeCode?: string;
+        /**
+         * Vimeo embed code. %id% is replaced by video id. (default: '<iframe src="http://player.vimeo.com/video/%id%?byline=0&amp;portrait=0&amp;autoplay=1" frameborder="no" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>')
+         */
+        vimeoCode?: string;
+    }
+
+    export interface RoyalSliderBlockOptions {
+        /**
+         * true or false  (default: true)
+         */
+        fadeEffect?: boolean;
+        /**
+         * Move effect direction.Can be 'left', 'right', 'top', 'bottom' or 'none'. (default: 'top')
+         */
+        moveEffect?: string;
+        /**
+         * Distance for move effect in pixels. (default: 20)
+         */
+        moveOffset?: number;
+        /**
+         * Transition speed of block, in ms. (default: 400)
+         */
+        speed?: number;
+        /**
+         * Easing function of block animation.Read more in easing section of docs. (default: 'easeOutSine' )
+         */
+        easing?: string;
+        /**
+         * Delay between each block show up, in ms. (default: 200)
+         */
+        delay?: number;
+    }
+
+    export interface RoyalSliderVisibleOptions {
+        /**
+         * Enable visible-nearby. (default: true)
+         */
+        enabled?: boolean;
+        /**
+         * Ratio that determines area of center image.For example for 0.6 - 60 % of slider area will get center image and 20% for two images on sides. (default: 0.6)
+         */
+        centerArea?: number;
+        /**
+         * Alignment of center image, if you set it to false center image will be aligned to left. (default: true)
+         */
+        center?: boolean;
+        /**
+         * Disables navigation to next slide by clicking on current slide (if navigateByClick is true). (default: true)
+         */
+        navigateByCenterClick?: boolean;
+        /**
+         * Used for responsive design. Changes centerArea value to breakpointCenterArea when width of slider is less then value in this option. Set to 0 to disable. (default: 0)
+         */
+        breakpoint?: number;
+        /**
+         * Same as centerArea option, just for breakpoint. Can be changed dynamically via `sliderInstance.st.breakpointCenterArea`. (default: 0.8)
+         */
+        breakpointCenterArea?: number;
+    }
+
+    export interface RoyalSliderOptions {
+        /**
+         * Automatically updates slider height based on base width. (default: false)
+         */
+        autoScaleSlider?: boolean;
+        /**
+         * Base slider width.Slider will autocalculate the ratio based on these values. (default: 800)
+         */
+        autoScaleSliderWidth?: number;
+        /**
+         * 400 Base slider height
+         */
+        autoScaleSliderHeight?: number;
+        /**
+         * Scale mode for images."fill", "fit", "fit-if-smaller" or "none". (default: 'fit-if-smaller')
+         */
+        imageScaleMode?: string;
+        /**
+         * Aligns image to center of slide. (default: true)
+         */
+        imageAlignCenter?: boolean;
+        /**
+         * Distance between image and edge of slide (doesn't work with 'fill' scale mode). (default: 4)
+         */
+        imageScalePadding?: number;
+        /**
+         * Navigation type, can be 'bullets', 'thumbnails', 'tabs' or 'none' (default: 'bullets')
+         */
+        controlNavigation?: string;
+        /**
+         * Direction arrows navigation. (default: true)
+         */
+        arrowsNav?: boolean;
+        /**
+         * Auto hide arrows. (default: true)
+         */
+        arrowsNavAutoHide?: boolean;
+        /**
+         * Hides arrows completely on touch devices. (default: false)
+         */
+        arrowsNavHideOnTouch?: boolean;
+        /**
+         * Adds base width to all images for better-looking loading. Can be specified separately for each image. (default: null)
+         */
+        imgWidth?: number;
+        /**
+         * Adds base height to all images for better-looking loading. Can be specified separately for each image. (default: null)
+         */
+        imgHeight?: number;
+        /**
+         * Spacing between slides in pixels. (default: 8)
+         */
+        slidesSpacing?: number;
+        /**
+         * Start slide index. (default: 0)
+         */
+        startSlideId?: number;
+        /**
+         * Makes slider to go from last slide to first. (default: false)
+         */
+        loop?: boolean;
+        /**
+         * Makes slider to go from last slide to first with rewind. Overrides prev option. (default: false)
+         */
+        loopRewind?: boolean;
+        /**
+         * Randomizes all slides at start. (default: false)
+         */
+        randomizeSlides?: boolean;
+        /**
+         * Number of slides to preload on sides.If you set it to 0, only one slide will be kept in the display list at once. (default: 4)
+         */
+        numImagesToPreload?: number;
+        /**
+         * Enables spinning preloader, you may style it via CSS (class rsPreloader). (default: true)
+         */
+        usePreloader?: boolean;
+        /**
+         * Can be 'vertical' or 'horizontal'. (default: 'horizontal')
+         */
+        slidesOrientation?: string;
+        /**
+         * 'move' or 'fade'. Important note about fade transition, slides must have background as only one image is animating. (default: 'move')
+         */
+        transitionType?: string;
+        /**
+         * Slider transition speed, in ms. (default: 600)
+         */
+        transitionSpeed?: number;
+        /**
+         * Easing function for simple transition.Read more in the easing section of the documentation. (default: 'easeInOutSine')
+         */
+        easeInOut?: string;
+        /**
+         * Easing function of animation after ending of the swipe gesture. Read more in the easing section of the documentation. (default: 'easeOutSine')
+         */
+        easeOut?: string;
+        /**
+         *  If set to true adds arrows and fullscreen button inside rsOverflow container, otherwise inside root slider container. (default: true)
+         */
+        controlsInside?: boolean;
+        /**
+         * Navigates forward by clicking on slide. (default: true)
+         */
+        navigateByClick?: boolean;
+        /**
+         * Mouse drag navigation over slider. (default: true)
+         */
+        sliderDrag?: boolean;
+        /**
+         * Touch navigation of slider. (default: true)
+         */
+        sliderTouch?: boolean;
+        /**
+         * Navigate slider with keyboard left and right arrows. (default: false)
+         */
+        keyboardNavEnabled?: boolean;
+        /**
+         * Fades in slide after it's loaded. (default: true)
+         */
+        fadeinLoadedSlide?: boolean;
+        /**
+         * Allows usage of CSS3 transitions. Might be useful if you're experiencing font-rendering problems, or other CSS3-related bugs. (default: true)
+         */
+        allowCSS3?: boolean;
+        /**
+         * Adds global caption element to slider, read more in the global caption section of documentation. (default: false)
+         */
+        globalCaption?: boolean;
+        /**
+         * Adds rsActiveSlide class to current slide before transition. (default: false)
+         */
+        addActiveClass?: boolean;
+        /**
+         * Minimum distance in pixels to show next slide while dragging. (default: 10)
+         */
+        minSlideOffset?: number;
+        /**
+         * Scales and animates height based on current slide. Please note: if you have images in slide that don't have rsImg class) or don't have fixed size, use $(window).load() instead of $(document).ready() before initializing slider. Also, autoHeight doesn't work with properties like autoScaleSlider, imageScaleMode and imageAlignCenter.  (default: false)
+         */
+        autoHeight?: boolean;// false
+        /**
+         * Overrides HTML of slides, used for creating of slides from HTML that is not attached to DOM. More info in knowledge base.  (default: null)
+         */
+        slides?: Element;
+        /**
+         * Thumbnail options
+         */
+        thumbs?: RoyalSliderThumbsOptions;
+        /**
+         * You may specify larger images when slider is in fullscreen mode by adding data-rsBigImg attribute to rsImg element. A few examples:
+         */
+        fullscreen?: RoyalSliderFullscreenOptions;
+        /**
+         * Deep linking module makes URL automatically change when you switch slides and you can easily link to specific slide (aka permalink).
+         */
+        deeplinking?: RoyalSliderDeeplinkingOptions;
+        /**
+         * Autoplay slideshow can be enabled via slider options. Delay between items can be set globally via delay option, or specifically for each item by adding data-rsDelay="1000" to root element of the slide (1000 = 1sec).
+         */
+        autoplay?: RoyalSliderAutoplayOptions;
+        /**
+         * To add video to slide, you need to add data-rsVideo="" attribute to image. It can contain link to YouTube or Vimeo video.
+         */
+        video?: RoyalSliderVideoOptions;
+        /**
+         * All elements inside slide that have class rsABlock will be treated by slider as animated blocks (tag name doesn't matter). Blocks can not be nested, but you can put multiple instances of them into one slide, or make slide itself animated block.
+         */
+        block?: RoyalSliderBlockOptions;
+        /**
+         * Module "reveals" next and previous slides, like in this template.
+         */
+        visibleNearby?: RoyalSliderVisibleOptions;
+    }
+
+    export interface RoyalSlider { //TODO: extends/implements JQuery? (giving problems due to next(), prev(), width and height and 'selector'.
+        /**
+         * go to slide with id
+         */
+        goTo(id: number): void;
+        /**
+         * next slide
+         */
+        next(): void;
+        /**
+         * prev slide
+         */
+        prev(): void;
+        /**
+         * removes all events and clears all slider data (use on ajax sites to avoid memory leaks)
+         */
+        destroy(): void;
+        /**
+         * Dynamic slides adding/removing
+         */
+        appendSlide(element: JQuery, index?: number): void;
+        /**
+         * Remove slide
+         */
+        removeSlide(index?: number): void;
+        /**
+         * updates size of slider.  Use after you resize slider with js.
+         */
+        updateSliderSize(forceResize?: boolean): void;
+        /**
+         * changes orientation of thumbnails
+         */
+        setThumbsOrientation(orientation: string): void;
+        /**
+         * updates size of thumbnails
+         */
+        updateThumbsSize(): void;
+        /**
+         * Enter Fullscreen mode
+         */
+        enterFullscreen(): void;
+        /**
+         * Exit Fullscreen mode
+         */
+        exitFullscreen(): void;
+        /**
+         * Start autoplay
+         */
+        startAutoPlay(): void;
+        /**
+         * Stop autoplay
+         */
+        stopAutoPlay(): void;
+        /**
+         * Toggle autoplay between start and stop
+         */
+        toggleAutoPlay(): void;
+        /**
+         * Toggle video between start and stop
+         */
+        toggleVideo(): void;
+        /**
+         * Play video
+         */
+        playVideo(): void;
+        /**
+         * Stop video
+         */
+        stopVideo(): void;
+        /**
+         * current slide index
+         */
+        currSlideId: number;
+        /**
+         * current slide object
+         */
+        currSlide: JQuery;
+        /**
+         * total number of slides
+         */
+        numSlides: number;
+        /**
+         * indicates if slider is in fullscreen mode
+         */
+        isFullscreen: boolean;
+        /**
+         * indicates if browser supports native fullscreen
+         */
+        nativeFS: boolean;
+        /**
+         * width of slider
+         */
+        width: number;
+        /**
+         * height of slider
+         */
+        height: number;
+        /**
+         * Boolean, changes on mouseup, indicates if slide was dragged. Used to check if event is drag or click.
+         */
+        dragSuccess: boolean;
+        /**
+         * contains all data about each slide
+         */
+        slides: any[]; //TODO: what type?
+        /**
+         * Contains list of HTML slides that are added to slider
+         */
+        slidesJQ: JQuery[]; //TODO: what type?
+        /**
+         * Object with slider settings
+         */
+        st: RoyalSliderOptions;
+        /**
+         * jQuery object with slider events
+         */
+        ev: JQuery;
+    }
+}
+
+interface JQuery {
+    /**
+    * Creates a new royal-slider with the specified, or default, options.
+    *
+    * @param options The options
+    */
+    royalSlider(options?: RoyalSlider.RoyalSliderOptions): JQuery;
+}
diff --git a/royalslider/royalslider-tests.ts b/royalslider/royalslider-tests.ts
index 7211b2222e..c4581230ff 100644
--- a/royalslider/royalslider-tests.ts
+++ b/royalslider/royalslider-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="royalslider.d.ts" />
+
 
 $(".royalSlider").royalSlider();
 
diff --git a/royalslider/royalslider.d.ts b/royalslider/royalslider.d.ts
deleted file mode 100644
index 5b39942764..0000000000
--- a/royalslider/royalslider.d.ts
+++ /dev/null
@@ -1,496 +0,0 @@
-// Type definitions for jQuery royal-slider v9.4.0
-// Project: http://dimsemenov.com/plugins/royal-slider/documentation/
-// Definitions by: Christiaan Rakowski <https://github.com/csrakowski/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace RoyalSlider {
-    export interface RoyalSliderThumbsOptions {
-        /**
-         * Thumbnails mouse drag. (default: true)
-         */
-        drag?: boolean;
-        /**
-         * Thumbnails touch. (default: true)
-         */
-        touch?: boolean;
-        /**
-         * 'horizontal' or 'vertical'. (default: 'horizontal')
-         */
-        orientation?: string;
-        /**
-         * Thumbnails arrows. (default: true)
-         */
-        arrows?: boolean;
-        /**
-         * Spacing between thumbs. (default: 4)
-         */
-        spacing?: number;
-        /**
-         * Auto hide thumbnails arrows on hover. (default: false)
-         */
-        arrowsAutoHide?: boolean;
-        /**
-         * Automatically centers container with thumbs if there are small number of items (default: true)
-         */
-        autoCenter?: boolean;
-        /**
-         * Thumbnails transition speed. (default: 600)
-         */
-        transitionSpeed?: number;
-        /**
-         * Reduces size of main viewport area by thumbnails width or height, use it when you set 100 % width to slider.This option is always true, when slider is in fullscreen mode. (default: true)
-         */
-        fitInViewport?: boolean;
-        /**
-         * Margin that equals thumbs spacing for first and last item. (default: true)
-         */
-        firstMargin?: boolean;
-        /**
-         * Replaces default thumbnail arrow. You have to add it to DOM manually. (default: null)
-         */
-        arrowLeft?: JQuery;
-        /**
-         * Replaces default thumbnail arrow. You have to add it to DOM manually. (default: null)
-         */
-        arrowRight?: JQuery;
-        /**
-         * Adds span element with class thumbIco to every thumbnail. Useful for styling (default: false)
-         */
-        appendSpan?: boolean;
-    }
-
-    export interface RoyalSliderFullscreenOptions {
-        /**
-         * Fullscreen functions enabled. (default: false)
-         */
-        enabled?: boolean;
-        /**
-         * Force keyboard arrows nav in fullscreen. (default: true)
-         */
-        keyboardNav?: boolean;
-        /**
-         * Fullscreen button at top right. (default: true)
-         */
-        buttonFS?: boolean;
-        /**
-         * Native browser fullscreen. (default: false)
-         */
-        nativeFS?: boolean;
-    }
-
-    export interface RoyalSliderDeeplinkingOptions {
-        /**
-         * Linking to slides by appending #SLIDE_INDEX to url.Slides count starts from 1. If change is set to false hash is only read once, after page load. (default: false)
-         */
-        enabled?: boolean;
-        /**
-         * Automatically change URL after transition and listen for hash change. (default: false)
-         */
-        change?: boolean;
-        /**
-         * Prefix that will be added to hash. For example if you set it to 'gallery-', hash would look like this: #gallery-5 (default: '')
-         */
-        prefix?: string;
-    }
-
-    export interface RoyalSliderAutoplayOptions {
-        /**
-         * Enable autoplay or not. (default: false)
-         */
-        enabled?: boolean;
-        /**
-         * Stop autoplay at first user action. (default: true)
-         */
-        stopAtAction?: boolean;
-        /**
-         * Pause autoplay on hover. (default: true)
-         */
-        pauseOnHover?: boolean;
-        /**
-         * Delay between items in ms. (default: 300)
-         */
-        delay?: number;
-    }
-
-    export interface RoyalSliderVideoOptions {
-        /**
-         * Auto hide arrows when video is playing  (default: true)
-         */
-        autoHideArrows?: boolean;
-        /**
-         * Auto hide navigation when video is playing. (default: false)
-         */
-        autoHideControlNav?: boolean;
-        /**
-         * Auto hide animated blocks when video is playing. (default: false)
-         */
-        autoHideBlocks?: boolean;
-        /**
-         * Youtube embed code. %id% is replaced by video id. (default: '<iframe src="http://www.youtube.com/embed/%id%?rel=1&autoplay=1&showinfo=0" frameborder="no"></iframe>')
-         */
-        youTubeCode?: string;
-        /**
-         * Vimeo embed code. %id% is replaced by video id. (default: '<iframe src="http://player.vimeo.com/video/%id%?byline=0&amp;portrait=0&amp;autoplay=1" frameborder="no" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>')
-         */
-        vimeoCode?: string;
-    }
-
-    export interface RoyalSliderBlockOptions {
-        /**
-         * true or false  (default: true)
-         */
-        fadeEffect?: boolean;
-        /**
-         * Move effect direction.Can be 'left', 'right', 'top', 'bottom' or 'none'. (default: 'top')
-         */
-        moveEffect?: string;
-        /**
-         * Distance for move effect in pixels. (default: 20)
-         */
-        moveOffset?: number;
-        /**
-         * Transition speed of block, in ms. (default: 400)
-         */
-        speed?: number;
-        /**
-         * Easing function of block animation.Read more in easing section of docs. (default: 'easeOutSine' )
-         */
-        easing?: string;
-        /**
-         * Delay between each block show up, in ms. (default: 200)
-         */
-        delay?: number;
-    }
-
-    export interface RoyalSliderVisibleOptions {
-        /**
-         * Enable visible-nearby. (default: true)
-         */
-        enabled?: boolean;
-        /**
-         * Ratio that determines area of center image.For example for 0.6 - 60 % of slider area will get center image and 20% for two images on sides. (default: 0.6)
-         */
-        centerArea?: number;
-        /**
-         * Alignment of center image, if you set it to false center image will be aligned to left. (default: true)
-         */
-        center?: boolean;
-        /**
-         * Disables navigation to next slide by clicking on current slide (if navigateByClick is true). (default: true)
-         */
-        navigateByCenterClick?: boolean;
-        /**
-         * Used for responsive design. Changes centerArea value to breakpointCenterArea when width of slider is less then value in this option. Set to 0 to disable. (default: 0)
-         */
-        breakpoint?: number;
-        /**
-         * Same as centerArea option, just for breakpoint. Can be changed dynamically via `sliderInstance.st.breakpointCenterArea`. (default: 0.8)
-         */
-        breakpointCenterArea?: number;
-    }
-
-    export interface RoyalSliderOptions {
-        /**
-         * Automatically updates slider height based on base width. (default: false)
-         */
-        autoScaleSlider?: boolean;
-        /**
-         * Base slider width.Slider will autocalculate the ratio based on these values. (default: 800)
-         */
-        autoScaleSliderWidth?: number;
-        /**
-         * 400 Base slider height
-         */
-        autoScaleSliderHeight?: number;
-        /**
-         * Scale mode for images."fill", "fit", "fit-if-smaller" or "none". (default: 'fit-if-smaller')
-         */
-        imageScaleMode?: string;
-        /**
-         * Aligns image to center of slide. (default: true)
-         */
-        imageAlignCenter?: boolean;
-        /**
-         * Distance between image and edge of slide (doesn't work with 'fill' scale mode). (default: 4)
-         */
-        imageScalePadding?: number;
-        /**
-         * Navigation type, can be 'bullets', 'thumbnails', 'tabs' or 'none' (default: 'bullets')
-         */
-        controlNavigation?: string;
-        /**
-         * Direction arrows navigation. (default: true)
-         */
-        arrowsNav?: boolean;
-        /**
-         * Auto hide arrows. (default: true)
-         */
-        arrowsNavAutoHide?: boolean;
-        /**
-         * Hides arrows completely on touch devices. (default: false)
-         */
-        arrowsNavHideOnTouch?: boolean;
-        /**
-         * Adds base width to all images for better-looking loading. Can be specified separately for each image. (default: null)
-         */
-        imgWidth?: number;
-        /**
-         * Adds base height to all images for better-looking loading. Can be specified separately for each image. (default: null)
-         */
-        imgHeight?: number;
-        /**
-         * Spacing between slides in pixels. (default: 8)
-         */
-        slidesSpacing?: number;
-        /**
-         * Start slide index. (default: 0)
-         */
-        startSlideId?: number;
-        /**
-         * Makes slider to go from last slide to first. (default: false)
-         */
-        loop?: boolean;
-        /**
-         * Makes slider to go from last slide to first with rewind. Overrides prev option. (default: false)
-         */
-        loopRewind?: boolean;
-        /**
-         * Randomizes all slides at start. (default: false)
-         */
-        randomizeSlides?: boolean;
-        /**
-         * Number of slides to preload on sides.If you set it to 0, only one slide will be kept in the display list at once. (default: 4)
-         */
-        numImagesToPreload?: number;
-        /**
-         * Enables spinning preloader, you may style it via CSS (class rsPreloader). (default: true)
-         */
-        usePreloader?: boolean;
-        /**
-         * Can be 'vertical' or 'horizontal'. (default: 'horizontal')
-         */
-        slidesOrientation?: string;
-        /**
-         * 'move' or 'fade'. Important note about fade transition, slides must have background as only one image is animating. (default: 'move')
-         */
-        transitionType?: string;
-        /**
-         * Slider transition speed, in ms. (default: 600)
-         */
-        transitionSpeed?: number;
-        /**
-         * Easing function for simple transition.Read more in the easing section of the documentation. (default: 'easeInOutSine')
-         */
-        easeInOut?: string;
-        /**
-         * Easing function of animation after ending of the swipe gesture. Read more in the easing section of the documentation. (default: 'easeOutSine')
-         */
-        easeOut?: string;
-        /**
-         *  If set to true adds arrows and fullscreen button inside rsOverflow container, otherwise inside root slider container. (default: true)
-         */
-        controlsInside?: boolean;
-        /**
-         * Navigates forward by clicking on slide. (default: true)
-         */
-        navigateByClick?: boolean;
-        /**
-         * Mouse drag navigation over slider. (default: true)
-         */
-        sliderDrag?: boolean;
-        /**
-         * Touch navigation of slider. (default: true)
-         */
-        sliderTouch?: boolean;
-        /**
-         * Navigate slider with keyboard left and right arrows. (default: false)
-         */
-        keyboardNavEnabled?: boolean;
-        /**
-         * Fades in slide after it's loaded. (default: true)
-         */
-        fadeinLoadedSlide?: boolean;
-        /**
-         * Allows usage of CSS3 transitions. Might be useful if you're experiencing font-rendering problems, or other CSS3-related bugs. (default: true)
-         */
-        allowCSS3?: boolean;
-        /**
-         * Adds global caption element to slider, read more in the global caption section of documentation. (default: false)
-         */
-        globalCaption?: boolean;
-        /**
-         * Adds rsActiveSlide class to current slide before transition. (default: false)
-         */
-        addActiveClass?: boolean;
-        /**
-         * Minimum distance in pixels to show next slide while dragging. (default: 10)
-         */
-        minSlideOffset?: number;
-        /**
-         * Scales and animates height based on current slide. Please note: if you have images in slide that don't have rsImg class) or don't have fixed size, use $(window).load() instead of $(document).ready() before initializing slider. Also, autoHeight doesn't work with properties like autoScaleSlider, imageScaleMode and imageAlignCenter.  (default: false)
-         */
-        autoHeight?: boolean;// false
-        /**
-         * Overrides HTML of slides, used for creating of slides from HTML that is not attached to DOM. More info in knowledge base.  (default: null)
-         */
-        slides?: Element;
-        /**
-         * Thumbnail options
-         */
-        thumbs?: RoyalSliderThumbsOptions;
-        /**
-         * You may specify larger images when slider is in fullscreen mode by adding data-rsBigImg attribute to rsImg element. A few examples:
-         */
-        fullscreen?: RoyalSliderFullscreenOptions;
-        /**
-         * Deep linking module makes URL automatically change when you switch slides and you can easily link to specific slide (aka permalink).
-         */
-        deeplinking?: RoyalSliderDeeplinkingOptions;
-        /**
-         * Autoplay slideshow can be enabled via slider options. Delay between items can be set globally via delay option, or specifically for each item by adding data-rsDelay="1000" to root element of the slide (1000 = 1sec).
-         */
-        autoplay?: RoyalSliderAutoplayOptions;
-        /**
-         * To add video to slide, you need to add data-rsVideo="" attribute to image. It can contain link to YouTube or Vimeo video.
-         */
-        video?: RoyalSliderVideoOptions;
-        /**
-         * All elements inside slide that have class rsABlock will be treated by slider as animated blocks (tag name doesn't matter). Blocks can not be nested, but you can put multiple instances of them into one slide, or make slide itself animated block.
-         */
-        block?: RoyalSliderBlockOptions;
-        /**
-         * Module "reveals" next and previous slides, like in this template.
-         */
-        visibleNearby?: RoyalSliderVisibleOptions;
-    }
-
-    export interface RoyalSlider { //TODO: extends/implements JQuery? (giving problems due to next(), prev(), width and height and 'selector'.
-        /**
-         * go to slide with id
-         */
-        goTo(id: number): void;
-        /**
-         * next slide
-         */
-        next(): void;
-        /**
-         * prev slide
-         */
-        prev(): void;
-        /**
-         * removes all events and clears all slider data (use on ajax sites to avoid memory leaks)
-         */
-        destroy(): void;
-        /**
-         * Dynamic slides adding/removing
-         */
-        appendSlide(element: JQuery, index?: number): void;
-        /**
-         * Remove slide
-         */
-        removeSlide(index?: number): void;
-        /**
-         * updates size of slider.  Use after you resize slider with js.
-         */
-        updateSliderSize(forceResize?: boolean): void;
-        /**
-         * changes orientation of thumbnails
-         */
-        setThumbsOrientation(orientation: string): void;
-        /**
-         * updates size of thumbnails
-         */
-        updateThumbsSize(): void;
-        /**
-         * Enter Fullscreen mode
-         */
-        enterFullscreen(): void;
-        /**
-         * Exit Fullscreen mode
-         */
-        exitFullscreen(): void;
-        /**
-         * Start autoplay
-         */
-        startAutoPlay(): void;
-        /**
-         * Stop autoplay
-         */
-        stopAutoPlay(): void;
-        /**
-         * Toggle autoplay between start and stop
-         */
-        toggleAutoPlay(): void;
-        /**
-         * Toggle video between start and stop
-         */
-        toggleVideo(): void;
-        /**
-         * Play video
-         */
-        playVideo(): void;
-        /**
-         * Stop video
-         */
-        stopVideo(): void;
-        /**
-         * current slide index
-         */
-        currSlideId: number;
-        /**
-         * current slide object
-         */
-        currSlide: JQuery;
-        /**
-         * total number of slides
-         */
-        numSlides: number;
-        /**
-         * indicates if slider is in fullscreen mode
-         */
-        isFullscreen: boolean;
-        /**
-         * indicates if browser supports native fullscreen
-         */
-        nativeFS: boolean;
-        /**
-         * width of slider
-         */
-        width: number;
-        /**
-         * height of slider
-         */
-        height: number;
-        /**
-         * Boolean, changes on mouseup, indicates if slide was dragged. Used to check if event is drag or click.
-         */
-        dragSuccess: boolean;
-        /**
-         * contains all data about each slide
-         */
-        slides: any[]; //TODO: what type?
-        /**
-         * Contains list of HTML slides that are added to slider
-         */
-        slidesJQ: JQuery[]; //TODO: what type?
-        /**
-         * Object with slider settings
-         */
-        st: RoyalSliderOptions;
-        /**
-         * jQuery object with slider events
-         */
-        ev: JQuery;
-    }
-}
-
-interface JQuery {
-    /**
-    * Creates a new royal-slider with the specified, or default, options.
-    *
-    * @param options The options
-    */
-    royalSlider(options?: RoyalSlider.RoyalSliderOptions): JQuery;
-}
diff --git a/royalslider/tsconfig.json b/royalslider/tsconfig.json
new file mode 100644
index 0000000000..db812dcafa
--- /dev/null
+++ b/royalslider/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "royalslider-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rsmq-worker/index.d.ts b/rsmq-worker/index.d.ts
new file mode 100644
index 0000000000..195b1ed819
--- /dev/null
+++ b/rsmq-worker/index.d.ts
@@ -0,0 +1,52 @@
+// Type definitions for rsmq-worker 0.3.5
+// Project: http://smrchy.github.io/rsmq/rsmq-worker/
+// Definitions by: TANAKA Koichi <https://github.com/MugeSo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="rsmq"/>
+
+
+import redis = require('redis');
+import events = require('events');
+
+declare namespace RSMQWorker {
+    export interface Client extends events.EventEmitter {
+        start(): Client;
+        stop(): Client;
+        send(message: string, delay?: number, cb?: CallbackT<string>): Client;
+        send(message: string, cb: CallbackT<string>): Client;
+        del(id: string, cb?: CallbackT<void>): Client;
+        changeInterval(interval: number | number[]): Client;
+    }
+
+    export interface Options {
+        interval?: number;
+        maxReceiveCount?: number;
+        invisibletime?: number;
+        defaultDelay?: number;
+        autostart?: boolean;
+        timeout?: number;
+        customExceedCheck?: CustomExceedCheckCallback;
+        rsmq?: RedisSMQ.Client;
+        redis?: redis.RedisClient;
+        redisPrefix?: string;
+        host?: string;
+        port?: number;
+        options?: redis.ClientOpts;
+    }
+
+    export interface CustomExceedCheckCallback {
+        (message: RedisSMQ.Message): boolean;
+    }
+
+    export interface CallbackT<R> {
+        (e?: Error, res?: R): void;
+    }
+}
+
+interface RSMQWorkerStatic {
+    new (queuename: string, options?: RSMQWorker.Options): RSMQWorker.Client;
+}
+
+declare var RSMQWorker: RSMQWorkerStatic;
+export = RSMQWorker;
diff --git a/rsmq-worker/rsmq-worker-tests.ts b/rsmq-worker/rsmq-worker-tests.ts
index d5d974bd06..2e1361d73c 100644
--- a/rsmq-worker/rsmq-worker-tests.ts
+++ b/rsmq-worker/rsmq-worker-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./rsmq-worker.d.ts" />
 
 import RSMQWorker = require('rsmq-worker');
 
diff --git a/rsmq-worker/rsmq-worker.d.ts b/rsmq-worker/rsmq-worker.d.ts
deleted file mode 100644
index a11ab1ef43..0000000000
--- a/rsmq-worker/rsmq-worker.d.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-// Type definitions for rsmq-worker 0.3.5
-// Project: http://smrchy.github.io/rsmq/rsmq-worker/
-// Definitions by: TANAKA Koichi <https://github.com/MugeSo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path='../rsmq/rsmq.d.ts'/>
-
-declare module "rsmq-worker" {
-    import redis = require('redis');
-    import events = require('events');
-
-    namespace RSMQWorker {
-        export interface Client extends events.EventEmitter {
-            start(): Client;
-            stop(): Client;
-            send(message: string, delay?: number, cb?: CallbackT<string>): Client;
-            send(message: string, cb: CallbackT<string>): Client;
-            del(id: string, cb?: CallbackT<void>): Client;
-            changeInterval(interval: number|number[]): Client;
-        }
-
-        export interface Options {
-            interval?: number;
-            maxReceiveCount?: number;
-            invisibletime?: number;
-            defaultDelay?: number;
-            autostart?: boolean;
-            timeout?: number;
-            customExceedCheck?: CustomExceedCheckCallback;
-            rsmq?: RedisSMQ.Client;
-            redis?: redis.RedisClient;
-            redisPrefix?: string;
-            host?: string;
-            port?: number;
-            options?: redis.ClientOpts;
-        }
-
-        export interface CustomExceedCheckCallback {
-            (message: RedisSMQ.Message): boolean;
-        }
-
-        export interface CallbackT<R> {
-            (e?:Error, res?:R): void;
-        }
-    }
-
-    interface RSMQWorkerStatic {
-        new(queuename: string, options?: RSMQWorker.Options): RSMQWorker.Client;
-    }
-
-    var RSMQWorker: RSMQWorkerStatic;
-    export = RSMQWorker;
-}
diff --git a/rsmq-worker/tsconfig.json b/rsmq-worker/tsconfig.json
new file mode 100644
index 0000000000..309a45b295
--- /dev/null
+++ b/rsmq-worker/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "rsmq-worker-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rsmq/index.d.ts b/rsmq/index.d.ts
new file mode 100644
index 0000000000..b10c6c30a1
--- /dev/null
+++ b/rsmq/index.d.ts
@@ -0,0 +1,91 @@
+// Type definitions for rsmq 0.3.16
+// Project: http://smrchy.github.io/rsmq/
+// Definitions by: Qubo <https://github.com/MugeSo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace RedisSMQ {
+    interface CallbackT<R> {
+        (e?:Error, res?:R): void;
+    }
+
+    interface Client {
+        createQueue(options:QueueOptions, cb:CallbackT<number>): void;
+        changeMessageVisibility(options:VisibilityOptions, cb:CallbackT<number>): void;
+        deleteMessage(options:MessageIdentifier, cb:CallbackT<number>): void;
+        deleteQueue(options:QueueIdentifier, cb:CallbackT<number>): void;
+        getQueueAttributes(options:QueueIdentifier, cb:CallbackT<QueueAttributes>): void;
+        listQueues(cb:CallbackT<string[]>): void;
+        receiveMessage(options:ReceiveOptions, cb:CallbackT<Message>): void;
+        sendMessage(options:NewMessage, cb:CallbackT<string>): void;
+        setQueueAttributes(options:QueueOptions, cb:CallbackT<QueueAttributes>): void;
+        quit(): void;
+    }
+
+    interface QueueIdentifier {
+        qname: string;
+    }
+
+    interface QueueOptions extends QueueIdentifier {
+        vt?: number;
+        delay?: number;
+        maxsize?: number;
+    }
+
+    interface MessageIdentifier extends QueueIdentifier {
+        id: string;
+    }
+
+    interface VisibilityOptions extends MessageIdentifier {
+        vt: number;
+    }
+
+    export interface QueueAttributes extends QueueIdentifier {
+        vt: number;
+        delay: number;
+        maxsize: number;
+        totalrecv: number;
+        totalsent: number;
+        created: number;
+        modified: number;
+        msgs: number;
+        hiddenmsgs: number;
+    }
+
+    interface ReceiveOptions extends QueueIdentifier {
+        vt?: number;
+    }
+
+    export interface Message extends MessageIdentifier {
+        message: string;
+        sent: number;
+        fr: number;
+        rc: number;
+    }
+
+    interface NewMessage extends QueueIdentifier {
+        message: string;
+        delay?: number;
+    }
+}
+
+import redis = require('redis');
+
+interface RedisSMQStatic {
+    new (options:ClientOptions): Client;
+}
+
+interface Client extends RedisSMQ.Client{
+    redis: redis.RedisClient;
+}
+
+interface ClientOptions {
+    host?: string;
+    port?: number;
+    options?: redis.ClientOpts;
+    client?: redis.RedisClient;
+    ns?: string;
+}
+
+declare var rsmq: RedisSMQStatic;
+export = rsmq;
+
diff --git a/rsmq/rsmq-tests.ts b/rsmq/rsmq-tests.ts
index c7a89490a5..4f2260a333 100644
--- a/rsmq/rsmq-tests.ts
+++ b/rsmq/rsmq-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="rsmq.d.ts" />
+
 
 var RedisSMQ = require("rsmq");
 var rsmq = new RedisSMQ( {host: "127.0.0.1", port: 6379, ns: "rsmq"} );
@@ -15,9 +15,9 @@ rsmq.createQueue({qname: "my-queue"}, (e: Error, success: number) => {
 rsmq.sendMessage({qname: "my-queue", message: "first message"}, (e: Error, id: string) => {
     rsmq.changeMessageVisibility({qname: "my-queue", id: id, vt: 100}, (e: Error, success: number) => {});
 });
-rsmq.getQueueAttributes({qname: 'my-queue'}, (e: Error, attr: RedisSMQ.QueueAttributes) =>{} );
-rsmq.setQueueAttributes({qname: "my-queue", vt: 20}, (e: Error, attr: RedisSMQ.QueueAttributes) => {});
-rsmq.receiveMessage({qname: "my-queue"}, (e: Error, message: RedisSMQ.Message) => {
+rsmq.getQueueAttributes({qname: 'my-queue'}, (e: Error, attr: any) =>{} );
+rsmq.setQueueAttributes({qname: "my-queue", vt: 20}, (e: Error, attr: any) => {});
+rsmq.receiveMessage({qname: "my-queue"}, (e: Error, message: any) => {
     rsmq.deleteMessage(message, (e: Error, success: number) => {});
 });
 rsmq.listQueues((e: Error, list: string[]) => {});
diff --git a/rsmq/rsmq.d.ts b/rsmq/rsmq.d.ts
deleted file mode 100644
index c4d3e0de02..0000000000
--- a/rsmq/rsmq.d.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-// Type definitions for rsmq 0.3.16
-// Project: http://smrchy.github.io/rsmq/
-// Definitions by: Qubo <https://github.com/MugeSo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path='../redis/redis.d.ts'/>
-
-declare namespace RedisSMQ {
-    interface CallbackT<R> {
-        (e?:Error, res?:R): void;
-    }
-
-    interface Client {
-        createQueue(options:QueueOptions, cb:CallbackT<number>): void;
-        changeMessageVisibility(options:VisibilityOptions, cb:CallbackT<number>): void;
-        deleteMessage(options:MessageIdentifier, cb:CallbackT<number>): void;
-        deleteQueue(options:QueueIdentifier, cb:CallbackT<number>): void;
-        getQueueAttributes(options:QueueIdentifier, cb:CallbackT<QueueAttributes>): void;
-        listQueues(cb:CallbackT<string[]>): void;
-        receiveMessage(options:ReceiveOptions, cb:CallbackT<Message>): void;
-        sendMessage(options:NewMessage, cb:CallbackT<string>): void;
-        setQueueAttributes(options:QueueOptions, cb:CallbackT<QueueAttributes>): void;
-        quit(): void;
-    }
-
-    interface QueueIdentifier {
-        qname: string;
-    }
-
-    interface QueueOptions extends QueueIdentifier {
-        vt?: number;
-        delay?: number;
-        maxsize?: number;
-    }
-
-    interface MessageIdentifier extends QueueIdentifier {
-        id: string;
-    }
-
-    interface VisibilityOptions extends MessageIdentifier {
-        vt: number;
-    }
-
-    export interface QueueAttributes extends QueueIdentifier {
-        vt: number;
-        delay: number;
-        maxsize: number;
-        totalrecv: number;
-        totalsent: number;
-        created: number;
-        modified: number;
-        msgs: number;
-        hiddenmsgs: number;
-    }
-
-    interface ReceiveOptions extends QueueIdentifier {
-        vt?: number;
-    }
-
-    export interface Message extends MessageIdentifier {
-        message: string;
-        sent: number;
-        fr: number;
-        rc: number;
-    }
-
-    interface NewMessage extends QueueIdentifier {
-        message: string;
-        delay?: number;
-    }
-}
-
-declare module 'rsmq' {
-    import redis = require('redis');
-
-    interface RedisSMQStatic {
-        new (options:ClientOptions): Client;
-    }
-
-    interface Client extends RedisSMQ.Client{
-        redis: redis.RedisClient;
-    }
-
-    interface ClientOptions {
-        host?: string;
-        port?: number;
-        options?: redis.ClientOpts;
-        client?: redis.RedisClient;
-        ns?: string;
-    }
-
-    var rsmq: RedisSMQStatic;
-    export = rsmq;
-}
diff --git a/rsmq/tsconfig.json b/rsmq/tsconfig.json
new file mode 100644
index 0000000000..91ea160018
--- /dev/null
+++ b/rsmq/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "rsmq-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rss/index.d.ts b/rss/index.d.ts
new file mode 100644
index 0000000000..bd5653bf8f
--- /dev/null
+++ b/rss/index.d.ts
@@ -0,0 +1,207 @@
+// Type definitions for rss
+// Project: https://github.com/dylang/node-rss
+// Definitions by: Second Datke <https://github.com/secondwtq>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var factory: NodeRSS.RSSFactory;
+export = factory;
+
+declare namespace NodeRSS {
+    interface FeedOptions {
+        /**
+         * Title of your site or feed.
+         */
+        title: string;
+        /**
+         * A short description of the feed.
+         */
+        description?: string;
+        /**
+         * Feed generator.
+         */
+        generator?: string;
+        /**
+         * URL to the rss feed.
+         */
+        feed_url: string;
+        /**
+         * URL to the site that the feed is for.
+         */
+        site_url: string;
+        /**
+         * Small image for feed readers to use.
+         */
+        image_url?: string;
+        /**
+         * URL to documentation on this feed.
+         */
+        docs?: string;
+        /**
+         * Who manages content in this feed.
+         */
+        managingEditor?: string;
+        /**
+         * Who manages feed availability and technical support.
+         */
+        webMaster?: string;
+        /**
+         * Copyright information for this feed.
+         */
+        copyright?: string;
+        /**
+         * The language of the content of this feed.
+         */
+        language?: string;
+        /**
+         * One or more categories this feed belongs to.
+         */
+        categories?: string[];
+        /**
+         * The publication date for content in the feed.
+         * Accepts Date object or string with any format
+         * JS Date can parse.
+         */
+        pubDate?: Date | string;
+        /**
+         * Number of minutes feed can be cached before refreshing
+         * from source.
+         */
+        ttl?: number;
+        /**
+         * Where is the PubSubHub hub located.
+         */
+        hub?: string;
+        /**
+         * Put additional namespaces in element
+         * (without 'xmlns:' prefix).
+         */
+        custom_namespaces?: Object;
+        /**
+         * Put additional elements in the feed (node-xml syntax).
+         */
+        custom_elements?: any[];
+    }
+
+    interface EnclosureObject {
+        /**
+         * URL to file object (or file).
+         */
+        url: string;
+        /**
+         * Path to binary file (or URL).
+         */
+        file: string;
+        /**
+         * Size of the file.
+         */
+        size?: number;
+        /**
+         * If not provided, the MIME Type will be guessed based
+         * on the extension of the file or URL, passing type to
+         * the enclosure will override the guessed type.
+         */
+        type?: string;
+    }
+
+    interface ItemOptions {
+        /**
+         * Title of this particular item.
+         */
+        title: string;
+        /**
+         * Content for the item. Can contain HTML but link and image
+         * URLs must be absolute path including hostname.
+         */
+        description: string;
+        /**
+         * URL to the item. This could be a blog entry.
+         */
+        url: string;
+        /**
+         * A unique string feed readers use to know if an item is
+         * new or has already been seen. If you use a guid never
+         * change it. If you don't provide a guid then your item
+         * urls must be unique.
+         * Defaults to url.
+         */
+        guid?: string;
+        /**
+         * If provided, each array item will be added as a category
+         * element.
+         */
+        categories?: string[];
+        /**
+         * If included it is the name of the item's creator. If not
+         * provided the item author will be the same as the feed author.
+         * This is typical except on multi-author blogs.
+         */
+        author?: string;
+        /**
+         * The date and time of when the item was created. Feed
+         * readers use this to determine the sort order. Some readers
+         * will also use it to determine if the content should be
+         * presented as unread.
+         * Accepts Date object or string with any format
+         * JS Date can parse.
+         */
+        date: Date | string;
+        /**
+         * The latitude coordinate of the item for GeoRSS.
+         */
+        lat?: number;
+        /**
+         * The longitude coordinate of the item for GeoRSS.
+         */
+        long?: number;
+        /**
+         * Put additional elements in the item (node-xml syntax).
+         */
+        custom_elements?: any[];
+        /**
+         * An enclosure object.
+         */
+        enclosure?: EnclosureObject;
+    }
+
+    interface XmlOptions {
+        /**
+         * What to use as a tab. Defaults to no tabs (compressed).
+         * For example you can use '\t' for tab character, or ' '
+         * for two-space tabs. If you set it to true it will use
+         * four spaces.
+         */
+        indent?: boolean | string;
+    }
+
+    interface RSS {
+        /**
+         * Add an item to a feed. An item can be used for a blog
+         * entry, project update, log entry, etc.
+         * @param {ItemOptions} itemOptions
+         * @returns {RSS}
+         */
+        item(itemOptions: ItemOptions): RSS;
+        /**
+         * Generate XML and return as a string for this feed.
+         * @returns {string}
+         */
+        xml(): string;
+        /**
+         * Generate XML and return as a string for this feed.
+         *
+         * @param {XmlOptions} xmlOptions - You can use indent
+         * option to specify the tab character to use.
+         * @returns {string}
+         */
+        xml(xmlOptions: XmlOptions): string;
+    }
+
+    interface RSSFactory {
+        /**
+         * Create an RSS feed with options.
+         * @param {FeedOptions} feedOptions - Options for the RSS feed.
+         * @returns {RSS}
+         */
+        new(feedOptions: FeedOptions): RSS;
+    }
+}
diff --git a/rss/rss-tests.ts b/rss/rss-tests.ts
index 38ce28a977..e73f786a18 100644
--- a/rss/rss-tests.ts
+++ b/rss/rss-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="rss.d.ts" />
+
 
 // this test is copied from https://github.com/dylang/node-rss
 //  it basically:
diff --git a/rss/rss.d.ts b/rss/rss.d.ts
deleted file mode 100644
index 58b46b4d07..0000000000
--- a/rss/rss.d.ts
+++ /dev/null
@@ -1,209 +0,0 @@
-// Type definitions for rss
-// Project: https://github.com/dylang/node-rss
-// Definitions by: Second Datke <https://github.com/secondwtq>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace NodeRSS {
-    interface FeedOptions {
-        /**
-         * Title of your site or feed.
-         */
-        title: string;
-        /**
-         * A short description of the feed.
-         */
-        description?: string;
-        /**
-         * Feed generator.
-         */
-        generator?: string;
-        /**
-         * URL to the rss feed.
-         */
-        feed_url: string;
-        /**
-         * URL to the site that the feed is for.
-         */
-        site_url: string;
-        /**
-         * Small image for feed readers to use.
-         */
-        image_url?: string;
-        /**
-         * URL to documentation on this feed.
-         */
-        docs?: string;
-        /**
-         * Who manages content in this feed.
-         */
-        managingEditor?: string;
-        /**
-         * Who manages feed availability and technical support.
-         */
-        webMaster?: string;
-        /**
-         * Copyright information for this feed.
-         */
-        copyright?: string;
-        /**
-         * The language of the content of this feed.
-         */
-        language?: string;
-        /**
-         * One or more categories this feed belongs to.
-         */
-        categories?: string[];
-        /**
-         * The publication date for content in the feed.
-         * Accepts Date object or string with any format
-         * JS Date can parse.
-         */
-        pubDate?: Date | string;
-        /**
-         * Number of minutes feed can be cached before refreshing
-         * from source.
-         */
-        ttl?: number;
-        /**
-         * Where is the PubSubHub hub located.
-         */
-        hub?: string;
-        /**
-         * Put additional namespaces in element
-         * (without 'xmlns:' prefix).
-         */
-        custom_namespaces?: Object;
-        /**
-         * Put additional elements in the feed (node-xml syntax).
-         */
-        custom_elements?: any[];
-    }
-
-    interface EnclosureObject {
-        /**
-         * URL to file object (or file).
-         */
-        url: string;
-        /**
-         * Path to binary file (or URL).
-         */
-        file: string;
-        /**
-         * Size of the file.
-         */
-        size?: number;
-        /**
-         * If not provided, the MIME Type will be guessed based
-         * on the extension of the file or URL, passing type to
-         * the enclosure will override the guessed type.
-         */
-        type?: string;
-    }
-
-    interface ItemOptions {
-        /**
-         * Title of this particular item.
-         */
-        title: string;
-        /**
-         * Content for the item. Can contain HTML but link and image
-         * URLs must be absolute path including hostname.
-         */
-        description: string;
-        /**
-         * URL to the item. This could be a blog entry.
-         */
-        url: string;
-        /**
-         * A unique string feed readers use to know if an item is
-         * new or has already been seen. If you use a guid never
-         * change it. If you don't provide a guid then your item
-         * urls must be unique.
-         * Defaults to url.
-         */
-        guid?: string;
-        /**
-         * If provided, each array item will be added as a category
-         * element.
-         */
-        categories?: string[];
-        /**
-         * If included it is the name of the item's creator. If not
-         * provided the item author will be the same as the feed author.
-         * This is typical except on multi-author blogs.
-         */
-        author?: string;
-        /**
-         * The date and time of when the item was created. Feed
-         * readers use this to determine the sort order. Some readers
-         * will also use it to determine if the content should be
-         * presented as unread.
-         * Accepts Date object or string with any format
-         * JS Date can parse.
-         */
-        date: Date | string;
-        /**
-         * The latitude coordinate of the item for GeoRSS.
-         */
-        lat?: number;
-        /**
-         * The longitude coordinate of the item for GeoRSS.
-         */
-        long?: number;
-        /**
-         * Put additional elements in the item (node-xml syntax).
-         */
-        custom_elements?: any[];
-        /**
-         * An enclosure object.
-         */
-        enclosure?: EnclosureObject;
-    }
-
-    interface XmlOptions {
-        /**
-         * What to use as a tab. Defaults to no tabs (compressed).
-         * For example you can use '\t' for tab character, or ' '
-         * for two-space tabs. If you set it to true it will use
-         * four spaces.
-         */
-        indent?: boolean | string;
-    }
-
-    interface RSS {
-        /**
-         * Add an item to a feed. An item can be used for a blog
-         * entry, project update, log entry, etc.
-         * @param {ItemOptions} itemOptions
-         * @returns {RSS}
-         */
-        item(itemOptions: ItemOptions): RSS;
-        /**
-         * Generate XML and return as a string for this feed.
-         * @returns {string}
-         */
-        xml(): string;
-        /**
-         * Generate XML and return as a string for this feed.
-         *
-         * @param {XmlOptions} xmlOptions - You can use indent
-         * option to specify the tab character to use.
-         * @returns {string}
-         */
-        xml(xmlOptions: XmlOptions): string;
-    }
-
-    interface RSSFactory {
-        /**
-         * Create an RSS feed with options.
-         * @param {FeedOptions} feedOptions - Options for the RSS feed.
-         * @returns {RSS}
-         */
-        new(feedOptions: FeedOptions): RSS;
-    }
-}
-
-declare module 'rss' {
-    var factory: NodeRSS.RSSFactory;
-    export = factory;
-}
diff --git a/rss/tsconfig.json b/rss/tsconfig.json
new file mode 100644
index 0000000000..620c07f460
--- /dev/null
+++ b/rss/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "rss-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rsync/index.d.ts b/rsync/index.d.ts
new file mode 100644
index 0000000000..7ec975e992
--- /dev/null
+++ b/rsync/index.d.ts
@@ -0,0 +1,95 @@
+// Type definitions for node-rsync v0.4.0
+// Project: https://github.com/mattijs/node-rsync
+// Definitions by: Philipp Stucki <https://github.com/philippstucki>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import * as child_process from 'child_process';
+interface StreamDataHandler {
+    (data: any): void;
+}
+
+interface Pattern {
+    action: string;
+    pattern: string;
+}
+
+interface Flag {
+    [name: string]: boolean;
+}
+
+interface Rsync {
+    // instance methods
+    set(option: string, value: string): Rsync;
+    set(option: string): Rsync;
+
+    unset(option: string): Rsync;
+
+    flags(flags: string, set?: boolean): Rsync;
+    flags(flags: Flag): Rsync;
+    flags(flags: string[], set?: boolean): Rsync;
+    flags(...flags: any[]): Rsync;
+
+    isSet(option: string): boolean;
+
+    option(option: string): any;
+
+    args(): string[];
+
+    command(): string;
+
+    output(stdout: StreamDataHandler, stderr: StreamDataHandler): Rsync;
+
+    execute(callback: (err: Error, code: number, cmd: string) => void): child_process.ChildProcess;
+    execute(
+        callback: (err: Error, code: number, cmd: string) => void,
+        stdout: StreamDataHandler,
+        stderr: StreamDataHandler
+    ): child_process.ChildProcess;
+
+
+    // option shorthands
+    shell(shell: string): Rsync;
+    delete(): Rsync;
+    progress(): Rsync;
+    archive(): Rsync;
+    compress(): Rsync;
+    recursive(): Rsync;
+    update(): Rsync;
+    quiet(): Rsync;
+    dirs(): Rsync;
+    links(): Rsync;
+    dry(): Rsync;
+
+    // accessor methods
+    executable(): string;
+    executable(e: string): Rsync;
+
+    executableShell(): string;
+    executableShell(e: string): Rsync;
+
+    destination(): string;
+    destination(d: string): Rsync;
+
+    source(): string[];
+    source(s: string): Rsync;
+    source(s: string[]): Rsync;
+
+    // pattern accessors
+    patterns(patterns: (string | Pattern)[]): Rsync;
+
+    exclude(p: string): Rsync;
+    exclude(p: string[]): Rsync;
+
+    include(p: string): Rsync;
+    include(p: string[]): Rsync;
+}
+
+interface RsyncStatic {
+    new (): Rsync;
+}
+
+declare const e: RsyncStatic;
+export = e;
diff --git a/rsync/rsync-tests.ts b/rsync/rsync-tests.ts
index 6e12213bd2..cfc9956dc2 100644
--- a/rsync/rsync-tests.ts
+++ b/rsync/rsync-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="rsync.d.ts"/>
-
 import * as Rsync from 'rsync';
 
 // --------------------------
diff --git a/rsync/rsync.d.ts b/rsync/rsync.d.ts
deleted file mode 100644
index 9c828e6fbc..0000000000
--- a/rsync/rsync.d.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-// Type definitions for node-rsync v0.4.0
-// Project: https://github.com/mattijs/node-rsync
-// Definitions by: Philipp Stucki <https://github.com/philippstucki>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'rsync' {
-    import * as child_process from 'child_process';
-    interface StreamDataHandler {
-        (data: any): void;
-    }
-
-    interface Pattern {
-        action: string;
-        pattern: string;
-    }
-
-    interface Flag {
-        [name: string]: boolean;
-    }
-
-    interface Rsync {
-        // instance methods
-        set(option: string, value: string): Rsync;
-        set(option: string): Rsync;
-
-        unset(option: string): Rsync;
-
-        flags(flags: string, set?: boolean): Rsync;
-        flags(flags: Flag): Rsync;
-        flags(flags: string[], set?: boolean): Rsync;
-        flags(...flags: any[]): Rsync;
-
-        isSet(option: string): boolean;
-
-        option(option: string): any;
-
-        args(): string[];
-
-        command(): string;
-
-        output(stdout: StreamDataHandler, stderr: StreamDataHandler): Rsync;
-
-        execute(callback: (err: Error, code: number, cmd: string) => void): child_process.ChildProcess;
-        execute(
-            callback: (err: Error, code: number, cmd: string) => void,
-            stdout: StreamDataHandler,
-            stderr: StreamDataHandler
-        ): child_process.ChildProcess;
-
-
-        // option shorthands
-        shell(shell: string): Rsync;
-        delete(): Rsync;
-        progress(): Rsync;
-        archive(): Rsync;
-        compress(): Rsync;
-        recursive(): Rsync;
-        update(): Rsync;
-        quiet(): Rsync;
-        dirs(): Rsync;
-        links(): Rsync;
-        dry(): Rsync;
-
-        // accessor methods
-        executable(): string;
-        executable(e: string): Rsync;
-
-        executableShell(): string;
-        executableShell(e: string): Rsync;
-
-        destination(): string;
-        destination(d: string): Rsync;
-
-        source(): string[];
-        source(s: string): Rsync;
-        source(s: string[]): Rsync;
-
-        // pattern accessors
-        patterns(patterns: (string|Pattern)[]): Rsync;
-
-        exclude(p: string): Rsync;
-        exclude(p: string[]): Rsync;
-
-        include(p: string): Rsync;
-        include(p: string[]): Rsync;
-    }
-
-    interface RsyncStatic {
-        new(): Rsync;
-    }
-
-    const e: RsyncStatic;
-    export = e;
-}
diff --git a/rsync/tsconfig.json b/rsync/tsconfig.json
new file mode 100644
index 0000000000..5dfbb98a1b
--- /dev/null
+++ b/rsync/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "rsync-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rtree/rtree.d.ts b/rtree/index.d.ts
similarity index 100%
rename from rtree/rtree.d.ts
rename to rtree/index.d.ts
diff --git a/rtree/rtree-tests.ts b/rtree/rtree-tests.ts
index 67d35a4e61..440e1d4473 100644
--- a/rtree/rtree-tests.ts
+++ b/rtree/rtree-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="rtree.d.ts"/>
-
 var myRTree = RTree(5);
 var el = "test";
 
diff --git a/rtree/tsconfig.json b/rtree/tsconfig.json
new file mode 100644
index 0000000000..f04527c59a
--- /dev/null
+++ b/rtree/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "rtree-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/run-sequence/index.d.ts b/run-sequence/index.d.ts
new file mode 100644
index 0000000000..f860c5d217
--- /dev/null
+++ b/run-sequence/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for run-sequence
+// Project: https://github.com/OverZealous/run-sequence
+// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import gulp = require('gulp');
+
+interface IRunSequence {
+    (...streams: (string | string[] | gulp.TaskCallback)[]): NodeJS.ReadWriteStream;
+
+    use(gulp: gulp.Gulp): IRunSequence;
+}
+
+declare var _tmp: IRunSequence;
+export = _tmp;
diff --git a/run-sequence/run-sequence-tests.ts b/run-sequence/run-sequence-tests.ts
index edc3266e91..0dedc4a91d 100644
--- a/run-sequence/run-sequence-tests.ts
+++ b/run-sequence/run-sequence-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="./run-sequence.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
-
 import gulp = require("gulp");
 import tmp = require("run-sequence");
 var runSequence = tmp.use(gulp);
diff --git a/run-sequence/run-sequence.d.ts b/run-sequence/run-sequence.d.ts
deleted file mode 100644
index c83f794aef..0000000000
--- a/run-sequence/run-sequence.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Type definitions for run-sequence
-// Project: https://github.com/OverZealous/run-sequence
-// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
-
-declare module "run-sequence" {
-    import gulp = require('gulp');
-
-    interface IRunSequence {
-        (...streams: (string | string[] | gulp.TaskCallback)[]): NodeJS.ReadWriteStream;
-
-        use(gulp: gulp.Gulp): IRunSequence;
-    }
-
-    var _tmp: IRunSequence;
-    export = _tmp;
-}
diff --git a/run-sequence/tsconfig.json b/run-sequence/tsconfig.json
new file mode 100644
index 0000000000..5f9c60e150
--- /dev/null
+++ b/run-sequence/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "run-sequence-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rx-angular/index.d.ts b/rx-angular/index.d.ts
new file mode 100644
index 0000000000..2faecd5e06
--- /dev/null
+++ b/rx-angular/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for angularjs extensions to rxjs
+// Project: http://reactivex.io/
+// Definitions by: Mick Delaney <https://github.com/mickdelaney/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angularjs" />
+/// <reference types="rx" />
+
+declare namespace Rx {
+
+    interface IObservable<T> {
+        safeApply($scope: ng.IScope, callback: (data: T) => void): Rx.Observable<T>;
+    }
+
+    export interface ScopeScheduler extends IScheduler {
+        constructor(scope: ng.IScope) : ScopeScheduler;
+    }
+
+    export interface ScopeSchedulerStatic extends SchedulerStatic {
+        new ($scope: angular.IScope): ScopeScheduler;
+    }
+
+    export var ScopeScheduler: ScopeSchedulerStatic;
+}
+
+declare namespace rx.angular {
+
+    export interface IRxScope extends ng.IScope {
+        $toObservable(property: string): Rx.Observable<any>;
+    }
+}
+
diff --git a/rx-angular/rx.angular-tests.ts b/rx-angular/rx.angular-tests.ts
index e90a45025c..f2413695af 100644
--- a/rx-angular/rx.angular-tests.ts
+++ b/rx-angular/rx.angular-tests.ts
@@ -3,8 +3,6 @@
 // Definitions by: Mick Delaney <https://github.com/mickdelaney/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="rx.angular.d.ts" />
-
 var app = angular.module('testModule');
 
 interface AppScope extends rx.angular.IRxScope {
@@ -13,7 +11,6 @@ interface AppScope extends rx.angular.IRxScope {
 app.controller('Ctrl', ($scope: AppScope) => {
     	
 	this.inputObservable = $scope.$toObservable('term')
-								 .throttle(400)
 								 .safeApply($scope, (results: any) => {
 				                      this.results = results;
 				                  });
diff --git a/rx-angular/rx.angular.d.ts b/rx-angular/rx.angular.d.ts
deleted file mode 100644
index 9316181e66..0000000000
--- a/rx-angular/rx.angular.d.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// Type definitions for angularjs extensions to rxjs
-// Project: http://reactivex.io/
-// Definitions by: Mick Delaney <https://github.com/mickdelaney/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angularjs/angular.d.ts" />
-/// <reference path="../rx/rx.d.ts" />
-/// <reference path="../rx/rx.time.d.ts" />
-
-declare namespace Rx {
-
-    interface IObservable<T> {
-        safeApply($scope: ng.IScope, callback: (data: T) => void): Rx.Observable<T>;
-    }
-
-    export interface ScopeScheduler extends IScheduler {
-        constructor(scope: ng.IScope) : ScopeScheduler;
-    }
-
-    export interface ScopeSchedulerStatic extends SchedulerStatic {
-        new ($scope: angular.IScope): ScopeScheduler;
-    }
-
-    export var ScopeScheduler: ScopeSchedulerStatic;
-}
-
-declare namespace rx.angular {
-
-    export interface IRxScope extends ng.IScope {
-        $toObservable(property: string): Rx.Observable<any>;
-    }
-}
-
diff --git a/rx-angular/tsconfig.json b/rx-angular/tsconfig.json
new file mode 100644
index 0000000000..969406a9ad
--- /dev/null
+++ b/rx-angular/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "rx.angular-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rx-dom/index.d.ts b/rx-dom/index.d.ts
new file mode 100644
index 0000000000..7afc8b5dd0
--- /dev/null
+++ b/rx-dom/index.d.ts
@@ -0,0 +1,142 @@
+// Type definitions for RxJS v2.5.3
+// Project: https://github.com/Reactive-Extensions/RxJS-DOM
+// Definitions by: oliver Weichhold <https://github.com/oliverw>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference types="rx" />
+
+declare module Rx.DOM {
+    export interface AjaxSettings {
+        async?: boolean;
+        body?: string;
+        // This options does not seem to be used in the code yet
+        // contentType?: string;
+        crossDomain?: boolean;
+        headers?: any;
+        method?: string;
+        password?: string;
+        progressObserver?: Rx.Observer<any>;
+        responseType?: string;
+        url?: string;
+        user?: string;
+    }
+
+    export interface AjaxSuccessResponse {
+        response: any;
+        status: number;
+        responseType: string;
+        xhr: XMLHttpRequest;
+        originalEvent: Event;
+    }
+
+    export interface AjaxErrorResponse {
+        type: string;
+        status: number;
+        xhr: XMLHttpRequest;
+        originalEvent: Event;
+    }
+
+    export interface JsonpSettings {
+        async?: boolean;
+        jsonp?: string;
+        jsonpCallback?: string;
+        url?: string;
+    }
+
+    export interface JsonpSuccessResponse {
+        response: any;
+        status: number;
+        responseType: string;
+        originalEvent: Event;
+    }
+
+    export interface JsonpErrorResponse {
+        type: string;
+        status: number;
+        originalEvent: Event;
+    }
+
+    export interface GeolocationOptions {
+        enableHighAccuracy?: boolean;
+        timeout?: number;
+        maximumAge?: number;
+    }
+
+    // Events
+    function fromEvent<T>(element:any, eventName:string, selector?:Function, useCapture?:boolean):Rx.Observable<T>;
+
+    function ready():Rx.Observable<any>;
+
+    // Event Shortcuts
+    function blur(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<FocusEvent>;
+    function change(element: Element, selector?:Function):Rx.Observable<Event>;
+    function click(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<MouseEvent>;
+    function contextmenu(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<MouseEvent>;
+    function dblclick(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<MouseEvent>;
+    function error(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<Event>;
+    function focus(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<FocusEvent>;
+    function focusin(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<MouseEvent>;
+    function focusout(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<MouseEvent>;
+    function keydown(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<KeyboardEvent>;
+    function keypress(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<KeyboardEvent>;
+    function keyup(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<KeyboardEvent>;
+    function load(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<UIEvent>;
+    function mousedown(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<MouseEvent>;
+    function mouseenter(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<MouseEvent>;
+    function mouseleave(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<MouseEvent>;
+    function mousemove(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<MouseEvent>;
+    function mouseout(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<MouseEvent>;
+    function mouseover(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<MouseEvent>;
+    function mouseup(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<MouseEvent>;
+    function resize(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<UIEvent>;
+    function scroll(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<UIEvent>;
+    function select(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<Event>;
+    function submit(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<Event>;
+    function unload(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<Event>;
+
+    // Pointer Events
+    function pointerdown(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<PointerEvent>;
+    function pointerenter(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<PointerEvent>;
+    function pointerleave(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<PointerEvent>;
+    function pointermove(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<PointerEvent>;
+    function pointerout(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<PointerEvent>;
+    function pointerover(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<PointerEvent>;
+    function pointerup(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<PointerEvent>;
+
+    // Touch Events
+    function touchcancel(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<TouchEvent>;
+    function touchend(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<TouchEvent>;
+    function touchmove(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<TouchEvent>;
+    function touchstart(element: Element, selector?:Function, useCapture?:boolean):Rx.Observable<TouchEvent>;
+
+    // Ajax
+    function ajax(url:string):Rx.Observable<AjaxSuccessResponse | AjaxErrorResponse>;
+    function ajax(settings:AjaxSettings):Rx.Observable<AjaxSuccessResponse | AjaxErrorResponse>;
+    function get(url:string):Rx.Observable<AjaxSuccessResponse | AjaxErrorResponse>;
+    function getJSON(url:string):Rx.Observable<string>;
+    function post(url:string, body:any):Rx.Observable<AjaxSuccessResponse | AjaxErrorResponse>;
+    function jsonpRequest(url:string):Rx.Observable<string>;
+    function jsonpRequest(settings:JsonpSettings):Rx.Observable<JsonpSuccessResponse | JsonpErrorResponse>;
+
+    // Server-Sent Events
+    function fromEventSource<T>(url:string, openObservable?:Rx.Observer<T>):Rx.Observable<T>;
+
+    // Web Sockets
+    function fromWebSocket(url:string, protocol:string, openObserver?:Rx.Observer<Event>, closingObserver?:Rx.Observer<CloseEvent>):Rx.Subject<MessageEvent>;
+
+    // Web Workers
+    function fromWebWorker(url:string):Rx.Subject<string>;
+
+    // Mutation Observers
+    function fromMutationObserver(target:Node, options:MutationObserverInit):Rx.Observable<MutationEvent>;
+
+    // Geolocation
+    export module geolocation {
+        function getCurrentPosition(geolocationOptions?:GeolocationOptions):Rx.Observable<Position>;
+        function watchPosition(geolocationOptions?:GeolocationOptions):Rx.Observable<Position>;
+    }
+}
+
+declare module "rx.DOM" {
+    export default Rx.DOM;
+}
\ No newline at end of file
diff --git a/rx-dom/rx-dom-tests.ts b/rx-dom/rx-dom-tests.ts
new file mode 100644
index 0000000000..fb834ee9c6
--- /dev/null
+++ b/rx-dom/rx-dom-tests.ts
@@ -0,0 +1,4 @@
+/// <reference types="rx" />
+
+import * as Rx from 'rx';
+import * as DOM from 'rx.DOM';
\ No newline at end of file
diff --git a/rx-dom/tsconfig.json b/rx-dom/tsconfig.json
new file mode 100644
index 0000000000..1a74c1ee05
--- /dev/null
+++ b/rx-dom/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "rx-dom-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rx-jquery/index.d.ts b/rx-jquery/index.d.ts
new file mode 100644
index 0000000000..912af6f5da
--- /dev/null
+++ b/rx-jquery/index.d.ts
@@ -0,0 +1,66 @@
+// Type definitions for RxJS-jQuery
+// Project: https://github.com/Reactive-Extensions/RxJS-jQuery/
+// Definitions by: Igor Oleinikov <https://github.com/Igorbek>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="jquery"/>
+///<reference types="rx"/>
+
+interface RxJQueryAjaxResult<T> {
+	data: T;
+	textStatus: string;
+	jqXHR: JQueryXHR;
+}
+
+interface JQueryStatic {
+	ajaxAsObservable<T>(settings: JQueryAjaxSettings): Rx.Observable<RxJQueryAjaxResult<T>>;
+	getAsObservable<T>(url: string, data: any, dataType: string): Rx.Observable<RxJQueryAjaxResult<T>>;
+	getJSONAsObservable<T>(url: string, data: any): Rx.Observable<RxJQueryAjaxResult<T>>;
+	getScriptAsObservable<T>(url: string, data: any): Rx.Observable<RxJQueryAjaxResult<T>>;
+	postAsObservable<T>(url: string, data: any, dataType: string): Rx.Observable<RxJQueryAjaxResult<T>>;
+}
+
+interface JQuery {
+	onAsObservable<T extends BaseJQueryEventObject>(events: string, selector?: string, eventData?: any): Rx.Observable<T>;
+	bindAsObservable<T extends BaseJQueryEventObject>(eventType: string, eventData?: any): Rx.Observable<T>;
+	delegateAsObservable<T extends BaseJQueryEventObject>(selector: string, eventType: string, eventData?: any): Rx.Observable<T>;
+	//liveAsObservable<T extends BaseJQueryEventObject>(eventType: string, eventData?: any): Rx.Observable<T>;	// removed in jquery 1.9
+
+	changeAsObservable(eventData?: any): Rx.Observable<JQueryInputEventObject>;
+	clickAsObservable(eventData?: any): Rx.Observable<JQueryMouseEventObject>;
+	dblclickAsObservable(eventData?: any): Rx.Observable<JQueryMouseEventObject>;
+	focusAsObservable(eventData?: any): Rx.Observable<JQueryInputEventObject>;
+	focusinAsObservable(eventData?: any): Rx.Observable<JQueryInputEventObject>;
+	focusoutAsObservable(eventData?: any): Rx.Observable<JQueryInputEventObject>;
+	keydownAsObservable(eventData?: any): Rx.Observable<JQueryKeyEventObject>;
+	keyupAsObservable(eventData?: any): Rx.Observable<JQueryKeyEventObject>;
+	loadAsObservable(eventData?: any): Rx.Observable<BaseJQueryEventObject>;
+	mousedownAsObservable(eventData?: any): Rx.Observable<JQueryMouseEventObject>;
+	mouseenterAsObservable(eventData?: any): Rx.Observable<JQueryMouseEventObject>;
+	mouseleaveAsObservable(eventData?: any): Rx.Observable<JQueryMouseEventObject>;
+	mousemoveAsObservable(eventData?: any): Rx.Observable<JQueryMouseEventObject>;
+	mouseoutAsObservable(eventData?: any): Rx.Observable<JQueryMouseEventObject>;
+	mouseoverAsObservable(eventData?: any): Rx.Observable<JQueryMouseEventObject>;
+	mouseupAsObservable(eventData?: any): Rx.Observable<JQueryMouseEventObject>;
+	resizeAsObservable(eventData?: any): Rx.Observable<BaseJQueryEventObject>;
+	scrollAsObservable(eventData?: any): Rx.Observable<BaseJQueryEventObject>;
+	selectAsObservable(eventData?: any): Rx.Observable<BaseJQueryEventObject>;
+	submitAsObservable(eventData?: any): Rx.Observable<BaseJQueryEventObject>;
+	unloadAsObservable(eventData?: any): Rx.Observable<BaseJQueryEventObject>;
+	hideAsObservable(duration: number): Rx.Observable<BaseJQueryEventObject>;
+	showAsObservable(duration: number): Rx.Observable<BaseJQueryEventObject>;
+	readyAsObservable(): Rx.Observable<any>;
+	animateAsObservable(properties: any, duration: number, easing?: string): Rx.Observable<any>;
+	fadeInAsObservable(duration: number, easing?: string): Rx.Observable<any>;
+	fadeToAsObservable(duration: number, opacity: number, easing?: string): Rx.Observable<any>;
+	fadeOutAsObservable(duration: number, easing?: string): Rx.Observable<any>;
+	fadeToggleAsObservable(duration: number, easing?: string): Rx.Observable<any>;
+	slideDownAsObservable(duration: number): Rx.Observable<any>;
+	slideUpAsObservable(duration: number): Rx.Observable<any>;
+	slideToggleAsObservable(duration: number): Rx.Observable<any>;
+	toggleAsObservable(duration: number): Rx.Observable<any>;
+}
+
+declare module "rx-jquery" {
+	export = Rx;
+}
\ No newline at end of file
diff --git a/rx-jquery/rx.jquery.d.ts b/rx-jquery/rx.jquery.d.ts
deleted file mode 100644
index 0925959614..0000000000
--- a/rx-jquery/rx.jquery.d.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-// Type definitions for RxJS-jQuery
-// Project: https://github.com/Reactive-Extensions/RxJS-jQuery/
-// Definitions by: Igor Oleinikov <https://github.com/Igorbek>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../jquery/jquery.d.ts"/>
-///<reference path="../rx/rx.d.ts"/>
-
-interface RxJQueryAjaxResult<T> {
-	data: T;
-	textStatus: string;
-	jqXHR: JQueryXHR;
-}
-
-interface JQueryStatic {
-	ajaxAsObservable<T>(settings: JQueryAjaxSettings): Rx.Observable<RxJQueryAjaxResult<T>>;
-	getAsObservable<T>(url: string, data: any, dataType: string): Rx.Observable<RxJQueryAjaxResult<T>>;
-	getJSONAsObservable<T>(url: string, data: any): Rx.Observable<RxJQueryAjaxResult<T>>;
-	getScriptAsObservable<T>(url: string, data: any): Rx.Observable<RxJQueryAjaxResult<T>>;
-	postAsObservable<T>(url: string, data: any, dataType: string): Rx.Observable<RxJQueryAjaxResult<T>>;
-}
-
-interface JQuery {
-	onAsObservable<T extends BaseJQueryEventObject>(events: string, selector?: string, eventData?: any): Rx.Observable<T>;
-	bindAsObservable<T extends BaseJQueryEventObject>(eventType: string, eventData?: any): Rx.Observable<T>;
-	delegateAsObservable<T extends BaseJQueryEventObject>(selector: string, eventType: string, eventData?: any): Rx.Observable<T>;
-	//liveAsObservable<T extends BaseJQueryEventObject>(eventType: string, eventData?: any): Rx.Observable<T>;	// removed in jquery 1.9
-
-	changeAsObservable(eventData?: any): Rx.Observable<JQueryInputEventObject>;
-	clickAsObservable(eventData?: any): Rx.Observable<JQueryMouseEventObject>;
-	dblclickAsObservable(eventData?: any): Rx.Observable<JQueryMouseEventObject>;
-	focusAsObservable(eventData?: any): Rx.Observable<JQueryInputEventObject>;
-	focusinAsObservable(eventData?: any): Rx.Observable<JQueryInputEventObject>;
-	focusoutAsObservable(eventData?: any): Rx.Observable<JQueryInputEventObject>;
-	keydownAsObservable(eventData?: any): Rx.Observable<JQueryKeyEventObject>;
-	keyupAsObservable(eventData?: any): Rx.Observable<JQueryKeyEventObject>;
-	loadAsObservable(eventData?: any): Rx.Observable<BaseJQueryEventObject>;
-	mousedownAsObservable(eventData?: any): Rx.Observable<JQueryMouseEventObject>;
-	mouseenterAsObservable(eventData?: any): Rx.Observable<JQueryMouseEventObject>;
-	mouseleaveAsObservable(eventData?: any): Rx.Observable<JQueryMouseEventObject>;
-	mousemoveAsObservable(eventData?: any): Rx.Observable<JQueryMouseEventObject>;
-	mouseoutAsObservable(eventData?: any): Rx.Observable<JQueryMouseEventObject>;
-	mouseoverAsObservable(eventData?: any): Rx.Observable<JQueryMouseEventObject>;
-	mouseupAsObservable(eventData?: any): Rx.Observable<JQueryMouseEventObject>;
-	resizeAsObservable(eventData?: any): Rx.Observable<BaseJQueryEventObject>;
-	scrollAsObservable(eventData?: any): Rx.Observable<BaseJQueryEventObject>;
-	selectAsObservable(eventData?: any): Rx.Observable<BaseJQueryEventObject>;
-	submitAsObservable(eventData?: any): Rx.Observable<BaseJQueryEventObject>;
-	unloadAsObservable(eventData?: any): Rx.Observable<BaseJQueryEventObject>;
-	hideAsObservable(duration: number): Rx.Observable<BaseJQueryEventObject>;
-	showAsObservable(duration: number): Rx.Observable<BaseJQueryEventObject>;
-	readyAsObservable(): Rx.Observable<any>;
-	animateAsObservable(properties: any, duration: number, easing?: string): Rx.Observable<any>;
-	fadeInAsObservable(duration: number, easing?: string): Rx.Observable<any>;
-	fadeToAsObservable(duration: number, opacity: number, easing?: string): Rx.Observable<any>;
-	fadeOutAsObservable(duration: number, easing?: string): Rx.Observable<any>;
-	fadeToggleAsObservable(duration: number, easing?: string): Rx.Observable<any>;
-	slideDownAsObservable(duration: number): Rx.Observable<any>;
-	slideUpAsObservable(duration: number): Rx.Observable<any>;
-	slideToggleAsObservable(duration: number): Rx.Observable<any>;
-	toggleAsObservable(duration: number): Rx.Observable<any>;
-}
-
-declare module "rx.jquery" {
-	export = Rx;
-}
\ No newline at end of file
diff --git a/rx-jquery/tsconfig.json b/rx-jquery/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/rx-jquery/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/rx/rx.d.ts b/rx/index.d.ts
similarity index 100%
rename from rx/rx.d.ts
rename to rx/index.d.ts
diff --git a/rx/rx-lite-tests.ts b/rx/rx-lite-tests.ts
index 9949fa2ea8..a914ccac97 100644
--- a/rx/rx-lite-tests.ts
+++ b/rx/rx-lite-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="rx-lite.d.ts" />
+
 function test_scan() {
 
 	/* Without a seed */
diff --git a/rx/rx-lite.d.ts b/rx/rx-lite.d.ts
index ce7a2c6ea7..3a4ee18450 100644
--- a/rx/rx-lite.d.ts
+++ b/rx/rx-lite.d.ts
@@ -269,7 +269,9 @@ declare namespace Rx {
 		concatMap<T2, R>(selector: (value: T, index: number) => IPromise<T2>, resultSelector: (value1: T, value2: T2, index: number) => R): Observable<R>;	// alias for selectConcat
 		concatMap<R>(selector: (value: T, index: number) => Observable<R>): Observable<R>;	// alias for selectConcat
 		concatMap<R>(selector: (value: T, index: number) => IPromise<R>): Observable<R>;	// alias for selectConcat
+		concatMap<R>(selector: (value: T, index: number) => R[]): Observable<R>;	// alias for selectConcat
 		concatMap<R>(sequence: Observable<R>): Observable<R>;	// alias for selectConcat
+		concatMap<R>(sequence: R[]): Observable<R>;	// alias for selectConcat
 		merge(maxConcurrent: number): T;
 		merge(other: Observable<T>): Observable<T>;
 		merge(other: IPromise<T>): Observable<T>;
@@ -572,10 +574,12 @@ declare namespace Rx {
 		catchError<T>(...sources: Observable<T>[]): Observable<T>;	// alias for catch
 		catchError<T>(...sources: IPromise<T>[]): Observable<T>;	// alias for catch
 
+		combineLatest<T, T2>(first: Observable<T>, second: Observable<T2>): Observable<[T, T2]>;
 		combineLatest<T, T2, TResult>(first: Observable<T>, second: Observable<T2>, resultSelector: (v1: T, v2: T2) => TResult): Observable<TResult>;
 		combineLatest<T, T2, TResult>(first: IPromise<T>, second: Observable<T2>, resultSelector: (v1: T, v2: T2) => TResult): Observable<TResult>;
 		combineLatest<T, T2, TResult>(first: Observable<T>, second: IPromise<T2>, resultSelector: (v1: T, v2: T2) => TResult): Observable<TResult>;
 		combineLatest<T, T2, TResult>(first: IPromise<T>, second: IPromise<T2>, resultSelector: (v1: T, v2: T2) => TResult): Observable<TResult>;
+		combineLatest<T, T2, T3>(first: Observable<T>, second: Observable<T2>, third: Observable<T3>): Observable<[T, T2, T3]>;
 		combineLatest<T, T2, T3, TResult>(first: Observable<T>, second: Observable<T2>, third: Observable<T3>, resultSelector: (v1: T, v2: T2, v3: T3) => TResult): Observable<TResult>;
 		combineLatest<T, T2, T3, TResult>(first: Observable<T>, second: Observable<T2>, third: IPromise<T3>, resultSelector: (v1: T, v2: T2, v3: T3) => TResult): Observable<TResult>;
 		combineLatest<T, T2, T3, TResult>(first: Observable<T>, second: IPromise<T2>, third: Observable<T3>, resultSelector: (v1: T, v2: T2, v3: T3) => TResult): Observable<TResult>;
@@ -584,6 +588,7 @@ declare namespace Rx {
 		combineLatest<T, T2, T3, TResult>(first: IPromise<T>, second: Observable<T2>, third: IPromise<T3>, resultSelector: (v1: T, v2: T2, v3: T3) => TResult): Observable<TResult>;
 		combineLatest<T, T2, T3, TResult>(first: IPromise<T>, second: IPromise<T2>, third: Observable<T3>, resultSelector: (v1: T, v2: T2, v3: T3) => TResult): Observable<TResult>;
 		combineLatest<T, T2, T3, TResult>(first: IPromise<T>, second: IPromise<T2>, third: IPromise<T3>, resultSelector: (v1: T, v2: T2, v3: T3) => TResult): Observable<TResult>;
+		combineLatest<T, T2, T3, T4>(first: Observable<T>, second: Observable<T2>, third: Observable<T3>, fourth: Observable<T4>): Observable<[T, T2, T3, T4]>;
 		combineLatest<T, T2, T3, T4, TResult>(first: Observable<T>, second: Observable<T2>, third: Observable<T3>, fourth: Observable<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
 		combineLatest<T, T2, T3, T4, TResult>(first: Observable<T>, second: Observable<T2>, third: Observable<T3>, fourth: IPromise<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
 		combineLatest<T, T2, T3, T4, TResult>(first: Observable<T>, second: Observable<T2>, third: IPromise<T3>, fourth: Observable<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
@@ -600,9 +605,11 @@ declare namespace Rx {
 		combineLatest<T, T2, T3, T4, TResult>(first: IPromise<T>, second: IPromise<T2>, third: Observable<T3>, fourth: IPromise<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
 		combineLatest<T, T2, T3, T4, TResult>(first: IPromise<T>, second: IPromise<T2>, third: IPromise<T3>, fourth: Observable<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
 		combineLatest<T, T2, T3, T4, TResult>(first: IPromise<T>, second: IPromise<T2>, third: IPromise<T3>, fourth: IPromise<T4>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4) => TResult): Observable<TResult>;
+		combineLatest<T, T2, T3, T4, T5>(first: Observable<T>, second: Observable<T2>, third: Observable<T3>, fourth: Observable<T4>, fifth: Observable<T5>): Observable<[T, T2, T3, T4, T5]>;
 		combineLatest<T, T2, T3, T4, T5, TResult>(first: Observable<T>, second: Observable<T2>, third: Observable<T3>, fourth: Observable<T4>, fifth: Observable<T5>, resultSelector: (v1: T, v2: T2, v3: T3, v4: T4, v5: T5) => TResult): Observable<TResult>;
-		combineLatest<TOther, TResult>(souces: Observable<TOther>[], resultSelector: (...otherValues: TOther[]) => TResult): Observable<TResult>;
-		combineLatest<TOther, TResult>(souces: IPromise<TOther>[], resultSelector: (...otherValues: TOther[]) => TResult): Observable<TResult>;
+		combineLatest<T>(sources: Observable<T>[]): Observable<T[]>;
+		combineLatest<TOther, TResult>(sources: Observable<TOther>[], resultSelector: (...otherValues: TOther[]) => TResult): Observable<TResult>;
+		combineLatest<TOther, TResult>(sources: IPromise<TOther>[], resultSelector: (...otherValues: TOther[]) => TResult): Observable<TResult>;
 
 		withLatestFrom<T, T2, TResult>(first: Observable<T>, second: Observable<T2>, resultSelector: (v1: T, v2: T2) => TResult): Observable<TResult>;
 		withLatestFrom<T, T2, TResult>(first: IPromise<T>, second: Observable<T2>, resultSelector: (v1: T, v2: T2) => TResult): Observable<TResult>;
diff --git a/rx/rx.all.d.ts b/rx/rx.all.d.ts
index 2929cbb5ef..52f66882e4 100644
--- a/rx/rx.all.d.ts
+++ b/rx/rx.all.d.ts
@@ -13,7 +13,7 @@
 /// <reference path="rx.joinpatterns.d.ts"/> 
 /// <reference path="rx.virtualtime.d.ts"/> 
 /// <reference path="rx.testing.d.ts"/>
-/// <reference path="rx.backpressure.d.ts" />
+
 
 declare module "rx.all" {
 	export = Rx;
diff --git a/rx/rx.async-tests.ts b/rx/rx.async-tests.ts
index eb61432245..df5270c062 100644
--- a/rx/rx.async-tests.ts
+++ b/rx/rx.async-tests.ts
@@ -1,7 +1,7 @@
 // Tests for RxJS-Async TypeScript definitions
 // Tests by Igor Oleinikov <https://github.com/Igorbek>
 
-/// <reference path="rx.async.d.ts" />
+
 
 namespace Rx.Tests.Async {
 
diff --git a/rx/rx.coincidence-lite.d.ts b/rx/rx.coincidence-lite.d.ts
index e99eae3b4a..f754f1b38f 100644
--- a/rx/rx.coincidence-lite.d.ts
+++ b/rx/rx.coincidence-lite.d.ts
@@ -29,6 +29,6 @@ declare namespace Rx {
 		*    An array of observables. The first triggers when the predicate returns true,
 		*    and the second triggers when the predicate returns false.
 		*/
-		partition(predicate: (value: T, index: number, source: Observable<T>) => boolean, thisArg: any): Observable<T>[];
+		partition(predicate: (value: T, index: number, source: Observable<T>) => boolean, thisArg?: any): Observable<T>[];
 	}
 }
diff --git a/rx/tsconfig.json b/rx/tsconfig.json
new file mode 100644
index 0000000000..5027857158
--- /dev/null
+++ b/rx/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "rx-lite-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/s3-uploader/index.d.ts b/s3-uploader/index.d.ts
new file mode 100644
index 0000000000..166d98a663
--- /dev/null
+++ b/s3-uploader/index.d.ts
@@ -0,0 +1,67 @@
+// Type definitions for s3-uploader
+// Project: https://www.npmjs.com/package/s3-uploader
+// Definitions by: COLSA Corporation <http://www.colsa.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+//NOTE: Does require GM (https://github.com/aheckmann/gm) thus requires GraphicsMagick (http://www.graphicsmagick.org/) or ImageMagick (http://www.imagemagick.org/)
+
+export = Upload;
+
+declare namespace Upload {
+    interface S3UploaderVersion {
+        original?: boolean;
+        suffix?: string;
+        quality?: number;
+        maxWidth?: number;
+        maxHeight?: number;
+    }
+
+    interface S3UploaderOptions {
+        awsAccessKeyId?: string;
+        awsSecretAccessKey?: string;
+        awsBucketRegion?: string;
+        awsBucketPath?: string;
+        awsBucketAcl?: string;
+        awsMaxRetries?: number;
+        awsHttpTimeout?: number;
+        resizeQuality?: number;
+        returnExif?: boolean;
+        tmpDir?: string;
+        workers?: number;
+        url?: string;
+        versions?: S3UploaderVersion;
+    }
+
+    interface Meta {
+        format: string;
+        fileSize: string;
+        imageSize: imageSize;
+        orientation: string;
+        colorSpace: string;
+        compression: string;
+        quallity: string;
+    }
+
+    interface imageSize {
+        height: number;
+        width: number;
+    }
+
+    interface image {
+        etag: string;
+        format: string;
+        height: number;
+        original: boolean;
+        path: string;
+        size: string;
+        src: string;
+        url: string;
+        width: number;
+    }
+}
+
+declare class Upload {
+    public constructor(awsBucketName: string, opts: Upload.S3UploaderOptions);
+
+    public upload(src: string, opts?: Upload.S3UploaderOptions, cb?: (err: string, images: Upload.image[], meta: Upload.Meta) => void): void;
+}
diff --git a/s3-uploader/s3-uploader-tests.ts b/s3-uploader/s3-uploader-tests.ts
index 6fa0658661..6f7fdffa88 100644
--- a/s3-uploader/s3-uploader-tests.ts
+++ b/s3-uploader/s3-uploader-tests.ts
@@ -1,22 +1,22 @@
-/// <reference path="../node/node.d.ts" />
-/// <reference path="s3-uploader.d.ts" />
+/// <reference types="node" />
+
 
 //NOTE: Does require GM (https://github.com/aheckmann/gm) thus requires GraphicsMagick (http://www.graphicsmagick.org/) or ImageMagick (http://www.imagemagick.org/)
 
 import Upload = require('s3-uploader');
 
-var s3VersionOriginal: S3UploaderVersion = {
+var s3VersionOriginal = {
     original: true
 };
 
-var s3VersionHeader: S3UploaderVersion = {
+var s3VersionHeader = {
     suffix: '-header',
     quality: 100,
     maxHeight: 300,
     maxWidth: 600
 }
 
-var s3Config: S3UploaderOptions = {
+var s3Config = {
     awsAccessKeyId: 'awsKeyId',
     awsSecretAccessKey: 'awsSecretAccessKey',
     awsBucketPath: '',
diff --git a/s3-uploader/s3-uploader.d.ts b/s3-uploader/s3-uploader.d.ts
deleted file mode 100644
index 2a8e6a10d7..0000000000
--- a/s3-uploader/s3-uploader.d.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-// Type definitions for s3-uploader
-// Project: https://www.npmjs.com/package/s3-uploader
-// Definitions by: COLSA Corporation <http://www.colsa.com/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-//NOTE: Does require GM (https://github.com/aheckmann/gm) thus requires GraphicsMagick (http://www.graphicsmagick.org/) or ImageMagick (http://www.imagemagick.org/)
-
-declare module "s3-uploader" {
-    export = Upload;
-}
-interface S3UploaderVersion {
-    original?: boolean;
-    suffix?: string;
-    quality?: number;
-    maxWidth?: number;
-    maxHeight?: number;
-}
-
-interface S3UploaderOptions {
-    awsAccessKeyId?: string;
-    awsSecretAccessKey?: string;
-    awsBucketRegion?: string;
-    awsBucketPath?: string;
-    awsBucketAcl?: string;
-    awsMaxRetries?: number;
-    awsHttpTimeout?: number;
-    resizeQuality?: number;
-    returnExif?: boolean;
-    tmpDir?: string;
-    workers?: number;
-    url?: string;
-    versions?: S3UploaderVersion;
-}
-
-declare class Meta {
-    public format: string;
-    public fileSize: string;
-    public imageSize: imageSize;
-    public orientation: string;
-    public colorSpace: string;
-    public compression: string;
-    public quallity: string;
-}
-
-declare class imageSize {
-    public height: number;
-    public width: number;
-}
-
-declare class image {
-    public etag: string;
-    public format: string;
-    public height: number;
-    public original: boolean;
-    public path: string;
-    public size: string;
-    public src: string;
-    public url: string;
-    public width: number;
-}
-
-declare class Upload {
-    public constructor(awsBucketName: string, opts: S3UploaderOptions);
-
-    public upload(src: string, opts?: S3UploaderOptions, cb?: (err: string, images: image[], meta: Meta) => void): void;
-}
diff --git a/s3-uploader/tsconfig.json b/s3-uploader/tsconfig.json
new file mode 100644
index 0000000000..d14c26199c
--- /dev/null
+++ b/s3-uploader/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "s3-uploader-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/s3rver/index.d.ts b/s3rver/index.d.ts
new file mode 100644
index 0000000000..2ec50a1f84
--- /dev/null
+++ b/s3rver/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for S3rver
+// Project: https://github.com/jamhall/s3rver
+// Definitions by: David Broder-Rodgers <https://github.com/DavidBR-SW/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import * as http from "http";
+
+declare class S3rver {
+    constructor(options: S3rverOptions)
+    setPort(port: number): S3rver;
+    setHostname(hostname: string): S3rver;
+    setDirectory(directory: string): S3rver;
+    setSilent(silent: boolean): S3rver;
+    setIndexDocument(indexDocument: string): S3rver;
+    setErrorDocument(errorDocument: string): S3rver;
+    run(callback: (error: Error, hostname: string, port: number, directory: string) => void): http.Server;
+}
+
+interface S3rverOptions {
+    port?: number;
+    hostname?: string;
+    silent?: boolean;
+    indexDocument?: string;
+    errorDocument?: string;
+    directory: string;
+}
+
+export = S3rver;
diff --git a/s3rver/s3rver-tests.ts b/s3rver/s3rver-tests.ts
index d8f25f4fbe..6dd8159b72 100644
--- a/s3rver/s3rver-tests.ts
+++ b/s3rver/s3rver-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="s3rver.d.ts" />
 
 import S3rver = require('s3rver');
 
diff --git a/s3rver/s3rver.d.ts b/s3rver/s3rver.d.ts
deleted file mode 100644
index 6bb273c0f6..0000000000
--- a/s3rver/s3rver.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// Type definitions for S3rver
-// Project: https://github.com/jamhall/s3rver
-// Definitions by: David Broder-Rodgers <https://github.com/DavidBR-SW/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "s3rver" {
-    import * as http from "http";
-
-    class S3rver {
-        constructor(options: S3rverOptions)
-        setPort(port: number): S3rver;
-        setHostname(hostname: string): S3rver;
-        setDirectory(directory: string): S3rver;
-        setSilent(silent: boolean): S3rver;
-        setIndexDocument(indexDocument: string): S3rver;
-        setErrorDocument(errorDocument: string): S3rver;
-        run(callback: (error: Error, hostname: string, port: number, directory: string) => void): http.Server;
-    }
-
-    interface S3rverOptions {
-        port?: number;
-        hostname?: string;
-        silent?: boolean;
-        indexDocument?: string;
-        errorDocument?: string;
-        directory: string;
-    }
-
-    export = S3rver;
-}
diff --git a/s3rver/tsconfig.json b/s3rver/tsconfig.json
new file mode 100644
index 0000000000..a43d65e1b1
--- /dev/null
+++ b/s3rver/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "s3rver-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/safari-extension/safari-extension-content.d.ts b/safari-extension-content/index.d.ts
similarity index 100%
rename from safari-extension/safari-extension-content.d.ts
rename to safari-extension-content/index.d.ts
diff --git a/safari-extension/safari-extension-content-tests.ts b/safari-extension-content/safari-extension-content-tests.ts
similarity index 98%
rename from safari-extension/safari-extension-content-tests.ts
rename to safari-extension-content/safari-extension-content-tests.ts
index 067e90f054..2a686bce8d 100644
--- a/safari-extension/safari-extension-content-tests.ts
+++ b/safari-extension-content/safari-extension-content-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="safari-extension-content.d.ts" />
+
 
 // https://developer.apple.com/library/safari/documentation/Tools/Conceptual/SafariExtensionGuide/AddingExtensionToolbars/AddingExtensionToolbars.html#//apple_ref/doc/uid/TP40009977-CH5-SW7
 var theBody = document.body;
diff --git a/safari-extension-content/tsconfig.json b/safari-extension-content/tsconfig.json
new file mode 100644
index 0000000000..0a1dd4baf2
--- /dev/null
+++ b/safari-extension-content/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "safari-extension-content-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/safari-extension/safari-extension.d.ts b/safari-extension/index.d.ts
similarity index 100%
rename from safari-extension/safari-extension.d.ts
rename to safari-extension/index.d.ts
diff --git a/safari-extension/safari-extension-tests.ts b/safari-extension/safari-extension-tests.ts
index 0336c4411f..21a99439e5 100644
--- a/safari-extension/safari-extension-tests.ts
+++ b/safari-extension/safari-extension-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="safari-extension.d.ts" />
+
 
 // https://developer.apple.com/library/safari/documentation/Tools/Conceptual/SafariExtensionGuide/AccessingResourcesWithinYourExtensionFolder/AccessingResourcesWithinYourExtensionFolder.html#//apple_ref/doc/uid/TP40009977-CH18-SW2
 var img = document.createElement("img");
diff --git a/safari-extension/tsconfig.json b/safari-extension/tsconfig.json
new file mode 100644
index 0000000000..9176dafd5d
--- /dev/null
+++ b/safari-extension/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "safari-extension-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sammy/index.d.ts b/sammy/index.d.ts
new file mode 100644
index 0000000000..a40926195d
--- /dev/null
+++ b/sammy/index.d.ts
@@ -0,0 +1,286 @@
+// Type definitions for Sammy.js
+// Project: http://sammyjs.org/
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Oisin Grehan <https://github.com/oising>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+declare function Sammy(): Sammy.Application;
+declare function Sammy(selector: string): Sammy.Application;
+declare function Sammy(handler: Function): Sammy.Application;
+declare function Sammy(selector: string, handler: Function): Sammy.Application;
+
+declare namespace Sammy {
+	interface SammyFunc {
+		(): Sammy.Application;
+		(selector: string): Sammy.Application;
+		(handler: Function): Sammy.Application;
+		(selector: string, handler: Function): Sammy.Application;
+	}
+
+	export function Cache(app, options);
+    export function DataCacheProxy(initial, $element);
+    export var DataLocationProxy:DataLocationProxy;
+    export function DefaultLocationProxy(app, run_interval_every);
+    export function EJS(app, method_alias);
+
+    export function Exceptional(app, errorReporter);
+    export function Flash(app);
+    export var FormBuilder: FormBuilder;
+    export function Form(app); // formFor ( name, object, content_callback )
+
+    export function Haml(app, method_alias);
+    export function Handlebars(app, method_alias);
+    export function Hogan(app, method_alias);
+    export function Hoptoad(app, errorReporter);
+    export function JSON(app);
+    export function Meld(app, method_alias);
+    export function MemoryCacheProxy(initial);
+    export function Mustache(app, method_alias);
+    export function NestedParams(app);
+    export function OAuth2(app);
+    export function PathLocationProxy(app);
+    export function Pure(app, method_alias);
+    export function PushLocationProxy(app);
+    export function Session(app, options);
+    export function Storage(app);
+    export var Store: Store;
+
+    export function Title();
+    export function Template(app, method_alias);
+    export function Tmpl(app, method_alias);
+    export function addLogger(logger);
+    export function log(...args:any[]);
+
+    export class Object {
+
+        constructor(obj: any);
+
+        escapeHTML(s: string): string;
+        h(s: string): string;
+
+        has(key: string): boolean;
+        join(...args: any[]): string;
+        keys(attributes_only?: boolean): string[];
+        log(...args: any[]): void;
+        toHTML(): string;
+        toHash(): any;
+        toString(include_functions?: boolean): string;
+    }
+
+    export interface Application extends Object {
+
+        ROUTE_VERBS: string[];
+        APP_EVENTS: string[];
+
+        (appFn: Function);
+
+        $element(selector?: string): JQuery;
+        after(callback: Function): Application;
+        any(verb: string, path: string, callback: Function): void;
+        around(callback: Function): Application;
+        before(callback: Function): Application;
+        before(options: any, callback: Function): Application;
+        bind(name: string, callback: Function): Application;
+        bind(name: string, data: any, callback: Function): Application;
+        bindToAllEvents(callback: Function): Application;
+        clearTemplateCache(): any;
+        contextMatchesOptions(context: any, match_options: any, positive?: boolean): boolean;
+        del(path: string, callback: Function): Application;
+        del(path: RegExp, callback: Function): Application;
+        destroy(): Application;
+        error(message: string, original_error: Error): void;
+        eventNamespace(): string;
+        get(path: string, callback: Function): Application;
+        get(path: RegExp, callback: Function): Application;
+        getLocation(): string;
+        helper(name: string, method: Function): any; // Behaviour similar to _.extend
+        helpers(extensions: any): any; // Behaviour similar to _.extend
+        isRunning(): boolean;
+        log(...params: any[]): void;
+        lookupRoute(verb: string, path: string): any;
+        mapRoutes(route_array: any[]): Application;
+        notFound(verb: string, path: string): any;
+        post(path: string, callback: Function): Application;
+        post(path: RegExp, callback: Function): Application;
+        put(path: string, callback: Function): Application;
+        put(path: RegExp, callback: Function): Application;
+        refresh(): Application;
+        routablePath(path: string): string;
+        route(verb: string, path: string, callback: Function): Application;
+        route(verb: string, path: RegExp, callback: Function): Application;
+        run(start_url?: string): Application;
+        runRoute(verb: string, path?: string, params?: any, target?: any): any;
+        send(...params: any[]);
+        setLocation(new_location: string): string;
+        setLocationProxy(new_proxy: DataLocationProxy): void;
+        swap(content: any, callback: Function): any;
+        templateCache(key: string, value: any): any;
+        toString(): string;
+        trigger(name: string, data?: any): Application;
+        unload(): Application;
+        use(...params: any[]): void;
+	last_location: string[];
+
+        // Features provided by oauth2 plugin
+        oauthorize: string;
+        requireOAuth();
+        requireOAuth(path?:string);
+        requireOAuth(callback?: Function);
+    }
+
+    export interface DataLocationProxy {
+
+        new (app, run_interval_every?): DataLocationProxy;
+        new (app, data_name, href_attribute): DataLocationProxy;
+
+        fullPath(location_obj): string;
+        bind(): void;
+        unbind(): void;
+        setLocation(new_location: string): string;
+        _startPolling(every: number): void;
+    }
+
+    export interface EventContext extends Object {
+
+        new (app, verb, path, params, target);
+
+        $element(): JQuery;
+        engineFor(engine: any): any;
+        eventNamespace(): string;
+        interpolate(content: any, data: any, engine: any, partials): EventContext;
+        json(str: any): any;
+        json(str: string): any;
+        load(location: any, options?: any, callback?: Function): any;
+        loadPartials(partials);
+        notFound(): any;
+        partial(location: string, data?: any, callback?: Function, partials?): RenderContext;
+        partials: any;
+        params: any;
+        redirect(...params: any[]): void;
+        render(location: string, data?: any, callback?: Function, partials?): RenderContext;
+        renderEach(location: any, data?: { name: string;data?:any}[],callback?: Function): RenderContext;
+        send(...params: any[]): RenderContext;
+        swap(contents: any, callback: Function): string;
+        toString(): string;
+        trigger(name: string, data?: any): EventContext;
+
+        // Provided by common sammy modules:
+        name: any;
+        title: any;
+    }
+
+    export interface FormBuilder {
+
+        new (name, object);
+
+        checkbox(keypath: string, value: any, ...attributes: any[]): string;
+        close(): string;
+        hidden(keypath: string, ...attributes: any[]): string;
+        label(keypath: string, content: any, ...attributes: any[]): string;
+        open(...attributes: any[]);
+        password(keypath: string, ...attributes: any[]): string;
+        radio(keypath: string, value: any, ...attributes: any[]): string;
+        select(keypath: string, options: any, ...attributes: any[]): string;
+        submit(...attributes: any[]): string;
+        text(keypath: string, ...attributes: any[]): string;
+        textarea(keypath: string, ...attributes: any[]): string;
+    }
+
+    export interface Form {
+        formFor(name: string, object: any, content_callback: Function): FormBuilder;
+    }
+
+    export interface GoogleAnalytics {
+
+        new (app, tracker);
+
+        noTrack();
+        track(path);
+    }
+
+    export interface Haml extends EventContext { }
+
+    export interface Handlebars extends EventContext { }
+
+    export interface Hogan extends EventContext { }
+
+    export interface JSON extends EventContext { }
+
+    export interface Mustache extends EventContext { }
+
+    export interface RenderContext extends Object {
+
+        new (event_context);
+
+        appendTo(selector: string): RenderContext;
+        collect(array: any[], callback: Function, now?: boolean): RenderContext;
+        interpolate(data: any, engine?: any, retain?: boolean): RenderContext;
+        load(location: string, options?: any, callback?: Function): RenderContext;
+        loadPartials(partials?: any): RenderContext;
+        next(content: any): void;
+        partial(location: string, callback: Function, partials): RenderContext;
+        partial(location: string, data: any, callback: Function, partials): RenderContext;
+        prependTo(selector: string): RenderContext;
+        render(callback: Function): RenderContext;
+        render(location: string, data: any): RenderContext;
+        render(location: string, callback: Function, partials?: any): RenderContext;
+        render(location: string, data: any, callback: Function): RenderContext;
+        render(location: string, data: any, callback: Function, partials: any): RenderContext;
+        renderEach(location: string, name?: string, data?: any, callback?: Function): RenderContext;
+        replace(selector: string): RenderContext;
+        send(...params: any[]): RenderContext;
+        swap(callback?: Function): RenderContext;
+        then(callback: Function): RenderContext;
+        trigger(name, data);
+        wait(): void;
+    }
+
+    export interface StoreOptions {
+        name?: string;
+        element?: string;
+        type?: string;
+        memory?: any;
+        data?: any;
+        cookie?: any;
+        local?: any;
+        session?: any;
+    }
+
+    export interface Store {
+
+        stores: any;
+
+        new (options?:any);
+
+        clear(key: string): any;
+        clearAll(): void;
+        each(callback: Function): boolean;
+        exists(key: string): boolean;
+        fetch(key: string, callback: Function): any;
+        filter(callback: Function): boolean;
+        first(callback: Function): boolean;
+        get(key: string): any;
+        isAvailable(): boolean;
+        keys(): string[];
+        load(key: string, path: string, callback: Function): void;
+        set(key: string, value: any): any;
+
+        Cookie(name, element, options);
+        Data(name, element);
+        LocalStorage(name, element);
+        Memory(name, element);
+        SessionStorage(name, element);
+        isAvailable(type);
+        Template(app, method_alias);
+	}
+}
+
+declare module "sammy" {
+    export = Sammy;
+}
+
+interface JQueryStatic {
+	sammy: Sammy.SammyFunc;
+	log: Function;
+}
diff --git a/sammyjs/sammyjs-tests.ts b/sammy/sammyjs-tests.ts
similarity index 99%
rename from sammyjs/sammyjs-tests.ts
rename to sammy/sammyjs-tests.ts
index 6a54a8019b..a15492c55a 100644
--- a/sammyjs/sammyjs-tests.ts
+++ b/sammy/sammyjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="sammyjs.d.ts" />
+
 
 function test_general() {
     // Example from homepage 
diff --git a/sammy/tsconfig.json b/sammy/tsconfig.json
new file mode 100644
index 0000000000..99a8681b2a
--- /dev/null
+++ b/sammy/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sammyjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sammyjs/sammyjs-tests.ts.tscparams b/sammyjs/sammyjs-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/sammyjs/sammyjs-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/sammyjs/sammyjs.d.ts b/sammyjs/sammyjs.d.ts
deleted file mode 100644
index 413de22b24..0000000000
--- a/sammyjs/sammyjs.d.ts
+++ /dev/null
@@ -1,286 +0,0 @@
-// Type definitions for Sammy.js
-// Project: http://sammyjs.org/
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Oisin Grehan <https://github.com/oising>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-declare function Sammy(): Sammy.Application;
-declare function Sammy(selector: string): Sammy.Application;
-declare function Sammy(handler: Function): Sammy.Application;
-declare function Sammy(selector: string, handler: Function): Sammy.Application;
-
-declare namespace Sammy {
-	interface SammyFunc {
-		(): Sammy.Application;
-		(selector: string): Sammy.Application;
-		(handler: Function): Sammy.Application;
-		(selector: string, handler: Function): Sammy.Application;
-	}
-
-	export function Cache(app, options);
-    export function DataCacheProxy(initial, $element);
-    export var DataLocationProxy:DataLocationProxy;
-    export function DefaultLocationProxy(app, run_interval_every);
-    export function EJS(app, method_alias);
-
-    export function Exceptional(app, errorReporter);
-    export function Flash(app);
-    export var FormBuilder: FormBuilder;
-    export function Form(app); // formFor ( name, object, content_callback )
-
-    export function Haml(app, method_alias);
-    export function Handlebars(app, method_alias);
-    export function Hogan(app, method_alias);
-    export function Hoptoad(app, errorReporter);
-    export function JSON(app);
-    export function Meld(app, method_alias);
-    export function MemoryCacheProxy(initial);
-    export function Mustache(app, method_alias);
-    export function NestedParams(app);
-    export function OAuth2(app);
-    export function PathLocationProxy(app);
-    export function Pure(app, method_alias);
-    export function PushLocationProxy(app);
-    export function Session(app, options);
-    export function Storage(app);
-    export var Store: Store;
-
-    export function Title();
-    export function Template(app, method_alias);
-    export function Tmpl(app, method_alias);
-    export function addLogger(logger);
-    export function log(...args:any[]);
-
-    export class Object {
-
-        constructor(obj: any);
-
-        escapeHTML(s: string): string;
-        h(s: string): string;
-
-        has(key: string): boolean;
-        join(...args: any[]): string;
-        keys(attributes_only?: boolean): string[];
-        log(...args: any[]): void;
-        toHTML(): string;
-        toHash(): any;
-        toString(include_functions?: boolean): string;
-    }
-
-    export interface Application extends Object {
-
-        ROUTE_VERBS: string[];
-        APP_EVENTS: string[];
-
-        (appFn: Function);
-
-        $element(selector?: string): JQuery;
-        after(callback: Function): Application;
-        any(verb: string, path: string, callback: Function): void;
-        around(callback: Function): Application;
-        before(callback: Function): Application;
-        before(options: any, callback: Function): Application;
-        bind(name: string, callback: Function): Application;
-        bind(name: string, data: any, callback: Function): Application;
-        bindToAllEvents(callback: Function): Application;
-        clearTemplateCache(): any;
-        contextMatchesOptions(context: any, match_options: any, positive?: boolean): boolean;
-        del(path: string, callback: Function): Application;
-        del(path: RegExp, callback: Function): Application;
-        destroy(): Application;
-        error(message: string, original_error: Error): void;
-        eventNamespace(): string;
-        get(path: string, callback: Function): Application;
-        get(path: RegExp, callback: Function): Application;
-        getLocation(): string;
-        helper(name: string, method: Function): any; // Behaviour similar to _.extend
-        helpers(extensions: any): any; // Behaviour similar to _.extend
-        isRunning(): boolean;
-        log(...params: any[]): void;
-        lookupRoute(verb: string, path: string): any;
-        mapRoutes(route_array: any[]): Application;
-        notFound(verb: string, path: string): any;
-        post(path: string, callback: Function): Application;
-        post(path: RegExp, callback: Function): Application;
-        put(path: string, callback: Function): Application;
-        put(path: RegExp, callback: Function): Application;
-        refresh(): Application;
-        routablePath(path: string): string;
-        route(verb: string, path: string, callback: Function): Application;
-        route(verb: string, path: RegExp, callback: Function): Application;
-        run(start_url?: string): Application;
-        runRoute(verb: string, path?: string, params?: any, target?: any): any;
-        send(...params: any[]);
-        setLocation(new_location: string): string;
-        setLocationProxy(new_proxy: DataLocationProxy): void;
-        swap(content: any, callback: Function): any;
-        templateCache(key: string, value: any): any;
-        toString(): string;
-        trigger(name: string, data?: any): Application;
-        unload(): Application;
-        use(...params: any[]): void;
-	last_location: string[];
-
-        // Features provided by oauth2 plugin
-        oauthorize: string;
-        requireOAuth();
-        requireOAuth(path?:string);
-        requireOAuth(callback?: Function);
-    }
-
-    export interface DataLocationProxy {
-
-        new (app, run_interval_every?): DataLocationProxy;
-        new (app, data_name, href_attribute): DataLocationProxy;
-
-        fullPath(location_obj): string;
-        bind(): void;
-        unbind(): void;
-        setLocation(new_location: string): string;
-        _startPolling(every: number): void;
-    }
-
-    export interface EventContext extends Object {
-
-        new (app, verb, path, params, target);
-
-        $element(): JQuery;
-        engineFor(engine: any): any;
-        eventNamespace(): string;
-        interpolate(content: any, data: any, engine: any, partials): EventContext;
-        json(str: any): any;
-        json(str: string): any;
-        load(location: any, options?: any, callback?: Function): any;
-        loadPartials(partials);
-        notFound(): any;
-        partial(location: string, data?: any, callback?: Function, partials?): RenderContext;
-        partials: any;
-        params: any;
-        redirect(...params: any[]): void;
-        render(location: string, data?: any, callback?: Function, partials?): RenderContext;
-        renderEach(location: any, data?: { name: string;data?:any}[],callback?: Function): RenderContext;
-        send(...params: any[]): RenderContext;
-        swap(contents: any, callback: Function): string;
-        toString(): string;
-        trigger(name: string, data?: any): EventContext;
-
-        // Provided by common sammy modules:
-        name: any;
-        title: any;
-    }
-
-    export interface FormBuilder {
-
-        new (name, object);
-
-        checkbox(keypath: string, value: any, ...attributes: any[]): string;
-        close(): string;
-        hidden(keypath: string, ...attributes: any[]): string;
-        label(keypath: string, content: any, ...attributes: any[]): string;
-        open(...attributes: any[]);
-        password(keypath: string, ...attributes: any[]): string;
-        radio(keypath: string, value: any, ...attributes: any[]): string;
-        select(keypath: string, options: any, ...attributes: any[]): string;
-        submit(...attributes: any[]): string;
-        text(keypath: string, ...attributes: any[]): string;
-        textarea(keypath: string, ...attributes: any[]): string;
-    }
-
-    export interface Form {
-        formFor(name: string, object: any, content_callback: Function): FormBuilder;
-    }
-
-    export interface GoogleAnalytics {
-
-        new (app, tracker);
-
-        noTrack();
-        track(path);
-    }
-
-    export interface Haml extends EventContext { }
-
-    export interface Handlebars extends EventContext { }
-
-    export interface Hogan extends EventContext { }
-
-    export interface JSON extends EventContext { }
-
-    export interface Mustache extends EventContext { }
-
-    export interface RenderContext extends Object {
-
-        new (event_context);
-
-        appendTo(selector: string): RenderContext;
-        collect(array: any[], callback: Function, now?: boolean): RenderContext;
-        interpolate(data: any, engine?: any, retain?: boolean): RenderContext;
-        load(location: string, options?: any, callback?: Function): RenderContext;
-        loadPartials(partials?: any): RenderContext;
-        next(content: any): void;
-        partial(location: string, callback: Function, partials): RenderContext;
-        partial(location: string, data: any, callback: Function, partials): RenderContext;
-        prependTo(selector: string): RenderContext;
-        render(callback: Function): RenderContext;
-        render(location: string, data: any): RenderContext;
-        render(location: string, callback: Function, partials?: any): RenderContext;
-        render(location: string, data: any, callback: Function): RenderContext;
-        render(location: string, data: any, callback: Function, partials: any): RenderContext;
-        renderEach(location: string, name?: string, data?: any, callback?: Function): RenderContext;
-        replace(selector: string): RenderContext;
-        send(...params: any[]): RenderContext;
-        swap(callback?: Function): RenderContext;
-        then(callback: Function): RenderContext;
-        trigger(name, data);
-        wait(): void;
-    }
-
-    export interface StoreOptions {
-        name?: string;
-        element?: string;
-        type?: string;
-        memory?: any;
-        data?: any;
-        cookie?: any;
-        local?: any;
-        session?: any;
-    }
-
-    export interface Store {
-
-        stores: any;
-
-        new (options?:any);
-
-        clear(key: string): any;
-        clearAll(): void;
-        each(callback: Function): boolean;
-        exists(key: string): boolean;
-        fetch(key: string, callback: Function): any;
-        filter(callback: Function): boolean;
-        first(callback: Function): boolean;
-        get(key: string): any;
-        isAvailable(): boolean;
-        keys(): string[];
-        load(key: string, path: string, callback: Function): void;
-        set(key: string, value: any): any;
-
-        Cookie(name, element, options);
-        Data(name, element);
-        LocalStorage(name, element);
-        Memory(name, element);
-        SessionStorage(name, element);
-        isAvailable(type);
-        Template(app, method_alias);
-	}
-}
-
-declare module "sammy" {
-    export = Sammy;
-}
-
-interface JQueryStatic {
-	sammy: Sammy.SammyFunc;
-	log: Function;
-}
diff --git a/sammyjs/sammyjs.d.ts.tscparams b/sammyjs/sammyjs.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/sammyjs/sammyjs.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/sandboxed-module/index.d.ts b/sandboxed-module/index.d.ts
new file mode 100644
index 0000000000..dac2656f3c
--- /dev/null
+++ b/sandboxed-module/index.d.ts
@@ -0,0 +1,120 @@
+// Type definitions for sandboxed-module v2.0.3
+// Project: https://github.com/felixge/node-sandboxed-module
+// Definitions by: Sven Reglitzki <https://github.com/svi3c/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+interface SandboxOptions {
+    /**
+     * An object containing moduleIds and the values to inject for them when required by the sandboxed module.
+     * This does not affect children of the sandboxed module.
+     */
+    requires?: Object;
+    /**
+     * An object of global variables to inject into the sandboxed module.
+     */
+    globals?: Object;
+    /**
+     * An object of local variables to inject into the sandboxed module.
+     */
+    locals?: Object;
+    /**
+     * An object of named functions which will transform the source code required with SandboxedModule.require.
+     * For example, CoffeeScript & istanbul support is implemented with built-in sourceTransformer functions
+     * (see #registerBuiltInSourceTransformer).
+     *
+     * A source transformer receives the source (as it's been transformed thus far) and must return the transformed
+     * source (whether it's changed or unchanged).
+     *
+     * An example source transformer to change all instances of the number "3" to "5" would look like this:
+     *
+     * SandboxedModule.require('../fixture/baz', {
+     *   sourceTransformers: {
+     *     turn3sInto5s: function(source) {
+     *       return source.replace(/3/g,'5');
+     *     }
+     *   }
+     * })
+     */
+    sourceTransformers?: Object;
+    /**
+     * If false, modules that are required by the sandboxed module will not be sandboxed. By default all modules
+     * required by the sandboxedModule will be sandboxed using the same options that were used for the original
+     * sandboxed module.
+     */
+    singleOnly?: boolean;
+    /**
+     * If false, the source transformers will not be run against modules required by the sandboxed module.
+     * By default it will take the same value as {@link SandboxOptions.singleOnly}.
+     */
+    sourceTransformersSingleOnly?: boolean;
+}
+
+declare class SandboxedModule {
+    /**
+     * See {@link SandboxOptions.requires}
+     */
+    required: Object;
+    /**
+     * See {@link SandboxOptions.globals}
+     */
+    globals: Object;
+    /**
+     * See {@link SandboxOptions.locals}
+     */
+    locals: Object;
+    /**
+     * See {@link SandboxOptions.sourceTransformers}.
+     */
+    sourceTransformers: Object;
+    /**
+     * The full path to the module.
+     */
+    filename: string;
+    /**
+     * The underlaying node.js Module instance.
+     */
+    module: string;
+    /**
+     * A getter returning the sandboxedModule.module.exports object.
+     */
+    exports: any;
+    /**
+     * Returns a new SandboxedModule where moduleId is a regular module path / id as you would normally pass into
+     * require(). The new module will be loaded in its own v8 context, but otherwise have access to the normal
+     * node.js environment.
+     *
+     * @param moduleId the ID of the module to load
+     * @param options the loading options
+     */
+    static load(moduleId: string, options?: SandboxOptions): SandboxedModule
+
+    /**
+     * Identical to {@link SandboxedModule.load()}, but returns sandboxedModule.exports directly.
+     *
+     * @param moduleId the ID of the module to require
+     * @param options the requiring options
+     */
+    static require(moduleId: string, options?: SandboxOptions): any
+    /**
+     * Sets options globally across all uses of {@link SandboxedModule.load()} and {@link SandboxedModule.require()}.
+     * This way, a commonly needed require, global, local, or sourceTransformer can be specified once across all
+     * sandboxed modules.
+     * @param options the loading and requiring default options
+     */
+    static configure(options: SandboxOptions): void
+    /**
+     * Enables a built-in source transformer by name. Currently, SandboxedModule ships with two built in source
+     * transformers:
+     *  * "coffee" - Compiles source with CoffeeScript [Enabled by default for backwards compatibility].
+     *    Be sure to run require('coffee-script').register() or require('coffee-script/register') as well.
+     *  * "istanbul" - Instruments sources via istanbul when istanbul code coverage is running.
+     *    For example, if you'd like to use SandboxedModule in conjunction with istanbul, just run
+     *    SandboxedModule.registerBuiltInSourceTransformer('istanbul').
+     * @param name The name of the built-in source transformer
+     */
+    static registerBuiltInSourceTransformer(name: String): void
+}
+
+export = SandboxedModule;
diff --git a/sandboxed-module/sandboxed-module-tests.ts b/sandboxed-module/sandboxed-module-tests.ts
index f702791780..ada25d0933 100644
--- a/sandboxed-module/sandboxed-module-tests.ts
+++ b/sandboxed-module/sandboxed-module-tests.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sven Reglitzki <https://github.com/svi3c/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="sandboxed-module.d.ts" />
 
 import SandboxedModule = require("sandboxed-module");
 
diff --git a/sandboxed-module/sandboxed-module.d.ts b/sandboxed-module/sandboxed-module.d.ts
deleted file mode 100644
index 55290cbc71..0000000000
--- a/sandboxed-module/sandboxed-module.d.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-// Type definitions for sandboxed-module v2.0.3
-// Project: https://github.com/felixge/node-sandboxed-module
-// Definitions by: Sven Reglitzki <https://github.com/svi3c/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "sandboxed-module" {
-
-    interface SandboxOptions {
-        /**
-         * An object containing moduleIds and the values to inject for them when required by the sandboxed module.
-         * This does not affect children of the sandboxed module.
-         */
-        requires?: Object;
-        /**
-         * An object of global variables to inject into the sandboxed module.
-         */
-        globals?: Object;
-        /**
-         * An object of local variables to inject into the sandboxed module.
-         */
-        locals?: Object;
-        /**
-         * An object of named functions which will transform the source code required with SandboxedModule.require.
-         * For example, CoffeeScript & istanbul support is implemented with built-in sourceTransformer functions
-         * (see #registerBuiltInSourceTransformer).
-         *
-         * A source transformer receives the source (as it's been transformed thus far) and must return the transformed
-         * source (whether it's changed or unchanged).
-         *
-         * An example source transformer to change all instances of the number "3" to "5" would look like this:
-         *
-         * SandboxedModule.require('../fixture/baz', {
-         *   sourceTransformers: {
-         *     turn3sInto5s: function(source) {
-         *       return source.replace(/3/g,'5');
-         *     }
-         *   }
-         * })
-         */
-        sourceTransformers?: Object;
-        /**
-         * If false, modules that are required by the sandboxed module will not be sandboxed. By default all modules
-         * required by the sandboxedModule will be sandboxed using the same options that were used for the original
-         * sandboxed module.
-         */
-        singleOnly?: boolean;
-        /**
-         * If false, the source transformers will not be run against modules required by the sandboxed module.
-         * By default it will take the same value as {@link SandboxOptions.singleOnly}.
-         */
-        sourceTransformersSingleOnly?: boolean;
-    }
-
-    class SandboxedModule {
-        /**
-         * See {@link SandboxOptions.requires}
-         */
-        required:Object;
-        /**
-         * See {@link SandboxOptions.globals}
-         */
-        globals:Object;
-        /**
-         * See {@link SandboxOptions.locals}
-         */
-        locals:Object;
-        /**
-         * See {@link SandboxOptions.sourceTransformers}.
-         */
-        sourceTransformers:Object;
-        /**
-         * The full path to the module.
-         */
-        filename:string;
-        /**
-         * The underlaying node.js Module instance.
-         */
-        module:string;
-        /**
-         * A getter returning the sandboxedModule.module.exports object.
-         */
-        exports:any;
-        /**
-         * Returns a new SandboxedModule where moduleId is a regular module path / id as you would normally pass into
-         * require(). The new module will be loaded in its own v8 context, but otherwise have access to the normal
-         * node.js environment.
-         *
-         * @param moduleId the ID of the module to load
-         * @param options the loading options
-         */
-        static load(moduleId:string, options?:SandboxOptions):SandboxedModule
-
-        /**
-         * Identical to {@link SandboxedModule.load()}, but returns sandboxedModule.exports directly.
-         *
-         * @param moduleId the ID of the module to require
-         * @param options the requiring options
-         */
-        static require(moduleId:string, options?:SandboxOptions):any
-        /**
-         * Sets options globally across all uses of {@link SandboxedModule.load()} and {@link SandboxedModule.require()}.
-         * This way, a commonly needed require, global, local, or sourceTransformer can be specified once across all
-         * sandboxed modules.
-         * @param options the loading and requiring default options
-         */
-        static configure(options:SandboxOptions):void
-        /**
-         * Enables a built-in source transformer by name. Currently, SandboxedModule ships with two built in source
-         * transformers:
-         *  * "coffee" - Compiles source with CoffeeScript [Enabled by default for backwards compatibility].
-         *    Be sure to run require('coffee-script').register() or require('coffee-script/register') as well.
-         *  * "istanbul" - Instruments sources via istanbul when istanbul code coverage is running.
-         *    For example, if you'd like to use SandboxedModule in conjunction with istanbul, just run
-         *    SandboxedModule.registerBuiltInSourceTransformer('istanbul').
-         * @param name The name of the built-in source transformer
-         */
-        static registerBuiltInSourceTransformer(name:String):void
-    }
-
-    export = SandboxedModule;
-}
diff --git a/sandboxed-module/tsconfig.json b/sandboxed-module/tsconfig.json
new file mode 100644
index 0000000000..ca2a7b02d0
--- /dev/null
+++ b/sandboxed-module/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sandboxed-module-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sanitize-filename/index.d.ts b/sanitize-filename/index.d.ts
new file mode 100644
index 0000000000..100764c349
--- /dev/null
+++ b/sanitize-filename/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for sanitize-filename v1.1.1
+// Project: https://github.com/parshap/node-sanitize-filename
+// Definitions by: Wim Looman <https://github.com/Nemo157>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function sanitize(filename: string, options?: sanitize.Options): string;
+
+declare namespace sanitize {
+    interface Options {
+        replacement: string;
+    }
+}
+
+export = sanitize;
diff --git a/sanitize-filename/sanitize-filename-tests.ts b/sanitize-filename/sanitize-filename-tests.ts
index 9ea38993a8..2f404c7217 100644
--- a/sanitize-filename/sanitize-filename-tests.ts
+++ b/sanitize-filename/sanitize-filename-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./sanitize-filename.d.ts" />
 
 import sanitize = require('sanitize-filename');
 
diff --git a/sanitize-filename/sanitize-filename.d.ts b/sanitize-filename/sanitize-filename.d.ts
deleted file mode 100644
index 05c53aa687..0000000000
--- a/sanitize-filename/sanitize-filename.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Type definitions for sanitize-filename v1.1.1
-// Project: https://github.com/parshap/node-sanitize-filename
-// Definitions by: Wim Looman <https://github.com/Nemo157>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "sanitize-filename" {
-	function sanitize(filename: string, options?: sanitize.Options): string;
-
-	namespace sanitize {
-		interface Options {
-			replacement: string;
-		}
-	}
-
-	export = sanitize;
-}
diff --git a/sanitize-filename/tsconfig.json b/sanitize-filename/tsconfig.json
new file mode 100644
index 0000000000..4f8d96d94a
--- /dev/null
+++ b/sanitize-filename/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sanitize-filename-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sanitize-html/index.d.ts b/sanitize-html/index.d.ts
new file mode 100644
index 0000000000..efbdd60b0c
--- /dev/null
+++ b/sanitize-html/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for sanitize-html 1.6.0
+// Project: https://github.com/punkave/sanitize-html
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+
+declare function sanitizeHtml(s: string, opts?: {
+    allowedTags?: string[];
+    allowedSchemes?: string[];
+    allowedAttributes?: { [index: string]: string[] };
+    allowedClasses?: { [index: string]: string[] };
+    transformTags?: { [index: string]: any };
+    exclusiveFilter?: {
+        [index: string]: (frame: {
+            tag: string;
+            attribs: { [index: string]: string };
+            text: string;
+            tagPosition: number;
+        }) => boolean
+    };
+
+}): string;
+
+export = sanitizeHtml;
diff --git a/sanitize-html/sanitize-html-tests.ts b/sanitize-html/sanitize-html-tests.ts
index 22811faac5..ba91d207a2 100644
--- a/sanitize-html/sanitize-html-tests.ts
+++ b/sanitize-html/sanitize-html-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="sanitize-html.d.ts" />
 
 import sanitizeHtml = require('sanitize-html');
 
diff --git a/sanitize-html/sanitize-html.d.ts b/sanitize-html/sanitize-html.d.ts
deleted file mode 100644
index e610a14f71..0000000000
--- a/sanitize-html/sanitize-html.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// Type definitions for sanitize-html 1.6.0
-// Project: https://github.com/punkave/sanitize-html
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-declare module "sanitize-html" {
-
-	function sanitizeHtml(s: string, opts?: {
-		allowedTags?: string[];
-		allowedSchemes?: string[];
-		allowedAttributes?: { [index: string]: string[] };
-		allowedClasses?: { [index: string]: string[] };
-		transformTags?: { [index: string]: any };
-		exclusiveFilter?: {
-			[index: string]: (frame: {
-				tag: string;
-				attribs: { [index: string]: string };
-				text: string;
-				tagPosition: number;
-			}) => boolean
-		};
-
-	}): string;
-
-	export = sanitizeHtml;
-}
diff --git a/sanitize-html/tsconfig.json b/sanitize-html/tsconfig.json
new file mode 100644
index 0000000000..4e7916e73c
--- /dev/null
+++ b/sanitize-html/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sanitize-html-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sanitizer/index.d.ts b/sanitizer/index.d.ts
new file mode 100644
index 0000000000..f37c8c7a77
--- /dev/null
+++ b/sanitizer/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for Sanitizer
+// Project: https://github.com/theSmaw/Caja-HTML-Sanitizer
+// Definitions by: Dave Taylor <http://davetayls.me>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export interface ISaxHandler {
+    startTag(name: string, attribs: string[], param: any): void;
+    endTag(name: string, param: any): void;
+    pcdata(text: string, param: any): void;
+    cdata(text: string, param: any): void;
+    rcdata(text: string, param: any): void;
+    comment(text: string, param: any): void;
+    startDoc(param: any): void;
+    endDoc(param: any): void;
+}
+
+export declare function escape(s: string): string;
+
+export declare function makeSaxParser(yourHandler: ISaxHandler): (...any: any[]) => any;
+
+export declare function normalizeRCData(s: string): string;
+
+export declare function sanitize(s: string): string;
+
+export declare function unescapeEntities(s: string): string;
diff --git a/sanitizer/sanitizer-tests.ts b/sanitizer/sanitizer-tests.ts
index 6a4c8982d6..e1dfd022b1 100644
--- a/sanitizer/sanitizer-tests.ts
+++ b/sanitizer/sanitizer-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="sanitizer.d.ts" />
 
 import sanitizer = require('sanitizer');
 
diff --git a/sanitizer/sanitizer.d.ts b/sanitizer/sanitizer.d.ts
deleted file mode 100644
index 4b41c44c1c..0000000000
--- a/sanitizer/sanitizer.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// Type definitions for Sanitizer
-// Project: https://github.com/theSmaw/Caja-HTML-Sanitizer
-// Definitions by: Dave Taylor <http://davetayls.me>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'sanitizer' {
-  export interface ISaxHandler {
-    startTag(name:string, attribs:string[], param:any):void;
-    endTag(name:string, param:any):void;
-    pcdata(text:string, param:any):void;
-    cdata(text:string, param:any):void;
-    rcdata(text:string, param:any):void;
-    comment(text:string, param:any):void;
-    startDoc(param:any):void;
-    endDoc(param:any):void;
-  }
-
-  export function escape(s:string):string;
-
-  export function makeSaxParser(yourHandler:ISaxHandler):(...any:any[])=>any;
-
-  export function normalizeRCData(s:string):string;
-
-  export function sanitize(s:string):string;
-
-  export function unescapeEntities(s:string):string;
-}
diff --git a/sanitizer/tsconfig.json b/sanitizer/tsconfig.json
new file mode 100644
index 0000000000..25f52b2662
--- /dev/null
+++ b/sanitizer/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sanitizer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sat/sat.d.ts b/sat/index.d.ts
similarity index 100%
rename from sat/sat.d.ts
rename to sat/index.d.ts
diff --git a/sat/sat-tests.ts b/sat/sat-tests.ts
index df453d4e9c..c3cd2ed41c 100644
--- a/sat/sat-tests.ts
+++ b/sat/sat-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="sat.d.ts" />
+
 class SatTest{
 	public vectorTest(){
 		let v1: SAT.Vector = new SAT.Vector(10, 10);
diff --git a/sat/tsconfig.json b/sat/tsconfig.json
new file mode 100644
index 0000000000..ec5a001949
--- /dev/null
+++ b/sat/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sat-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/satnav/satnav.d.ts b/satnav/index.d.ts
similarity index 100%
rename from satnav/satnav.d.ts
rename to satnav/index.d.ts
diff --git a/satnav/satnav-tests.ts b/satnav/satnav-tests.ts
index aae59ba1f5..f49570f73f 100644
--- a/satnav/satnav-tests.ts
+++ b/satnav/satnav-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="satnav.d.ts" />
+
 Satnav({})
 .navigate({
     path: 'product/{required}/?{optional}',
diff --git a/satnav/tsconfig.json b/satnav/tsconfig.json
new file mode 100644
index 0000000000..ed309ec3b9
--- /dev/null
+++ b/satnav/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "satnav-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sax/index.d.ts b/sax/index.d.ts
new file mode 100644
index 0000000000..c17ebd6928
--- /dev/null
+++ b/sax/index.d.ts
@@ -0,0 +1,91 @@
+// Type definitions for sax js
+// Project: https://github.com/isaacs/sax-js
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/// <reference types="node" />
+
+
+export declare var EVENTS: string[];
+
+interface SAXOptions {
+    trim?: boolean;
+    normalize?: boolean;
+    lowercase?: boolean;
+    xmlns?: boolean;
+    noscript?: boolean;
+    position?: boolean;
+}
+
+export interface QualifiedName {
+    name: string;
+    prefix: string;
+    local: string;
+    uri: string;
+}
+
+export interface QualifiedAttribute extends QualifiedName {
+    value: string;
+}
+
+interface BaseTag {
+    name: string;
+    isSelfClosing: boolean;
+}
+
+// Interface used when the xmlns option is set
+export interface QualifiedTag extends QualifiedName, BaseTag {
+    ns: { [key: string]: string };
+    attributes: { [key: string]: QualifiedAttribute };
+}
+
+export interface Tag extends BaseTag {
+    attributes: { [key: string]: string };
+}
+
+export declare function parser(strict: boolean, opt: SAXOptions): SAXParser;
+export declare class SAXParser {
+    constructor(strict: boolean, opt: SAXOptions);
+
+    // Methods
+    end(): void;
+    write(s: string): SAXParser;
+    resume(): SAXParser;
+    close(): SAXParser;
+    flush(): void;
+
+    // Members
+    line: number;
+    column: number;
+    error: Error;
+    position: number;
+    startTagPosition: number;
+    closed: boolean;
+    strict: boolean;
+    opt: SAXOptions;
+    tag: string;
+
+    // Events
+    onerror(e: Error): void;
+    ontext(t: string): void;
+    ondoctype(doctype: string): void;
+    onprocessinginstruction(node: { name: string; body: string }): void;
+    onopentag(tag: Tag | QualifiedTag): void;
+    onclosetag(tagName: string): void;
+    onattribute(attr: { name: string; value: string }): void;
+    oncomment(comment: string): void;
+    onopencdata(): void;
+    oncdata(cdata: string): void;
+    onclosecdata(): void;
+    onopennamespace(ns: { prefix: string; uri: string }): void;
+    onclosenamespace(ns: { prefix: string; uri: string }): void;
+    onend(): void;
+    onready(): void;
+    onscript(script: string): void;
+}
+
+import stream = require("stream");
+export declare function createStream(strict: boolean, opt: SAXOptions): SAXStream;
+export declare class SAXStream extends stream.Duplex {
+    constructor(strict: boolean, opt: SAXOptions);
+    private _parser: SAXParser;
+}
diff --git a/sax/sax-tests.ts b/sax/sax-tests.ts
index 3d347abb9b..353ead08e0 100644
--- a/sax/sax-tests.ts
+++ b/sax/sax-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../node/node.d.ts" />
-/// <reference path="./sax.d.ts" />
+/// <reference types="node" />
+
 import sax = require("sax");
 import fs = require("fs");
 
diff --git a/sax/sax.d.ts b/sax/sax.d.ts
deleted file mode 100644
index c61bf5bc08..0000000000
--- a/sax/sax.d.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-// Type definitions for sax js
-// Project: https://github.com/isaacs/sax-js
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/// <reference path="../node/node.d.ts" />
-
-declare module "sax" {
-    export var EVENTS: string[];
-
-    interface SAXOptions {
-        trim?: boolean;
-        normalize?: boolean;
-        lowercase?: boolean;
-        xmlns?: boolean;
-        noscript?: boolean;
-        position?: boolean;
-    }
-
-    export interface QualifiedName {
-        name: string;
-        prefix: string;
-        local: string;
-        uri: string;
-    }
-
-    export interface QualifiedAttribute extends QualifiedName {
-        value: string;
-    }
-
-    interface BaseTag {
-        name: string;
-        isSelfClosing: boolean;
-    }
-
-    // Interface used when the xmlns option is set
-    export interface QualifiedTag extends QualifiedName, BaseTag {
-        ns: { [key: string]: string };
-        attributes: { [key: string]: QualifiedAttribute };
-    }
-
-    export interface Tag extends BaseTag {
-        attributes: { [key: string]: string };
-    }
-
-    export function parser(strict: boolean, opt: SAXOptions): SAXParser;
-    export class SAXParser {
-        constructor(strict: boolean, opt: SAXOptions);
-
-        // Methods
-        end(): void;
-        write(s: string): SAXParser;
-        resume(): SAXParser;
-        close(): SAXParser;
-        flush(): void;
-
-        // Members
-        line: number;
-        column: number;
-        error: Error;
-        position: number;
-        startTagPosition: number;
-        closed: boolean;
-        strict: boolean;
-        opt: SAXOptions;
-        tag: string;
-
-        // Events
-        onerror(e: Error): void;
-        ontext(t: string): void;
-        ondoctype(doctype: string): void;
-        onprocessinginstruction(node: { name: string; body: string }): void;
-        onopentag(tag: Tag | QualifiedTag): void;
-        onclosetag(tagName: string): void;
-        onattribute(attr: { name: string; value: string }): void;
-        oncomment(comment: string): void;
-        onopencdata(): void;
-        oncdata(cdata: string): void;
-        onclosecdata(): void;
-        onopennamespace(ns: { prefix: string; uri: string }): void;
-        onclosenamespace(ns: { prefix: string; uri: string }): void;
-        onend(): void;
-        onready(): void;
-        onscript(script: string): void;
-    }
-
-    import stream = require("stream");
-    export function createStream(strict: boolean, opt: SAXOptions): SAXStream;
-    export class SAXStream extends stream.Duplex {
-        constructor(strict: boolean, opt: SAXOptions);
-        private _parser: SAXParser;
-    }
-}
diff --git a/sax/tsconfig.json b/sax/tsconfig.json
new file mode 100644
index 0000000000..5661003e57
--- /dev/null
+++ b/sax/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sax-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/scalike/index.d.ts b/scalike/index.d.ts
new file mode 100644
index 0000000000..1aa1c55899
--- /dev/null
+++ b/scalike/index.d.ts
@@ -0,0 +1,268 @@
+// Type definitions for scalike API
+// Project: https://github.com/ryoppy/scalike-typescript
+// Definitions by: ryoppy <https://github.com/ryoppy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = scalike;
+export as namespace scalike;
+
+declare namespace scalike {
+
+    export interface Either<A, B> {
+        value: A | B;
+        isLeft: boolean;
+        isRight: boolean;
+        left(): LeftProjection<A, B>;
+        right(): RightProjection<A, B>;
+        fold<X>(fa: (a: A) => X, fb: (b: B) => X): X;
+        swap(): Either<B, A>;
+    }
+    export function Right<A, B>(b: B): Either<A, B>;
+    export function Left<A, B>(a: A): Either<A, B>;
+    export class LeftProjection<A, B> {
+        private self;
+        constructor(self: Either<A, B>);
+        toString(): string;
+        get(): A;
+        foreach(f: (a: A) => void): void;
+        getOrElse<X extends A>(x: X): A;
+        forall(f: (a: A) => boolean): boolean;
+        exists(f: (a: A) => boolean): boolean;
+        filter(f: (a: A) => boolean): Optional<Either<A, B>>;
+        map<X>(f: (a: A) => X): Either<X | A, B>;
+        flatMap<X>(f: (a: A) => Either<X, B>): Either<X | A, B>;
+        toOptional(): Optional<A>;
+    }
+    export class RightProjection<A, B> {
+        private self;
+        constructor(self: Either<A, B>);
+        toString(): string;
+        get(): B;
+        foreach(f: (b: B) => void): void;
+        getOrElse<X extends B>(x: X): B;
+        forall(f: (b: B) => boolean): boolean;
+        exists(f: (b: B) => boolean): boolean;
+        filter(f: (b: B) => boolean): Optional<Either<A, B>>;
+        map<X>(f: (b: B) => X): Either<A, X | B>;
+        flatMap<X>(f: (a: B) => Either<A, X>): Either<A, X | B>;
+        toOptional(): Optional<B>;
+    }
+
+    export interface Optional<A> {
+        isEmpty: boolean;
+        nonEmpty: boolean;
+        get(): A;
+        getOrElse<B extends A>(a: B): A;
+        map<B>(f: (a: A) => B): Optional<B>;
+        fold<B>(ifEmpty: B, f: (a: A) => B): B;
+        flatten(): Optional<A>;
+        filter(f: (a: A) => boolean): Optional<A>;
+        contains<B extends A>(b: B): boolean;
+        exists(f: (a: A) => boolean): boolean;
+        forall(f: (a: A) => boolean): boolean;
+        flatMap<B>(f: (a: A) => Optional<B>): Optional<B>;
+        foreach(f: (a: A) => void): void;
+        orElse<B extends A>(ob: Optional<B>): Optional<A>;
+        apply1<B, C>(ob: Optional<B>, f: (a: A, b: B) => C): Optional<C>;
+        apply2<B, C, D>(ob: Optional<B>, oc: Optional<C>, f: (a: A, b: B, c: C) => D): Optional<D>;
+        chain<B>(ob: Optional<B>): OptionalBuilder1<A, B>;
+    }
+    export const None: Optional<any>;
+    export function Optional<A>(a: A): Optional<A>;
+    export function Some<A>(a: A): Optional<A>;
+    export class OptionalBuilder1<A, B> {
+        private oa;
+        private ob;
+        constructor(oa: Optional<A>, ob: Optional<B>);
+        run<C>(f: (a: A, b: B) => C): Optional<C>;
+        chain<C>(oc: Optional<C>): OptionalBuilder2<A, B, C>;
+    }
+    export class OptionalBuilder2<A, B, C> {
+        private oa;
+        private ob;
+        private oc;
+        constructor(oa: Optional<A>, ob: Optional<B>, oc: Optional<C>);
+        run<D>(f: (a: A, b: B, c: C) => D): Optional<D>;
+        chain<D>(od: Optional<D>): OptionalBuilder3<A, B, C, D>;
+    }
+    export class OptionalBuilder3<A, B, C, D> {
+        private oa;
+        private ob;
+        private oc;
+        private od;
+        constructor(oa: Optional<A>, ob: Optional<B>, oc: Optional<C>, od: Optional<D>);
+        run<E>(f: (a: A, b: B, c: C, d: D) => E): Optional<E>;
+        chain<E>(oe: Optional<E>): OptionalBuilder4<A, B, C, D, E>;
+    }
+    export class OptionalBuilder4<A, B, C, D, E> {
+        private oa;
+        private ob;
+        private oc;
+        private od;
+        private oe;
+        constructor(oa: Optional<A>, ob: Optional<B>, oc: Optional<C>, od: Optional<D>, oe: Optional<E>);
+        run<F>(f: (a: A, b: B, c: C, d: D, e: E) => F): Optional<F>;
+        chain<F>(of: Optional<F>): OptionalBuilder5<A, B, C, D, E, F>;
+    }
+    export class OptionalBuilder5<A, B, C, D, E, F> {
+        private oa;
+        private ob;
+        private oc;
+        private od;
+        private oe;
+        private of;
+        constructor(oa: Optional<A>, ob: Optional<B>, oc: Optional<C>, od: Optional<D>, oe: Optional<E>, of: Optional<F>);
+        run<G>(f: (a: A, b: B, c: C, d: D, e: E, f: F) => G): Optional<G>;
+    }
+
+    export interface Try<A> {
+        isSuccess: boolean;
+        isFailure: boolean;
+        get(): A;
+        getError(): Error;
+        fold<B>(fe: (e: Error) => B, ff: (a: A) => B): B;
+        getOrElse<B extends A>(a: B): A;
+        orElse<B extends A>(a: Try<B>): Try<A>;
+        foreach<B>(f: (a: A) => void): void;
+        flatMap<B>(f: (a: A) => Try<B>): Try<B>;
+        map<B>(f: (a: A) => B): Try<B>;
+        filter(f: (a: A) => boolean): Try<A>;
+        toOptional(): Optional<A>;
+        failed(): Try<A>;
+        transform<B>(fs: (a: A) => Try<B>, ff: (e: Error) => Try<B>): Try<B>;
+        recover<B extends A>(f: (e: Error) => Optional<Try<B>>): Try<A>;
+        apply1<B, C>(ob: Try<B>, f: (a: A, b: B) => C): Try<C>;
+        apply2<B, C, D>(ob: Try<B>, oc: Try<C>, f: (a: A, b: B, c: C) => D): Try<D>;
+        chain<B>(ob: Try<B>): TryBuilder1<A, B>;
+    }
+    export function Try<A>(f: () => A): Try<A>;
+    export function Success<A>(a: A): Try<A>;
+    export function Failure<A>(e: Error): Try<A>;
+
+    export class TryBuilder1<A, B> {
+        private oa;
+        private ob;
+        constructor(oa: Try<A>, ob: Try<B>);
+        run<C>(f: (a: A, b: B) => C): Try<C>;
+        chain<C>(oc: Try<C>): TryBuilder2<A, B, C>;
+    }
+    export class TryBuilder2<A, B, C> {
+        private oa;
+        private ob;
+        private oc;
+        constructor(oa: Try<A>, ob: Try<B>, oc: Try<C>);
+        run<D>(f: (a: A, b: B, c: C) => D): Try<D>;
+        chain<D>(od: Try<D>): TryBuilder3<A, B, C, D>;
+    }
+    export class TryBuilder3<A, B, C, D> {
+        private oa;
+        private ob;
+        private oc;
+        private od;
+        constructor(oa: Try<A>, ob: Try<B>, oc: Try<C>, od: Try<D>);
+        run<E>(f: (a: A, b: B, c: C, d: D) => E): Try<E>;
+        chain<E>(oe: Try<E>): TryBuilder4<A, B, C, D, E>;
+    }
+    export class TryBuilder4<A, B, C, D, E> {
+        private oa;
+        private ob;
+        private oc;
+        private od;
+        private oe;
+        constructor(oa: Try<A>, ob: Try<B>, oc: Try<C>, od: Try<D>, oe: Try<E>);
+        run<F>(f: (a: A, b: B, c: C, d: D, e: E) => F): Try<F>;
+        chain<F>(of: Try<F>): TryBuilder5<A, B, C, D, E, F>;
+    }
+    export class TryBuilder5<A, B, C, D, E, F> {
+        private oa;
+        private ob;
+        private oc;
+        private od;
+        private oe;
+        private of;
+        constructor(oa: Try<A>, ob: Try<B>, oc: Try<C>, od: Try<D>, oe: Try<E>, of: Try<F>);
+        run<G>(f: (a: A, b: B, c: C, d: D, e: E, f: F) => G): Try<G>;
+    }
+
+    export interface Future<A> {
+        getPromise(): Promise<A>;
+        onComplete<B>(f: (t: Try<A>) => B): void;
+        isCompleted(): boolean;
+        value(): Optional<Try<A>>;
+        failed(): Future<Error>;
+        foreach<B>(f: (a: A) => B): void;
+        transform<B>(f: (t: Try<A>) => Try<B>): Future<B>;
+        transform1<B>(fs: (a: A) => B, ff: (e: Error) => Error): Future<B>;
+        transformWith<B>(f: (t: Try<A>) => Future<B>): Future<B>;
+        map<B>(f: (a: A) => B): Future<B>;
+        flatMap<B>(f: (a: A) => Future<B>): Future<B>;
+        filter(f: (a: A) => boolean): Future<A>;
+        recover<B extends A>(f: (e: Error) => Optional<B>): Future<A>;
+        recoverWith<B extends A>(f: (e: Error) => Optional<Future<B>>): Future<A>;
+        zip<B>(fu: Future<B>): Future<[A, B]>;
+        zipWith<B, C>(fu: Future<B>, f: (a: A, b: B) => C): Future<C>;
+        fallbackTo<B extends A>(fu: Future<B>): Future<A>;
+        andThen<B>(f: (t: Try<A>) => B): Future<A>;
+        apply1<B, C>(ob: Future<B>, f: (a: A, b: B) => C): Future<C>;
+        apply2<B, C, D>(ob: Future<B>, oc: Future<C>, f: (a: A, b: B, c: C) => D): Future<D>;
+        chain<B>(ob: Future<B>): FutureBuilder1<A, B>;
+    }
+    export function Future<A>(f: Promise<A> | (() => A)): Future<A>;
+    export namespace Future {
+        function fromPromise<A>(p: Promise<A>): Future<A>;
+        function unit(): Future<void>;
+        function failed<A>(e: Error): Future<A>;
+        function successful<A>(a: A): Future<A>;
+        function fromTry<A>(t: Try<A>): Future<A>;
+        function sequence<A>(fus: Array<Future<A>>): Future<Array<A>>;
+        function firstCompletedOf<A>(fus: Array<Future<A>>): Future<A>;
+        function find<A>(fus: Array<Future<A>>, f: (a: A) => boolean): Future<Optional<A>>;
+        function foldLeft<A, B>(fu: Array<Future<A>>, zero: B, f: (b: B, a: A) => B): Future<B>;
+        function reduceLeft<A, B>(fu: Array<Future<A>>, f: (b: B, a: A) => B): Future<B>;
+        function traverse<A, B>(fu: Array<A>, f: (a: A) => Future<B>): Future<Array<B>>;
+    }
+    export class FutureBuilder1<A, B> {
+        private oa;
+        private ob;
+        constructor(oa: Future<A>, ob: Future<B>);
+        run<C>(f: (a: A, b: B) => C): Future<C>;
+        chain<C>(oc: Future<C>): FutureBuilder2<A, B, C>;
+    }
+    export class FutureBuilder2<A, B, C> {
+        private oa;
+        private ob;
+        private oc;
+        constructor(oa: Future<A>, ob: Future<B>, oc: Future<C>);
+        run<D>(f: (a: A, b: B, c: C) => D): Future<D>;
+        chain<D>(od: Future<D>): FutureBuilder3<A, B, C, D>;
+    }
+    export class FutureBuilder3<A, B, C, D> {
+        private oa;
+        private ob;
+        private oc;
+        private od;
+        constructor(oa: Future<A>, ob: Future<B>, oc: Future<C>, od: Future<D>);
+        run<E>(f: (a: A, b: B, c: C, d: D) => E): Future<E>;
+        chain<E>(oe: Future<E>): FutureBuilder4<A, B, C, D, E>;
+    }
+    export class FutureBuilder4<A, B, C, D, E> {
+        private oa;
+        private ob;
+        private oc;
+        private od;
+        private oe;
+        constructor(oa: Future<A>, ob: Future<B>, oc: Future<C>, od: Future<D>, oe: Future<E>);
+        run<F>(f: (a: A, b: B, c: C, d: D, e: E) => F): Future<F>;
+        chain<F>(of: Future<F>): FutureBuilder5<A, B, C, D, E, F>;
+    }
+    export class FutureBuilder5<A, B, C, D, E, F> {
+        private oa;
+        private ob;
+        private oc;
+        private od;
+        private oe;
+        private of;
+        constructor(oa: Future<A>, ob: Future<B>, oc: Future<C>, od: Future<D>, oe: Future<E>, of: Future<F>);
+        run<G>(f: (a: A, b: B, c: C, d: D, e: E, f: F) => G): Future<G>;
+    }
+}
diff --git a/scalike/scalike-tests.ts b/scalike/scalike-tests.ts
index 6f2057468a..f95bb91a9c 100644
--- a/scalike/scalike-tests.ts
+++ b/scalike/scalike-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="scalike.d.ts" />
+
 
 import {Optional, Some, None, Try, Right, Left, Either, Future} from "scalike";
 
diff --git a/scalike/scalike.d.ts b/scalike/scalike.d.ts
deleted file mode 100644
index 8fa1b07685..0000000000
--- a/scalike/scalike.d.ts
+++ /dev/null
@@ -1,269 +0,0 @@
-// Type definitions for scalike API
-// Project: https://github.com/ryoppy/scalike-typescript
-// Definitions by: ryoppy <https://github.com/ryoppy>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace scalike {
-
-    export interface Either<A, B> {
-        value: A | B;
-        isLeft: boolean;
-        isRight: boolean;
-        left(): LeftProjection<A, B>;
-        right(): RightProjection<A, B>;
-        fold<X>(fa: (a: A) => X, fb: (b: B) => X): X;
-        swap(): Either<B, A>;
-    }
-    export function Right<A, B>(b: B): Either<A, B>;
-    export function Left<A, B>(a: A): Either<A, B>;
-    export class LeftProjection<A, B> {
-        private self;
-        constructor(self: Either<A, B>);
-        toString(): string;
-        get(): A;
-        foreach(f: (a: A) => void): void;
-        getOrElse<X extends A>(x: X): A;
-        forall(f: (a: A) => boolean): boolean;
-        exists(f: (a: A) => boolean): boolean;
-        filter(f: (a: A) => boolean): Optional<Either<A, B>>;
-        map<X>(f: (a: A) => X): Either<X | A, B>;
-        flatMap<X>(f: (a: A) => Either<X, B>): Either<X | A, B>;
-        toOptional(): Optional<A>;
-    }
-    export class RightProjection<A, B> {
-        private self;
-        constructor(self: Either<A, B>);
-        toString(): string;
-        get(): B;
-        foreach(f: (b: B) => void): void;
-        getOrElse<X extends B>(x: X): B;
-        forall(f: (b: B) => boolean): boolean;
-        exists(f: (b: B) => boolean): boolean;
-        filter(f: (b: B) => boolean): Optional<Either<A, B>>;
-        map<X>(f: (b: B) => X): Either<A, X | B>;
-        flatMap<X>(f: (a: B) => Either<A, X>): Either<A, X | B>;
-        toOptional(): Optional<B>;
-    }
-
-    export interface Optional<A> {
-        isEmpty: boolean;
-        nonEmpty: boolean;
-        get(): A;
-        getOrElse<B extends A>(a: B): A;
-        map<B>(f: (a: A) => B): Optional<B>;
-        fold<B>(ifEmpty: B, f: (a: A) => B): B;
-        flatten(): Optional<A>;
-        filter(f: (a: A) => boolean): Optional<A>;
-        contains<B extends A>(b: B): boolean;
-        exists(f: (a: A) => boolean): boolean;
-        forall(f: (a: A) => boolean): boolean;
-        flatMap<B>(f: (a: A) => Optional<B>): Optional<B>;
-        foreach(f: (a: A) => void): void;
-        orElse<B extends A>(ob: Optional<B>): Optional<A>;
-        apply1<B, C>(ob: Optional<B>, f: (a: A, b: B) => C): Optional<C>;
-        apply2<B, C, D>(ob: Optional<B>, oc: Optional<C>, f: (a: A, b: B, c: C) => D): Optional<D>;
-        chain<B>(ob: Optional<B>): OptionalBuilder1<A, B>;
-    }
-    export const None: Optional<any>;
-    export function Optional<A>(a: A): Optional<A>;
-    export function Some<A>(a: A): Optional<A>;
-    export class OptionalBuilder1<A, B> {
-        private oa;
-        private ob;
-        constructor(oa: Optional<A>, ob: Optional<B>);
-        run<C>(f: (a: A, b: B) => C): Optional<C>;
-        chain<C>(oc: Optional<C>): OptionalBuilder2<A, B, C>;
-    }
-    export class OptionalBuilder2<A, B, C> {
-        private oa;
-        private ob;
-        private oc;
-        constructor(oa: Optional<A>, ob: Optional<B>, oc: Optional<C>);
-        run<D>(f: (a: A, b: B, c: C) => D): Optional<D>;
-        chain<D>(od: Optional<D>): OptionalBuilder3<A, B, C, D>;
-    }
-    export class OptionalBuilder3<A, B, C, D> {
-        private oa;
-        private ob;
-        private oc;
-        private od;
-        constructor(oa: Optional<A>, ob: Optional<B>, oc: Optional<C>, od: Optional<D>);
-        run<E>(f: (a: A, b: B, c: C, d: D) => E): Optional<E>;
-        chain<E>(oe: Optional<E>): OptionalBuilder4<A, B, C, D, E>;
-    }
-    export class OptionalBuilder4<A, B, C, D, E> {
-        private oa;
-        private ob;
-        private oc;
-        private od;
-        private oe;
-        constructor(oa: Optional<A>, ob: Optional<B>, oc: Optional<C>, od: Optional<D>, oe: Optional<E>);
-        run<F>(f: (a: A, b: B, c: C, d: D, e: E) => F): Optional<F>;
-        chain<F>(of: Optional<F>): OptionalBuilder5<A, B, C, D, E, F>;
-    }
-    export class OptionalBuilder5<A, B, C, D, E, F> {
-        private oa;
-        private ob;
-        private oc;
-        private od;
-        private oe;
-        private of;
-        constructor(oa: Optional<A>, ob: Optional<B>, oc: Optional<C>, od: Optional<D>, oe: Optional<E>, of: Optional<F>);
-        run<G>(f: (a: A, b: B, c: C, d: D, e: E, f: F) => G): Optional<G>;
-    }
-
-    export interface Try<A> {
-        isSuccess: boolean;
-        isFailure: boolean;
-        get(): A;
-        getError(): Error;
-        fold<B>(fe: (e: Error) => B, ff: (a: A) => B): B;
-        getOrElse<B extends A>(a: B): A;
-        orElse<B extends A>(a: Try<B>): Try<A>;
-        foreach<B>(f: (a: A) => void): void;
-        flatMap<B>(f: (a: A) => Try<B>): Try<B>;
-        map<B>(f: (a: A) => B): Try<B>;
-        filter(f: (a: A) => boolean): Try<A>;
-        toOptional(): Optional<A>;
-        failed(): Try<A>;
-        transform<B>(fs: (a: A) => Try<B>, ff: (e: Error) => Try<B>): Try<B>;
-        recover<B extends A>(f: (e: Error) => Optional<Try<B>>): Try<A>;
-        apply1<B, C>(ob: Try<B>, f: (a: A, b: B) => C): Try<C>;
-        apply2<B, C, D>(ob: Try<B>, oc: Try<C>, f: (a: A, b: B, c: C) => D): Try<D>;
-        chain<B>(ob: Try<B>): TryBuilder1<A, B>;
-    }
-    export function Try<A>(f: () => A): Try<A>;
-    export function Success<A>(a: A): Try<A>;
-    export function Failure<A>(e: Error): Try<A>;
-
-    export class TryBuilder1<A, B> {
-        private oa;
-        private ob;
-        constructor(oa: Try<A>, ob: Try<B>);
-        run<C>(f: (a: A, b: B) => C): Try<C>;
-        chain<C>(oc: Try<C>): TryBuilder2<A, B, C>;
-    }
-    export class TryBuilder2<A, B, C> {
-        private oa;
-        private ob;
-        private oc;
-        constructor(oa: Try<A>, ob: Try<B>, oc: Try<C>);
-        run<D>(f: (a: A, b: B, c: C) => D): Try<D>;
-        chain<D>(od: Try<D>): TryBuilder3<A, B, C, D>;
-    }
-    export class TryBuilder3<A, B, C, D> {
-        private oa;
-        private ob;
-        private oc;
-        private od;
-        constructor(oa: Try<A>, ob: Try<B>, oc: Try<C>, od: Try<D>);
-        run<E>(f: (a: A, b: B, c: C, d: D) => E): Try<E>;
-        chain<E>(oe: Try<E>): TryBuilder4<A, B, C, D, E>;
-    }
-    export class TryBuilder4<A, B, C, D, E> {
-        private oa;
-        private ob;
-        private oc;
-        private od;
-        private oe;
-        constructor(oa: Try<A>, ob: Try<B>, oc: Try<C>, od: Try<D>, oe: Try<E>);
-        run<F>(f: (a: A, b: B, c: C, d: D, e: E) => F): Try<F>;
-        chain<F>(of: Try<F>): TryBuilder5<A, B, C, D, E, F>;
-    }
-    export class TryBuilder5<A, B, C, D, E, F> {
-        private oa;
-        private ob;
-        private oc;
-        private od;
-        private oe;
-        private of;
-        constructor(oa: Try<A>, ob: Try<B>, oc: Try<C>, od: Try<D>, oe: Try<E>, of: Try<F>);
-        run<G>(f: (a: A, b: B, c: C, d: D, e: E, f: F) => G): Try<G>;
-    }
-
-    export interface Future<A> {
-        getPromise(): Promise<A>;
-        onComplete<B>(f: (t: Try<A>) => B): void;
-        isCompleted(): boolean;
-        value(): Optional<Try<A>>;
-        failed(): Future<Error>;
-        foreach<B>(f: (a: A) => B): void;
-        transform<B>(f: (t: Try<A>) => Try<B>): Future<B>;
-        transform1<B>(fs: (a: A) => B, ff: (e: Error) => Error): Future<B>;
-        transformWith<B>(f: (t: Try<A>) => Future<B>): Future<B>;
-        map<B>(f: (a: A) => B): Future<B>;
-        flatMap<B>(f: (a: A) => Future<B>): Future<B>;
-        filter(f: (a: A) => boolean): Future<A>;
-        recover<B extends A>(f: (e: Error) => Optional<B>): Future<A>;
-        recoverWith<B extends A>(f: (e: Error) => Optional<Future<B>>): Future<A>;
-        zip<B>(fu: Future<B>): Future<[A, B]>;
-        zipWith<B, C>(fu: Future<B>, f: (a: A, b: B) => C): Future<C>;
-        fallbackTo<B extends A>(fu: Future<B>): Future<A>;
-        andThen<B>(f: (t: Try<A>) => B): Future<A>;
-        apply1<B, C>(ob: Future<B>, f: (a: A, b: B) => C): Future<C>;
-        apply2<B, C, D>(ob: Future<B>, oc: Future<C>, f: (a: A, b: B, c: C) => D): Future<D>;
-        chain<B>(ob: Future<B>): FutureBuilder1<A, B>;
-    }
-    export function Future<A>(f: Promise<A> | (() => A)): Future<A>;
-    export namespace Future {
-        function fromPromise<A>(p: Promise<A>): Future<A>;
-        function unit(): Future<void>;
-        function failed<A>(e: Error): Future<A>;
-        function successful<A>(a: A): Future<A>;
-        function fromTry<A>(t: Try<A>): Future<A>;
-        function sequence<A>(fus: Array<Future<A>>): Future<Array<A>>;
-        function firstCompletedOf<A>(fus: Array<Future<A>>): Future<A>;
-        function find<A>(fus: Array<Future<A>>, f: (a: A) => boolean): Future<Optional<A>>;
-        function foldLeft<A, B>(fu: Array<Future<A>>, zero: B, f: (b: B, a: A) => B): Future<B>;
-        function reduceLeft<A, B>(fu: Array<Future<A>>, f: (b: B, a: A) => B): Future<B>;
-        function traverse<A, B>(fu: Array<A>, f: (a: A) => Future<B>): Future<Array<B>>;
-    }
-    export class FutureBuilder1<A, B> {
-        private oa;
-        private ob;
-        constructor(oa: Future<A>, ob: Future<B>);
-        run<C>(f: (a: A, b: B) => C): Future<C>;
-        chain<C>(oc: Future<C>): FutureBuilder2<A, B, C>;
-    }
-    export class FutureBuilder2<A, B, C> {
-        private oa;
-        private ob;
-        private oc;
-        constructor(oa: Future<A>, ob: Future<B>, oc: Future<C>);
-        run<D>(f: (a: A, b: B, c: C) => D): Future<D>;
-        chain<D>(od: Future<D>): FutureBuilder3<A, B, C, D>;
-    }
-    export class FutureBuilder3<A, B, C, D> {
-        private oa;
-        private ob;
-        private oc;
-        private od;
-        constructor(oa: Future<A>, ob: Future<B>, oc: Future<C>, od: Future<D>);
-        run<E>(f: (a: A, b: B, c: C, d: D) => E): Future<E>;
-        chain<E>(oe: Future<E>): FutureBuilder4<A, B, C, D, E>;
-    }
-    export class FutureBuilder4<A, B, C, D, E> {
-        private oa;
-        private ob;
-        private oc;
-        private od;
-        private oe;
-        constructor(oa: Future<A>, ob: Future<B>, oc: Future<C>, od: Future<D>, oe: Future<E>);
-        run<F>(f: (a: A, b: B, c: C, d: D, e: E) => F): Future<F>;
-        chain<F>(of: Future<F>): FutureBuilder5<A, B, C, D, E, F>;
-    }
-    export class FutureBuilder5<A, B, C, D, E, F> {
-        private oa;
-        private ob;
-        private oc;
-        private od;
-        private oe;
-        private of;
-        constructor(oa: Future<A>, ob: Future<B>, oc: Future<C>, od: Future<D>, oe: Future<E>, of: Future<F>);
-        run<G>(f: (a: A, b: B, c: C, d: D, e: E, f: F) => G): Future<G>;
-    }
-}
-
-declare module "scalike" {
-    export = scalike
-}
diff --git a/scalike/tsconfig.json b/scalike/tsconfig.json
new file mode 100644
index 0000000000..2b23d592a2
--- /dev/null
+++ b/scalike/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "scalike-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/screenfull/screenfull.d.ts b/screenfull/index.d.ts
similarity index 100%
rename from screenfull/screenfull.d.ts
rename to screenfull/index.d.ts
diff --git a/screenfull/screenfull-tests.ts b/screenfull/screenfull-tests.ts
index b4cc17421e..125cbbaf50 100644
--- a/screenfull/screenfull-tests.ts
+++ b/screenfull/screenfull-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="screenfull.d.ts" />
+
 
 function test_fullscreen_page() {
   if (screenfull.enabled) {
diff --git a/screenfull/tsconfig.json b/screenfull/tsconfig.json
new file mode 100644
index 0000000000..9d913333ae
--- /dev/null
+++ b/screenfull/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "screenfull-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/scripts/delete-tscparams.ts b/scripts/delete-tscparams.ts
new file mode 100644
index 0000000000..49bfef899c
--- /dev/null
+++ b/scripts/delete-tscparams.ts
@@ -0,0 +1,40 @@
+/// <reference types="node" />
+
+import * as fs from 'fs';
+import * as path from 'path';
+
+const home = path.join(__dirname, '..');
+
+function forEachTypingDir(callback: (fullPath: string, dirName: string) => void) {
+	fs.readdir(home, (err, dirs) => {
+		if (err) throw err;
+		for (const dir of dirs) {
+			const fullPath = path.join(home, dir);
+			fs.lstat(fullPath, (err, stats) => {
+				if (err) throw err;			
+				if (stats.isDirectory()) {
+					callback(fullPath, dir);
+				}
+			});
+		}
+	});
+}
+
+forEachTypingDir(typingPath => {
+	fs.readdir(typingPath, (err, files) => {
+		if(err) throw err;
+		for(const file of files) {
+			if (/tscparams$/.test(file)) {
+				const fullPath = path.join(typingPath, file);
+
+				fs.readFile(fullPath, 'utf-8', (err, paramText) => {
+					if(err) throw err;
+
+					if (paramText.length <= 2) {
+						fs.unlink(fullPath);
+					}
+				});
+			}
+		}
+	});
+});
diff --git a/scripts/fix-reference-comments.ts b/scripts/fix-reference-comments.ts
new file mode 100644
index 0000000000..ca2a18238b
--- /dev/null
+++ b/scripts/fix-reference-comments.ts
@@ -0,0 +1,50 @@
+/// <reference types="node" />
+
+import * as fs from 'fs';
+import * as path from 'path';
+
+const home = path.join(__dirname, '..');
+
+function forEachTypingDir(callback: (fullPath: string, dirName: string) => void) {
+	fs.readdir(home, (err, dirs) => {
+		if (err) throw err;
+		for (const dir of dirs) {
+			const fullPath = path.join(home, dir);
+			fs.lstat(fullPath, (err, stats) => {
+				if (err) throw err;
+				if (stats.isDirectory()) {
+					callback(fullPath, dir);
+				}
+			});
+		}
+	});
+}
+
+const referenceRegex = /^\/\/\/\s?\<reference path=["'](.*)["'] \/\>(\s*)$/gm;
+
+forEachTypingDir(typingPath => {
+	fs.readdir(typingPath, (err, files) => {
+		if (err) throw err;
+		for (const file of files) {
+			if (/\.ts(x?)$/.test(file)) {
+				const fullPath = path.join(typingPath, file);
+
+				console.log('Read ' + fullPath);
+				let fileContent = fs.readFileSync(fullPath, 'utf-8');
+				let match = referenceRegex.exec(fileContent);
+				while(match !== null) {
+					const referand = match[1];
+					const referandFullPath = path.join(path.dirname(fullPath), referand);
+					if (!fs.existsSync(referandFullPath)) {
+						console.log(`${fullPath} references missing file ${referandFullPath}`);
+						fileContent = fileContent.replace(match[0], '');
+						fs.writeFileSync(fullPath, fileContent, 'utf-8');
+					}
+
+					match = referenceRegex.exec(fileContent);
+
+				}
+			}
+		}
+	});
+});
diff --git a/scripts/generate-tsconfigs.ts b/scripts/generate-tsconfigs.ts
new file mode 100644
index 0000000000..8cdc71a295
--- /dev/null
+++ b/scripts/generate-tsconfigs.ts
@@ -0,0 +1,33 @@
+/// <reference types="node" />
+
+import * as fs from 'fs';
+import * as path from 'path';
+
+function repeat(s: string, count: number) {
+	return Array(count + 1).join(s);
+}
+
+function checkDir(home: string, count: number) {
+	fs.readdir(home, (err, dirs) => {
+		if (err) throw err;
+
+		for (const dir of dirs.map(d => path.join(home, d))) {
+			fs.lstat(dir, (err, stats) => {
+				if (err) throw err;
+				if (stats.isDirectory()) {
+					checkDir(dir, count + 1);
+					const target = path.join(dir, 'tsconfig.json');
+					fs.exists(target, exists => {
+						if (exists) {
+							const old = JSON.parse(fs.readFileSync(target, 'utf-8'));
+							old['compilerOptions']['typesRoot'] = repeat('../', count);
+							fs.writeFileSync(target, JSON.stringify(old, undefined, 4));
+						}
+					});
+				}
+			});
+		}
+	});
+}
+
+checkDir(path.join(__dirname, '..'), 1);
diff --git a/scripts/rename-entry-points.ts b/scripts/rename-entry-points.ts
new file mode 100644
index 0000000000..e1ea0c51d3
--- /dev/null
+++ b/scripts/rename-entry-points.ts
@@ -0,0 +1,70 @@
+/// <reference path="../node/index.d.ts" />
+
+import * as fs from 'fs';
+import * as path from 'path';
+
+function repeat(s: string, count: number) {
+	return Array(count + 1).join(s);
+}
+
+function checkDir(home: string, count: number) {
+	fs.readdir(home, (err, dirs) => {
+		if (err) throw err;
+
+		for (const dir of dirs.map(d => path.join(home, d))) {
+			fs.lstat(dir, (err, stats) => {
+				if(dir.indexOf('.git') > 0) return;
+
+				if (err) throw err;
+				if (stats.isDirectory()) {
+					checkDir(dir, count + 1);
+					fs.readdir(dir, (err, files) => {
+						if (err) throw err;
+						const target = path.join(dir, 'tsconfig.json');
+						fs.exists(target, exists => {
+							if (exists) {
+								const old = JSON.parse(fs.readFileSync(target, 'utf-8'));
+
+								let entryPoint: string = undefined;
+								let definitionFiles = files.filter(f => (f.indexOf('.d.ts') > 0));
+								if (definitionFiles.length === 1) {
+									entryPoint = definitionFiles[0];
+								} else if(fs.existsSync(path.join(dir, 'index.d.ts'))) {
+									entryPoint = 'index.d.ts';
+								} else {
+									entryPoint = path.basename(dir) + '.d.ts';
+								}
+
+								if (!fs.existsSync(path.join(dir, entryPoint))) {
+									console.log('No file ' + entryPoint + ' exists in ' + dir + ' so deleting it');
+									fs.unlink(target);
+									return;
+								}
+
+								let testFile = path.join(dir, path.basename(dir) + '-tests.ts');
+								if (!fs.existsSync(testFile)) {
+									let onlyTest = files.filter(f => f.toLowerCase().indexOf('-tests.ts') > 0)[0];
+									if (onlyTest) {
+										testFile = path.join(dir, onlyTest);
+									} else {
+										testFile = undefined;
+									}
+								}
+								if (testFile) {
+									old['files'] = ['index.d.ts', path.basename(testFile)];
+								} else {
+									old['files'] = ['index.d.ts'];
+								}
+
+								fs.writeFileSync(target, JSON.stringify(old, undefined, 4));
+								console.log('Write to ' + target);
+							}
+						});
+					});
+				}
+			});
+		}
+	});
+}
+
+checkDir(path.join(__dirname, '..'), 1);
diff --git a/scripts/rename-proper-modules.ts b/scripts/rename-proper-modules.ts
new file mode 100644
index 0000000000..ae5179e401
--- /dev/null
+++ b/scripts/rename-proper-modules.ts
@@ -0,0 +1,18 @@
+/// <reference types="node" />
+
+import * as fs from 'fs';
+import * as path from 'path';
+
+const data = JSON.parse(fs.readFileSync(path.join(__dirname, '../../publish-typings/data/definitions.json'), 'utf-8'));
+
+Object.keys(data).forEach(libName => {
+	const libData = data[libName];
+	if(libData.kind === 'ProperModule') {
+		if (libData.definitionFilename !== 'index.d.ts') {
+			console.log(`${libName} needs renaming from ${libData.definitionFilename}`);
+			const src = path.join(__dirname, '..', libName, libData.definitionFilename);
+			const dst = path.join(__dirname, '..', libName, 'index.d.ts');
+			fs.rename(src, dst);
+		}
+	}
+});
diff --git a/scroller/scroller.d.ts b/scroller/index.d.ts
similarity index 100%
rename from scroller/scroller.d.ts
rename to scroller/index.d.ts
diff --git a/scroller/scroller-tests.ts b/scroller/scroller-tests.ts
index 6a5a29be92..a4ac515b6c 100644
--- a/scroller/scroller-tests.ts
+++ b/scroller/scroller-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="scroller.d.ts"/>
-
 var clientWidth: any;
 var clientHeight: any;
 var render: any;
diff --git a/scroller/scroller-tests.ts.tscparams b/scroller/scroller-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/scroller/scroller-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/scroller/tsconfig.json b/scroller/tsconfig.json
new file mode 100644
index 0000000000..425e46f5b6
--- /dev/null
+++ b/scroller/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "scroller-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/scrolltofixed/index.d.ts b/scrolltofixed/index.d.ts
new file mode 100644
index 0000000000..d1042c3792
--- /dev/null
+++ b/scrolltofixed/index.d.ts
@@ -0,0 +1,49 @@
+// Type definitions for ScrollToFixed
+// Project: https://github.com/bigspotteddog/ScrollToFixed
+// Definitions by: Ben Dixon <https://github.com/bmdixon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace ScrollToFixed {
+	interface ScrollToFixedOptions {
+		marginTop? : number | (() => number);
+		limit? : number | (() => number);
+		bottom?: number;
+		zIndex? : number;
+		spacerClass? : string;
+		preFixed?: () => void;
+		postFixed?: () => void;
+		fixed?: () => void;
+		unfixed?: () => void;
+		preUnfixed?: () => void;
+		postUnfixed?: () => void;
+		preAbsolute?: () => void;
+		postAbsolute?: () => void;
+		offsets? : boolean;
+		minWidth? : number;
+		maxWidth? : number;
+		dontCheckForPositionFixedSupport? : boolean;
+		dontSetWidth? : boolean;
+		removeOffsets? : boolean;
+		baseClassName?: string;
+		className?: string;
+	}
+}
+
+interface JQuery {
+    scrollToFixed : (options? : ScrollToFixed.ScrollToFixedOptions) => JQuery[];
+}
+
+interface JQueryStatic {
+	isScrollToFixed(el: Element) : JQuery;
+	isScrollToFixed(el: Element[]) : JQuery;
+	isScrollToFixed(el: {}) : JQuery;
+	isScrollToFixed(el: JQuery) : JQuery;
+
+    ScrollToFixed(el: Element, options: ScrollToFixed.ScrollToFixedOptions): void;
+	ScrollToFixed(el : Element, options : ScrollToFixed.ScrollToFixedOptions) : JQuery;
+	ScrollToFixed(el: Element[], options : ScrollToFixed.ScrollToFixedOptions) : JQuery;
+	ScrollToFixed(el: {}, options : ScrollToFixed.ScrollToFixedOptions) : JQuery;
+	ScrollToFixed(el: JQuery, options : ScrollToFixed.ScrollToFixedOptions) : JQuery;
+}
diff --git a/scrolltofixed/scrolltofixed-tests.ts b/scrolltofixed/scrolltofixed-tests.ts
index 80d67922f7..dc2f30e376 100644
--- a/scrolltofixed/scrolltofixed-tests.ts
+++ b/scrolltofixed/scrolltofixed-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="scrolltofixed.d.ts" />
+
 
 $(document).ready(function() {
   $('#mydiv').scrollToFixed();
diff --git a/scrolltofixed/scrolltofixed.d.ts b/scrolltofixed/scrolltofixed.d.ts
deleted file mode 100644
index c4199e067d..0000000000
--- a/scrolltofixed/scrolltofixed.d.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-// Type definitions for ScrollToFixed
-// Project: https://github.com/bigspotteddog/ScrollToFixed
-// Definitions by: Ben Dixon <https://github.com/bmdixon>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace ScrollToFixed {
-	interface ScrollToFixedOptions {
-		marginTop? : number | (() => number);
-		limit? : number | (() => number);
-		bottom?: number;
-		zIndex? : number;
-		spacerClass? : string;
-		preFixed?: () => void;
-		postFixed?: () => void;
-		fixed?: () => void;
-		unfixed?: () => void;
-		preUnfixed?: () => void;
-		postUnfixed?: () => void;
-		preAbsolute?: () => void;
-		postAbsolute?: () => void;
-		offsets? : boolean;
-		minWidth? : number;
-		maxWidth? : number;
-		dontCheckForPositionFixedSupport? : boolean;
-		dontSetWidth? : boolean;
-		removeOffsets? : boolean;
-		baseClassName?: string;
-		className?: string;
-	}
-}
-
-interface JQuery {
-    scrollToFixed : (options? : ScrollToFixed.ScrollToFixedOptions) => JQuery[];
-}
-
-interface JQueryStatic {
-	isScrollToFixed(el: Element) : JQuery;
-	isScrollToFixed(el: Element[]) : JQuery;
-	isScrollToFixed(el: {}) : JQuery;
-	isScrollToFixed(el: JQuery) : JQuery;
-
-    ScrollToFixed(el: Element, options: ScrollToFixed.ScrollToFixedOptions): void;
-	ScrollToFixed(el : Element, options : ScrollToFixed.ScrollToFixedOptions) : JQuery;
-	ScrollToFixed(el: Element[], options : ScrollToFixed.ScrollToFixedOptions) : JQuery;
-	ScrollToFixed(el: {}, options : ScrollToFixed.ScrollToFixedOptions) : JQuery;
-	ScrollToFixed(el: JQuery, options : ScrollToFixed.ScrollToFixedOptions) : JQuery;
-}
diff --git a/scrolltofixed/tsconfig.json b/scrolltofixed/tsconfig.json
new file mode 100644
index 0000000000..9156dc0c1a
--- /dev/null
+++ b/scrolltofixed/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "scrolltofixed-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/scrypt-async/index.d.ts b/scrypt-async/index.d.ts
new file mode 100644
index 0000000000..e4a1867a1f
--- /dev/null
+++ b/scrypt-async/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for scrypt-async v1.2.0
+// Project: https://github.com/dchest/scrypt-async-js
+// Definitions by: Kaur Kuut <https://github.com/xStrom>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace ScryptAsync {
+	interface CallbackFunc {
+		(key: string): any;
+		(key: number[]): any;
+	}
+
+	interface ScryptStatic {
+		(password: string, salt: string, logN: number, r: number, dkLen: number, interruptStep: number, callback: CallbackFunc, encoding: string): void;
+		(password: string, salt: number[], logN: number, r: number, dkLen: number, interruptStep: number, callback: CallbackFunc, encoding: string): void;
+		(password: number[], salt: string, logN: number, r: number, dkLen: number, interruptStep: number, callback: CallbackFunc, encoding: string): void;
+		(password: number[], salt: number[], logN: number, r: number, dkLen: number, interruptStep: number, callback: CallbackFunc, encoding: string): void;
+
+		(password: string, salt: string, logN: number, r: number, dkLen: number, interruptStep: number, callback: CallbackFunc): void;
+		(password: string, salt: number[], logN: number, r: number, dkLen: number, interruptStep: number, callback: CallbackFunc): void;
+		(password: number[], salt: string, logN: number, r: number, dkLen: number, interruptStep: number, callback: CallbackFunc): void;
+		(password: number[], salt: number[], logN: number, r: number, dkLen: number, interruptStep: number, callback: CallbackFunc): void;
+
+		(password: string, salt: string, logN: number, r: number, dkLen: number, callback: CallbackFunc, encoding: string): void;
+		(password: string, salt: number[], logN: number, r: number, dkLen: number, callback: CallbackFunc, encoding: string): void;
+		(password: number[], salt: string, logN: number, r: number, dkLen: number, callback: CallbackFunc, encoding: string): void;
+		(password: number[], salt: number[], logN: number, r: number, dkLen: number, callback: CallbackFunc, encoding: string): void;
+
+		(password: string, salt: string, logN: number, r: number, dkLen: number, callback: CallbackFunc): void;
+		(password: string, salt: number[], logN: number, r: number, dkLen: number, callback: CallbackFunc): void;
+		(password: number[], salt: string, logN: number, r: number, dkLen: number, callback: CallbackFunc): void;
+		(password: number[], salt: number[], logN: number, r: number, dkLen: number, callback: CallbackFunc): void;
+	}
+}
+
+declare var scrypt: ScryptAsync.ScryptStatic;
+
+export = scrypt;
\ No newline at end of file
diff --git a/scrypt-async/scrypt-async-tests.ts b/scrypt-async/scrypt-async-tests.ts
index 745d3ae62b..ed12c9a5e5 100644
--- a/scrypt-async/scrypt-async-tests.ts
+++ b/scrypt-async/scrypt-async-tests.ts
@@ -1,7 +1,5 @@
 // Tests by: Kaur Kuut <https://github.com/xStrom>
-
-///<reference path="scrypt-async.d.ts" />
-
+import scrypt = require("scrypt-async");
 var callback = function(key: string | number[]) { };
 
 scrypt("abc", "def", 10, 8, 32, 1000, callback, "base64");
diff --git a/scrypt-async/scrypt-async.d.ts b/scrypt-async/scrypt-async.d.ts
deleted file mode 100644
index 367e1b06c7..0000000000
--- a/scrypt-async/scrypt-async.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-// Type definitions for scrypt-async v1.2.0
-// Project: https://github.com/dchest/scrypt-async-js
-// Definitions by: Kaur Kuut <https://github.com/xStrom>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace ScryptAsync {
-	interface CallbackFunc {
-		(key: string): any;
-		(key: number[]): any;
-	}
-
-	interface ScryptStatic {
-		(password: string, salt: string, logN: number, r: number, dkLen: number, interruptStep: number, callback: CallbackFunc, encoding: string): void;
-		(password: string, salt: number[], logN: number, r: number, dkLen: number, interruptStep: number, callback: CallbackFunc, encoding: string): void;
-		(password: number[], salt: string, logN: number, r: number, dkLen: number, interruptStep: number, callback: CallbackFunc, encoding: string): void;
-		(password: number[], salt: number[], logN: number, r: number, dkLen: number, interruptStep: number, callback: CallbackFunc, encoding: string): void;
-
-		(password: string, salt: string, logN: number, r: number, dkLen: number, interruptStep: number, callback: CallbackFunc): void;
-		(password: string, salt: number[], logN: number, r: number, dkLen: number, interruptStep: number, callback: CallbackFunc): void;
-		(password: number[], salt: string, logN: number, r: number, dkLen: number, interruptStep: number, callback: CallbackFunc): void;
-		(password: number[], salt: number[], logN: number, r: number, dkLen: number, interruptStep: number, callback: CallbackFunc): void;
-
-		(password: string, salt: string, logN: number, r: number, dkLen: number, callback: CallbackFunc, encoding: string): void;
-		(password: string, salt: number[], logN: number, r: number, dkLen: number, callback: CallbackFunc, encoding: string): void;
-		(password: number[], salt: string, logN: number, r: number, dkLen: number, callback: CallbackFunc, encoding: string): void;
-		(password: number[], salt: number[], logN: number, r: number, dkLen: number, callback: CallbackFunc, encoding: string): void;
-
-		(password: string, salt: string, logN: number, r: number, dkLen: number, callback: CallbackFunc): void;
-		(password: string, salt: number[], logN: number, r: number, dkLen: number, callback: CallbackFunc): void;
-		(password: number[], salt: string, logN: number, r: number, dkLen: number, callback: CallbackFunc): void;
-		(password: number[], salt: number[], logN: number, r: number, dkLen: number, callback: CallbackFunc): void;
-	}
-}
-
-declare var scrypt: ScryptAsync.ScryptStatic;
-
-declare module "scrypt-async" {
-	export = scrypt;
-}
diff --git a/scrypt-async/tsconfig.json b/scrypt-async/tsconfig.json
new file mode 100644
index 0000000000..1fb3dab68e
--- /dev/null
+++ b/scrypt-async/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "scrypt-async-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/seedrandom/index.d.ts b/seedrandom/index.d.ts
new file mode 100644
index 0000000000..4db50058bc
--- /dev/null
+++ b/seedrandom/index.d.ts
@@ -0,0 +1,45 @@
+// Type definitions for seedrandom 2.4.2
+// Project: https://github.com/davidbau/seedrandom
+// Definitions by: Kern Handa <https://github.com/kernhanda>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace seedrandom {
+
+  export type seedrandomStateType = boolean | (() => prng);
+
+  interface prng {
+    new (seed?: string, options?: seedRandomOptions, callback?: any): prng;
+    (): number;
+    quick(): number;
+    int32(): number;
+    double(): number;
+    state(): () => prng;
+  }
+
+  interface seedrandom_prng {
+    (seed?: string, options?: seedRandomOptions, callback?: any): prng;
+    alea: (seed?: string, options?: seedRandomOptions, callback?: seedrandomCallback) => prng;
+    xor128: (seed?: string, options?: seedRandomOptions, callback?: seedrandomCallback) => prng;
+    tychei: (seed?: string, options?: seedRandomOptions, callback?: seedrandomCallback) => prng;
+    xorwow: (seed?: string, options?: seedRandomOptions, callback?: seedrandomCallback) => prng;
+    xor4096: (seed?: string, options?: seedRandomOptions, callback?: seedrandomCallback) => prng;
+    xorshift7: (seed?: string, options?: seedRandomOptions, callback?: seedrandomCallback) => prng;
+    quick: (seed?: string, options?: seedRandomOptions, callback?: seedrandomCallback) => prng;
+  }
+
+  interface seedrandomCallback {
+    (prng?: prng, shortseed?: string, global?: boolean, state?: seedrandomStateType): prng;
+  }
+
+  interface seedRandomOptions {
+    entropy?: boolean;
+    'global'?: boolean;
+    state?: seedrandomStateType;
+    pass?: seedrandomCallback;
+  }
+}
+
+declare var seedrandom: seedrandom.seedrandom_prng;
+
+export = seedrandom;
+export as namespace seedrandom;
diff --git a/seedrandom/seedrandom-tests.ts b/seedrandom/seedrandom-tests.ts
index 69a11622fa..4a40c8c5dd 100644
--- a/seedrandom/seedrandom-tests.ts
+++ b/seedrandom/seedrandom-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./seedrandom.d.ts" />
+
 
 import seedrandom = require("seedrandom");
 
diff --git a/seedrandom/seedrandom.d.ts b/seedrandom/seedrandom.d.ts
deleted file mode 100644
index c161556f7e..0000000000
--- a/seedrandom/seedrandom.d.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-// Type definitions for seedrandom 2.4.2
-// Project: https://github.com/davidbau/seedrandom
-// Definitions by: Kern Handa <https://github.com/kernhanda>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare type seedrandomStateType = boolean | (() => prng);
-
-interface prng {
-  new(seed?: string, options?: seedRandomOptions, callback?: any): prng;
-  (): number;
-  quick(): number;
-  int32(): number;
-  double(): number;
-  state(): () => prng;
-}
-
-interface seedrandom_prng {
-  (seed?: string, options?: seedRandomOptions, callback?: any): prng;
-  alea: (seed?: string, options?: seedRandomOptions, callback?: seedrandomCallback) => prng;
-  xor128: (seed?: string, options?: seedRandomOptions, callback?: seedrandomCallback) => prng;
-  tychei: (seed?: string, options?: seedRandomOptions, callback?: seedrandomCallback) => prng;
-  xorwow: (seed?: string, options?: seedRandomOptions, callback?: seedrandomCallback) => prng;
-  xor4096: (seed?: string, options?: seedRandomOptions, callback?: seedrandomCallback) => prng;
-  xorshift7: (seed?: string, options?: seedRandomOptions, callback?: seedrandomCallback) => prng;
-  quick: (seed?: string, options?: seedRandomOptions, callback?: seedrandomCallback) => prng;
-}
-
-interface seedrandomCallback {
-  (prng?: prng, shortseed?: string, global?: boolean, state?: seedrandomStateType): prng;
-}
-
-interface seedRandomOptions {
-  entropy?: boolean;
-  'global'?: boolean;
-  state?: seedrandomStateType;
-  pass?: seedrandomCallback;
-}
-
-declare var seedrandom: seedrandom_prng;
-
-declare module "seedrandom" {
-  export = seedrandom;
-}
diff --git a/seedrandom/tsconfig.json b/seedrandom/tsconfig.json
new file mode 100644
index 0000000000..15ebc4785d
--- /dev/null
+++ b/seedrandom/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "seedrandom-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/segment-analytics/index.d.ts b/segment-analytics/index.d.ts
new file mode 100644
index 0000000000..e27f1a67d7
--- /dev/null
+++ b/segment-analytics/index.d.ts
@@ -0,0 +1,132 @@
+// Type definitions for Segment's analytics.js
+// Project: https://segment.com/docs/libraries/analytics.js/
+// Definitions by: Andrew Fong <https://github.com/fongandrew>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace SegmentAnalytics {
+
+  // Generic options object with integrations
+  interface SegmentOpts {
+    integrations?: any;
+    anonymousId?: string;
+  }
+
+  // The actual analytics.js object
+  interface AnalyticsJS {
+
+    /* Configure Segment with write key */
+    load(writeKey: string): void;
+
+    /* The identify method is how you tie one of your users and their actions
+       to a recognizable userId and traits. */
+    identify(userId: string, traits?: Object, options?: SegmentOpts,
+             callback?: () => void): void;
+    identify(userId: string, traits: Object, callback?: () => void): void;
+    identify(userId: string, callback?: () => void): void;
+    identify(traits?: Object, options?: SegmentOpts,
+             callback?: () => void): void;
+    identify(traits?: Object, callback?: () => void): void;
+    identify(callback: () => void): void;
+
+    /* The track method lets you record any actions your users perform. */
+    track(event: string, properties?: Object, options?: SegmentOpts,
+          callback?: () => void): void;
+    track(event: string, properties?: Object,
+          callback?: () => void): void;
+    track(event: string, callback?: () => void): void;
+
+    /* The page method lets you record page views on your website, along with
+       optional extra information about the page being viewed. */
+    page(category: string, name: string, properties?: Object,
+         options?: SegmentOpts, callback?: () => void): void;
+    page(name?: string, properties?: Object,
+         options?: SegmentOpts, callback?: () => void): void;
+    page(name?: string, properties?: Object, callback?: () => void): void;
+    page(name?: string, callback?: () => void): void;
+    page(properties?: Object, options?: SegmentOpts,
+         callback?: () => void): void;
+    page(callback?: () => void): void;
+
+    /* The group method associates an individual user with a group. The group
+       can a company, organization, account, project, team or any other name
+       you came up with for the same concept. */
+    group(groupId: string, traits?: Object, options?: SegmentOpts,
+          callback?: () => void): void;
+    group(groupId: string, traits?: Object, callback?: () => void): void;
+    group(groupId: string, callback?: () => void): void;
+
+    /* The alias method combines two previously unassociated user identities.
+       This comes in handy if the same user visits from two different devices
+       and you want to combine their history.
+
+       Some providers also don’t alias automatically for you when an anonymous
+       user signs up (like Mixpanel), so you need to call alias manually right
+       after sign up with their brand new userId. */
+    alias(userId: string, previousId?: string, options?: SegmentOpts,
+          callback?: () => void): void;
+    alias(userId: string, previousId?: string, callback?: () => void): void;
+    alias(userId: string, callback?: () => void): void;
+    alias(userId: string, options?: SegmentOpts, callback?: () => void): void;
+
+    /* trackLink is a helper that binds a track call to whenever a link is
+       clicked. Usually the page would change before you could call track, but
+       with trackLink a small timeout is inserted to give the track call enough
+       time to fire. */
+    trackLink(elements: JQuery|Element[]|Element,
+              event: string|{ (elm: Element): string },
+              properties?: Object|{ (elm: Element): Object }): void;
+
+    /* trackForm is a helper that binds a track call to a form submission.
+       Usually the page would change before you could call track, but with
+       trackForm a small timeout is inserted to give the track call enough
+       time to fire. */
+    trackForm(elements: JQuery|Element[]|Element,
+              event: string|{ (elm: Element): string },
+              properties?: Object|{ (elm: Element): Object }): void;
+
+    /* The ready method allows you to pass in a callback that will be called as
+       soon as all of your enabled integrations have loaded. It’s like jQuery’s
+       ready method, except for integrations. */
+    ready(callback: () => void): void;
+
+    /* If you need to clear the user and group id and traits we’ve added a
+       reset function that is most commonly used when your identified users
+       logout of your application. */
+    reset(): void;
+
+    /* Once Analytics.js loaded, you can retrieve information about the
+       currently identified user or group like their id and traits. */
+    user(): {
+      id(): string;
+      logout(): void;
+      reset(): void;
+      anonymousId(newId?: string): string;
+      traits(newTraits?: Object): void;
+    }
+
+    group(): {
+      id(): string;
+      traits(newTraits?: Object): void;
+    }
+
+    /* Analytics.js has a debug mode that logs helpful messages to the
+       console. */
+    debug(state?: boolean): void;
+
+    /* The global analytics object emits events whenever you call alias, group,
+       identify, track or page. That way you can listen to those events and run
+       your own custom code. */
+    on(event: string,
+       callback: {
+        (event: string, properties: Object, options: SegmentOpts): void
+      }): void;
+
+    /* You can extend the length (in milliseconds) of the method callbacks and
+       helpers */
+    timeout(milliseconds: number): void;
+  }
+}
+
+declare var analytics: SegmentAnalytics.AnalyticsJS;
diff --git a/segment-analytics/segment-analytics-tests.ts b/segment-analytics/segment-analytics-tests.ts
index b876ea1bed..b4c81e7c75 100644
--- a/segment-analytics/segment-analytics-tests.ts
+++ b/segment-analytics/segment-analytics-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="segment-analytics.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+
+/// <reference types="jquery" />
 
 // Some random vals to use
 
diff --git a/segment-analytics/segment-analytics.d.ts b/segment-analytics/segment-analytics.d.ts
deleted file mode 100644
index a474c668f7..0000000000
--- a/segment-analytics/segment-analytics.d.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-// Type definitions for Segment's analytics.js
-// Project: https://segment.com/docs/libraries/analytics.js/
-// Definitions by: Andrew Fong <https://github.com/fongandrew>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace SegmentAnalytics {
-
-  // Generic options object with integrations
-  interface SegmentOpts {
-    integrations?: any;
-    anonymousId?: string;
-  }
-
-  // The actual analytics.js object
-  interface AnalyticsJS {
-
-    /* Configure Segment with write key */
-    load(writeKey: string): void;
-
-    /* The identify method is how you tie one of your users and their actions
-       to a recognizable userId and traits. */
-    identify(userId: string, traits?: Object, options?: SegmentOpts,
-             callback?: () => void): void;
-    identify(userId: string, traits: Object, callback?: () => void): void;
-    identify(userId: string, callback?: () => void): void;
-    identify(traits?: Object, options?: SegmentOpts,
-             callback?: () => void): void;
-    identify(traits?: Object, callback?: () => void): void;
-    identify(callback: () => void): void;
-
-    /* The track method lets you record any actions your users perform. */
-    track(event: string, properties?: Object, options?: SegmentOpts,
-          callback?: () => void): void;
-    track(event: string, properties?: Object,
-          callback?: () => void): void;
-    track(event: string, callback?: () => void): void;
-
-    /* The page method lets you record page views on your website, along with
-       optional extra information about the page being viewed. */
-    page(category: string, name: string, properties?: Object,
-         options?: SegmentOpts, callback?: () => void): void;
-    page(name?: string, properties?: Object,
-         options?: SegmentOpts, callback?: () => void): void;
-    page(name?: string, properties?: Object, callback?: () => void): void;
-    page(name?: string, callback?: () => void): void;
-    page(properties?: Object, options?: SegmentOpts,
-         callback?: () => void): void;
-    page(callback?: () => void): void;
-
-    /* The group method associates an individual user with a group. The group
-       can a company, organization, account, project, team or any other name
-       you came up with for the same concept. */
-    group(groupId: string, traits?: Object, options?: SegmentOpts,
-          callback?: () => void): void;
-    group(groupId: string, traits?: Object, callback?: () => void): void;
-    group(groupId: string, callback?: () => void): void;
-
-    /* The alias method combines two previously unassociated user identities.
-       This comes in handy if the same user visits from two different devices
-       and you want to combine their history.
-
-       Some providers also don’t alias automatically for you when an anonymous
-       user signs up (like Mixpanel), so you need to call alias manually right
-       after sign up with their brand new userId. */
-    alias(userId: string, previousId?: string, options?: SegmentOpts,
-          callback?: () => void): void;
-    alias(userId: string, previousId?: string, callback?: () => void): void;
-    alias(userId: string, callback?: () => void): void;
-    alias(userId: string, options?: SegmentOpts, callback?: () => void): void;
-
-    /* trackLink is a helper that binds a track call to whenever a link is
-       clicked. Usually the page would change before you could call track, but
-       with trackLink a small timeout is inserted to give the track call enough
-       time to fire. */
-    trackLink(elements: JQuery|Element[]|Element,
-              event: string|{ (elm: Element): string },
-              properties?: Object|{ (elm: Element): Object }): void;
-
-    /* trackForm is a helper that binds a track call to a form submission.
-       Usually the page would change before you could call track, but with
-       trackForm a small timeout is inserted to give the track call enough
-       time to fire. */
-    trackForm(elements: JQuery|Element[]|Element,
-              event: string|{ (elm: Element): string },
-              properties?: Object|{ (elm: Element): Object }): void;
-
-    /* The ready method allows you to pass in a callback that will be called as
-       soon as all of your enabled integrations have loaded. It’s like jQuery’s
-       ready method, except for integrations. */
-    ready(callback: () => void): void;
-
-    /* If you need to clear the user and group id and traits we’ve added a
-       reset function that is most commonly used when your identified users
-       logout of your application. */
-    reset(): void;
-
-    /* Once Analytics.js loaded, you can retrieve information about the
-       currently identified user or group like their id and traits. */
-    user(): {
-      id(): string;
-      logout(): void;
-      reset(): void;
-      anonymousId(newId?: string): string;
-      traits(newTraits?: Object): void;
-    }
-
-    group(): {
-      id(): string;
-      traits(newTraits?: Object): void;
-    }
-
-    /* Analytics.js has a debug mode that logs helpful messages to the
-       console. */
-    debug(state?: boolean): void;
-
-    /* The global analytics object emits events whenever you call alias, group,
-       identify, track or page. That way you can listen to those events and run
-       your own custom code. */
-    on(event: string,
-       callback: {
-        (event: string, properties: Object, options: SegmentOpts): void
-      }): void;
-
-    /* You can extend the length (in milliseconds) of the method callbacks and
-       helpers */
-    timeout(milliseconds: number): void;
-  }
-}
-
-declare var analytics: SegmentAnalytics.AnalyticsJS;
diff --git a/segment-analytics/tsconfig.json b/segment-analytics/tsconfig.json
new file mode 100644
index 0000000000..8f3019a2fb
--- /dev/null
+++ b/segment-analytics/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "segment-analytics-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/select2/index.d.ts b/select2/index.d.ts
new file mode 100644
index 0000000000..8cf66694df
--- /dev/null
+++ b/select2/index.d.ts
@@ -0,0 +1,191 @@
+// Type definitions for Select2 4.0.1
+// Project: http://ivaynberg.github.com/select2/
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="jquery"/>
+
+interface Select2QueryOptions {
+    term?: string;
+    page?: number;
+    context?: any;
+    callback?: (result: { results: any; more?: boolean; context?: any; }) => void;
+}
+
+interface AjaxFunction {
+    (settings: JQueryAjaxSettings): JQueryXHR;
+    (url: string, settings?: JQueryAjaxSettings): JQueryXHR;
+}
+
+interface Select2AjaxOptions {
+    transport?: AjaxFunction;
+    /**
+    * Url to make request to, Can be string or a function returning a string.
+    */
+    url?: any;
+    dataType?: string;
+    delay?: number;
+    cache?: boolean;
+    data?: (term: string, page: number, context: any) => any;
+    results?: (term: any, page: number, context: any) => any;
+}
+
+interface IdTextPair {
+    id: any;
+    text: string;
+}
+
+interface Select2Options {
+    width?: string;
+    dropdownAutoWidth?: boolean;
+    minimumInputLength?: number;
+    minimumResultsForSearch?: number;
+    maximumSelectionSize?: number;
+    placeholder?: string | IdTextPair;
+    separator?: string;
+    allowClear?: boolean;
+    multiple?: boolean;
+    closeOnSelect?: boolean;
+    openOnEnter?: boolean;
+    id?: (object: any) => string;
+    matcher?: (term: string, text: string, option: any) => boolean;
+    formatSelection?: (object: any, container: JQuery, escapeMarkup:(markup: string) => string) => string;
+    formatResult?: (object: any, container: JQuery, query: any, escapeMarkup: (markup: string) => string) => string;
+    formatResultCssClass?: (object: any) => string;
+    formatNoMatches?: (term: string) => string;
+    formatSearching?: () => string;
+    formatInputTooShort?: (term: string, minLength: number) => string;
+    formatSelectionTooBig?: (maxSize: number) => string;
+    formatLoadMore?: (pageNumber: number) => string;
+    createSearchChoice?: (term: string, data: any) => any;
+    initSelection?: (element: JQuery, callback: (data: any) => void ) => void;
+    tokenizer?: (input: string, selection: any[], selectCallback: () => void , options: Select2Options) => string;
+    tokenSeparators?: string[];
+    query?: (options: Select2QueryOptions) => void;
+    ajax?: Select2AjaxOptions;
+    data?: any;
+    tags?: any;
+    containerCss?: any;
+    containerCssClass?: any;
+    dropdownCss?: any;
+    dropdownCssClass?: any;
+    escapeMarkup?: (markup: string) => string;
+    theme?: string;
+    /**
+    * Template can return both plain string that will be HTML escaped and a jquery object that can render HTML
+    */
+    templateSelection?: (object: Select2SelectionObject) => any;
+    templateResult?: (object: Select2SelectionObject) => any;
+	language?: string;
+}
+
+interface Select2JQueryEventObject extends JQueryEventObject {
+    val: any;
+    added: any;
+    removed: any;
+    choice: {
+        id: any;
+        text: string;
+    };
+}
+
+interface Select2SelectionObject {
+	loading: boolean,
+    disabled: boolean,
+    element: HTMLOptionElement,
+    id: string,
+    selected: boolean,
+    text: string,
+    title: string,
+}
+
+interface JQuery {
+    off(events?: "change", selector?: any, handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+
+    on(events: "change", selector?: string, data?: any, handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "change", selector?: string, handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "change", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-opening", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-open", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-close", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-highlight", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-selecting", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-removing", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-removed", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-loaded", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-focus", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-blur", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-opening", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-open", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-close", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-highlight", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-selecting", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-removing", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-removed", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-loaded", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-focus", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-blur", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+
+    select2(): JQuery;
+    select2(it: IdTextPair): JQuery;
+
+    /**
+    * Get the id value of the current selection
+    */
+    select2(method: 'val'): any;
+    /**
+    * Set the id value of the current selection
+    * @params value Value to set the id to
+    * @params triggerChange Should a change event be triggered
+    */
+    select2(method: 'val', value: any, triggerChange?: boolean): any;
+    /**
+    * Get the data object of the current selection
+    */
+    select2(method: 'data'): any;
+    /**
+    * Set the data of the current selection
+    * @params value Object to set the data to
+    * @params triggerChange Should a change event be triggered
+    */
+    select2(method: 'data', value: any, triggerChange?: boolean): any;
+    /**
+    * Reverts changes to DOM done by Select2. Any selection done via Select2 will be preserved.
+    */
+    select2(method: 'destroy'): JQuery;
+    /**
+    * Opens the dropdown
+    */
+    select2(method: 'open'): JQuery;
+    /**
+    * Closes the dropdown
+    */
+    select2(method: 'close'): JQuery;
+    /**
+    * Enables or disables Select2 and its underlying form component
+    * @param value True if it should be enabled false if it should be disabled
+    */
+    select2(method: 'enable', value: boolean): JQuery;
+    /**
+    * Toggles readonly mode on Select2 and its underlying form component
+    * @param value True if it should be readonly false if it should be read write
+    */
+    select2(method: 'readonly', value: boolean): JQuery;
+    /**
+    * Retrieves the main container element that wraps all of DOM added by Select2
+    */
+    select2(method: 'container'): JQuery;
+    /**
+    * Notifies Select2 that a drag and drop sorting operation has started
+    */
+    select2(method: 'onSortStart'): JQuery;
+    /**
+    * Notifies Select2 that a drag and drop sorting operation has finished
+    */
+    select2(method: 'onSortEnd'): JQuery;
+
+    select2(method: string): any;
+    select2(method: string, value: any, trigger?: boolean): any;
+    select2(options: Select2Options): JQuery;
+}
diff --git a/select2/select2-tests.ts b/select2/select2-tests.ts
index 5712fc2d3e..64f1bbf194 100644
--- a/select2/select2-tests.ts
+++ b/select2/select2-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="select2.d.ts" />
+/// <reference types="jquery" />
+
 
 $("#e9").select2();
 $("#e2").select2({
diff --git a/select2/select2-tests.ts.tscparams b/select2/select2-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/select2/select2-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/select2/select2.d.ts b/select2/select2.d.ts
deleted file mode 100644
index 9cfaa2d951..0000000000
--- a/select2/select2.d.ts
+++ /dev/null
@@ -1,191 +0,0 @@
-// Type definitions for Select2 4.0.1
-// Project: http://ivaynberg.github.com/select2/
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface Select2QueryOptions {
-    term?: string;
-    page?: number;
-    context?: any;
-    callback?: (result: { results: any; more?: boolean; context?: any; }) => void;
-}
-
-interface AjaxFunction {
-    (settings: JQueryAjaxSettings): JQueryXHR;
-    (url: string, settings?: JQueryAjaxSettings): JQueryXHR;
-}
-
-interface Select2AjaxOptions {
-    transport?: AjaxFunction;
-    /**
-    * Url to make request to, Can be string or a function returning a string.
-    */
-    url?: any;
-    dataType?: string;
-    delay?: number;
-    cache?: boolean;
-    data?: (term: string, page: number, context: any) => any;
-    results?: (term: any, page: number, context: any) => any;
-}
-
-interface IdTextPair {
-    id: any;
-    text: string;
-}
-
-interface Select2Options {
-    width?: string;
-    dropdownAutoWidth?: boolean;
-    minimumInputLength?: number;
-    minimumResultsForSearch?: number;
-    maximumSelectionSize?: number;
-    placeholder?: string | IdTextPair;
-    separator?: string;
-    allowClear?: boolean;
-    multiple?: boolean;
-    closeOnSelect?: boolean;
-    openOnEnter?: boolean;
-    id?: (object: any) => string;
-    matcher?: (term: string, text: string, option: any) => boolean;
-    formatSelection?: (object: any, container: JQuery, escapeMarkup:(markup: string) => string) => string;
-    formatResult?: (object: any, container: JQuery, query: any, escapeMarkup: (markup: string) => string) => string;
-    formatResultCssClass?: (object: any) => string;
-    formatNoMatches?: (term: string) => string;
-    formatSearching?: () => string;
-    formatInputTooShort?: (term: string, minLength: number) => string;
-    formatSelectionTooBig?: (maxSize: number) => string;
-    formatLoadMore?: (pageNumber: number) => string;
-    createSearchChoice?: (term: string, data: any) => any;
-    initSelection?: (element: JQuery, callback: (data: any) => void ) => void;
-    tokenizer?: (input: string, selection: any[], selectCallback: () => void , options: Select2Options) => string;
-    tokenSeparators?: string[];
-    query?: (options: Select2QueryOptions) => void;
-    ajax?: Select2AjaxOptions;
-    data?: any;
-    tags?: any;
-    containerCss?: any;
-    containerCssClass?: any;
-    dropdownCss?: any;
-    dropdownCssClass?: any;
-    escapeMarkup?: (markup: string) => string;
-    theme?: string;
-    /**
-    * Template can return both plain string that will be HTML escaped and a jquery object that can render HTML
-    */
-    templateSelection?: (object: Select2SelectionObject) => any;
-    templateResult?: (object: Select2SelectionObject) => any;
-	language?: string;
-}
-
-interface Select2JQueryEventObject extends JQueryEventObject {
-    val: any;
-    added: any;
-    removed: any;
-    choice: {
-        id: any;
-        text: string;
-    };
-}
-
-interface Select2SelectionObject {
-	loading: boolean,
-    disabled: boolean,
-    element: HTMLOptionElement,
-    id: string,
-    selected: boolean,
-    text: string,
-    title: string,
-}
-
-interface JQuery {
-    off(events?: "change", selector?: any, handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-
-    on(events: "change", selector?: string, data?: any, handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "change", selector?: string, handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "change", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-opening", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-open", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-close", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-highlight", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-selecting", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-removing", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-removed", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-loaded", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-focus", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-blur", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-opening", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-open", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-close", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-highlight", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-selecting", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-removing", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-removed", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-loaded", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-focus", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-blur", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-
-    select2(): JQuery;
-    select2(it: IdTextPair): JQuery;
-
-    /**
-    * Get the id value of the current selection
-    */
-    select2(method: 'val'): any;
-    /**
-    * Set the id value of the current selection
-    * @params value Value to set the id to
-    * @params triggerChange Should a change event be triggered
-    */
-    select2(method: 'val', value: any, triggerChange?: boolean): any;
-    /**
-    * Get the data object of the current selection
-    */
-    select2(method: 'data'): any;
-    /**
-    * Set the data of the current selection
-    * @params value Object to set the data to
-    * @params triggerChange Should a change event be triggered
-    */
-    select2(method: 'data', value: any, triggerChange?: boolean): any;
-    /**
-    * Reverts changes to DOM done by Select2. Any selection done via Select2 will be preserved.
-    */
-    select2(method: 'destroy'): JQuery;
-    /**
-    * Opens the dropdown
-    */
-    select2(method: 'open'): JQuery;
-    /**
-    * Closes the dropdown
-    */
-    select2(method: 'close'): JQuery;
-    /**
-    * Enables or disables Select2 and its underlying form component
-    * @param value True if it should be enabled false if it should be disabled
-    */
-    select2(method: 'enable', value: boolean): JQuery;
-    /**
-    * Toggles readonly mode on Select2 and its underlying form component
-    * @param value True if it should be readonly false if it should be read write
-    */
-    select2(method: 'readonly', value: boolean): JQuery;
-    /**
-    * Retrieves the main container element that wraps all of DOM added by Select2
-    */
-    select2(method: 'container'): JQuery;
-    /**
-    * Notifies Select2 that a drag and drop sorting operation has started
-    */
-    select2(method: 'onSortStart'): JQuery;
-    /**
-    * Notifies Select2 that a drag and drop sorting operation has finished
-    */
-    select2(method: 'onSortEnd'): JQuery;
-
-    select2(method: string): any;
-    select2(method: string, value: any, trigger?: boolean): any;
-    select2(options: Select2Options): JQuery;
-}
diff --git a/select2/tsconfig.json b/select2/tsconfig.json
new file mode 100644
index 0000000000..cbc927dfa3
--- /dev/null
+++ b/select2/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "select2-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/selectize/index.d.ts b/selectize/index.d.ts
new file mode 100644
index 0000000000..3c99a48522
--- /dev/null
+++ b/selectize/index.d.ts
@@ -0,0 +1,612 @@
+// Type definitions for Selectize 0.11.2
+// Project: https://github.com/brianreavis/selectize.js
+// Definitions by: Adi Dahiya <https://github.com/adidahiya>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+declare namespace Selectize {
+    // see https://github.com/brianreavis/selectize.js/blob/master/docs/usage.md
+    // option identifiers are parameterized by T; data is parameterized by U
+    interface IOptions<T, U> {
+
+        // General
+        // ------------------------------------------------------------------------------------------------------------
+
+        /**
+         * The string to separate items by. This option is only used when Selectize is instantiated from a
+         * <input type="text"> element.
+         *
+         * Default: ','
+         */
+        delimiter?: string;
+
+        /**
+         * Enable or disable international character support.
+         *
+         * Default: true
+         */
+        diacritics?: boolean;
+
+        /**
+         * Allows the user to create a new items that aren't in the list of options.
+         * This option can be any of the following: "true", "false" (disabled), or a function that accepts two
+         * arguments: "input" and "callback". The callback should be invoked with the final data for the option.
+         *
+         * Default: false
+         */
+        create?: any;
+
+        /**
+         * If true, when user exits the field (clicks outside of input or presses ESC) new option is created and
+         * selected (if `create`-option is enabled).
+         *
+         * Default: false
+         */
+        createOnBlur?: boolean;
+
+        /**
+         * Specifies a RegExp or String containing a regular expression that the current search filter must match to
+         * be allowed to be created. May also be a predicate function that takes the filter text and returns whether
+         * it is allowed.
+         *
+         * Default: null
+         */
+        createFilter?: any;
+
+        /**
+         * Toggles match highlighting within the dropdown menu.
+         *
+         * Default: true
+         */
+        highlight?: boolean;
+
+        /**
+         * If false, items created by the user will not show up as available options once they are unselected.
+         *
+         * Default: true
+         */
+        persist?: boolean;
+
+        /**
+         * Show the dropdown immediately when the control receives focus.
+         *
+         * Default: true
+         */
+        openOnFocus?: boolean;
+
+        /**
+         * The max number of items to render at once in the dropdown list of options.
+         *
+         * Default: 1000
+         */
+        maxOptions?: number;
+
+        /**
+         * The max number of items the user can select.
+         *
+         * Default: Infinity
+         */
+        maxItems?: number;
+
+        /**
+         * If true, the items that are currently selected will not be shown in the dropdown list of available options.
+         *
+         * Default: false
+         */
+        hideSelected?: boolean;
+
+        /**
+         * If true, Selectize will treat any options with a "" value like normal. This defaults to false to
+         * accomodate the common <select> practice of having the first empty option act as a placeholder.
+         *
+         * Default: false
+         */
+        allowEmptyOption?: boolean;
+
+        /**
+         * The animation duration (in milliseconds) of the scroll animation triggered when going [up] and [down] in
+         * the options dropdown.
+         *
+         * Default: 60
+         */
+        scrollDuration?: number;
+
+        /**
+         * The number of milliseconds to wait before requesting options from the server or null.
+         * If null, throttling is disabled.
+         *
+         * Default: 300
+         */
+        loadThrottle?: number;
+
+        /**
+         * If true, the "load" function will be called upon control initialization (with an empty search).
+         * Alternatively it can be set to "focus" to call the "load" function when control receives focus.
+         *
+         * Default: false
+         */
+        preload?: any;
+
+        /**
+         * The element the dropdown menu is appended to. This should be "body" or null.
+         * If null, the dropdown will be appended as a child of the selectize control.
+         *
+         * Default: null
+         */
+        dropdownParent?: string;
+
+        /**
+         * Sets if the "Add..." option should be the default selection in the dropdown.
+         *
+         * Default: false
+         */
+        addPrecedence?: boolean;
+
+        /**
+         * If true, the tab key will choose the currently selected item.
+         *
+         * Default: false
+         */
+        selectOnTab?: boolean;
+
+        /**
+         * An array of plugins to use
+         *
+         * Default: null
+         */
+        plugins?: string[];
+
+        // Data / Searching
+        // ------------------------------------------------------------------------------------------------------------
+
+        /**
+         * Options available to select; array of objects. If your element is <select> with <option>s specified this
+         * property gets populated accordingly. Setting this property is convenient if you have your data as an
+         * array and want to automatically generate the <option>s.
+         *
+         * Default: []
+         */
+        options?: U[];
+
+        /**
+         * The <option> attribute from which to read JSON data about the option.
+         *
+         * Default: "data-data"
+         */
+        dataAttr?: string;
+
+        /**
+         * The name of the property to use as the "value" when an item is selected.
+         *
+         * Default: "value"
+         */
+        valueField?: string;
+
+        /**
+         * Option groups that options will be bucketed into.
+         * If your element is a <select> with <optgroup>s this property gets populated automatically.
+         * Make sure each object in the array has a property named whatever "optgroupValueField" is set to.
+         */
+        optgroups?: U[];
+
+        /**
+         * The name of the option group property that serves as its unique identifier.
+         *
+         * Default: "value"
+         */
+        optgroupValueField?: string;
+
+        /**
+         * The name of the property to render as an option / item label (not needed when custom rendering
+         * functions are defined).
+         *
+         * Default: "text"
+         */
+        labelField?: string;
+
+        /**
+         * The name of the property to render as an option group label (not needed when custom rendering
+         * functions are defined).
+         *
+         * Default: "label"
+         */
+        optgroupLabelField?: string;
+
+        /**
+         * The name of the property to group items by.
+         *
+         * Default: "optgroup"
+         */
+        optgroupField?: string;
+
+        /**
+         * A single field or an array of fields to sort by. Each item in the array should be an object containing at
+         * least a "field" property. Optionally, "direction" can be set to "asc" or "desc". The order of the array
+         * defines the sort precedence.
+         *
+         * Unless present, a special "$score" field will be automatically added to the beginning of the sort list.
+         * This will make results sorted primarily by match quality (descending).
+         *
+         * Default: "$order"
+         */
+        sortField?: any;
+
+        /**
+         * An array of property names to analyze when filtering options.
+         *
+         * Default: ["text"]
+         */
+        searchField?: any;
+
+        /**
+         * When searching for multiple terms (separated by a space), this is the operator used. Can be "and" or "or".
+         *
+         * Default: "and"
+         */
+        searchConjunction?: string;
+
+        /**
+         * An array of optgroup values that indicates the order they should be listed in in the dropdown.
+         * If not provided, groups will be ordered by the ranking of the options within them.
+         *
+         * Default: null
+         */
+        optgroupOrder?: string[];
+
+        /**
+         * Copy the original input classes to the Dropdown element.
+         *
+         * Default: true
+         */
+        copyClassesToDropdown?: boolean;
+
+        // Callbacks
+        // ------------------------------------------------------------------------------------------------------------
+
+        /**
+         * Invoked when new options should be loaded from the server.
+         */
+        load?(query: string, callback: Function): any;
+
+        /**
+         * Overrides the scoring function used to sort available options. The provided function should return a
+         * function that returns a number greater than or equal to zero to represent the "score" of an item
+         * (the function's first argument). If 0, the option is declared not a match.
+         */
+        score?(search: ISearch): (item: any) => number;
+
+        /**
+         * Invoked once the control is completely initialized.
+         */
+        onInitialize?(): any;
+
+        /**
+         * Invoked when the value of the control changes.
+         *
+         * If single select, value is of type T.
+         * If multi select, value is of type T[].
+         */
+        onChange?(value: any): any;
+
+        /**
+         * Invoked when an item is selected.
+         */
+        onItemAdd?(value: T, item: JQuery): any;
+
+        /**
+         * Invoked when an item is deselected.
+         */
+        onItemRemove?(value: T): any;
+
+        /**
+         * Invoked when the control is manually cleared via the clear() method.
+         */
+        onClear?(): any;
+
+        /**
+         * Invoked when the user attempts to delete the current selection.
+         */
+        onDelete?(values: T[]): any;
+
+        /**
+         * Invoked when a new option is added to the available options list.
+         */
+        onOptionAdd?(value: T, data: U): any;
+
+        /**
+         * Invoked when an option is removed from the available options.
+         */
+        onOptionRemove?(value: T): any;
+
+        /**
+         * Invoked when the dropdown opens.
+         */
+        onDropdownOpen?(dropdown: JQuery): any;
+
+        /**
+         * Invoked when the dropdown closes.
+         */
+        onDropdownClose?(dropdown: JQuery): any;
+
+        /**
+         * Invoked when the user types while filtering options.
+         */
+        onType?(srt: string): any;
+
+        /**
+         * Invoked when new options have been loaded and added to the control (via the "load" option or "load" API method).
+         */
+        onLoad?(data: U[]): any;
+
+        // Rendering
+        // ------------------------------------------------------------------------------------------------------------
+
+        render?: ICustomRenderers<U>;
+    }
+
+    /**
+     * Custom rendering functions. Each function should accept two arguments: "data" and "escape" and return
+     * HTML (string) with a single root element. The "escape" argument is a function that takes a string and
+     * escapes all special HTML characters. This is very important to use to prevent XSS vulnerabilities.
+     */
+    interface ICustomRenderers<U> {
+        // An option in the dropdown list of available options.
+        option?(data: U, escape: (input: string) => string): string;
+
+        // An item the user has selected.
+        item?(data: U, escape: (input: string) => string): string;
+
+        // The "create new" option at the bottom of the dropdown. The data contains one property: "input"
+        // (which is what the user has typed).
+        option_create?(data: U, escape: (input: string) => string): string;
+
+        // The header of an option group.
+        optgroup_header?(data: U, escape: (input: string) => string): string;
+
+        // The wrapper for an optgroup. The "html" property in the data will be the raw html of the optgroup's header
+        // and options.
+        optgroup?(data: U, escape: (input: string) => string): string;
+    }
+
+    // see https://github.com/brianreavis/selectize.js/blob/master/docs/api.md
+    interface IApi<T, U> {
+
+        // Dropdown Options
+        // ------------------------------------------------------------------------------------------------------------
+
+        /**
+         * Adds an available option. If it already exists, nothing will happen.
+         * Note: this does not refresh the options list dropdown (use refreshOptions() for that).
+         */
+        addOption(data: U): void;
+
+        /**
+         * Updates an option available for selection. If it is visible in the selected items or options dropdown,
+         * it will be re-rendered automatically.
+         */
+        updateOption(value: T, data: U): void;
+
+        /**
+         * Removes the option identified by the given value.
+         */
+        removeOption(value: T): void;
+
+        /**
+         * Removes all options from the control.
+         */
+        clearOptions(): void;
+
+        /**
+         * Retrieves the jQuery element for the option identified by the given value.
+         */
+        getOption(value: T): any;
+
+        /**
+         * Retrieves the jQuery element for the previous or next option, relative to the currently highlighted option.
+         * The "direction" argument should be 1 for "next" or -1 for "previous".
+         */
+        getAdjacentOption(value: T, direction: number): void;
+
+        /**
+         * Refreshes the list of available options shown in the autocomplete dropdown menu.
+         */
+        refreshOptions(triggerDropdown: boolean): void;
+
+        // Selected Items
+        // ------------------------------------------------------------------------------------------------------------
+
+        /**
+         * Resets / clears all selected items from the control.
+         */
+        clear(): void;
+
+        /**
+         * Returns the jQuery element of the item matching the given value.
+         */
+        getItem(value: T): JQuery;
+
+        /**
+         * "Selects" an item. Adds it to the list at the current caret position.
+         */
+        addItem(value: T): void;
+
+        /**
+         * Removes the selected item matching the provided value.
+         */
+        removeItem(value: T): void;
+
+        /**
+         * Invokes the "create" method provided in the selectize options that should provide the data for the
+         * new item, given the user input. Once this completes, it will be added to the item list.
+         */
+        createItem(value: T): void;
+
+        /**
+         * Re-renders the selected item lists.
+         */
+        refreshItems(): void;
+
+        // Optgroups
+        // ------------------------------------------------------------------------------------------------------------
+
+        /**
+         * Registers a new optgroup for options to be bucketed into.
+         * The "id" argument refers to a value of the property in option identified by the "optgroupField" setting.
+         */
+        addOptionGroup(id: string, data: U): void;
+
+        // Events
+        // ------------------------------------------------------------------------------------------------------------
+
+        /**
+         * Adds an event listener.
+         */
+        on(eventName: string, handler: Function): void;
+
+        /**
+         * Removes an event listener. If no handler is provided, all event listeners are removed.
+         */
+        off(eventName: string, handler?: Function): void;
+
+        /**
+         * Triggers event listeners.
+         */
+        trigger(eventName: string, ...args: any[]): void;
+
+        // Dropdown Actions
+        // ------------------------------------------------------------------------------------------------------------
+
+        /**
+         * Shows the autocomplete dropdown containing the available options.
+         */
+        open(): void;
+
+        /**
+         * Closes the autocomplete dropdown menu.
+         */
+        close(): void;
+
+        /**
+         * Calculates and applies the appropriate position of the dropdown.
+         */
+        positionDropdown(): void;
+
+        // Other
+        // ------------------------------------------------------------------------------------------------------------
+
+        /**
+         * Destroys the control and unbinds event listeners so that it can be garbage collected.
+         */
+        destroy(): void;
+
+        /**
+         * Loads options by invoking the the provided function. The function should accept one argument (callback)
+         * and invoke the callback with the results once they are available.
+         */
+        load(callback: (results: any) => any): void;
+
+        /**
+         * Brings the control into focus.
+         */
+        focus(): void;
+
+        /**
+         * Forces the control out of focus.
+         */
+        blur(): void;
+
+        /**
+         * Disables user input on the control (note: the control can still receive focus).
+         */
+        lock(): void;
+
+        /**
+         * Re-enables user input on the control.
+         */
+        unlock(): void;
+
+        /**
+         * Disables user input on the control completely. While disabled, it cannot receive focus.
+         */
+        disable(): void;
+
+        /**
+         * Enables the control so that it can respond to focus and user input.
+         */
+        enable(): void;
+
+        /**
+         * Returns the value of the control. If multiple items can be selected (e.g. <select multiple>), this
+         * returns an array. If only one item can be selected, this returns a string.
+         */
+        getValue(): any;
+
+        /**
+         * Resets the selected items to the given value(s).
+         */
+        setValue(value: T): void;
+        setValue(value: T[]): void;
+
+        /**
+         * Moves the caret to the specified position ("index" being the index in the list of selected items).
+         */
+        setCaret(index: number): void;
+
+        /**
+         * Returns whether or not the user can select more items.
+         */
+        isFull(): boolean;
+
+        /**
+         * Clears the render cache. Takes an optional template argument (e.g. "option", "item") to clear only that cache.
+         */
+        clearCache(template?: string): void;
+    }
+
+    interface ISearchToken {
+        regex: RegExp;
+        string: string;
+    }
+
+    interface ISearchResult {
+        id: string;
+        score: number;
+    }
+
+    interface ISearch {
+        /**
+         * Original search options.
+         */
+        options: any;
+
+        /**
+         * The raw user input
+         */
+        query: string;
+
+        /**
+         * An array containing parsed search tokens. A token is an object containing two properties: "string" and "regex".
+         */
+        tokens: ISearchToken[];
+
+        /**
+         * The total number of results.
+         */
+        total: number;
+
+        /**
+         * A list of matched results. Each result is an object containing two properties: "score" and "id".
+         */
+        items: ISearchResult[];
+    }
+}
+
+interface JQuery {
+    selectize(options?: Selectize.IOptions<any, any>): JQuery;
+}
+
+interface HTMLElement {
+    selectize: Selectize.IApi<any, any>;
+}
+
diff --git a/selectize/selectize-tests.ts b/selectize/selectize-tests.ts
index c1f954746f..b2ec9e0a29 100644
--- a/selectize/selectize-tests.ts
+++ b/selectize/selectize-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="selectize.d.ts" />
+/// <reference types="jquery" />
+
 
 var $input = $(".test-input").selectize();
 var testApi = $input[0].selectize;
diff --git a/selectize/selectize.d.ts b/selectize/selectize.d.ts
deleted file mode 100644
index b593fa73dd..0000000000
--- a/selectize/selectize.d.ts
+++ /dev/null
@@ -1,612 +0,0 @@
-// Type definitions for Selectize 0.11.2
-// Project: https://github.com/brianreavis/selectize.js
-// Definitions by: Adi Dahiya <https://github.com/adidahiya>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-declare namespace Selectize {
-    // see https://github.com/brianreavis/selectize.js/blob/master/docs/usage.md
-    // option identifiers are parameterized by T; data is parameterized by U
-    interface IOptions<T, U> {
-
-        // General
-        // ------------------------------------------------------------------------------------------------------------
-
-        /**
-         * The string to separate items by. This option is only used when Selectize is instantiated from a
-         * <input type="text"> element.
-         *
-         * Default: ','
-         */
-        delimiter?: string;
-
-        /**
-         * Enable or disable international character support.
-         *
-         * Default: true
-         */
-        diacritics?: boolean;
-
-        /**
-         * Allows the user to create a new items that aren't in the list of options.
-         * This option can be any of the following: "true", "false" (disabled), or a function that accepts two
-         * arguments: "input" and "callback". The callback should be invoked with the final data for the option.
-         *
-         * Default: false
-         */
-        create?: any;
-
-        /**
-         * If true, when user exits the field (clicks outside of input or presses ESC) new option is created and
-         * selected (if `create`-option is enabled).
-         *
-         * Default: false
-         */
-        createOnBlur?: boolean;
-
-        /**
-         * Specifies a RegExp or String containing a regular expression that the current search filter must match to
-         * be allowed to be created. May also be a predicate function that takes the filter text and returns whether
-         * it is allowed.
-         *
-         * Default: null
-         */
-        createFilter?: any;
-
-        /**
-         * Toggles match highlighting within the dropdown menu.
-         *
-         * Default: true
-         */
-        highlight?: boolean;
-
-        /**
-         * If false, items created by the user will not show up as available options once they are unselected.
-         *
-         * Default: true
-         */
-        persist?: boolean;
-
-        /**
-         * Show the dropdown immediately when the control receives focus.
-         *
-         * Default: true
-         */
-        openOnFocus?: boolean;
-
-        /**
-         * The max number of items to render at once in the dropdown list of options.
-         *
-         * Default: 1000
-         */
-        maxOptions?: number;
-
-        /**
-         * The max number of items the user can select.
-         *
-         * Default: Infinity
-         */
-        maxItems?: number;
-
-        /**
-         * If true, the items that are currently selected will not be shown in the dropdown list of available options.
-         *
-         * Default: false
-         */
-        hideSelected?: boolean;
-
-        /**
-         * If true, Selectize will treat any options with a "" value like normal. This defaults to false to
-         * accomodate the common <select> practice of having the first empty option act as a placeholder.
-         *
-         * Default: false
-         */
-        allowEmptyOption?: boolean;
-
-        /**
-         * The animation duration (in milliseconds) of the scroll animation triggered when going [up] and [down] in
-         * the options dropdown.
-         *
-         * Default: 60
-         */
-        scrollDuration?: number;
-
-        /**
-         * The number of milliseconds to wait before requesting options from the server or null.
-         * If null, throttling is disabled.
-         *
-         * Default: 300
-         */
-        loadThrottle?: number;
-
-        /**
-         * If true, the "load" function will be called upon control initialization (with an empty search).
-         * Alternatively it can be set to "focus" to call the "load" function when control receives focus.
-         *
-         * Default: false
-         */
-        preload?: any;
-
-        /**
-         * The element the dropdown menu is appended to. This should be "body" or null.
-         * If null, the dropdown will be appended as a child of the selectize control.
-         *
-         * Default: null
-         */
-        dropdownParent?: string;
-
-        /**
-         * Sets if the "Add..." option should be the default selection in the dropdown.
-         *
-         * Default: false
-         */
-        addPrecedence?: boolean;
-
-        /**
-         * If true, the tab key will choose the currently selected item.
-         *
-         * Default: false
-         */
-        selectOnTab?: boolean;
-
-        /**
-         * An array of plugins to use
-         *
-         * Default: null
-         */
-        plugins?: string[];
-
-        // Data / Searching
-        // ------------------------------------------------------------------------------------------------------------
-
-        /**
-         * Options available to select; array of objects. If your element is <select> with <option>s specified this
-         * property gets populated accordingly. Setting this property is convenient if you have your data as an
-         * array and want to automatically generate the <option>s.
-         *
-         * Default: []
-         */
-        options?: U[];
-
-        /**
-         * The <option> attribute from which to read JSON data about the option.
-         *
-         * Default: "data-data"
-         */
-        dataAttr?: string;
-
-        /**
-         * The name of the property to use as the "value" when an item is selected.
-         *
-         * Default: "value"
-         */
-        valueField?: string;
-
-        /**
-         * Option groups that options will be bucketed into.
-         * If your element is a <select> with <optgroup>s this property gets populated automatically.
-         * Make sure each object in the array has a property named whatever "optgroupValueField" is set to.
-         */
-        optgroups?: U[];
-
-        /**
-         * The name of the option group property that serves as its unique identifier.
-         *
-         * Default: "value"
-         */
-        optgroupValueField?: string;
-
-        /**
-         * The name of the property to render as an option / item label (not needed when custom rendering
-         * functions are defined).
-         *
-         * Default: "text"
-         */
-        labelField?: string;
-
-        /**
-         * The name of the property to render as an option group label (not needed when custom rendering
-         * functions are defined).
-         *
-         * Default: "label"
-         */
-        optgroupLabelField?: string;
-
-        /**
-         * The name of the property to group items by.
-         *
-         * Default: "optgroup"
-         */
-        optgroupField?: string;
-
-        /**
-         * A single field or an array of fields to sort by. Each item in the array should be an object containing at
-         * least a "field" property. Optionally, "direction" can be set to "asc" or "desc". The order of the array
-         * defines the sort precedence.
-         *
-         * Unless present, a special "$score" field will be automatically added to the beginning of the sort list.
-         * This will make results sorted primarily by match quality (descending).
-         *
-         * Default: "$order"
-         */
-        sortField?: any;
-
-        /**
-         * An array of property names to analyze when filtering options.
-         *
-         * Default: ["text"]
-         */
-        searchField?: any;
-
-        /**
-         * When searching for multiple terms (separated by a space), this is the operator used. Can be "and" or "or".
-         *
-         * Default: "and"
-         */
-        searchConjunction?: string;
-
-        /**
-         * An array of optgroup values that indicates the order they should be listed in in the dropdown.
-         * If not provided, groups will be ordered by the ranking of the options within them.
-         *
-         * Default: null
-         */
-        optgroupOrder?: string[];
-
-        /**
-         * Copy the original input classes to the Dropdown element.
-         *
-         * Default: true
-         */
-        copyClassesToDropdown?: boolean;
-
-        // Callbacks
-        // ------------------------------------------------------------------------------------------------------------
-
-        /**
-         * Invoked when new options should be loaded from the server.
-         */
-        load?(query: string, callback: Function): any;
-
-        /**
-         * Overrides the scoring function used to sort available options. The provided function should return a
-         * function that returns a number greater than or equal to zero to represent the "score" of an item
-         * (the function's first argument). If 0, the option is declared not a match.
-         */
-        score?(search: ISearch): (item: any) => number;
-
-        /**
-         * Invoked once the control is completely initialized.
-         */
-        onInitialize?(): any;
-
-        /**
-         * Invoked when the value of the control changes.
-         *
-         * If single select, value is of type T.
-         * If multi select, value is of type T[].
-         */
-        onChange?(value: any): any;
-
-        /**
-         * Invoked when an item is selected.
-         */
-        onItemAdd?(value: T, item: JQuery): any;
-
-        /**
-         * Invoked when an item is deselected.
-         */
-        onItemRemove?(value: T): any;
-
-        /**
-         * Invoked when the control is manually cleared via the clear() method.
-         */
-        onClear?(): any;
-
-        /**
-         * Invoked when the user attempts to delete the current selection.
-         */
-        onDelete?(values: T[]): any;
-
-        /**
-         * Invoked when a new option is added to the available options list.
-         */
-        onOptionAdd?(value: T, data: U): any;
-
-        /**
-         * Invoked when an option is removed from the available options.
-         */
-        onOptionRemove?(value: T): any;
-
-        /**
-         * Invoked when the dropdown opens.
-         */
-        onDropdownOpen?(dropdown: JQuery): any;
-
-        /**
-         * Invoked when the dropdown closes.
-         */
-        onDropdownClose?(dropdown: JQuery): any;
-
-        /**
-         * Invoked when the user types while filtering options.
-         */
-        onType?(srt: string): any;
-
-        /**
-         * Invoked when new options have been loaded and added to the control (via the "load" option or "load" API method).
-         */
-        onLoad?(data: U[]): any;
-
-        // Rendering
-        // ------------------------------------------------------------------------------------------------------------
-
-        render?: ICustomRenderers<U>;
-    }
-
-    /**
-     * Custom rendering functions. Each function should accept two arguments: "data" and "escape" and return
-     * HTML (string) with a single root element. The "escape" argument is a function that takes a string and
-     * escapes all special HTML characters. This is very important to use to prevent XSS vulnerabilities.
-     */
-    interface ICustomRenderers<U> {
-        // An option in the dropdown list of available options.
-        option?(data: U, escape: (input: string) => string): string;
-
-        // An item the user has selected.
-        item?(data: U, escape: (input: string) => string): string;
-
-        // The "create new" option at the bottom of the dropdown. The data contains one property: "input"
-        // (which is what the user has typed).
-        option_create?(data: U, escape: (input: string) => string): string;
-
-        // The header of an option group.
-        optgroup_header?(data: U, escape: (input: string) => string): string;
-
-        // The wrapper for an optgroup. The "html" property in the data will be the raw html of the optgroup's header
-        // and options.
-        optgroup?(data: U, escape: (input: string) => string): string;
-    }
-
-    // see https://github.com/brianreavis/selectize.js/blob/master/docs/api.md
-    interface IApi<T, U> {
-
-        // Dropdown Options
-        // ------------------------------------------------------------------------------------------------------------
-
-        /**
-         * Adds an available option. If it already exists, nothing will happen.
-         * Note: this does not refresh the options list dropdown (use refreshOptions() for that).
-         */
-        addOption(data: U): void;
-
-        /**
-         * Updates an option available for selection. If it is visible in the selected items or options dropdown,
-         * it will be re-rendered automatically.
-         */
-        updateOption(value: T, data: U): void;
-
-        /**
-         * Removes the option identified by the given value.
-         */
-        removeOption(value: T): void;
-
-        /**
-         * Removes all options from the control.
-         */
-        clearOptions(): void;
-
-        /**
-         * Retrieves the jQuery element for the option identified by the given value.
-         */
-        getOption(value: T): any;
-
-        /**
-         * Retrieves the jQuery element for the previous or next option, relative to the currently highlighted option.
-         * The "direction" argument should be 1 for "next" or -1 for "previous".
-         */
-        getAdjacentOption(value: T, direction: number): void;
-
-        /**
-         * Refreshes the list of available options shown in the autocomplete dropdown menu.
-         */
-        refreshOptions(triggerDropdown: boolean): void;
-
-        // Selected Items
-        // ------------------------------------------------------------------------------------------------------------
-
-        /**
-         * Resets / clears all selected items from the control.
-         */
-        clear(): void;
-
-        /**
-         * Returns the jQuery element of the item matching the given value.
-         */
-        getItem(value: T): JQuery;
-
-        /**
-         * "Selects" an item. Adds it to the list at the current caret position.
-         */
-        addItem(value: T): void;
-
-        /**
-         * Removes the selected item matching the provided value.
-         */
-        removeItem(value: T): void;
-
-        /**
-         * Invokes the "create" method provided in the selectize options that should provide the data for the
-         * new item, given the user input. Once this completes, it will be added to the item list.
-         */
-        createItem(value: T): void;
-
-        /**
-         * Re-renders the selected item lists.
-         */
-        refreshItems(): void;
-
-        // Optgroups
-        // ------------------------------------------------------------------------------------------------------------
-
-        /**
-         * Registers a new optgroup for options to be bucketed into.
-         * The "id" argument refers to a value of the property in option identified by the "optgroupField" setting.
-         */
-        addOptionGroup(id: string, data: U): void;
-
-        // Events
-        // ------------------------------------------------------------------------------------------------------------
-
-        /**
-         * Adds an event listener.
-         */
-        on(eventName: string, handler: Function): void;
-
-        /**
-         * Removes an event listener. If no handler is provided, all event listeners are removed.
-         */
-        off(eventName: string, handler?: Function): void;
-
-        /**
-         * Triggers event listeners.
-         */
-        trigger(eventName: string, ...args: any[]): void;
-
-        // Dropdown Actions
-        // ------------------------------------------------------------------------------------------------------------
-
-        /**
-         * Shows the autocomplete dropdown containing the available options.
-         */
-        open(): void;
-
-        /**
-         * Closes the autocomplete dropdown menu.
-         */
-        close(): void;
-
-        /**
-         * Calculates and applies the appropriate position of the dropdown.
-         */
-        positionDropdown(): void;
-
-        // Other
-        // ------------------------------------------------------------------------------------------------------------
-
-        /**
-         * Destroys the control and unbinds event listeners so that it can be garbage collected.
-         */
-        destroy(): void;
-
-        /**
-         * Loads options by invoking the the provided function. The function should accept one argument (callback)
-         * and invoke the callback with the results once they are available.
-         */
-        load(callback: (results: any) => any): void;
-
-        /**
-         * Brings the control into focus.
-         */
-        focus(): void;
-
-        /**
-         * Forces the control out of focus.
-         */
-        blur(): void;
-
-        /**
-         * Disables user input on the control (note: the control can still receive focus).
-         */
-        lock(): void;
-
-        /**
-         * Re-enables user input on the control.
-         */
-        unlock(): void;
-
-        /**
-         * Disables user input on the control completely. While disabled, it cannot receive focus.
-         */
-        disable(): void;
-
-        /**
-         * Enables the control so that it can respond to focus and user input.
-         */
-        enable(): void;
-
-        /**
-         * Returns the value of the control. If multiple items can be selected (e.g. <select multiple>), this
-         * returns an array. If only one item can be selected, this returns a string.
-         */
-        getValue(): any;
-
-        /**
-         * Resets the selected items to the given value(s).
-         */
-        setValue(value: T): void;
-        setValue(value: T[]): void;
-
-        /**
-         * Moves the caret to the specified position ("index" being the index in the list of selected items).
-         */
-        setCaret(index: number): void;
-
-        /**
-         * Returns whether or not the user can select more items.
-         */
-        isFull(): boolean;
-
-        /**
-         * Clears the render cache. Takes an optional template argument (e.g. "option", "item") to clear only that cache.
-         */
-        clearCache(template?: string): void;
-    }
-
-    interface ISearchToken {
-        regex: RegExp;
-        string: string;
-    }
-
-    interface ISearchResult {
-        id: string;
-        score: number;
-    }
-
-    interface ISearch {
-        /**
-         * Original search options.
-         */
-        options: any;
-
-        /**
-         * The raw user input
-         */
-        query: string;
-
-        /**
-         * An array containing parsed search tokens. A token is an object containing two properties: "string" and "regex".
-         */
-        tokens: ISearchToken[];
-
-        /**
-         * The total number of results.
-         */
-        total: number;
-
-        /**
-         * A list of matched results. Each result is an object containing two properties: "score" and "id".
-         */
-        items: ISearchResult[];
-    }
-}
-
-interface JQuery {
-    selectize(options?: Selectize.IOptions<any, any>): JQuery;
-}
-
-interface HTMLElement {
-    selectize: Selectize.IApi<any, any>;
-}
-
diff --git a/selectize/tsconfig.json b/selectize/tsconfig.json
new file mode 100644
index 0000000000..337a1491c4
--- /dev/null
+++ b/selectize/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "selectize-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/selenium-webdriver/selenium-webdriver.d.ts b/selenium-webdriver/index.d.ts
similarity index 100%
rename from selenium-webdriver/selenium-webdriver.d.ts
rename to selenium-webdriver/index.d.ts
diff --git a/selenium-webdriver/selenium-webdriver-tests.ts b/selenium-webdriver/selenium-webdriver-tests.ts
index 345a8efc5b..da141b8eb3 100644
--- a/selenium-webdriver/selenium-webdriver-tests.ts
+++ b/selenium-webdriver/selenium-webdriver-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="selenium-webdriver.d.ts" />
+
 
 function TestChromeDriver() {
     var driver: chrome.Driver = new chrome.Driver();
diff --git a/selenium-webdriver/tsconfig.json b/selenium-webdriver/tsconfig.json
new file mode 100644
index 0000000000..5c3c9df42a
--- /dev/null
+++ b/selenium-webdriver/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "selenium-webdriver-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/semaphore/index.d.ts b/semaphore/index.d.ts
new file mode 100644
index 0000000000..7ee1165ef7
--- /dev/null
+++ b/semaphore/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for semaphore v1.0.3
+// Project: https://github.com/abrkn/semaphore.js
+// Definitions by: Matt Frantz <https://github.com/mhfrantz/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare function semaphore(capacity?: number): semaphore.Semaphore;
+
+declare namespace semaphore {
+
+    interface Task {
+        (): void;
+    }
+
+    interface Semaphore {
+        capacity: number;
+
+        take(task: Task): void;
+        take(n: number, task: Task): void;
+
+        leave(n?: number): void;
+    }
+}
+export = semaphore;
diff --git a/semaphore/semaphore-tests.ts b/semaphore/semaphore-tests.ts
index d6df36030a..c3d53990fc 100644
--- a/semaphore/semaphore-tests.ts
+++ b/semaphore/semaphore-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="semaphore.d.ts"/>
-
 import semaphore = require('semaphore');
 
 var sem: semaphore.Semaphore = semaphore(10);
diff --git a/semaphore/semaphore.d.ts b/semaphore/semaphore.d.ts
deleted file mode 100644
index 8de9f58718..0000000000
--- a/semaphore/semaphore.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// Type definitions for semaphore v1.0.3
-// Project: https://github.com/abrkn/semaphore.js
-// Definitions by: Matt Frantz <https://github.com/mhfrantz/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'semaphore' {
-
-  function semaphore(capacity?: number): semaphore.Semaphore;
-
-  namespace semaphore {
-
-    interface Task {
-      (): void;
-    }
-
-    interface Semaphore {
-      capacity: number;
-
-      take(task: Task): void;
-      take(n: number, task: Task): void;
-
-      leave(n?: number): void;
-    }
-  }
-  export = semaphore;
-}
diff --git a/semaphore/tsconfig.json b/semaphore/tsconfig.json
new file mode 100644
index 0000000000..8e49864266
--- /dev/null
+++ b/semaphore/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "semaphore-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/semver/semver.d.ts b/semver/index.d.ts
similarity index 100%
rename from semver/semver.d.ts
rename to semver/index.d.ts
diff --git a/semver/semver-tests.ts b/semver/semver-tests.ts
index d0b72d7f3d..6ec4332b3a 100644
--- a/semver/semver-tests.ts
+++ b/semver/semver-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="semver.d.ts" />
+
 
 var obj:Object;
 var bool:boolean;
diff --git a/semver/tsconfig.json b/semver/tsconfig.json
new file mode 100644
index 0000000000..1e42c6dccb
--- /dev/null
+++ b/semver/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "semver-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sencha_touch/SenchaTouch-Tests.ts b/sencha_touch/SenchaTouch-Tests.ts
index bf0b693d10..52be985f6b 100644
--- a/sencha_touch/SenchaTouch-Tests.ts
+++ b/sencha_touch/SenchaTouch-Tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="SenchaTouch.d.ts" />
 
 Ext.application({
     name: 'Sencha',
diff --git a/sencha_touch/SenchaTouch-Tests.ts.tscparams b/sencha_touch/SenchaTouch-Tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/sencha_touch/SenchaTouch-Tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/sencha_touch/SenchaTouch.d.ts b/sencha_touch/index.d.ts
similarity index 100%
rename from sencha_touch/SenchaTouch.d.ts
rename to sencha_touch/index.d.ts
diff --git a/sencha_touch/tsconfig.json b/sencha_touch/tsconfig.json
new file mode 100644
index 0000000000..f62fc08969
--- /dev/null
+++ b/sencha_touch/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "SenchaTouch-Tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/sendgrid/index.d.ts b/sendgrid/index.d.ts
new file mode 100644
index 0000000000..841e2ac21c
--- /dev/null
+++ b/sendgrid/index.d.ts
@@ -0,0 +1,167 @@
+// Type definitions for sendgrid 1.1.0
+// Project: https://github.com/sendgrid/sendgrid-nodejs
+// Definitions by: Maxime LUCE <https://github.com/SomaticIT>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var ctor: Sendgrid.Constructor;
+export = ctor;
+
+declare namespace Sendgrid {
+    //#region Options
+
+    export interface UriParts {
+        protocol: string;
+        host: string;
+        port: string;
+        endpoint: string;
+    }
+
+    export interface Options {
+        protocol?: string;
+        host?: string;
+        port?: string;
+        endpoint?: string;
+        uri?: string;
+        proxy?: string;
+        web?: {
+            pool?: any;
+        }
+    }
+
+    export interface OptionsExport {
+        uriParts: UriParts;
+        uri: string;
+
+        proxy?: string;
+        web?: {
+            pool?: any;
+        }
+    }
+
+    //#endregion
+
+    //#region Email
+
+    export interface EmailOptions {
+        to?: any;
+        toname?: string;
+        from?: string;
+        fromname?: string;
+        subject?: string;
+        text?: string;
+        html?: string;
+        bcc?: any;
+        replyto?: string;
+        date?: Date;
+        headers?: { [key: string]: string };
+        files?: FileHandlerOptions[];
+        smtpapi?: any;
+    }
+
+    export class Email {
+        to: any;
+        toname: string;
+        from: string;
+        fromname: string;
+        subject: string;
+        text: string;
+        html: string;
+        bcc: any;
+        replyto: string;
+        date: Date;
+        headers: { [key: string]: string };
+        files: FileHandler[];
+        smtpapi: any;
+
+        constructor();
+        constructor(options: EmailOptions);
+
+        addTo(address: string): void;
+        addHeader(type: string, value: string): void;
+        addSubstitution(type: string, value: string): void;
+        addSubstitution(type: string, value: string[]): void;
+        addSection(section: { [key: string]: string }): void;
+        addUniqueArg(uarg: { [key: string]: string }): void;
+        addCategory(category: string): void;
+        addFilter(filter: string, command: string, value: number): void;
+        addFilter(filter: string, command: string, value: string): void;
+        addFile(file: FileHandlerOptions): void;
+
+        setFrom(address: string): void;
+        setSubject(subject: string): void;
+        setText(text: string): void;
+        setHtml(html: string): void;
+        setHeaders(headers: { [key: string]: string }): void;
+        setSubstitutions(substitutions: { [key: string]: string[] }): void;
+        setSections(sections: { [key: string]: string }): void;
+        setUniqueArgs(uargs: { [key: string]: string }): void;
+        setCategories(categories: string[]): void;
+        setFilters(filters: any): void;
+    }
+
+    //#endregion
+
+    //#region FileHandler
+
+    export interface FileHandlerOptions {
+        filename?: string;
+        contentType?: string;
+        cid?: string;
+        path?: string;
+        url?: string;
+        content?: any;
+    }
+
+    export class FileHandler {
+        filename: string;
+        contentType: string;
+        cid: string;
+
+        type: string;
+        content: string;
+        path: string;
+        url: string;
+
+        constructor(options: FileHandlerOptions);
+
+        loadContent(callback: HandlerCallback): void;
+
+        static handlers: {
+            content: Handler;
+            path: Handler;
+            url: Handler;
+            none: Handler;
+        };
+    }
+
+    export interface Handler {
+        (file: FileHandler, callback: HandlerCallback): void;
+    }
+
+    export interface HandlerCallback {
+        (hasError: boolean, error: Error): void;
+        (hasError: boolean, error: string): void;
+    }
+
+    //#endregion
+
+    //#region Sendgrid Class
+
+    interface Constructor {
+        (api_user: string, api_key: string, options?: Options): Instance;
+        new (api_user: string, api_key: string, options?: Options): Instance;
+    }
+
+    export interface Instance {
+        version: string;
+        api_user: string;
+        api_key: string;
+        options: OptionsExport;
+        Email: typeof Email;
+
+        send(email: EmailOptions, callback: (err: Error, json: any) => any): void;
+        send(email: Email, callback: (err: Error, json: any) => any): void;
+    }
+
+    //#endregion
+}
diff --git a/sendgrid/sendgrid-tests.ts b/sendgrid/sendgrid-tests.ts
index e7d34feb08..c764442702 100644
--- a/sendgrid/sendgrid-tests.ts
+++ b/sendgrid/sendgrid-tests.ts
@@ -4,8 +4,7 @@
  * Created by using code samples from https://github.com/sendgrid/sendgrid-nodejs#usage
  */
 
-///<reference path="../node/node.d.ts" />
-///<reference path="sendgrid.d.ts" />
+/// <reference types="node" />
 
 import sg = require("sendgrid");
 var sendgrid = sg("api_user", "api_key");
diff --git a/sendgrid/sendgrid.d.ts b/sendgrid/sendgrid.d.ts
deleted file mode 100644
index 602e3de4fd..0000000000
--- a/sendgrid/sendgrid.d.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-// Type definitions for sendgrid 1.1.0
-// Project: https://github.com/sendgrid/sendgrid-nodejs
-// Definitions by: Maxime LUCE <https://github.com/SomaticIT>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace Sendgrid {
-    //#region Options
-
-    export interface UriParts {
-        protocol: string;
-        host: string;
-        port: string;
-        endpoint: string;
-    }
-
-    export interface Options {
-        protocol?: string;
-        host?: string;
-        port?: string;
-        endpoint?: string;
-        uri?: string;
-        proxy?: string;
-        web?: {
-            pool?: any;
-        }
-    }
-
-    export interface OptionsExport {
-        uriParts: UriParts;
-        uri: string;
-
-        proxy?: string;
-        web?: {
-            pool?: any;
-        }
-    }
-
-    //#endregion
-
-    //#region Email
-
-    export interface EmailOptions {
-        to?: any;
-        toname?: string;
-        from?: string;
-        fromname?: string;
-        subject?: string;
-        text?: string;
-        html?: string;
-        bcc?: any;
-        replyto?: string;
-        date?: Date;
-        headers?: { [key: string]: string };
-        files?: FileHandlerOptions[];
-        smtpapi?: any;
-    }
-
-    export class Email {
-        to: any;
-        toname: string;
-        from: string;
-        fromname: string;
-        subject: string;
-        text: string;
-        html: string;
-        bcc: any;
-        replyto: string;
-        date: Date;
-        headers: { [key: string]: string };
-        files: FileHandler[];
-        smtpapi: any;
-
-        constructor();
-        constructor(options: EmailOptions);
-
-        addTo(address: string): void;
-        addHeader(type: string, value: string): void;
-        addSubstitution(type: string, value: string): void;
-        addSubstitution(type: string, value: string[]): void;
-        addSection(section: { [key: string]: string }): void;
-        addUniqueArg(uarg: { [key: string]: string }): void;
-        addCategory(category: string): void;
-        addFilter(filter: string, command: string, value: number): void;
-        addFilter(filter: string, command: string, value: string): void;
-        addFile(file: FileHandlerOptions): void;
-
-        setFrom(address: string): void;
-        setSubject(subject: string): void;
-        setText(text: string): void;
-        setHtml(html: string): void;
-        setHeaders(headers: { [key: string]: string }): void;
-        setSubstitutions(substitutions: { [key: string]: string[] }): void;
-        setSections(sections: { [key: string]: string }): void;
-        setUniqueArgs(uargs: { [key: string]: string }): void;
-        setCategories(categories: string[]): void;
-        setFilters(filters: any): void;
-    }
-
-    //#endregion
-
-    //#region FileHandler
-
-    export interface FileHandlerOptions {
-        filename?: string;
-        contentType?: string;
-        cid?: string;
-        path?: string;
-        url?: string;
-        content?: any;
-    }
-
-    export class FileHandler {
-        filename: string;
-        contentType: string;
-        cid: string;
-
-        type: string;
-        content: string;
-        path: string;
-        url: string;
-
-        constructor(options: FileHandlerOptions);
-
-        loadContent(callback: HandlerCallback): void;
-
-        static handlers: {
-            content: Handler;
-            path: Handler;
-            url: Handler;
-            none: Handler;
-        };
-    }
-
-    export interface Handler {
-        (file: FileHandler, callback: HandlerCallback): void;
-    }
-
-    export interface HandlerCallback {
-        (hasError: boolean, error: Error): void;
-        (hasError: boolean, error: string): void;
-    }
-
-    //#endregion
-
-    //#region Sendgrid Class
-
-    interface Constructor {
-        (api_user: string, api_key: string, options?: Options): Instance;
-        new (api_user: string, api_key: string, options?: Options): Instance;
-    }
-
-    export interface Instance {
-        version: string;
-        api_user: string;
-        api_key: string;
-        options: OptionsExport;
-        Email: typeof Email;
-
-        send(email: EmailOptions, callback: (err: Error, json: any) => any): void;
-        send(email: Email, callback: (err: Error, json: any) => any): void;
-    }
-
-    //#endregion
-}
-
-declare module "sendgrid" {
-    var ctor: Sendgrid.Constructor;
-    export = ctor;
-}
diff --git a/sendgrid/tsconfig.json b/sendgrid/tsconfig.json
new file mode 100644
index 0000000000..2a6c6746d6
--- /dev/null
+++ b/sendgrid/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sendgrid-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sentence-case/index.d.ts b/sentence-case/index.d.ts
new file mode 100644
index 0000000000..59f23e4b27
--- /dev/null
+++ b/sentence-case/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for sentence-case
+// Project: https://github.com/blakeembrey/sentence-case
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function sentenceCase(string: string, locale?: string, repl?: string): string;
+export = sentenceCase;
diff --git a/sentence-case/sentence-case-tests.ts b/sentence-case/sentence-case-tests.ts
index 569d35233f..67f27e26de 100644
--- a/sentence-case/sentence-case-tests.ts
+++ b/sentence-case/sentence-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="sentence-case.d.ts" />
 
 import sentenceCase = require('sentence-case');
 
diff --git a/sentence-case/sentence-case.d.ts b/sentence-case/sentence-case.d.ts
deleted file mode 100644
index ef5b2b7dda..0000000000
--- a/sentence-case/sentence-case.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for sentence-case
-// Project: https://github.com/blakeembrey/sentence-case
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "sentence-case" {
-	function sentenceCase(string: string, locale?: string, repl?: string): string;
-	export = sentenceCase;
-}
diff --git a/sentence-case/tsconfig.json b/sentence-case/tsconfig.json
new file mode 100644
index 0000000000..88d5994d1a
--- /dev/null
+++ b/sentence-case/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sentence-case-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sequelize-fixtures/index.d.ts b/sequelize-fixtures/index.d.ts
new file mode 100644
index 0000000000..42adaad7af
--- /dev/null
+++ b/sequelize-fixtures/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for Sequelize-Fixtures 0.4.7
+// Project: https://github.com/domasx2/sequelize-fixtures
+// Definitions by: Christian Schwarz <https://github.com/cschwarz/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as Sequelize from "../sequelize";
+
+declare namespace SequelizeFixtures {
+    interface Options {
+        encoding?: string,
+        log?: (message: string) => void,
+        transaction?: Sequelize.Transaction,
+        transformFixtureDataFn?: (data: any) => any
+    }
+
+    interface SequelizeFixturesStatic {
+        loadFile(file: string, models: any, options?: Options): Promise<any>;
+        loadFiles(files: string[], models: any, options?: Options): Promise<any>;
+        loadFixture(fixture: any, models: any, options?: Options): Promise<any>;
+        loadFixtures(fixtures: any[], models: any, options?: Options): Promise<any>;
+    }
+}
+
+declare var sequelizeFixtures: SequelizeFixtures.SequelizeFixturesStatic;
+
+export = sequelizeFixtures;
diff --git a/sequelize-fixtures/sequelize-fixtures-tests.ts b/sequelize-fixtures/sequelize-fixtures-tests.ts
index c6edfd28f1..a59c3b157e 100644
--- a/sequelize-fixtures/sequelize-fixtures-tests.ts
+++ b/sequelize-fixtures/sequelize-fixtures-tests.ts
@@ -1,7 +1,4 @@
-/// <reference path="../sequelize/sequelize.d.ts" />
-/// <reference path="sequelize-fixtures.d.ts" />
-
-import Sequelize = require('sequelize');
+import Sequelize = require('sequelize');
 import SequelizeFixtures = require('sequelize-fixtures');
 
 var sequelize = new Sequelize("", "");
diff --git a/sequelize-fixtures/sequelize-fixtures.d.ts b/sequelize-fixtures/sequelize-fixtures.d.ts
deleted file mode 100644
index 4f89bc46f6..0000000000
--- a/sequelize-fixtures/sequelize-fixtures.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-// Type definitions for Sequelize-Fixtures 0.4.7
-// Project: https://github.com/domasx2/sequelize-fixtures
-// Definitions by: Christian Schwarz <https://github.com/cschwarz/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../sequelize/sequelize.d.ts" />
-
-declare module "sequelize-fixtures"
-{
-    import * as Sequelize from "sequelize";
-
-    namespace SequelizeFixtures {
-        interface Options {
-            encoding?: string,
-            log?: (message: string) => void,
-            transaction?: Sequelize.Transaction,
-            transformFixtureDataFn?: (data: any) => any
-        }
-
-        interface SequelizeFixturesStatic {
-            loadFile(file: string, models: any, options?: Options): Promise<any>;
-            loadFiles(files: string[], models: any, options?: Options): Promise<any>;
-            loadFixture(fixture: any, models: any, options?: Options): Promise<any>;
-            loadFixtures(fixtures: any[], models: any, options?: Options): Promise<any>;
-        }
-    }
-
-    var sequelizeFixtures: SequelizeFixtures.SequelizeFixturesStatic;
-
-    export = sequelizeFixtures;
-}
diff --git a/sequelize-fixtures/tsconfig.json b/sequelize-fixtures/tsconfig.json
new file mode 100644
index 0000000000..fd93508965
--- /dev/null
+++ b/sequelize-fixtures/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sequelize-fixtures-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sequelize/index.d.ts b/sequelize/index.d.ts
new file mode 100644
index 0000000000..5c3dc8ad5f
--- /dev/null
+++ b/sequelize/index.d.ts
@@ -0,0 +1,6163 @@
+// Type definitions for Sequelize 3.4.1
+// Project: http://sequelizejs.com
+// Definitions by: samuelneff <https://github.com/samuelneff>, Peter Harris <https://github.com/codeanimal>, Ivan Drinchev <https://github.com/drinchev>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Based on original work by: samuelneff <https://github.com/samuelneff/sequelize-auto-ts/blob/master/lib/sequelize.d.ts>
+
+/// <reference types="lodash" />
+/// <reference types="bluebird" />
+/// <reference types="validator" />
+
+
+
+declare namespace sequelize {
+
+    //
+    //  Associations
+    // ~~~~~~~~~~~~~~
+    //
+    //  https://github.com/sequelize/sequelize/tree/v3.4.1/lib/associations
+    //
+
+
+    /**
+     * The options for the getAssociation mixin of the belongsTo association.
+     * @see BelongsToGetAssociationMixin
+     */
+    interface BelongsToGetAssociationMixinOptions {
+        /**
+         * Apply a scope on the related model, or remove its default scope by passing false.
+         */
+        scope?: string | boolean;
+    }
+
+    /**
+     * The getAssociation mixin applied to models with belongsTo.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsTo(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttrib>, UserAttrib {
+     *    getRole: Sequelize.BelongsToGetAssociationMixin<RoleInstance>;
+     *    // setRole...
+     *    // createRole...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to/
+     * @see Instance
+     */
+    interface BelongsToGetAssociationMixin<TInstance> {
+        /**
+         * Get the associated instance.
+         * @param options The options to use when getting the association.
+         */
+        (options?: BelongsToGetAssociationMixinOptions): Promise<TInstance>;
+    }
+
+    /**
+     * The options for the setAssociation mixin of the belongsTo association.
+     * @see BelongsToSetAssociationMixin
+     */
+    interface BelongsToSetAssociationMixinOptions {
+        /**
+         * Skip saving this after setting the foreign key if false.
+         */
+        save?: boolean;
+    }
+
+    /**
+     * The setAssociation mixin applied to models with belongsTo.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsTo(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRole...
+     *    setRole: Sequelize.BelongsToSetAssociationMixin<RoleInstance, RoleId>;
+     *    // createRole...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to/
+     * @see Instance
+     */
+    interface BelongsToSetAssociationMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Set the associated instance.
+         * @param newAssociation An instance or the primary key of an instance to associate with this. Pass null or undefined to remove the association.
+         * @param options the options passed to `this.save`.
+         */
+        (
+            newAssociation?: TInstance | TInstancePrimaryKey,
+            options?: BelongsToSetAssociationMixinOptions | InstanceSaveOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the createAssociation mixin of the belongsTo association.
+     * @see BelongsToCreateAssociationMixin
+     */
+    interface BelongsToCreateAssociationMixinOptions { }
+
+    /**
+     * The createAssociation mixin applied to models with belongsTo.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsTo(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRole...
+     *    // setRole...
+     *    createRole: Sequelize.BelongsToCreateAssociationMixin<RoleAttributes>;
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to/
+     * @see Instance
+     */
+    interface BelongsToCreateAssociationMixin<TAttributes> {
+        /**
+         * Create a new instance of the associated model and associate it with this.
+         * @param values The values used to create the association.
+         * @param options The options passed to `target.create` and `setAssociation`.
+         */
+        (
+            values?: TAttributes,
+            options?: BelongsToCreateAssociationMixinOptions | CreateOptions | BelongsToSetAssociationMixinOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the getAssociation mixin of the hasOne association.
+     * @see HasOneGetAssociationMixin
+     */
+    interface HasOneGetAssociationMixinOptions {
+        /**
+         * Apply a scope on the related model, or remove its default scope by passing false.
+         */
+        scope?: string | boolean;
+    }
+
+    /**
+     * The getAssociation mixin applied to models with hasOne.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasOne(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttrib>, UserAttrib {
+     *    getRole: Sequelize.HasOneGetAssociationMixin<RoleInstance>;
+     *    // setRole...
+     *    // createRole...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-one/
+     * @see Instance
+     */
+    interface HasOneGetAssociationMixin<TInstance> {
+        /**
+         * Get the associated instance.
+         * @param options The options to use when getting the association.
+         */
+        (options?: HasOneGetAssociationMixinOptions): Promise<TInstance>;
+    }
+
+    /**
+     * The options for the setAssociation mixin of the hasOne association.
+     * @see HasOneSetAssociationMixin
+     */
+    interface HasOneSetAssociationMixinOptions {
+        /**
+         * Skip saving this after setting the foreign key if false.
+         */
+        save?: boolean;
+    }
+
+    /**
+     * The setAssociation mixin applied to models with hasOne.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasOne(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRole...
+     *    setRole: Sequelize.HasOneSetAssociationMixin<RoleInstance, RoleId>;
+     *    // createRole...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-one/
+     * @see Instance
+     */
+    interface HasOneSetAssociationMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Set the associated instance.
+         * @param newAssociation An instance or the primary key of an instance to associate with this. Pass null or undefined to remove the association.
+         * @param options The options passed to `getAssocation` and `target.save`.
+         */
+        (
+            newAssociation?: TInstance | TInstancePrimaryKey,
+            options?: HasOneSetAssociationMixinOptions | HasOneGetAssociationMixinOptions | InstanceSaveOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the createAssociation mixin of the hasOne association.
+     * @see HasOneCreateAssociationMixin
+     */
+    interface HasOneCreateAssociationMixinOptions { }
+
+    /**
+     * The createAssociation mixin applied to models with hasOne.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasOne(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRole...
+     *    // setRole...
+     *    createRole: Sequelize.HasOneCreateAssociationMixin<RoleAttributes>;
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-one/
+     * @see Instance
+     */
+    interface HasOneCreateAssociationMixin<TAttributes> {
+        /**
+         * Create a new instance of the associated model and associate it with this.
+         * @param values The values used to create the association.
+         * @param options The options passed to `target.create` and `setAssociation`.
+         */
+        (
+            values?: TAttributes,
+            options?: HasOneCreateAssociationMixinOptions | HasOneSetAssociationMixinOptions | CreateOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the getAssociations mixin of the hasMany association.
+     * @see HasManyGetAssociationsMixin
+     */
+    interface HasManyGetAssociationsMixinOptions {
+
+        /**
+         * An optional where clause to limit the associated models.
+         */
+        where?: WhereOptions;
+
+        /**
+         * Apply a scope on the related model, or remove its default scope by passing false.
+         */
+        scope?: string | boolean;
+    }
+
+    /**
+     * The getAssociations mixin applied to models with hasMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasMany(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    getRoles: Sequelize.HasManyGetAssociationsMixin<RoleInstance>;
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
+     * @see Instance
+     */
+    interface HasManyGetAssociationsMixin<TInstance> {
+        /**
+         * Get everything currently associated with this, using an optional where clause.
+         * @param options The options to use when getting the associations.
+         */
+        (options?: HasManyGetAssociationsMixinOptions): Promise<TInstance[]>;
+    }
+
+    /**
+     * The options for the setAssociations mixin of the hasMany association.
+     * @see HasManySetAssociationsMixin
+     */
+    interface HasManySetAssociationsMixinOptions {
+
+        /**
+         * Run validation for the join model.
+         */
+        validate?: boolean;
+    }
+
+    /**
+     * The setAssociations mixin applied to models with hasMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasMany(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    setRoles: Sequelize.HasManySetAssociationsMixin<RoleInstance, RoleId>;
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
+     * @see Instance
+     */
+    interface HasManySetAssociationsMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Set the associated models by passing an array of instances or their primary keys.
+         * Everything that it not in the passed array will be un-associated.
+         * @param newAssociations An array of instances or primary key of instances to associate with this. Pass null or undefined to remove all associations.
+         * @param options The options passed to `target.findAll` and `update`.
+         */
+        (
+            newAssociations?: Array<TInstance | TInstancePrimaryKey>,
+            options?: HasManySetAssociationsMixinOptions | FindOptions | InstanceUpdateOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the addAssociations mixin of the hasMany association.
+     * @see HasManyAddAssociationsMixin
+     */
+    interface HasManyAddAssociationsMixinOptions {
+
+        /**
+         * Run validation for the join model.
+         */
+        validate?: boolean;
+    }
+
+    /**
+     * The addAssociations mixin applied to models with hasMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasMany(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    addRoles: Sequelize.HasManyAddAssociationsMixin<RoleInstance, RoleId>;
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
+     * @see Instance
+     */
+    interface HasManyAddAssociationsMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Associate several instances with this.
+         * @param newAssociations An array of instances or primary key of instances to associate with this.
+         * @param options The options passed to `target.update`.
+         */
+        (
+            newAssociations?: Array<TInstance | TInstancePrimaryKey>,
+            options?: HasManyAddAssociationsMixinOptions | InstanceUpdateOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the addAssociation mixin of the hasMany association.
+     * @see HasManyAddAssociationMixin
+     */
+    interface HasManyAddAssociationMixinOptions {
+
+        /**
+         * Run validation for the join model.
+         */
+        validate?: boolean;
+    }
+
+    /**
+     * The addAssociation mixin applied to models with hasMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasMany(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    addRole: Sequelize.HasManyAddAssociationMixin<RoleInstance, RoleId>;
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
+     * @see Instance
+     */
+    interface HasManyAddAssociationMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Associate an instance with this.
+         * @param newAssociation An instance or the primary key of an instance to associate with this.
+         * @param options The options passed to `target.update`.
+         */
+        (
+            newAssociation?: TInstance | TInstancePrimaryKey,
+            options?: HasManyAddAssociationMixinOptions | InstanceUpdateOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the createAssociation mixin of the hasMany association.
+     * @see HasManyCreateAssociationMixin
+     */
+    interface HasManyCreateAssociationMixinOptions { }
+
+    /**
+     * The createAssociation mixin applied to models with hasMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasMany(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    createRole: Sequelize.HasManyCreateAssociationMixin<RoleAttributes>;
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
+     * @see Instance
+     */
+    interface HasManyCreateAssociationMixin<TAttributes> {
+        /**
+         * Create a new instance of the associated model and associate it with this.
+         * @param values The values used to create the association.
+         * @param options The options to use when creating the association.
+         */
+        (
+            values?: TAttributes,
+            options?: HasManyCreateAssociationMixinOptions | CreateOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the removeAssociation mixin of the hasMany association.
+     * @see HasManyRemoveAssociationMixin
+     */
+    interface HasManyRemoveAssociationMixinOptions { }
+
+    /**
+     * The removeAssociation mixin applied to models with hasMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasMany(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    removeRole: Sequelize.HasManyRemoveAssociationMixin<RoleInstance, RoleId>;
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
+     * @see Instance
+     */
+    interface HasManyRemoveAssociationMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Un-associate the instance.
+         * @param oldAssociated The instance or the primary key of the instance to un-associate.
+         * @param options The options passed to `target.update`.
+         */
+        (
+            oldAssociated?: TInstance | TInstancePrimaryKey,
+            options?: HasManyRemoveAssociationMixinOptions | InstanceUpdateOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the removeAssociations mixin of the hasMany association.
+     * @see HasManyRemoveAssociationsMixin
+     */
+    interface HasManyRemoveAssociationsMixinOptions { }
+
+    /**
+     * The removeAssociations mixin applied to models with hasMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasMany(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    removeRoles: Sequelize.HasManyRemoveAssociationsMixin<RoleInstance, RoleId>;
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
+     * @see Instance
+     */
+    interface HasManyRemoveAssociationsMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Un-associate several instances.
+         * @param oldAssociated An array of instances or primary key of instances to un-associate.
+         * @param options The options passed to `target.update`.
+         */
+        (
+            oldAssociateds?: Array<TInstance | TInstancePrimaryKey>,
+            options?: HasManyRemoveAssociationsMixinOptions | InstanceUpdateOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the hasAssociation mixin of the hasMany association.
+     * @see HasManyHasAssociationMixin
+     */
+    interface HasManyHasAssociationMixinOptions { }
+
+    /**
+     * The hasAssociation mixin applied to models with hasMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasMany(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    hasRole: Sequelize.HasManyHasAssociationMixin<RoleInstance, RoleId>;
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
+     * @see Instance
+     */
+    interface HasManyHasAssociationMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Check if an instance is associated with this.
+         * @param target The instance or the primary key of the instance to check.
+         * @param options The options passed to `getAssociations`.
+         */
+        (
+            target: TInstance | TInstancePrimaryKey,
+            options?: HasManyHasAssociationMixinOptions | HasManyGetAssociationsMixinOptions
+        ): Promise<boolean>;
+    }
+
+    /**
+     * The options for the hasAssociations mixin of the hasMany association.
+     * @see HasManyHasAssociationsMixin
+     */
+    interface HasManyHasAssociationsMixinOptions { }
+
+    /**
+     * The removeAssociations mixin applied to models with hasMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasMany(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles
+     *    // hasRole...
+     *    hasRoles: Sequelize.HasManyHasAssociationsMixin<RoleInstance, RoleId>;
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
+     * @see Instance
+     */
+    interface HasManyHasAssociationsMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Check if all instances are associated with this.
+         * @param targets An array of instances or primary key of instances to check.
+         * @param options The options passed to `getAssociations`.
+         */
+        (
+            targets: Array<TInstance | TInstancePrimaryKey>,
+            options?: HasManyHasAssociationsMixinOptions | HasManyGetAssociationsMixinOptions
+        ): Promise<boolean>;
+    }
+
+    /**
+     * The options for the countAssociations mixin of the hasMany association.
+     * @see HasManyCountAssociationsMixin
+     */
+    interface HasManyCountAssociationsMixinOptions {
+
+        /**
+         * An optional where clause to limit the associated models.
+         */
+        where?: WhereOptions;
+
+        /**
+         * Apply a scope on the related model, or remove its default scope by passing false.
+         */
+        scope?: string | boolean;
+    }
+
+    /**
+     * The countAssociations mixin applied to models with hasMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasMany(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    countRoles: Sequelize.HasManyCountAssociationsMixin;
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
+     * @see Instance
+     */
+    interface HasManyCountAssociationsMixin {
+        /**
+         * Count everything currently associated with this, using an optional where clause.
+         * @param options The options to use when counting the associations.
+         */
+        (options?: HasManyCountAssociationsMixinOptions): Promise<number>;
+    }
+
+    /**
+     * The options for the getAssociations mixin of the belongsToMany association.
+     * @see BelongsToManyGetAssociationsMixin
+     */
+    interface BelongsToManyGetAssociationsMixinOptions {
+
+        /**
+         * An optional where clause to limit the associated models.
+         */
+        where?: WhereOptions;
+
+        /**
+         * Apply a scope on the related model, or remove its default scope by passing false.
+         */
+        scope?: string | boolean;
+    }
+
+    /**
+     * The getAssociations mixin applied to models with belongsToMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsToMany(Role, { through: UserRole });
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    getRoles: Sequelize.BelongsToManyGetAssociationsMixin<RoleInstance>;
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
+     * @see Instance
+     */
+    interface BelongsToManyGetAssociationsMixin<TInstance> {
+        /**
+         * Get everything currently associated with this, using an optional where clause.
+         * @param options The options to use when getting the associations.
+         */
+        (options?: BelongsToManyGetAssociationsMixinOptions): Promise<TInstance[]>;
+    }
+
+    /**
+     * The options for the setAssociations mixin of the belongsToMany association.
+     * @see BelongsToManySetAssociationsMixin
+     */
+    interface BelongsToManySetAssociationsMixinOptions {
+
+        /**
+         * Run validation for the join model.
+         */
+        validate?: boolean;
+    }
+
+    /**
+     * The setAssociations mixin applied to models with belongsToMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsToMany(Role, { through: UserRole });
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    setRoles: Sequelize.BelongsToManySetAssociationsMixin<RoleInstance, RoleId, UserRoleAttributes>;
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
+     * @see Instance
+     */
+    interface BelongsToManySetAssociationsMixin<TInstance, TInstancePrimaryKey, TJoinTableAttributes> {
+        /**
+         * Set the associated models by passing an array of instances or their primary keys.
+         * Everything that it not in the passed array will be un-associated.
+         * @param newAssociations An array of instances or primary key of instances to associate with this. Pass null or undefined to remove all associations.
+         * @param options The options passed to `through.findAll`, `bulkCreate`, `update` and `destroy`. Can also hold additional attributes for the join table.
+         */
+        (
+            newAssociations?: Array<TInstance | TInstancePrimaryKey>,
+            options?: BelongsToManySetAssociationsMixinOptions | FindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | TJoinTableAttributes
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the addAssociations mixin of the belongsToMany association.
+     * @see BelongsToManyAddAssociationsMixin
+     */
+    interface BelongsToManyAddAssociationsMixinOptions {
+
+        /**
+         * Run validation for the join model.
+         */
+        validate?: boolean;
+    }
+
+    /**
+     * The addAssociations mixin applied to models with belongsToMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsToMany(Role, { through: UserRole });
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    addRoles: Sequelize.BelongsToManyAddAssociationsMixin<RoleInstance, RoleId, UserRoleAttributes>;
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
+     * @see Instance
+     */
+    interface BelongsToManyAddAssociationsMixin<TInstance, TInstancePrimaryKey, TJoinTableAttributes> {
+        /**
+         * Associate several instances with this.
+         * @param newAssociations An array of instances or primary key of instances to associate with this.
+         * @param options The options passed to `through.findAll`, `bulkCreate`, `update` and `destroy`. Can also hold additional attributes for the join table.
+         */
+        (
+            newAssociations?: Array<TInstance | TInstancePrimaryKey>,
+            options?: BelongsToManyAddAssociationsMixinOptions | FindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | TJoinTableAttributes
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the addAssociation mixin of the belongsToMany association.
+     * @see BelongsToManyAddAssociationMixin
+     */
+    interface BelongsToManyAddAssociationMixinOptions {
+
+        /**
+         * Run validation for the join model.
+         */
+        validate?: boolean;
+    }
+
+    /**
+     * The addAssociation mixin applied to models with belongsToMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsToMany(Role, { through: UserRole });
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    addRole: Sequelize.BelongsToManyAddAssociationMixin<RoleInstance, RoleId, UserRoleAttributes>;
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
+     * @see Instance
+     */
+    interface BelongsToManyAddAssociationMixin<TInstance, TInstancePrimaryKey, TJoinTableAttributes> {
+        /**
+         * Associate an instance with this.
+         * @param newAssociation An instance or the primary key of an instance to associate with this.
+         * @param options The options passed to `through.findAll`, `bulkCreate`, `update` and `destroy`. Can also hold additional attributes for the join table.
+         */
+        (
+            newAssociation?: TInstance | TInstancePrimaryKey,
+            options?: BelongsToManyAddAssociationMixinOptions | FindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | TJoinTableAttributes
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the createAssociation mixin of the belongsToMany association.
+     * @see BelongsToManyCreateAssociationMixin
+     */
+    interface BelongsToManyCreateAssociationMixinOptions { }
+
+    /**
+     * The createAssociation mixin applied to models with belongsToMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsToMany(Role, { through: UserRole });
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    createRole: Sequelize.BelongsToManyCreateAssociationMixin<RoleAttributes, UserRoleAttributes>;
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
+     * @see Instance
+     */
+    interface BelongsToManyCreateAssociationMixin<TAttributes, TJoinTableAttributes> {
+        /**
+         * Create a new instance of the associated model and associate it with this.
+         * @param values The values used to create the association.
+         * @param options Options passed to `create` and `add`. Can also hold additional attributes for the join table.
+         */
+        (
+            values?: TAttributes,
+            options?: BelongsToManyCreateAssociationMixinOptions | CreateOptions | TJoinTableAttributes
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the removeAssociation mixin of the belongsToMany association.
+     * @see BelongsToManyRemoveAssociationMixin
+     */
+    interface BelongsToManyRemoveAssociationMixinOptions { }
+
+    /**
+     * The removeAssociation mixin applied to models with belongsToMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsToMany(Role, { through: UserRole });
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    removeRole: Sequelize.BelongsToManyRemoveAssociationMixin<RoleInstance, RoleId>;
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
+     * @see Instance
+     */
+    interface BelongsToManyRemoveAssociationMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Un-associate the instance.
+         * @param oldAssociated The instance or the primary key of the instance to un-associate.
+         * @param options The options passed to `through.destroy`.
+         */
+        (
+            oldAssociated?: TInstance | TInstancePrimaryKey,
+            options?: BelongsToManyRemoveAssociationMixinOptions | InstanceDestroyOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the removeAssociations mixin of the belongsToMany association.
+     * @see BelongsToManyRemoveAssociationsMixin
+     */
+    interface BelongsToManyRemoveAssociationsMixinOptions { }
+
+    /**
+     * The removeAssociations mixin applied to models with belongsToMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsToMany(Role, { through: UserRole });
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    removeRoles: Sequelize.BelongsToManyRemoveAssociationsMixin<RoleInstance, RoleId>;
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
+     * @see Instance
+     */
+    interface BelongsToManyRemoveAssociationsMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Un-associate several instances.
+         * @param oldAssociated An array of instances or primary key of instances to un-associate.
+         * @param options The options passed to `through.destroy`.
+         */
+        (
+            oldAssociateds?: Array<TInstance | TInstancePrimaryKey>,
+            options?: BelongsToManyRemoveAssociationsMixinOptions | InstanceDestroyOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the hasAssociation mixin of the belongsToMany association.
+     * @see BelongsToManyHasAssociationMixin
+     */
+    interface BelongsToManyHasAssociationMixinOptions { }
+
+    /**
+     * The hasAssociation mixin applied to models with belongsToMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsToMany(Role, { through: UserRole });
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    hasRole: Sequelize.BelongsToManyHasAssociationMixin<RoleInstance, RoleId>;
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
+     * @see Instance
+     */
+    interface BelongsToManyHasAssociationMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Check if an instance is associated with this.
+         * @param target The instance or the primary key of the instance to check.
+         * @param options The options passed to `getAssociations`.
+         */
+        (
+            target: TInstance | TInstancePrimaryKey,
+            options?: BelongsToManyHasAssociationMixinOptions | BelongsToManyGetAssociationsMixinOptions
+        ): Promise<boolean>;
+    }
+
+    /**
+     * The options for the hasAssociations mixin of the belongsToMany association.
+     * @see BelongsToManyHasAssociationsMixin
+     */
+    interface BelongsToManyHasAssociationsMixinOptions { }
+
+    /**
+     * The removeAssociations mixin applied to models with belongsToMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsToMany(Role, { through: UserRole });
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles
+     *    // hasRole...
+     *    hasRoles: Sequelize.BelongsToManyHasAssociationsMixin<RoleInstance, RoleId>;
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
+     * @see Instance
+     */
+    interface BelongsToManyHasAssociationsMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Check if all instances are associated with this.
+         * @param targets An array of instances or primary key of instances to check.
+         * @param options The options passed to `getAssociations`.
+         */
+        (
+            targets: Array<TInstance | TInstancePrimaryKey>,
+            options?: BelongsToManyHasAssociationsMixinOptions | BelongsToManyGetAssociationsMixinOptions
+        ): Promise<boolean>;
+    }
+
+    /**
+     * The options for the countAssociations mixin of the belongsToMany association.
+     * @see BelongsToManyCountAssociationsMixin
+     */
+    interface BelongsToManyCountAssociationsMixinOptions {
+
+        /**
+         * An optional where clause to limit the associated models.
+         */
+        where?: WhereOptions;
+
+        /**
+         * Apply a scope on the related model, or remove its default scope by passing false.
+         */
+        scope?: string | boolean;
+    }
+
+    /**
+     * The countAssociations mixin applied to models with belongsToMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsToMany(Role, { through: UserRole });
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    countRoles: Sequelize.BelongsToManyCountAssociationsMixin;
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
+     * @see Instance
+     */
+    interface BelongsToManyCountAssociationsMixin {
+        /**
+         * Count everything currently associated with this, using an optional where clause.
+         * @param options The options to use when counting the associations.
+         */
+        (options?: BelongsToManyCountAssociationsMixinOptions): Promise<number>;
+    }
+
+    /**
+     * Foreign Key Options
+     *
+     * @see AssociationOptions
+     */
+    interface AssociationForeignKeyOptions extends ColumnOptions {
+
+        /**
+         *  Attribute name for the relation
+         */
+        name?: string;
+
+    }
+
+    /**
+     * Options provided when associating models
+     *
+     * @see Association class
+     */
+    interface AssociationOptions {
+
+        /**
+         * Set to true to run before-/afterDestroy hooks when an associated model is deleted because of a cascade.
+         * For example if `User.hasOne(Profile, {onDelete: 'cascade', hooks:true})`, the before-/afterDestroy hooks
+         * for profile will be called when a user is deleted. Otherwise the profile will be deleted without invoking
+         * any hooks.
+         *
+         * Defaults to false
+         */
+        hooks?: boolean;
+
+        /**
+         * The alias of this model, in singular form. See also the `name` option passed to `sequelize.define`. If
+         * you create multiple associations between the same tables, you should provide an alias to be able to
+         * distinguish between them. If you provide an alias when creating the assocition, you should provide the
+         * same alias when eager loading and when getting assocated models. Defaults to the singularized name of
+         * target
+         */
+        as?: string | { singular: string, plural: string };
+
+        /**
+         * The name of the foreign key in the target table or an object representing the type definition for the
+         * foreign column (see `Sequelize.define` for syntax). When using an object, you can add a `name` property
+         * to set the name of the column. Defaults to the name of source + primary key of source
+         */
+        foreignKey?: string | AssociationForeignKeyOptions;
+
+        /**
+         * What happens when delete occurs.
+         *
+         * Cascade if this is a n:m, and set null if it is a 1:m
+         *
+         * Defaults to 'SET NULL' or 'CASCADE'
+         */
+        onDelete?: string;
+
+        /**
+         * What happens when update occurs
+         *
+         * Defaults to 'CASCADE'
+         */
+        onUpdate?: string;
+
+        /**
+         * Should on update and on delete constraints be enabled on the foreign key.
+         */
+        constraints?: boolean;
+        foreignKeyConstraint?: boolean;
+
+    }
+
+    /**
+     * Options for Association Scope
+     *
+     * @see AssociationOptionsManyToMany
+     */
+    interface AssociationScope {
+
+        /**
+         * The name of the column that will be used for the associated scope and it's value
+         */
+        [scopeName: string]: any;
+
+    }
+
+    /**
+     * Options provided for many-to-many relationships
+     *
+     * @see AssociationOptionsHasMany
+     * @see AssociationOptionsBelongsToMany
+     */
+    interface AssociationOptionsManyToMany extends AssociationOptions {
+
+        /**
+         * A key/value set that will be used for association create and find defaults on the target.
+         * (sqlite not supported for N:M)
+         */
+        scope?: AssociationScope;
+
+    }
+
+    /**
+     * Options provided when associating models with hasOne relationship
+     *
+     * @see Association class hasOne method
+     */
+    interface AssociationOptionsHasOne extends AssociationOptions {
+
+        /**
+         * A string or a data type to represent the identifier in the table
+         */
+        keyType?: DataTypeAbstract;
+
+    }
+
+    /**
+     * Options provided when associating models with belongsTo relationship
+     *
+     * @see Association class belongsTo method
+     */
+    interface AssociationOptionsBelongsTo extends AssociationOptions {
+
+        /**
+         * The name of the field to use as the key for the association in the target table. Defaults to the primary
+         * key of the target table
+         */
+        targetKey?: string;
+
+        /**
+         * A string or a data type to represent the identifier in the table
+         */
+        keyType?: DataTypeAbstract;
+
+    }
+
+    /**
+     * Options provided when associating models with hasMany relationship
+     *
+     * @see Association class hasMany method
+     */
+    interface AssociationOptionsHasMany extends AssociationOptionsManyToMany {
+
+        /**
+         * A string or a data type to represent the identifier in the table
+         */
+        keyType?: DataTypeAbstract;
+
+    }
+
+    /**
+     * Options provided when associating models with belongsToMany relationship
+     *
+     * @see Association class belongsToMany method
+     */
+    interface AssociationOptionsBelongsToMany extends AssociationOptionsManyToMany {
+
+        /**
+         * The name of the table that is used to join source and target in n:m associations. Can also be a
+         * sequelize
+         * model if you want to define the junction table yourself and add extra attributes to it.
+         *
+         * In 3.4.1 version of Sequelize, hasMany's use of through gives an error, and on the other hand through
+         * option for belongsToMany has been made required.
+         *
+         * @see https://github.com/sequelize/sequelize/blob/v3.4.1/lib/associations/has-many.js
+         * @see https://github.com/sequelize/sequelize/blob/v3.4.1/lib/associations/belongs-to-many.js
+         */
+        through: Model<any, any> | string | ThroughOptions;
+
+        /**
+         * The name of the foreign key in the join table (representing the target model) or an object representing
+         * the type definition for the other column (see `Sequelize.define` for syntax). When using an object, you
+         * can add a `name` property to set the name of the colum. Defaults to the name of target + primary key of
+         * target
+         */
+        otherKey?: string | AssociationForeignKeyOptions;
+
+    }
+
+    /**
+     * Used for a association table in n:m associations.
+     *
+     * @see AssociationOptionsBelongsToMany
+     */
+    interface ThroughOptions {
+
+        /**
+         * The model used to join both sides of the N:M association.
+         */
+        model: Model<any, any>;
+
+        /**
+         * A key/value set that will be used for association create and find defaults on the through model.
+         * (Remember to add the attributes to the through model)
+         */
+        scope?: AssociationScope;
+
+        /**
+         * If true a unique key will be generated from the foreign keys used (might want to turn this off and create
+         * specific unique keys when using scopes)
+         *
+         * Defaults to true
+         */
+        unique?: boolean;
+
+    }
+
+    /**
+     * Creating assocations in sequelize is done by calling one of the belongsTo / hasOne / hasMany functions on a
+     * model (the source), and providing another model as the first argument to the function (the target).
+     *
+     * * hasOne - adds a foreign key to target
+     * * belongsTo - add a foreign key to source
+     * * hasMany - adds a foreign key to target, unless you also specify that target hasMany source, in which case
+     * a
+     * junction table is created with sourceId and targetId
+     *
+     * Creating an association will add a foreign key constraint to the attributes. All associations use `CASCADE`
+     * on update and `SET NULL` on delete, except for n:m, which also uses `CASCADE` on delete.
+     *
+     * When creating associations, you can provide an alias, via the `as` option. This is useful if the same model
+     * is associated twice, or you want your association to be called something other than the name of the target
+     * model.
+     *
+     * As an example, consider the case where users have many pictures, one of which is their profile picture. All
+     * pictures have a `userId`, but in addition the user model also has a `profilePictureId`, to be able to easily
+     * load the user's profile picture.
+     *
+     * ```js
+     * User.hasMany(Picture)
+     * User.belongsTo(Picture, { as: 'ProfilePicture', constraints: false })
+     *
+     * user.getPictures() // gets you all pictures
+     * user.getProfilePicture() // gets you only the profile picture
+     *
+     * User.findAll({
+     *   where: ...,
+     *   include: [
+     *     { model: Picture }, // load all pictures
+     *     { model: Picture, as: 'ProfilePicture' }, // load the profile picture. Notice that the spelling must be
+     * the exact same as the one in the association
+     *   ]
+     * })
+     * ```
+     * To get full control over the foreign key column added by sequelize, you can use the `foreignKey` option. It
+     * can either be a string, that specifies the name, or and object type definition,
+     * equivalent to those passed to `sequelize.define`.
+     *
+     * ```js
+     * User.hasMany(Picture, { foreignKey: 'uid' })
+     * ```
+     *
+     * The foreign key column in Picture will now be called `uid` instead of the default `userId`.
+     *
+     * ```js
+     * User.hasMany(Picture, {
+     *   foreignKey: {
+     *     name: 'uid',
+     *     allowNull: false
+     *   }
+     * })
+     * ```
+     *
+     * This specifies that the `uid` column can not be null. In most cases this will already be covered by the
+     * foreign key costraints, which sequelize creates automatically, but can be useful in case where the foreign
+     * keys are disabled, e.g. due to circular references (see `constraints: false` below).
+     *
+     * When fetching associated models, you can limit your query to only load some models. These queries are
+     * written
+     * in the same way as queries to `find`/`findAll`. To only get pictures in JPG, you can do:
+     *
+     * ```js
+     * user.getPictures({
+     *   where: {
+     *     format: 'jpg'
+     *   }
+     * })
+     * ```
+     *
+     * There are several ways to update and add new assoications. Continuing with our example of users and
+     * pictures:
+     * ```js
+     * user.addPicture(p) // Add a single picture
+     * user.setPictures([p1, p2]) // Associate user with ONLY these two picture, all other associations will be
+     * deleted user.addPictures([p1, p2]) // Associate user with these two pictures, but don't touch any current
+     * associations
+     * ```
+     *
+     * You don't have to pass in a complete object to the association functions, if your associated model has a
+     * single primary key:
+     *
+     * ```js
+     * user.addPicture(req.query.pid) // Here pid is just an integer, representing the primary key of the picture
+     * ```
+     *
+     * In the example above we have specified that a user belongs to his profile picture. Conceptually, this might
+     * not make sense, but since we want to add the foreign key to the user model this is the way to do it.
+     *
+     * Note how we also specified `constraints: false` for profile picture. This is because we add a foreign key
+     * from user to picture (profilePictureId), and from picture to user (userId). If we were to add foreign keys
+     * to both, it would create a cyclic dependency, and sequelize would not know which table to create first,
+     * since user depends on picture, and picture depends on user. These kinds of problems are detected by
+     * sequelize before the models are synced to the database, and you will get an error along the lines of `Error:
+     * Cyclic dependency found. 'users' is dependent of itself`. If you encounter this, you should either disable
+     * some constraints, or rethink your associations completely.
+     *
+     * @see Sequelize.Model
+     */
+    interface Associations {
+
+        /**
+         * Creates an association between this (the source) and the provided target. The foreign key is added
+         * on the target.
+         *
+         * Example: `User.hasOne(Profile)`. This will add userId to the profile table.
+         *
+         * @param target The model that will be associated with hasOne relationship
+         * @param options Options for the association
+         */
+        hasOne(target: Model<any, any>, options?: AssociationOptionsHasOne): void;
+
+        /**
+         * Creates an association between this (the source) and the provided target. The foreign key is added on the
+         * source.
+         *
+         * Example: `Profile.belongsTo(User)`. This will add userId to the profile table.
+         *
+         * @param target The model that will be associated with hasOne relationship
+         * @param options Options for the association
+         */
+        belongsTo(target: Model<any, any>, options?: AssociationOptionsBelongsTo): void;
+
+        /**
+         * Create an association that is either 1:m or n:m.
+         *
+         * ```js
+         * // Create a 1:m association between user and project
+         * User.hasMany(Project)
+         * ```
+         * ```js
+         * // Create a n:m association between user and project
+         * User.hasMany(Project)
+         * Project.hasMany(User)
+         * ```
+         * By default, the name of the join table will be source+target, so in this case projectsusers. This can be
+         * overridden by providing either a string or a Model as `through` in the options. If you use a through
+         * model with custom attributes, these attributes can be set when adding / setting new associations in two
+         * ways. Consider users and projects from before with a join table that stores whether the project has been
+         * started yet:
+         * ```js
+         * var UserProjects = sequelize.define('userprojects', {
+         *   started: Sequelize.BOOLEAN
+         * })
+         * User.hasMany(Project, { through: UserProjects })
+         * Project.hasMany(User, { through: UserProjects })
+         * ```
+         * ```js
+         * jan.addProject(homework, { started: false }) // The homework project is not started yet
+         * jan.setProjects([makedinner, doshopping], { started: true}) // Both shopping and dinner have been
+         * started
+         * ```
+         *
+         * If you want to set several target instances, but with different attributes you have to set the
+         * attributes on the instance, using a property with the name of the through model:
+         *
+         * ```js
+         * p1.userprojects {
+         *   started: true
+         * }
+         * user.setProjects([p1, p2], {started: false}) // The default value is false, but p1 overrides that.
+         * ```
+         *
+         * Similarily, when fetching through a join table with custom attributes, these attributes will be
+         * available as an object with the name of the through model.
+         * ```js
+         * user.getProjects().then(function (projects) {
+         *   var p1 = projects[0]
+         *   p1.userprojects.started // Is this project started yet?
+         * })
+         * ```
+         *
+         * @param target The model that will be associated with hasOne relationship
+         * @param options Options for the association
+         */
+        hasMany(target: Model<any, any>, options?: AssociationOptionsHasMany): void;
+
+        /**
+         * Create an N:M association with a join table
+         *
+         * ```js
+         * User.belongsToMany(Project)
+         * Project.belongsToMany(User)
+         * ```
+         * By default, the name of the join table will be source+target, so in this case projectsusers. This can be
+         * overridden by providing either a string or a Model as `through` in the options.
+         *
+         * If you use a through model with custom attributes, these attributes can be set when adding / setting new
+         * associations in two ways. Consider users and projects from before with a join table that stores whether
+         * the project has been started yet:
+         * ```js
+         * var UserProjects = sequelize.define('userprojects', {
+         *   started: Sequelize.BOOLEAN
+         * })
+         * User.belongsToMany(Project, { through: UserProjects })
+         * Project.belongsToMany(User, { through: UserProjects })
+         * ```
+         * ```js
+         * jan.addProject(homework, { started: false }) // The homework project is not started yet
+         * jan.setProjects([makedinner, doshopping], { started: true}) // Both shopping and dinner has been started
+         * ```
+         *
+         * If you want to set several target instances, but with different attributes you have to set the
+         * attributes on the instance, using a property with the name of the through model:
+         *
+         * ```js
+         * p1.userprojects {
+         *   started: true
+         * }
+         * user.setProjects([p1, p2], {started: false}) // The default value is false, but p1 overrides that.
+         * ```
+         *
+         * Similarily, when fetching through a join table with custom attributes, these attributes will be
+         * available as an object with the name of the through model.
+         * ```js
+         * user.getProjects().then(function (projects) {
+         *   var p1 = projects[0]
+         *   p1.userprojects.started // Is this project started yet?
+         * })
+         * ```
+         *
+         * @param target The model that will be associated with hasOne relationship
+         * @param options Options for the association
+         *
+         */
+        belongsToMany(target: Model<any, any>, options: AssociationOptionsBelongsToMany): void;
+
+    }
+
+    //
+    //  DataTypes
+    // ~~~~~~~~~~~
+    //
+    //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/data-types.js
+    //
+
+    /**
+     * Abstract DataType interface. Use this if you want to create an interface that has a value any of the
+     * DataTypes that Sequelize supports.
+     */
+    interface DataTypeAbstract {
+
+        /**
+         * Although this is not needed for the definitions itself, we want to make sure that DataTypeAbstract is not
+         * something than can be evaluated to an empty object.
+         */
+        dialectTypes: string;
+
+    }
+
+    interface DataTypeAbstractString<T> extends DataTypeAbstract {
+
+        /**
+         * A variable length string. Default length 255
+         */
+        (options?: { length: number }): T;
+        (length: number): T;
+
+        /**
+         * Property BINARY for the type
+         */
+        BINARY: T;
+
+    }
+
+    interface DataTypeString extends DataTypeAbstractString<DataTypeString> { }
+
+    interface DataTypeChar extends DataTypeAbstractString<DataTypeChar> { }
+
+    interface DataTypeText extends DataTypeAbstract {
+
+        /**
+         * Length of the text field.
+         *
+         * Available lengths: `tiny`, `medium`, `long`
+         */
+        (options?: { length: string }): DataTypeText;
+        (length: string): DataTypeText;
+
+    }
+
+    interface DataTypeAbstractNumber<T> extends DataTypeAbstract {
+        UNSIGNED: T;
+        ZEROFILL: T;
+    }
+
+    interface DataTypeNumber extends DataTypeAbstractNumber<DataTypeNumber> { }
+
+    interface DataTypeInteger extends DataTypeAbstractNumber<DataTypeInteger> {
+
+        /**
+         * Length of the number field.
+         */
+        (options?: { length: number }): DataTypeInteger;
+        (length: number): DataTypeInteger;
+
+    }
+
+    interface DataTypeBigInt extends DataTypeAbstractNumber<DataTypeBigInt> {
+
+        /**
+         * Length of the number field.
+         */
+        (options?: { length: number }): DataTypeBigInt;
+        (length: number): DataTypeBigInt;
+
+    }
+
+    interface DataTypeFloat extends DataTypeAbstractNumber<DataTypeFloat> {
+
+        /**
+         * Length of the number field and decimals of the float
+         */
+        (options?: { length: number, decimals?: number }): DataTypeFloat;
+        (length: number, decimals?: number): DataTypeFloat;
+
+    }
+
+    interface DataTypeReal extends DataTypeAbstractNumber<DataTypeReal> {
+
+        /**
+         * Length of the number field and decimals of the real
+         */
+        (options?: { length: number, decimals?: number }): DataTypeReal;
+        (length: number, decimals?: number): DataTypeReal;
+
+    }
+
+    interface DataTypeDouble extends DataTypeAbstractNumber<DataTypeDouble> {
+
+        /**
+         * Length of the number field and decimals of the real
+         */
+        (options?: { length: number, decimals?: number }): DataTypeDouble;
+        (length: number, decimals?: number): DataTypeDouble;
+
+    }
+
+    interface DataTypeDecimal extends DataTypeAbstractNumber<DataTypeDecimal> {
+
+        /**
+         * Precision and scale for the decimal number
+         */
+        (options?: { precision: number, scale?: number }): DataTypeDecimal;
+        (precision: number, scale?: number): DataTypeDecimal;
+
+    }
+
+    interface DataTypeBoolean extends DataTypeAbstract { }
+
+    interface DataTypeTime extends DataTypeAbstract { }
+
+    interface DataTypeDate extends DataTypeAbstract {
+
+        /**
+         * Length of decimal places of time
+         */
+        (options?: { length?: number }): DataTypeDate;
+        (length?: number): DataTypeDate;
+
+    }
+
+    interface DataTypeDateOnly extends DataTypeAbstract { }
+
+    interface DataTypeHStore extends DataTypeAbstract { }
+
+    interface DataTypeJSONType extends DataTypeAbstract { }
+
+    interface DataTypeJSONB extends DataTypeAbstract { }
+
+    interface DataTypeNow extends DataTypeAbstract { }
+
+    interface DataTypeBlob extends DataTypeAbstract {
+
+        /**
+         * Length of the blob field.
+         *
+         * Available lengths: `tiny`, `medium`, `long`
+         */
+        (options?: { length: string }): DataTypeBlob;
+        (length: string): DataTypeBlob;
+
+    }
+
+    interface DataTypeRange extends DataTypeAbstract {
+
+        /**
+         * Range field for Postgre
+         *
+         * Accepts subtype any of the ranges
+         */
+        (options?: { subtype: DataTypeAbstract }): DataTypeRange;
+        (subtype: DataTypeAbstract): DataTypeRange;
+
+    }
+
+    interface DataTypeUUID extends DataTypeAbstract { }
+
+    interface DataTypeUUIDv1 extends DataTypeAbstract { }
+
+    interface DataTypeUUIDv4 extends DataTypeAbstract { }
+
+    interface DataTypeVirtual extends DataTypeAbstract {
+
+        /**
+         * Virtual field
+         *
+         * Accepts subtype any of the DataTypes
+         * Array of required attributes that are available on the model
+         */
+        new (subtype: DataTypeAbstract, requireAttributes?: Array<string>): DataTypeVirtual;
+    }
+
+    interface DataTypeEnum extends DataTypeAbstract {
+
+        /**
+         * Enum field
+         *
+         * Accepts values
+         */
+        (options?: { values: string | string[] }): DataTypeEnum;
+        (values: string | string[]): DataTypeEnum;
+        (...args: string[]): DataTypeEnum;
+
+    }
+
+    interface DataTypeArray extends DataTypeAbstract {
+
+        /**
+         * Array field for Postgre
+         *
+         * Accepts type any of the DataTypes
+         */
+        (options: { type: DataTypeAbstract }): DataTypeArray;
+        (type: DataTypeAbstract): DataTypeArray;
+
+    }
+
+    interface DataTypeGeometry extends DataTypeAbstract {
+
+        /**
+         * Geometry field for Postgres
+         */
+        (type: string, srid?: number): DataTypeGeometry;
+
+    }
+
+    /**
+     * A convenience class holding commonly used data types. The datatypes are used when definining a new model
+     * using
+     * `Sequelize.define`, like this:
+     *
+     * ```js
+     * sequelize.define('model', {
+ *   column: DataTypes.INTEGER
+ * })
+     * ```
+     * When defining a model you can just as easily pass a string as type, but often using the types defined here
+     * is
+     * beneficial. For example, using `DataTypes.BLOB`, mean that that column will be returned as an instance of
+     * `Buffer` when being fetched by sequelize.
+     *
+     * Some data types have special properties that can be accessed in order to change the data type.
+     * For example, to get an unsigned integer with zerofill you can do `DataTypes.INTEGER.UNSIGNED.ZEROFILL`.
+     * The order you access the properties in do not matter, so `DataTypes.INTEGER.ZEROFILL.UNSIGNED` is fine as
+     * well. The available properties are listed under each data type.
+     *
+     * To provide a length for the data type, you can invoke it like a function: `INTEGER(2)`
+     *
+     * Three of the values provided here (`NOW`, `UUIDV1` and `UUIDV4`) are special default values, that should not
+     * be used to define types. Instead they are used as shorthands for defining default values. For example, to
+     * get a uuid field with a default value generated following v1 of the UUID standard:
+     *
+     * ```js
+     * sequelize.define('model', {
+ *   uuid: {
+ *     type: DataTypes.UUID,
+ *     defaultValue: DataTypes.UUIDV1,
+ *     primaryKey: true
+ *   }
+ * })
+     * ```
+     */
+    interface DataTypes {
+        ABSTRACT: DataTypeAbstract;
+        STRING: DataTypeString;
+        CHAR: DataTypeChar;
+        TEXT: DataTypeText;
+        NUMBER: DataTypeNumber;
+        INTEGER: DataTypeInteger;
+        BIGINT: DataTypeBigInt;
+        FLOAT: DataTypeFloat;
+        TIME: DataTypeTime;
+        DATE: DataTypeDate;
+        DATEONLY: DataTypeDateOnly;
+        BOOLEAN: DataTypeBoolean;
+        NOW: DataTypeNow;
+        BLOB: DataTypeBlob;
+        DECIMAL: DataTypeDecimal;
+        NUMERIC: DataTypeDecimal;
+        UUID: DataTypeUUID;
+        UUIDV1: DataTypeUUIDv1;
+        UUIDV4: DataTypeUUIDv4;
+        HSTORE: DataTypeHStore;
+        JSON: DataTypeJSONType;
+        JSONB: DataTypeJSONB;
+        VIRTUAL: DataTypeVirtual;
+        ARRAY: DataTypeArray;
+        NONE: DataTypeVirtual;
+        ENUM: DataTypeEnum;
+        RANGE: DataTypeRange;
+        REAL: DataTypeReal;
+        DOUBLE: DataTypeDouble;
+        "DOUBLE PRECISION": DataTypeDouble;
+        GEOMETRY: DataTypeGeometry;
+    }
+
+    //
+    //  Deferrable
+    // ~~~~~~~~~~~~
+    //
+    //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/deferrable.js
+    //
+
+    /**
+     * Abstract Deferrable interface. Use this if you want to create an interface that has a value any of the
+     * Deferrables that Sequelize supports.
+     */
+    interface DeferrableAbstract {
+
+        /**
+         * Although this is not needed for the definitions itself, we want to make sure that DeferrableAbstract is
+         * not something than can be evaluated to an empty object.
+         */
+        toString(): string;
+        toSql(): string;
+
+    }
+
+    interface DeferrableInitiallyDeferred extends DeferrableAbstract {
+
+        /**
+         * A property that will defer constraints checks to the end of transactions.
+         */
+        (): DeferrableInitiallyDeferred;
+
+    }
+
+    interface DeferrableInitiallyImmediate extends DeferrableAbstract {
+
+        /**
+         * A property that will trigger the constraint checks immediately
+         */
+        (): DeferrableInitiallyImmediate;
+
+    }
+
+    interface DeferrableNot extends DeferrableAbstract {
+
+        /**
+         * A property that will set the constraints to not deferred. This is the default in PostgreSQL and it make
+         * it impossible to dynamically defer the constraints within a transaction.
+         */
+        (): DeferrableNot;
+
+    }
+
+    interface DeferrableSetDeferred extends DeferrableAbstract {
+
+        /**
+         * A property that will trigger an additional query at the beginning of a
+         * transaction which sets the constraints to deferred.
+         *
+         * @param constraints An array of constraint names. Will defer all constraints by default.
+         */
+        (constraints: string[]): DeferrableSetDeferred;
+
+    }
+
+    interface DeferrableSetImmediate extends DeferrableAbstract {
+
+        /**
+         * A property that will trigger an additional query at the beginning of a
+         * transaction which sets the constraints to immediately.
+         *
+         * @param constraints An array of constraint names. Will defer all constraints by default.
+         */
+        (constraints: string[]): DeferrableSetImmediate;
+
+    }
+
+    /**
+     * A collection of properties related to deferrable constraints. It can be used to
+     * make foreign key constraints deferrable and to set the constaints within a
+     * transaction. This is only supported in PostgreSQL.
+     *
+     * The foreign keys can be configured like this. It will create a foreign key
+     * that will check the constraints immediately when the data was inserted.
+     *
+     * ```js
+     * sequelize.define('Model', {
+     *   foreign_id: {
+     *     type: Sequelize.INTEGER,
+     *     references: {
+     *       model: OtherModel,
+     *       key: 'id',
+     *       deferrable: Sequelize.Deferrable.INITIALLY_IMMEDIATE
+     *     }
+     *   }
+     * });
+     * ```
+     *
+     * The constraints can be configured in a transaction like this. It will
+     * trigger a query once the transaction has been started and set the constraints
+     * to be checked at the very end of the transaction.
+     *
+     * ```js
+     * sequelize.transaction({
+ *   deferrable: Sequelize.Deferrable.SET_DEFERRED
+ * });
+     * ```
+     */
+    interface Deferrable {
+        INITIALLY_DEFERRED: DeferrableInitiallyDeferred;
+        INITIALLY_IMMEDIATE: DeferrableInitiallyImmediate;
+        NOT: DeferrableNot;
+        SET_DEFERRED: DeferrableSetDeferred;
+        SET_IMMEDIATE: DeferrableSetImmediate;
+    }
+
+    //
+    //  Errors
+    // ~~~~~~~~
+    //
+    //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/errors.js
+    //
+
+    /**
+     * The Base Error all Sequelize Errors inherit from.
+     */
+    interface BaseError extends Error, ErrorConstructor { }
+
+    interface ValidationError extends BaseError {
+
+        /**
+         * Validation Error. Thrown when the sequelize validation has failed. The error contains an `errors`
+         * property, which is an array with 1 or more ValidationErrorItems, one for each validation that failed.
+         *
+         * @param message Error message
+         * @param errors  Array of ValidationErrorItem objects describing the validation errors
+         */
+        new (message: string, errors?: ValidationErrorItem[]): ValidationError;
+
+        /**
+         * Gets all validation error items for the path / field specified.
+         *
+         * @param path The path to be checked for error items
+         */
+        get(path: string): ValidationErrorItem[];
+
+        /** Array of ValidationErrorItem objects describing the validation errors */
+        errors: ValidationErrorItem[];
+
+    }
+
+    interface ValidationErrorItem extends BaseError {
+
+        /**
+         * Validation Error Item
+         * Instances of this class are included in the `ValidationError.errors` property.
+         *
+         * @param message An error message
+         * @param type The type of the validation error
+         * @param path The field that triggered the validation error
+         * @param value The value that generated the error
+         */
+        new (message: string, type: string, path: string, value: string): ValidationErrorItem;
+
+        /** An error message */
+        message: string;
+
+        /** The type of the validation error */
+        type: string;
+
+        /** The field that triggered the validation error */
+        path: string;
+
+        /** The value that generated the error */
+        value: string;
+
+    }
+
+    interface DatabaseError extends BaseError {
+
+        /**
+         * A base class for all database related errors.
+         */
+        new (parent: Error): DatabaseError;
+
+    }
+
+    interface TimeoutError extends DatabaseError {
+
+        /**
+         * Thrown when a database query times out because of a deadlock
+         */
+        new (parent: Error): TimeoutError;
+
+    }
+
+    interface UniqueConstraintError extends DatabaseError {
+
+        /**
+         * Thrown when a unique constraint is violated in the database
+         */
+        new (options: { parent?: Error, message?: string, errors?: Object }): UniqueConstraintError;
+
+    }
+
+    interface ForeignKeyConstraintError extends DatabaseError {
+
+        /**
+         * Thrown when a foreign key constraint is violated in the database
+         */
+        new (options: { parent?: Error, message?: string, index?: string, fields?: string[], table?: string }): ForeignKeyConstraintError;
+
+    }
+
+    interface ExclusionConstraintError extends DatabaseError {
+
+        /**
+         * Thrown when an exclusion constraint is violated in the database
+         */
+        new (options: { parent?: Error, message?: string, constraint?: string, fields?: string[], table?: string }): ExclusionConstraintError;
+
+    }
+
+    interface ConnectionError extends BaseError {
+
+        /**
+         * A base class for all connection related errors.
+         */
+        new (parent: Error): ConnectionError;
+
+    }
+
+    interface ConnectionRefusedError extends ConnectionError {
+
+        /**
+         * Thrown when a connection to a database is refused
+         */
+        new (parent: Error): ConnectionRefusedError;
+
+    }
+
+    interface AccessDeniedError extends ConnectionError {
+
+        /**
+         * Thrown when a connection to a database is refused due to insufficient privileges
+         */
+        new (parent: Error): AccessDeniedError;
+
+    }
+
+    interface HostNotFoundError extends ConnectionError {
+
+        /**
+         * Thrown when a connection to a database has a hostname that was not found
+         */
+        new (parent: Error): HostNotFoundError;
+
+    }
+
+    interface HostNotReachableError extends ConnectionError {
+
+        /**
+         * Thrown when a connection to a database has a hostname that was not reachable
+         */
+        new (parent: Error): HostNotReachableError;
+
+    }
+
+    interface InvalidConnectionError extends ConnectionError {
+
+        /**
+         * Thrown when a connection to a database has invalid values for any of the connection parameters
+         */
+        new (parent: Error): InvalidConnectionError;
+
+    }
+
+    interface ConnectionTimedOutError extends ConnectionError {
+
+        /**
+         * Thrown when a connection to a database times out
+         */
+        new (parent: Error): ConnectionTimedOutError;
+
+    }
+
+    /**
+     * Sequelize provides a host of custom error classes, to allow you to do easier debugging. All of these errors
+     * are exposed on the sequelize object and the sequelize constructor. All sequelize errors inherit from the
+     * base JS error object.
+     */
+    interface Errors {
+        Error: BaseError;
+        ValidationError: ValidationError;
+        ValidationErrorItem: ValidationErrorItem;
+        DatabaseError: DatabaseError;
+        TimeoutError: TimeoutError;
+        UniqueConstraintError: UniqueConstraintError;
+        ExclusionConstraintError: ExclusionConstraintError;
+        ForeignKeyConstraintError: ForeignKeyConstraintError;
+        ConnectionError: ConnectionError;
+        ConnectionRefusedError: ConnectionRefusedError;
+        AccessDeniedError: AccessDeniedError;
+        HostNotFoundError: HostNotFoundError;
+        HostNotReachableError: HostNotReachableError;
+        InvalidConnectionError: InvalidConnectionError;
+        ConnectionTimedOutError: ConnectionTimedOutError;
+    }
+
+    //
+    //  Hooks
+    // ~~~~~~~
+    //
+    //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/hooks.js
+    //
+
+    /**
+     * Options for Sequelize.define. We mostly duplicate the Hooks here, since there is no way to combine the two
+     * interfaces.
+     *
+     * beforeValidate, afterValidate, beforeBulkCreate, beforeBulkDestroy, beforeBulkUpdate, beforeCreate,
+     * beforeDestroy, beforeUpdate, afterCreate, afterDestroy, afterUpdate, afterBulkCreate, afterBulkDestroy and
+     * afterBulkUpdate.
+     */
+    interface HooksDefineOptions<TInstance> {
+
+        beforeValidate?: (instance: TInstance, options: Object, fn?: Function) => any;
+        afterValidate?: (instance: TInstance, options: Object, fn?: Function) => any;
+        beforeCreate?: (attributes: TInstance, options: Object, fn?: Function) => any;
+        afterCreate?: (attributes: TInstance, options: Object, fn?: Function) => any;
+        beforeDestroy?: (instance: TInstance, options: Object, fn?: Function) => any;
+        beforeDelete?: (instance: TInstance, options: Object, fn?: Function) => any;
+        afterDestroy?: (instance: TInstance, options: Object, fn?: Function) => any;
+        afterDelete?: (instance: TInstance, options: Object, fn?: Function) => any;
+        beforeUpdate?: (instance: TInstance, options: Object, fn?: Function) => any;
+        afterUpdate?: (instance: TInstance, options: Object, fn?: Function) => any;
+        beforeBulkCreate?: (instances: TInstance[], options: Object, fn?: Function) => any;
+        afterBulkCreate?: (instances: TInstance[], options: Object, fn?: Function) => any;
+        beforeBulkDestroy?: (options: Object, fn?: Function) => any;
+        beforeBulkDelete?: (options: Object, fn?: Function) => any;
+        afterBulkDestroy?: (options: Object, fn?: Function) => any;
+        afterBulkDelete?: (options: Object, fn?: Function) => any;
+        beforeBulkUpdate?: (options: Object, fn?: Function) => any;
+        afterBulkUpdate?: (options: Object, fn?: Function) => any;
+        beforeFind?: (options: Object, fn?: Function) => any;
+        beforeFindAfterExpandIncludeAll?: (options: Object, fn?: Function) => any;
+        beforeFindAfterOptions?: (options: Object, fn?: Function) => any;
+        afterFind?: (instancesOrInstance: TInstance[] | TInstance, options: Object,
+            fn?: Function) => any;
+
+    }
+
+    /**
+     * Hooks are function that are called before and after  (bulk-) creation/updating/deletion and validation.
+     * Hooks can be added to you models in three ways:
+     *
+     * 1. By specifying them as options in `sequelize.define`
+     * 2. By calling `hook()` with a string and your hook handler function
+     * 3. By calling the function with the same name as the hook you want
+     *
+     * ```js
+     * // Method 1
+     * sequelize.define(name, { attributes }, {
+     *   hooks: {
+     *     beforeBulkCreate: function () {
+     *       // can be a single function
+     *     },
+     *     beforeValidate: [
+     *       function () {},
+     *       function() {} // Or an array of several
+     *     ]
+     *   }
+     * })
+     *
+     * // Method 2
+     * Model.hook('afterDestroy', function () {})
+     *
+     * // Method 3
+     * Model.afterBulkUpdate(function () {})
+     * ```
+     *
+     * @see Sequelize.define
+     */
+    interface Hooks<TInstance> {
+
+        /**
+         * Add a hook to the model
+         *
+         * @param hookType
+         * @param name Provide a name for the hook function. It can be used to remove the hook later or to order
+         *     hooks based on some sort of priority system in the future.
+         * @param fn The hook function
+         *
+         * @alias hook
+         */
+        addHook(hookType: string, name: string, fn: Function): Hooks<TInstance>;
+        addHook(hookType: string, fn: Function): Hooks<TInstance>;
+        hook(hookType: string, name: string, fn: Function): Hooks<TInstance>;
+        hook(hookType: string, fn: Function): Hooks<TInstance>;
+
+        /**
+         * Remove hook from the model
+         *
+         * @param hookType
+         * @param name
+         */
+        removeHook(hookType: string, name: string): Hooks<TInstance>;
+
+        /**
+         * Check whether the mode has any hooks of this type
+         *
+         * @param hookType
+         *
+         * @alias hasHooks
+         */
+        hasHook(hookType: string): boolean;
+        hasHooks(hookType: string): boolean;
+
+        /**
+         * A hook that is run before validation
+         *
+         * @param name
+         * @param fn A callback function that is called with instance, options
+         */
+        beforeValidate(name: string,
+            fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+        beforeValidate(fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run after validation
+         *
+         * @param name
+         * @param fn A callback function that is called with instance, options
+         */
+        afterValidate(name: string,
+            fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+        afterValidate(fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run before creating a single instance
+         *
+         * @param name
+         * @param fn A callback function that is called with attributes, options
+         */
+        beforeCreate(name: string,
+            fn: (attributes: TInstance, options: Object, fn?: Function) => void): void;
+        beforeCreate(fn: (attributes: TInstance, options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run after creating a single instance
+         *
+         * @param name
+         * @param fn A callback function that is called with attributes, options
+         */
+        afterCreate(name: string,
+            fn: (attributes: TInstance, options: Object, fn?: Function) => void): void;
+        afterCreate(fn: (attributes: TInstance, options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run before destroying a single instance
+         *
+         * @param name
+         * @param fn A callback function that is called with instance, options
+         * @alias beforeDelete
+         */
+        beforeDestroy(name: string,
+            fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+        beforeDestroy(fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+        beforeDelete(name: string,
+            fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+        beforeDelete(fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run after destroying a single instance
+         *
+         * @param name
+         * @param fn A callback function that is called with instance, options
+         * @alias afterDelete
+         */
+        afterDestroy(name: string,
+            fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+        afterDestroy(fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+        afterDelete(name: string, fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+        afterDelete(fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run before updating a single instance
+         *
+         * @param name
+         * @param fn A callback function that is called with instance, options
+         */
+        beforeUpdate(name: string,
+            fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+        beforeUpdate(fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run after updating a single instance
+         *
+         * @param name
+         * @param fn A callback function that is called with instance, options
+         */
+        afterUpdate(name: string, fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+        afterUpdate(fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run before creating instances in bulk
+         *
+         * @param name
+         * @param fn A callback function that is called with instances, options
+         */
+        beforeBulkCreate(name: string,
+            fn: (instances: TInstance[], options: Object, fn?: Function) => void): void;
+        beforeBulkCreate(fn: (instances: TInstance[], options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run after creating instances in bulk
+         *
+         * @param name
+         * @param fn A callback function that is called with instances, options
+         * @name afterBulkCreate
+         */
+        afterBulkCreate(name: string,
+            fn: (instances: TInstance[], options: Object, fn?: Function) => void): void;
+        afterBulkCreate(fn: (instances: TInstance[], options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run before destroying instances in bulk
+         *
+         * @param name
+         * @param fn   A callback function that is called with options
+         *
+         * @alias beforeBulkDelete
+         */
+        beforeBulkDestroy(name: string, fn: (options: Object, fn?: Function) => void): void;
+        beforeBulkDestroy(fn: (options: Object, fn?: Function) => void): void;
+        beforeBulkDelete(name: string, fn: (options: Object, fn?: Function) => void): void;
+        beforeBulkDelete(fn: (options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run after destroying instances in bulk
+         *
+         * @param name
+         * @param fn   A callback function that is called with options
+         *
+         * @alias afterBulkDelete
+         */
+        afterBulkDestroy(name: string, fn: (options: Object, fn?: Function) => void): void;
+        afterBulkDestroy(fn: (options: Object, fn?: Function) => void): void;
+        afterBulkDelete(name: string, fn: (options: Object, fn?: Function) => void): void;
+        afterBulkDelete(fn: (options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run after updating instances in bulk
+         *
+         * @param name
+         * @param fn   A callback function that is called with options
+         */
+        beforeBulkUpdate(name: string, fn: (options: Object, fn?: Function) => void): void;
+        beforeBulkUpdate(fn: (options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run after updating instances in bulk
+         *
+         * @param name
+         * @param fn   A callback function that is called with options
+         */
+        afterBulkUpdate(name: string, fn: (options: Object, fn?: Function) => void): void;
+        afterBulkUpdate(fn: (options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run before a find (select) query
+         *
+         * @param name
+         * @param fn   A callback function that is called with options
+         */
+        beforeFind(name: string, fn: (options: Object, fn?: Function) => void): void;
+        beforeFind(fn: (options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run before a find (select) query, after any { include: {all: ...} } options are expanded
+         *
+         * @param name
+         * @param fn   A callback function that is called with options
+         */
+        beforeFindAfterExpandIncludeAll(name: string,
+            fn: (options: Object, fn?: Function) => void): void;
+        beforeFindAfterExpandIncludeAll(fn: (options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run before a find (select) query, after all option parsing is complete
+         *
+         * @param name
+         * @param fn   A callback function that is called with options
+         */
+        beforeFindAfterOptions(name: string, fn: (options: Object, fn?: Function) => void): void;
+        beforeFindAfterOptions(fn: (options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run after a find (select) query
+         *
+         * @param name
+         * @param fn   A callback function that is called with instance(s), options
+         */
+        afterFind(name: string,
+            fn: (instancesOrInstance: TInstance[] | TInstance, options: Object,
+                fn?: Function) => void): void;
+        afterFind(fn: (instancesOrInstance: TInstance[] | TInstance, options: Object,
+            fn?: Function) => void): void;
+
+        /**
+         * A hook that is run before a define call
+         *
+         * @param name
+         * @param fn   A callback function that is called with attributes, options
+         */
+        beforeDefine(name: string, fn: (attributes: DefineAttributes, options: Object) => void): void;
+        beforeDefine(fn: (attributes: DefineAttributes, options: Object) => void): void;
+
+        /**
+         * A hook that is run after a define call
+         *
+         * @param name
+         * @param fn   A callback function that is called with factory
+         */
+        afterDefine(name: string, fn: (model: Model<TInstance, any>) => void): void;
+        afterDefine(fn: (model: Model<TInstance, any>) => void): void;
+
+        /**
+         * A hook that is run before Sequelize() call
+         *
+         * @param name
+         * @param fn   A callback function that is called with config, options
+         */
+        beforeInit(name: string, fn: (config: Object, options: Object) => void): void;
+        beforeInit(fn: (config: Object, options: Object) => void): void;
+
+        /**
+         * A hook that is run after Sequelize() call
+         *
+         * @param name
+         * @param fn   A callback function that is called with sequelize
+         */
+        afterInit(name: string, fn: (sequelize: Sequelize) => void): void;
+        afterInit(fn: (sequelize: Sequelize) => void): void;
+
+    }
+
+    //
+    //  Instance
+    // ~~~~~~~~~~
+    //
+    //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/instance.js
+    //
+
+    /**
+     * Options used for Instance.increment method
+     */
+    interface InstanceIncrementDecrementOptions {
+
+        /**
+         * The number to increment by
+         *
+         * Defaults to 1
+         */
+        by?: number;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+        /**
+         * Transaction to run query under
+         */
+        transaction?: Transaction;
+
+        /**
+         * A hash of attributes to describe your search. See above for examples.
+         */
+        where?: WhereOptions | Array<col | and | or | string>;
+
+    }
+
+    /**
+     * Options used for Instance.restore method
+     */
+    interface InstanceRestoreOptions {
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+        /**
+         * Transaction to run query under
+         */
+        transaction?: Transaction;
+
+    }
+
+    /**
+     * Options used for Instance.destroy method
+     */
+    interface InstanceDestroyOptions {
+
+        /**
+         * If set to true, paranoid models will actually be deleted
+         */
+        force?: boolean;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+        /**
+         * Transaction to run the query in
+         */
+        transaction?: Transaction;
+
+    }
+
+    /**
+     * Options used for Instance.update method
+     */
+    interface InstanceUpdateOptions extends InstanceSaveOptions, InstanceSetOptions {
+
+        /**
+         * A hash of attributes to describe your search. See above for examples.
+         */
+        where?: WhereOptions | Array<col | and | or | string>;
+
+    }
+
+    /**
+     * Options used for Instance.set method
+     */
+    interface InstanceSetOptions {
+
+        /**
+         * If set to true, field and virtual setters will be ignored
+         */
+        raw?: boolean;
+
+        /**
+         * Clear all previously set data values
+         */
+        reset?: boolean;
+
+    }
+
+    /**
+     * Options used for Instance.save method
+     */
+    interface InstanceSaveOptions {
+
+        /**
+         * An optional array of strings, representing database columns. If fields is provided, only those columns
+         * will be validated and saved.
+         */
+        fields?: string[];
+
+        /**
+         * If true, the updatedAt timestamp will not be updated.
+         *
+         * Defaults to false
+         */
+        silent?: boolean;
+
+        /**
+         * If false, validations won't be run.
+         *
+         * Defaults to true
+         */
+        validate?: boolean;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+        /**
+         * Transaction to run the query in
+         */
+        transaction?: Transaction;
+
+    }
+
+    /**
+     * This class represents an single instance, a database row. You might see it referred to as both Instance and
+     * instance. You should not instantiate the Instance class directly, instead you access it using the finder and
+     * creation methods on the model.
+     *
+     * Instance instances operate with the concept of a `dataValues` property, which stores the actual values
+     * represented by the instance. By default, the values from dataValues can also be accessed directly from the
+     * Instance, that is:
+     * ```js
+     * instance.field
+     * // is the same as
+     * instance.get('field')
+     * // is the same as
+     * instance.getDataValue('field')
+     * ```
+     * However, if getters and/or setters are defined for `field` they will be invoked, instead of returning the
+     * value from `dataValues`. Accessing properties directly or using `get` is preferred for regular use,
+     * `getDataValue` should only be used for custom getters.
+     *
+     * @see Sequelize.define for more information about getters and setters
+     */
+    interface Instance<TAttributes> {
+
+        /**
+         * Returns true if this instance has not yet been persisted to the database
+         */
+        isNewRecord: boolean;
+
+        /**
+         * Returns the Model the instance was created from.
+         *
+         * @see Model
+         */
+        Model: Model<this, TAttributes>;
+
+        /**
+         * A reference to the sequelize instance
+         */
+        sequelize: Sequelize;
+
+        /**
+         * Get an object representing the query for this instance, use with `options.where`
+         */
+        where(): Object;
+
+        /**
+         * Get the value of the underlying data value
+         */
+        getDataValue(key: string): any;
+
+        /**
+         * Update the underlying data value
+         */
+        setDataValue(key: string, value: any): void;
+
+        /**
+         * If no key is given, returns all values of the instance, also invoking virtual getters.
+         *
+         * If key is given and a field or virtual getter is present for the key it will call that getter - else it
+         * will return the value for key.
+         *
+         * @param options.plain If set to true, included instances will be returned as plain objects
+         */
+        get(key: string, options?: { plain?: boolean, clone?: boolean }): any;
+        get(options?: { plain?: boolean, clone?: boolean }): TAttributes;
+
+        /**
+         * Set is used to update values on the instance (the sequelize representation of the instance that is,
+         * remember that nothing will be persisted before you actually call `save`). In its most basic form `set`
+         * will update a value stored in the underlying `dataValues` object. However, if a custom setter function
+         * is defined for the key, that function will be called instead. To bypass the setter, you can pass `raw:
+         * true` in the options object.
+         *
+         * If set is called with an object, it will loop over the object, and call set recursively for each key,
+         * value pair. If you set raw to true, the underlying dataValues will either be set directly to the object
+         * passed, or used to extend dataValues, if dataValues already contain values.
+         *
+         * When set is called, the previous value of the field is stored and sets a changed flag(see `changed`).
+         *
+         * Set can also be used to build instances for associations, if you have values for those.
+         * When using set with associations you need to make sure the property key matches the alias of the
+         * association while also making sure that the proper include options have been set (from .build() or
+         * .find())
+         *
+         * If called with a dot.seperated key on a JSON/JSONB attribute it will set the value nested and flag the
+         * entire object as changed.
+         *
+         * @param options.raw If set to true, field and virtual setters will be ignored
+         * @param options.reset Clear all previously set data values
+         */
+        set(key: string, value: any, options?: InstanceSetOptions): this;
+        set(keys: Object, options?: InstanceSetOptions): this;
+        setAttributes(key: string, value: any, options?: InstanceSetOptions): this;
+        setAttributes(keys: Object, options?: InstanceSetOptions): this;
+
+        /**
+         * If changed is called with a string it will return a boolean indicating whether the value of that key in
+         * `dataValues` is different from the value in `_previousDataValues`.
+         *
+         * If changed is called without an argument, it will return an array of keys that have changed.
+         *
+         * If changed is called without an argument and no keys have changed, it will return `false`.
+         */
+        changed(key: string): boolean;
+        changed(): boolean | string[];
+
+        /**
+         * Returns the previous value for key from `_previousDataValues`.
+         */
+        previous(key: string): any;
+
+        /**
+         * Validate this instance, and if the validation passes, persist it to the database.
+         *
+         * On success, the callback will be called with this instance. On validation error, the callback will be
+         * called with an instance of `Sequelize.ValidationError`. This error will have a property for each of the
+         * fields for which validation failed, with the error message for that field.
+         */
+        save(options?: InstanceSaveOptions): Promise<this>;
+
+        /**
+         * Refresh the current instance in-place, i.e. update the object with current data from the DB and return
+         * the same object. This is different from doing a `find(Instance.id)`, because that would create and
+         * return a new instance. With this method, all references to the Instance are updated with the new data
+         * and no new objects are created.
+         */
+        reload(options?: FindOptions): Promise<this>;
+
+        /**
+         * Validate the attribute of this instance according to validation rules set in the model definition.
+         *
+         * Emits null if and only if validation successful; otherwise an Error instance containing
+         * { field name : [error msgs] } entries.
+         *
+         * @param options.skip An array of strings. All properties that are in this array will not be validated
+         */
+        validate(options?: { skip?: string[] }): Promise<ValidationError>;
+
+        /**
+         * This is the same as calling `set` and then calling `save`.
+         */
+        update(key: string, value: any, options?: InstanceUpdateOptions): Promise<this>;
+        update(keys: Object, options?: InstanceUpdateOptions): Promise<this>;
+        updateAttributes(key: string, value: any, options?: InstanceUpdateOptions): Promise<this>;
+        updateAttributes(keys: Object, options?: InstanceUpdateOptions): Promise<this>;
+
+        /**
+         * Destroy the row corresponding to this instance. Depending on your setting for paranoid, the row will
+         * either be completely deleted, or have its deletedAt timestamp set to the current time.
+         */
+        destroy(options?: InstanceDestroyOptions): Promise<void>;
+
+        /**
+         * Restore the row corresponding to this instance. Only available for paranoid models.
+         */
+        restore(options?: InstanceRestoreOptions): Promise<void>;
+
+        /**
+         * Increment the value of one or more columns. This is done in the database, which means it does not use
+         * the values currently stored on the Instance. The increment is done using a
+         * ```sql
+         * SET column = column + X
+         * ```
+         * query. To get the correct value after an increment into the Instance you should do a reload.
+         *
+         *```js
+         * instance.increment('number') // increment number by 1
+         * instance.increment(['number', 'count'], { by: 2 }) // increment number and count by 2
+         * instance.increment({ answer: 42, tries: 1}, { by: 2 }) // increment answer by 42, and tries by 1.
+         *                                                        // `by` is ignored, since each column has its own
+         *                                                        // value
+         * ```
+         *
+         * @param fields If a string is provided, that column is incremented by the value of `by` given in options.
+         *               If an array is provided, the same is true for each column.
+         *               If and object is provided, each column is incremented by the value given.
+         */
+        increment(fields: string | string[] | Object,
+            options?: InstanceIncrementDecrementOptions): Promise<this>;
+
+        /**
+         * Decrement the value of one or more columns. This is done in the database, which means it does not use
+         * the values currently stored on the Instance. The decrement is done using a
+         * ```sql
+         * SET column = column - X
+         * ```
+         * query. To get the correct value after an decrement into the Instance you should do a reload.
+         *
+         * ```js
+         * instance.decrement('number') // decrement number by 1
+         * instance.decrement(['number', 'count'], { by: 2 }) // decrement number and count by 2
+         * instance.decrement({ answer: 42, tries: 1}, { by: 2 }) // decrement answer by 42, and tries by 1.
+         *                                                        // `by` is ignored, since each column has its own
+         *                                                        // value
+         * ```
+         *
+         * @param fields If a string is provided, that column is decremented by the value of `by` given in options.
+         *               If an array is provided, the same is true for each column.
+         *               If and object is provided, each column is decremented by the value given
+         */
+        decrement(fields: string | string[] | Object,
+            options?: InstanceIncrementDecrementOptions): Promise<this>;
+
+        /**
+         * Check whether all values of this and `other` Instance are the same
+         */
+        equals(other: Instance<any>): boolean;
+
+        /**
+         * Check if this is eqaul to one of `others` by calling equals
+         */
+        equalsOneOf(others: Instance<any>[]): boolean;
+
+        /**
+         * Convert the instance to a JSON representation. Proxies to calling `get` with no keys. This means get all
+         * values gotten from the DB, and apply all custom getters.
+         */
+        toJSON(): TAttributes;
+
+    }
+
+    //
+    //  Model
+    // ~~~~~~~
+    //
+    //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/model.js
+    //
+
+    /**
+     * Options to pass to Model on drop
+     */
+    interface DropOptions {
+
+        /**
+         * Also drop all objects depending on this table, such as views. Only works in postgres
+         */
+        cascade?: boolean;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+    }
+
+    /**
+     * Schema Options provided for applying a schema to a model
+     */
+    interface SchemaOptions {
+
+        /**
+         * The character(s) that separates the schema name from the table name
+         */
+        schemaDelimeter?: string;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: Function | boolean;
+
+    }
+
+    /**
+     * Scope Options for Model.scope
+     */
+    interface ScopeOptions {
+
+        /**
+         * The scope(s) to apply. Scopes can either be passed as consecutive arguments, or as an array of arguments.
+         * To apply simple scopes and scope functions with no arguments, pass them as strings. For scope function,
+         * pass an object, with a `method` property. The value can either be a string, if the method does not take
+         * any arguments, or an array, where the first element is the name of the method, and consecutive elements
+         * are arguments to that method. Pass null to remove all scopes, including the default.
+         */
+        method: string | any[];
+
+    }
+
+    /**
+     * Where Complex nested query
+     */
+    interface WhereNested {
+        $and: Array<WhereOptions | WhereLogic>;
+        $or: Array<WhereOptions | WhereLogic>;
+    }
+
+    /**
+     * Nested where Postgre Statement
+     */
+    interface WherePGStatement {
+        $any: Array<string | number>;
+        $all: Array<string | number>;
+    }
+
+    /**
+     * Where Geometry Options
+     */
+    interface WhereGeometryOptions {
+        type: string;
+        coordinates: Array<number[] | number>;
+    }
+
+    /**
+     * Logic of where statement
+     */
+    interface WhereLogic {
+        $ne: string | number | WhereLogic;
+        $in: Array<string | number> | literal;
+        $not: boolean | string | number | WhereOptions;
+        $notIn: Array<string | number> | literal;
+        $gte: number | string | Date;
+        $gt: number | string | Date;
+        $lte: number | string | Date;
+        $lt: number | string | Date;
+        $like: string | WherePGStatement;
+        $iLike: string | WherePGStatement;
+        $ilike: string | WherePGStatement;
+        $notLike: string | WherePGStatement;
+        $notILike: string | WherePGStatement;
+        $between: [number, number];
+        "..": [number, number];
+        $notBetween: [number, number];
+        "!..": [number, number];
+        $overlap: [number, number];
+        "&&": [number, number];
+        $contains: any;
+        "@>": any;
+        $contained: any;
+        "<@": any;
+    }
+
+    /**
+     * A hash of attributes to describe your search. See above for examples.
+     *
+     * We did put Object in the end, because there where query might be a JSON Blob. It cripples a bit the
+     * typesafety, but there is no way to pass the tests if we just remove it.
+     */
+    interface WhereOptions {
+        [field: string]: string | number | WhereLogic | WhereOptions | col | and | or | WhereGeometryOptions | Array<string | number> | Object;
+    }
+
+    /**
+     * Through options for Include Options
+     */
+    interface IncludeThroughOptions {
+
+        /**
+         * Filter on the join model for belongsToMany relations
+         */
+        where?: WhereOptions;
+
+        /**
+         * A list of attributes to select from the join model for belongsToMany relations
+         */
+        attributes?: string[];
+
+    }
+
+    /**
+     * Association Object for Include Options
+     */
+    interface IncludeAssociation {
+        source: Model<any, any>;
+        target: Model<any, any>;
+        identifier: string;
+    }
+
+    /**
+     * Complex include options
+     */
+    interface IncludeOptions {
+
+        /**
+         * The model you want to eagerly load
+         */
+        model?: Model<any, any>;
+
+        /**
+         * The alias of the relation, in case the model you want to eagerly load is aliassed. For `hasOne` /
+         * `belongsTo`, this should be the singular name, and for `hasMany`, it should be the plural
+         */
+        as?: string;
+
+        /**
+         * The association you want to eagerly load. (This can be used instead of providing a model/as pair)
+         */
+        association?: IncludeAssociation;
+
+        /**
+         * Where clauses to apply to the child models. Note that this converts the eager load to an inner join,
+         * unless you explicitly set `required: false`
+         */
+        where?: WhereOptions;
+
+        /**
+         * A list of attributes to select from the child model
+         */
+        attributes?: string[];
+
+        /**
+         * If true, converts to an inner join, which means that the parent model will only be loaded if it has any
+         * matching children. True if `include.where` is set, false otherwise.
+         */
+        required?: boolean;
+
+        /**
+         * Through Options
+         */
+        through?: IncludeThroughOptions;
+
+        /**
+         * Load further nested related models
+         */
+        include?: Array<Model<any, any> | IncludeOptions>;
+
+    }
+
+    /**
+     * Options that are passed to any model creating a SELECT query
+     *
+     * A hash of options to describe the scope of the search
+     */
+    interface FindOptions {
+
+        /**
+         * A hash of attributes to describe your search. See above for examples.
+         */
+        where?: WhereOptions | Array<col | and | or | string>;
+
+        /**
+         * A list of the attributes that you want to select. To rename an attribute, you can pass an array, with
+         * two elements - the first is the name of the attribute in the DB (or some kind of expression such as
+         * `Sequelize.literal`, `Sequelize.fn` and so on), and the second is the name you want the attribute to
+         * have in the returned instance
+         */
+        attributes?: Array<string | [string, string]>;
+
+        /**
+         * If true, only non-deleted records will be returned. If false, both deleted and non-deleted records will
+         * be returned. Only applies if `options.paranoid` is true for the model.
+         */
+        paranoid?: boolean;
+
+        /**
+         * A list of associations to eagerly load using a left join. Supported is either
+         * `{ include: [ Model1, Model2, ...]}` or `{ include: [{ model: Model1, as: 'Alias' }]}`.
+         * If your association are set up with an `as` (eg. `X.hasMany(Y, { as: 'Z }`, you need to specify Z in
+         * the as attribute when eager loading Y).
+         */
+        include?: Array<Model<any, any> | IncludeOptions>;
+
+        /**
+         * Specifies an ordering. If a string is provided, it will be escaped. Using an array, you can provide
+         * several columns / functions to order by. Each element can be further wrapped in a two-element array. The
+         * first element is the column / function to order by, the second is the direction. For example:
+         * `order: [['name', 'DESC']]`. In this way the column will be escaped, but the direction will not.
+         */
+        order?: string | col | literal | Array<string | number | Model<any, any> | { model: Model<any, any>, as?: string }> | Array<string | col | literal | Array<string | number | Model<any, any> | { model: Model<any, any>, as?: string }>>;
+
+        /**
+         * Limit the results
+         */
+        limit?: number;
+
+        /**
+         * Skip the results;
+         */
+        offset?: number;
+
+        /**
+         * Transaction to run query under
+         */
+        transaction?: Transaction;
+
+        /**
+         * Lock the selected rows. Possible options are transaction.LOCK.UPDATE and transaction.LOCK.SHARE.
+         * Postgres also supports transaction.LOCK.KEY_SHARE, transaction.LOCK.NO_KEY_UPDATE and specific model
+         * locks with joins. See [transaction.LOCK for an example](transaction#lock)
+         */
+        lock?: string | { level: string, of: Model<any, any> };
+
+        /**
+         * Return raw result. See sequelize.query for more information.
+         */
+        raw?: boolean;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+        /**
+         * having ?!?
+         */
+        having?: WhereOptions;
+
+    }
+
+    /**
+     * Options for Model.count method
+     */
+    interface CountOptions {
+
+        /**
+         * A hash of search attributes.
+         */
+        where?: WhereOptions | string[];
+
+        /**
+         * Include options. See `find` for details
+         */
+        include?: Array<Model<any, any> | IncludeOptions>;
+
+        /**
+         * Apply COUNT(DISTINCT(col))
+         */
+        distinct?: boolean;
+
+        /**
+         * Used in conjustion with `group`
+         */
+        attributes?: Array<string | [string, string]>;
+
+        /**
+         * For creating complex counts. Will return multiple rows as needed.
+         *
+         * TODO: Check?
+         */
+        group?: Object;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+        transaction?: Transaction;
+    }
+
+    /**
+     * Options for Model.build method
+     */
+    interface BuildOptions {
+
+        /**
+         * If set to true, values will ignore field and virtual setters.
+         */
+        raw?: boolean;
+
+        /**
+         * Is this record new
+         */
+        isNewRecord?: boolean;
+
+        /**
+         * an array of include options - Used to build prefetched/included model instances. See `set`
+         *
+         * TODO: See set
+         */
+        include?: Array<Model<any, any> | IncludeOptions>;
+
+    }
+
+    /**
+     * Options for Model.create method
+     */
+    interface CreateOptions extends BuildOptions {
+
+        /**
+         * If set, only columns matching those in fields will be saved
+         */
+        fields?: string[];
+
+        /**
+         * On Duplicate
+         */
+        onDuplicate?: string;
+
+        /**
+         * Transaction to run query under
+         */
+        transaction?: Transaction;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+        silent?: boolean;
+
+        returning?: boolean;
+    }
+
+    /**
+     * Options for Model.findOrInitialize method
+     */
+    interface FindOrInitializeOptions<TAttributes> {
+
+        /**
+         * A hash of search attributes.
+         */
+        where: string | WhereOptions;
+
+        /**
+         * Default values to use if building a new instance
+         */
+        defaults?: TAttributes;
+
+        /**
+         * Transaction to run query under
+         */
+        transaction?: Transaction;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+    }
+
+    /**
+     * Options for Model.upsert method
+     */
+    interface UpsertOptions {
+
+        /**
+         * Run validations before the row is inserted
+         */
+        validate?: boolean;
+
+        /**
+         * The fields to insert / update. Defaults to all fields
+         */
+        fields?: string[];
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+        /**
+         * Transaction to run query under
+         */
+        transaction?: Transaction;
+
+        /**
+         * An optional parameter to specify the schema search_path (Postgres only)
+         */
+        searchPath?: string;
+
+        /**
+         * Print query execution time in milliseconds when logging SQL.
+         */
+        benchmark?: boolean;
+    }
+
+    /**
+     * Options for Model.bulkCreate method
+     */
+    interface BulkCreateOptions {
+
+        /**
+         * Fields to insert (defaults to all fields)
+         */
+        fields?: string[];
+
+        /**
+         * Should each row be subject to validation before it is inserted. The whole insert will fail if one row
+         * fails validation
+         */
+        validate?: boolean;
+
+        /**
+         * Run before / after bulk create hooks?
+         */
+        hooks?: boolean;
+
+        /**
+         * Run before / after create hooks for each individual Instance? BulkCreate hooks will still be run if
+         * options.hooks is true.
+         */
+        individualHooks?: boolean;
+
+        /**
+         * Ignore duplicate values for primary keys? (not supported by postgres)
+         *
+         * Defaults to false
+         */
+        ignoreDuplicates?: boolean;
+
+        /**
+         * Fields to update if row key already exists (on duplicate key update)? (only supported by mysql &
+         * mariadb). By default, all fields are updated.
+         */
+        updateOnDuplicate?: string[];
+
+        /**
+         * Transaction to run query under
+         */
+        transaction?: Transaction;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+    }
+
+    /**
+     * The options passed to Model.destroy in addition to truncate
+     */
+    interface TruncateOptions {
+
+        /**
+         * Transaction to run query under
+         */
+        transaction?: Transaction;
+
+        /**
+         * Only used in conjuction with TRUNCATE. Truncates  all tables that have foreign-key references to the
+         * named table, or to any tables added to the group due to CASCADE.
+         *
+         * Defaults to false;
+         */
+        cascade?: boolean;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+    }
+
+    /**
+     * Options used for Model.destroy
+     */
+    interface DestroyOptions extends TruncateOptions {
+
+        /**
+         * Filter the destroy
+         */
+        where?: WhereOptions;
+
+        /**
+         * Run before / after bulk destroy hooks?
+         */
+        hooks?: boolean;
+
+        /**
+         * If set to true, destroy will SELECT all records matching the where parameter and will execute before /
+         * after destroy hooks on each row
+         */
+        individualHooks?: boolean;
+
+        /**
+         * How many rows to delete
+         */
+        limit?: number;
+
+        /**
+         * Delete instead of setting deletedAt to current timestamp (only applicable if `paranoid` is enabled)
+         */
+        force?: boolean;
+
+        /**
+         * If set to true, dialects that support it will use TRUNCATE instead of DELETE FROM. If a table is
+         * truncated the where and limit options are ignored
+         */
+        truncate?: boolean;
+
+    }
+
+    /**
+     * Options for Model.restore
+     */
+    interface RestoreOptions {
+
+        /**
+         * Filter the restore
+         */
+        where?: WhereOptions;
+
+        /**
+         * Run before / after bulk restore hooks?
+         */
+        hooks?: boolean;
+
+        /**
+         * If set to true, restore will find all records within the where parameter and will execute before / after
+         * bulkRestore hooks on each row
+         */
+        individualHooks?: boolean;
+
+        /**
+         * How many rows to undelete
+         */
+        limit?: number;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+        /**
+         * Transaction to run query under
+         */
+        transaction?: Transaction;
+
+    }
+
+    /**
+     * Options used for Model.update
+     */
+    interface UpdateOptions {
+
+        /**
+         * Options to describe the scope of the search.
+         */
+        where: WhereOptions;
+
+        /**
+         * Fields to update (defaults to all fields)
+         */
+        fields?: string[];
+
+        /**
+         * Should each row be subject to validation before it is inserted. The whole insert will fail if one row
+         * fails validation.
+         *
+         * Defaults to true
+         */
+        validate?: boolean;
+
+        /**
+         * Run before / after bulk update hooks?
+         *
+         * Defaults to true
+         */
+        hooks?: boolean;
+
+        /**
+         * Whether or not to update the side effects of any virtual setters.
+         *
+         * Defaults to true
+         */
+        sideEffects?: boolean;
+
+        /**
+         * Run before / after update hooks?. If true, this will execute a SELECT followed by individual UPDATEs.
+         * A select is needed, because the row data needs to be passed to the hooks
+         *
+         * Defaults to false
+         */
+        individualHooks?: boolean;
+
+        /**
+         * Return the affected rows (only for postgres)
+         */
+        returning?: boolean;
+
+        /**
+         * How many rows to update (only for mysql and mariadb)
+         */
+        limit?: number;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+        /**
+         * Transaction to run query under
+         */
+        transaction?: Transaction;
+
+    }
+
+    /**
+     * Options used for Model.aggregate
+     */
+    interface AggregateOptions extends QueryOptions {
+
+        /**
+         * A hash of search attributes.
+         */
+        where?: WhereOptions;
+
+        /**
+         * The type of the result. If `field` is a field in this Model, the default will be the type of that field,
+         * otherwise defaults to float.
+         */
+        dataType?: DataTypeAbstract | string;
+
+        /**
+         * Applies DISTINCT to the field being aggregated over
+         */
+        distinct?: boolean;
+
+    }
+
+    /**
+     * A Model represents a table in the database. Sometimes you might also see it referred to as model, or simply
+     * as factory. This class should _not_ be instantiated directly, it is created using `sequelize.define`, and
+     * already created models can be loaded using `sequelize.import`
+     */
+    interface Model<TInstance, TAttributes> extends Hooks<TInstance>, Associations {
+
+        /**
+         * The Instance class
+         */
+        Instance(): TInstance;
+
+        /**
+         * Remove attribute from model definition
+         *
+         * @param attribute
+         */
+        removeAttribute(attribute: string): void;
+
+        /**
+         * Sync this Model to the DB, that is create the table. Upon success, the callback will be called with the
+         * model instance (this)
+         */
+        sync(options?: SyncOptions): Promise<this>;
+
+        /**
+         * Drop the table represented by this Model
+         *
+         * @param options
+         */
+        drop(options?: DropOptions): Promise<void>;
+
+        /**
+         * Apply a schema to this model. For postgres, this will actually place the schema in front of the table
+         * name
+         * - `"schema"."tableName"`, while the schema will be prepended to the table name for mysql and
+         * sqlite - `'schema.tablename'`.
+         *
+         * @param schema The name of the schema
+         * @param options
+         */
+        schema(schema: string, options?: SchemaOptions): this;
+
+        /**
+         * Get the tablename of the model, taking schema into account. The method will return The name as a string
+         * if the model has no schema, or an object with `tableName`, `schema` and `delimiter` properties.
+         *
+         * @param options The hash of options from any query. You can use one model to access tables with matching
+         *     schemas by overriding `getTableName` and using custom key/values to alter the name of the table.
+         *     (eg.
+         *     subscribers_1, subscribers_2)
+         * @param options.logging=false A function that gets executed while running the query to log the sql.
+         */
+        getTableName(options?: { logging: Function }): string | Object;
+
+        /**
+         * Apply a scope created in `define` to the model. First let's look at how to create scopes:
+         * ```js
+         * var Model = sequelize.define('model', attributes, {
+         *   defaultScope: {
+         *     where: {
+         *       username: 'dan'
+         *     },
+         *     limit: 12
+         *   },
+         *   scopes: {
+         *     isALie: {
+         *       where: {
+         *         stuff: 'cake'
+         *       }
+         *     },
+         *     complexFunction: function(email, accessLevel) {
+         *       return {
+         *         where: {
+         *           email: {
+         *             $like: email
+         *           },
+         *           accesss_level {
+         *             $gte: accessLevel
+         *           }
+         *         }
+         *       }
+         *     }
+         *   }
+         * })
+         * ```
+         * Now, since you defined a default scope, every time you do Model.find, the default scope is appended to
+         * your query. Here's a couple of examples:
+         * ```js
+         * Model.findAll() // WHERE username = 'dan'
+         * Model.findAll({ where: { age: { gt: 12 } } }) // WHERE age > 12 AND username = 'dan'
+         * ```
+         *
+         * To invoke scope functions you can do:
+         * ```js
+         * Model.scope({ method: ['complexFunction' 'dan@sequelize.com', 42]}).findAll()
+         * // WHERE email like 'dan@sequelize.com%' AND access_level >= 42
+         * ```
+         *
+         * @return Model A reference to the model, with the scope(s) applied. Calling scope again on the returned
+         *     model will clear the previous scope.
+         */
+        scope(options?: string | string[] | ScopeOptions | WhereOptions): this;
+
+        /**
+         * Search for multiple instances.
+         *
+         * __Simple search using AND and =__
+         * ```js
+         * Model.findAll({
+         *   where: {
+         *     attr1: 42,
+         *     attr2: 'cake'
+         *   }
+         * })
+         * ```
+         * ```sql
+         * WHERE attr1 = 42 AND attr2 = 'cake'
+         *```
+         *
+         * __Using greater than, less than etc.__
+         * ```js
+         *
+         * Model.findAll({
+         *   where: {
+         *     attr1: {
+         *       gt: 50
+         *     },
+         *     attr2: {
+         *       lte: 45
+         *     },
+         *     attr3: {
+         *       in: [1,2,3]
+         *     },
+         *     attr4: {
+         *       ne: 5
+         *     }
+         *   }
+         * })
+         * ```
+         * ```sql
+         * WHERE attr1 > 50 AND attr2 <= 45 AND attr3 IN (1,2,3) AND attr4 != 5
+         * ```
+         * Possible options are: `$ne, $in, $not, $notIn, $gte, $gt, $lte, $lt, $like, $ilike/$iLike, $notLike,
+         * $notILike, '..'/$between, '!..'/$notBetween, '&&'/$overlap, '@>'/$contains, '<@'/$contained`
+         *
+         * __Queries using OR__
+         * ```js
+         * Model.findAll({
+         *   where: Sequelize.and(
+         *     { name: 'a project' },
+         *     Sequelize.or(
+         *       { id: [1,2,3] },
+         *       { id: { gt: 10 } }
+         *     )
+         *   )
+         * })
+         * ```
+         * ```sql
+         * WHERE name = 'a project' AND (id` IN (1,2,3) OR id > 10)
+         * ```
+         *
+         * The success listener is called with an array of instances if the query succeeds.
+         *
+         * @see    {Sequelize#query}
+         */
+        findAll(options?: FindOptions): Promise<TInstance[]>;
+        all(optionz?: FindOptions): Promise<TInstance[]>;
+
+        /**
+         * Search for a single instance by its primary key. This applies LIMIT 1, so the listener will
+         * always be called with a single instance.
+         */
+        findById(identifier?: number | string, options?: FindOptions): Promise<TInstance>;
+        findByPrimary(identifier?: number | string, options?: FindOptions): Promise<TInstance>;
+
+        /**
+         * Search for a single instance. This applies LIMIT 1, so the listener will always be called with a single
+         * instance.
+         */
+        findOne(options?: FindOptions): Promise<TInstance>;
+        find(optionz?: FindOptions): Promise<TInstance>;
+
+        /**
+         * Run an aggregation method on the specified field
+         *
+         * @param field The field to aggregate over. Can be a field name or *
+         * @param aggregateFunction The function to use for aggregation, e.g. sum, max etc.
+         * @param options Query options. See sequelize.query for full options
+         * @return Returns the aggregate result cast to `options.dataType`, unless `options.plain` is false, in
+         *     which case the complete data result is returned.
+         */
+        aggregate(field: string, aggregateFunction: Function, options?: AggregateOptions): Promise<Object>;
+
+        /**
+         * Count the number of records matching the provided where clause.
+         *
+         * If you provide an `include` option, the number of matching associations will be counted instead.
+         */
+        count(options?: CountOptions): Promise<number>;
+
+        /**
+         * Find all the rows matching your query, within a specified offset / limit, and get the total number of
+         * rows matching your query. This is very usefull for paging
+         *
+         * ```js
+         * Model.findAndCountAll({
+         *   where: ...,
+         *   limit: 12,
+         *   offset: 12
+         * }).then(function (result) {
+         *   ...
+         * })
+         * ```
+         * In the above example, `result.rows` will contain rows 13 through 24, while `result.count` will return
+         * the
+         * total number of rows that matched your query.
+         *
+         * When you add includes, only those which are required (either because they have a where clause, or
+         * because
+         * `required` is explicitly set to true on the include) will be added to the count part.
+         *
+         * Suppose you want to find all users who have a profile attached:
+         * ```js
+         * User.findAndCountAll({
+         *   include: [
+         *      { model: Profile, required: true}
+         *   ],
+         *   limit 3
+         * });
+         * ```
+         * Because the include for `Profile` has `required` set it will result in an inner join, and only the users
+         * who have a profile will be counted. If we remove `required` from the include, both users with and
+         * without
+         * profiles will be counted
+         */
+        findAndCount(options?: FindOptions): Promise<{ rows: TInstance[], count: number }>;
+        findAndCountAll(options?: FindOptions): Promise<{ rows: TInstance[], count: number }>;
+
+        /**
+         * Find the maximum value of field
+         */
+        max(field: string, options?: AggregateOptions): Promise<any>;
+
+        /**
+         * Find the minimum value of field
+         */
+        min(field: string, options?: AggregateOptions): Promise<any>;
+
+        /**
+         * Find the sum of field
+         */
+        sum(field: string, options?: AggregateOptions): Promise<number>;
+
+        /**
+         * Builds a new model instance. Values is an object of key value pairs, must be defined but can be empty.
+         */
+        build(record?: TAttributes, options?: BuildOptions): TInstance;
+
+        /**
+         * Undocumented bulkBuild
+         */
+        bulkBuild(records: TAttributes[], options?: BuildOptions): TInstance[];
+
+        /**
+         * Builds a new model instance and calls save on it.
+         */
+        create(values?: TAttributes, options?: CreateOptions): Promise<TInstance>;
+
+        /**
+         * Find a row that matches the query, or build (but don't save) the row if none is found.
+         * The successfull result of the promise will be (instance, initialized) - Make sure to use .spread()
+         */
+        findOrInitialize(options: FindOrInitializeOptions<TAttributes>): Promise<TInstance>;
+        findOrBuild(options: FindOrInitializeOptions<TAttributes>): Promise<TInstance>;
+
+        /**
+         * Find a row that matches the query, or build and save the row if none is found
+         * The successful result of the promise will be (instance, created) - Make sure to use .spread()
+         *
+         * If no transaction is passed in the `options` object, a new transaction will be created internally, to
+         * prevent the race condition where a matching row is created by another connection after the find but
+         * before the insert call. However, it is not always possible to handle this case in SQLite, specifically
+         * if one transaction inserts and another tries to select before the first one has comitted. In this case,
+         * an instance of sequelize.TimeoutError will be thrown instead. If a transaction is created, a savepoint
+         * will be created instead, and any unique constraint violation will be handled internally.
+         */
+        findOrCreate(options: FindOrInitializeOptions<TAttributes>): Promise<TInstance>;
+
+        /**
+         * Insert or update a single row. An update will be executed if a row which matches the supplied values on
+         * either the primary key or a unique key is found. Note that the unique index must be defined in your
+         * sequelize model and not just in the table. Otherwise you may experience a unique constraint violation,
+         * because sequelize fails to identify the row that should be updated.
+         *
+         * **Implementation details:**
+         *
+         * * MySQL - Implemented as a single query `INSERT values ON DUPLICATE KEY UPDATE values`
+         * * PostgreSQL - Implemented as a temporary function with exception handling: INSERT EXCEPTION WHEN
+         *   unique_constraint UPDATE
+         * * SQLite - Implemented as two queries `INSERT; UPDATE`. This means that the update is executed
+         * regardless
+         *   of whether the row already existed or not
+         *
+         * **Note** that SQLite returns undefined for created, no matter if the row was created or updated. This is
+         * because SQLite always runs INSERT OR IGNORE + UPDATE, in a single query, so there is no way to know
+         * whether the row was inserted or not.
+         */
+        upsert(values: TAttributes, options?: UpsertOptions): Promise<boolean>;
+        insertOrUpdate(values: TAttributes, options?: UpsertOptions): Promise<boolean>;
+
+        /**
+         * Create and insert multiple instances in bulk.
+         *
+         * The success handler is passed an array of instances, but please notice that these may not completely
+         * represent the state of the rows in the DB. This is because MySQL and SQLite do not make it easy to
+         * obtain
+         * back automatically generated IDs and other default values in a way that can be mapped to multiple
+         * records. To obtain Instances for the newly created values, you will need to query for them again.
+         *
+         * @param records List of objects (key/value pairs) to create instances from
+         */
+        bulkCreate(records: TAttributes[], options?: BulkCreateOptions): Promise<TInstance[]>;
+
+        /**
+         * Truncate all instances of the model. This is a convenient method for Model.destroy({ truncate: true }).
+         */
+        truncate(options?: TruncateOptions): Promise<void>;
+
+        /**
+         * Delete multiple instances, or set their deletedAt timestamp to the current time if `paranoid` is enabled.
+         *
+         * @return Promise<number> The number of destroyed rows
+         */
+        destroy(options?: DestroyOptions): Promise<number>;
+
+        /**
+         * Restore multiple instances if `paranoid` is enabled.
+         */
+        restore(options?: RestoreOptions): Promise<void>;
+
+        /**
+         * Update multiple instances that match the where options. The promise returns an array with one or two
+         * elements. The first element is always the number of affected rows, while the second element is the actual
+         * affected rows (only supported in postgres with `options.returning` true.)
+         */
+        update(values: TAttributes, options: UpdateOptions): Promise<[number, TInstance[]]>;
+
+        /**
+         * Run a describe query on the table. The result will be return to the listener as a hash of attributes and
+         * their types.
+         */
+        describe(): Promise<Object>;
+
+        /**
+         * Unscope the model
+         */
+        unscoped(): this;
+
+    }
+
+    //
+    //  Query Interface
+    // ~~~~~~~~~~~~~~~~~
+    //
+    //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/query-interface.js
+    //
+
+    /**
+     * Most of the methods accept options and use only the logger property of the options. That's why the most used
+     * interface type for options in a method is separated here as another interface.
+     */
+    interface QueryInterfaceOptions {
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+    }
+
+    /**
+     * The interface that Sequelize uses to talk to all databases.
+     *
+     * This interface is available through sequelize.QueryInterface. It should not be commonly used, but it's
+     * referenced anyway, so it can be used.
+     */
+    interface QueryInterface {
+
+        /**
+         * Returns the dialect-specific sql generator.
+         *
+         * We don't have a definition for the QueryGenerator, because I doubt it is commonly in use separately.
+         */
+        QueryGenerator: any;
+
+        /**
+         * Returns the current sequelize instance.
+         */
+        sequelize: Sequelize;
+
+        /**
+         * Queries the schema (table list).
+         *
+         * @param schema The schema to query. Applies only to Postgres.
+         */
+        createSchema(schema?: string, options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Drops the specified schema (table).
+         *
+         * @param schema The schema to query. Applies only to Postgres.
+         */
+        dropSchema(schema?: string, options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Drops all tables.
+         */
+        dropAllSchemas(options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Queries all table names in the database.
+         *
+         * @param options
+         */
+        showAllSchemas(options?: QueryOptions): Promise<Object>;
+
+        /**
+         * Return database version
+         */
+        databaseVersion(options?: QueryInterfaceOptions): Promise<string>;
+
+        /**
+         * Creates a table with specified attributes.
+         *
+         * @param tableName     Name of table to create
+         * @param attributes    Hash of attributes, key is attribute name, value is data type
+         * @param options       Query options.
+         */
+        createTable(tableName: string | { schema?: string, tableName?: string }, attributes: DefineAttributes,
+            options?: QueryOptions): Promise<void>;
+
+        /**
+         * Drops the specified table.
+         *
+         * @param tableName Table name.
+         * @param options   Query options, particularly "force".
+         */
+        dropTable(tableName: string, options?: QueryOptions): Promise<void>;
+
+        /**
+         * Drops all tables.
+         *
+         * @param options
+         */
+        dropAllTables(options?: QueryOptions): Promise<void>;
+
+        /**
+         * Drops all defined enums
+         *
+         * @param options
+         */
+        dropAllEnums(options?: QueryOptions): Promise<void>;
+
+        /**
+         * Renames a table
+         */
+        renameTable(before: string, after: string, options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Returns all tables
+         */
+        showAllTables(options?: QueryOptions): Promise<string[]>;
+
+        /**
+         * Describe a table
+         */
+        describeTable(tableName: string | { schema?: string, tableName?: string },
+            options?: string | { schema?: string, schemaDelimeter?: string, logging?: boolean | Function }): Promise<Object>;
+
+        /**
+         * Adds a new column to a table
+         */
+        addColumn(table: string, key: string, attribute: DefineAttributeColumnOptions | DataTypeAbstract,
+            options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Removes a column from a table
+         */
+        removeColumn(table: string, attribute: string, options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Changes a column
+         */
+        changeColumn(tableName: string | { schema?: string, tableName?: string }, attributeName: string,
+            dataTypeOrOptions?: string | DataTypeAbstract | DefineAttributeColumnOptions,
+            options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Renames a column
+         */
+        renameColumn(tableName: string | { schema?: string, tableName?: string }, attrNameBefore: string,
+            attrNameAfter: string,
+            options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Adds a new index to a table
+         */
+        addIndex(tableName: string | Object, attributes: string[], options?: QueryOptions,
+            rawTablename?: string): Promise<void>;
+
+        /**
+         * Shows the index of a table
+         */
+        showIndex(tableName: string | Object, options?: QueryOptions): Promise<Object>;
+
+        /**
+         * Put a name to an index
+         */
+        nameIndexes(indexes: string[], rawTablename: string): Promise<void>;
+
+        /**
+         * Returns all foreign key constraints of a table
+         */
+        getForeignKeysForTables(tableNames: string, options?: QueryInterfaceOptions): Promise<Object>;
+
+        /**
+         * Removes an index of a table
+         */
+        removeIndex(tableName: string, indexNameOrAttributes: string[] | string,
+            options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Inserts a new record
+         */
+        insert(instance: Instance<any>, tableName: string, values: Object,
+            options?: QueryOptions): Promise<Object>;
+
+        /**
+         * Inserts or Updates a record in the database
+         */
+        upsert(tableName: string, values: Object, updateValues: Object, model: Model<any, any>,
+            options?: QueryOptions): Promise<Object>;
+
+        /**
+         * Inserts multiple records at once
+         */
+        bulkInsert(tableName: string, records: Object[], options?: QueryOptions,
+            attributes?: string[] | string): Promise<Object>;
+
+        /**
+         * Updates a row
+         */
+        update(instance: Instance<any>, tableName: string, values: Object, identifier: Object,
+            options?: QueryOptions): Promise<Object>;
+
+        /**
+         * Updates multiple rows at once
+         */
+        bulkUpdate(tableName: string, values: Object, identifier: Object, options?: QueryOptions,
+            attributes?: string[] | string): Promise<Object>;
+
+        /**
+         * Deletes a row
+         */
+        "delete"(instance: Instance<any>, tableName: string, identifier: Object,
+            options?: QueryOptions): Promise<Object>;
+
+        /**
+         * Deletes multiple rows at once
+         */
+        bulkDelete(tableName: string, identifier: Object, options?: QueryOptions,
+            model?: Model<any, any>): Promise<Object>;
+
+        /**
+         * Returns selected rows
+         */
+        select(model: Model<any, any>, tableName: string, options?: QueryOptions): Promise<Object[]>;
+
+        /**
+         * Increments a row value
+         */
+        increment(instance: Instance<any>, tableName: string, values: Object, identifier: Object,
+            options?: QueryOptions): Promise<Object>;
+
+        /**
+         * Selects raw without parsing the string into an object
+         */
+        rawSelect(tableName: string, options: QueryOptions, attributeSelector: string | string[],
+            model?: Model<any, any>): Promise<string[]>;
+
+        /**
+         * Postgres only. Creates a trigger on specified table to call the specified function with supplied
+         * parameters.
+         */
+        createTrigger(tableName: string, triggerName: string, timingType: string, fireOnArray: any[],
+            functionName: string, functionParams: any[], optionsArray: string[],
+            options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Postgres only. Drops the specified trigger.
+         */
+        dropTrigger(tableName: string, triggerName: string, options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Postgres only. Renames a trigger
+         */
+        renameTrigger(tableName: string, oldTriggerName: string, newTriggerName: string,
+            options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Postgres only. Create a function
+         */
+        createFunction(functionName: string, params: any[], returnType: string, language: string,
+            body: string, options?: QueryOptions): Promise<void>;
+
+        /**
+         * Postgres only. Drops a function
+         */
+        dropFunction(functionName: string, params: any[],
+            options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Postgres only. Rename a function
+         */
+        renameFunction(oldFunctionName: string, params: any[], newFunctionName: string,
+            options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Escape an identifier (e.g. a table or attribute name). If force is true, the identifier will be quoted
+         * even if the `quoteIdentifiers` option is false.
+         */
+        quoteIdentifier(identifier: string, force: boolean): string;
+
+        /**
+         * Escape a table name
+         */
+        quoteTable(identifier: string): string;
+
+        /**
+         * Split an identifier into .-separated tokens and quote each part. If force is true, the identifier will be
+         * quoted even if the `quoteIdentifiers` option is false.
+         */
+        quoteIdentifiers(identifiers: string, force: boolean): string;
+
+        /**
+         * Escape a value (e.g. a string, number or date)
+         */
+        escape(value?: string | number | Date): string;
+
+        /**
+         * Set option for autocommit of a transaction
+         */
+        setAutocommit(transaction: Transaction, value: boolean, options?: QueryOptions): Promise<void>;
+
+        /**
+         * Set the isolation level of a transaction
+         */
+        setIsolationLevel(transaction: Transaction, value: string, options?: QueryOptions): Promise<void>;
+
+        /**
+         * Begin a new transaction
+         */
+        startTransaction(transaction: Transaction, options?: QueryOptions): Promise<void>;
+
+        /**
+         * Defer constraints
+         */
+        deferConstraints(transaction: Transaction, options?: QueryOptions): Promise<void>;
+
+        /**
+         * Commit an already started transaction
+         */
+        commitTransaction(transaction: Transaction, options?: QueryOptions): Promise<void>;
+
+        /**
+         * Rollback ( revert ) a transaction that has'nt been commited
+         */
+        rollbackTransaction(transaction: Transaction, options?: QueryOptions): Promise<void>;
+
+    }
+
+    //
+    //  Query Types
+    // ~~~~~~~~~~~~~
+    //
+    //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/query-types.js
+    //
+
+    interface QueryTypes {
+        SELECT: string; // 'SELECT'
+        INSERT: string; // 'INSERT'
+        UPDATE: string; // 'UPDATE'
+        BULKUPDATE: string; // 'BULKUPDATE'
+        BULKDELETE: string; // 'BULKDELETE'
+        DELETE: string; // 'DELETE'
+        UPSERT: string; // 'UPSERT'
+        VERSION: string; // 'VERSION'
+        SHOWTABLES: string; // 'SHOWTABLES'
+        SHOWINDEXES: string; // 'SHOWINDEXES'
+        DESCRIBE: string; // 'DESCRIBE'
+        RAW: string; // 'RAW'
+        FOREIGNKEYS: string; // 'FOREIGNKEYS'
+    }
+
+    //
+    //  Sequelize
+    // ~~~~~~~~~~~
+    //
+    //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/sequelize.js
+    //
+
+    /**
+     * General column options
+     *
+     * @see Define
+     * @see AssociationForeignKeyOptions
+     */
+    interface ColumnOptions {
+
+        /**
+         * If false, the column will have a NOT NULL constraint, and a not null validation will be run before an
+         * instance is saved.
+         */
+        allowNull?: boolean;
+
+        /**
+         *  If set, sequelize will map the attribute name to a different name in the database
+         */
+        field?: string;
+
+        /**
+         * A literal default value, a JavaScript function, or an SQL function (see `sequelize.fn`)
+         */
+        defaultValue?: any;
+
+    }
+
+    /**
+     * References options for the column's attributes
+     *
+     * @see AttributeColumnOptions
+     */
+    interface DefineAttributeColumnReferencesOptions {
+
+        /**
+         * If this column references another table, provide it here as a Model, or a string
+         */
+        model?: string | Model<any, any>;
+
+        /**
+         * The column of the foreign table that this column references
+         */
+        key?: string;
+
+        /**
+         * When to check for the foreign key constraing
+         *
+         * PostgreSQL only
+         */
+        deferrable?: Deferrable;
+
+    }
+
+    /**
+     * Column options for the model schema attributes
+     *
+     * @see Attributes
+     */
+    interface DefineAttributeColumnOptions extends ColumnOptions {
+
+        /**
+         * A string or a data type
+         */
+        type: string | DataTypeAbstract;
+
+        /**
+         * If true, the column will get a unique constraint. If a string is provided, the column will be part of a
+         * composite unique index. If multiple columns have the same string, they will be part of the same unique
+         * index
+         */
+        unique?: boolean | string | { name: string, msg: string };
+
+        /**
+         * Primary key flag
+         */
+        primaryKey?: boolean;
+
+        /**
+         * Is this field an auto increment field
+         */
+        autoIncrement?: boolean;
+
+        /**
+         * Comment for the database
+         */
+        comment?: string;
+
+        /**
+         * An object with reference configurations
+         */
+        references?: DefineAttributeColumnReferencesOptions;
+
+        /**
+         * What should happen when the referenced key is updated. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
+         * NO ACTION
+         */
+        onUpdate?: string;
+
+        /**
+         * What should happen when the referenced key is deleted. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
+         * NO ACTION
+         */
+        onDelete?: string;
+
+        /**
+         * Provide a custom getter for this column. Use `this.getDataValue(String)` to manipulate the underlying
+         * values.
+         */
+        get?: () => any;
+
+        /**
+         * Provide a custom setter for this column. Use `this.setDataValue(String, Value)` to manipulate the
+         * underlying values.
+         */
+        set?: (val: any) => void;
+
+        /**
+         * An object of validations to execute for this column every time the model is saved. Can be either the
+         * name of a validation provided by validator.js, a validation function provided by extending validator.js
+         * (see the
+         * `DAOValidator` property for more details), or a custom validation function. Custom validation functions
+         * are called with the value of the field, and can possibly take a second callback argument, to signal that
+         * they are asynchronous. If the validator is sync, it should throw in the case of a failed validation, it
+         * it is async, the callback should be called with the error text.
+         */
+        validate?: DefineValidateOptions;
+
+        /**
+         * Usage in object notation
+         *
+         * ```js
+         * sequelize.define('model', {
+         *     states: {
+         *       type:   Sequelize.ENUM,
+         *       values: ['active', 'pending', 'deleted']
+         *     }
+         *   })
+         * ```
+         */
+        values?: string[];
+
+    }
+
+    /**
+     * Interface for Attributes provided for a column
+     *
+     * @see Sequelize.define
+     */
+    interface DefineAttributes {
+
+        /**
+         * The description of a database column
+         */
+        [name: string]: string | DataTypeAbstract | DefineAttributeColumnOptions;
+
+    }
+
+    /**
+     * Interface for query options
+     *
+     * @see Options
+     */
+    interface QueryOptions {
+
+        /**
+         * If true, sequelize will not try to format the results of the query, or build an instance of a model from
+         * the result
+         */
+        raw?: boolean;
+
+        /**
+         * The transaction that the query should be executed under
+         */
+        transaction?: Transaction;
+
+        /**
+         * The type of query you are executing. The query type affects how results are formatted before they are
+         * passed back. The type is a string, but `Sequelize.QueryTypes` is provided as convenience shortcuts.
+         */
+        type?: string;
+
+        /**
+         * If true, transforms objects with `.` separated property names into nested objects using
+         * [dottie.js](https://github.com/mickhansen/dottie.js). For example { 'user.username': 'john' } becomes
+         * { user: { username: 'john' }}. When `nest` is true, the query type is assumed to be `'SELECT'`,
+         * unless otherwise specified
+         *
+         * Defaults to false
+         */
+        nest?: boolean;
+
+        /**
+         * Sets the query type to `SELECT` and return a single row
+         */
+        plain?: boolean;
+
+        /**
+         * Either an object of named parameter replacements in the format `:param` or an array of unnamed
+         * replacements to replace `?` in your SQL.
+         */
+        replacements?: Object | string[];
+
+        /**
+         * Force the query to use the write pool, regardless of the query type.
+         *
+         * Defaults to false
+         */
+        useMaster?: boolean;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: Function;
+
+        /**
+         * A sequelize instance used to build the return instance
+         */
+        instance?: Instance<any>;
+
+        /**
+         * A sequelize model used to build the returned model instances (used to be called callee)
+         */
+        model?: Model<any, any>;
+
+        // TODO: force, cascade
+
+    }
+
+    /**
+     * Model validations, allow you to specify format/content/inheritance validations for each attribute of the
+     * model.
+     *
+     * Validations are automatically run on create, update and save. You can also call validate() to manually
+     * validate an instance.
+     *
+     * The validations are implemented by validator.js.
+     */
+    interface DefineValidateOptions {
+
+        /**
+         * is: ["^[a-z]+$",'i'] // will only allow letters
+         * is: /^[a-z]+$/i      // same as the previous example using real RegExp
+         */
+        is?: string | Array<string | RegExp> | RegExp | { msg: string, args: string | Array<string | RegExp> | RegExp };
+
+        /**
+         * not: ["[a-z]",'i']  // will not allow letters
+         */
+        not?: string | Array<string | RegExp> | RegExp | { msg: string, args: string | Array<string | RegExp> | RegExp };
+
+        /**
+         * checks for email format (foo@bar.com)
+         */
+        isEmail?: boolean | { msg: string };
+
+        /**
+         * checks for url format (http://foo.com)
+         */
+        isUrl?: boolean | { msg: string };
+
+        /**
+         * checks for IPv4 (129.89.23.1) or IPv6 format
+         */
+        isIP?: boolean | { msg: string };
+
+        /**
+         * checks for IPv4 (129.89.23.1)
+         */
+        isIPv4?: boolean | { msg: string };
+
+        /**
+         * checks for IPv6 format
+         */
+        isIPv6?: boolean | { msg: string };
+
+        /**
+         * will only allow letters
+         */
+        isAlpha?: boolean | { msg: string };
+
+        /**
+         * will only allow alphanumeric characters, so "_abc" will fail
+         */
+        isAlphanumeric?: boolean | { msg: string };
+
+        /**
+         * will only allow numbers
+         */
+        isNumeric?: boolean | { msg: string };
+
+        /**
+         * checks for valid integers
+         */
+        isInt?: boolean | { msg: string };
+
+        /**
+         * checks for valid floating point numbers
+         */
+        isFloat?: boolean | { msg: string };
+
+        /**
+         * checks for any numbers
+         */
+        isDecimal?: boolean | { msg: string };
+
+        /**
+         * checks for lowercase
+         */
+        isLowercase?: boolean | { msg: string };
+
+        /**
+         * checks for uppercase
+         */
+        isUppercase?: boolean | { msg: string };
+
+        /**
+         * won't allow null
+         */
+        notNull?: boolean | { msg: string };
+
+        /**
+         * only allows null
+         */
+        isNull?: boolean | { msg: string };
+
+        /**
+         * don't allow empty strings
+         */
+        notEmpty?: boolean | { msg: string };
+
+        /**
+         * only allow a specific value
+         */
+        equals?: string | { msg: string };
+
+        /**
+         * force specific substrings
+         */
+        contains?: string | { msg: string };
+
+        /**
+         * check the value is not one of these
+         */
+        notIn?: string[][] | { msg: string, args: string[][] };
+
+        /**
+         * check the value is one of these
+         */
+        isIn?: string[][] | { msg: string, args: string[][] };
+
+        /**
+         * don't allow specific substrings
+         */
+        notContains?: string[] | string | { msg: string, args: string[] | string };
+
+        /**
+         * only allow values with length between 2 and 10
+         */
+        len?: [number, number] | { msg: string, args: [number, number] };
+
+        /**
+         * only allow uuids
+         */
+        isUUID?: number | { msg: string, args: number };
+
+        /**
+         * only allow date strings
+         */
+        isDate?: boolean | { msg: string, args: boolean };
+
+        /**
+         * only allow date strings after a specific date
+         */
+        isAfter?: string | { msg: string, args: string };
+
+        /**
+         * only allow date strings before a specific date
+         */
+        isBefore?: string | { msg: string, args: string };
+
+        /**
+         * only allow values
+         */
+        max?: number | { msg: string, args: number };
+
+        /**
+         * only allow values >= 23
+         */
+        min?: number | { msg: string, args: number };
+
+        /**
+         * only allow arrays
+         */
+        isArray?: boolean | { msg: string, args: boolean };
+
+        /**
+         * check for valid credit card numbers
+         */
+        isCreditCard?: boolean | { msg: string, args: boolean };
+
+        /**
+         * custom validations are also possible
+         *
+         * Implementation notes :
+         *
+         * We can't enforce any other method to be a function, so :
+         *
+         * ```typescript
+         * [name: string] : ( value : any ) => boolean;
+         * ```
+         *
+         * doesn't work in combination with the properties above
+         *
+         * @see https://github.com/Microsoft/TypeScript/issues/1889
+         */
+        [name: string]: any;
+
+    }
+
+    /**
+     * Interface for indexes property in DefineOptions
+     *
+     * @see DefineOptions
+     */
+    interface DefineIndexesOptions {
+
+        /**
+         * The name of the index. Defaults to model name + _ + fields concatenated
+         */
+        name?: string;
+
+        /**
+         * Index type. Only used by mysql. One of `UNIQUE`, `FULLTEXT` and `SPATIAL`
+         */
+        index?: string;
+
+        /**
+         * The method to create the index by (`USING` statement in SQL). BTREE and HASH are supported by mysql and
+         * postgres, and postgres additionally supports GIST and GIN.
+         */
+        method?: string;
+
+        /**
+         * Should the index by unique? Can also be triggered by setting type to `UNIQUE`
+         *
+         * Defaults to false
+         */
+        unique?: boolean;
+
+        /**
+         * PostgreSQL will build the index without taking any write locks. Postgres only
+         *
+         * Defaults to false
+         */
+        concurrently?: boolean;
+
+        /**
+         * An array of the fields to index. Each field can either be a string containing the name of the field,
+         * a sequelize object (e.g `sequelize.fn`), or an object with the following attributes: `attribute`
+         * (field name), `length` (create a prefix index of length chars), `order` (the direction the column
+         * should be sorted in), `collate` (the collation (sort order) for the column)
+         */
+        fields?: Array<string | { attribute: string, length: number, order: string, collate: string }>;
+
+    }
+
+    /**
+     * Interface for name property in DefineOptions
+     *
+     * @see DefineOptions
+     */
+    interface DefineNameOptions {
+
+        /**
+         * Singular model name
+         */
+        singular?: string;
+
+        /**
+         * Plural model name
+         */
+        plural?: string;
+
+    }
+
+    /**
+     * Interface for getterMethods in DefineOptions
+     *
+     * @see DefineOptions
+     */
+    interface DefineGetterMethodsOptions {
+        [name: string]: () => any;
+    }
+
+    /**
+     * Interface for setterMethods in DefineOptions
+     *
+     * @see DefineOptions
+     */
+    interface DefineSetterMethodsOptions {
+        [name: string]: (val: any) => void;
+    }
+
+    /**
+     * Interface for Define Scope Options
+     *
+     * @see DefineOptions
+     */
+    interface DefineScopeOptions {
+
+        /**
+         * Name of the scope and it's query
+         */
+        [scopeName: string]: FindOptions | Function;
+
+    }
+
+    /**
+     * Options for model definition
+     *
+     * @see Sequelize.define
+     */
+    interface DefineOptions<TInstance> {
+
+        /**
+         * Define the default search scope to use for this model. Scopes have the same form as the options passed to
+         * find / findAll.
+         */
+        defaultScope?: FindOptions;
+
+        /**
+         * More scopes, defined in the same way as defaultScope above. See `Model.scope` for more information about
+         * how scopes are defined, and what you can do with them
+         */
+        scopes?: DefineScopeOptions;
+
+        /**
+         * Don't persits null values. This means that all columns with null values will not be saved.
+         */
+        omitNull?: boolean;
+
+        /**
+         * Adds createdAt and updatedAt timestamps to the model. Default true.
+         */
+        timestamps?: boolean;
+
+        /**
+         * Calling destroy will not delete the model, but instead set a deletedAt timestamp if this is true. Needs
+         * timestamps=true to work. Default false.
+         */
+        paranoid?: boolean;
+
+        /**
+         * Converts all camelCased columns to underscored if true. Default false.
+         */
+        underscored?: boolean;
+
+        /**
+         * Converts camelCased model names to underscored tablenames if true. Default false.
+         */
+        underscoredAll?: boolean;
+
+        /**
+         * If freezeTableName is true, sequelize will not try to alter the DAO name to get the table name.
+         * Otherwise, the dao name will be pluralized. Default false.
+         */
+        freezeTableName?: boolean;
+
+        /**
+         * An object with two attributes, `singular` and `plural`, which are used when this model is associated to
+         * others.
+         */
+        name?: DefineNameOptions;
+
+        /**
+         * Indexes for the provided database table
+         */
+        indexes?: DefineIndexesOptions[];
+
+        /**
+         * Override the name of the createdAt column if a string is provided, or disable it if false. Timestamps
+         * must be true. Not affected by underscored setting.
+         */
+        createdAt?: string | boolean;
+
+        /**
+         * Override the name of the deletedAt column if a string is provided, or disable it if false. Timestamps
+         * must be true. Not affected by underscored setting.
+         */
+        deletedAt?: string | boolean;
+
+        /**
+         * Override the name of the updatedAt column if a string is provided, or disable it if false. Timestamps
+         * must be true. Not affected by underscored setting.
+         */
+        updatedAt?: string | boolean;
+
+        /**
+         * Defaults to pluralized model name, unless freezeTableName is true, in which case it uses model name
+         * verbatim
+         */
+        tableName?: string;
+
+        /**
+         * Provide getter functions that work like those defined per column. If you provide a getter method with
+         * the
+         * same name as a column, it will be used to access the value of that column. If you provide a name that
+         * does not match a column, this function will act as a virtual getter, that can fetch multiple other
+         * values
+         */
+        getterMethods?: DefineGetterMethodsOptions;
+
+        /**
+         * Provide setter functions that work like those defined per column. If you provide a setter method with
+         * the
+         * same name as a column, it will be used to update the value of that column. If you provide a name that
+         * does not match a column, this function will act as a virtual setter, that can act on and set other
+         * values, but will not be persisted
+         */
+        setterMethods?: DefineSetterMethodsOptions;
+
+        /**
+         * Provide functions that are added to each instance (DAO). If you override methods provided by sequelize,
+         * you can access the original method using `this.constructor.super_.prototype`, e.g.
+         * `this.constructor.super_.prototype.toJSON.apply(this, arguments)`
+         */
+        instanceMethods?: Object;
+
+        /**
+         * Provide functions that are added to the model (Model). If you override methods provided by sequelize,
+         * you can access the original method using `this.constructor.prototype`, e.g.
+         * `this.constructor.prototype.find.apply(this, arguments)`
+         */
+        classMethods?: Object;
+
+        schema?: string;
+
+        /**
+         * You can also change the database engine, e.g. to MyISAM. InnoDB is the default.
+         */
+        engine?: string;
+
+        charset?: string;
+
+        /**
+         * Finaly you can specify a comment for the table in MySQL and PG
+         */
+        comment?: string;
+
+        collate?: string;
+
+        /**
+         * Set the initial AUTO_INCREMENT value for the table in MySQL.
+         */
+        initialAutoIncrement?: string;
+
+        /**
+         * An object of hook function that are called before and after certain lifecycle events.
+         * The possible hooks are: beforeValidate, afterValidate, beforeBulkCreate, beforeBulkDestroy,
+         * beforeBulkUpdate, beforeCreate, beforeDestroy, beforeUpdate, afterCreate, afterDestroy, afterUpdate,
+         * afterBulkCreate, afterBulkDestory and afterBulkUpdate. See Hooks for more information about hook
+         * functions and their signatures. Each property can either be a function, or an array of functions.
+         */
+        hooks?: HooksDefineOptions<TInstance>;
+
+        /**
+         * An object of model wide validations. Validations have access to all model values via `this`. If the
+         * validator function takes an argument, it is asumed to be async, and is called with a callback that
+         * accepts an optional error.
+         */
+        validate?: DefineValidateOptions;
+
+    }
+
+    /**
+     * Sync Options
+     *
+     * @see Sequelize.sync
+     */
+    interface SyncOptions {
+
+        /**
+         * If force is true, each DAO will do DROP TABLE IF EXISTS ..., before it tries to create its own table
+         */
+        force?: boolean;
+
+        /**
+         * Match a regex against the database name before syncing, a safety check for cases where force: true is
+         * used in tests but not live code
+         */
+        match?: RegExp;
+
+        /**
+         * A function that logs sql queries, or false for no logging
+         */
+        logging?: Function | boolean;
+
+        /**
+         * The schema that the tables should be created in. This can be overriden for each table in sequelize.define
+         */
+        schema?: string;
+
+    }
+
+    interface SetOptions { }
+
+    /**
+     * Connection Pool options
+     *
+     * @see Options
+     */
+    interface PoolOptions {
+
+        /**
+         * Maximum connections of the pool
+         */
+        maxConnections?: number;
+
+        /**
+         * Minimum connections of the pool
+         */
+        minConnections?: number;
+
+        /**
+         * The maximum time, in milliseconds, that a connection can be idle before being released.
+         */
+        maxIdleTime?: number;
+
+        /**
+         * A function that validates a connection. Called with client. The default function checks that client is an
+         * object, and that its state is not disconnected.
+         */
+        validateConnection?: (client?: any) => boolean;
+
+    }
+
+    /**
+     * Interface for replication Options in the sequelize constructor
+     *
+     * @see Options
+     */
+    interface ReplicationOptions {
+
+        read?: {
+            host?: string;
+            port?: string | number;
+            username?: string;
+            password?: string;
+            database?: string;
+        };
+
+        write?: {
+            host?: string;
+            port?: string | number;
+            username?: string;
+            password?: string;
+            database?: string;
+        };
+
+    }
+
+    /**
+     * Options for the constructor of Sequelize main class
+     */
+    interface Options {
+
+        /**
+         * The dialect of the database you are connecting to. One of mysql, postgres, sqlite, mariadb and mssql.
+         *
+         * Defaults to 'mysql'
+         */
+        dialect?: string;
+
+        /**
+         * If specified, load the dialect library from this path. For example, if you want to use pg.js instead of
+         * pg when connecting to a pg database, you should specify 'pg.js' here
+         */
+        dialectModulePath?: string;
+
+        /**
+         * An object of additional options, which are passed directly to the connection library
+         */
+        dialectOptions?: Object;
+
+        /**
+         * Only used by sqlite.
+         *
+         * Defaults to ':memory:'
+         */
+        storage?: string;
+
+        /**
+         * The host of the relational database.
+         *
+         * Defaults to 'localhost'
+         */
+        host?: string;
+
+        /**
+         * The port of the relational database.
+         */
+        port?: number;
+
+        /**
+         * The protocol of the relational database.
+         *
+         * Defaults to 'tcp'
+         */
+        protocol?: string;
+
+        /**
+         * Default options for model definitions. See sequelize.define for options
+         */
+        define?: DefineOptions<any>;
+
+        /**
+         * Default options for sequelize.query
+         */
+        query?: QueryOptions;
+
+        /**
+         * Default options for sequelize.set
+         */
+        set?: SetOptions;
+
+        /**
+         * Default options for sequelize.sync
+         */
+        sync?: SyncOptions;
+
+        /**
+         * The timezone used when converting a date from the database into a JavaScript date. The timezone is also
+         * used to SET TIMEZONE when connecting to the server, to ensure that the result of NOW, CURRENT_TIMESTAMP
+         * and other time related functions have in the right timezone. For best cross platform performance use the
+         * format
+         * +/-HH:MM. Will also accept string versions of timezones used by moment.js (e.g. 'America/Los_Angeles');
+         * this is useful to capture daylight savings time changes.
+         *
+         * Defaults to '+00:00'
+         */
+        timezone?: string;
+
+        /**
+         * A function that gets executed everytime Sequelize would log something.
+         *
+         * Defaults to console.log
+         */
+        logging?: boolean | Function;
+
+        /**
+         * A flag that defines if null values should be passed to SQL queries or not.
+         *
+         * Defaults to false
+         */
+        omitNull?: boolean;
+
+        /**
+         * A flag that defines if native library shall be used or not. Currently only has an effect for postgres
+         *
+         * Defaults to false
+         */
+        native?: boolean;
+
+        /**
+         * Use read / write replication. To enable replication, pass an object, with two properties, read and write.
+         * Write should be an object (a single server for handling writes), and read an array of object (several
+         * servers to handle reads). Each read/write server can have the following properties: `host`, `port`,
+         * `username`, `password`, `database`
+         *
+         * Defaults to false
+         */
+        replication?: ReplicationOptions;
+
+        /**
+         * Connection pool options
+         */
+        pool?: PoolOptions;
+
+        /**
+         * Set to `false` to make table names and attributes case-insensitive on Postgres and skip double quoting of
+         * them.
+         *
+         * Defaults to true
+         */
+        quoteIdentifiers?: boolean;
+
+        /**
+         * Set the default transaction isolation level. See `Sequelize.Transaction.ISOLATION_LEVELS` for possible
+         * options.
+         *
+         * Defaults to 'REPEATABLE_READ'
+         */
+        isolationLevel?: string;
+
+        /**
+         * Set the default transaction type. See `Sequelize.Transaction.TYPES` for possible
+         * options.
+         *
+         * Defaults to 'DEFERRED'
+         */
+        transactionType?: string;
+
+    }
+
+    /**
+     * Sequelize methods that are available both for the static and the instance class of Sequelize
+     */
+    interface SequelizeStaticAndInstance extends Errors {
+
+        /**
+         * A reference to sequelize utilities. Most users will not need to use these utils directly. However, you
+         * might want to use `Sequelize.Utils._`, which is a reference to the lodash library, if you don't already
+         * have it imported in your project.
+         */
+        Utils: Utils;
+
+        /**
+         * A modified version of bluebird promises, that allows listening for sql events
+         */
+        Promise: typeof Promise;
+
+        /**
+         * Available query types for use with `sequelize.query`
+         */
+        QueryTypes: QueryTypes;
+
+        /**
+         * Exposes the validator.js object, so you can extend it with custom validation functions.
+         * The validator is exposed both on the instance, and on the constructor.
+         */
+        Validator: Validator;
+
+        /**
+         * A Model represents a table in the database. Sometimes you might also see it referred to as model, or
+         * simply as factory. This class should not be instantiated directly, it is created using sequelize.define,
+         * and already created models can be loaded using sequelize.import
+         */
+        Model: Model<any, any>;
+
+        /**
+         * A reference to the sequelize transaction class. Use this to access isolationLevels when creating a
+         * transaction
+         */
+        Transaction: TransactionStatic;
+
+        /**
+         * A reference to the deferrable collection. Use this to access the different deferrable options.
+         */
+        Deferrable: Deferrable;
+
+        /**
+         * A reference to the sequelize instance class.
+         */
+        Instance: Instance<any>;
+
+        /**
+         * Creates a object representing a database function. This can be used in search queries, both in where and
+         * order parts, and as default values in column definitions. If you want to refer to columns in your
+         * function, you should use `sequelize.col`, so that the columns are properly interpreted as columns and
+         * not a strings.
+         *
+         * Convert a user's username to upper case
+         * ```js
+         * instance.updateAttributes({
+         *   username: self.sequelize.fn('upper', self.sequelize.col('username'))
+         * })
+         * ```
+         * @param fn The function you want to call
+         * @param args All further arguments will be passed as arguments to the function
+         */
+        fn(fn: string, ...args: any[]): fn;
+
+        /**
+         * Creates a object representing a column in the DB. This is often useful in conjunction with
+         * `sequelize.fn`, since raw string arguments to fn will be escaped.
+         *
+         * @param col The name of the column
+         */
+        col(col: string): col;
+
+        /**
+         * Creates a object representing a call to the cast function.
+         *
+         * @param val The value to cast
+         * @param type The type to cast it to
+         */
+        cast(val: any, type: string): cast;
+
+        /**
+         * Creates a object representing a literal, i.e. something that will not be escaped.
+         *
+         * @param val
+         */
+        literal(val: any): literal;
+        asIs(val: any): literal;
+
+        /**
+         * An AND query
+         *
+         * @param args Each argument will be joined by AND
+         */
+        and(...args: Array<string | Object>): and;
+
+        /**
+         * An OR query
+         *
+         * @param args Each argument will be joined by OR
+         */
+        or(...args: Array<string | Object>): or;
+
+        /**
+         * Creates an object representing nested where conditions for postgres's json data-type.
+         *
+         * @param conditionsOrPath A hash containing strings/numbers or other nested hash, a string using dot
+         *     notation or a string using postgres json syntax.
+         * @param value An optional value to compare against. Produces a string of the form "<json path> =
+         *     '<value>'".
+         */
+        json(conditionsOrPath: string | Object, value?: string | number | boolean): json;
+
+        /**
+         * A way of specifying attr = condition.
+         *
+         * The attr can either be an object taken from `Model.rawAttributes` (for example `Model.rawAttributes.id`
+         * or
+         * `Model.rawAttributes.name`). The attribute should be defined in your model definition. The attribute can
+         * also be an object from one of the sequelize utility functions (`sequelize.fn`, `sequelize.col` etc.)
+         *
+         * For string attributes, use the regular `{ where: { attr: something }}` syntax. If you don't want your
+         * string to be escaped, use `sequelize.literal`.
+         *
+         * @param attr The attribute, which can be either an attribute object from `Model.rawAttributes` or a
+         *     sequelize object, for example an instance of `sequelize.fn`. For simple string attributes, use the
+         *     POJO syntax
+         * @param comparator Comparator
+         * @param logic The condition. Can be both a simply type, or a further condition (`.or`, `.and`, `.literal`
+         *     etc.)
+         */
+        where(attr: Object, comparator: string, logic: string | Object): where;
+        where(attr: Object, logic: string | Object): where;
+        condition(attr: Object, logic: string | Object): where;
+
+    }
+
+    /**
+     * Sequelize methods available only for the static class ( basically this is the constructor and some extends )
+     */
+    interface SequelizeStatic extends SequelizeStaticAndInstance, DataTypes {
+
+        /**
+         * Instantiate sequelize with name of database, username and password
+         *
+         * #### Example usage
+         *
+         * ```javascript
+         * // without password and options
+         * var sequelize = new Sequelize('database', 'username')
+         *
+         * // without options
+         * var sequelize = new Sequelize('database', 'username', 'password')
+         *
+         * // without password / with blank password
+         * var sequelize = new Sequelize('database', 'username', null, {})
+         *
+         * // with password and options
+         * var sequelize = new Sequelize('my_database', 'john', 'doe', {})
+         *
+         * // with uri (see below)
+         * var sequelize = new Sequelize('mysql://localhost:3306/database', {})
+         * ```
+         *
+         * @param database The name of the database
+         * @param username The username which is used to authenticate against the
+         *     database.
+         * @param password The password which is used to authenticate against the
+         *     database.
+         * @param options An object with options.
+         */
+        new (database: string, username: string, password: string, options?: Options): Sequelize;
+        new (database: string, username: string, options?: Options): Sequelize;
+
+        /**
+         * Instantiate sequelize with an URI
+         * @name Sequelize
+         * @constructor
+         *
+         * @param uri A full database URI
+         * @param options See above for possible options
+         */
+        new (uri: string, options?: Options): Sequelize;
+
+        /**
+         * Provide access to continuation-local-storage (http://docs.sequelizejs.com/en/latest/api/sequelize/#transactionoptions-promise)
+         */
+        cls: any;
+
+    }
+
+    interface QueryOptionsTransactionRequired { }
+    interface ModelsHashInterface {
+        [name: string]: Model<any, any>;
+    }
+
+    /**
+     * This is the main class, the entry point to sequelize. To use it, you just need to
+     * import sequelize:
+     *
+     * ```js
+     * var Sequelize = require('sequelize');
+     * ```
+     *
+     * In addition to sequelize, the connection library for the dialect you want to use
+     * should also be installed in your project. You don't need to import it however, as
+     * sequelize will take care of that.
+     */
+    interface Sequelize extends SequelizeStaticAndInstance, Hooks<any> {
+
+        /**
+         * A reference to Sequelize constructor from sequelize. Useful for accessing DataTypes, Errors etc.
+         */
+        Sequelize: SequelizeStatic;
+
+        /**
+         * Defined models.
+         */
+        models: ModelsHashInterface;
+
+        /**
+         * Returns the specified dialect.
+         */
+        getDialect(): string;
+
+        /**
+         * Returns an instance of QueryInterface.
+         */
+        getQueryInterface(): QueryInterface;
+
+        /**
+         * Define a new model, representing a table in the DB.
+         *
+         * The table columns are define by the hash that is given as the second argument. Each attribute of the
+         * hash
+         * represents a column. A short table definition might look like this:
+         *
+         * ```js
+         * sequelize.define('modelName', {
+         *     columnA: {
+         *         type: Sequelize.BOOLEAN,
+         *         validate: {
+         *           is: ["[a-z]",'i'],        // will only allow letters
+         *           max: 23,                  // only allow values <= 23
+         *           isIn: {
+         *             args: [['en', 'zh']],
+         *             msg: "Must be English or Chinese"
+         *           }
+         *         },
+         *         field: 'column_a'
+         *         // Other attributes here
+         *     },
+         *     columnB: Sequelize.STRING,
+         *     columnC: 'MY VERY OWN COLUMN TYPE'
+         * })
+         *
+         * sequelize.models.modelName // The model will now be available in models under the name given to define
+         * ```
+         *
+         * As shown above, column definitions can be either strings, a reference to one of the datatypes that are
+         * predefined on the Sequelize constructor, or an object that allows you to specify both the type of the
+         * column, and other attributes such as default values, foreign key constraints and custom setters and
+         * getters.
+         *
+         * For a list of possible data types, see
+         * http://docs.sequelizejs.com/en/latest/docs/models-definition/#data-types
+         *
+         * For more about getters and setters, see
+         * http://docs.sequelizejs.com/en/latest/docs/models-definition/#getters-setters
+         *
+         * For more about instance and class methods, see
+         * http://docs.sequelizejs.com/en/latest/docs/models-definition/#expansion-of-models
+         *
+         * For more about validation, see
+         * http://docs.sequelizejs.com/en/latest/docs/models-definition/#validations
+         *
+         * @param modelName  The name of the model. The model will be stored in `sequelize.models` under this name
+         * @param attributes An object, where each attribute is a column of the table. Each column can be either a
+         *                   DataType, a string or a type-description object, with the properties described below:
+         * @param options    These options are merged with the default define options provided to the Sequelize
+         *                   constructor
+         */
+        define<TInstance, TAttributes>(modelName: string, attributes: DefineAttributes,
+            options?: DefineOptions<TInstance>): Model<TInstance, TAttributes>;
+
+        /**
+         * Fetch a Model which is already defined
+         *
+         * @param modelName The name of a model defined with Sequelize.define
+         */
+        model<TInstance, TAttributes>(modelName: string): Model<TInstance, TAttributes>;
+
+        /**
+         * Checks whether a model with the given name is defined
+         *
+         * @param modelName The name of a model defined with Sequelize.define
+         */
+        isDefined(modelName: string): boolean;
+
+        /**
+         * Imports a model defined in another file
+         *
+         * Imported models are cached, so multiple calls to import with the same path will not load the file
+         * multiple times
+         *
+         * See https://github.com/sequelize/sequelize/blob/master/examples/using-multiple-model-files/Task.js for a
+         * short example of how to define your models in separate files so that they can be imported by
+         * sequelize.import
+         *
+         * @param path The path to the file that holds the model you want to import. If the part is relative, it
+         *     will be resolved relatively to the calling file
+         *
+         * @param defineFunction An optional function that provides model definitions. Useful if you do not
+         *     want to use the module root as the define function
+         */
+        import<TInstance, TAttributes>(path: string, defineFunction?: (sequelize: Sequelize, dataTypes: DataTypes) => Model<TInstance, TAttributes>): Model<TInstance, TAttributes>;
+
+        /**
+         * Execute a query on the DB, with the posibility to bypass all the sequelize goodness.
+         *
+         * By default, the function will return two arguments: an array of results, and a metadata object,
+         * containing number of affected rows etc. Use `.spread` to access the results.
+         *
+         * If you are running a type of query where you don't need the metadata, for example a `SELECT` query, you
+         * can pass in a query type to make sequelize format the results:
+         *
+         * ```js
+         * sequelize.query('SELECT...').spread(function (results, metadata) {
+         *   // Raw query - use spread
+         * });
+         *
+         * sequelize.query('SELECT...', { type: sequelize.QueryTypes.SELECT }).then(function (results) {
+         *   // SELECT query - use then
+         * })
+         * ```
+         *
+         * @param sql
+         * @param options Query options
+         */
+        query(sql: string | { query: string, values: any[] }, options?: QueryOptions): Promise<any>;
+
+        /**
+         * Execute a query which would set an environment or user variable. The variables are set per connection,
+         * so this function needs a transaction.
+         *
+         * Only works for MySQL.
+         *
+         * @param variables Object with multiple variables.
+         * @param options Query options.
+         */
+        set(variables: Object, options: QueryOptionsTransactionRequired): Promise<any>;
+
+        /**
+         * Escape value.
+         *
+         * @param value Value that needs to be escaped
+         */
+        escape(value: string): string;
+
+        /**
+         * Create a new database schema.
+         *
+         * Note,that this is a schema in the
+         * [postgres sense of the word](http://www.postgresql.org/docs/9.1/static/ddl-schemas.html),
+         * not a database table. In mysql and sqlite, this command will do nothing.
+         *
+         * @param schema Name of the schema
+         * @param options Options supplied
+         * @param options.logging A function that logs sql queries, or false for no logging
+         */
+        createSchema(schema: string, options: { logging?: boolean | Function }): Promise<any>;
+
+        /**
+         * Show all defined schemas
+         *
+         * Note,that this is a schema in the
+         * [postgres sense of the word](http://www.postgresql.org/docs/9.1/static/ddl-schemas.html),
+         * not a database table. In mysql and sqlite, this will show all tables.
+         *
+         * @param options Options supplied
+         * @param options.logging A function that logs sql queries, or false for no logging
+         */
+        showAllSchemas(options: { logging?: boolean | Function }): Promise<any>;
+
+        /**
+         * Drop a single schema
+         *
+         * Note,that this is a schema in the
+         * [postgres sense of the word](http://www.postgresql.org/docs/9.1/static/ddl-schemas.html),
+         * not a database table. In mysql and sqlite, this drop a table matching the schema name
+         *
+         * @param schema Name of the schema
+         * @param options Options supplied
+         * @param options.logging A function that logs sql queries, or false for no logging
+         */
+        dropSchema(schema: string, options: { logging?: boolean | Function }): Promise<any>;
+
+        /**
+         * Drop all schemas
+         *
+         * Note,that this is a schema in the
+         * [postgres sense of the word](http://www.postgresql.org/docs/9.1/static/ddl-schemas.html),
+         * not a database table. In mysql and sqlite, this is the equivalent of drop all tables.
+         *
+         * @param options Options supplied
+         * @param options.logging A function that logs sql queries, or false for no logging
+         */
+        dropAllSchemas(options: { logging?: boolean | Function }): Promise<any>;
+
+        /**
+         * Sync all defined models to the DB.
+         *
+         * @param options Sync Options
+         */
+        sync(options?: SyncOptions): Promise<any>;
+
+        /**
+         * Truncate all tables defined through the sequelize models. This is done
+         * by calling Model.truncate() on each model.
+         *
+         * @param {object} [options] The options passed to Model.destroy in addition to truncate
+         * @param {Boolean|function} [options.transaction]
+         * @param {Boolean|function} [options.logging] A function that logs sql queries, or false for no logging
+         */
+        truncate(options?: DestroyOptions): Promise<any>;
+
+        /**
+         * Drop all tables defined through this sequelize instance. This is done by calling Model.drop on each model
+         * @see {Model#drop} for options
+         *
+         * @param options The options passed to each call to Model.drop
+         */
+        drop(options?: DropOptions): Promise<any>;
+
+        /**
+         * Test the connection by trying to authenticate
+         *
+         * @param options Query Options for authentication
+         */
+        authenticate(options?: QueryOptions): Promise<void>;
+        validate(options?: QueryOptions): Promise<ValidationError>;
+
+        /**
+         * Start a transaction. When using transactions, you should pass the transaction in the options argument
+         * in order for the query to happen under that transaction
+         *
+         * ```js
+         * sequelize.transaction().then(function (t) {
+         *   return User.find(..., { transaction: t}).then(function (user) {
+         *     return user.updateAttributes(..., { transaction: t});
+         *   })
+         *   .then(t.commit.bind(t))
+         *   .catch(t.rollback.bind(t));
+         * })
+         * ```
+         *
+         * A syntax for automatically committing or rolling back based on the promise chain resolution is also
+         * supported:
+         *
+         * ```js
+         * sequelize.transaction(function (t) { // Note that we use a callback rather than a promise.then()
+         *   return User.find(..., { transaction: t}).then(function (user) {
+         *     return user.updateAttributes(..., { transaction: t});
+         *   });
+         * }).then(function () {
+         *   // Commited
+         * }).catch(function (err) {
+         *   // Rolled back
+         *   console.error(err);
+         * });
+         * ```
+         *
+         * If you have [CLS](https://github.com/othiym23/node-continuation-local-storage) enabled, the transaction
+         * will automatically be passed to any query that runs witin the callback. To enable CLS, add it do your
+         * project, create a namespace and set it on the sequelize constructor:
+         *
+         * ```js
+         * var cls = require('continuation-local-storage'),
+         *     ns = cls.createNamespace('....');
+         * var Sequelize = require('sequelize');
+         * Sequelize.cls = ns;
+         * ```
+         * Note, that CLS is enabled for all sequelize instances, and all instances will share the same namespace
+         *
+         * @param options Transaction Options
+         * @param autoCallback Callback for the transaction
+         */
+        transaction(options: TransactionOptions,
+            autoCallback: (t: Transaction) => Promise<any>): Promise<any>;
+        transaction(autoCallback: (t: Transaction) => Promise<any>): Promise<any>;
+        transaction(): Promise<Transaction>;
+
+        /**
+         * Close all connections used by this sequelize instance, and free all references so the instance can be
+         * garbage collected.
+         *
+         * Normally this is done on process exit, so you only need to call this method if you are creating multiple
+         * instances, and want to garbage collect some of them.
+         */
+        close(): void;
+
+        /**
+         * Returns the database version
+         */
+        databaseVersion(): Promise<string>;
+
+    }
+
+    //
+    //  Validator
+    // ~~~~~~~~~~~
+
+    /**
+     * Validator Interface
+     */
+    interface Validator extends ValidatorJS.ValidatorStatic {
+
+        notEmpty(str: string): boolean;
+        len(str: string, min: number, max: number): boolean;
+        isUrl(str: string): boolean;
+        isIPv6(str: string): boolean;
+        isIPv4(str: string): boolean;
+        notIn(str: string, values: string[]): boolean;
+        regex(str: string, pattern: string, modifiers: string): boolean;
+        notRegex(str: string, pattern: string, modifiers: string): boolean;
+        isDecimal(str: string): boolean;
+        min(str: string, val: number): boolean;
+        max(str: string, val: number): boolean;
+        not(str: string, pattern: string, modifiers: string): boolean;
+        contains(str: string, element: string[]): boolean;
+        notContains(str: string, element: string[]): boolean;
+        is(str: string, pattern: string, modifiers: string): boolean;
+
+    }
+
+    //
+    //  Transaction
+    // ~~~~~~~~~~~~~
+    //
+    //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/transaction.js
+    //
+
+    /**
+     * The transaction object is used to identify a running transaction. It is created by calling
+     * `Sequelize.transaction()`.
+     *
+     * To run a query under a transaction, you should pass the transaction in the options object.
+     */
+    interface Transaction {
+
+        /**
+         * Possible options for row locking. Used in conjuction with `find` calls:
+         *
+         * @see TransactionStatic
+         */
+        LOCK: TransactionLock;
+
+        /**
+         * Commit the transaction
+         */
+        commit(): Promise<void>;
+
+        /**
+         * Rollback (abort) the transaction
+         */
+        rollback(): Promise<void>;
+
+    }
+
+    /**
+     * The transaction static object
+     *
+     * @see Transaction
+     */
+    interface TransactionStatic {
+
+        /**
+         * Isolations levels can be set per-transaction by passing `options.isolationLevel` to
+         * `sequelize.transaction`. Default to `REPEATABLE_READ` but you can override the default isolation level
+         * by passing
+         * `options.isolationLevel` in `new Sequelize`.
+         *
+         * The possible isolations levels to use when starting a transaction:
+         *
+         * ```js
+         * {
+         *   READ_UNCOMMITTED: "READ UNCOMMITTED",
+         *   READ_COMMITTED: "READ COMMITTED",
+         *   REPEATABLE_READ: "REPEATABLE READ",
+         *   SERIALIZABLE: "SERIALIZABLE"
+         * }
+         * ```
+         *
+         * Pass in the desired level as the first argument:
+         *
+         * ```js
+         * return sequelize.transaction({
+         *   isolationLevel: Sequelize.Transaction.SERIALIZABLE
+         * }, function (t) {
+         *
+         *  // your transactions
+         *
+         * }).then(function(result) {
+         *   // transaction has been committed. Do something after the commit if required.
+         * }).catch(function(err) {
+         *   // do something with the err.
+         * });
+         * ```
+         *
+         * @see ISOLATION_LEVELS
+         */
+        ISOLATION_LEVELS: TransactionIsolationLevels;
+
+        /**
+         * Transaction type can be set per-transaction by passing `options.type` to
+         * `sequelize.transaction`. Default to `DEFERRED` but you can override the default isolation level
+         * by passing `options.transactionType` in `new Sequelize`.
+         *
+         * The transaction types to use when starting a transaction:
+         *
+         * ```js
+         * {
+         *   DEFERRED: "DEFERRED",
+         *   IMMEDIATE: "IMMEDIATE",
+         *   EXCLUSIVE: "EXCLUSIVE"
+         * }
+         * ```
+         *
+         * Pass in the transaction type the first argument:
+         *
+         * ```js
+         * return sequelize.transaction({
+         *   type: Sequelize.Transaction.EXCLUSIVE
+         * }, function (t) {
+         *
+         *  // your transactions
+         *
+         * }).then(function(result) {
+         *   // transaction has been committed. Do something after the commit if required.
+         * }).catch(function(err) {
+         *   // do something with the err.
+         * });
+         * ```
+         *
+         * @see Sequelize.Transaction.TYPES
+         */
+        TYPES: TransactionTypes;
+
+        /**
+         * Possible options for row locking. Used in conjuction with `find` calls:
+         *
+         * ```js
+         * t1 // is a transaction
+         * t1.LOCK.UPDATE,
+         * t1.LOCK.SHARE,
+         * t1.LOCK.KEY_SHARE, // Postgres 9.3+ only
+         * t1.LOCK.NO_KEY_UPDATE // Postgres 9.3+ only
+         * ```
+         *
+         * Usage:
+         * ```js
+         * t1 // is a transaction
+         * Model.findAll({
+         *   where: ...,
+         *   transaction: t1,
+         *   lock: t1.LOCK...
+         * });
+         * ```
+         *
+         * Postgres also supports specific locks while eager loading by using OF:
+         * ```js
+         * UserModel.findAll({
+         *   where: ...,
+         *   include: [TaskModel, ...],
+         *   transaction: t1,
+         *   lock: {
+         *     level: t1.LOCK...,
+         *     of: UserModel
+         *   }
+         * });
+         * ```
+         * UserModel will be locked but TaskModel won't!
+         */
+        LOCK: TransactionLock;
+
+    }
+
+    /**
+     * Isolations levels can be set per-transaction by passing `options.isolationLevel` to `sequelize.transaction`.
+     * Default to `REPEATABLE_READ` but you can override the default isolation level by passing
+     * `options.isolationLevel` in `new Sequelize`.
+     */
+    interface TransactionIsolationLevels {
+        READ_UNCOMMITTED: string; // 'READ UNCOMMITTED'
+        READ_COMMITTED: string; // 'READ COMMITTED'
+        REPEATABLE_READ: string; // 'REPEATABLE READ'
+        SERIALIZABLE: string; // 'SERIALIZABLE'
+    }
+
+    /**
+     * Transaction type can be set per-transaction by passing `options.type` to `sequelize.transaction`.
+     * Default to `DEFERRED` but you can override the default isolation level by passing
+     * `options.transactionType` in `new Sequelize`.
+     */
+    interface TransactionTypes {
+        DEFERRED: string; // 'DEFERRED'
+        IMMEDIATE: string; // 'IMMEDIATE'
+        EXCLUSIVE: string; // 'EXCLUSIVE'
+    }
+
+    /**
+     * Possible options for row locking. Used in conjuction with `find` calls:
+     */
+    interface TransactionLock {
+        UPDATE: string; // 'UPDATE'
+        SHARE: string; // 'SHARE'
+        KEY_SHARE: string; // 'KEY SHARE'
+        NO_KEY_UPDATE: string; // 'NO KEY UPDATE'
+    }
+
+    /**
+     * Options provided when the transaction is created
+     *
+     * @see sequelize.transaction()
+     */
+    interface TransactionOptions {
+
+        autocommit?: boolean;
+
+        /**
+         *  See `Sequelize.Transaction.ISOLATION_LEVELS` for possible options
+         */
+        isolationLevel?: string;
+
+        /**
+         *  See `Sequelize.Transaction.TYPES` for possible options
+         */
+        type?: string;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: Function;
+
+    }
+
+    //
+    //  Utils
+    // ~~~~~~~
+
+    interface fn {
+        clone: fnStatic;
+    }
+
+    interface fnStatic {
+        /**
+         * @param fn The function you want to call
+         * @param args All further arguments will be passed as arguments to the function
+         */
+        new (fn: string, ...args: any[]): fn;
+    }
+
+    interface col {
+        col: string;
+    }
+
+    interface colStatic {
+        /**
+         * Creates a object representing a column in the DB. This is often useful in conjunction with
+         * `sequelize.fn`, since raw string arguments to fn will be escaped.
+         * @see {Sequelize#fn}
+         *
+         * @param col The name of the column
+         */
+        new (col: string): col;
+    }
+
+    interface cast {
+        val: any;
+        type: string;
+    }
+
+    interface castStatic {
+        /**
+         * Creates a object representing a call to the cast function.
+         *
+         * @param val The value to cast
+         * @param type The type to cast it to
+         */
+        new (val: any, type: string): cast;
+    }
+
+    interface literal {
+        val: any;
+    }
+
+    interface literalStatic {
+        /**
+         * Creates a object representing a literal, i.e. something that will not be escaped.
+         *
+         * @param val
+         */
+        new (val: any): literal;
+    }
+
+    interface and {
+        args: any[];
+    }
+
+    interface andStatic {
+        /**
+         * An AND query
+         *
+         * @param args Each argument will be joined by AND
+         */
+        new (...args: Array<string | Object>): and;
+    }
+
+    interface or {
+        args: any[];
+    }
+
+    interface orStatic {
+        /**
+         * An OR query
+         * @see {Model#find}
+         *
+         * @param args Each argument will be joined by OR
+         */
+        new (...args: Array<string | Object>): or;
+    }
+
+    interface json {
+        conditions?: Object;
+        path?: string;
+        value?: string | number | boolean;
+    }
+
+    interface jsonStatic {
+        /**
+         * Creates an object representing nested where conditions for postgres's json data-type.
+         * @see {Model#find}
+         *
+         * @method json
+         * @param conditionsOrPath A hash containing strings/numbers or other nested hash, a string using dot
+         *     notation or a string using postgres json syntax.
+         * @param value An optional value to compare against. Produces a string of the form "<json path> =
+         *     '<value>'".
+         */
+        new (conditionsOrPath: string | Object, value?: string | number | boolean): json;
+    }
+
+    interface where {
+        attribute: Object;
+        comparator?: string;
+        logic: string | Object;
+    }
+
+    interface whereStatic {
+        /**
+         * A way of specifying attr = condition.
+         *
+         * The attr can either be an object taken from `Model.rawAttributes` (for example `Model.rawAttributes.id`
+         * or
+         * `Model.rawAttributes.name`). The attribute should be defined in your model definition. The attribute can
+         * also be an object from one of the sequelize utility functions (`sequelize.fn`, `sequelize.col` etc.)
+         *
+         * For string attributes, use the regular `{ where: { attr: something }}` syntax. If you don't want your
+         * string to be escaped, use `sequelize.literal`.
+         *
+         * @param attr The attribute, which can be either an attribute object from `Model.rawAttributes` or a
+         *     sequelize object, for example an instance of `sequelize.fn`. For simple string attributes, use the
+         *     POJO syntax
+         * @param comparator Comparator
+         * @param logic The condition. Can be both a simply type, or a further condition (`.or`, `.and`, `.literal`
+         *     etc.)
+         */
+        new (attr: Object, comparator: string, logic: string | Object): where;
+        new (attr: Object, logic: string | Object): where;
+    }
+
+    interface SequelizeLoDash extends _.LoDashStatic {
+
+        camelizeIf(str: string, condition: boolean): string;
+        underscoredIf(str: string, condition: boolean): string;
+        /**
+         * * Returns an array with some falsy values removed. The values null, "", undefined and NaN are considered
+         * falsey.
+         *
+         * @param arr Array to compact.
+         */
+        compactLite<T>(arr: T[]): T[];
+        matchesDots(dots: string | string[], value: Object): (item: Object) => boolean;
+
+    }
+
+    interface Utils {
+
+        _: SequelizeLoDash;
+
+        /**
+         * Same concept as _.merge, but don't overwrite properties that have already been assigned
+         */
+        mergeDefaults: typeof _.merge;
+
+        lowercaseFirst(str: string): string;
+        uppercaseFirst(str: string): string;
+        spliceStr(str: string, index: number, count: number, add: string): string;
+        camelize(str: string): string;
+        format(arr: any[], dialect?: string): string;
+        formatNamedParameters(sql: string, parameters: any, dialect?: string): string;
+        cloneDeep<T extends Object>(obj: T, fn?: (value: T) => any): T;
+        mapOptionFieldNames<T extends Object>(options: T, Model: Model<any, any>): T;
+        mapValueFieldNames(dataValues: Object, fields: string[], Model: Model<any, any>): Object;
+        argsArePrimaryKeys(args: any[], primaryKeys: Object): boolean;
+        canTreatArrayAsAnd(arr: any[]): boolean;
+        combineTableNames(tableName1: string, tableName2: string): string;
+        singularize(s: string): string;
+        pluralize(s: string): string;
+        removeCommentsFromFunctionString(s: string): string;
+        toDefaultValue(value: DataTypeAbstract): any;
+        toDefaultValue(value: () => DataTypeAbstract): any;
+
+        /**
+         * Determine if the default value provided exists and can be described
+         * in a db schema using the DEFAULT directive.
+         */
+        defaultValueSchemable(value: any): boolean;
+
+        removeNullValuesFromHash(hash: Object, omitNull?: boolean, options?: Object): any;
+        inherit(subClass: Object, superClass: Object): Object;
+        stack(): string;
+        sliceArgs(args: any[], begin?: number): any[];
+        now(dialect: string): Date;
+        tick(f: Function): void;
+        addTicks(s: string, tickChar?: string): string;
+        removeTicks(s: string, tickChar?: string): string;
+
+        fn: fnStatic;
+        col: colStatic;
+        cast: castStatic;
+        literal: literalStatic;
+        and: andStatic;
+        or: orStatic;
+        json: jsonStatic;
+        where: whereStatic;
+
+        validateParameter(value: Object, expectation: Object, options?: Object): boolean;
+        formatReferences(obj: Object): Object;
+        Promise: typeof Promise;
+
+    }
+
+}
+
+declare var sequelize: sequelize.SequelizeStatic;
+
+export = sequelize;
diff --git a/sequelize/sequelize-2.0.0.d.ts b/sequelize/sequelize-2.0.0.d.ts
index 79e02d467f..7987078a71 100644
--- a/sequelize/sequelize-2.0.0.d.ts
+++ b/sequelize/sequelize-2.0.0.d.ts
@@ -5,2788 +5,2786 @@
 
 // Based on original work by: samuelneff <https://github.com/samuelneff/sequelize-auto-ts/blob/master/lib/sequelize.d.ts>
 
-/// <reference path="../node/node.d.ts" />
-/// <reference path='../lodash/lodash-3.10.d.ts' />
+/// <reference types="node" />
+/// <reference types="lodash-3.10" />
 
-declare module "sequelize"
-{
-    namespace sequelize {
-        interface SequelizeStaticAndInstance {
 
-            /**
-             * A reference to sequelize utilities. Most users will not need to use these utils directly. However, you might want
-             * to use Sequelize.Utils._, which is a reference to the lodash library, if you don't already have it imported in
-             * your project.
-             */
-            Utils: Utils;
-
-            /**
-             * A modified version of bluebird promises, that allows listening for sql events.
-             *
-             * @see Promise
-             */
-            Promise: Promise;
-
-            /**
-             * Exposes the validator.js object, so you can extend it with custom validation functions. The validator is exposed
-             * both on the instance, and on the constructor.
-             *
-             * @see Validator
-             */
-            Validator: Validator;
-
-            QueryTypes: QueryTypes;
-
-            /**
-             * A general error class.
-             */
-            Error: Error;
-
-            /**
-             * Emitted when a validation fails.
-             *
-             * @see ValidationError
-             */
-            ValidationError: ValidationError;
-
-            /**
-             * Creates a object representing a database function. This can be used in search queries, both in where and order
-             * parts, and as default values in column definitions. If you want to refer to columns in your function, you should
-             * use sequelize.col, so that the columns are properly interpreted as columns and not a strings.
-             *
-             * @param fn The function you want to call.
-             * @param args All further arguments will be passed as arguments to the function.
-             */
-            fn(fn: string, ...args: Array<any>): any;
-
-            /**
-             * Creates a object representing a column in the DB. This is often useful in conjunction with sequelize.fn, since
-             * raw string arguments to fn will be escaped.
-             *
-             * @param col The name of the column
-             */
-            col(col: string): Col;
-
-            /**
-             * Creates a object representing a call to the cast function.
-             *
-             * @param val The value to cast.
-             * @param type The type to cast it to.
-             */
-            cast(val: any, type: string): Cast;
-
-            /**
-             * Creates a object representing a literal, i.e. something that will not be escaped.
-             *
-             * @param val Value to convert to a literal.
-             */
-            literal(val: any): Literal;
-
-            /**
-             * An AND query.
-             *
-             * @param args Each argument (string or object) will be joined by AND.
-             */
-            and(...args: Array<any>): And;
-
-            /**
-             * An OR query.
-             *
-             * @param args Each argument (string or object) will be joined by OR.
-             */
-            or(...args: Array<any>): Or;
-
-            /**
-             * A way of specifying attr = condition. Mostly used internally.
-             *
-             * @param attr          The attribute
-             * @param condition     The condition. Can be both a simply type, or a further condition (.or, .and, .literal etc.)
-             */
-            where(attr: string, condition: any): Where;
-        }
-
-        interface SequelizeStatic extends SequelizeStaticAndInstance, DataTypes {
-            /**
-             * Instantiate sequelize with name of database and username
-             * @param database database name
-             * @param username user name
-             */
-            new (database: string, username: string): Sequelize;
-
-            /**
-             * Instantiate sequelize with name of database, username and password
-             * @param database database name
-             * @param username user name
-             * @param password password
-             */
-            new (database: string, username: string, password: string): Sequelize;
-
-            /**
-             * Instantiate sequelize with name of database, username, password, and options.
-             * @param database database name
-             * @param username user name
-             * @param password password
-             * @param options options. @see Options
-             */
-            new (database: string, username: string, password: string, options: Options): Sequelize;
-
-            /**
-             * Instantiate sequelize with name of database, username, and options.
-             *
-             * @param database database name
-             * @param username user name
-             * @param options options. @see Options
-             */
-            new (database: string, username: string, options: Options): Sequelize;
-
-            /**
-             * Instantiate sequlize with an URI
-             * @param connectionString A full database URI
-             * @param options Options for sequelize. @see Options
-             */
-            new (connectionString: string, options?: Options): Sequelize;
-        }
-
-        interface Sequelize extends SequelizeStaticAndInstance {
-            /**
-             * Sequelize configuration (undocumented).
-             */
-            config: Config;
-
-            /**
-             * Sequelize options (undocumented).
-             */
-            options: Options;
-
-            /**
-             * Models are stored here under the name given to sequelize.define
-             */
-            models: any;
-            modelManager: ModelManager;
-            daoFactoryManager: ModelManager;
-            transactionManager: TransactionManager;
-            importCache: any;
-
-            /**
-             * A reference to the sequelize transaction class. Use this to access isolationLevels when creating a transaction.
-             *
-             * @see Transaction
-             */
-            Transaction: TransactionStatic;
-
-            /**
-             * Returns the specified dialect.
-             */
-            getDialect(): string;
-
-            /**
-             * Returns the singleton instance of QueryInterface.
-             */
-            getQueryInterface(): QueryInterface;
-
-            /**
-             * Returns the singleton instance of Migrator.
-             * @param options Migration options
-             * @param force A flag that defines if the migrator should get instantiated or not.
-             */
-            getMigrator(options?: MigratorOptions, force?: boolean): Migrator;
-
-            /**
-             * Define a new model, representing a table in the DB.
-             *
-             * @param daoName The name of the entity (table). Typically specified in singular form.
-             * @param attributes A hash of attributes to define. Each attribute can be either a string name for the attribute
-             *                   or can be an object defining the attribute and its options. Note attributes is not fully
-             *                   typed since TypeScript does not support union types--it can be either a string or an
-             *                   options object. @see AttributeOptions.
-             * @param options Table options. @see DefineOptions.
-             */
-            define<TInstance, TPojo>(daoName: string, attributes: any, options?: DefineOptions): Model<TInstance, TPojo>;
-
-            /**
-             * Fetch a DAO factory which is already defined.
-             *
-             * @param daoName The name of a model defined with Sequelize.define.
-             */
-            model<TInstance, TPojo>(daoName: string): Model<TInstance, TPojo>;
-
-            /**
-             * Checks whether a model with the given name is defined.
-             *
-             * @param daoName The name of a model defined with Sequelize.define.
-             */
-            isDefined(daoName: string): boolean;
-
-            /**
-             * Imports a model defined in another file.
-             *
-             * @param path  The path to the file that holds the model you want to import. If the part is relative, it will be
-             *              resolved relatively to the calling file
-             */
-            import<TInstance, TPojo>(path: string): Model<TInstance, TPojo>;
-
-            /**
-             * Execute a query on the DB, with the possibility to bypass all the sequelize goodness.
-             *
-             * @param sql           SQL statement to execute.
-             *
-             * @param callee        If callee is provided, the selected data will be used to build an instance of the DAO represented
-             *                      by the factory. Equivalent to calling Model.build with the values provided by the query.
-             *
-             * @param options       Query options.
-             *
-             * @param replacements  Either an object of named parameter replacements in the format :param or an array of
-             *                      unnamed replacements to replace ? in your SQL.
-             */
-            query(sql: string, callee?: Model<any, any>, options?: QueryOptions, replacements?: any): EventEmitter;
-
-            query<TInstance, TPojo>(sql: string, callee?: Model<TInstance, TPojo>, options?: QueryOptions): EventEmitterT<Model<TInstance, TPojo>>;
-
-            /**
-             * Create a new database schema.
-             *
-             * @param schema Name of the schema.
-             */
-            createSchema(schema: string): EventEmitter;
-
-            /**
-             * Show all defined schemas.
-             */
-            showAllSchemas(): EventEmitter;
-
-            /**
-             * Drop a single schema.
-             *
-             * @param schema Name of the schema.
-             */
-            dropSchema(schema: string): EventEmitter;
-
-            /**
-             * Drop all schemas.
-             */
-            dropAllSchemas(): EventEmitter;
-
-            /**
-             * Sync all defined DAOs to the DB.
-             *
-             * @param options Options.
-             */
-            sync(options?: SyncOptions): EventEmitter;
-
-            /**
-             * Drop all tables defined through this sequelize instance. This is done by calling Model.drop on each model.
-             *
-             * @param options The options passed to each call to Model.drop.
-             */
-            drop(options: DropOptions): EventEmitter;
-
-            /**
-             * Test the connection by trying to authenticate. Alias for 'validate'.
-             */
-            authenticate(): EventEmitter;
-
-            /**
-             * Alias for authenticate(). Test the connection by trying to authenticate. Alias for 'validate'.
-             */
-            validate(): EventEmitter;
-
-            /**
-             * !! DEPRECATED : When passing a callback to a transaction a promise chain is expected in return,
-             * the transaction will be committed or rejected based on the promise chain returned to the callback.
-             *
-             * Start a transaction. When using transactions, you should pass the transaction in the options argument in order
-             * for the query to happen under that transaction.
-             *
-             * @param callback  Called when the transaction has been set up and is ready for use. Callback takes transaction
-             *                  argument (overload available for error and transaction arguments too).
-             */
-            transaction(callback: (transaction: Transaction) => boolean): Promise;
-
-            /**
-             * Start a transaction. When using transactions, you should pass the transaction in the options argument in order
-             * for the query to happen under that transaction.
-             *
-             * @param options   Transaction options.
-             * @param callback  Called when the transaction has been set up and is ready for use. Callback takes transaction
-             *                  argument (overload available for error and transaction arguments too).
-             */
-            transaction(options?: TransactionOptions, callback?: (transaction: Transaction) => void): PromiseT<Transaction>;
-
-            close(): void;
-        }
-
-        interface Config {
-            database?: string;
-            username?: string;
-            password?: string;
-            host?: string;
-            port?: number;
-            pool?: PoolOptions;
-            protocol?: string;
-            queue?: boolean;
-            native?: boolean;
-            ssl?: boolean;
-            replication?: ReplicationOptions;
-            dialectModulePath?: string;
-            maxConcurrentQueries?: number;
-            dialectOptions?: any;
-        }
-
-        interface Model<TInstance, TPojo> extends Hooks, Associations {
-            /**
-             * A reference to the sequelize instance.
-             */
-            sequelize: Sequelize;
-
-            /**
-             * The name of the model, typically singular.
-             */
-            name: string;
-
-            /**
-             * The name of the underlying database table, typically plural.
-             */
-            tableName: string;
-
-            options: DefineOptions;
-            attributes: any;
-            rawAttributes: any;
-            modelManager: ModelManager;
-            daoFactoryManager: ModelManager;
-            associations: any;
-            scopeObj: any;
-
-            /**
-             * Sync this Model to the DB, that is create the table. Upon success, the callback will be called with the model
-             * instance (this).
-             */
-            sync(options?: SyncOptions): PromiseT<Model<TInstance, TPojo>>;
-
-            /**
-             * Drop the table represented by this Model.
-             *
-             * @param options
-             */
-            drop(options?: DropOptions): Promise;
-
-            /**
-             * Apply a schema to this model. For postgres, this will actually place the schema in front of the table name -
-             * "schema"."tableName", while the schema will be prepended to the table name for mysql and sqlite -
-             * 'schema.tablename'.
-             *
-             * @param schema    The name of the schema.
-             * @param options   Schema options.
-             */
-            schema(schema: string, options?: SchemaOptions): Model<TInstance, TPojo>;
-
-            /**
-             * Get the tablename of the model, taking schema into account. The method will return The name as a string if the
-             * model has no schema, or an object with tableName, schema and delimiter properties.
-             */
-            getTableName(): any;
-
-            /**
-             * Apply a scope created in define to the model.
-             *
-             * @param options The scope(s) to apply. Scopes can either be passed as consecutive arguments, or as an array of
-             *                arguments. To apply simple scopes, pass them as strings. For scope function, pass an object,
-             *                with a method property. The value can either be a string, if the method does not take any
-             *                arguments, or an array, where the first element is the name of the method, and consecutive
-             *                elements are arguments to that method. Pass null to remove all scopes, including the default.
-             */
-            scope(options: any): Model<TInstance, TPojo>;
-
-            /**
-             * Search for multiple instances..
-             *
-             * @param options       A hash of options to describe the scope of the search.
-             * @param queryOptions  Set the query options, e.g. raw, specifying that you want raw data instead of built
-             *                      Instances. See sequelize.query for options.
-             */
-            findAll(options?: FindOptions, queryOptions?: QueryOptions): PromiseT<Array<TInstance>>;
-
-            /**
-             * Search for a single instance. This applies LIMIT 1, so the listener will always be called with a single instance.
-             *
-             * @param options       A hash of options to describe the scope of the search.
-             * @param queryOptions  Set the query options, e.g. raw, specifying that you want raw data instead of built
-             *                      Instances. See sequelize.query for options
-             */
-            find(options?: FindOptions, queryOptions?: QueryOptions): PromiseT<TInstance>;
-
-            /**
-             * Search for a single instance. This applies LIMIT 1, so the listener will always be called with a single instance.
-             *
-             * @param options       A number to search by id.
-             * @param queryOptions  Set the query options, e.g. raw, specifying that you want raw data instead of built
-             *                      Instances. See sequelize.query for options
-             */
-            find(id?: number, queryOptions?: QueryOptions): PromiseT<TInstance>;
-
-            /**
-             * Run an aggregation method on the specified field.
-             *
-             * @param field                 The field to aggregate over. Can be a field name or *.
-             * @param aggregateFunction     The function to use for aggregation, e.g. sum, max etc.
-             * @param options               Query options, particularly options.dataType.
-             */
-            aggregate<V>(field: string, aggregateFunction: string, options: FindOptions): PromiseT<V>;
-
-            /**
-             * Count the number of records matching the provided where clause.
-             *
-             * @param options Conditions and options for the query.
-             */
-            count(options?: FindOptions): PromiseT<number>;
-
-            /**
-             * Find all the rows matching your query, within a specified offset / limit, and get the total number of rows
-             * matching your query. This is very usefull for paging.
-             *
-             * @param findOptions   Filtering options
-             * @param queryOptions  Query options
-             */
-            findAndCountAll(findOptions?: FindOptions, queryOptions?: QueryOptions): PromiseT<FindAndCountResult<TInstance>>;
-
-            /**
-             * Find the maximum value of field.
-             *
-             * @param field
-             * @param options
-             */
-            max<V>(field: string, options?: FindOptions): PromiseT<V>;
-
-            /**
-             * Find the minimum value of field.
-             *
-             * @param field
-             * @param options
-             */
-            min<V>(field: string, options?: FindOptions): PromiseT<V>;
-
-            /**
-             * Find the sum of field.
-             *
-             * @param field
-             * @param options
-             */
-            sum(field: string, options?: FindOptions): PromiseT<number>;
-
-            /**
-             * Builds a new model instance. Values is an object of key value pairs, must be defined but can be empty.
-             *
-             * @param values    any from which to build entity instance.
-             * @param options   any construction options.
-             */
-            build(values: TPojo, options?: BuildOptions): TInstance;
-
-            /**
-             * Builds a new model instance and calls save on it..
-             *
-             * @param values
-             * @param options
-             */
-            create(values: TPojo, options?: CopyOptions): PromiseT<TInstance>;
-
-            /**
-             * Find a row that matches the query, or build (but don't save) the row if none is found. The successfull result
-             * of the promise will be (instance, initialized) - Make sure to use .spread().
-             *
-             * @param where     A hash of search attributes. Note that this method differs from finders, in that the syntax
-             *                  is { attr1: 42 } and NOT { where: { attr1: 42}}. This may be subject to change in 2.0
-             * @param defaults  Default values to use if building a new instance
-             * @param options   Options passed to the find call
-             */
-            findOrInitialize(where: any, defaults?: TPojo, options?: QueryOptions): PromiseT<TInstance>;
-
-            /**
-             * Find a row that matches the query, or build and save the row if none is found The successfull result of the
-             * promise will be (instance, created) - Make sure to use .spread().
-             *
-             * @param where     A hash of search attributes. Note that this method differs from finders, in that the syntax is
-             *                  { attr1: 42 } and NOT { where: { attr1: 42}}. This is subject to change in 2.0
-             * @param defaults  Default values to use if creating a new instance
-             * @param options   Options passed to the find and create calls.
-             */
-            findOrCreate(where: any, defaults?: TPojo, options?: FindOrCreateOptions): PromiseT<TInstance>;
-
-            /**
-             * Create and insert multiple instances in bulk.
-             *
-             * @param records   List of objects (key/value pairs) to create instances from.
-             * @param options
-             */
-            bulkCreate(records: Array<TPojo>, options?: BulkCreateOptions): PromiseT<Array<TInstance>>;
-
-            /**
-             * Delete multiple instances.
-             */
-            destroy(where?: any, options?: DestroyOptions): Promise;
-
-            /**
-             * Update multiple instances that match the where options.
-             *
-             * @param attrValueHash A hash of fields to change and their new values
-             * @param where         Options to describe the scope of the search. Note that these options are not wrapped in a
-             *                      { where: ... } is in find / findAll calls etc. This is probably due to change in 2.0.
-             */
-            update(attrValueHash: TPojo, where: any, options?: UpdateOptions): Promise;
-
-            /**
-             * Run a describe query on the table. The result will be return to the listener as a hash of attributes and their
-             * types.
-             */
-            describe(): PromiseT<any>;
-
-            /**
-             *  A proxy to the node-sql query builder, which allows you to build your query through a chain of method calls.
-             *  The returned instance already has all the fields property populated with the field of the model.
-             */
-            dataset(): any;
-        }
-
-        interface Instance<TInstance, TPojo> {
-            /**
-             * Returns true if this instance has not yet been persisted to the database.
-             */
-            isNewRecord: boolean;
-
-            /**
-             * Returns the Model the instance was created from.
-             */
-            Model: Model<TInstance, TPojo>;
-
-            /**
-             * A reference to the sequelize instance.
-             */
-            sequelize: Sequelize;
-
-            /**
-             * If timestamps and paranoid are enabled, returns whether the deletedAt timestamp of this instance is set.
-             * Otherwise, always returns false.
-             */
-            isDeleted: boolean;
-
-            /**
-             * Get the values of this Instance. Proxies to this.get.
-             */
-            values: TPojo;
-
-            /**
-             * A getter for this.changed(). Returns true if any keys have changed.
-             */
-            isDirty: boolean;
-
-            /**
-             *  Get the values of the primary keys of this instance.
-             */
-            primaryKeyValues: TPojo;
-
-            /**
-             * Get the value of the underlying data value.
-             *
-             * @param key   Field to retrieve.
-             */
-            getDataValue(key: string): any;
-
-            /**
-             * Update the underlying data value.
-             *
-             * @param key   Field to set.
-             * @param value Value to set.
-             */
-            setDataValue(key: string, value: any): void;
-
-            /**
-             * Retrieves the value for the key when specified. If no key is given, returns all values of the instance, also
-             * invoking virtual getters.
-             */
-            get(key?: string): any;
-
-            /**
-             * Set is used to update values on the instance (the sequelize representation of the instance that is, remember
-             * that nothing will be persisted before you actually call save).
-             */
-            set(key: string, value: any, options?: SetOptions): void;
-
-            /**
-             * If changed is called with a string it will return a boolean indicating whether the value of that key in
-             * dataValues is different from the value in _previousDataValues. If changed is called without an argument, it will
-             * return an array of keys that have changed.
-             */
-            changed(key: string): any;
-
-            /**
-               * If changed is called with a string it will return a boolean indicating whether the value of that key in
-               * dataValues is different from the value in _previousDataValues. If changed is called without an argument, it will
-               * return an array of keys that have changed.
-               */
-            changed(): Array<string>;
-
-            /**
-             * Returns the previous value for key from _previousDataValues.
-             */
-            previous(key: string): any;
-
-            /**
-             * Validate this instance, and if the validation passes, persist it to the database.
-             */
-            save(fields?: Array<string>, options?: SaveOptions): PromiseT<TInstance>;
-
-            /**
-             * Refresh the current instance in-place, i.e. update the object with current data from the DB and return the same
-             * object. This is different from doing a find(Instance.id), because that would create and return a new instance.
-             * With this method, all references to the Instance are updated with the new data and no new objects are created.
-             */
-            reload(options?: FindOptions): PromiseT<TInstance>;
-
-            /**
-             * Validate the attribute of this instance according to validation rules set in the model definition.
-             */
-            validate(options?: ValidateOptions): PromiseT<Error>;
-
-            /**
-             * This is the same as calling setAttributes, then calling save.
-             */
-            updateAttributes(updates: TPojo, options: SaveOptions): PromiseT<TInstance>;
-
-            /**
-             * Destroy the row corresponding to this instance. Depending on your setting for paranoid, the row will either be
-             * completely deleted, or have its deletedAt timestamp set to the current time.
-             *
-             * @param options   Allows caller to specify if delete should be forced.
-             */
-            destroy(options?: DestroyInstanceOptions): Promise;
-
-            /**
-             * Increment the value of one or more columns. This is done in the database, which means it does not use the
-             * values currently stored on the Instance.
-             *
-             * @param fields    If a string is provided, that column is incremented by the value of by given in options. If an
-             *                  array is provided, the same is true for each column. If and object is provided, each column is
-             *                  incremented by the value given.
-             * @param options   Increment options.
-             */
-            increment(fields: any, options?: IncrementOptions): Promise;
-
-            /**
-             * Decrement the value of one or more columns. This is done in the database, which means it does not use the
-             * values currently stored on the Instance.
-             *
-             * @param fields    If a string is provided, that column is decremented by the value of by given in options. If an
-             *                  array is provided, the same is true for each column. If and object is provided, each column is
-             *                  decremented by the value given.
-             * @param options   Decrement options.
-             */
-            decrement(fields: any, options?: IncrementOptions): Promise;
-
-            /**
-             * Check whether all values of this and other Instance are the same.
-             */
-            equal(other: TInstance): boolean;
-
-            /**
-             * Check if this is eqaul to one of others by calling equals.
-             *
-             * @param others    Other instances to compare to.
-             */
-            equalsOneOf(others: Array<TInstance>): boolean;
-
-            /**
-             * Convert the instance to a JSON representation. Proxies to calling get with no keys. This means get all values
-             * gotten from the DB, and apply all custom getters.
-             */
-            toJSON(): TPojo;
-        }
-
-        interface Transaction extends TransactionStatic {
-            /**
-             * Commit the transaction.
-             */
-            commit(): Transaction;
-
-            /**
-             * Rollback (abort) the transaction.
-             */
-            rollback(): Transaction;
-        }
-
-        interface TransactionStatic {
-            /**
-             * The possible isolation levels to use when starting a transaction
-             */
-            ISOLATION_LEVELS: TransactionIsolationLevels;
-
-            /**
-             * Possible options for row locking. Used in conjuction with find calls.
-             */
-            LOCK: TransactionLocks;
-        }
-
-        interface TransactionIsolationLevels {
-            READ_UNCOMMITTED: string;// "READ UNCOMMITTED"
-            READ_COMMITTED: string;  // "READ COMMITTED"
-            REPEATABLE_READ: string; // "REPEATABLE READ"
-            SERIALIZABLE: string;    // "SERIALIZABLE"
-        }
-
-        interface TransactionLocks {
-            UPDATE: string;  // UPDATE
-            SHARE: string;   // SHARE
-        }
-
-        interface Hooks {
-
-            /**
-             * Add a named hook to the model.
-             *
-             * @param hooktype
-             */
-            addHook(hooktype: string, name: string, fn: (...args: Array<any>) => void): boolean;
-
-            /**
-             * Add a hook to the model.
-             *
-             * @param hooktype
-             */
-            addHook(hooktype: string, fn: (...args: Array<any>) => void): boolean;
-
-            /**
-             * A named hook that is run before validation.
-             */
-            beforeValidate<T>(name: string, validator: (dao: T, callback: (err?: Error) => void) => void): void;
-
-            /**
-             * A hook that is run before validation.
-             */
-            beforeValidate<T>(validator: (dao: T, callback: (err?: Error) => void) => void): void;
-
-            /**
-             * A named hook that is run before validation.
-             */
-            afterValidate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run before validation.
-             */
-            afterValidate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run before creating a single instance.
-             */
-            beforeCreate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run before creating a single instance.
-             */
-            beforeCreate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run after creating a single instance.
-             */
-            afterCreate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run after creating a single instance.
-             */
-            afterCreate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run before destroying a single instance.
-             */
-            beforeDestroy<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run before destroying a single instance.
-             */
-            beforeDestroy<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run after destroying a single instance.
-             */
-            afterDestroy<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run after destroying a single instance.
-             */
-            afterDestroy<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run before updating a single instance.
-             */
-            beforeUpdate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run before updating a single instance.
-             */
-            beforeUpdate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run after updating a single instance.
-             */
-            afterUpdate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run after updating a single instance.
-             */
-            afterUpdate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run before creating instances in bulk.
-             */
-            beforeBulkCreate<T>(name: string, validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run before creating instances in bulk.
-             */
-            beforeBulkCreate<T>(validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run after creating instances in bulk.
-             */
-            afterBulkCreate<T>(name: string, validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run after creating instances in bulk.
-             */
-            afterBulkCreate<T>(validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run before destroying instances in bulk.
-             */
-            beforeBulkDestroy<T>(name: string, validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
-
-            /**
-             * A hook that is run before destroying instances in bulk.
-             */
-            beforeBulkDestroy<T>(validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
-
-            /**
-             * A named hook that is run after destroying instances in bulk.
-             */
-            afterBulkDestroy<T>(name: string, validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
-
-            /**
-             * A hook that is run after destroying instances in bulk.
-             */
-            afterBulkDestroy<T>(validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
-
-            /**
-             * A named hook that is run before updating instances in bulk.
-             */
-            beforeBulkUpdate<T>(name: string, validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
-
-            /**
-             * A hook that is run before updating instances in bulk.
-             */
-            beforeBulkUpdate<T>(validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
-
-            /**
-             * A named hook that is run after updating instances in bulk.
-             */
-            afterBulkUpdate<T>(name: string, validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
-
-            /**
-             * A hook that is run after updating instances in bulk.
-             */
-            afterBulkUpdate<T>(validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
-        }
-
-        interface Associations {
-            /**
-             * Creates an association between this (the source) and the provided target. The foreign key is added on the target.
-             *
-             * @param target
-             * @param options
-             */
-            hasOne<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
-
-            /**
-             * Creates an association between this (the source) and the provided target. The foreign key is added on the source.
-             *
-             * @param target
-             * @param options
-             */
-            belongsTo<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
-
-            /**
-             * Creates an association to connect sources with multiple targets. Furthermore the targets can also have connections to multiple sources.
-             *
-             * @param target
-             * @param options
-             */
-            belongsToMany<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
-
-            /**
-             * Create an association that is either 1:m or n:m.
-             *
-             * @param target
-             * @param options
-             */
-            hasMany<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
-        }
+declare namespace sequelize {
+    interface SequelizeStaticAndInstance {
 
         /**
-         * Extension of external project that doesn't have definitions.
+         * A reference to sequelize utilities. Most users will not need to use these utils directly. However, you might want
+         * to use Sequelize.Utils._, which is a reference to the lodash library, if you don't already have it imported in
+         * your project.
+         */
+        Utils: Utils;
+
+        /**
+         * A modified version of bluebird promises, that allows listening for sql events.
          *
-         * See https://github.com/chriso/validator.js and https://github.com/sequelize/sequelize/blob/master/lib/instance-validator.js
+         * @see Promise
          */
-        interface Validator {
-
-        }
+        Promise: Promise;
 
         /**
-         * Custom class defined, but no extra methods or functionality even.
+         * Exposes the validator.js object, so you can extend it with custom validation functions. The validator is exposed
+         * both on the instance, and on the constructor.
+         *
+         * @see Validator
          */
-        interface ValidationError extends Error {
-
-        }
-
-        interface QueryChainer {
-            /**
-             * Add an query to the chainer. This can be done in two ways - either by invoking the method like you would
-             * normally, and then adding the returned emitter to the chainer, or by passing the class that you want to call a
-             * method on, the name of the method, and its parameters to the chainer. The second form might sound a bit
-             * cumbersome, but it is used when you want to run queries in serial.
-             *
-             * @param emitterOrKlass
-             * @param method
-             * @param params
-             * @param options
-             */
-            add(emitterOrKlass: any, method?: string, params?: any, options?: any): QueryChainer;
-
-            /**
-             * Run the query chainer. In reality, this means, wait for all the added emitters to finish, since the queries
-             * began executing as soon as you invoked their methods.
-             */
-            run(): EventEmitter;
-
-            /**
-             * Run the chainer serially, so that each query waits for the previous one to finish before it starts.
-             *
-             * @param options @see QueryChainerRunSeriallyOptions
-             */
-            runSerially(options?: QueryChainerRunSeriallyOptions): EventEmitter;
-        }
-
-        interface QueryInterface {
-
-            /**
-             * Returns the dialect-specific sql generator.
-             */
-            QueryGenerator: QueryGenerator;
-
-            /**
-             * Queries the schema (table list).
-             *
-             * @param schema The schema to query. Applies only to Postgres.
-             */
-            createSchema(schema?: string): EventEmitter;
-
-            /**
-             * Drops the specified schema (table).
-             *
-             * @param schema The name of the table to drop.
-             */
-            dropSchema(schema: string): EventEmitter;
-
-            /**
-             * Drops all tables.
-             */
-            dropAllSchemas(): EventEmitter;
-
-            /**
-             * Queries all table names in the database.
-             *
-             * @param options
-             */
-            showAllSchemas(options?: QueryOptions): EventEmitter;
-
-            /**
-             * Creates a table with specified attributes.
-             * @param tableName     Name of table to create
-             * @param attributes    Hash of attributes, key is attribute name, value is data type
-             * @param options       Query options.
-             *
-             * @return The return type will be a Promise when dialect is Postgres and an EventEmitter for MySQL and SQLite.
-             */
-            createTable(tableName: string, attributes: any, options?: QueryOptions): any;
-
-            /**
-             * Drops the specified table.
-             *
-             * @param tableName Table name.
-             * @param options   Query options, particularly "force".
-             */
-            dropTable(tableName: string, options?: QueryOptions): EventEmitter;
-            dropAllTables(options?: QueryOptions): EventEmitter;
-            dropAllEnums(options?: QueryOptions): EventEmitter;
-            renameTable(before: string, after: string): EventEmitter;
-            showAllTables(options?: QueryOptions): EventEmitter;
-            describeTable(tableName: string, options?: QueryOptions): EventEmitter;
-            addColumn(tableName: string, attributeName: any, dataTypeOrOptions?: any): EventEmitter;
-            removeColumn(tableName: string, attributeName: string): EventEmitter;
-            changeColumn(tableName: string, attributeName: string, dataTypeOrOptions: any): EventEmitter;
-            renameColumn(tableName: string, attrNameBefore: string, attrNameAfter: string): EventEmitter;
-            addIndex(tableName: string, attributes: Array<any>, options?: QueryOptions): EventEmitter;
-            showIndex(tableName: string, options?: QueryOptions): EventEmitter;
-            getForeignKeysForTables(tableNames: Array<string>): EventEmitter;
-            removeIndex(tableName: string, attributes: Array<string>): EventEmitter;
-            removeIndex(tableName: string, indexName: string): EventEmitter;
-            insert<TModel>(dao: TModel, tableName: string, values: any, options?: QueryOptions): EventEmitter;
-            /**
-             * Inserts several records into the specified table.
-             * @param tableName     Table to insert into.
-             * @param records       Array of key/value pairs to insert as records.
-             * @param options       Query options
-             * @param attributes    For Postgres only, used to identify if an attribute is auto-increment and thus handled specially.
-             */
-            bulkInsert(tableName: string, records: Array<any>, options?: QueryOptions, attributes?: any): EventEmitter;
-
-            update<TModel>(dao: TModel, tableName: string, values: Array<any>, where: any, options?: QueryOptions): EventEmitter;
-            bulkUpdate(tableName: string, values: Array<any>, where: any, options?: QueryOptions, attributes?: any): EventEmitter;
-            delete<TModel>(dao: TModel, tableName: string, where: any, options?: QueryOptions): EventEmitter;
-            bulkDelete(tableName: string, where: any, options?: QueryOptions): EventEmitter;
-            bulkDelete<TModel>(tableName: string, where: any, options: QueryOptions, model: TModel): EventEmitter;
-            select<TModel>(factory: TModel, tableName: string, scope?: any, queryOptions?: QueryOptions): EventEmitter;
-            increment<TModel>(dao: TModel, tableName: string, values: Array<any>, where: any, options?: QueryOptions): EventEmitter;
-            rawSelect<TModel>(tableName: string, options: QueryOptions, attributeSelector: string, model: TModel): EventEmitter;
-            /**
-             * Postgres only. Creates a trigger on specified table to call the specified function with supplied parameters.
-             *
-             * @param tableName
-             * @param triggerName
-             * @param timingType
-             * @param fireOnArray
-             * @param functionName
-             * @param functionParams
-             * @param optionsArray
-             */
-            createTrigger(tableName: string, triggerName: string, timingType: string, fireOnArray: Array<any>, functionName: string, functionParams: Array<any>, optionsArray: Array<string>): EventEmitter;
-            /**
-             * Postgres only. Drops the specified trigger.
-             *
-             * @param tableName
-             * @param triggerName
-             */
-            dropTrigger(tableName: string, triggerName: string): EventEmitter;
-            renameTrigger(tableName: string, oldTriggerName: string, newTriggerName: string): EventEmitter;
-            createFunction(functionName: string, params: Array<any>, returnType: string, language: string, body: string, options?: QueryOptions): EventEmitter;
-            dropFunction(functionName: string, params: Array<any>): EventEmitter;
-            renameFunction(oldFunctionName: string, params: Array<any>, newFunctionName: string): EventEmitter;
-            /**
-             * Escape an identifier (e.g. a table or attribute name). If force is true,
-             * the identifier will be quoted even if the `quoteIdentifiers` option is
-             * false.
-             */
-            quoteIdentifier(identifier: string, force: boolean): EventEmitter;
-            quoteTable(tableName: string): EventEmitter;
-            quoteIdentifiers(identifiers: string, force: boolean): EventEmitter;
-            escape(value: string): EventEmitter;
-            setAutocommit(transaction: Transaction, value: boolean): EventEmitter;
-            setIsolationLevel(transaction: Transaction, value: string): EventEmitter;
-            startTransaction(transaction: Transaction, options?: QueryOptions): EventEmitter;
-            commitTransaction(transaction: Transaction, options?: QueryOptions): EventEmitter;
-            rollbackTransaction(transaction: Transaction, options?: QueryOptions): EventEmitter;
-        }
-
-        interface QueryGenerator {
-            createSchema(schemaName: string): string;
-            dropSchema(schemaName: string): string;
-            showSchemasQuery(): string;
-            addSchema<TInstance, TPojo>(param: Model<TInstance, TPojo>): Schema;
-            createTableQuery(tableName: string, attributes: Array<any>, options?: CreateTableQueryOptions): string;
-            describeTableQuery(tableName: string, schema: string, schemaDelimiter: string): string;
-            dropTableQuery(tableName: string, options?: { cascade: string }): string;
-            renameTableQuery(before: string, after: string): string;
-            showTablesQuery(): string;
-            addColumnQuery(tableName: string, attributes: any): string;
-            removeColumnQuery(tableName: string, attributeName: string): string;
-            changeColumnQuery(tableName: string, attributes: any): string;
-            renameColumnQuery(tableName: string, attrNameBefore: string, attrNameAfter: string): string;
-            insertQuery(table: string, valueHash: any, modelAttributes: any): string;
-            bulkInsertQuery(tableName: string, attrValueHashes: any): string;
-            updateQuery(tableName: string, attrValueHash: any, where: any, options: InsertOptions, attributes: any): string;
-            deleteQuery(tableName: string, where: any, options: DestroyOptions): string;
-            deleteQuery<TInstance, TPojo>(tableName: string, where: any, options: DestroyOptions, model: Model<TInstance, TPojo>): string;
-            /**
-             * Creates a query to increment a value. Note "options" here is an additional hash of values to update.
-             *
-             * @param tableName
-             * @param attrValueHash
-             * @param where
-             * @param options
-             */
-            incrementQuery(tableName: string, attrValueHash: any, where: any, options?: any): string;
-            addIndexQuery(tableName: string, attributes: Array<any>, options?: IndexOptions): string;
-            /**
-             * Return indices for a table. Not options may be passed but is not used, so can be anything.
-             * @param tableName
-             * @param options
-             */
-            showIndexQuery(tableName: string, options?: any): string; // options is actually not used
-            removeIndexQuery(tableName: string, indexNameOrAttributes: string): string;
-            removeIndexQuery(tableName: string, indexNameOrAttributes: Array<string>): string;
-            attributesToSQL(attributes: Array<any>): string;
-            findAutoIncrementField<TInstance, TPojo>(factory: Model<TInstance, TPojo>): Array<string>;
-            quoteTable(param: any, as: boolean): string;
-            quote(obj: any, parent: any, force: boolean): string;
-            createTrigger(tableName: string, triggerName: string, timingType: string, fireOnArray: TriggerOptions, functionName: string, functionParams: Array<TriggerParam>): string;
-            dropTrigger(tableName: string, triggerName: string): string;
-            renameTrigger(tableName: string, oldTriggerName: string, newTriggerName: string): string;
-            createFunction(functionName: string, params: Array<TriggerParam>, returnType: string, language: string, body: string, options?: Array<string>): string;
-            dropFunction(functionName: string, params: Array<TriggerParam>): string;
-            renameFunction(oldFunctionName: string, params: Array<TriggerParam>, newFunctionName: string): string;
-            quoteIdentifier(identifier: string, force?: boolean): string;
-            quoteIdentifiers(identifiers: string, force?: boolean): string;
-            /**
-             * Not documented, and reading through the code, I'm not sure what all the options available are for value/field.
-             *
-             * @param value
-             * @param field
-             */
-            escape(value: any, field: any): string;
-            getForeignKeysQuery(tableName: string, schemaName: string): string;
-            dropForeignKeyQuery(tableName: string, foreignKey: string): string;
-            selectQuery<TInstance, TPojo>(tableName: string, options: SelectOptions, model?: Model<TInstance, TPojo>): string;
-            selectQuery<TInstance, TPojo>(tableName: Array<string>, options: SelectOptions, model?: Model<TInstance, TPojo>): string;
-            selectQuery<TInstance, TPojo>(tableName: Array<Array<string>>, options: SelectOptions, model?: Model<TInstance, TPojo>): string;
-            setAutocommitQuery(value: boolean): string;
-            setIsolationLevelQuery(value: string): string;
-            /**
-             * Returns start transaction query. Options is not used.
-             * @param options
-             */
-            startTransactionQuery(options?: any): string;
-            /**
-             * Returns start transaction query. Options is not used.
-             * @param options
-             */
-            commitTransactionQuery(options?: any): string;
-            /**
-             * Returns start transaction query. Options is not used.
-             * @param options
-             */
-            rollbackTransactionQuery(options?: any): string;
-            addLimitAndOffset(options: SelectOptions, query?: string): string;
-            getWhereConditions<TInstance, TPojo>(smth: any, tableName: string, factory: Model<TInstance, TPojo>, options?: any, prepend?: boolean): string;
-            prependTableNameToHash(tableName: string, hash?: any): string;
-            findAssociation<TInstance, TPojo>(attribute: string, dao: Model<TInstance, TPojo>): string;
-            getAssociationFilterDAO<TInstance, TPojo>(filterStr: string, dao: Model<TInstance, TPojo>): string;
-            isAssociationFilter<TInstance, TPojo>(filterStr: string, dao: Model<TInstance, TPojo>, options?: any): string;
-            getAssociationFilterColumn<TInstance, TPojo>(filterStr: string, dao: Model<TInstance, TPojo>, options?: { include: boolean }): string;
-            getConditionalJoins<TInstance, TPojo>(options: { where?: any }, originalDao: Model<TInstance, TPojo>): string;
-            arrayValue(value: Array<string>, key: string, _key: string, factory?: any, logicResult?: any): string;
-            hashToWhereConditions<TInstance, TPojo>(hash: any, dao: Model<TInstance, TPojo>, options?: HashToWhereConditionsOption): string;
-            booleanValue(value: boolean): string;
-        }
-
-        interface Schema {
-            tableName: string;
-            table: string;
-            name: string;
-            schema: string;
-            delimiter: string;
-        }
-
-        interface QueryTypes {
-            SELECT: string;
-            BULKUPDATE: string;
-            BULKDELETE: string;
-        }
-
-        interface ModelManager {
-            daos: Array<Model<any, any>>;
-            sequelize: Sequelize;
-            addDAO<TInstance, TPojo>(dao: Model<TInstance, TPojo>): Model<TInstance, TPojo>;
-            removeDAO<TInstance, TPojo>(dao: Model<TInstance, TPojo>): void;
-            getDAO<TInstance, TPojo>(daoName: string, options?: ModelMangerGetDaoOptions): Model<TInstance, TPojo>;
-            all: Array<Model<any, any>>;
-
-            /**
-             * Iterate over DAOs in an order suitable for e.g. creating tables. Will
-             * take foreign key constraints into account so that dependencies are visited
-             * before dependents.
-             */
-            forEachDAO(iterator: (dao: Model<any, any>, name: string) => void, options?: ModelManagerForEachDaoOptions): void;
-        }
-
-        interface TransactionManager {
-            sequelize: Sequelize;
-            connectorManagers: any;
-            getConnectorManager(uuid?: string): ConnectorManager;
-            releaseConnectionManager(uuid?: string): void;
-
-            /**
-             * Execute a query on the DB, with the possibility to bypass all the sequelize goodness.
-             *
-             * @param sql           SQL statement to execute.
-             *
-             * @param callee        If callee is provided, the selected data will be used to build an instance of the DAO represented
-             *                      by the factory. Equivalent to calling Model.build with the values provided by the query.
-             *
-             * @param options       Query options.
-             *
-             */
-            query(sql: string, callee?: Model<any, any>, options?: QueryOptions): EventEmitter;
-
-            query<TInstance, TPojo>(sql: string, callee?: Model<TInstance, TPojo>, options?: QueryOptions): EventEmitter;
-        }
-
-        interface ConnectorManager {
-
-            /**
-             * Execute a query on the DB, with the possibility to bypass all the sequelize goodness.
-             *
-             * @param sql           SQL statement to execute.
-             *
-             * @param callee        If callee is provided, the selected data will be used to build an instance of the DAO represented
-             *                      by the factory. Equivalent to calling Model.build with the values provided by the query.
-             *
-             * @param options       Query options.
-             *
-             */
-            query(sql: string, callee?: Model<any, any>, options?: QueryOptions): EventEmitter;
-
-            afterTransactionSetup(callback: () => void): void;
-            connect(): void;
-            disconnect(): void;
-            reconnect(): void;
-            cleanup(): void;
-        }
-
-        interface Migrator {
-            queryInterface: QueryInterface;
-            migrate(options?: MigratorOptions): EventEmitter;
-            getUndoneMigrations(callback: (err: Error, result: Array<Migrator>) => void): void;
-            findOrCreateMetaDAO(syncOptions?: SyncOptions): EventEmitter;
-            exec(filename: string, options?: MigratorExecOptions): EventEmitter;
-            getLastMigrationFromDatabase(): EventEmitter;
-            getLastMigrationIdFromDatabase(): EventEmitter;
-            getFormattedDateString(s: string): string;
-            stringToDate(s: string): Date;
-            saveSuccessfulMigration(from: Migration, to: Migration, callback: (metaData: MetaInstance) => void): void;
-            deleteUndoneMigration(from: Migration, to: Migration, callback: () => void): void;
-            execute(options?: MigrationExecuteOptions): EventEmitter;
-            isBefore(date: Date, options?: MigrationCompareOptions): boolean;
-            isAfter(date: Date, options?: MigrationCompareOptions): boolean;
-
-        }
-
-        interface Migration extends QueryInterface {
-            migrator: Migrator;
-            path: string;
-            filename: string;
-            migrationId: number;
-            date: Date;
-            queryInterface: QueryInterface;
-            migration: (err: Error, migration: Migration, dataTypes: any, callback: (err: Error) => void) => void;
-
-        }
-
-        interface EventEmitter extends EventEmitterT<any>, NodeJS.EventEmitter { }
-
-        interface EventEmitterT<R> extends NodeJS.EventEmitter {
-            /**
-             * Create a new emitter instance.
-             *
-             * @param handler
-             */
-            new (handler: (emitter: EventEmitterT<R>) => void): EventEmitterT<R>;
-
-            /**
-             * Run the function that was passed when the emitter was instantiated.
-             */
-            run(): EventEmitterT<R>;
-
-            /**
-             * Listen for success events.
-             *
-             * @param onSuccess
-             */
-            success(onSuccess: (result: R) => void): EventEmitterT<R>;
-
-            /**
-             * Alias for success(handler). Listen for success events.
-             *
-             * @param onSuccess
-             */
-            ok(onSuccess: (result: R) => void): EventEmitterT<R>;
-
-            /**
-             * Listen for error events.
-             *
-             * @param onError
-             */
-            error(onError: (err: Error) => void): EventEmitterT<R>;
-
-            /**
-             * Alias for error(handler). Listen for error events.
-             *
-             * @param onError
-             */
-            fail(onError: (err: Error) => void): EventEmitterT<R>;
-
-            /**
-             * Alias for error(handler). Listen for error events.
-             *
-             * @param onError
-             */
-            failure(onError: (err: Error) => void): EventEmitterT<R>;
-
-            /**
-             * Listen for both success and error events.
-             *
-             * @param onDone
-             */
-            done(onDone: (err: Error, result: R) => void): EventEmitterT<R>;
-
-            /**
-             * Alias for done(handler). Listen for both success and error events.
-             *
-             * @param onDone
-             */
-            complete(onDone: (err: Error, result: R) => void): EventEmitterT<R>;
-
-            /**
-             * Attach a function that is called every time the function that created this emitter executes a query.
-             *
-             * @param onSQL
-             */
-            sql(onSQL: (sql: string) => void): EventEmitterT<R>;
-
-            /**
-             * Proxy every event of this event emitter to another one.
-             *
-             * @param emitter   The event emitter that should receive the events.
-             * @param options   Contains an array of the events to proxy. Defaults to sql, error and success
-             */
-            proxy(emitter: EventEmitterT<R>, options?: ProxyOptions): EventEmitterT<R>;
-
-
-        }
-
-        interface Options {
-            /**
-             * The dialect you of the database you are connecting to. One of mysql, postgres, sqlite and mariadb.
-             * Default is mysql.
-             */
-            dialect?: string;
-
-            /**
-             * If specified, load the dialect library from this path. For example, if you want to use pg.js instead of pg when
-             * connecting to a pg database, you should specify 'pg.js' here
-             */
-            dialectModulePath?: string;
-
-            /**
-             * The dialect options that are passed to the underlying dialect library.
-             */
-            dialectOptions?: Object;
-
-            /**
-             * The host of the relational database. Default 'localhost'.
-             */
-            host?: string;
-
-            /**
-             * Integer    The port of the relational database.
-             */
-            port?: number;
-
-            /**
-             * The protocol of the relational database. Default 'tcp'.
-             */
-            protocol?: string;
-
-            /**
-             * Default options for model definitions. See sequelize.define for options.
-             */
-            define?: DefineOptions;
-
-            /**
-             * Default options for sequelize.query
-             */
-            query?: QueryOptions;
-
-            /**
-             * Default options for sequelize.sync
-             */
-            sync?: SyncOptions;
-
-            /**
-             * The timezone used when converting a date from the database into a javascript date. The timezone is also used to
-             * SET TIMEZONE when connecting to the server, to ensure that the result of NOW, CURRENT_TIMESTAMP and other time
-             * related functions have in the right timezone. For best cross platform performance use the format +/-HH:MM.
-             * Default '+00:00'.
-             */
-            timezone?: string;
-
-            /**
-             * Logging options. Function used to log. Default is console.log. Signature is (message:string) => void.
-             *
-             * Set to "false" to disable logging.
-             */
-            logging?: any;
-
-            /**                                                                                                                                                                                                                        logging=console.log]    Function    A function that gets executed everytime Sequelize would log something.
-             * A flag that defines if null values should be passed to SQL queries or not.
-             */
-            omitNull?: boolean;
-
-            /**
-             * Boolean    Queue queries, so that only maxConcurrentQueries number of queries are executing at once. If false, all
-             * queries will be executed immediately.
-             */
-            queue?: boolean;
-
-            /**
-             * The maximum number of queries that should be executed at once if queue is true.
-             */
-            maxConcurrentQueries?: number;
-
-            /**
-             * A flag that defines if native library shall be used or not. Currently only has an effect for postgres
-             */
-            native?: boolean;
-
-            /**
-             * Use read / write replication. To enable replication, pass an object, with two properties, read and write. Write
-             * should be an object (a single server for handling writes), and read an array of object (several servers to
-             * handle reads). Each read/write server can have the following properties?: host, port, username, password, database
-             */
-            replication?: ReplicationOptions;
-
-            /**
-             * Connection pool options.
-             *
-             */
-            pool?: PoolOptions;
-
-            /**
-             * Set to false to make table names and attributes case-insensitive on Postgres and skip double quoting of them.
-             * Default true.
-             */
-            quoteIdentifiers?: boolean;
-
-            /**
-             * Language. Default "en".
-             */
-            language?: string;
-        }
-
-        interface PoolOptions {
-            maxConnections?: number;
-
-            minConnections?: number;
-
-            /**
-             * The maximum time, in milliseconds, that a connection can be idle before being released.
-             */
-            maxIdleTime?: number;
-
-            /**
-             * A function that validates a connection. Called with client. The default function checks that client is an
-             * object, and that its state is not disconnected.
-             *
-             * Note, this is not documented, and after reading code I'm not sure what client's type is.
-             */
-            validateConnection?: (client?: any) => boolean;
-        }
-
-        interface AttributeOptions {
-            /**
-             * A string or a data type
-             */
-            type?: string;
-
-            /**
-             * If false, the column will have a NOT NULL constraint, and a not null validation will be run before an instance
-             * is saved.
-             */
-            allowNull?: boolean;
-
-            /**
-             * A literal default value, a javascript function, or an SQL function (see sequelize.fn)
-             */
-            defaultValue?: any;
-
-            /**
-             * If true, the column will get a unique constraint. If a string is provided, the column will be part of a
-             * composite unique index. If multiple columns have the same string, they will be part of the same unique index.
-             */
-            unique?: any;
-
-            primaryKey?: boolean;
-
-            /**
-             * If set, sequelize will map the attribute name to a different name in the database.
-             */
-            field?: string;
-
-            autoIncrement?: boolean;
-
-            comment?: string;
-
-            /**
-             * If this column references another table, provide it here as a Model, or a string.
-             */
-            references?: any;
-
-            /**
-             * The column of the foreign table that this column references. Default 'id'.
-             */
-            referencesKey?: string;
-
-            /**
-             * What should happen when the referenced key is updated. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
-             * NO ACTION.
-             */
-            onUpdate?: string;
-
-            /**
-             * What should happen when the referenced key is deleted. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
-             * NO ACTION.
-             */
-            onDelete?: string;
-
-            /**
-             * Provide a custom getter for this column. Use this.getDataValue(String) to manipulate the underlying values.
-             */
-            get?: () => any;
-
-            /**
-             * Provide a custom setter for this column. Use this.setDataValue(String, Value) to manipulate the underlying values.
-             */
-            set?: (value?: any) => void;
-
-            /**
-             * An object of validations to execute for this column every time the model is saved. Can be either the name of a
-             * validation provided by validator.js, a validation function provided by extending validator.js (see the
-             * DAOValidator property for more details), or a custom validation function. Custom validation functions are called
-             * with the value of the field, and can possibly take a second callback argument, to signal that they are
-             * asynchronous. If the validator is sync, it should throw in the case of a failed validation, it it is async,
-             * the callback should be called with the error text.
-             */
-            validate?: any;
-        }
-
-        interface ForeignKeyAttributeOptions extends AttributeOptions {
-            /**
-             * The name of the foreign key in the target table. Defaults to the name of source + primary key of source.
-             */
-            fieldName: string;
-        }
-
-        interface DefineOptions {
-            /**
-             * Define the default search scope to use for this model. Scopes have the same form as the options passed to
-             * find / findAll.
-             */
-            defaultScope?: FindOptions;
-
-            /**
-             * More scopes, defined in the same way as defaultScope above. See Model.scope for more information about how
-             * scopes are defined, and what you can do with them
-             */
-            scopes?: any;
-
-            /**
-             * Don't persits null values. This means that all columns with null values will not be saved.
-             */
-            omitNull?: boolean;
-
-            /**
-             * Adds createdAt and updatedAt timestamps to the model. Default true.
-             */
-            timestamps?: boolean;
-
-            /**
-             * Calling destroy will not delete the model, but instead set a deletedAt timestamp if this is true. Needs
-             * timestamps=true to work. Default false.
-             */
-            paranoid?: boolean;
-
-            /**
-             * Converts all camelCased columns to underscored if true. Default false.
-             */
-            underscored?: boolean;
-
-            /**
-             * Converts camelCased model names to underscored tablenames if true. Default false.
-             */
-            underscoredAll?: boolean;
-
-            /**
-             * If freezeTableName is true, sequelize will not try to alter the DAO name to get the table name. Otherwise, the
-             * dao name will be pluralized. Default false.
-             */
-            freezeTableName?: boolean;
-
-            /**
-             * Override the name of the createdAt column if a string is provided, or disable it if false. Timestamps must be true.
-             */
-            createdAt?: any;
-
-            /**
-             * Override the name of the updatedAt column if a string is provided, or disable it if false. Timestamps must be true.
-             */
-            updatedAt?: any;
-
-            /**
-             * Override the name of the deletedAt column if a string is provided, or disable it if false. Timestamps must be true.
-             */
-            deletedAt?: any;
-
-            /**
-             * Defaults to pluralized DAO name, unless freezeTableName is true, in which case it uses DAO name verbatim.
-             */
-            tableName?: string;
-
-            /**
-             * Provide getter functions that work like those defined per column. If you provide a getter method with the same
-             * name as a column, it will be used to access the value of that column. If you provide a name that does not match
-             * a column, this function will act as a virtual getter, that can fetch multiple other values.
-             */
-            getterMethods?: any;
-
-            /**
-             * Provide setter functions that work like those defined per column. If you provide a setter method with the same
-             * name as a column, it will be used to update the value of that column. If you provide a name that does not match
-             * a column, this function will act as a virtual setter, that can act on and set other values, but will not be
-             * persisted
-             */
-            setterMethods?: any;
-
-            /**
-             * Provide functions that are added to each instance (DAO).
-             */
-            instanceMethods?: any;
-
-            /**
-             * Provide functions that are added to the model (Model).
-             */
-            classMethods?: any;
-
-            /**
-             * Default 'public'.
-             */
-            schema?: string;
-            schemaDelimiter?: string;
-            engine?: string;
-            charset?: string;
-            comment?: string;
-            collate?: string;
-            whereCollection?: any;
-            language?: string;
-
-            /**
-             * An object of hook function that are called before and after certain lifecycle events. The possible hooks are?:
-             * beforeValidate, afterValidate, beforeBulkCreate, beforeBulkDestroy, beforeBulkUpdate, beforeCreate,
-             * beforeDestroy, beforeUpdate, afterCreate, afterDestroy, afterUpdate, afterBulkCreate, afterBulkDestory and
-             * afterBulkUpdate. See Hooks for more information about hook functions and their signatures. Each property can
-             * either be a function, or an array of functions.
-             */
-            hooks?: Hooks;
-
-            /**
-             * An object of model wide validations. Validations have access to all model values via this. If the validator
-             * function takes an argument, it is assumed to be async, and is called with a callback that accepts an optional
-             * error.
-             */
-            validate?: any;
-
-            /**
-             *
-             */
-            indexes?: Array<DefineIndexOptions>;
-        }
-
-        interface DefineIndexOptions {
-            /**
-             * The name of the index. Defaults to model name + _ + fields concatenated.
-             */
-            name?: string;
-
-            /**
-             * Index type. Only used by mysql. One of UNIQUE, FULLTEXT and SPATIAL.
-             */
-            type: string;
-
-            /**
-             * The method to create the index by (USING statement in SQL). BTREE and HASH are supported by mysql and postgres,
-             * and postgres additionally supports GIST and GIN.
-             */
-            method: string;
-
-            /**
-             * Should the index by unique? Can also be triggered by setting type to UNIQUE. Default false (unless type = "UNIQUE",
-             * then true).
-             */
-            unique?: boolean;
-
-            /**
-             * PostgreSQL will build the index without taking any write locks. Postgres only. Default false.
-             */
-            concurrently?: boolean;
-
-            /**
-             * An array of the fields to index. Each field can either be a string containing the name of the field, or an object
-             * with the following attributes: attribute (field name), length (create a prefix index of length chars), order (the
-             * direction the column should be sorted in), collate (the collation (sort order) for the column)
-             */
-            fields: Array<any>;
-        }
-
-        interface QueryOptions {
-            /**
-             * If true, sequelize will not try to format the results of the query, or build an instance of a model from the
-             * result.
-             */
-            raw?: boolean;
-
-            /**
-             * The transaction that the query should be executed under.
-             */
-            transaction?: Transaction;
-
-            /**
-             * The type of query you are executing. The query type affects how results are formatted before they are passed
-             * back. If no type is provided sequelize will try to guess the right type based on the sql, and fall back to
-             * SELECT. The type is a string, but Sequelize.QueryTypes is provided is convenience shortcuts. Current options
-             * are SELECT, BULKUPDATE and BULKDELETE.
-             *
-             * Default is SELECT.
-             */
-            type?: string;
-
-            /**
-             * Lock the selected rows in either share or update mode. Possible options are transaction.LOCK.UPDATE and
-             * transaction.LOCK.SHARE. See transaction.LOCK for an example.
-             */
-            lock?: string;
-
-            /**
-             * For aggregate function calls, the type of the result. If field is a field in this Model, the default will be the
-             * type of that field, otherwise defaults to float.
-             */
-            dataType?: any;
-
-            /**
-             * A function that logs sql queries, or false for no logging.
-             */
-            logging?: any;
-
-            /**
-             * If plain is true, then sequelize will only return the first record of the result set. In case of false it will
-             * all records.
-             */
-            plain?: boolean;
-        }
-
-        interface SyncOptions {
-            /**
-             * If force is true, each DAO will do DROP TABLE IF EXISTS ..., before it tries to create its own table.
-             * Default false.
-             */
-            force?: boolean;
-
-            /**
-             * A function that logs sql queries, or false for no logging.
-             */
-            logging?: any;
-
-            /**
-             * The schema that the tables should be created in. This can be overriden for each table in sequelize.define.
-             * Default 'public'.
-             */
-            schema?: string;
-        }
-
-        interface ReplicationOptions {
-            read?: Array<Server>;
-            write?: Server;
-        }
-
-        interface Server {
-            host?: string;
-            port?: number;
-            database?: string;
-            username?: string;
-            password?: string;
-        }
-
-        interface DropOptions {
-            /**
-             * Also drop all objects depending on this table, such as views. Only works in postgres.
-             *
-             * Default false.
-             */
-            cascade?: boolean;
-        }
-
-        interface SchemaOptions {
-            /**
-             * The character(s) that separates the schema name from the table name. Default '.'.
-             */
-            schemaDelimiter?: string;
-        }
-
-        interface FindOptions {
-            /**
-             * A hash of attributes to describe your search.
-             */
-            where?: any;
-
-            /**
-             * A list of the attributes that you want to select. To rename an attribute, you can pass an array, with two
-             * elements - the first is the name of the attribute in the DB (or some kind of expression such as
-             * Sequelize.literal, Sequelize.fn and so on), and the second is the name you want the attribute to have in the
-             * returned instance
-             */
-            attributes?: Array<any>;
-
-            /**
-             * A list of associations to eagerly load. Supported is either { include?: [ Model1, Model2, ...] } or { include?:
-             * [ { model?: Model1, as?: 'Alias' } ] }. If your association are set up with an as (eg. X.hasMany(Y, { as?: 'Z },
-             * you need to specify Z in the as attribute when eager loading Y). When using the object form, you can also
-             * specify attributes to specify what columns to load, where to limit the relations, and include to load further
-             * nested relations
-             */
-            include?: any;
-
-            /**
-             * Specifies an ordering. If a string is provided, it will be esacped. Using an array, you can provide several
-             * columns / functions to order by. Each element can be further wrapped in a two-element array. The first element
-             * is the column / function to order by, the second is the direction. For example?: order?: [['name', 'DESC']]. In
-             * this way the column will be escaped, but the direction will not.
-             */
-            order?: any;
-
-            limit?: number;
-
-            offset?: number;
-        }
-
-        interface BuildOptions {
-            /**
-             * If set to true, values will ignore field and virtual setters. Default false.
-             */
-            raw?: boolean;
-
-            /**
-             * Default true.
-             */
-            isNewRecord?: boolean;
-
-            /**
-             * Default true.
-             */
-            isDirty?: boolean;
-
-            /**
-             * an array of include options - Used to build prefetched/included model instances. See set.
-             */
-            include?: Array<any>;
-        }
-
-        interface CopyOptions extends BuildOptions {
-            /**
-             * If set, only columns matching those in fields will be saved.
-             */
-            fields?: Array<string>;
-
-            /**
-             *
-             */
-            transaction?: Transaction;
-        }
-
-        interface FindOrCreateOptions extends FindOptions, QueryOptions {
-
-        }
-
-        interface BulkCreateOptions {
-            /**
-             * Fields to insert (defaults to all fields).
-             */
-            fields?: Array<string>;
-
-            /**
-             * Should each row be subject to validation before it is inserted. The whole insert will fail if one row fails
-             * validation. Default false.
-             */
-            validate?: boolean;
-
-            /**
-             * Run before / after create hooks for each individual Instance? BulkCreate hooks will still be run. Default false;
-             */
-            hooks?: boolean;
-
-            /**
-             * Ignore duplicate values for primary keys? (not supported by postgres). Default false.
-             */
-            ignoreDuplicates?: boolean;
-        }
-
-        interface DestroyOptions {
-            /**
-             * If set to true, destroy will find all records within the where parameter and will execute before-/ after
-             * bulkDestroy hooks on each row.
-             */
-            hooks?: boolean;
-
-            /**
-             * How many rows to delete
-             */
-            limit?: number;
-
-            /**
-             * If set to true, dialects that support it will use TRUNCATE instead of DELETE FROM. If a table is truncated the
-             * where and limit options are ignored.
-             */
-            truncate?: boolean;
-        }
-
-        interface DestroyInstanceOptions {
-            /**
-             * If set to true, paranoid models will actually be deleted.
-             */
-            force: boolean;
-        }
-
-        interface InsertOptions {
-            limit?: number;
-            returning?: string;
-            allowNull?: string;
-        }
-
-        interface UpdateOptions {
-            /**
-             * Should each row be subject to validation before it is inserted. The whole insert will fail if one row fails
-             * validation. Default true.
-             */
-            validate?: boolean;
-
-            /**
-             * Run before / after bulkUpdate hooks? Default false.
-             */
-            hooks?: boolean;
-
-            /**
-             * How many rows to update (only for mysql and mariadb).
-             */
-            limit?: number;
-        }
-
-        interface SetOptions {
-            /**
-             * If set to true, field and virtual setters will be ignored. Default false.
-             */
-            raw?: boolean;
-
-            /**
-             * Clear all previously set data values. Default false.
-             */
-            reset?: boolean;
-
-            include?: any;
-        }
-
-        interface SaveOptions {
-            /**
-             * An alternative way of setting which fields should be persisted.
-             */
-            fields?: any;
-
-            /**
-             * If true, the updatedAt timestamp will not be updated. Default false.
-             */
-            silent?: boolean;
-
-            transaction?: Transaction;
-        }
-
-        interface ValidateOptions {
-            /**
-             * An array of strings. All properties that are in this array will not be validated.
-             */
-            skip: Array<string>;
-        }
-
-        interface IncrementOptions {
-            /**
-             * The number to increment by. Default 1.
-             */
-            by?: number;
-
-            transaction?: Transaction;
-        }
-
-        interface IndexOptions {
-            indicesType?: string;
-            indexType?: string;
-            indexName?: string;
-            parser?: any;
-        }
-
-        interface ProxyOptions {
-            /**
-             * An array of the events to proxy. Defaults to sql, error and success.
-             */
-            events: Array<string>;
-        }
-
-        interface AssociationOptions {
-            /**
-             * Set to true to run before-/afterDestroy hooks when an associated model is deleted because of a cascade. For
-             * example if User.hasOne(Profile, {onDelete: 'cascade', hooks:true}), the before-/afterDestroy hooks for profile
-             * will be called when a user is deleted. Otherwise the profile will be deleted without invoking any hooks.
-             * Default false.
-             */
-            hooks?: boolean;
-
-            /**
-             * The name of the table that is used to join source and target in n:m associations. Can also be a sequelize model
-             * if you want to define the junction table yourself and add extra attributes to it.
-             */
-            through?: any;
-
-            /**
-             * The alias of this model. If you create multiple associations between the same tables, you should provide an
-             * alias to be able to distinguish between them. If you provide an alias when creating the assocition, you should
-             * provide the same alias when eager loading and when getting assocated models. Defaults to the singularized
-             * version of target.name
-             */
-            as?: string;
-
-            /**
-             * The foreignKey can be either a string name of the foreign key in the target table,
-             * or can be an object defining the foreign key and its options. Note foreignKey is not fully
-             * typed since TypeScript does not support union types--it can be either a string or an
-             * options object. String name defaults to the name of source + primary key of source.
-             *
-             * @see ForeignKeyAttributeOptions.
-             */
-            foreignKey?: any;
-
-            /**
-             * What should happen when the referenced key is deleted. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
-             * NO ACTION. Default SET NULL.
-             */
-            onDelete?: string;
-
-            /**
-             * What should happen when the referenced key is updated. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
-             * NO ACTION. Default CASCADE.
-             */
-            onUpdate?: string;
-
-            /**
-             * Should on update and on delete constraints be enabled on the foreign key.
-             */
-            constraints?: boolean;
-        }
-
-        interface TriggerOptions {
-            insert?: Array<string>;
-            update?: Array<string>;
-            delete?: Array<string>;
-            truncate?: Array<string>;
-        }
-
-        interface TriggerParam {
-            type: string;
-            direction?: string;
-            name?: string;
-        }
-
-        interface SelectOptions {
-            limit?: number;
-            offset?: number;
-            attributes?: Array<any>;
-            hasIncludeWhere?: boolean;
-            hasIncludeRequired?: boolean;
-            hasMultiAssociation?: boolean;
-            tableAs?: string;
-            table?: string;
-            include?: Array<any>;
-            includeIgnoreAttributes?: boolean;
-            where?: any;
-            /**
-             * String field name or array of strings of field names.
-             */
-            group?: any;
-            having?: any;
-            order?: any;
-            lock?: string;
-        }
-
-        interface HashToWhereConditionsOption {
-            include?: boolean;
-            keysEscaped?: boolean;
-        }
-
-        interface ModelMangerGetDaoOptions {
-            attribute: string;
-        }
-
-        interface ModelManagerForEachDaoOptions {
-            /**
-             * Default true.
-             */
-            reverse: boolean;
-        }
-
-        interface MigratorOptions {
-            /**
-             * A flag that defines if the migrator should get instantiated or not..
-             */
-            force: boolean;
-        }
-
-        interface FindAndCountResult<T> {
-            /**
-             * The matching model instances.
-             */
-            rows?: Array<T>;
-
-            /**
-             * The total number of rows. This may be more than the rows returned if a limit and/or offset was supplied.
-             */
-            count?: number;
-        }
-
-        interface Col {
-            /**
-             * Column name.
-             */
-            col: string;
-        }
-
-        interface Cast {
-            /**
-             * The value to cast.
-             */
-            val: any;
-
-            /**
-             * The type to cast it to.
-             */
-            type: string;
-        }
-
-        interface Literal {
-            val: any;
-        }
-
-        interface And {
-            /**
-             * Each argument (string or object) will be joined by AND.
-             */
-            args: Array<any>;
-        }
-
-        interface Or {
-            /**
-             * Each argument (string or object) will be joined by OR.
-             */
-            args: Array<any>;
-        }
-
-        interface Where {
-            /**
-             * The attribute.
-             */
-            attribute: string;
-
-            /**
-             * The condition. Can be both a simply type, or a further condition (.or, .and, .literal etc.).
-             */
-            logic: any;
-        }
-
-        interface TransactionOptions {
-            /**
-             *
-             */
-            autocommit?: boolean;
-
-            /**
-             * One of: 'READ UNCOMMITTED', 'READ COMMITTED', 'REPEATABLE READ', 'SERIALIZABLE'. Default 'REPEATABLE READ'.
-             */
-            isolationLevel?: string;
-        }
-
-        interface QueryChainerRunSeriallyOptions {
-            /**
-             * If set to true, all pending emitters will be skipped if a previous emitter failed. Default false.
-             */
-            skipOnError: boolean;
-        }
-
-        interface CreateTableQueryOptions {
-            comment?: string;
-            uniqueKeys?: Array<any>;
-            charset?: string;
-        }
-
-        interface MigratorExecOptions {
-            before?: (migrator: Migrator) => void;
-            after?: (migrator: Migrator) => void;
-            success?: (migrator: Migrator) => void;
-        }
-
-        interface MigrationExecuteOptions {
-            method: string;
-        }
-
-        interface MigrationCompareOptions {
-            /**
-             * Default false.
-             */
-            withoutEquals: boolean;
-        }
-
-        interface Promise {
-            /**
-             * Listen for events, event emitter style. Mostly for backwards compatibility with EventEmitter.
-             *
-             * @param evt Event
-             * @param fct Handler
-             */
-            on(evt: string, fct: () => void): void;
-
-            /**
-             * Emit an event from the emitter.
-             *
-             * @param type  The type of event.
-             * @param value All other arguments will be passed to the event listeners.
-             */
-            emit(type: string, ...value: Array<any>): void;
-
-            /**
-             * Listen for success events.
-             */
-            success(onSuccess: () => void): Promise;
-
-            /**
-             * Alias for success(handler). Listen for success events.
-             */
-            ok(onSuccess: () => void): Promise;
-
-            /**
-             * Listen for error events.
-             *
-             * @param onError Error handler.
-             */
-            error(onError: (err?: Error) => void): Promise;
-
-            /**
-             * Alias for error(handler). Listen for error events.
-             *
-             * @param onError Error handler.
-             */
-            fail(onError: (err?: Error) => void): Promise;
-
-            /**
-             * Alias for error(handler). Listen for error events.
-             *
-             * @param onError Error handler.
-             */
-            failure(onError: (err?: Error) => void): Promise;
-
-            /**
-             * Listen for both success and error events..
-             */
-            done(handler: (err: Error, result?: any) => void): Promise;
-
-            /**
-             * Alias for done(handler). Listen for both success and error events..
-             */
-            complete(handler: (err: Error, result?: any) => void): Promise;
-
-            /**
-             * Attach a function that is called every time the function that created this emitter executes a query.
-             *
-             * @param onSQL
-             */
-            sql(onSQL: (sql: string) => void): Promise;
-
-            /**
-             * Proxy every event of this promise to another one.
-             *
-             * @param promise   The promise that should receive the events.
-             * @param options   Contains an array of the events to proxy. Defaults to sql, error and success
-             */
-            proxy(promise: Promise, options?: ProxyOptions): Promise;
-
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then(onFulfilled?: (result?: any) => void, onRejected?: (result?: any) => void): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then(onFulfilled?: (result?: any) => Promise, onRejected?: (result?: any) => Promise): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R>(onFulfilled?: (result?: any) => PromiseT<R>, onRejected?: (result?: any) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R>(onFulfilled?: (result?: any) => PromiseT<R>, onRejected?: (result?: any) => void): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R>(onFulfilled?: (result?: any) => void, onRejected?: (result?: any) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R1, R2>(onFulfilled?: (result?: any) => PromiseT<R1>, onRejected?: (result?: any) => PromiseT<R2>): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
-             * as opposed to then which will only recieve the first argument.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread(onFulfilled?: (...results: Array<any>) => Promise, onRejected?: (...results: Array<any>) => Promise): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
-             * as opposed to then which will only recieve the first argument.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread(onFulfilled?: (...results: Array<any>) => void, onRejected?: (...results: Array<any>) => void): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
-             * as opposed to then which will only recieve the first argument.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread(onFulfilled?: (...results: Array<any>) => Promise, onRejected?: (...results: Array<any>) => void): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
-             * as opposed to then which will only recieve the first argument.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread(onFulfilled?: (...results: Array<any>) => void, onRejected?: (...results: Array<any>) => Promise): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
-             * as opposed to then which will only recieve the first argument.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread<R>(onFulfilled?: (...results: Array<any>) => PromiseT<R>, onRejected?: (...results: Array<any>) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
-             * as opposed to then which will only recieve the first argument.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread<R>(onFulfilled?: (...results: Array<any>) => void, onRejected?: (...results: Array<any>) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
-             * as opposed to then which will only recieve the first argument.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread<R>(onFulfilled?: (...results: Array<any>) => PromiseT<R>, onRejected?: (...results: Array<any>) => void): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
-             * as opposed to then which will only recieve the first argument.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread<R1, R2>(onFulfilled?: (...results: Array<any>) => PromiseT<R1>, onRejected?: (...results: Array<any>) => PromiseT<R2>): Promise;
-
-            /**
-             * Shorthand for then(null, onRejected)
-             */
-            catch(onRejected: (result?: any) => Promise): Promise;
-
-            /**
-             * Shorthand for then(null, onRejected)
-             */
-            catch<R>(onRejected: (result?: any) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Shorthand for then(null, onRejected)
-             */
-            catch(onRejected: (result?: any) => void): Promise;
-        }
-
-        interface PromiseT<T> extends Promise {
-            /**
-             * Listen for events, event emitter style. Mostly for backwards compatibility with EventEmitter.
-             *
-             * @param evt Event
-             * @param fct Handler
-             */
-            on(evt: string, fct: (t: T) => void): void;
-
-            /**
-             * Emit an event from the emitter.
-             *
-             * @param type  The type of event.
-             * @param value All other arguments will be passed to the event listeners.
-             */
-            emit(type: string, ...value: Array<T>): void;
-
-            /**
-             * Listen for success events.
-             */
-            success(onSuccess: (t: T) => void): PromiseT<T>;
-
-            /**
-             * Alias for success(handler). Listen for success events.
-             */
-            ok(onSuccess: (t: T) => void): PromiseT<T>;
-
-            /**
-             * Listen for both success and error events..
-             */
-            done(handler: (err: Error, result: T) => void): PromiseT<T>;
-
-            /**
-             * Alias for done(handler). Listen for both success and error events..
-             */
-            complete(handler: (err: Error, result: T) => void): PromiseT<T>;
-
-            /**
-             * Attach a function that is called every time the function that created this emitter executes a query.
-             *
-             * @param onSQL
-             */
-            sql(onSQL: (sql: string) => void): PromiseT<T>;
-
-            /**
-             * Proxy every event of this promise to another one.
-             *
-             * @param promise   The promise that should receive the events.
-             * @param options   Contains an array of the events to proxy. Defaults to sql, error and success
-             */
-            proxy(promise: PromiseT<T>, options?: ProxyOptions): PromiseT<T>;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then(onFulfilled?: (result?: T) => void, onRejected?: (result?: T) => void): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then(onFulfilled?: (result?: T) => Promise, onRejected?: (result?: T) => Promise): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R>(onFulfilled?: (result?: T) => PromiseT<R>, onRejected?: (result?: T) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R>(onFulfilled?: (result?: T) => PromiseT<R>, onRejected?: (result?: T) => void): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R>(onFulfilled?: (result?: T) => void, onRejected?: (result?: T) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R1, R2>(onFulfilled?: (result?: T) => PromiseT<R1>, onRejected?: (result?: T) => PromiseT<R2>): Promise;
-
-            /**
-             * Shorthand for then(null, onRejected)
-             */
-            catch(onRejected: (result?: T) => Promise): Promise;
-
-            /**
-             * Shorthand for then(null, onRejected)
-             */
-            catch<R>(onRejected: (result?: T) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Shorthand for then(null, onRejected)
-             */
-            catch(onRejected: (result?: T) => void): Promise;
-        }
-
-        interface Utils {
-            _: Lodash;
-
-            /**
-             * Formats a string to parse and interpolate values into the string based on the optionally provided SQL dialect.
-             * @param arr       Array where first element is string with placeholders and remaining attributes are values to replace placeholders.
-             * @param dialect   SQL Dialect.
-             */
-            format(arr: Array<any>, dialect?: string): string;
-
-            /**
-             * Formats a SQL string replacing named placeholders with values from the parameters object with matching key names.
-             *
-             * @param sql           String to format.
-             * @param parameters    Key/value hash with values to replace in string.
-             * @param dialect       SQL Dialect
-             */
-            formatNamedParameters(sql: string, parameters: any, dialect?: string): string;
-
-            injectScope(scope: string, merge: boolean): any;
-
-            smartWhere(whereArg: any, dialect: string): any;
-
-            compileSmartWhere(obj: any, dialect: string): Array<any>;
-
-            getWhereLogic(logic: string, val?: any): string;
-
-            isHash(obj: any): boolean;
-
-            hasChanged(attrValue: any, value: any): boolean;
-
-            argsArePrimaryKeys(args: Array<any>, primaryKeys: any): boolean;
-
-            /**
-             * Consistently combines two table names such that the alphabetically first name always comes first when combined.
-             *
-             * @param table1
-             * @param table2
-             */
-            combineTableNames(table1: string, table2: string): string;
-
-            singularize(s: string, language?: string): string;
-
-            pluralize(s: string, language: string): string;
-
-            /**
-             * Same concept as _.merge, but don't overwrite properties that have already been assigned
-             */
-            mergeDefaults: typeof _.merge;
-
-            lowercaseFirst(str: string): string;
-
-            uppercaseFirst(str: string): string;
-
-            spliceStr(str: string, index: number, count: number, add: string): string;
-
-            camelize(str: string): string;
-
-            removeCommentsFromFunctionString(s: string): string;
-
-            toDefaultValue(value: any): any;
-
-            defaultValueSchemable(value: any): boolean;
-            setAttributes(hash: any, identifier: string, instance: any, prefix: string): any;
-            removeNullValuesFromHash(hash: any, omitNull: boolean, options: any): any;
-            firstValueOfHash(obj: any): any;
-            inherit(subClass: any, superClass: any): any;
-            stack(): string;
-            now(dialect: string): Date;
-
-            /**
-             * Runs provided function on next tick, depending on environment.
-             *
-             * @param f
-             */
-            tick(f: Function): void;
-
-            /**
-             * Surrounds a string with tick marks while removing all existing tick marks from the string.
-             * @param s         String to tick
-             * @param tickChar  Tick mark. Default `
-             */
-            addTicks(s: string, tickChar?: string): string;
-
-            removeTicks(s: string, tickChar?: string): string;
-
-            generateUUID(): string;
-
-            validateParameter(value: any, expectation: any): boolean;
-
-            CustomEventEmitter: EventEmitter;
-            Promise: Promise;
-            QueryChainer: QueryChainer;
-            Lingo: any; // external project, no definitions yet}
-        }
-
-        interface Lodash extends _.LoDashStatic {
-            camelizeIf(str: string, condition: boolean): string;
-            camelizeIf(str: string, condition: any): string;
-            underscoredIf(str: string, condition: boolean): string;
-            underscoredIf(str: string, condition: any): string;
-            /**
-             * * Returns an array with some falsy values removed. The values null, "", undefined and NaN are considered falsey.
-             *
-             * @param arr Array to compact.
-             */
-            compactLite<T>(arr: Array<T>): Array<T>;
-        }
-
-        interface MetaPojo {
-            from: string;
-            to: string;
-        }
-        interface MetaInstance extends MetaPojo, Model<MetaInstance, MetaPojo> {
-
-        }
-
-        interface DataTypeStringBase {
-            BINARY: DataTypeString;
-        }
-        interface DataTypeNumberBase {
-            UNSIGNED: boolean;
-            ZEROFILL: boolean;
-        }
-
-        interface DataTypeString extends DataTypeStringBase {
-        }
-        interface DataTypeChar extends DataTypeStringBase {
-        }
-        interface DataTypeInteger extends DataTypeNumberBase {
-        }
-        interface DataTypeBigInt extends DataTypeNumberBase {
-        }
-        interface DataTypeFloat extends DataTypeNumberBase {
-        }
-        interface DataTypeBlob {
-        }
-        interface DataTypeDecimal {
-            PRECISION: number;
-            SCALE: number;
-        }
-
-        interface DataTypeVirtual {
-        }
-        interface DataTypeEnum {
-            (...values: Array<string>): DataTypeEnum;
-        }
-        interface DataTypeArray {
-        }
-        interface DataTypeHstore {
-        }
-
-        interface DataTypes {
-            STRING: DataTypeString;
-            CHAR: DataTypeChar;
-            TEXT: string;
-            INTEGER: DataTypeInteger;
-            BIGINT: DataTypeBigInt;
-            DATE: string;
-            BOOLEAN: string;
-            FLOAT: DataTypeFloat;
-            NOW: string;
-            BLOB: DataTypeBlob;
-            DECIMAL: DataTypeDecimal;
-            UUID: string;
-            UUIDV1: string;
-            UUIDV4: string;
-            VIRTUAL: DataTypeVirtual;
-            NONE: DataTypeVirtual;
-            ENUM: DataTypeEnum;
-            ARRAY: DataTypeArray;
-            HSTORE: DataTypeHstore;
-        }
+        Validator: Validator;
+
+        QueryTypes: QueryTypes;
+
+        /**
+         * A general error class.
+         */
+        Error: Error;
+
+        /**
+         * Emitted when a validation fails.
+         *
+         * @see ValidationError
+         */
+        ValidationError: ValidationError;
+
+        /**
+         * Creates a object representing a database function. This can be used in search queries, both in where and order
+         * parts, and as default values in column definitions. If you want to refer to columns in your function, you should
+         * use sequelize.col, so that the columns are properly interpreted as columns and not a strings.
+         *
+         * @param fn The function you want to call.
+         * @param args All further arguments will be passed as arguments to the function.
+         */
+        fn(fn: string, ...args: Array<any>): any;
+
+        /**
+         * Creates a object representing a column in the DB. This is often useful in conjunction with sequelize.fn, since
+         * raw string arguments to fn will be escaped.
+         *
+         * @param col The name of the column
+         */
+        col(col: string): Col;
+
+        /**
+         * Creates a object representing a call to the cast function.
+         *
+         * @param val The value to cast.
+         * @param type The type to cast it to.
+         */
+        cast(val: any, type: string): Cast;
+
+        /**
+         * Creates a object representing a literal, i.e. something that will not be escaped.
+         *
+         * @param val Value to convert to a literal.
+         */
+        literal(val: any): Literal;
+
+        /**
+         * An AND query.
+         *
+         * @param args Each argument (string or object) will be joined by AND.
+         */
+        and(...args: Array<any>): And;
+
+        /**
+         * An OR query.
+         *
+         * @param args Each argument (string or object) will be joined by OR.
+         */
+        or(...args: Array<any>): Or;
+
+        /**
+         * A way of specifying attr = condition. Mostly used internally.
+         *
+         * @param attr          The attribute
+         * @param condition     The condition. Can be both a simply type, or a further condition (.or, .and, .literal etc.)
+         */
+        where(attr: string, condition: any): Where;
     }
 
-    var sequelize: sequelize.SequelizeStatic;
+    interface SequelizeStatic extends SequelizeStaticAndInstance, DataTypes {
+        /**
+         * Instantiate sequelize with name of database and username
+         * @param database database name
+         * @param username user name
+         */
+        new (database: string, username: string): Sequelize;
 
-    export = sequelize;
+        /**
+         * Instantiate sequelize with name of database, username and password
+         * @param database database name
+         * @param username user name
+         * @param password password
+         */
+        new (database: string, username: string, password: string): Sequelize;
+
+        /**
+         * Instantiate sequelize with name of database, username, password, and options.
+         * @param database database name
+         * @param username user name
+         * @param password password
+         * @param options options. @see Options
+         */
+        new (database: string, username: string, password: string, options: Options): Sequelize;
+
+        /**
+         * Instantiate sequelize with name of database, username, and options.
+         *
+         * @param database database name
+         * @param username user name
+         * @param options options. @see Options
+         */
+        new (database: string, username: string, options: Options): Sequelize;
+
+        /**
+         * Instantiate sequlize with an URI
+         * @param connectionString A full database URI
+         * @param options Options for sequelize. @see Options
+         */
+        new (connectionString: string, options?: Options): Sequelize;
+    }
+
+    interface Sequelize extends SequelizeStaticAndInstance {
+        /**
+         * Sequelize configuration (undocumented).
+         */
+        config: Config;
+
+        /**
+         * Sequelize options (undocumented).
+         */
+        options: Options;
+
+        /**
+         * Models are stored here under the name given to sequelize.define
+         */
+        models: any;
+        modelManager: ModelManager;
+        daoFactoryManager: ModelManager;
+        transactionManager: TransactionManager;
+        importCache: any;
+
+        /**
+         * A reference to the sequelize transaction class. Use this to access isolationLevels when creating a transaction.
+         *
+         * @see Transaction
+         */
+        Transaction: TransactionStatic;
+
+        /**
+         * Returns the specified dialect.
+         */
+        getDialect(): string;
+
+        /**
+         * Returns the singleton instance of QueryInterface.
+         */
+        getQueryInterface(): QueryInterface;
+
+        /**
+         * Returns the singleton instance of Migrator.
+         * @param options Migration options
+         * @param force A flag that defines if the migrator should get instantiated or not.
+         */
+        getMigrator(options?: MigratorOptions, force?: boolean): Migrator;
+
+        /**
+         * Define a new model, representing a table in the DB.
+         *
+         * @param daoName The name of the entity (table). Typically specified in singular form.
+         * @param attributes A hash of attributes to define. Each attribute can be either a string name for the attribute
+         *                   or can be an object defining the attribute and its options. Note attributes is not fully
+         *                   typed since TypeScript does not support union types--it can be either a string or an
+         *                   options object. @see AttributeOptions.
+         * @param options Table options. @see DefineOptions.
+         */
+        define<TInstance, TPojo>(daoName: string, attributes: any, options?: DefineOptions): Model<TInstance, TPojo>;
+
+        /**
+         * Fetch a DAO factory which is already defined.
+         *
+         * @param daoName The name of a model defined with Sequelize.define.
+         */
+        model<TInstance, TPojo>(daoName: string): Model<TInstance, TPojo>;
+
+        /**
+         * Checks whether a model with the given name is defined.
+         *
+         * @param daoName The name of a model defined with Sequelize.define.
+         */
+        isDefined(daoName: string): boolean;
+
+        /**
+         * Imports a model defined in another file.
+         *
+         * @param path  The path to the file that holds the model you want to import. If the part is relative, it will be
+         *              resolved relatively to the calling file
+         */
+        import<TInstance, TPojo>(path: string): Model<TInstance, TPojo>;
+
+        /**
+         * Execute a query on the DB, with the possibility to bypass all the sequelize goodness.
+         *
+         * @param sql           SQL statement to execute.
+         *
+         * @param callee        If callee is provided, the selected data will be used to build an instance of the DAO represented
+         *                      by the factory. Equivalent to calling Model.build with the values provided by the query.
+         *
+         * @param options       Query options.
+         *
+         * @param replacements  Either an object of named parameter replacements in the format :param or an array of
+         *                      unnamed replacements to replace ? in your SQL.
+         */
+        query(sql: string, callee?: Model<any, any>, options?: QueryOptions, replacements?: any): EventEmitter;
+
+        query<TInstance, TPojo>(sql: string, callee?: Model<TInstance, TPojo>, options?: QueryOptions): EventEmitterT<Model<TInstance, TPojo>>;
+
+        /**
+         * Create a new database schema.
+         *
+         * @param schema Name of the schema.
+         */
+        createSchema(schema: string): EventEmitter;
+
+        /**
+         * Show all defined schemas.
+         */
+        showAllSchemas(): EventEmitter;
+
+        /**
+         * Drop a single schema.
+         *
+         * @param schema Name of the schema.
+         */
+        dropSchema(schema: string): EventEmitter;
+
+        /**
+         * Drop all schemas.
+         */
+        dropAllSchemas(): EventEmitter;
+
+        /**
+         * Sync all defined DAOs to the DB.
+         *
+         * @param options Options.
+         */
+        sync(options?: SyncOptions): EventEmitter;
+
+        /**
+         * Drop all tables defined through this sequelize instance. This is done by calling Model.drop on each model.
+         *
+         * @param options The options passed to each call to Model.drop.
+         */
+        drop(options: DropOptions): EventEmitter;
+
+        /**
+         * Test the connection by trying to authenticate. Alias for 'validate'.
+         */
+        authenticate(): EventEmitter;
+
+        /**
+         * Alias for authenticate(). Test the connection by trying to authenticate. Alias for 'validate'.
+         */
+        validate(): EventEmitter;
+
+        /**
+         * !! DEPRECATED : When passing a callback to a transaction a promise chain is expected in return,
+         * the transaction will be committed or rejected based on the promise chain returned to the callback.
+         *
+         * Start a transaction. When using transactions, you should pass the transaction in the options argument in order
+         * for the query to happen under that transaction.
+         *
+         * @param callback  Called when the transaction has been set up and is ready for use. Callback takes transaction
+         *                  argument (overload available for error and transaction arguments too).
+         */
+        transaction(callback: (transaction: Transaction) => boolean): Promise;
+
+        /**
+         * Start a transaction. When using transactions, you should pass the transaction in the options argument in order
+         * for the query to happen under that transaction.
+         *
+         * @param options   Transaction options.
+         * @param callback  Called when the transaction has been set up and is ready for use. Callback takes transaction
+         *                  argument (overload available for error and transaction arguments too).
+         */
+        transaction(options?: TransactionOptions, callback?: (transaction: Transaction) => void): PromiseT<Transaction>;
+
+        close(): void;
+    }
+
+    interface Config {
+        database?: string;
+        username?: string;
+        password?: string;
+        host?: string;
+        port?: number;
+        pool?: PoolOptions;
+        protocol?: string;
+        queue?: boolean;
+        native?: boolean;
+        ssl?: boolean;
+        replication?: ReplicationOptions;
+        dialectModulePath?: string;
+        maxConcurrentQueries?: number;
+        dialectOptions?: any;
+    }
+
+    interface Model<TInstance, TPojo> extends Hooks, Associations {
+        /**
+         * A reference to the sequelize instance.
+         */
+        sequelize: Sequelize;
+
+        /**
+         * The name of the model, typically singular.
+         */
+        name: string;
+
+        /**
+         * The name of the underlying database table, typically plural.
+         */
+        tableName: string;
+
+        options: DefineOptions;
+        attributes: any;
+        rawAttributes: any;
+        modelManager: ModelManager;
+        daoFactoryManager: ModelManager;
+        associations: any;
+        scopeObj: any;
+
+        /**
+         * Sync this Model to the DB, that is create the table. Upon success, the callback will be called with the model
+         * instance (this).
+         */
+        sync(options?: SyncOptions): PromiseT<Model<TInstance, TPojo>>;
+
+        /**
+         * Drop the table represented by this Model.
+         *
+         * @param options
+         */
+        drop(options?: DropOptions): Promise;
+
+        /**
+         * Apply a schema to this model. For postgres, this will actually place the schema in front of the table name -
+         * "schema"."tableName", while the schema will be prepended to the table name for mysql and sqlite -
+         * 'schema.tablename'.
+         *
+         * @param schema    The name of the schema.
+         * @param options   Schema options.
+         */
+        schema(schema: string, options?: SchemaOptions): Model<TInstance, TPojo>;
+
+        /**
+         * Get the tablename of the model, taking schema into account. The method will return The name as a string if the
+         * model has no schema, or an object with tableName, schema and delimiter properties.
+         */
+        getTableName(): any;
+
+        /**
+         * Apply a scope created in define to the model.
+         *
+         * @param options The scope(s) to apply. Scopes can either be passed as consecutive arguments, or as an array of
+         *                arguments. To apply simple scopes, pass them as strings. For scope function, pass an object,
+         *                with a method property. The value can either be a string, if the method does not take any
+         *                arguments, or an array, where the first element is the name of the method, and consecutive
+         *                elements are arguments to that method. Pass null to remove all scopes, including the default.
+         */
+        scope(options: any): Model<TInstance, TPojo>;
+
+        /**
+         * Search for multiple instances..
+         *
+         * @param options       A hash of options to describe the scope of the search.
+         * @param queryOptions  Set the query options, e.g. raw, specifying that you want raw data instead of built
+         *                      Instances. See sequelize.query for options.
+         */
+        findAll(options?: FindOptions, queryOptions?: QueryOptions): PromiseT<Array<TInstance>>;
+
+        /**
+         * Search for a single instance. This applies LIMIT 1, so the listener will always be called with a single instance.
+         *
+         * @param options       A hash of options to describe the scope of the search.
+         * @param queryOptions  Set the query options, e.g. raw, specifying that you want raw data instead of built
+         *                      Instances. See sequelize.query for options
+         */
+        find(options?: FindOptions, queryOptions?: QueryOptions): PromiseT<TInstance>;
+
+        /**
+         * Search for a single instance. This applies LIMIT 1, so the listener will always be called with a single instance.
+         *
+         * @param options       A number to search by id.
+         * @param queryOptions  Set the query options, e.g. raw, specifying that you want raw data instead of built
+         *                      Instances. See sequelize.query for options
+         */
+        find(id?: number, queryOptions?: QueryOptions): PromiseT<TInstance>;
+
+        /**
+         * Run an aggregation method on the specified field.
+         *
+         * @param field                 The field to aggregate over. Can be a field name or *.
+         * @param aggregateFunction     The function to use for aggregation, e.g. sum, max etc.
+         * @param options               Query options, particularly options.dataType.
+         */
+        aggregate<V>(field: string, aggregateFunction: string, options: FindOptions): PromiseT<V>;
+
+        /**
+         * Count the number of records matching the provided where clause.
+         *
+         * @param options Conditions and options for the query.
+         */
+        count(options?: FindOptions): PromiseT<number>;
+
+        /**
+         * Find all the rows matching your query, within a specified offset / limit, and get the total number of rows
+         * matching your query. This is very usefull for paging.
+         *
+         * @param findOptions   Filtering options
+         * @param queryOptions  Query options
+         */
+        findAndCountAll(findOptions?: FindOptions, queryOptions?: QueryOptions): PromiseT<FindAndCountResult<TInstance>>;
+
+        /**
+         * Find the maximum value of field.
+         *
+         * @param field
+         * @param options
+         */
+        max<V>(field: string, options?: FindOptions): PromiseT<V>;
+
+        /**
+         * Find the minimum value of field.
+         *
+         * @param field
+         * @param options
+         */
+        min<V>(field: string, options?: FindOptions): PromiseT<V>;
+
+        /**
+         * Find the sum of field.
+         *
+         * @param field
+         * @param options
+         */
+        sum(field: string, options?: FindOptions): PromiseT<number>;
+
+        /**
+         * Builds a new model instance. Values is an object of key value pairs, must be defined but can be empty.
+         *
+         * @param values    any from which to build entity instance.
+         * @param options   any construction options.
+         */
+        build(values: TPojo, options?: BuildOptions): TInstance;
+
+        /**
+         * Builds a new model instance and calls save on it..
+         *
+         * @param values
+         * @param options
+         */
+        create(values: TPojo, options?: CopyOptions): PromiseT<TInstance>;
+
+        /**
+         * Find a row that matches the query, or build (but don't save) the row if none is found. The successfull result
+         * of the promise will be (instance, initialized) - Make sure to use .spread().
+         *
+         * @param where     A hash of search attributes. Note that this method differs from finders, in that the syntax
+         *                  is { attr1: 42 } and NOT { where: { attr1: 42}}. This may be subject to change in 2.0
+         * @param defaults  Default values to use if building a new instance
+         * @param options   Options passed to the find call
+         */
+        findOrInitialize(where: any, defaults?: TPojo, options?: QueryOptions): PromiseT<TInstance>;
+
+        /**
+         * Find a row that matches the query, or build and save the row if none is found The successfull result of the
+         * promise will be (instance, created) - Make sure to use .spread().
+         *
+         * @param where     A hash of search attributes. Note that this method differs from finders, in that the syntax is
+         *                  { attr1: 42 } and NOT { where: { attr1: 42}}. This is subject to change in 2.0
+         * @param defaults  Default values to use if creating a new instance
+         * @param options   Options passed to the find and create calls.
+         */
+        findOrCreate(where: any, defaults?: TPojo, options?: FindOrCreateOptions): PromiseT<TInstance>;
+
+        /**
+         * Create and insert multiple instances in bulk.
+         *
+         * @param records   List of objects (key/value pairs) to create instances from.
+         * @param options
+         */
+        bulkCreate(records: Array<TPojo>, options?: BulkCreateOptions): PromiseT<Array<TInstance>>;
+
+        /**
+         * Delete multiple instances.
+         */
+        destroy(where?: any, options?: DestroyOptions): Promise;
+
+        /**
+         * Update multiple instances that match the where options.
+         *
+         * @param attrValueHash A hash of fields to change and their new values
+         * @param where         Options to describe the scope of the search. Note that these options are not wrapped in a
+         *                      { where: ... } is in find / findAll calls etc. This is probably due to change in 2.0.
+         */
+        update(attrValueHash: TPojo, where: any, options?: UpdateOptions): Promise;
+
+        /**
+         * Run a describe query on the table. The result will be return to the listener as a hash of attributes and their
+         * types.
+         */
+        describe(): PromiseT<any>;
+
+        /**
+         *  A proxy to the node-sql query builder, which allows you to build your query through a chain of method calls.
+         *  The returned instance already has all the fields property populated with the field of the model.
+         */
+        dataset(): any;
+    }
+
+    interface Instance<TInstance, TPojo> {
+        /**
+         * Returns true if this instance has not yet been persisted to the database.
+         */
+        isNewRecord: boolean;
+
+        /**
+         * Returns the Model the instance was created from.
+         */
+        Model: Model<TInstance, TPojo>;
+
+        /**
+         * A reference to the sequelize instance.
+         */
+        sequelize: Sequelize;
+
+        /**
+         * If timestamps and paranoid are enabled, returns whether the deletedAt timestamp of this instance is set.
+         * Otherwise, always returns false.
+         */
+        isDeleted: boolean;
+
+        /**
+         * Get the values of this Instance. Proxies to this.get.
+         */
+        values: TPojo;
+
+        /**
+         * A getter for this.changed(). Returns true if any keys have changed.
+         */
+        isDirty: boolean;
+
+        /**
+         *  Get the values of the primary keys of this instance.
+         */
+        primaryKeyValues: TPojo;
+
+        /**
+         * Get the value of the underlying data value.
+         *
+         * @param key   Field to retrieve.
+         */
+        getDataValue(key: string): any;
+
+        /**
+         * Update the underlying data value.
+         *
+         * @param key   Field to set.
+         * @param value Value to set.
+         */
+        setDataValue(key: string, value: any): void;
+
+        /**
+         * Retrieves the value for the key when specified. If no key is given, returns all values of the instance, also
+         * invoking virtual getters.
+         */
+        get(key?: string): any;
+
+        /**
+         * Set is used to update values on the instance (the sequelize representation of the instance that is, remember
+         * that nothing will be persisted before you actually call save).
+         */
+        set(key: string, value: any, options?: SetOptions): void;
+
+        /**
+         * If changed is called with a string it will return a boolean indicating whether the value of that key in
+         * dataValues is different from the value in _previousDataValues. If changed is called without an argument, it will
+         * return an array of keys that have changed.
+         */
+        changed(key: string): any;
+
+        /**
+           * If changed is called with a string it will return a boolean indicating whether the value of that key in
+           * dataValues is different from the value in _previousDataValues. If changed is called without an argument, it will
+           * return an array of keys that have changed.
+           */
+        changed(): Array<string>;
+
+        /**
+         * Returns the previous value for key from _previousDataValues.
+         */
+        previous(key: string): any;
+
+        /**
+         * Validate this instance, and if the validation passes, persist it to the database.
+         */
+        save(fields?: Array<string>, options?: SaveOptions): PromiseT<TInstance>;
+
+        /**
+         * Refresh the current instance in-place, i.e. update the object with current data from the DB and return the same
+         * object. This is different from doing a find(Instance.id), because that would create and return a new instance.
+         * With this method, all references to the Instance are updated with the new data and no new objects are created.
+         */
+        reload(options?: FindOptions): PromiseT<TInstance>;
+
+        /**
+         * Validate the attribute of this instance according to validation rules set in the model definition.
+         */
+        validate(options?: ValidateOptions): PromiseT<Error>;
+
+        /**
+         * This is the same as calling setAttributes, then calling save.
+         */
+        updateAttributes(updates: TPojo, options: SaveOptions): PromiseT<TInstance>;
+
+        /**
+         * Destroy the row corresponding to this instance. Depending on your setting for paranoid, the row will either be
+         * completely deleted, or have its deletedAt timestamp set to the current time.
+         *
+         * @param options   Allows caller to specify if delete should be forced.
+         */
+        destroy(options?: DestroyInstanceOptions): Promise;
+
+        /**
+         * Increment the value of one or more columns. This is done in the database, which means it does not use the
+         * values currently stored on the Instance.
+         *
+         * @param fields    If a string is provided, that column is incremented by the value of by given in options. If an
+         *                  array is provided, the same is true for each column. If and object is provided, each column is
+         *                  incremented by the value given.
+         * @param options   Increment options.
+         */
+        increment(fields: any, options?: IncrementOptions): Promise;
+
+        /**
+         * Decrement the value of one or more columns. This is done in the database, which means it does not use the
+         * values currently stored on the Instance.
+         *
+         * @param fields    If a string is provided, that column is decremented by the value of by given in options. If an
+         *                  array is provided, the same is true for each column. If and object is provided, each column is
+         *                  decremented by the value given.
+         * @param options   Decrement options.
+         */
+        decrement(fields: any, options?: IncrementOptions): Promise;
+
+        /**
+         * Check whether all values of this and other Instance are the same.
+         */
+        equal(other: TInstance): boolean;
+
+        /**
+         * Check if this is eqaul to one of others by calling equals.
+         *
+         * @param others    Other instances to compare to.
+         */
+        equalsOneOf(others: Array<TInstance>): boolean;
+
+        /**
+         * Convert the instance to a JSON representation. Proxies to calling get with no keys. This means get all values
+         * gotten from the DB, and apply all custom getters.
+         */
+        toJSON(): TPojo;
+    }
+
+    interface Transaction extends TransactionStatic {
+        /**
+         * Commit the transaction.
+         */
+        commit(): Transaction;
+
+        /**
+         * Rollback (abort) the transaction.
+         */
+        rollback(): Transaction;
+    }
+
+    interface TransactionStatic {
+        /**
+         * The possible isolation levels to use when starting a transaction
+         */
+        ISOLATION_LEVELS: TransactionIsolationLevels;
+
+        /**
+         * Possible options for row locking. Used in conjuction with find calls.
+         */
+        LOCK: TransactionLocks;
+    }
+
+    interface TransactionIsolationLevels {
+        READ_UNCOMMITTED: string;// "READ UNCOMMITTED"
+        READ_COMMITTED: string;  // "READ COMMITTED"
+        REPEATABLE_READ: string; // "REPEATABLE READ"
+        SERIALIZABLE: string;    // "SERIALIZABLE"
+    }
+
+    interface TransactionLocks {
+        UPDATE: string;  // UPDATE
+        SHARE: string;   // SHARE
+    }
+
+    interface Hooks {
+
+        /**
+         * Add a named hook to the model.
+         *
+         * @param hooktype
+         */
+        addHook(hooktype: string, name: string, fn: (...args: Array<any>) => void): boolean;
+
+        /**
+         * Add a hook to the model.
+         *
+         * @param hooktype
+         */
+        addHook(hooktype: string, fn: (...args: Array<any>) => void): boolean;
+
+        /**
+         * A named hook that is run before validation.
+         */
+        beforeValidate<T>(name: string, validator: (dao: T, callback: (err?: Error) => void) => void): void;
+
+        /**
+         * A hook that is run before validation.
+         */
+        beforeValidate<T>(validator: (dao: T, callback: (err?: Error) => void) => void): void;
+
+        /**
+         * A named hook that is run before validation.
+         */
+        afterValidate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A hook that is run before validation.
+         */
+        afterValidate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A named hook that is run before creating a single instance.
+         */
+        beforeCreate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A hook that is run before creating a single instance.
+         */
+        beforeCreate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A named hook that is run after creating a single instance.
+         */
+        afterCreate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A hook that is run after creating a single instance.
+         */
+        afterCreate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A named hook that is run before destroying a single instance.
+         */
+        beforeDestroy<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A hook that is run before destroying a single instance.
+         */
+        beforeDestroy<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A named hook that is run after destroying a single instance.
+         */
+        afterDestroy<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A hook that is run after destroying a single instance.
+         */
+        afterDestroy<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A named hook that is run before updating a single instance.
+         */
+        beforeUpdate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A hook that is run before updating a single instance.
+         */
+        beforeUpdate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A named hook that is run after updating a single instance.
+         */
+        afterUpdate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A hook that is run after updating a single instance.
+         */
+        afterUpdate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A named hook that is run before creating instances in bulk.
+         */
+        beforeBulkCreate<T>(name: string, validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A hook that is run before creating instances in bulk.
+         */
+        beforeBulkCreate<T>(validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A named hook that is run after creating instances in bulk.
+         */
+        afterBulkCreate<T>(name: string, validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A hook that is run after creating instances in bulk.
+         */
+        afterBulkCreate<T>(validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A named hook that is run before destroying instances in bulk.
+         */
+        beforeBulkDestroy<T>(name: string, validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
+
+        /**
+         * A hook that is run before destroying instances in bulk.
+         */
+        beforeBulkDestroy<T>(validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
+
+        /**
+         * A named hook that is run after destroying instances in bulk.
+         */
+        afterBulkDestroy<T>(name: string, validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
+
+        /**
+         * A hook that is run after destroying instances in bulk.
+         */
+        afterBulkDestroy<T>(validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
+
+        /**
+         * A named hook that is run before updating instances in bulk.
+         */
+        beforeBulkUpdate<T>(name: string, validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
+
+        /**
+         * A hook that is run before updating instances in bulk.
+         */
+        beforeBulkUpdate<T>(validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
+
+        /**
+         * A named hook that is run after updating instances in bulk.
+         */
+        afterBulkUpdate<T>(name: string, validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
+
+        /**
+         * A hook that is run after updating instances in bulk.
+         */
+        afterBulkUpdate<T>(validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
+    }
+
+    interface Associations {
+        /**
+         * Creates an association between this (the source) and the provided target. The foreign key is added on the target.
+         *
+         * @param target
+         * @param options
+         */
+        hasOne<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
+
+        /**
+         * Creates an association between this (the source) and the provided target. The foreign key is added on the source.
+         *
+         * @param target
+         * @param options
+         */
+        belongsTo<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
+
+        /**
+         * Creates an association to connect sources with multiple targets. Furthermore the targets can also have connections to multiple sources.
+         *
+         * @param target
+         * @param options
+         */
+        belongsToMany<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
+
+        /**
+         * Create an association that is either 1:m or n:m.
+         *
+         * @param target
+         * @param options
+         */
+        hasMany<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
+    }
+
+    /**
+     * Extension of external project that doesn't have definitions.
+     *
+     * See https://github.com/chriso/validator.js and https://github.com/sequelize/sequelize/blob/master/lib/instance-validator.js
+     */
+    interface Validator {
+
+    }
+
+    /**
+     * Custom class defined, but no extra methods or functionality even.
+     */
+    interface ValidationError extends Error {
+
+    }
+
+    interface QueryChainer {
+        /**
+         * Add an query to the chainer. This can be done in two ways - either by invoking the method like you would
+         * normally, and then adding the returned emitter to the chainer, or by passing the class that you want to call a
+         * method on, the name of the method, and its parameters to the chainer. The second form might sound a bit
+         * cumbersome, but it is used when you want to run queries in serial.
+         *
+         * @param emitterOrKlass
+         * @param method
+         * @param params
+         * @param options
+         */
+        add(emitterOrKlass: any, method?: string, params?: any, options?: any): QueryChainer;
+
+        /**
+         * Run the query chainer. In reality, this means, wait for all the added emitters to finish, since the queries
+         * began executing as soon as you invoked their methods.
+         */
+        run(): EventEmitter;
+
+        /**
+         * Run the chainer serially, so that each query waits for the previous one to finish before it starts.
+         *
+         * @param options @see QueryChainerRunSeriallyOptions
+         */
+        runSerially(options?: QueryChainerRunSeriallyOptions): EventEmitter;
+    }
+
+    interface QueryInterface {
+
+        /**
+         * Returns the dialect-specific sql generator.
+         */
+        QueryGenerator: QueryGenerator;
+
+        /**
+         * Queries the schema (table list).
+         *
+         * @param schema The schema to query. Applies only to Postgres.
+         */
+        createSchema(schema?: string): EventEmitter;
+
+        /**
+         * Drops the specified schema (table).
+         *
+         * @param schema The name of the table to drop.
+         */
+        dropSchema(schema: string): EventEmitter;
+
+        /**
+         * Drops all tables.
+         */
+        dropAllSchemas(): EventEmitter;
+
+        /**
+         * Queries all table names in the database.
+         *
+         * @param options
+         */
+        showAllSchemas(options?: QueryOptions): EventEmitter;
+
+        /**
+         * Creates a table with specified attributes.
+         * @param tableName     Name of table to create
+         * @param attributes    Hash of attributes, key is attribute name, value is data type
+         * @param options       Query options.
+         *
+         * @return The return type will be a Promise when dialect is Postgres and an EventEmitter for MySQL and SQLite.
+         */
+        createTable(tableName: string, attributes: any, options?: QueryOptions): any;
+
+        /**
+         * Drops the specified table.
+         *
+         * @param tableName Table name.
+         * @param options   Query options, particularly "force".
+         */
+        dropTable(tableName: string, options?: QueryOptions): EventEmitter;
+        dropAllTables(options?: QueryOptions): EventEmitter;
+        dropAllEnums(options?: QueryOptions): EventEmitter;
+        renameTable(before: string, after: string): EventEmitter;
+        showAllTables(options?: QueryOptions): EventEmitter;
+        describeTable(tableName: string, options?: QueryOptions): EventEmitter;
+        addColumn(tableName: string, attributeName: any, dataTypeOrOptions?: any): EventEmitter;
+        removeColumn(tableName: string, attributeName: string): EventEmitter;
+        changeColumn(tableName: string, attributeName: string, dataTypeOrOptions: any): EventEmitter;
+        renameColumn(tableName: string, attrNameBefore: string, attrNameAfter: string): EventEmitter;
+        addIndex(tableName: string, attributes: Array<any>, options?: QueryOptions): EventEmitter;
+        showIndex(tableName: string, options?: QueryOptions): EventEmitter;
+        getForeignKeysForTables(tableNames: Array<string>): EventEmitter;
+        removeIndex(tableName: string, attributes: Array<string>): EventEmitter;
+        removeIndex(tableName: string, indexName: string): EventEmitter;
+        insert<TModel>(dao: TModel, tableName: string, values: any, options?: QueryOptions): EventEmitter;
+        /**
+         * Inserts several records into the specified table.
+         * @param tableName     Table to insert into.
+         * @param records       Array of key/value pairs to insert as records.
+         * @param options       Query options
+         * @param attributes    For Postgres only, used to identify if an attribute is auto-increment and thus handled specially.
+         */
+        bulkInsert(tableName: string, records: Array<any>, options?: QueryOptions, attributes?: any): EventEmitter;
+
+        update<TModel>(dao: TModel, tableName: string, values: Array<any>, where: any, options?: QueryOptions): EventEmitter;
+        bulkUpdate(tableName: string, values: Array<any>, where: any, options?: QueryOptions, attributes?: any): EventEmitter;
+        delete<TModel>(dao: TModel, tableName: string, where: any, options?: QueryOptions): EventEmitter;
+        bulkDelete(tableName: string, where: any, options?: QueryOptions): EventEmitter;
+        bulkDelete<TModel>(tableName: string, where: any, options: QueryOptions, model: TModel): EventEmitter;
+        select<TModel>(factory: TModel, tableName: string, scope?: any, queryOptions?: QueryOptions): EventEmitter;
+        increment<TModel>(dao: TModel, tableName: string, values: Array<any>, where: any, options?: QueryOptions): EventEmitter;
+        rawSelect<TModel>(tableName: string, options: QueryOptions, attributeSelector: string, model: TModel): EventEmitter;
+        /**
+         * Postgres only. Creates a trigger on specified table to call the specified function with supplied parameters.
+         *
+         * @param tableName
+         * @param triggerName
+         * @param timingType
+         * @param fireOnArray
+         * @param functionName
+         * @param functionParams
+         * @param optionsArray
+         */
+        createTrigger(tableName: string, triggerName: string, timingType: string, fireOnArray: Array<any>, functionName: string, functionParams: Array<any>, optionsArray: Array<string>): EventEmitter;
+        /**
+         * Postgres only. Drops the specified trigger.
+         *
+         * @param tableName
+         * @param triggerName
+         */
+        dropTrigger(tableName: string, triggerName: string): EventEmitter;
+        renameTrigger(tableName: string, oldTriggerName: string, newTriggerName: string): EventEmitter;
+        createFunction(functionName: string, params: Array<any>, returnType: string, language: string, body: string, options?: QueryOptions): EventEmitter;
+        dropFunction(functionName: string, params: Array<any>): EventEmitter;
+        renameFunction(oldFunctionName: string, params: Array<any>, newFunctionName: string): EventEmitter;
+        /**
+         * Escape an identifier (e.g. a table or attribute name). If force is true,
+         * the identifier will be quoted even if the `quoteIdentifiers` option is
+         * false.
+         */
+        quoteIdentifier(identifier: string, force: boolean): EventEmitter;
+        quoteTable(tableName: string): EventEmitter;
+        quoteIdentifiers(identifiers: string, force: boolean): EventEmitter;
+        escape(value: string): EventEmitter;
+        setAutocommit(transaction: Transaction, value: boolean): EventEmitter;
+        setIsolationLevel(transaction: Transaction, value: string): EventEmitter;
+        startTransaction(transaction: Transaction, options?: QueryOptions): EventEmitter;
+        commitTransaction(transaction: Transaction, options?: QueryOptions): EventEmitter;
+        rollbackTransaction(transaction: Transaction, options?: QueryOptions): EventEmitter;
+    }
+
+    interface QueryGenerator {
+        createSchema(schemaName: string): string;
+        dropSchema(schemaName: string): string;
+        showSchemasQuery(): string;
+        addSchema<TInstance, TPojo>(param: Model<TInstance, TPojo>): Schema;
+        createTableQuery(tableName: string, attributes: Array<any>, options?: CreateTableQueryOptions): string;
+        describeTableQuery(tableName: string, schema: string, schemaDelimiter: string): string;
+        dropTableQuery(tableName: string, options?: { cascade: string }): string;
+        renameTableQuery(before: string, after: string): string;
+        showTablesQuery(): string;
+        addColumnQuery(tableName: string, attributes: any): string;
+        removeColumnQuery(tableName: string, attributeName: string): string;
+        changeColumnQuery(tableName: string, attributes: any): string;
+        renameColumnQuery(tableName: string, attrNameBefore: string, attrNameAfter: string): string;
+        insertQuery(table: string, valueHash: any, modelAttributes: any): string;
+        bulkInsertQuery(tableName: string, attrValueHashes: any): string;
+        updateQuery(tableName: string, attrValueHash: any, where: any, options: InsertOptions, attributes: any): string;
+        deleteQuery(tableName: string, where: any, options: DestroyOptions): string;
+        deleteQuery<TInstance, TPojo>(tableName: string, where: any, options: DestroyOptions, model: Model<TInstance, TPojo>): string;
+        /**
+         * Creates a query to increment a value. Note "options" here is an additional hash of values to update.
+         *
+         * @param tableName
+         * @param attrValueHash
+         * @param where
+         * @param options
+         */
+        incrementQuery(tableName: string, attrValueHash: any, where: any, options?: any): string;
+        addIndexQuery(tableName: string, attributes: Array<any>, options?: IndexOptions): string;
+        /**
+         * Return indices for a table. Not options may be passed but is not used, so can be anything.
+         * @param tableName
+         * @param options
+         */
+        showIndexQuery(tableName: string, options?: any): string; // options is actually not used
+        removeIndexQuery(tableName: string, indexNameOrAttributes: string): string;
+        removeIndexQuery(tableName: string, indexNameOrAttributes: Array<string>): string;
+        attributesToSQL(attributes: Array<any>): string;
+        findAutoIncrementField<TInstance, TPojo>(factory: Model<TInstance, TPojo>): Array<string>;
+        quoteTable(param: any, as: boolean): string;
+        quote(obj: any, parent: any, force: boolean): string;
+        createTrigger(tableName: string, triggerName: string, timingType: string, fireOnArray: TriggerOptions, functionName: string, functionParams: Array<TriggerParam>): string;
+        dropTrigger(tableName: string, triggerName: string): string;
+        renameTrigger(tableName: string, oldTriggerName: string, newTriggerName: string): string;
+        createFunction(functionName: string, params: Array<TriggerParam>, returnType: string, language: string, body: string, options?: Array<string>): string;
+        dropFunction(functionName: string, params: Array<TriggerParam>): string;
+        renameFunction(oldFunctionName: string, params: Array<TriggerParam>, newFunctionName: string): string;
+        quoteIdentifier(identifier: string, force?: boolean): string;
+        quoteIdentifiers(identifiers: string, force?: boolean): string;
+        /**
+         * Not documented, and reading through the code, I'm not sure what all the options available are for value/field.
+         *
+         * @param value
+         * @param field
+         */
+        escape(value: any, field: any): string;
+        getForeignKeysQuery(tableName: string, schemaName: string): string;
+        dropForeignKeyQuery(tableName: string, foreignKey: string): string;
+        selectQuery<TInstance, TPojo>(tableName: string, options: SelectOptions, model?: Model<TInstance, TPojo>): string;
+        selectQuery<TInstance, TPojo>(tableName: Array<string>, options: SelectOptions, model?: Model<TInstance, TPojo>): string;
+        selectQuery<TInstance, TPojo>(tableName: Array<Array<string>>, options: SelectOptions, model?: Model<TInstance, TPojo>): string;
+        setAutocommitQuery(value: boolean): string;
+        setIsolationLevelQuery(value: string): string;
+        /**
+         * Returns start transaction query. Options is not used.
+         * @param options
+         */
+        startTransactionQuery(options?: any): string;
+        /**
+         * Returns start transaction query. Options is not used.
+         * @param options
+         */
+        commitTransactionQuery(options?: any): string;
+        /**
+         * Returns start transaction query. Options is not used.
+         * @param options
+         */
+        rollbackTransactionQuery(options?: any): string;
+        addLimitAndOffset(options: SelectOptions, query?: string): string;
+        getWhereConditions<TInstance, TPojo>(smth: any, tableName: string, factory: Model<TInstance, TPojo>, options?: any, prepend?: boolean): string;
+        prependTableNameToHash(tableName: string, hash?: any): string;
+        findAssociation<TInstance, TPojo>(attribute: string, dao: Model<TInstance, TPojo>): string;
+        getAssociationFilterDAO<TInstance, TPojo>(filterStr: string, dao: Model<TInstance, TPojo>): string;
+        isAssociationFilter<TInstance, TPojo>(filterStr: string, dao: Model<TInstance, TPojo>, options?: any): string;
+        getAssociationFilterColumn<TInstance, TPojo>(filterStr: string, dao: Model<TInstance, TPojo>, options?: { include: boolean }): string;
+        getConditionalJoins<TInstance, TPojo>(options: { where?: any }, originalDao: Model<TInstance, TPojo>): string;
+        arrayValue(value: Array<string>, key: string, _key: string, factory?: any, logicResult?: any): string;
+        hashToWhereConditions<TInstance, TPojo>(hash: any, dao: Model<TInstance, TPojo>, options?: HashToWhereConditionsOption): string;
+        booleanValue(value: boolean): string;
+    }
+
+    interface Schema {
+        tableName: string;
+        table: string;
+        name: string;
+        schema: string;
+        delimiter: string;
+    }
+
+    interface QueryTypes {
+        SELECT: string;
+        BULKUPDATE: string;
+        BULKDELETE: string;
+    }
+
+    interface ModelManager {
+        daos: Array<Model<any, any>>;
+        sequelize: Sequelize;
+        addDAO<TInstance, TPojo>(dao: Model<TInstance, TPojo>): Model<TInstance, TPojo>;
+        removeDAO<TInstance, TPojo>(dao: Model<TInstance, TPojo>): void;
+        getDAO<TInstance, TPojo>(daoName: string, options?: ModelMangerGetDaoOptions): Model<TInstance, TPojo>;
+        all: Array<Model<any, any>>;
+
+        /**
+         * Iterate over DAOs in an order suitable for e.g. creating tables. Will
+         * take foreign key constraints into account so that dependencies are visited
+         * before dependents.
+         */
+        forEachDAO(iterator: (dao: Model<any, any>, name: string) => void, options?: ModelManagerForEachDaoOptions): void;
+    }
+
+    interface TransactionManager {
+        sequelize: Sequelize;
+        connectorManagers: any;
+        getConnectorManager(uuid?: string): ConnectorManager;
+        releaseConnectionManager(uuid?: string): void;
+
+        /**
+         * Execute a query on the DB, with the possibility to bypass all the sequelize goodness.
+         *
+         * @param sql           SQL statement to execute.
+         *
+         * @param callee        If callee is provided, the selected data will be used to build an instance of the DAO represented
+         *                      by the factory. Equivalent to calling Model.build with the values provided by the query.
+         *
+         * @param options       Query options.
+         *
+         */
+        query(sql: string, callee?: Model<any, any>, options?: QueryOptions): EventEmitter;
+
+        query<TInstance, TPojo>(sql: string, callee?: Model<TInstance, TPojo>, options?: QueryOptions): EventEmitter;
+    }
+
+    interface ConnectorManager {
+
+        /**
+         * Execute a query on the DB, with the possibility to bypass all the sequelize goodness.
+         *
+         * @param sql           SQL statement to execute.
+         *
+         * @param callee        If callee is provided, the selected data will be used to build an instance of the DAO represented
+         *                      by the factory. Equivalent to calling Model.build with the values provided by the query.
+         *
+         * @param options       Query options.
+         *
+         */
+        query(sql: string, callee?: Model<any, any>, options?: QueryOptions): EventEmitter;
+
+        afterTransactionSetup(callback: () => void): void;
+        connect(): void;
+        disconnect(): void;
+        reconnect(): void;
+        cleanup(): void;
+    }
+
+    interface Migrator {
+        queryInterface: QueryInterface;
+        migrate(options?: MigratorOptions): EventEmitter;
+        getUndoneMigrations(callback: (err: Error, result: Array<Migrator>) => void): void;
+        findOrCreateMetaDAO(syncOptions?: SyncOptions): EventEmitter;
+        exec(filename: string, options?: MigratorExecOptions): EventEmitter;
+        getLastMigrationFromDatabase(): EventEmitter;
+        getLastMigrationIdFromDatabase(): EventEmitter;
+        getFormattedDateString(s: string): string;
+        stringToDate(s: string): Date;
+        saveSuccessfulMigration(from: Migration, to: Migration, callback: (metaData: MetaInstance) => void): void;
+        deleteUndoneMigration(from: Migration, to: Migration, callback: () => void): void;
+        execute(options?: MigrationExecuteOptions): EventEmitter;
+        isBefore(date: Date, options?: MigrationCompareOptions): boolean;
+        isAfter(date: Date, options?: MigrationCompareOptions): boolean;
+
+    }
+
+    interface Migration extends QueryInterface {
+        migrator: Migrator;
+        path: string;
+        filename: string;
+        migrationId: number;
+        date: Date;
+        queryInterface: QueryInterface;
+        migration: (err: Error, migration: Migration, dataTypes: any, callback: (err: Error) => void) => void;
+
+    }
+
+    interface EventEmitter extends EventEmitterT<any>, NodeJS.EventEmitter { }
+
+    interface EventEmitterT<R> extends NodeJS.EventEmitter {
+        /**
+         * Create a new emitter instance.
+         *
+         * @param handler
+         */
+        new (handler: (emitter: EventEmitterT<R>) => void): EventEmitterT<R>;
+
+        /**
+         * Run the function that was passed when the emitter was instantiated.
+         */
+        run(): EventEmitterT<R>;
+
+        /**
+         * Listen for success events.
+         *
+         * @param onSuccess
+         */
+        success(onSuccess: (result: R) => void): EventEmitterT<R>;
+
+        /**
+         * Alias for success(handler). Listen for success events.
+         *
+         * @param onSuccess
+         */
+        ok(onSuccess: (result: R) => void): EventEmitterT<R>;
+
+        /**
+         * Listen for error events.
+         *
+         * @param onError
+         */
+        error(onError: (err: Error) => void): EventEmitterT<R>;
+
+        /**
+         * Alias for error(handler). Listen for error events.
+         *
+         * @param onError
+         */
+        fail(onError: (err: Error) => void): EventEmitterT<R>;
+
+        /**
+         * Alias for error(handler). Listen for error events.
+         *
+         * @param onError
+         */
+        failure(onError: (err: Error) => void): EventEmitterT<R>;
+
+        /**
+         * Listen for both success and error events.
+         *
+         * @param onDone
+         */
+        done(onDone: (err: Error, result: R) => void): EventEmitterT<R>;
+
+        /**
+         * Alias for done(handler). Listen for both success and error events.
+         *
+         * @param onDone
+         */
+        complete(onDone: (err: Error, result: R) => void): EventEmitterT<R>;
+
+        /**
+         * Attach a function that is called every time the function that created this emitter executes a query.
+         *
+         * @param onSQL
+         */
+        sql(onSQL: (sql: string) => void): EventEmitterT<R>;
+
+        /**
+         * Proxy every event of this event emitter to another one.
+         *
+         * @param emitter   The event emitter that should receive the events.
+         * @param options   Contains an array of the events to proxy. Defaults to sql, error and success
+         */
+        proxy(emitter: EventEmitterT<R>, options?: ProxyOptions): EventEmitterT<R>;
+
+
+    }
+
+    interface Options {
+        /**
+         * The dialect you of the database you are connecting to. One of mysql, postgres, sqlite and mariadb.
+         * Default is mysql.
+         */
+        dialect?: string;
+
+        /**
+         * If specified, load the dialect library from this path. For example, if you want to use pg.js instead of pg when
+         * connecting to a pg database, you should specify 'pg.js' here
+         */
+        dialectModulePath?: string;
+
+        /**
+         * The dialect options that are passed to the underlying dialect library.
+         */
+        dialectOptions?: Object;
+
+        /**
+         * The host of the relational database. Default 'localhost'.
+         */
+        host?: string;
+
+        /**
+         * Integer    The port of the relational database.
+         */
+        port?: number;
+
+        /**
+         * The protocol of the relational database. Default 'tcp'.
+         */
+        protocol?: string;
+
+        /**
+         * Default options for model definitions. See sequelize.define for options.
+         */
+        define?: DefineOptions;
+
+        /**
+         * Default options for sequelize.query
+         */
+        query?: QueryOptions;
+
+        /**
+         * Default options for sequelize.sync
+         */
+        sync?: SyncOptions;
+
+        /**
+         * The timezone used when converting a date from the database into a javascript date. The timezone is also used to
+         * SET TIMEZONE when connecting to the server, to ensure that the result of NOW, CURRENT_TIMESTAMP and other time
+         * related functions have in the right timezone. For best cross platform performance use the format +/-HH:MM.
+         * Default '+00:00'.
+         */
+        timezone?: string;
+
+        /**
+         * Logging options. Function used to log. Default is console.log. Signature is (message:string) => void.
+         *
+         * Set to "false" to disable logging.
+         */
+        logging?: any;
+
+        /**                                                                                                                                                                                                                        logging=console.log]    Function    A function that gets executed everytime Sequelize would log something.
+         * A flag that defines if null values should be passed to SQL queries or not.
+         */
+        omitNull?: boolean;
+
+        /**
+         * Boolean    Queue queries, so that only maxConcurrentQueries number of queries are executing at once. If false, all
+         * queries will be executed immediately.
+         */
+        queue?: boolean;
+
+        /**
+         * The maximum number of queries that should be executed at once if queue is true.
+         */
+        maxConcurrentQueries?: number;
+
+        /**
+         * A flag that defines if native library shall be used or not. Currently only has an effect for postgres
+         */
+        native?: boolean;
+
+        /**
+         * Use read / write replication. To enable replication, pass an object, with two properties, read and write. Write
+         * should be an object (a single server for handling writes), and read an array of object (several servers to
+         * handle reads). Each read/write server can have the following properties?: host, port, username, password, database
+         */
+        replication?: ReplicationOptions;
+
+        /**
+         * Connection pool options.
+         *
+         */
+        pool?: PoolOptions;
+
+        /**
+         * Set to false to make table names and attributes case-insensitive on Postgres and skip double quoting of them.
+         * Default true.
+         */
+        quoteIdentifiers?: boolean;
+
+        /**
+         * Language. Default "en".
+         */
+        language?: string;
+    }
+
+    interface PoolOptions {
+        maxConnections?: number;
+
+        minConnections?: number;
+
+        /**
+         * The maximum time, in milliseconds, that a connection can be idle before being released.
+         */
+        maxIdleTime?: number;
+
+        /**
+         * A function that validates a connection. Called with client. The default function checks that client is an
+         * object, and that its state is not disconnected.
+         *
+         * Note, this is not documented, and after reading code I'm not sure what client's type is.
+         */
+        validateConnection?: (client?: any) => boolean;
+    }
+
+    interface AttributeOptions {
+        /**
+         * A string or a data type
+         */
+        type?: string;
+
+        /**
+         * If false, the column will have a NOT NULL constraint, and a not null validation will be run before an instance
+         * is saved.
+         */
+        allowNull?: boolean;
+
+        /**
+         * A literal default value, a javascript function, or an SQL function (see sequelize.fn)
+         */
+        defaultValue?: any;
+
+        /**
+         * If true, the column will get a unique constraint. If a string is provided, the column will be part of a
+         * composite unique index. If multiple columns have the same string, they will be part of the same unique index.
+         */
+        unique?: any;
+
+        primaryKey?: boolean;
+
+        /**
+         * If set, sequelize will map the attribute name to a different name in the database.
+         */
+        field?: string;
+
+        autoIncrement?: boolean;
+
+        comment?: string;
+
+        /**
+         * If this column references another table, provide it here as a Model, or a string.
+         */
+        references?: any;
+
+        /**
+         * The column of the foreign table that this column references. Default 'id'.
+         */
+        referencesKey?: string;
+
+        /**
+         * What should happen when the referenced key is updated. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
+         * NO ACTION.
+         */
+        onUpdate?: string;
+
+        /**
+         * What should happen when the referenced key is deleted. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
+         * NO ACTION.
+         */
+        onDelete?: string;
+
+        /**
+         * Provide a custom getter for this column. Use this.getDataValue(String) to manipulate the underlying values.
+         */
+        get?: () => any;
+
+        /**
+         * Provide a custom setter for this column. Use this.setDataValue(String, Value) to manipulate the underlying values.
+         */
+        set?: (value?: any) => void;
+
+        /**
+         * An object of validations to execute for this column every time the model is saved. Can be either the name of a
+         * validation provided by validator.js, a validation function provided by extending validator.js (see the
+         * DAOValidator property for more details), or a custom validation function. Custom validation functions are called
+         * with the value of the field, and can possibly take a second callback argument, to signal that they are
+         * asynchronous. If the validator is sync, it should throw in the case of a failed validation, it it is async,
+         * the callback should be called with the error text.
+         */
+        validate?: any;
+    }
+
+    interface ForeignKeyAttributeOptions extends AttributeOptions {
+        /**
+         * The name of the foreign key in the target table. Defaults to the name of source + primary key of source.
+         */
+        fieldName: string;
+    }
+
+    interface DefineOptions {
+        /**
+         * Define the default search scope to use for this model. Scopes have the same form as the options passed to
+         * find / findAll.
+         */
+        defaultScope?: FindOptions;
+
+        /**
+         * More scopes, defined in the same way as defaultScope above. See Model.scope for more information about how
+         * scopes are defined, and what you can do with them
+         */
+        scopes?: any;
+
+        /**
+         * Don't persits null values. This means that all columns with null values will not be saved.
+         */
+        omitNull?: boolean;
+
+        /**
+         * Adds createdAt and updatedAt timestamps to the model. Default true.
+         */
+        timestamps?: boolean;
+
+        /**
+         * Calling destroy will not delete the model, but instead set a deletedAt timestamp if this is true. Needs
+         * timestamps=true to work. Default false.
+         */
+        paranoid?: boolean;
+
+        /**
+         * Converts all camelCased columns to underscored if true. Default false.
+         */
+        underscored?: boolean;
+
+        /**
+         * Converts camelCased model names to underscored tablenames if true. Default false.
+         */
+        underscoredAll?: boolean;
+
+        /**
+         * If freezeTableName is true, sequelize will not try to alter the DAO name to get the table name. Otherwise, the
+         * dao name will be pluralized. Default false.
+         */
+        freezeTableName?: boolean;
+
+        /**
+         * Override the name of the createdAt column if a string is provided, or disable it if false. Timestamps must be true.
+         */
+        createdAt?: any;
+
+        /**
+         * Override the name of the updatedAt column if a string is provided, or disable it if false. Timestamps must be true.
+         */
+        updatedAt?: any;
+
+        /**
+         * Override the name of the deletedAt column if a string is provided, or disable it if false. Timestamps must be true.
+         */
+        deletedAt?: any;
+
+        /**
+         * Defaults to pluralized DAO name, unless freezeTableName is true, in which case it uses DAO name verbatim.
+         */
+        tableName?: string;
+
+        /**
+         * Provide getter functions that work like those defined per column. If you provide a getter method with the same
+         * name as a column, it will be used to access the value of that column. If you provide a name that does not match
+         * a column, this function will act as a virtual getter, that can fetch multiple other values.
+         */
+        getterMethods?: any;
+
+        /**
+         * Provide setter functions that work like those defined per column. If you provide a setter method with the same
+         * name as a column, it will be used to update the value of that column. If you provide a name that does not match
+         * a column, this function will act as a virtual setter, that can act on and set other values, but will not be
+         * persisted
+         */
+        setterMethods?: any;
+
+        /**
+         * Provide functions that are added to each instance (DAO).
+         */
+        instanceMethods?: any;
+
+        /**
+         * Provide functions that are added to the model (Model).
+         */
+        classMethods?: any;
+
+        /**
+         * Default 'public'.
+         */
+        schema?: string;
+        schemaDelimiter?: string;
+        engine?: string;
+        charset?: string;
+        comment?: string;
+        collate?: string;
+        whereCollection?: any;
+        language?: string;
+
+        /**
+         * An object of hook function that are called before and after certain lifecycle events. The possible hooks are?:
+         * beforeValidate, afterValidate, beforeBulkCreate, beforeBulkDestroy, beforeBulkUpdate, beforeCreate,
+         * beforeDestroy, beforeUpdate, afterCreate, afterDestroy, afterUpdate, afterBulkCreate, afterBulkDestory and
+         * afterBulkUpdate. See Hooks for more information about hook functions and their signatures. Each property can
+         * either be a function, or an array of functions.
+         */
+        hooks?: Hooks;
+
+        /**
+         * An object of model wide validations. Validations have access to all model values via this. If the validator
+         * function takes an argument, it is assumed to be async, and is called with a callback that accepts an optional
+         * error.
+         */
+        validate?: any;
+
+        /**
+         *
+         */
+        indexes?: Array<DefineIndexOptions>;
+    }
+
+    interface DefineIndexOptions {
+        /**
+         * The name of the index. Defaults to model name + _ + fields concatenated.
+         */
+        name?: string;
+
+        /**
+         * Index type. Only used by mysql. One of UNIQUE, FULLTEXT and SPATIAL.
+         */
+        type: string;
+
+        /**
+         * The method to create the index by (USING statement in SQL). BTREE and HASH are supported by mysql and postgres,
+         * and postgres additionally supports GIST and GIN.
+         */
+        method: string;
+
+        /**
+         * Should the index by unique? Can also be triggered by setting type to UNIQUE. Default false (unless type = "UNIQUE",
+         * then true).
+         */
+        unique?: boolean;
+
+        /**
+         * PostgreSQL will build the index without taking any write locks. Postgres only. Default false.
+         */
+        concurrently?: boolean;
+
+        /**
+         * An array of the fields to index. Each field can either be a string containing the name of the field, or an object
+         * with the following attributes: attribute (field name), length (create a prefix index of length chars), order (the
+         * direction the column should be sorted in), collate (the collation (sort order) for the column)
+         */
+        fields: Array<any>;
+    }
+
+    interface QueryOptions {
+        /**
+         * If true, sequelize will not try to format the results of the query, or build an instance of a model from the
+         * result.
+         */
+        raw?: boolean;
+
+        /**
+         * The transaction that the query should be executed under.
+         */
+        transaction?: Transaction;
+
+        /**
+         * The type of query you are executing. The query type affects how results are formatted before they are passed
+         * back. If no type is provided sequelize will try to guess the right type based on the sql, and fall back to
+         * SELECT. The type is a string, but Sequelize.QueryTypes is provided is convenience shortcuts. Current options
+         * are SELECT, BULKUPDATE and BULKDELETE.
+         *
+         * Default is SELECT.
+         */
+        type?: string;
+
+        /**
+         * Lock the selected rows in either share or update mode. Possible options are transaction.LOCK.UPDATE and
+         * transaction.LOCK.SHARE. See transaction.LOCK for an example.
+         */
+        lock?: string;
+
+        /**
+         * For aggregate function calls, the type of the result. If field is a field in this Model, the default will be the
+         * type of that field, otherwise defaults to float.
+         */
+        dataType?: any;
+
+        /**
+         * A function that logs sql queries, or false for no logging.
+         */
+        logging?: any;
+
+        /**
+         * If plain is true, then sequelize will only return the first record of the result set. In case of false it will
+         * all records.
+         */
+        plain?: boolean;
+    }
+
+    interface SyncOptions {
+        /**
+         * If force is true, each DAO will do DROP TABLE IF EXISTS ..., before it tries to create its own table.
+         * Default false.
+         */
+        force?: boolean;
+
+        /**
+         * A function that logs sql queries, or false for no logging.
+         */
+        logging?: any;
+
+        /**
+         * The schema that the tables should be created in. This can be overriden for each table in sequelize.define.
+         * Default 'public'.
+         */
+        schema?: string;
+    }
+
+    interface ReplicationOptions {
+        read?: Array<Server>;
+        write?: Server;
+    }
+
+    interface Server {
+        host?: string;
+        port?: number;
+        database?: string;
+        username?: string;
+        password?: string;
+    }
+
+    interface DropOptions {
+        /**
+         * Also drop all objects depending on this table, such as views. Only works in postgres.
+         *
+         * Default false.
+         */
+        cascade?: boolean;
+    }
+
+    interface SchemaOptions {
+        /**
+         * The character(s) that separates the schema name from the table name. Default '.'.
+         */
+        schemaDelimiter?: string;
+    }
+
+    interface FindOptions {
+        /**
+         * A hash of attributes to describe your search.
+         */
+        where?: any;
+
+        /**
+         * A list of the attributes that you want to select. To rename an attribute, you can pass an array, with two
+         * elements - the first is the name of the attribute in the DB (or some kind of expression such as
+         * Sequelize.literal, Sequelize.fn and so on), and the second is the name you want the attribute to have in the
+         * returned instance
+         */
+        attributes?: Array<any>;
+
+        /**
+         * A list of associations to eagerly load. Supported is either { include?: [ Model1, Model2, ...] } or { include?:
+         * [ { model?: Model1, as?: 'Alias' } ] }. If your association are set up with an as (eg. X.hasMany(Y, { as?: 'Z },
+         * you need to specify Z in the as attribute when eager loading Y). When using the object form, you can also
+         * specify attributes to specify what columns to load, where to limit the relations, and include to load further
+         * nested relations
+         */
+        include?: any;
+
+        /**
+         * Specifies an ordering. If a string is provided, it will be esacped. Using an array, you can provide several
+         * columns / functions to order by. Each element can be further wrapped in a two-element array. The first element
+         * is the column / function to order by, the second is the direction. For example?: order?: [['name', 'DESC']]. In
+         * this way the column will be escaped, but the direction will not.
+         */
+        order?: any;
+
+        limit?: number;
+
+        offset?: number;
+    }
+
+    interface BuildOptions {
+        /**
+         * If set to true, values will ignore field and virtual setters. Default false.
+         */
+        raw?: boolean;
+
+        /**
+         * Default true.
+         */
+        isNewRecord?: boolean;
+
+        /**
+         * Default true.
+         */
+        isDirty?: boolean;
+
+        /**
+         * an array of include options - Used to build prefetched/included model instances. See set.
+         */
+        include?: Array<any>;
+    }
+
+    interface CopyOptions extends BuildOptions {
+        /**
+         * If set, only columns matching those in fields will be saved.
+         */
+        fields?: Array<string>;
+
+        /**
+         *
+         */
+        transaction?: Transaction;
+    }
+
+    interface FindOrCreateOptions extends FindOptions, QueryOptions {
+
+    }
+
+    interface BulkCreateOptions {
+        /**
+         * Fields to insert (defaults to all fields).
+         */
+        fields?: Array<string>;
+
+        /**
+         * Should each row be subject to validation before it is inserted. The whole insert will fail if one row fails
+         * validation. Default false.
+         */
+        validate?: boolean;
+
+        /**
+         * Run before / after create hooks for each individual Instance? BulkCreate hooks will still be run. Default false;
+         */
+        hooks?: boolean;
+
+        /**
+         * Ignore duplicate values for primary keys? (not supported by postgres). Default false.
+         */
+        ignoreDuplicates?: boolean;
+    }
+
+    interface DestroyOptions {
+        /**
+         * If set to true, destroy will find all records within the where parameter and will execute before-/ after
+         * bulkDestroy hooks on each row.
+         */
+        hooks?: boolean;
+
+        /**
+         * How many rows to delete
+         */
+        limit?: number;
+
+        /**
+         * If set to true, dialects that support it will use TRUNCATE instead of DELETE FROM. If a table is truncated the
+         * where and limit options are ignored.
+         */
+        truncate?: boolean;
+    }
+
+    interface DestroyInstanceOptions {
+        /**
+         * If set to true, paranoid models will actually be deleted.
+         */
+        force: boolean;
+    }
+
+    interface InsertOptions {
+        limit?: number;
+        returning?: string;
+        allowNull?: string;
+    }
+
+    interface UpdateOptions {
+        /**
+         * Should each row be subject to validation before it is inserted. The whole insert will fail if one row fails
+         * validation. Default true.
+         */
+        validate?: boolean;
+
+        /**
+         * Run before / after bulkUpdate hooks? Default false.
+         */
+        hooks?: boolean;
+
+        /**
+         * How many rows to update (only for mysql and mariadb).
+         */
+        limit?: number;
+    }
+
+    interface SetOptions {
+        /**
+         * If set to true, field and virtual setters will be ignored. Default false.
+         */
+        raw?: boolean;
+
+        /**
+         * Clear all previously set data values. Default false.
+         */
+        reset?: boolean;
+
+        include?: any;
+    }
+
+    interface SaveOptions {
+        /**
+         * An alternative way of setting which fields should be persisted.
+         */
+        fields?: any;
+
+        /**
+         * If true, the updatedAt timestamp will not be updated. Default false.
+         */
+        silent?: boolean;
+
+        transaction?: Transaction;
+    }
+
+    interface ValidateOptions {
+        /**
+         * An array of strings. All properties that are in this array will not be validated.
+         */
+        skip: Array<string>;
+    }
+
+    interface IncrementOptions {
+        /**
+         * The number to increment by. Default 1.
+         */
+        by?: number;
+
+        transaction?: Transaction;
+    }
+
+    interface IndexOptions {
+        indicesType?: string;
+        indexType?: string;
+        indexName?: string;
+        parser?: any;
+    }
+
+    interface ProxyOptions {
+        /**
+         * An array of the events to proxy. Defaults to sql, error and success.
+         */
+        events: Array<string>;
+    }
+
+    interface AssociationOptions {
+        /**
+         * Set to true to run before-/afterDestroy hooks when an associated model is deleted because of a cascade. For
+         * example if User.hasOne(Profile, {onDelete: 'cascade', hooks:true}), the before-/afterDestroy hooks for profile
+         * will be called when a user is deleted. Otherwise the profile will be deleted without invoking any hooks.
+         * Default false.
+         */
+        hooks?: boolean;
+
+        /**
+         * The name of the table that is used to join source and target in n:m associations. Can also be a sequelize model
+         * if you want to define the junction table yourself and add extra attributes to it.
+         */
+        through?: any;
+
+        /**
+         * The alias of this model. If you create multiple associations between the same tables, you should provide an
+         * alias to be able to distinguish between them. If you provide an alias when creating the assocition, you should
+         * provide the same alias when eager loading and when getting assocated models. Defaults to the singularized
+         * version of target.name
+         */
+        as?: string;
+
+        /**
+         * The foreignKey can be either a string name of the foreign key in the target table,
+         * or can be an object defining the foreign key and its options. Note foreignKey is not fully
+         * typed since TypeScript does not support union types--it can be either a string or an
+         * options object. String name defaults to the name of source + primary key of source.
+         *
+         * @see ForeignKeyAttributeOptions.
+         */
+        foreignKey?: any;
+
+        /**
+         * What should happen when the referenced key is deleted. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
+         * NO ACTION. Default SET NULL.
+         */
+        onDelete?: string;
+
+        /**
+         * What should happen when the referenced key is updated. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
+         * NO ACTION. Default CASCADE.
+         */
+        onUpdate?: string;
+
+        /**
+         * Should on update and on delete constraints be enabled on the foreign key.
+         */
+        constraints?: boolean;
+    }
+
+    interface TriggerOptions {
+        insert?: Array<string>;
+        update?: Array<string>;
+        delete?: Array<string>;
+        truncate?: Array<string>;
+    }
+
+    interface TriggerParam {
+        type: string;
+        direction?: string;
+        name?: string;
+    }
+
+    interface SelectOptions {
+        limit?: number;
+        offset?: number;
+        attributes?: Array<any>;
+        hasIncludeWhere?: boolean;
+        hasIncludeRequired?: boolean;
+        hasMultiAssociation?: boolean;
+        tableAs?: string;
+        table?: string;
+        include?: Array<any>;
+        includeIgnoreAttributes?: boolean;
+        where?: any;
+        /**
+         * String field name or array of strings of field names.
+         */
+        group?: any;
+        having?: any;
+        order?: any;
+        lock?: string;
+    }
+
+    interface HashToWhereConditionsOption {
+        include?: boolean;
+        keysEscaped?: boolean;
+    }
+
+    interface ModelMangerGetDaoOptions {
+        attribute: string;
+    }
+
+    interface ModelManagerForEachDaoOptions {
+        /**
+         * Default true.
+         */
+        reverse: boolean;
+    }
+
+    interface MigratorOptions {
+        /**
+         * A flag that defines if the migrator should get instantiated or not..
+         */
+        force: boolean;
+    }
+
+    interface FindAndCountResult<T> {
+        /**
+         * The matching model instances.
+         */
+        rows?: Array<T>;
+
+        /**
+         * The total number of rows. This may be more than the rows returned if a limit and/or offset was supplied.
+         */
+        count?: number;
+    }
+
+    interface Col {
+        /**
+         * Column name.
+         */
+        col: string;
+    }
+
+    interface Cast {
+        /**
+         * The value to cast.
+         */
+        val: any;
+
+        /**
+         * The type to cast it to.
+         */
+        type: string;
+    }
+
+    interface Literal {
+        val: any;
+    }
+
+    interface And {
+        /**
+         * Each argument (string or object) will be joined by AND.
+         */
+        args: Array<any>;
+    }
+
+    interface Or {
+        /**
+         * Each argument (string or object) will be joined by OR.
+         */
+        args: Array<any>;
+    }
+
+    interface Where {
+        /**
+         * The attribute.
+         */
+        attribute: string;
+
+        /**
+         * The condition. Can be both a simply type, or a further condition (.or, .and, .literal etc.).
+         */
+        logic: any;
+    }
+
+    interface TransactionOptions {
+        /**
+         *
+         */
+        autocommit?: boolean;
+
+        /**
+         * One of: 'READ UNCOMMITTED', 'READ COMMITTED', 'REPEATABLE READ', 'SERIALIZABLE'. Default 'REPEATABLE READ'.
+         */
+        isolationLevel?: string;
+    }
+
+    interface QueryChainerRunSeriallyOptions {
+        /**
+         * If set to true, all pending emitters will be skipped if a previous emitter failed. Default false.
+         */
+        skipOnError: boolean;
+    }
+
+    interface CreateTableQueryOptions {
+        comment?: string;
+        uniqueKeys?: Array<any>;
+        charset?: string;
+    }
+
+    interface MigratorExecOptions {
+        before?: (migrator: Migrator) => void;
+        after?: (migrator: Migrator) => void;
+        success?: (migrator: Migrator) => void;
+    }
+
+    interface MigrationExecuteOptions {
+        method: string;
+    }
+
+    interface MigrationCompareOptions {
+        /**
+         * Default false.
+         */
+        withoutEquals: boolean;
+    }
+
+    interface Promise {
+        /**
+         * Listen for events, event emitter style. Mostly for backwards compatibility with EventEmitter.
+         *
+         * @param evt Event
+         * @param fct Handler
+         */
+        on(evt: string, fct: () => void): void;
+
+        /**
+         * Emit an event from the emitter.
+         *
+         * @param type  The type of event.
+         * @param value All other arguments will be passed to the event listeners.
+         */
+        emit(type: string, ...value: Array<any>): void;
+
+        /**
+         * Listen for success events.
+         */
+        success(onSuccess: () => void): Promise;
+
+        /**
+         * Alias for success(handler). Listen for success events.
+         */
+        ok(onSuccess: () => void): Promise;
+
+        /**
+         * Listen for error events.
+         *
+         * @param onError Error handler.
+         */
+        error(onError: (err?: Error) => void): Promise;
+
+        /**
+         * Alias for error(handler). Listen for error events.
+         *
+         * @param onError Error handler.
+         */
+        fail(onError: (err?: Error) => void): Promise;
+
+        /**
+         * Alias for error(handler). Listen for error events.
+         *
+         * @param onError Error handler.
+         */
+        failure(onError: (err?: Error) => void): Promise;
+
+        /**
+         * Listen for both success and error events..
+         */
+        done(handler: (err: Error, result?: any) => void): Promise;
+
+        /**
+         * Alias for done(handler). Listen for both success and error events..
+         */
+        complete(handler: (err: Error, result?: any) => void): Promise;
+
+        /**
+         * Attach a function that is called every time the function that created this emitter executes a query.
+         *
+         * @param onSQL
+         */
+        sql(onSQL: (sql: string) => void): Promise;
+
+        /**
+         * Proxy every event of this promise to another one.
+         *
+         * @param promise   The promise that should receive the events.
+         * @param options   Contains an array of the events to proxy. Defaults to sql, error and success
+         */
+        proxy(promise: Promise, options?: ProxyOptions): Promise;
+
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then(onFulfilled?: (result?: any) => void, onRejected?: (result?: any) => void): Promise;
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then(onFulfilled?: (result?: any) => Promise, onRejected?: (result?: any) => Promise): Promise;
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then<R>(onFulfilled?: (result?: any) => PromiseT<R>, onRejected?: (result?: any) => PromiseT<R>): PromiseT<R>;
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then<R>(onFulfilled?: (result?: any) => PromiseT<R>, onRejected?: (result?: any) => void): PromiseT<R>;
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then<R>(onFulfilled?: (result?: any) => void, onRejected?: (result?: any) => PromiseT<R>): PromiseT<R>;
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then<R1, R2>(onFulfilled?: (result?: any) => PromiseT<R1>, onRejected?: (result?: any) => PromiseT<R2>): Promise;
+
+        /**
+         * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
+         * as opposed to then which will only recieve the first argument.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         * @param onRejected
+         */
+        spread(onFulfilled?: (...results: Array<any>) => Promise, onRejected?: (...results: Array<any>) => Promise): Promise;
+
+        /**
+         * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
+         * as opposed to then which will only recieve the first argument.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         * @param onRejected
+         */
+        spread(onFulfilled?: (...results: Array<any>) => void, onRejected?: (...results: Array<any>) => void): Promise;
+
+        /**
+         * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
+         * as opposed to then which will only recieve the first argument.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         * @param onRejected
+         */
+        spread(onFulfilled?: (...results: Array<any>) => Promise, onRejected?: (...results: Array<any>) => void): Promise;
+
+        /**
+         * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
+         * as opposed to then which will only recieve the first argument.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         * @param onRejected
+         */
+        spread(onFulfilled?: (...results: Array<any>) => void, onRejected?: (...results: Array<any>) => Promise): Promise;
+
+        /**
+         * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
+         * as opposed to then which will only recieve the first argument.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         * @param onRejected
+         */
+        spread<R>(onFulfilled?: (...results: Array<any>) => PromiseT<R>, onRejected?: (...results: Array<any>) => PromiseT<R>): PromiseT<R>;
+
+        /**
+         * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
+         * as opposed to then which will only recieve the first argument.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         * @param onRejected
+         */
+        spread<R>(onFulfilled?: (...results: Array<any>) => void, onRejected?: (...results: Array<any>) => PromiseT<R>): PromiseT<R>;
+
+        /**
+         * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
+         * as opposed to then which will only recieve the first argument.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         * @param onRejected
+         */
+        spread<R>(onFulfilled?: (...results: Array<any>) => PromiseT<R>, onRejected?: (...results: Array<any>) => void): PromiseT<R>;
+
+        /**
+         * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
+         * as opposed to then which will only recieve the first argument.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         * @param onRejected
+         */
+        spread<R1, R2>(onFulfilled?: (...results: Array<any>) => PromiseT<R1>, onRejected?: (...results: Array<any>) => PromiseT<R2>): Promise;
+
+        /**
+         * Shorthand for then(null, onRejected)
+         */
+        catch(onRejected: (result?: any) => Promise): Promise;
+
+        /**
+         * Shorthand for then(null, onRejected)
+         */
+        catch<R>(onRejected: (result?: any) => PromiseT<R>): PromiseT<R>;
+
+        /**
+         * Shorthand for then(null, onRejected)
+         */
+        catch(onRejected: (result?: any) => void): Promise;
+    }
+
+    interface PromiseT<T> extends Promise {
+        /**
+         * Listen for events, event emitter style. Mostly for backwards compatibility with EventEmitter.
+         *
+         * @param evt Event
+         * @param fct Handler
+         */
+        on(evt: string, fct: (t: T) => void): void;
+
+        /**
+         * Emit an event from the emitter.
+         *
+         * @param type  The type of event.
+         * @param value All other arguments will be passed to the event listeners.
+         */
+        emit(type: string, ...value: Array<T>): void;
+
+        /**
+         * Listen for success events.
+         */
+        success(onSuccess: (t: T) => void): PromiseT<T>;
+
+        /**
+         * Alias for success(handler). Listen for success events.
+         */
+        ok(onSuccess: (t: T) => void): PromiseT<T>;
+
+        /**
+         * Listen for both success and error events..
+         */
+        done(handler: (err: Error, result: T) => void): PromiseT<T>;
+
+        /**
+         * Alias for done(handler). Listen for both success and error events..
+         */
+        complete(handler: (err: Error, result: T) => void): PromiseT<T>;
+
+        /**
+         * Attach a function that is called every time the function that created this emitter executes a query.
+         *
+         * @param onSQL
+         */
+        sql(onSQL: (sql: string) => void): PromiseT<T>;
+
+        /**
+         * Proxy every event of this promise to another one.
+         *
+         * @param promise   The promise that should receive the events.
+         * @param options   Contains an array of the events to proxy. Defaults to sql, error and success
+         */
+        proxy(promise: PromiseT<T>, options?: ProxyOptions): PromiseT<T>;
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then(onFulfilled?: (result?: T) => void, onRejected?: (result?: T) => void): Promise;
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then(onFulfilled?: (result?: T) => Promise, onRejected?: (result?: T) => Promise): Promise;
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then<R>(onFulfilled?: (result?: T) => PromiseT<R>, onRejected?: (result?: T) => PromiseT<R>): PromiseT<R>;
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then<R>(onFulfilled?: (result?: T) => PromiseT<R>, onRejected?: (result?: T) => void): PromiseT<R>;
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then<R>(onFulfilled?: (result?: T) => void, onRejected?: (result?: T) => PromiseT<R>): PromiseT<R>;
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then<R1, R2>(onFulfilled?: (result?: T) => PromiseT<R1>, onRejected?: (result?: T) => PromiseT<R2>): Promise;
+
+        /**
+         * Shorthand for then(null, onRejected)
+         */
+        catch(onRejected: (result?: T) => Promise): Promise;
+
+        /**
+         * Shorthand for then(null, onRejected)
+         */
+        catch<R>(onRejected: (result?: T) => PromiseT<R>): PromiseT<R>;
+
+        /**
+         * Shorthand for then(null, onRejected)
+         */
+        catch(onRejected: (result?: T) => void): Promise;
+    }
+
+    interface Utils {
+        _: Lodash;
+
+        /**
+         * Formats a string to parse and interpolate values into the string based on the optionally provided SQL dialect.
+         * @param arr       Array where first element is string with placeholders and remaining attributes are values to replace placeholders.
+         * @param dialect   SQL Dialect.
+         */
+        format(arr: Array<any>, dialect?: string): string;
+
+        /**
+         * Formats a SQL string replacing named placeholders with values from the parameters object with matching key names.
+         *
+         * @param sql           String to format.
+         * @param parameters    Key/value hash with values to replace in string.
+         * @param dialect       SQL Dialect
+         */
+        formatNamedParameters(sql: string, parameters: any, dialect?: string): string;
+
+        injectScope(scope: string, merge: boolean): any;
+
+        smartWhere(whereArg: any, dialect: string): any;
+
+        compileSmartWhere(obj: any, dialect: string): Array<any>;
+
+        getWhereLogic(logic: string, val?: any): string;
+
+        isHash(obj: any): boolean;
+
+        hasChanged(attrValue: any, value: any): boolean;
+
+        argsArePrimaryKeys(args: Array<any>, primaryKeys: any): boolean;
+
+        /**
+         * Consistently combines two table names such that the alphabetically first name always comes first when combined.
+         *
+         * @param table1
+         * @param table2
+         */
+        combineTableNames(table1: string, table2: string): string;
+
+        singularize(s: string, language?: string): string;
+
+        pluralize(s: string, language: string): string;
+
+        /**
+         * Same concept as _.merge, but don't overwrite properties that have already been assigned
+         */
+        mergeDefaults: typeof _.merge;
+
+        lowercaseFirst(str: string): string;
+
+        uppercaseFirst(str: string): string;
+
+        spliceStr(str: string, index: number, count: number, add: string): string;
+
+        camelize(str: string): string;
+
+        removeCommentsFromFunctionString(s: string): string;
+
+        toDefaultValue(value: any): any;
+
+        defaultValueSchemable(value: any): boolean;
+        setAttributes(hash: any, identifier: string, instance: any, prefix: string): any;
+        removeNullValuesFromHash(hash: any, omitNull: boolean, options: any): any;
+        firstValueOfHash(obj: any): any;
+        inherit(subClass: any, superClass: any): any;
+        stack(): string;
+        now(dialect: string): Date;
+
+        /**
+         * Runs provided function on next tick, depending on environment.
+         *
+         * @param f
+         */
+        tick(f: Function): void;
+
+        /**
+         * Surrounds a string with tick marks while removing all existing tick marks from the string.
+         * @param s         String to tick
+         * @param tickChar  Tick mark. Default `
+         */
+        addTicks(s: string, tickChar?: string): string;
+
+        removeTicks(s: string, tickChar?: string): string;
+
+        generateUUID(): string;
+
+        validateParameter(value: any, expectation: any): boolean;
+
+        CustomEventEmitter: EventEmitter;
+        Promise: Promise;
+        QueryChainer: QueryChainer;
+        Lingo: any; // external project, no definitions yet}
+    }
+
+    interface Lodash extends _.LoDashStatic {
+        camelizeIf(str: string, condition: boolean): string;
+        camelizeIf(str: string, condition: any): string;
+        underscoredIf(str: string, condition: boolean): string;
+        underscoredIf(str: string, condition: any): string;
+        /**
+         * * Returns an array with some falsy values removed. The values null, "", undefined and NaN are considered falsey.
+         *
+         * @param arr Array to compact.
+         */
+        compactLite<T>(arr: Array<T>): Array<T>;
+    }
+
+    interface MetaPojo {
+        from: string;
+        to: string;
+    }
+    interface MetaInstance extends MetaPojo, Model<MetaInstance, MetaPojo> {
+
+    }
+
+    interface DataTypeStringBase {
+        BINARY: DataTypeString;
+    }
+    interface DataTypeNumberBase {
+        UNSIGNED: boolean;
+        ZEROFILL: boolean;
+    }
+
+    interface DataTypeString extends DataTypeStringBase {
+    }
+    interface DataTypeChar extends DataTypeStringBase {
+    }
+    interface DataTypeInteger extends DataTypeNumberBase {
+    }
+    interface DataTypeBigInt extends DataTypeNumberBase {
+    }
+    interface DataTypeFloat extends DataTypeNumberBase {
+    }
+    interface DataTypeBlob {
+    }
+    interface DataTypeDecimal {
+        PRECISION: number;
+        SCALE: number;
+    }
+
+    interface DataTypeVirtual {
+    }
+    interface DataTypeEnum {
+        (...values: Array<string>): DataTypeEnum;
+    }
+    interface DataTypeArray {
+    }
+    interface DataTypeHstore {
+    }
+
+    interface DataTypes {
+        STRING: DataTypeString;
+        CHAR: DataTypeChar;
+        TEXT: string;
+        INTEGER: DataTypeInteger;
+        BIGINT: DataTypeBigInt;
+        DATE: string;
+        BOOLEAN: string;
+        FLOAT: DataTypeFloat;
+        NOW: string;
+        BLOB: DataTypeBlob;
+        DECIMAL: DataTypeDecimal;
+        UUID: string;
+        UUIDV1: string;
+        UUIDV4: string;
+        VIRTUAL: DataTypeVirtual;
+        NONE: DataTypeVirtual;
+        ENUM: DataTypeEnum;
+        ARRAY: DataTypeArray;
+        HSTORE: DataTypeHstore;
+    }
 }
+
+declare var sequelize: sequelize.SequelizeStatic;
+
+export = sequelize;
diff --git a/sequelize/sequelize-tests-2.0.0.ts b/sequelize/sequelize-tests-2.0.0.ts
index 0ef636c859..72d0cce727 100644
--- a/sequelize/sequelize-tests-2.0.0.ts
+++ b/sequelize/sequelize-tests-2.0.0.ts
@@ -1,4 +1,4 @@
-/// <reference path="sequelize-2.0.0.d.ts" />
+
 
 import Sequelize = require('sequelize');
 
diff --git a/sequelize/sequelize-tests.ts b/sequelize/sequelize-tests.ts
index 86be60d223..a17e7d90e3 100644
--- a/sequelize/sequelize-tests.ts
+++ b/sequelize/sequelize-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="sequelize.d.ts" />
-
 import Sequelize = require("sequelize");
 
 //
diff --git a/sequelize/sequelize.d.ts b/sequelize/sequelize.d.ts
deleted file mode 100644
index 9af29c0e97..0000000000
--- a/sequelize/sequelize.d.ts
+++ /dev/null
@@ -1,6165 +0,0 @@
-// Type definitions for Sequelize 3.4.1
-// Project: http://sequelizejs.com
-// Definitions by: samuelneff <https://github.com/samuelneff>, Peter Harris <https://github.com/codeanimal>, Ivan Drinchev <https://github.com/drinchev>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Based on original work by: samuelneff <https://github.com/samuelneff/sequelize-auto-ts/blob/master/lib/sequelize.d.ts>
-
-/// <reference path='../lodash/lodash.d.ts' />
-/// <reference path="../bluebird/bluebird.d.ts" />
-/// <reference path="../validator/validator.d.ts" />
-
-declare module "sequelize" {
-
-    namespace sequelize {
-
-        //
-        //  Associations
-        // ~~~~~~~~~~~~~~
-        //
-        //  https://github.com/sequelize/sequelize/tree/v3.4.1/lib/associations
-        //
-
-
-        /**
-         * The options for the getAssociation mixin of the belongsTo association.
-         * @see BelongsToGetAssociationMixin
-         */
-        interface BelongsToGetAssociationMixinOptions {
-            /**
-             * Apply a scope on the related model, or remove its default scope by passing false.
-             */
-            scope?: string | boolean;
-        }
-
-        /**
-         * The getAssociation mixin applied to models with belongsTo.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsTo(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttrib>, UserAttrib {
-         *    getRole: Sequelize.BelongsToGetAssociationMixin<RoleInstance>;
-         *    // setRole...
-         *    // createRole...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to/
-         * @see Instance
-         */
-        interface BelongsToGetAssociationMixin<TInstance> {
-            /**
-             * Get the associated instance.
-             * @param options The options to use when getting the association.
-             */
-            (options?: BelongsToGetAssociationMixinOptions): Promise<TInstance>;
-        }
-
-        /**
-         * The options for the setAssociation mixin of the belongsTo association.
-         * @see BelongsToSetAssociationMixin
-         */
-        interface BelongsToSetAssociationMixinOptions {
-            /**
-             * Skip saving this after setting the foreign key if false.
-             */
-            save?: boolean;
-        }
-
-        /**
-         * The setAssociation mixin applied to models with belongsTo.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsTo(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRole...
-         *    setRole: Sequelize.BelongsToSetAssociationMixin<RoleInstance, RoleId>;
-         *    // createRole...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to/
-         * @see Instance
-         */
-        interface BelongsToSetAssociationMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Set the associated instance.
-             * @param newAssociation An instance or the primary key of an instance to associate with this. Pass null or undefined to remove the association.
-             * @param options the options passed to `this.save`.
-             */
-            (
-                newAssociation?: TInstance | TInstancePrimaryKey,
-                options?: BelongsToSetAssociationMixinOptions | InstanceSaveOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the createAssociation mixin of the belongsTo association.
-         * @see BelongsToCreateAssociationMixin
-         */
-        interface BelongsToCreateAssociationMixinOptions { }
-
-        /**
-         * The createAssociation mixin applied to models with belongsTo.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsTo(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRole...
-         *    // setRole...
-         *    createRole: Sequelize.BelongsToCreateAssociationMixin<RoleAttributes>;
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to/
-         * @see Instance
-         */
-        interface BelongsToCreateAssociationMixin<TAttributes> {
-            /**
-             * Create a new instance of the associated model and associate it with this.
-             * @param values The values used to create the association.
-             * @param options The options passed to `target.create` and `setAssociation`.
-             */
-            (
-                values?: TAttributes,
-                options?: BelongsToCreateAssociationMixinOptions | CreateOptions | BelongsToSetAssociationMixinOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the getAssociation mixin of the hasOne association.
-         * @see HasOneGetAssociationMixin
-         */
-        interface HasOneGetAssociationMixinOptions {
-            /**
-             * Apply a scope on the related model, or remove its default scope by passing false.
-             */
-            scope?: string | boolean;
-        }
-
-        /**
-         * The getAssociation mixin applied to models with hasOne.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasOne(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttrib>, UserAttrib {
-         *    getRole: Sequelize.HasOneGetAssociationMixin<RoleInstance>;
-         *    // setRole...
-         *    // createRole...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-one/
-         * @see Instance
-         */
-        interface HasOneGetAssociationMixin<TInstance> {
-            /**
-             * Get the associated instance.
-             * @param options The options to use when getting the association.
-             */
-            (options?: HasOneGetAssociationMixinOptions): Promise<TInstance>;
-        }
-
-        /**
-         * The options for the setAssociation mixin of the hasOne association.
-         * @see HasOneSetAssociationMixin
-         */
-        interface HasOneSetAssociationMixinOptions {
-            /**
-             * Skip saving this after setting the foreign key if false.
-             */
-            save?: boolean;
-        }
-
-        /**
-         * The setAssociation mixin applied to models with hasOne.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasOne(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRole...
-         *    setRole: Sequelize.HasOneSetAssociationMixin<RoleInstance, RoleId>;
-         *    // createRole...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-one/
-         * @see Instance
-         */
-        interface HasOneSetAssociationMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Set the associated instance.
-             * @param newAssociation An instance or the primary key of an instance to associate with this. Pass null or undefined to remove the association.
-             * @param options The options passed to `getAssocation` and `target.save`.
-             */
-            (
-                newAssociation?: TInstance | TInstancePrimaryKey,
-                options?: HasOneSetAssociationMixinOptions | HasOneGetAssociationMixinOptions | InstanceSaveOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the createAssociation mixin of the hasOne association.
-         * @see HasOneCreateAssociationMixin
-         */
-        interface HasOneCreateAssociationMixinOptions { }
-
-        /**
-         * The createAssociation mixin applied to models with hasOne.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasOne(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRole...
-         *    // setRole...
-         *    createRole: Sequelize.HasOneCreateAssociationMixin<RoleAttributes>;
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-one/
-         * @see Instance
-         */
-        interface HasOneCreateAssociationMixin<TAttributes> {
-            /**
-             * Create a new instance of the associated model and associate it with this.
-             * @param values The values used to create the association.
-             * @param options The options passed to `target.create` and `setAssociation`.
-             */
-            (
-                values?: TAttributes,
-                options?: HasOneCreateAssociationMixinOptions | HasOneSetAssociationMixinOptions | CreateOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the getAssociations mixin of the hasMany association.
-         * @see HasManyGetAssociationsMixin
-         */
-        interface HasManyGetAssociationsMixinOptions {
-
-            /**
-             * An optional where clause to limit the associated models.
-             */
-            where?: WhereOptions;
-
-            /**
-             * Apply a scope on the related model, or remove its default scope by passing false.
-             */
-            scope?: string | boolean;
-        }
-
-        /**
-         * The getAssociations mixin applied to models with hasMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasMany(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    getRoles: Sequelize.HasManyGetAssociationsMixin<RoleInstance>;
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
-         * @see Instance
-         */
-        interface HasManyGetAssociationsMixin<TInstance> {
-            /**
-             * Get everything currently associated with this, using an optional where clause.
-             * @param options The options to use when getting the associations.
-             */
-            (options?: HasManyGetAssociationsMixinOptions): Promise<TInstance[]>;
-        }
-
-        /**
-         * The options for the setAssociations mixin of the hasMany association.
-         * @see HasManySetAssociationsMixin
-         */
-        interface HasManySetAssociationsMixinOptions {
-
-            /**
-             * Run validation for the join model.
-             */
-            validate?: boolean;
-        }
-
-        /**
-         * The setAssociations mixin applied to models with hasMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasMany(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    setRoles: Sequelize.HasManySetAssociationsMixin<RoleInstance, RoleId>;
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
-         * @see Instance
-         */
-        interface HasManySetAssociationsMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Set the associated models by passing an array of instances or their primary keys.
-             * Everything that it not in the passed array will be un-associated.
-             * @param newAssociations An array of instances or primary key of instances to associate with this. Pass null or undefined to remove all associations.
-             * @param options The options passed to `target.findAll` and `update`.
-             */
-            (
-                newAssociations?: Array<TInstance | TInstancePrimaryKey>,
-                options?: HasManySetAssociationsMixinOptions | FindOptions | InstanceUpdateOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the addAssociations mixin of the hasMany association.
-         * @see HasManyAddAssociationsMixin
-         */
-        interface HasManyAddAssociationsMixinOptions {
-
-            /**
-             * Run validation for the join model.
-             */
-            validate?: boolean;
-        }
-
-        /**
-         * The addAssociations mixin applied to models with hasMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasMany(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    addRoles: Sequelize.HasManyAddAssociationsMixin<RoleInstance, RoleId>;
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
-         * @see Instance
-         */
-        interface HasManyAddAssociationsMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Associate several instances with this.
-             * @param newAssociations An array of instances or primary key of instances to associate with this.
-             * @param options The options passed to `target.update`.
-             */
-            (
-                newAssociations?: Array<TInstance | TInstancePrimaryKey>,
-                options?: HasManyAddAssociationsMixinOptions | InstanceUpdateOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the addAssociation mixin of the hasMany association.
-         * @see HasManyAddAssociationMixin
-         */
-        interface HasManyAddAssociationMixinOptions {
-
-            /**
-             * Run validation for the join model.
-             */
-            validate?: boolean;
-        }
-
-        /**
-         * The addAssociation mixin applied to models with hasMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasMany(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    addRole: Sequelize.HasManyAddAssociationMixin<RoleInstance, RoleId>;
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
-         * @see Instance
-         */
-        interface HasManyAddAssociationMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Associate an instance with this.
-             * @param newAssociation An instance or the primary key of an instance to associate with this.
-             * @param options The options passed to `target.update`.
-             */
-            (
-                newAssociation?: TInstance | TInstancePrimaryKey,
-                options?: HasManyAddAssociationMixinOptions | InstanceUpdateOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the createAssociation mixin of the hasMany association.
-         * @see HasManyCreateAssociationMixin
-         */
-        interface HasManyCreateAssociationMixinOptions { }
-
-        /**
-         * The createAssociation mixin applied to models with hasMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasMany(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    createRole: Sequelize.HasManyCreateAssociationMixin<RoleAttributes>;
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
-         * @see Instance
-         */
-        interface HasManyCreateAssociationMixin<TAttributes> {
-            /**
-             * Create a new instance of the associated model and associate it with this.
-             * @param values The values used to create the association.
-             * @param options The options to use when creating the association.
-             */
-            (
-                values?: TAttributes,
-                options?: HasManyCreateAssociationMixinOptions | CreateOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the removeAssociation mixin of the hasMany association.
-         * @see HasManyRemoveAssociationMixin
-         */
-        interface HasManyRemoveAssociationMixinOptions { }
-
-        /**
-         * The removeAssociation mixin applied to models with hasMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasMany(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    removeRole: Sequelize.HasManyRemoveAssociationMixin<RoleInstance, RoleId>;
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
-         * @see Instance
-         */
-        interface HasManyRemoveAssociationMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Un-associate the instance.
-             * @param oldAssociated The instance or the primary key of the instance to un-associate.
-             * @param options The options passed to `target.update`.
-             */
-            (
-                oldAssociated?: TInstance | TInstancePrimaryKey,
-                options?: HasManyRemoveAssociationMixinOptions | InstanceUpdateOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the removeAssociations mixin of the hasMany association.
-         * @see HasManyRemoveAssociationsMixin
-         */
-        interface HasManyRemoveAssociationsMixinOptions { }
-
-        /**
-         * The removeAssociations mixin applied to models with hasMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasMany(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    removeRoles: Sequelize.HasManyRemoveAssociationsMixin<RoleInstance, RoleId>;
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
-         * @see Instance
-         */
-        interface HasManyRemoveAssociationsMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Un-associate several instances.
-             * @param oldAssociated An array of instances or primary key of instances to un-associate.
-             * @param options The options passed to `target.update`.
-             */
-            (
-                oldAssociateds?: Array<TInstance | TInstancePrimaryKey>,
-                options?: HasManyRemoveAssociationsMixinOptions | InstanceUpdateOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the hasAssociation mixin of the hasMany association.
-         * @see HasManyHasAssociationMixin
-         */
-        interface HasManyHasAssociationMixinOptions { }
-
-        /**
-         * The hasAssociation mixin applied to models with hasMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasMany(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    hasRole: Sequelize.HasManyHasAssociationMixin<RoleInstance, RoleId>;
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
-         * @see Instance
-         */
-        interface HasManyHasAssociationMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Check if an instance is associated with this.
-             * @param target The instance or the primary key of the instance to check.
-             * @param options The options passed to `getAssociations`.
-             */
-            (
-                target: TInstance | TInstancePrimaryKey,
-                options?: HasManyHasAssociationMixinOptions | HasManyGetAssociationsMixinOptions
-            ): Promise<boolean>;
-        }
-
-        /**
-         * The options for the hasAssociations mixin of the hasMany association.
-         * @see HasManyHasAssociationsMixin
-         */
-        interface HasManyHasAssociationsMixinOptions { }
-
-        /**
-         * The removeAssociations mixin applied to models with hasMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasMany(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles
-         *    // hasRole...
-         *    hasRoles: Sequelize.HasManyHasAssociationsMixin<RoleInstance, RoleId>;
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
-         * @see Instance
-         */
-        interface HasManyHasAssociationsMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Check if all instances are associated with this.
-             * @param targets An array of instances or primary key of instances to check.
-             * @param options The options passed to `getAssociations`.
-             */
-            (
-                targets: Array<TInstance | TInstancePrimaryKey>,
-                options?: HasManyHasAssociationsMixinOptions | HasManyGetAssociationsMixinOptions
-            ): Promise<boolean>;
-        }
-
-        /**
-         * The options for the countAssociations mixin of the hasMany association.
-         * @see HasManyCountAssociationsMixin
-         */
-        interface HasManyCountAssociationsMixinOptions {
-
-            /**
-             * An optional where clause to limit the associated models.
-             */
-            where?: WhereOptions;
-
-            /**
-             * Apply a scope on the related model, or remove its default scope by passing false.
-             */
-            scope?: string | boolean;
-        }
-
-        /**
-         * The countAssociations mixin applied to models with hasMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasMany(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    countRoles: Sequelize.HasManyCountAssociationsMixin;
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
-         * @see Instance
-         */
-        interface HasManyCountAssociationsMixin {
-            /**
-             * Count everything currently associated with this, using an optional where clause.
-             * @param options The options to use when counting the associations.
-             */
-            (options?: HasManyCountAssociationsMixinOptions): Promise<number>;
-        }
-
-        /**
-         * The options for the getAssociations mixin of the belongsToMany association.
-         * @see BelongsToManyGetAssociationsMixin
-         */
-        interface BelongsToManyGetAssociationsMixinOptions {
-
-            /**
-             * An optional where clause to limit the associated models.
-             */
-            where?: WhereOptions;
-
-            /**
-             * Apply a scope on the related model, or remove its default scope by passing false.
-             */
-            scope?: string | boolean;
-        }
-
-        /**
-         * The getAssociations mixin applied to models with belongsToMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsToMany(Role, { through: UserRole });
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    getRoles: Sequelize.BelongsToManyGetAssociationsMixin<RoleInstance>;
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
-         * @see Instance
-         */
-        interface BelongsToManyGetAssociationsMixin<TInstance> {
-            /**
-             * Get everything currently associated with this, using an optional where clause.
-             * @param options The options to use when getting the associations.
-             */
-            (options?: BelongsToManyGetAssociationsMixinOptions): Promise<TInstance[]>;
-        }
-
-        /**
-         * The options for the setAssociations mixin of the belongsToMany association.
-         * @see BelongsToManySetAssociationsMixin
-         */
-        interface BelongsToManySetAssociationsMixinOptions {
-
-            /**
-             * Run validation for the join model.
-             */
-            validate?: boolean;
-        }
-
-        /**
-         * The setAssociations mixin applied to models with belongsToMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsToMany(Role, { through: UserRole });
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    setRoles: Sequelize.BelongsToManySetAssociationsMixin<RoleInstance, RoleId, UserRoleAttributes>;
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
-         * @see Instance
-         */
-        interface BelongsToManySetAssociationsMixin<TInstance, TInstancePrimaryKey, TJoinTableAttributes> {
-            /**
-             * Set the associated models by passing an array of instances or their primary keys.
-             * Everything that it not in the passed array will be un-associated.
-             * @param newAssociations An array of instances or primary key of instances to associate with this. Pass null or undefined to remove all associations.
-             * @param options The options passed to `through.findAll`, `bulkCreate`, `update` and `destroy`. Can also hold additional attributes for the join table.
-             */
-            (
-                newAssociations?: Array<TInstance | TInstancePrimaryKey>,
-                options?: BelongsToManySetAssociationsMixinOptions | FindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | TJoinTableAttributes
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the addAssociations mixin of the belongsToMany association.
-         * @see BelongsToManyAddAssociationsMixin
-         */
-        interface BelongsToManyAddAssociationsMixinOptions {
-
-            /**
-             * Run validation for the join model.
-             */
-            validate?: boolean;
-        }
-
-        /**
-         * The addAssociations mixin applied to models with belongsToMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsToMany(Role, { through: UserRole });
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    addRoles: Sequelize.BelongsToManyAddAssociationsMixin<RoleInstance, RoleId, UserRoleAttributes>;
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
-         * @see Instance
-         */
-        interface BelongsToManyAddAssociationsMixin<TInstance, TInstancePrimaryKey, TJoinTableAttributes> {
-            /**
-             * Associate several instances with this.
-             * @param newAssociations An array of instances or primary key of instances to associate with this.
-             * @param options The options passed to `through.findAll`, `bulkCreate`, `update` and `destroy`. Can also hold additional attributes for the join table.
-             */
-            (
-                newAssociations?: Array<TInstance | TInstancePrimaryKey>,
-                options?: BelongsToManyAddAssociationsMixinOptions | FindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | TJoinTableAttributes
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the addAssociation mixin of the belongsToMany association.
-         * @see BelongsToManyAddAssociationMixin
-         */
-        interface BelongsToManyAddAssociationMixinOptions {
-
-            /**
-             * Run validation for the join model.
-             */
-            validate?: boolean;
-        }
-
-        /**
-         * The addAssociation mixin applied to models with belongsToMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsToMany(Role, { through: UserRole });
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    addRole: Sequelize.BelongsToManyAddAssociationMixin<RoleInstance, RoleId, UserRoleAttributes>;
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
-         * @see Instance
-         */
-        interface BelongsToManyAddAssociationMixin<TInstance, TInstancePrimaryKey, TJoinTableAttributes> {
-            /**
-             * Associate an instance with this.
-             * @param newAssociation An instance or the primary key of an instance to associate with this.
-             * @param options The options passed to `through.findAll`, `bulkCreate`, `update` and `destroy`. Can also hold additional attributes for the join table.
-             */
-            (
-                newAssociation?: TInstance | TInstancePrimaryKey,
-                options?: BelongsToManyAddAssociationMixinOptions | FindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | TJoinTableAttributes
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the createAssociation mixin of the belongsToMany association.
-         * @see BelongsToManyCreateAssociationMixin
-         */
-        interface BelongsToManyCreateAssociationMixinOptions { }
-
-        /**
-         * The createAssociation mixin applied to models with belongsToMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsToMany(Role, { through: UserRole });
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    createRole: Sequelize.BelongsToManyCreateAssociationMixin<RoleAttributes, UserRoleAttributes>;
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
-         * @see Instance
-         */
-        interface BelongsToManyCreateAssociationMixin<TAttributes, TJoinTableAttributes> {
-            /**
-             * Create a new instance of the associated model and associate it with this.
-             * @param values The values used to create the association.
-             * @param options Options passed to `create` and `add`. Can also hold additional attributes for the join table.
-             */
-            (
-                values?: TAttributes,
-                options?: BelongsToManyCreateAssociationMixinOptions | CreateOptions | TJoinTableAttributes
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the removeAssociation mixin of the belongsToMany association.
-         * @see BelongsToManyRemoveAssociationMixin
-         */
-        interface BelongsToManyRemoveAssociationMixinOptions { }
-
-        /**
-         * The removeAssociation mixin applied to models with belongsToMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsToMany(Role, { through: UserRole });
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    removeRole: Sequelize.BelongsToManyRemoveAssociationMixin<RoleInstance, RoleId>;
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
-         * @see Instance
-         */
-        interface BelongsToManyRemoveAssociationMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Un-associate the instance.
-             * @param oldAssociated The instance or the primary key of the instance to un-associate.
-             * @param options The options passed to `through.destroy`.
-             */
-            (
-                oldAssociated?: TInstance | TInstancePrimaryKey,
-                options?: BelongsToManyRemoveAssociationMixinOptions | InstanceDestroyOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the removeAssociations mixin of the belongsToMany association.
-         * @see BelongsToManyRemoveAssociationsMixin
-         */
-        interface BelongsToManyRemoveAssociationsMixinOptions { }
-
-        /**
-         * The removeAssociations mixin applied to models with belongsToMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsToMany(Role, { through: UserRole });
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    removeRoles: Sequelize.BelongsToManyRemoveAssociationsMixin<RoleInstance, RoleId>;
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
-         * @see Instance
-         */
-        interface BelongsToManyRemoveAssociationsMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Un-associate several instances.
-             * @param oldAssociated An array of instances or primary key of instances to un-associate.
-             * @param options The options passed to `through.destroy`.
-             */
-            (
-                oldAssociateds?: Array<TInstance | TInstancePrimaryKey>,
-                options?: BelongsToManyRemoveAssociationsMixinOptions | InstanceDestroyOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the hasAssociation mixin of the belongsToMany association.
-         * @see BelongsToManyHasAssociationMixin
-         */
-        interface BelongsToManyHasAssociationMixinOptions { }
-
-        /**
-         * The hasAssociation mixin applied to models with belongsToMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsToMany(Role, { through: UserRole });
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    hasRole: Sequelize.BelongsToManyHasAssociationMixin<RoleInstance, RoleId>;
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
-         * @see Instance
-         */
-        interface BelongsToManyHasAssociationMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Check if an instance is associated with this.
-             * @param target The instance or the primary key of the instance to check.
-             * @param options The options passed to `getAssociations`.
-             */
-            (
-                target: TInstance | TInstancePrimaryKey,
-                options?: BelongsToManyHasAssociationMixinOptions | BelongsToManyGetAssociationsMixinOptions
-            ): Promise<boolean>;
-        }
-
-        /**
-         * The options for the hasAssociations mixin of the belongsToMany association.
-         * @see BelongsToManyHasAssociationsMixin
-         */
-        interface BelongsToManyHasAssociationsMixinOptions { }
-
-        /**
-         * The removeAssociations mixin applied to models with belongsToMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsToMany(Role, { through: UserRole });
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles
-         *    // hasRole...
-         *    hasRoles: Sequelize.BelongsToManyHasAssociationsMixin<RoleInstance, RoleId>;
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
-         * @see Instance
-         */
-        interface BelongsToManyHasAssociationsMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Check if all instances are associated with this.
-             * @param targets An array of instances or primary key of instances to check.
-             * @param options The options passed to `getAssociations`.
-             */
-            (
-                targets: Array<TInstance | TInstancePrimaryKey>,
-                options?: BelongsToManyHasAssociationsMixinOptions | BelongsToManyGetAssociationsMixinOptions
-            ): Promise<boolean>;
-        }
-
-        /**
-         * The options for the countAssociations mixin of the belongsToMany association.
-         * @see BelongsToManyCountAssociationsMixin
-         */
-        interface BelongsToManyCountAssociationsMixinOptions {
-
-            /**
-             * An optional where clause to limit the associated models.
-             */
-            where?: WhereOptions;
-
-            /**
-             * Apply a scope on the related model, or remove its default scope by passing false.
-             */
-            scope?: string | boolean;
-        }
-
-        /**
-         * The countAssociations mixin applied to models with belongsToMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsToMany(Role, { through: UserRole });
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    countRoles: Sequelize.BelongsToManyCountAssociationsMixin;
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
-         * @see Instance
-         */
-        interface BelongsToManyCountAssociationsMixin {
-            /**
-             * Count everything currently associated with this, using an optional where clause.
-             * @param options The options to use when counting the associations.
-             */
-            (options?: BelongsToManyCountAssociationsMixinOptions): Promise<number>;
-        }
-
-        /**
-         * Foreign Key Options
-         *
-         * @see AssociationOptions
-         */
-        interface AssociationForeignKeyOptions extends ColumnOptions {
-
-            /**
-             *  Attribute name for the relation
-             */
-            name? : string;
-
-        }
-
-        /**
-         * Options provided when associating models
-         *
-         * @see Association class
-         */
-        interface AssociationOptions {
-
-            /**
-             * Set to true to run before-/afterDestroy hooks when an associated model is deleted because of a cascade.
-             * For example if `User.hasOne(Profile, {onDelete: 'cascade', hooks:true})`, the before-/afterDestroy hooks
-             * for profile will be called when a user is deleted. Otherwise the profile will be deleted without invoking
-             * any hooks.
-             *
-             * Defaults to false
-             */
-            hooks?: boolean;
-
-            /**
-             * The alias of this model, in singular form. See also the `name` option passed to `sequelize.define`. If
-             * you create multiple associations between the same tables, you should provide an alias to be able to
-             * distinguish between them. If you provide an alias when creating the assocition, you should provide the
-             * same alias when eager loading and when getting assocated models. Defaults to the singularized name of
-             * target
-             */
-                as?: string | { singular: string, plural: string };
-
-            /**
-             * The name of the foreign key in the target table or an object representing the type definition for the
-             * foreign column (see `Sequelize.define` for syntax). When using an object, you can add a `name` property
-             * to set the name of the column. Defaults to the name of source + primary key of source
-             */
-            foreignKey?: string | AssociationForeignKeyOptions;
-
-            /**
-             * What happens when delete occurs.
-             *
-             * Cascade if this is a n:m, and set null if it is a 1:m
-             *
-             * Defaults to 'SET NULL' or 'CASCADE'
-             */
-            onDelete?: string;
-
-            /**
-             * What happens when update occurs
-             *
-             * Defaults to 'CASCADE'
-             */
-            onUpdate?: string;
-
-            /**
-             * Should on update and on delete constraints be enabled on the foreign key.
-             */
-            constraints?: boolean;
-            foreignKeyConstraint?: boolean;
-
-        }
-
-        /**
-         * Options for Association Scope
-         *
-         * @see AssociationOptionsManyToMany
-         */
-        interface AssociationScope {
-
-            /**
-             * The name of the column that will be used for the associated scope and it's value
-             */
-            [scopeName: string] : any;
-
-        }
-
-        /**
-         * Options provided for many-to-many relationships
-         *
-         * @see AssociationOptionsHasMany
-         * @see AssociationOptionsBelongsToMany
-         */
-        interface AssociationOptionsManyToMany extends AssociationOptions {
-
-            /**
-             * A key/value set that will be used for association create and find defaults on the target.
-             * (sqlite not supported for N:M)
-             */
-            scope? : AssociationScope;
-
-        }
-
-        /**
-         * Options provided when associating models with hasOne relationship
-         *
-         * @see Association class hasOne method
-         */
-        interface AssociationOptionsHasOne extends AssociationOptions {
-
-            /**
-             * A string or a data type to represent the identifier in the table
-             */
-            keyType?: DataTypeAbstract;
-
-        }
-
-        /**
-         * Options provided when associating models with belongsTo relationship
-         *
-         * @see Association class belongsTo method
-         */
-        interface AssociationOptionsBelongsTo extends AssociationOptions {
-
-            /**
-             * The name of the field to use as the key for the association in the target table. Defaults to the primary
-             * key of the target table
-             */
-            targetKey? : string;
-
-            /**
-             * A string or a data type to represent the identifier in the table
-             */
-            keyType?: DataTypeAbstract;
-
-        }
-
-        /**
-         * Options provided when associating models with hasMany relationship
-         *
-         * @see Association class hasMany method
-         */
-        interface AssociationOptionsHasMany extends AssociationOptionsManyToMany {
-
-            /**
-             * A string or a data type to represent the identifier in the table
-             */
-            keyType?: DataTypeAbstract;
-
-        }
-
-        /**
-         * Options provided when associating models with belongsToMany relationship
-         *
-         * @see Association class belongsToMany method
-         */
-        interface AssociationOptionsBelongsToMany extends AssociationOptionsManyToMany {
-
-            /**
-             * The name of the table that is used to join source and target in n:m associations. Can also be a
-             * sequelize
-             * model if you want to define the junction table yourself and add extra attributes to it.
-             *
-             * In 3.4.1 version of Sequelize, hasMany's use of through gives an error, and on the other hand through
-             * option for belongsToMany has been made required.
-             *
-             * @see https://github.com/sequelize/sequelize/blob/v3.4.1/lib/associations/has-many.js
-             * @see https://github.com/sequelize/sequelize/blob/v3.4.1/lib/associations/belongs-to-many.js
-             */
-            through : Model<any, any> | string | ThroughOptions;
-
-            /**
-             * The name of the foreign key in the join table (representing the target model) or an object representing
-             * the type definition for the other column (see `Sequelize.define` for syntax). When using an object, you
-             * can add a `name` property to set the name of the colum. Defaults to the name of target + primary key of
-             * target
-             */
-            otherKey? : string | AssociationForeignKeyOptions;
-
-        }
-
-        /**
-         * Used for a association table in n:m associations.
-         *
-         * @see AssociationOptionsBelongsToMany
-         */
-        interface ThroughOptions {
-
-            /**
-             * The model used to join both sides of the N:M association.
-             */
-            model : Model<any, any>;
-
-            /**
-             * A key/value set that will be used for association create and find defaults on the through model.
-             * (Remember to add the attributes to the through model)
-             */
-            scope? : AssociationScope;
-
-            /**
-             * If true a unique key will be generated from the foreign keys used (might want to turn this off and create
-             * specific unique keys when using scopes)
-             *
-             * Defaults to true
-             */
-            unique? : boolean;
-
-        }
-
-        /**
-         * Creating assocations in sequelize is done by calling one of the belongsTo / hasOne / hasMany functions on a
-         * model (the source), and providing another model as the first argument to the function (the target).
-         *
-         * * hasOne - adds a foreign key to target
-         * * belongsTo - add a foreign key to source
-         * * hasMany - adds a foreign key to target, unless you also specify that target hasMany source, in which case
-         * a
-         * junction table is created with sourceId and targetId
-         *
-         * Creating an association will add a foreign key constraint to the attributes. All associations use `CASCADE`
-         * on update and `SET NULL` on delete, except for n:m, which also uses `CASCADE` on delete.
-         *
-         * When creating associations, you can provide an alias, via the `as` option. This is useful if the same model
-         * is associated twice, or you want your association to be called something other than the name of the target
-         * model.
-         *
-         * As an example, consider the case where users have many pictures, one of which is their profile picture. All
-         * pictures have a `userId`, but in addition the user model also has a `profilePictureId`, to be able to easily
-         * load the user's profile picture.
-         *
-         * ```js
-         * User.hasMany(Picture)
-         * User.belongsTo(Picture, { as: 'ProfilePicture', constraints: false })
-         *
-         * user.getPictures() // gets you all pictures
-         * user.getProfilePicture() // gets you only the profile picture
-         *
-         * User.findAll({
-         *   where: ...,
-         *   include: [
-         *     { model: Picture }, // load all pictures
-         *     { model: Picture, as: 'ProfilePicture' }, // load the profile picture. Notice that the spelling must be
-         * the exact same as the one in the association
-         *   ]
-         * })
-         * ```
-         * To get full control over the foreign key column added by sequelize, you can use the `foreignKey` option. It
-         * can either be a string, that specifies the name, or and object type definition,
-         * equivalent to those passed to `sequelize.define`.
-         *
-         * ```js
-         * User.hasMany(Picture, { foreignKey: 'uid' })
-         * ```
-         *
-         * The foreign key column in Picture will now be called `uid` instead of the default `userId`.
-         *
-         * ```js
-         * User.hasMany(Picture, {
-         *   foreignKey: {
-         *     name: 'uid',
-         *     allowNull: false
-         *   }
-         * })
-         * ```
-         *
-         * This specifies that the `uid` column can not be null. In most cases this will already be covered by the
-         * foreign key costraints, which sequelize creates automatically, but can be useful in case where the foreign
-         * keys are disabled, e.g. due to circular references (see `constraints: false` below).
-         *
-         * When fetching associated models, you can limit your query to only load some models. These queries are
-         * written
-         * in the same way as queries to `find`/`findAll`. To only get pictures in JPG, you can do:
-         *
-         * ```js
-         * user.getPictures({
-         *   where: {
-         *     format: 'jpg'
-         *   }
-         * })
-         * ```
-         *
-         * There are several ways to update and add new assoications. Continuing with our example of users and
-         * pictures:
-         * ```js
-         * user.addPicture(p) // Add a single picture
-         * user.setPictures([p1, p2]) // Associate user with ONLY these two picture, all other associations will be
-         * deleted user.addPictures([p1, p2]) // Associate user with these two pictures, but don't touch any current
-         * associations
-         * ```
-         *
-         * You don't have to pass in a complete object to the association functions, if your associated model has a
-         * single primary key:
-         *
-         * ```js
-         * user.addPicture(req.query.pid) // Here pid is just an integer, representing the primary key of the picture
-         * ```
-         *
-         * In the example above we have specified that a user belongs to his profile picture. Conceptually, this might
-         * not make sense, but since we want to add the foreign key to the user model this is the way to do it.
-         *
-         * Note how we also specified `constraints: false` for profile picture. This is because we add a foreign key
-         * from user to picture (profilePictureId), and from picture to user (userId). If we were to add foreign keys
-         * to both, it would create a cyclic dependency, and sequelize would not know which table to create first,
-         * since user depends on picture, and picture depends on user. These kinds of problems are detected by
-         * sequelize before the models are synced to the database, and you will get an error along the lines of `Error:
-         * Cyclic dependency found. 'users' is dependent of itself`. If you encounter this, you should either disable
-         * some constraints, or rethink your associations completely.
-         *
-         * @see Sequelize.Model
-         */
-        interface Associations {
-
-            /**
-             * Creates an association between this (the source) and the provided target. The foreign key is added
-             * on the target.
-             *
-             * Example: `User.hasOne(Profile)`. This will add userId to the profile table.
-             *
-             * @param target The model that will be associated with hasOne relationship
-             * @param options Options for the association
-             */
-            hasOne( target : Model<any, any>, options? : AssociationOptionsHasOne ): void;
-
-            /**
-             * Creates an association between this (the source) and the provided target. The foreign key is added on the
-             * source.
-             *
-             * Example: `Profile.belongsTo(User)`. This will add userId to the profile table.
-             *
-             * @param target The model that will be associated with hasOne relationship
-             * @param options Options for the association
-             */
-            belongsTo( target : Model<any, any>, options? : AssociationOptionsBelongsTo ) : void;
-
-            /**
-             * Create an association that is either 1:m or n:m.
-             *
-             * ```js
-             * // Create a 1:m association between user and project
-             * User.hasMany(Project)
-             * ```
-             * ```js
-             * // Create a n:m association between user and project
-             * User.hasMany(Project)
-             * Project.hasMany(User)
-             * ```
-             * By default, the name of the join table will be source+target, so in this case projectsusers. This can be
-             * overridden by providing either a string or a Model as `through` in the options. If you use a through
-             * model with custom attributes, these attributes can be set when adding / setting new associations in two
-             * ways. Consider users and projects from before with a join table that stores whether the project has been
-             * started yet:
-             * ```js
-             * var UserProjects = sequelize.define('userprojects', {
-             *   started: Sequelize.BOOLEAN
-             * })
-             * User.hasMany(Project, { through: UserProjects })
-             * Project.hasMany(User, { through: UserProjects })
-             * ```
-             * ```js
-             * jan.addProject(homework, { started: false }) // The homework project is not started yet
-             * jan.setProjects([makedinner, doshopping], { started: true}) // Both shopping and dinner have been
-             * started
-             * ```
-             *
-             * If you want to set several target instances, but with different attributes you have to set the
-             * attributes on the instance, using a property with the name of the through model:
-             *
-             * ```js
-             * p1.userprojects {
-             *   started: true
-             * }
-             * user.setProjects([p1, p2], {started: false}) // The default value is false, but p1 overrides that.
-             * ```
-             *
-             * Similarily, when fetching through a join table with custom attributes, these attributes will be
-             * available as an object with the name of the through model.
-             * ```js
-             * user.getProjects().then(function (projects) {
-             *   var p1 = projects[0]
-             *   p1.userprojects.started // Is this project started yet?
-             * })
-             * ```
-             *
-             * @param target The model that will be associated with hasOne relationship
-             * @param options Options for the association
-             */
-            hasMany( target : Model<any, any>, options? : AssociationOptionsHasMany ) : void;
-
-            /**
-             * Create an N:M association with a join table
-             *
-             * ```js
-             * User.belongsToMany(Project)
-             * Project.belongsToMany(User)
-             * ```
-             * By default, the name of the join table will be source+target, so in this case projectsusers. This can be
-             * overridden by providing either a string or a Model as `through` in the options.
-             *
-             * If you use a through model with custom attributes, these attributes can be set when adding / setting new
-             * associations in two ways. Consider users and projects from before with a join table that stores whether
-             * the project has been started yet:
-             * ```js
-             * var UserProjects = sequelize.define('userprojects', {
-             *   started: Sequelize.BOOLEAN
-             * })
-             * User.belongsToMany(Project, { through: UserProjects })
-             * Project.belongsToMany(User, { through: UserProjects })
-             * ```
-             * ```js
-             * jan.addProject(homework, { started: false }) // The homework project is not started yet
-             * jan.setProjects([makedinner, doshopping], { started: true}) // Both shopping and dinner has been started
-             * ```
-             *
-             * If you want to set several target instances, but with different attributes you have to set the
-             * attributes on the instance, using a property with the name of the through model:
-             *
-             * ```js
-             * p1.userprojects {
-             *   started: true
-             * }
-             * user.setProjects([p1, p2], {started: false}) // The default value is false, but p1 overrides that.
-             * ```
-             *
-             * Similarily, when fetching through a join table with custom attributes, these attributes will be
-             * available as an object with the name of the through model.
-             * ```js
-             * user.getProjects().then(function (projects) {
-             *   var p1 = projects[0]
-             *   p1.userprojects.started // Is this project started yet?
-             * })
-             * ```
-             *
-             * @param target The model that will be associated with hasOne relationship
-             * @param options Options for the association
-             *
-             */
-            belongsToMany( target : Model<any, any>, options : AssociationOptionsBelongsToMany ) : void;
-
-        }
-
-        //
-        //  DataTypes
-        // ~~~~~~~~~~~
-        //
-        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/data-types.js
-        //
-
-        /**
-         * Abstract DataType interface. Use this if you want to create an interface that has a value any of the
-         * DataTypes that Sequelize supports.
-         */
-        interface DataTypeAbstract {
-
-            /**
-             * Although this is not needed for the definitions itself, we want to make sure that DataTypeAbstract is not
-             * something than can be evaluated to an empty object.
-             */
-            dialectTypes : string;
-
-        }
-
-        interface DataTypeAbstractString<T> extends DataTypeAbstract {
-
-            /**
-             * A variable length string. Default length 255
-             */
-            ( options? : { length: number } ) : T;
-            ( length : number ) : T;
-
-            /**
-             * Property BINARY for the type
-             */
-            BINARY : T;
-
-        }
-
-        interface DataTypeString extends DataTypeAbstractString<DataTypeString> { }
-
-        interface DataTypeChar extends DataTypeAbstractString<DataTypeChar> { }
-
-        interface DataTypeText extends DataTypeAbstract {
-
-            /**
-             * Length of the text field.
-             *
-             * Available lengths: `tiny`, `medium`, `long`
-             */
-            ( options? : { length: string } ) : DataTypeText;
-            ( length : string ) : DataTypeText;
-
-        }
-
-        interface DataTypeAbstractNumber<T> extends DataTypeAbstract {
-            UNSIGNED : T;
-            ZEROFILL : T;
-        }
-
-        interface DataTypeNumber extends DataTypeAbstractNumber<DataTypeNumber> { }
-
-        interface DataTypeInteger extends DataTypeAbstractNumber<DataTypeInteger> {
-
-            /**
-             * Length of the number field.
-             */
-            ( options? : { length: number } ) : DataTypeInteger;
-            ( length : number ) : DataTypeInteger;
-
-        }
-
-        interface DataTypeBigInt extends DataTypeAbstractNumber<DataTypeBigInt> {
-
-            /**
-             * Length of the number field.
-             */
-            ( options? : { length: number } ) : DataTypeBigInt;
-            ( length : number ) : DataTypeBigInt;
-
-        }
-
-        interface DataTypeFloat extends DataTypeAbstractNumber<DataTypeFloat> {
-
-            /**
-             * Length of the number field and decimals of the float
-             */
-            ( options? : { length: number, decimals?: number } ) : DataTypeFloat;
-            ( length : number, decimals? : number ) : DataTypeFloat;
-
-        }
-
-        interface DataTypeReal extends DataTypeAbstractNumber<DataTypeReal> {
-
-            /**
-             * Length of the number field and decimals of the real
-             */
-            ( options? : { length: number, decimals?: number } ) : DataTypeReal;
-            ( length : number, decimals? : number ) : DataTypeReal;
-
-        }
-
-        interface DataTypeDouble extends DataTypeAbstractNumber<DataTypeDouble> {
-
-            /**
-             * Length of the number field and decimals of the real
-             */
-            ( options? : { length: number, decimals?: number } ) : DataTypeDouble;
-            ( length : number, decimals? : number ) : DataTypeDouble;
-
-        }
-
-        interface DataTypeDecimal extends DataTypeAbstractNumber<DataTypeDecimal> {
-
-            /**
-             * Precision and scale for the decimal number
-             */
-            ( options? : { precision: number, scale?: number } ) : DataTypeDecimal;
-            ( precision : number, scale? : number ) : DataTypeDecimal;
-
-        }
-
-        interface DataTypeBoolean extends DataTypeAbstract { }
-
-        interface DataTypeTime extends DataTypeAbstract { }
-
-        interface DataTypeDate extends DataTypeAbstract {
-
-            /**
-             * Length of decimal places of time
-             */
-            ( options? : { length?: number } ) : DataTypeDate;
-            ( length? : number) : DataTypeDate;
-
-        }
-
-        interface DataTypeDateOnly extends DataTypeAbstract { }
-
-        interface DataTypeHStore extends DataTypeAbstract { }
-
-        interface DataTypeJSONType extends DataTypeAbstract { }
-
-        interface DataTypeJSONB extends DataTypeAbstract { }
-
-        interface DataTypeNow extends DataTypeAbstract { }
-
-        interface DataTypeBlob extends DataTypeAbstract {
-
-            /**
-             * Length of the blob field.
-             *
-             * Available lengths: `tiny`, `medium`, `long`
-             */
-            ( options? : { length: string } ) : DataTypeBlob;
-            ( length : string ) : DataTypeBlob;
-
-        }
-
-        interface DataTypeRange extends DataTypeAbstract {
-
-            /**
-             * Range field for Postgre
-             *
-             * Accepts subtype any of the ranges
-             */
-            ( options? : { subtype: DataTypeAbstract } ) : DataTypeRange;
-            ( subtype : DataTypeAbstract ) : DataTypeRange;
-
-        }
-
-        interface DataTypeUUID extends DataTypeAbstract { }
-
-        interface DataTypeUUIDv1 extends DataTypeAbstract { }
-
-        interface DataTypeUUIDv4 extends DataTypeAbstract { }
-
-        interface DataTypeVirtual extends DataTypeAbstract {
-
-            /**
-             * Virtual field
-             *
-             * Accepts subtype any of the DataTypes
-             * Array of required attributes that are available on the model
-             */
-            new( subtype : DataTypeAbstract, requireAttributes? : Array<string> ) : DataTypeVirtual;
-        }
-
-        interface DataTypeEnum extends DataTypeAbstract {
-
-            /**
-             * Enum field
-             *
-             * Accepts values
-             */
-            ( options? : { values: string | string[] } ) : DataTypeEnum;
-            ( values : string | string[] ) : DataTypeEnum;
-            ( ...args : string[] ) : DataTypeEnum;
-
-        }
-
-        interface DataTypeArray extends DataTypeAbstract {
-
-            /**
-             * Array field for Postgre
-             *
-             * Accepts type any of the DataTypes
-             */
-            ( options : { type: DataTypeAbstract } ) : DataTypeArray;
-            ( type : DataTypeAbstract ) : DataTypeArray;
-
-        }
-
-        interface DataTypeGeometry extends DataTypeAbstract {
-
-            /**
-             * Geometry field for Postgres
-             */
-            ( type : string, srid? : number ) : DataTypeGeometry;
-
-        }
-
-        /**
-         * A convenience class holding commonly used data types. The datatypes are used when definining a new model
-         * using
-         * `Sequelize.define`, like this:
-         *
-         * ```js
-         * sequelize.define('model', {
-     *   column: DataTypes.INTEGER
-     * })
-         * ```
-         * When defining a model you can just as easily pass a string as type, but often using the types defined here
-         * is
-         * beneficial. For example, using `DataTypes.BLOB`, mean that that column will be returned as an instance of
-         * `Buffer` when being fetched by sequelize.
-         *
-         * Some data types have special properties that can be accessed in order to change the data type.
-         * For example, to get an unsigned integer with zerofill you can do `DataTypes.INTEGER.UNSIGNED.ZEROFILL`.
-         * The order you access the properties in do not matter, so `DataTypes.INTEGER.ZEROFILL.UNSIGNED` is fine as
-         * well. The available properties are listed under each data type.
-         *
-         * To provide a length for the data type, you can invoke it like a function: `INTEGER(2)`
-         *
-         * Three of the values provided here (`NOW`, `UUIDV1` and `UUIDV4`) are special default values, that should not
-         * be used to define types. Instead they are used as shorthands for defining default values. For example, to
-         * get a uuid field with a default value generated following v1 of the UUID standard:
-         *
-         * ```js
-         * sequelize.define('model', {
-     *   uuid: {
-     *     type: DataTypes.UUID,
-     *     defaultValue: DataTypes.UUIDV1,
-     *     primaryKey: true
-     *   }
-     * })
-         * ```
-         */
-        interface DataTypes {
-            ABSTRACT : DataTypeAbstract;
-            STRING : DataTypeString;
-            CHAR : DataTypeChar;
-            TEXT : DataTypeText;
-            NUMBER : DataTypeNumber;
-            INTEGER : DataTypeInteger;
-            BIGINT : DataTypeBigInt;
-            FLOAT : DataTypeFloat;
-            TIME : DataTypeTime;
-            DATE : DataTypeDate;
-            DATEONLY: DataTypeDateOnly;
-            BOOLEAN: DataTypeBoolean;
-            NOW: DataTypeNow;
-            BLOB: DataTypeBlob;
-            DECIMAL: DataTypeDecimal;
-            NUMERIC: DataTypeDecimal;
-            UUID: DataTypeUUID;
-            UUIDV1: DataTypeUUIDv1;
-            UUIDV4: DataTypeUUIDv4;
-            HSTORE: DataTypeHStore;
-            JSON: DataTypeJSONType;
-            JSONB: DataTypeJSONB;
-            VIRTUAL: DataTypeVirtual;
-            ARRAY: DataTypeArray;
-            NONE: DataTypeVirtual;
-            ENUM: DataTypeEnum;
-            RANGE: DataTypeRange;
-            REAL: DataTypeReal;
-            DOUBLE: DataTypeDouble;
-            "DOUBLE PRECISION": DataTypeDouble;
-            GEOMETRY: DataTypeGeometry;
-        }
-
-        //
-        //  Deferrable
-        // ~~~~~~~~~~~~
-        //
-        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/deferrable.js
-        //
-
-        /**
-         * Abstract Deferrable interface. Use this if you want to create an interface that has a value any of the
-         * Deferrables that Sequelize supports.
-         */
-        interface DeferrableAbstract {
-
-            /**
-             * Although this is not needed for the definitions itself, we want to make sure that DeferrableAbstract is
-             * not something than can be evaluated to an empty object.
-             */
-            toString() : string;
-            toSql() : string;
-
-        }
-
-        interface DeferrableInitiallyDeferred extends DeferrableAbstract {
-
-            /**
-             * A property that will defer constraints checks to the end of transactions.
-             */
-            () : DeferrableInitiallyDeferred;
-
-        }
-
-        interface DeferrableInitiallyImmediate extends DeferrableAbstract {
-
-            /**
-             * A property that will trigger the constraint checks immediately
-             */
-            () : DeferrableInitiallyImmediate;
-
-        }
-
-        interface DeferrableNot extends DeferrableAbstract {
-
-            /**
-             * A property that will set the constraints to not deferred. This is the default in PostgreSQL and it make
-             * it impossible to dynamically defer the constraints within a transaction.
-             */
-            () : DeferrableNot;
-
-        }
-
-        interface DeferrableSetDeferred extends DeferrableAbstract {
-
-            /**
-             * A property that will trigger an additional query at the beginning of a
-             * transaction which sets the constraints to deferred.
-             *
-             * @param constraints An array of constraint names. Will defer all constraints by default.
-             */
-            ( constraints : string[] ) : DeferrableSetDeferred;
-
-        }
-
-        interface DeferrableSetImmediate extends DeferrableAbstract {
-
-            /**
-             * A property that will trigger an additional query at the beginning of a
-             * transaction which sets the constraints to immediately.
-             *
-             * @param constraints An array of constraint names. Will defer all constraints by default.
-             */
-            ( constraints : string[] ) : DeferrableSetImmediate;
-
-        }
-
-        /**
-         * A collection of properties related to deferrable constraints. It can be used to
-         * make foreign key constraints deferrable and to set the constaints within a
-         * transaction. This is only supported in PostgreSQL.
-         *
-         * The foreign keys can be configured like this. It will create a foreign key
-         * that will check the constraints immediately when the data was inserted.
-         *
-         * ```js
-         * sequelize.define('Model', {
-         *   foreign_id: {
-         *     type: Sequelize.INTEGER,
-         *     references: {
-         *       model: OtherModel,
-         *       key: 'id',
-         *       deferrable: Sequelize.Deferrable.INITIALLY_IMMEDIATE
-         *     }
-         *   }
-         * });
-         * ```
-         *
-         * The constraints can be configured in a transaction like this. It will
-         * trigger a query once the transaction has been started and set the constraints
-         * to be checked at the very end of the transaction.
-         *
-         * ```js
-         * sequelize.transaction({
-     *   deferrable: Sequelize.Deferrable.SET_DEFERRED
-     * });
-         * ```
-         */
-        interface Deferrable {
-            INITIALLY_DEFERRED: DeferrableInitiallyDeferred;
-            INITIALLY_IMMEDIATE: DeferrableInitiallyImmediate;
-            NOT: DeferrableNot;
-            SET_DEFERRED: DeferrableSetDeferred;
-            SET_IMMEDIATE: DeferrableSetImmediate;
-        }
-
-        //
-        //  Errors
-        // ~~~~~~~~
-        //
-        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/errors.js
-        //
-
-        /**
-         * The Base Error all Sequelize Errors inherit from.
-         */
-        interface BaseError extends Error, ErrorConstructor { }
-
-        interface ValidationError extends BaseError {
-
-            /**
-             * Validation Error. Thrown when the sequelize validation has failed. The error contains an `errors`
-             * property, which is an array with 1 or more ValidationErrorItems, one for each validation that failed.
-             *
-             * @param message Error message
-             * @param errors  Array of ValidationErrorItem objects describing the validation errors
-             */
-            new ( message : string, errors? : ValidationErrorItem[] ) : ValidationError;
-
-            /**
-             * Gets all validation error items for the path / field specified.
-             *
-             * @param path The path to be checked for error items
-             */
-            get( path : string ) : ValidationErrorItem[];
-
-            /** Array of ValidationErrorItem objects describing the validation errors */
-            errors : ValidationErrorItem[];
-
-        }
-
-        interface ValidationErrorItem extends BaseError {
-
-            /**
-             * Validation Error Item
-             * Instances of this class are included in the `ValidationError.errors` property.
-             *
-             * @param message An error message
-             * @param type The type of the validation error
-             * @param path The field that triggered the validation error
-             * @param value The value that generated the error
-             */
-            new ( message : string, type : string, path : string, value : string ) : ValidationErrorItem;
-
-            /** An error message */
-            message : string;
-
-            /** The type of the validation error */
-            type : string;
-
-            /** The field that triggered the validation error */
-            path : string;
-
-            /** The value that generated the error */
-            value : string;
-
-        }
-
-        interface DatabaseError extends BaseError {
-
-            /**
-             * A base class for all database related errors.
-             */
-            new ( parent : Error ) : DatabaseError;
-
-        }
-
-        interface TimeoutError extends DatabaseError {
-
-            /**
-             * Thrown when a database query times out because of a deadlock
-             */
-            new ( parent : Error ) : TimeoutError;
-
-        }
-
-        interface UniqueConstraintError extends DatabaseError {
-
-            /**
-             * Thrown when a unique constraint is violated in the database
-             */
-            new ( options : { parent? : Error, message? : string, errors? : Object } ) : UniqueConstraintError;
-
-        }
-
-        interface ForeignKeyConstraintError extends DatabaseError {
-
-            /**
-             * Thrown when a foreign key constraint is violated in the database
-             */
-            new ( options : { parent? : Error, message? : string, index? : string, fields? : string[], table? : string } ) : ForeignKeyConstraintError;
-
-        }
-
-        interface ExclusionConstraintError extends DatabaseError {
-
-            /**
-             * Thrown when an exclusion constraint is violated in the database
-             */
-            new ( options : { parent? : Error, message? : string, constraint? : string, fields? : string[], table? : string } ) : ExclusionConstraintError;
-
-        }
-
-        interface ConnectionError extends BaseError {
-
-            /**
-             * A base class for all connection related errors.
-             */
-            new ( parent : Error ) : ConnectionError;
-
-        }
-
-        interface ConnectionRefusedError extends ConnectionError {
-
-            /**
-             * Thrown when a connection to a database is refused
-             */
-            new ( parent : Error ) : ConnectionRefusedError;
-
-        }
-
-        interface AccessDeniedError extends ConnectionError {
-
-            /**
-             * Thrown when a connection to a database is refused due to insufficient privileges
-             */
-            new ( parent : Error ) : AccessDeniedError;
-
-        }
-
-        interface HostNotFoundError extends ConnectionError {
-
-            /**
-             * Thrown when a connection to a database has a hostname that was not found
-             */
-            new ( parent : Error ) : HostNotFoundError;
-
-        }
-
-        interface HostNotReachableError extends ConnectionError {
-
-            /**
-             * Thrown when a connection to a database has a hostname that was not reachable
-             */
-            new ( parent : Error ) : HostNotReachableError;
-
-        }
-
-        interface InvalidConnectionError extends ConnectionError {
-
-            /**
-             * Thrown when a connection to a database has invalid values for any of the connection parameters
-             */
-            new ( parent : Error ) : InvalidConnectionError;
-
-        }
-
-        interface ConnectionTimedOutError extends ConnectionError {
-
-            /**
-             * Thrown when a connection to a database times out
-             */
-            new ( parent : Error ) : ConnectionTimedOutError;
-
-        }
-
-        /**
-         * Sequelize provides a host of custom error classes, to allow you to do easier debugging. All of these errors
-         * are exposed on the sequelize object and the sequelize constructor. All sequelize errors inherit from the
-         * base JS error object.
-         */
-        interface Errors {
-            Error : BaseError;
-            ValidationError : ValidationError;
-            ValidationErrorItem : ValidationErrorItem;
-            DatabaseError : DatabaseError;
-            TimeoutError : TimeoutError;
-            UniqueConstraintError : UniqueConstraintError;
-            ExclusionConstraintError : ExclusionConstraintError;
-            ForeignKeyConstraintError : ForeignKeyConstraintError;
-            ConnectionError : ConnectionError;
-            ConnectionRefusedError : ConnectionRefusedError;
-            AccessDeniedError : AccessDeniedError;
-            HostNotFoundError : HostNotFoundError;
-            HostNotReachableError : HostNotReachableError;
-            InvalidConnectionError : InvalidConnectionError;
-            ConnectionTimedOutError : ConnectionTimedOutError;
-        }
-
-        //
-        //  Hooks
-        // ~~~~~~~
-        //
-        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/hooks.js
-        //
-
-        /**
-         * Options for Sequelize.define. We mostly duplicate the Hooks here, since there is no way to combine the two
-         * interfaces.
-         *
-         * beforeValidate, afterValidate, beforeBulkCreate, beforeBulkDestroy, beforeBulkUpdate, beforeCreate,
-         * beforeDestroy, beforeUpdate, afterCreate, afterDestroy, afterUpdate, afterBulkCreate, afterBulkDestroy and
-         * afterBulkUpdate.
-         */
-        interface HooksDefineOptions<TInstance> {
-
-            beforeValidate? : ( instance : TInstance, options : Object, fn? : Function ) => any;
-            afterValidate? : ( instance : TInstance, options : Object, fn? : Function ) => any;
-            beforeCreate? : ( attributes : TInstance, options : Object, fn? : Function ) => any;
-            afterCreate? : ( attributes : TInstance, options : Object, fn? : Function ) => any;
-            beforeDestroy? : ( instance : TInstance, options : Object, fn? : Function ) => any;
-            beforeDelete? : ( instance : TInstance, options : Object, fn? : Function ) => any;
-            afterDestroy? : ( instance : TInstance, options : Object, fn? : Function ) => any;
-            afterDelete? : ( instance : TInstance, options : Object, fn? : Function ) => any;
-            beforeUpdate? : ( instance : TInstance, options : Object, fn? : Function ) => any;
-            afterUpdate? : ( instance : TInstance, options : Object, fn? : Function ) => any;
-            beforeBulkCreate? : ( instances : TInstance[], options : Object, fn? : Function ) => any;
-            afterBulkCreate? : ( instances : TInstance[], options : Object, fn? : Function ) => any;
-            beforeBulkDestroy? : ( options : Object, fn? : Function ) => any;
-            beforeBulkDelete? : ( options : Object, fn? : Function ) => any;
-            afterBulkDestroy? : ( options : Object, fn? : Function ) => any;
-            afterBulkDelete? : ( options : Object, fn? : Function ) => any;
-            beforeBulkUpdate? : ( options : Object, fn? : Function ) => any;
-            afterBulkUpdate? : ( options : Object, fn? : Function ) => any;
-            beforeFind? : ( options : Object, fn? : Function ) => any;
-            beforeFindAfterExpandIncludeAll? : ( options : Object, fn? : Function ) => any;
-            beforeFindAfterOptions? : ( options : Object, fn? : Function ) => any;
-            afterFind? : ( instancesOrInstance : TInstance[] | TInstance, options : Object,
-                           fn? : Function ) => any;
-
-        }
-
-        /**
-         * Hooks are function that are called before and after  (bulk-) creation/updating/deletion and validation.
-         * Hooks can be added to you models in three ways:
-         *
-         * 1. By specifying them as options in `sequelize.define`
-         * 2. By calling `hook()` with a string and your hook handler function
-         * 3. By calling the function with the same name as the hook you want
-         *
-         * ```js
-         * // Method 1
-         * sequelize.define(name, { attributes }, {
-         *   hooks: {
-         *     beforeBulkCreate: function () {
-         *       // can be a single function
-         *     },
-         *     beforeValidate: [
-         *       function () {},
-         *       function() {} // Or an array of several
-         *     ]
-         *   }
-         * })
-         *
-         * // Method 2
-         * Model.hook('afterDestroy', function () {})
-         *
-         * // Method 3
-         * Model.afterBulkUpdate(function () {})
-         * ```
-         *
-         * @see Sequelize.define
-         */
-        interface Hooks<TInstance> {
-
-            /**
-             * Add a hook to the model
-             *
-             * @param hookType
-             * @param name Provide a name for the hook function. It can be used to remove the hook later or to order
-             *     hooks based on some sort of priority system in the future.
-             * @param fn The hook function
-             *
-             * @alias hook
-             */
-            addHook( hookType : string, name : string, fn : Function ) : Hooks<TInstance>;
-            addHook( hookType : string, fn : Function ) : Hooks<TInstance>;
-            hook( hookType : string, name : string, fn : Function ) : Hooks<TInstance>;
-            hook( hookType : string, fn : Function ) : Hooks<TInstance>;
-
-            /**
-             * Remove hook from the model
-             *
-             * @param hookType
-             * @param name
-             */
-            removeHook( hookType : string, name : string ) : Hooks<TInstance>;
-
-            /**
-             * Check whether the mode has any hooks of this type
-             *
-             * @param hookType
-             *
-             * @alias hasHooks
-             */
-            hasHook( hookType : string ) : boolean;
-            hasHooks( hookType : string ) : boolean;
-
-            /**
-             * A hook that is run before validation
-             *
-             * @param name
-             * @param fn A callback function that is called with instance, options
-             */
-            beforeValidate( name : string,
-                            fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-            beforeValidate( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run after validation
-             *
-             * @param name
-             * @param fn A callback function that is called with instance, options
-             */
-            afterValidate( name : string,
-                           fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-            afterValidate( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run before creating a single instance
-             *
-             * @param name
-             * @param fn A callback function that is called with attributes, options
-             */
-            beforeCreate( name : string,
-                          fn : ( attributes : TInstance, options : Object, fn? : Function ) => void ): void;
-            beforeCreate( fn : ( attributes : TInstance, options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run after creating a single instance
-             *
-             * @param name
-             * @param fn A callback function that is called with attributes, options
-             */
-            afterCreate( name : string,
-                         fn : ( attributes : TInstance, options : Object, fn? : Function ) => void ): void;
-            afterCreate( fn : ( attributes : TInstance, options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run before destroying a single instance
-             *
-             * @param name
-             * @param fn A callback function that is called with instance, options
-             * @alias beforeDelete
-             */
-            beforeDestroy( name : string,
-                           fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-            beforeDestroy( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-            beforeDelete( name : string,
-                          fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-            beforeDelete( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run after destroying a single instance
-             *
-             * @param name
-             * @param fn A callback function that is called with instance, options
-             * @alias afterDelete
-             */
-            afterDestroy( name : string,
-                          fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-            afterDestroy( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-            afterDelete( name : string, fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-            afterDelete( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run before updating a single instance
-             *
-             * @param name
-             * @param fn A callback function that is called with instance, options
-             */
-            beforeUpdate( name : string,
-                          fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-            beforeUpdate( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run after updating a single instance
-             *
-             * @param name
-             * @param fn A callback function that is called with instance, options
-             */
-            afterUpdate( name : string, fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-            afterUpdate( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run before creating instances in bulk
-             *
-             * @param name
-             * @param fn A callback function that is called with instances, options
-             */
-            beforeBulkCreate( name : string,
-                              fn : ( instances : TInstance[], options : Object, fn? : Function ) => void ): void;
-            beforeBulkCreate( fn : ( instances : TInstance[], options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run after creating instances in bulk
-             *
-             * @param name
-             * @param fn A callback function that is called with instances, options
-             * @name afterBulkCreate
-             */
-            afterBulkCreate( name : string,
-                             fn : ( instances : TInstance[], options : Object, fn? : Function ) => void ): void;
-            afterBulkCreate( fn : ( instances : TInstance[], options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run before destroying instances in bulk
-             *
-             * @param name
-             * @param fn   A callback function that is called with options
-             *
-             * @alias beforeBulkDelete
-             */
-            beforeBulkDestroy( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
-            beforeBulkDestroy( fn : ( options : Object, fn? : Function ) => void ): void;
-            beforeBulkDelete( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
-            beforeBulkDelete( fn : ( options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run after destroying instances in bulk
-             *
-             * @param name
-             * @param fn   A callback function that is called with options
-             *
-             * @alias afterBulkDelete
-             */
-            afterBulkDestroy( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
-            afterBulkDestroy( fn : ( options : Object, fn? : Function ) => void ): void;
-            afterBulkDelete( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
-            afterBulkDelete( fn : ( options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run after updating instances in bulk
-             *
-             * @param name
-             * @param fn   A callback function that is called with options
-             */
-            beforeBulkUpdate( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
-            beforeBulkUpdate( fn : ( options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run after updating instances in bulk
-             *
-             * @param name
-             * @param fn   A callback function that is called with options
-             */
-            afterBulkUpdate( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
-            afterBulkUpdate( fn : ( options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run before a find (select) query
-             *
-             * @param name
-             * @param fn   A callback function that is called with options
-             */
-            beforeFind( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
-            beforeFind( fn : ( options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run before a find (select) query, after any { include: {all: ...} } options are expanded
-             *
-             * @param name
-             * @param fn   A callback function that is called with options
-             */
-            beforeFindAfterExpandIncludeAll( name : string,
-                                             fn : ( options : Object, fn? : Function ) => void ): void;
-            beforeFindAfterExpandIncludeAll( fn : ( options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run before a find (select) query, after all option parsing is complete
-             *
-             * @param name
-             * @param fn   A callback function that is called with options
-             */
-            beforeFindAfterOptions( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
-            beforeFindAfterOptions( fn : ( options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run after a find (select) query
-             *
-             * @param name
-             * @param fn   A callback function that is called with instance(s), options
-             */
-            afterFind( name : string,
-                       fn : ( instancesOrInstance : TInstance[] | TInstance, options : Object,
-                              fn? : Function ) => void ): void;
-            afterFind( fn : ( instancesOrInstance : TInstance[] | TInstance, options : Object,
-                              fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run before a define call
-             *
-             * @param name
-             * @param fn   A callback function that is called with attributes, options
-             */
-            beforeDefine( name : string, fn : ( attributes : DefineAttributes, options : Object ) => void ): void;
-            beforeDefine( fn : ( attributes : DefineAttributes, options : Object ) => void ): void;
-
-            /**
-             * A hook that is run after a define call
-             *
-             * @param name
-             * @param fn   A callback function that is called with factory
-             */
-            afterDefine( name : string, fn : ( model : Model<TInstance, any> ) => void ): void;
-            afterDefine( fn : ( model : Model<TInstance, any> ) => void ): void;
-
-            /**
-             * A hook that is run before Sequelize() call
-             *
-             * @param name
-             * @param fn   A callback function that is called with config, options
-             */
-            beforeInit( name : string, fn : ( config : Object, options : Object ) => void ): void;
-            beforeInit( fn : ( config : Object, options : Object ) => void ): void;
-
-            /**
-             * A hook that is run after Sequelize() call
-             *
-             * @param name
-             * @param fn   A callback function that is called with sequelize
-             */
-            afterInit( name : string, fn : ( sequelize : Sequelize ) => void ): void;
-            afterInit( fn : ( sequelize : Sequelize ) => void ): void;
-
-        }
-
-        //
-        //  Instance
-        // ~~~~~~~~~~
-        //
-        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/instance.js
-        //
-
-        /**
-         * Options used for Instance.increment method
-         */
-        interface InstanceIncrementDecrementOptions {
-
-            /**
-             * The number to increment by
-             *
-             * Defaults to 1
-             */
-            by? : number;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-            /**
-             * Transaction to run query under
-             */
-            transaction? : Transaction;
-
-            /**
-             * A hash of attributes to describe your search. See above for examples.
-             */
-            where? : WhereOptions | Array<col | and | or | string>;
-
-        }
-
-        /**
-         * Options used for Instance.restore method
-         */
-        interface InstanceRestoreOptions {
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-            /**
-             * Transaction to run query under
-             */
-            transaction? : Transaction;
-
-        }
-
-        /**
-         * Options used for Instance.destroy method
-         */
-        interface InstanceDestroyOptions {
-
-            /**
-             * If set to true, paranoid models will actually be deleted
-             */
-            force? : boolean;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-            /**
-             * Transaction to run the query in
-             */
-            transaction? : Transaction;
-
-        }
-
-        /**
-         * Options used for Instance.update method
-         */
-        interface InstanceUpdateOptions extends InstanceSaveOptions, InstanceSetOptions {
-
-            /**
-             * A hash of attributes to describe your search. See above for examples.
-             */
-            where? : WhereOptions | Array<col | and | or | string>;
-
-        }
-
-        /**
-         * Options used for Instance.set method
-         */
-        interface InstanceSetOptions {
-
-            /**
-             * If set to true, field and virtual setters will be ignored
-             */
-            raw? : boolean;
-
-            /**
-             * Clear all previously set data values
-             */
-            reset? : boolean;
-
-        }
-
-        /**
-         * Options used for Instance.save method
-         */
-        interface InstanceSaveOptions {
-
-            /**
-             * An optional array of strings, representing database columns. If fields is provided, only those columns
-             * will be validated and saved.
-             */
-            fields? : string[];
-
-            /**
-             * If true, the updatedAt timestamp will not be updated.
-             *
-             * Defaults to false
-             */
-            silent? : boolean;
-
-            /**
-             * If false, validations won't be run.
-             *
-             * Defaults to true
-             */
-            validate? : boolean;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-            /**
-             * Transaction to run the query in
-             */
-            transaction? : Transaction;
-
-        }
-
-        /**
-         * This class represents an single instance, a database row. You might see it referred to as both Instance and
-         * instance. You should not instantiate the Instance class directly, instead you access it using the finder and
-         * creation methods on the model.
-         *
-         * Instance instances operate with the concept of a `dataValues` property, which stores the actual values
-         * represented by the instance. By default, the values from dataValues can also be accessed directly from the
-         * Instance, that is:
-         * ```js
-         * instance.field
-         * // is the same as
-         * instance.get('field')
-         * // is the same as
-         * instance.getDataValue('field')
-         * ```
-         * However, if getters and/or setters are defined for `field` they will be invoked, instead of returning the
-         * value from `dataValues`. Accessing properties directly or using `get` is preferred for regular use,
-         * `getDataValue` should only be used for custom getters.
-         *
-         * @see Sequelize.define for more information about getters and setters
-         */
-        interface Instance<TAttributes> {
-
-            /**
-             * Returns true if this instance has not yet been persisted to the database
-             */
-            isNewRecord : boolean;
-
-            /**
-             * Returns the Model the instance was created from.
-             *
-             * @see Model
-             */
-            Model : Model<this, TAttributes>;
-
-            /**
-             * A reference to the sequelize instance
-             */
-            sequelize : Sequelize;
-
-            /**
-             * Get an object representing the query for this instance, use with `options.where`
-             */
-            where() : Object;
-
-            /**
-             * Get the value of the underlying data value
-             */
-            getDataValue( key : string ) : any;
-
-            /**
-             * Update the underlying data value
-             */
-            setDataValue( key : string, value : any ) : void;
-
-            /**
-             * If no key is given, returns all values of the instance, also invoking virtual getters.
-             *
-             * If key is given and a field or virtual getter is present for the key it will call that getter - else it
-             * will return the value for key.
-             *
-             * @param options.plain If set to true, included instances will be returned as plain objects
-             */
-            get( key : string, options? : { plain? : boolean, clone? : boolean } ) : any;
-            get( options? : { plain? : boolean, clone? : boolean } ) : TAttributes;
-
-            /**
-             * Set is used to update values on the instance (the sequelize representation of the instance that is,
-             * remember that nothing will be persisted before you actually call `save`). In its most basic form `set`
-             * will update a value stored in the underlying `dataValues` object. However, if a custom setter function
-             * is defined for the key, that function will be called instead. To bypass the setter, you can pass `raw:
-             * true` in the options object.
-             *
-             * If set is called with an object, it will loop over the object, and call set recursively for each key,
-             * value pair. If you set raw to true, the underlying dataValues will either be set directly to the object
-             * passed, or used to extend dataValues, if dataValues already contain values.
-             *
-             * When set is called, the previous value of the field is stored and sets a changed flag(see `changed`).
-             *
-             * Set can also be used to build instances for associations, if you have values for those.
-             * When using set with associations you need to make sure the property key matches the alias of the
-             * association while also making sure that the proper include options have been set (from .build() or
-             * .find())
-             *
-             * If called with a dot.seperated key on a JSON/JSONB attribute it will set the value nested and flag the
-             * entire object as changed.
-             *
-             * @param options.raw If set to true, field and virtual setters will be ignored
-             * @param options.reset Clear all previously set data values
-             */
-            set( key : string, value : any, options? : InstanceSetOptions ) : this;
-            set( keys : Object, options? : InstanceSetOptions ) : this;
-            setAttributes( key : string, value : any, options? : InstanceSetOptions ) : this;
-            setAttributes( keys : Object, options? : InstanceSetOptions ) : this;
-
-            /**
-             * If changed is called with a string it will return a boolean indicating whether the value of that key in
-             * `dataValues` is different from the value in `_previousDataValues`.
-             *
-             * If changed is called without an argument, it will return an array of keys that have changed.
-             *
-             * If changed is called without an argument and no keys have changed, it will return `false`.
-             */
-            changed( key : string ) : boolean;
-            changed() : boolean | string[];
-
-            /**
-             * Returns the previous value for key from `_previousDataValues`.
-             */
-            previous( key : string ) : any;
-
-            /**
-             * Validate this instance, and if the validation passes, persist it to the database.
-             *
-             * On success, the callback will be called with this instance. On validation error, the callback will be
-             * called with an instance of `Sequelize.ValidationError`. This error will have a property for each of the
-             * fields for which validation failed, with the error message for that field.
-             */
-            save( options? : InstanceSaveOptions ) : Promise<this>;
-
-            /**
-             * Refresh the current instance in-place, i.e. update the object with current data from the DB and return
-             * the same object. This is different from doing a `find(Instance.id)`, because that would create and
-             * return a new instance. With this method, all references to the Instance are updated with the new data
-             * and no new objects are created.
-             */
-            reload( options? : FindOptions ) : Promise<this>;
-
-            /**
-             * Validate the attribute of this instance according to validation rules set in the model definition.
-             *
-             * Emits null if and only if validation successful; otherwise an Error instance containing
-             * { field name : [error msgs] } entries.
-             *
-             * @param options.skip An array of strings. All properties that are in this array will not be validated
-             */
-            validate( options? : { skip?: string[] } ) : Promise<ValidationError>;
-
-            /**
-             * This is the same as calling `set` and then calling `save`.
-             */
-            update( key : string, value : any, options? : InstanceUpdateOptions ) : Promise<this>;
-            update( keys : Object, options? : InstanceUpdateOptions ) : Promise<this>;
-            updateAttributes( key : string, value : any, options? : InstanceUpdateOptions ) : Promise<this>;
-            updateAttributes( keys : Object, options? : InstanceUpdateOptions ) : Promise<this>;
-
-            /**
-             * Destroy the row corresponding to this instance. Depending on your setting for paranoid, the row will
-             * either be completely deleted, or have its deletedAt timestamp set to the current time.
-             */
-            destroy( options? : InstanceDestroyOptions ) : Promise<void>;
-
-            /**
-             * Restore the row corresponding to this instance. Only available for paranoid models.
-             */
-            restore( options? : InstanceRestoreOptions ) : Promise<void>;
-
-            /**
-             * Increment the value of one or more columns. This is done in the database, which means it does not use
-             * the values currently stored on the Instance. The increment is done using a
-             * ```sql
-             * SET column = column + X
-             * ```
-             * query. To get the correct value after an increment into the Instance you should do a reload.
-             *
-             *```js
-             * instance.increment('number') // increment number by 1
-             * instance.increment(['number', 'count'], { by: 2 }) // increment number and count by 2
-             * instance.increment({ answer: 42, tries: 1}, { by: 2 }) // increment answer by 42, and tries by 1.
-             *                                                        // `by` is ignored, since each column has its own
-             *                                                        // value
-             * ```
-             *
-             * @param fields If a string is provided, that column is incremented by the value of `by` given in options.
-             *               If an array is provided, the same is true for each column.
-             *               If and object is provided, each column is incremented by the value given.
-             */
-            increment( fields : string | string[] | Object,
-                       options? : InstanceIncrementDecrementOptions ) : Promise<this>;
-
-            /**
-             * Decrement the value of one or more columns. This is done in the database, which means it does not use
-             * the values currently stored on the Instance. The decrement is done using a
-             * ```sql
-             * SET column = column - X
-             * ```
-             * query. To get the correct value after an decrement into the Instance you should do a reload.
-             *
-             * ```js
-             * instance.decrement('number') // decrement number by 1
-             * instance.decrement(['number', 'count'], { by: 2 }) // decrement number and count by 2
-             * instance.decrement({ answer: 42, tries: 1}, { by: 2 }) // decrement answer by 42, and tries by 1.
-             *                                                        // `by` is ignored, since each column has its own
-             *                                                        // value
-             * ```
-             *
-             * @param fields If a string is provided, that column is decremented by the value of `by` given in options.
-             *               If an array is provided, the same is true for each column.
-             *               If and object is provided, each column is decremented by the value given
-             */
-            decrement( fields : string | string[] | Object,
-                       options? : InstanceIncrementDecrementOptions ) : Promise<this>;
-
-            /**
-             * Check whether all values of this and `other` Instance are the same
-             */
-            equals( other : Instance<any> ) : boolean;
-
-            /**
-             * Check if this is eqaul to one of `others` by calling equals
-             */
-            equalsOneOf( others : Instance<any>[] ) : boolean;
-
-            /**
-             * Convert the instance to a JSON representation. Proxies to calling `get` with no keys. This means get all
-             * values gotten from the DB, and apply all custom getters.
-             */
-            toJSON() : TAttributes;
-
-        }
-
-        //
-        //  Model
-        // ~~~~~~~
-        //
-        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/model.js
-        //
-
-        /**
-         * Options to pass to Model on drop
-         */
-        interface DropOptions {
-
-            /**
-             * Also drop all objects depending on this table, such as views. Only works in postgres
-             */
-            cascade?: boolean;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging?: boolean | Function;
-
-        }
-
-        /**
-         * Schema Options provided for applying a schema to a model
-         */
-        interface SchemaOptions {
-
-            /**
-             * The character(s) that separates the schema name from the table name
-             */
-            schemaDelimeter? : string;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : Function | boolean;
-
-        }
-
-        /**
-         * Scope Options for Model.scope
-         */
-        interface ScopeOptions {
-
-            /**
-             * The scope(s) to apply. Scopes can either be passed as consecutive arguments, or as an array of arguments.
-             * To apply simple scopes and scope functions with no arguments, pass them as strings. For scope function,
-             * pass an object, with a `method` property. The value can either be a string, if the method does not take
-             * any arguments, or an array, where the first element is the name of the method, and consecutive elements
-             * are arguments to that method. Pass null to remove all scopes, including the default.
-             */
-            method : string | any[];
-
-        }
-
-        /**
-         * Where Complex nested query
-         */
-        interface WhereNested {
-            $and : Array<WhereOptions | WhereLogic>;
-            $or : Array<WhereOptions | WhereLogic>;
-        }
-
-        /**
-         * Nested where Postgre Statement
-         */
-        interface WherePGStatement {
-            $any : Array<string | number>;
-            $all : Array<string | number>;
-        }
-
-        /**
-         * Where Geometry Options
-         */
-        interface WhereGeometryOptions {
-            type: string;
-            coordinates: Array<number[] | number>;
-        }
-
-        /**
-         * Logic of where statement
-         */
-        interface WhereLogic {
-            $ne : string | number | WhereLogic;
-            $in : Array<string | number> | literal;
-            $not : boolean | string | number | WhereOptions;
-            $notIn : Array<string | number> | literal;
-            $gte : number | string | Date;
-            $gt : number | string | Date;
-            $lte : number | string | Date;
-            $lt : number | string | Date;
-            $like : string | WherePGStatement;
-            $iLike : string | WherePGStatement;
-            $ilike : string | WherePGStatement;
-            $notLike : string | WherePGStatement;
-            $notILike : string | WherePGStatement;
-            $between : [number, number];
-            ".." : [number, number];
-            $notBetween: [number, number];
-            "!.." : [number, number];
-            $overlap : [number, number];
-            "&&" : [number, number];
-            $contains: any;
-            "@>": any;
-            $contained: any;
-            "<@": any;
-        }
-
-        /**
-         * A hash of attributes to describe your search. See above for examples.
-         *
-         * We did put Object in the end, because there where query might be a JSON Blob. It cripples a bit the
-         * typesafety, but there is no way to pass the tests if we just remove it.
-         */
-        interface WhereOptions {
-            [field: string]: string | number | WhereLogic | WhereOptions | col | and | or | WhereGeometryOptions | Array<string | number> | Object;
-        }
-
-        /**
-         * Through options for Include Options
-         */
-        interface IncludeThroughOptions {
-
-            /**
-             * Filter on the join model for belongsToMany relations
-             */
-            where? : WhereOptions;
-
-            /**
-             * A list of attributes to select from the join model for belongsToMany relations
-             */
-            attributes? : string[];
-
-        }
-
-        /**
-         * Association Object for Include Options
-         */
-        interface IncludeAssociation {
-            source: Model<any, any>;
-            target: Model<any, any>;
-            identifier: string;
-        }
-
-        /**
-         * Complex include options
-         */
-        interface IncludeOptions {
-
-            /**
-             * The model you want to eagerly load
-             */
-            model? : Model<any, any>;
-
-            /**
-             * The alias of the relation, in case the model you want to eagerly load is aliassed. For `hasOne` /
-             * `belongsTo`, this should be the singular name, and for `hasMany`, it should be the plural
-             */
-            as? : string;
-
-            /**
-             * The association you want to eagerly load. (This can be used instead of providing a model/as pair)
-             */
-            association? : IncludeAssociation;
-
-            /**
-             * Where clauses to apply to the child models. Note that this converts the eager load to an inner join,
-             * unless you explicitly set `required: false`
-             */
-            where? : WhereOptions;
-
-            /**
-             * A list of attributes to select from the child model
-             */
-            attributes? : string[];
-
-            /**
-             * If true, converts to an inner join, which means that the parent model will only be loaded if it has any
-             * matching children. True if `include.where` is set, false otherwise.
-             */
-            required? : boolean;
-
-            /**
-             * Through Options
-             */
-            through? : IncludeThroughOptions;
-
-            /**
-             * Load further nested related models
-             */
-            include? : Array<Model<any, any> | IncludeOptions>;
-
-        }
-
-        /**
-         * Options that are passed to any model creating a SELECT query
-         *
-         * A hash of options to describe the scope of the search
-         */
-        interface FindOptions {
-
-            /**
-             * A hash of attributes to describe your search. See above for examples.
-             */
-            where? : WhereOptions | Array<col | and | or | string>;
-
-            /**
-             * A list of the attributes that you want to select. To rename an attribute, you can pass an array, with
-             * two elements - the first is the name of the attribute in the DB (or some kind of expression such as
-             * `Sequelize.literal`, `Sequelize.fn` and so on), and the second is the name you want the attribute to
-             * have in the returned instance
-             */
-            attributes? : Array<string | [string, string]>;
-
-            /**
-             * If true, only non-deleted records will be returned. If false, both deleted and non-deleted records will
-             * be returned. Only applies if `options.paranoid` is true for the model.
-             */
-            paranoid?: boolean;
-
-            /**
-             * A list of associations to eagerly load using a left join. Supported is either
-             * `{ include: [ Model1, Model2, ...]}` or `{ include: [{ model: Model1, as: 'Alias' }]}`.
-             * If your association are set up with an `as` (eg. `X.hasMany(Y, { as: 'Z }`, you need to specify Z in
-             * the as attribute when eager loading Y).
-             */
-            include?: Array<Model<any, any> | IncludeOptions>;
-
-            /**
-             * Specifies an ordering. If a string is provided, it will be escaped. Using an array, you can provide
-             * several columns / functions to order by. Each element can be further wrapped in a two-element array. The
-             * first element is the column / function to order by, the second is the direction. For example:
-             * `order: [['name', 'DESC']]`. In this way the column will be escaped, but the direction will not.
-             */
-            order?: string | col | literal | Array<string | number | Model<any, any> | { model : Model<any, any>, as? : string}> | Array<string | col | literal | Array<string | number | Model<any, any> | { model : Model<any, any>, as? : string}>>;
-
-            /**
-             * Limit the results
-             */
-            limit?: number;
-
-            /**
-             * Skip the results;
-             */
-            offset?: number;
-
-            /**
-             * Transaction to run query under
-             */
-            transaction? : Transaction;
-
-            /**
-             * Lock the selected rows. Possible options are transaction.LOCK.UPDATE and transaction.LOCK.SHARE.
-             * Postgres also supports transaction.LOCK.KEY_SHARE, transaction.LOCK.NO_KEY_UPDATE and specific model
-             * locks with joins. See [transaction.LOCK for an example](transaction#lock)
-             */
-            lock? : string | { level: string, of: Model<any, any> };
-
-            /**
-             * Return raw result. See sequelize.query for more information.
-             */
-            raw? : boolean;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-            /**
-             * having ?!?
-             */
-            having? : WhereOptions;
-
-        }
-
-        /**
-         * Options for Model.count method
-         */
-        interface CountOptions {
-
-            /**
-             * A hash of search attributes.
-             */
-            where? : WhereOptions | string[];
-
-            /**
-             * Include options. See `find` for details
-             */
-            include?: Array<Model<any, any> | IncludeOptions>;
-
-            /**
-             * Apply COUNT(DISTINCT(col))
-             */
-            distinct? : boolean;
-
-            /**
-             * Used in conjustion with `group`
-             */
-            attributes? : Array<string | [string, string]>;
-
-            /**
-             * For creating complex counts. Will return multiple rows as needed.
-             *
-             * TODO: Check?
-             */
-            group? : Object;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-            transaction?: Transaction;
-        }
-
-        /**
-         * Options for Model.build method
-         */
-        interface BuildOptions {
-
-            /**
-             * If set to true, values will ignore field and virtual setters.
-             */
-            raw? : boolean;
-
-            /**
-             * Is this record new
-             */
-            isNewRecord? : boolean;
-
-            /**
-             * an array of include options - Used to build prefetched/included model instances. See `set`
-             *
-             * TODO: See set
-             */
-            include? :  Array<Model<any, any> | IncludeOptions>;
-
-        }
-
-        /**
-         * Options for Model.create method
-         */
-        interface CreateOptions extends BuildOptions {
-
-            /**
-             * If set, only columns matching those in fields will be saved
-             */
-            fields? : string[];
-
-            /**
-             * On Duplicate
-             */
-            onDuplicate? : string;
-
-            /**
-             * Transaction to run query under
-             */
-            transaction? : Transaction;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-            silent? : boolean;
-
-            returning? : boolean;
-        }
-
-        /**
-         * Options for Model.findOrInitialize method
-         */
-        interface FindOrInitializeOptions<TAttributes> {
-
-            /**
-             * A hash of search attributes.
-             */
-            where : string | WhereOptions;
-
-            /**
-             * Default values to use if building a new instance
-             */
-            defaults? : TAttributes;
-
-            /**
-             * Transaction to run query under
-             */
-            transaction? : Transaction;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-        }
-
-        /**
-         * Options for Model.upsert method
-         */
-        interface UpsertOptions {
-
-            /**
-             * Run validations before the row is inserted
-             */
-            validate? : boolean;
-
-            /**
-             * The fields to insert / update. Defaults to all fields
-             */
-            fields? : string[];
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-            /**
-             * Transaction to run query under
-             */
-            transaction? : Transaction;
-
-            /**
-             * An optional parameter to specify the schema search_path (Postgres only)
-             */
-            searchPath? : string;
-
-            /**
-             * Print query execution time in milliseconds when logging SQL.
-             */
-            benchmark? : boolean;
-        }
-
-        /**
-         * Options for Model.bulkCreate method
-         */
-        interface BulkCreateOptions {
-
-            /**
-             * Fields to insert (defaults to all fields)
-             */
-            fields? : string[];
-
-            /**
-             * Should each row be subject to validation before it is inserted. The whole insert will fail if one row
-             * fails validation
-             */
-            validate? : boolean;
-
-            /**
-             * Run before / after bulk create hooks?
-             */
-            hooks? : boolean;
-
-            /**
-             * Run before / after create hooks for each individual Instance? BulkCreate hooks will still be run if
-             * options.hooks is true.
-             */
-            individualHooks? : boolean;
-
-            /**
-             * Ignore duplicate values for primary keys? (not supported by postgres)
-             *
-             * Defaults to false
-             */
-            ignoreDuplicates? : boolean;
-
-            /**
-             * Fields to update if row key already exists (on duplicate key update)? (only supported by mysql &
-             * mariadb). By default, all fields are updated.
-             */
-            updateOnDuplicate? : string[];
-
-            /**
-             * Transaction to run query under
-             */
-            transaction? : Transaction;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-        }
-
-        /**
-         * The options passed to Model.destroy in addition to truncate
-         */
-        interface TruncateOptions {
-
-            /**
-             * Transaction to run query under
-             */
-            transaction? : Transaction;
-
-            /**
-             * Only used in conjuction with TRUNCATE. Truncates  all tables that have foreign-key references to the
-             * named table, or to any tables added to the group due to CASCADE.
-             *
-             * Defaults to false;
-             */
-            cascade? : boolean;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-        }
-
-        /**
-         * Options used for Model.destroy
-         */
-        interface DestroyOptions extends TruncateOptions {
-
-            /**
-             * Filter the destroy
-             */
-            where? : WhereOptions;
-
-            /**
-             * Run before / after bulk destroy hooks?
-             */
-            hooks? : boolean;
-
-            /**
-             * If set to true, destroy will SELECT all records matching the where parameter and will execute before /
-             * after destroy hooks on each row
-             */
-            individualHooks? : boolean;
-
-            /**
-             * How many rows to delete
-             */
-            limit? : number;
-
-            /**
-             * Delete instead of setting deletedAt to current timestamp (only applicable if `paranoid` is enabled)
-             */
-            force? : boolean;
-
-            /**
-             * If set to true, dialects that support it will use TRUNCATE instead of DELETE FROM. If a table is
-             * truncated the where and limit options are ignored
-             */
-            truncate? : boolean;
-
-        }
-
-        /**
-         * Options for Model.restore
-         */
-        interface RestoreOptions {
-
-            /**
-             * Filter the restore
-             */
-            where? : WhereOptions;
-
-            /**
-             * Run before / after bulk restore hooks?
-             */
-            hooks? : boolean;
-
-            /**
-             * If set to true, restore will find all records within the where parameter and will execute before / after
-             * bulkRestore hooks on each row
-             */
-            individualHooks? : boolean;
-
-            /**
-             * How many rows to undelete
-             */
-            limit? : number;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-            /**
-             * Transaction to run query under
-             */
-            transaction? : Transaction;
-
-        }
-
-        /**
-         * Options used for Model.update
-         */
-        interface UpdateOptions {
-
-            /**
-             * Options to describe the scope of the search.
-             */
-            where: WhereOptions;
-
-            /**
-             * Fields to update (defaults to all fields)
-             */
-            fields? : string[];
-
-            /**
-             * Should each row be subject to validation before it is inserted. The whole insert will fail if one row
-             * fails validation.
-             *
-             * Defaults to true
-             */
-            validate? : boolean;
-
-            /**
-             * Run before / after bulk update hooks?
-             *
-             * Defaults to true
-             */
-            hooks? : boolean;
-
-            /**
-             * Whether or not to update the side effects of any virtual setters.
-             *
-             * Defaults to true
-             */
-            sideEffects? : boolean;
-
-            /**
-             * Run before / after update hooks?. If true, this will execute a SELECT followed by individual UPDATEs.
-             * A select is needed, because the row data needs to be passed to the hooks
-             *
-             * Defaults to false
-             */
-            individualHooks? : boolean;
-
-            /**
-             * Return the affected rows (only for postgres)
-             */
-            returning? : boolean;
-
-            /**
-             * How many rows to update (only for mysql and mariadb)
-             */
-            limit? : number;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-            /**
-             * Transaction to run query under
-             */
-            transaction? : Transaction;
-
-        }
-
-        /**
-         * Options used for Model.aggregate
-         */
-        interface AggregateOptions extends QueryOptions {
-
-            /**
-             * A hash of search attributes.
-             */
-            where?: WhereOptions;
-
-            /**
-             * The type of the result. If `field` is a field in this Model, the default will be the type of that field,
-             * otherwise defaults to float.
-             */
-            dataType? : DataTypeAbstract | string;
-
-            /**
-             * Applies DISTINCT to the field being aggregated over
-             */
-            distinct? : boolean;
-
-        }
-
-        /**
-         * A Model represents a table in the database. Sometimes you might also see it referred to as model, or simply
-         * as factory. This class should _not_ be instantiated directly, it is created using `sequelize.define`, and
-         * already created models can be loaded using `sequelize.import`
-         */
-        interface Model<TInstance, TAttributes> extends Hooks<TInstance>, Associations {
-
-            /**
-             * The Instance class
-             */
-            Instance() : TInstance;
-
-            /**
-             * Remove attribute from model definition
-             *
-             * @param attribute
-             */
-            removeAttribute( attribute : string ) : void;
-
-            /**
-             * Sync this Model to the DB, that is create the table. Upon success, the callback will be called with the
-             * model instance (this)
-             */
-            sync( options? : SyncOptions ) : Promise<this>;
-
-            /**
-             * Drop the table represented by this Model
-             *
-             * @param options
-             */
-            drop( options? : DropOptions ) : Promise<void>;
-
-            /**
-             * Apply a schema to this model. For postgres, this will actually place the schema in front of the table
-             * name
-             * - `"schema"."tableName"`, while the schema will be prepended to the table name for mysql and
-             * sqlite - `'schema.tablename'`.
-             *
-             * @param schema The name of the schema
-             * @param options
-             */
-            schema( schema : string, options? : SchemaOptions ) : this;
-
-            /**
-             * Get the tablename of the model, taking schema into account. The method will return The name as a string
-             * if the model has no schema, or an object with `tableName`, `schema` and `delimiter` properties.
-             *
-             * @param options The hash of options from any query. You can use one model to access tables with matching
-             *     schemas by overriding `getTableName` and using custom key/values to alter the name of the table.
-             *     (eg.
-             *     subscribers_1, subscribers_2)
-             * @param options.logging=false A function that gets executed while running the query to log the sql.
-             */
-            getTableName( options? : { logging : Function } ) : string | Object;
-
-            /**
-             * Apply a scope created in `define` to the model. First let's look at how to create scopes:
-             * ```js
-             * var Model = sequelize.define('model', attributes, {
-             *   defaultScope: {
-             *     where: {
-             *       username: 'dan'
-             *     },
-             *     limit: 12
-             *   },
-             *   scopes: {
-             *     isALie: {
-             *       where: {
-             *         stuff: 'cake'
-             *       }
-             *     },
-             *     complexFunction: function(email, accessLevel) {
-             *       return {
-             *         where: {
-             *           email: {
-             *             $like: email
-             *           },
-             *           accesss_level {
-             *             $gte: accessLevel
-             *           }
-             *         }
-             *       }
-             *     }
-             *   }
-             * })
-             * ```
-             * Now, since you defined a default scope, every time you do Model.find, the default scope is appended to
-             * your query. Here's a couple of examples:
-             * ```js
-             * Model.findAll() // WHERE username = 'dan'
-             * Model.findAll({ where: { age: { gt: 12 } } }) // WHERE age > 12 AND username = 'dan'
-             * ```
-             *
-             * To invoke scope functions you can do:
-             * ```js
-             * Model.scope({ method: ['complexFunction' 'dan@sequelize.com', 42]}).findAll()
-             * // WHERE email like 'dan@sequelize.com%' AND access_level >= 42
-             * ```
-             *
-             * @return Model A reference to the model, with the scope(s) applied. Calling scope again on the returned
-             *     model will clear the previous scope.
-             */
-            scope( options? : string | string[] | ScopeOptions | WhereOptions ) : this;
-
-            /**
-             * Search for multiple instances.
-             *
-             * __Simple search using AND and =__
-             * ```js
-             * Model.findAll({
-             *   where: {
-             *     attr1: 42,
-             *     attr2: 'cake'
-             *   }
-             * })
-             * ```
-             * ```sql
-             * WHERE attr1 = 42 AND attr2 = 'cake'
-             *```
-             *
-             * __Using greater than, less than etc.__
-             * ```js
-             *
-             * Model.findAll({
-             *   where: {
-             *     attr1: {
-             *       gt: 50
-             *     },
-             *     attr2: {
-             *       lte: 45
-             *     },
-             *     attr3: {
-             *       in: [1,2,3]
-             *     },
-             *     attr4: {
-             *       ne: 5
-             *     }
-             *   }
-             * })
-             * ```
-             * ```sql
-             * WHERE attr1 > 50 AND attr2 <= 45 AND attr3 IN (1,2,3) AND attr4 != 5
-             * ```
-             * Possible options are: `$ne, $in, $not, $notIn, $gte, $gt, $lte, $lt, $like, $ilike/$iLike, $notLike,
-             * $notILike, '..'/$between, '!..'/$notBetween, '&&'/$overlap, '@>'/$contains, '<@'/$contained`
-             *
-             * __Queries using OR__
-             * ```js
-             * Model.findAll({
-             *   where: Sequelize.and(
-             *     { name: 'a project' },
-             *     Sequelize.or(
-             *       { id: [1,2,3] },
-             *       { id: { gt: 10 } }
-             *     )
-             *   )
-             * })
-             * ```
-             * ```sql
-             * WHERE name = 'a project' AND (id` IN (1,2,3) OR id > 10)
-             * ```
-             *
-             * The success listener is called with an array of instances if the query succeeds.
-             *
-             * @see    {Sequelize#query}
-             */
-            findAll( options? : FindOptions ) : Promise<TInstance[]>;
-            all( optionz? : FindOptions ) : Promise<TInstance[]>;
-
-            /**
-             * Search for a single instance by its primary key. This applies LIMIT 1, so the listener will
-             * always be called with a single instance.
-             */
-            findById( identifier? : number | string, options? : FindOptions ) : Promise<TInstance>;
-            findByPrimary( identifier? : number | string, options? : FindOptions ) : Promise<TInstance>;
-
-            /**
-             * Search for a single instance. This applies LIMIT 1, so the listener will always be called with a single
-             * instance.
-             */
-            findOne( options? : FindOptions ) : Promise<TInstance>;
-            find( optionz? : FindOptions ) : Promise<TInstance>;
-
-            /**
-             * Run an aggregation method on the specified field
-             *
-             * @param field The field to aggregate over. Can be a field name or *
-             * @param aggregateFunction The function to use for aggregation, e.g. sum, max etc.
-             * @param options Query options. See sequelize.query for full options
-             * @return Returns the aggregate result cast to `options.dataType`, unless `options.plain` is false, in
-             *     which case the complete data result is returned.
-             */
-            aggregate( field : string, aggregateFunction : Function, options? : AggregateOptions ) : Promise<Object>;
-
-            /**
-             * Count the number of records matching the provided where clause.
-             *
-             * If you provide an `include` option, the number of matching associations will be counted instead.
-             */
-            count( options? : CountOptions ) : Promise<number>;
-
-            /**
-             * Find all the rows matching your query, within a specified offset / limit, and get the total number of
-             * rows matching your query. This is very usefull for paging
-             *
-             * ```js
-             * Model.findAndCountAll({
-             *   where: ...,
-             *   limit: 12,
-             *   offset: 12
-             * }).then(function (result) {
-             *   ...
-             * })
-             * ```
-             * In the above example, `result.rows` will contain rows 13 through 24, while `result.count` will return
-             * the
-             * total number of rows that matched your query.
-             *
-             * When you add includes, only those which are required (either because they have a where clause, or
-             * because
-             * `required` is explicitly set to true on the include) will be added to the count part.
-             *
-             * Suppose you want to find all users who have a profile attached:
-             * ```js
-             * User.findAndCountAll({
-             *   include: [
-             *      { model: Profile, required: true}
-             *   ],
-             *   limit 3
-             * });
-             * ```
-             * Because the include for `Profile` has `required` set it will result in an inner join, and only the users
-             * who have a profile will be counted. If we remove `required` from the include, both users with and
-             * without
-             * profiles will be counted
-             */
-            findAndCount( options? : FindOptions ) : Promise<{ rows : TInstance[], count : number }>;
-            findAndCountAll( options? : FindOptions ) : Promise<{ rows : TInstance[], count : number }>;
-
-            /**
-             * Find the maximum value of field
-             */
-            max( field : string, options? : AggregateOptions ) : Promise<any>;
-
-            /**
-             * Find the minimum value of field
-             */
-            min( field : string, options? : AggregateOptions ) : Promise<any>;
-
-            /**
-             * Find the sum of field
-             */
-            sum( field : string, options? : AggregateOptions ) : Promise<number>;
-
-            /**
-             * Builds a new model instance. Values is an object of key value pairs, must be defined but can be empty.
-             */
-            build( record? : TAttributes, options? : BuildOptions ) : TInstance;
-
-            /**
-             * Undocumented bulkBuild
-             */
-            bulkBuild( records : TAttributes[], options? : BuildOptions ) : TInstance[];
-
-            /**
-             * Builds a new model instance and calls save on it.
-             */
-            create( values? : TAttributes, options? : CreateOptions ) : Promise<TInstance>;
-
-            /**
-             * Find a row that matches the query, or build (but don't save) the row if none is found.
-             * The successfull result of the promise will be (instance, initialized) - Make sure to use .spread()
-             */
-            findOrInitialize( options : FindOrInitializeOptions<TAttributes> ) : Promise<TInstance>;
-            findOrBuild( options : FindOrInitializeOptions<TAttributes> ) : Promise<TInstance>;
-
-            /**
-             * Find a row that matches the query, or build and save the row if none is found
-             * The successful result of the promise will be (instance, created) - Make sure to use .spread()
-             *
-             * If no transaction is passed in the `options` object, a new transaction will be created internally, to
-             * prevent the race condition where a matching row is created by another connection after the find but
-             * before the insert call. However, it is not always possible to handle this case in SQLite, specifically
-             * if one transaction inserts and another tries to select before the first one has comitted. In this case,
-             * an instance of sequelize.TimeoutError will be thrown instead. If a transaction is created, a savepoint
-             * will be created instead, and any unique constraint violation will be handled internally.
-             */
-            findOrCreate( options : FindOrInitializeOptions<TAttributes> ) : Promise<TInstance>;
-
-            /**
-             * Insert or update a single row. An update will be executed if a row which matches the supplied values on
-             * either the primary key or a unique key is found. Note that the unique index must be defined in your
-             * sequelize model and not just in the table. Otherwise you may experience a unique constraint violation,
-             * because sequelize fails to identify the row that should be updated.
-             *
-             * **Implementation details:**
-             *
-             * * MySQL - Implemented as a single query `INSERT values ON DUPLICATE KEY UPDATE values`
-             * * PostgreSQL - Implemented as a temporary function with exception handling: INSERT EXCEPTION WHEN
-             *   unique_constraint UPDATE
-             * * SQLite - Implemented as two queries `INSERT; UPDATE`. This means that the update is executed
-             * regardless
-             *   of whether the row already existed or not
-             *
-             * **Note** that SQLite returns undefined for created, no matter if the row was created or updated. This is
-             * because SQLite always runs INSERT OR IGNORE + UPDATE, in a single query, so there is no way to know
-             * whether the row was inserted or not.
-             */
-            upsert( values : TAttributes, options? : UpsertOptions ) : Promise<boolean>;
-            insertOrUpdate( values : TAttributes, options? : UpsertOptions ) : Promise<boolean>;
-
-            /**
-             * Create and insert multiple instances in bulk.
-             *
-             * The success handler is passed an array of instances, but please notice that these may not completely
-             * represent the state of the rows in the DB. This is because MySQL and SQLite do not make it easy to
-             * obtain
-             * back automatically generated IDs and other default values in a way that can be mapped to multiple
-             * records. To obtain Instances for the newly created values, you will need to query for them again.
-             *
-             * @param records List of objects (key/value pairs) to create instances from
-             */
-            bulkCreate( records : TAttributes[], options? : BulkCreateOptions ) : Promise<TInstance[]>;
-
-            /**
-             * Truncate all instances of the model. This is a convenient method for Model.destroy({ truncate: true }).
-             */
-            truncate( options? : TruncateOptions ) : Promise<void>;
-
-            /**
-             * Delete multiple instances, or set their deletedAt timestamp to the current time if `paranoid` is enabled.
-             *
-             * @return Promise<number> The number of destroyed rows
-             */
-            destroy( options? : DestroyOptions ) : Promise<number>;
-
-            /**
-             * Restore multiple instances if `paranoid` is enabled.
-             */
-            restore( options? : RestoreOptions ) : Promise<void>;
-
-            /**
-             * Update multiple instances that match the where options. The promise returns an array with one or two
-             * elements. The first element is always the number of affected rows, while the second element is the actual
-             * affected rows (only supported in postgres with `options.returning` true.)
-             */
-            update( values : TAttributes, options : UpdateOptions ) : Promise<[number, TInstance[]]>;
-
-            /**
-             * Run a describe query on the table. The result will be return to the listener as a hash of attributes and
-             * their types.
-             */
-            describe() : Promise<Object>;
-
-            /**
-             * Unscope the model
-             */
-            unscoped() : this;
-
-        }
-
-        //
-        //  Query Interface
-        // ~~~~~~~~~~~~~~~~~
-        //
-        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/query-interface.js
-        //
-
-        /**
-         * Most of the methods accept options and use only the logger property of the options. That's why the most used
-         * interface type for options in a method is separated here as another interface.
-         */
-        interface QueryInterfaceOptions {
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-        }
-
-        /**
-         * The interface that Sequelize uses to talk to all databases.
-         *
-         * This interface is available through sequelize.QueryInterface. It should not be commonly used, but it's
-         * referenced anyway, so it can be used.
-         */
-        interface QueryInterface {
-
-            /**
-             * Returns the dialect-specific sql generator.
-             *
-             * We don't have a definition for the QueryGenerator, because I doubt it is commonly in use separately.
-             */
-            QueryGenerator: any;
-
-            /**
-             * Returns the current sequelize instance.
-             */
-            sequelize: Sequelize;
-
-            /**
-             * Queries the schema (table list).
-             *
-             * @param schema The schema to query. Applies only to Postgres.
-             */
-            createSchema( schema? : string, options? : QueryInterfaceOptions ): Promise<void>;
-
-            /**
-             * Drops the specified schema (table).
-             *
-             * @param schema The schema to query. Applies only to Postgres.
-             */
-            dropSchema( schema? : string, options? : QueryInterfaceOptions ): Promise<void>;
-
-            /**
-             * Drops all tables.
-             */
-            dropAllSchemas( options? : QueryInterfaceOptions ): Promise<void>;
-
-            /**
-             * Queries all table names in the database.
-             *
-             * @param options
-             */
-            showAllSchemas( options? : QueryOptions ): Promise<Object>;
-
-            /**
-             * Return database version
-             */
-            databaseVersion( options? : QueryInterfaceOptions ) : Promise<string>;
-
-            /**
-             * Creates a table with specified attributes.
-             *
-             * @param tableName     Name of table to create
-             * @param attributes    Hash of attributes, key is attribute name, value is data type
-             * @param options       Query options.
-             */
-            createTable( tableName : string | { schema? : string, tableName? : string }, attributes : DefineAttributes,
-                         options? : QueryOptions ): Promise<void>;
-
-            /**
-             * Drops the specified table.
-             *
-             * @param tableName Table name.
-             * @param options   Query options, particularly "force".
-             */
-            dropTable( tableName : string, options? : QueryOptions ): Promise<void>;
-
-            /**
-             * Drops all tables.
-             *
-             * @param options
-             */
-            dropAllTables( options? : QueryOptions ): Promise<void>;
-
-            /**
-             * Drops all defined enums
-             *
-             * @param options
-             */
-            dropAllEnums( options? : QueryOptions ): Promise<void>;
-
-            /**
-             * Renames a table
-             */
-            renameTable( before : string, after : string, options? : QueryInterfaceOptions ) : Promise<void>;
-
-            /**
-             * Returns all tables
-             */
-            showAllTables( options? : QueryOptions ) : Promise<string[]>;
-
-            /**
-             * Describe a table
-             */
-            describeTable( tableName : string | { schema? : string, tableName? : string },
-                           options? : string | { schema? : string, schemaDelimeter? : string, logging? : boolean | Function } ) : Promise<Object>;
-
-            /**
-             * Adds a new column to a table
-             */
-            addColumn( table : string, key : string, attribute : DefineAttributeColumnOptions | DataTypeAbstract,
-                       options? : QueryInterfaceOptions ) : Promise<void>;
-
-            /**
-             * Removes a column from a table
-             */
-            removeColumn( table : string, attribute : string, options? : QueryInterfaceOptions ) : Promise<void>;
-
-            /**
-             * Changes a column
-             */
-            changeColumn( tableName : string | { schema? : string, tableName? : string }, attributeName : string,
-                          dataTypeOrOptions? : string | DataTypeAbstract | DefineAttributeColumnOptions,
-                          options? : QueryInterfaceOptions ) : Promise<void>;
-
-            /**
-             * Renames a column
-             */
-            renameColumn( tableName : string | { schema? : string, tableName? : string }, attrNameBefore : string,
-                          attrNameAfter : string,
-                          options? : QueryInterfaceOptions ) : Promise<void>;
-
-            /**
-             * Adds a new index to a table
-             */
-            addIndex( tableName : string | Object, attributes : string[], options? : QueryOptions,
-                      rawTablename? : string ) : Promise<void>;
-
-            /**
-             * Shows the index of a table
-             */
-            showIndex( tableName : string | Object, options? : QueryOptions ) : Promise<Object>;
-
-            /**
-             * Put a name to an index
-             */
-            nameIndexes( indexes : string[], rawTablename : string ) : Promise<void>;
-
-            /**
-             * Returns all foreign key constraints of a table
-             */
-            getForeignKeysForTables( tableNames : string, options? : QueryInterfaceOptions ) : Promise<Object>;
-
-            /**
-             * Removes an index of a table
-             */
-            removeIndex( tableName : string, indexNameOrAttributes : string[] | string,
-                         options? : QueryInterfaceOptions ) : Promise<void>;
-
-            /**
-             * Inserts a new record
-             */
-            insert( instance : Instance<any>, tableName : string, values : Object,
-                    options? : QueryOptions ) : Promise<Object>;
-
-            /**
-             * Inserts or Updates a record in the database
-             */
-            upsert( tableName : string, values : Object, updateValues : Object, model : Model<any, any>,
-                    options? : QueryOptions ) : Promise<Object>;
-
-            /**
-             * Inserts multiple records at once
-             */
-            bulkInsert( tableName : string, records : Object[], options? : QueryOptions,
-                        attributes? : string[] | string ) : Promise<Object>;
-
-            /**
-             * Updates a row
-             */
-            update( instance : Instance<any>, tableName : string, values : Object, identifier : Object,
-                    options? : QueryOptions ) : Promise<Object>;
-
-            /**
-             * Updates multiple rows at once
-             */
-            bulkUpdate( tableName : string, values : Object, identifier : Object, options? : QueryOptions,
-                        attributes? : string[] | string ) : Promise<Object>;
-
-            /**
-             * Deletes a row
-             */
-            "delete"( instance : Instance<any>, tableName : string, identifier : Object,
-                      options? : QueryOptions ) : Promise<Object>;
-
-            /**
-             * Deletes multiple rows at once
-             */
-            bulkDelete( tableName : string, identifier : Object, options? : QueryOptions,
-                        model? : Model<any, any> ) : Promise<Object>;
-
-            /**
-             * Returns selected rows
-             */
-            select( model : Model<any, any>, tableName : string, options? : QueryOptions ) : Promise<Object[]>;
-
-            /**
-             * Increments a row value
-             */
-            increment( instance : Instance<any>, tableName : string, values : Object, identifier : Object,
-                       options? : QueryOptions ) : Promise<Object>;
-
-            /**
-             * Selects raw without parsing the string into an object
-             */
-            rawSelect( tableName : string, options : QueryOptions, attributeSelector : string | string[],
-                       model? : Model<any, any> ) : Promise<string[]>;
-
-            /**
-             * Postgres only. Creates a trigger on specified table to call the specified function with supplied
-             * parameters.
-             */
-            createTrigger( tableName : string, triggerName : string, timingType : string, fireOnArray : any[],
-                           functionName : string, functionParams : any[], optionsArray : string[],
-                           options? : QueryInterfaceOptions ): Promise<void>;
-
-            /**
-             * Postgres only. Drops the specified trigger.
-             */
-            dropTrigger( tableName : string, triggerName : string, options? : QueryInterfaceOptions ): Promise<void>;
-
-            /**
-             * Postgres only. Renames a trigger
-             */
-            renameTrigger( tableName : string, oldTriggerName : string, newTriggerName : string,
-                           options? : QueryInterfaceOptions ) : Promise<void>;
-
-            /**
-             * Postgres only. Create a function
-             */
-            createFunction( functionName : string, params : any[], returnType : string, language : string,
-                            body : string, options? : QueryOptions ) : Promise<void>;
-
-            /**
-             * Postgres only. Drops a function
-             */
-            dropFunction( functionName : string, params : any[],
-                          options? : QueryInterfaceOptions ) : Promise<void>;
-
-            /**
-             * Postgres only. Rename a function
-             */
-            renameFunction( oldFunctionName : string, params : any[], newFunctionName : string,
-                            options? : QueryInterfaceOptions ) : Promise<void>;
-
-            /**
-             * Escape an identifier (e.g. a table or attribute name). If force is true, the identifier will be quoted
-             * even if the `quoteIdentifiers` option is false.
-             */
-            quoteIdentifier( identifier : string, force : boolean ) : string;
-
-            /**
-             * Escape a table name
-             */
-            quoteTable( identifier : string ) : string;
-
-            /**
-             * Split an identifier into .-separated tokens and quote each part. If force is true, the identifier will be
-             * quoted even if the `quoteIdentifiers` option is false.
-             */
-            quoteIdentifiers( identifiers : string, force : boolean ) : string;
-
-            /**
-             * Escape a value (e.g. a string, number or date)
-             */
-            escape( value? : string | number | Date ) : string;
-
-            /**
-             * Set option for autocommit of a transaction
-             */
-            setAutocommit( transaction : Transaction, value : boolean, options? : QueryOptions ) : Promise<void>;
-
-            /**
-             * Set the isolation level of a transaction
-             */
-            setIsolationLevel( transaction : Transaction, value : string, options? : QueryOptions ) : Promise<void>;
-
-            /**
-             * Begin a new transaction
-             */
-            startTransaction( transaction : Transaction, options? : QueryOptions ) : Promise<void>;
-
-            /**
-             * Defer constraints
-             */
-            deferConstraints( transaction : Transaction, options? : QueryOptions ) : Promise<void>;
-
-            /**
-             * Commit an already started transaction
-             */
-            commitTransaction( transaction : Transaction, options? : QueryOptions ) : Promise<void>;
-
-            /**
-             * Rollback ( revert ) a transaction that has'nt been commited
-             */
-            rollbackTransaction( transaction : Transaction, options? : QueryOptions ) : Promise<void>;
-
-        }
-
-        //
-        //  Query Types
-        // ~~~~~~~~~~~~~
-        //
-        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/query-types.js
-        //
-
-        interface QueryTypes {
-            SELECT: string; // 'SELECT'
-            INSERT: string; // 'INSERT'
-            UPDATE: string; // 'UPDATE'
-            BULKUPDATE: string; // 'BULKUPDATE'
-            BULKDELETE: string; // 'BULKDELETE'
-            DELETE: string; // 'DELETE'
-            UPSERT: string; // 'UPSERT'
-            VERSION: string; // 'VERSION'
-            SHOWTABLES: string; // 'SHOWTABLES'
-            SHOWINDEXES: string; // 'SHOWINDEXES'
-            DESCRIBE: string; // 'DESCRIBE'
-            RAW: string; // 'RAW'
-            FOREIGNKEYS: string; // 'FOREIGNKEYS'
-        }
-
-        //
-        //  Sequelize
-        // ~~~~~~~~~~~
-        //
-        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/sequelize.js
-        //
-
-        /**
-         * General column options
-         *
-         * @see Define
-         * @see AssociationForeignKeyOptions
-         */
-        interface ColumnOptions {
-
-            /**
-             * If false, the column will have a NOT NULL constraint, and a not null validation will be run before an
-             * instance is saved.
-             */
-            allowNull?: boolean;
-
-            /**
-             *  If set, sequelize will map the attribute name to a different name in the database
-             */
-            field? : string;
-
-            /**
-             * A literal default value, a JavaScript function, or an SQL function (see `sequelize.fn`)
-             */
-            defaultValue?: any;
-
-        }
-
-        /**
-         * References options for the column's attributes
-         *
-         * @see AttributeColumnOptions
-         */
-        interface DefineAttributeColumnReferencesOptions {
-
-            /**
-             * If this column references another table, provide it here as a Model, or a string
-             */
-            model?: string | Model<any, any>;
-
-            /**
-             * The column of the foreign table that this column references
-             */
-            key? : string;
-
-            /**
-             * When to check for the foreign key constraing
-             *
-             * PostgreSQL only
-             */
-            deferrable? : Deferrable;
-
-        }
-
-        /**
-         * Column options for the model schema attributes
-         *
-         * @see Attributes
-         */
-        interface DefineAttributeColumnOptions extends ColumnOptions {
-
-            /**
-             * A string or a data type
-             */
-            type: string | DataTypeAbstract;
-
-            /**
-             * If true, the column will get a unique constraint. If a string is provided, the column will be part of a
-             * composite unique index. If multiple columns have the same string, they will be part of the same unique
-             * index
-             */
-            unique?: boolean | string | { name: string, msg: string };
-
-            /**
-             * Primary key flag
-             */
-            primaryKey?: boolean;
-
-            /**
-             * Is this field an auto increment field
-             */
-            autoIncrement?: boolean;
-
-            /**
-             * Comment for the database
-             */
-            comment?: string;
-
-            /**
-             * An object with reference configurations
-             */
-            references? : DefineAttributeColumnReferencesOptions;
-
-            /**
-             * What should happen when the referenced key is updated. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
-             * NO ACTION
-             */
-            onUpdate? : string;
-
-            /**
-             * What should happen when the referenced key is deleted. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
-             * NO ACTION
-             */
-            onDelete? : string;
-
-            /**
-             * Provide a custom getter for this column. Use `this.getDataValue(String)` to manipulate the underlying
-             * values.
-             */
-            get? : () => any;
-
-            /**
-             * Provide a custom setter for this column. Use `this.setDataValue(String, Value)` to manipulate the
-             * underlying values.
-             */
-            set? : ( val : any ) => void;
-
-            /**
-             * An object of validations to execute for this column every time the model is saved. Can be either the
-             * name of a validation provided by validator.js, a validation function provided by extending validator.js
-             * (see the
-             * `DAOValidator` property for more details), or a custom validation function. Custom validation functions
-             * are called with the value of the field, and can possibly take a second callback argument, to signal that
-             * they are asynchronous. If the validator is sync, it should throw in the case of a failed validation, it
-             * it is async, the callback should be called with the error text.
-             */
-            validate? : DefineValidateOptions;
-
-            /**
-             * Usage in object notation
-             *
-             * ```js
-             * sequelize.define('model', {
-             *     states: {
-             *       type:   Sequelize.ENUM,
-             *       values: ['active', 'pending', 'deleted']
-             *     }
-             *   })
-             * ```
-             */
-            values? : string[];
-
-        }
-
-        /**
-         * Interface for Attributes provided for a column
-         *
-         * @see Sequelize.define
-         */
-        interface DefineAttributes {
-
-            /**
-             * The description of a database column
-             */
-            [name : string] : string | DataTypeAbstract | DefineAttributeColumnOptions;
-
-        }
-
-        /**
-         * Interface for query options
-         *
-         * @see Options
-         */
-        interface QueryOptions {
-
-            /**
-             * If true, sequelize will not try to format the results of the query, or build an instance of a model from
-             * the result
-             */
-            raw?: boolean;
-
-            /**
-             * The transaction that the query should be executed under
-             */
-            transaction?: Transaction;
-
-            /**
-             * The type of query you are executing. The query type affects how results are formatted before they are
-             * passed back. The type is a string, but `Sequelize.QueryTypes` is provided as convenience shortcuts.
-             */
-            type?: string;
-
-            /**
-             * If true, transforms objects with `.` separated property names into nested objects using
-             * [dottie.js](https://github.com/mickhansen/dottie.js). For example { 'user.username': 'john' } becomes
-             * { user: { username: 'john' }}. When `nest` is true, the query type is assumed to be `'SELECT'`,
-             * unless otherwise specified
-             *
-             * Defaults to false
-             */
-            nest?: boolean;
-
-            /**
-             * Sets the query type to `SELECT` and return a single row
-             */
-            plain?: boolean;
-
-            /**
-             * Either an object of named parameter replacements in the format `:param` or an array of unnamed
-             * replacements to replace `?` in your SQL.
-             */
-            replacements? : Object | string[];
-
-            /**
-             * Force the query to use the write pool, regardless of the query type.
-             *
-             * Defaults to false
-             */
-            useMaster? : boolean;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : Function;
-
-            /**
-             * A sequelize instance used to build the return instance
-             */
-            instance? : Instance<any>;
-
-            /**
-             * A sequelize model used to build the returned model instances (used to be called callee)
-             */
-            model? : Model<any, any>;
-
-            // TODO: force, cascade
-
-        }
-
-        /**
-         * Model validations, allow you to specify format/content/inheritance validations for each attribute of the
-         * model.
-         *
-         * Validations are automatically run on create, update and save. You can also call validate() to manually
-         * validate an instance.
-         *
-         * The validations are implemented by validator.js.
-         */
-        interface DefineValidateOptions {
-
-            /**
-             * is: ["^[a-z]+$",'i'] // will only allow letters
-             * is: /^[a-z]+$/i      // same as the previous example using real RegExp
-             */
-            is?: string | Array<string | RegExp> | RegExp | { msg: string, args : string | Array<string | RegExp> | RegExp };
-
-            /**
-             * not: ["[a-z]",'i']  // will not allow letters
-             */
-            not?: string | Array<string | RegExp> | RegExp | { msg: string, args : string | Array<string | RegExp> | RegExp };
-
-            /**
-             * checks for email format (foo@bar.com)
-             */
-            isEmail?: boolean | { msg: string };
-
-            /**
-             * checks for url format (http://foo.com)
-             */
-            isUrl?: boolean | { msg: string };
-
-            /**
-             * checks for IPv4 (129.89.23.1) or IPv6 format
-             */
-            isIP?: boolean | { msg: string };
-
-            /**
-             * checks for IPv4 (129.89.23.1)
-             */
-            isIPv4?: boolean | { msg: string };
-
-            /**
-             * checks for IPv6 format
-             */
-            isIPv6?: boolean | { msg: string };
-
-            /**
-             * will only allow letters
-             */
-            isAlpha?: boolean | { msg: string };
-
-            /**
-             * will only allow alphanumeric characters, so "_abc" will fail
-             */
-            isAlphanumeric?: boolean | { msg: string };
-
-            /**
-             * will only allow numbers
-             */
-            isNumeric?: boolean | { msg: string };
-
-            /**
-             * checks for valid integers
-             */
-            isInt?: boolean | { msg: string };
-
-            /**
-             * checks for valid floating point numbers
-             */
-            isFloat?: boolean | { msg: string };
-
-            /**
-             * checks for any numbers
-             */
-            isDecimal?: boolean | { msg: string };
-
-            /**
-             * checks for lowercase
-             */
-            isLowercase?: boolean | { msg: string };
-
-            /**
-             * checks for uppercase
-             */
-            isUppercase?: boolean | { msg: string };
-
-            /**
-             * won't allow null
-             */
-            notNull?: boolean | { msg: string };
-
-            /**
-             * only allows null
-             */
-            isNull?: boolean | { msg: string };
-
-            /**
-             * don't allow empty strings
-             */
-            notEmpty?: boolean | { msg: string };
-
-            /**
-             * only allow a specific value
-             */
-            equals? : string | { msg: string };
-
-            /**
-             * force specific substrings
-             */
-            contains? : string | { msg: string };
-
-            /**
-             * check the value is not one of these
-             */
-            notIn? : string[][] | { msg: string, args: string[][] };
-
-            /**
-             * check the value is one of these
-             */
-            isIn? : string[][] | { msg: string, args: string[][] };
-
-            /**
-             * don't allow specific substrings
-             */
-            notContains? : string[] | string | { msg: string, args: string[] | string };
-
-            /**
-             * only allow values with length between 2 and 10
-             */
-            len?: [number, number] | { msg: string, args: [number, number] };
-
-            /**
-             * only allow uuids
-             */
-            isUUID?: number | { msg: string, args: number };
-
-            /**
-             * only allow date strings
-             */
-            isDate?: boolean | { msg: string, args: boolean };
-
-            /**
-             * only allow date strings after a specific date
-             */
-            isAfter?: string | { msg: string, args: string };
-
-            /**
-             * only allow date strings before a specific date
-             */
-            isBefore?: string | { msg: string, args: string };
-
-            /**
-             * only allow values
-             */
-            max?: number | { msg: string, args: number };
-
-            /**
-             * only allow values >= 23
-             */
-            min?: number | { msg: string, args: number };
-
-            /**
-             * only allow arrays
-             */
-            isArray?: boolean | { msg: string, args: boolean };
-
-            /**
-             * check for valid credit card numbers
-             */
-            isCreditCard?: boolean | { msg: string, args: boolean };
-
-            /**
-             * custom validations are also possible
-             *
-             * Implementation notes :
-             *
-             * We can't enforce any other method to be a function, so :
-             *
-             * ```typescript
-             * [name: string] : ( value : any ) => boolean;
-             * ```
-             *
-             * doesn't work in combination with the properties above
-             *
-             * @see https://github.com/Microsoft/TypeScript/issues/1889
-             */
-            [name: string] : any;
-
-        }
-
-        /**
-         * Interface for indexes property in DefineOptions
-         *
-         * @see DefineOptions
-         */
-        interface DefineIndexesOptions {
-
-            /**
-             * The name of the index. Defaults to model name + _ + fields concatenated
-             */
-            name? : string;
-
-            /**
-             * Index type. Only used by mysql. One of `UNIQUE`, `FULLTEXT` and `SPATIAL`
-             */
-            index? : string;
-
-            /**
-             * The method to create the index by (`USING` statement in SQL). BTREE and HASH are supported by mysql and
-             * postgres, and postgres additionally supports GIST and GIN.
-             */
-            method? : string;
-
-            /**
-             * Should the index by unique? Can also be triggered by setting type to `UNIQUE`
-             *
-             * Defaults to false
-             */
-            unique? : boolean;
-
-            /**
-             * PostgreSQL will build the index without taking any write locks. Postgres only
-             *
-             * Defaults to false
-             */
-            concurrently? : boolean;
-
-            /**
-             * An array of the fields to index. Each field can either be a string containing the name of the field,
-             * a sequelize object (e.g `sequelize.fn`), or an object with the following attributes: `attribute`
-             * (field name), `length` (create a prefix index of length chars), `order` (the direction the column
-             * should be sorted in), `collate` (the collation (sort order) for the column)
-             */
-            fields? : Array<string|{ attribute: string, length: number, order: string, collate: string }>;
-
-        }
-
-        /**
-         * Interface for name property in DefineOptions
-         *
-         * @see DefineOptions
-         */
-        interface DefineNameOptions {
-
-            /**
-             * Singular model name
-             */
-            singular? : string;
-
-            /**
-             * Plural model name
-             */
-            plural? : string;
-
-        }
-
-        /**
-         * Interface for getterMethods in DefineOptions
-         *
-         * @see DefineOptions
-         */
-        interface DefineGetterMethodsOptions {
-            [name: string] : () => any;
-        }
-
-        /**
-         * Interface for setterMethods in DefineOptions
-         *
-         * @see DefineOptions
-         */
-        interface DefineSetterMethodsOptions {
-            [name: string] : ( val : any ) => void;
-        }
-
-        /**
-         * Interface for Define Scope Options
-         *
-         * @see DefineOptions
-         */
-        interface DefineScopeOptions {
-
-            /**
-             * Name of the scope and it's query
-             */
-            [scopeName: string] : FindOptions | Function;
-
-        }
-
-        /**
-         * Options for model definition
-         *
-         * @see Sequelize.define
-         */
-        interface DefineOptions<TInstance> {
-
-            /**
-             * Define the default search scope to use for this model. Scopes have the same form as the options passed to
-             * find / findAll.
-             */
-            defaultScope?: FindOptions;
-
-            /**
-             * More scopes, defined in the same way as defaultScope above. See `Model.scope` for more information about
-             * how scopes are defined, and what you can do with them
-             */
-            scopes?: DefineScopeOptions;
-
-            /**
-             * Don't persits null values. This means that all columns with null values will not be saved.
-             */
-            omitNull?: boolean;
-
-            /**
-             * Adds createdAt and updatedAt timestamps to the model. Default true.
-             */
-            timestamps?: boolean;
-
-            /**
-             * Calling destroy will not delete the model, but instead set a deletedAt timestamp if this is true. Needs
-             * timestamps=true to work. Default false.
-             */
-            paranoid?: boolean;
-
-            /**
-             * Converts all camelCased columns to underscored if true. Default false.
-             */
-            underscored?: boolean;
-
-            /**
-             * Converts camelCased model names to underscored tablenames if true. Default false.
-             */
-            underscoredAll?: boolean;
-
-            /**
-             * If freezeTableName is true, sequelize will not try to alter the DAO name to get the table name.
-             * Otherwise, the dao name will be pluralized. Default false.
-             */
-            freezeTableName?: boolean;
-
-            /**
-             * An object with two attributes, `singular` and `plural`, which are used when this model is associated to
-             * others.
-             */
-            name?: DefineNameOptions;
-
-            /**
-             * Indexes for the provided database table
-             */
-            indexes? : DefineIndexesOptions[];
-
-            /**
-             * Override the name of the createdAt column if a string is provided, or disable it if false. Timestamps
-             * must be true. Not affected by underscored setting.
-             */
-            createdAt? : string | boolean;
-
-            /**
-             * Override the name of the deletedAt column if a string is provided, or disable it if false. Timestamps
-             * must be true. Not affected by underscored setting.
-             */
-            deletedAt? : string | boolean;
-
-            /**
-             * Override the name of the updatedAt column if a string is provided, or disable it if false. Timestamps
-             * must be true. Not affected by underscored setting.
-             */
-            updatedAt? : string | boolean;
-
-            /**
-             * Defaults to pluralized model name, unless freezeTableName is true, in which case it uses model name
-             * verbatim
-             */
-            tableName? : string;
-
-            /**
-             * Provide getter functions that work like those defined per column. If you provide a getter method with
-             * the
-             * same name as a column, it will be used to access the value of that column. If you provide a name that
-             * does not match a column, this function will act as a virtual getter, that can fetch multiple other
-             * values
-             */
-            getterMethods? : DefineGetterMethodsOptions;
-
-            /**
-             * Provide setter functions that work like those defined per column. If you provide a setter method with
-             * the
-             * same name as a column, it will be used to update the value of that column. If you provide a name that
-             * does not match a column, this function will act as a virtual setter, that can act on and set other
-             * values, but will not be persisted
-             */
-            setterMethods? : DefineSetterMethodsOptions;
-
-            /**
-             * Provide functions that are added to each instance (DAO). If you override methods provided by sequelize,
-             * you can access the original method using `this.constructor.super_.prototype`, e.g.
-             * `this.constructor.super_.prototype.toJSON.apply(this, arguments)`
-             */
-            instanceMethods? : Object;
-
-            /**
-             * Provide functions that are added to the model (Model). If you override methods provided by sequelize,
-             * you can access the original method using `this.constructor.prototype`, e.g.
-             * `this.constructor.prototype.find.apply(this, arguments)`
-             */
-            classMethods? : Object;
-
-            schema? : string;
-
-            /**
-             * You can also change the database engine, e.g. to MyISAM. InnoDB is the default.
-             */
-            engine? : string;
-
-            charset? : string;
-
-            /**
-             * Finaly you can specify a comment for the table in MySQL and PG
-             */
-            comment? : string;
-
-            collate? : string;
-
-            /**
-             * Set the initial AUTO_INCREMENT value for the table in MySQL.
-             */
-            initialAutoIncrement? : string;
-
-            /**
-             * An object of hook function that are called before and after certain lifecycle events.
-             * The possible hooks are: beforeValidate, afterValidate, beforeBulkCreate, beforeBulkDestroy,
-             * beforeBulkUpdate, beforeCreate, beforeDestroy, beforeUpdate, afterCreate, afterDestroy, afterUpdate,
-             * afterBulkCreate, afterBulkDestory and afterBulkUpdate. See Hooks for more information about hook
-             * functions and their signatures. Each property can either be a function, or an array of functions.
-             */
-            hooks? : HooksDefineOptions<TInstance>;
-
-            /**
-             * An object of model wide validations. Validations have access to all model values via `this`. If the
-             * validator function takes an argument, it is asumed to be async, and is called with a callback that
-             * accepts an optional error.
-             */
-            validate? : DefineValidateOptions;
-
-        }
-
-        /**
-         * Sync Options
-         *
-         * @see Sequelize.sync
-         */
-        interface SyncOptions {
-
-            /**
-             * If force is true, each DAO will do DROP TABLE IF EXISTS ..., before it tries to create its own table
-             */
-            force?: boolean;
-
-            /**
-             * Match a regex against the database name before syncing, a safety check for cases where force: true is
-             * used in tests but not live code
-             */
-            match?: RegExp;
-
-            /**
-             * A function that logs sql queries, or false for no logging
-             */
-            logging?: Function | boolean;
-
-            /**
-             * The schema that the tables should be created in. This can be overriden for each table in sequelize.define
-             */
-            schema?: string;
-
-        }
-
-        interface SetOptions { }
-
-        /**
-         * Connection Pool options
-         *
-         * @see Options
-         */
-        interface PoolOptions {
-
-            /**
-             * Maximum connections of the pool
-             */
-            maxConnections?: number;
-
-            /**
-             * Minimum connections of the pool
-             */
-            minConnections?: number;
-
-            /**
-             * The maximum time, in milliseconds, that a connection can be idle before being released.
-             */
-            maxIdleTime?: number;
-
-            /**
-             * A function that validates a connection. Called with client. The default function checks that client is an
-             * object, and that its state is not disconnected.
-             */
-            validateConnection?: ( client? : any ) => boolean;
-
-        }
-
-        /**
-         * Interface for replication Options in the sequelize constructor
-         *
-         * @see Options
-         */
-        interface ReplicationOptions {
-
-            read?: {
-                host?: string;
-                port?: string | number;
-                username?: string;
-                password?: string;
-                database?: string;
-            };
-
-            write?: {
-                host?: string;
-                port?: string | number;
-                username?: string;
-                password?: string;
-                database?: string;
-            };
-
-        }
-
-        /**
-         * Options for the constructor of Sequelize main class
-         */
-        interface Options {
-
-            /**
-             * The dialect of the database you are connecting to. One of mysql, postgres, sqlite, mariadb and mssql.
-             *
-             * Defaults to 'mysql'
-             */
-            dialect?: string;
-
-            /**
-             * If specified, load the dialect library from this path. For example, if you want to use pg.js instead of
-             * pg when connecting to a pg database, you should specify 'pg.js' here
-             */
-            dialectModulePath?: string;
-
-            /**
-             * An object of additional options, which are passed directly to the connection library
-             */
-            dialectOptions? : Object;
-
-            /**
-             * Only used by sqlite.
-             *
-             * Defaults to ':memory:'
-             */
-            storage? : string;
-
-            /**
-             * The host of the relational database.
-             *
-             * Defaults to 'localhost'
-             */
-            host? : string;
-
-            /**
-             * The port of the relational database.
-             */
-            port? : number;
-
-            /**
-             * The protocol of the relational database.
-             *
-             * Defaults to 'tcp'
-             */
-            protocol? : string;
-
-            /**
-             * Default options for model definitions. See sequelize.define for options
-             */
-            define? : DefineOptions<any>;
-
-            /**
-             * Default options for sequelize.query
-             */
-            query? : QueryOptions;
-
-            /**
-             * Default options for sequelize.set
-             */
-            set? : SetOptions;
-
-            /**
-             * Default options for sequelize.sync
-             */
-            sync? : SyncOptions;
-
-            /**
-             * The timezone used when converting a date from the database into a JavaScript date. The timezone is also
-             * used to SET TIMEZONE when connecting to the server, to ensure that the result of NOW, CURRENT_TIMESTAMP
-             * and other time related functions have in the right timezone. For best cross platform performance use the
-             * format
-             * +/-HH:MM. Will also accept string versions of timezones used by moment.js (e.g. 'America/Los_Angeles');
-             * this is useful to capture daylight savings time changes.
-             *
-             * Defaults to '+00:00'
-             */
-            timezone? : string;
-
-            /**
-             * A function that gets executed everytime Sequelize would log something.
-             *
-             * Defaults to console.log
-             */
-            logging? : boolean | Function;
-
-            /**
-             * A flag that defines if null values should be passed to SQL queries or not.
-             *
-             * Defaults to false
-             */
-            omitNull? : boolean;
-
-            /**
-             * A flag that defines if native library shall be used or not. Currently only has an effect for postgres
-             *
-             * Defaults to false
-             */
-            native? : boolean;
-
-            /**
-             * Use read / write replication. To enable replication, pass an object, with two properties, read and write.
-             * Write should be an object (a single server for handling writes), and read an array of object (several
-             * servers to handle reads). Each read/write server can have the following properties: `host`, `port`,
-             * `username`, `password`, `database`
-             *
-             * Defaults to false
-             */
-            replication? : ReplicationOptions;
-
-            /**
-             * Connection pool options
-             */
-            pool? : PoolOptions;
-
-            /**
-             * Set to `false` to make table names and attributes case-insensitive on Postgres and skip double quoting of
-             * them.
-             *
-             * Defaults to true
-             */
-            quoteIdentifiers? : boolean;
-
-            /**
-             * Set the default transaction isolation level. See `Sequelize.Transaction.ISOLATION_LEVELS` for possible
-             * options.
-             *
-             * Defaults to 'REPEATABLE_READ'
-             */
-            isolationLevel? : string;
-
-            /**
-             * Set the default transaction type. See `Sequelize.Transaction.TYPES` for possible
-             * options.
-             *
-             * Defaults to 'DEFERRED'
-             */
-            transactionType? : string;
-
-        }
-
-        /**
-         * Sequelize methods that are available both for the static and the instance class of Sequelize
-         */
-        interface SequelizeStaticAndInstance extends Errors {
-
-            /**
-             * A reference to sequelize utilities. Most users will not need to use these utils directly. However, you
-             * might want to use `Sequelize.Utils._`, which is a reference to the lodash library, if you don't already
-             * have it imported in your project.
-             */
-            Utils: Utils;
-
-            /**
-             * A modified version of bluebird promises, that allows listening for sql events
-             */
-            Promise: typeof Promise;
-
-            /**
-             * Available query types for use with `sequelize.query`
-             */
-            QueryTypes: QueryTypes;
-
-            /**
-             * Exposes the validator.js object, so you can extend it with custom validation functions.
-             * The validator is exposed both on the instance, and on the constructor.
-             */
-            Validator: Validator;
-
-            /**
-             * A Model represents a table in the database. Sometimes you might also see it referred to as model, or
-             * simply as factory. This class should not be instantiated directly, it is created using sequelize.define,
-             * and already created models can be loaded using sequelize.import
-             */
-            Model: Model<any, any>;
-
-            /**
-             * A reference to the sequelize transaction class. Use this to access isolationLevels when creating a
-             * transaction
-             */
-            Transaction : TransactionStatic;
-
-            /**
-             * A reference to the deferrable collection. Use this to access the different deferrable options.
-             */
-            Deferrable : Deferrable;
-
-            /**
-             * A reference to the sequelize instance class.
-             */
-            Instance : Instance<any>;
-
-            /**
-             * Creates a object representing a database function. This can be used in search queries, both in where and
-             * order parts, and as default values in column definitions. If you want to refer to columns in your
-             * function, you should use `sequelize.col`, so that the columns are properly interpreted as columns and
-             * not a strings.
-             *
-             * Convert a user's username to upper case
-             * ```js
-             * instance.updateAttributes({
-             *   username: self.sequelize.fn('upper', self.sequelize.col('username'))
-             * })
-             * ```
-             * @param fn The function you want to call
-             * @param args All further arguments will be passed as arguments to the function
-             */
-            fn( fn : string, ...args : any[] ) : fn;
-
-            /**
-             * Creates a object representing a column in the DB. This is often useful in conjunction with
-             * `sequelize.fn`, since raw string arguments to fn will be escaped.
-             *
-             * @param col The name of the column
-             */
-            col( col : string ) : col;
-
-            /**
-             * Creates a object representing a call to the cast function.
-             *
-             * @param val The value to cast
-             * @param type The type to cast it to
-             */
-            cast( val : any, type : string ) : cast;
-
-            /**
-             * Creates a object representing a literal, i.e. something that will not be escaped.
-             *
-             * @param val
-             */
-            literal( val : any ) : literal;
-            asIs( val : any ) : literal;
-
-            /**
-             * An AND query
-             *
-             * @param args Each argument will be joined by AND
-             */
-            and( ...args : Array<string | Object> ) : and;
-
-            /**
-             * An OR query
-             *
-             * @param args Each argument will be joined by OR
-             */
-            or( ...args : Array<string | Object> ) : or;
-
-            /**
-             * Creates an object representing nested where conditions for postgres's json data-type.
-             *
-             * @param conditionsOrPath A hash containing strings/numbers or other nested hash, a string using dot
-             *     notation or a string using postgres json syntax.
-             * @param value An optional value to compare against. Produces a string of the form "<json path> =
-             *     '<value>'".
-             */
-            json( conditionsOrPath : string | Object, value? : string | number | boolean ) : json;
-
-            /**
-             * A way of specifying attr = condition.
-             *
-             * The attr can either be an object taken from `Model.rawAttributes` (for example `Model.rawAttributes.id`
-             * or
-             * `Model.rawAttributes.name`). The attribute should be defined in your model definition. The attribute can
-             * also be an object from one of the sequelize utility functions (`sequelize.fn`, `sequelize.col` etc.)
-             *
-             * For string attributes, use the regular `{ where: { attr: something }}` syntax. If you don't want your
-             * string to be escaped, use `sequelize.literal`.
-             *
-             * @param attr The attribute, which can be either an attribute object from `Model.rawAttributes` or a
-             *     sequelize object, for example an instance of `sequelize.fn`. For simple string attributes, use the
-             *     POJO syntax
-             * @param comparator Comparator
-             * @param logic The condition. Can be both a simply type, or a further condition (`.or`, `.and`, `.literal`
-             *     etc.)
-             */
-            where( attr : Object, comparator : string, logic : string | Object ) : where;
-            where( attr : Object, logic : string | Object ) : where;
-            condition( attr : Object, logic : string | Object ) : where;
-
-        }
-
-        /**
-         * Sequelize methods available only for the static class ( basically this is the constructor and some extends )
-         */
-        interface SequelizeStatic extends SequelizeStaticAndInstance, DataTypes {
-
-            /**
-             * Instantiate sequelize with name of database, username and password
-             *
-             * #### Example usage
-             *
-             * ```javascript
-             * // without password and options
-             * var sequelize = new Sequelize('database', 'username')
-             *
-             * // without options
-             * var sequelize = new Sequelize('database', 'username', 'password')
-             *
-             * // without password / with blank password
-             * var sequelize = new Sequelize('database', 'username', null, {})
-             *
-             * // with password and options
-             * var sequelize = new Sequelize('my_database', 'john', 'doe', {})
-             *
-             * // with uri (see below)
-             * var sequelize = new Sequelize('mysql://localhost:3306/database', {})
-             * ```
-             *
-             * @param database The name of the database
-             * @param username The username which is used to authenticate against the
-             *     database.
-             * @param password The password which is used to authenticate against the
-             *     database.
-             * @param options An object with options.
-             */
-            new ( database : string, username : string, password : string, options? : Options ) : Sequelize;
-            new ( database : string, username : string, options? : Options ) : Sequelize;
-
-            /**
-             * Instantiate sequelize with an URI
-             * @name Sequelize
-             * @constructor
-             *
-             * @param uri A full database URI
-             * @param options See above for possible options
-             */
-            new ( uri : string, options? : Options ) : Sequelize;
-
-            /**
-             * Provide access to continuation-local-storage (http://docs.sequelizejs.com/en/latest/api/sequelize/#transactionoptions-promise)
-             */
-            cls: any;
-
-        }
-
-        interface QueryOptionsTransactionRequired { }
-        interface ModelsHashInterface {
-            [name: string]: Model<any, any>;
-        }
-
-        /**
-         * This is the main class, the entry point to sequelize. To use it, you just need to
-         * import sequelize:
-         *
-         * ```js
-         * var Sequelize = require('sequelize');
-         * ```
-         *
-         * In addition to sequelize, the connection library for the dialect you want to use
-         * should also be installed in your project. You don't need to import it however, as
-         * sequelize will take care of that.
-         */
-        interface Sequelize extends SequelizeStaticAndInstance, Hooks<any> {
-
-            /**
-             * A reference to Sequelize constructor from sequelize. Useful for accessing DataTypes, Errors etc.
-             */
-            Sequelize: SequelizeStatic;
-
-            /**
-             * Defined models.
-             */
-            models: ModelsHashInterface;
-
-            /**
-             * Returns the specified dialect.
-             */
-            getDialect() : string;
-
-            /**
-             * Returns an instance of QueryInterface.
-             */
-            getQueryInterface(): QueryInterface;
-
-            /**
-             * Define a new model, representing a table in the DB.
-             *
-             * The table columns are define by the hash that is given as the second argument. Each attribute of the
-             * hash
-             * represents a column. A short table definition might look like this:
-             *
-             * ```js
-             * sequelize.define('modelName', {
-             *     columnA: {
-             *         type: Sequelize.BOOLEAN,
-             *         validate: {
-             *           is: ["[a-z]",'i'],        // will only allow letters
-             *           max: 23,                  // only allow values <= 23
-             *           isIn: {
-             *             args: [['en', 'zh']],
-             *             msg: "Must be English or Chinese"
-             *           }
-             *         },
-             *         field: 'column_a'
-             *         // Other attributes here
-             *     },
-             *     columnB: Sequelize.STRING,
-             *     columnC: 'MY VERY OWN COLUMN TYPE'
-             * })
-             *
-             * sequelize.models.modelName // The model will now be available in models under the name given to define
-             * ```
-             *
-             * As shown above, column definitions can be either strings, a reference to one of the datatypes that are
-             * predefined on the Sequelize constructor, or an object that allows you to specify both the type of the
-             * column, and other attributes such as default values, foreign key constraints and custom setters and
-             * getters.
-             *
-             * For a list of possible data types, see
-             * http://docs.sequelizejs.com/en/latest/docs/models-definition/#data-types
-             *
-             * For more about getters and setters, see
-             * http://docs.sequelizejs.com/en/latest/docs/models-definition/#getters-setters
-             *
-             * For more about instance and class methods, see
-             * http://docs.sequelizejs.com/en/latest/docs/models-definition/#expansion-of-models
-             *
-             * For more about validation, see
-             * http://docs.sequelizejs.com/en/latest/docs/models-definition/#validations
-             *
-             * @param modelName  The name of the model. The model will be stored in `sequelize.models` under this name
-             * @param attributes An object, where each attribute is a column of the table. Each column can be either a
-             *                   DataType, a string or a type-description object, with the properties described below:
-             * @param options    These options are merged with the default define options provided to the Sequelize
-             *                   constructor
-             */
-            define<TInstance, TAttributes>( modelName : string, attributes : DefineAttributes,
-                                            options? : DefineOptions<TInstance> ) : Model<TInstance, TAttributes>;
-
-            /**
-             * Fetch a Model which is already defined
-             *
-             * @param modelName The name of a model defined with Sequelize.define
-             */
-            model<TInstance, TAttributes>( modelName : string ) : Model<TInstance, TAttributes>;
-
-            /**
-             * Checks whether a model with the given name is defined
-             *
-             * @param modelName The name of a model defined with Sequelize.define
-             */
-            isDefined( modelName : string ) : boolean;
-
-            /**
-             * Imports a model defined in another file
-             *
-             * Imported models are cached, so multiple calls to import with the same path will not load the file
-             * multiple times
-             *
-             * See https://github.com/sequelize/sequelize/blob/master/examples/using-multiple-model-files/Task.js for a
-             * short example of how to define your models in separate files so that they can be imported by
-             * sequelize.import
-             *
-             * @param path The path to the file that holds the model you want to import. If the part is relative, it
-             *     will be resolved relatively to the calling file
-             *
-             * @param defineFunction An optional function that provides model definitions. Useful if you do not
-             *     want to use the module root as the define function
-             */
-            import<TInstance, TAttributes>( path : string, defineFunction? : (sequelize: Sequelize, dataTypes: DataTypes) => Model<TInstance, TAttributes> ) : Model<TInstance, TAttributes>;
-
-            /**
-             * Execute a query on the DB, with the posibility to bypass all the sequelize goodness.
-             *
-             * By default, the function will return two arguments: an array of results, and a metadata object,
-             * containing number of affected rows etc. Use `.spread` to access the results.
-             *
-             * If you are running a type of query where you don't need the metadata, for example a `SELECT` query, you
-             * can pass in a query type to make sequelize format the results:
-             *
-             * ```js
-             * sequelize.query('SELECT...').spread(function (results, metadata) {
-             *   // Raw query - use spread
-             * });
-             *
-             * sequelize.query('SELECT...', { type: sequelize.QueryTypes.SELECT }).then(function (results) {
-             *   // SELECT query - use then
-             * })
-             * ```
-             *
-             * @param sql
-             * @param options Query options
-             */
-            query( sql : string | { query: string, values: any[] }, options? : QueryOptions ) : Promise<any>;
-
-            /**
-             * Execute a query which would set an environment or user variable. The variables are set per connection,
-             * so this function needs a transaction.
-             *
-             * Only works for MySQL.
-             *
-             * @param variables Object with multiple variables.
-             * @param options Query options.
-             */
-            set( variables : Object, options : QueryOptionsTransactionRequired ) : Promise<any>;
-
-            /**
-             * Escape value.
-             *
-             * @param value Value that needs to be escaped
-             */
-            escape( value : string ) : string;
-
-            /**
-             * Create a new database schema.
-             *
-             * Note,that this is a schema in the
-             * [postgres sense of the word](http://www.postgresql.org/docs/9.1/static/ddl-schemas.html),
-             * not a database table. In mysql and sqlite, this command will do nothing.
-             *
-             * @param schema Name of the schema
-             * @param options Options supplied
-             * @param options.logging A function that logs sql queries, or false for no logging
-             */
-            createSchema( schema : string, options : { logging? : boolean | Function } ) : Promise<any>;
-
-            /**
-             * Show all defined schemas
-             *
-             * Note,that this is a schema in the
-             * [postgres sense of the word](http://www.postgresql.org/docs/9.1/static/ddl-schemas.html),
-             * not a database table. In mysql and sqlite, this will show all tables.
-             *
-             * @param options Options supplied
-             * @param options.logging A function that logs sql queries, or false for no logging
-             */
-            showAllSchemas( options : { logging? : boolean | Function } ) : Promise<any>;
-
-            /**
-             * Drop a single schema
-             *
-             * Note,that this is a schema in the
-             * [postgres sense of the word](http://www.postgresql.org/docs/9.1/static/ddl-schemas.html),
-             * not a database table. In mysql and sqlite, this drop a table matching the schema name
-             *
-             * @param schema Name of the schema
-             * @param options Options supplied
-             * @param options.logging A function that logs sql queries, or false for no logging
-             */
-            dropSchema( schema : string, options : { logging? : boolean | Function } ) : Promise<any>;
-
-            /**
-             * Drop all schemas
-             *
-             * Note,that this is a schema in the
-             * [postgres sense of the word](http://www.postgresql.org/docs/9.1/static/ddl-schemas.html),
-             * not a database table. In mysql and sqlite, this is the equivalent of drop all tables.
-             *
-             * @param options Options supplied
-             * @param options.logging A function that logs sql queries, or false for no logging
-             */
-            dropAllSchemas( options : { logging? : boolean | Function } ) : Promise<any>;
-
-            /**
-             * Sync all defined models to the DB.
-             *
-             * @param options Sync Options
-             */
-            sync( options? : SyncOptions ) : Promise<any>;
-
-            /**
-             * Truncate all tables defined through the sequelize models. This is done
-             * by calling Model.truncate() on each model.
-             *
-             * @param {object} [options] The options passed to Model.destroy in addition to truncate
-             * @param {Boolean|function} [options.transaction]
-             * @param {Boolean|function} [options.logging] A function that logs sql queries, or false for no logging
-             */
-            truncate( options? : DestroyOptions ) : Promise<any>;
-
-            /**
-             * Drop all tables defined through this sequelize instance. This is done by calling Model.drop on each model
-             * @see {Model#drop} for options
-             *
-             * @param options The options passed to each call to Model.drop
-             */
-            drop( options? : DropOptions ) : Promise<any>;
-
-            /**
-             * Test the connection by trying to authenticate
-             *
-             * @param options Query Options for authentication
-             */
-            authenticate( options? : QueryOptions ) : Promise<void>;
-            validate( options? : QueryOptions ) : Promise<ValidationError>;
-
-            /**
-             * Start a transaction. When using transactions, you should pass the transaction in the options argument
-             * in order for the query to happen under that transaction
-             *
-             * ```js
-             * sequelize.transaction().then(function (t) {
-             *   return User.find(..., { transaction: t}).then(function (user) {
-             *     return user.updateAttributes(..., { transaction: t});
-             *   })
-             *   .then(t.commit.bind(t))
-             *   .catch(t.rollback.bind(t));
-             * })
-             * ```
-             *
-             * A syntax for automatically committing or rolling back based on the promise chain resolution is also
-             * supported:
-             *
-             * ```js
-             * sequelize.transaction(function (t) { // Note that we use a callback rather than a promise.then()
-             *   return User.find(..., { transaction: t}).then(function (user) {
-             *     return user.updateAttributes(..., { transaction: t});
-             *   });
-             * }).then(function () {
-             *   // Commited
-             * }).catch(function (err) {
-             *   // Rolled back
-             *   console.error(err);
-             * });
-             * ```
-             *
-             * If you have [CLS](https://github.com/othiym23/node-continuation-local-storage) enabled, the transaction
-             * will automatically be passed to any query that runs witin the callback. To enable CLS, add it do your
-             * project, create a namespace and set it on the sequelize constructor:
-             *
-             * ```js
-             * var cls = require('continuation-local-storage'),
-             *     ns = cls.createNamespace('....');
-             * var Sequelize = require('sequelize');
-             * Sequelize.cls = ns;
-             * ```
-             * Note, that CLS is enabled for all sequelize instances, and all instances will share the same namespace
-             *
-             * @param options Transaction Options
-             * @param autoCallback Callback for the transaction
-             */
-            transaction( options : TransactionOptions,
-                         autoCallback : ( t : Transaction ) => Promise<any> ) : Promise<any>;
-            transaction( autoCallback : ( t : Transaction ) => Promise<any> ) : Promise<any>;
-            transaction() : Promise<Transaction>;
-
-            /**
-             * Close all connections used by this sequelize instance, and free all references so the instance can be
-             * garbage collected.
-             *
-             * Normally this is done on process exit, so you only need to call this method if you are creating multiple
-             * instances, and want to garbage collect some of them.
-             */
-            close() : void;
-
-            /**
-             * Returns the database version
-             */
-            databaseVersion() : Promise<string>;
-
-        }
-
-        //
-        //  Validator
-        // ~~~~~~~~~~~
-
-        /**
-         * Validator Interface
-         */
-        interface Validator extends ValidatorJS.ValidatorStatic {
-
-            notEmpty( str : string ) : boolean;
-            len( str : string, min : number, max : number ) : boolean;
-            isUrl( str : string ) : boolean;
-            isIPv6( str : string ) : boolean;
-            isIPv4( str : string ) : boolean;
-            notIn( str : string, values : string[] ) : boolean;
-            regex( str : string, pattern : string, modifiers : string ) : boolean;
-            notRegex( str : string, pattern : string, modifiers : string ) : boolean;
-            isDecimal( str : string ) : boolean;
-            min( str : string, val : number ) : boolean;
-            max( str : string, val : number ) : boolean;
-            not( str : string, pattern : string, modifiers : string ) : boolean;
-            contains( str : string, element : string[] ) : boolean;
-            notContains( str : string, element : string[] ) : boolean;
-            is( str : string, pattern : string, modifiers : string ) : boolean;
-
-        }
-
-        //
-        //  Transaction
-        // ~~~~~~~~~~~~~
-        //
-        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/transaction.js
-        //
-
-        /**
-         * The transaction object is used to identify a running transaction. It is created by calling
-         * `Sequelize.transaction()`.
-         *
-         * To run a query under a transaction, you should pass the transaction in the options object.
-         */
-        interface Transaction {
-
-            /**
-             * Possible options for row locking. Used in conjuction with `find` calls:
-             *
-             * @see TransactionStatic
-             */
-            LOCK : TransactionLock;
-
-            /**
-             * Commit the transaction
-             */
-            commit() : Promise<void>;
-
-            /**
-             * Rollback (abort) the transaction
-             */
-            rollback() : Promise<void>;
-
-        }
-
-        /**
-         * The transaction static object
-         *
-         * @see Transaction
-         */
-        interface TransactionStatic {
-
-            /**
-             * Isolations levels can be set per-transaction by passing `options.isolationLevel` to
-             * `sequelize.transaction`. Default to `REPEATABLE_READ` but you can override the default isolation level
-             * by passing
-             * `options.isolationLevel` in `new Sequelize`.
-             *
-             * The possible isolations levels to use when starting a transaction:
-             *
-             * ```js
-             * {
-             *   READ_UNCOMMITTED: "READ UNCOMMITTED",
-             *   READ_COMMITTED: "READ COMMITTED",
-             *   REPEATABLE_READ: "REPEATABLE READ",
-             *   SERIALIZABLE: "SERIALIZABLE"
-             * }
-             * ```
-             *
-             * Pass in the desired level as the first argument:
-             *
-             * ```js
-             * return sequelize.transaction({
-             *   isolationLevel: Sequelize.Transaction.SERIALIZABLE
-             * }, function (t) {
-             *
-             *  // your transactions
-             *
-             * }).then(function(result) {
-             *   // transaction has been committed. Do something after the commit if required.
-             * }).catch(function(err) {
-             *   // do something with the err.
-             * });
-             * ```
-             *
-             * @see ISOLATION_LEVELS
-             */
-            ISOLATION_LEVELS : TransactionIsolationLevels;
-
-            /**
-             * Transaction type can be set per-transaction by passing `options.type` to
-             * `sequelize.transaction`. Default to `DEFERRED` but you can override the default isolation level
-             * by passing `options.transactionType` in `new Sequelize`.
-             *
-             * The transaction types to use when starting a transaction:
-             *
-             * ```js
-             * {
-             *   DEFERRED: "DEFERRED",
-             *   IMMEDIATE: "IMMEDIATE",
-             *   EXCLUSIVE: "EXCLUSIVE"
-             * }
-             * ```
-             *
-             * Pass in the transaction type the first argument:
-             *
-             * ```js
-             * return sequelize.transaction({
-             *   type: Sequelize.Transaction.EXCLUSIVE
-             * }, function (t) {
-             *
-             *  // your transactions
-             *
-             * }).then(function(result) {
-             *   // transaction has been committed. Do something after the commit if required.
-             * }).catch(function(err) {
-             *   // do something with the err.
-             * });
-             * ```
-             *
-             * @see Sequelize.Transaction.TYPES
-             */
-            TYPES : TransactionTypes;
-
-            /**
-             * Possible options for row locking. Used in conjuction with `find` calls:
-             *
-             * ```js
-             * t1 // is a transaction
-             * t1.LOCK.UPDATE,
-             * t1.LOCK.SHARE,
-             * t1.LOCK.KEY_SHARE, // Postgres 9.3+ only
-             * t1.LOCK.NO_KEY_UPDATE // Postgres 9.3+ only
-             * ```
-             *
-             * Usage:
-             * ```js
-             * t1 // is a transaction
-             * Model.findAll({
-             *   where: ...,
-             *   transaction: t1,
-             *   lock: t1.LOCK...
-             * });
-             * ```
-             *
-             * Postgres also supports specific locks while eager loading by using OF:
-             * ```js
-             * UserModel.findAll({
-             *   where: ...,
-             *   include: [TaskModel, ...],
-             *   transaction: t1,
-             *   lock: {
-             *     level: t1.LOCK...,
-             *     of: UserModel
-             *   }
-             * });
-             * ```
-             * UserModel will be locked but TaskModel won't!
-             */
-            LOCK : TransactionLock;
-
-        }
-
-        /**
-         * Isolations levels can be set per-transaction by passing `options.isolationLevel` to `sequelize.transaction`.
-         * Default to `REPEATABLE_READ` but you can override the default isolation level by passing
-         * `options.isolationLevel` in `new Sequelize`.
-         */
-        interface TransactionIsolationLevels {
-            READ_UNCOMMITTED: string; // 'READ UNCOMMITTED'
-            READ_COMMITTED: string; // 'READ COMMITTED'
-            REPEATABLE_READ: string; // 'REPEATABLE READ'
-            SERIALIZABLE: string; // 'SERIALIZABLE'
-        }
-
-        /**
-         * Transaction type can be set per-transaction by passing `options.type` to `sequelize.transaction`.
-         * Default to `DEFERRED` but you can override the default isolation level by passing
-         * `options.transactionType` in `new Sequelize`.
-         */
-        interface TransactionTypes {
-          DEFERRED: string; // 'DEFERRED'
-          IMMEDIATE: string; // 'IMMEDIATE'
-          EXCLUSIVE: string; // 'EXCLUSIVE'
-        }
-
-        /**
-         * Possible options for row locking. Used in conjuction with `find` calls:
-         */
-        interface TransactionLock {
-            UPDATE: string; // 'UPDATE'
-            SHARE: string; // 'SHARE'
-            KEY_SHARE: string; // 'KEY SHARE'
-            NO_KEY_UPDATE: string; // 'NO KEY UPDATE'
-        }
-
-        /**
-         * Options provided when the transaction is created
-         *
-         * @see sequelize.transaction()
-         */
-        interface TransactionOptions {
-
-            autocommit?: boolean;
-
-            /**
-             *  See `Sequelize.Transaction.ISOLATION_LEVELS` for possible options
-             */
-            isolationLevel?: string;
-
-            /**
-             *  See `Sequelize.Transaction.TYPES` for possible options
-             */
-            type?: string;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging?: Function;
-
-        }
-
-        //
-        //  Utils
-        // ~~~~~~~
-
-        interface fn {
-            clone : fnStatic;
-        }
-
-        interface fnStatic {
-            /**
-             * @param fn The function you want to call
-             * @param args All further arguments will be passed as arguments to the function
-             */
-            new ( fn : string, ...args : any[] ) : fn;
-        }
-
-        interface col {
-            col: string;
-        }
-
-        interface colStatic {
-            /**
-             * Creates a object representing a column in the DB. This is often useful in conjunction with
-             * `sequelize.fn`, since raw string arguments to fn will be escaped.
-             * @see {Sequelize#fn}
-             *
-             * @param col The name of the column
-             */
-            new ( col : string ) : col;
-        }
-
-        interface cast {
-            val: any;
-            type: string;
-        }
-
-        interface castStatic {
-            /**
-             * Creates a object representing a call to the cast function.
-             *
-             * @param val The value to cast
-             * @param type The type to cast it to
-             */
-            new ( val : any, type : string ) : cast;
-        }
-
-        interface literal {
-            val: any;
-        }
-
-        interface literalStatic {
-            /**
-             * Creates a object representing a literal, i.e. something that will not be escaped.
-             *
-             * @param val
-             */
-            new ( val : any ) : literal;
-        }
-
-        interface and {
-            args: any[];
-        }
-
-        interface andStatic {
-            /**
-             * An AND query
-             *
-             * @param args Each argument will be joined by AND
-             */
-            new ( ...args : Array<string | Object> ) : and;
-        }
-
-        interface or {
-            args: any[];
-        }
-
-        interface orStatic {
-            /**
-             * An OR query
-             * @see {Model#find}
-             *
-             * @param args Each argument will be joined by OR
-             */
-            new ( ...args : Array<string | Object> ) : or;
-        }
-
-        interface json {
-            conditions?: Object;
-            path? : string;
-            value? : string | number | boolean;
-        }
-
-        interface jsonStatic {
-            /**
-             * Creates an object representing nested where conditions for postgres's json data-type.
-             * @see {Model#find}
-             *
-             * @method json
-             * @param conditionsOrPath A hash containing strings/numbers or other nested hash, a string using dot
-             *     notation or a string using postgres json syntax.
-             * @param value An optional value to compare against. Produces a string of the form "<json path> =
-             *     '<value>'".
-             */
-            new ( conditionsOrPath : string | Object, value? : string | number | boolean ) : json;
-        }
-
-        interface where {
-            attribute : Object;
-            comparator? : string;
-            logic : string | Object;
-        }
-
-        interface whereStatic {
-            /**
-             * A way of specifying attr = condition.
-             *
-             * The attr can either be an object taken from `Model.rawAttributes` (for example `Model.rawAttributes.id`
-             * or
-             * `Model.rawAttributes.name`). The attribute should be defined in your model definition. The attribute can
-             * also be an object from one of the sequelize utility functions (`sequelize.fn`, `sequelize.col` etc.)
-             *
-             * For string attributes, use the regular `{ where: { attr: something }}` syntax. If you don't want your
-             * string to be escaped, use `sequelize.literal`.
-             *
-             * @param attr The attribute, which can be either an attribute object from `Model.rawAttributes` or a
-             *     sequelize object, for example an instance of `sequelize.fn`. For simple string attributes, use the
-             *     POJO syntax
-             * @param comparator Comparator
-             * @param logic The condition. Can be both a simply type, or a further condition (`.or`, `.and`, `.literal`
-             *     etc.)
-             */
-            new ( attr : Object, comparator : string, logic : string | Object ) : where;
-            new ( attr : Object, logic : string | Object ) : where;
-        }
-
-        interface SequelizeLoDash extends _.LoDashStatic {
-
-            camelizeIf( str : string, condition : boolean ): string;
-            underscoredIf( str : string, condition : boolean ): string;
-            /**
-             * * Returns an array with some falsy values removed. The values null, "", undefined and NaN are considered
-             * falsey.
-             *
-             * @param arr Array to compact.
-             */
-            compactLite<T>( arr : T[] ): T[];
-            matchesDots( dots : string | string[], value : Object ) : ( item : Object ) => boolean;
-
-        }
-
-        interface Utils {
-
-            _ : SequelizeLoDash;
-
-            /**
-             * Same concept as _.merge, but don't overwrite properties that have already been assigned
-             */
-            mergeDefaults : typeof _.merge;
-
-            lowercaseFirst( str : string ): string;
-            uppercaseFirst( str : string ): string;
-            spliceStr( str : string, index : number, count : number, add : string ): string;
-            camelize( str : string ): string;
-            format( arr : any[], dialect? : string ): string;
-            formatNamedParameters( sql : string, parameters : any, dialect? : string ): string;
-            cloneDeep<T extends Object>( obj : T, fn? : ( value : T ) => any ) : T;
-            mapOptionFieldNames<T extends Object>( options : T, Model : Model<any, any> ) : T;
-            mapValueFieldNames( dataValues : Object, fields : string[], Model : Model<any, any> ) : Object;
-            argsArePrimaryKeys( args : any[], primaryKeys : Object ) : boolean;
-            canTreatArrayAsAnd( arr : any[] ) : boolean;
-            combineTableNames( tableName1 : string, tableName2 : string ): string;
-            singularize( s : string ): string;
-            pluralize( s : string ): string;
-            removeCommentsFromFunctionString( s : string ): string;
-            toDefaultValue( value : DataTypeAbstract ): any;
-            toDefaultValue( value : () => DataTypeAbstract ): any;
-
-            /**
-             * Determine if the default value provided exists and can be described
-             * in a db schema using the DEFAULT directive.
-             */
-            defaultValueSchemable( value : any ) : boolean;
-
-            removeNullValuesFromHash( hash : Object, omitNull? : boolean, options? : Object ): any;
-            inherit( subClass : Object, superClass : Object ): Object;
-            stack(): string;
-            sliceArgs( args : any[], begin? : number ) : any[];
-            now( dialect : string ): Date;
-            tick( f : Function ): void;
-            addTicks( s : string, tickChar? : string ): string;
-            removeTicks( s : string, tickChar? : string ): string;
-
-            fn: fnStatic;
-            col: colStatic;
-            cast: castStatic;
-            literal: literalStatic;
-            and: andStatic;
-            or: orStatic;
-            json: jsonStatic;
-            where: whereStatic;
-
-            validateParameter( value : Object, expectation : Object, options? : Object ) : boolean;
-            formatReferences( obj : Object ) : Object;
-            Promise : typeof Promise;
-
-        }
-
-    }
-
-    var sequelize : sequelize.SequelizeStatic;
-
-    export = sequelize;
-
-}
diff --git a/sequelize/tsconfig.json b/sequelize/tsconfig.json
new file mode 100644
index 0000000000..71c4361b6b
--- /dev/null
+++ b/sequelize/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "sequelize-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/serve-favicon/index.d.ts b/serve-favicon/index.d.ts
new file mode 100644
index 0000000000..09ad94122f
--- /dev/null
+++ b/serve-favicon/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for serve-favicon 2.2.0
+// Project: https://github.com/expressjs/serve-favicon
+// Definitions by: Uros Smolnik <https://github.com/urossmolnik/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* =================== USAGE ===================
+
+    import serveFavicon = require('serve-favicon');
+    app.use(serveFavicon(__dirname + '/public/favicon.ico'));
+
+ =============================================== */
+
+
+
+
+import express = require('express');
+
+/**
+ * Node.js middleware for serving a favicon.
+ */
+declare function serveFavicon(path: string, options?: {
+    /**
+    * The cache-control max-age directive in ms, defaulting to 1 day. This can also be a string accepted by the ms module.
+    */
+    maxAge?: number;
+}): express.RequestHandler;
+
+declare namespace serveFavicon { }
+
+export = serveFavicon;
diff --git a/serve-favicon/serve-favicon-tests.ts b/serve-favicon/serve-favicon-tests.ts
index 0f99a56fce..9491c05109 100644
--- a/serve-favicon/serve-favicon-tests.ts
+++ b/serve-favicon/serve-favicon-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="serve-favicon.d.ts" />
 
 import express = require('express');
 import favicon = require('serve-favicon');
diff --git a/serve-favicon/serve-favicon.d.ts b/serve-favicon/serve-favicon.d.ts
deleted file mode 100644
index eadd64876b..0000000000
--- a/serve-favicon/serve-favicon.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-// Type definitions for serve-favicon 2.2.0
-// Project: https://github.com/expressjs/serve-favicon
-// Definitions by: Uros Smolnik <https://github.com/urossmolnik/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/* =================== USAGE ===================
-
-    import serveFavicon = require('serve-favicon');
-    app.use(serveFavicon(__dirname + '/public/favicon.ico'));
-
- =============================================== */
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "serve-favicon" {
-    import express = require('express');
-
-    /**
-     * Node.js middleware for serving a favicon.
-     */
-    function serveFavicon(path: string, options?: {
-        /**
-        * The cache-control max-age directive in ms, defaulting to 1 day. This can also be a string accepted by the ms module.
-        */
-        maxAge?: number;
-    }): express.RequestHandler;
-    
-    namespace serveFavicon{}
-
-    export = serveFavicon;
-}
\ No newline at end of file
diff --git a/serve-favicon/tsconfig.json b/serve-favicon/tsconfig.json
new file mode 100644
index 0000000000..0a5e6adc44
--- /dev/null
+++ b/serve-favicon/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "serve-favicon-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/serve-index/index.d.ts b/serve-index/index.d.ts
new file mode 100644
index 0000000000..91437ac338
--- /dev/null
+++ b/serve-index/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for serve-index v1.7.2
+// Project: https://github.com/expressjs/serve-index
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+
+import * as express from 'express';
+import * as fs from 'fs';
+
+declare namespace serveIndex {
+    interface File {
+        name: string;
+        stat: fs.Stats;
+    }
+
+    interface Locals {
+        directory: string;
+        displayIcons: boolean;
+        fileList: Array<File>;
+        name: string;
+        stat: fs.Stats;
+        path: string;
+        style: string;
+        viewName: string;
+    }
+
+    type templateCallback = (error: Error, htmlString?: string) => void;
+
+    interface Options {
+        filter?: (filename: string, index: number, files: Array<File>, dir: string) => boolean;
+        hidden?: boolean;
+        icons?: boolean;
+        stylesheet?: string;
+        template?: string | ((locals: Locals, callback: templateCallback) => void);
+        view?: string;
+    }
+}
+
+declare function serveIndex(path: string, options?: serveIndex.Options): express.Handler;
+
+export = serveIndex;
diff --git a/serve-index/serve-index-tests.ts b/serve-index/serve-index-tests.ts
index 5c4910af9d..038fc3c533 100644
--- a/serve-index/serve-index-tests.ts
+++ b/serve-index/serve-index-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="serve-index.d.ts" />
-/// <reference path="../express/express.d.ts" />
 
 import * as express from 'express';
 import * as serveIndex from 'serve-index';
diff --git a/serve-index/serve-index.d.ts b/serve-index/serve-index.d.ts
deleted file mode 100644
index 0003733f98..0000000000
--- a/serve-index/serve-index.d.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-// Type definitions for serve-index v1.7.2
-// Project: https://github.com/expressjs/serve-index
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../express/express.d.ts" />
-
-declare module 'serve-index' {
-  import * as express from 'express';
-  import * as fs from 'fs';
-
-  namespace serveIndex {
-    interface File {
-      name: string;
-      stat: fs.Stats;
-    }
-
-    interface Locals {
-      directory: string;
-      displayIcons: boolean;
-      fileList: Array<File>;
-      name: string;
-      stat: fs.Stats;
-      path: string;
-      style: string;
-      viewName: string;
-    }
-
-    type templateCallback = (error: Error, htmlString?: string) => void;
-
-    interface Options {
-      filter?: (filename: string, index: number, files: Array<File>, dir: string) => boolean;
-      hidden?: boolean;
-      icons?: boolean;
-      stylesheet?: string;
-      template?: string | ((locals: Locals, callback: templateCallback) => void);
-      view?: string;
-    }
-  }
-
-  function serveIndex(path: string, options?: serveIndex.Options): express.Handler;
-
-  export = serveIndex;
-}
diff --git a/serve-index/tsconfig.json b/serve-index/tsconfig.json
new file mode 100644
index 0000000000..2db50d908e
--- /dev/null
+++ b/serve-index/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "serve-index-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/serve-static/index.d.ts b/serve-static/index.d.ts
new file mode 100644
index 0000000000..8eeedae319
--- /dev/null
+++ b/serve-static/index.d.ts
@@ -0,0 +1,83 @@
+// Type definitions for serve-static 1.7.1
+// Project: https://github.com/expressjs/serve-static
+// Definitions by: Uros Smolnik <https://github.com/urossmolnik/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* =================== USAGE ===================
+
+    import * as serveStatic from "serve-static";
+    app.use(serveStatic("public/ftp", {"index": ["default.html", "default.htm"]}))
+
+ =============================================== */
+
+/// <reference types="express-serve-static-core" />
+
+import * as express from "express-serve-static-core";
+
+/**
+ * Create a new middleware function to serve files from within a given root directory.
+ * The file to serve will be determined by combining req.url with the provided root directory.
+ * When a file is not found, instead of sending a 404 response, this module will instead call next() to move on to the next middleware, allowing for stacking and fall-backs.
+ */
+declare function serveStatic(root: string, options?: {
+    /**
+     * Set how "dotfiles" are treated when encountered. A dotfile is a file or directory that begins with a dot (".").
+     * Note this check is done on the path itself without checking if the path actually exists on the disk.
+     * If root is specified, only the dotfiles above the root are checked (i.e. the root itself can be within a dotfile when when set to "deny").
+     * The default value is 'ignore'.
+     * 'allow' No special treatment for dotfiles
+     * 'deny' Send a 403 for any request for a dotfile
+     * 'ignore' Pretend like the dotfile does not exist and call next()
+     */
+    dotfiles?: string;
+
+    /**
+     * Enable or disable etag generation, defaults to true.
+     */
+    etag?: boolean;
+
+    /**
+     * Set file extension fallbacks. When set, if a file is not found, the given extensions will be added to the file name and search for.
+     * The first that exists will be served. Example: ['html', 'htm'].
+     * The default value is false.
+     */
+    extensions?: string[];
+
+    /**
+     * By default this module will send "index.html" files in response to a request on a directory.
+     * To disable this set false or to supply a new index pass a string or an array in preferred order.
+     */
+    index?: boolean | string | string[];
+
+    /**
+     * Enable or disable Last-Modified header, defaults to true. Uses the file system's last modified value.
+     */
+    lastModified?: boolean;
+
+    /**
+     * Provide a max-age in milliseconds for http caching, defaults to 0. This can also be a string accepted by the ms module.
+     */
+    maxAge?: number | string;
+
+    /**
+     * Redirect to trailing "/" when the pathname is a dir. Defaults to true.
+     */
+    redirect?: boolean;
+
+    /**
+     * Function to set custom headers on response. Alterations to the headers need to occur synchronously.
+     * The function is called as fn(res, path, stat), where the arguments are:
+     * res the response object
+     * path the file path that is being sent
+     * stat the stat object of the file that is being sent
+     */
+    setHeaders?: (res: express.Response, path: string, stat: any) => any;
+}): express.Handler;
+
+import * as m from "mime";
+
+declare namespace serveStatic {
+    var mime: typeof m;
+}
+
+export = serveStatic;
diff --git a/serve-static/serve-static-tests.ts b/serve-static/serve-static-tests.ts
index 7435ed3ab8..43f4b24682 100644
--- a/serve-static/serve-static-tests.ts
+++ b/serve-static/serve-static-tests.ts
@@ -1,8 +1,7 @@
-/// <reference path="serve-static.d.ts" />
-/// <reference path="../express/express.d.ts" />
+
 
 import * as express from 'express';
-import * as serveStatic from 'serve-static';
+import * as serveStatic from './';
 var app = express();
 
 app.use(serveStatic('/1'));
diff --git a/serve-static/serve-static.d.ts b/serve-static/serve-static.d.ts
deleted file mode 100644
index d62979d96d..0000000000
--- a/serve-static/serve-static.d.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-// Type definitions for serve-static 1.7.1
-// Project: https://github.com/expressjs/serve-static
-// Definitions by: Uros Smolnik <https://github.com/urossmolnik/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/* =================== USAGE ===================
-
-    import * as serveStatic from "serve-static";
-    app.use(serveStatic("public/ftp", {"index": ["default.html", "default.htm"]}))
-
- =============================================== */
-
-/// <reference path="../express-serve-static-core/express-serve-static-core.d.ts" />
-/// <reference path="../mime/mime.d.ts" />
-
-declare module "serve-static" {
-    import * as express from "express-serve-static-core";
-
-    /**
-     * Create a new middleware function to serve files from within a given root directory.
-     * The file to serve will be determined by combining req.url with the provided root directory.
-     * When a file is not found, instead of sending a 404 response, this module will instead call next() to move on to the next middleware, allowing for stacking and fall-backs.
-     */
-    function serveStatic(root: string, options?: {
-        /**
-         * Set how "dotfiles" are treated when encountered. A dotfile is a file or directory that begins with a dot (".").
-         * Note this check is done on the path itself without checking if the path actually exists on the disk.
-         * If root is specified, only the dotfiles above the root are checked (i.e. the root itself can be within a dotfile when when set to "deny").
-         * The default value is 'ignore'.
-         * 'allow' No special treatment for dotfiles
-         * 'deny' Send a 403 for any request for a dotfile
-         * 'ignore' Pretend like the dotfile does not exist and call next()
-         */
-        dotfiles?: string;
-
-        /**
-         * Enable or disable etag generation, defaults to true.
-         */
-        etag?: boolean;
-
-        /**
-         * Set file extension fallbacks. When set, if a file is not found, the given extensions will be added to the file name and search for.
-         * The first that exists will be served. Example: ['html', 'htm'].
-         * The default value is false.
-         */
-        extensions?: string[];
-
-        /**
-         * By default this module will send "index.html" files in response to a request on a directory.
-         * To disable this set false or to supply a new index pass a string or an array in preferred order.
-         */
-        index?: boolean|string|string[];
-
-        /**
-         * Enable or disable Last-Modified header, defaults to true. Uses the file system's last modified value.
-         */
-        lastModified?: boolean;
-
-        /**
-         * Provide a max-age in milliseconds for http caching, defaults to 0. This can also be a string accepted by the ms module.
-         */
-        maxAge?: number|string;
-
-        /**
-         * Redirect to trailing "/" when the pathname is a dir. Defaults to true.
-         */
-        redirect?: boolean;
-
-        /**
-         * Function to set custom headers on response. Alterations to the headers need to occur synchronously.
-         * The function is called as fn(res, path, stat), where the arguments are:
-         * res the response object
-         * path the file path that is being sent
-         * stat the stat object of the file that is being sent
-         */
-        setHeaders?: (res: express.Response, path: string, stat: any) => any;
-    }): express.Handler;
-
-    import * as m from "mime";
-
-    namespace serveStatic {
-        var mime: typeof m;
-    }
-
-    export = serveStatic;
-}
diff --git a/serve-static/tsconfig.json b/serve-static/tsconfig.json
new file mode 100644
index 0000000000..c04a316de5
--- /dev/null
+++ b/serve-static/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "serve-static-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sharedworker/SharedWorker-tests.ts b/sharedworker/SharedWorker-tests.ts
index 853daa6b2f..0674166f8d 100644
--- a/sharedworker/SharedWorker-tests.ts
+++ b/sharedworker/SharedWorker-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="SharedWorker.d.ts" />
-
 var worker_with_name = new SharedWorker('worker.js', "worker");
 
 var worker = new SharedWorker('worker.js');
diff --git a/sharedworker/SharedWorker.d.ts b/sharedworker/index.d.ts
similarity index 100%
rename from sharedworker/SharedWorker.d.ts
rename to sharedworker/index.d.ts
diff --git a/sharedworker/tsconfig.json b/sharedworker/tsconfig.json
new file mode 100644
index 0000000000..76e83aed92
--- /dev/null
+++ b/sharedworker/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sharedworker-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sharepoint/SharePoint-tests.ts b/sharepoint/SharePoint-tests.ts
index 74263a099c..bef4ac4b39 100644
--- a/sharepoint/SharePoint-tests.ts
+++ b/sharepoint/SharePoint-tests.ts
@@ -1,7 +1,6 @@
-///<reference path="SharePoint.d.ts" />
-///<reference path="../angularjs/angular.d.ts" />
-///<reference path="../knockout/knockout.d.ts" />
-///<reference path="../jquery/jquery.d.ts" />
+///<reference types="angularjs" />
+///<reference types="knockout" />
+///<reference types="jquery" />
 
 
 //code from http://sptypescript.codeplex.com/
diff --git a/sharepoint/SharePoint-tests.ts.tscparams b/sharepoint/SharePoint-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/sharepoint/SharePoint-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/sharepoint/SharePoint.d.ts b/sharepoint/SharePoint.d.ts
deleted file mode 100644
index 2f3fa1634f..0000000000
--- a/sharepoint/SharePoint.d.ts
+++ /dev/null
@@ -1,11209 +0,0 @@
-// Type definitions for SharePoint 2010 and 2013
-// Project: https://github.com/gandjustas/sptypescript
-// Definitions by: Stanislav Vyshchepan <http://blog.gandjustas.ru>, Andrey Markeev <http://markeev.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../microsoft-ajax/microsoft.ajax.d.ts" />
-declare var _spBodyOnLoadFunctions: Function[];
-declare var _spBodyOnLoadFunctionNames: string[];
-declare var _spBodyOnLoadCalled: boolean;
-declare function ExecuteOrDelayUntilBodyLoaded(initFunc: () => void): void;
-declare function ExecuteOrDelayUntilScriptLoaded(func: () => void, depScriptFileName: string): boolean;
-declare function ExecuteOrDelayUntilEventNotified(func: Function, eventName: string): boolean;
-declare var Strings:any;
-
-declare namespace SP {
-    export class SOD {
-        static execute(fileName: string, functionName: string, ...args: any[]): void;
-        static executeFunc(fileName: string, typeName: string, fn: () => void): void;
-        static executeOrDelayUntilEventNotified(func: Function, eventName: string): boolean;
-        static executeOrDelayUntilScriptLoaded(func: () => void, depScriptFileName: string): boolean;
-        static notifyScriptLoadedAndExecuteWaitingJobs(scriptFileName: string): void;
-        static notifyEventAndExecuteWaitingJobs(eventName: string, args?: any[]): void;
-        static registerSod(fileName: string, url: string): void;
-        static registerSodDep(fileName: string, dependentFileName: string): void;
-        static loadMultiple(keys: string[], fn: () => void, bSync?: boolean): void;
-        static delayUntilEventNotified(func: Function, eventName: string): void;
-
-        static get_prefetch(): boolean;
-        static set_prefetch(value: boolean): void;
-
-        static get_ribbonImagePrefetchEnabled(): boolean;
-        static set_ribbonImagePrefetchEnabled(value: boolean): void;
-    }
-
-    export enum ListLevelPermissionMask {
-        viewListItems,//: 1,
-        insertListItems,//: 2,
-        editListItems,//: 4,
-        deleteListItems,//: 8,
-        approveItems,//: 16,
-        openItems,//: 32,
-        viewVersions,//: 64,
-        deleteVersions,//: 128,
-        breakCheckout,//: 256,
-        managePersonalViews,//: 512,
-        manageLists//: 2048
-    }
-
-    export class HtmlBuilder {
-        constructor();
-        addAttribute(name: string, value: string): void;
-        addCssClass(cssClassName: string): void;
-        addCommunitiesCssClass(cssClassName: string): void;
-        renderBeginTag(tagName: string): void;
-        renderEndTag(): void;
-        write(s: string): void;
-        writeEncoded(s: string): void;
-        toString(): string;
-    }
-
-    export class ScriptHelpers {
-        static disableWebpartSelection(context: SPClientTemplates.RenderContext): void;
-        static getDocumentQueryPairs(): { [index: string]: string; };
-        static getFieldFromSchema(schema: SPClientTemplates.ListSchema, fieldName: string): SPClientTemplates.FieldSchema;
-        static getLayoutsPageUrl(pageName: string, webServerRelativeUrl: string): string;
-        static getListLevelPermissionMask(jsonItem: string): number;
-        static getTextAreaElementValue(textAreaElement: HTMLTextAreaElement): string;
-        static getUrlQueryPairs(docUrl: string): { [index: string]: string; };
-        static getUserFieldProperty(item: ListItem, fieldName: string, propertyName: string): any;
-        static hasPermission(listPermissionMask: number, listPermission: ListLevelPermissionMask): boolean;
-        static newGuid(): SP.Guid;
-        static isNullOrEmptyString(str: string): boolean;
-        static isNullOrUndefined(obj: any): boolean;
-        static isNullOrUndefinedOrEmpty(str: string): boolean;
-        static isUndefined(obj: any): boolean;
-        static replaceOrAddQueryString(url: string, key: string, value: string): string;
-        static removeHtml(str: string): string;
-        static removeStyleChildren(element: HTMLElement): void;
-        static removeHtmlAndTrimStringWithEllipsis(str: string, maxLength: number): string;
-        static setTextAreaElementValue(textAreaElement: HTMLTextAreaElement, newValue: string): void;
-        static truncateToInt(n: number): number;
-        static urlCombine(path1: string, path2: string): string;
-        static resizeImageToSquareLength(imgElement: HTMLImageElement, squareLength: number): void;
-    }
-
-
-    export class PageContextInfo {
-        static get_siteServerRelativeUrl(): string;
-        static get_webServerRelativeUrl(): string;
-        static get_webAbsoluteUrl(): string;
-        static get_serverRequestPath(): string;
-        static get_siteAbsoluteUrl(): string;
-        static get_webTitle(): string;
-        static get_tenantAppVersion(): string;
-        static get_webLogoUrl(): string;
-        static get_webLanguage(): number;
-        static get_currentLanguage(): number;
-        static get_pageItemId(): number;
-        static get_pageListId(): string;
-        static get_webPermMasks(): { High: number; Low: number; };
-        static get_currentCultureName(): string;
-        static get_currentUICultureName(): string;
-        static get_clientServerTimeDelta(): number;
-        static get_userLoginName(): string;
-        static get_webTemplate(): string;
-        get_pagePersonalizationScope(): string;
-    }
-
-    export class ContextPermissions {
-        has(perm: number): boolean;
-        hasPermissions(high: number, low: number): boolean;
-        fromJson(json: { High: number; Low: number; }): void;
-    }
-
-    export module ListOperation {
-        export module ViewOperation {
-            export function getSelectedView(): string;
-            export function navigateUp(viewId: string): void;
-            export function refreshView(viewId: string): void;
-        }
-        export module Selection {
-            export function selectListItem(iid: string, bSelect: boolean): void;
-            export function getSelectedItems(): { id: number; fsObjType: FileSystemObjectType; }[];
-            export function getSelectedList(): string;
-            export function getSelectedView(): string;
-            export function navigateUp(viewId: string): void;
-            export function deselectAllListItems(iid: string): void;
-        }
-        export module Overrides {
-            export function overrideDeleteConfirmation(listId: string, overrideText: string): void;
-        }
-    }
-
-
-}
-
-/** Register function to rerun on partial update in MDS-enabled site.*/
-declare function RegisterModuleInit(scriptFileName: string, initFunc: () => void): void;
-
-/** Provides access to url and query string parts.*/
-declare class JSRequest {
-    /** Query string parts.*/
-    static QueryString: { [parameter: string]: string; };
-
-    /** initializes class.*/
-    static EnsureSetup(): void;
-
-    /** Current file name (after last '/' in url).*/
-    static FileName: string;
-
-    /** Current file path (before last '/' in url).*/
-    static PathName: string;
-}
-
-declare class _spPageContextInfo {
-    static alertsEnabled: boolean; //true
-    static allowSilverlightPrompt: string; //"True"
-    static clientServerTimeDelta: number; //-182
-    static crossDomainPhotosEnabled: boolean; //true
-    static currentCultureName: string; //"ru-RU"
-    static currentLanguage: number; //1049
-    static currentUICultureName: string; //"ru-RU"
-    static layoutsUrl: string;  //"_layouts/15"
-    static pageListId: string;  //"{06ee6d96-f27f-4160-b6bb-c18f187b18a7}"
-    static pageItemId: number;
-    static pagePersonalizationScope: string; //1
-    static serverRequestPath: string; //"/SPTypeScript/Lists/ConditionalFormattingTasksList/AllItems.aspx"
-    static siteAbsoluteUrl: string; // "https://gandjustas-7b20d3715e8ed4.sharepoint.com"
-    static siteClientTag: string; //"0$$15.0.4454.1021"
-    static siteServerRelativeUrl: string; // "/"
-    static systemUserKey: string; //"i:0h.f|membership|10033fff84e7cb2b@live.com"
-    static tenantAppVersion: string; //"0"
-    static userId: number; //12
-    static webAbsoluteUrl: string; //"https://gandjustas-7b20d3715e8ed4.sharepoint.com/SPTypeScript"
-    static webLanguage: number; //1049
-    static webLogoUrl: string; //"/_layouts/15/images/siteIcon.png?rev=23"
-    static webPermMasks: { High: number; Low: number; };
-    static webServerRelativeUrl: string; //"/SPTypeScript"
-    static webTemplate: string; //"17"
-    static webTitle: string; //"SPTypeScript"
-    static webUIVersion: number; //15
-}
-
-declare function STSHtmlEncode(value: string): string;
-declare function STSHtmlDecode(value: string): string;
-
-declare function AddEvtHandler(element: HTMLElement, event: string, func: EventListener): void;
-
-/** Gets query string parameter */
-declare function GetUrlKeyValue(key: string): string;
-
-declare class AjaxNavigate {
-    update(url: string, updateParts: Object, fullNavigate: boolean, anchorName: string): void;
-    add_navigate(handler: Function): void;
-    remove_navigate(handler: Function): void;
-    submit(formToSubmit: HTMLFormElement): void;
-    getParam(paramName: string): string;
-    getSavedFormAction(): string;
-    get_href(): string;
-    get_hash(): string;
-    get_search(): string;
-    convertMDSURLtoRegularURL(mdsPath: string): string;
-}
-
-declare var ajaxNavigate: AjaxNavigate;
-
-declare class Browseris {
-    firefox: boolean;
-    firefox36up: boolean;
-    firefox3up: boolean;
-    firefox4up: boolean;
-    ie: boolean;
-    ie55up: boolean;
-    ie5up: boolean;
-    ie7down: boolean;
-    ie8down: boolean;
-    ie9down: boolean;
-    ie8standard: boolean;
-    ie8standardUp: boolean;
-    ie9standardUp: boolean;
-    ipad: boolean;
-    windowsphone: boolean;
-    chrome: boolean;
-    chrome7up: boolean;
-    chrome8up: boolean;
-    chrome9up: boolean;
-    iever: boolean;
-    mac: boolean;
-    major: boolean;
-    msTouch: boolean;
-    isTouch: boolean;
-    nav: boolean;
-    nav6: boolean;
-    nav6up: boolean;
-    nav7up: boolean;
-    osver: boolean;
-    safari: boolean;
-    safari125up: boolean;
-    safari3up: boolean;
-    verIEFull: boolean;
-    w3c: boolean;
-    webKit: boolean;
-    win: boolean;
-    win8AppHost: boolean;
-    win32: boolean;
-    win64bit: boolean;
-    winnt: boolean;
-    armProcessor: boolean
-}
-
-declare var browseris: Browseris;
-
-interface ContextInfo extends SPClientTemplates.RenderContext {
-    AllowGridMode: boolean;
-    BasePermissions: any;
-    BaseViewID: any;
-    CascadeDeleteWarningMessage: string;
-    ContentTypesEnabled: boolean;
-    CurrentSelectedItems: boolean;
-    CurrentUserId: number;
-    EnableMinorVersions: boolean;
-    ExternalDataList: boolean;
-    HasRelatedCascadeLists: boolean;
-    HttpPath: string;
-    HttpRoot: string;
-    LastSelectableRowIdx: number;
-    LastSelectedItemIID: number;
-    LastRowIndexSelected: number;
-    RowFocusTimerID: number;
-    ListData: any;// SPClientTemplates.ListData_InView | SPClientTemplates.ListData_InForm
-    ListSchema: SPClientTemplates.ListSchema;
-    ModerationStatus: number;
-    PortalUrl: string;
-    RecycleBinEnabled: number;
-    SelectAllCbx: HTMLElement;
-    SendToLocationName: string;
-    SendToLocationUrl: string;
-    StateInitDone: boolean;
-    TableCbxFocusHandler: Function;
-    TableMouseoverHandler: Function;
-    TotalListItems: number;
-    WorkflowsAssociated: boolean;
-    clvp: any;
-    ctxId: number;
-    ctxType: any;
-    dictSel: any;
-    displayFormUrl: string;
-    editFormUrl: string;
-    imagesPath: string;
-    inGridMode: boolean;
-    inGridFullRender: boolean;
-    isForceCheckout: boolean;
-    isModerated: boolean;
-    isPortalTemplate: boolean;
-    isVersions: boolean;
-    isWebEditorPreview: boolean;
-    leavingGridMode: boolean;
-    loadingAsyncData: boolean;
-    listBaseType: number;
-    listName: string;
-    listTemplate: string;
-    listUrlDir: string;
-    newFormUrl: string;
-    onRefreshFailed: Function;
-    overrideDeleteConfirmation: string;
-    overrideFilterQstring: string;
-    recursiveView: boolean;
-    rootFolderForDisplay: string;
-    serverUrl: string;
-    verEnabled: boolean;
-    view: string;
-    queryString: string;
-    IsClientRendering: boolean;
-    wpq: string;
-    rootFolder: string;
-    IsAppWeb: boolean;
-    NewWOPIDocumentEnabled: boolean;
-    NewWOPIDocumentUrl: string;
-    AllowCreateFolder: boolean;
-    CanShareLinkForNewDocument: boolean;
-    noGroupCollapse: boolean;
-    SiteTemplateId: number;
-    ExcludeFromOfflineClient: boolean;
-
-}
-
-declare function GetCurrentCtx(): ContextInfo;
-declare function SetFullScreenMode(fullscreen: boolean): void;
-declare namespace SP {
-    export enum RequestExecutorErrors {
-        requestAbortedOrTimedout,
-        unexpectedResponse,
-        httpError,
-        noAppWeb,
-        domainDoesNotMatch,
-        noTrustedOrigins,
-        iFrameLoadError
-    }
-
-    export class RequestExecutor {
-        constructor(url: string, options?: any);
-        get_formDigestHandlingEnabled(): boolean;
-        set_formDigestHandlingEnabled(value: boolean): void;
-        get_iFrameSourceUrl(): string;
-        set_iFrameSourceUrl(value: string): void;
-        executeAsync(requestInfo: RequestInfo): void;
-        attemptLogin(returnUrl: string, success: (response: ResponseInfo) => void, error?: (response: ResponseInfo, error: RequestExecutorErrors, statusText: string) => void): void;
-    }
-
-    export interface RequestInfo {
-        url: string;
-        method?: string;
-        headers?: { [key: string]: string; };
-        /** Can be string or bytearray depending on binaryStringRequestBody field */
-        body?: string | Uint8Array;
-        binaryStringRequestBody?: boolean;
-
-        /** Currently need fix to get ginary response. Details: http://techmikael.blogspot.ru/2013/07/how-to-copy-files-between-sites-using.html */
-        binaryStringResponseBody?: boolean;
-        timeout?: number;
-        success?: (response: ResponseInfo) => void;
-        error?: (response: ResponseInfo, error: RequestExecutorErrors, statusText: string) => void;
-        state?: any;
-    }
-
-    export interface ResponseInfo {
-        statusCode?: number;
-        statusText?: string;
-        responseAvailable: boolean;
-        allResponseHeaders?: string;
-        headers?: { [key: string]: string; };
-        contentType?: string;
-        /** Can be string or bytearray depending on request.binaryStringResponseBody field */
-        body?: string | Uint8Array;
-        state?: any;
-    }
-
-    export class ProxyWebRequestExecutor extends Sys.Net.WebRequestExecutor {
-        constructor(url: string, options?: any);
-    }
-
-    export class ProxyWebRequestExecutorFactory implements SP.IWebRequestExecutorFactory {
-        constructor(url: string, options?: any);
-        createWebRequestExecutor(): ProxyWebRequestExecutor;
-    }
-}
-interface MQuery {
-    (selector: string, context?: any): MQueryResultSetElements;
-    (element: HTMLElement): MQueryResultSetElements;
-    (object: MQueryResultSetElements): MQueryResultSetElements;
-    <T>(object: MQueryResultSet<T>): MQueryResultSet<T>;
-    <T>(object: T): MQueryResultSet<T>;
-    (elementArray: HTMLElement[]): MQueryResultSetElements;
-    <T>(array: T[]): MQueryResultSet<T>;
-    <T>(): MQueryResultSet<T>;
-
-    throttle(fn: Function, interval: number, shouldOverrideThrottle: boolean): Function;
-
-    extend(target: any, ...objs: any[]): Object;
-    extend(deep: boolean, target: any, ...objs: any[]): Object;
-
-    makeArray<T>(obj: any): any[];
-
-    isDefined(obj: any): boolean;
-    isNotNull(obj: any): boolean;
-    isUndefined(obj: any): boolean;
-    isNull(obj: any): boolean;
-    isUndefinedOrNull(obj: any): boolean;
-    isDefinedAndNotNull(obj: any): boolean;
-    isString(obj: any): boolean;
-    isBoolean(obj: any): boolean;
-    isFunction(obj: any): boolean;
-    isArray(obj: any): boolean;
-    isNode(obj: any): boolean;
-    isElement(obj: any): boolean;
-    isMQueryResultSet(obj: any): boolean;
-    isNumber(obj: any): boolean;
-    isObject(obj: any): boolean;
-    isEmptyObject(obj: any): boolean;
-
-    ready(callback: () => void): void;
-    contains(container: HTMLElement, contained: HTMLElement): boolean;
-
-    proxy(fn: (...args: any[]) => any, context: any, ...args: any[]): Function;
-    proxy(context: any, name: string, ...args: any[]): any;
-
-    every<T>(obj: T[], fn: (elementOfArray: T, indexInArray: number) => boolean, context?: any): boolean;
-    every<T>(obj: MQueryResultSet<T>, fn: (elementOfArray: T, indexInArray: number) => boolean, context?: any): boolean;
-    every<T>(obj: T[], fn: (elementOfArray: T) => boolean, context?: any): boolean;
-    every<T>(obj: MQueryResultSet<T>, fn: (elementOfArray: any) => boolean, context?: any): boolean;
-
-    some<T>(obj: T[], fn: (elementOfArray: T, indexInArray: number) => boolean, context?: any): boolean;
-    some<T>(obj: MQueryResultSet<T>, fn: (elementOfArray: T, indexInArray: number) => boolean, context?: any): boolean;
-    some<T>(obj: T[], fn: (elementOfArray: T) => boolean, context?: any): boolean;
-    some<T>(obj: MQueryResultSet<T>, fn: (elementOfArray: T) => boolean, context?: any): boolean;
-
-    filter<T>(obj: T[], fn: (elementOfArray: T, indexInArray: number) => boolean, context?: any): T[];
-    filter<T>(obj: MQueryResultSet<T>, fn: (elementOfArray: T, indexInArray: number) => boolean, context?: any): MQueryResultSet<T>;
-    filter<T>(obj: T[], fn: (elementOfArray: T) => boolean, context?: any): T[];
-    filter<T>(obj: MQueryResultSet<T>, fn: (elementOfArray: T) => boolean, context?: any): MQueryResultSet<T>;
-
-    forEach<T>(obj: T[], fn: (elementOfArray: T, indexInArray: number) => void, context?: any): void;
-    forEach<T>(obj: MQueryResultSet<T>, fn: (elementOfArray: T, indexInArray: number) => void, context?: any): void;
-    forEach<T>(obj: T[], fn: (elementOfArray: T) => void, context?: any): void;
-    forEach<T>(obj: MQueryResultSet<T>, fn: (elementOfArray: T) => void, context?: any): void;
-
-    map<T, U>(array: T[], callback: (elementOfArray: T, indexInArray: number) => U): U[];
-    map<T, U>(array: MQueryResultSet<T>, callback: (elementOfArray: T, indexInArray: number) => U): MQueryResultSet<U>;
-    map<T, U>(array: T[], callback: (elementOfArray: T) => U): U[];
-    map<T, U>(array: MQueryResultSet<T>, callback: (elementOfArray: T) => U): MQueryResultSet<U>;
-
-    indexOf<T>(obj: T[], object: T, startIndex?: number): number;
-    lastIndexOf<T>(obj: T[], object: T, startIndex?: number): number;
-
-    data(element: HTMLElement, key: string, value: any): any;
-    data(element: HTMLElement, key: string): any;
-    data(element: HTMLElement): any;
-
-    removeData(element: HTMLElement, name?: string): MQueryResultSetElements;
-    hasData(element: HTMLElement): boolean;
-}
-
-interface MQueryResultSetElements extends MQueryResultSet<HTMLElement> {
-    append(node: HTMLElement): MQueryResultSetElements;
-    append(mQuerySet: MQueryResultSetElements): MQueryResultSetElements;
-    append(html: string): MQueryResultSetElements;
-
-    bind(eventType: string, handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    unbind(eventType: string, handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    trigger(eventType: string): MQueryResultSetElements;
-    one(eventType: string, handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-
-    detach(): MQueryResultSetElements;
-
-    find(selector: string): MQueryResultSetElements;
-    closest(selector: string, context?: any): MQueryResultSetElements;
-    offset(): { left: number; top: number; };
-    offset(coordinates: { left: any; top: any; }): MQueryResultSetElements;
-
-    filter(selector: string): MQueryResultSetElements;
-    filter(fn: (elementOfArray: HTMLElement, indexInArray: number) => boolean, context?: any): MQueryResultSetElements;
-    filter(fn: (elementOfArray: HTMLElement) => boolean, context?: any): MQueryResultSetElements;
-
-    not(selector: string): MQueryResultSetElements;
-
-    parent(selector?: string): MQueryResultSetElements;
-
-    offsetParent(selector?: string): MQueryResultSetElements;
-
-    parents(selector?: string): MQueryResultSetElements;
-    parentsUntil(selector?: string, filter?: string): MQueryResultSetElements;
-    parentsUntil(element?: HTMLElement, filter?: string): MQueryResultSetElements;
-
-    position(): { top: number; left: number; };
-
-    attr(attributeName: string): string;
-    attr(attributeName: string, value: any): MQueryResultSetElements;
-    attr(map: { [key: string]: any; }): MQueryResultSetElements;
-    attr(attributeName: string, func: (index: number, attr: any) => any): MQueryResultSetElements;
-
-    addClass(classNames: string): MQueryResultSetElements;
-    removeClass(classNames: string): MQueryResultSetElements;
-
-    css(propertyName: string): string;
-    css(propertyNames: string[]): string;
-    css(properties: any): MQueryResultSetElements;
-    css(propertyName: string, value: any): MQueryResultSetElements;
-    css(propertyName: any, value: any): MQueryResultSetElements;
-
-    remove(selector?: string): MQueryResultSetElements;
-    children(selector?: string): MQueryResultSetElements;
-    empty(): MQueryResultSetElements;
-    first(): MQueryResultSetElements;
-
-    data(key: string, value: any): MQueryResultSetElements;
-    data(obj: { [key: string]: any; }): MQueryResultSetElements;
-    data(key: string): any;
-
-    removeData(key: string): MQueryResultSetElements;
-
-    map(callback: (elementOfArray: HTMLElement, indexInArray: number) => any): MQueryResultSetElements;
-    map(callback: (elementOfArray: HTMLElement) => any): MQueryResultSetElements;
-
-    blur(): MQueryResultSetElements;
-    blur(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    change(): MQueryResultSetElements;
-    change(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    click(): MQueryResultSetElements;
-    click(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    dblclick(): MQueryResultSetElements;
-    dblclick(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    error(): MQueryResultSetElements;
-    error(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    focus(): MQueryResultSetElements;
-    focus(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    focusin(): MQueryResultSetElements;
-    focusin(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    focusout(): MQueryResultSetElements;
-    focusout(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    keydown(): MQueryResultSetElements;
-    keydown(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    keypress(): MQueryResultSetElements;
-    keypress(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    keyup(): MQueryResultSetElements;
-    keyup(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    load(): MQueryResultSetElements;
-    load(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    mousedown(): MQueryResultSetElements;
-    mousedown(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    mouseenter(): MQueryResultSetElements;
-    mouseenter(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    mouseleave(): MQueryResultSetElements;
-    mouseleave(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    mousemove(): MQueryResultSetElements;
-    mousemove(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    mouseout(): MQueryResultSetElements;
-    mouseout(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    mouseover(): MQueryResultSetElements;
-    mouseover(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    mouseup(): MQueryResultSetElements;
-    mouseup(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    resize(): MQueryResultSetElements;
-    resize(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    scroll(): MQueryResultSetElements;
-    scroll(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    select(): MQueryResultSetElements;
-    select(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    submit(): MQueryResultSetElements;
-    submit(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-    unload(): MQueryResultSetElements;
-    unload(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
-
-}
-
-interface MQueryResultSet<T> {
-    [index: number]: T;
-    contains(contained: T): boolean;
-
-    filter(fn: (elementOfArray: T, indexInArray: number) => boolean, context?: any): MQueryResultSet<T>;
-    filter(fn: (elementOfArray: T) => boolean, context?: any): MQueryResultSet<T>;
-
-    every(fn: (elementOfArray: T, indexInArray: number) => boolean, context?: any): boolean;
-    every(fn: (elementOfArray: T) => boolean, context?: any): boolean;
-
-    some(fn: (elementOfArray: T, indexInArray: number) => boolean, context?: any): boolean;
-    some(fn: (elementOfArray: T) => boolean, context?: any): boolean;
-
-    map(callback: (elementOfArray: T, indexInArray: number) => any): MQueryResultSet<T>;
-    map(callback: (elementOfArray: T) => any): MQueryResultSet<T>;
-
-    forEach(fn: (elementOfArray: T, indexInArray: number) => void, context?: any): void;
-    forEach(fn: (elementOfArray: T) => void, context?: any): void;
-
-    indexOf(object: any, startIndex?: number): number;
-    lastIndexOf(object: any, startIndex?: number): number;
-
-}
-
-interface MQueryEvent extends Event {
-    altKey: boolean;
-    attrChange: number;
-    attrName: string;
-    bubbles: boolean;
-    button: number;
-    cancelable: boolean;
-    ctrlKey: boolean;
-    defaultPrevented: boolean;
-    detail: number;
-    eventPhase: number;
-    newValue: string;
-    prevValue: string;
-    relatedNode: HTMLElement;
-    screenX: number;
-    screenY: number;
-    shiftKey: boolean;
-    view: any;
-}
-
-declare var m$: MQuery;
-declare class CalloutActionOptions {
-    /** Text for the action link */
-    text: string;
-    tooltip: string;
-    disabledTooltip: string;
-    /** Callback that is executed when the action link is clicked.
-        @param event Standard javascript event object
-        @param action The action object */
-    onClickCallback: (event: Event, action: CalloutAction) => any;
-    /** Callback which returns if the action link is enabled */
-    isEnabledCallback: (action: CalloutAction) => boolean;
-    /** Callback which returns if the action link is visible */
-    isVisibleCallback: (action: CalloutAction) => boolean;
-    /** Submenu entries for the action. If defined, the action link click will popup the specified menu. */
-    menuEntries: CalloutActionMenuEntry[];
-}
-
-/** Defines a callout action menu entry */
-declare class CalloutActionMenuEntry {
-    /** Creates a callout action menu entry
-        @param text Text to be displayed as the menu item text
-        @param onClickCallback Callback that will be fired when the item is clicked
-        @param wzISrc Url of the icon
-        @param wzIAlt Alternative text for the icon image
-        @param wzISeq Sequence for the menu item
-        @param wzDesc Description of the menu item */
-    constructor(
-        text: string,
-        onClickCallback: (actionMenuEntry: CalloutActionMenuEntry, actionMenuEntryIndex: number) => void,
-        wzISrc: string,
-        wzIAlt: string,
-        wzISeq: number,
-        wzDesc: string);
-}
-
-
-declare class CalloutActionMenu {
-    constructor(actionsId: any);
-    addAction(action: CalloutAction): void;
-    getActions(): CalloutAction[];
-    render(): void;
-    refreshActions(): void;
-    calculateActionWidth(): void;
-}
-
-
-declare class CalloutAction {
-    constructor(options: CalloutActionOptions);
-    getText(): string;
-    getToolTop(): string;
-    getDisabledToolTip(): string;
-    getOnClickCallback(event: any, action: CalloutAction): any;
-    getIsDisabledCallback(action: CalloutAction): boolean;
-    getIsVisibleCallback(action: CalloutAction): boolean;
-    getIsMenu(): boolean;
-    getMenuEntries(): CalloutActionMenuEntry[];
-    render(): void;
-    isEnabled(): boolean;
-    isVisible(): boolean;
-    set(options: CalloutActionOptions): void;
-}
-
-declare class Callout {
-    /** Sets options for the callout. Not all options can be changed for the callout after its creation. */
-    set(options: CalloutOptions): any;
-    /** Adds event handler to the callout.
-        @param eventName one of the following: "opened", "opening", "closing", "closed" */
-    addEventCallback(eventName: string, callback: (callout: Callout) => void): void;
-    /** Returns the launch point element of the callout. */
-    getLaunchPoint(): HTMLElement;
-    /** Returns the ID of the callout. */
-    getID(): string;
-    /** Returns the title of the callout. */
-    getTitle(): string;
-    /** Returns the contents of the callout. */
-    getContent(): string;
-    /** Returns the content element of the callout. */
-    getContentElement(): HTMLElement;
-    /** Returns the bounding element defined for the callout during its creation. */
-    getBoundingBox(): HTMLElement;
-    /** Returns the content width defined for the callout during its creation. */
-    getContentWidth(): number;
-    /** Returns the object that represents open behaivor defined for the callout during its creation. */
-    getOpenOptions(): CalloutOpenOptions;
-    /** Returns the beak orientation defined for the callout during its creation. */
-    getBeakOrientation(): string;
-    /** Returns the position algorithm function defined for the callout during its creation. */
-    getPositionAlgorithm(): any;
-    /** Specifies wherever callout is in "Opened" state */
-    isOpen(): boolean;
-    /** Specifies wherever callout is in "Opening" state */
-    isOpening(): boolean;
-    /** Specifies wherever callout is in "Opened" or "Opening" state */
-    isOpenOrOpening(): boolean;
-    /** Specifies wherever callout is in "Closing" state */
-    isClosing(): boolean;
-    /** Specifies wherever callout is in "Closed" state */
-    isClosed(): boolean;
-    /** Returns the callout actions menu */
-    getActionMenu(): CalloutActionMenu;
-    /** Adds a link to the actions panel in the bottom part of the callout window */
-    addAction(action: CalloutAction): void;
-    /** Re-renders the actions menu. Call after the actions menu is changed. */
-    refreshActions(): void;
-    /** Display the callout. Animation can be used only for IE9+ */
-    open(useAnimation: boolean): void;
-    /** Hide the callout. Animation can be used only for IE9+ */
-    close(useAnimation: boolean): void;
-    /** Display if hidden, hide if shown. */
-    toggle(): void;
-    /** Do not call this directly. Instead, use CalloutManager.remove */
-    destroy(): void;
-}
-
-declare class CalloutOpenOptions {
-    /** HTML event name, e.g. "click" */
-    event: string;
-    /** Callout will be closed on blur */
-    closeCalloutOnBlur: boolean;
-    /** Close button will be shown within the callout window */
-    showCloseButton: boolean;
-}
-
-declare class CalloutOptions {
-    /** Some unique id for the callout. */
-    ID: string;
-    /** Element on that the callout is shown. */
-    launchPoint: HTMLElement;
-    /** One of the following: "topBottom" (default) or "leftRight". */
-    beakOrientation: string;
-    /** String (HTML allowed) that represents contents of the callout window. */
-    content: string;
-    /** Title for the callout */
-    title: string;
-    /** HTML element that represents contents of the callout window. */
-    contentElement: HTMLElement;
-    /** If defined, callout will be inscribed into the bounding element. */
-    boundingBox: HTMLElement;
-    /** Content element's width in pixels. By default = 350. */
-    contentWidth: number;
-    /** Defines opening behavior */
-    openOptions: CalloutOpenOptions;
-    /** Fires after the callout is rendered but before it is positioned and shown */
-    onOpeningCallback: (callout: Callout) => void;
-    /** Fires right after the callout is shown */
-    onOpenedCallback: (callout: Callout) => void;
-    /** Fires right before the callout is closed */
-    onClosingCallback: (callout: Callout) => void;
-    /** Fires right after the callout is closed */
-    onClosedCallback: (callout: Callout) => void;
-    /** Sets the position of the callout during its opening phase. For an example of a position algorithm function, please explore defaultPositionAlgorithm function from the callout.debug.js file */
-    positionAlgorithm: (callout: Callout) => void;
-}
-
-
-declare class CalloutManager {
-    /** Creates a new callout */
-    static createNew(options: CalloutOptions): Callout;
-    /** Checks if callout with specified ID already exists. If it doesn't, creates it, otherwise returns the existing one. */
-    static createNewIfNecessary(options: CalloutOptions): Callout;
-    /** Detaches callout from the launch point and destroys it. */
-    static remove(callout: Callout): void;
-    /** Searches for a callout associated with the specified launch point. Throws error if not found. */
-    static getFromLaunchPoint(launchPoint: HTMLElement): Callout;
-    /** Searches for a callout associated with the specified launch point. Returns null if not found. */
-    static getFromLaunchPointIfExists(launchPoint: HTMLElement): Callout;
-    /** Gets the first launch point within the specified ancestor element, and returns true if the associated with it callout is opened or opening.
-        If the launch point is not found or the callout is hidden, returns false. */
-    static containsOneCalloutOpen(ancestor: HTMLElement): boolean;
-    /** Finds the closest launch point based on the specified descendant element, and returns callout associated with the launch point. */
-    static getFromCalloutDescendant(descendant: HTMLElement): Callout;
-    /** Perform some action for each callout on the page. */
-    static forEach(callback: (callout: Callout) => void): void;
-    /** Closes all callouts on the page */
-    static closeAll(): boolean;
-    /** Returns true if at least one of the defined on page callouts is opened. */
-    static isAtLeastOneCalloutOpen(): boolean;
-    /** Returns true if at least one of the defined on page callouts is opened or opening. */
-    static isAtLeastOneCalloutOn(): boolean;
-}
-
-
-declare namespace SPClientTemplates {
-
-    export enum FileSystemObjectType {
-        Invalid,
-        File,
-        Folder,
-        Web
-    }
-    export enum ChoiceFormatType {
-        Dropdown,
-        Radio
-    }
-
-    export enum ClientControlMode {
-        Invalid,
-        DisplayForm,
-        EditForm,
-        NewForm,
-        View
-    }
-
-    export enum RichTextMode {
-        Compatible,
-        FullHtml,
-        HtmlAsXml,
-        ThemeHtml
-    }
-    export enum UrlFormatType {
-        Hyperlink,
-        Image
-    }
-
-    export enum DateTimeDisplayFormat {
-        DateOnly,
-        DateTime,
-        TimeOnly
-    }
-
-    export enum DateTimeCalendarType {
-        None,
-        Gregorian,
-        Japan,
-        Taiwan,
-        Korea,
-        Hijri,
-        Thai,
-        Hebrew,
-        GregorianMEFrench,
-        GregorianArabic,
-        GregorianXLITEnglish,
-        GregorianXLITFrench,
-        KoreaJapanLunar,
-        ChineseLunar,
-        SakaEra,
-        UmAlQura
-    }
-    export enum UserSelectionMode {
-        PeopleOnly,
-        PeopleAndGroups
-    }
-
-    /** Represents schema for a Choice field in list form or in list view in grid mode */
-    export interface FieldSchema_InForm_Choice extends FieldSchema_InForm {
-        /** List of choices for this field. */
-        Choices: string[];
-        /** Display format for the choice field */
-        FormatType: ChoiceFormatType;
-    }
-    /** Represents schema for a Lookup field in list form or in list view in grid mode */
-    export interface FieldSchema_InForm_Lookup extends FieldSchema_InForm {
-        /** Specifies if the field allows multiple values */
-        AllowMultipleValues: boolean;
-        /** Returns base url for a list display form, e.g. "http://portal/web/_layouts/15/listform.aspx?PageType=4"
-            You must add "ListId" (Guid of the list) and "ID" (integer Id of the item) parameters in order to use this Url */
-        BaseDisplayFormUrl: string;
-        /** Indicates if the field is a dependent lookup */
-        DependentLookup: boolean;
-        /** Indicates wherever the lookup list is throttled (contains more items than value of the "List Throttle Limit" setting). */
-        Throttled: boolean;
-        /** Returns string representation of a number that represents the current value for the "List Throttle Limit" web application setting.
-            Only appears if Throttled property is true, i.e. the target lookup list is throttled. */
-        MaxQueryResult: string;
-        /** List of choices for this field. */
-        Choices: { LookupId: number; LookupValue: string; }[];
-        /** Number of choices. Appears only for Lookup field. */
-        ChoiceCount: number;
-
-        LookupListId: string;
-
-    }
-    /** Represents schema for a DateTime field in list form or in list view in grid mode */
-    export interface FieldSchema_InForm_DateTime extends FieldSchema_InForm {
-        /** Type of calendar to use */
-        CalendarType: DateTimeCalendarType;
-        /** Display format for DateTime field. */
-        DisplayFormat: DateTimeDisplayFormat;
-        /** Indicates wherever current user regional settings specify to display week numbers in day or week views of a calendar.
-            Only appears for DateTime fields. */
-        ShowWeekNumber: boolean;
-        TimeSeparator: string;
-        TimeZoneDifference: string;
-        FirstDayOfWeek: number;
-        FirstWeekOfYear: number;
-        HijriAdjustment: number;
-        WorkWeek: string;
-        LocaleId: string;
-        LanguageId: string;
-        MinJDay: number;
-        MaxJDay: number;
-        HoursMode24: boolean;
-        HoursOptions: string[];
-    }
-    /** Represents schema for a DateTime field in list form or in list view in grid mode */
-    export interface FieldSchema_InForm_Geolocation extends FieldSchema_InForm {
-        BingMapsKey: string;
-        IsBingMapBlockedInCurrentRegion: boolean;
-    }
-    /** Represents schema for a Choice field in list form or in list view in grid mode */
-    export interface FieldSchema_InForm_MultiChoice extends FieldSchema_InForm {
-        /** List of choices for this field. */
-        MultiChoices: string[];
-        /** Indicates wherever fill-in choice is allowed */
-        FillInChoice: boolean;
-    }
-    /** Represents schema for a Choice field in list form or in list view in grid mode */
-    export interface FieldSchema_InForm_MultiLineText extends FieldSchema_InForm {
-        /** Specifies whether rich text formatting can be used in the field */
-        RichText: boolean;
-        /** Changes are appended to the existing text. */
-        AppendOnly: boolean;
-        /** Rich text mode for the field */
-        RichTextMode: RichTextMode;
-        /** Number of lines configured to display */
-        NumberOfLines: number;
-        /** A boolean value that specifies whether hyperlinks can be used in this fields. */
-        AllowHyperlink: boolean;
-        /** WebPartAdderId for the ScriptEditorWebPart */
-        ScriptEditorAdderId: string;
-    }
-    /** Represents schema for a Number field in list form or in list view in grid mode */
-    export interface FieldSchema_InForm_Number extends FieldSchema_InForm {
-        ShowAsPercentage: boolean;
-    }
-    /** Represents schema for a Number field in list form or in list view in grid mode */
-    export interface FieldSchema_InForm_Text extends FieldSchema_InForm {
-        MaxLength: number;
-    }
-    /** Represents schema for a Number field in list form or in list view in grid mode */
-    export interface FieldSchema_InForm_Url extends FieldSchema_InForm {
-        DisplayFormat: UrlFormatType;
-    }
-    /** Represents schema for a Number field in list form or in list view in grid mode */
-    export interface FieldSchema_InForm_User extends FieldSchema_InForm {
-        Presence: boolean;
-        WithPicture: boolean;
-        DefaultRender: boolean;
-        WithPictureDetail: boolean;
-        /** Server relative Url for ~site/_layouts/listform.aspx */
-        ListFormUrl: string;
-        /** Server relative Url for ~site/_layouts/userdisp.aspx */
-        UserDisplayUrl: string;
-        EntitySeparator: string;
-        PictureOnly: boolean;
-        PictureSize: string;
-    }
-
-    export interface FieldSchema {
-        /** Specifies if the field can be edited while list view is in the Grid mode */
-        AllowGridEditing: boolean;
-        /** String representation of the field type, e.g. "Lookup". Same as SPField.TypeAsString */
-        FieldType: string;
-        /** Internal name of the field */
-        Name: string;
-        /** For OOTB fields, returns the type of field. For "UserMulti" returns "User", for "LookupMulti" returns "Lookup".
-            For custom field types, returns base type of the field. */
-        Type: string;
-    }
-
-    /** Represents field schema in Grid mode and on list forms.
-            Consider casting objects of this type to more specific field types, e.g. FieldSchemaInForm_Lookup */
-    export interface FieldSchema_InForm extends FieldSchema {
-        /** Description for this field. */
-        Description: string;
-        /** Direction of the reading order for the field. */
-        Direction: string;
-        /** Indicates whether the field is hidden */
-        Hidden: boolean;
-        /** Guid of the field */
-        Id: string;
-        /** Specifies Input Method Editor (IME) mode bias to use for the field.
-            The IME enables conversion of keystrokes between languages when one writing system has more characters than can be encoded for the given keyboard. */
-        IMEMode: any;
-        /** Specifies if the field is read only */
-        ReadOnlyField: boolean;
-        /** Specifies wherever field requires values */
-        Required: boolean;
-        RestrictedMode: boolean;
-        /** Title of the field */
-        Title: string;
-        /** If SPFarm.Local.UseMinWidthForHtmlPicker is true, UseMinWidth will be set to true. Undefined in other cases. */
-        UseMinWidth: boolean;
-    }
-
-    export interface ListSchema {
-        Field: FieldSchema[];
-    }
-
-
-    export interface ListSchema_InForm extends ListSchema {
-        Field: FieldSchema_InForm[];
-    }
-    export interface ListData_InForm {
-        Items: Item[];
-    }
-    export interface RenderContext_FieldInForm extends RenderContext_Form {
-        CurrentGroupIdx: number;
-        CurrentGroup: Group;
-        CurrentItems: Item[];
-        CurrentFieldSchema: FieldSchema_InForm;
-        CurrentFieldValue: any;
-    }
-    export interface RenderContext_Form extends RenderContext {
-        CurrentItem: Item;
-        FieldControlModes: { [fieldInternalName: string]: ClientControlMode; };
-        FormContext: ClientFormContext;
-        FormUniqueId: string;
-        ListData: ListData_InForm;
-        ListSchema: ListSchema_InForm;
-        CSRCustomLayout?: boolean;
-    }
-
-
-
-    export interface FieldSchema_InView_LookupField extends FieldSchema_InView {
-        /** Either "TRUE" or "FALSE" */
-        AllowMultipleValues: string;
-        /** Target lookup list display form URL, including PageType and List attributes. */
-        DispFormUrl: string;
-        /** Either "TRUE" or "FALSE" */
-        HasPrefix: string;
-    }
-    export interface FieldSchema_InView_UserField extends FieldSchema_InView {
-        /** Either "TRUE" or "FALSE" */
-        AllowMultipleValues: string;
-        /** Either "TRUE" or "FALSE" */
-        ImnHeader: string;
-        /** Either "TRUE" or "FALSE" */
-        HasPrefix: string;
-        /** Either "1" or "0" */
-        HasUserLink: string;
-        /** Either "1" or "0" */
-        DefaultRender: string;
-    }
-    /** Represents field schema in a list view. */
-    export interface FieldSchema_InView extends FieldSchema {
-        /** Either "TRUE" or "FALSE" */
-        CalloutMenu: string;
-        ClassInfo: string; // e.g. "Menu"
-        css: string;
-        DisplayName: string;
-        /** Either "TRUE" or "FALSE" */
-        Explicit: string;
-        fieldRenderer: any;
-        FieldTitle: string;
-        /** Indicates whether the field can be filtered. Either "TRUE" or "FALSE" */
-        Filterable: string;
-        /** Set to "TRUE" for fields that comply to the following Xpath query:
-            ViewFields/FieldRef[@Explicit='TRUE'] | Query/GroupBy/FieldRef[not(@Name=ViewFields/FieldRef/@Name)] */
-        GroupField: string;
-        /** Either "TRUE" or "FALSE" */
-        GridActiveAndReadOnly: string;
-        /** Guid of the field */
-        ID: string;
-        /** Specifies if the field contains list item menu.
-            Corresponds to ViewFields/FieldRef/@ListItemMenu attribute. Either "TRUE" or "FALSE" and might be missing. */
-        listItemMenu: string;
-        RealFieldName: string;
-        /** Either "TRUE" or "FALSE" */
-        ReadOnly: string;
-        ResultType: string;
-        /** Indicates whether the field can be sorted. Either "TRUE" or "FALSE" */
-        Sortable: string;
-    }
-    export interface ListSchema_InView extends ListSchema {
-        /** Key-value object that represents all aggregations defined for the view.
-            Key specifies the field internal name, and value specifies the type of the aggregation. */
-        Aggregate: { [name: string]: string; };
-        /** Either "TRUE" or false (for grouping) */
-        Collapse: string;
-        /** Specifies whether to open items in a client application ("1") or in browser ("0"). */
-        DefaultItemOpen: string;
-        Direction: string;
-        /** Either "0" or "1" */
-        EffectivePresenceEnabled: string;
-        /** If in grid mode (context.inGridMode == true), cast to FieldSchema_InForm[], otherwise cast to FieldSchema_InView[] */
-        FieldSortParam: string;
-        Filter: any;
-        /** Either "0" or "1" */
-        ForceCheckout: string;
-        /** Internal name for the first group by field, if any */
-        group1: string;
-        /** Internal name for the second group by field, if any */
-        group2: string;
-        /** "1" if the view contains "Title" field, otherwise not defined. */
-        HasTitle: string;
-        HttpVDir: string;
-        /** Either "0" or "1" */
-        InplaceSearchEnabled: string;
-        /** Either "0" or "1" */
-        IsDocLib: string;
-        /** e.g. "1033" */
-        LCID: string;
-        /** Either "0" or "1" */
-        ListRight_AddListItems: string;
-        NoListItem: string;
-        NoListItemHowTo: string;
-        /** Server-relative path to the current page */
-        PagePath: string;
-        /** Internal name of the field inside which the hierarchy buttons are displayed */
-        ParentHierarchyDisplayField: string;
-        PresenceAlt: string;
-        /** Represents SPList.RootFolder.Properties. Exists only if SPList.FetchPropertyBagForListView property is set to true. */
-        PropertyBag: { [key: string]: string; };
-        /** Either "True" or "False" */
-        RenderSaveAsNewViewButton: string;
-        /** Either "True" or "False" */
-        RenderViewSelectorPivotMenu: string;
-        /** Either "True" or "False" */
-        RenderViewSelectorPivotMenuAsync: string;
-        /** Query string parameters that specify GUID of the current view and the current root folder */
-        RootFolderParam: string;
-        SelectedID: string; // number
-        ShowWebPart: string;
-        /** Either "1" or undefined. */
-        StrikeThroughOnCompletedEnabled: string;
-        /** Either "0" or "1" */
-        TabularView: string;
-        Toolbar: string;
-        UIVersion: string; // number
-        Userid: string; // number
-        UserVanilla: any;
-        /** Server relative path to "/_layouts/userdisp.aspx" in the current web */
-        UserDispUrl: string;
-        /** Either "1" or "" */
-        UseParentHierarchy: string;
-        /** Guid of the view */
-        View: string;
-        /** JSON string */
-        ViewSelectorPivotMenuOptions: string;
-        /** Query string parameters that specify current root folder (RootFolder) and folder content type id (FolderCTID) */
-        ViewSelector_ViewParameters: string;
-    }
-    export interface ListData_InView {
-        FilterLink: string;
-        FilterFields: string;
-        FirstRow: number;
-        /** Either "0" or "1" */
-        ForceNoHierarchy: string;
-        HierarchyHasIndention: string;
-        /** Link to the previous page (not defined if not available) */
-        PrevHref: string;
-        /** Link to the next page  (not defined if not available) */
-        NextHref: string;
-        SortField: string;
-        SortDir: string;
-        LastRow: number;
-        Row: Item[];
-    }
-    export interface RenderContext_GroupInView extends RenderContext_InView {
-        CurrentGroupIdx: number;
-        CurrentGroup: Group;
-        CurrentItems: Item[];
-    }
-    export interface RenderContext_InView extends RenderContext {
-        AllowCreateFolder: boolean;
-        AllowGridMode: boolean;
-        BasePermissions: { [PermissionName: string]: boolean; }; // SP.BasePermissions?
-        bInitialRender: boolean;
-        CanShareLinkForNewDocument: boolean;
-        CascadeDeleteWarningMessage: string;
-        clvp: HTMLElement; // not in View
-        ContentTypesEnabled: boolean;
-        ctxId: number;
-        ctxType: any; // not in View
-        CurrentUserId: number;
-        CurrentUserIsSiteAdmin: boolean;
-        dictSel: any;
-        /** Absolute path for the list display form */
-        displayFormUrl: string;
-        /** Absolute path for the list edit form */
-        editFormUrl: string;
-        EnableMinorVersions: boolean;
-        ExternalDataList: boolean;
-        enteringGridMode: boolean;
-        existingServerFilterHash: any;
-        HasRelatedCascadeLists: number;
-        heroId: string; // e.g. "idHomePageNewItem"
-        HttpPath: string;
-        HttpRoot: string;
-        imagesPath: string;
-        inGridFullRender: any; // not in View
-        inGridMode: boolean;
-        IsAppWeb: boolean;
-        IsClientRendering: boolean;
-        isForceCheckout: boolean;
-        isModerated: boolean;
-        isPortalTemplate: any;
-        isWebEditorPreview: number;
-        isVersions: number;
-        isXslView: boolean;
-        LastRowIndexSelected: any; // not in View
-        LastSelectableRowIdx: any;
-        LastSelectedItemId: any; // not in View
-        leavingGridMode: boolean;
-        listBaseType: number;
-        ListData: ListData_InView;
-        ListDataJSONItemsKey: string; // ="Row"
-        /** Guid of the list */
-        listName: string;
-        ListSchema: ListSchema_InView;
-        listTemplate: string;
-        ListTitle: string;
-        listUrlDir: string;
-        loadingAsyncData: boolean;
-        ModerationStatus: number;
-        NavigateForFormsPages: boolean;
-        /** Absolute path for the list new form */
-        newFormUrl: string;
-        NewWOPIDocumentEnabled: any;
-        NewWOPIDocumentUrl: any;
-        noGroupCollapse: boolean;
-        OfficialFileName: string;
-        OfficialFileNames: string;
-        overrideDeleteConfirmation: string; // not in View
-        overrideFilterQstring: string; // not in View
-        PortalUrl: string;
-        queryString: any;
-        recursiveView: boolean;
-        /** either 1 or 0 */
-        RecycleBinEnabled: number;
-        RegionalSettingsTimeZoneBias: string;
-        rootFolder: string;
-        rootFolderForDisplay: any;
-        RowFocusTimerID: any;
-        SelectAllCbx: any;
-        SendToLocationName: string;
-        SendToLocationUrl: string;
-        serverUrl: any;
-        SiteTitle: string;
-        StateInitDone: boolean;
-        TableCbxFocusHandler: any;
-        TableMouseOverHandler: any;
-        TotalListItems: number;
-        verEnabled: number;
-        /** Guid of the view. */
-        view: string;
-        viewTitle: string;
-        WorkflowAssociated: boolean;
-        wpq: string;
-        WriteSecurity: string;
-    }
-    export interface RenderContext_ItemInView extends RenderContext_InView {
-        CurrentItem: Item;
-        CurrentItemIdx: number;
-    }
-    export interface RenderContext_FieldInView extends RenderContext_ItemInView {
-        /** If in grid mode (context.inGridMode == true), cast to FieldSchema_InForm, otherwise cast to FieldSchema_InView */
-        CurrentFieldSchema: FieldSchema_InForm | FieldSchema_InView;
-        CurrentFieldValue: any;
-        FieldControlsModes: { [fieldInternalName: string]: ClientControlMode; };
-        FormContext: ClientFormContext;
-        FormUniqueId: string;
-    }
-
-    export interface Item {
-        [fieldInternalName: string]: any;
-    }
-    export interface Group {
-        Items: Item[];
-    }
-    type RenderCallback = (ctx: RenderContext) => void;
-
-    export interface RenderContext {
-        BaseViewID?: number;
-        ControlMode?: ClientControlMode;
-        CurrentCultureName?: string;
-        CurrentLanguage?: number;
-        CurrentSelectedItems?: any;
-        CurrentUICultureName?: string;
-        ListTemplateType?: number;
-        OnPostRender?: RenderCallback | RenderCallback[];
-        OnPreRender?: RenderCallback | RenderCallback[];
-        onRefreshFailed?: any;
-        RenderBody?: (renderContext: RenderContext) => string;
-        RenderFieldByName?: (renderContext: RenderContext, fieldName: string) => string;
-        RenderFields?: (renderContext: RenderContext) => string;
-        RenderFooter?: (renderContext: RenderContext) => string;
-        RenderGroups?: (renderContext: RenderContext) => string;
-        RenderHeader?: (renderContext: RenderContext) => string;
-        RenderItems?: (renderContext: RenderContext) => string;
-        RenderView?: (renderContext: RenderContext) => string;
-        SiteClientTag?: string;
-        Templates?: Templates;
-    }
-
-    export interface SingleTemplateCallback {
-        /** Must return null in order to fall back to a more common template or to a system default template */
-        (renderContext: RenderContext_InView): string;
-    }
-    export interface GroupCallback {
-        /** Must return null in order to fall back to a more common template or to a system default template */
-        (renderContext: RenderContext_GroupInView): string;
-    }
-    export interface ItemCallback {
-        /** Must return null in order to fall back to a more common template or to a system default template */
-        (renderContext: RenderContext): string;
-    }
-
-    export interface FieldCallback {
-        /** Must return null in order to fall back to a more common template or to a system default template */
-        (renderContext: RenderContext): string;
-    }
-
-    export interface FieldInFormCallback {
-        /** Must return null in order to fall back to a more common template or to a system default template */
-        (renderContext: RenderContext_FieldInForm): string;
-    }
-    export interface FieldInViewCallback {
-        /** Must return null in order to fall back to a more common template or to a system default template */
-        (renderContext: RenderContext_FieldInView): string;
-    }
-
-    export interface FieldTemplateOverrides {
-        /** Defines templates for rendering the field on a display form. */
-        DisplayForm?: FieldInFormCallback;
-        /** Defines templates for rendering the field on an edit form. */
-        EditForm?: FieldInFormCallback;
-        /** Defines templates for rendering the field on a new form. */
-        NewForm?: FieldInFormCallback;
-        /** Defines templates for rendering the field on a list view. */
-        View?: FieldInViewCallback;
-    }
-
-    export interface FieldTemplates {
-        [fieldInternalName: string]: FieldCallback;
-    }
-
-    export interface Templates {
-        View?: RenderCallback | string; // TODO: determine appropriate context type and purpose of this template
-        Body?: RenderCallback | string; // TODO: determine appropriate context type and purpose of this template
-        /** Defines templates for rendering groups (aggregations). */
-        Group?: GroupCallback | string;
-        /** Defines templates for list items rendering. */
-        Item?: ItemCallback | string;
-        /** Defines template for rendering list view header.
-            Can be either string or SingleTemplateCallback */
-        Header?: SingleTemplateCallback | string;
-        /** Defines template for rendering list view footer.
-            Can be either string or SingleTemplateCallback */
-        Footer?: SingleTemplateCallback | string;
-        /** Defines templates for fields rendering. The field is specified by it's internal name. */
-        Fields?: FieldTemplates;
-    }
-
-    export interface FieldTemplateMap {
-        [fieldInternalName: string]: FieldTemplateOverrides;
-    }
-
-    export interface TemplateOverrides {
-        View?: RenderCallback | string; // TODO: determine appropriate context type and purpose of this template
-        Body?: RenderCallback | string; // TODO: determine appropriate context type and purpose of this template
-        /** Defines templates for rendering groups (aggregations). */
-        Group?: GroupCallback | string;
-        /** Defines templates for list items rendering. */
-        Item?: ItemCallback | string;
-        /** Defines template for rendering list view header.
-            Can be either string or SingleTemplateCallback */
-        Header?: SingleTemplateCallback | string;
-        /** Defines template for rendering list view footer.
-            Can be either string or SingleTemplateCallback */
-        Footer?: SingleTemplateCallback | string;
-        /** Defines templates for fields rendering. The field is specified by it's internal name. */
-        Fields?: FieldTemplateMap;
-    }
-    export interface TemplateOverridesOptions {
-        /** Template overrides */
-        Templates?: TemplateOverrides;
-
-        /** �allbacks called before rendering starts. Can be function (ctx: RenderContext) => void or array of functions.*/
-        OnPreRender?: RenderCallback | RenderCallback[];
-
-        /** �allbacks called after rendered html inserted into DOM. Can be function (ctx: RenderContext) => void or array of functions.*/
-        OnPostRender?: RenderCallback | RenderCallback[];
-
-        /** View style (SPView.StyleID) for which the templates should be applied.
-            If not defined, the templates will be applied only to default view style. */
-        ViewStyle?: number;
-        /** List template type (SPList.BaseTemplate) for which the template should be applied.
-            If not defined, the templates will be applied to all lists. */
-        ListTemplateType?: number;
-        /** Base view ID (SPView.BaseViewID) for which the template should be applied.
-            If not defined, the templates will be applied to all views. */
-        BaseViewID?: number | string;
-    }
-    export class TemplateManager {
-        static RegisterTemplateOverrides(renderCtx: TemplateOverridesOptions): void;
-        static GetTemplates(renderCtx: RenderContext): Templates;
-    }
-
-    export interface ClientUserValue {
-        lookupId: number;
-        lookupValue: string;
-        displayStr: string;
-        email: string;
-        sip: string;
-        title: string;
-        picture: string;
-        department: string;
-        jobTitle: string;
-    }
-    export interface ClientLookupValue {
-        LookupId: number;
-        LookupValue: string;
-    }
-    export interface ClientUrlValue {
-        URL: string;
-        Description: string;
-    }
-    export class Utility {
-        static ComputeRegisterTypeInfo(renderCtx: TemplateOverridesOptions): any;
-        static ControlModeToString(mode: SPClientTemplates.ClientControlMode): string;
-        static FileSystemObjectTypeToString(fileSystemObjectType: SPClientTemplates.FileSystemObjectType): string;
-        static ChoiceFormatTypeToString(fileSystemObjectType: SPClientTemplates.ChoiceFormatType): string;
-        static RichTextModeToString(fileSystemObjectType: SPClientTemplates.RichTextMode): string;
-        static IsValidControlMode(mode: number): boolean;
-        /** Removes leading and trailing spaces */
-        static Trim(str: string): string;
-        /** Creates SP.ClientContext based on the specified Web URL. If the SP.Runtime.js script is not loaded, returns null */
-        static InitContext(webUrl: string): SP.ClientContext;
-        static GetControlOptions(control: HTMLElement): any;
-        static TryParseInitialUserValue(userStr: string): ClientUserValue[];
-        /** Tries to resolve user names from string. Pushes either ClientUserValue (if resolved successfully) or original string (if not) to the resulting array. */
-        static TryParseUserControlValue(userStr: string, separator: string): any[];
-        static GetPropertiesFromPageContextInfo(context: RenderContext): void;
-        /** Replaces tokens "~site/", "~sitecollection/", "~sitecollectionmasterpagegallery", "{lcid}", "{locale}" and "{siteclienttag}" with appropriate context values */
-        static ReplaceUrlTokens(tokenUrl: string): string;
-        static ParseLookupValue(valueStr: string): ClientLookupValue;
-        static ParseMultiLookupValues(valueStr: string): ClientLookupValue[];
-        /** Represents lookup values array in some strange format */
-        static BuildLookupValuesAsString(choiceArray: ClientLookupValue[], isMultiLookup: boolean, setGroupDesc: boolean): string;
-        static ParseURLValue(value: string): ClientUrlValue;
-        static GetFormContextForCurrentField(context: RenderContext_Form): ClientFormContext;
-        /** Returns ";#" */
-        static UserLookupDelimitString: string;
-        /** Returns ";#" */
-        static UserMultiValueDelimitString:string;
-    }
-
-    export class ClientFormContext {
-        fieldValue: any;
-        fieldSchema: SPClientTemplates.FieldSchema_InForm;
-        fieldName: string;
-        controlMode: number;
-        webAttributes: {
-            AllowScriptableWebParts: boolean;
-            CurrentUserId: number;
-            EffectivePresenceEnabled: boolean;
-            LCID: string;
-            PermissionCustomizePages: boolean;
-            WebUrl: string;
-        };
-        itemAttributes: {
-            ExternalListItem: boolean;
-            FsObjType: number;
-            Id: number;
-            Url: string;
-        };
-        listAttributes: {
-            BaseType: number;
-            DefaultItemOpen: number;
-            Direction: string;
-            EnableVesioning: boolean;
-            Id: string;
-        };
-        registerInitCallback(fieldname: string, callback: () => void): void;
-        registerFocusCallback(fieldname: string, callback: () => void): void;
-        registerValidationErrorCallback(fieldname: string, callback: (error: any) => void): void;
-        registerGetValueCallback(fieldname: string, callback: () => any): void;
-        updateControlValue(fieldname: string, value: any): void;
-        registerClientValidator(fieldname: string, validator: SPClientForms.ClientValidation.ValidatorSet): void;
-        registerHasValueChangedCallback(fieldname: string, callback: (eventArg?: any) => void): void;
-    }
-
-}
-
-declare function GenerateIID(renderCtx: SPClientTemplates.RenderContext_ItemInView): string;
-declare function GenerateIIDForListItem(renderCtx: SPClientTemplates.RenderContext_InView, listItem: SPClientTemplates.Item): string;
-
-declare function SPFormControl_AppendValidationErrorMessage(nodeId: string, errorResult: any): void;
-declare function CoreRender(template: any, context: any): string;
-
-declare namespace SPClientForms {
-    namespace ClientValidation {
-        export class ValidationResult {
-            constructor(hasErrors: boolean, errorMsg: string);
-        }
-
-        export class ValidatorSet {
-            public RegisterValidator(validator: IValidator): void;
-        }
-
-        export interface IValidator {
-            Validate(value: any): ValidationResult;
-        }
-
-        export class RequiredValidator implements IValidator {
-            Validate(value: any): ValidationResult;
-        }
-
-        export class RequiredFileValidator implements IValidator {
-            Validate(value: any): ValidationResult;
-        }
-
-        export class RequiredRichTextValidator implements IValidator {
-            Validate(value: any): ValidationResult;
-        }
-
-        export class MaxLengthUrlValidator implements IValidator {
-            Validate(value: any): ValidationResult;
-        }
-
-
-    }
-
-    export enum FormManagerEvents {
-        Event_OnControlValueChanged,//: 1,
-        Event_OnControlInitializedCallback,//: 2,
-        Event_OnControlFocusSetCallback,//: 3,
-        Event_GetControlValueCallback,//: 4,
-        Event_OnControlValidationError,//: 5,
-        Event_RegisterControlValidator,//: 6,
-        Event_GetHasValueChangedCallback//: 7
-    }
-
-    export class ClientForm {
-        constructor(qualifier: string);
-        RenderClientForm(): void;
-        SubmitClientForm(): boolean;
-        NotifyControlEvent(eventName: FormManagerEvents, fldName: string, eventArg: any): void;
-    }
-
-    export class ClientFormManager {
-        static GetClientForm(qualifier: string): ClientForm;
-        static RegisterClientForm(qualifier: string): void;
-        static SubmitClientForm(qualifier: string): boolean;
-    }
-}
-
-declare class SPMgr {
-    NewGroup(listItem: Object, fieldName: string): boolean;
-    RenderHeader(renderCtx: SPClientTemplates.RenderContext, field: SPClientTemplates.FieldSchema): string;
-    RenderField(renderCtx: SPClientTemplates.RenderContext, field: SPClientTemplates.FieldSchema, listItem: Object, listSchema: SPClientTemplates.ListSchema): string;
-    RenderFieldByName(renderCtx: SPClientTemplates.RenderContext, fieldName: string, listItem: Object, listSchema: SPClientTemplates.ListSchema): string;
-}
-
-declare var spMgr: SPMgr;
-
-declare function SPField_FormDisplay_Default(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPField_FormDisplay_DefaultNoEncode(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPField_FormDisplay_Empty(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPFieldText_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPFieldNumber_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPFieldBoolean_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPFieldNote_Display(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPFieldNote_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPFieldFile_Display(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPFieldFile_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPFieldChoice_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPFieldChoice_Dropdown_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPFieldChoice_Radio_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPFieldMultiChoice_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPFieldDateTime_Display(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPFieldDateTime_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPFieldUrl_Display(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPFieldUrl_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPFieldUser_Display(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPFieldUserMulti_Display(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPClientPeoplePickerCSRTemplate(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPFieldLookup_Display(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPFieldLookup_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPFieldLookupMulti_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-declare function SPFieldAttachments_Default(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
-
-declare namespace SPAnimation {
-    export enum Attribute {
-        PositionX,
-        PositionY,
-        Height,
-        Width,
-        Opacity
-    }
-
-    export enum ID {
-        Basic_Show,
-        Basic_SlowShow,
-        Basic_Fade,
-        Basic_Move,
-        Basic_Size,
-        Content_SlideInFadeInRight,
-        Content_SlideInFadeInRightInc,
-        Content_SlideOutFadeOutRight,
-        Content_SlideInFadeInLeft,
-        Content_SlideInFadeInLeftInc,
-        SmallObject_SlideInFadeInTop,
-        SmallObject_SlideInFadeInLeft,
-        Test_Instant,
-        Test_Hold,
-        Basic_Opacity,
-        Basic_QuickShow,
-        Basic_QuickFade,
-        Content_SlideInFadeInGeneric,
-        Basic_StrikeThrough,
-        SmallObject_SlideInFadeInBottom,
-        SmallObject_SlideOutFadeOutBottom,
-        Basic_QuickSize
-    }
-
-    export class Settings {
-        static DisableAnimation(): void;
-        static DisableSessionAnimation(): void;
-        static IsAnimationEnabled(): boolean;
-    }
-
-
-    export class State {
-        SetAttribute(attributeId: Attribute, value: number): void;
-        GetAttribute(attributeId: Attribute): number;
-        GetDataIndex(attributeId: Attribute): number
-    }
-
-    export class Object {
-        constructor(animationID: ID, delay: number, element: HTMLElement, finalState: State, finishFunc?: (data: any) => void, data?: any);
-        constructor(animationID: ID, delay: number, element: HTMLElement[], finalState: State, finishFunc?: (data: any) => void, data?: any);
-        RunAnimation(): void;
-    }
-}
-
-declare namespace SPAnimationUtility {
-    export class BasicAnimator {
-        static FadeIn(element: HTMLElement, finishFunc?: (data: any) => void, data?: any): void;
-        static FadeOut(element: HTMLElement, finishFunc?: (data: any) => void, data?: any): void;
-        static Move(element: HTMLElement, posX: number, posY: number, finishFunc?: (data: any) => void, data?: any): void;
-        static StrikeThrough(element: HTMLElement, strikeThroughWidth: number, finishFunc?: (data: any) => void, data?: any): void;
-        static Resize(element: HTMLElement, newHeight: number, newWidth: number, finishFunc?: (data: any) => void, data?: any): void;
-        static CommonResize(element: HTMLElement, newHeight: number, newWidth: number, finishFunc: (data: any) => void, data: any, animationId: SPAnimation.ID): void;
-        static QuickResize(element: HTMLElement, newHeight: number, newWidth: number, finishFunc?: (data: any) => void, data?: any): void;
-        static ResizeContainerAndFillContent(element: HTMLElement, newHeight: number, newWidth: number, finishFunc: () => void, fAddToEnd: boolean): void;
-        static GetWindowScrollPosition(): { x: number; y: number; };
-        static GetLeftOffset(element: HTMLElement): number;
-        static GetTopOffset(element: HTMLElement): number;
-        static GetRightOffset(element: HTMLElement): number;
-        static PositionElement(element: HTMLElement, topValue: number, leftValue: number, heightValue: number, widthValue: number): void;
-        static PositionAbsolute(element: HTMLElement): void;
-        static PositionRelative(element: HTMLElement): void;
-        static PositionRelativeExact(element: HTMLElement, topValue: number, leftValue: number, heightValue: number, widthValue: number): void;
-        static PositionAbsoluteExact(element: HTMLElement, topValue: number, leftValue: number, heightValue: number, widthValue: number): void;
-        static IsPositioned(element: HTMLElement): boolean;
-    }
-}
-
-interface IEnumerator<T> {
-    get_current(): T;
-    moveNext(): boolean;
-    reset(): void;
-}
-
-interface IEnumerable<T> {
-    getEnumerator(): IEnumerator<T>;
-}
-
-declare namespace SP {
-    export class ScriptUtility {
-        static isNullOrEmptyString(str: string): boolean;
-        static isNullOrUndefined(obj: any): boolean;
-        static isUndefined(obj: any): boolean;
-        static truncateToInt(n: number): number;
-    }
-    export class Guid {
-        constructor(guidText: string);
-        static get_empty(): SP.Guid;
-        static newGuid(): SP.Guid;
-        static isValid(uuid: string): boolean;
-        toString(): string;
-        toString(format: string): string;
-        equals(uuid: SP.Guid): boolean;
-        toSerialized(): string;
-    }
-    /** Specifies permissions that are used to define user roles. Represents SPBasePermissions class. */
-    export enum PermissionKind {
-        /** Has no permissions on the Web site. Not available through the user interface. */
-        emptyMask,
-        /** View items in lists, documents in document libraries, and view Web discussion comments. */
-        viewListItems,
-        /** Add items to lists, add documents to document libraries, and add Web discussion comments. */
-        addListItems,
-        /** Edit items in lists, edit documents in document libraries, edit Web discussion comments in documents, and customize Web Part Pages in document libraries. */
-        editListItems,
-        /** Delete items from a list, documents from a document library, and Web discussion comments in documents. */
-        deleteListItems,
-        /** Approve a minor version of a list item or document. */
-        approveItems,
-        /** View the source of documents with server-side file handlers. */
-        openItems,
-        /** View past versions of a list item or document. */
-        viewVersions,
-        /** Delete past versions of a list item or document. */
-        deleteVersions,
-        /** Discard or check in a document which is checked out to another user. */
-        cancelCheckout,
-        /** Create, change, and delete personal views of lists. */
-        managePersonalViews,
-        /** Create and delete lists, add or remove columns in a list, and add or remove public views of a list. */
-        manageLists,
-        /** View forms, views, and application pages, and enumerate lists. */
-        viewFormPages,
-        /** Make content of a list or document library retrieveable for anonymous users through SharePoint search. The list permissions in the site do not change.  */
-        anonymousSearchAccessList,
-        /** Allow users to open a Web site, list, or folder to access items inside that container. */
-        open,
-        /** View pages in a Web site. */
-        viewPages,
-        /** Add, change, or delete HTML pages or Web Part Pages, and edit the Web site using a SharePoint Foundation?compatible editor. */
-        addAndCustomizePages,
-        /** Apply a theme or borders to the entire Web site. */
-        applyThemeAndBorder,
-        /** Apply a style sheet (.css file) to the Web site. */
-        applyStyleSheets,
-        /** View reports on Web site usage. */
-        viewUsageData,
-        /** Create a Web site using Self-Service Site Creation. */
-        createSSCSite,
-        /** Create subsites such as team sites, Meeting Workspace sites, and Document Workspace sites.  */
-        manageSubwebs,
-        /** Create a group of users that can be used anywhere within the site collection. */
-        createGroups,
-        /** Create and change permission levels on the Web site and assign permissions to users and groups. */
-        managePermissions,
-        /** Enumerate files and folders in a Web site using Microsoft Office SharePoint Designer 2007 and WebDAV interfaces. */
-        browseDirectories,
-        /** View information about users of the Web site. */
-        browseUserInfo,
-        /** Add or remove personal Web Parts on a Web Part Page. */
-        addDelPrivateWebParts,
-        /** Update Web Parts to display personalized information. */
-        updatePersonalWebParts,
-        /** Grant the ability to perform all administration tasks for the Web site as well as manage content. Activate, deactivate, or edit properties of Web site scoped Features through the object model or through the user interface (UI). When granted on the root Web site of a site collection, activate, deactivate, or edit properties of site collection scoped Features through the object model. To browse to the Site Collection Features page and activate or deactivate site collection scoped Features through the UI, you must be a site collection administrator. */
-        manageWeb,
-        /** Content of lists and document libraries in the Web site will be retrieveable for anonymous users through SharePoint search if the list or document library has AnonymousSearchAccessList set.  */
-        anonymousSearchAccessWebLists,
-        /** Use features that launch client applications; otherwise, users must work on documents locally and upload changes.  */
-        useClientIntegration,
-        /** Use SOAP, WebDAV, or Microsoft Office SharePoint Designer 2007 interfaces to access the Web site. */
-        useRemoteAPIs,
-        /** Manage alerts for all users of the Web site. */
-        manageAlerts,
-        /** Create e-mail alerts. */
-        createAlerts,
-        /** Allows a user to change his or her user information, such as adding a picture. */
-        editMyUserInfo,
-        /** Enumerate permissions on the Web site, list, folder, document, or list item. */
-        enumeratePermissions,
-        /** Has all permissions on the Web site. Not available through the user interface. */
-        fullMask,
-    }
-
-    export class BaseCollection<T> implements IEnumerable<T> {
-        getEnumerator(): IEnumerator<T>;
-        get_count(): number;
-        itemAtIndex(index: number): T;
-        constructor();
-    }
-    export interface IFromJson {
-        fromJson(initValue: any): void;
-        customFromJson(initValue: any): boolean;
-    }
-    export class Base64EncodedByteArray {
-        constructor();
-        constructor(base64Str: string);
-        get_length(): number;
-        toBase64String(): string;
-        append(b: any): void;
-        getByteAt(index: number): any;
-        setByteAt(index: number, b: any): void;
-    }
-    export class ConditionalScopeBase {
-        startScope(): any;
-        startIfTrue(): any;
-        startIfFalse(): any;
-        get_testResult(): boolean;
-        fromJson(initValue: any): void;
-        customFromJson(initValue: any): boolean;
-    }
-    export class ClientObjectPropertyConditionalScope extends SP.ConditionalScopeBase {
-        constructor(clientObject: SP.ClientObject, propertyName: string, comparisonOperator: string, valueToCompare: any);
-        constructor(clientObject: SP.ClientObject, propertyName: string, comparisonOperator: string, valueToCompare: any, allowAllActions: boolean);
-    }
-    //export class ClientResult {
-    //    get_value(): any;
-    //    setValue(value: any): void;
-    //    constructor();
-    //}
-    export class ClientResult<T> {
-        get_value(): T;
-        setValue(value: T): void;
-        constructor();
-    }
-    export class BooleanResult {
-        get_value(): boolean;
-        constructor();
-    }
-    export class CharResult {
-        get_value(): any;
-        constructor();
-    }
-    export class IntResult {
-        get_value(): number;
-        constructor();
-    }
-    export class DoubleResult {
-        get_value(): number;
-        constructor();
-    }
-    export class StringResult {
-        get_value(): string;
-        constructor();
-    }
-    export class DateTimeResult {
-        get_value(): Date;
-        constructor();
-    }
-    export class GuidResult {
-        get_value(): SP.Guid;
-        constructor();
-    }
-    export class JsonObjectResult {
-        get_value(): any;
-        constructor();
-    }
-    export class ClientDictionaryResultHandler<T> {
-        constructor(dict: SP.ClientResult<T>);
-    }
-    export class ClientUtility {
-        static urlPathEncodeForXmlHttpRequest(url: string): string;
-        static getOrCreateObjectPathForConstructor(context: SP.ClientRuntimeContext, typeId: string, args: any[]): SP.ObjectPath;
-    }
-    export class XElement {
-        get_name(): string;
-        set_name(value: string): void;
-        get_attributes(): any;
-        set_attributes(value: any): void;
-        get_children(): any;
-        set_children(value: any): void;
-        constructor();
-    }
-    export class ClientXElement {
-        get_element(): SP.XElement;
-        set_element(value: SP.XElement): void;
-        constructor();
-    }
-    export class ClientXDocument {
-        get_root(): SP.XElement;
-        set_root(value: SP.XElement): void;
-        constructor();
-    }
-    export class DataConvert {
-        static writePropertiesToXml(writer: SP.XmlWriter, obj: any, propNames: string[], serializationContext: SP.SerializationContext): void;
-        static populateDictionaryFromObject(dict: any, parentNode: any): void;
-        static fixupTypes(context: SP.ClientRuntimeContext, dict: any): void;
-        static populateArray(context: SP.ClientRuntimeContext, dest: any, jsonArrayFromServer: any): void;
-        static fixupType(context: SP.ClientRuntimeContext, obj: any): any;
-        static writeDictionaryToXml(writer: SP.XmlWriter, dict: any, topLevelElementTagName: string, keys: any, serializationContext: SP.SerializationContext): void;
-        static writeValueToXmlElement(writer: SP.XmlWriter, objValue: any, serializationContext: SP.SerializationContext): void;
-        static invokeSetProperty(obj: any, propName: string, propValue: any): void;
-        static invokeGetProperty(obj: any, propName: string): any;
-        static specifyDateTimeKind(datetime: Date, kind: SP.DateTimeKind): void;
-        static getDateTimeKind(datetime: Date): SP.DateTimeKind;
-        static createUnspecifiedDateTime(year: number, month: number, day: number, hour: number, minute: number, second: number, milliseconds: number): Date;
-        static createUtcDateTime(milliseconds: number): Date;
-        static createLocalDateTime(milliseconds: number): Date;
-    }
-    export interface IWebRequestExecutorFactory {
-        createWebRequestExecutor(): Sys.Net.WebRequestExecutor;
-    }
-    export class PageRequestFailedEventArgs extends Sys.EventArgs {
-        get_executor(): Sys.Net.WebRequestExecutor;
-        get_errorMessage(): string;
-        get_isErrorPage(): boolean;
-    }
-    export class PageRequestSucceededEventArgs extends Sys.EventArgs {
-        get_executor(): Sys.Net.WebRequestExecutor;
-    }
-    export class PageRequest {
-        get_request(): Sys.Net.WebRequest;
-        get_url(): string;
-        set_url(value: string): void;
-        get_expectedContentType(): string;
-        set_expectedContentType(value: string): void;
-        post(body: string): void;
-        get(): void;
-        static doPost(url: string, body: string, expectedContentType: string, succeededHandler: (sender: any, args: SP.PageRequestSucceededEventArgs) => void, failedHandler: (sender: any, args: SP.PageRequestFailedEventArgs) => void): void;
-        static doGet(url: string, expectedContentType: string, succeededHandler: (sender: any, args: SP.PageRequestSucceededEventArgs) => void, failedHandler: (sender: any, args: SP.PageRequestFailedEventArgs) => void): void;
-        add_succeeded(value: (sender: any, args: SP.PageRequestSucceededEventArgs) => void): void;
-        remove_succeeded(value: (sender: any, args: SP.PageRequestSucceededEventArgs) => void): void;
-        add_failed(value: (sender: any, args: SP.PageRequestFailedEventArgs) => void): void;
-        remove_failed(value: (sender: any, args: SP.PageRequestFailedEventArgs) => void): void;
-        constructor();
-    }
-    export class ResResources {
-        static getString(resourceId: string, args: any[]): string;
-    }
-    /** Defines a writer that provides a set of methods to append text in XML format. Use the static SP.XmlWriter.create(sb) Method to create an SP.XmlWriter object with the Sys.StringBuilder object you pass in. */
-    export class XmlWriter {
-        /** Creates a new instance of the XmlWriter class with the specified string builder. */
-        static create(sb: Sys.StringBuilder): SP.XmlWriter;
-        /** Appends a start element tag with the specified name in XML format to the object?s string builder. */
-        writeStartElement(tagName: string): void;
-        /** Appends an element with the specified tag name and value in XML format to the string builder. */
-        writeElementString(tagName: string, value: string): void;
-        /** Appends an end element tag in XML format to the object?s string builder. This method appends the end element tag ?/>? if the start element tag is not closed; otherwise, it appends a full end element tag ?</tagName>? to the string builder. */
-        writeEndElement(): void;
-        /** Appends an attribute with the specified name and value in XML format to the object?s string builder. */
-        writeAttributeString(localName: string, value: string): void;
-        /** This method only appends the name of the attribute. You can append the value of the attribute by calling the SP.XmlWriter.writeString(value) Method, and close the attribute by calling the SP.XmlWriter.writeEndAttribute() Method. */
-        writeStartAttribute(localName: string): void;
-        /** Appends an end of an attribute in XML format to the object?s string builder. */
-        writeEndAttribute(): void;
-        /** Appends the specified value for an element tag or attribute to the object?s string builder. */
-        writeString(value: string): void;
-        /** Appends the specified text to the object?s string builder. */
-        writeRaw(xml: string): void;
-        /** This member is reserved for internal use and is not intended to be used directly from your code. */
-        close(): void;
-    }
-
-    export class ClientConstants {
-        AddExpandoFieldTypeSuffix: string;
-        Actions: string;
-        ApplicationName: string;
-        Body: string;
-        CatchScope: string;
-        ChildItemQuery: string;
-        ChildItems: string;
-        ConditionalScope: string;
-        Constructor: string;
-        Context: string;
-        ErrorInfo: string;
-        ErrorMessage: string;
-        ErrorStackTrace: string;
-        ErrorCode: string;
-        ErrorTypeName: string;
-        ErrorValue: string;
-        ErrorDetails: string;
-        ErrorTraceCorrelationId: string;
-        ExceptionHandlingScope: string;
-        ExceptionHandlingScopeSimple: string;
-        QueryableExpression: string;
-        FinallyScope: string;
-        HasException: string;
-        Id: string;
-        Identity: string;
-        IfFalseScope: string;
-        IfTrueScope: string;
-        IsNull: string;
-        LibraryVersion: string;
-        TraceCorrelationId: string;
-        Count: string;
-        Method: string;
-        Methods: string;
-        Name: string;
-        Object: string;
-        ObjectPathId: string;
-        ObjectPath: string;
-        ObjectPaths: string;
-        ObjectType: string;
-        ObjectIdentity: string;
-        ObjectIdentityQuery: string;
-        ObjectVersion: string;
-        Parameter: string;
-        Parameters: string;
-        ParentId: string;
-        Processed: string;
-        Property: string;
-        Properties: string;
-        Query: string;
-        QueryResult: string;
-        Request: string;
-        Results: string;
-        ScalarProperty: string;
-        SchemaVersion: string;
-        ScopeId: string;
-        SelectAll: string;
-        SelectAllProperties: string;
-        SetProperty: string;
-        SetStaticProperty: string;
-        StaticMethod: string;
-        StaticProperty: string;
-        SuffixChar: string;
-        SuffixByte: string;
-        SuffixInt16: string;
-        SuffixUInt16: string;
-        SuffixInt32: string;
-        SuffixUInt32: string;
-        SuffixInt64: string;
-        SuffixUInt64: string;
-        SuffixSingle: string;
-        SuffixDouble: string;
-        SuffixDecimal: string;
-        SuffixTimeSpan: string;
-        SuffixArray: string;
-        Test: string;
-        TryScope: string;
-        Type: string;
-        TypeId: string;
-        Update: string;
-        Version: string;
-        XmlElementName: string;
-        XmlElementAttributes: string;
-        XmlElementChildren: string;
-        XmlNamespace: string;
-        FieldValuesMethodName: string;
-        RequestTokenHeader: string;
-        FormDigestHeader: string;
-        useWebLanguageHeader: string;
-        useWebLanguageHeaderValue: string;
-        ClientTagHeader: string;
-        TraceCorrelationIdRequestHeader: string;
-        TraceCorrelationIdResponseHeader: string;
-        greaterThan: string;
-        lessThan: string;
-        equal: string;
-        notEqual: string;
-        greaterThanOrEqual: string;
-        lessThanOrEqual: string;
-        andAlso: string;
-        orElse: string;
-        not: string;
-        expressionParameter: string;
-        expressionProperty: string;
-        expressionStaticProperty: string;
-        expressionMethod: string;
-        expressionStaticMethod: string;
-        expressionConstant: string;
-        expressionConvert: string;
-        expressionTypeIs: string;
-        ofType: string;
-        take: string;
-        where: string;
-        orderBy: string;
-        orderByDescending: string;
-        thenBy: string;
-        thenByDescending: string;
-        queryableObject: string;
-        ServiceFileName: string;
-        ServiceMethodName: string;
-        fluidApplicationInitParamUrl: string;
-        fluidApplicationInitParamViaUrl: string;
-        fluidApplicationInitParamRequestToken: string;
-        fluidApplicationInitParamFormDigestTimeoutSeconds: string;
-        fluidApplicationInitParamFormDigest: string;
-
-    }
-    export class ClientSchemaVersions {
-        version14: string;
-        version15: string;
-        currentVersion: string;
-    }
-    export class ClientErrorCodes {
-        genericError: number;
-        accessDenied: number;
-        docAlreadyExists: number;
-        versionConflict: number;
-        listItemDeleted: number;
-        invalidFieldValue: number;
-        notSupported: number;
-        redirect: number;
-        notSupportedRequestVersion: number;
-        fieldValueFailedValidation: number;
-        itemValueFailedValidation: number;
-    }
-    export class ClientAction {
-        get_id(): number;
-        get_path(): SP.ObjectPath;
-        get_name(): string;
-    }
-    export class ClientActionSetProperty extends SP.ClientAction {
-        constructor(obj: SP.ClientObject, propName: string, propValue: any);
-    }
-    export class ClientActionSetStaticProperty extends SP.ClientAction {
-        constructor(context: SP.ClientRuntimeContext, typeId: string, propName: string, propValue: any);
-    }
-    export class ClientActionInvokeMethod extends SP.ClientAction {
-        constructor(obj: SP.ClientObject, methodName: string, parameters: any[]);
-    }
-    export class ClientActionInvokeStaticMethod extends SP.ClientAction {
-        constructor(context: SP.ClientRuntimeContext, typeId: string, methodName: string, parameters: any[]);
-    }
-    export class ClientObject {
-        get_context(): SP.ClientRuntimeContext;
-        get_path(): SP.ObjectPath;
-        get_objectVersion(): string;
-        set_objectVersion(value: string): void;
-        fromJson(initValue: any): void;
-        customFromJson(initValue: any): boolean;
-        retrieve(): void;
-        refreshLoad(): void;
-        retrieve(propertyNames: string[]): void;
-        isPropertyAvailable(propertyName: string): boolean;
-        isObjectPropertyInstantiated(propertyName: string): boolean;
-        get_serverObjectIsNull(): boolean;
-        get_typedObject(): SP.ClientObject;
-    }
-    export class ClientObjectData {
-        get_properties(): any;
-        get_clientObjectProperties(): any;
-        get_methodReturnObjects(): any;
-        constructor();
-    }
-    /** Provides a base class for a collection of objects on a remote client. */
-    export class ClientObjectCollection<T> extends SP.ClientObject implements IEnumerable<T> {
-        get_areItemsAvailable(): boolean;
-        /** Gets the data for all of the items in the collection. */
-        retrieveItems(): SP.ClientObjectPrototype;
-        /** Returns an enumerator that iterates through the collection. */
-        getEnumerator(): IEnumerator<T>;
-        /** Returns number of items in the collection. */
-        get_count(): number;
-        get_data(): T[];
-        addChild(obj: T): void;
-        getItemAtIndex(index: number): T;
-        fromJson(obj: any): void;
-    }
-    export class ClientObjectList<T> extends SP.ClientObjectCollection<T> {
-        constructor(context: SP.ClientRuntimeContext, objectPath: SP.ObjectPath, childItemType: any);
-        fromJson(initValue: any): void;
-        customFromJson(initValue: any): boolean;
-    }
-    export class ClientObjectPrototype {
-        retrieve(): void;
-        retrieve(propertyNames: string[]): void;
-        retrieveObject(propertyName: string): SP.ClientObjectPrototype;
-        retrieveCollectionObject(propertyName: string): SP.ClientObjectCollectionPrototype;
-    }
-    export class ClientObjectCollectionPrototype extends SP.ClientObjectPrototype {
-        retrieveItems(): SP.ClientObjectPrototype;
-    }
-    export enum ClientRequestStatus {
-        active,
-        inProgress,
-        completedSuccess,
-        completedException,
-    }
-    export class WebRequestEventArgs extends Sys.EventArgs {
-        constructor(webRequest: Sys.Net.WebRequest);
-        get_webRequest(): Sys.Net.WebRequest;
-    }
-    export class ClientRequest {
-        static get_nextSequenceId(): number;
-        get_webRequest(): Sys.Net.WebRequest;
-        add_requestSucceeded(value: (sender: any, args: SP.ClientRequestSucceededEventArgs) => void): void;
-        remove_requestSucceeded(value: (sender: any, args: SP.ClientRequestSucceededEventArgs) => void): void;
-        add_requestFailed(value: (sender: any, args: SP.ClientRequestFailedEventArgs) => void): void;
-        remove_requestFailed(value: (sender: any, args: SP.ClientRequestFailedEventArgs) => void): void;
-        get_navigateWhenServerRedirect(): boolean;
-        set_navigateWhenServerRedirect(value: boolean): void;
-    }
-    export class ClientRequestEventArgs extends Sys.EventArgs {
-        get_request(): SP.ClientRequest;
-    }
-    export class ClientRequestFailedEventArgs extends SP.ClientRequestEventArgs {
-        constructor(request: SP.ClientRequest, message: string, stackTrace: string, errorCode: number, errorValue: string, errorTypeName: string, errorDetails: any);
-        constructor(request: SP.ClientRequest, message: string, stackTrace: string, errorCode: number, errorValue: string, errorTypeName: string, errorDetails: any, errorTraceCorrelationId: string);
-        get_message(): string;
-        get_stackTrace(): string;
-        get_errorCode(): number;
-        get_errorValue(): string;
-        get_errorTypeName(): string;
-        get_errorDetails(): any;
-        get_errorTraceCorrelationId(): string;
-    }
-    export class ClientRequestSucceededEventArgs extends SP.ClientRequestEventArgs {
-    }
-    export class ClientRuntimeContext implements Sys.IDisposable {
-        constructor(serverRelativeUrlOrFullUrl: string);
-        get_url(): string;
-        get_viaUrl(): string;
-        set_viaUrl(value: string): void;
-        get_formDigestHandlingEnabled(): boolean;
-        set_formDigestHandlingEnabled(value: boolean): void;
-        get_applicationName(): string;
-        set_applicationName(value: string): void;
-        get_clientTag(): string;
-        set_clientTag(value: string): void;
-        get_webRequestExecutorFactory(): SP.IWebRequestExecutorFactory;
-        set_webRequestExecutorFactory(value: SP.IWebRequestExecutorFactory): void;
-        get_pendingRequest(): SP.ClientRequest;
-        get_hasPendingRequest(): boolean;
-        add_executingWebRequest(value: (sender: any, args: SP.WebRequestEventArgs) => void): void;
-        remove_executingWebRequest(value: (sender: any, args: SP.WebRequestEventArgs) => void): void;
-        add_requestSucceeded(value: (sender: any, args: SP.ClientRequestSucceededEventArgs) => void): void;
-        remove_requestSucceeded(value: (sender: any, args: SP.ClientRequestSucceededEventArgs) => void): void;
-        add_requestFailed(value: (sender: any, args: SP.ClientRequestFailedEventArgs) => void): void;
-        remove_requestFailed(value: (sender: any, args: SP.ClientRequestFailedEventArgs) => void): void;
-        add_beginningRequest(value: (sender: any, args: SP.ClientRequestEventArgs) => void): void;
-        remove_beginningRequest(value: (sender: any, args: SP.ClientRequestEventArgs) => void): void;
-        get_requestTimeout(): number;
-        set_requestTimeout(value: number): void;
-        executeQueryAsync(succeededCallback: (sender: any, args: SP.ClientRequestSucceededEventArgs) => void, failedCallback: (sender: any, args: SP.ClientRequestFailedEventArgs) => void): void;
-        executeQueryAsync(succeededCallback: (sender: any, args: SP.ClientRequestSucceededEventArgs) => void): void;
-        executeQueryAsync(): void;
-        get_staticObjects(): any;
-        castTo(obj: SP.ClientObject, type: any): SP.ClientObject;
-        addQuery(query: SP.ClientAction): void;
-        addQueryIdAndResultObject(id: number, obj: any): void;
-        parseObjectFromJsonString(json: string): any;
-        parseObjectFromJsonString(json: string, skipTypeFixup: boolean): any;
-        load(clientObject: SP.ClientObject): void;
-        loadQuery<T>(clientObjectCollection: SP.ClientObjectCollection<T>, exp: string): any;
-        load(clientObject: SP.ClientObject, ...exps: string[]): void;
-        loadQuery<T>(clientObjectCollection: SP.ClientObjectCollection<T>): any;
-        get_serverSchemaVersion(): string;
-        get_serverLibraryVersion(): string;
-        get_traceCorrelationId(): string;
-        set_traceCorrelationId(value: string): void;
-        dispose(): void;
-    }
-    export class SimpleDataTable {
-        get_rows(): any[];
-        constructor();
-    }
-    export class ClientValueObject {
-        fromJson(obj: any): void;
-        customFromJson(obj: any): boolean;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        customWriteToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): boolean;
-        get_typeId(): string;
-    }
-    export class ClientValueObjectCollection<T> extends SP.ClientValueObject implements IEnumerable<T> {
-        get_count(): number;
-        getEnumerator(): IEnumerator<T>;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-    }
-    export class ExceptionHandlingScope {
-        constructor(context: SP.ClientRuntimeContext);
-        startScope(): any;
-        startTry(): any;
-        startCatch(): any;
-        startFinally(): any;
-        get_processed(): boolean;
-        get_hasException(): boolean;
-        get_errorMessage(): string;
-        get_serverStackTrace(): string;
-        get_serverErrorCode(): number;
-        get_serverErrorValue(): string;
-        get_serverErrorTypeName(): string;
-        get_serverErrorDetails(): any;
-    }
-    export class ObjectIdentityQuery extends SP.ClientAction {
-        constructor(objectPath: SP.ObjectPath);
-    }
-    export class ObjectPath {
-        setPendingReplace(): void;
-    }
-    export class ObjectPathProperty extends SP.ObjectPath {
-        constructor(context: SP.ClientRuntimeContext, parent: SP.ObjectPath, propertyName: string);
-    }
-    export class ObjectPathStaticProperty extends SP.ObjectPath {
-        constructor(context: SP.ClientRuntimeContext, typeId: string, propertyName: string);
-    }
-    export class ObjectPathMethod extends SP.ObjectPath {
-        constructor(context: SP.ClientRuntimeContext, parent: SP.ObjectPath, methodName: string, parameters: any[]);
-    }
-    export class ObjectPathStaticMethod extends SP.ObjectPath {
-        constructor(context: SP.ClientRuntimeContext, typeId: string, methodName: string, parameters: any[]);
-    }
-    export class ObjectPathConstructor extends SP.ObjectPath {
-        constructor(context: SP.ClientRuntimeContext, typeId: string, parameters: any[]);
-    }
-    export class SerializationContext {
-        addClientObject(obj: SP.ClientObject): void;
-        addObjectPath(path: SP.ObjectPath): void;
-    }
-    export class ResourceStrings {
-        argumentExceptionMessage: string;
-        argumentNullExceptionMessage: string;
-        cC_AppIconAlt: string;
-        cC_AppWebUrlNotSet: string;
-        cC_ArrowImageAlt: string;
-        cC_BackToSite: string;
-        cC_ErrorGettingThemeInfo: string;
-        cC_HelpLinkToolTip: string;
-        cC_HostSiteUrlNotSet: string;
-        cC_InvalidArgument: string;
-        cC_InvalidJSON: string;
-        cC_InvalidOperation: string;
-        cC_PlaceHolderElementNotFound: string;
-        cC_RequiredScriptNotLoaded: string;
-        cC_SendFeedback: string;
-        cC_SettingsLinkToolTip: string;
-        cC_TimeoutGettingThemeInfo: string;
-        cC_Welcome: string;
-        cannotFindContextWebServerRelativeUrl: string;
-        collectionHasNotBeenInitialized: string;
-        collectionModified: string;
-        invalidUsageOfConditionalScope: string;
-        invalidUsageOfConditionalScopeNowAllowedAction: string;
-        invalidUsageOfExceptionHandlingScope: string;
-        namedPropertyHasNotBeenInitialized: string;
-        namedServerObjectIsNull: string;
-        noObjectPathAssociatedWithObject: string;
-        notSameClientContext: string;
-        notSupportedQueryExpressionWithExpressionDetail: string;
-        objectNameIdentity: string;
-        objectNameMethod: string;
-        objectNameProperty: string;
-        objectNameType: string;
-        propertyHasNotBeenInitialized: string;
-        rE_BrowserBinaryDataNotSupported: string;
-        rE_BrowserNotSupported: string;
-        rE_CannotAccessSite: string;
-        rE_CannotAccessSiteCancelled: string;
-        rE_CannotAccessSiteOpenWindowFailed: string;
-        rE_DismissOpenWindowMessageLinkText: string;
-        rE_DomainDoesNotMatch: string;
-        rE_FixitHelpMessage: string;
-        rE_InvalidArgumentOrField: string;
-        rE_InvalidOperation: string;
-        rE_NoTrustedOrigins: string;
-        rE_OpenWindowButtonText: string;
-        rE_OpenWindowMessage: string;
-        rE_RequestAbortedOrTimedout: string;
-        rE_RequestUnexpectedResponse: string;
-        rE_RequestUnexpectedResponseWithContentTypeAndStatus: string;
-        requestAbortedOrTimedOut: string;
-        requestEmptyQueryName: string;
-        requestHasBeenExecuted: string;
-        requestUnexpectedResponse: string;
-        requestUnexpectedResponseWithContentTypeAndStatus: string;
-        requestUnexpectedResponseWithStatus: string;
-        requestUnknownResponse: string;
-        serverObjectIsNull: string;
-        unknownError: string;
-        unknownResponseData: string;
-    }
-    export class RuntimeRes {
-        cC_PlaceHolderElementNotFound: string;
-        rE_CannotAccessSiteOpenWindowFailed: string;
-        noObjectPathAssociatedWithObject: string;
-        cC_TimeoutGettingThemeInfo: string;
-        unknownResponseData: string;
-        requestUnexpectedResponseWithStatus: string;
-        objectNameProperty: string;
-        requestUnknownResponse: string;
-        rE_RequestUnexpectedResponseWithContentTypeAndStatus: string;
-        rE_BrowserNotSupported: string;
-        argumentExceptionMessage: string;
-        namedServerObjectIsNull: string;
-        objectNameType: string;
-        requestUnexpectedResponseWithContentTypeAndStatus: string;
-        cC_InvalidJSON: string;
-        invalidUsageOfExceptionHandlingScope: string;
-        serverObjectIsNull: string;
-        cC_AppWebUrlNotSet: string;
-        rE_OpenWindowMessage: string;
-        argumentNullExceptionMessage: string;
-        cC_HelpLinkToolTip: string;
-        propertyHasNotBeenInitialized: string;
-        rE_RequestAbortedOrTimedout: string;
-        invalidUsageOfConditionalScope: string;
-        cC_ErrorGettingThemeInfo: string;
-        rE_DismissOpenWindowMessageLinkText: string;
-        rE_CannotAccessSiteCancelled: string;
-        objectNameIdentity: string;
-        cC_HostSiteUrlNotSet: string;
-        rE_FixitHelpMessage: string;
-        notSupportedQueryExpressionWithExpressionDetail: string;
-        rE_RequestUnexpectedResponse: string;
-        rE_DomainDoesNotMatch: string;
-        cC_BackToSite: string;
-        rE_NoTrustedOrigins: string;
-        rE_InvalidOperation: string;
-        collectionModified: string;
-        cC_Welcome: string;
-        cC_AppIconAlt: string;
-        cC_SendFeedback: string;
-        cC_ArrowImageAlt: string;
-        cC_InvalidOperation: string;
-        requestAbortedOrTimedOut: string;
-        invalidUsageOfConditionalScopeNowAllowedAction: string;
-        cannotFindContextWebServerRelativeUrl: string;
-        rE_OpenWindowButtonText: string;
-        unknownError: string;
-        cC_InvalidArgument: string;
-        rE_InvalidArgumentOrField: string;
-        cC_SettingsLinkToolTip: string;
-        requestEmptyQueryName: string;
-        cC_RequiredScriptNotLoaded: string;
-        rE_CannotAccessSite: string;
-        notSameClientContext: string;
-        requestUnexpectedResponse: string;
-        rE_BrowserBinaryDataNotSupported: string;
-        collectionHasNotBeenInitialized: string;
-        namedPropertyHasNotBeenInitialized: string;
-        requestHasBeenExecuted: string;
-        objectNameMethod: string;
-    }
-    export class ParseJSONUtil {
-        static parseObjectFromJsonString(json: string): any;
-        static validateJson(text: string): boolean;
-    }
-    export enum DateTimeKind {
-        unspecified,
-        utc,
-        local,
-    }
-    export class OfficeVersion {
-        majorBuildVersion: number;
-        previousMajorBuildVersion: number;
-        majorVersion: string;
-        previousVersion: string;
-        majorVersionDotZero: string;
-        previousVersionDotZero: string;
-        assemblyVersion: string;
-        wssMajorVersion: string;
-    }
-    export class ClientContext extends SP.ClientRuntimeContext {
-        constructor(serverRelativeUrlOrFullUrl: string);
-        static get_current(): SP.ClientContext;
-        constructor();
-        get_web(): SP.Web;
-        get_site(): SP.Site;
-        get_serverVersion(): string;
-    }
-    export enum ULSTraceLevel {
-        verbose,
-    }
-    /** Provides a Unified Logging Service (ULS) that monitors log messages. */
-    export class ULS {
-        /** Gets a value that indicates whether the Unified Logging Service (ULS) is enabled. */
-        static get_enabled(): boolean;
-        /** Sets a value that indicates whether the Unified Logging Service (ULS) is enabled. */
-        static set_enabled(value: boolean): void;
-        /** Logs the specified debug message.
-            This method logs the message with a time stamp. If any log messages are pending, this method also logs them. If the message cannot be logged, the message is added to the list of pending log messages. */
-        static log(debugMessage: string): void;
-        /** Increases the indentation for subsequent log messages. */
-        static increaseIndent(): void;
-        /** Decreases the indentation for subsequent log messages. */
-        static decreaseIndent(): void;
-        /** Traces when the function was entered. */
-        static traceApiEnter(functionName: string, args: any[]): void;
-        /** Traces when the function was entered. */
-        static traceApiEnter(functionName: string): void;
-        /** Traces when the function has finished. */
-        static traceApiLeave(): void;
-    }
-    export class AccessRequests {
-        static changeRequestStatus(context: SP.ClientRuntimeContext, itemId: number, newStatus: number, convStr: string, permType: string, permissionLevel: number): void;
-        static changeRequestStatusBulk(context: SP.ClientRuntimeContext, requestIds: number[], newStatus: number): void;
-    }
-    export enum AddFieldOptions {
-        defaultValue,
-        addToDefaultContentType,
-        addToNoContentType,
-        addToAllContentTypes,
-        addFieldInternalNameHint,
-        addFieldToDefaultView,
-        addFieldCheckDisplayName,
-    }
-    export class AlternateUrl extends SP.ClientObject {
-        get_uri(): string;
-        get_urlZone(): SP.UrlZone;
-    }
-    export class App extends SP.ClientObject {
-        get_assetId(): string;
-        get_contentMarket(): string;
-        get_versionString(): string;
-    }
-    export class AppCatalog {
-        static getAppInstances(context: SP.ClientRuntimeContext, web: SP.Web): SP.ClientObjectList<SP.AppInstance>;
-        static getDeveloperSiteAppInstancesByIds(context: SP.ClientRuntimeContext, site: SP.Site, appInstanceIds: SP.Guid[]): SP.ClientObjectList<SP.AppInstance>;
-        static isAppSideloadingEnabled(context: SP.ClientRuntimeContext): SP.BooleanResult;
-    }
-    export class AppContextSite extends SP.ClientObject {
-        constructor(context: SP.ClientRuntimeContext, siteUrl: string);
-        get_site(): SP.Site;
-        get_web(): SP.Web;
-        static newObject(context: SP.ClientRuntimeContext, siteUrl: string): SP.AppContextSite;
-    }
-    export class AppInstance extends SP.ClientObject {
-        get_appPrincipalId(): string;
-        get_appWebFullUrl(): string;
-        get_id(): SP.Guid;
-        get_inError(): boolean;
-        get_startPage(): string;
-        get_remoteAppUrl(): string;
-        get_settingsPageUrl(): string;
-        get_siteId(): SP.Guid;
-        get_status(): SP.AppInstanceStatus;
-        get_title(): string;
-        get_webId(): SP.Guid;
-        getErrorDetails(): SP.ClientObjectList<SP.AppInstanceErrorDetails>;
-        uninstall(): SP.GuidResult;
-        upgrade(appPackageStream: SP.Base64EncodedByteArray): void;
-        cancelAllJobs(): SP.BooleanResult;
-        install(): SP.GuidResult;
-        getPreviousAppVersion(): SP.App;
-        retryAllJobs(): void;
-    }
-    export class AppInstanceErrorDetails extends SP.ClientObject {
-        get_correlationId(): SP.Guid;
-        set_correlationId(value: SP.Guid): void;
-        get_errorDetail(): string;
-        get_errorType(): SP.AppInstanceErrorType;
-        set_errorType(value: SP.AppInstanceErrorType): void;
-        get_errorTypeName(): string;
-        get_exceptionMessage(): string;
-        get_source(): SP.AppInstanceErrorSource;
-        set_source(value: SP.AppInstanceErrorSource): void;
-        get_sourceName(): string;
-    }
-    export enum AppInstanceErrorSource {
-        common,
-        appWeb,
-        parentWeb,
-        remoteWebSite,
-        database,
-        officeExtension,
-        eventCallouts,
-        finalization,
-    }
-    export enum AppInstanceErrorType {
-        transient,
-        configuration,
-        app,
-    }
-    export enum AppInstanceStatus {
-        invalidStatus,
-        installing,
-        canceling,
-        uninstalling,
-        installed,
-        upgrading,
-        initialized,
-        upgradeCanceling,
-        disabling,
-        disabled,
-    }
-    export class AppLicense extends SP.ClientValueObject {
-        get_rawXMLLicenseToken(): string;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class AppLicenseCollection extends SP.ClientValueObjectCollection<AppLicense> {
-        add(item: SP.AppLicense): void;
-        get_item(index: number): SP.AppLicense;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export enum AppLicenseType {
-        perpetualMultiUser,
-        perpetualAllUsers,
-        trialMultiUser,
-        trialAllUsers,
-    }
-    export class Attachment extends SP.ClientObject {
-        get_fileName(): string;
-        get_serverRelativeUrl(): string;
-        deleteObject(): void;
-    }
-    export class AttachmentCollection extends SP.ClientObjectCollection<Attachment> {
-        itemAt(index: number): SP.Attachment;
-        get_item(index: number): SP.Attachment;
-        getByFileName(fileName: string): SP.Attachment;
-    }
-    export class AttachmentCreationInformation extends SP.ClientValueObject {
-        get_contentStream(): SP.Base64EncodedByteArray;
-        set_contentStream(value: SP.Base64EncodedByteArray): void;
-        get_fileName(): string;
-        set_fileName(value: string): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class BasePermissions extends SP.ClientValueObject {
-        set(perm: SP.PermissionKind): void;
-        clear(perm: SP.PermissionKind): void;
-        clearAll(): void;
-        has(perm: SP.PermissionKind): boolean;
-        equals(perm: SP.BasePermissions): boolean;
-        hasPermissions(high: number, low: number): boolean;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    /** Specifies the base type for a list. */
-    export enum BaseType {
-        none,
-        genericList,
-        documentLibrary,
-        unused,
-        discussionBoard,
-        survey,
-        issue,
-    }
-    export enum BrowserFileHandling {
-        permissive,
-        strict,
-    }
-    export enum CalendarType {
-        none,
-        gregorian,
-        japan,
-        taiwan,
-        korea,
-        hijri,
-        thai,
-        hebrew,
-        gregorianMEFrench,
-        gregorianArabic,
-        gregorianXLITEnglish,
-        gregorianXLITFrench,
-        koreaJapanLunar,
-        chineseLunar,
-        sakaEra,
-        umAlQura,
-    }
-    /** Specifies a Collaborative Application Markup Language (CAML) query on a list. */
-    export class CamlQuery extends SP.ClientValueObject {
-        constructor();
-        /** This method creates a Collaborative Application Markup Language (CAML) string
-            that can be used to recursively get all of the items in a list, including
-            the items in the subfolders. */
-        static createAllItemsQuery(): SP.CamlQuery;
-        /** This method creates a Collaborative Application Markup Language (CAML) string
-            that can be used to recursively get all of the folders in a list, including
-            the subfolders. */
-        static createAllFoldersQuery(): SP.CamlQuery;
-        /** Returns true if the query returns dates in Coordinated Universal Time (UTC) format. */
-        get_datesInUtc(): boolean;
-        /** Sets a value that indicates whether the query returns dates in Coordinated Universal Time (UTC) format. */
-        set_datesInUtc(value: boolean): void;
-        /** Server relative URL of a list folder from which results will be returned. */
-        get_folderServerRelativeUrl(): string;
-        /** Sets a value that specifies the server relative URL of a list folder from which results will be returned. */
-        set_folderServerRelativeUrl(value: string): void;
-        get_listItemCollectionPosition(): SP.ListItemCollectionPosition;
-        /** Sets a value that specifies the information required to get the next page of data for the list view. */
-        set_listItemCollectionPosition(value: SP.ListItemCollectionPosition): void;
-        /** Gets value that specifies the XML schema that defines the list view. */
-        get_viewXml(): string;
-        /** Sets value that specifies the XML schema that defines the list view. It must be null, empty, or an XML fragment that conforms to the ViewDefinition type.  */
-        set_viewXml(value: string): void;
-        /** This member is reserved for internal use and is not intended to be used directly from your code. */
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-    }
-    export class Change extends SP.ClientObject {
-        get_changeToken(): SP.ChangeToken;
-        get_changeType(): SP.ChangeType;
-        get_siteId(): SP.Guid;
-        get_time(): Date;
-    }
-    export class ChangeAlert extends SP.Change {
-        get_alertId(): SP.Guid;
-        get_webId(): SP.Guid;
-    }
-    export class ChangeCollection extends SP.ClientObjectCollection<Change> {
-        itemAt(index: number): SP.Change;
-        get_item(index: number): SP.Change;
-    }
-    export class ChangeContentType extends SP.Change {
-        get_contentTypeId(): SP.ContentTypeId;
-        get_webId(): SP.Guid;
-    }
-    export class ChangeField extends SP.Change {
-        get_fieldId(): SP.Guid;
-        get_webId(): SP.Guid;
-    }
-    export class ChangeFile extends SP.Change {
-        get_uniqueId(): SP.Guid;
-        get_webId(): SP.Guid;
-    }
-    export class ChangeFolder extends SP.Change {
-        get_uniqueId(): SP.Guid;
-        get_webId(): SP.Guid;
-    }
-    export class ChangeGroup extends SP.Change {
-        get_groupId(): number;
-    }
-    export class ChangeItem extends SP.Change {
-        get_itemId(): number;
-        get_listId(): SP.Guid;
-        get_webId(): SP.Guid;
-    }
-    export class ChangeList extends SP.Change {
-        get_listId(): SP.Guid;
-        get_webId(): SP.Guid;
-    }
-    export class ChangeLogItemQuery extends SP.ClientValueObject {
-        get_changeToken(): string;
-        set_changeToken(value: string): void;
-        get_contains(): string;
-        set_contains(value: string): void;
-        get_query(): string;
-        set_query(value: string): void;
-        get_queryOptions(): string;
-        set_queryOptions(value: string): void;
-        get_rowLimit(): string;
-        set_rowLimit(value: string): void;
-        get_viewFields(): string;
-        set_viewFields(value: string): void;
-        get_viewName(): string;
-        set_viewName(value: string): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class ChangeQuery extends SP.ClientValueObject {
-        constructor();
-        constructor(allChangeObjectTypes: boolean, allChangeTypes: boolean);
-        get_add(): boolean;
-        set_add(value: boolean): void;
-        get_alert(): boolean;
-        set_alert(value: boolean): void;
-        get_changeTokenEnd(): SP.ChangeToken;
-        set_changeTokenEnd(value: SP.ChangeToken): void;
-        get_changeTokenStart(): SP.ChangeToken;
-        set_changeTokenStart(value: SP.ChangeToken): void;
-        get_contentType(): boolean;
-        set_contentType(value: boolean): void;
-        get_deleteObject(): boolean;
-        set_deleteObject(value: boolean): void;
-        get_field(): boolean;
-        set_field(value: boolean): void;
-        get_file(): boolean;
-        set_file(value: boolean): void;
-        get_folder(): boolean;
-        set_folder(value: boolean): void;
-        get_group(): boolean;
-        set_group(value: boolean): void;
-        get_groupMembershipAdd(): boolean;
-        set_groupMembershipAdd(value: boolean): void;
-        get_groupMembershipDelete(): boolean;
-        set_groupMembershipDelete(value: boolean): void;
-        get_item(): boolean;
-        set_item(value: boolean): void;
-        get_list(): boolean;
-        set_list(value: boolean): void;
-        get_move(): boolean;
-        set_move(value: boolean): void;
-        get_navigation(): boolean;
-        set_navigation(value: boolean): void;
-        get_rename(): boolean;
-        set_rename(value: boolean): void;
-        get_restore(): boolean;
-        set_restore(value: boolean): void;
-        get_roleAssignmentAdd(): boolean;
-        set_roleAssignmentAdd(value: boolean): void;
-        get_roleAssignmentDelete(): boolean;
-        set_roleAssignmentDelete(value: boolean): void;
-        get_roleDefinitionAdd(): boolean;
-        set_roleDefinitionAdd(value: boolean): void;
-        get_roleDefinitionDelete(): boolean;
-        set_roleDefinitionDelete(value: boolean): void;
-        get_roleDefinitionUpdate(): boolean;
-        set_roleDefinitionUpdate(value: boolean): void;
-        get_securityPolicy(): boolean;
-        set_securityPolicy(value: boolean): void;
-        get_site(): boolean;
-        set_site(value: boolean): void;
-        get_systemUpdate(): boolean;
-        set_systemUpdate(value: boolean): void;
-        get_update(): boolean;
-        set_update(value: boolean): void;
-        get_user(): boolean;
-        set_user(value: boolean): void;
-        get_view(): boolean;
-        set_view(value: boolean): void;
-        get_web(): boolean;
-        set_web(value: boolean): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-    }
-    export class ChangeSite extends SP.Change {
-    }
-    export class ChangeToken extends SP.ClientValueObject {
-        get_stringValue(): string;
-        set_stringValue(value: string): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export enum ChangeType {
-        noChange,
-        add,
-        update,
-        deleteObject,
-        rename,
-        moveAway,
-        moveInto,
-        restore,
-        roleAdd,
-        roleDelete,
-        roleUpdate,
-        assignmentAdd,
-        assignmentDelete,
-        memberAdd,
-        memberDelete,
-        systemUpdate,
-        navigation,
-        scopeAdd,
-        scopeDelete,
-        listContentTypeAdd,
-        listContentTypeDelete,
-    }
-    export class ChangeUser extends SP.Change {
-        get_activate(): boolean;
-        get_userId(): number;
-    }
-    export class ChangeView extends SP.Change {
-        get_viewId(): SP.Guid;
-        get_listId(): SP.Guid;
-        get_webId(): SP.Guid;
-    }
-    export class ChangeWeb extends SP.Change {
-        get_webId(): SP.Guid;
-    }
-    export enum CheckinType {
-        minorCheckIn,
-        majorCheckIn,
-        overwriteCheckIn,
-    }
-    export enum CheckOutType {
-        online,
-        offline,
-        none,
-    }
-    export enum ChoiceFormatType {
-        dropdown,
-        radioButtons,
-    }
-    export class CompatibilityRange extends SP.ClientObject {
-    }
-    export class ContentType extends SP.ClientObject {
-        get_description(): string;
-        set_description(value: string): void;
-        get_displayFormTemplateName(): string;
-        set_displayFormTemplateName(value: string): void;
-        get_displayFormUrl(): string;
-        set_displayFormUrl(value: string): void;
-        get_documentTemplate(): string;
-        set_documentTemplate(value: string): void;
-        get_documentTemplateUrl(): string;
-        get_editFormTemplateName(): string;
-        set_editFormTemplateName(value: string): void;
-        get_editFormUrl(): string;
-        set_editFormUrl(value: string): void;
-        get_fieldLinks(): SP.FieldLinkCollection;
-        get_fields(): SP.FieldCollection;
-        get_group(): string;
-        set_group(value: string): void;
-        get_hidden(): boolean;
-        set_hidden(value: boolean): void;
-        get_id(): SP.ContentTypeId;
-        get_jsLink(): string;
-        set_jsLink(value: string): void;
-        get_name(): string;
-        set_name(value: string): void;
-        get_newFormTemplateName(): string;
-        set_newFormTemplateName(value: string): void;
-        get_newFormUrl(): string;
-        set_newFormUrl(value: string): void;
-        get_parent(): SP.ContentType;
-        get_readOnly(): boolean;
-        set_readOnly(value: boolean): void;
-        get_schemaXml(): string;
-        get_schemaXmlWithResourceTokens(): string;
-        set_schemaXmlWithResourceTokens(value: string): void;
-        get_scope(): string;
-        get_sealed(): boolean;
-        set_sealed(value: boolean): void;
-        get_stringId(): string;
-        get_workflowAssociations(): SP.Workflow.WorkflowAssociationCollection;
-        update(updateChildren: boolean): void;
-        deleteObject(): void;
-    }
-    export class ContentTypeCollection extends SP.ClientObjectCollection<ContentType> {
-        itemAt(index: number): SP.ContentType;
-        get_item(index: number): SP.ContentType;
-        getById(contentTypeId: string): SP.ContentType;
-        addExistingContentType(contentType: SP.ContentType): SP.ContentType;
-        add(parameters: SP.ContentTypeCreationInformation): SP.ContentType;
-    }
-    export class ContentTypeCreationInformation extends SP.ClientValueObject {
-        get_description(): string;
-        set_description(value: string): void;
-        get_group(): string;
-        set_group(value: string): void;
-        get_name(): string;
-        set_name(value: string): void;
-        get_parentContentType(): SP.ContentType;
-        set_parentContentType(value: SP.ContentType): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class ContentTypeId extends SP.ClientValueObject {
-        toString(): string;
-        get_stringValue(): string;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export enum CustomizedPageStatus {
-        none,
-        uncustomized,
-        customized,
-    }
-    export enum DateTimeFieldFormatType {
-        dateOnly,
-        dateTime,
-    }
-    export enum DateTimeFieldFriendlyFormatType {
-        unspecified,
-        disabled,
-        relative,
-    }
-    export enum DraftVisibilityType {
-        reader,
-        author,
-        approver,
-    }
-    export class EventReceiverDefinition extends SP.ClientObject {
-        get_receiverAssembly(): string;
-        get_receiverClass(): string;
-        get_receiverId(): SP.Guid;
-        get_receiverName(): string;
-        get_sequenceNumber(): number;
-        get_synchronization(): SP.EventReceiverSynchronization;
-        get_eventType(): SP.EventReceiverType;
-        get_receiverUrl(): string;
-        update(): void;
-        deleteObject(): void;
-    }
-    export class EventReceiverDefinitionCollection extends SP.ClientObjectCollection<EventReceiverDefinition> {
-        itemAt(index: number): SP.EventReceiverDefinition;
-        get_item(index: number): SP.EventReceiverDefinition;
-        getById(eventReceiverId: SP.Guid): SP.EventReceiverDefinition;
-        add(eventReceiverCreationInformation: SP.EventReceiverDefinitionCreationInformation): SP.EventReceiverDefinition;
-    }
-    export class EventReceiverDefinitionCreationInformation extends SP.ClientValueObject {
-        get_receiverAssembly(): string;
-        set_receiverAssembly(value: string): void;
-        get_receiverClass(): string;
-        set_receiverClass(value: string): void;
-        get_receiverName(): string;
-        set_receiverName(value: string): void;
-        get_sequenceNumber(): number;
-        set_sequenceNumber(value: number): void;
-        get_synchronization(): SP.EventReceiverSynchronization;
-        set_synchronization(value: SP.EventReceiverSynchronization): void;
-        get_eventType(): SP.EventReceiverType;
-        set_eventType(value: SP.EventReceiverType): void;
-        get_receiverUrl(): string;
-        set_receiverUrl(value: string): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export enum EventReceiverSynchronization {
-        defaultSynchronization,
-        synchronous,
-        asynchronous,
-    }
-    export enum EventReceiverType {
-        invalidReceiver,
-        itemAdding,
-        itemUpdating,
-        itemDeleting,
-        itemCheckingIn,
-        itemCheckingOut,
-        itemUncheckingOut,
-        itemAttachmentAdding,
-        itemAttachmentDeleting,
-        itemFileMoving,
-        itemVersionDeleting,
-        fieldAdding,
-        fieldUpdating,
-        fieldDeleting,
-        listAdding,
-        listDeleting,
-        siteDeleting,
-        webDeleting,
-        webMoving,
-        webAdding,
-        groupAdding,
-        groupUpdating,
-        groupDeleting,
-        groupUserAdding,
-        groupUserDeleting,
-        roleDefinitionAdding,
-        roleDefinitionUpdating,
-        roleDefinitionDeleting,
-        roleAssignmentAdding,
-        roleAssignmentDeleting,
-        inheritanceBreaking,
-        inheritanceResetting,
-        workflowStarting,
-        itemAdded,
-        itemUpdated,
-        itemDeleted,
-        itemCheckedIn,
-        itemCheckedOut,
-        itemUncheckedOut,
-        itemAttachmentAdded,
-        itemAttachmentDeleted,
-        itemFileMoved,
-        itemFileConverted,
-        itemVersionDeleted,
-        fieldAdded,
-        fieldUpdated,
-        fieldDeleted,
-        listAdded,
-        listDeleted,
-        siteDeleted,
-        webDeleted,
-        webMoved,
-        webProvisioned,
-        groupAdded,
-        groupUpdated,
-        groupDeleted,
-        groupUserAdded,
-        groupUserDeleted,
-        roleDefinitionAdded,
-        roleDefinitionUpdated,
-        roleDefinitionDeleted,
-        roleAssignmentAdded,
-        roleAssignmentDeleted,
-        inheritanceBroken,
-        inheritanceReset,
-        workflowStarted,
-        workflowPostponed,
-        workflowCompleted,
-        entityInstanceAdded,
-        entityInstanceUpdated,
-        entityInstanceDeleted,
-        appInstalled,
-        appUpgraded,
-        appUninstalling,
-        emailReceived,
-        contextEvent,
-    }
-    export class Feature extends SP.ClientObject {
-        get_definitionId(): SP.Guid;
-    }
-    export class FeatureCollection extends SP.ClientObjectCollection<Feature> {
-        itemAt(index: number): SP.Feature;
-        get_item(index: number): SP.Feature;
-        getById(featureId: SP.Guid): SP.Feature;
-        add(featureId: SP.Guid, force: boolean, featdefScope: SP.FeatureDefinitionScope): SP.Feature;
-        remove(featureId: SP.Guid, force: boolean): void;
-    }
-    export enum FeatureDefinitionScope {
-        none,
-        farm,
-        site,
-        web,
-    }
-    export class Field extends SP.ClientObject {
-        get_canBeDeleted(): boolean;
-        get_defaultValue(): string;
-        set_defaultValue(value: string): void;
-        get_description(): string;
-        set_description(value: string): void;
-        get_direction(): string;
-        set_direction(value: string): void;
-        get_enforceUniqueValues(): boolean;
-        set_enforceUniqueValues(value: boolean): void;
-        get_entityPropertyName(): string;
-        get_filterable(): boolean;
-        get_fromBaseType(): boolean;
-        get_group(): string;
-        set_group(value: string): void;
-        get_hidden(): boolean;
-        set_hidden(value: boolean): void;
-        get_id(): SP.Guid;
-        get_indexed(): boolean;
-        set_indexed(value: boolean): void;
-        get_internalName(): string;
-        get_jsLink(): string;
-        set_jsLink(value: string): void;
-        get_readOnlyField(): boolean;
-        set_readOnlyField(value: boolean): void;
-        get_required(): boolean;
-        set_required(value: boolean): void;
-        get_schemaXml(): string;
-        set_schemaXml(value: string): void;
-        get_schemaXmlWithResourceTokens(): string;
-        get_scope(): string;
-        get_sealed(): boolean;
-        get_sortable(): boolean;
-        get_staticName(): string;
-        set_staticName(value: string): void;
-        get_title(): string;
-        set_title(value: string): void;
-        get_fieldTypeKind(): SP.FieldType;
-        set_fieldTypeKind(value: SP.FieldType): void;
-        get_typeAsString(): string;
-        set_typeAsString(value: string): void;
-        get_typeDisplayName(): string;
-        get_typeShortDescription(): string;
-        get_validationFormula(): string;
-        set_validationFormula(value: string): void;
-        get_validationMessage(): string;
-        set_validationMessage(value: string): void;
-        validateSetValue(item: SP.ListItem, value: string): void;
-        updateAndPushChanges(pushChangesToLists: boolean): void;
-        update(): void;
-        deleteObject(): void;
-        setShowInDisplayForm(value: boolean): void;
-        setShowInEditForm(value: boolean): void;
-        setShowInNewForm(value: boolean): void;
-    }
-    export class FieldCalculated extends SP.Field {
-        get_dateFormat(): SP.DateTimeFieldFormatType;
-        set_dateFormat(value: SP.DateTimeFieldFormatType): void;
-        get_formula(): string;
-        set_formula(value: string): void;
-        get_outputType(): SP.FieldType;
-        set_outputType(value: SP.FieldType): void;
-    }
-    export class FieldCalculatedErrorValue extends SP.ClientValueObject {
-        get_errorMessage(): string;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class FieldMultiChoice extends SP.Field {
-        get_fillInChoice(): boolean;
-        set_fillInChoice(value: boolean): void;
-        get_mappings(): string;
-        get_choices(): string[];
-        set_choices(value: string[]): void;
-    }
-    export class FieldChoice extends SP.FieldMultiChoice {
-        get_editFormat(): SP.ChoiceFormatType;
-        set_editFormat(value: SP.ChoiceFormatType): void;
-    }
-    export class FieldCollection extends SP.ClientObjectCollection<Field> {
-        itemAt(index: number): SP.Field;
-        get_item(index: number): SP.Field;
-        get_schemaXml(): string;
-        getByTitle(title: string): SP.Field;
-        getById(id: SP.Guid): SP.Field;
-        add(field: SP.Field): SP.Field;
-        addDependentLookup(displayName: string, primaryLookupField: SP.Field, lookupField: string): SP.Field;
-        addFieldAsXml(schemaXml: string, addToDefaultView: boolean, options: SP.AddFieldOptions): SP.Field;
-        getByInternalNameOrTitle(strName: string): SP.Field;
-    }
-    export class FieldComputed extends SP.Field {
-        get_enableLookup(): boolean;
-        set_enableLookup(value: boolean): void;
-    }
-    export class FieldNumber extends SP.Field {
-        get_maximumValue(): number;
-        set_maximumValue(value: number): void;
-        get_minimumValue(): number;
-        set_minimumValue(value: number): void;
-    }
-    export class FieldCurrency extends SP.FieldNumber {
-        get_currencyLocaleId(): number;
-        set_currencyLocaleId(value: number): void;
-    }
-    export class FieldDateTime extends SP.Field {
-        get_dateTimeCalendarType(): SP.CalendarType;
-        set_dateTimeCalendarType(value: SP.CalendarType): void;
-        get_displayFormat(): SP.DateTimeFieldFormatType;
-        set_displayFormat(value: SP.DateTimeFieldFormatType): void;
-        get_friendlyDisplayFormat(): SP.DateTimeFieldFriendlyFormatType;
-        set_friendlyDisplayFormat(value: SP.DateTimeFieldFriendlyFormatType): void;
-    }
-    export class FieldGeolocation extends SP.Field {
-    }
-    export class FieldGeolocationValue extends SP.ClientValueObject {
-        get_altitude(): number;
-        set_altitude(value: number): void;
-        get_latitude(): number;
-        set_latitude(value: number): void;
-        get_longitude(): number;
-        set_longitude(value: number): void;
-        get_measure(): number;
-        set_measure(value: number): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class FieldGuid extends SP.Field {
-    }
-    export class FieldLink extends SP.ClientObject {
-        get_hidden(): boolean;
-        set_hidden(value: boolean): void;
-        get_id(): SP.Guid;
-        get_name(): string;
-        get_required(): boolean;
-        set_required(value: boolean): void;
-        deleteObject(): void;
-    }
-    export class FieldLinkCollection extends SP.ClientObjectCollection<FieldLink> {
-        itemAt(index: number): SP.FieldLink;
-        get_item(index: number): SP.FieldLink;
-        getById(id: SP.Guid): SP.FieldLink;
-        add(parameters: SP.FieldLinkCreationInformation): SP.FieldLink;
-        reorder(internalNames: string[]): void;
-    }
-    export class FieldLinkCreationInformation extends SP.ClientValueObject {
-        get_field(): SP.Field;
-        set_field(value: SP.Field): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class FieldLookup extends SP.Field {
-        get_allowMultipleValues(): boolean;
-        set_allowMultipleValues(value: boolean): void;
-        get_isRelationship(): boolean;
-        set_isRelationship(value: boolean): void;
-        get_lookupField(): string;
-        set_lookupField(value: string): void;
-        get_lookupList(): string;
-        set_lookupList(value: string): void;
-        get_lookupWebId(): SP.Guid;
-        set_lookupWebId(value: SP.Guid): void;
-        get_primaryFieldId(): string;
-        set_primaryFieldId(value: string): void;
-        get_relationshipDeleteBehavior(): SP.RelationshipDeleteBehaviorType;
-        set_relationshipDeleteBehavior(value: SP.RelationshipDeleteBehaviorType): void;
-    }
-    export class FieldLookupValue extends SP.ClientValueObject {
-        get_lookupId(): number;
-        set_lookupId(value: number): void;
-        get_lookupValue(): string;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class FieldMultiLineText extends SP.Field {
-        get_allowHyperlink(): boolean;
-        set_allowHyperlink(value: boolean): void;
-        get_appendOnly(): boolean;
-        set_appendOnly(value: boolean): void;
-        get_numberOfLines(): number;
-        set_numberOfLines(value: number): void;
-        get_restrictedMode(): boolean;
-        set_restrictedMode(value: boolean): void;
-        get_richText(): boolean;
-        set_richText(value: boolean): void;
-        get_wikiLinking(): boolean;
-    }
-    export class FieldRatingScale extends SP.FieldMultiChoice {
-        get_gridEndNumber(): number;
-        set_gridEndNumber(value: number): void;
-        get_gridNAOptionText(): string;
-        set_gridNAOptionText(value: string): void;
-        get_gridStartNumber(): number;
-        set_gridStartNumber(value: number): void;
-        get_gridTextRangeAverage(): string;
-        set_gridTextRangeAverage(value: string): void;
-        get_gridTextRangeHigh(): string;
-        set_gridTextRangeHigh(value: string): void;
-        get_gridTextRangeLow(): string;
-        set_gridTextRangeLow(value: string): void;
-        get_rangeCount(): number;
-    }
-    export class FieldRatingScaleQuestionAnswer extends SP.ClientValueObject {
-        get_answer(): number;
-        set_answer(value: number): void;
-        get_question(): string;
-        set_question(value: string): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class FieldStringValues extends SP.ClientObject {
-        get_fieldValues(): any;
-        get_item(fieldName: string): string;
-        refreshLoad(): void;
-    }
-    export class FieldText extends SP.Field {
-        get_maxLength(): number;
-        set_maxLength(value: number): void;
-    }
-    export enum FieldType {
-        invalid,
-        integer,
-        text,
-        note,
-        dateTime,
-        counter,
-        choice,
-        lookup,
-        boolean,
-        number,
-        currency,
-        URL,
-        computed,
-        threading,
-        guid,
-        multiChoice,
-        gridChoice,
-        calculated,
-        file,
-        attachments,
-        user,
-        recurrence,
-        crossProjectLink,
-        modStat,
-        error,
-        contentTypeId,
-        pageSeparator,
-        threadIndex,
-        workflowStatus,
-        allDayEvent,
-        workflowEventType,
-        geolocation,
-        outcomeChoice,
-        maxItems,
-    }
-    export class FieldUrl extends SP.Field {
-        get_displayFormat(): SP.UrlFieldFormatType;
-        set_displayFormat(value: SP.UrlFieldFormatType): void;
-    }
-    export class FieldUrlValue extends SP.ClientValueObject {
-        get_description(): string;
-        set_description(value: string): void;
-        get_url(): string;
-        set_url(value: string): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class FieldUser extends SP.FieldLookup {
-        get_allowDisplay(): boolean;
-        set_allowDisplay(value: boolean): void;
-        get_presence(): boolean;
-        set_presence(value: boolean): void;
-        get_selectionGroup(): number;
-        set_selectionGroup(value: number): void;
-        get_selectionMode(): SP.FieldUserSelectionMode;
-        set_selectionMode(value: SP.FieldUserSelectionMode): void;
-    }
-    export enum FieldUserSelectionMode {
-        peopleOnly,
-        peopleAndGroups,
-    }
-    export class FieldUserValue extends SP.FieldLookupValue {
-        static fromUser(userName: string): SP.FieldUserValue;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    /** Represents a file in a SharePoint Web site that can be a Web Part Page, an item in a document library, or a file in a folder. */
-    export class File extends SP.ClientObject {
-        get_author(): SP.User;
-        /** Returns the user who has checked out the file. */
-        get_checkedOutByUser(): SP.User;
-        /** Returns the comment that was specified when the document was checked into the document library. */
-        get_checkInComment(): string;
-        /** The type of checkout that exists on the document. */
-        get_checkOutType(): SP.CheckOutType;
-        get_contentTag(): string;
-        /** Gets the customization(ghost) status of the SPFile. */
-        get_customizedPageStatus(): SP.CustomizedPageStatus;
-        /** Gets the ETag of the file  */
-        get_eTag(): string;
-        /** Specifies whether the file exists  */
-        get_exists(): boolean;
-        get_length(): number;
-        get_level(): SP.FileLevel;
-        /** Specifies the SPListItem corresponding to this file if this file belongs to a doclib. Values for all fields are returned also. */
-        get_listItemAllFields(): SP.ListItem;
-        /** Returns the user that owns the current lock on the file. MUST return null if there is no lock. */
-        get_lockedByUser(): SP.User;
-        /** Specifies the major version of the file. */
-        get_majorVersion(): number;
-        /** Specifies the minor version of the file. */
-        get_minorVersion(): number;
-        get_modifiedBy(): SP.User;
-        get_name(): string;
-        get_serverRelativeUrl(): string;
-        /** Specifies when the file was created. */
-        get_timeCreated(): Date;
-        /** Specifies when the file was created. */
-        get_timeLastModified(): Date;
-        get_title(): string;
-        /** Specifies the implementation-specific version identifier of the file. */
-        get_uIVersion(): number;
-        /** Specifies the implementation-specific version identifier of the file. */
-        get_uIVersionLabel(): string;
-        /** Returns a collection of file version objects that represent the versions of the file. */
-        get_versions(): SP.FileVersionCollection;
-        /** Reverts an existing online or offline checkout for the file. */
-        undoCheckOut(): void;
-        checkIn(comment: string, checkInType: SP.CheckinType): void;
-        publish(comment: string): void;
-        /** Removes the file from content approval with the specified comment. */
-        unPublish(comment: string): void;
-        /** Approves the file submitted for content approval with the specified comment.  */
-        approve(comment: string): void;
-        /** Denies the file submitted for content approval. */
-        deny(comment: string): void;
-        static getContentVerFromTag(context: SP.ClientRuntimeContext, contentTag: string): SP.IntResult;
-        getLimitedWebPartManager(scope: SP.WebParts.PersonalizationScope): SP.WebParts.LimitedWebPartManager;
-        moveTo(newUrl: string, flags: SP.MoveOperations): void;
-        copyTo(strNewUrl: string, bOverWrite: boolean): void;
-        saveBinary(parameters: SP.FileSaveBinaryInformation): void;
-        deleteObject(): void;
-        /** Moves the file to the recycle bin. MUST return the identifier of the new Recycle Bin item */
-        recycle(): SP.GuidResult;
-        checkOut(): void;
-    }
-    export class FileCollection extends SP.ClientObjectCollection<File> {
-        itemAt(index: number): SP.File;
-        get_item(index: number): SP.File;
-        getByUrl(url: string): SP.File;
-        add(parameters: SP.FileCreationInformation): SP.File;
-        addTemplateFile(urlOfFile: string, templateFileType: SP.TemplateFileType): SP.File;
-    }
-    export class FileCreationInformation extends SP.ClientValueObject {
-        get_content(): SP.Base64EncodedByteArray;
-        set_content(value: SP.Base64EncodedByteArray): void;
-        get_overwrite(): boolean;
-        set_overwrite(value: boolean): void;
-        get_url(): string;
-        set_url(value: string): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export enum FileLevel {
-        published,
-        draft,
-        checkout,
-    }
-    export class FileSaveBinaryInformation extends SP.ClientValueObject {
-        get_checkRequiredFields(): boolean;
-        set_checkRequiredFields(value: boolean): void;
-        get_content(): SP.Base64EncodedByteArray;
-        set_content(value: SP.Base64EncodedByteArray): void;
-        get_eTag(): string;
-        set_eTag(value: string): void;
-        get_fieldValues(): any;
-        set_fieldValues(value: any): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export enum FileSystemObjectType {
-        invalid,
-        file,
-        folder,
-        web,
-    }
-    export class FileVersion extends SP.ClientObject {
-        get_checkInComment(): string;
-        get_created(): Date;
-        get_createdBy(): SP.User;
-        get_iD(): number;
-        get_isCurrentVersion(): boolean;
-        get_size(): number;
-        get_url(): string;
-        get_versionLabel(): string;
-        deleteObject(): void;
-    }
-    export class FileVersionCollection extends SP.ClientObjectCollection<FileVersion> {
-        itemAt(index: number): SP.FileVersion;
-        get_item(index: number): SP.FileVersion;
-        getById(versionid: number): SP.FileVersion;
-        deleteByID(vid: number): void;
-        deleteByLabel(versionlabel: string): void;
-        deleteAll(): void;
-        restoreByLabel(versionlabel: string): void;
-    }
-    export class Folder extends SP.ClientObject {
-        get_contentTypeOrder(): SP.ContentTypeId[];
-        get_files(): SP.FileCollection;
-        get_listItemAllFields(): SP.ListItem;
-        get_itemCount(): number;
-        get_name(): string;
-        get_parentFolder(): SP.Folder;
-        get_properties(): SP.PropertyValues;
-        get_serverRelativeUrl(): string;
-        get_folders(): SP.FolderCollection;
-        get_uniqueContentTypeOrder(): SP.ContentTypeId[];
-        set_uniqueContentTypeOrder(value: SP.ContentTypeId[]): void;
-        get_welcomePage(): string;
-        set_welcomePage(value: string): void;
-        update(): void;
-        deleteObject(): void;
-        recycle(): SP.GuidResult;
-    }
-    export class FolderCollection extends SP.ClientObjectCollection<Folder> {
-        itemAt(index: number): SP.Folder;
-        get_item(index: number): SP.Folder;
-        getByUrl(url: string): SP.Folder;
-        add(url: string): SP.Folder;
-    }
-    export class Form extends SP.ClientObject {
-        get_id(): SP.Guid;
-        get_serverRelativeUrl(): string;
-        get_formType(): SP.PageType;
-    }
-    export class FormCollection extends SP.ClientObjectCollection<Form> {
-        itemAt(index: number): SP.Form;
-        get_item(index: number): SP.Form;
-        getByPageType(formType: SP.PageType): SP.Form;
-        getById(id: SP.Guid): SP.Form;
-    }
-    export class Principal extends SP.ClientObject {
-        get_id(): number;
-        get_isHiddenInUI(): boolean;
-        get_loginName(): string;
-        get_title(): string;
-        set_title(value: string): void;
-        get_principalType(): SP.Utilities.PrincipalType;
-    }
-    export class Group extends SP.Principal {
-        get_allowMembersEditMembership(): boolean;
-        set_allowMembersEditMembership(value: boolean): void;
-        get_allowRequestToJoinLeave(): boolean;
-        set_allowRequestToJoinLeave(value: boolean): void;
-        get_autoAcceptRequestToJoinLeave(): boolean;
-        set_autoAcceptRequestToJoinLeave(value: boolean): void;
-        get_canCurrentUserEditMembership(): boolean;
-        get_canCurrentUserManageGroup(): boolean;
-        get_canCurrentUserViewMembership(): boolean;
-        get_description(): string;
-        set_description(value: string): void;
-        get_onlyAllowMembersViewMembership(): boolean;
-        set_onlyAllowMembersViewMembership(value: boolean): void;
-        get_owner(): SP.Principal;
-        set_owner(value: SP.Principal): void;
-        get_ownerTitle(): string;
-        get_requestToJoinLeaveEmailSetting(): string;
-        set_requestToJoinLeaveEmailSetting(value: string): void;
-        get_users(): SP.UserCollection;
-        update(): void;
-    }
-    export class GroupCollection extends SP.ClientObjectCollection<Group> {
-        itemAt(index: number): SP.Group;
-        get_item(index: number): SP.Group;
-        getByName(name: string): SP.Group;
-        getById(id: number): SP.Group;
-        add(parameters: SP.GroupCreationInformation): SP.Group;
-        removeByLoginName(loginName: string): void;
-        removeById(id: number): void;
-        remove(group: SP.Group): void;
-    }
-    export class GroupCreationInformation extends SP.ClientValueObject {
-        get_description(): string;
-        set_description(value: string): void;
-        get_title(): string;
-        set_title(value: string): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class InformationRightsManagementSettings extends SP.ClientObject {
-        get_allowPrint(): boolean;
-        set_allowPrint(value: boolean): void;
-        get_allowScript(): boolean;
-        set_allowScript(value: boolean): void;
-        get_allowWriteCopy(): boolean;
-        set_allowWriteCopy(value: boolean): void;
-        get_disableDocumentBrowserView(): boolean;
-        set_disableDocumentBrowserView(value: boolean): void;
-        get_documentAccessExpireDays(): number;
-        set_documentAccessExpireDays(value: number): void;
-        get_documentLibraryProtectionExpireDate(): Date;
-        set_documentLibraryProtectionExpireDate(value: Date): void;
-        get_enableDocumentAccessExpire(): boolean;
-        set_enableDocumentAccessExpire(value: boolean): void;
-        get_enableDocumentBrowserPublishingView(): boolean;
-        set_enableDocumentBrowserPublishingView(value: boolean): void;
-        get_enableGroupProtection(): boolean;
-        set_enableGroupProtection(value: boolean): void;
-        get_enableLicenseCacheExpire(): boolean;
-        set_enableLicenseCacheExpire(value: boolean): void;
-        get_groupName(): string;
-        set_groupName(value: string): void;
-        get_licenseCacheExpireDays(): number;
-        set_licenseCacheExpireDays(value: number): void;
-        get_policyDescription(): string;
-        set_policyDescription(value: string): void;
-        get_policyTitle(): string;
-        set_policyTitle(value: string): void;
-        reset(): void;
-        update(): void;
-    }
-    export class Language extends SP.ClientValueObject {
-        get_displayName(): string;
-        get_languageTag(): string;
-        get_lcid(): number;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class SecurableObject extends SP.ClientObject {
-        get_firstUniqueAncestorSecurableObject(): SP.SecurableObject;
-        get_hasUniqueRoleAssignments(): boolean;
-        get_roleAssignments(): SP.RoleAssignmentCollection;
-        resetRoleInheritance(): void;
-        breakRoleInheritance(copyRoleAssignments: boolean, clearSubscopes: boolean): void;
-    }
-    /** Represents display mode for a control or form */
-    export enum ControlMode {
-        invalid,
-        displayMode,
-        editMode,
-        newMode
-    }
-    /** Represents a list on a SharePoint Web site. */
-    export class List extends SP.SecurableObject {
-        /** Gets item by id. */
-        getItemById(id: number): SP.ListItem;
-        /** Gets a value that specifies whether the list supports content types. */
-        get_allowContentTypes(): boolean;
-        /** Gets the list definition type on which the list is based. For lists based on OOTB list definitions, return value corresponds the SP.ListTemplateType enumeration. */
-        get_baseTemplate(): number;
-        /** Gets base type for the list. */
-        get_baseType(): SP.BaseType;
-        /** Gets a value that specifies the override of the web application�s BrowserFileHandling property at the list level. */
-        get_browserFileHandling(): SP.BrowserFileHandling;
-        /** Gets the content types that are associated with the list. */
-        get_contentTypes(): SP.ContentTypeCollection;
-        /** Gets a value that specifies whether content types are enabled for the list. */
-        get_contentTypesEnabled(): boolean;
-        /** Sets a value that specifies whether content types are enabled for the list. */
-        set_contentTypesEnabled(value: boolean): void;
-        /** Gets a value that specifies when the list was created. */
-        get_created(): Date;
-        /** Gets the data source associated with the list, or null if the list is not a virtual list. */
-        get_dataSource(): SP.ListDataSource;
-        /** Gets a value that specifies the default workflow identifier for content approval on the list. */
-        get_defaultContentApprovalWorkflowId(): SP.Guid;
-        /** Sets a value that specifies the default workflow identifier for content approval on the list. */
-        set_defaultContentApprovalWorkflowId(value: SP.Guid): void;
-        /** Gets a value that specifies the location of the default display form for the list. */
-        get_defaultDisplayFormUrl(): string;
-        /** Sets a value that specifies the location of the default display form for the list. */
-        set_defaultDisplayFormUrl(value: string): void;
-        /** Gets a value that specifies the URL of the edit form to use for list items in the list. */
-        get_defaultEditFormUrl(): string;
-        /** Sets a value that specifies the URL of the edit form to use for list items in the list. */
-        set_defaultEditFormUrl(value: string): void;
-        /** Gets a value that specifies the location of the default new form for the list. */
-        get_defaultNewFormUrl(): string;
-        /** Sets a value that specifies the location of the default new form for the list. */
-        set_defaultNewFormUrl(value: string): void;
-        /** Gets default view for the list. */
-        get_defaultView(): SP.View;
-        /** Get URL of the default view for the list. */
-        get_defaultViewUrl(): string;
-        /** Gets a value that specifies the description of the list. */
-        get_description(): string;
-        /** Sets a value that specifies the description of the list. */
-        set_description(value: string): void;
-        /** Gets a value that specifies the reading order of the list. */
-        get_direction(): string;
-        /** Sets a value that specifies the reading order of the list. */
-        set_direction(value: string): void;
-        /** Gets a value that specifies the server-relative URL of the document template for the list */
-        get_documentTemplateUrl(): string;
-        /** Sets a value that specifies the server-relative URL of the document template for the list */
-        set_documentTemplateUrl(value: string): void;
-        /** Gets a value that specifies the minimum permission required to view minor versions and drafts within the list. */
-        get_draftVersionVisibility(): SP.DraftVisibilityType;
-        /** Sets a value that specifies the minimum permission required to view minor versions and drafts within the list. */
-        set_draftVersionVisibility(value: SP.DraftVisibilityType): void;
-        /** Gets a value that specifies the effective permissions on the list that are assigned to the current user. */
-        get_effectiveBasePermissions(): SP.BasePermissions;
-        /** Gets the effective base permissions for the current user, as they should be displayed in UI. This will only differ from EffectiveBasePermissions if ReadOnlyUI is set to true, and in all cases will be a subset of EffectiveBasePermissions. To put it another way, EffectiveBasePermissionsForUI will always be as or more restrictive than EffectiveBasePermissions. */
-        get_effectiveBasePermissionsForUI(): SP.BasePermissions;
-        /** Gets a value that specifies whether list item attachments are enabled for the list. */
-        get_enableAttachments(): boolean;
-        /** Sets a value that specifies whether list item attachments are enabled for the list. */
-        set_enableAttachments(value: boolean): void;
-        /** Gets a value that specifies whether new list folders can be added to the list. */
-        get_enableFolderCreation(): boolean;
-        /** Sets a value that specifies whether new list folders can be added to the list. */
-        set_enableFolderCreation(value: boolean): void;
-        /** Gets a value that specifies whether minor versions are enabled for the list. */
-        get_enableMinorVersions(): boolean;
-        /** Sets a value that specifies whether minor versions are enabled for the list. */
-        set_enableMinorVersions(value: boolean): void;
-        /** Gets a value that specifies whether content approval is enabled for the list. */
-        get_enableModeration(): boolean;
-        /** Sets a value that specifies whether content approval is enabled for the list */
-        set_enableModeration(value: boolean): void;
-        /** Gets a value that specifies whether historical versions of list items and documents can be created in the list */
-        get_enableVersioning(): boolean;
-        /** Sets a value that specifies whether historical versions of list items and documents can be created in the list */
-        set_enableVersioning(value: boolean): void;
-        /** The entity type name. */
-        get_entityTypeName(): string;
-        /** Gets collection of event receiver objects associated with the list. */
-        get_eventReceivers(): SP.EventReceiverDefinitionCollection;
-        /** Gets a value that specifies the collection of all fields in the list. */
-        get_fields(): SP.FieldCollection;
-        /** Gets a value that indicates whether forced checkout is enabled for the document library. */
-        get_forceCheckout(): boolean;
-        /** Sets a value that indicates whether forced checkout is enabled for the document library */
-        set_forceCheckout(value: boolean): void;
-        /** Gets collections of forms associated with the list. */
-        get_forms(): SP.FormCollection;
-        /** Returns true if this is external list. */
-        get_hasExternalDataSource(): boolean;
-        /** Gets wherever the list is hidden */
-        get_hidden(): boolean;
-        /** Sets if the list is hidden from "All site contents" or not. */
-        set_hidden(value: boolean): void;
-        /** Gets id of the list */
-        get_id(): SP.Guid;
-        /** Gets a value that specifies the URI for the icon of the list */
-        get_imageUrl(): string;
-        /** Sets a value that specifies the URI for the icon of the list */
-        set_imageUrl(value: string): void;
-        /** Settings of document library Information Rights Management (IRM)  */
-        get_informationRightsManagementSettings(): SP.InformationRightsManagementSettings;
-        /** Gets a value that specifies whether Information Rights Management (IRM) is enabled for the list.  */
-        get_irmEnabled(): boolean;
-        /** Sets a value that specifies whether Information Rights Management (IRM) is enabled for the list.  */
-        set_irmEnabled(value: boolean): void;
-        /** Gets a value that specifies whether Information Rights Management (IRM) expiration is enabled for the list.  */
-        get_irmExpire(): boolean;
-        /** Sets a value that specifies whether Information Rights Management (IRM) expiration is enabled for the list.  */
-        set_irmExpire(value: boolean): void;
-        /** Gets a value that specifies whether Information Rights Management (IRM) rejection is enabled for the list.  */
-        get_irmReject(): boolean;
-        /** Sets a value that specifies whether Information Rights Management (IRM) rejection is enabled for the list.  */
-        set_irmReject(value: boolean): void;
-        /** Indicates whether this list should be treated as a top level navigation object or not.  */
-        get_isApplicationList(): boolean;
-        /** Sets a value that indicates whether this list should be treated as a top level navigation object or not.  */
-        set_isApplicationList(value: boolean): void;
-        /** Gets a value that specifies whether the list is a gallery. */
-        get_isCatalog(): boolean;
-        /** Gets a value that indicates whether the document library is a private list with restricted permissions, such as for Solutions.  */
-        get_isPrivate(): boolean;
-        /** Gets a value that indicates whether the list is designated as a default asset location for images or other files which the users upload to their wiki pages. */
-        get_isSiteAssetsLibrary(): boolean;
-        /** Gets a value that specifies the number of list items in the list */
-        get_itemCount(): number;
-        /** Gets a value that specifies the last time a list item was deleted from the list. */
-        get_lastItemDeletedDate(): Date;
-        /** Gets a value that specifies the last time a list item, field, or property of the list was modified. */
-        get_lastItemModifiedDate(): Date;
-        /** Sets a value that specifies the last time the list was modified. */
-        set_lastItemModifiedDate(value: Date): void;
-        /** The entity type full name of the list item in the list. */
-        get_listItemEntityTypeFullName(): string;
-        /** Gets a value that indicates whether the list in a Meeting Workspace site contains data for multiple meeting instances within the site */
-        get_multipleDataList(): boolean;
-        /** Sets a value that indicates whether the list in a Meeting Workspace site contains data for multiple meeting instances within the site */
-        set_multipleDataList(value: boolean): void;
-        /** Gets a value that specifies that the crawler must not crawl the list */
-        get_noCrawl(): boolean;
-        /** Sets a value that specifies that the crawler must not crawl the list */
-        set_noCrawl(value: boolean): void;
-        /** Gets a value that specifies whether the list appears on the Quick Launch of the site */
-        get_onQuickLaunch(): boolean;
-        /** Sets a value that specifies whether the list appears on the Quick Launch of the site */
-        set_onQuickLaunch(value: boolean): void;
-        /** Gets a value that specifies the site that contains the list. */
-        get_parentWeb(): SP.Web;
-        /** Gets a value that specifies the server-relative URL of the site that contains the list. */
-        get_parentWebUrl(): string;
-        /** Gets the root folder that contains the files in the list and any related files. */
-        get_rootFolder(): SP.Folder;
-        /** Gets a value that specifies the list schema of the list. */
-        get_schemaXml(): string;
-        /** Gets a value that indicates whether folders can be created within the list. */
-        get_serverTemplateCanCreateFolders(): boolean;
-        /** Gets a value that specifies the feature identifier of the feature that contains the list schema for the list. */
-        get_templateFeatureId(): SP.Guid;
-        /** Gets the list title. You can determine list URL from it's root folder URL. */
-        get_title(): string;
-        /** Sets the list title. To change list URL you should change name of the root folder. */
-        set_title(value: string): void;
-        /** Gets collection of custom actions associated with the list. */
-        get_userCustomActions(): SP.UserCustomActionCollection;
-        /** Gets a value that specifies the data validation criteria for a list item. */
-        get_validationFormula(): string;
-        /** Sets a value that specifies the data validation criteria for a list item. */
-        set_validationFormula(value: string): void;
-        /** Gets a value that specifies the error message returned when data validation fails for a list item. */
-        get_validationMessage(): string;
-        /** Sets a value that specifies the error message returned when data validation fails for a list item. */
-        set_validationMessage(value: string): void;
-        /** Returns collection of views added to the list */
-        get_views(): SP.ViewCollection;
-        /** Gets the collection of workflow association objects that represents all the workflows that are associated with the list. */
-        get_workflowAssociations(): SP.Workflow.WorkflowAssociationCollection;
-        /** Returns the collection of changes from the change log that have occurred within the list, based on the specified query. */
-        getChanges(query: SP.ChangeQuery): SP.ChangeCollection;
-        /** Returns array of items describing changes since time specified in the query */
-        getListItemChangesSinceToken(query: SP.ChangeLogItemQuery): any[];
-        /** Gets the effective permissions that a specified user has on the list. */
-        getUserEffectivePermissions(userName: string): SP.BasePermissions;
-        /** First tries to find if the view already exists. Overwrite it if yes, add a new view if no. Then extract all the adhoc filter/sort info from the URL and build and update the view's xml Returns the url of the new/overwritten view.
-            @param oldName The name of the view the user did the adhoc filter on (is currently on).
-            @param newName The desired name the user typed
-            @param privateView Boolean true when the user wants make a new view that's personal
-            @param uri Url that keeps all the adhoc filter/sort inforatmion */
-        saveAsNewView(oldName: string, newName: string, privateView: boolean, uri: string): SP.StringResult;
-        /** Returns a collection of lookup fields that use this list as a data source and that have FieldLookup.IsRelationship set to true. */
-        getRelatedFields(): SP.RelatedFieldCollection;
-        /** This member is reserved for internal use and is not intended to be used directly from your code. */
-        getRelatedFieldsExtendedData(): SP.RelatedFieldExtendedDataCollection;
-        /** Returns json string which contains all information necessary for rendering the specified list form for the specified itemId. Mode is SP.ControlMode */
-        renderListFormData(itemId: number, formId: string, mode: SP.ControlMode): SP.StringResult;
-        /** Returns the data for the specified query view. */
-        renderListData(viewXml: string): SP.StringResult;
-        /** This member is reserved for internal use and is not intended to be used directly from your code. */
-        reserveListItemId(): SP.IntResult;
-        /** Updates the database with changes that are made to the list object. */
-        update(): void;
-        /** Returns the list view with the specified view identifier. */
-        getView(viewGuid: SP.Guid): SP.View;
-        /** Deletes the list. */
-        deleteObject(): void;
-        /** Sends the list to the site recycle bin. */
-        recycle(): SP.GuidResult;
-        /** Returns collection of list items based on the specified CAML query. */
-        getItems(query: SP.CamlQuery): SP.ListItemCollection;
-        /** Creates a new list item in the list. */
-        addItem(parameters: SP.ListItemCreationInformation): SP.ListItem;
-    }
-    /** Represents a collection of SP.List objects */
-    export class ListCollection extends SP.ClientObjectCollection<List> {
-        /** Gets the list at the specified index in the collection. */
-        itemAt(index: number): SP.List;
-        /** Gets the list at the specified index in the collection. */
-        get_item(index: number): SP.List;
-        /** Returns the list with the specified title from the collection. */
-        getByTitle(title: string): SP.List;
-        /** Returns the list with the specified list identifier. */
-        getById(id: SP.Guid): SP.List;
-        /** Returns the list with the specified list identifier. */
-        getById(id: string): SP.List;
-        /** Creates a new list or a document library. */
-        add(parameters: SP.ListCreationInformation): SP.List;
-        /** Gets a list that is the default location for wiki pages. */
-        ensureSitePagesLibrary(): SP.List;
-        /** Gets a list that is the default asset location for images or other files, which the users upload to their wiki pages. */
-        ensureSiteAssetsLibrary(): SP.List;
-    }
-    export class ListCreationInformation extends SP.ClientValueObject {
-        get_customSchemaXml(): string;
-        set_customSchemaXml(value: string): void;
-        get_dataSourceProperties(): any;
-        set_dataSourceProperties(value: any): void;
-        get_description(): string;
-        set_description(value: string): void;
-        get_documentTemplateType(): number;
-        set_documentTemplateType(value: number): void;
-        get_quickLaunchOption(): SP.QuickLaunchOptions;
-        set_quickLaunchOption(value: SP.QuickLaunchOptions): void;
-        get_templateFeatureId(): SP.Guid;
-        set_templateFeatureId(value: SP.Guid): void;
-        get_templateType(): number;
-        set_templateType(value: number): void;
-        get_title(): string;
-        set_title(value: string): void;
-        get_url(): string;
-        set_url(value: string): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class ListDataSource extends SP.ClientValueObject {
-        get_properties(): any;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class ListDataValidationExceptionValue extends SP.ClientValueObject {
-        get_fieldFailures(): SP.ListDataValidationFailure[];
-        get_itemFailure(): SP.ListDataValidationFailure;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class ListDataValidationFailure extends SP.ClientValueObject {
-        get_displayName(): string;
-        get_message(): string;
-        get_name(): string;
-        get_reason(): SP.ListDataValidationFailureReason;
-        get_validationType(): SP.ListDataValidationType;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export enum ListDataValidationFailureReason {
-        dataFailure,
-        formulaError,
-    }
-    export enum ListDataValidationType {
-        userFormulaField,
-        userFormulaItem,
-        requiredField,
-        choiceField,
-        minMaxField,
-        textField,
-    }
-    /** Represents an item or row in a list. */
-    export class ListItem extends SP.SecurableObject {
-        get_fieldValues(): any;
-        /** Gets the specified field value for the list item. Field value is returned as string, but it can be casted to a specific field value type, e.g. SP.LookupFieldValue, etc. */
-        get_item(fieldInternalName: string): any;
-        /** Sets the specified field value for the list item. Consider using parseAndSetFieldValue instead. */
-        set_item(fieldInternalName: string, value: any): void;
-        /** Gets collection of objects that represent attachments for the list item. */
-        get_attachmentFiles(): SP.AttachmentCollection;
-        /** Gets the content type of the item. */
-        get_contentType(): SP.ContentType;
-        /** Gets a value that specifies the display name of the list item.
-            This property is not available by default when you return list items. Trying to call this method returns a PropertyOrFieldNotInitializedException if you try to access one of these properties. To access this property, use the Include method as part of the query string. */
-        get_displayName(): string;
-        /** Gets a value that specifies the effective permissions on the list item that are assigned to the current user.
-            This property is not available by default when you return list items. Trying to call this method returns a PropertyOrFieldNotInitializedException if you try to access one of these properties. To access this property, use the Include method as part of the query string. */
-        get_effectiveBasePermissions(): SP.BasePermissions;
-        /** Gets the effective base permissions for the current user, as they should be displayed in UI.
-            This will only differ from EffectiveBasePermissions if ReadOnlyUI is set to true on the item's parent list, and in all cases will be a subset of EffectiveBasePermissions. To put it another way, EffectiveBasePermissionsForUI will always be as or more restrictive than EffectiveBasePermissions.
-            This property is not available by default when you return list items. Trying to call this method returns a PropertyOrFieldNotInitializedException if you try to access one of these properties. To access this property, use the Include method as part of the query string.  */
-        get_effectiveBasePermissionsForUI(): SP.BasePermissions;
-        get_fieldValuesAsHtml(): SP.FieldStringValues;
-        get_fieldValuesAsText(): SP.FieldStringValues;
-        get_fieldValuesForEdit(): SP.FieldStringValues;
-        /** Gets the file that is represented by the item from a document library. Only for document libraries. */
-        get_file(): SP.File;
-        /** Gets or sets the file system object type for the item (file, folder or invalid). */
-        get_fileSystemObjectType(): SP.FileSystemObjectType;
-        /** Gets the parent folder for the list item */
-        get_folder(): SP.Folder;
-        /** Gets id of the item */
-        get_id(): number;
-        /** Get the list in which the item resides. */
-        get_parentList(): SP.List;
-        refreshLoad(): void;
-        getWOPIFrameUrl(action: SP.Utilities.SPWOPIFrameAction): SP.StringResult;
-        /** Commits changed properties of the list item. The actual update is performed during context.executeQueryAsync method call. */
-        update(): void;
-        /** Deletes the list item */
-        deleteObject(): void;
-        /** Moves the list item to the Recycle Bin and returns the identifier of the new Recycle Bin item. */
-        recycle(): SP.GuidResult;
-        /** Gets effective permissions for the specified user. */
-        getUserEffectivePermissions(userName: string): SP.BasePermissions;
-        /** Sets the value of the field for the list item based on an implementation specific transformation of the value. */
-        parseAndSetFieldValue(fieldInternalName: string, value: string): void;
-        /** Validates form values specified for the list item. Errors are returned through hasException and errorMessage properties of the ListItemFormUpdateValue objects */
-        validateUpdateListItem(formValues: SP.ListItemFormUpdateValue[], bNewDocumentUpdate: boolean): SP.ListItemFormUpdateValue[];
-    }
-    export class ListItemCollection extends SP.ClientObjectCollection<ListItem> {
-        itemAt(index: number): SP.ListItem;
-        get_item(index: number): SP.ListItem;
-        getById(id: number): SP.ListItem;
-        getById(id: string): SP.ListItem;
-        get_listItemCollectionPosition(): SP.ListItemCollectionPosition;
-    }
-    export class ListItemCollectionPosition extends SP.ClientValueObject {
-        get_pagingInfo(): string;
-        set_pagingInfo(value: string): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    /** Specifies the properties of the new list item. */
-    export class ListItemCreationInformation extends SP.ClientValueObject {
-        get_folderUrl(): string;
-        /** Sets a value that specifies the folder for the new list item. */
-        set_folderUrl(value: string): void;
-        get_leafName(): string;
-        /** Sets a value that specifies the name of the new list item. It must be the name of the file if the parent list of the list item is a document library. */
-        set_leafName(value: string): void;
-        get_underlyingObjectType(): SP.FileSystemObjectType;
-        /** Sets a value that specifies whether the new list item is a file or a folder. */
-        set_underlyingObjectType(value: SP.FileSystemObjectType): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class ListItemEntityCollection extends SP.ClientObjectCollection<ListItem> {
-        itemAt(index: number): SP.ListItem;
-        get_item(index: number): SP.ListItem;
-    }
-    export class ListItemFormUpdateValue extends SP.ClientValueObject {
-        get_errorMessage(): string;
-        set_errorMessage(value: string): void;
-        get_fieldName(): string;
-        set_fieldName(value: string): void;
-        get_fieldValue(): string;
-        set_fieldValue(value: string): void;
-        get_hasException(): boolean;
-        set_hasException(value: boolean): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class ListTemplate extends SP.ClientObject {
-        get_allowsFolderCreation(): boolean;
-        get_baseType(): SP.BaseType;
-        get_description(): string;
-        get_featureId(): SP.Guid;
-        get_hidden(): boolean;
-        get_imageUrl(): string;
-        get_internalName(): string;
-        get_isCustomTemplate(): boolean;
-        get_name(): string;
-        get_onQuickLaunch(): boolean;
-        get_listTemplateTypeKind(): number;
-        get_unique(): boolean;
-    }
-    export class ListTemplateCollection extends SP.ClientObjectCollection<ListTemplate> {
-        itemAt(index: number): SP.ListTemplate;
-        get_item(index: number): SP.ListTemplate;
-        getByName(name: string): SP.ListTemplate;
-    }
-    export enum ListTemplateType {
-        invalidType,
-        noListTemplate,
-        genericList,
-        documentLibrary,
-        survey,
-        links,
-        announcements,
-        contacts,
-        events,
-        tasks,
-        discussionBoard,
-        pictureLibrary,
-        dataSources,
-        webTemplateCatalog,
-        userInformation,
-        webPartCatalog,
-        listTemplateCatalog,
-        xMLForm,
-        masterPageCatalog,
-        noCodeWorkflows,
-        workflowProcess,
-        webPageLibrary,
-        customGrid,
-        solutionCatalog,
-        noCodePublic,
-        themeCatalog,
-        designCatalog,
-        appDataCatalog,
-        dataConnectionLibrary,
-        workflowHistory,
-        ganttTasks,
-        helpLibrary,
-        accessRequest,
-        tasksWithTimelineAndHierarchy,
-        maintenanceLogs,
-        meetings,
-        agenda,
-        meetingUser,
-        decision,
-        meetingObjective,
-        textBox,
-        thingsToBring,
-        homePageLibrary,
-        posts,
-        comments,
-        categories,
-        facility,
-        whereabouts,
-        callTrack,
-        circulation,
-        timecard,
-        holidays,
-        iMEDic,
-        externalList,
-        mySiteDocumentLibrary,
-        issueTracking,
-        adminTasks,
-        healthRules,
-        healthReports,
-        developerSiteDraftApps,
-    }
-    export enum MoveOperations {
-        none,
-        overwrite,
-        allowBrokenThickets,
-        bypassApprovePermission,
-    }
-    export class Navigation extends SP.ClientObject {
-        get_quickLaunch(): SP.NavigationNodeCollection;
-        get_topNavigationBar(): SP.NavigationNodeCollection;
-        get_useShared(): boolean;
-        set_useShared(value: boolean): void;
-        getNodeById(id: number): SP.NavigationNode;
-    }
-    export class NavigationNode extends SP.ClientObject {
-        get_children(): SP.NavigationNodeCollection;
-        get_id(): number;
-        get_isDocLib(): boolean;
-        get_isExternal(): boolean;
-        get_isVisible(): boolean;
-        set_isVisible(value: boolean): void;
-        get_title(): string;
-        set_title(value: string): void;
-        get_url(): string;
-        set_url(value: string): void;
-        update(): void;
-        deleteObject(): void;
-    }
-    export class NavigationNodeCollection extends SP.ClientObjectCollection<NavigationNode> {
-        itemAt(index: number): SP.NavigationNode;
-        get_item(index: number): SP.NavigationNode;
-        add(parameters: SP.NavigationNodeCreationInformation): SP.NavigationNode;
-    }
-    export class NavigationNodeCreationInformation extends SP.ClientValueObject {
-        get_asLastNode(): boolean;
-        set_asLastNode(value: boolean): void;
-        get_isExternal(): boolean;
-        set_isExternal(value: boolean): void;
-        get_previousNode(): SP.NavigationNode;
-        set_previousNode(value: SP.NavigationNode): void;
-        get_title(): string;
-        set_title(value: string): void;
-        get_url(): string;
-        set_url(value: string): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class ObjectSharingInformation extends SP.ClientObject {
-        get_anonymousEditLink(): string;
-        get_anonymousViewLink(): string;
-        get_canManagePermissions(): boolean;
-        get_hasPendingAccessRequests(): boolean;
-        get_hasPermissionLevels(): boolean;
-        get_isSharedWithCurrentUser(): boolean;
-        get_isSharedWithGuest(): boolean;
-        get_isSharedWithMany(): boolean;
-        get_isSharedWithSecurityGroup(): boolean;
-        get_pendingAccessRequestsLink(): string;
-        getSharedWithUsers(): SP.ClientObjectList<SP.ObjectSharingInformationUser>;
-        static getListItemSharingInformation(context: SP.ClientRuntimeContext, listID: SP.Guid, itemID: number, excludeCurrentUser: boolean, excludeSiteAdmin: boolean, excludeSecurityGroups: boolean, retrieveAnonymousLinks: boolean, retrieveUserInfoDetails: boolean, checkForAccessRequests: boolean): SP.ObjectSharingInformation;
-        static getWebSharingInformation(context: SP.ClientRuntimeContext, excludeCurrentUser: boolean, excludeSiteAdmin: boolean, excludeSecurityGroups: boolean, retrieveAnonymousLinks: boolean, retrieveUserInfoDetails: boolean, checkForAccessRequests: boolean): SP.ObjectSharingInformation;
-        static getObjectSharingInformation(context: SP.ClientRuntimeContext, securableObject: SP.SecurableObject, excludeCurrentUser: boolean, excludeSiteAdmin: boolean, excludeSecurityGroups: boolean, retrieveAnonymousLinks: boolean, retrieveUserInfoDetails: boolean, checkForAccessRequests: boolean, retrievePermissionLevels: boolean): SP.ObjectSharingInformation;
-    }
-    export class ObjectSharingInformationUser extends SP.ClientObject {
-        get_customRoleNames(): string;
-        get_department(): string;
-        get_email(): string;
-        get_hasEditPermission(): boolean;
-        get_hasViewPermission(): boolean;
-        get_id(): number;
-        get_isSiteAdmin(): boolean;
-        get_jobTitle(): string;
-        get_loginName(): string;
-        get_name(): string;
-        get_picture(): string;
-        get_principal(): SP.Principal;
-        get_sipAddress(): string;
-        get_user(): SP.User;
-    }
-    export enum OpenWebOptions {
-        none,
-        initNavigationCache,
-    }
-    export enum PageType {
-        invalid,
-        defaultView,
-        normalView,
-        dialogView,
-        view,
-        displayForm,
-        displayFormDialog,
-        editForm,
-        editFormDialog,
-        newForm,
-        newFormDialog,
-        solutionForm,
-        pAGE_MAXITEMS,
-    }
-    export class PropertyValues extends SP.ClientObject {
-        get_fieldValues(): any;
-        get_item(fieldName: string): any;
-        set_item(fieldName: string, value: any): void;
-        refreshLoad(): void;
-    }
-    export class PushNotificationSubscriber extends SP.ClientObject {
-        get_customArgs(): string;
-        set_customArgs(value: string): void;
-        get_deviceAppInstanceId(): SP.Guid;
-        get_lastModifiedTimeStamp(): Date;
-        get_registrationTimeStamp(): Date;
-        get_serviceToken(): string;
-        set_serviceToken(value: string): void;
-        get_subscriberType(): string;
-        set_subscriberType(value: string): void;
-        get_user(): SP.User;
-        update(): void;
-    }
-    export class PushNotificationSubscriberCollection extends SP.ClientObjectCollection<PushNotificationSubscriber> {
-        itemAt(index: number): SP.PushNotificationSubscriber;
-        get_item(index: number): SP.PushNotificationSubscriber;
-        getByStoreId(id: string): SP.PushNotificationSubscriber;
-    }
-    export enum QuickLaunchOptions {
-        off,
-        on,
-        defaultValue,
-    }
-    export class RecycleBinItem extends SP.ClientObject {
-        get_author(): SP.User;
-        get_deletedBy(): SP.User;
-        get_deletedDate(): Date;
-        get_dirName(): string;
-        get_id(): SP.Guid;
-        get_itemState(): SP.RecycleBinItemState;
-        get_itemType(): SP.RecycleBinItemType;
-        get_leafName(): string;
-        get_size(): number;
-        get_title(): string;
-        deleteObject(): void;
-        restore(): void;
-    }
-    export class RecycleBinItemCollection extends SP.ClientObjectCollection<RecycleBinItem> {
-        itemAt(index: number): SP.RecycleBinItem;
-        get_item(index: number): SP.RecycleBinItem;
-        getById(id: SP.Guid): SP.RecycleBinItem;
-        deleteAll(): void;
-        restoreAll(): void;
-    }
-    export enum RecycleBinItemState {
-        none,
-        firstStageRecycleBin,
-        secondStageRecycleBin,
-    }
-    export enum RecycleBinItemType {
-        none,
-        file,
-        fileVersion,
-        listItem,
-        list,
-        folder,
-        folderWithLists,
-        attachment,
-        listItemVersion,
-        cascadeParent,
-        web,
-    }
-    export class RegionalSettings extends SP.ClientObject {
-        get_adjustHijriDays(): number;
-        get_alternateCalendarType(): number;
-        get_aM(): string;
-        get_calendarType(): number;
-        get_collation(): number;
-        get_collationLCID(): number;
-        get_dateFormat(): number;
-        get_dateSeparator(): string;
-        get_decimalSeparator(): string;
-        get_digitGrouping(): string;
-        get_firstDayOfWeek(): number;
-        get_firstWeekOfYear(): number;
-        get_isEastAsia(): boolean;
-        get_isRightToLeft(): boolean;
-        get_isUIRightToLeft(): boolean;
-        get_listSeparator(): string;
-        get_localeId(): number;
-        get_negativeSign(): string;
-        get_negNumberMode(): number;
-        get_pM(): string;
-        get_positiveSign(): string;
-        get_showWeeks(): boolean;
-        get_thousandSeparator(): string;
-        get_time24(): boolean;
-        get_timeMarkerPosition(): number;
-        get_timeSeparator(): string;
-        get_timeZone(): SP.TimeZone;
-        get_timeZones(): SP.TimeZoneCollection;
-        get_workDayEndHour(): number;
-        get_workDays(): number;
-        get_workDayStartHour(): number;
-    }
-    export class RelatedField extends SP.ClientObject {
-        get_fieldId(): SP.Guid;
-        get_listId(): SP.Guid;
-        get_lookupList(): SP.List;
-        get_relationshipDeleteBehavior(): SP.RelationshipDeleteBehaviorType;
-        get_webId(): SP.Guid;
-    }
-    export class RelatedFieldCollection extends SP.ClientObjectCollection<RelatedField> {
-        itemAt(index: number): SP.RelatedField;
-        get_item(index: number): SP.RelatedField;
-    }
-    export class RelatedFieldExtendedData extends SP.ClientObject {
-        get_fieldId(): SP.Guid;
-        get_listId(): SP.Guid;
-        get_listImageUrl(): string;
-        get_resolvedListTitle(): string;
-        get_toolTipDescription(): string;
-        get_webId(): SP.Guid;
-    }
-    export class RelatedFieldExtendedDataCollection extends SP.ClientObjectCollection<RelatedFieldExtendedData> {
-        itemAt(index: number): SP.RelatedFieldExtendedData;
-        get_item(index: number): SP.RelatedFieldExtendedData;
-    }
-    export class RelatedItem extends SP.ClientValueObject {
-        get_iconUrl(): string;
-        set_iconUrl(value: string): void;
-        get_itemId(): number;
-        set_itemId(value: number): void;
-        get_listId(): string;
-        set_listId(value: string): void;
-        get_title(): string;
-        set_title(value: string): void;
-        get_url(): string;
-        set_url(value: string): void;
-        get_webId(): string;
-        set_webId(value: string): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class RelatedItemManager extends SP.ClientObject {
-        static getRelatedItems(context: SP.ClientRuntimeContext, SourceListName: string, SourceItemID: number): SP.RelatedItem[];
-        static getPageOneRelatedItems(context: SP.ClientRuntimeContext, SourceListName: string, SourceItemID: number): SP.RelatedItem[];
-        static addSingleLink(context: SP.ClientRuntimeContext, SourceListName: string, SourceItemID: number, SourceWebUrl: string, TargetListName: string, TargetItemID: number, TargetWebUrl: string, TryAddReverseLink: boolean): void;
-        static addSingleLinkToUrl(context: SP.ClientRuntimeContext, SourceListName: string, SourceItemID: number, TargetItemUrl: string, TryAddReverseLink: boolean): void;
-        static addSingleLinkFromUrl(context: SP.ClientRuntimeContext, SourceItemUrl: string, TargetListName: string, TargetItemID: number, TryAddReverseLink: boolean): void;
-        static deleteSingleLink(context: SP.ClientRuntimeContext, SourceListName: string, SourceItemID: number, SourceWebUrl: string, TargetListName: string, TargetItemID: number, TargetWebUrl: string, TryDeleteReverseLink: boolean): void;
-    }
-    export enum RelationshipDeleteBehaviorType {
-        none,
-        cascade,
-        restrict,
-    }
-    export class RequestVariable extends SP.ClientObject {
-        constructor(context: SP.ClientRuntimeContext);
-        get_value(): string;
-        static newObject(context: SP.ClientRuntimeContext): SP.RequestVariable;
-        append(value: string): void;
-        set(value: string): void;
-    }
-    export class RoleAssignment extends SP.ClientObject {
-        get_member(): SP.Principal;
-        get_principalId(): number;
-        get_roleDefinitionBindings(): SP.RoleDefinitionBindingCollection;
-        importRoleDefinitionBindings(roleDefinitionBindings: SP.RoleDefinitionBindingCollection): void;
-        update(): void;
-        deleteObject(): void;
-    }
-    export class RoleAssignmentCollection extends SP.ClientObjectCollection<RoleAssignment> {
-        itemAt(index: number): SP.RoleAssignment;
-        get_item(index: number): SP.RoleAssignment;
-        get_groups(): SP.GroupCollection;
-        getByPrincipal(principalToFind: SP.Principal): SP.RoleAssignment;
-        getByPrincipalId(principalId: number): SP.RoleAssignment;
-        add(principal: SP.Principal, roleBindings: SP.RoleDefinitionBindingCollection): SP.RoleAssignment;
-    }
-    export class RoleDefinition extends SP.ClientObject {
-        get_basePermissions(): SP.BasePermissions;
-        set_basePermissions(value: SP.BasePermissions): void;
-        get_description(): string;
-        set_description(value: string): void;
-        get_hidden(): boolean;
-        get_id(): number;
-        get_name(): string;
-        set_name(value: string): void;
-        get_order(): number;
-        set_order(value: number): void;
-        get_roleTypeKind(): SP.RoleType;
-        update(): void;
-        deleteObject(): void;
-    }
-    export class RoleDefinitionBindingCollection extends SP.ClientObjectCollection<RoleDefinition> {
-        itemAt(index: number): SP.RoleDefinition;
-        get_item(index: number): SP.RoleDefinition;
-        constructor(context: SP.ClientRuntimeContext);
-        static newObject(context: SP.ClientRuntimeContext): SP.RoleDefinitionBindingCollection;
-        add(roleDefinition: SP.RoleDefinition): void;
-        remove(roleDefinition: SP.RoleDefinition): void;
-        removeAll(): void;
-    }
-    export class RoleDefinitionCollection extends SP.ClientObjectCollection<RoleDefinition> {
-        itemAt(index: number): SP.RoleDefinition;
-        get_item(index: number): SP.RoleDefinition;
-        getByName(name: string): SP.RoleDefinition;
-        add(parameters: SP.RoleDefinitionCreationInformation): SP.RoleDefinition;
-        getById(id: number): SP.RoleDefinition;
-        getByType(roleType: SP.RoleType): SP.RoleDefinition;
-    }
-    export class RoleDefinitionCreationInformation extends SP.ClientValueObject {
-        get_basePermissions(): SP.BasePermissions;
-        set_basePermissions(value: SP.BasePermissions): void;
-        get_description(): string;
-        set_description(value: string): void;
-        get_name(): string;
-        set_name(value: string): void;
-        get_order(): number;
-        set_order(value: number): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export enum RoleType {
-        none,
-        guest,
-        reader,
-        contributor,
-        webDesigner,
-        administrator,
-        editor,
-    }
-    export class ServerSettings {
-        static getAlternateUrls(context: SP.ClientRuntimeContext): SP.ClientObjectList<SP.AlternateUrl>;
-        static getGlobalInstalledLanguages(context: SP.ClientRuntimeContext, compatibilityLevel: number): SP.Language[];
-    }
-    export class Site extends SP.ClientObject {
-        get_allowDesigner(): boolean;
-        set_allowDesigner(value: boolean): void;
-        get_allowMasterPageEditing(): boolean;
-        set_allowMasterPageEditing(value: boolean): void;
-        get_allowRevertFromTemplate(): boolean;
-        set_allowRevertFromTemplate(value: boolean): void;
-        get_allowSelfServiceUpgrade(): boolean;
-        set_allowSelfServiceUpgrade(value: boolean): void;
-        get_allowSelfServiceUpgradeEvaluation(): boolean;
-        set_allowSelfServiceUpgradeEvaluation(value: boolean): void;
-        get_canUpgrade(): boolean;
-        get_compatibilityLevel(): number;
-        get_eventReceivers(): SP.EventReceiverDefinitionCollection;
-        get_features(): SP.FeatureCollection;
-        get_id(): SP.Guid;
-        get_lockIssue(): string;
-        get_maxItemsPerThrottledOperation(): number;
-        get_owner(): SP.User;
-        set_owner(value: SP.User): void;
-        get_primaryUri(): string;
-        get_readOnly(): boolean;
-        get_recycleBin(): SP.RecycleBinItemCollection;
-        get_rootWeb(): SP.Web;
-        get_serverRelativeUrl(): string;
-        get_shareByLinkEnabled(): boolean;
-        get_showUrlStructure(): boolean;
-        set_showUrlStructure(value: boolean): void;
-        get_uIVersionConfigurationEnabled(): boolean;
-        set_uIVersionConfigurationEnabled(value: boolean): void;
-        get_upgradeInfo(): SP.UpgradeInfo;
-        get_upgradeReminderDate(): Date;
-        get_upgrading(): boolean;
-        get_url(): string;
-        get_usage(): SP.UsageInfo;
-        get_userCustomActions(): SP.UserCustomActionCollection;
-        updateClientObjectModelUseRemoteAPIsPermissionSetting(requireUseRemoteAPIs: boolean): void;
-        needsUpgradeByType(versionUpgrade: boolean, recursive: boolean): SP.BooleanResult;
-        runHealthCheck(ruleId: SP.Guid, bRepair: boolean, bRunAlways: boolean): SP.SiteHealth.SiteHealthSummary;
-        createPreviewSPSite(upgrade: boolean, sendemail: boolean): void;
-        runUpgradeSiteSession(versionUpgrade: boolean, queueOnly: boolean, sendEmail: boolean): void;
-        getChanges(query: SP.ChangeQuery): SP.ChangeCollection;
-        openWeb(strUrl: string): SP.Web;
-        openWebById(gWebId: SP.Guid): SP.Web;
-        getWebTemplates(LCID: number, overrideCompatLevel: number): SP.WebTemplateCollection;
-        getCustomListTemplates(web: SP.Web): SP.ListTemplateCollection;
-        getCatalog(typeCatalog: number): SP.List;
-        extendUpgradeReminderDate(): void;
-        invalidate(): void;
-    }
-    export class SiteUrl extends SP.ClientObject {
-    }
-    export class SubwebQuery extends SP.ClientValueObject {
-        get_configurationFilter(): number;
-        set_configurationFilter(value: number): void;
-        get_webTemplateFilter(): number;
-        set_webTemplateFilter(value: number): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export enum TemplateFileType {
-        standardPage,
-        wikiPage,
-        formPage,
-    }
-    export class ThemeInfo extends SP.ClientObject {
-        get_accessibleDescription(): string;
-        get_themeBackgroundImageUri(): string;
-        getThemeShadeByName(name: string): SP.StringResult;
-        getThemeFontByName(name: string, lcid: number): SP.StringResult;
-    }
-    export class TimeZone extends SP.ClientObject {
-        get_description(): string;
-        get_id(): number;
-        get_information(): SP.TimeZoneInformation;
-        localTimeToUTC(date: Date): SP.DateTimeResult;
-        utcToLocalTime(date: Date): SP.DateTimeResult;
-    }
-    export class TimeZoneCollection extends SP.ClientObjectCollection<TimeZone> {
-        itemAt(index: number): SP.TimeZone;
-        get_item(index: number): SP.TimeZone;
-        getById(id: number): SP.TimeZone;
-    }
-    export class TimeZoneInformation extends SP.ClientValueObject {
-        get_bias(): number;
-        get_daylightBias(): number;
-        get_standardBias(): number;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class UpgradeInfo extends SP.ClientValueObject {
-        get_errorFile(): string;
-        get_errors(): number;
-        get_lastUpdated(): Date;
-        get_logFile(): string;
-        get_requestDate(): Date;
-        get_retryCount(): number;
-        get_startTime(): Date;
-        get_status(): SP.UpgradeStatus;
-        get_upgradeType(): SP.UpgradeType;
-        get_warnings(): number;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export enum UpgradeStatus {
-        none,
-        inProgress,
-        failed,
-        completed,
-    }
-    export enum UpgradeType {
-        buildUpgrade,
-        versionUpgrade,
-    }
-    export enum UrlFieldFormatType {
-        hyperlink,
-        image,
-    }
-    export enum UrlZone {
-        defaultZone,
-        intranet,
-        internet,
-        custom,
-        extranet,
-    }
-    export class UsageInfo extends SP.ClientValueObject {
-        get_bandwidth(): number;
-        get_discussionStorage(): number;
-        get_hits(): number;
-        get_storage(): number;
-        get_storagePercentageUsed(): number;
-        get_visits(): number;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class User extends SP.Principal {
-        get_email(): string;
-        set_email(value: string): void;
-        get_groups(): SP.GroupCollection;
-        get_isSiteAdmin(): boolean;
-        set_isSiteAdmin(value: boolean): void;
-        get_userId(): SP.UserIdInfo;
-        update(): void;
-    }
-    export class UserCollection extends SP.ClientObjectCollection<User> {
-        itemAt(index: number): SP.User;
-        get_item(index: number): SP.User;
-        getByLoginName(loginName: string): SP.User;
-        getById(id: number): SP.User;
-        getByEmail(emailAddress: string): SP.User;
-        removeByLoginName(loginName: string): void;
-        removeById(id: number): void;
-        remove(user: SP.User): void;
-        add(parameters: SP.UserCreationInformation): SP.User;
-        addUser(user: SP.User): SP.User;
-    }
-    export class UserCreationInformation extends SP.ClientValueObject {
-        get_email(): string;
-        set_email(value: string): void;
-        get_loginName(): string;
-        set_loginName(value: string): void;
-        get_title(): string;
-        set_title(value: string): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class UserCustomAction extends SP.ClientObject {
-        get_commandUIExtension(): string;
-        set_commandUIExtension(value: string): void;
-        get_description(): string;
-        set_description(value: string): void;
-        get_group(): string;
-        set_group(value: string): void;
-        get_id(): SP.Guid;
-        get_imageUrl(): string;
-        set_imageUrl(value: string): void;
-        get_location(): string;
-        set_location(value: string): void;
-        get_name(): string;
-        set_name(value: string): void;
-        get_registrationId(): string;
-        set_registrationId(value: string): void;
-        get_registrationType(): SP.UserCustomActionRegistrationType;
-        set_registrationType(value: SP.UserCustomActionRegistrationType): void;
-        get_rights(): SP.BasePermissions;
-        set_rights(value: SP.BasePermissions): void;
-        get_scope(): SP.UserCustomActionScope;
-        get_scriptBlock(): string;
-        set_scriptBlock(value: string): void;
-        get_scriptSrc(): string;
-        set_scriptSrc(value: string): void;
-        get_sequence(): number;
-        set_sequence(value: number): void;
-        get_title(): string;
-        set_title(value: string): void;
-        get_url(): string;
-        set_url(value: string): void;
-        get_versionOfUserCustomAction(): string;
-        update(): void;
-        deleteObject(): void;
-    }
-    export class UserCustomActionCollection extends SP.ClientObjectCollection<UserCustomAction> {
-        itemAt(index: number): SP.UserCustomAction;
-        get_item(index: number): SP.UserCustomAction;
-        getById(id: SP.Guid): SP.UserCustomAction;
-        clear(): void;
-        add(): SP.UserCustomAction;
-    }
-    export enum UserCustomActionRegistrationType {
-        none,
-        list,
-        contentType,
-        progId,
-        fileType,
-    }
-    export enum UserCustomActionScope {
-        unknown,
-        site,
-        web,
-        list,
-    }
-    export class UserIdInfo extends SP.ClientValueObject {
-        get_nameId(): string;
-        get_nameIdIssuer(): string;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class View extends SP.ClientObject {
-        get_aggregations(): string;
-        set_aggregations(value: string): void;
-        get_aggregationsStatus(): string;
-        set_aggregationsStatus(value: string): void;
-        get_baseViewId(): string;
-        get_contentTypeId(): SP.ContentTypeId;
-        set_contentTypeId(value: SP.ContentTypeId): void;
-        get_defaultView(): boolean;
-        set_defaultView(value: boolean): void;
-        get_defaultViewForContentType(): boolean;
-        set_defaultViewForContentType(value: boolean): void;
-        get_editorModified(): boolean;
-        set_editorModified(value: boolean): void;
-        get_formats(): string;
-        set_formats(value: string): void;
-        get_hidden(): boolean;
-        set_hidden(value: boolean): void;
-        get_htmlSchemaXml(): string;
-        get_id(): SP.Guid;
-        get_imageUrl(): string;
-        get_includeRootFolder(): boolean;
-        set_includeRootFolder(value: boolean): void;
-        get_viewJoins(): string;
-        set_viewJoins(value: string): void;
-        get_jsLink(): string;
-        set_jsLink(value: string): void;
-        get_listViewXml(): string;
-        set_listViewXml(value: string): void;
-        get_method(): string;
-        set_method(value: string): void;
-        get_mobileDefaultView(): boolean;
-        set_mobileDefaultView(value: boolean): void;
-        get_mobileView(): boolean;
-        set_mobileView(value: boolean): void;
-        get_moderationType(): string;
-        get_orderedView(): boolean;
-        get_paged(): boolean;
-        set_paged(value: boolean): void;
-        get_personalView(): boolean;
-        get_viewProjectedFields(): string;
-        set_viewProjectedFields(value: string): void;
-        get_viewQuery(): string;
-        set_viewQuery(value: string): void;
-        get_readOnlyView(): boolean;
-        get_requiresClientIntegration(): boolean;
-        get_rowLimit(): number;
-        set_rowLimit(value: number): void;
-        get_scope(): SP.ViewScope;
-        set_scope(value: SP.ViewScope): void;
-        get_serverRelativeUrl(): string;
-        get_styleId(): string;
-        get_threaded(): boolean;
-        get_title(): string;
-        set_title(value: string): void;
-        get_toolbar(): string;
-        set_toolbar(value: string): void;
-        get_toolbarTemplateName(): string;
-        get_viewType(): string;
-        get_viewData(): string;
-        set_viewData(value: string): void;
-        get_viewFields(): SP.ViewFieldCollection;
-        deleteObject(): void;
-        renderAsHtml(): SP.StringResult;
-        update(): void;
-    }
-    export class ViewCollection extends SP.ClientObjectCollection<View> {
-        itemAt(index: number): SP.View;
-        get_item(index: number): SP.View;
-        getByTitle(strTitle: string): SP.View;
-        getById(guidId: SP.Guid): SP.View;
-        add(parameters: SP.ViewCreationInformation): SP.View;
-    }
-    export class ViewCreationInformation extends SP.ClientValueObject {
-        get_paged(): boolean;
-        set_paged(value: boolean): void;
-        get_personalView(): boolean;
-        set_personalView(value: boolean): void;
-        get_query(): string;
-        set_query(value: string): void;
-        get_rowLimit(): number;
-        set_rowLimit(value: number): void;
-        get_setAsDefaultView(): boolean;
-        set_setAsDefaultView(value: boolean): void;
-        get_title(): string;
-        set_title(value: string): void;
-        get_viewFields(): string[];
-        set_viewFields(value: string[]): void;
-        get_viewTypeKind(): SP.ViewType;
-        set_viewTypeKind(value: SP.ViewType): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class ViewFieldCollection extends SP.ClientObjectCollection<string> {
-        itemAt(index: number): string;
-        get_item(index: number): string;
-        get_schemaXml(): string;
-        moveFieldTo(field: string, index: number): void;
-        add(strField: string): void;
-        remove(strField: string): void;
-        removeAll(): void;
-    }
-    export enum ViewScope {
-        defaultValue,
-        recursive,
-        recursiveAll,
-        filesOnly,
-    }
-    export enum ViewType {
-        none,
-        html,
-        grid,
-        calendar,
-        recurrence,
-        chart,
-        gantt,
-    }
-    export class Web extends SP.SecurableObject {
-        get_allowDesignerForCurrentUser(): boolean;
-        get_allowMasterPageEditingForCurrentUser(): boolean;
-        get_allowRevertFromTemplateForCurrentUser(): boolean;
-        get_allowRssFeeds(): boolean;
-        get_allProperties(): SP.PropertyValues;
-        get_appInstanceId(): SP.Guid;
-        get_associatedMemberGroup(): SP.Group;
-        set_associatedMemberGroup(value: SP.Group): void;
-        get_associatedOwnerGroup(): SP.Group;
-        set_associatedOwnerGroup(value: SP.Group): void;
-        get_associatedVisitorGroup(): SP.Group;
-        set_associatedVisitorGroup(value: SP.Group): void;
-        get_availableContentTypes(): SP.ContentTypeCollection;
-        get_availableFields(): SP.FieldCollection;
-        get_configuration(): number;
-        get_contentTypes(): SP.ContentTypeCollection;
-        get_created(): Date;
-        get_currentUser(): SP.User;
-        get_customMasterUrl(): string;
-        set_customMasterUrl(value: string): void;
-        get_description(): string;
-        set_description(value: string): void;
-        get_documentLibraryCalloutOfficeWebAppPreviewersDisabled(): boolean;
-        get_effectiveBasePermissions(): SP.BasePermissions;
-        get_enableMinimalDownload(): boolean;
-        set_enableMinimalDownload(value: boolean): void;
-        get_eventReceivers(): SP.EventReceiverDefinitionCollection;
-        get_features(): SP.FeatureCollection;
-        get_fields(): SP.FieldCollection;
-        get_folders(): SP.FolderCollection;
-        get_id(): SP.Guid;
-        get_language(): number;
-        get_lastItemModifiedDate(): Date;
-        get_lists(): SP.ListCollection;
-        get_listTemplates(): SP.ListTemplateCollection;
-        get_masterUrl(): string;
-        set_masterUrl(value: string): void;
-        get_navigation(): SP.Navigation;
-        get_parentWeb(): SP.WebInformation;
-        get_pushNotificationSubscribers(): SP.PushNotificationSubscriberCollection;
-        get_quickLaunchEnabled(): boolean;
-        set_quickLaunchEnabled(value: boolean): void;
-        get_recycleBin(): SP.RecycleBinItemCollection;
-        get_recycleBinEnabled(): boolean;
-        get_regionalSettings(): SP.RegionalSettings;
-        get_roleDefinitions(): SP.RoleDefinitionCollection;
-        get_rootFolder(): SP.Folder;
-        get_saveSiteAsTemplateEnabled(): boolean;
-        set_saveSiteAsTemplateEnabled(value: boolean): void;
-        get_serverRelativeUrl(): string;
-        set_serverRelativeUrl(value: string): void;
-        get_showUrlStructureForCurrentUser(): boolean;
-        get_siteGroups(): SP.GroupCollection;
-        get_siteUserInfoList(): SP.List;
-        get_siteUsers(): SP.UserCollection;
-        get_supportedUILanguageIds(): number[];
-        get_syndicationEnabled(): boolean;
-        set_syndicationEnabled(value: boolean): void;
-        get_themeInfo(): SP.ThemeInfo;
-        get_title(): string;
-        set_title(value: string): void;
-        get_treeViewEnabled(): boolean;
-        set_treeViewEnabled(value: boolean): void;
-        get_uIVersion(): number;
-        set_uIVersion(value: number): void;
-        get_uIVersionConfigurationEnabled(): boolean;
-        set_uIVersionConfigurationEnabled(value: boolean): void;
-        get_url(): string;
-        get_userCustomActions(): SP.UserCustomActionCollection;
-        get_webs(): SP.WebCollection;
-        get_webTemplate(): string;
-        get_workflowAssociations(): SP.Workflow.WorkflowAssociationCollection;
-        get_workflowTemplates(): SP.Workflow.WorkflowTemplateCollection;
-        doesUserHavePermissions(permissionMask: SP.BasePermissions): SP.BooleanResult;
-        getUserEffectivePermissions(userName: string): SP.BasePermissions;
-        mapToIcon(fileName: string, progId: string, size: SP.Utilities.IconSize): SP.StringResult;
-        registerPushNotificationSubscriber(deviceAppInstanceId: SP.Guid, serviceToken: string): SP.PushNotificationSubscriber;
-        unregisterPushNotificationSubscriber(deviceAppInstanceId: SP.Guid): void;
-        getPushNotificationSubscribersByArgs(customArgs: string): SP.PushNotificationSubscriberCollection;
-        getPushNotificationSubscribersByUser(userName: string): SP.PushNotificationSubscriberCollection;
-        doesPushNotificationSubscriberExist(deviceAppInstanceId: SP.Guid): SP.BooleanResult;
-        getPushNotificationSubscriber(deviceAppInstanceId: SP.Guid): SP.PushNotificationSubscriber;
-        getUserById(userId: number): SP.User;
-        getAvailableWebTemplates(lcid: number, doIncludeCrossLanguage: boolean): SP.WebTemplateCollection;
-        getCatalog(typeCatalog: number): SP.List;
-        getChanges(query: SP.ChangeQuery): SP.ChangeCollection;
-        applyWebTemplate(webTemplate: string): void;
-        deleteObject(): void;
-        update(): void;
-        getFileByServerRelativeUrl(serverRelativeUrl: string): SP.File;
-        getFolderByServerRelativeUrl(serverRelativeUrl: string): SP.Folder;
-        getEntity(namespace: string, name: string): SP.BusinessData.Entity;
-        getAppBdcCatalogForAppInstance(appInstanceId: SP.Guid): SP.BusinessData.AppBdcCatalog;
-        getAppBdcCatalog(): SP.BusinessData.AppBdcCatalog;
-        getSubwebsForCurrentUser(query: SP.SubwebQuery): SP.WebCollection;
-        getAppInstanceById(appInstanceId: SP.Guid): SP.AppInstance;
-        getAppInstancesByProductId(productId: SP.Guid): SP.ClientObjectList<SP.AppInstance>;
-        loadAndInstallAppInSpecifiedLocale(appPackageStream: SP.Base64EncodedByteArray, installationLocaleLCID: number): SP.AppInstance;
-        loadApp(appPackageStream: SP.Base64EncodedByteArray, installationLocaleLCID: number): SP.AppInstance;
-        loadAndInstallApp(appPackageStream: SP.Base64EncodedByteArray): SP.AppInstance;
-        ensureUser(logonName: string): SP.User;
-        applyTheme(colorPaletteUrl: string, fontSchemeUrl: string, backgroundImageUrl: string, shareGenerated: boolean): void;
-
-        /** Available after March 2015 CU for SharePoint 2013*/
-        getList(url: string): List;
-    }
-    export class WebCollection extends SP.ClientObjectCollection<Web> {
-        itemAt(index: number): SP.Web;
-        get_item(index: number): SP.Web;
-        add(parameters: SP.WebCreationInformation): SP.Web;
-    }
-    export class WebCreationInformation extends SP.ClientValueObject {
-        get_description(): string;
-        set_description(value: string): void;
-        get_language(): number;
-        set_language(value: number): void;
-        get_title(): string;
-        set_title(value: string): void;
-        get_url(): string;
-        set_url(value: string): void;
-        get_useSamePermissionsAsParentSite(): boolean;
-        set_useSamePermissionsAsParentSite(value: boolean): void;
-        get_webTemplate(): string;
-        set_webTemplate(value: string): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class WebInformation extends SP.ClientObject {
-        get_configuration(): number;
-        get_created(): Date;
-        get_description(): string;
-        get_id(): SP.Guid;
-        get_language(): number;
-        get_lastItemModifiedDate(): Date;
-        get_serverRelativeUrl(): string;
-        get_title(): string;
-        get_webTemplate(): string;
-        get_webTemplateId(): number;
-    }
-    export class WebProxy {
-        static invoke(context: SP.ClientRuntimeContext, requestInfo: SP.WebRequestInfo): SP.WebResponseInfo;
-    }
-    export class WebRequestInfo extends SP.ClientValueObject {
-        get_body(): string;
-        set_body(value: string): void;
-        get_headers(): any;
-        set_headers(value: any): void;
-        get_method(): string;
-        set_method(value: string): void;
-        get_url(): string;
-        set_url(value: string): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class WebResponseInfo extends SP.ClientValueObject {
-        get_body(): string;
-        set_body(value: string): void;
-        get_headers(): any;
-        set_headers(value: any): void;
-        get_statusCode(): number;
-        set_statusCode(value: number): void;
-        get_typeId(): string;
-        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-        constructor();
-    }
-    export class WebTemplate extends SP.ClientObject {
-        get_description(): string;
-        get_displayCategory(): string;
-        get_id(): number;
-        get_imageUrl(): string;
-        get_isHidden(): boolean;
-        get_isRootWebOnly(): boolean;
-        get_isSubWebOnly(): boolean;
-        get_lcid(): number;
-        get_name(): string;
-        get_title(): string;
-    }
-    export class WebTemplateCollection extends SP.ClientObjectCollection<WebTemplate> {
-        itemAt(index: number): SP.WebTemplate;
-        get_item(index: number): SP.WebTemplate;
-        getByName(name: string): SP.WebTemplate;
-    }
-
-    export module Application {
-        export module UI {
-            export interface DefaultFormsInformationRequestor {
-                onDefaultFormsInformationRetrieveSuccess(defaultForms: SP.Application.UI.DefaultFormsInformation): void;
-                onDefaultFormsInformationRetrieveFailure(): void;
-            }
-            export class FormsInfo {
-                ContentTypeName: string;
-                NewFormUrl: string;
-                DisplayFormUrl: string;
-                EditFormUrl: string;
-                constructor();
-            }
-            export class DefaultFormsInformation {
-                DefaultForms: SP.Application.UI.FormsInfo;
-                OtherForms: any;
-                constructor();
-            }
-            export class DefaultFormsMenuBuilder {
-                static getDefaultFormsInformation(requestor: SP.Application.UI.DefaultFormsInformationRequestor, listId: SP.Guid): void;
-            }
-            export class ViewSelectorMenuOptions {
-                showRepairView: boolean;
-                showMergeView: boolean;
-                showEditView: boolean;
-                showCreateView: boolean;
-                showApproverView: boolean;
-                listId: string;
-                viewId: string;
-                viewParameters: string;
-                constructor();
-            }
-            export interface ViewInformationRequestor {
-                onViewInformationReturned(viewGroups: SP.Application.UI.ViewSelectorGroups): void;
-            }
-            export class ViewSelectorGroups {
-                ModeratedViews: any;
-                PublicViews: any;
-                PersonalViews: any;
-                OtherViews: any;
-                DefaultView: SP.Application.UI.ViewSelectorMenuItem;
-                ViewCreation: any;
-                constructor();
-            }
-            export class ViewSelectorMenuItem {
-                Text: string;
-                ActionScriptText: string;
-                NavigateUrl: string;
-                ImageSourceUrl: string;
-                Description: string;
-                Id: string;
-                Sequence: number;
-                ItemType: string;
-                GroupId: number;
-                constructor();
-            }
-            export class ViewSelectorSubMenu {
-                Text: string;
-                ImageSourceUrl: string;
-                SubMenuItems: any;
-                constructor();
-            }
-            export class ViewSelectorMenuBuilder {
-                static get_filterMenuItemsCallback(): (menuItems: any) => any;
-                static set_filterMenuItemsCallback(value: (menuItems: any) => any): void;
-                static showMenu(elem: HTMLElement, options: SP.Application.UI.ViewSelectorMenuOptions): void;
-                static getViewInformation(requestor: SP.Application.UI.ViewInformationRequestor, options: SP.Application.UI.ViewSelectorMenuOptions): void;
-            }
-            export class MoreColorsPicker extends Sys.UI.Control {
-                constructor(e: HTMLElement);
-                initialize(): void;
-                dispose(): void;
-                get_colorValue(): string;
-                set_colorValue(value: string): void;
-            }
-            export class MoreColorsPage extends Sys.UI.Control {
-                constructor(e: HTMLElement);
-                initialize(): void;
-                dispose(): void;
-                get_moreColorsPicker(): SP.Application.UI.MoreColorsPicker;
-                set_moreColorsPicker(value: SP.Application.UI.MoreColorsPicker): void;
-            }
-            export class ThemeWebPage extends Sys.UI.Control {
-                add_themeDisplayUpdated(value: (sender: any, e: Sys.EventArgs) => void): void;
-                remove_themeDisplayUpdated(value: (sender: any, e: Sys.EventArgs) => void): void;
-                constructor(e: HTMLElement);
-                initialize(): void;
-                dispose(): void;
-                onThemeSelectionChanged(evt: Sys.UI.DomEvent): void;
-                updateThemeDisplay(): void;
-                get_thmxThemes(): any;
-                set_thmxThemes(value: any): void;
-            }
-            export class WikiPageNameInPlaceEditor {
-                constructor(ownerDoc: any, displayElemId: string, editElemId: string, editTextBoxId: string);
-                editingPageCallback(): void;
-                savingPageCallback(): void;
-            }
-        }
-    }
-
-
-    export module Analytics {
-        export class AnalyticsUsageEntry extends SP.ClientObject {
-            static logAnalyticsEvent(context: SP.ClientRuntimeContext, eventTypeId: number, itemId: string): void;
-            static logAnalyticsEvent2(context: SP.ClientRuntimeContext, eventTypeId: number, itemId: string, rollupScopeId: SP.Guid, siteId: SP.Guid, userId: string): void;
-            static logAnalyticsAppEvent(context: SP.ClientRuntimeContext, appEventTypeId: SP.Guid, itemId: string): void;
-            static logAnalyticsAppEvent2(context: SP.ClientRuntimeContext, appEventTypeId: SP.Guid, itemId: string, rollupScopeId: SP.Guid, siteId: SP.Guid, userId: string): void;
-        }
-        export enum EventTypeId {
-            none,
-            first,
-            view,
-            recommendationView,
-            recommendationClick,
-            last,
-        }
-    }
-
-    export module SiteHealth {
-        export class SiteHealthResult extends SP.ClientValueObject {
-            get_messageAsText(): string;
-            get_ruleHelpLink(): string;
-            get_ruleId(): SP.Guid;
-            get_ruleIsRepairable(): boolean;
-            get_ruleName(): string;
-            get_status(): SP.SiteHealth.SiteHealthStatusType;
-            set_status(value: SP.SiteHealth.SiteHealthStatusType): void;
-            get_timeStamp(): Date;
-            set_timeStamp(value: Date): void;
-            get_typeId(): string;
-            writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-            constructor();
-        }
-        export enum SiteHealthStatusType {
-            passed,
-            failedWarning,
-            failedError,
-        }
-        export class SiteHealthSummary extends SP.ClientObject {
-            get_failedErrorCount(): number;
-            get_failedWarningCount(): number;
-            get_passedCount(): number;
-            get_results(): SP.SiteHealth.SiteHealthResult[];
-        }
-    }
-
-}
-
-
-
-
-declare namespace Microsoft.SharePoint.Client.Search {
-    namespace Query {
-
-        /**Contains information common to all types of search queries.*/
-        export class Query extends SP.ClientObject {
-            get_blockDedupeMode: () => number;
-            set_blockDedupeMode: (value: number) => void;
-
-            get_bypassResultTypes: () => boolean;
-            set_bypassResultTypes: (value: boolean) => void;
-
-            get_clientType: () => string;
-            set_clientType: (value: string) => void;
-
-            get_culture: () => number;
-            set_culture: (value: number) => void;
-
-            get_desiredSnippetLength: () => number;
-            set_desiredSnippetLength: (value: number) => void;
-
-            get_enableInterleaving: () => boolean;
-            set_enableInterleaving: (value: boolean) => void;
-
-            get_enableNicknames: () => boolean;
-            set_enableNicknames: (value: boolean) => void;
-
-            get_enableOrderingHitHighlightedProperty: () => boolean;
-            set_enableOrderingHitHighlightedProperty: (value: boolean) => void;
-
-            get_enablePhonetic: () => boolean;
-            set_enablePhonetic: (value: boolean) => void;
-
-            get_enableQueryRules: () => boolean;
-            set_enableQueryRules: (value: boolean) => void;
-
-            get_enableStemming: () => boolean;
-            set_enableStemming: (value: boolean) => void;
-
-            get_generateBlockRankLog: () => boolean;
-            set_generateBlockRankLog: (value: boolean) => void;
-
-            get_hitHighlightedMultivaluePropertyLimit: () => number;
-            set_hitHighlightedMultivaluePropertyLimit: (value: number) => void;
-
-            get_hitHighlightedProperties: () => StringCollection;
-
-            get_ignoreSafeQueryPropertiesTemplateUrl: () => boolean;
-            set_ignoreSafeQueryPropertiesTemplateUrl: (value: boolean) => void;
-
-            get_impressionID: () => string;
-            set_impressionID: (value: string) => void;
-
-            get_maxSnippetLength: () => number;
-            set_maxSnippetLength: (value: number) => void;
-
-            get_personalizationData: () => QueryPersonalizationData;
-            set_personalizationData: (value: QueryPersonalizationData) => void;
-
-            get_processBestBets: () => boolean;
-            set_processBestBets: (value: boolean) => void;
-
-            get_processPersonalFavorites: () => boolean;
-            set_processPersonalFavorites: (value: boolean) => void;
-
-            get_queryTag: () => string;
-            set_queryTag: (value: string) => void;
-
-            get_queryTemplate: () => string;
-            set_queryTemplate: (value: string) => void;
-
-            get_queryTemplateParameters: () => { [key: string]: boolean; };
-
-            get_queryText: () => string;
-            set_queryText: (value: string) => void;
-
-            get_rankingModelId: () => string;
-            set_rankingModelId: (value: string) => void;
-
-            get_resultsUrl: () => string;
-            set_resultsUrl: (value: string) => void;
-
-            get_rowLimit: () => number;
-            set_rowLimit: (value: number) => void;
-
-            get_rowsPerPage: () => number;
-            set_rowsPerPage: (value: number) => void;
-
-            get_safeQueryPropertiesTemplateUrl: () => string;
-            set_safeQueryPropertiesTemplateUrl: (value: string) => void;
-
-            get_showPeopleNameSuggestions: () => boolean;
-            set_showPeopleNameSuggestions: (value: boolean) => void;
-
-            get_sourceId: () => SP.Guid;
-            set_sourceId: (value: SP.Guid) => void;
-
-            get_startRow: () => number;
-            set_startRow: (value: number) => void;
-
-            get_summaryLength: () => number;
-            set_summaryLength: (value: number) => void;
-
-            get_timeout: () => number;
-            set_timeout: (value: number) => void;
-
-            get_totalRowsExactMinimum: () => number;
-            set_totalRowsExactMinimum: (value: number) => void;
-
-            get_trimDuplicates: () => boolean;
-            set_trimDuplicates: (value: boolean) => void;
-
-
-            get_uiLanguage: () => number;
-            set_uiLanguage: (value: number) => void;
-
-
-
-            getQuerySuggestionsWithResults: (iNumberOfQuerySuggestions: number,
-                iNumberOfResultSuggestions: number,
-                fPreQuerySuggestions: boolean,
-                fHitHighlighting: boolean,
-                fCapitalizeFirstLetters: boolean,
-                fPrefixMatchAllTerms: boolean) => QuerySuggestionResults;
-
-
-        }
-
-        /**Contains information about a keyword based search query.*/
-        export class KeywordQuery extends Query {
-            constructor(context: SP.ClientContext);
-
-            get_collapseSpecification: () => string;
-            set_collapseSpecification: (value: string) => void;
-
-            get_enableSorting: () => boolean;
-            set_enableSorting: (value: boolean) => void;
-
-            get_hiddenConstraints: () => string;
-            set_hiddenConstraints: (value: string) => void;
-
-            get_properties: () => KeywordQueryProperties;
-
-            get_refinementFilters: () => StringCollection;
-            set_refinementFilters: (value: StringCollection) => void;
-
-            get_refiners: () => string;
-            set_refiners: (value: string) => void;
-
-            get_reorderingRules: () => ReorderingRuleCollection;
-            set_reorderingRules: (value: ReorderingRuleCollection) => void;
-
-            /**Specifies the list of managed properties to be returned for each search result.*/
-            get_selectProperties: () => StringCollection;
-
-            get_sortList: () => SortCollection;
-
-            get_trimDuplicatesIncludeId: () => number;
-            set_trimDuplicatesIncludeId: (value: number) => void;
-        }
-
-        /**Executes queries against a search server.*/
-        export class SearchExecutor extends SP.ClientObject {
-            constructor(context: SP.ClientContext);
-
-            /**Runs a query.*/
-            executeQuery: (query: Query) => SP.JsonObjectResult;
-            executeQueries: (queryIds: string[], queries: Query[], handleExceptions: boolean) => SP.JsonObjectResult;
-            recordPageClick: (
-                pageInfo: string,
-                clickType: string,
-                blockType: number,
-                clickedResultId: string,
-                subResultIndex: number,
-                immediacySourceId: string,
-                immediacyQueryString: string,
-                immediacyTitle: string,
-                immediacyUrl: string) => void;
-            exportPopularQueries: (web: SP.Web, sourceId: SP.Guid) => SP.JsonObjectResult;
-        }
-
-
-        export class StringCollection extends SP.ClientObjectCollection<string> {
-            constructor(context: SP.ClientContext);
-            itemAt: (index: number) => string;
-            get_item: (index: number) => string;
-            get_childItemType: () => Object;
-            add: (property: string) => void;
-            clear: () => void;
-        }
-
-        export class QueryPersonalizationData extends SP.ClientObject {
-            //It's really empty;
-        }
-
-        export class QuerySuggestionResults extends SP.ClientValueObject {
-            get_peopleNames: () => string[];
-            set_peopleNames: (value: string[]) => void;
-
-            get_personalResults: () => PersonalResultSuggestion[];
-            set_personalResults: (value: PersonalResultSuggestion[]) => void;
-
-            get_queries: () => QuerySuggestionQuery[];
-            set_queries: (value: QuerySuggestionQuery[]) => void;
-        }
-
-        export class PersonalResultSuggestion extends SP.ClientValueObject {
-            get_highlightedTitle: () => string;
-            set_highlightedTitle: (value: string) => void;
-
-            get_isBestBet: () => boolean;
-            set_isBestBet: (value: boolean) => void;
-
-            get_title: () => string;
-            set_title: (value: string) => void;
-
-            get_url: () => string;
-            set_url: (value: string) => void;
-        }
-
-        export class QuerySuggestionQuery extends SP.ClientValueObject {
-            get_isPersonal: () => boolean;
-            set_isPersonal: (value: boolean) => void;
-
-            get_query: () => string;
-            set_query: (value: string) => void;
-        }
-
-        export class KeywordQueryProperties extends SP.ClientObject {
-            get_item: (key: string) => any;
-            set_item: (key: string, value: any) => void;
-            setQueryPropertyValue: (name: string) => QueryPropertyValue;
-            getQueryPropertyValue: (name: string, value: QueryPropertyValue) => void;
-        }
-
-        export enum QueryPropertyValueType {
-            none,
-            stringType,
-            int32TYpe,
-            booleanType,
-            stringArrayType,
-            unSupportedType
-        }
-
-        export class QueryPropertyValue extends SP.ClientValueObject {
-            get_boolVal: () => boolean;
-            set_boolVal: (value: boolean) => boolean;
-
-            get_intVal: () => number;
-            set_intVal: (value: number) => number;
-            get_queryPropertyValueTypeIndex: () => number;
-            set_queryPropertyValueTypeIndex: (value: number) => void;
-            get_strArray: () => string[];
-            set_strArray: (value: string[]) => string[];
-            get_strVal: () => string;
-            set_strVal: (value: string) => string;
-        }
-
-        export class QueryUtility {
-            static create: (name: string, val: any) => QueryPropertyValue;
-            static getQueryPropertyValueType: (val: QueryPropertyValue) => QueryPropertyValueType;
-            static queryPropertyValueToObject: (val: QueryPropertyValue) => any;
-        }
-        export class ReorderingRuleCollection extends SP.ClientObjectCollection<ReorderingRule> {
-            itemAt: (index: number) => ReorderingRule;
-            get_item: (index: number) => ReorderingRule;
-            get_childItemType: () => Object;
-            add: (property: ReorderingRule) => void;
-            clear: () => void;
-        }
-
-        export enum ReorderingRuleMatchType {
-            resultContainsKeyword,
-            titleContainsKeyword,
-            titleMatchesKeyword,
-            urlStartsWith,
-            urlExactlyMatches,
-            contentTypeIs,
-            fileExtensionMatches,
-            resultHasTag,
-            manualCondition
-        }
-
-        export class ReorderingRule extends SP.ClientValueObject {
-            get_boost: () => number;
-            set_boost: (value: number) => void;
-
-            get_matchType: () => ReorderingRuleMatchType;
-            set_matchType: (value: ReorderingRuleMatchType) => void;
-
-            get_matchValue: () => string;
-            set_matchValue: (value: string) => void;
-        }
-
-        export class SortCollection extends SP.ClientObjectCollection<Sort> {
-            itemAt: (index: number) => Sort;
-            get_item: (index: number) => Sort;
-            get_childItemType: () => Object;
-            add: (strProperty: string, sortDirection: SortDirection) => void;
-            clear: () => void;
-        }
-
-        enum SortDirection {
-            ascending,
-            descending,
-            fqlFormula
-        }
-        export class Sort extends SP.ClientValueObject {
-            get_direction: () => SortDirection;
-            set_direction: (value: SortDirection) => void;
-
-            get_property: () => string;
-            set_property: (value: string) => void;
-        }
-
-
-        export class ResultTableCollection extends SP.ClientValueObjectCollection<ResultTable> {
-            get_item: (index: number) => ResultTable;
-
-            get_elapsedTime: () => number;
-            set_elapsedTime: (value: number) => void;
-
-            get_properties: () => { [key: string]: any; };
-
-            get_queryErrors: () => { [key: string]: WebControls.ControlMessage; };
-
-            get_queryId: () => string;
-
-            get_spellingSuggestion: () => string;
-
-            get_triggeredRules: () => SP.Guid[];
-
-            initPropertiesFromJson: (parentNode: any) => void;
-
-        }
-
-        export class ResultTable extends SP.ClientValueObject {
-            get_groupTemplateId: () => string;
-
-            get_itemTemplateId: () => string;
-
-            get_properties: () => { [key: string]: any; };
-
-            get_queryId: () => string;
-
-            get_queryRuleId: () => string;
-
-            get_resultRows: () => { [key: string]: any; }[];
-
-            get_resultTitle: () => string;
-
-            get_resultTitleUrl: () => string;
-
-            get_rowCount: () => number;
-
-            get_tableType: () => string;
-
-            get_totalRows: () => number;
-
-            get_totalRowsIncludingDuplicates: () => number;
-
-            initPropertiesFromJson: (parentNode: any) => void;
-        }
-
-        export class RankingLabeling extends SP.ClientObject {
-            constructor(context: SP.ClientContext);
-            getJudgementsForQuery: (query: string) => SP.JsonObjectResult;
-            addJudgment: (userQuery: string, url: string, labelId: number) => void;
-            normalizeResultUrl: (url: string) => SP.JsonObjectResult;
-        }
-
-        export class PopularQuery extends SP.ClientValueObject {
-            get_clickCount: () => number;
-            set_clickCount: (value: number) => void;
-
-            get_LCID: () => number;
-            set_LCID: (value: number) => void;
-
-            get_queryCount: () => number;
-            set_queryCount: (value: number) => void;
-
-            get_queryText: () => string;
-            set_queryText: (value: string) => void;
-        }
-
-        export class QueryPropertyNames {
-            static blockDedupeMode: string; // 'BlockDedupeMode';
-            static bypassResultTypes: string; // 'BypassResultTypes';
-            static clientType: string; // 'ClientType';
-            static culture: string; // 'Culture';
-            static desiredSnippetLength: string; // 'DesiredSnippetLength';
-            static enableInterleaving: string; // 'EnableInterleaving';
-            static enableNicknames: string; // 'EnableNicknames';
-            static enableOrderingHitHighlightedProperty: string; // 'EnableOrderingHitHighlightedProperty';
-            static enablePhonetic: string; // 'EnablePhonetic';
-            static enableQueryRules: string; // 'EnableQueryRules';
-            static enableStemming: string; // 'EnableStemming';
-            static generateBlockRankLog: string; // 'GenerateBlockRankLog';
-            static hitHighlightedMultivaluePropertyLimit: string; // 'HitHighlightedMultivaluePropertyLimit';
-            static ignoreSafeQueryPropertiesTemplateUrl: string; // 'IgnoreSafeQueryPropertiesTemplateUrl';
-            static impressionID: string; // 'ImpressionID';
-            static maxSnippetLength: string; // 'MaxSnippetLength';
-            static processBestBets: string; // 'ProcessBestBets';
-            static processPersonalFavorites: string; // 'ProcessPersonalFavorites';
-            static queryTag: string; // 'QueryTag';
-            static queryTemplate: string; // 'QueryTemplate';
-            static queryTemplateParameters: string; // 'QueryTemplateParameters';
-            static queryText: string; // 'QueryText';
-            static rankingModelId: string; // 'RankingModelId';
-            static resultsUrl: string; // 'ResultsUrl';
-            static rowLimit: string; // 'RowLimit';
-            static rowsPerPage: string; // 'RowsPerPage';
-            static safeQueryPropertiesTemplateUrl: string; // 'SafeQueryPropertiesTemplateUrl';
-            static showPeopleNameSuggestions: string; // 'ShowPeopleNameSuggestions';
-            static sourceId: string; // 'SourceId';
-            static startRow: string; // 'StartRow';
-            static summaryLength: string; // 'SummaryLength';
-            static timeout: string; // 'Timeout';
-            static totalRowsExactMinimum: string; // 'TotalRowsExactMinimum';
-            static trimDuplicates: string; // 'TrimDuplicates';
-            static uiLanguage: string; // 'UILanguage';
-        }
-
-        export class QueryObjectPropertyNames {
-            static hitHighlightedProperties: string; // = 'HitHighlightedProperties';
-            static personalizationData: string; // = 'PersonalizationData';
-        }
-
-        export class KeywordQueryPropertyNames {
-            static collapseSpecification: string; // 'CollapseSpecification';
-            static enableSorting: string; // 'EnableSorting';
-            static hiddenConstraints: string; // 'HiddenConstraints';
-            static refiners: string; // 'Refiners';
-            static trimDuplicatesIncludeId: string; // 'TrimDuplicatesIncludeId';
-        }
-
-        export class KeywordQueryObjectPropertyNames {
-            static properties: string; // 'Properties';
-            static refinementFilters: string; // 'RefinementFilters';
-            static reorderingRules: string; // 'ReorderingRules';
-            static selectProperties: string; // 'SelectProperties';
-            static sortList: string; // 'SortList';
-        }
-    }
-
-    namespace WebControls {
-        export class ControlMessage extends SP.ClientValueObject {
-            get_code: () => number;
-
-            get_correlationID: () => string;
-
-            get_encodeDetails: () => boolean;
-
-            get_header: () => string;
-
-            get_level: () => MessageLevel;
-
-            get_messageDetails: () => string;
-
-            get_messageDetailsForViewers: () => string;
-
-            get_serverTypeId: () => string;
-
-            get_showForViewerUsers: () => boolean;
-
-            get_showInEditModeOnly: () => boolean;
-
-            get_stackTrace: () => string;
-
-            get_type: () => string;
-        }
-
-        export enum MessageLevel {
-            information,
-            warning,
-            error
-        }
-    }
-
-    namespace Administration {
-        export class DocumentCrawlLog extends SP.ClientObject {
-            constructor(context: SP.ClientContext, site: SP.Site);
-            getCrawledUrls: (getCountOnly: boolean,
-                maxRows: { High: number; Low: number; },
-                queryString: string,
-                isLike: boolean,
-                contentSourceID: number,
-                errorLevel: number,
-                errorID: number,
-                startDateTime: Date,
-                endDateTime: Date) => SP.JsonObjectResult;
-        }
-
-        export class SearchObjectOwner extends SP.ClientObject {
-            constructor(context: SP.ClientContext, lowestCurrentLevelToUse: SearchObjectLevel);
-        }
-
-        export enum SearchObjectLevel {
-            spWeb,
-            spSite,
-            spSiteSubscription,
-            ssa
-        }
-    }
-
-    namespace Portability {
-        export class SearchConfigurationPortability extends SP.ClientObject {
-            constructor(context: SP.ClientContext);
-            get_importWarnings: () => string;
-
-            exportSearchConfiguration: (owningScope: Administration.SearchObjectOwner) => SP.JsonObjectResult;
-
-            importSearchConfiguration: (owningScope: Administration.SearchObjectOwner, searchConfiguration: string) => void;
-
-            deleteSearchConfiguration: (owningScope: Administration.SearchObjectOwner, searchConfiguration: string) => void;
-        }
-
-        export class SearchConfigurationPortabilityPropertyNames {
-            static importWarnings: string;// = 'ImportWarnings'
-        }
-    }
-
-    /**Located in sp.search.apps.js*/
-    namespace Analytics {
-        export class AnalyticsItemData extends SP.ClientObject {
-            get_lastProcessingTime: () => Date;
-
-            get_totalHits: () => number;
-
-            get_totalUniqueUsers: () => number;
-
-            getHitCountForDay: (day: Date) => number;
-
-            getUniqueUsersCountForDay: (day: Date) => number;
-
-            getHitCountForMonth: (day: Date) => number;
-
-            getUniqueUsersCountForMonth: (day: Date) => number;
-        }
-
-        export class UsageAnalytics extends SP.ClientObject {
-            getAnalyticsItemData: (eventType: number, listItem: SP.ListItem) => AnalyticsItemData;
-
-            getAnalyticsItemDataForApplicationEventType: (appEventType: SP.Guid, listItem: SP.ListItem) => AnalyticsItemData;
-
-            deleteStandardEventUsageData: (eventType: number) => void;
-
-            deleteCustomEventUsageData: (appEventTypeId: SP.Guid) => void;
-        }
-
-
-
-    }
-}
-
-declare namespace SP {
-    export module BusinessData {
-        export class AppBdcCatalog extends SP.ClientObject {
-            getEntity(namespace: string, name: string): SP.BusinessData.Entity;
-            getLobSystemProperty(lobSystemName: string, propertyName: string): SP.StringResult;
-            setLobSystemProperty(lobSystemName: string, propertyName: string, propertyValue: string): void;
-            getLobSystemInstanceProperty(lobSystemName: string, lobSystemInstanceName: string, propertyName: string): SP.StringResult;
-            setLobSystemInstanceProperty(lobSystemName: string, lobSystemInstanceName: string, propertyName: string, propertyValue: string): void;
-            getConnectionId(lobSystemName: string, lobSystemInstanceName: string): SP.StringResult;
-            setConnectionId(lobSystemName: string, lobSystemInstanceName: string, connectionId: string): void;
-            getPermissibleConnections(): string[];
-        }
-        export class Entity extends SP.ClientObject {
-            get_estimatedInstanceCount(): number;
-            get_name(): string;
-            get_namespace(): string;
-            getIdentifiers(): SP.BusinessData.Collections.EntityIdentifierCollection;
-            getIdentifierCount(): SP.IntResult;
-            getLobSystem(): SP.BusinessData.LobSystem;
-            getCreatorView(methodInstanceName: string): SP.BusinessData.EntityView;
-            getUpdaterView(updaterName: string): SP.BusinessData.EntityView;
-            getFinderView(methodInstanceName: string): SP.BusinessData.EntityView;
-            getSpecificFinderView(specificFinderName: string): SP.BusinessData.EntityView;
-            getDefaultSpecificFinderView(): SP.BusinessData.EntityView;
-            findSpecificDefault(identity: SP.BusinessData.Runtime.EntityIdentity, lobSystemInstance: SP.BusinessData.LobSystemInstance): SP.BusinessData.Runtime.EntityInstance;
-            findSpecific(identity: SP.BusinessData.Runtime.EntityIdentity, specificFinderName: string, lobSystemInstance: SP.BusinessData.LobSystemInstance): SP.BusinessData.Runtime.EntityInstance;
-            findSpecificDefaultByBdcId(bdcIdentity: string, lobSystemInstance: SP.BusinessData.LobSystemInstance): SP.BusinessData.Runtime.EntityInstance;
-            findSpecificByBdcId(bdcIdentity: string, specificFinderName: string, lobSystemInstance: SP.BusinessData.LobSystemInstance): SP.BusinessData.Runtime.EntityInstance;
-            findFiltered(filterList: SP.BusinessData.Collections.FilterCollection, nameOfFinder: string, lobSystemInstance: SP.BusinessData.LobSystemInstance): SP.BusinessData.Collections.EntityInstanceCollection;
-            findAssociated(entityInstance: SP.BusinessData.Runtime.EntityInstance, associationName: string, filterList: SP.BusinessData.Collections.FilterCollection, lobSystemInstance: SP.BusinessData.LobSystemInstance): SP.BusinessData.Collections.EntityInstanceCollection;
-            getFilters(methodInstanceName: string): SP.BusinessData.Collections.FilterCollection;
-            execute(methodInstanceName: string, lobSystemInstance: SP.BusinessData.LobSystemInstance, inputParams: any[]): SP.BusinessData.MethodExecutionResult;
-            getAssociationView(associationName: string): SP.BusinessData.EntityView;
-            create(fieldValues: SP.BusinessData.Runtime.EntityFieldValueDictionary, lobSystemInstance: SP.BusinessData.LobSystemInstance): SP.BusinessData.Runtime.EntityIdentity;
-            subscribe(eventType: SP.BusinessData.Runtime.EntityEventType, notificationCallback: SP.BusinessData.Runtime.NotificationCallback, onBehalfOfUser: string, subscriberName: string, lobSystemInstance: SP.BusinessData.LobSystemInstance): SP.BusinessData.Runtime.Subscription;
-            unsubscribe(subscription: SP.BusinessData.Runtime.Subscription, onBehalfOfUser: string, unsubscriberName: string, lobSystemInstance: SP.BusinessData.LobSystemInstance): void;
-        }
-        export class EntityField extends SP.ClientObject {
-            get_containsLocalizedDisplayName(): boolean;
-            get_defaultDisplayName(): string;
-            get_localizedDisplayName(): string;
-            get_name(): string;
-        }
-        export class EntityIdentifier extends SP.ClientObject {
-            get_identifierType(): string;
-            get_name(): string;
-            getDefaultDisplayName(): SP.StringResult;
-            containsLocalizedDisplayName(): SP.BooleanResult;
-            getLocalizedDisplayName(): SP.StringResult;
-        }
-        export class EntityView extends SP.ClientObject {
-            get_fields(): SP.BusinessData.Collections.EntityFieldCollection;
-            get_name(): string;
-            get_relatedSpecificFinderName(): string;
-            getDefaultValues(): SP.BusinessData.Runtime.EntityFieldValueDictionary;
-            getXmlSchema(): SP.StringResult;
-            getTypeDescriptor(fieldDotNotation: string): SP.BusinessData.TypeDescriptor;
-            getType(fieldDotNotation: string): SP.StringResult;
-        }
-        export class Filter extends SP.ClientObject {
-            get_defaultDisplayName(): string;
-            get_filterField(): string;
-            get_filterType(): string;
-            get_localizedDisplayName(): string;
-            get_name(): string;
-            get_valueCount(): number;
-        }
-        export class LobSystem extends SP.ClientObject {
-            get_name(): string;
-            getLobSystemInstances(): SP.BusinessData.Collections.LobSystemInstanceCollection;
-        }
-        export class LobSystemInstance extends SP.ClientObject {
-            get_name(): string;
-        }
-        export class MethodExecutionResult extends SP.ClientObject {
-            get_returnParameterCollection(): SP.BusinessData.ReturnParameterCollection;
-        }
-        export class ReturnParameterCollection extends SP.ClientObjectCollection<SP.BusinessData.Runtime.EntityFieldValueDictionary> {
-            itemAt(index: number): SP.BusinessData.Runtime.EntityFieldValueDictionary;
-            get_item(index: number): SP.BusinessData.Runtime.EntityFieldValueDictionary;
-        }
-        export class TypeDescriptor extends SP.ClientObject {
-            get_containsReadOnly(): boolean;
-            get_isCollection(): boolean;
-            get_isReadOnly(): boolean;
-            get_name(): string;
-            get_typeName(): string;
-            containsLocalizedDisplayName(): SP.BooleanResult;
-            getLocalizedDisplayName(): SP.StringResult;
-            getDefaultDisplayName(): SP.StringResult;
-            isRoot(): SP.BooleanResult;
-            isLeaf(): SP.BooleanResult;
-            getChildTypeDescriptors(): SP.BusinessData.Collections.TypeDescriptorCollection;
-            getParentTypeDescriptor(): SP.BusinessData.TypeDescriptor;
-        }
-        export module Collections {
-            export class EntityFieldCollection extends SP.ClientObjectCollection<SP.BusinessData.EntityField> {
-                itemAt(index: number): SP.BusinessData.EntityField;
-                get_item(index: number): SP.BusinessData.EntityField;
-            }
-            export class EntityIdentifierCollection extends SP.ClientObjectCollection<SP.BusinessData.EntityIdentifier> {
-                itemAt(index: number): SP.BusinessData.EntityIdentifier;
-                get_item(index: number): SP.BusinessData.EntityIdentifier;
-            }
-            export class EntityInstanceCollection extends SP.ClientObjectCollection<SP.BusinessData.Runtime.EntityInstance> {
-                itemAt(index: number): SP.BusinessData.Runtime.EntityInstance;
-                get_item(index: number): SP.BusinessData.Runtime.EntityInstance;
-            }
-            export class FilterCollection extends SP.ClientObjectCollection<SP.BusinessData.Filter> {
-                itemAt(index: number): SP.BusinessData.Filter;
-                get_item(index: number): SP.BusinessData.Filter;
-                setFilterValue(inputFilterName: string, valueIndex: number, value: any): void;
-            }
-            export class LobSystemInstanceCollection extends SP.ClientObjectCollection<SP.BusinessData.LobSystemInstance> {
-                itemAt(index: number): SP.BusinessData.LobSystemInstance;
-                get_item(index: number): SP.BusinessData.LobSystemInstance;
-            }
-            export class TypeDescriptorCollection extends SP.ClientObjectCollection<SP.BusinessData.TypeDescriptor> {
-                itemAt(index: number): SP.BusinessData.TypeDescriptor;
-                get_item(index: number): SP.BusinessData.TypeDescriptor;
-            }
-        }
-
-        export module Infrastructure {
-            export class ExternalSubscriptionStore extends SP.ClientObject {
-                constructor(context: SP.ClientRuntimeContext, web: SP.Web);
-                static newObject(context: SP.ClientRuntimeContext, web: SP.Web): SP.BusinessData.Infrastructure.ExternalSubscriptionStore;
-                indexStore(): void;
-            }
-        }
-
-        export module Runtime {
-            export enum EntityEventType {
-                none,
-                itemAdded,
-                itemUpdated,
-                itemDeleted,
-            }
-            export class EntityFieldValueDictionary extends SP.ClientObject {
-                get_fieldValues(): any;
-                get_item(fieldName: string): any;
-                set_item(fieldName: string, value: any): void;
-                refreshLoad(): void;
-                fromXml(xml: string): void;
-                toXml(): SP.StringResult;
-                createInstance(fieldInstanceDotNotation: string, fieldDotNotation: string): void;
-                createCollectionInstance(fieldDotNotation: string, size: number): void;
-                getCollectionSize(fieldDotNotation: string): SP.IntResult;
-            }
-            export class EntityIdentity extends SP.ClientObject {
-                get_fieldValues(): any;
-                get_item(fieldName: string): any;
-                constructor(context: SP.ClientRuntimeContext, identifierValues: any[]);
-                get_identifierCount(): number;
-                static newObject(context: SP.ClientRuntimeContext, identifierValues: any[]): SP.BusinessData.Runtime.EntityIdentity;
-                refreshLoad(): void;
-            }
-            export class EntityInstance extends SP.ClientObject {
-                get_fieldValues(): any;
-                get_item(fieldName: string): any;
-                set_item(fieldName: string, value: any): void;
-                refreshLoad(): void;
-                createInstance(fieldInstanceDotNotation: string, fieldDotNotation: string): void;
-                createCollectionInstance(fieldDotNotation: string, size: number): void;
-                getIdentity(): SP.BusinessData.Runtime.EntityIdentity;
-                deleteObject(): void;
-                update(): void;
-                fromXml(xml: string): void;
-                toXml(): SP.StringResult;
-            }
-            export class NotificationCallback extends SP.ClientObject {
-                constructor(context: SP.ClientRuntimeContext, notificationEndpoint: string);
-                get_notificationContext(): string;
-                set_notificationContext(value: string): void;
-                get_notificationEndpoint(): string;
-                get_notificationForwarderType(): string;
-                set_notificationForwarderType(value: string): void;
-                static newObject(context: SP.ClientRuntimeContext, notificationEndpoint: string): SP.BusinessData.Runtime.NotificationCallback;
-            }
-            export class Subscription extends SP.ClientObject {
-                constructor(context: SP.ClientRuntimeContext, id: any, hash: string);
-                get_hash(): string;
-                get_iD(): any;
-                static newObject(context: SP.ClientRuntimeContext, id: any, hash: string): SP.BusinessData.Runtime.Subscription;
-            }
-        }
-    }
-}
-
-declare namespace SP {
-    export module Sharing {
-        export class DocumentSharingManager {
-            static getRoleDefinition(context: SP.ClientRuntimeContext, role: SP.Sharing.Role): SP.RoleDefinition;
-            static isDocumentSharingEnabled(context: SP.ClientRuntimeContext, list: SP.List): SP.BooleanResult;
-            static updateDocumentSharingInfo(context: SP.ClientRuntimeContext, resourceAddress: string, userRoleAssignments: SP.Sharing.UserRoleAssignment[], validateExistingPermissions: boolean, additiveMode: boolean, sendServerManagedNotification: boolean, customMessage: string, includeAnonymousLinksInNotification: boolean): SP.Sharing.UserSharingResult[];
-        }
-        export enum Role {
-            none,
-            view,
-            edit,
-            owner,
-        }
-        export class UserRoleAssignment extends SP.ClientValueObject {
-            get_role(): SP.Sharing.Role;
-            set_role(value: SP.Sharing.Role): void;
-            get_userId(): string;
-            set_userId(value: string): void;
-            get_typeId(): string;
-            writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-            constructor();
-        }
-        export class UserSharingResult extends SP.ClientValueObject {
-            get_allowedRoles(): SP.Sharing.Role[];
-            get_currentRole(): SP.Sharing.Role;
-            get_isUserKnown(): boolean;
-            get_message(): string;
-            get_status(): boolean;
-            get_user(): string;
-            get_typeId(): string;
-            writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-            constructor();
-        }
-    }
-
-}
-
-declare namespace SP {
-
-    export module Social {
-        /** Identifies an actor as a user, document, site, or tag. */
-        export enum SocialActorType {
-            user,
-            document,
-            site,
-            tag
-        }
-        /** Specifies one or more actor types in a query to the server. */
-        export enum SocialActorTypes {
-            none,
-            users,
-            documents,
-            sites,
-            tags,
-            /** The set excludes documents and sites that do not have feeds. */
-            excludeContentWithoutFeeds,
-            all
-        }
-        /** Specifies whether the action is to navigate to the attachment or to perform some action dependent on the context in which the attachment is presented to the user. */
-        export enum SocialAttachmentActionKind {
-            /** This value specifies that the action is to navigate to the attachment. */
-            navigate,
-            /** This value specifies that the action is dependent on the context that the attachment is displayed to the user. */
-            adHocAction
-        }
-
-        export enum SocialAttachmentKind {
-            image,
-            video,
-            document
-        }
-
-        /** Specifies whether the item being inserted is a user, document, site, tag, or link. */
-        export enum SocialDataItemType {
-            user,
-            document,
-            site,
-            tag,
-            link
-        }
-
-        /** Specifies whether the overlay is a link or one or more actors. */
-        export enum SocialDataOverlayType {
-            link,
-            actors
-        }
-
-        /** Specifies whether the sort order is by creation time or modification time. */
-        export enum SocialFeedSortOrder {
-            byModifiedTime,
-            byCreatedTime
-        }
-
-        /** Identifies the kind of post to be retrieved.  */
-        export enum SocialFeedType {
-            personal,
-            news,
-            timeline,
-            likes,
-            everyone
-        }
-
-        // For some reasons this enum doesn't exist
-        //export enum SocialFollowResult {
-        //    ok = 0,
-        //    alreadyFollowing = 1,
-        //    limitReached = 2,
-        //    internalError = 3
-        //}
-
-        /** Provides information about the feed.
-            This type provides information about whether the feed on the server contains additional threads that were not returned. */
-        export enum SocialFeedAttributes {
-            none,
-            moreThreadsAvailable
-        }
-
-        /** Specifies attributes of the post, such as whether the current user can like or delete the post. */
-        export enum SocialPostAttributes {
-            none,
-            canLike,
-            canDelete,
-            useAuthorImage,
-            useSmallImage,
-            canFollowUp
-        }
-
-        /** Defines the type of item being specified in the SocialPostDefinitionDataItem.
-            This type is only available in server-to-server calls. */
-        export enum SocialPostDefinitionDataItemType {
-            text,
-            user,
-            document,
-            site,
-            tag,
-            link
-        }
-
-        export enum SocialPostType {
-            root,
-            reply
-        }
-
-        /** Specifies a status or error code. */
-        export enum SocialStatusCode {
-            OK,
-            /** This value specifies that an invalid request was encountered. */
-            invalidRequest,
-            /** This value specifies that access was denied to the current user. */
-            accessDenied,
-            itemNotFound,
-            /** This value specifies that an invalid operation was attempted. */
-            invalidOperation,
-            /** This value specifies that the item was not changed by the operation. */
-            itemNotModified,
-            internalError,
-            /** This value specifies that there was an error reading the cache. */
-            cacheReadError,
-            /** This value specifies that there was an error updating the cache. */
-            cacheUpdateError,
-            personalSiteNotFound,
-            failedToCreatePersonalSite,
-            notAuthorizedToCreatePersonalSite,
-            cannotCreatePersonalSite,
-            /** This value specifies that a server limit was reached. */
-            limitReached,
-            /** This value specifies that the operation failed because there was an error handling an attachment. */
-            attachmentError,
-            /** This value specifies that the operation completed with recoverable errors and that the returned data is incomplete. */
-            partialData,
-            /** This value specifies that the operation failed because a required server feature was disabled by administrative action. */
-            featureDisabled
-        }
-
-        /** Specifies properties of the thread. */
-        export enum SocialThreadAttributes {
-            none,
-            isDigest,
-            canReply,
-            canLock,
-            isLocked,
-            replyLimitReached
-        }
-
-        export enum SocialThreadType {
-            normal,
-            likeReference,
-            replyReference,
-            mentionReference,
-            tagReference
-        }
-
-        /** Contains information about an actor retrieved from server. An actor is a user, document, site, or tag. */
-        export class SocialActor extends SP.ClientValueObject {
-            /** The AccountName property returns the user account name.
-                This property is only available for social actors of type "user". */
-            get_accountName(): string;
-            /** Identifies whether the actor is a user, document, site, or tag. */
-            get_actorType(): SocialActorType;
-            /** Specifies whether the actor can be followed by the current user. */
-            get_canFollow(): boolean;
-            /** Returns the URI of the document or site content.
-                This property is only available for social actors of type Document or Site. */
-            get_contentUri(): string;
-            get_emailAddress(): string;
-            /** Returns the URI of the user's followed content folder.
-                This property is only available for social actors of type "user". */
-            get_followedContentUri(): string;
-            /** Returns the actor's unique identifier. */
-            get_id(): string;
-            /** Returns the URI of the image representing the actor.
-                This property is only available if actor is User, Document, or Site. */
-            get_imageUri(): string;
-            /** Returns true if the current user is following the actor; otherwise, it returns false. */
-            get_isFollowed(): boolean;
-            /** Returns the URI of the library containing the document.
-                This property is only available for social actors of type "document". */
-            get_libraryUri(): string;
-            /** The Name property returns the actor's display name. */
-            get_name(): string;
-            /** Returns the URI of the user's personal site.
-                This property is only available for social actors of type "user". */
-            get_personalSiteUri(): string;
-            /** Represents the status of retrieving the actor */
-            get_status(): SocialStatusCode;
-            /** The StatusText property returns the most recent post of the user.
-                This property is only available for social actors of type "user". */
-            get_statusText(): string;
-            /** Returns the GUID of the tag.
-                Only available for social actors of type "tag" */
-            get_tagGuid(): string;
-            /** Returns the user's title
-                This property is only available for social actors of type "user". */
-            get_title(): string;
-            /** Returns the URI of the actor. */
-            get_uri(): string;
-        }
-
-        /** Identifies an actor to the server. An actor can be a user, document, site, or tag. */
-        export class SocialActorInfo extends SP.ClientValueObject {
-            /** User account name.
-                This property is only available for social actors of type "user". */
-            get_accountName(): string;
-            /** User account name.
-                This property is only available for social actors of type "user". */
-            set_accountName(value: string): string;
-            /** Identifies whether the actor is a user, document, site, or tag. */
-            get_actorType(): SocialActorType;
-            /** Identifies whether the actor is a user, document, site, or tag. */
-            set_actorType(value: SocialActorType): SocialActorType;
-            /** URI of the document or site content.
-                This property is only available for social actors of type Document or Site. */
-            get_contentUri(): string;
-            /** URI of the document or site content.
-                This property is only available for social actors of type Document or Site. */
-            set_contentUri(value: string): string;
-            /** Actor's unique identifier. */
-            get_id(): string;
-            /** Actor's unique identifier. */
-            set_id(value: string): string;
-            /** GUID of the tag.
-                Only available for social actors of type "tag" */
-            get_tagGuid(): string;
-            /** GUID of the tag.
-                Only available for social actors of type "tag" */
-            set_tagGuid(value: string): string;
-        }
-
-        /** Represents an image, document preview, or video preview attachment.  */
-        export class SocialAttachment extends SP.ClientValueObject {
-            /** Specifies the type of object that the attachment contains. */
-            get_attachmentKind(): SocialAttachmentKind;
-            /** Specifies the type of object that the attachment contains. */
-            set_attachmentKind(value: SocialAttachmentKind): SocialAttachmentKind;
-            /** Specifies the action to take when the user selects the attachment.
-                This property is only present if the AttachmentKind is Video. */
-            get_clickAction(): SocialAttachmentAction;
-            /** Specifies the action to take when the user selects the attachment.
-                This property is only present if the AttachmentKind is Video. */
-            set_clickAction(value: SocialAttachmentAction): SocialAttachmentAction;
-            /** Specifies the URI of the attachment content. */
-            get_contentUri(): string;
-            /** Specifies the URI of the attachment content. */
-            set_contentUri(value: string): string;
-            /** Provides a text description of the attachment. */
-            get_description(): string;
-            /** Provides a text description of the attachment. */
-            set_description(value: string): string;
-            /** Specifies the height of the attachment or of the attachment preview. */
-            get_height(): number;
-            /** Specifies the height of the attachment or of the attachment preview. */
-            set_height(value: number): number;
-            /** Specifies the duration of the attachment in seconds. This property is only present if the AttachmentKind is Video. */
-            get_length(): number;
-            /** Specifies the duration of the attachment in seconds. This property is only present if the AttachmentKind is Video. */
-            set_length(value: number): number;
-            /** Provides the attachment name. */
-            get_name(): string;
-            /** Provides the attachment name. */
-            set_name(value: string): string;
-            /** Specifies the URI of the attachment�s preview thumbnail.
-                This property is only present if the AttachmentKind is Document or Video. */
-            get_previewUri(): string;
-            /** Specifies the URI of the attachment�s preview thumbnail.
-                This property is only present if the AttachmentKind is Document or Video. */
-            set_previewUri(value: string): string;
-            /** Provides the attachment URI. */
-            get_uri(): string;
-            /** Provides the attachment URI. */
-            set_uri(value: string): string;
-            /** Specifies the width of the attachment or of the attachment preview. */
-            get_width(): number;
-            /** Specifies the width of the attachment or of the attachment preview. */
-            set_width(value: number): number;
-        }
-        /** Specifies the user actions that are allowed for the attachment object. */
-        export class SocialAttachmentAction extends SP.ClientValueObject {
-            /** Specifies whether the action is to navigate to a URI or an action that is dependent on the context in which the object is presented to the user. */
-            get_actionKind(): SocialAttachmentActionKind;
-            /** Specifies whether the action is to navigate to a URI or an action that is dependent on the context in which the object is presented to the user. */
-            set_actionKind(value: SocialAttachmentActionKind): SocialAttachmentActionKind;
-            /** Specifies the URI associated with the action. */
-            get_actionUri(): string;
-            /** Specifies the URI associated with the action. */
-            set_actionUri(value: string): string;
-        }
-
-        /** Defines a user, document, site, tag, or link to be inserted in a new post.
-            The SocialPostCreationData class defines the content text that contains substitution strings.
-            Each substitution string is replaced by a SocialDataItem value. */
-        export class SocialDataItem extends SP.ClientValueObject {
-            /** Identifies the user.  */
-            get_accountName(): string;
-            /** Identifies the user.  */
-            set_accountName(value: string): string;
-            /** Specifies whether the item being inserted is a user, document, site, tag, or link. */
-            get_itemType(): SocialDataItemType;
-            /** Specifies whether the item being inserted is a user, document, site, tag, or link. */
-            set_itemType(value: SocialDataItemType): SocialDataItemType;
-            /** Identifies the tag.  */
-            get_tagGuid(): string;
-            /** Identifies the tag.  */
-            set_tagGuid(value: string): string;
-            /** Specifies the plain text to be inserted in the created post. The server can use the specified text or can use text that identifies the item, for example the name specified in a user profile.  */
-            get_text(): string;
-            /** Specifies the plain text to be inserted in the created post. The server can use the specified text or can use text that identifies the item, for example the name specified in a user profile.  */
-            set_text(value: string): string;
-            /** Identifies the site, document, or link.  */
-            get_uri(): string;
-            /** Identifies the site, document, or link.  */
-            set_uri(value: string): string;
-        }
-
-        /** Provides information about an overlay.
-            An overlay is a substring in a post that represents a user, document, site, tag, or link.
-            The SocialPost class contains an array of SocialDataOverlay objects.
-            Each of the SocialDataOverlay objects specifies a link or one or more actors. */
-        export class SocialDataOverlay extends SP.ClientValueObject {
-            /** Specifies one or more actors as an array of integers where each integer specifies an index into the SocialThreadActors array.
-                This property is only available if the get_overlayType() has a value of SocialDataOverlayType.actors. */
-            get_actorIndexes(): number[];
-            /** The Index property specifies the starting position of the overlay in the SocialPostText string  */
-            get_index(): number;
-            /** The Length property specifies the number of characters in the overlay.  */
-            get_length(): number;
-            /** The LinkUri property specifies the URI of the link.
-                This property is only available if the get_overlayType() has a value of SocialDataOverlayType.link.  */
-            get_linkUri(): string;
-            /** Specifies whether the overlay is a link or one or more actors. */
-            get_overlayType(): SocialDataOverlayType;
-        }
-
-        /** Specifies information about errors that the server has encountered. */
-        export class SocialExceptionDetails extends SP.ClientValueObject {
-            get_internalErrorCode(): number;
-            get_internalMessage(): string;
-            get_internalStackTrace(): string;
-            /** Specifies a type name associated with the internal error if a type name is available. */
-            get_internalTypeName(): string;
-            get_status(): SocialStatusCode;
-        }
-
-        /** Specifies a feed, which contains an array of SocialThreads, each of which specifies a root SocialPost object and an array of response SocialPost objects. */
-        export class SocialFeed extends SP.ClientValueObject {
-            /** Specifies attributes of the returned feed.
-                The attributes specify if the requested feed has additional threads that were not included in the returned thread. */
-            get_attributes(): SocialFeedAttributes;
-            /** Returns the date-time of the most recent post that was requested.
-                The most recent post that was requested can be removed from the feed if the current user does not have access to it.
-                Consequently, the feed does not always contain the post with the date specified in this property. */
-            get_newestProcessed(): string;
-            /** The OldestProcessed property returns the date-time of the oldest post that was requested.
-                The oldest post that was requested can be removed from the feed if the current user does not have access to it.
-                Consequently, the feed does not always contain the post with the date specified in this property */
-            get_oldestProcessed(): string;
-            /** Contains the social threads in the feed. */
-            get_threads(): SocialThread[];
-            /** Returns the number of mentions of the current user that have been added to the feed on the server since the time that the unread mention count was cleared for the current user. */
-            get_unreadMentionCount(): number;
-        }
-
-        /** Provides access to social feeds.
-            It provides methods to create posts, delete posts, read posts, and perform other operations on posts. */
-        export class SocialFeedManager extends SP.ClientObject {
-            constructor(context: SP.ClientRuntimeContext);
-            /** Returns the current user */
-            get_owner(): SocialActor;
-            /** Specifies the URI of the personal site portal. */
-            get_personalSitePortalUri(): string;
-            /** Creates a post in the current user's newsfeed, in the specified user's feed, or in the specified thread.
-                This method returns a new or a modified thread.
-                @param targetId Optional, specifies the target of the post.
-                                If this parameter is null, the post is created as a root post in the current user's feed.
-                                If this parameter is set to a site URL or a site actor identification, the post is created as a root post in the specified site feed.
-                                If this parameter is set to a thread identification, the post is created as a reply post in the specified thread.
-                @param creationData Specifies the format and content of the post. */
-            createPost(targetId: string, creationData: SocialPostCreationData): SocialThread;
-            /** Deletes the specified post.
-                This method returns a digest of the modified thread.
-                If the entire thread is deleted, this method returns null.
-                If the post being deleted is the root post of a thread, all reply posts are also deleted.
-                @param postId   Specifies the post to be deleted.
-                                Corresponds the value returned from SocialPost.get_id(). */
-            deletePost(postId: string): SocialThread;
-            /** Returns the set of users who have liked the specified post.
-                @param postId   Specifies the post being queried for information about users that like the post.
-                                Corresponds the value returned from SocialPost.get_id().*/
-            getAllLikers(postId: string): SocialActor[];
-            /** Returns a feed for the current user.
-                The feed consists of an array of message threads.
-                Each thread consists of a root post and an array of reply posts. */
-            getFeed(type: SocialFeedType, options: SocialFeedOptions): SocialFeed;
-            /** Returns the public feed for a user or for a site.
-                The feed lists activity by the user and posts created by the server for that user.
-                For example, the feed can include posts indicating the user's birthday or indicating that the user liked a post.
-                @param actorId  Corresponds to the value returned by SocialActor.get_id().
-                                If the actorId specifies the current user, this method returns the public feed for the current user. */
-            getFeedFor(actorId: string, options: SocialFeedOptions): SocialFeed;
-            /** Returns the root post and all reply posts in the thread. */
-            getFullThread(threadId: string): SocialThread;
-            /** Returns a feed containing mention reference threads from the current user's personal feed. */
-            getMentions(clearUnreadMentions: boolean, options: SocialFeedOptions): SocialFeed;
-            /** Returns the server's count of unread mentions of the current user.
-                The server maintains a count of unread mentions in posts, but does not track which mentions have been read.
-                When a new mention is stored on the server, it increments the unread mention for the user specified by the mention.
-                The unread mention count is cleared by the GetMentions method. */
-            getUnreadMentionCount(): SP.IntResult;
-            /** Specifies that the current user likes the specified post.
-                Returns a digest thread containing the specified post.
-                A digest thread contains the root post and a selection of reply posts */
-            likePost(postId: string): SocialThread;
-            /** Specifies that the current user does not like the specified post.
-                Returns a digest thread containing the specified post.  */
-            unlikePost(postId: string): SocialThread;
-            /** Prevents any user from adding a new reply post to the specified thread.
-                Once a thread is locked, no new reply posts can be added until after the thread has been unlocked with the unlockThread method.
-                This method returns a digest of the locked thread */
-            lockThread(threadId: string): SocialThread;
-            /** Allows users to add new reply posts to the specified thread. */
-            unlockThread(threadId: string): SocialThread;
-            /** Suppresses activity notifications for the current user of updates to the specified thread. */
-            suppressThreadNotifications(threadId: string): void;
-            /** Creates an image attachment for a future post. */
-            createImageAttachment(name: string, description: string, imageData: any): SocialAttachment;
-            /** Generates a preview for the content specified by the URL. */
-            getPreview(itemUrl: string): SocialAttachment;
-            /** Returns the preview image data for an image attachment.
-                @param url Specifies the URL of the preview image relative to the personal site portal.
-                @param key Specifies the URL-encoded key to decrypt the image.
-                @param iv Specifies the URL-encoded initialization vector for decrypting the image. */
-            getPreviewImage(url: string, key: string, iv: string): any;
-        }
-
-        export class SocialFeedOptions extends SP.ClientObject {
-            get_maxThreadCount(): number;
-            set_maxThreadCount(value: number): number;
-            get_newerThan(): string;
-            set_newerThan(value: string): string;
-            get_olderThan(): string;
-            set_olderThan(value: string): string;
-            get_sortOrder(): SocialFeedSortOrder;
-            set_sortOrder(value: SocialFeedSortOrder): SocialFeedSortOrder;
-        }
-
-        /** Provides properties and methods for managing a user's list of followed actors.
-            Actors can be users, documents, sites, and tags. */
-        export class SocialFollowingManager extends SP.ClientObject {
-            constructor(context: SP.ClientRuntimeContext);
-            /** URI to a site  that lists the current user's followed documents. */
-            get_followedDocumentsUri(): string;
-            /** URI to a site  that lists the current user's followed sites. */
-            get_followedSitesUri(): string;
-            /** Adds the specified actor to the current user's list of followed items.
-                Returns one of the following values, wrapped into the SP.IntResult object:
-                0 = ok,
-                1 = alreadyFollowing,
-                2 = limitReached,
-                3 = internalError */
-            follow(actor: SocialActorInfo): SP.IntResult;
-            stopFollowing(actor: SocialActorInfo): SP.BooleanResult;
-            isFollowed(actor: SocialActorInfo): SP.BooleanResult;
-            getFollowed(types: SocialActorTypes): SocialActor[];
-            getFollowedCount(types: SocialActorTypes): SP.IntResult;
-            /** Returns the users who are followers of the current user. */
-            getFollowers(): SocialActor[];
-            getSuggestions(): SocialActor[];
-        }
-
-        /** Defines a link that includes a URI and text representation.
-            This class is used to represent the location of a web site.  */
-        export class SocialLink extends SP.ClientValueObject {
-            get_text(): string;
-            set_text(value: string): string;
-            get_uri(): string;
-            set_uri(value: string): string;
-        }
-
-        /** Specifies a post read from the server. */
-        export class SocialPost extends SP.ClientValueObject {
-            /** Specifies an image, document preview, or video preview attachment */
-            get_attachment(): SocialAttachment;
-            /** Describes attributes about the post, such as whether the current user can delete or like the post.  */
-            get_attributes(): SocialPostAttributes;
-            /** Specifies the author of the post as an index to the social thread's Actors array. */
-            get_authorIndex(): number;
-            /** Specifies the date and time that the post was created on the server. */
-            get_createdTime(): string;
-            /** Specifies the unique identifier of the post. */
-            get_id(): string;
-            /** Specifies information about users who like the post. */
-            get_likerInfo(): SocialPostActorInfo;
-            /** Specifies the date and time that the post was last modified on the server. */
-            get_modifiedTime(): string;
-            /** An array of objects in a post, where each object represents a user, document, site, tag, or link. */
-            get_overlays(): SocialDataOverlay[];
-            /** Specifies whether a post is the root post or a reply post in a thread */
-            get_postType(): SocialPostType;
-            /** Specifies the URI of the image to be displayed with the post.  */
-            get_preferredImageUri(): string;
-            /** Specifies the link to a web site associated with the application that created the post. */
-            get_source(): SocialLink;
-            /** Specifies the text of the post. */
-            get_text(): string;
-        }
-
-        /** Specifies a set of users, documents, sites, and tags by an index into the SocialThreadActors array  */
-        export class SocialPostActorInfo extends SP.ClientValueObject {
-            get_includesCurrentUser(): boolean;
-            /** Specifies an array of indexes into the SocialThreadActors array.
-                The server can choose to return a limited set of actors. For example, the server can choose to return a subset of the users that like a post. */
-            get_indexes(): number[];
-            get_totalCount(): number;
-        }
-
-        /** Specifies the content of a post in the SocialFeedManager.createPost method.
-            The post consists of a text message, which can optionally include social tags, mentions of users, and links. */
-        export class SocialPostCreationData extends SP.ClientValueObject {
-            /** Specifies an image, document preview, or video preview to be used in the post. */
-            get_attachment(): SocialAttachment;
-            /** Specifies an image, document preview, or video preview to be used in the post. */
-            set_attachment(value: SocialAttachment): SocialAttachment;
-            /** Specifies an array consisting of social tags, user mentions, links to documents, links to sites, and generic links.
-                Each element in the array is inserted into the ContentText string if there is a substitution reference to the array element in the string. */
-            get_contentItems(): SocialDataItem;
-            /** Specifies an array consisting of social tags, user mentions, links to documents, links to sites, and generic links.
-                Each element in the array is inserted into the ContentText string if there is a substitution reference to the array element in the string. */
-            set_contentItems(value: SocialDataItem): SocialDataItem;
-            /** Contains the text body of the post. */
-            get_contentText(): string;
-            /** Contains the text body of the post.
-                It can optionally contain one or more substitution references to elements in the zero-based ContentItems array.
-                A substitution reference consists of a series of characters that consist of an open-brace character ({) followed by one of more digits in the range 0 to 9 and terminated by a close-brace character (}).
-                The substitution reference is replaced by the text value of the element in the in the array at the offset specified by the value of the digits.
-                For example, the text string "{0}" is replaced by the first element in the ContentItems array. */
-            set_contentText(value: string): string;
-            /** Specifies additional information when creating server-generated posts */
-            get_definitionData(): SocialPostDefinitionData;
-            /** Specifies additional information when creating server-generated posts */
-            set_definitionData(value: SocialPostDefinitionData): SocialPostDefinitionData;
-            /** Specifies the link to a web site associated with the application that created the post */
-            get_source(): SocialLink;
-            /** Specifies the link to a web site associated with the application that created the post */
-            set_source(value: SocialLink): SocialLink;
-            /** Specifies that access to the post SHOULD be restricted to users that have access to the objects identified by the array of URIs */
-            get_securityUris(): string[];
-            /** Specifies that access to the post SHOULD be restricted to users that have access to the objects identified by the array of URIs */
-            set_securityUris(value: string[]): string[];
-            /** Indicates whether the post is to be used as the current user's new status message. */
-            get_updateStatusText(): boolean;
-            /** Indicates whether the post is to be used as the current user's new status message. */
-            set_updateStatusText(value: boolean): boolean;
-        }
-
-        /** Provides additional information about server-generated posts.
-            This type can only be specified in a server-to-server call. */
-        export class SocialPostDefinitionData extends SP.ClientValueObject {
-            get_items(): SocialPostDefinitionDataItem[];
-            set_items(value: SocialPostDefinitionDataItem[]): SocialPostDefinitionDataItem[];
-            get_name(): string;
-            set_name(value: string): string;
-        }
-
-        /** Specifies an item to be inserted in a post by replacing a token in the post definition.
-            This type can only be specified in a server-to-server call. */
-        export class SocialPostDefinitionDataItem extends SP.ClientValueObject {
-            /** Specifies the name of the user.
-                This property is only used if the ItemType property specifies that the item is a User. */
-            get_accountName(): string;
-            /** Specifies the name of the user.
-                This property is only used if the ItemType property specifies that the item is a User. */
-            set_accountName(value: string): string;
-            /** Specifies whether the item being formatted is a text element, a user, a document, a site, a tag, or a link. */
-            get_itemType(): SocialPostDefinitionDataItemType;
-            /** Specifies whether the item being formatted is a text element, a user, a document, a site, a tag, or a link. */
-            set_itemType(value: SocialPostDefinitionDataItemType): SocialPostDefinitionDataItemType;
-            /** Specifies the post definition token to be replaced by the item */
-            get_placeholderName(): string;
-            /** Specifies the post definition token to be replaced by the item */
-            set_placeholderName(value: string): string;
-            /** Specifies the GUID that identifies the tag.
-                This property is only used if the ItemType property specifies that the item is a Tag. */
-            get_tagGuid(): string;
-            /** Specifies the GUID that identifies the tag.
-                This property is only used if the ItemType property specifies that the item is a Tag. */
-            set_tagGuid(value: string): string;
-            /** Specifies the text that is substituted for the placeholder */
-            get_text(): string;
-            /** Specifies the text that is substituted for the placeholder */
-            set_text(value: string): string;
-            /** Specifies the URI of the document, site, or link.
-                This property is only available if the ItemType property specifies that the item is a Document, Link, or Site. */
-            get_uri(): string;
-            /** Specifies the URI of the document, site, or link.
-                This property is only available if the ItemType property specifies that the item is a Document, Link, or Site. */
-            set_uri(value: string): string;
-        }
-
-        /** Specifies a reference to a post in another thread.
-            The referenced post can be a post with a tag, a post that is liked, a post that mentions a user, or a post that is a reply. */
-        export class SocialPostReference extends SP.ClientValueObject {
-            /** Provides a digest of the thread containing the referenced post */
-            get_digest(): SocialThread;
-            get_post(): SocialPost;
-            /** Specifies the unique identifier of the thread containing the referenced post. */
-            get_threadId(): string;
-            /** Specifies the current owner of the thread as an index into the SocialThreadActors array. */
-            get_threadOwnerIndex(): number;
-        }
-
-        /** Specifies a thread that is stored on the server.
-            The thread contains a root post and zero or more reply posts. */
-        export class SocialThread extends SP.ClientValueObject {
-            /** Specifies the users who have created a post in the returned thread and also contains any users, documents, sites, and tags that are referenced in any of the posts in the returned thread. */
-            get_actors(): SocialActor[];
-            /** Specifies attributes of the thread, such as whether the current user can reply or lock the thread and whether the thread is a digest of a thread on the server, whether the number of replies has reached the maximum, and whether the thread is locked. */
-            get_attributes(): SocialThreadAttributes;
-            /** Specifies the unique identification of the thread. */
-            get_id(): string;
-            /** Specifies the thread owner as an index into the Actors array.
-                Typically, the thread owner is the user who created the root post, but the thread owner can be any user included in the Actors array. */
-            get_ownerIndex(): number;
-            /** Specifies a URI that is a permanent reference to the thread, if such a permanent reference is available.  */
-            get_permalink(): string;
-            /** Specifies a reference to a post in another thread.
-                The PostReference property is available only if the ThreadType has a value of ReplyReference, LikeReference, MentionReference, or TagReference.  */
-            get_postReference(): SocialPostReference;
-            /** Returns an array of zero or more reply posts.
-                The server can return a subset of the reply posts that are stored on the server. */
-            get_replies(): SocialPost[];
-            get_rootPost(): SocialPost;
-            /** Provides information about conditions that were encountered retrieving the thread that did not prevent the operation from completing. */
-            get_status(): SocialStatusCode;
-            /** Specifies if the thread is a normal thread created by one or more CreatePost calls or a reference post generated by the server when a user replies to a post, likes a post, or creates a post with a tag or mention */
-            get_threadType(): SocialThreadType;
-            get_totalReplyCount(): number;
-        }
-
-    }
-
-}
-declare namespace SP {
-    namespace Taxonomy {
-        export enum StringMatchOption {
-            startsWith,
-            exactMatch
-        }
-
-        export enum ChangeItemType {
-            unknown,
-            term,
-            termSet,
-            group,
-            termStore,
-            site
-        }
-
-        export enum ChangeOperationType {
-            unknown,
-            add,
-            edit,
-            deleteObject,
-            move,
-            copy,
-            pathChange,
-            merge,
-            importObject,
-            restore
-        }
-
-
-        export class TaxonomySession extends SP.ClientObject {
-            static getTaxonomySession(context: SP.ClientContext): TaxonomySession;
-            get_offlineTermStoreNames(): string[];
-            get_termStores(): TermStoreCollection;
-            getTerms(labelMatchInformation: LabelMatchInformation): TermCollection;
-            updateCache(): void;
-            getTerm(guid: SP.Guid): Term;
-            getTermsById(termIds: SP.Guid[]): TermCollection;
-            getTermsInDefaultLanguage(
-                termLabel: string,
-                defaultLabelOnly: boolean,
-                stringMatchOption: StringMatchOption,
-                resultCollectionSize: number,
-                trimUnavailable: boolean,
-                trimDeprecated: boolean): TermCollection;
-
-            getTermsInWorkingLocale(
-                termLabel: string,
-                defaultLabelOnly: boolean,
-                stringMatchOption: StringMatchOption,
-                resultCollectionSize: number,
-                trimUnavailable: boolean,
-                trimDeprecated: boolean): TermCollection;
-
-            getTermsWithCustomProperty(customPropertyName: string, trimUnavailable: boolean): TermCollection;
-            getTermsWithCustomProperty(customPropertyMatchInformation: CustomPropertyMatchInformation): TermCollection;
-            getTermSetsByName(termSetName: string, lcid: number): TermSetCollection;
-            getTermSetsByTermLabel(requiredTermLabels: string[], lcid: number): TermSetCollection;
-            getDefaultKeywordsTermStore(): TermStore;
-            getDefaultSiteCollectionTermStore(): TermStore;
-        }
-
-        export class TermStoreCollection extends SP.ClientObjectCollection<TermStore> {
-            itemAt(index: number): TermStore;
-            get_item(index: number): TermStore;
-            getById(id: SP.Guid): TermStore;
-            getByName(name: string): TermStore;
-        }
-
-        export class TermStore extends SP.ClientObject {
-            get_contentTypePublishingHub(): string;
-            get_defaultLanguage(): number;
-            set_defaultLanguage(value: number): void;
-            get_groups(): TermGroupCollection;
-            get_hashTagsTermSet(): TermSet;
-            get_id(): SP.Guid;
-            get_isOnline(): boolean;
-            get_keywordsTermSet(): TermSet;
-            get_languages(): number[];
-            get_name(): string;
-            get_orphanedTermsTermSet(): TermSet;
-            get_systemGroup(): TermGroup;
-            get_workingLanguage(): number;
-            set_workingLanguage(value: number): void;
-
-            addLanguage(lcid: number): void;
-            commitAll(): void;
-            createGroup(name: string): TermGroup;
-            createGroup(name: string, groupId: SP.Guid): TermGroup;
-
-            deleteLanguage(lcid: number): void;
-
-            getChanges(changeInformation: ChangeInformation): ChangedItemCollection;
-
-            getGroup(id: SP.Guid): TermGroup;
-            getTerm(termId: SP.Guid): Term;
-            getTermInTermSet(termSetId: SP.Guid, termId: SP.Guid): Term;
-            getTermsById(termIds: SP.Guid[]): TermCollection;
-            getTerms(termLabel: string, trimUnavailable: boolean): TermCollection;
-            getTerms(labelMatchInformation: LabelMatchInformation): TermCollection;
-            getTermSetsByName(termSetName: string, lcid: number): TermSetCollection;
-            getTermSetsByTermLabel(requiredTermLabels: string[], lcid: number): TermSetCollection;
-            getTermsWithCustomProperty(customPropertyName: string, trimUnavailable: boolean): TermCollection;
-            getTermsWithCustomProperty(customPropertyMatchInformation: CustomPropertyMatchInformation): TermCollection;
-
-            getTermSet(termSetId: SP.Guid): TermSet;
-            getTermSetsWithCustomProperty(customPropertyMatchInformation: CustomPropertyMatchInformation): TermSetCollection;
-            rollbackAll(): void;
-            updateCache(): void;
-            getSiteCollectionGroup(currentSite: SP.Site, createIfMissing: boolean): TermGroup;
-            updateUsedTermsOnSite(currentSite: SP.Site): void;
-        }
-
-        export class TaxonomyItem extends SP.ClientObject {
-            static normalizeName(context: SP.ClientContext, name: string): SP.StringResult;
-            get_createdDate(): Date;
-            get_id(): SP.Guid;
-            get_lastModifiedDate(): Date;
-            get_name(): string;
-            set_name(value: string): void;
-            get_termStore(): TermStore;
-            deleteObject(): void;
-        }
-
-        export class TermGroupCollection extends SP.ClientObjectCollection<TermGroup> {
-            itemAt(index: number): TermGroup;
-            get_item(index: number): TermGroup;
-            getById(id: SP.Guid): TermGroup;
-            getByName(name: string): TermGroup;
-        }
-
-        export class TermGroup extends TaxonomyItem {
-            get_description(): string;
-            set_description(value: string): void;
-            get_isSiteCollectionGroup(): boolean;
-            get_isSystemGroup(): boolean;
-            get_termSets(): TermSetCollection;
-            createTermSet(name: string, newTermSetId: SP.Guid, lcid: number): TermSet;
-            exportObject(): SP.StringResult;
-            getChanges(changeInformation: ChangeInformation): ChangedItemCollection;
-            getTermSetsWithCustomProperty(customPropertyMatchInformation: CustomPropertyMatchInformation): TermSetCollection;
-        }
-
-        export class TermSetItem extends TaxonomyItem {
-            get_customProperties(): { [key: string]: string; };
-            get_customSortOrder(): string;
-            set_customSortOrder(value: string): void;
-            get_isAvailableForTagging(): boolean;
-            set_isAvailableForTagging(value: boolean): void;
-            get_owner(): string;
-            set_owner(value: string): void;
-            get_terms(): TermCollection;
-            createTerm(name: string, lcid: number, newTermId: SP.Guid): Term;
-            /*getTerms(pagingLimit: number): TermCollection;*/ //Moved to descendants to void TypeScript errors
-            reuseTerm(sourceTerm: Term, reuseBranch: boolean): Term;
-            reuseTermWithPinning(sourceTerm: Term): Term;
-            deleteCustomProperty(name: string): void;
-            deleteAllCustomProperties(): void;
-            setCustomProperty(name: string, value: string): void;
-        }
-
-        export class TermSetCollection extends SP.ClientObjectCollection<TermSet> {
-            itemAt(index: number): TermSet;
-            get_item(index: number): TermSet;
-            getById(id: SP.Guid): TermSet;
-            getByName(name: string): TermSet;
-        }
-
-        export class TermSet extends TermSetItem {
-            get_contact(): string;
-            set_contact(value: string): void;
-            get_description(): string;
-            set_description(value: string): void;
-            get_group(): TermGroup;
-            get_isOpenForTermCreation(): boolean;
-            set_isOpenForTermCreation(value: boolean): void;
-            get_stakeholders(): string[];
-            addStakeholder(stakeholderName: string): void;
-            copy(): TermSet;
-            deleteStakeholder(stakeholderName: string): void;
-            exportObject(): SP.StringResult;
-            getAllTerms(): TermCollection;
-            getChanges(changeInformation: ChangeInformation): ChangedItemCollection;
-            getTerm(termId: SP.Guid): Term;
-            getTerms(pagingLimit: number): TermCollection;
-            getTerms(termLabel: string, trimUnavailable: boolean): TermCollection;
-            getTerms(labelMatchInformation: LabelMatchInformation): TermCollection;
-            getTermsWithCustomProperty(customPropertyName: string, trimUnavailable: boolean): TermCollection;
-            getTermsWithCustomProperty(customPropertyMatchInformation: CustomPropertyMatchInformation): TermCollection;
-            move(targetGroup: TermGroup): void;
-        }
-
-        export class TermCollection extends SP.ClientObjectCollection<Term> {
-            itemAt(index: number): Term;
-            get_item(index: number): Term;
-            getById(id: SP.Guid): Term;
-            getByName(name: string): Term;
-        }
-
-        export class Term extends TermSetItem {
-            get_description(): string;
-            get_isDeprecated(): boolean;
-            get_isKeyword(): boolean;
-            get_isPinned(): boolean;
-            get_isPinnedRoot(): boolean;
-            get_isReused(): boolean;
-            get_isRoot(): boolean;
-            get_isSourceTerm(): boolean;
-            get_labels(): LabelCollection;
-            get_localCustomProperties(): { [key: string]: string; };
-            get_mergedTermIds(): SP.Guid[];
-            get_parent(): Term;
-            get_pathOfTerm(): string;
-            get_pinSourceTermSet(): TermSet;
-            get_reusedTerms(): TermCollection;
-            get_sourceTerm(): Term;
-            get_termsCount(): number;
-            get_termSet(): TermSet;
-            get_termSets(): TermSetCollection;
-            copy(doCopyChildren: boolean): Term;
-            createLabel(labelName: string, lcid: number, isDefault: boolean): Label;
-            deleteLocalCustomProperty(name: string): void;
-            deleteAllLocalCustomProperties(): void;
-            deprecate(doDepricate: boolean): void;
-            getAllLabels(lcid: number): LabelCollection;
-            getDefaultLabel(lcid: number): Label;
-            getDescription(lcid: number): SP.StringResult;
-
-            getTerms(pagingLimit: number): TermCollection;
-            getTerms(
-                termLabel: string,
-                lcid: number,
-                defaultLabelOnly: boolean,
-                stringMatchOption: StringMatchOption,
-                resultCollectionSize: number,
-                trimUnavailable: boolean): TermCollection;
-
-            merge(termToMerge: Term): void;
-            move(newParnt: TermSetItem): void;
-            reassignSourceTerm(reusedTerm: Term): void;
-            setDescription(description: string, lcid: number): void;
-            setLocalCustomProperty(name: string, value: string): void;
-            getIsDescendantOf(ancestorTerm: Term): SP.BooleanResult;
-            getPath(lcid: number): SP.StringResult;
-        }
-
-
-        export class LabelCollection extends SP.ClientObjectCollection<Label> {
-            itemAt(index: number): Label;
-            get_item(index: number): Label;
-            getByValue(name: string): Label;
-        }
-
-        export class Label extends SP.ClientObject {
-            get_isDefaultForLanguage(): boolean;
-            get_language(): number;
-            set_language(value: number): void;
-            get_term(): Term;
-            get_value(): string;
-            set_value(value: string): void;
-            deleteObject(): void;
-            setAsDefaultForLanguage(): void;
-        }
-
-        export class LabelMatchInformation extends SP.ClientObject {
-            constructor(context: SP.ClientContext);
-            get_defaultLabelOnly(): boolean;
-            set_defaultLabelOnly(value: boolean): void;
-            get_excludeKeyword(): boolean;
-            set_excludeKeyword(value: boolean): void;
-            get_lcid(): number;
-            set_lcid(value: number): void;
-            get_resultCollectionSize(): number;
-            set_resultCollectionSize(value: number): void;
-            get_stringMatchOption(): StringMatchOption;
-            set_stringMatchOption(value: StringMatchOption): void;
-            get_termLabel(): string;
-            set_termLabel(value: string): void;
-            get_trimDeprecated(): boolean;
-            set_trimDeprecated(value: boolean): void;
-            get_trimUnavailable(): boolean;
-            set_trimUnavailable(value: boolean): void;
-        }
-
-        export class CustomPropertyMatchInformation extends SP.ClientObject {
-            constructor(context: SP.ClientContext);
-            get_customPropertyName(): string;
-            set_customPropertyName(value: string): void;
-            get_customPropertyValue(): string;
-            set_customPropertyValue(value: string): void;
-            get_resultCollectionSize(): number;
-            set_resultCollectionSize(value: number): void;
-            get_stringMatchOption(): StringMatchOption;
-            set_stringMatchOption(value: StringMatchOption): void;
-            get_trimUnavailable(): boolean;
-            set_trimUnavailable(value: boolean): void;
-        }
-
-        export class ChangeInformation extends SP.ClientObject {
-            constructor(context: SP.ClientContext);
-            get_itemType(): ChangeItemType;
-            set_itemType(value: ChangeItemType): void;
-            get_operationType(): ChangeOperationType;
-            set_operationType(value: ChangeOperationType): void;
-            get_startTime(): Date;
-            set_startTime(value: Date): void;
-            get_withinTimeSpan(): number;
-            set_withinTimeSpan(value: number): void;
-        }
-
-        export class ChangedItemCollection extends SP.ClientObjectCollection<ChangedItem> {
-            itemAt(index: number): ChangedItem;
-            get_item(index: number): ChangedItem;
-        }
-
-        export class ChangedItem extends SP.ClientObject {
-            get_changedBy(): string;
-            get_changedTime(): Date;
-            get_id(): SP.Guid;
-            get_itemType(): ChangeItemType;
-            get_operation(): ChangeOperationType;
-        }
-
-        export class ChangedSite extends ChangedItem {
-            get_siteId(): SP.Guid;
-            get_termId(): SP.Guid;
-            get_termSetId(): SP.Guid;
-        }
-
-        export class ChangedGroup extends ChangedItem {
-        }
-
-        export class ChangedTerm extends ChangedItem {
-            get_changedCustomProperties(): string[];
-            get_changedLocalCustomProperties(): string[];
-            get_groupId(): SP.Guid;
-            get_lcidsForChangedDescriptions(): number[];
-            get_lcidsForChangedLabels(): number[];
-            get_termSetId(): SP.Guid;
-        }
-
-        export class ChangedTermSet extends ChangedItem {
-            get_fromGroupId(): SP.Guid;
-            get_groupId(): SP.Guid;
-        }
-        export class ChangedTermStore extends ChangedItem {
-            get_changedLanguage(): number;
-            get_isDefaultLanguageChanged(): boolean;
-            get_isFullFarmRestore(): boolean;
-        }
-
-        export class TaxonomyField extends SP.FieldLookup {
-            constructor(context: SP.ClientContext, fields: SP.FieldCollection, filedName: string);
-            get_anchorId(): SP.Guid;
-            set_anchorId(value: SP.Guid): void;
-            get_createValuesInEditForm(): boolean;
-            set_createValuesInEditForm(value: boolean): void;
-            get_isAnchorValid(): boolean;
-            get_isKeyword(): boolean;
-            set_isKeyword(value: boolean): void;
-            get_isPathRendered(): boolean;
-            set_isPathRendered(value: boolean): void;
-            get_isTermSetValid(): boolean;
-            get_open(): boolean;
-            set_open(value: boolean): void;
-            get_sspId(): SP.Guid;
-            set_sspId(value: SP.Guid): void;
-            get_targetTemplate(): string;
-            set_targetTemplate(value: string): void;
-            get_termSetId(): SP.Guid;
-            set_termSetId(value: SP.Guid): void;
-            get_textField(): SP.Guid;
-            get_userCreated(): SP.Guid;
-            set_userCreated(value: SP.Guid): void;
-
-            getFieldValueAsText(value: TaxonomyFieldValue): SP.StringResult;
-            getFieldValueAsTaxonomyFieldValue(value: string): TaxonomyFieldValue;
-            getFieldValueAsTaxonomyFieldValueCollection(value: string): TaxonomyFieldValueCollection;
-            setFieldValueByTerm(listItem: SP.ListItem, term: Term, lcid: number): void;
-            setFieldValueByTermCollection(listItem: SP.ListItem, terms: TermCollection, lcid: number): void;
-            setFieldValueByCollection(listItem: SP.ListItem, terms: Term[], lcid: number): void;
-            setFieldValueByValue(listItem: SP.ListItem, taxValue: TaxonomyFieldValue): void;
-            setFieldValueByValueCollection(listItem: SP.ListItem, taxValueCollection: TaxonomyFieldValueCollection): void;
-            getFieldValueAsHtml(value: TaxonomyFieldValue): SP.StringResult;
-            getValidatedString(value: TaxonomyFieldValue): SP.StringResult;
-
-        }
-
-        export class TaxonomyFieldValueCollection extends SP.ClientObjectCollection<TaxonomyFieldValue> {
-            constructor(context: SP.ClientContext, fieldValue: string, creatingField: SP.Field);
-            itemAt(index: number): TaxonomyFieldValue;
-            get_item(index: number): TaxonomyFieldValue;
-            populateFromLabelGuidPairs(text: string): void;
-        }
-
-        export class TaxonomyFieldValue extends SP.ClientValueObject {
-            get_label(): string;
-            set_label(value: string): void;
-            get_termGuid(): SP.Guid;
-            set_termGuid(value: SP.Guid): void;
-            get_wssId(): SP.Guid;
-            set_wssId(value: SP.Guid): void;
-        }
-
-        export class MobileTaxonomyField extends SP.ClientObject {
-            get_readOnly(): boolean;
-        }
-    }
-}
-
-declare namespace SP {
-    export module DocumentSet {
-        export class DocumentSet extends ClientObject {
-            static create(context: ClientContext, parentFolder: Folder, name: string, ctid: ContentTypeId): StringResult;
-        }
-    }
-
-    export module Video {
-        export class EmbedCodeConfiguration extends ClientValueObject {
-            public get_autoPlay(): boolean;
-            public set_autoPlay(value: boolean): boolean;
-
-            public get_displayTitle(): boolean;
-            public set_displayTitle(value: boolean): boolean;
-
-            public get_linkToOwnerProfilePage(): boolean;
-            public set_linkToOwnerProfilePage(value: boolean): boolean;
-
-            public get_linkToVideoHomePage(): boolean;
-            public set_linkToVideoHomePage(value: boolean): boolean;
-
-            public get_loop(): boolean;
-            public set_loop(value: boolean): boolean;
-
-            public get_pixelHeight(): number;
-            public set_pixelHeight(value: number): number;
-
-            public get_pixelWidth(): number;
-            public set_pixelWidth(value: number): number;
-
-            public get_startTime(): number;
-            public set_startTime(value: number): number;
-
-            public get_previewImagePath(): string;
-            public set_previewImagePath(value: string): string;
-        }
-
-        export class VideoSet extends DocumentSet.DocumentSet {
-            static createVideo(context: ClientContext, parentFolder: Folder, name: string, ctid: ContentTypeId): StringResult;
-            static uploadVideo(context: ClientContext, list: List, fileName: string, file: any[], overwriteIfExists: boolean, parentFolderPath: string): StringResult;
-            static getEmbedCode(context: ClientContext, videoPath: string, properties: EmbedCodeConfiguration): StringResult;
-            static migrateVideo(context: ClientContext, videoFile: File): SP.ListItem;
-        }
-    }
-}
-
-
-declare namespace SP {
-    export module UI {
-        export module ApplicationPages {
-            export class SelectorSelectionEventArgs extends Sys.EventArgs {
-                constructor(entities: any);
-                get_entities(): any;
-            }
-            export interface ISelectorComponent {
-                get_selectedEntities(): any;
-                set_selectedEntities(value: any): void;
-                get_callback(): (sender: any, e: Sys.EventArgs) => void;
-                set_callback(value: (sender: any, e: Sys.EventArgs) => void): void;
-                get_scopeKey(): string;
-                get_componentType(): SP.UI.ApplicationPages.SelectorType;
-                revertTo(ent: SP.UI.ApplicationPages.ResolveEntity): void;
-                removeEntity(ent: SP.UI.ApplicationPages.ResolveEntity): void;
-                setEntity(ent: SP.UI.ApplicationPages.ResolveEntity): void;
-            }
-            export enum SelectorType {
-                none,
-                resource,
-                people,
-                people_And_Resource,
-                event,
-            }
-            export class CalendarSelector extends Sys.Component {
-                static instance(): SP.UI.ApplicationPages.CalendarSelector;
-                registerSelector(selector: SP.UI.ApplicationPages.ISelectorComponent): void;
-                getSelector(type: SP.UI.ApplicationPages.SelectorType, scopeKey: string): SP.UI.ApplicationPages.ISelectorComponent;
-                addHandler(scopeKey: string, people: boolean, resource: boolean, handler: (sender: any, selection: SP.UI.ApplicationPages.SelectorSelectionEventArgs) => void): void;
-                revertTo(scopeKey: string, ent: SP.UI.ApplicationPages.ResolveEntity): void;
-                removeEntity(scopeKey: string, ent: SP.UI.ApplicationPages.ResolveEntity): void;
-                constructor();
-            }
-            export class BaseSelectorComponent implements SP.UI.ApplicationPages.ISelectorComponent {
-                constructor(key: string, type: SP.UI.ApplicationPages.SelectorType);
-                get_scopeKey(): string;
-                get_componentType(): SP.UI.ApplicationPages.SelectorType;
-                get_selectedEntities(): any;
-                set_selectedEntities(value: any): void;
-                get_callback(): (sender: any, e: Sys.EventArgs) => void;
-                set_callback(value: (sender: any, e: Sys.EventArgs) => void): void;
-                revertTo(ent: SP.UI.ApplicationPages.ResolveEntity): void;
-                removeEntity(ent: SP.UI.ApplicationPages.ResolveEntity): void;
-                setEntity(ent: SP.UI.ApplicationPages.ResolveEntity): void;
-            }
-            export interface ICalendarController {
-                moveToDate(date: string): void;
-                moveToViewType(viewType: string): void;
-                moveToViewDate(scope: SP.UI.ApplicationPages.CalendarScope, date: string): void;
-                moveToView(scope: SP.UI.ApplicationPages.CalendarScope): void;
-                expandAll(): void;
-                collapseAll(): void;
-                refreshItems(): void;
-                getActiveScope(): SP.UI.ApplicationPages.CalendarScope;
-                newItemDialog(contentTypeId: string): void;
-                deleteItem(itemId: string): void;
-            }
-            export enum CalendarScope {
-                nothing,
-                monthly,
-                weeklyGroup,
-                daily,
-                weekly,
-                dailyGroup,
-            }
-            export class CalendarInstanceRepository {
-                static registerInstance(instanceId: string, contoller: SP.UI.ApplicationPages.ICalendarController): void;
-                static lookupInstance(instanceId: string): SP.UI.ApplicationPages.ICalendarController;
-                static firstInstance(): SP.UI.ApplicationPages.ICalendarController;
-            }
-            export class ResolveEntity {
-                tYPE_EVENT: string;
-                tYPE_USER: string;
-                tYPE_RESOURCE: string;
-                tYPE_EXCHANGE: string;
-                entityType: string;
-                displayName: string;
-                email: string;
-                accountName: string;
-                id: string;
-                members: SP.UI.ApplicationPages.ResolveEntity[];
-                needResolve: boolean;
-                isGroup: boolean;
-                get_key(): string;
-                constructor();
-            }
-            export class ClientPeoplePickerQueryParameters extends SP.ClientValueObject {
-                get_allowEmailAddresses(): boolean;
-                set_allowEmailAddresses(value: boolean): void;
-                get_allowMultipleEntities(): boolean;
-                set_allowMultipleEntities(value: boolean): void;
-                get_allUrlZones(): boolean;
-                set_allUrlZones(value: boolean): void;
-                get_enabledClaimProviders(): string;
-                set_enabledClaimProviders(value: string): void;
-                get_forceClaims(): boolean;
-                set_forceClaims(value: boolean): void;
-                get_maximumEntitySuggestions(): number;
-                set_maximumEntitySuggestions(value: number): void;
-                get_principalSource(): SP.Utilities.PrincipalSource;
-                set_principalSource(value: SP.Utilities.PrincipalSource): void;
-                get_principalType(): SP.Utilities.PrincipalType;
-                set_principalType(value: SP.Utilities.PrincipalType): void;
-                get_queryString(): string;
-                set_queryString(value: string): void;
-                get_required(): boolean;
-                set_required(value: boolean): void;
-                get_sharePointGroupID(): number;
-                set_sharePointGroupID(value: number): void;
-                get_urlZone(): SP.UrlZone;
-                set_urlZone(value: SP.UrlZone): void;
-                get_urlZoneSpecified(): boolean;
-                set_urlZoneSpecified(value: boolean): void;
-                get_web(): SP.Web;
-                set_web(value: SP.Web): void;
-                get_webApplicationID(): SP.Guid;
-                set_webApplicationID(value: SP.Guid): void;
-                get_typeId(): string;
-                writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-                constructor();
-            }
-            export class ClientPeoplePickerWebServiceInterface {
-                static clientPeoplePickerSearchUser(context: SP.ClientRuntimeContext, queryParams: SP.UI.ApplicationPages.ClientPeoplePickerQueryParameters): SP.StringResult;
-                static clientPeoplePickerResolveUser(context: SP.ClientRuntimeContext, queryParams: SP.UI.ApplicationPages.ClientPeoplePickerQueryParameters): SP.StringResult;
-            }
-            export class PeoplePickerWebServiceInterface {
-                static getSearchResultsByHierarchy(context: SP.ClientRuntimeContext, providerID: string, hierarchyNodeID: string, entityTypes: string, contextUrl: string): SP.StringResult;
-                static getSearchResults(context: SP.ClientRuntimeContext, searchPattern: string, providerID: string, hierarchyNodeID: string, entityTypes: string): SP.StringResult;
-            }
-        }
-    }
-}
-
-declare namespace SP {
-    export module UI {
-        export class PopoutMenu implements Sys.IDisposable {
-            constructor(launcherId: string, menuId: string, iconId: string, launcherOpenCssClass: string, textDirection: string, closeIconUrl: string, isClustered: boolean, closeIconOffsetLeft: number, closeIconOffsetTop: number, closeIconHeight: number, closeIconWidth: number);
-            launchMenu(): void;
-            closeMenu(): void;
-            static createPopoutMenuInstanceAndLaunch(anchorId: string, menuId: string, iconId: string, anchorOpenCss: string, textDirection: string, closeIconUrl: string, isClustered: boolean, x: number, y: number, height: number, width: number): void;
-            static closeActivePopoutMenuInstance(): void;
-            dispose(): void;
-        }
-        export class AttractModeControl extends Sys.UI.Control {
-            defaultAttractModeIcon: string;
-            cssAttractMode: string;
-            cssAttractModeBackground: string;
-            cssAttractModeCell: string;
-            cssAttractModeWrapper: string;
-            cssAttractModeIcon: string;
-            cssAttractModeText: string;
-            get_imageElement(): any;
-            get_textElement(): HTMLElement;
-            constructor();
-        }
-
-        export module Notify {
-            export function addNotification(strHtml: string, bSticky: boolean): string;
-            export function removeNotification(nid: string): void;
-            export function showLoadingNotification(bSticky: boolean): string;
-
-
-            export class Notification {
-                constructor(containerId: SPNotifications.ContainerID, strHtml: string, bSticky?: boolean, strTooltip?: string, onclickHandler?: () => void, extraData?: SPStatusNotificationData);
-                get_id(): string;
-                Show(bNoAnimate: boolean): void;
-                Hide(bNoAnimate: boolean): void;
-            }
-            export class NotificationContainer {
-                constructor(id: number, element: any, layer: number, notificationLimit?: number);
-                Clear(): void;
-                GetCount(): number;
-                SetEventHandler(eventId: SPNotifications.EventID, eventHandler: any): void;
-            }
-        }
-
-        export class Status {
-            static addStatus(strTitle: string, strHtml?: string, atBegining?: boolean): string;
-            static appendStatus(sid: string, strTitle: string, strHtml: string): string;
-            static updateStatus(sid: string, strHtml: string): void;
-            static setStatusPriColor(sid: string, strColor: string): void;
-            static removeStatus(sid: string): void;
-            static removeAllStatus(hide: boolean): void;
-            constructor();
-        }
-
-        export module Workspace {
-            export function add_resized(handler: () => void): void;
-            export function remove_resized(handler: () => void): void;
-        }
-        export class Menu {
-            static create(id: string): SP.UI.Menu;
-            addMenuItem(text: string, actionScriptText: string, imageSourceUrl: string, imageAlternateText: string, sequenceNumber: number, description: string, id: string): HTMLElement;
-            addSeparator(): void;
-            addSubMenu(text: string, imageSourceUrl: string, imageAlternateText: string, sequenceNumber: number, description: string, id: string): SP.UI.Menu;
-            show(relativeElement: HTMLElement, forceRefresh: boolean, flipTopLevelMenu: boolean, yOffset: number): void;
-            showFilterMenu(relativeElement: HTMLElement, forceRefresh: boolean, flipTopLevelMenu: boolean, yOffset: number, fShowClose: boolean, fShowCheckBoxes: boolean): void;
-            hideIcons(): void;
-            showIcons(): void;
-        }
-        export class MenuTest {
-            static setup(relativeElement: HTMLElement): void;
-            constructor();
-        }
-
-        export function $create_DialogOptions(): DialogOptions;
-
-        /** Result of a modal dialog execution */
-        export enum DialogResult {
-            /** Do not use this */
-            invalid,
-            /** User closed dialog, cancelling the action */
-            cancel,
-            /** Dialog actions completed successfully */
-            OK
-        }
-        /** Callback which processes dialog result value after dialog is closed */
-        export interface DialogReturnValueCallback {
-            (dialogResult: DialogResult, returnValue: any): void;
-        }
-        /** Options for dialog creation */
-        export interface IDialogOptions {
-            /** Text displayed in the title bar of the dialog box. If not defined, it will default to the title of the page defined by url property. */
-            title?: string;
-            /** X coordinate of the dialog box. */
-            x?: number;
-            /** Y coordinate of the dialog box. */
-            y?: number;
-            /** The dialog will be maximized when shown. */
-            showMaximized?: boolean;
-            /** url of the page which is shown in the modal dialog. You should use either html or url attribute, but not both. */
-            url?: string;
-            /** specifies if close button should be shown on the dialog */
-            showClose?: boolean;
-            /** specifies if maximize button should be shown on the dialog */
-            allowMaximize?: boolean;
-            /** callback that is called after dialog is closed */
-            dialogReturnValueCallback?: DialogReturnValueCallback;
-            /** automatically determine size of the dialog based on its contents. */
-            autoSize?: boolean;
-            /** minimum width of the dialog when using autoSize option */
-            autoSizeStartWidth?: number;
-            /** include padding for adding a scrollbar */
-            includeScrollBarPadding?: boolean;
-            /** width of the dialog. if not specified, will be determined automatically based on the contents of the dialog */
-            width?: number;
-            /** height of the dialog. if not specified, will be determined automatically based on the contents of the dialog */
-            height?: number;
-            /** html element which will be used as contents of the dialog. You should use either html or url attribute, but not both. */
-            html?: HTMLElement;
-            /** custom arguments to be passed to the dialog */
-            args?: any;
-        }
-        export class DialogOptions implements IDialogOptions {
-            /** Text displayed in the title bar of the dialog box. If not defined, it will default to the title of the page defined by url property. */
-            title: string;
-            /** X coordinate of the dialog box. */
-            x: number;
-            /** Y coordinate of the dialog box. */
-            y: number;
-            /** The dialog will be maximized when shown. */
-            showMaximized: boolean;
-            /** url of the page which is shown in the modal dialog. You should use either html or url attribute, but not both. */
-            url: string;
-            /** specifies if close button should be shown on the dialog */
-            showClose: boolean;
-            /** specifies if maximize button should be shown on the dialog */
-            allowMaximize: boolean;
-            /** callback that is called after dialog is closed */
-            dialogReturnValueCallback: DialogReturnValueCallback;
-            /** automatically determine size of the dialog based on its contents. */
-            autoSize: boolean;
-            /** minimum width of the dialog when using autoSize option */
-            autoSizeStartWidth: number;
-            /** include padding for adding a scrollbar */
-            includeScrollBarPadding: boolean;
-            /** width of the dialog. if not specified, will be determined automatically based on the contents of the dialog */
-            width: number;
-            /** height of the dialog. if not specified, will be determined automatically based on the contents of the dialog */
-            height: number;
-            /** html element which will be used as contents of the dialog. You should use either html or url attribute, but not both. */
-            html: HTMLElement;
-            /** custom arguments to be passed to the dialog */
-            args: any;
-        }
-        /** Represents a dialog. Do not use this class directly from your code. */
-        export class Dialog {
-            get_firstTabStop(): HTMLElement;
-            get_lastTabStop(): HTMLElement;
-            get_url(): string;
-            get_html(): string;
-            get_title(): string;
-            get_args(): any;
-            get_allowMaximize(): boolean;
-            get_showClose(): boolean;
-            get_returnValue(): any;
-            set_returnValue(value: any): void;
-            get_frameElement(): HTMLFrameElement;
-            get_dialogElement(): HTMLElement;
-            get_isMaximized(): boolean;
-            get_closed(): boolean;
-            autoSizeSuppressScrollbar(resizePageCallBack: any): void;
-            autoSize(): void;
-        }
-        /** Represents a modal dialog */
-        export class ModalDialog extends SP.UI.Dialog {
-            /** Displays a modal dialog defined by the specified options. */
-            static showModalDialog(options: SP.UI.IDialogOptions): SP.UI.ModalDialog;
-            /** Should be called from an existing dialog. */
-            static commonModalDialogClose(dialogResult: SP.UI.DialogResult, returnValue: any): void;
-            /** Shows a modal dialog, specified by url, callback, args, and options. Internally, uses SP.UI.ModalDialog.showModalDialog.
-                @param url overrides options.url
-                @param callback overrides options.dialogResultValueCallback
-                @param args overrides options.args */
-            static commonModalDialogOpen(url: string, options: SP.UI.IDialogOptions, callback?: SP.UI.DialogReturnValueCallback, args?: any): void;
-            /** Refresh the page if specified dialogResult equals to SP.UI.DialogResult.OK */
-            static RefreshPage(dialogResult: SP.UI.DialogResult): void;
-            /** Show page specified by the url in a modal dialog. If the dialog returns SP.UI.DialogResult.OK, the page is refreshed. */
-            static ShowPopupDialog(url: string): void;
-            /** Show modal dialog specified by url, callback, height and width. */
-            static OpenPopUpPage(url: string, callback: SP.UI.DialogReturnValueCallback, width?: number, height?: number): void;
-            /** Displays a wait/loading modal dialog with the specified title, message, height and width. Height and width are defined in pixels. Cancel/close button is not shown. */
-            static showWaitScreenWithNoClose(title: string, message?: string, height?: number, width?: number): SP.UI.ModalDialog;
-            /** Displays a wait/loading modal dialog with the specified title, message, height and width. Height and width are defined in pixels. Cancel button is shown. If user clicks it, the callbackFunc is called. */
-            static showWaitScreenSize(title: string, message?: string, callbackFunc?: SP.UI.DialogReturnValueCallback, height?: number, width?: number): SP.UI.ModalDialog;
-            static showPlatformFirstRunDialog(url: string, callbackFunc: SP.UI.DialogReturnValueCallback): SP.UI.ModalDialog;
-            static get_childDialog(): SP.UI.ModalDialog;
-            /** Closes the dialog using the specified dialog result. */
-            close(dialogResult: SP.UI.DialogResult): void;
-        }
-
-
-        export class Command {
-            constructor(name: string, displayName: string);
-            get_displayName(): string;
-            set_displayName(value: string): string;
-
-            get_tooltip(): string;
-            set_tooltip(value: string): string;
-
-            get_isEnabled(): boolean;
-            set_isEnabled(value: boolean): boolean;
-
-            get_href(): string;
-            get_name(): string;
-            get_elementIDPrefix(): string;
-            set_elementIDPrefix(value: string): string;
-
-            get_linkElement(): HTMLAnchorElement;
-
-            get_isDropDownCommand(): boolean;
-            set_isDropDownCommand(value: boolean): boolean;
-
-            attachEvents(): void;
-            render(builder: HtmlBuilder): void;
-
-
-            /**Should override*/
-            onClick(): void;
-
-        }
-
-
-        export class CommandBar {
-            constructor();
-            get_commands(): Command[];
-            get_dropDownThreshold(): number;
-            set_dropDownThreshold(value: number): number;
-            get_elementID(): string;
-            get_overrideClass(): string;
-            set_overrideClass(value: string): string;
-            addCommand(action: Command): void;
-            insertCommand(action: Command, position: number): void;
-            render(builder: HtmlBuilder): void;
-            attachEvents(): void;
-            findCommandByName(name: string): Command;
-        }
-
-
-        export class PagingControl {
-            constructor(id: string);
-            render(innerContent: string): string;
-            postRender(): void;
-            get_innerContent(): HTMLSpanElement;
-            get_innerContentClass(): string;
-            setButtonState(buttonId: number, state: number): void;
-            getButtonState(buttonId: number): number;
-            onWindowResized(): void;
-
-            /**Should override*/
-            onPrev(): void;
-            onNext(): void;
-
-            static ButtonIDs: {
-                prev: number;
-                next: number;
-            }
-
-            static ButtonState: {
-                hidden: number
-                disabled: number;
-                enabled: number;
-            }
-        }
-
-        export module Workplace {
-            export function add_resized(handler: Function): void;
-            export function remove_resized(handler: Function): void;
-        }
-
-        export module UIUtility {
-            export function generateRandomElementId(): string;
-            export function cancelEvent(evt: Event): void;
-            export function clearChildNodes(elem: HTMLElement): void;
-            export function hideElement(elem: HTMLElement): void;
-            export function showElement(elem: HTMLElement): void;
-            export function insertBefore(elem: HTMLElement, targetElement: HTMLElement): void;
-            export function insertAfter(elem: HTMLElement, targetElement: HTMLElement): void;
-            export function removeNode(elem: HTMLElement): void;
-            export function calculateOffsetLeft(elem: HTMLElement): number;
-            export function calculateOffsetTop(elem: HTMLElement): number;
-            export function createHtmlInputText(text: string): HTMLInputElement;
-            export function createHtmlInputCheck(isChecked: boolean): HTMLInputElement;
-            export function setInnerText(elem: HTMLElement, value: string): void;
-            export function getInnerText(elem: HTMLElement): string;
-            export function isTextNode(elem: HTMLElement): boolean;
-            export function isSvgNode(elem: HTMLElement): boolean;
-            export function isNodeOfType(elem: HTMLElement, tagNames: string[]): boolean;
-            export function focusValidOnThisNode(elem: HTMLElement): boolean;
-        }
-    }
-}
-
-declare namespace SPNotifications {
-
-    export enum ContainerID {
-        Basic,
-        Status,
-    }
-    export enum EventID {
-        OnShow,
-        OnHide,
-        OnDisplayNotification,
-        OnRemoveNotification,
-        OnNotificationCountChanged,
-    }
-}
-
-declare class SPStatusNotificationData {
-    constructor(text: string, subText: string, imageUrl: string, sip: string);
-}
-declare function RefreshCommandUI():void;
-
-declare namespace SP {
-    export module UI {
-        export module Controls {
-
-            export interface INavigationOptions {
-                assetId?: string;
-                siteTitle?: string;
-                siteUrl?: string;
-                appTitle?: string;
-                appTitleIconUrl?: string;
-                rightToLeft?: boolean;
-                appStartPage?: string;
-                appIconUrl?: string;
-                appHelpPageUrl?: string;
-                appHelpPageOnClick?: string;
-                settingsLinks?: ISettingsLink[];
-                language?: string;
-                clientTag?: string;
-                appWebUrl?: string;
-                onCssLoaded?: string;
-
-
-                bottomHeaderVisible?: boolean;
-                topHeaderVisible?: boolean;
-            }
-
-            export class NavigationOptions implements INavigationOptions { }
-
-
-            export interface ISettingsLink {
-                linkUrl: string;
-                displayName: string;
-            }
-
-            export class SettingsLink implements ISettingsLink {
-                linkUrl: string;
-                displayName: string;
-            }
-
-
-            export class Navigation {
-                constructor(placeholderDOMElementId: string, options: INavigationOptions);
-                public get_assetId(): string;
-                public get_siteTitle(): string;
-                public get_siteUrl(): string;
-
-                public get_appTitle(): string;
-                public set_appTitle(value: string): string;
-
-                public get_appTitleIconUrl(): string;
-                public set_appTitleIconUrl(value: string): string;
-
-                public get_rightToLeft(): boolean;
-                public set_rightToLeft(value: boolean): boolean;
-
-                public get_appStartPage(): string;
-                public set_appStartPage(value: string): string;
-
-                public get_appIconUrl(): string;
-                public set_appIconUrl(value: string): string;
-
-                public get_appHelpPageUrl(): string;
-                public set_appHelpPageUrl(value: string): string;
-
-                public get_appHelpPageOnClick(): string;
-                public set_appHelpPageOnClick(value: string): string;
-
-                public get_settingsLinks(): ISettingsLink[];
-                public set_settingsLinks(value: ISettingsLink[]): ISettingsLink[];
-
-                public setVisible(value: boolean): void;
-
-                public setTopHeaderVisible(value: boolean): void;
-                public setBottomHeaderVisible(value: boolean): void;
-                public remove(): void;
-
-                static getVersionedLayoutsUrl(pageName: string): string;
-            }
-
-
-            export class ControlManager {
-                static getControl(placeHolderId: string): any;
-            }
-        }
-    }
-}
-
-declare namespace SP {
-
-    export module UserProfiles {
-        /** Specifies types of changes made in the user profile store. */
-        export enum ChangeTypes {
-            /** No change was made */
-            none,
-            /** An object was added */
-            add,
-            /** An object was modified */
-            modify,
-            /** An object was removed */
-            remove,
-            /** The metadata of an object was modified */
-            metadata,
-            /** Multiple operations were performed on an object */
-            all
-        }
-
-        export class HashTag extends ClientValueObject {
-            get_name(): string;
-            get_useCount(): number;
-        }
-
-        export class HashTagCollection extends SP.ClientObjectCollection<HashTag> {
-            itemAt(index: number): HashTag;
-            get_item(index: number): HashTag;
-        }
-
-        /** Specifies types of user-related objects that can be changed in the user profile store. */
-        export enum ObjectTypes {
-            none,
-            singleValueProperty,
-            multiValueProperty,
-            anniversary,
-            dlMembership,
-            siteMembership,
-            quickLink,
-            colleague,
-            personalizationSite,
-            userProfile,
-            webLog,
-            custom,
-            organizationProfile,
-            organizationMembership,
-            all
-        }
-
-        /** Provides methods for operations related to people.
-            Note: The SocialFollowingManager object is the recommended object for performing Following People and Following Content tasks.
-            However, PeopleManager provides some methods that SocialFollowingManager doesn�t. */
-        export class PeopleManager extends SP.ClientObject {
-            constructor(context: SP.ClientRuntimeContext);
-            static getTrendingTags(context: SP.ClientRuntimeContext): HashTagCollection;
-            /** Checks whether the first user is following the second user. */
-            static isFollowing(context: SP.ClientRuntimeContext, possibleFollowerAccountName: string, possibleFolloweeAccountName: string): SP.BooleanResult;
-            /** Gets the URL of the edit profile page for the current user. */
-            get_editProfileLink(): string;
-            /** Gets a Boolean value that indicates whether the current user's People I'm Following list is public. */
-            get_isMyPeopleListPublic(): boolean;
-            /** Gets tags that the user is following. */
-            getFollowedTags(numberOfTagsToFetch: number): string[];
-            /** Gets user properties for the current user. */
-            getMyProperties(): PersonProperties;
-            getPropertiesFor(accountName: string): PersonProperties;
-            /** Gets the specified user profile property for the specified user. */
-            getUserProfilePropertyFor(accountName: string, propertyName: string): string;
-            /** Gets the specified user profile properties for the specified user. */
-            getUserProfilePropertiesFor(propertiesForUser: UserProfilePropertiesForUser): any[];
-            /** Gets suggestions for who the current user might want to follow.
-                Note: The recommended API to use for this task is SocialFollowingManager.getSuggestions.
-                Returns list of PersonProperties objects */
-            getMySuggestions(): SP.ClientObjectList<PersonProperties>;
-            /** Removes the specified user from the user's list of suggested people to follow. */
-            hideSuggestion(accountName: string): void;
-            follow(accountName: string): void;
-            stopFollowing(accountName: string): void;
-            /** Add the specified tag to the current user's list of followed tags.
-                @param tagId GUID of the tag to start following. */
-            followTag(tagId: string): void;
-            /** Remove the specified tag from the current user's list of followed tags.
-                @param tagId GUID of the tag to stop following. */
-            stopFollowingTag(tagId: string): void;
-            amIFollowing(accountName: string): SP.BooleanResult;
-            getPeopleFollowedByMe(): SP.ClientObjectList<PersonProperties>;
-            getPeopleFollowedBy(accountName: string): SP.ClientObjectList<PersonProperties>;
-            getMyFollowers(): SP.ClientObjectList<PersonProperties>;
-            getFollowersFor(accountName: string): SP.ClientObjectList<PersonProperties>;
-            amIFollowedBy(accountName: string): SP.BooleanResult;
-            /** Uploads and sets the user profile picture.
-                Pictures in bmp, jpg and png formats and up to 5,000,000 bytes are supported.
-                A user can upload a picture only to the user's own profile.
-                @param data Binary content of an image file */
-            setMyProfilePicture(data: SP.Base64EncodedByteArray): void;
-        }
-
-        /** Specifies the capabilities of a personal site. */
-        export enum PersonalSiteCapabilities {
-            none,
-            profile,
-            social,
-            storage,
-            myTasksDashboard,
-            education,
-            guest
-        }
-
-        /** Specifies an exception or status code for the state of a personal site instantiation. */
-        export enum PersonalSiteInstantiationState {
-            uninitialized,
-            enqueued,
-            created,
-            deleted,
-            permissionsGeneralFailure,
-            permissionsUPANotGranted,
-            permissionsUserNotLicensed,
-            permissionsSelfServiceSiteCreationDisabled,
-            permissionsNoMySitesInPeopleLight,
-            permissionsEmptyHostUrl,
-            permissionsHostFailedToInitializePersonalSiteContext,
-            errorGeneralFailure,
-            errorManagedPathDoesNotExist,
-            errorLanguageNotInstalled,
-            errorPartialCreate,
-            errorPersonalSiteAlreadyExists,
-            errorRootSiteNotPresent,
-            errorSelfServiceSiteCreateCallFailed
-        }
-
-        export enum SocialDataStoreExceptionCode {
-            socialListNotFound,
-            personalSiteNotFound,
-            cannotCreatePersonalSite,
-            noSocialFeatures
-        }
-
-        /** Represents user properties. */
-        export class PersonProperties extends SP.ClientObject {
-            /** Specifies the person's account name */
-            get_accountName(): string;
-            /** Specifies an array of strings containing the account names of a person's direct reports. */
-            get_directReports(): string[];
-            /** Specifies the person's name. */
-            get_displayName(): string;
-            /** Specifies the person's email address. */
-            get_email(): string;
-            /** Specifies an array of strings that specify the account names of a person's managers. */
-            get_extendedManagers(): string[];
-            /** Specifies an array of strings that specify the account names of person's extended reports. */
-            get_extendedReports(): string[];
-            /** Represents whether or not the current user is following this person. */
-            get_isFollowed(): boolean;
-            /** Specifies the person's latest microblog post. */
-            get_latestPost(): string;
-            /** Specifies an array of strings that specify the account names of person's peers, that is, those who have the same manager. */
-            get_peers(): string[];
-            /** Specifies the absolute URL of the person's personal page. */
-            get_personalUrl(): string;
-            /** Specifies the URL for the person's profile picture. */
-            get_pictureUrl(): string;
-            /** Specifies the person's title. */
-            get_title(): string;
-            /** Represents all user profile properties including custom.
-                The privacy settings affect which properties can be retrieved.
-                Multiple values are delimited by the vertical bar "|".
-                Null values are specified as empty strings. */
-            get_userProfileProperties(): { [name: string]: string; };
-            /** Specifies the URL for the person's profile. */
-            get_userUrl(): string;
-        }
-
-        /** Provides an alternate entry point to user profiles rather than calling methods directly. */
-        export class ProfileLoader extends SP.ClientObject {
-            static getProfileLoader(context: SP.ClientRuntimeContext): ProfileLoader;
-            getUserProfile(): UserProfile;
-        }
-
-        /** Represents a client-side user profile for a person.
-            Note: The client-side UserProfile object provides methods you can use to create a personal site for the current user.
-            However, it does not contain the user properties that the server-side UserProfile object contains.
-            To access user properties from client-side code, use PeopleManager */
-        export class UserProfile extends SP.ClientObject {
-            constructor();
-            /** Represents the content that the user is following. */
-            get_followedContent(): FollowedContent;
-            /** Retrieves SP.Site object that represents the user's personal site. */
-            get_personalSite(): SP.Site;
-            /** Specifies attributes of the user's personal site. */
-            get_personalSiteCapabilities(): PersonalSiteCapabilities;
-            /** Provides the state of the user's personal site */
-            get_personalSiteInstantiationState(): PersonalSiteInstantiationState;
-            /** Specifies whether the user can import pictures */
-            get_pictureImportEnabled(): boolean;
-            /** Specifies the URL to allow the current user to create a personal site. */
-            get_urlToCreatePersonalSite(): string;
-            /** Specifies whether the current user's social data is to be shared. */
-            shareAllSocialData(shareAll: boolean): void;
-            /** This member is reserved for internal use and is not intended to be used directly from your code.
-                Use the createPersonalSiteEnque method to create a personal site. */
-            createPersonalSite(lcid: number): void;
-            /** Enquees creation of a personal site for the current user.
-                @param isInteractive Has a true value if the request is from a web browser and a false value if the request is from a client application. */
-            createPersonalSiteEnque(isInteractive: boolean): void;
-        }
-
-        /** Provides access to followed content items. */
-        export class FollowedContent extends SP.ClientObject {
-            constructor(context: SP.ClientRuntimeContext);
-            static newObject(context: SP.ClientRuntimeContext): FollowedContent;
-            /** Gets the location of the followed sites view */
-            get_followedDocumentsUrl(): string;
-            /** Gets the location of the followed documents view. */
-            get_followedSitesUrl(): string;
-            /** The Follow method adds the specified document or site to the list of followed content.
-                @param url  URL that identifies the item to follow.
-                            The url parameter can identify an existing document or site using the url property of the original item.
-                            The url parameter can also identify a document with the following format: http://host/site?listId=<listGuid>&itemId=<itemId>
-                @param data Optional parameter that holds application-defined data for the item.
-                */
-            follow(url: string, data?: FollowedItemData): FollowResult;
-            /** The FollowItem method is reserved for server-to-server use only.
-                The server sets the specified item to be followed by the current user.
-                This method cannot be called from the client. */
-            followItem(item: FollowedItem): FollowResult;
-            /** Removes the specified document or site from list of followed content.
-                @param url  URL that identifies the item to stop following.
-                            The url parameter can identify an existing document or site using the url property of the original item.
-                            The url parameter can also identify a document with the following format: http://host/site?listId=<listGuid>&itemId=<itemId> */
-            stopFollowing(url: string): void;
-            /** Determines if the specified document or site is being followed.
-                @param url  URL that identifies the item that is supposed to be followed.
-                            The url parameter can identify an existing document or site using the url property of the original item.
-                            The url parameter can also identify a document with the following format: http://host/site?listId=<listGuid>&itemId=<itemId> */
-            isFollowed(url: string): SP.BooleanResult;
-            /** Retrieves the followed status of the specified document or site.
-                Returns a value of type FollowedStatus, wrapped into a SP.IntResult object.
-                @param url  URL that identifies the followed item.
-                            The url parameter can identify an existing document or site using the url property of the original item.
-                            The url parameter can also identify a document with the following format: http://host/site?listId=<listGuid>&itemId=<itemId> */
-            getFollowedStatus(url: string): SP.IntResult;
-            /** Returns the followed item identified by a given URL or returns null if the item does not exist.
-                @param url  URL that identifies the followed item.
-                            The url parameter can identify an existing document or site using the url property of the original item.
-                            The url parameter can also identify a document with the following format: http://host/site?listId=<listGuid>&itemId=<itemId> */
-            getItem(url: string): FollowedItem;
-            /** Returns an array of zero or more followed items described by the type and subtype parameters.
-                @param options Describes the type of item to return.
-                @param subType Integer that identifies the sites to return by the web template. */
-            getItems(options: FollowedContentQueryOptions, subtype: number): FollowedItem[];
-            /** Updates the properties for followed item with specified URL.
-                @param url  URL that identifies the followed item.
-                            The url parameter can identify an existing document or site using the url property of the original item.
-                            The url parameter can also identify a document with the following format: http://host/site?listId=<listGuid>&itemId=<itemId>
-                @param data Application-defined data stored with the followed item. */
-            updateData(url: string, data: FollowedItemData): void;
-            /** Returns the refreshed item that is being pointed to in the Social list.
-                @param item The original item as stored in the Followed Content list. */
-            refreshFollowedItem(item: FollowedItem): FollowedItem;
-            /** Finds the original item that is being pointed to in the Followed Content list and updates the Title, Url, and IconUrl fields if they have been changed.
-                @param url The URL of the original item as stored in the Followed Content list. */
-            findAndUpdateFollowedItem(url: string): FollowedItem;
-        }
-
-        /** Represents a followed content resource. */
-        export class FollowedItem extends SP.ClientValueObject {
-            /** Additional metadata associated with this item */
-            get_data(): { [name: string]: any; };
-            /** Additional metadata associated with this item */
-            set_data(value: { [name: string]: any; }): { [name: string]: any; };
-            /** Specifies the type of the file if this item is a file. Otherwise, this property is the empty string. */
-            get_fileType(): string;
-            /** Specifies the type of the file if this item is a file. Otherwise, this property is the empty string. */
-            set_fileType(value: string): string;
-            /** Provides information about the application that opens a followed document. */
-            get_fileTypeProgid(): string;
-            /** Provides information about the application that opens a followed document. */
-            set_fileTypeProgid(value: string): string;
-            /** Specifies additional information about the followed item.
-                The server stores the data so that it can return it to the client. */
-            get_flags(): string;
-            /** Specifies additional information about the followed item.
-                The server stores the data so that it can return it to the client. */
-            set_flags(value: string): string;
-            /** Indicates whether the followed site has a feed. */
-            get_hasFeed(): boolean;
-            /** Indicates whether the followed site has a feed. */
-            set_hasFeed(value: boolean): boolean;
-            /** Specifies if the item is hidden from the user. If true this item will not generate activity in the user's feed. */
-            get_hidden(): boolean;
-            /** Specifies if the item is hidden from the user. If true this item will not generate activity in the user's feed. */
-            set_hidden(value: boolean): boolean;
-            /** Specifies the URL of an icon to represent this item. */
-            get_iconUrl(): string;
-            /** Specifies the URL of an icon to represent this item. */
-            set_iconUrl(value: string): string;
-            /** Specifies the identification for this item in the Content database. */
-            get_itemId(): number;
-            /** Specifies the identification for this item in the Content database. */
-            set_itemId(value: number): number;
-            /** Specifies the type of this item. */
-            get_itemType(): FollowedItemType;
-            /** Specifies the type of this item. */
-            set_itemType(value: FollowedItemType): FollowedItemType;
-            /** The ListId property specifies the list identification (GUID) for this item in the Content database if this item is a list or the list identification for its parent list.
-                If the ItemType is Document, this property is specified, but if the ItemType is Site, then this property is not specified. */
-            get_listId(): string;
-            /** The ListId property specifies the list identification (GUID) for this item in the Content database if this item is a list or the list identification for its parent list.
-                If the ItemType is Document, this property is specified, but if the ItemType is Site, then this property is not specified. */
-            set_listId(value: string): string;
-            /** Specifies the URL of this item's parent list or web. */
-            get_parentUrl(): string;
-            /** Specifies the URL of this item's parent list or web. */
-            set_parentUrl(value: string): string;
-            /** Provides information about the followed document to the application that opens it. */
-            get_serverUrlProgid(): string;
-            /** Provides information about the followed document to the application that opens it. */
-            set_serverUrlProgid(value: string): string;
-            /** Specifies the site identification (GUID) in the Content database for this item if this item is a site, or for its parent site if this item is not a site. */
-            get_siteId(): string;
-            /** Specifies the site identification (GUID) in the Content database for this item if this item is a site, or for its parent site if this item is not a site. */
-            set_siteId(value: string): string;
-            /** Specifies the subtype of this item.
-                If the ItemType is Site, the Subtype specifies the web template identification.
-                If the ItemType is Document, the Subtype has a value of 1. */
-            get_subtype(): number;
-            /** Specifies the subtype of this item.
-                If the ItemType is Site, the Subtype specifies the web template identification.
-                If the ItemType is Document, the Subtype has a value of 1. */
-            set_subtype(value: number): number;
-            /** Specifies the item of this item */
-            get_title(): string;
-            /** Specifies the item of this item */
-            set_title(value: string): string;
-            /** Specifies the GUID for this item in the Content database. */
-            get_uniqueId(): SP.Guid;
-            /** Specifies the GUID for this item in the Content database. */
-            set_uniqueId(value: SP.Guid): SP.Guid;
-            /** Specifies the URL of this item. */
-            get_url(): string;
-            /** Specifies the URL of this item. */
-            set_url(value: string): string;
-            /** Specifies the site identification (GUID) in the Content database for this item if it is a site, or the identification of its parent site if this item is a document. */
-            get_webId(): SP.Guid;
-            /** Specifies the site identification (GUID) in the Content database for this item if it is a site, or the identification of its parent site if this item is a document. */
-            set_webId(value: SP.Guid): any;
-        }
-
-        export enum FollowedItemType {
-            unknown,
-            document,
-            site,
-            all
-        }
-
-        export enum FollowedContentExceptionType {
-            itemAlreadyExists,
-            itemDoesNotExist,
-            invalidQueryString,
-            invalidSubtypeValue,
-            unsupportedItemType,
-            followLimitReached,
-            untrustedSource,
-            unsupportedSite,
-            internalError
-        }
-
-        export enum FollowedContentQueryOptions {
-            unset,
-            sites,
-            documents,
-            hidden,
-            nonFeed,
-            defaultOptions,
-            all
-        }
-
-        export enum FollowedStatus {
-            followed,
-            notFollowed,
-            notFollowable
-        }
-
-
-        /** Contains additional data that can be attached to a FollowedItem object */
-        export class FollowedItemData extends SP.ClientObject {
-            /** An unordered collection of key/value pairs for custom properties to be set on the item. */
-            get_properties(): { [name: string]: any; };
-        }
-
-        /** Returns information about a request to follow an item. */
-        export class FollowResult extends SP.ClientValueObject {
-            /** Contains the item being followed. */
-            get_item(): FollowedItem;
-            /** Provides information about the attempt to follow an item. */
-            get_resultType(): FollowResultType;
-        }
-
-        export enum FollowResultType {
-            /** Result is unknown */
-            unknown,
-            /** The request succeeded and the item is being followed. */
-            followed,
-            /** The item was already being followed by the current user so there is no change in status. */
-            refollowed,
-            /** The request encountered the maximum follow limit. */
-            hitFollowLimit,
-            /** The request failed. */
-            failed
-        }
-
-        /** Represents a set of user profile properties for a specified user. */
-        export class UserProfilePropertiesForUser extends SP.ClientObject {
-            /** Creates new UserProfilePropertiesForUser object
-                @param context Specifies the client context to use.
-                @param accountName Specifies the user by account name.
-                @param propertyNames Specifies an array of strings that specify the properties to retrieve. */
-            constructor(context: SP.ClientContext, accountName: string, propertyNames: string[]);
-
-            /** Specifies the user account name */
-            get_accountName(): string;
-            /** Specifies the user account name */
-            set_accountName(value: string): string;
-            /** Gets an array of strings that specify the user profile property names. */
-            getPropertyNames(): string[];
-        }
-    }
-
-}
-
-declare namespace SP {
-
-    export module Utilities {
-        export class Utility {
-            lAYOUTS_LATESTVERSION_RELATIVE_URL: string;
-            lAYOUTS_LATESTVERSION_URL: string;
-            static get_layoutsLatestVersionRelativeUrl(): string;
-            static get_layoutsLatestVersionUrl(): string;
-            static getLayoutsPageUrl(pageName: string): string;
-            static getImageUrl(imageName: string): string;
-            static createWikiPageInContextWeb(context: SP.ClientRuntimeContext, parameters: SP.Utilities.WikiPageCreationInformation): SP.File;
-            static localizeWebPartGallery(context: SP.ClientRuntimeContext, items: SP.ListItemCollection): SP.ClientObjectList<SP.ListItem>;
-            static getAppLicenseInformation(context: SP.ClientRuntimeContext, productId: SP.Guid): SP.AppLicenseCollection;
-            static importAppLicense(context: SP.ClientRuntimeContext, licenseTokenToImport: string, contentMarket: string, billingMarket: string, appName: string, iconUrl: string, providerName: string, appSubtype: number): void;
-            static getAppLicenseDeploymentId(context: SP.ClientRuntimeContext): SP.GuidResult;
-            static logCustomAppError(context: SP.ClientRuntimeContext, error: string): SP.IntResult;
-            static logCustomRemoteAppError(context: SP.ClientRuntimeContext, productId: SP.Guid, error: string): SP.IntResult;
-            static getLocalizedString(context: SP.ClientRuntimeContext, source: string, defaultResourceFile: string, language: number): SP.StringResult;
-            static createNewDiscussion(context: SP.ClientRuntimeContext, list: SP.List, title: string): SP.ListItem;
-            static createNewDiscussionReply(context: SP.ClientRuntimeContext, parent: SP.ListItem): SP.ListItem;
-            static markDiscussionAsFeatured(context: SP.ClientRuntimeContext, listID: string, topicIDs: string): void;
-            static unmarkDiscussionAsFeatured(context: SP.ClientRuntimeContext, listID: string, topicIDs: string): void;
-            static searchPrincipals(context: SP.ClientRuntimeContext, web: SP.Web, input: string, scopes: SP.Utilities.PrincipalType, sources: SP.Utilities.PrincipalSource, usersContainer: SP.UserCollection, maxCount: number): SP.Utilities.PrincipalInfo[];
-            static getCurrentUserEmailAddresses(context: SP.ClientRuntimeContext): SP.StringResult;
-            static createEmailBodyForInvitation(context: SP.ClientRuntimeContext, pageAddress: string): SP.StringResult;
-            static getPeoplePickerURL(context: SP.ClientRuntimeContext, web: SP.Web, fieldUser: SP.FieldUser): SP.StringResult;
-            static resolvePrincipal(context: SP.ClientRuntimeContext, web: SP.Web, input: string, scopes: SP.Utilities.PrincipalType, sources: SP.Utilities.PrincipalSource, usersContainer: SP.UserCollection, inputIsEmailOnly: boolean): SP.Utilities.PrincipalInfo;
-            static getLowerCaseString(context: SP.ClientRuntimeContext, sourceValue: string, lcid: number): SP.StringResult;
-            static formatDateTime(context: SP.ClientRuntimeContext, web: SP.Web, datetime: Date, format: SP.Utilities.DateTimeFormat): SP.StringResult;
-            static isUserLicensedForEntityInContext(context: SP.ClientRuntimeContext, licensableEntity: string): SP.BooleanResult;
-        }
-        export enum DateTimeFormat {
-            dateTime,
-            dateOnly,
-            timeOnly,
-            iSO8601,
-            monthDayOnly,
-            monthYearOnly,
-            longDate,
-            unknownFormat,
-        }
-        export class EmailProperties extends SP.ClientValueObject {
-            get_additionalHeaders(): any;
-            set_additionalHeaders(value: any): void;
-            get_bCC(): string[];
-            set_bCC(value: string[]): void;
-            get_body(): string;
-            set_body(value: string): void;
-            get_cC(): string[];
-            set_cC(value: string[]): void;
-            get_from(): string;
-            set_from(value: string): void;
-            get_subject(): string;
-            set_subject(value: string): void;
-            get_to(): string[];
-            set_to(value: string[]): void;
-            get_typeId(): string;
-            writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-            constructor();
-        }
-        export enum IconSize {
-            size16,
-            size32,
-            size256,
-        }
-        export enum LogAppErrorResult {
-            success,
-            errorsThrottled,
-            accessDenied,
-        }
-        export class PrincipalInfo extends SP.ClientValueObject {
-            get_department(): string;
-            get_displayName(): string;
-            get_email(): string;
-            get_jobTitle(): string;
-            get_loginName(): string;
-            get_mobile(): string;
-            get_principalId(): number;
-            get_principalType(): SP.Utilities.PrincipalType;
-            get_sIPAddress(): string;
-            get_typeId(): string;
-            writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-            constructor();
-        }
-        export enum PrincipalSource {
-            none,
-            userInfoList,
-            windows,
-            membershipProvider,
-            roleProvider,
-            all,
-        }
-        export enum PrincipalType {
-            none,
-            user,
-            distributionList,
-            securityGroup,
-            sharePointGroup,
-            all,
-        }
-        export enum SPWOPIFrameAction {
-            view,
-            edit,
-            mobileView,
-            interactivePreview,
-        }
-        export class WikiPageCreationInformation extends SP.ClientValueObject {
-            get_serverRelativeUrl(): string;
-            set_serverRelativeUrl(value: string): void;
-            get_wikiHtmlContent(): string;
-            set_wikiHtmlContent(value: string): void;
-            get_typeId(): string;
-            writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-            constructor();
-        }
-        export class DateUtility {
-            static isLeapYear(year: number): boolean;
-            static dateToJulianDay(year: number, month: number, day: number): number;
-            static julianDayToDate(julianDay: number): SP.DateTimeUtil.SimpleDate;
-            static daysInMonth(year: number, month: number): number;
-        }
-        export class HttpUtility {
-            /** Official version of STSHtmlEncode. Calls it internally. */
-            static htmlEncode(stringToEncode: string): string;
-            static urlPathEncode(stringToEncode: string): string;
-            static urlKeyValueEncode(keyOrValueToEncode: string): string;
-            static ecmaScriptStringLiteralEncode(scriptLiteralToEncode: string): string;
-            static navigateTo(url: string): void;
-            /** Appends correct "Source" parameter to the specified url, and then navigates to this url.
-                "Source" parameter is recognized in many places in SharePoint, usually to determine "Cancel" behavior. */
-            static appendSourceAndNavigateTo(url: string): void;
-            static escapeXmlText(stringToEscape: string): string;
-            static navigateHttpFolder(urlSrc: string, frameTarget: string): void;
-        }
-        export class UrlBuilder {
-            constructor(path: string);
-            static urlCombine(path1: string, path2: string): string;
-            static replaceOrAddQueryString(url: string, key: string, value: string): string;
-            static removeQueryString(url: string, key: string): string;
-            combinePath(path: string): void;
-            addKeyValueQueryString(key: string, value: string): void;
-            /** Returns the resulting url */
-            get_url(): string;
-            /** Same as get_url() */
-            toString(): string;
-        }
-
-        export class LocUtility {
-            static getLocalizedCountValue(locText: string, intervals: string, count: number): string;
-        }
-
-        export class VersionUtility {
-            static get_layoutsLatestVersionRelativeUrl(): string;
-            static get_layoutsLatestVersionUrl(): string;
-            static getLayoutsPageUrl(pageName: string): string;
-            static getImageUrl(imageName: string): string;
-        }
-
-    }
-
-    export module DateTimeUtil {
-        export class SimpleDate {
-            constructor(year: number, month: number, day: number, era: number);
-            get_year(): number;
-            set_year(value: number): void;
-            get_month(): number;
-            set_month(value: number): void;
-            get_day(): number;
-            set_day(value: number): void;
-            get_era(): number;
-            set_era(value: number): void;
-            static dateEquals(date1: SimpleDate, date2: SimpleDate): boolean;
-            static dateLessEqual(date1: SimpleDate, date2: SimpleDate): boolean;
-            static dateGreaterEqual(date1: SimpleDate, date2: SimpleDate): boolean;
-            static dateLess(date1: SimpleDate, date2: SimpleDate): boolean;
-            static dateGreater(date1: SimpleDate, date2: SimpleDate): boolean;
-        }
-    }
-}
-
-declare namespace SP {
-    export module WebParts {
-        export class LimitedWebPartManager extends SP.ClientObject {
-            get_hasPersonalizedParts(): boolean;
-            get_scope(): SP.WebParts.PersonalizationScope;
-            get_webParts(): SP.WebParts.WebPartDefinitionCollection;
-            addWebPart(webPart: SP.WebParts.WebPart, zoneId: string, zoneIndex: number): SP.WebParts.WebPartDefinition;
-            importWebPart(webPartXml: string): SP.WebParts.WebPartDefinition;
-        }
-        export enum PersonalizationScope {
-            user,
-            shared,
-        }
-        export class TileData extends SP.ClientValueObject {
-            get_backgroundImageLocation(): string;
-            set_backgroundImageLocation(value: string): void;
-            get_description(): string;
-            set_description(value: string): void;
-            get_iD(): number;
-            set_iD(value: number): void;
-            get_linkLocation(): string;
-            set_linkLocation(value: string): void;
-            get_tileOrder(): number;
-            set_tileOrder(value: number): void;
-            get_title(): string;
-            set_title(value: string): void;
-            get_typeId(): string;
-            writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-            constructor();
-        }
-        export class WebPart extends SP.ClientObject {
-            get_hidden(): boolean;
-            set_hidden(value: boolean): void;
-            get_isClosed(): boolean;
-            get_properties(): SP.PropertyValues;
-            get_subtitle(): string;
-            get_title(): string;
-            set_title(value: string): void;
-            get_titleUrl(): string;
-            set_titleUrl(value: string): void;
-            get_zoneIndex(): number;
-        }
-        export class WebPartDefinition extends SP.ClientObject {
-            get_id(): SP.Guid;
-            get_webPart(): SP.WebParts.WebPart;
-            saveWebPartChanges(): void;
-            closeWebPart(): void;
-            openWebPart(): void;
-            deleteWebPart(): void;
-            moveWebPartTo(zoneID: string, zoneIndex: number): void;
-        }
-        export class WebPartDefinitionCollection extends SP.ClientObjectCollection<WebPartDefinition> {
-            itemAt(index: number): SP.WebParts.WebPartDefinition;
-            get_item(index: number): SP.WebParts.WebPartDefinition;
-            getById(id: SP.Guid): SP.WebParts.WebPartDefinition;
-            getByControlId(controlId: string): SP.WebParts.WebPartDefinition;
-        }
-    }
-}
-
-declare namespace SP {
-    export module Workflow {
-        export class WorkflowAssociation extends SP.ClientObject {
-            get_allowManual(): boolean;
-            set_allowManual(value: boolean): void;
-            get_associationData(): string;
-            set_associationData(value: string): void;
-            get_autoStartChange(): boolean;
-            set_autoStartChange(value: boolean): void;
-            get_autoStartCreate(): boolean;
-            set_autoStartCreate(value: boolean): void;
-            get_baseId(): SP.Guid;
-            get_created(): Date;
-            get_description(): string;
-            set_description(value: string): void;
-            get_enabled(): boolean;
-            set_enabled(value: boolean): void;
-            get_historyListTitle(): string;
-            set_historyListTitle(value: string): void;
-            get_id(): SP.Guid;
-            get_instantiationUrl(): string;
-            get_internalName(): string;
-            get_isDeclarative(): boolean;
-            get_listId(): SP.Guid;
-            get_modified(): Date;
-            get_name(): string;
-            set_name(value: string): void;
-            get_taskListTitle(): string;
-            set_taskListTitle(value: string): void;
-            get_webId(): SP.Guid;
-            update(): void;
-            deleteObject(): void;
-        }
-        export class WorkflowAssociationCollection extends SP.ClientObjectCollection<WorkflowAssociation> {
-            itemAt(index: number): SP.Workflow.WorkflowAssociation;
-            get_item(index: number): SP.Workflow.WorkflowAssociation;
-            getById(associationId: SP.Guid): SP.Workflow.WorkflowAssociation;
-            add(parameters: SP.Workflow.WorkflowAssociationCreationInformation): SP.Workflow.WorkflowAssociation;
-            getByName(name: string): SP.Workflow.WorkflowAssociation;
-        }
-        export class WorkflowAssociationCreationInformation extends SP.ClientValueObject {
-            get_contentTypeAssociationHistoryListName(): string;
-            set_contentTypeAssociationHistoryListName(value: string): void;
-            get_contentTypeAssociationTaskListName(): string;
-            set_contentTypeAssociationTaskListName(value: string): void;
-            get_historyList(): SP.List;
-            set_historyList(value: SP.List): void;
-            get_name(): string;
-            set_name(value: string): void;
-            get_taskList(): SP.List;
-            set_taskList(value: SP.List): void;
-            get_template(): SP.Workflow.WorkflowTemplate;
-            set_template(value: SP.Workflow.WorkflowTemplate): void;
-            get_typeId(): string;
-            writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
-            constructor();
-        }
-        export class WorkflowTemplate extends SP.ClientObject {
-            get_allowManual(): boolean;
-            get_associationUrl(): string;
-            get_autoStartChange(): boolean;
-            get_autoStartCreate(): boolean;
-            get_description(): string;
-            get_id(): SP.Guid;
-            get_isDeclarative(): boolean;
-            get_name(): string;
-            get_permissionsManual(): SP.BasePermissions;
-        }
-        export class WorkflowTemplateCollection extends SP.ClientObjectCollection<WorkflowTemplate> {
-            itemAt(index: number): SP.Workflow.WorkflowTemplate;
-            get_item(index: number): SP.Workflow.WorkflowTemplate;
-            getById(templateId: SP.Guid): SP.Workflow.WorkflowTemplate;
-            getByName(name: string): SP.Workflow.WorkflowTemplate;
-        }
-    }
-}
-
-declare namespace SP.WorkflowServices {
-
-    export enum WorkflowStatus {
-        notStarted,
-        started,
-        suspended,
-        canceling,
-        canceled,
-        terminated,
-        completed,
-        notSpecified,
-        invalid
-    }
-
-    // TODO: comments, types
-    export class InteropService extends SP.ClientObject {
-        constructor(context: SP.ClientRuntimeContext, objectPath: SP.ObjectPathStaticProperty);
-        static getCurrent(context: SP.ClientRuntimeContext): InteropService;
-        enableEvents(listId: SP.Guid, itemGuid: SP.Guid): void;
-        disableEvents(listId: SP.Guid, itemGuid: SP.Guid): void;
-        startWorkflow(associationName: string, correlationId: SP.Guid, listId: SP.Guid, itemGuid: SP.Guid, workflowParameters: any): SP.GuidResult;
-        cancelWorkflow(instanceId: SP.Guid): void;
-    }
-
-    /** Represents a workflow definition and associated properties. */
-    export class WorkflowDefinition extends SP.ClientObject {
-        constructor(context: SP.ClientRuntimeContext);
-        /** Url of the association form */
-        get_associationUrl(): string;
-        /** Url of the association form */
-        set_associationUrl(value: string): string;
-        get_description(): string;
-        set_description(value: string): string;
-        get_displayName(): string;
-        set_displayName(value: string): string;
-        /** Identifier for a draft version of the workflow definition */
-        get_draftVersion(): string;
-        /** Identifier for a draft version of the workflow definition */
-        set_draftVersion(value: string): string;
-        /** Defines the fields of the workflow initiation forms and association forms (CAML string)  */
-        get_formField(): string;
-        /** Defines the fields of the workflow initiation forms and association forms (CAML string)  */
-        set_formField(value: string): string;
-        get_id(): string;
-        set_id(value: string): string;
-        get_initiationUrl(): string;
-        set_initiationUrl(value: string): string;
-        /** Gets custom properties of the workflow definition */
-        get_properties(): { [propertyName: string]: any; };
-        /** true if the workflow definition has been published to the external workflow host; false if the workflow definition is only saved on the site  */
-        get_published(): boolean;
-        /** Determines whether to automatically generate an association form for this workflow.
-            If the value is true, and the associationUrl is not already set, a default association form is automatically generated for the workflow when saveDefinition is called.  */
-        get_requiresAssociationForm(): boolean;
-        /** Determines whether to automatically generate an association form for this workflow.
-            If the value is true, and the associationUrl is not already set, a default association form is automatically generated for the workflow when saveDefinition is called.  */
-        set_requiresAssociationForm(value: boolean): boolean;
-        /** Determines whether to automatically generate an initiation form for this workflow.
-            If the value is true, and the initiationUrl is not already set, a default initiation form is automatically generated for the workflow when saveDefinition is called.  */
-        get_requiresInitiationForm(): boolean;
-        /** Determines whether to automatically generate an initiation form for this workflow.
-            If the value is true, and the initiationUrl is not already set, a default initiation form is automatically generated for the workflow when saveDefinition is called.  */
-        set_requiresInitiationForm(value: boolean): boolean;
-        /** RestrictToScope is a GUID value, used in conjunction with the RestrictToType property to further restrict the scope of the definition.
-            For example, if the RestrictToType is "List", then setting the RestrictToScope to a particular list identifier limits the definition to be associable only to the specified list.
-            If the RestrictToType is "List" but the RestrictToScope is null or the empty string, then the definition is associable to any list. */
-        get_restrictToScope(): string;
-        /** RestrictToScope is a GUID value, used in conjunction with the RestrictToType property to further restrict the scope of the definition.
-            For example, if the RestrictToType is "List", then setting the RestrictToScope to a particular list identifier limits the definition to be associable only to the specified list.
-            If the RestrictToType is "List" but the RestrictToScope is null or the empty string, then the definition is associable to any list. */
-        set_restrictToScope(value: string): string;
-        /** RestrictToType determines the possible event source type for a workflow subscription that uses this definition.
-            Possible values include "List", "Site", the empty string, or null.  */
-        get_restrictToType(): string;
-        /** RestrictToType determines the possible event source type for a workflow subscription that uses this definition.
-            Possible values include "List", "Site", the empty string, or null.  */
-        set_restrictToType(value: string): string;
-        /** XAML definition of the workflow */
-        get_xaml(): string;
-        /** XAML definition of the workflow */
-        set_xaml(value: string): string;
-        /** This method adds a key-value pair (propertyName, value) to the workflow definition object�s property bag.  */
-        setProperty(propertyName: string, value: string): void;
-        /** This method is internal and is not intended to be used in your code. */
-        initPropertiesFromJson(parentNode: any): void;
-    }
-
-    /** Represents a collection of WorkflowDefinition objects */
-    export class WorkflowDefinitionCollection extends SP.ClientObjectCollection<WorkflowDefinition> {
-        itemAt(index: number): WorkflowDefinition;
-        get_item(index: number): WorkflowDefinition;
-        /** returns SP.WorkflowDefinition class */
-        get_childItemType(): any;
-    }
-
-    /** Manages workflow definitions and workflow activity authoring. */
-    export class WorkflowDeploymentService extends SP.ClientObject {
-        /** Returns an XML representation of a list of valid Workflow Manager Client 1.0 actions for the specified web (WorkflowInfo element). */
-        getDesignerActions(web: SP.Web): SP.StringResult;
-        /** Returns an XML representation of a collection of XAML class signatures for workflow definitions.
-            @param lastChanges Date time value representing the latest changes; class signatures older than this time are excluded from the result set.  */
-        getActivitySignatures(lastChanged: string): SP.ClientResult<any>;
-        /** Saves a SharePoint workflow definition to the workflow store.  */
-        saveDefinition(definition: WorkflowDefinition): SP.GuidResult;
-        /** Validates the specified activity against workflow definitions in the workflow store.  */
-        validateActivity(activityXaml: string): SP.StringResult;
-        /** Publishes a workflow definition to the workflow store.  */
-        publishDefinition(definitionId: string): void;
-        /** Marks a workflow definition as deprecated. Currently running workflow instances are allowed to complete, but new instances of the workflow definition are prevented from starting.  */
-        deprecateDefinition(definitionId: string): void;
-        /** Deletes a workflow definition.
-            @param definitionId The guid identifier of the workflow definition.  */
-        deleteDefinition(definitionId: string): void;
-        /** Retrieves workflow definitions from the workflow store that match the tags. */
-        enumerateDefinitions(publishedOnly: boolean): WorkflowDefinitionCollection;
-        /** Retrieves a specified workflow definition from the workflow store.
-            @param definitionId The guid identifier of the workflow definition.  */
-        getDefinition(definitionId: string): WorkflowDefinition;
-        /** Saves the collateral file of a workflow definition.
-            @param workflowDefinitionId The guid identifier of the workflow definition.*/
-        saveCollateral(workflowDefinitionId: string, leafFileName: string, fileContent: Base64EncodedByteArray): void;
-        /** Deletes the URL of a workflow definition's collateral file.
-            @param workflowDefinitionId The guid identifier of the workflow definition.  */
-        deleteCollateral(workflowDefinitionId: string, leafFileName: string): void;
-        /** Retrieves the URL of the collateral file of the workflow definition.
-            @param workflowDefinitionId The guid identifier of the workflow definition.
-            @param leafFileName The leaf name of the collateral file. */
-        getCollateralUri(workflowDefinitionId: string, leafFileName: string): SP.StringResult;
-        /** Packages a single workflow definition into a SharePoint solution package (.wsp file) and saves the package to the Site Assets library.
-            Returns the URL of the package file in the Site Asset library.
-            Remarks:
-            1. This method does not activate the package.
-            2. If a package with the same name already exists in the Site Assets library, the method adds an integer suffix in braces to the file name, e.g. packageDefaultFilename{2}.wsp
-            @param definitionId The guid identifier of the workflow definition.
-            @param packageDefaultFilename The default filename to choose for the new package.
-            @param packageTitle The title of the package.
-            @param packageDescription The description of the package. */
-        packageDefinition(definitionId: SP.Guid, packageDefaultFilename: string, packageTitle: string, packageDescription: string): SP.StringResult;
-    }
-
-    /** Represents an instance of a workflow association that performs on a list item the process that is defined in a workflow template */
-    export class WorkflowInstance extends SP.ClientObject {
-        /** Contains the error string or exception information if the workflow faults. */
-        get_faultInfo(): string;
-        /** Unique identifier (GUID) for the workflow instance */
-        get_id(): string;
-        /** Gets the Coordinated Universal Time (UTC) when this workflow instance was created. */
-        get_instanceCreated(): string;
-        /** Gets the Coordinated Universal Time (UTC) when the workflow instance state was last persisted */
-        get_lastUpdated(): string;
-        /** Specifies properties of this workflow instance */
-        get_properties(): { [name: string]: string; };
-        /** Returns runtime status of the workflow instance */
-        get_status(): WorkflowStatus;
-        /** Specifies the custom status set by workflow authors. */
-        get_userStatus(): string;
-        /** Specifies the custom status set by workflow authors. */
-        set_userStatus(value: string): string;
-        /** Gets the unique identifier (GUID) of the subscription that instantiates the WorkflowInstance */
-        get_workflowSubscriptionId(): SP.Guid;
-        /** This method is internal and is not intended to be used in your code. */
-        initPropertiesFromJson(parentNode: any): void;
-
-    }
-
-    /** Represents a collection of WorkflowInstance objects */
-    export class WorkflowInstanceCollection extends SP.ClientObjectCollection<WorkflowInstance> {
-        itemAt(index: number): WorkflowInstance;
-        get_item(index: number): WorkflowInstance;
-        /** returns SP.WorkflowInstance class */
-        get_childItemType(): any;
-    }
-
-    /** Reads the SharePoint workflow instances from the external workflow host and manages the instance execution. */
-    export class WorkflowInstanceService extends SP.ClientObject {
-        /** Starts a Workflow Manager Client 1.0 instance specified by the subscription and passes the supplied parameters.
-            Returns GUID of the instance object.
-            @param payload Object that contains name-value pairs of parameter names and values to pass into the workflow instance. */
-        startWorkflow(subscription: WorkflowSubscription, payload: { [name: string]: any; }): SP.GuidResult;
-        /** Starts a Workflow Manager Client 1.0 instance specified by the subscription and passes the supplied parameters.
-            Returns GUID of the instance object.
-            @param subscription The subscription associated with the workflow instance.
-            @param itemId The integer id of the list item on which to start the workflow instance.
-            @param payload Object that contains name-value pairs of parameter names and values to pass into the workflow instance. */
-        startWorkflowOnListItem(subscription: WorkflowSubscription, itemId: number, payload: { [name: string]: any; }): SP.GuidResult;
-        /** Gets workflow instance specified by the provided instance GUID */
-        getInstance(instanceId: string): WorkflowInstance;
-        /** Gets a workflow instance collection comprising the 100 most recent workflow instances started by a specified subscription.  */
-        enumerate(parentSubscription: WorkflowSubscription): WorkflowInstanceCollection;
-        /** Gets a workflow instance collection comprising 100 workflow instances starting at the specified offset.  */
-        enumerateWithOffset(parentSubscription: WorkflowSubscription, offset: number): WorkflowInstanceCollection;
-        /** Gets the list of instances for the specified list item. */
-        enumerateInstancesForListItem(listId: string, itemId: number): WorkflowInstanceCollection;
-        /** Gets the list of instances for the specified list item. */
-        enumerateInstancesForListItemWithOffset(listId: string, itemId: number, offset: number): WorkflowInstanceCollection;
-        /** Gets the list of instances for the current site. */
-        enumerateInstancesForSite(): WorkflowInstanceCollection;
-        /** Gets the list of instances for the current site. */
-        enumerateInstancesForSiteWithOffset(offset: number): WorkflowInstanceCollection;
-        /** Retrieves a count of all the instances of the specified WorkflowSubscription. */
-        countInstances(parentSubscription: WorkflowSubscription): SP.IntResult;
-        /** Retrieves a count of the instances of the specified WorkflowSubscription that have a specified status. */
-        countInstancesWithStatus(parentSubscription: WorkflowSubscription, status: WorkflowStatus): SP.IntResult;
-        /** Sends a cancel message to the specified workflow instance and permits the instance to execute a cancellation scope. */
-        cancelWorkflow(instance: WorkflowInstance): void;
-        /** Terminate a workflow instance forcefully by deleting it from memory. The instance is not allowed to execute a cancellation scope */
-        terminateWorkflow(instance: WorkflowInstance): void;
-        suspendWorkflow(instance: WorkflowInstance): void;
-        resumeWorkflow(instance: WorkflowInstance): void;
-        /** Sends a custom event to a running workflow with the event payload. */
-        publishCustomEvent(instance: WorkflowInstance, eventName: string, payload: string): void;
-        getDebugInfo(instance: WorkflowInstance): SP.StringResult;
-    }
-
-    /** Describes the workflow host configuration states and provides service objects that interact with the workflow */
-    export class WorkflowServicesManager extends SP.ClientObject {
-        constructor(context: SP.ClientRuntimeContext, web: SP.Web);
-        static newObject(context: SP.ClientRuntimeContext, web: SP.Web): WorkflowServicesManager;
-        /** The current application identifier.*/
-        get_appId(): string;
-        /** Indicates whether this workflow service is actively connected to a workflow host. */
-        get_isConnected(): boolean;
-        /** Returns the path of the current scope in the workflow host. */
-        get_scopePath(): string;
-        getWorkflowDeploymentService(): WorkflowDeploymentService;
-        getWorkflowInstanceService(): WorkflowInstanceService;
-        getWorkflowInteropService(): InteropService;
-        getWorkflowSubscriptionService(): WorkflowSubscriptionService;
-        /** This method is internal and is not intended to be used in your code. */
-        initPropertiesFromJson(parentNode: any): void;
-    }
-
-    /** Base class representing subscriptions for the external workflow host. */
-    export class WorkflowSubscription extends SP.ClientObject {
-        /** Gets the unique ID of the workflow definition to activate. */
-        get_definitionId(): SP.Guid;
-        /** Sets the unique ID of the workflow definition to activate. */
-        set_definitionId(value: SP.Guid): SP.Guid;
-        /** Gets a boolean value that specifies if the workflow subscription is enabled.
-            When disabled, new instances of the subscription cannot be started, but existing instances will continue to run.  */
-        get_enabled(): boolean;
-        /** Sets a boolean value that enables or disables the workflow subscription.
-            When disabled, new instances of the subscription cannot be started, but existing instances will continue to run.  */
-        set_enabled(value: boolean): boolean;
-        /** Gets the logical source instance name of the event. (GUID) */
-        get_eventSourceId(): string;
-        /** Sets the logical source instance name of the event. (GUID) */
-        set_eventSourceId(value: string): string;
-        /** Gets or sets the list of event types for which the subscription is listening.
-            For SharePoint events, these will map to a value in the SPEventReceiverType enumeration. */
-        get_eventTypes(): string[];
-        /** Gets or sets the list of event types for which the subscription is listening.
-            For SharePoint events, these will map to a value in the SPEventReceiverType enumeration. */
-        set_eventTypes(value: string[]): string[];
-        /** Unique identifier (GUID) of the workflow subscription */
-        get_id(): string;
-        /** Unique identifier (GUID) of the workflow subscription */
-        set_id(value: string): string;
-        /** Boolean value that specifies whether multiple workflow instances can be started manually on the same list item at the same time. This property can be used for list workflows only.  */
-        get_manualStartBypassesActivationLimit(): boolean;
-        /** Boolean value that specifies whether multiple workflow instances can be started manually on the same list item at the same time. This property can be used for list workflows only.  */
-        set_manualStartBypassesActivationLimit(value: boolean): boolean;
-        /** Gets the name of the workflow subscription for the specified event source.  */
-        get_name(): string;
-        /** Sets the name of the workflow subscription for the specified event source.  */
-        set_name(value: string): string;
-        /** Gets the properties and values to pass to the workflow definition when the subscription is matched. */
-        get_propertyDefinitions(): any;
-        /** Gets the name of the workflow status field on the specified list.  */
-        get_statusFieldName(): string;
-        /** Gets or sets the name of the workflow status field on the specified list.  */
-        set_statusFieldName(value: string): string;
-        /** Sets the name-value pairs for workflow definition initiation parameters that are stored in the PropertyDefinitions property  */
-        setProperty(propertyName: string, value: string): void;
-        /** This method is internal and is not intended to be used in your code. */
-        initPropertiesFromJson(parentNode: any): void;
-    }
-
-    /** Represents a collection of WorkflowSubscription objects */
-    export class WorkflowSubscriptionCollection extends SP.ClientObjectCollection<WorkflowSubscription> {
-        itemAt(index: number): WorkflowSubscription;
-        get_item(index: number): WorkflowSubscription;
-        /** returns SP.WorkflowInstance class */
-        get_childItemType(): any;
-    }
-
-    export class WorkflowSubscriptionService extends SP.ClientObject {
-        constructor(context: SP.ClientRuntimeContext, objectPath: SP.ObjectPathStaticProperty);
-        static getCurrent(context: SP.ClientRuntimeContext): WorkflowSubscriptionService;
-        /** Creates a workflow subscription for a workflow, and returns the unique identifier of the new subscription. */
-        publishSubscription(subscription: WorkflowSubscription): SP.GuidResult;
-        /** Creates a workflow subscription for a workflow and if necessary an event receiver on the specified list.
-            Also writes an EventSourceId that matches the list as the event source.
-            Returns the unique identifier of the new subscription.
-            @param listId Unique identifier (GUID) for the specified list. */
-        publishSubscriptionForList(subscription: WorkflowSubscription, listId: string): SP.GuidResult;
-        /** Ensures that an event receiver will monitor a list for the specified event.
-            @param listId Unique identifier (GUID) for the specified list.
-            @eventName eventName The name of the event to be monitored. */
-        registerInterestInList(listId: string, eventName: string): void;
-        /** Removes monitoring for an event receiver on the specified list with the specified event.
-            @param listId GUID of the list containing the event receiver to be unregistered.
-            @eventName eventName The name of the event to be removed. */
-        unregisterInterestInList(listId: string, eventName: string): void;
-        getSubscription(subscriptionId: SP.Guid): WorkflowSubscription;
-        deleteSubscription(subscriptionId: SP.Guid): WorkflowSubscription;
-        /** Retrieves workflow subscriptions that contains all of the workflow subscriptions on the Web  */
-        enumerateSubscriptions(): WorkflowSubscriptionCollection;
-        /** Retrieves workflow subscriptions based on workflow definition */
-        enumerateSubscriptionsByDefinition(definitionId: string): WorkflowSubscriptionCollection;
-        /** Retrieves workflow subscriptions based on the specified EventSourceId */
-        enumerateSubscriptionsByEventSource(eventSourceId: string): WorkflowSubscriptionCollection;
-        /** Retrieves workflow subscriptions based on the specified list.
-            @param listId The unique identifier (GUID) of the list on which to filter the subscriptions. */
-        enumerateSubscriptionsByList(listId: string): WorkflowSubscriptionCollection;
-    }
-
-}
-
-
-
-declare namespace SP {
-    export module Publishing {
-        export class PublishingWeb extends ClientObject {
-            static getPublishingWeb(context: ClientContext, web: Web): PublishingWeb;
-
-            public get_web(): Web;
-            public addPublishingPage(pageInformation: PublishingPageInformation): PublishingPage;
-        }
-
-        export class PublishingPageInformation extends ClientValueObject {
-
-            public get_folder(): Folder;
-            public set_folder(value: Folder): Folder;
-
-            public get_name(): string;
-            public set_name(value: string): string;
-
-            public get_pageLayoutListItem(): ListItem;
-            public set_pageLayoutListItem(value: ListItem): ListItem;
-        }
-
-        export class PublishingPage extends ScheduledItem {
-            static getPublishingPage(context: ClientContext, sourceListItem: ListItem): PublishingPage;
-            public addFriendlyUrl(friendlyUrlSegment: string, editableParent: Navigation.NavigationTermSetItem, doAddToNavigation: boolean): StringResult;
-        }
-
-        export class ScheduledItem extends ClientObject {
-            public get_listItem(): ListItem;
-
-            public get_startDate(): Date;
-            public set_startDate(value: Date): Date;
-
-            public get_endDate(): Date;
-            public set_endDate(value: Date): Date;
-
-            public schedule(approvalComment: string): void;
-        }
-
-        export class PublishingSite extends ClientObject {
-            static createPageLayout(context: ClientContext, parameters: PageLayoutCreationInformation): void;
-        }
-
-        export class PageLayoutCreationInformation extends ClientValueObject {
-            public get_web(): Web;
-            public set_web(value: Web): Web;
-
-            public get_associatedContentTypeId(): string;
-            public set_associatedContentTypeId(value: string): string;
-
-            public get_masterPageUrl(): string;
-            public set_masterPageUrl(value: string): string;
-
-            public get_newPageLayoutNameWithoutExtension(): string;
-            public set_newPageLayoutNameWithoutExtension(value: string): string;
-
-            public get_newPageLayoutEditablePath(): string;
-            public set_newPageLayoutEditablePath(value: string): string;
-        }
-
-        export class SiteServicesAddins {
-            static getSettings(context: ClientContext, addinId: Guid): AddinSettings;
-            static setSettings(context: ClientContext, addin: AddinSettings): void;
-            static deleteSettings(context: ClientContext, addinId: Guid): void;
-
-            static getPlugin(context: ClientContext, pluginName: string): AddinPlugin;
-            static setPlugin(context: ClientContext, addin: AddinPlugin): void;
-            static deletePlugin(context: ClientContext, pluginName: string): void;
-        }
-
-        export class AddinSettings extends ClientObject {
-            constructor(ctx: ClientContext, id: Guid);
-
-            public get_id(): Guid;
-
-            public get_title(): string;
-            public set_title(value: string): string;
-
-            public get_description(): string;
-            public set_description(value: string): string;
-
-            public get_enabled(): boolean;
-            public set_enabled(value: boolean): boolean;
-
-            public get_namespace(): boolean;
-            public set_namespace(value: boolean): boolean;
-
-            public get_headScript(): string;
-            public set_headScript(value: string): string;
-
-            public get_htmlStartBody(): string;
-            public set_htmlStartBody(value: string): string;
-
-            public get_htmlEndBody(): string;
-            public set_htmlEndBody(value: string): string;
-
-            public get_metaTagPagePropertyMappings(): { [key: string]: string };
-            public set_metaTagPagePropertyMappings(value: { [key: string]: string }): { [key: string]: string };
-
-        }
-
-        export class AddinPlugin extends ClientObject {
-            constructor(ctx: ClientContext);
-
-            public get_description(): string;
-            public set_description(value: string): string;
-
-            public get_markup(): string;
-            public set_markup(value: string): string;
-
-            public get_title(): string;
-            public set_title(value: string): string;
-        }
-
-
-        export class DesignPackage {
-            static install(context: ClientContext, site: Site, info: DesignPackageInfo, path: string): void;
-            static uninstall(context: ClientContext, site: Site, info: DesignPackageInfo): void;
-            static apply(context: ClientContext, site: Site, info: DesignPackageInfo): void;
-            static exportEnterprise(context: ClientContext, site: Site, includeSearchConfiguration: boolean): ClientResult<DesignPackageInfo>;
-            static exportSmallBusiness(context: ClientContext, site: Site, packageName: string, includeSearchConfiguration: boolean): ClientResult<DesignPackageInfo>;
-        }
-
-        export class DesignPackageInfo extends ClientValueObject {
-            public get_packageName(): string;
-            public set_packageName(value: string): string;
-
-            public get_packageGuid(): Guid;
-            public set_packageGuid(value: Guid): Guid;
-
-            public get_majorVersion(): number;
-            public set_majorVersion(value: number): number;
-
-            public get_minorVersion(): number;
-            public set_minorVersion(value: number): number;
-        }
-
-        export class SiteImageRenditions {
-            static getRenditions(context: ClientContext): ImageRendition[];
-            static setRenditions(context: ClientContext, renditions: ImageRendition[]): void;
-        }
-
-        export class ImageRendition extends ClientValueObject {
-            public get_id(): number;
-            public get_version(): number;
-
-            public get_name(): string;
-            public set_name(value: string): string;
-
-            public get_width(): number;
-            public set_width(value: number): number;
-
-            public get_height(): number;
-            public set_height(value: number): number;
-        }
-
-        export class Variations extends ClientObject {
-            static getLabels(context: ClientContext): ClientObjectList<VariationLabel>;
-            static getPeerUrl(context: ClientContext, currentUrl: string, labelTitle: string): StringResult;
-            static updateListItems(context: ClientContext, listId: Guid, itemIds: number[]): void;
-        }
-
-        export class VariationLabel extends ClientObject {
-            public get_displayName(): string;
-            public set_displayName(value: string): string;
-
-            public get_isSource(): boolean;
-            public set_isSource(value: boolean): boolean;
-
-            public get_language(): string;
-            public set_language(value: string): string;
-
-            public get_locale(): string;
-            public set_locale(value: string): string;
-
-            public get_title(): string;
-            public set_title(value: string): string;
-
-            public get_topWebUrl(): string;
-            public set_topWebUrl(value: string): string;
-        }
-
-        export class CustomizableString extends ClientObject {
-            public get_defaultValue(): string;
-
-            public get_value(): string;
-            public set_value(value: string): string;
-
-            public get_usesDefaultValue(): boolean;
-            public set_usesDefaultValue(value: boolean): boolean;
-
-        }
-
-
-        export module Navigation {
-            export enum NavigationLinkType {
-                root,
-                friendlyUrl,
-                simpleLink
-            }
-
-            export enum StandardNavigationSource {
-                unknown,
-                portalProvider,
-                taxonomyProvider,
-                inheritFromParentWeb
-            }
-
-            export class NavigationTermSetItem extends ClientObject {
-                public get_id(): Guid;
-
-                public get_isReadOnly(): boolean;
-
-                public get_linkType(): NavigationLinkType;
-                public set_linkType(value: NavigationLinkType): NavigationLinkType;
-
-                public get_targetUrlForChildTerms(): CustomizableString;
-
-                public get_catalogTargetUrlForChildTerms(): CustomizableString;
-
-                public get_taxonomyName(): string;
-
-                public get_title(): CustomizableString;
-
-                public get_terms(): NavigationTermCollection;
-
-                public get_view(): NavigationTermSetView;
-
-                public createTerm(termName: string, linkType: NavigationLinkType, termId: Guid): Taxonomy.Term;
-
-                public getTaxonomyTermStore(): Taxonomy.TermStore;
-
-                public getResolvedDisplayUrl(browserQueryString: string): StringResult;
-            }
-
-            export class NavigationTermCollection extends ClientObjectCollection<NavigationTerm> {
-
-            }
-
-            export class NavigationTerm extends NavigationTermSetItem {
-                public get_associatedFolderUrl(): string;
-                public set_associatedFolderUrl(value: string): string;
-
-                public get_catalogTargetUrl(): CustomizableString;
-
-                public get_categoryImageUrl(): string;
-                public set_categoryImageUrl(value: string): string;
-
-                public get_excludedProviders(): NavigationTermProviderNameCollection;
-
-                public get_excludeFromCurrentNavigation(): boolean;
-                public set_excludeFromCurrentNavigation(value: boolean): boolean;
-
-                public get_excludeFromGlobalNavigation(): boolean;
-                public set_excludeFromGlobalNavigation(value: boolean): boolean;
-
-                public get_friendlyUrlSegment(): CustomizableString;
-
-                public get_hoverText(): string;
-                public set_hoverText(value: string): string;
-
-                public get_isDeprecated(): boolean;
-                public get_isPinned(): boolean;
-                public get_isPinnedRoot(): boolean;
-
-                public get_parent(): NavigationTerm;
-
-                public get_simpleLinkUrl(): string;
-
-                public set_simpleLinkUrl(value: string): string;
-
-                public get_targetUrl(): CustomizableString;
-
-                public get_termSet(): NavigationTermSet;
-
-                public getAsEditable(taxonomySession: Taxonomy.TaxonomySession): NavigationTerm;
-
-                public getWithNewView(newView: NavigationTermSetView): NavigationTerm;
-
-                public getResolvedTargetUrl(browserQueryString: string, remainingUrlSegments: string[]): StringResult;
-
-                public getResolvedTargetUrlWithoutQuery(): StringResult;
-
-                public getResolvedAssociatedFolderUrl(): StringResult;
-
-                public getWebRelativeFriendlyUrl(): StringResult;
-
-                public getAllParentTerms(): NavigationTermCollection;
-
-                public getTaxonomyTerm(): Taxonomy.Term;
-
-                public move(newParent: NavigationTermSetItem): void;
-
-                public deleteObject(): void;
-
-                static getAsResolvedByWeb(context: ClientContext, term: Taxonomy.Term, web: Web, siteMapProviderName: string): NavigationTerm;
-                static getAsResolvedByView(context: ClientContext, term: Taxonomy.Term, view: NavigationTermSetView): NavigationTerm;
-            }
-
-
-            export class NavigationTermSet extends NavigationTermSetItem {
-                public get_isNavigationTermSet(): boolean;
-                public set_isNavigationTermSet(value: boolean): boolean;
-
-                public get_lcid(): number;
-
-                public get_loadedFromPersistedData(): boolean;
-
-                public get_termGroupId(): Guid;
-                public get_termStoreId(): Guid;
-
-                public getAsEditable(taxonomySession: Taxonomy.TaxonomySession): NavigationTermSet;
-
-                public getWithNewView(newView: NavigationTermSetView): NavigationTermSet;
-
-                public getTaxonomyTermSet(): Taxonomy.TermSet;
-
-                public getAllTerms(): NavigationTermCollection;
-
-                public findTermForUrl(url: string): NavigationTerm;
-
-                static getAsResolvedByWeb(context: ClientContext, termSet: Taxonomy.TermSet, web: Web, siteMapProviderName: string): NavigationTermSet;
-                static getAsResolvedByView(context: ClientContext, termSet: Taxonomy.TermSet, view: NavigationTermSetView): NavigationTermSet;
-            }
-
-
-            export class NavigationTermProviderNameCollection extends ClientObjectCollection<string> {
-                public Add(item: string): void;
-                public Clear(): void;
-                public Remove(item: string): BooleanResult;
-            }
-
-            export class NavigationTermSetView extends ClientObject {
-                constructor(context: ClientContext, web: Web, siteMapProviderName: string);
-
-                public get_excludeDeprecatedTerms(): boolean;
-                public set_excludeDeprecatedTerms(value: boolean): boolean;
-
-                public get_excludeTermsByPermissions(): boolean;
-                public set_excludeTermsByPermissions(value: boolean): boolean;
-
-                public get_excludeTermsByProvider(): boolean;
-                public set_excludeTermsByProvider(value: boolean): boolean;
-
-                public get_serverRelativeSiteUrl(): string;
-
-                public get_serverRelativeWebUrl(): string;
-
-                public get_siteMapProviderName(): string;
-                public set_siteMapProviderName(value: string): string;
-
-                public get_webId(): Guid;
-                public get_webTitle(): string;
-
-                public getCopy(): NavigationTermSetView;
-
-                static createEmptyInstance(context: ClientContext): NavigationTermSetView;
-            }
-
-            export class TaxonomyNavigation {
-                static getWebNavigationSettings(context: ClientContext, web: Web): WebNavigationSettings;
-                static getTermSetForWeb(context: ClientContext, web: Web, siteMapProviderName: string, includeInheritedSettings: boolean): NavigationTermSet;
-                static setCrawlAsFriendlyUrlPage(context: ClientContext, navigationTerm: Taxonomy.Term, crawlAsFriendlyUrlPage: boolean): BooleanResult;
-                static getNavigationLcidForWeb(context: ClientContext, web: Web): IntResult;
-                static flushSiteFromCache(context: ClientContext, site: Site): void;
-                static flushWebFromCache(context: ClientContext, web: Web): void;
-                static flushTermSetFromCache(context: ClientContext, webForPermissions: Web, termStoreId: Guid, termSetId: Guid): void;
-            }
-
-            export class WebNavigationSettings extends ClientObject {
-                constructor(context: ClientContext, web: Web);
-
-                public get_addNewPagesToNavigation(): boolean;
-                public set_addNewPagesToNavigation(value: boolean): boolean;
-
-                public get_createFriendlyUrlsForNewPages(): boolean;
-                public set_createFriendlyUrlsForNewPages(value: boolean): boolean;
-
-                public get_currentNavigation(): StandardNavigationSettings;
-                public get_globalNavigation(): StandardNavigationSettings;
-
-                public update(taxonomySession: Taxonomy.TaxonomySession): void;
-                public resetToDefaults(): void;
-            }
-
-            export class StandardNavigationSettings extends ClientObject {
-                public get_termSetId(): Guid;
-                public set_termSetId(value: Guid): Guid;
-
-                public get_termStoreId(): Guid;
-                public set_termStoreId(value: Guid): Guid;
-
-                public get_source(): StandardNavigationSource;
-
-                public set_source(value: StandardNavigationSource): StandardNavigationSource;
-            }
-
-        }
-    }
-}
-
-declare namespace SP {
-    export module CompliancePolicy {
-        export enum SPContainerType {
-            site,//: 0,
-            web,//: 1,
-            list//: 2
-        }
-
-        export class SPContainerId extends ClientObject {
-            static createFromList(context: ClientRuntimeContext, list: List): SPContainerId;
-            static createFromWeb(context: ClientRuntimeContext, web: Web): SPContainerId;
-            static createFromSite(context: ClientRuntimeContext, site: Site): SPContainerId;
-            static create(context: ClientRuntimeContext, containerId: any): SPContainerId;
-
-            get_containerType(): ContentType;
-            set_containerType(value: ContentType): ContentType;
-
-            get_listId(): SP.Guid;
-            set_listId(value: SP.Guid): SP.Guid;
-
-            get_siteId(): SP.Guid;
-            set_siteId(value: SP.Guid): SP.Guid;
-
-            get_siteUrl(): string;
-            set_siteUrl(value: string): string;
-
-            get_tenantId(): SP.Guid;
-            set_tenantId(value: SP.Guid): SP.Guid;
-
-            get_title(): string;
-            set_title(value: string): string;
-
-            get_version(): any;
-            set_version(value: any): any;
-
-            get_webId(): SP.Guid;
-            set_webId(value: SP.Guid): SP.Guid;
-
-            serialize(): SP.StringResult;
-        }
-
-        export class SPPolicyAssociation extends ClientObject {
-
-            get_allowOverride(): boolean;
-            set_allowOverride(value: boolean): boolean;
-
-            get_comment(): string;
-            set_comment(value: string): string;
-
-            get_defaultPolicyDefinitionConfigId(): any[];
-            set_defaultPolicyDefinitionConfigId(value: any[]): any[];
-
-            get_description(): string;
-            set_description(value: string): string;
-
-            get_identity(): boolean;
-            set_identity(value: boolean): boolean;
-
-            get_name(): string;
-            set_name(value: string): string;
-
-            get_policyApplyStatus(): any;
-            set_policyApplyStatus(value: any): any;
-
-            get_policyDefinitionConfigIds(): any[];
-            set_policyDefinitionConfigIds(value: any[]): any[];
-
-            get_scope(): any;
-            set_scope(value: any): any;
-
-            get_source(): any;
-            set_source(value: any): any;
-
-            get_version(): any;
-            set_version(value: any): any;
-
-            get_whenAppliedUTC(): Date;
-            set_whenAppliedUTC(value: Date): Date;
-
-            get_whenChangedUTC(): Date;
-            set_whenChangedUTC(value: Date): Date;
-
-            get_whenCreatedUTC(): Date;
-            set_whenCreatedUTC(value: Date): Date;
-        }
-
-        export class SPPolicyBinding extends ClientObject {
-
-            get_identity(): any;
-            set_identity(value: any): any;
-
-            get_isExempt(): boolean;
-            set_isExempt(value: boolean): boolean;
-
-            get_mode(): any;
-            set_mode(value: any): any;
-
-            get_name(): string;
-            set_name(value: string): string;
-
-            get_policyApplyStatus(): any;
-            set_policyApplyStatus(value: any): any;
-
-            get_policyAssociationConfigId(): any;
-            set_policyAssociationConfigId(value: any): any;
-
-            get_policyDefinitionConfigId(): any;
-            set_policyDefinitionConfigId(value: any): any;
-
-            get_policyRuleConfigId(): any;
-            set_policyRuleConfigId(value: any): any;
-
-            get_scope(): any;
-            set_scope(value: any): any;
-
-            get_source(): any;
-            set_source(value: any): any;
-
-            get_version(): any;
-            set_version(value: any): any;
-
-            get_whenAppliedUTC(): Date;
-            set_whenAppliedUTC(value: Date): Date;
-
-            get_whenChangedUTC(): Date;
-            set_whenChangedUTC(value: Date): Date;
-
-            get_whenCreatedUTC(): Date;
-            set_whenCreatedUTC(value: Date): Date;
-        }
-
-        export class SPPolicyDefinition extends ClientObject {
-
-            get_comment(): string;
-            set_comment(value: string): string;
-
-            get_createdBy(): any;
-            set_createdBy(value: any): any;
-
-            get_defaultPolicyRuleConfigId(): any;
-            set_defaultPolicyRuleConfigId(value: any): any;
-
-            get_description(): string;
-            set_description(value: string): string;
-
-            get_enabled(): boolean;
-            set_enabled(value: boolean): boolean;
-
-            get_identity(): any;
-            set_identity(value: any): any;
-
-            get_lastModifiedBy(): any;
-            set_lastModifiedBy(value: any): any;
-
-            get_name(): string;
-            set_name(value: string): string;
-
-            get_mode(): any;
-            set_mode(value: any): any;
-
-            get_scenario(): any;
-            set_scenario(value: any): any;
-
-            get_source(): any;
-            set_source(value: any): any;
-
-            get_version(): any;
-            set_version(value: any): any;
-
-            get_whenChangedUTC(): Date;
-            set_whenChangedUTC(value: Date): Date;
-
-            get_whenCreatedUTC(): Date;
-            set_whenCreatedUTC(value: Date): Date;
-
-
-        }
-
-        export class SPPolicyRule extends ClientObject {
-
-            get_comment(): string;
-            set_comment(value: string): string;
-
-            get_createdBy(): any;
-            set_createdBy(value: any): any;
-
-            get_description(): string;
-            set_description(value: string): string;
-
-            get_enabled(): boolean;
-            set_enabled(value: boolean): boolean;
-            get_identity(): any;
-            set_identity(value: any): any;
-
-            get_lastModifiedBy(): any;
-            set_lastModifiedBy(value: any): any;
-
-            get_mode(): any;
-            set_mode(value: any): any;
-
-            get_name(): string;
-            set_name(value: string): string;
-
-            get_policyDefinitionConfigId(): any;
-            set_policyDefinitionConfigId(value: any): any;
-
-            get_priority(): any;
-            set_priority(value: any): any;
-
-            get_ruleBlob(): any;
-            set_ruleBlob(value: any): any;
-
-            get_whenChangedUTC(): Date;
-            set_whenChangedUTC(value: Date): Date;
-
-            get_whenCreatedUTC(): Date;
-            set_whenCreatedUTC(value: Date): Date;
-        }
-
-        export class SPPolicyStore extends ClientObject {
-            constructor(context: ClientRuntimeContext, web: Web);
-
-            static createPolicyDefinition(context: ClientRuntimeContext): SPPolicyDefinition;
-            static createPolicyBinding(context: ClientRuntimeContext): SPPolicyBinding;
-            static createPolicyAssociation(context: ClientRuntimeContext): SPPolicyAssociation;
-            static createPolicyRule(context: ClientRuntimeContext): SPPolicyRule;
-
-
-            updatePolicyRule(policyRule: SPPolicyRule): void;
-
-            getPolicyRule(policyRuleId: any, throwIfNull: boolean): SPPolicyRule;
-
-            deletePolicyRule(policyRuleId: any): void;
-
-            notifyUnifiedPolicySync(notificationId: any, syncSvcUrl: string, changeInfos: any, syncNow: boolean, fullSyncForTenant: boolean): void;
-
-            updatePolicyDefinition(policyDefinition: SPPolicyDefinition): void;
-
-            getPolicyDefinition(policyDefinitionId: any): SPPolicyDefinition;
-
-            deletePolicyDefinition(policyDefinitionId: any): void;
-
-            getPolicyDefinitions(scenario: any): ClientObjectList<SPPolicyDefinition>;
-
-            updatePolicyBinding(policyBinding: SPPolicyBinding): void;
-
-            getPolicyBinding(policyBindingId: any): SPPolicyBinding;
-
-            deletePolicyBinding(policyBindingId: any): void;
-
-            updatePolicyAssociation(policyAssociation: SPPolicyAssociation): void;
-
-            getPolicyAssociation(policyAssociationId: any): SPPolicyAssociation;
-
-            getPolicyAssociationForContainer(containerId: SPContainerId): SPPolicyAssociation;
-
-            deletePolicyAssociation(policyAssociationId: any): void;
-        }
-
-        export class SPPolicyStoreProxy extends ClientObject {
-            constructor(context: ClientRuntimeContext, web: Web);
-
-            get_policyStoreUrl(): string;
-        }
-
-    }
-
-    export module Discovery {
-
-        export enum ExportStatus {
-            notStarted,//: 0,
-            started,//: 1,
-            complete,//: 2,
-            failed//: 3
-        }
-
-        export class Case extends ClientObject {
-            constructor(context: ClientRuntimeContext, web: Web);
-            getExportContent(sourceIds: number[]): SP.StringResult;
-        }
-        export class Export extends ClientObject {
-            constructor(context: ClientRuntimeContext, item: ListItem);
-            get_status(): ExportStatus;
-            set_status(value: ExportStatus): ExportStatus;
-            update(): void;
-            getExportContent(): SP.StringResult;
-        }
-    }
-
-    export module InformationPolicy {
-        export class ProjectPolicy extends SP.ClientObject {
-            constructor(context: ClientRuntimeContext, objectPath: ObjectPath);
-            get_description(): string;
-
-            get_emailBody(): string;
-            set_emailBody(value: string): string;
-
-            get_emailBodyWithTeamMailbox(): string;
-            set_emailBodyWithTeamMailbox(value: string): string;
-
-            get_emailSubject(): string;
-            set_emailSubject(value: string): string;
-
-            get_name(): string;
-            savePolicy(): void;
-
-
-            static getProjectPolicies(context: ClientRuntimeContext, web: Web): ClientObjectList<ProjectPolicy>;
-            static getCurrentlyAppliedProject(context: ClientRuntimeContext, web: Web): ProjectPolicy;
-            static applyProjectPolicy(context: ClientRuntimeContext, web: Web, projectPolicy: ProjectPolicy): void;
-            static openProject(context: ClientRuntimeContext, web: Web): void;
-            static closeProject(context: ClientRuntimeContext, web: Web): void;
-            static postponeProject(context: ClientRuntimeContext, web: Web): void;
-            static doesProjectHavePolicy(context: ClientRuntimeContext, web: Web): SP.BooleanResult;
-            static isProjectClosed(context: ClientRuntimeContext, web: Web): SP.BooleanResult;
-            static getProjectCloseDate(context: ClientRuntimeContext, web: Web): SP.DateTimeResult;
-            static getProjectExpirationDate(context: ClientRuntimeContext, web: Web): SP.DateTimeResult;
-        }
-    }
-}
-declare class SPClientAutoFill {
-    static MenuOptionType: {
-        Option: number;
-        Footer: number;
-        Separator: number;
-        Loading: number;
-    }
-
-    static KeyProperty: string; //= 'AutoFillKey';
-    static DisplayTextProperty: string;// = 'AutoFillDisplayText';
-    static SubDisplayTextProperty: string; //= 'AutoFillSubDisplayText';
-    static TitleTextProperty: string; //= 'AutoFillTitleText';
-    static MenuOptionTypeProperty: string;//= 'AutoFillMenuOptionType';
-
-    static GetAutoFillObjFromInput(elmText: HTMLInputElement): SPClientAutoFill;
-    static GetAutoFillObjFromContainer(elmChild: HTMLElement): SPClientAutoFill;
-    static GetAutoFillMenuItemFromOption(elmChild: HTMLElement): HTMLElement;
-
-    constructor(elmTextId: string, elmContainerId: string, fnPopulateAutoFill: (targetElement: HTMLInputElement) => void);
-    public TextElementId: string;
-    public AutoFillContainerId: string;
-    public AutoFillMenuId: string;
-    public VisibleItemCount: number;
-    public CurrentFocusOption: number;
-    public AutoFillMinTextLength: number;
-    public AutoFillTimeout: number;
-    public AutoFillCallbackTimeoutID: string;
-    public FuncOnAutoFillClose: (elmTextId: string, ojData: ISPClientAutoFillData) => void;
-    public FuncPopulateAutoFill: (targetElement: HTMLElement) => void;
-    public AllOptionData: { [key: string]: ISPClientAutoFillData };
-
-    PopulateAutoFill(jsonObjSuggestions: ISPClientAutoFillData[], fnOnAutoFillCloseFuncName: (elmTextId: string, objData: ISPClientAutoFillData) => void): void;
-    IsAutoFillOpen(): boolean;
-    SetAutoFillHeight(): void;
-    SelectAutoFillOption(elemOption: HTMLElement): void;
-    FocusAutoFill(): void;
-    BlurAutoFill(): void;
-    CloseAutoFill(ojData: ISPClientAutoFillData): void;
-    UpdateAutoFillMenuFocus(bMoveNextLink: boolean): void;
-    UpdateAutoFillPosition(): void;
-}
-
-interface ISPClientAutoFillData {
-    AutoFillKey?: any;
-    AutoFillDisplayText?: string;
-    AutoFillSubDisplayText?: string;
-    AutoFillTitleText?: string;
-    AutoFillMenuOptionType?: number;
-}
-
-
-declare class SPClientPeoplePicker {
-    static ValueName: string; // = 'Key';
-    static DisplayTextName: string; // = 'DisplayText';
-    static SubDisplayTextName: string; // = 'Title';
-    static DescriptionName: string; // = 'Description';
-    static SIPAddressName: string; // = 'SIPAddress';
-    static SuggestionsName: string; // = 'MultipleMatches';
-    static UnvalidatedEmailAddressKey: string; // = "UNVALIDATED_EMAIL_ADDRESS";
-    static KeyProperty: string; // = 'AutoFillKey';
-    static DisplayTextProperty: string; // = 'AutoFillDisplayText';
-    static SubDisplayTextProperty: string; // = 'AutoFillSubDisplayText';
-    static TitleTextProperty: string; // = 'AutoFillTitleText';
-    static DomainProperty: string; // = 'DomainText';
-
-    static SPClientPeoplePickerDict: {
-        [pickerIelementId: string]: SPClientPeoplePicker;
-    };
-
-    static InitializeStandalonePeoplePicker(clientId: string, value: ISPClientPeoplePickerEntity[], schema: ISPClientPeoplePickerSchema): void;
-    static ParseUserKeyPaste(userKey: string): string;
-    static GetTopLevelControl(elmChild: HTMLElement): HTMLElement;
-    static AugmentEntity(entity: ISPClientPeoplePickerEntity): ISPClientPeoplePickerEntity;
-    static AugmentEntitySuggestions(pickerObj: SPClientPeoplePicker, allEntities: ISPClientPeoplePickerEntity[], mergeLocal?: boolean): ISPClientPeoplePickerEntity[];
-    static PickerObjectFromSubElement(elmSubElement: HTMLElement): SPClientPeoplePicker;
-    static TestLocalMatch(strSearchLower: string, dataEntity: ISPClientPeoplePickerEntity): boolean;
-    static BuildUnresolvedEntity(key: string, dispText: string): ISPClientPeoplePickerEntity;
-    static AddAutoFillMetaData(pickerObj: SPClientPeoplePicker, options: ISPClientPeoplePickerEntity[], numOpts: number): ISPClientPeoplePickerEntity[];
-    static BuildAutoFillMenuItems(pickerObj: SPClientPeoplePicker, options: ISPClientPeoplePickerEntity[]): ISPClientPeoplePickerEntity[];
-    static IsUserEntity(entity: ISPClientPeoplePickerEntity): boolean;
-    static CreateSPPrincipalType(acctStr: string): number;
-
-
-    public TopLevelElementId: string; // '',
-    public EditorElementId: string; //'',
-    public AutoFillElementId: string; //'',
-    public ResolvedListElementId: string; //'',
-    public InitialHelpTextElementId: string; //'',
-    public WaitImageId: string; //'',
-    public HiddenInputId: string; //'',
-    public AllowEmpty: boolean; //true,
-    public ForceClaims: boolean; //false,
-    public AutoFillEnabled: boolean; //true,
-    public AllowMultipleUsers: boolean; //false,
-    public OnValueChangedClientScript: (pickerElementId: string, users: ISPClientPeoplePickerEntity[]) => void;
-    public OnUserResolvedClientScript: (pickerElementId: string, users: ISPClientPeoplePickerEntity[]) => void;
-    public OnControlValidateClientScript: (pickerElementId: string, users: ISPClientPeoplePickerEntity[]) => void;
-    public UrlZone: SP.UrlZone; //null,
-    public AllUrlZones: boolean; //false,
-    public SharePointGroupID: number; //0,
-    public AllowEmailAddresses: boolean; //false,
-    public PPMRU: SPClientPeoplePickerMRU;
-    public UseLocalSuggestionCache: boolean; //true,
-    public CurrentQueryStr: string; //'',
-    public LatestSearchQueryStr: string; // '',
-    public InitialSuggestions: ISPClientPeoplePickerEntity[];
-    public CurrentLocalSuggestions: ISPClientPeoplePickerEntity[];
-    public CurrentLocalSuggestionsDict: ISPClientPeoplePickerEntity;
-    public VisibleSuggestions: number; //5,
-    public PrincipalAccountType: string; //'',
-    public PrincipalAccountTypeEnum: SP.Utilities.PrincipalType;
-    public EnabledClaimProviders: string; //'',
-    public SearchPrincipalSource: SP.Utilities.PrincipalSource; //null,
-    public ResolvePrincipalSource: SP.Utilities.PrincipalSource; //null,
-    public MaximumEntitySuggestions: number; //30,
-    public EditorWidthSet: boolean; //false,
-    public QueryScriptInit: boolean; //false,
-    public AutoFillControl: SPClientAutoFill; //null,
-    public TotalUserCount: number; //0,
-    public UnresolvedUserCount: number; //0,
-    public UserQueryDict: { [index: string]: SP.StringResult };
-    public ProcessedUserList: { [index: string]: SPClientPeoplePickerProcessedUser };
-    public HasInputError: boolean; //false,
-    public HasServerError: boolean; //false,
-    public ShowUserPresence: boolean; //true,
-    public TerminatingCharacter: string; //';',
-    public UnresolvedUserElmIdToReplace: string; //'',
-    public WebApplicationID: SP.Guid; //'{00000000-0000-0000-0000-000000000000}',
-    public GetAllUserInfo(): ISPClientPeoplePickerEntity[];
-
-    public SetInitialValue(entities: ISPClientPeoplePickerEntity[], initialErrorMsg?: string): void
-    public AddUserKeys(userKeys: string, bSearch: boolean): void;
-    public BatchAddUserKeysOperation(allKeys: string[], numProcessed: number): void;
-    public ResolveAllUsers(fnContinuation: () => void): void;
-    public ExecutePickerQuery(queryIds: string, onSuccess: (queryId: string, result: SP.StringResult) => void, onFailure: (queryId: string, result: SP.StringResult) => void, fnContinuation: () => void): void;
-    public AddUnresolvedUserFromEditor(bRunQuery?: boolean): void;
-    public AddUnresolvedUser(unresolvedUserObj: ISPClientPeoplePickerEntity, bRunQuery?: boolean): void;
-    public UpdateUnresolvedUser(results: SP.StringResult, user: ISPClientPeoplePickerEntity): void;
-    public AddPickerSearchQuery(queryStr: string): string;
-    public AddPickerResolveQuery(queryStr: string): string;
-    public GetPeoplePickerQueryParameters(): SP.UI.ApplicationPages.ClientPeoplePickerQueryParameters;
-    public AddProcessedUser(userObject: ISPClientPeoplePickerEntity, fResolved?: boolean): string;
-    public DeleteProcessedUser(elmToRemove: HTMLElement): void;
-    public OnControlValueChanged(): void;
-    public OnControlResolvedUserChanged(): void;
-    public EnsureAutoFillControl(): void;
-    public ShowAutoFill(resultsTable: ISPClientAutoFillData[]): void;
-    public FocusAutoFill(): void;
-    public BlurAutoFill(): void;
-    public IsAutoFillOpen(): boolean;
-    public EnsureEditorWidth(): void;
-    public SetFocusOnEditorEnd(): void;
-    public ToggleWaitImageDisplay(bShowImage?: boolean): void;
-    public SaveAllUserKeysToHiddenInput(): void;
-    public GetCurrentEditorValue(): string;
-    public GetControlValueAsJSObject(): ISPClientPeoplePickerEntity[];
-    public GetAllUserKeys(): string;
-    public GetControlValueAsText(): string;
-    public IsEmpty(): boolean;
-    public IterateEachProcessedUser(fnCallback: (index: number, user: SPClientPeoplePickerProcessedUser) => void): void;
-    public HasResolvedUsers(): boolean;
-    public Validate(): void;
-    public ValidateCurrentState(): void
-    public GetUnresolvedEntityErrorMessage(): string;
-    public ShowErrorMessage(msg: string): void;
-    public ClearServerError(): void;
-    public SetServerError(): void;
-    public OnControlValidate(): void;
-    public SetEnabledState(bEnabled: boolean): void;
-    public DisplayLocalSuggestions(): void;
-    public CompileLocalSuggestions(input: string): void;
-    public PlanningGlobalSearch(): boolean;
-    public AddLoadingSuggestionMenuOption(): void;
-    public ShowingLocalSuggestions(): boolean;
-    public ShouldUsePPMRU(): boolean;
-    public AddResolvedUserToLocalCache(resolvedEntity: ISPClientPeoplePickerEntity, resolveText: string): void;
-}
-
-interface ISPClientPeoplePickerSchema {
-    TopLevelElementId?: string;
-    EditorElementId?: string;
-    AutoFillElementId?: string;
-    ResolvedListElementId?: string;
-    InitialHelpTextElementId?: string;
-    WaitImageId?: string;
-    HiddenInputId?: string;
-
-    AllowMultipleValues?: boolean;
-    Required?: boolean;
-    AutoFillEnabled?: boolean;
-    ForceClaims?: boolean;
-    AllowEmailAddresses?: boolean;
-    AllUrlZones?: boolean;
-    UseLocalSuggestionCache?: boolean;
-    UserNoQueryPermission?: boolean;
-
-    VisibleSuggestions?: number;
-    MaximumEntitySuggestions?: number;
-
-    ErrorMessage?: string;
-    InitialHelpText?: string;
-
-    InitialSuggestions?: ISPClientPeoplePickerEntity[];
-
-
-    UrlZone?: SP.UrlZone;
-    WebApplicationID?: SP.Guid;
-    SharePointGroupID?: number;
-
-    /** Specify User, DL, SecGroup or SPGroup*/
-    PrincipalAccountType?: string;
-
-    EnabledClaimProvider?: string;
-    ResolvePrincipalSource?: SP.Utilities.PrincipalSource;
-    SearchPrincipalSource?: SP.Utilities.PrincipalSource;
-
-    OnUserResolvedClientScript?: (pickerElementId: string, users: ISPClientPeoplePickerEntity[]) => void;
-    OnValueChangedClientScript?: (pickerElementId: string, users: ISPClientPeoplePickerEntity[]) => void;
-
-    /** Number or '100%'*/
-    Width?: any;
-
-    Rows?: number;
-
-}
-
-declare class SPClientPeoplePickerMRU {
-    static PPMRUVersion: number;// = 1;
-    static MaxPPMRUItems: number;// = 200;
-    static PPMRUDomLocalStoreKey: string;// = "ClientPeoplePickerMRU";
-    static GetSPClientPeoplePickerMRU(): SPClientPeoplePickerMRU;
-
-    GetItems(strKey: string): Object[];
-    SetItem(strSearchTerm: string, objEntity: Object): void;
-    ResetCache(): void;
-}
-
-interface ISPClientPeoplePickerEntity {
-    Key?: string;
-    Description?: string;
-    DisplayText?: string;
-    EntityType?: string;
-    ProviderDisplayName?: string;
-    ProviderName?: string;
-    IsResolved?: boolean;
-    EntityData?: {
-        Title: string;
-        MobilePhone: string;
-        Department: string;
-        Email: string;
-    };
-    MultipleMatches: ISPClientPeoplePickerEntity[];
-    DomainText?: string;
-    [key: string]: any;
-}
-
-declare class SPClientPeoplePickerProcessedUser {
-    UserContainerElementId: string;// '',
-    DisplayElementId: string;// '',
-    PresenceElementId: string;// '',
-    DeleteUserElementId: string;// '',
-    SID: string;// '',
-    DisplayName: string;// '',
-    SIPAddress: string;// '',
-    UserInfo: ISPClientPeoplePickerEntity;// null,
-    ResolvedUser: boolean;// true,
-    Suggestions: ISPClientAutoFillData[];// null,
-    ErrorDescription: string;// '',
-    ResolveText: string;// '',
-    public UpdateResolvedUser(newUserInfo: ISPClientPeoplePickerEntity, strNewElementId: string): void;
-    public UpdateSuggestions(entity: ISPClientPeoplePickerEntity): void;
-    public BuildUserHTML(): string;
-    public UpdateUserMaxWidth(): void;
-    public ResolvedAsUnverifiedEmail(): string;
-
-    static BuildUserPresenceHtml(elmId: string, strSip: string, bResolved?: boolean): string;
-    static GetUserContainerElement(elmChild: HTMLElement): HTMLElement;
-    static HandleProcessedUserClick(ndClicked: HTMLElement): void;
-    static DeleteProcessedUser(elmToRemove: HTMLElement): void;
-    static HandleDeleteProcessedUserKey(e: Event): void;
-    static HandleResolveProcessedUserKey(e: Event): void;
-}
-
-declare namespace Microsoft {
-    export module Office {
-        export module Server {
-            export module ReputationModel {
-                export class Reputation {
-                    constructor();
-                    static setLike(context: SP.ClientContext, listId: string, itemId: number, like: boolean): void;
-                    static setRating(context: SP.ClientContext, listId: string, itemId: number, rating: number): void;
-                }
-            }
-        }
-    }
-}
-
-/** Available only in SharePoint Online*/
-declare namespace Define {
-    export function loadScript(url: string, successCallback: () => void, errCallback: () => void): void;
-    /** Loads script from _layouts/15/[req].js */
-    export function require(req: string, callback: Function): void;
-    /** Loads script from _layouts/15/[req].js */
-    export function require(req: string[], callback: Function): void;
-    export function define(name: string, deps: string[], def: Function): void;
-}
-
-/** Available only in SharePoint Online*/
-declare namespace Verify {
-    export function ArgumentType(arg: string, expected: any): void;
-}
-
-
-/** Available only in SharePoint Online*/
-declare namespace BrowserStorage {
-    export var local: CachedStorage;
-    export var session: CachedStorage;
-
-    /** Available only in SharePoint Online*/
-    interface CachedStorage {
-        getItem(key: string): string;
-        setItem(key: string, value: string): void;
-        removeItem(key: string): void;
-        clead(): void;
-        length: number;
-    }
-}
-
-/** Available only in SharePoint Online*/
-declare namespace BrowserDetection {
-    export var browseris: Browseris;
-}
-
-/** Available only in SharePoint Online*/
-declare namespace CSSUtil {
-    export function HasClass(elem: HTMLElement, className: string): boolean;
-    export function AddClass(elem: HTMLElement, className: string): void;
-    export function RemoveClass(elem: HTMLElement, className: string): void;
-    export function pxToFloat(pxString: string): number;
-    export function pxToNum(px: string): number;
-    export function numToPx(n: number): string;
-    export function getCurrentEltStyleByNames(elem: HTMLElement, styleNames: string[]): string;
-    export function getCurrentStyle(elem: HTMLElement, cssStyle: string): string;
-    export function getCurrentStyleCorrect(element: HTMLElement, camelStyleName: string, dashStyleName: string): string;
-    export function getOpacity(element: HTMLElement): number;
-    export function setOpacity(element: HTMLElement, value: number): void;
-}
-
-/** Available only in SharePoint Online*/
-declare namespace DOM {
-    export var rightToLeft: boolean;
-    export function cancelDefault(evt: Event): void;
-    export function AbsLeft(el: HTMLElement): number;
-    export function AbsTop(el: HTMLElement): number;
-    export function CancelEvent(evt: Event): void;
-    export function GetElementsByName(nae: string): NodeList;
-    export function GetEventCoords(evt: Event): { x: number; y: number; };
-    export function GetEventSrcElement(evt: Event): HTMLElement;
-    export function GetInnerText(el: HTMLElement): string;
-    export function PreventDefaultNavigation(evt: Event): void;
-    export function SetEvent(eventName: string, eventFunc: Function, el: HTMLElement): void;
-}
-
-/** Available only in SharePoint Online*/
-declare namespace Encoding {
-    export function EncodeScriptQuote(str: string): string;
-    export function HtmlEncode(str: string): string;
-    export function HtmlDecode(str: string): string;
-    export function AttrQuote(str: string): string;
-    export function ScriptEncode(str: string): string;
-    export function ScriptEncodeWithQuote(str: string): string;
-    export function CanonicalizeUrlEncodingCase(str: string): string;
-}
-
-/** Available only in SharePoint Online*/
-declare namespace IE8Support {
-    export function arrayIndexOf<T>(array: T[], item: T, startIdx?: number): number;
-    export function attachDOMContentLoaded(handler: Function): void;
-    export function getComputedStyle(domObj: HTMLElement, camelStyleName: string, dashStyleName: string): string;
-    export function stopPropagation(evt: Event): void;
-}
-
-/** Available only in SharePoint Online*/
-declare namespace StringUtil {
-    export function BuildParam(stPattern: string, ...params: any[]): string;
-    export function ApplyStringTemplate(str: string, ...params: any[]): string;
-}
-
-/** Available only in SharePoint Online*/
-declare namespace TypeUtil {
-    export function IsArray(value: any): boolean;
-    export function IsNullOrUndefined(value: any): boolean;
-}
-
-/** Available only in SharePoint Online*/
-declare namespace Nav {
-    export var ajaxNavigate: AjaxNavigate;
-    export function convertRegularURLtoMDSURL(webUrl: string, fullPath: string): string;
-    export function isMDSUrl(url: string): boolean;
-    export function isPageUrlValid(url: string): boolean;
-    export function isPortalTemplatePage(url: string): boolean;
-    export function getAjaxLocationWindow(): string;
-    export function getSource(defaultSource?: string): string;
-    export function getUrlKeyValue(keyName: string, bNoDecode: boolean, url: string, bCaseInsensitive: boolean): string;
-    export function getWindowLocationNoHash(hre: string): string;
-    export function goToHistoryLink(el: HTMLAnchorElement, strVersion: string): void;
-    export function getGoToLinkUrl(el: HTMLAnchorElement): string;
-    export function goToLink(el: HTMLAnchorElement): void;
-    export function goToLinkOrDialogNewWindow(el: HTMLAnchorElement): void;
-    export function goToDiscussion(url: string): void;
-    export function onClickHook(evt: Event, topElm: HTMLElement): void;
-    export function pageUrlValidation(url: string, alertString: string): string;
-    export function parseHash(hash: string): Object;
-    export function navigate(url: string): void;
-    export function removeMDSQueryParametersFromUrl(url: string): string;
-    export function urlFromHashBag(hashObject: Object): string;
-    export function wantsNewTab(evt: Event): boolean;
-}
-
-/** Available only in SharePoint Online*/
-declare namespace URI_Encoding {
-    export function encodeURIComponent(str: string, bAsUrl?: boolean, bForFilterQuery?: boolean, bForCallback?: boolean): string;
-    export function escapeUrlForCallback(str: string): string;
-}
-
-interface IListItem {
-    ID: number;
-    ContentTypeId: string;
-}
-
-/** Available only in SharePoint Online*/
-declare namespace ListModule {
-    export module Util {
-        export function createViewEditUrl(renderCtx: SPClientTemplates.RenderContext, listItem: IListItem, useEditFormUrl?: boolean, appendSource?: boolean): string;
-        export function createItemPropertiesTitle(renderCtx: SPClientTemplates.RenderContext, listItem: IListItem): string;
-        export function clearSelectedItemsDict(context: any): void;
-        export function ctxInitItemState(context: any): void;
-        export function getAttributeFromItemTable(itemTableParam: HTMLElement, strAttributeName: string, strAttributeOldName: string): string
-        export function getSelectedItemsDict(context: any): any;
-        export function removeOnlyPagingArgs(url: string): string;
-        export function removePagingArgs(url: string): string;
-        export function showAttachmentRows(): void;
-    }
-}
-
-/** Available only in SharePoint Online*/
-declare namespace SPThemeUtils {
-    export function ApplyCurrentTheme(): void;
-    export function WithCurrentTheme(resultCallback: Function): void;
-    export function UseClientSideTheming(): boolean;
-    export function Suspend(): void;
-}
-
-declare namespace SP {
-    export module JsGrid {
-
-        export enum TextDirection {
-            Default, //0,
-            RightToLeft, //1,
-            LeftToRight //2
-        }
-
-        export enum PaneId {
-            MainGrid, //0,
-            PivotedGrid, //1,
-            Gantt //2
-        }
-
-        export enum PaneLayout {
-            GridOnly, //0,
-            GridAndGantt, //1,
-            GridAndPivotedGrid //2
-
-        }
-        export enum EditMode {
-            ReadOnly, //0,
-            ReadWrite, //1,
-            ReadOnlyDefer, //2,
-            ReadWriteDefer, //3,
-            Defer //4
-        }
-
-        export enum GanttDrawBarFlags {
-            LeftLink, //0x01,
-            RightLink //0x02
-
-        }
-        export enum GanttBarDateType {
-            Start, //0,
-            End //1
-        }
-
-        export enum ValidationState {
-            Valid, //0,
-            Pending, //1,
-            Invalid //2
-        }
-
-        export enum HierarchyMode {
-            None, //0,
-            Standard, //1,
-            Grouping //2
-        }
-
-        export enum EditActorWriteType {
-            Both, //1,
-            LocalizedOnly, //2,
-            DataOnly, //3,
-            Either //4
-        }
-
-        export enum EditActorReadType {
-            Both, //1,
-            LocalizedOnly, //2,
-            DataOnly //3
-        }
-
-        export enum EditActorUpdateType {
-            Committed, //0,
-            Uncommitted, //1
-        }
-
-        export enum SortMode {
-            Ascending, //1,
-            Descending, //-1,
-            None //0
-        }
-
-        export module RowHeaderStyleId {
-            export var Transfer: string; //'Transfer',
-            export var Conflict: string; //'Conflict'
-
-        }
-
-        export module RowHeaderAutoStyleId {
-            export var Dirty: string; //'Dirty',
-            export var Error: string; //'Error',
-            export var NewRow: string; //'NewRow'
-        }
-
-        export enum RowHeaderStatePriorities {
-            Dirty, //10,
-            Transfer, //30,
-            CellError, //40,
-            Conflict, //50,
-            RowError, //60,
-            NewRow //90
-        }
-
-        export enum UpdateSerializeMode {
-            Cancel, //0,
-            Default, //1,
-            PropDataOnly, //2,
-            PropLocalizedOnly, //3,
-            PropBoth //4
-        }
-
-        export enum UpdateTrackingMode {
-            PropData, //2,
-            PropLocalized, //3,
-            PropBoth //4
-        }
-
-        export module UserAction {
-            export var UserEdit: string; //'User Edit':string;
-            export var DeleteRecord: string; //'Delete Record':string;
-            export var InsertRecord: string; //'Insert Record':string;
-            export var Indent: string; //'Indent':string;
-            export var Outdent: string; //'Outdent':string;
-            export var Fill: string; //'Fill':string;
-            export var Paste: string; //'Paste':string;
-            export var CutPaste: string; //'Cut/Paste'
-        }
-
-        export enum ReadOnlyActiveState {
-            ReadOnlyActive, //0,
-            ReadOnlyDisabled, //1
-        }
-
-        export interface IValue {
-            data?: any;
-            localized?: string;
-        }
-        export enum SelectionTypeFlags {
-            MultipleCellRanges,
-            MultipleRowRanges,
-            MultipleColRanges
-        }
-
-
-        export class JsGridControl {
-            constructor(parentNode: HTMLElement, bShowLoadingBanner: boolean);
-            /** Returns true if Init method has been executed successfully */
-            IsInitialized(): boolean;
-            /** Replaces the control TableCache object with the provided one */
-            ResetData(cache: SP.JsGrid.TableCache): void;
-            /** Initialize the control */
-            Init(parameters: SP.JsGrid.JsGridControl.Parameters): void;
-            Cleanup(): void;
-            /** Removes all event handlers and markup associated with the control */
-            Dispose(): void;
-
-            // todo
-            NotifyDataAvailable(): void;
-            NotifySave(): void;
-            NotifyHide(): void;
-            NotifyResize(): void;
-            ClearTableView(): void;
-            HideInitialLoadingBanner(): void;
-            ShowInitialGridErrorMsg(errorMsg: string): void;
-            ShowGridErrorMsg(errorMsg: string): void;
-            LaunchPrintView(
-                additionalScriptFiles: any,
-                beforeInitFnName: any,
-                beforeInitFnArgsObj: any,
-                title: string,
-                bEnableGantt: boolean,
-                optGanttDelegateNames?: any,
-                optInitTableViewParamsFnName?: any,
-                optInitTableViewParamsFnArgsObj?: any,
-                optInitGanttStylesFnName?: any,
-                optInitGanttStylesFnArgsObj?: any): void;
-            GetAllDataJson(fnOnFinished: any, optFnGetCellStyleID?: any): void;
-            SetTableView(tableViewParams: any): void;
-            SetRowView(rowViewParam: any): void;
-
-            /** Enable grid after Disable. */
-            Enable(): void;
-            /** Covers the grid with the semi-transparent panel, preventing any operations with it.
-                Additionally, displays loading animated gif and optMsg as the message next to it.
-                If optMsg is not specified, displays "Loading..." text. */
-            Disable(optMsg?: string): void;
-            /** Enables grid editing */
-            EnableEditing(): void;
-            /** Disables grid editing: all the records become readonly */
-            DisableEditing(): void;
-            /** Switches the currently selected cell into edit mode: displays edit control and sets focus into it.
-                Returns true if success. */
-            TryBeginEdit(): boolean;
-            FinalizeEditing(fnContinue: Function, fnError: Function): void;
-            /** Get diff tracker object that tracks changes to the grid data. */
-            GetDiffTracker(): SP.JsGrid.Internal.DiffTracker;
-            /** Moves focus to the JsGrid control */
-            Focus(): void;
-
-            /** Try saving the new record row (aka entry row) if it was edited. */
-            TryCommitFirstEntryRecords(fnCommitComplete: { (): void }): void;
-            /** Removes all new record rows (aka entry rows), including unsaved and even empty ones.
-                The latter seems to be a bug, as I haven't found any easy way to restore the empty entry row. */
-            ClearUncommitedEntryRecords(): void;
-            /** Returns true if there are any unsaved new record rows (aka entry rows). */
-            AnyUncommitedEntryRecords(): boolean;
-
-
-            // todo
-            AnyUncomittedProvisionalRecords(): boolean;
-
-            /** Gets record based on the recordKey
-                @recordKey internal unique id of a row. You can get recordKey from view index via GetRecordKeyByViewIndex method. */
-            GetRecord(recordKey: number): IRecord;
-            /** Get entry record with the specified key.
-                Entry record is a special type of record because it represents a new record that doesn't exist yet. */
-            GetEntryRecord(key: any): any;
-            /** Determine if the specified record key identifies valid entry row. */
-            IsEntryRecord(recordKey: number): boolean;
-            /** Determine whether the specified cell is editable. */
-            IsCellEditable(record: IRecord, fieldKey: string, optPaneId?: any): boolean;
-            /** Adds one of builtin row state indicator icons into the row header.
-                Please pass one of the values of SP.JsGrid.RowHeaderStyleId
-                Row header is the leftmost gray column of the table. */
-            AddBuiltInRowHeaderState(recordKey: number, rowHeaderStateId: string): void;
-            /** Adds the specified state into the row header.
-                There can be several row header states for one row. Only one is shown (according to the Priority).
-                Row header is the leftmost gray column of the table. */
-            AddRowHeaderState(recordKey: number, rowHeaderState: SP.JsGrid.RowHeaderState): void;
-            /** Removes header state with specified id from the row. */
-            RemoveRowHeaderState(recordKey: number, rowHeaderStateId: string): void;
-
-            GetCheckSelectionManager(): any;
-            UpdateProperties(propertyUpdates: any, changeName: any, optChangeKey?: any): any;
-            GetLastRecordKey(): string;
-            InsertProvisionalRecordBefore(beforeRecordKey: number, newRecord: any, initialValues: any): any;
-            InsertProvisionalRecordAfter(afterRecordKey: number, newRecord: any, initialValues: any): any;
-            IsProvisionalRecordKey(recordKey: number): boolean;
-            InsertRecordBefore(beforeRecordKey: number, newRecord: any, optChangeKey?: any): any;
-            InsertRecordAfter(afterRecordKey: number, newRecord: any, optChangeKey?: any): any;
-            InsertHiddenRecord(recordKey: number, changeKey: any, optAfterRecordKey?: any): any;
-            DeleteRecords(recordKeys: any, optChangeKey?: any): any;
-            IndentRecords(recordKeys: any, optChangeKey?: any): any;
-            OutdentRecords(recordKeys: any, optChangeKey?: any): any;
-            ReorderRecords(beginRecordKey: number, endRecordKey: number, afterRecordKey: number, bSelectAfterwards: boolean): any;
-            GetContiguousRowSelectionWithoutEntryRecords(): { begin: any; end: any; keys: any };
-            CanMoveRecordsUpByOne(recordKeys: any): boolean;
-            CanMoveRecordsDownByOne(recordKeys: any): boolean;
-            MoveRecordsUpByOne(recordKeys: any): any;
-            MoveRecordsDownByOne(recordKeys: any): any;
-            GetReorderRange(recordKeys: any): any;
-            GetNodeExpandCollapseState(recordKey: number): any;
-            ToggleExpandCollapse(recordKey: number): void;
-
-            /** Attach event handler to a particular event type */
-            AttachEvent(eventType: JsGrid.EventType, fnOnEvent: { (args: IEventArgs): void }): void;
-            /** Detach a previously set event handler */
-            DetachEvent(eventType: JsGrid.EventType, fnOnEvent: any): void;
-
-            /** Set a delegate. Delegates are way to replace default functionality with custom one. */
-            SetDelegate(delegateKey: JsGrid.DelegateType, fn: any): void;
-            /** Get current delegate. */
-            GetDelegate(delegateKey: JsGrid.DelegateType): any;
-
-            /** Re-render the specified row in the view. */
-            RefreshRow(recordKey: number): void;
-            /** Re-render all rows in the view.
-                It can be used e.g. if you have some custom display controls and they are rendered differently depending on some external settings.
-                In this case, if you update the external settings, obviously you have to then update the view for these settings to take effect. */
-            RefreshAllRows(): void;
-            /** Clears undo queue, and also differencies tracker state and versions manager state. */
-            ClearChanges(): void;
-
-            GetGanttZoomLevel(): any;
-            SetGanttZoomLevel(level: any): void;
-            ScrollGanttToDate(date: any): void;
-
-            /** Get top record view index.
-                You can then use GetRecordKeyByViewIndex to convert this value into the recordKey. */
-            GetTopRecordIndex(): number;
-            /** Get number of rows displayed in the current view. */
-            GetViewRecordCount(): number;
-            /** Get record key for a row that is specified by the viewIdx.
-                viewIdx - index of the row in the view, use GetTopRecordIndex to get the first one.
-                Returns recordKey, which is a unique numeric identifier of a row within a dataset.
-                Main difference between viewIdx and recordKey is that viewIdx is only unique within a view,
-                e.g. if you do paging, it can be same for different records.
-             */
-            GetRecordKeyByViewIndex(viewIdx: number): number;
-            /** Opposite to GetRecordKeyByViewIndex, resolves the view index of the record based on record key.
-                recordKey - unique numeric identifier of a row in the current dataset.
-                Returns viewIdx - index of the row in the current view */
-            GetViewIndexOfRecord(recordKey: number): number;
-            /** Get top row index. Usually returns 0.
-                You can then use GetRecordKeyByViewIndex to convert this value into the recordKey. */
-            GetTopRowIndex(): number;
-
-            GetOutlineLevel(record: any): any;
-            GetSplitterPosition(): any;
-            SetSplitterPosition(pos: any): void;
-            GetLeftColumnIndex(optPaneId?: any): any;
-            EnsurePaneWidth(): void;
-
-            /** Show a previously hidden column at a specified position.
-                If atIdx is not defined, column will be shown at it's previous position. */
-            ShowColumn(columnKey: string, atIdx?: number): void;
-            /** Hide the specified column from grid */
-            HideColumn(columnKey: string): void;
-            /** Update column descriptions */
-            UpdateColumns(columnInfoCollection: ColumnInfoCollection): void;
-            GetColumns(optPaneId?: string): ColumnInfo[];
-            /** Get ColumnInfo object by fieldKey
-                @fieldKey when working with SharePoint data sources, fieldKey corresponds to field internal name */
-            GetColumnByFieldKey(fieldKey: string, optPaneId?: any): ColumnInfo;
-            /** Adds a column, based on the specified grid field */
-            AddColumn(columnInfo: ColumnInfo, gridField: GridField): void;
-
-            /** Switches column header in rename mode, showing textbox and thus giving the user possibility to rename this column. */
-            RenameColumn(columnKey: string): void;
-            /** Shows a dialog where user can reorder columns and change their widths. */
-            ShowColumnConfigurationDialog(): void;
-
-
-            /** Returns true, if there are any errors in the JsGrid */
-            AnyErrors(): boolean;
-            /** Returns true, if there are any errors in a specified row */
-            AnyErrorsInRecord(recordKey: number): boolean;
-            /** Set error for the specified by recordKey and fieldKey cell.
-                Returns id of the error, so that later you can clear the error using this id. */
-            SetCellError(recordKey: number, fieldKey: string, errorMessage: string): number;
-            /** Set error for the specified by recordKey row.
-                In the leftmost column of this row, exclamation mark error indicator will appear.
-                Clicking on this indicator will cause the specified error message appear in form of a reddish tooltip.
-                Returns id of the error, so that later you can clear the error using this id. */
-            SetRowError(recordKey: number, errorMessage: string): number;
-            /** Clear specified by id error that was previously set on the specified by recordKey and fieldKey cell. */
-            ClearCellError(recordKey: number, fieldKey: string, id: number): void;
-            /** Clear all errors in the specified cell. */
-            ClearAllErrorsOnCell(recordKey: number, fieldKey: string): void;
-            /** Clear specified by id error that was previously set on the specified by recordKey row. */
-            ClearRowError(recordKey: number, id: number): void;
-            /** Clear all errors in the specified row. */
-            ClearAllErrorsOnRow(recordKey: number): void;
-            /** Get error message for the specified cell.
-                If many errors are set on the cell, only first is returned.
-                If there are no errors in the cell, returns null. */
-            GetCellErrorMessage(recordKey: number, fieldKey: string): string;
-            /** Get error message for the specified row.
-                If many errors are set on the row, only first is returned.
-                If there are no errors in the row, returns null. */
-            GetRowErrorMessage(recordKey: number): string;
-            /** This method is used mostly when you have a rather tall JSGrid and you want to ensure that user sees
-                that some error has occured.
-                You can specify the minId or/and filter function.
-                If minId is specified, method searches for an error with first id which is greater than minId.
-                Scrolls to the Returns the id of the found record.
-                If there aren't any errors, that satisfy the conditions, method does nothing and returns null. */
-            ScrollToAndExpandNextError(minId?: number, fnFilter?: { (recordKey: number, fieldKey: string, id: number): boolean }): any;
-            /** Same as ScrollToAndExpandNextError, but searches within the specified record.
-                recordKey should be not null, otherwise you'll get an exception.
-                bDontExpand controls whether the error tooltip will be shown (if bDontExpand=true, tooltip will not be shown). */
-            ScrollToAndExpandNextErrorOnRecord(minId?: number, recordKey?: number, fnFilter?: { (recordKey: number, fieldKey: string, id: number): boolean }, bDontExpand?: boolean): any;
-
-            GetFocusedItem(): any;
-            SendKeyDownEvent(eventInfo: Sys.UI.DomEvent): any;
-            /** Moves cursor to entry record (the row that is used to add new records) */
-            JumpToEntryRecord(): void;
-
-            SelectRowRange(rowIdx1: number, rowIdx2: number, bAppend: boolean, optPaneId?: string): void;
-            SelectColumnRange(colIdx1: number, colIdx2: number, bAppend: boolean, optPaneId?: string): void;
-            SelectCellRange(rowIdx1: number, rowIdx2: number, colIdx1: number, colIdx2: number, bAppend: boolean, optPaneId?: string): void;
-            SelectRowRangeByKey(rowKey1: any, rowKey2: any, bAppend: boolean, optPaneId?: string): void;
-            SelectColumnRangeByKey(colKey1: any, colKey2: any, bAppend: boolean, optPaneId?: string): void;
-            SelectCellRangeByKey(recordKey1: string, recordKey2: string, colKey1: any, colKey2: any, bAppend: boolean, optPaneId?: string): void;
-
-            ChangeKeys(oldKey: any, newKey: any): void;
-            GetSelectedRowRanges(optPaneId?: any): any;
-            GetSelectedColumnRanges(optPaneId?: any): any;
-            GetSelectedRanges(optPaneId?: any): any;
-            MarkPropUpdateInvalid(recordKey: number, fieldKey: any, changeKey: any, optErrorMsg?: any): any;
-            GetCurrentChangeKey(): any;
-            CreateAndSynchronizeToNewChangeKey(): any;
-            CreateDataUpdateCmd(bUseCustomInitialUpdate: boolean): any;
-            IsChangeKeyApplied(changeKey: any): any;
-            GetChangeKeyForVersion(version: any): any;
-            TryReadPropForChangeKey(recordKey: number, fieldKey: any, changeKey: any): any;
-            GetUnfilteredHierarchyMap(): any;
-            GetHierarchyState(bDecompressGuidKeys: boolean): any;
-            IsGroupingRecordKey(recordKey: number): boolean;
-            IsGroupingColumnKey(recordKey: number): boolean;
-            GetSelectedRecordKeys(bDuplicatesAllowed: boolean): any;
-            /** Cut data from currently selected cells into the clipboard.
-                Will not work if current selection contains entry row or readonly cells. */
-            CutToClipboard(): void;
-            /** Copy data from currently selected cells into the clipboard. */
-            CopyToClipboard(): void;
-            /** Paste data from clipboard into currently selected cells. */
-            PasteFromClipboard(): void;
-            TryRestoreFocusAfterInsertOrDeleteColumns(origFocus: any): void;
-            /** Get undo manager for performing undo/redo operations programmatically. */
-            GetUndoManager(): SP.JsGrid.CommandManager;
-            /** Gets number of records visible in the current view, including the entry row. */
-            GetVisibleRecordCount(): number;
-            /** Returns index of the system RecordIndicatorCheckBoxColumn. If not present in the view, returns null. */
-            GetRecordIndicatorCheckBoxColumnIndex(): number;
-            /** Determines if the specified record is visible in the current view. */
-            IsRecordVisibleInView(recordKey: number): boolean;
-            GetHierarchyQueryObject(): any;
-            GetSpCsrRenderCtx(): any;
-        }
-
-        export interface IChangeKey {
-            Reserve(): void;
-            Release(): void;
-            GetVersionNumber(): number;
-            CompareTo(changeKey: IChangeKey): number;
-        }
-
-        export enum EventType {
-            OnCellFocusChanged,
-            OnRowFocusChanged,
-            OnCellEditBegin,
-            OnCellEditCompleted,
-            OnRightClick,
-            OnPropertyChanged,
-            OnRecordInserted,
-            OnRecordDeleted,
-            OnRecordChecked,
-            OnCellErrorStateChanged,
-            OnEntryRecordAdded,
-            OnEntryRecordCommitted,
-            OnEntryRecordPropertyChanged,
-            OnRowErrorStateChanged,
-            OnDoubleClick,
-            OnBeforeGridDispose,
-            OnSingleCellClick,
-            OnInitialChangesForChangeKeyComplete,
-            OnVacateChange,
-            OnGridErrorStateChanged,
-            OnSingleCellKeyDown,
-            OnRecordsReordered,
-            OnBeforePropertyChanged,
-            OnRowEscape,
-            OnBeginRenameColumn,
-            OnEndRenameColumn,
-            OnPasteBegin,
-            OnPasteEnd,
-            OnBeginRedoDataUpdateChange,
-            OnBeginUndoDataUpdateChange
-        }
-
-        export enum DelegateType {
-            ExpandColumnMenu,
-            AddColumnMenuItems,
-            Sort,
-            Filter,
-            InsertRecord,
-            DeleteRecords,
-            IndentRecords,
-            OutdentRecords,
-            IsRecordInsertInView,
-            ExpandDelayLoadedHierarchyNode,
-            AutoFilter,
-            ExpandConflictResolution,
-            GetAutoFilterEntries,
-            LaunchFilterDialog,
-            ShowColumnConfigurationDialog,
-            GetRecordEditMode,
-            GetGridRowStyleId,
-            CreateEntryRecord,
-            TryInsertEntryRecord,
-            WillAddColumnMenuItems,
-            NextPage,
-            AddNewColumn,
-            RemoveColumnFromView,
-            ReorderColumnPositionInView,
-            TryCreateProvisionalRecord,
-            CanReorderRecords,
-            AddNewColumnMenuItems,
-            TryBeginPaste,
-            AllowSelectionChange,
-            GetFieldEditMode,
-            GetFieldReadOnlyActiveState,
-            OnBeforeRecordReordered
-        }
-
-        export enum ClickContext {
-            SelectAllSquare,
-            RowHeader,
-            ColumnHeader,
-            Cell,
-            Gantt,
-            Other
-        }
-
-        export class RowHeaderState {
-            constructor(id: string, img: SP.JsGrid.Image, priority: SP.JsGrid.RowHeaderStatePriorities, tooltip: string, fnOnClick: { (eventInfo: Sys.UI.DomEvent, recordKey: number): void });
-            GetId(): string;
-            GetImg(): SP.JsGrid.Image;
-            GetPriority(): SP.JsGrid.RowHeaderStatePriorities;
-            GetOnClick(): { (eventInfo: Sys.UI.DomEvent, recordKey: number): void };
-            GetTooltip(): string;
-            toString(): string;
-        }
-
-        export class Image {
-            /** optOuterCssNames and optImgCssNames are strings that contain css class names separated by spaces.
-                optImgCssNames are applied to the img tag.
-                if bIsClustered, image is rendered inside div, and optOuterCssNames are applied to the div. */
-            constructor(imgSrc: string, bIsClustered: boolean, optOuterCssNames: string, optImgCssNames: string, bIsAnimated: boolean);
-            imgSrc: string;
-            bIsClustered: boolean;
-            optOuterCssNames: string;
-            imgCssNames: string;
-            bIsAnimated: boolean;
-            /** Renders the image with specified alternative text and on-click handler.
-                If bHideTooltip == false, then alternative text is also shown as the tooltip (title attribute). */
-            Render(altText: string, clickFn: { (eventInfo: Sys.UI.DomEvent): void }, bHideTooltip: boolean): HTMLElement;
-        }
-
-        export interface IEventArgs { }
-        export module EventArgs {
-            export class OnEntryRecordAdded implements IEventArgs {
-                constructor(recordKey: number);
-                recordKey: number;
-            }
-
-            export class CellFocusChanged implements IEventArgs {
-                constructor(newRecordKey: number, newFieldKey: string, oldRecordKey: number, oldFieldKey: string);
-                newRecordKey: number;
-                newFieldKey: string;
-                oldRecordKey: number;
-                oldFieldKey: string;
-            }
-            export class RowFocusChanged implements IEventArgs {
-                constructor(newRecordKey: number, oldRecordKey: number);
-                newRecordKey: number;
-                oldRecordKey: number;
-            }
-            export class CellEditBegin implements IEventArgs {
-                constructor(recordKey: number, fieldKey: string);
-                recordKey: number;
-                fieldKey: string;
-            }
-            export class CellEditCompleted implements IEventArgs {
-                constructor(recordKey: number, fieldKey: string, changeKey: JsGrid.IChangeKey, bCancelled: boolean);
-                recordKey: number;
-                fieldKey: string;
-                changeKey: JsGrid.IChangeKey;
-                bCancelled: boolean;
-            }
-            export class Click implements IEventArgs {
-                constructor(eventInfo: Sys.UI.DomEvent, context: JsGrid.ClickContext, recordKey: number, fieldKey: string);
-                eventInfo: Sys.UI.DomEvent;
-                context: JsGrid.ClickContext;
-                recordKey: number;
-                fieldKey: string;
-            }
-            export class PropertyChanged implements IEventArgs {
-                constructor(recordKey: number, fieldKey: string, oldProp: SP.JsGrid.Internal.PropertyUpdate, newProp: SP.JsGrid.Internal.PropertyUpdate, propType: SP.JsGrid.IPropertyType, changeKey: SP.JsGrid.IChangeKey, validationState: SP.JsGrid.ValidationState);
-                recordKey: number;
-                fieldKey: string;
-                oldProp: SP.JsGrid.Internal.PropertyUpdate;
-                newProp: SP.JsGrid.Internal.PropertyUpdate;
-                propType: SP.JsGrid.IPropertyType;
-                changeKey: SP.JsGrid.IChangeKey;
-                validationState: SP.JsGrid.ValidationState;
-            }
-            export class RecordInserted implements IEventArgs {
-                constructor(recordKey: number, recordIdx: number, afterRecordKey: number, changeKey: JsGrid.IChangeKey);
-                recordKey: number;
-                recordIdx: number;
-                afterRecordKey: number;
-                changeKey: JsGrid.IChangeKey;
-            }
-            export class RecordDeleted implements IEventArgs {
-                constructor(recordKey: number, recordIdx: number, changeKey: JsGrid.IChangeKey);
-                recordKey: number;
-                recordIdx: number;
-                changeKey: JsGrid.IChangeKey;
-            }
-            export class RecordChecked implements IEventArgs {
-                constructor(recordKeySet: SP.Utilities.Set, bChecked: boolean);
-                recordKeySet: SP.Utilities.Set;
-                bChecked: boolean;
-            }
-            export class OnCellErrorStateChanged implements IEventArgs {
-                constructor(recordKey: number, fieldKey: string, bAddingError: boolean, bCellCurrentlyHasError: boolean, bCellHadError: boolean, errorId: number);
-                recordKey: number;
-                fieldKey: string;
-                bAddingError: boolean;
-                bCellCurrentlyHasError: boolean;
-                bCellHadError: boolean;
-                errorId: number;
-            }
-            export class OnRowErrorStateChanged implements IEventArgs {
-                constructor(recordKey: number, bAddingError: boolean, bErrorCurrentlyInRow: boolean, bRowHadError: boolean, errorId: number, message: string);
-                recordKey: number;
-                bAddingError: boolean;
-                bErrorCurrentlyInRow: boolean;
-                bRowHadError: boolean;
-                errorId: number;
-                message: string;
-            }
-            export class OnEntryRecordCommitted implements IEventArgs {
-                constructor(origRecKey: string, recordKey: number, changeKey: JsGrid.IChangeKey);
-                originalRecordKey: number;
-                recordKey: number;
-                changeKey: JsGrid.IChangeKey
-            }
-            export class SingleCellClick implements IEventArgs {
-                constructor(eventInfo: Sys.UI.DomEvent, recordKey: number, fieldKey: string);
-                eventInfo: Sys.UI.DomEvent;
-                recordKey: number;
-                fieldKey: string;
-            }
-            export class PendingChangeKeyInitiallyComplete implements IEventArgs {
-                constructor(changeKey: JsGrid.IChangeKey);
-                changeKey: JsGrid.IChangeKey
-            }
-            export class VacateChange implements IEventArgs {
-                constructor(changeKey: JsGrid.IChangeKey);
-                changeKey: JsGrid.IChangeKey
-            }
-            export class GridErrorStateChanged implements IEventArgs {
-                constructor(bAnyErrors: boolean);
-                bAnyErrors: boolean;
-            }
-            export class SingleCellKeyDown implements IEventArgs {
-                constructor(eventInfo: Sys.UI.DomEvent, recordKey: number, fieldKey: string);
-                eventInfo: Sys.UI.DomEvent;
-                recordKey: number;
-                fieldKey: string;
-            }
-            export class OnRecordsReordered implements IEventArgs {
-                constructor(recordKeys: string[], changeKey: JsGrid.IChangeKey);
-                reorderedKeys: string[];
-                changeKey: JsGrid.IChangeKey;
-            }
-            export class OnRowEscape implements IEventArgs {
-                constructor(recordKey: number);
-                recordKey: number;
-            }
-            export class OnEndRenameColumn implements IEventArgs {
-                constructor(columnKey: string, originalColumnTitle: string, newColumnTitle: string);
-                columnKey: string;
-                originalColumnTitle: string;
-                newColumnTitle: string;
-            }
-            export class OnBeginRedoDataUpdateChange implements IEventArgs {
-                constructor(changeKey: JsGrid.IChangeKey);
-                changeKey: JsGrid.IChangeKey
-            }
-            export class OnBeginUndoDataUpdateChange implements IEventArgs {
-                constructor(changeKey: JsGrid.IChangeKey);
-                changeKey: JsGrid.IChangeKey
-            }
-
-        }
-
-        export module JsGridControl {
-            export class Parameters {
-                tableCache: SP.JsGrid.TableCache;
-                name: any; // TODO
-                bNotificationsEnabled: boolean;
-                styleManager: IStyleManager;
-                minHeaderHeight: number;
-                minRowHeight: number;
-                commandMgr: SP.JsGrid.CommandManager;
-                enabledRowHeaderAutoStates: SP.Utilities.Set;
-                tableViewParams: TableViewParameters;
-                bEnableDiffTracking: boolean;
-                isRTL: boolean;
-
-            }
-            export class TableViewParameters {
-                paneLayout: SP.JsGrid.PaneLayout;
-                defaultEditMode: SP.JsGrid.EditMode;
-                allowedSelectionTypes: SP.JsGrid.SelectionTypeFlags;
-
-                bMovableColumns: boolean;
-                bResizableColumns: boolean;
-                bHidableColumns: boolean;
-                bSortableColumns: boolean;
-                bAutoFilterableColumns: boolean;
-                bRowHeadersEnabled: boolean;
-                bRecordIndicatorCheckboxesEnabled: boolean;
-                bFillControlEnabled: boolean;
-                bEditingEnabled: boolean;
-                bNewRowEnabled: boolean;
-
-                checkSelectionCheckboxHiddenRecordKeys: string[];
-                checkSelectionCheckboxDisabledRecordKeys: string[];
-                checkSelectionCheckedRecordKeys: string[];
-
-                keyFieldName: string;
-                gridFieldMap: { [name: string]: GridField };
-
-                columns: ColumnInfoCollection;
-                messageOverrides: any; //TODO
-                operationalConstantsFieldKeyMap: any; //TODO
-
-                ganttParams: GanttParameters;
-                pivotedGridParams: PivotedGridParameters;
-                rowViewParams: RowViewParameters;
-            }
-            export class PivotedGridParameters {
-        	    //this.dateRange = null;
-             //   this.ganttBarStyles = null;
-             //   this.ganttZoomLevel = 3;
-             //   this.fnRenderGanttRow = null;
-             //   this.fnGetGanttBarDate = null;
-             //   this.fnGetGanttBarStyleIds = null;
-             //   this.fnGetPredecessors = null;
-             //   this.workDayStart = _spRegionalSettings.workDayStart;
-             //   this.workDayEnd = _spRegionalSettings.workDayEnd;
-             //   this.fieldKeyRedrawFilter = null;
-            }
-
-            export class GanttParameters {
-                columns: ColumnInfoCollection;
-            }
-
-            export class RowViewParameters {
-                hierarchyMode: SP.JsGrid.HierarchyMode;
-                view: any;
-
-                topViewIdx: number;
-
-
-                groupingLevel: any;
-                groupingRecordKeyPrefix: any;
-                autoFilterState: any;
-                unfilteredHierarchyMgr: any;
-                hierarchyDelayLoadKeys: any;
-                hierarchyState: any;
-                sortState: any;
-                filterState: any;
-                autoFilterEntries: any;
-                filteredDescCounts: any;
-
-            }
-        }
-
-        export class CommandManager {
-            // todo
-        }
-
-        export class TableCache {
-            // todo
-        }
-
-        export interface IStyleManager {
-            gridPaneStyle: IStyleType.GridPane;
-            columnHeaderStyleCollection: {
-                normal: IStyleType.Header;
-                normalHover: IStyleType.Header;
-                partSelected: IStyleType.Header;
-                partSelectedHover: IStyleType.Header;
-                allSelected: IStyleType.Header;
-                allSelectedHover: IStyleType.Header;
-            };
-            rowHeaderStyleCollection: {
-                normal: IStyleType.Header;
-                normalHover: IStyleType.Header;
-                partSelected: IStyleType.Header;
-                partSelectedHover: IStyleType.Header;
-                allSelected: IStyleType.Header;
-                allSelectedHover: IStyleType.Header;
-            };
-            splitterStyleCollection: {
-                normal: IStyleType.Splitter;
-                normalHandle: IStyleType.SplitterHandle;
-                hover: IStyleType.Splitter;
-                hoverHandle: IStyleType.SplitterHandle;
-                dra: IStyleType.Splitter;
-                dragHandle: IStyleType.SplitterHandle;
-            };
-            defaultCellStyle: IStyleType.Cell;
-            readOnlyCellStyle: IStyleType.Cell;
-            readOnlyFocusedCellStyle: IStyleType.Cell;
-            timescaleTierStyle: IStyleType.TimescaleTier;
-            groupingStyles: any[];
-            widgetDockStyle: IStyleType.Widget;
-            widgetDockHoverStyle: IStyleType.Widget;
-            widgetDockPressedStyle: IStyleType.Widget;
-            RegisterCellStyle(styleId: string, cellStyle: IStyleType.Cell): void;
-            GetCellStyle(styleId: string): IStyleType.Cell;
-            UpdateSplitterStyleFromCss(styleObject: IStyleType.Splitter, splitterStyleNameCollection: any): void;
-            UpdateHeaderStyleFromCss(styleObject: IStyleType.Header, headerStyleNameCol: any): void;
-            UpdateGridPaneStyleFromCss(styleObject: IStyleType.GridPane, gridStyleNameCollection: any): void;
-            UpdateDefaultCellStyleFromCss(styleObject: IStyleType.Cell, cssClass: string): void;
-            UpdateGroupStylesFromCss(styleObject: IStyleType.Cell, prefix: string): void;
-        }
-
-        export interface IStyleType { }
-        export module IStyleType {
-            export interface Splitter extends IStyleType {
-                outerBorderColor: any;
-                leftInnerBorderColor: any;
-                innerBorderColor: any;
-                backgroundColor: any;
-            }
-            export interface SplitterHandle extends IStyleType {
-                outerBorderColor: any;
-                leftInnerBorderColor: any;
-                innerBorderColor: any;
-                backgroundColor: any;
-                gripUpperColor: any;
-                gripLowerColor: any;
-            }
-            export interface GridPane {
-                verticalBorderColor: any;
-                verticalBorderStyle: any;
-                horizontalBorderColor: any;
-                horizontalBorderStyle: any;
-                backgroundColor: any;
-                columnDropIndicatorColor: any;
-                rowDropIndicatorColor: any;
-                linkColor: any;
-                visitedLinkColor: any;
-                copyRectForeBorderColor: any;
-                copyRectBackBorderColor: any;
-                focusRectBorderColor: any;
-                selectionRectBorderColor: any;
-                selectedCellBgColor: any;
-                readonlySelectionRectBorderColor: any;
-                changeHighlightCellBgColor: any;
-                fillRectBorderColor: any;
-                errorRectBorderColor: any;
-            }
-            export interface Header {
-                font: any;
-                fontSize: any;
-                fontWeight: any;
-                textColor: any;
-                backgroundColor: any;
-                outerBorderColor: any;
-                innerBorderColor: any;
-                eyeBrowBorderColor: any;
-                eyeBrowColor: any;
-                menuColor: any;
-                menuBorderColor: any;
-                resizeColor: any;
-                resizeBorderColor: any;
-                menuHoverColor: any;
-                menuHoverBorderColor: any;
-                resizeHoverColor: any;
-                resizeHoverBorderColor: any;
-                eyeBrowHoverColor: any;
-                eyeBrowHoverBorderColor: any;
-                elementClickColor: any;
-                elementClickBorderColor: any;
-            }
-            export interface Cell extends IStyleType {
-                /** -> CSS font-family */
-                font: any;
-                /** -> CSS font-size */
-                fontSize: any;
-                /** -> CSS font-weight */
-                fontWeight: any;
-                /** -> CSS font-style */
-                fontStyle: any;
-                /** -> CSS color */
-                textColor: any;
-                /** -> CSS background-color */
-                backgroundColor: any;
-                /** -> CSS text-align */
-                textAlign: any;
-            }
-            export interface Widget {
-                backgroundColor: any;
-                borderColor: any;
-            }
-            export interface RowHeaderStyle {
-                backgroundColor: any;
-                outerBorderColor: any;
-                innerBorderColor: any;
-            }
-            export interface TimescaleTier {
-                font: any;
-                fontSize: any;
-                fontWeight: any;
-                textColor: any;
-                backgroundColor: any;
-                verticalBorderColor: any;
-                verticalBorderStyle: any;
-                horizontalBorderColor: any;
-                horizontalBorderStyle: any;
-                outerBorderColor: any;
-                todayLineColor: any;
-            }
-        }
-
-        export class Style {
-
-            static Type: {
-                Splitter: IStyleType.Splitter;
-                SplitterHandle: IStyleType.SplitterHandle;
-                GridPane: IStyleType.GridPane;
-                Header: IStyleType.Header;
-                RowHeaderStyle: IStyleType.RowHeaderStyle;
-                TimescaleTier: IStyleType.TimescaleTier;
-                Cell: IStyleType.Cell;
-                Widget: IStyleType.Widget;
-            };
-
-            static SetRTL: { (rtlObject: any): void; };
-            static MakeJsGridStyleManager: { (): IStyleManager };
-            static CreateStyleFromCss: { (styleType: IStyleType, cssStyleName: string, optExistingStyle?: any, optClassId?: any): any; };
-            static CreateStyle: { (styleType: IStyleType, styleProps: any): any; };
-            static MergeCellStyles: { (majorStyle: any, minorStyle: any): any; };
-            static ApplyCellStyle: { (td: HTMLTableCellElement, style: any): void; };
-            static ApplyRowHeaderStyle: { (domObj: HTMLElement, style: any, fnGetHeaderSibling: Function): void; };
-            static ApplyCornerHeaderBorderStyle: { (domObj: HTMLElement, colStyle: any, rowStyle: any): void; };
-            static ApplyHeaderInnerBorderStyle: { (domObj: HTMLElement, bIsRowHeader: any, headerObject: any): void };
-            static ApplyColumnContextMenuStyle: { (domObj: HTMLElement, style: any): void };
-            static ApplySplitterStyle: { (domObj: HTMLElement, style: any): void };
-            static MakeBorderString: { (width: number, style: string, color: string): string };
-            static GetCellStyleDefaultBackgroundColor: { (): string };
-
-        }
-
-        export class ColumnInfoCollection {
-            constructor(colInfoArray: any[]);
-            GetColumnByKey(key: string): any;
-            GetColumnArray(bVisibleOnly?: boolean): any[];
-            GetColumnMap(): { [key: string]: any; };
-            AppendColumn(colInfo: any): void;
-            InsertColumnAt(idx: number, colInfo: any): void;
-            RemoveColumn(key: string): void;
-            /** Returns null if the specified column is not found or hidden. */
-            GetColumnPosition(key: string): number;
-        }
-
-        export class ColumnInfo {
-            constructor(name: string, imgSrc: string, key: string, width: number);
-            /** Column title */
-            name: string;
-            /** Column image URL.
-                If not null, the column header cell will show the image instead of title text.
-                If the title is defined at the same time as the imgSrc, the title will be shown as a tooltip. */
-            imgSrc: string;
-            /** Custom image HTML.
-                If you define this in addition to the imgSrc attribute, then instead of standard img tag
-                the custom HTML defined by this field will be used. */
-            imgRawSrc: string;
-            /** Column identifier */
-            columnKey: string;
-            /** Field keys of the fields, that are displayed in this column */
-            fieldKeys: string[];
-            /** Width of the column */
-            width: number;
-            bOpenMenuOnContentClick: boolean;
-            /** always returns 'column' */
-            ColumnType(): string;
-            /** true by default */
-            isVisible: boolean;
-            /** true by default */
-            isHidable: boolean;
-            /** true by default */
-            isResizable: boolean;
-            /** true by default */
-            isSortable: boolean;
-            /** true by default */
-            isAutoFilterable: boolean;
-            /** false by default */
-            isFooter: boolean;
-            /** determine whether the cells in this column should be clickable */
-            fnShouldLinkSingleValue: { (record: IRecord, fieldKey: string, dataValue: any, localizedValue: any): boolean };
-            /** if a particular cell is determined as clickable by fnShouldLinkSingleValue, this function will be called when the cell is clicked */
-            fnSingleValueClicked: { (record: IRecord, fieldKey: string, dataValue: any, localizedValue: any): void };
-            /** this is used when you need to make some of the cells in the column readonly, but at the same time keep others editable */
-            fnGetCellEditMode: { (record: IRecord, fieldKey: string): JsGrid.EditMode };
-            /** this function should return name of the display control for the given cell in the column
-                the name should be previously associated with the display control via SP.JsGrid.PropertyType.Utils.RegisterDisplayControl method */
-            fnGetDisplayControlName: { (record: IRecord, fieldKey: string): string };
-            /** this function should return name of the edit control for the given cell in the column
-                the name should be previously associated with the edit control via SP.JsGrid.PropertyType.Utils.RegisterEditControl method */
-            fnGetEditControlName: { (record: IRecord, fieldKey: string): string };
-            /** set widget control names for a particular cell
-                widgets are basically in-cell buttons with associated popup controls, e.g. date selector or address book button
-                standard widget ids are defined in the SP.JsGrid.WidgetControl.Type enumeration
-                it is also possible to create your own widgets
-                usually this function is not used, and instead, widget control names are determined via PropertyType
-             */
-            fnGetWidgetControlNames: { (record: IRecord, fieldKey: string): string[] };
-            /** this function should return id of the style for the given cell in the column
-                styles and their ids are registered for a JsGridControl via jsGridParams.styleManager.RegisterCellStyle method */
-            fnGetCellStyleId: { (record: IRecord, fieldKey: string, dataValue: any): string };
-            /** set custom tooltip for the given cell in the column. by default, localized value is displayed as the tooltip */
-            fnGetSingleValueTooltip: { (record: IRecord, fieldKey: string, dataValue: any, localizedValue: any): string };
-        }
-
-
-        export interface IRecord {
-            /** True if this is an entry row */
-            bIsNewRow: boolean;
-
-            /** Please use SetProp and GetProp */
-            properties: { [fieldKey: string]: IPropertyBase };
-
-            /** returns recordKey */
-            key(): number;
-            /** returns raw data value for the specified field */
-            GetDataValue(fieldKey: string): any;
-            /** returns localized text value for the specified field */
-            GetLocalizedValue(fieldKey: string): string;
-            /** returns true if data value for the specified field is available */
-            HasDataValue(fieldKey: string): boolean;
-            /** returns true if localized text value for the specified field is available */
-            HasLocalizedValue(fieldKey: string): boolean;
-
-            GetProp(fieldKey: string): IPropertyBase;
-            SetProp(fieldKey: string, prop: IPropertyBase): void;
-
-            /** Update the specified field with the specified value */
-            AddFieldValue(fieldKey: string, value: any): void;
-            /** Removes value of the specified field.
-                Does not refresh the view. */
-            RemoveFieldValue(fieldKey: string): void;
-        }
-
-
-        export class RecordFactory {
-            constructor(gridFieldMap: any, keyColumnName: string, fnGetPropType: any);
-            gridFieldMap: any;
-            /** Create a new record */
-            MakeRecord(dataPropMap: any, localizedPropMap: any, bKeepRawData: boolean): IRecord;
-        }
-
-        export interface IPropertyBase {
-            HasLocalizedValue(): boolean;
-            HasDataValue(): boolean;
-            Clone(): IPropertyBase;
-            /** dataValue actually is cloned */
-            Update(dataValue: any, localizedValue: string): void;
-            GetLocalized(): string;
-            GetData(): any;
-        }
-
-        export class Property {
-            static MakeProperty(dataValue: any, localizedValue: string, bHasDataValue: boolean, bHasLocalizedValue: boolean, propType: any): IPropertyBase;
-            static MakePropertyFromGridField(gridField: any, dataValue: any, localizedVal: string, optPropType?: any): IPropertyBase;
-        }
-
-        export class GridField {
-            constructor(key: string, hasDataValue: boolean, hasLocalizedValue: boolean, textDirection: TextDirection, defaultCellStyleId?: any, editMode?: EditMode, dateOnly?: boolean, csrInfo?: any);
-            key: string;
-            hasDataValue: boolean;
-            hasLocalizedValue: boolean;
-            textDirection: TextDirection;
-            dateOnly: boolean;
-            csrInfo: any;
-            GetEditMode(): EditMode;
-            SetEditMode(mode: EditMode): void;
-            GetDefaultCellStyleId(): any;
-            CompareSingleDataEqual(dataValue1: any, dataValue2: any): boolean;
-            GetPropType(): any;
-            GetSingleValuePropType(): any;
-            GetMultiValuePropType(): any;
-            SetSingleValuePropType(svPropType: any): void;
-            SetIsMultiValue(listSeparator: any): void;
-            GetIsMultiValue(): boolean;
-        }
-
-        export interface IEditActorGridContext {
-            jsGridObj: JsGridControl;
-            parentNode: HTMLElement;
-            styleManager: IStyleManager;
-            RTL: any;
-            emptyValue: any;
-            bLightFocus: boolean;
-            OnKeyDown: { (domEvent: Sys.UI.DomEvent): void; };
-        }
-
-        export interface IEditControlGridContext extends IEditActorGridContext {
-            OnActivateActor(): void;
-            OnDeactivateActor(): void;
-        }
-
-        export interface IPropertyType {
-            ID: string;
-            BeginValidateNormalizeConvert(recordKey: number, fieldKey: string, newValue: any, bIsLocalized: boolean, fnCallback: { (args: { isValid: boolean; dataValue: any; normalizedLocValue: string }): void; }, fnError: any): void;
-        }
-
-        export interface ILookupPropertyType extends IPropertyType {
-            GetItems(fnCallback: any): void;
-            DataToLocalized(dataValue: any): string;
-            LocalizedToData(localized: string): any;
-            GetImageSource(record: IRecord, dataValue: any): string;
-            GetStyleId(dataValue: any): string;
-            GetIsLimitedToList(): boolean;
-            GetSerializableLookupPropType(): { items: any[]; id: string; bLimitToList: boolean };
-        }
-
-        export interface IMultiValuePropertyType extends IPropertyType {
-            bMultiValue: boolean;
-            separator: string;
-            singleValuePropType: string;
-            GetSerializableMultiValuePropType(): { singleValuePropTypeID: string; separatorChar: string; bDelayInit: boolean; };
-            InitSingleValuePropType(): void;
-            LocStrToLocStrArray(locStr: string): string[];
-            LocStrArrayToLocStr(locStrArray: string[]): string;
-        }
-
-        export class PropertyType {
-            /** Lookup property type factory, based on SP.JsGrid.PropertyType.LookupTable class.
-                displayCtrlName should be one of the following: SP.JsGrid.DisplayControl.Type.Image, SP.JsGrid.DisplayControl.Type.ImageText or SP.JsGrid.DisplayControl.Type.Text
-             */
-            static RegisterNewLookupPropType(id: string, items: any[], displayCtrlName: string, bLimitToList: boolean): void;
-
-            /** Register a custom property type. */
-            static RegisterNewCustomPropType(propType: IPropertyType, displayCtrlName: string, editControlName: string, widgetControlNames: string[]): void;
-
-            /** Register a custom property type, where display and edit controls, and also widgets, are derived from the specified parent property type. */
-            static RegisterNewDerivedCustomPropType(propType: IPropertyType, baseTypeName: string): void;
-        }
-
-        export module PropertyType {
-            export class String implements IPropertyType {
-                constructor();
-                ID: string;
-                BeginValidateNormalizeConvert(recordKey: number, fieldKey: string, newValue: any, bIsLocalized: boolean, fnCallback: { (args: { isValid: boolean; dataValue: any; normalizedLocValue: string }): void; }, fnError: any): void;
-                toString(): string;
-            }
-            export class LookupTable implements ILookupPropertyType {
-                constructor(items: any[], id: string, bLimitToList: boolean);
-                ID: string;
-                BeginValidateNormalizeConvert(recordKey: number, fieldKey: string, newValue: any, bIsLocalized: boolean, fnCallback: { (args: { isValid: boolean; dataValue: any; normalizedLocValue: string }): void; }, fnError: any): void;
-                GetItems(fnCallback: any): void;
-                DataToLocalized(dataValue: any): string;
-                LocalizedToData(localized: string): any;
-                GetImageSource(record: IRecord, dataValue: any): string;
-                GetStyleId(dataValue: any): string;
-                GetIsLimitedToList(): boolean;
-                GetSerializableLookupPropType(): { items: any[]; id: string; bLimitToList: boolean };
-
-            }
-            export class CheckBoxBoolean implements IPropertyType {
-                constructor();
-                ID: string;
-                BeginValidateNormalizeConvert(recordKey: number, fieldKey: string, newValue: any, bIsLocalized: boolean, fnCallback: { (args: { isValid: boolean; dataValue: any; normalizedLocValue: string }): void; }, fnError: any): void;
-                DataToLocalized(dataValue: any): string;
-                GetBool(dataValue: any): boolean;
-                toString(): string;
-            }
-            export class DropDownBoolean implements IPropertyType {
-                constructor();
-                ID: string;
-                BeginValidateNormalizeConvert(recordKey: number, fieldKey: string, newValue: any, bIsLocalized: boolean, fnCallback: { (args: { isValid: boolean; dataValue: any; normalizedLocValue: string }): void; }, fnError: any): void;
-                DataToLocalized(dataValue: any): string;
-                GetBool(dataValue: any): boolean;
-                toString(): string;
-            }
-            export class MultiValuePropType implements IMultiValuePropertyType {
-                ID: string;
-                BeginValidateNormalizeConvert(recordKey: number, fieldKey: string, newValue: any, bIsLocalized: boolean, fnCallback: { (args: { isValid: boolean; dataValue: any; normalizedLocValue: string }): void; }, fnError: any): void;
-                bMultiValue: boolean;
-                separator: string;
-                singleValuePropType: string;
-                GetSerializableMultiValuePropType(): { singleValuePropTypeID: string; separatorChar: string; bDelayInit: boolean; };
-                InitSingleValuePropType(): void;
-                LocStrToLocStrArray(locStr: string): string[];
-                LocStrArrayToLocStr(locStrArray: string[]): string;
-            }
-            export class HyperLink implements IPropertyType {
-                ID: string;
-                BeginValidateNormalizeConvert(recordKey: number, fieldKey: string, newValue: any, bIsLocalized: boolean, fnCallback: { (args: { isValid: boolean; dataValue: any; normalizedLocValue: string }): void; }, fnError: any): void;
-                bHyperlink: boolean;
-                DataToLocalized(dataValue: any): string;
-                GetAddress(dataValue: any): string;
-                /** Returns string like this: '"http://site.com, Site title"' */
-                GetCopyValue(record: IRecord, dataValue: any, locValue: string): string;
-                toString(): string;
-            }
-
-
-            export class Utils {
-                static RegisterDisplayControl(name: string, singleton: any, requiredFunctionNames: string[]): void;
-                static RegisterEditControl(name: string, factory: (gridContext: IEditControlGridContext, gridTextInputElement: HTMLElement) => IEditControl, requiredFunctionNames: string[]): void;
-                static RegisterWidgetControl(name: string, factory: { (ddContext: any): IPropertyType; }, requiredFunctionNames: string[]): void;
-
-                static UpdateDisplayControlForPropType(propTypeName: string, displayControlType: string): void;
-            }
-        }
-
-        export module WidgetControl {
-            export class Type {
-                static Demo: string;
-                static Date: string;
-                static AddressBook: string;
-                static Hyperlink: string;
-            }
-        }
-
-        export module Internal {
-            export class DiffTracker {
-                constructor(objBag: any, fnGetChange: Function);
-                ExternalAPI: {
-                    AnyChanges(): boolean;
-                    ChangeKeySliceInfo(): any;
-                    ChangeQuery(): any;
-                    EventSliceInfo(): any;
-                    GetChanges(optStartEvent: any, optEndEvent: any, optRecordKeys: any, bFirstStartEvent: boolean, bStartInclusive: boolean, bEndInclusive: boolean, bIncludeInvalidPropUpdates: boolean, bLastEndEvent: boolean): any;
-                    GetChangesAsJson(changeQuery: any, optfnPreProcessUpdateForSerialize?: any): string;
-                    GetUniquePropertyChanges(changeQuery: any, optfnFilter?: any): any;
-                    RegisterEvent(changeKey: IChangeKey, eventObject: any): void;
-                    UnregisterEvent(changeKey: IChangeKey, eventObject: any): void;
-                };
-                Clear(): void;
-                NotifySynchronizeToChange(changeKey: IChangeKey): void;
-                NotifyRollbackChange(changeKey: IChangeKey): void;
-                NotifyVacateChange(changeKey: IChangeKey): void;
-            }
-
-            export class PropertyUpdate implements IValue {
-                constructor(data: any, localized: string);
-                data: any;
-                localized: string;
-            }
-        }
-
-        export interface IEditActorCellContext {
-            propType: IPropertyType;
-            originalValue: IValue;
-            record: IRecord;
-            column: ColumnInfo;
-            field: GridField;
-            fieldKey: string;
-            cellExpandSpace: { left: number; top: number; fight: number; bottom: number; };
-            SetCurrentValue(value: any): void;
-        }
-
-        export interface IEditControlCellContext extends IEditActorCellContext {
-            cellWidth: number;
-            cellHeight: number;
-            cellStyle: any; //TODO: Determine correct type
-            cellRect: any;
-            NotifyExpandControl(): void;
-            NotifyEditComplete(): void;
-            Show(element: HTMLElement): void;
-            Hide(element: HTMLElement): void;
-        }
-
-
-        export module EditControl {
-
-        }
-
-        export interface IEditControl {
-            SupportedWriteMode?: SP.JsGrid.EditActorWriteType;
-            SupportedReadMode?: SP.JsGrid.EditActorReadType;
-            GetCellContext?(): IEditControlCellContext;
-            GetOriginalValue?(): IValue;
-            SetValue?(value: IValue): void;
-            Dispose(): void;
-            GetInputElement?(): HTMLElement;
-            Focus?(eventInfo: Sys.UI.DomEvent): void;
-            BindToCell(cellContext: IEditControlCellContext): void;
-            OnBeginEdit(eventInfo: Sys.UI.DomEvent): void;
-            Unbind(): void;
-            OnEndEdit(): void;
-            OnCellMove?(): void;
-            OnValueChanged?(newValue: IValue): void;
-            IsCurrentlyUsingGridTextInputElement?(): boolean;
-            SetSize?(width: number, height: number): void;
-        }
-
-
-        export class StaticDataSource {
-            constructor(jsGridData: IGridData, optFnGetPropType?: Function);
-            AddColumn(gridField: SP.JsGrid.GridField, values: IValue[]):void;
-            RemoveColumn(fieldKey: string):void;
-            InitJsGridParams(optGridParams?: JsGridControl.Parameters): JsGridControl.Parameters;
-        }
-
-        export interface IGridData {
-            MetaData: IGridMetadata
-
-            Fields: IFieldInfo[];
-            Columns: IColumnInfo[];
-
-            LocalizedTable: any[];
-            UnlocalizedTable: any[];
-            ViewInfo: any[];
-
-            MultiValueSeparator?: string;
-            LookupTableInfo?: ILookupTableInfo[];
-            PivotedColumns?: ColumnInfo[];
-            PaneLayout?: PaneLayout;
-            GanttInfo?: any;
-            AutoFilterableColumns?: boolean;
-            AutoFilterState?: any;
-            SortState?: any[];
-            HierarchyState?: any;
-            TopRecord?: number;
-            RecordCount?: number;
-            AdditionalParams?: any;
-            CellStyles?: any;
-            GroupingGridRowStyleIds?: any[];
-            UnfilteredHierarchy?: any;
-            AutoFilterEntries?: any;
-
-            ViewDepKeys?: any[];
-        }
-
-        export interface IColumnInfo {
-            /** Column title */
-            name: string;
-            /** Column image URL.
-                If not null, the column header cell will show the image instead of title text.
-                If the title is defined at the same time as the imgSrc, the title will be shown as a tooltip. */
-            imgSrc?: string;
-            /** Column identifier */
-            columnKey: string;
-            /** Column identifier */
-            fieldKey: string;
-            /** Field keys of the fields, that are displayed in this column */
-            fieldKeys: string[];
-            /** Width of the column */
-            width: number;
-            /** true by default */
-            isVisible?: boolean;
-            /** true by default */
-            isHidable?: boolean;
-            /** true by default */
-            isResizable?: boolean;
-            /** true by default */
-            isSortable?: boolean;
-            /** true by default */
-            isAutoFilterable?: boolean;
-            /** false by default */
-            isFooter?: boolean;
-        }
-
-        export interface IGridMetadata {
-            KeyColumnName: string;
-            IsGanttEnabled?: boolean;
-            IsHierarchyEnabled?: boolean;
-            IsSorted?: boolean;
-            GroupingLevel?: number;
-            GroupingPrefix?: string;
-            RecordKeyHash?: string;
-            RecordKeyOrderChanged?: any;
-            GridOperationalConstantsFieldKeyMap?: { [index: number]: string };
-
-        }
-
-        export interface IFieldInfo {
-            fieldKey: string;
-            propertyTypeId: string;
-            editMode?: EditMode;
-            hasDataValue?: boolean;
-            hasLocalizedValue?: boolean;
-            multiValue?: boolean;
-            textDirection?: TextDirection;
-            dateOnly?: boolean;
-            defaultCellStyleId?: any;
-
-        }
-
-        export interface ILookupTableInfo {
-            id: string;
-            showImage?: boolean;
-            showText?: boolean;
-            limitToList?: boolean;
-            lookup: ILookupInfo[];
-        }
-        export interface ILookupInfo {
-            localString: string;
-            value: number;
-        }
-
-
-    }
-
-    export module Utilities {
-        export class Set {
-            constructor(items?: { [item: string]: number });
-            constructor(items?: { [item: number]: number });
-            /** Returns true if the set is empty */
-            IsEmpty(): boolean;
-            /** Returns first item in the set */
-            First(): any;
-            /** Returns the underlying collection of items as dictionary.
-                Items are the keys, and values are always 1.
-                So the return value may be either { [item: string]: number } or { [item: number]: number } */
-            GetCollection(): any;
-            /** Returns all items from the set as an array */
-            ToArray(): any[];
-            /** Adds all items from array to the set, and returns the set */
-            AddArray(array: any[]): SP.Utilities.Set;
-            /** Adds an item to the set */
-            Add(item: any): any;
-            /** Removes the specified item from the set and returns the removed item */
-            Remove(item: any): any;
-            /** Clears all the items from set */
-            Clear(): SP.Utilities.Set;
-            /** Returns true if item exists in this set */
-            Contains(item: any): boolean;
-            /** Returns a copy of this set */
-            Clone(): SP.Utilities.Set;
-            /** Returns a set that contains all the items that exist only in one of the sets (this and other), but not in both */
-            SymmetricDifference(otherSet: SP.Utilities.Set): SP.Utilities.Set;
-            /** Returns a set that contains all the items that are in this set but not in the otherSet */
-            Difference(otherSet: SP.Utilities.Set): SP.Utilities.Set;
-            /** Returns a new set, that contains items from this set and otherSet */
-            Union(otherSet: SP.Utilities.Set): SP.Utilities.Set;
-            /** Adds all items from otherSet to this set, and returns this set */
-            UnionWith(otherSet: SP.Utilities.Set): SP.Utilities.Set;
-            /** Returns a new set, that contains only items that exist both in this set and the otherSet */
-            Intersection(otherSet: SP.Utilities.Set): SP.Utilities.Set;
-        }
-    }
-}
-
-
-
-
-
-declare namespace SP {
-    export class GanttControl {
-        static WaitForGanttCreation(callack: (control: GanttControl) => void): void;
-        static Instances: GanttControl[];
-        static FnGanttCreationCallback: { (control: GanttControl): void }[];
-
-        get_Columns(): SP.JsGrid.ColumnInfo[];
-    }
-}
diff --git a/sharepoint/index.d.ts b/sharepoint/index.d.ts
new file mode 100644
index 0000000000..69f400c400
--- /dev/null
+++ b/sharepoint/index.d.ts
@@ -0,0 +1,11210 @@
+// Type definitions for SharePoint 2010 and 2013
+// Project: https://github.com/gandjustas/sptypescript
+// Definitions by: Stanislav Vyshchepan <http://blog.gandjustas.ru>, Andrey Markeev <http://markeev.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="microsoft-ajax" />
+
+declare var _spBodyOnLoadFunctions: Function[];
+declare var _spBodyOnLoadFunctionNames: string[];
+declare var _spBodyOnLoadCalled: boolean;
+declare function ExecuteOrDelayUntilBodyLoaded(initFunc: () => void): void;
+declare function ExecuteOrDelayUntilScriptLoaded(func: () => void, depScriptFileName: string): boolean;
+declare function ExecuteOrDelayUntilEventNotified(func: Function, eventName: string): boolean;
+declare var Strings:any;
+
+declare namespace SP {
+    export class SOD {
+        static execute(fileName: string, functionName: string, ...args: any[]): void;
+        static executeFunc(fileName: string, typeName: string, fn: () => void): void;
+        static executeOrDelayUntilEventNotified(func: Function, eventName: string): boolean;
+        static executeOrDelayUntilScriptLoaded(func: () => void, depScriptFileName: string): boolean;
+        static notifyScriptLoadedAndExecuteWaitingJobs(scriptFileName: string): void;
+        static notifyEventAndExecuteWaitingJobs(eventName: string, args?: any[]): void;
+        static registerSod(fileName: string, url: string): void;
+        static registerSodDep(fileName: string, dependentFileName: string): void;
+        static loadMultiple(keys: string[], fn: () => void, bSync?: boolean): void;
+        static delayUntilEventNotified(func: Function, eventName: string): void;
+
+        static get_prefetch(): boolean;
+        static set_prefetch(value: boolean): void;
+
+        static get_ribbonImagePrefetchEnabled(): boolean;
+        static set_ribbonImagePrefetchEnabled(value: boolean): void;
+    }
+
+    export enum ListLevelPermissionMask {
+        viewListItems,//: 1,
+        insertListItems,//: 2,
+        editListItems,//: 4,
+        deleteListItems,//: 8,
+        approveItems,//: 16,
+        openItems,//: 32,
+        viewVersions,//: 64,
+        deleteVersions,//: 128,
+        breakCheckout,//: 256,
+        managePersonalViews,//: 512,
+        manageLists//: 2048
+    }
+
+    export class HtmlBuilder {
+        constructor();
+        addAttribute(name: string, value: string): void;
+        addCssClass(cssClassName: string): void;
+        addCommunitiesCssClass(cssClassName: string): void;
+        renderBeginTag(tagName: string): void;
+        renderEndTag(): void;
+        write(s: string): void;
+        writeEncoded(s: string): void;
+        toString(): string;
+    }
+
+    export class ScriptHelpers {
+        static disableWebpartSelection(context: SPClientTemplates.RenderContext): void;
+        static getDocumentQueryPairs(): { [index: string]: string; };
+        static getFieldFromSchema(schema: SPClientTemplates.ListSchema, fieldName: string): SPClientTemplates.FieldSchema;
+        static getLayoutsPageUrl(pageName: string, webServerRelativeUrl: string): string;
+        static getListLevelPermissionMask(jsonItem: string): number;
+        static getTextAreaElementValue(textAreaElement: HTMLTextAreaElement): string;
+        static getUrlQueryPairs(docUrl: string): { [index: string]: string; };
+        static getUserFieldProperty(item: ListItem, fieldName: string, propertyName: string): any;
+        static hasPermission(listPermissionMask: number, listPermission: ListLevelPermissionMask): boolean;
+        static newGuid(): SP.Guid;
+        static isNullOrEmptyString(str: string): boolean;
+        static isNullOrUndefined(obj: any): boolean;
+        static isNullOrUndefinedOrEmpty(str: string): boolean;
+        static isUndefined(obj: any): boolean;
+        static replaceOrAddQueryString(url: string, key: string, value: string): string;
+        static removeHtml(str: string): string;
+        static removeStyleChildren(element: HTMLElement): void;
+        static removeHtmlAndTrimStringWithEllipsis(str: string, maxLength: number): string;
+        static setTextAreaElementValue(textAreaElement: HTMLTextAreaElement, newValue: string): void;
+        static truncateToInt(n: number): number;
+        static urlCombine(path1: string, path2: string): string;
+        static resizeImageToSquareLength(imgElement: HTMLImageElement, squareLength: number): void;
+    }
+
+
+    export class PageContextInfo {
+        static get_siteServerRelativeUrl(): string;
+        static get_webServerRelativeUrl(): string;
+        static get_webAbsoluteUrl(): string;
+        static get_serverRequestPath(): string;
+        static get_siteAbsoluteUrl(): string;
+        static get_webTitle(): string;
+        static get_tenantAppVersion(): string;
+        static get_webLogoUrl(): string;
+        static get_webLanguage(): number;
+        static get_currentLanguage(): number;
+        static get_pageItemId(): number;
+        static get_pageListId(): string;
+        static get_webPermMasks(): { High: number; Low: number; };
+        static get_currentCultureName(): string;
+        static get_currentUICultureName(): string;
+        static get_clientServerTimeDelta(): number;
+        static get_userLoginName(): string;
+        static get_webTemplate(): string;
+        get_pagePersonalizationScope(): string;
+    }
+
+    export class ContextPermissions {
+        has(perm: number): boolean;
+        hasPermissions(high: number, low: number): boolean;
+        fromJson(json: { High: number; Low: number; }): void;
+    }
+
+    export module ListOperation {
+        export module ViewOperation {
+            export function getSelectedView(): string;
+            export function navigateUp(viewId: string): void;
+            export function refreshView(viewId: string): void;
+        }
+        export module Selection {
+            export function selectListItem(iid: string, bSelect: boolean): void;
+            export function getSelectedItems(): { id: number; fsObjType: FileSystemObjectType; }[];
+            export function getSelectedList(): string;
+            export function getSelectedView(): string;
+            export function navigateUp(viewId: string): void;
+            export function deselectAllListItems(iid: string): void;
+        }
+        export module Overrides {
+            export function overrideDeleteConfirmation(listId: string, overrideText: string): void;
+        }
+    }
+
+
+}
+
+/** Register function to rerun on partial update in MDS-enabled site.*/
+declare function RegisterModuleInit(scriptFileName: string, initFunc: () => void): void;
+
+/** Provides access to url and query string parts.*/
+declare class JSRequest {
+    /** Query string parts.*/
+    static QueryString: { [parameter: string]: string; };
+
+    /** initializes class.*/
+    static EnsureSetup(): void;
+
+    /** Current file name (after last '/' in url).*/
+    static FileName: string;
+
+    /** Current file path (before last '/' in url).*/
+    static PathName: string;
+}
+
+declare class _spPageContextInfo {
+    static alertsEnabled: boolean; //true
+    static allowSilverlightPrompt: string; //"True"
+    static clientServerTimeDelta: number; //-182
+    static crossDomainPhotosEnabled: boolean; //true
+    static currentCultureName: string; //"ru-RU"
+    static currentLanguage: number; //1049
+    static currentUICultureName: string; //"ru-RU"
+    static layoutsUrl: string;  //"_layouts/15"
+    static pageListId: string;  //"{06ee6d96-f27f-4160-b6bb-c18f187b18a7}"
+    static pageItemId: number;
+    static pagePersonalizationScope: string; //1
+    static serverRequestPath: string; //"/SPTypeScript/Lists/ConditionalFormattingTasksList/AllItems.aspx"
+    static siteAbsoluteUrl: string; // "https://gandjustas-7b20d3715e8ed4.sharepoint.com"
+    static siteClientTag: string; //"0$$15.0.4454.1021"
+    static siteServerRelativeUrl: string; // "/"
+    static systemUserKey: string; //"i:0h.f|membership|10033fff84e7cb2b@live.com"
+    static tenantAppVersion: string; //"0"
+    static userId: number; //12
+    static webAbsoluteUrl: string; //"https://gandjustas-7b20d3715e8ed4.sharepoint.com/SPTypeScript"
+    static webLanguage: number; //1049
+    static webLogoUrl: string; //"/_layouts/15/images/siteIcon.png?rev=23"
+    static webPermMasks: { High: number; Low: number; };
+    static webServerRelativeUrl: string; //"/SPTypeScript"
+    static webTemplate: string; //"17"
+    static webTitle: string; //"SPTypeScript"
+    static webUIVersion: number; //15
+}
+
+declare function STSHtmlEncode(value: string): string;
+declare function STSHtmlDecode(value: string): string;
+
+declare function AddEvtHandler(element: HTMLElement, event: string, func: EventListener): void;
+
+/** Gets query string parameter */
+declare function GetUrlKeyValue(key: string): string;
+
+declare class AjaxNavigate {
+    update(url: string, updateParts: Object, fullNavigate: boolean, anchorName: string): void;
+    add_navigate(handler: Function): void;
+    remove_navigate(handler: Function): void;
+    submit(formToSubmit: HTMLFormElement): void;
+    getParam(paramName: string): string;
+    getSavedFormAction(): string;
+    get_href(): string;
+    get_hash(): string;
+    get_search(): string;
+    convertMDSURLtoRegularURL(mdsPath: string): string;
+}
+
+declare var ajaxNavigate: AjaxNavigate;
+
+declare class Browseris {
+    firefox: boolean;
+    firefox36up: boolean;
+    firefox3up: boolean;
+    firefox4up: boolean;
+    ie: boolean;
+    ie55up: boolean;
+    ie5up: boolean;
+    ie7down: boolean;
+    ie8down: boolean;
+    ie9down: boolean;
+    ie8standard: boolean;
+    ie8standardUp: boolean;
+    ie9standardUp: boolean;
+    ipad: boolean;
+    windowsphone: boolean;
+    chrome: boolean;
+    chrome7up: boolean;
+    chrome8up: boolean;
+    chrome9up: boolean;
+    iever: boolean;
+    mac: boolean;
+    major: boolean;
+    msTouch: boolean;
+    isTouch: boolean;
+    nav: boolean;
+    nav6: boolean;
+    nav6up: boolean;
+    nav7up: boolean;
+    osver: boolean;
+    safari: boolean;
+    safari125up: boolean;
+    safari3up: boolean;
+    verIEFull: boolean;
+    w3c: boolean;
+    webKit: boolean;
+    win: boolean;
+    win8AppHost: boolean;
+    win32: boolean;
+    win64bit: boolean;
+    winnt: boolean;
+    armProcessor: boolean
+}
+
+declare var browseris: Browseris;
+
+interface ContextInfo extends SPClientTemplates.RenderContext {
+    AllowGridMode: boolean;
+    BasePermissions: any;
+    BaseViewID: any;
+    CascadeDeleteWarningMessage: string;
+    ContentTypesEnabled: boolean;
+    CurrentSelectedItems: boolean;
+    CurrentUserId: number;
+    EnableMinorVersions: boolean;
+    ExternalDataList: boolean;
+    HasRelatedCascadeLists: boolean;
+    HttpPath: string;
+    HttpRoot: string;
+    LastSelectableRowIdx: number;
+    LastSelectedItemIID: number;
+    LastRowIndexSelected: number;
+    RowFocusTimerID: number;
+    ListData: any;// SPClientTemplates.ListData_InView | SPClientTemplates.ListData_InForm
+    ListSchema: SPClientTemplates.ListSchema;
+    ModerationStatus: number;
+    PortalUrl: string;
+    RecycleBinEnabled: number;
+    SelectAllCbx: HTMLElement;
+    SendToLocationName: string;
+    SendToLocationUrl: string;
+    StateInitDone: boolean;
+    TableCbxFocusHandler: Function;
+    TableMouseoverHandler: Function;
+    TotalListItems: number;
+    WorkflowsAssociated: boolean;
+    clvp: any;
+    ctxId: number;
+    ctxType: any;
+    dictSel: any;
+    displayFormUrl: string;
+    editFormUrl: string;
+    imagesPath: string;
+    inGridMode: boolean;
+    inGridFullRender: boolean;
+    isForceCheckout: boolean;
+    isModerated: boolean;
+    isPortalTemplate: boolean;
+    isVersions: boolean;
+    isWebEditorPreview: boolean;
+    leavingGridMode: boolean;
+    loadingAsyncData: boolean;
+    listBaseType: number;
+    listName: string;
+    listTemplate: string;
+    listUrlDir: string;
+    newFormUrl: string;
+    onRefreshFailed: Function;
+    overrideDeleteConfirmation: string;
+    overrideFilterQstring: string;
+    recursiveView: boolean;
+    rootFolderForDisplay: string;
+    serverUrl: string;
+    verEnabled: boolean;
+    view: string;
+    queryString: string;
+    IsClientRendering: boolean;
+    wpq: string;
+    rootFolder: string;
+    IsAppWeb: boolean;
+    NewWOPIDocumentEnabled: boolean;
+    NewWOPIDocumentUrl: string;
+    AllowCreateFolder: boolean;
+    CanShareLinkForNewDocument: boolean;
+    noGroupCollapse: boolean;
+    SiteTemplateId: number;
+    ExcludeFromOfflineClient: boolean;
+
+}
+
+declare function GetCurrentCtx(): ContextInfo;
+declare function SetFullScreenMode(fullscreen: boolean): void;
+declare namespace SP {
+    export enum RequestExecutorErrors {
+        requestAbortedOrTimedout,
+        unexpectedResponse,
+        httpError,
+        noAppWeb,
+        domainDoesNotMatch,
+        noTrustedOrigins,
+        iFrameLoadError
+    }
+
+    export class RequestExecutor {
+        constructor(url: string, options?: any);
+        get_formDigestHandlingEnabled(): boolean;
+        set_formDigestHandlingEnabled(value: boolean): void;
+        get_iFrameSourceUrl(): string;
+        set_iFrameSourceUrl(value: string): void;
+        executeAsync(requestInfo: RequestInfo): void;
+        attemptLogin(returnUrl: string, success: (response: ResponseInfo) => void, error?: (response: ResponseInfo, error: RequestExecutorErrors, statusText: string) => void): void;
+    }
+
+    export interface RequestInfo {
+        url: string;
+        method?: string;
+        headers?: { [key: string]: string; };
+        /** Can be string or bytearray depending on binaryStringRequestBody field */
+        body?: string | Uint8Array;
+        binaryStringRequestBody?: boolean;
+
+        /** Currently need fix to get ginary response. Details: http://techmikael.blogspot.ru/2013/07/how-to-copy-files-between-sites-using.html */
+        binaryStringResponseBody?: boolean;
+        timeout?: number;
+        success?: (response: ResponseInfo) => void;
+        error?: (response: ResponseInfo, error: RequestExecutorErrors, statusText: string) => void;
+        state?: any;
+    }
+
+    export interface ResponseInfo {
+        statusCode?: number;
+        statusText?: string;
+        responseAvailable: boolean;
+        allResponseHeaders?: string;
+        headers?: { [key: string]: string; };
+        contentType?: string;
+        /** Can be string or bytearray depending on request.binaryStringResponseBody field */
+        body?: string | Uint8Array;
+        state?: any;
+    }
+
+    export class ProxyWebRequestExecutor extends Sys.Net.WebRequestExecutor {
+        constructor(url: string, options?: any);
+    }
+
+    export class ProxyWebRequestExecutorFactory implements SP.IWebRequestExecutorFactory {
+        constructor(url: string, options?: any);
+        createWebRequestExecutor(): ProxyWebRequestExecutor;
+    }
+}
+interface MQuery {
+    (selector: string, context?: any): MQueryResultSetElements;
+    (element: HTMLElement): MQueryResultSetElements;
+    (object: MQueryResultSetElements): MQueryResultSetElements;
+    <T>(object: MQueryResultSet<T>): MQueryResultSet<T>;
+    <T>(object: T): MQueryResultSet<T>;
+    (elementArray: HTMLElement[]): MQueryResultSetElements;
+    <T>(array: T[]): MQueryResultSet<T>;
+    <T>(): MQueryResultSet<T>;
+
+    throttle(fn: Function, interval: number, shouldOverrideThrottle: boolean): Function;
+
+    extend(target: any, ...objs: any[]): Object;
+    extend(deep: boolean, target: any, ...objs: any[]): Object;
+
+    makeArray<T>(obj: any): any[];
+
+    isDefined(obj: any): boolean;
+    isNotNull(obj: any): boolean;
+    isUndefined(obj: any): boolean;
+    isNull(obj: any): boolean;
+    isUndefinedOrNull(obj: any): boolean;
+    isDefinedAndNotNull(obj: any): boolean;
+    isString(obj: any): boolean;
+    isBoolean(obj: any): boolean;
+    isFunction(obj: any): boolean;
+    isArray(obj: any): boolean;
+    isNode(obj: any): boolean;
+    isElement(obj: any): boolean;
+    isMQueryResultSet(obj: any): boolean;
+    isNumber(obj: any): boolean;
+    isObject(obj: any): boolean;
+    isEmptyObject(obj: any): boolean;
+
+    ready(callback: () => void): void;
+    contains(container: HTMLElement, contained: HTMLElement): boolean;
+
+    proxy(fn: (...args: any[]) => any, context: any, ...args: any[]): Function;
+    proxy(context: any, name: string, ...args: any[]): any;
+
+    every<T>(obj: T[], fn: (elementOfArray: T, indexInArray: number) => boolean, context?: any): boolean;
+    every<T>(obj: MQueryResultSet<T>, fn: (elementOfArray: T, indexInArray: number) => boolean, context?: any): boolean;
+    every<T>(obj: T[], fn: (elementOfArray: T) => boolean, context?: any): boolean;
+    every<T>(obj: MQueryResultSet<T>, fn: (elementOfArray: any) => boolean, context?: any): boolean;
+
+    some<T>(obj: T[], fn: (elementOfArray: T, indexInArray: number) => boolean, context?: any): boolean;
+    some<T>(obj: MQueryResultSet<T>, fn: (elementOfArray: T, indexInArray: number) => boolean, context?: any): boolean;
+    some<T>(obj: T[], fn: (elementOfArray: T) => boolean, context?: any): boolean;
+    some<T>(obj: MQueryResultSet<T>, fn: (elementOfArray: T) => boolean, context?: any): boolean;
+
+    filter<T>(obj: T[], fn: (elementOfArray: T, indexInArray: number) => boolean, context?: any): T[];
+    filter<T>(obj: MQueryResultSet<T>, fn: (elementOfArray: T, indexInArray: number) => boolean, context?: any): MQueryResultSet<T>;
+    filter<T>(obj: T[], fn: (elementOfArray: T) => boolean, context?: any): T[];
+    filter<T>(obj: MQueryResultSet<T>, fn: (elementOfArray: T) => boolean, context?: any): MQueryResultSet<T>;
+
+    forEach<T>(obj: T[], fn: (elementOfArray: T, indexInArray: number) => void, context?: any): void;
+    forEach<T>(obj: MQueryResultSet<T>, fn: (elementOfArray: T, indexInArray: number) => void, context?: any): void;
+    forEach<T>(obj: T[], fn: (elementOfArray: T) => void, context?: any): void;
+    forEach<T>(obj: MQueryResultSet<T>, fn: (elementOfArray: T) => void, context?: any): void;
+
+    map<T, U>(array: T[], callback: (elementOfArray: T, indexInArray: number) => U): U[];
+    map<T, U>(array: MQueryResultSet<T>, callback: (elementOfArray: T, indexInArray: number) => U): MQueryResultSet<U>;
+    map<T, U>(array: T[], callback: (elementOfArray: T) => U): U[];
+    map<T, U>(array: MQueryResultSet<T>, callback: (elementOfArray: T) => U): MQueryResultSet<U>;
+
+    indexOf<T>(obj: T[], object: T, startIndex?: number): number;
+    lastIndexOf<T>(obj: T[], object: T, startIndex?: number): number;
+
+    data(element: HTMLElement, key: string, value: any): any;
+    data(element: HTMLElement, key: string): any;
+    data(element: HTMLElement): any;
+
+    removeData(element: HTMLElement, name?: string): MQueryResultSetElements;
+    hasData(element: HTMLElement): boolean;
+}
+
+interface MQueryResultSetElements extends MQueryResultSet<HTMLElement> {
+    append(node: HTMLElement): MQueryResultSetElements;
+    append(mQuerySet: MQueryResultSetElements): MQueryResultSetElements;
+    append(html: string): MQueryResultSetElements;
+
+    bind(eventType: string, handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    unbind(eventType: string, handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    trigger(eventType: string): MQueryResultSetElements;
+    one(eventType: string, handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+
+    detach(): MQueryResultSetElements;
+
+    find(selector: string): MQueryResultSetElements;
+    closest(selector: string, context?: any): MQueryResultSetElements;
+    offset(): { left: number; top: number; };
+    offset(coordinates: { left: any; top: any; }): MQueryResultSetElements;
+
+    filter(selector: string): MQueryResultSetElements;
+    filter(fn: (elementOfArray: HTMLElement, indexInArray: number) => boolean, context?: any): MQueryResultSetElements;
+    filter(fn: (elementOfArray: HTMLElement) => boolean, context?: any): MQueryResultSetElements;
+
+    not(selector: string): MQueryResultSetElements;
+
+    parent(selector?: string): MQueryResultSetElements;
+
+    offsetParent(selector?: string): MQueryResultSetElements;
+
+    parents(selector?: string): MQueryResultSetElements;
+    parentsUntil(selector?: string, filter?: string): MQueryResultSetElements;
+    parentsUntil(element?: HTMLElement, filter?: string): MQueryResultSetElements;
+
+    position(): { top: number; left: number; };
+
+    attr(attributeName: string): string;
+    attr(attributeName: string, value: any): MQueryResultSetElements;
+    attr(map: { [key: string]: any; }): MQueryResultSetElements;
+    attr(attributeName: string, func: (index: number, attr: any) => any): MQueryResultSetElements;
+
+    addClass(classNames: string): MQueryResultSetElements;
+    removeClass(classNames: string): MQueryResultSetElements;
+
+    css(propertyName: string): string;
+    css(propertyNames: string[]): string;
+    css(properties: any): MQueryResultSetElements;
+    css(propertyName: string, value: any): MQueryResultSetElements;
+    css(propertyName: any, value: any): MQueryResultSetElements;
+
+    remove(selector?: string): MQueryResultSetElements;
+    children(selector?: string): MQueryResultSetElements;
+    empty(): MQueryResultSetElements;
+    first(): MQueryResultSetElements;
+
+    data(key: string, value: any): MQueryResultSetElements;
+    data(obj: { [key: string]: any; }): MQueryResultSetElements;
+    data(key: string): any;
+
+    removeData(key: string): MQueryResultSetElements;
+
+    map(callback: (elementOfArray: HTMLElement, indexInArray: number) => any): MQueryResultSetElements;
+    map(callback: (elementOfArray: HTMLElement) => any): MQueryResultSetElements;
+
+    blur(): MQueryResultSetElements;
+    blur(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    change(): MQueryResultSetElements;
+    change(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    click(): MQueryResultSetElements;
+    click(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    dblclick(): MQueryResultSetElements;
+    dblclick(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    error(): MQueryResultSetElements;
+    error(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    focus(): MQueryResultSetElements;
+    focus(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    focusin(): MQueryResultSetElements;
+    focusin(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    focusout(): MQueryResultSetElements;
+    focusout(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    keydown(): MQueryResultSetElements;
+    keydown(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    keypress(): MQueryResultSetElements;
+    keypress(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    keyup(): MQueryResultSetElements;
+    keyup(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    load(): MQueryResultSetElements;
+    load(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    mousedown(): MQueryResultSetElements;
+    mousedown(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    mouseenter(): MQueryResultSetElements;
+    mouseenter(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    mouseleave(): MQueryResultSetElements;
+    mouseleave(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    mousemove(): MQueryResultSetElements;
+    mousemove(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    mouseout(): MQueryResultSetElements;
+    mouseout(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    mouseover(): MQueryResultSetElements;
+    mouseover(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    mouseup(): MQueryResultSetElements;
+    mouseup(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    resize(): MQueryResultSetElements;
+    resize(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    scroll(): MQueryResultSetElements;
+    scroll(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    select(): MQueryResultSetElements;
+    select(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    submit(): MQueryResultSetElements;
+    submit(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+    unload(): MQueryResultSetElements;
+    unload(handler: (eventObject: MQueryEvent) => any): MQueryResultSetElements;
+
+}
+
+interface MQueryResultSet<T> {
+    [index: number]: T;
+    contains(contained: T): boolean;
+
+    filter(fn: (elementOfArray: T, indexInArray: number) => boolean, context?: any): MQueryResultSet<T>;
+    filter(fn: (elementOfArray: T) => boolean, context?: any): MQueryResultSet<T>;
+
+    every(fn: (elementOfArray: T, indexInArray: number) => boolean, context?: any): boolean;
+    every(fn: (elementOfArray: T) => boolean, context?: any): boolean;
+
+    some(fn: (elementOfArray: T, indexInArray: number) => boolean, context?: any): boolean;
+    some(fn: (elementOfArray: T) => boolean, context?: any): boolean;
+
+    map(callback: (elementOfArray: T, indexInArray: number) => any): MQueryResultSet<T>;
+    map(callback: (elementOfArray: T) => any): MQueryResultSet<T>;
+
+    forEach(fn: (elementOfArray: T, indexInArray: number) => void, context?: any): void;
+    forEach(fn: (elementOfArray: T) => void, context?: any): void;
+
+    indexOf(object: any, startIndex?: number): number;
+    lastIndexOf(object: any, startIndex?: number): number;
+
+}
+
+interface MQueryEvent extends Event {
+    altKey: boolean;
+    attrChange: number;
+    attrName: string;
+    bubbles: boolean;
+    button: number;
+    cancelable: boolean;
+    ctrlKey: boolean;
+    defaultPrevented: boolean;
+    detail: number;
+    eventPhase: number;
+    newValue: string;
+    prevValue: string;
+    relatedNode: HTMLElement;
+    screenX: number;
+    screenY: number;
+    shiftKey: boolean;
+    view: any;
+}
+
+declare var m$: MQuery;
+declare class CalloutActionOptions {
+    /** Text for the action link */
+    text: string;
+    tooltip: string;
+    disabledTooltip: string;
+    /** Callback that is executed when the action link is clicked.
+        @param event Standard javascript event object
+        @param action The action object */
+    onClickCallback: (event: Event, action: CalloutAction) => any;
+    /** Callback which returns if the action link is enabled */
+    isEnabledCallback: (action: CalloutAction) => boolean;
+    /** Callback which returns if the action link is visible */
+    isVisibleCallback: (action: CalloutAction) => boolean;
+    /** Submenu entries for the action. If defined, the action link click will popup the specified menu. */
+    menuEntries: CalloutActionMenuEntry[];
+}
+
+/** Defines a callout action menu entry */
+declare class CalloutActionMenuEntry {
+    /** Creates a callout action menu entry
+        @param text Text to be displayed as the menu item text
+        @param onClickCallback Callback that will be fired when the item is clicked
+        @param wzISrc Url of the icon
+        @param wzIAlt Alternative text for the icon image
+        @param wzISeq Sequence for the menu item
+        @param wzDesc Description of the menu item */
+    constructor(
+        text: string,
+        onClickCallback: (actionMenuEntry: CalloutActionMenuEntry, actionMenuEntryIndex: number) => void,
+        wzISrc: string,
+        wzIAlt: string,
+        wzISeq: number,
+        wzDesc: string);
+}
+
+
+declare class CalloutActionMenu {
+    constructor(actionsId: any);
+    addAction(action: CalloutAction): void;
+    getActions(): CalloutAction[];
+    render(): void;
+    refreshActions(): void;
+    calculateActionWidth(): void;
+}
+
+
+declare class CalloutAction {
+    constructor(options: CalloutActionOptions);
+    getText(): string;
+    getToolTop(): string;
+    getDisabledToolTip(): string;
+    getOnClickCallback(event: any, action: CalloutAction): any;
+    getIsDisabledCallback(action: CalloutAction): boolean;
+    getIsVisibleCallback(action: CalloutAction): boolean;
+    getIsMenu(): boolean;
+    getMenuEntries(): CalloutActionMenuEntry[];
+    render(): void;
+    isEnabled(): boolean;
+    isVisible(): boolean;
+    set(options: CalloutActionOptions): void;
+}
+
+declare class Callout {
+    /** Sets options for the callout. Not all options can be changed for the callout after its creation. */
+    set(options: CalloutOptions): any;
+    /** Adds event handler to the callout.
+        @param eventName one of the following: "opened", "opening", "closing", "closed" */
+    addEventCallback(eventName: string, callback: (callout: Callout) => void): void;
+    /** Returns the launch point element of the callout. */
+    getLaunchPoint(): HTMLElement;
+    /** Returns the ID of the callout. */
+    getID(): string;
+    /** Returns the title of the callout. */
+    getTitle(): string;
+    /** Returns the contents of the callout. */
+    getContent(): string;
+    /** Returns the content element of the callout. */
+    getContentElement(): HTMLElement;
+    /** Returns the bounding element defined for the callout during its creation. */
+    getBoundingBox(): HTMLElement;
+    /** Returns the content width defined for the callout during its creation. */
+    getContentWidth(): number;
+    /** Returns the object that represents open behaivor defined for the callout during its creation. */
+    getOpenOptions(): CalloutOpenOptions;
+    /** Returns the beak orientation defined for the callout during its creation. */
+    getBeakOrientation(): string;
+    /** Returns the position algorithm function defined for the callout during its creation. */
+    getPositionAlgorithm(): any;
+    /** Specifies wherever callout is in "Opened" state */
+    isOpen(): boolean;
+    /** Specifies wherever callout is in "Opening" state */
+    isOpening(): boolean;
+    /** Specifies wherever callout is in "Opened" or "Opening" state */
+    isOpenOrOpening(): boolean;
+    /** Specifies wherever callout is in "Closing" state */
+    isClosing(): boolean;
+    /** Specifies wherever callout is in "Closed" state */
+    isClosed(): boolean;
+    /** Returns the callout actions menu */
+    getActionMenu(): CalloutActionMenu;
+    /** Adds a link to the actions panel in the bottom part of the callout window */
+    addAction(action: CalloutAction): void;
+    /** Re-renders the actions menu. Call after the actions menu is changed. */
+    refreshActions(): void;
+    /** Display the callout. Animation can be used only for IE9+ */
+    open(useAnimation: boolean): void;
+    /** Hide the callout. Animation can be used only for IE9+ */
+    close(useAnimation: boolean): void;
+    /** Display if hidden, hide if shown. */
+    toggle(): void;
+    /** Do not call this directly. Instead, use CalloutManager.remove */
+    destroy(): void;
+}
+
+declare class CalloutOpenOptions {
+    /** HTML event name, e.g. "click" */
+    event: string;
+    /** Callout will be closed on blur */
+    closeCalloutOnBlur: boolean;
+    /** Close button will be shown within the callout window */
+    showCloseButton: boolean;
+}
+
+declare class CalloutOptions {
+    /** Some unique id for the callout. */
+    ID: string;
+    /** Element on that the callout is shown. */
+    launchPoint: HTMLElement;
+    /** One of the following: "topBottom" (default) or "leftRight". */
+    beakOrientation: string;
+    /** String (HTML allowed) that represents contents of the callout window. */
+    content: string;
+    /** Title for the callout */
+    title: string;
+    /** HTML element that represents contents of the callout window. */
+    contentElement: HTMLElement;
+    /** If defined, callout will be inscribed into the bounding element. */
+    boundingBox: HTMLElement;
+    /** Content element's width in pixels. By default = 350. */
+    contentWidth: number;
+    /** Defines opening behavior */
+    openOptions: CalloutOpenOptions;
+    /** Fires after the callout is rendered but before it is positioned and shown */
+    onOpeningCallback: (callout: Callout) => void;
+    /** Fires right after the callout is shown */
+    onOpenedCallback: (callout: Callout) => void;
+    /** Fires right before the callout is closed */
+    onClosingCallback: (callout: Callout) => void;
+    /** Fires right after the callout is closed */
+    onClosedCallback: (callout: Callout) => void;
+    /** Sets the position of the callout during its opening phase. For an example of a position algorithm function, please explore defaultPositionAlgorithm function from the callout.debug.js file */
+    positionAlgorithm: (callout: Callout) => void;
+}
+
+
+declare class CalloutManager {
+    /** Creates a new callout */
+    static createNew(options: CalloutOptions): Callout;
+    /** Checks if callout with specified ID already exists. If it doesn't, creates it, otherwise returns the existing one. */
+    static createNewIfNecessary(options: CalloutOptions): Callout;
+    /** Detaches callout from the launch point and destroys it. */
+    static remove(callout: Callout): void;
+    /** Searches for a callout associated with the specified launch point. Throws error if not found. */
+    static getFromLaunchPoint(launchPoint: HTMLElement): Callout;
+    /** Searches for a callout associated with the specified launch point. Returns null if not found. */
+    static getFromLaunchPointIfExists(launchPoint: HTMLElement): Callout;
+    /** Gets the first launch point within the specified ancestor element, and returns true if the associated with it callout is opened or opening.
+        If the launch point is not found or the callout is hidden, returns false. */
+    static containsOneCalloutOpen(ancestor: HTMLElement): boolean;
+    /** Finds the closest launch point based on the specified descendant element, and returns callout associated with the launch point. */
+    static getFromCalloutDescendant(descendant: HTMLElement): Callout;
+    /** Perform some action for each callout on the page. */
+    static forEach(callback: (callout: Callout) => void): void;
+    /** Closes all callouts on the page */
+    static closeAll(): boolean;
+    /** Returns true if at least one of the defined on page callouts is opened. */
+    static isAtLeastOneCalloutOpen(): boolean;
+    /** Returns true if at least one of the defined on page callouts is opened or opening. */
+    static isAtLeastOneCalloutOn(): boolean;
+}
+
+
+declare namespace SPClientTemplates {
+
+    export enum FileSystemObjectType {
+        Invalid,
+        File,
+        Folder,
+        Web
+    }
+    export enum ChoiceFormatType {
+        Dropdown,
+        Radio
+    }
+
+    export enum ClientControlMode {
+        Invalid,
+        DisplayForm,
+        EditForm,
+        NewForm,
+        View
+    }
+
+    export enum RichTextMode {
+        Compatible,
+        FullHtml,
+        HtmlAsXml,
+        ThemeHtml
+    }
+    export enum UrlFormatType {
+        Hyperlink,
+        Image
+    }
+
+    export enum DateTimeDisplayFormat {
+        DateOnly,
+        DateTime,
+        TimeOnly
+    }
+
+    export enum DateTimeCalendarType {
+        None,
+        Gregorian,
+        Japan,
+        Taiwan,
+        Korea,
+        Hijri,
+        Thai,
+        Hebrew,
+        GregorianMEFrench,
+        GregorianArabic,
+        GregorianXLITEnglish,
+        GregorianXLITFrench,
+        KoreaJapanLunar,
+        ChineseLunar,
+        SakaEra,
+        UmAlQura
+    }
+    export enum UserSelectionMode {
+        PeopleOnly,
+        PeopleAndGroups
+    }
+
+    /** Represents schema for a Choice field in list form or in list view in grid mode */
+    export interface FieldSchema_InForm_Choice extends FieldSchema_InForm {
+        /** List of choices for this field. */
+        Choices: string[];
+        /** Display format for the choice field */
+        FormatType: ChoiceFormatType;
+    }
+    /** Represents schema for a Lookup field in list form or in list view in grid mode */
+    export interface FieldSchema_InForm_Lookup extends FieldSchema_InForm {
+        /** Specifies if the field allows multiple values */
+        AllowMultipleValues: boolean;
+        /** Returns base url for a list display form, e.g. "http://portal/web/_layouts/15/listform.aspx?PageType=4"
+            You must add "ListId" (Guid of the list) and "ID" (integer Id of the item) parameters in order to use this Url */
+        BaseDisplayFormUrl: string;
+        /** Indicates if the field is a dependent lookup */
+        DependentLookup: boolean;
+        /** Indicates wherever the lookup list is throttled (contains more items than value of the "List Throttle Limit" setting). */
+        Throttled: boolean;
+        /** Returns string representation of a number that represents the current value for the "List Throttle Limit" web application setting.
+            Only appears if Throttled property is true, i.e. the target lookup list is throttled. */
+        MaxQueryResult: string;
+        /** List of choices for this field. */
+        Choices: { LookupId: number; LookupValue: string; }[];
+        /** Number of choices. Appears only for Lookup field. */
+        ChoiceCount: number;
+
+        LookupListId: string;
+
+    }
+    /** Represents schema for a DateTime field in list form or in list view in grid mode */
+    export interface FieldSchema_InForm_DateTime extends FieldSchema_InForm {
+        /** Type of calendar to use */
+        CalendarType: DateTimeCalendarType;
+        /** Display format for DateTime field. */
+        DisplayFormat: DateTimeDisplayFormat;
+        /** Indicates wherever current user regional settings specify to display week numbers in day or week views of a calendar.
+            Only appears for DateTime fields. */
+        ShowWeekNumber: boolean;
+        TimeSeparator: string;
+        TimeZoneDifference: string;
+        FirstDayOfWeek: number;
+        FirstWeekOfYear: number;
+        HijriAdjustment: number;
+        WorkWeek: string;
+        LocaleId: string;
+        LanguageId: string;
+        MinJDay: number;
+        MaxJDay: number;
+        HoursMode24: boolean;
+        HoursOptions: string[];
+    }
+    /** Represents schema for a DateTime field in list form or in list view in grid mode */
+    export interface FieldSchema_InForm_Geolocation extends FieldSchema_InForm {
+        BingMapsKey: string;
+        IsBingMapBlockedInCurrentRegion: boolean;
+    }
+    /** Represents schema for a Choice field in list form or in list view in grid mode */
+    export interface FieldSchema_InForm_MultiChoice extends FieldSchema_InForm {
+        /** List of choices for this field. */
+        MultiChoices: string[];
+        /** Indicates wherever fill-in choice is allowed */
+        FillInChoice: boolean;
+    }
+    /** Represents schema for a Choice field in list form or in list view in grid mode */
+    export interface FieldSchema_InForm_MultiLineText extends FieldSchema_InForm {
+        /** Specifies whether rich text formatting can be used in the field */
+        RichText: boolean;
+        /** Changes are appended to the existing text. */
+        AppendOnly: boolean;
+        /** Rich text mode for the field */
+        RichTextMode: RichTextMode;
+        /** Number of lines configured to display */
+        NumberOfLines: number;
+        /** A boolean value that specifies whether hyperlinks can be used in this fields. */
+        AllowHyperlink: boolean;
+        /** WebPartAdderId for the ScriptEditorWebPart */
+        ScriptEditorAdderId: string;
+    }
+    /** Represents schema for a Number field in list form or in list view in grid mode */
+    export interface FieldSchema_InForm_Number extends FieldSchema_InForm {
+        ShowAsPercentage: boolean;
+    }
+    /** Represents schema for a Number field in list form or in list view in grid mode */
+    export interface FieldSchema_InForm_Text extends FieldSchema_InForm {
+        MaxLength: number;
+    }
+    /** Represents schema for a Number field in list form or in list view in grid mode */
+    export interface FieldSchema_InForm_Url extends FieldSchema_InForm {
+        DisplayFormat: UrlFormatType;
+    }
+    /** Represents schema for a Number field in list form or in list view in grid mode */
+    export interface FieldSchema_InForm_User extends FieldSchema_InForm {
+        Presence: boolean;
+        WithPicture: boolean;
+        DefaultRender: boolean;
+        WithPictureDetail: boolean;
+        /** Server relative Url for ~site/_layouts/listform.aspx */
+        ListFormUrl: string;
+        /** Server relative Url for ~site/_layouts/userdisp.aspx */
+        UserDisplayUrl: string;
+        EntitySeparator: string;
+        PictureOnly: boolean;
+        PictureSize: string;
+    }
+
+    export interface FieldSchema {
+        /** Specifies if the field can be edited while list view is in the Grid mode */
+        AllowGridEditing: boolean;
+        /** String representation of the field type, e.g. "Lookup". Same as SPField.TypeAsString */
+        FieldType: string;
+        /** Internal name of the field */
+        Name: string;
+        /** For OOTB fields, returns the type of field. For "UserMulti" returns "User", for "LookupMulti" returns "Lookup".
+            For custom field types, returns base type of the field. */
+        Type: string;
+    }
+
+    /** Represents field schema in Grid mode and on list forms.
+            Consider casting objects of this type to more specific field types, e.g. FieldSchemaInForm_Lookup */
+    export interface FieldSchema_InForm extends FieldSchema {
+        /** Description for this field. */
+        Description: string;
+        /** Direction of the reading order for the field. */
+        Direction: string;
+        /** Indicates whether the field is hidden */
+        Hidden: boolean;
+        /** Guid of the field */
+        Id: string;
+        /** Specifies Input Method Editor (IME) mode bias to use for the field.
+            The IME enables conversion of keystrokes between languages when one writing system has more characters than can be encoded for the given keyboard. */
+        IMEMode: any;
+        /** Specifies if the field is read only */
+        ReadOnlyField: boolean;
+        /** Specifies wherever field requires values */
+        Required: boolean;
+        RestrictedMode: boolean;
+        /** Title of the field */
+        Title: string;
+        /** If SPFarm.Local.UseMinWidthForHtmlPicker is true, UseMinWidth will be set to true. Undefined in other cases. */
+        UseMinWidth: boolean;
+    }
+
+    export interface ListSchema {
+        Field: FieldSchema[];
+    }
+
+
+    export interface ListSchema_InForm extends ListSchema {
+        Field: FieldSchema_InForm[];
+    }
+    export interface ListData_InForm {
+        Items: Item[];
+    }
+    export interface RenderContext_FieldInForm extends RenderContext_Form {
+        CurrentGroupIdx: number;
+        CurrentGroup: Group;
+        CurrentItems: Item[];
+        CurrentFieldSchema: FieldSchema_InForm;
+        CurrentFieldValue: any;
+    }
+    export interface RenderContext_Form extends RenderContext {
+        CurrentItem: Item;
+        FieldControlModes: { [fieldInternalName: string]: ClientControlMode; };
+        FormContext: ClientFormContext;
+        FormUniqueId: string;
+        ListData: ListData_InForm;
+        ListSchema: ListSchema_InForm;
+        CSRCustomLayout?: boolean;
+    }
+
+
+
+    export interface FieldSchema_InView_LookupField extends FieldSchema_InView {
+        /** Either "TRUE" or "FALSE" */
+        AllowMultipleValues: string;
+        /** Target lookup list display form URL, including PageType and List attributes. */
+        DispFormUrl: string;
+        /** Either "TRUE" or "FALSE" */
+        HasPrefix: string;
+    }
+    export interface FieldSchema_InView_UserField extends FieldSchema_InView {
+        /** Either "TRUE" or "FALSE" */
+        AllowMultipleValues: string;
+        /** Either "TRUE" or "FALSE" */
+        ImnHeader: string;
+        /** Either "TRUE" or "FALSE" */
+        HasPrefix: string;
+        /** Either "1" or "0" */
+        HasUserLink: string;
+        /** Either "1" or "0" */
+        DefaultRender: string;
+    }
+    /** Represents field schema in a list view. */
+    export interface FieldSchema_InView extends FieldSchema {
+        /** Either "TRUE" or "FALSE" */
+        CalloutMenu: string;
+        ClassInfo: string; // e.g. "Menu"
+        css: string;
+        DisplayName: string;
+        /** Either "TRUE" or "FALSE" */
+        Explicit: string;
+        fieldRenderer: any;
+        FieldTitle: string;
+        /** Indicates whether the field can be filtered. Either "TRUE" or "FALSE" */
+        Filterable: string;
+        /** Set to "TRUE" for fields that comply to the following Xpath query:
+            ViewFields/FieldRef[@Explicit='TRUE'] | Query/GroupBy/FieldRef[not(@Name=ViewFields/FieldRef/@Name)] */
+        GroupField: string;
+        /** Either "TRUE" or "FALSE" */
+        GridActiveAndReadOnly: string;
+        /** Guid of the field */
+        ID: string;
+        /** Specifies if the field contains list item menu.
+            Corresponds to ViewFields/FieldRef/@ListItemMenu attribute. Either "TRUE" or "FALSE" and might be missing. */
+        listItemMenu: string;
+        RealFieldName: string;
+        /** Either "TRUE" or "FALSE" */
+        ReadOnly: string;
+        ResultType: string;
+        /** Indicates whether the field can be sorted. Either "TRUE" or "FALSE" */
+        Sortable: string;
+    }
+    export interface ListSchema_InView extends ListSchema {
+        /** Key-value object that represents all aggregations defined for the view.
+            Key specifies the field internal name, and value specifies the type of the aggregation. */
+        Aggregate: { [name: string]: string; };
+        /** Either "TRUE" or false (for grouping) */
+        Collapse: string;
+        /** Specifies whether to open items in a client application ("1") or in browser ("0"). */
+        DefaultItemOpen: string;
+        Direction: string;
+        /** Either "0" or "1" */
+        EffectivePresenceEnabled: string;
+        /** If in grid mode (context.inGridMode == true), cast to FieldSchema_InForm[], otherwise cast to FieldSchema_InView[] */
+        FieldSortParam: string;
+        Filter: any;
+        /** Either "0" or "1" */
+        ForceCheckout: string;
+        /** Internal name for the first group by field, if any */
+        group1: string;
+        /** Internal name for the second group by field, if any */
+        group2: string;
+        /** "1" if the view contains "Title" field, otherwise not defined. */
+        HasTitle: string;
+        HttpVDir: string;
+        /** Either "0" or "1" */
+        InplaceSearchEnabled: string;
+        /** Either "0" or "1" */
+        IsDocLib: string;
+        /** e.g. "1033" */
+        LCID: string;
+        /** Either "0" or "1" */
+        ListRight_AddListItems: string;
+        NoListItem: string;
+        NoListItemHowTo: string;
+        /** Server-relative path to the current page */
+        PagePath: string;
+        /** Internal name of the field inside which the hierarchy buttons are displayed */
+        ParentHierarchyDisplayField: string;
+        PresenceAlt: string;
+        /** Represents SPList.RootFolder.Properties. Exists only if SPList.FetchPropertyBagForListView property is set to true. */
+        PropertyBag: { [key: string]: string; };
+        /** Either "True" or "False" */
+        RenderSaveAsNewViewButton: string;
+        /** Either "True" or "False" */
+        RenderViewSelectorPivotMenu: string;
+        /** Either "True" or "False" */
+        RenderViewSelectorPivotMenuAsync: string;
+        /** Query string parameters that specify GUID of the current view and the current root folder */
+        RootFolderParam: string;
+        SelectedID: string; // number
+        ShowWebPart: string;
+        /** Either "1" or undefined. */
+        StrikeThroughOnCompletedEnabled: string;
+        /** Either "0" or "1" */
+        TabularView: string;
+        Toolbar: string;
+        UIVersion: string; // number
+        Userid: string; // number
+        UserVanilla: any;
+        /** Server relative path to "/_layouts/userdisp.aspx" in the current web */
+        UserDispUrl: string;
+        /** Either "1" or "" */
+        UseParentHierarchy: string;
+        /** Guid of the view */
+        View: string;
+        /** JSON string */
+        ViewSelectorPivotMenuOptions: string;
+        /** Query string parameters that specify current root folder (RootFolder) and folder content type id (FolderCTID) */
+        ViewSelector_ViewParameters: string;
+    }
+    export interface ListData_InView {
+        FilterLink: string;
+        FilterFields: string;
+        FirstRow: number;
+        /** Either "0" or "1" */
+        ForceNoHierarchy: string;
+        HierarchyHasIndention: string;
+        /** Link to the previous page (not defined if not available) */
+        PrevHref: string;
+        /** Link to the next page  (not defined if not available) */
+        NextHref: string;
+        SortField: string;
+        SortDir: string;
+        LastRow: number;
+        Row: Item[];
+    }
+    export interface RenderContext_GroupInView extends RenderContext_InView {
+        CurrentGroupIdx: number;
+        CurrentGroup: Group;
+        CurrentItems: Item[];
+    }
+    export interface RenderContext_InView extends RenderContext {
+        AllowCreateFolder: boolean;
+        AllowGridMode: boolean;
+        BasePermissions: { [PermissionName: string]: boolean; }; // SP.BasePermissions?
+        bInitialRender: boolean;
+        CanShareLinkForNewDocument: boolean;
+        CascadeDeleteWarningMessage: string;
+        clvp: HTMLElement; // not in View
+        ContentTypesEnabled: boolean;
+        ctxId: number;
+        ctxType: any; // not in View
+        CurrentUserId: number;
+        CurrentUserIsSiteAdmin: boolean;
+        dictSel: any;
+        /** Absolute path for the list display form */
+        displayFormUrl: string;
+        /** Absolute path for the list edit form */
+        editFormUrl: string;
+        EnableMinorVersions: boolean;
+        ExternalDataList: boolean;
+        enteringGridMode: boolean;
+        existingServerFilterHash: any;
+        HasRelatedCascadeLists: number;
+        heroId: string; // e.g. "idHomePageNewItem"
+        HttpPath: string;
+        HttpRoot: string;
+        imagesPath: string;
+        inGridFullRender: any; // not in View
+        inGridMode: boolean;
+        IsAppWeb: boolean;
+        IsClientRendering: boolean;
+        isForceCheckout: boolean;
+        isModerated: boolean;
+        isPortalTemplate: any;
+        isWebEditorPreview: number;
+        isVersions: number;
+        isXslView: boolean;
+        LastRowIndexSelected: any; // not in View
+        LastSelectableRowIdx: any;
+        LastSelectedItemId: any; // not in View
+        leavingGridMode: boolean;
+        listBaseType: number;
+        ListData: ListData_InView;
+        ListDataJSONItemsKey: string; // ="Row"
+        /** Guid of the list */
+        listName: string;
+        ListSchema: ListSchema_InView;
+        listTemplate: string;
+        ListTitle: string;
+        listUrlDir: string;
+        loadingAsyncData: boolean;
+        ModerationStatus: number;
+        NavigateForFormsPages: boolean;
+        /** Absolute path for the list new form */
+        newFormUrl: string;
+        NewWOPIDocumentEnabled: any;
+        NewWOPIDocumentUrl: any;
+        noGroupCollapse: boolean;
+        OfficialFileName: string;
+        OfficialFileNames: string;
+        overrideDeleteConfirmation: string; // not in View
+        overrideFilterQstring: string; // not in View
+        PortalUrl: string;
+        queryString: any;
+        recursiveView: boolean;
+        /** either 1 or 0 */
+        RecycleBinEnabled: number;
+        RegionalSettingsTimeZoneBias: string;
+        rootFolder: string;
+        rootFolderForDisplay: any;
+        RowFocusTimerID: any;
+        SelectAllCbx: any;
+        SendToLocationName: string;
+        SendToLocationUrl: string;
+        serverUrl: any;
+        SiteTitle: string;
+        StateInitDone: boolean;
+        TableCbxFocusHandler: any;
+        TableMouseOverHandler: any;
+        TotalListItems: number;
+        verEnabled: number;
+        /** Guid of the view. */
+        view: string;
+        viewTitle: string;
+        WorkflowAssociated: boolean;
+        wpq: string;
+        WriteSecurity: string;
+    }
+    export interface RenderContext_ItemInView extends RenderContext_InView {
+        CurrentItem: Item;
+        CurrentItemIdx: number;
+    }
+    export interface RenderContext_FieldInView extends RenderContext_ItemInView {
+        /** If in grid mode (context.inGridMode == true), cast to FieldSchema_InForm, otherwise cast to FieldSchema_InView */
+        CurrentFieldSchema: FieldSchema_InForm | FieldSchema_InView;
+        CurrentFieldValue: any;
+        FieldControlsModes: { [fieldInternalName: string]: ClientControlMode; };
+        FormContext: ClientFormContext;
+        FormUniqueId: string;
+    }
+
+    export interface Item {
+        [fieldInternalName: string]: any;
+    }
+    export interface Group {
+        Items: Item[];
+    }
+    type RenderCallback = (ctx: RenderContext) => void;
+
+    export interface RenderContext {
+        BaseViewID?: number;
+        ControlMode?: ClientControlMode;
+        CurrentCultureName?: string;
+        CurrentLanguage?: number;
+        CurrentSelectedItems?: any;
+        CurrentUICultureName?: string;
+        ListTemplateType?: number;
+        OnPostRender?: RenderCallback | RenderCallback[];
+        OnPreRender?: RenderCallback | RenderCallback[];
+        onRefreshFailed?: any;
+        RenderBody?: (renderContext: RenderContext) => string;
+        RenderFieldByName?: (renderContext: RenderContext, fieldName: string) => string;
+        RenderFields?: (renderContext: RenderContext) => string;
+        RenderFooter?: (renderContext: RenderContext) => string;
+        RenderGroups?: (renderContext: RenderContext) => string;
+        RenderHeader?: (renderContext: RenderContext) => string;
+        RenderItems?: (renderContext: RenderContext) => string;
+        RenderView?: (renderContext: RenderContext) => string;
+        SiteClientTag?: string;
+        Templates?: Templates;
+    }
+
+    export interface SingleTemplateCallback {
+        /** Must return null in order to fall back to a more common template or to a system default template */
+        (renderContext: RenderContext_InView): string;
+    }
+    export interface GroupCallback {
+        /** Must return null in order to fall back to a more common template or to a system default template */
+        (renderContext: RenderContext_GroupInView): string;
+    }
+    export interface ItemCallback {
+        /** Must return null in order to fall back to a more common template or to a system default template */
+        (renderContext: RenderContext): string;
+    }
+
+    export interface FieldCallback {
+        /** Must return null in order to fall back to a more common template or to a system default template */
+        (renderContext: RenderContext): string;
+    }
+
+    export interface FieldInFormCallback {
+        /** Must return null in order to fall back to a more common template or to a system default template */
+        (renderContext: RenderContext_FieldInForm): string;
+    }
+    export interface FieldInViewCallback {
+        /** Must return null in order to fall back to a more common template or to a system default template */
+        (renderContext: RenderContext_FieldInView): string;
+    }
+
+    export interface FieldTemplateOverrides {
+        /** Defines templates for rendering the field on a display form. */
+        DisplayForm?: FieldInFormCallback;
+        /** Defines templates for rendering the field on an edit form. */
+        EditForm?: FieldInFormCallback;
+        /** Defines templates for rendering the field on a new form. */
+        NewForm?: FieldInFormCallback;
+        /** Defines templates for rendering the field on a list view. */
+        View?: FieldInViewCallback;
+    }
+
+    export interface FieldTemplates {
+        [fieldInternalName: string]: FieldCallback;
+    }
+
+    export interface Templates {
+        View?: RenderCallback | string; // TODO: determine appropriate context type and purpose of this template
+        Body?: RenderCallback | string; // TODO: determine appropriate context type and purpose of this template
+        /** Defines templates for rendering groups (aggregations). */
+        Group?: GroupCallback | string;
+        /** Defines templates for list items rendering. */
+        Item?: ItemCallback | string;
+        /** Defines template for rendering list view header.
+            Can be either string or SingleTemplateCallback */
+        Header?: SingleTemplateCallback | string;
+        /** Defines template for rendering list view footer.
+            Can be either string or SingleTemplateCallback */
+        Footer?: SingleTemplateCallback | string;
+        /** Defines templates for fields rendering. The field is specified by it's internal name. */
+        Fields?: FieldTemplates;
+    }
+
+    export interface FieldTemplateMap {
+        [fieldInternalName: string]: FieldTemplateOverrides;
+    }
+
+    export interface TemplateOverrides {
+        View?: RenderCallback | string; // TODO: determine appropriate context type and purpose of this template
+        Body?: RenderCallback | string; // TODO: determine appropriate context type and purpose of this template
+        /** Defines templates for rendering groups (aggregations). */
+        Group?: GroupCallback | string;
+        /** Defines templates for list items rendering. */
+        Item?: ItemCallback | string;
+        /** Defines template for rendering list view header.
+            Can be either string or SingleTemplateCallback */
+        Header?: SingleTemplateCallback | string;
+        /** Defines template for rendering list view footer.
+            Can be either string or SingleTemplateCallback */
+        Footer?: SingleTemplateCallback | string;
+        /** Defines templates for fields rendering. The field is specified by it's internal name. */
+        Fields?: FieldTemplateMap;
+    }
+    export interface TemplateOverridesOptions {
+        /** Template overrides */
+        Templates?: TemplateOverrides;
+
+        /** �allbacks called before rendering starts. Can be function (ctx: RenderContext) => void or array of functions.*/
+        OnPreRender?: RenderCallback | RenderCallback[];
+
+        /** �allbacks called after rendered html inserted into DOM. Can be function (ctx: RenderContext) => void or array of functions.*/
+        OnPostRender?: RenderCallback | RenderCallback[];
+
+        /** View style (SPView.StyleID) for which the templates should be applied.
+            If not defined, the templates will be applied only to default view style. */
+        ViewStyle?: number;
+        /** List template type (SPList.BaseTemplate) for which the template should be applied.
+            If not defined, the templates will be applied to all lists. */
+        ListTemplateType?: number;
+        /** Base view ID (SPView.BaseViewID) for which the template should be applied.
+            If not defined, the templates will be applied to all views. */
+        BaseViewID?: number | string;
+    }
+    export class TemplateManager {
+        static RegisterTemplateOverrides(renderCtx: TemplateOverridesOptions): void;
+        static GetTemplates(renderCtx: RenderContext): Templates;
+    }
+
+    export interface ClientUserValue {
+        lookupId: number;
+        lookupValue: string;
+        displayStr: string;
+        email: string;
+        sip: string;
+        title: string;
+        picture: string;
+        department: string;
+        jobTitle: string;
+    }
+    export interface ClientLookupValue {
+        LookupId: number;
+        LookupValue: string;
+    }
+    export interface ClientUrlValue {
+        URL: string;
+        Description: string;
+    }
+    export class Utility {
+        static ComputeRegisterTypeInfo(renderCtx: TemplateOverridesOptions): any;
+        static ControlModeToString(mode: SPClientTemplates.ClientControlMode): string;
+        static FileSystemObjectTypeToString(fileSystemObjectType: SPClientTemplates.FileSystemObjectType): string;
+        static ChoiceFormatTypeToString(fileSystemObjectType: SPClientTemplates.ChoiceFormatType): string;
+        static RichTextModeToString(fileSystemObjectType: SPClientTemplates.RichTextMode): string;
+        static IsValidControlMode(mode: number): boolean;
+        /** Removes leading and trailing spaces */
+        static Trim(str: string): string;
+        /** Creates SP.ClientContext based on the specified Web URL. If the SP.Runtime.js script is not loaded, returns null */
+        static InitContext(webUrl: string): SP.ClientContext;
+        static GetControlOptions(control: HTMLElement): any;
+        static TryParseInitialUserValue(userStr: string): ClientUserValue[];
+        /** Tries to resolve user names from string. Pushes either ClientUserValue (if resolved successfully) or original string (if not) to the resulting array. */
+        static TryParseUserControlValue(userStr: string, separator: string): any[];
+        static GetPropertiesFromPageContextInfo(context: RenderContext): void;
+        /** Replaces tokens "~site/", "~sitecollection/", "~sitecollectionmasterpagegallery", "{lcid}", "{locale}" and "{siteclienttag}" with appropriate context values */
+        static ReplaceUrlTokens(tokenUrl: string): string;
+        static ParseLookupValue(valueStr: string): ClientLookupValue;
+        static ParseMultiLookupValues(valueStr: string): ClientLookupValue[];
+        /** Represents lookup values array in some strange format */
+        static BuildLookupValuesAsString(choiceArray: ClientLookupValue[], isMultiLookup: boolean, setGroupDesc: boolean): string;
+        static ParseURLValue(value: string): ClientUrlValue;
+        static GetFormContextForCurrentField(context: RenderContext_Form): ClientFormContext;
+        /** Returns ";#" */
+        static UserLookupDelimitString: string;
+        /** Returns ";#" */
+        static UserMultiValueDelimitString:string;
+    }
+
+    export class ClientFormContext {
+        fieldValue: any;
+        fieldSchema: SPClientTemplates.FieldSchema_InForm;
+        fieldName: string;
+        controlMode: number;
+        webAttributes: {
+            AllowScriptableWebParts: boolean;
+            CurrentUserId: number;
+            EffectivePresenceEnabled: boolean;
+            LCID: string;
+            PermissionCustomizePages: boolean;
+            WebUrl: string;
+        };
+        itemAttributes: {
+            ExternalListItem: boolean;
+            FsObjType: number;
+            Id: number;
+            Url: string;
+        };
+        listAttributes: {
+            BaseType: number;
+            DefaultItemOpen: number;
+            Direction: string;
+            EnableVesioning: boolean;
+            Id: string;
+        };
+        registerInitCallback(fieldname: string, callback: () => void): void;
+        registerFocusCallback(fieldname: string, callback: () => void): void;
+        registerValidationErrorCallback(fieldname: string, callback: (error: any) => void): void;
+        registerGetValueCallback(fieldname: string, callback: () => any): void;
+        updateControlValue(fieldname: string, value: any): void;
+        registerClientValidator(fieldname: string, validator: SPClientForms.ClientValidation.ValidatorSet): void;
+        registerHasValueChangedCallback(fieldname: string, callback: (eventArg?: any) => void): void;
+    }
+
+}
+
+declare function GenerateIID(renderCtx: SPClientTemplates.RenderContext_ItemInView): string;
+declare function GenerateIIDForListItem(renderCtx: SPClientTemplates.RenderContext_InView, listItem: SPClientTemplates.Item): string;
+
+declare function SPFormControl_AppendValidationErrorMessage(nodeId: string, errorResult: any): void;
+declare function CoreRender(template: any, context: any): string;
+
+declare namespace SPClientForms {
+    namespace ClientValidation {
+        export class ValidationResult {
+            constructor(hasErrors: boolean, errorMsg: string);
+        }
+
+        export class ValidatorSet {
+            public RegisterValidator(validator: IValidator): void;
+        }
+
+        export interface IValidator {
+            Validate(value: any): ValidationResult;
+        }
+
+        export class RequiredValidator implements IValidator {
+            Validate(value: any): ValidationResult;
+        }
+
+        export class RequiredFileValidator implements IValidator {
+            Validate(value: any): ValidationResult;
+        }
+
+        export class RequiredRichTextValidator implements IValidator {
+            Validate(value: any): ValidationResult;
+        }
+
+        export class MaxLengthUrlValidator implements IValidator {
+            Validate(value: any): ValidationResult;
+        }
+
+
+    }
+
+    export enum FormManagerEvents {
+        Event_OnControlValueChanged,//: 1,
+        Event_OnControlInitializedCallback,//: 2,
+        Event_OnControlFocusSetCallback,//: 3,
+        Event_GetControlValueCallback,//: 4,
+        Event_OnControlValidationError,//: 5,
+        Event_RegisterControlValidator,//: 6,
+        Event_GetHasValueChangedCallback//: 7
+    }
+
+    export class ClientForm {
+        constructor(qualifier: string);
+        RenderClientForm(): void;
+        SubmitClientForm(): boolean;
+        NotifyControlEvent(eventName: FormManagerEvents, fldName: string, eventArg: any): void;
+    }
+
+    export class ClientFormManager {
+        static GetClientForm(qualifier: string): ClientForm;
+        static RegisterClientForm(qualifier: string): void;
+        static SubmitClientForm(qualifier: string): boolean;
+    }
+}
+
+declare class SPMgr {
+    NewGroup(listItem: Object, fieldName: string): boolean;
+    RenderHeader(renderCtx: SPClientTemplates.RenderContext, field: SPClientTemplates.FieldSchema): string;
+    RenderField(renderCtx: SPClientTemplates.RenderContext, field: SPClientTemplates.FieldSchema, listItem: Object, listSchema: SPClientTemplates.ListSchema): string;
+    RenderFieldByName(renderCtx: SPClientTemplates.RenderContext, fieldName: string, listItem: Object, listSchema: SPClientTemplates.ListSchema): string;
+}
+
+declare var spMgr: SPMgr;
+
+declare function SPField_FormDisplay_Default(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPField_FormDisplay_DefaultNoEncode(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPField_FormDisplay_Empty(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldText_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldNumber_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldBoolean_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldNote_Display(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldNote_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldFile_Display(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldFile_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldChoice_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldChoice_Dropdown_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldChoice_Radio_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldMultiChoice_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldDateTime_Display(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldDateTime_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldUrl_Display(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldUrl_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldUser_Display(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldUserMulti_Display(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPClientPeoplePickerCSRTemplate(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldLookup_Display(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldLookup_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldLookupMulti_Edit(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+declare function SPFieldAttachments_Default(ctx: SPClientTemplates.RenderContext_FieldInForm): string;
+
+declare namespace SPAnimation {
+    export enum Attribute {
+        PositionX,
+        PositionY,
+        Height,
+        Width,
+        Opacity
+    }
+
+    export enum ID {
+        Basic_Show,
+        Basic_SlowShow,
+        Basic_Fade,
+        Basic_Move,
+        Basic_Size,
+        Content_SlideInFadeInRight,
+        Content_SlideInFadeInRightInc,
+        Content_SlideOutFadeOutRight,
+        Content_SlideInFadeInLeft,
+        Content_SlideInFadeInLeftInc,
+        SmallObject_SlideInFadeInTop,
+        SmallObject_SlideInFadeInLeft,
+        Test_Instant,
+        Test_Hold,
+        Basic_Opacity,
+        Basic_QuickShow,
+        Basic_QuickFade,
+        Content_SlideInFadeInGeneric,
+        Basic_StrikeThrough,
+        SmallObject_SlideInFadeInBottom,
+        SmallObject_SlideOutFadeOutBottom,
+        Basic_QuickSize
+    }
+
+    export class Settings {
+        static DisableAnimation(): void;
+        static DisableSessionAnimation(): void;
+        static IsAnimationEnabled(): boolean;
+    }
+
+
+    export class State {
+        SetAttribute(attributeId: Attribute, value: number): void;
+        GetAttribute(attributeId: Attribute): number;
+        GetDataIndex(attributeId: Attribute): number
+    }
+
+    export class Object {
+        constructor(animationID: ID, delay: number, element: HTMLElement, finalState: State, finishFunc?: (data: any) => void, data?: any);
+        constructor(animationID: ID, delay: number, element: HTMLElement[], finalState: State, finishFunc?: (data: any) => void, data?: any);
+        RunAnimation(): void;
+    }
+}
+
+declare namespace SPAnimationUtility {
+    export class BasicAnimator {
+        static FadeIn(element: HTMLElement, finishFunc?: (data: any) => void, data?: any): void;
+        static FadeOut(element: HTMLElement, finishFunc?: (data: any) => void, data?: any): void;
+        static Move(element: HTMLElement, posX: number, posY: number, finishFunc?: (data: any) => void, data?: any): void;
+        static StrikeThrough(element: HTMLElement, strikeThroughWidth: number, finishFunc?: (data: any) => void, data?: any): void;
+        static Resize(element: HTMLElement, newHeight: number, newWidth: number, finishFunc?: (data: any) => void, data?: any): void;
+        static CommonResize(element: HTMLElement, newHeight: number, newWidth: number, finishFunc: (data: any) => void, data: any, animationId: SPAnimation.ID): void;
+        static QuickResize(element: HTMLElement, newHeight: number, newWidth: number, finishFunc?: (data: any) => void, data?: any): void;
+        static ResizeContainerAndFillContent(element: HTMLElement, newHeight: number, newWidth: number, finishFunc: () => void, fAddToEnd: boolean): void;
+        static GetWindowScrollPosition(): { x: number; y: number; };
+        static GetLeftOffset(element: HTMLElement): number;
+        static GetTopOffset(element: HTMLElement): number;
+        static GetRightOffset(element: HTMLElement): number;
+        static PositionElement(element: HTMLElement, topValue: number, leftValue: number, heightValue: number, widthValue: number): void;
+        static PositionAbsolute(element: HTMLElement): void;
+        static PositionRelative(element: HTMLElement): void;
+        static PositionRelativeExact(element: HTMLElement, topValue: number, leftValue: number, heightValue: number, widthValue: number): void;
+        static PositionAbsoluteExact(element: HTMLElement, topValue: number, leftValue: number, heightValue: number, widthValue: number): void;
+        static IsPositioned(element: HTMLElement): boolean;
+    }
+}
+
+interface IEnumerator<T> {
+    get_current(): T;
+    moveNext(): boolean;
+    reset(): void;
+}
+
+interface IEnumerable<T> {
+    getEnumerator(): IEnumerator<T>;
+}
+
+declare namespace SP {
+    export class ScriptUtility {
+        static isNullOrEmptyString(str: string): boolean;
+        static isNullOrUndefined(obj: any): boolean;
+        static isUndefined(obj: any): boolean;
+        static truncateToInt(n: number): number;
+    }
+    export class Guid {
+        constructor(guidText: string);
+        static get_empty(): SP.Guid;
+        static newGuid(): SP.Guid;
+        static isValid(uuid: string): boolean;
+        toString(): string;
+        toString(format: string): string;
+        equals(uuid: SP.Guid): boolean;
+        toSerialized(): string;
+    }
+    /** Specifies permissions that are used to define user roles. Represents SPBasePermissions class. */
+    export enum PermissionKind {
+        /** Has no permissions on the Web site. Not available through the user interface. */
+        emptyMask,
+        /** View items in lists, documents in document libraries, and view Web discussion comments. */
+        viewListItems,
+        /** Add items to lists, add documents to document libraries, and add Web discussion comments. */
+        addListItems,
+        /** Edit items in lists, edit documents in document libraries, edit Web discussion comments in documents, and customize Web Part Pages in document libraries. */
+        editListItems,
+        /** Delete items from a list, documents from a document library, and Web discussion comments in documents. */
+        deleteListItems,
+        /** Approve a minor version of a list item or document. */
+        approveItems,
+        /** View the source of documents with server-side file handlers. */
+        openItems,
+        /** View past versions of a list item or document. */
+        viewVersions,
+        /** Delete past versions of a list item or document. */
+        deleteVersions,
+        /** Discard or check in a document which is checked out to another user. */
+        cancelCheckout,
+        /** Create, change, and delete personal views of lists. */
+        managePersonalViews,
+        /** Create and delete lists, add or remove columns in a list, and add or remove public views of a list. */
+        manageLists,
+        /** View forms, views, and application pages, and enumerate lists. */
+        viewFormPages,
+        /** Make content of a list or document library retrieveable for anonymous users through SharePoint search. The list permissions in the site do not change.  */
+        anonymousSearchAccessList,
+        /** Allow users to open a Web site, list, or folder to access items inside that container. */
+        open,
+        /** View pages in a Web site. */
+        viewPages,
+        /** Add, change, or delete HTML pages or Web Part Pages, and edit the Web site using a SharePoint Foundation?compatible editor. */
+        addAndCustomizePages,
+        /** Apply a theme or borders to the entire Web site. */
+        applyThemeAndBorder,
+        /** Apply a style sheet (.css file) to the Web site. */
+        applyStyleSheets,
+        /** View reports on Web site usage. */
+        viewUsageData,
+        /** Create a Web site using Self-Service Site Creation. */
+        createSSCSite,
+        /** Create subsites such as team sites, Meeting Workspace sites, and Document Workspace sites.  */
+        manageSubwebs,
+        /** Create a group of users that can be used anywhere within the site collection. */
+        createGroups,
+        /** Create and change permission levels on the Web site and assign permissions to users and groups. */
+        managePermissions,
+        /** Enumerate files and folders in a Web site using Microsoft Office SharePoint Designer 2007 and WebDAV interfaces. */
+        browseDirectories,
+        /** View information about users of the Web site. */
+        browseUserInfo,
+        /** Add or remove personal Web Parts on a Web Part Page. */
+        addDelPrivateWebParts,
+        /** Update Web Parts to display personalized information. */
+        updatePersonalWebParts,
+        /** Grant the ability to perform all administration tasks for the Web site as well as manage content. Activate, deactivate, or edit properties of Web site scoped Features through the object model or through the user interface (UI). When granted on the root Web site of a site collection, activate, deactivate, or edit properties of site collection scoped Features through the object model. To browse to the Site Collection Features page and activate or deactivate site collection scoped Features through the UI, you must be a site collection administrator. */
+        manageWeb,
+        /** Content of lists and document libraries in the Web site will be retrieveable for anonymous users through SharePoint search if the list or document library has AnonymousSearchAccessList set.  */
+        anonymousSearchAccessWebLists,
+        /** Use features that launch client applications; otherwise, users must work on documents locally and upload changes.  */
+        useClientIntegration,
+        /** Use SOAP, WebDAV, or Microsoft Office SharePoint Designer 2007 interfaces to access the Web site. */
+        useRemoteAPIs,
+        /** Manage alerts for all users of the Web site. */
+        manageAlerts,
+        /** Create e-mail alerts. */
+        createAlerts,
+        /** Allows a user to change his or her user information, such as adding a picture. */
+        editMyUserInfo,
+        /** Enumerate permissions on the Web site, list, folder, document, or list item. */
+        enumeratePermissions,
+        /** Has all permissions on the Web site. Not available through the user interface. */
+        fullMask,
+    }
+
+    export class BaseCollection<T> implements IEnumerable<T> {
+        getEnumerator(): IEnumerator<T>;
+        get_count(): number;
+        itemAtIndex(index: number): T;
+        constructor();
+    }
+    export interface IFromJson {
+        fromJson(initValue: any): void;
+        customFromJson(initValue: any): boolean;
+    }
+    export class Base64EncodedByteArray {
+        constructor();
+        constructor(base64Str: string);
+        get_length(): number;
+        toBase64String(): string;
+        append(b: any): void;
+        getByteAt(index: number): any;
+        setByteAt(index: number, b: any): void;
+    }
+    export class ConditionalScopeBase {
+        startScope(): any;
+        startIfTrue(): any;
+        startIfFalse(): any;
+        get_testResult(): boolean;
+        fromJson(initValue: any): void;
+        customFromJson(initValue: any): boolean;
+    }
+    export class ClientObjectPropertyConditionalScope extends SP.ConditionalScopeBase {
+        constructor(clientObject: SP.ClientObject, propertyName: string, comparisonOperator: string, valueToCompare: any);
+        constructor(clientObject: SP.ClientObject, propertyName: string, comparisonOperator: string, valueToCompare: any, allowAllActions: boolean);
+    }
+    //export class ClientResult {
+    //    get_value(): any;
+    //    setValue(value: any): void;
+    //    constructor();
+    //}
+    export class ClientResult<T> {
+        get_value(): T;
+        setValue(value: T): void;
+        constructor();
+    }
+    export class BooleanResult {
+        get_value(): boolean;
+        constructor();
+    }
+    export class CharResult {
+        get_value(): any;
+        constructor();
+    }
+    export class IntResult {
+        get_value(): number;
+        constructor();
+    }
+    export class DoubleResult {
+        get_value(): number;
+        constructor();
+    }
+    export class StringResult {
+        get_value(): string;
+        constructor();
+    }
+    export class DateTimeResult {
+        get_value(): Date;
+        constructor();
+    }
+    export class GuidResult {
+        get_value(): SP.Guid;
+        constructor();
+    }
+    export class JsonObjectResult {
+        get_value(): any;
+        constructor();
+    }
+    export class ClientDictionaryResultHandler<T> {
+        constructor(dict: SP.ClientResult<T>);
+    }
+    export class ClientUtility {
+        static urlPathEncodeForXmlHttpRequest(url: string): string;
+        static getOrCreateObjectPathForConstructor(context: SP.ClientRuntimeContext, typeId: string, args: any[]): SP.ObjectPath;
+    }
+    export class XElement {
+        get_name(): string;
+        set_name(value: string): void;
+        get_attributes(): any;
+        set_attributes(value: any): void;
+        get_children(): any;
+        set_children(value: any): void;
+        constructor();
+    }
+    export class ClientXElement {
+        get_element(): SP.XElement;
+        set_element(value: SP.XElement): void;
+        constructor();
+    }
+    export class ClientXDocument {
+        get_root(): SP.XElement;
+        set_root(value: SP.XElement): void;
+        constructor();
+    }
+    export class DataConvert {
+        static writePropertiesToXml(writer: SP.XmlWriter, obj: any, propNames: string[], serializationContext: SP.SerializationContext): void;
+        static populateDictionaryFromObject(dict: any, parentNode: any): void;
+        static fixupTypes(context: SP.ClientRuntimeContext, dict: any): void;
+        static populateArray(context: SP.ClientRuntimeContext, dest: any, jsonArrayFromServer: any): void;
+        static fixupType(context: SP.ClientRuntimeContext, obj: any): any;
+        static writeDictionaryToXml(writer: SP.XmlWriter, dict: any, topLevelElementTagName: string, keys: any, serializationContext: SP.SerializationContext): void;
+        static writeValueToXmlElement(writer: SP.XmlWriter, objValue: any, serializationContext: SP.SerializationContext): void;
+        static invokeSetProperty(obj: any, propName: string, propValue: any): void;
+        static invokeGetProperty(obj: any, propName: string): any;
+        static specifyDateTimeKind(datetime: Date, kind: SP.DateTimeKind): void;
+        static getDateTimeKind(datetime: Date): SP.DateTimeKind;
+        static createUnspecifiedDateTime(year: number, month: number, day: number, hour: number, minute: number, second: number, milliseconds: number): Date;
+        static createUtcDateTime(milliseconds: number): Date;
+        static createLocalDateTime(milliseconds: number): Date;
+    }
+    export interface IWebRequestExecutorFactory {
+        createWebRequestExecutor(): Sys.Net.WebRequestExecutor;
+    }
+    export class PageRequestFailedEventArgs extends Sys.EventArgs {
+        get_executor(): Sys.Net.WebRequestExecutor;
+        get_errorMessage(): string;
+        get_isErrorPage(): boolean;
+    }
+    export class PageRequestSucceededEventArgs extends Sys.EventArgs {
+        get_executor(): Sys.Net.WebRequestExecutor;
+    }
+    export class PageRequest {
+        get_request(): Sys.Net.WebRequest;
+        get_url(): string;
+        set_url(value: string): void;
+        get_expectedContentType(): string;
+        set_expectedContentType(value: string): void;
+        post(body: string): void;
+        get(): void;
+        static doPost(url: string, body: string, expectedContentType: string, succeededHandler: (sender: any, args: SP.PageRequestSucceededEventArgs) => void, failedHandler: (sender: any, args: SP.PageRequestFailedEventArgs) => void): void;
+        static doGet(url: string, expectedContentType: string, succeededHandler: (sender: any, args: SP.PageRequestSucceededEventArgs) => void, failedHandler: (sender: any, args: SP.PageRequestFailedEventArgs) => void): void;
+        add_succeeded(value: (sender: any, args: SP.PageRequestSucceededEventArgs) => void): void;
+        remove_succeeded(value: (sender: any, args: SP.PageRequestSucceededEventArgs) => void): void;
+        add_failed(value: (sender: any, args: SP.PageRequestFailedEventArgs) => void): void;
+        remove_failed(value: (sender: any, args: SP.PageRequestFailedEventArgs) => void): void;
+        constructor();
+    }
+    export class ResResources {
+        static getString(resourceId: string, args: any[]): string;
+    }
+    /** Defines a writer that provides a set of methods to append text in XML format. Use the static SP.XmlWriter.create(sb) Method to create an SP.XmlWriter object with the Sys.StringBuilder object you pass in. */
+    export class XmlWriter {
+        /** Creates a new instance of the XmlWriter class with the specified string builder. */
+        static create(sb: Sys.StringBuilder): SP.XmlWriter;
+        /** Appends a start element tag with the specified name in XML format to the object?s string builder. */
+        writeStartElement(tagName: string): void;
+        /** Appends an element with the specified tag name and value in XML format to the string builder. */
+        writeElementString(tagName: string, value: string): void;
+        /** Appends an end element tag in XML format to the object?s string builder. This method appends the end element tag ?/>? if the start element tag is not closed; otherwise, it appends a full end element tag ?</tagName>? to the string builder. */
+        writeEndElement(): void;
+        /** Appends an attribute with the specified name and value in XML format to the object?s string builder. */
+        writeAttributeString(localName: string, value: string): void;
+        /** This method only appends the name of the attribute. You can append the value of the attribute by calling the SP.XmlWriter.writeString(value) Method, and close the attribute by calling the SP.XmlWriter.writeEndAttribute() Method. */
+        writeStartAttribute(localName: string): void;
+        /** Appends an end of an attribute in XML format to the object?s string builder. */
+        writeEndAttribute(): void;
+        /** Appends the specified value for an element tag or attribute to the object?s string builder. */
+        writeString(value: string): void;
+        /** Appends the specified text to the object?s string builder. */
+        writeRaw(xml: string): void;
+        /** This member is reserved for internal use and is not intended to be used directly from your code. */
+        close(): void;
+    }
+
+    export class ClientConstants {
+        AddExpandoFieldTypeSuffix: string;
+        Actions: string;
+        ApplicationName: string;
+        Body: string;
+        CatchScope: string;
+        ChildItemQuery: string;
+        ChildItems: string;
+        ConditionalScope: string;
+        Constructor: string;
+        Context: string;
+        ErrorInfo: string;
+        ErrorMessage: string;
+        ErrorStackTrace: string;
+        ErrorCode: string;
+        ErrorTypeName: string;
+        ErrorValue: string;
+        ErrorDetails: string;
+        ErrorTraceCorrelationId: string;
+        ExceptionHandlingScope: string;
+        ExceptionHandlingScopeSimple: string;
+        QueryableExpression: string;
+        FinallyScope: string;
+        HasException: string;
+        Id: string;
+        Identity: string;
+        IfFalseScope: string;
+        IfTrueScope: string;
+        IsNull: string;
+        LibraryVersion: string;
+        TraceCorrelationId: string;
+        Count: string;
+        Method: string;
+        Methods: string;
+        Name: string;
+        Object: string;
+        ObjectPathId: string;
+        ObjectPath: string;
+        ObjectPaths: string;
+        ObjectType: string;
+        ObjectIdentity: string;
+        ObjectIdentityQuery: string;
+        ObjectVersion: string;
+        Parameter: string;
+        Parameters: string;
+        ParentId: string;
+        Processed: string;
+        Property: string;
+        Properties: string;
+        Query: string;
+        QueryResult: string;
+        Request: string;
+        Results: string;
+        ScalarProperty: string;
+        SchemaVersion: string;
+        ScopeId: string;
+        SelectAll: string;
+        SelectAllProperties: string;
+        SetProperty: string;
+        SetStaticProperty: string;
+        StaticMethod: string;
+        StaticProperty: string;
+        SuffixChar: string;
+        SuffixByte: string;
+        SuffixInt16: string;
+        SuffixUInt16: string;
+        SuffixInt32: string;
+        SuffixUInt32: string;
+        SuffixInt64: string;
+        SuffixUInt64: string;
+        SuffixSingle: string;
+        SuffixDouble: string;
+        SuffixDecimal: string;
+        SuffixTimeSpan: string;
+        SuffixArray: string;
+        Test: string;
+        TryScope: string;
+        Type: string;
+        TypeId: string;
+        Update: string;
+        Version: string;
+        XmlElementName: string;
+        XmlElementAttributes: string;
+        XmlElementChildren: string;
+        XmlNamespace: string;
+        FieldValuesMethodName: string;
+        RequestTokenHeader: string;
+        FormDigestHeader: string;
+        useWebLanguageHeader: string;
+        useWebLanguageHeaderValue: string;
+        ClientTagHeader: string;
+        TraceCorrelationIdRequestHeader: string;
+        TraceCorrelationIdResponseHeader: string;
+        greaterThan: string;
+        lessThan: string;
+        equal: string;
+        notEqual: string;
+        greaterThanOrEqual: string;
+        lessThanOrEqual: string;
+        andAlso: string;
+        orElse: string;
+        not: string;
+        expressionParameter: string;
+        expressionProperty: string;
+        expressionStaticProperty: string;
+        expressionMethod: string;
+        expressionStaticMethod: string;
+        expressionConstant: string;
+        expressionConvert: string;
+        expressionTypeIs: string;
+        ofType: string;
+        take: string;
+        where: string;
+        orderBy: string;
+        orderByDescending: string;
+        thenBy: string;
+        thenByDescending: string;
+        queryableObject: string;
+        ServiceFileName: string;
+        ServiceMethodName: string;
+        fluidApplicationInitParamUrl: string;
+        fluidApplicationInitParamViaUrl: string;
+        fluidApplicationInitParamRequestToken: string;
+        fluidApplicationInitParamFormDigestTimeoutSeconds: string;
+        fluidApplicationInitParamFormDigest: string;
+
+    }
+    export class ClientSchemaVersions {
+        version14: string;
+        version15: string;
+        currentVersion: string;
+    }
+    export class ClientErrorCodes {
+        genericError: number;
+        accessDenied: number;
+        docAlreadyExists: number;
+        versionConflict: number;
+        listItemDeleted: number;
+        invalidFieldValue: number;
+        notSupported: number;
+        redirect: number;
+        notSupportedRequestVersion: number;
+        fieldValueFailedValidation: number;
+        itemValueFailedValidation: number;
+    }
+    export class ClientAction {
+        get_id(): number;
+        get_path(): SP.ObjectPath;
+        get_name(): string;
+    }
+    export class ClientActionSetProperty extends SP.ClientAction {
+        constructor(obj: SP.ClientObject, propName: string, propValue: any);
+    }
+    export class ClientActionSetStaticProperty extends SP.ClientAction {
+        constructor(context: SP.ClientRuntimeContext, typeId: string, propName: string, propValue: any);
+    }
+    export class ClientActionInvokeMethod extends SP.ClientAction {
+        constructor(obj: SP.ClientObject, methodName: string, parameters: any[]);
+    }
+    export class ClientActionInvokeStaticMethod extends SP.ClientAction {
+        constructor(context: SP.ClientRuntimeContext, typeId: string, methodName: string, parameters: any[]);
+    }
+    export class ClientObject {
+        get_context(): SP.ClientRuntimeContext;
+        get_path(): SP.ObjectPath;
+        get_objectVersion(): string;
+        set_objectVersion(value: string): void;
+        fromJson(initValue: any): void;
+        customFromJson(initValue: any): boolean;
+        retrieve(): void;
+        refreshLoad(): void;
+        retrieve(propertyNames: string[]): void;
+        isPropertyAvailable(propertyName: string): boolean;
+        isObjectPropertyInstantiated(propertyName: string): boolean;
+        get_serverObjectIsNull(): boolean;
+        get_typedObject(): SP.ClientObject;
+    }
+    export class ClientObjectData {
+        get_properties(): any;
+        get_clientObjectProperties(): any;
+        get_methodReturnObjects(): any;
+        constructor();
+    }
+    /** Provides a base class for a collection of objects on a remote client. */
+    export class ClientObjectCollection<T> extends SP.ClientObject implements IEnumerable<T> {
+        get_areItemsAvailable(): boolean;
+        /** Gets the data for all of the items in the collection. */
+        retrieveItems(): SP.ClientObjectPrototype;
+        /** Returns an enumerator that iterates through the collection. */
+        getEnumerator(): IEnumerator<T>;
+        /** Returns number of items in the collection. */
+        get_count(): number;
+        get_data(): T[];
+        addChild(obj: T): void;
+        getItemAtIndex(index: number): T;
+        fromJson(obj: any): void;
+    }
+    export class ClientObjectList<T> extends SP.ClientObjectCollection<T> {
+        constructor(context: SP.ClientRuntimeContext, objectPath: SP.ObjectPath, childItemType: any);
+        fromJson(initValue: any): void;
+        customFromJson(initValue: any): boolean;
+    }
+    export class ClientObjectPrototype {
+        retrieve(): void;
+        retrieve(propertyNames: string[]): void;
+        retrieveObject(propertyName: string): SP.ClientObjectPrototype;
+        retrieveCollectionObject(propertyName: string): SP.ClientObjectCollectionPrototype;
+    }
+    export class ClientObjectCollectionPrototype extends SP.ClientObjectPrototype {
+        retrieveItems(): SP.ClientObjectPrototype;
+    }
+    export enum ClientRequestStatus {
+        active,
+        inProgress,
+        completedSuccess,
+        completedException,
+    }
+    export class WebRequestEventArgs extends Sys.EventArgs {
+        constructor(webRequest: Sys.Net.WebRequest);
+        get_webRequest(): Sys.Net.WebRequest;
+    }
+    export class ClientRequest {
+        static get_nextSequenceId(): number;
+        get_webRequest(): Sys.Net.WebRequest;
+        add_requestSucceeded(value: (sender: any, args: SP.ClientRequestSucceededEventArgs) => void): void;
+        remove_requestSucceeded(value: (sender: any, args: SP.ClientRequestSucceededEventArgs) => void): void;
+        add_requestFailed(value: (sender: any, args: SP.ClientRequestFailedEventArgs) => void): void;
+        remove_requestFailed(value: (sender: any, args: SP.ClientRequestFailedEventArgs) => void): void;
+        get_navigateWhenServerRedirect(): boolean;
+        set_navigateWhenServerRedirect(value: boolean): void;
+    }
+    export class ClientRequestEventArgs extends Sys.EventArgs {
+        get_request(): SP.ClientRequest;
+    }
+    export class ClientRequestFailedEventArgs extends SP.ClientRequestEventArgs {
+        constructor(request: SP.ClientRequest, message: string, stackTrace: string, errorCode: number, errorValue: string, errorTypeName: string, errorDetails: any);
+        constructor(request: SP.ClientRequest, message: string, stackTrace: string, errorCode: number, errorValue: string, errorTypeName: string, errorDetails: any, errorTraceCorrelationId: string);
+        get_message(): string;
+        get_stackTrace(): string;
+        get_errorCode(): number;
+        get_errorValue(): string;
+        get_errorTypeName(): string;
+        get_errorDetails(): any;
+        get_errorTraceCorrelationId(): string;
+    }
+    export class ClientRequestSucceededEventArgs extends SP.ClientRequestEventArgs {
+    }
+    export class ClientRuntimeContext implements Sys.IDisposable {
+        constructor(serverRelativeUrlOrFullUrl: string);
+        get_url(): string;
+        get_viaUrl(): string;
+        set_viaUrl(value: string): void;
+        get_formDigestHandlingEnabled(): boolean;
+        set_formDigestHandlingEnabled(value: boolean): void;
+        get_applicationName(): string;
+        set_applicationName(value: string): void;
+        get_clientTag(): string;
+        set_clientTag(value: string): void;
+        get_webRequestExecutorFactory(): SP.IWebRequestExecutorFactory;
+        set_webRequestExecutorFactory(value: SP.IWebRequestExecutorFactory): void;
+        get_pendingRequest(): SP.ClientRequest;
+        get_hasPendingRequest(): boolean;
+        add_executingWebRequest(value: (sender: any, args: SP.WebRequestEventArgs) => void): void;
+        remove_executingWebRequest(value: (sender: any, args: SP.WebRequestEventArgs) => void): void;
+        add_requestSucceeded(value: (sender: any, args: SP.ClientRequestSucceededEventArgs) => void): void;
+        remove_requestSucceeded(value: (sender: any, args: SP.ClientRequestSucceededEventArgs) => void): void;
+        add_requestFailed(value: (sender: any, args: SP.ClientRequestFailedEventArgs) => void): void;
+        remove_requestFailed(value: (sender: any, args: SP.ClientRequestFailedEventArgs) => void): void;
+        add_beginningRequest(value: (sender: any, args: SP.ClientRequestEventArgs) => void): void;
+        remove_beginningRequest(value: (sender: any, args: SP.ClientRequestEventArgs) => void): void;
+        get_requestTimeout(): number;
+        set_requestTimeout(value: number): void;
+        executeQueryAsync(succeededCallback: (sender: any, args: SP.ClientRequestSucceededEventArgs) => void, failedCallback: (sender: any, args: SP.ClientRequestFailedEventArgs) => void): void;
+        executeQueryAsync(succeededCallback: (sender: any, args: SP.ClientRequestSucceededEventArgs) => void): void;
+        executeQueryAsync(): void;
+        get_staticObjects(): any;
+        castTo(obj: SP.ClientObject, type: any): SP.ClientObject;
+        addQuery(query: SP.ClientAction): void;
+        addQueryIdAndResultObject(id: number, obj: any): void;
+        parseObjectFromJsonString(json: string): any;
+        parseObjectFromJsonString(json: string, skipTypeFixup: boolean): any;
+        load(clientObject: SP.ClientObject): void;
+        loadQuery<T>(clientObjectCollection: SP.ClientObjectCollection<T>, exp: string): any;
+        load(clientObject: SP.ClientObject, ...exps: string[]): void;
+        loadQuery<T>(clientObjectCollection: SP.ClientObjectCollection<T>): any;
+        get_serverSchemaVersion(): string;
+        get_serverLibraryVersion(): string;
+        get_traceCorrelationId(): string;
+        set_traceCorrelationId(value: string): void;
+        dispose(): void;
+    }
+    export class SimpleDataTable {
+        get_rows(): any[];
+        constructor();
+    }
+    export class ClientValueObject {
+        fromJson(obj: any): void;
+        customFromJson(obj: any): boolean;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        customWriteToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): boolean;
+        get_typeId(): string;
+    }
+    export class ClientValueObjectCollection<T> extends SP.ClientValueObject implements IEnumerable<T> {
+        get_count(): number;
+        getEnumerator(): IEnumerator<T>;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+    }
+    export class ExceptionHandlingScope {
+        constructor(context: SP.ClientRuntimeContext);
+        startScope(): any;
+        startTry(): any;
+        startCatch(): any;
+        startFinally(): any;
+        get_processed(): boolean;
+        get_hasException(): boolean;
+        get_errorMessage(): string;
+        get_serverStackTrace(): string;
+        get_serverErrorCode(): number;
+        get_serverErrorValue(): string;
+        get_serverErrorTypeName(): string;
+        get_serverErrorDetails(): any;
+    }
+    export class ObjectIdentityQuery extends SP.ClientAction {
+        constructor(objectPath: SP.ObjectPath);
+    }
+    export class ObjectPath {
+        setPendingReplace(): void;
+    }
+    export class ObjectPathProperty extends SP.ObjectPath {
+        constructor(context: SP.ClientRuntimeContext, parent: SP.ObjectPath, propertyName: string);
+    }
+    export class ObjectPathStaticProperty extends SP.ObjectPath {
+        constructor(context: SP.ClientRuntimeContext, typeId: string, propertyName: string);
+    }
+    export class ObjectPathMethod extends SP.ObjectPath {
+        constructor(context: SP.ClientRuntimeContext, parent: SP.ObjectPath, methodName: string, parameters: any[]);
+    }
+    export class ObjectPathStaticMethod extends SP.ObjectPath {
+        constructor(context: SP.ClientRuntimeContext, typeId: string, methodName: string, parameters: any[]);
+    }
+    export class ObjectPathConstructor extends SP.ObjectPath {
+        constructor(context: SP.ClientRuntimeContext, typeId: string, parameters: any[]);
+    }
+    export class SerializationContext {
+        addClientObject(obj: SP.ClientObject): void;
+        addObjectPath(path: SP.ObjectPath): void;
+    }
+    export class ResourceStrings {
+        argumentExceptionMessage: string;
+        argumentNullExceptionMessage: string;
+        cC_AppIconAlt: string;
+        cC_AppWebUrlNotSet: string;
+        cC_ArrowImageAlt: string;
+        cC_BackToSite: string;
+        cC_ErrorGettingThemeInfo: string;
+        cC_HelpLinkToolTip: string;
+        cC_HostSiteUrlNotSet: string;
+        cC_InvalidArgument: string;
+        cC_InvalidJSON: string;
+        cC_InvalidOperation: string;
+        cC_PlaceHolderElementNotFound: string;
+        cC_RequiredScriptNotLoaded: string;
+        cC_SendFeedback: string;
+        cC_SettingsLinkToolTip: string;
+        cC_TimeoutGettingThemeInfo: string;
+        cC_Welcome: string;
+        cannotFindContextWebServerRelativeUrl: string;
+        collectionHasNotBeenInitialized: string;
+        collectionModified: string;
+        invalidUsageOfConditionalScope: string;
+        invalidUsageOfConditionalScopeNowAllowedAction: string;
+        invalidUsageOfExceptionHandlingScope: string;
+        namedPropertyHasNotBeenInitialized: string;
+        namedServerObjectIsNull: string;
+        noObjectPathAssociatedWithObject: string;
+        notSameClientContext: string;
+        notSupportedQueryExpressionWithExpressionDetail: string;
+        objectNameIdentity: string;
+        objectNameMethod: string;
+        objectNameProperty: string;
+        objectNameType: string;
+        propertyHasNotBeenInitialized: string;
+        rE_BrowserBinaryDataNotSupported: string;
+        rE_BrowserNotSupported: string;
+        rE_CannotAccessSite: string;
+        rE_CannotAccessSiteCancelled: string;
+        rE_CannotAccessSiteOpenWindowFailed: string;
+        rE_DismissOpenWindowMessageLinkText: string;
+        rE_DomainDoesNotMatch: string;
+        rE_FixitHelpMessage: string;
+        rE_InvalidArgumentOrField: string;
+        rE_InvalidOperation: string;
+        rE_NoTrustedOrigins: string;
+        rE_OpenWindowButtonText: string;
+        rE_OpenWindowMessage: string;
+        rE_RequestAbortedOrTimedout: string;
+        rE_RequestUnexpectedResponse: string;
+        rE_RequestUnexpectedResponseWithContentTypeAndStatus: string;
+        requestAbortedOrTimedOut: string;
+        requestEmptyQueryName: string;
+        requestHasBeenExecuted: string;
+        requestUnexpectedResponse: string;
+        requestUnexpectedResponseWithContentTypeAndStatus: string;
+        requestUnexpectedResponseWithStatus: string;
+        requestUnknownResponse: string;
+        serverObjectIsNull: string;
+        unknownError: string;
+        unknownResponseData: string;
+    }
+    export class RuntimeRes {
+        cC_PlaceHolderElementNotFound: string;
+        rE_CannotAccessSiteOpenWindowFailed: string;
+        noObjectPathAssociatedWithObject: string;
+        cC_TimeoutGettingThemeInfo: string;
+        unknownResponseData: string;
+        requestUnexpectedResponseWithStatus: string;
+        objectNameProperty: string;
+        requestUnknownResponse: string;
+        rE_RequestUnexpectedResponseWithContentTypeAndStatus: string;
+        rE_BrowserNotSupported: string;
+        argumentExceptionMessage: string;
+        namedServerObjectIsNull: string;
+        objectNameType: string;
+        requestUnexpectedResponseWithContentTypeAndStatus: string;
+        cC_InvalidJSON: string;
+        invalidUsageOfExceptionHandlingScope: string;
+        serverObjectIsNull: string;
+        cC_AppWebUrlNotSet: string;
+        rE_OpenWindowMessage: string;
+        argumentNullExceptionMessage: string;
+        cC_HelpLinkToolTip: string;
+        propertyHasNotBeenInitialized: string;
+        rE_RequestAbortedOrTimedout: string;
+        invalidUsageOfConditionalScope: string;
+        cC_ErrorGettingThemeInfo: string;
+        rE_DismissOpenWindowMessageLinkText: string;
+        rE_CannotAccessSiteCancelled: string;
+        objectNameIdentity: string;
+        cC_HostSiteUrlNotSet: string;
+        rE_FixitHelpMessage: string;
+        notSupportedQueryExpressionWithExpressionDetail: string;
+        rE_RequestUnexpectedResponse: string;
+        rE_DomainDoesNotMatch: string;
+        cC_BackToSite: string;
+        rE_NoTrustedOrigins: string;
+        rE_InvalidOperation: string;
+        collectionModified: string;
+        cC_Welcome: string;
+        cC_AppIconAlt: string;
+        cC_SendFeedback: string;
+        cC_ArrowImageAlt: string;
+        cC_InvalidOperation: string;
+        requestAbortedOrTimedOut: string;
+        invalidUsageOfConditionalScopeNowAllowedAction: string;
+        cannotFindContextWebServerRelativeUrl: string;
+        rE_OpenWindowButtonText: string;
+        unknownError: string;
+        cC_InvalidArgument: string;
+        rE_InvalidArgumentOrField: string;
+        cC_SettingsLinkToolTip: string;
+        requestEmptyQueryName: string;
+        cC_RequiredScriptNotLoaded: string;
+        rE_CannotAccessSite: string;
+        notSameClientContext: string;
+        requestUnexpectedResponse: string;
+        rE_BrowserBinaryDataNotSupported: string;
+        collectionHasNotBeenInitialized: string;
+        namedPropertyHasNotBeenInitialized: string;
+        requestHasBeenExecuted: string;
+        objectNameMethod: string;
+    }
+    export class ParseJSONUtil {
+        static parseObjectFromJsonString(json: string): any;
+        static validateJson(text: string): boolean;
+    }
+    export enum DateTimeKind {
+        unspecified,
+        utc,
+        local,
+    }
+    export class OfficeVersion {
+        majorBuildVersion: number;
+        previousMajorBuildVersion: number;
+        majorVersion: string;
+        previousVersion: string;
+        majorVersionDotZero: string;
+        previousVersionDotZero: string;
+        assemblyVersion: string;
+        wssMajorVersion: string;
+    }
+    export class ClientContext extends SP.ClientRuntimeContext {
+        constructor(serverRelativeUrlOrFullUrl: string);
+        static get_current(): SP.ClientContext;
+        constructor();
+        get_web(): SP.Web;
+        get_site(): SP.Site;
+        get_serverVersion(): string;
+    }
+    export enum ULSTraceLevel {
+        verbose,
+    }
+    /** Provides a Unified Logging Service (ULS) that monitors log messages. */
+    export class ULS {
+        /** Gets a value that indicates whether the Unified Logging Service (ULS) is enabled. */
+        static get_enabled(): boolean;
+        /** Sets a value that indicates whether the Unified Logging Service (ULS) is enabled. */
+        static set_enabled(value: boolean): void;
+        /** Logs the specified debug message.
+            This method logs the message with a time stamp. If any log messages are pending, this method also logs them. If the message cannot be logged, the message is added to the list of pending log messages. */
+        static log(debugMessage: string): void;
+        /** Increases the indentation for subsequent log messages. */
+        static increaseIndent(): void;
+        /** Decreases the indentation for subsequent log messages. */
+        static decreaseIndent(): void;
+        /** Traces when the function was entered. */
+        static traceApiEnter(functionName: string, args: any[]): void;
+        /** Traces when the function was entered. */
+        static traceApiEnter(functionName: string): void;
+        /** Traces when the function has finished. */
+        static traceApiLeave(): void;
+    }
+    export class AccessRequests {
+        static changeRequestStatus(context: SP.ClientRuntimeContext, itemId: number, newStatus: number, convStr: string, permType: string, permissionLevel: number): void;
+        static changeRequestStatusBulk(context: SP.ClientRuntimeContext, requestIds: number[], newStatus: number): void;
+    }
+    export enum AddFieldOptions {
+        defaultValue,
+        addToDefaultContentType,
+        addToNoContentType,
+        addToAllContentTypes,
+        addFieldInternalNameHint,
+        addFieldToDefaultView,
+        addFieldCheckDisplayName,
+    }
+    export class AlternateUrl extends SP.ClientObject {
+        get_uri(): string;
+        get_urlZone(): SP.UrlZone;
+    }
+    export class App extends SP.ClientObject {
+        get_assetId(): string;
+        get_contentMarket(): string;
+        get_versionString(): string;
+    }
+    export class AppCatalog {
+        static getAppInstances(context: SP.ClientRuntimeContext, web: SP.Web): SP.ClientObjectList<SP.AppInstance>;
+        static getDeveloperSiteAppInstancesByIds(context: SP.ClientRuntimeContext, site: SP.Site, appInstanceIds: SP.Guid[]): SP.ClientObjectList<SP.AppInstance>;
+        static isAppSideloadingEnabled(context: SP.ClientRuntimeContext): SP.BooleanResult;
+    }
+    export class AppContextSite extends SP.ClientObject {
+        constructor(context: SP.ClientRuntimeContext, siteUrl: string);
+        get_site(): SP.Site;
+        get_web(): SP.Web;
+        static newObject(context: SP.ClientRuntimeContext, siteUrl: string): SP.AppContextSite;
+    }
+    export class AppInstance extends SP.ClientObject {
+        get_appPrincipalId(): string;
+        get_appWebFullUrl(): string;
+        get_id(): SP.Guid;
+        get_inError(): boolean;
+        get_startPage(): string;
+        get_remoteAppUrl(): string;
+        get_settingsPageUrl(): string;
+        get_siteId(): SP.Guid;
+        get_status(): SP.AppInstanceStatus;
+        get_title(): string;
+        get_webId(): SP.Guid;
+        getErrorDetails(): SP.ClientObjectList<SP.AppInstanceErrorDetails>;
+        uninstall(): SP.GuidResult;
+        upgrade(appPackageStream: SP.Base64EncodedByteArray): void;
+        cancelAllJobs(): SP.BooleanResult;
+        install(): SP.GuidResult;
+        getPreviousAppVersion(): SP.App;
+        retryAllJobs(): void;
+    }
+    export class AppInstanceErrorDetails extends SP.ClientObject {
+        get_correlationId(): SP.Guid;
+        set_correlationId(value: SP.Guid): void;
+        get_errorDetail(): string;
+        get_errorType(): SP.AppInstanceErrorType;
+        set_errorType(value: SP.AppInstanceErrorType): void;
+        get_errorTypeName(): string;
+        get_exceptionMessage(): string;
+        get_source(): SP.AppInstanceErrorSource;
+        set_source(value: SP.AppInstanceErrorSource): void;
+        get_sourceName(): string;
+    }
+    export enum AppInstanceErrorSource {
+        common,
+        appWeb,
+        parentWeb,
+        remoteWebSite,
+        database,
+        officeExtension,
+        eventCallouts,
+        finalization,
+    }
+    export enum AppInstanceErrorType {
+        transient,
+        configuration,
+        app,
+    }
+    export enum AppInstanceStatus {
+        invalidStatus,
+        installing,
+        canceling,
+        uninstalling,
+        installed,
+        upgrading,
+        initialized,
+        upgradeCanceling,
+        disabling,
+        disabled,
+    }
+    export class AppLicense extends SP.ClientValueObject {
+        get_rawXMLLicenseToken(): string;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class AppLicenseCollection extends SP.ClientValueObjectCollection<AppLicense> {
+        add(item: SP.AppLicense): void;
+        get_item(index: number): SP.AppLicense;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export enum AppLicenseType {
+        perpetualMultiUser,
+        perpetualAllUsers,
+        trialMultiUser,
+        trialAllUsers,
+    }
+    export class Attachment extends SP.ClientObject {
+        get_fileName(): string;
+        get_serverRelativeUrl(): string;
+        deleteObject(): void;
+    }
+    export class AttachmentCollection extends SP.ClientObjectCollection<Attachment> {
+        itemAt(index: number): SP.Attachment;
+        get_item(index: number): SP.Attachment;
+        getByFileName(fileName: string): SP.Attachment;
+    }
+    export class AttachmentCreationInformation extends SP.ClientValueObject {
+        get_contentStream(): SP.Base64EncodedByteArray;
+        set_contentStream(value: SP.Base64EncodedByteArray): void;
+        get_fileName(): string;
+        set_fileName(value: string): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class BasePermissions extends SP.ClientValueObject {
+        set(perm: SP.PermissionKind): void;
+        clear(perm: SP.PermissionKind): void;
+        clearAll(): void;
+        has(perm: SP.PermissionKind): boolean;
+        equals(perm: SP.BasePermissions): boolean;
+        hasPermissions(high: number, low: number): boolean;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    /** Specifies the base type for a list. */
+    export enum BaseType {
+        none,
+        genericList,
+        documentLibrary,
+        unused,
+        discussionBoard,
+        survey,
+        issue,
+    }
+    export enum BrowserFileHandling {
+        permissive,
+        strict,
+    }
+    export enum CalendarType {
+        none,
+        gregorian,
+        japan,
+        taiwan,
+        korea,
+        hijri,
+        thai,
+        hebrew,
+        gregorianMEFrench,
+        gregorianArabic,
+        gregorianXLITEnglish,
+        gregorianXLITFrench,
+        koreaJapanLunar,
+        chineseLunar,
+        sakaEra,
+        umAlQura,
+    }
+    /** Specifies a Collaborative Application Markup Language (CAML) query on a list. */
+    export class CamlQuery extends SP.ClientValueObject {
+        constructor();
+        /** This method creates a Collaborative Application Markup Language (CAML) string
+            that can be used to recursively get all of the items in a list, including
+            the items in the subfolders. */
+        static createAllItemsQuery(): SP.CamlQuery;
+        /** This method creates a Collaborative Application Markup Language (CAML) string
+            that can be used to recursively get all of the folders in a list, including
+            the subfolders. */
+        static createAllFoldersQuery(): SP.CamlQuery;
+        /** Returns true if the query returns dates in Coordinated Universal Time (UTC) format. */
+        get_datesInUtc(): boolean;
+        /** Sets a value that indicates whether the query returns dates in Coordinated Universal Time (UTC) format. */
+        set_datesInUtc(value: boolean): void;
+        /** Server relative URL of a list folder from which results will be returned. */
+        get_folderServerRelativeUrl(): string;
+        /** Sets a value that specifies the server relative URL of a list folder from which results will be returned. */
+        set_folderServerRelativeUrl(value: string): void;
+        get_listItemCollectionPosition(): SP.ListItemCollectionPosition;
+        /** Sets a value that specifies the information required to get the next page of data for the list view. */
+        set_listItemCollectionPosition(value: SP.ListItemCollectionPosition): void;
+        /** Gets value that specifies the XML schema that defines the list view. */
+        get_viewXml(): string;
+        /** Sets value that specifies the XML schema that defines the list view. It must be null, empty, or an XML fragment that conforms to the ViewDefinition type.  */
+        set_viewXml(value: string): void;
+        /** This member is reserved for internal use and is not intended to be used directly from your code. */
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+    }
+    export class Change extends SP.ClientObject {
+        get_changeToken(): SP.ChangeToken;
+        get_changeType(): SP.ChangeType;
+        get_siteId(): SP.Guid;
+        get_time(): Date;
+    }
+    export class ChangeAlert extends SP.Change {
+        get_alertId(): SP.Guid;
+        get_webId(): SP.Guid;
+    }
+    export class ChangeCollection extends SP.ClientObjectCollection<Change> {
+        itemAt(index: number): SP.Change;
+        get_item(index: number): SP.Change;
+    }
+    export class ChangeContentType extends SP.Change {
+        get_contentTypeId(): SP.ContentTypeId;
+        get_webId(): SP.Guid;
+    }
+    export class ChangeField extends SP.Change {
+        get_fieldId(): SP.Guid;
+        get_webId(): SP.Guid;
+    }
+    export class ChangeFile extends SP.Change {
+        get_uniqueId(): SP.Guid;
+        get_webId(): SP.Guid;
+    }
+    export class ChangeFolder extends SP.Change {
+        get_uniqueId(): SP.Guid;
+        get_webId(): SP.Guid;
+    }
+    export class ChangeGroup extends SP.Change {
+        get_groupId(): number;
+    }
+    export class ChangeItem extends SP.Change {
+        get_itemId(): number;
+        get_listId(): SP.Guid;
+        get_webId(): SP.Guid;
+    }
+    export class ChangeList extends SP.Change {
+        get_listId(): SP.Guid;
+        get_webId(): SP.Guid;
+    }
+    export class ChangeLogItemQuery extends SP.ClientValueObject {
+        get_changeToken(): string;
+        set_changeToken(value: string): void;
+        get_contains(): string;
+        set_contains(value: string): void;
+        get_query(): string;
+        set_query(value: string): void;
+        get_queryOptions(): string;
+        set_queryOptions(value: string): void;
+        get_rowLimit(): string;
+        set_rowLimit(value: string): void;
+        get_viewFields(): string;
+        set_viewFields(value: string): void;
+        get_viewName(): string;
+        set_viewName(value: string): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class ChangeQuery extends SP.ClientValueObject {
+        constructor();
+        constructor(allChangeObjectTypes: boolean, allChangeTypes: boolean);
+        get_add(): boolean;
+        set_add(value: boolean): void;
+        get_alert(): boolean;
+        set_alert(value: boolean): void;
+        get_changeTokenEnd(): SP.ChangeToken;
+        set_changeTokenEnd(value: SP.ChangeToken): void;
+        get_changeTokenStart(): SP.ChangeToken;
+        set_changeTokenStart(value: SP.ChangeToken): void;
+        get_contentType(): boolean;
+        set_contentType(value: boolean): void;
+        get_deleteObject(): boolean;
+        set_deleteObject(value: boolean): void;
+        get_field(): boolean;
+        set_field(value: boolean): void;
+        get_file(): boolean;
+        set_file(value: boolean): void;
+        get_folder(): boolean;
+        set_folder(value: boolean): void;
+        get_group(): boolean;
+        set_group(value: boolean): void;
+        get_groupMembershipAdd(): boolean;
+        set_groupMembershipAdd(value: boolean): void;
+        get_groupMembershipDelete(): boolean;
+        set_groupMembershipDelete(value: boolean): void;
+        get_item(): boolean;
+        set_item(value: boolean): void;
+        get_list(): boolean;
+        set_list(value: boolean): void;
+        get_move(): boolean;
+        set_move(value: boolean): void;
+        get_navigation(): boolean;
+        set_navigation(value: boolean): void;
+        get_rename(): boolean;
+        set_rename(value: boolean): void;
+        get_restore(): boolean;
+        set_restore(value: boolean): void;
+        get_roleAssignmentAdd(): boolean;
+        set_roleAssignmentAdd(value: boolean): void;
+        get_roleAssignmentDelete(): boolean;
+        set_roleAssignmentDelete(value: boolean): void;
+        get_roleDefinitionAdd(): boolean;
+        set_roleDefinitionAdd(value: boolean): void;
+        get_roleDefinitionDelete(): boolean;
+        set_roleDefinitionDelete(value: boolean): void;
+        get_roleDefinitionUpdate(): boolean;
+        set_roleDefinitionUpdate(value: boolean): void;
+        get_securityPolicy(): boolean;
+        set_securityPolicy(value: boolean): void;
+        get_site(): boolean;
+        set_site(value: boolean): void;
+        get_systemUpdate(): boolean;
+        set_systemUpdate(value: boolean): void;
+        get_update(): boolean;
+        set_update(value: boolean): void;
+        get_user(): boolean;
+        set_user(value: boolean): void;
+        get_view(): boolean;
+        set_view(value: boolean): void;
+        get_web(): boolean;
+        set_web(value: boolean): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+    }
+    export class ChangeSite extends SP.Change {
+    }
+    export class ChangeToken extends SP.ClientValueObject {
+        get_stringValue(): string;
+        set_stringValue(value: string): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export enum ChangeType {
+        noChange,
+        add,
+        update,
+        deleteObject,
+        rename,
+        moveAway,
+        moveInto,
+        restore,
+        roleAdd,
+        roleDelete,
+        roleUpdate,
+        assignmentAdd,
+        assignmentDelete,
+        memberAdd,
+        memberDelete,
+        systemUpdate,
+        navigation,
+        scopeAdd,
+        scopeDelete,
+        listContentTypeAdd,
+        listContentTypeDelete,
+    }
+    export class ChangeUser extends SP.Change {
+        get_activate(): boolean;
+        get_userId(): number;
+    }
+    export class ChangeView extends SP.Change {
+        get_viewId(): SP.Guid;
+        get_listId(): SP.Guid;
+        get_webId(): SP.Guid;
+    }
+    export class ChangeWeb extends SP.Change {
+        get_webId(): SP.Guid;
+    }
+    export enum CheckinType {
+        minorCheckIn,
+        majorCheckIn,
+        overwriteCheckIn,
+    }
+    export enum CheckOutType {
+        online,
+        offline,
+        none,
+    }
+    export enum ChoiceFormatType {
+        dropdown,
+        radioButtons,
+    }
+    export class CompatibilityRange extends SP.ClientObject {
+    }
+    export class ContentType extends SP.ClientObject {
+        get_description(): string;
+        set_description(value: string): void;
+        get_displayFormTemplateName(): string;
+        set_displayFormTemplateName(value: string): void;
+        get_displayFormUrl(): string;
+        set_displayFormUrl(value: string): void;
+        get_documentTemplate(): string;
+        set_documentTemplate(value: string): void;
+        get_documentTemplateUrl(): string;
+        get_editFormTemplateName(): string;
+        set_editFormTemplateName(value: string): void;
+        get_editFormUrl(): string;
+        set_editFormUrl(value: string): void;
+        get_fieldLinks(): SP.FieldLinkCollection;
+        get_fields(): SP.FieldCollection;
+        get_group(): string;
+        set_group(value: string): void;
+        get_hidden(): boolean;
+        set_hidden(value: boolean): void;
+        get_id(): SP.ContentTypeId;
+        get_jsLink(): string;
+        set_jsLink(value: string): void;
+        get_name(): string;
+        set_name(value: string): void;
+        get_newFormTemplateName(): string;
+        set_newFormTemplateName(value: string): void;
+        get_newFormUrl(): string;
+        set_newFormUrl(value: string): void;
+        get_parent(): SP.ContentType;
+        get_readOnly(): boolean;
+        set_readOnly(value: boolean): void;
+        get_schemaXml(): string;
+        get_schemaXmlWithResourceTokens(): string;
+        set_schemaXmlWithResourceTokens(value: string): void;
+        get_scope(): string;
+        get_sealed(): boolean;
+        set_sealed(value: boolean): void;
+        get_stringId(): string;
+        get_workflowAssociations(): SP.Workflow.WorkflowAssociationCollection;
+        update(updateChildren: boolean): void;
+        deleteObject(): void;
+    }
+    export class ContentTypeCollection extends SP.ClientObjectCollection<ContentType> {
+        itemAt(index: number): SP.ContentType;
+        get_item(index: number): SP.ContentType;
+        getById(contentTypeId: string): SP.ContentType;
+        addExistingContentType(contentType: SP.ContentType): SP.ContentType;
+        add(parameters: SP.ContentTypeCreationInformation): SP.ContentType;
+    }
+    export class ContentTypeCreationInformation extends SP.ClientValueObject {
+        get_description(): string;
+        set_description(value: string): void;
+        get_group(): string;
+        set_group(value: string): void;
+        get_name(): string;
+        set_name(value: string): void;
+        get_parentContentType(): SP.ContentType;
+        set_parentContentType(value: SP.ContentType): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class ContentTypeId extends SP.ClientValueObject {
+        toString(): string;
+        get_stringValue(): string;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export enum CustomizedPageStatus {
+        none,
+        uncustomized,
+        customized,
+    }
+    export enum DateTimeFieldFormatType {
+        dateOnly,
+        dateTime,
+    }
+    export enum DateTimeFieldFriendlyFormatType {
+        unspecified,
+        disabled,
+        relative,
+    }
+    export enum DraftVisibilityType {
+        reader,
+        author,
+        approver,
+    }
+    export class EventReceiverDefinition extends SP.ClientObject {
+        get_receiverAssembly(): string;
+        get_receiverClass(): string;
+        get_receiverId(): SP.Guid;
+        get_receiverName(): string;
+        get_sequenceNumber(): number;
+        get_synchronization(): SP.EventReceiverSynchronization;
+        get_eventType(): SP.EventReceiverType;
+        get_receiverUrl(): string;
+        update(): void;
+        deleteObject(): void;
+    }
+    export class EventReceiverDefinitionCollection extends SP.ClientObjectCollection<EventReceiverDefinition> {
+        itemAt(index: number): SP.EventReceiverDefinition;
+        get_item(index: number): SP.EventReceiverDefinition;
+        getById(eventReceiverId: SP.Guid): SP.EventReceiverDefinition;
+        add(eventReceiverCreationInformation: SP.EventReceiverDefinitionCreationInformation): SP.EventReceiverDefinition;
+    }
+    export class EventReceiverDefinitionCreationInformation extends SP.ClientValueObject {
+        get_receiverAssembly(): string;
+        set_receiverAssembly(value: string): void;
+        get_receiverClass(): string;
+        set_receiverClass(value: string): void;
+        get_receiverName(): string;
+        set_receiverName(value: string): void;
+        get_sequenceNumber(): number;
+        set_sequenceNumber(value: number): void;
+        get_synchronization(): SP.EventReceiverSynchronization;
+        set_synchronization(value: SP.EventReceiverSynchronization): void;
+        get_eventType(): SP.EventReceiverType;
+        set_eventType(value: SP.EventReceiverType): void;
+        get_receiverUrl(): string;
+        set_receiverUrl(value: string): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export enum EventReceiverSynchronization {
+        defaultSynchronization,
+        synchronous,
+        asynchronous,
+    }
+    export enum EventReceiverType {
+        invalidReceiver,
+        itemAdding,
+        itemUpdating,
+        itemDeleting,
+        itemCheckingIn,
+        itemCheckingOut,
+        itemUncheckingOut,
+        itemAttachmentAdding,
+        itemAttachmentDeleting,
+        itemFileMoving,
+        itemVersionDeleting,
+        fieldAdding,
+        fieldUpdating,
+        fieldDeleting,
+        listAdding,
+        listDeleting,
+        siteDeleting,
+        webDeleting,
+        webMoving,
+        webAdding,
+        groupAdding,
+        groupUpdating,
+        groupDeleting,
+        groupUserAdding,
+        groupUserDeleting,
+        roleDefinitionAdding,
+        roleDefinitionUpdating,
+        roleDefinitionDeleting,
+        roleAssignmentAdding,
+        roleAssignmentDeleting,
+        inheritanceBreaking,
+        inheritanceResetting,
+        workflowStarting,
+        itemAdded,
+        itemUpdated,
+        itemDeleted,
+        itemCheckedIn,
+        itemCheckedOut,
+        itemUncheckedOut,
+        itemAttachmentAdded,
+        itemAttachmentDeleted,
+        itemFileMoved,
+        itemFileConverted,
+        itemVersionDeleted,
+        fieldAdded,
+        fieldUpdated,
+        fieldDeleted,
+        listAdded,
+        listDeleted,
+        siteDeleted,
+        webDeleted,
+        webMoved,
+        webProvisioned,
+        groupAdded,
+        groupUpdated,
+        groupDeleted,
+        groupUserAdded,
+        groupUserDeleted,
+        roleDefinitionAdded,
+        roleDefinitionUpdated,
+        roleDefinitionDeleted,
+        roleAssignmentAdded,
+        roleAssignmentDeleted,
+        inheritanceBroken,
+        inheritanceReset,
+        workflowStarted,
+        workflowPostponed,
+        workflowCompleted,
+        entityInstanceAdded,
+        entityInstanceUpdated,
+        entityInstanceDeleted,
+        appInstalled,
+        appUpgraded,
+        appUninstalling,
+        emailReceived,
+        contextEvent,
+    }
+    export class Feature extends SP.ClientObject {
+        get_definitionId(): SP.Guid;
+    }
+    export class FeatureCollection extends SP.ClientObjectCollection<Feature> {
+        itemAt(index: number): SP.Feature;
+        get_item(index: number): SP.Feature;
+        getById(featureId: SP.Guid): SP.Feature;
+        add(featureId: SP.Guid, force: boolean, featdefScope: SP.FeatureDefinitionScope): SP.Feature;
+        remove(featureId: SP.Guid, force: boolean): void;
+    }
+    export enum FeatureDefinitionScope {
+        none,
+        farm,
+        site,
+        web,
+    }
+    export class Field extends SP.ClientObject {
+        get_canBeDeleted(): boolean;
+        get_defaultValue(): string;
+        set_defaultValue(value: string): void;
+        get_description(): string;
+        set_description(value: string): void;
+        get_direction(): string;
+        set_direction(value: string): void;
+        get_enforceUniqueValues(): boolean;
+        set_enforceUniqueValues(value: boolean): void;
+        get_entityPropertyName(): string;
+        get_filterable(): boolean;
+        get_fromBaseType(): boolean;
+        get_group(): string;
+        set_group(value: string): void;
+        get_hidden(): boolean;
+        set_hidden(value: boolean): void;
+        get_id(): SP.Guid;
+        get_indexed(): boolean;
+        set_indexed(value: boolean): void;
+        get_internalName(): string;
+        get_jsLink(): string;
+        set_jsLink(value: string): void;
+        get_readOnlyField(): boolean;
+        set_readOnlyField(value: boolean): void;
+        get_required(): boolean;
+        set_required(value: boolean): void;
+        get_schemaXml(): string;
+        set_schemaXml(value: string): void;
+        get_schemaXmlWithResourceTokens(): string;
+        get_scope(): string;
+        get_sealed(): boolean;
+        get_sortable(): boolean;
+        get_staticName(): string;
+        set_staticName(value: string): void;
+        get_title(): string;
+        set_title(value: string): void;
+        get_fieldTypeKind(): SP.FieldType;
+        set_fieldTypeKind(value: SP.FieldType): void;
+        get_typeAsString(): string;
+        set_typeAsString(value: string): void;
+        get_typeDisplayName(): string;
+        get_typeShortDescription(): string;
+        get_validationFormula(): string;
+        set_validationFormula(value: string): void;
+        get_validationMessage(): string;
+        set_validationMessage(value: string): void;
+        validateSetValue(item: SP.ListItem, value: string): void;
+        updateAndPushChanges(pushChangesToLists: boolean): void;
+        update(): void;
+        deleteObject(): void;
+        setShowInDisplayForm(value: boolean): void;
+        setShowInEditForm(value: boolean): void;
+        setShowInNewForm(value: boolean): void;
+    }
+    export class FieldCalculated extends SP.Field {
+        get_dateFormat(): SP.DateTimeFieldFormatType;
+        set_dateFormat(value: SP.DateTimeFieldFormatType): void;
+        get_formula(): string;
+        set_formula(value: string): void;
+        get_outputType(): SP.FieldType;
+        set_outputType(value: SP.FieldType): void;
+    }
+    export class FieldCalculatedErrorValue extends SP.ClientValueObject {
+        get_errorMessage(): string;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class FieldMultiChoice extends SP.Field {
+        get_fillInChoice(): boolean;
+        set_fillInChoice(value: boolean): void;
+        get_mappings(): string;
+        get_choices(): string[];
+        set_choices(value: string[]): void;
+    }
+    export class FieldChoice extends SP.FieldMultiChoice {
+        get_editFormat(): SP.ChoiceFormatType;
+        set_editFormat(value: SP.ChoiceFormatType): void;
+    }
+    export class FieldCollection extends SP.ClientObjectCollection<Field> {
+        itemAt(index: number): SP.Field;
+        get_item(index: number): SP.Field;
+        get_schemaXml(): string;
+        getByTitle(title: string): SP.Field;
+        getById(id: SP.Guid): SP.Field;
+        add(field: SP.Field): SP.Field;
+        addDependentLookup(displayName: string, primaryLookupField: SP.Field, lookupField: string): SP.Field;
+        addFieldAsXml(schemaXml: string, addToDefaultView: boolean, options: SP.AddFieldOptions): SP.Field;
+        getByInternalNameOrTitle(strName: string): SP.Field;
+    }
+    export class FieldComputed extends SP.Field {
+        get_enableLookup(): boolean;
+        set_enableLookup(value: boolean): void;
+    }
+    export class FieldNumber extends SP.Field {
+        get_maximumValue(): number;
+        set_maximumValue(value: number): void;
+        get_minimumValue(): number;
+        set_minimumValue(value: number): void;
+    }
+    export class FieldCurrency extends SP.FieldNumber {
+        get_currencyLocaleId(): number;
+        set_currencyLocaleId(value: number): void;
+    }
+    export class FieldDateTime extends SP.Field {
+        get_dateTimeCalendarType(): SP.CalendarType;
+        set_dateTimeCalendarType(value: SP.CalendarType): void;
+        get_displayFormat(): SP.DateTimeFieldFormatType;
+        set_displayFormat(value: SP.DateTimeFieldFormatType): void;
+        get_friendlyDisplayFormat(): SP.DateTimeFieldFriendlyFormatType;
+        set_friendlyDisplayFormat(value: SP.DateTimeFieldFriendlyFormatType): void;
+    }
+    export class FieldGeolocation extends SP.Field {
+    }
+    export class FieldGeolocationValue extends SP.ClientValueObject {
+        get_altitude(): number;
+        set_altitude(value: number): void;
+        get_latitude(): number;
+        set_latitude(value: number): void;
+        get_longitude(): number;
+        set_longitude(value: number): void;
+        get_measure(): number;
+        set_measure(value: number): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class FieldGuid extends SP.Field {
+    }
+    export class FieldLink extends SP.ClientObject {
+        get_hidden(): boolean;
+        set_hidden(value: boolean): void;
+        get_id(): SP.Guid;
+        get_name(): string;
+        get_required(): boolean;
+        set_required(value: boolean): void;
+        deleteObject(): void;
+    }
+    export class FieldLinkCollection extends SP.ClientObjectCollection<FieldLink> {
+        itemAt(index: number): SP.FieldLink;
+        get_item(index: number): SP.FieldLink;
+        getById(id: SP.Guid): SP.FieldLink;
+        add(parameters: SP.FieldLinkCreationInformation): SP.FieldLink;
+        reorder(internalNames: string[]): void;
+    }
+    export class FieldLinkCreationInformation extends SP.ClientValueObject {
+        get_field(): SP.Field;
+        set_field(value: SP.Field): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class FieldLookup extends SP.Field {
+        get_allowMultipleValues(): boolean;
+        set_allowMultipleValues(value: boolean): void;
+        get_isRelationship(): boolean;
+        set_isRelationship(value: boolean): void;
+        get_lookupField(): string;
+        set_lookupField(value: string): void;
+        get_lookupList(): string;
+        set_lookupList(value: string): void;
+        get_lookupWebId(): SP.Guid;
+        set_lookupWebId(value: SP.Guid): void;
+        get_primaryFieldId(): string;
+        set_primaryFieldId(value: string): void;
+        get_relationshipDeleteBehavior(): SP.RelationshipDeleteBehaviorType;
+        set_relationshipDeleteBehavior(value: SP.RelationshipDeleteBehaviorType): void;
+    }
+    export class FieldLookupValue extends SP.ClientValueObject {
+        get_lookupId(): number;
+        set_lookupId(value: number): void;
+        get_lookupValue(): string;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class FieldMultiLineText extends SP.Field {
+        get_allowHyperlink(): boolean;
+        set_allowHyperlink(value: boolean): void;
+        get_appendOnly(): boolean;
+        set_appendOnly(value: boolean): void;
+        get_numberOfLines(): number;
+        set_numberOfLines(value: number): void;
+        get_restrictedMode(): boolean;
+        set_restrictedMode(value: boolean): void;
+        get_richText(): boolean;
+        set_richText(value: boolean): void;
+        get_wikiLinking(): boolean;
+    }
+    export class FieldRatingScale extends SP.FieldMultiChoice {
+        get_gridEndNumber(): number;
+        set_gridEndNumber(value: number): void;
+        get_gridNAOptionText(): string;
+        set_gridNAOptionText(value: string): void;
+        get_gridStartNumber(): number;
+        set_gridStartNumber(value: number): void;
+        get_gridTextRangeAverage(): string;
+        set_gridTextRangeAverage(value: string): void;
+        get_gridTextRangeHigh(): string;
+        set_gridTextRangeHigh(value: string): void;
+        get_gridTextRangeLow(): string;
+        set_gridTextRangeLow(value: string): void;
+        get_rangeCount(): number;
+    }
+    export class FieldRatingScaleQuestionAnswer extends SP.ClientValueObject {
+        get_answer(): number;
+        set_answer(value: number): void;
+        get_question(): string;
+        set_question(value: string): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class FieldStringValues extends SP.ClientObject {
+        get_fieldValues(): any;
+        get_item(fieldName: string): string;
+        refreshLoad(): void;
+    }
+    export class FieldText extends SP.Field {
+        get_maxLength(): number;
+        set_maxLength(value: number): void;
+    }
+    export enum FieldType {
+        invalid,
+        integer,
+        text,
+        note,
+        dateTime,
+        counter,
+        choice,
+        lookup,
+        boolean,
+        number,
+        currency,
+        URL,
+        computed,
+        threading,
+        guid,
+        multiChoice,
+        gridChoice,
+        calculated,
+        file,
+        attachments,
+        user,
+        recurrence,
+        crossProjectLink,
+        modStat,
+        error,
+        contentTypeId,
+        pageSeparator,
+        threadIndex,
+        workflowStatus,
+        allDayEvent,
+        workflowEventType,
+        geolocation,
+        outcomeChoice,
+        maxItems,
+    }
+    export class FieldUrl extends SP.Field {
+        get_displayFormat(): SP.UrlFieldFormatType;
+        set_displayFormat(value: SP.UrlFieldFormatType): void;
+    }
+    export class FieldUrlValue extends SP.ClientValueObject {
+        get_description(): string;
+        set_description(value: string): void;
+        get_url(): string;
+        set_url(value: string): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class FieldUser extends SP.FieldLookup {
+        get_allowDisplay(): boolean;
+        set_allowDisplay(value: boolean): void;
+        get_presence(): boolean;
+        set_presence(value: boolean): void;
+        get_selectionGroup(): number;
+        set_selectionGroup(value: number): void;
+        get_selectionMode(): SP.FieldUserSelectionMode;
+        set_selectionMode(value: SP.FieldUserSelectionMode): void;
+    }
+    export enum FieldUserSelectionMode {
+        peopleOnly,
+        peopleAndGroups,
+    }
+    export class FieldUserValue extends SP.FieldLookupValue {
+        static fromUser(userName: string): SP.FieldUserValue;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    /** Represents a file in a SharePoint Web site that can be a Web Part Page, an item in a document library, or a file in a folder. */
+    export class File extends SP.ClientObject {
+        get_author(): SP.User;
+        /** Returns the user who has checked out the file. */
+        get_checkedOutByUser(): SP.User;
+        /** Returns the comment that was specified when the document was checked into the document library. */
+        get_checkInComment(): string;
+        /** The type of checkout that exists on the document. */
+        get_checkOutType(): SP.CheckOutType;
+        get_contentTag(): string;
+        /** Gets the customization(ghost) status of the SPFile. */
+        get_customizedPageStatus(): SP.CustomizedPageStatus;
+        /** Gets the ETag of the file  */
+        get_eTag(): string;
+        /** Specifies whether the file exists  */
+        get_exists(): boolean;
+        get_length(): number;
+        get_level(): SP.FileLevel;
+        /** Specifies the SPListItem corresponding to this file if this file belongs to a doclib. Values for all fields are returned also. */
+        get_listItemAllFields(): SP.ListItem;
+        /** Returns the user that owns the current lock on the file. MUST return null if there is no lock. */
+        get_lockedByUser(): SP.User;
+        /** Specifies the major version of the file. */
+        get_majorVersion(): number;
+        /** Specifies the minor version of the file. */
+        get_minorVersion(): number;
+        get_modifiedBy(): SP.User;
+        get_name(): string;
+        get_serverRelativeUrl(): string;
+        /** Specifies when the file was created. */
+        get_timeCreated(): Date;
+        /** Specifies when the file was created. */
+        get_timeLastModified(): Date;
+        get_title(): string;
+        /** Specifies the implementation-specific version identifier of the file. */
+        get_uIVersion(): number;
+        /** Specifies the implementation-specific version identifier of the file. */
+        get_uIVersionLabel(): string;
+        /** Returns a collection of file version objects that represent the versions of the file. */
+        get_versions(): SP.FileVersionCollection;
+        /** Reverts an existing online or offline checkout for the file. */
+        undoCheckOut(): void;
+        checkIn(comment: string, checkInType: SP.CheckinType): void;
+        publish(comment: string): void;
+        /** Removes the file from content approval with the specified comment. */
+        unPublish(comment: string): void;
+        /** Approves the file submitted for content approval with the specified comment.  */
+        approve(comment: string): void;
+        /** Denies the file submitted for content approval. */
+        deny(comment: string): void;
+        static getContentVerFromTag(context: SP.ClientRuntimeContext, contentTag: string): SP.IntResult;
+        getLimitedWebPartManager(scope: SP.WebParts.PersonalizationScope): SP.WebParts.LimitedWebPartManager;
+        moveTo(newUrl: string, flags: SP.MoveOperations): void;
+        copyTo(strNewUrl: string, bOverWrite: boolean): void;
+        saveBinary(parameters: SP.FileSaveBinaryInformation): void;
+        deleteObject(): void;
+        /** Moves the file to the recycle bin. MUST return the identifier of the new Recycle Bin item */
+        recycle(): SP.GuidResult;
+        checkOut(): void;
+    }
+    export class FileCollection extends SP.ClientObjectCollection<File> {
+        itemAt(index: number): SP.File;
+        get_item(index: number): SP.File;
+        getByUrl(url: string): SP.File;
+        add(parameters: SP.FileCreationInformation): SP.File;
+        addTemplateFile(urlOfFile: string, templateFileType: SP.TemplateFileType): SP.File;
+    }
+    export class FileCreationInformation extends SP.ClientValueObject {
+        get_content(): SP.Base64EncodedByteArray;
+        set_content(value: SP.Base64EncodedByteArray): void;
+        get_overwrite(): boolean;
+        set_overwrite(value: boolean): void;
+        get_url(): string;
+        set_url(value: string): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export enum FileLevel {
+        published,
+        draft,
+        checkout,
+    }
+    export class FileSaveBinaryInformation extends SP.ClientValueObject {
+        get_checkRequiredFields(): boolean;
+        set_checkRequiredFields(value: boolean): void;
+        get_content(): SP.Base64EncodedByteArray;
+        set_content(value: SP.Base64EncodedByteArray): void;
+        get_eTag(): string;
+        set_eTag(value: string): void;
+        get_fieldValues(): any;
+        set_fieldValues(value: any): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export enum FileSystemObjectType {
+        invalid,
+        file,
+        folder,
+        web,
+    }
+    export class FileVersion extends SP.ClientObject {
+        get_checkInComment(): string;
+        get_created(): Date;
+        get_createdBy(): SP.User;
+        get_iD(): number;
+        get_isCurrentVersion(): boolean;
+        get_size(): number;
+        get_url(): string;
+        get_versionLabel(): string;
+        deleteObject(): void;
+    }
+    export class FileVersionCollection extends SP.ClientObjectCollection<FileVersion> {
+        itemAt(index: number): SP.FileVersion;
+        get_item(index: number): SP.FileVersion;
+        getById(versionid: number): SP.FileVersion;
+        deleteByID(vid: number): void;
+        deleteByLabel(versionlabel: string): void;
+        deleteAll(): void;
+        restoreByLabel(versionlabel: string): void;
+    }
+    export class Folder extends SP.ClientObject {
+        get_contentTypeOrder(): SP.ContentTypeId[];
+        get_files(): SP.FileCollection;
+        get_listItemAllFields(): SP.ListItem;
+        get_itemCount(): number;
+        get_name(): string;
+        get_parentFolder(): SP.Folder;
+        get_properties(): SP.PropertyValues;
+        get_serverRelativeUrl(): string;
+        get_folders(): SP.FolderCollection;
+        get_uniqueContentTypeOrder(): SP.ContentTypeId[];
+        set_uniqueContentTypeOrder(value: SP.ContentTypeId[]): void;
+        get_welcomePage(): string;
+        set_welcomePage(value: string): void;
+        update(): void;
+        deleteObject(): void;
+        recycle(): SP.GuidResult;
+    }
+    export class FolderCollection extends SP.ClientObjectCollection<Folder> {
+        itemAt(index: number): SP.Folder;
+        get_item(index: number): SP.Folder;
+        getByUrl(url: string): SP.Folder;
+        add(url: string): SP.Folder;
+    }
+    export class Form extends SP.ClientObject {
+        get_id(): SP.Guid;
+        get_serverRelativeUrl(): string;
+        get_formType(): SP.PageType;
+    }
+    export class FormCollection extends SP.ClientObjectCollection<Form> {
+        itemAt(index: number): SP.Form;
+        get_item(index: number): SP.Form;
+        getByPageType(formType: SP.PageType): SP.Form;
+        getById(id: SP.Guid): SP.Form;
+    }
+    export class Principal extends SP.ClientObject {
+        get_id(): number;
+        get_isHiddenInUI(): boolean;
+        get_loginName(): string;
+        get_title(): string;
+        set_title(value: string): void;
+        get_principalType(): SP.Utilities.PrincipalType;
+    }
+    export class Group extends SP.Principal {
+        get_allowMembersEditMembership(): boolean;
+        set_allowMembersEditMembership(value: boolean): void;
+        get_allowRequestToJoinLeave(): boolean;
+        set_allowRequestToJoinLeave(value: boolean): void;
+        get_autoAcceptRequestToJoinLeave(): boolean;
+        set_autoAcceptRequestToJoinLeave(value: boolean): void;
+        get_canCurrentUserEditMembership(): boolean;
+        get_canCurrentUserManageGroup(): boolean;
+        get_canCurrentUserViewMembership(): boolean;
+        get_description(): string;
+        set_description(value: string): void;
+        get_onlyAllowMembersViewMembership(): boolean;
+        set_onlyAllowMembersViewMembership(value: boolean): void;
+        get_owner(): SP.Principal;
+        set_owner(value: SP.Principal): void;
+        get_ownerTitle(): string;
+        get_requestToJoinLeaveEmailSetting(): string;
+        set_requestToJoinLeaveEmailSetting(value: string): void;
+        get_users(): SP.UserCollection;
+        update(): void;
+    }
+    export class GroupCollection extends SP.ClientObjectCollection<Group> {
+        itemAt(index: number): SP.Group;
+        get_item(index: number): SP.Group;
+        getByName(name: string): SP.Group;
+        getById(id: number): SP.Group;
+        add(parameters: SP.GroupCreationInformation): SP.Group;
+        removeByLoginName(loginName: string): void;
+        removeById(id: number): void;
+        remove(group: SP.Group): void;
+    }
+    export class GroupCreationInformation extends SP.ClientValueObject {
+        get_description(): string;
+        set_description(value: string): void;
+        get_title(): string;
+        set_title(value: string): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class InformationRightsManagementSettings extends SP.ClientObject {
+        get_allowPrint(): boolean;
+        set_allowPrint(value: boolean): void;
+        get_allowScript(): boolean;
+        set_allowScript(value: boolean): void;
+        get_allowWriteCopy(): boolean;
+        set_allowWriteCopy(value: boolean): void;
+        get_disableDocumentBrowserView(): boolean;
+        set_disableDocumentBrowserView(value: boolean): void;
+        get_documentAccessExpireDays(): number;
+        set_documentAccessExpireDays(value: number): void;
+        get_documentLibraryProtectionExpireDate(): Date;
+        set_documentLibraryProtectionExpireDate(value: Date): void;
+        get_enableDocumentAccessExpire(): boolean;
+        set_enableDocumentAccessExpire(value: boolean): void;
+        get_enableDocumentBrowserPublishingView(): boolean;
+        set_enableDocumentBrowserPublishingView(value: boolean): void;
+        get_enableGroupProtection(): boolean;
+        set_enableGroupProtection(value: boolean): void;
+        get_enableLicenseCacheExpire(): boolean;
+        set_enableLicenseCacheExpire(value: boolean): void;
+        get_groupName(): string;
+        set_groupName(value: string): void;
+        get_licenseCacheExpireDays(): number;
+        set_licenseCacheExpireDays(value: number): void;
+        get_policyDescription(): string;
+        set_policyDescription(value: string): void;
+        get_policyTitle(): string;
+        set_policyTitle(value: string): void;
+        reset(): void;
+        update(): void;
+    }
+    export class Language extends SP.ClientValueObject {
+        get_displayName(): string;
+        get_languageTag(): string;
+        get_lcid(): number;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class SecurableObject extends SP.ClientObject {
+        get_firstUniqueAncestorSecurableObject(): SP.SecurableObject;
+        get_hasUniqueRoleAssignments(): boolean;
+        get_roleAssignments(): SP.RoleAssignmentCollection;
+        resetRoleInheritance(): void;
+        breakRoleInheritance(copyRoleAssignments: boolean, clearSubscopes: boolean): void;
+    }
+    /** Represents display mode for a control or form */
+    export enum ControlMode {
+        invalid,
+        displayMode,
+        editMode,
+        newMode
+    }
+    /** Represents a list on a SharePoint Web site. */
+    export class List extends SP.SecurableObject {
+        /** Gets item by id. */
+        getItemById(id: number): SP.ListItem;
+        /** Gets a value that specifies whether the list supports content types. */
+        get_allowContentTypes(): boolean;
+        /** Gets the list definition type on which the list is based. For lists based on OOTB list definitions, return value corresponds the SP.ListTemplateType enumeration. */
+        get_baseTemplate(): number;
+        /** Gets base type for the list. */
+        get_baseType(): SP.BaseType;
+        /** Gets a value that specifies the override of the web application�s BrowserFileHandling property at the list level. */
+        get_browserFileHandling(): SP.BrowserFileHandling;
+        /** Gets the content types that are associated with the list. */
+        get_contentTypes(): SP.ContentTypeCollection;
+        /** Gets a value that specifies whether content types are enabled for the list. */
+        get_contentTypesEnabled(): boolean;
+        /** Sets a value that specifies whether content types are enabled for the list. */
+        set_contentTypesEnabled(value: boolean): void;
+        /** Gets a value that specifies when the list was created. */
+        get_created(): Date;
+        /** Gets the data source associated with the list, or null if the list is not a virtual list. */
+        get_dataSource(): SP.ListDataSource;
+        /** Gets a value that specifies the default workflow identifier for content approval on the list. */
+        get_defaultContentApprovalWorkflowId(): SP.Guid;
+        /** Sets a value that specifies the default workflow identifier for content approval on the list. */
+        set_defaultContentApprovalWorkflowId(value: SP.Guid): void;
+        /** Gets a value that specifies the location of the default display form for the list. */
+        get_defaultDisplayFormUrl(): string;
+        /** Sets a value that specifies the location of the default display form for the list. */
+        set_defaultDisplayFormUrl(value: string): void;
+        /** Gets a value that specifies the URL of the edit form to use for list items in the list. */
+        get_defaultEditFormUrl(): string;
+        /** Sets a value that specifies the URL of the edit form to use for list items in the list. */
+        set_defaultEditFormUrl(value: string): void;
+        /** Gets a value that specifies the location of the default new form for the list. */
+        get_defaultNewFormUrl(): string;
+        /** Sets a value that specifies the location of the default new form for the list. */
+        set_defaultNewFormUrl(value: string): void;
+        /** Gets default view for the list. */
+        get_defaultView(): SP.View;
+        /** Get URL of the default view for the list. */
+        get_defaultViewUrl(): string;
+        /** Gets a value that specifies the description of the list. */
+        get_description(): string;
+        /** Sets a value that specifies the description of the list. */
+        set_description(value: string): void;
+        /** Gets a value that specifies the reading order of the list. */
+        get_direction(): string;
+        /** Sets a value that specifies the reading order of the list. */
+        set_direction(value: string): void;
+        /** Gets a value that specifies the server-relative URL of the document template for the list */
+        get_documentTemplateUrl(): string;
+        /** Sets a value that specifies the server-relative URL of the document template for the list */
+        set_documentTemplateUrl(value: string): void;
+        /** Gets a value that specifies the minimum permission required to view minor versions and drafts within the list. */
+        get_draftVersionVisibility(): SP.DraftVisibilityType;
+        /** Sets a value that specifies the minimum permission required to view minor versions and drafts within the list. */
+        set_draftVersionVisibility(value: SP.DraftVisibilityType): void;
+        /** Gets a value that specifies the effective permissions on the list that are assigned to the current user. */
+        get_effectiveBasePermissions(): SP.BasePermissions;
+        /** Gets the effective base permissions for the current user, as they should be displayed in UI. This will only differ from EffectiveBasePermissions if ReadOnlyUI is set to true, and in all cases will be a subset of EffectiveBasePermissions. To put it another way, EffectiveBasePermissionsForUI will always be as or more restrictive than EffectiveBasePermissions. */
+        get_effectiveBasePermissionsForUI(): SP.BasePermissions;
+        /** Gets a value that specifies whether list item attachments are enabled for the list. */
+        get_enableAttachments(): boolean;
+        /** Sets a value that specifies whether list item attachments are enabled for the list. */
+        set_enableAttachments(value: boolean): void;
+        /** Gets a value that specifies whether new list folders can be added to the list. */
+        get_enableFolderCreation(): boolean;
+        /** Sets a value that specifies whether new list folders can be added to the list. */
+        set_enableFolderCreation(value: boolean): void;
+        /** Gets a value that specifies whether minor versions are enabled for the list. */
+        get_enableMinorVersions(): boolean;
+        /** Sets a value that specifies whether minor versions are enabled for the list. */
+        set_enableMinorVersions(value: boolean): void;
+        /** Gets a value that specifies whether content approval is enabled for the list. */
+        get_enableModeration(): boolean;
+        /** Sets a value that specifies whether content approval is enabled for the list */
+        set_enableModeration(value: boolean): void;
+        /** Gets a value that specifies whether historical versions of list items and documents can be created in the list */
+        get_enableVersioning(): boolean;
+        /** Sets a value that specifies whether historical versions of list items and documents can be created in the list */
+        set_enableVersioning(value: boolean): void;
+        /** The entity type name. */
+        get_entityTypeName(): string;
+        /** Gets collection of event receiver objects associated with the list. */
+        get_eventReceivers(): SP.EventReceiverDefinitionCollection;
+        /** Gets a value that specifies the collection of all fields in the list. */
+        get_fields(): SP.FieldCollection;
+        /** Gets a value that indicates whether forced checkout is enabled for the document library. */
+        get_forceCheckout(): boolean;
+        /** Sets a value that indicates whether forced checkout is enabled for the document library */
+        set_forceCheckout(value: boolean): void;
+        /** Gets collections of forms associated with the list. */
+        get_forms(): SP.FormCollection;
+        /** Returns true if this is external list. */
+        get_hasExternalDataSource(): boolean;
+        /** Gets wherever the list is hidden */
+        get_hidden(): boolean;
+        /** Sets if the list is hidden from "All site contents" or not. */
+        set_hidden(value: boolean): void;
+        /** Gets id of the list */
+        get_id(): SP.Guid;
+        /** Gets a value that specifies the URI for the icon of the list */
+        get_imageUrl(): string;
+        /** Sets a value that specifies the URI for the icon of the list */
+        set_imageUrl(value: string): void;
+        /** Settings of document library Information Rights Management (IRM)  */
+        get_informationRightsManagementSettings(): SP.InformationRightsManagementSettings;
+        /** Gets a value that specifies whether Information Rights Management (IRM) is enabled for the list.  */
+        get_irmEnabled(): boolean;
+        /** Sets a value that specifies whether Information Rights Management (IRM) is enabled for the list.  */
+        set_irmEnabled(value: boolean): void;
+        /** Gets a value that specifies whether Information Rights Management (IRM) expiration is enabled for the list.  */
+        get_irmExpire(): boolean;
+        /** Sets a value that specifies whether Information Rights Management (IRM) expiration is enabled for the list.  */
+        set_irmExpire(value: boolean): void;
+        /** Gets a value that specifies whether Information Rights Management (IRM) rejection is enabled for the list.  */
+        get_irmReject(): boolean;
+        /** Sets a value that specifies whether Information Rights Management (IRM) rejection is enabled for the list.  */
+        set_irmReject(value: boolean): void;
+        /** Indicates whether this list should be treated as a top level navigation object or not.  */
+        get_isApplicationList(): boolean;
+        /** Sets a value that indicates whether this list should be treated as a top level navigation object or not.  */
+        set_isApplicationList(value: boolean): void;
+        /** Gets a value that specifies whether the list is a gallery. */
+        get_isCatalog(): boolean;
+        /** Gets a value that indicates whether the document library is a private list with restricted permissions, such as for Solutions.  */
+        get_isPrivate(): boolean;
+        /** Gets a value that indicates whether the list is designated as a default asset location for images or other files which the users upload to their wiki pages. */
+        get_isSiteAssetsLibrary(): boolean;
+        /** Gets a value that specifies the number of list items in the list */
+        get_itemCount(): number;
+        /** Gets a value that specifies the last time a list item was deleted from the list. */
+        get_lastItemDeletedDate(): Date;
+        /** Gets a value that specifies the last time a list item, field, or property of the list was modified. */
+        get_lastItemModifiedDate(): Date;
+        /** Sets a value that specifies the last time the list was modified. */
+        set_lastItemModifiedDate(value: Date): void;
+        /** The entity type full name of the list item in the list. */
+        get_listItemEntityTypeFullName(): string;
+        /** Gets a value that indicates whether the list in a Meeting Workspace site contains data for multiple meeting instances within the site */
+        get_multipleDataList(): boolean;
+        /** Sets a value that indicates whether the list in a Meeting Workspace site contains data for multiple meeting instances within the site */
+        set_multipleDataList(value: boolean): void;
+        /** Gets a value that specifies that the crawler must not crawl the list */
+        get_noCrawl(): boolean;
+        /** Sets a value that specifies that the crawler must not crawl the list */
+        set_noCrawl(value: boolean): void;
+        /** Gets a value that specifies whether the list appears on the Quick Launch of the site */
+        get_onQuickLaunch(): boolean;
+        /** Sets a value that specifies whether the list appears on the Quick Launch of the site */
+        set_onQuickLaunch(value: boolean): void;
+        /** Gets a value that specifies the site that contains the list. */
+        get_parentWeb(): SP.Web;
+        /** Gets a value that specifies the server-relative URL of the site that contains the list. */
+        get_parentWebUrl(): string;
+        /** Gets the root folder that contains the files in the list and any related files. */
+        get_rootFolder(): SP.Folder;
+        /** Gets a value that specifies the list schema of the list. */
+        get_schemaXml(): string;
+        /** Gets a value that indicates whether folders can be created within the list. */
+        get_serverTemplateCanCreateFolders(): boolean;
+        /** Gets a value that specifies the feature identifier of the feature that contains the list schema for the list. */
+        get_templateFeatureId(): SP.Guid;
+        /** Gets the list title. You can determine list URL from it's root folder URL. */
+        get_title(): string;
+        /** Sets the list title. To change list URL you should change name of the root folder. */
+        set_title(value: string): void;
+        /** Gets collection of custom actions associated with the list. */
+        get_userCustomActions(): SP.UserCustomActionCollection;
+        /** Gets a value that specifies the data validation criteria for a list item. */
+        get_validationFormula(): string;
+        /** Sets a value that specifies the data validation criteria for a list item. */
+        set_validationFormula(value: string): void;
+        /** Gets a value that specifies the error message returned when data validation fails for a list item. */
+        get_validationMessage(): string;
+        /** Sets a value that specifies the error message returned when data validation fails for a list item. */
+        set_validationMessage(value: string): void;
+        /** Returns collection of views added to the list */
+        get_views(): SP.ViewCollection;
+        /** Gets the collection of workflow association objects that represents all the workflows that are associated with the list. */
+        get_workflowAssociations(): SP.Workflow.WorkflowAssociationCollection;
+        /** Returns the collection of changes from the change log that have occurred within the list, based on the specified query. */
+        getChanges(query: SP.ChangeQuery): SP.ChangeCollection;
+        /** Returns array of items describing changes since time specified in the query */
+        getListItemChangesSinceToken(query: SP.ChangeLogItemQuery): any[];
+        /** Gets the effective permissions that a specified user has on the list. */
+        getUserEffectivePermissions(userName: string): SP.BasePermissions;
+        /** First tries to find if the view already exists. Overwrite it if yes, add a new view if no. Then extract all the adhoc filter/sort info from the URL and build and update the view's xml Returns the url of the new/overwritten view.
+            @param oldName The name of the view the user did the adhoc filter on (is currently on).
+            @param newName The desired name the user typed
+            @param privateView Boolean true when the user wants make a new view that's personal
+            @param uri Url that keeps all the adhoc filter/sort inforatmion */
+        saveAsNewView(oldName: string, newName: string, privateView: boolean, uri: string): SP.StringResult;
+        /** Returns a collection of lookup fields that use this list as a data source and that have FieldLookup.IsRelationship set to true. */
+        getRelatedFields(): SP.RelatedFieldCollection;
+        /** This member is reserved for internal use and is not intended to be used directly from your code. */
+        getRelatedFieldsExtendedData(): SP.RelatedFieldExtendedDataCollection;
+        /** Returns json string which contains all information necessary for rendering the specified list form for the specified itemId. Mode is SP.ControlMode */
+        renderListFormData(itemId: number, formId: string, mode: SP.ControlMode): SP.StringResult;
+        /** Returns the data for the specified query view. */
+        renderListData(viewXml: string): SP.StringResult;
+        /** This member is reserved for internal use and is not intended to be used directly from your code. */
+        reserveListItemId(): SP.IntResult;
+        /** Updates the database with changes that are made to the list object. */
+        update(): void;
+        /** Returns the list view with the specified view identifier. */
+        getView(viewGuid: SP.Guid): SP.View;
+        /** Deletes the list. */
+        deleteObject(): void;
+        /** Sends the list to the site recycle bin. */
+        recycle(): SP.GuidResult;
+        /** Returns collection of list items based on the specified CAML query. */
+        getItems(query: SP.CamlQuery): SP.ListItemCollection;
+        /** Creates a new list item in the list. */
+        addItem(parameters: SP.ListItemCreationInformation): SP.ListItem;
+    }
+    /** Represents a collection of SP.List objects */
+    export class ListCollection extends SP.ClientObjectCollection<List> {
+        /** Gets the list at the specified index in the collection. */
+        itemAt(index: number): SP.List;
+        /** Gets the list at the specified index in the collection. */
+        get_item(index: number): SP.List;
+        /** Returns the list with the specified title from the collection. */
+        getByTitle(title: string): SP.List;
+        /** Returns the list with the specified list identifier. */
+        getById(id: SP.Guid): SP.List;
+        /** Returns the list with the specified list identifier. */
+        getById(id: string): SP.List;
+        /** Creates a new list or a document library. */
+        add(parameters: SP.ListCreationInformation): SP.List;
+        /** Gets a list that is the default location for wiki pages. */
+        ensureSitePagesLibrary(): SP.List;
+        /** Gets a list that is the default asset location for images or other files, which the users upload to their wiki pages. */
+        ensureSiteAssetsLibrary(): SP.List;
+    }
+    export class ListCreationInformation extends SP.ClientValueObject {
+        get_customSchemaXml(): string;
+        set_customSchemaXml(value: string): void;
+        get_dataSourceProperties(): any;
+        set_dataSourceProperties(value: any): void;
+        get_description(): string;
+        set_description(value: string): void;
+        get_documentTemplateType(): number;
+        set_documentTemplateType(value: number): void;
+        get_quickLaunchOption(): SP.QuickLaunchOptions;
+        set_quickLaunchOption(value: SP.QuickLaunchOptions): void;
+        get_templateFeatureId(): SP.Guid;
+        set_templateFeatureId(value: SP.Guid): void;
+        get_templateType(): number;
+        set_templateType(value: number): void;
+        get_title(): string;
+        set_title(value: string): void;
+        get_url(): string;
+        set_url(value: string): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class ListDataSource extends SP.ClientValueObject {
+        get_properties(): any;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class ListDataValidationExceptionValue extends SP.ClientValueObject {
+        get_fieldFailures(): SP.ListDataValidationFailure[];
+        get_itemFailure(): SP.ListDataValidationFailure;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class ListDataValidationFailure extends SP.ClientValueObject {
+        get_displayName(): string;
+        get_message(): string;
+        get_name(): string;
+        get_reason(): SP.ListDataValidationFailureReason;
+        get_validationType(): SP.ListDataValidationType;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export enum ListDataValidationFailureReason {
+        dataFailure,
+        formulaError,
+    }
+    export enum ListDataValidationType {
+        userFormulaField,
+        userFormulaItem,
+        requiredField,
+        choiceField,
+        minMaxField,
+        textField,
+    }
+    /** Represents an item or row in a list. */
+    export class ListItem extends SP.SecurableObject {
+        get_fieldValues(): any;
+        /** Gets the specified field value for the list item. Field value is returned as string, but it can be casted to a specific field value type, e.g. SP.LookupFieldValue, etc. */
+        get_item(fieldInternalName: string): any;
+        /** Sets the specified field value for the list item. Consider using parseAndSetFieldValue instead. */
+        set_item(fieldInternalName: string, value: any): void;
+        /** Gets collection of objects that represent attachments for the list item. */
+        get_attachmentFiles(): SP.AttachmentCollection;
+        /** Gets the content type of the item. */
+        get_contentType(): SP.ContentType;
+        /** Gets a value that specifies the display name of the list item.
+            This property is not available by default when you return list items. Trying to call this method returns a PropertyOrFieldNotInitializedException if you try to access one of these properties. To access this property, use the Include method as part of the query string. */
+        get_displayName(): string;
+        /** Gets a value that specifies the effective permissions on the list item that are assigned to the current user.
+            This property is not available by default when you return list items. Trying to call this method returns a PropertyOrFieldNotInitializedException if you try to access one of these properties. To access this property, use the Include method as part of the query string. */
+        get_effectiveBasePermissions(): SP.BasePermissions;
+        /** Gets the effective base permissions for the current user, as they should be displayed in UI.
+            This will only differ from EffectiveBasePermissions if ReadOnlyUI is set to true on the item's parent list, and in all cases will be a subset of EffectiveBasePermissions. To put it another way, EffectiveBasePermissionsForUI will always be as or more restrictive than EffectiveBasePermissions.
+            This property is not available by default when you return list items. Trying to call this method returns a PropertyOrFieldNotInitializedException if you try to access one of these properties. To access this property, use the Include method as part of the query string.  */
+        get_effectiveBasePermissionsForUI(): SP.BasePermissions;
+        get_fieldValuesAsHtml(): SP.FieldStringValues;
+        get_fieldValuesAsText(): SP.FieldStringValues;
+        get_fieldValuesForEdit(): SP.FieldStringValues;
+        /** Gets the file that is represented by the item from a document library. Only for document libraries. */
+        get_file(): SP.File;
+        /** Gets or sets the file system object type for the item (file, folder or invalid). */
+        get_fileSystemObjectType(): SP.FileSystemObjectType;
+        /** Gets the parent folder for the list item */
+        get_folder(): SP.Folder;
+        /** Gets id of the item */
+        get_id(): number;
+        /** Get the list in which the item resides. */
+        get_parentList(): SP.List;
+        refreshLoad(): void;
+        getWOPIFrameUrl(action: SP.Utilities.SPWOPIFrameAction): SP.StringResult;
+        /** Commits changed properties of the list item. The actual update is performed during context.executeQueryAsync method call. */
+        update(): void;
+        /** Deletes the list item */
+        deleteObject(): void;
+        /** Moves the list item to the Recycle Bin and returns the identifier of the new Recycle Bin item. */
+        recycle(): SP.GuidResult;
+        /** Gets effective permissions for the specified user. */
+        getUserEffectivePermissions(userName: string): SP.BasePermissions;
+        /** Sets the value of the field for the list item based on an implementation specific transformation of the value. */
+        parseAndSetFieldValue(fieldInternalName: string, value: string): void;
+        /** Validates form values specified for the list item. Errors are returned through hasException and errorMessage properties of the ListItemFormUpdateValue objects */
+        validateUpdateListItem(formValues: SP.ListItemFormUpdateValue[], bNewDocumentUpdate: boolean): SP.ListItemFormUpdateValue[];
+    }
+    export class ListItemCollection extends SP.ClientObjectCollection<ListItem> {
+        itemAt(index: number): SP.ListItem;
+        get_item(index: number): SP.ListItem;
+        getById(id: number): SP.ListItem;
+        getById(id: string): SP.ListItem;
+        get_listItemCollectionPosition(): SP.ListItemCollectionPosition;
+    }
+    export class ListItemCollectionPosition extends SP.ClientValueObject {
+        get_pagingInfo(): string;
+        set_pagingInfo(value: string): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    /** Specifies the properties of the new list item. */
+    export class ListItemCreationInformation extends SP.ClientValueObject {
+        get_folderUrl(): string;
+        /** Sets a value that specifies the folder for the new list item. */
+        set_folderUrl(value: string): void;
+        get_leafName(): string;
+        /** Sets a value that specifies the name of the new list item. It must be the name of the file if the parent list of the list item is a document library. */
+        set_leafName(value: string): void;
+        get_underlyingObjectType(): SP.FileSystemObjectType;
+        /** Sets a value that specifies whether the new list item is a file or a folder. */
+        set_underlyingObjectType(value: SP.FileSystemObjectType): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class ListItemEntityCollection extends SP.ClientObjectCollection<ListItem> {
+        itemAt(index: number): SP.ListItem;
+        get_item(index: number): SP.ListItem;
+    }
+    export class ListItemFormUpdateValue extends SP.ClientValueObject {
+        get_errorMessage(): string;
+        set_errorMessage(value: string): void;
+        get_fieldName(): string;
+        set_fieldName(value: string): void;
+        get_fieldValue(): string;
+        set_fieldValue(value: string): void;
+        get_hasException(): boolean;
+        set_hasException(value: boolean): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class ListTemplate extends SP.ClientObject {
+        get_allowsFolderCreation(): boolean;
+        get_baseType(): SP.BaseType;
+        get_description(): string;
+        get_featureId(): SP.Guid;
+        get_hidden(): boolean;
+        get_imageUrl(): string;
+        get_internalName(): string;
+        get_isCustomTemplate(): boolean;
+        get_name(): string;
+        get_onQuickLaunch(): boolean;
+        get_listTemplateTypeKind(): number;
+        get_unique(): boolean;
+    }
+    export class ListTemplateCollection extends SP.ClientObjectCollection<ListTemplate> {
+        itemAt(index: number): SP.ListTemplate;
+        get_item(index: number): SP.ListTemplate;
+        getByName(name: string): SP.ListTemplate;
+    }
+    export enum ListTemplateType {
+        invalidType,
+        noListTemplate,
+        genericList,
+        documentLibrary,
+        survey,
+        links,
+        announcements,
+        contacts,
+        events,
+        tasks,
+        discussionBoard,
+        pictureLibrary,
+        dataSources,
+        webTemplateCatalog,
+        userInformation,
+        webPartCatalog,
+        listTemplateCatalog,
+        xMLForm,
+        masterPageCatalog,
+        noCodeWorkflows,
+        workflowProcess,
+        webPageLibrary,
+        customGrid,
+        solutionCatalog,
+        noCodePublic,
+        themeCatalog,
+        designCatalog,
+        appDataCatalog,
+        dataConnectionLibrary,
+        workflowHistory,
+        ganttTasks,
+        helpLibrary,
+        accessRequest,
+        tasksWithTimelineAndHierarchy,
+        maintenanceLogs,
+        meetings,
+        agenda,
+        meetingUser,
+        decision,
+        meetingObjective,
+        textBox,
+        thingsToBring,
+        homePageLibrary,
+        posts,
+        comments,
+        categories,
+        facility,
+        whereabouts,
+        callTrack,
+        circulation,
+        timecard,
+        holidays,
+        iMEDic,
+        externalList,
+        mySiteDocumentLibrary,
+        issueTracking,
+        adminTasks,
+        healthRules,
+        healthReports,
+        developerSiteDraftApps,
+    }
+    export enum MoveOperations {
+        none,
+        overwrite,
+        allowBrokenThickets,
+        bypassApprovePermission,
+    }
+    export class Navigation extends SP.ClientObject {
+        get_quickLaunch(): SP.NavigationNodeCollection;
+        get_topNavigationBar(): SP.NavigationNodeCollection;
+        get_useShared(): boolean;
+        set_useShared(value: boolean): void;
+        getNodeById(id: number): SP.NavigationNode;
+    }
+    export class NavigationNode extends SP.ClientObject {
+        get_children(): SP.NavigationNodeCollection;
+        get_id(): number;
+        get_isDocLib(): boolean;
+        get_isExternal(): boolean;
+        get_isVisible(): boolean;
+        set_isVisible(value: boolean): void;
+        get_title(): string;
+        set_title(value: string): void;
+        get_url(): string;
+        set_url(value: string): void;
+        update(): void;
+        deleteObject(): void;
+    }
+    export class NavigationNodeCollection extends SP.ClientObjectCollection<NavigationNode> {
+        itemAt(index: number): SP.NavigationNode;
+        get_item(index: number): SP.NavigationNode;
+        add(parameters: SP.NavigationNodeCreationInformation): SP.NavigationNode;
+    }
+    export class NavigationNodeCreationInformation extends SP.ClientValueObject {
+        get_asLastNode(): boolean;
+        set_asLastNode(value: boolean): void;
+        get_isExternal(): boolean;
+        set_isExternal(value: boolean): void;
+        get_previousNode(): SP.NavigationNode;
+        set_previousNode(value: SP.NavigationNode): void;
+        get_title(): string;
+        set_title(value: string): void;
+        get_url(): string;
+        set_url(value: string): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class ObjectSharingInformation extends SP.ClientObject {
+        get_anonymousEditLink(): string;
+        get_anonymousViewLink(): string;
+        get_canManagePermissions(): boolean;
+        get_hasPendingAccessRequests(): boolean;
+        get_hasPermissionLevels(): boolean;
+        get_isSharedWithCurrentUser(): boolean;
+        get_isSharedWithGuest(): boolean;
+        get_isSharedWithMany(): boolean;
+        get_isSharedWithSecurityGroup(): boolean;
+        get_pendingAccessRequestsLink(): string;
+        getSharedWithUsers(): SP.ClientObjectList<SP.ObjectSharingInformationUser>;
+        static getListItemSharingInformation(context: SP.ClientRuntimeContext, listID: SP.Guid, itemID: number, excludeCurrentUser: boolean, excludeSiteAdmin: boolean, excludeSecurityGroups: boolean, retrieveAnonymousLinks: boolean, retrieveUserInfoDetails: boolean, checkForAccessRequests: boolean): SP.ObjectSharingInformation;
+        static getWebSharingInformation(context: SP.ClientRuntimeContext, excludeCurrentUser: boolean, excludeSiteAdmin: boolean, excludeSecurityGroups: boolean, retrieveAnonymousLinks: boolean, retrieveUserInfoDetails: boolean, checkForAccessRequests: boolean): SP.ObjectSharingInformation;
+        static getObjectSharingInformation(context: SP.ClientRuntimeContext, securableObject: SP.SecurableObject, excludeCurrentUser: boolean, excludeSiteAdmin: boolean, excludeSecurityGroups: boolean, retrieveAnonymousLinks: boolean, retrieveUserInfoDetails: boolean, checkForAccessRequests: boolean, retrievePermissionLevels: boolean): SP.ObjectSharingInformation;
+    }
+    export class ObjectSharingInformationUser extends SP.ClientObject {
+        get_customRoleNames(): string;
+        get_department(): string;
+        get_email(): string;
+        get_hasEditPermission(): boolean;
+        get_hasViewPermission(): boolean;
+        get_id(): number;
+        get_isSiteAdmin(): boolean;
+        get_jobTitle(): string;
+        get_loginName(): string;
+        get_name(): string;
+        get_picture(): string;
+        get_principal(): SP.Principal;
+        get_sipAddress(): string;
+        get_user(): SP.User;
+    }
+    export enum OpenWebOptions {
+        none,
+        initNavigationCache,
+    }
+    export enum PageType {
+        invalid,
+        defaultView,
+        normalView,
+        dialogView,
+        view,
+        displayForm,
+        displayFormDialog,
+        editForm,
+        editFormDialog,
+        newForm,
+        newFormDialog,
+        solutionForm,
+        pAGE_MAXITEMS,
+    }
+    export class PropertyValues extends SP.ClientObject {
+        get_fieldValues(): any;
+        get_item(fieldName: string): any;
+        set_item(fieldName: string, value: any): void;
+        refreshLoad(): void;
+    }
+    export class PushNotificationSubscriber extends SP.ClientObject {
+        get_customArgs(): string;
+        set_customArgs(value: string): void;
+        get_deviceAppInstanceId(): SP.Guid;
+        get_lastModifiedTimeStamp(): Date;
+        get_registrationTimeStamp(): Date;
+        get_serviceToken(): string;
+        set_serviceToken(value: string): void;
+        get_subscriberType(): string;
+        set_subscriberType(value: string): void;
+        get_user(): SP.User;
+        update(): void;
+    }
+    export class PushNotificationSubscriberCollection extends SP.ClientObjectCollection<PushNotificationSubscriber> {
+        itemAt(index: number): SP.PushNotificationSubscriber;
+        get_item(index: number): SP.PushNotificationSubscriber;
+        getByStoreId(id: string): SP.PushNotificationSubscriber;
+    }
+    export enum QuickLaunchOptions {
+        off,
+        on,
+        defaultValue,
+    }
+    export class RecycleBinItem extends SP.ClientObject {
+        get_author(): SP.User;
+        get_deletedBy(): SP.User;
+        get_deletedDate(): Date;
+        get_dirName(): string;
+        get_id(): SP.Guid;
+        get_itemState(): SP.RecycleBinItemState;
+        get_itemType(): SP.RecycleBinItemType;
+        get_leafName(): string;
+        get_size(): number;
+        get_title(): string;
+        deleteObject(): void;
+        restore(): void;
+    }
+    export class RecycleBinItemCollection extends SP.ClientObjectCollection<RecycleBinItem> {
+        itemAt(index: number): SP.RecycleBinItem;
+        get_item(index: number): SP.RecycleBinItem;
+        getById(id: SP.Guid): SP.RecycleBinItem;
+        deleteAll(): void;
+        restoreAll(): void;
+    }
+    export enum RecycleBinItemState {
+        none,
+        firstStageRecycleBin,
+        secondStageRecycleBin,
+    }
+    export enum RecycleBinItemType {
+        none,
+        file,
+        fileVersion,
+        listItem,
+        list,
+        folder,
+        folderWithLists,
+        attachment,
+        listItemVersion,
+        cascadeParent,
+        web,
+    }
+    export class RegionalSettings extends SP.ClientObject {
+        get_adjustHijriDays(): number;
+        get_alternateCalendarType(): number;
+        get_aM(): string;
+        get_calendarType(): number;
+        get_collation(): number;
+        get_collationLCID(): number;
+        get_dateFormat(): number;
+        get_dateSeparator(): string;
+        get_decimalSeparator(): string;
+        get_digitGrouping(): string;
+        get_firstDayOfWeek(): number;
+        get_firstWeekOfYear(): number;
+        get_isEastAsia(): boolean;
+        get_isRightToLeft(): boolean;
+        get_isUIRightToLeft(): boolean;
+        get_listSeparator(): string;
+        get_localeId(): number;
+        get_negativeSign(): string;
+        get_negNumberMode(): number;
+        get_pM(): string;
+        get_positiveSign(): string;
+        get_showWeeks(): boolean;
+        get_thousandSeparator(): string;
+        get_time24(): boolean;
+        get_timeMarkerPosition(): number;
+        get_timeSeparator(): string;
+        get_timeZone(): SP.TimeZone;
+        get_timeZones(): SP.TimeZoneCollection;
+        get_workDayEndHour(): number;
+        get_workDays(): number;
+        get_workDayStartHour(): number;
+    }
+    export class RelatedField extends SP.ClientObject {
+        get_fieldId(): SP.Guid;
+        get_listId(): SP.Guid;
+        get_lookupList(): SP.List;
+        get_relationshipDeleteBehavior(): SP.RelationshipDeleteBehaviorType;
+        get_webId(): SP.Guid;
+    }
+    export class RelatedFieldCollection extends SP.ClientObjectCollection<RelatedField> {
+        itemAt(index: number): SP.RelatedField;
+        get_item(index: number): SP.RelatedField;
+    }
+    export class RelatedFieldExtendedData extends SP.ClientObject {
+        get_fieldId(): SP.Guid;
+        get_listId(): SP.Guid;
+        get_listImageUrl(): string;
+        get_resolvedListTitle(): string;
+        get_toolTipDescription(): string;
+        get_webId(): SP.Guid;
+    }
+    export class RelatedFieldExtendedDataCollection extends SP.ClientObjectCollection<RelatedFieldExtendedData> {
+        itemAt(index: number): SP.RelatedFieldExtendedData;
+        get_item(index: number): SP.RelatedFieldExtendedData;
+    }
+    export class RelatedItem extends SP.ClientValueObject {
+        get_iconUrl(): string;
+        set_iconUrl(value: string): void;
+        get_itemId(): number;
+        set_itemId(value: number): void;
+        get_listId(): string;
+        set_listId(value: string): void;
+        get_title(): string;
+        set_title(value: string): void;
+        get_url(): string;
+        set_url(value: string): void;
+        get_webId(): string;
+        set_webId(value: string): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class RelatedItemManager extends SP.ClientObject {
+        static getRelatedItems(context: SP.ClientRuntimeContext, SourceListName: string, SourceItemID: number): SP.RelatedItem[];
+        static getPageOneRelatedItems(context: SP.ClientRuntimeContext, SourceListName: string, SourceItemID: number): SP.RelatedItem[];
+        static addSingleLink(context: SP.ClientRuntimeContext, SourceListName: string, SourceItemID: number, SourceWebUrl: string, TargetListName: string, TargetItemID: number, TargetWebUrl: string, TryAddReverseLink: boolean): void;
+        static addSingleLinkToUrl(context: SP.ClientRuntimeContext, SourceListName: string, SourceItemID: number, TargetItemUrl: string, TryAddReverseLink: boolean): void;
+        static addSingleLinkFromUrl(context: SP.ClientRuntimeContext, SourceItemUrl: string, TargetListName: string, TargetItemID: number, TryAddReverseLink: boolean): void;
+        static deleteSingleLink(context: SP.ClientRuntimeContext, SourceListName: string, SourceItemID: number, SourceWebUrl: string, TargetListName: string, TargetItemID: number, TargetWebUrl: string, TryDeleteReverseLink: boolean): void;
+    }
+    export enum RelationshipDeleteBehaviorType {
+        none,
+        cascade,
+        restrict,
+    }
+    export class RequestVariable extends SP.ClientObject {
+        constructor(context: SP.ClientRuntimeContext);
+        get_value(): string;
+        static newObject(context: SP.ClientRuntimeContext): SP.RequestVariable;
+        append(value: string): void;
+        set(value: string): void;
+    }
+    export class RoleAssignment extends SP.ClientObject {
+        get_member(): SP.Principal;
+        get_principalId(): number;
+        get_roleDefinitionBindings(): SP.RoleDefinitionBindingCollection;
+        importRoleDefinitionBindings(roleDefinitionBindings: SP.RoleDefinitionBindingCollection): void;
+        update(): void;
+        deleteObject(): void;
+    }
+    export class RoleAssignmentCollection extends SP.ClientObjectCollection<RoleAssignment> {
+        itemAt(index: number): SP.RoleAssignment;
+        get_item(index: number): SP.RoleAssignment;
+        get_groups(): SP.GroupCollection;
+        getByPrincipal(principalToFind: SP.Principal): SP.RoleAssignment;
+        getByPrincipalId(principalId: number): SP.RoleAssignment;
+        add(principal: SP.Principal, roleBindings: SP.RoleDefinitionBindingCollection): SP.RoleAssignment;
+    }
+    export class RoleDefinition extends SP.ClientObject {
+        get_basePermissions(): SP.BasePermissions;
+        set_basePermissions(value: SP.BasePermissions): void;
+        get_description(): string;
+        set_description(value: string): void;
+        get_hidden(): boolean;
+        get_id(): number;
+        get_name(): string;
+        set_name(value: string): void;
+        get_order(): number;
+        set_order(value: number): void;
+        get_roleTypeKind(): SP.RoleType;
+        update(): void;
+        deleteObject(): void;
+    }
+    export class RoleDefinitionBindingCollection extends SP.ClientObjectCollection<RoleDefinition> {
+        itemAt(index: number): SP.RoleDefinition;
+        get_item(index: number): SP.RoleDefinition;
+        constructor(context: SP.ClientRuntimeContext);
+        static newObject(context: SP.ClientRuntimeContext): SP.RoleDefinitionBindingCollection;
+        add(roleDefinition: SP.RoleDefinition): void;
+        remove(roleDefinition: SP.RoleDefinition): void;
+        removeAll(): void;
+    }
+    export class RoleDefinitionCollection extends SP.ClientObjectCollection<RoleDefinition> {
+        itemAt(index: number): SP.RoleDefinition;
+        get_item(index: number): SP.RoleDefinition;
+        getByName(name: string): SP.RoleDefinition;
+        add(parameters: SP.RoleDefinitionCreationInformation): SP.RoleDefinition;
+        getById(id: number): SP.RoleDefinition;
+        getByType(roleType: SP.RoleType): SP.RoleDefinition;
+    }
+    export class RoleDefinitionCreationInformation extends SP.ClientValueObject {
+        get_basePermissions(): SP.BasePermissions;
+        set_basePermissions(value: SP.BasePermissions): void;
+        get_description(): string;
+        set_description(value: string): void;
+        get_name(): string;
+        set_name(value: string): void;
+        get_order(): number;
+        set_order(value: number): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export enum RoleType {
+        none,
+        guest,
+        reader,
+        contributor,
+        webDesigner,
+        administrator,
+        editor,
+    }
+    export class ServerSettings {
+        static getAlternateUrls(context: SP.ClientRuntimeContext): SP.ClientObjectList<SP.AlternateUrl>;
+        static getGlobalInstalledLanguages(context: SP.ClientRuntimeContext, compatibilityLevel: number): SP.Language[];
+    }
+    export class Site extends SP.ClientObject {
+        get_allowDesigner(): boolean;
+        set_allowDesigner(value: boolean): void;
+        get_allowMasterPageEditing(): boolean;
+        set_allowMasterPageEditing(value: boolean): void;
+        get_allowRevertFromTemplate(): boolean;
+        set_allowRevertFromTemplate(value: boolean): void;
+        get_allowSelfServiceUpgrade(): boolean;
+        set_allowSelfServiceUpgrade(value: boolean): void;
+        get_allowSelfServiceUpgradeEvaluation(): boolean;
+        set_allowSelfServiceUpgradeEvaluation(value: boolean): void;
+        get_canUpgrade(): boolean;
+        get_compatibilityLevel(): number;
+        get_eventReceivers(): SP.EventReceiverDefinitionCollection;
+        get_features(): SP.FeatureCollection;
+        get_id(): SP.Guid;
+        get_lockIssue(): string;
+        get_maxItemsPerThrottledOperation(): number;
+        get_owner(): SP.User;
+        set_owner(value: SP.User): void;
+        get_primaryUri(): string;
+        get_readOnly(): boolean;
+        get_recycleBin(): SP.RecycleBinItemCollection;
+        get_rootWeb(): SP.Web;
+        get_serverRelativeUrl(): string;
+        get_shareByLinkEnabled(): boolean;
+        get_showUrlStructure(): boolean;
+        set_showUrlStructure(value: boolean): void;
+        get_uIVersionConfigurationEnabled(): boolean;
+        set_uIVersionConfigurationEnabled(value: boolean): void;
+        get_upgradeInfo(): SP.UpgradeInfo;
+        get_upgradeReminderDate(): Date;
+        get_upgrading(): boolean;
+        get_url(): string;
+        get_usage(): SP.UsageInfo;
+        get_userCustomActions(): SP.UserCustomActionCollection;
+        updateClientObjectModelUseRemoteAPIsPermissionSetting(requireUseRemoteAPIs: boolean): void;
+        needsUpgradeByType(versionUpgrade: boolean, recursive: boolean): SP.BooleanResult;
+        runHealthCheck(ruleId: SP.Guid, bRepair: boolean, bRunAlways: boolean): SP.SiteHealth.SiteHealthSummary;
+        createPreviewSPSite(upgrade: boolean, sendemail: boolean): void;
+        runUpgradeSiteSession(versionUpgrade: boolean, queueOnly: boolean, sendEmail: boolean): void;
+        getChanges(query: SP.ChangeQuery): SP.ChangeCollection;
+        openWeb(strUrl: string): SP.Web;
+        openWebById(gWebId: SP.Guid): SP.Web;
+        getWebTemplates(LCID: number, overrideCompatLevel: number): SP.WebTemplateCollection;
+        getCustomListTemplates(web: SP.Web): SP.ListTemplateCollection;
+        getCatalog(typeCatalog: number): SP.List;
+        extendUpgradeReminderDate(): void;
+        invalidate(): void;
+    }
+    export class SiteUrl extends SP.ClientObject {
+    }
+    export class SubwebQuery extends SP.ClientValueObject {
+        get_configurationFilter(): number;
+        set_configurationFilter(value: number): void;
+        get_webTemplateFilter(): number;
+        set_webTemplateFilter(value: number): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export enum TemplateFileType {
+        standardPage,
+        wikiPage,
+        formPage,
+    }
+    export class ThemeInfo extends SP.ClientObject {
+        get_accessibleDescription(): string;
+        get_themeBackgroundImageUri(): string;
+        getThemeShadeByName(name: string): SP.StringResult;
+        getThemeFontByName(name: string, lcid: number): SP.StringResult;
+    }
+    export class TimeZone extends SP.ClientObject {
+        get_description(): string;
+        get_id(): number;
+        get_information(): SP.TimeZoneInformation;
+        localTimeToUTC(date: Date): SP.DateTimeResult;
+        utcToLocalTime(date: Date): SP.DateTimeResult;
+    }
+    export class TimeZoneCollection extends SP.ClientObjectCollection<TimeZone> {
+        itemAt(index: number): SP.TimeZone;
+        get_item(index: number): SP.TimeZone;
+        getById(id: number): SP.TimeZone;
+    }
+    export class TimeZoneInformation extends SP.ClientValueObject {
+        get_bias(): number;
+        get_daylightBias(): number;
+        get_standardBias(): number;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class UpgradeInfo extends SP.ClientValueObject {
+        get_errorFile(): string;
+        get_errors(): number;
+        get_lastUpdated(): Date;
+        get_logFile(): string;
+        get_requestDate(): Date;
+        get_retryCount(): number;
+        get_startTime(): Date;
+        get_status(): SP.UpgradeStatus;
+        get_upgradeType(): SP.UpgradeType;
+        get_warnings(): number;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export enum UpgradeStatus {
+        none,
+        inProgress,
+        failed,
+        completed,
+    }
+    export enum UpgradeType {
+        buildUpgrade,
+        versionUpgrade,
+    }
+    export enum UrlFieldFormatType {
+        hyperlink,
+        image,
+    }
+    export enum UrlZone {
+        defaultZone,
+        intranet,
+        internet,
+        custom,
+        extranet,
+    }
+    export class UsageInfo extends SP.ClientValueObject {
+        get_bandwidth(): number;
+        get_discussionStorage(): number;
+        get_hits(): number;
+        get_storage(): number;
+        get_storagePercentageUsed(): number;
+        get_visits(): number;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class User extends SP.Principal {
+        get_email(): string;
+        set_email(value: string): void;
+        get_groups(): SP.GroupCollection;
+        get_isSiteAdmin(): boolean;
+        set_isSiteAdmin(value: boolean): void;
+        get_userId(): SP.UserIdInfo;
+        update(): void;
+    }
+    export class UserCollection extends SP.ClientObjectCollection<User> {
+        itemAt(index: number): SP.User;
+        get_item(index: number): SP.User;
+        getByLoginName(loginName: string): SP.User;
+        getById(id: number): SP.User;
+        getByEmail(emailAddress: string): SP.User;
+        removeByLoginName(loginName: string): void;
+        removeById(id: number): void;
+        remove(user: SP.User): void;
+        add(parameters: SP.UserCreationInformation): SP.User;
+        addUser(user: SP.User): SP.User;
+    }
+    export class UserCreationInformation extends SP.ClientValueObject {
+        get_email(): string;
+        set_email(value: string): void;
+        get_loginName(): string;
+        set_loginName(value: string): void;
+        get_title(): string;
+        set_title(value: string): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class UserCustomAction extends SP.ClientObject {
+        get_commandUIExtension(): string;
+        set_commandUIExtension(value: string): void;
+        get_description(): string;
+        set_description(value: string): void;
+        get_group(): string;
+        set_group(value: string): void;
+        get_id(): SP.Guid;
+        get_imageUrl(): string;
+        set_imageUrl(value: string): void;
+        get_location(): string;
+        set_location(value: string): void;
+        get_name(): string;
+        set_name(value: string): void;
+        get_registrationId(): string;
+        set_registrationId(value: string): void;
+        get_registrationType(): SP.UserCustomActionRegistrationType;
+        set_registrationType(value: SP.UserCustomActionRegistrationType): void;
+        get_rights(): SP.BasePermissions;
+        set_rights(value: SP.BasePermissions): void;
+        get_scope(): SP.UserCustomActionScope;
+        get_scriptBlock(): string;
+        set_scriptBlock(value: string): void;
+        get_scriptSrc(): string;
+        set_scriptSrc(value: string): void;
+        get_sequence(): number;
+        set_sequence(value: number): void;
+        get_title(): string;
+        set_title(value: string): void;
+        get_url(): string;
+        set_url(value: string): void;
+        get_versionOfUserCustomAction(): string;
+        update(): void;
+        deleteObject(): void;
+    }
+    export class UserCustomActionCollection extends SP.ClientObjectCollection<UserCustomAction> {
+        itemAt(index: number): SP.UserCustomAction;
+        get_item(index: number): SP.UserCustomAction;
+        getById(id: SP.Guid): SP.UserCustomAction;
+        clear(): void;
+        add(): SP.UserCustomAction;
+    }
+    export enum UserCustomActionRegistrationType {
+        none,
+        list,
+        contentType,
+        progId,
+        fileType,
+    }
+    export enum UserCustomActionScope {
+        unknown,
+        site,
+        web,
+        list,
+    }
+    export class UserIdInfo extends SP.ClientValueObject {
+        get_nameId(): string;
+        get_nameIdIssuer(): string;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class View extends SP.ClientObject {
+        get_aggregations(): string;
+        set_aggregations(value: string): void;
+        get_aggregationsStatus(): string;
+        set_aggregationsStatus(value: string): void;
+        get_baseViewId(): string;
+        get_contentTypeId(): SP.ContentTypeId;
+        set_contentTypeId(value: SP.ContentTypeId): void;
+        get_defaultView(): boolean;
+        set_defaultView(value: boolean): void;
+        get_defaultViewForContentType(): boolean;
+        set_defaultViewForContentType(value: boolean): void;
+        get_editorModified(): boolean;
+        set_editorModified(value: boolean): void;
+        get_formats(): string;
+        set_formats(value: string): void;
+        get_hidden(): boolean;
+        set_hidden(value: boolean): void;
+        get_htmlSchemaXml(): string;
+        get_id(): SP.Guid;
+        get_imageUrl(): string;
+        get_includeRootFolder(): boolean;
+        set_includeRootFolder(value: boolean): void;
+        get_viewJoins(): string;
+        set_viewJoins(value: string): void;
+        get_jsLink(): string;
+        set_jsLink(value: string): void;
+        get_listViewXml(): string;
+        set_listViewXml(value: string): void;
+        get_method(): string;
+        set_method(value: string): void;
+        get_mobileDefaultView(): boolean;
+        set_mobileDefaultView(value: boolean): void;
+        get_mobileView(): boolean;
+        set_mobileView(value: boolean): void;
+        get_moderationType(): string;
+        get_orderedView(): boolean;
+        get_paged(): boolean;
+        set_paged(value: boolean): void;
+        get_personalView(): boolean;
+        get_viewProjectedFields(): string;
+        set_viewProjectedFields(value: string): void;
+        get_viewQuery(): string;
+        set_viewQuery(value: string): void;
+        get_readOnlyView(): boolean;
+        get_requiresClientIntegration(): boolean;
+        get_rowLimit(): number;
+        set_rowLimit(value: number): void;
+        get_scope(): SP.ViewScope;
+        set_scope(value: SP.ViewScope): void;
+        get_serverRelativeUrl(): string;
+        get_styleId(): string;
+        get_threaded(): boolean;
+        get_title(): string;
+        set_title(value: string): void;
+        get_toolbar(): string;
+        set_toolbar(value: string): void;
+        get_toolbarTemplateName(): string;
+        get_viewType(): string;
+        get_viewData(): string;
+        set_viewData(value: string): void;
+        get_viewFields(): SP.ViewFieldCollection;
+        deleteObject(): void;
+        renderAsHtml(): SP.StringResult;
+        update(): void;
+    }
+    export class ViewCollection extends SP.ClientObjectCollection<View> {
+        itemAt(index: number): SP.View;
+        get_item(index: number): SP.View;
+        getByTitle(strTitle: string): SP.View;
+        getById(guidId: SP.Guid): SP.View;
+        add(parameters: SP.ViewCreationInformation): SP.View;
+    }
+    export class ViewCreationInformation extends SP.ClientValueObject {
+        get_paged(): boolean;
+        set_paged(value: boolean): void;
+        get_personalView(): boolean;
+        set_personalView(value: boolean): void;
+        get_query(): string;
+        set_query(value: string): void;
+        get_rowLimit(): number;
+        set_rowLimit(value: number): void;
+        get_setAsDefaultView(): boolean;
+        set_setAsDefaultView(value: boolean): void;
+        get_title(): string;
+        set_title(value: string): void;
+        get_viewFields(): string[];
+        set_viewFields(value: string[]): void;
+        get_viewTypeKind(): SP.ViewType;
+        set_viewTypeKind(value: SP.ViewType): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class ViewFieldCollection extends SP.ClientObjectCollection<string> {
+        itemAt(index: number): string;
+        get_item(index: number): string;
+        get_schemaXml(): string;
+        moveFieldTo(field: string, index: number): void;
+        add(strField: string): void;
+        remove(strField: string): void;
+        removeAll(): void;
+    }
+    export enum ViewScope {
+        defaultValue,
+        recursive,
+        recursiveAll,
+        filesOnly,
+    }
+    export enum ViewType {
+        none,
+        html,
+        grid,
+        calendar,
+        recurrence,
+        chart,
+        gantt,
+    }
+    export class Web extends SP.SecurableObject {
+        get_allowDesignerForCurrentUser(): boolean;
+        get_allowMasterPageEditingForCurrentUser(): boolean;
+        get_allowRevertFromTemplateForCurrentUser(): boolean;
+        get_allowRssFeeds(): boolean;
+        get_allProperties(): SP.PropertyValues;
+        get_appInstanceId(): SP.Guid;
+        get_associatedMemberGroup(): SP.Group;
+        set_associatedMemberGroup(value: SP.Group): void;
+        get_associatedOwnerGroup(): SP.Group;
+        set_associatedOwnerGroup(value: SP.Group): void;
+        get_associatedVisitorGroup(): SP.Group;
+        set_associatedVisitorGroup(value: SP.Group): void;
+        get_availableContentTypes(): SP.ContentTypeCollection;
+        get_availableFields(): SP.FieldCollection;
+        get_configuration(): number;
+        get_contentTypes(): SP.ContentTypeCollection;
+        get_created(): Date;
+        get_currentUser(): SP.User;
+        get_customMasterUrl(): string;
+        set_customMasterUrl(value: string): void;
+        get_description(): string;
+        set_description(value: string): void;
+        get_documentLibraryCalloutOfficeWebAppPreviewersDisabled(): boolean;
+        get_effectiveBasePermissions(): SP.BasePermissions;
+        get_enableMinimalDownload(): boolean;
+        set_enableMinimalDownload(value: boolean): void;
+        get_eventReceivers(): SP.EventReceiverDefinitionCollection;
+        get_features(): SP.FeatureCollection;
+        get_fields(): SP.FieldCollection;
+        get_folders(): SP.FolderCollection;
+        get_id(): SP.Guid;
+        get_language(): number;
+        get_lastItemModifiedDate(): Date;
+        get_lists(): SP.ListCollection;
+        get_listTemplates(): SP.ListTemplateCollection;
+        get_masterUrl(): string;
+        set_masterUrl(value: string): void;
+        get_navigation(): SP.Navigation;
+        get_parentWeb(): SP.WebInformation;
+        get_pushNotificationSubscribers(): SP.PushNotificationSubscriberCollection;
+        get_quickLaunchEnabled(): boolean;
+        set_quickLaunchEnabled(value: boolean): void;
+        get_recycleBin(): SP.RecycleBinItemCollection;
+        get_recycleBinEnabled(): boolean;
+        get_regionalSettings(): SP.RegionalSettings;
+        get_roleDefinitions(): SP.RoleDefinitionCollection;
+        get_rootFolder(): SP.Folder;
+        get_saveSiteAsTemplateEnabled(): boolean;
+        set_saveSiteAsTemplateEnabled(value: boolean): void;
+        get_serverRelativeUrl(): string;
+        set_serverRelativeUrl(value: string): void;
+        get_showUrlStructureForCurrentUser(): boolean;
+        get_siteGroups(): SP.GroupCollection;
+        get_siteUserInfoList(): SP.List;
+        get_siteUsers(): SP.UserCollection;
+        get_supportedUILanguageIds(): number[];
+        get_syndicationEnabled(): boolean;
+        set_syndicationEnabled(value: boolean): void;
+        get_themeInfo(): SP.ThemeInfo;
+        get_title(): string;
+        set_title(value: string): void;
+        get_treeViewEnabled(): boolean;
+        set_treeViewEnabled(value: boolean): void;
+        get_uIVersion(): number;
+        set_uIVersion(value: number): void;
+        get_uIVersionConfigurationEnabled(): boolean;
+        set_uIVersionConfigurationEnabled(value: boolean): void;
+        get_url(): string;
+        get_userCustomActions(): SP.UserCustomActionCollection;
+        get_webs(): SP.WebCollection;
+        get_webTemplate(): string;
+        get_workflowAssociations(): SP.Workflow.WorkflowAssociationCollection;
+        get_workflowTemplates(): SP.Workflow.WorkflowTemplateCollection;
+        doesUserHavePermissions(permissionMask: SP.BasePermissions): SP.BooleanResult;
+        getUserEffectivePermissions(userName: string): SP.BasePermissions;
+        mapToIcon(fileName: string, progId: string, size: SP.Utilities.IconSize): SP.StringResult;
+        registerPushNotificationSubscriber(deviceAppInstanceId: SP.Guid, serviceToken: string): SP.PushNotificationSubscriber;
+        unregisterPushNotificationSubscriber(deviceAppInstanceId: SP.Guid): void;
+        getPushNotificationSubscribersByArgs(customArgs: string): SP.PushNotificationSubscriberCollection;
+        getPushNotificationSubscribersByUser(userName: string): SP.PushNotificationSubscriberCollection;
+        doesPushNotificationSubscriberExist(deviceAppInstanceId: SP.Guid): SP.BooleanResult;
+        getPushNotificationSubscriber(deviceAppInstanceId: SP.Guid): SP.PushNotificationSubscriber;
+        getUserById(userId: number): SP.User;
+        getAvailableWebTemplates(lcid: number, doIncludeCrossLanguage: boolean): SP.WebTemplateCollection;
+        getCatalog(typeCatalog: number): SP.List;
+        getChanges(query: SP.ChangeQuery): SP.ChangeCollection;
+        applyWebTemplate(webTemplate: string): void;
+        deleteObject(): void;
+        update(): void;
+        getFileByServerRelativeUrl(serverRelativeUrl: string): SP.File;
+        getFolderByServerRelativeUrl(serverRelativeUrl: string): SP.Folder;
+        getEntity(namespace: string, name: string): SP.BusinessData.Entity;
+        getAppBdcCatalogForAppInstance(appInstanceId: SP.Guid): SP.BusinessData.AppBdcCatalog;
+        getAppBdcCatalog(): SP.BusinessData.AppBdcCatalog;
+        getSubwebsForCurrentUser(query: SP.SubwebQuery): SP.WebCollection;
+        getAppInstanceById(appInstanceId: SP.Guid): SP.AppInstance;
+        getAppInstancesByProductId(productId: SP.Guid): SP.ClientObjectList<SP.AppInstance>;
+        loadAndInstallAppInSpecifiedLocale(appPackageStream: SP.Base64EncodedByteArray, installationLocaleLCID: number): SP.AppInstance;
+        loadApp(appPackageStream: SP.Base64EncodedByteArray, installationLocaleLCID: number): SP.AppInstance;
+        loadAndInstallApp(appPackageStream: SP.Base64EncodedByteArray): SP.AppInstance;
+        ensureUser(logonName: string): SP.User;
+        applyTheme(colorPaletteUrl: string, fontSchemeUrl: string, backgroundImageUrl: string, shareGenerated: boolean): void;
+
+        /** Available after March 2015 CU for SharePoint 2013*/
+        getList(url: string): List;
+    }
+    export class WebCollection extends SP.ClientObjectCollection<Web> {
+        itemAt(index: number): SP.Web;
+        get_item(index: number): SP.Web;
+        add(parameters: SP.WebCreationInformation): SP.Web;
+    }
+    export class WebCreationInformation extends SP.ClientValueObject {
+        get_description(): string;
+        set_description(value: string): void;
+        get_language(): number;
+        set_language(value: number): void;
+        get_title(): string;
+        set_title(value: string): void;
+        get_url(): string;
+        set_url(value: string): void;
+        get_useSamePermissionsAsParentSite(): boolean;
+        set_useSamePermissionsAsParentSite(value: boolean): void;
+        get_webTemplate(): string;
+        set_webTemplate(value: string): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class WebInformation extends SP.ClientObject {
+        get_configuration(): number;
+        get_created(): Date;
+        get_description(): string;
+        get_id(): SP.Guid;
+        get_language(): number;
+        get_lastItemModifiedDate(): Date;
+        get_serverRelativeUrl(): string;
+        get_title(): string;
+        get_webTemplate(): string;
+        get_webTemplateId(): number;
+    }
+    export class WebProxy {
+        static invoke(context: SP.ClientRuntimeContext, requestInfo: SP.WebRequestInfo): SP.WebResponseInfo;
+    }
+    export class WebRequestInfo extends SP.ClientValueObject {
+        get_body(): string;
+        set_body(value: string): void;
+        get_headers(): any;
+        set_headers(value: any): void;
+        get_method(): string;
+        set_method(value: string): void;
+        get_url(): string;
+        set_url(value: string): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class WebResponseInfo extends SP.ClientValueObject {
+        get_body(): string;
+        set_body(value: string): void;
+        get_headers(): any;
+        set_headers(value: any): void;
+        get_statusCode(): number;
+        set_statusCode(value: number): void;
+        get_typeId(): string;
+        writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+        constructor();
+    }
+    export class WebTemplate extends SP.ClientObject {
+        get_description(): string;
+        get_displayCategory(): string;
+        get_id(): number;
+        get_imageUrl(): string;
+        get_isHidden(): boolean;
+        get_isRootWebOnly(): boolean;
+        get_isSubWebOnly(): boolean;
+        get_lcid(): number;
+        get_name(): string;
+        get_title(): string;
+    }
+    export class WebTemplateCollection extends SP.ClientObjectCollection<WebTemplate> {
+        itemAt(index: number): SP.WebTemplate;
+        get_item(index: number): SP.WebTemplate;
+        getByName(name: string): SP.WebTemplate;
+    }
+
+    export module Application {
+        export module UI {
+            export interface DefaultFormsInformationRequestor {
+                onDefaultFormsInformationRetrieveSuccess(defaultForms: SP.Application.UI.DefaultFormsInformation): void;
+                onDefaultFormsInformationRetrieveFailure(): void;
+            }
+            export class FormsInfo {
+                ContentTypeName: string;
+                NewFormUrl: string;
+                DisplayFormUrl: string;
+                EditFormUrl: string;
+                constructor();
+            }
+            export class DefaultFormsInformation {
+                DefaultForms: SP.Application.UI.FormsInfo;
+                OtherForms: any;
+                constructor();
+            }
+            export class DefaultFormsMenuBuilder {
+                static getDefaultFormsInformation(requestor: SP.Application.UI.DefaultFormsInformationRequestor, listId: SP.Guid): void;
+            }
+            export class ViewSelectorMenuOptions {
+                showRepairView: boolean;
+                showMergeView: boolean;
+                showEditView: boolean;
+                showCreateView: boolean;
+                showApproverView: boolean;
+                listId: string;
+                viewId: string;
+                viewParameters: string;
+                constructor();
+            }
+            export interface ViewInformationRequestor {
+                onViewInformationReturned(viewGroups: SP.Application.UI.ViewSelectorGroups): void;
+            }
+            export class ViewSelectorGroups {
+                ModeratedViews: any;
+                PublicViews: any;
+                PersonalViews: any;
+                OtherViews: any;
+                DefaultView: SP.Application.UI.ViewSelectorMenuItem;
+                ViewCreation: any;
+                constructor();
+            }
+            export class ViewSelectorMenuItem {
+                Text: string;
+                ActionScriptText: string;
+                NavigateUrl: string;
+                ImageSourceUrl: string;
+                Description: string;
+                Id: string;
+                Sequence: number;
+                ItemType: string;
+                GroupId: number;
+                constructor();
+            }
+            export class ViewSelectorSubMenu {
+                Text: string;
+                ImageSourceUrl: string;
+                SubMenuItems: any;
+                constructor();
+            }
+            export class ViewSelectorMenuBuilder {
+                static get_filterMenuItemsCallback(): (menuItems: any) => any;
+                static set_filterMenuItemsCallback(value: (menuItems: any) => any): void;
+                static showMenu(elem: HTMLElement, options: SP.Application.UI.ViewSelectorMenuOptions): void;
+                static getViewInformation(requestor: SP.Application.UI.ViewInformationRequestor, options: SP.Application.UI.ViewSelectorMenuOptions): void;
+            }
+            export class MoreColorsPicker extends Sys.UI.Control {
+                constructor(e: HTMLElement);
+                initialize(): void;
+                dispose(): void;
+                get_colorValue(): string;
+                set_colorValue(value: string): void;
+            }
+            export class MoreColorsPage extends Sys.UI.Control {
+                constructor(e: HTMLElement);
+                initialize(): void;
+                dispose(): void;
+                get_moreColorsPicker(): SP.Application.UI.MoreColorsPicker;
+                set_moreColorsPicker(value: SP.Application.UI.MoreColorsPicker): void;
+            }
+            export class ThemeWebPage extends Sys.UI.Control {
+                add_themeDisplayUpdated(value: (sender: any, e: Sys.EventArgs) => void): void;
+                remove_themeDisplayUpdated(value: (sender: any, e: Sys.EventArgs) => void): void;
+                constructor(e: HTMLElement);
+                initialize(): void;
+                dispose(): void;
+                onThemeSelectionChanged(evt: Sys.UI.DomEvent): void;
+                updateThemeDisplay(): void;
+                get_thmxThemes(): any;
+                set_thmxThemes(value: any): void;
+            }
+            export class WikiPageNameInPlaceEditor {
+                constructor(ownerDoc: any, displayElemId: string, editElemId: string, editTextBoxId: string);
+                editingPageCallback(): void;
+                savingPageCallback(): void;
+            }
+        }
+    }
+
+
+    export module Analytics {
+        export class AnalyticsUsageEntry extends SP.ClientObject {
+            static logAnalyticsEvent(context: SP.ClientRuntimeContext, eventTypeId: number, itemId: string): void;
+            static logAnalyticsEvent2(context: SP.ClientRuntimeContext, eventTypeId: number, itemId: string, rollupScopeId: SP.Guid, siteId: SP.Guid, userId: string): void;
+            static logAnalyticsAppEvent(context: SP.ClientRuntimeContext, appEventTypeId: SP.Guid, itemId: string): void;
+            static logAnalyticsAppEvent2(context: SP.ClientRuntimeContext, appEventTypeId: SP.Guid, itemId: string, rollupScopeId: SP.Guid, siteId: SP.Guid, userId: string): void;
+        }
+        export enum EventTypeId {
+            none,
+            first,
+            view,
+            recommendationView,
+            recommendationClick,
+            last,
+        }
+    }
+
+    export module SiteHealth {
+        export class SiteHealthResult extends SP.ClientValueObject {
+            get_messageAsText(): string;
+            get_ruleHelpLink(): string;
+            get_ruleId(): SP.Guid;
+            get_ruleIsRepairable(): boolean;
+            get_ruleName(): string;
+            get_status(): SP.SiteHealth.SiteHealthStatusType;
+            set_status(value: SP.SiteHealth.SiteHealthStatusType): void;
+            get_timeStamp(): Date;
+            set_timeStamp(value: Date): void;
+            get_typeId(): string;
+            writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+            constructor();
+        }
+        export enum SiteHealthStatusType {
+            passed,
+            failedWarning,
+            failedError,
+        }
+        export class SiteHealthSummary extends SP.ClientObject {
+            get_failedErrorCount(): number;
+            get_failedWarningCount(): number;
+            get_passedCount(): number;
+            get_results(): SP.SiteHealth.SiteHealthResult[];
+        }
+    }
+
+}
+
+
+
+
+declare namespace Microsoft.SharePoint.Client.Search {
+    namespace Query {
+
+        /**Contains information common to all types of search queries.*/
+        export class Query extends SP.ClientObject {
+            get_blockDedupeMode: () => number;
+            set_blockDedupeMode: (value: number) => void;
+
+            get_bypassResultTypes: () => boolean;
+            set_bypassResultTypes: (value: boolean) => void;
+
+            get_clientType: () => string;
+            set_clientType: (value: string) => void;
+
+            get_culture: () => number;
+            set_culture: (value: number) => void;
+
+            get_desiredSnippetLength: () => number;
+            set_desiredSnippetLength: (value: number) => void;
+
+            get_enableInterleaving: () => boolean;
+            set_enableInterleaving: (value: boolean) => void;
+
+            get_enableNicknames: () => boolean;
+            set_enableNicknames: (value: boolean) => void;
+
+            get_enableOrderingHitHighlightedProperty: () => boolean;
+            set_enableOrderingHitHighlightedProperty: (value: boolean) => void;
+
+            get_enablePhonetic: () => boolean;
+            set_enablePhonetic: (value: boolean) => void;
+
+            get_enableQueryRules: () => boolean;
+            set_enableQueryRules: (value: boolean) => void;
+
+            get_enableStemming: () => boolean;
+            set_enableStemming: (value: boolean) => void;
+
+            get_generateBlockRankLog: () => boolean;
+            set_generateBlockRankLog: (value: boolean) => void;
+
+            get_hitHighlightedMultivaluePropertyLimit: () => number;
+            set_hitHighlightedMultivaluePropertyLimit: (value: number) => void;
+
+            get_hitHighlightedProperties: () => StringCollection;
+
+            get_ignoreSafeQueryPropertiesTemplateUrl: () => boolean;
+            set_ignoreSafeQueryPropertiesTemplateUrl: (value: boolean) => void;
+
+            get_impressionID: () => string;
+            set_impressionID: (value: string) => void;
+
+            get_maxSnippetLength: () => number;
+            set_maxSnippetLength: (value: number) => void;
+
+            get_personalizationData: () => QueryPersonalizationData;
+            set_personalizationData: (value: QueryPersonalizationData) => void;
+
+            get_processBestBets: () => boolean;
+            set_processBestBets: (value: boolean) => void;
+
+            get_processPersonalFavorites: () => boolean;
+            set_processPersonalFavorites: (value: boolean) => void;
+
+            get_queryTag: () => string;
+            set_queryTag: (value: string) => void;
+
+            get_queryTemplate: () => string;
+            set_queryTemplate: (value: string) => void;
+
+            get_queryTemplateParameters: () => { [key: string]: boolean; };
+
+            get_queryText: () => string;
+            set_queryText: (value: string) => void;
+
+            get_rankingModelId: () => string;
+            set_rankingModelId: (value: string) => void;
+
+            get_resultsUrl: () => string;
+            set_resultsUrl: (value: string) => void;
+
+            get_rowLimit: () => number;
+            set_rowLimit: (value: number) => void;
+
+            get_rowsPerPage: () => number;
+            set_rowsPerPage: (value: number) => void;
+
+            get_safeQueryPropertiesTemplateUrl: () => string;
+            set_safeQueryPropertiesTemplateUrl: (value: string) => void;
+
+            get_showPeopleNameSuggestions: () => boolean;
+            set_showPeopleNameSuggestions: (value: boolean) => void;
+
+            get_sourceId: () => SP.Guid;
+            set_sourceId: (value: SP.Guid) => void;
+
+            get_startRow: () => number;
+            set_startRow: (value: number) => void;
+
+            get_summaryLength: () => number;
+            set_summaryLength: (value: number) => void;
+
+            get_timeout: () => number;
+            set_timeout: (value: number) => void;
+
+            get_totalRowsExactMinimum: () => number;
+            set_totalRowsExactMinimum: (value: number) => void;
+
+            get_trimDuplicates: () => boolean;
+            set_trimDuplicates: (value: boolean) => void;
+
+
+            get_uiLanguage: () => number;
+            set_uiLanguage: (value: number) => void;
+
+
+
+            getQuerySuggestionsWithResults: (iNumberOfQuerySuggestions: number,
+                iNumberOfResultSuggestions: number,
+                fPreQuerySuggestions: boolean,
+                fHitHighlighting: boolean,
+                fCapitalizeFirstLetters: boolean,
+                fPrefixMatchAllTerms: boolean) => QuerySuggestionResults;
+
+
+        }
+
+        /**Contains information about a keyword based search query.*/
+        export class KeywordQuery extends Query {
+            constructor(context: SP.ClientContext);
+
+            get_collapseSpecification: () => string;
+            set_collapseSpecification: (value: string) => void;
+
+            get_enableSorting: () => boolean;
+            set_enableSorting: (value: boolean) => void;
+
+            get_hiddenConstraints: () => string;
+            set_hiddenConstraints: (value: string) => void;
+
+            get_properties: () => KeywordQueryProperties;
+
+            get_refinementFilters: () => StringCollection;
+            set_refinementFilters: (value: StringCollection) => void;
+
+            get_refiners: () => string;
+            set_refiners: (value: string) => void;
+
+            get_reorderingRules: () => ReorderingRuleCollection;
+            set_reorderingRules: (value: ReorderingRuleCollection) => void;
+
+            /**Specifies the list of managed properties to be returned for each search result.*/
+            get_selectProperties: () => StringCollection;
+
+            get_sortList: () => SortCollection;
+
+            get_trimDuplicatesIncludeId: () => number;
+            set_trimDuplicatesIncludeId: (value: number) => void;
+        }
+
+        /**Executes queries against a search server.*/
+        export class SearchExecutor extends SP.ClientObject {
+            constructor(context: SP.ClientContext);
+
+            /**Runs a query.*/
+            executeQuery: (query: Query) => SP.JsonObjectResult;
+            executeQueries: (queryIds: string[], queries: Query[], handleExceptions: boolean) => SP.JsonObjectResult;
+            recordPageClick: (
+                pageInfo: string,
+                clickType: string,
+                blockType: number,
+                clickedResultId: string,
+                subResultIndex: number,
+                immediacySourceId: string,
+                immediacyQueryString: string,
+                immediacyTitle: string,
+                immediacyUrl: string) => void;
+            exportPopularQueries: (web: SP.Web, sourceId: SP.Guid) => SP.JsonObjectResult;
+        }
+
+
+        export class StringCollection extends SP.ClientObjectCollection<string> {
+            constructor(context: SP.ClientContext);
+            itemAt: (index: number) => string;
+            get_item: (index: number) => string;
+            get_childItemType: () => Object;
+            add: (property: string) => void;
+            clear: () => void;
+        }
+
+        export class QueryPersonalizationData extends SP.ClientObject {
+            //It's really empty;
+        }
+
+        export class QuerySuggestionResults extends SP.ClientValueObject {
+            get_peopleNames: () => string[];
+            set_peopleNames: (value: string[]) => void;
+
+            get_personalResults: () => PersonalResultSuggestion[];
+            set_personalResults: (value: PersonalResultSuggestion[]) => void;
+
+            get_queries: () => QuerySuggestionQuery[];
+            set_queries: (value: QuerySuggestionQuery[]) => void;
+        }
+
+        export class PersonalResultSuggestion extends SP.ClientValueObject {
+            get_highlightedTitle: () => string;
+            set_highlightedTitle: (value: string) => void;
+
+            get_isBestBet: () => boolean;
+            set_isBestBet: (value: boolean) => void;
+
+            get_title: () => string;
+            set_title: (value: string) => void;
+
+            get_url: () => string;
+            set_url: (value: string) => void;
+        }
+
+        export class QuerySuggestionQuery extends SP.ClientValueObject {
+            get_isPersonal: () => boolean;
+            set_isPersonal: (value: boolean) => void;
+
+            get_query: () => string;
+            set_query: (value: string) => void;
+        }
+
+        export class KeywordQueryProperties extends SP.ClientObject {
+            get_item: (key: string) => any;
+            set_item: (key: string, value: any) => void;
+            setQueryPropertyValue: (name: string) => QueryPropertyValue;
+            getQueryPropertyValue: (name: string, value: QueryPropertyValue) => void;
+        }
+
+        export enum QueryPropertyValueType {
+            none,
+            stringType,
+            int32TYpe,
+            booleanType,
+            stringArrayType,
+            unSupportedType
+        }
+
+        export class QueryPropertyValue extends SP.ClientValueObject {
+            get_boolVal: () => boolean;
+            set_boolVal: (value: boolean) => boolean;
+
+            get_intVal: () => number;
+            set_intVal: (value: number) => number;
+            get_queryPropertyValueTypeIndex: () => number;
+            set_queryPropertyValueTypeIndex: (value: number) => void;
+            get_strArray: () => string[];
+            set_strArray: (value: string[]) => string[];
+            get_strVal: () => string;
+            set_strVal: (value: string) => string;
+        }
+
+        export class QueryUtility {
+            static create: (name: string, val: any) => QueryPropertyValue;
+            static getQueryPropertyValueType: (val: QueryPropertyValue) => QueryPropertyValueType;
+            static queryPropertyValueToObject: (val: QueryPropertyValue) => any;
+        }
+        export class ReorderingRuleCollection extends SP.ClientObjectCollection<ReorderingRule> {
+            itemAt: (index: number) => ReorderingRule;
+            get_item: (index: number) => ReorderingRule;
+            get_childItemType: () => Object;
+            add: (property: ReorderingRule) => void;
+            clear: () => void;
+        }
+
+        export enum ReorderingRuleMatchType {
+            resultContainsKeyword,
+            titleContainsKeyword,
+            titleMatchesKeyword,
+            urlStartsWith,
+            urlExactlyMatches,
+            contentTypeIs,
+            fileExtensionMatches,
+            resultHasTag,
+            manualCondition
+        }
+
+        export class ReorderingRule extends SP.ClientValueObject {
+            get_boost: () => number;
+            set_boost: (value: number) => void;
+
+            get_matchType: () => ReorderingRuleMatchType;
+            set_matchType: (value: ReorderingRuleMatchType) => void;
+
+            get_matchValue: () => string;
+            set_matchValue: (value: string) => void;
+        }
+
+        export class SortCollection extends SP.ClientObjectCollection<Sort> {
+            itemAt: (index: number) => Sort;
+            get_item: (index: number) => Sort;
+            get_childItemType: () => Object;
+            add: (strProperty: string, sortDirection: SortDirection) => void;
+            clear: () => void;
+        }
+
+        enum SortDirection {
+            ascending,
+            descending,
+            fqlFormula
+        }
+        export class Sort extends SP.ClientValueObject {
+            get_direction: () => SortDirection;
+            set_direction: (value: SortDirection) => void;
+
+            get_property: () => string;
+            set_property: (value: string) => void;
+        }
+
+
+        export class ResultTableCollection extends SP.ClientValueObjectCollection<ResultTable> {
+            get_item: (index: number) => ResultTable;
+
+            get_elapsedTime: () => number;
+            set_elapsedTime: (value: number) => void;
+
+            get_properties: () => { [key: string]: any; };
+
+            get_queryErrors: () => { [key: string]: WebControls.ControlMessage; };
+
+            get_queryId: () => string;
+
+            get_spellingSuggestion: () => string;
+
+            get_triggeredRules: () => SP.Guid[];
+
+            initPropertiesFromJson: (parentNode: any) => void;
+
+        }
+
+        export class ResultTable extends SP.ClientValueObject {
+            get_groupTemplateId: () => string;
+
+            get_itemTemplateId: () => string;
+
+            get_properties: () => { [key: string]: any; };
+
+            get_queryId: () => string;
+
+            get_queryRuleId: () => string;
+
+            get_resultRows: () => { [key: string]: any; }[];
+
+            get_resultTitle: () => string;
+
+            get_resultTitleUrl: () => string;
+
+            get_rowCount: () => number;
+
+            get_tableType: () => string;
+
+            get_totalRows: () => number;
+
+            get_totalRowsIncludingDuplicates: () => number;
+
+            initPropertiesFromJson: (parentNode: any) => void;
+        }
+
+        export class RankingLabeling extends SP.ClientObject {
+            constructor(context: SP.ClientContext);
+            getJudgementsForQuery: (query: string) => SP.JsonObjectResult;
+            addJudgment: (userQuery: string, url: string, labelId: number) => void;
+            normalizeResultUrl: (url: string) => SP.JsonObjectResult;
+        }
+
+        export class PopularQuery extends SP.ClientValueObject {
+            get_clickCount: () => number;
+            set_clickCount: (value: number) => void;
+
+            get_LCID: () => number;
+            set_LCID: (value: number) => void;
+
+            get_queryCount: () => number;
+            set_queryCount: (value: number) => void;
+
+            get_queryText: () => string;
+            set_queryText: (value: string) => void;
+        }
+
+        export class QueryPropertyNames {
+            static blockDedupeMode: string; // 'BlockDedupeMode';
+            static bypassResultTypes: string; // 'BypassResultTypes';
+            static clientType: string; // 'ClientType';
+            static culture: string; // 'Culture';
+            static desiredSnippetLength: string; // 'DesiredSnippetLength';
+            static enableInterleaving: string; // 'EnableInterleaving';
+            static enableNicknames: string; // 'EnableNicknames';
+            static enableOrderingHitHighlightedProperty: string; // 'EnableOrderingHitHighlightedProperty';
+            static enablePhonetic: string; // 'EnablePhonetic';
+            static enableQueryRules: string; // 'EnableQueryRules';
+            static enableStemming: string; // 'EnableStemming';
+            static generateBlockRankLog: string; // 'GenerateBlockRankLog';
+            static hitHighlightedMultivaluePropertyLimit: string; // 'HitHighlightedMultivaluePropertyLimit';
+            static ignoreSafeQueryPropertiesTemplateUrl: string; // 'IgnoreSafeQueryPropertiesTemplateUrl';
+            static impressionID: string; // 'ImpressionID';
+            static maxSnippetLength: string; // 'MaxSnippetLength';
+            static processBestBets: string; // 'ProcessBestBets';
+            static processPersonalFavorites: string; // 'ProcessPersonalFavorites';
+            static queryTag: string; // 'QueryTag';
+            static queryTemplate: string; // 'QueryTemplate';
+            static queryTemplateParameters: string; // 'QueryTemplateParameters';
+            static queryText: string; // 'QueryText';
+            static rankingModelId: string; // 'RankingModelId';
+            static resultsUrl: string; // 'ResultsUrl';
+            static rowLimit: string; // 'RowLimit';
+            static rowsPerPage: string; // 'RowsPerPage';
+            static safeQueryPropertiesTemplateUrl: string; // 'SafeQueryPropertiesTemplateUrl';
+            static showPeopleNameSuggestions: string; // 'ShowPeopleNameSuggestions';
+            static sourceId: string; // 'SourceId';
+            static startRow: string; // 'StartRow';
+            static summaryLength: string; // 'SummaryLength';
+            static timeout: string; // 'Timeout';
+            static totalRowsExactMinimum: string; // 'TotalRowsExactMinimum';
+            static trimDuplicates: string; // 'TrimDuplicates';
+            static uiLanguage: string; // 'UILanguage';
+        }
+
+        export class QueryObjectPropertyNames {
+            static hitHighlightedProperties: string; // = 'HitHighlightedProperties';
+            static personalizationData: string; // = 'PersonalizationData';
+        }
+
+        export class KeywordQueryPropertyNames {
+            static collapseSpecification: string; // 'CollapseSpecification';
+            static enableSorting: string; // 'EnableSorting';
+            static hiddenConstraints: string; // 'HiddenConstraints';
+            static refiners: string; // 'Refiners';
+            static trimDuplicatesIncludeId: string; // 'TrimDuplicatesIncludeId';
+        }
+
+        export class KeywordQueryObjectPropertyNames {
+            static properties: string; // 'Properties';
+            static refinementFilters: string; // 'RefinementFilters';
+            static reorderingRules: string; // 'ReorderingRules';
+            static selectProperties: string; // 'SelectProperties';
+            static sortList: string; // 'SortList';
+        }
+    }
+
+    namespace WebControls {
+        export class ControlMessage extends SP.ClientValueObject {
+            get_code: () => number;
+
+            get_correlationID: () => string;
+
+            get_encodeDetails: () => boolean;
+
+            get_header: () => string;
+
+            get_level: () => MessageLevel;
+
+            get_messageDetails: () => string;
+
+            get_messageDetailsForViewers: () => string;
+
+            get_serverTypeId: () => string;
+
+            get_showForViewerUsers: () => boolean;
+
+            get_showInEditModeOnly: () => boolean;
+
+            get_stackTrace: () => string;
+
+            get_type: () => string;
+        }
+
+        export enum MessageLevel {
+            information,
+            warning,
+            error
+        }
+    }
+
+    namespace Administration {
+        export class DocumentCrawlLog extends SP.ClientObject {
+            constructor(context: SP.ClientContext, site: SP.Site);
+            getCrawledUrls: (getCountOnly: boolean,
+                maxRows: { High: number; Low: number; },
+                queryString: string,
+                isLike: boolean,
+                contentSourceID: number,
+                errorLevel: number,
+                errorID: number,
+                startDateTime: Date,
+                endDateTime: Date) => SP.JsonObjectResult;
+        }
+
+        export class SearchObjectOwner extends SP.ClientObject {
+            constructor(context: SP.ClientContext, lowestCurrentLevelToUse: SearchObjectLevel);
+        }
+
+        export enum SearchObjectLevel {
+            spWeb,
+            spSite,
+            spSiteSubscription,
+            ssa
+        }
+    }
+
+    namespace Portability {
+        export class SearchConfigurationPortability extends SP.ClientObject {
+            constructor(context: SP.ClientContext);
+            get_importWarnings: () => string;
+
+            exportSearchConfiguration: (owningScope: Administration.SearchObjectOwner) => SP.JsonObjectResult;
+
+            importSearchConfiguration: (owningScope: Administration.SearchObjectOwner, searchConfiguration: string) => void;
+
+            deleteSearchConfiguration: (owningScope: Administration.SearchObjectOwner, searchConfiguration: string) => void;
+        }
+
+        export class SearchConfigurationPortabilityPropertyNames {
+            static importWarnings: string;// = 'ImportWarnings'
+        }
+    }
+
+    /**Located in sp.search.apps.js*/
+    namespace Analytics {
+        export class AnalyticsItemData extends SP.ClientObject {
+            get_lastProcessingTime: () => Date;
+
+            get_totalHits: () => number;
+
+            get_totalUniqueUsers: () => number;
+
+            getHitCountForDay: (day: Date) => number;
+
+            getUniqueUsersCountForDay: (day: Date) => number;
+
+            getHitCountForMonth: (day: Date) => number;
+
+            getUniqueUsersCountForMonth: (day: Date) => number;
+        }
+
+        export class UsageAnalytics extends SP.ClientObject {
+            getAnalyticsItemData: (eventType: number, listItem: SP.ListItem) => AnalyticsItemData;
+
+            getAnalyticsItemDataForApplicationEventType: (appEventType: SP.Guid, listItem: SP.ListItem) => AnalyticsItemData;
+
+            deleteStandardEventUsageData: (eventType: number) => void;
+
+            deleteCustomEventUsageData: (appEventTypeId: SP.Guid) => void;
+        }
+
+
+
+    }
+}
+
+declare namespace SP {
+    export module BusinessData {
+        export class AppBdcCatalog extends SP.ClientObject {
+            getEntity(namespace: string, name: string): SP.BusinessData.Entity;
+            getLobSystemProperty(lobSystemName: string, propertyName: string): SP.StringResult;
+            setLobSystemProperty(lobSystemName: string, propertyName: string, propertyValue: string): void;
+            getLobSystemInstanceProperty(lobSystemName: string, lobSystemInstanceName: string, propertyName: string): SP.StringResult;
+            setLobSystemInstanceProperty(lobSystemName: string, lobSystemInstanceName: string, propertyName: string, propertyValue: string): void;
+            getConnectionId(lobSystemName: string, lobSystemInstanceName: string): SP.StringResult;
+            setConnectionId(lobSystemName: string, lobSystemInstanceName: string, connectionId: string): void;
+            getPermissibleConnections(): string[];
+        }
+        export class Entity extends SP.ClientObject {
+            get_estimatedInstanceCount(): number;
+            get_name(): string;
+            get_namespace(): string;
+            getIdentifiers(): SP.BusinessData.Collections.EntityIdentifierCollection;
+            getIdentifierCount(): SP.IntResult;
+            getLobSystem(): SP.BusinessData.LobSystem;
+            getCreatorView(methodInstanceName: string): SP.BusinessData.EntityView;
+            getUpdaterView(updaterName: string): SP.BusinessData.EntityView;
+            getFinderView(methodInstanceName: string): SP.BusinessData.EntityView;
+            getSpecificFinderView(specificFinderName: string): SP.BusinessData.EntityView;
+            getDefaultSpecificFinderView(): SP.BusinessData.EntityView;
+            findSpecificDefault(identity: SP.BusinessData.Runtime.EntityIdentity, lobSystemInstance: SP.BusinessData.LobSystemInstance): SP.BusinessData.Runtime.EntityInstance;
+            findSpecific(identity: SP.BusinessData.Runtime.EntityIdentity, specificFinderName: string, lobSystemInstance: SP.BusinessData.LobSystemInstance): SP.BusinessData.Runtime.EntityInstance;
+            findSpecificDefaultByBdcId(bdcIdentity: string, lobSystemInstance: SP.BusinessData.LobSystemInstance): SP.BusinessData.Runtime.EntityInstance;
+            findSpecificByBdcId(bdcIdentity: string, specificFinderName: string, lobSystemInstance: SP.BusinessData.LobSystemInstance): SP.BusinessData.Runtime.EntityInstance;
+            findFiltered(filterList: SP.BusinessData.Collections.FilterCollection, nameOfFinder: string, lobSystemInstance: SP.BusinessData.LobSystemInstance): SP.BusinessData.Collections.EntityInstanceCollection;
+            findAssociated(entityInstance: SP.BusinessData.Runtime.EntityInstance, associationName: string, filterList: SP.BusinessData.Collections.FilterCollection, lobSystemInstance: SP.BusinessData.LobSystemInstance): SP.BusinessData.Collections.EntityInstanceCollection;
+            getFilters(methodInstanceName: string): SP.BusinessData.Collections.FilterCollection;
+            execute(methodInstanceName: string, lobSystemInstance: SP.BusinessData.LobSystemInstance, inputParams: any[]): SP.BusinessData.MethodExecutionResult;
+            getAssociationView(associationName: string): SP.BusinessData.EntityView;
+            create(fieldValues: SP.BusinessData.Runtime.EntityFieldValueDictionary, lobSystemInstance: SP.BusinessData.LobSystemInstance): SP.BusinessData.Runtime.EntityIdentity;
+            subscribe(eventType: SP.BusinessData.Runtime.EntityEventType, notificationCallback: SP.BusinessData.Runtime.NotificationCallback, onBehalfOfUser: string, subscriberName: string, lobSystemInstance: SP.BusinessData.LobSystemInstance): SP.BusinessData.Runtime.Subscription;
+            unsubscribe(subscription: SP.BusinessData.Runtime.Subscription, onBehalfOfUser: string, unsubscriberName: string, lobSystemInstance: SP.BusinessData.LobSystemInstance): void;
+        }
+        export class EntityField extends SP.ClientObject {
+            get_containsLocalizedDisplayName(): boolean;
+            get_defaultDisplayName(): string;
+            get_localizedDisplayName(): string;
+            get_name(): string;
+        }
+        export class EntityIdentifier extends SP.ClientObject {
+            get_identifierType(): string;
+            get_name(): string;
+            getDefaultDisplayName(): SP.StringResult;
+            containsLocalizedDisplayName(): SP.BooleanResult;
+            getLocalizedDisplayName(): SP.StringResult;
+        }
+        export class EntityView extends SP.ClientObject {
+            get_fields(): SP.BusinessData.Collections.EntityFieldCollection;
+            get_name(): string;
+            get_relatedSpecificFinderName(): string;
+            getDefaultValues(): SP.BusinessData.Runtime.EntityFieldValueDictionary;
+            getXmlSchema(): SP.StringResult;
+            getTypeDescriptor(fieldDotNotation: string): SP.BusinessData.TypeDescriptor;
+            getType(fieldDotNotation: string): SP.StringResult;
+        }
+        export class Filter extends SP.ClientObject {
+            get_defaultDisplayName(): string;
+            get_filterField(): string;
+            get_filterType(): string;
+            get_localizedDisplayName(): string;
+            get_name(): string;
+            get_valueCount(): number;
+        }
+        export class LobSystem extends SP.ClientObject {
+            get_name(): string;
+            getLobSystemInstances(): SP.BusinessData.Collections.LobSystemInstanceCollection;
+        }
+        export class LobSystemInstance extends SP.ClientObject {
+            get_name(): string;
+        }
+        export class MethodExecutionResult extends SP.ClientObject {
+            get_returnParameterCollection(): SP.BusinessData.ReturnParameterCollection;
+        }
+        export class ReturnParameterCollection extends SP.ClientObjectCollection<SP.BusinessData.Runtime.EntityFieldValueDictionary> {
+            itemAt(index: number): SP.BusinessData.Runtime.EntityFieldValueDictionary;
+            get_item(index: number): SP.BusinessData.Runtime.EntityFieldValueDictionary;
+        }
+        export class TypeDescriptor extends SP.ClientObject {
+            get_containsReadOnly(): boolean;
+            get_isCollection(): boolean;
+            get_isReadOnly(): boolean;
+            get_name(): string;
+            get_typeName(): string;
+            containsLocalizedDisplayName(): SP.BooleanResult;
+            getLocalizedDisplayName(): SP.StringResult;
+            getDefaultDisplayName(): SP.StringResult;
+            isRoot(): SP.BooleanResult;
+            isLeaf(): SP.BooleanResult;
+            getChildTypeDescriptors(): SP.BusinessData.Collections.TypeDescriptorCollection;
+            getParentTypeDescriptor(): SP.BusinessData.TypeDescriptor;
+        }
+        export module Collections {
+            export class EntityFieldCollection extends SP.ClientObjectCollection<SP.BusinessData.EntityField> {
+                itemAt(index: number): SP.BusinessData.EntityField;
+                get_item(index: number): SP.BusinessData.EntityField;
+            }
+            export class EntityIdentifierCollection extends SP.ClientObjectCollection<SP.BusinessData.EntityIdentifier> {
+                itemAt(index: number): SP.BusinessData.EntityIdentifier;
+                get_item(index: number): SP.BusinessData.EntityIdentifier;
+            }
+            export class EntityInstanceCollection extends SP.ClientObjectCollection<SP.BusinessData.Runtime.EntityInstance> {
+                itemAt(index: number): SP.BusinessData.Runtime.EntityInstance;
+                get_item(index: number): SP.BusinessData.Runtime.EntityInstance;
+            }
+            export class FilterCollection extends SP.ClientObjectCollection<SP.BusinessData.Filter> {
+                itemAt(index: number): SP.BusinessData.Filter;
+                get_item(index: number): SP.BusinessData.Filter;
+                setFilterValue(inputFilterName: string, valueIndex: number, value: any): void;
+            }
+            export class LobSystemInstanceCollection extends SP.ClientObjectCollection<SP.BusinessData.LobSystemInstance> {
+                itemAt(index: number): SP.BusinessData.LobSystemInstance;
+                get_item(index: number): SP.BusinessData.LobSystemInstance;
+            }
+            export class TypeDescriptorCollection extends SP.ClientObjectCollection<SP.BusinessData.TypeDescriptor> {
+                itemAt(index: number): SP.BusinessData.TypeDescriptor;
+                get_item(index: number): SP.BusinessData.TypeDescriptor;
+            }
+        }
+
+        export module Infrastructure {
+            export class ExternalSubscriptionStore extends SP.ClientObject {
+                constructor(context: SP.ClientRuntimeContext, web: SP.Web);
+                static newObject(context: SP.ClientRuntimeContext, web: SP.Web): SP.BusinessData.Infrastructure.ExternalSubscriptionStore;
+                indexStore(): void;
+            }
+        }
+
+        export module Runtime {
+            export enum EntityEventType {
+                none,
+                itemAdded,
+                itemUpdated,
+                itemDeleted,
+            }
+            export class EntityFieldValueDictionary extends SP.ClientObject {
+                get_fieldValues(): any;
+                get_item(fieldName: string): any;
+                set_item(fieldName: string, value: any): void;
+                refreshLoad(): void;
+                fromXml(xml: string): void;
+                toXml(): SP.StringResult;
+                createInstance(fieldInstanceDotNotation: string, fieldDotNotation: string): void;
+                createCollectionInstance(fieldDotNotation: string, size: number): void;
+                getCollectionSize(fieldDotNotation: string): SP.IntResult;
+            }
+            export class EntityIdentity extends SP.ClientObject {
+                get_fieldValues(): any;
+                get_item(fieldName: string): any;
+                constructor(context: SP.ClientRuntimeContext, identifierValues: any[]);
+                get_identifierCount(): number;
+                static newObject(context: SP.ClientRuntimeContext, identifierValues: any[]): SP.BusinessData.Runtime.EntityIdentity;
+                refreshLoad(): void;
+            }
+            export class EntityInstance extends SP.ClientObject {
+                get_fieldValues(): any;
+                get_item(fieldName: string): any;
+                set_item(fieldName: string, value: any): void;
+                refreshLoad(): void;
+                createInstance(fieldInstanceDotNotation: string, fieldDotNotation: string): void;
+                createCollectionInstance(fieldDotNotation: string, size: number): void;
+                getIdentity(): SP.BusinessData.Runtime.EntityIdentity;
+                deleteObject(): void;
+                update(): void;
+                fromXml(xml: string): void;
+                toXml(): SP.StringResult;
+            }
+            export class NotificationCallback extends SP.ClientObject {
+                constructor(context: SP.ClientRuntimeContext, notificationEndpoint: string);
+                get_notificationContext(): string;
+                set_notificationContext(value: string): void;
+                get_notificationEndpoint(): string;
+                get_notificationForwarderType(): string;
+                set_notificationForwarderType(value: string): void;
+                static newObject(context: SP.ClientRuntimeContext, notificationEndpoint: string): SP.BusinessData.Runtime.NotificationCallback;
+            }
+            export class Subscription extends SP.ClientObject {
+                constructor(context: SP.ClientRuntimeContext, id: any, hash: string);
+                get_hash(): string;
+                get_iD(): any;
+                static newObject(context: SP.ClientRuntimeContext, id: any, hash: string): SP.BusinessData.Runtime.Subscription;
+            }
+        }
+    }
+}
+
+declare namespace SP {
+    export module Sharing {
+        export class DocumentSharingManager {
+            static getRoleDefinition(context: SP.ClientRuntimeContext, role: SP.Sharing.Role): SP.RoleDefinition;
+            static isDocumentSharingEnabled(context: SP.ClientRuntimeContext, list: SP.List): SP.BooleanResult;
+            static updateDocumentSharingInfo(context: SP.ClientRuntimeContext, resourceAddress: string, userRoleAssignments: SP.Sharing.UserRoleAssignment[], validateExistingPermissions: boolean, additiveMode: boolean, sendServerManagedNotification: boolean, customMessage: string, includeAnonymousLinksInNotification: boolean): SP.Sharing.UserSharingResult[];
+        }
+        export enum Role {
+            none,
+            view,
+            edit,
+            owner,
+        }
+        export class UserRoleAssignment extends SP.ClientValueObject {
+            get_role(): SP.Sharing.Role;
+            set_role(value: SP.Sharing.Role): void;
+            get_userId(): string;
+            set_userId(value: string): void;
+            get_typeId(): string;
+            writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+            constructor();
+        }
+        export class UserSharingResult extends SP.ClientValueObject {
+            get_allowedRoles(): SP.Sharing.Role[];
+            get_currentRole(): SP.Sharing.Role;
+            get_isUserKnown(): boolean;
+            get_message(): string;
+            get_status(): boolean;
+            get_user(): string;
+            get_typeId(): string;
+            writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+            constructor();
+        }
+    }
+
+}
+
+declare namespace SP {
+
+    export module Social {
+        /** Identifies an actor as a user, document, site, or tag. */
+        export enum SocialActorType {
+            user,
+            document,
+            site,
+            tag
+        }
+        /** Specifies one or more actor types in a query to the server. */
+        export enum SocialActorTypes {
+            none,
+            users,
+            documents,
+            sites,
+            tags,
+            /** The set excludes documents and sites that do not have feeds. */
+            excludeContentWithoutFeeds,
+            all
+        }
+        /** Specifies whether the action is to navigate to the attachment or to perform some action dependent on the context in which the attachment is presented to the user. */
+        export enum SocialAttachmentActionKind {
+            /** This value specifies that the action is to navigate to the attachment. */
+            navigate,
+            /** This value specifies that the action is dependent on the context that the attachment is displayed to the user. */
+            adHocAction
+        }
+
+        export enum SocialAttachmentKind {
+            image,
+            video,
+            document
+        }
+
+        /** Specifies whether the item being inserted is a user, document, site, tag, or link. */
+        export enum SocialDataItemType {
+            user,
+            document,
+            site,
+            tag,
+            link
+        }
+
+        /** Specifies whether the overlay is a link or one or more actors. */
+        export enum SocialDataOverlayType {
+            link,
+            actors
+        }
+
+        /** Specifies whether the sort order is by creation time or modification time. */
+        export enum SocialFeedSortOrder {
+            byModifiedTime,
+            byCreatedTime
+        }
+
+        /** Identifies the kind of post to be retrieved.  */
+        export enum SocialFeedType {
+            personal,
+            news,
+            timeline,
+            likes,
+            everyone
+        }
+
+        // For some reasons this enum doesn't exist
+        //export enum SocialFollowResult {
+        //    ok = 0,
+        //    alreadyFollowing = 1,
+        //    limitReached = 2,
+        //    internalError = 3
+        //}
+
+        /** Provides information about the feed.
+            This type provides information about whether the feed on the server contains additional threads that were not returned. */
+        export enum SocialFeedAttributes {
+            none,
+            moreThreadsAvailable
+        }
+
+        /** Specifies attributes of the post, such as whether the current user can like or delete the post. */
+        export enum SocialPostAttributes {
+            none,
+            canLike,
+            canDelete,
+            useAuthorImage,
+            useSmallImage,
+            canFollowUp
+        }
+
+        /** Defines the type of item being specified in the SocialPostDefinitionDataItem.
+            This type is only available in server-to-server calls. */
+        export enum SocialPostDefinitionDataItemType {
+            text,
+            user,
+            document,
+            site,
+            tag,
+            link
+        }
+
+        export enum SocialPostType {
+            root,
+            reply
+        }
+
+        /** Specifies a status or error code. */
+        export enum SocialStatusCode {
+            OK,
+            /** This value specifies that an invalid request was encountered. */
+            invalidRequest,
+            /** This value specifies that access was denied to the current user. */
+            accessDenied,
+            itemNotFound,
+            /** This value specifies that an invalid operation was attempted. */
+            invalidOperation,
+            /** This value specifies that the item was not changed by the operation. */
+            itemNotModified,
+            internalError,
+            /** This value specifies that there was an error reading the cache. */
+            cacheReadError,
+            /** This value specifies that there was an error updating the cache. */
+            cacheUpdateError,
+            personalSiteNotFound,
+            failedToCreatePersonalSite,
+            notAuthorizedToCreatePersonalSite,
+            cannotCreatePersonalSite,
+            /** This value specifies that a server limit was reached. */
+            limitReached,
+            /** This value specifies that the operation failed because there was an error handling an attachment. */
+            attachmentError,
+            /** This value specifies that the operation completed with recoverable errors and that the returned data is incomplete. */
+            partialData,
+            /** This value specifies that the operation failed because a required server feature was disabled by administrative action. */
+            featureDisabled
+        }
+
+        /** Specifies properties of the thread. */
+        export enum SocialThreadAttributes {
+            none,
+            isDigest,
+            canReply,
+            canLock,
+            isLocked,
+            replyLimitReached
+        }
+
+        export enum SocialThreadType {
+            normal,
+            likeReference,
+            replyReference,
+            mentionReference,
+            tagReference
+        }
+
+        /** Contains information about an actor retrieved from server. An actor is a user, document, site, or tag. */
+        export class SocialActor extends SP.ClientValueObject {
+            /** The AccountName property returns the user account name.
+                This property is only available for social actors of type "user". */
+            get_accountName(): string;
+            /** Identifies whether the actor is a user, document, site, or tag. */
+            get_actorType(): SocialActorType;
+            /** Specifies whether the actor can be followed by the current user. */
+            get_canFollow(): boolean;
+            /** Returns the URI of the document or site content.
+                This property is only available for social actors of type Document or Site. */
+            get_contentUri(): string;
+            get_emailAddress(): string;
+            /** Returns the URI of the user's followed content folder.
+                This property is only available for social actors of type "user". */
+            get_followedContentUri(): string;
+            /** Returns the actor's unique identifier. */
+            get_id(): string;
+            /** Returns the URI of the image representing the actor.
+                This property is only available if actor is User, Document, or Site. */
+            get_imageUri(): string;
+            /** Returns true if the current user is following the actor; otherwise, it returns false. */
+            get_isFollowed(): boolean;
+            /** Returns the URI of the library containing the document.
+                This property is only available for social actors of type "document". */
+            get_libraryUri(): string;
+            /** The Name property returns the actor's display name. */
+            get_name(): string;
+            /** Returns the URI of the user's personal site.
+                This property is only available for social actors of type "user". */
+            get_personalSiteUri(): string;
+            /** Represents the status of retrieving the actor */
+            get_status(): SocialStatusCode;
+            /** The StatusText property returns the most recent post of the user.
+                This property is only available for social actors of type "user". */
+            get_statusText(): string;
+            /** Returns the GUID of the tag.
+                Only available for social actors of type "tag" */
+            get_tagGuid(): string;
+            /** Returns the user's title
+                This property is only available for social actors of type "user". */
+            get_title(): string;
+            /** Returns the URI of the actor. */
+            get_uri(): string;
+        }
+
+        /** Identifies an actor to the server. An actor can be a user, document, site, or tag. */
+        export class SocialActorInfo extends SP.ClientValueObject {
+            /** User account name.
+                This property is only available for social actors of type "user". */
+            get_accountName(): string;
+            /** User account name.
+                This property is only available for social actors of type "user". */
+            set_accountName(value: string): string;
+            /** Identifies whether the actor is a user, document, site, or tag. */
+            get_actorType(): SocialActorType;
+            /** Identifies whether the actor is a user, document, site, or tag. */
+            set_actorType(value: SocialActorType): SocialActorType;
+            /** URI of the document or site content.
+                This property is only available for social actors of type Document or Site. */
+            get_contentUri(): string;
+            /** URI of the document or site content.
+                This property is only available for social actors of type Document or Site. */
+            set_contentUri(value: string): string;
+            /** Actor's unique identifier. */
+            get_id(): string;
+            /** Actor's unique identifier. */
+            set_id(value: string): string;
+            /** GUID of the tag.
+                Only available for social actors of type "tag" */
+            get_tagGuid(): string;
+            /** GUID of the tag.
+                Only available for social actors of type "tag" */
+            set_tagGuid(value: string): string;
+        }
+
+        /** Represents an image, document preview, or video preview attachment.  */
+        export class SocialAttachment extends SP.ClientValueObject {
+            /** Specifies the type of object that the attachment contains. */
+            get_attachmentKind(): SocialAttachmentKind;
+            /** Specifies the type of object that the attachment contains. */
+            set_attachmentKind(value: SocialAttachmentKind): SocialAttachmentKind;
+            /** Specifies the action to take when the user selects the attachment.
+                This property is only present if the AttachmentKind is Video. */
+            get_clickAction(): SocialAttachmentAction;
+            /** Specifies the action to take when the user selects the attachment.
+                This property is only present if the AttachmentKind is Video. */
+            set_clickAction(value: SocialAttachmentAction): SocialAttachmentAction;
+            /** Specifies the URI of the attachment content. */
+            get_contentUri(): string;
+            /** Specifies the URI of the attachment content. */
+            set_contentUri(value: string): string;
+            /** Provides a text description of the attachment. */
+            get_description(): string;
+            /** Provides a text description of the attachment. */
+            set_description(value: string): string;
+            /** Specifies the height of the attachment or of the attachment preview. */
+            get_height(): number;
+            /** Specifies the height of the attachment or of the attachment preview. */
+            set_height(value: number): number;
+            /** Specifies the duration of the attachment in seconds. This property is only present if the AttachmentKind is Video. */
+            get_length(): number;
+            /** Specifies the duration of the attachment in seconds. This property is only present if the AttachmentKind is Video. */
+            set_length(value: number): number;
+            /** Provides the attachment name. */
+            get_name(): string;
+            /** Provides the attachment name. */
+            set_name(value: string): string;
+            /** Specifies the URI of the attachment�s preview thumbnail.
+                This property is only present if the AttachmentKind is Document or Video. */
+            get_previewUri(): string;
+            /** Specifies the URI of the attachment�s preview thumbnail.
+                This property is only present if the AttachmentKind is Document or Video. */
+            set_previewUri(value: string): string;
+            /** Provides the attachment URI. */
+            get_uri(): string;
+            /** Provides the attachment URI. */
+            set_uri(value: string): string;
+            /** Specifies the width of the attachment or of the attachment preview. */
+            get_width(): number;
+            /** Specifies the width of the attachment or of the attachment preview. */
+            set_width(value: number): number;
+        }
+        /** Specifies the user actions that are allowed for the attachment object. */
+        export class SocialAttachmentAction extends SP.ClientValueObject {
+            /** Specifies whether the action is to navigate to a URI or an action that is dependent on the context in which the object is presented to the user. */
+            get_actionKind(): SocialAttachmentActionKind;
+            /** Specifies whether the action is to navigate to a URI or an action that is dependent on the context in which the object is presented to the user. */
+            set_actionKind(value: SocialAttachmentActionKind): SocialAttachmentActionKind;
+            /** Specifies the URI associated with the action. */
+            get_actionUri(): string;
+            /** Specifies the URI associated with the action. */
+            set_actionUri(value: string): string;
+        }
+
+        /** Defines a user, document, site, tag, or link to be inserted in a new post.
+            The SocialPostCreationData class defines the content text that contains substitution strings.
+            Each substitution string is replaced by a SocialDataItem value. */
+        export class SocialDataItem extends SP.ClientValueObject {
+            /** Identifies the user.  */
+            get_accountName(): string;
+            /** Identifies the user.  */
+            set_accountName(value: string): string;
+            /** Specifies whether the item being inserted is a user, document, site, tag, or link. */
+            get_itemType(): SocialDataItemType;
+            /** Specifies whether the item being inserted is a user, document, site, tag, or link. */
+            set_itemType(value: SocialDataItemType): SocialDataItemType;
+            /** Identifies the tag.  */
+            get_tagGuid(): string;
+            /** Identifies the tag.  */
+            set_tagGuid(value: string): string;
+            /** Specifies the plain text to be inserted in the created post. The server can use the specified text or can use text that identifies the item, for example the name specified in a user profile.  */
+            get_text(): string;
+            /** Specifies the plain text to be inserted in the created post. The server can use the specified text or can use text that identifies the item, for example the name specified in a user profile.  */
+            set_text(value: string): string;
+            /** Identifies the site, document, or link.  */
+            get_uri(): string;
+            /** Identifies the site, document, or link.  */
+            set_uri(value: string): string;
+        }
+
+        /** Provides information about an overlay.
+            An overlay is a substring in a post that represents a user, document, site, tag, or link.
+            The SocialPost class contains an array of SocialDataOverlay objects.
+            Each of the SocialDataOverlay objects specifies a link or one or more actors. */
+        export class SocialDataOverlay extends SP.ClientValueObject {
+            /** Specifies one or more actors as an array of integers where each integer specifies an index into the SocialThreadActors array.
+                This property is only available if the get_overlayType() has a value of SocialDataOverlayType.actors. */
+            get_actorIndexes(): number[];
+            /** The Index property specifies the starting position of the overlay in the SocialPostText string  */
+            get_index(): number;
+            /** The Length property specifies the number of characters in the overlay.  */
+            get_length(): number;
+            /** The LinkUri property specifies the URI of the link.
+                This property is only available if the get_overlayType() has a value of SocialDataOverlayType.link.  */
+            get_linkUri(): string;
+            /** Specifies whether the overlay is a link or one or more actors. */
+            get_overlayType(): SocialDataOverlayType;
+        }
+
+        /** Specifies information about errors that the server has encountered. */
+        export class SocialExceptionDetails extends SP.ClientValueObject {
+            get_internalErrorCode(): number;
+            get_internalMessage(): string;
+            get_internalStackTrace(): string;
+            /** Specifies a type name associated with the internal error if a type name is available. */
+            get_internalTypeName(): string;
+            get_status(): SocialStatusCode;
+        }
+
+        /** Specifies a feed, which contains an array of SocialThreads, each of which specifies a root SocialPost object and an array of response SocialPost objects. */
+        export class SocialFeed extends SP.ClientValueObject {
+            /** Specifies attributes of the returned feed.
+                The attributes specify if the requested feed has additional threads that were not included in the returned thread. */
+            get_attributes(): SocialFeedAttributes;
+            /** Returns the date-time of the most recent post that was requested.
+                The most recent post that was requested can be removed from the feed if the current user does not have access to it.
+                Consequently, the feed does not always contain the post with the date specified in this property. */
+            get_newestProcessed(): string;
+            /** The OldestProcessed property returns the date-time of the oldest post that was requested.
+                The oldest post that was requested can be removed from the feed if the current user does not have access to it.
+                Consequently, the feed does not always contain the post with the date specified in this property */
+            get_oldestProcessed(): string;
+            /** Contains the social threads in the feed. */
+            get_threads(): SocialThread[];
+            /** Returns the number of mentions of the current user that have been added to the feed on the server since the time that the unread mention count was cleared for the current user. */
+            get_unreadMentionCount(): number;
+        }
+
+        /** Provides access to social feeds.
+            It provides methods to create posts, delete posts, read posts, and perform other operations on posts. */
+        export class SocialFeedManager extends SP.ClientObject {
+            constructor(context: SP.ClientRuntimeContext);
+            /** Returns the current user */
+            get_owner(): SocialActor;
+            /** Specifies the URI of the personal site portal. */
+            get_personalSitePortalUri(): string;
+            /** Creates a post in the current user's newsfeed, in the specified user's feed, or in the specified thread.
+                This method returns a new or a modified thread.
+                @param targetId Optional, specifies the target of the post.
+                                If this parameter is null, the post is created as a root post in the current user's feed.
+                                If this parameter is set to a site URL or a site actor identification, the post is created as a root post in the specified site feed.
+                                If this parameter is set to a thread identification, the post is created as a reply post in the specified thread.
+                @param creationData Specifies the format and content of the post. */
+            createPost(targetId: string, creationData: SocialPostCreationData): SocialThread;
+            /** Deletes the specified post.
+                This method returns a digest of the modified thread.
+                If the entire thread is deleted, this method returns null.
+                If the post being deleted is the root post of a thread, all reply posts are also deleted.
+                @param postId   Specifies the post to be deleted.
+                                Corresponds the value returned from SocialPost.get_id(). */
+            deletePost(postId: string): SocialThread;
+            /** Returns the set of users who have liked the specified post.
+                @param postId   Specifies the post being queried for information about users that like the post.
+                                Corresponds the value returned from SocialPost.get_id().*/
+            getAllLikers(postId: string): SocialActor[];
+            /** Returns a feed for the current user.
+                The feed consists of an array of message threads.
+                Each thread consists of a root post and an array of reply posts. */
+            getFeed(type: SocialFeedType, options: SocialFeedOptions): SocialFeed;
+            /** Returns the public feed for a user or for a site.
+                The feed lists activity by the user and posts created by the server for that user.
+                For example, the feed can include posts indicating the user's birthday or indicating that the user liked a post.
+                @param actorId  Corresponds to the value returned by SocialActor.get_id().
+                                If the actorId specifies the current user, this method returns the public feed for the current user. */
+            getFeedFor(actorId: string, options: SocialFeedOptions): SocialFeed;
+            /** Returns the root post and all reply posts in the thread. */
+            getFullThread(threadId: string): SocialThread;
+            /** Returns a feed containing mention reference threads from the current user's personal feed. */
+            getMentions(clearUnreadMentions: boolean, options: SocialFeedOptions): SocialFeed;
+            /** Returns the server's count of unread mentions of the current user.
+                The server maintains a count of unread mentions in posts, but does not track which mentions have been read.
+                When a new mention is stored on the server, it increments the unread mention for the user specified by the mention.
+                The unread mention count is cleared by the GetMentions method. */
+            getUnreadMentionCount(): SP.IntResult;
+            /** Specifies that the current user likes the specified post.
+                Returns a digest thread containing the specified post.
+                A digest thread contains the root post and a selection of reply posts */
+            likePost(postId: string): SocialThread;
+            /** Specifies that the current user does not like the specified post.
+                Returns a digest thread containing the specified post.  */
+            unlikePost(postId: string): SocialThread;
+            /** Prevents any user from adding a new reply post to the specified thread.
+                Once a thread is locked, no new reply posts can be added until after the thread has been unlocked with the unlockThread method.
+                This method returns a digest of the locked thread */
+            lockThread(threadId: string): SocialThread;
+            /** Allows users to add new reply posts to the specified thread. */
+            unlockThread(threadId: string): SocialThread;
+            /** Suppresses activity notifications for the current user of updates to the specified thread. */
+            suppressThreadNotifications(threadId: string): void;
+            /** Creates an image attachment for a future post. */
+            createImageAttachment(name: string, description: string, imageData: any): SocialAttachment;
+            /** Generates a preview for the content specified by the URL. */
+            getPreview(itemUrl: string): SocialAttachment;
+            /** Returns the preview image data for an image attachment.
+                @param url Specifies the URL of the preview image relative to the personal site portal.
+                @param key Specifies the URL-encoded key to decrypt the image.
+                @param iv Specifies the URL-encoded initialization vector for decrypting the image. */
+            getPreviewImage(url: string, key: string, iv: string): any;
+        }
+
+        export class SocialFeedOptions extends SP.ClientObject {
+            get_maxThreadCount(): number;
+            set_maxThreadCount(value: number): number;
+            get_newerThan(): string;
+            set_newerThan(value: string): string;
+            get_olderThan(): string;
+            set_olderThan(value: string): string;
+            get_sortOrder(): SocialFeedSortOrder;
+            set_sortOrder(value: SocialFeedSortOrder): SocialFeedSortOrder;
+        }
+
+        /** Provides properties and methods for managing a user's list of followed actors.
+            Actors can be users, documents, sites, and tags. */
+        export class SocialFollowingManager extends SP.ClientObject {
+            constructor(context: SP.ClientRuntimeContext);
+            /** URI to a site  that lists the current user's followed documents. */
+            get_followedDocumentsUri(): string;
+            /** URI to a site  that lists the current user's followed sites. */
+            get_followedSitesUri(): string;
+            /** Adds the specified actor to the current user's list of followed items.
+                Returns one of the following values, wrapped into the SP.IntResult object:
+                0 = ok,
+                1 = alreadyFollowing,
+                2 = limitReached,
+                3 = internalError */
+            follow(actor: SocialActorInfo): SP.IntResult;
+            stopFollowing(actor: SocialActorInfo): SP.BooleanResult;
+            isFollowed(actor: SocialActorInfo): SP.BooleanResult;
+            getFollowed(types: SocialActorTypes): SocialActor[];
+            getFollowedCount(types: SocialActorTypes): SP.IntResult;
+            /** Returns the users who are followers of the current user. */
+            getFollowers(): SocialActor[];
+            getSuggestions(): SocialActor[];
+        }
+
+        /** Defines a link that includes a URI and text representation.
+            This class is used to represent the location of a web site.  */
+        export class SocialLink extends SP.ClientValueObject {
+            get_text(): string;
+            set_text(value: string): string;
+            get_uri(): string;
+            set_uri(value: string): string;
+        }
+
+        /** Specifies a post read from the server. */
+        export class SocialPost extends SP.ClientValueObject {
+            /** Specifies an image, document preview, or video preview attachment */
+            get_attachment(): SocialAttachment;
+            /** Describes attributes about the post, such as whether the current user can delete or like the post.  */
+            get_attributes(): SocialPostAttributes;
+            /** Specifies the author of the post as an index to the social thread's Actors array. */
+            get_authorIndex(): number;
+            /** Specifies the date and time that the post was created on the server. */
+            get_createdTime(): string;
+            /** Specifies the unique identifier of the post. */
+            get_id(): string;
+            /** Specifies information about users who like the post. */
+            get_likerInfo(): SocialPostActorInfo;
+            /** Specifies the date and time that the post was last modified on the server. */
+            get_modifiedTime(): string;
+            /** An array of objects in a post, where each object represents a user, document, site, tag, or link. */
+            get_overlays(): SocialDataOverlay[];
+            /** Specifies whether a post is the root post or a reply post in a thread */
+            get_postType(): SocialPostType;
+            /** Specifies the URI of the image to be displayed with the post.  */
+            get_preferredImageUri(): string;
+            /** Specifies the link to a web site associated with the application that created the post. */
+            get_source(): SocialLink;
+            /** Specifies the text of the post. */
+            get_text(): string;
+        }
+
+        /** Specifies a set of users, documents, sites, and tags by an index into the SocialThreadActors array  */
+        export class SocialPostActorInfo extends SP.ClientValueObject {
+            get_includesCurrentUser(): boolean;
+            /** Specifies an array of indexes into the SocialThreadActors array.
+                The server can choose to return a limited set of actors. For example, the server can choose to return a subset of the users that like a post. */
+            get_indexes(): number[];
+            get_totalCount(): number;
+        }
+
+        /** Specifies the content of a post in the SocialFeedManager.createPost method.
+            The post consists of a text message, which can optionally include social tags, mentions of users, and links. */
+        export class SocialPostCreationData extends SP.ClientValueObject {
+            /** Specifies an image, document preview, or video preview to be used in the post. */
+            get_attachment(): SocialAttachment;
+            /** Specifies an image, document preview, or video preview to be used in the post. */
+            set_attachment(value: SocialAttachment): SocialAttachment;
+            /** Specifies an array consisting of social tags, user mentions, links to documents, links to sites, and generic links.
+                Each element in the array is inserted into the ContentText string if there is a substitution reference to the array element in the string. */
+            get_contentItems(): SocialDataItem;
+            /** Specifies an array consisting of social tags, user mentions, links to documents, links to sites, and generic links.
+                Each element in the array is inserted into the ContentText string if there is a substitution reference to the array element in the string. */
+            set_contentItems(value: SocialDataItem): SocialDataItem;
+            /** Contains the text body of the post. */
+            get_contentText(): string;
+            /** Contains the text body of the post.
+                It can optionally contain one or more substitution references to elements in the zero-based ContentItems array.
+                A substitution reference consists of a series of characters that consist of an open-brace character ({) followed by one of more digits in the range 0 to 9 and terminated by a close-brace character (}).
+                The substitution reference is replaced by the text value of the element in the in the array at the offset specified by the value of the digits.
+                For example, the text string "{0}" is replaced by the first element in the ContentItems array. */
+            set_contentText(value: string): string;
+            /** Specifies additional information when creating server-generated posts */
+            get_definitionData(): SocialPostDefinitionData;
+            /** Specifies additional information when creating server-generated posts */
+            set_definitionData(value: SocialPostDefinitionData): SocialPostDefinitionData;
+            /** Specifies the link to a web site associated with the application that created the post */
+            get_source(): SocialLink;
+            /** Specifies the link to a web site associated with the application that created the post */
+            set_source(value: SocialLink): SocialLink;
+            /** Specifies that access to the post SHOULD be restricted to users that have access to the objects identified by the array of URIs */
+            get_securityUris(): string[];
+            /** Specifies that access to the post SHOULD be restricted to users that have access to the objects identified by the array of URIs */
+            set_securityUris(value: string[]): string[];
+            /** Indicates whether the post is to be used as the current user's new status message. */
+            get_updateStatusText(): boolean;
+            /** Indicates whether the post is to be used as the current user's new status message. */
+            set_updateStatusText(value: boolean): boolean;
+        }
+
+        /** Provides additional information about server-generated posts.
+            This type can only be specified in a server-to-server call. */
+        export class SocialPostDefinitionData extends SP.ClientValueObject {
+            get_items(): SocialPostDefinitionDataItem[];
+            set_items(value: SocialPostDefinitionDataItem[]): SocialPostDefinitionDataItem[];
+            get_name(): string;
+            set_name(value: string): string;
+        }
+
+        /** Specifies an item to be inserted in a post by replacing a token in the post definition.
+            This type can only be specified in a server-to-server call. */
+        export class SocialPostDefinitionDataItem extends SP.ClientValueObject {
+            /** Specifies the name of the user.
+                This property is only used if the ItemType property specifies that the item is a User. */
+            get_accountName(): string;
+            /** Specifies the name of the user.
+                This property is only used if the ItemType property specifies that the item is a User. */
+            set_accountName(value: string): string;
+            /** Specifies whether the item being formatted is a text element, a user, a document, a site, a tag, or a link. */
+            get_itemType(): SocialPostDefinitionDataItemType;
+            /** Specifies whether the item being formatted is a text element, a user, a document, a site, a tag, or a link. */
+            set_itemType(value: SocialPostDefinitionDataItemType): SocialPostDefinitionDataItemType;
+            /** Specifies the post definition token to be replaced by the item */
+            get_placeholderName(): string;
+            /** Specifies the post definition token to be replaced by the item */
+            set_placeholderName(value: string): string;
+            /** Specifies the GUID that identifies the tag.
+                This property is only used if the ItemType property specifies that the item is a Tag. */
+            get_tagGuid(): string;
+            /** Specifies the GUID that identifies the tag.
+                This property is only used if the ItemType property specifies that the item is a Tag. */
+            set_tagGuid(value: string): string;
+            /** Specifies the text that is substituted for the placeholder */
+            get_text(): string;
+            /** Specifies the text that is substituted for the placeholder */
+            set_text(value: string): string;
+            /** Specifies the URI of the document, site, or link.
+                This property is only available if the ItemType property specifies that the item is a Document, Link, or Site. */
+            get_uri(): string;
+            /** Specifies the URI of the document, site, or link.
+                This property is only available if the ItemType property specifies that the item is a Document, Link, or Site. */
+            set_uri(value: string): string;
+        }
+
+        /** Specifies a reference to a post in another thread.
+            The referenced post can be a post with a tag, a post that is liked, a post that mentions a user, or a post that is a reply. */
+        export class SocialPostReference extends SP.ClientValueObject {
+            /** Provides a digest of the thread containing the referenced post */
+            get_digest(): SocialThread;
+            get_post(): SocialPost;
+            /** Specifies the unique identifier of the thread containing the referenced post. */
+            get_threadId(): string;
+            /** Specifies the current owner of the thread as an index into the SocialThreadActors array. */
+            get_threadOwnerIndex(): number;
+        }
+
+        /** Specifies a thread that is stored on the server.
+            The thread contains a root post and zero or more reply posts. */
+        export class SocialThread extends SP.ClientValueObject {
+            /** Specifies the users who have created a post in the returned thread and also contains any users, documents, sites, and tags that are referenced in any of the posts in the returned thread. */
+            get_actors(): SocialActor[];
+            /** Specifies attributes of the thread, such as whether the current user can reply or lock the thread and whether the thread is a digest of a thread on the server, whether the number of replies has reached the maximum, and whether the thread is locked. */
+            get_attributes(): SocialThreadAttributes;
+            /** Specifies the unique identification of the thread. */
+            get_id(): string;
+            /** Specifies the thread owner as an index into the Actors array.
+                Typically, the thread owner is the user who created the root post, but the thread owner can be any user included in the Actors array. */
+            get_ownerIndex(): number;
+            /** Specifies a URI that is a permanent reference to the thread, if such a permanent reference is available.  */
+            get_permalink(): string;
+            /** Specifies a reference to a post in another thread.
+                The PostReference property is available only if the ThreadType has a value of ReplyReference, LikeReference, MentionReference, or TagReference.  */
+            get_postReference(): SocialPostReference;
+            /** Returns an array of zero or more reply posts.
+                The server can return a subset of the reply posts that are stored on the server. */
+            get_replies(): SocialPost[];
+            get_rootPost(): SocialPost;
+            /** Provides information about conditions that were encountered retrieving the thread that did not prevent the operation from completing. */
+            get_status(): SocialStatusCode;
+            /** Specifies if the thread is a normal thread created by one or more CreatePost calls or a reference post generated by the server when a user replies to a post, likes a post, or creates a post with a tag or mention */
+            get_threadType(): SocialThreadType;
+            get_totalReplyCount(): number;
+        }
+
+    }
+
+}
+declare namespace SP {
+    namespace Taxonomy {
+        export enum StringMatchOption {
+            startsWith,
+            exactMatch
+        }
+
+        export enum ChangeItemType {
+            unknown,
+            term,
+            termSet,
+            group,
+            termStore,
+            site
+        }
+
+        export enum ChangeOperationType {
+            unknown,
+            add,
+            edit,
+            deleteObject,
+            move,
+            copy,
+            pathChange,
+            merge,
+            importObject,
+            restore
+        }
+
+
+        export class TaxonomySession extends SP.ClientObject {
+            static getTaxonomySession(context: SP.ClientContext): TaxonomySession;
+            get_offlineTermStoreNames(): string[];
+            get_termStores(): TermStoreCollection;
+            getTerms(labelMatchInformation: LabelMatchInformation): TermCollection;
+            updateCache(): void;
+            getTerm(guid: SP.Guid): Term;
+            getTermsById(termIds: SP.Guid[]): TermCollection;
+            getTermsInDefaultLanguage(
+                termLabel: string,
+                defaultLabelOnly: boolean,
+                stringMatchOption: StringMatchOption,
+                resultCollectionSize: number,
+                trimUnavailable: boolean,
+                trimDeprecated: boolean): TermCollection;
+
+            getTermsInWorkingLocale(
+                termLabel: string,
+                defaultLabelOnly: boolean,
+                stringMatchOption: StringMatchOption,
+                resultCollectionSize: number,
+                trimUnavailable: boolean,
+                trimDeprecated: boolean): TermCollection;
+
+            getTermsWithCustomProperty(customPropertyName: string, trimUnavailable: boolean): TermCollection;
+            getTermsWithCustomProperty(customPropertyMatchInformation: CustomPropertyMatchInformation): TermCollection;
+            getTermSetsByName(termSetName: string, lcid: number): TermSetCollection;
+            getTermSetsByTermLabel(requiredTermLabels: string[], lcid: number): TermSetCollection;
+            getDefaultKeywordsTermStore(): TermStore;
+            getDefaultSiteCollectionTermStore(): TermStore;
+        }
+
+        export class TermStoreCollection extends SP.ClientObjectCollection<TermStore> {
+            itemAt(index: number): TermStore;
+            get_item(index: number): TermStore;
+            getById(id: SP.Guid): TermStore;
+            getByName(name: string): TermStore;
+        }
+
+        export class TermStore extends SP.ClientObject {
+            get_contentTypePublishingHub(): string;
+            get_defaultLanguage(): number;
+            set_defaultLanguage(value: number): void;
+            get_groups(): TermGroupCollection;
+            get_hashTagsTermSet(): TermSet;
+            get_id(): SP.Guid;
+            get_isOnline(): boolean;
+            get_keywordsTermSet(): TermSet;
+            get_languages(): number[];
+            get_name(): string;
+            get_orphanedTermsTermSet(): TermSet;
+            get_systemGroup(): TermGroup;
+            get_workingLanguage(): number;
+            set_workingLanguage(value: number): void;
+
+            addLanguage(lcid: number): void;
+            commitAll(): void;
+            createGroup(name: string): TermGroup;
+            createGroup(name: string, groupId: SP.Guid): TermGroup;
+
+            deleteLanguage(lcid: number): void;
+
+            getChanges(changeInformation: ChangeInformation): ChangedItemCollection;
+
+            getGroup(id: SP.Guid): TermGroup;
+            getTerm(termId: SP.Guid): Term;
+            getTermInTermSet(termSetId: SP.Guid, termId: SP.Guid): Term;
+            getTermsById(termIds: SP.Guid[]): TermCollection;
+            getTerms(termLabel: string, trimUnavailable: boolean): TermCollection;
+            getTerms(labelMatchInformation: LabelMatchInformation): TermCollection;
+            getTermSetsByName(termSetName: string, lcid: number): TermSetCollection;
+            getTermSetsByTermLabel(requiredTermLabels: string[], lcid: number): TermSetCollection;
+            getTermsWithCustomProperty(customPropertyName: string, trimUnavailable: boolean): TermCollection;
+            getTermsWithCustomProperty(customPropertyMatchInformation: CustomPropertyMatchInformation): TermCollection;
+
+            getTermSet(termSetId: SP.Guid): TermSet;
+            getTermSetsWithCustomProperty(customPropertyMatchInformation: CustomPropertyMatchInformation): TermSetCollection;
+            rollbackAll(): void;
+            updateCache(): void;
+            getSiteCollectionGroup(currentSite: SP.Site, createIfMissing: boolean): TermGroup;
+            updateUsedTermsOnSite(currentSite: SP.Site): void;
+        }
+
+        export class TaxonomyItem extends SP.ClientObject {
+            static normalizeName(context: SP.ClientContext, name: string): SP.StringResult;
+            get_createdDate(): Date;
+            get_id(): SP.Guid;
+            get_lastModifiedDate(): Date;
+            get_name(): string;
+            set_name(value: string): void;
+            get_termStore(): TermStore;
+            deleteObject(): void;
+        }
+
+        export class TermGroupCollection extends SP.ClientObjectCollection<TermGroup> {
+            itemAt(index: number): TermGroup;
+            get_item(index: number): TermGroup;
+            getById(id: SP.Guid): TermGroup;
+            getByName(name: string): TermGroup;
+        }
+
+        export class TermGroup extends TaxonomyItem {
+            get_description(): string;
+            set_description(value: string): void;
+            get_isSiteCollectionGroup(): boolean;
+            get_isSystemGroup(): boolean;
+            get_termSets(): TermSetCollection;
+            createTermSet(name: string, newTermSetId: SP.Guid, lcid: number): TermSet;
+            exportObject(): SP.StringResult;
+            getChanges(changeInformation: ChangeInformation): ChangedItemCollection;
+            getTermSetsWithCustomProperty(customPropertyMatchInformation: CustomPropertyMatchInformation): TermSetCollection;
+        }
+
+        export class TermSetItem extends TaxonomyItem {
+            get_customProperties(): { [key: string]: string; };
+            get_customSortOrder(): string;
+            set_customSortOrder(value: string): void;
+            get_isAvailableForTagging(): boolean;
+            set_isAvailableForTagging(value: boolean): void;
+            get_owner(): string;
+            set_owner(value: string): void;
+            get_terms(): TermCollection;
+            createTerm(name: string, lcid: number, newTermId: SP.Guid): Term;
+            /*getTerms(pagingLimit: number): TermCollection;*/ //Moved to descendants to void TypeScript errors
+            reuseTerm(sourceTerm: Term, reuseBranch: boolean): Term;
+            reuseTermWithPinning(sourceTerm: Term): Term;
+            deleteCustomProperty(name: string): void;
+            deleteAllCustomProperties(): void;
+            setCustomProperty(name: string, value: string): void;
+        }
+
+        export class TermSetCollection extends SP.ClientObjectCollection<TermSet> {
+            itemAt(index: number): TermSet;
+            get_item(index: number): TermSet;
+            getById(id: SP.Guid): TermSet;
+            getByName(name: string): TermSet;
+        }
+
+        export class TermSet extends TermSetItem {
+            get_contact(): string;
+            set_contact(value: string): void;
+            get_description(): string;
+            set_description(value: string): void;
+            get_group(): TermGroup;
+            get_isOpenForTermCreation(): boolean;
+            set_isOpenForTermCreation(value: boolean): void;
+            get_stakeholders(): string[];
+            addStakeholder(stakeholderName: string): void;
+            copy(): TermSet;
+            deleteStakeholder(stakeholderName: string): void;
+            exportObject(): SP.StringResult;
+            getAllTerms(): TermCollection;
+            getChanges(changeInformation: ChangeInformation): ChangedItemCollection;
+            getTerm(termId: SP.Guid): Term;
+            getTerms(pagingLimit: number): TermCollection;
+            getTerms(termLabel: string, trimUnavailable: boolean): TermCollection;
+            getTerms(labelMatchInformation: LabelMatchInformation): TermCollection;
+            getTermsWithCustomProperty(customPropertyName: string, trimUnavailable: boolean): TermCollection;
+            getTermsWithCustomProperty(customPropertyMatchInformation: CustomPropertyMatchInformation): TermCollection;
+            move(targetGroup: TermGroup): void;
+        }
+
+        export class TermCollection extends SP.ClientObjectCollection<Term> {
+            itemAt(index: number): Term;
+            get_item(index: number): Term;
+            getById(id: SP.Guid): Term;
+            getByName(name: string): Term;
+        }
+
+        export class Term extends TermSetItem {
+            get_description(): string;
+            get_isDeprecated(): boolean;
+            get_isKeyword(): boolean;
+            get_isPinned(): boolean;
+            get_isPinnedRoot(): boolean;
+            get_isReused(): boolean;
+            get_isRoot(): boolean;
+            get_isSourceTerm(): boolean;
+            get_labels(): LabelCollection;
+            get_localCustomProperties(): { [key: string]: string; };
+            get_mergedTermIds(): SP.Guid[];
+            get_parent(): Term;
+            get_pathOfTerm(): string;
+            get_pinSourceTermSet(): TermSet;
+            get_reusedTerms(): TermCollection;
+            get_sourceTerm(): Term;
+            get_termsCount(): number;
+            get_termSet(): TermSet;
+            get_termSets(): TermSetCollection;
+            copy(doCopyChildren: boolean): Term;
+            createLabel(labelName: string, lcid: number, isDefault: boolean): Label;
+            deleteLocalCustomProperty(name: string): void;
+            deleteAllLocalCustomProperties(): void;
+            deprecate(doDepricate: boolean): void;
+            getAllLabels(lcid: number): LabelCollection;
+            getDefaultLabel(lcid: number): Label;
+            getDescription(lcid: number): SP.StringResult;
+
+            getTerms(pagingLimit: number): TermCollection;
+            getTerms(
+                termLabel: string,
+                lcid: number,
+                defaultLabelOnly: boolean,
+                stringMatchOption: StringMatchOption,
+                resultCollectionSize: number,
+                trimUnavailable: boolean): TermCollection;
+
+            merge(termToMerge: Term): void;
+            move(newParnt: TermSetItem): void;
+            reassignSourceTerm(reusedTerm: Term): void;
+            setDescription(description: string, lcid: number): void;
+            setLocalCustomProperty(name: string, value: string): void;
+            getIsDescendantOf(ancestorTerm: Term): SP.BooleanResult;
+            getPath(lcid: number): SP.StringResult;
+        }
+
+
+        export class LabelCollection extends SP.ClientObjectCollection<Label> {
+            itemAt(index: number): Label;
+            get_item(index: number): Label;
+            getByValue(name: string): Label;
+        }
+
+        export class Label extends SP.ClientObject {
+            get_isDefaultForLanguage(): boolean;
+            get_language(): number;
+            set_language(value: number): void;
+            get_term(): Term;
+            get_value(): string;
+            set_value(value: string): void;
+            deleteObject(): void;
+            setAsDefaultForLanguage(): void;
+        }
+
+        export class LabelMatchInformation extends SP.ClientObject {
+            constructor(context: SP.ClientContext);
+            get_defaultLabelOnly(): boolean;
+            set_defaultLabelOnly(value: boolean): void;
+            get_excludeKeyword(): boolean;
+            set_excludeKeyword(value: boolean): void;
+            get_lcid(): number;
+            set_lcid(value: number): void;
+            get_resultCollectionSize(): number;
+            set_resultCollectionSize(value: number): void;
+            get_stringMatchOption(): StringMatchOption;
+            set_stringMatchOption(value: StringMatchOption): void;
+            get_termLabel(): string;
+            set_termLabel(value: string): void;
+            get_trimDeprecated(): boolean;
+            set_trimDeprecated(value: boolean): void;
+            get_trimUnavailable(): boolean;
+            set_trimUnavailable(value: boolean): void;
+        }
+
+        export class CustomPropertyMatchInformation extends SP.ClientObject {
+            constructor(context: SP.ClientContext);
+            get_customPropertyName(): string;
+            set_customPropertyName(value: string): void;
+            get_customPropertyValue(): string;
+            set_customPropertyValue(value: string): void;
+            get_resultCollectionSize(): number;
+            set_resultCollectionSize(value: number): void;
+            get_stringMatchOption(): StringMatchOption;
+            set_stringMatchOption(value: StringMatchOption): void;
+            get_trimUnavailable(): boolean;
+            set_trimUnavailable(value: boolean): void;
+        }
+
+        export class ChangeInformation extends SP.ClientObject {
+            constructor(context: SP.ClientContext);
+            get_itemType(): ChangeItemType;
+            set_itemType(value: ChangeItemType): void;
+            get_operationType(): ChangeOperationType;
+            set_operationType(value: ChangeOperationType): void;
+            get_startTime(): Date;
+            set_startTime(value: Date): void;
+            get_withinTimeSpan(): number;
+            set_withinTimeSpan(value: number): void;
+        }
+
+        export class ChangedItemCollection extends SP.ClientObjectCollection<ChangedItem> {
+            itemAt(index: number): ChangedItem;
+            get_item(index: number): ChangedItem;
+        }
+
+        export class ChangedItem extends SP.ClientObject {
+            get_changedBy(): string;
+            get_changedTime(): Date;
+            get_id(): SP.Guid;
+            get_itemType(): ChangeItemType;
+            get_operation(): ChangeOperationType;
+        }
+
+        export class ChangedSite extends ChangedItem {
+            get_siteId(): SP.Guid;
+            get_termId(): SP.Guid;
+            get_termSetId(): SP.Guid;
+        }
+
+        export class ChangedGroup extends ChangedItem {
+        }
+
+        export class ChangedTerm extends ChangedItem {
+            get_changedCustomProperties(): string[];
+            get_changedLocalCustomProperties(): string[];
+            get_groupId(): SP.Guid;
+            get_lcidsForChangedDescriptions(): number[];
+            get_lcidsForChangedLabels(): number[];
+            get_termSetId(): SP.Guid;
+        }
+
+        export class ChangedTermSet extends ChangedItem {
+            get_fromGroupId(): SP.Guid;
+            get_groupId(): SP.Guid;
+        }
+        export class ChangedTermStore extends ChangedItem {
+            get_changedLanguage(): number;
+            get_isDefaultLanguageChanged(): boolean;
+            get_isFullFarmRestore(): boolean;
+        }
+
+        export class TaxonomyField extends SP.FieldLookup {
+            constructor(context: SP.ClientContext, fields: SP.FieldCollection, filedName: string);
+            get_anchorId(): SP.Guid;
+            set_anchorId(value: SP.Guid): void;
+            get_createValuesInEditForm(): boolean;
+            set_createValuesInEditForm(value: boolean): void;
+            get_isAnchorValid(): boolean;
+            get_isKeyword(): boolean;
+            set_isKeyword(value: boolean): void;
+            get_isPathRendered(): boolean;
+            set_isPathRendered(value: boolean): void;
+            get_isTermSetValid(): boolean;
+            get_open(): boolean;
+            set_open(value: boolean): void;
+            get_sspId(): SP.Guid;
+            set_sspId(value: SP.Guid): void;
+            get_targetTemplate(): string;
+            set_targetTemplate(value: string): void;
+            get_termSetId(): SP.Guid;
+            set_termSetId(value: SP.Guid): void;
+            get_textField(): SP.Guid;
+            get_userCreated(): SP.Guid;
+            set_userCreated(value: SP.Guid): void;
+
+            getFieldValueAsText(value: TaxonomyFieldValue): SP.StringResult;
+            getFieldValueAsTaxonomyFieldValue(value: string): TaxonomyFieldValue;
+            getFieldValueAsTaxonomyFieldValueCollection(value: string): TaxonomyFieldValueCollection;
+            setFieldValueByTerm(listItem: SP.ListItem, term: Term, lcid: number): void;
+            setFieldValueByTermCollection(listItem: SP.ListItem, terms: TermCollection, lcid: number): void;
+            setFieldValueByCollection(listItem: SP.ListItem, terms: Term[], lcid: number): void;
+            setFieldValueByValue(listItem: SP.ListItem, taxValue: TaxonomyFieldValue): void;
+            setFieldValueByValueCollection(listItem: SP.ListItem, taxValueCollection: TaxonomyFieldValueCollection): void;
+            getFieldValueAsHtml(value: TaxonomyFieldValue): SP.StringResult;
+            getValidatedString(value: TaxonomyFieldValue): SP.StringResult;
+
+        }
+
+        export class TaxonomyFieldValueCollection extends SP.ClientObjectCollection<TaxonomyFieldValue> {
+            constructor(context: SP.ClientContext, fieldValue: string, creatingField: SP.Field);
+            itemAt(index: number): TaxonomyFieldValue;
+            get_item(index: number): TaxonomyFieldValue;
+            populateFromLabelGuidPairs(text: string): void;
+        }
+
+        export class TaxonomyFieldValue extends SP.ClientValueObject {
+            get_label(): string;
+            set_label(value: string): void;
+            get_termGuid(): SP.Guid;
+            set_termGuid(value: SP.Guid): void;
+            get_wssId(): SP.Guid;
+            set_wssId(value: SP.Guid): void;
+        }
+
+        export class MobileTaxonomyField extends SP.ClientObject {
+            get_readOnly(): boolean;
+        }
+    }
+}
+
+declare namespace SP {
+    export module DocumentSet {
+        export class DocumentSet extends ClientObject {
+            static create(context: ClientContext, parentFolder: Folder, name: string, ctid: ContentTypeId): StringResult;
+        }
+    }
+
+    export module Video {
+        export class EmbedCodeConfiguration extends ClientValueObject {
+            public get_autoPlay(): boolean;
+            public set_autoPlay(value: boolean): boolean;
+
+            public get_displayTitle(): boolean;
+            public set_displayTitle(value: boolean): boolean;
+
+            public get_linkToOwnerProfilePage(): boolean;
+            public set_linkToOwnerProfilePage(value: boolean): boolean;
+
+            public get_linkToVideoHomePage(): boolean;
+            public set_linkToVideoHomePage(value: boolean): boolean;
+
+            public get_loop(): boolean;
+            public set_loop(value: boolean): boolean;
+
+            public get_pixelHeight(): number;
+            public set_pixelHeight(value: number): number;
+
+            public get_pixelWidth(): number;
+            public set_pixelWidth(value: number): number;
+
+            public get_startTime(): number;
+            public set_startTime(value: number): number;
+
+            public get_previewImagePath(): string;
+            public set_previewImagePath(value: string): string;
+        }
+
+        export class VideoSet extends DocumentSet.DocumentSet {
+            static createVideo(context: ClientContext, parentFolder: Folder, name: string, ctid: ContentTypeId): StringResult;
+            static uploadVideo(context: ClientContext, list: List, fileName: string, file: any[], overwriteIfExists: boolean, parentFolderPath: string): StringResult;
+            static getEmbedCode(context: ClientContext, videoPath: string, properties: EmbedCodeConfiguration): StringResult;
+            static migrateVideo(context: ClientContext, videoFile: File): SP.ListItem;
+        }
+    }
+}
+
+
+declare namespace SP {
+    export module UI {
+        export module ApplicationPages {
+            export class SelectorSelectionEventArgs extends Sys.EventArgs {
+                constructor(entities: any);
+                get_entities(): any;
+            }
+            export interface ISelectorComponent {
+                get_selectedEntities(): any;
+                set_selectedEntities(value: any): void;
+                get_callback(): (sender: any, e: Sys.EventArgs) => void;
+                set_callback(value: (sender: any, e: Sys.EventArgs) => void): void;
+                get_scopeKey(): string;
+                get_componentType(): SP.UI.ApplicationPages.SelectorType;
+                revertTo(ent: SP.UI.ApplicationPages.ResolveEntity): void;
+                removeEntity(ent: SP.UI.ApplicationPages.ResolveEntity): void;
+                setEntity(ent: SP.UI.ApplicationPages.ResolveEntity): void;
+            }
+            export enum SelectorType {
+                none,
+                resource,
+                people,
+                people_And_Resource,
+                event,
+            }
+            export class CalendarSelector extends Sys.Component {
+                static instance(): SP.UI.ApplicationPages.CalendarSelector;
+                registerSelector(selector: SP.UI.ApplicationPages.ISelectorComponent): void;
+                getSelector(type: SP.UI.ApplicationPages.SelectorType, scopeKey: string): SP.UI.ApplicationPages.ISelectorComponent;
+                addHandler(scopeKey: string, people: boolean, resource: boolean, handler: (sender: any, selection: SP.UI.ApplicationPages.SelectorSelectionEventArgs) => void): void;
+                revertTo(scopeKey: string, ent: SP.UI.ApplicationPages.ResolveEntity): void;
+                removeEntity(scopeKey: string, ent: SP.UI.ApplicationPages.ResolveEntity): void;
+                constructor();
+            }
+            export class BaseSelectorComponent implements SP.UI.ApplicationPages.ISelectorComponent {
+                constructor(key: string, type: SP.UI.ApplicationPages.SelectorType);
+                get_scopeKey(): string;
+                get_componentType(): SP.UI.ApplicationPages.SelectorType;
+                get_selectedEntities(): any;
+                set_selectedEntities(value: any): void;
+                get_callback(): (sender: any, e: Sys.EventArgs) => void;
+                set_callback(value: (sender: any, e: Sys.EventArgs) => void): void;
+                revertTo(ent: SP.UI.ApplicationPages.ResolveEntity): void;
+                removeEntity(ent: SP.UI.ApplicationPages.ResolveEntity): void;
+                setEntity(ent: SP.UI.ApplicationPages.ResolveEntity): void;
+            }
+            export interface ICalendarController {
+                moveToDate(date: string): void;
+                moveToViewType(viewType: string): void;
+                moveToViewDate(scope: SP.UI.ApplicationPages.CalendarScope, date: string): void;
+                moveToView(scope: SP.UI.ApplicationPages.CalendarScope): void;
+                expandAll(): void;
+                collapseAll(): void;
+                refreshItems(): void;
+                getActiveScope(): SP.UI.ApplicationPages.CalendarScope;
+                newItemDialog(contentTypeId: string): void;
+                deleteItem(itemId: string): void;
+            }
+            export enum CalendarScope {
+                nothing,
+                monthly,
+                weeklyGroup,
+                daily,
+                weekly,
+                dailyGroup,
+            }
+            export class CalendarInstanceRepository {
+                static registerInstance(instanceId: string, contoller: SP.UI.ApplicationPages.ICalendarController): void;
+                static lookupInstance(instanceId: string): SP.UI.ApplicationPages.ICalendarController;
+                static firstInstance(): SP.UI.ApplicationPages.ICalendarController;
+            }
+            export class ResolveEntity {
+                tYPE_EVENT: string;
+                tYPE_USER: string;
+                tYPE_RESOURCE: string;
+                tYPE_EXCHANGE: string;
+                entityType: string;
+                displayName: string;
+                email: string;
+                accountName: string;
+                id: string;
+                members: SP.UI.ApplicationPages.ResolveEntity[];
+                needResolve: boolean;
+                isGroup: boolean;
+                get_key(): string;
+                constructor();
+            }
+            export class ClientPeoplePickerQueryParameters extends SP.ClientValueObject {
+                get_allowEmailAddresses(): boolean;
+                set_allowEmailAddresses(value: boolean): void;
+                get_allowMultipleEntities(): boolean;
+                set_allowMultipleEntities(value: boolean): void;
+                get_allUrlZones(): boolean;
+                set_allUrlZones(value: boolean): void;
+                get_enabledClaimProviders(): string;
+                set_enabledClaimProviders(value: string): void;
+                get_forceClaims(): boolean;
+                set_forceClaims(value: boolean): void;
+                get_maximumEntitySuggestions(): number;
+                set_maximumEntitySuggestions(value: number): void;
+                get_principalSource(): SP.Utilities.PrincipalSource;
+                set_principalSource(value: SP.Utilities.PrincipalSource): void;
+                get_principalType(): SP.Utilities.PrincipalType;
+                set_principalType(value: SP.Utilities.PrincipalType): void;
+                get_queryString(): string;
+                set_queryString(value: string): void;
+                get_required(): boolean;
+                set_required(value: boolean): void;
+                get_sharePointGroupID(): number;
+                set_sharePointGroupID(value: number): void;
+                get_urlZone(): SP.UrlZone;
+                set_urlZone(value: SP.UrlZone): void;
+                get_urlZoneSpecified(): boolean;
+                set_urlZoneSpecified(value: boolean): void;
+                get_web(): SP.Web;
+                set_web(value: SP.Web): void;
+                get_webApplicationID(): SP.Guid;
+                set_webApplicationID(value: SP.Guid): void;
+                get_typeId(): string;
+                writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+                constructor();
+            }
+            export class ClientPeoplePickerWebServiceInterface {
+                static clientPeoplePickerSearchUser(context: SP.ClientRuntimeContext, queryParams: SP.UI.ApplicationPages.ClientPeoplePickerQueryParameters): SP.StringResult;
+                static clientPeoplePickerResolveUser(context: SP.ClientRuntimeContext, queryParams: SP.UI.ApplicationPages.ClientPeoplePickerQueryParameters): SP.StringResult;
+            }
+            export class PeoplePickerWebServiceInterface {
+                static getSearchResultsByHierarchy(context: SP.ClientRuntimeContext, providerID: string, hierarchyNodeID: string, entityTypes: string, contextUrl: string): SP.StringResult;
+                static getSearchResults(context: SP.ClientRuntimeContext, searchPattern: string, providerID: string, hierarchyNodeID: string, entityTypes: string): SP.StringResult;
+            }
+        }
+    }
+}
+
+declare namespace SP {
+    export module UI {
+        export class PopoutMenu implements Sys.IDisposable {
+            constructor(launcherId: string, menuId: string, iconId: string, launcherOpenCssClass: string, textDirection: string, closeIconUrl: string, isClustered: boolean, closeIconOffsetLeft: number, closeIconOffsetTop: number, closeIconHeight: number, closeIconWidth: number);
+            launchMenu(): void;
+            closeMenu(): void;
+            static createPopoutMenuInstanceAndLaunch(anchorId: string, menuId: string, iconId: string, anchorOpenCss: string, textDirection: string, closeIconUrl: string, isClustered: boolean, x: number, y: number, height: number, width: number): void;
+            static closeActivePopoutMenuInstance(): void;
+            dispose(): void;
+        }
+        export class AttractModeControl extends Sys.UI.Control {
+            defaultAttractModeIcon: string;
+            cssAttractMode: string;
+            cssAttractModeBackground: string;
+            cssAttractModeCell: string;
+            cssAttractModeWrapper: string;
+            cssAttractModeIcon: string;
+            cssAttractModeText: string;
+            get_imageElement(): any;
+            get_textElement(): HTMLElement;
+            constructor();
+        }
+
+        export module Notify {
+            export function addNotification(strHtml: string, bSticky: boolean): string;
+            export function removeNotification(nid: string): void;
+            export function showLoadingNotification(bSticky: boolean): string;
+
+
+            export class Notification {
+                constructor(containerId: SPNotifications.ContainerID, strHtml: string, bSticky?: boolean, strTooltip?: string, onclickHandler?: () => void, extraData?: SPStatusNotificationData);
+                get_id(): string;
+                Show(bNoAnimate: boolean): void;
+                Hide(bNoAnimate: boolean): void;
+            }
+            export class NotificationContainer {
+                constructor(id: number, element: any, layer: number, notificationLimit?: number);
+                Clear(): void;
+                GetCount(): number;
+                SetEventHandler(eventId: SPNotifications.EventID, eventHandler: any): void;
+            }
+        }
+
+        export class Status {
+            static addStatus(strTitle: string, strHtml?: string, atBegining?: boolean): string;
+            static appendStatus(sid: string, strTitle: string, strHtml: string): string;
+            static updateStatus(sid: string, strHtml: string): void;
+            static setStatusPriColor(sid: string, strColor: string): void;
+            static removeStatus(sid: string): void;
+            static removeAllStatus(hide: boolean): void;
+            constructor();
+        }
+
+        export module Workspace {
+            export function add_resized(handler: () => void): void;
+            export function remove_resized(handler: () => void): void;
+        }
+        export class Menu {
+            static create(id: string): SP.UI.Menu;
+            addMenuItem(text: string, actionScriptText: string, imageSourceUrl: string, imageAlternateText: string, sequenceNumber: number, description: string, id: string): HTMLElement;
+            addSeparator(): void;
+            addSubMenu(text: string, imageSourceUrl: string, imageAlternateText: string, sequenceNumber: number, description: string, id: string): SP.UI.Menu;
+            show(relativeElement: HTMLElement, forceRefresh: boolean, flipTopLevelMenu: boolean, yOffset: number): void;
+            showFilterMenu(relativeElement: HTMLElement, forceRefresh: boolean, flipTopLevelMenu: boolean, yOffset: number, fShowClose: boolean, fShowCheckBoxes: boolean): void;
+            hideIcons(): void;
+            showIcons(): void;
+        }
+        export class MenuTest {
+            static setup(relativeElement: HTMLElement): void;
+            constructor();
+        }
+
+        export function $create_DialogOptions(): DialogOptions;
+
+        /** Result of a modal dialog execution */
+        export enum DialogResult {
+            /** Do not use this */
+            invalid,
+            /** User closed dialog, cancelling the action */
+            cancel,
+            /** Dialog actions completed successfully */
+            OK
+        }
+        /** Callback which processes dialog result value after dialog is closed */
+        export interface DialogReturnValueCallback {
+            (dialogResult: DialogResult, returnValue: any): void;
+        }
+        /** Options for dialog creation */
+        export interface IDialogOptions {
+            /** Text displayed in the title bar of the dialog box. If not defined, it will default to the title of the page defined by url property. */
+            title?: string;
+            /** X coordinate of the dialog box. */
+            x?: number;
+            /** Y coordinate of the dialog box. */
+            y?: number;
+            /** The dialog will be maximized when shown. */
+            showMaximized?: boolean;
+            /** url of the page which is shown in the modal dialog. You should use either html or url attribute, but not both. */
+            url?: string;
+            /** specifies if close button should be shown on the dialog */
+            showClose?: boolean;
+            /** specifies if maximize button should be shown on the dialog */
+            allowMaximize?: boolean;
+            /** callback that is called after dialog is closed */
+            dialogReturnValueCallback?: DialogReturnValueCallback;
+            /** automatically determine size of the dialog based on its contents. */
+            autoSize?: boolean;
+            /** minimum width of the dialog when using autoSize option */
+            autoSizeStartWidth?: number;
+            /** include padding for adding a scrollbar */
+            includeScrollBarPadding?: boolean;
+            /** width of the dialog. if not specified, will be determined automatically based on the contents of the dialog */
+            width?: number;
+            /** height of the dialog. if not specified, will be determined automatically based on the contents of the dialog */
+            height?: number;
+            /** html element which will be used as contents of the dialog. You should use either html or url attribute, but not both. */
+            html?: HTMLElement;
+            /** custom arguments to be passed to the dialog */
+            args?: any;
+        }
+        export class DialogOptions implements IDialogOptions {
+            /** Text displayed in the title bar of the dialog box. If not defined, it will default to the title of the page defined by url property. */
+            title: string;
+            /** X coordinate of the dialog box. */
+            x: number;
+            /** Y coordinate of the dialog box. */
+            y: number;
+            /** The dialog will be maximized when shown. */
+            showMaximized: boolean;
+            /** url of the page which is shown in the modal dialog. You should use either html or url attribute, but not both. */
+            url: string;
+            /** specifies if close button should be shown on the dialog */
+            showClose: boolean;
+            /** specifies if maximize button should be shown on the dialog */
+            allowMaximize: boolean;
+            /** callback that is called after dialog is closed */
+            dialogReturnValueCallback: DialogReturnValueCallback;
+            /** automatically determine size of the dialog based on its contents. */
+            autoSize: boolean;
+            /** minimum width of the dialog when using autoSize option */
+            autoSizeStartWidth: number;
+            /** include padding for adding a scrollbar */
+            includeScrollBarPadding: boolean;
+            /** width of the dialog. if not specified, will be determined automatically based on the contents of the dialog */
+            width: number;
+            /** height of the dialog. if not specified, will be determined automatically based on the contents of the dialog */
+            height: number;
+            /** html element which will be used as contents of the dialog. You should use either html or url attribute, but not both. */
+            html: HTMLElement;
+            /** custom arguments to be passed to the dialog */
+            args: any;
+        }
+        /** Represents a dialog. Do not use this class directly from your code. */
+        export class Dialog {
+            get_firstTabStop(): HTMLElement;
+            get_lastTabStop(): HTMLElement;
+            get_url(): string;
+            get_html(): string;
+            get_title(): string;
+            get_args(): any;
+            get_allowMaximize(): boolean;
+            get_showClose(): boolean;
+            get_returnValue(): any;
+            set_returnValue(value: any): void;
+            get_frameElement(): HTMLFrameElement;
+            get_dialogElement(): HTMLElement;
+            get_isMaximized(): boolean;
+            get_closed(): boolean;
+            autoSizeSuppressScrollbar(resizePageCallBack: any): void;
+            autoSize(): void;
+        }
+        /** Represents a modal dialog */
+        export class ModalDialog extends SP.UI.Dialog {
+            /** Displays a modal dialog defined by the specified options. */
+            static showModalDialog(options: SP.UI.IDialogOptions): SP.UI.ModalDialog;
+            /** Should be called from an existing dialog. */
+            static commonModalDialogClose(dialogResult: SP.UI.DialogResult, returnValue: any): void;
+            /** Shows a modal dialog, specified by url, callback, args, and options. Internally, uses SP.UI.ModalDialog.showModalDialog.
+                @param url overrides options.url
+                @param callback overrides options.dialogResultValueCallback
+                @param args overrides options.args */
+            static commonModalDialogOpen(url: string, options: SP.UI.IDialogOptions, callback?: SP.UI.DialogReturnValueCallback, args?: any): void;
+            /** Refresh the page if specified dialogResult equals to SP.UI.DialogResult.OK */
+            static RefreshPage(dialogResult: SP.UI.DialogResult): void;
+            /** Show page specified by the url in a modal dialog. If the dialog returns SP.UI.DialogResult.OK, the page is refreshed. */
+            static ShowPopupDialog(url: string): void;
+            /** Show modal dialog specified by url, callback, height and width. */
+            static OpenPopUpPage(url: string, callback: SP.UI.DialogReturnValueCallback, width?: number, height?: number): void;
+            /** Displays a wait/loading modal dialog with the specified title, message, height and width. Height and width are defined in pixels. Cancel/close button is not shown. */
+            static showWaitScreenWithNoClose(title: string, message?: string, height?: number, width?: number): SP.UI.ModalDialog;
+            /** Displays a wait/loading modal dialog with the specified title, message, height and width. Height and width are defined in pixels. Cancel button is shown. If user clicks it, the callbackFunc is called. */
+            static showWaitScreenSize(title: string, message?: string, callbackFunc?: SP.UI.DialogReturnValueCallback, height?: number, width?: number): SP.UI.ModalDialog;
+            static showPlatformFirstRunDialog(url: string, callbackFunc: SP.UI.DialogReturnValueCallback): SP.UI.ModalDialog;
+            static get_childDialog(): SP.UI.ModalDialog;
+            /** Closes the dialog using the specified dialog result. */
+            close(dialogResult: SP.UI.DialogResult): void;
+        }
+
+
+        export class Command {
+            constructor(name: string, displayName: string);
+            get_displayName(): string;
+            set_displayName(value: string): string;
+
+            get_tooltip(): string;
+            set_tooltip(value: string): string;
+
+            get_isEnabled(): boolean;
+            set_isEnabled(value: boolean): boolean;
+
+            get_href(): string;
+            get_name(): string;
+            get_elementIDPrefix(): string;
+            set_elementIDPrefix(value: string): string;
+
+            get_linkElement(): HTMLAnchorElement;
+
+            get_isDropDownCommand(): boolean;
+            set_isDropDownCommand(value: boolean): boolean;
+
+            attachEvents(): void;
+            render(builder: HtmlBuilder): void;
+
+
+            /**Should override*/
+            onClick(): void;
+
+        }
+
+
+        export class CommandBar {
+            constructor();
+            get_commands(): Command[];
+            get_dropDownThreshold(): number;
+            set_dropDownThreshold(value: number): number;
+            get_elementID(): string;
+            get_overrideClass(): string;
+            set_overrideClass(value: string): string;
+            addCommand(action: Command): void;
+            insertCommand(action: Command, position: number): void;
+            render(builder: HtmlBuilder): void;
+            attachEvents(): void;
+            findCommandByName(name: string): Command;
+        }
+
+
+        export class PagingControl {
+            constructor(id: string);
+            render(innerContent: string): string;
+            postRender(): void;
+            get_innerContent(): HTMLSpanElement;
+            get_innerContentClass(): string;
+            setButtonState(buttonId: number, state: number): void;
+            getButtonState(buttonId: number): number;
+            onWindowResized(): void;
+
+            /**Should override*/
+            onPrev(): void;
+            onNext(): void;
+
+            static ButtonIDs: {
+                prev: number;
+                next: number;
+            }
+
+            static ButtonState: {
+                hidden: number
+                disabled: number;
+                enabled: number;
+            }
+        }
+
+        export module Workplace {
+            export function add_resized(handler: Function): void;
+            export function remove_resized(handler: Function): void;
+        }
+
+        export module UIUtility {
+            export function generateRandomElementId(): string;
+            export function cancelEvent(evt: Event): void;
+            export function clearChildNodes(elem: HTMLElement): void;
+            export function hideElement(elem: HTMLElement): void;
+            export function showElement(elem: HTMLElement): void;
+            export function insertBefore(elem: HTMLElement, targetElement: HTMLElement): void;
+            export function insertAfter(elem: HTMLElement, targetElement: HTMLElement): void;
+            export function removeNode(elem: HTMLElement): void;
+            export function calculateOffsetLeft(elem: HTMLElement): number;
+            export function calculateOffsetTop(elem: HTMLElement): number;
+            export function createHtmlInputText(text: string): HTMLInputElement;
+            export function createHtmlInputCheck(isChecked: boolean): HTMLInputElement;
+            export function setInnerText(elem: HTMLElement, value: string): void;
+            export function getInnerText(elem: HTMLElement): string;
+            export function isTextNode(elem: HTMLElement): boolean;
+            export function isSvgNode(elem: HTMLElement): boolean;
+            export function isNodeOfType(elem: HTMLElement, tagNames: string[]): boolean;
+            export function focusValidOnThisNode(elem: HTMLElement): boolean;
+        }
+    }
+}
+
+declare namespace SPNotifications {
+
+    export enum ContainerID {
+        Basic,
+        Status,
+    }
+    export enum EventID {
+        OnShow,
+        OnHide,
+        OnDisplayNotification,
+        OnRemoveNotification,
+        OnNotificationCountChanged,
+    }
+}
+
+declare class SPStatusNotificationData {
+    constructor(text: string, subText: string, imageUrl: string, sip: string);
+}
+declare function RefreshCommandUI():void;
+
+declare namespace SP {
+    export module UI {
+        export module Controls {
+
+            export interface INavigationOptions {
+                assetId?: string;
+                siteTitle?: string;
+                siteUrl?: string;
+                appTitle?: string;
+                appTitleIconUrl?: string;
+                rightToLeft?: boolean;
+                appStartPage?: string;
+                appIconUrl?: string;
+                appHelpPageUrl?: string;
+                appHelpPageOnClick?: string;
+                settingsLinks?: ISettingsLink[];
+                language?: string;
+                clientTag?: string;
+                appWebUrl?: string;
+                onCssLoaded?: string;
+
+
+                bottomHeaderVisible?: boolean;
+                topHeaderVisible?: boolean;
+            }
+
+            export class NavigationOptions implements INavigationOptions { }
+
+
+            export interface ISettingsLink {
+                linkUrl: string;
+                displayName: string;
+            }
+
+            export class SettingsLink implements ISettingsLink {
+                linkUrl: string;
+                displayName: string;
+            }
+
+
+            export class Navigation {
+                constructor(placeholderDOMElementId: string, options: INavigationOptions);
+                public get_assetId(): string;
+                public get_siteTitle(): string;
+                public get_siteUrl(): string;
+
+                public get_appTitle(): string;
+                public set_appTitle(value: string): string;
+
+                public get_appTitleIconUrl(): string;
+                public set_appTitleIconUrl(value: string): string;
+
+                public get_rightToLeft(): boolean;
+                public set_rightToLeft(value: boolean): boolean;
+
+                public get_appStartPage(): string;
+                public set_appStartPage(value: string): string;
+
+                public get_appIconUrl(): string;
+                public set_appIconUrl(value: string): string;
+
+                public get_appHelpPageUrl(): string;
+                public set_appHelpPageUrl(value: string): string;
+
+                public get_appHelpPageOnClick(): string;
+                public set_appHelpPageOnClick(value: string): string;
+
+                public get_settingsLinks(): ISettingsLink[];
+                public set_settingsLinks(value: ISettingsLink[]): ISettingsLink[];
+
+                public setVisible(value: boolean): void;
+
+                public setTopHeaderVisible(value: boolean): void;
+                public setBottomHeaderVisible(value: boolean): void;
+                public remove(): void;
+
+                static getVersionedLayoutsUrl(pageName: string): string;
+            }
+
+
+            export class ControlManager {
+                static getControl(placeHolderId: string): any;
+            }
+        }
+    }
+}
+
+declare namespace SP {
+
+    export module UserProfiles {
+        /** Specifies types of changes made in the user profile store. */
+        export enum ChangeTypes {
+            /** No change was made */
+            none,
+            /** An object was added */
+            add,
+            /** An object was modified */
+            modify,
+            /** An object was removed */
+            remove,
+            /** The metadata of an object was modified */
+            metadata,
+            /** Multiple operations were performed on an object */
+            all
+        }
+
+        export class HashTag extends ClientValueObject {
+            get_name(): string;
+            get_useCount(): number;
+        }
+
+        export class HashTagCollection extends SP.ClientObjectCollection<HashTag> {
+            itemAt(index: number): HashTag;
+            get_item(index: number): HashTag;
+        }
+
+        /** Specifies types of user-related objects that can be changed in the user profile store. */
+        export enum ObjectTypes {
+            none,
+            singleValueProperty,
+            multiValueProperty,
+            anniversary,
+            dlMembership,
+            siteMembership,
+            quickLink,
+            colleague,
+            personalizationSite,
+            userProfile,
+            webLog,
+            custom,
+            organizationProfile,
+            organizationMembership,
+            all
+        }
+
+        /** Provides methods for operations related to people.
+            Note: The SocialFollowingManager object is the recommended object for performing Following People and Following Content tasks.
+            However, PeopleManager provides some methods that SocialFollowingManager doesn�t. */
+        export class PeopleManager extends SP.ClientObject {
+            constructor(context: SP.ClientRuntimeContext);
+            static getTrendingTags(context: SP.ClientRuntimeContext): HashTagCollection;
+            /** Checks whether the first user is following the second user. */
+            static isFollowing(context: SP.ClientRuntimeContext, possibleFollowerAccountName: string, possibleFolloweeAccountName: string): SP.BooleanResult;
+            /** Gets the URL of the edit profile page for the current user. */
+            get_editProfileLink(): string;
+            /** Gets a Boolean value that indicates whether the current user's People I'm Following list is public. */
+            get_isMyPeopleListPublic(): boolean;
+            /** Gets tags that the user is following. */
+            getFollowedTags(numberOfTagsToFetch: number): string[];
+            /** Gets user properties for the current user. */
+            getMyProperties(): PersonProperties;
+            getPropertiesFor(accountName: string): PersonProperties;
+            /** Gets the specified user profile property for the specified user. */
+            getUserProfilePropertyFor(accountName: string, propertyName: string): string;
+            /** Gets the specified user profile properties for the specified user. */
+            getUserProfilePropertiesFor(propertiesForUser: UserProfilePropertiesForUser): any[];
+            /** Gets suggestions for who the current user might want to follow.
+                Note: The recommended API to use for this task is SocialFollowingManager.getSuggestions.
+                Returns list of PersonProperties objects */
+            getMySuggestions(): SP.ClientObjectList<PersonProperties>;
+            /** Removes the specified user from the user's list of suggested people to follow. */
+            hideSuggestion(accountName: string): void;
+            follow(accountName: string): void;
+            stopFollowing(accountName: string): void;
+            /** Add the specified tag to the current user's list of followed tags.
+                @param tagId GUID of the tag to start following. */
+            followTag(tagId: string): void;
+            /** Remove the specified tag from the current user's list of followed tags.
+                @param tagId GUID of the tag to stop following. */
+            stopFollowingTag(tagId: string): void;
+            amIFollowing(accountName: string): SP.BooleanResult;
+            getPeopleFollowedByMe(): SP.ClientObjectList<PersonProperties>;
+            getPeopleFollowedBy(accountName: string): SP.ClientObjectList<PersonProperties>;
+            getMyFollowers(): SP.ClientObjectList<PersonProperties>;
+            getFollowersFor(accountName: string): SP.ClientObjectList<PersonProperties>;
+            amIFollowedBy(accountName: string): SP.BooleanResult;
+            /** Uploads and sets the user profile picture.
+                Pictures in bmp, jpg and png formats and up to 5,000,000 bytes are supported.
+                A user can upload a picture only to the user's own profile.
+                @param data Binary content of an image file */
+            setMyProfilePicture(data: SP.Base64EncodedByteArray): void;
+        }
+
+        /** Specifies the capabilities of a personal site. */
+        export enum PersonalSiteCapabilities {
+            none,
+            profile,
+            social,
+            storage,
+            myTasksDashboard,
+            education,
+            guest
+        }
+
+        /** Specifies an exception or status code for the state of a personal site instantiation. */
+        export enum PersonalSiteInstantiationState {
+            uninitialized,
+            enqueued,
+            created,
+            deleted,
+            permissionsGeneralFailure,
+            permissionsUPANotGranted,
+            permissionsUserNotLicensed,
+            permissionsSelfServiceSiteCreationDisabled,
+            permissionsNoMySitesInPeopleLight,
+            permissionsEmptyHostUrl,
+            permissionsHostFailedToInitializePersonalSiteContext,
+            errorGeneralFailure,
+            errorManagedPathDoesNotExist,
+            errorLanguageNotInstalled,
+            errorPartialCreate,
+            errorPersonalSiteAlreadyExists,
+            errorRootSiteNotPresent,
+            errorSelfServiceSiteCreateCallFailed
+        }
+
+        export enum SocialDataStoreExceptionCode {
+            socialListNotFound,
+            personalSiteNotFound,
+            cannotCreatePersonalSite,
+            noSocialFeatures
+        }
+
+        /** Represents user properties. */
+        export class PersonProperties extends SP.ClientObject {
+            /** Specifies the person's account name */
+            get_accountName(): string;
+            /** Specifies an array of strings containing the account names of a person's direct reports. */
+            get_directReports(): string[];
+            /** Specifies the person's name. */
+            get_displayName(): string;
+            /** Specifies the person's email address. */
+            get_email(): string;
+            /** Specifies an array of strings that specify the account names of a person's managers. */
+            get_extendedManagers(): string[];
+            /** Specifies an array of strings that specify the account names of person's extended reports. */
+            get_extendedReports(): string[];
+            /** Represents whether or not the current user is following this person. */
+            get_isFollowed(): boolean;
+            /** Specifies the person's latest microblog post. */
+            get_latestPost(): string;
+            /** Specifies an array of strings that specify the account names of person's peers, that is, those who have the same manager. */
+            get_peers(): string[];
+            /** Specifies the absolute URL of the person's personal page. */
+            get_personalUrl(): string;
+            /** Specifies the URL for the person's profile picture. */
+            get_pictureUrl(): string;
+            /** Specifies the person's title. */
+            get_title(): string;
+            /** Represents all user profile properties including custom.
+                The privacy settings affect which properties can be retrieved.
+                Multiple values are delimited by the vertical bar "|".
+                Null values are specified as empty strings. */
+            get_userProfileProperties(): { [name: string]: string; };
+            /** Specifies the URL for the person's profile. */
+            get_userUrl(): string;
+        }
+
+        /** Provides an alternate entry point to user profiles rather than calling methods directly. */
+        export class ProfileLoader extends SP.ClientObject {
+            static getProfileLoader(context: SP.ClientRuntimeContext): ProfileLoader;
+            getUserProfile(): UserProfile;
+        }
+
+        /** Represents a client-side user profile for a person.
+            Note: The client-side UserProfile object provides methods you can use to create a personal site for the current user.
+            However, it does not contain the user properties that the server-side UserProfile object contains.
+            To access user properties from client-side code, use PeopleManager */
+        export class UserProfile extends SP.ClientObject {
+            constructor();
+            /** Represents the content that the user is following. */
+            get_followedContent(): FollowedContent;
+            /** Retrieves SP.Site object that represents the user's personal site. */
+            get_personalSite(): SP.Site;
+            /** Specifies attributes of the user's personal site. */
+            get_personalSiteCapabilities(): PersonalSiteCapabilities;
+            /** Provides the state of the user's personal site */
+            get_personalSiteInstantiationState(): PersonalSiteInstantiationState;
+            /** Specifies whether the user can import pictures */
+            get_pictureImportEnabled(): boolean;
+            /** Specifies the URL to allow the current user to create a personal site. */
+            get_urlToCreatePersonalSite(): string;
+            /** Specifies whether the current user's social data is to be shared. */
+            shareAllSocialData(shareAll: boolean): void;
+            /** This member is reserved for internal use and is not intended to be used directly from your code.
+                Use the createPersonalSiteEnque method to create a personal site. */
+            createPersonalSite(lcid: number): void;
+            /** Enquees creation of a personal site for the current user.
+                @param isInteractive Has a true value if the request is from a web browser and a false value if the request is from a client application. */
+            createPersonalSiteEnque(isInteractive: boolean): void;
+        }
+
+        /** Provides access to followed content items. */
+        export class FollowedContent extends SP.ClientObject {
+            constructor(context: SP.ClientRuntimeContext);
+            static newObject(context: SP.ClientRuntimeContext): FollowedContent;
+            /** Gets the location of the followed sites view */
+            get_followedDocumentsUrl(): string;
+            /** Gets the location of the followed documents view. */
+            get_followedSitesUrl(): string;
+            /** The Follow method adds the specified document or site to the list of followed content.
+                @param url  URL that identifies the item to follow.
+                            The url parameter can identify an existing document or site using the url property of the original item.
+                            The url parameter can also identify a document with the following format: http://host/site?listId=<listGuid>&itemId=<itemId>
+                @param data Optional parameter that holds application-defined data for the item.
+                */
+            follow(url: string, data?: FollowedItemData): FollowResult;
+            /** The FollowItem method is reserved for server-to-server use only.
+                The server sets the specified item to be followed by the current user.
+                This method cannot be called from the client. */
+            followItem(item: FollowedItem): FollowResult;
+            /** Removes the specified document or site from list of followed content.
+                @param url  URL that identifies the item to stop following.
+                            The url parameter can identify an existing document or site using the url property of the original item.
+                            The url parameter can also identify a document with the following format: http://host/site?listId=<listGuid>&itemId=<itemId> */
+            stopFollowing(url: string): void;
+            /** Determines if the specified document or site is being followed.
+                @param url  URL that identifies the item that is supposed to be followed.
+                            The url parameter can identify an existing document or site using the url property of the original item.
+                            The url parameter can also identify a document with the following format: http://host/site?listId=<listGuid>&itemId=<itemId> */
+            isFollowed(url: string): SP.BooleanResult;
+            /** Retrieves the followed status of the specified document or site.
+                Returns a value of type FollowedStatus, wrapped into a SP.IntResult object.
+                @param url  URL that identifies the followed item.
+                            The url parameter can identify an existing document or site using the url property of the original item.
+                            The url parameter can also identify a document with the following format: http://host/site?listId=<listGuid>&itemId=<itemId> */
+            getFollowedStatus(url: string): SP.IntResult;
+            /** Returns the followed item identified by a given URL or returns null if the item does not exist.
+                @param url  URL that identifies the followed item.
+                            The url parameter can identify an existing document or site using the url property of the original item.
+                            The url parameter can also identify a document with the following format: http://host/site?listId=<listGuid>&itemId=<itemId> */
+            getItem(url: string): FollowedItem;
+            /** Returns an array of zero or more followed items described by the type and subtype parameters.
+                @param options Describes the type of item to return.
+                @param subType Integer that identifies the sites to return by the web template. */
+            getItems(options: FollowedContentQueryOptions, subtype: number): FollowedItem[];
+            /** Updates the properties for followed item with specified URL.
+                @param url  URL that identifies the followed item.
+                            The url parameter can identify an existing document or site using the url property of the original item.
+                            The url parameter can also identify a document with the following format: http://host/site?listId=<listGuid>&itemId=<itemId>
+                @param data Application-defined data stored with the followed item. */
+            updateData(url: string, data: FollowedItemData): void;
+            /** Returns the refreshed item that is being pointed to in the Social list.
+                @param item The original item as stored in the Followed Content list. */
+            refreshFollowedItem(item: FollowedItem): FollowedItem;
+            /** Finds the original item that is being pointed to in the Followed Content list and updates the Title, Url, and IconUrl fields if they have been changed.
+                @param url The URL of the original item as stored in the Followed Content list. */
+            findAndUpdateFollowedItem(url: string): FollowedItem;
+        }
+
+        /** Represents a followed content resource. */
+        export class FollowedItem extends SP.ClientValueObject {
+            /** Additional metadata associated with this item */
+            get_data(): { [name: string]: any; };
+            /** Additional metadata associated with this item */
+            set_data(value: { [name: string]: any; }): { [name: string]: any; };
+            /** Specifies the type of the file if this item is a file. Otherwise, this property is the empty string. */
+            get_fileType(): string;
+            /** Specifies the type of the file if this item is a file. Otherwise, this property is the empty string. */
+            set_fileType(value: string): string;
+            /** Provides information about the application that opens a followed document. */
+            get_fileTypeProgid(): string;
+            /** Provides information about the application that opens a followed document. */
+            set_fileTypeProgid(value: string): string;
+            /** Specifies additional information about the followed item.
+                The server stores the data so that it can return it to the client. */
+            get_flags(): string;
+            /** Specifies additional information about the followed item.
+                The server stores the data so that it can return it to the client. */
+            set_flags(value: string): string;
+            /** Indicates whether the followed site has a feed. */
+            get_hasFeed(): boolean;
+            /** Indicates whether the followed site has a feed. */
+            set_hasFeed(value: boolean): boolean;
+            /** Specifies if the item is hidden from the user. If true this item will not generate activity in the user's feed. */
+            get_hidden(): boolean;
+            /** Specifies if the item is hidden from the user. If true this item will not generate activity in the user's feed. */
+            set_hidden(value: boolean): boolean;
+            /** Specifies the URL of an icon to represent this item. */
+            get_iconUrl(): string;
+            /** Specifies the URL of an icon to represent this item. */
+            set_iconUrl(value: string): string;
+            /** Specifies the identification for this item in the Content database. */
+            get_itemId(): number;
+            /** Specifies the identification for this item in the Content database. */
+            set_itemId(value: number): number;
+            /** Specifies the type of this item. */
+            get_itemType(): FollowedItemType;
+            /** Specifies the type of this item. */
+            set_itemType(value: FollowedItemType): FollowedItemType;
+            /** The ListId property specifies the list identification (GUID) for this item in the Content database if this item is a list or the list identification for its parent list.
+                If the ItemType is Document, this property is specified, but if the ItemType is Site, then this property is not specified. */
+            get_listId(): string;
+            /** The ListId property specifies the list identification (GUID) for this item in the Content database if this item is a list or the list identification for its parent list.
+                If the ItemType is Document, this property is specified, but if the ItemType is Site, then this property is not specified. */
+            set_listId(value: string): string;
+            /** Specifies the URL of this item's parent list or web. */
+            get_parentUrl(): string;
+            /** Specifies the URL of this item's parent list or web. */
+            set_parentUrl(value: string): string;
+            /** Provides information about the followed document to the application that opens it. */
+            get_serverUrlProgid(): string;
+            /** Provides information about the followed document to the application that opens it. */
+            set_serverUrlProgid(value: string): string;
+            /** Specifies the site identification (GUID) in the Content database for this item if this item is a site, or for its parent site if this item is not a site. */
+            get_siteId(): string;
+            /** Specifies the site identification (GUID) in the Content database for this item if this item is a site, or for its parent site if this item is not a site. */
+            set_siteId(value: string): string;
+            /** Specifies the subtype of this item.
+                If the ItemType is Site, the Subtype specifies the web template identification.
+                If the ItemType is Document, the Subtype has a value of 1. */
+            get_subtype(): number;
+            /** Specifies the subtype of this item.
+                If the ItemType is Site, the Subtype specifies the web template identification.
+                If the ItemType is Document, the Subtype has a value of 1. */
+            set_subtype(value: number): number;
+            /** Specifies the item of this item */
+            get_title(): string;
+            /** Specifies the item of this item */
+            set_title(value: string): string;
+            /** Specifies the GUID for this item in the Content database. */
+            get_uniqueId(): SP.Guid;
+            /** Specifies the GUID for this item in the Content database. */
+            set_uniqueId(value: SP.Guid): SP.Guid;
+            /** Specifies the URL of this item. */
+            get_url(): string;
+            /** Specifies the URL of this item. */
+            set_url(value: string): string;
+            /** Specifies the site identification (GUID) in the Content database for this item if it is a site, or the identification of its parent site if this item is a document. */
+            get_webId(): SP.Guid;
+            /** Specifies the site identification (GUID) in the Content database for this item if it is a site, or the identification of its parent site if this item is a document. */
+            set_webId(value: SP.Guid): any;
+        }
+
+        export enum FollowedItemType {
+            unknown,
+            document,
+            site,
+            all
+        }
+
+        export enum FollowedContentExceptionType {
+            itemAlreadyExists,
+            itemDoesNotExist,
+            invalidQueryString,
+            invalidSubtypeValue,
+            unsupportedItemType,
+            followLimitReached,
+            untrustedSource,
+            unsupportedSite,
+            internalError
+        }
+
+        export enum FollowedContentQueryOptions {
+            unset,
+            sites,
+            documents,
+            hidden,
+            nonFeed,
+            defaultOptions,
+            all
+        }
+
+        export enum FollowedStatus {
+            followed,
+            notFollowed,
+            notFollowable
+        }
+
+
+        /** Contains additional data that can be attached to a FollowedItem object */
+        export class FollowedItemData extends SP.ClientObject {
+            /** An unordered collection of key/value pairs for custom properties to be set on the item. */
+            get_properties(): { [name: string]: any; };
+        }
+
+        /** Returns information about a request to follow an item. */
+        export class FollowResult extends SP.ClientValueObject {
+            /** Contains the item being followed. */
+            get_item(): FollowedItem;
+            /** Provides information about the attempt to follow an item. */
+            get_resultType(): FollowResultType;
+        }
+
+        export enum FollowResultType {
+            /** Result is unknown */
+            unknown,
+            /** The request succeeded and the item is being followed. */
+            followed,
+            /** The item was already being followed by the current user so there is no change in status. */
+            refollowed,
+            /** The request encountered the maximum follow limit. */
+            hitFollowLimit,
+            /** The request failed. */
+            failed
+        }
+
+        /** Represents a set of user profile properties for a specified user. */
+        export class UserProfilePropertiesForUser extends SP.ClientObject {
+            /** Creates new UserProfilePropertiesForUser object
+                @param context Specifies the client context to use.
+                @param accountName Specifies the user by account name.
+                @param propertyNames Specifies an array of strings that specify the properties to retrieve. */
+            constructor(context: SP.ClientContext, accountName: string, propertyNames: string[]);
+
+            /** Specifies the user account name */
+            get_accountName(): string;
+            /** Specifies the user account name */
+            set_accountName(value: string): string;
+            /** Gets an array of strings that specify the user profile property names. */
+            getPropertyNames(): string[];
+        }
+    }
+
+}
+
+declare namespace SP {
+
+    export module Utilities {
+        export class Utility {
+            lAYOUTS_LATESTVERSION_RELATIVE_URL: string;
+            lAYOUTS_LATESTVERSION_URL: string;
+            static get_layoutsLatestVersionRelativeUrl(): string;
+            static get_layoutsLatestVersionUrl(): string;
+            static getLayoutsPageUrl(pageName: string): string;
+            static getImageUrl(imageName: string): string;
+            static createWikiPageInContextWeb(context: SP.ClientRuntimeContext, parameters: SP.Utilities.WikiPageCreationInformation): SP.File;
+            static localizeWebPartGallery(context: SP.ClientRuntimeContext, items: SP.ListItemCollection): SP.ClientObjectList<SP.ListItem>;
+            static getAppLicenseInformation(context: SP.ClientRuntimeContext, productId: SP.Guid): SP.AppLicenseCollection;
+            static importAppLicense(context: SP.ClientRuntimeContext, licenseTokenToImport: string, contentMarket: string, billingMarket: string, appName: string, iconUrl: string, providerName: string, appSubtype: number): void;
+            static getAppLicenseDeploymentId(context: SP.ClientRuntimeContext): SP.GuidResult;
+            static logCustomAppError(context: SP.ClientRuntimeContext, error: string): SP.IntResult;
+            static logCustomRemoteAppError(context: SP.ClientRuntimeContext, productId: SP.Guid, error: string): SP.IntResult;
+            static getLocalizedString(context: SP.ClientRuntimeContext, source: string, defaultResourceFile: string, language: number): SP.StringResult;
+            static createNewDiscussion(context: SP.ClientRuntimeContext, list: SP.List, title: string): SP.ListItem;
+            static createNewDiscussionReply(context: SP.ClientRuntimeContext, parent: SP.ListItem): SP.ListItem;
+            static markDiscussionAsFeatured(context: SP.ClientRuntimeContext, listID: string, topicIDs: string): void;
+            static unmarkDiscussionAsFeatured(context: SP.ClientRuntimeContext, listID: string, topicIDs: string): void;
+            static searchPrincipals(context: SP.ClientRuntimeContext, web: SP.Web, input: string, scopes: SP.Utilities.PrincipalType, sources: SP.Utilities.PrincipalSource, usersContainer: SP.UserCollection, maxCount: number): SP.Utilities.PrincipalInfo[];
+            static getCurrentUserEmailAddresses(context: SP.ClientRuntimeContext): SP.StringResult;
+            static createEmailBodyForInvitation(context: SP.ClientRuntimeContext, pageAddress: string): SP.StringResult;
+            static getPeoplePickerURL(context: SP.ClientRuntimeContext, web: SP.Web, fieldUser: SP.FieldUser): SP.StringResult;
+            static resolvePrincipal(context: SP.ClientRuntimeContext, web: SP.Web, input: string, scopes: SP.Utilities.PrincipalType, sources: SP.Utilities.PrincipalSource, usersContainer: SP.UserCollection, inputIsEmailOnly: boolean): SP.Utilities.PrincipalInfo;
+            static getLowerCaseString(context: SP.ClientRuntimeContext, sourceValue: string, lcid: number): SP.StringResult;
+            static formatDateTime(context: SP.ClientRuntimeContext, web: SP.Web, datetime: Date, format: SP.Utilities.DateTimeFormat): SP.StringResult;
+            static isUserLicensedForEntityInContext(context: SP.ClientRuntimeContext, licensableEntity: string): SP.BooleanResult;
+        }
+        export enum DateTimeFormat {
+            dateTime,
+            dateOnly,
+            timeOnly,
+            iSO8601,
+            monthDayOnly,
+            monthYearOnly,
+            longDate,
+            unknownFormat,
+        }
+        export class EmailProperties extends SP.ClientValueObject {
+            get_additionalHeaders(): any;
+            set_additionalHeaders(value: any): void;
+            get_bCC(): string[];
+            set_bCC(value: string[]): void;
+            get_body(): string;
+            set_body(value: string): void;
+            get_cC(): string[];
+            set_cC(value: string[]): void;
+            get_from(): string;
+            set_from(value: string): void;
+            get_subject(): string;
+            set_subject(value: string): void;
+            get_to(): string[];
+            set_to(value: string[]): void;
+            get_typeId(): string;
+            writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+            constructor();
+        }
+        export enum IconSize {
+            size16,
+            size32,
+            size256,
+        }
+        export enum LogAppErrorResult {
+            success,
+            errorsThrottled,
+            accessDenied,
+        }
+        export class PrincipalInfo extends SP.ClientValueObject {
+            get_department(): string;
+            get_displayName(): string;
+            get_email(): string;
+            get_jobTitle(): string;
+            get_loginName(): string;
+            get_mobile(): string;
+            get_principalId(): number;
+            get_principalType(): SP.Utilities.PrincipalType;
+            get_sIPAddress(): string;
+            get_typeId(): string;
+            writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+            constructor();
+        }
+        export enum PrincipalSource {
+            none,
+            userInfoList,
+            windows,
+            membershipProvider,
+            roleProvider,
+            all,
+        }
+        export enum PrincipalType {
+            none,
+            user,
+            distributionList,
+            securityGroup,
+            sharePointGroup,
+            all,
+        }
+        export enum SPWOPIFrameAction {
+            view,
+            edit,
+            mobileView,
+            interactivePreview,
+        }
+        export class WikiPageCreationInformation extends SP.ClientValueObject {
+            get_serverRelativeUrl(): string;
+            set_serverRelativeUrl(value: string): void;
+            get_wikiHtmlContent(): string;
+            set_wikiHtmlContent(value: string): void;
+            get_typeId(): string;
+            writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+            constructor();
+        }
+        export class DateUtility {
+            static isLeapYear(year: number): boolean;
+            static dateToJulianDay(year: number, month: number, day: number): number;
+            static julianDayToDate(julianDay: number): SP.DateTimeUtil.SimpleDate;
+            static daysInMonth(year: number, month: number): number;
+        }
+        export class HttpUtility {
+            /** Official version of STSHtmlEncode. Calls it internally. */
+            static htmlEncode(stringToEncode: string): string;
+            static urlPathEncode(stringToEncode: string): string;
+            static urlKeyValueEncode(keyOrValueToEncode: string): string;
+            static ecmaScriptStringLiteralEncode(scriptLiteralToEncode: string): string;
+            static navigateTo(url: string): void;
+            /** Appends correct "Source" parameter to the specified url, and then navigates to this url.
+                "Source" parameter is recognized in many places in SharePoint, usually to determine "Cancel" behavior. */
+            static appendSourceAndNavigateTo(url: string): void;
+            static escapeXmlText(stringToEscape: string): string;
+            static navigateHttpFolder(urlSrc: string, frameTarget: string): void;
+        }
+        export class UrlBuilder {
+            constructor(path: string);
+            static urlCombine(path1: string, path2: string): string;
+            static replaceOrAddQueryString(url: string, key: string, value: string): string;
+            static removeQueryString(url: string, key: string): string;
+            combinePath(path: string): void;
+            addKeyValueQueryString(key: string, value: string): void;
+            /** Returns the resulting url */
+            get_url(): string;
+            /** Same as get_url() */
+            toString(): string;
+        }
+
+        export class LocUtility {
+            static getLocalizedCountValue(locText: string, intervals: string, count: number): string;
+        }
+
+        export class VersionUtility {
+            static get_layoutsLatestVersionRelativeUrl(): string;
+            static get_layoutsLatestVersionUrl(): string;
+            static getLayoutsPageUrl(pageName: string): string;
+            static getImageUrl(imageName: string): string;
+        }
+
+    }
+
+    export module DateTimeUtil {
+        export class SimpleDate {
+            constructor(year: number, month: number, day: number, era: number);
+            get_year(): number;
+            set_year(value: number): void;
+            get_month(): number;
+            set_month(value: number): void;
+            get_day(): number;
+            set_day(value: number): void;
+            get_era(): number;
+            set_era(value: number): void;
+            static dateEquals(date1: SimpleDate, date2: SimpleDate): boolean;
+            static dateLessEqual(date1: SimpleDate, date2: SimpleDate): boolean;
+            static dateGreaterEqual(date1: SimpleDate, date2: SimpleDate): boolean;
+            static dateLess(date1: SimpleDate, date2: SimpleDate): boolean;
+            static dateGreater(date1: SimpleDate, date2: SimpleDate): boolean;
+        }
+    }
+}
+
+declare namespace SP {
+    export module WebParts {
+        export class LimitedWebPartManager extends SP.ClientObject {
+            get_hasPersonalizedParts(): boolean;
+            get_scope(): SP.WebParts.PersonalizationScope;
+            get_webParts(): SP.WebParts.WebPartDefinitionCollection;
+            addWebPart(webPart: SP.WebParts.WebPart, zoneId: string, zoneIndex: number): SP.WebParts.WebPartDefinition;
+            importWebPart(webPartXml: string): SP.WebParts.WebPartDefinition;
+        }
+        export enum PersonalizationScope {
+            user,
+            shared,
+        }
+        export class TileData extends SP.ClientValueObject {
+            get_backgroundImageLocation(): string;
+            set_backgroundImageLocation(value: string): void;
+            get_description(): string;
+            set_description(value: string): void;
+            get_iD(): number;
+            set_iD(value: number): void;
+            get_linkLocation(): string;
+            set_linkLocation(value: string): void;
+            get_tileOrder(): number;
+            set_tileOrder(value: number): void;
+            get_title(): string;
+            set_title(value: string): void;
+            get_typeId(): string;
+            writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+            constructor();
+        }
+        export class WebPart extends SP.ClientObject {
+            get_hidden(): boolean;
+            set_hidden(value: boolean): void;
+            get_isClosed(): boolean;
+            get_properties(): SP.PropertyValues;
+            get_subtitle(): string;
+            get_title(): string;
+            set_title(value: string): void;
+            get_titleUrl(): string;
+            set_titleUrl(value: string): void;
+            get_zoneIndex(): number;
+        }
+        export class WebPartDefinition extends SP.ClientObject {
+            get_id(): SP.Guid;
+            get_webPart(): SP.WebParts.WebPart;
+            saveWebPartChanges(): void;
+            closeWebPart(): void;
+            openWebPart(): void;
+            deleteWebPart(): void;
+            moveWebPartTo(zoneID: string, zoneIndex: number): void;
+        }
+        export class WebPartDefinitionCollection extends SP.ClientObjectCollection<WebPartDefinition> {
+            itemAt(index: number): SP.WebParts.WebPartDefinition;
+            get_item(index: number): SP.WebParts.WebPartDefinition;
+            getById(id: SP.Guid): SP.WebParts.WebPartDefinition;
+            getByControlId(controlId: string): SP.WebParts.WebPartDefinition;
+        }
+    }
+}
+
+declare namespace SP {
+    export module Workflow {
+        export class WorkflowAssociation extends SP.ClientObject {
+            get_allowManual(): boolean;
+            set_allowManual(value: boolean): void;
+            get_associationData(): string;
+            set_associationData(value: string): void;
+            get_autoStartChange(): boolean;
+            set_autoStartChange(value: boolean): void;
+            get_autoStartCreate(): boolean;
+            set_autoStartCreate(value: boolean): void;
+            get_baseId(): SP.Guid;
+            get_created(): Date;
+            get_description(): string;
+            set_description(value: string): void;
+            get_enabled(): boolean;
+            set_enabled(value: boolean): void;
+            get_historyListTitle(): string;
+            set_historyListTitle(value: string): void;
+            get_id(): SP.Guid;
+            get_instantiationUrl(): string;
+            get_internalName(): string;
+            get_isDeclarative(): boolean;
+            get_listId(): SP.Guid;
+            get_modified(): Date;
+            get_name(): string;
+            set_name(value: string): void;
+            get_taskListTitle(): string;
+            set_taskListTitle(value: string): void;
+            get_webId(): SP.Guid;
+            update(): void;
+            deleteObject(): void;
+        }
+        export class WorkflowAssociationCollection extends SP.ClientObjectCollection<WorkflowAssociation> {
+            itemAt(index: number): SP.Workflow.WorkflowAssociation;
+            get_item(index: number): SP.Workflow.WorkflowAssociation;
+            getById(associationId: SP.Guid): SP.Workflow.WorkflowAssociation;
+            add(parameters: SP.Workflow.WorkflowAssociationCreationInformation): SP.Workflow.WorkflowAssociation;
+            getByName(name: string): SP.Workflow.WorkflowAssociation;
+        }
+        export class WorkflowAssociationCreationInformation extends SP.ClientValueObject {
+            get_contentTypeAssociationHistoryListName(): string;
+            set_contentTypeAssociationHistoryListName(value: string): void;
+            get_contentTypeAssociationTaskListName(): string;
+            set_contentTypeAssociationTaskListName(value: string): void;
+            get_historyList(): SP.List;
+            set_historyList(value: SP.List): void;
+            get_name(): string;
+            set_name(value: string): void;
+            get_taskList(): SP.List;
+            set_taskList(value: SP.List): void;
+            get_template(): SP.Workflow.WorkflowTemplate;
+            set_template(value: SP.Workflow.WorkflowTemplate): void;
+            get_typeId(): string;
+            writeToXml(writer: SP.XmlWriter, serializationContext: SP.SerializationContext): void;
+            constructor();
+        }
+        export class WorkflowTemplate extends SP.ClientObject {
+            get_allowManual(): boolean;
+            get_associationUrl(): string;
+            get_autoStartChange(): boolean;
+            get_autoStartCreate(): boolean;
+            get_description(): string;
+            get_id(): SP.Guid;
+            get_isDeclarative(): boolean;
+            get_name(): string;
+            get_permissionsManual(): SP.BasePermissions;
+        }
+        export class WorkflowTemplateCollection extends SP.ClientObjectCollection<WorkflowTemplate> {
+            itemAt(index: number): SP.Workflow.WorkflowTemplate;
+            get_item(index: number): SP.Workflow.WorkflowTemplate;
+            getById(templateId: SP.Guid): SP.Workflow.WorkflowTemplate;
+            getByName(name: string): SP.Workflow.WorkflowTemplate;
+        }
+    }
+}
+
+declare namespace SP.WorkflowServices {
+
+    export enum WorkflowStatus {
+        notStarted,
+        started,
+        suspended,
+        canceling,
+        canceled,
+        terminated,
+        completed,
+        notSpecified,
+        invalid
+    }
+
+    // TODO: comments, types
+    export class InteropService extends SP.ClientObject {
+        constructor(context: SP.ClientRuntimeContext, objectPath: SP.ObjectPathStaticProperty);
+        static getCurrent(context: SP.ClientRuntimeContext): InteropService;
+        enableEvents(listId: SP.Guid, itemGuid: SP.Guid): void;
+        disableEvents(listId: SP.Guid, itemGuid: SP.Guid): void;
+        startWorkflow(associationName: string, correlationId: SP.Guid, listId: SP.Guid, itemGuid: SP.Guid, workflowParameters: any): SP.GuidResult;
+        cancelWorkflow(instanceId: SP.Guid): void;
+    }
+
+    /** Represents a workflow definition and associated properties. */
+    export class WorkflowDefinition extends SP.ClientObject {
+        constructor(context: SP.ClientRuntimeContext);
+        /** Url of the association form */
+        get_associationUrl(): string;
+        /** Url of the association form */
+        set_associationUrl(value: string): string;
+        get_description(): string;
+        set_description(value: string): string;
+        get_displayName(): string;
+        set_displayName(value: string): string;
+        /** Identifier for a draft version of the workflow definition */
+        get_draftVersion(): string;
+        /** Identifier for a draft version of the workflow definition */
+        set_draftVersion(value: string): string;
+        /** Defines the fields of the workflow initiation forms and association forms (CAML string)  */
+        get_formField(): string;
+        /** Defines the fields of the workflow initiation forms and association forms (CAML string)  */
+        set_formField(value: string): string;
+        get_id(): string;
+        set_id(value: string): string;
+        get_initiationUrl(): string;
+        set_initiationUrl(value: string): string;
+        /** Gets custom properties of the workflow definition */
+        get_properties(): { [propertyName: string]: any; };
+        /** true if the workflow definition has been published to the external workflow host; false if the workflow definition is only saved on the site  */
+        get_published(): boolean;
+        /** Determines whether to automatically generate an association form for this workflow.
+            If the value is true, and the associationUrl is not already set, a default association form is automatically generated for the workflow when saveDefinition is called.  */
+        get_requiresAssociationForm(): boolean;
+        /** Determines whether to automatically generate an association form for this workflow.
+            If the value is true, and the associationUrl is not already set, a default association form is automatically generated for the workflow when saveDefinition is called.  */
+        set_requiresAssociationForm(value: boolean): boolean;
+        /** Determines whether to automatically generate an initiation form for this workflow.
+            If the value is true, and the initiationUrl is not already set, a default initiation form is automatically generated for the workflow when saveDefinition is called.  */
+        get_requiresInitiationForm(): boolean;
+        /** Determines whether to automatically generate an initiation form for this workflow.
+            If the value is true, and the initiationUrl is not already set, a default initiation form is automatically generated for the workflow when saveDefinition is called.  */
+        set_requiresInitiationForm(value: boolean): boolean;
+        /** RestrictToScope is a GUID value, used in conjunction with the RestrictToType property to further restrict the scope of the definition.
+            For example, if the RestrictToType is "List", then setting the RestrictToScope to a particular list identifier limits the definition to be associable only to the specified list.
+            If the RestrictToType is "List" but the RestrictToScope is null or the empty string, then the definition is associable to any list. */
+        get_restrictToScope(): string;
+        /** RestrictToScope is a GUID value, used in conjunction with the RestrictToType property to further restrict the scope of the definition.
+            For example, if the RestrictToType is "List", then setting the RestrictToScope to a particular list identifier limits the definition to be associable only to the specified list.
+            If the RestrictToType is "List" but the RestrictToScope is null or the empty string, then the definition is associable to any list. */
+        set_restrictToScope(value: string): string;
+        /** RestrictToType determines the possible event source type for a workflow subscription that uses this definition.
+            Possible values include "List", "Site", the empty string, or null.  */
+        get_restrictToType(): string;
+        /** RestrictToType determines the possible event source type for a workflow subscription that uses this definition.
+            Possible values include "List", "Site", the empty string, or null.  */
+        set_restrictToType(value: string): string;
+        /** XAML definition of the workflow */
+        get_xaml(): string;
+        /** XAML definition of the workflow */
+        set_xaml(value: string): string;
+        /** This method adds a key-value pair (propertyName, value) to the workflow definition object�s property bag.  */
+        setProperty(propertyName: string, value: string): void;
+        /** This method is internal and is not intended to be used in your code. */
+        initPropertiesFromJson(parentNode: any): void;
+    }
+
+    /** Represents a collection of WorkflowDefinition objects */
+    export class WorkflowDefinitionCollection extends SP.ClientObjectCollection<WorkflowDefinition> {
+        itemAt(index: number): WorkflowDefinition;
+        get_item(index: number): WorkflowDefinition;
+        /** returns SP.WorkflowDefinition class */
+        get_childItemType(): any;
+    }
+
+    /** Manages workflow definitions and workflow activity authoring. */
+    export class WorkflowDeploymentService extends SP.ClientObject {
+        /** Returns an XML representation of a list of valid Workflow Manager Client 1.0 actions for the specified web (WorkflowInfo element). */
+        getDesignerActions(web: SP.Web): SP.StringResult;
+        /** Returns an XML representation of a collection of XAML class signatures for workflow definitions.
+            @param lastChanges Date time value representing the latest changes; class signatures older than this time are excluded from the result set.  */
+        getActivitySignatures(lastChanged: string): SP.ClientResult<any>;
+        /** Saves a SharePoint workflow definition to the workflow store.  */
+        saveDefinition(definition: WorkflowDefinition): SP.GuidResult;
+        /** Validates the specified activity against workflow definitions in the workflow store.  */
+        validateActivity(activityXaml: string): SP.StringResult;
+        /** Publishes a workflow definition to the workflow store.  */
+        publishDefinition(definitionId: string): void;
+        /** Marks a workflow definition as deprecated. Currently running workflow instances are allowed to complete, but new instances of the workflow definition are prevented from starting.  */
+        deprecateDefinition(definitionId: string): void;
+        /** Deletes a workflow definition.
+            @param definitionId The guid identifier of the workflow definition.  */
+        deleteDefinition(definitionId: string): void;
+        /** Retrieves workflow definitions from the workflow store that match the tags. */
+        enumerateDefinitions(publishedOnly: boolean): WorkflowDefinitionCollection;
+        /** Retrieves a specified workflow definition from the workflow store.
+            @param definitionId The guid identifier of the workflow definition.  */
+        getDefinition(definitionId: string): WorkflowDefinition;
+        /** Saves the collateral file of a workflow definition.
+            @param workflowDefinitionId The guid identifier of the workflow definition.*/
+        saveCollateral(workflowDefinitionId: string, leafFileName: string, fileContent: Base64EncodedByteArray): void;
+        /** Deletes the URL of a workflow definition's collateral file.
+            @param workflowDefinitionId The guid identifier of the workflow definition.  */
+        deleteCollateral(workflowDefinitionId: string, leafFileName: string): void;
+        /** Retrieves the URL of the collateral file of the workflow definition.
+            @param workflowDefinitionId The guid identifier of the workflow definition.
+            @param leafFileName The leaf name of the collateral file. */
+        getCollateralUri(workflowDefinitionId: string, leafFileName: string): SP.StringResult;
+        /** Packages a single workflow definition into a SharePoint solution package (.wsp file) and saves the package to the Site Assets library.
+            Returns the URL of the package file in the Site Asset library.
+            Remarks:
+            1. This method does not activate the package.
+            2. If a package with the same name already exists in the Site Assets library, the method adds an integer suffix in braces to the file name, e.g. packageDefaultFilename{2}.wsp
+            @param definitionId The guid identifier of the workflow definition.
+            @param packageDefaultFilename The default filename to choose for the new package.
+            @param packageTitle The title of the package.
+            @param packageDescription The description of the package. */
+        packageDefinition(definitionId: SP.Guid, packageDefaultFilename: string, packageTitle: string, packageDescription: string): SP.StringResult;
+    }
+
+    /** Represents an instance of a workflow association that performs on a list item the process that is defined in a workflow template */
+    export class WorkflowInstance extends SP.ClientObject {
+        /** Contains the error string or exception information if the workflow faults. */
+        get_faultInfo(): string;
+        /** Unique identifier (GUID) for the workflow instance */
+        get_id(): string;
+        /** Gets the Coordinated Universal Time (UTC) when this workflow instance was created. */
+        get_instanceCreated(): string;
+        /** Gets the Coordinated Universal Time (UTC) when the workflow instance state was last persisted */
+        get_lastUpdated(): string;
+        /** Specifies properties of this workflow instance */
+        get_properties(): { [name: string]: string; };
+        /** Returns runtime status of the workflow instance */
+        get_status(): WorkflowStatus;
+        /** Specifies the custom status set by workflow authors. */
+        get_userStatus(): string;
+        /** Specifies the custom status set by workflow authors. */
+        set_userStatus(value: string): string;
+        /** Gets the unique identifier (GUID) of the subscription that instantiates the WorkflowInstance */
+        get_workflowSubscriptionId(): SP.Guid;
+        /** This method is internal and is not intended to be used in your code. */
+        initPropertiesFromJson(parentNode: any): void;
+
+    }
+
+    /** Represents a collection of WorkflowInstance objects */
+    export class WorkflowInstanceCollection extends SP.ClientObjectCollection<WorkflowInstance> {
+        itemAt(index: number): WorkflowInstance;
+        get_item(index: number): WorkflowInstance;
+        /** returns SP.WorkflowInstance class */
+        get_childItemType(): any;
+    }
+
+    /** Reads the SharePoint workflow instances from the external workflow host and manages the instance execution. */
+    export class WorkflowInstanceService extends SP.ClientObject {
+        /** Starts a Workflow Manager Client 1.0 instance specified by the subscription and passes the supplied parameters.
+            Returns GUID of the instance object.
+            @param payload Object that contains name-value pairs of parameter names and values to pass into the workflow instance. */
+        startWorkflow(subscription: WorkflowSubscription, payload: { [name: string]: any; }): SP.GuidResult;
+        /** Starts a Workflow Manager Client 1.0 instance specified by the subscription and passes the supplied parameters.
+            Returns GUID of the instance object.
+            @param subscription The subscription associated with the workflow instance.
+            @param itemId The integer id of the list item on which to start the workflow instance.
+            @param payload Object that contains name-value pairs of parameter names and values to pass into the workflow instance. */
+        startWorkflowOnListItem(subscription: WorkflowSubscription, itemId: number, payload: { [name: string]: any; }): SP.GuidResult;
+        /** Gets workflow instance specified by the provided instance GUID */
+        getInstance(instanceId: string): WorkflowInstance;
+        /** Gets a workflow instance collection comprising the 100 most recent workflow instances started by a specified subscription.  */
+        enumerate(parentSubscription: WorkflowSubscription): WorkflowInstanceCollection;
+        /** Gets a workflow instance collection comprising 100 workflow instances starting at the specified offset.  */
+        enumerateWithOffset(parentSubscription: WorkflowSubscription, offset: number): WorkflowInstanceCollection;
+        /** Gets the list of instances for the specified list item. */
+        enumerateInstancesForListItem(listId: string, itemId: number): WorkflowInstanceCollection;
+        /** Gets the list of instances for the specified list item. */
+        enumerateInstancesForListItemWithOffset(listId: string, itemId: number, offset: number): WorkflowInstanceCollection;
+        /** Gets the list of instances for the current site. */
+        enumerateInstancesForSite(): WorkflowInstanceCollection;
+        /** Gets the list of instances for the current site. */
+        enumerateInstancesForSiteWithOffset(offset: number): WorkflowInstanceCollection;
+        /** Retrieves a count of all the instances of the specified WorkflowSubscription. */
+        countInstances(parentSubscription: WorkflowSubscription): SP.IntResult;
+        /** Retrieves a count of the instances of the specified WorkflowSubscription that have a specified status. */
+        countInstancesWithStatus(parentSubscription: WorkflowSubscription, status: WorkflowStatus): SP.IntResult;
+        /** Sends a cancel message to the specified workflow instance and permits the instance to execute a cancellation scope. */
+        cancelWorkflow(instance: WorkflowInstance): void;
+        /** Terminate a workflow instance forcefully by deleting it from memory. The instance is not allowed to execute a cancellation scope */
+        terminateWorkflow(instance: WorkflowInstance): void;
+        suspendWorkflow(instance: WorkflowInstance): void;
+        resumeWorkflow(instance: WorkflowInstance): void;
+        /** Sends a custom event to a running workflow with the event payload. */
+        publishCustomEvent(instance: WorkflowInstance, eventName: string, payload: string): void;
+        getDebugInfo(instance: WorkflowInstance): SP.StringResult;
+    }
+
+    /** Describes the workflow host configuration states and provides service objects that interact with the workflow */
+    export class WorkflowServicesManager extends SP.ClientObject {
+        constructor(context: SP.ClientRuntimeContext, web: SP.Web);
+        static newObject(context: SP.ClientRuntimeContext, web: SP.Web): WorkflowServicesManager;
+        /** The current application identifier.*/
+        get_appId(): string;
+        /** Indicates whether this workflow service is actively connected to a workflow host. */
+        get_isConnected(): boolean;
+        /** Returns the path of the current scope in the workflow host. */
+        get_scopePath(): string;
+        getWorkflowDeploymentService(): WorkflowDeploymentService;
+        getWorkflowInstanceService(): WorkflowInstanceService;
+        getWorkflowInteropService(): InteropService;
+        getWorkflowSubscriptionService(): WorkflowSubscriptionService;
+        /** This method is internal and is not intended to be used in your code. */
+        initPropertiesFromJson(parentNode: any): void;
+    }
+
+    /** Base class representing subscriptions for the external workflow host. */
+    export class WorkflowSubscription extends SP.ClientObject {
+        /** Gets the unique ID of the workflow definition to activate. */
+        get_definitionId(): SP.Guid;
+        /** Sets the unique ID of the workflow definition to activate. */
+        set_definitionId(value: SP.Guid): SP.Guid;
+        /** Gets a boolean value that specifies if the workflow subscription is enabled.
+            When disabled, new instances of the subscription cannot be started, but existing instances will continue to run.  */
+        get_enabled(): boolean;
+        /** Sets a boolean value that enables or disables the workflow subscription.
+            When disabled, new instances of the subscription cannot be started, but existing instances will continue to run.  */
+        set_enabled(value: boolean): boolean;
+        /** Gets the logical source instance name of the event. (GUID) */
+        get_eventSourceId(): string;
+        /** Sets the logical source instance name of the event. (GUID) */
+        set_eventSourceId(value: string): string;
+        /** Gets or sets the list of event types for which the subscription is listening.
+            For SharePoint events, these will map to a value in the SPEventReceiverType enumeration. */
+        get_eventTypes(): string[];
+        /** Gets or sets the list of event types for which the subscription is listening.
+            For SharePoint events, these will map to a value in the SPEventReceiverType enumeration. */
+        set_eventTypes(value: string[]): string[];
+        /** Unique identifier (GUID) of the workflow subscription */
+        get_id(): string;
+        /** Unique identifier (GUID) of the workflow subscription */
+        set_id(value: string): string;
+        /** Boolean value that specifies whether multiple workflow instances can be started manually on the same list item at the same time. This property can be used for list workflows only.  */
+        get_manualStartBypassesActivationLimit(): boolean;
+        /** Boolean value that specifies whether multiple workflow instances can be started manually on the same list item at the same time. This property can be used for list workflows only.  */
+        set_manualStartBypassesActivationLimit(value: boolean): boolean;
+        /** Gets the name of the workflow subscription for the specified event source.  */
+        get_name(): string;
+        /** Sets the name of the workflow subscription for the specified event source.  */
+        set_name(value: string): string;
+        /** Gets the properties and values to pass to the workflow definition when the subscription is matched. */
+        get_propertyDefinitions(): any;
+        /** Gets the name of the workflow status field on the specified list.  */
+        get_statusFieldName(): string;
+        /** Gets or sets the name of the workflow status field on the specified list.  */
+        set_statusFieldName(value: string): string;
+        /** Sets the name-value pairs for workflow definition initiation parameters that are stored in the PropertyDefinitions property  */
+        setProperty(propertyName: string, value: string): void;
+        /** This method is internal and is not intended to be used in your code. */
+        initPropertiesFromJson(parentNode: any): void;
+    }
+
+    /** Represents a collection of WorkflowSubscription objects */
+    export class WorkflowSubscriptionCollection extends SP.ClientObjectCollection<WorkflowSubscription> {
+        itemAt(index: number): WorkflowSubscription;
+        get_item(index: number): WorkflowSubscription;
+        /** returns SP.WorkflowInstance class */
+        get_childItemType(): any;
+    }
+
+    export class WorkflowSubscriptionService extends SP.ClientObject {
+        constructor(context: SP.ClientRuntimeContext, objectPath: SP.ObjectPathStaticProperty);
+        static getCurrent(context: SP.ClientRuntimeContext): WorkflowSubscriptionService;
+        /** Creates a workflow subscription for a workflow, and returns the unique identifier of the new subscription. */
+        publishSubscription(subscription: WorkflowSubscription): SP.GuidResult;
+        /** Creates a workflow subscription for a workflow and if necessary an event receiver on the specified list.
+            Also writes an EventSourceId that matches the list as the event source.
+            Returns the unique identifier of the new subscription.
+            @param listId Unique identifier (GUID) for the specified list. */
+        publishSubscriptionForList(subscription: WorkflowSubscription, listId: string): SP.GuidResult;
+        /** Ensures that an event receiver will monitor a list for the specified event.
+            @param listId Unique identifier (GUID) for the specified list.
+            @eventName eventName The name of the event to be monitored. */
+        registerInterestInList(listId: string, eventName: string): void;
+        /** Removes monitoring for an event receiver on the specified list with the specified event.
+            @param listId GUID of the list containing the event receiver to be unregistered.
+            @eventName eventName The name of the event to be removed. */
+        unregisterInterestInList(listId: string, eventName: string): void;
+        getSubscription(subscriptionId: SP.Guid): WorkflowSubscription;
+        deleteSubscription(subscriptionId: SP.Guid): WorkflowSubscription;
+        /** Retrieves workflow subscriptions that contains all of the workflow subscriptions on the Web  */
+        enumerateSubscriptions(): WorkflowSubscriptionCollection;
+        /** Retrieves workflow subscriptions based on workflow definition */
+        enumerateSubscriptionsByDefinition(definitionId: string): WorkflowSubscriptionCollection;
+        /** Retrieves workflow subscriptions based on the specified EventSourceId */
+        enumerateSubscriptionsByEventSource(eventSourceId: string): WorkflowSubscriptionCollection;
+        /** Retrieves workflow subscriptions based on the specified list.
+            @param listId The unique identifier (GUID) of the list on which to filter the subscriptions. */
+        enumerateSubscriptionsByList(listId: string): WorkflowSubscriptionCollection;
+    }
+
+}
+
+
+
+declare namespace SP {
+    export module Publishing {
+        export class PublishingWeb extends ClientObject {
+            static getPublishingWeb(context: ClientContext, web: Web): PublishingWeb;
+
+            public get_web(): Web;
+            public addPublishingPage(pageInformation: PublishingPageInformation): PublishingPage;
+        }
+
+        export class PublishingPageInformation extends ClientValueObject {
+
+            public get_folder(): Folder;
+            public set_folder(value: Folder): Folder;
+
+            public get_name(): string;
+            public set_name(value: string): string;
+
+            public get_pageLayoutListItem(): ListItem;
+            public set_pageLayoutListItem(value: ListItem): ListItem;
+        }
+
+        export class PublishingPage extends ScheduledItem {
+            static getPublishingPage(context: ClientContext, sourceListItem: ListItem): PublishingPage;
+            public addFriendlyUrl(friendlyUrlSegment: string, editableParent: Navigation.NavigationTermSetItem, doAddToNavigation: boolean): StringResult;
+        }
+
+        export class ScheduledItem extends ClientObject {
+            public get_listItem(): ListItem;
+
+            public get_startDate(): Date;
+            public set_startDate(value: Date): Date;
+
+            public get_endDate(): Date;
+            public set_endDate(value: Date): Date;
+
+            public schedule(approvalComment: string): void;
+        }
+
+        export class PublishingSite extends ClientObject {
+            static createPageLayout(context: ClientContext, parameters: PageLayoutCreationInformation): void;
+        }
+
+        export class PageLayoutCreationInformation extends ClientValueObject {
+            public get_web(): Web;
+            public set_web(value: Web): Web;
+
+            public get_associatedContentTypeId(): string;
+            public set_associatedContentTypeId(value: string): string;
+
+            public get_masterPageUrl(): string;
+            public set_masterPageUrl(value: string): string;
+
+            public get_newPageLayoutNameWithoutExtension(): string;
+            public set_newPageLayoutNameWithoutExtension(value: string): string;
+
+            public get_newPageLayoutEditablePath(): string;
+            public set_newPageLayoutEditablePath(value: string): string;
+        }
+
+        export class SiteServicesAddins {
+            static getSettings(context: ClientContext, addinId: Guid): AddinSettings;
+            static setSettings(context: ClientContext, addin: AddinSettings): void;
+            static deleteSettings(context: ClientContext, addinId: Guid): void;
+
+            static getPlugin(context: ClientContext, pluginName: string): AddinPlugin;
+            static setPlugin(context: ClientContext, addin: AddinPlugin): void;
+            static deletePlugin(context: ClientContext, pluginName: string): void;
+        }
+
+        export class AddinSettings extends ClientObject {
+            constructor(ctx: ClientContext, id: Guid);
+
+            public get_id(): Guid;
+
+            public get_title(): string;
+            public set_title(value: string): string;
+
+            public get_description(): string;
+            public set_description(value: string): string;
+
+            public get_enabled(): boolean;
+            public set_enabled(value: boolean): boolean;
+
+            public get_namespace(): boolean;
+            public set_namespace(value: boolean): boolean;
+
+            public get_headScript(): string;
+            public set_headScript(value: string): string;
+
+            public get_htmlStartBody(): string;
+            public set_htmlStartBody(value: string): string;
+
+            public get_htmlEndBody(): string;
+            public set_htmlEndBody(value: string): string;
+
+            public get_metaTagPagePropertyMappings(): { [key: string]: string };
+            public set_metaTagPagePropertyMappings(value: { [key: string]: string }): { [key: string]: string };
+
+        }
+
+        export class AddinPlugin extends ClientObject {
+            constructor(ctx: ClientContext);
+
+            public get_description(): string;
+            public set_description(value: string): string;
+
+            public get_markup(): string;
+            public set_markup(value: string): string;
+
+            public get_title(): string;
+            public set_title(value: string): string;
+        }
+
+
+        export class DesignPackage {
+            static install(context: ClientContext, site: Site, info: DesignPackageInfo, path: string): void;
+            static uninstall(context: ClientContext, site: Site, info: DesignPackageInfo): void;
+            static apply(context: ClientContext, site: Site, info: DesignPackageInfo): void;
+            static exportEnterprise(context: ClientContext, site: Site, includeSearchConfiguration: boolean): ClientResult<DesignPackageInfo>;
+            static exportSmallBusiness(context: ClientContext, site: Site, packageName: string, includeSearchConfiguration: boolean): ClientResult<DesignPackageInfo>;
+        }
+
+        export class DesignPackageInfo extends ClientValueObject {
+            public get_packageName(): string;
+            public set_packageName(value: string): string;
+
+            public get_packageGuid(): Guid;
+            public set_packageGuid(value: Guid): Guid;
+
+            public get_majorVersion(): number;
+            public set_majorVersion(value: number): number;
+
+            public get_minorVersion(): number;
+            public set_minorVersion(value: number): number;
+        }
+
+        export class SiteImageRenditions {
+            static getRenditions(context: ClientContext): ImageRendition[];
+            static setRenditions(context: ClientContext, renditions: ImageRendition[]): void;
+        }
+
+        export class ImageRendition extends ClientValueObject {
+            public get_id(): number;
+            public get_version(): number;
+
+            public get_name(): string;
+            public set_name(value: string): string;
+
+            public get_width(): number;
+            public set_width(value: number): number;
+
+            public get_height(): number;
+            public set_height(value: number): number;
+        }
+
+        export class Variations extends ClientObject {
+            static getLabels(context: ClientContext): ClientObjectList<VariationLabel>;
+            static getPeerUrl(context: ClientContext, currentUrl: string, labelTitle: string): StringResult;
+            static updateListItems(context: ClientContext, listId: Guid, itemIds: number[]): void;
+        }
+
+        export class VariationLabel extends ClientObject {
+            public get_displayName(): string;
+            public set_displayName(value: string): string;
+
+            public get_isSource(): boolean;
+            public set_isSource(value: boolean): boolean;
+
+            public get_language(): string;
+            public set_language(value: string): string;
+
+            public get_locale(): string;
+            public set_locale(value: string): string;
+
+            public get_title(): string;
+            public set_title(value: string): string;
+
+            public get_topWebUrl(): string;
+            public set_topWebUrl(value: string): string;
+        }
+
+        export class CustomizableString extends ClientObject {
+            public get_defaultValue(): string;
+
+            public get_value(): string;
+            public set_value(value: string): string;
+
+            public get_usesDefaultValue(): boolean;
+            public set_usesDefaultValue(value: boolean): boolean;
+
+        }
+
+
+        export module Navigation {
+            export enum NavigationLinkType {
+                root,
+                friendlyUrl,
+                simpleLink
+            }
+
+            export enum StandardNavigationSource {
+                unknown,
+                portalProvider,
+                taxonomyProvider,
+                inheritFromParentWeb
+            }
+
+            export class NavigationTermSetItem extends ClientObject {
+                public get_id(): Guid;
+
+                public get_isReadOnly(): boolean;
+
+                public get_linkType(): NavigationLinkType;
+                public set_linkType(value: NavigationLinkType): NavigationLinkType;
+
+                public get_targetUrlForChildTerms(): CustomizableString;
+
+                public get_catalogTargetUrlForChildTerms(): CustomizableString;
+
+                public get_taxonomyName(): string;
+
+                public get_title(): CustomizableString;
+
+                public get_terms(): NavigationTermCollection;
+
+                public get_view(): NavigationTermSetView;
+
+                public createTerm(termName: string, linkType: NavigationLinkType, termId: Guid): Taxonomy.Term;
+
+                public getTaxonomyTermStore(): Taxonomy.TermStore;
+
+                public getResolvedDisplayUrl(browserQueryString: string): StringResult;
+            }
+
+            export class NavigationTermCollection extends ClientObjectCollection<NavigationTerm> {
+
+            }
+
+            export class NavigationTerm extends NavigationTermSetItem {
+                public get_associatedFolderUrl(): string;
+                public set_associatedFolderUrl(value: string): string;
+
+                public get_catalogTargetUrl(): CustomizableString;
+
+                public get_categoryImageUrl(): string;
+                public set_categoryImageUrl(value: string): string;
+
+                public get_excludedProviders(): NavigationTermProviderNameCollection;
+
+                public get_excludeFromCurrentNavigation(): boolean;
+                public set_excludeFromCurrentNavigation(value: boolean): boolean;
+
+                public get_excludeFromGlobalNavigation(): boolean;
+                public set_excludeFromGlobalNavigation(value: boolean): boolean;
+
+                public get_friendlyUrlSegment(): CustomizableString;
+
+                public get_hoverText(): string;
+                public set_hoverText(value: string): string;
+
+                public get_isDeprecated(): boolean;
+                public get_isPinned(): boolean;
+                public get_isPinnedRoot(): boolean;
+
+                public get_parent(): NavigationTerm;
+
+                public get_simpleLinkUrl(): string;
+
+                public set_simpleLinkUrl(value: string): string;
+
+                public get_targetUrl(): CustomizableString;
+
+                public get_termSet(): NavigationTermSet;
+
+                public getAsEditable(taxonomySession: Taxonomy.TaxonomySession): NavigationTerm;
+
+                public getWithNewView(newView: NavigationTermSetView): NavigationTerm;
+
+                public getResolvedTargetUrl(browserQueryString: string, remainingUrlSegments: string[]): StringResult;
+
+                public getResolvedTargetUrlWithoutQuery(): StringResult;
+
+                public getResolvedAssociatedFolderUrl(): StringResult;
+
+                public getWebRelativeFriendlyUrl(): StringResult;
+
+                public getAllParentTerms(): NavigationTermCollection;
+
+                public getTaxonomyTerm(): Taxonomy.Term;
+
+                public move(newParent: NavigationTermSetItem): void;
+
+                public deleteObject(): void;
+
+                static getAsResolvedByWeb(context: ClientContext, term: Taxonomy.Term, web: Web, siteMapProviderName: string): NavigationTerm;
+                static getAsResolvedByView(context: ClientContext, term: Taxonomy.Term, view: NavigationTermSetView): NavigationTerm;
+            }
+
+
+            export class NavigationTermSet extends NavigationTermSetItem {
+                public get_isNavigationTermSet(): boolean;
+                public set_isNavigationTermSet(value: boolean): boolean;
+
+                public get_lcid(): number;
+
+                public get_loadedFromPersistedData(): boolean;
+
+                public get_termGroupId(): Guid;
+                public get_termStoreId(): Guid;
+
+                public getAsEditable(taxonomySession: Taxonomy.TaxonomySession): NavigationTermSet;
+
+                public getWithNewView(newView: NavigationTermSetView): NavigationTermSet;
+
+                public getTaxonomyTermSet(): Taxonomy.TermSet;
+
+                public getAllTerms(): NavigationTermCollection;
+
+                public findTermForUrl(url: string): NavigationTerm;
+
+                static getAsResolvedByWeb(context: ClientContext, termSet: Taxonomy.TermSet, web: Web, siteMapProviderName: string): NavigationTermSet;
+                static getAsResolvedByView(context: ClientContext, termSet: Taxonomy.TermSet, view: NavigationTermSetView): NavigationTermSet;
+            }
+
+
+            export class NavigationTermProviderNameCollection extends ClientObjectCollection<string> {
+                public Add(item: string): void;
+                public Clear(): void;
+                public Remove(item: string): BooleanResult;
+            }
+
+            export class NavigationTermSetView extends ClientObject {
+                constructor(context: ClientContext, web: Web, siteMapProviderName: string);
+
+                public get_excludeDeprecatedTerms(): boolean;
+                public set_excludeDeprecatedTerms(value: boolean): boolean;
+
+                public get_excludeTermsByPermissions(): boolean;
+                public set_excludeTermsByPermissions(value: boolean): boolean;
+
+                public get_excludeTermsByProvider(): boolean;
+                public set_excludeTermsByProvider(value: boolean): boolean;
+
+                public get_serverRelativeSiteUrl(): string;
+
+                public get_serverRelativeWebUrl(): string;
+
+                public get_siteMapProviderName(): string;
+                public set_siteMapProviderName(value: string): string;
+
+                public get_webId(): Guid;
+                public get_webTitle(): string;
+
+                public getCopy(): NavigationTermSetView;
+
+                static createEmptyInstance(context: ClientContext): NavigationTermSetView;
+            }
+
+            export class TaxonomyNavigation {
+                static getWebNavigationSettings(context: ClientContext, web: Web): WebNavigationSettings;
+                static getTermSetForWeb(context: ClientContext, web: Web, siteMapProviderName: string, includeInheritedSettings: boolean): NavigationTermSet;
+                static setCrawlAsFriendlyUrlPage(context: ClientContext, navigationTerm: Taxonomy.Term, crawlAsFriendlyUrlPage: boolean): BooleanResult;
+                static getNavigationLcidForWeb(context: ClientContext, web: Web): IntResult;
+                static flushSiteFromCache(context: ClientContext, site: Site): void;
+                static flushWebFromCache(context: ClientContext, web: Web): void;
+                static flushTermSetFromCache(context: ClientContext, webForPermissions: Web, termStoreId: Guid, termSetId: Guid): void;
+            }
+
+            export class WebNavigationSettings extends ClientObject {
+                constructor(context: ClientContext, web: Web);
+
+                public get_addNewPagesToNavigation(): boolean;
+                public set_addNewPagesToNavigation(value: boolean): boolean;
+
+                public get_createFriendlyUrlsForNewPages(): boolean;
+                public set_createFriendlyUrlsForNewPages(value: boolean): boolean;
+
+                public get_currentNavigation(): StandardNavigationSettings;
+                public get_globalNavigation(): StandardNavigationSettings;
+
+                public update(taxonomySession: Taxonomy.TaxonomySession): void;
+                public resetToDefaults(): void;
+            }
+
+            export class StandardNavigationSettings extends ClientObject {
+                public get_termSetId(): Guid;
+                public set_termSetId(value: Guid): Guid;
+
+                public get_termStoreId(): Guid;
+                public set_termStoreId(value: Guid): Guid;
+
+                public get_source(): StandardNavigationSource;
+
+                public set_source(value: StandardNavigationSource): StandardNavigationSource;
+            }
+
+        }
+    }
+}
+
+declare namespace SP {
+    export module CompliancePolicy {
+        export enum SPContainerType {
+            site,//: 0,
+            web,//: 1,
+            list//: 2
+        }
+
+        export class SPContainerId extends ClientObject {
+            static createFromList(context: ClientRuntimeContext, list: List): SPContainerId;
+            static createFromWeb(context: ClientRuntimeContext, web: Web): SPContainerId;
+            static createFromSite(context: ClientRuntimeContext, site: Site): SPContainerId;
+            static create(context: ClientRuntimeContext, containerId: any): SPContainerId;
+
+            get_containerType(): ContentType;
+            set_containerType(value: ContentType): ContentType;
+
+            get_listId(): SP.Guid;
+            set_listId(value: SP.Guid): SP.Guid;
+
+            get_siteId(): SP.Guid;
+            set_siteId(value: SP.Guid): SP.Guid;
+
+            get_siteUrl(): string;
+            set_siteUrl(value: string): string;
+
+            get_tenantId(): SP.Guid;
+            set_tenantId(value: SP.Guid): SP.Guid;
+
+            get_title(): string;
+            set_title(value: string): string;
+
+            get_version(): any;
+            set_version(value: any): any;
+
+            get_webId(): SP.Guid;
+            set_webId(value: SP.Guid): SP.Guid;
+
+            serialize(): SP.StringResult;
+        }
+
+        export class SPPolicyAssociation extends ClientObject {
+
+            get_allowOverride(): boolean;
+            set_allowOverride(value: boolean): boolean;
+
+            get_comment(): string;
+            set_comment(value: string): string;
+
+            get_defaultPolicyDefinitionConfigId(): any[];
+            set_defaultPolicyDefinitionConfigId(value: any[]): any[];
+
+            get_description(): string;
+            set_description(value: string): string;
+
+            get_identity(): boolean;
+            set_identity(value: boolean): boolean;
+
+            get_name(): string;
+            set_name(value: string): string;
+
+            get_policyApplyStatus(): any;
+            set_policyApplyStatus(value: any): any;
+
+            get_policyDefinitionConfigIds(): any[];
+            set_policyDefinitionConfigIds(value: any[]): any[];
+
+            get_scope(): any;
+            set_scope(value: any): any;
+
+            get_source(): any;
+            set_source(value: any): any;
+
+            get_version(): any;
+            set_version(value: any): any;
+
+            get_whenAppliedUTC(): Date;
+            set_whenAppliedUTC(value: Date): Date;
+
+            get_whenChangedUTC(): Date;
+            set_whenChangedUTC(value: Date): Date;
+
+            get_whenCreatedUTC(): Date;
+            set_whenCreatedUTC(value: Date): Date;
+        }
+
+        export class SPPolicyBinding extends ClientObject {
+
+            get_identity(): any;
+            set_identity(value: any): any;
+
+            get_isExempt(): boolean;
+            set_isExempt(value: boolean): boolean;
+
+            get_mode(): any;
+            set_mode(value: any): any;
+
+            get_name(): string;
+            set_name(value: string): string;
+
+            get_policyApplyStatus(): any;
+            set_policyApplyStatus(value: any): any;
+
+            get_policyAssociationConfigId(): any;
+            set_policyAssociationConfigId(value: any): any;
+
+            get_policyDefinitionConfigId(): any;
+            set_policyDefinitionConfigId(value: any): any;
+
+            get_policyRuleConfigId(): any;
+            set_policyRuleConfigId(value: any): any;
+
+            get_scope(): any;
+            set_scope(value: any): any;
+
+            get_source(): any;
+            set_source(value: any): any;
+
+            get_version(): any;
+            set_version(value: any): any;
+
+            get_whenAppliedUTC(): Date;
+            set_whenAppliedUTC(value: Date): Date;
+
+            get_whenChangedUTC(): Date;
+            set_whenChangedUTC(value: Date): Date;
+
+            get_whenCreatedUTC(): Date;
+            set_whenCreatedUTC(value: Date): Date;
+        }
+
+        export class SPPolicyDefinition extends ClientObject {
+
+            get_comment(): string;
+            set_comment(value: string): string;
+
+            get_createdBy(): any;
+            set_createdBy(value: any): any;
+
+            get_defaultPolicyRuleConfigId(): any;
+            set_defaultPolicyRuleConfigId(value: any): any;
+
+            get_description(): string;
+            set_description(value: string): string;
+
+            get_enabled(): boolean;
+            set_enabled(value: boolean): boolean;
+
+            get_identity(): any;
+            set_identity(value: any): any;
+
+            get_lastModifiedBy(): any;
+            set_lastModifiedBy(value: any): any;
+
+            get_name(): string;
+            set_name(value: string): string;
+
+            get_mode(): any;
+            set_mode(value: any): any;
+
+            get_scenario(): any;
+            set_scenario(value: any): any;
+
+            get_source(): any;
+            set_source(value: any): any;
+
+            get_version(): any;
+            set_version(value: any): any;
+
+            get_whenChangedUTC(): Date;
+            set_whenChangedUTC(value: Date): Date;
+
+            get_whenCreatedUTC(): Date;
+            set_whenCreatedUTC(value: Date): Date;
+
+
+        }
+
+        export class SPPolicyRule extends ClientObject {
+
+            get_comment(): string;
+            set_comment(value: string): string;
+
+            get_createdBy(): any;
+            set_createdBy(value: any): any;
+
+            get_description(): string;
+            set_description(value: string): string;
+
+            get_enabled(): boolean;
+            set_enabled(value: boolean): boolean;
+            get_identity(): any;
+            set_identity(value: any): any;
+
+            get_lastModifiedBy(): any;
+            set_lastModifiedBy(value: any): any;
+
+            get_mode(): any;
+            set_mode(value: any): any;
+
+            get_name(): string;
+            set_name(value: string): string;
+
+            get_policyDefinitionConfigId(): any;
+            set_policyDefinitionConfigId(value: any): any;
+
+            get_priority(): any;
+            set_priority(value: any): any;
+
+            get_ruleBlob(): any;
+            set_ruleBlob(value: any): any;
+
+            get_whenChangedUTC(): Date;
+            set_whenChangedUTC(value: Date): Date;
+
+            get_whenCreatedUTC(): Date;
+            set_whenCreatedUTC(value: Date): Date;
+        }
+
+        export class SPPolicyStore extends ClientObject {
+            constructor(context: ClientRuntimeContext, web: Web);
+
+            static createPolicyDefinition(context: ClientRuntimeContext): SPPolicyDefinition;
+            static createPolicyBinding(context: ClientRuntimeContext): SPPolicyBinding;
+            static createPolicyAssociation(context: ClientRuntimeContext): SPPolicyAssociation;
+            static createPolicyRule(context: ClientRuntimeContext): SPPolicyRule;
+
+
+            updatePolicyRule(policyRule: SPPolicyRule): void;
+
+            getPolicyRule(policyRuleId: any, throwIfNull: boolean): SPPolicyRule;
+
+            deletePolicyRule(policyRuleId: any): void;
+
+            notifyUnifiedPolicySync(notificationId: any, syncSvcUrl: string, changeInfos: any, syncNow: boolean, fullSyncForTenant: boolean): void;
+
+            updatePolicyDefinition(policyDefinition: SPPolicyDefinition): void;
+
+            getPolicyDefinition(policyDefinitionId: any): SPPolicyDefinition;
+
+            deletePolicyDefinition(policyDefinitionId: any): void;
+
+            getPolicyDefinitions(scenario: any): ClientObjectList<SPPolicyDefinition>;
+
+            updatePolicyBinding(policyBinding: SPPolicyBinding): void;
+
+            getPolicyBinding(policyBindingId: any): SPPolicyBinding;
+
+            deletePolicyBinding(policyBindingId: any): void;
+
+            updatePolicyAssociation(policyAssociation: SPPolicyAssociation): void;
+
+            getPolicyAssociation(policyAssociationId: any): SPPolicyAssociation;
+
+            getPolicyAssociationForContainer(containerId: SPContainerId): SPPolicyAssociation;
+
+            deletePolicyAssociation(policyAssociationId: any): void;
+        }
+
+        export class SPPolicyStoreProxy extends ClientObject {
+            constructor(context: ClientRuntimeContext, web: Web);
+
+            get_policyStoreUrl(): string;
+        }
+
+    }
+
+    export module Discovery {
+
+        export enum ExportStatus {
+            notStarted,//: 0,
+            started,//: 1,
+            complete,//: 2,
+            failed//: 3
+        }
+
+        export class Case extends ClientObject {
+            constructor(context: ClientRuntimeContext, web: Web);
+            getExportContent(sourceIds: number[]): SP.StringResult;
+        }
+        export class Export extends ClientObject {
+            constructor(context: ClientRuntimeContext, item: ListItem);
+            get_status(): ExportStatus;
+            set_status(value: ExportStatus): ExportStatus;
+            update(): void;
+            getExportContent(): SP.StringResult;
+        }
+    }
+
+    export module InformationPolicy {
+        export class ProjectPolicy extends SP.ClientObject {
+            constructor(context: ClientRuntimeContext, objectPath: ObjectPath);
+            get_description(): string;
+
+            get_emailBody(): string;
+            set_emailBody(value: string): string;
+
+            get_emailBodyWithTeamMailbox(): string;
+            set_emailBodyWithTeamMailbox(value: string): string;
+
+            get_emailSubject(): string;
+            set_emailSubject(value: string): string;
+
+            get_name(): string;
+            savePolicy(): void;
+
+
+            static getProjectPolicies(context: ClientRuntimeContext, web: Web): ClientObjectList<ProjectPolicy>;
+            static getCurrentlyAppliedProject(context: ClientRuntimeContext, web: Web): ProjectPolicy;
+            static applyProjectPolicy(context: ClientRuntimeContext, web: Web, projectPolicy: ProjectPolicy): void;
+            static openProject(context: ClientRuntimeContext, web: Web): void;
+            static closeProject(context: ClientRuntimeContext, web: Web): void;
+            static postponeProject(context: ClientRuntimeContext, web: Web): void;
+            static doesProjectHavePolicy(context: ClientRuntimeContext, web: Web): SP.BooleanResult;
+            static isProjectClosed(context: ClientRuntimeContext, web: Web): SP.BooleanResult;
+            static getProjectCloseDate(context: ClientRuntimeContext, web: Web): SP.DateTimeResult;
+            static getProjectExpirationDate(context: ClientRuntimeContext, web: Web): SP.DateTimeResult;
+        }
+    }
+}
+declare class SPClientAutoFill {
+    static MenuOptionType: {
+        Option: number;
+        Footer: number;
+        Separator: number;
+        Loading: number;
+    }
+
+    static KeyProperty: string; //= 'AutoFillKey';
+    static DisplayTextProperty: string;// = 'AutoFillDisplayText';
+    static SubDisplayTextProperty: string; //= 'AutoFillSubDisplayText';
+    static TitleTextProperty: string; //= 'AutoFillTitleText';
+    static MenuOptionTypeProperty: string;//= 'AutoFillMenuOptionType';
+
+    static GetAutoFillObjFromInput(elmText: HTMLInputElement): SPClientAutoFill;
+    static GetAutoFillObjFromContainer(elmChild: HTMLElement): SPClientAutoFill;
+    static GetAutoFillMenuItemFromOption(elmChild: HTMLElement): HTMLElement;
+
+    constructor(elmTextId: string, elmContainerId: string, fnPopulateAutoFill: (targetElement: HTMLInputElement) => void);
+    public TextElementId: string;
+    public AutoFillContainerId: string;
+    public AutoFillMenuId: string;
+    public VisibleItemCount: number;
+    public CurrentFocusOption: number;
+    public AutoFillMinTextLength: number;
+    public AutoFillTimeout: number;
+    public AutoFillCallbackTimeoutID: string;
+    public FuncOnAutoFillClose: (elmTextId: string, ojData: ISPClientAutoFillData) => void;
+    public FuncPopulateAutoFill: (targetElement: HTMLElement) => void;
+    public AllOptionData: { [key: string]: ISPClientAutoFillData };
+
+    PopulateAutoFill(jsonObjSuggestions: ISPClientAutoFillData[], fnOnAutoFillCloseFuncName: (elmTextId: string, objData: ISPClientAutoFillData) => void): void;
+    IsAutoFillOpen(): boolean;
+    SetAutoFillHeight(): void;
+    SelectAutoFillOption(elemOption: HTMLElement): void;
+    FocusAutoFill(): void;
+    BlurAutoFill(): void;
+    CloseAutoFill(ojData: ISPClientAutoFillData): void;
+    UpdateAutoFillMenuFocus(bMoveNextLink: boolean): void;
+    UpdateAutoFillPosition(): void;
+}
+
+interface ISPClientAutoFillData {
+    AutoFillKey?: any;
+    AutoFillDisplayText?: string;
+    AutoFillSubDisplayText?: string;
+    AutoFillTitleText?: string;
+    AutoFillMenuOptionType?: number;
+}
+
+
+declare class SPClientPeoplePicker {
+    static ValueName: string; // = 'Key';
+    static DisplayTextName: string; // = 'DisplayText';
+    static SubDisplayTextName: string; // = 'Title';
+    static DescriptionName: string; // = 'Description';
+    static SIPAddressName: string; // = 'SIPAddress';
+    static SuggestionsName: string; // = 'MultipleMatches';
+    static UnvalidatedEmailAddressKey: string; // = "UNVALIDATED_EMAIL_ADDRESS";
+    static KeyProperty: string; // = 'AutoFillKey';
+    static DisplayTextProperty: string; // = 'AutoFillDisplayText';
+    static SubDisplayTextProperty: string; // = 'AutoFillSubDisplayText';
+    static TitleTextProperty: string; // = 'AutoFillTitleText';
+    static DomainProperty: string; // = 'DomainText';
+
+    static SPClientPeoplePickerDict: {
+        [pickerIelementId: string]: SPClientPeoplePicker;
+    };
+
+    static InitializeStandalonePeoplePicker(clientId: string, value: ISPClientPeoplePickerEntity[], schema: ISPClientPeoplePickerSchema): void;
+    static ParseUserKeyPaste(userKey: string): string;
+    static GetTopLevelControl(elmChild: HTMLElement): HTMLElement;
+    static AugmentEntity(entity: ISPClientPeoplePickerEntity): ISPClientPeoplePickerEntity;
+    static AugmentEntitySuggestions(pickerObj: SPClientPeoplePicker, allEntities: ISPClientPeoplePickerEntity[], mergeLocal?: boolean): ISPClientPeoplePickerEntity[];
+    static PickerObjectFromSubElement(elmSubElement: HTMLElement): SPClientPeoplePicker;
+    static TestLocalMatch(strSearchLower: string, dataEntity: ISPClientPeoplePickerEntity): boolean;
+    static BuildUnresolvedEntity(key: string, dispText: string): ISPClientPeoplePickerEntity;
+    static AddAutoFillMetaData(pickerObj: SPClientPeoplePicker, options: ISPClientPeoplePickerEntity[], numOpts: number): ISPClientPeoplePickerEntity[];
+    static BuildAutoFillMenuItems(pickerObj: SPClientPeoplePicker, options: ISPClientPeoplePickerEntity[]): ISPClientPeoplePickerEntity[];
+    static IsUserEntity(entity: ISPClientPeoplePickerEntity): boolean;
+    static CreateSPPrincipalType(acctStr: string): number;
+
+
+    public TopLevelElementId: string; // '',
+    public EditorElementId: string; //'',
+    public AutoFillElementId: string; //'',
+    public ResolvedListElementId: string; //'',
+    public InitialHelpTextElementId: string; //'',
+    public WaitImageId: string; //'',
+    public HiddenInputId: string; //'',
+    public AllowEmpty: boolean; //true,
+    public ForceClaims: boolean; //false,
+    public AutoFillEnabled: boolean; //true,
+    public AllowMultipleUsers: boolean; //false,
+    public OnValueChangedClientScript: (pickerElementId: string, users: ISPClientPeoplePickerEntity[]) => void;
+    public OnUserResolvedClientScript: (pickerElementId: string, users: ISPClientPeoplePickerEntity[]) => void;
+    public OnControlValidateClientScript: (pickerElementId: string, users: ISPClientPeoplePickerEntity[]) => void;
+    public UrlZone: SP.UrlZone; //null,
+    public AllUrlZones: boolean; //false,
+    public SharePointGroupID: number; //0,
+    public AllowEmailAddresses: boolean; //false,
+    public PPMRU: SPClientPeoplePickerMRU;
+    public UseLocalSuggestionCache: boolean; //true,
+    public CurrentQueryStr: string; //'',
+    public LatestSearchQueryStr: string; // '',
+    public InitialSuggestions: ISPClientPeoplePickerEntity[];
+    public CurrentLocalSuggestions: ISPClientPeoplePickerEntity[];
+    public CurrentLocalSuggestionsDict: ISPClientPeoplePickerEntity;
+    public VisibleSuggestions: number; //5,
+    public PrincipalAccountType: string; //'',
+    public PrincipalAccountTypeEnum: SP.Utilities.PrincipalType;
+    public EnabledClaimProviders: string; //'',
+    public SearchPrincipalSource: SP.Utilities.PrincipalSource; //null,
+    public ResolvePrincipalSource: SP.Utilities.PrincipalSource; //null,
+    public MaximumEntitySuggestions: number; //30,
+    public EditorWidthSet: boolean; //false,
+    public QueryScriptInit: boolean; //false,
+    public AutoFillControl: SPClientAutoFill; //null,
+    public TotalUserCount: number; //0,
+    public UnresolvedUserCount: number; //0,
+    public UserQueryDict: { [index: string]: SP.StringResult };
+    public ProcessedUserList: { [index: string]: SPClientPeoplePickerProcessedUser };
+    public HasInputError: boolean; //false,
+    public HasServerError: boolean; //false,
+    public ShowUserPresence: boolean; //true,
+    public TerminatingCharacter: string; //';',
+    public UnresolvedUserElmIdToReplace: string; //'',
+    public WebApplicationID: SP.Guid; //'{00000000-0000-0000-0000-000000000000}',
+    public GetAllUserInfo(): ISPClientPeoplePickerEntity[];
+
+    public SetInitialValue(entities: ISPClientPeoplePickerEntity[], initialErrorMsg?: string): void
+    public AddUserKeys(userKeys: string, bSearch: boolean): void;
+    public BatchAddUserKeysOperation(allKeys: string[], numProcessed: number): void;
+    public ResolveAllUsers(fnContinuation: () => void): void;
+    public ExecutePickerQuery(queryIds: string, onSuccess: (queryId: string, result: SP.StringResult) => void, onFailure: (queryId: string, result: SP.StringResult) => void, fnContinuation: () => void): void;
+    public AddUnresolvedUserFromEditor(bRunQuery?: boolean): void;
+    public AddUnresolvedUser(unresolvedUserObj: ISPClientPeoplePickerEntity, bRunQuery?: boolean): void;
+    public UpdateUnresolvedUser(results: SP.StringResult, user: ISPClientPeoplePickerEntity): void;
+    public AddPickerSearchQuery(queryStr: string): string;
+    public AddPickerResolveQuery(queryStr: string): string;
+    public GetPeoplePickerQueryParameters(): SP.UI.ApplicationPages.ClientPeoplePickerQueryParameters;
+    public AddProcessedUser(userObject: ISPClientPeoplePickerEntity, fResolved?: boolean): string;
+    public DeleteProcessedUser(elmToRemove: HTMLElement): void;
+    public OnControlValueChanged(): void;
+    public OnControlResolvedUserChanged(): void;
+    public EnsureAutoFillControl(): void;
+    public ShowAutoFill(resultsTable: ISPClientAutoFillData[]): void;
+    public FocusAutoFill(): void;
+    public BlurAutoFill(): void;
+    public IsAutoFillOpen(): boolean;
+    public EnsureEditorWidth(): void;
+    public SetFocusOnEditorEnd(): void;
+    public ToggleWaitImageDisplay(bShowImage?: boolean): void;
+    public SaveAllUserKeysToHiddenInput(): void;
+    public GetCurrentEditorValue(): string;
+    public GetControlValueAsJSObject(): ISPClientPeoplePickerEntity[];
+    public GetAllUserKeys(): string;
+    public GetControlValueAsText(): string;
+    public IsEmpty(): boolean;
+    public IterateEachProcessedUser(fnCallback: (index: number, user: SPClientPeoplePickerProcessedUser) => void): void;
+    public HasResolvedUsers(): boolean;
+    public Validate(): void;
+    public ValidateCurrentState(): void
+    public GetUnresolvedEntityErrorMessage(): string;
+    public ShowErrorMessage(msg: string): void;
+    public ClearServerError(): void;
+    public SetServerError(): void;
+    public OnControlValidate(): void;
+    public SetEnabledState(bEnabled: boolean): void;
+    public DisplayLocalSuggestions(): void;
+    public CompileLocalSuggestions(input: string): void;
+    public PlanningGlobalSearch(): boolean;
+    public AddLoadingSuggestionMenuOption(): void;
+    public ShowingLocalSuggestions(): boolean;
+    public ShouldUsePPMRU(): boolean;
+    public AddResolvedUserToLocalCache(resolvedEntity: ISPClientPeoplePickerEntity, resolveText: string): void;
+}
+
+interface ISPClientPeoplePickerSchema {
+    TopLevelElementId?: string;
+    EditorElementId?: string;
+    AutoFillElementId?: string;
+    ResolvedListElementId?: string;
+    InitialHelpTextElementId?: string;
+    WaitImageId?: string;
+    HiddenInputId?: string;
+
+    AllowMultipleValues?: boolean;
+    Required?: boolean;
+    AutoFillEnabled?: boolean;
+    ForceClaims?: boolean;
+    AllowEmailAddresses?: boolean;
+    AllUrlZones?: boolean;
+    UseLocalSuggestionCache?: boolean;
+    UserNoQueryPermission?: boolean;
+
+    VisibleSuggestions?: number;
+    MaximumEntitySuggestions?: number;
+
+    ErrorMessage?: string;
+    InitialHelpText?: string;
+
+    InitialSuggestions?: ISPClientPeoplePickerEntity[];
+
+
+    UrlZone?: SP.UrlZone;
+    WebApplicationID?: SP.Guid;
+    SharePointGroupID?: number;
+
+    /** Specify User, DL, SecGroup or SPGroup*/
+    PrincipalAccountType?: string;
+
+    EnabledClaimProvider?: string;
+    ResolvePrincipalSource?: SP.Utilities.PrincipalSource;
+    SearchPrincipalSource?: SP.Utilities.PrincipalSource;
+
+    OnUserResolvedClientScript?: (pickerElementId: string, users: ISPClientPeoplePickerEntity[]) => void;
+    OnValueChangedClientScript?: (pickerElementId: string, users: ISPClientPeoplePickerEntity[]) => void;
+
+    /** Number or '100%'*/
+    Width?: any;
+
+    Rows?: number;
+
+}
+
+declare class SPClientPeoplePickerMRU {
+    static PPMRUVersion: number;// = 1;
+    static MaxPPMRUItems: number;// = 200;
+    static PPMRUDomLocalStoreKey: string;// = "ClientPeoplePickerMRU";
+    static GetSPClientPeoplePickerMRU(): SPClientPeoplePickerMRU;
+
+    GetItems(strKey: string): Object[];
+    SetItem(strSearchTerm: string, objEntity: Object): void;
+    ResetCache(): void;
+}
+
+interface ISPClientPeoplePickerEntity {
+    Key?: string;
+    Description?: string;
+    DisplayText?: string;
+    EntityType?: string;
+    ProviderDisplayName?: string;
+    ProviderName?: string;
+    IsResolved?: boolean;
+    EntityData?: {
+        Title: string;
+        MobilePhone: string;
+        Department: string;
+        Email: string;
+    };
+    MultipleMatches: ISPClientPeoplePickerEntity[];
+    DomainText?: string;
+    [key: string]: any;
+}
+
+declare class SPClientPeoplePickerProcessedUser {
+    UserContainerElementId: string;// '',
+    DisplayElementId: string;// '',
+    PresenceElementId: string;// '',
+    DeleteUserElementId: string;// '',
+    SID: string;// '',
+    DisplayName: string;// '',
+    SIPAddress: string;// '',
+    UserInfo: ISPClientPeoplePickerEntity;// null,
+    ResolvedUser: boolean;// true,
+    Suggestions: ISPClientAutoFillData[];// null,
+    ErrorDescription: string;// '',
+    ResolveText: string;// '',
+    public UpdateResolvedUser(newUserInfo: ISPClientPeoplePickerEntity, strNewElementId: string): void;
+    public UpdateSuggestions(entity: ISPClientPeoplePickerEntity): void;
+    public BuildUserHTML(): string;
+    public UpdateUserMaxWidth(): void;
+    public ResolvedAsUnverifiedEmail(): string;
+
+    static BuildUserPresenceHtml(elmId: string, strSip: string, bResolved?: boolean): string;
+    static GetUserContainerElement(elmChild: HTMLElement): HTMLElement;
+    static HandleProcessedUserClick(ndClicked: HTMLElement): void;
+    static DeleteProcessedUser(elmToRemove: HTMLElement): void;
+    static HandleDeleteProcessedUserKey(e: Event): void;
+    static HandleResolveProcessedUserKey(e: Event): void;
+}
+
+declare namespace Microsoft {
+    export module Office {
+        export module Server {
+            export module ReputationModel {
+                export class Reputation {
+                    constructor();
+                    static setLike(context: SP.ClientContext, listId: string, itemId: number, like: boolean): void;
+                    static setRating(context: SP.ClientContext, listId: string, itemId: number, rating: number): void;
+                }
+            }
+        }
+    }
+}
+
+/** Available only in SharePoint Online*/
+declare namespace Define {
+    export function loadScript(url: string, successCallback: () => void, errCallback: () => void): void;
+    /** Loads script from _layouts/15/[req].js */
+    export function require(req: string, callback: Function): void;
+    /** Loads script from _layouts/15/[req].js */
+    export function require(req: string[], callback: Function): void;
+    export function define(name: string, deps: string[], def: Function): void;
+}
+
+/** Available only in SharePoint Online*/
+declare namespace Verify {
+    export function ArgumentType(arg: string, expected: any): void;
+}
+
+
+/** Available only in SharePoint Online*/
+declare namespace BrowserStorage {
+    export var local: CachedStorage;
+    export var session: CachedStorage;
+
+    /** Available only in SharePoint Online*/
+    interface CachedStorage {
+        getItem(key: string): string;
+        setItem(key: string, value: string): void;
+        removeItem(key: string): void;
+        clead(): void;
+        length: number;
+    }
+}
+
+/** Available only in SharePoint Online*/
+declare namespace BrowserDetection {
+    export var browseris: Browseris;
+}
+
+/** Available only in SharePoint Online*/
+declare namespace CSSUtil {
+    export function HasClass(elem: HTMLElement, className: string): boolean;
+    export function AddClass(elem: HTMLElement, className: string): void;
+    export function RemoveClass(elem: HTMLElement, className: string): void;
+    export function pxToFloat(pxString: string): number;
+    export function pxToNum(px: string): number;
+    export function numToPx(n: number): string;
+    export function getCurrentEltStyleByNames(elem: HTMLElement, styleNames: string[]): string;
+    export function getCurrentStyle(elem: HTMLElement, cssStyle: string): string;
+    export function getCurrentStyleCorrect(element: HTMLElement, camelStyleName: string, dashStyleName: string): string;
+    export function getOpacity(element: HTMLElement): number;
+    export function setOpacity(element: HTMLElement, value: number): void;
+}
+
+/** Available only in SharePoint Online*/
+declare namespace DOM {
+    export var rightToLeft: boolean;
+    export function cancelDefault(evt: Event): void;
+    export function AbsLeft(el: HTMLElement): number;
+    export function AbsTop(el: HTMLElement): number;
+    export function CancelEvent(evt: Event): void;
+    export function GetElementsByName(nae: string): NodeList;
+    export function GetEventCoords(evt: Event): { x: number; y: number; };
+    export function GetEventSrcElement(evt: Event): HTMLElement;
+    export function GetInnerText(el: HTMLElement): string;
+    export function PreventDefaultNavigation(evt: Event): void;
+    export function SetEvent(eventName: string, eventFunc: Function, el: HTMLElement): void;
+}
+
+/** Available only in SharePoint Online*/
+declare namespace Encoding {
+    export function EncodeScriptQuote(str: string): string;
+    export function HtmlEncode(str: string): string;
+    export function HtmlDecode(str: string): string;
+    export function AttrQuote(str: string): string;
+    export function ScriptEncode(str: string): string;
+    export function ScriptEncodeWithQuote(str: string): string;
+    export function CanonicalizeUrlEncodingCase(str: string): string;
+}
+
+/** Available only in SharePoint Online*/
+declare namespace IE8Support {
+    export function arrayIndexOf<T>(array: T[], item: T, startIdx?: number): number;
+    export function attachDOMContentLoaded(handler: Function): void;
+    export function getComputedStyle(domObj: HTMLElement, camelStyleName: string, dashStyleName: string): string;
+    export function stopPropagation(evt: Event): void;
+}
+
+/** Available only in SharePoint Online*/
+declare namespace StringUtil {
+    export function BuildParam(stPattern: string, ...params: any[]): string;
+    export function ApplyStringTemplate(str: string, ...params: any[]): string;
+}
+
+/** Available only in SharePoint Online*/
+declare namespace TypeUtil {
+    export function IsArray(value: any): boolean;
+    export function IsNullOrUndefined(value: any): boolean;
+}
+
+/** Available only in SharePoint Online*/
+declare namespace Nav {
+    export var ajaxNavigate: AjaxNavigate;
+    export function convertRegularURLtoMDSURL(webUrl: string, fullPath: string): string;
+    export function isMDSUrl(url: string): boolean;
+    export function isPageUrlValid(url: string): boolean;
+    export function isPortalTemplatePage(url: string): boolean;
+    export function getAjaxLocationWindow(): string;
+    export function getSource(defaultSource?: string): string;
+    export function getUrlKeyValue(keyName: string, bNoDecode: boolean, url: string, bCaseInsensitive: boolean): string;
+    export function getWindowLocationNoHash(hre: string): string;
+    export function goToHistoryLink(el: HTMLAnchorElement, strVersion: string): void;
+    export function getGoToLinkUrl(el: HTMLAnchorElement): string;
+    export function goToLink(el: HTMLAnchorElement): void;
+    export function goToLinkOrDialogNewWindow(el: HTMLAnchorElement): void;
+    export function goToDiscussion(url: string): void;
+    export function onClickHook(evt: Event, topElm: HTMLElement): void;
+    export function pageUrlValidation(url: string, alertString: string): string;
+    export function parseHash(hash: string): Object;
+    export function navigate(url: string): void;
+    export function removeMDSQueryParametersFromUrl(url: string): string;
+    export function urlFromHashBag(hashObject: Object): string;
+    export function wantsNewTab(evt: Event): boolean;
+}
+
+/** Available only in SharePoint Online*/
+declare namespace URI_Encoding {
+    export function encodeURIComponent(str: string, bAsUrl?: boolean, bForFilterQuery?: boolean, bForCallback?: boolean): string;
+    export function escapeUrlForCallback(str: string): string;
+}
+
+interface IListItem {
+    ID: number;
+    ContentTypeId: string;
+}
+
+/** Available only in SharePoint Online*/
+declare namespace ListModule {
+    export module Util {
+        export function createViewEditUrl(renderCtx: SPClientTemplates.RenderContext, listItem: IListItem, useEditFormUrl?: boolean, appendSource?: boolean): string;
+        export function createItemPropertiesTitle(renderCtx: SPClientTemplates.RenderContext, listItem: IListItem): string;
+        export function clearSelectedItemsDict(context: any): void;
+        export function ctxInitItemState(context: any): void;
+        export function getAttributeFromItemTable(itemTableParam: HTMLElement, strAttributeName: string, strAttributeOldName: string): string
+        export function getSelectedItemsDict(context: any): any;
+        export function removeOnlyPagingArgs(url: string): string;
+        export function removePagingArgs(url: string): string;
+        export function showAttachmentRows(): void;
+    }
+}
+
+/** Available only in SharePoint Online*/
+declare namespace SPThemeUtils {
+    export function ApplyCurrentTheme(): void;
+    export function WithCurrentTheme(resultCallback: Function): void;
+    export function UseClientSideTheming(): boolean;
+    export function Suspend(): void;
+}
+
+declare namespace SP {
+    export module JsGrid {
+
+        export enum TextDirection {
+            Default, //0,
+            RightToLeft, //1,
+            LeftToRight //2
+        }
+
+        export enum PaneId {
+            MainGrid, //0,
+            PivotedGrid, //1,
+            Gantt //2
+        }
+
+        export enum PaneLayout {
+            GridOnly, //0,
+            GridAndGantt, //1,
+            GridAndPivotedGrid //2
+
+        }
+        export enum EditMode {
+            ReadOnly, //0,
+            ReadWrite, //1,
+            ReadOnlyDefer, //2,
+            ReadWriteDefer, //3,
+            Defer //4
+        }
+
+        export enum GanttDrawBarFlags {
+            LeftLink, //0x01,
+            RightLink //0x02
+
+        }
+        export enum GanttBarDateType {
+            Start, //0,
+            End //1
+        }
+
+        export enum ValidationState {
+            Valid, //0,
+            Pending, //1,
+            Invalid //2
+        }
+
+        export enum HierarchyMode {
+            None, //0,
+            Standard, //1,
+            Grouping //2
+        }
+
+        export enum EditActorWriteType {
+            Both, //1,
+            LocalizedOnly, //2,
+            DataOnly, //3,
+            Either //4
+        }
+
+        export enum EditActorReadType {
+            Both, //1,
+            LocalizedOnly, //2,
+            DataOnly //3
+        }
+
+        export enum EditActorUpdateType {
+            Committed, //0,
+            Uncommitted, //1
+        }
+
+        export enum SortMode {
+            Ascending, //1,
+            Descending, //-1,
+            None //0
+        }
+
+        export module RowHeaderStyleId {
+            export var Transfer: string; //'Transfer',
+            export var Conflict: string; //'Conflict'
+
+        }
+
+        export module RowHeaderAutoStyleId {
+            export var Dirty: string; //'Dirty',
+            export var Error: string; //'Error',
+            export var NewRow: string; //'NewRow'
+        }
+
+        export enum RowHeaderStatePriorities {
+            Dirty, //10,
+            Transfer, //30,
+            CellError, //40,
+            Conflict, //50,
+            RowError, //60,
+            NewRow //90
+        }
+
+        export enum UpdateSerializeMode {
+            Cancel, //0,
+            Default, //1,
+            PropDataOnly, //2,
+            PropLocalizedOnly, //3,
+            PropBoth //4
+        }
+
+        export enum UpdateTrackingMode {
+            PropData, //2,
+            PropLocalized, //3,
+            PropBoth //4
+        }
+
+        export module UserAction {
+            export var UserEdit: string; //'User Edit':string;
+            export var DeleteRecord: string; //'Delete Record':string;
+            export var InsertRecord: string; //'Insert Record':string;
+            export var Indent: string; //'Indent':string;
+            export var Outdent: string; //'Outdent':string;
+            export var Fill: string; //'Fill':string;
+            export var Paste: string; //'Paste':string;
+            export var CutPaste: string; //'Cut/Paste'
+        }
+
+        export enum ReadOnlyActiveState {
+            ReadOnlyActive, //0,
+            ReadOnlyDisabled, //1
+        }
+
+        export interface IValue {
+            data?: any;
+            localized?: string;
+        }
+        export enum SelectionTypeFlags {
+            MultipleCellRanges,
+            MultipleRowRanges,
+            MultipleColRanges
+        }
+
+
+        export class JsGridControl {
+            constructor(parentNode: HTMLElement, bShowLoadingBanner: boolean);
+            /** Returns true if Init method has been executed successfully */
+            IsInitialized(): boolean;
+            /** Replaces the control TableCache object with the provided one */
+            ResetData(cache: SP.JsGrid.TableCache): void;
+            /** Initialize the control */
+            Init(parameters: SP.JsGrid.JsGridControl.Parameters): void;
+            Cleanup(): void;
+            /** Removes all event handlers and markup associated with the control */
+            Dispose(): void;
+
+            // todo
+            NotifyDataAvailable(): void;
+            NotifySave(): void;
+            NotifyHide(): void;
+            NotifyResize(): void;
+            ClearTableView(): void;
+            HideInitialLoadingBanner(): void;
+            ShowInitialGridErrorMsg(errorMsg: string): void;
+            ShowGridErrorMsg(errorMsg: string): void;
+            LaunchPrintView(
+                additionalScriptFiles: any,
+                beforeInitFnName: any,
+                beforeInitFnArgsObj: any,
+                title: string,
+                bEnableGantt: boolean,
+                optGanttDelegateNames?: any,
+                optInitTableViewParamsFnName?: any,
+                optInitTableViewParamsFnArgsObj?: any,
+                optInitGanttStylesFnName?: any,
+                optInitGanttStylesFnArgsObj?: any): void;
+            GetAllDataJson(fnOnFinished: any, optFnGetCellStyleID?: any): void;
+            SetTableView(tableViewParams: any): void;
+            SetRowView(rowViewParam: any): void;
+
+            /** Enable grid after Disable. */
+            Enable(): void;
+            /** Covers the grid with the semi-transparent panel, preventing any operations with it.
+                Additionally, displays loading animated gif and optMsg as the message next to it.
+                If optMsg is not specified, displays "Loading..." text. */
+            Disable(optMsg?: string): void;
+            /** Enables grid editing */
+            EnableEditing(): void;
+            /** Disables grid editing: all the records become readonly */
+            DisableEditing(): void;
+            /** Switches the currently selected cell into edit mode: displays edit control and sets focus into it.
+                Returns true if success. */
+            TryBeginEdit(): boolean;
+            FinalizeEditing(fnContinue: Function, fnError: Function): void;
+            /** Get diff tracker object that tracks changes to the grid data. */
+            GetDiffTracker(): SP.JsGrid.Internal.DiffTracker;
+            /** Moves focus to the JsGrid control */
+            Focus(): void;
+
+            /** Try saving the new record row (aka entry row) if it was edited. */
+            TryCommitFirstEntryRecords(fnCommitComplete: { (): void }): void;
+            /** Removes all new record rows (aka entry rows), including unsaved and even empty ones.
+                The latter seems to be a bug, as I haven't found any easy way to restore the empty entry row. */
+            ClearUncommitedEntryRecords(): void;
+            /** Returns true if there are any unsaved new record rows (aka entry rows). */
+            AnyUncommitedEntryRecords(): boolean;
+
+
+            // todo
+            AnyUncomittedProvisionalRecords(): boolean;
+
+            /** Gets record based on the recordKey
+                @recordKey internal unique id of a row. You can get recordKey from view index via GetRecordKeyByViewIndex method. */
+            GetRecord(recordKey: number): IRecord;
+            /** Get entry record with the specified key.
+                Entry record is a special type of record because it represents a new record that doesn't exist yet. */
+            GetEntryRecord(key: any): any;
+            /** Determine if the specified record key identifies valid entry row. */
+            IsEntryRecord(recordKey: number): boolean;
+            /** Determine whether the specified cell is editable. */
+            IsCellEditable(record: IRecord, fieldKey: string, optPaneId?: any): boolean;
+            /** Adds one of builtin row state indicator icons into the row header.
+                Please pass one of the values of SP.JsGrid.RowHeaderStyleId
+                Row header is the leftmost gray column of the table. */
+            AddBuiltInRowHeaderState(recordKey: number, rowHeaderStateId: string): void;
+            /** Adds the specified state into the row header.
+                There can be several row header states for one row. Only one is shown (according to the Priority).
+                Row header is the leftmost gray column of the table. */
+            AddRowHeaderState(recordKey: number, rowHeaderState: SP.JsGrid.RowHeaderState): void;
+            /** Removes header state with specified id from the row. */
+            RemoveRowHeaderState(recordKey: number, rowHeaderStateId: string): void;
+
+            GetCheckSelectionManager(): any;
+            UpdateProperties(propertyUpdates: any, changeName: any, optChangeKey?: any): any;
+            GetLastRecordKey(): string;
+            InsertProvisionalRecordBefore(beforeRecordKey: number, newRecord: any, initialValues: any): any;
+            InsertProvisionalRecordAfter(afterRecordKey: number, newRecord: any, initialValues: any): any;
+            IsProvisionalRecordKey(recordKey: number): boolean;
+            InsertRecordBefore(beforeRecordKey: number, newRecord: any, optChangeKey?: any): any;
+            InsertRecordAfter(afterRecordKey: number, newRecord: any, optChangeKey?: any): any;
+            InsertHiddenRecord(recordKey: number, changeKey: any, optAfterRecordKey?: any): any;
+            DeleteRecords(recordKeys: any, optChangeKey?: any): any;
+            IndentRecords(recordKeys: any, optChangeKey?: any): any;
+            OutdentRecords(recordKeys: any, optChangeKey?: any): any;
+            ReorderRecords(beginRecordKey: number, endRecordKey: number, afterRecordKey: number, bSelectAfterwards: boolean): any;
+            GetContiguousRowSelectionWithoutEntryRecords(): { begin: any; end: any; keys: any };
+            CanMoveRecordsUpByOne(recordKeys: any): boolean;
+            CanMoveRecordsDownByOne(recordKeys: any): boolean;
+            MoveRecordsUpByOne(recordKeys: any): any;
+            MoveRecordsDownByOne(recordKeys: any): any;
+            GetReorderRange(recordKeys: any): any;
+            GetNodeExpandCollapseState(recordKey: number): any;
+            ToggleExpandCollapse(recordKey: number): void;
+
+            /** Attach event handler to a particular event type */
+            AttachEvent(eventType: JsGrid.EventType, fnOnEvent: { (args: IEventArgs): void }): void;
+            /** Detach a previously set event handler */
+            DetachEvent(eventType: JsGrid.EventType, fnOnEvent: any): void;
+
+            /** Set a delegate. Delegates are way to replace default functionality with custom one. */
+            SetDelegate(delegateKey: JsGrid.DelegateType, fn: any): void;
+            /** Get current delegate. */
+            GetDelegate(delegateKey: JsGrid.DelegateType): any;
+
+            /** Re-render the specified row in the view. */
+            RefreshRow(recordKey: number): void;
+            /** Re-render all rows in the view.
+                It can be used e.g. if you have some custom display controls and they are rendered differently depending on some external settings.
+                In this case, if you update the external settings, obviously you have to then update the view for these settings to take effect. */
+            RefreshAllRows(): void;
+            /** Clears undo queue, and also differencies tracker state and versions manager state. */
+            ClearChanges(): void;
+
+            GetGanttZoomLevel(): any;
+            SetGanttZoomLevel(level: any): void;
+            ScrollGanttToDate(date: any): void;
+
+            /** Get top record view index.
+                You can then use GetRecordKeyByViewIndex to convert this value into the recordKey. */
+            GetTopRecordIndex(): number;
+            /** Get number of rows displayed in the current view. */
+            GetViewRecordCount(): number;
+            /** Get record key for a row that is specified by the viewIdx.
+                viewIdx - index of the row in the view, use GetTopRecordIndex to get the first one.
+                Returns recordKey, which is a unique numeric identifier of a row within a dataset.
+                Main difference between viewIdx and recordKey is that viewIdx is only unique within a view,
+                e.g. if you do paging, it can be same for different records.
+             */
+            GetRecordKeyByViewIndex(viewIdx: number): number;
+            /** Opposite to GetRecordKeyByViewIndex, resolves the view index of the record based on record key.
+                recordKey - unique numeric identifier of a row in the current dataset.
+                Returns viewIdx - index of the row in the current view */
+            GetViewIndexOfRecord(recordKey: number): number;
+            /** Get top row index. Usually returns 0.
+                You can then use GetRecordKeyByViewIndex to convert this value into the recordKey. */
+            GetTopRowIndex(): number;
+
+            GetOutlineLevel(record: any): any;
+            GetSplitterPosition(): any;
+            SetSplitterPosition(pos: any): void;
+            GetLeftColumnIndex(optPaneId?: any): any;
+            EnsurePaneWidth(): void;
+
+            /** Show a previously hidden column at a specified position.
+                If atIdx is not defined, column will be shown at it's previous position. */
+            ShowColumn(columnKey: string, atIdx?: number): void;
+            /** Hide the specified column from grid */
+            HideColumn(columnKey: string): void;
+            /** Update column descriptions */
+            UpdateColumns(columnInfoCollection: ColumnInfoCollection): void;
+            GetColumns(optPaneId?: string): ColumnInfo[];
+            /** Get ColumnInfo object by fieldKey
+                @fieldKey when working with SharePoint data sources, fieldKey corresponds to field internal name */
+            GetColumnByFieldKey(fieldKey: string, optPaneId?: any): ColumnInfo;
+            /** Adds a column, based on the specified grid field */
+            AddColumn(columnInfo: ColumnInfo, gridField: GridField): void;
+
+            /** Switches column header in rename mode, showing textbox and thus giving the user possibility to rename this column. */
+            RenameColumn(columnKey: string): void;
+            /** Shows a dialog where user can reorder columns and change their widths. */
+            ShowColumnConfigurationDialog(): void;
+
+
+            /** Returns true, if there are any errors in the JsGrid */
+            AnyErrors(): boolean;
+            /** Returns true, if there are any errors in a specified row */
+            AnyErrorsInRecord(recordKey: number): boolean;
+            /** Set error for the specified by recordKey and fieldKey cell.
+                Returns id of the error, so that later you can clear the error using this id. */
+            SetCellError(recordKey: number, fieldKey: string, errorMessage: string): number;
+            /** Set error for the specified by recordKey row.
+                In the leftmost column of this row, exclamation mark error indicator will appear.
+                Clicking on this indicator will cause the specified error message appear in form of a reddish tooltip.
+                Returns id of the error, so that later you can clear the error using this id. */
+            SetRowError(recordKey: number, errorMessage: string): number;
+            /** Clear specified by id error that was previously set on the specified by recordKey and fieldKey cell. */
+            ClearCellError(recordKey: number, fieldKey: string, id: number): void;
+            /** Clear all errors in the specified cell. */
+            ClearAllErrorsOnCell(recordKey: number, fieldKey: string): void;
+            /** Clear specified by id error that was previously set on the specified by recordKey row. */
+            ClearRowError(recordKey: number, id: number): void;
+            /** Clear all errors in the specified row. */
+            ClearAllErrorsOnRow(recordKey: number): void;
+            /** Get error message for the specified cell.
+                If many errors are set on the cell, only first is returned.
+                If there are no errors in the cell, returns null. */
+            GetCellErrorMessage(recordKey: number, fieldKey: string): string;
+            /** Get error message for the specified row.
+                If many errors are set on the row, only first is returned.
+                If there are no errors in the row, returns null. */
+            GetRowErrorMessage(recordKey: number): string;
+            /** This method is used mostly when you have a rather tall JSGrid and you want to ensure that user sees
+                that some error has occured.
+                You can specify the minId or/and filter function.
+                If minId is specified, method searches for an error with first id which is greater than minId.
+                Scrolls to the Returns the id of the found record.
+                If there aren't any errors, that satisfy the conditions, method does nothing and returns null. */
+            ScrollToAndExpandNextError(minId?: number, fnFilter?: { (recordKey: number, fieldKey: string, id: number): boolean }): any;
+            /** Same as ScrollToAndExpandNextError, but searches within the specified record.
+                recordKey should be not null, otherwise you'll get an exception.
+                bDontExpand controls whether the error tooltip will be shown (if bDontExpand=true, tooltip will not be shown). */
+            ScrollToAndExpandNextErrorOnRecord(minId?: number, recordKey?: number, fnFilter?: { (recordKey: number, fieldKey: string, id: number): boolean }, bDontExpand?: boolean): any;
+
+            GetFocusedItem(): any;
+            SendKeyDownEvent(eventInfo: Sys.UI.DomEvent): any;
+            /** Moves cursor to entry record (the row that is used to add new records) */
+            JumpToEntryRecord(): void;
+
+            SelectRowRange(rowIdx1: number, rowIdx2: number, bAppend: boolean, optPaneId?: string): void;
+            SelectColumnRange(colIdx1: number, colIdx2: number, bAppend: boolean, optPaneId?: string): void;
+            SelectCellRange(rowIdx1: number, rowIdx2: number, colIdx1: number, colIdx2: number, bAppend: boolean, optPaneId?: string): void;
+            SelectRowRangeByKey(rowKey1: any, rowKey2: any, bAppend: boolean, optPaneId?: string): void;
+            SelectColumnRangeByKey(colKey1: any, colKey2: any, bAppend: boolean, optPaneId?: string): void;
+            SelectCellRangeByKey(recordKey1: string, recordKey2: string, colKey1: any, colKey2: any, bAppend: boolean, optPaneId?: string): void;
+
+            ChangeKeys(oldKey: any, newKey: any): void;
+            GetSelectedRowRanges(optPaneId?: any): any;
+            GetSelectedColumnRanges(optPaneId?: any): any;
+            GetSelectedRanges(optPaneId?: any): any;
+            MarkPropUpdateInvalid(recordKey: number, fieldKey: any, changeKey: any, optErrorMsg?: any): any;
+            GetCurrentChangeKey(): any;
+            CreateAndSynchronizeToNewChangeKey(): any;
+            CreateDataUpdateCmd(bUseCustomInitialUpdate: boolean): any;
+            IsChangeKeyApplied(changeKey: any): any;
+            GetChangeKeyForVersion(version: any): any;
+            TryReadPropForChangeKey(recordKey: number, fieldKey: any, changeKey: any): any;
+            GetUnfilteredHierarchyMap(): any;
+            GetHierarchyState(bDecompressGuidKeys: boolean): any;
+            IsGroupingRecordKey(recordKey: number): boolean;
+            IsGroupingColumnKey(recordKey: number): boolean;
+            GetSelectedRecordKeys(bDuplicatesAllowed: boolean): any;
+            /** Cut data from currently selected cells into the clipboard.
+                Will not work if current selection contains entry row or readonly cells. */
+            CutToClipboard(): void;
+            /** Copy data from currently selected cells into the clipboard. */
+            CopyToClipboard(): void;
+            /** Paste data from clipboard into currently selected cells. */
+            PasteFromClipboard(): void;
+            TryRestoreFocusAfterInsertOrDeleteColumns(origFocus: any): void;
+            /** Get undo manager for performing undo/redo operations programmatically. */
+            GetUndoManager(): SP.JsGrid.CommandManager;
+            /** Gets number of records visible in the current view, including the entry row. */
+            GetVisibleRecordCount(): number;
+            /** Returns index of the system RecordIndicatorCheckBoxColumn. If not present in the view, returns null. */
+            GetRecordIndicatorCheckBoxColumnIndex(): number;
+            /** Determines if the specified record is visible in the current view. */
+            IsRecordVisibleInView(recordKey: number): boolean;
+            GetHierarchyQueryObject(): any;
+            GetSpCsrRenderCtx(): any;
+        }
+
+        export interface IChangeKey {
+            Reserve(): void;
+            Release(): void;
+            GetVersionNumber(): number;
+            CompareTo(changeKey: IChangeKey): number;
+        }
+
+        export enum EventType {
+            OnCellFocusChanged,
+            OnRowFocusChanged,
+            OnCellEditBegin,
+            OnCellEditCompleted,
+            OnRightClick,
+            OnPropertyChanged,
+            OnRecordInserted,
+            OnRecordDeleted,
+            OnRecordChecked,
+            OnCellErrorStateChanged,
+            OnEntryRecordAdded,
+            OnEntryRecordCommitted,
+            OnEntryRecordPropertyChanged,
+            OnRowErrorStateChanged,
+            OnDoubleClick,
+            OnBeforeGridDispose,
+            OnSingleCellClick,
+            OnInitialChangesForChangeKeyComplete,
+            OnVacateChange,
+            OnGridErrorStateChanged,
+            OnSingleCellKeyDown,
+            OnRecordsReordered,
+            OnBeforePropertyChanged,
+            OnRowEscape,
+            OnBeginRenameColumn,
+            OnEndRenameColumn,
+            OnPasteBegin,
+            OnPasteEnd,
+            OnBeginRedoDataUpdateChange,
+            OnBeginUndoDataUpdateChange
+        }
+
+        export enum DelegateType {
+            ExpandColumnMenu,
+            AddColumnMenuItems,
+            Sort,
+            Filter,
+            InsertRecord,
+            DeleteRecords,
+            IndentRecords,
+            OutdentRecords,
+            IsRecordInsertInView,
+            ExpandDelayLoadedHierarchyNode,
+            AutoFilter,
+            ExpandConflictResolution,
+            GetAutoFilterEntries,
+            LaunchFilterDialog,
+            ShowColumnConfigurationDialog,
+            GetRecordEditMode,
+            GetGridRowStyleId,
+            CreateEntryRecord,
+            TryInsertEntryRecord,
+            WillAddColumnMenuItems,
+            NextPage,
+            AddNewColumn,
+            RemoveColumnFromView,
+            ReorderColumnPositionInView,
+            TryCreateProvisionalRecord,
+            CanReorderRecords,
+            AddNewColumnMenuItems,
+            TryBeginPaste,
+            AllowSelectionChange,
+            GetFieldEditMode,
+            GetFieldReadOnlyActiveState,
+            OnBeforeRecordReordered
+        }
+
+        export enum ClickContext {
+            SelectAllSquare,
+            RowHeader,
+            ColumnHeader,
+            Cell,
+            Gantt,
+            Other
+        }
+
+        export class RowHeaderState {
+            constructor(id: string, img: SP.JsGrid.Image, priority: SP.JsGrid.RowHeaderStatePriorities, tooltip: string, fnOnClick: { (eventInfo: Sys.UI.DomEvent, recordKey: number): void });
+            GetId(): string;
+            GetImg(): SP.JsGrid.Image;
+            GetPriority(): SP.JsGrid.RowHeaderStatePriorities;
+            GetOnClick(): { (eventInfo: Sys.UI.DomEvent, recordKey: number): void };
+            GetTooltip(): string;
+            toString(): string;
+        }
+
+        export class Image {
+            /** optOuterCssNames and optImgCssNames are strings that contain css class names separated by spaces.
+                optImgCssNames are applied to the img tag.
+                if bIsClustered, image is rendered inside div, and optOuterCssNames are applied to the div. */
+            constructor(imgSrc: string, bIsClustered: boolean, optOuterCssNames: string, optImgCssNames: string, bIsAnimated: boolean);
+            imgSrc: string;
+            bIsClustered: boolean;
+            optOuterCssNames: string;
+            imgCssNames: string;
+            bIsAnimated: boolean;
+            /** Renders the image with specified alternative text and on-click handler.
+                If bHideTooltip == false, then alternative text is also shown as the tooltip (title attribute). */
+            Render(altText: string, clickFn: { (eventInfo: Sys.UI.DomEvent): void }, bHideTooltip: boolean): HTMLElement;
+        }
+
+        export interface IEventArgs { }
+        export module EventArgs {
+            export class OnEntryRecordAdded implements IEventArgs {
+                constructor(recordKey: number);
+                recordKey: number;
+            }
+
+            export class CellFocusChanged implements IEventArgs {
+                constructor(newRecordKey: number, newFieldKey: string, oldRecordKey: number, oldFieldKey: string);
+                newRecordKey: number;
+                newFieldKey: string;
+                oldRecordKey: number;
+                oldFieldKey: string;
+            }
+            export class RowFocusChanged implements IEventArgs {
+                constructor(newRecordKey: number, oldRecordKey: number);
+                newRecordKey: number;
+                oldRecordKey: number;
+            }
+            export class CellEditBegin implements IEventArgs {
+                constructor(recordKey: number, fieldKey: string);
+                recordKey: number;
+                fieldKey: string;
+            }
+            export class CellEditCompleted implements IEventArgs {
+                constructor(recordKey: number, fieldKey: string, changeKey: JsGrid.IChangeKey, bCancelled: boolean);
+                recordKey: number;
+                fieldKey: string;
+                changeKey: JsGrid.IChangeKey;
+                bCancelled: boolean;
+            }
+            export class Click implements IEventArgs {
+                constructor(eventInfo: Sys.UI.DomEvent, context: JsGrid.ClickContext, recordKey: number, fieldKey: string);
+                eventInfo: Sys.UI.DomEvent;
+                context: JsGrid.ClickContext;
+                recordKey: number;
+                fieldKey: string;
+            }
+            export class PropertyChanged implements IEventArgs {
+                constructor(recordKey: number, fieldKey: string, oldProp: SP.JsGrid.Internal.PropertyUpdate, newProp: SP.JsGrid.Internal.PropertyUpdate, propType: SP.JsGrid.IPropertyType, changeKey: SP.JsGrid.IChangeKey, validationState: SP.JsGrid.ValidationState);
+                recordKey: number;
+                fieldKey: string;
+                oldProp: SP.JsGrid.Internal.PropertyUpdate;
+                newProp: SP.JsGrid.Internal.PropertyUpdate;
+                propType: SP.JsGrid.IPropertyType;
+                changeKey: SP.JsGrid.IChangeKey;
+                validationState: SP.JsGrid.ValidationState;
+            }
+            export class RecordInserted implements IEventArgs {
+                constructor(recordKey: number, recordIdx: number, afterRecordKey: number, changeKey: JsGrid.IChangeKey);
+                recordKey: number;
+                recordIdx: number;
+                afterRecordKey: number;
+                changeKey: JsGrid.IChangeKey;
+            }
+            export class RecordDeleted implements IEventArgs {
+                constructor(recordKey: number, recordIdx: number, changeKey: JsGrid.IChangeKey);
+                recordKey: number;
+                recordIdx: number;
+                changeKey: JsGrid.IChangeKey;
+            }
+            export class RecordChecked implements IEventArgs {
+                constructor(recordKeySet: SP.Utilities.Set, bChecked: boolean);
+                recordKeySet: SP.Utilities.Set;
+                bChecked: boolean;
+            }
+            export class OnCellErrorStateChanged implements IEventArgs {
+                constructor(recordKey: number, fieldKey: string, bAddingError: boolean, bCellCurrentlyHasError: boolean, bCellHadError: boolean, errorId: number);
+                recordKey: number;
+                fieldKey: string;
+                bAddingError: boolean;
+                bCellCurrentlyHasError: boolean;
+                bCellHadError: boolean;
+                errorId: number;
+            }
+            export class OnRowErrorStateChanged implements IEventArgs {
+                constructor(recordKey: number, bAddingError: boolean, bErrorCurrentlyInRow: boolean, bRowHadError: boolean, errorId: number, message: string);
+                recordKey: number;
+                bAddingError: boolean;
+                bErrorCurrentlyInRow: boolean;
+                bRowHadError: boolean;
+                errorId: number;
+                message: string;
+            }
+            export class OnEntryRecordCommitted implements IEventArgs {
+                constructor(origRecKey: string, recordKey: number, changeKey: JsGrid.IChangeKey);
+                originalRecordKey: number;
+                recordKey: number;
+                changeKey: JsGrid.IChangeKey
+            }
+            export class SingleCellClick implements IEventArgs {
+                constructor(eventInfo: Sys.UI.DomEvent, recordKey: number, fieldKey: string);
+                eventInfo: Sys.UI.DomEvent;
+                recordKey: number;
+                fieldKey: string;
+            }
+            export class PendingChangeKeyInitiallyComplete implements IEventArgs {
+                constructor(changeKey: JsGrid.IChangeKey);
+                changeKey: JsGrid.IChangeKey
+            }
+            export class VacateChange implements IEventArgs {
+                constructor(changeKey: JsGrid.IChangeKey);
+                changeKey: JsGrid.IChangeKey
+            }
+            export class GridErrorStateChanged implements IEventArgs {
+                constructor(bAnyErrors: boolean);
+                bAnyErrors: boolean;
+            }
+            export class SingleCellKeyDown implements IEventArgs {
+                constructor(eventInfo: Sys.UI.DomEvent, recordKey: number, fieldKey: string);
+                eventInfo: Sys.UI.DomEvent;
+                recordKey: number;
+                fieldKey: string;
+            }
+            export class OnRecordsReordered implements IEventArgs {
+                constructor(recordKeys: string[], changeKey: JsGrid.IChangeKey);
+                reorderedKeys: string[];
+                changeKey: JsGrid.IChangeKey;
+            }
+            export class OnRowEscape implements IEventArgs {
+                constructor(recordKey: number);
+                recordKey: number;
+            }
+            export class OnEndRenameColumn implements IEventArgs {
+                constructor(columnKey: string, originalColumnTitle: string, newColumnTitle: string);
+                columnKey: string;
+                originalColumnTitle: string;
+                newColumnTitle: string;
+            }
+            export class OnBeginRedoDataUpdateChange implements IEventArgs {
+                constructor(changeKey: JsGrid.IChangeKey);
+                changeKey: JsGrid.IChangeKey
+            }
+            export class OnBeginUndoDataUpdateChange implements IEventArgs {
+                constructor(changeKey: JsGrid.IChangeKey);
+                changeKey: JsGrid.IChangeKey
+            }
+
+        }
+
+        export module JsGridControl {
+            export class Parameters {
+                tableCache: SP.JsGrid.TableCache;
+                name: any; // TODO
+                bNotificationsEnabled: boolean;
+                styleManager: IStyleManager;
+                minHeaderHeight: number;
+                minRowHeight: number;
+                commandMgr: SP.JsGrid.CommandManager;
+                enabledRowHeaderAutoStates: SP.Utilities.Set;
+                tableViewParams: TableViewParameters;
+                bEnableDiffTracking: boolean;
+                isRTL: boolean;
+
+            }
+            export class TableViewParameters {
+                paneLayout: SP.JsGrid.PaneLayout;
+                defaultEditMode: SP.JsGrid.EditMode;
+                allowedSelectionTypes: SP.JsGrid.SelectionTypeFlags;
+
+                bMovableColumns: boolean;
+                bResizableColumns: boolean;
+                bHidableColumns: boolean;
+                bSortableColumns: boolean;
+                bAutoFilterableColumns: boolean;
+                bRowHeadersEnabled: boolean;
+                bRecordIndicatorCheckboxesEnabled: boolean;
+                bFillControlEnabled: boolean;
+                bEditingEnabled: boolean;
+                bNewRowEnabled: boolean;
+
+                checkSelectionCheckboxHiddenRecordKeys: string[];
+                checkSelectionCheckboxDisabledRecordKeys: string[];
+                checkSelectionCheckedRecordKeys: string[];
+
+                keyFieldName: string;
+                gridFieldMap: { [name: string]: GridField };
+
+                columns: ColumnInfoCollection;
+                messageOverrides: any; //TODO
+                operationalConstantsFieldKeyMap: any; //TODO
+
+                ganttParams: GanttParameters;
+                pivotedGridParams: PivotedGridParameters;
+                rowViewParams: RowViewParameters;
+            }
+            export class PivotedGridParameters {
+        	    //this.dateRange = null;
+             //   this.ganttBarStyles = null;
+             //   this.ganttZoomLevel = 3;
+             //   this.fnRenderGanttRow = null;
+             //   this.fnGetGanttBarDate = null;
+             //   this.fnGetGanttBarStyleIds = null;
+             //   this.fnGetPredecessors = null;
+             //   this.workDayStart = _spRegionalSettings.workDayStart;
+             //   this.workDayEnd = _spRegionalSettings.workDayEnd;
+             //   this.fieldKeyRedrawFilter = null;
+            }
+
+            export class GanttParameters {
+                columns: ColumnInfoCollection;
+            }
+
+            export class RowViewParameters {
+                hierarchyMode: SP.JsGrid.HierarchyMode;
+                view: any;
+
+                topViewIdx: number;
+
+
+                groupingLevel: any;
+                groupingRecordKeyPrefix: any;
+                autoFilterState: any;
+                unfilteredHierarchyMgr: any;
+                hierarchyDelayLoadKeys: any;
+                hierarchyState: any;
+                sortState: any;
+                filterState: any;
+                autoFilterEntries: any;
+                filteredDescCounts: any;
+
+            }
+        }
+
+        export class CommandManager {
+            // todo
+        }
+
+        export class TableCache {
+            // todo
+        }
+
+        export interface IStyleManager {
+            gridPaneStyle: IStyleType.GridPane;
+            columnHeaderStyleCollection: {
+                normal: IStyleType.Header;
+                normalHover: IStyleType.Header;
+                partSelected: IStyleType.Header;
+                partSelectedHover: IStyleType.Header;
+                allSelected: IStyleType.Header;
+                allSelectedHover: IStyleType.Header;
+            };
+            rowHeaderStyleCollection: {
+                normal: IStyleType.Header;
+                normalHover: IStyleType.Header;
+                partSelected: IStyleType.Header;
+                partSelectedHover: IStyleType.Header;
+                allSelected: IStyleType.Header;
+                allSelectedHover: IStyleType.Header;
+            };
+            splitterStyleCollection: {
+                normal: IStyleType.Splitter;
+                normalHandle: IStyleType.SplitterHandle;
+                hover: IStyleType.Splitter;
+                hoverHandle: IStyleType.SplitterHandle;
+                dra: IStyleType.Splitter;
+                dragHandle: IStyleType.SplitterHandle;
+            };
+            defaultCellStyle: IStyleType.Cell;
+            readOnlyCellStyle: IStyleType.Cell;
+            readOnlyFocusedCellStyle: IStyleType.Cell;
+            timescaleTierStyle: IStyleType.TimescaleTier;
+            groupingStyles: any[];
+            widgetDockStyle: IStyleType.Widget;
+            widgetDockHoverStyle: IStyleType.Widget;
+            widgetDockPressedStyle: IStyleType.Widget;
+            RegisterCellStyle(styleId: string, cellStyle: IStyleType.Cell): void;
+            GetCellStyle(styleId: string): IStyleType.Cell;
+            UpdateSplitterStyleFromCss(styleObject: IStyleType.Splitter, splitterStyleNameCollection: any): void;
+            UpdateHeaderStyleFromCss(styleObject: IStyleType.Header, headerStyleNameCol: any): void;
+            UpdateGridPaneStyleFromCss(styleObject: IStyleType.GridPane, gridStyleNameCollection: any): void;
+            UpdateDefaultCellStyleFromCss(styleObject: IStyleType.Cell, cssClass: string): void;
+            UpdateGroupStylesFromCss(styleObject: IStyleType.Cell, prefix: string): void;
+        }
+
+        export interface IStyleType { }
+        export module IStyleType {
+            export interface Splitter extends IStyleType {
+                outerBorderColor: any;
+                leftInnerBorderColor: any;
+                innerBorderColor: any;
+                backgroundColor: any;
+            }
+            export interface SplitterHandle extends IStyleType {
+                outerBorderColor: any;
+                leftInnerBorderColor: any;
+                innerBorderColor: any;
+                backgroundColor: any;
+                gripUpperColor: any;
+                gripLowerColor: any;
+            }
+            export interface GridPane {
+                verticalBorderColor: any;
+                verticalBorderStyle: any;
+                horizontalBorderColor: any;
+                horizontalBorderStyle: any;
+                backgroundColor: any;
+                columnDropIndicatorColor: any;
+                rowDropIndicatorColor: any;
+                linkColor: any;
+                visitedLinkColor: any;
+                copyRectForeBorderColor: any;
+                copyRectBackBorderColor: any;
+                focusRectBorderColor: any;
+                selectionRectBorderColor: any;
+                selectedCellBgColor: any;
+                readonlySelectionRectBorderColor: any;
+                changeHighlightCellBgColor: any;
+                fillRectBorderColor: any;
+                errorRectBorderColor: any;
+            }
+            export interface Header {
+                font: any;
+                fontSize: any;
+                fontWeight: any;
+                textColor: any;
+                backgroundColor: any;
+                outerBorderColor: any;
+                innerBorderColor: any;
+                eyeBrowBorderColor: any;
+                eyeBrowColor: any;
+                menuColor: any;
+                menuBorderColor: any;
+                resizeColor: any;
+                resizeBorderColor: any;
+                menuHoverColor: any;
+                menuHoverBorderColor: any;
+                resizeHoverColor: any;
+                resizeHoverBorderColor: any;
+                eyeBrowHoverColor: any;
+                eyeBrowHoverBorderColor: any;
+                elementClickColor: any;
+                elementClickBorderColor: any;
+            }
+            export interface Cell extends IStyleType {
+                /** -> CSS font-family */
+                font: any;
+                /** -> CSS font-size */
+                fontSize: any;
+                /** -> CSS font-weight */
+                fontWeight: any;
+                /** -> CSS font-style */
+                fontStyle: any;
+                /** -> CSS color */
+                textColor: any;
+                /** -> CSS background-color */
+                backgroundColor: any;
+                /** -> CSS text-align */
+                textAlign: any;
+            }
+            export interface Widget {
+                backgroundColor: any;
+                borderColor: any;
+            }
+            export interface RowHeaderStyle {
+                backgroundColor: any;
+                outerBorderColor: any;
+                innerBorderColor: any;
+            }
+            export interface TimescaleTier {
+                font: any;
+                fontSize: any;
+                fontWeight: any;
+                textColor: any;
+                backgroundColor: any;
+                verticalBorderColor: any;
+                verticalBorderStyle: any;
+                horizontalBorderColor: any;
+                horizontalBorderStyle: any;
+                outerBorderColor: any;
+                todayLineColor: any;
+            }
+        }
+
+        export class Style {
+
+            static Type: {
+                Splitter: IStyleType.Splitter;
+                SplitterHandle: IStyleType.SplitterHandle;
+                GridPane: IStyleType.GridPane;
+                Header: IStyleType.Header;
+                RowHeaderStyle: IStyleType.RowHeaderStyle;
+                TimescaleTier: IStyleType.TimescaleTier;
+                Cell: IStyleType.Cell;
+                Widget: IStyleType.Widget;
+            };
+
+            static SetRTL: { (rtlObject: any): void; };
+            static MakeJsGridStyleManager: { (): IStyleManager };
+            static CreateStyleFromCss: { (styleType: IStyleType, cssStyleName: string, optExistingStyle?: any, optClassId?: any): any; };
+            static CreateStyle: { (styleType: IStyleType, styleProps: any): any; };
+            static MergeCellStyles: { (majorStyle: any, minorStyle: any): any; };
+            static ApplyCellStyle: { (td: HTMLTableCellElement, style: any): void; };
+            static ApplyRowHeaderStyle: { (domObj: HTMLElement, style: any, fnGetHeaderSibling: Function): void; };
+            static ApplyCornerHeaderBorderStyle: { (domObj: HTMLElement, colStyle: any, rowStyle: any): void; };
+            static ApplyHeaderInnerBorderStyle: { (domObj: HTMLElement, bIsRowHeader: any, headerObject: any): void };
+            static ApplyColumnContextMenuStyle: { (domObj: HTMLElement, style: any): void };
+            static ApplySplitterStyle: { (domObj: HTMLElement, style: any): void };
+            static MakeBorderString: { (width: number, style: string, color: string): string };
+            static GetCellStyleDefaultBackgroundColor: { (): string };
+
+        }
+
+        export class ColumnInfoCollection {
+            constructor(colInfoArray: any[]);
+            GetColumnByKey(key: string): any;
+            GetColumnArray(bVisibleOnly?: boolean): any[];
+            GetColumnMap(): { [key: string]: any; };
+            AppendColumn(colInfo: any): void;
+            InsertColumnAt(idx: number, colInfo: any): void;
+            RemoveColumn(key: string): void;
+            /** Returns null if the specified column is not found or hidden. */
+            GetColumnPosition(key: string): number;
+        }
+
+        export class ColumnInfo {
+            constructor(name: string, imgSrc: string, key: string, width: number);
+            /** Column title */
+            name: string;
+            /** Column image URL.
+                If not null, the column header cell will show the image instead of title text.
+                If the title is defined at the same time as the imgSrc, the title will be shown as a tooltip. */
+            imgSrc: string;
+            /** Custom image HTML.
+                If you define this in addition to the imgSrc attribute, then instead of standard img tag
+                the custom HTML defined by this field will be used. */
+            imgRawSrc: string;
+            /** Column identifier */
+            columnKey: string;
+            /** Field keys of the fields, that are displayed in this column */
+            fieldKeys: string[];
+            /** Width of the column */
+            width: number;
+            bOpenMenuOnContentClick: boolean;
+            /** always returns 'column' */
+            ColumnType(): string;
+            /** true by default */
+            isVisible: boolean;
+            /** true by default */
+            isHidable: boolean;
+            /** true by default */
+            isResizable: boolean;
+            /** true by default */
+            isSortable: boolean;
+            /** true by default */
+            isAutoFilterable: boolean;
+            /** false by default */
+            isFooter: boolean;
+            /** determine whether the cells in this column should be clickable */
+            fnShouldLinkSingleValue: { (record: IRecord, fieldKey: string, dataValue: any, localizedValue: any): boolean };
+            /** if a particular cell is determined as clickable by fnShouldLinkSingleValue, this function will be called when the cell is clicked */
+            fnSingleValueClicked: { (record: IRecord, fieldKey: string, dataValue: any, localizedValue: any): void };
+            /** this is used when you need to make some of the cells in the column readonly, but at the same time keep others editable */
+            fnGetCellEditMode: { (record: IRecord, fieldKey: string): JsGrid.EditMode };
+            /** this function should return name of the display control for the given cell in the column
+                the name should be previously associated with the display control via SP.JsGrid.PropertyType.Utils.RegisterDisplayControl method */
+            fnGetDisplayControlName: { (record: IRecord, fieldKey: string): string };
+            /** this function should return name of the edit control for the given cell in the column
+                the name should be previously associated with the edit control via SP.JsGrid.PropertyType.Utils.RegisterEditControl method */
+            fnGetEditControlName: { (record: IRecord, fieldKey: string): string };
+            /** set widget control names for a particular cell
+                widgets are basically in-cell buttons with associated popup controls, e.g. date selector or address book button
+                standard widget ids are defined in the SP.JsGrid.WidgetControl.Type enumeration
+                it is also possible to create your own widgets
+                usually this function is not used, and instead, widget control names are determined via PropertyType
+             */
+            fnGetWidgetControlNames: { (record: IRecord, fieldKey: string): string[] };
+            /** this function should return id of the style for the given cell in the column
+                styles and their ids are registered for a JsGridControl via jsGridParams.styleManager.RegisterCellStyle method */
+            fnGetCellStyleId: { (record: IRecord, fieldKey: string, dataValue: any): string };
+            /** set custom tooltip for the given cell in the column. by default, localized value is displayed as the tooltip */
+            fnGetSingleValueTooltip: { (record: IRecord, fieldKey: string, dataValue: any, localizedValue: any): string };
+        }
+
+
+        export interface IRecord {
+            /** True if this is an entry row */
+            bIsNewRow: boolean;
+
+            /** Please use SetProp and GetProp */
+            properties: { [fieldKey: string]: IPropertyBase };
+
+            /** returns recordKey */
+            key(): number;
+            /** returns raw data value for the specified field */
+            GetDataValue(fieldKey: string): any;
+            /** returns localized text value for the specified field */
+            GetLocalizedValue(fieldKey: string): string;
+            /** returns true if data value for the specified field is available */
+            HasDataValue(fieldKey: string): boolean;
+            /** returns true if localized text value for the specified field is available */
+            HasLocalizedValue(fieldKey: string): boolean;
+
+            GetProp(fieldKey: string): IPropertyBase;
+            SetProp(fieldKey: string, prop: IPropertyBase): void;
+
+            /** Update the specified field with the specified value */
+            AddFieldValue(fieldKey: string, value: any): void;
+            /** Removes value of the specified field.
+                Does not refresh the view. */
+            RemoveFieldValue(fieldKey: string): void;
+        }
+
+
+        export class RecordFactory {
+            constructor(gridFieldMap: any, keyColumnName: string, fnGetPropType: any);
+            gridFieldMap: any;
+            /** Create a new record */
+            MakeRecord(dataPropMap: any, localizedPropMap: any, bKeepRawData: boolean): IRecord;
+        }
+
+        export interface IPropertyBase {
+            HasLocalizedValue(): boolean;
+            HasDataValue(): boolean;
+            Clone(): IPropertyBase;
+            /** dataValue actually is cloned */
+            Update(dataValue: any, localizedValue: string): void;
+            GetLocalized(): string;
+            GetData(): any;
+        }
+
+        export class Property {
+            static MakeProperty(dataValue: any, localizedValue: string, bHasDataValue: boolean, bHasLocalizedValue: boolean, propType: any): IPropertyBase;
+            static MakePropertyFromGridField(gridField: any, dataValue: any, localizedVal: string, optPropType?: any): IPropertyBase;
+        }
+
+        export class GridField {
+            constructor(key: string, hasDataValue: boolean, hasLocalizedValue: boolean, textDirection: TextDirection, defaultCellStyleId?: any, editMode?: EditMode, dateOnly?: boolean, csrInfo?: any);
+            key: string;
+            hasDataValue: boolean;
+            hasLocalizedValue: boolean;
+            textDirection: TextDirection;
+            dateOnly: boolean;
+            csrInfo: any;
+            GetEditMode(): EditMode;
+            SetEditMode(mode: EditMode): void;
+            GetDefaultCellStyleId(): any;
+            CompareSingleDataEqual(dataValue1: any, dataValue2: any): boolean;
+            GetPropType(): any;
+            GetSingleValuePropType(): any;
+            GetMultiValuePropType(): any;
+            SetSingleValuePropType(svPropType: any): void;
+            SetIsMultiValue(listSeparator: any): void;
+            GetIsMultiValue(): boolean;
+        }
+
+        export interface IEditActorGridContext {
+            jsGridObj: JsGridControl;
+            parentNode: HTMLElement;
+            styleManager: IStyleManager;
+            RTL: any;
+            emptyValue: any;
+            bLightFocus: boolean;
+            OnKeyDown: { (domEvent: Sys.UI.DomEvent): void; };
+        }
+
+        export interface IEditControlGridContext extends IEditActorGridContext {
+            OnActivateActor(): void;
+            OnDeactivateActor(): void;
+        }
+
+        export interface IPropertyType {
+            ID: string;
+            BeginValidateNormalizeConvert(recordKey: number, fieldKey: string, newValue: any, bIsLocalized: boolean, fnCallback: { (args: { isValid: boolean; dataValue: any; normalizedLocValue: string }): void; }, fnError: any): void;
+        }
+
+        export interface ILookupPropertyType extends IPropertyType {
+            GetItems(fnCallback: any): void;
+            DataToLocalized(dataValue: any): string;
+            LocalizedToData(localized: string): any;
+            GetImageSource(record: IRecord, dataValue: any): string;
+            GetStyleId(dataValue: any): string;
+            GetIsLimitedToList(): boolean;
+            GetSerializableLookupPropType(): { items: any[]; id: string; bLimitToList: boolean };
+        }
+
+        export interface IMultiValuePropertyType extends IPropertyType {
+            bMultiValue: boolean;
+            separator: string;
+            singleValuePropType: string;
+            GetSerializableMultiValuePropType(): { singleValuePropTypeID: string; separatorChar: string; bDelayInit: boolean; };
+            InitSingleValuePropType(): void;
+            LocStrToLocStrArray(locStr: string): string[];
+            LocStrArrayToLocStr(locStrArray: string[]): string;
+        }
+
+        export class PropertyType {
+            /** Lookup property type factory, based on SP.JsGrid.PropertyType.LookupTable class.
+                displayCtrlName should be one of the following: SP.JsGrid.DisplayControl.Type.Image, SP.JsGrid.DisplayControl.Type.ImageText or SP.JsGrid.DisplayControl.Type.Text
+             */
+            static RegisterNewLookupPropType(id: string, items: any[], displayCtrlName: string, bLimitToList: boolean): void;
+
+            /** Register a custom property type. */
+            static RegisterNewCustomPropType(propType: IPropertyType, displayCtrlName: string, editControlName: string, widgetControlNames: string[]): void;
+
+            /** Register a custom property type, where display and edit controls, and also widgets, are derived from the specified parent property type. */
+            static RegisterNewDerivedCustomPropType(propType: IPropertyType, baseTypeName: string): void;
+        }
+
+        export module PropertyType {
+            export class String implements IPropertyType {
+                constructor();
+                ID: string;
+                BeginValidateNormalizeConvert(recordKey: number, fieldKey: string, newValue: any, bIsLocalized: boolean, fnCallback: { (args: { isValid: boolean; dataValue: any; normalizedLocValue: string }): void; }, fnError: any): void;
+                toString(): string;
+            }
+            export class LookupTable implements ILookupPropertyType {
+                constructor(items: any[], id: string, bLimitToList: boolean);
+                ID: string;
+                BeginValidateNormalizeConvert(recordKey: number, fieldKey: string, newValue: any, bIsLocalized: boolean, fnCallback: { (args: { isValid: boolean; dataValue: any; normalizedLocValue: string }): void; }, fnError: any): void;
+                GetItems(fnCallback: any): void;
+                DataToLocalized(dataValue: any): string;
+                LocalizedToData(localized: string): any;
+                GetImageSource(record: IRecord, dataValue: any): string;
+                GetStyleId(dataValue: any): string;
+                GetIsLimitedToList(): boolean;
+                GetSerializableLookupPropType(): { items: any[]; id: string; bLimitToList: boolean };
+
+            }
+            export class CheckBoxBoolean implements IPropertyType {
+                constructor();
+                ID: string;
+                BeginValidateNormalizeConvert(recordKey: number, fieldKey: string, newValue: any, bIsLocalized: boolean, fnCallback: { (args: { isValid: boolean; dataValue: any; normalizedLocValue: string }): void; }, fnError: any): void;
+                DataToLocalized(dataValue: any): string;
+                GetBool(dataValue: any): boolean;
+                toString(): string;
+            }
+            export class DropDownBoolean implements IPropertyType {
+                constructor();
+                ID: string;
+                BeginValidateNormalizeConvert(recordKey: number, fieldKey: string, newValue: any, bIsLocalized: boolean, fnCallback: { (args: { isValid: boolean; dataValue: any; normalizedLocValue: string }): void; }, fnError: any): void;
+                DataToLocalized(dataValue: any): string;
+                GetBool(dataValue: any): boolean;
+                toString(): string;
+            }
+            export class MultiValuePropType implements IMultiValuePropertyType {
+                ID: string;
+                BeginValidateNormalizeConvert(recordKey: number, fieldKey: string, newValue: any, bIsLocalized: boolean, fnCallback: { (args: { isValid: boolean; dataValue: any; normalizedLocValue: string }): void; }, fnError: any): void;
+                bMultiValue: boolean;
+                separator: string;
+                singleValuePropType: string;
+                GetSerializableMultiValuePropType(): { singleValuePropTypeID: string; separatorChar: string; bDelayInit: boolean; };
+                InitSingleValuePropType(): void;
+                LocStrToLocStrArray(locStr: string): string[];
+                LocStrArrayToLocStr(locStrArray: string[]): string;
+            }
+            export class HyperLink implements IPropertyType {
+                ID: string;
+                BeginValidateNormalizeConvert(recordKey: number, fieldKey: string, newValue: any, bIsLocalized: boolean, fnCallback: { (args: { isValid: boolean; dataValue: any; normalizedLocValue: string }): void; }, fnError: any): void;
+                bHyperlink: boolean;
+                DataToLocalized(dataValue: any): string;
+                GetAddress(dataValue: any): string;
+                /** Returns string like this: '"http://site.com, Site title"' */
+                GetCopyValue(record: IRecord, dataValue: any, locValue: string): string;
+                toString(): string;
+            }
+
+
+            export class Utils {
+                static RegisterDisplayControl(name: string, singleton: any, requiredFunctionNames: string[]): void;
+                static RegisterEditControl(name: string, factory: (gridContext: IEditControlGridContext, gridTextInputElement: HTMLElement) => IEditControl, requiredFunctionNames: string[]): void;
+                static RegisterWidgetControl(name: string, factory: { (ddContext: any): IPropertyType; }, requiredFunctionNames: string[]): void;
+
+                static UpdateDisplayControlForPropType(propTypeName: string, displayControlType: string): void;
+            }
+        }
+
+        export module WidgetControl {
+            export class Type {
+                static Demo: string;
+                static Date: string;
+                static AddressBook: string;
+                static Hyperlink: string;
+            }
+        }
+
+        export module Internal {
+            export class DiffTracker {
+                constructor(objBag: any, fnGetChange: Function);
+                ExternalAPI: {
+                    AnyChanges(): boolean;
+                    ChangeKeySliceInfo(): any;
+                    ChangeQuery(): any;
+                    EventSliceInfo(): any;
+                    GetChanges(optStartEvent: any, optEndEvent: any, optRecordKeys: any, bFirstStartEvent: boolean, bStartInclusive: boolean, bEndInclusive: boolean, bIncludeInvalidPropUpdates: boolean, bLastEndEvent: boolean): any;
+                    GetChangesAsJson(changeQuery: any, optfnPreProcessUpdateForSerialize?: any): string;
+                    GetUniquePropertyChanges(changeQuery: any, optfnFilter?: any): any;
+                    RegisterEvent(changeKey: IChangeKey, eventObject: any): void;
+                    UnregisterEvent(changeKey: IChangeKey, eventObject: any): void;
+                };
+                Clear(): void;
+                NotifySynchronizeToChange(changeKey: IChangeKey): void;
+                NotifyRollbackChange(changeKey: IChangeKey): void;
+                NotifyVacateChange(changeKey: IChangeKey): void;
+            }
+
+            export class PropertyUpdate implements IValue {
+                constructor(data: any, localized: string);
+                data: any;
+                localized: string;
+            }
+        }
+
+        export interface IEditActorCellContext {
+            propType: IPropertyType;
+            originalValue: IValue;
+            record: IRecord;
+            column: ColumnInfo;
+            field: GridField;
+            fieldKey: string;
+            cellExpandSpace: { left: number; top: number; fight: number; bottom: number; };
+            SetCurrentValue(value: any): void;
+        }
+
+        export interface IEditControlCellContext extends IEditActorCellContext {
+            cellWidth: number;
+            cellHeight: number;
+            cellStyle: any; //TODO: Determine correct type
+            cellRect: any;
+            NotifyExpandControl(): void;
+            NotifyEditComplete(): void;
+            Show(element: HTMLElement): void;
+            Hide(element: HTMLElement): void;
+        }
+
+
+        export module EditControl {
+
+        }
+
+        export interface IEditControl {
+            SupportedWriteMode?: SP.JsGrid.EditActorWriteType;
+            SupportedReadMode?: SP.JsGrid.EditActorReadType;
+            GetCellContext?(): IEditControlCellContext;
+            GetOriginalValue?(): IValue;
+            SetValue?(value: IValue): void;
+            Dispose(): void;
+            GetInputElement?(): HTMLElement;
+            Focus?(eventInfo: Sys.UI.DomEvent): void;
+            BindToCell(cellContext: IEditControlCellContext): void;
+            OnBeginEdit(eventInfo: Sys.UI.DomEvent): void;
+            Unbind(): void;
+            OnEndEdit(): void;
+            OnCellMove?(): void;
+            OnValueChanged?(newValue: IValue): void;
+            IsCurrentlyUsingGridTextInputElement?(): boolean;
+            SetSize?(width: number, height: number): void;
+        }
+
+
+        export class StaticDataSource {
+            constructor(jsGridData: IGridData, optFnGetPropType?: Function);
+            AddColumn(gridField: SP.JsGrid.GridField, values: IValue[]):void;
+            RemoveColumn(fieldKey: string):void;
+            InitJsGridParams(optGridParams?: JsGridControl.Parameters): JsGridControl.Parameters;
+        }
+
+        export interface IGridData {
+            MetaData: IGridMetadata
+
+            Fields: IFieldInfo[];
+            Columns: IColumnInfo[];
+
+            LocalizedTable: any[];
+            UnlocalizedTable: any[];
+            ViewInfo: any[];
+
+            MultiValueSeparator?: string;
+            LookupTableInfo?: ILookupTableInfo[];
+            PivotedColumns?: ColumnInfo[];
+            PaneLayout?: PaneLayout;
+            GanttInfo?: any;
+            AutoFilterableColumns?: boolean;
+            AutoFilterState?: any;
+            SortState?: any[];
+            HierarchyState?: any;
+            TopRecord?: number;
+            RecordCount?: number;
+            AdditionalParams?: any;
+            CellStyles?: any;
+            GroupingGridRowStyleIds?: any[];
+            UnfilteredHierarchy?: any;
+            AutoFilterEntries?: any;
+
+            ViewDepKeys?: any[];
+        }
+
+        export interface IColumnInfo {
+            /** Column title */
+            name: string;
+            /** Column image URL.
+                If not null, the column header cell will show the image instead of title text.
+                If the title is defined at the same time as the imgSrc, the title will be shown as a tooltip. */
+            imgSrc?: string;
+            /** Column identifier */
+            columnKey: string;
+            /** Column identifier */
+            fieldKey: string;
+            /** Field keys of the fields, that are displayed in this column */
+            fieldKeys: string[];
+            /** Width of the column */
+            width: number;
+            /** true by default */
+            isVisible?: boolean;
+            /** true by default */
+            isHidable?: boolean;
+            /** true by default */
+            isResizable?: boolean;
+            /** true by default */
+            isSortable?: boolean;
+            /** true by default */
+            isAutoFilterable?: boolean;
+            /** false by default */
+            isFooter?: boolean;
+        }
+
+        export interface IGridMetadata {
+            KeyColumnName: string;
+            IsGanttEnabled?: boolean;
+            IsHierarchyEnabled?: boolean;
+            IsSorted?: boolean;
+            GroupingLevel?: number;
+            GroupingPrefix?: string;
+            RecordKeyHash?: string;
+            RecordKeyOrderChanged?: any;
+            GridOperationalConstantsFieldKeyMap?: { [index: number]: string };
+
+        }
+
+        export interface IFieldInfo {
+            fieldKey: string;
+            propertyTypeId: string;
+            editMode?: EditMode;
+            hasDataValue?: boolean;
+            hasLocalizedValue?: boolean;
+            multiValue?: boolean;
+            textDirection?: TextDirection;
+            dateOnly?: boolean;
+            defaultCellStyleId?: any;
+
+        }
+
+        export interface ILookupTableInfo {
+            id: string;
+            showImage?: boolean;
+            showText?: boolean;
+            limitToList?: boolean;
+            lookup: ILookupInfo[];
+        }
+        export interface ILookupInfo {
+            localString: string;
+            value: number;
+        }
+
+
+    }
+
+    export module Utilities {
+        export class Set {
+            constructor(items?: { [item: string]: number });
+            constructor(items?: { [item: number]: number });
+            /** Returns true if the set is empty */
+            IsEmpty(): boolean;
+            /** Returns first item in the set */
+            First(): any;
+            /** Returns the underlying collection of items as dictionary.
+                Items are the keys, and values are always 1.
+                So the return value may be either { [item: string]: number } or { [item: number]: number } */
+            GetCollection(): any;
+            /** Returns all items from the set as an array */
+            ToArray(): any[];
+            /** Adds all items from array to the set, and returns the set */
+            AddArray(array: any[]): SP.Utilities.Set;
+            /** Adds an item to the set */
+            Add(item: any): any;
+            /** Removes the specified item from the set and returns the removed item */
+            Remove(item: any): any;
+            /** Clears all the items from set */
+            Clear(): SP.Utilities.Set;
+            /** Returns true if item exists in this set */
+            Contains(item: any): boolean;
+            /** Returns a copy of this set */
+            Clone(): SP.Utilities.Set;
+            /** Returns a set that contains all the items that exist only in one of the sets (this and other), but not in both */
+            SymmetricDifference(otherSet: SP.Utilities.Set): SP.Utilities.Set;
+            /** Returns a set that contains all the items that are in this set but not in the otherSet */
+            Difference(otherSet: SP.Utilities.Set): SP.Utilities.Set;
+            /** Returns a new set, that contains items from this set and otherSet */
+            Union(otherSet: SP.Utilities.Set): SP.Utilities.Set;
+            /** Adds all items from otherSet to this set, and returns this set */
+            UnionWith(otherSet: SP.Utilities.Set): SP.Utilities.Set;
+            /** Returns a new set, that contains only items that exist both in this set and the otherSet */
+            Intersection(otherSet: SP.Utilities.Set): SP.Utilities.Set;
+        }
+    }
+}
+
+
+
+
+
+declare namespace SP {
+    export class GanttControl {
+        static WaitForGanttCreation(callack: (control: GanttControl) => void): void;
+        static Instances: GanttControl[];
+        static FnGanttCreationCallback: { (control: GanttControl): void }[];
+
+        get_Columns(): SP.JsGrid.ColumnInfo[];
+    }
+}
diff --git a/sharepoint/tsconfig.json b/sharepoint/tsconfig.json
new file mode 100644
index 0000000000..5aceccc963
--- /dev/null
+++ b/sharepoint/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sharepoint-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/shelljs/index.d.ts b/shelljs/index.d.ts
new file mode 100644
index 0000000000..e18716a06d
--- /dev/null
+++ b/shelljs/index.d.ts
@@ -0,0 +1,531 @@
+// Type definitions for ShellJS v0.3.0
+// Project: http://shelljs.org
+// Definitions by: Niklas Mollenhauer <https://github.com/nikeee>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+///<reference types="node"/>
+
+
+import child = require("child_process");
+
+/**
+ * Changes to directory dir for the duration of the script
+ * @param {string} dir Directory to change in.
+ */
+export declare function cd(dir: string): void;
+
+/**
+ * Returns the current directory.
+ * @return {string} The current directory.
+ */
+export declare function pwd(): string;
+
+/**
+ * Returns array of files in the given path, or in current directory if no path provided.
+ * @param  {string[]} ...paths Paths to search.
+ * @return {string[]}          An array of files in the given path(s).
+ */
+export declare function ls(...paths: string[]): string[];
+
+/**
+ * Returns array of files in the given path, or in current directory if no path provided.
+ * @param  {string}   options  Available options: -R (recursive), -A (all files, include files beginning with ., except for . and ..)
+ * @param  {string[]} ...paths Paths to search.
+ * @return {string[]}          An array of files in the given path(s).
+ */
+export declare function ls(options: string, ...paths: string[]): string[];
+
+/**
+ * Returns array of files in the given path, or in current directory if no path provided.
+ * @param  {string[]} paths Paths to search.
+ * @return {string[]}       An array of files in the given path(s).
+ */
+export declare function ls(paths: string[]): string[];
+
+/**
+ * Returns array of files in the given path, or in current directory if no path provided.
+ * @param  {string}   options  Available options: -R (recursive), -A (all files, include files beginning with ., except for . and ..)
+ * @param  {string[]} paths    Paths to search.
+ * @return {string[]}          An array of files in the given path(s).
+ */
+export declare function ls(options: string, paths: string[]): string[];
+
+/**
+ * Returns array of all files (however deep) in the given paths.
+ * @param {string[]} ...path   The path(s) to search.
+ * @return {string[]}          An array of all files (however deep) in the given path(s).
+ */
+export declare function find(...path: string[]): string[];
+
+/**
+ * Returns array of all files (however deep) in the given paths.
+ * @param {string[]} path   The path(s) to search.
+ * @return {string[]}       An array of all files (however deep) in the given path(s).
+ */
+export declare function find(path: string[]): string[];
+
+/**
+ * Copies files. The wildcard * is accepted.
+ * @param {string} source  The source.
+ * @param {string}   dest  The destination.
+ */
+export declare function cp(source: string, dest: string): void;
+
+/**
+ * Copies files. The wildcard * is accepted.
+ * @param {string[]} source  The source.
+ * @param {string}   dest    The destination.
+ */
+export declare function cp(source: string[], dest: string): void;
+
+/**
+ * Copies files. The wildcard * is accepted.
+ * @param {string}   options Available options: -f (force), -r, -R (recursive)
+ * @param {strin]}   source  The source.
+ * @param {string}   dest    The destination.
+ */
+export declare function cp(options: string, source: string, dest: string): void;
+
+/**
+ * Copies files. The wildcard * is accepted.
+ * @param {string}   options Available options: -f (force), -r, -R (recursive)
+ * @param {string[]} source  The source.
+ * @param {string}   dest    The destination.
+ */
+export declare function cp(options: string, source: string[], dest: string): void;
+
+/**
+ * Removes files. The wildcard * is accepted.
+ * @param {string[]} ...files Files to remove.
+ */
+export declare function rm(...files: string[]): void;
+
+/**
+ * Removes files. The wildcard * is accepted.
+ * @param {string[]} files Files to remove.
+ */
+export declare function rm(files: string[]): void;
+
+/**
+ * Removes files. The wildcard * is accepted.
+ * @param {string}   options  Available options: -f (force), -r, -R (recursive)
+ * @param {string[]} ...files Files to remove.
+ */
+export declare function rm(options: string, ...files: string[]): void;
+
+/**
+ * Removes files. The wildcard * is accepted.
+ * @param {string}   options  Available options: -f (force), -r, -R (recursive)
+ * @param {string[]} ...files Files to remove.
+ */
+export declare function rm(options: string, files: string[]): void;
+
+/**
+ * Moves files. The wildcard * is accepted.
+ * @param {string} source The source.
+ * @param {string} dest   The destination.
+ */
+export declare function mv(source: string, dest: string): void;
+
+/**
+ * Moves files. The wildcard * is accepted.
+ * @param {string[]} source The source.
+ * @param {string}   dest   The destination.
+ */
+export declare function mv(source: string[], dest: string): void;
+
+/**
+ * Creates directories.
+ * @param {string[]} ...dir Directories to create.
+ */
+export declare function mkdir(...dir: string[]): void;
+
+/**
+ * Creates directories.
+ * @param {string[]} dir Directories to create.
+ */
+export declare function mkdir(dir: string[]): void;
+
+/**
+ * Creates directories.
+ * @param {string}   options Available options: p (full paths, will create intermediate dirs if necessary)
+ * @param {string[]} ...dir  The directories to create.
+ */
+export declare function mkdir(options: string, ...dir: string[]): void;
+
+/**
+ * Creates directories.
+ * @param {string}   options Available options: p (full paths, will create intermediate dirs if necessary)
+ * @param {string[]} dir     The directories to create.
+ */
+export declare function mkdir(options: string, dir: string[]): void;
+
+/**
+ * Evaluates expression using the available primaries and returns corresponding value.
+ * @param  {string}  option '-b': true if path is a block device; '-c': true if path is a character device; '-d': true if path is a directory; '-e': true if path exists; '-f': true if path is a regular file; '-L': true if path is a symboilc link; '-p': true if path is a pipe (FIFO); '-S': true if path is a socket
+ * @param  {string}  path   The path.
+ * @return {boolean}        See option parameter.
+ */
+export declare function test(option: string, path: string): boolean;
+
+/**
+ * Returns a string containing the given file, or a concatenated string containing the files if more than one file is given (a new line character is introduced between each file). Wildcard * accepted.
+ * @param  {string[]} ...files Files to use.
+ * @return {string}            A string containing the given file, or a concatenated string containing the files if more than one file is given (a new line character is introduced between each file).
+ */
+export declare function cat(...files: string[]): string;
+
+/**
+ * Returns a string containing the given file, or a concatenated string containing the files if more than one file is given (a new line character is introduced between each file). Wildcard * accepted.
+ * @param  {string[]} files Files to use.
+ * @return {string}         A string containing the given file, or a concatenated string containing the files if more than one file is given (a new line character is introduced between each file).
+ */
+export declare function cat(files: string[]): string;
+
+
+// Does not work yet.
+export interface String {
+    /**
+     * Analogous to the redirection operator > in Unix, but works with JavaScript strings (such as those returned by cat, grep, etc). Like Unix redirections, to() will overwrite any existing file!
+     * @param {string} file The file to use.
+     */
+    to(file: string): void;
+
+    /**
+     * Analogous to the redirect-and-append operator >> in Unix, but works with JavaScript strings (such as those returned by cat, grep, etc).
+     * @param {string} file The file to append to.
+     */
+    toEnd(file: string): void;
+}
+
+/**
+ * Reads an input string from file and performs a JavaScript replace() on the input using the given search regex and replacement string or function. Returns the new string after replacement.
+ * @param  {RegExp} searchRegex The regular expression to use for search.
+ * @param  {string} replacement The replacement.
+ * @param  {string} file        The file to process.
+ * @return {string}             The new string after replacement.
+ */
+export declare function sed(searchRegex: RegExp, replacement: string, file: string): string;
+
+/**
+ * Reads an input string from file and performs a JavaScript replace() on the input using the given search regex and replacement string or function. Returns the new string after replacement.
+ * @param  {string} searchRegex The regular expression to use for search.
+ * @param  {string} replacement The replacement.
+ * @param  {string} file        The file to process.
+ * @return {string}             The new string after replacement.
+ */
+export declare function sed(searchRegex: string, replacement: string, file: string): string;
+
+/**
+ * Reads an input string from file and performs a JavaScript replace() on the input using the given search regex and replacement string or function. Returns the new string after replacement.
+ * @param  {string} options     Available options: -i (Replace contents of 'file' in-place. Note that no backups will be created!)
+ * @param  {RegExp} searchRegex The regular expression to use for search.
+ * @param  {string} replacement The replacement.
+ * @param  {string} file        The file to process.
+ * @return {string}             The new string after replacement.
+ */
+export declare function sed(options: string, searchRegex: RegExp, replacement: string, file: string): string;
+
+/**
+ * Reads an input string from file and performs a JavaScript replace() on the input using the given search regex and replacement string or function. Returns the new string after replacement.
+ * @param  {string} options     Available options: -i (Replace contents of 'file' in-place. Note that no backups will be created!)
+ * @param  {string} searchRegex The regular expression to use for search.
+ * @param  {string} replacement The replacement.
+ * @param  {string} file        The file to process.
+ * @return {string}             The new string after replacement.
+ */
+export declare function sed(options: string, searchRegex: string, replacement: string, file: string): string;
+
+/**
+ * Reads input string from given files and returns a string containing all lines of the file that match the given regex_filter. Wildcard * accepted.
+ * @param  {RegExp}   regex_filter The regular expression to use.
+ * @param  {string[]} ...files     The files to process.
+ * @return {string}                Returns a string containing all lines of the file that match the given regex_filter.
+ */
+export declare function grep(regex_filter: RegExp, ...files: string[]): string;
+
+/**
+ * Reads input string from given files and returns a string containing all lines of the file that match the given regex_filter. Wildcard * accepted.
+ * @param  {RegExp}   regex_filter The regular expression to use.
+ * @param  {string[]} ...files     The files to process.
+ * @return {string}                Returns a string containing all lines of the file that match the given regex_filter.
+ */
+export declare function grep(regex_filter: RegExp, files: string[]): string;
+
+/**
+ * Reads input string from given files and returns a string containing all lines of the file that match the given regex_filter. Wildcard * accepted.
+ * @param  {string}   options      Available options: -v (Inverse the sense of the regex and print the lines not matching the criteria.)
+ * @param  {string}   regex_filter The regular expression to use.
+ * @param  {string[]} ...files     The files to process.
+ * @return {string}                Returns a string containing all lines of the file that match the given regex_filter.
+ */
+export declare function grep(options: string, regex_filter: string, ...files: string[]): string;
+
+/**
+ * Reads input string from given files and returns a string containing all lines of the file that match the given regex_filter. Wildcard * accepted.
+ * @param  {string}   options      Available options: -v (Inverse the sense of the regex and print the lines not matching the criteria.)
+ * @param  {string}   regex_filter The regular expression to use.
+ * @param  {string[]} files        The files to process.
+ * @return {string}                Returns a string containing all lines of the file that match the given regex_filter.
+ */
+export declare function grep(options: string, regex_filter: string, files: string[]): string;
+
+/**
+ * Searches for command in the system's PATH. On Windows looks for .exe, .cmd, and .bat extensions.
+ * @param  {string} command The command to search for.
+ * @return {string}         Returns string containing the absolute path to the command.
+ */
+export declare function which(command: string): string;
+
+/**
+ * Prints string to stdout, and returns string with additional utility methods like .to().
+ * @param  {string[]} ...text The text to print.
+ * @return {string}           Returns the string that was passed as argument.
+ */
+export declare function echo(...text: string[]): string;
+
+/**
+ * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
+ * @param  {"+N"}     dir Brings the Nth directory (counting from the left of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
+ * @return {string[]}     Returns an array of paths in the stack.
+ */
+export declare function pushd(dir: "+N"): string[];
+
+/**
+ * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
+ * @param  {"-N"}     dir Brings the Nth directory (counting from the right of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
+ * @return {string[]}     Returns an array of paths in the stack.
+ */
+export declare function pushd(dir: "-N"): string[];
+
+/**
+ * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
+ * @param  {string}     dir Makes the current working directory be the top of the stack, and then executes the equivalent of cd dir.
+ * @return {string[]}       Returns an array of paths in the stack.
+ */
+export declare function pushd(dir: string): string[];
+
+/**
+ * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
+ * @param  {string}   options Available options: -n (Suppresses the normal change of directory when adding directories to the stack, so that only the stack is manipulated)
+ * @param  {"+N"}     dir Brings the Nth directory (counting from the left of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
+ * @return {string[]}     Returns an array of paths in the stack.
+ */
+export declare function pushd(options: string, dir: "+N"): string[];
+
+/**
+ * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
+ * @param  {string}   options Available options: -n (Suppresses the normal change of directory when adding directories to the stack, so that only the stack is manipulated)
+ * @param  {"-N"}     dir Brings the Nth directory (counting from the right of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
+ * @return {string[]}     Returns an array of paths in the stack.
+ */
+export declare function pushd(options: string, dir: "-N"): string[];
+
+/**
+ * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
+ * @param  {string}   options Available options: -n (Suppresses the normal change of directory when adding directories to the stack, so that only the stack is manipulated)
+ * @param  {string}   dir     Makes the current working directory be the top of the stack, and then executes the equivalent of cd dir.
+ * @return {string[]}         Returns an array of paths in the stack.
+ */
+export declare function pushd(options: string, dir: string): string[];
+
+/**
+ * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
+ * @param  {"+N"}     dir Removes the Nth directory (counting from the left of the list printed by dirs), starting with zero.
+ * @return {string[]}     Returns an array of paths in the stack.
+ */
+export declare function popd(dir: "+N"): string[];
+
+/**
+ * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
+ * @return {string[]}     Returns an array of paths in the stack.
+ */
+export declare function popd(): string[];
+
+/**
+ * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
+ * @param  {"-N"}     dir Removes the Nth directory (counting from the right of the list printed by dirs), starting with zero.
+ * @return {string[]}     Returns an array of paths in the stack.
+ */
+export declare function popd(dir: "-N"): string[];
+
+/**
+ * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
+ * @param  {string}     dir You can only use -N and +N.
+ * @return {string[]}       Returns an array of paths in the stack.
+ */
+export declare function popd(dir: string): string[];
+
+/**
+ * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
+ * @param  {string}   options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated)
+ * @param  {"+N"}     dir     Removes the Nth directory (counting from the left of the list printed by dirs), starting with zero.
+ * @return {string[]}         Returns an array of paths in the stack.
+ */
+export declare function popd(options: string, dir: "+N"): string[];
+
+/**
+ * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
+ * @param  {string}   options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated)
+ * @param  {"-N"}     dir     Removes the Nth directory (counting from the right of the list printed by dirs), starting with zero.
+ * @return {string[]}         Returns an array of paths in the stack.
+ */
+export declare function popd(options: string, dir: "-N"): string[];
+
+/**
+ * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
+ * @param  {string}   options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated)
+ * @param  {string}   dir     You can only use -N and +N.
+ * @return {string[]}         Returns an array of paths in the stack.
+ */
+export declare function popd(options: string, dir: string): string[];
+
+/**
+ * Clears the directory stack by deleting all of the elements.
+ * @param  {"-c"}     options Clears the directory stack by deleting all of the elements.
+ * @return {string[]}         Returns an array of paths in the stack, or a single path if +N or -N was specified.
+ */
+export declare function dirs(options: "-c"): string[];
+
+/**
+ * Display the list of currently remembered directories. Returns an array of paths in the stack, or a single path if +N or -N was specified.
+ * @param  {"+N"}   options Displays the Nth directory (counting from the left of the list printed by dirs when invoked without options), starting with zero.
+ * @return {string[]}       Returns an array of paths in the stack, or a single path if +N or -N was specified.
+ */
+export declare function dirs(options: "+N"): string;
+
+/**
+ * Display the list of currently remembered directories. Returns an array of paths in the stack, or a single path if +N or -N was specified.
+ * @param  {"-N"}   options Displays the Nth directory (counting from the right of the list printed by dirs when invoked without options), starting with zero.
+ * @return {string[]}       Returns an array of paths in the stack, or a single path if +N or -N was specified.
+ */
+export declare function dirs(options: "-N"): string;
+
+/**
+ * Display the list of currently remembered directories. Returns an array of paths in the stack, or a single path if +N or -N was specified.
+ * @param  {string} options Available options: -c, -N, +N. You can only use those.
+ * @return {any}            Returns an array of paths in the stack, or a single path if +N or -N was specified.
+ */
+export declare function dirs(options: string): any;
+
+/**
+ * Links source to dest. Use -f to force the link, should dest already exist.
+ * @param {string} source The source.
+ * @param {string} dest   The destination.
+ */
+export declare function ln(source: string, dest: string): void;
+
+/**
+ * Links source to dest. Use -f to force the link, should dest already exist.
+ * @param {string} options Available options: s (symlink), f (force)
+ * @param {string} source The source.
+ * @param {string} dest   The destination.
+ */
+export declare function ln(options: string, source: string, dest: string): void;
+
+/**
+ * Exits the current process with the given exit code.
+ * @param {number} code The exit code.
+ */
+export declare function exit(code: number): void;
+
+/**
+ * Object containing environment variables (both getter and setter). Shortcut to process.env.
+ */
+export declare var env: { [key: string]: string };
+
+/**
+ * Executes the given command synchronously.
+ * @param  {string}                 command The command to execute.
+ * @return {ExecOutputReturnValue}          Returns an object containing the return code and output as string.
+ */
+export declare function exec(command: string): ExecOutputReturnValue;
+/**
+ * Executes the given command synchronously.
+ * @param  {string}                                     command The command to execute.
+ * @param  {ExecOptions}                                options Silence and synchronous options.
+ * @return {ExecOutputReturnValue | child.ChildProcess}         Returns an object containing the return code and output as string, or if {async:true} was passed, a ChildProcess.
+ */
+export declare function exec(command: string, options: ExecOptions): ExecOutputReturnValue | child.ChildProcess;
+/**
+ * Executes the given command synchronously.
+ * @param  {string}          command  The command to execute.
+ * @param  {ExecOptions}     options  Silence and synchronous options.
+ * @param  {ExecCallback}    callback Receives code and output asynchronously.
+ */
+export declare function exec(command: string, options: ExecOptions, callback: ExecCallback): child.ChildProcess;
+/**
+ * Executes the given command synchronously.
+ * @param  {string}          command  The command to execute.
+ * @param  {ExecCallback}    callback Receives code and output asynchronously.
+ */
+export declare function exec(command: string, callback: ExecCallback): child.ChildProcess;
+
+export interface ExecCallback {
+    (code: number, output: string): any;
+}
+
+export interface ExecOptions {
+    silent?: boolean;
+    async?: boolean;
+}
+
+export interface ExecOutputReturnValue {
+    code: number;
+    output: string;
+}
+
+/**
+ * Alters the permissions of a file or directory by either specifying the absolute permissions in octal form or expressing the changes in symbols. This command tries to mimic the POSIX behavior as much as possible. Notable exceptions:
+ * - In symbolic modes, 'a-r' and '-r' are identical. No consideration is given to the umask.
+ * - There is no "quiet" option since default behavior is to run silent.
+ * @param {number} octalMode The access mode. Octal.
+ * @param {string} file      The file to use.
+ */
+export declare function chmod(octalMode: number, file: string): void;
+
+/**
+ * Alters the permissions of a file or directory by either specifying the absolute permissions in octal form or expressing the changes in symbols. This command tries to mimic the POSIX behavior as much as possible. Notable exceptions:
+ * - In symbolic modes, 'a-r' and '-r' are identical. No consideration is given to the umask.
+ * - There is no "quiet" option since default behavior is to run silent.
+ * @param {string} mode      The access mode. Can be an octal string or a symbolic mode string.
+ * @param {string} file      The file to use.
+ */
+export declare function chmod(mode: string, file: string): void;
+
+// Non-Unix commands
+
+/**
+ * Searches and returns string containing a writeable, platform-dependent temporary directory. Follows Python's tempfile algorithm.
+ * @return {string} The temp file path.
+ */
+export declare function tempdir(): string;
+
+/**
+ * Tests if error occurred in the last command.
+ * @return {string} Returns null if no error occurred, otherwise returns string explaining the error
+ */
+export declare function error(): string;
+
+// Configuration
+
+interface ShellConfig {
+    /**
+     * Suppresses all command output if true, except for echo() calls. Default is false.
+     * @type {boolean}
+     */
+    silent: boolean;
+
+    /**
+     * If true the script will die on errors. Default is false.
+     * @type {boolean}
+     */
+    fatal: boolean;
+}
+
+/**
+ * The shelljs configuration.
+ * @type {ShellConfig}
+ */
+export declare var config: ShellConfig;
diff --git a/shelljs/shelljs-tests.ts b/shelljs/shelljs-tests.ts
index 34292f8d8a..1d46e2a136 100644
--- a/shelljs/shelljs-tests.ts
+++ b/shelljs/shelljs-tests.ts
@@ -4,8 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // Tests taken from documentation samples.
 
-///<reference path="../node/node.d.ts" />
-///<reference path="../shelljs/shelljs.d.ts" />
+///<reference types="node" />
 
 import shell = require("shelljs");
 
diff --git a/shelljs/shelljs.d.ts b/shelljs/shelljs.d.ts
deleted file mode 100644
index 949f723ff9..0000000000
--- a/shelljs/shelljs.d.ts
+++ /dev/null
@@ -1,536 +0,0 @@
-// Type definitions for ShellJS v0.3.0
-// Project: http://shelljs.org
-// Definitions by: Niklas Mollenhauer <https://github.com/nikeee>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-///<reference path="../node/node.d.ts"/>
-
-declare module "shelljs"
-{
-    import child = require("child_process");
-
-    /**
-     * Changes to directory dir for the duration of the script
-     * @param {string} dir Directory to change in.
-     */
-    export function cd(dir: string): void;
-
-    /**
-     * Returns the current directory.
-     * @return {string} The current directory.
-     */
-    export function pwd(): string;
-
-    /**
-     * Returns array of files in the given path, or in current directory if no path provided.
-     * @param  {string[]} ...paths Paths to search.
-     * @return {string[]}          An array of files in the given path(s).
-     */
-    export function ls(...paths: string[]): string[];
-
-    /**
-     * Returns array of files in the given path, or in current directory if no path provided.
-     * @param  {string}   options  Available options: -R (recursive), -A (all files, include files beginning with ., except for . and ..)
-     * @param  {string[]} ...paths Paths to search.
-     * @return {string[]}          An array of files in the given path(s).
-     */
-    export function ls(options: string, ...paths: string[]): string[];
-
-    /**
-     * Returns array of files in the given path, or in current directory if no path provided.
-     * @param  {string[]} paths Paths to search.
-     * @return {string[]}       An array of files in the given path(s).
-     */
-    export function ls(paths: string[]): string[];
-
-    /**
-     * Returns array of files in the given path, or in current directory if no path provided.
-     * @param  {string}   options  Available options: -R (recursive), -A (all files, include files beginning with ., except for . and ..)
-     * @param  {string[]} paths    Paths to search.
-     * @return {string[]}          An array of files in the given path(s).
-     */
-    export function ls(options: string, paths: string[]): string[];
-
-    /**
-     * Returns array of all files (however deep) in the given paths.
-     * @param {string[]} ...path   The path(s) to search.
-     * @return {string[]}          An array of all files (however deep) in the given path(s).
-     */
-    export function find(...path: string[]): string[];
-
-    /**
-     * Returns array of all files (however deep) in the given paths.
-     * @param {string[]} path   The path(s) to search.
-     * @return {string[]}       An array of all files (however deep) in the given path(s).
-     */
-    export function find(path: string[]): string[];
-
-    /**
-     * Copies files. The wildcard * is accepted.
-     * @param {string} source  The source.
-     * @param {string}   dest  The destination.
-     */
-    export function cp(source: string, dest: string): void;
-
-    /**
-     * Copies files. The wildcard * is accepted.
-     * @param {string[]} source  The source.
-     * @param {string}   dest    The destination.
-     */
-    export function cp(source: string[], dest: string): void;
-
-    /**
-     * Copies files. The wildcard * is accepted.
-     * @param {string}   options Available options: -f (force), -r, -R (recursive)
-     * @param {strin]}   source  The source.
-     * @param {string}   dest    The destination.
-     */
-    export function cp(options: string, source: string, dest: string): void;
-
-    /**
-     * Copies files. The wildcard * is accepted.
-     * @param {string}   options Available options: -f (force), -r, -R (recursive)
-     * @param {string[]} source  The source.
-     * @param {string}   dest    The destination.
-     */
-    export function cp(options: string, source: string[], dest: string): void;
-
-    /**
-     * Removes files. The wildcard * is accepted.
-     * @param {string[]} ...files Files to remove.
-     */
-    export function rm(...files: string[]): void;
-
-    /**
-     * Removes files. The wildcard * is accepted.
-     * @param {string[]} files Files to remove.
-     */
-    export function rm(files: string[]): void;
-
-    /**
-     * Removes files. The wildcard * is accepted.
-     * @param {string}   options  Available options: -f (force), -r, -R (recursive)
-     * @param {string[]} ...files Files to remove.
-     */
-    export function rm(options: string, ...files: string[]): void;
-
-    /**
-     * Removes files. The wildcard * is accepted.
-     * @param {string}   options  Available options: -f (force), -r, -R (recursive)
-     * @param {string[]} ...files Files to remove.
-     */
-    export function rm(options: string, files: string[]): void;
-
-    /**
-     * Moves files. The wildcard * is accepted.
-     * @param {string} source The source.
-     * @param {string} dest   The destination.
-     */
-    export function mv(source: string, dest: string): void;
-    
-    /**
-     * Moves files. The wildcard * is accepted.
-     * @param {string[]} source The source.
-     * @param {string}   dest   The destination.
-     */
-    export function mv(source: string[], dest: string): void;
-
-    /**
-     * Creates directories.
-     * @param {string[]} ...dir Directories to create.
-     */
-    export function mkdir(...dir: string[]): void;
-
-    /**
-     * Creates directories.
-     * @param {string[]} dir Directories to create.
-     */
-    export function mkdir(dir: string[]): void;
-
-    /**
-     * Creates directories.
-     * @param {string}   options Available options: p (full paths, will create intermediate dirs if necessary)
-     * @param {string[]} ...dir  The directories to create.
-     */
-    export function mkdir(options: string, ...dir: string[]): void;
-
-    /**
-     * Creates directories.
-     * @param {string}   options Available options: p (full paths, will create intermediate dirs if necessary)
-     * @param {string[]} dir     The directories to create.
-     */
-    export function mkdir(options: string, dir: string[]): void;
-
-    /**
-     * Evaluates expression using the available primaries and returns corresponding value.
-     * @param  {string}  option '-b': true if path is a block device; '-c': true if path is a character device; '-d': true if path is a directory; '-e': true if path exists; '-f': true if path is a regular file; '-L': true if path is a symboilc link; '-p': true if path is a pipe (FIFO); '-S': true if path is a socket
-     * @param  {string}  path   The path.
-     * @return {boolean}        See option parameter.
-     */
-    export function test(option: string, path: string): boolean;
-
-    /**
-     * Returns a string containing the given file, or a concatenated string containing the files if more than one file is given (a new line character is introduced between each file). Wildcard * accepted.
-     * @param  {string[]} ...files Files to use.
-     * @return {string}            A string containing the given file, or a concatenated string containing the files if more than one file is given (a new line character is introduced between each file).
-     */
-    export function cat(...files: string[]): string;
-
-    /**
-     * Returns a string containing the given file, or a concatenated string containing the files if more than one file is given (a new line character is introduced between each file). Wildcard * accepted.
-     * @param  {string[]} files Files to use.
-     * @return {string}         A string containing the given file, or a concatenated string containing the files if more than one file is given (a new line character is introduced between each file).
-     */
-    export function cat(files: string[]): string;
-
-
-    // Does not work yet.
-    export interface String
-    {
-        /**
-         * Analogous to the redirection operator > in Unix, but works with JavaScript strings (such as those returned by cat, grep, etc). Like Unix redirections, to() will overwrite any existing file!
-         * @param {string} file The file to use.
-         */
-        to(file: string): void;
-
-        /**
-         * Analogous to the redirect-and-append operator >> in Unix, but works with JavaScript strings (such as those returned by cat, grep, etc).
-         * @param {string} file The file to append to.
-         */
-        toEnd(file: string): void;
-    }
-
-    /**
-     * Reads an input string from file and performs a JavaScript replace() on the input using the given search regex and replacement string or function. Returns the new string after replacement.
-     * @param  {RegExp} searchRegex The regular expression to use for search.
-     * @param  {string} replacement The replacement.
-     * @param  {string} file        The file to process.
-     * @return {string}             The new string after replacement.
-     */
-    export function sed(searchRegex: RegExp, replacement: string, file: string): string;
-
-    /**
-     * Reads an input string from file and performs a JavaScript replace() on the input using the given search regex and replacement string or function. Returns the new string after replacement.
-     * @param  {string} searchRegex The regular expression to use for search.
-     * @param  {string} replacement The replacement.
-     * @param  {string} file        The file to process.
-     * @return {string}             The new string after replacement.
-     */
-    export function sed(searchRegex: string, replacement: string, file: string): string;
-
-    /**
-     * Reads an input string from file and performs a JavaScript replace() on the input using the given search regex and replacement string or function. Returns the new string after replacement.
-     * @param  {string} options     Available options: -i (Replace contents of 'file' in-place. Note that no backups will be created!)
-     * @param  {RegExp} searchRegex The regular expression to use for search.
-     * @param  {string} replacement The replacement.
-     * @param  {string} file        The file to process.
-     * @return {string}             The new string after replacement.
-     */
-    export function sed(options: string, searchRegex: RegExp, replacement: string, file: string): string;
-
-    /**
-     * Reads an input string from file and performs a JavaScript replace() on the input using the given search regex and replacement string or function. Returns the new string after replacement.
-     * @param  {string} options     Available options: -i (Replace contents of 'file' in-place. Note that no backups will be created!)
-     * @param  {string} searchRegex The regular expression to use for search.
-     * @param  {string} replacement The replacement.
-     * @param  {string} file        The file to process.
-     * @return {string}             The new string after replacement.
-     */
-    export function sed(options: string, searchRegex: string, replacement: string, file: string): string;
-
-    /**
-     * Reads input string from given files and returns a string containing all lines of the file that match the given regex_filter. Wildcard * accepted.
-     * @param  {RegExp}   regex_filter The regular expression to use.
-     * @param  {string[]} ...files     The files to process.
-     * @return {string}                Returns a string containing all lines of the file that match the given regex_filter.
-     */
-    export function grep(regex_filter: RegExp, ...files: string[]): string;
-
-    /**
-     * Reads input string from given files and returns a string containing all lines of the file that match the given regex_filter. Wildcard * accepted.
-     * @param  {RegExp}   regex_filter The regular expression to use.
-     * @param  {string[]} ...files     The files to process.
-     * @return {string}                Returns a string containing all lines of the file that match the given regex_filter.
-     */
-    export function grep(regex_filter: RegExp, files: string[]): string;
-
-    /**
-     * Reads input string from given files and returns a string containing all lines of the file that match the given regex_filter. Wildcard * accepted.
-     * @param  {string}   options      Available options: -v (Inverse the sense of the regex and print the lines not matching the criteria.)
-     * @param  {string}   regex_filter The regular expression to use.
-     * @param  {string[]} ...files     The files to process.
-     * @return {string}                Returns a string containing all lines of the file that match the given regex_filter.
-     */
-    export function grep(options: string, regex_filter: string, ...files: string[]): string;
-
-    /**
-     * Reads input string from given files and returns a string containing all lines of the file that match the given regex_filter. Wildcard * accepted.
-     * @param  {string}   options      Available options: -v (Inverse the sense of the regex and print the lines not matching the criteria.)
-     * @param  {string}   regex_filter The regular expression to use.
-     * @param  {string[]} files        The files to process.
-     * @return {string}                Returns a string containing all lines of the file that match the given regex_filter.
-     */
-    export function grep(options: string, regex_filter: string, files: string[]): string;
-
-    /**
-     * Searches for command in the system's PATH. On Windows looks for .exe, .cmd, and .bat extensions.
-     * @param  {string} command The command to search for.
-     * @return {string}         Returns string containing the absolute path to the command.
-     */
-    export function which(command: string): string;
-
-    /**
-     * Prints string to stdout, and returns string with additional utility methods like .to().
-     * @param  {string[]} ...text The text to print.
-     * @return {string}           Returns the string that was passed as argument.
-     */
-    export function echo(...text: string[]): string;
-
-    /**
-     * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
-     * @param  {"+N"}     dir Brings the Nth directory (counting from the left of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
-     * @return {string[]}     Returns an array of paths in the stack.
-     */
-    export function pushd(dir: "+N"): string[];
-
-    /**
-     * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
-     * @param  {"-N"}     dir Brings the Nth directory (counting from the right of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
-     * @return {string[]}     Returns an array of paths in the stack.
-     */
-    export function pushd(dir: "-N"): string[];
-
-    /**
-     * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
-     * @param  {string}     dir Makes the current working directory be the top of the stack, and then executes the equivalent of cd dir.
-     * @return {string[]}       Returns an array of paths in the stack.
-     */
-    export function pushd(dir: string): string[];
-
-    /**
-     * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
-     * @param  {string}   options Available options: -n (Suppresses the normal change of directory when adding directories to the stack, so that only the stack is manipulated)
-     * @param  {"+N"}     dir Brings the Nth directory (counting from the left of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
-     * @return {string[]}     Returns an array of paths in the stack.
-     */
-    export function pushd(options: string, dir: "+N"): string[];
-
-    /**
-     * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
-     * @param  {string}   options Available options: -n (Suppresses the normal change of directory when adding directories to the stack, so that only the stack is manipulated)
-     * @param  {"-N"}     dir Brings the Nth directory (counting from the right of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
-     * @return {string[]}     Returns an array of paths in the stack.
-     */
-    export function pushd(options: string, dir: "-N"): string[];
-
-    /**
-     * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
-     * @param  {string}   options Available options: -n (Suppresses the normal change of directory when adding directories to the stack, so that only the stack is manipulated)
-     * @param  {string}   dir     Makes the current working directory be the top of the stack, and then executes the equivalent of cd dir.
-     * @return {string[]}         Returns an array of paths in the stack.
-     */
-    export function pushd(options: string, dir: string): string[];
-
-    /**
-     * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
-     * @param  {"+N"}     dir Removes the Nth directory (counting from the left of the list printed by dirs), starting with zero.
-     * @return {string[]}     Returns an array of paths in the stack.
-     */
-    export function popd(dir: "+N"): string[];
-
-    /**
-     * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
-     * @return {string[]}     Returns an array of paths in the stack.
-     */
-    export function popd(): string[];
-
-    /**
-     * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
-     * @param  {"-N"}     dir Removes the Nth directory (counting from the right of the list printed by dirs), starting with zero.
-     * @return {string[]}     Returns an array of paths in the stack.
-     */
-    export function popd(dir: "-N"): string[];
-
-    /**
-     * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
-     * @param  {string}     dir You can only use -N and +N.
-     * @return {string[]}       Returns an array of paths in the stack.
-     */
-    export function popd(dir: string): string[];
-
-    /**
-     * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
-     * @param  {string}   options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated)
-     * @param  {"+N"}     dir     Removes the Nth directory (counting from the left of the list printed by dirs), starting with zero.
-     * @return {string[]}         Returns an array of paths in the stack.
-     */
-    export function popd(options: string, dir: "+N"): string[];
-
-    /**
-     * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
-     * @param  {string}   options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated)
-     * @param  {"-N"}     dir     Removes the Nth directory (counting from the right of the list printed by dirs), starting with zero.
-     * @return {string[]}         Returns an array of paths in the stack.
-     */
-    export function popd(options: string, dir: "-N"): string[];
-
-    /**
-     * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
-     * @param  {string}   options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated)
-     * @param  {string}   dir     You can only use -N and +N.
-     * @return {string[]}         Returns an array of paths in the stack.
-     */
-    export function popd(options: string, dir: string): string[];
-
-    /**
-     * Clears the directory stack by deleting all of the elements.
-     * @param  {"-c"}     options Clears the directory stack by deleting all of the elements.
-     * @return {string[]}         Returns an array of paths in the stack, or a single path if +N or -N was specified.
-     */
-    export function dirs(options: "-c"): string[];
-
-    /**
-     * Display the list of currently remembered directories. Returns an array of paths in the stack, or a single path if +N or -N was specified.
-     * @param  {"+N"}   options Displays the Nth directory (counting from the left of the list printed by dirs when invoked without options), starting with zero.
-     * @return {string[]}       Returns an array of paths in the stack, or a single path if +N or -N was specified.
-     */
-    export function dirs(options: "+N"): string;
-
-    /**
-     * Display the list of currently remembered directories. Returns an array of paths in the stack, or a single path if +N or -N was specified.
-     * @param  {"-N"}   options Displays the Nth directory (counting from the right of the list printed by dirs when invoked without options), starting with zero.
-     * @return {string[]}       Returns an array of paths in the stack, or a single path if +N or -N was specified.
-     */
-    export function dirs(options: "-N"): string;
-
-    /**
-     * Display the list of currently remembered directories. Returns an array of paths in the stack, or a single path if +N or -N was specified.
-     * @param  {string} options Available options: -c, -N, +N. You can only use those.
-     * @return {any}            Returns an array of paths in the stack, or a single path if +N or -N was specified.
-     */
-    export function dirs(options: string): any;
-
-    /**
-     * Links source to dest. Use -f to force the link, should dest already exist.
-     * @param {string} source The source.
-     * @param {string} dest   The destination.
-     */
-    export function ln(source: string, dest: string): void;
-
-    /**
-     * Links source to dest. Use -f to force the link, should dest already exist.
-     * @param {string} options Available options: s (symlink), f (force)
-     * @param {string} source The source.
-     * @param {string} dest   The destination.
-     */
-    export function ln(options: string, source: string, dest: string): void;
-
-    /**
-     * Exits the current process with the given exit code.
-     * @param {number} code The exit code.
-     */
-    export function exit(code: number): void;
-
-    /**
-     * Object containing environment variables (both getter and setter). Shortcut to process.env.
-     */
-    export var env: { [key: string]: string };
-    
-    /**
-     * Executes the given command synchronously.
-     * @param  {string}                 command The command to execute.
-     * @return {ExecOutputReturnValue}          Returns an object containing the return code and output as string.
-     */
-    export function exec(command: string): ExecOutputReturnValue;
-    /**
-     * Executes the given command synchronously.
-     * @param  {string}                                     command The command to execute.
-     * @param  {ExecOptions}                                options Silence and synchronous options.
-     * @return {ExecOutputReturnValue | child.ChildProcess}         Returns an object containing the return code and output as string, or if {async:true} was passed, a ChildProcess.
-     */
-    export function exec(command: string, options: ExecOptions): ExecOutputReturnValue | child.ChildProcess;
-    /**
-     * Executes the given command synchronously.
-     * @param  {string}          command  The command to execute.
-     * @param  {ExecOptions}     options  Silence and synchronous options.
-     * @param  {ExecCallback}    callback Receives code and output asynchronously.
-     */
-    export function exec(command: string, options: ExecOptions, callback: ExecCallback): child.ChildProcess;
-    /**
-     * Executes the given command synchronously.
-     * @param  {string}          command  The command to execute.
-     * @param  {ExecCallback}    callback Receives code and output asynchronously.
-     */
-    export function exec(command: string, callback: ExecCallback): child.ChildProcess;
-
-    export interface ExecCallback {
-        (code: number, output: string): any;
-    }
-
-    export interface ExecOptions {
-        silent?: boolean;
-        async?: boolean;
-    }
-
-    export interface ExecOutputReturnValue
-    {
-        code: number;
-        output: string;
-    }
-
-    /**
-     * Alters the permissions of a file or directory by either specifying the absolute permissions in octal form or expressing the changes in symbols. This command tries to mimic the POSIX behavior as much as possible. Notable exceptions:
-     * - In symbolic modes, 'a-r' and '-r' are identical. No consideration is given to the umask.
-     * - There is no "quiet" option since default behavior is to run silent.
-     * @param {number} octalMode The access mode. Octal.
-     * @param {string} file      The file to use.
-     */
-    export function chmod(octalMode: number, file: string): void;
-
-    /**
-     * Alters the permissions of a file or directory by either specifying the absolute permissions in octal form or expressing the changes in symbols. This command tries to mimic the POSIX behavior as much as possible. Notable exceptions:
-     * - In symbolic modes, 'a-r' and '-r' are identical. No consideration is given to the umask.
-     * - There is no "quiet" option since default behavior is to run silent.
-     * @param {string} mode      The access mode. Can be an octal string or a symbolic mode string.
-     * @param {string} file      The file to use.
-     */
-    export function chmod(mode: string, file: string): void;
-
-    // Non-Unix commands
-
-    /**
-     * Searches and returns string containing a writeable, platform-dependent temporary directory. Follows Python's tempfile algorithm.
-     * @return {string} The temp file path.
-     */
-    export function tempdir(): string;
-
-    /**
-     * Tests if error occurred in the last command.
-     * @return {string} Returns null if no error occurred, otherwise returns string explaining the error
-     */
-    export function error(): string;
-
-    // Configuration
-
-    interface ShellConfig
-    {
-        /**
-         * Suppresses all command output if true, except for echo() calls. Default is false.
-         * @type {boolean}
-         */
-        silent: boolean;
-
-        /**
-         * If true the script will die on errors. Default is false.
-         * @type {boolean}
-         */
-        fatal: boolean;
-    }
-
-    /**
-     * The shelljs configuration.
-     * @type {ShellConfig}
-     */
-    export var config: ShellConfig;
-}
diff --git a/shelljs/tsconfig.json b/shelljs/tsconfig.json
new file mode 100644
index 0000000000..6bb2d43d6d
--- /dev/null
+++ b/shelljs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "shelljs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/shortid/index.d.ts b/shortid/index.d.ts
new file mode 100644
index 0000000000..437c502fce
--- /dev/null
+++ b/shortid/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for shortid
+// Project: https://github.com/dylang/shortid
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export declare function generate(): string;
+export declare function characters(string: string): string;
+export declare function isValid(id: any): boolean;
+export declare function worker(integer: number): void;
+export declare function seed(float: number): void;
diff --git a/shortid/shortid-tests.ts b/shortid/shortid-tests.ts
index 31ee0df1d1..6d05a500b4 100644
--- a/shortid/shortid-tests.ts
+++ b/shortid/shortid-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="shortid.d.ts" />
 
 import shortid = require('shortid');
 
diff --git a/shortid/shortid.d.ts b/shortid/shortid.d.ts
deleted file mode 100644
index bc295f7628..0000000000
--- a/shortid/shortid.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for shortid
-// Project: https://github.com/dylang/shortid
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "shortid" {
-	export function generate(): string;
-	export function characters(string: string): string;
-	export function isValid(id: any): boolean;
-	export function worker(integer: number): void;
-	export function seed(float: number): void;
-}
diff --git a/shortid/tsconfig.json b/shortid/tsconfig.json
new file mode 100644
index 0000000000..2d619f944c
--- /dev/null
+++ b/shortid/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "shortid-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/should-promised/should-promised.d.ts b/should-promised/index.d.ts
similarity index 100%
rename from should-promised/should-promised.d.ts
rename to should-promised/index.d.ts
diff --git a/should-promised/should-promised-tests.ts b/should-promised/should-promised-tests.ts
index 0f4abfd3c9..d68742938f 100644
--- a/should-promised/should-promised-tests.ts
+++ b/should-promised/should-promised-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../should/should.d.ts" />
-/// <reference path="should-promised.d.ts" />
+/// <reference types="should" />
+
 
 var promise: Promise<number> = new Promise<number>(function (resolve, reject) {});
 
diff --git a/should-promised/tsconfig.json b/should-promised/tsconfig.json
new file mode 100644
index 0000000000..5bb0ecfc60
--- /dev/null
+++ b/should-promised/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "should-promised-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/should/should.d.ts b/should/index.d.ts
similarity index 100%
rename from should/should.d.ts
rename to should/index.d.ts
diff --git a/should/should-tests.ts b/should/should-tests.ts
index 41c814aea3..0e755a52b3 100644
--- a/should/should-tests.ts
+++ b/should/should-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="should.d.ts" />
+
 
 import should = require('should');
 
diff --git a/should/tsconfig.json b/should/tsconfig.json
new file mode 100644
index 0000000000..755ad069e1
--- /dev/null
+++ b/should/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "should-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/showdown/index.d.ts b/showdown/index.d.ts
new file mode 100644
index 0000000000..3316a1faba
--- /dev/null
+++ b/showdown/index.d.ts
@@ -0,0 +1,87 @@
+// Type definitions for Showdown 0.3.1
+// Project: https://github.com/coreyti/showdown
+// Definitions by: cbowdon <https://github.com/cbowdon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = Showdown;
+export as namespace showdown;
+
+declare namespace Showdown {
+
+    /** Defined for information only - used in union type */
+    interface Replace {
+        /**
+         * This is just the replacer function argument to String.prototype.replace, signature from lib.d.ts
+         */
+        replace(substring: string, ...args: any[]): string;
+    }
+
+    interface Extension {
+        /**
+         * Describes what type of extension - language ext or output modifier.
+         * If absent, 'output modifier' type is assumed (contrary to comments in source).
+         */
+        type?: string;
+    }
+
+    interface LangExtension extends Extension {
+        filter? (text: string): string;
+    }
+
+    interface OutputModifier extends Extension {
+        /** Used to build a Regex */
+        regex?: string;
+        /** Similar to arg to String.prototype.replace (which is in fact called under the hood) */
+        replace?: any; // string | Replace
+    }
+
+    /**
+     * Defines a plugin/extension
+     * Each single extension can be one of two types:
+     *
+     * + Language Extension -- Language extensions are ones that that add new markdown syntax to showdown. For example, say you wanted ^^youtube http://www.youtube.com/watch?v=oHg5SJYRHA0 to automatically render as an embedded YouTube video, that would be a language extension.
+     * + Output Modifiers -- After showdown has run, and generated HTML, an output modifier would change that HTML. For example, say you wanted to change <div class="header"> to be <header>, that would be an output modifier.
+     *
+     * Each extension can provide two combinations of interfaces for showdown.
+     */
+    interface ShowdownExtension extends LangExtension, OutputModifier {
+    }
+
+    /** Defined for information only - used in union type */
+    interface Plugin {
+        (converter: Converter): ShowdownExtension[];
+    }
+
+    interface ConverterOptions {
+        extensions: any[]; // (string | Plugin)[]
+    }
+
+    interface Converter {
+        /**
+         * @param text The input text (markdown)
+         * @return The output HTML
+         */
+        makeHtml(text: string): string;
+    }
+
+    interface ConverterStatic {
+        /**
+         * @constructor
+         * @param converter_options Configuration object, describes which extensions to apply
+         */
+        new(converter_options?: ConverterOptions): Converter;
+    }
+
+    /** Constructor function for a Converter */
+    var converter: ConverterStatic;
+
+    /** Registered extensions */
+    var extensions: { [name: string]: ShowdownExtension };
+
+    /**
+     * Showdown defers to the ES5 native or other predefined forEach where available, otherwise simple loop
+     * @param obj An array of items
+     * @param callback Applied once to each item (signature here is from forEach in lib.d.ts)
+     */
+    function forEach<T>(obj: T[], callback: (value: T, index: number, array: T[]) => any): void;
+}
diff --git a/showdown/showdown-tests.ts b/showdown/showdown-tests.ts
index bb5adc8507..e6c447ffea 100644
--- a/showdown/showdown-tests.ts
+++ b/showdown/showdown-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="showdown.d.ts" />
+
 
 // compile: tsc showdown/showdown-tests.ts --noImplicitAny --module commonjs
 // run: node showdown/showdown-tests.js
diff --git a/showdown/showdown.d.ts b/showdown/showdown.d.ts
deleted file mode 100644
index 2a34defcb5..0000000000
--- a/showdown/showdown.d.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-// Type definitions for Showdown 0.3.1
-// Project: https://github.com/coreyti/showdown
-// Definitions by: cbowdon <https://github.com/cbowdon>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace Showdown {
-
-    /** Defined for information only - used in union type */
-    interface Replace {
-        /**
-         * This is just the replacer function argument to String.prototype.replace, signature from lib.d.ts
-         */
-        replace(substring: string, ...args: any[]): string;
-    }
-
-    interface Extension {
-        /**
-         * Describes what type of extension - language ext or output modifier.
-         * If absent, 'output modifier' type is assumed (contrary to comments in source).
-         */
-        type?: string;
-    }
-
-    interface LangExtension extends Extension {
-        filter? (text: string): string;
-    }
-
-    interface OutputModifier extends Extension {
-        /** Used to build a Regex */
-        regex?: string;
-        /** Similar to arg to String.prototype.replace (which is in fact called under the hood) */
-        replace?: any; // string | Replace
-    }
-
-    /**
-     * Defines a plugin/extension
-     * Each single extension can be one of two types:
-     *
-     * + Language Extension -- Language extensions are ones that that add new markdown syntax to showdown. For example, say you wanted ^^youtube http://www.youtube.com/watch?v=oHg5SJYRHA0 to automatically render as an embedded YouTube video, that would be a language extension.
-     * + Output Modifiers -- After showdown has run, and generated HTML, an output modifier would change that HTML. For example, say you wanted to change <div class="header"> to be <header>, that would be an output modifier.
-     *
-     * Each extension can provide two combinations of interfaces for showdown.
-     */
-    interface ShowdownExtension extends LangExtension, OutputModifier {
-    }
-
-    /** Defined for information only - used in union type */
-    interface Plugin {
-        (converter: Converter): ShowdownExtension[];
-    }
-
-    interface ConverterOptions {
-        extensions: any[]; // (string | Plugin)[]
-    }
-
-    interface Converter {
-        /**
-         * @param text The input text (markdown)
-         * @return The output HTML
-         */
-        makeHtml(text: string): string;
-    }
-
-    interface ConverterStatic {
-        /**
-         * @constructor
-         * @param converter_options Configuration object, describes which extensions to apply
-         */
-        new(converter_options?: ConverterOptions): Converter;
-    }
-
-    /** Constructor function for a Converter */
-    var converter: ConverterStatic;
-
-    /** Registered extensions */
-    var extensions: { [name: string]: ShowdownExtension };
-
-    /**
-     * Showdown defers to the ES5 native or other predefined forEach where available, otherwise simple loop
-     * @param obj An array of items
-     * @param callback Applied once to each item (signature here is from forEach in lib.d.ts)
-     */
-    function forEach<T>(obj: T[], callback: (value: T, index: number, array: T[]) => any): void;
-}
-
-declare module "showdown" {
-    export = Showdown;
-}
diff --git a/showdown/tsconfig.json b/showdown/tsconfig.json
new file mode 100644
index 0000000000..ab1f7b76e3
--- /dev/null
+++ b/showdown/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "showdown-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/shuffle-array/index.d.ts b/shuffle-array/index.d.ts
new file mode 100644
index 0000000000..710607bf51
--- /dev/null
+++ b/shuffle-array/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for shuffle-array
+// Project: https://github.com/pazguille/shuffle-array
+// Definitions by: rhysd <https://rhysd.github.io>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/**
+ * copy - Sets if should return a shuffled copy of the given array. By default it's a falsy value.
+ * rng - Specifies a custom random number generator.
+ */
+interface ShuffleOption {
+    copy?: boolean;
+    rng?: () => number;
+}
+/**
+ * picks - Specifies how many random elements you want to pick. By default it picks 1.
+ * rng - Specifies a custom random number generator.
+ */
+interface PickOption {
+    picks?: number;
+    rng?: () => number;
+}
+interface ShuffleArray {
+    /**
+     * Randomizes the order of the elements in a given array.
+     *
+     * arr - The given array.
+     * options - Optional configuration options.
+     */
+    <T>(arr: T[], options?: ShuffleOption): T[];
+    /**
+     * Pick one or more random elements from the given array.
+     *
+     * arr - The given array.
+     * options - Optional configuration options.
+     */
+    pick<T>(arr: T[], options?: Object): T[];
+}
+declare var shuffle: ShuffleArray;
+export = shuffle;
diff --git a/shuffle-array/shuffle-array-tests.ts b/shuffle-array/shuffle-array-tests.ts
index 9b799bb6ed..e0101fd503 100644
--- a/shuffle-array/shuffle-array-tests.ts
+++ b/shuffle-array/shuffle-array-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="../shuffle-array/shuffle-array.d.ts" />
 
 import shuffle = require('shuffle-array');
 
diff --git a/shuffle-array/shuffle-array.d.ts b/shuffle-array/shuffle-array.d.ts
deleted file mode 100644
index 880396c4a0..0000000000
--- a/shuffle-array/shuffle-array.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// Type definitions for shuffle-array
-// Project: https://github.com/pazguille/shuffle-array
-// Definitions by: rhysd <https://rhysd.github.io>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "shuffle-array" {
-	/**
-	 * copy - Sets if should return a shuffled copy of the given array. By default it's a falsy value.
-	 * rng - Specifies a custom random number generator.
-	 */
-	interface ShuffleOption {
-		copy?: boolean;
-		rng?: () => number;
-	}
-	/**
-	 * picks - Specifies how many random elements you want to pick. By default it picks 1.
-	 * rng - Specifies a custom random number generator.
-	 */
-	interface PickOption {
-		picks?: number;
-		rng?: () => number;
-	}
-	interface ShuffleArray {
-		/**
-		 * Randomizes the order of the elements in a given array.
-		 *
-		 * arr - The given array.
-		 * options - Optional configuration options.
-		 */
-		<T>(arr: T[], options?: ShuffleOption): T[];
-		/**
-		 * Pick one or more random elements from the given array.
-		 *
-		 * arr - The given array.
-		 * options - Optional configuration options.
-		 */
-		pick<T>(arr: T[], options?: Object): T[];
-	}
-	var shuffle: ShuffleArray;
-	export = shuffle;
-}
-
diff --git a/shuffle-array/tsconfig.json b/shuffle-array/tsconfig.json
new file mode 100644
index 0000000000..5201ee7326
--- /dev/null
+++ b/shuffle-array/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "shuffle-array-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/siesta/siesta.d.ts b/siesta/index.d.ts
similarity index 100%
rename from siesta/siesta.d.ts
rename to siesta/index.d.ts
diff --git a/siesta/siesta-tests.ts b/siesta/siesta-tests.ts
index e0af1d74a5..483257785e 100644
--- a/siesta/siesta-tests.ts
+++ b/siesta/siesta-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="siesta.d.ts" />
+
 
 StartTest(function (t: Siesta.Test.ExtJS) {
     t.waitForComponentQuery('#myItemId', () => {
diff --git a/siesta/siesta-tests.ts.tscparams b/siesta/siesta-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/siesta/siesta-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/siesta/siesta.d.ts.tscparams b/siesta/siesta.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/siesta/siesta.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/siesta/tsconfig.json b/siesta/tsconfig.json
new file mode 100644
index 0000000000..4e3bf508b3
--- /dev/null
+++ b/siesta/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "siesta-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sigmajs/sigmajs.d.ts b/sigmajs/index.d.ts
similarity index 100%
rename from sigmajs/sigmajs.d.ts
rename to sigmajs/index.d.ts
diff --git a/sigmajs/sigmajs-tests.ts b/sigmajs/sigmajs-tests.ts
index 6edd4e68e7..a29ae0773c 100644
--- a/sigmajs/sigmajs-tests.ts
+++ b/sigmajs/sigmajs-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="sigmajs.d.ts"/>
 namespace SigmaJsTests {
     var container = document.createElement("sigma");
     var s = new sigma({
diff --git a/sigmajs/tsconfig.json b/sigmajs/tsconfig.json
new file mode 100644
index 0000000000..d4a693b57c
--- /dev/null
+++ b/sigmajs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sigmajs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/signalr/index.d.ts b/signalr/index.d.ts
new file mode 100644
index 0000000000..dd4f7385bc
--- /dev/null
+++ b/signalr/index.d.ts
@@ -0,0 +1,365 @@
+// Type definitions for SignalR 2.2.0
+// Project: http://www.asp.net/signalr
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>, T. Michael Keesey <https://github.com/keesey/>, Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="jquery" />
+
+
+declare namespace SignalR {
+    
+    const enum ConnectionState {
+        Connecting = 0,
+        Connected = 1,
+        Reconnecting = 2,
+        Disconnected = 4
+    }
+
+    interface AvailableEvents {
+        onStart: string;
+        onStarting: string;
+        onReceived: string;
+        onError: string;
+        onConnectionSlow: string;
+        onReconnect: string;
+        onStateChanged: string;
+        onDisconnect: string;
+    }
+
+    interface Transport {
+        name: string;
+        supportsKeepAlive(): boolean;
+        send(connection: SignalR.Connection, data: any): void;
+        start(connection: SignalR.Connection, onSuccess: () => void, onFailed: (error?: ConnectionError) => void): void;
+        reconnect(connection: SignalR.Connection): void;
+        lostConnection(connection: SignalR.Connection): void;
+        stop(connection: SignalR.Connection): void;
+        abort(connection: SignalR.Connection, async: boolean): void;
+    }
+
+    interface Transports {
+        foreverFrame: Transport;
+        longPolling: Transport;
+        serverSentEvents: Transport;
+        webSockets: Transport;
+    }
+
+    namespace Hub {
+
+        interface Proxy {
+            state: any;
+            connection: Connection;
+            hubName: string;
+            init(connection: Connection, hubName: string): void;
+            hasSubscriptions(): boolean;
+            /**
+            * Wires up a callback to be invoked when a invocation request is received from the server hub.
+            *
+            * @param eventName The name of the hub event to register the callback for.
+            * @param callback The callback to be invoked.
+            */
+            on(eventName: string, callback: (...msg: any[]) => void): Proxy;
+            /**
+            * Removes the callback invocation request from the server hub for the given event name.
+            *
+            * @param eventName The name of the hub event to unregister the callback for.
+            * @param callback The callback to be invoked.
+            */
+            off(eventName: string, callback: (...msg: any[]) => void): Proxy;
+            /**
+            * Invokes a server hub method with the given arguments.
+            *
+            * @param methodName The name of the server hub method.
+            */
+            invoke(methodName: string, ...args: any[]): JQueryPromise<any>;
+        }
+
+        interface Options {
+            queryString?: string;
+            logging?: boolean;
+            useDefaultPath?: boolean;
+        }
+
+        interface ClientHubInvocation {
+            Hub: string;
+            Method: string;
+            Args: string;
+            State: string;
+        }
+
+        interface Connection extends SignalR.Connection {
+            proxies: { [hubName: string]: any };
+            transport: { name: string, supportsKeepAlive: () => boolean };
+            /**
+            * Creates a new proxy object for the given hub connection that can be used to invoke
+            * methods on server hubs and handle client method invocation requests from the server.
+            *
+            * @param hubName The name of the hub on the server to create the proxy for.
+            */
+            createHubProxy(hubName: string): Proxy;
+        }
+
+        interface HubCreator {
+            /**
+            * Creates a new hub connection.
+            *
+            * @param url [Optional] The hub route url, defaults to "/signalr".
+            * @param options [Optional] Settings to use when creating the hubConnection.
+            */
+            (url?: string, options?: Options): Connection;
+        }
+
+        interface IHub {
+            start(): void;
+        }
+
+    }
+
+    interface StateChanged {
+        oldState: number;
+        newState: number;
+    }
+
+    interface ConnectionStates {
+        connecting: number;
+        connected: number;
+        reconnecting: number;
+        disconnected: number;
+    }
+
+    interface Resources {
+        nojQuery: string;
+        noTransportOnInit: string;
+        errorOnNegotiate: string;
+        stoppedWhileLoading: string;
+        stoppedWhileNegotiating: string;
+        errorParsingNegotiateResponse: string;
+        errorDuringStartRequest: string;
+        stoppedDuringStartRequest: string;
+        errorParsingStartResponse: string;
+        invalidStartResponse: string;
+        protocolIncompatible: string;
+        sendFailed: string;
+        parseFailed: string;
+        longPollFailed: string;
+        eventSourceFailedToConnect: string;
+        eventSourceError: string;
+        webSocketClosed: string;
+        pingServerFailedInvalidResponse: string;
+        pingServerFailed: string;
+        pingServerFailedStatusCode: string;
+        pingServerFailedParse: string;
+        noConnectionTransport: string;
+        webSocketsInvalidState: string;
+        reconnectTimeout: string;
+        reconnectWindowTimeout: string;
+    }
+
+    interface AjaxDefaults {
+        processData: boolean;
+        timeout: number;
+        async: boolean;
+        global: boolean;
+        cache: boolean;
+    }
+
+    interface ConnectionOptions {
+        transport?: string | Array<string> | Transport;
+        callback?: Function;
+        waitForPageLoad?: boolean;
+        jsonp?: boolean;
+        pingInterval?: number;
+    }
+
+    interface SimplifyLocation {
+        protocol: string;
+        host: string;
+    }
+    
+    interface ConnectionErrorContext {
+        readyState: number;
+        responseText: string;
+        status: number;
+        statusText: string;
+    }
+
+    interface ConnectionError extends Error {
+        context: ConnectionErrorContext;
+        transport?: string;
+        source?: string;
+    }
+
+    interface Connection {
+        clientProtocol: string;
+        ajaxDataType: string;
+        contentType: string;
+        id: string;
+        json: JSON;
+        logging: boolean;
+        url: string;
+        qs: string | Object;
+        state: number;
+        reconnectDelay: number;
+        transportConnectTimeout: number;
+        /**
+        * This should be set by the server in response to the negotiate request (30s default)
+        */
+        disconnectTimeout: number;
+        /**
+        * This should be set by the server in response to the negotiate request
+        */
+        reconnectWindow: number;
+        /**
+        * Warn user of slow connection if we breach the X% mark of the keep alive timeout
+        */
+        keepAliveWarnAt: number;
+
+        /**
+        * Starts the connection
+        */
+        start(): JQueryPromise<any>;
+
+        /**
+        * Starts the connection
+        *
+        * @param callback A callback function to execute when the connection has started
+        */
+        start(callback: () => void): JQueryPromise<any>;
+
+        /**
+        * Starts the connection
+        *
+        * @param options Options map
+        */
+        start(options: ConnectionOptions): JQueryPromise<any>;
+
+        /**
+        * Starts the connection
+        *
+        * @param options Options map
+        * @param calback A callback function to execute when the connection has started
+        */
+        start(options: ConnectionOptions, callback: () => void): JQueryPromise<any>;
+
+        /**
+        * Adds a callback that will be invoked before anything is sent over the connection
+        *
+        * @param calback A callback function to execute before the connection is fully instantiated.
+        */
+        starting(callback: () => void): Connection;
+
+        /**
+        * Sends data over the connection
+        *
+        * @param options Options map
+        * @param calback The data to send over the connection
+        */
+        send(data: string): Connection;
+
+        /**
+        * Adds a callback that will be invoked after anything is received over the connection
+        *
+        * @param calback A callback function to execute when any data is received on the connection
+        */
+        received(callback: (data: any) => void): Connection;
+
+        /**
+        * Adds a callback that will be invoked when the connection state changes
+        *
+        * @param calback A callback function to execute when the connection state changes
+        */
+        stateChanged(callback: (change: StateChanged) => void): Connection;
+
+        /**
+        * Adds a callback that will be invoked after an error occurs with the connection
+        *
+        * @param calback A callback function to execute when an error occurs on the connection
+        */
+        error(callback: (error: ConnectionError) => void): Connection;
+
+        /**
+        * Adds a callback that will be invoked when the client disconnects
+        *
+        * @param calback A callback function to execute when the connection is broken
+        */
+        disconnected(callback: () => void): Connection;
+
+        /**
+        * Adds a callback that will be invoked when the client detects a slow connection
+        *
+        * @param calback A callback function to execute when the connection is slow
+        */
+        connectionSlow(callback: () => void): Connection;
+
+        /**
+        * Adds a callback that will be invoked when the underlying transport begins reconnecting
+        *
+        * @param calback A callback function to execute when the connection enters a reconnecting state
+        */
+        reconnecting(callback: () => void): Connection;
+
+        /**
+        * Adds a callback that will be invoked when the underlying transport reconnects
+        *
+        * @param calback A callback function to execute when the connection is restored
+        */
+        reconnected(callback: () => void): Connection;
+
+        /**
+        * Stops listening
+        *
+        * @param async Whether or not to asynchronously abort the connection
+        * @param notifyServer Whether we want to notify the server that we are aborting the connection
+        */
+        stop(async?: boolean, notifyServer?: boolean): Connection;
+
+        log(msg: string): Connection;
+
+        /**
+        * Checks if url is cross domain
+        *
+        * @param url The base URL
+        * @param against An optional argument to compare the URL against, if not specified it will be set to window.location. If specified it must contain a protocol and a host property.
+        */
+        isCrossDomain(url: string, against?: Location | SimplifyLocation): boolean;
+
+        hub: Hub.Connection;
+
+        lastError: ConnectionError;
+        resources: Resources;
+    }
+}
+
+interface SignalR {
+    /**
+    * Creates a new SignalR connection for the given url
+    *
+    * @param url   The URL of the long polling endpoint
+    * @param queryString   [Optional] Custom querystring parameters to add to the connection URL. If an object, every non-function member will be added to the querystring. If a string, it's added to the QS as specified.
+    * @param logging [Optional] A flag indicating whether connection logging is enabled to the browser console/log. Defaults to false.
+    */
+    (url: string, queryString?: string | Object, logging?: boolean): SignalR.Connection;
+    ajaxDefaults: SignalR.AjaxDefaults;
+    changeState(connection: SignalR.Connection, expectedState: number, newState: number): void;
+    connectionState: SignalR.ConnectionStates;
+    events: SignalR.AvailableEvents;
+    transports: SignalR.Transports;
+    hub: SignalR.Hub.Connection;
+    hubConnection: SignalR.Hub.HubCreator;
+    isDisconnecting(connection: SignalR.Connection): boolean;
+    /**
+    *   Reinstates the original value of $.connection and returns the signalR object for manual assignment.
+    */
+    noConflict(): SignalR.Connection;
+    /**
+    *   Current SignalR version.
+    */
+    version: string;
+}
+
+interface JQueryStatic {
+    signalR: SignalR;
+    connection: SignalR;
+    hubConnection: SignalR.Hub.HubCreator;
+}
diff --git a/signalr/signalr-1.0-tests.ts b/signalr/signalr-1.0-tests.ts
index 725c65c6be..ccbe018242 100644
--- a/signalr/signalr-1.0-tests.ts
+++ b/signalr/signalr-1.0-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="signalr-1.0.d.ts" />
+
 
 function test_client() {
     var connection = $.connection('/echo');
diff --git a/signalr/signalr-1.0.d.ts b/signalr/signalr-1.0.d.ts
index c1aeb6a60b..129e211d3f 100644
--- a/signalr/signalr-1.0.d.ts
+++ b/signalr/signalr-1.0.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-/// <reference path="../jquery/jquery.d.ts" />
+/// <reference types="jquery" />
 
 interface HubMethod {
     (callback: (data: string) => void ): any;
diff --git a/signalr/signalr-tests.ts b/signalr/signalr-tests.ts
index f18eecd988..f678acbbf4 100644
--- a/signalr/signalr-tests.ts
+++ b/signalr/signalr-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="signalr.d.ts" />
+
 
 var connection = $.hubConnection();
 var contosoChatHubProxy = connection.createHubProxy('contosoChatHub');
diff --git a/signalr/signalr.d.ts b/signalr/signalr.d.ts
deleted file mode 100644
index ea150d71f9..0000000000
--- a/signalr/signalr.d.ts
+++ /dev/null
@@ -1,365 +0,0 @@
-// Type definitions for SignalR 2.2.0
-// Project: http://www.asp.net/signalr
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>, T. Michael Keesey <https://github.com/keesey/>, Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-
-declare namespace SignalR {
-    
-    const enum ConnectionState {
-        Connecting = 0,
-        Connected = 1,
-        Reconnecting = 2,
-        Disconnected = 4
-    }
-
-    interface AvailableEvents {
-        onStart: string;
-        onStarting: string;
-        onReceived: string;
-        onError: string;
-        onConnectionSlow: string;
-        onReconnect: string;
-        onStateChanged: string;
-        onDisconnect: string;
-    }
-
-    interface Transport {
-        name: string;
-        supportsKeepAlive(): boolean;
-        send(connection: SignalR.Connection, data: any): void;
-        start(connection: SignalR.Connection, onSuccess: () => void, onFailed: (error?: ConnectionError) => void): void;
-        reconnect(connection: SignalR.Connection): void;
-        lostConnection(connection: SignalR.Connection): void;
-        stop(connection: SignalR.Connection): void;
-        abort(connection: SignalR.Connection, async: boolean): void;
-    }
-
-    interface Transports {
-        foreverFrame: Transport;
-        longPolling: Transport;
-        serverSentEvents: Transport;
-        webSockets: Transport;
-    }
-
-    namespace Hub {
-
-        interface Proxy {
-            state: any;
-            connection: Connection;
-            hubName: string;
-            init(connection: Connection, hubName: string): void;
-            hasSubscriptions(): boolean;
-            /**
-            * Wires up a callback to be invoked when a invocation request is received from the server hub.
-            *
-            * @param eventName The name of the hub event to register the callback for.
-            * @param callback The callback to be invoked.
-            */
-            on(eventName: string, callback: (...msg: any[]) => void): Proxy;
-            /**
-            * Removes the callback invocation request from the server hub for the given event name.
-            *
-            * @param eventName The name of the hub event to unregister the callback for.
-            * @param callback The callback to be invoked.
-            */
-            off(eventName: string, callback: (...msg: any[]) => void): Proxy;
-            /**
-            * Invokes a server hub method with the given arguments.
-            *
-            * @param methodName The name of the server hub method.
-            */
-            invoke(methodName: string, ...args: any[]): JQueryPromise<any>;
-        }
-
-        interface Options {
-            queryString?: string;
-            logging?: boolean;
-            useDefaultPath?: boolean;
-        }
-
-        interface ClientHubInvocation {
-            Hub: string;
-            Method: string;
-            Args: string;
-            State: string;
-        }
-
-        interface Connection extends SignalR.Connection {
-            proxies: { [hubName: string]: any };
-            transport: { name: string, supportsKeepAlive: () => boolean };
-            /**
-            * Creates a new proxy object for the given hub connection that can be used to invoke
-            * methods on server hubs and handle client method invocation requests from the server.
-            *
-            * @param hubName The name of the hub on the server to create the proxy for.
-            */
-            createHubProxy(hubName: string): Proxy;
-        }
-
-        interface HubCreator {
-            /**
-            * Creates a new hub connection.
-            *
-            * @param url [Optional] The hub route url, defaults to "/signalr".
-            * @param options [Optional] Settings to use when creating the hubConnection.
-            */
-            (url?: string, options?: Options): Connection;
-        }
-
-        interface IHub {
-            start(): void;
-        }
-
-    }
-
-    interface StateChanged {
-        oldState: number;
-        newState: number;
-    }
-
-    interface ConnectionStates {
-        connecting: number;
-        connected: number;
-        reconnecting: number;
-        disconnected: number;
-    }
-
-    interface Resources {
-        nojQuery: string;
-        noTransportOnInit: string;
-        errorOnNegotiate: string;
-        stoppedWhileLoading: string;
-        stoppedWhileNegotiating: string;
-        errorParsingNegotiateResponse: string;
-        errorDuringStartRequest: string;
-        stoppedDuringStartRequest: string;
-        errorParsingStartResponse: string;
-        invalidStartResponse: string;
-        protocolIncompatible: string;
-        sendFailed: string;
-        parseFailed: string;
-        longPollFailed: string;
-        eventSourceFailedToConnect: string;
-        eventSourceError: string;
-        webSocketClosed: string;
-        pingServerFailedInvalidResponse: string;
-        pingServerFailed: string;
-        pingServerFailedStatusCode: string;
-        pingServerFailedParse: string;
-        noConnectionTransport: string;
-        webSocketsInvalidState: string;
-        reconnectTimeout: string;
-        reconnectWindowTimeout: string;
-    }
-
-    interface AjaxDefaults {
-        processData: boolean;
-        timeout: number;
-        async: boolean;
-        global: boolean;
-        cache: boolean;
-    }
-
-    interface ConnectionOptions {
-        transport?: string | Array<string> | Transport;
-        callback?: Function;
-        waitForPageLoad?: boolean;
-        jsonp?: boolean;
-        pingInterval?: number;
-    }
-
-    interface SimplifyLocation {
-        protocol: string;
-        host: string;
-    }
-    
-    interface ConnectionErrorContext {
-        readyState: number;
-        responseText: string;
-        status: number;
-        statusText: string;
-    }
-
-    interface ConnectionError extends Error {
-        context: ConnectionErrorContext;
-        transport?: string;
-        source?: string;
-    }
-
-    interface Connection {
-        clientProtocol: string;
-        ajaxDataType: string;
-        contentType: string;
-        id: string;
-        json: JSON;
-        logging: boolean;
-        url: string;
-        qs: string | Object;
-        state: number;
-        reconnectDelay: number;
-        transportConnectTimeout: number;
-        /**
-        * This should be set by the server in response to the negotiate request (30s default)
-        */
-        disconnectTimeout: number;
-        /**
-        * This should be set by the server in response to the negotiate request
-        */
-        reconnectWindow: number;
-        /**
-        * Warn user of slow connection if we breach the X% mark of the keep alive timeout
-        */
-        keepAliveWarnAt: number;
-
-        /**
-        * Starts the connection
-        */
-        start(): JQueryPromise<any>;
-
-        /**
-        * Starts the connection
-        *
-        * @param callback A callback function to execute when the connection has started
-        */
-        start(callback: () => void): JQueryPromise<any>;
-
-        /**
-        * Starts the connection
-        *
-        * @param options Options map
-        */
-        start(options: ConnectionOptions): JQueryPromise<any>;
-
-        /**
-        * Starts the connection
-        *
-        * @param options Options map
-        * @param calback A callback function to execute when the connection has started
-        */
-        start(options: ConnectionOptions, callback: () => void): JQueryPromise<any>;
-
-        /**
-        * Adds a callback that will be invoked before anything is sent over the connection
-        *
-        * @param calback A callback function to execute before the connection is fully instantiated.
-        */
-        starting(callback: () => void): Connection;
-
-        /**
-        * Sends data over the connection
-        *
-        * @param options Options map
-        * @param calback The data to send over the connection
-        */
-        send(data: string): Connection;
-
-        /**
-        * Adds a callback that will be invoked after anything is received over the connection
-        *
-        * @param calback A callback function to execute when any data is received on the connection
-        */
-        received(callback: (data: any) => void): Connection;
-
-        /**
-        * Adds a callback that will be invoked when the connection state changes
-        *
-        * @param calback A callback function to execute when the connection state changes
-        */
-        stateChanged(callback: (change: StateChanged) => void): Connection;
-
-        /**
-        * Adds a callback that will be invoked after an error occurs with the connection
-        *
-        * @param calback A callback function to execute when an error occurs on the connection
-        */
-        error(callback: (error: ConnectionError) => void): Connection;
-
-        /**
-        * Adds a callback that will be invoked when the client disconnects
-        *
-        * @param calback A callback function to execute when the connection is broken
-        */
-        disconnected(callback: () => void): Connection;
-
-        /**
-        * Adds a callback that will be invoked when the client detects a slow connection
-        *
-        * @param calback A callback function to execute when the connection is slow
-        */
-        connectionSlow(callback: () => void): Connection;
-
-        /**
-        * Adds a callback that will be invoked when the underlying transport begins reconnecting
-        *
-        * @param calback A callback function to execute when the connection enters a reconnecting state
-        */
-        reconnecting(callback: () => void): Connection;
-
-        /**
-        * Adds a callback that will be invoked when the underlying transport reconnects
-        *
-        * @param calback A callback function to execute when the connection is restored
-        */
-        reconnected(callback: () => void): Connection;
-
-        /**
-        * Stops listening
-        *
-        * @param async Whether or not to asynchronously abort the connection
-        * @param notifyServer Whether we want to notify the server that we are aborting the connection
-        */
-        stop(async?: boolean, notifyServer?: boolean): Connection;
-
-        log(msg: string): Connection;
-
-        /**
-        * Checks if url is cross domain
-        *
-        * @param url The base URL
-        * @param against An optional argument to compare the URL against, if not specified it will be set to window.location. If specified it must contain a protocol and a host property.
-        */
-        isCrossDomain(url: string, against?: Location | SimplifyLocation): boolean;
-
-        hub: Hub.Connection;
-
-        lastError: ConnectionError;
-        resources: Resources;
-    }
-}
-
-interface SignalR {
-    /**
-    * Creates a new SignalR connection for the given url
-    *
-    * @param url   The URL of the long polling endpoint
-    * @param queryString   [Optional] Custom querystring parameters to add to the connection URL. If an object, every non-function member will be added to the querystring. If a string, it's added to the QS as specified.
-    * @param logging [Optional] A flag indicating whether connection logging is enabled to the browser console/log. Defaults to false.
-    */
-    (url: string, queryString?: string | Object, logging?: boolean): SignalR.Connection;
-    ajaxDefaults: SignalR.AjaxDefaults;
-    changeState(connection: SignalR.Connection, expectedState: number, newState: number): void;
-    connectionState: SignalR.ConnectionStates;
-    events: SignalR.AvailableEvents;
-    transports: SignalR.Transports;
-    hub: SignalR.Hub.Connection;
-    hubConnection: SignalR.Hub.HubCreator;
-    isDisconnecting(connection: SignalR.Connection): boolean;
-    /**
-    *   Reinstates the original value of $.connection and returns the signalR object for manual assignment.
-    */
-    noConflict(): SignalR.Connection;
-    /**
-    *   Current SignalR version.
-    */
-    version: string;
-}
-
-interface JQueryStatic {
-    signalR: SignalR;
-    connection: SignalR;
-    hubConnection: SignalR.Hub.HubCreator;
-}
diff --git a/signalr/tsconfig.json b/signalr/tsconfig.json
new file mode 100644
index 0000000000..8e92ec183e
--- /dev/null
+++ b/signalr/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "signalr-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/signals/index.d.ts b/signals/index.d.ts
new file mode 100644
index 0000000000..879aa189f1
--- /dev/null
+++ b/signals/index.d.ts
@@ -0,0 +1,112 @@
+// Type definitions for JS-Signals
+// Project: http://millermedeiros.github.io/js-signals/
+// Definitions by: Diullei Gomes <https://github.com/diullei>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var signals: signals.SignalWrapper;
+
+export = signals;
+export as namespace signals;
+
+declare namespace signals {
+
+    interface SignalWrapper {
+        Signal: Signal
+    }
+
+    interface SignalBinding {
+        active: boolean;
+        context: any;
+        params: any;
+        detach(): Function;
+        execute(paramsArr?: any[]): any;
+        getListener(): Function;
+        getSignal(): Signal;
+        isBound(): boolean;
+        isOnce(): boolean;
+    }
+
+    interface Signal {
+        /**
+         * Custom event broadcaster
+         * <br />- inspired by Robert Penner's AS3 Signals.
+         * @name Signal
+         * @author Miller Medeiros
+         * @constructor
+         */
+        new (): Signal;
+
+        /**
+         * If Signal is active and should broadcast events.
+         */
+        active: boolean;
+
+        /**
+         * If Signal should keep record of previously dispatched parameters and automatically
+         * execute listener during add()/addOnce() if Signal was already dispatched before.
+         */
+        memorize: boolean;
+
+        /**
+         * Signals Version Number
+         */
+        VERSION: string;
+
+        /**
+         * Add a listener to the signal.
+         *
+         * @param listener Signal handler function.
+         * @param listenercontext Context on which listener will be executed (object that should represent the `this` variable inside listener function).
+         * @param priority The priority level of the event listener. Listeners with higher priority will be executed before listeners with lower priority. Listeners with same priority level will be executed at the same order as they were added. (default = 0)
+         */
+        add(listener: Function, listenerContext?: any, priority?: Number): SignalBinding;
+
+        /**
+        * Add listener to the signal that should be removed after first execution (will be executed only once).
+        *
+        * @param listener Signal handler function.
+        * @param listenercontext Context on which listener will be executed (object that should represent the `this` variable inside listener function).
+        * @param priority The priority level of the event listener. Listeners with higher priority will be executed before listeners with lower priority. Listeners with same priority level will be executed at the same order as they were added. (default = 0)
+        */
+        addOnce(listener: Function, listenerContext?: any, priority?: Number): SignalBinding;
+
+        /**
+         * Dispatch/Broadcast Signal to all listeners added to the queue.
+         *
+         * @param params Parameters that should be passed to each handler.
+         */
+        dispatch(...params: any[]): void;
+
+        /**
+         * Remove all bindings from signal and destroy any reference to external objects (destroy Signal object).
+         */
+        dispose(): void;
+
+        /**
+         * Forget memorized arguments.
+         */
+        forget(): void;
+
+        /**
+         * Returns a number of listeners attached to the Signal.
+         */
+        getNumListeners(): number;
+
+        /**
+         * Stop propagation of the event, blocking the dispatch to next listeners on the queue.
+         */
+        halt(): void;
+
+        /**
+         * Check if listener was attached to Signal.
+         */
+        has(listener: Function, context?: any): boolean;
+
+        /**
+         * Remove a single listener from the dispatch queue.
+         */
+        remove(listener: Function, context?: any): Function;
+
+        removeAll(): void;
+    }
+}
diff --git a/js-signals/js-signals-tests.ts b/signals/js-signals-tests.ts
similarity index 90%
rename from js-signals/js-signals-tests.ts
rename to signals/js-signals-tests.ts
index 0be29da5bd..a0fa8e34f1 100644
--- a/js-signals/js-signals-tests.ts
+++ b/signals/js-signals-tests.ts
@@ -1,9 +1,8 @@
-///<reference path="js-signals.d.ts" />
-
+import signals = require("signals");
 // lifted from https://github.com/millermedeiros/js-signals/wiki/Examples
 interface TestObject {
-  started: Signal;
-  stopped: Signal;
+  started: signals.Signal;
+  stopped: signals.Signal;
 }
 
 namespace Signals.Tests {
@@ -145,11 +144,11 @@ namespace Signals.AdvancedTests {
   var handler = function(){
     alert('foo bar');
   };
-  var binding:SignalBinding = myObject.started.add(handler); //methods `add()` and `addOnce()` returns a SignalBinding object
+  var binding: signals.SignalBinding = myObject.started.add(handler); //methods `add()` and `addOnce()` returns a SignalBinding object
   binding.execute(); //will alert "foo bar"
 
   //Retrieve anonymous listener
-  var binding:SignalBinding = myObject.started.add(function(){
+  var binding:signals.SignalBinding = myObject.started.add(function(){
     alert('foo bar');
   });
 
@@ -158,7 +157,7 @@ namespace Signals.AdvancedTests {
   var anonymousHandler = binding.getListener(); //reference to the anonymous function
 
   //Remove / Detach anonymous listener
-  var binding:SignalBinding = myObject.started.add(function(){
+  var binding:signals.SignalBinding = myObject.started.add(function(){
     alert('foo bar');
   });
   myObject.started.dispatch(); //will alert "foo bar"
@@ -167,10 +166,10 @@ namespace Signals.AdvancedTests {
   myObject.started.dispatch(); //nothing happens
 
   //Check if binding will execute only once
-  var binding1:SignalBinding = myObject.started.add(function(){
+  var binding1:signals.SignalBinding = myObject.started.add(function(){
     alert('foo bar');
   });
-  var binding2:SignalBinding = myObject.started.addOnce(function(){
+  var binding2:signals.SignalBinding = myObject.started.addOnce(function(){
     alert('foo bar');
   });
   alert(binding1.isOnce()); //alert "false"
@@ -181,7 +180,7 @@ namespace Signals.AdvancedTests {
   var obj = {
     foo : "it's over 9000!"
   };
-  var binding:SignalBinding = myObject.started.add(function(){
+  var binding:signals.SignalBinding = myObject.started.add(function(){
     alert(this.foo);
   });
   myObject.started.dispatch(); //will alert "bar"
@@ -189,7 +188,7 @@ namespace Signals.AdvancedTests {
   myObject.started.dispatch(); //will alert "it's over 9000!"
 
   //Add default parameters to Signal dispatch (v0.6.3+)
-  var binding:SignalBinding = myObject.started.add(function(a:string, b:string, c:string){
+  var binding:signals.SignalBinding = myObject.started.add(function(a:string, b:string, c:string){
     alert(a +' '+ b +' '+ c);
   });
   binding.params = ['lorem', 'ipsum']; //set default parameters of the binding
diff --git a/signals/tsconfig.json b/signals/tsconfig.json
new file mode 100644
index 0000000000..b947e90e3b
--- /dev/null
+++ b/signals/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "js-signals-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/signature_pad/signature_pad.d.ts b/signature_pad/index.d.ts
similarity index 100%
rename from signature_pad/signature_pad.d.ts
rename to signature_pad/index.d.ts
diff --git a/signature_pad/signature_pad-tests.ts b/signature_pad/signature_pad-tests.ts
index 57c42e7d41..d4968b5c2a 100644
--- a/signature_pad/signature_pad-tests.ts
+++ b/signature_pad/signature_pad-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path='signature_pad.d.ts'/>
-
 /* TEST 1 - Basic structure and usage */
 function BasicTest() {
     var canvas = document.querySelector("canvas");
diff --git a/signature_pad/tsconfig.json b/signature_pad/tsconfig.json
new file mode 100644
index 0000000000..4d049421e7
--- /dev/null
+++ b/signature_pad/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "signature_pad-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/simple-cw-node/index.d.ts b/simple-cw-node/index.d.ts
new file mode 100644
index 0000000000..c73394e4b0
--- /dev/null
+++ b/simple-cw-node/index.d.ts
@@ -0,0 +1,83 @@
+// Type definitions for simple-cw-node
+// Project: https://github.com/astronaughts/simple-cw-node
+// Definitions by: vvakame <https://github.com/vvakame>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+import superagent = require("superagent");
+// TODO 1. update superagent with generics
+// TODO 2. create underscore.deffered .d.ts file
+// TODO 3. refactor & improve specialized parameter methods
+
+// Merged declaration, ChatWork is both a callable function and a namespace
+declare function ChatWork(): ChatWork.ChatWork;
+
+declare namespace ChatWork {
+    interface ChatWorkInitOptions {
+        token: string;
+    }
+
+    interface ChatWork {
+        apiVersion: string;
+        sdkVersion: string;
+        token: string;
+        Deferred: any; // _.Deferred
+        when: any; // _.when
+
+        init(options: ChatWorkInitOptions): void;
+
+        // http://developer.chatwork.com/ja/endpoint_me.html
+        get(api: "me", callback: (err: Error, res: superagent.Response) => void): void;
+
+        // http://developer.chatwork.com/ja/endpoint_my.html
+        get(api: "my/status", callback: (err: Error, res: superagent.Response) => void): void;
+        get(api: "my/tasks", callback: (err: Error, res: superagent.Response) => void): void;
+
+        // http://developer.chatwork.com/ja/endpoint_contacts.html
+        get(api: "contacts", callback: (err: Error, res: superagent.Response) => void): void;
+
+        // http://developer.chatwork.com/ja/endpoint_rooms.html
+        get(api: "rooms", callback: (err: Error, res: superagent.Response) => void): void;
+        post(api: "rooms", args: any, callback: (err: Error, res: superagent.Response) => void): void;
+
+        // can't create specialized parameter
+        // specialized parameter required compile-time constant string literal
+        // GET      /rooms/{room_id}
+        // PUT      /rooms/{room_id}
+        // DELETE   /rooms/{room_id}
+        // GET      /rooms/{room_id}/members
+        // PUT      /rooms/{room_id}/members
+        // GET      /rooms/{room_id}/messages <- not implemented yet
+        // POST     /rooms/{room_id}/messages
+        // GET      /rooms/{room_id}/messages/{message_id}
+        // GET      /rooms/{room_id}/tasks
+        // POST     /rooms/{room_id}/tasks
+        // GET      /rooms/{room_id}/tasks/{task_id}
+        // GET      /rooms/{room_id}/files
+        // GET      /rooms/{room_id}/files/{file_id}
+
+        // General functions
+
+        api(method: string, api: string): any; // return same type as _.Deferred()
+        api(method: string, api: string, callback: (err: Error, res: superagent.Response) => void): void;
+        api(method: string, api: string, args: any, callback: (err: Error, res: superagent.Response) => void): void;
+
+        get(api: string): any; // return same type as _.Deferred()
+        get(api: string, callback: (err: Error, res: superagent.Response) => void): void;
+        get(api: string, args: any, callback: (err: Error, res: superagent.Response) => void): void;
+
+        post(api: string): any; // return same type as _.Deferred()
+        post(api: string, callback: (err: Error, res: superagent.Response) => void): void;
+        post(api: string, args: any, callback: (err: Error, res: superagent.Response) => void): void;
+
+        put(api: string): any; // return same type as _.Deferred()
+        put(api: string, callback: (err: Error, res: superagent.Response) => void): void;
+        put(api: string, args: any, callback: (err: Error, res: superagent.Response) => void): void;
+
+        del(api: string): any; // return same type as _.Deferred()
+        del(api: string, callback: (err: Error, res: superagent.Response) => void): void;
+        del(api: string, args: any, callback: (err: Error, res: superagent.Response) => void): void;
+    }
+}
+
+export = ChatWork;
diff --git a/simple-cw-node/simple-cw-node-tests.ts b/simple-cw-node/simple-cw-node-tests.ts
index d25cc0399d..0e1361357b 100644
--- a/simple-cw-node/simple-cw-node-tests.ts
+++ b/simple-cw-node/simple-cw-node-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="../node/node.d.ts" />
-
-/// <reference path="./simple-cw-node.d.ts" />
+/// <reference types="node" />
 
 import CW = require('simple-cw-node');
 var client = CW();
diff --git a/simple-cw-node/simple-cw-node.d.ts b/simple-cw-node/simple-cw-node.d.ts
deleted file mode 100644
index 5634ac5a1f..0000000000
--- a/simple-cw-node/simple-cw-node.d.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-// Type definitions for simple-cw-node
-// Project: https://github.com/astronaughts/simple-cw-node
-// Definitions by: vvakame <https://github.com/vvakame>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../superagent/superagent.d.ts" />
-
-declare module "simple-cw-node" {
-	import superagent = require("superagent");
-	// TODO 1. update superagent with generics
-	// TODO 2. create underscore.deffered .d.ts file
-	// TODO 3. refactor & improve specialized parameter methods
-
-	// Merged declaration, ChatWork is both a callable function and a namespace
-	function ChatWork():ChatWork.ChatWork;
-
-	namespace ChatWork {
-		interface ChatWorkInitOptions {
-			token:string;
-		}
-
-		interface ChatWork {
-			apiVersion:string;
-			sdkVersion:string;
-			token:string;
-			Deferred: any; // _.Deferred
-			when: any; // _.when
-
-			init(options:ChatWorkInitOptions):void;
-
-			// http://developer.chatwork.com/ja/endpoint_me.html
-			get(api:"me", callback:(err:Error, res:superagent.Response)=>void):void;
-
-			// http://developer.chatwork.com/ja/endpoint_my.html
-			get(api:"my/status", callback:(err:Error, res:superagent.Response)=>void):void;
-			get(api:"my/tasks", callback:(err:Error, res:superagent.Response)=>void):void;
-
-			// http://developer.chatwork.com/ja/endpoint_contacts.html
-			get(api:"contacts", callback:(err:Error, res:superagent.Response)=>void):void;
-
-			// http://developer.chatwork.com/ja/endpoint_rooms.html
-			get(api:"rooms", callback:(err:Error, res:superagent.Response)=>void):void;
-			post(api:"rooms", args:any, callback:(err:Error, res:superagent.Response)=>void):void;
-
-			// can't create specialized parameter
-			// specialized parameter required compile-time constant string literal
-			// GET      /rooms/{room_id}
-			// PUT      /rooms/{room_id}
-			// DELETE   /rooms/{room_id}
-			// GET      /rooms/{room_id}/members
-			// PUT      /rooms/{room_id}/members
-			// GET      /rooms/{room_id}/messages <- not implemented yet
-			// POST     /rooms/{room_id}/messages
-			// GET      /rooms/{room_id}/messages/{message_id}
-			// GET      /rooms/{room_id}/tasks
-			// POST     /rooms/{room_id}/tasks
-			// GET      /rooms/{room_id}/tasks/{task_id}
-			// GET      /rooms/{room_id}/files
-			// GET      /rooms/{room_id}/files/{file_id}
-
-			// General functions
-
-			api(method:string, api:string):any; // return same type as _.Deferred()
-			api(method:string, api:string, callback:(err:Error, res:superagent.Response)=>void):void;
-			api(method:string, api:string, args:any, callback:(err:Error, res:superagent.Response)=>void):void;
-
-			get(api:string):any; // return same type as _.Deferred()
-			get(api:string, callback:(err:Error, res:superagent.Response)=>void):void;
-			get(api:string, args:any, callback:(err:Error, res:superagent.Response)=>void):void;
-
-			post(api:string):any; // return same type as _.Deferred()
-			post(api:string, callback:(err:Error, res:superagent.Response)=>void):void;
-			post(api:string, args:any, callback:(err:Error, res:superagent.Response)=>void):void;
-
-			put(api:string):any; // return same type as _.Deferred()
-			put(api:string, callback:(err:Error, res:superagent.Response)=>void):void;
-			put(api:string, args:any, callback:(err:Error, res:superagent.Response)=>void):void;
-
-			del(api:string):any; // return same type as _.Deferred()
-			del(api:string, callback:(err:Error, res:superagent.Response)=>void):void;
-			del(api:string, args:any, callback:(err:Error, res:superagent.Response)=>void):void;
-		}
-	}
-
-	export = ChatWork;
-}
diff --git a/simple-cw-node/tsconfig.json b/simple-cw-node/tsconfig.json
new file mode 100644
index 0000000000..555df82388
--- /dev/null
+++ b/simple-cw-node/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "simple-cw-node-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/simple-mock/index.d.ts b/simple-mock/index.d.ts
new file mode 100644
index 0000000000..dd95b6159f
--- /dev/null
+++ b/simple-mock/index.d.ts
@@ -0,0 +1,193 @@
+// Type definitions for simple-mock
+// Project: https://github.com/jupiter/simple-mock
+// Definitions by: Leon Yu <https://github.com/leonyu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace Simple {
+  type Fn<T> = {
+    (...args: any[]): T
+  }
+
+  export interface Static {
+    /**
+     * Restores all current mocks.
+     */
+    restore(): void;
+
+    /**
+     * Wraps fn in a spy and sets this on the obj, restorable with all mocks.
+     */
+    mock<T>(obj: any, key: string, fn: Fn<T>): Stub<T>;
+
+    /**
+     * Sets the value on this object. E.g. mock(config, 'title', 'test') is the same as config.title = 'test', but restorable with all mocks.
+     */
+    mock<T>(obj: any, key: string, mockValue: T): T;
+
+    /**
+     * If obj has already has this function, it is wrapped in a spy. The resulting spy can be turned into a stub by further configuration. Restores with all mocks.
+     */
+    mock(obj: any, key: string): Stub<any>;
+    mock<T>(obj: any, key: string): Stub<T>;
+
+    /**
+     * Wraps fn in a spy.
+     */
+    spy<T>(fn: Fn<T>): Spy<T>;
+    /**
+     * Wraps fn in a spy.
+     */
+    mock<T>(fn: Fn<T>): Spy<T>;
+
+    /**
+     * Returns a stub function that is also a spy.
+     */
+    stub(): Stub<any>;
+    stub<T>(): Stub<T>;
+
+    /**
+     * Returns a stub function that is also a spy.
+     */
+    mock(): Stub<any>;
+    mock<T>(): Stub<T>;
+
+    Promise?: PromiseConstructorLike;
+  }
+
+  interface Calls<T> {
+    /**
+     * an array of arguments received on the call
+     */
+    args: any[];
+    /**
+     * first argument
+     */
+    arg: any;
+    /**
+     * the context (this) of the call
+     */
+    context: any;
+    /**
+     * the value returned by the wrapped function
+     */
+    returned: T;
+    /**
+     * the error thrown by the wrapped function
+     */
+    threw: Error;
+    /**
+     * autoincrementing number, can be compared to evaluate call order
+     */
+    k: number;
+  }
+
+  export interface Spy<T>{
+    (...args: any[]): T;
+
+    called: boolean;
+    /**
+     * Number of times the function was called.
+     */
+    callCount: number;
+    calls: Calls<T>[];
+    firstCall: Calls<T>;
+    /**
+     * The last call object. (This is often also the first and only call.)
+     */
+    lastCall: Calls<T>;
+    /**
+     * Resets all counts and properties to the original state.
+     */
+    reset(): void;
+  }
+
+  interface Action<T> {
+    /**
+     * arguments to call back with
+     */
+    cbArgs: ArrayLike<any>;
+    returnValue: T;
+    throwError: Error;
+  }
+
+  export interface Stub<T> extends Spy<T> {
+    /**
+     * Configures this stub to call this function, returning its return value.
+     * Subsequent calls of this on the same stub (chainable) will queue up different behaviours for each subsequent call of the stub.
+     */
+    callFn<R>(fn: Fn<R>): Stub<R>;
+
+    /**
+     * Configures this stub to call the original, unstubbed function, returning its return value.
+     * Subsequent calls of this on the same stub (chainable) will queue up different behaviours for each subsequent call of the stub.
+     */
+    callOriginal(): Stub<T>;
+
+    /**
+     * Configures this stub to return with this value.
+     * Subsequent calls of this on the same stub (chainable) will queue up different behaviours for each subsequent call of the stub.
+     */
+    returnWith<R>(val: R): Stub<R>;
+
+    /**
+     * Configures this stub to throw this error.
+     * Subsequent calls of this on the same stub (chainable) will queue up different behaviours for each subsequent call of the stub.
+     */
+    throwWith(err: Error): Stub<T>;
+
+    /**
+     * Configures this stub to call back with the arguments passed. It will use either the last argument as callback, or the argument at cbArgumentIndex.
+     * Subsequent calls of this on the same stub (chainable) will queue up different behaviours for each subsequent call of the stub.
+     */
+    callback(...args: any[]): Stub<T>;
+    /**
+     * Configures this stub to call back with the arguments passed. It will use either the last argument as callback, or the argument at cbArgumentIndex.
+     * Subsequent calls of this on the same stub (chainable) will queue up different behaviours for each subsequent call of the stub.
+     */
+    callbackWith(...args: any[]): Stub<T>;
+
+    /**
+     * Configures this stub to call back with the arguments passed. It will use either the last argument as callback, or the argument at cbArgumentIndex.
+     * Subsequent calls of this on the same stub (chainable) will queue up different behaviours for each subsequent call of the stub.
+     */
+    callbackAtIndex(cbArgumentIndex: number, ...args: any[]): Stub<T>;
+    /**
+     * Configures this stub to call back with the arguments passed. It will use either the last argument as callback, or the argument at cbArgumentIndex.
+     * Subsequent calls of this on the same stub (chainable) will queue up different behaviours for each subsequent call of the stub.
+     */
+    callbackArgWith(cbArgumentIndex: number, ...args: any[]): Stub<T>;
+
+
+    /**
+     * Configures the last configured function or callback to be called in this context, i.e. this will be obj.
+     */
+    inThisContext(obj: any): Stub<T>;
+
+    /**
+     * Configures the stub to return a Promise (where available] resolving to this value. Same as stub.returnWith(Promise.resolve(val)).
+     * You can use a custom Promise-conforming library, i.e. simple.Promise = require('bluebird') or simple.Promise = $q.
+     */
+    resolveWith<V>(val: V): Stub<PromiseLike<V>>;
+
+    /**
+     * Configures the stub to return a Promise (where available) rejecting with this error. Same as stub.returnWith(Promise.reject(val)).
+     * You can use a custom Promise-conforming library, i.e. simple.Promise = require('bluebird') or simple.Promise = $q.
+     */
+    rejectWith<V>(val: V): Stub<PromiseLike<V>>;
+
+    /**
+     * An array of behaviours, each having one of these properties:
+     */
+    actions: Action<T>[];
+
+    /**
+     * setting whether the queue of actions for this stub should repeat.
+     * @default true
+     */
+    loop: boolean;
+  }
+}
+
+declare var Simple: Simple.Static;
+export = Simple;
+
diff --git a/simple-mock/simple-mock-tests.ts b/simple-mock/simple-mock-tests.ts
index e83b22affb..7bea9ca625 100644
--- a/simple-mock/simple-mock-tests.ts
+++ b/simple-mock/simple-mock-tests.ts
@@ -1,36 +1,34 @@
-/// <reference path="../mocha/mocha.d.ts"/>
-/// <reference path="../node/node.d.ts"/>
-/// <reference path="../bluebird/bluebird.d.ts"/>
+/// <reference types="mocha"/>
+/// <reference types="node"/>
+/// <reference types="bluebird"/>
 
-/// <reference path="./simple-mock.d.ts"/>
+'use strict';
 
-'use strict'
-
-import simple = require('simple-mock');
+import Simple = require('Simple-mock');
 import assert = require('assert');
 
 import Bluebird = require('bluebird');
 
-// Following code is a TypeScript convertion of the test suite bundled with simple-mock.
+// Following code is a TypeScript convertion of the test suite bundled with Simple-mock.
 // Original test in MIT license
 
-describe('simple', function () {
-  describe('spy()', function () {
-    describe('for noop function', function () {
+describe('Simple', function() {
+  describe('spy()', function() {
+    describe('for noop function', function() {
       let spyFn: Simple.Spy<void>;
 
-      beforeEach(function () {
-        spyFn = simple.spy(function () {})
+      beforeEach(function() {
+        spyFn = Simple.spy(function() { })
       })
 
-      it('can be queried without having been called', function () {
+      it('can be queried without having been called', function() {
         assert.equal(spyFn.callCount, 0)
         assert.deepEqual(spyFn.calls, [])
         assert(spyFn.lastCall)
         assert.deepEqual(spyFn.lastCall.args, [])
       })
 
-      it('can be queried for arguments on a single call', function () {
+      it('can be queried for arguments on a single call', function() {
         let context = {
           spyFn: spyFn
         }
@@ -47,7 +45,7 @@ describe('simple', function () {
         assert.equal(spyFn.lastCall.context, context)
       })
 
-      it('can be queried for arguments over multiple calls', function () {
+      it('can be queried for arguments over multiple calls', function() {
         let context = {
           spyFn: spyFn
         }
@@ -71,20 +69,20 @@ describe('simple', function () {
       })
     })
 
-    describe('for a throwing function', function () {
+    describe('for a throwing function', function() {
       let originalFn: () => void;
       let spyFn: Simple.Spy<void>;
-      beforeEach(function () {
+      beforeEach(function() {
         let i = 0
 
-        originalFn = function () {
+        originalFn = function() {
           throw new Error(`${i++}`)
         }
 
-        spyFn = simple.spy(originalFn)
+        spyFn = Simple.spy(originalFn)
       })
 
-      it('can be queried without having been called', function () {
+      it('can be queried without having been called', function() {
         assert(!spyFn.called)
         assert.equal(spyFn.callCount, 0)
         assert.deepEqual(spyFn.calls, [])
@@ -92,7 +90,7 @@ describe('simple', function () {
         assert.equal(spyFn.lastCall.threw, undefined)
       })
 
-      it('can be queried for what it threw on a single call', function () {
+      it('can be queried for what it threw on a single call', function() {
         let threw: Error;
         try {
           spyFn()
@@ -107,7 +105,7 @@ describe('simple', function () {
         assert.equal(spyFn.firstCall.threw, threw)
       })
 
-      it('can be queried for what it threw over multiple calls', function () {
+      it('can be queried for what it threw over multiple calls', function() {
         let threw: Error[] = []
         try {
           spyFn()
@@ -135,20 +133,20 @@ describe('simple', function () {
       })
     })
 
-    describe('for a returning function', function () {
+    describe('for a returning function', function() {
       let originalFn: () => number;
       let spyFn: Simple.Spy<number>;
-      beforeEach(function () {
+      beforeEach(function() {
         let i = 1
 
         originalFn = () => {
           return i++
         }
 
-        spyFn = simple.spy(originalFn)
+        spyFn = Simple.spy(originalFn)
       })
 
-      it('can be queried without having been called', function () {
+      it('can be queried without having been called', function() {
         assert(!spyFn.called)
         assert.equal(spyFn.callCount, 0)
         assert.deepEqual(spyFn.calls, [])
@@ -156,7 +154,7 @@ describe('simple', function () {
         assert.equal(spyFn.lastCall.returned, undefined)
       })
 
-      it('can be queried for what it threw on a single call', function () {
+      it('can be queried for what it threw on a single call', function() {
         let returned: number
 
         returned = spyFn()
@@ -167,7 +165,7 @@ describe('simple', function () {
         assert.equal(spyFn.firstCall.returned, returned)
       })
 
-      it('can be queried for what it threw over multiple calls', function () {
+      it('can be queried for what it threw over multiple calls', function() {
         let returned: number[] = []
 
         returned.push(spyFn())
@@ -184,11 +182,11 @@ describe('simple', function () {
       })
     })
 
-    describe('calls of multiple spies', function () {
-      it('can be compared to determine the order they were called in', function () {
-        let spy1 = simple.spy(function () {})
-        let spy2 = simple.spy(function () {})
-        let spy3 = simple.spy(function () {})
+    describe('calls of multiple spies', function() {
+      it('can be compared to determine the order they were called in', function() {
+        let spy1 = Simple.spy(function() { })
+        let spy2 = Simple.spy(function() { })
+        let spy3 = Simple.spy(function() { })
 
         spy1()
         spy3()
@@ -203,11 +201,11 @@ describe('simple', function () {
     })
   })
 
-  describe('stub()', function () {
-    describe('with no configuration', function () {
+  describe('stub()', function() {
+    describe('with no configuration', function() {
       let stubFn: Simple.Stub<void>;
-      it('is also a spy', function () {
-        stubFn = simple.stub()
+      it('is also a spy', function() {
+        stubFn = Simple.stub()
 
         stubFn('etc')
         assert(stubFn.called)
@@ -215,15 +213,15 @@ describe('simple', function () {
       })
     })
 
-    describe('for a single callback configuration', function () {
+    describe('for a single callback configuration', function() {
       let stubFn: Simple.Stub<void>;
-      describe('with default index', function () {
-        beforeEach(function () {
-          stubFn = simple.stub().callbackWith(1, 2, 3)
+      describe('with default index', function() {
+        beforeEach(function() {
+          stubFn = Simple.stub().callbackWith(1, 2, 3)
         })
 
-        it('can call back with arguments', function () {
-          stubFn('a', function () {
+        it('can call back with arguments', function() {
+          stubFn('a', function() {
             assert(stubFn.called)
             assert.equal(stubFn.callCount, 1)
             assert.equal(stubFn.lastCall.args[0], 'a')
@@ -234,9 +232,9 @@ describe('simple', function () {
           })
         })
 
-        it('can call back with arguments, over multiple calls', function () {
-          stubFn('a', function () {})
-          stubFn('b', function () {
+        it('can call back with arguments, over multiple calls', function() {
+          stubFn('a', function() { })
+          stubFn('b', function() {
             assert(stubFn.called)
             assert.equal(stubFn.callCount, 2)
             assert.equal(stubFn.lastCall.args[0], 'b')
@@ -248,13 +246,13 @@ describe('simple', function () {
         })
       })
 
-      describe('with specified index', function () {
-        beforeEach(function () {
-          stubFn = simple.stub().callbackArgWith(1, 2, 3)
+      describe('with specified index', function() {
+        beforeEach(function() {
+          stubFn = Simple.stub().callbackArgWith(1, 2, 3)
         })
 
-        it('can call back with arguments', function () {
-          stubFn('a', function () {
+        it('can call back with arguments', function() {
+          stubFn('a', function() {
             assert(stubFn.called)
             assert.equal(stubFn.callCount, 1)
             assert.equal(stubFn.lastCall.args[0], 'a')
@@ -264,9 +262,9 @@ describe('simple', function () {
           })
         })
 
-        it('can call back with arguments, over multiple calls', function () {
-          stubFn('a', function () {})
-          stubFn('b', function () {
+        it('can call back with arguments, over multiple calls', function() {
+          stubFn('a', function() { })
+          stubFn('b', function() {
             assert(stubFn.called)
             assert.equal(stubFn.callCount, 2)
             assert.equal(stubFn.lastCall.args[0], 'b')
@@ -277,13 +275,13 @@ describe('simple', function () {
         })
       })
 
-      describe('with context specified', function () {
-        beforeEach(function () {
-          stubFn = simple.stub().callback().inThisContext({ a: 'a' })
+      describe('with context specified', function() {
+        beforeEach(function() {
+          stubFn = Simple.stub().callback().inThisContext({ a: 'a' })
         })
 
-        it('should do what...', function (done) {
-          stubFn(function () {
+        it('should do what...', function(done) {
+          stubFn(function() {
             assert.equal(this.a, 'a')
             done()
           })
@@ -291,14 +289,14 @@ describe('simple', function () {
       })
     })
 
-    describe('for a multiple callback configurations', function () {
+    describe('for a multiple callback configurations', function() {
       let stubFn: Simple.Stub<void>;
-      beforeEach(function () {
-        stubFn = simple.stub().callbackWith(1).callbackWith(2).callbackWith(3)
+      beforeEach(function() {
+        stubFn = Simple.stub().callbackWith(1).callbackWith(2).callbackWith(3)
       })
 
-      it('can call back once with arguments', function () {
-        stubFn('a', function () {
+      it('can call back once with arguments', function() {
+        stubFn('a', function() {
           assert(stubFn.called)
           assert.equal(stubFn.callCount, 1)
           assert.equal(stubFn.lastCall.args[0], 'a')
@@ -306,57 +304,57 @@ describe('simple', function () {
         })
       })
 
-      it('can call back with arguments, over multiple calls, looping per default', function () {
-        stubFn('a', function () {})
-        stubFn('b', function () {
+      it('can call back with arguments, over multiple calls, looping per default', function() {
+        stubFn('a', function() { })
+        stubFn('b', function() {
           assert(stubFn.called)
           assert.equal(stubFn.callCount, 2)
           assert.equal(stubFn.lastCall.args[0], 'b')
           assert.equal(arguments[0], 2)
         })
-        stubFn('c', function () {
+        stubFn('c', function() {
           assert(stubFn.called)
           assert.equal(stubFn.callCount, 3)
           assert.equal(stubFn.lastCall.args[0], 'c')
           assert.equal(arguments[0], 3)
         })
-        stubFn('d', function () {
+        stubFn('d', function() {
           assert.equal(stubFn.callCount, 4)
           assert.equal(stubFn.lastCall.args[0], 'd')
           assert.equal(arguments[0], 1)
         })
       })
 
-      it('can call back with arguments, over multiple calls, looping turned off', function () {
+      it('can call back with arguments, over multiple calls, looping turned off', function() {
         stubFn.loop = false
-        stubFn('a', function () {})
-        stubFn('b', function () {
+        stubFn('a', function() { })
+        stubFn('b', function() {
           assert(stubFn.called)
           assert.equal(stubFn.callCount, 2)
           assert.equal(stubFn.lastCall.args[0], 'b')
           assert.equal(arguments[0], 2)
         })
-        stubFn('c', function () {
+        stubFn('c', function() {
           assert(stubFn.called)
           assert.equal(stubFn.callCount, 3)
           assert.equal(stubFn.lastCall.args[0], 'c')
           assert.equal(arguments[0], 3)
         })
         let neverCalled = true
-        stubFn('d', function () {
+        stubFn('d', function() {
           neverCalled = false
         })
         assert(neverCalled)
       })
     })
 
-    describe('for a single throwing configuration', function () {
+    describe('for a single throwing configuration', function() {
       let stubFn: Simple.Stub<void>;
-      beforeEach(function () {
-        stubFn = simple.stub().throwWith(new Error('example'))
+      beforeEach(function() {
+        stubFn = Simple.stub().throwWith(new Error('example'))
       })
 
-      it('can throw', function () {
+      it('can throw', function() {
         let threw: Error
         try {
           stubFn()
@@ -370,7 +368,7 @@ describe('simple', function () {
         assert.equal(threw.message, 'example')
       })
 
-      it('can throw over multiple calls, looping per default', function () {
+      it('can throw over multiple calls, looping per default', function() {
         let threw: Error[] = []
         try {
           stubFn()
@@ -391,13 +389,13 @@ describe('simple', function () {
       })
     })
 
-    describe('for a multiple throwing configurations', function () {
+    describe('for a multiple throwing configurations', function() {
       let stubFn: Simple.Stub<void>;
-      beforeEach(function () {
-        stubFn = simple.stub().throwWith(new Error('a')).throwWith(new Error('b'))
+      beforeEach(function() {
+        stubFn = Simple.stub().throwWith(new Error('a')).throwWith(new Error('b'))
       })
 
-      it('can throw', function () {
+      it('can throw', function() {
         let threw: Error
         try {
           stubFn()
@@ -411,7 +409,7 @@ describe('simple', function () {
         assert.equal(threw.message, 'a')
       })
 
-      it('can throw over multiple calls, looping per default', function () {
+      it('can throw over multiple calls, looping per default', function() {
         let threw: Error[] = []
         try {
           stubFn()
@@ -437,7 +435,7 @@ describe('simple', function () {
         assert.equal(threw[2].message, 'a')
       })
 
-      it('can throw over multiple calls, looping turned off', function () {
+      it('can throw over multiple calls, looping turned off', function() {
         stubFn.loop = false
 
         let threw: Error[] = []
@@ -465,13 +463,13 @@ describe('simple', function () {
       })
     })
 
-    describe('for a single returning configuration', function () {
+    describe('for a single returning configuration', function() {
       let stubFn: Simple.Stub<string>;
-      beforeEach(function () {
-        stubFn = simple.stub()
+      beforeEach(function() {
+        stubFn = Simple.stub()
       })
 
-      it('can return', function () {
+      it('can return', function() {
         stubFn.returnWith('example')
 
         let returned: string
@@ -482,7 +480,7 @@ describe('simple', function () {
         assert.equal(returned, 'example')
       })
 
-      it('can return an empty string', function () {
+      it('can return an empty string', function() {
         stubFn.returnWith('')
 
         let returned: string
@@ -492,7 +490,7 @@ describe('simple', function () {
         assert.equal(returned, '')
       })
 
-      it('can return over multiple calls, looping per default', function () {
+      it('can return over multiple calls, looping per default', function() {
         stubFn.returnWith('example-a')
         stubFn.returnWith('example-b')
 
@@ -512,13 +510,13 @@ describe('simple', function () {
       })
     })
 
-    describe('for a multiple returning configurations', function () {
+    describe('for a multiple returning configurations', function() {
       let stubFn: Simple.Stub<string>;
-      beforeEach(function () {
-        stubFn = simple.stub().returnWith('a').returnWith('b')
+      beforeEach(function() {
+        stubFn = Simple.stub().returnWith('a').returnWith('b')
       })
 
-      it('can return', function () {
+      it('can return', function() {
         let returned: string
         returned = stubFn()
 
@@ -527,7 +525,7 @@ describe('simple', function () {
         assert.equal(returned, 'a')
       })
 
-      it('can return over multiple calls, looping per default', function () {
+      it('can return over multiple calls, looping per default', function() {
         let returned: string[] = []
         returned.push(stubFn())
         returned.push(stubFn())
@@ -541,7 +539,7 @@ describe('simple', function () {
         assert.equal(returned[2], 'a')
       })
 
-      it('can return over multiple calls, looping turned off', function () {
+      it('can return over multiple calls, looping turned off', function() {
         stubFn.loop = false
 
         let returned: string[] = []
@@ -558,9 +556,9 @@ describe('simple', function () {
       })
     })
 
-    describe('for a specified function to call', function () {
-      it('should be called with arguments and return', function () {
-        let stubFn = simple.stub().callFn(function () {
+    describe('for a specified function to call', function() {
+      it('should be called with arguments and return', function() {
+        let stubFn = Simple.stub().callFn(function() {
           return arguments
         })
 
@@ -571,22 +569,22 @@ describe('simple', function () {
         assert.equal(returned[1], 'x')
       })
 
-      it('should be able to throw', function () {
-        let stubFn = simple.stub().callFn(function () {
+      it('should be able to throw', function() {
+        let stubFn = Simple.stub().callFn(function() {
           throw new Error('my message')
         })
 
         try {
           stubFn()
-        } catch(e) {
+        } catch (e) {
           assert(e instanceof Error)
           assert.equal(e.message, 'my message')
         }
       })
 
-      it('should be called in context', function () {
+      it('should be called in context', function() {
         let mockObj = {
-          stubFn: simple.stub().callFn(function () {
+          stubFn: Simple.stub().callFn(function() {
             return this
           })
         }
@@ -596,11 +594,11 @@ describe('simple', function () {
         assert.equal(returned, mockObj)
       })
 
-      it('can be called in specified context', function () {
+      it('can be called in specified context', function() {
         let anotherMockObj = {}
 
         let mockObj = {
-          stubFn: simple.stub().callFn(function () {
+          stubFn: Simple.stub().callFn(function() {
             return this
           }).inThisContext(anotherMockObj)
         }
@@ -611,13 +609,13 @@ describe('simple', function () {
       })
     })
 
-    describe('for custom/when-conforming promises', function () {
+    describe('for custom/when-conforming promises', function() {
       let fulfilledStub: Simple.Stub<boolean>
       let rejectedStub: Simple.Stub<boolean>
 
-      beforeEach(function () {
-        fulfilledStub = simple.stub().returnWith(true)
-        rejectedStub = simple.stub().returnWith(true)
+      beforeEach(function() {
+        fulfilledStub = Simple.stub().returnWith(true)
+        rejectedStub = Simple.stub().returnWith(true)
 
         interface MockPromise<T> {
           resolveValue: T,
@@ -628,22 +626,22 @@ describe('simple', function () {
         let mockPromise: MockPromise<boolean> = {
           resolveValue: null as boolean,
           rejectValue: null as boolean,
-          then: function (fulfilledFn: (value: any) => boolean, rejectedFn: (error: any) => boolean) {
+          then: function(fulfilledFn: (value: any) => boolean, rejectedFn: (error: any) => boolean) {
             let self = this
-            process.nextTick(function () {
+            process.nextTick(function() {
               if (self.resolveValue) return fulfilledFn(self.resolveValue)
               if (self.rejectValue) return rejectedFn(self.rejectValue)
             })
           }
         }
 
-        simple.mock(simple, 'Promise', {
-          when: function<T>(value: T) {
+        Simple.mock(Simple, 'Promise', {
+          when: function <T>(value: T) {
             let promise: MockPromise<T> = Object.create(mockPromise)
             promise.resolveValue = value
             return promise
           },
-          reject: function<T>(value: T) {
+          reject: function <T>(value: T) {
             let promise: MockPromise<T> = Object.create(mockPromise)
             promise.rejectValue = value
             return promise
@@ -651,20 +649,20 @@ describe('simple', function () {
         })
       })
 
-      describe('with a single resolving configuration', function () {
+      describe('with a single resolving configuration', function() {
         let stubFn: Simple.Stub<PromiseLike<string>>;
-        beforeEach(function () {
-          stubFn = simple.stub().resolveWith('example')
+        beforeEach(function() {
+          stubFn = Simple.stub().resolveWith('example')
         })
 
-        it('can return a promise', function (done) {
+        it('can return a promise', function(done) {
           let returned = stubFn()
 
           assert(returned)
 
           returned.then(fulfilledStub, rejectedStub)
 
-          setTimeout(function () {
+          setTimeout(function() {
             assert.equal(fulfilledStub.callCount, 1)
             assert.equal(fulfilledStub.lastCall.arg, 'example')
             assert.equal(rejectedStub.callCount, 0)
@@ -673,20 +671,20 @@ describe('simple', function () {
         })
       })
 
-      describe('with a multiple resolving configurations', function () {
+      describe('with a multiple resolving configurations', function() {
         let stubFn: Simple.Stub<PromiseLike<string>>;
-        beforeEach(function () {
-          stubFn = simple.stub().resolveWith('a').resolveWith('b')
+        beforeEach(function() {
+          stubFn = Simple.stub().resolveWith('a').resolveWith('b')
         })
 
-        it('can return a promise', function (done) {
+        it('can return a promise', function(done) {
           let returned = stubFn()
 
           assert(returned)
 
           returned.then(fulfilledStub, rejectedStub)
 
-          setTimeout(function () {
+          setTimeout(function() {
             assert.equal(fulfilledStub.callCount, 1)
             assert.equal(fulfilledStub.lastCall.arg, 'a')
             assert.equal(rejectedStub.callCount, 0)
@@ -694,12 +692,12 @@ describe('simple', function () {
           }, 0)
         })
 
-        it('can return over multiple calls, looping per default', function (done) {
+        it('can return over multiple calls, looping per default', function(done) {
           stubFn().then(fulfilledStub, rejectedStub)
           stubFn().then(fulfilledStub, rejectedStub)
           stubFn().then(fulfilledStub, rejectedStub)
 
-          setTimeout(function () {
+          setTimeout(function() {
             assert.equal(fulfilledStub.callCount, 3)
             assert.equal(fulfilledStub.calls[0].arg, 'a')
             assert.equal(fulfilledStub.calls[1].arg, 'b')
@@ -710,20 +708,20 @@ describe('simple', function () {
         })
       })
 
-      describe('with a single rejecting configuration', function () {
+      describe('with a single rejecting configuration', function() {
         let stubFn: Simple.Stub<PromiseLike<string>>;
-        beforeEach(function () {
-          stubFn = simple.stub().rejectWith('example')
+        beforeEach(function() {
+          stubFn = Simple.stub().rejectWith('example')
         })
 
-        it('can return a promise', function (done) {
+        it('can return a promise', function(done) {
           let returned = stubFn()
 
           assert(returned)
 
           returned.then(fulfilledStub, rejectedStub)
 
-          setTimeout(function () {
+          setTimeout(function() {
             assert.equal(fulfilledStub.callCount, 0)
             assert.equal(rejectedStub.callCount, 1)
             assert.equal(rejectedStub.lastCall.arg, 'example')
@@ -732,20 +730,20 @@ describe('simple', function () {
         })
       })
 
-      describe('with a multiple rejecting configurations', function () {
+      describe('with a multiple rejecting configurations', function() {
         let stubFn: Simple.Stub<PromiseLike<string>>;
-        beforeEach(function () {
-          stubFn = simple.stub().rejectWith('a').rejectWith('b')
+        beforeEach(function() {
+          stubFn = Simple.stub().rejectWith('a').rejectWith('b')
         })
 
-        it('can return a promise', function (done) {
+        it('can return a promise', function(done) {
           let returned = stubFn()
 
           assert(returned)
 
           returned.then(fulfilledStub, rejectedStub)
 
-          setTimeout(function () {
+          setTimeout(function() {
             assert.equal(fulfilledStub.callCount, 0)
             assert.equal(rejectedStub.callCount, 1)
             assert.equal(rejectedStub.lastCall.arg, 'a')
@@ -753,12 +751,12 @@ describe('simple', function () {
           }, 0)
         })
 
-        it('can return over multiple calls, looping per default', function (done) {
+        it('can return over multiple calls, looping per default', function(done) {
           stubFn().then(fulfilledStub, rejectedStub)
           stubFn().then(fulfilledStub, rejectedStub)
           stubFn().then(fulfilledStub, rejectedStub)
 
-          setTimeout(function () {
+          setTimeout(function() {
             assert.equal(fulfilledStub.callCount, 0)
             assert.equal(rejectedStub.callCount, 3)
             assert.equal(rejectedStub.calls[0].arg, 'a')
@@ -770,29 +768,29 @@ describe('simple', function () {
       })
     })
 
-    describe('for native/conforming promises', function () {
+    describe('for native/conforming promises', function() {
       let fulfilledStub: Simple.Stub<boolean>
       let rejectedStub: Simple.Stub<boolean>
 
-      beforeEach(function () {
-        fulfilledStub = simple.stub().returnWith(true)
-        rejectedStub = simple.stub().returnWith(true)
+      beforeEach(function() {
+        fulfilledStub = Simple.stub().returnWith(true)
+        rejectedStub = Simple.stub().returnWith(true)
       })
 
-      describe('with a single resolving configuration', function () {
+      describe('with a single resolving configuration', function() {
         let stubFn: Simple.Stub<PromiseLike<string>>;
-        beforeEach(function () {
-          stubFn = simple.stub().resolveWith('example')
+        beforeEach(function() {
+          stubFn = Simple.stub().resolveWith('example')
         })
 
-        it('can return a promise', function (done) {
+        it('can return a promise', function(done) {
           let returned = stubFn()
 
           assert(returned)
 
           returned.then(fulfilledStub, rejectedStub)
 
-          setTimeout(function () {
+          setTimeout(function() {
             assert.equal(fulfilledStub.callCount, 1)
             assert.equal(fulfilledStub.lastCall.arg, 'example')
             assert.equal(rejectedStub.callCount, 0)
@@ -801,20 +799,20 @@ describe('simple', function () {
         })
       })
 
-      describe('with a multiple resolving configurations', function () {
+      describe('with a multiple resolving configurations', function() {
         let stubFn: Simple.Stub<PromiseLike<string>>;
-        beforeEach(function () {
-          stubFn = simple.stub().resolveWith('a').resolveWith('b')
+        beforeEach(function() {
+          stubFn = Simple.stub().resolveWith('a').resolveWith('b')
         })
 
-        it('can return a promise', function (done) {
+        it('can return a promise', function(done) {
           let returned = stubFn()
 
           assert(returned)
 
           returned.then(fulfilledStub, rejectedStub)
 
-          setTimeout(function () {
+          setTimeout(function() {
             assert.equal(fulfilledStub.callCount, 1)
             assert.equal(fulfilledStub.lastCall.arg, 'a')
             assert.equal(rejectedStub.callCount, 0)
@@ -822,12 +820,12 @@ describe('simple', function () {
           }, 0)
         })
 
-        it('can return over multiple calls, looping per default', function (done) {
+        it('can return over multiple calls, looping per default', function(done) {
           stubFn().then(fulfilledStub, rejectedStub)
           stubFn().then(fulfilledStub, rejectedStub)
           stubFn().then(fulfilledStub, rejectedStub)
 
-          setTimeout(function () {
+          setTimeout(function() {
             assert.equal(fulfilledStub.callCount, 3)
             assert.equal(fulfilledStub.calls[0].arg, 'a')
             assert.equal(fulfilledStub.calls[1].arg, 'b')
@@ -838,20 +836,20 @@ describe('simple', function () {
         })
       })
 
-      describe('with a single rejecting configuration', function () {
+      describe('with a single rejecting configuration', function() {
         let stubFn: Simple.Stub<PromiseLike<string>>;
-        beforeEach(function () {
-          stubFn = simple.stub().rejectWith('example')
+        beforeEach(function() {
+          stubFn = Simple.stub().rejectWith('example')
         })
 
-        it('can return a promise', function (done) {
+        it('can return a promise', function(done) {
           let returned = stubFn()
 
           assert(returned)
 
           returned.then(fulfilledStub, rejectedStub)
 
-          setTimeout(function () {
+          setTimeout(function() {
             assert.equal(fulfilledStub.callCount, 0)
             assert.equal(rejectedStub.callCount, 1)
             assert.equal(rejectedStub.lastCall.arg, 'example')
@@ -860,20 +858,20 @@ describe('simple', function () {
         })
       })
 
-      describe('with a multiple rejecting configurations', function () {
+      describe('with a multiple rejecting configurations', function() {
         let stubFn: Simple.Stub<PromiseLike<string>>;
-        beforeEach(function () {
-          stubFn = simple.stub().rejectWith('a').rejectWith('b')
+        beforeEach(function() {
+          stubFn = Simple.stub().rejectWith('a').rejectWith('b')
         })
 
-        it('can return a promise', function (done) {
+        it('can return a promise', function(done) {
           let returned = stubFn()
 
           assert(returned)
 
           returned.then(fulfilledStub, rejectedStub)
 
-          setTimeout(function () {
+          setTimeout(function() {
             assert.equal(fulfilledStub.callCount, 0)
             assert.equal(rejectedStub.callCount, 1)
             assert.equal(rejectedStub.lastCall.arg, 'a')
@@ -881,12 +879,12 @@ describe('simple', function () {
           }, 0)
         })
 
-        it('can return over multiple calls, looping per default', function (done) {
+        it('can return over multiple calls, looping per default', function(done) {
           stubFn().then(fulfilledStub, rejectedStub)
           stubFn().then(fulfilledStub, rejectedStub)
           stubFn().then(fulfilledStub, rejectedStub)
 
-          setTimeout(function () {
+          setTimeout(function() {
             assert.equal(fulfilledStub.callCount, 0)
             assert.equal(rejectedStub.callCount, 3)
             assert.equal(rejectedStub.calls[0].arg, 'a')
@@ -899,8 +897,8 @@ describe('simple', function () {
     })
   })
 
-  describe('mock()', function () {
-    describe('on a object with prototype', function () {
+  describe('mock()', function() {
+    describe('on a object with prototype', function() {
       class ProtoKlass {
         protoValue: string = 'x'
         protoFn() {
@@ -910,96 +908,96 @@ describe('simple', function () {
 
       let obj: any
 
-      before(function () {
+      before(function() {
       })
 
-      beforeEach(function () {
+      beforeEach(function() {
         obj = new ProtoKlass()
       })
 
-      it('can mock instance values over its prototype\'s and restore', function () {
-        simple.mock(obj, 'protoValue', 'y')
+      it('can mock instance values over its prototype\'s and restore', function() {
+        Simple.mock(obj, 'protoValue', 'y')
         assert.equal(obj.protoValue, 'y')
-        simple.restore()
+        Simple.restore()
         assert.equal(obj.protoValue, 'x')
       })
 
-      it('can mock with custom instance functions over its prototype\'s and restore', function () {
-        simple.mock(obj, 'protoFn', function () {
+      it('can mock with custom instance functions over its prototype\'s and restore', function() {
+        Simple.mock(obj, 'protoFn', function() {
           return 'y'
         })
         assert.equal(obj.protoFn(), 'y')
         assert(obj.protoFn.called)
-        simple.restore()
+        Simple.restore()
         assert.equal(obj.protoFn(), 'x')
       })
 
-      it('can mock with stubbed functions over its prototype\'s and restore', function () {
-        simple.mock(obj, 'protoFn').returnWith('y')
+      it('can mock with stubbed functions over its prototype\'s and restore', function() {
+        Simple.mock(obj, 'protoFn').returnWith('y')
         assert.equal(obj.protoFn(), 'y')
         assert(obj.protoFn.called)
-        simple.restore()
+        Simple.restore()
         assert.equal(obj.protoFn(), 'x')
       })
 
-      it('can mock with stubbed functions and prototype\'s original over its prototype\'s and restore', function () {
-        simple.mock(obj, 'protoFn').returnWith('y').callOriginal().returnWith('z')
+      it('can mock with stubbed functions and prototype\'s original over its prototype\'s and restore', function() {
+        Simple.mock(obj, 'protoFn').returnWith('y').callOriginal().returnWith('z')
         assert.equal(obj.protoFn(), 'y')
         assert.equal(obj.protoFn(), 'x')
         assert.equal(obj.protoFn(), 'z')
         assert.equal(obj.protoFn.callCount, 3)
-        simple.restore()
+        Simple.restore()
         assert.equal(obj.protoFn(), 'x')
       })
     })
 
-    describe('on an anonymous object', function () {
+    describe('on an anonymous object', function() {
       let obj: any
-      beforeEach(function () {
+      beforeEach(function() {
         obj = {
           a: 'a',
           b: 'b',
           c: 'c',
-          fnD: function () {
+          fnD: function() {
             return 'd'
           }
         }
       })
 
-      it('can mock instance values and restore', function () {
+      it('can mock instance values and restore', function() {
         let beforeKeys = Object.keys(obj)
-        simple.mock(obj, 'a', 'd')
-        simple.mock(obj, 'd', 'a')
+        Simple.mock(obj, 'a', 'd')
+        Simple.mock(obj, 'd', 'a')
         assert.equal(obj.a, 'd')
         assert.equal(obj.d, 'a')
-        simple.restore()
+        Simple.restore()
         assert.equal(obj.a, 'a')
         assert.equal(obj.d, undefined)
         assert.deepEqual(Object.keys(obj), beforeKeys)
       })
 
-      it('can mock with spy on pre-existing functions and restore', function () {
-        simple.mock(obj, 'fnD').returnWith('a')
+      it('can mock with spy on pre-existing functions and restore', function() {
+        Simple.mock(obj, 'fnD').returnWith('a')
         assert.equal(obj.fnD(), 'a')
         assert(obj.fnD.called)
-        simple.restore()
+        Simple.restore()
         assert.equal(obj.fnD(), 'd')
       })
 
-      it('can mock with newly stubbed functions and restore', function () {
-        simple.mock(obj, 'fnA').returnWith('a')
+      it('can mock with newly stubbed functions and restore', function() {
+        Simple.mock(obj, 'fnA').returnWith('a')
         assert.equal(obj.fnA(), 'a')
         assert(obj.fnA.called)
-        simple.restore()
+        Simple.restore()
         assert.equal(obj.fnA, undefined)
       })
     })
 
-    describe('with one argument', function () {
-      it('returns a spy', function () {
+    describe('with one argument', function() {
+      it('returns a spy', function() {
         let called = 0
 
-        let spy = simple.mock(function () {
+        let spy = Simple.mock(function() {
           called++
         })
 
@@ -1009,9 +1007,9 @@ describe('simple', function () {
       })
     })
 
-    describe('with no arguments', function () {
-      it('returns a stub', function () {
-        let stub = simple.mock().returnWith('x')
+    describe('with no arguments', function() {
+      it('returns a stub', function() {
+        let stub = Simple.mock().returnWith('x')
 
         let x = stub()
         assert(stub.called)
@@ -1021,4 +1019,5 @@ describe('simple', function () {
   })
 })
 
-simple.Promise = Bluebird;
+Simple.Promise = Bluebird;
+
diff --git a/simple-mock/simple-mock.d.ts b/simple-mock/simple-mock.d.ts
deleted file mode 100644
index 3a5aa9a684..0000000000
--- a/simple-mock/simple-mock.d.ts
+++ /dev/null
@@ -1,194 +0,0 @@
-// Type definitions for simple-mock
-// Project: https://github.com/jupiter/simple-mock
-// Definitions by: Leon Yu <https://github.com/leonyu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace Simple {
-  type Fn<T> = {
-    (...args: any[]): T
-  }
-
-  export interface Static {
-    /**
-     * Restores all current mocks.
-     */
-    restore(): void;
-
-    /**
-     * Wraps fn in a spy and sets this on the obj, restorable with all mocks.
-     */
-    mock<T>(obj: any, key: string, fn: Fn<T>): Stub<T>;
-
-    /**
-     * Sets the value on this object. E.g. mock(config, 'title', 'test') is the same as config.title = 'test', but restorable with all mocks.
-     */
-    mock<T>(obj: any, key: string, mockValue: T): T;
-
-    /**
-     * If obj has already has this function, it is wrapped in a spy. The resulting spy can be turned into a stub by further configuration. Restores with all mocks.
-     */
-    mock(obj: any, key: string): Stub<any>;
-    mock<T>(obj: any, key: string): Stub<T>;
-
-    /**
-     * Wraps fn in a spy.
-     */
-    spy<T>(fn: Fn<T>): Spy<T>;
-    /**
-     * Wraps fn in a spy.
-     */
-    mock<T>(fn: Fn<T>): Spy<T>;
-
-    /**
-     * Returns a stub function that is also a spy.
-     */
-    stub(): Stub<any>;
-    stub<T>(): Stub<T>;
-
-    /**
-     * Returns a stub function that is also a spy.
-     */
-    mock(): Stub<any>;
-    mock<T>(): Stub<T>;
-
-    Promise?: PromiseConstructorLike;
-  }
-
-  interface Calls<T> {
-    /**
-     * an array of arguments received on the call
-     */
-    args: any[];
-    /**
-     * first argument
-     */
-    arg: any;
-    /**
-     * the context (this) of the call
-     */
-    context: any;
-    /**
-     * the value returned by the wrapped function
-     */
-    returned: T;
-    /**
-     * the error thrown by the wrapped function
-     */
-    threw: Error;
-    /**
-     * autoincrementing number, can be compared to evaluate call order
-     */
-    k: number;
-  }
-
-  export interface Spy<T>{
-    (...args: any[]): T;
-
-    called: boolean;
-    /**
-     * Number of times the function was called.
-     */
-    callCount: number;
-    calls: Calls<T>[];
-    firstCall: Calls<T>;
-    /**
-     * The last call object. (This is often also the first and only call.)
-     */
-    lastCall: Calls<T>;
-    /**
-     * Resets all counts and properties to the original state.
-     */
-    reset(): void;
-  }
-
-  interface Action<T> {
-    /**
-     * arguments to call back with
-     */
-    cbArgs: ArrayLike<any>;
-    returnValue: T;
-    throwError: Error;
-  }
-
-  export interface Stub<T> extends Spy<T> {
-    /**
-     * Configures this stub to call this function, returning its return value.
-     * Subsequent calls of this on the same stub (chainable) will queue up different behaviours for each subsequent call of the stub.
-     */
-    callFn<R>(fn: Fn<R>): Stub<R>;
-
-    /**
-     * Configures this stub to call the original, unstubbed function, returning its return value.
-     * Subsequent calls of this on the same stub (chainable) will queue up different behaviours for each subsequent call of the stub.
-     */
-    callOriginal(): Stub<T>;
-
-    /**
-     * Configures this stub to return with this value.
-     * Subsequent calls of this on the same stub (chainable) will queue up different behaviours for each subsequent call of the stub.
-     */
-    returnWith<R>(val: R): Stub<R>;
-
-    /**
-     * Configures this stub to throw this error.
-     * Subsequent calls of this on the same stub (chainable) will queue up different behaviours for each subsequent call of the stub.
-     */
-    throwWith(err: Error): Stub<T>;
-
-    /**
-     * Configures this stub to call back with the arguments passed. It will use either the last argument as callback, or the argument at cbArgumentIndex.
-     * Subsequent calls of this on the same stub (chainable) will queue up different behaviours for each subsequent call of the stub.
-     */
-    callback(...args: any[]): Stub<T>;
-    /**
-     * Configures this stub to call back with the arguments passed. It will use either the last argument as callback, or the argument at cbArgumentIndex.
-     * Subsequent calls of this on the same stub (chainable) will queue up different behaviours for each subsequent call of the stub.
-     */
-    callbackWith(...args: any[]): Stub<T>;
-
-    /**
-     * Configures this stub to call back with the arguments passed. It will use either the last argument as callback, or the argument at cbArgumentIndex.
-     * Subsequent calls of this on the same stub (chainable) will queue up different behaviours for each subsequent call of the stub.
-     */
-    callbackAtIndex(cbArgumentIndex: number, ...args: any[]): Stub<T>;
-    /**
-     * Configures this stub to call back with the arguments passed. It will use either the last argument as callback, or the argument at cbArgumentIndex.
-     * Subsequent calls of this on the same stub (chainable) will queue up different behaviours for each subsequent call of the stub.
-     */
-    callbackArgWith(cbArgumentIndex: number, ...args: any[]): Stub<T>;
-
-
-    /**
-     * Configures the last configured function or callback to be called in this context, i.e. this will be obj.
-     */
-    inThisContext(obj: any): Stub<T>;
-
-    /**
-     * Configures the stub to return a Promise (where available] resolving to this value. Same as stub.returnWith(Promise.resolve(val)).
-     * You can use a custom Promise-conforming library, i.e. simple.Promise = require('bluebird') or simple.Promise = $q.
-     */
-    resolveWith<V>(val: V): Stub<PromiseLike<V>>;
-
-    /**
-     * Configures the stub to return a Promise (where available) rejecting with this error. Same as stub.returnWith(Promise.reject(val)).
-     * You can use a custom Promise-conforming library, i.e. simple.Promise = require('bluebird') or simple.Promise = $q.
-     */
-    rejectWith<V>(val: V): Stub<PromiseLike<V>>;
-
-    /**
-     * An array of behaviours, each having one of these properties:
-     */
-    actions: Action<T>[];
-
-    /**
-     * setting whether the queue of actions for this stub should repeat.
-     * @default true
-     */
-    loop: boolean;
-  }
-}
-
-declare module "simple-mock" {
-  var simple: Simple.Static;
-  export = simple;
-}
diff --git a/simple-mock/tsconfig.json b/simple-mock/tsconfig.json
new file mode 100644
index 0000000000..f3ad4ef8eb
--- /dev/null
+++ b/simple-mock/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "simple-mock-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/simplebar/simplebar.d.ts b/simplebar/index.d.ts
similarity index 100%
rename from simplebar/simplebar.d.ts
rename to simplebar/index.d.ts
diff --git a/simplebar/simplebar-tests.ts b/simplebar/simplebar-tests.ts
index 033b16c741..9ce78c1fdf 100644
--- a/simplebar/simplebar-tests.ts
+++ b/simplebar/simplebar-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="simplebar.d.ts"/>
-/// <reference path="../jquery/jquery.d.ts"/>
+/// <reference types="jquery"/>
 
 var simplebar = $.fn.simplebar.noConflict();
 $.fn.simplebar = simplebar;
diff --git a/simplebar/tsconfig.json b/simplebar/tsconfig.json
new file mode 100644
index 0000000000..2910e0e6f6
--- /dev/null
+++ b/simplebar/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "simplebar-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/simplestorage.js/index.d.ts b/simplestorage.js/index.d.ts
new file mode 100644
index 0000000000..9710f42e8c
--- /dev/null
+++ b/simplestorage.js/index.d.ts
@@ -0,0 +1,109 @@
+// Type definitions for simpleStorage v0.1.3
+// Project: https://github.com/andris9/simpleStorage
+// Definitions by: Áxel Costas Pena <https://github.com/axelcostaspena>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace simplestoragejs {
+
+    /**
+     * {@link simpleStorage} API is a subset of {@link http://www.jstorage.info/|jStorage} with slight modifications, so for most cases it should work out of the box if you are converting from {@link http://www.jstorage.info/|jStorage}. Main difference is between return values - if an action failed because of an error (storage full, storage not available, invalid data used etc.), you get the error object as the return value. {@link http://www.jstorage.info/|jStorage} never indicated anything if an error occurred.
+     * @see https://github.com/andris9/simpleStorage#usage
+     */
+    export interface SimpleStorage {
+
+        version: string;
+
+        /**
+         * Check if local storage can be used.
+         * Returns <code>true</code> if storage is available.
+         * @see https://github.com/andris9/simpleStorage#canuse
+         */
+        canUse(): boolean;
+
+        /**
+         * Store or update a value in local storage.
+         * Returns <code>true</code> if value was stored, <code>false</code> if value was not stored or <code>{@link Error}</code> object if value was not stored because of an error.
+         * @param key The key for the value.
+         * @param value Value to be stored (can be any JSONeable value).
+         * @param [options] Optional options object.
+         * @see https://github.com/andris9/simpleStorage#setkey-value-options
+         */
+        set(key: string, value: any, options?: SetOptions): boolean|Error;
+
+        /**
+         * Retrieve a value from local storage.
+         * Returns the value for a key or undefined if the key was not found.
+         * @param key The key to be retrieved.
+         * @see https://github.com/andris9/simpleStorage#getkey
+         */
+        get(key: string): any;
+
+        /**
+         * Removes a value from local storage.
+         * Returns <code>true</code> if the value was deleted, <code>false</code> if the value was not found or <code>{@link Error}</code> object if value was not deleted because of an error.
+         * @param key The key to be deleted.
+         * @see https://github.com/andris9/simpleStorage#deletekeykey
+         */
+        deleteKey(key: string): boolean|Error;
+
+        /**
+         * Set a millisecond timeout. When the timeout is reached, the key is removed automatically from local storage.
+         * Returns <code>true</code> if ttl was set, <code>false</code> if value was not found or <code>{@link Error}</code> object if ttl was not set because of an error.
+         * @param key The key to be updated.
+         * @param ttl Timeout in milliseconds. If the value is 0, timeout is cleared from the key.
+         * @see https://github.com/andris9/simpleStorage#setttlkey-ttl
+         */
+        setTTL(key: string, ttl: number): boolean|Error;
+
+        /**
+         * Retrieve remaining milliseconds for a key with TTL.
+         * Returns the finite number of remaining milliseconds, <code>Infinity</code> if TTL is not set for the selected key or <code>false</code> if the selected key does not exist or is expired.
+         * @param key The key to be checked.
+         * @see https://github.com/andris9/simpleStorage#getttlkey
+         */
+        getTTL(key: string): number|boolean;
+
+        /**
+         * Clear all values.
+         * Returns <code>true</code> if storage was flushed or <code>{@link Error}</code> object if storage was not flushed because of an error.
+         * @see https://github.com/andris9/simpleStorage#flush
+         */
+        flush(): boolean|Error;
+
+        /**
+         * Retrieve all used keys as an array.
+         * Returns an array of keys.
+         * @see https://github.com/andris9/simpleStorage#index
+         */
+        index(): [string]|boolean;
+
+        /**
+         * Get used storage in symbol count.
+         * @see https://github.com/andris9/simpleStorage#storagesize
+         */
+        storageSize(): number;
+    }
+
+    /**
+     * @see https://github.com/andris9/simpleStorage#setkey-value-options
+     */
+    export interface SetOptions {
+        /**
+         * Sets the time-to-live (TTL) value in milliseconds for the given key/value.
+         */
+        TTL?: number;
+    }
+
+}
+
+export = simpleStorage;
+export as namespace simpleStorage;
+
+/**
+ * Cross-browser key-value store database to store data locally in the browser.
+ * {@link simpleStorage} is a fork of {@link http://www.jstorage.info/|jStorage} that only includes the minimal set of features. Basically it is a wrapper for native <code>{@link JSON}</code> + <code>{@link WindowLocalStorage.localStorage|localStorage}</code> with some TTL magic mixed in.
+ * The module has no dependencies, you can use it as a standalone script (introduces {@link simpleStorage} global) or as an AMD module. All modern browsers (including mobile) are supported, older browsers (IE7, Firefox 3) are not.
+ * {@link simpleStorage} is very small - about 1kB in size when minimized and gzipped.
+ * @see https://github.com/andris9/simpleStorage#simplestorage
+ */
+declare var simpleStorage:simplestoragejs.SimpleStorage;
diff --git a/simplestorage.js/simplestorage.js-tests.ts b/simplestorage.js/simplestorage.js-tests.ts
index 1e9f4202a3..b5405d3775 100644
--- a/simplestorage.js/simplestorage.js-tests.ts
+++ b/simplestorage.js/simplestorage.js-tests.ts
@@ -1,5 +1,4 @@
-///<reference path="simplestorage.js.d.ts"/>
-
+import simpleStorage = require("simplestorage.js")
 var versionTest:        string           = simpleStorage.version;
 var canUseTest:         boolean          = simpleStorage.canUse();
 var simpleStorageTest1: boolean|Error    = simpleStorage.set("string", 7);
diff --git a/simplestorage.js/simplestorage.js.d.ts b/simplestorage.js/simplestorage.js.d.ts
deleted file mode 100644
index 43650fd657..0000000000
--- a/simplestorage.js/simplestorage.js.d.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-// Type definitions for simpleStorage v0.1.3
-// Project: https://github.com/andris9/simpleStorage
-// Definitions by: Áxel Costas Pena <https://github.com/axelcostaspena>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace simplestoragejs {
-
-    /**
-     * {@link simpleStorage} API is a subset of {@link http://www.jstorage.info/|jStorage} with slight modifications, so for most cases it should work out of the box if you are converting from {@link http://www.jstorage.info/|jStorage}. Main difference is between return values - if an action failed because of an error (storage full, storage not available, invalid data used etc.), you get the error object as the return value. {@link http://www.jstorage.info/|jStorage} never indicated anything if an error occurred.
-     * @see https://github.com/andris9/simpleStorage#usage
-     */
-    export interface SimpleStorage {
-
-        version: string;
-
-        /**
-         * Check if local storage can be used.
-         * Returns <code>true</code> if storage is available.
-         * @see https://github.com/andris9/simpleStorage#canuse
-         */
-        canUse(): boolean;
-
-        /**
-         * Store or update a value in local storage.
-         * Returns <code>true</code> if value was stored, <code>false</code> if value was not stored or <code>{@link Error}</code> object if value was not stored because of an error.
-         * @param key The key for the value.
-         * @param value Value to be stored (can be any JSONeable value).
-         * @param [options] Optional options object.
-         * @see https://github.com/andris9/simpleStorage#setkey-value-options
-         */
-        set(key: string, value: any, options?: SetOptions): boolean|Error;
-
-        /**
-         * Retrieve a value from local storage.
-         * Returns the value for a key or undefined if the key was not found.
-         * @param key The key to be retrieved.
-         * @see https://github.com/andris9/simpleStorage#getkey
-         */
-        get(key: string): any;
-
-        /**
-         * Removes a value from local storage.
-         * Returns <code>true</code> if the value was deleted, <code>false</code> if the value was not found or <code>{@link Error}</code> object if value was not deleted because of an error.
-         * @param key The key to be deleted.
-         * @see https://github.com/andris9/simpleStorage#deletekeykey
-         */
-        deleteKey(key: string): boolean|Error;
-
-        /**
-         * Set a millisecond timeout. When the timeout is reached, the key is removed automatically from local storage.
-         * Returns <code>true</code> if ttl was set, <code>false</code> if value was not found or <code>{@link Error}</code> object if ttl was not set because of an error.
-         * @param key The key to be updated.
-         * @param ttl Timeout in milliseconds. If the value is 0, timeout is cleared from the key.
-         * @see https://github.com/andris9/simpleStorage#setttlkey-ttl
-         */
-        setTTL(key: string, ttl: number): boolean|Error;
-
-        /**
-         * Retrieve remaining milliseconds for a key with TTL.
-         * Returns the finite number of remaining milliseconds, <code>Infinity</code> if TTL is not set for the selected key or <code>false</code> if the selected key does not exist or is expired.
-         * @param key The key to be checked.
-         * @see https://github.com/andris9/simpleStorage#getttlkey
-         */
-        getTTL(key: string): number|boolean;
-
-        /**
-         * Clear all values.
-         * Returns <code>true</code> if storage was flushed or <code>{@link Error}</code> object if storage was not flushed because of an error.
-         * @see https://github.com/andris9/simpleStorage#flush
-         */
-        flush(): boolean|Error;
-
-        /**
-         * Retrieve all used keys as an array.
-         * Returns an array of keys.
-         * @see https://github.com/andris9/simpleStorage#index
-         */
-        index(): [string]|boolean;
-
-        /**
-         * Get used storage in symbol count.
-         * @see https://github.com/andris9/simpleStorage#storagesize
-         */
-        storageSize(): number;
-    }
-
-    /**
-     * @see https://github.com/andris9/simpleStorage#setkey-value-options
-     */
-    export interface SetOptions {
-        /**
-         * Sets the time-to-live (TTL) value in milliseconds for the given key/value.
-         */
-        TTL?: number;
-    }
-
-}
-
-declare module "simpleStorage" {
-    export = simpleStorage;
-}
-
-/**
- * Cross-browser key-value store database to store data locally in the browser.
- * {@link simpleStorage} is a fork of {@link http://www.jstorage.info/|jStorage} that only includes the minimal set of features. Basically it is a wrapper for native <code>{@link JSON}</code> + <code>{@link WindowLocalStorage.localStorage|localStorage}</code> with some TTL magic mixed in.
- * The module has no dependencies, you can use it as a standalone script (introduces {@link simpleStorage} global) or as an AMD module. All modern browsers (including mobile) are supported, older browsers (IE7, Firefox 3) are not.
- * {@link simpleStorage} is very small - about 1kB in size when minimized and gzipped.
- * @see https://github.com/andris9/simpleStorage#simplestorage
- */
-declare var simpleStorage:simplestoragejs.SimpleStorage;
diff --git a/simplestorage.js/tsconfig.json b/simplestorage.js/tsconfig.json
new file mode 100644
index 0000000000..a0a399f4d7
--- /dev/null
+++ b/simplestorage.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "simplestorage.js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sinon-chai/index.d.ts b/sinon-chai/index.d.ts
new file mode 100644
index 0000000000..149b46abea
--- /dev/null
+++ b/sinon-chai/index.d.ts
@@ -0,0 +1,85 @@
+// Type definitions for sinon-chai 2.7.0
+// Project: https://github.com/domenic/sinon-chai
+// Definitions by: Kazi Manzur Rashid <https://github.com/kazimanzurrashid/>, Jed Mao <https://github.com/jedmao/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="chai" />
+/// <reference types="sinon" />
+
+declare namespace Chai {
+
+    interface LanguageChains {
+        always: Assertion;
+    }
+
+    interface Assertion {
+        /**
+         * true if the spy was called at least once.
+         */
+        called: Assertion;
+        /**
+         * @param count The number of recorded calls.
+         */
+        callCount(count: number): Assertion;
+        /**
+         * true if the spy was called exactly once.
+         */
+        calledOnce: Assertion;
+        /**
+         * true if the spy was called exactly twice.
+         */
+        calledTwice: Assertion;
+        /**
+         * true if the spy was called exactly thrice.
+         */
+        calledThrice: Assertion;
+        /**
+         * Returns true if the spy was called before anotherSpy.
+         */
+        calledBefore(anotherSpy: Sinon.SinonSpy): Assertion;
+        /**
+         * Returns true if the spy was called after anotherSpy.
+         */
+        calledAfter(anotherSpy: Sinon.SinonSpy): Assertion;
+        /**
+         * Returns true if spy/stub was called with the new operator. Beware that
+         * this is inferred based on the value of the this object and the spy
+         * function's prototype, so it may give false positives if you actively
+         * return the right kind of object.
+         */
+        calledWithNew: Assertion;
+        /**
+         * Returns true if context was this for this call.
+         */
+        calledOn(context: any): Assertion;
+        /**
+         * Returns true if call received provided arguments (and possibly others).
+         */
+        calledWith(...args: any[]): Assertion;
+        /**
+         * Returns true if call received provided arguments and no others.
+         */
+        calledWithExactly(...args: any[]): Assertion;
+        /**
+         * Returns true if call received matching arguments (and possibly others).
+         * This behaves the same as spyCall.calledWith(sinon.match(arg1), sinon.match(arg2), ...).
+         */
+        calledWithMatch(...args: any[]): Assertion;
+        /**
+         * Returns true if spy returned the provided value at least once. Uses
+         * deep comparison for objects and arrays. Use spy.returned(sinon.match.same(obj))
+         * for strict comparison (see matchers).
+         */
+        returned(obj: any): Assertion;
+        /**
+         * Returns true if spy threw the provided exception object at least once.
+         */
+        thrown(obj?: Error|typeof Error|string): Assertion;
+    }
+}
+
+declare module "sinon-chai" {
+    function sinonChai(chai: any, utils: any): void;
+    namespace sinonChai { }
+    export = sinonChai;
+}
diff --git a/sinon-chai/sinon-chai-tests.ts b/sinon-chai/sinon-chai-tests.ts
index 65036219e4..b19d1b4d5a 100644
--- a/sinon-chai/sinon-chai-tests.ts
+++ b/sinon-chai/sinon-chai-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="sinon-chai.d.ts" />
+
 
 import chai = require('chai');
 import sinonChai = require('sinon-chai');
diff --git a/sinon-chai/sinon-chai.d.ts b/sinon-chai/sinon-chai.d.ts
deleted file mode 100644
index 5fa9dc7818..0000000000
--- a/sinon-chai/sinon-chai.d.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-// Type definitions for sinon-chai 2.7.0
-// Project: https://github.com/domenic/sinon-chai
-// Definitions by: Kazi Manzur Rashid <https://github.com/kazimanzurrashid/>, Jed Mao <https://github.com/jedmao/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../chai/chai.d.ts" />
-/// <reference path="../sinon/sinon.d.ts" />
-
-declare namespace Chai {
-
-    interface LanguageChains {
-        always: Assertion;
-    }
-
-    interface Assertion {
-        /**
-         * true if the spy was called at least once.
-         */
-        called: Assertion;
-        /**
-         * @param count The number of recorded calls.
-         */
-        callCount(count: number): Assertion;
-        /**
-         * true if the spy was called exactly once.
-         */
-        calledOnce: Assertion;
-        /**
-         * true if the spy was called exactly twice.
-         */
-        calledTwice: Assertion;
-        /**
-         * true if the spy was called exactly thrice.
-         */
-        calledThrice: Assertion;
-        /**
-         * Returns true if the spy was called before anotherSpy.
-         */
-        calledBefore(anotherSpy: Sinon.SinonSpy): Assertion;
-        /**
-         * Returns true if the spy was called after anotherSpy.
-         */
-        calledAfter(anotherSpy: Sinon.SinonSpy): Assertion;
-        /**
-         * Returns true if spy/stub was called with the new operator. Beware that
-         * this is inferred based on the value of the this object and the spy
-         * function's prototype, so it may give false positives if you actively
-         * return the right kind of object.
-         */
-        calledWithNew: Assertion;
-        /**
-         * Returns true if context was this for this call.
-         */
-        calledOn(context: any): Assertion;
-        /**
-         * Returns true if call received provided arguments (and possibly others).
-         */
-        calledWith(...args: any[]): Assertion;
-        /**
-         * Returns true if call received provided arguments and no others.
-         */
-        calledWithExactly(...args: any[]): Assertion;
-        /**
-         * Returns true if call received matching arguments (and possibly others).
-         * This behaves the same as spyCall.calledWith(sinon.match(arg1), sinon.match(arg2), ...).
-         */
-        calledWithMatch(...args: any[]): Assertion;
-        /**
-         * Returns true if spy returned the provided value at least once. Uses
-         * deep comparison for objects and arrays. Use spy.returned(sinon.match.same(obj))
-         * for strict comparison (see matchers).
-         */
-        returned(obj: any): Assertion;
-        /**
-         * Returns true if spy threw the provided exception object at least once.
-         */
-        thrown(obj?: Error|typeof Error|string): Assertion;
-    }
-}
-
-declare module "sinon-chai" {
-    function sinonChai(chai: any, utils: any): void;
-    namespace sinonChai { }
-    export = sinonChai;
-}
diff --git a/sinon-chai/tsconfig.json b/sinon-chai/tsconfig.json
new file mode 100644
index 0000000000..adf540eb65
--- /dev/null
+++ b/sinon-chai/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sinon-chai-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sinon-chrome/index.d.ts b/sinon-chrome/index.d.ts
new file mode 100644
index 0000000000..0bd8874780
--- /dev/null
+++ b/sinon-chrome/index.d.ts
@@ -0,0 +1,551 @@
+// Type definitions for Sinon-Chrome v0.2.1
+// Project: https://github.com/vitalets/sinon-chrome
+// Definitions by: Tim Perry <https://github.com/pimterry>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="chrome"/>
+/// <reference types="sinon"/>
+
+/**
+ * To use sinon-chrome:
+ * Use chrome.* as normal in your production code
+ * In tests, forcibly cast window.chrome to typeof SinonChrome to access stub API.
+ * @example
+ * var chrome = <typeof SinonChrome> <any> window.chrome;
+ * chrome.storage.onChanged.trigger(...);
+ */
+declare namespace SinonChrome {
+    /**
+     * Flush cache
+     */
+    export function flush(): void;
+
+    /**
+     * Reset all stubs and remove event listeners
+     * See https://github.com/cjohansen/Sinon.JS/issues/572
+     */
+    export function reset(): void;
+
+    export var csi: Sinon.SinonSpy;
+    export var loadTimes: Sinon.SinonSpy;
+}
+
+declare namespace SinonChrome.events {
+    interface Event extends chrome.events.Event<Function> {
+        trigger(...args: any[]): void;
+        triggerAsync(...args: any[]): void;
+
+        applyTrigger(args: any[]): void;
+        applyTriggerAsync(args: any[]): void;
+
+        addListener: Sinon.SinonSpy;
+        removeListener: Sinon.SinonSpy;
+        removeListeners: Sinon.SinonSpy;
+        hasListener: Sinon.SinonSpy;
+    }
+}
+
+declare namespace SinonChrome.alarms {
+    export var clear: Sinon.SinonSpy;
+    export var clearAll: Sinon.SinonSpy;
+    export var create: Sinon.SinonSpy;
+    export var get: Sinon.SinonSpy;
+    export var getAll: Sinon.SinonSpy;
+    export var onAlarm: SinonChrome.events.Event;
+}
+
+declare namespace SinonChrome.app {
+    export var getDetails: Sinon.SinonStub;
+    export var getDetailsForFrame: Sinon.SinonStub;
+    export var getDetails: Sinon.SinonStub;
+    export var getDetailsForFrame: Sinon.SinonStub;
+    export var getIsInstalled: Sinon.SinonStub;
+    export var installState: Sinon.SinonStub;
+    export var runningState: Sinon.SinonStub;
+}
+
+declare namespace SinonChrome.bookmarks {
+    export var create: Sinon.SinonStub;
+    export var get: Sinon.SinonStub;
+    export var getChildren: Sinon.SinonStub;
+    export var getRecent: Sinon.SinonStub;
+    export var getSubTree: Sinon.SinonStub;
+    export var getTree: Sinon.SinonStub;
+    export var move: Sinon.SinonStub;
+    export var remove: Sinon.SinonStub;
+    export var removeTree: Sinon.SinonStub;
+    export var search: Sinon.SinonStub;
+    export var update: Sinon.SinonStub;
+
+    export var onChanged: SinonChrome.events.Event;
+    export var onChildrenReordered: SinonChrome.events.Event;
+    export var onCreated: SinonChrome.events.Event;
+    export var onImportBegan: SinonChrome.events.Event;
+    export var onImportEnded: SinonChrome.events.Event;
+    export var onMoved: SinonChrome.events.Event;
+    export var onRemoved: SinonChrome.events.Event;
+}
+
+declare namespace SinonChrome.browserAction {
+    export var disable: Sinon.SinonStub;
+    export var enable: Sinon.SinonStub;
+    export var getBadgeBackgroundColor: Sinon.SinonStub;
+    export var getBadgeText: Sinon.SinonStub;
+    export var getPopup: Sinon.SinonStub;
+    export var getTitle: Sinon.SinonStub;
+    export var setBadgeBackgroundColor: Sinon.SinonStub;
+    export var setBadgeText: Sinon.SinonStub;
+    export var setIcon: Sinon.SinonStub;
+    export var setPopup: Sinon.SinonStub;
+    export var setTitle: Sinon.SinonStub;
+
+    export var onClicked: SinonChrome.events.Event;
+}
+
+declare namespace SinonChrome.browsingData {
+    export var remove: Sinon.SinonStub;
+    export var removeAppcache: Sinon.SinonStub;
+    export var removeCache: Sinon.SinonStub;
+    export var removeCookies: Sinon.SinonStub;
+    export var removeDownloads: Sinon.SinonStub;
+    export var removeFileSystems: Sinon.SinonStub;
+    export var removeFormData: Sinon.SinonStub;
+    export var removeHistory: Sinon.SinonStub;
+    export var removeIndexedDB: Sinon.SinonStub;
+    export var removeLocalStorage: Sinon.SinonStub;
+    export var removePasswords: Sinon.SinonStub;
+    export var removePluginData: Sinon.SinonStub;
+    export var removeWebSQL: Sinon.SinonStub;
+    export var settings: Sinon.SinonStub;
+}
+
+declare namespace SinonChrome.contentSettings {
+    interface StubbedContentSetting {
+      clear: Sinon.SinonStub;
+      get: Sinon.SinonStub;
+      getResourceIdentifiers: Sinon.SinonStub;
+      set: Sinon.SinonStub;
+    }
+
+    export var cookies: StubbedContentSetting;
+    export var images: StubbedContentSetting;
+    export var javascript: StubbedContentSetting;
+    export var notifications: StubbedContentSetting;
+    export var plugins: StubbedContentSetting;
+    export var popups: StubbedContentSetting;
+}
+
+declare namespace SinonChrome.contextMenus {
+    export var create: Sinon.SinonStub;
+    export var remove: Sinon.SinonStub;
+    export var removeAll: Sinon.SinonStub;
+    export var update: Sinon.SinonStub;
+
+    export var onClicked: SinonChrome.events.Event;
+}
+
+declare namespace SinonChrome.omnibox {
+    export var setDefaultSuggestion: Sinon.SinonStub;
+    export var onInputStarted: SinonChrome.events.Event;
+    export var onInputChanged: SinonChrome.events.Event;
+    export var onInputEntered: SinonChrome.events.Event;
+    export var onInputCancelled: SinonChrome.events.Event;
+}
+
+declare namespace SinonChrome.cookies {
+    export var get: Sinon.SinonStub;
+    export var getAll: Sinon.SinonStub;
+    export var getAllCookieStores: Sinon.SinonStub;
+    export var onChanged: SinonChrome.events.Event;
+    export var remove: Sinon.SinonStub;
+    export var set: Sinon.SinonStub;
+}
+
+/* TODO: Uncomment once https://github.com/Microsoft/TypeScript/issues/7840 is fixed
+declare module SinonChrome.debugger {
+    export var attach: Sinon.SinonStub;
+    export var detach: Sinon.SinonStub;
+    export var getTargets: Sinon.SinonStub;
+    export var sendCommand: Sinon.SinonStub;
+
+    export var onDetach: SinonChrome.events.Event;
+    export var onEvent: SinonChrome.events.Event;
+}
+*/
+
+declare namespace SinonChrome.declarativeContent {
+    export var PageStateMatcher: Sinon.SinonStub;
+    export var RequestContentScript: Sinon.SinonStub;
+    export var ShowPageAction: Sinon.SinonStub;
+
+    export var onPageChanged: SinonChrome.events.Event;
+}
+
+declare namespace SinonChrome. desktopCapture {
+    export var cancelChooseDesktopMedia: Sinon.SinonStub;
+    export var chooseDesktopMedia: Sinon.SinonStub;
+}
+
+declare namespace SinonChrome.downloads {
+    export var acceptDanger: Sinon.SinonStub;
+    export var cancel: Sinon.SinonStub;
+    export var download: Sinon.SinonStub;
+    export var drag: Sinon.SinonStub;
+    export var erase: Sinon.SinonStub;
+    export var getFileIcon: Sinon.SinonStub;
+    export var open: Sinon.SinonStub;
+    export var pause: Sinon.SinonStub;
+    export var removeFile: Sinon.SinonStub;
+    export var resume: Sinon.SinonStub;
+    export var search: Sinon.SinonStub;
+    export var setShelfEnabled: Sinon.SinonStub;
+    export var show: Sinon.SinonStub;
+    export var showDefaultFolder: Sinon.SinonStub;
+
+    export var onChanged: SinonChrome.events.Event;
+    export var onCreated: SinonChrome.events.Event;
+    export var onDeterminingFilename: SinonChrome.events.Event;
+    export var onErased: SinonChrome.events.Event;
+}
+
+declare namespace SinonChrome.extension {
+    export var connect: Sinon.SinonStub;
+    export var connectNative: Sinon.SinonStub;
+    export var getBackgroundPage: Sinon.SinonStub;
+    export var getURL: Sinon.SinonStub;
+    export var getViews: Sinon.SinonStub;
+    export var isAllowedFileSchemeAccess: Sinon.SinonStub;
+    export var isAllowedIncognitoAccess: Sinon.SinonStub;
+    export var sendMessage: Sinon.SinonStub;
+    export var sendNativeMessage: Sinon.SinonStub;
+    export var sendRequest: Sinon.SinonStub;
+    export var setUpdateUrlData: Sinon.SinonStub;
+
+    export var onConnect: SinonChrome.events.Event;
+    export var onConnectExternal: SinonChrome.events.Event;
+    export var onMessage: SinonChrome.events.Event;
+    export var onMessageExternal: SinonChrome.events.Event;
+    export var onRequest: SinonChrome.events.Event;
+    export var onRequestExternal: SinonChrome.events.Event;
+}
+
+declare namespace SinonChrome.fontSettings {
+    export var clearDefaultFixedFontSize: Sinon.SinonStub;
+    export var clearDefaultFontSize: Sinon.SinonStub;
+    export var clearFont: Sinon.SinonStub;
+    export var clearMinimumFontSize: Sinon.SinonStub;
+    export var getDefaultFixedFontSize: Sinon.SinonStub;
+    export var getDefaultFontSize: Sinon.SinonStub;
+    export var getFont: Sinon.SinonStub;
+    export var getFontList: Sinon.SinonStub;
+    export var getMinimumFontSize: Sinon.SinonStub;
+    export var setDefaultFixedFontSize: Sinon.SinonStub;
+    export var setDefaultFontSize: Sinon.SinonStub;
+    export var setFont: Sinon.SinonStub;
+    export var setMinimumFontSize: Sinon.SinonStub;
+
+    export var onDefaultFixedFontSizeChanged: SinonChrome.events.Event;
+    export var onDefaultFontSizeChanged: SinonChrome.events.Event;
+    export var onFontChanged: SinonChrome.events.Event;
+    export var onMinimumFontSizeChanged: SinonChrome.events.Event;
+}
+
+declare namespace SinonChrome.gcm {
+    export var onMessage: SinonChrome.events.Event;
+    export var onMessagesDeleted: SinonChrome.events.Event;
+    export var onSendError: SinonChrome.events.Event;
+
+    export var register: Sinon.SinonStub;
+    export var send: Sinon.SinonStub;
+    export var unregister: Sinon.SinonStub;
+}
+
+declare namespace SinonChrome.history {
+    export var addUrl: Sinon.SinonStub;
+    export var deleteAll: Sinon.SinonStub;
+    export var deleteRange: Sinon.SinonStub;
+    export var deleteUrl: Sinon.SinonStub;
+    export var getVisits: Sinon.SinonStub;
+    export var search: Sinon.SinonStub;
+
+    export var onVisitRemoved: SinonChrome.events.Event;
+    export var onVisited: SinonChrome.events.Event;
+}
+
+declare namespace SinonChrome.i18n {
+    export var getAcceptLanguages: Sinon.SinonStub;
+    export var getMessage: Sinon.SinonStub;
+    export var getUILanguage: Sinon.SinonStub;
+}
+
+declare namespace SinonChrome.identity {
+    export var getAuthToken: Sinon.SinonStub;
+    export var getProfileUserInfo: Sinon.SinonStub;
+    export var getRedirectURL: Sinon.SinonStub;
+    export var launchWebAuthFlow: Sinon.SinonStub;
+    export var removeCachedAuthToken: Sinon.SinonStub;
+
+    export var onSignInChanged: SinonChrome.events.Event;
+}
+
+declare namespace SinonChrome.idle {
+    export var onStateChanged: SinonChrome.events.Event;
+
+    export var queryState: Sinon.SinonStub;
+    export var setDetectionInterval: Sinon.SinonStub;
+}
+
+declare namespace SinonChrome.management {
+    export var createAppShortcut: Sinon.SinonStub;
+    export var generateAppForLink: Sinon.SinonStub;
+    export var get: Sinon.SinonStub;
+    export var getAll: Sinon.SinonStub;
+    export var getPermissionWarningsById: Sinon.SinonStub;
+    export var getPermissionWarningsByManifest: Sinon.SinonStub;
+    export var launchApp: Sinon.SinonStub;
+    export var setEnabled: Sinon.SinonStub;
+    export var setLaunchType: Sinon.SinonStub;
+    export var uninstall: Sinon.SinonStub;
+    export var uninstallSelf: Sinon.SinonStub;
+
+    export var onDisabled: SinonChrome.events.Event;
+    export var onEnabled: SinonChrome.events.Event;
+    export var onInstalled: SinonChrome.events.Event;
+    export var onUninstalled: SinonChrome.events.Event;
+}
+
+declare namespace SinonChrome.notifications {
+    export var clear: Sinon.SinonStub;
+    export var create: Sinon.SinonStub;
+    export var getAll: Sinon.SinonStub;
+    export var getPermissionLevel: Sinon.SinonStub;
+    export var update: Sinon.SinonStub;
+
+    export var onButtonClicked: SinonChrome.events.Event;
+    export var onClicked: SinonChrome.events.Event;
+    export var onClosed: SinonChrome.events.Event;
+    export var onPermissionLevelChanged: SinonChrome.events.Event;
+    export var onShowSettings: SinonChrome.events.Event;
+}
+
+declare namespace SinonChrome.pageCapture {
+    export var saveAsMHTML: Sinon.SinonStub;
+}
+
+declare namespace SinonChrome.permissions {
+    export var contains: Sinon.SinonStub;
+    export var getAll: Sinon.SinonStub;
+    export var onAdded: SinonChrome.events.Event;
+    export var onRemoved: SinonChrome.events.Event;
+    export var remove: Sinon.SinonStub;
+    export var request: Sinon.SinonStub;
+}
+
+declare namespace SinonChrome.power {
+    export var releaseKeepAwake: Sinon.SinonStub;
+    export var requestKeepAwake: Sinon.SinonStub;
+}
+
+declare namespace SinonChrome.types {
+    interface StubbedChromeSetting {
+        clear: Sinon.SinonStub;
+        get: Sinon.SinonStub;
+        set: Sinon.SinonStub;
+
+        onChange: SinonChrome.events.Event;
+    }
+}
+
+declare namespace SinonChrome.privacy {
+    export var network: {
+        networkPredictionEnabled: SinonChrome.types.StubbedChromeSetting;
+    };
+    export var services: {
+        alternateErrorPagesEnabled: SinonChrome.types.StubbedChromeSetting;
+        autofillEnabled: SinonChrome.types.StubbedChromeSetting;
+        passwordSavingEnabled: SinonChrome.types.StubbedChromeSetting;
+        safeBrowsingEnabled: SinonChrome.types.StubbedChromeSetting;
+        searchSuggestEnabled: SinonChrome.types.StubbedChromeSetting;
+        spellingServiceEnabled: SinonChrome.types.StubbedChromeSetting;
+        translationServiceEnabled: SinonChrome.types.StubbedChromeSetting;
+    };
+    export var website: {
+      hyperlinkAuditingEnabled: SinonChrome.types.StubbedChromeSetting;
+      referrersEnabled: SinonChrome.types.StubbedChromeSetting;
+      thirdPartyCookiesAllowed: SinonChrome.types.StubbedChromeSetting;
+    };
+}
+
+declare namespace SinonChrome.proxy {
+    export var onProxyError: SinonChrome.events.Event;
+    export var settings: SinonChrome.types.StubbedChromeSetting;
+}
+
+declare namespace SinonChrome.pushMessaging {
+    export var getChannelId: Sinon.SinonStub;
+    export var onMessage: SinonChrome.events.Event;
+}
+
+declare namespace SinonChrome.runtime {
+    export var connect: Sinon.SinonStub;
+    export var connectNative: Sinon.SinonStub;
+    export var getBackgroundPage: Sinon.SinonStub;
+    export var getManifest: Sinon.SinonStub;
+    export var getPackageDirectoryEntry: Sinon.SinonStub;
+    export var getPlatformInfo: Sinon.SinonStub;
+    export var reload: Sinon.SinonStub;
+    export var requestUpdateCheck: Sinon.SinonStub;
+    export var restart: Sinon.SinonStub;
+    export var sendMessage: Sinon.SinonStub;
+    export var sendNativeMessage: Sinon.SinonStub;
+
+    export var onBrowserUpdateAvailable: SinonChrome.events.Event;
+    export var onConnect: SinonChrome.events.Event;
+    export var onConnectExternal: SinonChrome.events.Event;
+    export var onInstalled: SinonChrome.events.Event;
+    export var onMessage: SinonChrome.events.Event;
+    export var onMessageExternal: SinonChrome.events.Event;
+    export var onRestartRequired: SinonChrome.events.Event;
+    export var onStartup: SinonChrome.events.Event;
+    export var onSuspend: SinonChrome.events.Event;
+    export var onSuspendCanceled: SinonChrome.events.Event;
+    export var onUpdateAvailable: SinonChrome.events.Event;
+
+    export var id: string;
+    export var getURL: Sinon.SinonSpy;
+    export var lastError: { message?: string };
+}
+
+declare namespace SinonChrome.sessions {
+    export var getDevices: Sinon.SinonStub;
+    export var getRecentlyClosed: Sinon.SinonStub;
+    export var restore: Sinon.SinonStub;
+
+    export var onChanged: SinonChrome.events.Event;
+}
+
+declare namespace SinonChrome.storage {
+    interface StubbedStorageArea {
+      clear: Sinon.SinonStub;
+      get: Sinon.SinonStub;
+      getBytesInUse: Sinon.SinonStub;
+      remove: Sinon.SinonStub;
+      set: Sinon.SinonStub;
+    }
+
+    export var local: StubbedStorageArea;
+    export var managed: StubbedStorageArea;
+    export var sync: StubbedStorageArea;
+
+    export var onChanged: SinonChrome.events.Event;
+}
+
+declare namespace SinonChrome.tabCapture {
+    export var capture: Sinon.SinonStub;
+    export var getCapturedTabs: Sinon.SinonStub;
+
+    export var onStatusChanged: SinonChrome.events.Event;
+}
+
+declare namespace SinonChrome.tabs {
+    export var captureVisibleTab: Sinon.SinonStub;
+    export var connect: Sinon.SinonStub;
+    export var create: Sinon.SinonStub;
+    export var detectLanguage: Sinon.SinonStub;
+    export var duplicate: Sinon.SinonStub;
+    export var executeScript: Sinon.SinonStub;
+    export var get: Sinon.SinonStub;
+    export var getAllInWindow: Sinon.SinonStub;
+    export var getCurrent: Sinon.SinonStub;
+    export var getSelected: Sinon.SinonStub;
+    export var highlight: Sinon.SinonStub;
+    export var insertCSS: Sinon.SinonStub;
+    export var move: Sinon.SinonStub;
+    export var query: Sinon.SinonStub;
+    export var reload: Sinon.SinonStub;
+    export var remove: Sinon.SinonStub;
+    export var sendMessage: Sinon.SinonStub;
+    export var sendRequest: Sinon.SinonStub;
+    export var update: Sinon.SinonStub;
+
+    export var onActivated: SinonChrome.events.Event;
+    export var onActiveChanged: SinonChrome.events.Event;
+    export var onAttached: SinonChrome.events.Event;
+    export var onCreated: SinonChrome.events.Event;
+    export var onDetached: SinonChrome.events.Event;
+    export var onHighlightChanged: SinonChrome.events.Event;
+    export var onHighlighted: SinonChrome.events.Event;
+    export var onMoved: SinonChrome.events.Event;
+    export var onRemoved: SinonChrome.events.Event;
+    export var onReplaced: SinonChrome.events.Event;
+    export var onSelectionChanged: SinonChrome.events.Event;
+    export var onUpdated: SinonChrome.events.Event;
+    export var onZoomChange: SinonChrome.events.Event;
+}
+
+declare namespace SinonChrome.topSites {
+    export var get: Sinon.SinonStub;
+}
+
+declare namespace SinonChrome.tts {
+    export var getVoices: Sinon.SinonStub;
+    export var isSpeaking: Sinon.SinonStub;
+    export var pause: Sinon.SinonStub;
+    export var resume: Sinon.SinonStub;
+    export var speak: Sinon.SinonStub;
+    export var stop: Sinon.SinonStub;
+
+    export var onEvent: SinonChrome.events.Event;
+}
+
+declare namespace SinonChrome.ttsEngine {
+    export var onPause: SinonChrome.events.Event;
+    export var onResume: SinonChrome.events.Event;
+    export var onSpeak: SinonChrome.events.Event;
+    export var onStop: SinonChrome.events.Event;
+
+    export var sendTtsEvent: Sinon.SinonStub;
+}
+
+declare namespace SinonChrome.webNavigation {
+    export var getAllFrames: Sinon.SinonStub;
+    export var getFrame: Sinon.SinonStub;
+
+    export var onBeforeNavigate: SinonChrome.events.Event;
+    export var onCommitted: SinonChrome.events.Event;
+    export var onCompleted: SinonChrome.events.Event;
+    export var onCreatedNavigationTarget: SinonChrome.events.Event;
+    export var onDOMContentLoaded: SinonChrome.events.Event;
+    export var onErrorOccurred: SinonChrome.events.Event;
+    export var onHistoryStateUpdated: SinonChrome.events.Event;
+    export var onReferenceFragmentUpdated: SinonChrome.events.Event;
+    export var onTabReplaced: SinonChrome.events.Event;
+}
+
+declare namespace SinonChrome.webRequest {
+    export var handlerBehaviorChanged: Sinon.SinonStub;
+
+    export var onAuthRequired: SinonChrome.events.Event;
+    export var onBeforeRedirect: SinonChrome.events.Event;
+    export var onBeforeRequest: SinonChrome.events.Event;
+    export var onBeforeSendHeaders: SinonChrome.events.Event;
+    export var onCompleted: SinonChrome.events.Event;
+    export var onErrorOccurred: SinonChrome.events.Event;
+    export var onHeadersReceived: SinonChrome.events.Event;
+    export var onResponseStarted: SinonChrome.events.Event;
+    export var onSendHeaders: SinonChrome.events.Event;
+}
+
+declare namespace SinonChrome.windows {
+    export var create: Sinon.SinonStub;
+    export var get: Sinon.SinonStub;
+    export var getAll: Sinon.SinonStub;
+    export var getCurrent: Sinon.SinonStub;
+    export var getLastFocused: Sinon.SinonStub;
+    export var remove: Sinon.SinonStub;
+    export var update: Sinon.SinonStub;
+
+    export var onCreated: SinonChrome.events.Event;
+    export var onFocusChanged: SinonChrome.events.Event;
+    export var onRemoved: SinonChrome.events.Event;
+}
diff --git a/sinon-chrome/sinon-chrome-tests.ts b/sinon-chrome/sinon-chrome-tests.ts
index 1b714fb4ee..70c6cfb1d3 100644
--- a/sinon-chrome/sinon-chrome-tests.ts
+++ b/sinon-chrome/sinon-chrome-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="sinon-chrome.d.ts"/>
-
 var chromeStub = <typeof SinonChrome> <any> window.chrome;
 
 // Examples taken from https://github.com/vitalets/sinon-chrome:
diff --git a/sinon-chrome/sinon-chrome.d.ts b/sinon-chrome/sinon-chrome.d.ts
deleted file mode 100644
index 698408f84c..0000000000
--- a/sinon-chrome/sinon-chrome.d.ts
+++ /dev/null
@@ -1,549 +0,0 @@
-// Type definitions for Sinon-Chrome v0.2.1
-// Project: https://github.com/vitalets/sinon-chrome
-// Definitions by: Tim Perry <https://github.com/pimterry>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../chrome/chrome.d.ts"/>
-/// <reference path="../sinon/sinon.d.ts"/>
-
-/**
- * To use sinon-chrome:
- * Use chrome.* as normal in your production code
- * In tests, forcibly cast window.chrome to typeof SinonChrome to access stub API.
- * @example
- * var chrome = <typeof SinonChrome> <any> window.chrome;
- * chrome.storage.onChanged.trigger(...);
- */
-declare namespace SinonChrome {
-    /**
-     * Flush cache
-     */
-    export function flush(): void;
-
-    /**
-     * Reset all stubs and remove event listeners
-     * See https://github.com/cjohansen/Sinon.JS/issues/572
-     */
-    export function reset(): void;
-
-    export var csi: Sinon.SinonSpy;
-    export var loadTimes: Sinon.SinonSpy;
-}
-
-declare namespace SinonChrome.events {
-    interface Event extends chrome.events.Event<Function> {
-        trigger(...args: any[]): void;
-        triggerAsync(...args: any[]): void;
-
-        applyTrigger(args: any[]): void;
-        applyTriggerAsync(args: any[]): void;
-
-        addListener: Sinon.SinonSpy;
-        removeListener: Sinon.SinonSpy;
-        removeListeners: Sinon.SinonSpy;
-        hasListener: Sinon.SinonSpy;
-    }
-}
-
-declare namespace SinonChrome.alarms {
-    export var clear: Sinon.SinonSpy;
-    export var clearAll: Sinon.SinonSpy;
-    export var create: Sinon.SinonSpy;
-    export var get: Sinon.SinonSpy;
-    export var getAll: Sinon.SinonSpy;
-    export var onAlarm: SinonChrome.events.Event;
-}
-
-declare namespace SinonChrome.app {
-    export var getDetails: Sinon.SinonStub;
-    export var getDetailsForFrame: Sinon.SinonStub;
-    export var getDetails: Sinon.SinonStub;
-    export var getDetailsForFrame: Sinon.SinonStub;
-    export var getIsInstalled: Sinon.SinonStub;
-    export var installState: Sinon.SinonStub;
-    export var runningState: Sinon.SinonStub;
-}
-
-declare namespace SinonChrome.bookmarks {
-    export var create: Sinon.SinonStub;
-    export var get: Sinon.SinonStub;
-    export var getChildren: Sinon.SinonStub;
-    export var getRecent: Sinon.SinonStub;
-    export var getSubTree: Sinon.SinonStub;
-    export var getTree: Sinon.SinonStub;
-    export var move: Sinon.SinonStub;
-    export var remove: Sinon.SinonStub;
-    export var removeTree: Sinon.SinonStub;
-    export var search: Sinon.SinonStub;
-    export var update: Sinon.SinonStub;
-
-    export var onChanged: SinonChrome.events.Event;
-    export var onChildrenReordered: SinonChrome.events.Event;
-    export var onCreated: SinonChrome.events.Event;
-    export var onImportBegan: SinonChrome.events.Event;
-    export var onImportEnded: SinonChrome.events.Event;
-    export var onMoved: SinonChrome.events.Event;
-    export var onRemoved: SinonChrome.events.Event;
-}
-
-declare namespace SinonChrome.browserAction {
-    export var disable: Sinon.SinonStub;
-    export var enable: Sinon.SinonStub;
-    export var getBadgeBackgroundColor: Sinon.SinonStub;
-    export var getBadgeText: Sinon.SinonStub;
-    export var getPopup: Sinon.SinonStub;
-    export var getTitle: Sinon.SinonStub;
-    export var setBadgeBackgroundColor: Sinon.SinonStub;
-    export var setBadgeText: Sinon.SinonStub;
-    export var setIcon: Sinon.SinonStub;
-    export var setPopup: Sinon.SinonStub;
-    export var setTitle: Sinon.SinonStub;
-
-    export var onClicked: SinonChrome.events.Event;
-}
-
-declare namespace SinonChrome.browsingData {
-    export var remove: Sinon.SinonStub;
-    export var removeAppcache: Sinon.SinonStub;
-    export var removeCache: Sinon.SinonStub;
-    export var removeCookies: Sinon.SinonStub;
-    export var removeDownloads: Sinon.SinonStub;
-    export var removeFileSystems: Sinon.SinonStub;
-    export var removeFormData: Sinon.SinonStub;
-    export var removeHistory: Sinon.SinonStub;
-    export var removeIndexedDB: Sinon.SinonStub;
-    export var removeLocalStorage: Sinon.SinonStub;
-    export var removePasswords: Sinon.SinonStub;
-    export var removePluginData: Sinon.SinonStub;
-    export var removeWebSQL: Sinon.SinonStub;
-    export var settings: Sinon.SinonStub;
-}
-
-declare namespace SinonChrome.contentSettings {
-    interface StubbedContentSetting {
-      clear: Sinon.SinonStub;
-      get: Sinon.SinonStub;
-      getResourceIdentifiers: Sinon.SinonStub;
-      set: Sinon.SinonStub;
-    }
-
-    export var cookies: StubbedContentSetting;
-    export var images: StubbedContentSetting;
-    export var javascript: StubbedContentSetting;
-    export var notifications: StubbedContentSetting;
-    export var plugins: StubbedContentSetting;
-    export var popups: StubbedContentSetting;
-}
-
-declare namespace SinonChrome.contextMenus {
-    export var create: Sinon.SinonStub;
-    export var remove: Sinon.SinonStub;
-    export var removeAll: Sinon.SinonStub;
-    export var update: Sinon.SinonStub;
-
-    export var onClicked: SinonChrome.events.Event;
-}
-
-declare namespace SinonChrome.omnibox {
-    export var setDefaultSuggestion: Sinon.SinonStub;
-    export var onInputStarted: SinonChrome.events.Event;
-    export var onInputChanged: SinonChrome.events.Event;
-    export var onInputEntered: SinonChrome.events.Event;
-    export var onInputCancelled: SinonChrome.events.Event;
-}
-
-declare namespace SinonChrome.cookies {
-    export var get: Sinon.SinonStub;
-    export var getAll: Sinon.SinonStub;
-    export var getAllCookieStores: Sinon.SinonStub;
-    export var onChanged: SinonChrome.events.Event;
-    export var remove: Sinon.SinonStub;
-    export var set: Sinon.SinonStub;
-}
-
-declare module "SinonChrome.debugger" {
-    export var attach: Sinon.SinonStub;
-    export var detach: Sinon.SinonStub;
-    export var getTargets: Sinon.SinonStub;
-    export var sendCommand: Sinon.SinonStub;
-
-    export var onDetach: SinonChrome.events.Event;
-    export var onEvent: SinonChrome.events.Event;
-}
-
-declare namespace SinonChrome.declarativeContent {
-    export var PageStateMatcher: Sinon.SinonStub;
-    export var RequestContentScript: Sinon.SinonStub;
-    export var ShowPageAction: Sinon.SinonStub;
-
-    export var onPageChanged: SinonChrome.events.Event;
-}
-
-declare namespace SinonChrome. desktopCapture {
-    export var cancelChooseDesktopMedia: Sinon.SinonStub;
-    export var chooseDesktopMedia: Sinon.SinonStub;
-}
-
-declare namespace SinonChrome.downloads {
-    export var acceptDanger: Sinon.SinonStub;
-    export var cancel: Sinon.SinonStub;
-    export var download: Sinon.SinonStub;
-    export var drag: Sinon.SinonStub;
-    export var erase: Sinon.SinonStub;
-    export var getFileIcon: Sinon.SinonStub;
-    export var open: Sinon.SinonStub;
-    export var pause: Sinon.SinonStub;
-    export var removeFile: Sinon.SinonStub;
-    export var resume: Sinon.SinonStub;
-    export var search: Sinon.SinonStub;
-    export var setShelfEnabled: Sinon.SinonStub;
-    export var show: Sinon.SinonStub;
-    export var showDefaultFolder: Sinon.SinonStub;
-
-    export var onChanged: SinonChrome.events.Event;
-    export var onCreated: SinonChrome.events.Event;
-    export var onDeterminingFilename: SinonChrome.events.Event;
-    export var onErased: SinonChrome.events.Event;
-}
-
-declare namespace SinonChrome.extension {
-    export var connect: Sinon.SinonStub;
-    export var connectNative: Sinon.SinonStub;
-    export var getBackgroundPage: Sinon.SinonStub;
-    export var getURL: Sinon.SinonStub;
-    export var getViews: Sinon.SinonStub;
-    export var isAllowedFileSchemeAccess: Sinon.SinonStub;
-    export var isAllowedIncognitoAccess: Sinon.SinonStub;
-    export var sendMessage: Sinon.SinonStub;
-    export var sendNativeMessage: Sinon.SinonStub;
-    export var sendRequest: Sinon.SinonStub;
-    export var setUpdateUrlData: Sinon.SinonStub;
-
-    export var onConnect: SinonChrome.events.Event;
-    export var onConnectExternal: SinonChrome.events.Event;
-    export var onMessage: SinonChrome.events.Event;
-    export var onMessageExternal: SinonChrome.events.Event;
-    export var onRequest: SinonChrome.events.Event;
-    export var onRequestExternal: SinonChrome.events.Event;
-}
-
-declare namespace SinonChrome.fontSettings {
-    export var clearDefaultFixedFontSize: Sinon.SinonStub;
-    export var clearDefaultFontSize: Sinon.SinonStub;
-    export var clearFont: Sinon.SinonStub;
-    export var clearMinimumFontSize: Sinon.SinonStub;
-    export var getDefaultFixedFontSize: Sinon.SinonStub;
-    export var getDefaultFontSize: Sinon.SinonStub;
-    export var getFont: Sinon.SinonStub;
-    export var getFontList: Sinon.SinonStub;
-    export var getMinimumFontSize: Sinon.SinonStub;
-    export var setDefaultFixedFontSize: Sinon.SinonStub;
-    export var setDefaultFontSize: Sinon.SinonStub;
-    export var setFont: Sinon.SinonStub;
-    export var setMinimumFontSize: Sinon.SinonStub;
-
-    export var onDefaultFixedFontSizeChanged: SinonChrome.events.Event;
-    export var onDefaultFontSizeChanged: SinonChrome.events.Event;
-    export var onFontChanged: SinonChrome.events.Event;
-    export var onMinimumFontSizeChanged: SinonChrome.events.Event;
-}
-
-declare namespace SinonChrome.gcm {
-    export var onMessage: SinonChrome.events.Event;
-    export var onMessagesDeleted: SinonChrome.events.Event;
-    export var onSendError: SinonChrome.events.Event;
-
-    export var register: Sinon.SinonStub;
-    export var send: Sinon.SinonStub;
-    export var unregister: Sinon.SinonStub;
-}
-
-declare namespace SinonChrome.history {
-    export var addUrl: Sinon.SinonStub;
-    export var deleteAll: Sinon.SinonStub;
-    export var deleteRange: Sinon.SinonStub;
-    export var deleteUrl: Sinon.SinonStub;
-    export var getVisits: Sinon.SinonStub;
-    export var search: Sinon.SinonStub;
-
-    export var onVisitRemoved: SinonChrome.events.Event;
-    export var onVisited: SinonChrome.events.Event;
-}
-
-declare namespace SinonChrome.i18n {
-    export var getAcceptLanguages: Sinon.SinonStub;
-    export var getMessage: Sinon.SinonStub;
-    export var getUILanguage: Sinon.SinonStub;
-}
-
-declare namespace SinonChrome.identity {
-    export var getAuthToken: Sinon.SinonStub;
-    export var getProfileUserInfo: Sinon.SinonStub;
-    export var getRedirectURL: Sinon.SinonStub;
-    export var launchWebAuthFlow: Sinon.SinonStub;
-    export var removeCachedAuthToken: Sinon.SinonStub;
-
-    export var onSignInChanged: SinonChrome.events.Event;
-}
-
-declare namespace SinonChrome.idle {
-    export var onStateChanged: SinonChrome.events.Event;
-
-    export var queryState: Sinon.SinonStub;
-    export var setDetectionInterval: Sinon.SinonStub;
-}
-
-declare namespace SinonChrome.management {
-    export var createAppShortcut: Sinon.SinonStub;
-    export var generateAppForLink: Sinon.SinonStub;
-    export var get: Sinon.SinonStub;
-    export var getAll: Sinon.SinonStub;
-    export var getPermissionWarningsById: Sinon.SinonStub;
-    export var getPermissionWarningsByManifest: Sinon.SinonStub;
-    export var launchApp: Sinon.SinonStub;
-    export var setEnabled: Sinon.SinonStub;
-    export var setLaunchType: Sinon.SinonStub;
-    export var uninstall: Sinon.SinonStub;
-    export var uninstallSelf: Sinon.SinonStub;
-
-    export var onDisabled: SinonChrome.events.Event;
-    export var onEnabled: SinonChrome.events.Event;
-    export var onInstalled: SinonChrome.events.Event;
-    export var onUninstalled: SinonChrome.events.Event;
-}
-
-declare namespace SinonChrome.notifications {
-    export var clear: Sinon.SinonStub;
-    export var create: Sinon.SinonStub;
-    export var getAll: Sinon.SinonStub;
-    export var getPermissionLevel: Sinon.SinonStub;
-    export var update: Sinon.SinonStub;
-
-    export var onButtonClicked: SinonChrome.events.Event;
-    export var onClicked: SinonChrome.events.Event;
-    export var onClosed: SinonChrome.events.Event;
-    export var onPermissionLevelChanged: SinonChrome.events.Event;
-    export var onShowSettings: SinonChrome.events.Event;
-}
-
-declare namespace SinonChrome.pageCapture {
-    export var saveAsMHTML: Sinon.SinonStub;
-}
-
-declare namespace SinonChrome.permissions {
-    export var contains: Sinon.SinonStub;
-    export var getAll: Sinon.SinonStub;
-    export var onAdded: SinonChrome.events.Event;
-    export var onRemoved: SinonChrome.events.Event;
-    export var remove: Sinon.SinonStub;
-    export var request: Sinon.SinonStub;
-}
-
-declare namespace SinonChrome.power {
-    export var releaseKeepAwake: Sinon.SinonStub;
-    export var requestKeepAwake: Sinon.SinonStub;
-}
-
-declare namespace SinonChrome.types {
-    interface StubbedChromeSetting {
-        clear: Sinon.SinonStub;
-        get: Sinon.SinonStub;
-        set: Sinon.SinonStub;
-
-        onChange: SinonChrome.events.Event;
-    }
-}
-
-declare namespace SinonChrome.privacy {
-    export var network: {
-        networkPredictionEnabled: SinonChrome.types.StubbedChromeSetting;
-    };
-    export var services: {
-        alternateErrorPagesEnabled: SinonChrome.types.StubbedChromeSetting;
-        autofillEnabled: SinonChrome.types.StubbedChromeSetting;
-        passwordSavingEnabled: SinonChrome.types.StubbedChromeSetting;
-        safeBrowsingEnabled: SinonChrome.types.StubbedChromeSetting;
-        searchSuggestEnabled: SinonChrome.types.StubbedChromeSetting;
-        spellingServiceEnabled: SinonChrome.types.StubbedChromeSetting;
-        translationServiceEnabled: SinonChrome.types.StubbedChromeSetting;
-    };
-    export var website: {
-      hyperlinkAuditingEnabled: SinonChrome.types.StubbedChromeSetting;
-      referrersEnabled: SinonChrome.types.StubbedChromeSetting;
-      thirdPartyCookiesAllowed: SinonChrome.types.StubbedChromeSetting;
-    };
-}
-
-declare namespace SinonChrome.proxy {
-    export var onProxyError: SinonChrome.events.Event;
-    export var settings: SinonChrome.types.StubbedChromeSetting;
-}
-
-declare namespace SinonChrome.pushMessaging {
-    export var getChannelId: Sinon.SinonStub;
-    export var onMessage: SinonChrome.events.Event;
-}
-
-declare namespace SinonChrome.runtime {
-    export var connect: Sinon.SinonStub;
-    export var connectNative: Sinon.SinonStub;
-    export var getBackgroundPage: Sinon.SinonStub;
-    export var getManifest: Sinon.SinonStub;
-    export var getPackageDirectoryEntry: Sinon.SinonStub;
-    export var getPlatformInfo: Sinon.SinonStub;
-    export var reload: Sinon.SinonStub;
-    export var requestUpdateCheck: Sinon.SinonStub;
-    export var restart: Sinon.SinonStub;
-    export var sendMessage: Sinon.SinonStub;
-    export var sendNativeMessage: Sinon.SinonStub;
-
-    export var onBrowserUpdateAvailable: SinonChrome.events.Event;
-    export var onConnect: SinonChrome.events.Event;
-    export var onConnectExternal: SinonChrome.events.Event;
-    export var onInstalled: SinonChrome.events.Event;
-    export var onMessage: SinonChrome.events.Event;
-    export var onMessageExternal: SinonChrome.events.Event;
-    export var onRestartRequired: SinonChrome.events.Event;
-    export var onStartup: SinonChrome.events.Event;
-    export var onSuspend: SinonChrome.events.Event;
-    export var onSuspendCanceled: SinonChrome.events.Event;
-    export var onUpdateAvailable: SinonChrome.events.Event;
-
-    export var id: string;
-    export var getURL: Sinon.SinonSpy;
-    export var lastError: { message?: string };
-}
-
-declare namespace SinonChrome.sessions {
-    export var getDevices: Sinon.SinonStub;
-    export var getRecentlyClosed: Sinon.SinonStub;
-    export var restore: Sinon.SinonStub;
-
-    export var onChanged: SinonChrome.events.Event;
-}
-
-declare namespace SinonChrome.storage {
-    interface StubbedStorageArea {
-      clear: Sinon.SinonStub;
-      get: Sinon.SinonStub;
-      getBytesInUse: Sinon.SinonStub;
-      remove: Sinon.SinonStub;
-      set: Sinon.SinonStub;
-    }
-
-    export var local: StubbedStorageArea;
-    export var managed: StubbedStorageArea;
-    export var sync: StubbedStorageArea;
-
-    export var onChanged: SinonChrome.events.Event;
-}
-
-declare namespace SinonChrome.tabCapture {
-    export var capture: Sinon.SinonStub;
-    export var getCapturedTabs: Sinon.SinonStub;
-
-    export var onStatusChanged: SinonChrome.events.Event;
-}
-
-declare namespace SinonChrome.tabs {
-    export var captureVisibleTab: Sinon.SinonStub;
-    export var connect: Sinon.SinonStub;
-    export var create: Sinon.SinonStub;
-    export var detectLanguage: Sinon.SinonStub;
-    export var duplicate: Sinon.SinonStub;
-    export var executeScript: Sinon.SinonStub;
-    export var get: Sinon.SinonStub;
-    export var getAllInWindow: Sinon.SinonStub;
-    export var getCurrent: Sinon.SinonStub;
-    export var getSelected: Sinon.SinonStub;
-    export var highlight: Sinon.SinonStub;
-    export var insertCSS: Sinon.SinonStub;
-    export var move: Sinon.SinonStub;
-    export var query: Sinon.SinonStub;
-    export var reload: Sinon.SinonStub;
-    export var remove: Sinon.SinonStub;
-    export var sendMessage: Sinon.SinonStub;
-    export var sendRequest: Sinon.SinonStub;
-    export var update: Sinon.SinonStub;
-
-    export var onActivated: SinonChrome.events.Event;
-    export var onActiveChanged: SinonChrome.events.Event;
-    export var onAttached: SinonChrome.events.Event;
-    export var onCreated: SinonChrome.events.Event;
-    export var onDetached: SinonChrome.events.Event;
-    export var onHighlightChanged: SinonChrome.events.Event;
-    export var onHighlighted: SinonChrome.events.Event;
-    export var onMoved: SinonChrome.events.Event;
-    export var onRemoved: SinonChrome.events.Event;
-    export var onReplaced: SinonChrome.events.Event;
-    export var onSelectionChanged: SinonChrome.events.Event;
-    export var onUpdated: SinonChrome.events.Event;
-    export var onZoomChange: SinonChrome.events.Event;
-}
-
-declare namespace SinonChrome.topSites {
-    export var get: Sinon.SinonStub;
-}
-
-declare namespace SinonChrome.tts {
-    export var getVoices: Sinon.SinonStub;
-    export var isSpeaking: Sinon.SinonStub;
-    export var pause: Sinon.SinonStub;
-    export var resume: Sinon.SinonStub;
-    export var speak: Sinon.SinonStub;
-    export var stop: Sinon.SinonStub;
-
-    export var onEvent: SinonChrome.events.Event;
-}
-
-declare namespace SinonChrome.ttsEngine {
-    export var onPause: SinonChrome.events.Event;
-    export var onResume: SinonChrome.events.Event;
-    export var onSpeak: SinonChrome.events.Event;
-    export var onStop: SinonChrome.events.Event;
-
-    export var sendTtsEvent: Sinon.SinonStub;
-}
-
-declare namespace SinonChrome.webNavigation {
-    export var getAllFrames: Sinon.SinonStub;
-    export var getFrame: Sinon.SinonStub;
-
-    export var onBeforeNavigate: SinonChrome.events.Event;
-    export var onCommitted: SinonChrome.events.Event;
-    export var onCompleted: SinonChrome.events.Event;
-    export var onCreatedNavigationTarget: SinonChrome.events.Event;
-    export var onDOMContentLoaded: SinonChrome.events.Event;
-    export var onErrorOccurred: SinonChrome.events.Event;
-    export var onHistoryStateUpdated: SinonChrome.events.Event;
-    export var onReferenceFragmentUpdated: SinonChrome.events.Event;
-    export var onTabReplaced: SinonChrome.events.Event;
-}
-
-declare namespace SinonChrome.webRequest {
-    export var handlerBehaviorChanged: Sinon.SinonStub;
-
-    export var onAuthRequired: SinonChrome.events.Event;
-    export var onBeforeRedirect: SinonChrome.events.Event;
-    export var onBeforeRequest: SinonChrome.events.Event;
-    export var onBeforeSendHeaders: SinonChrome.events.Event;
-    export var onCompleted: SinonChrome.events.Event;
-    export var onErrorOccurred: SinonChrome.events.Event;
-    export var onHeadersReceived: SinonChrome.events.Event;
-    export var onResponseStarted: SinonChrome.events.Event;
-    export var onSendHeaders: SinonChrome.events.Event;
-}
-
-declare namespace SinonChrome.windows {
-    export var create: Sinon.SinonStub;
-    export var get: Sinon.SinonStub;
-    export var getAll: Sinon.SinonStub;
-    export var getCurrent: Sinon.SinonStub;
-    export var getLastFocused: Sinon.SinonStub;
-    export var remove: Sinon.SinonStub;
-    export var update: Sinon.SinonStub;
-
-    export var onCreated: SinonChrome.events.Event;
-    export var onFocusChanged: SinonChrome.events.Event;
-    export var onRemoved: SinonChrome.events.Event;
-}
diff --git a/sinon-chrome/tsconfig.json b/sinon-chrome/tsconfig.json
new file mode 100644
index 0000000000..31aea9f1ae
--- /dev/null
+++ b/sinon-chrome/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sinon-chrome-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sinon-stub-promise/index.d.ts b/sinon-stub-promise/index.d.ts
new file mode 100644
index 0000000000..cc84d9000d
--- /dev/null
+++ b/sinon-stub-promise/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for sinon-stub-promise v1.0.1
+// Project: https://github.com/substantial/sinon-stub-promise
+// Definitions by: Thiago Temple <https://github.com/vintem>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="sinon"/>
+
+declare namespace Sinon {
+  interface SinonPromise {
+    resolves(value?: any): void;
+    rejects(value?: any): void;
+  }
+
+  interface SinonStub {
+    returnsPromise(): SinonPromise;
+  }
+}
diff --git a/sinon-stub-promise/sinon-stub-promise-tests.ts b/sinon-stub-promise/sinon-stub-promise-tests.ts
index 56c20a18a9..3a03787235 100644
--- a/sinon-stub-promise/sinon-stub-promise-tests.ts
+++ b/sinon-stub-promise/sinon-stub-promise-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="sinon-stub-promise.d.ts"/>
 function testResolve() {
     var promise = sinon.stub().returnsPromise();
     promise.resolves('test val');
diff --git a/sinon-stub-promise/sinon-stub-promise.d.ts b/sinon-stub-promise/sinon-stub-promise.d.ts
deleted file mode 100644
index 151f6d2ff4..0000000000
--- a/sinon-stub-promise/sinon-stub-promise.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for sinon-stub-promise v1.0.1
-// Project: https://github.com/substantial/sinon-stub-promise
-// Definitions by: Thiago Temple <https://github.com/vintem>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../sinon/sinon.d.ts"/>
-
-declare namespace Sinon {
-  interface SinonPromise {
-    resolves(value?: any): void;
-    rejects(value?: any): void;
-  }
-
-  interface SinonStub {
-    returnsPromise(): SinonPromise;
-  }
-}
diff --git a/sinon-stub-promise/tsconfig.json b/sinon-stub-promise/tsconfig.json
new file mode 100644
index 0000000000..bf99070a90
--- /dev/null
+++ b/sinon-stub-promise/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sinon-stub-promise-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sinon/index.d.ts b/sinon/index.d.ts
new file mode 100644
index 0000000000..77de211994
--- /dev/null
+++ b/sinon/index.d.ts
@@ -0,0 +1,434 @@
+// Type definitions for Sinon 1.16.0
+// Project: http://sinonjs.org/
+// Definitions by: William Sears <https://github.com/mrbigdog2u>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace Sinon {
+    interface SinonSpyCallApi {
+        // Properties
+        thisValue: any;
+        args: any[];
+        exception: any;
+        returnValue: any;
+
+        // Methods
+        calledOn(obj: any): boolean;
+        calledWith(...args: any[]): boolean;
+        calledWithExactly(...args: any[]): boolean;
+        calledWithMatch(...args: any[]): boolean;
+        notCalledWith(...args: any[]): boolean;
+        notCalledWithMatch(...args: any[]): boolean;
+        returned(value: any): boolean;
+        threw(): boolean;
+        threw(type: string): boolean;
+        threw(obj: any): boolean;
+        callArg(pos: number): void;
+        callArgOn(pos: number, obj: any, ...args: any[]): void;
+        callArgWith(pos: number, ...args: any[]): void;
+        callArgOnWith(pos: number, obj: any, ...args: any[]): void;
+        yield(...args: any[]): void;
+        yieldOn(obj: any, ...args: any[]): void;
+        yieldTo(property: string, ...args: any[]): void;
+        yieldToOn(property: string, obj: any, ...args: any[]): void;
+    }
+
+    interface SinonSpyCall extends SinonSpyCallApi {
+        calledBefore(call: SinonSpyCall): boolean;
+        calledAfter(call: SinonSpyCall): boolean;
+        calledWithNew(call: SinonSpyCall): boolean;
+    }
+
+    interface SinonSpy extends SinonSpyCallApi {
+        // Properties
+        callCount: number;
+        called: boolean;
+        notCalled: boolean;
+        calledOnce: boolean;
+        calledTwice: boolean;
+        calledThrice: boolean;
+        firstCall: SinonSpyCall;
+        secondCall: SinonSpyCall;
+        thirdCall: SinonSpyCall;
+        lastCall: SinonSpyCall;
+        thisValues: any[];
+        args: any[][];
+        exceptions: any[];
+        returnValues: any[];
+
+        // Methods
+        (...args: any[]): any;
+        calledBefore(anotherSpy: SinonSpy): boolean;
+        calledAfter(anotherSpy: SinonSpy): boolean;
+        calledWithNew(spy: SinonSpy): boolean;
+        withArgs(...args: any[]): SinonSpy;
+        alwaysCalledOn(obj: any): boolean;
+        alwaysCalledWith(...args: any[]): boolean;
+        alwaysCalledWithExactly(...args: any[]): boolean;
+        alwaysCalledWithMatch(...args: any[]): boolean;
+        neverCalledWith(...args: any[]): boolean;
+        neverCalledWithMatch(...args: any[]): boolean;
+        alwaysThrew(): boolean;
+        alwaysThrew(type: string): boolean;
+        alwaysThrew(obj: any): boolean;
+        alwaysReturned(): boolean;
+        invokeCallback(...args: any[]): void;
+        getCall(n: number): SinonSpyCall;
+        reset(): void;
+        printf(format: string, ...args: any[]): string;
+        restore(): void;
+    }
+
+    interface SinonSpyStatic {
+        (): SinonSpy;
+        (func: any): SinonSpy;
+        (obj: any, method: string): SinonSpy;
+    }
+
+    interface SinonStatic {
+        spy: SinonSpyStatic;
+    }
+
+    interface SinonStub extends SinonSpy {
+        resetBehavior(): void;
+        returns(obj: any): SinonStub;
+        returnsArg(index: number): SinonStub;
+        returnsThis(): SinonStub;
+        throws(type?: string): SinonStub;
+        throws(obj: any): SinonStub;
+        callsArg(index: number): SinonStub;
+        callsArgOn(index: number, context: any): SinonStub;
+        callsArgWith(index: number, ...args: any[]): SinonStub;
+        callsArgOnWith(index: number, context: any, ...args: any[]): SinonStub;
+        callsArgAsync(index: number): SinonStub;
+        callsArgOnAsync(index: number, context: any): SinonStub;
+        callsArgWithAsync(index: number, ...args: any[]): SinonStub;
+        callsArgOnWithAsync(index: number, context: any, ...args: any[]): SinonStub;
+        onCall(n: number): SinonStub;
+        onFirstCall(): SinonStub;
+        onSecondCall(): SinonStub;
+        onThirdCall(): SinonStub;
+        yields(...args: any[]): SinonStub;
+        yieldsOn(context: any, ...args: any[]): SinonStub;
+        yieldsTo(property: string, ...args: any[]): SinonStub;
+        yieldsToOn(property: string, context: any, ...args: any[]): SinonStub;
+        yieldsAsync(...args: any[]): SinonStub;
+        yieldsOnAsync(context: any, ...args: any[]): SinonStub;
+        yieldsToAsync(property: string, ...args: any[]): SinonStub;
+        yieldsToOnAsync(property: string, context: any, ...args: any[]): SinonStub;
+        withArgs(...args: any[]): SinonStub;
+    }
+
+    interface SinonStubStatic {
+        (): SinonStub;
+        (obj: any): SinonStub;
+        (obj: any, method: string): SinonStub;
+        (obj: any, method: string, func: any): SinonStub;
+    }
+
+    interface SinonStatic {
+        stub: SinonStubStatic;
+    }
+
+    interface SinonExpectation extends SinonStub {
+        atLeast(n: number): SinonExpectation;
+        atMost(n: number): SinonExpectation;
+        never(): SinonExpectation;
+        once(): SinonExpectation;
+        twice(): SinonExpectation;
+        thrice(): SinonExpectation;
+        exactly(n: number): SinonExpectation;
+        withArgs(...args: any[]): SinonExpectation;
+        withExactArgs(...args: any[]): SinonExpectation;
+        on(obj: any): SinonExpectation;
+        verify(): SinonExpectation;
+        restore(): void;
+    }
+
+    interface SinonExpectationStatic {
+        create(methodName?: string): SinonExpectation;
+    }
+
+    interface SinonMock {
+        expects(method: string): SinonExpectation;
+        restore(): void;
+        verify(): void;
+    }
+
+    interface SinonMockStatic {
+        (): SinonExpectation;
+        (obj: any): SinonMock;
+    }
+
+    interface SinonStatic {
+        expectation: SinonExpectationStatic;
+        mock: SinonMockStatic;
+    }
+
+    interface SinonFakeTimers {
+        now: number;
+        create(now: number): SinonFakeTimers;
+        setTimeout(callback: (...args: any[]) => void, timeout: number, ...args: any[]): number;
+        clearTimeout(id: number): void;
+        setInterval(callback: (...args: any[]) => void, timeout: number, ...args: any[]): number;
+        clearInterval(id: number): void;
+        tick(ms: number): number;
+        reset(): void;
+        Date(): Date;
+        Date(year: number): Date;
+        Date(year: number, month: number): Date;
+        Date(year: number, month: number, day: number): Date;
+        Date(year: number, month: number, day: number, hour: number): Date;
+        Date(year: number, month: number, day: number, hour: number, minute: number): Date;
+        Date(year: number, month: number, day: number, hour: number, minute: number, second: number): Date;
+        Date(year: number, month: number, day: number, hour: number, minute: number, second: number, ms: number): Date;
+        restore(): void;
+
+		/**
+		 * Simulate the user changing the system clock while your program is running. It changes the 'now' timestamp
+		 * without affecting timers, intervals or immediates.
+		 * @param now The new 'now' in unix milliseconds
+		 */
+		setSystemTime(now: number): void;
+		/**
+		 * Simulate the user changing the system clock while your program is running. It changes the 'now' timestamp
+		 * without affecting timers, intervals or immediates.
+		 * @param now The new 'now' as a JavaScript Date
+		 */
+		setSystemTime(date: Date): void;
+	}
+
+    interface SinonFakeTimersStatic {
+        (): SinonFakeTimers;
+        (...timers: string[]): SinonFakeTimers;
+        (now: number, ...timers: string[]): SinonFakeTimers;
+    }
+
+    interface SinonStatic {
+        useFakeTimers: SinonFakeTimersStatic;
+        clock: SinonFakeTimers;
+    }
+
+    interface SinonFakeUploadProgress {
+        eventListeners: {
+            progress: any[];
+            load: any[];
+            abort: any[];
+            error: any[];
+        };
+
+        addEventListener(event: string, listener: (e: Event) => any): void;
+        removeEventListener(event: string, listener: (e: Event) => any): void;
+        dispatchEvent(event: Event): void;
+    }
+
+    interface SinonFakeXMLHttpRequest {
+        // Properties
+        onCreate: (xhr: SinonFakeXMLHttpRequest) => void;
+        url: string;
+        method: string;
+        requestHeaders: any;
+        requestBody: string;
+        status: number;
+        statusText: string;
+        async: boolean;
+        username: string;
+        password: string;
+        withCredentials: boolean;
+        upload: SinonFakeUploadProgress;
+        responseXML: Document;
+        getResponseHeader(header: string): string;
+        getAllResponseHeaders(): any;
+
+        // Methods
+        restore(): void;
+        useFilters: boolean;
+        addFilter(filter: (method: string, url: string, async: boolean, username: string, password: string) => boolean): void;
+        setResponseHeaders(headers: any): void;
+        setResponseBody(body: string): void;
+        respond(status: number, headers: any, body: string): void;
+        autoRespond(ms: number): void;
+    }
+
+    interface SinonFakeXMLHttpRequestStatic {
+        (): SinonFakeXMLHttpRequest;
+    }
+
+    interface SinonStatic {
+        useFakeXMLHttpRequest: SinonFakeXMLHttpRequestStatic;
+        FakeXMLHttpRequest: SinonFakeXMLHttpRequest;
+    }
+
+    interface SinonFakeServer {
+        // Properties
+        autoRespond: boolean;
+        autoRespondAfter: number;
+        fakeHTTPMethods: boolean;
+        getHTTPMethod: (request: SinonFakeXMLHttpRequest) => string;
+        requests: SinonFakeXMLHttpRequest[];
+        respondImmediately: boolean;
+
+        // Methods
+        respondWith(body: string): void;
+        respondWith(response: any[]): void;
+        respondWith(fn: (xhr: SinonFakeXMLHttpRequest) => void): void;
+        respondWith(url: string, body: string): void;
+        respondWith(url: string, response: any[]): void;
+        respondWith(url: string, fn: (xhr: SinonFakeXMLHttpRequest) => void): void;
+        respondWith(method: string, url: string, body: string): void;
+        respondWith(method: string, url: string, response: any[]): void;
+        respondWith(method: string, url: string, fn: (xhr: SinonFakeXMLHttpRequest) => void): void;
+        respondWith(url: RegExp, body: string): void;
+        respondWith(url: RegExp, response: any[]): void;
+        respondWith(url: RegExp, fn: (xhr: SinonFakeXMLHttpRequest) => void): void;
+        respondWith(method: string, url: RegExp, body: string): void;
+        respondWith(method: string, url: RegExp, response: any[]): void;
+        respondWith(method: string, url: RegExp, fn: (xhr: SinonFakeXMLHttpRequest) => void): void;
+        respond(): void;
+        restore(): void;
+    }
+
+    interface SinonFakeServerStatic {
+        create(): SinonFakeServer;
+    }
+
+    interface SinonStatic {
+        fakeServer: SinonFakeServerStatic;
+        fakeServerWithClock: SinonFakeServerStatic;
+    }
+
+    interface SinonExposeOptions {
+        prefix?: string;
+        includeFail?: boolean;
+    }
+
+    interface SinonAssert {
+        // Properties
+        failException: string;
+        fail: (message?: string) => void; // Overridable
+        pass: (assertion: any) => void; // Overridable
+
+        // Methods
+        notCalled(spy: SinonSpy): void;
+        called(spy: SinonSpy): void;
+        calledOnce(spy: SinonSpy): void;
+        calledTwice(spy: SinonSpy): void;
+        calledThrice(spy: SinonSpy): void;
+        callCount(spy: SinonSpy, count: number): void;
+        callOrder(...spies: SinonSpy[]): void;
+        calledOn(spy: SinonSpy, obj: any): void;
+        alwaysCalledOn(spy: SinonSpy, obj: any): void;
+        calledWith(spy: SinonSpy, ...args: any[]): void;
+        alwaysCalledWith(spy: SinonSpy, ...args: any[]): void;
+        neverCalledWith(spy: SinonSpy, ...args: any[]): void;
+        calledWithExactly(spy: SinonSpy, ...args: any[]): void;
+        alwaysCalledWithExactly(spy: SinonSpy, ...args: any[]): void;
+        calledWithMatch(spy: SinonSpy, ...args: any[]): void;
+        alwaysCalledWithMatch(spy: SinonSpy, ...args: any[]): void;
+        neverCalledWithMatch(spy: SinonSpy, ...args: any[]): void;
+        threw(spy: SinonSpy): void;
+        threw(spy: SinonSpy, exception: string): void;
+        threw(spy: SinonSpy, exception: any): void;
+        alwaysThrew(spy: SinonSpy): void;
+        alwaysThrew(spy: SinonSpy, exception: string): void;
+        alwaysThrew(spy: SinonSpy, exception: any): void;
+        expose(obj: any, options?: SinonExposeOptions): void;
+    }
+
+    interface SinonStatic {
+        assert: SinonAssert;
+    }
+
+    interface SinonMatcher {
+        and(expr: SinonMatcher): SinonMatcher;
+        or(expr: SinonMatcher): SinonMatcher;
+    }
+
+    interface SinonMatch {
+        (value: number): SinonMatcher;
+        (value: string): SinonMatcher;
+        (expr: RegExp): SinonMatcher;
+        (obj: any): SinonMatcher;
+        (callback: (value: any) => boolean): SinonMatcher;
+        any: SinonMatcher;
+        defined: SinonMatcher;
+        truthy: SinonMatcher;
+        falsy: SinonMatcher;
+        bool: SinonMatcher;
+        number: SinonMatcher;
+        string: SinonMatcher;
+        object: SinonMatcher;
+        func: SinonMatcher;
+        array: SinonMatcher;
+        regexp: SinonMatcher;
+        date: SinonMatcher;
+        same(obj: any): SinonMatcher;
+        typeOf(type: string): SinonMatcher;
+        instanceOf(type: any): SinonMatcher;
+        has(property: string, expect?: any): SinonMatcher;
+        hasOwn(property: string, expect?: any): SinonMatcher;
+    }
+
+    interface SinonStatic {
+        match: SinonMatch;
+    }
+
+    interface SinonSandboxConfig {
+        injectInto?: any;
+        properties?: string[];
+        useFakeTimers?: any;
+        useFakeServer?: any;
+    }
+
+    interface SinonSandbox {
+        clock: SinonFakeTimers;
+        requests: SinonFakeXMLHttpRequest;
+        server: SinonFakeServer;
+        spy: SinonSpyStatic;
+        stub: SinonStubStatic;
+        mock: SinonMockStatic;
+        useFakeTimers: SinonFakeTimersStatic;
+        useFakeXMLHttpRequest: SinonFakeXMLHttpRequestStatic;
+        useFakeServer(): SinonFakeServer;
+        restore(): void;
+    }
+
+    interface SinonSandboxStatic {
+        create(): SinonSandbox;
+        create(config: SinonSandboxConfig): SinonSandbox;
+    }
+
+    interface SinonStatic {
+        sandbox: SinonSandboxStatic;
+    }
+
+    interface SinonTestConfig {
+        injectIntoThis?: boolean;
+        injectInto?: any;
+        properties?: string[];
+        useFakeTimers?: boolean;
+        useFakeServer?: boolean;
+    }
+
+    interface SinonTestWrapper extends SinonSandbox {
+        (...args: any[]): any;
+    }
+
+    interface SinonStatic {
+        config: SinonTestConfig;
+        test(fn: (...args: any[]) => any): SinonTestWrapper;
+        testCase(tests: any): any;
+    }
+
+    // Utility overridables
+    interface SinonStatic {
+        createStubInstance(constructor: any): SinonStub;
+        format(obj: any): string;
+        log(message: string): void;
+        restore(object: any): void;
+    }
+}
+
+declare var sinon: Sinon.SinonStatic;
+
+export = sinon;
+
diff --git a/sinon/sinon-tests.ts b/sinon/sinon-tests.ts
index 3e6f720866..fa1f313d7b 100644
--- a/sinon/sinon-tests.ts
+++ b/sinon/sinon-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="sinon.d.ts" />
+import sinon = require("sinon");
 
 function once(fn: Function) {
     var returnValue: any, called = false;
@@ -110,7 +110,7 @@ testSeven();
 testEight();
 testNine();
 
-var clock: Sinon.SinonFakeTimers = sinon.useFakeTimers();
+var clock = sinon.useFakeTimers();
 clock.setSystemTime(1000);
 clock.setSystemTime(new Date());
 
diff --git a/sinon/sinon.d.ts b/sinon/sinon.d.ts
deleted file mode 100644
index 719ed6405c..0000000000
--- a/sinon/sinon.d.ts
+++ /dev/null
@@ -1,435 +0,0 @@
-// Type definitions for Sinon 1.16.0
-// Project: http://sinonjs.org/
-// Definitions by: William Sears <https://github.com/mrbigdog2u>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace Sinon {
-    interface SinonSpyCallApi {
-        // Properties
-        thisValue: any;
-        args: any[];
-        exception: any;
-        returnValue: any;
-
-        // Methods
-        calledOn(obj: any): boolean;
-        calledWith(...args: any[]): boolean;
-        calledWithExactly(...args: any[]): boolean;
-        calledWithMatch(...args: any[]): boolean;
-        notCalledWith(...args: any[]): boolean;
-        notCalledWithMatch(...args: any[]): boolean;
-        returned(value: any): boolean;
-        threw(): boolean;
-        threw(type: string): boolean;
-        threw(obj: any): boolean;
-        callArg(pos: number): void;
-        callArgOn(pos: number, obj: any, ...args: any[]): void;
-        callArgWith(pos: number, ...args: any[]): void;
-        callArgOnWith(pos: number, obj: any, ...args: any[]): void;
-        yield(...args: any[]): void;
-        yieldOn(obj: any, ...args: any[]): void;
-        yieldTo(property: string, ...args: any[]): void;
-        yieldToOn(property: string, obj: any, ...args: any[]): void;
-    }
-
-    interface SinonSpyCall extends SinonSpyCallApi {
-        calledBefore(call: SinonSpyCall): boolean;
-        calledAfter(call: SinonSpyCall): boolean;
-        calledWithNew(call: SinonSpyCall): boolean;
-    }
-
-    interface SinonSpy extends SinonSpyCallApi {
-        // Properties
-        callCount: number;
-        called: boolean;
-        notCalled: boolean;
-        calledOnce: boolean;
-        calledTwice: boolean;
-        calledThrice: boolean;
-        firstCall: SinonSpyCall;
-        secondCall: SinonSpyCall;
-        thirdCall: SinonSpyCall;
-        lastCall: SinonSpyCall;
-        thisValues: any[];
-        args: any[][];
-        exceptions: any[];
-        returnValues: any[];
-
-        // Methods
-        (...args: any[]): any;
-        calledBefore(anotherSpy: SinonSpy): boolean;
-        calledAfter(anotherSpy: SinonSpy): boolean;
-        calledWithNew(spy: SinonSpy): boolean;
-        withArgs(...args: any[]): SinonSpy;
-        alwaysCalledOn(obj: any): boolean;
-        alwaysCalledWith(...args: any[]): boolean;
-        alwaysCalledWithExactly(...args: any[]): boolean;
-        alwaysCalledWithMatch(...args: any[]): boolean;
-        neverCalledWith(...args: any[]): boolean;
-        neverCalledWithMatch(...args: any[]): boolean;
-        alwaysThrew(): boolean;
-        alwaysThrew(type: string): boolean;
-        alwaysThrew(obj: any): boolean;
-        alwaysReturned(): boolean;
-        invokeCallback(...args: any[]): void;
-        getCall(n: number): SinonSpyCall;
-        reset(): void;
-        printf(format: string, ...args: any[]): string;
-        restore(): void;
-    }
-
-    interface SinonSpyStatic {
-        (): SinonSpy;
-        (func: any): SinonSpy;
-        (obj: any, method: string): SinonSpy;
-    }
-
-    interface SinonStatic {
-        spy: SinonSpyStatic;
-    }
-
-    interface SinonStub extends SinonSpy {
-        resetBehavior(): void;
-        returns(obj: any): SinonStub;
-        returnsArg(index: number): SinonStub;
-        returnsThis(): SinonStub;
-        throws(type?: string): SinonStub;
-        throws(obj: any): SinonStub;
-        callsArg(index: number): SinonStub;
-        callsArgOn(index: number, context: any): SinonStub;
-        callsArgWith(index: number, ...args: any[]): SinonStub;
-        callsArgOnWith(index: number, context: any, ...args: any[]): SinonStub;
-        callsArgAsync(index: number): SinonStub;
-        callsArgOnAsync(index: number, context: any): SinonStub;
-        callsArgWithAsync(index: number, ...args: any[]): SinonStub;
-        callsArgOnWithAsync(index: number, context: any, ...args: any[]): SinonStub;
-        onCall(n: number): SinonStub;
-        onFirstCall(): SinonStub;
-        onSecondCall(): SinonStub;
-        onThirdCall(): SinonStub;
-        yields(...args: any[]): SinonStub;
-        yieldsOn(context: any, ...args: any[]): SinonStub;
-        yieldsTo(property: string, ...args: any[]): SinonStub;
-        yieldsToOn(property: string, context: any, ...args: any[]): SinonStub;
-        yieldsAsync(...args: any[]): SinonStub;
-        yieldsOnAsync(context: any, ...args: any[]): SinonStub;
-        yieldsToAsync(property: string, ...args: any[]): SinonStub;
-        yieldsToOnAsync(property: string, context: any, ...args: any[]): SinonStub;
-        withArgs(...args: any[]): SinonStub;
-    }
-
-    interface SinonStubStatic {
-        (): SinonStub;
-        (obj: any): SinonStub;
-        (obj: any, method: string): SinonStub;
-        (obj: any, method: string, func: any): SinonStub;
-    }
-
-    interface SinonStatic {
-        stub: SinonStubStatic;
-    }
-
-    interface SinonExpectation extends SinonStub {
-        atLeast(n: number): SinonExpectation;
-        atMost(n: number): SinonExpectation;
-        never(): SinonExpectation;
-        once(): SinonExpectation;
-        twice(): SinonExpectation;
-        thrice(): SinonExpectation;
-        exactly(n: number): SinonExpectation;
-        withArgs(...args: any[]): SinonExpectation;
-        withExactArgs(...args: any[]): SinonExpectation;
-        on(obj: any): SinonExpectation;
-        verify(): SinonExpectation;
-        restore(): void;
-    }
-
-    interface SinonExpectationStatic {
-        create(methodName?: string): SinonExpectation;
-    }
-
-    interface SinonMock {
-        expects(method: string): SinonExpectation;
-        restore(): void;
-        verify(): void;
-    }
-
-    interface SinonMockStatic {
-        (): SinonExpectation;
-        (obj: any): SinonMock;
-    }
-
-    interface SinonStatic {
-        expectation: SinonExpectationStatic;
-        mock: SinonMockStatic;
-    }
-
-    interface SinonFakeTimers {
-        now: number;
-        create(now: number): SinonFakeTimers;
-        setTimeout(callback: (...args: any[]) => void, timeout: number, ...args: any[]): number;
-        clearTimeout(id: number): void;
-        setInterval(callback: (...args: any[]) => void, timeout: number, ...args: any[]): number;
-        clearInterval(id: number): void;
-        tick(ms: number): number;
-        reset(): void;
-        Date(): Date;
-        Date(year: number): Date;
-        Date(year: number, month: number): Date;
-        Date(year: number, month: number, day: number): Date;
-        Date(year: number, month: number, day: number, hour: number): Date;
-        Date(year: number, month: number, day: number, hour: number, minute: number): Date;
-        Date(year: number, month: number, day: number, hour: number, minute: number, second: number): Date;
-        Date(year: number, month: number, day: number, hour: number, minute: number, second: number, ms: number): Date;
-        restore(): void;
-
-		/**
-		 * Simulate the user changing the system clock while your program is running. It changes the 'now' timestamp
-		 * without affecting timers, intervals or immediates.
-		 * @param now The new 'now' in unix milliseconds
-		 */
-		setSystemTime(now: number): void;
-		/**
-		 * Simulate the user changing the system clock while your program is running. It changes the 'now' timestamp
-		 * without affecting timers, intervals or immediates.
-		 * @param now The new 'now' as a JavaScript Date
-		 */
-		setSystemTime(date: Date): void;
-	}
-
-    interface SinonFakeTimersStatic {
-        (): SinonFakeTimers;
-        (...timers: string[]): SinonFakeTimers;
-        (now: number, ...timers: string[]): SinonFakeTimers;
-    }
-
-    interface SinonStatic {
-        useFakeTimers: SinonFakeTimersStatic;
-        clock: SinonFakeTimers;
-    }
-
-    interface SinonFakeUploadProgress {
-        eventListeners: {
-            progress: any[];
-            load: any[];
-            abort: any[];
-            error: any[];
-        };
-
-        addEventListener(event: string, listener: (e: Event) => any): void;
-        removeEventListener(event: string, listener: (e: Event) => any): void;
-        dispatchEvent(event: Event): void;
-    }
-
-    interface SinonFakeXMLHttpRequest {
-        // Properties
-        onCreate: (xhr: SinonFakeXMLHttpRequest) => void;
-        url: string;
-        method: string;
-        requestHeaders: any;
-        requestBody: string;
-        status: number;
-        statusText: string;
-        async: boolean;
-        username: string;
-        password: string;
-        withCredentials: boolean;
-        upload: SinonFakeUploadProgress;
-        responseXML: Document;
-        getResponseHeader(header: string): string;
-        getAllResponseHeaders(): any;
-
-        // Methods
-        restore(): void;
-        useFilters: boolean;
-        addFilter(filter: (method: string, url: string, async: boolean, username: string, password: string) => boolean): void;
-        setResponseHeaders(headers: any): void;
-        setResponseBody(body: string): void;
-        respond(status: number, headers: any, body: string): void;
-        autoRespond(ms: number): void;
-    }
-
-    interface SinonFakeXMLHttpRequestStatic {
-        (): SinonFakeXMLHttpRequest;
-    }
-
-    interface SinonStatic {
-        useFakeXMLHttpRequest: SinonFakeXMLHttpRequestStatic;
-        FakeXMLHttpRequest: SinonFakeXMLHttpRequest;
-    }
-
-    interface SinonFakeServer {
-        // Properties
-        autoRespond: boolean;
-        autoRespondAfter: number;
-        fakeHTTPMethods: boolean;
-        getHTTPMethod: (request: SinonFakeXMLHttpRequest) => string;
-        requests: SinonFakeXMLHttpRequest[];
-        respondImmediately: boolean;
-
-        // Methods
-        respondWith(body: string): void;
-        respondWith(response: any[]): void;
-        respondWith(fn: (xhr: SinonFakeXMLHttpRequest) => void): void;
-        respondWith(url: string, body: string): void;
-        respondWith(url: string, response: any[]): void;
-        respondWith(url: string, fn: (xhr: SinonFakeXMLHttpRequest) => void): void;
-        respondWith(method: string, url: string, body: string): void;
-        respondWith(method: string, url: string, response: any[]): void;
-        respondWith(method: string, url: string, fn: (xhr: SinonFakeXMLHttpRequest) => void): void;
-        respondWith(url: RegExp, body: string): void;
-        respondWith(url: RegExp, response: any[]): void;
-        respondWith(url: RegExp, fn: (xhr: SinonFakeXMLHttpRequest) => void): void;
-        respondWith(method: string, url: RegExp, body: string): void;
-        respondWith(method: string, url: RegExp, response: any[]): void;
-        respondWith(method: string, url: RegExp, fn: (xhr: SinonFakeXMLHttpRequest) => void): void;
-        respond(): void;
-        restore(): void;
-    }
-
-    interface SinonFakeServerStatic {
-        create(): SinonFakeServer;
-    }
-
-    interface SinonStatic {
-        fakeServer: SinonFakeServerStatic;
-        fakeServerWithClock: SinonFakeServerStatic;
-    }
-
-    interface SinonExposeOptions {
-        prefix?: string;
-        includeFail?: boolean;
-    }
-
-    interface SinonAssert {
-        // Properties
-        failException: string;
-        fail: (message?: string) => void; // Overridable
-        pass: (assertion: any) => void; // Overridable
-
-        // Methods
-        notCalled(spy: SinonSpy): void;
-        called(spy: SinonSpy): void;
-        calledOnce(spy: SinonSpy): void;
-        calledTwice(spy: SinonSpy): void;
-        calledThrice(spy: SinonSpy): void;
-        callCount(spy: SinonSpy, count: number): void;
-        callOrder(...spies: SinonSpy[]): void;
-        calledOn(spy: SinonSpy, obj: any): void;
-        alwaysCalledOn(spy: SinonSpy, obj: any): void;
-        calledWith(spy: SinonSpy, ...args: any[]): void;
-        alwaysCalledWith(spy: SinonSpy, ...args: any[]): void;
-        neverCalledWith(spy: SinonSpy, ...args: any[]): void;
-        calledWithExactly(spy: SinonSpy, ...args: any[]): void;
-        alwaysCalledWithExactly(spy: SinonSpy, ...args: any[]): void;
-        calledWithMatch(spy: SinonSpy, ...args: any[]): void;
-        alwaysCalledWithMatch(spy: SinonSpy, ...args: any[]): void;
-        neverCalledWithMatch(spy: SinonSpy, ...args: any[]): void;
-        threw(spy: SinonSpy): void;
-        threw(spy: SinonSpy, exception: string): void;
-        threw(spy: SinonSpy, exception: any): void;
-        alwaysThrew(spy: SinonSpy): void;
-        alwaysThrew(spy: SinonSpy, exception: string): void;
-        alwaysThrew(spy: SinonSpy, exception: any): void;
-        expose(obj: any, options?: SinonExposeOptions): void;
-    }
-
-    interface SinonStatic {
-        assert: SinonAssert;
-    }
-
-    interface SinonMatcher {
-        and(expr: SinonMatcher): SinonMatcher;
-        or(expr: SinonMatcher): SinonMatcher;
-    }
-
-    interface SinonMatch {
-        (value: number): SinonMatcher;
-        (value: string): SinonMatcher;
-        (expr: RegExp): SinonMatcher;
-        (obj: any): SinonMatcher;
-        (callback: (value: any) => boolean): SinonMatcher;
-        any: SinonMatcher;
-        defined: SinonMatcher;
-        truthy: SinonMatcher;
-        falsy: SinonMatcher;
-        bool: SinonMatcher;
-        number: SinonMatcher;
-        string: SinonMatcher;
-        object: SinonMatcher;
-        func: SinonMatcher;
-        array: SinonMatcher;
-        regexp: SinonMatcher;
-        date: SinonMatcher;
-        same(obj: any): SinonMatcher;
-        typeOf(type: string): SinonMatcher;
-        instanceOf(type: any): SinonMatcher;
-        has(property: string, expect?: any): SinonMatcher;
-        hasOwn(property: string, expect?: any): SinonMatcher;
-    }
-
-    interface SinonStatic {
-        match: SinonMatch;
-    }
-
-    interface SinonSandboxConfig {
-        injectInto?: any;
-        properties?: string[];
-        useFakeTimers?: any;
-        useFakeServer?: any;
-    }
-
-    interface SinonSandbox {
-        clock: SinonFakeTimers;
-        requests: SinonFakeXMLHttpRequest;
-        server: SinonFakeServer;
-        spy: SinonSpyStatic;
-        stub: SinonStubStatic;
-        mock: SinonMockStatic;
-        useFakeTimers: SinonFakeTimersStatic;
-        useFakeXMLHttpRequest: SinonFakeXMLHttpRequestStatic;
-        useFakeServer(): SinonFakeServer;
-        restore(): void;
-    }
-
-    interface SinonSandboxStatic {
-        create(): SinonSandbox;
-        create(config: SinonSandboxConfig): SinonSandbox;
-    }
-
-    interface SinonStatic {
-        sandbox: SinonSandboxStatic;
-    }
-
-    interface SinonTestConfig {
-        injectIntoThis?: boolean;
-        injectInto?: any;
-        properties?: string[];
-        useFakeTimers?: boolean;
-        useFakeServer?: boolean;
-    }
-
-    interface SinonTestWrapper extends SinonSandbox {
-        (...args: any[]): any;
-    }
-
-    interface SinonStatic {
-        config: SinonTestConfig;
-        test(fn: (...args: any[]) => any): SinonTestWrapper;
-        testCase(tests: any): any;
-    }
-
-    // Utility overridables
-    interface SinonStatic {
-        createStubInstance(constructor: any): SinonStub;
-        format(obj: any): string;
-        log(message: string): void;
-        restore(object: any): void;
-    }
-}
-
-declare var sinon: Sinon.SinonStatic;
-
-declare module "sinon" {
-    export = sinon;
-}
diff --git a/sinon/tsconfig.json b/sinon/tsconfig.json
new file mode 100644
index 0000000000..7e1638f8de
--- /dev/null
+++ b/sinon/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sinon-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sipml/sipml.d.ts b/sipml/index.d.ts
similarity index 100%
rename from sipml/sipml.d.ts
rename to sipml/index.d.ts
diff --git a/sipml/sipml-tests.ts b/sipml/sipml-tests.ts
index a10c868d42..e88f11f0ff 100644
--- a/sipml/sipml-tests.ts
+++ b/sipml/sipml-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="sipml.d.ts" />
+
 
 /* Code borrowed from http://sipml5.org/docgen/index.html?svn=224 */
 
diff --git a/sipml/tsconfig.json b/sipml/tsconfig.json
new file mode 100644
index 0000000000..54bffdf54f
--- /dev/null
+++ b/sipml/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sipml-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sjcl/index.d.ts b/sjcl/index.d.ts
new file mode 100644
index 0000000000..875bb6163d
--- /dev/null
+++ b/sjcl/index.d.ts
@@ -0,0 +1,559 @@
+// Type definitions for sjcl v1.0.1
+// Project: http://crypto.stanford.edu/sjcl/
+// Definitions by: Eugene Chernyshov <https://github.com/Evgenus>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = sjcl;
+export as namespace sjcl;
+
+declare namespace sjcl {
+
+    export var bn: BigNumberStatic;
+    export var bitArray: BitArrayStatic;
+    export var codec: SjclCodecs;
+    export var hash: SjclHashes;
+    export var exception: SjclExceptions;
+    export var cipher: SjclCiphers;
+    export var mode: SjclModes;
+    export var misc: SjclMisc;
+    export var ecc: SjclEllipticCurveCryptography;
+    export var random: SjclRandom;
+    export var prng: SjclRandomStatic;
+    export var keyexchange: SjclKeyExchange;
+    export var json: SjclJson;
+    export var encrypt: SjclConveninceEncryptor;
+    export var decrypt: SjclConveninceDecryptor;
+
+    // ________________________________________________________________________
+
+    interface BigNumber {
+        radix: number;
+        maxMul: number;
+
+        copy(): BigNumber;
+
+        /// Initializes this with it, either as a bn, a number, or a hex string.
+        initWith: TypeHelpers.BigNumberBinaryOperator;
+
+        /// Returns true if "this" and "that" are equal.  Calls fullReduce().
+        /// Equality test is in constant time.
+        equals(that: number): boolean;
+        equals(that: BigNumber): boolean;
+
+        /// Get the i'th limb of this, zero if i is too large.
+        getLimb(index: number): number;
+
+        /// Constant time comparison function.
+        /// Returns 1 if this >= that, or zero otherwise.
+        greaterEquals(that: number): boolean;
+        greaterEquals(that: BigNumber): boolean;
+
+        /// Convert to a hex string.
+        toString(): string;
+
+        /// this += that.  Does not normalize.
+        addM: TypeHelpers.BigNumberBinaryOperator;
+
+        /// this *= 2.  Requires normalized; ends up normalized.
+        doubleM(): BigNumber;
+
+        /// this /= 2, rounded down.  Requires normalized; ends up normalized.
+        halveM(): BigNumber;
+
+        /// this -= that.  Does not normalize.
+        subM: TypeHelpers.BigNumberBinaryOperator;
+
+        mod: TypeHelpers.BigNumberBinaryOperator;
+
+        /// return inverse mod prime p.  p must be odd. Binary extended Euclidean algorithm mod p.
+        inverseMod: TypeHelpers.BigNumberBinaryOperator;
+
+        /// this + that.  Does not normalize.
+        add: TypeHelpers.BigNumberBinaryOperator;
+
+        /// this - that.  Does not normalize.
+        sub: TypeHelpers.BigNumberBinaryOperator;
+
+        /// this * that.  Normalizes and reduces.
+        mul: TypeHelpers.BigNumberBinaryOperator;
+
+        /// this ^ 2.  Normalizes and reduces.
+        square(): BigNumber;
+
+        /// this ^ n.  Uses square-and-multiply.  Normalizes and reduces.
+        power(n: number): BigNumber;
+        power(n: BigNumber): BigNumber;
+        power(a: number[]): BigNumber;
+
+        /// this * that mod N
+        mulmod: TypeHelpers.BigNumberTrinaryOperator;
+
+        /// this ^ x mod N
+        powermod: TypeHelpers.BigNumberTrinaryOperator;
+
+        trim(): BigNumber;
+
+        /// Reduce mod a modulus.  Stubbed for subclassing.
+        reduce(): BigNumber;
+
+        /// Reduce and normalize.
+        fullReduce(): BigNumber;
+
+        /// Propagate carries.
+        normalize(): BigNumber;
+
+        /// Constant-time normalize. Does not allocate additional space.
+        cnormalize(): BigNumber;
+
+        /// Serialize to a bit array
+        toBits(len?: number): BitArray;
+
+        /// Return the length in bits, rounded up to the nearest byte.
+        bitLength(): number;
+    }
+
+    interface BigNumberStatic {
+        new (): BigNumber;
+        new (n: string): BigNumber;
+        new (n: number): BigNumber;
+        new (n: BigNumber): BigNumber;
+
+        fromBits(bits: BitArray): BigNumber;
+        random: TypeHelpers.Bind1<number>;
+        prime: {
+            p127: PseudoMersennePrimeStatic;
+            // Bernstein's prime for Curve25519
+            p25519: PseudoMersennePrimeStatic;
+            // Koblitz primes
+            p192k: PseudoMersennePrimeStatic;
+            p224k: PseudoMersennePrimeStatic;
+            p256k: PseudoMersennePrimeStatic;
+            // NIST primes
+            p192: PseudoMersennePrimeStatic;
+            p224: PseudoMersennePrimeStatic;
+            p256: PseudoMersennePrimeStatic;
+            p384: PseudoMersennePrimeStatic;
+            p521: PseudoMersennePrimeStatic;
+        };
+
+        pseudoMersennePrime(exponent: number, coeff: number[][]): PseudoMersennePrimeStatic;
+    }
+
+    interface PseudoMersennePrime extends BigNumber {
+        reduce(): PseudoMersennePrime;
+        fullReduce(): PseudoMersennePrime;
+        inverse(): PseudoMersennePrime;
+    }
+
+    interface PseudoMersennePrimeStatic extends BigNumberStatic {
+        new (): PseudoMersennePrime;
+        new (n: string): PseudoMersennePrime;
+        new (n: number): PseudoMersennePrime;
+        new (n: BigNumber): PseudoMersennePrime;
+    }
+
+    // ________________________________________________________________________
+
+    interface BitArray extends Array<number> {
+    }
+
+    interface BitArrayStatic {
+        /// Array slices in units of bits.
+        bitSlice(a: BitArray, bstart: number, bend: number): BitArray;
+
+        /// Extract a number packed into a bit array.
+        extract(a: BitArray, bstart: number, blenth: number): number;
+
+        /// Concatenate two bit arrays.
+        concat(a1: BitArray, a2: BitArray): BitArray
+
+        /// Find the length of an array of bits.
+        bitLength(a: BitArray): number;
+
+        /// Truncate an array.
+        clamp(a: BitArray, len: number): BitArray;
+
+        /// Make a partial word for a bit array.
+        partial(len: number, x: number, _end?: number): number;
+
+        /// Get the number of bits used by a partial word.
+        getPartial(x: number): number;
+
+        /// Compare two arrays for equality in a predictable amount of time.
+        equal(a: BitArray, b: BitArray): boolean;
+
+        /// Shift an array right.
+        _shiftRight(a: BitArray, shift: number, carry?: number, out?: BitArray): BitArray;
+
+        /// xor a block of 4 words together.
+        _xor4(x: number[], y: number[]): number[];
+    }
+
+    // ________________________________________________________________________
+
+    interface SjclCodec<T> {
+        fromBits(bits: BitArray): T;
+        toBits(value: T): BitArray;
+    }
+
+    interface SjclCodecs {
+        utf8String: SjclCodec<string>;
+        hex: SjclCodec<string>;
+        bytes: SjclCodec<number[]>;
+        base64: SjclCodec<string>;
+        base64url: SjclCodec<string>;
+    }
+
+    // ________________________________________________________________________
+
+    interface SjclHash {
+        reset(): SjclHash;
+        update(data: string): SjclHash;
+        update(data: BitArray): SjclHash;
+        finalize(): BitArray;
+    }
+
+    interface SjclHashStatic {
+        new (hash?: SjclHash): SjclHash;
+        hash(data: string): BitArray;
+        hash(data: BitArray): BitArray;
+    }
+
+    interface SjclHashes {
+        sha1: SjclHashStatic;
+        sha256: SjclHashStatic;
+        sha512: SjclHashStatic;
+    }
+
+    // ________________________________________________________________________
+
+    interface SjclExceptions {
+        corrupt: SjclExceptionFactory;
+        invalid: SjclExceptionFactory;
+        bug: SjclExceptionFactory;
+        notReady: SjclExceptionFactory;
+    }
+
+    interface SjclExceptionFactory {
+        new (message: string): Error;
+    }
+
+    // ________________________________________________________________________
+
+    interface SjclCiphers {
+        aes: SjclCipherStatic;
+    }
+
+    interface SjclCipher {
+        encrypt(data: number[]): number[];
+        decrypt(data: number[]): number[];
+    }
+
+    interface SjclCipherStatic {
+        new (key: number[]): SjclCipher;
+    }
+
+    // ________________________________________________________________________
+
+    interface SjclModes {
+        gcm: SjclGCMMode;
+        ccm: SjclCCMMode;
+        ocb2: SjclOCB2Mode;
+        cbc: SjclCBCMode;
+    }
+
+    interface SjclGCMMode {
+        encrypt(prp: SjclCipher, plaintext: BitArray, iv: BitArray, adata?: BitArray, tlen?: number): BitArray;
+        decrypt(prp: SjclCipher, ciphertext: BitArray, iv: BitArray, adata?: BitArray, tlen?: number): BitArray;
+    }
+
+    interface SjclCCMMode {
+        encrypt(prp: SjclCipher, plaintext: BitArray, iv: BitArray, adata?: BitArray, tlen?: number): BitArray;
+        decrypt(prp: SjclCipher, ciphertext: BitArray, iv: BitArray, adata?: BitArray, tlen?: number): BitArray;
+    }
+
+    interface SjclOCB2Mode {
+        encrypt(prp: SjclCipher, plaintext: BitArray, iv: BitArray, adata?: BitArray, tlen?: number, premac?: boolean): BitArray;
+        decrypt(prp: SjclCipher, ciphertext: BitArray, iv: BitArray, adata?: BitArray, tlen?: number, premac?: boolean): BitArray;
+        pmac(prp: SjclCipher, adata: BitArray): number[];
+    }
+
+    interface SjclCBCMode {
+        encrypt(prp: SjclCipher, plaintext: BitArray, iv: BitArray, adata?: BitArray): BitArray;
+        decrypt(prp: SjclCipher, ciphertext: BitArray, iv: BitArray, adata?: BitArray): BitArray;
+    }
+
+    // ________________________________________________________________________
+
+    interface Pbkdf2Params {
+        iter?: number;
+        salt?: BitArray;
+    }
+
+    interface SjclMisc {
+        pbkdf2(password: string, salt: string, count?: number, length?: number, Prff?: SjclPseudorandomFunctionFamilyStatic): BitArray;
+        pbkdf2(password: BitArray, salt: string, count?: number, length?: number, Prff?: SjclPseudorandomFunctionFamilyStatic): BitArray;
+        pbkdf2(password: BitArray, salt: BitArray, count?: number, length?: number, Prff?: SjclPseudorandomFunctionFamilyStatic): BitArray;
+        pbkdf2(password: string, salt: BitArray, count?: number, length?: number, Prff?: SjclPseudorandomFunctionFamilyStatic): BitArray;
+        hmac: SjclHmacStatic;
+        cachedPbkdf2(password: string, obj?: Pbkdf2Params): {
+            key: BitArray;
+            salt: BitArray;
+        };
+    }
+
+    class SjclPseudorandomFunctionFamily {
+        encrypt(data: string): BitArray;
+        encrypt(data: BitArray): BitArray;
+    }
+
+    interface SjclHmac extends SjclPseudorandomFunctionFamily {
+        mac(data: string): BitArray;
+        mac(data: BitArray): BitArray;
+        reset(): void;
+        update(data: string): void;
+        update(data: BitArray): void;
+        digest(): BitArray;
+    }
+
+    interface SjclPseudorandomFunctionFamilyStatic {
+        new (key: BitArray): SjclPseudorandomFunctionFamily;
+    }
+
+    interface SjclHmacStatic {
+        new (key: BitArray, Hash?: SjclHashStatic): SjclHmac;
+    }
+
+    // ________________________________________________________________________
+
+    interface SjclEllipticCurveCryptography {
+        point: SjclEllipticalPointStatic;
+        pointJac: SjclPointJacobianStatic;
+        curve: SjclEllipticalCurveStatic;
+        curves: {
+            c192: SjclEllipticalCurve;
+            c224: SjclEllipticalCurve;
+            c256: SjclEllipticalCurve;
+            c384: SjclEllipticalCurve;
+            k192: SjclEllipticalCurve;
+            k224: SjclEllipticalCurve;
+            k256: SjclEllipticalCurve;
+        };
+        basicKey: SjclECCBasic;
+        elGamal: SjclElGamal;
+        ecdsa: SjclEcdsa;
+    }
+
+    interface SjclEllipticalPoint {
+        toJac(): SjclPointJacobian;
+        mult(k: BigNumber): SjclEllipticalPoint;
+        mult2(k: BigNumber, k2: BigNumber, affine2: SjclEllipticalPoint): SjclEllipticalPoint;
+        multiples(): Array<SjclEllipticalPoint>;
+        isValid(): boolean;
+        toBits(): BitArray;
+    }
+
+    interface SjclEllipticalPointStatic {
+        new (curve: SjclEllipticalCurve, x?: BigNumber, y?: BigNumber): SjclEllipticalPoint;
+    }
+
+    interface SjclPointJacobian {
+        add(T: SjclEllipticalPoint): SjclPointJacobian;
+        doubl(): SjclPointJacobian;
+        toAffine(): SjclEllipticalPoint;
+        mult(k: BigNumber, affine: SjclEllipticalPoint): SjclPointJacobian;
+        mult2(k1: BigNumber, affine: SjclEllipticalPoint, k2: BigNumber, affine2: SjclEllipticalPoint): SjclPointJacobian;
+        isValid(): boolean;
+    }
+
+    interface SjclPointJacobianStatic {
+        new (curve: SjclEllipticalCurve, x?: BigNumber, y?: BigNumber, z?: BigNumber):SjclPointJacobian;
+    }
+
+    interface SjclEllipticalCurve {
+        fromBits(bits: BitArray): SjclEllipticalPoint;
+    }
+
+    interface SjclEllipticalCurveStatic {
+        new (Field: BigNumber, r: BigNumber, a: BigNumber, b: BigNumber, x: BigNumber, y: BigNumber): SjclEllipticalCurve;
+    }
+
+    interface SjclKeyPair<P extends SjclECCPublicKey, S extends SjclECCSecretKey> {
+        pub: P;
+        sec: S;
+    }
+
+    interface SjclKeysGenerator<P extends SjclECCPublicKey, S extends SjclECCSecretKey> {
+        (curve: SjclEllipticalCurve, paranoia: number, sec?: BigNumber): SjclKeyPair<P, S>;
+        (curve: number, paranoia: number, sec?: BigNumber): SjclKeyPair<P, S>;
+    }
+
+    interface SjclECCPublicKeyData {
+        x: BitArray;
+        y: BitArray;
+    }
+
+    class SjclECCPublicKey {
+        get(): SjclECCPublicKeyData;
+    }
+
+    class SjclECCSecretKey {
+        get(): BitArray;
+    }
+
+    interface SjclECCPublicKeyFactory<T extends SjclECCPublicKey> {
+        new (curve: SjclEllipticalCurve, point: SjclEllipticalPoint): T;
+        new (curve: SjclEllipticalCurve, point: BitArray): T;
+    }
+
+    interface SjclECCSecretKeyFactory<T extends SjclECCSecretKey> {
+        new (curve: SjclEllipticalCurve, exponent: BigNumber): T;
+    }
+
+    interface SjclECCBasic {
+        publicKey: SjclECCPublicKeyFactory<SjclECCPublicKey>;
+        secretKey: SjclECCSecretKeyFactory<SjclECCSecretKey>;
+        generateKeys(cn: string): SjclKeysGenerator<SjclECCPublicKey, SjclECCSecretKey>;
+    }
+
+    class SjclElGamalPublicKey extends SjclECCPublicKey {
+        kem(paranoia: number): {
+            key: BitArray;
+            tag: BitArray;
+        };
+    }
+
+    class SjclElGamalSecretKey extends SjclECCSecretKey {
+        unkem(tag: BitArray): BitArray;
+        dh(pk: SjclECCPublicKey): BitArray;
+    }
+
+    interface SjclElGamal {
+        publicKey: SjclECCPublicKeyFactory<SjclElGamalPublicKey>;
+        secretKey: SjclECCSecretKeyFactory<SjclElGamalSecretKey>;
+        generateKeys: SjclKeysGenerator<SjclElGamalPublicKey, SjclElGamalSecretKey>;
+    }
+
+    class SjclEcdsaPublicKey extends SjclECCPublicKey {
+        verify(hash: BitArray, rs: BitArray, fakeLegacyVersion: boolean): boolean;
+    }
+
+    class SjclEcdsaSecretKey extends SjclECCSecretKey {
+        sign(hash: BitArray, paranoia: number, fakeLegacyVersion: boolean, fixedKForTesting?: BigNumber): BitArray;
+    }
+
+    interface SjclEcdsa {
+        publicKey: SjclECCPublicKeyFactory<SjclEcdsaPublicKey>;
+        secretKey: SjclECCSecretKeyFactory<SjclEcdsaSecretKey>;
+        generateKeys: SjclKeysGenerator<SjclEcdsaPublicKey, SjclEcdsaSecretKey>;
+    }
+
+    // ________________________________________________________________________
+
+    interface SjclRandom {
+        randomWords(nwords: number, paranoia?: number): BitArray;
+        setDefaultParanoia(paranoia: number, allowZeroParanoia: string): void;
+        addEntropy(data: number, estimatedEntropy: number, source: string): void;
+        addEntropy(data: number[], estimatedEntropy: number, source: string): void;
+        addEntropy(data: string, estimatedEntropy: number, source: string): void;
+        isReady(paranoia?: number): boolean;
+        getProgress(paranoia?: number): number;
+        startCollectors(): void;
+        stopCollectors(): void;
+        addEventListener(name: string, cb: Function): void;
+        removeEventListener(name: string, cb: Function): void;
+    }
+
+    interface SjclRandomStatic {
+        new (defaultParanoia: number): SjclRandom;
+    }
+
+    // ________________________________________________________________________
+
+    interface SjclKeyExchange {
+        srp: SecureRemotePassword;
+    }
+
+    interface SjclSRPGroup {
+        N: BigNumber;
+        g: BigNumber;
+    }
+
+    interface SecureRemotePassword {
+        makeVerifier(username: string, password: string, salt: BitArray, group: SjclSRPGroup): BitArray;
+        makeX(username: string, password: string, salt: BitArray): BitArray;
+        knownGroup(i: string): SjclSRPGroup;
+        knownGroup(i: number): SjclSRPGroup;
+    }
+
+    // ________________________________________________________________________
+
+    interface SjclCipherParams {
+        v?: number;
+        iter?: number;
+        ks?: number;
+        ts?: number;
+        mode?: string;
+        adata?: string;
+        cipher?: string;
+    }
+
+    interface SjclCipherEncryptParams extends SjclCipherParams {
+        salt: BitArray;
+        iv: BitArray;
+    }
+
+    interface SjclCipherDecryptParams extends SjclCipherParams {
+        salt?: BitArray;
+        iv?: BitArray;
+    }
+
+    interface SjclCipherEncrypted extends SjclCipherEncryptParams {
+        kemtag?: BitArray;
+        ct: BitArray;
+    }
+
+    interface SjclCipherDecrypted extends SjclCipherEncrypted {
+        key: BitArray;
+    }
+
+    interface SjclConveninceEncryptor {
+        (password: string, plaintext: string, params?: SjclCipherEncryptParams, rp?: SjclCipherEncrypted): SjclCipherEncrypted;
+        (password: BitArray, plaintext: string, params?: SjclCipherEncryptParams, rp?: SjclCipherEncrypted): SjclCipherEncrypted;
+        (password: SjclElGamalPublicKey, plaintext: string, params?: SjclCipherEncryptParams, rp?: SjclCipherEncrypted): SjclCipherEncrypted;
+    }
+
+    interface SjclConveninceDecryptor {
+        (password: string, ciphertext: SjclCipherEncrypted, params?: SjclCipherDecryptParams, rp?: SjclCipherDecrypted): string;
+        (password: BitArray, ciphertext: SjclCipherEncrypted, params?: SjclCipherDecryptParams, rp?: SjclCipherDecrypted): string;
+        (password: SjclElGamalSecretKey, ciphertext: SjclCipherEncrypted, params?: SjclCipherDecryptParams, rp?: SjclCipherDecrypted): string;
+    }
+
+    interface SjclJson {
+        encrypt: SjclConveninceEncryptor;
+        decrypt: SjclConveninceDecryptor;
+        encode(obj: Object): string;
+        decode(obj: string): Object;
+    }
+
+    // ________________________________________________________________________
+
+    namespace TypeHelpers {
+        interface One<T> {
+            (value: T): BigNumber;
+        }
+
+        interface BigNumberBinaryOperator extends One<number>, One<string>, One<BigNumber> {
+        }
+
+        interface Two<T1, T2> {
+            (x: T1, N: T2): BigNumber;
+        }
+
+        interface Bind1<T> extends Two<number, T>, Two<string, T>, Two<BigNumber, T> {
+        }
+
+        interface BigNumberTrinaryOperator extends Bind1<number>, Bind1<string>, Bind1<BigNumber> {
+        }
+    }
+}
diff --git a/sjcl/sjcl-tests.ts b/sjcl/sjcl-tests.ts
index 4ff603203f..8b876736ab 100644
--- a/sjcl/sjcl-tests.ts
+++ b/sjcl/sjcl-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./sjcl.d.ts" /> 
+import sjcl = require("sjcl"); 
 
 var b: boolean;
 var n: number;
diff --git a/sjcl/sjcl.d.ts b/sjcl/sjcl.d.ts
deleted file mode 100644
index e63c7b35b4..0000000000
--- a/sjcl/sjcl.d.ts
+++ /dev/null
@@ -1,560 +0,0 @@
-// Type definitions for sjcl v1.0.1
-// Project: http://crypto.stanford.edu/sjcl/
-// Definitions by: Eugene Chernyshov <https://github.com/Evgenus>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace sjcl {
-
-    export var bn: BigNumberStatic;
-    export var bitArray: BitArrayStatic;
-    export var codec: SjclCodecs;
-    export var hash: SjclHashes;
-    export var exception: SjclExceptions;
-    export var cipher: SjclCiphers;
-    export var mode: SjclModes;
-    export var misc: SjclMisc;
-    export var ecc: SjclEllipticCurveCryptography;
-    export var random: SjclRandom;
-    export var prng: SjclRandomStatic;
-    export var keyexchange: SjclKeyExchange;
-    export var json: SjclJson;
-    export var encrypt: SjclConveninceEncryptor;
-    export var decrypt: SjclConveninceDecryptor;
-
-    // ________________________________________________________________________
-
-    interface BigNumber {
-        radix: number;
-        maxMul: number;
-
-        copy(): BigNumber;
-
-        /// Initializes this with it, either as a bn, a number, or a hex string.
-        initWith: TypeHelpers.BigNumberBinaryOperator;
-
-        /// Returns true if "this" and "that" are equal.  Calls fullReduce().
-        /// Equality test is in constant time.
-        equals(that: number): boolean;
-        equals(that: BigNumber): boolean;
-
-        /// Get the i'th limb of this, zero if i is too large.
-        getLimb(index: number): number;
-
-        /// Constant time comparison function.
-        /// Returns 1 if this >= that, or zero otherwise.
-        greaterEquals(that: number): boolean;
-        greaterEquals(that: BigNumber): boolean;
-
-        /// Convert to a hex string.
-        toString(): string;
-
-        /// this += that.  Does not normalize.
-        addM: TypeHelpers.BigNumberBinaryOperator;
-
-        /// this *= 2.  Requires normalized; ends up normalized.
-        doubleM(): BigNumber;
-
-        /// this /= 2, rounded down.  Requires normalized; ends up normalized.
-        halveM(): BigNumber;
-
-        /// this -= that.  Does not normalize.
-        subM: TypeHelpers.BigNumberBinaryOperator;
-
-        mod: TypeHelpers.BigNumberBinaryOperator;
-
-        /// return inverse mod prime p.  p must be odd. Binary extended Euclidean algorithm mod p.
-        inverseMod: TypeHelpers.BigNumberBinaryOperator;
-
-        /// this + that.  Does not normalize.
-        add: TypeHelpers.BigNumberBinaryOperator;
-
-        /// this - that.  Does not normalize.
-        sub: TypeHelpers.BigNumberBinaryOperator;
-
-        /// this * that.  Normalizes and reduces.
-        mul: TypeHelpers.BigNumberBinaryOperator;
-
-        /// this ^ 2.  Normalizes and reduces.
-        square(): BigNumber;
-
-        /// this ^ n.  Uses square-and-multiply.  Normalizes and reduces.
-        power(n: number): BigNumber;
-        power(n: BigNumber): BigNumber;
-        power(a: number[]): BigNumber;
-
-        /// this * that mod N
-        mulmod: TypeHelpers.BigNumberTrinaryOperator;
-
-        /// this ^ x mod N
-        powermod: TypeHelpers.BigNumberTrinaryOperator;
-
-        trim(): BigNumber;
-
-        /// Reduce mod a modulus.  Stubbed for subclassing.
-        reduce(): BigNumber;
-
-        /// Reduce and normalize.
-        fullReduce(): BigNumber;
-
-        /// Propagate carries.
-        normalize(): BigNumber;
-
-        /// Constant-time normalize. Does not allocate additional space.
-        cnormalize(): BigNumber;
-
-        /// Serialize to a bit array
-        toBits(len?: number): BitArray;
-
-        /// Return the length in bits, rounded up to the nearest byte.
-        bitLength(): number;
-    }
-
-    interface BigNumberStatic {
-        new (): BigNumber;
-        new (n: string): BigNumber;
-        new (n: number): BigNumber;
-        new (n: BigNumber): BigNumber;
-
-        fromBits(bits: BitArray): BigNumber;
-        random: TypeHelpers.Bind1<number>;
-        prime: {
-            p127: PseudoMersennePrimeStatic;
-            // Bernstein's prime for Curve25519
-            p25519: PseudoMersennePrimeStatic;
-            // Koblitz primes
-            p192k: PseudoMersennePrimeStatic;
-            p224k: PseudoMersennePrimeStatic;
-            p256k: PseudoMersennePrimeStatic;
-            // NIST primes
-            p192: PseudoMersennePrimeStatic;
-            p224: PseudoMersennePrimeStatic;
-            p256: PseudoMersennePrimeStatic;
-            p384: PseudoMersennePrimeStatic;
-            p521: PseudoMersennePrimeStatic;
-        };
-
-        pseudoMersennePrime(exponent: number, coeff: number[][]): PseudoMersennePrimeStatic;
-    }
-
-    interface PseudoMersennePrime extends BigNumber {
-        reduce(): PseudoMersennePrime;
-        fullReduce(): PseudoMersennePrime;
-        inverse(): PseudoMersennePrime;
-    }
-
-    interface PseudoMersennePrimeStatic extends BigNumberStatic {
-        new (): PseudoMersennePrime;
-        new (n: string): PseudoMersennePrime;
-        new (n: number): PseudoMersennePrime;
-        new (n: BigNumber): PseudoMersennePrime;
-    }
-
-    // ________________________________________________________________________
-
-    interface BitArray extends Array<number> {
-    }
-
-    interface BitArrayStatic {
-        /// Array slices in units of bits.
-        bitSlice(a: BitArray, bstart: number, bend: number): BitArray;
-
-        /// Extract a number packed into a bit array.
-        extract(a: BitArray, bstart: number, blenth: number): number;
-
-        /// Concatenate two bit arrays.
-        concat(a1: BitArray, a2: BitArray): BitArray
-
-        /// Find the length of an array of bits.
-        bitLength(a: BitArray): number;
-
-        /// Truncate an array.
-        clamp(a: BitArray, len: number): BitArray;
-
-        /// Make a partial word for a bit array.
-        partial(len: number, x: number, _end?: number): number;
-
-        /// Get the number of bits used by a partial word.
-        getPartial(x: number): number;
-
-        /// Compare two arrays for equality in a predictable amount of time.
-        equal(a: BitArray, b: BitArray): boolean;
-
-        /// Shift an array right.
-        _shiftRight(a: BitArray, shift: number, carry?: number, out?: BitArray): BitArray;
-
-        /// xor a block of 4 words together.
-        _xor4(x: number[], y: number[]): number[];
-    }
-
-    // ________________________________________________________________________
-
-    interface SjclCodec<T> {
-        fromBits(bits: BitArray): T;
-        toBits(value: T): BitArray;
-    }
-
-    interface SjclCodecs {
-        utf8String: SjclCodec<string>;
-        hex: SjclCodec<string>;
-        bytes: SjclCodec<number[]>;
-        base64: SjclCodec<string>;
-        base64url: SjclCodec<string>;
-    }
-
-    // ________________________________________________________________________
-
-    interface SjclHash {
-        reset(): SjclHash;
-        update(data: string): SjclHash;
-        update(data: BitArray): SjclHash;
-        finalize(): BitArray;
-    }
-
-    interface SjclHashStatic {
-        new (hash?: SjclHash): SjclHash;
-        hash(data: string): BitArray;
-        hash(data: BitArray): BitArray;
-    }
-
-    interface SjclHashes {
-        sha1: SjclHashStatic;
-        sha256: SjclHashStatic;
-        sha512: SjclHashStatic;
-    }
-
-    // ________________________________________________________________________
-
-    interface SjclExceptions {
-        corrupt: SjclExceptionFactory;
-        invalid: SjclExceptionFactory;
-        bug: SjclExceptionFactory;
-        notReady: SjclExceptionFactory;
-    }
-
-    interface SjclExceptionFactory {
-        new (message: string): Error;
-    }
-
-    // ________________________________________________________________________
-
-    interface SjclCiphers {
-        aes: SjclCipherStatic;
-    }
-
-    interface SjclCipher {
-        encrypt(data: number[]): number[];
-        decrypt(data: number[]): number[];
-    }
-
-    interface SjclCipherStatic {
-        new (key: number[]): SjclCipher;
-    }
-
-    // ________________________________________________________________________
-
-    interface SjclModes {
-        gcm: SjclGCMMode;
-        ccm: SjclCCMMode;
-        ocb2: SjclOCB2Mode;
-        cbc: SjclCBCMode;
-    }
-
-    interface SjclGCMMode {
-        encrypt(prp: SjclCipher, plaintext: BitArray, iv: BitArray, adata?: BitArray, tlen?: number): BitArray;
-        decrypt(prp: SjclCipher, ciphertext: BitArray, iv: BitArray, adata?: BitArray, tlen?: number): BitArray;
-    }
-
-    interface SjclCCMMode {
-        encrypt(prp: SjclCipher, plaintext: BitArray, iv: BitArray, adata?: BitArray, tlen?: number): BitArray;
-        decrypt(prp: SjclCipher, ciphertext: BitArray, iv: BitArray, adata?: BitArray, tlen?: number): BitArray;
-    }
-
-    interface SjclOCB2Mode {
-        encrypt(prp: SjclCipher, plaintext: BitArray, iv: BitArray, adata?: BitArray, tlen?: number, premac?: boolean): BitArray;
-        decrypt(prp: SjclCipher, ciphertext: BitArray, iv: BitArray, adata?: BitArray, tlen?: number, premac?: boolean): BitArray;
-        pmac(prp: SjclCipher, adata: BitArray): number[];
-    }
-
-    interface SjclCBCMode {
-        encrypt(prp: SjclCipher, plaintext: BitArray, iv: BitArray, adata?: BitArray): BitArray;
-        decrypt(prp: SjclCipher, ciphertext: BitArray, iv: BitArray, adata?: BitArray): BitArray;
-    }
-
-    // ________________________________________________________________________
-
-    interface Pbkdf2Params {
-        iter?: number;
-        salt?: BitArray;
-    }
-
-    interface SjclMisc {
-        pbkdf2(password: string, salt: string, count?: number, length?: number, Prff?: SjclPseudorandomFunctionFamilyStatic): BitArray;
-        pbkdf2(password: BitArray, salt: string, count?: number, length?: number, Prff?: SjclPseudorandomFunctionFamilyStatic): BitArray;
-        pbkdf2(password: BitArray, salt: BitArray, count?: number, length?: number, Prff?: SjclPseudorandomFunctionFamilyStatic): BitArray;
-        pbkdf2(password: string, salt: BitArray, count?: number, length?: number, Prff?: SjclPseudorandomFunctionFamilyStatic): BitArray;
-        hmac: SjclHmacStatic;
-        cachedPbkdf2(password: string, obj?: Pbkdf2Params): {
-            key: BitArray;
-            salt: BitArray;
-        };
-    }
-
-    class SjclPseudorandomFunctionFamily {
-        encrypt(data: string): BitArray;
-        encrypt(data: BitArray): BitArray;
-    }
-
-    interface SjclHmac extends SjclPseudorandomFunctionFamily {
-        mac(data: string): BitArray;
-        mac(data: BitArray): BitArray;
-        reset(): void;
-        update(data: string): void;
-        update(data: BitArray): void;
-        digest(): BitArray;
-    }
-
-    interface SjclPseudorandomFunctionFamilyStatic {
-        new (key: BitArray): SjclPseudorandomFunctionFamily;
-    }
-
-    interface SjclHmacStatic {
-        new (key: BitArray, Hash?: SjclHashStatic): SjclHmac;
-    }
-
-    // ________________________________________________________________________
-
-    interface SjclEllipticCurveCryptography {
-        point: SjclEllipticalPointStatic;
-        pointJac: SjclPointJacobianStatic;
-        curve: SjclEllipticalCurveStatic;
-        curves: {
-            c192: SjclEllipticalCurve;
-            c224: SjclEllipticalCurve;
-            c256: SjclEllipticalCurve;
-            c384: SjclEllipticalCurve;
-            k192: SjclEllipticalCurve;
-            k224: SjclEllipticalCurve;
-            k256: SjclEllipticalCurve;
-        };
-        basicKey: SjclECCBasic;
-        elGamal: SjclElGamal;
-        ecdsa: SjclEcdsa;
-    }
-
-    interface SjclEllipticalPoint {
-        toJac(): SjclPointJacobian;
-        mult(k: BigNumber): SjclEllipticalPoint;
-        mult2(k: BigNumber, k2: BigNumber, affine2: SjclEllipticalPoint): SjclEllipticalPoint;
-        multiples(): Array<SjclEllipticalPoint>;
-        isValid(): boolean;
-        toBits(): BitArray;
-    }
-
-    interface SjclEllipticalPointStatic {
-        new (curve: SjclEllipticalCurve, x?: BigNumber, y?: BigNumber): SjclEllipticalPoint;
-    }
-
-    interface SjclPointJacobian {
-        add(T: SjclEllipticalPoint): SjclPointJacobian;
-        doubl(): SjclPointJacobian;
-        toAffine(): SjclEllipticalPoint;
-        mult(k: BigNumber, affine: SjclEllipticalPoint): SjclPointJacobian;
-        mult2(k1: BigNumber, affine: SjclEllipticalPoint, k2: BigNumber, affine2: SjclEllipticalPoint): SjclPointJacobian;
-        isValid(): boolean;
-    }
-
-    interface SjclPointJacobianStatic {
-        new (curve: SjclEllipticalCurve, x?: BigNumber, y?: BigNumber, z?: BigNumber):SjclPointJacobian;
-    }
-
-    interface SjclEllipticalCurve {
-        fromBits(bits: BitArray): SjclEllipticalPoint;
-    }
-
-    interface SjclEllipticalCurveStatic {
-        new (Field: BigNumber, r: BigNumber, a: BigNumber, b: BigNumber, x: BigNumber, y: BigNumber): SjclEllipticalCurve;
-    }
-
-    interface SjclKeyPair<P extends SjclECCPublicKey, S extends SjclECCSecretKey> {
-        pub: P;
-        sec: S;
-    }
-
-    interface SjclKeysGenerator<P extends SjclECCPublicKey, S extends SjclECCSecretKey> {
-        (curve: SjclEllipticalCurve, paranoia: number, sec?: BigNumber): SjclKeyPair<P, S>;
-        (curve: number, paranoia: number, sec?: BigNumber): SjclKeyPair<P, S>;
-    }
-
-    interface SjclECCPublicKeyData {
-        x: BitArray;
-        y: BitArray;
-    }
-
-    class SjclECCPublicKey {
-        get(): SjclECCPublicKeyData;
-    }
-
-    class SjclECCSecretKey {
-        get(): BitArray;
-    }
-
-    interface SjclECCPublicKeyFactory<T extends SjclECCPublicKey> {
-        new (curve: SjclEllipticalCurve, point: SjclEllipticalPoint): T;
-        new (curve: SjclEllipticalCurve, point: BitArray): T;
-    }
-
-    interface SjclECCSecretKeyFactory<T extends SjclECCSecretKey> {
-        new (curve: SjclEllipticalCurve, exponent: BigNumber): T;
-    }
-
-    interface SjclECCBasic {
-        publicKey: SjclECCPublicKeyFactory<SjclECCPublicKey>;
-        secretKey: SjclECCSecretKeyFactory<SjclECCSecretKey>;
-        generateKeys(cn: string): SjclKeysGenerator<SjclECCPublicKey, SjclECCSecretKey>;
-    }
-
-    class SjclElGamalPublicKey extends SjclECCPublicKey {
-        kem(paranoia: number): {
-            key: BitArray;
-            tag: BitArray;
-        };
-    }
-
-    class SjclElGamalSecretKey extends SjclECCSecretKey {
-        unkem(tag: BitArray): BitArray;
-        dh(pk: SjclECCPublicKey): BitArray;
-    }
-
-    interface SjclElGamal {
-        publicKey: SjclECCPublicKeyFactory<SjclElGamalPublicKey>;
-        secretKey: SjclECCSecretKeyFactory<SjclElGamalSecretKey>;
-        generateKeys: SjclKeysGenerator<SjclElGamalPublicKey, SjclElGamalSecretKey>;
-    }
-
-    class SjclEcdsaPublicKey extends SjclECCPublicKey {
-        verify(hash: BitArray, rs: BitArray, fakeLegacyVersion: boolean): boolean;
-    }
-
-    class SjclEcdsaSecretKey extends SjclECCSecretKey {
-        sign(hash: BitArray, paranoia: number, fakeLegacyVersion: boolean, fixedKForTesting?: BigNumber): BitArray;
-    }
-
-    interface SjclEcdsa {
-        publicKey: SjclECCPublicKeyFactory<SjclEcdsaPublicKey>;
-        secretKey: SjclECCSecretKeyFactory<SjclEcdsaSecretKey>;
-        generateKeys: SjclKeysGenerator<SjclEcdsaPublicKey, SjclEcdsaSecretKey>;
-    }
-
-    // ________________________________________________________________________
-
-    interface SjclRandom {
-        randomWords(nwords: number, paranoia?: number): BitArray;
-        setDefaultParanoia(paranoia: number, allowZeroParanoia: string): void;
-        addEntropy(data: number, estimatedEntropy: number, source: string): void;
-        addEntropy(data: number[], estimatedEntropy: number, source: string): void;
-        addEntropy(data: string, estimatedEntropy: number, source: string): void;
-        isReady(paranoia?: number): boolean;
-        getProgress(paranoia?: number): number;
-        startCollectors(): void;
-        stopCollectors(): void;
-        addEventListener(name: string, cb: Function): void;
-        removeEventListener(name: string, cb: Function): void;
-    }
-
-    interface SjclRandomStatic {
-        new (defaultParanoia: number): SjclRandom;
-    }
-
-    // ________________________________________________________________________
-
-    interface SjclKeyExchange {
-        srp: SecureRemotePassword;
-    }
-
-    interface SjclSRPGroup {
-        N: BigNumber;
-        g: BigNumber;
-    }
-
-    interface SecureRemotePassword {
-        makeVerifier(username: string, password: string, salt: BitArray, group: SjclSRPGroup): BitArray;
-        makeX(username: string, password: string, salt: BitArray): BitArray;
-        knownGroup(i: string): SjclSRPGroup;
-        knownGroup(i: number): SjclSRPGroup;
-    }
-
-    // ________________________________________________________________________
-
-    interface SjclCipherParams {
-        v?: number;
-        iter?: number;
-        ks?: number;
-        ts?: number;
-        mode?: string;
-        adata?: string;
-        cipher?: string;
-    }
-
-    interface SjclCipherEncryptParams extends SjclCipherParams {
-        salt: BitArray;
-        iv: BitArray;
-    }
-
-    interface SjclCipherDecryptParams extends SjclCipherParams {
-        salt?: BitArray;
-        iv?: BitArray;
-    }
-
-    interface SjclCipherEncrypted extends SjclCipherEncryptParams {
-        kemtag?: BitArray;
-        ct: BitArray;
-    }
-
-    interface SjclCipherDecrypted extends SjclCipherEncrypted {
-        key: BitArray;
-    }
-
-    interface SjclConveninceEncryptor {
-        (password: string, plaintext: string, params?: SjclCipherEncryptParams, rp?: SjclCipherEncrypted): SjclCipherEncrypted;
-        (password: BitArray, plaintext: string, params?: SjclCipherEncryptParams, rp?: SjclCipherEncrypted): SjclCipherEncrypted;
-        (password: SjclElGamalPublicKey, plaintext: string, params?: SjclCipherEncryptParams, rp?: SjclCipherEncrypted): SjclCipherEncrypted;
-    }
-
-    interface SjclConveninceDecryptor {
-        (password: string, ciphertext: SjclCipherEncrypted, params?: SjclCipherDecryptParams, rp?: SjclCipherDecrypted): string;
-        (password: BitArray, ciphertext: SjclCipherEncrypted, params?: SjclCipherDecryptParams, rp?: SjclCipherDecrypted): string;
-        (password: SjclElGamalSecretKey, ciphertext: SjclCipherEncrypted, params?: SjclCipherDecryptParams, rp?: SjclCipherDecrypted): string;
-    }
-
-    interface SjclJson {
-        encrypt: SjclConveninceEncryptor;
-        decrypt: SjclConveninceDecryptor;
-        encode(obj: Object): string;
-        decode(obj: string): Object;
-    }
-
-    // ________________________________________________________________________
-
-    namespace TypeHelpers {
-        interface One<T> {
-            (value: T): BigNumber;
-        }
-
-        interface BigNumberBinaryOperator extends One<number>, One<string>, One<BigNumber> {
-        }
-
-        interface Two<T1, T2> {
-            (x: T1, N: T2): BigNumber;
-        }
-
-        interface Bind1<T> extends Two<number, T>, Two<string, T>, Two<BigNumber, T> {
-        }
-
-        interface BigNumberTrinaryOperator extends Bind1<number>, Bind1<string>, Bind1<BigNumber> {
-        }
-    }
-}
-
-declare module "sjcl" {
-    export = sjcl;
-}
diff --git a/sjcl/tsconfig.json b/sjcl/tsconfig.json
new file mode 100644
index 0000000000..886585a85a
--- /dev/null
+++ b/sjcl/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sjcl-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ski/index.d.ts b/ski/index.d.ts
new file mode 100644
index 0000000000..3b42cfe607
--- /dev/null
+++ b/ski/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for ski 1.1.0
+// Project: https://github.com/jden/ski
+// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export declare function S<T, S, U>(x: (z: U) => (y: S) => T, y: (z: U) => S, z: U): T;
+export declare function K<T, S>(x: T): (y?: S) => T
+export declare function I<T>(x: T): T;
diff --git a/ski/ski-tests.ts b/ski/ski-tests.ts
index 73b8b43922..67ab43e4de 100644
--- a/ski/ski-tests.ts
+++ b/ski/ski-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./ski.d.ts" />
 
 import { S, K, I } from 'ski';
 
diff --git a/ski/ski.d.ts b/ski/ski.d.ts
deleted file mode 100644
index 3632f18fb6..0000000000
--- a/ski/ski.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Type definitions for ski 1.1.0
-// Project: https://github.com/jden/ski
-// Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "ski" {
-	export function S<T, S, U>(x: (z: U) => (y: S) => T, y: (z: U) => S, z: U): T;
-	export function K<T, S>(x: T): (y?: S) => T
-	export function I<T>(x: T): T;
-}
diff --git a/ski/tsconfig.json b/ski/tsconfig.json
new file mode 100644
index 0000000000..7724157baf
--- /dev/null
+++ b/ski/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ski-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/skyway/index.d.ts b/skyway/index.d.ts
new file mode 100644
index 0000000000..b9a06a8f15
--- /dev/null
+++ b/skyway/index.d.ts
@@ -0,0 +1,184 @@
+// Type definitions for SkyWay
+// Project: http://nttcom.github.io/skyway/
+// Definitions by: Toshiya Nakakura <https://github.com/nakakura>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="webrtc" />
+
+declare namespace PeerJs{
+    interface PeerJSOption{
+        key?: string;
+        host?: string;
+        port?: number;
+        path?: string;
+        secure?: boolean;
+        turn?: boolean;
+        config?: RTCPeerConnectionConfig;
+        debug?: number;
+    }
+
+    interface PeerConnectOption{
+        label?: string;
+        metadata?: any;
+        serialization?: string;
+        reliable?: boolean;
+    }
+
+    interface DataConnection{
+        send(data: any): void;
+        close(): void;
+        on(event: string, cb: ()=>void): void;
+        on(event: 'data', cb: (data: any)=>void): void;
+        on(event: 'open', cb: ()=>void): void;
+        on(event: 'close', cb: ()=>void): void;
+        on(event: 'error', cb: (err: any)=>void): void;
+        off(event: string, fn: Function, once?: boolean): void;
+        bufferSize: number;
+        dataChannel: RTCDataChannel;
+        label: string;
+        metadata: any;
+        open: boolean;
+        peerConnection: any;
+        peer: string;
+        reliable: boolean;
+        serialization: string;
+        type: string;
+    }
+
+    interface MediaConnection{
+        answer(stream?: any): void;
+        close(): void;
+        on(event: string, cb: ()=>void): void;
+        on(event: 'stream', cb: (stream: any)=>void): void;
+        on(event: 'close', cb: ()=>void): void;
+        on(event: 'error', cb: (err: any)=>void): void;
+        off(event: string, fn: Function, once?: boolean): void;
+        open: boolean;
+        metadata: any;
+        peer: string;
+        type: string;
+    }
+
+    interface utilSupportsObj {
+        audioVideo: boolean;
+        data: boolean;
+        binary: boolean;
+        reliable: boolean;
+    }
+
+    interface util{
+        browser: string;
+        supports: utilSupportsObj;
+    }
+
+    export interface Peer{
+        /**
+         *
+         * @param id The brokering ID of the remote peer (their peer.id).
+         * @param options for specifying details about Peer Connection
+         */
+        connect(id: string, options?: PeerJs.PeerConnectOption): PeerJs.DataConnection;
+        /**
+         * Connects to the remote peer specified by id and returns a data connection.
+         * @param id The brokering ID of the remote peer (their peer.id).
+         * @param stream The caller's media stream
+         */
+        call(id: string, stream: any): PeerJs.MediaConnection;
+        /**
+         * Calls the remote peer specified by id and returns a media connection.
+         * @param event Event name
+         * @param cb Callback Function
+         */
+        on(event: string, cb: ()=>void): void;
+        /**
+         * Emitted when a connection to the PeerServer is established.
+         * @param event Event name
+         * @param cb id is the brokering ID of the peer
+         */
+        on(event: 'open', cb: (id: string)=>void): void;
+        /**
+         * Emitted when a new data connection is established from a remote peer.
+         * @param event Event name
+         * @param cb Callback Function
+         */
+        on(event: 'connection', cb: (dataConnection: PeerJs.DataConnection)=>void): void;
+        /**
+         * Emitted when a remote peer attempts to call you.
+         * @param event Event name
+         * @param cb Callback Function
+         */
+        on(event: 'call', cb: (mediaConnection: PeerJs.MediaConnection)=>void): void;
+        /**
+         * Emitted when the peer is destroyed and can no longer accept or create any new connections.
+         * @param event Event name
+         * @param cb Callback Function
+         */
+        on(event: 'close', cb: ()=>void): void;
+        /**
+         * Emitted when the peer is disconnected from the signalling server
+         * @param event Event name
+         * @param cb Callback Function
+         */
+        on(event: 'disconnected', cb: ()=>void): void;
+        /**
+         * Errors on the peer are almost always fatal and will destroy the peer.
+         * @param event Event name
+         * @param cb Callback Function
+         */
+        on(event: 'error', cb: (err: any)=>void): void;
+        /**
+         * Remove event listeners.(EventEmitter3)
+         * @param {String} event The event we want to remove.
+         * @param {Function} fn The listener that we need to find.
+         * @param {Boolean} once Only remove once listeners.
+         */
+        off(event: string, fn: Function, once?: boolean): void;
+        /**
+         * Close the connection to the server, leaving all existing data and media connections intact.
+         */
+        disconnect(): void;
+        /**
+         * Close the connection to the server and terminate all existing connections.
+         */
+        destroy(): void;
+        /**
+         * Get a list of available peer IDs
+         * @param callback
+         */
+        listAllPeers(callback: (peerIds: Array<string>)=>void): void;
+
+        /**
+         * The brokering ID of this peer
+         */
+        id: string;
+        /**
+         * A hash of all connections associated with this peer, keyed by the remote peer's ID.
+         */
+        connections: any;
+        /**
+         * false if there is an active connection to the PeerServer.
+         */
+        disconnected: boolean;
+        /**
+         * true if this peer and all of its connections can no longer be used.
+         */
+        destroyed: boolean;
+    }
+}
+
+declare var Peer: {
+    prototype: RTCIceServer;
+    /**
+     * A peer can connect to other peers and listen for connections.
+     * @param id Other peers can connect to this peer using the provided ID.
+     *     If no ID is given, one will be generated by the brokering server.
+     * @param options for specifying details about PeerServer
+     */
+    new (id: string, options?: PeerJs.PeerJSOption): PeerJs.Peer;
+
+    /**
+     * A peer can connect to other peers and listen for connections.
+     * @param options for specifying details about PeerServer
+     */
+    new (options: PeerJs.PeerJSOption): PeerJs.Peer;
+};
diff --git a/skyway/skyway-tests.ts b/skyway/skyway-tests.ts
index 0a2a49d591..2731192f75 100644
--- a/skyway/skyway-tests.ts
+++ b/skyway/skyway-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="./skyway.d.ts" />
-/// <reference path="../webrtc/RTCPeerConnection.d.ts" />
-
 var peerByOption: PeerJs.Peer = new Peer({
     key: 'peerKey',
     debug: 3,
diff --git a/skyway/skyway.d.ts b/skyway/skyway.d.ts
deleted file mode 100644
index c9bc774f53..0000000000
--- a/skyway/skyway.d.ts
+++ /dev/null
@@ -1,184 +0,0 @@
-// Type definitions for SkyWay
-// Project: http://nttcom.github.io/skyway/
-// Definitions by: Toshiya Nakakura <https://github.com/nakakura>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path='../webrtc/RTCPeerConnection.d.ts' />
-
-declare namespace PeerJs{
-    interface PeerJSOption{
-        key?: string;
-        host?: string;
-        port?: number;
-        path?: string;
-        secure?: boolean;
-        turn?: boolean;
-        config?: RTCPeerConnectionConfig;
-        debug?: number;
-    }
-
-    interface PeerConnectOption{
-        label?: string;
-        metadata?: any;
-        serialization?: string;
-        reliable?: boolean;
-    }
-
-    interface DataConnection{
-        send(data: any): void;
-        close(): void;
-        on(event: string, cb: ()=>void): void;
-        on(event: 'data', cb: (data: any)=>void): void;
-        on(event: 'open', cb: ()=>void): void;
-        on(event: 'close', cb: ()=>void): void;
-        on(event: 'error', cb: (err: any)=>void): void;
-        off(event: string, fn: Function, once?: boolean): void;
-        bufferSize: number;
-        dataChannel: RTCDataChannel;
-        label: string;
-        metadata: any;
-        open: boolean;
-        peerConnection: any;
-        peer: string;
-        reliable: boolean;
-        serialization: string;
-        type: string;
-    }
-
-    interface MediaConnection{
-        answer(stream?: any): void;
-        close(): void;
-        on(event: string, cb: ()=>void): void;
-        on(event: 'stream', cb: (stream: any)=>void): void;
-        on(event: 'close', cb: ()=>void): void;
-        on(event: 'error', cb: (err: any)=>void): void;
-        off(event: string, fn: Function, once?: boolean): void;
-        open: boolean;
-        metadata: any;
-        peer: string;
-        type: string;
-    }
-
-    interface utilSupportsObj {
-        audioVideo: boolean;
-        data: boolean;
-        binary: boolean;
-        reliable: boolean;
-    }
-
-    interface util{
-        browser: string;
-        supports: utilSupportsObj;
-    }
-
-    export interface Peer{
-        /**
-         *
-         * @param id The brokering ID of the remote peer (their peer.id).
-         * @param options for specifying details about Peer Connection
-         */
-        connect(id: string, options?: PeerJs.PeerConnectOption): PeerJs.DataConnection;
-        /**
-         * Connects to the remote peer specified by id and returns a data connection.
-         * @param id The brokering ID of the remote peer (their peer.id).
-         * @param stream The caller's media stream
-         */
-        call(id: string, stream: any): PeerJs.MediaConnection;
-        /**
-         * Calls the remote peer specified by id and returns a media connection.
-         * @param event Event name
-         * @param cb Callback Function
-         */
-        on(event: string, cb: ()=>void): void;
-        /**
-         * Emitted when a connection to the PeerServer is established.
-         * @param event Event name
-         * @param cb id is the brokering ID of the peer
-         */
-        on(event: 'open', cb: (id: string)=>void): void;
-        /**
-         * Emitted when a new data connection is established from a remote peer.
-         * @param event Event name
-         * @param cb Callback Function
-         */
-        on(event: 'connection', cb: (dataConnection: PeerJs.DataConnection)=>void): void;
-        /**
-         * Emitted when a remote peer attempts to call you.
-         * @param event Event name
-         * @param cb Callback Function
-         */
-        on(event: 'call', cb: (mediaConnection: PeerJs.MediaConnection)=>void): void;
-        /**
-         * Emitted when the peer is destroyed and can no longer accept or create any new connections.
-         * @param event Event name
-         * @param cb Callback Function
-         */
-        on(event: 'close', cb: ()=>void): void;
-        /**
-         * Emitted when the peer is disconnected from the signalling server
-         * @param event Event name
-         * @param cb Callback Function
-         */
-        on(event: 'disconnected', cb: ()=>void): void;
-        /**
-         * Errors on the peer are almost always fatal and will destroy the peer.
-         * @param event Event name
-         * @param cb Callback Function
-         */
-        on(event: 'error', cb: (err: any)=>void): void;
-        /**
-         * Remove event listeners.(EventEmitter3)
-         * @param {String} event The event we want to remove.
-         * @param {Function} fn The listener that we need to find.
-         * @param {Boolean} once Only remove once listeners.
-         */
-        off(event: string, fn: Function, once?: boolean): void;
-        /**
-         * Close the connection to the server, leaving all existing data and media connections intact.
-         */
-        disconnect(): void;
-        /**
-         * Close the connection to the server and terminate all existing connections.
-         */
-        destroy(): void;
-        /**
-         * Get a list of available peer IDs
-         * @param callback
-         */
-        listAllPeers(callback: (peerIds: Array<string>)=>void): void;
-
-        /**
-         * The brokering ID of this peer
-         */
-        id: string;
-        /**
-         * A hash of all connections associated with this peer, keyed by the remote peer's ID.
-         */
-        connections: any;
-        /**
-         * false if there is an active connection to the PeerServer.
-         */
-        disconnected: boolean;
-        /**
-         * true if this peer and all of its connections can no longer be used.
-         */
-        destroyed: boolean;
-    }
-}
-
-declare var Peer: {
-    prototype: RTCIceServer;
-    /**
-     * A peer can connect to other peers and listen for connections.
-     * @param id Other peers can connect to this peer using the provided ID.
-     *     If no ID is given, one will be generated by the brokering server.
-     * @param options for specifying details about PeerServer
-     */
-    new (id: string, options?: PeerJs.PeerJSOption): PeerJs.Peer;
-
-    /**
-     * A peer can connect to other peers and listen for connections.
-     * @param options for specifying details about PeerServer
-     */
-    new (options: PeerJs.PeerJSOption): PeerJs.Peer;
-};
diff --git a/skyway/tsconfig.json b/skyway/tsconfig.json
new file mode 100644
index 0000000000..0139487a06
--- /dev/null
+++ b/skyway/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "skyway-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/slate-irc/index.d.ts b/slate-irc/index.d.ts
new file mode 100644
index 0000000000..361271d2c3
--- /dev/null
+++ b/slate-irc/index.d.ts
@@ -0,0 +1,97 @@
+// Type definitions for slate-irc
+// Project: https://github.com/slate/slate-irc
+// Definitions by: Elisée MAURER <https://github.com/elisee/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import * as net from "net";
+
+declare function IRC(socket: net.Socket): IRC.Client;
+
+declare namespace IRC {
+    interface DataEvent {
+        prefix: string;
+        command: string;
+        params: string;
+        trailing: string;
+        string: string;
+    }
+
+    interface MOTDEvent {
+        motd: string[];
+    }
+
+    interface MessageEvent {
+        from: string;
+        hostmask: any;
+        to: string;
+        message: string;
+    }
+
+    interface JoinEvent {
+        nick: string;
+        hostmask: string;
+        channel: string;
+    }
+
+    interface PartEvent {
+        nick: string;
+        hostmask: string;
+        channels: string[];
+    }
+
+    interface NickEvent {
+        nick: string;
+        hostmask: string;
+        new: string;
+    }
+
+    interface QuitEvent {
+        nick: string;
+        hostmask: string;
+        message: string;
+    }
+
+    class Client {
+        me: string;
+
+        write(str: string): void;
+
+        pass(pass: string): void;
+        nick(nick: string): void;
+        user(username: string, realname: string): void;
+
+        invite(name: string, channel: string): void;
+        send(target: string, msg: string): void;
+        action(target: string, msg: string): void;
+        notice(target: string, msg: string): void;
+        ctcp(target: string, msg: string): void;
+
+        join(channel: string, key?: string): void;
+        part(channel: string, msg?: string): void;
+        names(channel: string, callback: (error: Error, names: { name: string; mode: string; }[]) => void): void;
+
+        away(message: string): void;
+        topic(channel: string, topic: string): void;
+        kick(channels: string | string[], nicks: string | string[], msg: string): void;
+        oper(name: string, password: string): void;
+        mode(target: string, flags: string, params: string): void;
+        quit(msg: string): void;
+        whois(target: string, mask: string, callback: Function): void;
+
+        on(event: string, callback: Function): void;
+        on(event: "data", callback: (event: DataEvent) => void): void;
+        on(event: "welcome", callback: (name: string) => void): void;
+        on(event: "message", callback: (event: MessageEvent) => void): void;
+        on(event: "notice", callback: (event: MessageEvent) => void): void;
+        on(event: "motd", callback: (event: MOTDEvent) => void): void;
+        on(event: "join", callback: (event: JoinEvent) => void): void;
+        on(event: "part", callback: (event: PartEvent) => void): void;
+        on(event: "nick", callback: (event: NickEvent) => void): void;
+        on(event: "quit", callback: (event: QuitEvent) => void): void;
+    }
+}
+
+export = IRC;
diff --git a/slate-irc/slate-irc-tests.ts b/slate-irc/slate-irc-tests.ts
index 9766a310df..3b1dd6bd3f 100644
--- a/slate-irc/slate-irc-tests.ts
+++ b/slate-irc/slate-irc-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="slate-irc.d.ts" />
 
 import * as net from "net";
 import * as SlateIRC from "slate-irc";
diff --git a/slate-irc/slate-irc.d.ts b/slate-irc/slate-irc.d.ts
deleted file mode 100644
index 5f9d947bca..0000000000
--- a/slate-irc/slate-irc.d.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-// Type definitions for slate-irc
-// Project: https://github.com/slate/slate-irc
-// Definitions by: Elisée MAURER <https://github.com/elisee/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "slate-irc" {
-  import * as net from "net";
-
-  function IRC(socket: net.Socket): IRC.Client;
-
-  namespace IRC {
-    interface DataEvent {
-      prefix: string;
-      command: string;
-      params: string;
-      trailing: string;
-      string: string;
-    }
-
-    interface MOTDEvent {
-      motd: string[];
-    }
-
-    interface MessageEvent {
-      from: string;
-      hostmask: any;
-      to: string;
-      message: string;
-    }
-
-    interface JoinEvent {
-      nick: string;
-      hostmask: string;
-      channel: string;
-    }
-
-    interface PartEvent {
-      nick: string;
-      hostmask: string;
-      channels: string[];
-    }
-
-    interface NickEvent {
-      nick: string;
-      hostmask: string;
-      new: string;
-    }
-
-    interface QuitEvent {
-      nick: string;
-      hostmask: string;
-      message: string;
-    }
-
-    class Client {
-      me: string;
-
-      write(str: string): void;
-
-      pass(pass: string): void;
-      nick(nick: string): void;
-      user(username: string, realname: string): void;
-
-      invite(name: string, channel: string): void;
-      send(target: string, msg: string): void;
-      action(target: string, msg: string): void;
-      notice(target: string, msg: string): void;
-      ctcp(target: string, msg: string): void;
-
-      join(channel: string, key?: string): void;
-      part(channel: string, msg?: string): void;
-      names(channel: string, callback: (error: Error, names: { name: string; mode: string; }[]) => void): void;
-
-      away(message: string): void;
-      topic(channel: string, topic: string): void;
-      kick(channels: string|string[], nicks: string|string[], msg: string): void;
-      oper(name: string, password: string): void;
-      mode(target: string, flags: string, params: string): void;
-      quit(msg: string): void;
-      whois(target: string, mask: string, callback: Function): void;
-
-      on(event: string, callback: Function): void;
-      on(event: "data", callback: (event: DataEvent) => void): void;
-      on(event: "welcome", callback: (name: string) => void): void;
-      on(event: "message", callback: (event: MessageEvent) => void): void;
-      on(event: "notice", callback: (event: MessageEvent) => void): void;
-      on(event: "motd", callback: (event: MOTDEvent) => void): void;
-      on(event: "join", callback: (event: JoinEvent) => void): void;
-      on(event: "part", callback: (event: PartEvent) => void): void;
-      on(event: "nick", callback: (event: NickEvent) => void): void;
-      on(event: "quit", callback: (event: QuitEvent) => void): void;
-    }
-  }
-
-  export = IRC;
-}
diff --git a/slate-irc/tsconfig.json b/slate-irc/tsconfig.json
new file mode 100644
index 0000000000..d1f307ea2d
--- /dev/null
+++ b/slate-irc/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "slate-irc-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/slick-carousel/index.d.ts b/slick-carousel/index.d.ts
new file mode 100644
index 0000000000..e8ff8f198e
--- /dev/null
+++ b/slick-carousel/index.d.ts
@@ -0,0 +1,388 @@
+// Type definitions for stick 1.5.8
+// Project: http://kenwheeler.github.io/slick/
+// Definitions by: John Gouigouix <https://github.com/orchestra-ts/DefinitelyTyped/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface JQuerySlickOptions {
+
+    /**
+     * Enables tabbing and arrow key navigation
+     * Default: true
+     */
+    accessibility?: boolean;
+
+    /**
+     * Enables adaptive height for single slide horizontal carousels.
+     * Default: false
+     */
+    adaptiveHeight?: boolean;
+
+    /**
+     * Enables Autoplay
+     * Default: false
+     */
+    autoplay?: boolean;
+
+    /**
+     * Autoplay Speed in milliseconds
+     * Default: 3000
+     */
+    autoplaySpeed?: number;
+
+    /**
+     * Prev/Next Arrows
+     * Default: true
+     */
+    arrows?: boolean;
+
+    /**
+     * Set the slider to be the navigation of other slider (Class or ID Name)
+     * Default: null
+     */
+    asNavFor?: string;
+
+    /**
+     * Change where the navigation arrows are attached (Selector, htmlString, Array, Element, jQuery object)
+     * Default: $(element)
+     */
+    appendArrows?: any;
+
+    /**
+     * Allows you to select a node or customize the HTML for the "Previous" arrow.
+     * Default: <button type="button" class="slick-prev">Previous</button>
+     */
+    prevArrow?: string | Object;
+
+    /**
+     * Allows you to select a node or customize the HTML for the "Next" arrow.
+     * Default: <button type="button" class="slick-next">Next</button>
+     */
+    nextArrow?: string | Object;
+
+    /**
+     * Enables centered view with partial prev/next slides. Use with odd numbered slidesToShow counts.
+     * Default: false
+     */
+    centerMode?: boolean;
+
+    /**
+     * Side padding when in center mode (px or %)
+     * Default: '50px'
+     */
+    centerPadding?: string;
+
+    /**
+     * CSS3 Animation Easing
+     * Default: 'ease'
+     */
+    cssEase?: string;
+
+    /**
+     * Custom paging templates. See source for use example.
+     * Default: n/a
+     */
+    customPaging?: (slider: any, i: number) => string;
+
+    /**
+     * Show dot indicators
+     * Default: false
+     */
+    dots?: boolean;
+
+    /**
+     * Enable mouse dragging
+     * Default: true
+     */
+    draggable?: boolean;
+
+    /**
+     * Enable fade
+     * Default: false
+     */
+    fade?: boolean;
+
+    /**
+     * Enable focus on selected element (click)
+     * Default: false
+     */
+    focusOnSelect?: boolean;
+
+    /**
+     * Add easing for jQuery animate. Use with easing libraries or default easing methods
+     * Default: 'linear'
+     */
+    easing?: string;
+
+    /**
+     * Resistance when swiping edges of non-infinite carousels
+     * Default: 0.15
+     */
+    edgeFriction?: number;
+
+    /**
+     * Infinite loop sliding
+     * Default: true
+     */
+    infinite?: boolean;
+
+    /**
+     * Slide to start on
+     * Default: 0
+     */
+    initialSlide?: number;
+
+    /**
+     * Set lazy loading technique. Accepts 'ondemand' or 'progressive'.
+     * Default: 'ondemand'
+     */
+    lazyLoad?: string;
+
+    /**
+     * Responsive settings use mobile first calculation
+     * Default: false
+     */
+    mobileFirst?: boolean;
+
+    /**
+     * Pause Autoplay On Hover
+     * Default: true
+     */
+    pauseOnHover?: boolean;
+
+    /**
+     * Pause Autoplay when a dot is hovered
+     * Default: false
+     */
+    pauseOnDotsHover?: boolean;
+
+    /**
+     * Width that responsive object responds to. Can be 'window', 'slider' or 'min' (the smaller of the two)
+     * Default: 'window'
+     */
+    respondTo?: string;
+
+    /**
+     * Object containing breakpoints and settings objects (see demo).
+     * Enables settings sets at given screen width.
+     * Set settings to "unslick" instead of an object to disable slick at a given breakpoint.
+     * Default: none
+     */
+    responsive?: Object;
+
+    /**
+     * Setting this to more than 1 initializes grid mode. Use slidesPerRow to set how many slides should be in each row.
+     * Default: 1
+     */
+    rows?: number;
+
+    /**
+     * Element query to use as slide
+     * Default: 'div'
+     */
+    slide?: string;
+
+    /**
+     * With grid mode intialized via the rows option, this sets how many slides are in each grid row.
+     * Default: 1
+     */
+    slidesPerRow?: number;
+
+    /**
+     * # of slides to show
+     * Default: 1
+     */
+    slidesToShow?: number;
+
+    /**
+     * # of slides to scroll
+     * Default: 1
+     */
+    slidesToScroll?: number;
+
+    /**
+     * Slide/Fade animation speed (ms)
+     * Default: 300
+     */
+    speed?: number;
+
+    /**
+     * Enable swiping
+     * Default: true
+     */
+    swipe?: boolean;
+
+    /**
+     * Allow users to drag or swipe directly to a slide irrespective of slidesToScroll.
+     * Default: false
+     */
+    swipeToSlide?: boolean;
+
+    /**
+     * Enable slide motion with touch
+     * Default: true
+     */
+    touchMove?: boolean;
+
+    /**
+     * To advance slides, the user must swipe a length of (1/touchThreshold) * the width of the slider.
+     * Default: 5
+     */
+    touchThreshold?: number;
+
+    /**
+     * Enable/Disable CSS Transitions
+     * Default: true
+     */
+    useCSS?: boolean;
+
+    /**
+     * Variable width slides.
+     * Default: false
+     */
+    variableWidth?: boolean;
+
+    /**
+     * Vertical slide mode
+     * Default: false
+     */
+    vertical?: boolean;
+
+    /**
+     * Vertical swipe mode
+     * Default: false
+     */
+    verticalSwiping?: boolean;
+
+    /**
+     * Change the slider's direction to become right-to-left
+     * Default: false
+     */
+    rtl?: boolean;
+
+}
+
+
+interface JQuery {
+
+    /**
+     * Create slick component
+     */
+    slick(): JQuery;
+    slick(options: JQuerySlickOptions): JQuery;
+
+    /**
+     * Trigger non-specialized signature method
+     * @param methodName
+     * @param arg
+     */
+    slick(methodName: string, ...arg: any[]): any;
+
+    /**
+     * Returns the current slide index
+     * @param methodName The name of the method
+     */
+    slick(methodName: "slickCurrentSlide"): number;
+
+    /**
+     * Navigates to a slide by index
+     * @param methodName The name of the method
+     * @param slide
+     * @param animate
+     */
+    slick(methodName: "slickGoTo", slide: number, animate?: boolean): JQuery;
+
+    /**
+     * Navigates to the next slide
+     * @param methodName The name of the method
+     */
+    slick(methodName: "slickNext"): JQuery;
+
+    /**
+     * Navigates to the previous slide
+     * @param methodName The name of the method
+     */
+    slick(methodName: "slickPrev"): JQuery;
+
+    /**
+     * Pauses autoplay
+     * @param methodName The name of the method
+     */
+    slick(methodName: "slickPause"): JQuery;
+
+    /**
+     * Starts autoplay
+     * @param methodName The name of the method
+     */
+    slick(methodName: "slickPlay"): JQuery;
+
+    /**
+     * Add a slide. If an index is provided, will add at that index, or before if addBefore is set. If no index is provided,
+     * add to the end or to the beginning if addBefore is set. Accepts HTML String || Object
+     * @param methodName The name of the method
+     * @param html
+     * @param index/div>
+     * @param addBefore
+     */
+    slick(methodName: "slickAdd", html: string | Object, index?: number, addBefore?: number): JQuery;
+
+    /**
+     * Remove slide by index. If removeBefore is set true, remove slide preceding index, or the first slide if no index is specified.
+     * If removeBefore is set to false, remove the slide following index, or the last slide if no index is set.
+     * @param methodName The name of the method
+     * @param index
+     * @param removeBefore
+     */
+    slick(methodName: "slickRemove", index: number, removeBefore?: number): JQuery;
+
+    /**
+     * Filters slides using jQuery .filter()
+     * @param methodName The name of the method
+     * @param selector
+     */
+    slick(methodName : "slickFilter", selector: string): JQuery;
+
+    /**
+     * Filters slides using jQuery .filter()
+     * @param methodName The name of the method
+     * @param func
+     */
+    slick(methodName : "slickFilter", func: (index: number, element: Element) => any): JQuery;
+
+    /**
+     * Removes applied filtering
+     * @param methodName The name of the method
+     * @param index
+     */
+    slick(methodName: "slickUnfilter", index: number): JQuery;
+
+    /**
+     * Sets an individual value live. Set refresh to true if it's a UI update.
+     * @param methodName The name of the method
+     * @param option The option name
+     */
+    slick(methodName: "slickGetOption", option: any): JQuerySlickOptions;
+
+    /**
+     * Sets an individual value live. Set refresh to true if it's a UI update.
+     * @param methodName The name of the method
+     * @param option The option name
+     * @param value depends on option
+     * @param refresh
+     */
+    slick(methodName: "slickSetOption", option: string, value: JQuerySlickOptions, refresh?: boolean): JQuery;
+
+    /**
+     * Deconstructs slick
+     * @param methodName The name of the method
+     */
+    slick(methodName: "unslick"): JQuery;
+
+    /**
+     * Get Slick Object
+     * @param methodName The name of the method
+     */
+    slick(methodName: "getSlick"): Object;
+
+}
diff --git a/slick-carousel/slick-carousel-tests.ts b/slick-carousel/slick-carousel-tests.ts
index 0279f5131e..b7f61a5d2a 100644
--- a/slick-carousel/slick-carousel-tests.ts
+++ b/slick-carousel/slick-carousel-tests.ts
@@ -1,5 +1,5 @@
-///<reference path="../jquery/jquery.d.ts" />
-///<reference path="../slick-carousel/slick-carousel.d.ts" />
+///<reference types="jquery" />
+///<reference types="slick-carousel" />
 
 
 // --------------------------------------------------------
diff --git a/slick-carousel/slick-carousel.d.ts b/slick-carousel/slick-carousel.d.ts
deleted file mode 100644
index c006926f38..0000000000
--- a/slick-carousel/slick-carousel.d.ts
+++ /dev/null
@@ -1,388 +0,0 @@
-// Type definitions for stick 1.5.8
-// Project: http://kenwheeler.github.io/slick/
-// Definitions by: John Gouigouix <https://github.com/orchestra-ts/DefinitelyTyped/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface JQuerySlickOptions {
-
-    /**
-     * Enables tabbing and arrow key navigation
-     * Default: true
-     */
-    accessibility?: boolean;
-
-    /**
-     * Enables adaptive height for single slide horizontal carousels.
-     * Default: false
-     */
-    adaptiveHeight?: boolean;
-
-    /**
-     * Enables Autoplay
-     * Default: false
-     */
-    autoplay?: boolean;
-
-    /**
-     * Autoplay Speed in milliseconds
-     * Default: 3000
-     */
-    autoplaySpeed?: number;
-
-    /**
-     * Prev/Next Arrows
-     * Default: true
-     */
-    arrows?: boolean;
-
-    /**
-     * Set the slider to be the navigation of other slider (Class or ID Name)
-     * Default: null
-     */
-    asNavFor?: string;
-
-    /**
-     * Change where the navigation arrows are attached (Selector, htmlString, Array, Element, jQuery object)
-     * Default: $(element)
-     */
-    appendArrows?: any;
-
-    /**
-     * Allows you to select a node or customize the HTML for the "Previous" arrow.
-     * Default: <button type="button" class="slick-prev">Previous</button>
-     */
-    prevArrow?: string | Object;
-
-    /**
-     * Allows you to select a node or customize the HTML for the "Next" arrow.
-     * Default: <button type="button" class="slick-next">Next</button>
-     */
-    nextArrow?: string | Object;
-
-    /**
-     * Enables centered view with partial prev/next slides. Use with odd numbered slidesToShow counts.
-     * Default: false
-     */
-    centerMode?: boolean;
-
-    /**
-     * Side padding when in center mode (px or %)
-     * Default: '50px'
-     */
-    centerPadding?: string;
-
-    /**
-     * CSS3 Animation Easing
-     * Default: 'ease'
-     */
-    cssEase?: string;
-
-    /**
-     * Custom paging templates. See source for use example.
-     * Default: n/a
-     */
-    customPaging?: (slider: any, i: number) => string;
-
-    /**
-     * Show dot indicators
-     * Default: false
-     */
-    dots?: boolean;
-
-    /**
-     * Enable mouse dragging
-     * Default: true
-     */
-    draggable?: boolean;
-
-    /**
-     * Enable fade
-     * Default: false
-     */
-    fade?: boolean;
-
-    /**
-     * Enable focus on selected element (click)
-     * Default: false
-     */
-    focusOnSelect?: boolean;
-
-    /**
-     * Add easing for jQuery animate. Use with easing libraries or default easing methods
-     * Default: 'linear'
-     */
-    easing?: string;
-
-    /**
-     * Resistance when swiping edges of non-infinite carousels
-     * Default: 0.15
-     */
-    edgeFriction?: number;
-
-    /**
-     * Infinite loop sliding
-     * Default: true
-     */
-    infinite?: boolean;
-
-    /**
-     * Slide to start on
-     * Default: 0
-     */
-    initialSlide?: number;
-
-    /**
-     * Set lazy loading technique. Accepts 'ondemand' or 'progressive'.
-     * Default: 'ondemand'
-     */
-    lazyLoad?: string;
-
-    /**
-     * Responsive settings use mobile first calculation
-     * Default: false
-     */
-    mobileFirst?: boolean;
-
-    /**
-     * Pause Autoplay On Hover
-     * Default: true
-     */
-    pauseOnHover?: boolean;
-
-    /**
-     * Pause Autoplay when a dot is hovered
-     * Default: false
-     */
-    pauseOnDotsHover?: boolean;
-
-    /**
-     * Width that responsive object responds to. Can be 'window', 'slider' or 'min' (the smaller of the two)
-     * Default: 'window'
-     */
-    respondTo?: string;
-
-    /**
-     * Object containing breakpoints and settings objects (see demo).
-     * Enables settings sets at given screen width.
-     * Set settings to "unslick" instead of an object to disable slick at a given breakpoint.
-     * Default: none
-     */
-    responsive?: Object;
-
-    /**
-     * Setting this to more than 1 initializes grid mode. Use slidesPerRow to set how many slides should be in each row.
-     * Default: 1
-     */
-    rows?: number;
-
-    /**
-     * Element query to use as slide
-     * Default: 'div'
-     */
-    slide?: string;
-
-    /**
-     * With grid mode intialized via the rows option, this sets how many slides are in each grid row.
-     * Default: 1
-     */
-    slidesPerRow?: number;
-
-    /**
-     * # of slides to show
-     * Default: 1
-     */
-    slidesToShow?: number;
-
-    /**
-     * # of slides to scroll
-     * Default: 1
-     */
-    slidesToScroll?: number;
-
-    /**
-     * Slide/Fade animation speed (ms)
-     * Default: 300
-     */
-    speed?: number;
-
-    /**
-     * Enable swiping
-     * Default: true
-     */
-    swipe?: boolean;
-
-    /**
-     * Allow users to drag or swipe directly to a slide irrespective of slidesToScroll.
-     * Default: false
-     */
-    swipeToSlide?: boolean;
-
-    /**
-     * Enable slide motion with touch
-     * Default: true
-     */
-    touchMove?: boolean;
-
-    /**
-     * To advance slides, the user must swipe a length of (1/touchThreshold) * the width of the slider.
-     * Default: 5
-     */
-    touchThreshold?: number;
-
-    /**
-     * Enable/Disable CSS Transitions
-     * Default: true
-     */
-    useCSS?: boolean;
-
-    /**
-     * Variable width slides.
-     * Default: false
-     */
-    variableWidth?: boolean;
-
-    /**
-     * Vertical slide mode
-     * Default: false
-     */
-    vertical?: boolean;
-
-    /**
-     * Vertical swipe mode
-     * Default: false
-     */
-    verticalSwiping?: boolean;
-
-    /**
-     * Change the slider's direction to become right-to-left
-     * Default: false
-     */
-    rtl?: boolean;
-
-}
-
-
-interface JQuery {
-
-    /**
-     * Create slick component
-     */
-    slick(): JQuery;
-    slick(options: JQuerySlickOptions): JQuery;
-
-    /**
-     * Trigger non-specialized signature method
-     * @param methodName
-     * @param arg
-     */
-    slick(methodName: string, ...arg: any[]): any;
-
-    /**
-     * Returns the current slide index
-     * @param methodName The name of the method
-     */
-    slick(methodName: "slickCurrentSlide"): number;
-
-    /**
-     * Navigates to a slide by index
-     * @param methodName The name of the method
-     * @param slide
-     * @param animate
-     */
-    slick(methodName: "slickGoTo", slide: number, animate?: boolean): JQuery;
-
-    /**
-     * Navigates to the next slide
-     * @param methodName The name of the method
-     */
-    slick(methodName: "slickNext"): JQuery;
-
-    /**
-     * Navigates to the previous slide
-     * @param methodName The name of the method
-     */
-    slick(methodName: "slickPrev"): JQuery;
-
-    /**
-     * Pauses autoplay
-     * @param methodName The name of the method
-     */
-    slick(methodName: "slickPause"): JQuery;
-
-    /**
-     * Starts autoplay
-     * @param methodName The name of the method
-     */
-    slick(methodName: "slickPlay"): JQuery;
-
-    /**
-     * Add a slide. If an index is provided, will add at that index, or before if addBefore is set. If no index is provided,
-     * add to the end or to the beginning if addBefore is set. Accepts HTML String || Object
-     * @param methodName The name of the method
-     * @param html
-     * @param index/div>
-     * @param addBefore
-     */
-    slick(methodName: "slickAdd", html: string | Object, index?: number, addBefore?: number): JQuery;
-
-    /**
-     * Remove slide by index. If removeBefore is set true, remove slide preceding index, or the first slide if no index is specified.
-     * If removeBefore is set to false, remove the slide following index, or the last slide if no index is set.
-     * @param methodName The name of the method
-     * @param index
-     * @param removeBefore
-     */
-    slick(methodName: "slickRemove", index: number, removeBefore?: number): JQuery;
-
-    /**
-     * Filters slides using jQuery .filter()
-     * @param methodName The name of the method
-     * @param selector
-     */
-    slick(methodName : "slickFilter", selector: string): JQuery;
-
-    /**
-     * Filters slides using jQuery .filter()
-     * @param methodName The name of the method
-     * @param func
-     */
-    slick(methodName : "slickFilter", func: (index: number, element: Element) => any): JQuery;
-
-    /**
-     * Removes applied filtering
-     * @param methodName The name of the method
-     * @param index
-     */
-    slick(methodName: "slickUnfilter", index: number): JQuery;
-
-    /**
-     * Sets an individual value live. Set refresh to true if it's a UI update.
-     * @param methodName The name of the method
-     * @param option The option name
-     */
-    slick(methodName: "slickGetOption", option: any): JQuerySlickOptions;
-
-    /**
-     * Sets an individual value live. Set refresh to true if it's a UI update.
-     * @param methodName The name of the method
-     * @param option The option name
-     * @param value depends on option
-     * @param refresh
-     */
-    slick(methodName: "slickSetOption", option: string, value: JQuerySlickOptions, refresh?: boolean): JQuery;
-
-    /**
-     * Deconstructs slick
-     * @param methodName The name of the method
-     */
-    slick(methodName: "unslick"): JQuery;
-
-    /**
-     * Get Slick Object
-     * @param methodName The name of the method
-     */
-    slick(methodName: "getSlick"): Object;
-
-}
diff --git a/slick-carousel/tsconfig.json b/slick-carousel/tsconfig.json
new file mode 100644
index 0000000000..1c55b0ddc8
--- /dev/null
+++ b/slick-carousel/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "slick-carousel-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/slickgrid/SlickGrid-tests.ts b/slickgrid/SlickGrid-tests.ts
index e267a85948..f77f3dc017 100644
--- a/slickgrid/SlickGrid-tests.ts
+++ b/slickgrid/SlickGrid-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="SlickGrid.d.ts" />
+/// <reference types="jquery" />
+
 
 interface MyData extends Slick.SlickData {
 	title: string;
diff --git a/slickgrid/SlickGrid.d.ts b/slickgrid/SlickGrid.d.ts
deleted file mode 100644
index 9dbdd0e75c..0000000000
--- a/slickgrid/SlickGrid.d.ts
+++ /dev/null
@@ -1,1758 +0,0 @@
-// Type definitions for SlickGrid 2.1.0
-// Project: https://github.com/mleibman/SlickGrid
-// Definitions by: Josh Baldwin <https://github.com/jbaldwin/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/*
-SlickGrid-2.1.d.ts may be freely distributed under the MIT license.
-
-Copyright (c) 2013 Josh Baldwin https://github.com/jbaldwin/SlickGrid.d.ts
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface DOMEvent extends Event {}
-
-declare namespace Slick {
-
-	/**
-	* slick.core.js
-	**/
-
-	/**
-	* An event object for passing data to event handlers and letting them control propagation.
-	* <p>This is pretty much identical to how W3C and jQuery implement events.</p>
-	* @class EventData
-	* @constructor
-	**/
-	export class EventData {
-
-		constructor();
-
-		/***
-		* Stops event from propagating up the DOM tree.
-		* @method stopPropagation
-		*/
-		public stopPropagation(): void;
-
-		/***
-		* Returns whether stopPropagation was called on this event object.
-		* @method isPropagationStopped
-		* @return {Boolean}
-		*/
-		public isPropagationStopped(): boolean;
-
-		/***
-		* Prevents the rest of the handlers from being executed.
-		* @method stopImmediatePropagation
-		*/
-		public stopImmediatePropagation(): void;
-
-		/***
-		* Returns whether stopImmediatePropagation was called on this event object.\
-		* @method isImmediatePropagationStopped
-		* @return {Boolean}
-		*/
-		public isImmediatePropagationStopped(): boolean;
-	}
-
-	/***
-	* A simple publisher-subscriber implementation.
-	* @class Event
-	* @constructor
-	*/
-	export class Event<T> {
-
-		constructor();
-
-		/***
-		* Adds an event handler to be called when the event is fired.
-		* <p>Event handler will receive two arguments - an <code>EventData</code> and the <code>data</code>
-		* object the event was fired with.<p>
-		* @method subscribe
-		* @param fn {Function} Event handler.
-		*/
-		public subscribe(fn: (eventData: EventData, data: T) => any ): void;
-
-		/***
-		* Removes an event handler added with <code>subscribe(fn)</code>.
-		* @method unsubscribe
-		* @param fn {Function} Event handler to be removed.
-		*/
-		public unsubscribe(fn: (eventData: EventData, data: T) => any ): void;
-
-		/***
-		* Fires an event notifying all subscribers.
-		* @method notify
-		* @param args {Object} Additional data object to be passed to all handlers.
-		* @param e {EventData}
-		*      Optional.
-		*      An <code>EventData</code> object to be passed to all handlers.
-		*      For DOM events, an existing W3C/jQuery event object can be passed in.
-		* @param scope {Object}
-		*      Optional.
-		*      The scope ("this") within which the handler will be executed.
-		*      If not specified, the scope will be set to the <code>Event</code> instance.
-		* @return Last run callback result.
-		* @note slick.core.Event.notify shows this method as returning a value, type is unknown.
-		*/
-		public notify(args?: T, e?: EventData, scope?: any): any;
-		public notify(args?: T, e?: DOMEvent, scope?: any): any;
-
-	}
-
-	// todo: is this private? there are no comments in the code
-	export class EventHandler {
-		constructor();
-
-		public subscribe(event: EventData, handler: Function): EventHandler;
-		public unsubscribe(event: EventData, handler: Function): EventHandler;
-		public unsubscribeAll(): EventHandler;
-	}
-
-	/***
-	* A structure containing a range of cells.
-	* @class Range
-	**/
-	export class Range {
-
-		/**
-		* A structure containing a range of cells.
-		* @constructor
-		* @param fromRow {Integer} Starting row.
-		* @param fromCell {Integer} Starting cell.
-		* @param toRow {Integer} Optional. Ending row. Defaults to <code>fromRow</code>.
-		* @param toCell {Integer} Optional. Ending cell. Defaults to <code>fromCell</code>.
-		**/
-		constructor(fromRow: number, fromCell: number, toRow?: number, toCell?: number);
-
-		/***
-		* @property fromRow
-		* @type {Integer}
-		*/
-		public fromRow: number;
-
-		/***
-		* @property fromCell
-		* @type {Integer}
-		*/
-		public fromCell: number;
-
-		/***
-		* @property toRow
-		* @type {Integer}
-		*/
-		public toRow: number;
-
-		/***
-		* @property toCell
-		* @type {Integer}
-		*/
-		public toCell: number;
-
-		/***
-		* Returns whether a range represents a single row.
-		* @method isSingleRow
-		* @return {Boolean}
-		*/
-		public isSingleRow(): boolean;
-
-		/***
-		* Returns whether a range represents a single cell.
-		* @method isSingleCell
-		* @return {Boolean}
-		*/
-		public isSingleCell(): boolean;
-
-		/***
-		* Returns whether a range contains a given cell.
-		* @method contains
-		* @param row {Integer}
-		* @param cell {Integer}
-		* @return {Boolean}
-		*/
-		public contains(row: number, cell: number): boolean;
-
-		/***
-		* Returns a readable representation of a range.
-		* @method toString
-		* @return {String}
-		*/
-		public toString(): string;
-
-	}
-
-	/***
-	* A base class that all special / non-data rows (like Group and GroupTotals) derive from.
-	* @class NonDataItem
-	* @constructor
-	*/
-	export class NonDataRow {
-
-	}
-
-	/***
-	* Information about a group of rows.
-	* @class Group
-	* @extends Slick.NonDataItem
-	* @constructor
-	*/
-	export class Group<T extends SlickData> extends NonDataRow {
-
-		constructor();
-
-		/**
-		* Grouping level, starting with 0.
-		* @property level
-		* @type {Number}
-		*/
-		public level: number;
-
-		/***
-		* Number of rows in the group.
-		* @property count
-		* @type {Integer}
-		*/
-		public count: number;
-
-		/***
-		* Grouping value.
-		* @property value
-		* @type {Object}
-		*/
-		public value: any;
-
-		/***
-		* Formatted display value of the group.
-		* @property title
-		* @type {String}
-		*/
-		public title: string;
-
-		/***
-		* Whether a group is collapsed.
-		* @property collapsed
-		* @type {Boolean}
-		*/
-		public collapsed: boolean;
-
-		/***
-		* GroupTotals, if any.
-		* @property totals
-		* @type {GroupTotals}
-		*/
-		public totals: GroupTotals<T>;
-
-		/**
-		* Rows that are part of the group.
-		* @property rows
-		* @type {Array}
-		*/
-		public rows: T[];
-
-		/**
-		* Sub-groups that are part of the group.
-		* @property groups
-		* @type {Array}
-		*/
-		public groups: Group<T>[];
-
-		/**
-		* A unique key used to identify the group.  This key can be used in calls to DataView
-		* collapseGroup() or expandGroup().
-		* @property groupingKey
-		* @type {Object}
-		*/
-		public groupingKey: any;
-
-		/***
-		* Compares two Group instances.
-		* @method equals
-		* @return {Boolean}
-		* @param group {Group} Group instance to compare to.
-		* todo: this is on the prototype (NonDataRow()) instance, not Group, maybe doesn't matter?
-		*/
-		public equals(group: Group<T>): boolean;
-	}
-
-	/***
-	* Information about group totals.
-	* An instance of GroupTotals will be created for each totals row and passed to the aggregators
-	* so that they can store arbitrary data in it.  That data can later be accessed by group totals
-	* formatters during the display.
-	* @class GroupTotals
-	* @extends Slick.NonDataItem
-	* @constructor
-	*/
-	export class GroupTotals<T> extends NonDataRow {
-
-		constructor();
-
-		/***
-		* Parent Group.
-		* @param group
-		* @type {Group}
-		*/
-		public group: Group<T>;
-
-	}
-
-	/***
-	* A locking helper to track the active edit controller and ensure that only a single controller
-	* can be active at a time.  This prevents a whole class of state and validation synchronization
-	* issues.  An edit controller (such as SlickGrid) can query if an active edit is in progress
-	* and attempt a commit or cancel before proceeding.
-	* @class EditorLock
-	* @constructor
-	*/
-	export class EditorLock<T extends Slick.SlickData> {
-
-		constructor();
-
-		/***
-		* Returns true if a specified edit controller is active (has the edit lock).
-		* If the parameter is not specified, returns true if any edit controller is active.
-		* @method isActive
-		* @param editController {EditController}
-		* @return {Boolean}
-		*/
-		public isActive(editController: Editors.Editor<T>): boolean;
-
-		/***
-		* Sets the specified edit controller as the active edit controller (acquire edit lock).
-		* If another edit controller is already active, and exception will be thrown.
-		* @method activate
-		* @param editController {EditController} edit controller acquiring the lock
-		*/
-		public activate(editController: Editors.Editor<T>): void;
-
-		/***
-		* Unsets the specified edit controller as the active edit controller (release edit lock).
-		* If the specified edit controller is not the active one, an exception will be thrown.
-		* @method deactivate
-		* @param editController {EditController} edit controller releasing the lock
-		*/
-		public deactivate(editController: Editors.Editor<T>): void;
-
-		/***
-		* Attempts to commit the current edit by calling "commitCurrentEdit" method on the active edit
-		* controller and returns whether the commit attempt was successful (commit may fail due to validation
-		* errors, etc.).  Edit controller's "commitCurrentEdit" must return true if the commit has succeeded
-		* and false otherwise.  If no edit controller is active, returns true.
-		* @method commitCurrentEdit
-		* @return {Boolean}
-		*/
-		public commitCurrentEdit(): boolean;
-
-		/***
-		* Attempts to cancel the current edit by calling "cancelCurrentEdit" method on the active edit
-		* controller and returns whether the edit was successfully cancelled.  If no edit controller is
-		* active, returns true.
-		* @method cancelCurrentEdit
-		* @return {Boolean}
-		*/
-		public cancelCurrentEdit(): boolean;
-	}
-
-	/**
-	* A global singleton editor lock.
-	* @class GlobalEditorLock
-	* @static
-	* @constructor
-	**/
-	export var GlobalEditorLock: EditorLock<Slick.SlickData>;
-
-	/**
-	* slick.grid.js
-	**/
-
-	/**
-	* Options which you can apply to the columns objects.
-	**/
-	export interface Column<T extends Slick.SlickData> {
-
-		/**
-		* This accepts a function of the form function(cellNode, row, dataContext, colDef) and is used to post-process the cell's DOM node / nodes
-		* @param cellNode
-		* @param row
-		* @param dataContext
-		* @param colDef
-		* @return
-		**/
-		asyncPostRender?: (cellNode:any, row:any, dataContext:any, colDef:any) => void;
-
-		/**
-		* Used by the the slick.rowMoveManager.js plugin for moving rows. Has no effect without the plugin installed.
-		**/
-		behavior?: any;
-
-		/**
-		* In the "Add New" row, determines whether clicking cells in this column can trigger row addition. If true, clicking on the cell in this column in the "Add New" row will not trigger row addition.
-		**/
-		cannotTriggerInsert?: boolean;
-
-		/**
-		* Accepts a string as a class name, applies that class to every row cell in the column.
-		**/
-		cssClass?: string;
-
-		/**
-		* When set to true, the first user click on the header will do a descending sort. When set to false, the first user click on the header will do an ascending sort.
-		**/
-		defaultSortAsc?: boolean;
-
-		/**
-		* The editor for cell edits {TextEditor, IntegerEditor, DateEditor...} See slick.editors.js
-		**/
-		editor?: any; // typeof Editors.Editor<T>;
-
-		/**
-		* The property name in the data object to pull content from. (This is assumed to be on the root of the data object.)
-		**/
-		field?: string;
-
-		/**
-		* When set to false, clicking on a cell in this column will not select the row for that cell. The cells in this column will also be skipped during tab navigation.
-		**/
-		focusable?: boolean;
-
-		/**
-		* This accepts a function of the form function(row, cell, value, columnDef, dataContext) and returns a formatted version of the data in each cell of this column. For example, setting formatter to function(r, c, v, cd, dc) { return "Hello!"; } would overwrite every value in the column with "Hello!" See defaultFormatter in slick.grid.js for an example formatter.
-		* @param row
-		* @param cell
-		* @param value
-		* @param columnDef
-		* @param dataContext
-		* @return
-		**/
-		formatter?: Formatter<T>;
-
-		/**
-		* Accepts a string as a class name, applies that class to the cell for the column header.
-		**/
-		headerCssClass?: string;
-
-		/**
-		* A unique identifier for the column within the grid.
-		**/
-		id?: string;
-
-		/**
-		* Set the maximum allowable width of this column, in pixels.
-		**/
-		maxWidth?: number;
-
-		/**
-		*  Set the minimum allowable width of this column, in pixels.
-		**/
-		minWidth?: number;
-
-		/**
-		* The text to display on the column heading.
-		**/
-		name?: string;
-
-		/**
-		* If set to true, whenever this column is resized, the entire table view will rerender.
-		**/
-		rerenderOnResize?: boolean;
-
-		/**
-		* If false, column can no longer be resized.
-		**/
-		resizable?: boolean;
-
-		/**
-		* If false, when a row is selected, the CSS class for selected cells ("selected" by default) is not applied to the cell in this column.
-		**/
-		selectable?: boolean;
-
-		/**
-		* If true, the column will be sortable by clicking on the header.
-		**/
-		sortable?: boolean;
-
-		/**
-		* If set to a non-empty string, a tooltip will appear on hover containing the string.
-		**/
-		toolTip?: string;
-
-		/**
-		* Width of the column in pixels. (May often be overridden by things like minWidth, maxWidth, forceFitColumns, etc.)
-		**/
-		width?: number;
-	}
-
-	export interface EditorFactory {
-		getEditor<T>(column: Column<T>): Editors.Editor<T>;
-	}
-
-	export interface FormatterFactory<T extends SlickData> {
-		getFormatter(column: Column<T>): Formatter<any>;
-	}
-
-	export interface GridOptions<T extends SlickData> {
-
-		/**
-		* Makes cell editors load asynchronously after a small delay. This greatly increases keyboard navigation speed.
-		**/
-		asyncEditorLoading?: boolean;
-
-		/**
-		* Delay after which cell editor is loaded. Ignored unless asyncEditorLoading is true.
-		**/
-		asyncEditorLoadDelay?: number;
-
-		/**
-		*
-		**/
-		asyncPostRenderDelay?: number;
-
-		/**
-		* Cell will not automatically go into edit mode when selected.
-		**/
-		autoEdit?: boolean;
-
-		/**
-		*
-		**/
-		autoHeight?: boolean;
-
-		/**
-		* A CSS class to apply to flashing cells via flashCell().
-		**/
-		cellFlashingCssClass?: string;
-
-		/**
-		* A CSS class to apply to cells highlighted via setHighlightedCells().
-		**/
-		cellHighlightCssClass?: string;
-
-		/**
-		*
-		**/
-		dataItemColumnValueExtractor?: any;
-
-		/**
-		*
-		**/
-		defaultColumnWidth?: number;
-
-		/**
-		*
-		**/
-		defaultFormatter?: Formatter<T>;
-
-		/**
-		*
-		**/
-		editable?: boolean;
-
-		/**
-		* Not listed as a default under options in slick.grid.js
-		**/
-		editCommandHandler?: any; // queueAndExecuteCommand
-
-		/**
-		* A factory object responsible to creating an editor for a given cell. Must implement getEditor(column).
-		**/
-		editorFactory?: EditorFactory;
-
-		/**
-		* A Slick.EditorLock instance to use for controlling concurrent data edits.
-		**/
-		editorLock?: EditorLock<T>;
-
-		/**
-		* If true, a blank row will be displayed at the bottom - typing values in that row will add a new one. Must subscribe to onAddNewRow to save values.
-		**/
-		enableAddRow?: boolean;
-
-		/**
-		* If true, async post rendering will occur and asyncPostRender delegates on columns will be called.
-		**/
-		enableAsyncPostRender?: boolean;
-
-		/**
-		* *WARNING*: Not contained in SlickGrid 2.1, may be deprecated
-		**/
-		enableCellRangeSelection?: any;
-
-		/**
-		* Appears to enable cell virtualisation for optimised speed with large datasets
-		**/
-		enableCellNavigation?: boolean;
-
-		/**
-		*
-		**/
-		enableColumnReorder?: boolean;
-
-		/**
-		* *WARNING*: Not contained in SlickGrid 2.1, may be deprecated
-		**/
-		enableRowReordering?: any;
-
-		/**
-		*
-		**/
-		enableTextSelectionOnCells?: boolean;
-
-		/**
-		* @see Example: Explicit Initialization
-		**/
-		explicitInitialization?: boolean;
-
-		/**
-		* Force column sizes to fit into the container (preventing horizontal scrolling). Effectively sets column width to be 1/Number of Columns which on small containers may not be desirable
-		**/
-		forceFitColumns?: boolean;
-
-		/**
-		*
-		**/
-		forceSyncScrolling?: boolean;
-
-		/**
-		* A factory object responsible to creating a formatter for a given cell. Must implement getFormatter(column).
-		**/
-		formatterFactory?: FormatterFactory<T>;
-
-		/**
-		* Will expand the table row divs to the full width of the container, table cell divs will remain aligned to the left
-		**/
-		fullWidthRows?: boolean;
-
-		/**
-		*
-		**/
-		headerRowHeight?: number;
-
-		/**
-		*
-		**/
-		leaveSpaceForNewRows?: boolean;
-
-		/**
-		* @see Example: Multi-Column Sort
-		**/
-		multiColumnSort?: boolean;
-
-		/**
-		*
-		**/
-		multiSelect?: boolean;
-
-		/**
-		*
-		**/
-		rowHeight?: number;
-
-		/**
-		*
-		**/
-		selectedCellCssClass?: string;
-
-		/**
-		*
-		**/
-		showHeaderRow?: boolean;
-
-		/**
-		* If true, the column being resized will change its width as the mouse is dragging the resize handle. If false, the column will resize after mouse drag ends.
-		**/
-		syncColumnCellResize?: boolean;
-
-		/**
-		*
-		**/
-		topPanelHeight?: number;
-	}
-
-	export interface DataProvider<T extends SlickData> {
-		/**
-		 * Returns the number of data items in the set.
-		 */
-		getLength(): number;
-
-		/**
-		 * Returns the item at a given index.
-		 * @param index
-		 */
-		getItem(index: number): T;
-
-		/**
-		 * Returns the metadata for the item at a given index (optional).
-		 * @param index
-		 */
-		getItemMetadata?(index: number): RowMetadata<T>;
-	}
-
-	export interface SlickData {
-		// todo ? might be able to leave as empty
-	}
-
-	export interface RowMetadata<T> {
-		/**
-		 * One or more (space-separated) CSS classes to be added to the entire row.
-		 */
-		cssClasses?: string;
-
-		/**
-		 * Whether or not any cells in the row can be set as "active".
-		 */
-		focusable?: boolean;
-
-		/**
-		 * Whether or not a row or any cells in it can be selected.
-		 */
-		selectable?: boolean;
-
-		/**
-		 * Metadata related to individual columns
-		 */
-		columns?: {
-			/**
-			 * Metadata indexed by column id
-			 */
-			[index: string]: ColumnMetadata<T>;
-			/**
-			 * Metadata indexed by column index
-			 */
-			[index: number]: ColumnMetadata<T>;
-		}
-	}
-
-	export interface ColumnMetadata<T extends SlickData> {
-		/**
-		 * Whether or not a cell can be set as "active".
-		 */
-		focusable?: boolean;
-
-		/**
-		 * Whether or not a cell can be selected.
-		 */
-		selectable?: boolean;
-
-		/**
-		 * A custom cell formatter.
-		 */
-		formatter?: Formatter<T>;
-
-		/**
-		 * A custom cell editor.
-		 */
-		editor?: Slick.Editors.Editor<T>;
-
-		/**
-		 * Number of columns this cell will span. Can also contain "*" to indicate that the cell should span the rest of the row.
-		 */
-		colspan?: number|string;
-	}
-
-	/**
-	* Selecting cells in SlickGrid is handled by a selection model.
-	* Selection models are controllers responsible for handling user interactions and notifying subscribers of the changes in the selection. Selection is represented as an array of Slick.Range objects.
-	* You can get the current selection model from the grid by calling getSelectionModel() and set a different one using setSelectionModel(selectionModel). By default, no selection model is set.
-	* The grid also provides two helper methods to simplify development - getSelectedRows() and setSelectedRows(rowsArray), as well as an onSelectedRowsChanged event.
-	* SlickGrid includes two pre-made selection models - Slick.CellSelectionModel and Slick.RowSelectionModel, but you can easily write a custom one.
-	**/
-	export class SelectionModel<T extends SlickData, E> {
-		/**
-		* An initializer function that will be called with an instance of the grid whenever a selection model is registered with setSelectionModel. The selection model can use this to initialize its state and subscribe to grid events.
-		**/
-		init(grid: Grid<T>): void;
-
-		/**
-		* A destructor function that will be called whenever a selection model is unregistered from the grid by a call to setSelectionModel with another selection model or whenever a grid with this selection model is destroyed. The selection model can use this destructor to unsubscribe from grid events and release all resources (remove DOM nodes, event listeners, etc.).
-		**/
-		destroy(): void;
-
-		onSelectedRangesChanged: Slick.Event<E>;
-	}
-
-	export class Grid<T extends SlickData> {
-
-		/**
-		* Create an instance of the grid.
-		* @param container Container node to create the grid in. This can be a DOM Element, a jQuery node, or a jQuery selector.
-		* @param data Databinding source. This can either be a regular JavaScript array or a custom object exposing getItem(index) and getLength() functions.
-		* @param columns An array of column definition objects. See Column Options for a list of options that can be included on each column definition object.
-		* @param options Additional options.  See Grid Options for a list of options that can be included.
-		**/
-		constructor(
-			container: string|HTMLElement|JQuery,
-			data: T[]|DataProvider<T>,
-			columns: Column<T>[],
-			options: GridOptions<T>);
-
-		// #region Core
-
-		/**
-		* Initializes the grid. Called after plugins are registered. Normally, this is called by the constructor, so you don't need to call it. However, in certain cases you may need to delay the initialization until some other process has finished. In that case, set the explicitInitialization option to true and call the grid.init() manually.
-		**/
-		public init(): void;
-
-		/**
-		* todo: no docs
-		**/
-		public destroy(): void;
-
-		/**
-		* Returns an array of every data object, unless you're using DataView in which case it returns a DataView object.
-		* @return
-		**/
-		public getData(): any;
-		//public getData(): T[];
-		// Issue: typescript limitation, cannot differentiate calls by return type only, so need to cast to DataView or T[].
-		//public getData(): DataView;
-
-		/**
-		* Returns the databinding item at a given position.
-		* @param index Item index.
-		* @return
-		**/
-		public getDataItem(index: number): T;
-
-		/**
-		* Sets a new source for databinding and removes all rendered rows. Note that this doesn't render the new rows - you can follow it with a call to render() to do that.
-		* @param newData New databinding source using a regular JavaScript array..
-		* @param scrollToTop If true, the grid will reset the vertical scroll position to the top of the grid.
-		**/
-		public setData(newData: T[], scrollToTop: boolean): void;
-
-		/**
-		* Sets a new source for databinding and removes all rendered rows. Note that this doesn't render the new rows - you can follow it with a call to render() to do that.
-		* @param newData New databinding source using a custom object exposing getItem(index) and getLength() functions.
-		* @param scrollToTop If true, the grid will reset the vertical scroll position to the top of the grid.
-		**/
-		public setData(newData: DataProvider<T>, scrollToTop: boolean): void;
-
-		/**
-		* Returns the size of the databinding source.
-		* @return
-		**/
-		public getDataLength(): number;
-
-		/**
-		* Returns an object containing all of the Grid options set on the grid. See a list of Grid Options here.
-		* @return
-		**/
-		public getOptions(): GridOptions<any>;
-
-		/**
-		* Returns an array of row indices corresponding to the currently selected rows.
-		* @return
-		**/
-		public getSelectedRows(): number[];
-
-		/**
-		* Returns the current SelectionModel. See here for more information about SelectionModels.
-		* @return
-		**/
-		public getSelectionModel(): SelectionModel<any, any>;
-
-		/**
-		* Extends grid options with a given hash. If an there is an active edit, the grid will attempt to commit the changes and only continue if the attempt succeeds.
-		* @options An object with configuration options.
-		**/
-		public setOptions(options: GridOptions<T>): void;
-
-		/**
-		* Accepts an array of row indices and applies the current selectedCellCssClass to the cells in the row, respecting whether cells have been flagged as selectable.
-		* @param rowsArray An array of row numbers.
-		**/
-		public setSelectedRows(rowsArray: number[]): void;
-
-		/**
-		* Unregisters a current selection model and registers a new one. See the definition of SelectionModel for more information.
-		* @selectionModel A SelectionModel.
-		**/
-		public setSelectionModel(selectionModel: SelectionModel<T, any>): void;		// todo: don't know the type of the event data type
-
-		// #endregion Core
-
-		// #region Columns
-
-		/**
-		* Proportionately resizes all columns to fill available horizontal space. This does not take the cell contents into consideration.
-		**/
-		public autosizeColumns(): void;
-
-		/**
-		* Returns the index of a column with a given id. Since columns can be reordered by the user, this can be used to get the column definition independent of the order:
-		* @param id A column id.
-		* @return
-		**/
-		public getColumnIndex(id: string): number;
-
-		/**
-		* Returns an array of column definitions, containing the option settings for each individual column.
-		* @return
-		**/
-		public getColumns(): Column<T>[];
-
-		/**
-		* Sets grid columns. Column headers will be recreated and all rendered rows will be removed. To rerender the grid (if necessary), call render().
-		* @param columnDefinitions An array of column definitions.
-		**/
-		public setColumns(columnDefinitions: Column<T>[]): void;
-
-		/**
-		* Accepts a columnId string and an ascending boolean. Applies a sort glyph in either ascending or descending form to the header of the column. Note that this does not actually sort the column. It only adds the sort glyph to the header.
-		* @param columnId
-		* @param ascending
-		**/
-		public setSortColumn(columnId: string, ascending: boolean): void;
-
-		/**
-		* Accepts an array of objects in the form [ { columnId: [string], sortAsc: [boolean] }, ... ]. When called, this will apply a sort glyph in either ascending or descending form to the header of each column specified in the array. Note that this does not actually sort the column. It only adds the sort glyph to the header
-		* @param cols
-		**/
-		public setSortColumns(cols: { columnId: string; sortAsc: boolean }[]): void;
-
-		/**
-		* todo: no docs or comments available
-		* @return
-		**/
-		public getSortColumns(): { columnId: string; sortAsc: boolean }[];
-
-		/**
-		* Updates an existing column definition and a corresponding header DOM element with the new title and tooltip.
-		* @param columnId Column id.
-		* @param title New column name.
-		* @param toolTip New column tooltip.
-		**/
-		public updateColumnHeader(columnId: string, title?: string, toolTip?: string): void;
-
-		// #endregion Columns
-
-		// #region Cells
-
-		/**
-		* Adds an "overlay" of CSS classes to cell DOM elements. SlickGrid can have many such overlays associated with different keys and they are frequently used by plugins. For example, SlickGrid uses this method internally to decorate selected cells with selectedCellCssClass (see options).
-		* @param key A unique key you can use in calls to setCellCssStyles and removeCellCssStyles. If a hash with that key has already been set, an exception will be thrown.
-		* @param hash A hash of additional cell CSS classes keyed by row number and then by column id. Multiple CSS classes can be specified and separated by space.
-		* @example
-		* {
-		* 	0:    {
-		* 		"number_column":    "cell-bold",
-		* 		"title_column":     "cell-title cell-highlighted"
-		* 	},
-		* 	4:    {
-		* 		"percent_column":    "cell-highlighted"
-		* 	}
-		* }
-		**/
-		public addCellCssStyles(key: string, hash: CellCssStylesHash): void;
-
-		/**
-		* Returns true if you can click on a given cell and make it the active focus.
-		* @param row A row index.
-		* @param col A column index.
-		* @return
-		**/
-		public canCellBeActive(row: number, col: number): boolean;
-
-		/**
-		* Returns true if selecting the row causes this particular cell to have the selectedCellCssClass applied to it. A cell can be selected if it exists and if it isn't on an empty / "Add New" row and if it is not marked as "unselectable" in the column definition.
-		* @param row A row index.
-		* @param col A column index.
-		* @return
-		**/
-		public canCellBeSelected(row: number, col: number): boolean;
-
-		/**
-		* Attempts to switch the active cell into edit mode. Will throw an error if the cell is set to be not editable. Uses the specified editor, otherwise defaults to any default editor for that given cell.
-		* @param editor A SlickGrid editor (see examples in slick.editors.js).
-		**/
-		public editActiveCell(editor: Editors.Editor<T>): void;
-
-		/**
-		* Flashes the cell twice by toggling the CSS class 4 times.
-		* @param row A row index.
-		* @param cell A column index.
-		* @param speed (optional) - The milliseconds delay between the toggling calls. Defaults to 100 ms.
-		**/
-		public flashCell(row: number, cell: number, speed?: number): void;
-
-		/**
-		* Returns an object representing the coordinates of the currently active cell:
-		* @example
-		* 	{
-		* 	  row: activeRow,
-		* 	  cell: activeCell
-		* 	}
-		* @return
-		**/
-		public getActiveCell(): Cell;
-
-		/**
-		* Returns the DOM element containing the currently active cell. If no cell is active, null is returned.
-		* @return
-		**/
-		public getActiveCellNode(): HTMLElement;
-
-		/**
-		* Returns an object representing information about the active cell's position. All coordinates are absolute and take into consideration the visibility and scrolling position of all ancestors.
-		* @return
-		**/
-		public getActiveCellPosition(): CellPosition;
-
-		/**
-		* Accepts a key name, returns the group of CSS styles defined under that name. See setCellCssStyles for more info.
-		* @param key A string.
-		* @return
-		**/
-		public getCellCssStyles(key: string): CellCssStylesHash;
-
-		/**
-		* Returns the active cell editor. If there is no actively edited cell, null is returned.
-		* @return
-		**/
-		public getCellEditor(): Editors.Editor<any>;
-
-		/**
-		* Returns a hash containing row and cell indexes from a standard W3C/jQuery event.
-		* @param e A standard W3C/jQuery event.
-		* @return
-		**/
-		public getCellFromEvent<T>(e: Event<T>): Cell; // todo: !! Unsure on return type !!
-
-		/**
-		* Returns a hash containing row and cell indexes. Coordinates are relative to the top left corner of the grid beginning with the first row (not including the column headers).
-		* @param x An x coordinate.
-		* @param y A y coordinate.
-		* @return
-		**/
-		public getCellFromPoint(x: number, y: number): Cell; // todo: !! Unsure on return type !!
-
-		/**
-		* Returns a DOM element containing a cell at a given row and cell.
-		* @param row A row index.
-		* @param cell A column index.
-		* @return
-		**/
-		public getCellNode(row: number, cell: number): HTMLElement;
-
-		/**
-		* Returns an object representing information about a cell's position. All coordinates are absolute and take into consideration the visibility and scrolling position of all ancestors.
-		* @param row A row index.
-		* @param cell A column index.
-		* @return
-		**/
-		public getCellNodeBox(row: number, cell: number): CellPosition;
-
-		/**
-		* Accepts a row integer and a cell integer, scrolling the view to the row where row is its row index, and cell is its cell index. Optionally accepts a forceEdit boolean which, if true, will attempt to initiate the edit dialogue for the field in the specified cell.
-		* Unlike setActiveCell, this scrolls the row into the viewport and sets the keyboard focus.
-		* @param row A row index.
-		* @param cell A column index.
-		* @param forceEdit If true, will attempt to initiate the edit dialogue for the field in the specified cell.
-		* @return
-		**/
-		public gotoCell(row: number, cell: number, forceEdit?: boolean): void;
-
-		/**
-		* todo: no docs
-		* @return
-		**/
-		public getTopPanel(): HTMLElement;
-
-		/**
-		* todo: no docs
-		* @param visible
-		**/
-		public setTopPanelVisibility(visible: boolean): void;
-
-		/**
-		* todo: no docs
-		* @param visible
-		**/
-		public setHeaderRowVisibility(visible: boolean): void;
-
-		/**
-		* todo: no docs
-		* @return
-		**/
-		public getHeaderRow(): HTMLElement;
-
-		/**
-		* todo: no docs, return type is probably wrong -> "return $header && $header[0]"
-		* @param columnId
-		* @return
-		**/
-		public getHeaderRowColumn(columnId: string): Column<any>;
-
-		/**
-		* todo: no docs
-		* @return
-		**/
-		public getGridPosition(): CellPosition;
-
-		/**
-		* Switches the active cell one row down skipping unselectable cells. Returns a boolean saying whether it was able to complete or not.
-		* @return
-		**/
-		public navigateDown(): boolean;
-
-		/**
-		* Switches the active cell one cell left skipping unselectable cells. Unline navigatePrev, navigateLeft stops at the first cell of the row. Returns a boolean saying whether it was able to complete or not.
-		* @return
-		**/
-		public navigateLeft(): boolean;
-
-		/**
-		* Tabs over active cell to the next selectable cell. Returns a boolean saying whether it was able to complete or not.
-		* @return
-		**/
-		public navigateNext(): boolean;
-
-		/**
-		* Tabs over active cell to the previous selectable cell. Returns a boolean saying whether it was able to complete or not.
-		* @return
-		**/
-		public navigatePrev(): boolean;
-
-		/**
-		* Switches the active cell one cell right skipping unselectable cells. Unline navigateNext, navigateRight stops at the last cell of the row. Returns a boolean saying whether it was able to complete or not.
-		* @return
-		**/
-		public navigateRight(): boolean;
-
-		/**
-		* Switches the active cell one row up skipping unselectable cells. Returns a boolean saying whether it was able to complete or not.
-		* @return
-		**/
-		public navigateUp(): boolean;
-
-		/**
-		* Removes an "overlay" of CSS classes from cell DOM elements. See setCellCssStyles for more.
-		* @param key A string key.
-		**/
-		public removeCellCssStyles(key: string): void;
-
-		/**
-		* Resets active cell.
-		**/
-		public resetActiveCell(): void;
-
-		/**
-		* Sets an active cell.
-		* @param row A row index.
-		* @param cell A column index.
-		**/
-		public setActiveCell(row: number, cell: number): void;
-
-		/**
-		* Sets CSS classes to specific grid cells by calling removeCellCssStyles(key) followed by addCellCssStyles(key, hash). key is name for this set of styles so you can reference it later - to modify it or remove it, for example. hash is a per-row-index, per-column-name nested hash of CSS classes to apply.
-		* Suppose you have a grid with columns:
-		* ["login", "name", "birthday", "age", "likes_icecream", "favorite_cake"]
-		* ...and you'd like to highlight the "birthday" and "age" columns for people whose birthday is today, in this case, rows at index 0 and 9. (The first and tenth row in the grid).
-		* @param key A string key. Will overwrite any data already associated with this key.
-		* @param hash A hash of additional cell CSS classes keyed by row number and then by column id. Multiple CSS classes can be specified and separated by space.
-		**/
-		public setCellCssStyles(key: string, hash: CellCssStylesHash): void;
-
-		// #endregion Cells
-
-		// #region Events
-
-		public onScroll: Slick.Event<OnScrollEventArgs<T>>;
-		public onSort: Slick.Event<OnSortEventArgs<T>>;
-		public onHeaderMouseEnter: Slick.Event<OnHeaderMouseEventArgs<T>>;
-		public onHeaderMouseLeave: Slick.Event<OnHeaderMouseEventArgs<T>>;
-		public onHeaderContextMenu: Slick.Event<OnHeaderContextMenuEventArgs<T>>;
-		public onHeaderClick: Slick.Event<OnHeaderClickEventArgs<T>>;
-		public onHeaderCellRendered: Slick.Event<OnHeaderCellRenderedEventArgs<T>>;
-		public onBeforeHeaderCellDestroy: Slick.Event<OnBeforeHeaderCellDestroyEventArgs<T>>;
-		public onHeaderRowCellRendered: Slick.Event<OnHeaderRowCellRenderedEventArgs<T>>;
-		public onBeforeHeaderRowCellDestroy: Slick.Event<OnBeforeHeaderRowCellDestroyEventArgs<T>>;
-		public onMouseEnter: Slick.Event<OnMouseEnterEventArgs<T>>;
-		public onMouseLeave: Slick.Event<OnMouseLeaveEventArgs<T>>;
-		public onClick: Slick.Event<OnClickEventArgs<T>>;
-		public onDblClick: Slick.Event<OnDblClickEventArgs<T>>;
-		public onContextMenu: Slick.Event<OnContextMenuEventArgs<T>>;
-		public onKeyDown: Slick.Event<OnKeyDownEventArgs<T>>;
-		public onAddNewRow: Slick.Event<OnAddNewRowEventArgs<T>>;
-		public onValidationError: Slick.Event<OnValidationErrorEventArgs<T>>;
-		public onColumnsReordered: Slick.Event<OnColumnsReorderedEventArgs<T>>;
-		public onColumnsResized: Slick.Event<OnColumnsResizedEventArgs<T>>;
-		public onCellChange: Slick.Event<OnCellChangeEventArgs<T>>;
-		public onBeforeEditCell: Slick.Event<OnBeforeEditCellEventArgs<T>>;
-		public onBeforeCellEditorDestroy: Slick.Event<OnBeforeCellEditorDestroyEventArgs<T>>;
-		public onBeforeDestroy: Slick.Event<OnBeforeDestroyEventArgs<T>>;
-		public onActiveCellChanged: Slick.Event<OnActiveCellChangedEventArgs<T>>;
-		public onActiveCellPositionChanged: Slick.Event<OnActiveCellPositionChangedEventArgs<T>>;
-		public onDragInit: Slick.Event<OnDragInitEventArgs<T>>;
-		public onDragStart: Slick.Event<OnDragStartEventArgs<T>>;
-		public onDrag: Slick.Event<OnDragEventArgs<T>>;
-		public onDragEnd: Slick.Event<OnDragEndEventArgs<T>>;
-		public onSelectedRowsChanged: Slick.Event<OnSelectedRowsChangedEventArgs<T>>;
-		public onCellCssStylesChanged: Slick.Event<OnCellCssStylesChangedEventArgs<T>>;
-		public onViewportChanged: Slick.Event<OnViewportChangedEventArgs<T>>;
-		// #endregion Events
-
-		// #region Plugins
-
-		public registerPlugin(plugin: Plugin<T>): void;
-		public unregisterPlugin(plugin: Plugin<T>): void;
-
-		// #endregion Plugins
-
-		// #region Rendering
-
-		public render(): void;
-		public invalidate(): void;
-		public invalidateRow(row: number): void;
-		public invalidateRows(rows: number[]): void;
-		public invalidateAllRows(): void;
-		public updateCell(row: number, cell: number): void;
-		public updateRow(row: number): void;
-		public getViewport(viewportTop?: number, viewportLeft?: number): Viewport;
-		public getRenderedRange(viewportTop?: number, viewportLeft?: number): Viewport;
-		public resizeCanvas(): void;
-		public updateRowCount(): void;
-		public scrollRowIntoView(row: number, doPaging: boolean): void;
-		public scrollRowToTop(row: number): void;
-		public scrollCellIntoView(row: number, cell: number, doPaging: boolean): void;
-		public getCanvasNode(): HTMLCanvasElement;
-		public focus(): void;
-
-		// #endregion Rendering
-
-		// #region Editors
-
-		public getEditorLock(): EditorLock<any>;
-		public getEditController(): { commitCurrentEdit():boolean; cancelCurrentEdit():boolean; };
-
-		// #endregion Editors
-	}
-
-	export interface GridEventArgs<T extends SlickData> {
-		grid: Grid<T>;
-	}
-
-	export interface OnCellCssStylesChangedEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		key: string;
-		hash: CellCssStylesHash;
-	}
-
-	export interface OnSelectedRowsChangedEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		rows: number[];
-	}
-
-	export interface OnDragEndEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		// todo: need to understand $canvas drag event parameter's 'dd' object
-		// the documentation is not enlightening
-	}
-
-	export interface OnDragEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		// todo: need to understand $canvas drag event parameter's 'dd' object
-		// the documentation is not enlightening
-	}
-
-	export interface OnDragStartEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		// todo: need to understand $canvas drag event parameter's 'dd' object
-		// the documentation is not enlightening
-	}
-
-	export interface OnDragInitEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		// todo: need to understand $canvas drag event parameter's 'dd' object
-		// the documentation is not enlightening
-	}
-
-	export interface OnActiveCellPositionChangedEventArgs<T extends SlickData> extends GridEventArgs<T> {
-
-	}
-
-	export interface OnActiveCellChangedEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		row: number;
-		cell: number;
-	}
-
-	export interface OnBeforeDestroyEventArgs<T extends SlickData> extends GridEventArgs<T> {
-
-	}
-
-	export interface OnBeforeCellEditorDestroyEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		editor: Editors.Editor<T>;
-	}
-
-	export interface OnBeforeEditCellEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		row: number;
-		cell: number;
-		item: T;
-		column: Column<T>;
-	}
-
-	export interface OnCellChangeEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		row: number;
-		cell: number;
-		item: T;
-	}
-
-	export interface OnColumnsResizedEventArgs<T extends SlickData> extends GridEventArgs<T> {
-
-	}
-
-	export interface OnColumnsReorderedEventArgs<T extends SlickData> extends GridEventArgs<T> {
-
-	}
-
-	export interface OnValidationErrorEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		editor: Editors.Editor<T>;
-		cellNode: HTMLElement;
-		validationResults: ValidateResults;
-		row: number;
-		cell: number;
-		column: Column<T>;
-	}
-
-	export interface OnAddNewRowEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		item: T;
-		column: Column<T>;
-	}
-
-	export interface OnKeyDownEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		row: number;
-		cell: number;
-	}
-
-	export interface OnContextMenuEventArgs<T extends SlickData> extends GridEventArgs<T> {
-
-	}
-
-	export interface OnDblClickEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		row: number;
-		cell: number;
-	}
-
-	export interface OnClickEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		row: number;
-		cell: number;
-	}
-
-	export interface OnMouseLeaveEventArgs<T extends SlickData> extends GridEventArgs<T> {
-
-	}
-
-	export interface OnMouseEnterEventArgs<T extends SlickData> extends GridEventArgs<T> {
-
-	}
-
-	export interface OnBeforeHeaderRowCellDestroyEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		node: HTMLElement; // todo: might be JQuery instance
-		column: Column<T>;
-	}
-
-	export interface OnHeaderRowCellRenderedEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		node: HTMLElement; // todo: might be JQuery instance
-		column: Column<T>;
-	}
-
-	export interface OnBeforeHeaderCellDestroyEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		node: HTMLElement; // todo: might be JQuery instance
-		column: Column<T>;
-	}
-
-	export interface OnHeaderCellRenderedEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		node: HTMLElement;	// todo: might be JQuery instance
-		column: Column<T>;
-	}
-
-	export interface OnHeaderClickEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		column: Column<T>;
-	}
-
-	export interface OnHeaderContextMenuEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		column: Column<T>;
-	}
-
-	export interface OnHeaderMouseEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		column: Column<T>;
-	}
-
-	export interface OnSortEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		multiColumnSort: boolean;
-		sortCol?: SortColumn<T>;
-		sortCols?: SortColumn<T>[];
-		sortAsc: boolean;
-	}
-
-	export interface OnScrollEventArgs<T extends SlickData> extends GridEventArgs<T> {
-		scrollLeft: number;
-		scrollTop: number;
-	}
-
-	export interface OnViewportChangedEventArgs<T extends SlickData> extends GridEventArgs<T> {
-
-	}
-
-	export interface SortColumn<T extends SlickData> {
-		sortCol: Column<T>;
-		sortAsc: boolean;
-	}
-
-	export interface Cell {
-		row: number;
-		cell: number;
-	}
-
-	export interface CellPosition extends Position {
-		bottom: number;
-		height: number;
-		right: number;
-		visible: boolean;
-		width: number;
-	}
-
-	export interface Position {
-		top: number;
-		left: number;
-	}
-
-	export interface CellCssStylesHash {
-		[index: number]: {
-			[id: string]: string;
-		}
-	}
-
-	export interface Viewport {
-		top: number;
-		bottom: number;
-		leftPx: number;
-		rightPx: number;
-	}
-
-	export interface ValidateResults {
-		valid: boolean;
-		msg: string;
-	}
-
-	export module Editors {
-
-		export interface EditorOptions<T extends Slick.SlickData> {
-			column: Column<T>;
-			container: HTMLElement;
-			grid: Grid<T>;
-		}
-
-		export class Editor<T extends Slick.SlickData> {
-			constructor(args: EditorOptions<T>);
-			public init(): void;
-			public destroy(): void;
-			public focus(): void;
-			public loadValue(item:any): void; // todo: typeof(item)
-			public applyValue(item:any, state: string): void; // todo: typeof(item)
-			public isValueChanged(): boolean;
-			public serializeValue(): any;
-			public validate(): ValidateResults;
-		}
-
-		export class Text<T extends Slick.SlickData> extends Editor<T> {
-			constructor(args: EditorOptions<T>);
-
-			public getValue(): string;
-			public setValue(val: string): void;
-			public serializeValue(): string;
-		}
-
-		export class Integer<T extends Slick.SlickData> extends Editor<T> {
-			constructor(args: EditorOptions<T>);
-
-			public serializeValue(): number;
-		}
-
-		export class Date<T extends Slick.SlickData> extends Editor<T> {
-			constructor(args: EditorOptions<T>);
-
-			public show(): void;
-			public hide(): void;
-			public position(position: Position): void;
-			public serializeValue(): string;
-		}
-
-		export class YesNoSelect<T extends Slick.SlickData> extends Editor<T> {
-			constructor(args: EditorOptions<T>);
-
-			public serializeValue(): boolean;
-		}
-
-		export class Checkbox<T extends Slick.SlickData> extends Editor<T> {
-			constructor(args: EditorOptions<T>);
-
-			public serializeValue(): boolean;
-
-		}
-		export class PercentComplete<T extends Slick.SlickData> extends Editor<T> {
-			constructor(args: EditorOptions<T>);
-
-			public serializeValue(): number;
-		}
-
-		export class LongText<T extends Slick.SlickData> extends Editor<T> {
-			constructor(args: EditorOptions<T>);
-
-			public handleKeyDown(e: DOMEvent): void;
-			public save(): void;
-			public cancel(): void;
-			public hide(): void;
-			public show(): void;
-			public position(position: Position): void;
-			public serializeValue(): string;
-		}
-	}
-
-	export interface Formatter<T extends SlickData> {
-        (row: number, cell: number, value: any, columnDef: Column<T>, dataContext: SlickData): string;
-	}
-
-	export module Formatters {
-		var PercentComplete: Formatter<Slick.SlickData>;
-		var PercentCompleteBar: Formatter<Slick.SlickData>;
-		var YesNo: Formatter<Slick.SlickData>;
-		var Checkmark: Formatter<Slick.SlickData>;
-	}
-
-	export module Data {
-
-		export interface DataViewOptions<T extends Slick.SlickData> {
-			groupItemMetadataProvider?: GroupItemMetadataProvider<T>;
-			inlineFilters?: boolean;
-		}
-
-		/**
-		* Item -> Data by index
-		* Row -> Data by row
-		**/
-		export class DataView<T extends Slick.SlickData> implements DataProvider<T> {
-
-			constructor(options?: DataViewOptions<T>);
-
-			public beginUpdate(): void;
-			public endUpdate(): void;
-			public setPagingOptions(args: PagingOptions): void;
-			public getPagingInfo(): PagingOptions;
-			public getItems(): T[];
-			public setItems(data: T[], objectIdProperty?: string): void;
-			public setFilter(filterFn: (item: T, args:any) => boolean): void;	// todo: typeof(args)
-			public sort(comparer: Function, ascending: boolean): void;		// todo: typeof(comparer), should be the same callback as Array.sort
-			public fastSort(field: string, ascending: boolean): void;
-			public fastSort(field: Function, ascending: boolean): void;		// todo: typeof(field), should be the same callback as Array.sort
-			public reSort(): void;
-			public setGrouping(groupingInfos: GroupingOptions<T> | GroupingOptions<T>[]): void;
-			public getGrouping(): GroupingOptions<T>[];
-
-			/**
-			* @deprecated
-			**/
-			public groupBy(valueGetter:any, valueFormatter:any, sortComparer:any): void;
-
-			/**
-			* @deprecated
-			**/
-			public setAggregators(groupAggregators:any, includeCollapsed:any): void;
-
-			/**
-			* @param level Optional level to collapse.  If not specified, applies to all levels.
-			**/
-			public collapseAllGroups(level?: number): void;
-
-			/**
-			* @param level Optional level to collapse.  If not specified, applies to all levels.
-			**/
-			public expandAllGroups(level?: number): void;
-
-			/**
-			* @param varArgs Either a Slick.Group's "groupingKey" property, or a
-			*     variable argument list of grouping values denoting a unique path to the row.  For
-			*     example, calling collapseGroup('high', '10%') will collapse the '10%' subgroup of
-			*     the 'high' setGrouping.
-			*/
-			public collapseGroup(...varArgs: string[]): void;
-
-			/**
-			* @param varArgs Either a Slick.Group's "groupingKey" property, or a
-			*     variable argument list of grouping values denoting a unique path to the row.  For
-			*     example, calling expandGroup('high', '10%') will expand the '10%' subgroup of
-			*     the 'high' setGrouping.
-			*/
-			public expandGroup(...varArgs: string[]): void;
-			public getGroups(): Group<T>[];
-			public getIdxById(id: string): number;
-			public getRowById(id: string): number;
-			public getItemById(id: any): T;
-			public getItemByIdx(idx: number): T;
-			public mapRowsToIds(rowArray: T[]): string[];
-			public setRefreshHints(hints: RefreshHints): void;
-			public setFilterArgs(args: any): void;
-			public refresh(): void;
-			public updateItem(id: string, item: T): void;
-			public insertItem(insertBefore: number, item: T): void;
-			public addItem(item: T): void;
-			public deleteItem(id: string): void;
-			public syncGridSelection(grid: Grid<T>, preserveHidden: boolean): void;
-			public syncGridCellCssStyles(grid: Grid<T>, key: string): void;
-
-			public getLength(): number;
-			public getItem(index: number): T;
-			public getItemMetadata(index: number): RowMetadata<T>;
-
-			public onRowCountChanged: Slick.Event<OnRowCountChangedEventData>;
-			public onRowsChanged: Slick.Event<OnRowsChangedEventData>;
-			public onPagingInfoChanged: Slick.Event<OnPagingInfoChangedEventData>;
-		}
-
-		export interface GroupingOptions<T> {
-			getter?: ((item?: T) => any) | string;
-			formatter?: (item?: T) => string;
-			comparer?: (a: Group<T>, b: Group<T>) => number;
-			predefinedValues?: any[];	// todo
-			aggregators?: Aggregators.Aggregator<T>[];
-			aggregateEmpty?: boolean;
-			aggregateCollapsed?: boolean;
-			aggregateChildGroups?: boolean;
-			collapsed?: boolean;
-			displayTotalsRow?: boolean;
-		}
-
-		export interface PagingOptions {
-			pageSize?: number;
-			pageNum?: number;
-			totalRows?: number;
-			totalPages?: number;
-		}
-
-		export interface RefreshHints {
-			isFilterNarrowing?: boolean;
-			isFilterExpanding?: boolean;
-			isFilterUnchanged?: boolean;
-			ignoreDiffsBefore?: boolean;
-			ignoreDiffsAfter?: boolean;
-		}
-
-		export interface OnRowCountChangedEventData {
-			// empty
-		}
-		export interface OnRowsChangedEventData {
-			rows: number[];
-		}
-		export interface OnPagingInfoChangedEventData extends PagingOptions {
-
-		}
-
-		export module Aggregators {
-			export class Aggregator<T extends Slick.SlickData> {
-				public field: string;
-				public init(): void;
-				public accumulate(item: T): void;
-				public storeResult(groupTotals: GroupTotals<T>): void;
-			}
-
-			export class Avg<T> extends Aggregator<T> {
-
-			}
-
-			export class Min<T> extends Aggregator<T> {
-
-			}
-
-			export class Max<T> extends Aggregator<T> {
-
-			}
-
-			export class Sum<T> extends Aggregator<T> {
-
-			}
-		}
-
-		/***
-		* Provides item metadata for group (Slick.Group) and totals (Slick.Totals) rows produced by the DataView.
-		* This metadata overrides the default behavior and formatting of those rows so that they appear and function
-		* correctly when processed by the grid.
-		*
-		* This class also acts as a grid plugin providing event handlers to expand & collapse groups.
-		* If "grid.registerPlugin(...)" is not called, expand & collapse will not work.
-		*
-		* @class GroupItemMetadataProvider
-		* @module Data
-		* @namespace Slick.Data
-		* @constructor
-		* @param options
-		*/
-		export class GroupItemMetadataProvider<T extends Slick.SlickData> {
-			public init(): void;
-			public destroy(): void;
-			public getGroupRowMetadata(item?: Group<T>): RowMetadata<T>;
-			public getTotalsRowMetadata(item?: GroupTotals<T>): RowMetadata<T>;
-		}
-
-		export interface GroupItemMetadataProviderOptions {
-			groupCssClass?: string;
-			groupTitleCssClass?: string;
-			totalsCssClass?: string;
-			groupFocusable?: boolean;
-			totalsFocusable?: boolean;
-			toggleCssClass?: string;
-			toggleExpandedCssCass?: string;
-			toggleCollapsedCssClass?: string;
-			enableExpandCollapse?: boolean;
-		}
-
-		//export class RemoteModel {
-		//	public data: any;
-
-		//	public clear(): any;
-		//	public isDataLoaded(): any;
-		//	public ensureData(): any;
-		//	public reloadData(): any;
-		//	public setSort(): any;
-		//	public setSearch(): any;
-
-		//	public onDataLoading: Slick.Event<OnDataLoadingEventData>;
-		//	public onDataLoaded: Slick.Event<OnDataLoadedEventData>;
-
-		//}
-
-		//export interface OnDataLoadingEventData {
-
-		//}
-
-		//export interface OnDataLoadedEventData {
-
-		//}
-	}
-
-	export class Plugin<T extends Slick.SlickData> {
-
-		constructor(options?: PluginOptions);
-		public init(grid: Grid<T>): void;
-		public destroy(): void;
-	}
-
-	export interface PluginOptions {
-		// extend your plugin options here
-	}
-
-}
diff --git a/slickgrid/index.d.ts b/slickgrid/index.d.ts
new file mode 100644
index 0000000000..507247c675
--- /dev/null
+++ b/slickgrid/index.d.ts
@@ -0,0 +1,1762 @@
+// Type definitions for SlickGrid 2.1.0
+// Project: https://github.com/mleibman/SlickGrid
+// Definitions by: Josh Baldwin <https://github.com/jbaldwin/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*
+SlickGrid-2.1.d.ts may be freely distributed under the MIT license.
+
+Copyright (c) 2013 Josh Baldwin https://github.com/jbaldwin/SlickGrid.d.ts
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+/// <reference types="jquery" />
+
+interface DOMEvent extends Event {}
+
+declare namespace Slick {
+
+	/**
+	* slick.core.js
+	**/
+
+	/**
+	* An event object for passing data to event handlers and letting them control propagation.
+	* <p>This is pretty much identical to how W3C and jQuery implement events.</p>
+	* @class EventData
+	* @constructor
+	**/
+	export class EventData {
+
+		constructor();
+
+		/***
+		* Stops event from propagating up the DOM tree.
+		* @method stopPropagation
+		*/
+		public stopPropagation(): void;
+
+		/***
+		* Returns whether stopPropagation was called on this event object.
+		* @method isPropagationStopped
+		* @return {Boolean}
+		*/
+		public isPropagationStopped(): boolean;
+
+		/***
+		* Prevents the rest of the handlers from being executed.
+		* @method stopImmediatePropagation
+		*/
+		public stopImmediatePropagation(): void;
+
+		/***
+		* Returns whether stopImmediatePropagation was called on this event object.\
+		* @method isImmediatePropagationStopped
+		* @return {Boolean}
+		*/
+		public isImmediatePropagationStopped(): boolean;
+	}
+
+	/***
+	* A simple publisher-subscriber implementation.
+	* @class Event
+	* @constructor
+	*/
+	export class Event<T> {
+
+		constructor();
+
+		/***
+		* Adds an event handler to be called when the event is fired.
+		* <p>Event handler will receive two arguments - an <code>EventData</code> and the <code>data</code>
+		* object the event was fired with.<p>
+		* @method subscribe
+		* @param fn {Function} Event handler.
+		*/
+		public subscribe(fn: (eventData: EventData, data: T) => any ): void;
+
+		/***
+		* Removes an event handler added with <code>subscribe(fn)</code>.
+		* @method unsubscribe
+		* @param fn {Function} Event handler to be removed.
+		*/
+		public unsubscribe(fn: (eventData: EventData, data: T) => any ): void;
+
+		/***
+		* Fires an event notifying all subscribers.
+		* @method notify
+		* @param args {Object} Additional data object to be passed to all handlers.
+		* @param e {EventData}
+		*      Optional.
+		*      An <code>EventData</code> object to be passed to all handlers.
+		*      For DOM events, an existing W3C/jQuery event object can be passed in.
+		* @param scope {Object}
+		*      Optional.
+		*      The scope ("this") within which the handler will be executed.
+		*      If not specified, the scope will be set to the <code>Event</code> instance.
+		* @return Last run callback result.
+		* @note slick.core.Event.notify shows this method as returning a value, type is unknown.
+		*/
+		public notify(args?: T, e?: EventData, scope?: any): any;
+		public notify(args?: T, e?: DOMEvent, scope?: any): any;
+
+	}
+
+	// todo: is this private? there are no comments in the code
+	export class EventHandler {
+		constructor();
+
+		public subscribe(event: EventData, handler: Function): EventHandler;
+		public unsubscribe(event: EventData, handler: Function): EventHandler;
+		public unsubscribeAll(): EventHandler;
+	}
+
+	/***
+	* A structure containing a range of cells.
+	* @class Range
+	**/
+	export class Range {
+
+		/**
+		* A structure containing a range of cells.
+		* @constructor
+		* @param fromRow {Integer} Starting row.
+		* @param fromCell {Integer} Starting cell.
+		* @param toRow {Integer} Optional. Ending row. Defaults to <code>fromRow</code>.
+		* @param toCell {Integer} Optional. Ending cell. Defaults to <code>fromCell</code>.
+		**/
+		constructor(fromRow: number, fromCell: number, toRow?: number, toCell?: number);
+
+		/***
+		* @property fromRow
+		* @type {Integer}
+		*/
+		public fromRow: number;
+
+		/***
+		* @property fromCell
+		* @type {Integer}
+		*/
+		public fromCell: number;
+
+		/***
+		* @property toRow
+		* @type {Integer}
+		*/
+		public toRow: number;
+
+		/***
+		* @property toCell
+		* @type {Integer}
+		*/
+		public toCell: number;
+
+		/***
+		* Returns whether a range represents a single row.
+		* @method isSingleRow
+		* @return {Boolean}
+		*/
+		public isSingleRow(): boolean;
+
+		/***
+		* Returns whether a range represents a single cell.
+		* @method isSingleCell
+		* @return {Boolean}
+		*/
+		public isSingleCell(): boolean;
+
+		/***
+		* Returns whether a range contains a given cell.
+		* @method contains
+		* @param row {Integer}
+		* @param cell {Integer}
+		* @return {Boolean}
+		*/
+		public contains(row: number, cell: number): boolean;
+
+		/***
+		* Returns a readable representation of a range.
+		* @method toString
+		* @return {String}
+		*/
+		public toString(): string;
+
+	}
+
+	/***
+	* A base class that all special / non-data rows (like Group and GroupTotals) derive from.
+	* @class NonDataItem
+	* @constructor
+	*/
+	export class NonDataRow {
+
+	}
+
+	/***
+	* Information about a group of rows.
+	* @class Group
+	* @extends Slick.NonDataItem
+	* @constructor
+	*/
+	export class Group<T extends SlickData> extends NonDataRow {
+
+		constructor();
+
+		/**
+		* Grouping level, starting with 0.
+		* @property level
+		* @type {Number}
+		*/
+		public level: number;
+
+		/***
+		* Number of rows in the group.
+		* @property count
+		* @type {Integer}
+		*/
+		public count: number;
+
+		/***
+		* Grouping value.
+		* @property value
+		* @type {Object}
+		*/
+		public value: any;
+
+		/***
+		* Formatted display value of the group.
+		* @property title
+		* @type {String}
+		*/
+		public title: string;
+
+		/***
+		* Whether a group is collapsed.
+		* @property collapsed
+		* @type {Boolean}
+		*/
+		public collapsed: boolean;
+
+		/***
+		* GroupTotals, if any.
+		* @property totals
+		* @type {GroupTotals}
+		*/
+		public totals: GroupTotals<T>;
+
+		/**
+		* Rows that are part of the group.
+		* @property rows
+		* @type {Array}
+		*/
+		public rows: T[];
+
+		/**
+		* Sub-groups that are part of the group.
+		* @property groups
+		* @type {Array}
+		*/
+		public groups: Group<T>[];
+
+		/**
+		* A unique key used to identify the group.  This key can be used in calls to DataView
+		* collapseGroup() or expandGroup().
+		* @property groupingKey
+		* @type {Object}
+		*/
+		public groupingKey: any;
+
+		/***
+		* Compares two Group instances.
+		* @method equals
+		* @return {Boolean}
+		* @param group {Group} Group instance to compare to.
+		* todo: this is on the prototype (NonDataRow()) instance, not Group, maybe doesn't matter?
+		*/
+		public equals(group: Group<T>): boolean;
+	}
+
+	/***
+	* Information about group totals.
+	* An instance of GroupTotals will be created for each totals row and passed to the aggregators
+	* so that they can store arbitrary data in it.  That data can later be accessed by group totals
+	* formatters during the display.
+	* @class GroupTotals
+	* @extends Slick.NonDataItem
+	* @constructor
+	*/
+	export class GroupTotals<T> extends NonDataRow {
+
+		constructor();
+
+		/***
+		* Parent Group.
+		* @param group
+		* @type {Group}
+		*/
+		public group: Group<T>;
+
+	}
+
+	/***
+	* A locking helper to track the active edit controller and ensure that only a single controller
+	* can be active at a time.  This prevents a whole class of state and validation synchronization
+	* issues.  An edit controller (such as SlickGrid) can query if an active edit is in progress
+	* and attempt a commit or cancel before proceeding.
+	* @class EditorLock
+	* @constructor
+	*/
+	export class EditorLock<T extends Slick.SlickData> {
+
+		constructor();
+
+		/***
+		* Returns true if a specified edit controller is active (has the edit lock).
+		* If the parameter is not specified, returns true if any edit controller is active.
+		* @method isActive
+		* @param editController {EditController}
+		* @return {Boolean}
+		*/
+		public isActive(editController: Editors.Editor<T>): boolean;
+
+		/***
+		* Sets the specified edit controller as the active edit controller (acquire edit lock).
+		* If another edit controller is already active, and exception will be thrown.
+		* @method activate
+		* @param editController {EditController} edit controller acquiring the lock
+		*/
+		public activate(editController: Editors.Editor<T>): void;
+
+		/***
+		* Unsets the specified edit controller as the active edit controller (release edit lock).
+		* If the specified edit controller is not the active one, an exception will be thrown.
+		* @method deactivate
+		* @param editController {EditController} edit controller releasing the lock
+		*/
+		public deactivate(editController: Editors.Editor<T>): void;
+
+		/***
+		* Attempts to commit the current edit by calling "commitCurrentEdit" method on the active edit
+		* controller and returns whether the commit attempt was successful (commit may fail due to validation
+		* errors, etc.).  Edit controller's "commitCurrentEdit" must return true if the commit has succeeded
+		* and false otherwise.  If no edit controller is active, returns true.
+		* @method commitCurrentEdit
+		* @return {Boolean}
+		*/
+		public commitCurrentEdit(): boolean;
+
+		/***
+		* Attempts to cancel the current edit by calling "cancelCurrentEdit" method on the active edit
+		* controller and returns whether the edit was successfully cancelled.  If no edit controller is
+		* active, returns true.
+		* @method cancelCurrentEdit
+		* @return {Boolean}
+		*/
+		public cancelCurrentEdit(): boolean;
+	}
+
+	/**
+	* A global singleton editor lock.
+	* @class GlobalEditorLock
+	* @static
+	* @constructor
+	**/
+	export var GlobalEditorLock: EditorLock<Slick.SlickData>;
+
+	/**
+	* slick.grid.js
+	**/
+
+	/**
+	* Options which you can apply to the columns objects.
+	**/
+	export interface Column<T extends Slick.SlickData> {
+
+		/**
+		* This accepts a function of the form function(cellNode, row, dataContext, colDef) and is used to post-process the cell's DOM node / nodes
+		* @param cellNode
+		* @param row
+		* @param dataContext
+		* @param colDef
+		* @return
+		**/
+		asyncPostRender?: (cellNode:any, row:any, dataContext:any, colDef:any) => void;
+
+		/**
+		* Used by the the slick.rowMoveManager.js plugin for moving rows. Has no effect without the plugin installed.
+		**/
+		behavior?: any;
+
+		/**
+		* In the "Add New" row, determines whether clicking cells in this column can trigger row addition. If true, clicking on the cell in this column in the "Add New" row will not trigger row addition.
+		**/
+		cannotTriggerInsert?: boolean;
+
+		/**
+		* Accepts a string as a class name, applies that class to every row cell in the column.
+		**/
+		cssClass?: string;
+
+		/**
+		* When set to true, the first user click on the header will do a descending sort. When set to false, the first user click on the header will do an ascending sort.
+		**/
+		defaultSortAsc?: boolean;
+
+		/**
+		* The editor for cell edits {TextEditor, IntegerEditor, DateEditor...} See slick.editors.js
+		**/
+		editor?: any; // typeof Editors.Editor<T>;
+
+		/**
+		* The property name in the data object to pull content from. (This is assumed to be on the root of the data object.)
+		**/
+		field?: string;
+
+		/**
+		* When set to false, clicking on a cell in this column will not select the row for that cell. The cells in this column will also be skipped during tab navigation.
+		**/
+		focusable?: boolean;
+
+		/**
+		* This accepts a function of the form function(row, cell, value, columnDef, dataContext) and returns a formatted version of the data in each cell of this column. For example, setting formatter to function(r, c, v, cd, dc) { return "Hello!"; } would overwrite every value in the column with "Hello!" See defaultFormatter in slick.grid.js for an example formatter.
+		* @param row
+		* @param cell
+		* @param value
+		* @param columnDef
+		* @param dataContext
+		* @return
+		**/
+		formatter?: Formatter<T>;
+
+		/**
+		* Accepts a string as a class name, applies that class to the cell for the column header.
+		**/
+		headerCssClass?: string;
+
+		/**
+		* A unique identifier for the column within the grid.
+		**/
+		id?: string;
+
+		/**
+		* Set the maximum allowable width of this column, in pixels.
+		**/
+		maxWidth?: number;
+
+		/**
+		*  Set the minimum allowable width of this column, in pixels.
+		**/
+		minWidth?: number;
+
+		/**
+		* The text to display on the column heading.
+		**/
+		name?: string;
+
+		/**
+		* If set to true, whenever this column is resized, the entire table view will rerender.
+		**/
+		rerenderOnResize?: boolean;
+
+		/**
+		* If false, column can no longer be resized.
+		**/
+		resizable?: boolean;
+
+		/**
+		* If false, when a row is selected, the CSS class for selected cells ("selected" by default) is not applied to the cell in this column.
+		**/
+		selectable?: boolean;
+
+		/**
+		* If true, the column will be sortable by clicking on the header.
+		**/
+		sortable?: boolean;
+
+		/**
+		* If set to a non-empty string, a tooltip will appear on hover containing the string.
+		**/
+		toolTip?: string;
+
+		/**
+		* Width of the column in pixels. (May often be overridden by things like minWidth, maxWidth, forceFitColumns, etc.)
+		**/
+		width?: number;
+	}
+
+	export interface EditorFactory {
+		getEditor<T>(column: Column<T>): Editors.Editor<T>;
+	}
+
+	export interface FormatterFactory<T extends SlickData> {
+		getFormatter(column: Column<T>): Formatter<any>;
+	}
+
+	export interface GridOptions<T extends SlickData> {
+
+		/**
+		* Makes cell editors load asynchronously after a small delay. This greatly increases keyboard navigation speed.
+		**/
+		asyncEditorLoading?: boolean;
+
+		/**
+		* Delay after which cell editor is loaded. Ignored unless asyncEditorLoading is true.
+		**/
+		asyncEditorLoadDelay?: number;
+
+		/**
+		*
+		**/
+		asyncPostRenderDelay?: number;
+
+		/**
+		* Cell will not automatically go into edit mode when selected.
+		**/
+		autoEdit?: boolean;
+
+		/**
+		*
+		**/
+		autoHeight?: boolean;
+
+		/**
+		* A CSS class to apply to flashing cells via flashCell().
+		**/
+		cellFlashingCssClass?: string;
+
+		/**
+		* A CSS class to apply to cells highlighted via setHighlightedCells().
+		**/
+		cellHighlightCssClass?: string;
+
+		/**
+		*
+		**/
+		dataItemColumnValueExtractor?: any;
+
+		/**
+		*
+		**/
+		defaultColumnWidth?: number;
+
+		/**
+		*
+		**/
+		defaultFormatter?: Formatter<T>;
+
+		/**
+		*
+		**/
+		editable?: boolean;
+
+		/**
+		* Not listed as a default under options in slick.grid.js
+		**/
+		editCommandHandler?: any; // queueAndExecuteCommand
+
+		/**
+		* A factory object responsible to creating an editor for a given cell. Must implement getEditor(column).
+		**/
+		editorFactory?: EditorFactory;
+
+		/**
+		* A Slick.EditorLock instance to use for controlling concurrent data edits.
+		**/
+		editorLock?: EditorLock<T>;
+
+		/**
+		* If true, a blank row will be displayed at the bottom - typing values in that row will add a new one. Must subscribe to onAddNewRow to save values.
+		**/
+		enableAddRow?: boolean;
+
+		/**
+		* If true, async post rendering will occur and asyncPostRender delegates on columns will be called.
+		**/
+		enableAsyncPostRender?: boolean;
+
+		/**
+		* *WARNING*: Not contained in SlickGrid 2.1, may be deprecated
+		**/
+		enableCellRangeSelection?: any;
+
+		/**
+		* Appears to enable cell virtualisation for optimised speed with large datasets
+		**/
+		enableCellNavigation?: boolean;
+
+		/**
+		*
+		**/
+		enableColumnReorder?: boolean;
+
+		/**
+		* *WARNING*: Not contained in SlickGrid 2.1, may be deprecated
+		**/
+		enableRowReordering?: any;
+
+		/**
+		*
+		**/
+		enableTextSelectionOnCells?: boolean;
+
+		/**
+		* @see Example: Explicit Initialization
+		**/
+		explicitInitialization?: boolean;
+
+		/**
+		* Force column sizes to fit into the container (preventing horizontal scrolling). Effectively sets column width to be 1/Number of Columns which on small containers may not be desirable
+		**/
+		forceFitColumns?: boolean;
+
+		/**
+		*
+		**/
+		forceSyncScrolling?: boolean;
+
+		/**
+		* A factory object responsible to creating a formatter for a given cell. Must implement getFormatter(column).
+		**/
+		formatterFactory?: FormatterFactory<T>;
+
+		/**
+		* Will expand the table row divs to the full width of the container, table cell divs will remain aligned to the left
+		**/
+		fullWidthRows?: boolean;
+
+		/**
+		*
+		**/
+		headerRowHeight?: number;
+
+		/**
+		*
+		**/
+		leaveSpaceForNewRows?: boolean;
+
+		/**
+		* @see Example: Multi-Column Sort
+		**/
+		multiColumnSort?: boolean;
+
+		/**
+		*
+		**/
+		multiSelect?: boolean;
+
+		/**
+		*
+		**/
+		rowHeight?: number;
+
+		/**
+		*
+		**/
+		selectedCellCssClass?: string;
+
+		/**
+		*
+		**/
+		showHeaderRow?: boolean;
+
+		/**
+		* If true, the column being resized will change its width as the mouse is dragging the resize handle. If false, the column will resize after mouse drag ends.
+		**/
+		syncColumnCellResize?: boolean;
+
+		/**
+		*
+		**/
+		topPanelHeight?: number;
+	}
+
+	export interface DataProvider<T extends SlickData> {
+		/**
+		 * Returns the number of data items in the set.
+		 */
+		getLength(): number;
+
+		/**
+		 * Returns the item at a given index.
+		 * @param index
+		 */
+		getItem(index: number): T;
+
+		/**
+		 * Returns the metadata for the item at a given index (optional).
+		 * @param index
+		 */
+		getItemMetadata?(index: number): RowMetadata<T>;
+	}
+
+	export interface SlickData {
+		// todo ? might be able to leave as empty
+	}
+
+	export interface RowMetadata<T> {
+		/**
+		 * One or more (space-separated) CSS classes to be added to the entire row.
+		 */
+		cssClasses?: string;
+
+		/**
+		 * Whether or not any cells in the row can be set as "active".
+		 */
+		focusable?: boolean;
+
+		/**
+		 * Whether or not a row or any cells in it can be selected.
+		 */
+		selectable?: boolean;
+
+		/**
+		 * Metadata related to individual columns
+		 */
+		columns?: {
+			/**
+			 * Metadata indexed by column id
+			 */
+			[index: string]: ColumnMetadata<T>;
+			/**
+			 * Metadata indexed by column index
+			 */
+			[index: number]: ColumnMetadata<T>;
+		}
+	}
+
+	export interface ColumnMetadata<T extends SlickData> {
+		/**
+		 * Whether or not a cell can be set as "active".
+		 */
+		focusable?: boolean;
+
+		/**
+		 * Whether or not a cell can be selected.
+		 */
+		selectable?: boolean;
+
+		/**
+		 * A custom cell formatter.
+		 */
+		formatter?: Formatter<T>;
+
+		/**
+		 * A custom cell editor.
+		 */
+		editor?: Slick.Editors.Editor<T>;
+
+		/**
+		 * Number of columns this cell will span. Can also contain "*" to indicate that the cell should span the rest of the row.
+		 */
+		colspan?: number|string;
+	}
+
+	/**
+	* Selecting cells in SlickGrid is handled by a selection model.
+	* Selection models are controllers responsible for handling user interactions and notifying subscribers of the changes in the selection. Selection is represented as an array of Slick.Range objects.
+	* You can get the current selection model from the grid by calling getSelectionModel() and set a different one using setSelectionModel(selectionModel). By default, no selection model is set.
+	* The grid also provides two helper methods to simplify development - getSelectedRows() and setSelectedRows(rowsArray), as well as an onSelectedRowsChanged event.
+	* SlickGrid includes two pre-made selection models - Slick.CellSelectionModel and Slick.RowSelectionModel, but you can easily write a custom one.
+	**/
+	export class SelectionModel<T extends SlickData, E> {
+		/**
+		* An initializer function that will be called with an instance of the grid whenever a selection model is registered with setSelectionModel. The selection model can use this to initialize its state and subscribe to grid events.
+		**/
+		init(grid: Grid<T>): void;
+
+		/**
+		* A destructor function that will be called whenever a selection model is unregistered from the grid by a call to setSelectionModel with another selection model or whenever a grid with this selection model is destroyed. The selection model can use this destructor to unsubscribe from grid events and release all resources (remove DOM nodes, event listeners, etc.).
+		**/
+		destroy(): void;
+
+		onSelectedRangesChanged: Slick.Event<E>;
+	}
+
+	export class Grid<T extends SlickData> {
+
+		/**
+		* Create an instance of the grid.
+		* @param container Container node to create the grid in. This can be a DOM Element, a jQuery node, or a jQuery selector.
+		* @param data Databinding source. This can either be a regular JavaScript array or a custom object exposing getItem(index) and getLength() functions.
+		* @param columns An array of column definition objects. See Column Options for a list of options that can be included on each column definition object.
+		* @param options Additional options.  See Grid Options for a list of options that can be included.
+		**/
+		constructor(
+			container: string|HTMLElement|JQuery,
+			data: T[]|DataProvider<T>,
+			columns: Column<T>[],
+			options: GridOptions<T>);
+
+		// #region Core
+
+		/**
+		* Initializes the grid. Called after plugins are registered. Normally, this is called by the constructor, so you don't need to call it. However, in certain cases you may need to delay the initialization until some other process has finished. In that case, set the explicitInitialization option to true and call the grid.init() manually.
+		**/
+		public init(): void;
+
+		/**
+		* todo: no docs
+		**/
+		public destroy(): void;
+
+		/**
+		* Returns an array of every data object, unless you're using DataView in which case it returns a DataView object.
+		* @return
+		**/
+		public getData(): any;
+		//public getData(): T[];
+		// Issue: typescript limitation, cannot differentiate calls by return type only, so need to cast to DataView or T[].
+		//public getData(): DataView;
+
+		/**
+		* Returns the databinding item at a given position.
+		* @param index Item index.
+		* @return
+		**/
+		public getDataItem(index: number): T;
+
+		/**
+		* Sets a new source for databinding and removes all rendered rows. Note that this doesn't render the new rows - you can follow it with a call to render() to do that.
+		* @param newData New databinding source using a regular JavaScript array..
+		* @param scrollToTop If true, the grid will reset the vertical scroll position to the top of the grid.
+		**/
+		public setData(newData: T[], scrollToTop: boolean): void;
+
+		/**
+		* Sets a new source for databinding and removes all rendered rows. Note that this doesn't render the new rows - you can follow it with a call to render() to do that.
+		* @param newData New databinding source using a custom object exposing getItem(index) and getLength() functions.
+		* @param scrollToTop If true, the grid will reset the vertical scroll position to the top of the grid.
+		**/
+		public setData(newData: DataProvider<T>, scrollToTop: boolean): void;
+
+		/**
+		* Returns the size of the databinding source.
+		* @return
+		**/
+		public getDataLength(): number;
+
+		/**
+		* Returns an object containing all of the Grid options set on the grid. See a list of Grid Options here.
+		* @return
+		**/
+		public getOptions(): GridOptions<any>;
+
+		/**
+		* Returns an array of row indices corresponding to the currently selected rows.
+		* @return
+		**/
+		public getSelectedRows(): number[];
+
+		/**
+		* Returns the current SelectionModel. See here for more information about SelectionModels.
+		* @return
+		**/
+		public getSelectionModel(): SelectionModel<any, any>;
+
+		/**
+		* Extends grid options with a given hash. If an there is an active edit, the grid will attempt to commit the changes and only continue if the attempt succeeds.
+		* @options An object with configuration options.
+		**/
+		public setOptions(options: GridOptions<T>): void;
+
+		/**
+		* Accepts an array of row indices and applies the current selectedCellCssClass to the cells in the row, respecting whether cells have been flagged as selectable.
+		* @param rowsArray An array of row numbers.
+		**/
+		public setSelectedRows(rowsArray: number[]): void;
+
+		/**
+		* Unregisters a current selection model and registers a new one. See the definition of SelectionModel for more information.
+		* @selectionModel A SelectionModel.
+		**/
+		public setSelectionModel(selectionModel: SelectionModel<T, any>): void;		// todo: don't know the type of the event data type
+
+		// #endregion Core
+
+		// #region Columns
+
+		/**
+		* Proportionately resizes all columns to fill available horizontal space. This does not take the cell contents into consideration.
+		**/
+		public autosizeColumns(): void;
+
+		/**
+		* Returns the index of a column with a given id. Since columns can be reordered by the user, this can be used to get the column definition independent of the order:
+		* @param id A column id.
+		* @return
+		**/
+		public getColumnIndex(id: string): number;
+
+		/**
+		* Returns an array of column definitions, containing the option settings for each individual column.
+		* @return
+		**/
+		public getColumns(): Column<T>[];
+
+		/**
+		* Sets grid columns. Column headers will be recreated and all rendered rows will be removed. To rerender the grid (if necessary), call render().
+		* @param columnDefinitions An array of column definitions.
+		**/
+		public setColumns(columnDefinitions: Column<T>[]): void;
+
+		/**
+		* Accepts a columnId string and an ascending boolean. Applies a sort glyph in either ascending or descending form to the header of the column. Note that this does not actually sort the column. It only adds the sort glyph to the header.
+		* @param columnId
+		* @param ascending
+		**/
+		public setSortColumn(columnId: string, ascending: boolean): void;
+
+		/**
+		* Accepts an array of objects in the form [ { columnId: [string], sortAsc: [boolean] }, ... ]. When called, this will apply a sort glyph in either ascending or descending form to the header of each column specified in the array. Note that this does not actually sort the column. It only adds the sort glyph to the header
+		* @param cols
+		**/
+		public setSortColumns(cols: { columnId: string; sortAsc: boolean }[]): void;
+
+		/**
+		* todo: no docs or comments available
+		* @return
+		**/
+		public getSortColumns(): { columnId: string; sortAsc: boolean }[];
+
+		/**
+		* Updates an existing column definition and a corresponding header DOM element with the new title and tooltip.
+		* @param columnId Column id.
+		* @param title New column name.
+		* @param toolTip New column tooltip.
+		**/
+		public updateColumnHeader(columnId: string, title?: string, toolTip?: string): void;
+
+		// #endregion Columns
+
+		// #region Cells
+
+		/**
+		* Adds an "overlay" of CSS classes to cell DOM elements. SlickGrid can have many such overlays associated with different keys and they are frequently used by plugins. For example, SlickGrid uses this method internally to decorate selected cells with selectedCellCssClass (see options).
+		* @param key A unique key you can use in calls to setCellCssStyles and removeCellCssStyles. If a hash with that key has already been set, an exception will be thrown.
+		* @param hash A hash of additional cell CSS classes keyed by row number and then by column id. Multiple CSS classes can be specified and separated by space.
+		* @example
+		* {
+		* 	0:    {
+		* 		"number_column":    "cell-bold",
+		* 		"title_column":     "cell-title cell-highlighted"
+		* 	},
+		* 	4:    {
+		* 		"percent_column":    "cell-highlighted"
+		* 	}
+		* }
+		**/
+		public addCellCssStyles(key: string, hash: CellCssStylesHash): void;
+
+		/**
+		* Returns true if you can click on a given cell and make it the active focus.
+		* @param row A row index.
+		* @param col A column index.
+		* @return
+		**/
+		public canCellBeActive(row: number, col: number): boolean;
+
+		/**
+		* Returns true if selecting the row causes this particular cell to have the selectedCellCssClass applied to it. A cell can be selected if it exists and if it isn't on an empty / "Add New" row and if it is not marked as "unselectable" in the column definition.
+		* @param row A row index.
+		* @param col A column index.
+		* @return
+		**/
+		public canCellBeSelected(row: number, col: number): boolean;
+
+		/**
+		* Attempts to switch the active cell into edit mode. Will throw an error if the cell is set to be not editable. Uses the specified editor, otherwise defaults to any default editor for that given cell.
+		* @param editor A SlickGrid editor (see examples in slick.editors.js).
+		**/
+		public editActiveCell(editor: Editors.Editor<T>): void;
+
+		/**
+		* Flashes the cell twice by toggling the CSS class 4 times.
+		* @param row A row index.
+		* @param cell A column index.
+		* @param speed (optional) - The milliseconds delay between the toggling calls. Defaults to 100 ms.
+		**/
+		public flashCell(row: number, cell: number, speed?: number): void;
+
+		/**
+		* Returns an object representing the coordinates of the currently active cell:
+		* @example
+		* 	{
+		* 	  row: activeRow,
+		* 	  cell: activeCell
+		* 	}
+		* @return
+		**/
+		public getActiveCell(): Cell;
+
+		/**
+		* Returns the DOM element containing the currently active cell. If no cell is active, null is returned.
+		* @return
+		**/
+		public getActiveCellNode(): HTMLElement;
+
+		/**
+		* Returns an object representing information about the active cell's position. All coordinates are absolute and take into consideration the visibility and scrolling position of all ancestors.
+		* @return
+		**/
+		public getActiveCellPosition(): CellPosition;
+
+		/**
+		* Accepts a key name, returns the group of CSS styles defined under that name. See setCellCssStyles for more info.
+		* @param key A string.
+		* @return
+		**/
+		public getCellCssStyles(key: string): CellCssStylesHash;
+
+		/**
+		* Returns the active cell editor. If there is no actively edited cell, null is returned.
+		* @return
+		**/
+		public getCellEditor(): Editors.Editor<any>;
+
+		/**
+		* Returns a hash containing row and cell indexes from a standard W3C/jQuery event.
+		* @param e A standard W3C/jQuery event.
+		* @return
+		**/
+		public getCellFromEvent<T>(e: Event<T>): Cell; // todo: !! Unsure on return type !!
+
+		/**
+		* Returns a hash containing row and cell indexes. Coordinates are relative to the top left corner of the grid beginning with the first row (not including the column headers).
+		* @param x An x coordinate.
+		* @param y A y coordinate.
+		* @return
+		**/
+		public getCellFromPoint(x: number, y: number): Cell; // todo: !! Unsure on return type !!
+
+		/**
+		* Returns a DOM element containing a cell at a given row and cell.
+		* @param row A row index.
+		* @param cell A column index.
+		* @return
+		**/
+		public getCellNode(row: number, cell: number): HTMLElement;
+
+		/**
+		* Returns an object representing information about a cell's position. All coordinates are absolute and take into consideration the visibility and scrolling position of all ancestors.
+		* @param row A row index.
+		* @param cell A column index.
+		* @return
+		**/
+		public getCellNodeBox(row: number, cell: number): CellPosition;
+
+		/**
+		* Accepts a row integer and a cell integer, scrolling the view to the row where row is its row index, and cell is its cell index. Optionally accepts a forceEdit boolean which, if true, will attempt to initiate the edit dialogue for the field in the specified cell.
+		* Unlike setActiveCell, this scrolls the row into the viewport and sets the keyboard focus.
+		* @param row A row index.
+		* @param cell A column index.
+		* @param forceEdit If true, will attempt to initiate the edit dialogue for the field in the specified cell.
+		* @return
+		**/
+		public gotoCell(row: number, cell: number, forceEdit?: boolean): void;
+
+		/**
+		* todo: no docs
+		* @return
+		**/
+		public getTopPanel(): HTMLElement;
+
+		/**
+		* todo: no docs
+		* @param visible
+		**/
+		public setTopPanelVisibility(visible: boolean): void;
+
+		/**
+		* todo: no docs
+		* @param visible
+		**/
+		public setHeaderRowVisibility(visible: boolean): void;
+
+		/**
+		* todo: no docs
+		* @return
+		**/
+		public getHeaderRow(): HTMLElement;
+
+		/**
+		* todo: no docs, return type is probably wrong -> "return $header && $header[0]"
+		* @param columnId
+		* @return
+		**/
+		public getHeaderRowColumn(columnId: string): Column<any>;
+
+		/**
+		* todo: no docs
+		* @return
+		**/
+		public getGridPosition(): CellPosition;
+
+		/**
+		* Switches the active cell one row down skipping unselectable cells. Returns a boolean saying whether it was able to complete or not.
+		* @return
+		**/
+		public navigateDown(): boolean;
+
+		/**
+		* Switches the active cell one cell left skipping unselectable cells. Unline navigatePrev, navigateLeft stops at the first cell of the row. Returns a boolean saying whether it was able to complete or not.
+		* @return
+		**/
+		public navigateLeft(): boolean;
+
+		/**
+		* Tabs over active cell to the next selectable cell. Returns a boolean saying whether it was able to complete or not.
+		* @return
+		**/
+		public navigateNext(): boolean;
+
+		/**
+		* Tabs over active cell to the previous selectable cell. Returns a boolean saying whether it was able to complete or not.
+		* @return
+		**/
+		public navigatePrev(): boolean;
+
+		/**
+		* Switches the active cell one cell right skipping unselectable cells. Unline navigateNext, navigateRight stops at the last cell of the row. Returns a boolean saying whether it was able to complete or not.
+		* @return
+		**/
+		public navigateRight(): boolean;
+
+		/**
+		* Switches the active cell one row up skipping unselectable cells. Returns a boolean saying whether it was able to complete or not.
+		* @return
+		**/
+		public navigateUp(): boolean;
+
+		/**
+		* Removes an "overlay" of CSS classes from cell DOM elements. See setCellCssStyles for more.
+		* @param key A string key.
+		**/
+		public removeCellCssStyles(key: string): void;
+
+		/**
+		* Resets active cell.
+		**/
+		public resetActiveCell(): void;
+
+		/**
+		* Sets an active cell.
+		* @param row A row index.
+		* @param cell A column index.
+		**/
+		public setActiveCell(row: number, cell: number): void;
+
+		/**
+		* Sets CSS classes to specific grid cells by calling removeCellCssStyles(key) followed by addCellCssStyles(key, hash). key is name for this set of styles so you can reference it later - to modify it or remove it, for example. hash is a per-row-index, per-column-name nested hash of CSS classes to apply.
+		* Suppose you have a grid with columns:
+		* ["login", "name", "birthday", "age", "likes_icecream", "favorite_cake"]
+		* ...and you'd like to highlight the "birthday" and "age" columns for people whose birthday is today, in this case, rows at index 0 and 9. (The first and tenth row in the grid).
+		* @param key A string key. Will overwrite any data already associated with this key.
+		* @param hash A hash of additional cell CSS classes keyed by row number and then by column id. Multiple CSS classes can be specified and separated by space.
+		**/
+		public setCellCssStyles(key: string, hash: CellCssStylesHash): void;
+
+		// #endregion Cells
+
+		// #region Events
+
+		public onScroll: Slick.Event<OnScrollEventArgs<T>>;
+		public onSort: Slick.Event<OnSortEventArgs<T>>;
+		public onHeaderMouseEnter: Slick.Event<OnHeaderMouseEventArgs<T>>;
+		public onHeaderMouseLeave: Slick.Event<OnHeaderMouseEventArgs<T>>;
+		public onHeaderContextMenu: Slick.Event<OnHeaderContextMenuEventArgs<T>>;
+		public onHeaderClick: Slick.Event<OnHeaderClickEventArgs<T>>;
+		public onHeaderCellRendered: Slick.Event<OnHeaderCellRenderedEventArgs<T>>;
+		public onBeforeHeaderCellDestroy: Slick.Event<OnBeforeHeaderCellDestroyEventArgs<T>>;
+		public onHeaderRowCellRendered: Slick.Event<OnHeaderRowCellRenderedEventArgs<T>>;
+		public onBeforeHeaderRowCellDestroy: Slick.Event<OnBeforeHeaderRowCellDestroyEventArgs<T>>;
+		public onMouseEnter: Slick.Event<OnMouseEnterEventArgs<T>>;
+		public onMouseLeave: Slick.Event<OnMouseLeaveEventArgs<T>>;
+		public onClick: Slick.Event<OnClickEventArgs<T>>;
+		public onDblClick: Slick.Event<OnDblClickEventArgs<T>>;
+		public onContextMenu: Slick.Event<OnContextMenuEventArgs<T>>;
+		public onKeyDown: Slick.Event<OnKeyDownEventArgs<T>>;
+		public onAddNewRow: Slick.Event<OnAddNewRowEventArgs<T>>;
+		public onValidationError: Slick.Event<OnValidationErrorEventArgs<T>>;
+		public onColumnsReordered: Slick.Event<OnColumnsReorderedEventArgs<T>>;
+		public onColumnsResized: Slick.Event<OnColumnsResizedEventArgs<T>>;
+		public onCellChange: Slick.Event<OnCellChangeEventArgs<T>>;
+		public onBeforeEditCell: Slick.Event<OnBeforeEditCellEventArgs<T>>;
+		public onBeforeCellEditorDestroy: Slick.Event<OnBeforeCellEditorDestroyEventArgs<T>>;
+		public onBeforeDestroy: Slick.Event<OnBeforeDestroyEventArgs<T>>;
+		public onActiveCellChanged: Slick.Event<OnActiveCellChangedEventArgs<T>>;
+		public onActiveCellPositionChanged: Slick.Event<OnActiveCellPositionChangedEventArgs<T>>;
+		public onDragInit: Slick.Event<OnDragInitEventArgs<T>>;
+		public onDragStart: Slick.Event<OnDragStartEventArgs<T>>;
+		public onDrag: Slick.Event<OnDragEventArgs<T>>;
+		public onDragEnd: Slick.Event<OnDragEndEventArgs<T>>;
+		public onSelectedRowsChanged: Slick.Event<OnSelectedRowsChangedEventArgs<T>>;
+		public onCellCssStylesChanged: Slick.Event<OnCellCssStylesChangedEventArgs<T>>;
+		public onViewportChanged: Slick.Event<OnViewportChangedEventArgs<T>>;
+		// #endregion Events
+
+		// #region Plugins
+
+		public registerPlugin(plugin: Plugin<T>): void;
+		public unregisterPlugin(plugin: Plugin<T>): void;
+
+		// #endregion Plugins
+
+		// #region Rendering
+
+		public render(): void;
+		public invalidate(): void;
+		public invalidateRow(row: number): void;
+		public invalidateRows(rows: number[]): void;
+		public invalidateAllRows(): void;
+		public updateCell(row: number, cell: number): void;
+		public updateRow(row: number): void;
+		public getViewport(viewportTop?: number, viewportLeft?: number): Viewport;
+		public getRenderedRange(viewportTop?: number, viewportLeft?: number): Viewport;
+		public resizeCanvas(): void;
+		public updateRowCount(): void;
+		public scrollRowIntoView(row: number, doPaging: boolean): void;
+		public scrollRowToTop(row: number): void;
+		public scrollCellIntoView(row: number, cell: number, doPaging: boolean): void;
+		public getCanvasNode(): HTMLCanvasElement;
+		public focus(): void;
+
+		// #endregion Rendering
+
+		// #region Editors
+
+		public getEditorLock(): EditorLock<any>;
+		public getEditController(): { commitCurrentEdit():boolean; cancelCurrentEdit():boolean; };
+
+		// #endregion Editors
+	}
+
+	export interface GridEventArgs<T extends SlickData> {
+		grid: Grid<T>;
+	}
+
+	export interface OnCellCssStylesChangedEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		key: string;
+		hash: CellCssStylesHash;
+	}
+
+	export interface OnSelectedRowsChangedEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		rows: number[];
+	}
+
+	export interface OnDragEndEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		// todo: need to understand $canvas drag event parameter's 'dd' object
+		// the documentation is not enlightening
+	}
+
+	export interface OnDragEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		// todo: need to understand $canvas drag event parameter's 'dd' object
+		// the documentation is not enlightening
+	}
+
+	export interface OnDragStartEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		// todo: need to understand $canvas drag event parameter's 'dd' object
+		// the documentation is not enlightening
+	}
+
+	export interface OnDragInitEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		// todo: need to understand $canvas drag event parameter's 'dd' object
+		// the documentation is not enlightening
+	}
+
+	export interface OnActiveCellPositionChangedEventArgs<T extends SlickData> extends GridEventArgs<T> {
+
+	}
+
+	export interface OnActiveCellChangedEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		row: number;
+		cell: number;
+	}
+
+	export interface OnBeforeDestroyEventArgs<T extends SlickData> extends GridEventArgs<T> {
+
+	}
+
+	export interface OnBeforeCellEditorDestroyEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		editor: Editors.Editor<T>;
+	}
+
+	export interface OnBeforeEditCellEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		row: number;
+		cell: number;
+		item: T;
+		column: Column<T>;
+	}
+
+	export interface OnCellChangeEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		row: number;
+		cell: number;
+		item: T;
+	}
+
+	export interface OnColumnsResizedEventArgs<T extends SlickData> extends GridEventArgs<T> {
+
+	}
+
+	export interface OnColumnsReorderedEventArgs<T extends SlickData> extends GridEventArgs<T> {
+
+	}
+
+	export interface OnValidationErrorEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		editor: Editors.Editor<T>;
+		cellNode: HTMLElement;
+		validationResults: ValidateResults;
+		row: number;
+		cell: number;
+		column: Column<T>;
+	}
+
+	export interface OnAddNewRowEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		item: T;
+		column: Column<T>;
+	}
+
+	export interface OnKeyDownEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		row: number;
+		cell: number;
+	}
+
+	export interface OnContextMenuEventArgs<T extends SlickData> extends GridEventArgs<T> {
+
+	}
+
+	export interface OnDblClickEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		row: number;
+		cell: number;
+	}
+
+	export interface OnClickEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		row: number;
+		cell: number;
+	}
+
+	export interface OnMouseLeaveEventArgs<T extends SlickData> extends GridEventArgs<T> {
+
+	}
+
+	export interface OnMouseEnterEventArgs<T extends SlickData> extends GridEventArgs<T> {
+
+	}
+
+	export interface OnBeforeHeaderRowCellDestroyEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		node: HTMLElement; // todo: might be JQuery instance
+		column: Column<T>;
+	}
+
+	export interface OnHeaderRowCellRenderedEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		node: HTMLElement; // todo: might be JQuery instance
+		column: Column<T>;
+	}
+
+	export interface OnBeforeHeaderCellDestroyEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		node: HTMLElement; // todo: might be JQuery instance
+		column: Column<T>;
+	}
+
+	export interface OnHeaderCellRenderedEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		node: HTMLElement;	// todo: might be JQuery instance
+		column: Column<T>;
+	}
+
+	export interface OnHeaderClickEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		column: Column<T>;
+	}
+
+	export interface OnHeaderContextMenuEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		column: Column<T>;
+	}
+
+	export interface OnHeaderMouseEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		column: Column<T>;
+	}
+
+	export interface OnSortEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		multiColumnSort: boolean;
+
+		// Single column returned
+		sortCol?: Column<T>;
+		sortAsc: boolean;
+
+		// Multiple columns returned
+		sortCols?: SortColumn<T>[];
+	}
+
+	export interface OnScrollEventArgs<T extends SlickData> extends GridEventArgs<T> {
+		scrollLeft: number;
+		scrollTop: number;
+	}
+
+	export interface OnViewportChangedEventArgs<T extends SlickData> extends GridEventArgs<T> {
+
+	}
+
+	export interface SortColumn<T extends SlickData> {
+		sortCol: Column<T>;
+		sortAsc: boolean;
+	}
+
+	export interface Cell {
+		row: number;
+		cell: number;
+	}
+
+	export interface CellPosition extends Position {
+		bottom: number;
+		height: number;
+		right: number;
+		visible: boolean;
+		width: number;
+	}
+
+	export interface Position {
+		top: number;
+		left: number;
+	}
+
+	export interface CellCssStylesHash {
+		[index: number]: {
+			[id: string]: string;
+		}
+	}
+
+	export interface Viewport {
+		top: number;
+		bottom: number;
+		leftPx: number;
+		rightPx: number;
+	}
+
+	export interface ValidateResults {
+		valid: boolean;
+		msg: string;
+	}
+
+	export module Editors {
+
+		export interface EditorOptions<T extends Slick.SlickData> {
+			column: Column<T>;
+			container: HTMLElement;
+			grid: Grid<T>;
+		}
+
+		export class Editor<T extends Slick.SlickData> {
+			constructor(args: EditorOptions<T>);
+			public init(): void;
+			public destroy(): void;
+			public focus(): void;
+			public loadValue(item:any): void; // todo: typeof(item)
+			public applyValue(item:any, state: string): void; // todo: typeof(item)
+			public isValueChanged(): boolean;
+			public serializeValue(): any;
+			public validate(): ValidateResults;
+		}
+
+		export class Text<T extends Slick.SlickData> extends Editor<T> {
+			constructor(args: EditorOptions<T>);
+
+			public getValue(): string;
+			public setValue(val: string): void;
+			public serializeValue(): string;
+		}
+
+		export class Integer<T extends Slick.SlickData> extends Editor<T> {
+			constructor(args: EditorOptions<T>);
+
+			public serializeValue(): number;
+		}
+
+		export class Date<T extends Slick.SlickData> extends Editor<T> {
+			constructor(args: EditorOptions<T>);
+
+			public show(): void;
+			public hide(): void;
+			public position(position: Position): void;
+			public serializeValue(): string;
+		}
+
+		export class YesNoSelect<T extends Slick.SlickData> extends Editor<T> {
+			constructor(args: EditorOptions<T>);
+
+			public serializeValue(): boolean;
+		}
+
+		export class Checkbox<T extends Slick.SlickData> extends Editor<T> {
+			constructor(args: EditorOptions<T>);
+
+			public serializeValue(): boolean;
+
+		}
+		export class PercentComplete<T extends Slick.SlickData> extends Editor<T> {
+			constructor(args: EditorOptions<T>);
+
+			public serializeValue(): number;
+		}
+
+		export class LongText<T extends Slick.SlickData> extends Editor<T> {
+			constructor(args: EditorOptions<T>);
+
+			public handleKeyDown(e: DOMEvent): void;
+			public save(): void;
+			public cancel(): void;
+			public hide(): void;
+			public show(): void;
+			public position(position: Position): void;
+			public serializeValue(): string;
+		}
+	}
+
+	export interface Formatter<T extends SlickData> {
+        (row: number, cell: number, value: any, columnDef: Column<T>, dataContext: SlickData): string;
+	}
+
+	export module Formatters {
+		var PercentComplete: Formatter<Slick.SlickData>;
+		var PercentCompleteBar: Formatter<Slick.SlickData>;
+		var YesNo: Formatter<Slick.SlickData>;
+		var Checkmark: Formatter<Slick.SlickData>;
+	}
+
+	export module Data {
+
+		export interface DataViewOptions<T extends Slick.SlickData> {
+			groupItemMetadataProvider?: GroupItemMetadataProvider<T>;
+			inlineFilters?: boolean;
+		}
+
+		/**
+		* Item -> Data by index
+		* Row -> Data by row
+		**/
+		export class DataView<T extends Slick.SlickData> implements DataProvider<T> {
+
+			constructor(options?: DataViewOptions<T>);
+
+			public beginUpdate(): void;
+			public endUpdate(): void;
+			public setPagingOptions(args: PagingOptions): void;
+			public getPagingInfo(): PagingOptions;
+			public getItems(): T[];
+			public setItems(data: T[], objectIdProperty?: string): void;
+			public setFilter(filterFn: (item: T, args:any) => boolean): void;	// todo: typeof(args)
+			public sort(comparer: Function, ascending: boolean): void;		// todo: typeof(comparer), should be the same callback as Array.sort
+			public fastSort(field: string, ascending: boolean): void;
+			public fastSort(field: Function, ascending: boolean): void;		// todo: typeof(field), should be the same callback as Array.sort
+			public reSort(): void;
+			public setGrouping(groupingInfos: GroupingOptions<T> | GroupingOptions<T>[]): void;
+			public getGrouping(): GroupingOptions<T>[];
+
+			/**
+			* @deprecated
+			**/
+			public groupBy(valueGetter:any, valueFormatter:any, sortComparer:any): void;
+
+			/**
+			* @deprecated
+			**/
+			public setAggregators(groupAggregators:any, includeCollapsed:any): void;
+
+			/**
+			* @param level Optional level to collapse.  If not specified, applies to all levels.
+			**/
+			public collapseAllGroups(level?: number): void;
+
+			/**
+			* @param level Optional level to collapse.  If not specified, applies to all levels.
+			**/
+			public expandAllGroups(level?: number): void;
+
+			/**
+			* @param varArgs Either a Slick.Group's "groupingKey" property, or a
+			*     variable argument list of grouping values denoting a unique path to the row.  For
+			*     example, calling collapseGroup('high', '10%') will collapse the '10%' subgroup of
+			*     the 'high' setGrouping.
+			*/
+			public collapseGroup(...varArgs: string[]): void;
+
+			/**
+			* @param varArgs Either a Slick.Group's "groupingKey" property, or a
+			*     variable argument list of grouping values denoting a unique path to the row.  For
+			*     example, calling expandGroup('high', '10%') will expand the '10%' subgroup of
+			*     the 'high' setGrouping.
+			*/
+			public expandGroup(...varArgs: string[]): void;
+			public getGroups(): Group<T>[];
+			public getIdxById(id: string): number;
+			public getRowById(id: string): number;
+			public getItemById(id: any): T;
+			public getItemByIdx(idx: number): T;
+			public mapRowsToIds(rowArray: T[]): string[];
+			public setRefreshHints(hints: RefreshHints): void;
+			public setFilterArgs(args: any): void;
+			public refresh(): void;
+			public updateItem(id: string, item: T): void;
+			public insertItem(insertBefore: number, item: T): void;
+			public addItem(item: T): void;
+			public deleteItem(id: string): void;
+			public syncGridSelection(grid: Grid<T>, preserveHidden: boolean): void;
+			public syncGridCellCssStyles(grid: Grid<T>, key: string): void;
+
+			public getLength(): number;
+			public getItem(index: number): T;
+			public getItemMetadata(index: number): RowMetadata<T>;
+
+			public onRowCountChanged: Slick.Event<OnRowCountChangedEventData>;
+			public onRowsChanged: Slick.Event<OnRowsChangedEventData>;
+			public onPagingInfoChanged: Slick.Event<OnPagingInfoChangedEventData>;
+		}
+
+		export interface GroupingOptions<T> {
+			getter?: ((item?: T) => any) | string;
+			formatter?: (item?: T) => string;
+			comparer?: (a: Group<T>, b: Group<T>) => number;
+			predefinedValues?: any[];	// todo
+			aggregators?: Aggregators.Aggregator<T>[];
+			aggregateEmpty?: boolean;
+			aggregateCollapsed?: boolean;
+			aggregateChildGroups?: boolean;
+			collapsed?: boolean;
+			displayTotalsRow?: boolean;
+		}
+
+		export interface PagingOptions {
+			pageSize?: number;
+			pageNum?: number;
+			totalRows?: number;
+			totalPages?: number;
+		}
+
+		export interface RefreshHints {
+			isFilterNarrowing?: boolean;
+			isFilterExpanding?: boolean;
+			isFilterUnchanged?: boolean;
+			ignoreDiffsBefore?: boolean;
+			ignoreDiffsAfter?: boolean;
+		}
+
+		export interface OnRowCountChangedEventData {
+			// empty
+		}
+		export interface OnRowsChangedEventData {
+			rows: number[];
+		}
+		export interface OnPagingInfoChangedEventData extends PagingOptions {
+
+		}
+
+		export module Aggregators {
+			export class Aggregator<T extends Slick.SlickData> {
+				public field: string;
+				public init(): void;
+				public accumulate(item: T): void;
+				public storeResult(groupTotals: GroupTotals<T>): void;
+			}
+
+			export class Avg<T> extends Aggregator<T> {
+
+			}
+
+			export class Min<T> extends Aggregator<T> {
+
+			}
+
+			export class Max<T> extends Aggregator<T> {
+
+			}
+
+			export class Sum<T> extends Aggregator<T> {
+
+			}
+		}
+
+		/***
+		* Provides item metadata for group (Slick.Group) and totals (Slick.Totals) rows produced by the DataView.
+		* This metadata overrides the default behavior and formatting of those rows so that they appear and function
+		* correctly when processed by the grid.
+		*
+		* This class also acts as a grid plugin providing event handlers to expand & collapse groups.
+		* If "grid.registerPlugin(...)" is not called, expand & collapse will not work.
+		*
+		* @class GroupItemMetadataProvider
+		* @module Data
+		* @namespace Slick.Data
+		* @constructor
+		* @param options
+		*/
+		export class GroupItemMetadataProvider<T extends Slick.SlickData> {
+			public init(): void;
+			public destroy(): void;
+			public getGroupRowMetadata(item?: Group<T>): RowMetadata<T>;
+			public getTotalsRowMetadata(item?: GroupTotals<T>): RowMetadata<T>;
+		}
+
+		export interface GroupItemMetadataProviderOptions {
+			groupCssClass?: string;
+			groupTitleCssClass?: string;
+			totalsCssClass?: string;
+			groupFocusable?: boolean;
+			totalsFocusable?: boolean;
+			toggleCssClass?: string;
+			toggleExpandedCssCass?: string;
+			toggleCollapsedCssClass?: string;
+			enableExpandCollapse?: boolean;
+		}
+
+		//export class RemoteModel {
+		//	public data: any;
+
+		//	public clear(): any;
+		//	public isDataLoaded(): any;
+		//	public ensureData(): any;
+		//	public reloadData(): any;
+		//	public setSort(): any;
+		//	public setSearch(): any;
+
+		//	public onDataLoading: Slick.Event<OnDataLoadingEventData>;
+		//	public onDataLoaded: Slick.Event<OnDataLoadedEventData>;
+
+		//}
+
+		//export interface OnDataLoadingEventData {
+
+		//}
+
+		//export interface OnDataLoadedEventData {
+
+		//}
+	}
+
+	export class Plugin<T extends Slick.SlickData> {
+
+		constructor(options?: PluginOptions);
+		public init(grid: Grid<T>): void;
+		public destroy(): void;
+	}
+
+	export interface PluginOptions {
+		// extend your plugin options here
+	}
+
+}
diff --git a/slickgrid/slick.autotooltips-tests.ts b/slickgrid/slick.autotooltips-tests.ts
index f2e7f6f39c..9ee791718b 100644
--- a/slickgrid/slick.autotooltips-tests.ts
+++ b/slickgrid/slick.autotooltips-tests.ts
@@ -1,7 +1,7 @@
-/// <reference path="./slick.autotooltips.d.ts" />
 
-var grid = new Slick.Grid("#myGrid", [], [], {});
-grid.registerPlugin(new Slick.AutoTooltips({
+
+var tgrid = new Slick.Grid("#myGrid", [], [], {});
+tgrid.registerPlugin(new Slick.AutoTooltips({
     enableForCells: true,
     enableForHeaderCells: true,
     maxToolTipLength: 100
diff --git a/slickgrid/slick.autotooltips.d.ts b/slickgrid/slick.autotooltips.d.ts
index 84c90d2a3f..2c33e52431 100644
--- a/slickgrid/slick.autotooltips.d.ts
+++ b/slickgrid/slick.autotooltips.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Ryo Iwamoto <https://github.com/ryiwamoto>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="SlickGrid.d.ts" />
+
 
 declare namespace Slick {
     export interface SlickGridAutoTooltipsOption extends PluginOptions {
diff --git a/slickgrid/slick.headerbuttons.d.ts b/slickgrid/slick.headerbuttons.d.ts
index cf3134dc1c..a4191a79f3 100644
--- a/slickgrid/slick.headerbuttons.d.ts
+++ b/slickgrid/slick.headerbuttons.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Derek Cicerone <https://github.com/derekcicerone/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="SlickGrid.d.ts" />
+
 
 declare namespace Slick {
 
diff --git a/slickgrid/slick.rowselectionmodel.d.ts b/slickgrid/slick.rowselectionmodel.d.ts
index c4e46873fd..2c06f63591 100644
--- a/slickgrid/slick.rowselectionmodel.d.ts
+++ b/slickgrid/slick.rowselectionmodel.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Derek Cicerone <https://github.com/derekcicerone/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="SlickGrid.d.ts" />
+
 
 declare namespace Slick {
     class RowSelectionModel<T extends SlickData, E> extends SelectionModel<T, E> {
diff --git a/slickgrid/tsconfig.json b/slickgrid/tsconfig.json
new file mode 100644
index 0000000000..d83d287fc0
--- /dev/null
+++ b/slickgrid/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "slickgrid-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/slideout/index.d.ts b/slideout/index.d.ts
new file mode 100644
index 0000000000..cc358bf190
--- /dev/null
+++ b/slideout/index.d.ts
@@ -0,0 +1,156 @@
+// Type definitions for Slideout 0.1.12
+// Project: https://github.com/mango/slideout
+// Definitions by: Markus Peloso <https://github.com/ToastHawaii/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = Slideout;
+export as namespace Slideout;
+
+declare namespace Slideout {
+    /**
+     * Options to customize a new instance of Slideout.
+     */
+    interface Options {
+        /**
+         * The DOM element that contains all your application content (.slideout-panel).
+         */
+        panel: HTMLElement;
+
+        /**
+         * The DOM element that contains your menu application (.slideout-menu).
+         */
+        menu: HTMLElement;
+
+        /**
+         * The time (milliseconds) to open/close the slideout.
+         * Default: 300.
+         */
+        duration?: number;
+
+        /**
+         * The CSS effect to use when animating the opening and closing of the slideout.
+         * Default: ease.
+        */
+        fx?: string;
+
+        /**
+         *   Default: 256.
+         */
+        padding?: number;
+
+        /**
+         * The number of px needed for the menu can be opened completely, otherwise it closes.
+         * Default: 70.
+         */
+        tolerance?: number;
+
+        /**
+         * Set this option to false to disable Slideout touch events.
+         * Default: true.
+         */
+        touch?: boolean;
+
+        /**
+         * The side to open the slideout.
+         * Default: left.
+         */
+        side?: "left" | "right";
+    }
+
+    type Events = "beforeopen" | "open" | "beforeclose" | "close" | "translatestart" | "translate" | "translateend";
+}
+
+/**
+ * A touch slideout navigation menu for your mobile web apps.
+ */
+declare class Slideout {
+    /**
+     * A touch slideout navigation menu for your mobile web apps.
+     * @param options Options to customize a new instance of Slideout.
+     */
+    constructor(options: Slideout.Options);
+
+    /**
+     * Opens the slideout menu. It emits beforeopen and open events.
+     */
+    open(): Slideout;
+
+    /**
+     * Closes the slideout menu. It emits beforeclose and close events.
+     */
+    close(): Slideout;
+
+    /**
+     * Toggles (open/close) the slideout menu.
+     */
+    toggle(): Slideout;
+
+    /**
+     * Returns true if the slideout is currently open, and false if it is closed.
+     */
+    isOpen(): boolean;
+
+    /**
+     * Cleans up the instance so another slideout can be created on the same area.
+     */
+    destroy(): Slideout;
+
+    /**
+     * Enables opening the slideout via touch events.
+     */
+    enableTouch(): Slideout;
+
+    /**
+     * Disables opening the slideout via touch events.
+     */
+    disableTouch(): Slideout;
+
+    /**
+     * Adds a listener to the collection for the specified event.
+     * @param event The event name.
+     * @param listener A listener function to add.
+     */
+    on(event: "translate", listener: (translateX: number) => any): Slideout;
+
+    /**
+     * Adds a listener to the collection for the specified event.
+     * @param event The event name.
+     * @param listener A listener function to add.
+     */
+    on(event: Slideout.Events, listener: Function): Slideout;
+
+    /**
+   * Adds a listener to the collection for the specified event that will be called only once.
+   * @param event The event name.
+   * @param listener A listener function to add.
+   */
+    once(event: "translate", listener: (translateX: number) => any): Slideout;
+
+    /**
+     * Adds a listener to the collection for the specified event that will be called only once.
+     * @param event The event name.
+     * @param listener A listener function to add.
+     */
+    once(event: Slideout.Events, listener: Function): Slideout;
+
+    /**
+     * Removes a listener from the collection for the specified event.
+     * @param event The event name.
+     * @param listener A listener function to remove.
+     */
+    off(event: "translate", listener: (translateX: number) => any): Slideout;
+
+    /**
+     * Removes a listener from the collection for the specified event.
+     * @param event The event name.
+     * @param listener A listener function to remove.
+     */
+    off(event: Slideout.Events, listener: Function): Slideout;
+
+    /**
+     * Execute each item in the listener collection in order with the specified data.
+     * @param event The name of the event you want to emit.
+     * @param data Data to pass to the listeners.
+     */
+    emit(event: Slideout.Events, ...data: any[]): Slideout;
+}
diff --git a/slideout/slideout-tests.ts b/slideout/slideout-tests.ts
index 7d634be80d..0c6bdb5798 100644
--- a/slideout/slideout-tests.ts
+++ b/slideout/slideout-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="slideout.d.ts" />
+import Slideout = require("slideout");
 
 // Slideout(options)
 var slideout = new Slideout({
diff --git a/slideout/slideout.d.ts b/slideout/slideout.d.ts
deleted file mode 100644
index 28c317d0c6..0000000000
--- a/slideout/slideout.d.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-// Type definitions for Slideout 0.1.12
-// Project: https://github.com/mango/slideout
-// Definitions by: Markus Peloso <https://github.com/ToastHawaii/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "slideout" {
-    export = Slideout;
-}
-
-declare namespace Slideout {
-    /**
-     * Options to customize a new instance of Slideout.
-     */
-    interface Options {
-        /**
-         * The DOM element that contains all your application content (.slideout-panel).
-         */
-        panel: HTMLElement;
-
-        /**
-         * The DOM element that contains your menu application (.slideout-menu).
-         */
-        menu: HTMLElement;
-
-        /**
-         * The time (milliseconds) to open/close the slideout.
-         * Default: 300.
-         */
-        duration?: number;
-
-        /**
-         * The CSS effect to use when animating the opening and closing of the slideout.
-         * Default: ease.
-        */
-        fx?: string;
-
-        /**
-         *   Default: 256.
-         */
-        padding?: number;
-
-        /**
-         * The number of px needed for the menu can be opened completely, otherwise it closes.
-         * Default: 70.
-         */
-        tolerance?: number;
-
-        /**
-         * Set this option to false to disable Slideout touch events.
-         * Default: true.
-         */
-        touch?: boolean;
-
-        /**
-         * The side to open the slideout.
-         * Default: left.
-         */
-        side?: "left" | "right";
-    }
-
-    type Events = "beforeopen" | "open" | "beforeclose" | "close" | "translatestart" | "translate" | "translateend";
-}
-
-/**
- * A touch slideout navigation menu for your mobile web apps.
- */
-declare class Slideout {
-    /**
-     * A touch slideout navigation menu for your mobile web apps.
-     * @param options Options to customize a new instance of Slideout.
-     */
-    constructor(options: Slideout.Options);
-
-    /**
-     * Opens the slideout menu. It emits beforeopen and open events.
-     */
-    open(): Slideout;
-
-    /**
-     * Closes the slideout menu. It emits beforeclose and close events.
-     */
-    close(): Slideout;
-
-    /**
-     * Toggles (open/close) the slideout menu.
-     */
-    toggle(): Slideout;
-
-    /**
-     * Returns true if the slideout is currently open, and false if it is closed.
-     */
-    isOpen(): boolean;
-
-    /**
-     * Cleans up the instance so another slideout can be created on the same area.
-     */
-    destroy(): Slideout;
-
-    /**
-     * Enables opening the slideout via touch events.
-     */
-    enableTouch(): Slideout;
-
-    /**
-     * Disables opening the slideout via touch events.
-     */
-    disableTouch(): Slideout;
-
-    /**
-     * Adds a listener to the collection for the specified event.
-     * @param event The event name.
-     * @param listener A listener function to add.
-     */
-    on(event: "translate", listener: (translateX: number) => any): Slideout;
-
-    /**
-     * Adds a listener to the collection for the specified event.
-     * @param event The event name.
-     * @param listener A listener function to add.
-     */
-    on(event: Slideout.Events, listener: Function): Slideout;
-
-    /**
-   * Adds a listener to the collection for the specified event that will be called only once.
-   * @param event The event name.
-   * @param listener A listener function to add.
-   */
-    once(event: "translate", listener: (translateX: number) => any): Slideout;
-
-    /**
-     * Adds a listener to the collection for the specified event that will be called only once.
-     * @param event The event name.
-     * @param listener A listener function to add.
-     */
-    once(event: Slideout.Events, listener: Function): Slideout;
-
-    /**
-     * Removes a listener from the collection for the specified event.
-     * @param event The event name.
-     * @param listener A listener function to remove.
-     */
-    off(event: "translate", listener: (translateX: number) => any): Slideout;
-
-    /**
-     * Removes a listener from the collection for the specified event.
-     * @param event The event name.
-     * @param listener A listener function to remove.
-     */
-    off(event: Slideout.Events, listener: Function): Slideout;
-
-    /**
-     * Execute each item in the listener collection in order with the specified data.
-     * @param event The name of the event you want to emit.
-     * @param data Data to pass to the listeners.
-     */
-    emit(event: Slideout.Events, ...data: any[]): Slideout;
-}
diff --git a/slideout/tsconfig.json b/slideout/tsconfig.json
new file mode 100644
index 0000000000..b3e7316260
--- /dev/null
+++ b/slideout/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "slideout-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/smoothie/index.d.ts b/smoothie/index.d.ts
new file mode 100644
index 0000000000..7c53b10ddb
--- /dev/null
+++ b/smoothie/index.d.ts
@@ -0,0 +1,182 @@
+// Type definitions for Smoothie Charts 1.25
+// Project: https://github.com/joewalnes/smoothie
+// Definitions by: Drew Noakes <https://drewnoakes.com>, Mike H. Hawley <https://github.com/mikehhawley>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/smoothie
+
+// NOTE this reference is here to make the DefinitelyTyped `npm test` suite pass and
+//      may be removed if you are using this module declaration in isolation from the
+//      rest of DefinitelyTyped.
+/// <reference types="node" />
+
+
+export interface ITimeSeriesOptions {
+    resetBounds?: boolean;
+    resetBoundsInterval?: number;
+}
+
+export interface ITimeSeriesPresentationOptions {
+    strokeStyle?: string;
+    fillStyle?: string;
+    lineWidth?: number;
+}
+
+export declare class TimeSeries {
+    /**
+     * Initialises a new <code>TimeSeries</code> with optional data options.
+     *
+     * Options are of the form (defaults shown):
+     *
+     * <pre>
+     * {
+     *   resetBounds: true,        // enables/disables automatic scaling of the y-axis
+     *   resetBoundsInterval: 3000 // the period between scaling calculations, in millis
+     * }
+     * </pre>
+     *
+     * Presentation options for TimeSeries are specified as an argument to <code>SmoothieChart.addTimeSeries</code>.
+     */
+    constructor(options?: ITimeSeriesOptions);
+
+    /**
+     * Clears all data and state from this TimeSeries object.
+     */
+    clear(): void;
+
+    /**
+     * Recalculate the min/max values for this <code>TimeSeries</code> object.
+     *
+     * This causes the graph to scale itself in the y-axis.
+     */
+    resetBounds(): void;
+
+    /**
+     * Adds a new data point to the <code>TimeSeries</code>, preserving chronological order.
+     *
+     * @param timestamp the position, in time, of this data point
+     * @param value the value of this data point
+     * @param sumRepeatedTimeStampValues if <code>timestamp</code> has an exact match in the series, this flag controls
+     * whether it is replaced, or the values summed (defaults to false.)
+     */
+    append(timestamp: number, value: number, sumRepeatedTimeStampValues?: boolean): void;
+
+    dropOldData(oldestValidTime: number, maxDataSetLength: number): void;
+}
+
+export interface IGridOptions {
+    /** The background colour of the chart. */
+    fillStyle?: string;
+    /** The pixel width of grid lines. */
+    lineWidth?: number;
+    /** Colour of grid lines. */
+    strokeStyle?: string;
+    /** Distance between vertical grid lines. */
+    millisPerLine?: number;
+    /** Controls whether grid lines are 1px sharp, or softened. */
+    sharpLines?: boolean;
+    /** Number of vertical sections marked out by horizontal grid lines. */
+    verticalSections?: number;
+    /** Whether the grid lines trace the border of the chart or not. */
+    borderVisible?: boolean;
+}
+
+export interface ILabelOptions {
+    /** Enables/disables labels showing the min/max values. */
+    disabled?: boolean;
+    /** Colour for text of labels. */
+    fillStyle?: string;
+    fontSize?: number;
+    fontFamily?: string;
+    precision?: number;
+}
+
+export interface IRange { min: number; max: number }
+
+export interface IHorizontalLine {
+    value?: number;
+    color?: string;
+    lineWidth?: number;
+}
+
+export interface IChartOptions {
+    /** Specify to clamp the lower y-axis to a given value. */
+    minValue?: number;
+    /** Specify to clamp the upper y-axis to a given value. */
+    maxValue?: number;
+    /** Allows proportional padding to be added above the chart. for 10% padding, specify 1.1. */
+    maxValueScale?: number;
+    yRangeFunction?: (range: IRange) => IRange;
+    /** Controls the rate at which y-value zoom animation occurs. */
+    scaleSmoothing?: number;
+    /** Sets the speed at which the chart pans by. */
+    millisPerPixel?: number;
+    /** Whether to render at different DPI depending upon the device. Enabled by default. */
+    enableDpiScaling?: boolean;
+    yMinFormatter?: (min: number, precision: number) => string;
+    yMaxFormatter?: (max: number, precision: number) => string;
+    maxDataSetLength?: number;
+    /** One of: 'bezier', 'linear', 'step' */
+    interpolation?: string;
+    /** Optional function to format time stamps for bottom of chart. You may use <code>SmoothieChart.timeFormatter</code>, or your own/ */
+    timestampFormatter?: (date: Date) => string;
+    horizontalLines?: IHorizontalLine[];
+
+    grid?: IGridOptions;
+
+    labels?: ILabelOptions;
+}
+
+/**
+ * Initialises a new <code>SmoothieChart</code>.
+ *
+ * Options are optional and may be sparsely populated. Just specify the values you
+ * need and the rest will be given sensible defaults.
+ */
+export declare class SmoothieChart {
+    constructor(chartOptions?: IChartOptions);
+
+    /**
+     * Adds a <code>TimeSeries</code> to this chart, with optional presentation options.
+     */
+    addTimeSeries(series: TimeSeries, seriesOptions?: ITimeSeriesPresentationOptions): void;
+
+    /**
+     * Removes the specified <code>TimeSeries</code> from the chart.
+     */
+    removeTimeSeries(series: TimeSeries): void;
+
+    /**
+     * Gets render options for the specified <code>TimeSeries</code>.
+     *
+     * As you may use a single <code>TimeSeries</code> in multiple charts with different formatting in each usage,
+     * these settings are stored in the chart.
+     */
+    getTimeSeriesOptions(timeSeries: TimeSeries): ITimeSeriesPresentationOptions;
+
+    /**
+     * Brings the specified <code>TimeSeries</code> to the top of the chart. It will be rendered last.
+     */
+    bringToFront(timeSeries: TimeSeries): void;
+
+    /**
+     * Instructs the <code>SmoothieChart</code> to start rendering to the provided canvas, with specified delay.
+     *
+     * @param canvas the target canvas element
+     * @param delayMillis an amount of time to wait before a data point is shown. This can prevent the end of the series
+     * from appearing on screen, with new values flashing into view, at the expense of some latency.
+     */
+    streamTo(canvas: HTMLCanvasElement, delayMillis?: number): void;
+
+    /**
+     * Starts the animation of this chart. Called by <code>streamTo</code>.
+     */
+    start(): void;
+
+    /**
+     * Stops the animation of this chart.
+     */
+    stop(): void;
+
+    updateValueRange(): void;
+
+    render(canvas?: HTMLCanvasElement, time?: number): void;
+}
diff --git a/smoothie/smoothie-tests.ts b/smoothie/smoothie-tests.ts
index 9da8eebf61..5a89014192 100644
--- a/smoothie/smoothie-tests.ts
+++ b/smoothie/smoothie-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="smoothie.d.ts" />
 
 // Smoothie supports browserify
 import smoothie = require('smoothie');
diff --git a/smoothie/smoothie.d.ts b/smoothie/smoothie.d.ts
deleted file mode 100644
index 98f205f598..0000000000
--- a/smoothie/smoothie.d.ts
+++ /dev/null
@@ -1,192 +0,0 @@
-// Type definitions for Smoothie Charts 1.25
-// Project: https://github.com/joewalnes/smoothie
-// Definitions by: Drew Noakes <https://drewnoakes.com>, Mike H. Hawley <https://github.com/mikehhawley>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/smoothie
-
-// NOTE this reference is here to make the DefinitelyTyped `npm test` suite pass and
-//      may be removed if you are using this module declaration in isolation from the
-//      rest of DefinitelyTyped.
-/// <reference path="../node/node.d.ts" />
-
-declare module "smoothie"
-{
-    export interface ITimeSeriesOptions
-    {
-        resetBounds?: boolean;
-        resetBoundsInterval?: number;
-    }
-
-    export interface ITimeSeriesPresentationOptions
-    {
-        strokeStyle?: string;
-        fillStyle?: string;
-        lineWidth?: number;
-    }
-
-    export class TimeSeries
-    {
-        /**
-         * Initialises a new <code>TimeSeries</code> with optional data options.
-         *
-         * Options are of the form (defaults shown):
-         *
-         * <pre>
-         * {
-         *   resetBounds: true,        // enables/disables automatic scaling of the y-axis
-         *   resetBoundsInterval: 3000 // the period between scaling calculations, in millis
-         * }
-         * </pre>
-         *
-         * Presentation options for TimeSeries are specified as an argument to <code>SmoothieChart.addTimeSeries</code>.
-         */
-        constructor(options?: ITimeSeriesOptions);
-
-        /**
-         * Clears all data and state from this TimeSeries object.
-         */
-        clear(): void;
-
-        /**
-         * Recalculate the min/max values for this <code>TimeSeries</code> object.
-         *
-         * This causes the graph to scale itself in the y-axis.
-         */
-        resetBounds(): void;
-
-        /**
-         * Adds a new data point to the <code>TimeSeries</code>, preserving chronological order.
-         *
-         * @param timestamp the position, in time, of this data point
-         * @param value the value of this data point
-         * @param sumRepeatedTimeStampValues if <code>timestamp</code> has an exact match in the series, this flag controls
-         * whether it is replaced, or the values summed (defaults to false.)
-         */
-        append(timestamp: number, value: number, sumRepeatedTimeStampValues?: boolean): void;
-
-        dropOldData(oldestValidTime: number, maxDataSetLength: number): void;
-    }
-
-    export interface IGridOptions
-    {
-        /** The background colour of the chart. */
-        fillStyle?: string;
-        /** The pixel width of grid lines. */
-        lineWidth?: number;
-        /** Colour of grid lines. */
-        strokeStyle?: string;
-        /** Distance between vertical grid lines. */
-        millisPerLine?: number;
-        /** Controls whether grid lines are 1px sharp, or softened. */
-        sharpLines?: boolean;
-        /** Number of vertical sections marked out by horizontal grid lines. */
-        verticalSections?: number;
-        /** Whether the grid lines trace the border of the chart or not. */
-        borderVisible?: boolean;
-    }
-
-    export interface ILabelOptions
-    {
-        /** Enables/disables labels showing the min/max values. */
-        disabled?: boolean;
-        /** Colour for text of labels. */
-        fillStyle?: string;
-        fontSize?: number;
-        fontFamily?: string;
-        precision?: number;
-    }
-
-    export interface IRange { min: number; max: number }
-
-    export interface IHorizontalLine
-    {
-        value?: number;
-        color?: string;
-        lineWidth?: number;
-    }
-
-    export interface IChartOptions
-    {
-        /** Specify to clamp the lower y-axis to a given value. */
-        minValue?: number;
-        /** Specify to clamp the upper y-axis to a given value. */
-        maxValue?: number;
-        /** Allows proportional padding to be added above the chart. for 10% padding, specify 1.1. */
-        maxValueScale?: number;
-        yRangeFunction?: (range:IRange)=>IRange;
-        /** Controls the rate at which y-value zoom animation occurs. */
-        scaleSmoothing?: number;
-        /** Sets the speed at which the chart pans by. */
-        millisPerPixel?: number;
-        /** Whether to render at different DPI depending upon the device. Enabled by default. */
-        enableDpiScaling?: boolean;
-        yMinFormatter?: (min:number, precision:number)=>string;
-        yMaxFormatter?: (max:number, precision:number)=>string;
-        maxDataSetLength?: number;
-        /** One of: 'bezier', 'linear', 'step' */
-        interpolation?: string;
-        /** Optional function to format time stamps for bottom of chart. You may use <code>SmoothieChart.timeFormatter</code>, or your own/ */
-        timestampFormatter?: (date:Date)=>string;
-        horizontalLines?: IHorizontalLine[];
-
-        grid?: IGridOptions;
-
-        labels?: ILabelOptions;
-    }
-
-    /**
-     * Initialises a new <code>SmoothieChart</code>.
-     *
-     * Options are optional and may be sparsely populated. Just specify the values you
-     * need and the rest will be given sensible defaults.
-     */
-    export class SmoothieChart
-    {
-        constructor(chartOptions?: IChartOptions);
-
-        /**
-         * Adds a <code>TimeSeries</code> to this chart, with optional presentation options.
-         */
-        addTimeSeries(series: TimeSeries, seriesOptions?: ITimeSeriesPresentationOptions): void;
-
-        /**
-         * Removes the specified <code>TimeSeries</code> from the chart.
-         */
-        removeTimeSeries(series: TimeSeries): void;
-
-        /**
-         * Gets render options for the specified <code>TimeSeries</code>.
-         *
-         * As you may use a single <code>TimeSeries</code> in multiple charts with different formatting in each usage,
-         * these settings are stored in the chart.
-         */
-        getTimeSeriesOptions(timeSeries: TimeSeries): ITimeSeriesPresentationOptions;
-
-        /**
-         * Brings the specified <code>TimeSeries</code> to the top of the chart. It will be rendered last.
-         */
-        bringToFront(timeSeries: TimeSeries): void;
-
-        /**
-         * Instructs the <code>SmoothieChart</code> to start rendering to the provided canvas, with specified delay.
-         *
-         * @param canvas the target canvas element
-         * @param delayMillis an amount of time to wait before a data point is shown. This can prevent the end of the series
-         * from appearing on screen, with new values flashing into view, at the expense of some latency.
-         */
-        streamTo(canvas: HTMLCanvasElement, delayMillis?: number): void;
-
-        /**
-         * Starts the animation of this chart. Called by <code>streamTo</code>.
-         */
-        start(): void;
-
-        /**
-         * Stops the animation of this chart.
-         */
-        stop(): void;
-
-        updateValueRange(): void;
-
-        render(canvas?: HTMLCanvasElement, time?: number): void;
-    }
-}
diff --git a/smoothie/tsconfig.json b/smoothie/tsconfig.json
new file mode 100644
index 0000000000..b4f79b6e6f
--- /dev/null
+++ b/smoothie/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "smoothie-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/smtpapi/index.d.ts b/smtpapi/index.d.ts
new file mode 100644
index 0000000000..d35f9dbc4c
--- /dev/null
+++ b/smtpapi/index.d.ts
@@ -0,0 +1,62 @@
+// Type definitions for smtpapi-nodejs v1.2.0
+// Project: https://github.com/sendgrid/smtpapi-nodejs
+// Definitions by: Antonio Morales <https://github.com/a-morales>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var smtp: SmtpApi.Constructor;
+export = smtp;
+
+declare namespace SmtpApi {
+
+  interface Header {
+    to: string[];
+    sub: Object;
+    unique_args: Object;
+    category: string[];
+    section: Object;
+    filters: Object;
+    send_at: "" | number;
+    send_each_at: number[];
+    asm_group_id: number;
+    ip_pool: string;
+  }
+
+  interface Constructor {
+        new (): Instance;
+        new (header: Header): Instance;
+  }
+
+  interface Instance {
+      header: Header;
+      version: string;
+
+      jsonObject(): Header;
+      jsonString(): string;
+
+      addTo(to: string): void;
+      addTo(tos: string[]): void;
+      addSubstitution(key: string, val: string): void;
+      addSubstitution(key: string, val: string[]): void;
+      addUniqueArg(key: string, val: string): void;
+      addCategory(cat: string): void;
+      addCategory(cat: string[]): void;
+      addSection(sec: string, val: string): void;
+      addFilter(filter: string, setting:string , val: number): void;
+      addFilter(filter: string, setting:string , val: string): void;
+      addSendEachAt(send_each_at: number): void;
+      addSendEachAt(send_each_at: number[]): void;
+
+      setTos(email: string): void;
+      setTos(emails: string[]): void;
+      setSubstitutions(subs: Object): void;
+      setUniqueArgs(val: Object): void;
+      setCategories(cats: string): void;
+      setCategories(cats: string[]): void;
+      setSections(sec: Object): void;
+      setFilters(filters: Object): void;
+      setSendAt(send_at: number): void;
+      setSendEachAt(send_each_at: number[]): void;
+      setASMGroupID(asm_group_id: number): void;
+      setIpPool(ip_pool: string): void;
+  }
+}
diff --git a/smtpapi/smtpapi-tests.ts b/smtpapi/smtpapi-tests.ts
index f5e437386f..6dc172e843 100644
--- a/smtpapi/smtpapi-tests.ts
+++ b/smtpapi/smtpapi-tests.ts
@@ -2,8 +2,6 @@
  * Created from usage code samples from //github.com/sendgrid/smtpapi-nodejs#usage
  */
 
-///<reference path="smtpapi.d.ts" />
-
 import smtpapi = require("smtpapi");
 var header = new smtpapi();
 
diff --git a/smtpapi/smtpapi.d.ts b/smtpapi/smtpapi.d.ts
deleted file mode 100644
index 6d7ca1e0a3..0000000000
--- a/smtpapi/smtpapi.d.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-// Type definitions for smtpapi-nodejs v1.2.0
-// Project: https://github.com/sendgrid/smtpapi-nodejs
-// Definitions by: Antonio Morales <https://github.com/a-morales>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace SmtpApi {
-
-  interface Header {
-    to: string[];
-    sub: Object;
-    unique_args: Object;
-    category: string[];
-    section: Object;
-    filters: Object;
-    send_at: "" | number;
-    send_each_at: number[];
-    asm_group_id: number;
-    ip_pool: string;
-  }
-
-  interface Constructor {
-        new (): Instance;
-        new (header: Header): Instance;
-  }
-
-  interface Instance {
-      header: Header;
-      version: string;
-
-      jsonObject(): Header;
-      jsonString(): string;
-
-      addTo(to: string): void;
-      addTo(tos: string[]): void;
-      addSubstitution(key: string, val: string): void;
-      addSubstitution(key: string, val: string[]): void;
-      addUniqueArg(key: string, val: string): void;
-      addCategory(cat: string): void;
-      addCategory(cat: string[]): void;
-      addSection(sec: string, val: string): void;
-      addFilter(filter: string, setting:string , val: number): void;
-      addFilter(filter: string, setting:string , val: string): void;
-      addSendEachAt(send_each_at: number): void;
-      addSendEachAt(send_each_at: number[]): void;
-
-      setTos(email: string): void;
-      setTos(emails: string[]): void;
-      setSubstitutions(subs: Object): void;
-      setUniqueArgs(val: Object): void;
-      setCategories(cats: string): void;
-      setCategories(cats: string[]): void;
-      setSections(sec: Object): void;
-      setFilters(filters: Object): void;
-      setSendAt(send_at: number): void;
-      setSendEachAt(send_each_at: number[]): void;
-      setASMGroupID(asm_group_id: number): void;
-      setIpPool(ip_pool: string): void;
-  }
-}
-
-declare module 'smtpapi' {
-  var smtp: SmtpApi.Constructor;
-  export = smtp;
-}
diff --git a/smtpapi/tsconfig.json b/smtpapi/tsconfig.json
new file mode 100644
index 0000000000..03c61f58e4
--- /dev/null
+++ b/smtpapi/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "smtpapi-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/snake-case/index.d.ts b/snake-case/index.d.ts
new file mode 100644
index 0000000000..493fe072c7
--- /dev/null
+++ b/snake-case/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for snake-case
+// Project: https://github.com/blakeembrey/snake-case
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function snakeCase(string: string, locale?: string): string;
+export = snakeCase;
diff --git a/snake-case/snake-case-tests.ts b/snake-case/snake-case-tests.ts
index e8d6db7bca..efabda950d 100644
--- a/snake-case/snake-case-tests.ts
+++ b/snake-case/snake-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="snake-case.d.ts" />
 
 import camelCase = require('snake-case');
 
diff --git a/snake-case/snake-case.d.ts b/snake-case/snake-case.d.ts
deleted file mode 100644
index df4a4652be..0000000000
--- a/snake-case/snake-case.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for snake-case
-// Project: https://github.com/blakeembrey/snake-case
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "snake-case" {
-	function snakeCase(string: string, locale?: string): string;
-	export = snakeCase;
-}
diff --git a/snake-case/tsconfig.json b/snake-case/tsconfig.json
new file mode 100644
index 0000000000..0df83fcf4f
--- /dev/null
+++ b/snake-case/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "snake-case-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/snapsvg/snapsvg.d.ts b/snapsvg/index.d.ts
similarity index 100%
rename from snapsvg/snapsvg.d.ts
rename to snapsvg/index.d.ts
diff --git a/snapsvg/snapsvg-tests-2.ts b/snapsvg/snapsvg-tests-2.ts
index 942f593aed..0ab83291bd 100644
--- a/snapsvg/snapsvg-tests-2.ts
+++ b/snapsvg/snapsvg-tests-2.ts
@@ -1,4 +1,4 @@
-/// <reference path="snapsvg.d.ts" />
+
 
 // tests by Daniel Rosenwasser
 function tester1() {
diff --git a/snapsvg/snapsvg-tests-3.ts b/snapsvg/snapsvg-tests-3.ts
index ad4512aa8c..d0d0a7b3fd 100644
--- a/snapsvg/snapsvg-tests-3.ts
+++ b/snapsvg/snapsvg-tests-3.ts
@@ -246,7 +246,7 @@ window.onload=()=>{
 
         function nextFrame ( el:Snap.Element, frameArray:any[],  whichFrame:number ) {
                 if( whichFrame >= frameArray.length ) { return }
-                el.animate( frameArray[ whichFrame ].animation, frameArray[ whichFrame ].dur, nextFrame.bind( null, el, frameArray, whichFrame + 1 ) );
+                el.animate( frameArray[ whichFrame ].animation, frameArray[ whichFrame ].dur, <any>nextFrame.bind( null, el, frameArray, whichFrame + 1 ) );
 
         }
 
diff --git a/snapsvg/snapsvg-tests.ts b/snapsvg/snapsvg-tests.ts
index b07bc20079..3f8094690f 100644
--- a/snapsvg/snapsvg-tests.ts
+++ b/snapsvg/snapsvg-tests.ts
@@ -1,6 +1,5 @@
-//Copied from the snap homepage http://snapsvg.io/
+// Copied from the snap homepage http://snapsvg.io/
 
-///<reference path="snapsvg.d.ts"/>
 // First lets create our drawing surface out of existing SVG element
 // If you want to create new surface just provide dimensions
 // like s = Snap(800, 600);
diff --git a/snapsvg/tsconfig.json b/snapsvg/tsconfig.json
new file mode 100644
index 0000000000..e002a1b7d8
--- /dev/null
+++ b/snapsvg/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "snapsvg-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/soap/index.d.ts b/soap/index.d.ts
new file mode 100644
index 0000000000..a5f12dc3ea
--- /dev/null
+++ b/soap/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for soap
+// Project: https://www.npmjs.com/package/soap
+// Definitions by: Nicole Wang <https://github.com/nicoleWjie>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import * as events from 'events';
+
+declare class WSSecurity {
+    constructor(username: string, password: string, options: any);
+}
+interface Client extends events.EventEmitter {
+    setSecurity(s: WSSecurity): void;
+    [method: string]: (args: any, fn: (err: any, result: any) => void, options?: any) => void;
+    addSoapHeader(headJSON: any): void;
+}
+declare function createClient(wsdlPath: string, options: any, fn: (err: any, client: Client) => void): void;
diff --git a/soap/soap-tests.ts b/soap/soap-tests.ts
index 5229cfcf8e..b05095e0c2 100644
--- a/soap/soap-tests.ts
+++ b/soap/soap-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="soap.d.ts" />
 
 import * as soap from 'soap';
 import * as events from 'events';
diff --git a/soap/soap.d.ts b/soap/soap.d.ts
deleted file mode 100644
index 36f50309b7..0000000000
--- a/soap/soap.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Type definitions for soap
-// Project: https://www.npmjs.com/package/soap
-// Definitions by: Nicole Wang <https://github.com/nicoleWjie>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path='../node/node.d.ts' />
-
-declare module 'soap' {
-    import * as events from 'events';
-
-    class WSSecurity {
-        constructor(username: string, password: string, options: any);
-    }
-    interface Client extends events.EventEmitter {
-        setSecurity(s: WSSecurity): void;
-        [method: string]: (args: any, fn: (err: any, result: any) => void, options?: any) => void;
-        addSoapHeader(headJSON: any): void;
-    }
-    function createClient(wsdlPath: string, options: any, fn: (err: any, client: Client) => void): void;
-
-}
\ No newline at end of file
diff --git a/soap/tsconfig.json b/soap/tsconfig.json
new file mode 100644
index 0000000000..61f33a3f80
--- /dev/null
+++ b/soap/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "soap-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/socket.io-client/socket.io-client.d.ts b/socket.io-client/index.d.ts
similarity index 100%
rename from socket.io-client/socket.io-client.d.ts
rename to socket.io-client/index.d.ts
diff --git a/socket.io-client/socket.io-client-tests.ts b/socket.io-client/socket.io-client-tests.ts
index f2563fc462..d72629358d 100644
--- a/socket.io-client/socket.io-client-tests.ts
+++ b/socket.io-client/socket.io-client-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="socket.io-client.d.ts"/>
-
 function testUsingWithNodeHTTPServer() {
     var socket = io('http://localhost');
     socket.on('news', function (data: any) {
diff --git a/socket.io-client/tsconfig.json b/socket.io-client/tsconfig.json
new file mode 100644
index 0000000000..abad6f3597
--- /dev/null
+++ b/socket.io-client/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "socket.io-client-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/socket.io-redis/index.d.ts b/socket.io-redis/index.d.ts
new file mode 100644
index 0000000000..7380182c12
--- /dev/null
+++ b/socket.io-redis/index.d.ts
@@ -0,0 +1,120 @@
+// Type definitions for socket.io-redis 1.0.0
+// Project: https://github.com/socketio/socket.io-redis
+// Definitions by: Philipp Holzer <https://github.com/nupplaphil/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="socket.io" />
+
+declare module 'socket.io-redis' {
+	var redis: SocketIORedisStatic;
+
+	export = redis;
+}
+
+interface SocketIORedisStatic {
+	/**
+	 * Default Redis Adapter constructor
+	 */
+	(): SocketIORedis.RedisAdapter;
+
+	/**
+	 * Creates a new Redis Adapter
+	 * @param uri Is a string like localhost:6379 where your redis server is located.
+	 * @param opts An optional parameters object
+	 */
+	(uri: string, opts?: SocketIORedis.SocketIORedisOptions): SocketIORedis.RedisAdapter;
+
+	/**
+	 * Creates a new Redis Adapter
+	 * @param opts A parameters object
+	 */
+	(opts: SocketIORedis.SocketIORedisOptions): SocketIORedis.RedisAdapter;
+}
+
+/**
+ * TODO: return Value for pubClient and subClient is RedisClient, but the im port throws errors because of "invalid module name in augmenatition"
+ *
+ */
+declare namespace SocketIORedis {
+	/**
+	 * Options to pass to the redis server when creating it
+	 */
+	interface SocketIORedisOptions {
+
+		/**
+		 * The optional name of the key to pub/sub events on as prefix
+		 * @default socket.io
+		 */
+		key?: string;
+
+		/**
+		 * The optional host to connect to redis on
+		 * @default localhost
+		 */
+		host?: string;
+
+		/**
+		 * The optional port to connect to redis on
+		 * @default 6379
+		 */
+		port?: string;
+
+		/**
+		 * The optional redis client to publish events on
+		 */
+		pubClient?: any;
+
+		/**
+		 * The optional redis client to subscribe to events on
+		 */
+		subClient?: any;
+	}
+
+	interface RedisAdapter extends SocketIO.Adapter {
+
+		/**
+		 * This servers key
+		 */
+		uid: string;
+
+		/**
+		 * The prefix of pub/sub events
+		 */
+		prefix: string;
+
+		/**
+		 * Optional, the redis client to publish events on
+		 */
+		pubClient?: any;
+
+		/**
+		 * Optional, the redis client to subscribe to events on
+		 */
+		subClient?: any;
+
+		/**
+		 * Broadcasts a packet
+		 * @param packet The packet to broadcast
+		 * @param opts Any options to send along:
+		 *    - rooms: An optional list of rooms to broadcast to. If empty, the packet is broadcast to all sockets
+		 *    - except: A list of Socket IDs to exclude
+		 *    - flags: Any flags that we want to send along ('json', 'volatile', 'broadcast')
+		 * @param remote The optional flag, whether the packet came from another node
+		 */
+		broadcast: {
+			(packet: any, opts: { rooms?: string[]; except?: string[]; flags?: {[flag: string]: boolean} }): void;
+			(packet: any, opts: { rooms?: string[]; except?: string[]; flags?: {[flag: string]: boolean} }, remote?: boolean): void;
+		};
+
+		/**
+		 * Removes a socket from all the rooms that it's joined
+		 * @param id The ID of the socket that we're removing
+		 * @param callback An optional callback to call when the socket has been
+		 */
+		delAll: {
+			(id: string): void;
+			(id: string, callback?: (err?: any) => void): void;
+		};
+	}
+}
diff --git a/socket.io-redis/socket.io-redis-tests.ts b/socket.io-redis/socket.io-redis-tests.ts
index 2ce2be1bd6..28b0f9873f 100644
--- a/socket.io-redis/socket.io-redis-tests.ts
+++ b/socket.io-redis/socket.io-redis-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="../socket.io/socket.io.d.ts"/>
-/// <reference path="../redis/redis.d.ts"/>
-/// <reference path="socket.io-redis.d.ts"/>
+/// <reference types="socket.io"/>
 
 import socketIO = require('socket.io');
 import ioRedis = require('socket.io-redis');
diff --git a/socket.io-redis/socket.io-redis.d.ts b/socket.io-redis/socket.io-redis.d.ts
deleted file mode 100644
index b3eb44e5ec..0000000000
--- a/socket.io-redis/socket.io-redis.d.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-// Type definitions for socket.io-redis 1.0.0
-// Project: https://github.com/socketio/socket.io-redis
-// Definitions by: Philipp Holzer <https://github.com/nupplaphil/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../redis/redis.d.ts" />
-/// <reference path="../socket.io/socket.io.d.ts" />
-
-declare module 'socket.io-redis' {
-	var redis: SocketIORedisStatic;
-
-	export = redis;
-}
-
-interface SocketIORedisStatic {
-	/**
-	 * Default Redis Adapter constructor
-	 */
-	(): SocketIORedis.RedisAdapter;
-
-	/**
-	 * Creates a new Redis Adapter
-	 * @param uri Is a string like localhost:6379 where your redis server is located.
-	 * @param opts An optional parameters object
-	 */
-	(uri: string, opts?: SocketIORedis.SocketIORedisOptions): SocketIORedis.RedisAdapter;
-
-	/**
-	 * Creates a new Redis Adapter
-	 * @param opts A parameters object
-	 */
-	(opts: SocketIORedis.SocketIORedisOptions): SocketIORedis.RedisAdapter;
-}
-
-/**
- * TODO: return Value for pubClient and subClient is RedisClient, but the im port throws errors because of "invalid module name in augmenatition"
- *
- */
-declare namespace SocketIORedis {
-	/**
-	 * Options to pass to the redis server when creating it
-	 */
-	interface SocketIORedisOptions {
-
-		/**
-		 * The optional name of the key to pub/sub events on as prefix
-		 * @default socket.io
-		 */
-		key?: string;
-
-		/**
-		 * The optional host to connect to redis on
-		 * @default localhost
-		 */
-		host?: string;
-
-		/**
-		 * The optional port to connect to redis on
-		 * @default 6379
-		 */
-		port?: string;
-
-		/**
-		 * The optional redis client to publish events on
-		 */
-		pubClient?: any;
-
-		/**
-		 * The optional redis client to subscribe to events on
-		 */
-		subClient?: any;
-	}
-
-	interface RedisAdapter extends SocketIO.Adapter {
-
-		/**
-		 * This servers key
-		 */
-		uid: string;
-
-		/**
-		 * The prefix of pub/sub events
-		 */
-		prefix: string;
-
-		/**
-		 * Optional, the redis client to publish events on
-		 */
-		pubClient?: any;
-
-		/**
-		 * Optional, the redis client to subscribe to events on
-		 */
-		subClient?: any;
-
-		/**
-		 * Broadcasts a packet
-		 * @param packet The packet to broadcast
-		 * @param opts Any options to send along:
-		 *    - rooms: An optional list of rooms to broadcast to. If empty, the packet is broadcast to all sockets
-		 *    - except: A list of Socket IDs to exclude
-		 *    - flags: Any flags that we want to send along ('json', 'volatile', 'broadcast')
-		 * @param remote The optional flag, whether the packet came from another node
-		 */
-		broadcast: {
-			(packet: any, opts: { rooms?: string[]; except?: string[]; flags?: {[flag: string]: boolean} }): void;
-			(packet: any, opts: { rooms?: string[]; except?: string[]; flags?: {[flag: string]: boolean} }, remote?: boolean): void;
-		};
-
-		/**
-		 * Removes a socket from all the rooms that it's joined
-		 * @param id The ID of the socket that we're removing
-		 * @param callback An optional callback to call when the socket has been
-		 */
-		delAll: {
-			(id: string): void;
-			(id: string, callback?: (err?: any) => void): void;
-		};
-	}
-}
diff --git a/socket.io-redis/tsconfig.json b/socket.io-redis/tsconfig.json
new file mode 100644
index 0000000000..a2410dc9e4
--- /dev/null
+++ b/socket.io-redis/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "socket.io-redis-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/socket.io.users/index.d.ts b/socket.io.users/index.d.ts
new file mode 100644
index 0000000000..e7c346f7f4
--- /dev/null
+++ b/socket.io.users/index.d.ts
@@ -0,0 +1,77 @@
+// Type definitions for socket.io.users
+// Project: https://github.com/nodets/socket.io.users
+// Definitions by: Makis Maropoulos <https://github.com/kataras>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+/// <reference types="express-session" />
+/// <reference types="socket.io" />
+
+
+import { EventEmitter } from 'events';
+import { Application } from "express";
+import { SessionOptions } from "express-session";
+
+declare var CONNECTION_EVENTS: string[];
+declare var Middleware: () => (socket: SocketIO.Socket, next: () => any) => void;
+declare var Session: (app: Application, options?: SessionOptions) => void;
+
+type SocketUserList = {
+    [namespace: string]: Users;
+};
+
+declare class Namespaces {
+    private static socketUsersList: any;
+    static attach(namespace: string, socketUsersObj: Users): void;
+    static get(namespace: string): Users;
+}
+
+declare class User {
+    id: string | number;
+    socket: SocketIO.Socket;
+    sockets: SocketIO.Socket[];
+    rooms: string[];
+    ip: string;
+    remoteAddresses: string[];
+    store: any;
+    attach(socket: SocketIO.Socket): void;
+    detachSocket(socket: SocketIO.Socket): void;
+    detach(): void;
+    join(room: string): boolean;
+    leave(room: string): void;
+    leaveAll(): void;
+    /** same as in, checks if this user is inside a room */
+    belong(room: string): boolean;
+    /** same as belong, checks if this user is inside a room  */
+    in(room: string): boolean;
+    set(key: string, value: any, callback?: () => void): void;
+    get: (key: string) => any;
+    toString(): string;
+    emit(...args: any[]): void;
+    to(room: string): SocketIO.Socket;
+}
+
+
+declare class Users extends EventEmitter {
+    namespace: string;
+    users: User[];
+    constructor(namespace?: string);
+    static of(namespace?: string): Users;
+    takeId: (request: any) => string | number;
+    create(socket: SocketIO.Socket): User;
+    getById(id: string | number): User;
+    get(socket: SocketIO.Socket): User;
+    list(): User[];
+    size(): number;
+    push(_user: User): void;
+    add(socket: SocketIO.Socket): User;
+    indexOf(user: User): number;
+    remove(user: User): void;
+    room(room: string): User[];
+    in(room: string): User[];
+    from(room: string): User[];
+    update(user: User): void;
+    emitAll(...args: any[]): void;
+    registerSocketEvents(currentUser: User): void;
+}
diff --git a/socket.io.users/socket.io.users-tests.ts b/socket.io.users/socket.io.users-tests.ts
index 54a0472628..565f6a7d7b 100644
--- a/socket.io.users/socket.io.users-tests.ts
+++ b/socket.io.users/socket.io.users-tests.ts
@@ -1,7 +1,7 @@
-/// <reference path="../socket.io/socket.io.d.ts"/>
-/// <reference path="socket.io.users.d.ts" />
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../express/express.d.ts" />
+/// <reference types="socket.io"/>
+
+/// <reference types="node" />
+
 var express = require('express');
 var app = express();
 var httpServer = require('http').createServer(app);
diff --git a/socket.io.users/socket.io.users.d.ts b/socket.io.users/socket.io.users.d.ts
deleted file mode 100644
index 0a6c78473e..0000000000
--- a/socket.io.users/socket.io.users.d.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-// Type definitions for socket.io.users
-// Project: https://github.com/nodets/socket.io.users
-// Definitions by: Makis Maropoulos <https://github.com/kataras>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../express/express.d.ts" />
-/// <reference path="../express-session/express-session.d.ts" />
-/// <reference path="../socket.io/socket.io.d.ts" />
-
-declare module "socket.io.users" {
-	import { EventEmitter } from 'events';
-	import { Application } from "express";
-	import { SessionOptions } from "express-session";
-
-	var CONNECTION_EVENTS: string[];
-	var Middleware: () => (socket: SocketIO.Socket, next: () => any) => void;
-	var Session: (app: Application, options?: SessionOptions) => void;
-
-	type SocketUserList = {
-		[namespace: string]: Users;
-	};
-
-	class Namespaces {
-		private static socketUsersList: any;
-		static attach(namespace: string, socketUsersObj: Users): void;
-		static get(namespace: string): Users;
-	}
-
-	class User {
-		id: string | number;
-		socket: SocketIO.Socket;
-		sockets: SocketIO.Socket[];
-		rooms: string[];
-		ip: string;
-		remoteAddresses: string[];
-		store: any;
-		attach(socket: SocketIO.Socket): void;
-		detachSocket(socket: SocketIO.Socket): void;
-		detach(): void;
-		join(room: string): boolean;
-		leave(room: string): void;
-		leaveAll(): void;
-		/** same as in, checks if this user is inside a room */
-		belong(room: string): boolean;
-		/** same as belong, checks if this user is inside a room  */
-		in(room: string): boolean;
-		set(key: string, value: any, callback?: () => void): void;
-		get: (key: string) => any;
-		toString(): string;
-		emit(...args: any[]): void;
-		to(room: string): SocketIO.Socket;
-	}
-
-
-	class Users extends EventEmitter {
-		namespace: string;
-		users: User[];
-		constructor(namespace?: string);
-		static of(namespace?: string): Users;
-		takeId: (request: any) => string | number;
-		create(socket: SocketIO.Socket): User;
-		getById(id: string | number): User;
-		get(socket: SocketIO.Socket): User;
-		list(): User[];
-		size(): number;
-		push(_user: User): void;
-		add(socket: SocketIO.Socket): User;
-		indexOf(user: User): number;
-		remove(user: User): void;
-		room(room: string): User[];
-		in(room: string): User[];
-		from(room: string): User[];
-		update(user: User): void;
-		emitAll(...args: any[]): void;
-		registerSocketEvents(currentUser: User): void;
-	}
-
-}
diff --git a/socket.io.users/tsconfig.json b/socket.io.users/tsconfig.json
new file mode 100644
index 0000000000..935778e0a5
--- /dev/null
+++ b/socket.io.users/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "socket.io.users-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/socket.io/index.d.ts b/socket.io/index.d.ts
new file mode 100644
index 0000000000..66b5673b60
--- /dev/null
+++ b/socket.io/index.d.ts
@@ -0,0 +1,857 @@
+// Type definitions for socket.io 1.4.4
+// Project: http://socket.io/
+// Definitions by: PROGRE <https://github.com/progre/>, Damian Connolly <https://github.com/divillysausages/>, Florent Poujol <https://github.com/florentpoujol/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="node" />
+
+declare module 'socket.io' {
+	var server: SocketIOStatic;
+
+	export = server;
+}
+
+interface SocketIOStatic {
+	/**
+	 * Default Server constructor
+	 */
+	(): SocketIO.Server;
+
+	/**
+	 * Creates a new Server
+	 * @param srv The HTTP server that we're going to bind to
+	 * @param opts An optional parameters object
+	 */
+	(srv: any, opts?: SocketIO.ServerOptions): SocketIO.Server;
+
+	/**
+	 * Creates a new Server
+	 * @param port A port to bind to, as a number, or a string
+	 * @param An optional parameters object
+	 */
+	(port: string|number, opts?: SocketIO.ServerOptions): SocketIO.Server;
+
+	/**
+	 * Creates a new Server
+	 * @param A parameters object
+	 */
+	(opts: SocketIO.ServerOptions): SocketIO.Server;
+
+	/**
+	 * Backwards compatibility
+	 * @see io().listen()
+	 */
+    listen: SocketIOStatic;
+}
+
+declare namespace SocketIO {
+
+	interface Server {
+
+		/**
+		 * A dictionary of all the namespaces currently on this Server
+		 */
+		nsps: {[namespace: string]: Namespace};
+
+		/**
+		 * The default '/' Namespace
+		 */
+		sockets: Namespace;
+
+		/**
+		 * Sets the 'json' flag when emitting an event
+		 */
+		json: Server;
+
+		/**
+		 * Server request verification function, that checks for allowed origins
+		 * @param req The http.IncomingMessage request
+		 * @param fn The callback to be called. It should take one parameter, err,
+		 * which will be null if there was no problem, and one parameter, success,
+		 * of type boolean
+		 */
+		checkRequest( req:any, fn:( err: any, success: boolean ) => void ):void;
+
+		/**
+		 * Gets whether we're serving the client.js file or not
+		 * @default true
+		 */
+		serveClient(): boolean;
+
+		/**
+		 * Sets whether we're serving the client.js file or not
+		 * @param v True if we want to serve the file, false otherwise
+		 * @default true
+		 * @return This Server
+		 */
+		serveClient( v: boolean ): Server;
+
+		/**
+		 * Gets the client serving path
+		 * @default '/socket.io'
+		 */
+		path(): string;
+
+		/**
+		 * Sets the client serving path
+		 * @param v The path to serve the client file on
+		 * @default '/socket.io'
+		 * @return This Server
+		 */
+		path( v: string ): Server;
+
+		/**
+		 * Gets the adapter that we're going to use for handling rooms
+		 * @default typeof Adapter
+		 */
+		adapter(): any;
+
+		/**
+		 * Sets the adapter (class) that we're going to use for handling rooms
+		 * @param v The class for the adapter to create
+		 * @default typeof Adapter
+		 * @return This Server
+		 */
+		adapter( v: any ): Server;
+
+		/**
+		 * Gets the allowed origins for requests
+		 * @default "*:*"
+		 */
+		origins(): string;
+
+		/**
+		 * Sets the allowed origins for requests
+		 * @param v The allowed origins, in host:port form
+		 * @default "*:*"
+		 * return This Server
+		 */
+		origins( v: string ): Server;
+
+		/**
+		 * Attaches socket.io to a server
+		 * @param srv The http.Server that we want to attach to
+		 * @param opts An optional parameters object
+		 * @return This Server
+		 */
+		attach( srv: any, opts?: ServerOptions ): Server;
+
+		/**
+		 * Attaches socket.io to a port
+		 * @param port The port that we want to attach to
+		 * @param opts An optional parameters object
+		 * @return This Server
+		 */
+		attach( port: number, opts?: ServerOptions ): Server;
+
+		/**
+		 * @see attach( srv, opts )
+		 */
+		listen( srv: any, opts?: ServerOptions ): Server;
+
+		/**
+		 * @see attach( port, opts )
+		 */
+		listen( port: number, opts?: ServerOptions ): Server;
+
+		/**
+		 * Binds socket.io to an engine.io intsance
+		 * @param src The Engine.io (or compatible) server to bind to
+		 * @return This Server
+		 */
+		bind( srv: any ): Server;
+
+		/**
+		 * Called with each incoming connection
+		 * @param socket The Engine.io Socket
+		 * @return This Server
+		 */
+		onconnection( socket: any ): Server;
+
+		/**
+		 * Looks up/creates a Namespace
+		 * @param nsp The name of the NameSpace to look up/create. Should start
+		 * with a '/'
+		 * @return The Namespace
+		 */
+		of( nsp: string ): Namespace;
+
+		/**
+		 * Closes the server connection
+		 */
+		close():void;
+
+		/**
+		 * The event fired when we get a new connection
+		 * @param event The event being fired: 'connection'
+		 * @param listener A listener that should take one parameter of type Socket
+		 * @return The default '/' Namespace
+		 */
+		on( event: 'connection', listener: ( socket: Socket ) => void ): Namespace;
+
+		/**
+		 * @see on( 'connection', listener )
+		 */
+		on( event: 'connect', listener: ( socket: Socket ) => void ): Namespace;
+
+		/**
+		 * Base 'on' method to add a listener for an event
+		 * @param event The event that we want to add a listener for
+		 * @param listener The callback to call when we get the event. The parameters
+		 * for the callback depend on the event
+		 * @return The default '/' Namespace
+		 */
+		on( event: string, listener: Function ): Namespace;
+
+		/**
+		 * Targets a room when emitting to the default '/' Namespace
+		 * @param room The name of the room that we're targeting
+		 * @return The default '/' Namespace
+		 */
+		to( room: string ): Namespace;
+
+		/**
+		 * @see to( room )
+		 */
+		in( room: string ): Namespace;
+
+		/**
+		 * Registers a middleware function, which is a function that gets executed
+		 * for every incoming Socket, on the default '/' Namespace
+		 * @param fn The function to call when we get a new incoming socket. It should
+		 * take one parameter of type Socket, and one callback function to call to
+		 * execute the next middleware function. The callback can take one optional
+		 * parameter, err, if there was an error. Errors passed to middleware callbacks
+		 * are sent as special 'error' packets to clients
+		 * @return The default '/' Namespace
+		 */
+		use( fn: ( socket:Socket, fn: ( err?: any ) => void ) =>void ): Namespace;
+
+		/**
+		 * Emits an event to the default Namespace
+		 * @param event The event that we want to emit
+		 * @param args Any number of optional arguments to pass with the event. If the
+		 * last argument is a function, it will be called as an ack. The ack should
+		 * take whatever data was sent with the packet
+		 * @return The default '/' Namespace
+		 */
+		emit( event: string, ...args: any[]): Namespace;
+
+		/**
+		 * Sends a 'message' event
+		 * @see emit( event, ...args )
+		 * @return The default '/' Namespace
+		 */
+		send( ...args: any[] ): Namespace;
+
+		/**
+		 * @see send( ...args )
+		 */
+		write( ...args: any[] ): Namespace;
+
+		/**
+		 * Gets a list of clients
+		 * @return The default '/' Namespace
+		 */
+		clients( ...args: any[] ): Namespace;
+
+		/**
+		 * Sets the compress flag
+		 * @return The default '/' Namespace
+		 */
+		compress( ...args: any[] ): Namespace;
+	}
+
+	/**
+	 * Options to pass to our server when creating it
+	 */
+	interface ServerOptions {
+
+		/**
+		 * The path to server the client file to
+		 * @default '/socket.io'
+		 */
+		path?: string;
+
+		/**
+		 * Should we serve the client file?
+		 * @default true
+		 */
+		serveClient?: boolean;
+
+		/**
+		 * The adapter to use for handling rooms. NOTE: this should be a class,
+		 * not an object
+		 * @default typeof Adapter
+		 */
+		adapter?: Adapter;
+
+		/**
+		 * Accepted origins
+		 * @default '*:*'
+		 */
+		origins?: string;
+
+		/**
+		 * How many milliseconds without a pong packed to consider the connection closed (engine.io)
+		 * @default 60000
+		 */
+		pingTimeout?: number;
+
+		/**
+		 * How many milliseconds before sending a new ping packet (keep-alive) (engine.io)
+		 * @default 25000
+		 */
+		pingInterval?: number;
+
+		/**
+		 * How many bytes or characters a message can be when polling, before closing the session
+		 * (to avoid Dos) (engine.io)
+		 * @default 10E7
+		 */
+		maxHttpBufferSize?: number;
+
+		/**
+		 * A function that receives a given handshake or upgrade request as its first parameter,
+		 * and can decide whether to continue or not. The second argument is a function that needs
+		 * to be called with the decided information: fn( err, success ), where success is a boolean
+		 * value where false means that the request is rejected, and err is an error code (engine.io)
+		 * @default null
+		 */
+		allowRequest?: (request:any, callback: (err: number, success: boolean) => void) => void;
+
+		/**
+		 * Transports to allow connections to (engine.io)
+		 * @default ['polling','websocket']
+		 */
+		transports?: string[];
+
+		/**
+		 * Whether to allow transport upgrades (engine.io)
+		 * @default true
+		 */
+		allowUpgrades?: boolean;
+
+		/**
+		 * parameters of the WebSocket permessage-deflate extension (see ws module).
+		 * Set to false to disable (engine.io)
+		 * @default true
+		 */
+		perMessageDeflate?: Object|boolean;
+
+		/**
+		 * Parameters of the http compression for the polling transports (see zlib).
+		 * Set to false to disable, or set an object with parameter "threshold:number"
+		 * to only compress data if the byte size is above this value (1024) (engine.io)
+		 * @default true|1024
+		 */
+		httpCompression?: Object|boolean;
+
+		/**
+		 * Name of the HTTP cookie that contains the client sid to send as part of
+		 * handshake response headers. Set to false to not send one (engine.io)
+		 * @default "io"
+		 */
+		cookie?: string|boolean;
+	}
+
+	/**
+	 * The Namespace, sandboxed environments for sockets, each connection
+	 * to a Namespace requires a new Socket
+	 */
+	interface Namespace extends NodeJS.EventEmitter {
+
+		/**
+		 * The name of the NameSpace
+		 */
+		name: string;
+
+		/**
+		 * The controller Server for this Namespace
+		 */
+		server: Server;
+
+		/**
+		 * A dictionary of all the Sockets connected to this Namespace, where
+		 * the Socket ID is the key
+		 */
+		sockets: { [id: string]: Socket };
+
+		/**
+		 * A dictionary of all the Sockets connected to this Namespace, where
+		 * the Socket ID is the key
+		 */
+		connected: { [id: string]: Socket };
+
+		/**
+		 * The Adapter that we're using to handle dealing with rooms etc
+		 */
+		adapter: Adapter;
+
+		/**
+		 * Sets the 'json' flag when emitting an event
+		 */
+		json: Namespace;
+
+		/**
+		 * Registers a middleware function, which is a function that gets executed
+		 * for every incoming Socket
+		 * @param fn The function to call when we get a new incoming socket. It should
+		 * take one parameter of type Socket, and one callback function to call to
+		 * execute the next middleware function. The callback can take one optional
+		 * parameter, err, if there was an error. Errors passed to middleware callbacks
+		 * are sent as special 'error' packets to clients
+		 * @return This Namespace
+		 */
+		use( fn: ( socket:Socket, fn: ( err?: any ) => void ) =>void ): Namespace;
+
+		/**
+		 * Targets a room when emitting
+		 * @param room The name of the room that we're targeting
+		 * @return This Namespace
+		 */
+		to( room: string ): Namespace;
+
+		/**
+		 * @see to( room )
+		 */
+		in( room: string ): Namespace;
+
+		/**
+		 * Sends a 'message' event
+		 * @see emit( event, ...args )
+		 * @return This Namespace
+		 */
+		send( ...args: any[] ): Namespace;
+
+		/**
+		 * @see send( ...args )
+		 */
+		write( ...args: any[] ): Namespace;
+
+		/**
+		 * The event fired when we get a new connection
+		 * @param event The event being fired: 'connection'
+		 * @param listener A listener that should take one parameter of type Socket
+		 * @return This Namespace
+		 */
+		on( event: 'connection', listener: ( socket: Socket ) => void ): this;
+
+		/**
+		 * @see on( 'connection', listener )
+		 */
+		on( event: 'connect', listener: ( socket: Socket ) => void ): this;
+
+		/**
+		 * Base 'on' method to add a listener for an event
+		 * @param event The event that we want to add a listener for
+		 * @param listener The callback to call when we get the event. The parameters
+		 * for the callback depend on the event
+		 * @ This Namespace
+		 */
+		on( event: string, listener: Function ): this;
+
+		/**
+		 * Gets a list of clients.
+		 * @return This Namespace
+		 */
+		clients( fn: Function ): Namespace;
+
+		/**
+		 * Sets the compress flag.
+		 * @param compress If `true`, compresses the sending data
+		 * @return This Namespace
+		 */
+		compress( compress: boolean ): Namespace;
+	}
+
+	/**
+	 * The socket, which handles our connection for a namespace. NOTE: while
+	 * we technically extend NodeJS.EventEmitter, we're not putting it here
+	 * as we have a problem with the emit() event (as it's overridden with a
+	 * different return)
+	 */
+	interface Socket {
+
+		/**
+		 * The namespace that this socket is for
+		 */
+		nsp: Namespace;
+
+		/**
+		 * The Server that our namespace is in
+		 */
+		server: Server;
+
+		/**
+		 * The Adapter that we use to handle our rooms
+		 */
+		adapter: Adapter;
+
+		/**
+		 * The unique ID for this Socket. Regenerated at every connection. This is
+		 * also the name of the room that the Socket automatically joins on connection
+		 */
+		id: string;
+
+		/**
+		 * The http.IncomingMessage request sent with the connection. Useful
+		 * for recovering headers etc
+		 */
+		request: any;
+
+		/**
+		 * The Client associated with this Socket
+		 */
+		client: Client;
+
+		/**
+		 * The underlying Engine.io Socket instance
+		 */
+		conn: {
+
+			/**
+			 * The ID for this socket - matches Client.id
+			 */
+			id: string;
+
+			/**
+			 * The Engine.io Server for this socket
+			 */
+			server: any;
+
+			/**
+			 * The ready state for the client. Either 'opening', 'open', 'closing', or 'closed'
+			 */
+			readyState: string;
+
+			/**
+			 * The remote IP for this connection
+			 */
+			remoteAddress: string;
+		};
+
+		/**
+		 * The list of rooms that this Socket is currently in, where
+		 * the ID the the room ID
+		 */
+		rooms: { [id: string]: string };
+
+		/**
+		 * Is the Socket currently connected?
+		 */
+		connected: boolean;
+
+		/**
+		 * Is the Socket currently disconnected?
+		 */
+		disconnected: boolean;
+
+		/**
+		 * The object used when negociating the handshake
+		 */
+		handshake: {
+			/**
+			 * The headers passed along with the request. e.g. 'host',
+			 * 'connection', 'accept', 'referer', 'cookie'
+			 */
+			headers: any;
+
+			/**
+			 * The current time, as a string
+			 */
+			time: string;
+
+			/**
+			 * The remote address of the connection request
+			 */
+			address: string;
+
+			/**
+			 * Is this a cross-domain request?
+			 */
+			xdomain: boolean;
+
+			/**
+			 * Is this a secure request?
+			 */
+			secure: boolean;
+
+			/**
+			 * The timestamp for when this was issued
+			 */
+			issued: number;
+
+			/**
+			 * The request url
+			 */
+			url: string;
+
+			/**
+			 * Any query string parameters in the request url
+			 */
+			query: any;
+		};
+
+		/**
+		 * Sets the 'json' flag when emitting an event
+		 */
+		json: Socket;
+
+		/**
+		 * Sets the 'volatile' flag when emitting an event. Volatile messages are
+		 * messages that can be dropped because of network issues and the like. Use
+		 * for high-volume/real-time messages where you don't need to receive *all*
+		 * of them
+		 */
+		volatile: Socket;
+
+		/**
+		 * Sets the 'broadcast' flag when emitting an event. Broadcasting an event
+		 * will send it to all the other sockets in the namespace except for yourself
+		 */
+		broadcast: Socket;
+
+		/**
+		 * Emits an event to this client. If the 'broadcast' flag was set, this will
+		 * emit to all other clients, except for this one
+		 * @param event The event that we want to emit
+		 * @param args Any number of optional arguments to pass with the event. If the
+		 * last argument is a function, it will be called as an ack. The ack should
+		 * take whatever data was sent with the packet
+		 * @return This Socket
+		 */
+		emit( event: string, ...args: any[]): Socket;
+
+		/**
+		 * Targets a room when broadcasting
+		 * @param room The name of the room that we're targeting
+		 * @return This Socket
+		 */
+		to( room: string ): Socket;
+
+		/**
+		 * @see to( room )
+		 */
+		in( room: string ): Socket;
+
+		/**
+		 * Sends a 'message' event
+		 * @see emit( event, ...args )
+		 */
+		send( ...args: any[] ): Socket;
+
+		/**
+		 * @see send( ...args )
+		 */
+		write( ...args: any[] ): Socket;
+
+		/**
+		 * Joins a room. You can join multiple rooms, and by default, on connection,
+		 * you join a room with the same name as your ID
+		 * @param name The name of the room that we want to join
+		 * @param fn An optional callback to call when we've joined the room. It should
+		 * take an optional parameter, err, of a possible error
+		 * @return This Socket
+		 */
+		join( name: string, fn?: ( err?: any ) => void ): Socket;
+
+		/**
+		 * Leaves a room
+		 * @param name The name of the room to leave
+		 * @param fn An optional callback to call when we've left the room. It should
+		 * take on optional parameter, err, of a possible error
+		 */
+		leave( name: string, fn?: Function ): Socket;
+
+		/**
+		 * Leaves all the rooms that we've joined
+		 */
+		leaveAll(): void;
+
+		/**
+		 * Disconnects this Socket
+		 * @param close If true, also closes the underlying connection
+		 * @return This Socket
+		 */
+		disconnect( close?: boolean ): Socket;
+
+		/**
+		 * Adds a listener for a particular event. Calling multiple times will add
+		 * multiple listeners
+		 * @param event The event that we're listening for
+		 * @param fn The function to call when we get the event. Parameters depend on the
+		 * event in question
+		 * @return This Socket
+		 */
+		on( event: string, fn: Function ): Socket;
+
+		/**
+		 * @see on( event, fn )
+		 */
+		addListener( event: string, fn: Function ): Socket;
+
+		/**
+		 * Adds a listener for a particular event that will be invoked
+		 * a single time before being automatically removed
+		 * @param event The event that we're listening for
+		 * @param fn The function to call when we get the event. Parameters depend on
+		 * the event in question
+		 * @return This Socket
+		 */
+		once( event: string, fn: Function ): Socket;
+
+		/**
+		 * Removes a listener for a particular type of event. This will either
+		 * remove a specific listener, or all listeners for this type of event
+		 * @param event The event that we want to remove the listener of
+		 * @param fn The function to remove, or null if we want to remove all functions
+		 * @return This Socket
+		 */
+		removeListener( event: string, fn?: Function ): Socket;
+
+		/**
+		 * Removes all event listeners on this object
+		 * @return This Socket
+		 */
+		removeAllListeners( event?: string ): Socket;
+
+		/**
+		 * Sets the maximum number of listeners this instance can have
+		 * @param n The max number of listeners we can add to this emitter
+		 * @return This Socket
+		 */
+		setMaxListeners( n: number ): Socket;
+
+		/**
+		 * Returns all the callbacks for a particular event
+		 * @param event The event that we're looking for the callbacks of
+		 * @return An array of callback Functions, or an empty array if we don't have any
+		 */
+		listeners( event: string ):Function[];
+
+		/**
+		 * Sets the compress flag
+		 * @param compress If `true`, compresses the sending data
+		 * @return This Socket
+		 */
+		compress( compress: boolean ): Socket;
+	}
+
+	/**
+	 * The interface used when dealing with rooms etc
+	 */
+	interface Adapter extends NodeJS.EventEmitter {
+
+		/**
+		 * The namespace that this adapter is for
+		 */
+		nsp: Namespace;
+
+		/**
+		 * A dictionary of all the rooms that we have in this namespace
+		 * The rooms are made of a `sockets` key which is the dictionary of sockets per ID
+		 */
+		rooms: {[room: string]: {sockets: {[id: string]: boolean }}};
+
+		/**
+		 * A dictionary of all the socket ids that we're dealing with, and all
+		 * the rooms that the socket is currently in
+		 */
+		sids: {[id: string]: {[room: string]: boolean}};
+
+		/**
+		 * Adds a socket to a room. If the room doesn't exist, it's created
+		 * @param id The ID of the socket to add
+		 * @param room The name of the room to add the socket to
+		 * @param callback An optional callback to call when the socket has been
+		 * added. It should take an optional parameter, error, if there was a problem
+		 */
+		add( id: string, room: string, callback?: ( err?: any ) => void ): void;
+
+		/**
+		 * Removes a socket from a room. If there are no more sockets in the room,
+		 * the room is deleted
+		 * @param id The ID of the socket that we're removing
+		 * @param room The name of the room to remove the socket from
+		 * @param callback An optional callback to call when the socket has been
+		 * removed. It should take on optional parameter, error, if there was a problem
+		 */
+		del( id: string, room: string, callback?: ( err?: any ) => void ): void;
+
+		/**
+		 * Removes a socket from all the rooms that it's joined
+		 * @param id The ID of the socket that we're removing
+		 */
+		delAll( id: string ):void;
+
+		/**
+		 * Broadcasts a packet
+		 * @param packet The packet to broadcast
+		 * @param opts Any options to send along:
+		 * 	- rooms: An optional list of rooms to broadcast to. If empty, the packet is broadcast to all sockets
+		 * 	- except: A list of Socket IDs to exclude
+		 * 	- flags: Any flags that we want to send along ('json', 'volatile', 'broadcast')
+		 */
+		broadcast( packet: any, opts: { rooms?: string[]; except?: string[]; flags?: {[flag: string]: boolean} } ):void;
+	}
+
+	/**
+	 * The client behind each socket (can have multiple sockets)
+	 */
+	interface Client {
+		/**
+		 * The Server that this client belongs to
+		 */
+		server: Server;
+
+		/**
+		 * The underlying Engine.io Socket instance
+		 */
+		conn: {
+
+			/**
+			 * The ID for this socket - matches Client.id
+			 */
+			id: string;
+
+			/**
+			 * The Engine.io Server for this socket
+			 */
+			server: any;
+
+			/**
+			 * The ready state for the client. Either 'opening', 'open', 'closing', or 'closed'
+			 */
+			readyState: string;
+
+			/**
+			 * The remote IP for this connection
+			 */
+			remoteAddress: string;
+		};
+
+		/**
+		 * The ID for this client. Regenerated at every connection
+		 */
+		id: string;
+
+		/**
+		 * The http.IncomingMessage request sent with the connection. Useful
+		 * for recovering headers etc
+		 */
+		request: any;
+
+		/**
+		 * The dictionary of sockets currently connect via this client (i.e. to different
+		 * namespaces) where the Socket ID is the key
+		 */
+		sockets: {[id: string]: Socket};
+
+		/**
+		 * A dictionary of all the namespaces for this client, with the Socket that
+		 * deals with that namespace
+		 */
+		nsps: {[nsp: string]: Socket};
+	}
+}
diff --git a/socket.io/socket.io-tests.ts b/socket.io/socket.io-tests.ts
index 0f3b26963e..442e677751 100644
--- a/socket.io/socket.io-tests.ts
+++ b/socket.io/socket.io-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="socket.io.d.ts"/>
-
 import socketIO = require('socket.io');
 
 function testUsingWithNodeHTTPServer() {
diff --git a/socket.io/socket.io.d.ts b/socket.io/socket.io.d.ts
deleted file mode 100644
index ad95f39ef3..0000000000
--- a/socket.io/socket.io.d.ts
+++ /dev/null
@@ -1,857 +0,0 @@
-// Type definitions for socket.io 1.4.4
-// Project: http://socket.io/
-// Definitions by: PROGRE <https://github.com/progre/>, Damian Connolly <https://github.com/divillysausages/>, Florent Poujol <https://github.com/florentpoujol/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path='../node/node.d.ts' />
-
-declare module 'socket.io' {
-	var server: SocketIOStatic;
-
-	export = server;
-}
-
-interface SocketIOStatic {
-	/**
-	 * Default Server constructor
-	 */
-	(): SocketIO.Server;
-
-	/**
-	 * Creates a new Server
-	 * @param srv The HTTP server that we're going to bind to
-	 * @param opts An optional parameters object
-	 */
-	(srv: any, opts?: SocketIO.ServerOptions): SocketIO.Server;
-
-	/**
-	 * Creates a new Server
-	 * @param port A port to bind to, as a number, or a string
-	 * @param An optional parameters object
-	 */
-	(port: string|number, opts?: SocketIO.ServerOptions): SocketIO.Server;
-
-	/**
-	 * Creates a new Server
-	 * @param A parameters object
-	 */
-	(opts: SocketIO.ServerOptions): SocketIO.Server;
-
-	/**
-	 * Backwards compatibility
-	 * @see io().listen()
-	 */
-    listen: SocketIOStatic;
-}
-
-declare namespace SocketIO {
-
-	interface Server {
-
-		/**
-		 * A dictionary of all the namespaces currently on this Server
-		 */
-		nsps: {[namespace: string]: Namespace};
-
-		/**
-		 * The default '/' Namespace
-		 */
-		sockets: Namespace;
-
-		/**
-		 * Sets the 'json' flag when emitting an event
-		 */
-		json: Server;
-
-		/**
-		 * Server request verification function, that checks for allowed origins
-		 * @param req The http.IncomingMessage request
-		 * @param fn The callback to be called. It should take one parameter, err,
-		 * which will be null if there was no problem, and one parameter, success,
-		 * of type boolean
-		 */
-		checkRequest( req:any, fn:( err: any, success: boolean ) => void ):void;
-
-		/**
-		 * Gets whether we're serving the client.js file or not
-		 * @default true
-		 */
-		serveClient(): boolean;
-
-		/**
-		 * Sets whether we're serving the client.js file or not
-		 * @param v True if we want to serve the file, false otherwise
-		 * @default true
-		 * @return This Server
-		 */
-		serveClient( v: boolean ): Server;
-
-		/**
-		 * Gets the client serving path
-		 * @default '/socket.io'
-		 */
-		path(): string;
-
-		/**
-		 * Sets the client serving path
-		 * @param v The path to serve the client file on
-		 * @default '/socket.io'
-		 * @return This Server
-		 */
-		path( v: string ): Server;
-
-		/**
-		 * Gets the adapter that we're going to use for handling rooms
-		 * @default typeof Adapter
-		 */
-		adapter(): any;
-
-		/**
-		 * Sets the adapter (class) that we're going to use for handling rooms
-		 * @param v The class for the adapter to create
-		 * @default typeof Adapter
-		 * @return This Server
-		 */
-		adapter( v: any ): Server;
-
-		/**
-		 * Gets the allowed origins for requests
-		 * @default "*:*"
-		 */
-		origins(): string;
-
-		/**
-		 * Sets the allowed origins for requests
-		 * @param v The allowed origins, in host:port form
-		 * @default "*:*"
-		 * return This Server
-		 */
-		origins( v: string ): Server;
-
-		/**
-		 * Attaches socket.io to a server
-		 * @param srv The http.Server that we want to attach to
-		 * @param opts An optional parameters object
-		 * @return This Server
-		 */
-		attach( srv: any, opts?: ServerOptions ): Server;
-
-		/**
-		 * Attaches socket.io to a port
-		 * @param port The port that we want to attach to
-		 * @param opts An optional parameters object
-		 * @return This Server
-		 */
-		attach( port: number, opts?: ServerOptions ): Server;
-
-		/**
-		 * @see attach( srv, opts )
-		 */
-		listen( srv: any, opts?: ServerOptions ): Server;
-
-		/**
-		 * @see attach( port, opts )
-		 */
-		listen( port: number, opts?: ServerOptions ): Server;
-
-		/**
-		 * Binds socket.io to an engine.io intsance
-		 * @param src The Engine.io (or compatible) server to bind to
-		 * @return This Server
-		 */
-		bind( srv: any ): Server;
-
-		/**
-		 * Called with each incoming connection
-		 * @param socket The Engine.io Socket
-		 * @return This Server
-		 */
-		onconnection( socket: any ): Server;
-
-		/**
-		 * Looks up/creates a Namespace
-		 * @param nsp The name of the NameSpace to look up/create. Should start
-		 * with a '/'
-		 * @return The Namespace
-		 */
-		of( nsp: string ): Namespace;
-
-		/**
-		 * Closes the server connection
-		 */
-		close():void;
-
-		/**
-		 * The event fired when we get a new connection
-		 * @param event The event being fired: 'connection'
-		 * @param listener A listener that should take one parameter of type Socket
-		 * @return The default '/' Namespace
-		 */
-		on( event: 'connection', listener: ( socket: Socket ) => void ): Namespace;
-
-		/**
-		 * @see on( 'connection', listener )
-		 */
-		on( event: 'connect', listener: ( socket: Socket ) => void ): Namespace;
-
-		/**
-		 * Base 'on' method to add a listener for an event
-		 * @param event The event that we want to add a listener for
-		 * @param listener The callback to call when we get the event. The parameters
-		 * for the callback depend on the event
-		 * @return The default '/' Namespace
-		 */
-		on( event: string, listener: Function ): Namespace;
-
-		/**
-		 * Targets a room when emitting to the default '/' Namespace
-		 * @param room The name of the room that we're targeting
-		 * @return The default '/' Namespace
-		 */
-		to( room: string ): Namespace;
-
-		/**
-		 * @see to( room )
-		 */
-		in( room: string ): Namespace;
-
-		/**
-		 * Registers a middleware function, which is a function that gets executed
-		 * for every incoming Socket, on the default '/' Namespace
-		 * @param fn The function to call when we get a new incoming socket. It should
-		 * take one parameter of type Socket, and one callback function to call to
-		 * execute the next middleware function. The callback can take one optional
-		 * parameter, err, if there was an error. Errors passed to middleware callbacks
-		 * are sent as special 'error' packets to clients
-		 * @return The default '/' Namespace
-		 */
-		use( fn: ( socket:Socket, fn: ( err?: any ) => void ) =>void ): Namespace;
-
-		/**
-		 * Emits an event to the default Namespace
-		 * @param event The event that we want to emit
-		 * @param args Any number of optional arguments to pass with the event. If the
-		 * last argument is a function, it will be called as an ack. The ack should
-		 * take whatever data was sent with the packet
-		 * @return The default '/' Namespace
-		 */
-		emit( event: string, ...args: any[]): Namespace;
-
-		/**
-		 * Sends a 'message' event
-		 * @see emit( event, ...args )
-		 * @return The default '/' Namespace
-		 */
-		send( ...args: any[] ): Namespace;
-
-		/**
-		 * @see send( ...args )
-		 */
-		write( ...args: any[] ): Namespace;
-
-		/**
-		 * Gets a list of clients
-		 * @return The default '/' Namespace
-		 */
-		clients( ...args: any[] ): Namespace;
-
-		/**
-		 * Sets the compress flag
-		 * @return The default '/' Namespace
-		 */
-		compress( ...args: any[] ): Namespace;
-	}
-
-	/**
-	 * Options to pass to our server when creating it
-	 */
-	interface ServerOptions {
-
-		/**
-		 * The path to server the client file to
-		 * @default '/socket.io'
-		 */
-		path?: string;
-
-		/**
-		 * Should we serve the client file?
-		 * @default true
-		 */
-		serveClient?: boolean;
-
-		/**
-		 * The adapter to use for handling rooms. NOTE: this should be a class,
-		 * not an object
-		 * @default typeof Adapter
-		 */
-		adapter?: Adapter;
-
-		/**
-		 * Accepted origins
-		 * @default '*:*'
-		 */
-		origins?: string;
-
-		/**
-		 * How many milliseconds without a pong packed to consider the connection closed (engine.io)
-		 * @default 60000
-		 */
-		pingTimeout?: number;
-
-		/**
-		 * How many milliseconds before sending a new ping packet (keep-alive) (engine.io)
-		 * @default 25000
-		 */
-		pingInterval?: number;
-
-		/**
-		 * How many bytes or characters a message can be when polling, before closing the session
-		 * (to avoid Dos) (engine.io)
-		 * @default 10E7
-		 */
-		maxHttpBufferSize?: number;
-
-		/**
-		 * A function that receives a given handshake or upgrade request as its first parameter,
-		 * and can decide whether to continue or not. The second argument is a function that needs
-		 * to be called with the decided information: fn( err, success ), where success is a boolean
-		 * value where false means that the request is rejected, and err is an error code (engine.io)
-		 * @default null
-		 */
-		allowRequest?: (request:any, callback: (err: number, success: boolean) => void) => void;
-
-		/**
-		 * Transports to allow connections to (engine.io)
-		 * @default ['polling','websocket']
-		 */
-		transports?: string[];
-
-		/**
-		 * Whether to allow transport upgrades (engine.io)
-		 * @default true
-		 */
-		allowUpgrades?: boolean;
-
-		/**
-		 * parameters of the WebSocket permessage-deflate extension (see ws module).
-		 * Set to false to disable (engine.io)
-		 * @default true
-		 */
-		perMessageDeflate?: Object|boolean;
-
-		/**
-		 * Parameters of the http compression for the polling transports (see zlib).
-		 * Set to false to disable, or set an object with parameter "threshold:number"
-		 * to only compress data if the byte size is above this value (1024) (engine.io)
-		 * @default true|1024
-		 */
-		httpCompression?: Object|boolean;
-
-		/**
-		 * Name of the HTTP cookie that contains the client sid to send as part of
-		 * handshake response headers. Set to false to not send one (engine.io)
-		 * @default "io"
-		 */
-		cookie?: string|boolean;
-	}
-
-	/**
-	 * The Namespace, sandboxed environments for sockets, each connection
-	 * to a Namespace requires a new Socket
-	 */
-	interface Namespace extends NodeJS.EventEmitter {
-
-		/**
-		 * The name of the NameSpace
-		 */
-		name: string;
-
-		/**
-		 * The controller Server for this Namespace
-		 */
-		server: Server;
-
-		/**
-		 * A dictionary of all the Sockets connected to this Namespace, where
-		 * the Socket ID is the key
-		 */
-		sockets: { [id: string]: Socket };
-
-		/**
-		 * A dictionary of all the Sockets connected to this Namespace, where
-		 * the Socket ID is the key
-		 */
-		connected: { [id: string]: Socket };
-
-		/**
-		 * The Adapter that we're using to handle dealing with rooms etc
-		 */
-		adapter: Adapter;
-
-		/**
-		 * Sets the 'json' flag when emitting an event
-		 */
-		json: Namespace;
-
-		/**
-		 * Registers a middleware function, which is a function that gets executed
-		 * for every incoming Socket
-		 * @param fn The function to call when we get a new incoming socket. It should
-		 * take one parameter of type Socket, and one callback function to call to
-		 * execute the next middleware function. The callback can take one optional
-		 * parameter, err, if there was an error. Errors passed to middleware callbacks
-		 * are sent as special 'error' packets to clients
-		 * @return This Namespace
-		 */
-		use( fn: ( socket:Socket, fn: ( err?: any ) => void ) =>void ): Namespace;
-
-		/**
-		 * Targets a room when emitting
-		 * @param room The name of the room that we're targeting
-		 * @return This Namespace
-		 */
-		to( room: string ): Namespace;
-
-		/**
-		 * @see to( room )
-		 */
-		in( room: string ): Namespace;
-
-		/**
-		 * Sends a 'message' event
-		 * @see emit( event, ...args )
-		 * @return This Namespace
-		 */
-		send( ...args: any[] ): Namespace;
-
-		/**
-		 * @see send( ...args )
-		 */
-		write( ...args: any[] ): Namespace;
-
-		/**
-		 * The event fired when we get a new connection
-		 * @param event The event being fired: 'connection'
-		 * @param listener A listener that should take one parameter of type Socket
-		 * @return This Namespace
-		 */
-		on( event: 'connection', listener: ( socket: Socket ) => void ): this;
-
-		/**
-		 * @see on( 'connection', listener )
-		 */
-		on( event: 'connect', listener: ( socket: Socket ) => void ): this;
-
-		/**
-		 * Base 'on' method to add a listener for an event
-		 * @param event The event that we want to add a listener for
-		 * @param listener The callback to call when we get the event. The parameters
-		 * for the callback depend on the event
-		 * @ This Namespace
-		 */
-		on( event: string, listener: Function ): this;
-
-		/**
-		 * Gets a list of clients.
-		 * @return This Namespace
-		 */
-		clients( fn: Function ): Namespace;
-
-		/**
-		 * Sets the compress flag.
-		 * @param compress If `true`, compresses the sending data
-		 * @return This Namespace
-		 */
-		compress( compress: boolean ): Namespace;
-	}
-
-	/**
-	 * The socket, which handles our connection for a namespace. NOTE: while
-	 * we technically extend NodeJS.EventEmitter, we're not putting it here
-	 * as we have a problem with the emit() event (as it's overridden with a
-	 * different return)
-	 */
-	interface Socket {
-
-		/**
-		 * The namespace that this socket is for
-		 */
-		nsp: Namespace;
-
-		/**
-		 * The Server that our namespace is in
-		 */
-		server: Server;
-
-		/**
-		 * The Adapter that we use to handle our rooms
-		 */
-		adapter: Adapter;
-
-		/**
-		 * The unique ID for this Socket. Regenerated at every connection. This is
-		 * also the name of the room that the Socket automatically joins on connection
-		 */
-		id: string;
-
-		/**
-		 * The http.IncomingMessage request sent with the connection. Useful
-		 * for recovering headers etc
-		 */
-		request: any;
-
-		/**
-		 * The Client associated with this Socket
-		 */
-		client: Client;
-
-		/**
-		 * The underlying Engine.io Socket instance
-		 */
-		conn: {
-
-			/**
-			 * The ID for this socket - matches Client.id
-			 */
-			id: string;
-
-			/**
-			 * The Engine.io Server for this socket
-			 */
-			server: any;
-
-			/**
-			 * The ready state for the client. Either 'opening', 'open', 'closing', or 'closed'
-			 */
-			readyState: string;
-
-			/**
-			 * The remote IP for this connection
-			 */
-			remoteAddress: string;
-		};
-
-		/**
-		 * The list of rooms that this Socket is currently in, where
-		 * the ID the the room ID
-		 */
-		rooms: { [id: string]: string };
-
-		/**
-		 * Is the Socket currently connected?
-		 */
-		connected: boolean;
-
-		/**
-		 * Is the Socket currently disconnected?
-		 */
-		disconnected: boolean;
-
-		/**
-		 * The object used when negociating the handshake
-		 */
-		handshake: {
-			/**
-			 * The headers passed along with the request. e.g. 'host',
-			 * 'connection', 'accept', 'referer', 'cookie'
-			 */
-			headers: any;
-
-			/**
-			 * The current time, as a string
-			 */
-			time: string;
-
-			/**
-			 * The remote address of the connection request
-			 */
-			address: string;
-
-			/**
-			 * Is this a cross-domain request?
-			 */
-			xdomain: boolean;
-
-			/**
-			 * Is this a secure request?
-			 */
-			secure: boolean;
-
-			/**
-			 * The timestamp for when this was issued
-			 */
-			issued: number;
-
-			/**
-			 * The request url
-			 */
-			url: string;
-
-			/**
-			 * Any query string parameters in the request url
-			 */
-			query: any;
-		};
-
-		/**
-		 * Sets the 'json' flag when emitting an event
-		 */
-		json: Socket;
-
-		/**
-		 * Sets the 'volatile' flag when emitting an event. Volatile messages are
-		 * messages that can be dropped because of network issues and the like. Use
-		 * for high-volume/real-time messages where you don't need to receive *all*
-		 * of them
-		 */
-		volatile: Socket;
-
-		/**
-		 * Sets the 'broadcast' flag when emitting an event. Broadcasting an event
-		 * will send it to all the other sockets in the namespace except for yourself
-		 */
-		broadcast: Socket;
-
-		/**
-		 * Emits an event to this client. If the 'broadcast' flag was set, this will
-		 * emit to all other clients, except for this one
-		 * @param event The event that we want to emit
-		 * @param args Any number of optional arguments to pass with the event. If the
-		 * last argument is a function, it will be called as an ack. The ack should
-		 * take whatever data was sent with the packet
-		 * @return This Socket
-		 */
-		emit( event: string, ...args: any[]): Socket;
-
-		/**
-		 * Targets a room when broadcasting
-		 * @param room The name of the room that we're targeting
-		 * @return This Socket
-		 */
-		to( room: string ): Socket;
-
-		/**
-		 * @see to( room )
-		 */
-		in( room: string ): Socket;
-
-		/**
-		 * Sends a 'message' event
-		 * @see emit( event, ...args )
-		 */
-		send( ...args: any[] ): Socket;
-
-		/**
-		 * @see send( ...args )
-		 */
-		write( ...args: any[] ): Socket;
-
-		/**
-		 * Joins a room. You can join multiple rooms, and by default, on connection,
-		 * you join a room with the same name as your ID
-		 * @param name The name of the room that we want to join
-		 * @param fn An optional callback to call when we've joined the room. It should
-		 * take an optional parameter, err, of a possible error
-		 * @return This Socket
-		 */
-		join( name: string, fn?: ( err?: any ) => void ): Socket;
-
-		/**
-		 * Leaves a room
-		 * @param name The name of the room to leave
-		 * @param fn An optional callback to call when we've left the room. It should
-		 * take on optional parameter, err, of a possible error
-		 */
-		leave( name: string, fn?: Function ): Socket;
-
-		/**
-		 * Leaves all the rooms that we've joined
-		 */
-		leaveAll(): void;
-
-		/**
-		 * Disconnects this Socket
-		 * @param close If true, also closes the underlying connection
-		 * @return This Socket
-		 */
-		disconnect( close?: boolean ): Socket;
-
-		/**
-		 * Adds a listener for a particular event. Calling multiple times will add
-		 * multiple listeners
-		 * @param event The event that we're listening for
-		 * @param fn The function to call when we get the event. Parameters depend on the
-		 * event in question
-		 * @return This Socket
-		 */
-		on( event: string, fn: Function ): Socket;
-
-		/**
-		 * @see on( event, fn )
-		 */
-		addListener( event: string, fn: Function ): Socket;
-
-		/**
-		 * Adds a listener for a particular event that will be invoked
-		 * a single time before being automatically removed
-		 * @param event The event that we're listening for
-		 * @param fn The function to call when we get the event. Parameters depend on
-		 * the event in question
-		 * @return This Socket
-		 */
-		once( event: string, fn: Function ): Socket;
-
-		/**
-		 * Removes a listener for a particular type of event. This will either
-		 * remove a specific listener, or all listeners for this type of event
-		 * @param event The event that we want to remove the listener of
-		 * @param fn The function to remove, or null if we want to remove all functions
-		 * @return This Socket
-		 */
-		removeListener( event: string, fn?: Function ): Socket;
-
-		/**
-		 * Removes all event listeners on this object
-		 * @return This Socket
-		 */
-		removeAllListeners( event?: string ): Socket;
-
-		/**
-		 * Sets the maximum number of listeners this instance can have
-		 * @param n The max number of listeners we can add to this emitter
-		 * @return This Socket
-		 */
-		setMaxListeners( n: number ): Socket;
-
-		/**
-		 * Returns all the callbacks for a particular event
-		 * @param event The event that we're looking for the callbacks of
-		 * @return An array of callback Functions, or an empty array if we don't have any
-		 */
-		listeners( event: string ):Function[];
-
-		/**
-		 * Sets the compress flag
-		 * @param compress If `true`, compresses the sending data
-		 * @return This Socket
-		 */
-		compress( compress: boolean ): Socket;
-	}
-
-	/**
-	 * The interface used when dealing with rooms etc
-	 */
-	interface Adapter extends NodeJS.EventEmitter {
-
-		/**
-		 * The namespace that this adapter is for
-		 */
-		nsp: Namespace;
-
-		/**
-		 * A dictionary of all the rooms that we have in this namespace
-		 * The rooms are made of a `sockets` key which is the dictionary of sockets per ID
-		 */
-		rooms: {[room: string]: {sockets: {[id: string]: boolean }}};
-
-		/**
-		 * A dictionary of all the socket ids that we're dealing with, and all
-		 * the rooms that the socket is currently in
-		 */
-		sids: {[id: string]: {[room: string]: boolean}};
-
-		/**
-		 * Adds a socket to a room. If the room doesn't exist, it's created
-		 * @param id The ID of the socket to add
-		 * @param room The name of the room to add the socket to
-		 * @param callback An optional callback to call when the socket has been
-		 * added. It should take an optional parameter, error, if there was a problem
-		 */
-		add( id: string, room: string, callback?: ( err?: any ) => void ): void;
-
-		/**
-		 * Removes a socket from a room. If there are no more sockets in the room,
-		 * the room is deleted
-		 * @param id The ID of the socket that we're removing
-		 * @param room The name of the room to remove the socket from
-		 * @param callback An optional callback to call when the socket has been
-		 * removed. It should take on optional parameter, error, if there was a problem
-		 */
-		del( id: string, room: string, callback?: ( err?: any ) => void ): void;
-
-		/**
-		 * Removes a socket from all the rooms that it's joined
-		 * @param id The ID of the socket that we're removing
-		 */
-		delAll( id: string ):void;
-
-		/**
-		 * Broadcasts a packet
-		 * @param packet The packet to broadcast
-		 * @param opts Any options to send along:
-		 * 	- rooms: An optional list of rooms to broadcast to. If empty, the packet is broadcast to all sockets
-		 * 	- except: A list of Socket IDs to exclude
-		 * 	- flags: Any flags that we want to send along ('json', 'volatile', 'broadcast')
-		 */
-		broadcast( packet: any, opts: { rooms?: string[]; except?: string[]; flags?: {[flag: string]: boolean} } ):void;
-	}
-
-	/**
-	 * The client behind each socket (can have multiple sockets)
-	 */
-	interface Client {
-		/**
-		 * The Server that this client belongs to
-		 */
-		server: Server;
-
-		/**
-		 * The underlying Engine.io Socket instance
-		 */
-		conn: {
-
-			/**
-			 * The ID for this socket - matches Client.id
-			 */
-			id: string;
-
-			/**
-			 * The Engine.io Server for this socket
-			 */
-			server: any;
-
-			/**
-			 * The ready state for the client. Either 'opening', 'open', 'closing', or 'closed'
-			 */
-			readyState: string;
-
-			/**
-			 * The remote IP for this connection
-			 */
-			remoteAddress: string;
-		};
-
-		/**
-		 * The ID for this client. Regenerated at every connection
-		 */
-		id: string;
-
-		/**
-		 * The http.IncomingMessage request sent with the connection. Useful
-		 * for recovering headers etc
-		 */
-		request: any;
-
-		/**
-		 * The dictionary of sockets currently connect via this client (i.e. to different
-		 * namespaces) where the Socket ID is the key
-		 */
-		sockets: {[id: string]: Socket};
-
-		/**
-		 * A dictionary of all the namespaces for this client, with the Socket that
-		 * deals with that namespace
-		 */
-		nsps: {[nsp: string]: Socket};
-	}
-}
diff --git a/socket.io/tsconfig.json b/socket.io/tsconfig.json
new file mode 100644
index 0000000000..d55bb1a615
--- /dev/null
+++ b/socket.io/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "socket.io-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/socketty/index.d.ts b/socketty/index.d.ts
new file mode 100644
index 0000000000..344312eb50
--- /dev/null
+++ b/socketty/index.d.ts
@@ -0,0 +1,59 @@
+// Type definitions for Socketty v0.2.2
+// Project: https://www.npmjs.com/package/socketty
+// Definitions by: Nax <https://github.com/Nax>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var socketty: socketty.Socketty;
+
+export = socketty;
+export as namespace socketty;
+
+declare namespace socketty {
+
+    interface Socketty {
+        /**
+         * Connect to a socketty server.
+         * @param url The server url
+         * @param callback The callback to be run when the connection is open
+         * @return A Socket
+         */
+        connect(url: string, callback: (socket: SockettySocket) => void): SockettySocket;
+
+        /**
+         * Create a socketty server.
+         * @param httpServer The HTTP server to use
+         * @return A socketty server
+         */
+        createServer(httpServer: any): SockettyServer;
+    }
+
+    interface SockettySocket {
+        /**
+         * Listen for an action.
+         * @param action The action to listen to
+         * @param callback A callback to be run when the action is fired
+         */
+        on(action: string, callback: (message?: any) => void): void;
+
+        /**
+         * Send an action, as well as an optional message.
+         * @param action The action to send
+         * @param message The message to send
+         */
+        send(action: string, message?: any): void;
+
+        /**
+         * Specify a callback to be run when the socket is disconnected.
+         * @param callback The disconnect callback
+         */
+        disconnect(callback: () => void): void;
+    }
+
+    interface SockettyServer {
+        /**
+         * Specify a callback to be run when a new socket connects to the server.
+         * @param callback The callback
+         */
+        connection(callback: (socket: SockettySocket) => void): void;
+    }
+}
diff --git a/socketty/socketty-tests.ts b/socketty/socketty-tests.ts
index 22809a6b06..09a8ea80f7 100644
--- a/socketty/socketty-tests.ts
+++ b/socketty/socketty-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="socketty.d.ts" />
+import socketty = require("socketty");
 
 /* Server */
 
@@ -6,7 +6,7 @@ var httpServer = {}; // Assume it's a real HTTP server object
 
 var webSocketServer = socketty.createServer(httpServer);
 
-webSocketServer.connection((socket: SockettySocket) => {
+webSocketServer.connection((socket: socketty.SockettySocket) => {
     console.log('Client connected');
     socket.on('msg', (message?: any) => {
         console.log('Client said' + message);
@@ -18,7 +18,7 @@ webSocketServer.connection((socket: SockettySocket) => {
 
 /* Client */
 
-socketty.connect('ws://localhost:8080', (socket: SockettySocket) => {
+socketty.connect('ws://localhost:8080', (socket: socketty.SockettySocket) => {
     console.log('Connected !');
     socket.send('msg', 'Hello server!');
 });
diff --git a/socketty/socketty.d.ts b/socketty/socketty.d.ts
deleted file mode 100644
index da7f825071..0000000000
--- a/socketty/socketty.d.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-// Type definitions for Socketty v0.2.2
-// Project: https://www.npmjs.com/package/socketty
-// Definitions by: Nax <https://github.com/Nax>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare var socketty: Socketty;
-
-declare module 'socketty' {
-    export = socketty;
-}
-
-interface Socketty {
-    /**
-     * Connect to a socketty server.
-     * @param url The server url
-     * @param callback The callback to be run when the connection is open
-     * @return A Socket
-     */
-    connect(url: string, callback: (socket: SockettySocket) => void): SockettySocket;
-
-    /**
-     * Create a socketty server.
-     * @param httpServer The HTTP server to use
-     * @return A socketty server
-     */
-    createServer(httpServer: any): SockettyServer;
-}
-
-interface SockettySocket {
-    /**
-     * Listen for an action.
-     * @param action The action to listen to
-     * @param callback A callback to be run when the action is fired
-     */
-    on(action: string, callback: (message?: any) => void): void;
-
-    /**
-     * Send an action, as well as an optional message.
-     * @param action The action to send
-     * @param message The message to send
-     */
-    send(action: string, message?: any): void;
-
-    /**
-     * Specify a callback to be run when the socket is disconnected.
-     * @param callback The disconnect callback
-     */
-    disconnect(callback: () => void): void;
-}
-
-interface SockettyServer {
-    /**
-     * Specify a callback to be run when a new socket connects to the server.
-     * @param callback The callback
-     */
-    connection(callback: (socket: SockettySocket) => void): void;
-}
diff --git a/socketty/tsconfig.json b/socketty/tsconfig.json
new file mode 100644
index 0000000000..8656b1a2dc
--- /dev/null
+++ b/socketty/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "socketty-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sockjs-client/index.d.ts b/sockjs-client/index.d.ts
new file mode 100644
index 0000000000..b5728a3042
--- /dev/null
+++ b/sockjs-client/index.d.ts
@@ -0,0 +1,65 @@
+// Type definitions for sockjs-client 1.0.3
+// Project: https://github.com/sockjs/sockjs-client
+// Definitions by: Emil Ivanov <https://github.com/vladev>, Alexander Rusakov <https://github.com/arusakov/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace __SockJSClient {
+  interface BaseEvent {
+    type: string;
+  }
+
+  interface OpenEvent extends BaseEvent {}
+
+  interface CloseEvent extends BaseEvent {
+    code: number;
+    reason: string;
+    wasClean: boolean;
+  }
+
+  interface MessageEvent extends BaseEvent {
+    data: string;
+  }
+
+  interface SessionGenerator {
+    (): string;
+  }
+
+  interface Options {
+    server?: string;
+    sessionId?: number | SessionGenerator;
+    transports?: string | string[]
+  }
+
+  enum State {
+    CONNECTING = 0, OPEN, CLOSING, CLOSED
+  }
+
+  interface SockJSClass extends EventTarget {
+    readyState: State;
+    protocol: string;
+    url: string;
+    onopen: (e: OpenEvent) => any;
+    onclose: (e: CloseEvent) => any;
+    onmessage: (e: MessageEvent) => any;
+    send(data: any): void;
+    close(code?: number, reason?: string): void;
+  }
+}
+
+import SockJSClass = __SockJSClient.SockJSClass;
+import Options = __SockJSClient.Options;
+import State = __SockJSClient.State;
+
+declare var SockJS: {
+  new(url: string, _reserved?: any, options?: Options): SockJSClass;
+  (url: string, _reserved?: any, options?: Options): SockJSClass;
+  prototype: SockJSClass;
+  CONNECTING: State;
+  OPEN: State;
+  CLOSING: State;
+  CLOSED: State;
+};
+
+export = SockJS;
+export as namespace SockJS;
+
diff --git a/sockjs-client/sockjs-client-tests.ts b/sockjs-client/sockjs-client-tests.ts
index 53199ad0dd..b7f6b3ab62 100644
--- a/sockjs-client/sockjs-client-tests.ts
+++ b/sockjs-client/sockjs-client-tests.ts
@@ -1,10 +1,8 @@
-/// <reference path="./sockjs-client.d.ts" />
+
 
 import * as SockJS from 'sockjs-client';
-import BaseEvent = __SockJSClient.BaseEvent;
-import SockJSClass = __SockJSClient.SockJSClass;
 
-let sockJs: SockJSClass;
+let sockJs: any;
 
 sockJs = new SockJS('url');
 sockJs = SockJS('url');
@@ -18,9 +16,9 @@ sockJs = SockJS('url', null, {
   transports: ['websocket', 'eventsource']
 });
 
-let listener = (e: BaseEvent) => e;
+let listener = (e: any) => e;
 let listenerObj = {
-  handleEvent: (e: BaseEvent) => e
+  handleEvent: (e: any) => e
 };
 
 sockJs.addEventListener('onopen', listener);
@@ -33,9 +31,9 @@ sockJs.removeEventListener('onclose', listener, true);
 sockJs.removeEventListener('onopen', listenerObj);
 sockJs.removeEventListener('onclose', listenerObj, true);
 
-sockJs.onopen = e => console.log(e);
-sockJs.onmessage = e => console.log(e.data);
-sockJs.onclose = e => console.log(e.code, e.reason, e.wasClean);
+sockJs.onopen = (e: any) => console.log(e);
+sockJs.onmessage = (e: any) => console.log(e.data);
+sockJs.onclose = (e: any) => console.log(e.code, e.reason, e.wasClean);
 
 let testStates = SockJS.CONNECTING !== -1 && SockJS.OPEN !== -1 &&
                   SockJS.CLOSING !== -1 && SockJS.CLOSED !== -1;
diff --git a/sockjs-client/sockjs-client.d.ts b/sockjs-client/sockjs-client.d.ts
deleted file mode 100644
index 87bb0a8501..0000000000
--- a/sockjs-client/sockjs-client.d.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-// Type definitions for sockjs-client 1.0.3
-// Project: https://github.com/sockjs/sockjs-client
-// Definitions by: Emil Ivanov <https://github.com/vladev>, Alexander Rusakov <https://github.com/arusakov/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace __SockJSClient {
-  interface BaseEvent {
-    type: string;
-  }
-
-  interface OpenEvent extends BaseEvent {}
-
-  interface CloseEvent extends BaseEvent {
-    code: number;
-    reason: string;
-    wasClean: boolean;
-  }
-
-  interface MessageEvent extends BaseEvent {
-    data: string;
-  }
-
-  interface SessionGenerator {
-    (): string;
-  }
-
-  interface Options {
-    server?: string;
-    sessionId?: number | SessionGenerator;
-    transports?: string | string[]
-  }
-
-  enum State {
-    CONNECTING = 0, OPEN, CLOSING, CLOSED
-  }
-
-  interface SockJSClass extends EventTarget {
-    readyState: State;
-    protocol: string;
-    url: string;
-    onopen: (e: OpenEvent) => any;
-    onclose: (e: CloseEvent) => any;
-    onmessage: (e: MessageEvent) => any;
-    send(data: any): void;
-    close(code?: number, reason?: string): void;
-  }
-}
-
-declare module 'sockjs-client' {
-  import SockJSClass = __SockJSClient.SockJSClass;
-  import Options = __SockJSClient.Options;
-  import State = __SockJSClient.State;
-
-  var SockJS: {
-    new(url: string, _reserved?: any, options?: Options): SockJSClass;
-    (url: string, _reserved?: any, options?: Options): SockJSClass;
-    prototype: SockJSClass;
-    CONNECTING: State;
-    OPEN: State;
-    CLOSING: State;
-    CLOSED: State;
-  };
-
-  export = SockJS;
-}
diff --git a/sockjs-client/tsconfig.json b/sockjs-client/tsconfig.json
new file mode 100644
index 0000000000..c8577823b7
--- /dev/null
+++ b/sockjs-client/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sockjs-client-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sockjs-node/index.d.ts b/sockjs-node/index.d.ts
new file mode 100644
index 0000000000..1de35afd2a
--- /dev/null
+++ b/sockjs-node/index.d.ts
@@ -0,0 +1,56 @@
+// Type definitions for sockjs-node 0.3.x
+// Project: https://github.com/sockjs/sockjs-node
+// Definitions by: Phil McCloghry-Laing <https://github.com/pmccloghrylaing>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import http = require('http');
+
+export interface ServerOptions {
+    sockjs_url?: string;
+    prefix?: string;
+    response_limit?: number;
+    websocket?: boolean;
+    jsessionid?: any;
+    log?: (severity: string, message: string) => void;
+    heartbeat_delay?: number;
+    disconnect_delay?: number;
+}
+
+export declare function createServer(options?: ServerOptions): Server;
+
+export interface Server extends NodeJS.EventEmitter {
+    installHandlers(server: http.Server, options?: ServerOptions): any;
+
+    on(event: 'connection', listener: (conn: Connection) => any): this;
+    on(event: string, listener: Function): this;
+}
+
+export interface Connection extends NodeJS.ReadWriteStream {
+    remoteAddress: string;
+    remotePort: number;
+    address: {
+        [key: string]: {
+            address: string;
+            port: number;
+        };
+    };
+    headers: {
+        [key: string]: string;
+    };
+    url: string;
+    pathname: string;
+    prefix: string;
+    protocol: string;
+    readyState: number;
+    id: string;
+
+    close(code?: string, reason?: string): boolean;
+    destroy(): void;
+
+    on(event: 'data', listener: (message: string) => any): this;
+    on(event: 'close', listener: () => void): this;
+    on(event: string, listener: Function): this;
+}
diff --git a/sockjs-node/sockjs-node-tests.ts b/sockjs-node/sockjs-node-tests.ts
index 25e5b496af..ca80b26e64 100644
--- a/sockjs-node/sockjs-node-tests.ts
+++ b/sockjs-node/sockjs-node-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="sockjs-node.d.ts" />
-import sockjs = require("sockjs");
+import sockjs = require("sockjs-node");
 import http = require("http");
 import stream = require("stream");
 
@@ -24,7 +23,7 @@ serverOptions.websocket = true;
 serverOptions.jsessionid = true;
 serverOptions.jsessionid = () => true;
 
-serverOptions.log = (severity, message) => { };
+serverOptions.log = (severity: any, message: any) => { };
 serverOptions.heartbeat_delay = 25000;
 serverOptions.disconnect_delay = 5000;
 
@@ -32,7 +31,7 @@ serverOptions.disconnect_delay = 5000;
 var connection: sockjs.Connection;
 
 // on('connection') passes a sockJS connection
-server.on('connection', (conn) => {
+server.on('connection', (conn: any) => {
     connection = conn;
     conn = connection;
 });
diff --git a/sockjs-node/sockjs-node.d.ts b/sockjs-node/sockjs-node.d.ts
deleted file mode 100644
index 1804495127..0000000000
--- a/sockjs-node/sockjs-node.d.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-// Type definitions for sockjs-node 0.3.x
-// Project: https://github.com/sockjs/sockjs-node
-// Definitions by: Phil McCloghry-Laing <https://github.com/pmccloghrylaing>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "sockjs" {
-    import http = require('http');
-
-    export interface ServerOptions {
-        sockjs_url?: string;
-        prefix?: string;
-        response_limit?: number;
-        websocket?: boolean;
-        jsessionid?: any;
-        log?: (severity: string, message: string) => void;
-        heartbeat_delay?: number;
-        disconnect_delay?: number;
-    }
-
-    export function createServer(options?: ServerOptions): Server;
-
-    export interface Server extends NodeJS.EventEmitter {
-        installHandlers(server: http.Server, options?: ServerOptions): any;
-
-        on(event: 'connection', listener: (conn: Connection) => any): this;
-        on(event: string, listener: Function): this;
-    }
-
-    export interface Connection extends NodeJS.ReadWriteStream {
-        remoteAddress: string;
-        remotePort: number;
-        address: {
-            [key: string]: {
-                address: string;
-                port: number;
-            };
-        };
-        headers: {
-            [key: string]: string;
-        };
-        url: string;
-        pathname: string;
-        prefix: string;
-        protocol: string;
-        readyState: number;
-        id: string;
-
-        close(code?: string, reason?: string): boolean;
-        destroy(): void;
-
-        on(event: 'data', listener: (message: string) => any): this;
-        on(event: 'close', listener: () => void): this;
-        on(event: string, listener: Function): this;
-    }
-}
diff --git a/sockjs-node/tsconfig.json b/sockjs-node/tsconfig.json
new file mode 100644
index 0000000000..30d207aafa
--- /dev/null
+++ b/sockjs-node/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sockjs-node-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sockjs/index.d.ts b/sockjs/index.d.ts
new file mode 100644
index 0000000000..bfb3eb9e49
--- /dev/null
+++ b/sockjs/index.d.ts
@@ -0,0 +1,55 @@
+// Type definitions for SockJS 0.3.x
+// Project: https://github.com/sockjs/sockjs-client
+// Definitions by: Emil Ivanov <https://github.com/vladev>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace SockJS;
+export = SockJS;
+
+interface SockJSSimpleEvent {
+    type: string;
+    toString(): string;
+}
+
+interface SJSOpenEvent extends SockJSSimpleEvent {}
+
+interface SJSCloseEvent extends SockJSSimpleEvent {
+    code: number;
+    reason: string;
+    wasClean: boolean;
+}
+
+interface SJSMessageEvent extends SockJSSimpleEvent {
+    data: string;
+}
+
+interface SockJS extends EventTarget {
+    protocol: string;
+    readyState: number;
+    onopen: (ev: SJSOpenEvent) => any;
+    onmessage: (ev: SJSMessageEvent) => any;
+    onclose: (ev: SJSCloseEvent) => any;
+    send(data: any): void;
+    close(code?: number, reason?: string): void;
+    OPEN: number;
+    CLOSING: number;
+    CONNECTING: number;
+    CLOSED: number;
+}
+
+declare var SockJS: {
+    prototype: SockJS;
+    new (url: string, _reserved?: any, options?: {
+        debug?: boolean;
+        devel?: boolean;
+        protocols_whitelist?: string[];
+        server?: string;
+        rtt?: number;
+        rto?: number;
+        info?: {
+            websocket?: boolean;
+            cookie_needed?: boolean;
+            null_origin?: boolean;
+        };
+    }): SockJS;
+};
\ No newline at end of file
diff --git a/sockjs/sockjs.d.ts b/sockjs/sockjs.d.ts
deleted file mode 100644
index e692115764..0000000000
--- a/sockjs/sockjs.d.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// Type definitions for SockJS 0.3.x
-// Project: https://github.com/sockjs/sockjs-client
-// Definitions by: Emil Ivanov <https://github.com/vladev>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface SockJSSimpleEvent {
-    type: string;
-    toString(): string;
-}
-
-interface SJSOpenEvent extends SockJSSimpleEvent {}
-
-interface SJSCloseEvent extends SockJSSimpleEvent {
-    code: number;
-    reason: string;
-    wasClean: boolean;
-}
-
-interface SJSMessageEvent extends SockJSSimpleEvent {
-    data: string;
-}
-
-interface SockJS extends EventTarget {
-    protocol: string;
-    readyState: number;
-    onopen: (ev: SJSOpenEvent) => any;
-    onmessage: (ev: SJSMessageEvent) => any;
-    onclose: (ev: SJSCloseEvent) => any;
-    send(data: any): void;
-    close(code?: number, reason?: string): void;
-    OPEN: number;
-    CLOSING: number;
-    CONNECTING: number;
-    CLOSED: number;
-}
-
-declare var SockJS: {
-    prototype: SockJS;
-    new (url: string, _reserved?: any, options?: {
-        debug?: boolean;
-        devel?: boolean;
-        protocols_whitelist?: string[];
-        server?: string;
-        rtt?: number;
-        rto?: number;
-        info?: {
-            websocket?: boolean;
-            cookie_needed?: boolean;
-            null_origin?: boolean;
-        };
-    }): SockJS;
-};
\ No newline at end of file
diff --git a/sockjs/tsconfig.json b/sockjs/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/sockjs/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sortablejs/index.d.ts b/sortablejs/index.d.ts
new file mode 100644
index 0000000000..4fdc27cd61
--- /dev/null
+++ b/sortablejs/index.d.ts
@@ -0,0 +1,205 @@
+// Type definitions for Sortable.js v1.3.0-rc1
+// Project: https://github.com/RubaXa/Sortable
+// Definitions by: Maw-Fox <http://github.com/Maw-Fox>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace Sortablejs {
+    interface SortableOptions {
+        group?: any;
+        sort?: boolean;
+        delay?: number;
+        disabled?: boolean;
+        store?: {
+            get: (sortable: Sortable) => any[];
+            set: (sortable: Sortable) => any;
+        };
+        animation?: number;
+        handle?: string;
+        filter?: any;
+        draggable?: string;
+        ghostClass?: string;
+        chosenClass?: string;
+        dataIdAttr?: string;
+        forceFallback?: boolean;
+        fallbackClass?: string;
+        fallbackOnBody?: boolean;
+        scroll?: boolean;
+        scrollSensitivity?: number;
+        scrollSpeed?: number;
+        setData?: (dataTransfer: any, draggedElement: any) => any;
+        onStart?: (event: any) => any;
+        onEnd?: (event: any) => any;
+        onAdd?: (event: any) => any;
+        onUpdate?: (event: any) => any;
+        onSort?: (event: any) => any;
+        onRemove?: (event: any) => any;
+        onFilter?: (event: any) => any;
+        onMove?: (event: any) => boolean;
+    }
+
+    interface SortableUtils {
+        /**
+         * Attach an event handler function
+         * @param {HTMLElement} element an HTMLElement.
+         * @param {string} event an Event context.
+         * @param {Function} fn
+         */
+        on(element: any, event: string, fn: (event: any) => any): void;
+
+        /**
+         * Remove an event handler function
+         * @param {HTMLElement} element an HTMLElement.
+         * @param {string} event an Event context.
+         * @param {Function} fn a callback.
+         */
+        off(element: any, event: string, fn: (event: any) => any): void;
+
+        /**
+         * Get the values of all the CSS properties.
+         * @param {HTMLElement} element an HTMLElement.
+         * @returns {Object}
+         */
+        css(element: any): any;
+
+        /**
+         * Get the value of style properties.
+         * @param {HTMLElement} element an HTMLElement.
+         * @param {string} prop a property key.
+         * @returns {*}
+         */
+        css(element: any, prop: string): any;
+
+        /**
+         * Set one CSS property.
+         * @param {HTMLElement} element an HTMLElement.
+         * @param {string} prop a property key.
+         * @param {string} value a property value.
+         */
+        css(element: any, prop: string, value: string): void;
+
+        /**
+         * Set CSS properties.
+         * @param {HTMLElement} element an HTMLElement.
+         * @param {Object} props a properties object.
+         */
+        css(element: any, props: any): void;
+
+        /**
+         * Get elements by tag name.
+         * @param {HTMLElement} context an HTMLElement.
+         * @param {string} tagName A tag name.
+         * @param {function} [iterator] An iterator.
+         * @returns {HTMLElement[]}
+         */
+        find(context: any, tagName: string, iterator?: (value: any) => any): any[];
+
+        /**
+         * Takes a function and returns a new one that will always have a particular context.
+         * @param {*} context an HTMLElement.
+         * @param {function} fn a function.
+         * @returns {function}
+         */
+        bind(context: any, fn: () => any): () => any;
+
+        /**
+         * Check the current matched set of elements against a selector.
+         * @param {HTMLElement} element an HTMLElement.
+         * @param {string} selector an element selector.
+         * @returns {boolean}
+         */
+        is(element: any, selector: string): boolean;
+
+        /**
+         * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
+         * @param {HTMLElement} element an HTMLElement.
+         * @param {string} selector an element seletor.
+         * @param {HTMLElement} [context] a specific element's context.
+         * @returns {HTMLElement}
+         */
+        closest(element: any, selector: string, context?: any): any;
+
+        /**
+         * Add or remove one classes from each element
+         * @param {HTMLElement} element an HTMLElement.
+         * @param {string} name a class name.
+         * @param {boolean} state a class's state.
+         */
+        toggleClass(element: any, name: string, state: boolean): void;
+    }
+
+    class DOMRect {
+        public bottom: number;
+        public height: number;
+        public left: number;
+        public right: number;
+        public top: number;
+        public width: number;
+        public x: number;
+        public y: number;
+    }
+
+    class Sortable {
+        public options: SortableOptions;
+        public el: any;
+
+        /**
+         * Sortable's main constructor.
+         * @param {HTMLElement} element Any variety of HTMLElement.
+         * @param {SortableOptions} options Sortable options object.
+         */
+        constructor(element: any, options: SortableOptions);
+
+        static active: Sortable;
+        static utils: SortableUtils;
+
+        /**
+         * Creation of new instances.
+         * @param {HTMLElement} element Any variety of HTMLElement.
+         * @param {SortableOptions} options Sortable options object.
+         * @returns {Sortable}
+         */
+        static create(element: any, options: SortableOptions): Sortable;
+
+        /**
+         * Options getter/setter
+         * @param {string} name a SortableOptions property.
+         * @param {*} [value] a Value.
+         * @returns {*}
+         */
+        option(name: string, value: any): any;
+        option(name: string): any;
+
+        /**
+         * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
+         * @param {string|HTMLElement} element an HTMLElement or selector string.
+         * @returns {HTMLElement}
+         */
+        closest(element: any): any;
+
+        /**
+         * Sorts the elements according to the array.
+         * @param {string[]} order an array of strings to sort.
+         */
+        sort(order: string[]): void;
+
+        /**
+         * Saving and restoring of the sort.
+         */
+        save(): void;
+
+        /**
+         * Removes the sortable functionality completely.
+         */
+        destroy(): void;
+
+        /**
+         * Serializes the sortable's item data-id's (dataIdAttr option) into an array of string.
+         * @returns {string[]}
+         */
+        toArray(): string[];
+    }
+}
+
+import Sortable = Sortablejs.Sortable;
+export = Sortable;
+export as namespace Sortable;
diff --git a/sortablejs/sortablejs-tests.ts b/sortablejs/sortablejs-tests.ts
index 8c45596cbe..73c32ea862 100644
--- a/sortablejs/sortablejs-tests.ts
+++ b/sortablejs/sortablejs-tests.ts
@@ -1,6 +1,6 @@
 // Examples from project repo used for tests.
+import Sortable = require("sortablejs");
 
-/// <reference path="sortablejs.d.ts" />
 
 var simpleList = document.getElementById('list');
 var list = simpleList;
diff --git a/sortablejs/sortablejs.d.ts b/sortablejs/sortablejs.d.ts
deleted file mode 100644
index 1348a57fbb..0000000000
--- a/sortablejs/sortablejs.d.ts
+++ /dev/null
@@ -1,208 +0,0 @@
-// Type definitions for Sortable.js v1.3.0-rc1
-// Project: https://github.com/RubaXa/Sortable
-// Definitions by: Maw-Fox <http://github.com/Maw-Fox>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace Sortablejs {
-    interface SortableOptions {
-        group?: any;
-        sort?: boolean;
-        delay?: number;
-        disabled?: boolean;
-        store?: {
-            get: (sortable: Sortable) => any[];
-            set: (sortable: Sortable) => any;
-        };
-        animation?: number;
-        handle?: string;
-        filter?: any;
-        draggable?: string;
-        ghostClass?: string;
-        chosenClass?: string;
-        dataIdAttr?: string;
-        forceFallback?: boolean;
-        fallbackClass?: string;
-        fallbackOnBody?: boolean;
-        scroll?: boolean;
-        scrollSensitivity?: number;
-        scrollSpeed?: number;
-        setData?: (dataTransfer: any, draggedElement: any) => any;
-        onStart?: (event: any) => any;
-        onEnd?: (event: any) => any;
-        onAdd?: (event: any) => any;
-        onUpdate?: (event: any) => any;
-        onSort?: (event: any) => any;
-        onRemove?: (event: any) => any;
-        onFilter?: (event: any) => any;
-        onMove?: (event: any) => boolean;
-    }
-
-    interface SortableUtils {
-        /**
-         * Attach an event handler function
-         * @param {HTMLElement} element an HTMLElement.
-         * @param {string} event an Event context.
-         * @param {Function} fn
-         */
-        on(element: any, event: string, fn: (event: any) => any): void;
-
-        /**
-         * Remove an event handler function
-         * @param {HTMLElement} element an HTMLElement.
-         * @param {string} event an Event context.
-         * @param {Function} fn a callback.
-         */
-        off(element: any, event: string, fn: (event: any) => any): void;
-
-        /**
-         * Get the values of all the CSS properties.
-         * @param {HTMLElement} element an HTMLElement.
-         * @returns {Object}
-         */
-        css(element: any): any;
-
-        /**
-         * Get the value of style properties.
-         * @param {HTMLElement} element an HTMLElement.
-         * @param {string} prop a property key.
-         * @returns {*}
-         */
-        css(element: any, prop: string): any;
-
-        /**
-         * Set one CSS property.
-         * @param {HTMLElement} element an HTMLElement.
-         * @param {string} prop a property key.
-         * @param {string} value a property value.
-         */
-        css(element: any, prop: string, value: string): void;
-
-        /**
-         * Set CSS properties.
-         * @param {HTMLElement} element an HTMLElement.
-         * @param {Object} props a properties object.
-         */
-        css(element: any, props: any): void;
-
-        /**
-         * Get elements by tag name.
-         * @param {HTMLElement} context an HTMLElement.
-         * @param {string} tagName A tag name.
-         * @param {function} [iterator] An iterator.
-         * @returns {HTMLElement[]}
-         */
-        find(context: any, tagName: string, iterator?: (value: any) => any): any[];
-
-        /**
-         * Takes a function and returns a new one that will always have a particular context.
-         * @param {*} context an HTMLElement.
-         * @param {function} fn a function.
-         * @returns {function}
-         */
-        bind(context: any, fn: () => any): () => any;
-
-        /**
-         * Check the current matched set of elements against a selector.
-         * @param {HTMLElement} element an HTMLElement.
-         * @param {string} selector an element selector.
-         * @returns {boolean}
-         */
-        is(element: any, selector: string): boolean;
-
-        /**
-         * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
-         * @param {HTMLElement} element an HTMLElement.
-         * @param {string} selector an element seletor.
-         * @param {HTMLElement} [context] a specific element's context.
-         * @returns {HTMLElement}
-         */
-        closest(element: any, selector: string, context?: any): any;
-
-        /**
-         * Add or remove one classes from each element
-         * @param {HTMLElement} element an HTMLElement.
-         * @param {string} name a class name.
-         * @param {boolean} state a class's state.
-         */
-        toggleClass(element: any, name: string, state: boolean): void;
-    }
-
-    class DOMRect {
-        public bottom: number;
-        public height: number;
-        public left: number;
-        public right: number;
-        public top: number;
-        public width: number;
-        public x: number;
-        public y: number;
-    }
-
-    class Sortable {
-        public options: SortableOptions;
-        public el: any;
-
-        /**
-         * Sortable's main constructor.
-         * @param {HTMLElement} element Any variety of HTMLElement.
-         * @param {SortableOptions} options Sortable options object.
-         */
-        constructor(element: any, options: SortableOptions);
-
-        static active: Sortable;
-        static utils: SortableUtils;
-
-        /**
-         * Creation of new instances.
-         * @param {HTMLElement} element Any variety of HTMLElement.
-         * @param {SortableOptions} options Sortable options object.
-         * @returns {Sortable}
-         */
-        static create(element: any, options: SortableOptions): Sortable;
-
-        /**
-         * Options getter/setter
-         * @param {string} name a SortableOptions property.
-         * @param {*} [value] a Value.
-         * @returns {*}
-         */
-        option(name: string, value: any): any;
-        option(name: string): any;
-
-        /**
-         * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
-         * @param {string|HTMLElement} element an HTMLElement or selector string.
-         * @returns {HTMLElement}
-         */
-        closest(element: any): any;
-
-        /**
-         * Sorts the elements according to the array.
-         * @param {string[]} order an array of strings to sort.
-         */
-        sort(order: string[]): void;
-
-        /**
-         * Saving and restoring of the sort.
-         */
-        save(): void;
-
-        /**
-         * Removes the sortable functionality completely.
-         */
-        destroy(): void;
-
-        /**
-         * Serializes the sortable's item data-id's (dataIdAttr option) into an array of string.
-         * @returns {string[]}
-         */
-        toArray(): string[];
-    }
-}
-
-import Sortable = Sortablejs.Sortable;
-
-declare module 'Sortable' {
-    import Sortable = Sortablejs.Sortable;
-    export = Sortable;
-}
diff --git a/sortablejs/tsconfig.json b/sortablejs/tsconfig.json
new file mode 100644
index 0000000000..2b1fbcf4ce
--- /dev/null
+++ b/sortablejs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sortablejs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/soundjs/index.d.ts b/soundjs/index.d.ts
new file mode 100644
index 0000000000..3fe8b2748d
--- /dev/null
+++ b/soundjs/index.d.ts
@@ -0,0 +1,265 @@
+// Type definitions for SoundJS 0.6.0
+// Project: http://www.createjs.com/#!/SoundJS
+// Definitions by: Pedro Ferreira <https://bitbucket.org/drk4>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*
+    Copyright (c) 2012 Pedro Ferreira
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+// Library documentation : http://www.createjs.com/Docs/SoundJS/modules/SoundJS.html
+
+/// <reference types="createjs-lib" />
+/// <reference types="preloadjs" />
+
+declare namespace createjs {
+
+    export class AbstractPlugin
+        {
+        // methods
+        create(src: string, startTime: number, duration: number): AbstractSoundInstance;
+        getVolume(): number;
+        isPreloadComplete(src: string): boolean;
+        isPreloadStarted(src: string): boolean;
+        isSupported(): boolean;
+        preload(loader: Object): void;
+        register(loadItem: string, instances: number): Object;
+        removeAllSounds(src: string): void;
+        removeSound(src: string): void;
+        setMute(value: boolean): boolean;
+        setVolume(value: number): boolean;
+        }
+
+    export class AbstractSoundInstance extends EventDispatcher
+        {
+        constructor(src: string, startTime: number, duration: number, playbackResource: Object);
+
+        // properties
+        duration: number;
+        loop: number;
+        muted: boolean;
+        pan: number;
+        paused: boolean;
+        playbackResource: Object;
+        playState: string;
+        position: number;
+        src: string;
+        uniqueId: number | string;
+        volume: number;
+
+        // methods
+        destroy(): void;
+        getDuration(): number;
+        getLoop(): number;
+        getMute(): boolean;
+        getPan(): number;
+        getPaused(): boolean;
+        getPosition(): number;
+        getVolume(): number;
+        play(interrupt?: string | Object, delay?: number, offset?: number, loop?: number, volume?: number, pan?: number): AbstractSoundInstance;
+        setDuration(value: number): AbstractSoundInstance;
+        setLoop(value: number): void;
+        setMute(value: boolean): AbstractSoundInstance;
+        setPan(value: number): AbstractSoundInstance;
+        setPlayback(value: Object): AbstractSoundInstance;
+        setPosition(value: number): AbstractSoundInstance;
+        setVolume(value: number): AbstractSoundInstance;
+        stop(): AbstractSoundInstance;
+        }
+
+    export class FlashAudioLoader extends AbstractLoader
+        {
+        // properties
+        flashId: string;
+
+        // methods
+        setFlash(flash: Object): void;
+        }
+
+    export class FlashAudioPlugin extends AbstractPlugin
+        {
+        // properties
+        flashReady: boolean;
+        showOutput: boolean;
+        static swfPath: string;
+
+        // methods
+        static isSupported(): boolean;
+        }
+
+    export class FlashAudioSoundInstance extends AbstractSoundInstance
+        {
+        constructor(src: string, startTime: number, duration: number, playbackResource: Object);
+        }
+
+    /**
+     * @deprecated - use FlashAudioPlugin
+     */
+    export class FlashPlugin {
+        constructor();
+
+        // properties
+        static buildDate: string;
+        flashReady: boolean;
+        showOutput: boolean;
+        static swfPath: string;
+        static version: string;
+
+        // methods
+        create(src: string): AbstractSoundInstance;
+        getVolume(): number;
+        isPreloadStarted(src: string): boolean;
+        static isSupported(): boolean;
+        preload(src: string, instance: Object): void;
+        register(src: string, instances: number): Object;
+        removeAllSounds (): void;
+        removeSound(src: string): void;
+        setMute(value: boolean): boolean;
+        setVolume(value: number): boolean;
+    }
+
+    export class HTMLAudioPlugin extends AbstractPlugin
+        {
+        constructor();
+
+        // properties
+        defaultNumChannels: number;
+        enableIOS: boolean;     // deprecated
+        static MAX_INSTANCES: number;
+
+        // methods
+        static isSupported(): boolean;
+        }
+
+    export class HTMLAudioSoundInstance extends AbstractSoundInstance
+        {
+        constructor(src: string, startTime: number, duration: number, playbackResource: Object);
+        }
+
+    export class HTMLAudioTagPool
+        {
+
+        }
+
+    export class PlayPropsConfig
+	{
+	delay:number;
+	duration:number;
+	interrupt:string;
+	loop:number;
+	offset:number;
+	pan:number;
+	startTime:number;
+	volume:number;
+	static create( value:PlayPropsConfig|any ): PlayPropsConfig;
+	set ( props:any ): PlayPropsConfig;
+	}
+
+    export class Sound extends EventDispatcher
+        {
+        // properties
+        static activePlugin: Object;
+        static alternateExtensions: any[];
+        static defaultInterruptBehavior: string;
+        static EXTENSION_MAP: Object;
+        static INTERRUPT_ANY: string;
+        static INTERRUPT_EARLY: string;
+        static INTERRUPT_LATE: string;
+        static INTERRUPT_NONE: string;
+        static PLAY_FAILED: string;
+        static PLAY_FINISHED: string;
+        static PLAY_INITED: string;
+        static PLAY_INTERRUPTED: string;
+        static PLAY_SUCCEEDED: string;
+        static SUPPORTED_EXTENSIONS: string[];
+	static muted: boolean;
+	static volume: number;
+        static capabilities: any;
+
+        // methods
+        static createInstance(src: string): AbstractSoundInstance;
+        static getCapabilities(): Object;
+        static getCapability(key: string): number | boolean;
+        static getMute(): boolean;
+        static getVolume(): number;
+        static initializeDefaultPlugins(): boolean;
+        static isReady(): boolean;
+        static loadComplete(src: string): boolean;
+        static play(src: string, interrupt?: any, delay?: number, offset?: number, loop?: number, volume?: number, pan?: number): AbstractSoundInstance;
+        static registerManifest(manifest: Object[], basePath: string): Object;
+        static registerPlugins(plugins: any[]): boolean;
+        static registerSound(src: string | Object, id?: string, data?: number | Object, basePath?: string): Object;
+        static registerSounds(sounds: Object[], basePath?: string): Object[];
+        static removeAllSounds(): void;
+        static removeManifest(manifest: any[], basePath: string): Object;
+        static removeSound(src: string | Object, basePath: string): boolean;
+        static setMute(value: boolean): boolean;
+        static setVolume(value: number): void;
+        static stop(): void;
+
+        // EventDispatcher mixins
+        static addEventListener(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): Function;
+        static addEventListener(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): Function;
+        static addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): Object;
+        static addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): Object;
+        static dispatchEvent(eventObj: Object | string | Event, target?: Object): boolean;
+        static hasEventListener(type: string): boolean;
+        static off(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): void;
+        static off(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): void;
+        static off(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): void;
+        static off(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): void;
+        static off(type: string, listener: Function, useCapture?: boolean): void; // It is necessary for "arguments.callee"
+        static on(type: string, listener: (eventObj: Object) => boolean, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function;
+        static on(type: string, listener: (eventObj: Object) => void, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function;
+        static on(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Object;
+        static on(type: string, listener: { handleEvent: (eventObj: Object) => void; }, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Object;
+        static removeAllEventListeners(type?: string): void;
+        static removeEventListener(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): void;
+        static removeEventListener(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): void;
+        static removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): void;
+        static removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): void;
+        static removeEventListener(type: string, listener: Function, useCapture?: boolean): void; // It is necessary for "arguments.callee"
+        static toString(): string;
+        static willTrigger(type: string): boolean;
+    }
+
+    export class SoundJS {
+        static buildDate: string;
+        static version: string;
+    }
+
+    export class WebAudioLoader
+        {
+        static context: AudioContext;
+        }
+
+    export class WebAudioPlugin extends AbstractPlugin
+        {
+        constructor();
+
+        // properties
+        static context: AudioContext;
+        context: AudioContext;
+        dynamicsCompressorNode: DynamicsCompressorNode;
+        gainNode: GainNode;
+
+        // methods
+        static isSupported(): boolean;
+        static playEmptySound(): void;
+        }
+
+    export class WebAudioSoundInstance extends AbstractSoundInstance
+        {
+        constructor(src: string, startTime: number, duration: number, playbackResource: Object);
+
+        // properties
+        static context: AudioContext;
+        static destinationNode: AudioNode;
+        gainNode: GainNode;
+        panNode: PannerNode;
+        sourceNode: AudioNode;
+        }
+}
diff --git a/soundjs/soundjs-tests.ts b/soundjs/soundjs-tests.ts
index 1d97d18d7b..384e9cd88e 100644
--- a/soundjs/soundjs-tests.ts
+++ b/soundjs/soundjs-tests.ts
@@ -1,6 +1,3 @@
-///<reference path="./soundjs.d.ts"/>
-
-
 // Sample from : http://www.createjs.com/Docs/SoundJS/modules/SoundJS.html 
 // Feature set example: 
 createjs.Sound.addEventListener("fileload", createjs.proxy(this.loadHandler, this));
diff --git a/soundjs/soundjs.d.ts b/soundjs/soundjs.d.ts
deleted file mode 100644
index 2f62fdab02..0000000000
--- a/soundjs/soundjs.d.ts
+++ /dev/null
@@ -1,265 +0,0 @@
-// Type definitions for SoundJS 0.6.0
-// Project: http://www.createjs.com/#!/SoundJS
-// Definitions by: Pedro Ferreira <https://bitbucket.org/drk4>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/*
-    Copyright (c) 2012 Pedro Ferreira
-    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-// Library documentation : http://www.createjs.com/Docs/SoundJS/modules/SoundJS.html
-
-/// <reference path="../createjs-lib/createjs-lib.d.ts" />
-/// <reference path="../preloadjs/preloadjs.d.ts" />
-
-declare namespace createjs {
-
-    export class AbstractPlugin
-        {
-        // methods
-        create(src: string, startTime: number, duration: number): AbstractSoundInstance;
-        getVolume(): number;
-        isPreloadComplete(src: string): boolean;
-        isPreloadStarted(src: string): boolean;
-        isSupported(): boolean;
-        preload(loader: Object): void;
-        register(loadItem: string, instances: number): Object;
-        removeAllSounds(src: string): void;
-        removeSound(src: string): void;
-        setMute(value: boolean): boolean;
-        setVolume(value: number): boolean;
-        }
-
-    export class AbstractSoundInstance extends EventDispatcher
-        {
-        constructor(src: string, startTime: number, duration: number, playbackResource: Object);
-
-        // properties
-        duration: number;
-        loop: number;
-        muted: boolean;
-        pan: number;
-        paused: boolean;
-        playbackResource: Object;
-        playState: string;
-        position: number;
-        src: string;
-        uniqueId: number | string;
-        volume: number;
-
-        // methods
-        destroy(): void;
-        getDuration(): number;
-        getLoop(): number;
-        getMute(): boolean;
-        getPan(): number;
-        getPaused(): boolean;
-        getPosition(): number;
-        getVolume(): number;
-        play(interrupt?: string | Object, delay?: number, offset?: number, loop?: number, volume?: number, pan?: number): AbstractSoundInstance;
-        setDuration(value: number): AbstractSoundInstance;
-        setLoop(value: number): void;
-        setMute(value: boolean): AbstractSoundInstance;
-        setPan(value: number): AbstractSoundInstance;
-        setPlayback(value: Object): AbstractSoundInstance;
-        setPosition(value: number): AbstractSoundInstance;
-        setVolume(value: number): AbstractSoundInstance;
-        stop(): AbstractSoundInstance;
-        }
-
-    export class FlashAudioLoader extends AbstractLoader
-        {
-        // properties
-        flashId: string;
-
-        // methods
-        setFlash(flash: Object): void;
-        }
-
-    export class FlashAudioPlugin extends AbstractPlugin
-        {
-        // properties
-        flashReady: boolean;
-        showOutput: boolean;
-        static swfPath: string;
-
-        // methods
-        static isSupported(): boolean;
-        }
-
-    export class FlashAudioSoundInstance extends AbstractSoundInstance
-        {
-        constructor(src: string, startTime: number, duration: number, playbackResource: Object);
-        }
-
-    /**
-     * @deprecated - use FlashAudioPlugin
-     */
-    export class FlashPlugin {
-        constructor();
-
-        // properties
-        static buildDate: string;
-        flashReady: boolean;
-        showOutput: boolean;
-        static swfPath: string;
-        static version: string;
-
-        // methods
-        create(src: string): AbstractSoundInstance;
-        getVolume(): number;
-        isPreloadStarted(src: string): boolean;
-        static isSupported(): boolean;
-        preload(src: string, instance: Object): void;
-        register(src: string, instances: number): Object;
-        removeAllSounds (): void;
-        removeSound(src: string): void;
-        setMute(value: boolean): boolean;
-        setVolume(value: number): boolean;
-    }
-
-    export class HTMLAudioPlugin extends AbstractPlugin
-        {
-        constructor();
-
-        // properties
-        defaultNumChannels: number;
-        enableIOS: boolean;     // deprecated
-        static MAX_INSTANCES: number;
-
-        // methods
-        static isSupported(): boolean;
-        }
-
-    export class HTMLAudioSoundInstance extends AbstractSoundInstance
-        {
-        constructor(src: string, startTime: number, duration: number, playbackResource: Object);
-        }
-
-    export class HTMLAudioTagPool
-        {
-
-        }
-
-    export class PlayPropsConfig
-	{
-	delay:number;
-	duration:number;
-	interrupt:string;
-	loop:number;
-	offset:number;
-	pan:number;
-	startTime:number;
-	volume:number;
-	static create( value:PlayPropsConfig|any ): PlayPropsConfig;
-	set ( props:any ): PlayPropsConfig;
-	}
-
-    export class Sound extends EventDispatcher
-        {
-        // properties
-        static activePlugin: Object;
-        static alternateExtensions: any[];
-        static defaultInterruptBehavior: string;
-        static EXTENSION_MAP: Object;
-        static INTERRUPT_ANY: string;
-        static INTERRUPT_EARLY: string;
-        static INTERRUPT_LATE: string;
-        static INTERRUPT_NONE: string;
-        static PLAY_FAILED: string;
-        static PLAY_FINISHED: string;
-        static PLAY_INITED: string;
-        static PLAY_INTERRUPTED: string;
-        static PLAY_SUCCEEDED: string;
-        static SUPPORTED_EXTENSIONS: string[];
-	static muted: boolean;
-	static volume: number;
-        static capabilities: any;
-
-        // methods
-        static createInstance(src: string): AbstractSoundInstance;
-        static getCapabilities(): Object;
-        static getCapability(key: string): number | boolean;
-        static getMute(): boolean;
-        static getVolume(): number;
-        static initializeDefaultPlugins(): boolean;
-        static isReady(): boolean;
-        static loadComplete(src: string): boolean;
-        static play(src: string, interrupt?: any, delay?: number, offset?: number, loop?: number, volume?: number, pan?: number): AbstractSoundInstance;
-        static registerManifest(manifest: Object[], basePath: string): Object;
-        static registerPlugins(plugins: any[]): boolean;
-        static registerSound(src: string | Object, id?: string, data?: number | Object, basePath?: string): Object;
-        static registerSounds(sounds: Object[], basePath?: string): Object[];
-        static removeAllSounds(): void;
-        static removeManifest(manifest: any[], basePath: string): Object;
-        static removeSound(src: string | Object, basePath: string): boolean;
-        static setMute(value: boolean): boolean;
-        static setVolume(value: number): void;
-        static stop(): void;
-
-        // EventDispatcher mixins
-        static addEventListener(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): Function;
-        static addEventListener(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): Function;
-        static addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): Object;
-        static addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): Object;
-        static dispatchEvent(eventObj: Object | string | Event, target?: Object): boolean;
-        static hasEventListener(type: string): boolean;
-        static off(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): void;
-        static off(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): void;
-        static off(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): void;
-        static off(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): void;
-        static off(type: string, listener: Function, useCapture?: boolean): void; // It is necessary for "arguments.callee"
-        static on(type: string, listener: (eventObj: Object) => boolean, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function;
-        static on(type: string, listener: (eventObj: Object) => void, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function;
-        static on(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Object;
-        static on(type: string, listener: { handleEvent: (eventObj: Object) => void; }, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Object;
-        static removeAllEventListeners(type?: string): void;
-        static removeEventListener(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): void;
-        static removeEventListener(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): void;
-        static removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): void;
-        static removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): void;
-        static removeEventListener(type: string, listener: Function, useCapture?: boolean): void; // It is necessary for "arguments.callee"
-        static toString(): string;
-        static willTrigger(type: string): boolean;
-    }
-
-    export class SoundJS {
-        static buildDate: string;
-        static version: string;
-    }
-
-    export class WebAudioLoader
-        {
-        static context: AudioContext;
-        }
-
-    export class WebAudioPlugin extends AbstractPlugin
-        {
-        constructor();
-
-        // properties
-        static context: AudioContext;
-        context: AudioContext;
-        dynamicsCompressorNode: DynamicsCompressorNode;
-        gainNode: GainNode;
-
-        // methods
-        static isSupported(): boolean;
-        static playEmptySound(): void;
-        }
-
-    export class WebAudioSoundInstance extends AbstractSoundInstance
-        {
-        constructor(src: string, startTime: number, duration: number, playbackResource: Object);
-
-        // properties
-        static context: AudioContext;
-        static destinationNode: AudioNode;
-        gainNode: GainNode;
-        panNode: PannerNode;
-        sourceNode: AudioNode;
-        }
-}
diff --git a/soundjs/tsconfig.json b/soundjs/tsconfig.json
new file mode 100644
index 0000000000..b434aae0b9
--- /dev/null
+++ b/soundjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "soundjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/source-map-support/index.d.ts b/source-map-support/index.d.ts
new file mode 100644
index 0000000000..8df4456483
--- /dev/null
+++ b/source-map-support/index.d.ts
@@ -0,0 +1,42 @@
+// Type definitions for source-map-support 0.2.10
+// Project: https://github.com/evanw/source-map-support
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+/**
+ * Output of retrieveSourceMap().
+ */
+export interface UrlAndMap {
+    url: string;
+    map: string | Buffer;
+}
+
+/**
+ * Options to install().
+ */
+export interface Options {
+    handleUncaughtExceptions?: boolean;
+    emptyCacheBetweenOperations?: boolean;
+    retrieveFile?: (path: string) => string;
+    retrieveSourceMap?: (source: string) => UrlAndMap;
+}
+
+export interface Position {
+    source: string;
+    line: number;
+    column: number;
+}
+
+export declare function wrapCallSite(frame: any /* StackFrame */): any /* StackFrame */;
+export declare function getErrorSource(error: Error): string;
+export declare function mapSourcePosition(position: Position): Position;
+export declare function retrieveSourceMap(source: string): UrlAndMap;
+
+/**
+ * Install SourceMap support.
+ * @param options Can be used to e.g. disable uncaughtException handler.
+ */
+export declare function install(options?: Options): void;
diff --git a/source-map-support/source-map-support-tests.ts b/source-map-support/source-map-support-tests.ts
index 09a4fff459..602547509e 100644
--- a/source-map-support/source-map-support-tests.ts
+++ b/source-map-support/source-map-support-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="source-map-support.d.ts" />
 
 import sms = require('source-map-support');
 
diff --git a/source-map-support/source-map-support.d.ts b/source-map-support/source-map-support.d.ts
deleted file mode 100644
index b672e5291a..0000000000
--- a/source-map-support/source-map-support.d.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-// Type definitions for source-map-support 0.2.10
-// Project: https://github.com/evanw/source-map-support
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'source-map-support' {
-	/**
-	 * Output of retrieveSourceMap().
-	 */
-	export interface UrlAndMap {
-		url: string;
-		map: string|Buffer;
-	}
-
-	/**
-	 * Options to install().
-	 */
-	export interface Options {
-		handleUncaughtExceptions?: boolean;
-		emptyCacheBetweenOperations?: boolean;
-		retrieveFile?: (path: string) => string;
-		retrieveSourceMap?: (source: string) => UrlAndMap;
-	}
-
-	export interface Position {
-		source: string;
-		line: number;
-		column: number;
-	}
-
-	export function wrapCallSite(frame: any /* StackFrame */): any /* StackFrame */;
-	export function getErrorSource(error: Error): string;
-	export function mapSourcePosition(position: Position): Position;
-	export function retrieveSourceMap(source: string): UrlAndMap;
-
-	/**
-	 * Install SourceMap support.
-	 * @param options Can be used to e.g. disable uncaughtException handler.
-	 */
-	export function install(options?: Options): void;
-}
diff --git a/source-map-support/tsconfig.json b/source-map-support/tsconfig.json
new file mode 100644
index 0000000000..760d58d180
--- /dev/null
+++ b/source-map-support/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "source-map-support-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/source-map/index.d.ts b/source-map/index.d.ts
new file mode 100644
index 0000000000..eed01d5387
--- /dev/null
+++ b/source-map/index.d.ts
@@ -0,0 +1,89 @@
+// Type definitions for source-map v0.1.38
+// Project: https://github.com/mozilla/source-map
+// Definitions by: Morten Houston Ludvigsen <https://github.com/MortenHoustonLudvigsen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = SourceMap;
+export as namespace sourceMap;
+
+declare namespace SourceMap {
+    interface StartOfSourceMap {
+        file?: string;
+        sourceRoot?: string;
+    }
+
+    interface RawSourceMap extends StartOfSourceMap {
+        version: string;
+        sources: Array<string>;
+        names: Array<string>;
+        sourcesContent?: string[];
+        mappings: string;
+    }
+
+    interface Position {
+        line: number;
+        column: number;
+    }
+
+    interface MappedPosition extends Position {
+        source: string;
+        name?: string;
+    }
+
+    interface MappingItem {
+        source: string;
+        generatedLine: number;
+        generatedColumn: number;
+        originalLine: number;
+        originalColumn: number;
+        name: string;
+    }
+
+    interface Mapping {
+        generated: Position;
+        original: Position;
+        source: string;
+        name?: string;
+    }
+
+    interface CodeWithSourceMap {
+        code: string;
+        map: SourceMapGenerator;
+    }
+
+    class SourceMapConsumer {
+        public static GENERATED_ORDER: number;
+        public static ORIGINAL_ORDER: number;
+
+        constructor(rawSourceMap: RawSourceMap);
+        public originalPositionFor(generatedPosition: Position): MappedPosition;
+        public generatedPositionFor(originalPosition: MappedPosition): Position;
+        public sourceContentFor(source: string): string;
+        public eachMapping(callback: (mapping: MappingItem) => void, context?: any, order?: number): void;
+    }
+
+    class SourceMapGenerator {
+        constructor(startOfSourceMap?: StartOfSourceMap);
+        public static fromSourceMap(sourceMapConsumer: SourceMapConsumer): SourceMapGenerator;
+        public addMapping(mapping: Mapping): void;
+        public setSourceContent(sourceFile: string, sourceContent: string): void;
+        public applySourceMap(sourceMapConsumer: SourceMapConsumer, sourceFile?: string, sourceMapPath?: string): void;
+        public toString(): string;
+    }
+
+    class SourceNode {
+        constructor();
+        constructor(line: number, column: number, source: string);
+        constructor(line: number, column: number, source: string, chunk?: string, name?: string);
+        public static fromStringWithSourceMap(code: string, sourceMapConsumer: SourceMapConsumer, relativePath?: string): SourceNode;
+        public add(chunk: any): SourceNode;
+        public prepend(chunk: any): SourceNode;
+        public setSourceContent(sourceFile: string, sourceContent: string): void;
+        public walk(fn: (chunk: string, mapping: MappedPosition) => void): void;
+        public walkSourceContents(fn: (file: string, content: string) => void): void;
+        public join(sep: string): SourceNode;
+        public replaceRight(pattern: string, replacement: string): SourceNode;
+        public toString(): string;
+        public toStringWithSourceMap(startOfSourceMap?: StartOfSourceMap): CodeWithSourceMap;
+    }
+}
diff --git a/source-map/source-map-tests.ts b/source-map/source-map-tests.ts
index ac621fe430..979f8d4d25 100644
--- a/source-map/source-map-tests.ts
+++ b/source-map/source-map-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./source-map.d.ts" />
+
 
 import SourceMap = require('source-map');
 
diff --git a/source-map/source-map.d.ts b/source-map/source-map.d.ts
deleted file mode 100644
index cbdccc80d6..0000000000
--- a/source-map/source-map.d.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-// Type definitions for source-map v0.1.38
-// Project: https://github.com/mozilla/source-map
-// Definitions by: Morten Houston Ludvigsen <https://github.com/MortenHoustonLudvigsen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace SourceMap {
-    interface StartOfSourceMap {
-        file?: string;
-        sourceRoot?: string;
-    }
-
-    interface RawSourceMap extends StartOfSourceMap {
-        version: string;
-        sources: Array<string>;
-        names: Array<string>;
-        sourcesContent?: string[];
-        mappings: string;
-    }
-
-    interface Position {
-        line: number;
-        column: number;
-    }
-
-    interface MappedPosition extends Position {
-        source: string;
-        name?: string;
-    }
-
-    interface MappingItem {
-        source: string;
-        generatedLine: number;
-        generatedColumn: number;
-        originalLine: number;
-        originalColumn: number;
-        name: string;
-    }
-
-    interface Mapping {
-        generated: Position;
-        original: Position;
-        source: string;
-        name?: string;
-    }
-
-    interface CodeWithSourceMap {
-        code: string;
-        map: SourceMapGenerator;
-    }
-
-    class SourceMapConsumer {
-        public static GENERATED_ORDER: number;
-        public static ORIGINAL_ORDER: number;
-
-        constructor(rawSourceMap: RawSourceMap);
-        public originalPositionFor(generatedPosition: Position): MappedPosition;
-        public generatedPositionFor(originalPosition: MappedPosition): Position;
-        public sourceContentFor(source: string): string;
-        public eachMapping(callback: (mapping: MappingItem) => void, context?: any, order?: number): void;
-    }
-
-    class SourceMapGenerator {
-        constructor(startOfSourceMap?: StartOfSourceMap);
-        public static fromSourceMap(sourceMapConsumer: SourceMapConsumer): SourceMapGenerator;
-        public addMapping(mapping: Mapping): void;
-        public setSourceContent(sourceFile: string, sourceContent: string): void;
-        public applySourceMap(sourceMapConsumer: SourceMapConsumer, sourceFile?: string, sourceMapPath?: string): void;
-        public toString(): string;
-    }
-
-    class SourceNode {
-        constructor();
-        constructor(line: number, column: number, source: string);
-        constructor(line: number, column: number, source: string, chunk?: string, name?: string);
-        public static fromStringWithSourceMap(code: string, sourceMapConsumer: SourceMapConsumer, relativePath?: string): SourceNode;
-        public add(chunk: any): SourceNode;
-        public prepend(chunk: any): SourceNode;
-        public setSourceContent(sourceFile: string, sourceContent: string): void;
-        public walk(fn: (chunk: string, mapping: MappedPosition) => void): void;
-        public walkSourceContents(fn: (file: string, content: string) => void): void;
-        public join(sep: string): SourceNode;
-        public replaceRight(pattern: string, replacement: string): SourceNode;
-        public toString(): string;
-        public toStringWithSourceMap(startOfSourceMap?: StartOfSourceMap): CodeWithSourceMap;
-    }
-}
-
-declare module 'source-map' {
-    export = SourceMap;
-}
diff --git a/source-map/tsconfig.json b/source-map/tsconfig.json
new file mode 100644
index 0000000000..7e2a06bb38
--- /dev/null
+++ b/source-map/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "source-map-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/space-pen/index.d.ts b/space-pen/index.d.ts
new file mode 100644
index 0000000000..52aaf5d320
--- /dev/null
+++ b/space-pen/index.d.ts
@@ -0,0 +1,625 @@
+// Type definitions for SpacePen
+// Project: https://github.com/atom/space-pen
+// Definitions by: vvakame <https://github.com/vvakame>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+// http://atom.github.io/space-pen/
+
+interface JQuery {
+	view():any;
+	views():any[];
+}
+
+interface JQuery {
+	scrollBottom():number;
+	scrollBottom(newValue:number):JQuery;
+	scrollDown():JQuery;
+	scrollUp():JQuery;
+	scrollToTop():JQuery;
+	scrollToBottom():JQuery;
+	scrollRight():number;
+	scrollRight(newValue:number):JQuery;
+	pageUp():JQuery;
+	pageDown():JQuery;
+	isOnDom():boolean;
+	isVisible():boolean;
+	isHidden():boolean;
+	isDisabled():boolean;
+	enable():JQuery;
+	disable():JQuery;
+	insertAt(index:number, element:any):JQuery;
+	removeAt(index:number):JQuery;
+	indexOf(child:any):any;
+	containsElement(element:any):boolean;
+	preempt(eventName:any, handler:Function):any;
+	handlers(eventName:any):any;
+	hasParent():boolean;
+	hasFocus():boolean;
+	flashError():number;
+	trueHeight():any;
+	trueWidth():any;
+	document(eventName:any, docString:string):any;
+	events():any;
+	command(eventName:any, handler:any):any;
+	command(eventName:any, selector:any, handler:any):any;
+	command(eventName:any, selector:any, options:any, handler:any):any;
+	iconSize(size:number):void;
+	intValue():number;
+}
+
+declare class View /* implements JQuery */ {
+
+	static builderStack:Builder[];
+
+	static subview(name:any, view:any):void;
+
+	static text(str:string):void;
+
+	static tag(tagName:any, ...args:any[]):void;
+
+	static raw(str:string):void;
+
+	static pushBuilder():void;
+
+	static popBuilder():Builder;
+
+	static buildHtml(fn:()=>void):string[];
+
+	static render(fn:()=>void):JQuery;
+
+	// please override this method!
+	static content(...args:any[]):void;
+
+	// tag start
+	static a(...args:any[]):void;
+
+	static abbr(...args:any[]):void;
+
+	static address(...args:any[]):void;
+
+	static article(...args:any[]):void;
+
+	static aside(...args:any[]):void;
+
+	static audio(...args:any[]):void;
+
+	static b(...args:any[]):void;
+
+	static bdi(...args:any[]):void;
+
+	static bdo(...args:any[]):void;
+
+	static blockquote(...args:any[]):void;
+
+	static body(...args:any[]):void;
+
+	static button(...args:any[]):void;
+
+	static canvas(...args:any[]):void;
+
+	static caption(...args:any[]):void;
+
+	static cite(...args:any[]):void;
+
+	static code(...args:any[]):void;
+
+	static colgroup(...args:any[]):void;
+
+	static datalist(...args:any[]):void;
+
+	static dd(...args:any[]):void;
+
+	static del(...args:any[]):void;
+
+	static details(...args:any[]):void;
+
+	static dfn(...args:any[]):void;
+
+	static div(...args:any[]):void;
+
+	static dl(...args:any[]):void;
+
+	static dt(...args:any[]):void;
+
+	static em(...args:any[]):void;
+
+	static fieldset(...args:any[]):void;
+
+	static figcaption(...args:any[]):void;
+
+	static figure(...args:any[]):void;
+
+	static footer(...args:any[]):void;
+
+	static form(...args:any[]):void;
+
+	static h1(...args:any[]):void;
+
+	static h2(...args:any[]):void;
+
+	static h3(...args:any[]):void;
+
+	static h4(...args:any[]):void;
+
+	static h5(...args:any[]):void;
+
+	static h6(...args:any[]):void;
+
+	static head(...args:any[]):void;
+
+	static header(...args:any[]):void;
+
+	static hgroup(...args:any[]):void;
+
+	static html(...args:any[]):void;
+
+	static i(...args:any[]):void;
+
+	static iframe(...args:any[]):void;
+
+	static ins(...args:any[]):void;
+
+	static kbd(...args:any[]):void;
+
+	static label(...args:any[]):void;
+
+	static legend(...args:any[]):void;
+
+	static li(...args:any[]):void;
+
+	static map(...args:any[]):void;
+
+	static mark(...args:any[]):void;
+
+	static menu(...args:any[]):void;
+
+	static meter(...args:any[]):void;
+
+	static nav(...args:any[]):void;
+
+	static noscript(...args:any[]):void;
+
+	static object(...args:any[]):void;
+
+	static ol(...args:any[]):void;
+
+	static optgroup(...args:any[]):void;
+
+	static option(...args:any[]):void;
+
+	static output(...args:any[]):void;
+
+	static p(...args:any[]):void;
+
+	static pre(...args:any[]):void;
+
+	static progress(...args:any[]):void;
+
+	static q(...args:any[]):void;
+
+	static rp(...args:any[]):void;
+
+	static rt(...args:any[]):void;
+
+	static ruby(...args:any[]):void;
+
+	static s(...args:any[]):void;
+
+	static samp(...args:any[]):void;
+
+	static script(...args:any[]):void;
+
+	static section(...args:any[]):void;
+
+	static select(...args:any[]):void;
+
+	static small(...args:any[]):void;
+
+	static span(...args:any[]):void;
+
+	static strong(...args:any[]):void;
+
+	static style(...args:any[]):void;
+
+	static sub(...args:any[]):void;
+
+	static summary(...args:any[]):void;
+
+	static sup(...args:any[]):void;
+
+	static table(...args:any[]):void;
+
+	static tbody(...args:any[]):void;
+
+	static td(...args:any[]):void;
+
+	static textarea(...args:any[]):void;
+
+	static tfoot(...args:any[]):void;
+
+	static th(...args:any[]):void;
+
+	static thead(...args:any[]):void;
+
+	static time(...args:any[]):void;
+
+	static title(...args:any[]):void;
+
+	static tr(...args:any[]):void;
+
+	static u(...args:any[]):void;
+
+	static ul(...args:any[]):void;
+
+	static video(...args:any[]):void;
+
+	static area(...args:any[]):void;
+
+	static base(...args:any[]):void;
+
+	static br(...args:any[]):void;
+
+	static col(...args:any[]):void;
+
+	static command(...args:any[]):void;
+
+	static embed(...args:any[]):void;
+
+	static hr(...args:any[]):void;
+
+	static img(...args:any[]):void;
+
+	static input(...args:any[]):void;
+
+	static keygen(...args:any[]):void;
+
+	static link(...args:any[]):void;
+
+	static meta(...args:any[]):void;
+
+	static param(...args:any[]):void;
+
+	static source(...args:any[]):void;
+
+	static track(...args:any[]):void;
+
+	static wbrk(...args:any[]):void;
+
+	// tag end
+
+	initialize(view:View, args:any):void;
+
+	constructor(...args:any[]);
+
+	buildHtml(params:any):any;
+
+	wireOutlets(view:View):void;
+
+	bindEventHandlers(view:View):void;
+
+	pushStack(elems:any):any;
+
+	end():any;
+
+	command(commandName:any, selector:any, options:any, handler:any):any;
+
+	preempt(eventName:any, handler:any):any;
+}
+
+declare class Builder {
+	document:any[];
+	postProcessingSteps:any[];
+
+	buildHtml():any[];
+
+	tag(name:string, ...args:any[]):void;
+
+	openTag(name:string, attributes:any):void;
+
+	closeTag(name:string):void;
+
+	text(str:string):void;
+
+	raw(str:string):void;
+
+	subview(outletName:any, subview:View):void;
+
+	extractOptions(args:any):any;
+}
+
+declare module "space-pen" {
+
+	// copy & paste start
+	class View /* implements JQueryStatic */ {
+
+		static builderStack:Builder[];
+
+		static subview(name:any, view:any):void;
+
+		static text(str:string):void;
+
+		static tag(tagName:any, ...args:any[]):void;
+
+		static raw(str:string):void;
+
+		static pushBuilder():void;
+
+		static popBuilder():Builder;
+
+		static buildHtml(fn:()=>void):string[];
+
+		static render(fn:()=>void):JQuery;
+
+		// please override this method!
+		static content(...args:any[]):void;
+
+		// tag start
+		static a(...args:any[]):any;
+
+		static abbr(...args:any[]):any;
+
+		static address(...args:any[]):any;
+
+		static article(...args:any[]):any;
+
+		static aside(...args:any[]):any;
+
+		static audio(...args:any[]):any;
+
+		static b(...args:any[]):any;
+
+		static bdi(...args:any[]):any;
+
+		static bdo(...args:any[]):any;
+
+		static blockquote(...args:any[]):any;
+
+		static body(...args:any[]):any;
+
+		static button(...args:any[]):any;
+
+		static canvas(...args:any[]):any;
+
+		static caption(...args:any[]):any;
+
+		static cite(...args:any[]):any;
+
+		static code(...args:any[]):any;
+
+		static colgroup(...args:any[]):any;
+
+		static datalist(...args:any[]):any;
+
+		static dd(...args:any[]):any;
+
+		static del(...args:any[]):any;
+
+		static details(...args:any[]):any;
+
+		static dfn(...args:any[]):any;
+
+		static div(...args:any[]):any;
+
+		static dl(...args:any[]):any;
+
+		static dt(...args:any[]):any;
+
+		static em(...args:any[]):any;
+
+		static fieldset(...args:any[]):any;
+
+		static figcaption(...args:any[]):any;
+
+		static figure(...args:any[]):any;
+
+		static footer(...args:any[]):any;
+
+		static form(...args:any[]):any;
+
+		static h1(...args:any[]):any;
+
+		static h2(...args:any[]):any;
+
+		static h3(...args:any[]):any;
+
+		static h4(...args:any[]):any;
+
+		static h5(...args:any[]):any;
+
+		static h6(...args:any[]):any;
+
+		static head(...args:any[]):any;
+
+		static header(...args:any[]):any;
+
+		static hgroup(...args:any[]):any;
+
+		static html(...args:any[]):any;
+
+		static i(...args:any[]):any;
+
+		static iframe(...args:any[]):any;
+
+		static ins(...args:any[]):any;
+
+		static kbd(...args:any[]):any;
+
+		static label(...args:any[]):any;
+
+		static legend(...args:any[]):any;
+
+		static li(...args:any[]):any;
+
+		static map(...args:any[]):any;
+
+		static mark(...args:any[]):any;
+
+		static menu(...args:any[]):any;
+
+		static meter(...args:any[]):any;
+
+		static nav(...args:any[]):any;
+
+		static noscript(...args:any[]):any;
+
+		static object(...args:any[]):any;
+
+		static ol(...args:any[]):any;
+
+		static optgroup(...args:any[]):any;
+
+		static option(...args:any[]):any;
+
+		static output(...args:any[]):any;
+
+		static p(...args:any[]):any;
+
+		static pre(...args:any[]):any;
+
+		static progress(...args:any[]):any;
+
+		static q(...args:any[]):any;
+
+		static rp(...args:any[]):any;
+
+		static rt(...args:any[]):any;
+
+		static ruby(...args:any[]):any;
+
+		static s(...args:any[]):any;
+
+		static samp(...args:any[]):any;
+
+		static script(...args:any[]):any;
+
+		static section(...args:any[]):any;
+
+		static select(...args:any[]):any;
+
+		static small(...args:any[]):any;
+
+		static span(...args:any[]):any;
+
+		static strong(...args:any[]):any;
+
+		static style(...args:any[]):any;
+
+		static sub(...args:any[]):any;
+
+		static summary(...args:any[]):any;
+
+		static sup(...args:any[]):any;
+
+		static table(...args:any[]):any;
+
+		static tbody(...args:any[]):any;
+
+		static td(...args:any[]):any;
+
+		static textarea(...args:any[]):any;
+
+		static tfoot(...args:any[]):any;
+
+		static th(...args:any[]):any;
+
+		static thead(...args:any[]):any;
+
+		static time(...args:any[]):any;
+
+		static title(...args:any[]):any;
+
+		static tr(...args:any[]):any;
+
+		static u(...args:any[]):any;
+
+		static ul(...args:any[]):any;
+
+		static video(...args:any[]):any;
+
+		static area(...args:any[]):any;
+
+		static base(...args:any[]):any;
+
+		static br(...args:any[]):any;
+
+		static col(...args:any[]):any;
+
+		static command(...args:any[]):any;
+
+		static embed(...args:any[]):any;
+
+		static hr(...args:any[]):any;
+
+		static img(...args:any[]):any;
+
+		static input(...args:any[]):any;
+
+		static keygen(...args:any[]):any;
+
+		static link(...args:any[]):any;
+
+		static meta(...args:any[]):any;
+
+		static param(...args:any[]):any;
+
+		static source(...args:any[]):any;
+
+		static track(...args:any[]):any;
+
+		static wbrk(...args:any[]):any;
+
+		// tag end
+
+		initialize(view:View, args:any):void;
+
+		constructor(...args:any[]);
+
+		buildHtml(params:any):any;
+
+		wireOutlets(view:View):void;
+
+		bindEventHandlers(view:View):void;
+
+		pushStack(elems:any):any;
+
+		end():any;
+
+		command(eventName:string, handler:any):any;
+
+		command(eventName:string, selector:any, handler:any):any;
+
+		command(eventName:string, selector:any, options:any, handler:any):any;
+
+		preempt(eventName:any, handler:any):any;
+	}
+
+	class Builder {
+		document:any[];
+		postProcessingSteps:any[];
+
+		buildHtml():any[];
+
+		tag(name:string, ...args:any[]):void;
+
+		openTag(name:string, attributes:any):void;
+
+		closeTag(name:string):void;
+
+		text(str:string):void;
+
+		raw(str:string):void;
+
+		subview(outletName:any, subview:View):void;
+
+		extractOptions(args:any):any;
+	}
+	// copy & paste end
+
+
+	var jQuery:JQueryStatic;
+	var $:JQueryStatic;
+	var $$:(fn:Function)=>JQuery; // same type as View.render's return type.
+	var $$$:(fn:Function)=>any; // same type as View.buildHtml's return type's [0].
+}
diff --git a/space-pen/space-pen-tests.ts b/space-pen/space-pen-tests.ts
index 05c2eea03b..4beebddae1 100644
--- a/space-pen/space-pen-tests.ts
+++ b/space-pen/space-pen-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./space-pen.d.ts" />
+
 
 import SpacePen = require("space-pen");
 import View = SpacePen.View;
diff --git a/space-pen/space-pen.d.ts b/space-pen/space-pen.d.ts
deleted file mode 100644
index eb48db3ef5..0000000000
--- a/space-pen/space-pen.d.ts
+++ /dev/null
@@ -1,625 +0,0 @@
-// Type definitions for SpacePen
-// Project: https://github.com/atom/space-pen
-// Definitions by: vvakame <https://github.com/vvakame>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-// http://atom.github.io/space-pen/
-
-interface JQuery {
-	view():any;
-	views():any[];
-}
-
-interface JQuery {
-	scrollBottom():number;
-	scrollBottom(newValue:number):JQuery;
-	scrollDown():JQuery;
-	scrollUp():JQuery;
-	scrollToTop():JQuery;
-	scrollToBottom():JQuery;
-	scrollRight():number;
-	scrollRight(newValue:number):JQuery;
-	pageUp():JQuery;
-	pageDown():JQuery;
-	isOnDom():boolean;
-	isVisible():boolean;
-	isHidden():boolean;
-	isDisabled():boolean;
-	enable():JQuery;
-	disable():JQuery;
-	insertAt(index:number, element:any):JQuery;
-	removeAt(index:number):JQuery;
-	indexOf(child:any):any;
-	containsElement(element:any):boolean;
-	preempt(eventName:any, handler:Function):any;
-	handlers(eventName:any):any;
-	hasParent():boolean;
-	hasFocus():boolean;
-	flashError():number;
-	trueHeight():any;
-	trueWidth():any;
-	document(eventName:any, docString:string):any;
-	events():any;
-	command(eventName:any, handler:any):any;
-	command(eventName:any, selector:any, handler:any):any;
-	command(eventName:any, selector:any, options:any, handler:any):any;
-	iconSize(size:number):void;
-	intValue():number;
-}
-
-declare class View /* implements JQuery */ {
-
-	static builderStack:Builder[];
-
-	static subview(name:any, view:any):void;
-
-	static text(str:string):void;
-
-	static tag(tagName:any, ...args:any[]):void;
-
-	static raw(str:string):void;
-
-	static pushBuilder():void;
-
-	static popBuilder():Builder;
-
-	static buildHtml(fn:()=>void):string[];
-
-	static render(fn:()=>void):JQuery;
-
-	// please override this method!
-	static content(...args:any[]):void;
-
-	// tag start
-	static a(...args:any[]):void;
-
-	static abbr(...args:any[]):void;
-
-	static address(...args:any[]):void;
-
-	static article(...args:any[]):void;
-
-	static aside(...args:any[]):void;
-
-	static audio(...args:any[]):void;
-
-	static b(...args:any[]):void;
-
-	static bdi(...args:any[]):void;
-
-	static bdo(...args:any[]):void;
-
-	static blockquote(...args:any[]):void;
-
-	static body(...args:any[]):void;
-
-	static button(...args:any[]):void;
-
-	static canvas(...args:any[]):void;
-
-	static caption(...args:any[]):void;
-
-	static cite(...args:any[]):void;
-
-	static code(...args:any[]):void;
-
-	static colgroup(...args:any[]):void;
-
-	static datalist(...args:any[]):void;
-
-	static dd(...args:any[]):void;
-
-	static del(...args:any[]):void;
-
-	static details(...args:any[]):void;
-
-	static dfn(...args:any[]):void;
-
-	static div(...args:any[]):void;
-
-	static dl(...args:any[]):void;
-
-	static dt(...args:any[]):void;
-
-	static em(...args:any[]):void;
-
-	static fieldset(...args:any[]):void;
-
-	static figcaption(...args:any[]):void;
-
-	static figure(...args:any[]):void;
-
-	static footer(...args:any[]):void;
-
-	static form(...args:any[]):void;
-
-	static h1(...args:any[]):void;
-
-	static h2(...args:any[]):void;
-
-	static h3(...args:any[]):void;
-
-	static h4(...args:any[]):void;
-
-	static h5(...args:any[]):void;
-
-	static h6(...args:any[]):void;
-
-	static head(...args:any[]):void;
-
-	static header(...args:any[]):void;
-
-	static hgroup(...args:any[]):void;
-
-	static html(...args:any[]):void;
-
-	static i(...args:any[]):void;
-
-	static iframe(...args:any[]):void;
-
-	static ins(...args:any[]):void;
-
-	static kbd(...args:any[]):void;
-
-	static label(...args:any[]):void;
-
-	static legend(...args:any[]):void;
-
-	static li(...args:any[]):void;
-
-	static map(...args:any[]):void;
-
-	static mark(...args:any[]):void;
-
-	static menu(...args:any[]):void;
-
-	static meter(...args:any[]):void;
-
-	static nav(...args:any[]):void;
-
-	static noscript(...args:any[]):void;
-
-	static object(...args:any[]):void;
-
-	static ol(...args:any[]):void;
-
-	static optgroup(...args:any[]):void;
-
-	static option(...args:any[]):void;
-
-	static output(...args:any[]):void;
-
-	static p(...args:any[]):void;
-
-	static pre(...args:any[]):void;
-
-	static progress(...args:any[]):void;
-
-	static q(...args:any[]):void;
-
-	static rp(...args:any[]):void;
-
-	static rt(...args:any[]):void;
-
-	static ruby(...args:any[]):void;
-
-	static s(...args:any[]):void;
-
-	static samp(...args:any[]):void;
-
-	static script(...args:any[]):void;
-
-	static section(...args:any[]):void;
-
-	static select(...args:any[]):void;
-
-	static small(...args:any[]):void;
-
-	static span(...args:any[]):void;
-
-	static strong(...args:any[]):void;
-
-	static style(...args:any[]):void;
-
-	static sub(...args:any[]):void;
-
-	static summary(...args:any[]):void;
-
-	static sup(...args:any[]):void;
-
-	static table(...args:any[]):void;
-
-	static tbody(...args:any[]):void;
-
-	static td(...args:any[]):void;
-
-	static textarea(...args:any[]):void;
-
-	static tfoot(...args:any[]):void;
-
-	static th(...args:any[]):void;
-
-	static thead(...args:any[]):void;
-
-	static time(...args:any[]):void;
-
-	static title(...args:any[]):void;
-
-	static tr(...args:any[]):void;
-
-	static u(...args:any[]):void;
-
-	static ul(...args:any[]):void;
-
-	static video(...args:any[]):void;
-
-	static area(...args:any[]):void;
-
-	static base(...args:any[]):void;
-
-	static br(...args:any[]):void;
-
-	static col(...args:any[]):void;
-
-	static command(...args:any[]):void;
-
-	static embed(...args:any[]):void;
-
-	static hr(...args:any[]):void;
-
-	static img(...args:any[]):void;
-
-	static input(...args:any[]):void;
-
-	static keygen(...args:any[]):void;
-
-	static link(...args:any[]):void;
-
-	static meta(...args:any[]):void;
-
-	static param(...args:any[]):void;
-
-	static source(...args:any[]):void;
-
-	static track(...args:any[]):void;
-
-	static wbrk(...args:any[]):void;
-
-	// tag end
-
-	initialize(view:View, args:any):void;
-
-	constructor(...args:any[]);
-
-	buildHtml(params:any):any;
-
-	wireOutlets(view:View):void;
-
-	bindEventHandlers(view:View):void;
-
-	pushStack(elems:any):any;
-
-	end():any;
-
-	command(commandName:any, selector:any, options:any, handler:any):any;
-
-	preempt(eventName:any, handler:any):any;
-}
-
-declare class Builder {
-	document:any[];
-	postProcessingSteps:any[];
-
-	buildHtml():any[];
-
-	tag(name:string, ...args:any[]):void;
-
-	openTag(name:string, attributes:any):void;
-
-	closeTag(name:string):void;
-
-	text(str:string):void;
-
-	raw(str:string):void;
-
-	subview(outletName:any, subview:View):void;
-
-	extractOptions(args:any):any;
-}
-
-declare module "space-pen" {
-
-	// copy & paste start
-	class View /* implements JQueryStatic */ {
-
-		static builderStack:Builder[];
-
-		static subview(name:any, view:any):void;
-
-		static text(str:string):void;
-
-		static tag(tagName:any, ...args:any[]):void;
-
-		static raw(str:string):void;
-
-		static pushBuilder():void;
-
-		static popBuilder():Builder;
-
-		static buildHtml(fn:()=>void):string[];
-
-		static render(fn:()=>void):JQuery;
-
-		// please override this method!
-		static content(...args:any[]):void;
-
-		// tag start
-		static a(...args:any[]):any;
-
-		static abbr(...args:any[]):any;
-
-		static address(...args:any[]):any;
-
-		static article(...args:any[]):any;
-
-		static aside(...args:any[]):any;
-
-		static audio(...args:any[]):any;
-
-		static b(...args:any[]):any;
-
-		static bdi(...args:any[]):any;
-
-		static bdo(...args:any[]):any;
-
-		static blockquote(...args:any[]):any;
-
-		static body(...args:any[]):any;
-
-		static button(...args:any[]):any;
-
-		static canvas(...args:any[]):any;
-
-		static caption(...args:any[]):any;
-
-		static cite(...args:any[]):any;
-
-		static code(...args:any[]):any;
-
-		static colgroup(...args:any[]):any;
-
-		static datalist(...args:any[]):any;
-
-		static dd(...args:any[]):any;
-
-		static del(...args:any[]):any;
-
-		static details(...args:any[]):any;
-
-		static dfn(...args:any[]):any;
-
-		static div(...args:any[]):any;
-
-		static dl(...args:any[]):any;
-
-		static dt(...args:any[]):any;
-
-		static em(...args:any[]):any;
-
-		static fieldset(...args:any[]):any;
-
-		static figcaption(...args:any[]):any;
-
-		static figure(...args:any[]):any;
-
-		static footer(...args:any[]):any;
-
-		static form(...args:any[]):any;
-
-		static h1(...args:any[]):any;
-
-		static h2(...args:any[]):any;
-
-		static h3(...args:any[]):any;
-
-		static h4(...args:any[]):any;
-
-		static h5(...args:any[]):any;
-
-		static h6(...args:any[]):any;
-
-		static head(...args:any[]):any;
-
-		static header(...args:any[]):any;
-
-		static hgroup(...args:any[]):any;
-
-		static html(...args:any[]):any;
-
-		static i(...args:any[]):any;
-
-		static iframe(...args:any[]):any;
-
-		static ins(...args:any[]):any;
-
-		static kbd(...args:any[]):any;
-
-		static label(...args:any[]):any;
-
-		static legend(...args:any[]):any;
-
-		static li(...args:any[]):any;
-
-		static map(...args:any[]):any;
-
-		static mark(...args:any[]):any;
-
-		static menu(...args:any[]):any;
-
-		static meter(...args:any[]):any;
-
-		static nav(...args:any[]):any;
-
-		static noscript(...args:any[]):any;
-
-		static object(...args:any[]):any;
-
-		static ol(...args:any[]):any;
-
-		static optgroup(...args:any[]):any;
-
-		static option(...args:any[]):any;
-
-		static output(...args:any[]):any;
-
-		static p(...args:any[]):any;
-
-		static pre(...args:any[]):any;
-
-		static progress(...args:any[]):any;
-
-		static q(...args:any[]):any;
-
-		static rp(...args:any[]):any;
-
-		static rt(...args:any[]):any;
-
-		static ruby(...args:any[]):any;
-
-		static s(...args:any[]):any;
-
-		static samp(...args:any[]):any;
-
-		static script(...args:any[]):any;
-
-		static section(...args:any[]):any;
-
-		static select(...args:any[]):any;
-
-		static small(...args:any[]):any;
-
-		static span(...args:any[]):any;
-
-		static strong(...args:any[]):any;
-
-		static style(...args:any[]):any;
-
-		static sub(...args:any[]):any;
-
-		static summary(...args:any[]):any;
-
-		static sup(...args:any[]):any;
-
-		static table(...args:any[]):any;
-
-		static tbody(...args:any[]):any;
-
-		static td(...args:any[]):any;
-
-		static textarea(...args:any[]):any;
-
-		static tfoot(...args:any[]):any;
-
-		static th(...args:any[]):any;
-
-		static thead(...args:any[]):any;
-
-		static time(...args:any[]):any;
-
-		static title(...args:any[]):any;
-
-		static tr(...args:any[]):any;
-
-		static u(...args:any[]):any;
-
-		static ul(...args:any[]):any;
-
-		static video(...args:any[]):any;
-
-		static area(...args:any[]):any;
-
-		static base(...args:any[]):any;
-
-		static br(...args:any[]):any;
-
-		static col(...args:any[]):any;
-
-		static command(...args:any[]):any;
-
-		static embed(...args:any[]):any;
-
-		static hr(...args:any[]):any;
-
-		static img(...args:any[]):any;
-
-		static input(...args:any[]):any;
-
-		static keygen(...args:any[]):any;
-
-		static link(...args:any[]):any;
-
-		static meta(...args:any[]):any;
-
-		static param(...args:any[]):any;
-
-		static source(...args:any[]):any;
-
-		static track(...args:any[]):any;
-
-		static wbrk(...args:any[]):any;
-
-		// tag end
-
-		initialize(view:View, args:any):void;
-
-		constructor(...args:any[]);
-
-		buildHtml(params:any):any;
-
-		wireOutlets(view:View):void;
-
-		bindEventHandlers(view:View):void;
-
-		pushStack(elems:any):any;
-
-		end():any;
-
-		command(eventName:string, handler:any):any;
-
-		command(eventName:string, selector:any, handler:any):any;
-
-		command(eventName:string, selector:any, options:any, handler:any):any;
-
-		preempt(eventName:any, handler:any):any;
-	}
-
-	class Builder {
-		document:any[];
-		postProcessingSteps:any[];
-
-		buildHtml():any[];
-
-		tag(name:string, ...args:any[]):void;
-
-		openTag(name:string, attributes:any):void;
-
-		closeTag(name:string):void;
-
-		text(str:string):void;
-
-		raw(str:string):void;
-
-		subview(outletName:any, subview:View):void;
-
-		extractOptions(args:any):any;
-	}
-	// copy & paste end
-
-
-	var jQuery:JQueryStatic;
-	var $:JQueryStatic;
-	var $$:(fn:Function)=>JQuery; // same type as View.render's return type.
-	var $$$:(fn:Function)=>any; // same type as View.buildHtml's return type's [0].
-}
diff --git a/space-pen/tsconfig.json b/space-pen/tsconfig.json
new file mode 100644
index 0000000000..fc2f69c301
--- /dev/null
+++ b/space-pen/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "space-pen-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/speakeasy/index.d.ts b/speakeasy/index.d.ts
new file mode 100644
index 0000000000..6c2245ad59
--- /dev/null
+++ b/speakeasy/index.d.ts
@@ -0,0 +1,50 @@
+// Type definitions for speakeasy v1.0.4
+// Project: https://github.com/markbao/speakeasy
+// Definitions by: Lucas Woo <https://github.com/legendecas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+interface IKey {
+    ascii: string;
+    base32: string;
+    hex: string;
+    qr_code_ascii: string;
+    qr_code_hex: string;
+    qr_code_base32: string;
+    google_auth_qr: string;
+}
+
+interface GenerateOptions {
+    length?: number;
+    symbols?: boolean;
+    qr_codes?: boolean;
+    google_auth_qr?: boolean;
+    name?: string;
+}
+
+interface TotpOptions {
+    key: string;
+    step?: number;
+    time?: number;
+    initial_time?: number;
+    length?: number;
+    encoding?: string;
+}
+
+interface HotpOptions {
+    key: string;
+    counter: number;
+    length?: number;
+    encoding?: string;
+}
+
+export declare function generate_key(options: GenerateOptions): IKey;
+
+export declare function hotp(options: HotpOptions): string;
+
+export declare function counter(options: HotpOptions): string;
+
+export declare function totp(options: TotpOptions): string;
+
+export declare function time(options: TotpOptions): string;
diff --git a/speakeasy/speakeasy-tests.ts b/speakeasy/speakeasy-tests.ts
index ae483bb8ee..3c8da97140 100644
--- a/speakeasy/speakeasy-tests.ts
+++ b/speakeasy/speakeasy-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="speakeasy.d.ts"/>
-
 import speakeasy = require('speakeasy');
 
 speakeasy.generate_key({length: 20, google_auth_qr: true});
diff --git a/speakeasy/speakeasy.d.ts b/speakeasy/speakeasy.d.ts
deleted file mode 100644
index 4017c4f7eb..0000000000
--- a/speakeasy/speakeasy.d.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-// Type definitions for speakeasy v1.0.4
-// Project: https://github.com/markbao/speakeasy
-// Definitions by: Lucas Woo <https://github.com/legendecas>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "speakeasy" {
-
-    interface IKey {
-        ascii: string;
-        base32: string;
-        hex: string;
-        qr_code_ascii: string;
-        qr_code_hex: string;
-        qr_code_base32: string;
-        google_auth_qr: string;
-    }
-
-    interface GenerateOptions {
-        length?: number;
-        symbols?: boolean;
-        qr_codes?: boolean;
-        google_auth_qr?: boolean;
-        name?: string;
-    }
-
-    interface TotpOptions {
-        key: string;
-        step?: number;
-        time?: number;
-        initial_time?: number;
-        length?: number;
-        encoding?: string;
-    }
-
-    interface HotpOptions {
-        key: string;
-        counter: number;
-        length?: number;
-        encoding?: string;
-    }
-
-    export function generate_key(options: GenerateOptions): IKey;
-
-    export function hotp(options: HotpOptions): string;
-
-    export function counter(options: HotpOptions): string;
-
-    export function totp(options: TotpOptions): string;
-
-    export function time(options: TotpOptions): string;
-}
diff --git a/speakeasy/tsconfig.json b/speakeasy/tsconfig.json
new file mode 100644
index 0000000000..1af03d8dfd
--- /dev/null
+++ b/speakeasy/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "speakeasy-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/spectrum/index.d.ts b/spectrum/index.d.ts
new file mode 100644
index 0000000000..1145d4d108
--- /dev/null
+++ b/spectrum/index.d.ts
@@ -0,0 +1,292 @@
+// Type definitions for spectrum 1.5.1
+// Project: https://github.com/bgrins/spectrum/
+// Definitions by: Mordechai Zuber <https://github.com/M-Zuber>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+/// <reference types="tinycolor"/>
+
+interface JQuery {
+
+    /**
+     * Shows the colorpicker.
+     */
+    spectrum(methodName: "show"): JQuery;
+
+    /**
+     * Hides the colorpicker.
+     */
+    spectrum(methodName: "hide"): JQuery;
+
+    /**
+    * Toggles the colorpicker.
+    *
+    * Warning: If you are calling toggle from a click handler,
+    *   make sure you return false to prevent the colorpicker from immediately hiding after it is toggled.
+    */
+    spectrum(methodName: "toggle"): JQuery;
+
+    /**
+     * Gets the current value from the colorpicker.
+     */
+    spectrum(methodName: "get"): tinycolorInstance;
+
+    /**
+     * Sets the colorpickers value to update the original input.
+     * Note: this will not fire the `change` event, to prevent infinite loops
+     *  from calling `set` from within `change`.
+     *
+     * @param colorString- the new color for the colorpicker.
+     */
+    spectrum(methodName: "set", colorString?: string): JQuery;
+
+    /**
+     * Retrieves the container element of the colorpicker,
+     * in case you want to manaully position it or do other things.
+     */
+    spectrum(methodName: "container"): JQuery;
+
+    /**
+     * Resets the positioning of the container element.
+     * This could be used if the colorpicker was hidden when initialized,
+     * or if the colorpicker is inside of a moving area.
+     */
+    spectrum(methodName: "reflow"): JQuery;
+
+    /**
+     * Removes the colorpicker functionality and restores the element to its original state.
+     */
+    spectrum(methodName: "destroy"): JQuery;
+
+    /**
+     * Allows selection of the colorpicker component. if it is already enabled, this method does nothing.
+     * Additionally, this will cause the original (now hidden) input to be set as disabled.
+     */
+    spectrum(methodName: "enable"): JQuery;
+
+    /**
+     * Disables selection of the colorpicker component. adds the sp-disabled class onto the replacer element.
+     * If it is already disabled, this method does nothing.
+     * Additionally, this will remove the disabled property on the original (now hidden).
+     */
+    spectrum(methodName: "disable"): JQuery;
+
+    /**
+     * Retrieves the current value for the option name.
+     *
+     * @param optionName- the option to retrieve the value for.
+     */
+    spectrum(methodName: "option", optionName?: string): JQuery;
+
+    /**
+     * Sets the value of the option name with the value passed in.
+     *
+     * @param optionName- the option to set.
+     * @param newOptionvalue- the new value for the option.
+     */
+    spectrum(methodName: "option", optionName?: string, newOptionValue?: any): JQuery;
+
+    /**
+     * Calls the method.
+     */
+    spectrum(methodName: string): any; // in most cases this is JQuery except for the get method which returns a tinycolorInstance
+
+    /**
+     * Initializes the input element that it is called on
+     * as a spectrum colorpicker instance.
+     */
+    spectrum(options?: Spectrum.Options): JQuery;
+
+    /**
+     * Called at the beginning of a drag event on either hue slider, alpha slider, or main color picker areas.
+     */
+    on(events: "dragstart.spectrum", handler: (eventObject: JQueryEventObject, color: tinycolorInstance) => any): JQuery;
+
+    /**
+     * Called at the end of a drag event on either hue slider, alpha slider, or main color picker areas.
+     */
+    on(events: "dragstop.spectrum", handler: (eventObject: JQueryEventObject, color: tinycolorInstance) => any): JQuery;
+}
+
+declare namespace Spectrum {
+
+    interface Options {
+
+        /**
+         * The initial color can be set with the color option.
+         * if you don't pass in a color, Spectrum will use the value attribute on the input.
+         * The input is a string that is parsed using https://github.com/bgrins/TinyColor
+         */
+        color?: string;
+
+        /**
+         * The colorpicker will always show up at full size, and be positioned as an inline-block element.
+         */
+        flat?: boolean;
+
+        /**
+         * Adds an input to allow for free form typing.
+         */
+        showInput?: boolean;
+
+        /**
+         * Shows the color that was initially set when opening.
+         * This provides an easy way to click back to what was set when opened.
+         */
+        showInitial?: boolean;
+
+        /**
+         * Allows the colorpicker to have no color as a value.
+         * Will display a button to set selection to 'no color'.
+         */
+        allowEmpty?: boolean;
+
+        /**
+         * Allows alpha transparency selection
+         */
+        showAlpha?: boolean;
+
+        /**
+         * Automatically disables the colorpicker.
+         * Additionally, if the input that you initialize spectrum on is disabled, this will be the default value.
+         * Note: you cannot enable spectrum if the input is disabled
+         */
+        disabled?: boolean;
+
+        /**
+         * Sets a palette below the colorpicker to make it convenient for users to choose from
+         *  frequently or recently used colors.
+         * Default value:  [["#ffffff", "#000000", "#ff0000", "#ff8000", "#ffff00", "#008000", "#0000ff", "#4b0082", "#9400d3"]]
+         */
+        palette?: string[][];
+
+        /**
+         * When the colorpicker is closed, the current color will be added to the palette if it isn't there already.
+         */
+        showPalette?: boolean;
+
+        /**
+         * Shows only the colors specified in the palette
+         */
+        showPaletteOnly?: boolean;
+
+        /**
+         * Shows a button to toggle the colorpicker next to the palette.
+         * This way, the user can choose from a limited number of colors in the palette,
+         * but still be able to pick a color that's not in the palette.
+         */
+        togglePaletteOnly?: boolean;
+
+        /**
+         * Changes the text on the open-toggle colorpicker button.
+         */
+        togglePaletteMoreText?: string;
+
+        /**
+         * Changes the text on the close-toggle colorpicker button.
+         */
+        togglePaletteLessText?: string;
+
+        /**
+         * Automatically hides the colorpicker after a palette color is selected.
+         */
+        hideAfterPaletteSelect?: boolean;
+
+        /**
+         * Keeps track of what has been selected by the user.
+         */
+        showSelectionPalette?: boolean;
+
+        /**
+         * The users selection will be saved in the browser's localStorage object.
+         * Any Spectrum with the same string will share the selection.
+         */
+        localStorageKey?: string;
+
+        /**
+         * When clicking outside of the colorpicker,
+         *  force it to fire a change event rather than having it revert the change.
+         */
+        clickoutFiresChange?: boolean;
+
+        /**
+         * Sets the text on the cancel button.
+         */
+        cancelText?: string;
+
+        /**
+         * Sets the text on the choose button.
+         */
+        chooseText?: string;
+
+        /**
+         * Adds an additional class name to the just the container element.
+         */
+        containerClassName?: string;
+
+        /**
+         * Adds an additional class name to just the replacer element.
+         */
+        replacerClassName?: string;
+
+        /**
+         * Sets the format that is displayed in the text box.
+         * This will also change the format that is displayed in the titles from the palette swatches.
+         * Possible values: "hex", "hex3", "hsl", "rgb", "name"
+         */
+        preferredFormat?: string;
+
+        /**
+         * Toggles the choose/cancel buttons.
+         * If there are no buttons, the behavior will be to fire the `change` event (and update the original input) when the picker is closed.
+         */
+        showButtons?: boolean;
+
+        /**
+         * Sets which element the colorpicker container is appended to (default is "body").
+         * This can be any valid object taken into the jQuery appendTo function.
+         * Changing this can help resolve issues with opening the colorpicker in a modal dialog
+         * or fixed position container, for instance.
+         */
+        appendTo?: any //same as JQuery appendTo : JQuery| any[] | Element| string
+
+        /**
+         * Sets the max size for the palette.
+         */
+        maxSelectionSize?: number;
+
+        /**
+         */
+        selectionPalette?: string[];
+
+        /**
+         * Called as the original input changes. Only happens when the input is closed or the 'Choose' button is clicked.
+         */
+        change?: (color: tinycolorInstance) => void;
+
+        /**
+         * Called as the user moves around within the colorpicker.
+         */
+        move?: (color: tinycolorInstance) => void;
+
+        /**
+         * Called after the colorpicker is opened. This is ignored on a flat colorpicker.
+         * Note, when any colorpicker on the page is shown it will hide any that are already open.
+         */
+        show?: (color: tinycolorInstance) => void;
+
+        /**
+         * Called after the colorpicker is hidden.
+         * This happens when clicking outside of the picker while it is open.
+         * Note, when any colorpicker on the page is shown it will hide any that are already open.
+         * This event is ignored on a flat colorpicker.
+         */
+        hide?: (color: tinycolorInstance) => void;
+
+        /**
+         * You can prevent the colorpicker from showing up if you return false in the beforeShow event.
+         * This event is ignored on a flat colorpicker.
+         */
+        beforeShow?: (color: tinycolorInstance) => void;
+    }
+}
diff --git a/spectrum/spectrum-tests.ts b/spectrum/spectrum-tests.ts
index f469f8a163..e9bf388bbe 100644
--- a/spectrum/spectrum-tests.ts
+++ b/spectrum/spectrum-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="spectrum.d.ts" />
+/// <reference types="jquery" />
+
 
 $("#picker").spectrum();
 
diff --git a/spectrum/spectrum.d.ts b/spectrum/spectrum.d.ts
deleted file mode 100644
index 5193d2f903..0000000000
--- a/spectrum/spectrum.d.ts
+++ /dev/null
@@ -1,292 +0,0 @@
-// Type definitions for spectrum 1.5.1
-// Project: https://github.com/bgrins/spectrum/
-// Definitions by: Mordechai Zuber <https://github.com/M-Zuber>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="../tinycolor/tinycolor.d.ts"/>
-
-interface JQuery {
-
-    /**
-     * Shows the colorpicker.
-     */
-    spectrum(methodName: "show"): JQuery;
-
-    /**
-     * Hides the colorpicker.
-     */
-    spectrum(methodName: "hide"): JQuery;
-
-    /**
-    * Toggles the colorpicker.
-    *
-    * Warning: If you are calling toggle from a click handler,
-    *   make sure you return false to prevent the colorpicker from immediately hiding after it is toggled.
-    */
-    spectrum(methodName: "toggle"): JQuery;
-
-    /**
-     * Gets the current value from the colorpicker.
-     */
-    spectrum(methodName: "get"): tinycolorInstance;
-
-    /**
-     * Sets the colorpickers value to update the original input.
-     * Note: this will not fire the `change` event, to prevent infinite loops
-     *  from calling `set` from within `change`.
-     *
-     * @param colorString- the new color for the colorpicker.
-     */
-    spectrum(methodName: "set", colorString?: string): JQuery;
-
-    /**
-     * Retrieves the container element of the colorpicker,
-     * in case you want to manaully position it or do other things.
-     */
-    spectrum(methodName: "container"): JQuery;
-
-    /**
-     * Resets the positioning of the container element.
-     * This could be used if the colorpicker was hidden when initialized,
-     * or if the colorpicker is inside of a moving area.
-     */
-    spectrum(methodName: "reflow"): JQuery;
-
-    /**
-     * Removes the colorpicker functionality and restores the element to its original state.
-     */
-    spectrum(methodName: "destroy"): JQuery;
-
-    /**
-     * Allows selection of the colorpicker component. if it is already enabled, this method does nothing.
-     * Additionally, this will cause the original (now hidden) input to be set as disabled.
-     */
-    spectrum(methodName: "enable"): JQuery;
-
-    /**
-     * Disables selection of the colorpicker component. adds the sp-disabled class onto the replacer element.
-     * If it is already disabled, this method does nothing.
-     * Additionally, this will remove the disabled property on the original (now hidden).
-     */
-    spectrum(methodName: "disable"): JQuery;
-
-    /**
-     * Retrieves the current value for the option name.
-     *
-     * @param optionName- the option to retrieve the value for.
-     */
-    spectrum(methodName: "option", optionName?: string): JQuery;
-
-    /**
-     * Sets the value of the option name with the value passed in.
-     *
-     * @param optionName- the option to set.
-     * @param newOptionvalue- the new value for the option.
-     */
-    spectrum(methodName: "option", optionName?: string, newOptionValue?: any): JQuery;
-
-    /**
-     * Calls the method.
-     */
-    spectrum(methodName: string): any; // in most cases this is JQuery except for the get method which returns a tinycolorInstance
-
-    /**
-     * Initializes the input element that it is called on
-     * as a spectrum colorpicker instance.
-     */
-    spectrum(options?: Spectrum.Options): JQuery;
-
-    /**
-     * Called at the beginning of a drag event on either hue slider, alpha slider, or main color picker areas.
-     */
-    on(events: "dragstart.spectrum", handler: (eventObject: JQueryEventObject, color: tinycolorInstance) => any): JQuery;
-
-    /**
-     * Called at the end of a drag event on either hue slider, alpha slider, or main color picker areas.
-     */
-    on(events: "dragstop.spectrum", handler: (eventObject: JQueryEventObject, color: tinycolorInstance) => any): JQuery;
-}
-
-declare namespace Spectrum {
-
-    interface Options {
-
-        /**
-         * The initial color can be set with the color option.
-         * if you don't pass in a color, Spectrum will use the value attribute on the input.
-         * The input is a string that is parsed using https://github.com/bgrins/TinyColor
-         */
-        color?: string;
-
-        /**
-         * The colorpicker will always show up at full size, and be positioned as an inline-block element.
-         */
-        flat?: boolean;
-
-        /**
-         * Adds an input to allow for free form typing.
-         */
-        showInput?: boolean;
-
-        /**
-         * Shows the color that was initially set when opening.
-         * This provides an easy way to click back to what was set when opened.
-         */
-        showInitial?: boolean;
-
-        /**
-         * Allows the colorpicker to have no color as a value.
-         * Will display a button to set selection to 'no color'.
-         */
-        allowEmpty?: boolean;
-
-        /**
-         * Allows alpha transparency selection
-         */
-        showAlpha?: boolean;
-
-        /**
-         * Automatically disables the colorpicker.
-         * Additionally, if the input that you initialize spectrum on is disabled, this will be the default value.
-         * Note: you cannot enable spectrum if the input is disabled
-         */
-        disabled?: boolean;
-
-        /**
-         * Sets a palette below the colorpicker to make it convenient for users to choose from
-         *  frequently or recently used colors.
-         * Default value:  [["#ffffff", "#000000", "#ff0000", "#ff8000", "#ffff00", "#008000", "#0000ff", "#4b0082", "#9400d3"]]
-         */
-        palette?: string[][];
-
-        /**
-         * When the colorpicker is closed, the current color will be added to the palette if it isn't there already.
-         */
-        showPalette?: boolean;
-
-        /**
-         * Shows only the colors specified in the palette
-         */
-        showPaletteOnly?: boolean;
-
-        /**
-         * Shows a button to toggle the colorpicker next to the palette.
-         * This way, the user can choose from a limited number of colors in the palette,
-         * but still be able to pick a color that's not in the palette.
-         */
-        togglePaletteOnly?: boolean;
-
-        /**
-         * Changes the text on the open-toggle colorpicker button.
-         */
-        togglePaletteMoreText?: string;
-
-        /**
-         * Changes the text on the close-toggle colorpicker button.
-         */
-        togglePaletteLessText?: string;
-
-        /**
-         * Automatically hides the colorpicker after a palette color is selected.
-         */
-        hideAfterPaletteSelect?: boolean;
-
-        /**
-         * Keeps track of what has been selected by the user.
-         */
-        showSelectionPalette?: boolean;
-
-        /**
-         * The users selection will be saved in the browser's localStorage object.
-         * Any Spectrum with the same string will share the selection.
-         */
-        localStorageKey?: string;
-
-        /**
-         * When clicking outside of the colorpicker,
-         *  force it to fire a change event rather than having it revert the change.
-         */
-        clickoutFiresChange?: boolean;
-
-        /**
-         * Sets the text on the cancel button.
-         */
-        cancelText?: string;
-
-        /**
-         * Sets the text on the choose button.
-         */
-        chooseText?: string;
-
-        /**
-         * Adds an additional class name to the just the container element.
-         */
-        containerClassName?: string;
-
-        /**
-         * Adds an additional class name to just the replacer element.
-         */
-        replacerClassName?: string;
-
-        /**
-         * Sets the format that is displayed in the text box.
-         * This will also change the format that is displayed in the titles from the palette swatches.
-         * Possible values: "hex", "hex3", "hsl", "rgb", "name"
-         */
-        preferredFormat?: string;
-
-        /**
-         * Toggles the choose/cancel buttons.
-         * If there are no buttons, the behavior will be to fire the `change` event (and update the original input) when the picker is closed.
-         */
-        showButtons?: boolean;
-
-        /**
-         * Sets which element the colorpicker container is appended to (default is "body").
-         * This can be any valid object taken into the jQuery appendTo function.
-         * Changing this can help resolve issues with opening the colorpicker in a modal dialog
-         * or fixed position container, for instance.
-         */
-        appendTo?: any //same as JQuery appendTo : JQuery| any[] | Element| string
-
-        /**
-         * Sets the max size for the palette.
-         */
-        maxSelectionSize?: number;
-
-        /**
-         */
-        selectionPalette?: string[];
-
-        /**
-         * Called as the original input changes. Only happens when the input is closed or the 'Choose' button is clicked.
-         */
-        change?: (color: tinycolorInstance) => void;
-
-        /**
-         * Called as the user moves around within the colorpicker.
-         */
-        move?: (color: tinycolorInstance) => void;
-
-        /**
-         * Called after the colorpicker is opened. This is ignored on a flat colorpicker.
-         * Note, when any colorpicker on the page is shown it will hide any that are already open.
-         */
-        show?: (color: tinycolorInstance) => void;
-
-        /**
-         * Called after the colorpicker is hidden.
-         * This happens when clicking outside of the picker while it is open.
-         * Note, when any colorpicker on the page is shown it will hide any that are already open.
-         * This event is ignored on a flat colorpicker.
-         */
-        hide?: (color: tinycolorInstance) => void;
-
-        /**
-         * You can prevent the colorpicker from showing up if you return false in the beforeShow event.
-         * This event is ignored on a flat colorpicker.
-         */
-        beforeShow?: (color: tinycolorInstance) => void;
-    }
-}
diff --git a/spectrum/tsconfig.json b/spectrum/tsconfig.json
new file mode 100644
index 0000000000..ae3299e265
--- /dev/null
+++ b/spectrum/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "spectrum-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/spin/spin.d.ts b/spin/index.d.ts
similarity index 100%
rename from spin/spin.d.ts
rename to spin/index.d.ts
diff --git a/spin/spin-tests.ts b/spin/spin-tests.ts
index 1816b784b7..e9ae63c9a7 100644
--- a/spin/spin-tests.ts
+++ b/spin/spin-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="spin.d.ts" />
+
 
 var spinner = new Spinner().spin();
 target.appendChild(spinner.el);
diff --git a/spin/tsconfig.json b/spin/tsconfig.json
new file mode 100644
index 0000000000..02a5895c89
--- /dev/null
+++ b/spin/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "spin-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/split/index.d.ts b/split/index.d.ts
new file mode 100644
index 0000000000..f4cd33dd5e
--- /dev/null
+++ b/split/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for split v0.3.3
+// Project: https://github.com/dominictarr/split
+// Definitions by: Marcin Porębski <https://github.com/marcinporebski>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+interface SplitOptions {
+    maxLength: number
+}
+
+declare function split(matcher?: any, mapper?: any, options?: SplitOptions): any;
+
+export = split;
diff --git a/split/split-tests.ts b/split/split-tests.ts
index b9aef877f6..204a044b68 100644
--- a/split/split-tests.ts
+++ b/split/split-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="split.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import stream = require("stream");
 import split = require("split");
diff --git a/split/split.d.ts b/split/split.d.ts
deleted file mode 100644
index 71eb97845e..0000000000
--- a/split/split.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for split v0.3.3
-// Project: https://github.com/dominictarr/split
-// Definitions by: Marcin Porębski <https://github.com/marcinporebski>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "split" {
-
-    interface SplitOptions {
-        maxLength: number
-    }
-
-    function split(matcher?:any, mapper?:any, options?: SplitOptions):any;
-
-    export = split;
-}
\ No newline at end of file
diff --git a/split/tsconfig.json b/split/tsconfig.json
new file mode 100644
index 0000000000..56407beb96
--- /dev/null
+++ b/split/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "split-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/spotify-api/spotify-api.d.ts b/spotify-api/index.d.ts
similarity index 100%
rename from spotify-api/spotify-api.d.ts
rename to spotify-api/index.d.ts
diff --git a/spotify-api/spotify-api-tests.ts b/spotify-api/spotify-api-tests.ts
index db90150162..69ac2fee09 100644
--- a/spotify-api/spotify-api-tests.ts
+++ b/spotify-api/spotify-api-tests.ts
@@ -8,7 +8,7 @@
  * To find tests, search for "* Tests" instead of scrolling to keep sane.
  */
 
-/// <reference path="./spotify-api.d.ts" />
+
 
 
 
diff --git a/spotify-api/tsconfig.json b/spotify-api/tsconfig.json
new file mode 100644
index 0000000000..947e87142b
--- /dev/null
+++ b/spotify-api/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "spotify-api-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/spotify-web-api-js/index.d.ts b/spotify-web-api-js/index.d.ts
new file mode 100644
index 0000000000..de4a2aabaf
--- /dev/null
+++ b/spotify-web-api-js/index.d.ts
@@ -0,0 +1,533 @@
+// Type definitions for spotify-web-api-js
+// Project: https://github.com/JMPerez/spotify-web-api-js
+// Definitions by: Niels Kristian Hansen Skovmand <https://github.com/skovmand>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="spotify-api" />
+
+/**
+ * Declare SpotifyWebApi variable, sincle that is the name of the function in spotify-web-api-js.
+ */
+declare var SpotifyWebApi: SpotifyWebApiJs.SpotifyWebApiJsStatic;
+
+declare namespace SpotifyWebApiJs {
+    /**
+     * An optional callback that receives 2 parameters. The first
+     * one is the error object (null if no error), and the second is the value if the request succeeded.
+     */
+    interface ResultsCallback<T> {
+        (error: ErrorObject, value: T) : any
+    }
+
+    /**
+     * Describes the regular error object: https://developer.spotify.com/web-api/user-guide/#error-details
+     */
+    interface ErrorObject {
+        status: number,
+        response: string,
+        statusText: string
+    }
+
+    /**
+     * Describes the static side of SpotifyApi. Get a new instance of the SpotifyApi.
+     */
+    interface SpotifyWebApiJsStatic {
+        new(): SpotifyApiJs;
+    }
+
+    /**
+     * Describes an instance of SpotifyApi
+     */
+    interface SpotifyApiJs {
+        /**
+         * Fetches a resource through a generic GET request.
+         *
+         * @param url The URL to be fetched
+         * @param callback An optional callback
+         */
+        getGeneric(url: string, callback?: ResultsCallback<Object>) : Promise<Object>;
+
+        /**
+         * Fetches information about the current user.
+         * See [Get Current User's Profile](https://developer.spotify.com/web-api/get-current-users-profile/)
+         *
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        getMe(options?: Object, callback?: ResultsCallback<SpotifyApi.CurrentUsersProfileResponse>) : Promise<SpotifyApi.CurrentUsersProfileResponse>;
+
+        /**
+         * Fetches current user's saved tracks.
+         * See [Get Current User's Saved Tracks](https://developer.spotify.com/web-api/get-users-saved-tracks/)
+         *
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        getMySavedTracks(options?: Object, callback?: ResultsCallback<SpotifyApi.UsersSavedTracksResponse>) : Promise<SpotifyApi.UsersSavedTracksResponse>;
+
+        /**
+         * Adds a list of tracks to the current user's saved tracks.
+         * See [Save Tracks for Current User](https://developer.spotify.com/web-api/save-tracks-user/)
+         *
+         * @param trackIds The ids of the tracks. If you know their Spotify URI it is easy to find their track id (e.g. spotify:track:<here_is_the_track_id>)
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        addToMySavedTracks(trackIds: string[], options?: Object, callback?: ResultsCallback<SpotifyApi.SaveTracksForUserResponse>) : Promise<SpotifyApi.SaveTracksForUserResponse>;
+
+        /**
+         * Remove a list of tracks from the current user's saved tracks.
+         * See [Remove Tracks for Current User](https://developer.spotify.com/web-api/remove-tracks-user/)
+         *
+         * @param trackIds The ids of the tracks. If you know their Spotify URI it is easy to find their track id (e.g. spotify:track:<here_is_the_track_id>)
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        removeFromMySavedTracks(trackIds: string[], options?: Object, callback?: ResultsCallback<SpotifyApi.RemoveUsersSavedTracksResponse>) : Promise<SpotifyApi.RemoveUsersSavedTracksResponse>;
+
+        /**
+         * Checks if the current user's saved tracks contains a certain list of tracks.
+         * See [Check Current User's Saved Tracks](https://developer.spotify.com/web-api/check-users-saved-tracks/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param trackIds The ids of the tracks. If you know their Spotify URI it is easy to find their track id (e.g. spotify:track:<here_is_the_track_id>)
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        containsMySavedTracks(trackIds: string[], options?: Object, callback?: ResultsCallback<SpotifyApi.CheckUsersSavedTracksResponse>) : Promise<SpotifyApi.CheckUsersSavedTracksResponse>;
+
+        /**
+         * Adds the current user as a follower of one or more other Spotify users.
+         * See [Follow Artists or Users](https://developer.spotify.com/web-api/follow-artists-users/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param userIds The ids of the users. If you know their Spotify URI it is easy to find their user id (e.g. spotify:user:<here_is_the_user_id>)
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded. one is the error object (null if no error), and the second is an empty value if the request succeeded.
+         */
+        followUsers(userIds: string[], callback?: ResultsCallback<SpotifyApi.FollowArtistsOrUsersResponse>) : Promise<SpotifyApi.FollowArtistsOrUsersResponse>;
+
+        /**
+         * Adds the current user as a follower of one or more artists.
+         * See [Follow Artists or Users](https://developer.spotify.com/web-api/follow-artists-users/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param artistIds The ids of the artists. If you know their Spotify URI it is easy to find their artist id (e.g. spotify:artist:<here_is_the_artist_id>)
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded. one is the error object (null if no error), and the second is an empty value if the request succeeded.
+         */
+        followArtists(artistIds: string[], callback?: ResultsCallback<SpotifyApi.FollowArtistsOrUsersResponse>) : Promise<SpotifyApi.FollowArtistsOrUsersResponse>;
+
+        /**
+         * Add the current user as a follower of one playlist.
+         * See [Follow a Playlist](https://developer.spotify.com/web-api/follow-playlist/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param ownerId The id of the playlist owner. If you know the Spotify URI of the playlist, it is easy to find the owner's user id (e.g. spotify:user:<here_is_the_owner_id>:playlist:xxxx)
+         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
+         * @param options A JSON object with options that can be passed. For instance, whether you want the playlist to be followed privately ({public: false})
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        followPlaylist(ownerId: string, playlistId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.FollowPlaylistReponse>) : Promise<SpotifyApi.FollowPlaylistReponse>;
+
+        /**
+         * Removes the current user as a follower of one or more other Spotify users.
+         * See [Unfollow Artists or Users](https://developer.spotify.com/web-api/unfollow-artists-users/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param userIds The ids of the users. If you know their Spotify URI it is easy to find their user id (e.g. spotify:user:<here_is_the_user_id>)
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        unfollowUsers(userIds: string[], callback?: ResultsCallback<SpotifyApi.UnfollowArtistsOrUsersResponse>) : Promise<SpotifyApi.UnfollowArtistsOrUsersResponse>;
+
+        /**
+         * Removes the current user as a follower of one or more artists.
+         * See [Unfollow Artists or Users](https://developer.spotify.com/web-api/unfollow-artists-users/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param artistIds The ids of the artists. If you know their Spotify URI it is easy to find their artist id (e.g. spotify:artist:<here_is_the_artist_id>)
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        unfollowArtists(artistIds: string[], callback?: ResultsCallback<SpotifyApi.UnfollowArtistsOrUsersResponse>) : Promise<SpotifyApi.UnfollowArtistsOrUsersResponse>;
+
+        /**
+         * Remove the current user as a follower of one playlist.
+         * See [Unfollow a Playlist](https://developer.spotify.com/web-api/unfollow-playlist/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param ownerId The id of the playlist owner. If you know the Spotify URI of the playlist, it is easy to find the owner's user id (e.g. spotify:user:<here_is_the_owner_id>:playlist:xxxx)
+         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        unfollowPlaylist(ownerId: string, playlistId: string, callback?: ResultsCallback<SpotifyApi.UnfollowPlaylistReponse>) : Promise<SpotifyApi.UnfollowPlaylistReponse>;
+
+        /**
+         * Checks to see if the current user is following one or more other Spotify users.
+         * See [Check if Current User Follows Users or Artists](https://developer.spotify.com/web-api/check-current-user-follows/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param userIds The ids of the users. If you know their Spotify URI it is easy to find their user id (e.g. spotify:user:<here_is_the_user_id>)
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        isFollowingUsers(userIds: string[], callback?: ResultsCallback<SpotifyApi.UserFollowsUsersOrArtistsResponse>) : Promise<SpotifyApi.UserFollowsUsersOrArtistsResponse>
+
+        /**
+         * Checks to see if the current user is following one or more artists.
+         * See [Check if Current User Follows](https://developer.spotify.com/web-api/check-current-user-follows/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param artistIds The ids of the artists. If you know their Spotify URI it is easy to find their artist id (e.g. spotify:artist:<here_is_the_artist_id>)
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        isFollowingArtists(artistIds: string[], callback?: ResultsCallback<SpotifyApi.UserFollowsUsersOrArtistsResponse>) : Promise<SpotifyApi.UserFollowsUsersOrArtistsResponse>;
+
+        /**
+         * Check to see if one or more Spotify users are following a specified playlist.
+         * See [Check if Users Follow a Playlist](https://developer.spotify.com/web-api/check-user-following-playlist/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param ownerId The id of the playlist owner. If you know the Spotify URI of the playlist, it is easy to find the owner's user id (e.g. spotify:user:<here_is_the_owner_id>:playlist:xxxx)
+         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
+         * @param userIds The ids of the users. If you know their Spotify URI it is easy to find their user id (e.g. spotify:user:<here_is_the_user_id>)
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        areFollowingPlaylist(ownerId: string, playlistId: string, userIds: string[], callback?: ResultsCallback<SpotifyApi.UsersFollowPlaylistReponse>) : Promise<SpotifyApi.UsersFollowPlaylistReponse>;
+
+        /**
+         * Get the current user's followed artists.
+         * See [Get User's Followed Artists](https://developer.spotify.com/web-api/get-followed-artists/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param options Options, being after and limit.
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        getFollowedArtists(options?: Object, callback?: ResultsCallback<SpotifyApi.UsersFollowedArtistsResponse>) : Promise<SpotifyApi.UsersFollowedArtistsResponse>;
+
+        /**
+         * Fetches information about a specific user.
+         * See [Get a User's Profile](https://developer.spotify.com/web-api/get-users-profile/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param userId The id of the user. If you know the Spotify URI it is easy to find the id (e.g. spotify:user:<here_is_the_id>)
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        getUser(userId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.UserProfileResponse>) : Promise<SpotifyApi.UserProfileResponse>;
+
+        /**
+         * Fetches a list of the current user's playlists.
+         * See [Get a List of a User's Playlists](https://developer.spotify.com/web-api/get-list-users-playlists/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param userId The id of the user. If you know the Spotify URI it is easy to find the id (e.g. spotify:user:<here_is_the_id>)
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        getUserPlaylists(userId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.ListOfUsersPlaylistsResponse>) : Promise<SpotifyApi.ListOfUsersPlaylistsResponse>;
+
+        /**
+         * Fetches a specific playlist.
+         * See [Get a Playlist](https://developer.spotify.com/web-api/get-playlist/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param userId The id of the user. If you know the Spotify URI it is easy to find the user id (e.g. spotify:user:<here_is_the_user_id>:playlist:xxxx)
+         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        getPlaylist(userId: string, playlistId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.SinglePlaylistResponse>) : Promise<SpotifyApi.SinglePlaylistResponse>;
+
+        /**
+         * Fetches the tracks from a specific playlist.
+         * See [Get a Playlist's Tracks](https://developer.spotify.com/web-api/get-playlists-tracks/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param userId The id of the user. If you know the Spotify URI it is easy to find the user id (e.g. spotify:user:<here_is_the_user_id>:playlist:xxxx)
+         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        getPlaylistTracks(userId: string, playlistId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.PlaylistTrackResponse>) : Promise<SpotifyApi.PlaylistTrackResponse>;
+
+        /**
+         * Creates a playlist and stores it in the current user's library.
+         * See [Create a Playlist](https://developer.spotify.com/web-api/create-playlist/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param userId The id of the user. You may want to user the "getMe" function to find out the id of the current logged in user
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        createPlaylist(userId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.CreatePlaylistResponse>) : Promise<SpotifyApi.CreatePlaylistResponse>;
+
+        /**
+         * Change a playlist's name and public/private state
+         * See [Change a Playlist's Details](https://developer.spotify.com/web-api/change-playlist-details/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param userId The id of the user. You may want to user the "getMe" function to find out the id of the current logged in user
+         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
+         * @param data A JSON object with the data to update. E.g. {name: 'A new name', public: true}
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        changePlaylistDetails(userId: string, playlistId: string, data: Object, callback?: ResultsCallback<SpotifyApi.ChangePlaylistDetailsReponse>) : Promise<SpotifyApi.ChangePlaylistDetailsReponse>;
+
+        /**
+         * Add tracks to a playlist.
+         * See [Add Tracks to a Playlist](https://developer.spotify.com/web-api/add-tracks-to-playlist/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param userId The id of the user. If you know the Spotify URI it is easy to find the user id (e.g. spotify:user:<here_is_the_user_id>:playlist:xxxx)
+         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
+         * @param uris An array of Spotify URIs for the tracks
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        addTracksToPlaylist(userId: string, playlistId: string, uris: string[], options?: Object, callback?: ResultsCallback<SpotifyApi.AddTracksToPlaylistResponse>) : Promise<SpotifyApi.AddTracksToPlaylistResponse>;
+
+        /**
+         * Replace the tracks of a playlist
+         * See [Replace a Playlist's Tracks](https://developer.spotify.com/web-api/replace-playlists-tracks/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param userId The id of the user. If you know the Spotify URI it is easy to find the user id (e.g. spotify:user:<here_is_the_user_id>:playlist:xxxx)
+         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
+         * @param uris An array of Spotify URIs for the tracks
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        replaceTracksInPlaylist(userId: string, playlistId: string, uris: string[], callback?: ResultsCallback<SpotifyApi.ReplacePlaylistTracksResponse>) : Promise<SpotifyApi.ReplacePlaylistTracksResponse>;
+
+        /**
+         * Reorder tracks in a playlist
+         * See [Reorder a Playlist’s Tracks](https://developer.spotify.com/web-api/reorder-playlists-tracks/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param userId The id of the user. If you know the Spotify URI it is easy to find the user id (e.g. spotify:user:<here_is_the_user_id>:playlist:xxxx)
+         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
+         * @param rangeStart The position of the first track to be reordered.
+         * @param insertBefore The position where the tracks should be inserted. To reorder the tracks to the end of the playlist, simply set insert_before to the position after the last track.
+         * @param options An object with optional parameters (range_length, snapshot_id)
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        reorderTracksInPlaylist(userId: string, playlistId: string, rangeStart: number, insertBefore: number, options?: Object, callback?: ResultsCallback<SpotifyApi.ReorderPlaylistTracksResponse>) : Promise<SpotifyApi.ReorderPlaylistTracksResponse>;
+
+        /**
+         * Remove tracks from a playlist
+         * See [Remove Tracks from a Playlist](https://developer.spotify.com/web-api/remove-tracks-playlist/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param userId The id of the user. If you know the Spotify URI it is easy to find the user id (e.g. spotify:user:<here_is_the_user_id>:playlist:xxxx)
+         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
+         * @param uris An array of tracks to be removed. Each element of the array can be either a string, in which case it is treated as a URI, or an object containing the properties `uri` (which is a string) and `positions` (which is an array of integers).
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        removeTracksFromPlaylist(userId: string, playlistId: string, uris: Object[], callback?: ResultsCallback<SpotifyApi.RemoveTracksFromPlaylistResponse>) : Promise<SpotifyApi.RemoveTracksFromPlaylistResponse>;
+
+        /**
+         * Remove tracks from a playlist, specifying a snapshot id.
+         * See [Remove Tracks from a Playlist](https://developer.spotify.com/web-api/remove-tracks-playlist/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param userId The id of the user. If you know the Spotify URI it is easy to find the user id (e.g. spotify:user:<here_is_the_user_id>:playlist:xxxx)
+         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
+         * @param uris An array of tracks to be removed. Each element of the array can be either a string, in which case it is treated as a URI, or an object containing the properties `uri` (which is a string) and `positions` (which is an array of integers).
+         * @param snapshotId The playlist's snapshot ID against which you want to make the changes
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        removeTracksFromPlaylistWithSnapshotId(userId: string, playlistId: string, uris: Object[], snapshotId: string, callback?: ResultsCallback<SpotifyApi.PlaylistSnapshotResponse>) : Promise<SpotifyApi.PlaylistSnapshotResponse>;
+
+        /**
+         * Remove tracks from a playlist, specifying the positions of the tracks to be removed.
+         * See [Remove Tracks from a Playlist](https://developer.spotify.com/web-api/remove-tracks-playlist/) on
+         * the Spotify Developer site for more information about the endpoint.
+         * @param userId The id of the user. If you know the Spotify URI it is easy
+         * to find the user id (e.g. spotify:user:<here_is_the_user_id>:playlist:xxxx)
+         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
+         * @param positions array of integers containing the positions of the tracks to remove from the playlist.
+         * @param snapshotId The playlist's snapshot ID against which you want to make the changes
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        removeTracksFromPlaylistInPositions(userId: string, playlistId: string, positions: number[], snapshotId: string, callback?: ResultsCallback<SpotifyApi.PlaylistSnapshotResponse>) : Promise<SpotifyApi.PlaylistSnapshotResponse>;
+
+        /**
+         * Fetches an album from the Spotify catalog.
+         * See [Get an Album](https://developer.spotify.com/web-api/get-album/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param albumId The id of the album. If you know the Spotify URI it is easy to find the album id (e.g. spotify:album:<here_is_the_album_id>)
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        getAlbum(albumId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.SingleAlbumResponse>) : Promise<SpotifyApi.SingleAlbumResponse>;
+
+        /**
+         * Fetches the tracks of an album from the Spotify catalog.
+         * See [Get an Album's Tracks](https://developer.spotify.com/web-api/get-albums-tracks/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param albumId The id of the album. If you know the Spotify URI it is easy to find the album id (e.g. spotify:album:<here_is_the_album_id>)
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        getAlbumTracks(albumId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.AlbumTracksResponse>) : Promise<SpotifyApi.AlbumTracksResponse>;
+
+        /**
+         * Fetches multiple albums from the Spotify catalog.
+         * See [Get Several Albums](https://developer.spotify.com/web-api/get-several-albums/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param albumIds The ids of the albums. If you know their Spotify URI it is easy to find their album id (e.g. spotify:album:<here_is_the_album_id>)
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        getAlbums(albumIds: string[], options?: Object, callback?: ResultsCallback<SpotifyApi.MultipleAlbumsResponse>) : Promise<SpotifyApi.MultipleAlbumsResponse>;
+
+        /**
+         * Fetches a track from the Spotify catalog.
+         * See [Get a Track](https://developer.spotify.com/web-api/get-track/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param trackId The id of the track. If you know the Spotify URI it is easy to find the track id (e.g. spotify:track:<here_is_the_track_id>)
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        getTrack(trackId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.SingleTrackResponse>) : Promise<SpotifyApi.SingleTrackResponse>;
+
+        /**
+         * Fetches multiple tracks from the Spotify catalog.
+         * See [Get Several Tracks](https://developer.spotify.com/web-api/get-several-tracks/) on
+         * the Spotify Developer site for more information about the endpoint.
+         * @param trackIds The ids of the tracks. If you know their Spotify URI it is easy to find their track id (e.g. spotify:track:<here_is_the_track_id>)
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        getTracks(trackIds: string[], options?: Object, callback?: ResultsCallback<SpotifyApi.MultipleTracksResponse>) : Promise<SpotifyApi.MultipleTracksResponse>;
+
+        /**
+         * Fetches an artist from the Spotify catalog.
+         * See [Get an Artist](https://developer.spotify.com/web-api/get-artist/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param artistId The id of the artist. If you know the Spotify URI it is easy to find the artist id (e.g. spotify:artist:<here_is_the_artist_id>)
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        getArtist(artistId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.SingleArtistResponse>) : Promise<SpotifyApi.SingleArtistResponse>;
+
+        /**
+         * Fetches multiple artists from the Spotify catalog.
+         * See [Get Several Artists](https://developer.spotify.com/web-api/get-several-artists/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param artistIds The ids of the artists. If you know their Spotify URI it is easy to find their artist id (e.g. spotify:artist:<here_is_the_artist_id>)
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        getArtists(artistIds: string[], options?: Object, callback?: ResultsCallback<SpotifyApi.MultipleArtistsResponse>) : Promise<SpotifyApi.MultipleArtistsResponse>;
+
+        /**
+         * Fetches the albums of an artist from the Spotify catalog.
+         * See [Get an Artist's Albums](https://developer.spotify.com/web-api/get-artists-albums/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param artistId The id of the artist. If you know the Spotify URI it is easy to find the artist id (e.g. spotify:artist:<here_is_the_artist_id>)
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        getArtistAlbums(artistId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.ArtistsAlbumsResponse>) : Promise<SpotifyApi.ArtistsAlbumsResponse>;
+
+        /**
+         * Fetches a list of top tracks of an artist from the Spotify catalog, for a specific country.
+         * See [Get an Artist's Top Tracks](https://developer.spotify.com/web-api/get-artists-top-tracks/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param artistId The id of the artist. If you know the Spotify URI it is easy to find the artist id (e.g. spotify:artist:<here_is_the_artist_id>)
+         * @param countryId The id of the country (e.g. ES for Spain or US for United States)
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        getArtistTopTracks(artistId: string, countryId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.ArtistsTopTracksResponse>) : Promise<SpotifyApi.ArtistsTopTracksResponse>;
+
+        /**
+         * Fetches a list of artists related with a given one from the Spotify catalog.
+         * See [Get an Artist's Related Artists](https://developer.spotify.com/web-api/get-related-artists/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param artistId The id of the artist. If you know the Spotify URI it is easy to find the artist id (e.g. spotify:artist:<here_is_the_artist_id>)
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        getArtistRelatedArtists(artistId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.ArtistsRelatedArtistsResponse>) : Promise<SpotifyApi.ArtistsRelatedArtistsResponse>;
+
+        /**
+         * Fetches a list of Spotify featured playlists (shown, for example, on a Spotify player's "Browse" tab).
+         * See [Get a List of Featured Playlists](https://developer.spotify.com/web-api/get-list-featured-playlists/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        getFeaturedPlaylists(options?: Object, callback?: ResultsCallback<SpotifyApi.ListOfFeaturedPlaylistsResponse>) : Promise<SpotifyApi.ListOfFeaturedPlaylistsResponse>;
+
+        /**
+         * Fetches a list of new album releases featured in Spotify (shown, for example, on a Spotify player's "Browse" tab).
+         * See [Get a List of New Releases](https://developer.spotify.com/web-api/get-list-new-releases/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        getNewReleases(options?: Object, callback?: ResultsCallback<SpotifyApi.ListOfNewReleasesResponse>) : Promise<SpotifyApi.ListOfNewReleasesResponse>;
+
+        /**
+         * Get a list of categories used to tag items in Spotify (on, for example, the Spotify player's "Browse" tab).
+         * See [Get a List of Categories](https://developer.spotify.com/web-api/get-list-categories/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        getCategories(options?: Object, callback?: ResultsCallback<SpotifyApi.MultipleCategoriesResponse>) : Promise<SpotifyApi.MultipleCategoriesResponse>;
+
+        /**
+         * Get a single category used to tag items in Spotify (on, for example, the Spotify player's "Browse" tab).
+         * See [Get a Category](https://developer.spotify.com/web-api/get-category/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param categoryId The id of the category. These can be found with the getCategories function
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        getCategory(categoryId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.SingleCategoryResponse>) : Promise<SpotifyApi.SingleCategoryResponse>;
+
+        /**
+         * Get a list of Spotify playlists tagged with a particular category.
+         * See [Get a Category's Playlists](https://developer.spotify.com/web-api/get-categorys-playlists/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param categoryId The id of the category. These can be found with the getCategories function
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        getCategoryPlaylists(categoryId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.CategoryPlaylistsReponse>) : Promise<SpotifyApi.CategoryPlaylistsReponse>;
+
+        /**
+         * Fetches albums from the Spotify catalog according to a query.
+         * See [Search for an Item](https://developer.spotify.com/web-api/search-item/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param query The search query
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        searchAlbums(query: string, options?: SpotifyApi.SearchForItemParameterObject, callback?: ResultsCallback<SpotifyApi.AlbumSearchResponse>) : Promise<SpotifyApi.AlbumSearchResponse>;
+
+        /**
+         * Fetches artists from the Spotify catalog according to a query.
+         * See [Search for an Item](https://developer.spotify.com/web-api/search-item/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param query The search query
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        searchArtists(query: string, options?: SpotifyApi.SearchForItemParameterObject, callback?: ResultsCallback<SpotifyApi.ArtistSearchResponse>) : Promise<SpotifyApi.ArtistSearchResponse>;
+
+        /**
+         * Fetches tracks from the Spotify catalog according to a query.
+         * See [Search for an Item](https://developer.spotify.com/web-api/search-item/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param query The search query
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        searchTracks(query: string, options?: SpotifyApi.SearchForItemParameterObject, callback?: ResultsCallback<SpotifyApi.TrackSearchResponse>) : Promise<SpotifyApi.TrackSearchResponse>;
+
+        /**
+         * Fetches playlists from the Spotify catalog according to a query.
+         * See [Search for an Item](https://developer.spotify.com/web-api/search-item/) on the Spotify Developer site for more information about the endpoint.
+         *
+         * @param query The search query
+         * @param options A JSON object with options that can be passed
+         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
+         */
+        searchPlaylists(query: string, options?: SpotifyApi.SearchForItemParameterObject, callback?: ResultsCallback<SpotifyApi.PlaylistSearchResponse>) : Promise<SpotifyApi.PlaylistSearchResponse>;
+
+        /**
+         * Sets the access token to be used.
+         * See [the Authorization Guide](https://developer.spotify.com/web-api/authorization-guide/) on the Spotify Developer site for more information about obtaining an access token.
+         *
+         * @param accessToken The access token
+         */
+        setAccessToken(accessToken: string) : void;
+
+        /**
+         * Sets an implementation of Promises/A+ to be used. E.g. Q, when.
+         * See [Conformant Implementations](https://github.com/promises-aplus/promises-spec/blob/master/implementations.md) for a list of some available options
+         *
+         * @param promiseImplementation A Promises/A+ valid implementation
+         * @throws {Error} If the implementation being set doesn't conform with Promises/A+
+         */
+        setPromiseImplementation(promiseImplementation: Object) : void;
+    }
+}
diff --git a/spotify-web-api-js/spotify-web-api-js-tests.ts b/spotify-web-api-js/spotify-web-api-js-tests.ts
index 11fcf2b43b..fe859c287c 100644
--- a/spotify-web-api-js/spotify-web-api-js-tests.ts
+++ b/spotify-web-api-js/spotify-web-api-js-tests.ts
@@ -5,8 +5,8 @@
 
 // This test-file assumes the following two d.ts files to be present.
 
-/// <reference path="./spotify-web-api-js.d.ts" />
-/// <reference path="../spotify-api/spotify-api.d.ts" />
+
+/// <reference types="spotify-api" />
 
 var spotify = new SpotifyWebApi();
 
diff --git a/spotify-web-api-js/spotify-web-api-js.d.ts b/spotify-web-api-js/spotify-web-api-js.d.ts
deleted file mode 100644
index 817626199c..0000000000
--- a/spotify-web-api-js/spotify-web-api-js.d.ts
+++ /dev/null
@@ -1,533 +0,0 @@
-// Type definitions for spotify-web-api-js
-// Project: https://github.com/JMPerez/spotify-web-api-js
-// Definitions by: Niels Kristian Hansen Skovmand <https://github.com/skovmand>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../spotify-api/spotify-api.d.ts" />
-
-/**
- * Declare SpotifyWebApi variable, sincle that is the name of the function in spotify-web-api-js.
- */
-declare var SpotifyWebApi: SpotifyWebApiJs.SpotifyWebApiJsStatic;
-
-declare namespace SpotifyWebApiJs {
-    /**
-     * An optional callback that receives 2 parameters. The first
-     * one is the error object (null if no error), and the second is the value if the request succeeded.
-     */
-    interface ResultsCallback<T> {
-        (error: ErrorObject, value: T) : any
-    }
-
-    /**
-     * Describes the regular error object: https://developer.spotify.com/web-api/user-guide/#error-details
-     */
-    interface ErrorObject {
-        status: number,
-        response: string,
-        statusText: string
-    }
-
-    /**
-     * Describes the static side of SpotifyApi. Get a new instance of the SpotifyApi.
-     */
-    interface SpotifyWebApiJsStatic {
-        new(): SpotifyApiJs;
-    }
-
-    /**
-     * Describes an instance of SpotifyApi
-     */
-    interface SpotifyApiJs {
-        /**
-         * Fetches a resource through a generic GET request.
-         *
-         * @param url The URL to be fetched
-         * @param callback An optional callback
-         */
-        getGeneric(url: string, callback?: ResultsCallback<Object>) : Promise<Object>;
-
-        /**
-         * Fetches information about the current user.
-         * See [Get Current User's Profile](https://developer.spotify.com/web-api/get-current-users-profile/)
-         *
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        getMe(options?: Object, callback?: ResultsCallback<SpotifyApi.CurrentUsersProfileResponse>) : Promise<SpotifyApi.CurrentUsersProfileResponse>;
-
-        /**
-         * Fetches current user's saved tracks.
-         * See [Get Current User's Saved Tracks](https://developer.spotify.com/web-api/get-users-saved-tracks/)
-         *
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        getMySavedTracks(options?: Object, callback?: ResultsCallback<SpotifyApi.UsersSavedTracksResponse>) : Promise<SpotifyApi.UsersSavedTracksResponse>;
-
-        /**
-         * Adds a list of tracks to the current user's saved tracks.
-         * See [Save Tracks for Current User](https://developer.spotify.com/web-api/save-tracks-user/)
-         *
-         * @param trackIds The ids of the tracks. If you know their Spotify URI it is easy to find their track id (e.g. spotify:track:<here_is_the_track_id>)
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        addToMySavedTracks(trackIds: string[], options?: Object, callback?: ResultsCallback<SpotifyApi.SaveTracksForUserResponse>) : Promise<SpotifyApi.SaveTracksForUserResponse>;
-
-        /**
-         * Remove a list of tracks from the current user's saved tracks.
-         * See [Remove Tracks for Current User](https://developer.spotify.com/web-api/remove-tracks-user/)
-         *
-         * @param trackIds The ids of the tracks. If you know their Spotify URI it is easy to find their track id (e.g. spotify:track:<here_is_the_track_id>)
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        removeFromMySavedTracks(trackIds: string[], options?: Object, callback?: ResultsCallback<SpotifyApi.RemoveUsersSavedTracksResponse>) : Promise<SpotifyApi.RemoveUsersSavedTracksResponse>;
-
-        /**
-         * Checks if the current user's saved tracks contains a certain list of tracks.
-         * See [Check Current User's Saved Tracks](https://developer.spotify.com/web-api/check-users-saved-tracks/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param trackIds The ids of the tracks. If you know their Spotify URI it is easy to find their track id (e.g. spotify:track:<here_is_the_track_id>)
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        containsMySavedTracks(trackIds: string[], options?: Object, callback?: ResultsCallback<SpotifyApi.CheckUsersSavedTracksResponse>) : Promise<SpotifyApi.CheckUsersSavedTracksResponse>;
-
-        /**
-         * Adds the current user as a follower of one or more other Spotify users.
-         * See [Follow Artists or Users](https://developer.spotify.com/web-api/follow-artists-users/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param userIds The ids of the users. If you know their Spotify URI it is easy to find their user id (e.g. spotify:user:<here_is_the_user_id>)
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded. one is the error object (null if no error), and the second is an empty value if the request succeeded.
-         */
-        followUsers(userIds: string[], callback?: ResultsCallback<SpotifyApi.FollowArtistsOrUsersResponse>) : Promise<SpotifyApi.FollowArtistsOrUsersResponse>;
-
-        /**
-         * Adds the current user as a follower of one or more artists.
-         * See [Follow Artists or Users](https://developer.spotify.com/web-api/follow-artists-users/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param artistIds The ids of the artists. If you know their Spotify URI it is easy to find their artist id (e.g. spotify:artist:<here_is_the_artist_id>)
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded. one is the error object (null if no error), and the second is an empty value if the request succeeded.
-         */
-        followArtists(artistIds: string[], callback?: ResultsCallback<SpotifyApi.FollowArtistsOrUsersResponse>) : Promise<SpotifyApi.FollowArtistsOrUsersResponse>;
-
-        /**
-         * Add the current user as a follower of one playlist.
-         * See [Follow a Playlist](https://developer.spotify.com/web-api/follow-playlist/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param ownerId The id of the playlist owner. If you know the Spotify URI of the playlist, it is easy to find the owner's user id (e.g. spotify:user:<here_is_the_owner_id>:playlist:xxxx)
-         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
-         * @param options A JSON object with options that can be passed. For instance, whether you want the playlist to be followed privately ({public: false})
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        followPlaylist(ownerId: string, playlistId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.FollowPlaylistReponse>) : Promise<SpotifyApi.FollowPlaylistReponse>;
-
-        /**
-         * Removes the current user as a follower of one or more other Spotify users.
-         * See [Unfollow Artists or Users](https://developer.spotify.com/web-api/unfollow-artists-users/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param userIds The ids of the users. If you know their Spotify URI it is easy to find their user id (e.g. spotify:user:<here_is_the_user_id>)
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        unfollowUsers(userIds: string[], callback?: ResultsCallback<SpotifyApi.UnfollowArtistsOrUsersResponse>) : Promise<SpotifyApi.UnfollowArtistsOrUsersResponse>;
-
-        /**
-         * Removes the current user as a follower of one or more artists.
-         * See [Unfollow Artists or Users](https://developer.spotify.com/web-api/unfollow-artists-users/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param artistIds The ids of the artists. If you know their Spotify URI it is easy to find their artist id (e.g. spotify:artist:<here_is_the_artist_id>)
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        unfollowArtists(artistIds: string[], callback?: ResultsCallback<SpotifyApi.UnfollowArtistsOrUsersResponse>) : Promise<SpotifyApi.UnfollowArtistsOrUsersResponse>;
-
-        /**
-         * Remove the current user as a follower of one playlist.
-         * See [Unfollow a Playlist](https://developer.spotify.com/web-api/unfollow-playlist/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param ownerId The id of the playlist owner. If you know the Spotify URI of the playlist, it is easy to find the owner's user id (e.g. spotify:user:<here_is_the_owner_id>:playlist:xxxx)
-         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        unfollowPlaylist(ownerId: string, playlistId: string, callback?: ResultsCallback<SpotifyApi.UnfollowPlaylistReponse>) : Promise<SpotifyApi.UnfollowPlaylistReponse>;
-
-        /**
-         * Checks to see if the current user is following one or more other Spotify users.
-         * See [Check if Current User Follows Users or Artists](https://developer.spotify.com/web-api/check-current-user-follows/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param userIds The ids of the users. If you know their Spotify URI it is easy to find their user id (e.g. spotify:user:<here_is_the_user_id>)
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        isFollowingUsers(userIds: string[], callback?: ResultsCallback<SpotifyApi.UserFollowsUsersOrArtistsResponse>) : Promise<SpotifyApi.UserFollowsUsersOrArtistsResponse>
-
-        /**
-         * Checks to see if the current user is following one or more artists.
-         * See [Check if Current User Follows](https://developer.spotify.com/web-api/check-current-user-follows/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param artistIds The ids of the artists. If you know their Spotify URI it is easy to find their artist id (e.g. spotify:artist:<here_is_the_artist_id>)
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        isFollowingArtists(artistIds: string[], callback?: ResultsCallback<SpotifyApi.UserFollowsUsersOrArtistsResponse>) : Promise<SpotifyApi.UserFollowsUsersOrArtistsResponse>;
-
-        /**
-         * Check to see if one or more Spotify users are following a specified playlist.
-         * See [Check if Users Follow a Playlist](https://developer.spotify.com/web-api/check-user-following-playlist/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param ownerId The id of the playlist owner. If you know the Spotify URI of the playlist, it is easy to find the owner's user id (e.g. spotify:user:<here_is_the_owner_id>:playlist:xxxx)
-         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
-         * @param userIds The ids of the users. If you know their Spotify URI it is easy to find their user id (e.g. spotify:user:<here_is_the_user_id>)
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        areFollowingPlaylist(ownerId: string, playlistId: string, userIds: string[], callback?: ResultsCallback<SpotifyApi.UsersFollowPlaylistReponse>) : Promise<SpotifyApi.UsersFollowPlaylistReponse>;
-
-        /**
-         * Get the current user's followed artists.
-         * See [Get User's Followed Artists](https://developer.spotify.com/web-api/get-followed-artists/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param options Options, being after and limit.
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        getFollowedArtists(options?: Object, callback?: ResultsCallback<SpotifyApi.UsersFollowedArtistsResponse>) : Promise<SpotifyApi.UsersFollowedArtistsResponse>;
-
-        /**
-         * Fetches information about a specific user.
-         * See [Get a User's Profile](https://developer.spotify.com/web-api/get-users-profile/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param userId The id of the user. If you know the Spotify URI it is easy to find the id (e.g. spotify:user:<here_is_the_id>)
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        getUser(userId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.UserProfileResponse>) : Promise<SpotifyApi.UserProfileResponse>;
-
-        /**
-         * Fetches a list of the current user's playlists.
-         * See [Get a List of a User's Playlists](https://developer.spotify.com/web-api/get-list-users-playlists/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param userId The id of the user. If you know the Spotify URI it is easy to find the id (e.g. spotify:user:<here_is_the_id>)
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        getUserPlaylists(userId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.ListOfUsersPlaylistsResponse>) : Promise<SpotifyApi.ListOfUsersPlaylistsResponse>;
-
-        /**
-         * Fetches a specific playlist.
-         * See [Get a Playlist](https://developer.spotify.com/web-api/get-playlist/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param userId The id of the user. If you know the Spotify URI it is easy to find the user id (e.g. spotify:user:<here_is_the_user_id>:playlist:xxxx)
-         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        getPlaylist(userId: string, playlistId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.SinglePlaylistResponse>) : Promise<SpotifyApi.SinglePlaylistResponse>;
-
-        /**
-         * Fetches the tracks from a specific playlist.
-         * See [Get a Playlist's Tracks](https://developer.spotify.com/web-api/get-playlists-tracks/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param userId The id of the user. If you know the Spotify URI it is easy to find the user id (e.g. spotify:user:<here_is_the_user_id>:playlist:xxxx)
-         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        getPlaylistTracks(userId: string, playlistId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.PlaylistTrackResponse>) : Promise<SpotifyApi.PlaylistTrackResponse>;
-
-        /**
-         * Creates a playlist and stores it in the current user's library.
-         * See [Create a Playlist](https://developer.spotify.com/web-api/create-playlist/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param userId The id of the user. You may want to user the "getMe" function to find out the id of the current logged in user
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        createPlaylist(userId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.CreatePlaylistResponse>) : Promise<SpotifyApi.CreatePlaylistResponse>;
-
-        /**
-         * Change a playlist's name and public/private state
-         * See [Change a Playlist's Details](https://developer.spotify.com/web-api/change-playlist-details/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param userId The id of the user. You may want to user the "getMe" function to find out the id of the current logged in user
-         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
-         * @param data A JSON object with the data to update. E.g. {name: 'A new name', public: true}
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        changePlaylistDetails(userId: string, playlistId: string, data: Object, callback?: ResultsCallback<SpotifyApi.ChangePlaylistDetailsReponse>) : Promise<SpotifyApi.ChangePlaylistDetailsReponse>;
-
-        /**
-         * Add tracks to a playlist.
-         * See [Add Tracks to a Playlist](https://developer.spotify.com/web-api/add-tracks-to-playlist/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param userId The id of the user. If you know the Spotify URI it is easy to find the user id (e.g. spotify:user:<here_is_the_user_id>:playlist:xxxx)
-         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
-         * @param uris An array of Spotify URIs for the tracks
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        addTracksToPlaylist(userId: string, playlistId: string, uris: string[], options?: Object, callback?: ResultsCallback<SpotifyApi.AddTracksToPlaylistResponse>) : Promise<SpotifyApi.AddTracksToPlaylistResponse>;
-
-        /**
-         * Replace the tracks of a playlist
-         * See [Replace a Playlist's Tracks](https://developer.spotify.com/web-api/replace-playlists-tracks/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param userId The id of the user. If you know the Spotify URI it is easy to find the user id (e.g. spotify:user:<here_is_the_user_id>:playlist:xxxx)
-         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
-         * @param uris An array of Spotify URIs for the tracks
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        replaceTracksInPlaylist(userId: string, playlistId: string, uris: string[], callback?: ResultsCallback<SpotifyApi.ReplacePlaylistTracksResponse>) : Promise<SpotifyApi.ReplacePlaylistTracksResponse>;
-
-        /**
-         * Reorder tracks in a playlist
-         * See [Reorder a Playlist’s Tracks](https://developer.spotify.com/web-api/reorder-playlists-tracks/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param userId The id of the user. If you know the Spotify URI it is easy to find the user id (e.g. spotify:user:<here_is_the_user_id>:playlist:xxxx)
-         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
-         * @param rangeStart The position of the first track to be reordered.
-         * @param insertBefore The position where the tracks should be inserted. To reorder the tracks to the end of the playlist, simply set insert_before to the position after the last track.
-         * @param options An object with optional parameters (range_length, snapshot_id)
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        reorderTracksInPlaylist(userId: string, playlistId: string, rangeStart: number, insertBefore: number, options?: Object, callback?: ResultsCallback<SpotifyApi.ReorderPlaylistTracksResponse>) : Promise<SpotifyApi.ReorderPlaylistTracksResponse>;
-
-        /**
-         * Remove tracks from a playlist
-         * See [Remove Tracks from a Playlist](https://developer.spotify.com/web-api/remove-tracks-playlist/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param userId The id of the user. If you know the Spotify URI it is easy to find the user id (e.g. spotify:user:<here_is_the_user_id>:playlist:xxxx)
-         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
-         * @param uris An array of tracks to be removed. Each element of the array can be either a string, in which case it is treated as a URI, or an object containing the properties `uri` (which is a string) and `positions` (which is an array of integers).
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        removeTracksFromPlaylist(userId: string, playlistId: string, uris: Object[], callback?: ResultsCallback<SpotifyApi.RemoveTracksFromPlaylistResponse>) : Promise<SpotifyApi.RemoveTracksFromPlaylistResponse>;
-
-        /**
-         * Remove tracks from a playlist, specifying a snapshot id.
-         * See [Remove Tracks from a Playlist](https://developer.spotify.com/web-api/remove-tracks-playlist/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param userId The id of the user. If you know the Spotify URI it is easy to find the user id (e.g. spotify:user:<here_is_the_user_id>:playlist:xxxx)
-         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
-         * @param uris An array of tracks to be removed. Each element of the array can be either a string, in which case it is treated as a URI, or an object containing the properties `uri` (which is a string) and `positions` (which is an array of integers).
-         * @param snapshotId The playlist's snapshot ID against which you want to make the changes
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        removeTracksFromPlaylistWithSnapshotId(userId: string, playlistId: string, uris: Object[], snapshotId: string, callback?: ResultsCallback<SpotifyApi.PlaylistSnapshotResponse>) : Promise<SpotifyApi.PlaylistSnapshotResponse>;
-
-        /**
-         * Remove tracks from a playlist, specifying the positions of the tracks to be removed.
-         * See [Remove Tracks from a Playlist](https://developer.spotify.com/web-api/remove-tracks-playlist/) on
-         * the Spotify Developer site for more information about the endpoint.
-         * @param userId The id of the user. If you know the Spotify URI it is easy
-         * to find the user id (e.g. spotify:user:<here_is_the_user_id>:playlist:xxxx)
-         * @param playlistId The id of the playlist. If you know the Spotify URI it is easy to find the playlist id (e.g. spotify:user:xxxx:playlist:<here_is_the_playlist_id>)
-         * @param positions array of integers containing the positions of the tracks to remove from the playlist.
-         * @param snapshotId The playlist's snapshot ID against which you want to make the changes
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        removeTracksFromPlaylistInPositions(userId: string, playlistId: string, positions: number[], snapshotId: string, callback?: ResultsCallback<SpotifyApi.PlaylistSnapshotResponse>) : Promise<SpotifyApi.PlaylistSnapshotResponse>;
-
-        /**
-         * Fetches an album from the Spotify catalog.
-         * See [Get an Album](https://developer.spotify.com/web-api/get-album/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param albumId The id of the album. If you know the Spotify URI it is easy to find the album id (e.g. spotify:album:<here_is_the_album_id>)
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        getAlbum(albumId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.SingleAlbumResponse>) : Promise<SpotifyApi.SingleAlbumResponse>;
-
-        /**
-         * Fetches the tracks of an album from the Spotify catalog.
-         * See [Get an Album's Tracks](https://developer.spotify.com/web-api/get-albums-tracks/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param albumId The id of the album. If you know the Spotify URI it is easy to find the album id (e.g. spotify:album:<here_is_the_album_id>)
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        getAlbumTracks(albumId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.AlbumTracksResponse>) : Promise<SpotifyApi.AlbumTracksResponse>;
-
-        /**
-         * Fetches multiple albums from the Spotify catalog.
-         * See [Get Several Albums](https://developer.spotify.com/web-api/get-several-albums/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param albumIds The ids of the albums. If you know their Spotify URI it is easy to find their album id (e.g. spotify:album:<here_is_the_album_id>)
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        getAlbums(albumIds: string[], options?: Object, callback?: ResultsCallback<SpotifyApi.MultipleAlbumsResponse>) : Promise<SpotifyApi.MultipleAlbumsResponse>;
-
-        /**
-         * Fetches a track from the Spotify catalog.
-         * See [Get a Track](https://developer.spotify.com/web-api/get-track/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param trackId The id of the track. If you know the Spotify URI it is easy to find the track id (e.g. spotify:track:<here_is_the_track_id>)
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        getTrack(trackId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.SingleTrackResponse>) : Promise<SpotifyApi.SingleTrackResponse>;
-
-        /**
-         * Fetches multiple tracks from the Spotify catalog.
-         * See [Get Several Tracks](https://developer.spotify.com/web-api/get-several-tracks/) on
-         * the Spotify Developer site for more information about the endpoint.
-         * @param trackIds The ids of the tracks. If you know their Spotify URI it is easy to find their track id (e.g. spotify:track:<here_is_the_track_id>)
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        getTracks(trackIds: string[], options?: Object, callback?: ResultsCallback<SpotifyApi.MultipleTracksResponse>) : Promise<SpotifyApi.MultipleTracksResponse>;
-
-        /**
-         * Fetches an artist from the Spotify catalog.
-         * See [Get an Artist](https://developer.spotify.com/web-api/get-artist/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param artistId The id of the artist. If you know the Spotify URI it is easy to find the artist id (e.g. spotify:artist:<here_is_the_artist_id>)
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        getArtist(artistId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.SingleArtistResponse>) : Promise<SpotifyApi.SingleArtistResponse>;
-
-        /**
-         * Fetches multiple artists from the Spotify catalog.
-         * See [Get Several Artists](https://developer.spotify.com/web-api/get-several-artists/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param artistIds The ids of the artists. If you know their Spotify URI it is easy to find their artist id (e.g. spotify:artist:<here_is_the_artist_id>)
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        getArtists(artistIds: string[], options?: Object, callback?: ResultsCallback<SpotifyApi.MultipleArtistsResponse>) : Promise<SpotifyApi.MultipleArtistsResponse>;
-
-        /**
-         * Fetches the albums of an artist from the Spotify catalog.
-         * See [Get an Artist's Albums](https://developer.spotify.com/web-api/get-artists-albums/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param artistId The id of the artist. If you know the Spotify URI it is easy to find the artist id (e.g. spotify:artist:<here_is_the_artist_id>)
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        getArtistAlbums(artistId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.ArtistsAlbumsResponse>) : Promise<SpotifyApi.ArtistsAlbumsResponse>;
-
-        /**
-         * Fetches a list of top tracks of an artist from the Spotify catalog, for a specific country.
-         * See [Get an Artist's Top Tracks](https://developer.spotify.com/web-api/get-artists-top-tracks/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param artistId The id of the artist. If you know the Spotify URI it is easy to find the artist id (e.g. spotify:artist:<here_is_the_artist_id>)
-         * @param countryId The id of the country (e.g. ES for Spain or US for United States)
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        getArtistTopTracks(artistId: string, countryId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.ArtistsTopTracksResponse>) : Promise<SpotifyApi.ArtistsTopTracksResponse>;
-
-        /**
-         * Fetches a list of artists related with a given one from the Spotify catalog.
-         * See [Get an Artist's Related Artists](https://developer.spotify.com/web-api/get-related-artists/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param artistId The id of the artist. If you know the Spotify URI it is easy to find the artist id (e.g. spotify:artist:<here_is_the_artist_id>)
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        getArtistRelatedArtists(artistId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.ArtistsRelatedArtistsResponse>) : Promise<SpotifyApi.ArtistsRelatedArtistsResponse>;
-
-        /**
-         * Fetches a list of Spotify featured playlists (shown, for example, on a Spotify player's "Browse" tab).
-         * See [Get a List of Featured Playlists](https://developer.spotify.com/web-api/get-list-featured-playlists/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        getFeaturedPlaylists(options?: Object, callback?: ResultsCallback<SpotifyApi.ListOfFeaturedPlaylistsResponse>) : Promise<SpotifyApi.ListOfFeaturedPlaylistsResponse>;
-
-        /**
-         * Fetches a list of new album releases featured in Spotify (shown, for example, on a Spotify player's "Browse" tab).
-         * See [Get a List of New Releases](https://developer.spotify.com/web-api/get-list-new-releases/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        getNewReleases(options?: Object, callback?: ResultsCallback<SpotifyApi.ListOfNewReleasesResponse>) : Promise<SpotifyApi.ListOfNewReleasesResponse>;
-
-        /**
-         * Get a list of categories used to tag items in Spotify (on, for example, the Spotify player's "Browse" tab).
-         * See [Get a List of Categories](https://developer.spotify.com/web-api/get-list-categories/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        getCategories(options?: Object, callback?: ResultsCallback<SpotifyApi.MultipleCategoriesResponse>) : Promise<SpotifyApi.MultipleCategoriesResponse>;
-
-        /**
-         * Get a single category used to tag items in Spotify (on, for example, the Spotify player's "Browse" tab).
-         * See [Get a Category](https://developer.spotify.com/web-api/get-category/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param categoryId The id of the category. These can be found with the getCategories function
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        getCategory(categoryId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.SingleCategoryResponse>) : Promise<SpotifyApi.SingleCategoryResponse>;
-
-        /**
-         * Get a list of Spotify playlists tagged with a particular category.
-         * See [Get a Category's Playlists](https://developer.spotify.com/web-api/get-categorys-playlists/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param categoryId The id of the category. These can be found with the getCategories function
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        getCategoryPlaylists(categoryId: string, options?: Object, callback?: ResultsCallback<SpotifyApi.CategoryPlaylistsReponse>) : Promise<SpotifyApi.CategoryPlaylistsReponse>;
-
-        /**
-         * Fetches albums from the Spotify catalog according to a query.
-         * See [Search for an Item](https://developer.spotify.com/web-api/search-item/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param query The search query
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        searchAlbums(query: string, options?: SpotifyApi.SearchForItemParameterObject, callback?: ResultsCallback<SpotifyApi.AlbumSearchResponse>) : Promise<SpotifyApi.AlbumSearchResponse>;
-
-        /**
-         * Fetches artists from the Spotify catalog according to a query.
-         * See [Search for an Item](https://developer.spotify.com/web-api/search-item/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param query The search query
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        searchArtists(query: string, options?: SpotifyApi.SearchForItemParameterObject, callback?: ResultsCallback<SpotifyApi.ArtistSearchResponse>) : Promise<SpotifyApi.ArtistSearchResponse>;
-
-        /**
-         * Fetches tracks from the Spotify catalog according to a query.
-         * See [Search for an Item](https://developer.spotify.com/web-api/search-item/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param query The search query
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        searchTracks(query: string, options?: SpotifyApi.SearchForItemParameterObject, callback?: ResultsCallback<SpotifyApi.TrackSearchResponse>) : Promise<SpotifyApi.TrackSearchResponse>;
-
-        /**
-         * Fetches playlists from the Spotify catalog according to a query.
-         * See [Search for an Item](https://developer.spotify.com/web-api/search-item/) on the Spotify Developer site for more information about the endpoint.
-         *
-         * @param query The search query
-         * @param options A JSON object with options that can be passed
-         * @param callback An optional callback that receives 2 parameters. The first one is the error object (null if no error), and the second is the value if the request succeeded.
-         */
-        searchPlaylists(query: string, options?: SpotifyApi.SearchForItemParameterObject, callback?: ResultsCallback<SpotifyApi.PlaylistSearchResponse>) : Promise<SpotifyApi.PlaylistSearchResponse>;
-
-        /**
-         * Sets the access token to be used.
-         * See [the Authorization Guide](https://developer.spotify.com/web-api/authorization-guide/) on the Spotify Developer site for more information about obtaining an access token.
-         *
-         * @param accessToken The access token
-         */
-        setAccessToken(accessToken: string) : void;
-
-        /**
-         * Sets an implementation of Promises/A+ to be used. E.g. Q, when.
-         * See [Conformant Implementations](https://github.com/promises-aplus/promises-spec/blob/master/implementations.md) for a list of some available options
-         *
-         * @param promiseImplementation A Promises/A+ valid implementation
-         * @throws {Error} If the implementation being set doesn't conform with Promises/A+
-         */
-        setPromiseImplementation(promiseImplementation: Object) : void;
-    }
-}
diff --git a/spotify-web-api-js/tsconfig.json b/spotify-web-api-js/tsconfig.json
new file mode 100644
index 0000000000..55af12c458
--- /dev/null
+++ b/spotify-web-api-js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "spotify-web-api-js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sprintf-js/sprintf-js.d.ts b/sprintf-js/index.d.ts
similarity index 100%
rename from sprintf-js/sprintf-js.d.ts
rename to sprintf-js/index.d.ts
diff --git a/sprintf-js/sprintf-tests.ts b/sprintf-js/sprintf-tests.ts
index ba48ccab79..8119f6d45a 100644
--- a/sprintf-js/sprintf-tests.ts
+++ b/sprintf-js/sprintf-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="sprintf-js.d.ts" />
+
 
 import sprintf = require('sprintf-js');
 
diff --git a/sprintf-js/tsconfig.json b/sprintf-js/tsconfig.json
new file mode 100644
index 0000000000..6209b2b8b8
--- /dev/null
+++ b/sprintf-js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sprintf-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sprintf/index.d.ts b/sprintf/index.d.ts
new file mode 100644
index 0000000000..018a1a33b1
--- /dev/null
+++ b/sprintf/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for sprintff
+// Project: https://github.com/maritz/node-sprintff
+// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/sprintff.d.ts
+
+
+export declare function sprintf(fmt: string, ...args: any[]): string;
+export declare function vsprintf(fmt: string, args: any[]): string;
diff --git a/sprintf/sprintf-tests.ts b/sprintf/sprintf-tests.ts
index 563fbebdd9..3dca1f4f02 100644
--- a/sprintf/sprintf-tests.ts
+++ b/sprintf/sprintf-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="sprintf.d.ts" />
 
 import sprintf = require('sprintf');
 
diff --git a/sprintf/sprintf.d.ts b/sprintf/sprintf.d.ts
deleted file mode 100644
index 04f3fc48da..0000000000
--- a/sprintf/sprintf.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Type definitions for sprintff
-// Project: https://github.com/maritz/node-sprintff
-// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/sprintff.d.ts
-
-declare module "sprintf" {
-	export function sprintf(fmt: string, ...args: any[]): string;
-	export function vsprintf(fmt: string, args: any[]): string;
-}
diff --git a/sprintf/tsconfig.json b/sprintf/tsconfig.json
new file mode 100644
index 0000000000..6209b2b8b8
--- /dev/null
+++ b/sprintf/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sprintf-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sql.js/index.d.ts b/sql.js/index.d.ts
new file mode 100644
index 0000000000..d3a20aced0
--- /dev/null
+++ b/sql.js/index.d.ts
@@ -0,0 +1,63 @@
+// Type definitions for sql.js
+// Project: https://github.com/kripken/sql.js
+// Definitions by: George Wu <https://github.com/Hozuki/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare class Database {
+    constructor(data: Buffer);
+    constructor(data: Uint8Array);
+    constructor(data: number[]);
+
+    run(sql: string): Database;
+    run(sql: string, params: { [key: string]: number | string | Uint8Array }): Database;
+    run(sql: string, params: (number | string | Uint8Array)[]): Database;
+
+    exec(sql: string): QueryResults[];
+
+    each(sql: string, callback: (obj: { [columnName: string]: number | string | Uint8Array }) => void, done: () => void): void;
+    each(sql: string, params: { [key: string]: number | string | Uint8Array }, callback: (obj: { [columnName: string]: number | string | Uint8Array }) => void, done: () => void): void;
+    each(sql: string, params: (number | string | Uint8Array)[], callback: (obj: { [columnName: string]: number | string | Uint8Array }) => void, done: () => void): void;
+
+    prepare(sql: string): Statement;
+    prepare(sql: string, params: { [key: string]: number | string | Uint8Array }): Statement;
+    prepare(sql: string, params: (number | string | Uint8Array)[]): Statement;
+
+    export(): Uint8Array;
+
+    close(): void;
+}
+
+declare class Statement {
+    bind(): boolean;
+    bind(values: { [key: string]: number | string | Uint8Array }): boolean;
+    bind(values: (number | string | Uint8Array)[]): boolean;
+
+    step(): boolean;
+
+    get(): (number | string | Uint8Array)[];
+    get(params: { [key: string]: number | string | Uint8Array }): (number | string | Uint8Array)[];
+    get(params: (number | string | Uint8Array)[]): (number | string | Uint8Array)[];
+
+    getColumnNames(): string[];
+
+    getAsObject(): { [columnName: string]: number | string | Uint8Array };
+    getAsObject(params: { [key: string]: number | string | Uint8Array }): { [columnName: string]: number | string | Uint8Array };
+    getAsObject(params: (number | string | Uint8Array)[]): { [columnName: string]: number | string | Uint8Array };
+
+    run(): void;
+    run(values: { [key: string]: number | string | Uint8Array }): void;
+    run(values: (number | string | Uint8Array)[]): void;
+
+    reset(): void;
+
+    freemem(): void;
+
+    free(): boolean;
+}
+
+interface QueryResults {
+    columns: string[];
+    values: (number | string | Uint8Array)[][];
+}
diff --git a/sql.js/sql.js-tests.ts b/sql.js/sql.js-tests.ts
index 40fceb8fbd..1ee45cba21 100644
--- a/sql.js/sql.js-tests.ts
+++ b/sql.js/sql.js-tests.ts
@@ -1,8 +1,7 @@
-/// <reference path="../node/node.d.ts" />
-/// <reference path="sql.js.d.ts" />
+/// <reference types="node" />
+
 
 import fs = require("fs");
-import SQL = require("sql.js");
 
 var DB_PATH = "data.db";
 
@@ -14,7 +13,7 @@ function createFile(path: string): void {
 // Open the database file. If it does not exist, create a blank database in memory.
 var databaseData: Buffer;
 databaseData = fs.existsSync(DB_PATH) ? fs.readFileSync(DB_PATH) : null;
-var db = new SQL.Database(databaseData);
+var db = new Database(databaseData);
 
 // Create a new table 'test_table' in the database in memory.
 var createTableStatement =
diff --git a/sql.js/sql.js.d.ts b/sql.js/sql.js.d.ts
deleted file mode 100644
index 67f0a183c2..0000000000
--- a/sql.js/sql.js.d.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-// Type definitions for sql.js
-// Project: https://github.com/kripken/sql.js
-// Definitions by: George Wu <https://github.com/Hozuki/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "sql.js" {
-
-    class Database {
-        constructor(data: Buffer);
-        constructor(data: Uint8Array);
-        constructor(data: number[]);
-
-        run(sql: string): Database;
-        run(sql: string, params: { [key: string]: number | string | Uint8Array }): Database;
-        run(sql: string, params: (number | string | Uint8Array)[]): Database;
-
-        exec(sql: string): QueryResults[];
-
-        each(sql: string, callback: (obj: { [columnName: string]: number | string | Uint8Array }) => void, done: () => void): void;
-        each(sql: string, params: { [key: string]: number | string | Uint8Array }, callback: (obj: { [columnName: string]: number | string | Uint8Array }) => void, done: () => void): void;
-        each(sql: string, params: (number | string | Uint8Array)[], callback: (obj: { [columnName: string]: number | string | Uint8Array }) => void, done: () => void): void;
-
-        prepare(sql: string): Statement;
-        prepare(sql: string, params: { [key: string]: number | string | Uint8Array }): Statement;
-        prepare(sql: string, params: (number | string | Uint8Array)[]): Statement;
-
-        export(): Uint8Array;
-
-        close(): void;
-    }
-
-    class Statement {
-        bind(): boolean;
-        bind(values: { [key: string]: number | string | Uint8Array }): boolean;
-        bind(values: (number | string | Uint8Array)[]): boolean;
-
-        step(): boolean;
-
-        get(): (number | string | Uint8Array)[];
-        get(params: { [key: string]: number | string | Uint8Array }): (number | string | Uint8Array)[];
-        get(params: (number | string | Uint8Array)[]): (number | string | Uint8Array)[];
-
-        getColumnNames(): string[];
-
-        getAsObject(): { [columnName: string]: number | string | Uint8Array };
-        getAsObject(params: { [key: string]: number | string | Uint8Array }): { [columnName: string]: number | string | Uint8Array };
-        getAsObject(params: (number | string | Uint8Array)[]): { [columnName: string]: number | string | Uint8Array };
-
-        run(): void;
-        run(values: { [key: string]: number | string | Uint8Array }): void;
-        run(values: (number | string | Uint8Array)[]): void;
-
-        reset(): void;
-
-        freemem(): void;
-
-        free(): boolean;
-    }
-
-    interface QueryResults {
-        columns: string[];
-        values: (number | string | Uint8Array)[][];
-    }
-
-}
diff --git a/sql.js/tsconfig.json b/sql.js/tsconfig.json
new file mode 100644
index 0000000000..4ec1e14042
--- /dev/null
+++ b/sql.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sql.js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sqlite3/index.d.ts b/sqlite3/index.d.ts
new file mode 100644
index 0000000000..ad591ea8b2
--- /dev/null
+++ b/sqlite3/index.d.ts
@@ -0,0 +1,80 @@
+// Type definitions for sqlite3 2.2.3
+// Project: https://github.com/mapbox/node-sqlite3
+// Definitions by: Nick Malaguti <https://github.com/nmalaguti/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import events = require("events");
+
+export declare var OPEN_READONLY: number;
+export declare var OPEN_READWRITE: number;
+export declare var OPEN_CREATE: number;
+
+export declare var cached: {
+    Database(filename: string, callback?: (err: Error) => void): Database;
+    Database(filename: string, mode?: number, callback?: (err: Error) => void): Database;
+};
+
+export interface RunResult {
+    lastID: number;
+    changes: number;
+}
+
+export declare class Statement {
+    public bind(callback?: (err: Error) => void): Statement;
+    public bind(...params: any[]): Statement;
+
+    public reset(callback?: (err: Error) => void): Statement;
+
+    public finalize(callback?: (err: Error) => void): Statement;
+
+    public run(callback?: (err: Error) => void): Statement;
+    public run(...params: any[]): Statement;
+
+    public get(callback?: (err: Error, row: any) => void): Statement;
+    public get(...params: any[]): Statement;
+
+    public all(callback?: (err: Error, rows: any[]) => void): Statement;
+    public all(...params: any[]): Statement;
+
+    public each(callback?: (err: Error, row: any) => void, complete?: (err: Error, count: number) => void): Statement;
+    public each(...params: any[]): Statement;
+}
+
+export declare class Database extends events.EventEmitter {
+    constructor(filename: string, callback?: (err: Error) => void);
+    constructor(filename: string, mode?: number, callback?: (err: Error) => void);
+
+    public close(callback?: (err: Error) => void): void;
+
+    public run(sql: string, callback?: (err: Error) => void): Database;
+    public run(sql: string, ...params: any[]): Database;
+
+    public get(sql: string, callback?: (err: Error, row: any) => void): Database;
+    public get(sql: string, ...params: any[]): Database;
+
+    public all(sql: string, callback?: (err: Error, rows: any[]) => void): Database;
+    public all(sql: string, ...params: any[]): Database;
+
+    public each(sql: string, callback?: (err: Error, row: any) => void, complete?: (err: Error, count: number) => void): Database;
+    public each(sql: string, ...params: any[]): Database;
+
+    public exec(sql: string, callback?: (err: Error) => void): Database;
+
+    public prepare(sql: string, callback?: (err: Error) => void): Statement;
+    public prepare(sql: string, ...params: any[]): Statement;
+
+    public serialize(callback?: () => void): void;
+    public parallelize(callback?: () => void): void;
+
+    public on(event: "trace", listener: (sql: string) => void): this;
+    public on(event: "profile", listener: (sql: string, time: number) => void): this;
+    public on(event: "error", listener: (err: Error) => void): this;
+    public on(event: "open", listener: () => void): this;
+    public on(event: "close", listener: () => void): this;
+    public on(event: string, listener: Function): this;
+}
+
+declare function verbose(): void;
diff --git a/sqlite3/sqlite3-tests.ts b/sqlite3/sqlite3-tests.ts
index 7059a439af..1a38a05d2c 100644
--- a/sqlite3/sqlite3-tests.ts
+++ b/sqlite3/sqlite3-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="sqlite3.d.ts" />
 
 import sqlite3 = require('sqlite3');
 sqlite3.verbose();
diff --git a/sqlite3/sqlite3.d.ts b/sqlite3/sqlite3.d.ts
deleted file mode 100644
index dbc205cc0e..0000000000
--- a/sqlite3/sqlite3.d.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-// Type definitions for sqlite3 2.2.3
-// Project: https://github.com/mapbox/node-sqlite3
-// Definitions by: Nick Malaguti <https://github.com/nmalaguti/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "sqlite3" {
-    import events = require("events");
-    
-    export var OPEN_READONLY: number;
-    export var OPEN_READWRITE: number;
-    export var OPEN_CREATE: number;
-    
-    export var cached: {
-        Database(filename: string, callback?: (err: Error) => void): Database;
-        Database(filename: string, mode?: number, callback?: (err: Error) => void): Database;
-    };
-    
-    export interface RunResult {
-        lastID: number;
-        changes: number;
-    }
-    
-    export class Statement {
-        public bind(callback?: (err: Error) => void): Statement;
-        public bind(...params: any[]): Statement;
-        
-        public reset(callback?: (err: Error) => void): Statement;
-        
-        public finalize(callback?: (err: Error) => void): Statement;
-        
-        public run(callback?: (err: Error) => void): Statement;
-        public run(...params: any[]): Statement;
-        
-        public get(callback?: (err: Error, row: any) => void): Statement;
-        public get(...params: any[]): Statement;
-        
-        public all(callback?: (err: Error, rows: any[]) => void): Statement;
-        public all(...params: any[]): Statement;
-        
-        public each(callback?: (err: Error, row: any) => void, complete?: (err: Error, count: number) => void): Statement;
-        public each(...params: any[]): Statement;
-    }
-    
-    export class Database extends events.EventEmitter {
-        constructor(filename: string, callback?: (err: Error) => void);
-        constructor(filename: string, mode?: number, callback?: (err: Error) => void);
-        
-        public close(callback?: (err: Error) => void): void;
-        
-        public run(sql: string, callback?: (err: Error) => void): Database;
-        public run(sql: string, ...params: any[]): Database;
-        
-        public get(sql: string, callback?: (err: Error, row: any) => void): Database;
-        public get(sql: string, ...params: any[]): Database;
-        
-        public all(sql: string, callback?: (err: Error, rows: any[]) => void): Database;
-        public all(sql: string, ...params: any[]): Database;
-        
-        public each(sql: string, callback?: (err: Error, row: any) => void, complete?: (err: Error, count: number) => void): Database;
-        public each(sql: string, ...params: any[]): Database;
-        
-        public exec(sql: string, callback?: (err: Error) => void): Database;
-        
-        public prepare(sql: string, callback?: (err: Error) => void): Statement;
-        public prepare(sql: string, ...params: any[]): Statement;
-        
-        public serialize(callback?: () => void): void;
-        public parallelize(callback?: () => void): void;
-
-        public on(event: "trace", listener: (sql: string) => void): this;
-        public on(event: "profile", listener: (sql: string, time: number) => void): this;
-        public on(event: "error", listener: (err: Error) => void): this;
-        public on(event: "open", listener: () => void): this;
-        public on(event: "close", listener: () => void): this;
-        public on(event: string, listener: Function): this;
-    }
-    
-    function verbose(): void;
-}
diff --git a/sqlite3/tsconfig.json b/sqlite3/tsconfig.json
new file mode 100644
index 0000000000..ebef01b0a1
--- /dev/null
+++ b/sqlite3/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sqlite3-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/squirejs/index.d.ts b/squirejs/index.d.ts
new file mode 100644
index 0000000000..d9037cf8cb
--- /dev/null
+++ b/squirejs/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for Squire 0.2.1
+// Project: https://github.com/iammerrick/Squire.js
+// Definitions by: Bradley Ayers <https://github.com/bradleyayers>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare class Squire {
+    constructor();
+    constructor(context: string);
+    mock(name: string, mock: any): Squire;
+    mock(mocks: { [name: string]: any }): Squire;
+    require(dependencies: string[], callback: Function, errback?: Function): Squire;
+    store(name: string | string[]): Squire;
+    clean(): Squire;
+    clean(name: string | string[]): Squire;
+    remove(): String;
+    run(dependencies: string[], test: Function): (done: Function) => void;
+}
+
+declare namespace Squire {
+    namespace Helpers {
+        export function returns<T>(what: T): () => T;
+        export function constructs<T>(what: T): () => (() => T);
+    }
+}
+
+export = Squire;
diff --git a/squirejs/squirejs-tests.ts b/squirejs/squirejs-tests.ts
index fc1701fbf6..92f56b9333 100644
--- a/squirejs/squirejs-tests.ts
+++ b/squirejs/squirejs-tests.ts
@@ -1,6 +1,5 @@
-/// <reference path="squirejs.d.ts" />
 
-import Squire = require('Squire');
+import Squire = require('squirejs');
 
 // Default Configuration
 var injector = new Squire();
diff --git a/squirejs/squirejs.d.ts b/squirejs/squirejs.d.ts
deleted file mode 100644
index 081d262d8b..0000000000
--- a/squirejs/squirejs.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Type definitions for Squire 0.2.1
-// Project: https://github.com/iammerrick/Squire.js
-// Definitions by: Bradley Ayers <https://github.com/bradleyayers>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'Squire' {
-    class Squire {
-        constructor();
-        constructor(context: string);
-        mock(name: string, mock: any): Squire;
-        mock(mocks: {[name: string]: any}): Squire;
-        require(dependencies: string[], callback: Function, errback?: Function): Squire;
-        store(name: string | string[]): Squire;
-        clean(): Squire;
-        clean(name: string | string[]): Squire;
-        remove(): String;
-        run(dependencies: string[], test: Function): (done: Function) => void;
-    }
-
-    namespace Squire {
-        namespace Helpers {
-            export function returns<T>(what: T): () => T;
-            export function constructs<T>(what: T): () => (() => T);
-        }
-    }
-
-    export = Squire;
-}
diff --git a/squirejs/tsconfig.json b/squirejs/tsconfig.json
new file mode 100644
index 0000000000..f9c9cc29c6
--- /dev/null
+++ b/squirejs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "squirejs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/srp/index.d.ts b/srp/index.d.ts
new file mode 100644
index 0000000000..f13add89ff
--- /dev/null
+++ b/srp/index.d.ts
@@ -0,0 +1,73 @@
+// Type definitions for node-srp
+// Project: https://github.com/mozilla/node-srp
+// Definitions by: Pat Smuk <https://github.com/Patman64>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="bignum" />
+/// <reference types="node" />
+
+export = SRP;
+
+declare namespace SRP {
+    export interface Params {
+        N_length_bits: number;
+        N: BigNum;
+        g: BigNum;
+        hash: string;
+    }
+    
+    export var params: {
+        [bits: string]: Params;
+    };
+    
+    /**
+     * The verifier is calculated as described in Section 3 of [SRP-RFC].
+     * We give the algorithm here for convenience.
+     *
+     * The verifier (v) is computed based on the salt (s), user name (I),
+     * password (P), and group parameters (N, g).
+     *
+     *         x = H(s | H(I | ":" | P))
+     *         v = g^x % N
+     *
+     * @param {Params} params group parameters, with .N, .g, .hash
+     * @param {Buffer} salt salt
+     * @param {Buffer} I user identity
+     * @param {Buffer} P user password
+     * 
+     * @returns {Buffer}
+     */
+    export function computeVerifier(params: Params, salt: Buffer, I: Buffer, P: Buffer): Buffer;
+    
+    /**
+     * Generate a random key.
+     *
+     * @param {number} bytes length of key (default=32)
+     * @param {function} callback function to call with err,key
+     */
+    export function genKey(bytes: number, callback: (error: Error, key: Buffer) => void): void;
+    
+    /**
+     * Generate a random 32-byte key.
+     *
+     * @param {function} callback function to call with err,key
+     */
+    export function genKey(callback: (error: Error, key: Buffer) => void): void;
+    
+    export class Client {
+        constructor(params: Params, salt: Buffer, identity: Buffer, password: Buffer, secret1: Buffer);
+        computeA(): Buffer;
+        setB(B: Buffer): void;
+        computeM1(): Buffer;
+        checkM2(M2: Buffer): void;
+        computeK(): Buffer;
+    }
+    
+    export class Server {
+        constructor(params: Params, verifier: Buffer, secret2: Buffer);
+        computeB(): Buffer;
+        setA(A: Buffer): void;
+        checkM1(M1: Buffer): Buffer;
+        computeK(): Buffer;
+    }
+}
\ No newline at end of file
diff --git a/srp/srp-tests.ts b/srp/srp-tests.ts
index 002a652d33..6032b21178 100644
--- a/srp/srp-tests.ts
+++ b/srp/srp-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="srp.d.ts" />
+
 
 var srp = require('srp');
 
diff --git a/srp/srp.d.ts b/srp/srp.d.ts
deleted file mode 100644
index 040c1ace69..0000000000
--- a/srp/srp.d.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-// Type definitions for node-srp
-// Project: https://github.com/mozilla/node-srp
-// Definitions by: Pat Smuk <https://github.com/Patman64>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../bignum/bignum.d.ts" />
-/// <reference path="../node/node.d.ts" />
-
-declare namespace SRP {
-    export interface Params {
-        N_length_bits: number;
-        N: BigNum;
-        g: BigNum;
-        hash: string;
-    }
-    
-    export var params: {
-        [bits: string]: Params;
-    };
-    
-    /**
-     * The verifier is calculated as described in Section 3 of [SRP-RFC].
-     * We give the algorithm here for convenience.
-     *
-     * The verifier (v) is computed based on the salt (s), user name (I),
-     * password (P), and group parameters (N, g).
-     *
-     *         x = H(s | H(I | ":" | P))
-     *         v = g^x % N
-     *
-     * @param {Params} params group parameters, with .N, .g, .hash
-     * @param {Buffer} salt salt
-     * @param {Buffer} I user identity
-     * @param {Buffer} P user password
-     * 
-     * @returns {Buffer}
-     */
-    export function computeVerifier(params: Params, salt: Buffer, I: Buffer, P: Buffer): Buffer;
-    
-    /**
-     * Generate a random key.
-     *
-     * @param {number} bytes length of key (default=32)
-     * @param {function} callback function to call with err,key
-     */
-    export function genKey(bytes: number, callback: (error: Error, key: Buffer) => void): void;
-    
-    /**
-     * Generate a random 32-byte key.
-     *
-     * @param {function} callback function to call with err,key
-     */
-    export function genKey(callback: (error: Error, key: Buffer) => void): void;
-    
-    export class Client {
-        constructor(params: Params, salt: Buffer, identity: Buffer, password: Buffer, secret1: Buffer);
-        computeA(): Buffer;
-        setB(B: Buffer): void;
-        computeM1(): Buffer;
-        checkM2(M2: Buffer): void;
-        computeK(): Buffer;
-    }
-    
-    export class Server {
-        constructor(params: Params, verifier: Buffer, secret2: Buffer);
-        computeB(): Buffer;
-        setA(A: Buffer): void;
-        checkM1(M1: Buffer): Buffer;
-        computeK(): Buffer;
-    }
-}
-
-declare module "srp" {
-    export = SRP;
-}
diff --git a/srp/tsconfig.json b/srp/tsconfig.json
new file mode 100644
index 0000000000..d94dd6eb91
--- /dev/null
+++ b/srp/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "srp-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ss-utils/index.d.ts b/ss-utils/index.d.ts
new file mode 100644
index 0000000000..a842b4ca45
--- /dev/null
+++ b/ss-utils/index.d.ts
@@ -0,0 +1,172 @@
+// Type definitions for ServiceStack Utils v0.0.1
+// Project: https://servicestack.net/
+// Definitions by: Demis Bellot <https://github.com/mythz/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace ssutils {
+
+    interface Static {
+        handlers: { [index: string]: Function };
+        onSubmitDisable: string;
+        validation: Validation;
+        clearAdjacentError: () => void;
+        todate: (s: string) => Date;
+        todfmt: (s: string) => string;
+        dfmt: (d: Date) => string;
+        dfmthm: (d: Date) => string;
+        tfmt12: (d: Date) => string;
+        splitOnFirst: (s: string, delimiter:string) => string[];
+        splitOnLast: (s: string, delimiter: string) => string[];
+        getSelection: () => string;
+        combinePaths: (...paths:string[]) => string;
+        queryString: (url: string) => { [index: string]: string };
+        createPath: (route: string, args: any) => string;
+        createUrl: (route: string, args: any) => string;
+        humanize: (s: string) => string;
+        normalizeKey: (key: string) => string;
+        normalize: (dto: any, deep?:boolean) => any;
+        parseResponseStatus: (json: string, defaultMsg?: string) => any;
+        postJSON: (url: string, data: Object | String, success?: Function, error?: Function) => any;
+
+        listenOn: string;
+        eventReceivers: any;
+        eventChannels: string[];
+        eventSourceUrl: string;
+        updateSubscriberUrl: string;
+        updateChannels: (channels: string[]) => void;
+        updateSubscriber: (data: UpdateSubscriberOptions, cb?: (user: SSEUpdate) => void, cbError?: Function) => any;
+        subscribeToChannels: (channels: string[], cb?: (user: SSEUpdate) => void, cbError?: Function) => any;
+        unsubscribeFromChannels: (channels: string[], cb?: (user: SSEUpdate) => void, cbError?: Function) => any;
+        reconnectServerEvents: (opt: ReconnectServerEventsOptions) => any;
+    }
+
+    interface Validation {
+        overrideMessages: boolean;
+        messages: { [index: string]: string };
+        errorFilter: (errorMsg: string, errorCode: string, type: string) => void;
+    }
+
+    interface ValidationOptional {
+        overrideMessages?: boolean;
+        messages?: { [index: string]: string };
+        errorFilter?: (errorMsg: string, errorCode: string, type: string) => void;
+    }
+
+    interface ApplyErrorsOptions extends ValidationOptional {
+    }
+
+    interface BindFormOptions {
+        validation?: ValidationOptional;
+        validate?: (form: HTMLFormElement) => boolean;
+        onSubmitDisable?: string;
+        complete?: (...args: any[]) => void;
+        error?: (...args: any[]) => void;
+    }
+
+    interface HandleServerEventsOptions {
+        handlers?: { [index: string]: Function };
+        validate?: (op?: string, target?: string, msg?: string, json?: string) => boolean;
+        heartbeatUrl?: string;
+        heartbeatIntervalMs?: number;
+        unRegisterUrl?: string;
+        receivers?: { [index: string]: any };
+        success?: (selector: string, msg: string, e: any) => void;
+    }
+
+    interface UpdateSubscriberOptions {
+        SubscribeChannels?: string;
+        UnsubscribeChannels?: string;
+    }
+
+    interface ResponseStatus {
+        errorCode: string;
+        message: string;
+        stackTrace: string;
+        errors: ResponseError[];
+    }
+    interface ResponseError {
+        errorCode: string;
+        fieldName: string;
+        message: string;
+    }
+
+    interface SSECommand {
+        userId: string;
+        displayName: string;
+        channels: string;
+        profileUrl: string;
+    }
+
+    interface SSEHeartbeat extends SSECommand { }
+    interface SSEJoin extends SSECommand { }
+    interface SSELeave extends SSECommand { }
+    interface SSEUpdate extends SSECommand { }
+
+    interface SSEConnect extends SSECommand {
+        id: string;
+        unRegisterUrl: string;
+        heartbeatUrl: string;
+        updateSubscriberUrl: string;
+        heartbeatIntervalMs: number;
+        idleTimeoutMs: number;
+    }
+
+    interface ReconnectServerEventsOptions {
+        url?: string;
+        onerror?: (...args: any[]) => void;
+        onmessage?: (...args: any[]) => void;
+        errorArgs?: any[];
+    }
+
+    /**
+     * EventSource
+     */
+    enum ReadyState { CONNECTING = 0, OPEN = 1, CLOSED = 2 }
+
+    interface IEventSourceStatic extends EventTarget {
+        new (url: string, eventSourceInitDict?: IEventSourceInit): IEventSourceStatic;
+        url: string;
+        withCredentials: boolean;
+        CONNECTING: ReadyState; // constant, always 0
+        OPEN: ReadyState; // constant, always 1
+        CLOSED: ReadyState; // constant, always 2
+        readyState: ReadyState;
+        onopen: Function;
+        onmessage: (event: IOnMessageEvent) => void;
+        onerror: Function;
+        close: () => void;
+    }
+
+    interface IEventSourceInit {
+        withCredentials?: boolean;
+    }
+
+    interface IOnMessageEvent {
+        data: string;
+    }
+}
+
+//Needs to be declared locally
+//declare var EventSource: ssutils.IEventSourceStatic;
+
+interface JQuery {
+    setFieldError: (name: string, msg: string) => void;
+    serializeMap: () => { [index: string]: any };
+    applyErrors: (status: ssutils.ResponseStatus, opt?: ssutils.ApplyErrorsOptions) => JQuery;
+    clearErrors: () => JQuery;
+    bindForm: (opt?: ssutils.ApplyErrorsOptions) => JQuery;
+    applyValues: (values: { [index: string]: string }) => JQuery;
+    bindHandlers: (handlers: { [index: string]: Function }) => JQuery;
+    setActiveLinks: () => JQuery;
+    handleServerEvents: (opt?: ssutils.HandleServerEventsOptions) => void;
+}
+
+interface JQueryStatic {
+    ss: ssutils.Static;
+}
+
+declare module "ss-utils" {
+    export = ssutils;
+}
diff --git a/ss-utils/ss-utils-tests.ts b/ss-utils/ss-utils-tests.ts
index 0282aef211..71934fed54 100644
--- a/ss-utils/ss-utils-tests.ts
+++ b/ss-utils/ss-utils-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="ss-utils.d.ts" />
+/// <reference types="jquery" />
+
 
 declare var EventSource : ssutils.IEventSourceStatic;
 
diff --git a/ss-utils/ss-utils.d.ts b/ss-utils/ss-utils.d.ts
deleted file mode 100644
index d86f227c7f..0000000000
--- a/ss-utils/ss-utils.d.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-// Type definitions for ServiceStack Utils v0.0.1
-// Project: https://servicestack.net/
-// Definitions by: Demis Bellot <https://github.com/mythz/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace ssutils {
-
-    interface Static {
-        handlers: { [index: string]: Function };
-        onSubmitDisable: string;
-        validation: Validation;
-        clearAdjacentError: () => void;
-        todate: (s: string) => Date;
-        todfmt: (s: string) => string;
-        dfmt: (d: Date) => string;
-        dfmthm: (d: Date) => string;
-        tfmt12: (d: Date) => string;
-        splitOnFirst: (s: string, delimiter:string) => string[];
-        splitOnLast: (s: string, delimiter: string) => string[];
-        getSelection: () => string;
-        combinePaths: (...paths:string[]) => string;
-        queryString: (url: string) => { [index: string]: string };
-        createPath: (route: string, args: any) => string;
-        createUrl: (route: string, args: any) => string;
-        humanize: (s: string) => string;
-        normalizeKey: (key: string) => string;
-        normalize: (dto: any, deep?:boolean) => any;
-        parseResponseStatus: (json: string, defaultMsg?: string) => any;
-        postJSON: (url: string, data: Object | String, success?: Function, error?: Function) => any;
-
-        listenOn: string;
-        eventReceivers: any;
-        eventChannels: string[];
-        eventSourceUrl: string;
-        updateSubscriberUrl: string;
-        updateChannels: (channels: string[]) => void;
-        updateSubscriber: (data: UpdateSubscriberOptions, cb?: (user: SSEUpdate) => void, cbError?: Function) => any;
-        subscribeToChannels: (channels: string[], cb?: (user: SSEUpdate) => void, cbError?: Function) => any;
-        unsubscribeFromChannels: (channels: string[], cb?: (user: SSEUpdate) => void, cbError?: Function) => any;
-        reconnectServerEvents: (opt: ReconnectServerEventsOptions) => any;
-    }
-
-    interface Validation {
-        overrideMessages: boolean;
-        messages: { [index: string]: string };
-        errorFilter: (errorMsg: string, errorCode: string, type: string) => void;
-    }
-
-    interface ValidationOptional {
-        overrideMessages?: boolean;
-        messages?: { [index: string]: string };
-        errorFilter?: (errorMsg: string, errorCode: string, type: string) => void;
-    }
-
-    interface ApplyErrorsOptions extends ValidationOptional {
-    }
-
-    interface BindFormOptions {
-        validation?: ValidationOptional;
-        validate?: (form: HTMLFormElement) => boolean;
-        onSubmitDisable?: string;
-        complete?: (...args: any[]) => void;
-        error?: (...args: any[]) => void;
-    }
-
-    interface HandleServerEventsOptions {
-        handlers?: { [index: string]: Function };
-        validate?: (op?: string, target?: string, msg?: string, json?: string) => boolean;
-        heartbeatUrl?: string;
-        heartbeatIntervalMs?: number;
-        unRegisterUrl?: string;
-        receivers?: { [index: string]: any };
-        success?: (selector: string, msg: string, e: any) => void;
-    }
-
-    interface UpdateSubscriberOptions {
-        SubscribeChannels?: string;
-        UnsubscribeChannels?: string;
-    }
-
-    interface ResponseStatus {
-        errorCode: string;
-        message: string;
-        stackTrace: string;
-        errors: ResponseError[];
-    }
-    interface ResponseError {
-        errorCode: string;
-        fieldName: string;
-        message: string;
-    }
-
-    interface SSECommand {
-        userId: string;
-        displayName: string;
-        channels: string;
-        profileUrl: string;
-    }
-
-    interface SSEHeartbeat extends SSECommand { }
-    interface SSEJoin extends SSECommand { }
-    interface SSELeave extends SSECommand { }
-    interface SSEUpdate extends SSECommand { }
-
-    interface SSEConnect extends SSECommand {
-        id: string;
-        unRegisterUrl: string;
-        heartbeatUrl: string;
-        updateSubscriberUrl: string;
-        heartbeatIntervalMs: number;
-        idleTimeoutMs: number;
-    }
-
-    interface ReconnectServerEventsOptions {
-        url?: string;
-        onerror?: (...args: any[]) => void;
-        onmessage?: (...args: any[]) => void;
-        errorArgs?: any[];
-    }
-
-    /**
-     * EventSource
-     */
-    enum ReadyState { CONNECTING = 0, OPEN = 1, CLOSED = 2 }
-
-    interface IEventSourceStatic extends EventTarget {
-        new (url: string, eventSourceInitDict?: IEventSourceInit): IEventSourceStatic;
-        url: string;
-        withCredentials: boolean;
-        CONNECTING: ReadyState; // constant, always 0
-        OPEN: ReadyState; // constant, always 1
-        CLOSED: ReadyState; // constant, always 2
-        readyState: ReadyState;
-        onopen: Function;
-        onmessage: (event: IOnMessageEvent) => void;
-        onerror: Function;
-        close: () => void;
-    }
-
-    interface IEventSourceInit {
-        withCredentials?: boolean;
-    }
-
-    interface IOnMessageEvent {
-        data: string;
-    }
-}
-
-//Needs to be declared locally
-//declare var EventSource: ssutils.IEventSourceStatic;
-
-interface JQuery {
-    setFieldError: (name: string, msg: string) => void;
-    serializeMap: () => { [index: string]: any };
-    applyErrors: (status: ssutils.ResponseStatus, opt?: ssutils.ApplyErrorsOptions) => JQuery;
-    clearErrors: () => JQuery;
-    bindForm: (opt?: ssutils.ApplyErrorsOptions) => JQuery;
-    applyValues: (values: { [index: string]: string }) => JQuery;
-    bindHandlers: (handlers: { [index: string]: Function }) => JQuery;
-    setActiveLinks: () => JQuery;
-    handleServerEvents: (opt?: ssutils.HandleServerEventsOptions) => void;
-}
-
-interface JQueryStatic {
-    ss: ssutils.Static;
-}
-
-declare module "ss-utils" {
-    export = ssutils;
-}
diff --git a/ss-utils/tsconfig.json b/ss-utils/tsconfig.json
new file mode 100644
index 0000000000..7d1f28d39a
--- /dev/null
+++ b/ss-utils/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ss-utils-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ssh2/index.d.ts b/ssh2/index.d.ts
new file mode 100644
index 0000000000..de9705bea4
--- /dev/null
+++ b/ssh2/index.d.ts
@@ -0,0 +1,428 @@
+// Type definitions for ssh2
+// Project: https://github.com/mscdex/ssh2
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import stream = require('stream');
+
+declare namespace ssh2 {
+    interface Client extends NodeJS.EventEmitter {
+        Server: ServerStatic;
+        new (): Client;
+        /**
+         * SFTPStream.STATUS_CODE from ssh2-streams.
+         */
+        SFTP_STATUS_CODE: Sftp.StatusCode;
+        /**
+         * SFTPStream.OPEN_MODE from ssh2-streams.
+         */
+        SFTP_OPEN_MODE: Sftp.OpenMode;
+        //TODO: Type ssh2-streams
+        /**
+         * utility methods from ssh2-streams.
+         */
+        utils: Utils;
+
+        connect(config: ConnectConfig): void;
+        end(): void;
+        destroy(): void;
+        exec(command: string, options: ExecOption, callback: ChannelCallback): boolean;
+        exec(command: string, callback: ChannelCallback): boolean;
+        shell(window: boolean | PseudoTtySettings, options: boolean | number | X11Settings, callback: ChannelCallback): boolean;
+        shell(window: boolean | PseudoTtySettings, callback: ChannelCallback): boolean;
+        shell(callback: ChannelCallback): boolean;
+        subsys(subsystem: string, callback: ChannelCallback): boolean;
+        sftp(callback: SftpCallback): boolean;
+        forwardIn(bindAddr: string, bindPort: number, callback?: ForwardInCallback): boolean;
+        unforwardIn(bindAddr: string, bindPort: number, callback?: ErrorCallback): boolean;
+        forwardOut(srcIP: string, srcPort: number, dstIP: string, dstPort: number, callback: ChannelCallback): boolean;
+        openssh_noMoreSessions(callback?: ErrorCallback): boolean;
+        openssh_forwardInStreamLocal(socketPath: string, callback?: ErrorCallback): boolean;
+        openssh_unforwardInStreamLocal(socketPath: string, callback?: ErrorCallback): boolean;
+        openssh_forwardOutStreamLocal(socketPath: string, callback?: ChannelCallback): boolean;
+    }
+
+    interface ConnectConfig {
+        /**
+         * @description Hostname or IP address of the server.
+         * @default 'localhost'
+         */
+        host?: string;
+        /**
+         * @description Port number of the server.
+         * @default 22
+         */
+        port?: number;
+        /**
+         * @description Only connect via resolved IPv4 address for `host`.
+         * @default false
+         */
+        forceIPv4?: boolean;
+        /**
+         * @description Only connect via resolved IPv6 address for `host`.
+         * @default false
+         */
+        forceIPv6?: boolean;
+        /**
+         * @description 'md5' or 'sha1'. The host's key is hashed using this method and passed to the **hostVerifier** function.
+         * @default (none)
+         */
+        hostHash?: string;
+        /**
+         * @description Function that is passed a string hex hash of the host's key for verification purposes.
+         * Return `true` to continue with the handshake or `false` to reject and disconnect.
+         */
+        hostVerifier?: (keyHash: string) => boolean;
+        /**
+         * @description Username for authentication.
+         */
+        username?: string;
+        /**
+         * @description Password for password-based user authentication.
+         */
+        password?: string;
+        /**
+         * @description Path to ssh-agent's UNIX socket for ssh-agent-based user authentication.
+         * Windows users: set to 'pageant' for authenticating with Pageant or (actual) path to a cygwin "UNIX socket."
+         */
+        agent?: string;
+        /**
+         * @description Buffer or string that contains a private key for either key-based or hostbased user authentication (OpenSSH format).
+         */
+        privateKey?: Buffer | string;
+        /**
+         * @description For an encrypted private key, this is the passphrase used to decrypt it.
+         */
+        passphrase?: string;
+        /**
+         * @description Along with **localUsername** and **privateKey**, set this to a non-empty string for hostbased user authentication.
+         */
+        localHostname?: string;
+        /**
+         * @description Along with **localHostname** and **privateKey**, set this to a non-empty string for hostbased user authentication.
+         */
+        localUsername?: string;
+        /**
+         * @description Try keyboard-interactive user authentication if primary user authentication method fails.
+         * If you set this to `true`, you need to handle the `keyboard-interactive` event.
+         */
+        tryKeyboard: boolean;
+        /**
+         * @description How often (in milliseconds) to send SSH-level keepalive packets to the server
+         * (in a similar way as OpenSSH's ServerAliveInterval config option). Set to 0 to disable.
+         * @default 0
+         */
+        keepaliveInterval?: number;
+        /**
+         * @description How many consecutive, unanswered SSH-level keepalive packets that can be sent to the server
+         * before disconnection (similar to OpenSSH's ServerAliveCountMax config option).
+         * @default 3
+         */
+        keepaliveCountMax?: number;
+        /**
+         * @description How long (in milliseconds) to wait for the SSH handshake to complete.
+         * @default 20000
+         */
+        readyTimeout?: number;
+        /**
+         * @description Performs a strict server vendor check before sending vendor-specific requests,
+         * etc. (e.g. check for OpenSSH server when using `openssh_noMoreSessions()`)
+         * @default true
+         */
+        strictVendor?: boolean;
+        /**
+         * A ReadableStream to use for communicating with the server instead of creating and using a new TCP connection (useful for connection hopping).
+         */
+        sock?: NodeJS.ReadableStream;
+        /**
+         * @description Set to `true` to use OpenSSH agent forwarding (`auth-agent@openssh.com`) for the life of the connection. `agent` must also be set to use this feature.
+         * @default false
+         */
+        agentForward?: boolean;
+        /**
+         * @description Set this to a function that receives a single string argument to get detailed (local) debug information.
+         */
+        debug: (information: string) => any;
+    }
+
+    interface ExecOption {
+        /**
+         * @description An environment to use for the execution of the command.
+         */
+        env?: any;
+        /**
+         * @description Set to true to allocate a pseudo-tty with defaults, or an object containing specific pseudo-tty settings
+         * (see 'Pseudo-TTY settings'). Setting up a pseudo-tty can be useful when working with remote processes
+         * that expect input from an actual terminal (e.g. sudo's password prompt).
+         */
+        pty?: boolean | PseudoTtySettings;
+        /**
+         * @description Set to true to use defaults below, set to a number to specify a specific screen number,
+         * or an object.
+         */
+        x11?: boolean | number | X11Settings;
+    }
+
+    interface X11Settings {
+        /**
+         * Allow just a single connection?
+         * @default false
+         */
+        single?: boolean;
+        /**
+         * Screen number to use
+         * @default 0
+         */
+        screen?: number;
+    }
+
+    interface PseudoTtySettings {
+        /**
+         * @description * Number of rows
+         * @default 24
+         */
+        rows?: number;
+        /**
+         * @description * Number of columns
+         * @default 80
+         */
+        cols?: number;
+        /**
+         * @description * Height in pixels
+         * @default 480
+         */
+        height?: number;
+        /**
+         * @description * Width in pixels
+         * @default 640
+         */
+        width?: number;
+        /**
+         * @description The value to use for $TERM
+         * @default 'vt100'
+         */
+        term?: string;
+    }
+
+    interface ForwardInCallback {
+        (err?: Error, bindPort?: number): void;
+    }
+
+    interface ChannelCallback {
+        (err?: Error, channel?: Channel): void;
+    }
+
+    interface SftpCallback {
+        (err?: Error, sftp?: Sftp.Wrapper): void;
+    }
+
+    interface ErrorCallback {
+        (err?: Error): void;
+    }
+
+    interface Channel extends stream.Duplex {
+        new (info?: any, client?: any, options?: any): Channel;
+        eof(): boolean;
+        close(): boolean;
+        destroy(): void;
+        setWindow(rows: number, cols: number, height: number, width: number): boolean;
+        signal(signalName: string): boolean;
+        exit(name: string, coreDumped: boolean, msg: string): boolean;
+        exit(status: number): boolean;
+        stderr?: ServerStderr;
+    }
+
+    interface ServerStderr extends NodeJS.WritableStream {
+        new (channel: Channel): ServerStderr;
+    }
+
+    interface ServerStatic {
+        new (config: ServerConfig, listener?: any): Server;
+        createServer(config: ServerConfig, listener?: any): Server;
+        KEEPALIVE_INTERVAL: number;
+        KEEPALIVE_CLIENT_INTERVAL: number;
+        KEEPALIVE_CLIENT_COUNT_MAX: number;
+    }
+
+    interface Server extends NodeJS.EventEmitter {
+        listen(port: number, hostname?: string, backlog?: number, callback?: Function): Server;
+        listen(port: number, hostname?: string, callback?: Function): Server;
+        listen(path: string, callback?: Function): Server;
+        listen(handle: any, listeningListener?: Function): Server;
+        address(): { port: number; family: string; address: string; };
+        getConnections(callback: any): any; //TODO: No type
+        close(callback?: Function): Server;
+        ref(): void;
+        unref(): void;
+    }
+
+    interface ServerConfig {
+        /**
+         * @description Buffer or string that contains the host private key (OpenSSH format).
+         */
+        privateKey: Buffer | string;
+        /**
+         * @description For an encrypted host private key, this is the passphrase used to decrypt it.
+         */
+        passphrase?: string;
+        /**
+         * @description A message that is sent to clients immediately upon connection, before handshaking begins.
+         */
+        banner?: string;
+        /**
+         * @description A custom server software name/version identifier.
+         * @default 'ssh2js' + moduleVersion + 'srv'
+         */
+        indent?: string;
+        /**
+         * @description This is the highWaterMark to use for the parser stream.
+         * @default 32 * 1024
+         */
+        highWaterMark?: number;
+        /**
+         * @description Set this to a function that receives a single string argument to get detailed (local) debug information.
+         */
+        debug?: (information: string) => any;
+    }
+
+    // utility methods from ssh2-streams.
+    interface Utils {
+        iv_inc: Function;
+        isStreamCipher: Function;
+        isGCM: Function;
+        readInt: Function;
+        readString: Function;
+        parseKey: Function;
+        genPublicKey: Function;
+        convertPPKPrivate: Function;
+        verifyPPKMAC: Function;
+        decryptKey: Function;
+    }
+
+    namespace Sftp {
+        // SFTPStream.STATUS_CODE from ssh2-streams.
+        interface StatusCode {
+            OK: number;
+            EOF: number;
+            NO_SUCH_FILE: number;
+            PERMISSION_DENIED: number;
+            FAILURE: number;
+            BAD_MESSAGE: number;
+            NO_CONNECTION: number;
+            CONNECTION_LOST: number;
+            OP_UNSUPPORTED: number;
+        }
+
+        // SFTPStream.OPEN_MODE from ssh2-streams.
+        interface OpenMode {
+            READ: number;
+            WRITE: number;
+            APPEND: number;
+            CREAT: number;
+            TRUNC: number;
+            EXCL: number;
+        }
+
+        interface Attributes {
+            mode: number;
+            uid: number;
+            gid: number;
+            size: number;
+            atime: number;
+            mtime: number;
+        }
+        interface InputAttributes {
+            mode?: number;
+            uid?: number;
+            gid?: number;
+            size?: number;
+            atime?: number;
+            mtime?: number;
+        }
+        interface Stats extends Attributes {
+            isDirectory(): boolean;
+            isFile(): boolean;
+            isBlockDevice(): boolean;
+            isCharacterDevice(): boolean;
+            isSymbloicLink(): boolean;
+            isFIFO(): boolean;
+            isSocket(): boolean;
+        }
+
+        interface Wrapper extends NodeJS.EventEmitter {
+            fastGet(remotePath: string, localPath: string, callback: (err: any) => void): void;
+            fastGet(remotePath: string, localPath: string, options: TransferOptions, callback: (err: any) => void): void;
+            fastPut(localPath: string, remotePath: string, callback: (err: any) => void): void;
+            fastPut(localPath: string, remotePath: string, options: TransferOptions, callback: (err: any) => void): void;
+
+            createReadStream(path: string, options?: ReadStreamOptions): stream.Readable;
+            createWriteStream(path: string, options?: WriteStreamOptions): stream.Writable;
+            open(filename: string, mode: string, callback: (err: any, handle: Buffer) => void): boolean;
+            open(filename: string, mode: string, attributes: InputAttributes, callback: (err: any, handle: Buffer) => void): boolean;
+            close(handle: Buffer, callback: (err: any) => void): boolean;
+            readData(handle: Buffer, buffer: Buffer, offset: number, length: number, position: number,
+                callback: (err: any, bytesRead: number, buffer: Buffer, position: number) => void): boolean;
+            writeData(handle: Buffer, buffer: Buffer, offset: number, length: number, position: number,
+                callback: (err: any) => void): boolean;
+            fstat(handle: Buffer, callback: (err: any, stats: Stats) => void): boolean;
+            fsetstat(handle: Buffer, attributes: InputAttributes, callback: (err: any) => void): boolean;
+            futimes(handle: Buffer, atime: number | Date, mtime: number | Date, callback: (err: any) => void): boolean;
+            fchown(handle: Buffer, uid: number, gid: number, callback: (err: any) => void): boolean;
+            fchmod(handle: Buffer, mode: number | string, callback: (err: any) => void): boolean;
+            opendir(path: string, callback: (err: any, handle: Buffer) => void): boolean;
+            readdir(location: string | Buffer, callback: (err: any, list: ReadDirItem[]) => void): boolean;
+            unlink(path: string, callback: (err: any) => void): boolean;
+            rename(srcPath: string, destPath: string, callback: (err: any) => void): boolean;
+            mkdir(path: string, callback: (err: any) => void): boolean;
+            mkdir(path: string, attributes: InputAttributes, callback: (err: any) => void): boolean;
+            rmdir(path: string, callback: (err: any) => void): boolean;
+            stat(path: string, callback: (err: any, stats: Stats) => void): boolean;
+            lstat(path: string, callback: (err: any, stats: Stats) => void): boolean;
+            setstat(path: string, attributes: InputAttributes, callback: (err: any) => void): boolean;
+            utimes(path: string, atime: number | Date, mtime: number | Date, callback: (err: any) => void): boolean;
+            chown(path: string, uid: number, gid: number, callback: (err: any) => void): boolean;
+            chmod(path: string, mode: number | string, callback: (err: any) => void): boolean;
+            readlink(path: string, callback: (err: any, target: string) => void): boolean;
+            symlink(targetPath: string, linkPath: string, callback: (err: any) => void): boolean;
+            realpath(path: string, callback: (err: any, absPath: string) => void): boolean;
+
+            ext_openssh_rename(srcPath: string, destPath: string, callback: (err: any) => void): boolean;
+            ext_openssh_statvfs(path: string, callback: (err: any, fsInfo: any) => void): boolean;
+            ext_openssh_fstatvfs(handle: Buffer, callback: (err: any, fsInfo: any) => void): boolean;
+            ext_openssh_hardlink(targetPath: string, linkPath: string, callback: (err: any) => void): boolean;
+            ext_openssh_fsync(handle: Buffer, callback: (err: any, fsInfo: any) => void): boolean;
+        }
+
+        interface TransferOptions {
+            concurrency?: number;
+            chunkSize?: number;
+            step?: (total_transferred: number, chunk: number, total: number) => void;
+        }
+        interface ReadStreamOptions {
+            flags?: string;
+            encoding?: string;
+            handle?: Buffer;
+            mode?: number;
+            autoClose?: boolean;
+            start?: number;
+            end?: number;
+        }
+        interface WriteStreamOptions {
+            flags?: string;
+            encoding?: string;
+            mode?: number;
+        }
+        interface ReadDirItem {
+            filename: string;
+            longname: string;
+            attrs: Attributes;
+        }
+    }
+}
+
+declare var ssh2: ssh2.Client;
+
+export = ssh2;
diff --git a/ssh2/ssh2-tests.ts b/ssh2/ssh2-tests.ts
index 1c59b13054..0209f1ef3d 100644
--- a/ssh2/ssh2-tests.ts
+++ b/ssh2/ssh2-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="ssh2.d.ts" />
 
 import * as ssh2 from 'ssh2';
 
@@ -132,9 +131,9 @@ var Client = require('ssh2').Client;
 var conn = new Client();
 conn.on('ready', () => {
     console.log('Client :: ready');
-    conn.sftp( (err: Error, sftp: any) => {
+    conn.sftp( (err: Error, sftp: ssh2.Sftp.Wrapper) => {
         if (err) throw err;
-        sftp.readdir('foo', (err: Error, list: any) => {
+        sftp.readdir('foo', (err: Error, list: ssh2.Sftp.ReadDirItem[]) => {
             if (err) throw err;
             console.dir(list);
             conn.end();
diff --git a/ssh2/ssh2.d.ts b/ssh2/ssh2.d.ts
deleted file mode 100644
index 6e05e0c826..0000000000
--- a/ssh2/ssh2.d.ts
+++ /dev/null
@@ -1,339 +0,0 @@
-// Type definitions for ssh2
-// Project: https://github.com/mscdex/ssh2
-// Definitions by: Qubo <https://github.com/tkQubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "ssh2" {
-    import stream = require('stream');
-
-    namespace ssh2 {
-        interface Client {
-            Server: ServerStatic;
-            new(): Client;
-            /**
-             * SFTPStream.STATUS_CODE from ssh2-streams.
-             */
-            SFTP_STATUS_CODE: Sftp.StatusCode;
-            /**
-             * SFTPStream.OPEN_MODE from ssh2-streams.
-             */
-            SFTP_OPEN_MODE: Sftp.OpenMode;
-            //TODO: Type ssh2-streams
-            /**
-             * utility methods from ssh2-streams.
-             */
-            utils: Utils;
-
-            connect(config: ConnectConfig): void;
-            end(): void;
-            destroy(): void;
-            exec(command: string, options: ExecOption, callback: ChannelCallback): boolean;
-            exec(command: string, callback: ChannelCallback): boolean;
-            shell(window: boolean|PseudoTtySettings, options: boolean|number|X11Settings, callback: ChannelCallback): boolean;
-            shell(window: boolean|PseudoTtySettings, callback: ChannelCallback): boolean;
-            shell(callback: ChannelCallback): boolean;
-            subsys(subsystem: string, callback: ChannelCallback): boolean;
-            sftp(callback: SftpCallback): boolean;
-            forwardIn(bindAddr: string, bindPort: number, callback?: ForwardInCallback): boolean;
-            unforwardIn(bindAddr: string, bindPort: number, callback?: ErrorCallback): boolean;
-            forwardOut(srcIP: string, srcPort: number, dstIP: string, dstPort: number, callback: ChannelCallback): boolean;
-            openssh_noMoreSessions(callback?: ErrorCallback): boolean;
-            openssh_forwardInStreamLocal(socketPath: string, callback?: ErrorCallback): boolean;
-            openssh_unforwardInStreamLocal(socketPath: string, callback?: ErrorCallback): boolean;
-            openssh_forwardOutStreamLocal(socketPath: string, callback?: ChannelCallback): boolean;
-        }
-
-        interface ConnectConfig {
-            /**
-             * @description Hostname or IP address of the server.
-             * @default 'localhost'
-             */
-            host?: string;
-            /**
-             * @description Port number of the server.
-             * @default 22
-             */
-            port?: number;
-            /**
-             * @description Only connect via resolved IPv4 address for `host`.
-             * @default false
-             */
-            forceIPv4?: boolean;
-            /**
-             * @description Only connect via resolved IPv6 address for `host`.
-             * @default false
-             */
-            forceIPv6?: boolean;
-            /**
-             * @description 'md5' or 'sha1'. The host's key is hashed using this method and passed to the **hostVerifier** function.
-             * @default (none)
-             */
-            hostHash?: string;
-            /**
-             * @description Function that is passed a string hex hash of the host's key for verification purposes.
-             * Return `true` to continue with the handshake or `false` to reject and disconnect.
-             */
-            hostVerifier?: (keyHash: string) => boolean;
-            /**
-             * @description Username for authentication.
-             */
-            username?: string;
-            /**
-             * @description Password for password-based user authentication.
-             */
-            password?: string;
-            /**
-             * @description Path to ssh-agent's UNIX socket for ssh-agent-based user authentication.
-             * Windows users: set to 'pageant' for authenticating with Pageant or (actual) path to a cygwin "UNIX socket."
-             */
-            agent?: string;
-            /**
-             * @description Buffer or string that contains a private key for either key-based or hostbased user authentication (OpenSSH format).
-             */
-            privateKey?: Buffer|string;
-            /**
-             * @description For an encrypted private key, this is the passphrase used to decrypt it.
-             */
-            passphrase?: string;
-            /**
-             * @description Along with **localUsername** and **privateKey**, set this to a non-empty string for hostbased user authentication.
-             */
-            localHostname?: string;
-            /**
-             * @description Along with **localHostname** and **privateKey**, set this to a non-empty string for hostbased user authentication.
-             */
-            localUsername?: string;
-            /**
-             * @description Try keyboard-interactive user authentication if primary user authentication method fails.
-             * If you set this to `true`, you need to handle the `keyboard-interactive` event.
-             */
-            tryKeyboard: boolean;
-            /**
-             * @description How often (in milliseconds) to send SSH-level keepalive packets to the server
-             * (in a similar way as OpenSSH's ServerAliveInterval config option). Set to 0 to disable.
-             * @default 0
-             */
-            keepaliveInterval?: number;
-            /**
-             * @description How many consecutive, unanswered SSH-level keepalive packets that can be sent to the server
-             * before disconnection (similar to OpenSSH's ServerAliveCountMax config option).
-             * @default 3
-             */
-            keepaliveCountMax?: number;
-            /**
-             * @description How long (in milliseconds) to wait for the SSH handshake to complete.
-             * @default 20000
-             */
-            readyTimeout?: number;
-            /**
-             * @description Performs a strict server vendor check before sending vendor-specific requests,
-             * etc. (e.g. check for OpenSSH server when using `openssh_noMoreSessions()`)
-             * @default true
-             */
-            strictVendor?: boolean;
-            /**
-             * A ReadableStream to use for communicating with the server instead of creating and using a new TCP connection (useful for connection hopping).
-             */
-            sock?: NodeJS.ReadableStream;
-            /**
-             * @description Set to `true` to use OpenSSH agent forwarding (`auth-agent@openssh.com`) for the life of the connection. `agent` must also be set to use this feature.
-             * @default false
-             */
-            agentForward?: boolean;
-            /**
-             * @description Set this to a function that receives a single string argument to get detailed (local) debug information.
-             */
-            debug: (information: string) => any;
-        }
-
-        interface ExecOption {
-            /**
-             * @description An environment to use for the execution of the command.
-             */
-            env?: any;
-            /**
-             * @description Set to true to allocate a pseudo-tty with defaults, or an object containing specific pseudo-tty settings
-             * (see 'Pseudo-TTY settings'). Setting up a pseudo-tty can be useful when working with remote processes
-             * that expect input from an actual terminal (e.g. sudo's password prompt).
-             */
-            pty?: boolean|PseudoTtySettings;
-            /**
-             * @description Set to true to use defaults below, set to a number to specify a specific screen number,
-             * or an object.
-             */
-            x11?: boolean|number|X11Settings;
-        }
-
-        interface X11Settings {
-            /**
-             * Allow just a single connection?
-             * @default false
-             */
-            single?: boolean;
-            /**
-             * Screen number to use
-             * @default 0
-             */
-            screen?: number;
-        }
-
-        interface PseudoTtySettings {
-            /**
-             * @description * Number of rows
-             * @default 24
-             */
-            rows?: number;
-            /**
-             * @description * Number of columns
-             * @default 80
-             */
-            cols?: number;
-            /**
-             * @description * Height in pixels
-             * @default 480
-             */
-            height?: number;
-            /**
-             * @description * Width in pixels
-             * @default 640
-             */
-            width?: number;
-            /**
-             * @description The value to use for $TERM
-             * @default 'vt100'
-             */
-            term?: string;
-        }
-
-        interface ForwardInCallback {
-            (err?: Error, bindPort?: number): void;
-        }
-
-        interface ChannelCallback {
-            (err?: Error, channel?: Channel): void;
-        }
-
-        interface SftpCallback {
-            (err?: Error, sftp?: Sftp.Wrapper): void;
-        }
-
-        interface ErrorCallback {
-            (err?: Error): void;
-        }
-
-        interface Channel extends stream.Duplex {
-            new(info?: any, client?: any, options?: any): Channel;
-            eof(): boolean;
-            close(): boolean;
-            destroy(): void;
-            setWindow(rows: number, cols: number, height: number, width: number): boolean;
-            signal(signalName: string): boolean;
-            exit(name: string, coreDumped: boolean, msg: string): boolean;
-            exit(status: number): boolean;
-            stderr?: ServerStderr;
-        }
-
-        interface ServerStderr extends NodeJS.WritableStream {
-            new(channel: Channel): ServerStderr;
-        }
-
-        interface ServerStatic {
-            new(config: ServerConfig, listener?: any): Server;
-            createServer(config: ServerConfig, listener?: any): Server;
-            KEEPALIVE_INTERVAL: number;
-            KEEPALIVE_CLIENT_INTERVAL: number;
-            KEEPALIVE_CLIENT_COUNT_MAX: number;
-        }
-
-        interface Server extends NodeJS.EventEmitter {
-            listen(port: number, hostname?: string, backlog?: number, callback?: Function): Server;
-            listen(port: number, hostname?: string, callback?: Function): Server;
-            listen(path: string, callback?: Function): Server;
-            listen(handle: any, listeningListener?: Function): Server;
-            address(): { port: number; family: string; address: string; };
-            getConnections(callback: any): any; //TODO: No type
-            close(callback?: Function): Server;
-            ref(): void;
-            unref(): void;
-        }
-
-        interface ServerConfig {
-            /**
-             * @description Buffer or string that contains the host private key (OpenSSH format).
-             */
-            privateKey: Buffer|string;
-            /**
-             * @description For an encrypted host private key, this is the passphrase used to decrypt it.
-             */
-            passphrase?: string;
-            /**
-             * @description A message that is sent to clients immediately upon connection, before handshaking begins.
-             */
-            banner?: string;
-            /**
-             * @description A custom server software name/version identifier.
-             * @default 'ssh2js' + moduleVersion + 'srv'
-             */
-            indent?: string;
-            /**
-             * @description This is the highWaterMark to use for the parser stream.
-             * @default 32 * 1024
-             */
-            highWaterMark?: number;
-            /**
-             * @description Set this to a function that receives a single string argument to get detailed (local) debug information.
-             */
-            debug?: (information: string) => any;
-        }
-
-        // utility methods from ssh2-streams.
-        interface Utils {
-            iv_inc: Function;
-            isStreamCipher: Function;
-            isGCM: Function;
-            readInt: Function;
-            readString: Function;
-            parseKey: Function;
-            genPublicKey: Function;
-            convertPPKPrivate: Function;
-            verifyPPKMAC: Function;
-            decryptKey: Function;
-        }
-
-        namespace Sftp {
-            // SFTPStream.STATUS_CODE from ssh2-streams.
-            interface StatusCode {
-                OK: number;
-                EOF: number;
-                NO_SUCH_FILE: number;
-                PERMISSION_DENIED: number;
-                FAILURE: number;
-                BAD_MESSAGE: number;
-                NO_CONNECTION: number;
-                CONNECTION_LOST: number;
-                OP_UNSUPPORTED: number;
-            }
-
-            // SFTPStream.OPEN_MODE from ssh2-streams.
-            interface OpenMode {
-                READ: number;
-                WRITE: number;
-                APPEND: number;
-                CREAT: number;
-                TRUNC: number;
-                EXCL: number;
-            }
-
-            interface Wrapper extends NodeJS.EventEmitter {
-                //TODO: extends `ssh2-streams.SFTPStream`
-            }
-        }
-    }
-
-    var ssh2: ssh2.Client;
-
-    export = ssh2;
-}
-
diff --git a/ssh2/tsconfig.json b/ssh2/tsconfig.json
new file mode 100644
index 0000000000..dd1c78b353
--- /dev/null
+++ b/ssh2/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ssh2-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/stack-mapper/index.d.ts b/stack-mapper/index.d.ts
new file mode 100644
index 0000000000..ee282bb165
--- /dev/null
+++ b/stack-mapper/index.d.ts
@@ -0,0 +1,45 @@
+// Type definitions for stack-mapper 0.2.2
+// Project: https://github.com/thlorenz/stack-mapper
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare namespace stackMapper {
+
+    export class StackMapper {
+
+        /**
+         * Maps the trace statements of the given error stack and replaces locations
+         * referencing code in the generated file with the locations inside the original files.
+         *
+         * @name map
+         * @function
+         * @param {Array} array of callsite objects (see readme for details about Callsite object)
+         * @return {Array.<Object>} info about the error stack with adapted locations, each with the following properties
+         *    - filename: original filename
+         *    - line: origial line in that filename of the trace
+         *    - column: origial column on that line of the trace
+         */
+        public map(stack: Callsite[]): Callsite[];
+    }
+
+    export interface Callsite {
+        filename: string;
+        line: number;
+        column: number;
+    }
+
+}
+
+/**
+ * Returns a Stackmapper that will use the given source map to map error trace locations.
+ *
+ * @name stackMapper
+ * @function
+ * @param {Object} sourcemap source map for the generated file
+ * @return {StackMapper} stack mapper for the particular source map
+ */
+declare function stackMapper(sourcemap: any): stackMapper.StackMapper;
+
+export = stackMapper;
diff --git a/stack-mapper/stack-mapper-tests.ts b/stack-mapper/stack-mapper-tests.ts
index 734b7ab3ce..4959e2501b 100644
--- a/stack-mapper/stack-mapper-tests.ts
+++ b/stack-mapper/stack-mapper-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="stack-mapper.d.ts" />
-
-import stackMapper = require("stack-mapper");
+import stackMapper = require("stack-mapper");
 
 var map: any = {};
 var sm: stackMapper.StackMapper = stackMapper(map);
diff --git a/stack-mapper/stack-mapper.d.ts b/stack-mapper/stack-mapper.d.ts
deleted file mode 100644
index e6776e4ca6..0000000000
--- a/stack-mapper/stack-mapper.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// Type definitions for stack-mapper 0.2.2
-// Project: https://github.com/thlorenz/stack-mapper
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "stack-mapper" {
-
-	namespace stackMapper {
-
-		export class StackMapper {
-
-			/**
-			 * Maps the trace statements of the given error stack and replaces locations
-			 * referencing code in the generated file with the locations inside the original files.
-			 *
-			 * @name map
-			 * @function
-			 * @param {Array} array of callsite objects (see readme for details about Callsite object)
-			 * @return {Array.<Object>} info about the error stack with adapted locations, each with the following properties
-			 *    - filename: original filename
-			 *    - line: origial line in that filename of the trace
-			 *    - column: origial column on that line of the trace
-			 */
-			public map(stack: Callsite[]): Callsite[];
-		}
-
-		export interface Callsite {
-			filename: string;
-			line: number;
-			column: number;
-		}
-
-	}
-
-	/**
-	 * Returns a Stackmapper that will use the given source map to map error trace locations.
-	 *
-	 * @name stackMapper
-	 * @function
-	 * @param {Object} sourcemap source map for the generated file
-	 * @return {StackMapper} stack mapper for the particular source map
-	 */
-	function stackMapper(sourcemap: any): stackMapper.StackMapper;
-
-	export = stackMapper;
-}
diff --git a/stack-mapper/tsconfig.json b/stack-mapper/tsconfig.json
new file mode 100644
index 0000000000..b312a2f24b
--- /dev/null
+++ b/stack-mapper/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "stack-mapper-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/stack-trace/index.d.ts b/stack-trace/index.d.ts
new file mode 100644
index 0000000000..e25523b8ba
--- /dev/null
+++ b/stack-trace/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for node-stack-trace
+// Project: https://github.com/felixge/node-stack-trace
+// Definitions by: Exceptionless <https://github.com/exceptionless>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export interface StackFrame {
+    getTypeName(): string;
+    getFunctionName(): string;
+    getMethodName(): string;
+    getFileName(): string;
+    getTypeName(): string;
+    getLineNumber(): number;
+    getColumnNumber(): number;
+    isNative(): boolean;
+}
+
+export declare function get(belowFn?: () => void): StackFrame[];
+export declare function parse(err: Error): StackFrame[];
diff --git a/stack-trace/stack-trace-tests.ts b/stack-trace/stack-trace-tests.ts
index c18f637519..19a3083d16 100644
--- a/stack-trace/stack-trace-tests.ts
+++ b/stack-trace/stack-trace-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./stack-trace.d.ts" />
 
 import stackTrace = require('stack-trace');
 
diff --git a/stack-trace/stack-trace.d.ts b/stack-trace/stack-trace.d.ts
deleted file mode 100644
index 800a3da051..0000000000
--- a/stack-trace/stack-trace.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Type definitions for node-stack-trace
-// Project: https://github.com/felixge/node-stack-trace
-// Definitions by: Exceptionless <https://github.com/exceptionless>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'stack-trace' {
-  export interface StackFrame {
-    getTypeName():string;
-    getFunctionName():string;
-    getMethodName():string;
-    getFileName():string;
-    getTypeName():string;
-    getLineNumber():number;
-    getColumnNumber():number;
-    isNative():boolean;
-  }
-
-  export function get(belowFn?:() => void): StackFrame[];
-  export function parse(err:Error): StackFrame[];
-}
diff --git a/stack-trace/tsconfig.json b/stack-trace/tsconfig.json
new file mode 100644
index 0000000000..14d1cfab84
--- /dev/null
+++ b/stack-trace/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "stack-trace-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/stacktrace-js/stacktrace-js.d.ts b/stacktrace-js/index.d.ts
similarity index 100%
rename from stacktrace-js/stacktrace-js.d.ts
rename to stacktrace-js/index.d.ts
diff --git a/stacktrace-js/stacktrace-js-tests.ts b/stacktrace-js/stacktrace-js-tests.ts
index c4c9bcf879..11917616ae 100644
--- a/stacktrace-js/stacktrace-js-tests.ts
+++ b/stacktrace-js/stacktrace-js-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="stacktrace-js.d.ts" />
+
 
 function interestingFn() {
     return 'https://github.com/exceptionless/Exceptionless';
diff --git a/stacktrace-js/tsconfig.json b/stacktrace-js/tsconfig.json
new file mode 100644
index 0000000000..0a8ba8d567
--- /dev/null
+++ b/stacktrace-js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "stacktrace-js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/stampit/stampit.d.ts b/stampit/index.d.ts
similarity index 100%
rename from stampit/stampit.d.ts
rename to stampit/index.d.ts
diff --git a/stampit/stampit-tests.ts b/stampit/stampit-tests.ts
index 07d3fe8585..259c3ccd5a 100644
--- a/stampit/stampit-tests.ts
+++ b/stampit/stampit-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="stampit.d.ts" />
+
 
 import stampit = require('stampit');
 
diff --git a/stampit/tsconfig.json b/stampit/tsconfig.json
new file mode 100644
index 0000000000..a07fdfea6b
--- /dev/null
+++ b/stampit/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "stampit-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/stamplay-js-sdk/index.d.ts b/stamplay-js-sdk/index.d.ts
new file mode 100644
index 0000000000..53f57ad86c
--- /dev/null
+++ b/stamplay-js-sdk/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for stamplay-js-sdk 1.2.9
+// Project: https://github.com/Stamplay/stamplay-js-sdk
+// Definitions by: Riderman de Sousa Barbosa <https://github.com/ridermansb/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="promises-a-plus" />
+
+declare namespace Stamplay {
+
+  export interface IStamplayModel {
+    signup({}) : PromisesAPlus.Thenable<any>
+    new() : IStamplayModel
+    get(property : string) : any
+    set(property : string, value: any) : void
+    unset(property : string) : void
+    fetch(id : any) : PromisesAPlus.Thenable<any>
+    destroy() : PromisesAPlus.Thenable<any>
+    save({}?) : PromisesAPlus.Thenable<any>
+    upVote() : PromisesAPlus.Thenable<any>
+  }
+
+  export interface IStamplayObject  {
+      Model : IStamplayModel
+      Collection : any
+
+  }
+
+  export interface StamplayStatic {
+      init(appId : string) : void;
+      User() : IStamplayObject
+      Cobject(object : string) : IStamplayObject
+  }
+}
+
+declare var Stamplay: Stamplay.StamplayStatic;
diff --git a/stamplay-js-sdk/stamplay-js-sdk-tests.ts b/stamplay-js-sdk/stamplay-js-sdk-tests.ts
index 88b6d713d6..d9a4247e03 100644
--- a/stamplay-js-sdk/stamplay-js-sdk-tests.ts
+++ b/stamplay-js-sdk/stamplay-js-sdk-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="stamplay-js-sdk.d.ts" />
+
 Stamplay.init('sample');
 var userFn = Stamplay.User();
 var user = new userFn.Model;
diff --git a/stamplay-js-sdk/stamplay-js-sdk.d.ts b/stamplay-js-sdk/stamplay-js-sdk.d.ts
deleted file mode 100644
index 952ed78ea0..0000000000
--- a/stamplay-js-sdk/stamplay-js-sdk.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-// Type definitions for stamplay-js-sdk 1.2.9
-// Project: https://github.com/Stamplay/stamplay-js-sdk
-// Definitions by: Riderman de Sousa Barbosa <https://github.com/ridermansb/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="..\promises-a-plus\promises-a-plus.d.ts"/>
-
-declare namespace Stamplay {
-
-  export interface IStamplayModel {
-    signup({}) : PromisesAPlus.Thenable<any>
-    new() : IStamplayModel
-    get(property : string) : any
-    set(property : string, value: any) : void
-    unset(property : string) : void
-    fetch(id : any) : PromisesAPlus.Thenable<any>
-    destroy() : PromisesAPlus.Thenable<any>
-    save({}?) : PromisesAPlus.Thenable<any>
-    upVote() : PromisesAPlus.Thenable<any>
-  }
-
-  export interface IStamplayObject  {
-      Model : IStamplayModel
-      Collection : any
-
-  }
-
-  export interface StamplayStatic {
-      init(appId : string) : void;
-      User() : IStamplayObject
-      Cobject(object : string) : IStamplayObject
-  }
-}
-
-declare var Stamplay: Stamplay.StamplayStatic;
-
-declare module "Stamplay" {
-    export = Stamplay;
-}
diff --git a/stamplay-js-sdk/tsconfig.json b/stamplay-js-sdk/tsconfig.json
new file mode 100644
index 0000000000..693db077cf
--- /dev/null
+++ b/stamplay-js-sdk/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "stamplay-js-sdk-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/state-machine/state-machine.d.ts b/state-machine/index.d.ts
similarity index 100%
rename from state-machine/state-machine.d.ts
rename to state-machine/index.d.ts
diff --git a/state-machine/state-machine-tests.ts b/state-machine/state-machine-tests.ts
index 7c7c705e31..b9011f19d7 100644
--- a/state-machine/state-machine-tests.ts
+++ b/state-machine/state-machine-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="state-machine.d.ts" />
+
 
 interface StateMachineTest extends StateMachine {
 	warn?: StateMachineEvent;
diff --git a/state-machine/tsconfig.json b/state-machine/tsconfig.json
new file mode 100644
index 0000000000..a3654b17af
--- /dev/null
+++ b/state-machine/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "state-machine-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/static-eval/index.d.ts b/static-eval/index.d.ts
new file mode 100644
index 0000000000..53db0266fc
--- /dev/null
+++ b/static-eval/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for static-eval v0.2.4
+// Project: https://github.com/substack/static-eval
+// Definitions by: Ben Liddicott <https://github.com/benliddicott/DefinitelyTyped>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="esprima" />
+
+
+/**
+* Evaluates the given ESTree.Expression, with the given named variables in place.
+* @param ast [ESTree.Expression] An esprima expression derived from parse.body[].expression
+* @param vars Named variables, objects or functions which may be referenced in the expression.
+*/
+declare function evaluate(ast: ESTree.Expression, vars: { [name: string]: any }): any;
+export =evaluate;
diff --git a/static-eval/static-eval-tests.ts b/static-eval/static-eval-tests.ts
index fe42c3d4d2..bb893a4d60 100644
--- a/static-eval/static-eval-tests.ts
+++ b/static-eval/static-eval-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../esprima/esprima.d.ts" />
-/// <reference path="static-eval.d.ts" />
+/// <reference types="esprima" />
 
 import evaluate = require('static-eval');
 import esprima = require('esprima');
diff --git a/static-eval/static-eval.d.ts b/static-eval/static-eval.d.ts
deleted file mode 100644
index 251030fb02..0000000000
--- a/static-eval/static-eval.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Type definitions for static-eval v0.2.4
-// Project: https://github.com/substack/static-eval
-// Definitions by: Ben Liddicott <https://github.com/benliddicott/DefinitelyTyped>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
- 
-/// <reference path="../esprima/esprima.d.ts" />
-
-declare module 'static-eval' {
-    /**
-    * Evaluates the given ESTree.Expression, with the given named variables in place.
-    * @param ast [ESTree.Expression] An esprima expression derived from parse.body[].expression
-    * @param vars Named variables, objects or functions which may be referenced in the expression.
-    */
-    function evaluate(ast : ESTree.Expression, vars: { [name: string]: any }): any;
-    export =evaluate;
-}
diff --git a/static-eval/tsconfig.json b/static-eval/tsconfig.json
new file mode 100644
index 0000000000..ddb9ad9880
--- /dev/null
+++ b/static-eval/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "static-eval-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/stats/stats.d.ts b/stats/index.d.ts
similarity index 100%
rename from stats/stats.d.ts
rename to stats/index.d.ts
diff --git a/stats/stats-tests.ts b/stats/stats-tests.ts
index 0c80fc99c9..babdfa807b 100644
--- a/stats/stats-tests.ts
+++ b/stats/stats-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="stats.d.ts" />
+
 
 var stats = new Stats();
 stats.setMode(1); // 0: fps, 1: ms
diff --git a/stats/tsconfig.json b/stats/tsconfig.json
new file mode 100644
index 0000000000..4a63bdaf20
--- /dev/null
+++ b/stats/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "stats-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/statsd-client/index.d.ts b/statsd-client/index.d.ts
new file mode 100644
index 0000000000..b3084f7024
--- /dev/null
+++ b/statsd-client/index.d.ts
@@ -0,0 +1,102 @@
+// Type definitions for statsd-client v0.1.0
+// Project: https://github.com/msiebuhr/node-statsd-client
+// Definitions by: Peter Kooijmans <https://github.com/peterkooijmans/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+interface CommonOptions {
+    /**
+     * Prefix all stats with this value (default "").
+     */
+    prefix?: string;
+
+    /**
+     * Print what is being sent to stderr (default false).
+     */
+    debug?: boolean;
+
+    /**
+     * User specifically wants to use tcp (default false)
+     */
+    tcp?: boolean;
+
+    /**
+     * Dual-use timer. Will flush metrics every interval. For UDP, 
+     * it auto-closes the socket after this long without activity 
+     * (default 1000 ms; 0 disables this). For TCP, it auto-closes 
+     * the socket after socketTimeoutsToClose number of timeouts 
+     * have elapsed without activity.
+     */
+    socketTimeout?: number;
+}
+
+interface TcpOptions extends CommonOptions {
+    /**
+     * Where to send the stats (default localhost).
+     */
+    host?: string;
+
+    /**
+     * Port to contact the statsd-daemon on (default 8125).
+     */
+    port?: number;
+
+    /**
+     * Number of timeouts in which the socket auto-closes if it 
+     * has been inactive. (default 10; 1 to auto-close after a 
+     * single timeout).
+     */
+    socketTimeoutsToClose: number;
+}
+
+interface UdpOptions extends CommonOptions {
+    /**
+     * Where to send the stats (default localhost).
+     */
+    host?: string;
+
+    /**
+     * Port to contact the statsd-daemon on (default 8125).
+     */
+    port?: number;
+}
+
+interface HttpOptions extends CommonOptions {
+    /**
+     * Where to send the stats (default localhost).
+     */
+    host?: string;
+
+    /**
+     * Additional headers to send (default {}).
+     */
+    headers?: { [index: string]: string };
+
+    /**
+     * What HTTP method to use (default "PUT").
+     */
+    method?: string;
+}
+
+declare class StatsdClient {
+    constructor(options: TcpOptions | UdpOptions | HttpOptions);
+
+    counter(metric: string, delta: number): void;
+    increment(metric: string, delta?: number): void;
+    decrement(metric: string, delta?: number): void;
+
+    gauge(name: string, value: number): void;
+    gaugeDelta(name: string, delta: number): void;
+
+    set(name: string, value: number): void;
+
+    timing(name: string, start: Date): void;
+    timing(name: string, duration: number): void;
+
+    close(): void;
+
+    getChildClient(name: string): StatsdClient;
+}
+
+export = StatsdClient;
diff --git a/statsd-client/statsd-client-tests.ts b/statsd-client/statsd-client-tests.ts
index 2dc6f01444..d8490448a5 100644
--- a/statsd-client/statsd-client-tests.ts
+++ b/statsd-client/statsd-client-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="statsd-client.d.ts" />
 
 import SDC = require("statsd-client");
 
diff --git a/statsd-client/statsd-client.d.ts b/statsd-client/statsd-client.d.ts
deleted file mode 100644
index 2fabcfb83f..0000000000
--- a/statsd-client/statsd-client.d.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-// Type definitions for statsd-client v0.1.0
-// Project: https://github.com/msiebuhr/node-statsd-client
-// Definitions by: Peter Kooijmans <https://github.com/peterkooijmans/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "statsd-client" {
-
-	interface CommonOptions {
-		/**
-		 * Prefix all stats with this value (default "").
-		 */
-		prefix?: string;
-
-		/**
-		 * Print what is being sent to stderr (default false).
-		 */
-		debug?: boolean;
-
-		/**
-		 * User specifically wants to use tcp (default false)
-		 */
-		tcp?: boolean;
-
-		/**
-		 * Dual-use timer. Will flush metrics every interval. For UDP, 
-		 * it auto-closes the socket after this long without activity 
-		 * (default 1000 ms; 0 disables this). For TCP, it auto-closes 
-		 * the socket after socketTimeoutsToClose number of timeouts 
-		 * have elapsed without activity.
-		 */
-		socketTimeout?: number;
-	}
-
-	interface TcpOptions extends CommonOptions {
-		/**
-		 * Where to send the stats (default localhost).
-		 */
-		host?: string;
-
-		/**
-		 * Port to contact the statsd-daemon on (default 8125).
-		 */
-		port?: number;
-
-		/**
-		 * Number of timeouts in which the socket auto-closes if it 
-		 * has been inactive. (default 10; 1 to auto-close after a 
-		 * single timeout).
-		 */
-		socketTimeoutsToClose: number;
-	}
-
-	interface UdpOptions extends CommonOptions {
-		/**
-		 * Where to send the stats (default localhost).
-		 */
-		host?: string;
-
-		/**
-		 * Port to contact the statsd-daemon on (default 8125).
-		 */
-		port?: number;
-	}
-
-	interface HttpOptions extends CommonOptions {
-		/**
-		 * Where to send the stats (default localhost).
-		 */
-		host?: string;
-
-		/**
-		 * Additional headers to send (default {}).
-		 */
-		headers?: { [index : string] : string };
-
-		/**
-		 * What HTTP method to use (default "PUT").
-		 */
-		method?: string;
-	}
-
-	class StatsdClient {
-		constructor(options: TcpOptions | UdpOptions | HttpOptions);
-
-		counter(metric: string, delta: number): void;
-		increment(metric: string, delta?: number): void;
-		decrement(metric: string, delta?: number): void;
-
-		gauge(name: string, value: number): void;
-		gaugeDelta(name: string, delta: number): void;
-
-		set(name: string, value: number): void;
-
-		timing(name: string, start: Date): void;
-		timing(name: string, duration: number): void;
-
-		close(): void;
-
-		getChildClient(name: string): StatsdClient;
-	}
-
-	export = StatsdClient;
-}
diff --git a/statsd-client/tsconfig.json b/statsd-client/tsconfig.json
new file mode 100644
index 0000000000..008185daf9
--- /dev/null
+++ b/statsd-client/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "statsd-client-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/status-bar/index.d.ts b/status-bar/index.d.ts
new file mode 100644
index 0000000000..44511b8998
--- /dev/null
+++ b/status-bar/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for status-bar
+// Project: https://github.com/atom/status-bar
+// Definitions by: vvakame <https://github.com/vvakame/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="space-pen" />
+/// <reference types="text-buffer" />
+
+declare namespace StatusBar {
+	interface IStatusBarViewStatic {
+		content():any;
+
+		new(...args:any[]):IStatusBarView;
+	}
+
+	interface IStatusBarView extends View {
+
+		initialize():any;
+		attach():any;
+		destroy():any;
+		appendLeft(view:View):any;
+		prependLeft(view:View):any;
+		appendRight(view:View):any;
+		prependRight(view:View):any;
+		getActiveBuffer():TextBuffer.ITextBuffer;
+		getActiveItem():any;
+		storeActiveBuffer():TextBuffer.ITextBuffer;
+		subscribeToBuffer(event:string, callback:Function):any;
+		subscribeAllToBuffer():any[];
+		unsubscribeAllFromBuffer():any[];
+	}
+}
diff --git a/status-bar/status-bar-tests.ts b/status-bar/status-bar-tests.ts
index 13e1941b66..7a1448b9ec 100644
--- a/status-bar/status-bar-tests.ts
+++ b/status-bar/status-bar-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./status-bar.d.ts" />
+
 
 declare var StatusBarView:StatusBar.IStatusBarViewStatic;
 
diff --git a/status-bar/status-bar.d.ts b/status-bar/status-bar.d.ts
deleted file mode 100644
index 005fad8a41..0000000000
--- a/status-bar/status-bar.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// Type definitions for status-bar
-// Project: https://github.com/atom/status-bar
-// Definitions by: vvakame <https://github.com/vvakame/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../space-pen/space-pen.d.ts" />
-/// <reference path="../text-buffer/text-buffer.d.ts" />
-
-declare namespace StatusBar {
-	interface IStatusBarViewStatic {
-		content():any;
-
-		new(...args:any[]):IStatusBarView;
-	}
-
-	interface IStatusBarView extends View {
-
-		initialize():any;
-		attach():any;
-		destroy():any;
-		appendLeft(view:View):any;
-		prependLeft(view:View):any;
-		appendRight(view:View):any;
-		prependRight(view:View):any;
-		getActiveBuffer():TextBuffer.ITextBuffer;
-		getActiveItem():any;
-		storeActiveBuffer():TextBuffer.ITextBuffer;
-		subscribeToBuffer(event:string, callback:Function):any;
-		subscribeAllToBuffer():any[];
-		unsubscribeAllFromBuffer():any[];
-	}
-}
diff --git a/status-bar/tsconfig.json b/status-bar/tsconfig.json
new file mode 100644
index 0000000000..12538f57ed
--- /dev/null
+++ b/status-bar/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "status-bar-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/statuses/index.d.ts b/statuses/index.d.ts
new file mode 100644
index 0000000000..f6e22d2176
--- /dev/null
+++ b/statuses/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for statuses v1.2.1
+// Project: https://github.com/jshttp/statuses
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface Status {
+    [code: number]: string;
+    [msg: string]: any | number;
+
+    codes: Array<number>;
+    redirect: { [code: number]: boolean };
+    empty: { [code: number]: boolean };
+    retry: { [code: number]: boolean };
+
+    (code: number | string): number;
+}
+
+declare var status: Status;
+export = status;
diff --git a/statuses/statuses-tests.ts b/statuses/statuses-tests.ts
index a55a706fff..28fd02a28b 100644
--- a/statuses/statuses-tests.ts
+++ b/statuses/statuses-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="statuses.d.ts" />
 
 import status = require('statuses');
 
diff --git a/statuses/statuses.d.ts b/statuses/statuses.d.ts
deleted file mode 100644
index 239b5fd320..0000000000
--- a/statuses/statuses.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Type definitions for statuses v1.2.1
-// Project: https://github.com/jshttp/statuses
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'statuses' {
-    interface Status {
-        [code: number]: string;
-        [msg: string]: any | number;
-
-        codes: Array<number>;
-        redirect: {[code: number]: boolean};
-        empty: {[code: number]: boolean};
-        retry: {[code: number]: boolean};
-
-        (code: number | string): number;
-    }
-
-    var status: Status;
-    export = status;
-}
diff --git a/statuses/tsconfig.json b/statuses/tsconfig.json
new file mode 100644
index 0000000000..71e953cb13
--- /dev/null
+++ b/statuses/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "statuses-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/steam/index.d.ts b/steam/index.d.ts
new file mode 100644
index 0000000000..92399d8bc8
--- /dev/null
+++ b/steam/index.d.ts
@@ -0,0 +1,64 @@
+// Type definitions for steam
+// Project: https://github.com/seishun/node-steam
+// Definitions by: Andrey Kurdyumov <https://github.com/kant2002>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export = Steam;
+
+declare namespace Steam {
+    export var servers: any;
+
+    export interface LogonOptions {
+        accountName: string;
+        password: string;
+        shaSentryfile?: string;
+        authCode?: string;
+    }
+
+    export enum EResult {
+        AccountLogonDenied
+    }
+
+    export enum EPersonaState {
+        Online
+    }
+
+    export enum EChatEntryType {
+        ChatMsg
+    }
+
+    export enum EChatMemberStateChange {
+        Kicked
+    }
+
+    export class SteamClient implements NodeJS.EventEmitter {
+        sessionId: string;
+        cookie: string[];
+        steamID: string;
+        users: {};
+
+        logOn(options: LogonOptions): void;
+        webLogOn(callback: (cookie: any[]) => void): void;
+
+        joinChat(chatId: string): void;
+        sendMessage(source: any, message: string, entryType: EChatEntryType): void;
+
+        setPersonaState(state: EPersonaState): void;
+        setPersonaName(name: string): void;
+
+        // Event emitter
+        addListener(event: string, listener: Function): this;
+        on(event: string, listener: Function): this;
+        once(event: string, listener: Function): this;
+        removeListener(event: string, listener: Function): this;
+        removeAllListeners(event?: string): this;
+        setMaxListeners(n: number): this;
+        getMaxListeners(): number;
+        listeners(event: string): Function[];
+        emit(event: string, ...args: any[]): boolean;
+        listenerCount(type: string): number;
+    }
+}
+
diff --git a/steam/steam-tests.ts b/steam/steam-tests.ts
index 8b9f04eef5..260761719e 100644
--- a/steam/steam-tests.ts
+++ b/steam/steam-tests.ts
@@ -3,7 +3,7 @@
 // Definitions by: Andrey Kurdyumov <https://github.com/kant2002>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="steam.d.ts" />
+import Steam = require("steam");
 
 var bot = new Steam.SteamClient();
 bot.logOn({
diff --git a/steam/steam.d.ts b/steam/steam.d.ts
deleted file mode 100644
index 6deb9f432e..0000000000
--- a/steam/steam.d.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-// Type definitions for steam
-// Project: https://github.com/seishun/node-steam
-// Definitions by: Andrey Kurdyumov <https://github.com/kant2002>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare namespace Steam {
-    export var servers: any;
-
-    export interface LogonOptions {
-        accountName: string;
-        password: string;
-        shaSentryfile?: string;
-        authCode?: string;
-    }
-
-    export enum EResult {
-        AccountLogonDenied
-    }
-
-    export enum EPersonaState {
-        Online
-    }
-
-    export enum EChatEntryType {
-        ChatMsg
-    }
-
-    export enum EChatMemberStateChange {
-        Kicked
-    }
-
-    export class SteamClient implements NodeJS.EventEmitter {
-        sessionId: string;
-        cookie: string[];
-        steamID: string;
-        users: {};
-
-        logOn(options: LogonOptions): void;
-        webLogOn(callback: (cookie: any[]) => void): void;
-
-        joinChat(chatId: string): void;
-        sendMessage(source: any, message: string, entryType: EChatEntryType): void;
-
-        setPersonaState(state: EPersonaState): void;
-        setPersonaName(name: string): void;
-
-        // Event emitter
-        addListener(event: string, listener: Function): this;
-        on(event: string, listener: Function): this;
-        once(event: string, listener: Function): this;
-        removeListener(event: string, listener: Function): this;
-        removeAllListeners(event?: string): this;
-        setMaxListeners(n: number): this;
-        getMaxListeners(): number;
-        listeners(event: string): Function[];
-        emit(event: string, ...args: any[]): boolean;
-        listenerCount(type: string): number;
-    }
-}
-
-declare module "steam" {
-    export = Steam;
-}
-
diff --git a/steam/tsconfig.json b/steam/tsconfig.json
new file mode 100644
index 0000000000..41be3fe6fe
--- /dev/null
+++ b/steam/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "steam-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/storejs/storejs.d.ts b/storejs/index.d.ts
similarity index 100%
rename from storejs/storejs.d.ts
rename to storejs/index.d.ts
diff --git a/storejs/storejs-tests.ts b/storejs/storejs-tests.ts
index 06387a728d..725a81c6b4 100644
--- a/storejs/storejs-tests.ts
+++ b/storejs/storejs-tests.ts
@@ -1,5 +1,4 @@
 // Tests for storagejs.d.ts
-///<reference path="storejs.d.ts" />
 
 // Store 'marcus' at 'username'
 store.set('username', 'marcus');
diff --git a/storejs/tsconfig.json b/storejs/tsconfig.json
new file mode 100644
index 0000000000..73e64ff40c
--- /dev/null
+++ b/storejs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "storejs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/stream-meter/index.d.ts b/stream-meter/index.d.ts
new file mode 100644
index 0000000000..37d5f315c6
--- /dev/null
+++ b/stream-meter/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for stream-meter
+// Project: https://github.com/brycebaril/node-stream-meter
+// Definitions by: TANAKA Koichi <https://github.com/mugeso/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/// <reference types="node" />
+
+
+import {Transform} from 'stream';
+
+declare function m(maxBytes?: number): m.StreamMeter;
+
+declare namespace m {
+    export interface StreamMeter extends Transform {
+        constructor(maxBytes?: number): StreamMeter;
+        bytes: number;
+        maxBytes: number;
+    }
+}
+
+export = m;
diff --git a/stream-meter/stream-meter-test.ts b/stream-meter/stream-meter-test.ts
index a9d391ac8b..396f8aa6b1 100644
--- a/stream-meter/stream-meter-test.ts
+++ b/stream-meter/stream-meter-test.ts
@@ -1,4 +1,4 @@
-/// <reference path="./stream-meter.d.ts" />
+
 import * as meter from 'stream-meter';
 
 var m:meter.StreamMeter = meter();
diff --git a/stream-meter/stream-meter.d.ts b/stream-meter/stream-meter.d.ts
deleted file mode 100644
index f1c200e40f..0000000000
--- a/stream-meter/stream-meter.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Type definitions for stream-meter
-// Project: https://github.com/brycebaril/node-stream-meter
-// Definitions by: TANAKA Koichi <https://github.com/mugeso/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/// <reference path="../node/node.d.ts" />
-
-declare module "stream-meter" {
-    import {Transform} from 'stream';
-
-    function m(maxBytes?:number):m.StreamMeter;
-
-    namespace m {
-        export interface StreamMeter extends Transform {
-            constructor(maxBytes?: number): StreamMeter;
-            bytes: number;
-            maxBytes: number;
-        }
-    }
-
-   export = m;
-}
\ No newline at end of file
diff --git a/stream-meter/tsconfig.json b/stream-meter/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/stream-meter/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/stream-series/index.d.ts b/stream-series/index.d.ts
new file mode 100644
index 0000000000..4459e550cb
--- /dev/null
+++ b/stream-series/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for stream-series
+// Project: https://github.com/rschmukler/stream-series
+// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+declare function series<T extends NodeJS.ReadableStream>(...streams: T[]): NodeJS.ReadWriteStream;
+export = series;
diff --git a/stream-series/stream-series-tests.ts b/stream-series/stream-series-tests.ts
index 2ed31ffb15..b1dacf4baa 100644
--- a/stream-series/stream-series-tests.ts
+++ b/stream-series/stream-series-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./stream-series.d.ts" />
 
 import stream = require("stream");
 import Stream = stream.Duplex;
diff --git a/stream-series/stream-series.d.ts b/stream-series/stream-series.d.ts
deleted file mode 100644
index 63e73dffda..0000000000
--- a/stream-series/stream-series.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Type definitions for stream-series
-// Project: https://github.com/rschmukler/stream-series
-// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "stream-series" {
-    function series<T extends NodeJS.ReadableStream>(...streams: T[]): NodeJS.ReadWriteStream;
-    export = series;
-}
diff --git a/stream-series/tsconfig.json b/stream-series/tsconfig.json
new file mode 100644
index 0000000000..a4b026cac8
--- /dev/null
+++ b/stream-series/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "stream-series-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/stream-to-array/index.d.ts b/stream-to-array/index.d.ts
new file mode 100644
index 0000000000..c61e61ea4e
--- /dev/null
+++ b/stream-to-array/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for stream-to-array
+// Project: https://github.com/stream-utils/stream-to-array
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="node" />
+
+
+declare function toArray(stream: NodeJS.ReadableStream, callback: (err: any, arr: any[]) => void): NodeJS.ReadWriteStream;
+export = toArray;
diff --git a/stream-to-array/stream-to-array-tests.ts b/stream-to-array/stream-to-array-tests.ts
index a4803d051b..c011f3e542 100644
--- a/stream-to-array/stream-to-array-tests.ts
+++ b/stream-to-array/stream-to-array-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="./stream-to-array.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import toArray = require('stream-to-array');
 
diff --git a/stream-to-array/stream-to-array.d.ts b/stream-to-array/stream-to-array.d.ts
deleted file mode 100644
index ed3e498b77..0000000000
--- a/stream-to-array/stream-to-array.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for stream-to-array
-// Project: https://github.com/stream-utils/stream-to-array
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'stream-to-array' {
-	function toArray(stream: NodeJS.ReadableStream, callback: (err: any, arr: any[]) => void): NodeJS.ReadWriteStream;
-	export = toArray;
-}
diff --git a/stream-to-array/tsconfig.json b/stream-to-array/tsconfig.json
new file mode 100644
index 0000000000..6044ef23d9
--- /dev/null
+++ b/stream-to-array/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "stream-to-array-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/streamjs/streamjs.d.ts b/streamjs/index.d.ts
similarity index 100%
rename from streamjs/streamjs.d.ts
rename to streamjs/index.d.ts
diff --git a/streamjs/streamjs-tests.ts b/streamjs/streamjs-tests.ts
index f911c8f522..c42e4d6be7 100644
--- a/streamjs/streamjs-tests.ts
+++ b/streamjs/streamjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="streamjs.d.ts" />
+
 
 var numStream: Stream<number>;
 numStream = Stream.of(1, 2, 3);
diff --git a/streamjs/tsconfig.json b/streamjs/tsconfig.json
new file mode 100644
index 0000000000..1c227d5e42
--- /dev/null
+++ b/streamjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "streamjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/string/index.d.ts b/string/index.d.ts
new file mode 100644
index 0000000000..dbf3120e09
--- /dev/null
+++ b/string/index.d.ts
@@ -0,0 +1,133 @@
+// Type definitions for string.js
+// Project: http://stringjs.com
+// Definitions by: Bas Pennings <https://github.com/basp/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface StringJS {
+	length: number;
+	
+	s: string;
+	
+	between(left: string, right?: string): StringJS;
+	
+	camelize(): StringJS;
+	
+	capitalize(): StringJS;
+	
+	chompLeft(prefix: string): StringJS;
+	
+	chompRight(suffix: string): StringJS;
+	
+	collapseWhitespace(): StringJS;
+	
+	contains(ss: string): boolean;
+	
+	count(substring: string): number;
+	
+	dasherize(): StringJS;
+	
+	decodeHTMLEntities(): StringJS;
+	
+	endsWith(ss: string): boolean;
+	
+	escapeHTML(): StringJS;
+	
+	ensureLeft(prefix: string): StringJS;
+	
+	ensureRight(suffix: string): StringJS;
+	
+	humanize(): StringJS;
+	
+	include(ss: string): boolean;
+	
+	isAlpha(): boolean;
+	
+	isAlphaNumeric(): boolean;
+	
+	isEmpty(): boolean;
+	
+	isLower(): boolean;
+	
+	isNumeric(): boolean;
+	
+	isUpper(): boolean;
+	
+	latinise(): StringJS;
+	
+	left(n: number): StringJS;
+	
+	lines(): string[];
+	
+	pad(len: number, char?: string|number): StringJS;
+	
+	padLeft(len: number, char?: string|number): StringJS;
+	
+	padRight(len: number, char?: string|number): StringJS;
+	
+	parseCSV(delimiter?: string, qualifier?: string, escape?: string, lineDelimiter?: string): string[];
+	
+	repeat(n: number): StringJS;
+	
+	replaceAll(ss: string, newStr: string): StringJS;
+	
+	strip(...strings: string[]): StringJS;
+	
+	right(n: number): StringJS;
+	
+	setValue(string: any): StringJS;
+	
+	slugify(): StringJS;
+	
+	startsWith(prefix: string): boolean;
+	
+	stripPunctuation(): StringJS;
+	
+	stripTags(...tags: string[]): StringJS;
+	
+	template(values: Object, open?: string, close?: string): StringJS;
+	
+	times(n: number): StringJS;
+	
+	toBoolean(): boolean;
+	
+	toCSV(delimiter?: string, qualifier?: string): StringJS;
+	toCSV(options: {
+		delimiter?: string,
+		qualifier?: string,
+		escape?: string,
+		encloseNumbers?: boolean,
+		keys?: boolean
+	}): StringJS;
+	
+	toFloat(precision?: number): number;
+	
+	toInt(): number;
+	
+	toInteger(): number;
+	
+	toString(): string;
+	
+	trim(): StringJS;
+	
+	trimLeft(): StringJS;
+	
+	trimRight(): StringJS;
+	
+	truncate(length: number, chars?: string): StringJS;
+	
+	underscore(): StringJS;
+	
+	unescapeHTML(): StringJS;
+	
+	wrapHTML(element?: string, attributes?: Object): StringJS;
+}
+
+declare var S: {
+	(o: any): StringJS;
+	VERSION: string;
+	TMPL_OPEN: string;
+	TMPL_CLOSE: string;
+}
+
+export = S;
+export as namespace S;
diff --git a/string/string-tests.ts b/string/string-tests.ts
index 22fca046d3..9349551b18 100644
--- a/string/string-tests.ts
+++ b/string/string-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="string.d.ts" />
+
 
 import S = require('string');
 
diff --git a/string/string.d.ts b/string/string.d.ts
deleted file mode 100644
index 889197eccc..0000000000
--- a/string/string.d.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-// Type definitions for string.js
-// Project: http://stringjs.com
-// Definitions by: Bas Pennings <https://github.com/basp/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface StringJS {
-	length: number;
-	
-	s: string;
-	
-	between(left: string, right?: string): StringJS;
-	
-	camelize(): StringJS;
-	
-	capitalize(): StringJS;
-	
-	chompLeft(prefix: string): StringJS;
-	
-	chompRight(suffix: string): StringJS;
-	
-	collapseWhitespace(): StringJS;
-	
-	contains(ss: string): boolean;
-	
-	count(substring: string): number;
-	
-	dasherize(): StringJS;
-	
-	decodeHTMLEntities(): StringJS;
-	
-	endsWith(ss: string): boolean;
-	
-	escapeHTML(): StringJS;
-	
-	ensureLeft(prefix: string): StringJS;
-	
-	ensureRight(suffix: string): StringJS;
-	
-	humanize(): StringJS;
-	
-	include(ss: string): boolean;
-	
-	isAlpha(): boolean;
-	
-	isAlphaNumeric(): boolean;
-	
-	isEmpty(): boolean;
-	
-	isLower(): boolean;
-	
-	isNumeric(): boolean;
-	
-	isUpper(): boolean;
-	
-	latinise(): StringJS;
-	
-	left(n: number): StringJS;
-	
-	lines(): string[];
-	
-	pad(len: number, char?: string|number): StringJS;
-	
-	padLeft(len: number, char?: string|number): StringJS;
-	
-	padRight(len: number, char?: string|number): StringJS;
-	
-	parseCSV(delimiter?: string, qualifier?: string, escape?: string, lineDelimiter?: string): string[];
-	
-	repeat(n: number): StringJS;
-	
-	replaceAll(ss: string, newStr: string): StringJS;
-	
-	strip(...strings: string[]): StringJS;
-	
-	right(n: number): StringJS;
-	
-	setValue(string: any): StringJS;
-	
-	slugify(): StringJS;
-	
-	startsWith(prefix: string): boolean;
-	
-	stripPunctuation(): StringJS;
-	
-	stripTags(...tags: string[]): StringJS;
-	
-	template(values: Object, open?: string, close?: string): StringJS;
-	
-	times(n: number): StringJS;
-	
-	toBoolean(): boolean;
-	
-	toCSV(delimiter?: string, qualifier?: string): StringJS;
-	toCSV(options: {
-		delimiter?: string,
-		qualifier?: string,
-		escape?: string,
-		encloseNumbers?: boolean,
-		keys?: boolean
-	}): StringJS;
-	
-	toFloat(precision?: number): number;
-	
-	toInt(): number;
-	
-	toInteger(): number;
-	
-	toString(): string;
-	
-	trim(): StringJS;
-	
-	trimLeft(): StringJS;
-	
-	trimRight(): StringJS;
-	
-	truncate(length: number, chars?: string): StringJS;
-	
-	underscore(): StringJS;
-	
-	unescapeHTML(): StringJS;
-	
-	wrapHTML(element?: string, attributes?: Object): StringJS;
-}
-
-declare module "string" {
-	var S: {
-		(o: any): StringJS;
-		VERSION: string;
-		TMPL_OPEN: string;
-		TMPL_CLOSE: string;
-	}
-	
-	export = S;
-}
\ No newline at end of file
diff --git a/string/tsconfig.json b/string/tsconfig.json
new file mode 100644
index 0000000000..008d7d534c
--- /dev/null
+++ b/string/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "string-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/string_score/string_score.d.ts b/string_score/index.d.ts
similarity index 100%
rename from string_score/string_score.d.ts
rename to string_score/index.d.ts
diff --git a/string_score/string_score-tests.ts b/string_score/string_score-tests.ts
index 8a7399603d..c0f120be49 100644
--- a/string_score/string_score-tests.ts
+++ b/string_score/string_score-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="string_score.d.ts" />
+
 
 import string_score = require('string_score');
 
diff --git a/string_score/tsconfig.json b/string_score/tsconfig.json
new file mode 100644
index 0000000000..badc9ae0a3
--- /dev/null
+++ b/string_score/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "string_score-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/strip-json-comments/index.d.ts b/strip-json-comments/index.d.ts
new file mode 100644
index 0000000000..c623893e07
--- /dev/null
+++ b/strip-json-comments/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for strip-json-comments
+// Project: https://github.com/sindresorhus/strip-json-comments
+// Definitions by: Dylan R. E. Moonfire <https://github.com/dmoonfire/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface StripJsonOptions {
+    whitespace?: boolean;
+}
+
+declare function stripJsonComments(input: string, opts?: StripJsonOptions): string;
+export = stripJsonComments;
diff --git a/strip-json-comments/strip-json-comments-tests.ts b/strip-json-comments/strip-json-comments-tests.ts
index 057277f5b6..272cba2bad 100644
--- a/strip-json-comments/strip-json-comments-tests.ts
+++ b/strip-json-comments/strip-json-comments-tests.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/sindresorhus/strip-json-comments
 // Definitions by: Dylan R. E. Moonfire <https://github.com/dmoonfire/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-///<reference path="strip-json-comments.d.ts" />
+
 import stripJsonComments = require("strip-json-comments");
 
 const json = '{/*rainbows*/"unicorn":"cake"}';
diff --git a/strip-json-comments/strip-json-comments.d.ts b/strip-json-comments/strip-json-comments.d.ts
deleted file mode 100644
index 8dbe55a70b..0000000000
--- a/strip-json-comments/strip-json-comments.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Type definitions for strip-json-comments
-// Project: https://github.com/sindresorhus/strip-json-comments
-// Definitions by: Dylan R. E. Moonfire <https://github.com/dmoonfire/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "strip-json-comments" {
-    interface StripJsonOptions {
-        whitespace?: boolean;
-    }
-
-    function stripJsonComments(input: string, opts?: StripJsonOptions): string;
-    export = stripJsonComments;
-}
diff --git a/strip-json-comments/tsconfig.json b/strip-json-comments/tsconfig.json
new file mode 100644
index 0000000000..b5a4955531
--- /dev/null
+++ b/strip-json-comments/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "strip-json-comments-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/stripe-checkout/index.d.ts b/stripe-checkout/index.d.ts
new file mode 100644
index 0000000000..eceb933144
--- /dev/null
+++ b/stripe-checkout/index.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for Stripe Checkout
+// Project: https://stripe.com/checkout
+// Definitions by: Chris Wrench <https://github.com/cgwrench>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="stripe"/>
+
+interface StripeCheckoutStatic {
+    configure(options: StripeCheckoutOptions): StripeCheckoutHandler;
+}
+
+interface StripeCheckoutHandler {
+    open(options?: StripeCheckoutOptions): void;
+    close(): void;
+}
+
+interface StripeCheckoutOptions {
+    key?: string;
+    token?: (token: StripeTokenResponse) => void;
+    image?: string;
+    name?: string;
+    description?: string;
+    amount?: number;
+    locale?: string;
+    currency?: string;
+    panelLabel?: string;
+    zipCode?: boolean;
+    email?: string;
+    label?: string;
+    allowRememberMe?: boolean;
+    bitcoin?: boolean;
+    opened?: () => void;
+    closed?: () => void;
+}
+
+declare var StripeCheckout: StripeCheckoutStatic;
diff --git a/stripe-checkout/stripe-checkout-tests.ts b/stripe-checkout/stripe-checkout-tests.ts
index c054b2365d..26a8d3a30c 100644
--- a/stripe-checkout/stripe-checkout-tests.ts
+++ b/stripe-checkout/stripe-checkout-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="stripe-checkout.d.ts" />
-
 // Test the minimum amount of configuration required.
 var handler = StripeCheckout.configure({
 	key: "my-secret-key",
diff --git a/stripe-checkout/stripe-checkout.d.ts b/stripe-checkout/stripe-checkout.d.ts
deleted file mode 100644
index 9799cc0278..0000000000
--- a/stripe-checkout/stripe-checkout.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Type definitions for Stripe Checkout
-// Project: https://stripe.com/checkout
-// Definitions by: Chris Wrench <https://github.com/cgwrench>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../stripe/stripe.d.ts"/>
-
-interface StripeCheckoutStatic {
-    configure(options: StripeCheckoutOptions): StripeCheckoutHandler;
-}
-
-interface StripeCheckoutHandler {
-    open(options?: StripeCheckoutOptions): void;
-    close(): void;
-}
-
-interface StripeCheckoutOptions {
-    key?: string;
-    token?: (token: StripeTokenResponse) => void;
-    image?: string;
-    name?: string;
-    description?: string;
-    amount?: number;
-    locale?: string;
-    currency?: string;
-    panelLabel?: string;
-    zipCode?: boolean;
-    email?: string;
-    label?: string;
-    allowRememberMe?: boolean;
-    bitcoin?: boolean;
-    opened?: () => void;
-    closed?: () => void;
-}
-
-declare var StripeCheckout: StripeCheckoutStatic;
diff --git a/stripe-checkout/tsconfig.json b/stripe-checkout/tsconfig.json
new file mode 100644
index 0000000000..effd650ead
--- /dev/null
+++ b/stripe-checkout/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "stripe-checkout-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/stripe/index.d.ts b/stripe/index.d.ts
new file mode 100644
index 0000000000..7bee5830b6
--- /dev/null
+++ b/stripe/index.d.ts
@@ -0,0 +1,109 @@
+// Type definitions for stripe
+// Project: https://stripe.com/
+// Definitions by: Andy Hawkins <https://github.com/a904guy/,http://a904guy.com>, Eric J. Smith <https://github.com/ejsmith/>, Amrit Kahlon <https://github.com/amritk/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="stripe-node.d.ts" />
+
+interface StripeStatic {
+    setPublishableKey(key: string): void;
+    validateCardNumber(cardNumber: string): boolean;
+    validateExpiry(month: string, year: string): boolean;
+    validateCVC(cardCVC: string): boolean;
+    cardType(cardNumber: string): string;
+    getToken(token: string, responseHandler: (status: number, response: StripeTokenResponse) => void): void;
+    card: StripeCardData;
+    createToken(data: StripeTokenData, responseHandler: (status: number, response: StripeTokenResponse) => void): void;
+    bankAccount: StripeBankAccount;
+}
+
+interface StripeTokenData {
+    number: string;
+    exp_month: number;
+    exp_year: number;
+    cvc?: string;
+    name?: string;
+    address_line1?: string;
+    address_line2?: string;
+    address_city?: string;
+    address_state?: string;
+    address_zip?: string;
+    address_country?: string;
+}
+
+interface StripeTokenResponse {
+    id: string;
+    card: StripeCardData;
+    created: number;
+    currency: string;
+    livemode: boolean;
+    object: string;
+    used: boolean;
+    error: StripeError;
+}
+
+interface StripeError {
+    type: string;
+    code: string;
+    message: string;
+    param?: string;
+}
+
+interface StripeCardData {
+    object: string;
+    last4: string;
+    type: string;
+    exp_month: number;
+    exp_year: number;
+    fingerprint: string;
+    country?: string;
+    name?: string;
+    address_line1?: string;
+    address_line2?: string;
+    address_city?: string;
+    address_state?: string;
+    address_zip?: string;
+    address_country?: string;
+    createToken(data: StripeTokenData, responseHandler: (status: number, response: StripeTokenResponse) => void): void;
+}
+
+interface StripeBankAccount
+{
+    createToken(params: StripeBankTokenParams, stripeResponseHandler: (status:number, response: StripeBankTokenResponse) => void): void;
+    validateRoutingNumber(routingNumber: number | string, countryCode: string): boolean;
+    validateAccountNumber(accountNumber: number | string, countryCode: string): boolean;
+}
+
+interface StripeBankTokenParams
+{
+    country: string;
+    currency: string;
+    account_number: number | string;
+    routing_number?: number | string;
+    account_holder_name: string;
+    account_holder_type: string;
+}
+
+interface StripeBankTokenResponse
+{
+    id: string;
+    bank_account: {
+        id: string;
+        country: string;
+        bank_name: string;
+        last4: number;
+        validated: boolean;
+        object: string;
+    };
+    created: number;
+    livemode: boolean;
+    type: string;
+    object: string;
+    used: boolean;
+    error: StripeError;
+}
+
+declare var Stripe: StripeStatic;
+declare module "Stripe" {
+    export = StripeStatic;
+}
diff --git a/stripe/stripe-node-tests.ts b/stripe/stripe-node-tests.ts
index 3217b78fb2..21e41a2583 100644
--- a/stripe/stripe-node-tests.ts
+++ b/stripe/stripe-node-tests.ts
@@ -1,29 +1,93 @@
-/// <reference path="stripe-node.d.ts" />
-
 import StripeNode = require('stripe');
 
-var stripe = new StripeNode("sk_test_BF573NobVn98OiIsPAv7A04K");
+var stripeTor = new StripeNode("sk_test_BF573NobVn98OiIsPAv7A04K");
+var stripe = StripeNode("sk_test_BF573NobVn98OiIsPAv7A04K")
 
-stripe.setApiVersion('2015-02-18');
-stripe.customers.list({ limit: 3 }, function (err, customers) {
+stripe.setApiVersion('2016-03-07');
+
+
+//#region Balance tests
+// ##################################################################################
+
+stripe.balance.retrieve(function (err, balance) {
     // asynchronously called
 });
+stripe.balance.retrieve().then(function (balance) {
+    // asynchronously called
+});
+
+stripe.balance.retrieveTransaction(
+    "txn_17xMvmBoqMA9o2xkYNH2ewNj",
+    function (err, balanceTransaction) {
+        // asynchronously called
+    }
+);
+stripe.balance.retrieveTransaction(
+    "txn_17xMvmBoqMA9o2xkYNH2ewNj").then(
+    function (balanceTransaction) {
+        // asynchronously called
+    }
+);
+
+stripe.balance.listTransactions({ limit: 3 }, function (err, transactions) {
+    // asynchronously called
+});
+stripe.balance.listTransactions({ limit: 3 }).then( function (transactions) {
+    // asynchronously called
+});
+stripe.balance.listTransactions().then(function (transactions) {
+    // asynchronously called
+});
+//#endregion
+
+//#region Charges tests
+// ##################################################################################
 
 stripe.charges.create({
     amount: 400,
-    currency: "usd",
-    source: "tok_15V2YhEe31JkLCeQy9iUgsJX", // obtained with Stripe.js
+    currency: "gbp",
+    source: "tok_17wV94BoqMA9o2xkhlAd3ALf", // obtained with Stripe.js
     description: "Charge for test@example.com"
 }, function (err, charge) {
     // asynchronously called
+    });
+stripe.charges.create({
+    amount: 400,
+    currency: "gbp",
+    source: "tok_17wV94BoqMA9o2xkhlAd3ALf", // obtained with Stripe.js
+    description: "Charge for test@example.com"
+}).then(function (charge) {
+    // asynchronously called
+
+    charge.refunds.create().then(function (refund) {
+        // asynchronously called
+    });
+    charge.refunds.create({ amount: 100 }).then(function (refund) {
+        // asynchronously called
+    });
+
+    charge.refunds.retrieve("re_15jzA4Ee31JkLCeQcxbTbjaL").then(function (refund) {
+
+    });
+
+    charge.refunds.update("re_15jzA4Ee31JkLCeQcxbTbjaL", { metadata: { test: "data" } }).then(function (refund) {
+
+    });
+
+    charge.refunds.list({ limit: 3 }).then(function (refund) {
+
+    });
+    charge.refunds.list().then(function (refund) {
+
+    });
 });
 
-stripe.charges.retrieve(
-    "ch_15fvyXEe31JkLCeQOo0SwFk9",
-    function (err, charge) {
-        // asynchronously called
-    }
-    );
+stripe.charges.retrieve("ch_15fvyXEe31JkLCeQOo0SwFk9", function (err, charge) {
+    // asynchronously called
+});
+stripe.charges.retrieve("ch_15fvyXEe31JkLCeQOo0SwFk9").then(function (charge) {
+    // asynchronously called
+});
 
 stripe.charges.update(
     "ch_15fvyXEe31JkLCeQOo0SwFk9",
@@ -33,23 +97,41 @@ stripe.charges.update(
     function (err, charge) {
         // asynchronously called
     }
-    );
+);
+stripe.charges.update(
+    "ch_15fvyXEe31JkLCeQOo0SwFk9",
+    {
+        description: "Charge for test@example.com"
+    })
+    .then(function (charge) {
+        // asynchronously called
+    });
 
 stripe.charges.capture("ch_15fvyXEe31JkLCeQOo0SwFk9", function (err, charge) {
     // asynchronously called
 });
+stripe.charges.capture("ch_15fvyXEe31JkLCeQOo0SwFk9").then( function (charge) {
+    // asynchronously called
+});
 
 stripe.charges.list({ limit: 3 }, function (err, charges) {
     // asynchronously called
 });
+stripe.charges.list({ limit: 3 }).then(function (charges) {
+    // asynchronously called
+});
 
-stripe.charges.createRefund(
-    "ch_15fvyXEe31JkLCeQOo0SwFk9",
-    {},
+stripe.charges.refund("ch_15fvyXEe31JkLCeQOo0SwFk9", {},
     function (err, refund) {
         // asynchronously called
     }
-    );
+);
+stripe.charges.refund("ch_15fvyXEe31JkLCeQOo0SwFk9", {}).then(function (refund) {
+    // asynchronously called
+});
+stripe.charges.refund("ch_15fvyXEe31JkLCeQOo0SwFk9").then(function (refund) {
+    // asynchronously called
+});
 
 stripe.charges.retrieveRefund(
     "ch_15fvyXEe31JkLCeQOo0SwFk9",
@@ -57,51 +139,166 @@ stripe.charges.retrieveRefund(
     function (err, refund) {
         // asynchronously called
     }
-    );
+);
+stripe.charges.retrieveRefund(
+    "ch_15fvyXEe31JkLCeQOo0SwFk9",
+    "re_15jzA4Ee31JkLCeQcxbTbjaL").then(function (refund) {
+        // asynchronously called
+    }
+);
+
+stripe.charges.createRefund(
+    "ch_15fvyXEe31JkLCeQOo0SwFk9",
+    {},
+    function (err, refund) {
+        // asynchronously called
+    }
+);
+stripe.charges.createRefund(
+    "ch_15fvyXEe31JkLCeQOo0SwFk9",
+    function (err, refund) {
+        // asynchronously called
+    }
+);
+stripe.charges.createRefund("ch_15fvyXEe31JkLCeQOo0SwFk9").then(function (refund) {
+    // asynchronously called
+});
 
 stripe.charges.updateRefund(
     "ch_15fvyXEe31JkLCeQOo0SwFk9",
     "re_15jzA4Ee31JkLCeQcxbTbjaL",
     { metadata: { key: "value" } },
-    function (err, refund) {
+    function (err: StripeNode.IStripeError, refund: StripeNode.refunds.IRefund) {
         // asynchronously called
-    }
-    );
 
-stripe.charges.listRefunds('ch_15fvyXEe31JkLCeQOo0SwFk9', null, function (err, refunds) {
+    }
+);
+stripe.charges.updateRefund(
+    "ch_15fvyXEe31JkLCeQOo0SwFk9",
+    "re_15jzA4Ee31JkLCeQcxbTbjaL",
+    { metadata: { key: "value" } }).then(
+    function (refund) {
+        // asynchronously called
+
+    }
+);
+
+stripe.charges.listRefunds('ch_15fvyXEe31JkLCeQOo0SwFk9', function (err, refunds) {
     // asynchronously called
 });
+stripe.charges.listRefunds('ch_15fvyXEe31JkLCeQOo0SwFk9').then(function (refunds) {
+    // asynchronously called
+});
+stripe.charges.listRefunds('ch_15fvyXEe31JkLCeQOo0SwFk9', { limit: 3 }, function (err, refunds) {
+    // asynchronously called
+});
+stripe.charges.listRefunds('ch_15fvyXEe31JkLCeQOo0SwFk9', { limit: 3 }).then(function (refunds) {
+    // asynchronously called
+});
+
+stripe.charges.markAsSafe('ch_15fvyXEe31JkLCeQOo0SwFk9', function (err, refunds) {
+    // asynchronously called
+});
+stripe.charges.markAsSafe('ch_15fvyXEe31JkLCeQOo0SwFk9').then(function (refunds) {
+    // asynchronously called
+});
+
+stripe.charges.markAsFraudulent('ch_15fvyXEe31JkLCeQOo0SwFk9', function (err, refunds) {
+    // asynchronously called
+});
+stripe.charges.markAsFraudulent('ch_15fvyXEe31JkLCeQOo0SwFk9').then(function (refunds) {
+    // asynchronously called
+});
+
+//#endregion
+
+//#region Customer tests
+// ##################################################################################
 
 stripe.customers.create({
     description: 'Customer for test@example.com',
     source: "tok_15V2YhEe31JkLCeQy9iUgsJX" // obtained with Stripe.js
 }, function (err, customer) {
-        // asynchronously called
+    // asynchronously called
     });
+stripe.customers.create({
+    description: 'Customer for test@example.com',
+    source: "tok_15V2YhEe31JkLCeQy9iUgsJX" // obtained with Stripe.js
+}).then( function (customer) {
+    // asynchronously called
+    customer.cards.create({ card: "tok_17wV94BoqMA9o2xkhlAd3ALf"}).then(function (customer) {});
+    customer.cards.retrieve("card_17xMvXBoqMA9o2xkq6W5gamx").then(function (card) {});
+    customer.cards.update("card_17xMvXBoqMA9o2xkq6W5gamx", { name: "Test" }).then(function (card) {});
+    customer.cards.list().then(function (cards) {});
+    customer.cards.del("card_17xMvXBoqMA9o2xkq6W5gamx").then(function (confirmation) {});
+
+    customer.subscriptions.create({ plan: "gold" }).then(function (subscription) { });
+    customer.subscriptions.retrieve("sub_8Eluur5KoIKxuy").then(function (subscription) { });
+    customer.subscriptions.update("sub_8Eluur5KoIKxuy", { plan: "silver" }).then(function (subscription) { });
+    customer.subscriptions.list().then(function (subscriptions) { });
+    customer.subscriptions.del("sub_8Eluur5KoIKxuy").then(function (subscription) { });
+    customer.subscriptions.deleteDiscount("sub_8Eluur5KoIKxuy").then(function (confirmation) { });
+});
+
+
+stripe.customers.create({
+    description: 'Customer for test@example.com',
+    source: "tok_15V2YhEe31JkLCeQy9iUgsJX" // obtained with Stripe.js
+}, { stripe_account: "" }, function (err, customer) {
+    // asynchronously called
+});
+stripe.customers.create({
+    description: 'Customer for test@example.com',
+    source: "tok_15V2YhEe31JkLCeQy9iUgsJX" // obtained with Stripe.js
+}, { stripe_account: "" }).then(function (customer) {
+
+});
 
 stripe.customers.retrieve(
     "cus_5rfJKDJkuxzh5Q",
     function (err, customer) {
         // asynchronously called
+        customer.cards.create(
+            { card: "tok_15V2YhEe31JkLCeQy9iUgsJX" },
+            function (err, card) {
+                // asynchronously called
+                card.brand;
+            }
+        );
     }
-    );
+);
+stripe.customers.retrieve("cus_5rfJKDJkuxzh5Q").then(function (customer) {
+    // asynchronously called
+});
 
 stripe.customers.update("cus_5rfJKDJkuxzh5Q", {
     description: "Customer for test@example.com"
 }, function (err, customer) {
-        // asynchronously called
+    // asynchronously called
     });
+stripe.customers.update("cus_5rfJKDJkuxzh5Q", {
+    description: "Customer for test@example.com"
+}).then(function (customer) {
+    // asynchronously called
+});
 
 stripe.customers.del(
     "cus_5rfJKDJkuxzh5Q",
     function (err, confirmation) {
         // asynchronously called
     }
-    );
+);
+stripe.customers.del("cus_5rfJKDJkuxzh5Q").then(function (confirmation) {
+        // asynchronously called
+    }
+);
 
 stripe.customers.list({ limit: 3 }, function (err, customers) {
     // asynchronously called
 });
+stripe.customers.list({ limit: 3 }).then(function (customers) {
+    // asynchronously called
+});
 
 stripe.customers.createCard(
     "cus_5rfJKDJkuxzh5Q",
@@ -109,23 +306,85 @@ stripe.customers.createCard(
     function (err, card) {
         // asynchronously called
     }
-    );
+);
+stripe.customers.createCard("cus_5rfJKDJkuxzh5Q", { card: "tok_15V2YhEe31JkLCeQy9iUgsJX" }).then(function (card) {
+    // asynchronously called
+});
+
+stripe.customers.createSource(
+    "cus_5rfJKDJkuxzh5Q",
+    { source: "tok_15V2YhEe31JkLCeQy9iUgsJX" },
+    function (err, source) {
+        var card = <StripeNode.ICard>source;
+        var bankAcc = <StripeNode.IBankAccount>source;
+    }
+);
+stripe.customers.createSource("cus_5rfJKDJkuxzh5Q", { source: "tok_15V2YhEe31JkLCeQy9iUgsJX" }).then(function (source) {
+    var card = <StripeNode.ICard>source;
+    var bankAcc = <StripeNode.IBankAccount>source;
+});
+
+stripe.customers.createSource(
+    "cus_5rfJKDJkuxzh5Q",
+    {
+        source: {
+            object: "card",
+            exp_month: 1,
+            exp_year: 16,
+            number: 4242424242424242
+        }
+    },
+    function (err, card) {
+        // asynchronously called
+        var obj: StripeNode.ICard = card;
+    }
+);
+stripe.customers.createSource(
+    "cus_5rfJKDJkuxzh5Q",
+    {
+        source: {
+            object: "card",
+            exp_month: 1,
+            exp_year: 16,
+            number: 4242424242424242
+        }
+    }).then(
+    function (card) {
+        // asynchronously called
+        var obj: StripeNode.ICard = card;
+    }
+);
+
+stripe.customers.createSource(
+    "cus_5rfJKDJkuxzh5Q",
+    { source: "btok_8E264Lxsbyvj3E" },
+    function (err: StripeNode.IStripeError, bankAcc: StripeNode.IBankAccount) {
+        // asynchronously called
+        bankAcc.bank_name;
+    }
+);
+stripe.customers.createSource(
+    "cus_5rfJKDJkuxzh5Q",
+    { source: "btok_8E264Lxsbyvj3E" }).then(function (bankAcc: StripeNode.IBankAccount) {
+        // asynchronously called
+        bankAcc.bank_name;
+    }
+);
 
 stripe.customers.retrieveCard(
     "cus_5rfJKDJkuxzh5Q",
     "card_15fvyXEe31JkLCeQ9KMktP5S",
     function (err, card) {
         // asynchronously called
+        var obj: StripeNode.ICard = card;
     }
-    );
-
+);
 stripe.customers.retrieveCard(
     "cus_5rfJKDJkuxzh5Q",
-    "card_15fvyXEe31JkLCeQ9KMktP5S",
-    function (err, card) {
+    "card_15fvyXEe31JkLCeQ9KMktP5S").then(function (card) {
         // asynchronously called
-    }
-    );
+        var obj: StripeNode.ICard = card;
+    });
 
 stripe.customers.updateCard(
     "cus_5rfJKDJkuxzh5Q",
@@ -133,17 +392,17 @@ stripe.customers.updateCard(
     { name: "Jane Austen" },
     function (err, card) {
         // asynchronously called
+        var obj: StripeNode.ICard = card;
     }
-    );
+);
 
 stripe.customers.updateCard(
     "cus_5rfJKDJkuxzh5Q",
     "card_15fvyXEe31JkLCeQ9KMktP5S",
-    { name: "Jane Austen" },
-    function (err, card) {
+    { name: "Jane Austen" }).then(function (card) {
         // asynchronously called
-    }
-    );
+        var obj: StripeNode.ICard = card;
+    });
 
 stripe.customers.deleteCard(
     "cus_5rfJKDJkuxzh5Q",
@@ -151,11 +410,26 @@ stripe.customers.deleteCard(
     function (err, confirmation) {
         // asynchronously called
     }
-    );
+);
+stripe.customers.deleteCard(
+    "cus_5rfJKDJkuxzh5Q",
+    "card_15fvyXEe31JkLCeQ9KMktP5S").then(function (confirmation) {
+        // asynchronously called
+    });
 
 stripe.customers.listCards('cu_15fvyVEe31JkLCeQvr155iqc', null, function (err, cards) {
     // asynchronously called
 });
+stripe.customers.listCards('cu_15fvyVEe31JkLCeQvr155iqc', null).then(function (cards) {
+    // asynchronously called
+});
+
+stripe.customers.listCards('cu_15fvyVEe31JkLCeQvr155iqc', function (err, cards) {
+    // asynchronously called
+});
+stripe.customers.listCards('cu_15fvyVEe31JkLCeQvr155iqc').then(function (cards) {
+    // asynchronously called
+});
 
 stripe.customers.retrieveSubscription(
     "cus_5rfJKDJkuxzh5Q",
@@ -163,16 +437,19 @@ stripe.customers.retrieveSubscription(
     function (err, subscription) {
         // asynchronously called
     }
-    );
+);
+stripe.customers.retrieveSubscription("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLGSwsYp").then(function (subscription) {
+    // asynchronously called
+});
 
-stripe.customers.updateSubscription(
-    "cus_5rfJKDJkuxzh5Q",
-    "sub_5rfJxnBLGSwsYp",
-    { plan: "platypi-dev" },
+stripe.customers.updateSubscription("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLGSwsYp", { plan: "platypi-dev" },
     function (err, subscription) {
         // asynchronously called
     }
-    );
+);
+stripe.customers.updateSubscription("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLGSwsYp", { plan: "platypi-dev" }).then(function (subscription) {
+    // asynchronously called
+});
 
 stripe.customers.cancelSubscription(
     "cus_5rfJKDJkuxzh5Q",
@@ -181,104 +458,350 @@ stripe.customers.cancelSubscription(
     function (err, confirmation) {
         // asynchronously called
     }
-    );
+);
+stripe.customers.cancelSubscription("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLGSwsYp", null).then(function (confirmation) {
+    // asynchronously called
+});
+
+stripe.customers.cancelSubscription(
+    "cus_5rfJKDJkuxzh5Q",
+    "sub_5rfJxnBLGSwsYp",
+    function (err, confirmation) {
+        // asynchronously called
+    }
+);
+stripe.customers.cancelSubscription("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLGSwsYp").then(function (confirmation) {
+    // asynchronously called
+});
 
 stripe.customers.listSubscriptions('cu_15fvyVEe31JkLCeQvr155iqc', null, function (err, subscriptions) {
     // asynchronously called
 });
-
-stripe.plans.create({
-    amount: 2000,
-    interval: "month",
-    name: "Amazing Gold Plan",
-    currency: "usd",
-    id: "gold"
-}, function (err, plan) {
-        // asynchronously called
-    });
-
-stripe.plans.retrieve(
-    "platypi-dev",
-    function (err, plan) {
-        // asynchronously called
-    }
-    );
-
-stripe.plans.update("platypi-dev", {
-    name: "New plan name"
-}, function (err, plan) {
-        // asynchronously called
-    });
-
-stripe.plans.del(
-    "platypi-dev",
-    function (err, confirmation) {
-        // asynchronously called
-    }
-    );
-
-stripe.plans.list(null, function (err, plans) {
+stripe.customers.listSubscriptions('cu_15fvyVEe31JkLCeQvr155iqc', null).then(function (subscriptions) {
     // asynchronously called
 });
 
+stripe.customers.listSubscriptions('cu_15fvyVEe31JkLCeQvr155iqc', function (err, subscriptions) {
+    // asynchronously called
+});
+stripe.customers.listSubscriptions('cu_15fvyVEe31JkLCeQvr155iqc').then(function (subscriptions) {
+    // asynchronously called
+});
+
+stripe.customers.deleteDiscount("cus_5rfJKDJkuxzh5Q", function (err, confirmation) {
+    // asynchronously called
+});
+stripe.customers.deleteDiscount("cus_5rfJKDJkuxzh5Q").then(function (confirmation) {
+    // asynchronously called
+});
+
+stripe.customers.deleteSubscriptionDiscount("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLGSwsYp", function (err, confirmation) {
+    // asynchronously called
+});
+stripe.customers.deleteSubscriptionDiscount("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLGSwsYp").then(function (confirmation) {
+    // asynchronously called
+});
+
+//#endregion
+
+//#region Disputes tests
+// ##################################################################################
+
+//#endregion
+
+//#region Events tests
+// ##################################################################################
+
+//#endregion
+
+//#region File Uploads tests
+// ##################################################################################
+
+//#endregion
+
+//#region Refunds tests
+// ##################################################################################
+
+
+//#endregion
+
+//#region Tokens tests
+// ##################################################################################
+
+//#endregion
+
+//#region Transfers tests
+// ##################################################################################
+
+//#endregion
+
+//#region Transfers Reversals tests
+// ##################################################################################
+
+//#endregion
+
+//#region Accounts test
+// ##################################################################################
+
+stripe.accounts.create({
+    email: ""
+}, function (err, customer) {
+    // asynchronously called
+    }
+);
+stripe.accounts.create({
+    email: ""
+}).then(function (customer) {
+    // asynchronously called
+    }
+);
+
+stripe.accounts.retrieve(
+    "acct_17wV8KBoqMA9o2xk",
+    function (err, account) {
+        // asynchronously called
+    }
+);
+stripe.accounts.retrieve(
+    "acct_17wV8KBoqMA9o2xk").then(
+    function (account) {
+        // asynchronously called
+    }
+);
+
+stripe.accounts.update("acct_17wV8KBoqMA9o2xk",
+    {
+        support_phone: "555-867-5309"
+    },
+    function(err, account) {
+        // asynchronously called
+    }
+);
+stripe.accounts.update("acct_17wV8KBoqMA9o2xk",
+    {
+        support_phone: "555-867-5309"
+    }).then(
+    function(account) {
+        // asynchronously called
+    }
+);
+
+stripe.accounts.del("acct_17wV8KBoqMA9o2xk", function (err, confirmation) { });
+stripe.accounts.del("acct_17wV8KBoqMA9o2xk").then(function (confirmation) { });
+
+stripe.accounts.reject("acct_17wV8KBoqMA9o2xk", { reason: 'fraud' }, function (err, account) {
+    // asynchronously called
+});
+stripe.accounts.reject("acct_17wV8KBoqMA9o2xk", { reason: 'fraud' }).then(function (account) {
+    // asynchronously called
+});
+
+stripe.accounts.list(
+    { limit: 3 },
+    function (err, accounts) {
+        // asynchronously called
+    }
+);
+stripe.accounts.list(
+    { limit: 3 }).then(
+    function (accounts) {
+        // asynchronously called
+    }
+);
+//#endregion
+
+//#region Application Fee Refunds tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region Application Fees tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region Country Specs tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region External Accounts tests
+// ##################################################################################
+
+stripe.accounts.createExternalAccount("", { external_account: "btok_8E264Lxsbyvj3E" }, function (err, extAcc) {
+    var card = <StripeNode.ICard>extAcc;
+    var bankAcc = <StripeNode.IBankAccount>extAcc;
+});
+stripe.accounts.createExternalAccount("", { external_account: "tok_15V2YhEe31JkLCeQy9iUgsJX" }).then(function (extAcc) {
+    var card = <StripeNode.ICard>extAcc;
+    var bankAcc = <StripeNode.IBankAccount>extAcc;
+});
+
+stripe.accounts.createExternalAccount("", { external_account: "tok_15V2YhEe31JkLCeQy9iUgsJX" }, { stripe_account: "acct_17wV8KOoqMF9a2xk" }).then(function (extAcc) {
+    var card = <StripeNode.ICard>extAcc;
+    var bankAcc = <StripeNode.IBankAccount>extAcc;
+});
+stripe.accounts.createExternalAccount("", { external_account: "tok_15V2YhEe31JkLCeQy9iUgsJX" }, "acct_17wV8KOoqMF9a2xk").then(function (extAcc) {
+    var card = <StripeNode.ICard>extAcc;
+    var bankAcc = <StripeNode.IBankAccount>extAcc;
+});
+
+//#endregion
+
+//#region Bank Accounts tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region Bitcoin Receivers tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region Cards tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region Orders tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region Order Items tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region Products tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region SKUs tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region Coupons tests
+// ##################################################################################
+
 stripe.coupons.create({
     percent_off: 25,
     duration: 'repeating',
     duration_in_months: 3,
     id: '25OFF'
 }, function (err, coupon) {
-        // asynchronously called
+    // asynchronously called
     });
+stripe.coupons.create({
+    percent_off: 25,
+    duration: 'repeating',
+    duration_in_months: 3,
+    id: '25OFF'
+}).then(function (coupon) {
+    // asynchronously called
+});
 
 stripe.coupons.retrieve(
     "25OFF",
     function (err, coupon) {
         // asynchronously called
     }
-    );
+);
+stripe.coupons.retrieve("25OFF").then(function (coupon) {
+    // asynchronously called
+});
 
 stripe.coupons.update("25OFF", {
     metadata: { key: "value" }
-}, function (err, coupon) {
-        // asynchronously called
-    });
+}, function (err: StripeNode.IStripeError, coupon: StripeNode.coupons.ICoupon) {
+    // asynchronously called
+});
+stripe.coupons.update("25OFF", {
+    metadata: { key: "value" }
+}).then(function (coupon) {
+    // asynchronously called
+});
 
 stripe.coupons.del("25OFF", function (err, confirmation) {
 
+});
+stripe.coupons.del("25OFF").then(function (confirmation) {
+
 });
 
 stripe.coupons.list({ limit: 3 }, function (err, coupons) {
     // asynchronously called
 });
-
-stripe.customers.deleteDiscount("cus_5rfJKDJkuxzh5Q", function (err, confirmation) {
+stripe.coupons.list({ limit: 3 }).then(function (coupons) {
     // asynchronously called
 });
 
-stripe.customers.deleteSubscriptionDiscount("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLGSwsYp", function (err, confirmation) {
-    // asynchronously called
-});
+//#endregion
+
+//#region Discounts tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region Invoices tests
+// ##################################################################################
 
 stripe.invoices.create({
     customer: "cus_5rfJKDJkuxzh5Q"
 }, function (err, invoice) {
-        // asynchronously called
+    // asynchronously called
     });
+stripe.invoices.create({
+    customer: "cus_5rfJKDJkuxzh5Q"
+}).then(function (invoice) {
+    // asynchronously called
+});
 
 stripe.invoices.retrieve(
     "in_15fvyXEe31JkLCeQH7QbgZZb",
     function (err, invoice) {
         // asynchronously called
     }
-    );
+);
+stripe.invoices.retrieve("in_15fvyXEe31JkLCeQH7QbgZZb").then(function (invoice) {
+    // asynchronously called
+});
 
 stripe.invoices.retrieveLines(
     "in_15fvyXEe31JkLCeQH7QbgZZb",
     { limit: 5 },
     function (err, lines) {
         // asynchronously called
+        lines.data[0].type = "invoiceitem"
     }
-    );
+);
+stripe.invoices.retrieveLines("in_15fvyXEe31JkLCeQH7QbgZZb", { limit: 5 }).then(function (lines) {
+    // asynchronously called
+});
 
 stripe.invoices.retrieveUpcoming(
     "cus_5rfJKDJkuxzh5Q",
@@ -286,7 +809,20 @@ stripe.invoices.retrieveUpcoming(
     function (err, upcoming) {
         // asynchronously called
     }
-    );
+);
+stripe.invoices.retrieveUpcoming("cus_5rfJKDJkuxzh5Q", null).then(function (upcoming) {
+    // asynchronously called
+});
+
+stripe.invoices.retrieveUpcoming(
+    "cus_5rfJKDJkuxzh5Q",
+    function (err, upcoming) {
+        // asynchronously called
+    }
+);
+stripe.invoices.retrieveUpcoming("cus_5rfJKDJkuxzh5Q").then(function (upcoming) {
+    // asynchronously called
+});
 
 stripe.invoices.update(
     "in_15fvyXEe31JkLCeQH7QbgZZb",
@@ -296,15 +832,112 @@ stripe.invoices.update(
     function (err, invoice) {
         // asynchronously called
     }
-    );
+);
+stripe.invoices.update(
+    "in_15fvyXEe31JkLCeQH7QbgZZb",
+    {
+        closed: true
+    }).then(function (invoice) {
+        // asynchronously called
+    }
+);
 
 stripe.invoices.pay("in_15fvyXEe31JkLCeQH7QbgZZb", function (err, invoice) {
     // asynchronously called
 });
+stripe.invoices.pay("in_15fvyXEe31JkLCeQH7QbgZZb").then(function (invoice) {
+    // asynchronously called
+});
 
 stripe.invoices.list(
     { customer: "cus_5rfJKDJkuxzh5Q", limit: 3 },
     function (err, invoices) {
         // asynchronously called
     }
-    );
+);
+stripe.invoices.list({ customer: "cus_5rfJKDJkuxzh5Q", limit: 3 }).then(function (invoices) {
+    // asynchronously called
+});
+
+//#endregion
+
+//#region Invoice Items tests
+// ##################################################################################
+
+
+
+//#endregion
+
+//#region Plans tests
+// ##################################################################################
+
+stripe.plans.create({
+    amount: 2000,
+    interval: "month",
+    name: "Amazing Gold Plan",
+    currency: "usd",
+    id: "gold"
+}, function (err, plan) {
+    // asynchronously called
+    });
+stripe.plans.create({
+    amount: 2000,
+    interval: "month",
+    name: "Amazing Gold Plan",
+    currency: "usd",
+    id: "gold"
+}).then(function (plan) {
+    // asynchronously called
+});
+
+stripe.plans.retrieve(
+    "platypi-dev",
+    function (err, plan) {
+        // asynchronously called
+    }
+);
+stripe.plans.retrieve("platypi-dev").then(function (plan) {
+    // asynchronously called
+});
+
+stripe.plans.update("platypi-dev", {
+    name: "New plan name"
+}, function (err, plan) {
+    // asynchronously called
+});
+stripe.plans.update("platypi-dev", { name: "New plan name" }).then(function (plan) {
+    // asynchronously called
+});
+
+stripe.plans.del(
+    "platypi-dev",
+    function (err, confirmation) {
+        // asynchronously called
+    }
+);
+stripe.plans.del("platypi-dev").then(function (confirmation) {
+    // asynchronously called
+});
+
+stripe.plans.list(null, function (err, plans) {
+    // asynchronously called
+});
+stripe.plans.list(null).then(function (plans) {
+    // asynchronously called
+});
+
+stripe.plans.list(function (err, plans) {
+    // asynchronously called
+});
+stripe.plans.list().then(function (plans) {
+    // asynchronously called
+});
+
+//#endregion
+
+//#region Subscriptions tests
+// ##################################################################################
+
+
+
+//#endregion
diff --git a/stripe/stripe-node.d.ts b/stripe/stripe-node.d.ts
index 53c472463f..f4a607cb52 100644
--- a/stripe/stripe-node.d.ts
+++ b/stripe/stripe-node.d.ts
@@ -1,22 +1,30 @@
-// Type definitions for stripe-node
+// Type definitions for stripe-node 4.5.0
 // Project: https://github.com/stripe/stripe-node/
-// Definitions by: William Johnston <https://github.com/wjohnsto>
+// Definitions by: William Johnston <https://github.com/wjohnsto>, Peter Harris <https://github.com/codeanimal/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/// <reference types="bluebird" />
+/// <reference types="node" />
+
 declare module 'stripe' {
-    var out: typeof StripeNode.Stripe;
+    var out: StripeNode.StripeExport;
     export = out;
 }
 
 declare namespace StripeNode {
-    class Stripe {
-        static DEFAULT_HOST: string;
-        static DEFAULT_PORT: string;
-        static DEFAULT_BASE_PATH: string;
-        static DEFAULT_API_VERSION: string;
-        static DEFAULT_TIMEOUT: number;
-        static PACKAGE_VERSION: string;
-        static USER_AGENT: {
+    interface StripeExport extends StripeStatic {
+        new (apiKey: string, version?: string): Stripe;
+        (apiKey: string, version?: string): Stripe;
+    }
+    
+    interface StripeStatic {
+        DEFAULT_HOST: string;
+        DEFAULT_PORT: string;
+        DEFAULT_BASE_PATH: string;
+        DEFAULT_API_VERSION: string;
+        DEFAULT_TIMEOUT: number;
+        PACKAGE_VERSION: string;
+        USER_AGENT: {
             bindings_version: string;
             lang: string;
             lang_version: string;
@@ -24,39 +32,50 @@ declare namespace StripeNode {
             publisher: string;
             uname: string;
         };
-        static USER_AGENT_SERIALIZED: string;
+        USER_AGENT_SERIALIZED: string;
 
-        static resources: typeof resources;
-        static StripeResource: typeof StripeResource;
-
-        account: resources.Account;
+        resources: typeof resources;
+        StripeResource: typeof StripeResource;
+    }
+    
+    // Helper 
+    type IBankAccount = bankAccounts.IBankAccount;
+    type ICard = cards.ICard;
+    
+    interface Stripe extends StripeStatic {
+        accounts: resources.Accounts;
         balance: resources.Balance;
         charges: resources.Charges;
         coupons: resources.Coupons;
         customers: resources.Customers;
+        disputes: resources.Disputes;
         events: resources.Events;
         invoices: resources.Invoices;
         invoiceItems: resources.InvoiceItems;
         plans: resources.Plans;
+        /**
+         * @deprecated
+         */
         recipientCards: resources.RecipientCards;
+        /**
+         * @deprecated
+         */
         recipients: resources.Recipients;
         tokens: resources.Tokens;
-        yransfers: resources.Transfers;
+        transfers: resources.Transfers;
         applicationFees: resources.ApplicationFees;
         fileUploads: resources.FileUploads;
         bitcoinReceivers: resources.BitcoinReceivers;
-        customerCards: resources.CustomerCards;
-        customerSubscriptions: resources.CustomerSubscriptions;
-        chargeRefunds: resources.ChargeRefunds;
-        applicationFeeRefunds: resources.ApplicationFeeRefunds;
-        transferReversals: resources.TransferReversals;
-
-        constructor(apiKey: string, version?: string);
-
+        refunds: resources.Refunds;
+        countrySpecs: resources.CountrySpecs;
+        orders: resources.Orders;
+        products: resources.Products;
+        skus: resources.SKUs;
+        
         setHost(host: string): void;
         setHost(host: string, port: string|number): void;
         setHost(host: string, port: string|number, protocol: string): void;
-
+        
         setProtocol(protocol: string): void;
         setPort(port: string|number): void;
         setApiVersion(version?: string): void;
@@ -66,80 +85,628 @@ declare namespace StripeNode {
         getConstant(c: string): any;
         getClientUserAgent(response: (userAgent: string) => void): void;
     }
-
-    namespace account { }
-
+    
+    namespace accounts { 
+        interface IAccount extends IResourceObject, IAccountShared {
+            /**
+             * Value is "account"
+             */
+            object: string;
+            
+            /**
+             * Whether or not the account can create live charges
+             */
+            charges_enabled: boolean;
+            
+            /**
+             * The country of the account
+             */
+            country: string;
+            
+            /**
+             * Whether or not account details have been submitted yet. Standalone 
+             * accounts cannot receive transfers before this is true.
+             */
+            details_submitted: boolean;
+            
+            /**
+             * The display name for this account. This is used on the Stripe dashboard to 
+             * help you differentiate between accounts.
+             */
+            display_name: string;
+            
+            /**
+             * Whether or not Stripe will send automatic transfers for this account. This 
+             * is only false when Stripe is waiting for additional information from the 
+             * account holder.
+             */
+            transfers_enabled: boolean;
+            
+            /**
+             * The state of the account’s information requests, including what 
+             * information is needed and by when it must be provided.
+             */
+            verification: {
+                /**
+                 * A string describing the reason for this account being unable to charge 
+                 * and/or transfer, if that is the case. Possible values are "rejected.fraud", 
+                 * "rejected.terms_of_service", "rejected.listed", "rejected.other", 
+                 * "fields_needed", "listed", or "other".
+                 */
+                disabled_reason: string;
+                
+                /**
+                 * At what time the fields_needed must be provided. If this date is in 
+                 * the past, the account is already in bad standing, and providing 
+                 * fields_needed is necessary to re-enable transfers and prevent other 
+                 * consequences. If this date is in the future, fields_needed must be 
+                 * provided to ensure the account remains in good standing.
+                 */
+                due_by: number;
+                
+                /**
+                 * Field names that need to be provided for the account to remain in good 
+                 * standing. Nested fields are separated by "." (for example, 
+                 * "legal_entity.first_name").
+                 */
+                fields_needed: Array<string>;
+            }
+        }
+        
+        interface IAccountCreationOptions extends IAccountUpdateOptions {
+            /**
+             * The country the account holder resides in or that the business is legally 
+             * established in. For example, if you are in the United States and the 
+             * business you’re creating an account for is legally represented in Canada, 
+             * you would use “CA” as the country for the account being created.
+             */
+            country?: string;
+            
+            /**
+             * The email address of the account holder. For standalone accounts, Stripe 
+             * will email your user with instructions for how to set up their account. For 
+             * managed accounts, this is only to make the account easier to identify to 
+             * you: Stripe will never directly reach out to your users.
+             */
+            email: string;
+            
+            /**
+             * Whether you'd like to create a managed or standalone account. Managed 
+             * accounts have extra parameters available to them, and require that you, 
+             * the platform, handle all communication with the account holder. 
+             * Standalone accounts are normal Stripe accounts: Stripe will email the 
+             * account holder to setup a username and password, and handle all account 
+             * management directly with them.
+             */
+            managed?: boolean;
+        }
+        
+        interface IAccountShared {
+            business_logo?: string;
+            
+            /**
+             * The publicly sharable name for this account
+             */
+            business_name?: string;
+            
+            /**
+             * A CSS hex color value representing the primary branding color for this 
+             * account
+             */
+            business_primary_color?: string;
+            
+            /**
+             * The URL that best shows the service or product provided for this account
+             */
+            business_url?: string;
+            
+            /**
+             * A boolean for whether or not Stripe should try to reclaim negative 
+             * balances from the account holder’s bank account. See our managed 
+             * account bank transfer guide for more information
+             */
+            debit_negative_balances?: boolean;
+            
+            /**
+             * Account-level settings to automatically decline certain types of charges 
+             * regardless of the bank’s decision.
+             */
+            decline_charge_on?: {
+                /**
+                 * Whether or not Stripe should automatically decline charges with an 
+                 * incorrect zip/postal code. This setting only applies if a card includes a 
+                 * zip code and the bank specifically marks it as failed.
+                 */
+                avs_failure?: boolean;
+                
+                /**
+                 * Whether or not Stripe should automatically decline charges with an 
+                 * incorrect CVC. This setting only applies if a card includes a CVC and the 
+                 * bank specifically marks it as failed.
+                 */
+                cvc_failure?: boolean;
+            };
+            
+            /**
+             * Three-letter ISO currency code representing the default currency for the 
+             * account. This must be a currency that Stripe supports in the account’s 
+             * country.
+             */
+            default_currency?: string;
+            
+            /**
+             * Email address of the account holder. For standalone accounts, this is used 
+             * to email them asking them to claim their Stripe account. For managed 
+             * accounts, this is only to make the account easier to identify to you: Stripe 
+             * will not email the account holder.
+             */
+            email?: string;
+            
+            /**
+             * Information about the holder of this account, i.e. the user receiving funds 
+             * from this account
+             */
+            legal_entity?: {}; //TODO: Implement this type definition.
+            
+            /**
+             * A set of key/value pairs that you can attach to an account object. It can be 
+             * useful for storing additional information about the account in a structured 
+             * format. This can be unset by updating the value to null and then saving.
+             */
+            metadata?: IMetadata;
+            
+            /**
+             * Internal-only description of the product being sold or service being 
+             * provided by this account. It’s used by Stripe for risk and underwriting 
+             * purposes.
+             */
+            product_description?: string;
+            
+            /**
+             * The text that will appear on credit card statements by default if a charge is 
+             * being made directly on the account.
+             */
+            statement_descriptor?: string;
+            
+            /**
+             * A publicly shareable email address that can be reached for support for this 
+             * account
+             */
+            support_email?: string;
+            
+            /**
+             * A publicly shareable phone number that can be reached for support for 
+             * this account
+             */
+            support_phone?: string;
+            
+            /**
+             * A publicly shareable URL that can be reached for support for this account
+             */
+            support_url?: string;
+            
+            /**
+             * Details on who accepted the Stripe terms of service, and when they 
+             * accepted it. See our updating managed accounts guide for more 
+             * information
+             */
+            tos_acceptance?: {
+                /**
+                 * The unix timestamp that Stripe’s terms of service were agreed to by the 
+                 * account holder
+                 */
+                date: number;
+                
+                /**
+                 * The IP address from which Stripe’s terms of service were agreed to by the account holder
+                 */
+                ip?: string;
+                
+                /**
+                 * The user agent of the browser from which Stripe’s terms of service 
+                 * were agreed to by the account holder
+                 */
+                user_agent?: string;
+            };
+            
+            /**
+             * Details on when this account will make funds from charges available, and 
+             * when they will be paid out to the account holder’s bank account. See our 
+             * managed account bank transfer guide for more information
+             */
+            transfer_schedule?: {
+                /**
+                 * The number of days charges for the account will be held before being 
+                 * paid out. May also be the string “minimum” for the lowest available 
+                 * value (based on country). Default is “minimum”. Does not apply when 
+                 * interval is “manual”.
+                 */
+                delay_days?: number | string;
+                
+                /**
+                 * How frequently funds will be paid out. One of "manual" (for only 
+                 * triggered via API call), "daily", "weekly", or "monthly". Default is "daily".
+                 */
+                interval?: string;
+                
+                /**
+                 * The day of the month funds will be paid out. Required and available 
+                 * only if interval is "monthly".
+                 */
+                monthly_anchor?: number;
+                
+                /**
+                 * The day of the week funds will be paid out, of the style ‘monday’, 
+                 * ‘tuesday’, etc. Required and available only if interval is weekly.
+                 */
+                weekly_anchor?: string;
+            }
+        }
+        
+        interface IAccountUpdateOptions extends IDataOptions, IAccountShared {
+            /**
+             * A card or bank account to attach to the account. You can provide either a 
+             * token, like the ones returned by Stripe.js, or a dictionary as documented in 
+             * the external_account parameter for either card or bank account creation. 
+             * 
+             * This will create a new external account object, make it the new default 
+             * external account for its currency, and delete the old default if one exists. If 
+             * you want to add additional external accounts instead of replacing the 
+             * existing default for this currency, use the bank account or card creation 
+             * API.
+             */
+            external_account?: {
+                /**
+                 * The type of external account. Should be "bank_account".
+                 */
+                object: string;
+                
+                /**
+                 * The account number for the bank account in string form. Must be a 
+                 * checking account.
+                 */
+                account_number: string;
+                
+                /**
+                 * The country the bank account is in.
+                 */
+                country: string;
+                
+                /**
+                 * The currency the bank account is in. This must be a country/currency 
+                 * pairing that Stripe supports.
+                 */
+                currency: string;
+                
+                /**
+                 * The name of the person or business that owns the bank account. This 
+                 * field is required when attaching the bank account to a customer object.
+                 */
+                account_holder_name?: string;
+                
+                /**
+                 * The type of entity that holds the account. This can be either 
+                 * "individual" or "company". This field is required when attaching the 
+                 * bank account to a customer object.
+                 */
+                account_holder_type?: string;
+                
+                /**
+                 * The routing number, sort code, or other country-appropriate institution 
+                 * number for the bank account. For US bank accounts, this is required 
+                 * and should be the ACH routing number, not the wire routing number. If 
+                 * you are providing an IBAN for account_number, this field is not 
+                 * required.
+                 */
+                routing_number?: string;
+            }
+        }
+        
+        interface IExternalAccountCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * When adding a card to a customer, the parameter name is source. When 
+             * adding to an account, the parameter name is external_account. The 
+             * value can either be a token, like the ones returned by our Stripe.js, or a 
+             * dictionary containing a user’s credit card details (with the options shown 
+             * below). Stripe will automatically validate the card.
+             */
+            external_account: string ;
+            
+            /**
+             * Only applicable on accounts (not customers or recipients). If you set this to true (or if this is the first external account being added 
+             * in this currency) this card will become the default external account for its currency.
+             */
+            default_for_currency?: boolean;
+        }
+        
+        interface IExternalAccountUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * If set to true, this bank account will become the default external account for its currency.
+             */
+            default_for_currency?: boolean;
+        }
+        
+        interface IBankAccountListOptions extends IListOptions {
+            object: "bank_account"
+        }
+        
+        interface ICardListOptions extends IListOptions {
+            object: "card"
+        }
+        
+        interface IRejectReason {
+            /**
+             * The reason for rejecting the account. May be one of "fraud", 
+             * "terms_of_service", or "other".
+             */
+            reason: "fraud" | "terms_of_service" | "other" ;
+        }
+    }
+    
+    namespace applicationFees { 
+        interface IApplicationFee extends IResourceObject {
+            /**
+             * Value is "application_fee"
+             */
+            object: string;
+            
+            /**
+             * ID of the Stripe account this fee was taken from. [Expandable]
+             */
+            account: string | accounts.IAccount;
+            
+            /**
+             * Amount earned, in cents/pence.
+             */
+            amount: number;
+            
+            /**
+             * Positive integer or zero
+             */
+            amount_refunded: number;
+            
+            /**
+             * ID of the Connect Application that earned the fee. [Expandable]
+             */
+            application: string; //TODO: Implement IApplication interface and reference type here for expansion:- "string | IApplication"
+            
+            /**
+             * Balance transaction that describes the impact of this collected application 
+             * fee on your account balance (not including refunds). [Expandable]
+             */
+            balance_transaction: string | balance.IBalanceTransaction;
+            
+            /**
+             * ID of the charge that the application fee was taken from. [Expandable]
+             */
+            charge: string | charges.ICharge;
+            
+            created: number;
+            
+            /**
+             * Three-letter ISO code representing the currency of the charge.
+             */
+            currency: string;
+            
+            livemode: boolean;
+            
+            /**
+             * ID of the corresponding charge on the platform account, if this fee was the 
+             * result of a charge using the destination parameter. [Expandable]
+             */
+            originating_transaction: string;
+            
+            /**
+             * Whether or not the fee has been fully refunded. If the fee is only partially 
+             * refunded, this attribute will still be false.
+             */
+            refunded: boolean;
+            
+            /**
+             * A list of refunds that have been applied to the fee.
+             */
+            refunds: IApplicationFeeRefunds;
+        }
+        
+        interface IApplicationFeeListOptions extends IListOptionsCreated {
+            /**
+             * Only return application fees for the charge specified by this charge ID.
+             */
+            charge: string;
+        }
+        
+        interface IApplicationFeeRefund extends IResourceObject {
+            /**
+             * Value is "fee_refund"
+             */
+            object:string;
+            
+            /**
+             * Amount, in cents/pence.
+             */
+            amount: number;
+            
+            /**
+             * Balance transaction that describes the impact on your account balance.
+             */
+            balance_transaction: string | balance.IBalanceTransaction;
+            
+            created: number;
+            
+            /**
+             * Three-letter ISO code representing the currency.
+             */
+            currency: string;
+            
+            /**
+             * ID of the application fee that was refunded.
+             */
+            fee: string | IApplicationFee;
+            
+            /**
+             * A set of key/value pairs that you can attach to the object. It can be useful 
+             * for storing additional information in a structured format.
+             */
+            metadata: IMetadata;
+        }
+        
+        interface IApplicationFeeRefunds extends IList<IApplicationFeeRefund>, resources.ApplicationFeeRefunds { }
+        
+        interface IApplicationFeeRefundCreationOptions extends IDataOptions {
+            /**
+             * A positive integer in pence representing how much of this fee to refund. 
+             * Can only refund up to the unrefunded amount remaining of the fee.
+             * 
+             * default is entire application fee
+             */
+            amount?: number;
+            
+            /**
+             * A set of key/value pairs that you can attach to a refund object. It can be 
+             * useful for storing additional information about the refund in a structured 
+             * format. You can unset an individual key by setting its value to null and 
+             * then saving. To clear all keys, set metadata to null, then save.
+             */
+            metadata?: IMetadata;
+        }
+    }
+    
     namespace balance {
-        interface IBalanceTransaction {
-            id: string;
-
+        interface IBalance extends IObject {
+            /**
+             * Value is 'balance'
+             */
+            object: string;
+            
+            /**
+             * Funds that are available to be paid out automatically by Stripe or explicitly 
+             * via the transfers API. The available balance for each currency and payment 
+             * type can be found in the source_types property.
+             */
+            available: Array<ISourceType>;
+            
+            livemode: boolean;
+            
+            /**
+             * Funds that are not available in the balance yet, due to the 7-day rolling pay 
+             * cycle. The pending balance for each currency and payment type can be 
+             * found in the source_types property
+             */
+            pending: Array<ISourceType>;
+        }
+        
+        interface ISourceType {
+            currency: string;
+            amount: number;
+            source_types: {
+                card: number;
+                bitcoin_receiver?: number;
+                customer_bank_account?: number;
+                alipay_account?: number;
+            }
+        }
+        
+        interface IBalanceTransaction extends IResourceObject {
             /**
              * Value is 'balance_transaction'
              */
             object: string;
 
             /**
-             * Gross amount of the transaction, in cents.
+             * Gross amount of the transaction, in cents/pence.
              */
             amount: number;
 
             /**
-             * The date the transaction�s net funds will become available in the Stripe balance.
+             * The date the transaction's net funds will become available in the Stripe balance.
              */
             available_on: number;
+            
             created: number;
 
             /**
              * Three-letter ISO currency code representing the currency.
              */
             currency: string;
-
+            
+            description?: string;
+            
             /**
-             * Fee (in cents) paid for this transaction
+             * Fee (in cents/pence) paid for this transaction
              */
             fee: number;
 
             /**
-             * Detailed breakdown of fees (in cents) paid for this transaction
+             * Detailed breakdown of fees (in cents/pence) paid for this transaction
              */
             fee_details: Array<{
                 amount: number;
-
+                application: string;
+                
                 /**
                  * Three-letter ISO currency code representing the currency of the amount that was disputed.
                  */
                 currency: string;
-
+                
+                description: string;
+                
                 /**
-                 * Type of the fee, one of: application_fee, stripe_fee or tax.
+                 * Type of the fee, one of: "application_fee", "stripe_fee"" or "tax".
                  */
                 type: string;
-                application: string;
-                description: string;
             }>;
 
             /**
              * Net amount of the transaction, in cents.
              */
             net: number;
-
+            
             /**
-             * If the transaction�s net funds are available in the Stripe balance yet. Either available or pending.
+             * The Stripe object this transaction is related to. [Expandable]
+             */
+            source: string | IResourceObject;
+            
+            /**
+             * The transfers (if any) for which source is a source_transaction.
+             */
+            source_transfers: IList<transfers.ITransfer>;
+            
+            /**
+             * If the transaction's net funds are available in the Stripe balance yet. Either "available" or "pending".
              */
             status: string;
 
             /**
-             * Type of the transaction, one of: charge, refund, adjustment, application_fee,
-             * application_fee_refund, transfer, transfer_cancel or transfer_failure.
+             * Transaction type: "adjustment", "application_fee", 
+             * "application_fee_refund", "charge", "payment", "payment_refund", 
+             * "refund", "transfer", "transfer_cancel", "transfer_failure", or 
+             * "transfer_refund".
              */
             type: string;
-            description?: string;
-
+        }
+        
+        interface IBalanceListOptions extends IListOptions {
+            available_on?: string | IDateFilter;
+            currency?: string;
+            
             /**
-             * The Stripe object this transaction is related to.
+             * Only returns transactions that are related to the specified Stripe object ID 
+             * (e.g. filtering by a charge ID will return all related charge transactions).
              */
-            source?: IPaymentToken | ICard;
-            source_transfers: IList<transfers.ITransfer>;
+            source?: string;
+            
+            /**
+             * For automatic Stripe transfers only, only returns transactions that were 
+             * transferred out on the specified transfer ID.
+             */
+            transfer?: string;
+            
+            /**
+             * Only returns transactions of the given type. One of: "charge", "refund", 
+             * "adjustment", "application_fee", "application_fee_refund", "transfer", 
+             * or "transfer_failure"
+             */
+            type?: string;
         }
     }
 
@@ -149,21 +716,35 @@ declare namespace StripeNode {
          * To charge a credit or a debit card, you create a charge object. You can retrieve and refund individual
          * charges as well as list all charges. Charges are identified by a unique random ID.
          */
-        interface ICharge {
-            id: string;
-
+        interface ICharge extends IResourceObject {
             /**
              * Value is 'charge'
              */
-            object: string;
-
-            livemode: boolean;
+            object: "charge";
 
             /**
-             * Amount charged in cents, positive integer or zero.
+             * Amount charged in cents/pence, positive integer or zero.
              */
             amount: number;
-
+            
+            /**
+             * Amount in cents/pence refunded (can be less than the amount attribute on the 
+             * charge if a partial refund was issued), positive integer or zero.
+             */
+            amount_refunded: number;
+            
+            /**
+             * The application fee (if any) for the charge. See the Connect documentation 
+             * for details. [Expandable]
+             */
+            application_fee?: string;
+            
+            /**
+             * ID of the balance transaction that describes the impact of this charge on 
+             * your account balance (not including refunds or disputes). [Expandable]
+             */
+            balance_transaction: string | balance.IBalanceTransaction;
+            
             /**
              * If the charge was created without capturing, this boolean represents whether or not it is
              * still uncaptured or has since been captured.
@@ -173,12 +754,78 @@ declare namespace StripeNode {
             created: number;
 
             /**
-             * Three-letter ISO currency code representing the currency in which the charge was made.
+             * Three-letter ISO currency code representing the currency in which the 
+             * charge was made.
              */
             currency: string;
+            
+            /**
+             * ID of the customer this charge is for if one exists. [Expandable]
+             */
+            customer: string | customers.ICustomer;
+            
+            description?: string;
+            
+            /**
+             * Details about the dispute if the charge has been disputed.
+             */
+            dispute?: disputes.IDispute;
+            
+            /**
+             * Error code explaining reason for charge failure if available (see the errors section for a list of
+             * codes: https://stripe.com/docs/api#errors).
+             */
+            failure_code: string;
+            
+            /**
+             * Message to user further explaining reason for charge failure if available.
+             */
+            failure_message: string;
+            
+            /**
+             * Hash with information on fraud assessments for the charge.
+             */
+            fraud_details: {
+                /**
+                 * Assessments reported by you have the key user_report and, if set, possible values of "safe" and "fraudulent".
+                 */
+                user_report?: "fraudulent" | "safe";
 
+                /**
+                 * Assessments from Stripe have the key stripe_report and, if set, the value "fraudulent".
+                 */
+                stripe_report?: "fraudulent";
+            };
+            
+            /**
+             * ID of the invoice this charge is for if one exists. [Expandable]
+             */
+            invoice: string | invoices.IInvoice;
+            
+            livemode: boolean;
+            
+            metadata: IMetadata;
+            
+            /**
+             * ID of the order this charge is for if one exists. [Expandable]
+             */
+            order: string | orders.IOrder;
+            
+            /**
+             * true if the charge succeeded, or was successfully authorized for later capture.
+             */
             paid: boolean;
-
+            
+            /**
+             * This is the email address that the receipt for this charge was sent to.
+             */
+            receipt_email: string;
+            
+            /**
+             * This is the transaction number that appears on email receipts sent for this charge.
+             */
+            receipt_number: string;
+            
             /**
              * Whether or not the charge has been fully refunded. If the charge is only partially refunded,
              * this attribute will still be false.
@@ -188,117 +835,234 @@ declare namespace StripeNode {
             /**
              * A list of refunds that have been applied to the charge.
              */
-            refunds: IList<chargeRefunds.IRefund>;
-
-            /**
-             * For most Stripe users, the source of every charge is a credit or debit card.
-             * This hash is then the card object describing that card.
-             */
-            source: ICard;
-
-            /**
-             * The status of the payment is either succeeded or failed.
-             */
-            status: string;
-
-            /**
-             * Amount in cents refunded (can be less than the amount attribute on the charge if a partial refund was issued).
-             */
-            amount_refunded: number;
-
-            /**
-             * ID of the balance transaction that describes the impact of this charge on your account balance (not including refunds or disputes).
-             */
-            balance_transaction: string;
-
-            /**
-             * ID of the customer this charge is for if one exists.
-             */
-            customer: string;
-            description?: string;
-
-            /**
-             * Details about the dispute if the charge has been disputed.
-             */
-            dispute?: IDispute;
-
-            /**
-             * Error code explaining reason for charge failure if available (see the errors section for a list of
-             * codes: https://stripe.com/docs/api#errors).
-             */
-            failure_code: string;
-
-            /**
-             * Message to user further explaining reason for charge failure if available.
-             */
-            failure_message: string;
-
-            /**
-             * ID of the invoice this charge is for if one exists.
-             */
-            invoice: string;
-            metadata: IMetadata;
-
-            /**
-             * This is the email address that the receipt for this charge was sent to.
-             */
-            receipt_email: string;
-
-            /**
-             * This is the transaction number that appears on email receipts sent for this charge.
-             */
-            receipt_number: string;
-            application_fee?: string;
-
-            /**
-             * Hash with information on fraud assessments for the charge.
-             */
-            fraud_details: {
-                /**
-                 * Assessments reported by you have the key user_report and, if set, possible values of safe and fraudulent.
-                 */
-                user_report?: string;
-
-                /**
-                 * Assessments from Stripe have the key stripe_report and, if set, the value fraudulent.
-                 */
-                stripe_report?: string;
-            };
-
+            refunds: IChargeRefunds;
+            
             /**
              * Shipping information for the charge.
              */
             shipping?: IShippingInformation;
+            
+            /**
+             * For most Stripe users, the source of every charge is a credit or debit card.
+             * This hash is then the card object describing that card.
+             */
+            source: cards.ICard | bitcoinReceivers.IBitcoinReceiver;
+            
+            /**
+             * The transfer ID which created this charge. Only present if the charge came 
+             * from another Stripe account. See the Connect documentation for details.
+             * [Expandable]
+             */
+            source_transfer: string | transfers.ITransfer;
+            
+            /**
+             * Extra information about a charge. This will appear on your customer’s 
+             * credit card statement.
+             */
+            statement_descriptor: string;
+            
+            /**
+             * The status of the payment is either "succeeded", "pending", or "failed".
+             */
+            status: "succeeded" | "pending" | "failed";
+            
+            /**
+             * ID of the transfer to the destination account (only applicable if the 
+             * charge was created using the destination parameter). [Expandable]
+             */
+            transfer: string | transfers.ITransfer;
         }
-    }
+        
+        interface IChargeCreationOptions extends IDataOptions {
+            /**
+             * A positive integer in the smallest currency unit (e.g 100 cents to charge 
+             * $1.00, or 1 to charge ¥1, a 0-decimal currency) representing how much to 
+             * charge the card. The minimum amount is £0.50 (or equivalent in charge 
+             * currency).
+             */
+            amount: number;
+            
+            /**
+             * 3-letter ISO code for currency.
+             */
+            currency: string;
+            
+            /**
+             * A fee in pence that will be applied to the charge and transferred to the 
+             * application owner's Stripe account. To use an application fee, the request 
+             * must be made on behalf of another account, using the Stripe-Account 
+             * header, an OAuth key, or the destination parameter. For more 
+             * information, see the application fees documentation.
+             * 
+             * Connect only.
+             */
+            application_fee?: number;
+            
+            /**
+             * Whether or not to immediately capture the charge. When false, the charge 
+             * issues an authorization (or pre-authorization), and will need to be 
+             * captured later. Uncaptured charges expire in 7 days. For more information, 
+             * see authorizing charges and settling later.
+             */
+            capture?: boolean;
+            
+            /**
+             * An arbitrary string which you can attach to a charge object. It is displayed 
+             * when in the web interface alongside the charge. Note that if you use Stripe 
+             * to send automatic email receipts to your customers, your receipt emails 
+             * will include the description of the charge(s) that they are describing.
+             */
+            description?: string;
+            
+            /**
+             * An account to make the charge on behalf of. If specified, the charge will be 
+             * attributed to the destination account for tax reporting, and the funds from 
+             * the charge will be transferred to the destination account. The ID of the 
+             * resulting transfer will be returned in the transfer field of the response. See 
+             * the documentation for details.
+             * 
+             * Connect only.
+             */
+            destination?: string;
+            
+            /**
+             * A set of key/value pairs that you can attach to a charge object. It can be 
+             * useful for storing additional information about the customer in a 
+             * structured format. It's often a good idea to store an email address in 
+             * metadata for tracking later.
+             */
+            metadata?: IMetadata;
+            
+            /**
+             * The email address to send this charge's receipt to. The receipt will not be 
+             * sent until the charge is paid. If this charge is for a customer, the email 
+             * address specified here will override the customer's email address. 
+             * Receipts will not be sent for test mode charges. If receipt_email is 
+             * specified for a charge in live mode, a receipt will be sent regardless of your 
+             * email settings.
+             */
+            receipt_email?: string;
+            
+            /**
+             * Shipping information for the charge. Helps prevent fraud on charges for 
+             * physical goods. For more information, see the Charge object 
+             * documentation.
+             */
+            shipping?: IShippingInformation;
+            
+            /**
+             * The ID of an existing customer that will be charged in this request.
+             */
+            customer?: string;
+            
+            /**
+             * A payment source to be charged, such as a credit card. If you also pass a 
+             * customer ID, the source must be the ID of a source belonging to the 
+             * customer. Otherwise, if you do not pass a customer ID, the source you 
+             * provide must either be a token, like the ones returned by Stripe.js, or a 
+             * object containing a user's credit card details, with the options described 
+             * below. Although not all information is required, the extra info helps 
+             * prevent fraud.
+             */
+            source?: sources.ISourceCreationOptions;
+            
+            /**
+             * An arbitrary string to be displayed on your customer's credit card 
+             * statement. This may be up to 22 characters. As an example, if your 
+             * website is RunClub and the item you're charging for is a race ticket, you 
+             * may want to specify a statement_descriptor of 
+             * RunClub 5K race ticket. The statement description may not include 
+             * <>"' characters, and will appear on your customer's statement in capital 
+             * letters. Non-ASCII characters are automatically stripped. While most 
+             * banks display this information consistently, some may display it 
+             * incorrectly or not at all.
+             */
+            statement_descriptor?: string;
+        }
+        
+        interface IChargeUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * An arbitrary string which you can attach to a charge object. It is displayed when in the web interface alongside the charge.
+             * Note that if you use Stripe to send automatic email receipts to your customers, your receipt emails will include the description
+             * of the charge(s) that they are describing. This can be unset by updating the value to null and then saving.
+             */
+            description?: string;
+            
+            /**
+             * A set of key/value pairs you can attach to a charge giving information about its riskiness.
+             */
+            fraud_details?: {
+                /**
+                 * If you believe a charge is fraudulent, include a user_report key with a value of fraudulent. If you believe a
+                 * charge is safe, include a user_report key with a value of safe. Note that you must refund a charge before setting
+                 * the user_report to fraudulent. Stripe will use the information you send to improve our fraud detection algorithm
+                 */
+                user_report?: "fraudulent" | "safe";
+            }
 
+            /**
+             * This is the email address that the receipt for this charge will be sent to.
+             * If this field is updated, then a new email receipt will be sent to the updated address.
+             */
+            receipt_email?: string;
+            
+            /**
+             * Shipping information for the charge. Helps prevent fraud on charges for 
+             * physical goods.
+             */
+            shipping?: IShippingInformation;
+        }
+        
+        interface IChargeListOptions extends IListOptionsCreated {
+            /**
+             * Only return charges for the customer specified by this customer ID.
+             */
+            customer?: string;
+            
+            /**
+             * A filter on the list based on the source of the charge. The value can be a 
+             * dictionary with the following options:
+             */
+            source?: {
+                /**
+                 * Return charges that match this source type string. Available options are 
+                 * "all", "alipay_account", "bitcoin_receiver", or "card".
+                 */
+                object: "all" | "alipay_account" | "bitcoin_receiver" | "card";
+            }
+        }
+
+        interface IChargeRefunds extends IList<refunds.IRefund>, resources.ChargeRefunds { }
+    }
+    
     namespace coupons {
         /**
          * A discount represents the actual application of a coupon to a particular customer. It contains information
          * about when the discount began and when it will end.
          */
-        interface IDiscount {
+        interface IDiscount extends IObject {
             /**
              * Value is 'discount'
              */
-            object: string;
-
+            object: "discount";
+            
             /**
              * Hash describing the coupon applied to create this discount
              */
             coupon: ICoupon;
+            
             customer: string;
-
-            /**
-             * Date that the coupon was applied
-             */
-            start: number;
-
+            
             /**
              * If the coupon has a duration of once or repeating, the date that this discount will end. If the coupon
              * used has a forever duration, this attribute will be null.
              */
             end: number;
+            
+            /**
+             * Date that the coupon was applied
+             */
+            start: number;
 
             /**
              * The subscription that this coupon is applied to, if it is applied to a particular subscription
@@ -310,45 +1074,41 @@ declare namespace StripeNode {
          * A coupon contains information about a percent-off or amount-off discount you might want to apply to a customer.
          * Coupons only apply to invoices; they do not apply to one-off charges.
          */
-        interface ICoupon {
-            id: string;
-
+        interface ICoupon extends IResourceObject {
             /**
              * Value is 'coupon'
              */
-            object: string;
-            livemode: boolean;
-            created: number;
-
-            /**
-             * One of forever, once, and repeating. Describes how long a customer who applies this coupon will get the discount.
-             */
-            duration: string;
-
+            object: "coupon";
+            
             /**
              * Amount (in the currency specified) that will be taken off the subtotal of any invoices for this customer.
              */
             amount_off: number;
-
+            
+            created: number;
+            
             /**
              * If amount_off has been set, the currency of the amount to take off.
              */
             currency: string;
-
+            
+            /**
+             * One of "forever", "once", and "repeating". Describes how long a customer who applies this coupon will get the discount.
+             */
+            duration: "forever" | "once" | "repeating" ;
+            
             /**
              * If duration is repeating, the number of months the coupon applies. Null if coupon duration is forever or once.
              */
             duration_in_months: number;
-
+            
+            livemode: boolean;
+            
             /**
              * Maximum number of times this coupon can be redeemed, in total, before it is no longer valid.
              */
             max_redemptions: number;
-
-            /**
-             * A set of key/value pairs that you can attach to a coupon object. It can be useful for storing
-             * additional information about the coupon in a structured format.
-             */
+            
             metadata: IMetadata;
 
             /**
@@ -372,68 +1132,632 @@ declare namespace StripeNode {
              */
             valid: boolean;
         }
+        
+        interface ICouponCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * Unique string of your choice that will be used to identify this coupon when applying it to a customer. This is often a specific 
+             * code you’ll give to your customer to use when signing up (e.g. FALL25OFF). If you don’t want to specify a particular code, you 
+             * can leave the ID blank and we’ll generate a random code for you.
+             */
+            id?: string;
+            
+            /**
+             * Specifies how long the discount will be in effect. Can be forever, once, or repeating.
+             */
+            duration: "forever" | "once" | "repeating" ;
+            
+            /**
+             * A positive integer representing the amount to subtract from an invoice total (required if percent_off is not passed)
+             */
+            amount_off?: number;
+            
+            /**
+             * Currency of the amount_off parameter (required if amount_off is passed)
+             */
+            currency?: string;
+            
+            /**
+             * Required only if duration is repeating, in which case it must be a positive integer that specifies the number of months 
+             * the discount will be in effect.
+             */
+            duration_in_months?: number;
+            
+            /**
+             * A positive integer specifying the number of times the coupon can be redeemed before it’s no longer valid. 
+             * 
+             * For example, you might have a 50% off coupon that the first 20 readers of your blog can use.
+             */
+            max_redemptions?: number;
+
+            /**
+             * A positive integer between 1 and 100 that represents the discount the coupon will apply (required if amount_off is not passed)
+             */
+            percent_off?: number;
+
+            /**
+             * Unix timestamp specifying the last time at which the coupon can be redeemed. 
+             * After the redeem_by date, the coupon can no longer be applied to new customers.
+             */
+            redeem_by?: number;
+        }
     }
+    
     namespace customers {
         /**
          * Customer objects allow you to perform recurring charges and track multiple charges that are associated
          * with the same customer. The API allows you to create, delete, and update your customers. You can
          * retrieve individual customers as well as a list of all your customers.
          */
-        interface ICustomer {
-            id: string;
-
+        interface ICustomer extends IResourceObject {
             /**
              * Value is 'customer'
              */
-            object: string;
-            livemode: boolean;
-            created: number;
-
+            object: "customer";
+            
             /**
-             * Current balance, if any, being stored on the customer�s account. If negative, the customer has credit to apply to
+             * Current balance, if any, being stored on the customer's account. If negative, the customer has credit to apply to
              * the next invoice. If positive, the customer has an amount owed that will be added to the next invoice. The balance
              * does not refer to any unpaid invoices; it solely takes into account amounts that have yet to be successfully applied
              * to any invoice. This balance is only taken into account for recurring charges.
              */
             account_balance?: number;
-
+            
+            created: number;
+            
             /**
              * The currency the customer can be charged in for recurring billing purposes (subscriptions, invoices, invoice items).
              */
             currency: string;
 
             /**
-             * ID of the default source attached to this customer.
+             * ID of the default source attached to this customer. [Expandable]
              */
-            default_source: string;
+            default_source: string | cards.ICard | bitcoinReceivers.IBitcoinReceiver;
 
             /**
-             * Whether or not the latest charge for the customer�s latest invoice has failed
+             * Whether or not the latest charge for the customer's latest invoice has failed
              */
             delinquent: boolean;
-
+            
+            description?: string;
+            
             /**
              * Describes the current discount active on the customer, if there is one.
              */
-            discount: coupons.IDiscount;
-            description?: string;
+            discount?: coupons.IDiscount;
+            
             email?: string;
-
-            /**
-             * A set of key/value pairs that you can attach to a customer object. It can be useful for storing
-             * additional information about the customer in a structured format.
-             */
+            
+            livemode: boolean;
+            
             metadata?: IMetadata;
-
-            sources?: IList<ICard | bitcoinReceivers.IBitcoinReceiver>;
+            
+            /**
+             * Shipping information associated with the customer.
+             */
+            shipping: IShippingInformation;
+            
+            /**
+             * The customer’s payment sources, if any
+             */
+            sources?: IList<cards.ICard | bitcoinReceivers.IBitcoinReceiver>;
+            
+            cards?: resources.CustomerCards;
+            
+            /**
+             * The customer's current subscriptions, if any
+             */
+            subscriptions: ICustomerSubscriptions;
+        }
+        
+        interface ICustomerSubscriptions extends IList<customerSubscriptions.ISubscription>, resources.CustomerSubscriptions {}
+        
+        interface ICustomerCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * An integer amount in cents that is the starting account balance for your customer. A negative amount represents a credit that
+             * will be used before attempting any charges to the customer's card; a positive amount will be added to the next invoice.
+             */
+            account_balance?: number;
 
             /**
-             * The customer�s current subscriptions, if any
+             * If you provide a coupon code, the customer will have a discount applied on all recurring charges. Charges you create through the
+             * API will not have the discount.
              */
-            subscriptions: IList<customerSubscriptions.ISubscription>;
+            coupon?: string;
+
+            /**
+             * An arbitrary string that you can attach to a customer object. It is displayed alongside the customer in the dashboard. This can
+             * be unset by updating the value to null and then saving.
+             */
+            description?: string;
+
+            /**
+             * Customer's email address. It's displayed alongside the customer in your dashboard and can be useful for searching and tracking.
+             * This can be unset by updating the value to null and then saving.
+             */
+            email?: string;
+            
+            /**
+             * The identifier of the plan to subscribe the customer to. If provided, the returned customer object will have a list of subscriptions
+             * that the customer is currently subscribed to. If you subscribe a customer to a plan without a free trial, the customer must have a
+             * valid card as well.
+             */
+            plan?: string;
+
+            /**
+             * The quantity you'd like to apply to the subscription you're creating (if you pass in a plan). For example, if your plan is
+             * 10 cents/user/month, and your customer has 5 users, you could pass 5 as the quantity to have the customer charged 50 cents
+             * (5 x 10 cents) monthly. Defaults to 1 if not set. Only applies when the plan parameter is also provided.
+             */
+            quantity?: number;
+            
+            shipping?: IShippingInformation;
+            
+            /**
+             * The source can either be a token, like the ones returned by our Stripe.js, or 
+             * a dictionary containing a user’s credit card details.
+             */
+            source?: sources.ISourceCreationOptionsExtended;
+            
+            /**
+             * A positive decimal (with at most two decimal places) between 1 and 100. 
+             * This represents the percentage of the subscription invoice subtotal that 
+             * will be calculated and added as tax to the final amount each billing period. 
+             * For example, a plan which charges $10/month with a tax_percent of 20.0 
+             * will charge $12 per invoice. Can only be used if a plan is provided.
+             */
+            tax_percent?: number;
+            
+            /**
+             * Unix timestamp representing the end of the trial period the customer will get before being charged. If set, trial_end will
+             * override the default trial period of the plan the customer is being subscribed to. The special value now can be provided to
+             * end the customer's trial immediately. Only applies when the plan parameter is also provided.
+             */
+            trial_end?: number;
+        }
+        
+        interface ICustomerUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * An integer amount in cents that is the starting account balance for your customer. A negative amount represents a credit that
+             * will be used before attempting any charges to the customer's card; a positive amount will be added to the next invoice.
+             */
+            account_balance?: number;
+
+            /**
+             * If you provide a coupon code, the customer will have a discount applied on all recurring charges. Charges you create through the
+             * API will not have the discount.
+             */
+            coupon?: string;
+            
+            /**
+             * ID of source to make the customer’s new default for invoice payments
+             */
+            default_source?: string;
+            
+            /**
+             * An arbitrary string that you can attach to a customer object. It is displayed alongside the customer in the dashboard. This can
+             * be unset by updating the value to null and then saving.
+             */
+            description?: string;
+
+            /**
+             * Customer's email address. It's displayed alongside the customer in your dashboard and can be useful for searching and tracking.
+             * This can be unset by updating the value to null and then saving.
+             */
+            email?: string;
+            
+            shipping?: IShippingInformation;
+            
+            /**
+             * The source can either be a token, like the ones returned by our Stripe.js, or 
+             * a dictionary containing a user’s credit card details (with the options shown 
+             * below). Passing source will create a new source object, make it the new 
+             * customer default source, and delete the old customer default if one exists. 
+             * If you want to add additional sources instead of replacing the existing 
+             * default, use the card creation API. Whenever you attach a card to a 
+             * customer, Stripe will automatically validate the card.
+             */
+            source?: sources.ISourceCreationOptionsExtended;
+        }
+        
+        interface ICustomerSourceCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * When adding a card to a customer, the parameter name is source. When 
+             * adding to an account, the parameter name is external_account. The 
+             * value can either be a token, like the ones returned by our Stripe.js, or a 
+             * dictionary containing a user’s credit card details (with the options shown 
+             * below). Stripe will automatically validate the card.
+             */
+            source: sources.ISourceCreationOptions;
+        }
+        
+        interface ICustomerCardSourceCreationOptions extends ICustomerSourceCreationOptions {
+            source: cards.ISourceCreationOptions;
+        }
+        
+        interface IBankAccountSourceListOptions extends IListOptions {
+            object: "bank_account"
+        }
+        
+        interface ICardSourceListOptions extends IListOptions {
+            object: "card"
         }
     }
-    namespace events { }
+    
+    namespace disputes {
+        /**
+         * A dispute occurs when a customer questions your charge with their bank or credit card company.
+         * When a customer disputes your charge, you're given the opportunity to respond to the dispute with
+         * evidence that shows the charge is legitimate. You can find more information about the dispute process
+         * in our disputes FAQ: https://stripe.com/help/disputes
+         */
+        interface IDispute extends IResourceObject {
+            /**
+             * Value is 'dispute'
+             */
+            object: "dispute";
+            
+            /**
+             * Disputed amount. Usually the amount of the charge, but can differ (usually because of currency
+             * fluctuation or because only part of the order is disputed).
+             */
+            amount: number;
+            
+            /**
+             * List of zero, one, or two balance transactions that show funds withdrawn and reinstated to your
+             * Stripe account as a result of this dispute.
+             */
+            balance_transactions: Array<balance.IBalanceTransaction>;
+            
+            /**
+             * ID of the charge that was disputed. [Expandable]
+             */
+            charge: string | charges.ICharge;
+            
+            /**
+             * Date dispute was opened
+             */
+            created: number;
+
+            /**
+             * Three-letter ISO currency code representing the currency of the amount that was disputed.
+             */
+            currency: string;
+            
+            /**
+             * Evidence provided to respond to a dispute. Updating any field in the hash will submit all fields in the hash for review.
+             */
+            evidence: IDisputeEvidence;
+            
+            /**
+             * Information about the evidence submission.
+             */
+            evidence_details?: {
+                /**
+                 * Date by which evidence must be submitted in order to successfully challenge dispute. Will be null
+                 * if the customer's bank or credit card company doesn't allow a response for this particular dispute.
+                 */
+                due_by: number;
+                
+                /**
+                 * Whether or not evidence has been saved for this dispute.
+                 */
+                has_evidence: boolean;
+
+                /**
+                 * Whether or not the last evidence submission was submitted past the due date. Defaults to false
+                 * if no evidence submissions have occurred. If true, then delivery of the latest evidence is not guaranteed.
+                 */
+                past_due: boolean;
+                
+                /**
+                 * The number of times the evidence has been submitted. You may submit evidence a maximum of 5 times
+                 */
+                submission_count: number;
+            };
+            
+            /**
+             * If true, it is still possible to refund the disputed payment. Once the payment has been fully
+             * refunded, no further funds will be withdrawn from your Stripe account as a result of this dispute.
+             */
+            is_charge_refundable: boolean;
+            
+            livemode: boolean;
+            metadata: IMetadata;
+            
+            /**
+             * Reason given by cardholder for dispute. 
+             * Possible values are duplicate, fraudulent, subscription_canceled, product_unacceptable, 
+             * product_not_received, unrecognized, credit_not_processed, incorrect_account_details, 
+             * insufficient_funds, bank_cannot_process, debit_not_authorized, general.
+             * Read more about dispute reasons: https://stripe.com/help/disputes#reasons
+             */
+            reason: "duplicate" | "fraudulent" | "subscription_canceled" | "product_unacceptable" | "product_not_received" | "unrecognized" | "credit_not_processed" | "incorrect_account_details" | "insufficient_funds" | "bank_cannot_process" | "debit_not_authorized" | "general";
+
+            /**
+             * Current status of dispute. Possible values are warning_needs_response, warning_under_review, warning_closed,
+             * needs_response, response_disabled, under_review, charge_refunded, won, lost.
+             */
+            status: "warning_needs_response" | "warning_under_review" | "warning_closed" | "needs_response" | "response_disabled" | "under_review" | "charge_refunded" | "won" | "lost";
+        }
+        
+        interface IDisputeEvidence {
+            /**
+             * Any server or activity logs showing proof that the customer accessed or downloaded the purchased
+             * digital product. This information should include IP addresses, corresponding timestamps, and any
+             * detailed recorded activity.
+             */
+            access_activity_log?: string;
+
+            /**
+             * The billing addess provided by the customer.
+             */
+            billing_address?: string;
+
+            /**
+             * (ID of a file upload) Your subscription cancellation policy, as shown to the customer. [Expandable]
+             */
+            cancellation_policy?: string;
+
+            /**
+             * An explanation of how and when the customer was shown your refund policy prior to purchase.
+             */
+            cancellation_policy_disclosure?: string;
+
+            /**
+             * A justification for why the customer's subscription was not canceled.
+             */
+            cancellation_rebuttal?: string;
+
+            /**
+             * (ID of a file upload) Any communication with the customer that you feel is relevant to your case (for
+             * example emails proving that they received the product or service, or demonstrating their use of or
+             * satisfaction with the product or service).
+             */
+            customer_communication?: string;
+
+            /**
+             * The email address of the customer.
+             */
+            customer_email_address?: string;
+
+            /**
+             * The name of the customer.
+             */
+            customer_name?: string;
+
+            /**
+             * The IP address that the customer used when making the purchase.
+             */
+            customer_purchase_ip?: string;
+
+            /**
+             * (ID of a file upload) A relevant document or contract showing the customer's signature. [Expandable]
+             */
+            customer_signature?: string;
+
+            /**
+             * (ID of a file upload) Documentation for the prior charge that can uniquely identify the charge,
+             * such as a receipt, shipping label, work order, etc. This document should be paired with a similar
+             * document from the disputed payment that proves the two payments are separate. [Expandable]
+             */
+            duplicate_charge_documentation?: string;
+
+            /**
+             * An explanation of the difference between the disputed charge and the prior charge that appears to be a duplicate.
+             */
+            duplicate_charge_explanation?: string;
+
+            /**
+             * The Stripe ID for the prior charge which appears to be a duplicate of the disputed charge.
+             */
+            duplicate_charge_id?: string;
+
+            /**
+             * A description of the product or service which was sold.
+             */
+            product_description?: string;
+
+            /**
+             * (ID of a file upload) Any receipt or message sent to the customer notifying them of the charge. [Expandable]
+             */
+            receipt?: string;
+
+            /**
+             * (ID of a file upload) Your refund policy, as shown to the customer. [Expandable]
+             */
+            refund_policy?: string;
+
+            /**
+             * Documentation demonstrating that the customer was shown your refund policy prior to purchase.
+             */
+            refund_policy_disclosure?: string;
+
+            /**
+             * A justification for why the customer is not entitled to a refund.
+             */
+            refund_refusal_explanation?: string;
+
+            /**
+             * The date on which the customer received or began receiving the purchased service, in a clear human-readable format.
+             */
+            service_date?: string;
+
+            /**
+             * (ID of a file upload) Documentation showing proof that a service was provided to the customer. This could
+             * include a copy of a signed contract, work order, or other form of written agreement.
+             */
+            service_documentation?: string;
+
+            /**
+             * The address to which a physical product was shipped. You should try to include as much complete address information as possible.
+             */
+            shipping_address?: string;
+
+            /**
+             * The delivery service that shipped a physical product, such as Fedex, UPS, USPS, etc. If multiple carriers were used
+             * for this purchase, please separate them with commas.
+             */
+            shipping_carrier?: string;
+
+            /**
+             * The date on which a physical product began its route to the shipping address, in a clear human-readable format.
+             */
+            shipping_date?: string;
+
+            /**
+             * (ID of a file upload) Documentation showing proof that a product was shipped to the customer at the same address
+             * the customer provided to you. This could include a copy of the shipment receipt, shipping label, etc, and should
+             * show the full shipping address of the customer, if possible. [Expandable]
+             */
+            shipping_documentation?: string;
+
+            /**
+             * The tracking number for a physical product, obtained from the delivery service. If multiple tracking numbers
+             * were generated for this purchase, please separate them with commas.
+             */
+            shipping_tracking_number?: string;
+
+            /**
+             * (ID of a file upload) Any additional evidence or statements. [Expandable]
+             */
+            uncategorized_file?: string;
+
+            /**
+             * Any additional evidence or statements.
+             */
+            uncategorized_text?: string;
+        }
+        
+        interface IDisputeUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * Evidence to upload to respond to a dispute. Updating any field in the hash will submit all fields in the hash for review.
+             */
+            evidence?: disputes.IDisputeEvidence;
+        }
+    }
+    
+    namespace events {
+        interface IEvent extends IResourceObject {
+            /**
+             * Value is "event"
+             */
+            object: "event";
+            
+            /**
+             * The Stripe API version used to render data. 
+             * Note: this property is populated for events on or after October 31, 2014.
+             */
+            api_version: string;
+            
+            created: number;
+            
+            /**
+             * Hash containing data associated with the event.
+             */
+            data: {
+                /**
+                 * describes the object the event is about. For example, an 
+                 * invoice.created event will have a full invoice object as the value of 
+                 * the object key.
+                 */
+                object: IObject;
+                
+                /**
+                 * 
+                 */
+                previous_attributes?: {};
+            };
+            
+            livemode: boolean;
+            
+            /**
+             * Number of webhooks yet to be delivered successfully (return a 20x response) to the URLs you’ve specified.
+             * 
+             * positive integer or zero
+             */
+            pending_webhooks: number;
+            
+            /**
+             * ID of the API request that caused the event. If null, the event was 
+             * automatic (e.g. Stripe’s automatic subscription handling). Request logs are 
+             * available in the dashboard but currently not in the API. Note: this property 
+             * is populated for events on or after April 23, 2013.
+             */
+            request?: string;
+            
+            /**
+             * Description of the event: e.g. invoice.created, charge.refunded, etc.
+             */
+            type: string;
+        }
+        
+        interface IEventListOptions extends IListOptionsCreated {
+            /**
+             * A string containing a specific event name, or group of events using * as a 
+             * wildcard. The list will be filtered to include only events with a matching 
+             * event property
+             */
+            type: string;
+        }
+     }
+    
+    namespace fileUploads {
+        interface IFileUpdate extends IResourceObject {
+            /**
+             * Value is "file_upload"
+             */
+            object: "file_upload";
+            
+            created: number;
+            
+            /**
+             * The purpose of the uploaded file. Possible values are "business_logo", 
+             * "dispute_evidence", "identity_document", "incorporation_article", 
+             * "incorporation_document".
+             */
+            purpose: IPurpose;
+            
+            /**
+             * The size in bytes of the file upload object.
+             */
+            size: number;
+            
+            /**
+             * The type of the file returned. Returns one of the following: 
+             * pdf, jpg, png.
+             */
+            type: "pdf" | "jpg" | "png";
+            
+            /**
+             * A read-only URL where the uploaded file can be accessed. Will be nil 
+             * unless the uploaded file has one of the following purposes:
+             *  business_logo, dispute_evidence, incorporation_document. 
+             * Also nil if retrieved with the publishable API key.
+             */
+            url: string;
+        }
+        
+        interface IFileUploadCreationOptions extends IDataOptions {
+            purpose: IPurpose;
+            file: {
+                data: string | Buffer;
+                name: string;
+                type: string | "application/octet-stream";
+            }
+        }
+        
+        interface IFileUploadListOptions extends IListOptionsCreated {
+            /**
+             * The file purpose to filter queries by. If none is provided, files will not be 
+             * filtered by purpose.
+             */
+            purpose: IPurpose;
+        }
+        
+        type IPurpose = "business_logo" | "dispute_evidence" | "identity_document" | "incorporation_article" | "incorporation_document";
+     }
+    
     namespace invoices {
         /**
          * Invoices are statements of what a customer owes for a particular billing period, including subscriptions,
@@ -448,24 +1772,27 @@ declare namespace StripeNode {
          * not include unpaid invoices; it only includes balances that need to be taken into account when calculating
          * the amount due for the next invoice.
          */
-        interface IInvoice {
-            id: string;
-
+        interface IInvoice extends IResourceObject {
             /**
              * Value is 'invoice'
              */
-            object: string;
-            livemode: boolean;
-
+            object: "invoice";
+            
             /**
-             * Final amount due at this time for this invoice. If the invoice�s total is smaller than the minimum charge
+             * Final amount due at this time for this invoice. If the invoice's total is smaller than the minimum charge
              * amount, for example, or if there is account credit that can be applied to the invoice, the amount_due may
              * be 0. If there is a positive starting_balance for the invoice (the customer owes money), the amount_due
              * will also take that into account. The charge that gets generated for the invoice will be for the amount
              * specified in amount_due.
              */
             amount_due: number;
-
+            
+            /**
+             * The fee in cents that will be applied to the invoice and transferred to the application owner's
+             * Stripe account when the invoice is paid.
+             */
+            application_fee: number;
+            
             /**
              * Number of payment attempts made for this invoice, from the perspective of the payment retry schedule. Any
              * payment attempt counts as the first attempt, and subsequently only automatic retries increment the attempt
@@ -479,16 +1806,30 @@ declare namespace StripeNode {
              * users.
              */
             attempted: boolean;
-
+            
             /**
-             * Whether or not the invoice is still trying to collect payment. An invoice is closed if it�s either paid or
+             * ID of the latest charge generated for this invoice, if any. [Expandable]
+             */
+            charge: string | charges.ICharge;
+            
+            /**
+             * Whether or not the invoice is still trying to collect payment. An invoice is closed if it's either paid or
              * it has been marked closed. A closed invoice will no longer attempt to collect payment.
              */
             closed: boolean;
+            
             currency: string;
             customer: string;
             date: number;
-
+            description: string;
+            discount: coupons.IDiscount;
+            
+            /**
+             * Ending customer balance after attempting to pay invoice. If the invoice has not been attempted yet,
+             * this will be null.
+             */
+            ending_balance: number;
+            
             /**
              * Whether or not the invoice has been forgiven. Forgiving an invoice instructs us to update the subscription
              * status as if the invoice were succcessfully paid. Once an invoice has been forgiven, it cannot be unforgiven
@@ -497,13 +1838,23 @@ declare namespace StripeNode {
             forgiven: boolean;
 
             /**
-             * The individual line items that make up the invoice
+             * The individual line items that make up the invoice. 
+             * 
+             * lines is sorted as follows: invoice items in reverse chronological order, followed by the subscription, if any.
              */
-            lines: IList<invoiceItems.InvoiceLineItem>;
-
+            lines: IList<IInvoiceLineItem>;
+            
+            livemode: boolean;
+            metadata: IMetadata;
+            
+            /**
+             * The time at which payment will next be attempted.
+             */
+            next_payment_attempt: number;
+            
             /**
              * Whether or not payment was successfully collected for this invoice. An invoice can be paid (most commonly)
-             * with a charge or with credit from the customer�s account balance.
+             * with a charge or with credit from the customer's account balance.
              */
             paid: boolean;
 
@@ -516,186 +1867,754 @@ declare namespace StripeNode {
              * Start of the usage period during which invoice items were added to this invoice
              */
             period_start: number;
-
+            
+            /**
+             * This is the transaction number that appears on email receipts sent for this invoice.
+             */
+            receipt_number: string;
+            
             /**
              * Starting customer balance before attempting to pay invoice. If the invoice has not been attempted yet,
              * this will be the current customer balance.
              */
             starting_balance: number;
-
-            /**
-             * Total of all subscriptions, invoice items, and prorations on the invoice before any discount is applied
-             */
-            subtotal: number;
-
-            /**
-             * Total after discount
-             */
-            total: number;
-
-            /**
-             * The fee in cents that will be applied to the invoice and transferred to the application owner�s
-             * Stripe account when the invoice is paid.
-             */
-            application_fee: number;
-
-            /**
-             * ID of the latest charge generated for this invoice, if any.
-             */
-            charge: string;
-            description: string;
-            discount: coupons.IDiscount;
-
-            /**
-             * Ending customer balance after attempting to pay invoice. If the invoice has not been attempted yet,
-             * this will be null.
-             */
-            ending_balance: number;
-
-            /**
-             * The time at which payment will next be attempted.
-             */
-            next_payment_attempt: number;
-
-            /**
-             * This is the transaction number that appears on email receipts sent for this invoice.
-             */
-            receipt_number: string;
-
+            
             /**
              * Extra information about an invoice for the customer�s credit card statement.
              */
             statement_descriptor: string;
-
+            
             /**
              * The subscription that this invoice was prepared for, if any.
              */
             subscription: string;
-
+            
+            /**
+             * Only set for upcoming invoices that preview prorations. The time used to calculate prorations.
+             */
+            subscription_proration_date: number;
+            
+            /**
+             * Total of all subscriptions, invoice items, and prorations on the invoice before any discount is applied
+             */
+            subtotal: number;
+            
+            /**
+             * The amount of tax included in the total, calculated from tax_percent and the subtotal. If no tax_percent
+             * is defined, this value will be null.
+             */
+            tax: number;
+            
+            /**
+             * This percentage of the subtotal has been added to the total amount of the invoice, including invoice line
+             * items and discounts. This field is inherited from the subscription's tax_percent field, but can be changed
+             * before the invoice is paid. This field defaults to null.
+             */
+            tax_percent: number;
+            
+            /**
+             * Total after discount
+             */
+            total: number;
+            
             /**
              * The time at which webhooks for this invoice were successfully delivered (if the invoice had no webhooks to
              * deliver, this will match date). Invoice payment is delayed until webhooks are delivered, or until all webhook
              * delivery attempts have been exhausted.
              */
             webhooks_delivered_at: number;
-
-            /**
-             * A set of key/value pairs that you can attach to an invoice object. It can be useful for storing additional
-             * information about the invoice in a structured format.
-             */
-            metadata: IMetadata;
-
-            /**
-             * The amount of tax included in the total, calculated from tax_percent and the subtotal. If no tax_percent
-             * is defined, this value will be null.
-             */
-            tax: number;
-
-            /**
-             * This percentage of the subtotal has been added to the total amount of the invoice, including invoice line
-             * items and discounts. This field is inherited from the subscription�s tax_percent field, but can be changed
-             * before the invoice is paid. This field defaults to null.
-             */
-            tax_percent: number;
         }
-    }
-    namespace invoiceItems {
-        interface InvoiceLineItem {
+        
+        interface IInvoiceLineItem extends IResourceObject {
             /**
              * The ID of the source of this line item, either an invoice item or a subscription
              */
             id: string;
-
+            
             /**
-             * Value is 'line_item'
+             * Value is "line_item"
              */
-            object: string;
-
+            object: "line_item";
+            
             /**
-             * Whether or not this is a test line item
-             */
-            livemode: boolean;
-
-            /**
-             * The amount, in cents
+             * The amount, in cents/pence
              */
             amount: number;
+            
             currency: string;
-
-            /**
-             * If true, discounts will apply to this line item. Always false for prorations.
-             */
-            discountable: boolean;
-
-            /**
-             * The period this line_item covers
-             */
-            period: {
-                /**
-                 * The period start date
-                 */
-                start: number;
-                /**
-                 * The period end date
-                 */
-                end: number;
-            };
-
-            /**
-             * Whether or not this is a proration
-             */
-            proration: boolean;
-
-            /**
-             * A string identifying the type of the source of this line item, either an invoiceitem or a subscription
-             */
-            type: string;
-
+            
             /**
              * A text description of the line item, if the line item is an invoice item
              */
             description: string;
-
+            
             /**
-             * Key-value pairs attached to the line item, if the line item is an invoice item
+             * If true, discounts will apply to this line item. Always false for prorations.
              */
+            discountable: boolean;
+            
+            /**
+             * Whether or not this is a test line item
+             */
+            livemode: boolean;
+            
             metadata: IMetadata;
-
+            
+            /**
+             * The period this line_item covers. For subscription line items, this is the subscription period. For prorations, this starts when 
+             * the proration was calculated, and ends at the period end of the subscription. For invoice items, this is the time at which the 
+             * invoice item was created, so the period start and end are the same time.
+             */
+            period: IPeriod;
+            
             /**
              * The plan of the subscription, if the line item is a subscription or a proration
              */
             plan: plans.IPlan;
-
+            
+            /**
+             * Whether or not this is a proration
+             */
+            proration: boolean;
+            
             /**
              * The quantity of the subscription, if the line item is a subscription or a proration
              */
             quantity: number;
-
+            
             /**
              * When type is invoiceitem, the subscription that the invoice item pertains to, if any. Left blank when
-             * type is already subscription, as it�d be redundant with id.
+             * type is already subscription, as it'd be redundant with id.
+             */
+            subscription: string;
+            
+            /**
+             * A string identifying the type of the source of this line item, either an invoiceitem or a subscription
+             */
+            type: "invoiceitem" | "subscription";
+        }
+        
+        interface IInvoiceCreationOptions extends IDataOptionsWithMetadata {
+            customer: string;
+            
+            /**
+             * A fee in pence that will be applied to the invoice and transferred to the application owner’s Stripe account. 
+             * The request must be made with an OAuth key or the Stripe-Account header in order to take an application fee. 
+             * For more information, see the application fees documentation.
+             */
+            application_fee?: number;
+            
+            description?: string;
+            
+            /**
+             * Extra information about a charge for the customer’s credit card statement.
+             */
+            statement_descriptor?: string
+            
+            /**
+             * The ID of the subscription to invoice. If not set, the created invoice will include all pending invoice items for 
+             * the customer. If set, the created invoice will exclude pending invoice items that pertain to other subscriptions.
+             */
+            subscription?: string;
+            
+            /**
+             * The percent tax rate applied to the invoice, represented as a decimal number.
+             */
+            tax_percent?: number;
+        }
+        
+        interface IInvoiceUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * A fee in pence that will be applied to the invoice and transferred to the application owner’s Stripe account. 
+             * The request must be made with an OAuth key or the Stripe-Account header in order to take an application fee. 
+             * For more information, see the application fees documentation.
+             */
+            application_fee?: number;
+            
+            /**
+             * Boolean representing whether an invoice is closed or not. To close an invoice, pass true.
+             */
+            closed?: boolean;
+            
+            description?: string;
+            
+            /**
+             * Boolean representing whether an invoice is forgiven or not. To forgive an invoice, pass true. Forgiving an invoice 
+             * instructs us to update the subscription status as if the invoice were successfully paid. Once an invoice has been 
+             * forgiven, it cannot be unforgiven or reopened.
+             */
+            forgiven?: boolean;
+            
+            /**
+             * Extra information about a charge for the customer’s credit card statement.
+             */
+            statement_descriptor?: string
+            
+            /**
+             * The percent tax rate applied to the invoice, represented as a decimal number.
+             */
+            tax_percent?: number;
+        }
+        
+        interface IInvoiceListOptions extends IListOptions {
+            /**
+             * The identifier of the customer whose invoices to return. If none is provided, all invoices will be returned.
+             */
+            customer?: string;
+            
+            date?: IDateFilter;
+        }
+        
+        interface IInvoiceLineItemRetrievalOptions extends IListOptions {
+            coupon?: string;
+            
+            /**
+             * In the case of upcoming invoices, the customer of the upcoming invoice is required. In other cases it is ignored.
+             */
+            customer?: string;
+            
+            /**
+             * In the case of upcoming invoices, the subscription of the upcoming invoice is optional. In other cases it is ignored.
+             */
+            subscription?: string;
+            
+            subscription_plan?: string;
+            subscription_prorate?: boolean;
+            subscription_proration_date?: number;
+            subscription_quantity?: number;
+            subscription_trial_end?: number;
+        }
+
+        interface IInvoiceUpcomingOptions extends IDataOptions {
+            /**
+             * The code of the coupon to apply. If a subscription or subscription_plan is provided, the invoice returned will preview updating 
+             * or creating a subscription with that coupon. Otherwise, it will preview applying that coupon to the customer for the next upcoming 
+             * invoice from among the customer’s subscriptions.
+             */
+            coupon?: string;
+            
+            /**
+             * The identifier of the subscription for which you’d like to retrieve the upcoming invoice. If not provided, but a subscription_plan 
+             * is provided, you will preview creating a subscription to that plan. If neither subscription nor subscription_plan is provided, you 
+             * will retrieve the next upcoming invoice from among the customer’s subscriptions.
+             */
+            subscription?: string;
+            
+            /**
+             * If set, the invoice returned will preview updating the subscription given to this plan, or creating a new subscription to this plan 
+             * if no subscription is given.
+             */
+            subscription_plan?: string;
+            
+            /**
+             * If previewing an update to a subscription, this decides whether the preview will show the result of applying prorations or not. If 
+             * set, one of subscription_plan or subscription, and one of subscription_plan, subscription_quantity or subscription_trial_end are 
+             * required.
+             */
+            subscription_prorate?: boolean;
+            
+            /**
+             * If previewing an update to a subscription, and doing proration, subscription_proration_date forces the proration to be calculated as 
+             * though the update was done at the specified time. The time given must be within the current subscription period, and cannot be 
+             * before the subscription was on its current plan.If set, subscription, and one of subscription_plan, subscription_quantity or 
+             * subscription_trial_end are required. Also, subscription_proration cannot be set to false.
+             */
+            subscription_proration_date?: number;
+            
+            /**
+             * If provided, the invoice returned will preview updating or creating a subscription with that quantity. If set, one of subscription_plan 
+             * or subscription is required.
+             */
+            subscription_quantity?: number;
+            
+            /**
+             * If provided, the invoice returned will preview updating or creating a subscription with that trial end. If set, one of subscription_plan 
+             * or subscription is required.
+             */
+            subscription_trial_end?: number;
+        }
+        
+        interface IPeriod {
+            /**
+             * The period start date
+             */
+            start: number;
+            /**
+             * The period end date
+             */
+            end: number;
+        }
+    }
+    namespace invoiceItems {
+        interface InvoiceItem extends IResourceObject {
+            /**
+             * Value is "invoiceitem"
+             */
+            object: "invoiceitem";
+            
+            amount: number;
+            currency: string;
+            customer: string;
+            date: number;
+            description: string;
+            
+            /**
+             * If true, discounts will apply to this invoice item. Always false for prorations.
+             */
+            discountable: boolean;
+            
+            invoice: string;
+            livemode: boolean;
+            metadata: IMetadata;
+            
+            period: invoices.IPeriod;
+            
+            /**
+             * If the invoice item is a proration, the plan of the subscription that the proration was computed for.
+             */
+            plan: plans.IPlan;
+            
+            /**
+             * Whether or not the invoice item was created automatically as a proration adjustment when the customer switched plans
+             */
+            proration: boolean;
+            
+            /**
+             * If the invoice item is a proration, the quantity of the subscription that the proration was computed for.
+             */
+            quantity: number;
+            
+            /**
+             * The subscription that this invoice item has been created for, if any.
              */
             subscription: string;
         }
+        
+        interface InvoiceItemCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * The integer amount in cents of the charge to be applied to the upcoming invoice. If you want to apply a credit to the customer’s 
+             * account, pass a negative amount.
+             */
+            amount: number;
+            
+            /**
+             * 3-letter ISO code for currency.
+             */
+            currency: string;
+            
+            /**
+             * The ID of the customer who will be billed when this invoice item is billed.
+             */
+            customer: string;
+            
+            /**
+             * An arbitrary string which you can attach to the invoice item. The description is displayed in the invoice for easy tracking. 
+             * This can be unset by updating the value to null and then saving.
+             */
+            description?: string;
+            
+            /**
+             * Controls whether discounts apply to this invoice item. Defaults to false for prorations or negative invoice items, and true for 
+             * all other invoice items.
+             */
+            discountable?: boolean;
+            
+            /**
+             * The ID of an existing invoice to add this invoice item to. When left blank, the invoice item will be added to the next upcoming 
+             * scheduled invoice. Use this when adding invoice items in response to an invoice.created webhook. You cannot add an invoice item 
+             * to an invoice that has already been paid, attempted or closed.
+             */
+            invoice?: string;
+            
+            /**
+             * The ID of a subscription to add this invoice item to. When left blank, the invoice item will be be added to the next upcoming 
+             * scheduled invoice. When set, scheduled invoices for subscriptions other than the specified subscription will ignore the invoice 
+             * item. Use this when you want to express that an invoice item has been accrued within the context of a particular subscription.
+             */
+            subscription?: string;
+        }
+        
+        interface InvoiceItemUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * The integer amount in cents/pence of the charge to be applied to the upcoming invoice. If you want to apply a credit to the customer's 
+             * account, pass a negative amount.
+             */
+            amount?: number;
+            
+            /**
+             * An arbitrary string which you can attach to the invoice item. The description is displayed in the invoice for easy tracking. This can be 
+             * unset by updating the value to null and then saving.
+             */
+            description?: string;
+            
+            /**
+             * Controls whether discounts apply to this invoice item. Defaults to false for prorations or negative invoice items, and true for all other 
+             * invoice items. Cannot be set to true for prorations.
+             */
+            discountable?: boolean;
+        }
+        
+        interface InvoiceItemListOptions extends IListOptionsCreated {
+            /**
+             * The identifier of the customer whose invoice items to return. If none is provided, all invoice items will be returned.
+             */
+            customer?: string;
+        }
     }
+    
+    namespace orders {
+        interface IOrder extends IResourceObject {
+            /**
+             * Value is "order"
+             */
+            object: "order";
+            
+            /**
+             * A positive integer in the smallest currency unit (that is, 100 cents for $1.00, or 1 for ¥1, Japanese Yen being a 0-decimal 
+             * currency) representing the total amount for the order.
+             */
+            amount: number;
+            
+            /**
+             * ID of the Connect Application that created the order.
+             */
+            application: string;
+            
+            application_fee: number;
+            
+            /**
+             * The ID of the payment used to pay for the order. Present if the order status is paid, fulfilled, or refunded. [Expandable]
+             */
+            charge: string | charges.ICharge;
+            
+            created: number;
+            
+            /**
+             * 3-letter ISO code representing the currency in which the order was made.
+             */
+            currency: string;
+            
+            /**
+             * The customer used for the order. [Expandable]
+             */
+            customer: string | customers.ICustomer;
+            
+            /**
+             * The email address of the customer placing the order.
+             */
+            email: string;
+            
+            external_coupon_code: string;
+            
+            /**
+             * List of items constituting the order.
+             */
+            items: Array<IOrderItem>;
+            
+            livemode: boolean;
+            metadata: IMetadata;
+            
+            /**
+             * The shipping method that is currently selected for this order, if any. If present, it is equal to one of the ids of shipping methods 
+             * in the shipping_methods array. At order creation time, if there are multiple shipping methods, Stripe will automatically selected 
+             * the first method.
+             */
+            selected_shipping_method: string;
+            
+            /**
+             * The shipping address for the order. Present if the order is for goods to be shipped.
+             */
+            shipping: IShippingInformation;
+            
+            /**
+             * A list of supported shipping methods for this order. The desired shipping method can be specified either by updating the order, or 
+             * when paying it.
+             */
+            shipping_methods: Array<IShippingMethod>;
+            
+            status: OrderStatus;
+            
+            /**
+             * The timestamps at which the order status was updated
+             */
+            status_transactions: {
+                canceled: number;
+                fulfiled: number;
+                paid: number;
+                returned: number;
+            };
+            
+            updated: number;
+        }
+        
+        interface IOrderItem extends IObject {
+            /**
+             * value is "order_item"
+             */
+            object: "order_item";
+            
+            /**
+             * A positive integer in the smallest currency unit (that is, 100 cents for $1.00, or 1 for ¥1, Japanese Yen being a 0-decimal currency) 
+             * representing the total amount for the line item.
+             */
+            amount: number;
+            
+            /**
+             * 3-letter ISO code representing the currency of the line item.
+             */
+            currency: string;
+            
+            /**
+             * Description of the line item, meant to be displayable to the user (e.g., "Express shipping").
+             */
+            description: string;
+            
+            /**
+             * The ID of the associated object for this line item. Expandable if not null (e.g., expandable to a SKU). [Expandable]
+             */
+            parent: string | skus.ISku;
+            
+            /**
+             * A positive integer representing the number of instances of parent that are included in this order item. 
+             * Applicable/present only if type is sku.
+             */
+            quantity: number;
+            
+            /**
+             * The type of line item. One of "sku", "tax", "shipping", or "discount".
+             */
+            type: "sku" | "tax" | "shipping" | "discount" ;
+        }
+        
+        interface IOrderCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * 3-letter ISO code representing the currency in which the order should be made. Stripe will validate that all entries in items match 
+             * the currency specified here.
+             */
+            currency: string;
+            
+            /**
+             * A coupon code that represents a discount to be applied to this order. Must be one-time duration and in same currency as the order.
+             */
+            coupon?: string;
+            
+            /**
+             * The ID of an existing customer to use for this order. If provided, the customer email and shipping address will be used to create 
+             * the order. Subsequently, the customer will also be charged to pay the order. If email or shipping are also provided, they will 
+             * override the values retrieved from the customer object.
+             */
+            customer?: string;
+            
+            /**
+             * The email address of the customer placing the order.
+             */
+            email?: string;
+            
+            /**
+             * List of items constituting the order.
+             */
+            items?: Array<IOrderItemCreationHash>;
+            
+            /**
+             * Shipping address for the order. Required if any of the SKUs are for products that have shippable set to true.
+             */
+            shipping?: IShippingInformation;
+        }
+        
+        interface IOrderUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * A coupon code that represents a discount to be applied to this order. Must be one-time duration and in same currency as the order.
+             */
+            coupon?: string;
+            
+            /**
+             * The shipping method to select for fulfilling this order. If specified, must be one of the ids of a shipping method in the 
+             * shipping_methods array. If specified, will overwrite the existing selected shipping method, updating items as necessary.
+             */
+            selected_shipping_method?: string;
+            
+            status: OrderStatus;
+        }
+        
+        interface IOrderPayOptions extends IDataOptionsWithMetadata {
+            /**
+             * The ID of an existing customer that will be charged in this request.
+             * 
+             * Either customer or source is required
+             */
+            customer?: string;
+            
+            /**
+             * A payment source to be charged, such as a credit card. If you also pass a customer ID, the source must be the ID of a source belonging 
+             * to the customer. Otherwise, if you do not pass a customer ID, the source you provide must either be a token, like the ones returned 
+             * by Stripe.js, or a object containing a user's credit card details, with the options described below. Although not all information is 
+             * required, the extra info helps prevent fraud.
+             * 
+             * Either source or customer is required
+             */
+            source?: sources.ISourceCreationOptions;
+            
+            /**
+             * A fee in cents/pence that will be applied to the order and transferred to the application owner's Stripe account. To use an application 
+             * fee, the request must be made on behalf of another account, using the Stripe-Account header or OAuth key. For more information, see 
+             * the application fees documentation.
+             */
+            application_fee?: number;
+            
+            /**
+             * The email address of the customer placing the order. If a customer is specified, that customer's email address will be used.
+             * 
+             * Optional, but required if not previously specified.
+             */
+            email?: string;
+        }
+        
+        interface IOrderListOptions extends IListOptionsCreated {
+            /**
+             * Only return orders for the given customer
+             */
+            customer?: string;
+            
+            /**
+             * Only return orders with the given IDs
+             */
+            ids?: Array<string>;
+            
+            /**
+             * Only return orders that have the given status. One of "created", "paid", "fulfilled", or "refunded".
+             */
+            status: OrderStatus;
+            
+            /**
+             * Filter orders based on when they were "paid", "fulfilled", "canceled", or "returned"
+             */
+            status_transitions?: {
+                /**
+                 * A filter on the list based on the object canceled field. The value can be a string with an integer Unix timestamp, 
+                 * or it can be a dictionary with the following options:
+                 */
+                canceled?: IDateFilter;
+                
+                /**
+                 * A filter on the list based on the object fulfilled field. The value can be a string with an integer Unix timestamp, 
+                 * or it can be a dictionary with the following options:
+                 */
+                fulfilled?: IDateFilter;
+                
+                /**
+                 * A filter on the list based on the object paid field. The value can be a string with an integer Unix timestamp, 
+                 * or it can be a dictionary with the following options:
+                 */
+                paid?: IDateFilter;
+                
+                /**
+                 * A filter on the list based on the object returned field. The value can be a string with an integer Unix timestamp, 
+                 * or it can be a dictionary with the following options:
+                 */
+                returned?: IDateFilter;
+            }
+        }
+        
+        interface IOrderItemCreationHash {
+            /**
+             * A positive integer in the smallest currency unit (that is, 100 cents for $1.00, or 1 for ¥1, Japanese Yen being a 0-decimal currency) 
+             * representing the total amount for the line item.
+             */
+            amount?: number;
+            
+            /**
+             * 3-letter ISO code representing the currency of the line item.
+             */
+            currency?: string;
+            
+            /**
+             * Description of the line item, meant to be displayable to the user (e.g., "Express shipping").
+             */
+            description?: string;
+            
+            /**
+             * The ID of the SKU being ordered.
+             */
+            parent: string;
+            
+            /**
+             * The quantity of this order item. When type is sku, this is the number of instances of the SKU to be ordered.
+             */
+            quantity?: number;
+            
+            /**
+             * The type of line item. One of "sku", "tax", "shipping", or "discount".
+             */
+            type?: "sku" | "tax" | "shipping" | "discount" ;
+        }
+        
+        interface IShippingMethod {
+            id: string;
+            
+            /**
+             * A positive integer in the smallest currency unit (that is, 100 cents for $1.00, or 1 for ¥1, Japanese Yen being a 0-decimal currency) 
+             * representing the total amount for the line item.
+             */
+            amount: number;
+            
+            /**
+             * 3-letter ISO code representing the currency of the line item.
+             */
+            currency: string;
+            
+            /**
+             * The estimated delivery date for the given shipping method. Can be either a specific date or a range.
+             */
+            delivery_estimate: {
+                /**
+                 * If type is "exact", date will be the expected delivery date in the format YYYY-MM-DD
+                 */
+                date: string;
+                
+                /**
+                 * If type is "range", earliest will be be the earliest delivery date in the format YYYY-MM-DD
+                 */
+                earliest: string;
+                
+                /**
+                 * If type is "range", latest will be the latest delivery date in the format YYYY-MM-DD
+                 */
+                latest: string;
+                
+                /**
+                 * The type of estimate. Must be either "range" or "exact"
+                 */
+                type: "range" | "exact";
+            };
+            
+            /**
+             * Description of the line item, meant to be displayable to the user (e.g., "Express shipping").
+             */
+            description: string;
+        }
+        
+        /**
+         * Current order status. One of created, paid, canceled, fulfilled, or returned. More detail in the Relay API Overview.
+         */
+        type OrderStatus = "created" | "paid" | "canceled" | "fulfilled" | "returned";
+    }
+    
     namespace plans {
         /**
          * A subscription plan contains the pricing information for different products and feature levels on your site.
          * For example, you might have a $10/month plan for basic features and a different $20/month plan for premium features.
          */
-        interface IPlan {
-            id: string;
-
+        interface IPlan extends IResourceObject {
             /**
-             * Value is 'plan'
+             * Value is "plan"
              */
-            object: string;
-            livemode: boolean;
-
+            object: "plan";
+            
             /**
              * The amount in cents to be charged on the interval specified
              */
             amount: number;
+            
             created: number;
 
             /**
@@ -704,52 +2623,619 @@ declare namespace StripeNode {
             currency: string;
 
             /**
-             * One of day, week, month or year. The frequency with which a subscription should be billed.
+             * One of "day", "week", "month" or "year". The frequency with which a subscription should be billed.
              */
-            interval: string;
-
+            interval: IntervalUnit;
+            
             /**
              * The number of intervals (specified in the interval property) between each subscription billing. For example,
              * interval=month and interval_count=3 bills every 3 months.
              */
             interval_count: number;
-
+            
+            livemode: boolean;
+            metadata: IMetadata;
+            
             /**
              * Display name of the plan
              */
             name: string;
-
+            
             /**
-             * A set of key/value pairs that you can attach to a plan object. It can be useful for storing additional information
-             * about the plan in a structured format.
+             * Extra information about a charge for the customer's credit card statement.
              */
-            metadata: IMetadata;
-
+            statement_descriptor: string;
+            
             /**
              * Number of trial period days granted when subscribing a customer to this plan. Null if the plan has no trial period.
              */
             trial_period_days: number;
-
+        }
+        
+        interface IPlanCreationOptions extends IDataOptionsWithMetadata {
             /**
-             * Extra information about a charge for the customer�s credit card statement.
+             * Unique string of your choice that will be used to identify this plan when subscribing a customer. This could be an identifier 
+             * like "gold" or a primary key from your own database.
              */
-            statement_descriptor: string;
+            id: string;
+            
+            /**
+             * A positive integer in cents/pence (or 0 for a free plan) representing how much to charge (on a recurring basis).
+             */
+            amount: number;
+            
+            /**
+             * 3-letter ISO code for currency.
+             */
+            currency: string;
+            
+            /**
+             * Specifies billing frequency. Either "day", "week", "month" or "year".
+             */
+            interval: IntervalUnit;
+            
+            /**
+             * Name of the plan, to be displayed on invoices and in the web interface.
+             */
+            name: string;
+            
+            /**
+             * The number of intervals between each subscription billing. For example, interval=month and interval_count=3 bills every 3 months. 
+             * Maximum of one year interval allowed (1 year, 12 months, or 52 weeks).
+             */
+            interval_count?: number;
+            
+            /**
+             * An arbitrary string to be displayed on your customer’s credit card statement. This may be up to 22 characters. As an example, if your website 
+             * is RunClub and the item you’re charging for is your Silver Plan, you may want to specify a statement_descriptor of RunClub Silver Plan. 
+             * The statement description may not include <>"' characters, and will appear on your customer’s statement in capital letters. Non-ASCII 
+             * characters are automatically stripped. While most banks display this information consistently, some may display it incorrectly or not at all.
+             */
+            statement_descriptor?: string;
+            
+            /**
+             * Specifies a trial period in (an integer number of) days. If you include a trial period, the customer won't be billed for the first time 
+             * until the trial period ends. If the customer cancels before the trial period is over, she'll never be billed at all.
+             */
+            trial_period_days?: number;
+        }
+        
+        interface IPlanUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * Name of the plan, to be displayed on invoices and in the web interface.
+             */
+            name?: string;
+            
+            /**
+             * An arbitrary string to be displayed on your customer’s credit card statement. This may be up to 22 characters. As an example, if your website 
+             * is RunClub and the item you’re charging for is your Silver Plan, you may want to specify a statement_descriptor of RunClub Silver Plan. 
+             * The statement description may not include <>"' characters, and will appear on your customer’s statement in capital letters. Non-ASCII 
+             * characters are automatically stripped. While most banks display this information consistently, some may display it incorrectly or not at all.
+             */
+            statement_descriptor?: string;
+        }
+        
+        type IntervalUnit = "day" | "week" | "month" | "year";
+    }
+    
+    namespace products {
+        interface IProduct extends IResourceObject {
+            /**
+             * Value is "product"
+             */
+            object: "product";
+            
+            /**
+             * Whether or not the product is currently available for purchase.
+             */
+            active: boolean;
+            
+            /**
+             * A list of up to 5 attributes that each SKU can provide values for (e.g. ["color", "size"]).
+             */
+            attributes: Array<string>;
+            
+            /**
+             * A short one-line description of the product, meant to be displayable to the customer.
+             */
+            caption: string;
+            
+            created: number;
+            
+            /**
+             * An array of connect application identifiers that cannot purchase this product.
+             */
+            deactivated_on: Array<string>;
+            
+            /**
+             * The product’s description, meant to be displayable to the customer.
+             */
+            description: string;
+            
+            /**
+             * A list of up to 8 URLs of images for this product, meant to be displayable to the customer.
+             */
+            images: Array<string>;
+            
+            livemode: boolean;
+            metadata: IMetadata;
+            
+            /**
+             * The product’s name, meant to be displayable to the customer.
+             */
+            name: string;
+            
+            package_dimensions: IPackageDimensions;
+            
+            /**
+             * Whether this product is a shipped good.
+             */
+            shippable: boolean;
+            
+            /**
+             * A sublist of active SKUs associated with this product.
+             */
+            skus: IList<skus.ISku>;
+            
+            updated: number;
+            
+            /**
+             * A URL of a publicly-accessible webpage for this product.
+             */
+            url: string;
+        }
+        
+        interface IProductCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * The identifier for the product. Must be unique. If not provided, an identifier will be randomly generated.
+             */
+            id?: string;
+            
+            /**
+             * The product’s name, meant to be displayable to the customer.
+             */
+            name: string;
+            
+            /**
+             * Whether or not the product is currently available for purchase. Defaults to true.
+             */
+            active?: boolean;
+            
+            /**
+             * A list of up to 5 alphanumeric attributes that each SKU can provide values for (e.g. ["color", "size"]).
+             */
+            attribute?: Array<string>;
+            
+            /**
+             * A short one-line description of the product, meant to be displayable to the customer.
+             */
+            caption?: string;
+            
+            /**
+             * An array of Connect application names or identifiers that should not be able to order the SKUs for this product.
+             */
+            deactivate_on?: Array<string>;
+            
+            /**
+             * The product’s description, meant to be displayable to the customer.
+             */
+            description?: string;
+            
+            /**
+             * A list of up to 8 URLs of images for this product, meant to be displayable to the customer.
+             */
+            images?: Array<string>;
+            
+            package_dimensions?: IPackageDimensions;
+            
+            /**
+             * Whether this product is shipped (i.e. physical goods). Defaults to true.
+             */
+            shippable?: boolean;
+            
+            /**
+             * A URL of a publicly-accessible webpage for this product.
+             */
+            url?: string;
+        }
+        
+        interface IProductUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * Whether or not the product is available for purchase. Setting this to false also deactivates any active, related SKUs. Setting this to 
+             * true does not automatically activate any deactivated, related SKUs.
+             */
+            active?: boolean;
+            
+            /**
+             * A short one-line description of the product, meant to be displayable to the customer.
+             */
+            caption?: string;
+            
+            /**
+             * An array of Connect application names or identifiers that should not be able to order the SKUs for this product. This can be unset 
+             * by updating the value to null and then saving.
+             */
+            deactivate_on?: Array<string>;
+            
+            /**
+             * The product’s description, meant to be displayable to the customer.
+             */
+            description?: string;
+            
+            /**
+             * A list of up to 8 URLs of images for this product, meant to be displayable to the customer. This can be unset by updating the value to 
+             * null and then saving.
+             */
+            images?: Array<string>;
+            
+            /**
+             * The product’s name, meant to be displayable to the customer.
+             */
+            name?: string;
+            
+            package_dimensions?: IPackageDimensions;
+            
+            /**
+             * Whether this product is shipped (i.e. physical goods). Defaults to true.
+             */
+            shippable?: boolean;
+            
+            /**
+             * A URL of a publicly-accessible webpage for this product.
+             */
+            url?: string;
+        }
+        
+        interface IProductListOptions extends IListOptions {
+            /**
+             * Only return products that are active or inactive (e.g. pass false to list all inactive products).
+             */
+            active?: boolean;
+            
+            /**
+             * Only return products with the given IDs.
+             */
+            ids?: Array<string>;
+            
+            /**
+             * Only return products that can be shipped (i.e., physical, not digital products).
+             */
+            shippable?: boolean;
+            
+            /**
+             * Only return products with the given url
+             */
+            url?: string;
+        }
+        
+        /**
+         * The dimensions of this product for shipping purposes. A SKU associated with this product can override this value by having its 
+         * own package_dimensions
+         */
+        interface IPackageDimensions {
+            /**
+             * Height, in inches. Maximum precision is 2 decimal places.
+             */
+            height: number;
+            /**
+             * Length, in inches. Maximum precision is 2 decimal places.
+             */
+            length: number;
+            /**
+             * Weight, in ounces. Maximum precision is 2 decimal places.
+             */
+            weight: number;
+            /**
+             * Width, in inches. Maximum precision is 2 decimal places.
+             */
+            width: number;
         }
     }
+    
     namespace recipientCards { }
-    namespace recipients { }
-    namespace tokens { }
-    namespace transfers {
-        interface ITransfer {
-            id: string;
-            object: string;
+    
+    namespace recipients {
+        interface IRecipient extends IResourceObject { 
+            
+        }
+     }
+    
+    namespace skus {
+        interface ISku extends IResourceObject {
+            /**
+             * Value is "sku"
+             */
+            object: "sku";
+            
+            /**
+             * Whether or not the SKU is available for purchase.
+             */
+            active: boolean;
+            
+            attributes: ISkuAttributes;
+            created: number;
+            
+            /**
+             * 3-letter ISO code for currency.
+             */
+            currency: string;
+            
+            /**
+             * The URL of an image for this SKU, meant to be displayable to the customer.
+             */
+            image: string;
+            
+            inventory: IInventory;
             livemode: boolean;
-
+            metadata: IMetadata;
+            
+            /**
+             * The dimensions of this SKU for shipping purposes.
+             */
+            package_dimensions: products.IPackageDimensions;
+            
+            /**
+             * The cost of the item as a positive integer in the smallest currency unit (that is, 100 cents to charge $1.00, or 1 to charge ¥1, 
+             * Japanese Yen being a 0-decimal currency).
+             */
+            price: number;
+            
+            /**
+             * The ID of the product this SKU is associated with. The product must be currently active. [Expandable]
+             */
+            product: string | products.IProduct;
+            
+            updated: number;
+        }
+        
+        interface ISkuCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * The identifier for the SKU. Must be unique. If not provided, an identifier will be randomly generated.
+             */
+            id?: string;
+            
+            /**
+             * 3-letter ISO code for currency.
+             */
+            currency: string;
+            
+            inventory: IInventory;
+            
+            /**
+             * The cost of the item as a nonnegative integer in the smallest currency unit (that is, 100 cents to charge $1.00, or 1 to charge ¥1, 
+             * Japanese Yen being a 0-decimal currency).
+             */
+            price: number;
+            
+            /**
+             * The ID of the product this SKU is associated with.
+             */
+            product: string;
+            
+            /**
+             * Whether or not the SKU is available for purchase. Default to true.
+             */
+            active?: boolean;
+            
+            attributes?: ISkuAttributes;
+            
+            /**
+             * The URL of an image for this SKU, meant to be displayable to the customer.
+             */
+            image?: string;
+            
+            /**
+             * The dimensions of this SKU for shipping purposes.
+             */
+            package_dimensions?: products.IPackageDimensions;
+        }
+        
+        interface ISkuUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * Whether or not the SKU is available for purchase.
+             */
+            active?: boolean;
+            
+            /**
+             * 3-letter ISO code for currency.
+             */
+            currency?: string;
+            
+            /**
+             * The URL of an image for this SKU, meant to be displayable to the customer. 
+             * This can be unset by updating the value to null and then saving.
+             */
+            image?: string;
+            
+            inventory?: IInventory;
+            
+            /**
+             * The dimensions of this SKU for shipping purposes.
+             */
+            package_dimensions?: products.IPackageDimensions;
+            
+            /**
+             * The cost of the item as a nonnegative integer in the smallest currency unit (that is, 100 cents to charge $1.00, or 1 to charge ¥1, 
+             * Japanese Yen being a 0-decimal currency).
+             */
+            price?: number;
+            
+            /**
+             * The ID of the product this SKU is associated with.
+             */
+            product?: string;
+        }
+        
+        interface ISkuListOptions extends IListOptions {
+            /**
+             * Only return SKUs that are active or inactive (e.g. pass false to list all inactive products).
+             */
+            active?: boolean;
+            
+            /**
+             * Only return SKUs that have the specified key/value pairs in this partially constructed dictionary. 
+             * Can be specified only if product is also supplied. For instance, if the associated product has 
+             * attributes ["color", "size"], passing in attributes[color]=red returns all the SKUs for this product 
+             * that have color set to red.
+             */
+            attributes?: ISkuAttributes;
+            
+            /**
+             * Only return SKUs with the given IDs.
+             */
+            ids?: Array<string>;
+            
+            /**
+             * Only return SKUs that are either in stock or out of stock (e.g. pass false to list all SKUs that are out of stock). 
+             * If no value is provided, all SKUs are returned.
+             */
+            in_stock?: boolean;
+            
+            /**
+             * The ID of the product whose SKUs will be retrieved.
+             */
+            product?: string;
+        }
+        
+        /**
+         * Description of the SKU’s inventory.
+         */
+        interface IInventory {
+            /**
+             * The count of inventory available. Will be present if and only if type is "finite".
+             * 
+             * Positive integer or zero
+             */
+            quantity?: number;
+            
+            /**
+             * Inventory type. Possible values are "finite", "bucket"" (not quantified), and "infinite".
+             */
+            type: "finite" | "bucket" | "infinite" ;
+            
+            /**
+             * An indicator of the inventory available. Possible values are "in_stock", "limited", and "out_of_stock". 
+             * Will be present if and only if type is "bucket".
+             */
+            value?: "in_stock" | "limited" | "out_of_stock";
+        }
+        
+        /**
+         * A dictionary of attributes and values for the attributes defined by the product. 
+         * If, for example, a product’s attributes are ["size", "gender"], 
+         * a valid SKU has the following dictionary of attributes: {"size": "Medium", "gender": "Unisex"}.
+         */
+        interface ISkuAttributes {}
+    }
+    
+    namespace tokens { 
+        interface IToken extends ICardToken, IBankAccountToken { }
+        
+        interface ICardToken extends ITokenBase {
+            /**
+             * Hash describing the card used to make the charge
+             */
+            card?: cards.ICardHash;
+        }
+        
+        interface IBankAccountToken extends ITokenBase {
+            /**
+             * Hash describing the bank account
+             */
+            bank_account?: bankAccounts.IBankAccountHash;
+        }
+        
+        interface ITokenBase extends IResourceObject {
+            /**
+             * Value is "token""
+             */
+            object: "token" ;
+            
+            /**
+             * IP address of the client that generated the token
+             */
+            client_ip: string;
+            
+            created: number;
+            livemode: boolean;
+            
+            /**
+             * Type of the token: card or bank_account
+             */
+            type: "card" | "bank_account" ;
+            
+            /**
+             * Whether or not this token has already been used (tokens can be used only once)
+             */
+            used: boolean;
+        }
+        
+        interface ITokenCreationOptionsBase extends IDataOptions {
+            /**
+             * The customer (owned by the application's account) to create a 
+             * token for. For use with Stripe Connect only; this can only be used 
+             * with an OAuth access token or Stripe-Account header. For more 
+             * details, see the shared customers documentation.
+             * 
+             * Stripe connect only
+             */
+            customer?: string;
+        }
+        
+        interface ICardTokenCreationOptions extends ITokenCreationOptionsBase {
+            /**
+             * The card this token will represent. If you also pass in a customer, 
+             * the card must be the ID of a card belonging to the customer. 
+             * Otherwise, if you do not pass a customer, a object containing a 
+             * user's credit card details, with the options described below.
+             */
+            card: sources.ISourceCreationOptions;
+        }
+        
+        interface IBankAccountTokenCreationOptions extends ITokenCreationOptionsBase {
+            /**
+             * The card this token will represent. If you also pass in a customer, 
+             * the card must be the ID of a card belonging to the customer. 
+             * Otherwise, if you do not pass a customer, a object containing a 
+             * user's credit card details, with the options described below.
+             */
+            bank_account: bankAccounts.ISourceCreationOptions;
+        }
+        
+        interface IPiiTokenCreationOptions extends IDataOptions {
+            pii: {
+                /**
+                 * The personal_id_number for PII in string form.
+                 */
+                personal_id_number: string;
+            }
+        }
+    }
+    
+    namespace transfers {
+        interface ITransfer extends IResourceObject {
+            /**
+             * Value is "transfer"
+             */
+            object: "transfer";
+            
             /**
              * Amount (in cents) to be transferred to your bank account
              */
             amount: number;
-
+            
+            /**
+             * Amount in cents reversed (can be less than the amount attribute on the transfer if a partial reversal was issued).
+             */
+            amount_reversed: number;
+            
+            application_fee: string;
+            
+            /**
+             * Balance transaction that describes the impact of this transfer on your account balance. [Expandable]
+             */
+            balance_transaction: string | balance.IBalanceTransaction;
+            
             /**
              * Time that this record of the transfer was first created.
              */
@@ -761,97 +3247,381 @@ declare namespace StripeNode {
             currency: string;
 
             /**
-             * Date the transfer is scheduled to arrive in the bank. This doesn�t factor in delays like weekends or bank holidays.
+             * Date the transfer is scheduled to arrive in the bank. This factors in delays like weekends or bank holidays.
              */
             date: number;
 
-            /**
-             * A list of reversals that have been applied to the transfer.
-             */
-            reversals: IList<IReversal>;
-
-            /**
-             * Whether or not the transfer has been fully reversed. If the transfer is only partially reversed, this attribute
-             * will still be false.
-             */
-            reversed: boolean;
-
-            /**
-             * Current status of the transfer (paid, pending, canceled or failed). A transfer will be pending until it is submitted, at which
-             * point it becomes paid. If it does not go through successfully, its status will change to failed or canceled.
-             */
-            status: string;
-
-            /**
-             * The type of this type of this transfer. Can be card or bank_account.
-             */
-            type: string;
-
-            /**
-             * Amount in cents reversed (can be less than the amount attribute on the transfer if a partial reversal was issued).
-             */
-            amount_reversed: number;
-
-            /**
-             * Balance transaction that describes the impact of this transfer on your account balance.
-             */
-            balance_transaction: string;
-
             /**
              * Internal-only description of the transfer
              */
             description: string;
-
+            
+            /**
+             * ID of the bank account, card, or Stripe account the transfer was sent to. [Expandable]
+             */
+            destination: string | bankAccounts.IBankAccount | cards.ICardHash | accounts.IAccount;
+            
+            /**
+             * If the destination is a Stripe account, this will be the ID of the 
+             * payment that the destination account received for the transfer. [Expandable]
+             */
+            destination_payment: string;
+            
             /**
              * Error code explaining reason for transfer failure if available. See Types of transfer failures for a
              * list of failure codes: https://stripe.com/docs/api#transfer_failures
              */
             failure_code: string;
-
+            
             /**
              * Message to user further explaining reason for transfer failure if available.
              */
             failure_message: string;
+            
+            livemode: boolean;
             metadata: IMetadata;
-            application_fee: string;
-
+            
             /**
-             * Hash describing the bank account this transfer was sent to
+             * A list of reversals that have been applied to the transfer.
              */
-            bank_account: IBankAccount;
-
+            reversals: ITransferReversals;
+            
             /**
-             * Hash describing the debit card this transfer was sent to
+             * Whether or not the transfer has been fully reversed. If the transfer is only partially reversed, this attribute
+             * will still be false.
              */
-            card: ICard;
-
+            reversed: boolean;
+            
             /**
-             * ID of the recipient this transfer is for if one exists. Transfers to your bank account do not have a recipient.
+             * ID of the charge (or other transaction) that was used to fund the 
+             * transfer. If null, the transfer was funded from the available 
+             * balance. [Expandable]
              */
-            recipient: string;
-            source_transaction: string;
-
+            source_transaction: string | charges.ICharge;
+            
             /**
-             * Extra information about a transfer to be displayed on the user�s bank statement.
+             * The source balance this transfer came from. 
+             * One of card, bank_account, bitcoin_receiver, or alipay_account
+             */
+            source_type: SourceTypes;
+            
+            /**
+             * Extra information about a transfer to be displayed on the user's bank statement.
              */
             statement_descriptor: string;
+            
+            /**
+             * Current status of the transfer (paid, pending, in_transit, canceled or failed). 
+             * A transfer will be pending until it is submitted to the bank, at which point 
+             * it becomes in_transit. It will then change to paid if the transaction goes 
+             * through. If it does not go through successfully, its status will change to 
+             * failed or canceled.
+             */
+            status: Statuses;
+            
+            /**
+             * Can be card, bank_account, or stripe_account.
+             */
+            type: "card" | "bank_account" | "stripe_account" ;
+        }
+        
+        interface ITransferReversals extends IList<transferReversals.IReversal>, resources.TransferReversals {}
+        
+        interface ITransferCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * A positive integer in cents/pence representing how much to transfer.
+             */
+            amount: number;
+            
+            /**
+             * 3-letter ISO code for currency.
+             */
+            currency: string;
+            
+            /**
+             * The id of a bank account or a card to send the transfer to, or the 
+             * string "default_for_currency" to use the default external 
+             * account for the specified currency. 
+             * 
+             * If you use Stripe Connect, this can be the the id of a connected 
+             * Stripe account; see the details about when such transfers are 
+             * permitted.
+             */
+            destination: string;
+            
+            /**
+             * An arbitrary string which you can attach to a transfer object. It is 
+             * displayed when in the web interface alongside the transfer.
+             */
+            description?: string
+            
+            /**
+             * You can use this parameter to transfer funds from a charge (or 
+             * other transaction) before they are added to your available 
+             * balance. A pending balance will transfer immediately but the 
+             * funds will not become available until the original charge 
+             * becomes available. See the Connect documentation for details.
+             */
+            source_transaction?: string;
+            
+            /**
+             * A string to be displayed on the recipient's bank or card 
+             * statement. This may be at most 22 characters. Attempting to use 
+             * a statement_descriptor longer than 22 characters will return 
+             * an error. Note: Most banks will truncate this information and/or 
+             * display it inconsistently. Some may not display it at all.
+             */
+            statement_descriptor?: string;
+            
+            /**
+             * The source balance to draw this transfer from. Balances for 
+             * different payment sources are kept separately. You can find the 
+             * amounts with the balances API. Valid options are: 
+             * "alipay_account", "bank_account", "bitcoin_receiver", and "card".
+             */
+            source_type?: SourceTypes;
+        }
+        
+        interface ITransferUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * An arbitrary string which you can attach to a transfer object. It is 
+             * displayed when in the web interface alongside the transfer. This 
+             * can be unset by updating the value to null and then saving.
+             */
+            description?: string;
+        }
+        
+        interface ITransferListOptions extends IListOptionsCreated {
+            date?: IDateFilter;
+            
+            /**
+             * Only return transfers for the destination specified by this 
+             * account ID.
+             */
+            destination?: string;
+            
+            /**
+             * Only return transfers for the recipient specified by this 
+             * recipient ID.
+             */
+            recipient?: string;
+            
+            /**
+             * Only return transfers that have the given status: 
+             * pending, paid, failed, in_transit, or canceled.
+             */
+            status: Statuses;
+        }
+        
+        type SourceTypes = "alipay_account" | "bank_account" | "bitcoin_receiver" | "card";
+        
+        type Statuses = "pending" | "paid" | "failed" | "in_transit" | "canceled";
+    }
+    
+    namespace transferReversals {
+        interface IReversal extends IResourceObject {
+            /**
+             * Value is 'transfer_reversal'
+             */
+            object: "transfer_reversal";
+            
+            /**
+             * Amount reversed, in cents/pence.
+             */
+            amount: number;
+            
+            /**
+             * Balance transaction that describes the impact of this reversal on your account balance. [Expandable]
+             */
+            balance_transaction: string | balance.IBalanceTransaction;
+            
+            created: number;
+
+            /**
+             * Three-letter ISO currency code representing the currency.
+             */
+            currency: string;
+            
+            metadata: IMetadata;
+
+            /**
+             * ID of the transfer that was reversed. [Expandable]
+             */
+            transfer: string | transfers.ITransfer;
+        }
+        
+        interface IReversalCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * A positive integer in cents/pence representing how much of this transfer to reverse. Can only reverse up to the unreversed amount 
+             * remaining of the transfer. Partial transfer reversals are only allowed for transfers to Stripe Accounts.
+             */
+            amount?: number;
+            
+            /**
+             * An arbitrary string which you can attach to a reversal object. It is displayed alongside the reversal in the dashboard. This will 
+             * be unset if you POST an empty value.
+             */
+            description?: string;
+            
+            /**
+             * Boolean indicating whether the application fee should be refunded when reversing this transfer. If a full transfer reversal is 
+             * given, the full application fee will be refunded. Otherwise, the application fee will be refunded with an amount proportional to 
+             * the amount of the transfer reversed.
+             */
+            refund_application_fee?: boolean;
+        }
+        
+        interface IReversalUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * An arbitrary string which you can attach to a reversal object. It is displayed when in the web interface alongside the 
+             * reversal. This can be unset by updating the value to null and then saving.
+             */
+            description?: string;
         }
     }
-    namespace applicationFees { }
-    namespace fileUploads { }
+    
+    namespace bankAccounts {
+        interface IBankAccount extends IBankAccountHash {
+            account: string;
+            
+            /**
+             * This indicates whether or not this bank account is the default external account for its currency.
+             */
+            default_for_currency: boolean;
+            
+            /**
+             * A set of key/value pairs that you can attach to a bank account object. It 
+             * can be useful for storing additional information about the bank account in 
+             * a structured format.
+             */
+            metadata: IMetadata;
+        }
+        
+        interface IBankAccountHash extends IResourceObject {
+            /**
+             * value is "customer_bank_account"
+             */
+            object: "customer_bank_account";
+            
+            /**
+             * The name of the person or business that owns the bank account.
+             */
+            account_holder_name: string;
+            
+            /**
+             * The type of entity that holds the account. This can be either 
+             * "individual"" or "company".
+             */
+            account_holder_type: string;
+            
+            /**
+             * Name of the bank associated with the routing number, e.g. WELLS FARGO.
+             */
+            bank_name: string;
+            
+            /**
+             * Two-letter ISO code representing the country the bank account is located in.
+             */
+            country: string;
+
+            /**
+             * Three-letter ISO currency code representing the currency paid out to the bank account.
+             */
+            currency: string;
+            
+            /**
+             * Uniquely identifies this particular bank account. You can use this attribute 
+             * to check whether two bank accounts are the same.
+             */
+            fingerprint: string;
+            
+            last4: string;
+            
+            /**
+             * The routing transit number for the bank account.
+             */
+            routing_number: string;
+            
+            /**
+             * Possible values are "new", "validated", "verified", "verification_failed", 
+             * or "errored". A bank account that hasn’t had any activity or validation 
+             * performed is "new". If Stripe can determine that the bank account exists, its 
+             * status will be "validated". Note that there often isn’t enough information 
+             * to know (e.g. for smaller credit unions), and the validation is not always 
+             * run. If customer bank account verification has succeeded, the bank 
+             * account status will be "verified". If the verification failed for any reason, 
+             * such as microdeposit failure, the status will be "verification_failed". If a 
+             * transfer sent to this bank account fails, we’ll set the status to "errored"" 
+             * and will not continue to send transfers until the bank details are updated.
+             */
+            status: "new" | "validated" | "verified" | "verification_failed" | "error" ;
+        }
+        
+        interface ISourceCreationOptions {
+            /**
+             * The account number for the bank account in string form. 
+             * Must be a checking account.
+             */
+            account_number: string;
+            
+            /**
+             * The country the bank account is in.
+             */
+            country: string;
+            
+            /**
+             * The currency the bank account is in. This must be a 
+             * country/currency pairing that Stripe supports.
+             */
+            currency: string;
+            
+            /**
+             * The routing number, sort code, or other country-appropriate 
+             * institution number for the bank account. For US bank 
+             * accounts, this is required and should be the ACH routing 
+             * number, not the wire routing number. If you are providing an 
+             * IBAN for account_number, this field is not required.
+             */
+            routing_number?: string;
+            
+            /**
+             * The name of the person or business that owns the bank 
+             * account. This field is required when attaching the bank 
+             * account to a customer object.
+             */
+            account_holder_name?: string;
+            
+            /**
+             * The type of entity that holds the account. This can be either 
+             * "individual" or "company". This field is required when 
+             * attaching the bank account to a customer object.
+             */
+            account_holder_type?: "individual" | "company" ;
+        }
+        
+        interface IBankAccountUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * The name of the person or business that owns the bank account.
+             */
+            account_holder_name?: string;
+            
+            /**
+             * The type of entity that holds the account. This can be either "individual" or "company".
+             */
+            account_holder_type?: "individual" | "company";
+        }
+    }
+    
     namespace bitcoinReceivers {
         /**
          * A Bitcoin receiver wraps a Bitcoin address so that a customer can push a payment to you. This guide describes how to use
          * receivers to create Bitcoin payments.
          */
-        interface IBitcoinReceiver {
-            id: string;
-
+        interface IBitcoinReceiver extends IResourceObject {
             /**
-             * Value is 'bitcoin_receiver'
+             * Value is "bitcoin_receiver"
              */
-            object: string;
-            livemode: boolean;
+            object: "bitcoin_receiver";
 
             /**
              * True when this bitcoin receiver has received a non-zero amount of bitcoin.
@@ -883,13 +3653,22 @@ declare namespace StripeNode {
              * This URI can be displayed to the customer as a clickable link (to activate their bitcoin client) or as a QR code (for mobile wallets).
              */
             bitcoin_uri: number;
+            
             created: number;
 
             /**
              * Three-letter ISO currency code representing the currency to which the bitcoin will be converted.
              */
             currency: string;
-
+            
+            customer: string;
+            description: string;
+            
+            /**
+             * The customer's email address, set by the API call that creates the receiver.
+             */
+            email: string;
+            
             /**
              * This flag is initially false and updates to true when the customer sends the bitcoin_amount to this receiver.
              */
@@ -899,7 +3678,20 @@ declare namespace StripeNode {
              * A bitcoin address that is specific to this receiver. The customer can send bitcoin to this address to fill the receiver.
              */
             inbound_address: string;
-
+            
+            livemode: boolean;
+            metadata: IMetadata;
+            
+            /**
+             * The ID of the payment created from the receiver, if any. Hidden when viewing the receiver with a publishable key.
+             */
+            payment: string;
+            
+            /**
+             * The refund address for these bitcoin, if communicated by the customer.
+             */
+            refund_address: string;
+            
             /**
              * A list with one entry for each time that the customer sent bitcoin to the receiver. Hidden when viewing the
              * receiver with a publishable key.
@@ -910,34 +3702,11 @@ declare namespace StripeNode {
              * This receiver contains uncaptured funds that can be used for a payment or refunded.
              */
             uncaptured_funds: boolean;
-            description: string;
-
-            /**
-             * The customer�s email address, set by the API call that creates the receiver.
-             */
-            email: string;
-
-            /**
-             * A set of key/value pairs that you can attach to a customer object. It can be useful for storing additional information
-             * about the customer in a structured format.
-             */
-            metadata: IMetadata;
-
-            /**
-             * The ID of the payment created from the receiver, if any. Hidden when viewing the receiver with a publishable key.
-             */
-            payment: string;
-
-            /**
-             * The refund address for these bitcoin, if communicated by the customer.
-             */
-            refund_address: string;
-            customer: string;
+            
+            used_for_payment: boolean;
         }
 
-        interface IBitcoinTransaction {
-            id: string;
-
+        interface IBitcoinTransaction extends IResourceObject {
             /**
              * Value is 'list'
              */
@@ -952,6 +3721,7 @@ declare namespace StripeNode {
              * The amount of bitcoin contained in the transaction.
              */
             bitcoin_amount: number;
+            
             created: number;
 
             /**
@@ -964,47 +3734,345 @@ declare namespace StripeNode {
              */
             receiver: string;
         }
+        
+        interface IBitcoinReceiverCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * The amount of currency that you will be paid.
+             */
+            amount: number;
+            
+            /**
+             * The currency to which the bitcoin will be converted. You will be paid out in this currency. Only USD is currently supported.
+             */
+            currency: string;
+            
+            /**
+             * The email address of the customer.
+             */
+            email: string;
+            
+            description?: string;
+            
+            /**
+             * A flag that indicates whether you would like Stripe to automatically handle refunds for any mispayments to the receiver.
+             */
+            refund_mispayments?: boolean;
+        }
+        
+        interface IBitcoinReceiverListOptions extends IListOptions {
+            /**
+             * Filter for active receivers.
+             */
+            active?: boolean;
+            
+            /**
+             * Filter for filled receivers.
+             */
+            filled?: boolean;
+            
+            /**
+             * Filter for receivers with uncaptured funds.
+             */
+            uncaptured_funds?: boolean;
+        }
+    }
+    
+    namespace cards { 
+        /**
+         * You can store multiple cards on a customer in order to charge the customer later. You
+         * can also store multiple debit cards on a recipient in order to transfer to those cards later.
+         */
+        interface ICard extends ICardHash {
+            /**
+             * The account this card belongs to. This attribute will not be in the 
+             * card object if the card belongs to a customer or recipient instead.
+             * [Expandable]
+             */
+            account?: string | accounts.IAccount;
+            
+            /**
+             * Only applicable on accounts (not customers or recipients). The 
+             * card can be used as a transfer destination for funds in this 
+             * currency.
+             */
+            currency?: string;
+            
+            /**
+             * The customer that this card belongs to. This attribute will not be 
+             * in the card object if the card belongs to an account or recipient 
+             * instead.
+             */
+            customer?: customers.ICustomer;
+            
+            /**
+             * Only applicable on accounts (not customers or recipients). This 
+             * indicates whether or not this card is the default external account 
+             * for its currency.
+             */
+            default_for_currency?: boolean;
+            
+            /**
+             * The recipient that this card belongs to. This attribute will not be 
+             * in the card object if the card belongs to a customer or account 
+             * instead. [Expandable]
+             */
+            recipient?: string | recipients.IRecipient;
+        }
+        
+        /**
+         * Hash describing the card used to make the charge
+         */
+        interface ICardHash extends IResourceObject {
+            /**
+             * ID of card (used in conjunction with a customer or recipient ID)
+             */
+            id: string;
+
+            /**
+             * Value is 'card'
+             */
+            object: string;
+
+            /**
+             * The card number
+             */
+            number: number;
+            
+            /**
+             * Card brand. Can be Visa, American Express, MasterCard, Discover, JCB, Diners Club, or Unknown.
+             */
+            brand: "Visa" | "American Express" | "MasterCard" | "Discover" | "JCB" | "Diners Club" | "Unknown" ;
+            exp_month: number;
+            exp_year: number;
+
+            /**
+             * Card funding type. Can be credit, debit, prepaid, or unknown
+             */
+            funding: "credit" | "debit" | "prepaid" | "unknown";
+            last4: string;
+            address_city: string;
+
+            /**
+             * Billing address country, if provided when creating card
+             */
+            address_country: string;
+            address_line1: string;
+
+            /**
+             * If address_line1 was provided, results of the check: pass, fail, unavailable, or unchecked.
+             */
+            address_line1_check: string;
+            address_line2: string;
+            address_state: string;
+            address_zip: string;
+            
+            /**
+             * If address_zip was provided, results of the check: pass, fail, unavailable, or unchecked.
+             */
+            address_zip_check: "pass" | "fail" | "unavailable" | "unchecked" ;
+            
+            /**
+             * Two-letter ISO code representing the country of the card. You could use this
+             * attribute to get a sense of the international breakdown of cards you've collected.
+             */
+            country: string;
+            
+            /**
+             * If a CVC was provided, results of the check: pass, fail, unavailable, or unchecked
+             */
+            cvc_check: "pass" | "fail" | "unavailable" | "unchecked";
+
+            /**
+             * (For Apple Pay integrations only.) The last four digits of the device account number.
+             */
+            dynamic_last4: string;
+
+            /**
+             * Cardholder name
+             */
+            name: string;
+            
+            /**
+             * Uniquely identifies this particular card number. You can use this attribute to check
+             * whether two customers who've signed up with you are using the same card number, for example.
+             */
+            fingerprint: string;
+            
+            metadata?: IMetadata;
+            
+            /**
+             * If the card number is tokenized, this is the method that was 
+             * used. Can be "apple_pay" or "android_pay".
+             */
+            tokenization_method: "apple_pay" | "android_pay";
+        }
+        
+        interface ICardUpdateOptions extends IDataOptionsWithMetadata {
+            address_city?: string;
+            address_country?: string;
+            address_line1?: string;
+            address_line2?: string;
+            address_state?: string;
+            address_zip?: string;
+            
+            /**
+             * Only applicable on accounts (not customers or recipients). 
+             * If set to true, this card will become the default external 
+             * account for its currency.
+             * 
+             * Managed accounts only
+             */
+            default_for_currency?: boolean;
+            
+            exp_month?: number;
+            exp_year?: number;
+            
+            /**
+             * Cardholder name
+             */
+            name?: string;
+        }
+        
+        interface ISourceCreationOptions {
+            /**
+             * he type of payment source. Should be "card".
+             */
+            object: "card";
+            
+            /**
+             * Two digit number representing the card's expiration month.
+             */
+            exp_month: number;
+            
+            /**
+             * Two or four digit number representing the card's expiration year.
+             */
+            exp_year: number;
+            
+            /**
+             * The card number, as a string without any separators.
+             */
+            number: number;
+            
+            /**
+             * Card security code. Required unless your account is registered in 
+             * Australia, Canada, or the United States. Highly recommended to always 
+             * include this value.
+             */
+            cvc?: number;
+            
+            /**
+             * Cardholder's full name.
+             */
+            name?: string;
+            
+            address_city?: string;
+            address_country?: string;
+            address_line1?: string;
+            address_line2?: string;
+            address_state?: string;
+            address_zip?: string;
+            
+            metadata?: IMetadata;
+        }
+        
+        interface ISourceCreationOptionsExtended extends ISourceCreationOptions {
+            /**
+             * Required when adding a card to an account (not applicable to a 
+             * customers or recipients). The card (which must be a debit card) can be 
+             * used as a transfer destination for funds in this currency. Currently, the 
+             * only supported currency for debit card transfers is usd.
+             * 
+             * Managed accounts only.
+             */
+            currency?: string;
+            
+            /**
+             * Only applicable on accounts (not customers or recipients). If you set 
+             * this to true (or if this is the first external account being added in this 
+             * currency) this card will become the default external account for its 
+             * currency.
+             * 
+             * Managed accounts only.
+             */
+            default_for_currency?: boolean;
+        }
     }
-    namespace customerCards { }
 
     namespace customerSubscriptions {
         /**
          * Subscriptions allow you to charge a customer's card on a recurring basis. A subscription ties a customer to
          * a particular plan you've created: https://stripe.com/docs/api#create_plan
          */
-        interface ISubscription {
-            id: string;
-
+        interface ISubscription extends IResourceObject {
             /**
-             * Value is 'subscription'
+             * Value is "subscription"
              */
-            object: string;
-
+            object: "subscription";
+            
+            /**
+             * A positive decimal that represents the fee percentage of the subscription invoice amount that will be transferred to
+             * the application owner's Stripe account each billing period.
+             */
+            application_fee_percent: number;
+            
             /**
              * If the subscription has been canceled with the at_period_end flag set to true, cancel_at_period_end on the
              * subscription will be true. You can use this attribute to determine whether a subscription that has a status
              * of active is scheduled to be canceled at the end of the current period.
              */
             cancel_at_period_end: boolean;
+            
+            /**
+             * If the subscription has been canceled, the date of that cancellation. If the subscription was canceled with
+             * cancel_at_period_end, canceled_at will still reflect the date of the initial cancellation request, not the end of the
+             * subscription period when the subscription is automatically moved to a canceled state.
+             */
+            canceled_at: number;
+            
+            /**
+             * End of the current period that the subscription has been invoiced for. At the end of this period, a new invoice will be created.
+             */
+            current_period_end: number;
+            
+            /**
+             * Start of the current period that the subscription has been invoiced for
+             */
+            current_period_start: number;
+            
             customer: string;
-
+            
+            /**
+             * Describes the current discount applied to this subscription, if there is one. When billing, a discount applied to a
+             * subscription overrides a discount applied on a customer-wide basis.
+             */
+            discount: coupons.IDiscount;
+            
+            /**
+             * If the subscription has ended (either because it was canceled or because the customer was switched to a subscription
+             * to a new plan), the date the subscription ended
+             */
+            ended_at: number;
+            
+            metadata: IMetadata;
+            
             /**
              * Hash describing the plan the customer is subscribed to
              */
             plan: plans.IPlan;
-
+            
             /**
              * The number of subscriptions for the associated plan
              */
             quantity: number;
-
+            
             /**
              * Date the subscription started
              */
             start: number;
-
+            
             /**
-             * Possible values are trialing, active, past_due, canceled, or unpaid. A subscription still in its trial period is trialing
+             * Possible values are "trialing", "active", "past_due", "canceled", or "unpaid". A subscription still in its trial period is trialing
              * and moves to active when the trial period is over. When payment to renew the subscription fails, the subscription becomes
              * past_due. After Stripe has exhausted all payment retry attempts, the subscription ends up with a status of either canceled
              * or unpaid depending on your retry settings. Note that when a subscription has a status of unpaid, no subsequent invoices
@@ -1012,101 +4080,175 @@ declare namespace StripeNode {
              * card details will not lead to Stripe retrying the latest invoice.). After receiving updated card details from a customer,
              * you may choose to reopen and pay their closed invoices.
              */
-            status: string;
-
-            /**
-             * A positive decimal that represents the fee percentage of the subscription invoice amount that will be transferred to
-             * the application owner�s Stripe account each billing period.
-             */
-            application_fee_percent: number;
-
-            /**
-             * If the subscription has been canceled, the date of that cancellation. If the subscription was canceled with
-             * cancel_at_period_end, canceled_at will still reflect the date of the initial cancellation request, not the end of the
-             * subscription period when the subscription is automatically moved to a canceled state.
-             */
-            canceled_at: number;
-
-            /**
-             * End of the current period that the subscription has been invoiced for. At the end of this period, a new invoice will be created.
-             */
-            current_period_end: number;
-
-            /**
-             * Start of the current period that the subscription has been invoiced for
-             */
-            current_period_start: number;
-
-            /**
-             * Describes the current discount applied to this subscription, if there is one. When billing, a discount applied to a
-             * subscription overrides a discount applied on a customer-wide basis.
-             */
-            discount: coupons.IDiscount;
-
-            /**
-             * If the subscription has ended (either because it was canceled or because the customer was switched to a subscription
-             * to a new plan), the date the subscription ended
-             */
-            ended_at: number;
-
-            /**
-             * A set of key/value pairs that you can attach to a subscription object. It can be useful for storing additional
-             * information about the subscription in a structured format.
-             */
-            metadata: IMetadata;
-
-            /**
-             * If the subscription has a trial, the end of that trial.
-             */
-            trial_end: number;
-
-            /**
-             * If the subscription has a trial, the beginning of that trial.
-             */
-            trial_start: number;
-
+            status: "trialing" | "active" | "past_due" | "canceled" | "unpaid";
+            
             /**
              * If provided, each invoice created by this subscription will apply the tax rate, increasing the amount billed to the customer.
              */
             tax_percent: number;
+            
+            /**
+             * If the subscription has a trial, the end of that trial.
+             */
+            trial_end: number;
+            
+            /**
+             * If the subscription has a trial, the beginning of that trial.
+             */
+            trial_start: number;
+        }
+        
+        interface ISubscriptionCreationOptions extends IDataOptionsWithMetadata {
+            /**
+             * The identifier of the plan to subscribe the customer to.
+             */
+            plan: string;
+            
+            /**
+             * A positive decimal (with at most two decimal places) between 1 and 100. This represents the percentage of the subscription invoice 
+             * subtotal that will be transferred to the application owner’s Stripe account. The request must be made with an OAuth key in order 
+             * to set an application fee percentage. For more information, see the application fees documentation.
+             */
+            application_fee_percent?: number;
+            
+            /**
+             * The code of the coupon to apply to this subscription. A coupon applied to a subscription will only affect invoices created for that 
+             * particular subscription.
+             */
+            coupon?: string;
+            
+            source?: sources.ISourceCreationOptions;
+            
+            /**
+             * The quantity you'd like to apply to the subscription you're creating. For example, if your plan is £10/user/month, and your customer 
+             * has 5 users, you could pass 5 as the quantity to have the customer charged £50 (5 x £10) monthly. If you update a subscription but 
+             * don't change the plan ID (e.g. changing only the trial_end), the subscription will inherit the old subscription's quantity attribute 
+             * unless you pass a new quantity parameter. If you update a subscription and change the plan ID, the new subscription will not inherit 
+             * the quantity attribute and will default to 1 unless you pass a quantity parameter.
+             */
+            quantity?: number;
+            
+            /**
+             * A positive decimal (with at most two decimal places) between 1 and 100. This represents the percentage of the subscription invoice 
+             * subtotal that will be calculated and added as tax to the final amount each billing period. For example, a plan which charges $10/month 
+             * with a tax_percent of 20.0 will charge $12 per invoice.
+             */
+            tax_percent?: number;
+            
+            /**
+             * Unix timestamp representing the end of the trial period the customer will get before being charged for the first time. If set, trial_end 
+             * will override the default trial period of the plan the customer is being subscribed to. The special value now can be provided to end the 
+             * customer's trial immediately.
+             */
+            trial_end?: number;
+        }
+        
+        interface ISubscriptionUpdateOptions extends IDataOptionsWithMetadata {
+            /**
+             * A positive decimal (with at most two decimal places) between 1 and 100. This represents the percentage of the subscription invoice 
+             * subtotal that will be transferred to the application owner’s Stripe account. The request must be made with an OAuth key in order 
+             * to set an application fee percentage. For more information, see the application fees documentation.
+             */
+            application_fee_percent?: number;
+            
+            /**
+             * The code of the coupon to apply to this subscription. A coupon applied to a subscription will only affect invoices created for that 
+             * particular subscription.
+             */
+            coupon?: string;
+            
+            /**
+             * The identifier of the plan to update the subscription to. If omitted, the subscription will not change plans.
+             */
+            plan?: string;
+            
+            /**
+             * Flag telling us whether to prorate switching plans during a billing cycle.
+             */
+            prorate?: boolean;
+            
+            /**
+             * If set, the proration will be calculated as though the subscription was updated at the given time. This can be used to apply exactly the 
+             * same proration that was previewed with upcoming invoice endpoint. It can also be used to implement custom proration logic, such as 
+             * prorating by day instead of by second, by providing the time that you wish to use for proration calculations.
+             */
+            proration_date?: number;
+            
+            /**
+             * The quantity you'd like to apply to the subscription you're creating. For example, if your plan is £10/user/month, and your customer 
+             * has 5 users, you could pass 5 as the quantity to have the customer charged £50 (5 x £10) monthly. If you update a subscription but 
+             * don't change the plan ID (e.g. changing only the trial_end), the subscription will inherit the old subscription's quantity attribute 
+             * unless you pass a new quantity parameter. If you update a subscription and change the plan ID, the new subscription will not inherit 
+             * the quantity attribute and will default to 1 unless you pass a quantity parameter.
+             */
+            quantity?: number;
+            
+            source?: sources.ISourceCreationOptions;
+            
+            /**
+             * A positive decimal (with at most two decimal places) between 1 and 100. This represents the percentage of the subscription invoice 
+             * subtotal that will be calculated and added as tax to the final amount each billing period. For example, a plan which charges $10/month 
+             * with a tax_percent of 20.0 will charge $12 per invoice.
+             */
+            tax_percent?: number;
+            
+            /**
+             * Unix timestamp representing the end of the trial period the customer will get before being charged for the first time. If set, trial_end 
+             * will override the default trial period of the plan the customer is being subscribed to. The special value now can be provided to end the 
+             * customer's trial immediately.
+             */
+            trial_end?: number;
+        }
+        
+        interface ISubscriptionCancellationOptions extends IDataOptions {
+            /**
+             * A flag that if set to true will delay the cancellation of the subscription until the end of the current period.
+             */
+            at_period_end?: boolean;
         }
     }
 
-    namespace chargeRefunds {
+    namespace refunds {
         interface IRefund {
             id: string;
 
             /**
-             * Value is 'list'
+             * Value is 'refund'
              */
             object: string;
 
             /**
-             * Amount reversed in cents.
+             * Amount in cents/pence.
              */
             amount: number;
-
+            
+            /**
+             * Balance transaction that describes the impact of this reversal on your account balance.
+             */
+            balance_transaction: string;
+            
+            /**
+             * ID of the charge that was refunded. [Expandable]
+             */
+            charge: string | charges.ICharge;
+            
             created: number;
 
             /**
              * Three-letter ISO currency code representing the currency in which the charge was made.
              */
             currency: string;
-
+            
+            description: string;
+            
             /**
-             * Balance transaction that describes the impact of this reversal on your account balance.
+             * A set of key/value pairs that you can attach to the object. It can be useful 
+             * for storing additional information in a structured format.
              */
-            balance_transaction: string;
-
-            /**
-             * ID of the charge that was refunded.
-             */
-            charge: string;
-
             metadata: IMetadata;
 
             /**
-             * Reason for the refund. If set, possible values are duplicate, fraudulent, and requested_by_customer.
+             * Reason for the refund. If set, possible values are "duplicate", "fraudulent", and "requested_by_customer".
              */
             reason: string;
 
@@ -1114,54 +4256,441 @@ declare namespace StripeNode {
              * This is the transaction number that appears on email receipts sent for this refund.
              */
             receipt_number: string;
-
-            description: string;
+        }
+        
+        interface IRefundCreationOptions extends IDataOptions {
+            /**
+             * A positive integer in cents/pence representing how much of this charge to 
+             * refund. Can only refund up to the unrefunded amount remaining of the 
+             * charge.
+             * 
+             * default is entire charge
+             */
+            amount?: number;
+            
+            /**
+             * A set of key/value pairs that you can attach to a refund object. It can be 
+             * useful for storing additional information about the refund in a structured 
+             * format. You can unset an individual key by setting its value to null and 
+             * then saving. To clear all keys, set metadata to null, then save.
+             */
+            metadata?: IMetadata;
+            
+            /**
+             * String indicating the reason for the refund. If set, possible values are 
+             * "duplicate", "fraudulent", and "requested_by_customer". Specifying 
+             * "fraudulent" as the reason when you believe the charge to be fraudulent 
+             * will help us improve our fraud detection algorithms.
+             */
+            reason?: string;
+            
+            /**
+             * Boolean indicating whether the application fee should be refunded when 
+             * refunding this charge. If a full charge refund is given, the full application 
+             * fee will be refunded. Else, the application fee will be refunded with an 
+             * amount proportional to the amount of the charge refunded.
+             * An application fee can only be refunded by the application that created the 
+             * charge.
+             * 
+             * Connect only, default is false.
+             */
+            refund_application_fee?: boolean;
+            
+            /**
+             * Boolean indicating whether the transfer should be reversed when 
+             * refunding this charge. The transfer will be reversed for the same amount 
+             * being refunded (either the entire or partial amount).
+             * A transfer can only be reversed by the application that created the charge.
+             * 
+             * Connect only, default is false.
+             */
+            reverse_transfer?: boolean;
+        }
+        
+        interface IRefundCreationOptionsWithCharge extends IRefundCreationOptions {
+            /**
+             * The identifier of the charge to refund.
+             */
+            charge: string;
+        }
+        
+        interface IRefundListOptions extends IListOptions {
+            /**
+             * Only return refunds for the charge specified by this charge ID.
+             */
+            charge?: string;
         }
     }
-
-    namespace applicationFeeRefunds { }
-    namespace transferReversals { }
-
+    
+    namespace sources {
+        /**
+         * The source can either be a token, like the ones returned by our 
+         * Stripe.js, or a object containing a user's credit card details (with 
+         * the options shown below). You must provide a source if the 
+         * customer does not already have a valid source attached, and you 
+         * are subscribing the customer for a plan that is not free. Passing 
+         * source will create a new source object, make it the customer 
+         * default source, and delete the old customer default if one exists. 
+         * If you want to add an additional source to use with subscriptions, 
+         * instead use the card creation API to add the card and then the 
+         * customer update API to set it as the default. Whenever you 
+         * attach a card to a customer, Stripe will automatically validate the 
+         * card.
+         */
+        type ISourceCreationOptions = string | cards.ISourceCreationOptions;
+        
+        /**
+         * The source can either be a token, like the ones returned by our 
+         * Stripe.js, or a object containing a user's credit card details (with 
+         * the options shown below). You must provide a source if the 
+         * customer does not already have a valid source attached, and you 
+         * are subscribing the customer for a plan that is not free. Passing 
+         * source will create a new source object, make it the customer 
+         * default source, and delete the old customer default if one exists. 
+         * If you want to add an additional source to use with subscriptions, 
+         * instead use the card creation API to add the card and then the 
+         * customer update API to set it as the default. Whenever you 
+         * attach a card to a customer, Stripe will automatically validate the 
+         * card.
+         */
+        type ISourceCreationOptionsExtended = string | cards.ISourceCreationOptionsExtended;
+    }
+    
+    namespace countrySpecs {
+        interface ICountrySpec extends IResourceObject {
+            /**
+             * Value is "country_spec"
+             */
+            object: "country_spec";
+            
+            /**
+             * The default currency for this country. This applies to both payment methods and bank accounts.
+             */
+            default_currency: string;
+            
+            /**
+             * Currencies that can be accepted in the specific country (for transfers).
+             */
+            supported_bank_account_currencies: {};
+            
+            /**
+             * Currencies that can be accepted in the specified country (for payments).
+             */
+            supported_payment_currencies: Array<string>;
+            
+            /**
+             * Payment methods available in the specified country. You will need to enable bitcoin and ACH payments on your account for those methods to 
+             * appear in this list. The stripe payment method refers to charging through your platform.
+             */
+            supported_payment_methods: Array<string>;
+            
+            /**
+             * Lists the types of verification data needed to keep an account open. Includes 'minimum' fields, which every account must eventually 
+             * provide, as well as a 'additional' fields, which are only required for some merchants.
+             */
+            verification_fields: {
+                individual: {
+                    minimum: Array<string>;
+                    additional: Array<string>;
+                },
+                company: {
+                    minimum: Array<string>;
+                    additional: Array<string>;
+                }
+            }
+        }
+    }
+    
     class StripeResource {
         constructor(stripe: Stripe, urlData: any);
     }
-
+    
     namespace resources {
-        class Account extends StripeResource {
-            create(): void;
-            list(): void;
-            update(id: string): void;
-            retrieve(id: string): void;
-        }
+        class Accounts extends StripeResource {
+            /**
+             * With Connect, you can create Stripe accounts for your users. To do this, you'll first need to register your platform.
+             */
+            create(data: accounts.IAccountCreationOptions, options: HeaderOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+            create(data: accounts.IAccountCreationOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+            
+            /**
+             * Retrieves the details of the account.
+             */
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+            retrieve(id: string, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+            retrieve(options: HeaderOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+            retrieve(response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+            
+            /**
+             * Updates an account by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
+             * 
+             * You may only update accounts that you manage. To update your own account, you can currently only do so via the dashboard. 
+             * For more information on updating managed accounts, see our guide.
+             */
+            update(id: string, data: accounts.IAccountUpdateOptions, options: HeaderOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+            update(id: string, data: accounts.IAccountUpdateOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+            
+            /**
+             * With Connect, you may delete Stripe accounts you manage.
+             * 
+             * Managed accounts created using test-mode keys can be deleted at any time. Managed accounts created using live-mode keys may only be 
+             * deleted once all balances are zero.
+             * 
+             * If you are looking to close your own account, use the data tab in your account settings instead.
+             */
+            del(id: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            del(id: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            del(options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            del(response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            
+            /**
+             * With Connect, you may flag managed accounts as suspicious.
+             * 
+             * Managed accounts created using test-mode keys can be rejected at any time. Managed accounts created using live-mode keys may only be 
+             * rejected once all balances are zero.
+             */
+            reject(id: string, data: accounts.IRejectReason, options: HeaderOptions, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+            reject(id: string, data: accounts.IRejectReason, response?: IResponseFn<accounts.IAccount>): Promise<accounts.IAccount>;
+            
+            /**
+             * Returns a list of accounts connected to your platform via Connect. If you’re not a platform, the list will be empty.
+             */
+            list(data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<accounts.IAccount>>): Promise<IList<accounts.IAccount>>;
+            list(data: IListOptions, response?: IResponseFn<IList<accounts.IAccount>>): Promise<IList<accounts.IAccount>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<accounts.IAccount>>): Promise<IList<accounts.IAccount>>;
+            list(response?: IResponseFn<IList<accounts.IAccount>>): Promise<IList<accounts.IAccount>>;
+            
+            /**
+             * When you create a new bank account or credit card, you must specify a managed account to create it on.
+             * 
+             * If the bank account's owner has no other external account in the bank account's currency, the new bank account will become the 
+             * default for that currency. However, if the owner already has a bank account for that currency, the new account will only become 
+             * the default if the default_for_currency parameter is set to true.
+             * 
+             * If the account has no default destination card, then the new card will become the default. However, if the owner already has a 
+             * default then it will not change. To change the default, you should set default_for_currency to true when creating a card for a 
+             * managed account.
+             */
+            createExternalAccount(accId: string, data: accounts.IExternalAccountCreationOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
+            createExternalAccount(accId: string, data: accounts.IExternalAccountCreationOptions, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
+            
+            /**
+             * By default, you can see the 10 most recent bank accounts stored on a managed account directly on the object, but you can also 
+             * retrieve details about a specific bank account stored on the Stripe account.
+             */
+            retrieveExternalAccount(accId: string, bankAccId: string, options: HeaderOptions, response?: IResponseFn<bankAccounts.IBankAccount>): Promise<bankAccounts.IBankAccount>;
+            retrieveExternalAccount(accId: string, bankAccId: string, response?: IResponseFn<bankAccounts.IBankAccount>): Promise<bankAccounts.IBankAccount>;
 
-        class ApplicationFeeRefunds extends StripeResource {
-            create(): void;
-            list(): void;
-            update(id: string): void;
-            retrieve(id: string): void;
+            /**
+             * You can always see the 10 most recent cards directly on a managed account; this method lets you retrieve details about a specific 
+             * card stored on the account.
+             */
+            retrieveCard(accId: string, cardId: string, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            retrieveCard(accId: string, cardId: string, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            
+            /**
+             * Updates the metadata of a bank account belonging to a managed account, and optionally sets it as the default for its currency. 
+             * Other bank account details are not editable by design.
+             */
+            updateExternalAccount(accId: string, bankAccId: string, data: accounts.IExternalAccountUpdateOptions, options: HeaderOptions, response?: IResponseFn<bankAccounts.IBankAccount>): Promise<bankAccounts.IBankAccount>;
+            updateExternalAccount(accId: string, bankAccId: string, data: accounts.IExternalAccountUpdateOptions, response?: IResponseFn<bankAccounts.IBankAccount>): Promise<bankAccounts.IBankAccount>;
+            /**
+             * If you need to update only some card details, like the billing address or expiration date, you can do so without having to re-enter the 
+             * full card details. Stripe also works directly with card networks so that your customers can continue using your service without 
+             * interruption.
+             * 
+             * When you update a card, Stripe will automatically validate the card.
+             */
+            updateExternalAccount(accId: string, cardId: string, data: cards.ICardUpdateOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            updateExternalAccount(accId: string, cardId: string, data: cards.ICardUpdateOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            
+            /**
+             * You can delete destination bank accounts and cards from a managed account. If a bank account is the default external account for its currency 
+             * or card's default_for_currency property is true, it can only be deleted if it is the only external account for that currency, and the 
+             * currency is not the Stripe account's default currency. Otherwise, you must set another external account to be the default for the currency 
+             * before deleting it.
+             */
+            deleteExternalAccount(accId: string, id: string, options: HeaderOptions, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
+            deleteExternalAccount(accId: string, id: string, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
+            
+            /**
+             * You can see a list of the bank accounts belonging to a managed account. Note that the 10 most recent external accounts are always 
+             * available by default on the corresponding Stripe object. If you need more than those 10, you can use this API method and the limit 
+             * and starting_after parameters to page through additional bank accounts.
+             */
+            listExternalAccounts(accId: string, data: accounts.IBankAccountListOptions, options: HeaderOptions, response?: IResponseFn<IList<bankAccounts.IBankAccount>>): Promise<IList<bankAccounts.IBankAccount>>;
+            listExternalAccounts(accId: string, data: accounts.IBankAccountListOptions, response?: IResponseFn<IList<bankAccounts.IBankAccount>>): Promise<IList<bankAccounts.IBankAccount>>;
+            
+            /**
+             * You can see a list of the cards belonging to a managed account. Note that the 10 most recent external accounts are available on the 
+             * account object. If you need more than those 10, you can use this API method and the limit and starting_after parameters to page 
+             * through additional cards.
+             */
+            listExternalAccounts(accId: string, data: accounts.ICardListOptions, options: HeaderOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+            listExternalAccounts(accId: string, data: accounts.ICardListOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
         }
-
+        
         class ApplicationFees extends StripeResource {
-            list(): void;
-            retrieve(id: string): void;
-        }
+            /**
+             * Retrieves the details of an application fee that your account has collected. The same information is returned when refunding the 
+             * application fee.
+             */
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFee>): Promise<applicationFees.IApplicationFee>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<applicationFees.IApplicationFee>): Promise<applicationFees.IApplicationFee>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFee>): Promise<applicationFees.IApplicationFee>;
+            retrieve(id: string, response?: IResponseFn<applicationFees.IApplicationFee>): Promise<applicationFees.IApplicationFee>;
+            
+            /**
+             * Returns a list of application fees you’ve previously collected. The application fees are returned in sorted order, with the most 
+             * recent fees appearing first.
+             */
+            list(data: applicationFees.IApplicationFeeListOptions, options: HeaderOptions, response?: IResponseFn<IList<applicationFees.IApplicationFee>>): Promise<IList<applicationFees.IApplicationFee>>;
+            list(data: applicationFees.IApplicationFeeListOptions, response?: IResponseFn<IList<applicationFees.IApplicationFee>>): Promise<IList<applicationFees.IApplicationFee>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<applicationFees.IApplicationFee>>): Promise<IList<applicationFees.IApplicationFee>>;
+            list(response?: IResponseFn<IList<applicationFees.IApplicationFee>>): Promise<IList<applicationFees.IApplicationFee>>;
+            
+            /**
+             * Refunds an application fee that has previously been collected but not yet refunded. Funds will be refunded to the Stripe account that 
+             * the fee was originally collected from.
+             * 
+             * You can optionally refund only part of an application fee. You can do so as many times as you wish until the entire fee has been refunded.
+             * 
+             * Once entirely refunded, an application fee can't be refunded again. This method will throw an error when called on an already-refunded 
+             * application fee, or when trying to refund more money than is left on an application fee.
+             */
+            refund(feeId: string, data: applicationFees.IApplicationFeeRefundCreationOptions, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            refund(feeId: string, data: applicationFees.IApplicationFeeRefundCreationOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            refund(feeId: string, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            refund(feeId: string, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
 
+            /**
+             * Refunds an application fee that has previously been collected but not yet refunded. Funds will be refunded to the Stripe account that 
+             * the fee was originally collected from.
+             * 
+             * You can optionally refund only part of an application fee. You can do so as many times as you wish until the entire fee has been refunded.
+             * 
+             * Once entirely refunded, an application fee can't be refunded again. This method will throw an error when called on an already-refunded 
+             * application fee, or when trying to refund more money than is left on an application fee.
+             */
+            createRefund(feeId: string, data: applicationFees.IApplicationFeeRefundCreationOptions, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            createRefund(feeId: string, data: applicationFees.IApplicationFeeRefundCreationOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            createRefund(feeId: string, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            createRefund(feeId: string, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            
+            /**
+             * By default, you can see the 10 most recent refunds stored directly on the application fee object, but you can also retrieve details 
+             * about a specific refund stored on the application fee.
+             */
+            retreiveRefund(feeId: string, refundId: string, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            retreiveRefund(feeId: string, refundId: string, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            
+            /**
+             * Updates the specified application fee refund by setting the values of the parameters passed. Any parameters not provided will be left 
+             * unchanged.
+             * 
+             * This request only accepts metadata as an argument.
+             */
+            updateRefund(feeId: string, refundId: string, data: { metadata?: IMetadata }, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            updateRefund(feeId: string, refundId: string, data: { metadata?: IMetadata }, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            
+            /**
+             * You can see a list of the refunds belonging to a specific application fee. Note that the 10 most recent refunds are always available 
+             * by default on the application fee object. If you need more than those 10, you can use this API method and the limit and starting_after 
+             * parameters to page through additional refunds.
+             */
+            listRefunds(feeId: string, data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
+            listRefunds(feeId: string, data: IListOptions, response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
+            listRefunds(feeId: string, options: HeaderOptions, response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
+            listRefunds(feeId: string, response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
+        }
+        
+        class ApplicationFeeRefunds extends StripeResource {
+            /**
+             * Refunds an application fee that has previously been collected but not yet refunded. Funds will be refunded to the Stripe account that 
+             * the fee was originally collected from.
+             * 
+             * You can optionally refund only part of an application fee. You can do so as many times as you wish until the entire fee has been refunded.
+             * 
+             * Once entirely refunded, an application fee can't be refunded again. This method will throw an error when called on an already-refunded 
+             * application fee, or when trying to refund more money than is left on an application fee.
+             */
+            create(data: applicationFees.IApplicationFeeRefundCreationOptions, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            create(data: applicationFees.IApplicationFeeRefundCreationOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            create(options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            create(response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            
+            /**
+             * By default, you can see the 10 most recent refunds stored directly on the application fee object, but you can also retrieve details 
+             * about a specific refund stored on the application fee.
+             */
+            retrieve(refundId: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            retrieve(refundId: string, options: IDataOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            retrieve(refundId: string, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            retrieve(refundId: string, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            
+            
+            /**
+             * Updates the specified application fee refund by setting the values of the parameters passed. Any parameters not provided will be left 
+             * unchanged.
+             * 
+             * This request only accepts metadata as an argument.
+             */
+            update(refundId: string, data: { metadata?: IMetadata }, options: HeaderOptions, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            update(refundId: string, data: { metadata?: IMetadata }, response?: IResponseFn<applicationFees.IApplicationFeeRefund>): Promise<applicationFees.IApplicationFeeRefund>;
+            
+            /**
+             * You can see a list of the refunds belonging to a specific application fee. Note that the 10 most recent refunds are always available 
+             * by default on the application fee object. If you need more than those 10, you can use this API method and the limit and starting_after 
+             * parameters to page through additional refunds.
+             */
+            list(data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
+            list(data: IListOptions, response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
+            list(response?: IResponseFn<IList<applicationFees.IApplicationFeeRefund>>): Promise<IList<applicationFees.IApplicationFeeRefund>>;
+        }
+        
         class Balance extends StripeResource {
-            retrieve(id: string): void;
+            retrieve(options: HeaderOptions, response?: IResponseFn<balance.IBalance>): Promise<balance.IBalance>;
+            retrieve(response?: IResponseFn<balance.IBalance>): Promise<balance.IBalance>;
+            
+            retrieveTransaction(id: string, options: HeaderOptions, response?: IResponseFn<balance.IBalanceTransaction>): Promise<balance.IBalanceTransaction>;
+            retrieveTransaction(id: string, response?: IResponseFn<balance.IBalanceTransaction>): Promise<balance.IBalanceTransaction>;
+            
+            listTransactions(data: balance.IBalanceListOptions, options: HeaderOptions, response?: IResponseFn<balance.IBalanceTransaction>): Promise<IList<balance.IBalanceTransaction>>;
+            listTransactions(data: balance.IBalanceListOptions, response?: IResponseFn<balance.IBalanceTransaction>): Promise<IList<balance.IBalanceTransaction>>;
+            listTransactions(options: HeaderOptions, response?: IResponseFn<balance.IBalanceTransaction>): Promise<IList<balance.IBalanceTransaction>>;
+            listTransactions(response?: IResponseFn<balance.IBalanceTransaction>): Promise<IList<balance.IBalanceTransaction>>;
         }
-
+        
         class BitcoinReceivers extends StripeResource {
-            create(): void;
-            list(): void;
-            update(id: string): void;
-            retrieve(id: string): void;
-        }
-
-        class ChargeRefunds extends StripeResource {
-            create(): void;
-            list(): void;
-            update(id: string): void;
-            retrieve(id: string): void;
+            /**
+             * Creates a Bitcoin receiver object that can be used to accept bitcoin payments from your customer. The receiver exposes a Bitcoin address 
+             * and is created with a bitcoin to USD exchange rate that is valid for 10 minutes.
+             */
+            create(data: bitcoinReceivers.IBitcoinReceiverCreationOptions, options: HeaderOptions, response?: IResponseFn<bitcoinReceivers.IBitcoinReceiver>): Promise<bitcoinReceivers.IBitcoinReceiver>;
+            create(data: bitcoinReceivers.IBitcoinReceiverCreationOptions, response?: IResponseFn<bitcoinReceivers.IBitcoinReceiver>): Promise<bitcoinReceivers.IBitcoinReceiver>;
+            
+            /**
+             * Retrieves the Bitcoin receiver with the given ID.
+             */
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<bitcoinReceivers.IBitcoinReceiver>): Promise<bitcoinReceivers.IBitcoinReceiver>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<bitcoinReceivers.IBitcoinReceiver>): Promise<bitcoinReceivers.IBitcoinReceiver>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<bitcoinReceivers.IBitcoinReceiver>): Promise<bitcoinReceivers.IBitcoinReceiver>;
+            retrieve(id: string, response?: IResponseFn<bitcoinReceivers.IBitcoinReceiver>): Promise<bitcoinReceivers.IBitcoinReceiver>;
+            
+            
+            /**
+             * Returns a list of your receivers. Receivers are returned sorted by creation date, with the most recently created receivers appearing first.
+             */
+            list(data: bitcoinReceivers.IBitcoinReceiverListOptions, options: HeaderOptions, response?: IResponseFn<IList<bitcoinReceivers.IBitcoinReceiver>>): Promise<IList<bitcoinReceivers.IBitcoinReceiver>>;
+            list(data: bitcoinReceivers.IBitcoinReceiverListOptions, response?: IResponseFn<IList<bitcoinReceivers.IBitcoinReceiver>>): Promise<IList<bitcoinReceivers.IBitcoinReceiver>>;
+            
+            //update(id: string): void; // This does seem to be a method in the library (https://github.com/stripe/stripe-node/blob/master/lib/resources/BitcoinReceivers.js#L12), but isn't in the API documentation.
+            
+            setMetadata(): void; //TODO: Implement placeholder method
+            getMetadata(): void; //TODO: Implement placeholder method
         }
 
         class Charges extends StripeResource {
@@ -1178,75 +4707,8 @@ declare namespace StripeNode {
              * @param options Options for creating a charge.
              * @param response A callback to receive the response and newly created charge, or errors if they exist.
              */
-            create(options: {
-                /**
-                 * A positive integer in the smallest currency unit (e.g 100 cents to charge $1.00, or 1 to charge �1, a 0-decimal currency)
-                 * representing how much to charge the card. The minimum amount is $0.50 (or equivalent in charge currency).
-                 */
-                amount: number;
-
-                /**
-                 * 3-letter ISO code for currency.
-                 */
-                currency: string;
-
-                /**
-                 * The ID of an existing customer that will be charged in this request.
-                 */
-                customer?: string;
-
-                /**
-                 * A payment source to be charged, such as a credit card. If you also pass a customer ID, the source must be the ID of
-                 * a source belonging to the customer. Otherwise, if you do not pass a customer ID, the source you provide must either
-                 * be a token, like the ones returned by Stripe.js, or a object containing a user's credit card details, with the options
-                 * described below. Although not all information is required, the extra info helps prevent fraud.
-                 */
-                source?: string | IPaymentToken | ICard;
-
-                /**
-                 * An arbitrary string which you can attach to a charge object. It is displayed when in the web interface alongside the
-                 * charge. Note that if you use Stripe to send automatic email receipts to your customers, your receipt emails will include
-                 * the description of the charge(s) that they are describing.
-                 */
-                description?: string;
-                metadata?: IMetadata;
-
-                /**
-                 * Whether or not to immediately capture the charge. When false, the charge issues an authorization (or pre-authorization),
-                 * and will need to be captured later. Uncaptured charges expire in 7 days. For more information, see authorizing charges
-                 * and settling later: https://support.stripe.com/questions/can-i-authorize-a-charge-and-then-wait-to-settle-it-later
-                 */
-                capture?: boolean;
-
-                /**
-                 * An arbitrary string to be displayed on your customer's credit card statement. This may be up to 22 characters.
-                 * As an example, if your website is RunClub and the item you're charging for is a race ticket, you may want to
-                 * specify a statement_descriptor of RunClub 5K race ticket. The statement description may not include <>"' characters,
-                 * and will appear on your customer's statement in capital letters. Non-ASCII characters are automatically stripped.
-                 * While most banks display this information consistently, some may display it incorrectly or not at all.
-                 */
-                statement_descriptor?: string;
-
-                /**
-                 * The email address to send this charge's receipt to. The receipt will not be sent until the charge is paid.
-                 * If this charge is for a customer, the email address specified here will override the customer's email address.
-                 * Receipts will not be sent for test mode charges. If receipt_email is specified for a charge in live mode, a receipt
-                 * will be sent regardless of your email settings.
-                 */
-                receipt_email?: string;
-
-                /**
-                 * A fee in cents that will be applied to the charge and transferred to the application owner's Stripe account.
-                 * The request must be made with an OAuth key in order to take an application fee. For more information,
-                 * see the application fees documentation: https://stripe.com/docs/connect/collecting-fees
-                 */
-                application_fee?: string;
-
-                /**
-                 * Shipping information for the charge. Helps prevent fraud on charges for physical goods.
-                 */
-                shipping?: IShippingInformation;
-            }, response: IResponseFn<charges.ICharge>): void;
+            create(data: charges.IChargeCreationOptions, options: HeaderOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
+            create(data: charges.IChargeCreationOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
 
             /**
              * Retrieves the details of a charge that has previously been created. Supply the unique charge ID that was returned
@@ -1256,53 +4718,29 @@ declare namespace StripeNode {
              * @param id The identifier of the charge to be retrieved
              * @param response A callback that takes in a potential error and a charge object.
              */
-            retrieve(id: string, response: IResponseFn<charges.ICharge>): void;
-
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
+            retrieve(id: string, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
+            
+            
             /**
              * Updates the specified charge by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
              * This request accepts only the description, metadata, receipt_emailand fraud_details as arguments.
              *
              * @param id The identifier of the charge to be updated
-             * @param update An object containing the updated properties.
+             * @param data An object containing the updated properties.
              */
-            update(id: string, update: {
-                /**
-                 * An arbitrary string which you can attach to a charge object. It is displayed when in the web interface alongside the charge.
-                 * Note that if you use Stripe to send automatic email receipts to your customers, your receipt emails will include the description
-                 * of the charge(s) that they are describing. This can be unset by updating the value to null and then saving.
-                 */
-                description?: string;
-
-                /**
-                 * You can unset an individual key by setting its value to null and then saving. To clear all keys, set metadata to null, then save.
-                 */
-                metadata?: IMetadata;
-
-                /**
-                 * This is the email address that the receipt for this charge will be sent to.
-                 * If this field is updated, then a new email receipt will be sent to the updated address.
-                 */
-                receipt_email?: string;
-
-                /**
-                 * A set of key/value pairs you can attach to a charge giving information about its riskiness.
-                 */
-                fraud_details?: {
-                    /**
-                     * If you believe a charge is fraudulent, include a user_report key with a value of fraudulent. If you believe a
-                     * charge is safe, include a user_report key with a value of safe. Note that you must refund a charge before setting
-                     * the user_report to fraudulent. Stripe will use the information you send to improve our fraud detection algorithm
-                     */
-                    user_report?: string;
-                }
-            }, response: IResponseFn<charges.ICharge>): void;
+            update(id: string, data: charges.IChargeUpdateOptions, options: HeaderOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
+            update(id: string, data: charges.IChargeUpdateOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
 
             /**
              * Capture the payment of an existing, uncaptured, charge. This is the second half of the two-step payment flow, where first
              * you created a charge with the capture option set to false. Uncaptured payments expire exactly seven days after they are
              * created. If they are not captured by that point in time, they will be marked as refunded and will no longer be capturable.
              */
-            capture(id: string, response: IResponseFn<charges.ICharge>): void;
+            capture(id: string, options: HeaderOptions, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
+            capture(id: string, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
 
             /**
              * Returns a list of charges you've previously created. The charges are returned in sorted order, with the most recent charges
@@ -1313,43 +4751,24 @@ declare namespace StripeNode {
              * If you provide a non-existent customer ID, this call throws an error. You can optionally request that the response include
              * the total count of all charges that match your filters. To do so, specify include[]=total_count in your request.
              *
-             * @param options Filtering options for the returned items.
+             * @param data Filtering options for the returned items.
              */
-            list(options: IListOptions, response: IResponseFn<IList<charges.ICharge>>): void;
-
+            list(data: charges.IChargeListOptions, options: HeaderOptions, response?: IResponseFn<IList<charges.ICharge>>): Promise<IList<charges.ICharge>>;
+            list(data: charges.IChargeListOptions, response?: IResponseFn<IList<charges.ICharge>>): Promise<IList<charges.ICharge>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<charges.ICharge>>): Promise<IList<charges.ICharge>>;
+            list(response?: IResponseFn<IList<charges.ICharge>>): Promise<IList<charges.ICharge>>;
+            
             /**
-             * When you get a dispute, contacting your customer is always the best first step. If that doesn't work, you can submit evidence in
-             * order to help us resolve the dispute in your favor. You can do this in your dashboard, but if you prefer, you can use the API to
-             * submit evidence programmatically. Depending on your dispute type, different evidence fields will give you a better chance of winning
-             * your dispute. You may want to consult our guide to dispute types to help you figure out which evidence fields to provide:
-             * https://stripe.com/help/dispute-types
-             *
-             * @param chargeId The ID for the disputed charge
-             * @param options The fields to update
+             * When you create a new refund, you must specify a charge to create it on.
+             * Creating a new refund will refund a charge that has previously been created but not yet refunded. Funds will be refunded to the credit or debit card that was originally charged. The fees you were originally charged are also refunded.
+             * You can optionally refund only part of a charge. You can do so as many times as you wish until the entire charge has been refunded.
+             * Once entirely refunded, a charge can't be refunded again. This method will throw an error when called on an already-refunded charge, or when trying to refund more money than is left on a charge.
              */
-            updateDispute(chargeId: string, options: {
-                /**
-                 * Evidence to upload to respond to a dispute. Updating any field in the hash will submit all fields in the hash for review.
-                 */
-                evidence?: IDisputeEvidence;
-                /**
-                 * A set of key/value pairs that you can attach to a dispute object. It can be useful for storing additional information about the
-                 * dispute in a structured format. This can be unset by updating the value to null and then saving.
-                 */
-                metadata?: IMetadata;
-            }, response: IResponseFn<IDispute>): void;
-
-
-            /**
-             * Closing the dispute for a charge indicates that you do not have any evidence to submit and are essentially 'dismissing' the dispute,
-             * acknowledging it as lost. The status of the dispute will change from under_review to lost.
-             *
-             * IMPORTANT: Closing a dispute is irreversible.
-             *
-             * @param chargeId The ID of the disputed charge
-             */
-            closeDispute(chargeId: string): void;
-
+            refund(chargeId: string, data: refunds.IRefundCreationOptions, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            refund(chargeId: string, data: refunds.IRefundCreationOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            refund(chargeId: string, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            refund(chargeId: string, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            
             /**
              * When you create a new refund, you must specify a charge to create it on. Creating a new refund will refund a charge that has previously
              * been created but not yet refunded. Funds will be refunded to the credit or debit card that was originally charged. The fees you were
@@ -1361,36 +4780,15 @@ declare namespace StripeNode {
              * charge identifier was provided.
              *
              * @param id The identifier of the charge to be refunded.
-             * @param options Options for specifying reasons and refund amount
+             * @param data Options for specifying reasons and refund amount
              * @param response The refund.
+             * 
+             * @deprecated According to source code (https://github.com/stripe/stripe-node/blob/master/lib/resources/Charges.js#L43)
              */
-            createRefund(id: string, options: {
-                /**
-                 * A positive integer in cents representing how much of this charge to refund. Can only refund up to the unrefunded amount remaining
-                 * of the charge.
-                 */
-                amount?: number;
-
-                /**
-                 * Boolean indicating whether the application fee should be refunded when refunding this charge. If a full charge refund is given, the
-                 * full application fee will be refunded. Else, the application fee will be refunded with an amount proportional to the amount of the
-                 * charge refunded. An application fee can only be refunded by the application that created the charge.
-                 */
-                refund_applcation_fee?: boolean;
-
-                /**
-                 * String indicating the reason for the refund. If set, possible values are duplicate, fraudulent, and requested_by_customer. Specifying
-                 * fraudulent as the reason when you believe the charge to be fraudulent will help us improve our fraud detection algorithms.
-                 */
-                reason?: string;
-
-                /**
-                 * A set of key/value pairs that you can attach to a refund object. It can be useful for storing additional information about the refund
-                 * in a structured format. You can unset an individual key by setting its value to null and then saving. To clear all keys, set metadata
-                 * to null, then save.
-                 */
-                metadata?: IMetadata;
-            }, response: IResponseFn<chargeRefunds.IRefund>): void;
+            createRefund(id: string, data: refunds.IRefundCreationOptions, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            createRefund(id: string, data: refunds.IRefundCreationOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            createRefund(id: string, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            createRefund(id: string, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
 
             /**
              * By default, you can see the 10 most recent refunds stored directly on the charge object, but you can also retrieve details about a specific
@@ -1399,7 +4797,8 @@ declare namespace StripeNode {
              * @param chargeId The ID of the charge refunded
              * @param refundId The ID of the refund to retrieve
              */
-            retrieveRefund(chargeId: string, refundId: string, response: IResponseFn<chargeRefunds.IRefund>): void;
+            retrieveRefund(chargeId: string, refundId: string, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            retrieveRefund(chargeId: string, refundId: string, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
 
             /**
              * Updates the specified refund by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
@@ -1408,14 +4807,8 @@ declare namespace StripeNode {
              * @param chargeId The ID of the charge refunded
              * @param refundId The ID of the refund to update
              */
-            updateRefund(chargeId: string, refundId: string, options: {
-                /**
-                 * A set of key/value pairs that you can attach to a refund object. It can be useful for storing additional information about the refund
-                 * in a structured format. You can unset an individual key by setting its value to null and then saving. To clear all keys, set metadata
-                 * to null, then save.
-                 */
-                metadata: IMetadata;
-            }, response: IResponseFn<chargeRefunds.IRefund>): void;
+            updateRefund(chargeId: string, refundId: string, data: IDataOptionsWithMetadata, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            updateRefund(chargeId: string, refundId: string, data: IDataOptionsWithMetadata, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
 
             /**
              * You can see a list of the refunds belonging to a specific charge. Note that the 10 most recent refunds are always available by default on
@@ -1428,9 +4821,63 @@ declare namespace StripeNode {
              * of all refunds that match your filters. To do so, specify include[]=total_count in your request.
              *
              * @param chargeId The ID of the charge refunded
-             * @param options Used to filter the refunds returned
+             * @param data Used to filter the refunds returned
              */
-            listRefunds(chargeId: string, options: IListOptions, response: IResponseFn<IList<chargeRefunds.IRefund>>): void;
+            listRefunds(chargeId: string, data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            listRefunds(chargeId: string, data: IListOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            listRefunds(chargeId: string, options: HeaderOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            listRefunds(chargeId: string, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            
+            markAsSafe(chargeId: string, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
+            markAsFraudulent(chargeId: string, response?: IResponseFn<charges.ICharge>): Promise<charges.ICharge>;
+        }
+
+        class ChargeRefunds extends StripeResource {
+            /**
+             * When you create a new refund, you must specify a charge to create it on.
+             * 
+             * Creating a new refund will refund a charge that has previously been created but not yet refunded. 
+             * Funds will be refunded to the credit or debit card that was originally charged. 
+             * The fees you were originally charged are also refunded.
+             * 
+             * You can optionally refund only part of a charge. 
+             * You can do so as many times as you wish until the entire charge has been refunded.
+             * 
+             * Once entirely refunded, a charge can't be refunded again. 
+             * This method will throw an error when called on an already-refunded charge, or when trying to refund more money than is left on a charge.
+             */
+            create(data: refunds.IRefundCreationOptions, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            create(data: refunds.IRefundCreationOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            create(options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            create(response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+
+            /**
+             * Retrieves the details of an existing refund.
+             */
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            retrieve(id: string, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+
+
+            /**
+             * Updates the specified refund by setting the values of the parameters passed.
+             * Any parameters not provided will be left unchanged.
+             * 
+             * This request only accepts metadata as an argument.
+             */
+            update(id: string, data: IDataOptionsWithMetadata, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            update(id: string, data: IDataOptionsWithMetadata, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+
+            /**
+             * Returns a list of all refunds you’ve previously created. The refunds are returned in sorted order, 
+             * with the most recent refunds appearing first. 
+             * For convenience, the 10 most recent refunds are always available by default on the charge object.
+             */
+            list(data: refunds.IRefundListOptions, options: HeaderOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            list(data: refunds.IRefundListOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            list(response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
         }
 
         class Coupons extends StripeResource {
@@ -1443,61 +4890,11 @@ declare namespace StripeNode {
              *
              * @returns Returns the coupon object.
              *
-             * @param options Options for creating the coupon.
+             * @param data Options for creating the coupon.
              */
-            create(options: {
-                /**
-                 * Unique string of your choice that will be used to identify this coupon when applying it a customer. This is often a specific code
-                 * you�ll give to your customer to use when signing up (e.g. FALL25OFF). If you don�t want to specify a particular code, you can leave
-                 * the ID blank and we�ll generate a random code for you.
-                 */
-                id?: string;
-
-                /**
-                 * Specifies how long the discount will be in effect. Can be forever, once, or repeating.
-                 */
-                duration: string;
-
-                /**
-                 * A positive integer representing the amount to subtract from an invoice total (required if percent_off is not passed)
-                 */
-                amount_off?: number;
-
-                /**
-                 * Currency of the amount_off parameter (required if amount_off is passed)
-                 */
-                currency?: string;
-
-                /**
-                 * required only if duration is repeating If duration is repeating, a positive integer that specifies the number of months the
-                 * discount will be in effect
-                 */
-                duration_in_months?: number;
-
-                /**
-                 * A positive integer specifying the number of times the coupon can be redeemed before it�s no longer valid. For example, you might
-                 * have a 50% off coupon that the first 20 readers of your blog can use.
-                 */
-                max_redemptions?: number;
-
-                /**
-                 * A set of key/value pairs that you can attach to a coupon object. It can be useful for storing additional information about the
-                 * coupon in a structured format. This can be unset by updating the value to null and then saving.
-                 */
-                metadata?: IMetadata;
-
-                /**
-                 * A positive integer between 1 and 100 that represents the discount the coupon will apply (required if amount_off is not passed)
-                 */
-                percent_off?: number;
-
-                /**
-                 * Unix timestamp specifying the last time at which the coupon can be redeemed. After the redeem_by date, the coupon can no longer
-                 * be applied to new customers.
-                 */
-                redeem_by?: number;
-            }, response: IResponseFn<coupons.ICoupon>): void;
-
+            create(data: coupons.ICouponCreationOptions, options: HeaderOptions, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
+            create(data: coupons.ICouponCreationOptions, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
+            
             /**
              * Retrieves the coupon with the given ID.
              *
@@ -1505,8 +4902,12 @@ declare namespace StripeNode {
              *
              * @param id The ID of the desired coupon
              */
-            retrieve(id: string, response: IResponseFn<coupons.ICoupon>): void;
-
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
+            retrieve(id: string, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
+            
+            
             /**
              * Updates the metadata of a coupon. Other coupon details (currency, duration, amount_off) are, by design, not editable.
              *
@@ -1514,16 +4915,11 @@ declare namespace StripeNode {
              * been deleted.
              *
              * @param id The ID of the coupon to be updated
-             * @param options Metadata to update
+             * @param data Metadata to update
              */
-            update(id: string, options: {
-                /**
-                 * A set of key/value pairs that you can attach to a coupon object. It can be useful for storing additional information about the
-                 * coupon in a structured format.
-                 */
-                metadata?: IMetadata;
-            }, response: IResponseFn<coupons.ICoupon>): void;
-
+            update(id: string, data: IDataOptionsWithMetadata, options: HeaderOptions, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
+            update(id: string, data: IDataOptionsWithMetadata, response?: IResponseFn<coupons.ICoupon>): Promise<coupons.ICoupon>;
+            
             /**
              * You can delete coupons via the coupon management page of the Stripe dashboard. However, deleting a coupon does not affect any
              * customers who have already applied the coupon; it means that new customers can't redeem the coupon. You can also delete coupons
@@ -1534,8 +4930,9 @@ declare namespace StripeNode {
              *
              * @param id The ID of the coupon to be deleted.
              */
-            del(id: string, response: IResponseFn<IDeleteConfirmation>): void;
-
+            del(id: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            del(id: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            
             /**
              * Returns a list of your coupons.
              *
@@ -1544,19 +4941,86 @@ declare namespace StripeNode {
              * should never throw an error. You can optionally request that the response include the total count of all coupons. To do so, specify
              * include[]=total_count in your request.
              *
-             * @param options Filtering options for the list.
+             * @param data Filtering options for the list.
              */
-            list(options: IListOptions, response: IResponseFn<coupons.ICoupon>): void;
+            list(data: IListOptionsCreated, options: HeaderOptions, response?: IResponseFn<IList<coupons.ICoupon>>): Promise<IList<coupons.ICoupon>>;
+            list(data: IListOptionsCreated, response?: IResponseFn<IList<coupons.ICoupon>>): Promise<IList<coupons.ICoupon>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<coupons.ICoupon>>): Promise<IList<coupons.ICoupon>>;
+            list(response?: IResponseFn<IList<coupons.ICoupon>>): Promise<IList<coupons.ICoupon>>;
         }
 
         class CustomerCards extends StripeResource {
-            create(): void;
-            list(): void;
-            update(id: string): void;
-            retrieve(id: string): void;
-            del(id: string): void;
+            /**
+             * When you create a new credit card, you must specify a customer or recipient to create it on. If the card's owner has no default card,
+             * then the new card will become the default. However, if the owner already has a default then it will not change. To change the default,
+             * you should either update the customer to have a new default_source or update the recipient to have a new default_card.
+             *
+             * @returns Returns the card object.
+             */
+            create(data: {
+                card?: sources.ISourceCreationOptionsExtended;
+            }, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            create(data: {
+                card?: sources.ISourceCreationOptionsExtended;
+            }, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            
+            /**
+             * You can see a list of the cards belonging to a customer or recipient. Note that the 10 most recent
+             * cards are always available by default on the customer or recipient object. If you need more than
+             * those 10, you can use this API method and the limit and starting_after parameters to page through
+             * additional cards.
+             *
+             * @returns Returns a list of the cards stored on the customer or recipient. You can optionally request
+             * that the response include the total count of all cards for the customer or recipient. To do so,
+             * specify include[]=total_count in your request.
+             * @param data Filtering options
+             */
+            list(data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+            list(data: IListOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+            list(response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+            
+            /**
+             * If you need to update only some card details, like the billing address or expiration date, you can do so without having to re-enter the
+             * full card details. Stripe also works directly with card networks so that your customers can continue using your service without
+             * interruption. When you update a card, Stripe will automatically validate the card.
+             *
+             * @returns Returns the card object.
+             *
+             * @param cardId The ID of the card to be retrieved.
+             */
+            update(cardId: string, data: cards.ICardUpdateOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            update(cardId: string, data: cards.ICardUpdateOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            
+            /**
+             * By default, you can see the 10 most recent cards stored on a customer or recipient directly on the customer or recipient object, but
+             * you can also retrieve details about a specific card stored on the customer or recipient.
+             *
+             * @returns Returns the card object.
+             *
+             * @param cardId The ID of the card to be retrieved.
+             */
+            retrieve(cardId: string, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            retrieve(cardId: string, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            
+            /**
+             * You can delete cards from a customer or recipient. If you delete a card that is currently the
+             * default source on a customer, then the most recently added source will become the new default.
+             * If you delete a card that is the last remaining source on the customer then the default_source
+             * attribute will become null. Similarly, if you delete the default card on a recipient, then the
+             * most recently added card will become the new default. If you delete the last remaining card on
+             * a recipient, then the default_card attribute will become null. Note that for cards belonging to
+             * customers, you may want to prevent customers on paid subscriptions from deleting all cards on
+             * file so that there is at least one default card for the next invoice payment attempt.
+             *
+             * @returns Returns the deleted card object.
+             *
+             * @param cardId The ID of the card to be retrieved.
+             */
+            del(cardId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            del(cardId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
         }
-
+        
         class Customers extends StripeResource {
             /**
              * Creates a new customer object.
@@ -1567,62 +5031,11 @@ declare namespace StripeNode {
              * the call will throw an error. If a source has been attached to the customer, the returned customer object will have a default_source
              * attribute, which is an ID that can be expanded into the full source details when retrieving the customer.
              *
-             * @param options The options for the new customer
+             * @param data The options for the new customer
              */
-            create(options: {
-                /**
-                 * An integer amount in cents that is the starting account balance for your customer. A negative amount represents a credit that
-                 * will be used before attempting any charges to the customer�s card; a positive amount will be added to the next invoice.
-                 */
-                account_balance?: number;
-
-                /**
-                 * If you provide a coupon code, the customer will have a discount applied on all recurring charges. Charges you create through the
-                 * API will not have the discount.
-                 */
-                coupon?: string;
-
-                /**
-                 * An arbitrary string that you can attach to a customer object. It is displayed alongside the customer in the dashboard. This can
-                 * be unset by updating the value to null and then saving.
-                 */
-                description?: string;
-
-                /**
-                 * Customer�s email address. It�s displayed alongside the customer in your dashboard and can be useful for searching and tracking.
-                 * This can be unset by updating the value to null and then saving.
-                 */
-                email?: string;
-
-                /**
-                 * A set of key/value pairs that you can attach to a customer object. It can be useful for storing additional information about the
-                 * customer in a structured format. This can be unset by updating the value to null and then saving.
-                 */
-                metadata?: IMetadata;
-
-                /**
-                 * The identifier of the plan to subscribe the customer to. If provided, the returned customer object will have a list of subscriptions
-                 * that the customer is currently subscribed to. If you subscribe a customer to a plan without a free trial, the customer must have a
-                 * valid card as well.
-                 */
-                plan?: string;
-
-                /**
-                 * The quantity you�d like to apply to the subscription you�re creating (if you pass in a plan). For example, if your plan is
-                 * 10 cents/user/month, and your customer has 5 users, you could pass 5 as the quantity to have the customer charged 50 cents
-                 * (5 x 10 cents) monthly. Defaults to 1 if not set. Only applies when the plan parameter is also provided.
-                 */
-                quantity?: number;
-                source?: string | ICard;
-
-                /**
-                 * Unix timestamp representing the end of the trial period the customer will get before being charged. If set, trial_end will
-                 * override the default trial period of the plan the customer is being subscribed to. The special value now can be provided to
-                 * end the customer�s trial immediately. Only applies when the plan parameter is also provided.
-                 */
-                trial_end?: number;
-            }, response: IResponseFn<customers.ICustomer>): void;
-
+            create(data: customers.ICustomerCreationOptions, options: HeaderOptions, response?: IResponseFn<customers.ICustomer>): Promise<customers.ICustomer>;
+            create(data: customers.ICustomerCreationOptions, response?: IResponseFn<customers.ICustomer>): Promise<customers.ICustomer>;
+            
             /**
              * Returns a list of your customers. The customers are returned sorted by creation date, with the most recently created customers
              * appearing first.
@@ -1632,10 +5045,13 @@ declare namespace StripeNode {
              * This request should never throw an error. You can optionally request that the response include the total count of all customers
              * that match your filters. To do so, specify include[]=total_count in your request.
              *
-             * @param options Allows you to filter the customers you want.
+             * @param data Allows you to filter the customers you want.
              */
-            list(options: IListOptions, response: IResponseFn<IList<customers.ICustomer>>): void;
-
+            list(data: IListOptionsCreated, options: HeaderOptions, response?: IResponseFn<IList<customers.ICustomer>>): Promise<IList<customers.ICustomer>>;
+            list(data: IListOptionsCreated, response?: IResponseFn<IList<customers.ICustomer>>): Promise<IList<customers.ICustomer>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<customers.ICustomer>>): Promise<IList<customers.ICustomer>>;
+            list(response?: IResponseFn<IList<customers.ICustomer>>): Promise<IList<customers.ICustomer>>;
+            
             /**
              * Updates the specified customer by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
              * For example, if you pass the card parameter, that becomes the customer's active card to be used for all charges in the future.
@@ -1647,60 +5063,11 @@ declare namespace StripeNode {
              *
              * @returns Returns the customer object if the update succeeded. Throws an error if update parameters are invalid (e.g. specifying
              * an invalid coupon or an invalid card).
+             * 
+             * @param id The identifier of the customer to be retrieved.
              */
-            update(id: string, options: {
-                /**
-                 * An integer amount in cents that is the starting account balance for your customer. A negative amount represents a credit that
-                 * will be used before attempting any charges to the customer�s card; a positive amount will be added to the next invoice.
-                 */
-                account_balance?: number;
-
-                /**
-                 * If you provide a coupon code, the customer will have a discount applied on all recurring charges. Charges you create through the
-                 * API will not have the discount.
-                 */
-                coupon?: string;
-
-                /**
-                 * An arbitrary string that you can attach to a customer object. It is displayed alongside the customer in the dashboard. This can
-                 * be unset by updating the value to null and then saving.
-                 */
-                description?: string;
-
-                /**
-                 * Customer�s email address. It�s displayed alongside the customer in your dashboard and can be useful for searching and tracking.
-                 * This can be unset by updating the value to null and then saving.
-                 */
-                email?: string;
-
-                /**
-                 * A set of key/value pairs that you can attach to a customer object. It can be useful for storing additional information about the
-                 * customer in a structured format. This can be unset by updating the value to null and then saving.
-                 */
-                metadata?: IMetadata;
-
-                /**
-                 * The identifier of the plan to subscribe the customer to. If provided, the returned customer object will have a list of subscriptions
-                 * that the customer is currently subscribed to. If you subscribe a customer to a plan without a free trial, the customer must have a
-                 * valid card as well.
-                 */
-                plan?: string;
-
-                /**
-                 * The quantity you�d like to apply to the subscription you�re creating (if you pass in a plan). For example, if your plan is
-                 * 10 cents/user/month, and your customer has 5 users, you could pass 5 as the quantity to have the customer charged 50 cents
-                 * (5 x 10 cents) monthly. Defaults to 1 if not set. Only applies when the plan parameter is also provided.
-                 */
-                quantity?: number;
-                source?: ICard;
-
-                /**
-                 * Unix timestamp representing the end of the trial period the customer will get before being charged. If set, trial_end will
-                 * override the default trial period of the plan the customer is being subscribed to. The special value now can be provided to
-                 * end the customer�s trial immediately. Only applies when the plan parameter is also provided.
-                 */
-                trial_end?: number;
-            }, response: IResponseFn<customers.ICustomer>): void;
+            update(id: string, data: customers.ICustomerUpdateOptions, options: HeaderOptions, response?: IResponseFn<customers.ICustomer>): Promise<IList<customers.ICustomer>>;
+            update(id: string, data: customers.ICustomerUpdateOptions, response?: IResponseFn<customers.ICustomer>): Promise<IList<customers.ICustomer>>;
 
             /**
              * Retrieves the details of an existing customer. You need only supply the unique customer identifier that was returned upon customer
@@ -1711,8 +5078,9 @@ declare namespace StripeNode {
              *
              * @param id The identifier of the customer to be retrieved.
              */
-            retrieve(id: string, response: IResponseFn<customers.ICustomer>): void;
-
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<customers.ICustomer>): Promise<customers.ICustomer>;
+            retrieve(id: string, response?: IResponseFn<customers.ICustomer>): Promise<customers.ICustomer>;
+            
             /**
              * Permanently deletes a customer. It cannot be undone. Also immediately cancels any active subscriptions on the customer.
              *
@@ -1722,8 +5090,11 @@ declare namespace StripeNode {
              *
              * @param id The identifier of the customer to be deleted.
              */
-            del(id: string, response: IResponseFn<IDeleteConfirmation>): void;
-
+            del(id: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            del(id: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            
+            
+            
             /**
              * When you create a new credit card, you must specify a customer or recipient to create it on. If the card's owner has no default card,
              * then the new card will become the default. However, if the owner already has a default then it will not change. To change the default,
@@ -1732,16 +5103,16 @@ declare namespace StripeNode {
              * @returns Returns the card object.
              *
              * @param customerId The customer ID to which to add the card.
+             * 
+             * @deprecated
              */
-            createCard(customerId: string, options: {
-                /**
-                 * The source can either be a token, like the ones returned by our Stripe.js, or a dictionary containing a user�s credit card details
-                 * (with the options shown below). Whenever you create a new card for a customer, Stripe will automatically validate the card.
-                 */
-                source?: string | ICard;
-                card?: string | IPaymentToken;
-            }, response: IResponseFn<ICard>): void;
-
+            createCard(customerId: string, data: {
+                card?: sources.ISourceCreationOptionsExtended;
+            }, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            createCard(customerId: string, data: {
+                card?: sources.ISourceCreationOptionsExtended;
+            }, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            
             /**
              * By default, you can see the 10 most recent cards stored on a customer or recipient directly on the customer or recipient object, but
              * you can also retrieve details about a specific card stored on the customer or recipient.
@@ -1751,8 +5122,9 @@ declare namespace StripeNode {
              * @param customerId The ID of the customer whose card needs to be retrieved.
              * @param cardId The ID of the card to be retrieved.
              */
-            retrieveCard(customerId: string, cardId: string, response: IResponseFn<ICard>): void;
-
+            retrieveCard(customerId: string, cardId: string, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            retrieveCard(customerId: string, cardId: string, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            
             /**
              * If you need to update only some card details, like the billing address or expiration date, you can do so without having to re-enter the
              * full card details. Stripe also works directly with card networks so that your customers can continue using your service without
@@ -1763,36 +5135,9 @@ declare namespace StripeNode {
              * @param customerId The ID of the customer whose card needs to be retrieved.
              * @param cardId The ID of the card to be retrieved.
              */
-            updateCard(customerId: string, cardId: string, options: {
-                /**
-                 * The card number
-                 */
-                'number'?: number;
-                exp_month?: number;
-                exp_year?: number;
-                address_city?: string;
-
-                /**
-                 * Billing address country, if provided when creating card
-                 */
-                address_country?: string;
-                address_line1?: string;
-                address_line2?: string;
-                address_state?: string;
-                address_zip?: string;
-
-                /**
-                 * Two-letter ISO code representing the country of the card. You could use this
-                 * attribute to get a sense of the international breakdown of cards you�ve collected.
-                 */
-                country?: string;
-
-                /**
-                 * Cardholder name
-                 */
-                name?: string;
-            }, response: IResponseFn<ICard>): void;
-
+            updateCard(customerId: string, cardId: string, data: cards.ICardUpdateOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            updateCard(customerId: string, cardId: string, data: cards.ICardUpdateOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            
             /**
              * You can delete cards from a customer or recipient. If you delete a card that is currently the
              * default source on a customer, then the most recently added source will become the new default.
@@ -1808,8 +5153,9 @@ declare namespace StripeNode {
              * @param customerId The ID of the customer whose card needs to be retrieved.
              * @param cardId The ID of the card to be retrieved.
              */
-            deleteCard(customerId: string, cardId: string, response: IResponseFn<IDeleteConfirmation>): void;
-
+            deleteCard(customerId: string, cardId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            deleteCard(customerId: string, cardId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            
             /**
              * You can see a list of the cards belonging to a customer or recipient. Note that the 10 most recent
              * cards are always available by default on the customer or recipient object. If you need more than
@@ -1821,10 +5167,132 @@ declare namespace StripeNode {
              * specify include[]=total_count in your request.
              *
              * @param customerId The ID of the customer whose cards will be retrieved
-             * @param options Filtering options
+             * @param data Filtering options
              */
-            listCards(customerId: string, options: IListOptions, response: IResponseFn<IList<ICard>>): void;
+            listCards(customerId: string, data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+            listCards(customerId: string, data: IListOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+            listCards(customerId: string, options: HeaderOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+            listCards(customerId: string, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+            
+            
+            /**
+             * When adding a card to a customer, the parameter name is source. When 
+             * adding to an account, the parameter name is external_account. The 
+             * value can either be a token, like the ones returned by our Stripe.js, or a 
+             * dictionary containing a user's credit card details. 
+             * Stripe will automatically validate the card.
+             *
+             * @returns Returns the card object.
+             *
+             * @param customerId The customer ID to which to add the card.
+             */
+            createSource(customerId: string, data: customers.ICustomerCardSourceCreationOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            createSource(customerId: string, data: customers.ICustomerCardSourceCreationOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            /**
+             * When adding a card to a customer, the parameter name is source. When 
+             * adding to an account, the parameter name is external_account. The 
+             * value can either be a token, like the ones returned by our Stripe.js, or a 
+             * dictionary containing a user’s credit card details. 
+             * Stripe will automatically validate the card.
+             *
+             * @returns Returns the card or bank account object.
+             *
+             * @param customerId The customer ID to which to add the card.
+             */
+            createSource(customerId: string, data: customers.ICustomerSourceCreationOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
+            createSource(customerId: string, data: customers.ICustomerSourceCreationOptions, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
+            
+            /**
+             * You can see a list of the cards belonging to a customer or recipient. Note that the 10 most recent
+             * cards are always available by default on the customer or recipient object. If you need more than
+             * those 10, you can use this API method and the limit and starting_after parameters to page through
+             * additional cards.
+             *
+             * @returns Returns a list of the cards stored on the customer or recipient. You can optionally request
+             * that the response include the total count of all cards for the customer or recipient. To do so,
+             * specify include[]=total_count in your request.
+             *
+             * @param customerId The ID of the customer whose cards will be retrieved
+             * @param data Filtering options
+             */
+            listSource(customerId: string, data: customers.ICardSourceListOptions, options: HeaderOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+            listSource(customerId: string, data: customers.ICardSourceListOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+            /**
+             * You can see a list of the bank accounts belonging to a customer or recipient. Note that the 10 most recent
+             * bank accounts are always available by default on the customer or recipient object. If you need more than
+             * those 10, you can use this API method and the limit and starting_after parameters to page through
+             * additional cards.
+             *
+             * @returns Returns a list of the bank accounts stored on the customer or recipient. You can optionally request
+             * that the response include the total count of all bank accounts for the customer or recipient. To do so,
+             * specify include[]=total_count in your request.
+             *
+             * @param customerId The ID of the customer whose cards will be retrieved
+             * @param data Filtering options
+             */
+            listSource(customerId: string, data: customers.IBankAccountSourceListOptions, options: HeaderOptions, response?: IResponseFn<IList<bankAccounts.IBankAccount>>): Promise<IList<bankAccounts.IBankAccount>>;
+            listSource(customerId: string, data: customers.IBankAccountSourceListOptions, response?: IResponseFn<IList<bankAccounts.IBankAccount>>): Promise<IList<bankAccounts.IBankAccount>>;
+            
+            /**
+             * By default, you can see the 10 most recent cards/bank accounts stored on a customer or recipient directly on the customer or recipient object, but
+             * you can also retrieve details about a specific card/bank account stored on the customer or recipient.
+             *
+             * @returns Returns the card/bank account object.
+             *
+             * @param customerId The ID of the customer whose card needs to be retrieved.
+             * @param sourceId The ID of the source to be retrieved.
+             */
+            retrieveSource(customerId: string, sourceId: string, options: HeaderOptions, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
+            retrieveSource(customerId: string, sourceId: string, response?: IResponseFn<cards.ICard | bankAccounts.IBankAccount>): Promise<cards.ICard | bankAccounts.IBankAccount>;
+            
+            /**
+             * If you need to update only some card details, like the billing address or expiration date, you can do so without having to re-enter the
+             * full card details. Stripe also works directly with card networks so that your customers can continue using your service without
+             * interruption. When you update a card, Stripe will automatically validate the card.
+             *
+             * @returns Returns the card object.
+             *
+             * @param customerId The ID of the customer whose card needs to be retrieved.
+             * @param sourceId The ID of the card to be retrieved.
+             */
+            updateSource(customerId: string, sourceId: string, data: cards.ICardUpdateOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            updateSource(customerId: string, sourceId: string, data: cards.ICardUpdateOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            
+            /**
+             * Updates the metadata, account_holder_name, and account_holder_type of a bank account belonging to a Customer. Other bank account details 
+             * are not editable by design.
+             *
+             * @returns Returns the bank account object.
+             *
+             * @param customerId The ID of the customer whose card needs to be retrieved.
+             * @param sourceId The ID of the bank account to be updated.
+             */
+            updateSource(customerId: string, sourceId: string, data: bankAccounts.IBankAccountUpdateOptions, options: HeaderOptions, response?: IResponseFn<cards.ICard>): Promise<cards.ICard>;
+            updateSource(customerId: string, sourceId: string, data: bankAccounts.IBankAccountUpdateOptions, response?: IResponseFn<bankAccounts.IBankAccount>): Promise<bankAccounts.IBankAccount>;
+            
+            /**
+             * You can delete cards or bank accounts from a customer or recipient. If you delete a card or bank account that is currently the
+             * default source on a customer, then the most recently added source will become the new default.
+             * If you delete a card or bank account that is the last remaining source on the customer then the default_source
+             * attribute will become null. Similarly, if you delete the default card or bank account on a recipient, then the
+             * most recently added source will become the new default. If you delete the last remaining source on
+             * a recipient, then the default_card attribute will become null. Note that for sources belonging to
+             * customers, you may want to prevent customers on paid subscriptions from deleting all sources on
+             * file so that there is at least one default source for the next invoice payment attempt.
+             *
+             * @returns Returns a confirmation object.
+             *
+             * @param customerId The ID of the customer whose source needs to be deleted.
+             * @param sourceId The ID of the source to be deleted.
+             */
+            deleteSource(customerId: string, sourceId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            deleteSource(customerId: string, sourceId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
 
+
+            verifySource(customerId: string, sourceId: string, options: HeaderOptions): Promise<{}>; //TODO: This still needs properly implementing.
+            verifySource(customerId: string, sourceId: string): Promise<{}>; //TODO: This still needs properly implementing.
+            
+            
             /**
              * Creates a new subscription on an existing customer.
              *
@@ -1835,71 +5303,9 @@ declare namespace StripeNode {
              * @param customerId The customer to which the add the subscription.
              * @param options The options for the new subscription
              */
-            createSubscription(customerId: string, options: {
-                /**
-                 * The identifier of the plan to subscribe the customer to.
-                 */
-                plan: string;
-
-                /**
-                 * The code of the coupon to apply to this subscription. A coupon applied to a subscription will only
-                 * affect invoices created for that particular subscription.
-                 */
-                coupon?: string;
-
-                /**
-                 * Unix timestamp representing the end of the trial period the customer will get before being charged
-                 * for the first time. If set, trial_end will override the default trial period of the plan the customer
-                 * is being subscribed to. The special value now can be provided to end the customer's trial immediately.
-                 */
-                trial_end?: number;
-
-                /**
-                 * The source can either be a token, like the ones returned by our Stripe.js, or a object containing a
-                 * user's credit card details (with the options shown below). You must provide a source if the customer
-                 * does not already have a valid source attached, and you are subscribing the customer for a plan that
-                 * is not free. Passing source will create a new source object, make it the customer default source, and
-                 * delete the old customer default if one exists. If you want to add an additional source to use with
-                 * subscriptions, instead use the card creation API to add the card and then the customer update API to
-                 * set it as the default. Whenever you attach a card to a customer, Stripe will automatically validate
-                 * the card.
-                 */
-                source?: IPaymentToken | ICard;
-
-                /**
-                 * The quantity you'd like to apply to the subscription you're creating. For example, if your plan is
-                 * $10/user/month, and your customer has 5 users, you could pass 5 as the quantity to have the customer
-                 * charged $50 (5 x $10) monthly. If you update a subscription but don't change the plan ID (e.g.
-                 * changing only the trial_end), the subscription will inherit the old subscription's quantity attribute
-                 * unless you pass a new quantity parameter. If you update a subscription and change the plan ID, the new
-                 * subscription will not inherit the quantity attribute and will default to 1 unless you pass a quantity
-                 * parameter.
-                 */
-                quantity?: number;
-
-                /**
-                 * A positive decimal (with at most two decimal places) between 1 and 100. This represents the percentage
-                 * of the subscription invoice subtotal that will be transferred to the application owner�s Stripe account.
-                 * The request must be made with an OAuth key in order to set an application fee percentage. For more
-                 * information, see the application fees documentation: https://stripe.com/docs/connect/collecting-fees#subscriptions
-                 */
-                application_fee_percent?: number;
-
-                /**
-                 * A positive decimal (with at most two decimal places) between 1 and 100. This represents the percentage
-                 * of the subscription invoice subtotal that will be calculated and added as tax to the final amount each
-                 * billing period. For example, a plan which charges $10/month with a tax_percent of 20.0 will charge
-                 * $12 per invoice.
-                 */
-                tax_percent?: number;
-
-                /**
-                 * A set of key/value pairs that you can attach to a subscription object. It can be useful for
-                 * storing additional information about the subscription in a structured format.
-                 */
-                metadata?: IMetadata;
-            }, response: IResponseFn<customerSubscriptions.ISubscription>): void;
-
+            createSubscription(customerId: string, data: customerSubscriptions.ISubscriptionCreationOptions, options: HeaderOptions, response?: IResponseFn<customerSubscriptions.ISubscription>): Promise<customerSubscriptions.ISubscription>;
+            createSubscription(customerId: string, data: customerSubscriptions.ISubscriptionCreationOptions, response?: IResponseFn<customerSubscriptions.ISubscription>): Promise<customerSubscriptions.ISubscription>;
+            
             /**
              * By default, you can see the 10 most recent active subscriptions stored on a customer directly on the customer
              * object, but you can also retrieve details about a specific active subscription for a customer.
@@ -1909,8 +5315,9 @@ declare namespace StripeNode {
              * @param customerId The customer ID for the subscription
              * @param subscriptionId The ID of the subscription to retrieve
              */
-            retrieveSubscription(customerId: string, subscriptionId: string, response: IResponseFn<customerSubscriptions.ISubscription>): void;
-
+            retrieveSubscription(customerId: string, subscriptionId: string, options: HeaderOptions, response?: IResponseFn<customerSubscriptions.ISubscription>): Promise<customerSubscriptions.ISubscription>;
+            retrieveSubscription(customerId: string, subscriptionId: string, response?: IResponseFn<customerSubscriptions.ISubscription>): Promise<customerSubscriptions.ISubscription>;
+            
             /**
              * Updates an existing subscription on a customer to match the specified parameters. When changing plans or quantities,
              * we will optionally prorate the price we charge next month to make up for any price changes.
@@ -1934,71 +5341,11 @@ declare namespace StripeNode {
              *
              * @param customerId The ID of the customer whose subscription needs to be updated.
              * @param subscriptionId The ID of the subscription to update.
-             * @param options The fields to update
+             * @param data The fields to update
              */
-            updateSubscription(customerId: string, subscriptionId: string, options: {
-                /**
-                 * The identifier of the plan to update the subscription to. If omitted, the subscription will not change plans.
-                 */
-                plan?: string;
-
-                /**
-                 * The code of the coupon to apply to the customer if you would like to apply it at the same time as updating the subscription.
-                 */
-                coupon?: string;
-
-                /**
-                 * Flag telling us whether to prorate switching plans during a billing cycle.
-                 */
-                prorate?: boolean;
-
-                /**
-                 * Unix timestamp representing the end of the trial period the customer will get before being charged for the first time. If set,
-                 * trial_end will override the default trial period of the plan the customer is being subscribed to. The special value now can be
-                 * provided to end the customer's trial immediately.
-                 */
-                trial_end?: number;
-
-                /**
-                 * The source can either be a token, like the ones returned by our Stripe.js, or a object containing a user's credit card details
-                 * (with the options shown below). You must provide a source if the customer does not already have a valid source attached, and
-                 * you are subscribing the customer for a plan that is not free. Passing source will create a new source object, make it the
-                 * customer default source, and delete the old customer default if one exists. If you want to add an additional source to use
-                 * with subscriptions, instead use the card creation API to add the card and then the customer update API to set it as the default.
-                 * Whenever you attach a card to a customer, Stripe will automatically validate the card.
-                 */
-                source?: IPaymentToken | ICard;
-
-                /**
-                 * The quantity you'd like to apply to the subscription you're updating. For example, if your plan is $10/user/month, and your
-                 * customer has 5 users, you could pass 5 as the quantity to have the customer charged $50 (5 x $10) monthly. If you update a
-                 * subscription but don't change the plan ID (e.g. changing only the trial_end), the subscription will inherit the old subscription's
-                 * quantity attribute unless you pass a new quantity parameter. If you update a subscription and change the plan ID, the new
-                 * subscription will not inherit the quantity attribute and will default to 1 unless you pass a quantity parameter.
-                 */
-                quantity?: number;
-
-                /**
-                 * A positive decimal (with at most two decimal places) between 1 and 100 that represents the percentage of the subscription
-                 * invoice amount due each billing period (including any bundled invoice items) that will be transferred to the application
-                 * owner�s Stripe account. The request must be made with an OAuth key in order to set an application fee percentage . For more
-                 * information, see the application fees documentation: https://stripe.com/docs/connect/collecting-fees#subscriptions
-                 */
-                application_fee_percent?: number;
-
-                /**
-                 * Update the amount of tax applied to this subscription. Changing the tax_percent of a subscription will only affect future
-                 * invoices.
-                 */
-                tax_percent?: number;
-
-                /**
-                 * A set of key/value pairs that you can attach to a subscription object. It can be useful for storing additional information
-                 * about the subscription in a structured format.
-                 */
-                metadata?: IMetadata;
-            }, response: IResponseFn<customerSubscriptions.ISubscription>): void;
-
+            updateSubscription(customerId: string, subscriptionId: string, data: customerSubscriptions.ISubscriptionUpdateOptions, options: HeaderOptions, response?: IResponseFn<customerSubscriptions.ISubscription>): Promise<customerSubscriptions.ISubscription>;
+            updateSubscription(customerId: string, subscriptionId: string, data: customerSubscriptions.ISubscriptionUpdateOptions, response?: IResponseFn<customerSubscriptions.ISubscription>): Promise<customerSubscriptions.ISubscription>;
+            
             /**
              * Cancels a customer's subscription. If you set the at_period_end parameter to true, the subscription will remain active until
              * the end of the period, at which point it will be canceled and not renewed. By default, the subscription is terminated
@@ -2016,15 +5363,12 @@ declare namespace StripeNode {
              *
              * @param customerId The ID of the customer whose subscription needs to be cancelled.
              * @param subscriptionId The ID of the subscription to cancel.
-             * @param options Specify when to cancel the subscription
+             * @param data Specify when to cancel the subscription
              */
-            cancelSubscription(customerId: string, subscriptionId: string, options: {
-                /**
-                 * A flag that if set to true will delay the cancellation of the subscription until the end of the current period.
-                 */
-                at_period_end?: boolean;
-            }, response: IResponseFn<customerSubscriptions.ISubscription>): void;
-
+            cancelSubscription(customerId: string, subscriptionId: string, data: customerSubscriptions.ISubscriptionCancellationOptions, options: HeaderOptions, response?: IResponseFn<customerSubscriptions.ISubscription>): Promise<customerSubscriptions.ISubscription>;
+            cancelSubscription(customerId: string, subscriptionId: string, data: customerSubscriptions.ISubscriptionCancellationOptions, response?: IResponseFn<customerSubscriptions.ISubscription>): Promise<customerSubscriptions.ISubscription>;
+            cancelSubscription(customerId: string, subscriptionId: string, response?: IResponseFn<customerSubscriptions.ISubscription>): Promise<customerSubscriptions.ISubscription>;
+            
             /**
              * You can see a list of the customer's active subscriptions. Note that the 10 most recent active subscriptions are always available
              * by default on the customer object. If you need more than those 10, you can use the limit and starting_after parameters to page
@@ -2034,10 +5378,14 @@ declare namespace StripeNode {
              * count of all subscriptions for the customer. To do so, specify include[]=total_count in your request.
              *
              * @param customerId The ID of the customer whose subscriptions will be retrieved
-             * @param options Filtering options
+             * @param data Filtering options
              */
-            listSubscriptions(customerId: string, options: IListOptions, response: IResponseFn<IList<customerSubscriptions.ISubscription>>): void;
-
+            listSubscriptions(customerId: string, data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<customerSubscriptions.ISubscription>>): Promise<IList<customerSubscriptions.ISubscription>>;
+            listSubscriptions(customerId: string, data: IListOptions, response?: IResponseFn<IList<customerSubscriptions.ISubscription>>): Promise<IList<customerSubscriptions.ISubscription>>;
+            listSubscriptions(customerId: string, options: HeaderOptions, response?: IResponseFn<IList<customerSubscriptions.ISubscription>>): Promise<IList<customerSubscriptions.ISubscription>>;
+            listSubscriptions(customerId: string, response?: IResponseFn<IList<customerSubscriptions.ISubscription>>): Promise<IList<customerSubscriptions.ISubscription>>;
+            
+            
             /**
              * Removes the currently applied discount on a customer.
              *
@@ -2046,8 +5394,9 @@ declare namespace StripeNode {
              *
              * @param customerId The ID of the customer.
              */
-            deleteDiscount(customerId: string, response: IResponseFn<IDeleteConfirmation>): void;
-
+            deleteDiscount(customerId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;;
+            deleteDiscount(customerId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;;
+            
             /**
              * Removes the currently applied discount on a subscription.
              *
@@ -2057,33 +5406,203 @@ declare namespace StripeNode {
              * @param customerId The ID of the customer.
              * @param subscriptionId The ID of the subscription.
              */
-            deleteSubscriptionDiscount(customerId: string, subscriptionId: string, response: IResponseFn<IDeleteConfirmation>): void;
+            deleteSubscriptionDiscount(customerId: string, subscriptionId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;;
+            deleteSubscriptionDiscount(customerId: string, subscriptionId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;;
         }
 
         class CustomerSubscriptions extends StripeResource {
-            create(): void;
-            list(): void;
-            update(id: string): void;
-            retrieve(id: string): void;
-            del(id: string): void;
+            /**
+             * Creates a new subscription on an existing customer.
+             *
+             * @returns The newly created subscription object if the call succeeded. If the customer has no card or the
+             * attempted charge fails, this call throws an error (unless the specified plan is free or has a trial
+             * period).
+             *
+             * @param options The options for the new subscription
+             */
+            create(data: customerSubscriptions.ISubscriptionCreationOptions, options: HeaderOptions, response?: IResponseFn<customerSubscriptions.ISubscription>): Promise<customerSubscriptions.ISubscription>;
+            create(data: customerSubscriptions.ISubscriptionCreationOptions, response?: IResponseFn<customerSubscriptions.ISubscription>): Promise<customerSubscriptions.ISubscription>;
+            
+            /**
+             * By default, you can see the 10 most recent active subscriptions stored on a customer directly on the customer
+             * object, but you can also retrieve details about a specific active subscription for a customer.
+             *
+             * @returns Returns the subscription object.
+             *
+             * @param subscriptionId The ID of the subscription to retrieve
+             */
+            retrieve(subscriptionId: string, options: HeaderOptions, response?: IResponseFn<customerSubscriptions.ISubscription>): Promise<customerSubscriptions.ISubscription>;
+            retrieve(subscriptionId: string, response?: IResponseFn<customerSubscriptions.ISubscription>): Promise<customerSubscriptions.ISubscription>;
+            
+            /**
+             * Updates an existing subscription on a customer to match the specified parameters. When changing plans or quantities,
+             * we will optionally prorate the price we charge next month to make up for any price changes.
+             *
+             * By default, we prorate subscription changes. For example, if a customer signs up on May 1 for a $10 plan, she'll be billed
+             * $10 immediately. If she then switches to a $20 plan on May 15, on June 1 she'll be billed $25 ($20 for a renewal of her
+             * subscription and a $5 prorating adjustment for the previous month). Similarly, a downgrade will generate a credit to be
+             * applied to the next invoice. We also prorate when you make quantity changes. Switching plans does not change the billing
+             * date or generate an immediate charge unless you're switching between different intervals (e.g. monthly to yearly), in which
+             * case we apply a credit for the time unused on the old plan and charge for the new plan starting right away, resetting the
+             * billing date. (Note that if we charge for the new plan, and that payment fails, the plan change will not go into effect). If
+             * you'd like to charge for an upgrade immediately, just pass prorate as true as usual, and then invoice the customer as soon
+             * as you make the subscription change. That'll collect the proration adjustments into a new invoice, and Stripe will automatically
+             * attempt to pay the invoice. If you don't want to prorate at all, set the prorate option to false and the customer would be billed
+             * $10 on May 1 and $20 on June 1. Similarly, if you set prorate to false when switching between different billing intervals
+             * (monthly to yearly, for example), we won't generate any credits for the old subscription's unused time, although we will still
+             * reset the billing date and bill immediately for the new subscription.
+             *
+             * @returns The newly updated subscription object if the call succeeded. If a charge is required for the update, and
+             * the charge fails, this call raises throws an error, and the subscription update does not go into effect.
+             *
+             * @param subscriptionId The ID of the subscription to update.
+             * @param data The fields to update
+             */
+            update(subscriptionId: string, data: customerSubscriptions.ISubscriptionUpdateOptions, options: HeaderOptions, response?: IResponseFn<customerSubscriptions.ISubscription>): Promise<customerSubscriptions.ISubscription>;
+            update(subscriptionId: string, data: customerSubscriptions.ISubscriptionUpdateOptions, response?: IResponseFn<customerSubscriptions.ISubscription>): Promise<customerSubscriptions.ISubscription>;
+            
+            /**
+             * Cancels a customer's subscription. If you set the at_period_end parameter to true, the subscription will remain active until
+             * the end of the period, at which point it will be canceled and not renewed. By default, the subscription is terminated
+             * immediately. In either case, the customer will not be charged again for the subscription. Note, however, that any pending
+             * invoice items that you've created will still be charged for at the end of the period unless manually deleted. If you've set
+             * the subscription to cancel at period end, any pending prorations will also be left in place and collected at the end of the
+             * period, but if the subscription is set to cancel immediately, pending prorations will be removed. By default, all unpaid
+             * invoices for the customer will be closed upon subscription cancellation. We do this in order to prevent unexpected payment
+             * retries once the customer has canceled a subscription. However, you can reopen the invoices manually after subscription
+             * cancellation to have us proceed with automatic retries, or you could even re-attempt payment yourself on all unpaid invoices
+             * before allowing the customer to cancel the subscription at all.
+             *
+             * @returns The canceled subscription object. Its subscription status will be set to "canceled" unless you've set at_period_end
+             * to true when canceling, in which case the status will remain "active" but the cancel_at_period_end attribute will change to true.
+             *
+             * @param subscriptionId The ID of the subscription to cancel.
+             * @param data Specify when to cancel the subscription
+             */
+            del(subscriptionId: string, data: customerSubscriptions.ISubscriptionCancellationOptions, options: HeaderOptions, response?: IResponseFn<customerSubscriptions.ISubscription>): Promise<customerSubscriptions.ISubscription>;
+            del(subscriptionId: string, data: customerSubscriptions.ISubscriptionCancellationOptions, response?: IResponseFn<customerSubscriptions.ISubscription>): Promise<customerSubscriptions.ISubscription>;
+            del(subscriptionId: string, options: HeaderOptions, response?: IResponseFn<customerSubscriptions.ISubscription>): Promise<customerSubscriptions.ISubscription>;
+            del(subscriptionId: string, response?: IResponseFn<customerSubscriptions.ISubscription>): Promise<customerSubscriptions.ISubscription>;
+            
+            /**
+             * You can see a list of the customer's active subscriptions. Note that the 10 most recent active subscriptions are always available
+             * by default on the customer object. If you need more than those 10, you can use the limit and starting_after parameters to page
+             * through additional subscriptions.
+             *
+             * @returns Returns a list of the customer's active subscriptions. You can optionally request that the response include the total
+             * count of all subscriptions for the customer. To do so, specify include[]=total_count in your request.
+             *
+             * @param data Filtering options
+             */
+            list(data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<customerSubscriptions.ISubscription>>): Promise<IList<customerSubscriptions.ISubscription>>;
+            list(data: IListOptions, response?: IResponseFn<IList<customerSubscriptions.ISubscription>>): Promise<IList<customerSubscriptions.ISubscription>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<customerSubscriptions.ISubscription>>): Promise<IList<customerSubscriptions.ISubscription>>;
+            list(response?: IResponseFn<IList<customerSubscriptions.ISubscription>>): Promise<IList<customerSubscriptions.ISubscription>>;
+            
+            /**
+             * Removes the currently applied discount on a subscription.
+             *
+             * @returns An object with a deleted flag set to true upon success. This call throws an error otherwise, such as if no
+             * discount exists on this subscription.
+             *
+             * @param subscriptionId The ID of the subscription.
+             */
+            deleteDiscount(subscriptionId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;;
+            deleteDiscount(subscriptionId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;;
         }
-
+        
+        class Disputes extends StripeResource {
+            /**
+             * Retrieves the dispute with the given ID.
+             */
+            retrieve(disputeId: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
+            retrieve(disputeId: string, data: IDataOptions, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
+            retrieve(disputeId: string, options: HeaderOptions, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
+            retrieve(disputeId: string, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
+            
+            
+            /**
+             * When you get a dispute, contacting your customer is always the best first step. If that doesn't work, you can submit evidence in
+             * order to help us resolve the dispute in your favor. You can do this in your dashboard, but if you prefer, you can use the API to
+             * submit evidence programmatically. Depending on your dispute type, different evidence fields will give you a better chance of winning
+             * your dispute. You may want to consult our guide to dispute types to help you figure out which evidence fields to provide:
+             * https://stripe.com/help/dispute-types
+             *
+             * @param data The fields to update
+             */
+            update(disputeId: string, data: disputes.IDisputeUpdateOptions, options: HeaderOptions, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
+            update(disputeId: string, data: disputes.IDisputeUpdateOptions, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
+            
+            /**
+             * Closing the dispute for a charge indicates that you do not have any evidence to submit and are 
+             * essentially ‘dismissing’ the dispute, acknowledging it as lost
+             * 
+             * The status of the dispute will change from needs_response to lost. 
+             * 
+             * *Closing a dispute is irreversible!*
+             */
+            close(disputeId: string, options: HeaderOptions, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
+            close(disputeId: string, response?: IResponseFn<disputes.IDispute>): Promise<disputes.IDispute>;
+            
+            /**
+             * Returns a list of your disputes.
+             */
+            list(data: IListOptionsCreated, options: HeaderOptions, response?: IResponseFn<IList<disputes.IDispute>>): Promise<IList<disputes.IDispute>>;
+            list(data: IListOptionsCreated, response?: IResponseFn<IList<disputes.IDispute>>): Promise<IList<disputes.IDispute>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<disputes.IDispute>>): Promise<IList<disputes.IDispute>>;
+            list(response?: IResponseFn<IList<disputes.IDispute>>): Promise<IList<disputes.IDispute>>;
+            
+            setMetadata(): void; //TODO: Implement placeholder method
+            getMetadata(): void; //TODO: Implement placeholder method
+        }
+        
         class Events extends StripeResource {
-            list(): void;
-            retrieve(id: string): void;
+            /**
+             * Retrieves the details of an event. Supply the unique identifier of the event, which you might have 
+             * received in a webhook.
+             */
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<events.IEvent>): Promise<events.IEvent>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<events.IEvent>): Promise<events.IEvent>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<events.IEvent>): Promise<events.IEvent>;
+            retrieve(id: string, response?: IResponseFn<events.IEvent>): Promise<events.IEvent>;
+            
+            
+            /**
+             * List events, going back up to 30 days.
+             */
+            list(data: events.IEventListOptions, options: HeaderOptions, response?: IResponseFn<IList<events.IEvent>>): Promise<IList<events.IEvent>>;
+            list(data: events.IEventListOptions, response?: IResponseFn<IList<events.IEvent>>): Promise<IList<events.IEvent>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<events.IEvent>>): Promise<IList<events.IEvent>>;
+            list(response?: IResponseFn<IList<events.IEvent>>): Promise<IList<events.IEvent>>;
         }
 
         class FileUploads extends StripeResource {
-            list(): void;
-            retrieve(id: string): void;
-        }
-
-        class InvoiceItems extends StripeResource {
-            create(): void;
-            list(): void;
-            update(id: string): void;
-            retrieve(id: string): void;
-            del(id: string): void;
+            /**
+             * To upload a file to Stripe, you’ll need to send a request of type multipart/form-data. 
+             * The request should contain the file you would like to upload, as well as the parameters for creating a file.
+             * 
+             * All of Stripe’s officially supported API libraries should have support for sending multipart/form-data.
+             */
+            create(data: fileUploads.IFileUploadCreationOptions, options: HeaderOptions, response?: IResponseFn<fileUploads.IFileUpdate>): Promise<fileUploads.IFileUpdate>;
+            create(data: fileUploads.IFileUploadCreationOptions, response?: IResponseFn<fileUploads.IFileUpdate>): Promise<fileUploads.IFileUpdate>;
+            
+            /**
+             * Retrieves the details of an existing file object. 
+             * Supply the unique file upload ID from a file creation request, and Stripe will return the corresponding transfer information.
+             */
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<fileUploads.IFileUpdate>): Promise<fileUploads.IFileUpdate>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<fileUploads.IFileUpdate>): Promise<fileUploads.IFileUpdate>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<fileUploads.IFileUpdate>): Promise<fileUploads.IFileUpdate>;
+            retrieve(id: string, response?: IResponseFn<fileUploads.IFileUpdate>): Promise<fileUploads.IFileUpdate>;
+            
+            /**
+             * Returns a list of the files that you have uploaded to Stripe. 
+             * The file uploads are returned sorted by creation date, with the most recently created file uploads appearing first.
+             */
+            list(data: fileUploads.IFileUploadListOptions, options: HeaderOptions, response?: IResponseFn<IList<fileUploads.IFileUpdate>>): Promise<IList<fileUploads.IFileUpdate>>;
+            list(data: fileUploads.IFileUploadListOptions, response?: IResponseFn<IList<fileUploads.IFileUpdate>>): Promise<IList<fileUploads.IFileUpdate>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<fileUploads.IFileUpdate>>): Promise<IList<fileUploads.IFileUpdate>>;
+            list(response?: IResponseFn<IList<fileUploads.IFileUpdate>>): Promise<IList<fileUploads.IFileUpdate>>;
         }
 
         class Invoices extends StripeResource {
@@ -2096,38 +5615,11 @@ declare namespace StripeNode {
              * @returns Returns the invoice object if there are pending invoice items to invoice. Throws an error if there
              * are no pending invoice items or if the customer ID provided is invalid.
              *
-             * @param options Options used to create the invoice.
+             * @param data Options used to create the invoice.
              */
-            create(options: {
-                customer: string;
-
-                /**
-                 * A fee in cents that will be applied to the invoice and transferred to the application owner�s Stripe account.
-                 * The request must be made with an OAuth key or the Stripe-Account header in order to take an application fee.
-                 * For more information, see the application fees documentation.
-                 */
-                application_fee?: number;
-                description?: string;
-                metadata?: IMetadata;
-
-                /**
-                 * Extra information about a charge for the customer�s credit card statement.
-                 */
-                statement_descriptor?: string;
-
-                /**
-                 * The ID of the subscription to invoice. If not set, the created invoice will include all pending invoice items
-                 * for the customer. If set, the created invoice will exclude pending invoice items that pertain to other
-                 * subscriptions.
-                 */
-                subscription?: string;
-
-                /**
-                 * The percent tax rate applied to the invoice, represented as a decimal number.
-                 */
-                tax_percent?: number;
-            }, response: IResponseFn<invoices.IInvoice>): void;
-
+            create(data: invoices.IInvoiceCreationOptions, options: HeaderOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            create(data: invoices.IInvoiceCreationOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            
             /**
              * Retrieves the invoice with the given ID. The invoice object contains a
              * lines hash that contains information about the subscriptions and invoice items that have been applied to the
@@ -2146,8 +5638,11 @@ declare namespace StripeNode {
              *
              * @param id The ID of the desired invoice.
              */
-            retrieve(id: string, response: IResponseFn<invoices.IInvoice>): void;
-
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            retrieve(id: string, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            
             /**
              * When retrieving an invoice, you'll get a lines property containing the total count of line items and the first
              * handful of those items. There is also a URL where you can retrieve the full (paginated) list of line items.
@@ -2155,39 +5650,13 @@ declare namespace StripeNode {
              * @returns Returns a list of line_item objects.
              *
              * @param id The id of the invoice containing the lines to be retrieved
-             * @param options Filtering options
+             * @param data Filtering options
              */
-            retrieveLines(id: string, options: {
-                /**
-                 * In the case of upcoming invoices, the customer of the upcoming invoice is required. In other cases it is ignored.
-                 */
-                customer?: string;
-
-                /**
-                 * A cursor for use in pagination. ending_before is an object ID that defines your place in the list.
-                 * For instance, if you make a list request and receive 100 objects, starting with obj_bar, your subsequent
-                 * call can include ending_before=obj_bar in order to fetch the previous page of the list.
-                 */
-                ending_before?: string;
-
-                /**
-                 * A limit on the number of objects to be returned. Limit can range between 1 and 100 items.
-                 */
-                limit?: number;
-
-                /**
-                 * A cursor for use in pagination. starting_after is an object ID that defines your place in the list. For instance,
-                 * if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include
-                 * starting_after=obj_foo in order to fetch the next page of the list.
-                 */
-                starting_after?: string;
-
-                /**
-                 * In the case of upcoming invoices, the subscription of the upcoming invoice is optional. In other cases it is ignored.
-                 */
-                subscription?: string;
-            }, response: IResponseFn<IList<invoiceItems.InvoiceLineItem>>): void;
-
+            retrieveLines(id: string, data: invoices.IInvoiceLineItemRetrievalOptions, options: HeaderOptions, response?: IResponseFn<IList<invoices.IInvoiceLineItem>>): Promise<invoices.IInvoiceLineItem>;
+            retrieveLines(id: string, data: invoices.IInvoiceLineItemRetrievalOptions, response?: IResponseFn<IList<invoices.IInvoiceLineItem>>): Promise<invoices.IInvoiceLineItem>;
+            retrieveLines(id: string, options: HeaderOptions, response?: IResponseFn<IList<invoices.IInvoiceLineItem>>): Promise<invoices.IInvoiceLineItem>;
+            retrieveLines(id: string, response?: IResponseFn<IList<invoices.IInvoiceLineItem>>): Promise<invoices.IInvoiceLineItem>;
+            
             /**
              * At any time, you can preview the upcoming invoice for a customer. This will show you all the charges that are pending,
              * including subscription renewal charges, invoice item charges, etc. It will also show you any discount that is applicable
@@ -2200,14 +5669,11 @@ declare namespace StripeNode {
              *
              * @param id The identifier of the customer whose upcoming invoice you'd like to retrieve.
              */
-            retrieveUpcoming(id: string, options: {
-                /**
-                 * The identifier of the subscription for which you'd like to retrieve the upcoming invoice. If not provided, you will
-                 * retrieve the next upcoming invoice from among the customer's subscriptions.
-                 */
-                subscription?: string;
-            }, response: IResponseFn<invoices.IInvoice>): void;
-
+            retrieveUpcoming(id: string, data: invoices.IInvoiceUpcomingOptions, options: HeaderOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            retrieveUpcoming(id: string, data: invoices.IInvoiceUpcomingOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            retrieveUpcoming(id: string, options: HeaderOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            retrieveUpcoming(id: string, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            
             /**
              * Until an invoice is paid, it is marked as open (closed=false). If you'd like to stop Stripe from automatically attempting
              * payment on an invoice or would simply like to close the invoice out as no longer owed by the customer, you can update the
@@ -2216,42 +5682,11 @@ declare namespace StripeNode {
              * @returns Returns the invoice object.
              *
              * @param id The ID of the invoice to update
-             * @param options Fields to update
+             * @param data Fields to update
              */
-            update(id: string, options: {
-                /**
-                 * A fee in cents that will be applied to the invoice and transferred to the application owner�s Stripe account. The request
-                 * must be made with an OAuth key or the Stripe-Account header in order to take an application fee. For more information,
-                 * see the application fees documentation: https://stripe.com/docs/connect/collecting-fees#subscriptions
-                 */
-                application_fee?: number;
-
-                /**
-                 * Boolean representing whether an invoice is closed or not. To close an invoice, pass true.
-                 */
-                closed?: boolean;
-                description?: string;
-
-                /**
-                 * Boolean representing whether an invoice is forgiven or not. To forgive an invoice, pass true. Forgiving an invoice instructs
-                 * us to update the subscription status as if the invoice were succcessfully paid. Once an invoice has been forgiven, it
-                 * cannot be unforgiven or reopened.
-                 */
-                forgiven?: string;
-                metadata?: IMetadata;
-
-                /**
-                 * Extra information about a charge for the customer�s credit card statement.
-                 */
-                statement_descriptor?: string;
-
-                /**
-                 * The percent tax rate applied to the invoice, represented as a decimal number. The tax rate of a paid or forgiven invoice
-                 * cannot be changed.
-                 */
-                tax_percent?: number;
-            }, response: IResponseFn<invoices.IInvoice>): void;
-
+            update(id: string, data: invoices.IInvoiceUpdateOptions, options: HeaderOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            update(id: string, data: invoices.IInvoiceUpdateOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            
             /**
              * Stripe automatically creates and then attempts to pay invoices for customers on subscriptions. We'll also retry unpaid
              * invoices according to your retry settings. However, if you'd like to attempt to collect payment on an invoice out of the
@@ -2261,8 +5696,9 @@ declare namespace StripeNode {
              *
              * @param id The ID of the invoice to pay.
              */
-            pay(id: string, response: IResponseFn<invoices.IInvoice>): void;
-
+            pay(id: string, options: HeaderOptions, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            pay(id: string, response?: IResponseFn<invoices.IInvoice>): Promise<invoices.IInvoice>;
+            
             /**
              * You can list all invoices, or list the invoices for a specific customer. The invoices are returned
              * sorted by creation date, with the most recently created invoices appearing first.
@@ -2270,11 +5706,50 @@ declare namespace StripeNode {
              * @returns A object with a data property that contains an array of invoice objects. Throws an error if the
              * customer ID is invalid.
              *
-             * @param options Filtering options
+             * @param data Filtering options
              */
-            list(options: IListOptions, response: IResponseFn<IList<invoices.IInvoice>>): void;
+            list(data: invoices.IInvoiceListOptions, options: HeaderOptions, response?: IResponseFn<IList<invoices.IInvoice>>): Promise<IList<invoices.IInvoice>>;
+            list(data: invoices.IInvoiceListOptions, response?: IResponseFn<IList<invoices.IInvoice>>): Promise<IList<invoices.IInvoice>>;
+            list(response?: IResponseFn<IList<invoices.IInvoice>>): Promise<IList<invoices.IInvoice>>;
         }
-
+        
+        class InvoiceItems extends StripeResource {
+            /**
+             * Adds an arbitrary charge or credit to the customer’s upcoming invoice.
+             */
+            create(data: invoiceItems.InvoiceItemCreationOptions, options: HeaderOptions, response?: IResponseFn<invoiceItems.InvoiceItem>): Promise<invoiceItems.InvoiceItem>;
+            create(data: invoiceItems.InvoiceItemCreationOptions, response?: IResponseFn<invoiceItems.InvoiceItem>): Promise<invoiceItems.InvoiceItem>;
+            
+            /**
+             * Retrieves the invoice item with the given ID.
+             */
+            retrieve(invoiceItemId: string, options: HeaderOptions, response?: IResponseFn<invoiceItems.InvoiceItem>): Promise<invoiceItems.InvoiceItem>;
+            retrieve(invoiceItemId: string, response?: IResponseFn<invoiceItems.InvoiceItem>): Promise<invoiceItems.InvoiceItem>;
+            
+            /**
+             * Updates the amount or description of an invoice item on an upcoming invoice. Updating an invoice item is only possible before the 
+             * invoice it's attached to is closed.
+             */
+            update(invoiceItemId: string, data: invoiceItems.InvoiceItemUpdateOptions, options: HeaderOptions, response?: IResponseFn<invoiceItems.InvoiceItem>): Promise<invoiceItems.InvoiceItem>;
+            update(invoiceItemId: string, data: invoiceItems.InvoiceItemUpdateOptions, response?: IResponseFn<invoiceItems.InvoiceItem>): Promise<invoiceItems.InvoiceItem>;
+            
+            /**
+             * Returns a list of your invoice items. Invoice items are returned sorted by creation date, with the most recently created invoice 
+             * items appearing first.
+             */
+            list(data: invoiceItems.InvoiceItemListOptions, options: HeaderOptions, response?: IResponseFn<IList<invoiceItems.InvoiceItem>>): Promise<IList<invoiceItems.InvoiceItem>>;
+            list(data: invoiceItems.InvoiceItemListOptions, response?: IResponseFn<IList<invoiceItems.InvoiceItem>>): Promise<IList<invoiceItems.InvoiceItem>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<invoiceItems.InvoiceItem>>): Promise<IList<invoiceItems.InvoiceItem>>;
+            list(response?: IResponseFn<IList<invoiceItems.InvoiceItem>>): Promise<IList<invoiceItems.InvoiceItem>>;
+            
+            /**
+             * Removes an invoice item from the upcoming invoice. Removing an invoice item is only possible before the invoice it's attached 
+             * to is closed.
+             */
+            del(invoiceItemId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            del(invoiceItemId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+        }
+        
         class Plans extends StripeResource {
             /**
              * You can create plans easily via the plan management page of the Stripe dashboard. Plan creation is also
@@ -2282,107 +5757,32 @@ declare namespace StripeNode {
              *
              * @returns The newly created plan
              *
-             * @param options Options for the new plan.
+             * @param data Creation options for the new plan.
              */
-            create(options: {
-                /**
-                 * Unique string of your choice that will be used to identify this plan when subscribing a customer.
-                 * This could be an identifier like "gold" or a primary key from your own database.
-                 */
-                id: string;
-
-                /**
-                 * A positive integer in cents (or 0 for a free plan) representing how much to charge (on a recurring basis).
-                 */
-                amount: number;
-
-                /**
-                 * 3-letter ISO code for currency.
-                 */
-                currency: string;
-
-                /**
-                 * Specifies billing frequency. Either day, week, month or year.
-                 */
-                interval: string;
-
-                /**
-                 * The number of intervals between each subscription billing. For example, interval=month and
-                 * interval_count=3 bills every 3 months. Maximum of one year interval allowed (1 year, 12 months,
-                 * or 52 weeks).
-                 */
-                interval_count?: number;
-
-                /**
-                 * Name of the plan, to be displayed on invoices and in the web interface.
-                 */
-                name: string;
-
-                /**
-                 * Specifies a trial period in (an integer number of) days. If you include a trial period, the customer
-                 * won't be billed for the first time until the trial period ends. If the customer cancels before the
-                 * trial period is over, she'll never be billed at all.
-                 */
-                trial_period_days?: number;
-
-                /**
-                 * A set of key/value pairs that you can attach to a plan object. It can be useful for storing additional
-                 * information about the plan in a structured format.
-                 */
-                metadata?: IMetadata;
-
-                /**
-                 * An arbitrary string to be displayed on your customer's credit card statement. This may be up to 22 characters.
-                 * As an example, if your website is RunClub and the item you're charging for is your Silver Plan, you may want
-                 * to specify a statement_descriptor of RunClub Silver Plan. The statement description may not include <>"'
-                 * characters, and will appear on your customer's statement in capital letters. Non-ASCII characters are
-                 * automatically stripped. While most banks display this information consistently, some may display it incorrectly
-                 * or not at all.
-                 */
-                statement_descriptor?: string;
-            }, response: IResponseFn<plans.IPlan>): void;
-
+            create(data: plans.IPlanCreationOptions, options: HeaderOptions, response?: IResponseFn<plans.IPlan>): Promise<plans.IPlan>;
+            create(data: plans.IPlanCreationOptions, response?: IResponseFn<plans.IPlan>): Promise<plans.IPlan>;
+            
             /**
              * Retrieves the plan with the given ID.
              *
              * @returns Returns a plan if a valid plan ID was provided. Throws an error otherwise.
              *
-             * @param id The ID of the desired plan.
+             * @param planName The identifier of the desired plan.
              */
-            retrieve(id: string, response: IResponseFn<plans.IPlan>): void;
-
+            retrieve(planName: string, options: HeaderOptions, response?: IResponseFn<plans.IPlan>): Promise<plans.IPlan>;
+            retrieve(planName: string, response?: IResponseFn<plans.IPlan>): Promise<plans.IPlan>;
+            
             /**
              * Updates the name of a plan. Other plan details (price, interval, etc.) are, by design, not editable.
              *
              * @returns The updated plan object is returned upon success. Otherwise, this call throws an error.
              *
-             * @param id The plan ID to update
-             * @param options The fields to update
+             * @param planName The identifier of the plan to update
+             * @param data The fields to update
              */
-            update(id: string, options: {
-                /**
-                 * Name of the plan, to be displayed on invoices and in the web interface.
-                 */
-                name?: string;
-
-                /**
-                 * A set of key/value pairs that you can attach to a plan object. It can be useful for storing additional information
-                 * about the plan in a structured format. You can unset an individual key by setting its value to null and then saving.
-                 * To clear all keys, set metadata to null, then save.
-                 */
-                metadata?: IMetadata;
-
-                /**
-                 * An arbitrary string to be displayed on your customer's credit card statement. This may be up to 22 characters.
-                 * As an example, if your website is RunClub and the item you're charging for is your Silver Plan, you may want
-                 * to specify a statement_descriptor of RunClub Silver Plan. The statement description may not include <>"'
-                 * characters, and will appear on your customer's statement in capital letters. Non-ASCII characters are
-                 * automatically stripped. While most banks display this information consistently, some may display it incorrectly
-                 * or not at all.
-                 */
-                statement_descriptor?: string;
-            }, response: IResponseFn<plans.IPlan>): void;
-
+            update(planName: string, data: plans.IPlanUpdateOptions, options: HeaderOptions, response?: IResponseFn<plans.IPlan>): Promise<plans.IPlan>;
+            update(planName: string, data: plans.IPlanUpdateOptions, response?: IResponseFn<plans.IPlan>): Promise<plans.IPlan>;
+            
             /**
              * You can delete plans via the plan management page of the Stripe dashboard. However, deleting a plan does not affect
              * any current subscribers to the plan; it merely means that new subscribers can't be added to that plan. You can also
@@ -2390,10 +5790,11 @@ declare namespace StripeNode {
              *
              * @returns An object with the deleted plan's ID and a deleted flag upon success. Otherwise, this call throws an error, such as if the plan has already been deleted.
              *
-             * @param id The identifier of the plan to be deleted.
+             * @param planName The identifier of the plan to be deleted.
              */
-            del(id: string, response: IResponseFn<IDeleteConfirmation>): void;
-
+            del(planName: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            del(planName: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            
             /**
              * Returns a list of your plans.
              *
@@ -2402,55 +5803,460 @@ declare namespace StripeNode {
              * request should never throw an error. You can optionally request that the response include the total count of all plans. To
              * do so, specify include[]=total_count in your request.
              */
-            list(options: IListOptions, response: IResponseFn<IList<plans.IPlan>>): void;
+            list(data: IListOptionsCreated, options: HeaderOptions, response?: IResponseFn<IList<plans.IPlan>>): Promise<IList<plans.IPlan>>;
+            list(data: IListOptionsCreated, response?: IResponseFn<IList<plans.IPlan>>): Promise<IList<plans.IPlan>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<plans.IPlan>>): Promise<IList<plans.IPlan>>;
+            list(response?: IResponseFn<IList<plans.IPlan>>): Promise<IList<plans.IPlan>>;
         }
-
+        
+        /**
+         * @deprecated
+         */
         class RecipientCards extends StripeResource {
+            /**
+             * @deprecated
+             */
             create(): void;
+            /**
+             * @deprecated
+             */
             list(): void;
+            /**
+             * @deprecated
+             */
             update(id: string): void;
+            /**
+             * @deprecated
+             */
             retrieve(id: string): void;
+            //options: IDataOptions
+            /**
+             * @deprecated
+             */
             del(id: string): void;
         }
 
+        /**
+         * @deprecated
+         */
         class Recipients extends StripeResource {
+            /**
+             * @deprecated
+             */
             create(): void;
+            /**
+             * @deprecated
+             */
             list(): void;
+            /**
+             * @deprecated
+             */
             update(id: string): void;
+            /**
+             * @deprecated
+             */
             retrieve(id: string): void;
+            //options: IDataOptions
+            /**
+             * @deprecated
+             */
             del(id: string): void;
         }
-
-        class Tokens extends StripeResource {
-            create(): void;
-            retrieve(id: string): void;
+        
+        class Refunds extends StripeResource {
+            /**
+             * When you create a new refund, you must specify a charge to create it on.
+             * 
+             * Creating a new refund will refund a charge that has previously been created but not yet refunded. 
+             * Funds will be refunded to the credit or debit card that was originally charged. 
+             * The fees you were originally charged are also refunded.
+             * 
+             * You can optionally refund only part of a charge. 
+             * You can do so as many times as you wish until the entire charge has been refunded.
+             * 
+             * Once entirely refunded, a charge can't be refunded again. 
+             * This method will throw an error when called on an already-refunded charge, or when trying to refund more money than is left on a charge.
+             */
+            create(data: refunds.IRefundCreationOptionsWithCharge, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            create(data: refunds.IRefundCreationOptionsWithCharge, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            
+            /**
+             * Retrieves the details of an existing refund.
+             */
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            retrieve(id: string, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            
+            
+            /**
+             * Updates the specified refund by setting the values of the parameters passed.
+             * Any parameters not provided will be left unchanged.
+             * 
+             * This request only accepts metadata as an argument.
+             */
+            update(id: string, data: IDataOptionsWithMetadata, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            update(id: string, data: IDataOptionsWithMetadata, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            
+            /**
+             * Returns a list of all refunds you’ve previously created. The refunds are returned in sorted order, 
+             * with the most recent refunds appearing first. 
+             * For convenience, the 10 most recent refunds are always available by default on the charge object.
+             */
+            list(data: refunds.IRefundListOptions, options: HeaderOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            list(data: refunds.IRefundListOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            list(response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
         }
-
-        class TransferReversals extends StripeResource {
-            create(): void;
-            list(): void;
-            update(id: string): void;
-            retrieve(id: string): void;
+        
+        class Tokens extends StripeResource {
+            /**
+             * Creates a single use token that wraps the details of a credit card. This token can be used 
+             * in place of a credit card object with any API method. These tokens can only be used once: 
+             * by creating a new charge object, or attaching them to a customer.
+             */
+            create(data: tokens.ICardTokenCreationOptions, options: HeaderOptions, response?: IResponseFn<tokens.ICardToken>): Promise<tokens.ICardToken>;
+            create(data: tokens.ICardTokenCreationOptions, response?: IResponseFn<tokens.ICardToken>): Promise<tokens.ICardToken>;
+            
+            /**
+             * Creates a single use token that wraps the details of a bank account. This token can be used 
+             * in place of a bank account object with any API method. These tokens can only be used once: 
+             * by attaching them to a recipient or managed account.
+             */
+            create(data: tokens.IBankAccountTokenCreationOptions, options: HeaderOptions, response?: IResponseFn<tokens.IBankAccountToken>): Promise<tokens.IBankAccountToken>;
+            create(data: tokens.IBankAccountTokenCreationOptions, response?: IResponseFn<tokens.IBankAccountToken>): Promise<tokens.IBankAccountToken>;
+            
+            /**
+             * Creates a single use token that wraps the details of personally identifiable information (PII). 
+             * This token can be used in place of a personal_id_number in the Account Update API method. 
+             * These tokens can only be used once.
+             */
+            create(data: tokens.IPiiTokenCreationOptions, options: HeaderOptions, response?: IResponseFn<tokens.IToken>): Promise<tokens.IToken>;
+            create(data: tokens.IPiiTokenCreationOptions, response?: IResponseFn<tokens.IToken>): Promise<tokens.IToken>;
+            
+            /**
+             * Retrieves the token with the given ID.
+             */
+            retrieve(tokenId: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<tokens.IToken>): Promise<tokens.IToken>;
+            retrieve(tokenId: string, data: IDataOptions, response?: IResponseFn<tokens.IToken>): Promise<tokens.IToken>;
+            retrieve(tokenId: string, options: HeaderOptions, response?: IResponseFn<tokens.IToken>): Promise<tokens.IToken>;
+            retrieve(tokenId: string, response?: IResponseFn<tokens.IToken>): Promise<tokens.IToken>;
+            
         }
 
         class Transfers extends StripeResource {
-            create(): void;
-            list(): void;
-            update(id: string): void;
-            retrieve(id: string): void;
+            /**
+             * To send funds from your Stripe account to a third-party recipient or to your own bank account, you create a new transfer 
+             * object. Your Stripe balance must be able to cover the transfer amount, or you'll receive an "Insufficient Funds" error.
+             * 
+             * If your API key is in test mode, money won't actually be sent, though everything else will occur as if in live mode.
+             * 
+             * If you are creating a manual transfer or a special case transfer on a Stripe account that uses multiple payment source 
+             * types, you'll need to specify the source type balance that the transfer should draw from. The balance object details 
+             * available and pending amounts by source type.
+             */
+            create(data: transfers.ITransferCreationOptions, options: HeaderOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
+            create(data: transfers.ITransferCreationOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
+            
+            /**
+             * Retrieves the details of an existing transfer. Supply the unique transfer ID from either a transfer creation request or 
+             * the transfer list, and Stripe will return the corresponding transfer information.
+             */
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
+            retrieve(id: string, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
+            
+            
+            /**
+             * Updates the specified transfer by setting the values of the parameters passed. Any parameters not provided will be left 
+             * unchanged.
+             * 
+             * This request accepts only the description and metadata as arguments.
+             */
+            update(id: string, data: transfers.ITransferUpdateOptions, options: HeaderOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
+            update(id: string, data: transfers.ITransferUpdateOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
+            
+            /**
+             * Returns a list of existing transfers sent to third-party bank accounts or that Stripe has sent you. The transfers are 
+             * returned in sorted order, with the most recently created transfers appearing first.
+             */
+            list(data: transfers.ITransferListOptions, options: HeaderOptions, response?: IResponseFn<IList<transfers.ITransfer>>): Promise<IList<transfers.ITransfer>>;
+            list(data: transfers.ITransferListOptions, response?: IResponseFn<IList<transfers.ITransfer>>): Promise<IList<transfers.ITransfer>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<transfers.ITransfer>>): Promise<IList<transfers.ITransfer>>;
+            list(response?: IResponseFn<IList<transfers.ITransfer>>): Promise<IList<transfers.ITransfer>>;
+            
+            cancel(id: string, options: HeaderOptions, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
+            cancel(id: string, response?: IResponseFn<transfers.ITransfer>): Promise<transfers.ITransfer>;
+            
+            listTransactions(options: HeaderOptions, response?: IResponseFn<IList<charges.ICharge>>): Promise<IList<charges.ICharge>>; //TODO: Not sure if this should be a list of balance transactions or charges.
+            listTransactions(response?: IResponseFn<IList<charges.ICharge>>): Promise<IList<charges.ICharge>>; //TODO: Not sure if this should be a list of balance transactions or charges.
+            
+            /**
+             * When you create a new reversal, you must specify a transfer to create it on.
+             * 
+             * Creating a new reversal on a transfer that has previously been created but not paid out will return the funds to your available balance 
+             * and refund the fees you were originally charged on the transfer. You may not reverse automatic Stripe transfers.
+             * 
+             * When reversing transfers to Stripe accounts, you can optionally reverse part of the transfer. You can do so as many times as you wish 
+             * until the entire transfer has been reversed.
+             * 
+             * Once entirely reversed, a transfer can't be reversed again. This method will return an error when called on an already-reversed transfer, 
+             * or when trying to reverse more money than is left on a transfer.
+             */
+            reverse(id: string, data: transferReversals.IReversalCreationOptions, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            reverse(id: string, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            reverse(id: string, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            
+            /**
+             * When you create a new reversal, you must specify a transfer to create it on.
+             * 
+             * Creating a new reversal on a transfer that has previously been created but not paid out will return the funds to your available balance 
+             * and refund the fees you were originally charged on the transfer. You may not reverse automatic Stripe transfers.
+             * 
+             * When reversing transfers to Stripe accounts, you can optionally reverse part of the transfer. You can do so as many times as you wish 
+             * until the entire transfer has been reversed.
+             * 
+             * Once entirely reversed, a transfer can't be reversed again. This method will return an error when called on an already-reversed transfer, 
+             * or when trying to reverse more money than is left on a transfer.
+             */
+            createReverse(transferId: string, data: transferReversals.IReversalCreationOptions, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            createReverse(transferId: string, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            createReverse(transferId: string, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            
+            /**
+             * By default, you can see the 10 most recent reversals stored directly on the transfer object, but you can also retrieve details about a 
+             * specific reversal stored on the transfer.
+             */
+            retrieveReversal(transferId: string, reversalId: string, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            retrieveReversal(transferId: string, reversalId: string, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            
+            /**
+             * Updates the specified reversal by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
+             * 
+             * This request only accepts metadata and description as arguments.
+             */
+            updateReversal(transferId: string, reversalId: string, data: transferReversals.IReversalUpdateOptions, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            updateReversal(transferId: string, reversalId: string, data: transferReversals.IReversalUpdateOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            
+            /**
+             * You can see a list of the reversals belonging to a specific transfer. Note that the 10 most recent reversals are always available by 
+             * default on the transfer object. If you need more than those 10, you can use this API method and the limit and starting_after 
+             * parameters to page through additional reversals.
+             */
+            listReversals(transferId: string, data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
+            listReversals(transferId: string, data: IListOptions, response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
+            listReversals(transferId: string, options: HeaderOptions, response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
+            listReversals(transferId: string, response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
+            
+            setMetadata(): void; //TODO: Implement placeholder method
+            getMetadata(): void; //TODO: Implement placeholder method
+        }
+        
+        class TransferReversals extends StripeResource {
+            /**
+             * When you create a new reversal, you must specify a transfer to create it on.
+             * 
+             * Creating a new reversal on a transfer that has previously been created but not paid out will return the funds to your available balance 
+             * and refund the fees you were originally charged on the transfer. You may not reverse automatic Stripe transfers.
+             * 
+             * When reversing transfers to Stripe accounts, you can optionally reverse part of the transfer. You can do so as many times as you wish 
+             * until the entire transfer has been reversed.
+             * 
+             * Once entirely reversed, a transfer can't be reversed again. This method will return an error when called on an already-reversed transfer, 
+             * or when trying to reverse more money than is left on a transfer.
+             */
+            create(data: transferReversals.IReversalCreationOptions, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            create(options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            create(response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            
+            /**
+             * By default, you can see the 10 most recent reversals stored directly on the transfer object, but you can also retrieve details about a 
+             * specific reversal stored on the transfer.
+             */
+            retrieve(reversalId: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            retrieve(reversalId: string, data: IDataOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            retrieve(reversalId: string, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            retrieve(reversalId: string, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            
+            /**
+             * Updates the specified reversal by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
+             * 
+             * This request only accepts metadata and description as arguments.
+             */
+            update(reversalId: string, data: transferReversals.IReversalUpdateOptions, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            update(reversalId: string, data: transferReversals.IReversalUpdateOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            
+            /**
+             * You can see a list of the reversals belonging to a specific transfer. Note that the 10 most recent reversals are always available by 
+             * default on the transfer object. If you need more than those 10, you can use this API method and the limit and starting_after 
+             * parameters to page through additional reversals.
+             */
+            list(data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
+            list(data: IListOptions, response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
+            list(response?: IResponseFn<IList<transferReversals.IReversal>>): Promise<IList<transferReversals.IReversal>>;
+        }
+        
+        class CountrySpecs extends StripeResource {
+            /**
+             * Lists all Country Spec objects available in the API.
+             */
+            list(data: IListOptions, options: HeaderOptions, response?: IResponseFn<IList<countrySpecs.ICountrySpec>>): Promise<IList<countrySpecs.ICountrySpec>>;
+            list(data: IListOptions, response?: IResponseFn<IList<countrySpecs.ICountrySpec>>): Promise<IList<countrySpecs.ICountrySpec>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<countrySpecs.ICountrySpec>>): Promise<IList<countrySpecs.ICountrySpec>>;
+            list(response?: IResponseFn<IList<countrySpecs.ICountrySpec>>): Promise<IList<countrySpecs.ICountrySpec>>;
+            
+            /**
+             * Returns a Country Spec for a given Country code.
+             * 
+             * @param retrieve  An ISO country code. Available country codes can be listed with the List Country Specs endpoint.
+             */
+            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<countrySpecs.ICountrySpec>): Promise<countrySpecs.ICountrySpec>;
+            retrieve(id: string, data: IDataOptions, response?: IResponseFn<countrySpecs.ICountrySpec>): Promise<countrySpecs.ICountrySpec>;
+            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<countrySpecs.ICountrySpec>): Promise<countrySpecs.ICountrySpec>;
+            retrieve(id: string, response?: IResponseFn<countrySpecs.ICountrySpec>): Promise<countrySpecs.ICountrySpec>;
+        }
+        
+        class Orders {
+            /**
+             * Creates a new order object.
+             */
+            create(data: orders.IOrderCreationOptions, options: HeaderOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
+            create(data: orders.IOrderCreationOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
+            
+            /**
+             * Retrieves the details of an existing order. Supply the unique order ID from either an order creation request or the order list, 
+             * and Stripe will return the corresponding order information.
+             */
+            retrieve(orderId: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
+            retrieve(orderId: string, data: IDataOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
+            retrieve(orderId: string, options: HeaderOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
+            retrieve(orderId: string, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
+            
+            /**
+             * Updates the specific order by setting the values of the parameters passed. Any parameters not provided will be left unchanged. 
+             * This request accepts only the metadata, and status as arguments.
+             */
+            update(orderId: string, data: orders.IOrderUpdateOptions, options: HeaderOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
+            update(orderId: string, data: orders.IOrderUpdateOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
+            
+            /**
+             * Pay an order by providing a source to create a payment.
+             */
+            pay(orderId: string, data: orders.IOrderPayOptions, options: HeaderOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
+            pay(orderId: string, data: orders.IOrderPayOptions, response?: IResponseFn<orders.IOrder>): Promise<orders.IOrder>;
+            
+            /**
+             * Returns a list of your orders. The orders are returned sorted by creation date, with the most recently created orders appearing first.
+             */
+            list(data: orders.IOrderListOptions, options: HeaderOptions, response?: IResponseFn<IList<orders.IOrder>>): Promise<IList<orders.IOrder>>;
+            list(data: orders.IOrderListOptions, response?: IResponseFn<IList<orders.IOrder>>): Promise<IList<orders.IOrder>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<orders.IOrder>>): Promise<IList<orders.IOrder>>;
+            list(response?: IResponseFn<IList<orders.IOrder>>): Promise<IList<orders.IOrder>>;
+        }
+        
+        class Products {
+            /**
+             * Creates a new product object.
+             */
+            create(data: products.IProductCreationOptions, options: HeaderOptions, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
+            create(data: products.IProductCreationOptions, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
+            
+            /**
+             * Retrieves the details of an existing product. Supply the unique product ID from either a product creation request or the product 
+             * list, and Stripe will return the corresponding product information.
+             */
+            retrieve(productId: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
+            retrieve(productId: string, data: IDataOptions, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
+            retrieve(productId: string, options: HeaderOptions, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
+            retrieve(productId: string, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
+            
+            /**
+             * Updates the specific product by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
+             * 
+             * Note that a product's attributes are not editable. Instead, you would need to deactivate the existing product and create a new one 
+             * with the new attribute values.
+             */
+            update(productId: string, data: products.IProductUpdateOptions, options: HeaderOptions, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
+            update(productId: string, data: products.IProductUpdateOptions, response?: IResponseFn<products.IProduct>): Promise<products.IProduct>;
+            
+            /**
+             * Returns a list of your products. The products are returned sorted by creation date, with the most recently created products appearing first.
+             */
+            list(data: products.IProductListOptions, options: HeaderOptions, response?: IResponseFn<IList<products.IProduct>>): Promise<IList<products.IProduct>>;
+            list(data: products.IProductListOptions, response?: IResponseFn<IList<products.IProduct>>): Promise<IList<products.IProduct>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<products.IProduct>>): Promise<IList<products.IProduct>>;
+            list(response?: IResponseFn<IList<products.IProduct>>): Promise<IList<products.IProduct>>;
+            
+            /**
+             * Delete a product. Deleting a product is only possible if it has no SKUs associated with it.
+             */
+            del(productId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            del(productId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+        }
+        
+        class SKUs {
+            /**
+             * Creates a new SKU associated with a product.
+             */
+            create(data: skus.ISkuCreationOptions, options: HeaderOptions, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
+            create(data: skus.ISkuCreationOptions, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
+            
+            /**
+             * Retrieves the details of an existing SKU. Supply the unique SKU identifier from either a SKU creation request or from the 
+             * product, and Stripe will return the corresponding SKU information.
+             */
+            retrieve(skuId: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
+            retrieve(skuId: string, data: IDataOptions, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
+            retrieve(skuId: string, options: HeaderOptions, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
+            retrieve(skuId: string, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
+            
+            /**
+             * Updates the specific SKU by setting the values of the parameters passed. Any parameters not provided will be left unchanged.
+             * 
+             * Note that a SKU's attributes are not editable. Instead, you would need to deactivate the existing SKU and create a new one with 
+             * the new attribute values.
+             */
+            update(skuId: string, data: skus.ISkuUpdateOptions, options: HeaderOptions, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
+            update(skuId: string, data: skus.ISkuUpdateOptions, response?: IResponseFn<skus.ISku>): Promise<skus.ISku>;
+            
+            /**
+             * Returns a list of your SKUs. The SKUs are returned sorted by creation date, with the most recently created SKUs appearing first.
+             */
+            list(data: skus.ISkuListOptions, options: HeaderOptions, response?: IResponseFn<IList<skus.ISku>>): Promise<IList<skus.ISku>>;
+            list(data: skus.ISkuListOptions, response?: IResponseFn<IList<skus.ISku>>): Promise<IList<skus.ISku>>;
+            list(options: HeaderOptions, response?: IResponseFn<IList<skus.ISku>>): Promise<IList<skus.ISku>>;
+            list(response?: IResponseFn<IList<skus.ISku>>): Promise<IList<skus.ISku>>;
+            
+            /**
+             * Delete a SKU. Deleting a SKU is only possible until it has been used in an order.
+             */
+            del(skuId: string, options: HeaderOptions, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
+            del(skuId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
         }
     }
-
+    
+    interface IObject {
+        object: string;
+    }
+    
+    interface IResourceObject extends IObject {
+        id: string;
+    }
+    
     interface IResponseFn<R> {
         (err: IStripeError, value: R): void;
     }
-
+    
     interface IDeleteConfirmation { id: string; deleted: boolean; }
-
+    
     /**
-     * Options for filtering a list by created period.
+     * A filter on the list based on this object field. The value can 
+     * be a string with an integer Unix timestamp, or it can be a 
+     * dictionary with the following options:
      */
-    interface IDateFilter {
+    type IDateFilter = string | {
         /**
          * Return values where the created field is after this timestamp.
          */
@@ -2473,334 +6279,8 @@ declare namespace StripeNode {
     }
 
     /**
-     * A dispute occurs when a customer questions your charge with their bank or credit card company.
-     * When a customer disputes your charge, you're given the opportunity to respond to the dispute with
-     * evidence that shows the charge is legitimate. You can find more information about the dispute process
-     * in our disputes FAQ: https://stripe.com/help/disputes
-     */
-    interface IDispute {
-        /**
-         * Valud is 'dispute'
-         */
-        object: string;
-        livemode: boolean;
-
-        /**
-         * Disputed amount. Usually the amount of the charge, but can differ (usually because of currency
-         * fluctuation or because only part of the order is disputed).
-         */
-        amount: number;
-
-        /**
-         * ID of the charge that was disputed
-         */
-        charge: string;
-
-        /**
-         * Date dispute was opened
-         */
-        created: number;
-
-        /**
-         * Three-letter ISO currency code representing the currency of the amount that was disputed.
-         */
-        currency: string;
-
-        /**
-         * Reason given by cardholder for dispute. Possible values are duplicate, fraudulent, subscription_canceled,
-         * product_unacceptable, product_not_received, unrecognized, credit_not_processed, general.
-         * Read more about dispute reasons: https://stripe.com/help/disputes#reasons
-         */
-        reason: string;
-
-        /**
-         * Current status of dispute. Possible values are warning_needs_response, warning_under_review, warning_closed,
-         * needs_response, response_disabled, under_review, charge_refunded, won, lost.
-         */
-        status: string;
-
-        /**
-         * List of zero, one, or two balance transactions that show funds withdrawn and reinstated to your
-         * Stripe account as a result of this dispute.
-         */
-        balance_transactions: Array<balance.IBalanceTransaction>;
-
-        /**
-         * Evidence provided to respond to a dispute. Updating any field in the hash will submit all fields in the hash for review.
-         */
-        evidence: IDisputeEvidence;
-
-        /**
-         * Information about the evidence submission.
-         */
-        evidence_details?: {
-            /**
-             * Whether or not evidence has been saved for this dispute.
-             */
-            has_evidence: boolean;
-
-            /**
-             * The number of times the evidence has been submitted. You may submit evidence a maximum of 5 times
-             */
-            submission_count: number;
-
-            /**
-             * Date by which evidence must be submitted in order to successfully challenge dispute. Will be null
-             * if the customer�s bank or credit card company doesn�t allow a response for this particular dispute.
-             */
-            due_by: number;
-
-            /**
-             * Whether or not the last evidence submission was submitted past the due date. Defaults to false
-             * if no evidence submissions have occurred. If true, then delivery of the latest evidence is not guaranteed.
-             */
-            past_due: boolean;
-        };
-
-        /**
-         * If true, it is still possible to refund the disputed payment. Once the payment has been fully
-         * refunded, no further funds will be withdrawn from your Stripe account as a result of this dispute.
-         */
-        is_charge_refundable: boolean;
-        metadata: IMetadata;
-    }
-
-    interface IBankAccount {
-        id: string;
-        object: string;
-
-        /**
-         * Two-letter ISO code representing the country the bank account is located in.
-         */
-        country: string;
-
-        /**
-         * Three-letter ISO currency code representing the currency paid out to the bank account.
-         */
-        currency: string;
-        default_for_currency: boolean;
-        last4: string;
-
-        /**
-         * Possible values are new, validated, verified, or errored. A bank account that hasn�t had any activity or validation performed
-         * is new. If Stripe can determine that the bank account exists, its status will be validated. Note that there often isn�t enough
-         * information to know (e.g. for smaller credit unions), and the validation is not always run. If the recipient or customer proves
-         * that they own the bank account (via microdeposit or login), the status will be verified. If a transfer sent to this bank account
-         * fails, we�ll set the status to errored and will not continue to send transfers until the bank details are updated.
-         */
-        status: string;
-
-        /**
-         * Name of the bank associated with the routing number, e.g. WELLS FARGO.
-         */
-        bank_name: string;
-
-        /**
-         * Uniquely identifies this particular bank account. You can use this attribute to check whether two bank accounts are the same.
-         */
-        fingerprint: string;
-
-        /**
-         * The routing transit number for the bank account.
-         */
-        routing_number: string;
-    }
-
-    interface IReversal {
-        id: string;
-
-        /**
-         * Value is 'list'
-         */
-        object: string;
-
-        /**
-         * Amount reversed, in cents.
-         */
-        amount: number;
-        created: number;
-
-        /**
-         * Three-letter ISO currency code representing the currency.
-         */
-        currency: string;
-
-        /**
-         * Balance transaction that describes the impact of this reversal on your account balance.
-         */
-        balance_transaction: string;
-        metadata: IMetadata;
-
-        /**
-         * ID of the transfer that was reversed.
-         */
-        transfer: string;
-    }
-
-    interface IDisputeEvidence {
-        /**
-         * Any server or activity logs showing proof that the customer accessed or downloaded the purchased
-         * digital product. This information should include IP addresses, corresponding timestamps, and any
-         * detailed recorded activity.
-         */
-        access_activity_log?: string;
-
-        /**
-         * The billing addess provided by the customer.
-         */
-        billing_address?: string;
-
-        /**
-         * (ID of a file upload) Your subscription cancellation policy, as shown to the customer.
-         */
-        cancellation_policy?: string;
-
-        /**
-         * An explanation of how and when the customer was shown your refund policy prior to purchase.
-         */
-        cancellation_policy_disclosure?: string;
-
-        /**
-         * A justification for why the customer�s subscription was not canceled.
-         */
-        cancellation_rebuttal?: string;
-
-        /**
-         * (ID of a file upload) Any communication with the customer that you feel is relevant to your case (for
-         * example emails proving that they received the product or service, or demonstrating their use of or
-         * satisfaction with the product or service).
-         */
-        customer_communication?: string;
-
-        /**
-         * The email address of the customer.
-         */
-        customer_email_address?: string;
-
-        /**
-         * The name of the customer.
-         */
-        customer_name?: string;
-
-        /**
-         * The IP address that the customer used when making the purchase.
-         */
-        customer_purchase_ip?: string;
-
-        /**
-         * (ID of a file upload) A relevant document or contract showing the customer�s signature.
-         */
-        customer_signature?: string;
-
-        /**
-         * (ID of a file upload) Documentation for the prior charge that can uniquely identify the charge,
-         * such as a receipt, shipping label, work order, etc. This document should be paired with a similar
-         * document from the disputed payment that proves the two payments are separate.
-         */
-        duplicate_charge_documentation?: string;
-
-        /**
-         * An explanation of the difference between the disputed charge and the prior charge that appears to be a duplicate.
-         */
-        duplicate_charge_explanation?: string;
-
-        /**
-         * The Stripe ID for the prior charge which appears to be a duplicate of the disputed charge.
-         */
-        duplicate_charge_id?: string;
-
-        /**
-         * A description of the product or service which was sold.
-         */
-        product_description?: string;
-
-        /**
-         * (ID of a file upload) Any receipt or message sent to the customer notifying them of the charge.
-         */
-        receipt?: string;
-
-        /**
-         * (ID of a file upload) Your refund policy, as shown to the customer.
-         */
-        refund_policy?: string;
-
-        /**
-         * Documentation demonstrating that the customer was shown your refund policy prior to purchase.
-         */
-        refund_policy_disclosure?: string;
-
-        /**
-         * A justification for why the customer is not entitled to a refund.
-         */
-        refund_refusal_explanation?: string;
-
-        /**
-         * The date on which the customer received or began receiving the purchased service, in a clear human-readable format.
-         */
-        service_date?: string;
-
-        /**
-         * (ID of a file upload) Documentation showing proof that a service was provided to the customer. This could
-         * include a copy of a signed contract, work order, or other form of written agreement.
-         */
-        service_documentation?: string;
-
-        /**
-         * The address to which a physical product was shipped. You should try to include as much complete address information as possible.
-         */
-        shipping_address?: string;
-
-        /**
-         * The delivery service that shipped a physical product, such as Fedex, UPS, USPS, etc. If multiple carriers were used
-         * for this purchase, please separate them with commas.
-         */
-        shipping_carrier?: string;
-
-        /**
-         * The date on which a physical product began its route to the shipping address, in a clear human-readable format.
-         */
-        shipping_date?: string;
-
-        /**
-         * (ID of a file upload) Documentation showing proof that a product was shipped to the customer at the same address
-         * the customer provided to you. This could include a copy of the shipment receipt, shipping label, etc, and should
-         * show the full shipping address of the customer, if possible.
-         */
-        shipping_documentation?: string;
-
-        /**
-         * The tracking number for a physical product, obtained from the delivery service. If multiple tracking numbers
-         * were generated for this purchase, please separate them with commas.
-         */
-        shipping_tracking_number?: string;
-
-        /**
-         * (ID of a file upload) Any additional evidence or statements.
-         */
-        uncategorized_file?: string;
-
-        /**
-         * Any additional evidence or statements.
-         */
-        uncategorized_text?: string;
-    }
-
-    /**
-     * To safely retry an API request without accidentally performing the same operation twice,
-     * you can attach a unique key to any POST request made to the Stripe API via the Idempotency-Key: <key> header.
-     * For example, if a request to create a charge fails due to a network connection error, you can make
-     * a second request with the same key to guarantee that only a single charge is created.
-     * The creation of the key is completely up to you � we suggest using random strings or UUIDs.
-     * We'll always send back the same response for requests made with the same key, even if you make the request
-     * with different request parameters. The keys expire after 24 hours.
-     */
-    interface IIdempotentOptions {
-        idempotency_key: string;
-    }
-
-    /**
-     * A set of key/value pairs that you can attach to a reversal. It can be useful for storing
-     * additional information about the reversal in a structured format.
+     * A set of key/value pairs that you can attach to an object. It can be useful for storing
+     * additional information about the object in a structured format.
      */
     interface IMetadata { }
 
@@ -2817,27 +6297,27 @@ declare namespace StripeNode {
             /**
              * Address line 2 (Apartment/Suite/Unit/Building)
              */
-            line2: string;
+            line2?: string;
 
             /**
              * City/Suburb/Town/Village
              */
-            city: string;
+            city?: string;
 
             /**
              * State/Province/County
              */
-            state: string;
+            state?: string;
 
             /**
              * Zip/Postal Code
              */
-            postal_code: string;
+            postal_code?: string;
 
             /**
              * 2-letter country code
              */
-            country: string;
+            country?: string;
         };
 
         /**
@@ -2848,18 +6328,18 @@ declare namespace StripeNode {
         /**
          * The delivery service that shipped a physical product, such as Fedex, UPS, USPS, etc.
          */
-        carrier: string;
+        carrier?: string;
 
         /**
          * Recipient phone (including extension).
          */
-        phone: string;
+        phone?: string;
 
         /**
          * The tracking number for a physical product, obtained from the delivery service. If multiple
          * tracking numbers were generated for this purchase, please separate them with commas.
          */
-        tracking_number: string;
+        tracking_number?: string;
     }
 
 
@@ -2868,13 +6348,19 @@ declare namespace StripeNode {
          * Value is 'list'
          */
         object: string;
-
+        
+        /**
+         * An array containing the actual response elements, paginated by any request parameters.
+         */
         data: Array<T>;
-
+        
+        /**
+         * Whether or not there are more elements available after this set. If false, this set comprises the end of the list.
+         */
         has_more: boolean;
 
         /**
-         * The URL where this list can be accessed.
+         * The URL for accessing this list.
          */
         url: string;
 
@@ -2882,145 +6368,10 @@ declare namespace StripeNode {
          * The total number of items available. This value is not included by default,
          * but you can request it by specifying ?include[]=total_count
          */
-        total_count: number;
+        total_count?: number;
     }
 
-    interface IPaymentToken {
-        id: string;
-        card: {
-            name: string;
-            address_line1: string;
-            address_line2: string;
-            address_city: string;
-            address_state: string;
-            address_zip: string;
-            address_country: string;
-            country: string;
-            exp_month: number;
-            exp_year: number;
-            last4: string;
-            object: string;
-            brand: string;
-            funding: string;
-        };
-        created: number;
-        livemode: boolean;
-        type: string;
-        object: string;
-        used: boolean;
-    }
-
-    /**
-     * You can store multiple cards on a customer in order to charge the customer later. You
-     * can also store multiple debit cards on a recipient in order to transfer to those cards later.
-     */
-    interface ICard {
-        /**
-         * ID of card (used in conjunction with a customer or recipient ID)
-         */
-        id: string;
-
-        /**
-         * Value is 'card'
-         */
-        object: string;
-
-        /**
-         * The card number
-         */
-        'number': number;
-
-        /**
-         * Card brand. Can be Visa, American Express, MasterCard, Discover, JCB, Diners Club, or Unknown.
-         */
-        brand: string;
-        exp_month: number;
-        exp_year: number;
-
-        /**
-         * Card funding type. Can be credit, debit, prepaid, or unknown
-         */
-        funding: string;
-        last4: string;
-        address_city: string;
-
-        /**
-         * Billing address country, if provided when creating card
-         */
-        address_country: string;
-        address_line1: string;
-
-        /**
-         * If address_line1 was provided, results of the check: pass, fail, unavailable, or unchecked.
-         */
-        address_line1_check: string;
-        address_line2: string;
-        address_state: string;
-        address_zip: string;
-
-        /**
-         * If address_zip was provided, results of the check: pass, fail, unavailable, or unchecked.
-         */
-        address_zip_check: string;
-
-        /**
-         * Two-letter ISO code representing the country of the card. You could use this
-         * attribute to get a sense of the international breakdown of cards you�ve collected.
-         */
-        country: string;
-
-        /**
-         * The customer that this card belongs to. This attribute will not be in the card object
-         * if the card belongs to a recipient instead.
-         */
-        customer: string;
-
-        /**
-         * If a CVC was provided, results of the check: pass, fail, unavailable, or unchecked
-         */
-        cvc_check: string;
-
-        /**
-         * (For Apple Pay integrations only.) The last four digits of the device account number.
-         */
-        dynamic_last4: string;
-
-        /**
-         * Cardholder name
-         */
-        name: string;
-
-        /**
-         * The recipient that this card belongs to. This attribute will not be in the card object if
-         * the card belongs to a customer instead.
-         */
-        recipient: string;
-
-        /**
-         * Uniquely identifies this particular card number. You can use this attribute to check
-         * whether two customers who�ve signed up with you are using the same card number, for example.
-         */
-        fingerprint: string;
-    }
-
-    interface IListOptions {
-        /**
-         * A filter on the list based on the object created field. The value can be a string with an integer Unix timestamp, or it can
-         * be a dictionary.
-         */
-        created?: string | IDateFilter;
-
-        /**
-         * A filter on the list based on the object date field. The value can be a string with an integer Unix timestamp,
-         * or it can be a dictionary.
-         */
-        date?: string | IDateFilter;
-
-        /**
-         * Only return charges for the customer specified by this customer ID.
-         */
-        customer?: string;
-
+    interface IListOptions extends IDataOptions {
         /**
          * A cursor for use in pagination. ending_before is an object ID that defines your place in the list. For instance, if you make
          * a list request and receive 100 objects, starting with obj_bar, your subsequent call can include ending_before=obj_bar in
@@ -3040,7 +6391,52 @@ declare namespace StripeNode {
          */
         starting_after?: string;
     }
-
+    interface IListOptionsCreated extends IListOptions {
+        /**
+         * A filter on the list based on the object created field. The value can be a string with an integer Unix timestamp, or it can
+         * be a dictionary.
+         */
+        created?: string | IDateFilter;
+    }
+    
+    interface IDataOptions {
+        expand?: Array<string>;
+        include?: Array<string>;
+    }
+    
+    interface IDataOptionsWithMetadata extends IDataOptions {
+        /**
+         * A set of key/value pairs that you can attach to an object. It can be 
+         * useful for storing additional information about the object in a structured 
+         * format. You can unset an individual key by setting its value to null and 
+         * then saving. To clear all keys, set metadata to null, then save.
+         */
+        metadata?: IMetadata;
+    }
+    
+    interface IHeaderOptions {
+        /**
+         * To safely retry an API request without accidentally performing the same operation twice,
+         * you can attach a unique key to any POST request made to the Stripe API via the Idempotency-Key: <key> header.
+         * For example, if a request to create a charge fails due to a network connection error, you can make
+         * a second request with the same key to guarantee that only a single charge is created.
+         * The creation of the key is completely up to you. We suggest using random strings or UUIDs.
+         * We'll always send back the same response for requests made with the same key, even if you make the request
+         * with different request parameters. The keys expire after 24 hours.
+         */
+        idempotency_key?: string;
+        
+        stripe_account?: string;
+        
+        api_key?: string;
+    }
+    
+    /**
+     * Header options can either be a Connect Account Secret Key, 
+     * or a hash with one or more of these keys: idempotency_key, stripe_account, api_key
+     */
+    type HeaderOptions = IHeaderOptions | string;
+    
     /**
      * Stripe uses conventional HTTP response codes to indicate success or failure of an API request.
      * In general, codes in the 2xx range indicate success, codes in the 4xx range indicate an error that
diff --git a/stripe/stripe.d.ts b/stripe/stripe.d.ts
deleted file mode 100644
index b07d647936..0000000000
--- a/stripe/stripe.d.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-// Type definitions for stripe
-// Project: https://stripe.com/
-// Definitions by: Andy Hawkins <https://github.com/a904guy/,http://a904guy.com>, Eric J. Smith <https://github.com/ejsmith/>, Amrit Kahlon <https://github.com/amritk/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface StripeStatic {
-    setPublishableKey(key: string): void;
-    validateCardNumber(cardNumber: string): boolean;
-    validateExpiry(month: string, year: string): boolean;
-    validateCVC(cardCVC: string): boolean;
-    cardType(cardNumber: string): string;
-    getToken(token: string, responseHandler: (status: number, response: StripeTokenResponse) => void): void;
-    card: StripeCardData;
-    createToken(data: StripeTokenData, responseHandler: (status: number, response: StripeTokenResponse) => void): void;
-    bankAccount: StripeBankAccount;
-}
-
-interface StripeTokenData {
-    number: string;
-    exp_month: number;
-    exp_year: number;
-    cvc?: string;
-    name?: string;
-    address_line1?: string;
-    address_line2?: string;
-    address_city?: string;
-    address_state?: string;
-    address_zip?: string;
-    address_country?: string;
-}
-
-interface StripeTokenResponse {
-    id: string;
-    card: StripeCardData;
-    created: number;
-    currency: string;
-    livemode: boolean;
-    object: string;
-    used: boolean;
-    error: StripeError;
-}
-
-interface StripeError {
-    type: string;
-    code: string;
-    message: string;
-    param?: string;
-}
-
-interface StripeCardData {
-    object: string;
-    last4: string;
-    type: string;
-    exp_month: number;
-    exp_year: number;
-    fingerprint: string;
-    country?: string;
-    name?: string;
-    address_line1?: string;
-    address_line2?: string;
-    address_city?: string;
-    address_state?: string;
-    address_zip?: string;
-    address_country?: string;
-    createToken(data: StripeTokenData, responseHandler: (status: number, response: StripeTokenResponse) => void): void;
-}
-
-interface StripeBankAccount
-{
-    createToken(params: StripeBankTokenParams, stripeResponseHandler: (status:number, response: StripeBankTokenResponse) => void): void;
-    validateRoutingNumber(routingNumber: number | string, countryCode: string): boolean;
-    validateAccountNumber(accountNumber: number | string, countryCode: string): boolean;
-}
-
-interface StripeBankTokenParams
-{
-    country: string;
-    currency: string;
-    account_number: number | string;
-    routing_number?: number | string;
-}
-
-interface StripeBankTokenResponse
-{
-    id: string;
-    bank_account: {
-        id: string;
-        country: string;
-        bank_name: string;
-        last4: number;
-        validated: boolean;
-        object: string;
-    };
-    created: number;
-    livemode: boolean;
-    type: string;
-    object: string;
-    used: boolean;
-    error: StripeError;
-}
-
-declare var Stripe: StripeStatic;
-declare module "Stripe" {
-    export = StripeStatic;
-}
diff --git a/stripe/tsconfig.json b/stripe/tsconfig.json
new file mode 100644
index 0000000000..7f9b33934d
--- /dev/null
+++ b/stripe/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "stripe-node-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/strophe/strophe.d.ts b/strophe/index.d.ts
similarity index 100%
rename from strophe/strophe.d.ts
rename to strophe/index.d.ts
diff --git a/strophe/strophe-tests.ts b/strophe/strophe-tests.ts
index 78ffb3941e..4e2d42cc9d 100644
--- a/strophe/strophe-tests.ts
+++ b/strophe/strophe-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="strophe.d.ts"/> 
-
-function log(msg: string): void {
+function log(msg: string): void {
     console.log(msg);
 }
 
diff --git a/strophe/tsconfig.json b/strophe/tsconfig.json
new file mode 100644
index 0000000000..02ffc5f3f7
--- /dev/null
+++ b/strophe/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "strophe-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/stylus/index.d.ts b/stylus/index.d.ts
new file mode 100644
index 0000000000..836c2b00a9
--- /dev/null
+++ b/stylus/index.d.ts
@@ -0,0 +1,1445 @@
+// Type definitions for stylus 0.48.1
+// Project: https://github.com/LearnBoost/stylus
+// Definitions by: Maxime LUCE <https://github.com/SomaticIT>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare var stylus: Stylus.Static;
+export = stylus;
+
+declare namespace Stylus {
+
+    export interface Static {
+        /**
+         * Return a new `Renderer` for the given `str` and `options`.
+         */
+        (str: string): Renderer;
+        (str: string, options: RenderOptions): Renderer;
+
+        /**
+         * Library version.
+         */
+        version: string;
+
+        /**
+         * Expose nodes.
+         */
+        nodes: NodeStatic;
+
+        /**
+         * Expose BIFs.
+         */
+        functions: Functions;
+
+        /**
+         * Expose utils.
+         */
+        utils: Utils;
+
+        Visitor: typeof Visitor;
+        Parser: typeof Parser;
+        Evaluator: typeof Evaluator;
+        Compiler: typeof Compiler;
+
+        /**
+         * Expose middleware.
+         */
+        middleware(dir: string): Middleware;
+        middleware(options: any): Middleware;
+
+        /**
+         * Convert the given `css` to `stylus` source.
+         */
+        convertCSS(css: string): string;
+
+        /**
+         * Render the given `str` with `options` and callback `fn(err, css)`.
+         */
+        render(str: string, callback: RenderCallback): void;
+        render(str: string, options: RenderOptions, callback: RenderCallback): void;
+
+        /**
+         * Return a url() function with the given `options`.
+         */
+        url: UrlFunction;
+
+        /**
+         * Return a url() function with the given `options`.
+         */
+        resolver(options: any): LiteralFunction;
+    }
+
+    //#region Internal Modules
+
+    export interface NodeStatic {
+        Node: typeof Nodes.Node;
+        Root: typeof Nodes.Root;
+        Null: typeof Nodes.Null;
+        Each: typeof Nodes.Each;
+        If: typeof Nodes.If;
+        Call: typeof Nodes.Call;
+        UnaryOp: typeof Nodes.UnaryOp;
+        BinOp: typeof Nodes.BinOp;
+        Ternary: typeof Nodes.Ternary;
+        Block: typeof Nodes.Block;
+        Unit: typeof Nodes.Unit;
+        String: typeof Nodes.String;
+        HSLA: typeof Nodes.HSLA;
+        RGBA: typeof Nodes.RGBA;
+        Ident: typeof Nodes.Ident;
+        Group: typeof Nodes.Group;
+        Literal: typeof Nodes.Literal;
+        Boolean: typeof Nodes.Boolean;
+        Return: typeof Nodes.Return;
+        Media: typeof Nodes.Media;
+        QueryList: typeof Nodes.QueryList;
+        Query: typeof Nodes.Query;
+        QueryExpr: typeof Nodes.QueryExpr;
+        Params: typeof Nodes.Params;
+        Comment: typeof Nodes.Comment;
+        Keyframes: typeof Nodes.Keyframes;
+        Member: typeof Nodes.Member;
+        Charset: typeof Nodes.Charset;
+        Namespace: typeof Nodes.Namespace;
+        Import: typeof Nodes.Import;
+        Extend: typeof Nodes.Extend;
+        Object: typeof Nodes.Object;
+        Function: typeof Nodes.Function;
+        Property: typeof Nodes.Property;
+        Selector: typeof Nodes.Selector;
+        Expression: typeof Nodes.Expression;
+        Arguments: typeof Nodes.Arguments;
+        Atblock: typeof Nodes.Atblock;
+        Atrule: typeof Nodes.Atrule;
+
+        true: Nodes.Boolean;
+        false: Nodes.Boolean;
+        null: Nodes.Null;
+    }
+
+    export interface Functions {
+        /**
+         * Convert the given `color` to an `HSLA` node,
+         * or h,s,l,a component values.
+         */
+        hsla(rgba: Nodes.RGBA): Nodes.HSLA;
+        hsla(hsla: Nodes.HSLA): Nodes.HSLA;
+        hsla(hue: Nodes.Unit, saturation: Nodes.Unit, lightness: Nodes.Unit, alpha: Nodes.Unit): Nodes.HSLA;
+
+        /**
+         * Convert the given `color` to an `HSLA` node,
+         * or h,s,l component values.
+         */
+        hsl(rgba: Nodes.RGBA): Nodes.HSLA;
+        hsl(hsla: Nodes.HSLA): Nodes.HSLA;
+        hsl(hue: Nodes.Unit, saturation: Nodes.Unit, lightness: Nodes.Unit): Nodes.HSLA;
+
+        /**
+         * Return type of `node`.
+         */
+        type(node: Nodes.Node): string;
+        /**
+         * Return type of `node`.
+         */
+        typeof(node: Nodes.Node): string;
+        /**
+         * Return type of `node`.
+         */
+        "type-of"(node: Nodes.Node): string;
+
+        /**
+         * Return component `name` for the given `color`.
+         */
+        component(color: Nodes.RGBA, name: Nodes.String): Nodes.Unit;
+        component(color: Nodes.HSLA, name: Nodes.String): Nodes.Unit;
+
+        /**
+         * Return component `name` for the given `color`.
+         */
+        basename(path: Nodes.String): string;
+        basename(path: Nodes.String, ext: Nodes.String): string;
+
+        /**
+         * Return the dirname of `path`.
+         */
+        dirname(path: Nodes.String): string;
+
+        /**
+         * Return the extension of `path`.
+         */
+        extname(path: Nodes.String): string;
+
+        /**
+         * Joins given paths
+         */
+        pathjoin(...paths: Nodes.String[]): string;
+
+        /**
+         * Return the red component of the given `color`,
+         * or set the red component to the optional second `value` argument.
+         */
+        red(color: Nodes.RGBA): Nodes.Unit;
+        red(color: Nodes.HSLA): Nodes.Unit;
+        red(color: Nodes.RGBA, value: Nodes.Unit): Nodes.RGBA;
+        red(color: Nodes.HSLA, value: Nodes.Unit): Nodes.RGBA;
+
+        /**
+         * Return the green component of the given `color`,
+         * or set the green component to the optional second `value` argument.
+         */
+        green(color: Nodes.RGBA): Nodes.Unit;
+        green(color: Nodes.HSLA): Nodes.Unit;
+        green(color: Nodes.RGBA, value: Nodes.Unit): Nodes.RGBA;
+        green(color: Nodes.HSLA, value: Nodes.Unit): Nodes.RGBA;
+
+        /**
+         * Return the blue component of the given `color`,
+         * or set the blue component to the optional second `value` argument.
+         */
+        blue(color: Nodes.RGBA): Nodes.Unit;
+        blue(color: Nodes.HSLA): Nodes.Unit;
+        blue(color: Nodes.RGBA, value: Nodes.Unit): Nodes.RGBA;
+        blue(color: Nodes.HSLA, value: Nodes.Unit): Nodes.RGBA;
+
+        /**
+         * Return the alpha component of the given `color`,
+         * or set the alpha component to the optional second `value` argument.
+         */
+        alpha(color: Nodes.RGBA): Nodes.Unit;
+        alpha(color: Nodes.HSLA): Nodes.Unit;
+        alpha(color: Nodes.RGBA, value: Nodes.Unit): Nodes.RGBA;
+        alpha(color: Nodes.HSLA, value: Nodes.Unit): Nodes.RGBA;
+
+        /**
+         * Return the hue component of the given `color`,
+         * or set the hue component to the optional second `value` argument.
+         */
+        hue(color: Nodes.RGBA): Nodes.Unit;
+        hue(color: Nodes.HSLA): Nodes.Unit;
+        hue(color: Nodes.RGBA, value: Nodes.Unit): Nodes.RGBA;
+        hue(color: Nodes.HSLA, value: Nodes.Unit): Nodes.RGBA;
+
+        /**
+         * Return the saturation component of the given `color`,
+         * or set the saturation component to the optional second `value` argument.
+         */
+        saturation(color: Nodes.RGBA): Nodes.Unit;
+        saturation(color: Nodes.HSLA): Nodes.Unit;
+        saturation(color: Nodes.RGBA, value: Nodes.Unit): Nodes.RGBA;
+        saturation(color: Nodes.HSLA, value: Nodes.Unit): Nodes.RGBA;
+
+        /**
+         * Return the lightness component of the given `color`,
+         * or set the lightness component to the optional second `value` argument.
+         */
+        lightness(color: Nodes.RGBA): Nodes.Unit;
+        lightness(color: Nodes.HSLA): Nodes.Unit;
+        lightness(color: Nodes.RGBA, value: Nodes.Unit): Nodes.RGBA;
+        lightness(color: Nodes.HSLA, value: Nodes.Unit): Nodes.RGBA;
+
+        /**
+         * Return a `RGBA` from the r,g,b,a channels.
+         */
+        rgba(rgba: Nodes.RGBA): Nodes.RGBA;
+        rgba(hsla: Nodes.HSLA): Nodes.RGBA;
+        rgba(hue: Nodes.Unit, saturation: Nodes.Unit, lightness: Nodes.Unit, alpha: Nodes.Unit): Nodes.RGBA;
+
+        /**
+         * Return a `RGBA` from the r,g,b channels.
+         */
+        rgb(rgba: Nodes.RGBA): Nodes.RGBA;
+        rgb(hsla: Nodes.HSLA): Nodes.RGBA;
+        rgb(hue: Nodes.Unit, saturation: Nodes.Unit, lightness: Nodes.Unit, alpha: Nodes.Unit): Nodes.RGBA;
+
+        /**
+         * Blend the `top` color over the `bottom`
+         */
+        blend(top: Nodes.RGBA): Nodes.RGBA;
+        blend(top: Nodes.RGBA, bottom: Nodes.RGBA): Nodes.RGBA;
+        blend(top: Nodes.RGBA, bottom: Nodes.HSLA): Nodes.RGBA;
+        blend(top: Nodes.HSLA): Nodes.RGBA;
+        blend(top: Nodes.HSLA, bottom: Nodes.RGBA): Nodes.RGBA;
+        blend(top: Nodes.HSLA, bottom: Nodes.HSLA): Nodes.RGBA;
+
+        /**
+         * Returns the relative luminance of the given `color`,
+         * see http://www.w3.org/TR/WCAG20/#relativeluminancedef
+         */
+        luminosity(rgba: Nodes.RGBA): Nodes.Unit;
+        luminosity(rgba: Nodes.HSLA): Nodes.Unit;
+
+        /**
+         * Returns the contrast ratio object between `top` and `bottom` colors,
+         * based on http://leaverou.github.io/contrast-ratio/
+         * and https://github.com/LeaVerou/contrast-ratio/blob/gh-pages/color.js#L108
+         */
+        contrast(top: Nodes.RGBA): Nodes.Object;
+        contrast(top: Nodes.RGBA, bottom: Nodes.RGBA): Nodes.Object;
+        contrast(top: Nodes.RGBA, bottom: Nodes.HSLA): Nodes.Object;
+        contrast(top: Nodes.HSLA): Nodes.Object;
+        contrast(top: Nodes.HSLA, bottom: Nodes.RGBA): Nodes.Object;
+        contrast(top: Nodes.HSLA, bottom: Nodes.HSLA): Nodes.Object;
+
+        /**
+         * Returns the transparent version of the given `top` color,
+         * as if it was blend over the given `bottom` color.
+         */
+        transparentify(top: Nodes.RGBA): Nodes.Object;
+        transparentify(top: Nodes.RGBA, bottom: Nodes.RGBA, alpha?: Nodes.Unit): Nodes.Object;
+        transparentify(top: Nodes.RGBA, bottom: Nodes.HSLA, alpha?: Nodes.Unit): Nodes.Object;
+        transparentify(top: Nodes.HSLA): Nodes.Object;
+        transparentify(top: Nodes.HSLA, bottom: Nodes.RGBA, alpha?: Nodes.Unit): Nodes.Object;
+        transparentify(top: Nodes.HSLA, bottom: Nodes.HSLA, alpha?: Nodes.Unit): Nodes.Object;
+
+        /**
+         * Convert a .json file into stylus variables or object.
+         * Nested variable object keys are joined with a dash (-)
+         *
+         * Given this sample media-queries.json file:
+         * {
+         *   "small": "screen and (max-width:400px)",
+         *   "tablet": {
+         *     "landscape": "screen and (min-width:600px) and (orientation:landscape)",
+         *     "portrait": "screen and (min-width:600px) and (orientation:portrait)"
+         *   }
+         * }
+         */
+        json(path: Nodes.String, local: Nodes.Boolean, namePrefix: Nodes.String): any;
+
+        /**
+         * Use the given `plugin`.
+         */
+        use(plugin: Nodes.String): void;
+        use(plugin: Nodes.String, options: any): void;
+
+        /**
+         * Unquote the given `string`.
+         */
+        unquote(str: Nodes.String): Nodes.Literal;
+
+        /**
+         * Like `unquote` but tries to convert the given `str` to a Stylus node.
+         */
+        convert(str: Nodes.String): Nodes.Node;
+
+        /**
+         * Assign `type` to the given `unit` or return `unit`'s type.
+         */
+        unit(unit: Nodes.Unit, type: Nodes.String): Nodes.Unit;
+
+        /**
+         * Lookup variable `name` or return Null.
+         */
+        lookup(name: Nodes.String): Nodes.Node;
+
+        /**
+         * Set a variable `name` on current scope.
+         */
+        define(name: Nodes.String, expr: Nodes.Expression): Nodes.Node;
+
+        /**
+         * Perform `op` on the `left` and `right` operands.
+         */
+        operate(op: Nodes.String, left: Nodes.Node, right: Nodes.Node): Nodes.Node;
+
+        /**
+         * Test if `val` matches the given `pattern`.
+         */
+        match(pattern: Nodes.String, val: Nodes.String): Nodes.Boolean;
+        match(pattern: Nodes.String, val: Nodes.Ident): Nodes.Boolean;
+
+        /**
+         * Returns substring of the given `val`.
+         */
+        substr(val: Nodes.String, start: Nodes.Number, length: Nodes.Number): Nodes.String;
+        substr(val: Nodes.Ident, start: Nodes.Number, length: Nodes.Number): Nodes.Ident;
+
+        /**
+         * Returns string with all matches of `pattern` replaced by `replacement` in given `val`
+         */
+        replace(pattern: Nodes.String, replacement: Nodes.String, val: Nodes.String): Nodes.String;
+        replace(pattern: Nodes.String, replacement: Nodes.String, val: Nodes.Ident): Nodes.Ident;
+
+        /**
+         * Splits the given `val` by `delim`
+         */
+        split(pattern: Nodes.String, val: Nodes.String): Nodes.Expression;
+        split(pattern: Nodes.String, val: Nodes.Ident): Nodes.Expression;
+
+        /**
+         * Return length of the given `expr`.
+         */
+        length(expr: Nodes.Expression): Nodes.Unit;
+
+        /**
+         * Inspect the given `expr`.
+         */
+        length(...expr: Nodes.Expression[]): Nodes.Null;
+
+        /**
+         * Throw an error with the given `msg`.
+         */
+        error(msg: Nodes.String): void;
+
+        /**
+         * Warn with the given `msg` prefixed by "Warning: ".
+         */
+        warn(msg: Nodes.String): Nodes.Null;
+
+        /**
+         * Output stack trace.
+         */
+        trace(): Nodes.Null;
+
+        /**
+         * Push the given args to `expr`.
+         */
+        push(expr: Nodes.Expression, ...nodes: Nodes.Node[]): Nodes.Unit;
+
+        /**
+         * Pop a value from `expr`.
+         */
+        pop(expr: Nodes.Expression): Nodes.Node;
+
+        /**
+         * Unshift the given args to `expr`.
+         */
+        unshift(expr: Nodes.Expression, ...nodes: Nodes.Node[]): Nodes.Unit;
+
+        /**
+         * Unshift the given args to `expr`..
+         */
+        prepend(expr: Nodes.Expression, ...nodes: Nodes.Node[]): Nodes.Unit;
+
+        /**
+         * Shift a value from `expr`.
+         */
+        shift(expr: Nodes.Expression): Nodes.Node;
+
+        /**
+         * Return a `Literal` with the given `fmt`, and variable number of arguments.
+         */
+        s(fmt: Nodes.String, ...nodes: Nodes.Node[]): Nodes.Literal;
+
+        /**
+         * Return a `Literal` `num` converted to the provided `base`, padded to `width`
+         * with zeroes (default width is 2)
+         */
+        "base-convert"(num: Nodes.Number, base: Nodes.Number, width: Nodes.Number): Nodes.Literal;
+
+        /**
+         * Return the opposites of the given `positions`.
+         */
+        "opposite-position"(positions: Nodes.Expression): Nodes.Expression;
+
+        /**
+         * Return the width and height of the given `img` path.
+         */
+        "image-size"(img: Nodes.String, ignoreErr: Nodes.Boolean): Nodes.Expression;
+
+        /**
+         * Return the tangent of the given `angle`.
+         */
+        tan(angle: Nodes.Unit): Nodes.Unit;
+
+        /**
+         * Return the tangent of the given `angle`.
+         */
+        math(n: Nodes.Unit, fn: Nodes.String): Nodes.Unit;
+
+        /**
+         * Return the opposites of the given `positions`.
+         */
+        "-math-prop"(prop: Nodes.String): Nodes.Unit;
+
+        /**
+         * Adjust HSL `color` `prop` by `amount`.
+         */
+        adjust(rgba: Nodes.RGBA, prop: Nodes.String, amount: Nodes.Unit): Nodes.RGBA;
+        adjust(hsla: Nodes.HSLA, prop: Nodes.String, amount: Nodes.Unit): Nodes.RGBA;
+
+        /**
+         * Return a clone of the given `expr`.
+         */
+        clone(expr: Nodes.Expression): Nodes.Expression;
+
+        /**
+         * Add property `name` with the given `expr` to the mixin-able block.
+         */
+        "add-property"(name: Nodes.String, expr: Nodes.Expression): Nodes.Property;
+
+        /**
+         * Merge the object `dest` with the given args.
+         */
+        merge(dest: Nodes.Object, ...objs: Nodes.Object[]): Nodes.Object;
+
+        /**
+         * Merge the object `dest` with the given args.
+         */
+        extend(dest: Nodes.Object, ...objs: Nodes.Object[]): Nodes.Object;
+
+        /**
+         * Return the current selector or compile `sel` selector.
+         */
+        selector(): string;
+        selector(sel: Nodes.String): string;
+
+        /**
+         * Prefix css classes in a block
+         */
+        "-prefix-classes"(prefix: Nodes.String, block: Nodes.Block): Nodes.Block;
+
+        /**
+         * Returns the @media string for the current block
+         */
+        "current-media"(): Nodes.String;
+
+        /**
+         * Return the separator of the given `list`.
+         */
+        "list-separator"(list: Nodes.Expression): Nodes.String;
+    }
+
+    export interface Utils {
+        /**
+         * Check if `path` looks absolute.
+         */
+        absolute(path: string): boolean;
+
+        /**
+         * Attempt to lookup `path` within `paths` from tail to head.
+         * Optionally a path to `ignore` may be passed.
+         */
+        lookup(path: string, paths: string, ignore: string, resolveURL: boolean): string;
+
+        /**
+         * Attempt to lookup `path` within `paths` from tail to head.
+         * Optionally a path to `ignore` may be passed.
+         */
+        lookupIndex(path: string, paths: string, filename: string): string[];
+
+        /**
+         * Like `utils.lookup` but uses `glob` to find files.
+         */
+        find(path: string, paths: string, ignore: string): string[];
+
+        /**
+         * Format the given `err` with the given `options`.
+         */
+        formatException(err: Error, options: ExceptionOptions): Error;
+
+        /**
+         * Assert that `node` is of the given `type`, or throw.
+         */
+        assertType(node: Nodes.Node, type: string, param: string): void;
+
+        /**
+         * Assert that `node` is a `String` or `Ident`.
+         */
+        assertString(node: Nodes.Node, param: string): void;
+
+        /**
+         * Assert that `node` is a `RGBA` or `HSLA`.
+         */
+        assertColor(node: Nodes.Node, param: string): void;
+
+        /**
+         * Assert that param `name` is given, aka the `node` is passed.
+         */
+        assertPresent(node: Nodes.Node, name: string): void;
+
+        /**
+         * Unwrap `expr`.
+         *
+         * Takes an expressions with length of 1
+         * such as `((1 2 3))` and unwraps it to `(1 2 3)`.
+         */
+        unwrap(expr: Nodes.Expression): Nodes.Node;
+
+        /**
+         * Coerce JavaScript values to their Stylus equivalents.
+         */
+        coerce(val: any): Nodes.Node;
+        coerce(val: any, raw: boolean): Nodes.Node;
+
+        /**
+         * Coerce a javascript `Array` to a Stylus `Expression`.
+         */
+        coerceArray(val: any): Nodes.Expression;
+        coerceArray(val: any, raw: boolean): Nodes.Expression;
+
+        /**
+         * Coerce a javascript object to a Stylus `Expression` or `Object`.
+         *
+         * For example `{ foo: 'bar', bar: 'baz' }` would become
+         * the expression `(foo 'bar') (bar 'baz')`. If `raw` is true
+         * given `obj` would become a Stylus hash object.
+         */
+        coerceObject(obj: any): Nodes.Expression;
+        coerceObject(obj: any, raw: boolean): Nodes.Expression;
+
+        /**
+         * Return param names for `fn`.
+         */
+        params(fn: Function): string[];
+
+        /**
+         * Merge object `b` with `a`.
+         */
+        merge(a: any, b: any): any;
+
+        /**
+         * Returns an array with unique values.
+         */
+        uniq(arr: any[]): any[];
+
+        /**
+         * Compile selector strings in `arr` from the bottom-up
+         * to produce the selector combinations. For example
+         * the following Stylus:
+         */
+        compileSelectors(arr: string[], leaveHidden: boolean): string[];
+    }
+
+    export interface UrlFunction {
+        (options: UrlOptions): LiteralFunction;
+
+        mimes: {
+            ".gif": string;
+            ".png": string;
+            ".jpg": string;
+            ".jpeg": string;
+            ".svg": string;
+            ".ttf": string;
+            ".eot": string;
+            ".woff": string;
+        };
+    }
+
+    export interface Middleware {
+        (req: any, res: any, next: Function): void;
+    }
+
+    //#endregion
+
+    //#region Internal Classes
+
+    export class Visitor {
+    }
+
+    export class Parser {
+    }
+
+    export class Evaluator {
+    }
+
+    export class Compiler {
+    }
+
+    export class Renderer implements NodeJS.EventEmitter {
+        options: RenderOptions;
+        str: string;
+        events: any;
+
+        constructor(str: string);
+        constructor(str: string, options: RenderOptions);
+
+        /**
+         * Parse and evaluate AST, then callback `fn(err, css, js)`.
+         */
+        render(callback: RenderCallback): void;
+
+        /**
+         * Parse and evaluate AST and return the result.
+         */
+        render(): string;
+
+        /**
+         * Get dependencies of the compiled file.
+         */
+        deps(filename: string): string[];
+
+        /**
+         * Set option `key` to `val`.
+         */
+        set(key: string, val: any): Renderer;
+
+        /**
+         * Get option `key`.
+         */
+        get(key: string): any;
+
+        /**
+         * Include the given `path` to the lookup paths array.
+         */
+        include(path: string): Renderer;
+
+        /**
+         * Use the given `fn`.
+         *
+         * This allows for plugins to alter the renderer in
+         * any way they wish, exposing paths etc.
+         */
+        use(fn: (renderer: Renderer) => any): Renderer;
+
+        /**
+         * Define function or global var with the given `name`. Optionally
+         * the function may accept full expressions, by setting `raw`
+         * to `true`.
+         */
+        define(name: string, fn: Function): Renderer;
+        define(name: string, node: Nodes.Node): Renderer;
+        define(name: string, val: any): Renderer;
+        define(name: string, fn: Function, raw: boolean): Renderer;
+        define(name: string, node: Nodes.Node, raw: boolean): Renderer;
+        define(name: string, val: any, raw: boolean): Renderer;
+
+        /**
+         * Import the given `file`.
+         */
+        import(file: string): Renderer;
+
+        //#region EventEmitter Members
+        addListener(event: string, listener: Function): this;
+        on(event: string, listener: Function): this;
+        once(event: string, listener: Function): this;
+        removeListener(event: string, listener: Function): this;
+        removeAllListeners(event?: string): this;
+        setMaxListeners(n: number): this;
+        getMaxListeners(): number;
+        listeners(event: string): Function[];
+        emit(event: string, ...args: any[]): boolean;
+        listenerCount(type: string): number;
+        //#endregion
+    }
+
+    //#endregion
+
+    //#region Nodes Classes
+
+    export module Nodes {
+
+        export class Node {
+            lineno: number;
+            column: number;
+            filename: string;
+
+            first: Node;
+            hash: string;
+            nodeName: string;
+
+            constructor();
+
+            /**
+             * Return a clone of this node.
+             */
+            clone(): Node;
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { lineno: number; column: number; filename: string };
+
+            /**
+             * Nodes by default evaluate to themselves.
+             */
+            eval(): Node;
+
+            /**
+             * Return true.
+             */
+            toBoolean(): Boolean;
+
+            /**
+             * Return the expression, or wrap this node in an expression.
+             */
+            toExpression(): Expression;
+
+            /**
+             * Return false if `op` is generally not coerced.
+             */
+            shouldCoerce(op: string): boolean;
+
+            /**
+             * Operate on `right` with the given `op`.
+             */
+            operate(op: string, right: Node): Node;
+
+            /**
+             *  Default coercion throws.
+             */
+            coerce(other: Node): Node;
+        }
+
+        export class Root extends Node {
+            nodes: Node[];
+
+            /**
+             * Push a `node` to this block.
+             */
+            push(node: Node): void;
+
+            /**
+             * Unshift a `node` to this block.
+             */
+            unshift(node: Node): void;
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { nodes: Node[]; lineno: number; column: number; filename: string };
+        }
+
+        export class String extends Node {
+            val: string;
+            string: string;
+            prefixed: boolean;
+            quote: string;
+
+            constructor(val: string);
+            constructor(val: string, quote: string);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { val: string; quote: string; lineno: number; column: number; filename: string };
+        }
+
+        export class Number extends Node {
+
+        }
+
+        export class Boolean extends Node {
+            val: boolean;
+            isTrue: boolean;
+            isFalse: boolean;
+
+            constructor();
+            constructor(val: boolean);
+
+            /**
+             * Negate the value.
+             */
+            negate(): Boolean;
+
+            /**
+             * Return 'Boolean'.
+             */
+            inspect(): Boolean;
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; val: boolean; lineno: number; column: number; filename: string };
+        }
+
+        export class Object extends Node {
+            vals: Dictionary<Node>;
+            length: number;
+
+            constructor();
+
+            /**
+             * Set `key` to `val`.
+             */
+            set(key: string, value: Node): Object;
+
+            /**
+             * Get `key`.
+             */
+            get(key: string): Node;
+
+            /**
+             * Has `key`?
+             */
+            has(key: string): boolean;
+
+            /**
+             * Convert object to string with properties.
+             */
+            toBlock(): string;
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; vals: Dictionary<Node>; lineno: number; column: number; filename: string };
+        }
+
+        export class Null extends Node {
+            isNull: boolean;
+
+            constructor();
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; lineno: number; column: number; filename: string };
+        }
+
+        export class Ident extends Node {
+            name: string;
+            string: string;
+            val: Node;
+            mixin: boolean;
+
+            isEmpty: boolean;
+
+            constructor(name: string, val: Node);
+            constructor(name: string, val: Node, mixin: boolean);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; name: string; val: Node; mixin: boolean; lineno: number; column: number; filename: string };
+        }
+
+        export class Literal extends Node {
+            val: string;
+            string: string;
+            prefixed: boolean;
+
+            constructor(str: string);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; string: string; val: string; prefixed: boolean; lineno: number; column: number; filename: string };
+        }
+
+        export class Unit extends Node {
+            val: number;
+            type: string;
+
+            constructor(val: number, type: string);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; val: number; type: string; lineno: number; column: number; filename: string };
+        }
+
+        export class RGBA extends Node {
+            r: number;
+            g: number;
+            b: number;
+            a: number;
+            rgba: RGBA;
+            hsla: HSLA;
+
+            constructor(r: number, g: number, b: number, a: number);
+
+            /**
+             * Return an `RGBA` without clamping values.
+             */
+            static withoutClamping(r: number, g: number, b: number, a: number): RGBA;
+
+            /**
+             * Return a `RGBA` from the given `hsla`.
+             */
+            static fromHSLA(hsla: HSLA): RGBA;
+
+            /**
+             * Add r,g,b,a to the current component values
+             */
+            add(r: number, g: number, b: number, a: number): RGBA;
+
+            /**
+             * Subtract r,g,b,a from the current component values
+             */
+            substract(r: number, g: number, b: number, a: number): RGBA;
+
+            /**
+             * Multiply rgb components by `n`.
+             */
+            multiply(n: number): RGBA;
+
+            /**
+             * Divide rgb components by `n`.
+             */
+            divide(n: number): RGBA;
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; r: number; g: number; b: number; a: number; lineno: number; column: number; filename: string };
+        }
+
+        export class HSLA extends Node {
+            h: number;
+            s: number;
+            l: number;
+            a: number;
+            hsla: HSLA;
+            rgba: RGBA;
+
+            constructor(h: number, s: number, l: number, a: number);
+
+            /**
+             * Return a `HSLA` from the given `hsla`.
+             */
+            static fromRGBA(rgba: RGBA): HSLA;
+
+            /**
+             * Add h,s,l to the current component values
+             */
+            add(h: number, s: number, l: number): HSLA;
+
+            /**
+             * Subtract h,s,l from the current component values
+             */
+            substract(h: number, s: number, l: number): HSLA;
+
+            /**
+             * Adjust lightness by `percent`.
+             */
+            adjustLightness(percent: number): HSLA;
+
+            /**
+             * djust hue by `deg`.
+             */
+            adjustHue(deg: number): HSLA;
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; h: number; s: number; l: number; a: number; lineno: number; column: number; filename: string };
+        }
+
+        export class Block extends Node {
+            nodes: Node[];
+            parent: Block;
+            node: Node;
+            scope: boolean;
+
+            hasProperties: boolean;
+            hasMedia: boolean;
+            isEmpty: boolean;
+
+            constructor(parent: Block);
+            constructor(parent: Block, node: Node);
+
+            /**
+             * Push a `node` to this block.
+             */
+            push(node: Node): void;
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; nodes: Node[]; scope: boolean; lineno: number; column: number; filename: string };
+        }
+
+        export class Group extends Node {
+            nodes: Node[];
+            block: Block;
+
+            hasOnlyPlaceholders: boolean;
+
+            constructor();
+
+            /**
+             * Push the given `selector` node.
+             */
+            push(node: Node): void;
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; nodes: Node[]; block: Block; lineno: number; column: number; filename: string };
+        }
+
+        export class Expression extends Node {
+            nodes: Node[];
+            isList: boolean;
+
+            isEmpty: boolean;
+            first: Node;
+
+            constructor(isList: boolean);
+
+            /**
+             * Push the given node.
+             */
+            push(node: Node): void;
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; nodes: Node[]; isList: boolean; lineno: number; column: number; filename: string };
+        }
+
+        export class Property extends Node {
+            segments: Node[];
+            expr: Expression;
+
+            constructor(segs: Node[], expr: Expression);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; segments: Node[]; name: string; expr?: Expression; literal?: Literal; lineno: number; column: number; filename: string };
+        }
+
+        export class Each extends Node {
+            val: string;
+            key: string;
+            expr: Expression;
+            block: Block;
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; val: string; key: string; expr: Expression; block: Block; lineno: number; column: number; filename: string };
+        }
+
+        export class If extends Node {
+            cond: Expression;
+            elses: Expression[];
+            block: Block;
+            negate: boolean;
+
+            constructor(cond: Expression, negate: boolean);
+            constructor(cond: Expression, block: Block);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; cond: Expression; elses: Expression[]; block: Block; negate: boolean; lineno: number; column: number; filename: string };
+        }
+
+        export class Call extends Node {
+            name: string;
+            args: Expression;
+
+            constructor(name: string, args: Expression);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; name: string; args: Expression; lineno: number; column: number; filename: string };
+        }
+
+        export class UnaryOp extends Node {
+            op: string;
+            expr: Expression;
+
+            constructor(op: string, expr: Expression);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; op: string; expr: Expression; lineno: number; column: number; filename: string };
+        }
+
+        export class BinOp extends Node {
+            op: string;
+            left: Expression;
+            right: Expression;
+
+            constructor(op: string, left: Expression, right: Expression);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; op: string; left: Expression; right: Expression; lineno: number; column: number; filename: string };
+        }
+
+        export class Ternary extends Node {
+            op: string;
+            trueExpr: Expression;
+            falseExpr: Expression;
+
+            constructor(op: string, trueExpr: Expression, falseExpr: Expression);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; op: string; trueExpr: Expression; falseExpr: Expression; lineno: number; column: number; filename: string };
+        }
+
+        export class Return extends Node {
+            expr: Expression;
+
+            constructor(expr: Expression);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; expr: Expression; lineno: number; column: number; filename: string };
+        }
+
+        export class Media extends Node {
+            val: string;
+
+            constructor(val: string);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; val: string; lineno: number; column: number; filename: string };
+        }
+
+        export class QueryList extends Node {
+            nodes: Node[];
+
+            constructor();
+
+            /**
+             * Push the given `node`.
+             */
+            push(node: Node): void;
+
+            /**
+             * Merges this query list with the `other`.
+             */
+            merge(other: MediaQueryList): MediaQueryList;
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; nodes: Node[]; lineno: number; column: number; filename: string };
+        }
+
+        export class Query extends Node {
+            nodes: QueryExpr[];
+            type: string;
+            predicate: string;
+
+            resolvedType: string;
+            resolvedPredicate: string;
+
+            constructor();
+
+            /**
+             * Push the given `expr`.
+             */
+            push(expr: QueryExpr): void;
+
+            /**
+             * Merges this query with the `other`.
+             */
+            merge(other: Query): Query;
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; nodes: QueryExpr[]; predicate: string; type: string; lineno: number; column: number; filename: string };
+        }
+
+        export class QueryExpr extends Node {
+            segments: Node[];
+            expr: Expression;
+
+            constructor(segs: Node[]);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; segments: Node[]; lineno: number; column: number; filename: string };
+        }
+
+        export class Params extends Node {
+            nodes: Node[];
+
+            length: number;
+
+            /**
+             * Push the given `node`.
+             */
+            push(node: Node): void;
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; nodes: Node[]; lineno: number; column: number; filename: string };
+        }
+
+        export class Comment extends Node {
+            str: string;
+            suppress: boolean;
+            inline: boolean;
+
+            constructor(str: string, suppress: boolean, inline: boolean);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; str: string; suppress: boolean; inline: boolean; lineno: number; column: number; filename: string };
+        }
+
+        export class Keyframes extends Node {
+            segments: Node[];
+            prefix: string;
+
+            constructor(segs: Node[]);
+            constructor(segs: Node[], prefix: string);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; segments: Node[]; prefix: string; block: Block; lineno: number; column: number; filename: string };
+        }
+
+        export class Member extends Node {
+            left: Node;
+            right: Node;
+
+            constructor(left: Node, right: Node);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; left: Node; right: Node; val?: string; lineno: number; column: number; filename: string };
+        }
+
+        export class Charset extends Node {
+            val: string;
+
+            constructor(val: string);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; val: string; lineno: number; column: number; filename: string };
+        }
+
+        export class Namespace extends Node {
+            val: string;
+            prefix: string;
+
+            constructor(val: string, prefix: string);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; val: string; prefix: string; lineno: number; column: number; filename: string };
+        }
+
+        export class Import extends Node {
+            path: Expression;
+            once: boolean;
+
+            constructor(path: Expression);
+            constructor(path: Expression, once: boolean);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; path: Expression; lineno: number; column: number; filename: string };
+        }
+
+        export class Extend extends Node {
+            selectors: Selector[];
+
+            constructor(selectors: Selector[]);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; selectors: Selector[]; lineno: number; column: number; filename: string };
+        }
+
+        export class Function extends Node {
+            name: string;
+            params: Params;
+            body: Block;
+
+            constructor(name: string, params: Params, body: Block);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; name: string; params: Params; body: Block; lineno: number; column: number; filename: string };
+        }
+
+        export class Selector extends Node {
+            inherits: boolean;
+            segments: Node[];
+
+            constructor(segs: Node[]);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; segments: Node[]; inherits: boolean; val: string; lineno: number; column: number; filename: string };
+        }
+
+        export class Arguments extends Expression {
+            map: Dictionary<Node>;
+
+            constructor();
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; map: Dictionary<Node>; isList: boolean; preserve: boolean; nodes: Node[]; lineno: number; column: number; filename: string };
+        }
+
+        export class Atblock extends Node {
+            block: Block;
+            nodes: Node[];
+
+            constructor();
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; block: Block; lineno: number; column: number; filename: string };
+        }
+
+        export class Atrule extends Node {
+            type: string;
+
+            hasOnlyProperties: boolean;
+
+            constructor(type: string);
+
+            /**
+             * Return a JSON representation of this node.
+             */
+            toJSON(): { __type: string; type: string; segments: Node[]; block?: Block; lineno: number; column: number; filename: string };
+        }
+    }
+
+    //#endregion
+
+    //#region Internal Interfaces
+
+    export interface Dictionary<T> {
+        [key: string]: T;
+    }
+
+    export interface RenderOptions {
+        globals?: Dictionary<any>;
+        functions?: Dictionary<any>;
+        imports?: string[];
+        paths?: string[];
+        filename?: string;
+        Evaluator?: typeof Evaluator;
+    }
+
+    export interface RenderCallback {
+        (err: Error, css: string, js: string): void;
+    }
+
+    export interface UrlOptions {
+        limit?: string;
+        path: string;
+    }
+
+    export interface LiteralFunction {
+        (url: string): Nodes.Literal;
+        raw: boolean;
+    }
+
+    export interface ExceptionOptions {
+        filename: string;
+        context: number;
+        lineno: number;
+        column: number;
+        input: string;
+    }
+
+    //#endregion
+}
diff --git a/stylus/stylus-tests.ts b/stylus/stylus-tests.ts
index 78b2456df2..4f17d26a9c 100644
--- a/stylus/stylus-tests.ts
+++ b/stylus/stylus-tests.ts
@@ -4,9 +4,9 @@
  * Created by using code samples from https://github.com/LearnBoost/stylus/blob/master/docs/js.md.
  */
 
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../express/express.d.ts" />
-/// <reference path="stylus.d.ts" />
+/// <reference types="node" />
+
+
 
 import stylus = require("stylus");
 
@@ -89,7 +89,7 @@ stylus(str)
  * .use(fn)
  * https://github.com/LearnBoost/stylus/blob/master/docs/js.md#usefn
  */
-var mylib = function (style: Stylus.Renderer) {
+var mylib = function (style: any) {
     style.define('number', 15.5);
     style.define('get-list', function () {
         return ['foo', 'bar', 'baz'];
diff --git a/stylus/stylus.d.ts b/stylus/stylus.d.ts
deleted file mode 100644
index 52053af678..0000000000
--- a/stylus/stylus.d.ts
+++ /dev/null
@@ -1,1447 +0,0 @@
-// Type definitions for stylus 0.48.1
-// Project: https://github.com/LearnBoost/stylus
-// Definitions by: Maxime LUCE <https://github.com/SomaticIT>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare namespace Stylus {
-
-    export interface Static {
-        /**
-         * Return a new `Renderer` for the given `str` and `options`.
-         */
-        (str: string): Renderer;
-        (str: string, options: RenderOptions): Renderer;
-
-        /**
-         * Library version.
-         */
-        version: string;
-
-        /**
-         * Expose nodes.
-         */
-        nodes: NodeStatic;
-
-        /**
-         * Expose BIFs.
-         */
-        functions: Functions;
-
-        /**
-         * Expose utils.
-         */
-        utils: Utils;
-
-        Visitor: typeof Visitor;
-        Parser: typeof Parser;
-        Evaluator: typeof Evaluator;
-        Compiler: typeof Compiler;
-
-        /**
-         * Expose middleware.
-         */
-        middleware(dir: string): Middleware;
-        middleware(options: any): Middleware;
-
-        /**
-         * Convert the given `css` to `stylus` source.
-         */
-        convertCSS(css: string): string;
-
-        /**
-         * Render the given `str` with `options` and callback `fn(err, css)`.
-         */
-        render(str: string, callback: RenderCallback): void;
-        render(str: string, options: RenderOptions, callback: RenderCallback): void;
-
-        /**
-         * Return a url() function with the given `options`.
-         */
-        url: UrlFunction;
-
-        /**
-         * Return a url() function with the given `options`.
-         */
-        resolver(options: any): LiteralFunction;
-    }
-
-    //#region Internal Modules
-
-    export interface NodeStatic {
-        Node: typeof Nodes.Node;
-        Root: typeof Nodes.Root;
-        Null: typeof Nodes.Null;
-        Each: typeof Nodes.Each;
-        If: typeof Nodes.If;
-        Call: typeof Nodes.Call;
-        UnaryOp: typeof Nodes.UnaryOp;
-        BinOp: typeof Nodes.BinOp;
-        Ternary: typeof Nodes.Ternary;
-        Block: typeof Nodes.Block;
-        Unit: typeof Nodes.Unit;
-        String: typeof Nodes.String;
-        HSLA: typeof Nodes.HSLA;
-        RGBA: typeof Nodes.RGBA;
-        Ident: typeof Nodes.Ident;
-        Group: typeof Nodes.Group;
-        Literal: typeof Nodes.Literal;
-        Boolean: typeof Nodes.Boolean;
-        Return: typeof Nodes.Return;
-        Media: typeof Nodes.Media;
-        QueryList: typeof Nodes.QueryList;
-        Query: typeof Nodes.Query;
-        QueryExpr: typeof Nodes.QueryExpr;
-        Params: typeof Nodes.Params;
-        Comment: typeof Nodes.Comment;
-        Keyframes: typeof Nodes.Keyframes;
-        Member: typeof Nodes.Member;
-        Charset: typeof Nodes.Charset;
-        Namespace: typeof Nodes.Namespace;
-        Import: typeof Nodes.Import;
-        Extend: typeof Nodes.Extend;
-        Object: typeof Nodes.Object;
-        Function: typeof Nodes.Function;
-        Property: typeof Nodes.Property;
-        Selector: typeof Nodes.Selector;
-        Expression: typeof Nodes.Expression;
-        Arguments: typeof Nodes.Arguments;
-        Atblock: typeof Nodes.Atblock;
-        Atrule: typeof Nodes.Atrule;
-
-        true: Nodes.Boolean;
-        false: Nodes.Boolean;
-        null: Nodes.Null;
-    }
-
-    export interface Functions {
-        /**
-         * Convert the given `color` to an `HSLA` node,
-         * or h,s,l,a component values.
-         */
-        hsla(rgba: Nodes.RGBA): Nodes.HSLA;
-        hsla(hsla: Nodes.HSLA): Nodes.HSLA;
-        hsla(hue: Nodes.Unit, saturation: Nodes.Unit, lightness: Nodes.Unit, alpha: Nodes.Unit): Nodes.HSLA;
-
-        /**
-         * Convert the given `color` to an `HSLA` node,
-         * or h,s,l component values.
-         */
-        hsl(rgba: Nodes.RGBA): Nodes.HSLA;
-        hsl(hsla: Nodes.HSLA): Nodes.HSLA;
-        hsl(hue: Nodes.Unit, saturation: Nodes.Unit, lightness: Nodes.Unit): Nodes.HSLA;
-
-        /**
-         * Return type of `node`.
-         */
-        type(node: Nodes.Node): string;
-        /**
-         * Return type of `node`.
-         */
-        typeof(node: Nodes.Node): string;
-        /**
-         * Return type of `node`.
-         */
-        "type-of"(node: Nodes.Node): string;
-
-        /**
-         * Return component `name` for the given `color`.
-         */
-        component(color: Nodes.RGBA, name: Nodes.String): Nodes.Unit;
-        component(color: Nodes.HSLA, name: Nodes.String): Nodes.Unit;
-
-        /**
-         * Return component `name` for the given `color`.
-         */
-        basename(path: Nodes.String): string;
-        basename(path: Nodes.String, ext: Nodes.String): string;
-
-        /**
-         * Return the dirname of `path`.
-         */
-        dirname(path: Nodes.String): string;
-
-        /**
-         * Return the extension of `path`.
-         */
-        extname(path: Nodes.String): string;
-
-        /**
-         * Joins given paths
-         */
-        pathjoin(...paths: Nodes.String[]): string;
-
-        /**
-         * Return the red component of the given `color`,
-         * or set the red component to the optional second `value` argument.
-         */
-        red(color: Nodes.RGBA): Nodes.Unit;
-        red(color: Nodes.HSLA): Nodes.Unit;
-        red(color: Nodes.RGBA, value: Nodes.Unit): Nodes.RGBA;
-        red(color: Nodes.HSLA, value: Nodes.Unit): Nodes.RGBA;
-
-        /**
-         * Return the green component of the given `color`,
-         * or set the green component to the optional second `value` argument.
-         */
-        green(color: Nodes.RGBA): Nodes.Unit;
-        green(color: Nodes.HSLA): Nodes.Unit;
-        green(color: Nodes.RGBA, value: Nodes.Unit): Nodes.RGBA;
-        green(color: Nodes.HSLA, value: Nodes.Unit): Nodes.RGBA;
-
-        /**
-         * Return the blue component of the given `color`,
-         * or set the blue component to the optional second `value` argument.
-         */
-        blue(color: Nodes.RGBA): Nodes.Unit;
-        blue(color: Nodes.HSLA): Nodes.Unit;
-        blue(color: Nodes.RGBA, value: Nodes.Unit): Nodes.RGBA;
-        blue(color: Nodes.HSLA, value: Nodes.Unit): Nodes.RGBA;
-
-        /**
-         * Return the alpha component of the given `color`,
-         * or set the alpha component to the optional second `value` argument.
-         */
-        alpha(color: Nodes.RGBA): Nodes.Unit;
-        alpha(color: Nodes.HSLA): Nodes.Unit;
-        alpha(color: Nodes.RGBA, value: Nodes.Unit): Nodes.RGBA;
-        alpha(color: Nodes.HSLA, value: Nodes.Unit): Nodes.RGBA;
-
-        /**
-         * Return the hue component of the given `color`,
-         * or set the hue component to the optional second `value` argument.
-         */
-        hue(color: Nodes.RGBA): Nodes.Unit;
-        hue(color: Nodes.HSLA): Nodes.Unit;
-        hue(color: Nodes.RGBA, value: Nodes.Unit): Nodes.RGBA;
-        hue(color: Nodes.HSLA, value: Nodes.Unit): Nodes.RGBA;
-
-        /**
-         * Return the saturation component of the given `color`,
-         * or set the saturation component to the optional second `value` argument.
-         */
-        saturation(color: Nodes.RGBA): Nodes.Unit;
-        saturation(color: Nodes.HSLA): Nodes.Unit;
-        saturation(color: Nodes.RGBA, value: Nodes.Unit): Nodes.RGBA;
-        saturation(color: Nodes.HSLA, value: Nodes.Unit): Nodes.RGBA;
-
-        /**
-         * Return the lightness component of the given `color`,
-         * or set the lightness component to the optional second `value` argument.
-         */
-        lightness(color: Nodes.RGBA): Nodes.Unit;
-        lightness(color: Nodes.HSLA): Nodes.Unit;
-        lightness(color: Nodes.RGBA, value: Nodes.Unit): Nodes.RGBA;
-        lightness(color: Nodes.HSLA, value: Nodes.Unit): Nodes.RGBA;
-
-        /**
-         * Return a `RGBA` from the r,g,b,a channels.
-         */
-        rgba(rgba: Nodes.RGBA): Nodes.RGBA;
-        rgba(hsla: Nodes.HSLA): Nodes.RGBA;
-        rgba(hue: Nodes.Unit, saturation: Nodes.Unit, lightness: Nodes.Unit, alpha: Nodes.Unit): Nodes.RGBA;
-
-        /**
-         * Return a `RGBA` from the r,g,b channels.
-         */
-        rgb(rgba: Nodes.RGBA): Nodes.RGBA;
-        rgb(hsla: Nodes.HSLA): Nodes.RGBA;
-        rgb(hue: Nodes.Unit, saturation: Nodes.Unit, lightness: Nodes.Unit, alpha: Nodes.Unit): Nodes.RGBA;
-
-        /**
-         * Blend the `top` color over the `bottom`
-         */
-        blend(top: Nodes.RGBA): Nodes.RGBA;
-        blend(top: Nodes.RGBA, bottom: Nodes.RGBA): Nodes.RGBA;
-        blend(top: Nodes.RGBA, bottom: Nodes.HSLA): Nodes.RGBA;
-        blend(top: Nodes.HSLA): Nodes.RGBA;
-        blend(top: Nodes.HSLA, bottom: Nodes.RGBA): Nodes.RGBA;
-        blend(top: Nodes.HSLA, bottom: Nodes.HSLA): Nodes.RGBA;
-
-        /**
-         * Returns the relative luminance of the given `color`,
-         * see http://www.w3.org/TR/WCAG20/#relativeluminancedef
-         */
-        luminosity(rgba: Nodes.RGBA): Nodes.Unit;
-        luminosity(rgba: Nodes.HSLA): Nodes.Unit;
-
-        /**
-         * Returns the contrast ratio object between `top` and `bottom` colors,
-         * based on http://leaverou.github.io/contrast-ratio/
-         * and https://github.com/LeaVerou/contrast-ratio/blob/gh-pages/color.js#L108
-         */
-        contrast(top: Nodes.RGBA): Nodes.Object;
-        contrast(top: Nodes.RGBA, bottom: Nodes.RGBA): Nodes.Object;
-        contrast(top: Nodes.RGBA, bottom: Nodes.HSLA): Nodes.Object;
-        contrast(top: Nodes.HSLA): Nodes.Object;
-        contrast(top: Nodes.HSLA, bottom: Nodes.RGBA): Nodes.Object;
-        contrast(top: Nodes.HSLA, bottom: Nodes.HSLA): Nodes.Object;
-
-        /**
-         * Returns the transparent version of the given `top` color,
-         * as if it was blend over the given `bottom` color.
-         */
-        transparentify(top: Nodes.RGBA): Nodes.Object;
-        transparentify(top: Nodes.RGBA, bottom: Nodes.RGBA, alpha?: Nodes.Unit): Nodes.Object;
-        transparentify(top: Nodes.RGBA, bottom: Nodes.HSLA, alpha?: Nodes.Unit): Nodes.Object;
-        transparentify(top: Nodes.HSLA): Nodes.Object;
-        transparentify(top: Nodes.HSLA, bottom: Nodes.RGBA, alpha?: Nodes.Unit): Nodes.Object;
-        transparentify(top: Nodes.HSLA, bottom: Nodes.HSLA, alpha?: Nodes.Unit): Nodes.Object;
-
-        /**
-         * Convert a .json file into stylus variables or object.
-         * Nested variable object keys are joined with a dash (-)
-         *
-         * Given this sample media-queries.json file:
-         * {
-         *   "small": "screen and (max-width:400px)",
-         *   "tablet": {
-         *     "landscape": "screen and (min-width:600px) and (orientation:landscape)",
-         *     "portrait": "screen and (min-width:600px) and (orientation:portrait)"
-         *   }
-         * }
-         */
-        json(path: Nodes.String, local: Nodes.Boolean, namePrefix: Nodes.String): any;
-
-        /**
-         * Use the given `plugin`.
-         */
-        use(plugin: Nodes.String): void;
-        use(plugin: Nodes.String, options: any): void;
-
-        /**
-         * Unquote the given `string`.
-         */
-        unquote(str: Nodes.String): Nodes.Literal;
-
-        /**
-         * Like `unquote` but tries to convert the given `str` to a Stylus node.
-         */
-        convert(str: Nodes.String): Nodes.Node;
-
-        /**
-         * Assign `type` to the given `unit` or return `unit`'s type.
-         */
-        unit(unit: Nodes.Unit, type: Nodes.String): Nodes.Unit;
-
-        /**
-         * Lookup variable `name` or return Null.
-         */
-        lookup(name: Nodes.String): Nodes.Node;
-
-        /**
-         * Set a variable `name` on current scope.
-         */
-        define(name: Nodes.String, expr: Nodes.Expression): Nodes.Node;
-
-        /**
-         * Perform `op` on the `left` and `right` operands.
-         */
-        operate(op: Nodes.String, left: Nodes.Node, right: Nodes.Node): Nodes.Node;
-
-        /**
-         * Test if `val` matches the given `pattern`.
-         */
-        match(pattern: Nodes.String, val: Nodes.String): Nodes.Boolean;
-        match(pattern: Nodes.String, val: Nodes.Ident): Nodes.Boolean;
-
-        /**
-         * Returns substring of the given `val`.
-         */
-        substr(val: Nodes.String, start: Nodes.Number, length: Nodes.Number): Nodes.String;
-        substr(val: Nodes.Ident, start: Nodes.Number, length: Nodes.Number): Nodes.Ident;
-
-        /**
-         * Returns string with all matches of `pattern` replaced by `replacement` in given `val`
-         */
-        replace(pattern: Nodes.String, replacement: Nodes.String, val: Nodes.String): Nodes.String;
-        replace(pattern: Nodes.String, replacement: Nodes.String, val: Nodes.Ident): Nodes.Ident;
-
-        /**
-         * Splits the given `val` by `delim`
-         */
-        split(pattern: Nodes.String, val: Nodes.String): Nodes.Expression;
-        split(pattern: Nodes.String, val: Nodes.Ident): Nodes.Expression;
-
-        /**
-         * Return length of the given `expr`.
-         */
-        length(expr: Nodes.Expression): Nodes.Unit;
-
-        /**
-         * Inspect the given `expr`.
-         */
-        length(...expr: Nodes.Expression[]): Nodes.Null;
-
-        /**
-         * Throw an error with the given `msg`.
-         */
-        error(msg: Nodes.String): void;
-
-        /**
-         * Warn with the given `msg` prefixed by "Warning: ".
-         */
-        warn(msg: Nodes.String): Nodes.Null;
-
-        /**
-         * Output stack trace.
-         */
-        trace(): Nodes.Null;
-
-        /**
-         * Push the given args to `expr`.
-         */
-        push(expr: Nodes.Expression, ...nodes: Nodes.Node[]): Nodes.Unit;
-
-        /**
-         * Pop a value from `expr`.
-         */
-        pop(expr: Nodes.Expression): Nodes.Node;
-
-        /**
-         * Unshift the given args to `expr`.
-         */
-        unshift(expr: Nodes.Expression, ...nodes: Nodes.Node[]): Nodes.Unit;
-
-        /**
-         * Unshift the given args to `expr`..
-         */
-        prepend(expr: Nodes.Expression, ...nodes: Nodes.Node[]): Nodes.Unit;
-
-        /**
-         * Shift a value from `expr`.
-         */
-        shift(expr: Nodes.Expression): Nodes.Node;
-
-        /**
-         * Return a `Literal` with the given `fmt`, and variable number of arguments.
-         */
-        s(fmt: Nodes.String, ...nodes: Nodes.Node[]): Nodes.Literal;
-
-        /**
-         * Return a `Literal` `num` converted to the provided `base`, padded to `width`
-         * with zeroes (default width is 2)
-         */
-        "base-convert"(num: Nodes.Number, base: Nodes.Number, width: Nodes.Number): Nodes.Literal;
-
-        /**
-         * Return the opposites of the given `positions`.
-         */
-        "opposite-position"(positions: Nodes.Expression): Nodes.Expression;
-
-        /**
-         * Return the width and height of the given `img` path.
-         */
-        "image-size"(img: Nodes.String, ignoreErr: Nodes.Boolean): Nodes.Expression;
-
-        /**
-         * Return the tangent of the given `angle`.
-         */
-        tan(angle: Nodes.Unit): Nodes.Unit;
-
-        /**
-         * Return the tangent of the given `angle`.
-         */
-        math(n: Nodes.Unit, fn: Nodes.String): Nodes.Unit;
-
-        /**
-         * Return the opposites of the given `positions`.
-         */
-        "-math-prop"(prop: Nodes.String): Nodes.Unit;
-
-        /**
-         * Adjust HSL `color` `prop` by `amount`.
-         */
-        adjust(rgba: Nodes.RGBA, prop: Nodes.String, amount: Nodes.Unit): Nodes.RGBA;
-        adjust(hsla: Nodes.HSLA, prop: Nodes.String, amount: Nodes.Unit): Nodes.RGBA;
-
-        /**
-         * Return a clone of the given `expr`.
-         */
-        clone(expr: Nodes.Expression): Nodes.Expression;
-
-        /**
-         * Add property `name` with the given `expr` to the mixin-able block.
-         */
-        "add-property"(name: Nodes.String, expr: Nodes.Expression): Nodes.Property;
-
-        /**
-         * Merge the object `dest` with the given args.
-         */
-        merge(dest: Nodes.Object, ...objs: Nodes.Object[]): Nodes.Object;
-
-        /**
-         * Merge the object `dest` with the given args.
-         */
-        extend(dest: Nodes.Object, ...objs: Nodes.Object[]): Nodes.Object;
-
-        /**
-         * Return the current selector or compile `sel` selector.
-         */
-        selector(): string;
-        selector(sel: Nodes.String): string;
-
-        /**
-         * Prefix css classes in a block
-         */
-        "-prefix-classes"(prefix: Nodes.String, block: Nodes.Block): Nodes.Block;
-
-        /**
-         * Returns the @media string for the current block
-         */
-        "current-media"(): Nodes.String;
-
-        /**
-         * Return the separator of the given `list`.
-         */
-        "list-separator"(list: Nodes.Expression): Nodes.String;
-    }
-
-    export interface Utils {
-        /**
-         * Check if `path` looks absolute.
-         */
-        absolute(path: string): boolean;
-
-        /**
-         * Attempt to lookup `path` within `paths` from tail to head.
-         * Optionally a path to `ignore` may be passed.
-         */
-        lookup(path: string, paths: string, ignore: string, resolveURL: boolean): string;
-
-        /**
-         * Attempt to lookup `path` within `paths` from tail to head.
-         * Optionally a path to `ignore` may be passed.
-         */
-        lookupIndex(path: string, paths: string, filename: string): string[];
-
-        /**
-         * Like `utils.lookup` but uses `glob` to find files.
-         */
-        find(path: string, paths: string, ignore: string): string[];
-
-        /**
-         * Format the given `err` with the given `options`.
-         */
-        formatException(err: Error, options: ExceptionOptions): Error;
-
-        /**
-         * Assert that `node` is of the given `type`, or throw.
-         */
-        assertType(node: Nodes.Node, type: string, param: string): void;
-
-        /**
-         * Assert that `node` is a `String` or `Ident`.
-         */
-        assertString(node: Nodes.Node, param: string): void;
-
-        /**
-         * Assert that `node` is a `RGBA` or `HSLA`.
-         */
-        assertColor(node: Nodes.Node, param: string): void;
-
-        /**
-         * Assert that param `name` is given, aka the `node` is passed.
-         */
-        assertPresent(node: Nodes.Node, name: string): void;
-
-        /**
-         * Unwrap `expr`.
-         *
-         * Takes an expressions with length of 1
-         * such as `((1 2 3))` and unwraps it to `(1 2 3)`.
-         */
-        unwrap(expr: Nodes.Expression): Nodes.Node;
-
-        /**
-         * Coerce JavaScript values to their Stylus equivalents.
-         */
-        coerce(val: any): Nodes.Node;
-        coerce(val: any, raw: boolean): Nodes.Node;
-
-        /**
-         * Coerce a javascript `Array` to a Stylus `Expression`.
-         */
-        coerceArray(val: any): Nodes.Expression;
-        coerceArray(val: any, raw: boolean): Nodes.Expression;
-
-        /**
-         * Coerce a javascript object to a Stylus `Expression` or `Object`.
-         *
-         * For example `{ foo: 'bar', bar: 'baz' }` would become
-         * the expression `(foo 'bar') (bar 'baz')`. If `raw` is true
-         * given `obj` would become a Stylus hash object.
-         */
-        coerceObject(obj: any): Nodes.Expression;
-        coerceObject(obj: any, raw: boolean): Nodes.Expression;
-
-        /**
-         * Return param names for `fn`.
-         */
-        params(fn: Function): string[];
-
-        /**
-         * Merge object `b` with `a`.
-         */
-        merge(a: any, b: any): any;
-
-        /**
-         * Returns an array with unique values.
-         */
-        uniq(arr: any[]): any[];
-
-        /**
-         * Compile selector strings in `arr` from the bottom-up
-         * to produce the selector combinations. For example
-         * the following Stylus:
-         */
-        compileSelectors(arr: string[], leaveHidden: boolean): string[];
-    }
-
-    export interface UrlFunction {
-        (options: UrlOptions): LiteralFunction;
-
-        mimes: {
-            ".gif": string;
-            ".png": string;
-            ".jpg": string;
-            ".jpeg": string;
-            ".svg": string;
-            ".ttf": string;
-            ".eot": string;
-            ".woff": string;
-        };
-    }
-
-    export interface Middleware {
-        (req: any, res: any, next: Function): void;
-    }
-
-    //#endregion
-
-    //#region Internal Classes
-
-    export class Visitor {
-    }
-
-    export class Parser {
-    }
-
-    export class Evaluator {
-    }
-
-    export class Compiler {
-    }
-
-    export class Renderer implements NodeJS.EventEmitter {
-        options: RenderOptions;
-        str: string;
-        events: any;
-
-        constructor(str: string);
-        constructor(str: string, options: RenderOptions);
-
-        /**
-         * Parse and evaluate AST, then callback `fn(err, css, js)`.
-         */
-        render(callback: RenderCallback): void;
-
-        /**
-         * Parse and evaluate AST and return the result.
-         */
-        render(): string;
-
-        /**
-         * Get dependencies of the compiled file.
-         */
-        deps(filename: string): string[];
-
-        /**
-         * Set option `key` to `val`.
-         */
-        set(key: string, val: any): Renderer;
-
-        /**
-         * Get option `key`.
-         */
-        get(key: string): any;
-
-        /**
-         * Include the given `path` to the lookup paths array.
-         */
-        include(path: string): Renderer;
-
-        /**
-         * Use the given `fn`.
-         *
-         * This allows for plugins to alter the renderer in
-         * any way they wish, exposing paths etc.
-         */
-        use(fn: (renderer: Renderer) => any): Renderer;
-
-        /**
-         * Define function or global var with the given `name`. Optionally
-         * the function may accept full expressions, by setting `raw`
-         * to `true`.
-         */
-        define(name: string, fn: Function): Renderer;
-        define(name: string, node: Nodes.Node): Renderer;
-        define(name: string, val: any): Renderer;
-        define(name: string, fn: Function, raw: boolean): Renderer;
-        define(name: string, node: Nodes.Node, raw: boolean): Renderer;
-        define(name: string, val: any, raw: boolean): Renderer;
-
-        /**
-         * Import the given `file`.
-         */
-        import(file: string): Renderer;
-
-        //#region EventEmitter Members
-        addListener(event: string, listener: Function): this;
-        on(event: string, listener: Function): this;
-        once(event: string, listener: Function): this;
-        removeListener(event: string, listener: Function): this;
-        removeAllListeners(event?: string): this;
-        setMaxListeners(n: number): this;
-        getMaxListeners(): number;
-        listeners(event: string): Function[];
-        emit(event: string, ...args: any[]): boolean;
-        listenerCount(type: string): number;
-        //#endregion
-    }
-
-    //#endregion
-
-    //#region Nodes Classes
-
-    export module Nodes {
-
-        export class Node {
-            lineno: number;
-            column: number;
-            filename: string;
-
-            first: Node;
-            hash: string;
-            nodeName: string;
-
-            constructor();
-
-            /**
-             * Return a clone of this node.
-             */
-            clone(): Node;
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { lineno: number; column: number; filename: string };
-
-            /**
-             * Nodes by default evaluate to themselves.
-             */
-            eval(): Node;
-
-            /**
-             * Return true.
-             */
-            toBoolean(): Boolean;
-
-            /**
-             * Return the expression, or wrap this node in an expression.
-             */
-            toExpression(): Expression;
-
-            /**
-             * Return false if `op` is generally not coerced.
-             */
-            shouldCoerce(op: string): boolean;
-
-            /**
-             * Operate on `right` with the given `op`.
-             */
-            operate(op: string, right: Node): Node;
-
-            /**
-             *  Default coercion throws.
-             */
-            coerce(other: Node): Node;
-        }
-
-        export class Root extends Node {
-            nodes: Node[];
-
-            /**
-             * Push a `node` to this block.
-             */
-            push(node: Node): void;
-
-            /**
-             * Unshift a `node` to this block.
-             */
-            unshift(node: Node): void;
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { nodes: Node[]; lineno: number; column: number; filename: string };
-        }
-
-        export class String extends Node {
-            val: string;
-            string: string;
-            prefixed: boolean;
-            quote: string;
-
-            constructor(val: string);
-            constructor(val: string, quote: string);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { val: string; quote: string; lineno: number; column: number; filename: string };
-        }
-
-        export class Number extends Node {
-
-        }
-
-        export class Boolean extends Node {
-            val: boolean;
-            isTrue: boolean;
-            isFalse: boolean;
-
-            constructor();
-            constructor(val: boolean);
-
-            /**
-             * Negate the value.
-             */
-            negate(): Boolean;
-
-            /**
-             * Return 'Boolean'.
-             */
-            inspect(): Boolean;
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; val: boolean; lineno: number; column: number; filename: string };
-        }
-
-        export class Object extends Node {
-            vals: Dictionary<Node>;
-            length: number;
-
-            constructor();
-
-            /**
-             * Set `key` to `val`.
-             */
-            set(key: string, value: Node): Object;
-
-            /**
-             * Get `key`.
-             */
-            get(key: string): Node;
-
-            /**
-             * Has `key`?
-             */
-            has(key: string): boolean;
-
-            /**
-             * Convert object to string with properties.
-             */
-            toBlock(): string;
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; vals: Dictionary<Node>; lineno: number; column: number; filename: string };
-        }
-
-        export class Null extends Node {
-            isNull: boolean;
-
-            constructor();
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; lineno: number; column: number; filename: string };
-        }
-
-        export class Ident extends Node {
-            name: string;
-            string: string;
-            val: Node;
-            mixin: boolean;
-
-            isEmpty: boolean;
-
-            constructor(name: string, val: Node);
-            constructor(name: string, val: Node, mixin: boolean);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; name: string; val: Node; mixin: boolean; lineno: number; column: number; filename: string };
-        }
-
-        export class Literal extends Node {
-            val: string;
-            string: string;
-            prefixed: boolean;
-
-            constructor(str: string);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; string: string; val: string; prefixed: boolean; lineno: number; column: number; filename: string };
-        }
-
-        export class Unit extends Node {
-            val: number;
-            type: string;
-
-            constructor(val: number, type: string);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; val: number; type: string; lineno: number; column: number; filename: string };
-        }
-
-        export class RGBA extends Node {
-            r: number;
-            g: number;
-            b: number;
-            a: number;
-            rgba: RGBA;
-            hsla: HSLA;
-
-            constructor(r: number, g: number, b: number, a: number);
-
-            /**
-             * Return an `RGBA` without clamping values.
-             */
-            static withoutClamping(r: number, g: number, b: number, a: number): RGBA;
-
-            /**
-             * Return a `RGBA` from the given `hsla`.
-             */
-            static fromHSLA(hsla: HSLA): RGBA;
-
-            /**
-             * Add r,g,b,a to the current component values
-             */
-            add(r: number, g: number, b: number, a: number): RGBA;
-
-            /**
-             * Subtract r,g,b,a from the current component values
-             */
-            substract(r: number, g: number, b: number, a: number): RGBA;
-
-            /**
-             * Multiply rgb components by `n`.
-             */
-            multiply(n: number): RGBA;
-
-            /**
-             * Divide rgb components by `n`.
-             */
-            divide(n: number): RGBA;
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; r: number; g: number; b: number; a: number; lineno: number; column: number; filename: string };
-        }
-
-        export class HSLA extends Node {
-            h: number;
-            s: number;
-            l: number;
-            a: number;
-            hsla: HSLA;
-            rgba: RGBA;
-
-            constructor(h: number, s: number, l: number, a: number);
-
-            /**
-             * Return a `HSLA` from the given `hsla`.
-             */
-            static fromRGBA(rgba: RGBA): HSLA;
-
-            /**
-             * Add h,s,l to the current component values
-             */
-            add(h: number, s: number, l: number): HSLA;
-
-            /**
-             * Subtract h,s,l from the current component values
-             */
-            substract(h: number, s: number, l: number): HSLA;
-
-            /**
-             * Adjust lightness by `percent`.
-             */
-            adjustLightness(percent: number): HSLA;
-
-            /**
-             * djust hue by `deg`.
-             */
-            adjustHue(deg: number): HSLA;
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; h: number; s: number; l: number; a: number; lineno: number; column: number; filename: string };
-        }
-
-        export class Block extends Node {
-            nodes: Node[];
-            parent: Block;
-            node: Node;
-            scope: boolean;
-
-            hasProperties: boolean;
-            hasMedia: boolean;
-            isEmpty: boolean;
-
-            constructor(parent: Block);
-            constructor(parent: Block, node: Node);
-
-            /**
-             * Push a `node` to this block.
-             */
-            push(node: Node): void;
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; nodes: Node[]; scope: boolean; lineno: number; column: number; filename: string };
-        }
-
-        export class Group extends Node {
-            nodes: Node[];
-            block: Block;
-
-            hasOnlyPlaceholders: boolean;
-
-            constructor();
-
-            /**
-             * Push the given `selector` node.
-             */
-            push(node: Node): void;
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; nodes: Node[]; block: Block; lineno: number; column: number; filename: string };
-        }
-
-        export class Expression extends Node {
-            nodes: Node[];
-            isList: boolean;
-
-            isEmpty: boolean;
-            first: Node;
-
-            constructor(isList: boolean);
-
-            /**
-             * Push the given node.
-             */
-            push(node: Node): void;
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; nodes: Node[]; isList: boolean; lineno: number; column: number; filename: string };
-        }
-
-        export class Property extends Node {
-            segments: Node[];
-            expr: Expression;
-
-            constructor(segs: Node[], expr: Expression);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; segments: Node[]; name: string; expr?: Expression; literal?: Literal; lineno: number; column: number; filename: string };
-        }
-
-        export class Each extends Node {
-            val: string;
-            key: string;
-            expr: Expression;
-            block: Block;
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; val: string; key: string; expr: Expression; block: Block; lineno: number; column: number; filename: string };
-        }
-
-        export class If extends Node {
-            cond: Expression;
-            elses: Expression[];
-            block: Block;
-            negate: boolean;
-
-            constructor(cond: Expression, negate: boolean);
-            constructor(cond: Expression, block: Block);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; cond: Expression; elses: Expression[]; block: Block; negate: boolean; lineno: number; column: number; filename: string };
-        }
-
-        export class Call extends Node {
-            name: string;
-            args: Expression;
-
-            constructor(name: string, args: Expression);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; name: string; args: Expression; lineno: number; column: number; filename: string };
-        }
-
-        export class UnaryOp extends Node {
-            op: string;
-            expr: Expression;
-
-            constructor(op: string, expr: Expression);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; op: string; expr: Expression; lineno: number; column: number; filename: string };
-        }
-
-        export class BinOp extends Node {
-            op: string;
-            left: Expression;
-            right: Expression;
-
-            constructor(op: string, left: Expression, right: Expression);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; op: string; left: Expression; right: Expression; lineno: number; column: number; filename: string };
-        }
-
-        export class Ternary extends Node {
-            op: string;
-            trueExpr: Expression;
-            falseExpr: Expression;
-
-            constructor(op: string, trueExpr: Expression, falseExpr: Expression);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; op: string; trueExpr: Expression; falseExpr: Expression; lineno: number; column: number; filename: string };
-        }
-
-        export class Return extends Node {
-            expr: Expression;
-
-            constructor(expr: Expression);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; expr: Expression; lineno: number; column: number; filename: string };
-        }
-
-        export class Media extends Node {
-            val: string;
-
-            constructor(val: string);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; val: string; lineno: number; column: number; filename: string };
-        }
-
-        export class QueryList extends Node {
-            nodes: Node[];
-
-            constructor();
-
-            /**
-             * Push the given `node`.
-             */
-            push(node: Node): void;
-
-            /**
-             * Merges this query list with the `other`.
-             */
-            merge(other: MediaQueryList): MediaQueryList;
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; nodes: Node[]; lineno: number; column: number; filename: string };
-        }
-
-        export class Query extends Node {
-            nodes: QueryExpr[];
-            type: string;
-            predicate: string;
-
-            resolvedType: string;
-            resolvedPredicate: string;
-
-            constructor();
-
-            /**
-             * Push the given `expr`.
-             */
-            push(expr: QueryExpr): void;
-
-            /**
-             * Merges this query with the `other`.
-             */
-            merge(other: Query): Query;
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; nodes: QueryExpr[]; predicate: string; type: string; lineno: number; column: number; filename: string };
-        }
-
-        export class QueryExpr extends Node {
-            segments: Node[];
-            expr: Expression;
-
-            constructor(segs: Node[]);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; segments: Node[]; lineno: number; column: number; filename: string };
-        }
-
-        export class Params extends Node {
-            nodes: Node[];
-
-            length: number;
-
-            /**
-             * Push the given `node`.
-             */
-            push(node: Node): void;
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; nodes: Node[]; lineno: number; column: number; filename: string };
-        }
-
-        export class Comment extends Node {
-            str: string;
-            suppress: boolean;
-            inline: boolean;
-
-            constructor(str: string, suppress: boolean, inline: boolean);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; str: string; suppress: boolean; inline: boolean; lineno: number; column: number; filename: string };
-        }
-
-        export class Keyframes extends Node {
-            segments: Node[];
-            prefix: string;
-
-            constructor(segs: Node[]);
-            constructor(segs: Node[], prefix: string);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; segments: Node[]; prefix: string; block: Block; lineno: number; column: number; filename: string };
-        }
-
-        export class Member extends Node {
-            left: Node;
-            right: Node;
-
-            constructor(left: Node, right: Node);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; left: Node; right: Node; val?: string; lineno: number; column: number; filename: string };
-        }
-
-        export class Charset extends Node {
-            val: string;
-
-            constructor(val: string);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; val: string; lineno: number; column: number; filename: string };
-        }
-
-        export class Namespace extends Node {
-            val: string;
-            prefix: string;
-
-            constructor(val: string, prefix: string);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; val: string; prefix: string; lineno: number; column: number; filename: string };
-        }
-
-        export class Import extends Node {
-            path: Expression;
-            once: boolean;
-
-            constructor(path: Expression);
-            constructor(path: Expression, once: boolean);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; path: Expression; lineno: number; column: number; filename: string };
-        }
-
-        export class Extend extends Node {
-            selectors: Selector[];
-
-            constructor(selectors: Selector[]);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; selectors: Selector[]; lineno: number; column: number; filename: string };
-        }
-
-        export class Function extends Node {
-            name: string;
-            params: Params;
-            body: Block;
-
-            constructor(name: string, params: Params, body: Block);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; name: string; params: Params; body: Block; lineno: number; column: number; filename: string };
-        }
-
-        export class Selector extends Node {
-            inherits: boolean;
-            segments: Node[];
-
-            constructor(segs: Node[]);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; segments: Node[]; inherits: boolean; val: string; lineno: number; column: number; filename: string };
-        }
-
-        export class Arguments extends Expression {
-            map: Dictionary<Node>;
-
-            constructor();
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; map: Dictionary<Node>; isList: boolean; preserve: boolean; nodes: Node[]; lineno: number; column: number; filename: string };
-        }
-
-        export class Atblock extends Node {
-            block: Block;
-            nodes: Node[];
-
-            constructor();
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; block: Block; lineno: number; column: number; filename: string };
-        }
-
-        export class Atrule extends Node {
-            type: string;
-
-            hasOnlyProperties: boolean;
-
-            constructor(type: string);
-
-            /**
-             * Return a JSON representation of this node.
-             */
-            toJSON(): { __type: string; type: string; segments: Node[]; block?: Block; lineno: number; column: number; filename: string };
-        }
-    }
-
-    //#endregion
-
-    //#region Internal Interfaces
-
-    export interface Dictionary<T> {
-        [key: string]: T;
-    }
-
-    export interface RenderOptions {
-        globals?: Dictionary<any>;
-        functions?: Dictionary<any>;
-        imports?: string[];
-        paths?: string[];
-        filename?: string;
-        Evaluator?: typeof Evaluator;
-    }
-
-    export interface RenderCallback {
-        (err: Error, css: string, js: string): void;
-    }
-
-    export interface UrlOptions {
-        limit?: string;
-        path: string;
-    }
-
-    export interface LiteralFunction {
-        (url: string): Nodes.Literal;
-        raw: boolean;
-    }
-
-    export interface ExceptionOptions {
-        filename: string;
-        context: number;
-        lineno: number;
-        column: number;
-        input: string;
-    }
-
-    //#endregion
-}
-
-declare module "stylus" {
-    var stylus: Stylus.Static;
-    export = stylus;
-}
diff --git a/stylus/tsconfig.json b/stylus/tsconfig.json
new file mode 100644
index 0000000000..aedb91df32
--- /dev/null
+++ b/stylus/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "stylus-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/succinct/index.d.ts b/succinct/index.d.ts
new file mode 100644
index 0000000000..33272292f2
--- /dev/null
+++ b/succinct/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for jQuery Succinct v1.1.0
+// Project: http://mikeking.io/succinct/
+// Definitions by: Matt Brooks <https://github.com/EnableSoftware>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace JQuerySuccinct {
+    interface Options {
+        size?: number;
+        omission?: string;
+        ignore?: boolean;
+    }
+}
+
+interface JQuery {
+    succinct(settings?: JQuerySuccinct.Options): JQuery;
+}
diff --git a/succinct/succinct-tests.ts b/succinct/succinct-tests.ts
index 7b81e5f85b..11665fe88d 100644
--- a/succinct/succinct-tests.ts
+++ b/succinct/succinct-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="succinct.d.ts" />
+
 
 // Call with no arguments (accepting defaults)
 $(".truncate").succinct();
diff --git a/succinct/succinct.d.ts b/succinct/succinct.d.ts
deleted file mode 100644
index 334e18f869..0000000000
--- a/succinct/succinct.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Type definitions for jQuery Succinct v1.1.0
-// Project: http://mikeking.io/succinct/
-// Definitions by: Matt Brooks <https://github.com/EnableSoftware>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace JQuerySuccinct {
-    interface Options {
-        size?: number;
-        omission?: string;
-        ignore?: boolean;
-    }
-}
-
-interface JQuery {
-    succinct(settings?: JQuerySuccinct.Options): JQuery;
-}
diff --git a/succinct/tsconfig.json b/succinct/tsconfig.json
new file mode 100644
index 0000000000..752e511755
--- /dev/null
+++ b/succinct/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "succinct-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sugar/sugar.d.ts b/sugar/index.d.ts
similarity index 100%
rename from sugar/sugar.d.ts
rename to sugar/index.d.ts
diff --git a/sugar/tsconfig.json b/sugar/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/sugar/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/superagent/index.d.ts b/superagent/index.d.ts
new file mode 100644
index 0000000000..7ba86e8fe6
--- /dev/null
+++ b/superagent/index.d.ts
@@ -0,0 +1,113 @@
+// Type definitions for SuperAgent v1.4.0
+// Project: https://github.com/visionmedia/superagent
+// Definitions by: Alex Varju <https://github.com/varju/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import stream = require('stream');
+
+type CallbackHandler = (err: any, res: request.Response) => void;
+
+declare var request: request.SuperAgentStatic;
+
+declare namespace request {
+    interface SuperAgentStatic extends SuperAgent<SuperAgentRequest> {
+        (url: string): SuperAgentRequest;
+        (method: string, url: string): SuperAgentRequest;
+
+        agent(): SuperAgent<SuperAgentRequest>;
+    }
+
+    interface SuperAgent<Req extends Request<any>> extends stream.Stream {
+        get(url: string, callback?: CallbackHandler): Req;
+        post(url: string, callback?: CallbackHandler): Req;
+        put(url: string, callback?: CallbackHandler): Req;
+        head(url: string, callback?: CallbackHandler): Req;
+        del(url: string, callback?: CallbackHandler): Req;
+        delete(url: string, callback?: CallbackHandler): Req;
+        options(url: string, callback?: CallbackHandler): Req;
+        trace(url: string, callback?: CallbackHandler): Req;
+        copy(url: string, callback?: CallbackHandler): Req;
+        lock(url: string, callback?: CallbackHandler): Req;
+        mkcol(url: string, callback?: CallbackHandler): Req;
+        move(url: string, callback?: CallbackHandler): Req;
+        purge(url: string, callback?: CallbackHandler): Req;
+        propfind(url: string, callback?: CallbackHandler): Req;
+        proppatch(url: string, callback?: CallbackHandler): Req;
+        unlock(url: string, callback?: CallbackHandler): Req;
+        report(url: string, callback?: CallbackHandler): Req;
+        mkactivity(url: string, callback?: CallbackHandler): Req;
+        checkout(url: string, callback?: CallbackHandler): Req;
+        merge(url: string, callback?: CallbackHandler): Req;
+        // m-search(url: string, callback?: CallbackHandler): Req;
+        notify(url: string, callback?: CallbackHandler): Req;
+        subscribe(url: string, callback?: CallbackHandler): Req;
+        unsubscribe(url: string, callback?: CallbackHandler): Req;
+        patch(url: string, callback?: CallbackHandler): Req;
+        search(url: string, callback?: CallbackHandler): Req;
+        connect(url: string, callback?: CallbackHandler): Req;
+
+        parse(fn: Function): Req;
+        saveCookies(res: Response): void;
+        attachCookies(req: Req): void;
+    }
+
+    interface Response extends NodeJS.ReadableStream {
+        text: string;
+        body: any;
+        files: any;
+        header: any;
+        type: string;
+        charset: string;
+        status: number;
+        statusType: number;
+        info: boolean;
+        ok: boolean;
+        redirect: boolean;
+        clientError: boolean;
+        serverError: boolean;
+        error: Error;
+        accepted: boolean;
+        noContent: boolean;
+        badRequest: boolean;
+        unauthorized: boolean;
+        notAcceptable: boolean;
+        notFound: boolean;
+        forbidden: boolean;
+        get(header: string): string;
+    }
+
+    interface Request<Req extends Request<any>> /* extends NodeJS.WritableStream */ {
+        abort(): void;
+        accept(type: string): Req;
+        attach(field: string, file: string, filename?: string): Req;
+        auth(user: string, name: string): Req;
+        buffer(val: boolean): Req;
+        clearTimeout(): Req;
+        end(callback?: CallbackHandler): Req;
+        field(name: string, val: string): Req;
+        get(field: string): string;
+        on(name: string, handler: Function): Req;
+        on(name: 'error', handler: (err: any) => void): Req;
+        part(): Req;
+        pipe(stream: NodeJS.WritableStream, options?: Object): stream.Writable;
+        query(val: Object): Req;
+        redirects(n: number): Req;
+        send(data: string): Req;
+        send(data: Object): Req;
+        send(): Req;
+        set(field: string, val: string): Req;
+        set(field: Object): Req;
+        timeout(ms: number): Req;
+        type(val: string): Req;
+        use(fn: Function): Req;
+        withCredentials(): Req;
+        write(data: string, encoding?: string): Req;
+        write(data: Buffer, encoding?: string): Req;
+    }
+    interface SuperAgentRequest extends Request<Request<Request<Request<any>>>> { }
+
+}
+
+export = request;
diff --git a/superagent/superagent-tests.ts b/superagent/superagent-tests.ts
index 58b6840440..41be044d88 100644
--- a/superagent/superagent-tests.ts
+++ b/superagent/superagent-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="superagent.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 // via: http://visionmedia.github.io/superagent/
 
diff --git a/superagent/superagent.d.ts b/superagent/superagent.d.ts
deleted file mode 100644
index fa0ac1827f..0000000000
--- a/superagent/superagent.d.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-// Type definitions for SuperAgent v1.4.0
-// Project: https://github.com/visionmedia/superagent
-// Definitions by: Alex Varju <https://github.com/varju/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path='../node/node.d.ts' />
-
-declare module "superagent" {
-  import stream = require('stream');
-
-  type CallbackHandler = (err: any, res: request.Response) => void;
-
-  var request: request.SuperAgentStatic;
-
-  namespace request {
-    interface SuperAgentStatic extends SuperAgent<SuperAgentRequest> {
-      (url: string): SuperAgentRequest;
-      (method: string, url: string): SuperAgentRequest;
-
-      agent(): SuperAgent<SuperAgentRequest>;
-    }
-
-    interface SuperAgent<Req extends Request<any>> extends stream.Stream {
-      get(url: string, callback?: CallbackHandler): Req;
-      post(url: string, callback?: CallbackHandler): Req;
-      put(url: string, callback?: CallbackHandler): Req;
-      head(url: string, callback?: CallbackHandler): Req;
-      del(url: string, callback?: CallbackHandler): Req;
-      delete(url: string, callback?: CallbackHandler): Req;
-      options(url: string, callback?: CallbackHandler): Req;
-      trace(url: string, callback?: CallbackHandler): Req;
-      copy(url: string, callback?: CallbackHandler): Req;
-      lock(url: string, callback?: CallbackHandler): Req;
-      mkcol(url: string, callback?: CallbackHandler): Req;
-      move(url: string, callback?: CallbackHandler): Req;
-      purge(url: string, callback?: CallbackHandler): Req;
-      propfind(url: string, callback?: CallbackHandler): Req;
-      proppatch(url: string, callback?: CallbackHandler): Req;
-      unlock(url: string, callback?: CallbackHandler): Req;
-      report(url: string, callback?: CallbackHandler): Req;
-      mkactivity(url: string, callback?: CallbackHandler): Req;
-      checkout(url: string, callback?: CallbackHandler): Req;
-      merge(url: string, callback?: CallbackHandler): Req;
-      // m-search(url: string, callback?: CallbackHandler): Req;
-      notify(url: string, callback?: CallbackHandler): Req;
-      subscribe(url: string, callback?: CallbackHandler): Req;
-      unsubscribe(url: string, callback?: CallbackHandler): Req;
-      patch(url: string, callback?: CallbackHandler): Req;
-      search(url: string, callback?: CallbackHandler): Req;
-      connect(url: string, callback?: CallbackHandler): Req;
-
-      parse(fn: Function): Req;
-      saveCookies(res: Response): void;
-      attachCookies(req: Req): void;
-    }
-
-    interface Response extends NodeJS.ReadableStream {
-      text: string;
-      body: any;
-      files: any;
-      header: any;
-      type: string;
-      charset: string;
-      status: number;
-      statusType: number;
-      info: boolean;
-      ok: boolean;
-      redirect: boolean;
-      clientError: boolean;
-      serverError: boolean;
-      error: Error;
-      accepted: boolean;
-      noContent: boolean;
-      badRequest: boolean;
-      unauthorized: boolean;
-      notAcceptable: boolean;
-      notFound: boolean;
-      forbidden: boolean;
-      get(header: string): string;
-    }
-
-    interface Request<Req extends Request<any>> /* extends NodeJS.WritableStream */ {
-      abort(): void;
-      accept(type: string): Req;
-      attach(field: string, file: string, filename?: string): Req;
-      auth(user: string, name: string): Req;
-      buffer(val: boolean): Req;
-      clearTimeout(): Req;
-      end(callback?: CallbackHandler): Req;
-      field(name: string, val: string): Req;
-      get(field: string): string;
-      on(name: string, handler: Function): Req;
-      on(name: 'error', handler: (err: any) => void): Req;
-      part(): Req;
-      pipe(stream: NodeJS.WritableStream, options?: Object): stream.Writable;
-      query(val: Object): Req;
-      redirects(n: number): Req;
-      send(data: string): Req;
-      send(data: Object): Req;
-      send(): Req;
-      set(field: string, val: string): Req;
-      set(field: Object): Req;
-      timeout(ms: number): Req;
-      type(val: string): Req;
-      use(fn: Function): Req;
-      withCredentials(): Req;
-      write(data: string, encoding?: string): Req;
-      write(data: Buffer, encoding?: string): Req;
-    }
-    interface SuperAgentRequest extends Request<Request<Request<Request<any>>>> {}
-
-  }
-
-  export = request;
-}
-
diff --git a/superagent/tsconfig.json b/superagent/tsconfig.json
new file mode 100644
index 0000000000..aee5103ded
--- /dev/null
+++ b/superagent/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "superagent-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/supertest-as-promised/index.d.ts b/supertest-as-promised/index.d.ts
new file mode 100644
index 0000000000..81fc0857df
--- /dev/null
+++ b/supertest-as-promised/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for SuperTest as Promised v2.0.2
+// Project: https://github.com/WhoopInc/supertest-as-promised
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="bluebird" />
+
+
+// Mostly copy-pasted from supertest.d.ts
+
+import * as superagent from 'superagent';
+import * as PromiseBluebird from 'bluebird';
+
+declare function supertest(app: any): supertest.SuperTest;
+
+declare namespace supertest {
+    function agent(app?: any): supertest.SuperTest;
+
+    interface SuperTest extends superagent.SuperAgent<Test> {
+    }
+
+    interface Promise<T> extends PromiseBluebird<T> {
+        toPromise(): PromiseBluebird<T>;
+    }
+
+    interface Test extends superagent.Request<Test> {
+        url: string;
+        serverAddress(app: any, path: string): string;
+        expect(status: number): Promise<supertest.Response>;
+        expect(status: number, body: string): Promise<supertest.Response>;
+        expect(body: string): Promise<supertest.Response>;
+        expect(body: RegExp): Promise<supertest.Response>;
+        expect(body: Object): Promise<supertest.Response>;
+        expect(field: string, val: string): Promise<supertest.Response>;
+        expect(field: string, val: RegExp): Promise<supertest.Response>;
+        expect(checker: (res: Response) => any): Promise<supertest.Response>;
+    }
+
+    interface Response extends superagent.Response {
+    }
+}
+
+export = supertest;
diff --git a/supertest-as-promised/supertest-as-promised-tests.ts b/supertest-as-promised/supertest-as-promised-tests.ts
index 2b79abd07f..d6eb5771c9 100644
--- a/supertest-as-promised/supertest-as-promised-tests.ts
+++ b/supertest-as-promised/supertest-as-promised-tests.ts
@@ -1,6 +1,5 @@
-/// <reference path="supertest-as-promised.d.ts" />
-/// <reference path="../express/express.d.ts" />
-/// <reference path="../jasmine/jasmine.d.ts" />
+
+/// <reference types="jasmine" />
 
 import * as request from 'supertest-as-promised';
 import * as express from 'express';
diff --git a/supertest-as-promised/supertest-as-promised.d.ts b/supertest-as-promised/supertest-as-promised.d.ts
deleted file mode 100644
index a7256e5bbf..0000000000
--- a/supertest-as-promised/supertest-as-promised.d.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-// Type definitions for SuperTest as Promised v2.0.2
-// Project: https://github.com/WhoopInc/supertest-as-promised
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path='../superagent/superagent.d.ts' />
-/// <reference path="../bluebird/bluebird.d.ts" />
-
-declare module "supertest-as-promised" {
-  // Mostly copy-pasted from supertest.d.ts
-
-  import * as superagent from 'superagent';
-  import * as PromiseBluebird from 'bluebird';
-
-  function supertest(app: any): supertest.SuperTest;
-
-  namespace supertest {
-    function agent(app?: any): supertest.SuperTest;
-
-    interface SuperTest extends superagent.SuperAgent<Test> {
-    }
-
-    interface Promise<T> extends PromiseBluebird<T> {
-      toPromise(): PromiseBluebird<T>;
-    }
-
-    interface Test extends superagent.Request<Test> {
-      url: string;
-      serverAddress(app: any, path: string): string;
-      expect(status: number): Promise<supertest.Response>;
-      expect(status: number, body: string): Promise<supertest.Response>;
-      expect(body: string): Promise<supertest.Response>;
-      expect(body: RegExp): Promise<supertest.Response>;
-      expect(body: Object): Promise<supertest.Response>;
-      expect(field: string, val: string): Promise<supertest.Response>;
-      expect(field: string, val: RegExp): Promise<supertest.Response>;
-      expect(checker: (res: Response) => any): Promise<supertest.Response>;
-    }
-
-    interface Response extends superagent.Response {
-    }
-  }
-
-  export = supertest;
-}
diff --git a/supertest-as-promised/tsconfig.json b/supertest-as-promised/tsconfig.json
new file mode 100644
index 0000000000..216fa7e0cc
--- /dev/null
+++ b/supertest-as-promised/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "supertest-as-promised-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/supertest/index.d.ts b/supertest/index.d.ts
new file mode 100644
index 0000000000..7f1f9f5e79
--- /dev/null
+++ b/supertest/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for SuperTest v1.1.0
+// Project: https://github.com/visionmedia/supertest
+// Definitions by: Alex Varju <https://github.com/varju/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+import superagent = require('superagent');
+
+type CallbackHandler = (err: any, res: supertest.Response) => void;
+
+declare function supertest(app: any): supertest.SuperTest;
+
+declare namespace supertest {
+    function agent(app?: any): supertest.SuperTest;
+
+    interface SuperTest extends superagent.SuperAgent<Test> {
+    }
+
+    interface Test extends superagent.Request<Test> {
+        url: string;
+        serverAddress(app: any, path: string): string;
+        expect(status: number, callback?: CallbackHandler): Test;
+        expect(status: number, body: string, callback?: CallbackHandler): Test;
+        expect(body: string, callback?: CallbackHandler): Test;
+        expect(body: RegExp, callback?: CallbackHandler): Test;
+        expect(body: Object, callback?: CallbackHandler): Test;
+        expect(field: string, val: string, callback?: CallbackHandler): Test;
+        expect(field: string, val: RegExp, callback?: CallbackHandler): Test;
+        expect(checker: (res: Response) => any): Test;
+        end(callback?: CallbackHandler): Test;
+    }
+
+    interface Response extends superagent.Response {
+    }
+}
+
+export = supertest;
diff --git a/supertest/supertest-tests.ts b/supertest/supertest-tests.ts
index 5e0de8ad8c..69892341d3 100644
--- a/supertest/supertest-tests.ts
+++ b/supertest/supertest-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="supertest.d.ts" />
-/// <reference path="../express/express.d.ts" />
 
 import * as supertest from 'supertest';
 import * as express from 'express';
diff --git a/supertest/supertest.d.ts b/supertest/supertest.d.ts
deleted file mode 100644
index 430c9f15c5..0000000000
--- a/supertest/supertest.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// Type definitions for SuperTest v1.1.0
-// Project: https://github.com/visionmedia/supertest
-// Definitions by: Alex Varju <https://github.com/varju/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path='../superagent/superagent.d.ts' />
-
-declare module "supertest" {
-  import superagent = require('superagent');
-
-  type CallbackHandler = (err: any, res: supertest.Response) => void;
-
-  function supertest(app: any): supertest.SuperTest;
-
-  namespace supertest {
-    function agent(app?: any): supertest.SuperTest;
-
-    interface SuperTest extends superagent.SuperAgent<Test> {
-    }
-
-    interface Test extends superagent.Request<Test> {
-      url: string;
-      serverAddress(app: any, path: string): string;
-      expect(status: number, callback?: CallbackHandler): Test;
-      expect(status: number, body: string, callback?: CallbackHandler): Test;
-      expect(body: string, callback?: CallbackHandler): Test;
-      expect(body: RegExp, callback?: CallbackHandler): Test;
-      expect(body: Object, callback?: CallbackHandler): Test;
-      expect(field: string, val: string, callback?: CallbackHandler): Test;
-      expect(field: string, val: RegExp, callback?: CallbackHandler): Test;
-      expect(checker: (res: Response) => any): Test;
-      end(callback?: CallbackHandler): Test;
-    }
-
-    interface Response extends superagent.Response {
-    }
-  }
-
-  export = supertest;
-}
diff --git a/supertest/tsconfig.json b/supertest/tsconfig.json
new file mode 100644
index 0000000000..33f4574b8f
--- /dev/null
+++ b/supertest/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "supertest-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/survey-knockout/index.d.ts b/survey-knockout/index.d.ts
new file mode 100644
index 0000000000..6c3e95cbdc
--- /dev/null
+++ b/survey-knockout/index.d.ts
@@ -0,0 +1,1087 @@
+// Type definitions for Survey JavaScript library v0.9.3
+// Project: http://surveyjs.org/
+// Definitions by: Andrew Telnov <https://github.com/andrewtelnov/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module Survey {
+    interface HashTable<T> {
+        [key: string]: T;
+    }
+    interface ISurvey {
+        getValue(name: string): any;
+        setValue(name: string, newValue: any): any;
+        getComment(name: string): string;
+        setComment(name: string, newValue: string): any;
+        pageVisibilityChanged(page: IPage, newValue: boolean): any;
+        questionVisibilityChanged(question: IQuestion, newValue: boolean): any;
+        questionAdded(question: IQuestion, index: number): any;
+        questionRemoved(question: IQuestion): any;
+        validateQuestion(name: string): SurveyError;
+        isDesignMode: boolean;
+    }
+    interface IQuestion {
+        name: string;
+        visible: boolean;
+        hasTitle: boolean;
+        setVisibleIndex(value: number): any;
+        onSurveyValueChanged(newValue: any): any;
+    }
+    interface IPage {
+        visible: boolean;
+    }
+    class ItemValue {
+        static Separator: string;
+        static setData(items: Array<ItemValue>, values: Array<any>): void;
+        static getData(items: Array<ItemValue>): any;
+        private itemValue;
+        private itemText;
+        constructor(value: any, text?: string);
+        getType(): string;
+        value: any;
+        hasText: boolean;
+        text: string;
+    }
+    class Base {
+        getType(): string;
+    }
+    class SurveyError {
+        getText(): string;
+    }
+    class Event<T extends Function, Options> {
+        private callbacks;
+        isEmpty: boolean;
+        fire(sender: any, options: Options): void;
+        add(func: T): void;
+        remove(func: T): void;
+    }
+}
+
+declare module Survey {
+    class dxSurveyService {
+        static serviceUrl: string;
+        constructor();
+        loadSurvey(surveyId: string, onLoad: (success: boolean, result: string, response: any) => void): void;
+        sendResult(postId: string, result: JSON, onSendResult: (success: boolean, response: any) => void, clientId?: string, isPartialCompleted?: boolean): void;
+        getResult(resultId: string, name: string, onGetResult: (success: boolean, data: any, dataList: Array<any>, response: any) => void): void;
+        isCompleted(resultId: string, clientId: string, onIsCompleted: (success: boolean, result: string, response: any) => void): void;
+    }
+}
+
+declare module Survey {
+    var surveyLocalization: {
+        currentLocale: string;
+        locales: {};
+        getString: (strName: string) => any;
+        getLocales: () => string[];
+    };
+    var surveyStrings: {
+        pagePrevText: string;
+        pageNextText: string;
+        completeText: string;
+        otherItemText: string;
+        progressText: string;
+        optionsCaption: string;
+        requiredError: string;
+        numericError: string;
+        textMinLength: string;
+        minSelectError: string;
+        maxSelectError: string;
+        numericMinMax: string;
+        numericMin: string;
+        numericMax: string;
+        invalidEmail: string;
+    };
+}
+
+
+
+declare module Survey {
+    class AnswerRequiredError extends SurveyError {
+        constructor();
+        getText(): string;
+    }
+    class RequreNumericError extends SurveyError {
+        constructor();
+        getText(): string;
+    }
+    class CustomError extends SurveyError {
+        private text;
+        constructor(text: string);
+        getText(): string;
+    }
+}
+
+
+declare module Survey {
+    class JsonObjectProperty {
+        name: string;
+        private typeValue;
+        private choicesValue;
+        private choicesfunc;
+        className: string;
+        classNamePart: string;
+        baseClassName: string;
+        defaultValue: any;
+        onGetValue: (obj: any) => any;
+        onSetValue: (obj: any, value: any, jsonConv: JsonObject) => any;
+        constructor(name: string);
+        type: string;
+        hasToUseGetValue: (obj: any) => any;
+        isDefaultValue(value: any): boolean;
+        getValue(obj: any): any;
+        hasToUseSetValue: (obj: any, value: any, jsonConv: JsonObject) => any;
+        setValue(obj: any, value: any, jsonConv: JsonObject): void;
+        getObjType(objType: string): string;
+        getClassName(className: string): string;
+        choices: Array<any>;
+        setChoices(value: Array<any>, valueFunc: () => Array<any>): void;
+    }
+    class JsonMetadataClass {
+        name: string;
+        creator: () => any;
+        parentName: string;
+        static requiredSymbol: string;
+        static typeSymbol: string;
+        properties: Array<JsonObjectProperty>;
+        requiredProperties: Array<string>;
+        constructor(name: string, propertiesNames: Array<string>, creator?: () => any, parentName?: string);
+        find(name: string): JsonObjectProperty;
+        private getPropertyName(propertyName);
+    }
+    class JsonMetadata {
+        private classes;
+        private childrenClasses;
+        private classProperties;
+        private classRequiredProperties;
+        addClass(name: string, propertiesNames: Array<string>, creator?: () => any, parentName?: string): JsonMetadataClass;
+        overrideClassCreatore(name: string, creator: () => any): void;
+        setPropertyValues(name: string, propertyName: string, propertyClassName: string, defaultValue?: any, onGetValue?: (obj: any) => any, onSetValue?: (obj: any, value: any, jsonConv: JsonObject) => any): void;
+        setPropertyChoices(name: string, propertyName: string, choices: Array<any>, choicesFunc?: () => Array<any>): void;
+        setPropertyClassInfo(name: string, propertyName: string, baseClassName: string, classNamePart?: string): void;
+        getProperties(name: string): Array<JsonObjectProperty>;
+        createClass(name: string): any;
+        getChildrenClasses(name: string, canBeCreated?: boolean): Array<JsonMetadataClass>;
+        getRequiredProperties(name: string): Array<string>;
+        private fillChildrenClasses(name, canBeCreated, result);
+        private findClass(name);
+        private findProperty(name, propertyName);
+        private fillProperties(name, list);
+        private addProperty(property, list, endIndex);
+        private fillRequiredProperties(name, list);
+    }
+    class JsonError {
+        type: string;
+        message: string;
+        description: string;
+        at: Number;
+        constructor(type: string, message: string);
+        getFullDescription(): string;
+    }
+    class JsonUnknownPropertyError extends JsonError {
+        propertyName: string;
+        className: string;
+        constructor(propertyName: string, className: string);
+    }
+    class JsonMissingTypeErrorBase extends JsonError {
+        baseClassName: string;
+        type: string;
+        message: string;
+        constructor(baseClassName: string, type: string, message: string);
+    }
+    class JsonMissingTypeError extends JsonMissingTypeErrorBase {
+        propertyName: string;
+        baseClassName: string;
+        constructor(propertyName: string, baseClassName: string);
+    }
+    class JsonIncorrectTypeError extends JsonMissingTypeErrorBase {
+        propertyName: string;
+        baseClassName: string;
+        constructor(propertyName: string, baseClassName: string);
+    }
+    class JsonRequiredPropertyError extends JsonError {
+        propertyName: string;
+        className: string;
+        constructor(propertyName: string, className: string);
+    }
+    class JsonObject {
+        private static typePropertyName;
+        private static positionPropertyName;
+        private static metaDataValue;
+        static metaData: JsonMetadata;
+        errors: JsonError[];
+        toJsonObject(obj: any): any;
+        toObject(jsonObj: any, obj: any): void;
+        protected toJsonObjectCore(obj: any, property: JsonObjectProperty): any;
+        protected valueToJson(obj: any, result: any, property: JsonObjectProperty): void;
+        protected valueToObj(value: any, obj: any, key: any, property: JsonObjectProperty): void;
+        private isValueArray(value);
+        private createNewObj(value, property);
+        private checkNewObjectOnErrors(newObj, value, property, className);
+        private addNewError(error, jsonObj);
+        private valueToArray(value, obj, key, property);
+        private findProperty(properties, key);
+    }
+}
+
+
+
+declare module Survey {
+    class QuestionBase extends Base implements IQuestion {
+        name: string;
+        protected data: ISurvey;
+        private visibleValue;
+        private visibleIndexValue;
+        width: string;
+        visibilityChangedCallback: () => void;
+        visibleIndexChangedCallback: () => void;
+        constructor(name: string);
+        visible: boolean;
+        visibleIndex: number;
+        hasErrors(): boolean;
+        hasTitle: boolean;
+        hasComment: boolean;
+        setData(newValue: ISurvey): void;
+        protected fireCallback(callback: () => void): void;
+        protected onSetData(): void;
+        protected onCreating(): void;
+        onSurveyValueChanged(newValue: any): void;
+        setVisibleIndex(value: number): void;
+    }
+}
+
+
+
+declare module Survey {
+    class QuestionFactory {
+        static Instance: QuestionFactory;
+        static DefaultChoices: (string | {
+            value: number;
+            text: string;
+        })[];
+        private creatorHash;
+        registerQuestion(questionType: string, questionCreator: (name: string) => QuestionBase): void;
+        getAllTypes(): Array<string>;
+        createQuestion(questionType: string, name: string): QuestionBase;
+    }
+}
+
+
+
+
+declare module Survey {
+    class PageModel extends Base implements IPage {
+        name: string;
+        questions: Array<QuestionBase>;
+        data: ISurvey;
+        title: string;
+        visibleIndex: number;
+        private numValue;
+        private visibleValue;
+        constructor(name?: string);
+        num: number;
+        visible: boolean;
+        getType(): string;
+        isVisible: boolean;
+        addQuestion(question: QuestionBase, index?: number): void;
+        addNewQuestion(questionType: string, name: string): QuestionBase;
+        removeQuestion(question: QuestionBase): void;
+        hasErrors(): boolean;
+        addQuestionsToList(list: Array<IQuestion>, visibleOnly?: boolean): void;
+        protected onNumChanged(value: number): void;
+    }
+}
+
+
+
+
+declare module Survey {
+    class ValidatorResult {
+        value: any;
+        error: SurveyError;
+        constructor(value: any, error?: SurveyError);
+    }
+    class SurveyValidator extends Base {
+        text: string;
+        constructor();
+        protected getErrorText(name: string): string;
+        protected getDefaultErrorText(name: string): string;
+        validate(value: any, name?: string): ValidatorResult;
+    }
+    interface IValidatorOwner {
+        validators: Array<SurveyValidator>;
+        value: any;
+        getValidatorTitle(): string;
+    }
+    class ValidatorRunner {
+        run(owner: IValidatorOwner): SurveyError;
+    }
+    class NumericValidator extends SurveyValidator {
+        minValue: number;
+        maxValue: number;
+        constructor(minValue?: number, maxValue?: number);
+        getType(): string;
+        validate(value: any, name?: string): ValidatorResult;
+        protected getDefaultErrorText(name: string): any;
+        private isNumber(value);
+    }
+    class TextValidator extends SurveyValidator {
+        minLength: number;
+        constructor(minLength?: number);
+        getType(): string;
+        validate(value: any, name?: string): ValidatorResult;
+        protected getDefaultErrorText(name: string): any;
+    }
+    class AnswerCountValidator extends SurveyValidator {
+        minCount: number;
+        maxCount: number;
+        constructor(minCount?: number, maxCount?: number);
+        getType(): string;
+        validate(value: any, name?: string): ValidatorResult;
+        protected getDefaultErrorText(name: string): string;
+    }
+    class RegexValidator extends SurveyValidator {
+        regex: string;
+        constructor(regex?: string);
+        getType(): string;
+        validate(value: any, name?: string): ValidatorResult;
+    }
+    class EmailValidator extends SurveyValidator {
+        private re;
+        constructor();
+        getType(): string;
+        validate(value: any, name?: string): ValidatorResult;
+        protected getDefaultErrorText(name: string): any;
+    }
+}
+
+
+
+
+
+
+declare module Survey {
+    class Question extends QuestionBase implements IValidatorOwner {
+        name: string;
+        private titleValue;
+        private questionValue;
+        private isRequiredValue;
+        private hasCommentValue;
+        private hasOtherValue;
+        errors: Array<SurveyError>;
+        validators: Array<SurveyValidator>;
+        valueChangedCallback: () => void;
+        commentChangedCallback: () => void;
+        errorsChangedCallback: () => void;
+        constructor(name: string);
+        hasTitle: boolean;
+        title: string;
+        supportComment(): boolean;
+        supportOther(): boolean;
+        isRequired: boolean;
+        hasComment: boolean;
+        hasOther: boolean;
+        protected onSetData(): void;
+        value: any;
+        comment: string;
+        isEmpty(): boolean;
+        hasErrors(): boolean;
+        private checkForErrors();
+        protected onCheckForErrors(errors: Array<SurveyError>): void;
+        protected runValidators(): SurveyError;
+        private isValueChangedInSurvey;
+        protected setNewValue(newValue: any): void;
+        protected onValueChanged(): void;
+        private setNewComment(newValue);
+        onSurveyValueChanged(newValue: any): void;
+        getValidatorTitle(): string;
+    }
+}
+
+
+
+declare module Survey {
+    class QuestionSelectBase extends Question {
+        otherItem: ItemValue;
+        choicesValues: Array<ItemValue>;
+        otherErrorText: string;
+        choicesOrderValue: string;
+        constructor(name: string);
+        isOtherSelected: boolean;
+        choices: Array<any>;
+        choicesOrder: string;
+        otherText: string;
+        visibleChoices: Array<ItemValue>;
+        supportComment(): boolean;
+        supportOther(): boolean;
+        protected onCheckForErrors(errors: Array<SurveyError>): void;
+        sortVisibleChoices(array: Array<ItemValue>): Array<ItemValue>;
+        sortArray(array: Array<ItemValue>, mult: number): Array<ItemValue>;
+        randomizeArray(array: Array<ItemValue>): Array<ItemValue>;
+    }
+    class QuestionCheckboxBase extends QuestionSelectBase {
+        name: string;
+        private colCountValue;
+        colCountChangedCallback: () => void;
+        constructor(name: string);
+        colCount: number;
+    }
+}
+
+
+
+declare module Survey {
+    class QuestionCheckboxModel extends QuestionCheckboxBase {
+        name: string;
+        constructor(name: string);
+        isOtherSelected: boolean;
+        getType(): string;
+    }
+}
+
+
+
+declare module Survey {
+    class QuestionCommentModel extends Question {
+        name: string;
+        rows: number;
+        cols: number;
+        constructor(name: string);
+        getType(): string;
+        isEmpty(): boolean;
+    }
+}
+
+
+
+declare module Survey {
+    class QuestionDropdownModel extends QuestionSelectBase {
+        name: string;
+        private optionsCaptionValue;
+        constructor(name: string);
+        optionsCaption: string;
+        getType(): string;
+    }
+}
+
+
+
+declare module Survey {
+    class QuestionHtmlModel extends QuestionBase {
+        name: string;
+        private htmlValue;
+        constructor(name: string);
+        getType(): string;
+        html: string;
+    }
+}
+
+
+
+declare module Survey {
+    interface IMatrixData {
+        onMatrixRowChanged(row: MatrixRowModel): any;
+    }
+    class MatrixRowModel extends Base {
+        name: any;
+        text: string;
+        fullName: string;
+        private data;
+        protected rowValue: any;
+        constructor(name: any, text: string, fullName: string, data: IMatrixData, value: any);
+        value: any;
+        protected onValueChanged(): void;
+    }
+    class QuestionMatrixModel extends Question implements IMatrixData {
+        name: string;
+        private columnsValue;
+        private rowsValue;
+        private isRowChanging;
+        private generatedVisibleRows;
+        constructor(name: string);
+        getType(): string;
+        hasRows: boolean;
+        columns: Array<any>;
+        rows: Array<any>;
+        visibleRows: Array<MatrixRowModel>;
+        protected createMatrixRow(name: any, text: string, fullName: string, value: any): MatrixRowModel;
+        protected onValueChanged(): void;
+        onMatrixRowChanged(row: MatrixRowModel): void;
+    }
+}
+
+
+
+declare module Survey {
+    interface IMatrixDropdownData {
+        onCellChanged(cell: MatrixDropdownCellModel): any;
+        columns: Array<MatrixDropdownColumn>;
+        choices: Array<any>;
+        optionsCaption: string;
+    }
+    class MatrixDropdownColumn extends Base {
+        name: string;
+        private choicesValue;
+        private titleValue;
+        optionsCaption: string;
+        constructor(name: string, title?: string);
+        getType(): string;
+        title: string;
+        choices: Array<any>;
+    }
+    class MatrixDropdownCellModel {
+        column: MatrixDropdownColumn;
+        row: MatrixDropdownRowModel;
+        private data;
+        private cellValue;
+        constructor(column: MatrixDropdownColumn, row: MatrixDropdownRowModel, data: IMatrixDropdownData, value: any);
+        choices: Array<any>;
+        optionsCaption: string;
+        value: any;
+        protected onValueChanged(): void;
+    }
+    class MatrixDropdownRowModel {
+        name: any;
+        text: string;
+        protected data: IMatrixDropdownData;
+        protected rowValue: any;
+        cells: Array<MatrixDropdownCellModel>;
+        constructor(name: any, text: string, data: IMatrixDropdownData, value: any);
+        value: any;
+        private buildCells();
+        protected createCell(column: MatrixDropdownColumn, value: any): MatrixDropdownCellModel;
+        protected getCellValue(column: MatrixDropdownColumn): any;
+    }
+    class QuestionMatrixDropdownModel extends Question implements IMatrixDropdownData {
+        name: string;
+        private columnsValue;
+        private rowsValue;
+        private choicesValue;
+        private optionsCaptionValue;
+        private isRowChanging;
+        private generatedVisibleRows;
+        constructor(name: string);
+        getType(): string;
+        columns: Array<MatrixDropdownColumn>;
+        rows: Array<any>;
+        choices: Array<any>;
+        optionsCaption: string;
+        addColumn(name: string, title?: string): MatrixDropdownColumn;
+        visibleRows: Array<MatrixDropdownRowModel>;
+        protected createMatrixRow(name: any, text: string, value: any): MatrixDropdownRowModel;
+        protected onValueChanged(): void;
+        onCellChanged(cell: MatrixDropdownCellModel): void;
+    }
+}
+
+
+
+declare module Survey {
+    interface IMultipleTextData {
+        getMultipleTextValue(name: string): any;
+        setMultipleTextValue(name: string, value: any): any;
+    }
+    class MultipleTextItemModel extends Base implements IValidatorOwner {
+        name: any;
+        private data;
+        private titleValue;
+        validators: Array<SurveyValidator>;
+        constructor(name?: any, title?: string);
+        getType(): string;
+        setData(data: IMultipleTextData): void;
+        title: string;
+        value: any;
+        onValueChanged(newValue: any): void;
+        getValidatorTitle(): string;
+    }
+    class QuestionMultipleTextModel extends Question implements IMultipleTextData {
+        name: string;
+        itemSize: number;
+        items: Array<MultipleTextItemModel>;
+        constructor(name: string);
+        getType(): string;
+        AddItem(name: string, title?: string): MultipleTextItemModel;
+        private isMultipleItemValueChanging;
+        protected onValueChanged(): void;
+        protected createTextItem(name: string, title: string): MultipleTextItemModel;
+        protected onItemValueChanged(): void;
+        protected runValidators(): SurveyError;
+        getMultipleTextValue(name: string): any;
+        setMultipleTextValue(name: string, value: any): void;
+    }
+}
+
+
+
+declare module Survey {
+    class QuestionRadiogroupModel extends QuestionCheckboxBase {
+        name: string;
+        constructor(name: string);
+        getType(): string;
+    }
+}
+
+
+
+declare module Survey {
+    class QuestionRatingModel extends Question {
+        name: string;
+        static defaultRateValues: ItemValue[];
+        private rates;
+        mininumRateDescription: string;
+        maximumRateDescription: string;
+        rateValuesChangedCallback: () => void;
+        constructor(name: string);
+        rateValues: Array<any>;
+        visibleRateValues: ItemValue[];
+        getType(): string;
+        supportComment(): boolean;
+        supportOther(): boolean;
+    }
+}
+
+
+
+declare module Survey {
+    class QuestionTextModel extends Question {
+        name: string;
+        size: number;
+        constructor(name: string);
+        getType(): string;
+        isEmpty(): boolean;
+    }
+}
+
+
+
+declare module Survey {
+    class Trigger extends Base {
+        static operatorsValue: HashTable<Function>;
+        static operators: HashTable<Function>;
+        private opValue;
+        value: any;
+        constructor();
+        operator: string;
+        check(value: any): void;
+        protected onSuccess(): void;
+        protected onFailure(): void;
+    }
+    interface ISurveyTriggerOwner {
+        getObjects(pages: string[], questions: string[]): any[];
+    }
+    class SurveyTrigger extends Trigger {
+        name: string;
+        pages: string[];
+        questions: string[];
+        private owner;
+        constructor();
+        setOwner(owner: ISurveyTriggerOwner): void;
+        protected onSuccess(): void;
+        protected onFailure(): void;
+        onTrigger(func: Function): void;
+        protected onItemSuccess(item: any): void;
+        protected onItemFailure(item: any): void;
+    }
+    class SurveyTriggerVisible extends SurveyTrigger {
+        constructor();
+        getType(): string;
+        protected onItemSuccess(item: any): void;
+        protected onItemFailure(item: any): void;
+    }
+}
+
+
+
+
+
+
+declare module Survey {
+    class SurveyModel extends Base implements ISurvey, ISurveyTriggerOwner {
+        surveyId: string;
+        surveyPostId: string;
+        clientId: string;
+        sendResultOnPageNext: boolean;
+        commentPrefix: string;
+        title: string;
+        showNavigationButtons: boolean;
+        showTitle: boolean;
+        showPageTitles: boolean;
+        requiredText: string;
+        showProgressBar: string;
+        pages: Array<PageModel>;
+        triggers: Array<SurveyTrigger>;
+        private currentPageValue;
+        private valuesHash;
+        private pagePrevTextValue;
+        private pageNextTextValue;
+        private completeTextValue;
+        private showPageNumbersValue;
+        private showQuestionNumbersValue;
+        private localeValue;
+        onComplete: Event<(sender: SurveyModel) => any, any>;
+        onCurrentPageChanged: Event<(sender: SurveyModel, options: any) => any, any>;
+        onValueChanged: Event<(sender: SurveyModel, options: any) => any, any>;
+        onVisibleChanged: Event<(sender: SurveyModel, options: any) => any, any>;
+        onPageVisibleChanged: Event<(sender: SurveyModel, options: any) => any, any>;
+        onQuestionAdded: Event<(sender: SurveyModel, options: any) => any, any>;
+        onQuestionRemoved: Event<(sender: SurveyModel, options: any) => any, any>;
+        onValidateQuestion: Event<(sender: SurveyModel, options: any) => any, any>;
+        onSendResult: Event<(sender: SurveyModel, options: any) => any, any>;
+        onGetResult: Event<(sender: SurveyModel, options: any) => any, any>;
+        jsonErrors: Array<JsonError>;
+        mode: string;
+        constructor(jsonObj?: any, renderedElement?: any);
+        getType(): string;
+        locale: string;
+        pagePrevText: string;
+        pageNextText: string;
+        completeText: string;
+        showPageNumbers: boolean;
+        showQuestionNumbers: string;
+        data: any;
+        comments: any;
+        visiblePages: Array<PageModel>;
+        isEmpty: boolean;
+        PageCount: number;
+        visiblePageCount: number;
+        currentPage: PageModel;
+        protected currentPageChanged(newValue: PageModel, oldValue: PageModel): void;
+        isDesignMode: boolean;
+        nextPage(): boolean;
+        isCurrentPageHasErrors: boolean;
+        prevPage(): boolean;
+        completeLastPage(): boolean;
+        isFirstPage: boolean;
+        isLastPage: boolean;
+        progressText: string;
+        getPage(index: number): PageModel;
+        addPage(page: PageModel): void;
+        addNewPage(name: string): PageModel;
+        removePage(page: PageModel): void;
+        getQuestionByName(name: string): IQuestion;
+        getQuestionsByNames(names: string[]): IQuestion[];
+        getPageByQuestion(question: IQuestion): PageModel;
+        getPageByName(name: string): PageModel;
+        getPagesByNames(names: string[]): PageModel[];
+        getAllQuestions(visibleOnly?: boolean): Array<IQuestion>;
+        protected createNewPage(name: string): PageModel;
+        private notifyQuestionOnValueChanged(name, newValue);
+        private notifyAllQuestionsOnValueChanged();
+        private checkTriggers(name, newValue);
+        sendResult(postId?: string, clientId?: string, isPartialCompleted?: boolean): void;
+        getResult(resultId: string, name: string): void;
+        loadSurveyFromService(surveyId?: string, element?: any): void;
+        protected onLoadSurveyFromService(element: any): void;
+        private updateVisibleIndexes();
+        private updatePageVisibleIndexes(showIndex);
+        private updateQuestionVisibleIndexes(questions, showIndex);
+        private setJsonObject(jsonObj);
+        protected onBeforeCreating(): void;
+        protected onCreating(): void;
+        getValue(name: string): any;
+        setValue(name: string, newValue: any): void;
+        getComment(name: string): string;
+        setComment(name: string, newValue: string): void;
+        questionVisibilityChanged(question: IQuestion, newValue: boolean): void;
+        pageVisibilityChanged(page: IPage, newValue: boolean): void;
+        questionAdded(question: IQuestion, index: number): void;
+        questionRemoved(question: IQuestion): void;
+        validateQuestion(name: string): SurveyError;
+        getObjects(pages: string[], questions: string[]): any[];
+    }
+}
+
+declare module Survey {
+    class SurveyWindowModel extends Base {
+        static surveyElementName: string;
+        surveyValue: SurveyModel;
+        windowElement: HTMLDivElement;
+        isShowingValue: boolean;
+        isExpandedValue: boolean;
+        titleValue: string;
+        templateValue: string;
+        constructor(jsonObj: any);
+        getType(): string;
+        survey: SurveyModel;
+        isShowing: boolean;
+        isExpanded: boolean;
+        title: string;
+        expand(): void;
+        collapse(): void;
+        protected createSurvey(jsonObj: any): SurveyModel;
+        protected expandcollapse(value: boolean): void;
+    }
+}
+
+
+declare module Survey {
+}
+
+
+declare module Survey {
+}
+
+
+declare module Survey {
+    class Page extends PageModel {
+        koNo: any;
+        constructor(name?: string);
+        protected onCreating(): void;
+        protected onNumChanged(value: number): void;
+    }
+}
+
+
+declare module Survey {
+    class QuestionImplementorBase {
+        question: QuestionBase;
+        koVisible: any;
+        koNo: any;
+        koErrors: any;
+        constructor(question: QuestionBase);
+        protected onVisibilityChanged(): void;
+        protected onVisibleIndexChanged(): void;
+        protected getNo(): string;
+    }
+}
+
+
+
+declare module Survey {
+    class QuestionImplementor extends QuestionImplementorBase {
+        question: Question;
+        private isUpdating;
+        koValue: any;
+        koComment: any;
+        constructor(question: Question);
+        protected onValueChanged(): void;
+        protected onCommentChanged(): void;
+        protected onVisibilityChanged(): void;
+        protected onVisibleIndexChanged(): void;
+        protected onErrorsChanged(): void;
+        protected createkoValue(): any;
+        protected setkoValue(newValue: any): void;
+        protected updateValue(newValue: any): void;
+        protected updateComment(newValue: any): void;
+        protected getNo(): string;
+    }
+}
+
+
+declare module Survey {
+    class QuestionSelectBaseImplementor extends QuestionImplementor {
+        koOtherVisible: any;
+        constructor(question: Question);
+        protected isOtherSelected: boolean;
+    }
+    class QuestionCheckboxBaseImplementor extends QuestionSelectBaseImplementor {
+        koWidth: any;
+        constructor(question: Question);
+        protected onColCountChanged(): void;
+        protected colWidth: string;
+        private koAfterRender(el, con);
+    }
+}
+
+
+
+declare module Survey {
+    class QuestionCheckbox extends QuestionCheckboxModel {
+        name: string;
+        constructor(name: string);
+    }
+}
+
+
+declare module Survey {
+    class QuestionComment extends QuestionCommentModel {
+        name: string;
+        constructor(name: string);
+    }
+}
+
+
+declare module Survey {
+    class QuestionDropdown extends QuestionDropdownModel {
+        name: string;
+        constructor(name: string);
+    }
+}
+
+
+
+declare module Survey {
+    class QuestionHtml extends QuestionHtmlModel {
+        name: string;
+        constructor(name: string);
+    }
+}
+
+
+declare module Survey {
+    class MatrixRow extends MatrixRowModel {
+        name: any;
+        text: string;
+        fullName: string;
+        private isValueUpdating;
+        koValue: any;
+        constructor(name: any, text: string, fullName: string, data: IMatrixData, value: any);
+        protected onValueChanged(): void;
+    }
+    class QuestionMatrix extends QuestionMatrixModel {
+        name: string;
+        constructor(name: string);
+        protected createMatrixRow(name: any, text: string, fullName: string, value: any): MatrixRowModel;
+    }
+}
+
+
+declare module Survey {
+    class MatrixDropdownCell extends MatrixDropdownCellModel {
+        column: MatrixDropdownColumn;
+        row: MatrixDropdownRowModel;
+        private isValueUpdating;
+        koValue: any;
+        constructor(column: MatrixDropdownColumn, row: MatrixDropdownRowModel, data: IMatrixDropdownData, value: any);
+        protected onValueChanged(): void;
+    }
+    class MatrixDropdownRow extends MatrixDropdownRowModel {
+        name: any;
+        text: string;
+        constructor(name: any, text: string, data: IMatrixDropdownData, value: any);
+        protected createCell(column: MatrixDropdownColumn, value: any): MatrixDropdownCellModel;
+    }
+    class QuestionMatrixDropdown extends QuestionMatrixDropdownModel {
+        name: string;
+        constructor(name: string);
+        protected createMatrixRow(name: any, text: string, value: any): MatrixDropdownRowModel;
+    }
+}
+
+
+declare module Survey {
+    class MultipleTextItem extends MultipleTextItemModel {
+        name: any;
+        private isKOValueUpdating;
+        koValue: any;
+        constructor(name?: any, title?: string);
+        onValueChanged(newValue: any): void;
+    }
+    class QuestionMultipleText extends QuestionMultipleTextModel {
+        name: string;
+        constructor(name: string);
+        protected createTextItem(name: string, title: string): MultipleTextItemModel;
+    }
+}
+
+
+declare module Survey {
+    class QuestionRadiogroup extends QuestionRadiogroupModel {
+        name: string;
+        constructor(name: string);
+    }
+}
+
+
+declare module Survey {
+    class QuestionRating extends QuestionRatingModel {
+        name: string;
+        constructor(name: string);
+    }
+}
+
+
+declare module Survey {
+    class QuestionText extends QuestionTextModel {
+        name: string;
+        constructor(name: string);
+    }
+}
+
+
+declare module Survey {
+    class SurveyBase extends SurveyModel {
+        private renderedElement;
+        onRendered: Event<(sender: SurveyModel) => any, any>;
+        koCurrentPage: any;
+        koIsFirstPage: any;
+        koIsLastPage: any;
+        dummyObservable: any;
+        koProgress: any;
+        koProgressText: any;
+        constructor(jsonObj?: any, renderedElement?: any);
+        render(element?: any): void;
+        protected createNewPage(name: string): Page;
+        protected getTemplate(): string;
+        protected onBeforeCreating(): void;
+        protected currentPageChanged(newValue: PageModel, oldValue: PageModel): void;
+        protected onLoadSurveyFromService(element: any): void;
+        private applyBinding();
+        private updateKoCurrentPage();
+        private getProgress();
+    }
+}
+
+
+
+declare module Survey {
+    class SurveyWindowBase extends SurveyWindowModel {
+        koExpanded: any;
+        doExpand: any;
+        constructor(jsonObj: any);
+        protected createSurvey(jsonObj: any): SurveyModel;
+        protected expandcollapse(value: boolean): void;
+        protected template: string;
+        show(): void;
+        protected getDefaultTemplate(): string;
+        hide(): void;
+        private changeExpanded();
+        private onComplete();
+    }
+}
+
+declare module Survey {
+    class SurveyTemplateTextBase {
+        constructor();
+        replaceText(replaceText: string, id: string, questionType?: string): void;
+        protected getId(id: string, questionType: string): string;
+        protected text: string;
+    }
+}
+
+declare module template.ko {
+    var html: string;
+}
+
+
+
+declare module Survey {
+    class Survey extends SurveyBase {
+        constructor(jsonObj?: any, renderedElement?: any);
+        protected getTemplate(): string;
+    }
+}
+
+
+
+declare module Survey {
+    class SurveyWindow extends SurveyWindowBase {
+        koExpanded: any;
+        doExpand: any;
+        constructor(jsonObj: any);
+        protected createSurvey(jsonObj: any): SurveyModel;
+        protected getDefaultTemplate(): string;
+    }
+}
+
+declare module template.window.ko {
+    var html: string;
+}
+
+
+
+declare module Survey {
+    class SurveyTemplateText extends SurveyTemplateTextBase {
+        protected text: string;
+    }
+}
+
diff --git a/survey-knockout/survey-knockout-tests.ts b/survey-knockout/survey-knockout-tests.ts
new file mode 100644
index 0000000000..e658b88002
--- /dev/null
+++ b/survey-knockout/survey-knockout-tests.ts
@@ -0,0 +1,22 @@
+
+                     
+function createFromCodeTests() {
+    var survey = new Survey.SurveyModel();
+    var page = survey.addNewPage("Page 1");
+    page.addNewQuestion("text", "question1");
+    page.addNewQuestion("comment", "question2");
+    page = survey.addNewPage("Page 2");
+    page.addNewQuestion("matrix", "question3");
+    page.addNewQuestion("matrixdropdown", "question4");
+    return survey;
+}
+function createFromJSONTests() {
+    var survey = new Survey.SurveyModel({
+        pages: [{
+            "name": "page1",
+            "questions": [{ "type": "text", "name": "textQuestion", "isRequired": "true" }, { "type": "checkbox", "name": "checkboxQuestion", "isRequired": "true", "choices": ["red", "white"] }]
+        }]
+    });
+    survey.setValue("textQuestion", "newValue");
+    return survey;
+}
diff --git a/survey-knockout/tsconfig.json b/survey-knockout/tsconfig.json
new file mode 100644
index 0000000000..10f22edab7
--- /dev/null
+++ b/survey-knockout/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "survey-knockout-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/svg-injector/index.d.ts b/svg-injector/index.d.ts
new file mode 100644
index 0000000000..809f983280
--- /dev/null
+++ b/svg-injector/index.d.ts
@@ -0,0 +1,45 @@
+// Type definitions for SVG Injector
+// Project: https://github.com/iconic/SVGInjector
+// Definitions by: Patrick Westerhoff <https://github.com/poke>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace SVGInjector {
+    interface SVGInjector {
+        /**
+         * Replace the given elements with their full inline SVG DOM elements.
+         *
+         * @param elements Array of or single DOM element.
+         * @param options Injector options.
+         * @param done Callback that receives the injected element count as parameter.
+         */
+        (elements: Node | NodeList | Array<Node>, options?: SVGInjectorOptions, done?: (elementCount: number) => void): void;
+    }
+
+    interface SVGInjectorOptions {
+        /**
+         * Whether to run scripts blocks found in the SVG.
+         *
+         * Possible values:
+         * 'always' — Run scripts every time.
+         * 'once' — Only run scripts once for each SVG.
+         * 'never' — Ignore scripts (default)
+         */
+        evalScripts?: string;
+
+        /**
+         * Location of fallback pngs, if desired.
+         */
+        pngFallback?: string;
+
+        /**
+         * Callback to run during each SVG injection. The SVG element is passed if
+         * the injection was successful.
+         */
+        each?: (svg: SVGElement | string) => void;
+    }
+}
+
+
+declare var SVGInjector: SVGInjector.SVGInjector;
+export = SVGInjector;
+export as namespace SVGInjector;
\ No newline at end of file
diff --git a/svg-injector/svg-injector-tests.ts b/svg-injector/svg-injector-tests.ts
index e90bf8e2a8..cec4bbd0b2 100644
--- a/svg-injector/svg-injector-tests.ts
+++ b/svg-injector/svg-injector-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="svg-injector.d.ts" />
+import svgInjector = require("svg-injector");
 
-var SVGInjector: SVGInjector;
+var SVGInjector: svgInjector.SVGInjector;
 
 // Simple example
 var mySVGsToInject = document.querySelectorAll('img.inject-me');
diff --git a/svg-injector/svg-injector.d.ts b/svg-injector/svg-injector.d.ts
deleted file mode 100644
index 2fd41caa86..0000000000
--- a/svg-injector/svg-injector.d.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-// Type definitions for SVG Injector
-// Project: https://github.com/iconic/SVGInjector
-// Definitions by: Patrick Westerhoff <https://github.com/poke>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare interface SVGInjector {
-    /**
-     * Replace the given elements with their full inline SVG DOM elements.
-     *
-     * @param elements Array of or single DOM element.
-     * @param options Injector options.
-     * @param done Callback that receives the injected element count as parameter.
-     */
-    (elements: Node | NodeList | Array<Node>, options?: SVGInjectorOptions, done?: (elementCount: number) => void): void;
-}
-
-declare interface SVGInjectorOptions {
-    /**
-     * Whether to run scripts blocks found in the SVG.
-     *
-     * Possible values:
-     * 'always' — Run scripts every time.
-     * 'once' — Only run scripts once for each SVG.
-     * 'never' — Ignore scripts (default)
-     */
-    evalScripts?: string;
-
-    /**
-     * Location of fallback pngs, if desired.
-     */
-    pngFallback?: string;
-
-    /**
-     * Callback to run during each SVG injection. The SVG element is passed if
-     * the injection was successful.
-     */
-    each?: (svg: SVGElement | string) => void;
-}
-
-declare module "svg-injector" {
-    var SVGInjector: SVGInjector;
-    export = SVGInjector;
-}
diff --git a/svg-injector/tsconfig.json b/svg-injector/tsconfig.json
new file mode 100644
index 0000000000..9e2e13bb18
--- /dev/null
+++ b/svg-injector/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "svg-injector-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/svg-pan-zoom/svg-pan-zoom.d.ts b/svg-pan-zoom/index.d.ts
similarity index 100%
rename from svg-pan-zoom/svg-pan-zoom.d.ts
rename to svg-pan-zoom/index.d.ts
diff --git a/svg-pan-zoom/svg-pan-zoom-tests.ts b/svg-pan-zoom/svg-pan-zoom-tests.ts
index 2cb34b7c5c..423f69b5de 100644
--- a/svg-pan-zoom/svg-pan-zoom-tests.ts
+++ b/svg-pan-zoom/svg-pan-zoom-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="svg-pan-zoom.d.ts" />
+
 
 var svgPanZoomOptions : SvgPanZoom.OptionConfig = {
     panEnabled: true // enable or disable panning (default enabled)
diff --git a/svg-pan-zoom/tsconfig.json b/svg-pan-zoom/tsconfig.json
new file mode 100644
index 0000000000..d9253218da
--- /dev/null
+++ b/svg-pan-zoom/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "svg-pan-zoom-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/svg-sprite/index.d.ts b/svg-sprite/index.d.ts
new file mode 100644
index 0000000000..1a9ea77177
--- /dev/null
+++ b/svg-sprite/index.d.ts
@@ -0,0 +1,357 @@
+// Type definitions for svg-sprite
+// Project: https://github.com/jkphl/svg-sprite
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import File = require('../vinyl');
+import winston = require('winston');
+
+declare namespace sprite {
+    interface SVGSpriterConstructor extends NodeJS.EventEmitter {
+        /**
+         * The spriter's constructor (always the entry point)
+         * @param config Main configuration for the spriting process
+         */
+        new (config: Config): SVGSpriter;
+    }
+
+    interface SVGSpriter {
+        /**
+         * Registering source SVG files
+         * @param file Absolute path to the SVG file or a vinyl file object carrying all the necessary values (the following arguments are ignored then).
+         * @param name The "local" part of the file path, possibly including subdirectories which will get traversed to CSS selectors using the shape.id.separator configuration option.
+         * @param svg SVG file content.
+         */
+        add(file: string | File, name: string, svg: string): SVGSpriter;
+        /**
+         * Registering source SVG files
+         * @param file Absolute path to the SVG file or a vinyl file object carrying all the necessary values (the following arguments are ignored then).
+         */
+        add(file: File): SVGSpriter;
+        /**
+         * Triggering the sprite compilation
+         * @param config Configuration object setting the output mode parameters for a single compilation run. If omitted, the mode property of the main configuration used for the constructor will be used.
+         * @param callback Callback triggered when the compilation has finished.
+         */
+        compile(config: Config, callback: CompileCallback): SVGSpriter;
+        /**
+         * Triggering the sprite compilation
+         * @param callback Callback triggered when the compilation has finished.
+         */
+        compile(callback: CompileCallback): void;
+        /**
+         * Accessing the intermediate SVG resources
+         * @param dest Base directory for the SVG files in case the will be written to disk.
+         * @param callback Callback triggered when the shapes are available.
+         */
+        getShapes(dest: string, callback: GetShapesCallback): void;
+    }
+
+    interface Config {
+        /**
+         * Main output directory
+         * @default '.'
+         */
+        dest?: string;
+        /**
+         * Logging verbosity or custom logger
+         */
+        log?: string | winston.LoggerInstance;
+        /**
+         * SVG shape configuration
+         */
+        shape?: Shape;
+        /**
+         * Sprite SVG options
+         */
+        svg?: Svg;
+        /**
+         * Custom templating variables
+         */
+        variables?: any;
+        /**
+         * Output mode configurations
+         */
+        mode?: Mode;
+    }
+
+    /**
+     * All settings affecting the SVG shapes of the sprite
+     */
+    interface Shape {
+        /**
+         * SVG shape ID related options
+         */
+        id?: {
+            /**
+             * Separator for directory name traversal
+             */
+            separator?: string;
+            /**
+             * SVG shape ID generator callback
+             */
+            generator?: string | ((svg: string) => string);
+            /**
+             * File name separator for shape states (e.g. ':hover')
+             */
+            pseudo?: string;
+            /**
+             * Whitespace replacement for shape IDs
+             */
+            whitespace?: string;
+        };
+        /**
+         * Dimension related options
+         */
+        dimension?: {
+            /**
+             * Max. shape width
+             */
+            maxWidth?: number;
+            /**
+             * Max. shape height
+             */
+            maxHeight?: number;
+            /**
+             * Floating point precision
+             */
+            precision?: number;
+            /**
+             * Width and height attributes on embedded shapes
+             */
+            attributes?: boolean;
+        };
+        /**
+         * Spacing related options
+         */
+        spacing?: {
+            /**
+             * Padding around all shapes
+             */
+            padding?: number | number[];
+            /**
+             * Padding strategy (similar to CSS `box-sizing`)
+             */
+            box?: string;
+        };
+        /**
+         * List of transformations / optimizations
+         */
+        transform?: (string | CustomConfigurationTransform | CustomCallbackTransform)[];
+        /**
+         * Path to YAML file with meta / accessibility data
+         */
+        meta?: string;
+        /**
+         * Path to YAML file with extended alignment data
+         */
+        align?: string;
+        /**
+         * Output directory for optimized intermediate SVG shapes
+         */
+        dest?: string;
+    }
+
+    /**
+     * Pre-defined shape transformation with custom configuration
+     */
+    interface CustomConfigurationTransform {
+        [transformationName: string]: {
+            plugins?: { [transformationName: string]: boolean }[];
+        }
+    }
+
+    /**
+     * Custom callback transformation
+     */
+    interface CustomCallbackTransform {
+        [transformationName: string]: {
+            /**
+             * Custom callback transformation
+             * @param shape SVG shape object
+             * @param sprite SVG spriter
+             * @param callback Callback
+             */
+            (shape: any, sprite: SVGSpriter, callback: Function): any;
+        }
+    }
+
+    interface Svg {
+        /**
+         * Output an XML declaration at the very beginning of each compiled sprite.
+         * If you provide a non-empty string here, it will be used one-to-one as declaration (e.g. <?xml version="1.0" encoding="utf-8"?>).
+         * If you set this to TRUE, *svg-sprite* will look at the registered shapes for an XML declaration and use the first one it can find.
+         * @default true
+         */
+        xmlDeclaration?: boolean | string;
+        /**
+         * Include a <DOCTYPE> declaration in each compiled sprite. If you provide a non-empty string here,
+         * it will be used one-to-one as declaration (e.g. <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">).
+         * If you set this to TRUE, *svg-sprite* will look at the registered shapes for a DOCTYPE declaration and use the first one it can find.
+         * @default true
+         */
+        doctypeDeclaration?: boolean | string;
+        /**
+         * In order to avoid ID clashes, the default behavior is to namespace all IDs in the source SVGs before compiling them into a sprite.
+         * Each ID is prepended with a unique string. In some situations, it might be desirable to disable ID namespacing, e.g. when you want to script the resulting sprite.
+         * Just set svg.namespaceIDs to FALSE then and be aware that you might also want to disable SVGO's ID minification (shape.transform.svgo.plugins: [{cleanupIDs: false}]).
+         * @default true
+         */
+        namespaceIDs?: boolean;
+        /**
+         * In order to avoid CSS class name ambiguities, the default behavior is to namespace CSS class names in the source SVGs before compiling them into a sprite.
+         * Each class name is prepended with a unique string. Disable this option to keep the class names untouched.
+         * @default true
+         */
+        namespaceClassnames?: boolean;
+        /**
+         * If truthy, width and height attributes will be set on the sprite's <svg> element (where applicable).
+         * @default true
+         */
+        dimensionAttributes?: boolean;
+        /**
+         * Shorthand for applying custom attributes to the outermost <svg> element.
+         * Please be aware that certain attributes (e.g. viewBox) will be calculated dynamically and override custom rootAttributes in any case.
+         */
+        rootAttributes?: any;
+        /**
+         * Floating point precision for CSS positioning values (defaults to -1 meaning highest possible precision).
+         */
+        precision?: number;
+        /**
+         * Callback (or list of callbacks) that will be applied to the resulting SVG sprites as global [post-processing transformation](#svg-sprite-customization).
+         * transform: Function∣Array
+         */
+        transform?: SvgTransformer | SvgTransformer[];
+    }
+
+    interface SvgTransformer {
+        /**
+         * Custom sprite SVG transformation
+         * @param svg Sprite SVG
+         * @return Processed SVG
+         */
+        (svg: string): string;
+    }
+
+    interface Mode {
+        css?: CssAndViewSpecificModeConfig | boolean;
+        view?: CssAndViewSpecificModeConfig | boolean;
+        defs?: DefsAndSymbolSpecificModeConfig | boolean;
+        symbol?: DefsAndSymbolSpecificModeConfig | boolean;
+        stack?: ModeConfig | boolean;
+        [customConfigName: string]: ModeConfig;
+    }
+
+    interface ModeConfig {
+        /**
+         * Base directory for sprite and CSS file output. If not absolute, the path will be resolved using the main output directory (see global dest option).
+         * @default "<mode>"
+         */
+        dest?: string;
+        /**
+         * Used for prefixing the [shape ID](#shape-ids) during CSS selector construction. If the value is empty,
+         * no prefix will be used. The prefix may contain the placeholder "%s" (e.g. ".svg %s-svg"),
+         * which will then get replaced by the shape ID. Please be aware that "%" is a special character
+         * in this context and that you'll have to escape it by another percent sign ("%%") in case you want
+         * to output it to your stylesheets (e.g. for a [Sass placeholder selector](http://sass-lang.com/documentation/file.SASS_REFERENCE.html#placeholder_selectors_)).
+         * @default ".svg-%s"
+         */
+        prefix?: string;
+        /**
+         * A non-empty string value will trigger the creation of additional CSS rules specifying the dimensions of each shape in the sprite.
+         * The string will be used as suffix to mode.<mode>.prefix during CSS selector construction and may contain the placeholder "%s",
+         * which will get replaced by the value of mode.<mode>.prefix.
+         * A boolean TRUE will cause the dimensions to be included directly into each shape's CSS rule (only available for «css» and «view» sprites).
+         * @default "-dims"
+         */
+        dimensions?: string | boolean;
+        /**
+         * SVG sprite path and file name, relative to the mode.<mode>.dest directory.
+         * You may omit the file extension, in which case it will be set to ".svg" automatically.
+         * @default "svg/sprite.<mode>.svg"
+         */
+        sprite?: string;
+        /**
+         * Add a content based hash to the name of the sprite file so that clients reliably reload the sprite
+         * when it's content changes («cache busting»). Defaults to false except for «css» and «view» sprites.
+         * @default true∣false
+         */
+        bust?: boolean;
+        /**
+         * Collection of [stylesheet rendering configurations](#rendering-configurations).
+         * The keys are used as file extensions as well as file return keys. At present,
+         * there are default templates for the file extensions css ([CSS](http://www.w3.org/Style/CSS/)),
+         * scss ([Sass](http://sass-lang.com/)), less ([Less](http://lesscss.org/)) and styl ([Stylus](http://learnboost.github.io/stylus/)),
+         * which all reside in the directory tmpl/css. Example: {css: true, scss: {dest: '_sprite.scss'}}
+         * @default {}
+         */
+        render?: { [key: string]: RenderingConfiguration | boolean };
+        /**
+         * Enabling this will trigger the creation of an HTML document demoing the usage of the sprite. Please see below for details on [rendering configurations](#rendering-configurations).
+         * @default false
+         */
+        example?: RenderingConfiguration | boolean;
+        /**
+         * Specify svg-sprite which output mode to use with this configuration
+         */
+        mode?: string;
+    }
+
+    interface RenderingConfiguration {
+        /**
+         * HTML document Mustache template
+         * @default "tmpl/<mode>/sprite.html"
+         */
+        template?: string;
+        /**
+         * HTML document destination
+         * @default "sprite.<mode>.html"
+         */
+        dest?: string;
+    }
+
+    interface CssAndViewSpecificModeConfig extends ModeConfig {
+        /**
+         * The arrangement of the shapes within the sprite. Might be "vertical", "horizontal", "diagonal" or "packed"
+         * (with the latter being the most compact type). It depends on your project which layout is best for you.
+         * @default "packed"
+         */
+        layout?: string;
+        /**
+         * If given and not empty, this will be the selector name of a CSS rule commonly specifying the background-image
+         * and background-repeat properties for all the shapes in the sprite (thus saving some bytes by not unnecessarily repeating them for each shape)
+         */
+        common?: string;
+        /**
+         * If given and not empty, a mixin with this name will be added to supporting output formats (e.g. Sass, LESS, Stylus),
+         * specifying the background-image and background-repeat properties for all the shapes in the sprite.
+         * You may use it for creating custom CSS within @media rules. The mixin acts much like the common rule.
+         * In fact, you can even combine the two - if both are enabled, the common rule will use the mixin internally.
+         */
+        mixin?: string;
+    }
+
+    interface DefsAndSymbolSpecificModeConfig extends ModeConfig {
+        /**
+         * If you want to embed the sprite into your HTML source, you will want to set this to true
+         * in order to prevent the creation of SVG namespace declarations and to set some other attributes for effectively hiding the library sprite.
+         * @default false
+         */
+        inline?: boolean;
+    }
+
+    interface CompileCallback {
+        (error: Error, result: any, data: any): any;
+    }
+
+    interface GetShapesCallback {
+        (error: Error, result: File[]): any;
+    }
+}
+
+declare var sprite: sprite.SVGSpriterConstructor;
+
+export = sprite;
diff --git a/svg-sprite/svg-sprite-tests.ts b/svg-sprite/svg-sprite-tests.ts
index 74097962f0..39042dcf9c 100644
--- a/svg-sprite/svg-sprite-tests.ts
+++ b/svg-sprite/svg-sprite-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="svg-sprite.d.ts" />
 
 import SVGSpriter = require('svg-sprite');
 import * as fs from 'fs';
diff --git a/svg-sprite/svg-sprite.d.ts b/svg-sprite/svg-sprite.d.ts
deleted file mode 100644
index 4848d1359b..0000000000
--- a/svg-sprite/svg-sprite.d.ts
+++ /dev/null
@@ -1,362 +0,0 @@
-// Type definitions for svg-sprite
-// Project: https://github.com/jkphl/svg-sprite
-// Definitions by: Qubo <https://github.com/tkqubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../vinyl/vinyl.d.ts" />
-/// <reference path="../winston/winston.d.ts" />
-
-declare module "svg-sprite" {
-    import File = require('vinyl');
-    import winston = require('winston');
-
-    namespace sprite {
-        interface SVGSpriterConstructor extends NodeJS.EventEmitter {
-            /**
-             * The spriter's constructor (always the entry point)
-             * @param config Main configuration for the spriting process
-             */
-            new(config: Config): SVGSpriter;
-        }
-
-        interface SVGSpriter {
-            /**
-             * Registering source SVG files
-             * @param file Absolute path to the SVG file or a vinyl file object carrying all the necessary values (the following arguments are ignored then).
-             * @param name The "local" part of the file path, possibly including subdirectories which will get traversed to CSS selectors using the shape.id.separator configuration option.
-             * @param svg SVG file content.
-             */
-            add(file: string|File, name: string, svg: string): SVGSpriter;
-            /**
-             * Registering source SVG files
-             * @param file Absolute path to the SVG file or a vinyl file object carrying all the necessary values (the following arguments are ignored then).
-             */
-            add(file: File): SVGSpriter;
-            /**
-             * Triggering the sprite compilation
-             * @param config Configuration object setting the output mode parameters for a single compilation run. If omitted, the mode property of the main configuration used for the constructor will be used.
-             * @param callback Callback triggered when the compilation has finished.
-             */
-            compile(config: Config, callback: CompileCallback): SVGSpriter;
-            /**
-             * Triggering the sprite compilation
-             * @param callback Callback triggered when the compilation has finished.
-             */
-            compile(callback: CompileCallback): void;
-            /**
-             * Accessing the intermediate SVG resources
-             * @param dest Base directory for the SVG files in case the will be written to disk.
-             * @param callback Callback triggered when the shapes are available.
-             */
-            getShapes(dest: string, callback: GetShapesCallback): void;
-        }
-
-        interface Config {
-            /**
-             * Main output directory
-             * @default '.'
-             */
-            dest?: string;
-            /**
-             * Logging verbosity or custom logger
-             */
-            log?: string|winston.LoggerInstance;
-            /**
-             * SVG shape configuration
-             */
-            shape?: Shape;
-            /**
-             * Sprite SVG options
-             */
-            svg?: Svg;
-            /**
-             * Custom templating variables
-             */
-            variables?: any;
-            /**
-             * Output mode configurations
-             */
-            mode?: Mode;
-        }
-
-        /**
-         * All settings affecting the SVG shapes of the sprite
-         */
-        interface Shape {
-            /**
-             * SVG shape ID related options
-             */
-            id?: {
-                /**
-                 * Separator for directory name traversal
-                 */
-                separator?: string;
-                /**
-                 * SVG shape ID generator callback
-                 */
-                generator?: string|((svg: string) => string);
-                /**
-                 * File name separator for shape states (e.g. ':hover')
-                 */
-                pseudo?: string;
-                /**
-                 * Whitespace replacement for shape IDs
-                 */
-                whitespace?: string;
-            };
-            /**
-             * Dimension related options
-             */
-            dimension?: {
-                /**
-                 * Max. shape width
-                 */
-                maxWidth?: number;
-                /**
-                 * Max. shape height
-                 */
-                maxHeight?: number;
-                /**
-                 * Floating point precision
-                 */
-                precision?: number;
-                /**
-                 * Width and height attributes on embedded shapes
-                 */
-                attributes?: boolean;
-            };
-            /**
-             * Spacing related options
-             */
-            spacing?: {
-                /**
-                 * Padding around all shapes
-                 */
-                padding?: number|number[];
-                /**
-                 * Padding strategy (similar to CSS `box-sizing`)
-                 */
-                box?: string;
-            };
-            /**
-             * List of transformations / optimizations
-             */
-            transform?: (string|CustomConfigurationTransform|CustomCallbackTransform)[];
-            /**
-             * Path to YAML file with meta / accessibility data
-             */
-            meta?: string;
-            /**
-             * Path to YAML file with extended alignment data
-             */
-            align?: string;
-            /**
-             * Output directory for optimized intermediate SVG shapes
-             */
-            dest?: string;
-        }
-
-        /**
-         * Pre-defined shape transformation with custom configuration
-         */
-        interface CustomConfigurationTransform {
-            [transformationName: string]: {
-                plugins?: { [transformationName: string]: boolean }[];
-            }
-        }
-
-        /**
-         * Custom callback transformation
-         */
-        interface CustomCallbackTransform {
-            [transformationName: string]: {
-                /**
-                 * Custom callback transformation
-                 * @param shape SVG shape object
-                 * @param sprite SVG spriter
-                 * @param callback Callback
-                 */
-                (shape: any, sprite: SVGSpriter, callback: Function): any;
-            }
-        }
-
-        interface Svg {
-            /**
-             * Output an XML declaration at the very beginning of each compiled sprite.
-             * If you provide a non-empty string here, it will be used one-to-one as declaration (e.g. <?xml version="1.0" encoding="utf-8"?>).
-             * If you set this to TRUE, *svg-sprite* will look at the registered shapes for an XML declaration and use the first one it can find.
-             * @default true
-             */
-            xmlDeclaration?: boolean|string;
-            /**
-             * Include a <DOCTYPE> declaration in each compiled sprite. If you provide a non-empty string here,
-             * it will be used one-to-one as declaration (e.g. <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">).
-             * If you set this to TRUE, *svg-sprite* will look at the registered shapes for a DOCTYPE declaration and use the first one it can find.
-             * @default true
-             */
-            doctypeDeclaration?: boolean|string;
-            /**
-             * In order to avoid ID clashes, the default behavior is to namespace all IDs in the source SVGs before compiling them into a sprite.
-             * Each ID is prepended with a unique string. In some situations, it might be desirable to disable ID namespacing, e.g. when you want to script the resulting sprite.
-             * Just set svg.namespaceIDs to FALSE then and be aware that you might also want to disable SVGO's ID minification (shape.transform.svgo.plugins: [{cleanupIDs: false}]).
-             * @default true
-             */
-            namespaceIDs?: boolean;
-            /**
-             * In order to avoid CSS class name ambiguities, the default behavior is to namespace CSS class names in the source SVGs before compiling them into a sprite.
-             * Each class name is prepended with a unique string. Disable this option to keep the class names untouched.
-             * @default true
-             */
-            namespaceClassnames?: boolean;
-            /**
-             * If truthy, width and height attributes will be set on the sprite's <svg> element (where applicable).
-             * @default true
-             */
-            dimensionAttributes?: boolean;
-            /**
-             * Shorthand for applying custom attributes to the outermost <svg> element.
-             * Please be aware that certain attributes (e.g. viewBox) will be calculated dynamically and override custom rootAttributes in any case.
-             */
-            rootAttributes?: any;
-            /**
-             * Floating point precision for CSS positioning values (defaults to -1 meaning highest possible precision).
-             */
-            precision?: number;
-            /**
-             * Callback (or list of callbacks) that will be applied to the resulting SVG sprites as global [post-processing transformation](#svg-sprite-customization).
-             * transform: Function∣Array
-             */
-            transform?: SvgTransformer|SvgTransformer[];
-        }
-
-        interface SvgTransformer {
-            /**
-             * Custom sprite SVG transformation
-             * @param svg Sprite SVG
-             * @return Processed SVG
-             */
-            (svg: string): string;
-        }
-
-        interface Mode {
-            css?: CssAndViewSpecificModeConfig|boolean;
-            view?: CssAndViewSpecificModeConfig|boolean;
-            defs?: DefsAndSymbolSpecificModeConfig|boolean;
-            symbol?: DefsAndSymbolSpecificModeConfig|boolean;
-            stack?: ModeConfig|boolean;
-            [customConfigName: string]: ModeConfig;
-        }
-
-        interface ModeConfig {
-            /**
-             * Base directory for sprite and CSS file output. If not absolute, the path will be resolved using the main output directory (see global dest option).
-             * @default "<mode>"
-             */
-            dest?: string;
-            /**
-             * Used for prefixing the [shape ID](#shape-ids) during CSS selector construction. If the value is empty,
-             * no prefix will be used. The prefix may contain the placeholder "%s" (e.g. ".svg %s-svg"),
-             * which will then get replaced by the shape ID. Please be aware that "%" is a special character
-             * in this context and that you'll have to escape it by another percent sign ("%%") in case you want
-             * to output it to your stylesheets (e.g. for a [Sass placeholder selector](http://sass-lang.com/documentation/file.SASS_REFERENCE.html#placeholder_selectors_)).
-             * @default ".svg-%s"
-             */
-            prefix?: string;
-            /**
-             * A non-empty string value will trigger the creation of additional CSS rules specifying the dimensions of each shape in the sprite.
-             * The string will be used as suffix to mode.<mode>.prefix during CSS selector construction and may contain the placeholder "%s",
-             * which will get replaced by the value of mode.<mode>.prefix.
-             * A boolean TRUE will cause the dimensions to be included directly into each shape's CSS rule (only available for «css» and «view» sprites).
-             * @default "-dims"
-             */
-            dimensions?: string|boolean;
-            /**
-             * SVG sprite path and file name, relative to the mode.<mode>.dest directory.
-             * You may omit the file extension, in which case it will be set to ".svg" automatically.
-             * @default "svg/sprite.<mode>.svg"
-             */
-            sprite?: string;
-            /**
-             * Add a content based hash to the name of the sprite file so that clients reliably reload the sprite
-             * when it's content changes («cache busting»). Defaults to false except for «css» and «view» sprites.
-             * @default true∣false
-             */
-            bust?: boolean;
-            /**
-             * Collection of [stylesheet rendering configurations](#rendering-configurations).
-             * The keys are used as file extensions as well as file return keys. At present,
-             * there are default templates for the file extensions css ([CSS](http://www.w3.org/Style/CSS/)),
-             * scss ([Sass](http://sass-lang.com/)), less ([Less](http://lesscss.org/)) and styl ([Stylus](http://learnboost.github.io/stylus/)),
-             * which all reside in the directory tmpl/css. Example: {css: true, scss: {dest: '_sprite.scss'}}
-             * @default {}
-             */
-            render?: { [key: string]: RenderingConfiguration|boolean };
-            /**
-             * Enabling this will trigger the creation of an HTML document demoing the usage of the sprite. Please see below for details on [rendering configurations](#rendering-configurations).
-             * @default false
-             */
-            example?: RenderingConfiguration|boolean;
-            /**
-             * Specify svg-sprite which output mode to use with this configuration
-             */
-            mode?: string;
-        }
-
-        interface RenderingConfiguration {
-            /**
-             * HTML document Mustache template
-             * @default "tmpl/<mode>/sprite.html"
-             */
-            template?: string;
-            /**
-             * HTML document destination
-             * @default "sprite.<mode>.html"
-             */
-            dest?: string;
-        }
-
-        interface CssAndViewSpecificModeConfig extends ModeConfig {
-            /**
-             * The arrangement of the shapes within the sprite. Might be "vertical", "horizontal", "diagonal" or "packed"
-             * (with the latter being the most compact type). It depends on your project which layout is best for you.
-             * @default "packed"
-             */
-            layout?: string;
-            /**
-             * If given and not empty, this will be the selector name of a CSS rule commonly specifying the background-image
-             * and background-repeat properties for all the shapes in the sprite (thus saving some bytes by not unnecessarily repeating them for each shape)
-             */
-            common?: string;
-            /**
-             * If given and not empty, a mixin with this name will be added to supporting output formats (e.g. Sass, LESS, Stylus),
-             * specifying the background-image and background-repeat properties for all the shapes in the sprite.
-             * You may use it for creating custom CSS within @media rules. The mixin acts much like the common rule.
-             * In fact, you can even combine the two - if both are enabled, the common rule will use the mixin internally.
-             */
-            mixin?: string;
-        }
-
-        interface DefsAndSymbolSpecificModeConfig extends ModeConfig {
-            /**
-             * If you want to embed the sprite into your HTML source, you will want to set this to true
-             * in order to prevent the creation of SVG namespace declarations and to set some other attributes for effectively hiding the library sprite.
-             * @default false
-             */
-            inline?: boolean;
-        }
-
-        interface CompileCallback {
-            (error: Error, result: any, data: any): any;
-        }
-
-        interface GetShapesCallback {
-            (error: Error, result: File[]): any;
-        }
-    }
-
-    var sprite: sprite.SVGSpriterConstructor;
-
-    export = sprite;
-}
-
diff --git a/svg-sprite/tsconfig.json b/svg-sprite/tsconfig.json
new file mode 100644
index 0000000000..9590656273
--- /dev/null
+++ b/svg-sprite/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "svg-sprite-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/svgjs/svgjs.d.ts b/svg.js/index.d.ts
similarity index 100%
rename from svgjs/svgjs.d.ts
rename to svg.js/index.d.ts
diff --git a/svgjs/svgjs-tests.ts b/svg.js/svgjs-tests.ts
similarity index 97%
rename from svgjs/svgjs-tests.ts
rename to svg.js/svgjs-tests.ts
index 63fcc1ce79..0a87f3d3ae 100644
--- a/svgjs/svgjs-tests.ts
+++ b/svg.js/svgjs-tests.ts
@@ -1,9 +1,7 @@
-/// <reference path='../jquery/jquery.d.ts' />
-/// <reference path='svgjs.d.ts' />
+/// <reference types="jquery" />
  
 // create svg drawing paper
 
-
 // Example from svgjs.com
 function one() {
     var draw = SVG('canvas')
diff --git a/svg.js/tsconfig.json b/svg.js/tsconfig.json
new file mode 100644
index 0000000000..d529723a13
--- /dev/null
+++ b/svg.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "svgjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/svg2png/index.d.ts b/svg2png/index.d.ts
new file mode 100644
index 0000000000..326ef4d17c
--- /dev/null
+++ b/svg2png/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for svg2png node package 
+// Project: https://github.com/domenic/svg2png
+// Definitions by: hans windhoff <https://github.com/hansrwindhoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function svg2png(srcFile: string, destFile: string, scale: number, cb: (err:Error) => void):void;
+declare function svg2png(srcFile: string, destFile: string, cb: (err:Error) => void):void;
+
+
+export = svg2png;
diff --git a/svg2png/svg2png-tests.ts b/svg2png/svg2png-tests.ts
index 328e199aba..45a3361ec5 100644
--- a/svg2png/svg2png-tests.ts
+++ b/svg2png/svg2png-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./svg2png.d.ts" />
+
 "use strict";
 
 import svg2png = require("svg2png");
diff --git a/svg2png/svg2png.d.ts b/svg2png/svg2png.d.ts
deleted file mode 100644
index 25cdb18d1b..0000000000
--- a/svg2png/svg2png.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for svg2png node package 
-// Project: https://github.com/domenic/svg2png
-// Definitions by: hans windhoff <https://github.com/hansrwindhoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare function svg2png(srcFile: string, destFile: string, scale: number, cb: (err:Error) => void):void;
-declare function svg2png(srcFile: string, destFile: string, cb: (err:Error) => void):void;
-
-
-declare module "svg2png" {
-  export = svg2png;
-}
diff --git a/svg2png/tsconfig.json b/svg2png/tsconfig.json
new file mode 100644
index 0000000000..71da6a1cc5
--- /dev/null
+++ b/svg2png/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "svg2png-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/svgjs.draggable/svgjs.draggable.d.ts b/svgjs.draggable/index.d.ts
similarity index 100%
rename from svgjs.draggable/svgjs.draggable.d.ts
rename to svgjs.draggable/index.d.ts
diff --git a/svgjs.draggable/tsconfig.json b/svgjs.draggable/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/svgjs.draggable/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/swag/index.d.ts b/swag/index.d.ts
new file mode 100644
index 0000000000..29ba129fe5
--- /dev/null
+++ b/swag/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for swag 0.6.1
+// Project: https://github.com/elving/swag
+// Definitions by: Shogo Iwano <https://github.com/shiwano>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="handlebars" />
+
+interface SwagStatic {
+    registerHelpers(handlebars: typeof Handlebars): void;
+}
+
+declare var Swag: SwagStatic;
+
+export = Swag;
+export as namespace Swag;
+
diff --git a/swag/swag-tests.ts b/swag/swag-tests.ts
index 0dfe567371..303d223085 100644
--- a/swag/swag-tests.ts
+++ b/swag/swag-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="swag.d.ts" />
+
 
 import Handlebars = require('handlebars');
 import Swag = require('swag');
diff --git a/swag/swag.d.ts b/swag/swag.d.ts
deleted file mode 100644
index 273fce8e33..0000000000
--- a/swag/swag.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Type definitions for swag 0.6.1
-// Project: https://github.com/elving/swag
-// Definitions by: Shogo Iwano <https://github.com/shiwano>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../handlebars/handlebars.d.ts" />
-
-interface SwagStatic {
-    registerHelpers(handlebars: typeof Handlebars): void;
-}
-
-declare var Swag: SwagStatic;
-
-declare module 'swag' {
-    export = Swag;
-}
diff --git a/swag/tsconfig.json b/swag/tsconfig.json
new file mode 100644
index 0000000000..15023f12ab
--- /dev/null
+++ b/swag/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "swag-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/swaggerize-express/index.d.ts b/swaggerize-express/index.d.ts
new file mode 100644
index 0000000000..31c9627db8
--- /dev/null
+++ b/swaggerize-express/index.d.ts
@@ -0,0 +1,283 @@
+// Type definitions for swaggerize-express 4.x
+// Project: https://github.com/krakenjs/swaggerize-express
+// Definitions by: TANAKA Koichi <https://github.com/mugeso/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* =================== USAGE ===================
+ import express = require('express');
+ import swaggerize = require('swaggerize-express');
+ var app = express();
+ app.use(swaggerize({
+    api: require('./api.json'),
+    docspath: '/api-docs',
+    handlers: './handlers'
+ });
+ =============================================== */
+
+import express = require('express');
+declare function swaggerize(options: swaggerize.Options): express.RequestHandler;
+
+declare namespace swaggerize {
+    export module Swagger {
+        export interface ApiDefinition {
+            swagger: string
+            info: InfoObject
+            host?: string
+            basePath?: string
+            schemes?: string[]
+            consumes?: MimeTypes
+            produces?: MimeTypes
+            paths: PathsObject
+            definitions?: DefinitionsObject
+            parameters?: ParametersDefinitionsObject
+            responses?: ResponsesDefinitionsObject
+            securityDefinitions?: SecurityDefinitionsObject
+            security?: SecurityRequirementObject[]
+            tags?: TagObject[]
+            externalDocs?: ExternalDocumentationObject
+        }
+
+        type MimeTypes = string[]
+
+        export interface InfoObject {
+            title: string
+            description?: string
+            termsOfService?: string
+            contact?: ContactObject
+            license?: LicenseObject
+            version: string
+        }
+
+        export interface ContactObject {
+            name?: string
+            url?: string
+            email?: string
+        }
+
+        export interface LicenseObject {
+            name: string
+            url?: string
+        }
+
+        export interface PathsObject {
+            [index: string]: PathItemObject | any
+        }
+
+        export interface PathItemObject {
+            $ref?: string
+            get?: OperationObject
+            put?: OperationObject
+            post?: OperationObject
+            'delete'?: OperationObject
+            options?: OperationObject
+            head?: OperationObject
+            patch?: OperationObject
+            parameters?: Parameters
+        }
+
+        export interface OperationObject {
+            tags?: string[]
+            summary?: string
+            description?: string
+            externalDocs?: ExternalDocumentationObject
+            operationId?: string
+            consumes?: MimeTypes
+            produces?: MimeTypes
+            parameters?: Parameters
+            responses: ResponsesObject
+            schemes?: string[]
+            deprecated?: boolean
+            security?: SecurityRequirementObject[]
+        }
+
+        export interface DefinitionsObject {
+            [index: string]: SchemaObject
+        }
+
+        export interface ResponsesObject {
+            [index: string]: Response | any
+            'default': Response
+        }
+
+        type Response = ResponseObject | ReferenceObject
+
+        export interface ResponsesDefinitionsObject {
+            [index: string]: ResponseObject
+        }
+
+        export interface ResponseObject {
+            description: string
+            schema?: SchemaObject
+            headers?: HeadersObject
+            examples?: ExampleObject
+        }
+
+        export interface HeadersObject {
+            [index: string]: HeaderObject
+        }
+
+        export interface HeaderObject extends ItemsObject {
+        }
+
+        export interface ExampleObject {
+            [index: string]: any
+        }
+
+        export interface SecurityDefinitionsObject {
+            [index: string]: SecuritySchemeObject
+        }
+
+        export interface SecuritySchemeObject {
+            type: string
+            description?: string
+            name: string
+            'in': string
+            flow: string
+            authorizationUrl: string
+            tokenUrl: string
+            scopes: ScopesObject
+        }
+
+        export interface ScopesObject {
+            [index: string]: any
+        }
+
+        export interface SecurityRequirementObject {
+            [index: string]: string[]
+        }
+
+        export interface TagObject {
+            name: string
+            description?: string
+            externalDocs?: ExternalDocumentationObject
+        }
+
+        export interface ItemsObject {
+            type: string
+            format?: string
+            items?: ItemsObject
+            collectionFormat?: string
+            'default'?: any
+            maximum?: number
+            exclusiveMaximum: boolean
+            minimum?: number
+            exclusiveMinimum?: boolean
+            maxLength?: number
+            minLength?: number
+            pattern?: string
+            maxItems?: number
+            minItems?: number
+            uniqueItems?: boolean
+            'enum'?: any[]
+            multipleOf?: number
+        }
+
+        export interface ParametersDefinitionsObject {
+            [index: string]: ParameterObject
+        }
+
+        type Parameters = (ParameterObject | ReferenceObject)[]
+
+        export interface ParameterObject {
+            name: string
+            'in': string
+            description?: string
+            required?: boolean
+        }
+
+        export interface InBodyParameterObject extends ParameterObject {
+            schema: SchemaObject
+        }
+
+        export interface GeneralParameterObject extends ParameterObject, ItemsObject {
+            allowEmptyValue?: boolean
+        }
+
+        export interface ReferenceObject {
+            $ref: string
+        }
+
+        export interface ExternalDocumentationObject {
+            [index: string]: any
+            description?: string
+            url: string
+        }
+
+        export interface SchemaObject extends IJsonSchema {
+            [index: string]: any
+            discriminator?: string
+            readOnly?: boolean
+            xml?: XMLObject
+            externalDocs: ExternalDocumentationObject
+            example: any
+        }
+
+        export interface XMLObject {
+            [index: string]: any
+            name?: string
+            namespace?: string
+            prefix?: string
+            attribute?: boolean
+            wrapped?: boolean
+        }
+    }
+
+    export interface Options {
+        api: Swagger.ApiDefinition
+        docspath: String
+        handlers: String
+    }
+
+    export interface IConfig {
+        api: Swagger.ApiDefinition
+        routes: express.IRoute[]
+    }
+
+    export interface SwaggerizedExpress extends express.Express {
+        swagger: IConfig
+    }
+}
+
+interface IJsonSchema {
+    id?: string
+    $schema?: string
+    title?: string
+    description?: string
+    multipleOf?: number
+    maximum?: number
+    exclusiveMaximum?: boolean
+    minimum?: number
+    exclusiveMinimum?: boolean
+    maxLength?: number
+    minLength?: number
+    pattern?: string
+    additionalItems?: boolean | IJsonSchema
+    items?: IJsonSchema | IJsonSchema[]
+    maxItems?: number
+    minItems?: number
+    uniqueItems?: boolean
+    maxProperties?: number
+    minProperties?: number
+    required?: string[]
+    additionalProperties?: boolean | IJsonSchema
+    definitions?: {
+        [name: string]: IJsonSchema
+    }
+    properties?: {
+        [name: string]: IJsonSchema
+    }
+    patternProperties?: {
+        [name: string]: IJsonSchema
+    }
+    dependencies?: {
+        [name: string]: IJsonSchema | string[]
+    }
+    'enum'?: any[]
+    type?: string | string[]
+    allOf?: IJsonSchema[]
+    anyOf?: IJsonSchema[]
+    oneOf?: IJsonSchema[]
+    not?: IJsonSchema
+}
+
+export = swaggerize;
diff --git a/swaggerize-express/swaggerize-express-tests.ts b/swaggerize-express/swaggerize-express-tests.ts
index 03a0807ef6..1008566188 100644
--- a/swaggerize-express/swaggerize-express-tests.ts
+++ b/swaggerize-express/swaggerize-express-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="swaggerize-express.d.ts" />
 import http = require('http');
 import express = require('express');
 import swaggerize = require('swaggerize-express');
diff --git a/swaggerize-express/swaggerize-express.d.ts b/swaggerize-express/swaggerize-express.d.ts
deleted file mode 100644
index a73350b765..0000000000
--- a/swaggerize-express/swaggerize-express.d.ts
+++ /dev/null
@@ -1,289 +0,0 @@
-// Type definitions for swaggerize-express 4.x
-// Project: https://github.com/krakenjs/swaggerize-express
-// Definitions by: TANAKA Koichi <https://github.com/mugeso/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/* =================== USAGE ===================
-
- import express = require('express');
- import swaggerize = require('swaggerize-express');
- var app = express();
- app.use(swaggerize({
-    api: require('./api.json'),
-    docspath: '/api-docs',
-    handlers: './handlers'
- });
-
- =============================================== */
-
-/// <reference path="../express/express.d.ts" />
-
-declare module "swaggerize-express" {
-    import express = require('express');
-    function swaggerize(options: swaggerize.Options): express.RequestHandler;
-
-    namespace swaggerize {
-        export module Swagger {
-            export interface ApiDefinition {
-                swagger: string
-                info: InfoObject
-                host?: string
-                basePath?: string
-                schemes?: string[]
-                consumes?: MimeTypes
-                produces?: MimeTypes
-                paths: PathsObject
-                definitions?: DefinitionsObject
-                parameters?: ParametersDefinitionsObject
-                responses?: ResponsesDefinitionsObject
-                securityDefinitions?: SecurityDefinitionsObject
-                security?: SecurityRequirementObject[]
-                tags?: TagObject[]
-                externalDocs?: ExternalDocumentationObject
-            }
-
-            type MimeTypes = string[]
-
-            export interface InfoObject {
-                title: string
-                description?: string
-                termsOfService?: string
-                contact?: ContactObject
-                license?: LicenseObject
-                version: string
-            }
-
-            export interface ContactObject {
-                name?: string
-                url?: string
-                email?: string
-            }
-
-            export interface LicenseObject {
-                name: string
-                url?: string
-            }
-
-            export interface PathsObject {
-                [index: string]: PathItemObject|any
-            }
-
-            export interface PathItemObject {
-                $ref?: string
-                get?: OperationObject
-                put?: OperationObject
-                post?: OperationObject
-                'delete'?: OperationObject
-                options?: OperationObject
-                head?: OperationObject
-                patch?: OperationObject
-                parameters?: Parameters
-            }
-
-            export interface OperationObject {
-                tags?: string[]
-                summary?: string
-                description?: string
-                externalDocs?: ExternalDocumentationObject
-                operationId?: string
-                consumes?: MimeTypes
-                produces?: MimeTypes
-                parameters?: Parameters
-                responses: ResponsesObject
-                schemes?: string[]
-                deprecated?: boolean
-                security?: SecurityRequirementObject[]
-            }
-
-            export interface DefinitionsObject {
-                [index: string]: SchemaObject
-            }
-
-            export interface ResponsesObject {
-                [index: string]: Response|any
-                'default': Response
-            }
-
-            type Response = ResponseObject|ReferenceObject
-
-            export interface ResponsesDefinitionsObject {
-                [index: string]: ResponseObject
-            }
-
-            export interface ResponseObject {
-                description: string
-                schema?: SchemaObject
-                headers?: HeadersObject
-                examples?: ExampleObject
-            }
-
-            export interface HeadersObject {
-                [index: string]: HeaderObject
-            }
-
-            export interface HeaderObject extends ItemsObject {
-            }
-
-            export interface ExampleObject {
-                [index: string]: any
-            }
-
-            export interface SecurityDefinitionsObject {
-                [index: string]: SecuritySchemeObject
-            }
-
-            export interface SecuritySchemeObject {
-                type: string
-                description?: string
-                name: string
-                'in': string
-                flow: string
-                authorizationUrl: string
-                tokenUrl: string
-                scopes: ScopesObject
-            }
-
-            export interface ScopesObject {
-                [index: string]: any
-            }
-
-            export interface SecurityRequirementObject {
-                [index: string]: string[]
-            }
-
-            export interface TagObject {
-                name: string
-                description?: string
-                externalDocs?: ExternalDocumentationObject
-            }
-
-            export interface ItemsObject {
-                type: string
-                format?: string
-                items?: ItemsObject
-                collectionFormat?: string
-                'default'?: any
-                maximum?: number
-                exclusiveMaximum: boolean
-                minimum?: number
-                exclusiveMinimum?: boolean
-                maxLength?: number
-                minLength?: number
-                pattern?: string
-                maxItems?: number
-                minItems?: number
-                uniqueItems?: boolean
-                'enum'?: any[]
-                multipleOf?: number
-            }
-
-            export interface ParametersDefinitionsObject {
-                [index: string]: ParameterObject
-            }
-
-            type Parameters = (ParameterObject|ReferenceObject)[]
-
-            export interface ParameterObject {
-                name: string
-                'in': string
-                description?: string
-                required?: boolean
-            }
-
-            export interface InBodyParameterObject extends ParameterObject {
-                schema: SchemaObject
-            }
-
-            export interface GeneralParameterObject extends ParameterObject, ItemsObject {
-                allowEmptyValue?: boolean
-            }
-
-            export interface ReferenceObject {
-                $ref: string
-            }
-
-            export interface ExternalDocumentationObject {
-                [index: string]: any
-                description?: string
-                url: string
-            }
-
-            export interface SchemaObject extends IJsonSchema {
-                [index: string]: any
-                discriminator?: string
-                readOnly?: boolean
-                xml?: XMLObject
-                externalDocs: ExternalDocumentationObject
-                example: any
-            }
-
-            export interface XMLObject {
-                [index: string]: any
-                name?: string
-                namespace?: string
-                prefix?: string
-                attribute?: boolean
-                wrapped?: boolean
-            }
-        }
-
-        export interface Options {
-            api: Swagger.ApiDefinition
-            docspath: String
-            handlers: String
-        }
-
-        export interface IConfig {
-            api: Swagger.ApiDefinition
-            routes: express.IRoute[]
-        }
-
-        export interface SwaggerizedExpress extends express.Express {
-            swagger: IConfig
-        }
-    }
-
-    interface IJsonSchema {
-        id?: string
-        $schema?: string
-        title?: string
-        description?: string
-        multipleOf?: number
-        maximum?: number
-        exclusiveMaximum?: boolean
-        minimum?: number
-        exclusiveMinimum?: boolean
-        maxLength?: number
-        minLength?: number
-        pattern?: string
-        additionalItems?: boolean | IJsonSchema
-        items?: IJsonSchema | IJsonSchema[]
-        maxItems?: number
-        minItems?: number
-        uniqueItems?: boolean
-        maxProperties?: number
-        minProperties?: number
-        required?: string[]
-        additionalProperties?: boolean | IJsonSchema
-        definitions?: {
-            [name: string]: IJsonSchema
-        }
-        properties?: {
-            [name: string]: IJsonSchema
-        }
-        patternProperties?: {
-            [name: string]: IJsonSchema
-        }
-        dependencies?: {
-            [name: string]: IJsonSchema | string[]
-        }
-        'enum'?: any[]
-        type?: string | string[]
-        allOf?: IJsonSchema[]
-        anyOf?: IJsonSchema[]
-        oneOf?: IJsonSchema[]
-        not?: IJsonSchema
-    }
-
-    export = swaggerize;
-}
diff --git a/swaggerize-express/tsconfig.json b/swaggerize-express/tsconfig.json
new file mode 100644
index 0000000000..5f75eaea37
--- /dev/null
+++ b/swaggerize-express/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "swaggerize-express-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/swap-case/index.d.ts b/swap-case/index.d.ts
new file mode 100644
index 0000000000..bd3e957813
--- /dev/null
+++ b/swap-case/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for swap-case
+// Project: https://github.com/blakeembrey/swap-case
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function swapCase(string: string, locale?: string): string;
+export = swapCase;
diff --git a/swap-case/swap-case-tests.ts b/swap-case/swap-case-tests.ts
index 2a5e987efe..23a230a149 100644
--- a/swap-case/swap-case-tests.ts
+++ b/swap-case/swap-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="swap-case.d.ts" />
 
 import swapCase = require('swap-case');
 
diff --git a/swap-case/swap-case.d.ts b/swap-case/swap-case.d.ts
deleted file mode 100644
index d3c85813c6..0000000000
--- a/swap-case/swap-case.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for swap-case
-// Project: https://github.com/blakeembrey/swap-case
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "swap-case" {
-	function swapCase(string: string, locale?: string): string;
-	export = swapCase;
-}
diff --git a/swap-case/tsconfig.json b/swap-case/tsconfig.json
new file mode 100644
index 0000000000..e2385ca7a1
--- /dev/null
+++ b/swap-case/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "swap-case-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/sweetalert/sweetalert.d.ts b/sweetalert/index.d.ts
similarity index 100%
rename from sweetalert/sweetalert.d.ts
rename to sweetalert/index.d.ts
diff --git a/sweetalert/sweetalert-tests.ts b/sweetalert/sweetalert-tests.ts
index b6fa2aa1ad..d309dacf8d 100644
--- a/sweetalert/sweetalert-tests.ts
+++ b/sweetalert/sweetalert-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="sweetalert.d.ts" />
+
 
 // A basic message
 swal("Here's a message!");
diff --git a/sweetalert/tsconfig.json b/sweetalert/tsconfig.json
new file mode 100644
index 0000000000..6972f1017e
--- /dev/null
+++ b/sweetalert/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "sweetalert-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/swfobject/swfobject.d.ts b/swfobject/index.d.ts
similarity index 100%
rename from swfobject/swfobject.d.ts
rename to swfobject/index.d.ts
diff --git a/swfobject/swfobject-tests.ts b/swfobject/swfobject-tests.ts
index 87c14eb4cb..9ea252b41d 100644
--- a/swfobject/swfobject-tests.ts
+++ b/swfobject/swfobject-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="swfobject.d.ts" />
+
 
 // access to user agent.
 var userAgent = swfobject.ua;
diff --git a/swfobject/tsconfig.json b/swfobject/tsconfig.json
new file mode 100644
index 0000000000..85e04338a5
--- /dev/null
+++ b/swfobject/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "swfobject-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/swiftclick/swiftclick.d.ts b/swiftclick/index.d.ts
similarity index 100%
rename from swiftclick/swiftclick.d.ts
rename to swiftclick/index.d.ts
diff --git a/swiftclick/swiftclick-tests.ts b/swiftclick/swiftclick-tests.ts
index 237978996e..132a0e41a1 100644
--- a/swiftclick/swiftclick-tests.ts
+++ b/swiftclick/swiftclick-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="swiftclick.d.ts" />
+
 
 var swiftClick = SwiftClick.attach(document.body);
 
diff --git a/swiftclick/tsconfig.json b/swiftclick/tsconfig.json
new file mode 100644
index 0000000000..008264ad06
--- /dev/null
+++ b/swiftclick/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "swiftclick-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/swig-email-templates/index.d.ts b/swig-email-templates/index.d.ts
new file mode 100644
index 0000000000..7a0a1b97a1
--- /dev/null
+++ b/swig-email-templates/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for swig-email-templates
+// Project: https://github.com/andrewrk/swig-email-templates
+// Definitions by: Adam Babcock <https://github.com/mrhen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import swig = require('../swig');
+
+interface SwigRender<T> {
+    (file: string, context: T, callback: (err: any, html: string, text: string) => any): any;
+}
+
+interface SwigEmailTemplatesOptions extends swig.SwigOptions {
+    root?: string;
+}
+
+declare function init<T>(options: SwigEmailTemplatesOptions, cb: (err: any, render: SwigRender<T>) => any): any;
+export = init;
+
diff --git a/swig-email-templates/swig-email-templates-tests.ts b/swig-email-templates/swig-email-templates-tests.ts
index ef845b8e17..de396909a6 100644
--- a/swig-email-templates/swig-email-templates-tests.ts
+++ b/swig-email-templates/swig-email-templates-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="swig-email-templates.d.ts" />
 
 import emailTemplates = require('swig-email-templates');
 
diff --git a/swig-email-templates/swig-email-templates.d.ts b/swig-email-templates/swig-email-templates.d.ts
deleted file mode 100644
index ad762b9da7..0000000000
--- a/swig-email-templates/swig-email-templates.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Type definitions for swig-email-templates
-// Project: https://github.com/andrewrk/swig-email-templates
-// Definitions by: Adam Babcock <https://github.com/mrhen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../swig/swig.d.ts" />
-
-declare module "swig-email-templates" {
-    import swig = require('swig');
-
-    interface SwigRender<T> {
-        (file:string, context:T, callback:(err:any, html:string, text:string)=>any):any;
-    }
-
-    interface SwigEmailTemplatesOptions extends swig.SwigOptions {
-        root?: string;
-    }
-
-    function init<T>(options:SwigEmailTemplatesOptions, cb:(err:any, render:SwigRender<T>)=>any):any;
-    export = init
-}
diff --git a/swig-email-templates/tsconfig.json b/swig-email-templates/tsconfig.json
new file mode 100644
index 0000000000..56e144a810
--- /dev/null
+++ b/swig-email-templates/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "swig-email-templates-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/swig/index.d.ts b/swig/index.d.ts
new file mode 100644
index 0000000000..3a01ad0d81
--- /dev/null
+++ b/swig/index.d.ts
@@ -0,0 +1,157 @@
+// Type definitions for swig
+// Project: http://github.com/paularmstrong/swig
+// Definitions by: Peter Harris <https://github.com/CodeAnimal>, Carlos Ballesteros Velasco <https://github.com/soywiz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// API Documentation : http://paularmstrong.github.io/swig/docs/api/
+
+
+export declare class Swig {
+    constructor(options?: SwigOptions);
+
+    setFilter(
+        name: string,
+        method: (input: any, ...args: any[]) => string
+    ): void;
+    setTag(
+        name: string,
+        parse: (str?: string, line?: string, parser?: Object, types?: lexer.TYPES, stack?: any, opts?: Object, swig?: Swig) => boolean,
+        compile: (compiler?: (content?: string, parents?: any, options?: any, blockName?: string) => string, args?: any[], content?: string, parents?: any, options?: any, blockName?: string) => string,
+        ends?: boolean,
+        blockLevel?: boolean
+    ): void;
+    setExtension(name: string, object: any): void;
+    parseFile(pathName: string, options?: any): parser.ParseReturn;
+    precompile(source: string, options?: SwigOptions): any;
+    compile(source: string, options?: SwigOptions): (locals?: any) => string;
+    compileFile(pathname: string, options: SwigOptions, cb: (err: Error, compiledRender: (locals?: any) => string) => void): void;
+    compileFile(pathname: string, options?: SwigOptions): (locals?: any) => string;
+    render(source: string, options?: SwigOptions): string;
+    renderFile(pathName: string, locals: any, cb: (err: Error, output: string) => void): void;
+    renderFile(pathName: string, locals?: any): string;
+    run(templateFn: Function, locals?: any, filePath?: string): string;
+    invalidateCache(): void;
+
+    loaders: typeof loaders;
+}
+
+export declare module lexer {
+    export enum TYPES {
+        /** Whitespace */
+        WHITESPACE = 0,
+        /** Plain string */
+        STRING = 1,
+        /** Variable filter */
+        FILTER = 2,
+        /** Empty variable filter */
+        FILTEREMPTY = 3,
+        /** Function */
+        FUNCTION = 4,
+        /** Function with no arguments */
+        FUNCTIONEMPTY = 5,
+        /** Open parenthesis */
+        PARENOPEN = 6,
+        /** Close parenthesis */
+        PARENCLOSE = 7,
+        /** Comma */
+        COMMA = 8,
+        /** Variable */
+        VAR = 9,
+        /** Number */
+        NUMBER = 10,
+        /** Math operator */
+        OPERATOR = 11,
+        /** Open square bracket */
+        BRACKETOPEN = 12,
+        /** Close square bracket */
+        BRACKETCLOSE = 13,
+        /** Key on an object using dot-notation */
+        DOTKEY = 14,
+        /** Start of an array */
+        ARRAYOPEN = 15,
+        /** End of an array
+         * Currently unused
+        ARRAYCLOSE = 16, */
+        /** Open curly brace */
+        CURLYOPEN = 17,
+        /** Close curly brace */
+        CURLYCLOSE = 18,
+        /** Colon (:) */
+        COLON = 19,
+        /** JavaScript-valid comparator */
+        COMPARATOR = 20,
+        /** Boolean logic */
+        LOGIC = 21,
+        /** Boolean logic "not" */
+        NOT = 22,
+        /** true or false */
+        BOOL = 23,
+        /** Variable assignment */
+        ASSIGNMENT = 24,
+        /** Start of a method */
+        METHODOPEN = 25,
+        /** End of a method
+         * Currently unused
+        METHODEND = 26, */
+        /** Unknown type */
+        UNKNOWN = 100
+    }
+
+    export function read(str: string): string[];
+}
+
+export declare module parser {
+    interface ParseReturn {
+        name: string;
+        parent: any;
+        tokens: any[];
+        blocks: any;
+    }
+}
+
+export interface SwigOptions {
+    autoescape?: boolean;
+    cache?: any;
+    cmtControls?: string[];
+    loader?: TemplateLoader;
+    locals?: any;
+    tagControls?: string[];
+    varControls?: string[];
+}
+
+export interface TemplateLoader {
+    resolve(to: string, from: string): string;
+    load(identifier: string, callback?: (err: Error, data: any) => void): void;
+    load(identifier: string): any;
+}
+
+export declare module loaders {
+    export function fs(basepath?: string, encoding?: string): TemplateLoader;
+    export function memory(mapping: any, basepath?: string): TemplateLoader;
+}
+
+export declare var version: string;
+export declare function setDefaults(options: SwigOptions): void;
+export declare function setDefaultTZOffset(offset: number): void;
+export declare function setFilter(
+    name: string,
+    method: (input: any, ...args: any[]) => string
+): void;
+export declare function setTag(
+    name: string,
+    parse: (str?: string, line?: string, parser?: Object, types?: lexer.TYPES, stack?: any, opts?: Object, swig?: Swig) => boolean,
+    compile: (compiler?: (content?: string, parents?: any, options?: any, blockName?: string) => string, args?: any[], content?: string, parents?: any, options?: any, blockName?: string) => string,
+    ends?: boolean,
+    blockLevel?: boolean
+): void;
+export declare function setExtension(name: string, object: any): void;
+export declare function parseFile(pathName: string, options?: any): parser.ParseReturn;
+export declare function precompile(source: string, options?: SwigOptions): any;
+export declare function compile(source: string, options?: SwigOptions): (locals?: any) => string;
+export declare function compileFile(pathname: string, options: SwigOptions, cb: (err: Error, compiledRender: (locals?: any) => string) => void): void;
+export declare function compileFile(pathname: string, options?: SwigOptions): (locals?: any) => string;
+export declare function render(source: string, options?: SwigOptions): string;
+export declare function renderFile(pathName: string, locals: any, cb: (err: Error, output: string) => void): void;
+export declare function renderFile(pathName: string, locals?: any): string
+export declare function run(templateFn: Function, locals?: any, filePath?: string): string;
+export declare function invalidateCache(): void;
diff --git a/swig/swig-tests.ts b/swig/swig-tests.ts
index 929a67c890..0c6c130b23 100644
--- a/swig/swig-tests.ts
+++ b/swig/swig-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="swig.d.ts" />
-
-import swig = require('swig');
+import swig = require('./');
 
 var swigObj: swig.Swig;
 var value: any;
diff --git a/swig/swig.d.ts b/swig/swig.d.ts
deleted file mode 100644
index 5e5914afb0..0000000000
--- a/swig/swig.d.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-// Type definitions for swig
-// Project: http://github.com/paularmstrong/swig
-// Definitions by: Peter Harris <https://github.com/CodeAnimal>, Carlos Ballesteros Velasco <https://github.com/soywiz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// API Documentation : http://paularmstrong.github.io/swig/docs/api/
-
-declare module "swig" {
-    export class Swig {
-        constructor(options?: SwigOptions);
-
-        setFilter(
-            name: string,
-            method: (input: any, ...args: any[]) => string
-            ): void;
-        setTag(
-            name: string,
-            parse: (str?: string, line?: string, parser?: Object, types?: lexer.TYPES, stack?: any, opts?: Object, swig?: Swig) => boolean,
-            compile: (compiler?: (content?: string, parents?: any, options?: any, blockName?: string) => string, args?: any[], content?: string, parents?: any, options?: any, blockName?: string) => string,
-            ends?: boolean,
-            blockLevel?: boolean
-            ): void;
-        setExtension(name: string, object: any): void;
-        parseFile(pathName: string, options?: any): parser.ParseReturn;
-        precompile(source: string, options?: SwigOptions): any;
-        compile(source: string, options?: SwigOptions): (locals?: any) => string;
-        compileFile(pathname: string, options: SwigOptions, cb: (err: Error, compiledRender: (locals?: any) => string) => void): void;
-        compileFile(pathname: string, options?: SwigOptions): (locals?: any) => string;
-        render(source: string, options?: SwigOptions): string;
-        renderFile(pathName: string, locals: any, cb: (err: Error, output: string) => void): void;
-        renderFile(pathName: string, locals?: any): string;
-        run(templateFn: Function, locals?: any, filePath?: string): string;
-        invalidateCache(): void;
-
-        loaders: typeof loaders;
-    }
-
-    export module lexer {
-        export enum TYPES {
-            /** Whitespace */
-            WHITESPACE = 0,
-            /** Plain string */
-            STRING = 1,
-            /** Variable filter */
-            FILTER = 2,
-            /** Empty variable filter */
-            FILTEREMPTY = 3,
-            /** Function */
-            FUNCTION = 4,
-            /** Function with no arguments */
-            FUNCTIONEMPTY = 5,
-            /** Open parenthesis */
-            PARENOPEN = 6,
-            /** Close parenthesis */
-            PARENCLOSE = 7,
-            /** Comma */
-            COMMA = 8,
-            /** Variable */
-            VAR = 9,
-            /** Number */
-            NUMBER = 10,
-            /** Math operator */
-            OPERATOR = 11,
-            /** Open square bracket */
-            BRACKETOPEN = 12,
-            /** Close square bracket */
-            BRACKETCLOSE = 13,
-            /** Key on an object using dot-notation */
-            DOTKEY = 14,
-            /** Start of an array */
-            ARRAYOPEN = 15,
-            /** End of an array
-             * Currently unused
-            ARRAYCLOSE = 16, */
-            /** Open curly brace */
-            CURLYOPEN = 17,
-            /** Close curly brace */
-            CURLYCLOSE = 18,
-            /** Colon (:) */
-            COLON = 19,
-            /** JavaScript-valid comparator */
-            COMPARATOR = 20,
-            /** Boolean logic */
-            LOGIC = 21,
-            /** Boolean logic "not" */
-            NOT = 22,
-            /** true or false */
-            BOOL = 23,
-            /** Variable assignment */
-            ASSIGNMENT = 24,
-            /** Start of a method */
-            METHODOPEN = 25,
-            /** End of a method
-             * Currently unused
-            METHODEND = 26, */
-            /** Unknown type */
-            UNKNOWN = 100
-        }
-
-        export function read(str: string): string[];
-    }
-
-    export module parser {
-        interface ParseReturn {
-            name: string;
-            parent: any;
-            tokens: any[];
-            blocks: any;
-        }
-    }
-
-    export interface SwigOptions {
-        autoescape?: boolean;
-        cache?: any;
-        cmtControls?: string[];
-        loader?: TemplateLoader;
-        locals?: any;
-        tagControls?: string[];
-        varControls?: string[];
-    }
-
-    export interface TemplateLoader {
-        resolve(to: string, from: string): string;
-        load(identifier: string, callback?: (err: Error, data: any) => void): void;
-        load(identifier:string): any;
-    }
-
-    export module loaders {
-        export function fs(basepath?: string, encoding?: string): TemplateLoader;
-        export function memory(mapping: any, basepath?: string): TemplateLoader;
-    }
-
-    export var version: string;
-    export function setDefaults(options: SwigOptions): void;
-    export function setDefaultTZOffset(offset: number): void;
-    export function setFilter(
-        name: string,
-        method: (input: any, ...args: any[]) => string
-        ): void;
-    export function setTag(
-        name: string,
-        parse: (str?: string, line?: string, parser?: Object, types?: lexer.TYPES, stack?: any, opts?: Object, swig?: Swig) => boolean,
-        compile: (compiler?: (content?: string, parents?: any, options?: any, blockName?: string) => string, args?: any[], content?: string, parents?: any, options?: any, blockName?: string) => string,
-        ends?: boolean,
-        blockLevel?: boolean
-        ): void;
-    export function setExtension(name: string, object: any): void;
-    export function parseFile(pathName: string, options?: any): parser.ParseReturn;
-    export function precompile(source: string, options?: SwigOptions): any;
-    export function compile(source: string, options?: SwigOptions): (locals?: any) => string;
-    export function compileFile(pathname: string, options: SwigOptions, cb: (err: Error, compiledRender: (locals?: any) => string) => void): void;
-    export function compileFile(pathname: string, options?: SwigOptions): (locals?: any) => string;
-    export function render(source: string, options?: SwigOptions): string;
-    export function renderFile(pathName: string, locals: any, cb: (err: Error, output: string) => void): void;
-    export function renderFile(pathName: string, locals?: any): string
-    export function run(templateFn: Function, locals?: any, filePath?: string): string;
-    export function invalidateCache(): void;
-}
diff --git a/swig/tsconfig.json b/swig/tsconfig.json
new file mode 100644
index 0000000000..f0daf1dc2a
--- /dev/null
+++ b/swig/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "swig-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/swipe/swipe.d.ts b/swipe/index.d.ts
similarity index 100%
rename from swipe/swipe.d.ts
rename to swipe/index.d.ts
diff --git a/swipe/swipe-tests.ts b/swipe/swipe-tests.ts
index a13006ebbb..50ef24a86f 100644
--- a/swipe/swipe-tests.ts
+++ b/swipe/swipe-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="swipe.d.ts" />
+
 
 // Creation of element
 var mySwipe = new Swipe(document.getElementById('slider'));
\ No newline at end of file
diff --git a/swipe/tsconfig.json b/swipe/tsconfig.json
new file mode 100644
index 0000000000..e62d0b02dc
--- /dev/null
+++ b/swipe/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "swipe-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/swiper/index.d.ts b/swiper/index.d.ts
new file mode 100644
index 0000000000..4b256e5a80
--- /dev/null
+++ b/swiper/index.d.ts
@@ -0,0 +1,195 @@
+// Type definitions for Swiper 2.0.0
+// Project: https://github.com/nolimits4web/Swiper
+// Definitions by: Sebastián Galiano <https://github.com/sgaliano/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+interface SwiperOptions {
+    speed?: number;
+    autoplay?: number;
+    mode?: string;
+    loop?: boolean;
+    loopAdditionalSlides?: number;
+    slidesPerView?: any;
+    slidesPerGroup?: number;
+    calculateHeight?: boolean;
+    updateOnImagesReady?: boolean;
+    releaseFormElements?: boolean;
+    watchActiveIndex?: boolean;
+    visibilityFullFit?: boolean;
+    autoResize?: boolean;
+    resizeReInit?: boolean;
+    DOMAnimation?: boolean;
+    resistance?: any;
+    noSwiping?: boolean;
+    preventLinks?: boolean;
+    initialSlide?: number;
+    useCSS3Transforms?: boolean;
+
+    // Free Mode and Scroll Container
+    freeMode?: boolean;
+    freeModeFluid?: boolean;
+    scrollContainer?: boolean;
+    momentumRatio?: number;
+    momentumBounce?: boolean;
+    momentumBounceRatio?: number;
+
+    // Slides offset
+    centeredSlides?: boolean;
+    offsetPxBefore?: number;
+    offsetPxAfter?: number;
+    offsetSlidesBefore?: number;
+    offsetSlidesAfter?: number;
+
+    // Touch/mouse interactions
+    touchRatio?: number;
+    simulateTouch?: boolean;
+    onlyExternal?: boolean;
+    followFinger?: boolean;
+    grabCursor?: boolean;
+    shortSwipes?: boolean;
+    moveStartThreshold?: number;
+
+    // Navigation
+    keyboardControl?: boolean;
+    mousewheelControl?: boolean;
+
+    // Pagination
+    pagination?: any;
+    paginationClickable?: boolean;
+    paginationAsRange?: boolean;
+    createPagination?: boolean;
+
+    // Namespace
+    wrapperClass?: string;
+    slideClass?: string;
+    slideActiveClass?: string;
+    slideVisibleClass?: string;
+    slideElement?: string;
+    noSwipingClass?: string;
+    paginationElement?: string;
+    paginationElementClass?: string;
+    paginationActiveClass?: string;
+    paginationVisibleClass?: string;
+
+    // Callbacks
+    queueStartCallbacks?: boolean;
+    queueEndCallbacks?: boolean;
+    onTouchStart?: (swiper: Swiper) => void;
+    onTouchMove?: (swiper: Swiper) => void;
+    onTouchEnd?: (swiper: Swiper) => void;
+    onSlideReset?: (swiper: Swiper) => void;
+    onSlideChangeStart?: (swiper: Swiper) => void;
+    onSlideChangeEnd?: (swiper: Swiper) => void;
+    onSlideClick?: (swiper: Swiper) => void;
+    onSlideTouch?: (swiper: Swiper) => void;
+    onImagesReady?: (swiper: Swiper) => void;
+    onMomentumBounce?: (swiper: Swiper) => void;
+    onResistanceBefore?: (swiper: Swiper, distance: any) => void;
+    onResistanceAfter?: (swiper: Swiper, distance: any) => void;
+
+    // Slides Loader
+    loader?: {
+        slides?: any[];
+        slidesHTMLType?: string;
+        surroundGroups?: number;
+        logic?: string;
+        loadAllSlides?: boolean;
+    };
+
+    // Plugins
+    scrollbar?: SwiperScrollbarOptions;
+}
+
+interface SwiperScrollbarOptions {
+    container: string;          // Default: '.swiper-scrollbar'
+    draggable?: boolean;        // Default: true
+    hide?: boolean;             // Default: true
+    snapOnRelease?: boolean;    // Default: false
+}
+
+declare class SwiperSlide {
+    append(): SwiperSlide;
+    clone(): SwiperSlide;
+    getWidth(): number;
+    getHeight(): number;
+    getOffset(): { top: number; left: number; };
+    insertAfter(index: number): SwiperSlide;
+    prepend(): SwiperSlide;
+    remove(): void;
+}
+
+declare class Swiper {
+    constructor(container: string, options?: SwiperOptions);
+    constructor(container: Element, options?: SwiperOptions);
+
+    // Properties
+    width: number;
+    height: number;
+    params: any;
+    positions: any;
+
+    // Feature detection
+    support: {
+        touch: boolean;
+        transforms: boolean;
+        transforms3d: boolean;
+        transitions: boolean;
+    };
+
+    // Browser detection
+    browser: {
+        ie8: boolean;
+        ie10: boolean;
+    };
+
+    // Navigation
+    activeIndex: number;
+    activeLoopIndex: number;
+    activeLoaderIndex: number;
+    previousIndex: number;
+    swipeNext(internal?: boolean): boolean;
+    swipePrev(internal?: boolean): boolean;
+    swipeReset(): boolean;
+    swipeTo(index: number, speed?: number, runCallbacks?: boolean): boolean;
+    activeSlide(): SwiperSlide;
+    updateActiveSlide(index: number): void;
+
+    // Events
+    touches: any;
+    isTouched: boolean;
+    clickedSlideIndex: number;
+    clickedSlide: SwiperSlide;
+    wrapperTransitionEnd(callback: () => void, permanent: boolean): void;
+
+    // Init/reset
+    destroy(removeResizeEvent?: boolean): void;
+    reInit(forceCalcSlides?: boolean): void;
+    resizeFix(reInit?: boolean): void;
+
+    // Autoplaying
+    autoplay: boolean;
+    startAutoplay(): void;
+    stopAutoplay(): void;
+
+    // Other methods
+    getWrapperTranslate(axis: string): number;  // 'x' or 'y'
+    setWrapperTranslate(x: number, y: number, z: number): void;
+    setWrapperTransition(duration: any): void;
+
+    // Slides API
+    slides: SwiperSlide[];
+    createSlide(html: string, slideClassList?: string, element?: string): SwiperSlide;
+    appendSlide(html: string, slideClassList?: string, element?: string): SwiperSlide;
+    appendSlide(slideInstance: HTMLElement): SwiperSlide;
+    prependSlide(html: string, slideClassList?: string, element?: string): SwiperSlide;
+    prependSlide(slideInstance: HTMLElement): SwiperSlide;
+    insertSlideAfter(index: number, html: string, slideClassList?: string, element?: string): SwiperSlide;
+    insertSlideAfter(index: number, slideInstance: HTMLElement): SwiperSlide;
+    removeSlide(index: number): boolean;
+    removeLastSlide(): boolean;
+    removeAllSlides(): void;
+    getSlide(index: number): SwiperSlide;
+    getLastSlide(): SwiperSlide;
+    getFirstSlide(): SwiperSlide;
+}
\ No newline at end of file
diff --git a/swiper/swiper-tests.ts b/swiper/swiper-tests.ts
index 55c004124a..12abcc8944 100644
--- a/swiper/swiper-tests.ts
+++ b/swiper/swiper-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="swiper.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+
+/// <reference types="jquery" />
 
 //
 // Main demos
diff --git a/swiper/swiper-tests.ts.tscparams b/swiper/swiper-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/swiper/swiper-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/swiper/swiper.d.ts b/swiper/swiper.d.ts
deleted file mode 100644
index f3c906710d..0000000000
--- a/swiper/swiper.d.ts
+++ /dev/null
@@ -1,195 +0,0 @@
-// Type definitions for Swiper 2.0.0
-// Project: https://github.com/nolimits4web/Swiper
-// Definitions by: Sebastián Galiano <https://github.com/sgaliano/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-interface SwiperOptions {
-    speed?: number;
-    autoplay?: number;
-    mode?: string;
-    loop?: boolean;
-    loopAdditionalSlides?: number;
-    slidesPerView?: any;
-    slidesPerGroup?: number;
-    calculateHeight?: boolean;
-    updateOnImagesReady?: boolean;
-    releaseFormElements?: boolean;
-    watchActiveIndex?: boolean;
-    visibilityFullFit?: boolean;
-    autoResize?: boolean;
-    resizeReInit?: boolean;
-    DOMAnimation?: boolean;
-    resistance?: any;
-    noSwiping?: boolean;
-    preventLinks?: boolean;
-    initialSlide?: number;
-    useCSS3Transforms?: boolean;
-
-    // Free Mode and Scroll Container
-    freeMode?: boolean;
-    freeModeFluid?: boolean;
-    scrollContainer?: boolean;
-    momentumRatio?: number;
-    momentumBounce?: boolean;
-    momentumBounceRatio?: number;
-
-    // Slides offset
-    centeredSlides?: boolean;
-    offsetPxBefore?: number;
-    offsetPxAfter?: number;
-    offsetSlidesBefore?: number;
-    offsetSlidesAfter?: number;
-
-    // Touch/mouse interactions
-    touchRatio?: number;
-    simulateTouch?: boolean;
-    onlyExternal?: boolean;
-    followFinger?: boolean;
-    grabCursor?: boolean;
-    shortSwipes?: boolean;
-    moveStartThreshold?: number;
-
-    // Navigation
-    keyboardControl?: boolean;
-    mousewheelControl?: boolean;
-
-    // Pagination
-    pagination?: any;
-    paginationClickable?: boolean;
-    paginationAsRange?: boolean;
-    createPagination?: boolean;
-
-    // Namespace
-    wrapperClass?: string;
-    slideClass?: string;
-    slideActiveClass?: string;
-    slideVisibleClass?: string;
-    slideElement?: string;
-    noSwipingClass?: string;
-    paginationElement?: string;
-    paginationElementClass?: string;
-    paginationActiveClass?: string;
-    paginationVisibleClass?: string;
-
-    // Callbacks
-    queueStartCallbacks?: boolean;
-    queueEndCallbacks?: boolean;
-    onTouchStart?: (swiper: Swiper) => void;
-    onTouchMove?: (swiper: Swiper) => void;
-    onTouchEnd?: (swiper: Swiper) => void;
-    onSlideReset?: (swiper: Swiper) => void;
-    onSlideChangeStart?: (swiper: Swiper) => void;
-    onSlideChangeEnd?: (swiper: Swiper) => void;
-    onSlideClick?: (swiper: Swiper) => void;
-    onSlideTouch?: (swiper: Swiper) => void;
-    onImagesReady?: (swiper: Swiper) => void;
-    onMomentumBounce?: (swiper: Swiper) => void;
-    onResistanceBefore?: (swiper: Swiper, distance) => void;
-    onResistanceAfter?: (swiper: Swiper, distance) => void;
-
-    // Slides Loader
-    loader?: {
-        slides?: any[];
-        slidesHTMLType?: string;
-        surroundGroups?: number;
-        logic?: string;
-        loadAllSlides?: boolean;
-    };
-
-    // Plugins
-    scrollbar?: SwiperScrollbarOptions;
-}
-
-interface SwiperScrollbarOptions {
-    container: string;          // Default: '.swiper-scrollbar'
-    draggable?: boolean;        // Default: true
-    hide?: boolean;             // Default: true
-    snapOnRelease?: boolean;    // Default: false
-}
-
-declare class SwiperSlide {
-    append(): SwiperSlide;
-    clone(): SwiperSlide;
-    getWidth(): number;
-    getHeight(): number;
-    getOffset(): { top: number; left: number; };
-    insertAfter(index: number): SwiperSlide;
-    prepend(): SwiperSlide;
-    remove(): void;
-}
-
-declare class Swiper {
-    constructor(container: string, options?: SwiperOptions);
-    constructor(container: Element, options?: SwiperOptions);
-
-    // Properties
-    width: number;
-    height: number;
-    params;
-    positions;
-
-    // Feature detection
-    support: {
-        touch: boolean;
-        transforms: boolean;
-        transforms3d: boolean;
-        transitions: boolean;
-    };
-
-    // Browser detection
-    browser: {
-        ie8: boolean;
-        ie10: boolean;
-    };
-
-    // Navigation
-    activeIndex: number;
-    activeLoopIndex: number;
-    activeLoaderIndex: number;
-    previousIndex: number;
-    swipeNext(internal?: boolean): boolean;
-    swipePrev(internal?: boolean): boolean;
-    swipeReset(): boolean;
-    swipeTo(index: number, speed?: number, runCallbacks?: boolean): boolean;
-    activeSlide(): SwiperSlide;
-    updateActiveSlide(index: number): void;
-
-    // Events
-    touches;
-    isTouched: boolean;
-    clickedSlideIndex: number;
-    clickedSlide: SwiperSlide;
-    wrapperTransitionEnd(callback: () => void, permanent: boolean): void;
-
-    // Init/reset
-    destroy(removeResizeEvent?: boolean): void;
-    reInit(forceCalcSlides?: boolean): void;
-    resizeFix(reInit?: boolean): void;
-
-    // Autoplaying
-    autoplay: boolean;
-    startAutoplay(): void;
-    stopAutoplay(): void;
-
-    // Other methods
-    getWrapperTranslate(axis: string): number;  // 'x' or 'y'
-    setWrapperTranslate(x: number, y: number, z: number): void;
-    setWrapperTransition(duration): void;
-
-    // Slides API
-    slides: SwiperSlide[];
-    createSlide(html: string, slideClassList?: string, element?: string): SwiperSlide;
-    appendSlide(html: string, slideClassList?: string, element?: string): SwiperSlide;
-    appendSlide(slideInstance: HTMLElement): SwiperSlide;
-    prependSlide(html: string, slideClassList?: string, element?: string): SwiperSlide;
-    prependSlide(slideInstance: HTMLElement): SwiperSlide;
-    insertSlideAfter(index: number, html: string, slideClassList?: string, element?: string): SwiperSlide;
-    insertSlideAfter(index: number, slideInstance: HTMLElement): SwiperSlide;
-    removeSlide(index: number): boolean;
-    removeLastSlide(): boolean;
-    removeAllSlides(): void;
-    getSlide(index: number): SwiperSlide;
-    getLastSlide(): SwiperSlide;
-    getFirstSlide(): SwiperSlide;
-}
\ No newline at end of file
diff --git a/swiper/swiper.d.ts.tscparams b/swiper/swiper.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/swiper/swiper.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/swiper/tsconfig.json b/swiper/tsconfig.json
new file mode 100644
index 0000000000..8355f9631c
--- /dev/null
+++ b/swiper/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "swiper-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/swipeview/swipeview.d.ts b/swipeview/index.d.ts
similarity index 100%
rename from swipeview/swipeview.d.ts
rename to swipeview/index.d.ts
diff --git a/swipeview/swipeview-tests.ts b/swipeview/swipeview-tests.ts
index e9781133f0..245f8d2327 100644
--- a/swipeview/swipeview-tests.ts
+++ b/swipeview/swipeview-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="swipeview.d.ts" />
+
 
 function demo1() {
     document.addEventListener('touchmove', function (e) { e.preventDefault(); }, false);
diff --git a/swipeview/swipeview-tests.ts.tscparams b/swipeview/swipeview-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/swipeview/swipeview-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/swipeview/tsconfig.json b/swipeview/tsconfig.json
new file mode 100644
index 0000000000..3268731d69
--- /dev/null
+++ b/swipeview/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "swipeview-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/switchery/index.d.ts b/switchery/index.d.ts
new file mode 100644
index 0000000000..5ddaff456f
--- /dev/null
+++ b/switchery/index.d.ts
@@ -0,0 +1,92 @@
+// Type definitions for switchery 0.8.1
+// Project: https://github.com/abpetkov/switchery
+// Definitions by: Bruno Grieder <https://github.com/bgrieder>, Clayton Lautier <https://github.com/claylaut>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var switchery: Switchery.SwitcheryStatic;
+export default switchery;
+export as namespace Switchery;
+
+declare namespace Switchery {
+
+    interface SwitcheryStatic {
+        new (node: Node, options?: Options): Switchery;
+    }
+
+    interface Options {
+
+        /**
+         * color of the switch element (HEX or RGB value)
+         * @default '#64bd63'
+         */
+        color?: string;
+        /**
+         * secondary color for background color and border, when the switch is off
+         * @default '#dfdfdf'
+         */
+        secondaryColor?: string;
+        /**
+         * color of the jack/handle element
+         * @default '#fff'
+         */
+        jackColor?: string;
+        /**
+         * color of unchecked jack/handle element
+         * @default 'null'
+		 */
+        jackSecondaryColor?: string;
+        /**
+         * class name for the switch element (by default styled in switchery.css)
+         * @default 'switchery'
+         */
+        className?: string;
+        /**
+         * enable or disable click events and changing the state of the switch (boolean value)
+         * @default false
+         */
+        disabled?: boolean;
+        /**
+         * opacity of the switch when it's disabled (0 to 1)
+         * @default 0.5
+         */
+        disabledOpacity?: number;
+        /**
+         * length of time that the transition will take, ex. '0.4s', '1s', '2.2s' (Note: transition speed of the handle is twice shorter)
+         * @default '0.1s'
+         */
+        speed?: string;
+        /**
+         * size of the switch element (small or large)
+         * @default 'default'
+         */
+        size?: string;
+    }
+}
+
+interface Switchery {
+
+	/**
+     * Unbinding all event handlers attached to the switch element to prepare the object for garbage collection.
+     * @returns {void}
+     */
+    destroy(): void;
+
+	/**
+     * Enable disabled switch by re-adding event handlers and changing the opacity to 1.
+     * @returns {void}
+     */
+    enable(): void;
+
+	/**
+     * Disable switch by unbinding attached events and changing opacity to disabledOpacity value
+     * @returns {void}
+     */
+    disable(): void;
+
+	/**
+     * Check if switch is currently disabled by checking the readonly and disabled attributes on the checkbox and the disabled option set via JS.
+     *  If any of those are present, the returned value is true.
+     * @returns {boolean} whether it's disabled or not.
+     */
+    isDisabled(): boolean;
+}
diff --git a/switchery/switchery-tests.ts b/switchery/switchery-tests.ts
index 35bd77920f..b1894ef2db 100644
--- a/switchery/switchery-tests.ts
+++ b/switchery/switchery-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="switchery.d.ts"/>
-
 //
 // Examples from https://github.com/abpetkov/switchery
 //
diff --git a/switchery/switchery.d.ts b/switchery/switchery.d.ts
deleted file mode 100644
index d17802d5b2..0000000000
--- a/switchery/switchery.d.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-// Type definitions for switchery 0.8.1
-// Project: https://github.com/abpetkov/switchery
-// Definitions by: Bruno Grieder <https://github.com/bgrieder>, Clayton Lautier <https://github.com/claylaut>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace Switchery {
-
-    interface SwitcheryStatic {
-        new (node: Node, options?: Options): Switchery;
-    }
-
-    interface Options {
-
-        /**
-         * color of the switch element (HEX or RGB value)
-         * @default '#64bd63'
-         */
-        color?: string;
-        /**
-         * secondary color for background color and border, when the switch is off
-         * @default '#dfdfdf'
-         */
-        secondaryColor?: string;
-        /**
-         * color of the jack/handle element
-         * @default '#fff'
-         */
-        jackColor?: string;
-        /**
-         * color of unchecked jack/handle element
-         * @default 'null'
-		 */
-        jackSecondaryColor?: string;
-        /**
-         * class name for the switch element (by default styled in switchery.css)
-         * @default 'switchery'
-         */
-        className?: string;
-        /**
-         * enable or disable click events and changing the state of the switch (boolean value)
-         * @default false
-         */
-        disabled?: boolean;
-        /**
-         * opacity of the switch when it's disabled (0 to 1)
-         * @default 0.5
-         */
-        disabledOpacity?: number;
-        /**
-         * length of time that the transition will take, ex. '0.4s', '1s', '2.2s' (Note: transition speed of the handle is twice shorter)
-         * @default '0.1s'
-         */
-        speed?: string;
-        /**
-         * size of the switch element (small or large)
-         * @default 'default'
-         */
-        size?: string;
-    }
-}
-
-interface Switchery {
-
-	/**
-     * Unbinding all event handlers attached to the switch element to prepare the object for garbage collection.
-     * @returns {void}
-     */
-    destroy(): void;
-
-	/**
-     * Enable disabled switch by re-adding event handlers and changing the opacity to 1.
-     * @returns {void}
-     */
-    enable(): void;
-
-	/**
-     * Disable switch by unbinding attached events and changing opacity to disabledOpacity value
-     * @returns {void}
-     */
-    disable(): void;
-
-	/**
-     * Check if switch is currently disabled by checking the readonly and disabled attributes on the checkbox and the disabled option set via JS.
-     *  If any of those are present, the returned value is true.
-     * @returns {boolean} whether it's disabled or not.
-     */
-    isDisabled(): boolean;
-}
-
-declare module "switchery" {
-    var switchery: Switchery.SwitcheryStatic;
-    export default switchery;
-}
diff --git a/switchery/tsconfig.json b/switchery/tsconfig.json
new file mode 100644
index 0000000000..31fdfbbe8c
--- /dev/null
+++ b/switchery/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "switchery-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/swiz/index.d.ts b/swiz/index.d.ts
new file mode 100644
index 0000000000..dfbb3d5de5
--- /dev/null
+++ b/swiz/index.d.ts
@@ -0,0 +1,194 @@
+// Type definitions for swiz
+// Project: https://github.com/racker/node-swiz
+// Definitions by: Jeff Goddard <https://github.com/jedigo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/swiz.d.ts
+
+
+export declare class Cidr {
+    constructor(x: string, y?: string);
+    isInCIDR(x: any): boolean;
+}
+
+export declare class Valve {
+    constructor(schema: IValveSchema, baton?: any);
+    setSchema(schema: IValveSchema): Valve;
+    addFinalValidator(func: (obj: any, callback: (err: Error, cleaned: any) => void) => void): Valve;
+    addChainValidator(name: string, description: string, func: (value: any, callback: (err: Error, cleaned: any) => void) => void): void;
+    check(obj: any, options: ICheckOptions, callback: (err: any, cleaned: any) => void): void;
+    check(obj: any, callback: (err: any, cleaned: any) => void): void;
+    checkUpdate(existing: any, obj: any, callback: (err: any, cleaned: any) => void): void;
+    help(schema: IValveSchema): any;
+}
+
+export interface ICheckOptions {
+    strict?: boolean;
+}
+
+export interface IValveSchema {
+    [index: string]: IValveSchemaMember;
+}
+
+export interface IValveSchemaMember { }
+
+export interface IValveSchemaMemberArray extends IValveSchemaMember {
+    [index: string]: IValveSchemaMember;
+}
+
+export declare function Chain(): IChain;
+
+export declare function chain(): IChain;
+
+export interface IChain extends IValveSchemaMember {
+    getValidatorPos(name: string): number;
+    hasValidator(name: string): number;
+    getValidatorAtPos(pos: number): IValidator;
+    isUnique(): IChain;
+    toUnique(): IChain;
+    notIPBlacklisted(): IChain;
+    isCIDR(): IChain;
+    isEmail(): IChain;
+    isUrl(): IChain;
+    isAddressPair(): IChain;
+    isIP(): IChain;
+    isIPv4(): IChain;
+    isIPv6(): IChain;
+    isHostnameOrIp(): IChain;
+    isAllowedFQDNOrIP(blacklist?: string[]): IChain;
+    isHostname(): IChain;
+    isAlpha(): IChain;
+    isAlphanumeric(): IChain;
+    isNumeric(): IChain;
+    isInt(): IChain;
+    isLowercase(): IChain;
+    isUppercase(): IChain;
+    isDecimal(): IChain;
+    isFloat(): IChain;
+    notNull(): IChain;
+    isNull(): IChain;
+    notEmpty(): IChain;
+    equals(arg: any): IChain;
+    contains(arg: any): IChain;
+    notContains(arg: any): IChain;
+    notIn(values: any[], caseSensitive?: boolean): IChain;
+    regex(pattern: RegExp): IChain;
+    regex(pattern: string, modifiers?: string): IChain;
+    is(pattern: string, modifiers?: string): IChain;
+    notRegex(pattern: RegExp): IChain;
+    notRegex(pattern: string, modifiers?: string): IChain;
+    not(pattern: string, modifiers: string): IChain;
+    len(min: number, max?: number): IChain;
+    numItems(min: number, max: number): IChain;
+    toFloat(): IChain;
+    toInt(): IChain;
+    toBoolean(): IChain;
+    toBooleanStrict(): IChain;
+    entityDecode(): IChain;
+    entityEncode(): IChain;
+    trim(chars?: string): IChain;
+    ltrim(chars?: string): IChain;
+    rtrim(chars: string): IChain;
+    ifNull(replace: string): IChain;
+    xss(is_image?: boolean): IChain;
+    enumerated(map: any): IChain;
+    inArray(array: any[]): IChain;
+    isString(): IChain;
+    isBoolean(): IChain;
+    range(min: any, max: any): IChain;
+    optional(): IChain;
+    isPort(): IChain;
+    isV1UUID(): IChain;
+    immutable(): IChain;
+    updateRequired(): IChain;
+    isArray(chain: IChain): IChain;
+    isHash(keyChain: IChain, valueChain: IChain): IChain;
+    rename(target: string): IChain;
+    custom(name: string): IChain;
+}
+
+export declare function defToValve(def: struct.IObj[]): IValveSchema[];
+
+export declare class Swiz {
+    constructor(defs: struct.IObj[], options?: ISwizOptions);
+    buildObject(obj: any, callback: (err: any, result: any) => void): void;
+    buildObjectSync(obj: any): any;
+    serializeJson(obj: any): string;
+    serializeXml(obj: any): string;
+    deserializeXml(xml: string): any;
+    serialize(mode: SERIALIZATION, version: number, obj: ISerializable, callback: (err: any, result: string) => void): void;
+    serializeForPagination(mode: SERIALIZATION, array: any[], metadata: any, callback: (err: any, result: string) => void): void;
+    deserialize(mode: SERIALIZATION, version: number, raw: string, callback: (err: any, result: any) => void): void;
+    getFieldDefinition(stype: string, name: string): struct.IField;
+}
+
+export interface ISerializable {
+    getSerializerType(): string;
+}
+
+export interface ISwizOptions {
+    stripNulls?: boolean;
+    stripSerializerType?: boolean;
+    for?: string;
+}
+
+interface IValidator {
+    name: string;
+    func(value: any, baton: any, callback: Function): void;
+    help: string;
+}
+
+export declare function stripSerializerTypes(obj: any): any;
+
+export declare module struct {
+    export function Obj(name: string, options?: IObjOptions): IObj;
+    export function Field(name: string, options?: IFieldOptions): IField;
+    export function coerce(value: any, coerceTo: string): any;
+
+    export interface IObj {
+        name: string;
+        options: IObjOptions;
+        singular: string;
+        plural: string;
+        fields: IField[];
+    }
+
+    export interface IField {
+        name: string;
+        options: IFieldOptions;
+        src: string;
+        singular: string;
+        plural: string;
+        desc?: string;
+        val?: IChain;
+        attribute: boolean;
+        enumerated: boolean;
+        ignorePublic: boolean;
+        filterFrom: string[];
+        coerceTo: any;
+    }
+
+    export interface IObjOptions {
+        singular?: string;
+        plural?: string;
+        fields?: IField[];
+    }
+
+    export interface IFieldOptions {
+        src?: string;
+        singular?: string;
+        plural?: string;
+        desc?: string;
+        val?: IChain;
+        attribute?: boolean;
+        enumerated?: any;
+        ignorePublic?: boolean;
+        filterFrom?: string[];
+        coerceTo?: string;
+    }
+}
+
+export declare enum SERIALIZATION {
+    SERIALIZATION_JSON,
+    SERIALIZATION_XML
+}
diff --git a/swiz/swiz-tests.ts b/swiz/swiz-tests.ts
index b156ff1403..36ff9f01a6 100644
--- a/swiz/swiz-tests.ts
+++ b/swiz/swiz-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="swiz.d.ts" />
 
 import swiz = require('swiz');
 
diff --git a/swiz/swiz.d.ts b/swiz/swiz.d.ts
deleted file mode 100644
index 93a8ff72e4..0000000000
--- a/swiz/swiz.d.ts
+++ /dev/null
@@ -1,195 +0,0 @@
-// Type definitions for swiz
-// Project: https://github.com/racker/node-swiz
-// Definitions by: Jeff Goddard <https://github.com/jedigo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/swiz.d.ts
-
-declare module "swiz" {
-	export class Cidr {
-		constructor(x: string, y?: string);
-		isInCIDR(x: any): boolean;
-	}
-
-	export class Valve {
-		constructor(schema: IValveSchema, baton?: any);
-		setSchema(schema: IValveSchema): Valve;
-		addFinalValidator(func: (obj: any, callback: (err: Error, cleaned: any) => void) => void): Valve;
-		addChainValidator(name: string, description: string, func: (value: any, callback: (err: Error, cleaned: any) => void) => void): void;
-		check(obj: any, options: ICheckOptions, callback: (err: any, cleaned: any) => void): void;
-		check(obj: any, callback: (err: any, cleaned: any) => void): void;
-		checkUpdate(existing: any, obj: any, callback: (err: any, cleaned: any) => void): void;
-		help(schema: IValveSchema): any;
-	}
-
-	export interface ICheckOptions {
-		strict?: boolean;
-	}
-
-	export interface IValveSchema  {
-		[index: string]: IValveSchemaMember;
-	}
-
-	export interface IValveSchemaMember {}
-
-	export interface IValveSchemaMemberArray extends IValveSchemaMember {
-		[index: string]: IValveSchemaMember;
-	}
-
-	export function Chain(): IChain;
-
-	export function chain(): IChain;
-
-	export interface IChain extends IValveSchemaMember {
-		getValidatorPos(name: string): number;
-		hasValidator(name: string): number;
-		getValidatorAtPos(pos: number): IValidator;
-		isUnique(): IChain;
-		toUnique(): IChain;
-		notIPBlacklisted(): IChain;
-		isCIDR(): IChain;
-		isEmail(): IChain;
-		isUrl(): IChain;
-		isAddressPair(): IChain;
-		isIP(): IChain;
-		isIPv4(): IChain;
-		isIPv6(): IChain;
-		isHostnameOrIp(): IChain;
-		isAllowedFQDNOrIP(blacklist?: string[]): IChain;
-		isHostname(): IChain;
-		isAlpha(): IChain;
-		isAlphanumeric(): IChain;
-		isNumeric(): IChain;
-		isInt(): IChain;
-		isLowercase(): IChain;
-		isUppercase(): IChain;
-		isDecimal(): IChain;
-		isFloat(): IChain;
-		notNull(): IChain;
-		isNull(): IChain;
-		notEmpty(): IChain;
-		equals(arg: any): IChain;
-		contains(arg: any): IChain;
-		notContains(arg: any): IChain;
-		notIn(values: any[], caseSensitive?: boolean): IChain;
-		regex(pattern: RegExp): IChain;
-		regex(pattern: string, modifiers?: string): IChain;
-		is(pattern: string, modifiers?: string): IChain;
-		notRegex(pattern: RegExp): IChain;
-		notRegex(pattern: string, modifiers?: string): IChain;
-		not(pattern: string, modifiers: string): IChain;
-		len(min: number, max?: number): IChain;
-		numItems(min: number, max: number): IChain;
-		toFloat(): IChain;
-		toInt(): IChain;
-		toBoolean(): IChain;
-		toBooleanStrict(): IChain;
-		entityDecode(): IChain;
-		entityEncode(): IChain;
-		trim(chars?: string): IChain;
-		ltrim(chars?: string): IChain;
-		rtrim(chars: string): IChain;
-		ifNull(replace: string): IChain;
-		xss(is_image?: boolean): IChain;
-		enumerated(map: any): IChain;
-		inArray(array: any[]): IChain;
-		isString(): IChain;
-		isBoolean(): IChain;
-		range(min: any, max: any): IChain;
-		optional(): IChain;
-		isPort(): IChain;
-		isV1UUID(): IChain;
-		immutable(): IChain;
-		updateRequired(): IChain;
-		isArray(chain: IChain): IChain;
-		isHash(keyChain: IChain, valueChain: IChain): IChain;
-		rename(target: string): IChain;
-		custom(name: string): IChain;
-	}
-
-	export function defToValve(def: struct.IObj[]): IValveSchema[];
-
-	export class Swiz {
-		constructor(defs: struct.IObj[], options?: ISwizOptions);
-		buildObject(obj: any, callback: (err: any, result: any) => void): void;
-		buildObjectSync(obj: any): any;
-		serializeJson(obj: any): string;
-		serializeXml(obj: any): string;
-		deserializeXml(xml: string): any;
-		serialize(mode: SERIALIZATION, version: number, obj: ISerializable, callback: (err: any, result: string) => void): void;
-		serializeForPagination(mode: SERIALIZATION, array: any[], metadata: any, callback: (err: any, result: string) => void): void;
-		deserialize(mode: SERIALIZATION, version: number, raw: string, callback: (err: any, result: any) => void): void;
-		getFieldDefinition(stype: string, name: string): struct.IField;
-	}
-
-	export interface ISerializable {
-		getSerializerType(): string;
-	}
-
-	export interface ISwizOptions {
-		stripNulls?: boolean;
-		stripSerializerType?: boolean;
-		for?: string;
-	}
-
-	interface IValidator {
-		name: string;
-		func(value: any, baton: any, callback: Function): void;
-		help: string;
-	}
-
-	export function stripSerializerTypes(obj: any): any;
-
-	export module struct {
-		export function Obj(name: string, options?: IObjOptions): IObj;
-		export function Field(name: string, options?: IFieldOptions): IField;
-		export function coerce(value: any, coerceTo: string): any;
-
-		export interface IObj {
-			name: string;
-			options: IObjOptions;
-			singular: string;
-			plural: string;
-			fields: IField[];
-		}
-
-		export interface IField {
-			name: string;
-			options: IFieldOptions;
-			src: string;
-			singular: string;
-			plural: string;
-			desc?: string;
-			val?: IChain;
-			attribute: boolean;
-			enumerated: boolean;
-			ignorePublic: boolean;
-			filterFrom: string[];
-			coerceTo: any;
-		}
-
-		export interface IObjOptions {
-			singular?: string;
-			plural?: string;
-			fields?: IField[];
-		}
-
-		export interface IFieldOptions {
-			src?: string;
-			singular?: string;
-			plural?: string;
-			desc?: string;
-			val?: IChain;
-			attribute?: boolean;
-			enumerated?: any;
-			ignorePublic?: boolean;
-			filterFrom?: string[];
-			coerceTo?: string;
-		}
-	}
-
-	export enum SERIALIZATION {
-		SERIALIZATION_JSON,
-		SERIALIZATION_XML
-	}
-}
diff --git a/swiz/tsconfig.json b/swiz/tsconfig.json
new file mode 100644
index 0000000000..b441012bfe
--- /dev/null
+++ b/swiz/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "swiz-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/systemjs/index.d.ts b/systemjs/index.d.ts
new file mode 100644
index 0000000000..7f845c0028
--- /dev/null
+++ b/systemjs/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for System.js 0.18.4
+// Project: https://github.com/systemjs/systemjs
+// Definitions by: Ludovic HENIN <https://github.com/ludohenin/>, Nathan Walker <https://github.com/NathanWalker/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var System: System;
+
+export = System;
+export as namespace System;
+
+interface System {
+  import(name: string): any;
+  defined: any;
+  amdDefine: () => void;
+  amdRequire: () => void;
+  baseURL: string;
+  paths: { [key: string]: string };
+  meta: { [key: string]: Object };
+  config: any;
+  _nodeRequire: (name: string) => any;
+}
diff --git a/systemjs/systemjs-tests.ts b/systemjs/systemjs-tests.ts
index 7a56ef8dc9..15c4401d19 100644
--- a/systemjs/systemjs-tests.ts
+++ b/systemjs/systemjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="systemjs.d.ts" />
+
 
 import System = require('systemjs');
 
diff --git a/systemjs/systemjs.d.ts b/systemjs/systemjs.d.ts
deleted file mode 100644
index aea028f8de..0000000000
--- a/systemjs/systemjs.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Type definitions for System.js 0.18.4
-// Project: https://github.com/systemjs/systemjs
-// Definitions by: Ludovic HENIN <https://github.com/ludohenin/>, Nathan Walker <https://github.com/NathanWalker/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface System {
-  import(name: string): any;
-  defined: any;
-  amdDefine: () => void;
-  amdRequire: () => void;
-  baseURL: string;
-  paths: { [key: string]: string };
-  meta: { [key: string]: Object };
-  config: any;
-}
-
-declare var System: System;
-
-declare module "systemjs" {
-  export = System;
-}
\ No newline at end of file
diff --git a/systemjs/tsconfig.json b/systemjs/tsconfig.json
new file mode 100644
index 0000000000..d84a56934b
--- /dev/null
+++ b/systemjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "systemjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tabris/index.d.ts b/tabris/index.d.ts
new file mode 100644
index 0000000000..351ae56a7b
--- /dev/null
+++ b/tabris/index.d.ts
@@ -0,0 +1,1444 @@
+// Type definitions for Tabris.js v1.2
+// Project: http://tabrisjs.com
+// Definitions by: Tabris.js team <http://github.com/eclipsesource/tabris>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = tabris;
+
+declare namespace tabris {
+
+  // Types
+
+  interface Bounds {
+
+    /**
+     * the horizontal offset from the parent's left edge in dip
+     */
+    left: number;
+
+    /**
+     * the vertical offset from the parent's top edge in dip
+     */
+    top: number;
+
+    /**
+     * the width of the widget in dip
+     */
+    width: number;
+
+    /**
+     * the height of the widget in dip
+     */
+    height: number;
+
+  }
+
+  interface Transformation {
+
+    /**
+     * Clock-wise rotation in radians. Defaults to `0`.
+     */
+     rotation: number;
+
+    /**
+     * Horizontal scale factor. Defaults to `1`.
+     */
+    scaleX: number;
+
+    /*
+     * Vertical scale factor. Defaults to `1`.
+     */
+    scaleY: number;
+
+    /**
+     * Horizontal translation (shift) in dip. Defaults to `0`.
+     */
+    translationX: number;
+
+    /**
+     * Vertical translation (shift) in dip. Defaults to `0`.
+     */
+    translationY: number;
+
+  }
+
+  // TODO A plain string can be used as a shorthand, e.g. `"image.jpg"` equals `{src: "image.jpg"}`.
+  interface Image {
+
+    /**
+     * Image path or URL.
+     */
+    src?: string;
+
+    /**
+     * Image width, extracted from the image file when missing.
+     */
+    width?: number;
+
+    /**
+     * Image height, extracted from the image file when missing.
+     */
+    height?: number;
+
+    /**
+     * Image scale factor - the image will be scaled down by this factor.
+     * Ignored when width or height are set.
+     */
+    scale?: number;
+
+  }
+
+  interface CanvasContext {
+    // TODO
+  }
+
+  // Events
+
+  /**
+   * Event handling API supported by widgets and various other objects.
+   */
+  interface EventSupport <T> {
+
+    /**
+     * Adds the *listener* to the list of functions to be notified when *event* is fired.
+     * In the listener function, `this` will point to the object itself. Supports chaining.
+     *
+     * @param event the name of the event to listen on
+     * @param listener the listener function
+     */
+    on (event: string, listener: (target: T, ...args: any[]) => any): T;
+
+    /**
+     * Same as `on`, but removes the listener after it has been invoked by an event.
+     * Supports chaining.
+     *
+     * @param event the name of the event to listen on
+     * @param listener the listener function
+     */
+    once (event: string, listener: (target: T, ...args: any[]) => any): T;
+
+    /**
+     * Removes all listeners for all events from this widget. Supports chaining.
+     */
+    off (): T;
+
+    /**
+     * Removes all listeners for *event* from this widget. Supports chaining.
+     *
+     * @param event the event name to remove listeners for
+     */
+    off (event: string): T;
+
+    /**
+     * Removes all occurrences of *listener* that are bound to *event* from this widget.
+     * Supports chaining.
+     *
+     * @param event the event to remove the listener from
+     * @param listener the listener function to remove
+     */
+    off (event: string, listener: (target: T, ...args: any[]) => any): T;
+
+    /**
+     * Triggers an event on this object. Supports chaining.
+     *
+     * @param event the name of the event to trigger
+     * @param args the arguments to pass to the listener functions
+     */
+    trigger (event: string, ...args: any[]): T;
+
+  }
+
+  interface AnimationOptions {
+
+    /**
+     * The time until the animation starts in ms, defaults to `0`.
+     */
+    delay?: number;
+
+    /**
+     * The duration in ms.
+     */
+    duration: number;
+
+    /**
+     * One of `linear`, `ease-in`, `ease-out`, `ease-in-out`.
+     */
+    easing: string;
+
+    /**
+     * The number of times to repeat the animation, defaults to `0`.
+     */
+    repeat: number;
+
+    /**
+     * `true` to alternate the direction of the animation on every repeat.
+     */
+    reverse: boolean;
+
+    /**
+     * No effect, but will be given in animation events.
+     */
+    name: string;
+
+  }
+
+  // Widget
+
+  function create (type: string, properties: WidgetProperties): Widget<any>;
+
+  /**
+   * API supported by all widgets.
+   */
+  interface Widget <T> extends EventSupport <T> {
+
+    // Property Support
+
+    /**
+     * Gets the current value of the given *property*.
+     *
+     * @param property
+     */
+    get (property: string): any;
+
+    /**
+     * Sets the given property. Supports chaining.
+     *
+     * @param property the name of the property to set
+     * @param value the value to set the property to
+     * @param options passed to the change event resulting from this method call
+     */
+    set (property: string, value: any, options?: Object): T;
+
+    /**
+     * Sets all key-value pairs in the properties object as widget properties. Supports chaining.
+     *
+     * @param properties the properties to set
+     * @param options passed to the change event resulting from this method call
+     */
+    set (properties: WidgetProperties, options?: Object): T;
+
+    /**
+     * Starts an animation that transforms the given properties from their current values to the given ones.
+     * Supported properties are *transform* and *opacity*.
+     *
+     * @param properties The properties and target values to animate.
+     * @param options Configures the animation itself.
+     */
+    animate (properties: WidgetProperties, options: AnimationOptions): void;
+
+    /**
+     * Appends this widget to the given parent.
+     * The parent widget must support children (extending *Composite*).
+     *
+     * @param parent the parent widget to append this one to
+     */
+    appendTo (parent: Composite): T;
+
+    /**
+     * Applies the given properties to all descendants that match the associated selector(s).
+     *
+     * @param properties an object in the format
+     *   `{selector: {property: value, property: value, ... }, selector: ...}`
+     */
+    apply (properties: Object): T;
+
+    /**
+     * Returns a (possibly empty) collection of all children of this widget.
+     */
+    children (): WidgetCollection;
+
+    /**
+     * Returns a (possibly empty) collection of all children of this widget that match the selector.
+     *
+     * @param selector a selector string to filter children
+     */
+    children (selector: string): WidgetCollection;
+
+    /**
+     * Removes this widget from its parent and destroys it. Also disposes of all its children.
+     * Triggers a `remove` event on the parent and a `dispose` event on itself.
+     * The widget can no longer be used.
+     */
+    dispose (): void;
+
+    /**
+     * Returns a (possibly empty) collection of all descendants of this widget.
+     */
+    find (): WidgetCollection
+
+    /**
+     * Returns a (possibly empty) collection of all descendants of this widget that match the selector.
+     * @param selector
+     */
+    find (selector: string): WidgetCollection
+
+    /**
+     * Returns `true` if the widget has been disposed, otherwise `false`.
+     */
+    isDisposed (): boolean
+
+    /**
+     * Returns the parent of this widget.
+     */
+    parent (): T;
+
+    /**
+     * An application-wide unique identifier automatically assigned to all widgets on creation.
+     * Do not change it.
+     */
+    cid: string;
+
+    /**
+     * Direct access to the value of the property of the same name.
+     * May be used instead of `widget.get("id");`.
+     * Do not use this field to change the value, instead use `widget.set("id", id);`.
+     */
+    id: string;
+
+    /**
+     * The exact string that was used to create this widget using the `tabris.create` method.
+     */
+    type: string;
+
+  }
+
+  interface WidgetProperties {
+
+    /**
+     * The background color of the widget.
+     */
+    background?: string;
+
+    /**
+     * An image to be displayed on the widget's background.
+     * If the image is smaller than the widget, it will be tiled.
+     */
+    backgroundImage?: Image;
+
+    /**
+     * The vertical position of the widget's baseline relative to a sibling widget.
+     */
+    baseline?: any;
+
+    /**
+     * The position of the widget's bottom edge relative to the parent or a sibling widget.
+     */
+    bottom?: any;
+
+    /**
+     * The actual location and size of the widget, relative to its parent. This property is read-only.
+     */
+    bounds?: Bounds;
+
+    /**
+     * The horizontal position of the widget's center relative to the parent's center.
+     */
+    centerX?: number;
+
+    /**
+     * The vertical position of the widget's center relative to the parent's center.
+     */
+    centerY?: number;
+
+    /**
+     * Whether the widget can be operated.
+     */
+    enabled?: boolean;
+
+    /**
+     * The font used for the widget.
+     */
+    font?: string;
+
+    /**
+     * The height of the widget.
+     */
+    height?: number;
+
+    /**
+     * Whether the entire widget should be highlighted while touched.
+     */
+    highlightOnTouch?: boolean;
+
+    /**
+     * A string to identify the widget by using selectors. Id's are optional.
+     * It is strongly recommended that they are unique within a page.
+     */
+    id?: string;
+
+    /**
+     * Shorthand for all layout properties. See [Layout](../layout.md).
+     */
+    layoutData?: Object;
+
+    /**
+     * The position of the widget's left edge relative to the parent or a sibling widget.
+     */
+    left?: any;
+
+    /**
+     * Opacity of the entire widget. Can be used for fade animations.
+     */
+    opacity?: number;
+
+    /**
+     * The position of the widget's right edge relative to the parent or a sibling widget.
+     */
+    right?: any;
+
+    /**
+     * Text color of the widget.
+     */
+    textColor?: string;
+
+    /**
+     * The position of the widget's top edge relative to the parent or a sibling widget.
+     */
+    top?: any;
+
+    /**
+     * Modifications to the widget's shape, size, or position. Can be used for animations.
+     * **Note:** In Android, the *transform* property does not affect the *bounds* property,
+     * while it does so in iOS.
+     */
+    transform?: Transformation;
+
+    /**
+     * Whether the widget is visible.
+     */
+    visible?: boolean;
+
+    /**
+     * The width of the widget.
+     */
+    width?: number;
+
+  }
+
+  // Action
+
+  function create (type: "Action", properties: ActionProperties): Action;
+
+  /**
+   * An executable item that is integrated in the application's navigation menu.
+   * Add a listener on *select* to implement the action.
+   */
+  interface Action extends Widget <Action> {
+
+    set (property: string, value: any, options?: Object): Action;
+    set (properties: ActionProperties, options?: Object): Action;
+
+  }
+
+  interface ActionProperties extends WidgetProperties {
+
+    /**
+     * Icon image for the action.
+     */
+    image?: Image;
+
+    /**
+     * Actions with higher placement priority will be placed at a more significant position in the UI,
+     * e.g. low priority actions could go into a menu instead of being included in a toolbar.
+     * Any of `low`, `high`, `normal`.
+     */
+    placementPriority?: string;
+
+    /**
+     * The text to be displayed for the action.
+     */
+    title?: string;
+
+  }
+
+  // Button
+
+  function create (type: "Button", properties: ButtonProperties): Button;
+
+  /**
+   * A push button. Can contain a text or an image.
+   */
+  interface Button extends Widget <Button> {
+
+    set (property: string, value: any, options?: Object): Button;
+    set (properties: ButtonProperties, options?: Object): Button;
+
+  }
+
+  interface ButtonProperties extends WidgetProperties {
+
+    /**
+     * The horizontal alignment of the button text.
+     * Any of `left`, `right`, `center`. Defaults to `center`.
+     */
+    alignment?: string;
+
+    /**
+     * An image to be displayed on the button.
+     */
+    image?: Image;
+
+    /**
+     * The button's label text.
+     */
+    text?: string;
+
+  }
+
+  // Canvas
+
+  function create (type: "Canvas", properties: WidgetProperties): Canvas;
+
+  /**
+   * Canvas is a widget which allows drawing on it using a canvas context.
+   * Canvas context is a subset of the HTML5 [CanvasRenderingContext2D](https://developer.mozilla.org/en/docs/Web/API/CanvasRenderingContext2D).
+   */
+  interface Canvas extends Composite {
+
+    /**
+     * Returns the drawing context.
+     *
+     * @param contextType This must be `"2d"`
+     * @param width
+     * @param height
+     */
+    getContext (contextType: string, width: number, height: number): CanvasContext;
+
+  }
+
+  // Cell
+
+  function create (type: "Cell", properties: CellProperties): Cell;
+
+  /**
+   * This widget represents a space in a *CollectionView* on which an item is displayed.
+   * Cell widgets are not created by the application but by the *CollectionView* widget.
+   */
+  interface Cell extends Composite {
+
+    set (property: string, value: any, options?: Object): Cell;
+    set (properties: CellProperties, options?: Object): Cell;
+
+  }
+
+  interface CellProperties extends WidgetProperties {
+
+    /**
+     * The item that is currently represented by this cell.
+     * This property is not set by the application but by the *CollectionView* widget.
+     */
+    item?: any;
+
+    /**
+     * The index of the item that is currently represented by this cell.
+     * This property is not set by the application but by the *CollectionView* widget.
+     */
+    itemIndex?: number;
+
+  }
+
+  // CheckBox
+
+  function create (type: "CheckBox", properties: CheckBoxProperties): CheckBox;
+
+  /**
+   * A check box widget.
+   */
+  interface CheckBox extends Widget <CheckBox> {
+
+    set (property: string, value: any, options?: Object): CheckBox;
+    set (properties: CheckBoxProperties, options?: Object): CheckBox;
+
+  }
+
+  interface CheckBoxProperties extends WidgetProperties {
+
+    /**
+     * The checked state of the check box.
+     */
+    selection?: boolean;
+
+    /**
+     * The label text of the check box.
+     */
+    text?: string;
+
+  }
+
+  // CollectionView
+
+  function create (type: "CollectionView", properties: CollectionViewProperties): CollectionView;
+
+  /**
+   * A scrollable list that displays data items in cells, one per row.
+   * Cells are created on demand and filled with widgets in the *initializeCell* callback.
+   */
+  interface CollectionView extends Widget <CollectionView> {
+
+    set (property: string, value: any, options?: Object): CollectionView;
+    set (properties: CollectionViewProperties, options?: Object): CollectionView;
+
+    /**
+     * Inserts the given items into this view. Items are added at the end.
+     * This operation will modify the *items* property.
+     *
+     * @param items
+     */
+    insert (items: any[]): void;
+
+    /**
+     * Inserts the given items into this view at the given index.
+     * This operation will modify the *items* property.
+     *
+     * @param items
+     * @param index the position to insert the items at.
+     *   If a negative index is given, it is interpreted as relative to the end.
+     *   If the given index is greater than the item count, new items will be appended at the end.
+     */
+    insert (items: any[], index: number): void;
+
+    /**
+     * Triggers a refresh of all visible items.
+     * This will issue *change:item* events on the corresponding cells.
+     */
+    refresh (): void;
+
+    /**
+     * Triggers a refresh of the item with the given index.
+     * If the item is scrolled into view, an *change:item* event will be issued on the corresponding cell.
+     *
+     * @param index The index of the item that was changed.
+     */
+    refresh (index: number): void;
+
+    /**
+     * Removes the item at the given index from this view. This operation will modify the *items* property.
+     * @param index The index of the item to remove. If this is negative, it is interpreted as relative to the end.
+     */
+    remove (index: number): void;
+
+    /**
+     * Removes *count* items beginning with the given index from this view.
+     * This operation will modify the *items* property.
+     *
+     * @param index The index of the first item to remove.
+     *   If this is negative, it is interpreted as relative to the end.
+     * @param count The number of items to remove.
+     */
+    remove (index: number, count: number): void;
+
+    /**
+     * Scrolls the item with the given index into view.
+     * @param index The index of the item to reveal. If this is negative, it is interpreted as relative to the end
+     */
+    reveal (index: number): void;
+
+  }
+
+  interface CollectionViewProperties extends WidgetProperties {
+
+    /**
+     * The name of the cell type to use for a given item.
+     * This name will be passed to the `initializeCell` and `itemHeight` functions.
+     * Cells will be reused only by items that require the same cell type.
+     * If set to a function, this function will be called for every item, providing the item as a parameter,
+     * and must return a name for the cell type to use for the given item.
+     */
+    cellType?: (item : any) => string | string;
+
+    /**
+     * A callback used to initialize a collection cell by attaching widget and *change:item* listener.
+     * Cells are created by the framework and recycled on scrolling.
+     * This callback receives the cell as the first and the cell type as second parameter.
+     *
+     * @static
+     */
+    initializeCell?: (cell: Cell, type: string) => any;
+
+    /**
+     * The height of a collection cell. If set to a function, this function will be called for every item,
+     * providing the item and the cell type as parameters, and must return the item height for the given item.
+     */
+    itemHeight?: (item: any, type: string) => number | number;
+
+    /**
+     * An array of data items to be displayed by the collection view.
+     * For dynamic content, use the methods `insert` and `remove` instead of setting this property directly.
+     */
+    items?: any[];
+
+    /**
+     * Enables the user to trigger a refresh by using the pull-to-refresh gesture.
+     */
+    refreshEnabled?: boolean;
+
+    /**
+     * Whether the refresh indicator is currently visible. Will be set to `true` when a *refresh* event
+     * is triggered. Reset it to `false` when the refresh is finished.
+     */
+    refreshIndicator?: boolean;
+
+    /**
+     * The message text displayed together with the refresh indicator. Currently not supported on Android.
+     */
+    refreshMessage?: string;
+
+  }
+
+  // Composite
+
+  function create (type: "Composite", properties: WidgetProperties): Composite;
+
+  interface Parent <T> {
+
+    /**
+     * Adds the given widget(s) in the given order to the composite.
+     *
+     * @param child
+     * @param child*
+     */
+    append (...children: Widget<any>[]): T;
+
+    /**
+     * Adds all widgets in the given collection to the composite.
+     * @param collection
+     */
+    append (collection: WidgetCollection): T;
+
+  }
+
+  /**
+   * An empty widget that can contain other widgets.
+   */
+  interface Composite extends Widget <Composite>, Parent <Composite> {
+  }
+
+  // Drawer
+
+  function create (type: "Drawer", properties: WidgetProperties): Drawer;
+
+  /**
+   * A navigation drawer that can be swiped in from the left edge of the screen. Can contain any kind of widgets.
+   * It may be useful to include a `PageSelector` that displays all top-level pages.
+   */
+  interface Drawer extends Composite {
+
+    /**
+     * Closes the drawer.
+     */
+    close (): Drawer;
+
+    /**
+     * Opens the drawer.
+     */
+    open (): Drawer;
+
+  }
+
+  // ImageView
+
+  function create (type: "ImageView", properties: ImageViewProperties): ImageView;
+
+  /**
+   * A widget to display an image.
+   */
+  interface ImageView extends Widget <ImageView> {
+
+    set (property: string, value: any, options?: Object): ImageView;
+    set (properties: ImageViewProperties, options?: Object): ImageView;
+
+  }
+
+  interface ImageViewProperties {
+
+    image?: Image;
+
+    /**
+     * Any of `auto`, `fit`, `fill`, `stretch`, `none`. Defaults to `auto`.;
+     */
+    scaleMode?: string;
+
+  }
+
+  // Page
+
+  function create (type: "Page", properties: PageProperties): Page;
+
+  /**
+   * Pages contain an application's UI. Top-level pages are included in the application's main menu.
+   */
+  interface Page extends Widget <Page>, Parent <Page> {
+
+    set (property: string, value: any, options?: Object): Page;
+    set (properties: PageProperties, options?: Object): Page;
+
+    /**
+     * Opens the page, i.e. makes it the active page.
+     */
+    open (): Page;
+
+    /**
+     * Closes and disposes of the page.
+     */
+    close (): void;
+
+  }
+
+  interface PageProperties extends WidgetProperties {
+
+    image?: Image;
+
+    title?: string;
+
+    topLevel?: boolean;
+
+  }
+
+  // PageSelector
+
+  function create (type: "PageSelector", properties: WidgetProperties): PageSelector;
+
+  /**
+   * A CollectionView that contains all top-level pages and allows to open them.
+   * New top-level pages are added dynamically.
+   */
+  interface PageSelector extends CollectionView {
+  }
+
+  // Picker
+
+  function create (type: "Picker", properties: PickerProperties): Picker;
+
+  /**
+   * A widget with a drop-down list of items to choose from.
+   */
+  interface Picker extends Widget <Picker> {
+
+    set (property: string, value: any, options?: Object): Picker;
+    set (properties: PickerProperties, options?: Object): Picker;
+
+  }
+
+  interface PickerProperties extends WidgetProperties {
+
+    items?: string[];
+
+    selection?: string;
+
+    selectionIndex?: number;
+
+  }
+
+  // ProgressBar
+
+  function create (type: "ProgressBar", properties: ProgressBarProperties): ProgressBar;
+
+  /**
+   * A widget representing a numeric value as a horizontal bar with a growing indicator.
+   */
+  interface ProgressBar extends Widget <ProgressBar> {
+
+    set (property: string, value: any, options?: Object): ProgressBar;
+    set (properties: ProgressBarProperties, options?: Object): ProgressBar;
+
+  }
+
+  interface ProgressBarProperties {
+
+    /**
+     * Defaults to 100.
+     */
+    maximum?: number;
+
+    /**
+     * Defaults to 0.
+     */
+    minimum?: number;
+
+    /**
+     * Defaults to 0.
+     */
+    selection?: number;
+
+    /**
+     * Any of `normal`, `paused, `error`. Defaults to `normal`.
+     */
+    state?: string;
+
+  }
+
+  // RadioButton
+
+  function create (type: "RadioButton", properties: RadioButtonProperties): RadioButton;
+
+  /**
+   * A radio button. Selecting a radio button de-selects all its siblings (i.e. all radio buttons
+   * within the same parent).
+   */
+  interface RadioButton extends Widget <RadioButton> {
+
+    set (property: string, value: any, options?: Object): RadioButton;
+    set (properties: RadioButtonProperties, options?: Object): RadioButton;
+
+  }
+
+  interface RadioButtonProperties extends WidgetProperties {
+
+    /**
+     * The checked state of the radio button.
+     */
+    selection?: boolean;
+
+    /**
+     * The label text of the radio button.
+     */
+    text?: string;
+
+  }
+
+  // ScrollView
+
+  function create (type: "ScrollView", properties: ScrollViewProperties): ScrollView;
+
+  /**
+   * A composite that allows its content to overflow either vertically (default) or horizontally.
+   * Children of a ScrollView may not be attached to its edge in scrolling direction (to the bottom
+   * for vertical scrolling, to the right for horizontal scrolling).
+   */
+  interface ScrollView extends Composite {
+
+    set (property: string, value: any, options?: Object): ScrollView;
+    set (properties: ScrollViewProperties, options?: Object): ScrollView;
+
+  }
+
+  interface ScrollViewProperties extends WidgetProperties {
+
+    /**
+     * Specifies the scrolling direction of the scroll composite.
+     * Either `vertical` or `horizontal`. Default to `vertical`.
+     * @static
+     */
+    direction?: string;
+
+  }
+
+  // SearchAction
+
+  function create (type: "SearchAction", properties: SearchActionProperties): SearchAction;
+
+  /**
+   * An action that displays a search text field with dynamic proposals when selected.
+   * Add a listener on *select* to implement the action. On *input*, you may set a list of *proposals*.
+   */
+  interface SearchAction extends Action {
+
+    set (property: string, value: any, options?: Object): SearchAction;
+    set (properties: SearchActionProperties, options?: Object): SearchAction;
+
+  }
+
+  interface SearchActionProperties extends ActionProperties {
+
+    /**
+     * A hint text that is displayed when the search input is empty.
+     */
+    message?: string;
+
+    /**
+     * The list of proposals to display.
+     */
+    proposals?: string[];
+
+    /**
+     * The text in the search input field.
+     */
+    text?: string;
+
+  }
+
+  // Slider
+
+  function create (type: "Slider", properties: SliderProperties): Slider;
+
+  /**
+   * A widget representing a numeric value as an movable indicator on a horizontal line.
+   */
+  interface Slider extends Widget <Slider> {
+
+    set (property: string, value: any, options?: Object): Slider;
+    set (properties: SliderProperties, options?: Object): Slider;
+
+  }
+
+  interface SliderProperties extends WidgetProperties {
+
+    maximum?: number;
+
+    minimum?: number;
+
+    selection?: number;
+
+  }
+
+  // Switch
+
+  function create (type: "Switch", properties: SwitchProperties): Switch;
+
+  /**
+   * A switch widget that can be toggled.
+   */
+  interface Switch extends Widget <Switch> {
+
+    set (property: string, value: any, options?: Object): Switch;
+    set (properties: SwitchProperties, options?: Object): Switch;
+
+  }
+
+  interface SwitchProperties extends WidgetProperties {
+
+    /**
+     * The checked state of the switch.
+     */
+    selection?: boolean;
+
+  }
+
+  // Tab
+
+  function create (type: "Tab", properties: TabProperties): Tab;
+
+  /**
+   * A container representing a single tab of the TabFolder widget.
+   */
+  interface Tab extends Composite {
+
+    set (property: string, value: any, options?: Object): Tab;
+    set (properties: TabProperties, options?: Object): Tab;
+
+  }
+
+  interface TabProperties extends WidgetProperties {
+
+    badge?: string;
+
+    image?: Image;
+
+    title?: string;
+
+  }
+
+  // TabFolder
+
+  function create (type: "TabFolder", properties: TabFolderProperties): TabFolder;
+
+  /**
+   * A widget that can switch between [tabs](#tab).
+   */
+  interface TabFolder extends Widget <TabFolder> {
+
+    set (property: string, value: any, options?: Object): TabFolder;
+    set (properties: TabFolderProperties, options?: Object): TabFolder;
+
+    /**
+     * Adds the given tabs in the given order to the TabFolder.
+     *
+     * @param children
+     */
+    append (...children: Tab[]): TabFolder;
+
+  }
+
+  interface TabFolderProperties extends WidgetProperties {
+
+    /**
+     * Enables swiping through tabs.
+     */
+    paging?: boolean;
+
+    selection?: Tab;
+
+    /**
+     * The placement of the tab titles. When set to `"auto"`, the position is platform dependent.
+     * Any of `top`, `bottom`, `auto`. Defaults to `auto`.
+     * @static
+     */
+    tabBarLocation?: string;
+
+  }
+
+  // TextInput
+
+  function create (type: "TextInput", properties: TextInputProperties): TextInput;
+
+  /**
+   * A widget that allows to enter text.
+   */
+  interface TextInput extends Widget <TextInput> {
+
+    set (property: string, value: any, options?: Object): TextInput;
+    set (properties: TextInputProperties, options?: Object): TextInput;
+
+  }
+
+  interface TextInputProperties extends WidgetProperties {
+
+    /**
+     * The horizontal alignment of the text.
+     * Any of `left`, `right`, `center`. Default: `left`.
+     */
+    alignment?: string;
+
+    /**
+     * Automatically switch to capital letters after every key pressed.
+     */
+    autoCapitalize?: boolean;
+
+    /**
+     * Enables the spell checker and auto-correction feature.
+     */
+    autoCorrect?: boolean;
+
+    editable?: boolean;
+
+    /**
+     * Selects the keyboard type to use for editing this widget.
+     * Any of `ascii`, `decimal`, `email`, `number`, `numbersAndPunctuation`, `phone`, `url`, `default`.
+     */
+    keyboard?: string;
+
+    /**
+     * A hint text that is displayed when the input field is empty.
+     */
+    message?: string;
+
+    /**
+     * The text in the input field.
+     */
+    text?: string;
+
+    /**
+     * The type of the text widget.
+     * Any of `default`, `password`, `search`, `multiline`.
+     * @static
+     */
+    type?: string;
+
+  }
+
+  // TextView
+
+  function create (type: "TextView", properties: TextViewProperties): TextView;
+
+  /**
+   * A widget to display a text. For images, use ImageView.
+   */
+  interface TextView extends Widget <TextView> {
+
+    set (property: string, value: any, options?: Object): TextView;
+    set (properties: TextViewProperties, options?: Object): TextView;
+
+  }
+
+  interface TextViewProperties extends WidgetProperties {
+
+    /**
+     * The horizontal alignment of the text.
+     * Any of `left`, `right`, `center`. Default: `left`.
+     */
+    alignment?: string;
+
+    /**
+     * Allows for a subset of HTML tags in the text.
+     * Supported tags are: `a`, `del`, `ins`, `b`, `i`, `strong`, `em`, `big`, `small`, `br`.
+     * All tags must be closed (e.g. use `<br/>` instead of `<br>`). Nesting tags is currently not supported.
+     * @static
+     */
+    markupEnabled?: boolean;
+
+    /**
+     * Limit the number of lines to be displayed to the given maximum. `null` disables this limit.
+     */
+    maxLines?: number;
+
+    /**
+     * The text to display.
+     */
+    text?: string;
+
+  }
+
+  // ToggleButton
+
+  function create (type: "ToggleButton", properties: ToggleButtonProperties): ToggleButton;
+
+  /**
+   * A push button that "snaps in", i.e. it is selected when pressed and deselected when pressed again.
+   */
+  interface ToggleButton extends Widget <ToggleButton> {
+
+    set (property: string, value: any, options?: Object): ToggleButton;
+    set (properties: ToggleButtonProperties, options?: Object): ToggleButton;
+
+  }
+
+  interface ToggleButtonProperties extends WidgetProperties {
+
+    /**
+     * The horizontal alignment of the button text.
+     * Any of `left`, `right`, `center`. Default: `left`.
+     */
+    alignment?: string;
+
+    /**
+     * An image to be displayed on the button.
+     */
+    image?: Image;
+
+    /**
+     * The selection state of the toggle button.
+     */
+    selection?: boolean;
+
+    /**
+     * The button's label text.
+     */
+    text?: string;
+
+  }
+
+  // Video
+
+  function create (type: "Video", properties: VideoProperties): Video;
+
+  /**
+   * A widget that plays a video from a URL.
+   */
+  interface Video extends Widget <Video> {
+
+    set (property: string, value: any, options?: Object): Video;
+    set (properties: VideoProperties, options?: Object): Video;
+
+  }
+
+  interface VideoProperties extends WidgetProperties {
+
+    /**
+     * The URL of the video to play.
+     */
+    url?: string;
+
+  }
+
+  // WebView
+
+  function create (type: "WebView", properties: WebViewProperties): WebView;
+
+  /**
+   * A widget that can display a web page.
+   * Since this widget requires a lot of recourses it's recommended to have no more than one instance at a time.
+   */
+  interface WebView extends Widget <WebView> {
+
+    set (property: string, value: any, options?: Object): Video;
+    set (properties: WebViewProperties, options?: Object): Video;
+
+  }
+
+  interface WebViewProperties extends WidgetProperties {
+
+    /**
+     * A complete HTML document to display. Always returns the last set value.
+     */
+    html?: string;
+
+    /**
+     * The URL of the web page to display. Returns empty string when content from *html* property is displayed.
+     */
+    url?: string;
+
+  }
+
+  // WidgetCollection
+
+  /**
+   */
+  interface WidgetCollection extends EventSupport <WidgetCollection> {
+
+    /**
+     * Animates all widgets in this collection.
+     *
+     * @param properties The properties and target values to animate.
+     * @param options Configures the animation itself.
+     */
+    animate (properties: WidgetProperties, options: AnimationOptions): void;
+
+    /**
+     * Append all widgets in this collection to the given widget.
+     * @param parent
+     */
+    appendTo (parent: Composite): WidgetCollection;
+
+    /**
+     * Returns a collection containing all children of all widgets in this collection.
+     */
+    children (): WidgetCollection;
+
+    /**
+     * Same as `collection.children().filter(selector)`.
+     * @param selector
+     */
+    children (selector: string): WidgetCollection;
+
+    /**
+     * Disposes all widgets in this collection.
+     */
+    dispose (): void;
+
+    /**
+     * Returns a collection containing all descendants of all widgets in this collection.
+     */
+    find (): WidgetCollection;
+
+    /**
+     * Returns a collection containing all descendants of all widgets in this collection that match the given selector.
+     * @param selector
+     */
+    find (selector: string): WidgetCollection;
+
+    /**
+     * Returns a collection containing all direct parents of all widgets in this collection.
+     */
+    parent (): WidgetCollection;
+
+    /**
+     * A read-only field containing the number of widgets in the collection.
+     */
+    length: number;
+
+  }
+
+  // tabris.app
+
+  /**
+   * The object `tabris.app` provides information about the application.
+   */
+  interface App {
+
+    /**
+     * Installs a patch from the given URL.
+     * When the patch is successfully installed, it will remain inactive until the application is reloaded.
+     * @param url The URL to fetch a patch from.
+     * @param callback A callback function to be called when the installation has finished or failed.
+     * In case of a failure, the callback will receive a parameter `error` that contains an Error object.
+     * If the installation succeeds, this parameter will be `undefined` and a second parameter will contain
+     * the parsed content of the file `patch.json` from the installed patch.
+     * @provisional
+     */
+    installPatch (url : string, callback : (error: Error, patch: Object) => any): void;
+
+    /**
+     * Forces the running application to reload the main module and start over.
+     */
+    reload (): void;
+
+  }
+
+  export var app: App;
+
+  // tabris.device
+
+  /**
+   * The object `tabris.device` provides information about the device that executes the application.
+   * All properties are read-only.
+   */
+  interface Device extends EventSupport <Device> {
+
+    get(property: string): void;
+
+    /**
+     * The user language configured on the device as an [RFC 4646](http://tools.ietf.org/html/rfc4646) compliant string. For example `"de"`, `"es-ES"`, etc. This property is also available globally as `navigator.language`.
+     */
+    get(property: "language"): string;
+
+    /**
+     * The name of the device model. For example `"iPad4,1"` or `"Nexus 7"`.
+     * This property is also available globally as `device.model`.
+     */
+    get(property: "model"): string;
+
+    /**
+     * The device orientation. One of `portrait-primary`, `portrait-secondary`, `landscape-primary`, and `landscape-secondary`.
+     */
+    get(property: "orientation"): string;
+
+    /**
+     * The name of the platform. Currently either `"Android"` or `"iOS"`.
+     * This property is also available globally as `device.platform`.
+     */
+    get(property: "platform"): string;
+
+    /**
+     * The ratio between physical pixels and device independent pixels.
+     * This property is also available globally as [`window.devicePixelRatio`](https://developer.mozilla.org/en-US/docs/Web/API/Window.devicePixelRatio).
+     */
+    get(property: "scaleFactor"): number;
+
+    /**
+     * The entire height of the device's screen in device independent pixel.
+     * Depends on the current device orientation. This property is also available globally as [screen.height](https://developer.mozilla.org/en-US/docs/Web/API/Screen.height).
+     */
+    get(property: "screenHeight"): number;
+
+    /**
+     * The entire width of the device's screen in device independent pixel.
+     * Depends on the current device orientation. This property is also available as globally as [screen.width](https://developer.mozilla.org/en-US/docs/Web/API/Screen.width).
+     */
+    get(property: "screenWidth"): number;
+
+    /**
+     * The platform version. On iOS it lools like this: `"8.1.1"`.
+     * On Android, the [version code](https://developer.android.com/reference/android/os/Build.VERSION_CODES.html)
+     * is returned. This property is also available globally as `device.version`.
+     */
+    get(property: "version"): string;
+
+  }
+
+  export var device: Device;
+
+  // tabris.ui
+
+  /**
+   * The object `tabris.ui` is the root element for all widgets.
+   * This is the parent for all top-level pages, *actions* and the *drawer*.
+   */
+  interface UI extends EventSupport <UI> {
+
+    get(property: string): void;
+
+    /**
+     * The currently visible page.
+     */
+    get(property: "activePage"): Page;
+
+    /**
+     * Background color for the navigation elements.
+     */
+    get(property: "background"): string;
+
+    /**
+     * Text color for the navigation elements.
+     */
+    get(property: "textColor"): string;
+
+    /**
+     * Whether the toolbars above and below pages are visible.
+     */
+    get(property: "toolbarVisible"): boolean;
+
+  }
+
+  export var ui: UI;
+
+}
diff --git a/tabris/tabris-tests.ts b/tabris/tabris-tests.ts
index 28ab53cecd..c67f71dd5a 100644
--- a/tabris/tabris-tests.ts
+++ b/tabris/tabris-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./tabris.d.ts" />
+import tabris = require("tabris");
 
 var page = tabris.create("Page", {});
 
diff --git a/tabris/tabris.d.ts b/tabris/tabris.d.ts
deleted file mode 100644
index 31a12d05a5..0000000000
--- a/tabris/tabris.d.ts
+++ /dev/null
@@ -1,1446 +0,0 @@
-// Type definitions for Tabris.js v1.2
-// Project: http://tabrisjs.com
-// Definitions by: Tabris.js team <http://github.com/eclipsesource/tabris>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace tabris {
-
-  // Types
-
-  interface Bounds {
-
-    /**
-     * the horizontal offset from the parent's left edge in dip
-     */
-    left: number;
-
-    /**
-     * the vertical offset from the parent's top edge in dip
-     */
-    top: number;
-
-    /**
-     * the width of the widget in dip
-     */
-    width: number;
-
-    /**
-     * the height of the widget in dip
-     */
-    height: number;
-
-  }
-
-  interface Transformation {
-
-    /**
-     * Clock-wise rotation in radians. Defaults to `0`.
-     */
-     rotation: number;
-
-    /**
-     * Horizontal scale factor. Defaults to `1`.
-     */
-    scaleX: number;
-
-    /*
-     * Vertical scale factor. Defaults to `1`.
-     */
-    scaleY: number;
-
-    /**
-     * Horizontal translation (shift) in dip. Defaults to `0`.
-     */
-    translationX: number;
-
-    /**
-     * Vertical translation (shift) in dip. Defaults to `0`.
-     */
-    translationY: number;
-
-  }
-
-  // TODO A plain string can be used as a shorthand, e.g. `"image.jpg"` equals `{src: "image.jpg"}`.
-  interface Image {
-
-    /**
-     * Image path or URL.
-     */
-    src?: string;
-
-    /**
-     * Image width, extracted from the image file when missing.
-     */
-    width?: number;
-
-    /**
-     * Image height, extracted from the image file when missing.
-     */
-    height?: number;
-
-    /**
-     * Image scale factor - the image will be scaled down by this factor.
-     * Ignored when width or height are set.
-     */
-    scale?: number;
-
-  }
-
-  interface CanvasContext {
-    // TODO
-  }
-
-  // Events
-
-  /**
-   * Event handling API supported by widgets and various other objects.
-   */
-  interface EventSupport <T> {
-
-    /**
-     * Adds the *listener* to the list of functions to be notified when *event* is fired.
-     * In the listener function, `this` will point to the object itself. Supports chaining.
-     *
-     * @param event the name of the event to listen on
-     * @param listener the listener function
-     */
-    on (event: string, listener: (target: T, ...args: any[]) => any): T;
-
-    /**
-     * Same as `on`, but removes the listener after it has been invoked by an event.
-     * Supports chaining.
-     *
-     * @param event the name of the event to listen on
-     * @param listener the listener function
-     */
-    once (event: string, listener: (target: T, ...args: any[]) => any): T;
-
-    /**
-     * Removes all listeners for all events from this widget. Supports chaining.
-     */
-    off (): T;
-
-    /**
-     * Removes all listeners for *event* from this widget. Supports chaining.
-     *
-     * @param event the event name to remove listeners for
-     */
-    off (event: string): T;
-
-    /**
-     * Removes all occurrences of *listener* that are bound to *event* from this widget.
-     * Supports chaining.
-     *
-     * @param event the event to remove the listener from
-     * @param listener the listener function to remove
-     */
-    off (event: string, listener: (target: T, ...args: any[]) => any): T;
-
-    /**
-     * Triggers an event on this object. Supports chaining.
-     *
-     * @param event the name of the event to trigger
-     * @param args the arguments to pass to the listener functions
-     */
-    trigger (event: string, ...args: any[]): T;
-
-  }
-
-  interface AnimationOptions {
-
-    /**
-     * The time until the animation starts in ms, defaults to `0`.
-     */
-    delay?: number;
-
-    /**
-     * The duration in ms.
-     */
-    duration: number;
-
-    /**
-     * One of `linear`, `ease-in`, `ease-out`, `ease-in-out`.
-     */
-    easing: string;
-
-    /**
-     * The number of times to repeat the animation, defaults to `0`.
-     */
-    repeat: number;
-
-    /**
-     * `true` to alternate the direction of the animation on every repeat.
-     */
-    reverse: boolean;
-
-    /**
-     * No effect, but will be given in animation events.
-     */
-    name: string;
-
-  }
-
-  // Widget
-
-  function create (type: string, properties: WidgetProperties): Widget<any>;
-
-  /**
-   * API supported by all widgets.
-   */
-  interface Widget <T> extends EventSupport <T> {
-
-    // Property Support
-
-    /**
-     * Gets the current value of the given *property*.
-     *
-     * @param property
-     */
-    get (property: string): any;
-
-    /**
-     * Sets the given property. Supports chaining.
-     *
-     * @param property the name of the property to set
-     * @param value the value to set the property to
-     * @param options passed to the change event resulting from this method call
-     */
-    set (property: string, value: any, options?: Object): T;
-
-    /**
-     * Sets all key-value pairs in the properties object as widget properties. Supports chaining.
-     *
-     * @param properties the properties to set
-     * @param options passed to the change event resulting from this method call
-     */
-    set (properties: WidgetProperties, options?: Object): T;
-
-    /**
-     * Starts an animation that transforms the given properties from their current values to the given ones.
-     * Supported properties are *transform* and *opacity*.
-     *
-     * @param properties The properties and target values to animate.
-     * @param options Configures the animation itself.
-     */
-    animate (properties: WidgetProperties, options: AnimationOptions): void;
-
-    /**
-     * Appends this widget to the given parent.
-     * The parent widget must support children (extending *Composite*).
-     *
-     * @param parent the parent widget to append this one to
-     */
-    appendTo (parent: Composite): T;
-
-    /**
-     * Applies the given properties to all descendants that match the associated selector(s).
-     *
-     * @param properties an object in the format
-     *   `{selector: {property: value, property: value, ... }, selector: ...}`
-     */
-    apply (properties: Object): T;
-
-    /**
-     * Returns a (possibly empty) collection of all children of this widget.
-     */
-    children (): WidgetCollection;
-
-    /**
-     * Returns a (possibly empty) collection of all children of this widget that match the selector.
-     *
-     * @param selector a selector string to filter children
-     */
-    children (selector: string): WidgetCollection;
-
-    /**
-     * Removes this widget from its parent and destroys it. Also disposes of all its children.
-     * Triggers a `remove` event on the parent and a `dispose` event on itself.
-     * The widget can no longer be used.
-     */
-    dispose (): void;
-
-    /**
-     * Returns a (possibly empty) collection of all descendants of this widget.
-     */
-    find (): WidgetCollection
-
-    /**
-     * Returns a (possibly empty) collection of all descendants of this widget that match the selector.
-     * @param selector
-     */
-    find (selector: string): WidgetCollection
-
-    /**
-     * Returns `true` if the widget has been disposed, otherwise `false`.
-     */
-    isDisposed (): boolean
-
-    /**
-     * Returns the parent of this widget.
-     */
-    parent (): T;
-
-    /**
-     * An application-wide unique identifier automatically assigned to all widgets on creation.
-     * Do not change it.
-     */
-    cid: string;
-
-    /**
-     * Direct access to the value of the property of the same name.
-     * May be used instead of `widget.get("id");`.
-     * Do not use this field to change the value, instead use `widget.set("id", id);`.
-     */
-    id: string;
-
-    /**
-     * The exact string that was used to create this widget using the `tabris.create` method.
-     */
-    type: string;
-
-  }
-
-  interface WidgetProperties {
-
-    /**
-     * The background color of the widget.
-     */
-    background?: string;
-
-    /**
-     * An image to be displayed on the widget's background.
-     * If the image is smaller than the widget, it will be tiled.
-     */
-    backgroundImage?: Image;
-
-    /**
-     * The vertical position of the widget's baseline relative to a sibling widget.
-     */
-    baseline?: any;
-
-    /**
-     * The position of the widget's bottom edge relative to the parent or a sibling widget.
-     */
-    bottom?: any;
-
-    /**
-     * The actual location and size of the widget, relative to its parent. This property is read-only.
-     */
-    bounds?: Bounds;
-
-    /**
-     * The horizontal position of the widget's center relative to the parent's center.
-     */
-    centerX?: number;
-
-    /**
-     * The vertical position of the widget's center relative to the parent's center.
-     */
-    centerY?: number;
-
-    /**
-     * Whether the widget can be operated.
-     */
-    enabled?: boolean;
-
-    /**
-     * The font used for the widget.
-     */
-    font?: string;
-
-    /**
-     * The height of the widget.
-     */
-    height?: number;
-
-    /**
-     * Whether the entire widget should be highlighted while touched.
-     */
-    highlightOnTouch?: boolean;
-
-    /**
-     * A string to identify the widget by using selectors. Id's are optional.
-     * It is strongly recommended that they are unique within a page.
-     */
-    id?: string;
-
-    /**
-     * Shorthand for all layout properties. See [Layout](../layout.md).
-     */
-    layoutData?: Object;
-
-    /**
-     * The position of the widget's left edge relative to the parent or a sibling widget.
-     */
-    left?: any;
-
-    /**
-     * Opacity of the entire widget. Can be used for fade animations.
-     */
-    opacity?: number;
-
-    /**
-     * The position of the widget's right edge relative to the parent or a sibling widget.
-     */
-    right?: any;
-
-    /**
-     * Text color of the widget.
-     */
-    textColor?: string;
-
-    /**
-     * The position of the widget's top edge relative to the parent or a sibling widget.
-     */
-    top?: any;
-
-    /**
-     * Modifications to the widget's shape, size, or position. Can be used for animations.
-     * **Note:** In Android, the *transform* property does not affect the *bounds* property,
-     * while it does so in iOS.
-     */
-    transform?: Transformation;
-
-    /**
-     * Whether the widget is visible.
-     */
-    visible?: boolean;
-
-    /**
-     * The width of the widget.
-     */
-    width?: number;
-
-  }
-
-  // Action
-
-  function create (type: "Action", properties: ActionProperties): Action;
-
-  /**
-   * An executable item that is integrated in the application's navigation menu.
-   * Add a listener on *select* to implement the action.
-   */
-  interface Action extends Widget <Action> {
-
-    set (property: string, value: any, options?: Object): Action;
-    set (properties: ActionProperties, options?: Object): Action;
-
-  }
-
-  interface ActionProperties extends WidgetProperties {
-
-    /**
-     * Icon image for the action.
-     */
-    image?: Image;
-
-    /**
-     * Actions with higher placement priority will be placed at a more significant position in the UI,
-     * e.g. low priority actions could go into a menu instead of being included in a toolbar.
-     * Any of `low`, `high`, `normal`.
-     */
-    placementPriority?: string;
-
-    /**
-     * The text to be displayed for the action.
-     */
-    title?: string;
-
-  }
-
-  // Button
-
-  function create (type: "Button", properties: ButtonProperties): Button;
-
-  /**
-   * A push button. Can contain a text or an image.
-   */
-  interface Button extends Widget <Button> {
-
-    set (property: string, value: any, options?: Object): Button;
-    set (properties: ButtonProperties, options?: Object): Button;
-
-  }
-
-  interface ButtonProperties extends WidgetProperties {
-
-    /**
-     * The horizontal alignment of the button text.
-     * Any of `left`, `right`, `center`. Defaults to `center`.
-     */
-    alignment?: string;
-
-    /**
-     * An image to be displayed on the button.
-     */
-    image?: Image;
-
-    /**
-     * The button's label text.
-     */
-    text?: string;
-
-  }
-
-  // Canvas
-
-  function create (type: "Canvas", properties: WidgetProperties): Canvas;
-
-  /**
-   * Canvas is a widget which allows drawing on it using a canvas context.
-   * Canvas context is a subset of the HTML5 [CanvasRenderingContext2D](https://developer.mozilla.org/en/docs/Web/API/CanvasRenderingContext2D).
-   */
-  interface Canvas extends Composite {
-
-    /**
-     * Returns the drawing context.
-     *
-     * @param contextType This must be `"2d"`
-     * @param width
-     * @param height
-     */
-    getContext (contextType: string, width: number, height: number): CanvasContext;
-
-  }
-
-  // Cell
-
-  function create (type: "Cell", properties: CellProperties): Cell;
-
-  /**
-   * This widget represents a space in a *CollectionView* on which an item is displayed.
-   * Cell widgets are not created by the application but by the *CollectionView* widget.
-   */
-  interface Cell extends Composite {
-
-    set (property: string, value: any, options?: Object): Cell;
-    set (properties: CellProperties, options?: Object): Cell;
-
-  }
-
-  interface CellProperties extends WidgetProperties {
-
-    /**
-     * The item that is currently represented by this cell.
-     * This property is not set by the application but by the *CollectionView* widget.
-     */
-    item?: any;
-
-    /**
-     * The index of the item that is currently represented by this cell.
-     * This property is not set by the application but by the *CollectionView* widget.
-     */
-    itemIndex?: number;
-
-  }
-
-  // CheckBox
-
-  function create (type: "CheckBox", properties: CheckBoxProperties): CheckBox;
-
-  /**
-   * A check box widget.
-   */
-  interface CheckBox extends Widget <CheckBox> {
-
-    set (property: string, value: any, options?: Object): CheckBox;
-    set (properties: CheckBoxProperties, options?: Object): CheckBox;
-
-  }
-
-  interface CheckBoxProperties extends WidgetProperties {
-
-    /**
-     * The checked state of the check box.
-     */
-    selection?: boolean;
-
-    /**
-     * The label text of the check box.
-     */
-    text?: string;
-
-  }
-
-  // CollectionView
-
-  function create (type: "CollectionView", properties: CollectionViewProperties): CollectionView;
-
-  /**
-   * A scrollable list that displays data items in cells, one per row.
-   * Cells are created on demand and filled with widgets in the *initializeCell* callback.
-   */
-  interface CollectionView extends Widget <CollectionView> {
-
-    set (property: string, value: any, options?: Object): CollectionView;
-    set (properties: CollectionViewProperties, options?: Object): CollectionView;
-
-    /**
-     * Inserts the given items into this view. Items are added at the end.
-     * This operation will modify the *items* property.
-     *
-     * @param items
-     */
-    insert (items: any[]): void;
-
-    /**
-     * Inserts the given items into this view at the given index.
-     * This operation will modify the *items* property.
-     *
-     * @param items
-     * @param index the position to insert the items at.
-     *   If a negative index is given, it is interpreted as relative to the end.
-     *   If the given index is greater than the item count, new items will be appended at the end.
-     */
-    insert (items: any[], index: number): void;
-
-    /**
-     * Triggers a refresh of all visible items.
-     * This will issue *change:item* events on the corresponding cells.
-     */
-    refresh (): void;
-
-    /**
-     * Triggers a refresh of the item with the given index.
-     * If the item is scrolled into view, an *change:item* event will be issued on the corresponding cell.
-     *
-     * @param index The index of the item that was changed.
-     */
-    refresh (index: number): void;
-
-    /**
-     * Removes the item at the given index from this view. This operation will modify the *items* property.
-     * @param index The index of the item to remove. If this is negative, it is interpreted as relative to the end.
-     */
-    remove (index: number): void;
-
-    /**
-     * Removes *count* items beginning with the given index from this view.
-     * This operation will modify the *items* property.
-     *
-     * @param index The index of the first item to remove.
-     *   If this is negative, it is interpreted as relative to the end.
-     * @param count The number of items to remove.
-     */
-    remove (index: number, count: number): void;
-
-    /**
-     * Scrolls the item with the given index into view.
-     * @param index The index of the item to reveal. If this is negative, it is interpreted as relative to the end
-     */
-    reveal (index: number): void;
-
-  }
-
-  interface CollectionViewProperties extends WidgetProperties {
-
-    /**
-     * The name of the cell type to use for a given item.
-     * This name will be passed to the `initializeCell` and `itemHeight` functions.
-     * Cells will be reused only by items that require the same cell type.
-     * If set to a function, this function will be called for every item, providing the item as a parameter,
-     * and must return a name for the cell type to use for the given item.
-     */
-    cellType?: (item : any) => string | string;
-
-    /**
-     * A callback used to initialize a collection cell by attaching widget and *change:item* listener.
-     * Cells are created by the framework and recycled on scrolling.
-     * This callback receives the cell as the first and the cell type as second parameter.
-     *
-     * @static
-     */
-    initializeCell?: (cell: Cell, type: string) => any;
-
-    /**
-     * The height of a collection cell. If set to a function, this function will be called for every item,
-     * providing the item and the cell type as parameters, and must return the item height for the given item.
-     */
-    itemHeight?: (item: any, type: string) => number | number;
-
-    /**
-     * An array of data items to be displayed by the collection view.
-     * For dynamic content, use the methods `insert` and `remove` instead of setting this property directly.
-     */
-    items?: any[];
-
-    /**
-     * Enables the user to trigger a refresh by using the pull-to-refresh gesture.
-     */
-    refreshEnabled?: boolean;
-
-    /**
-     * Whether the refresh indicator is currently visible. Will be set to `true` when a *refresh* event
-     * is triggered. Reset it to `false` when the refresh is finished.
-     */
-    refreshIndicator?: boolean;
-
-    /**
-     * The message text displayed together with the refresh indicator. Currently not supported on Android.
-     */
-    refreshMessage?: string;
-
-  }
-
-  // Composite
-
-  function create (type: "Composite", properties: WidgetProperties): Composite;
-
-  interface Parent <T> {
-
-    /**
-     * Adds the given widget(s) in the given order to the composite.
-     *
-     * @param child
-     * @param child*
-     */
-    append (...children: Widget<any>[]): T;
-
-    /**
-     * Adds all widgets in the given collection to the composite.
-     * @param collection
-     */
-    append (collection: WidgetCollection): T;
-
-  }
-
-  /**
-   * An empty widget that can contain other widgets.
-   */
-  interface Composite extends Widget <Composite>, Parent <Composite> {
-  }
-
-  // Drawer
-
-  function create (type: "Drawer", properties: WidgetProperties): Drawer;
-
-  /**
-   * A navigation drawer that can be swiped in from the left edge of the screen. Can contain any kind of widgets.
-   * It may be useful to include a `PageSelector` that displays all top-level pages.
-   */
-  interface Drawer extends Composite {
-
-    /**
-     * Closes the drawer.
-     */
-    close (): Drawer;
-
-    /**
-     * Opens the drawer.
-     */
-    open (): Drawer;
-
-  }
-
-  // ImageView
-
-  function create (type: "ImageView", properties: ImageViewProperties): ImageView;
-
-  /**
-   * A widget to display an image.
-   */
-  interface ImageView extends Widget <ImageView> {
-
-    set (property: string, value: any, options?: Object): ImageView;
-    set (properties: ImageViewProperties, options?: Object): ImageView;
-
-  }
-
-  interface ImageViewProperties {
-
-    image?: Image;
-
-    /**
-     * Any of `auto`, `fit`, `fill`, `stretch`, `none`. Defaults to `auto`.;
-     */
-    scaleMode?: string;
-
-  }
-
-  // Page
-
-  function create (type: "Page", properties: PageProperties): Page;
-
-  /**
-   * Pages contain an application's UI. Top-level pages are included in the application's main menu.
-   */
-  interface Page extends Widget <Page>, Parent <Page> {
-
-    set (property: string, value: any, options?: Object): Page;
-    set (properties: PageProperties, options?: Object): Page;
-
-    /**
-     * Opens the page, i.e. makes it the active page.
-     */
-    open (): Page;
-
-    /**
-     * Closes and disposes of the page.
-     */
-    close (): void;
-
-  }
-
-  interface PageProperties extends WidgetProperties {
-
-    image?: Image;
-
-    title?: string;
-
-    topLevel?: boolean;
-
-  }
-
-  // PageSelector
-
-  function create (type: "PageSelector", properties: WidgetProperties): PageSelector;
-
-  /**
-   * A CollectionView that contains all top-level pages and allows to open them.
-   * New top-level pages are added dynamically.
-   */
-  interface PageSelector extends CollectionView {
-  }
-
-  // Picker
-
-  function create (type: "Picker", properties: PickerProperties): Picker;
-
-  /**
-   * A widget with a drop-down list of items to choose from.
-   */
-  interface Picker extends Widget <Picker> {
-
-    set (property: string, value: any, options?: Object): Picker;
-    set (properties: PickerProperties, options?: Object): Picker;
-
-  }
-
-  interface PickerProperties extends WidgetProperties {
-
-    items?: string[];
-
-    selection?: string;
-
-    selectionIndex?: number;
-
-  }
-
-  // ProgressBar
-
-  function create (type: "ProgressBar", properties: ProgressBarProperties): ProgressBar;
-
-  /**
-   * A widget representing a numeric value as a horizontal bar with a growing indicator.
-   */
-  interface ProgressBar extends Widget <ProgressBar> {
-
-    set (property: string, value: any, options?: Object): ProgressBar;
-    set (properties: ProgressBarProperties, options?: Object): ProgressBar;
-
-  }
-
-  interface ProgressBarProperties {
-
-    /**
-     * Defaults to 100.
-     */
-    maximum?: number;
-
-    /**
-     * Defaults to 0.
-     */
-    minimum?: number;
-
-    /**
-     * Defaults to 0.
-     */
-    selection?: number;
-
-    /**
-     * Any of `normal`, `paused, `error`. Defaults to `normal`.
-     */
-    state?: string;
-
-  }
-
-  // RadioButton
-
-  function create (type: "RadioButton", properties: RadioButtonProperties): RadioButton;
-
-  /**
-   * A radio button. Selecting a radio button de-selects all its siblings (i.e. all radio buttons
-   * within the same parent).
-   */
-  interface RadioButton extends Widget <RadioButton> {
-
-    set (property: string, value: any, options?: Object): RadioButton;
-    set (properties: RadioButtonProperties, options?: Object): RadioButton;
-
-  }
-
-  interface RadioButtonProperties extends WidgetProperties {
-
-    /**
-     * The checked state of the radio button.
-     */
-    selection?: boolean;
-
-    /**
-     * The label text of the radio button.
-     */
-    text?: string;
-
-  }
-
-  // ScrollView
-
-  function create (type: "ScrollView", properties: ScrollViewProperties): ScrollView;
-
-  /**
-   * A composite that allows its content to overflow either vertically (default) or horizontally.
-   * Children of a ScrollView may not be attached to its edge in scrolling direction (to the bottom
-   * for vertical scrolling, to the right for horizontal scrolling).
-   */
-  interface ScrollView extends Composite {
-
-    set (property: string, value: any, options?: Object): ScrollView;
-    set (properties: ScrollViewProperties, options?: Object): ScrollView;
-
-  }
-
-  interface ScrollViewProperties extends WidgetProperties {
-
-    /**
-     * Specifies the scrolling direction of the scroll composite.
-     * Either `vertical` or `horizontal`. Default to `vertical`.
-     * @static
-     */
-    direction?: string;
-
-  }
-
-  // SearchAction
-
-  function create (type: "SearchAction", properties: SearchActionProperties): SearchAction;
-
-  /**
-   * An action that displays a search text field with dynamic proposals when selected.
-   * Add a listener on *select* to implement the action. On *input*, you may set a list of *proposals*.
-   */
-  interface SearchAction extends Action {
-
-    set (property: string, value: any, options?: Object): SearchAction;
-    set (properties: SearchActionProperties, options?: Object): SearchAction;
-
-  }
-
-  interface SearchActionProperties extends ActionProperties {
-
-    /**
-     * A hint text that is displayed when the search input is empty.
-     */
-    message?: string;
-
-    /**
-     * The list of proposals to display.
-     */
-    proposals?: string[];
-
-    /**
-     * The text in the search input field.
-     */
-    text?: string;
-
-  }
-
-  // Slider
-
-  function create (type: "Slider", properties: SliderProperties): Slider;
-
-  /**
-   * A widget representing a numeric value as an movable indicator on a horizontal line.
-   */
-  interface Slider extends Widget <Slider> {
-
-    set (property: string, value: any, options?: Object): Slider;
-    set (properties: SliderProperties, options?: Object): Slider;
-
-  }
-
-  interface SliderProperties extends WidgetProperties {
-
-    maximum?: number;
-
-    minimum?: number;
-
-    selection?: number;
-
-  }
-
-  // Switch
-
-  function create (type: "Switch", properties: SwitchProperties): Switch;
-
-  /**
-   * A switch widget that can be toggled.
-   */
-  interface Switch extends Widget <Switch> {
-
-    set (property: string, value: any, options?: Object): Switch;
-    set (properties: SwitchProperties, options?: Object): Switch;
-
-  }
-
-  interface SwitchProperties extends WidgetProperties {
-
-    /**
-     * The checked state of the switch.
-     */
-    selection?: boolean;
-
-  }
-
-  // Tab
-
-  function create (type: "Tab", properties: TabProperties): Tab;
-
-  /**
-   * A container representing a single tab of the TabFolder widget.
-   */
-  interface Tab extends Composite {
-
-    set (property: string, value: any, options?: Object): Tab;
-    set (properties: TabProperties, options?: Object): Tab;
-
-  }
-
-  interface TabProperties extends WidgetProperties {
-
-    badge?: string;
-
-    image?: Image;
-
-    title?: string;
-
-  }
-
-  // TabFolder
-
-  function create (type: "TabFolder", properties: TabFolderProperties): TabFolder;
-
-  /**
-   * A widget that can switch between [tabs](#tab).
-   */
-  interface TabFolder extends Widget <TabFolder> {
-
-    set (property: string, value: any, options?: Object): TabFolder;
-    set (properties: TabFolderProperties, options?: Object): TabFolder;
-
-    /**
-     * Adds the given tabs in the given order to the TabFolder.
-     *
-     * @param children
-     */
-    append (...children: Tab[]): TabFolder;
-
-  }
-
-  interface TabFolderProperties extends WidgetProperties {
-
-    /**
-     * Enables swiping through tabs.
-     */
-    paging?: boolean;
-
-    selection?: Tab;
-
-    /**
-     * The placement of the tab titles. When set to `"auto"`, the position is platform dependent.
-     * Any of `top`, `bottom`, `auto`. Defaults to `auto`.
-     * @static
-     */
-    tabBarLocation?: string;
-
-  }
-
-  // TextInput
-
-  function create (type: "TextInput", properties: TextInputProperties): TextInput;
-
-  /**
-   * A widget that allows to enter text.
-   */
-  interface TextInput extends Widget <TextInput> {
-
-    set (property: string, value: any, options?: Object): TextInput;
-    set (properties: TextInputProperties, options?: Object): TextInput;
-
-  }
-
-  interface TextInputProperties extends WidgetProperties {
-
-    /**
-     * The horizontal alignment of the text.
-     * Any of `left`, `right`, `center`. Default: `left`.
-     */
-    alignment?: string;
-
-    /**
-     * Automatically switch to capital letters after every key pressed.
-     */
-    autoCapitalize?: boolean;
-
-    /**
-     * Enables the spell checker and auto-correction feature.
-     */
-    autoCorrect?: boolean;
-
-    editable?: boolean;
-
-    /**
-     * Selects the keyboard type to use for editing this widget.
-     * Any of `ascii`, `decimal`, `email`, `number`, `numbersAndPunctuation`, `phone`, `url`, `default`.
-     */
-    keyboard?: string;
-
-    /**
-     * A hint text that is displayed when the input field is empty.
-     */
-    message?: string;
-
-    /**
-     * The text in the input field.
-     */
-    text?: string;
-
-    /**
-     * The type of the text widget.
-     * Any of `default`, `password`, `search`, `multiline`.
-     * @static
-     */
-    type?: string;
-
-  }
-
-  // TextView
-
-  function create (type: "TextView", properties: TextViewProperties): TextView;
-
-  /**
-   * A widget to display a text. For images, use ImageView.
-   */
-  interface TextView extends Widget <TextView> {
-
-    set (property: string, value: any, options?: Object): TextView;
-    set (properties: TextViewProperties, options?: Object): TextView;
-
-  }
-
-  interface TextViewProperties extends WidgetProperties {
-
-    /**
-     * The horizontal alignment of the text.
-     * Any of `left`, `right`, `center`. Default: `left`.
-     */
-    alignment?: string;
-
-    /**
-     * Allows for a subset of HTML tags in the text.
-     * Supported tags are: `a`, `del`, `ins`, `b`, `i`, `strong`, `em`, `big`, `small`, `br`.
-     * All tags must be closed (e.g. use `<br/>` instead of `<br>`). Nesting tags is currently not supported.
-     * @static
-     */
-    markupEnabled?: boolean;
-
-    /**
-     * Limit the number of lines to be displayed to the given maximum. `null` disables this limit.
-     */
-    maxLines?: number;
-
-    /**
-     * The text to display.
-     */
-    text?: string;
-
-  }
-
-  // ToggleButton
-
-  function create (type: "ToggleButton", properties: ToggleButtonProperties): ToggleButton;
-
-  /**
-   * A push button that "snaps in", i.e. it is selected when pressed and deselected when pressed again.
-   */
-  interface ToggleButton extends Widget <ToggleButton> {
-
-    set (property: string, value: any, options?: Object): ToggleButton;
-    set (properties: ToggleButtonProperties, options?: Object): ToggleButton;
-
-  }
-
-  interface ToggleButtonProperties extends WidgetProperties {
-
-    /**
-     * The horizontal alignment of the button text.
-     * Any of `left`, `right`, `center`. Default: `left`.
-     */
-    alignment?: string;
-
-    /**
-     * An image to be displayed on the button.
-     */
-    image?: Image;
-
-    /**
-     * The selection state of the toggle button.
-     */
-    selection?: boolean;
-
-    /**
-     * The button's label text.
-     */
-    text?: string;
-
-  }
-
-  // Video
-
-  function create (type: "Video", properties: VideoProperties): Video;
-
-  /**
-   * A widget that plays a video from a URL.
-   */
-  interface Video extends Widget <Video> {
-
-    set (property: string, value: any, options?: Object): Video;
-    set (properties: VideoProperties, options?: Object): Video;
-
-  }
-
-  interface VideoProperties extends WidgetProperties {
-
-    /**
-     * The URL of the video to play.
-     */
-    url?: string;
-
-  }
-
-  // WebView
-
-  function create (type: "WebView", properties: WebViewProperties): WebView;
-
-  /**
-   * A widget that can display a web page.
-   * Since this widget requires a lot of recourses it's recommended to have no more than one instance at a time.
-   */
-  interface WebView extends Widget <WebView> {
-
-    set (property: string, value: any, options?: Object): Video;
-    set (properties: WebViewProperties, options?: Object): Video;
-
-  }
-
-  interface WebViewProperties extends WidgetProperties {
-
-    /**
-     * A complete HTML document to display. Always returns the last set value.
-     */
-    html?: string;
-
-    /**
-     * The URL of the web page to display. Returns empty string when content from *html* property is displayed.
-     */
-    url?: string;
-
-  }
-
-  // WidgetCollection
-
-  /**
-   */
-  interface WidgetCollection extends EventSupport <WidgetCollection> {
-
-    /**
-     * Animates all widgets in this collection.
-     *
-     * @param properties The properties and target values to animate.
-     * @param options Configures the animation itself.
-     */
-    animate (properties: WidgetProperties, options: AnimationOptions): void;
-
-    /**
-     * Append all widgets in this collection to the given widget.
-     * @param parent
-     */
-    appendTo (parent: Composite): WidgetCollection;
-
-    /**
-     * Returns a collection containing all children of all widgets in this collection.
-     */
-    children (): WidgetCollection;
-
-    /**
-     * Same as `collection.children().filter(selector)`.
-     * @param selector
-     */
-    children (selector: string): WidgetCollection;
-
-    /**
-     * Disposes all widgets in this collection.
-     */
-    dispose (): void;
-
-    /**
-     * Returns a collection containing all descendants of all widgets in this collection.
-     */
-    find (): WidgetCollection;
-
-    /**
-     * Returns a collection containing all descendants of all widgets in this collection that match the given selector.
-     * @param selector
-     */
-    find (selector: string): WidgetCollection;
-
-    /**
-     * Returns a collection containing all direct parents of all widgets in this collection.
-     */
-    parent (): WidgetCollection;
-
-    /**
-     * A read-only field containing the number of widgets in the collection.
-     */
-    length: number;
-
-  }
-
-  // tabris.app
-
-  /**
-   * The object `tabris.app` provides information about the application.
-   */
-  interface App {
-
-    /**
-     * Installs a patch from the given URL.
-     * When the patch is successfully installed, it will remain inactive until the application is reloaded.
-     * @param url The URL to fetch a patch from.
-     * @param callback A callback function to be called when the installation has finished or failed.
-     * In case of a failure, the callback will receive a parameter `error` that contains an Error object.
-     * If the installation succeeds, this parameter will be `undefined` and a second parameter will contain
-     * the parsed content of the file `patch.json` from the installed patch.
-     * @provisional
-     */
-    installPatch (url : string, callback : (error: Error, patch: Object) => any): void;
-
-    /**
-     * Forces the running application to reload the main module and start over.
-     */
-    reload (): void;
-
-  }
-
-  export var app: App;
-
-  // tabris.device
-
-  /**
-   * The object `tabris.device` provides information about the device that executes the application.
-   * All properties are read-only.
-   */
-  interface Device extends EventSupport <Device> {
-
-    get(property: string): void;
-
-    /**
-     * The user language configured on the device as an [RFC 4646](http://tools.ietf.org/html/rfc4646) compliant string. For example `"de"`, `"es-ES"`, etc. This property is also available globally as `navigator.language`.
-     */
-    get(property: "language"): string;
-
-    /**
-     * The name of the device model. For example `"iPad4,1"` or `"Nexus 7"`.
-     * This property is also available globally as `device.model`.
-     */
-    get(property: "model"): string;
-
-    /**
-     * The device orientation. One of `portrait-primary`, `portrait-secondary`, `landscape-primary`, and `landscape-secondary`.
-     */
-    get(property: "orientation"): string;
-
-    /**
-     * The name of the platform. Currently either `"Android"` or `"iOS"`.
-     * This property is also available globally as `device.platform`.
-     */
-    get(property: "platform"): string;
-
-    /**
-     * The ratio between physical pixels and device independent pixels.
-     * This property is also available globally as [`window.devicePixelRatio`](https://developer.mozilla.org/en-US/docs/Web/API/Window.devicePixelRatio).
-     */
-    get(property: "scaleFactor"): number;
-
-    /**
-     * The entire height of the device's screen in device independent pixel.
-     * Depends on the current device orientation. This property is also available globally as [screen.height](https://developer.mozilla.org/en-US/docs/Web/API/Screen.height).
-     */
-    get(property: "screenHeight"): number;
-
-    /**
-     * The entire width of the device's screen in device independent pixel.
-     * Depends on the current device orientation. This property is also available as globally as [screen.width](https://developer.mozilla.org/en-US/docs/Web/API/Screen.width).
-     */
-    get(property: "screenWidth"): number;
-
-    /**
-     * The platform version. On iOS it lools like this: `"8.1.1"`.
-     * On Android, the [version code](https://developer.android.com/reference/android/os/Build.VERSION_CODES.html)
-     * is returned. This property is also available globally as `device.version`.
-     */
-    get(property: "version"): string;
-
-  }
-
-  export var device: Device;
-
-  // tabris.ui
-
-  /**
-   * The object `tabris.ui` is the root element for all widgets.
-   * This is the parent for all top-level pages, *actions* and the *drawer*.
-   */
-  interface UI extends EventSupport <UI> {
-
-    get(property: string): void;
-
-    /**
-     * The currently visible page.
-     */
-    get(property: "activePage"): Page;
-
-    /**
-     * Background color for the navigation elements.
-     */
-    get(property: "background"): string;
-
-    /**
-     * Text color for the navigation elements.
-     */
-    get(property: "textColor"): string;
-
-    /**
-     * Whether the toolbars above and below pages are visible.
-     */
-    get(property: "toolbarVisible"): boolean;
-
-  }
-
-  export var ui: UI;
-
-}
-
-declare module "tabris" {
-  export = tabris;
-}
diff --git a/tabris/tsconfig.json b/tabris/tsconfig.json
new file mode 100644
index 0000000000..5ed37773d9
--- /dev/null
+++ b/tabris/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "tabris-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tabtab/index.d.ts b/tabtab/index.d.ts
new file mode 100644
index 0000000000..eba5a58c3a
--- /dev/null
+++ b/tabtab/index.d.ts
@@ -0,0 +1,89 @@
+// Type definitions for tabtab 0.0.4
+// Project: https://github.com/mklabs/node-tabtab
+// Definitions by: Vojtěch Habarta <https://github.com/vojtechhabarta>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+/**
+ * Main completion method, has support for installation and actual completion.
+ * @param name Name of the command to complete.
+ * @param cb Get called when a tab-completion command happens.
+ */
+export declare function complete(name: string, cb: CallBack): void;
+
+/**
+ * Main completion method, has support for installation and actual completion.
+ * @param name Name of the command to complete.
+ * @param completer Name of the command to call on completion.
+ * @param cb Get called when a tab-completion command happens.
+ */
+export declare function complete(name: string, completer: string, cb: CallBack): void;
+
+/**
+ * Simple helper function to know if the script is run in the context of a completion command.
+ */
+export declare function isComplete(): boolean;
+
+/**
+ * Helper to return the list of short and long options, parsed from the usual --help output of a command (cake/rake -H, vagrant, commander -h, optimist.help(), ...).
+ */
+export declare function parseOut(str: string): { shorts: string[]; longs: string[] };
+
+/**
+ * Same purpose as parseOut, but for parsing tasks from an help command (cake/rake -T, vagrant, etc.).
+ */
+export declare function parseTasks(str: string, prefix: string, reg?: RegExp | string): string[];
+
+/**
+ * Helper to return completion output and log to standard output.
+ * @param values Array of values to complete against.
+ * @param data The data object returned by the complete callback, used mainly to filter results accordingly upon the text that is supplied by the user.
+ * @param prefix A prefix to add to the completion results, useful for options to add dashes (eg. - or --).
+ */
+export declare function log(values: string[], data: Data, prefix?: string): void;
+
+interface CallBack {
+    (error?: Error, data?: Data, text?: string): any;
+}
+
+/**
+ * Holds interesting values to drive the output of the completion.
+ */
+interface Data {
+
+    /**
+     * full command being completed
+     */
+    line: string;
+
+    /**
+     * number of words
+     */
+    words: number;
+
+    /**
+     * cursor position
+     */
+    point: number;
+
+    /**
+     * tabing in the middle of a word: foo bar baz bar foobarrrrrrr
+     */
+    partial: string;
+
+    /**
+     * last word of the line
+     */
+    last: string;
+
+    /**
+     * last partial of the line
+     */
+    lastPartial: string;
+
+    /**
+     * the previous word
+     */
+    prev: string;
+}
diff --git a/tabtab/tabtab-tests.ts b/tabtab/tabtab-tests.ts
index 69db6edbb3..8330d7c2cd 100644
--- a/tabtab/tabtab-tests.ts
+++ b/tabtab/tabtab-tests.ts
@@ -1,6 +1,5 @@
 
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../tabtab/tabtab.d.ts" />
+/// <reference types="node" />
 
 import tabtab = require('tabtab');
 import child_process = require('child_process');
diff --git a/tabtab/tabtab.d.ts b/tabtab/tabtab.d.ts
deleted file mode 100644
index a777c9aba5..0000000000
--- a/tabtab/tabtab.d.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-// Type definitions for tabtab 0.0.4
-// Project: https://github.com/mklabs/node-tabtab
-// Definitions by: Vojtěch Habarta <https://github.com/vojtechhabarta>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "tabtab" {
-
-    /**
-     * Main completion method, has support for installation and actual completion.
-     * @param name Name of the command to complete.
-     * @param cb Get called when a tab-completion command happens.
-     */
-    export function complete(name: string, cb: CallBack): void;
-
-    /**
-     * Main completion method, has support for installation and actual completion.
-     * @param name Name of the command to complete.
-     * @param completer Name of the command to call on completion.
-     * @param cb Get called when a tab-completion command happens.
-     */
-    export function complete(name: string, completer: string, cb: CallBack): void;
-
-    /**
-     * Simple helper function to know if the script is run in the context of a completion command.
-     */
-    export function isComplete(): boolean;
-
-    /**
-     * Helper to return the list of short and long options, parsed from the usual --help output of a command (cake/rake -H, vagrant, commander -h, optimist.help(), ...).
-     */
-    export function parseOut(str: string): { shorts: string[]; longs: string[] };
-
-    /**
-     * Same purpose as parseOut, but for parsing tasks from an help command (cake/rake -T, vagrant, etc.).
-     */
-    export function parseTasks(str: string, prefix: string, reg?: RegExp|string): string[];
-
-    /**
-     * Helper to return completion output and log to standard output.
-     * @param values Array of values to complete against.
-     * @param data The data object returned by the complete callback, used mainly to filter results accordingly upon the text that is supplied by the user.
-     * @param prefix A prefix to add to the completion results, useful for options to add dashes (eg. - or --).
-     */
-    export function log(values: string[], data: Data, prefix?: string): void;
-
-    interface CallBack {
-        (error?: Error, data?: Data, text?: string): any;
-    }
-
-    /**
-     * Holds interesting values to drive the output of the completion.
-     */
-    interface Data {
-
-        /**
-         * full command being completed
-         */
-        line: string;
-
-        /**
-         * number of words
-         */
-        words: number;
-
-        /**
-         * cursor position
-         */
-        point: number;
-
-        /**
-         * tabing in the middle of a word: foo bar baz bar foobarrrrrrr
-         */
-        partial: string;
-
-        /**
-         * last word of the line
-         */
-        last: string;
-
-        /**
-         * last partial of the line
-         */
-        lastPartial: string;
-
-        /**
-         * the previous word
-         */
-        prev: string;
-    }
-
-}
diff --git a/tabtab/tsconfig.json b/tabtab/tsconfig.json
new file mode 100644
index 0000000000..b94d17ffe3
--- /dev/null
+++ b/tabtab/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "tabtab-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tape/index.d.ts b/tape/index.d.ts
new file mode 100644
index 0000000000..4fc331c402
--- /dev/null
+++ b/tape/index.d.ts
@@ -0,0 +1,201 @@
+// Type definitions for tape v4.2.2
+// Project: https://github.com/substack/tape
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Haoqun Jiang <https://github.com/sodatea>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+export = tape;
+
+/**
+ * Create a new test with an optional name string and optional opts object.
+ * cb(t) fires with the new test object t once all preceeding tests have finished.
+ * Tests execute serially.
+ */
+declare function tape(name: string, cb: tape.TestCase): void;
+declare function tape(name: string, opts: tape.TestOptions, cb: tape.TestCase): void;
+declare function tape(cb: tape.TestCase): void;
+declare function tape(opts: tape.TestOptions, cb: tape.TestCase): void;
+
+declare namespace tape {
+
+    interface TestCase {
+        (test: Test): void;
+    }
+
+    /**
+     * Available opts options for the tape function.
+     */
+    interface TestOptions {
+        skip?: boolean;		// See tape.skip.
+        timeout?: number;	// Set a timeout for the test, after which it will fail. See tape.timeoutAfter.
+    }
+
+    /**
+     * Options for the createStream function.
+     */
+    interface StreamOptions {
+        objectMode?: boolean;
+    }
+
+    /**
+     * Generate a new test that will be skipped over.
+     */
+    export function skip(name: string, cb: tape.TestCase): void;
+
+    /**
+     * Like test(name, cb) except if you use .only this is the only test case that will run for the entire process, all other test cases using tape will be ignored.
+     */
+    export function only(name: string, cb: tape.TestCase): void;
+
+    /**
+     * Create a new test harness instance, which is a function like test(), but with a new pending stack and test state.
+     */
+    export function createHarness(): typeof tape;
+    /**
+     * Create a stream of output, bypassing the default output stream that writes messages to console.log().
+     * By default stream will be a text stream of TAP output, but you can get an object stream instead by setting opts.objectMode to true.
+     */
+    export function createStream(opts?: tape.StreamOptions): NodeJS.ReadableStream;
+
+    interface Test {
+        /**
+         * Create a subtest with a new test handle st from cb(st) inside the current test.
+         * cb(st) will only fire when t finishes.
+         * Additional tests queued up after t will not be run until all subtests finish.
+         */
+        test(name: string, cb: tape.TestCase): void;
+
+        /**
+         * Declare that n assertions should be run. end() will be called automatically after the nth assertion.
+         * If there are any more assertions after the nth, or after end() is called, they will generate errors.
+         */
+        plan(n: number): void;
+
+        /**
+         * Declare the end of a test explicitly.
+         * If err is passed in t.end will assert that it is falsey.
+         */
+        end(err?: any): void;
+
+        /**
+         * Generate a failing assertion with a message msg.
+         */
+        fail(msg?: string): void;
+
+        /**
+         * Generate a passing assertion with a message msg.
+         */
+        pass(msg?: string): void;
+
+        /**
+         * Automatically timeout the test after X ms.
+         */
+        timeoutAfter(ms: number): void;
+
+        /**
+         * Generate an assertion that will be skipped over.
+         */
+        skip(msg?: string): void;
+
+        /**
+         * Assert that value is truthy with an optional description message msg.
+         */
+        ok(value: any, msg?: string): void;
+        true(value: any, msg?: string): void;
+        assert(value: any, msg?: string): void;
+
+        /**
+         * Assert that value is falsy with an optional description message msg.
+         */
+        notOk(value: any, msg?: string): void;
+        false(value: any, msg?: string): void;
+        notok(value: any, msg?: string): void;
+
+        /**
+         * Assert that err is falsy.
+         * If err is non-falsy, use its err.message as the description message.
+         */
+        error(err: any, msg?: string): void;
+        ifError(err: any, msg?: string): void;
+        ifErr(err: any, msg?: string): void;
+        iferror(err: any, msg?: string): void;
+
+        /**
+         * Assert that a === b with an optional description msg.
+         */
+        equal(a: any, b: any, msg?: string): void;
+        equals(a: any, b: any, msg?: string): void;
+        isEqual(a: any, b: any, msg?: string): void;
+        is(a: any, b: any, msg?: string): void;
+        strictEqual(a: any, b: any, msg?: string): void;
+        strictEquals(a: any, b: any, msg?: string): void;
+
+        /**
+         * Assert that a !== b with an optional description msg.
+         */
+        notEqual(a: any, b: any, msg?: string): void;
+        notEquals(a: any, b: any, msg?: string): void;
+        notStrictEqual(a: any, b: any, msg?: string): void;
+        notStrictEquals(a: any, b: any, msg?: string): void;
+        isNotEqual(a: any, b: any, msg?: string): void;
+        isNot(a: any, b: any, msg?: string): void;
+        not(a: any, b: any, msg?: string): void;
+        doesNotEqual(a: any, b: any, msg?: string): void;
+        isInequal(a: any, b: any, msg?: string): void;
+
+        /**
+         * Assert that a and b have the same structure and nested values using node's deepEqual() algorithm with strict comparisons (===) on leaf nodes and an optional description msg.
+         */
+        deepEqual(a: any, b: any, msg?: string): void;
+        deepEquals(a: any, b: any, msg?: string): void;
+        isEquivalent(a: any, b: any, msg?: string): void;
+        same(a: any, b: any, msg?: string): void;
+
+        /**
+         * Assert that a and b do not have the same structure and nested values using node's deepEqual() algorithm with strict comparisons (===) on leaf nodes and an optional description msg.
+         */
+        notDeepEqual(a: any, b: any, msg?: string): void;
+        notEquivalent(a: any, b: any, msg?: string): void;
+        notDeeply(a: any, b: any, msg?: string): void;
+        notSame(a: any, b: any, msg?: string): void;
+        isNotDeepEqual(a: any, b: any, msg?: string): void;
+        isNotDeeply(a: any, b: any, msg?: string): void;
+        isNotEquivalent(a: any, b: any, msg?: string): void;
+        isInequivalent(a: any, b: any, msg?: string): void;
+
+        /**
+         * Assert that a and b have the same structure and nested values using node's deepEqual() algorithm with loose comparisons (==) on leaf nodes and an optional description msg.
+         */
+        deepLooseEqual(a: any, b: any, msg?: string): void;
+        looseEqual(a: any, b: any, msg?: string): void;
+        looseEquals(a: any, b: any, msg?: string): void;
+
+        /**
+         * Assert that a and b do not have the same structure and nested values using node's deepEqual() algorithm with loose comparisons (==) on leaf nodes and an optional description msg.
+         */
+        notDeepLooseEqual(a: any, b: any, msg?: string): void;
+        notLooseEqual(a: any, b: any, msg?: string): void;
+        notLooseEquals(a: any, b: any, msg?: string): void;
+
+        /**
+         * Assert that the function call fn() throws an exception.
+         * expected, if present, must be a RegExp or Function, which is used to test the exception object.
+         */
+        throws(fn: () => void, msg?: string): void;
+        throws(fn: () => void, exceptionExpected: RegExp | (() => void), msg?: string): void;
+
+        /**
+         * Assert that the function call fn() does not throw an exception.
+         */
+        doesNotThrow(fn: () => void, msg?: string): void;
+        doesNotThrow(fn: () => void, exceptionExpected: RegExp | (() => void), msg?: string): void;
+
+        /**
+         * Print a message without breaking the tap output.
+         * (Useful when using e.g. tap-colorize where output is buffered & console.log will print in incorrect order vis-a-vis tap output.)
+         */
+        comment(msg: string): void;
+    }
+}
diff --git a/tape/tape-tests.ts b/tape/tape-tests.ts
index 919da38808..cc51d27ba1 100644
--- a/tape/tape-tests.ts
+++ b/tape/tape-tests.ts
@@ -1,6 +1,5 @@
-/// <reference path="tape.d.ts" />
 
-/// <reference path="../node/node.d.ts" />
+/// <reference types="node" />
 
 import tape = require("tape");
 
diff --git a/tape/tape.d.ts b/tape/tape.d.ts
deleted file mode 100644
index 0a9a422efa..0000000000
--- a/tape/tape.d.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-// Type definitions for tape v4.2.2
-// Project: https://github.com/substack/tape
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Haoqun Jiang <https://github.com/sodatea>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'tape' {
-	export = tape;
-
-	/**
-	 * Create a new test with an optional name string and optional opts object.
-	 * cb(t) fires with the new test object t once all preceeding tests have finished.
-	 * Tests execute serially.
-	 */
-	function tape(name: string, cb: tape.TestCase): void;
-	function tape(name: string, opts: tape.TestOptions, cb: tape.TestCase): void;
-	function tape(cb: tape.TestCase): void;
-	function tape(opts: tape.TestOptions, cb: tape.TestCase): void;
-
-	namespace tape {
-
-		interface TestCase {
-			(test: Test): void;
-		}
-
-		/**
-		 * Available opts options for the tape function.
-		 */
-		interface TestOptions {
-			skip?: boolean;		// See tape.skip.
-			timeout?: number;	// Set a timeout for the test, after which it will fail. See tape.timeoutAfter.
-		}
-
-		/**
-		 * Options for the createStream function.
-		 */
-		interface StreamOptions {
-			objectMode?: boolean;
-		}
-
-		/**
-		 * Generate a new test that will be skipped over.
-		 */
-		export function skip(name: string, cb: tape.TestCase): void;
-
-		/**
-		 * Like test(name, cb) except if you use .only this is the only test case that will run for the entire process, all other test cases using tape will be ignored.
-		 */
-		export function only(name: string, cb: tape.TestCase): void;
-
-		/**
-		 * Create a new test harness instance, which is a function like test(), but with a new pending stack and test state.
-		 */
-		export function createHarness(): typeof tape;
-		/**
-		 * Create a stream of output, bypassing the default output stream that writes messages to console.log().
-		 * By default stream will be a text stream of TAP output, but you can get an object stream instead by setting opts.objectMode to true.
-		 */
-		export function createStream(opts?: tape.StreamOptions): NodeJS.ReadableStream;
-
-		interface Test {
-			/**
-			 * Create a subtest with a new test handle st from cb(st) inside the current test.
-			 * cb(st) will only fire when t finishes.
-			 * Additional tests queued up after t will not be run until all subtests finish.
-			 */
-			test(name: string, cb: tape.TestCase): void;
-
-			/**
-			 * Declare that n assertions should be run. end() will be called automatically after the nth assertion.
-			 * If there are any more assertions after the nth, or after end() is called, they will generate errors.
-			 */
-			plan(n: number): void;
-
-			/**
-			 * Declare the end of a test explicitly.
-			 * If err is passed in t.end will assert that it is falsey.
-			 */
-			end(err?: any): void;
-
-			/**
-			 * Generate a failing assertion with a message msg.
-			 */
-			fail(msg?: string): void;
-
-			/**
-			 * Generate a passing assertion with a message msg.
-			 */
-			pass(msg?: string): void;
-
-			/**
-			 * Automatically timeout the test after X ms.
-			 */
-			timeoutAfter(ms: number): void;
-
-			/**
-			 * Generate an assertion that will be skipped over.
-			 */
-			skip(msg?: string): void;
-
-			/**
-			 * Assert that value is truthy with an optional description message msg.
-			 */
-			ok(value: any, msg?: string): void;
-			true(value: any, msg?: string): void;
-			assert(value: any, msg?: string): void;
-
-			/**
-			 * Assert that value is falsy with an optional description message msg.
-			 */
-			notOk(value: any, msg?: string): void;
-			false(value: any, msg?: string): void;
-			notok(value: any, msg?: string): void;
-
-			/**
-			 * Assert that err is falsy.
-			 * If err is non-falsy, use its err.message as the description message.
-			 */
-			error(err: any, msg?: string): void;
-			ifError(err: any, msg?: string): void;
-			ifErr(err: any, msg?: string): void;
-			iferror(err: any, msg?: string): void;
-
-			/**
-			 * Assert that a === b with an optional description msg.
-			 */
-			equal(a: any, b: any, msg?: string): void;
-			equals(a: any, b: any, msg?: string): void;
-			isEqual(a: any, b: any, msg?: string): void;
-			is(a: any, b: any, msg?: string): void;
-			strictEqual(a: any, b: any, msg?: string): void;
-			strictEquals(a: any, b: any, msg?: string): void;
-
-			/**
-			 * Assert that a !== b with an optional description msg.
-			 */
-			notEqual(a: any, b: any, msg?: string): void;
-			notEquals(a: any, b: any, msg?: string): void;
-			notStrictEqual(a: any, b: any, msg?: string): void;
-			notStrictEquals(a: any, b: any, msg?: string): void;
-			isNotEqual(a: any, b: any, msg?: string): void;
-			isNot(a: any, b: any, msg?: string): void;
-			not(a: any, b: any, msg?: string): void;
-			doesNotEqual(a: any, b: any, msg?: string): void;
-			isInequal(a: any, b: any, msg?: string): void;
-
-			/**
-			 * Assert that a and b have the same structure and nested values using node's deepEqual() algorithm with strict comparisons (===) on leaf nodes and an optional description msg.
-			 */
-			deepEqual(a: any, b: any, msg?: string): void;
-			deepEquals(a: any, b: any, msg?: string): void;
-			isEquivalent(a: any, b: any, msg?: string): void;
-			same(a: any, b: any, msg?: string): void;
-
-			/**
-			 * Assert that a and b do not have the same structure and nested values using node's deepEqual() algorithm with strict comparisons (===) on leaf nodes and an optional description msg.
-			 */
-			notDeepEqual(a: any, b: any, msg?: string): void;
-			notEquivalent(a: any, b: any, msg?: string): void;
-			notDeeply(a: any, b: any, msg?: string): void;
-			notSame(a: any, b: any, msg?: string): void;
-			isNotDeepEqual(a: any, b: any, msg?: string): void;
-			isNotDeeply(a: any, b: any, msg?: string): void;
-			isNotEquivalent(a: any, b: any, msg?: string): void;
-			isInequivalent(a: any, b: any, msg?: string): void;
-
-			/**
-			 * Assert that a and b have the same structure and nested values using node's deepEqual() algorithm with loose comparisons (==) on leaf nodes and an optional description msg.
-			 */
-			deepLooseEqual(a: any, b: any, msg?: string): void;
-			looseEqual(a: any, b: any, msg?: string): void;
-			looseEquals(a: any, b: any, msg?: string): void;
-
-			/**
-			 * Assert that a and b do not have the same structure and nested values using node's deepEqual() algorithm with loose comparisons (==) on leaf nodes and an optional description msg.
-			 */
-			notDeepLooseEqual(a: any, b: any, msg?: string): void;
-			notLooseEqual(a: any, b: any, msg?: string): void;
-			notLooseEquals(a: any, b: any, msg?: string): void;
-
-			/**
-			 * Assert that the function call fn() throws an exception.
-			 * expected, if present, must be a RegExp or Function, which is used to test the exception object.
-			 */
-			throws(fn: () => void, msg?: string): void;
-			throws(fn: () => void, exceptionExpected: RegExp | (() => void), msg?: string): void;
-
-			/**
-			 * Assert that the function call fn() does not throw an exception.
-			 */
-			doesNotThrow(fn: () => void, msg?: string): void;
-			doesNotThrow(fn: () => void, exceptionExpected: RegExp | (() => void), msg?: string): void;
-
-			/**
-			 * Print a message without breaking the tap output.
-			 * (Useful when using e.g. tap-colorize where output is buffered & console.log will print in incorrect order vis-a-vis tap output.)
-			 */
-			comment(msg: string): void;
-		}
-	}
-}
diff --git a/tape/tsconfig.json b/tape/tsconfig.json
new file mode 100644
index 0000000000..15f34a792d
--- /dev/null
+++ b/tape/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "tape-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tar/index.d.ts b/tar/index.d.ts
new file mode 100644
index 0000000000..fbfa9b8b0e
--- /dev/null
+++ b/tar/index.d.ts
@@ -0,0 +1,227 @@
+// Type definitions for tar v1.0.1
+// Project: https://github.com/npm/node-tar
+// Definitions by: Maxime LUCE <https://github.com/SomaticIT>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TODO: When/if typings for [fstream](https://github.com/npm/fstream) are written, refactor this typing to use it for the various streams.
+
+/// <reference types="node" />
+
+
+import stream = require("stream");
+
+// #region Interfaces
+
+export interface HeaderProperties {
+    path?: string;
+    mode?: number;
+    uid?: number;
+    gid?: number;
+    size?: number;
+    mtime?: number;
+    uname?: string;
+    gname?: string;
+    devmaj?: number;
+    devmin?: number;
+}
+
+export interface ExtractOptions {
+    type?: string;
+    Directory?: boolean;
+    path?: string;
+    strip?: number;
+}
+
+export interface ParseStream extends NodeJS.ReadWriteStream {
+    position: number;
+
+    _stream: stream.Stream;
+    _ended: boolean;
+
+    _streamEnd(): void;
+    _process(c: Buffer): void;
+    _startEntry(c: Buffer): void;
+}
+
+export interface PackStream extends NodeJS.ReadWriteStream {
+    writable: boolean;
+    readable: boolean;
+
+    _noProprietary: boolean;
+    _global: HeaderProperties;
+    _buffer: stream.Stream[];
+    _currentEntry: any;
+    _processing: boolean;
+    _pipeRoot: stream.Stream;
+    _needDrain: boolean;
+    _paused: boolean;
+
+    addGlobal(props: HeaderProperties): void;
+    add(stream: stream.Stream): boolean;
+    destroy(): void;
+
+    _process(): void;
+}
+
+export interface ExtractStream extends ParseStream {
+}
+
+// #endregion
+
+// #region Enums
+
+export declare var fields: {
+    path: number;
+    mode: number;
+    uid: number;
+    gid: number;
+    size: number;
+    mtime: number;
+    cksum: number;
+    type: number;
+    linkpath: number;
+    ustar: number;
+    ustarvar: number;
+    uname: number;
+    gname: number;
+    devmaj: number;
+    devmin: number;
+    prefix: number;
+    fill: number;
+};
+
+export declare var fieldSize: number[];
+export declare var fieldOffs: number[];
+export declare var fieldEnds: number[];
+
+/**
+ * Different values of the 'type' field
+ * paths match the values of Stats.isX() functions, where appropriate
+ */
+export declare var types: {
+    0: string;
+    "\0": string;
+    "": string;
+    1: string;
+    2: string;
+    3: string;
+    4: string;
+    5: string;
+    6: string;
+    7: string;
+    g: string;
+    x: string;
+    A: string;
+    D: string;
+    I: string;
+    K: string;
+    L: string;
+    M: string;
+    N: string;
+    S: string;
+    V: string;
+    X: string;
+    File: string;
+    OldFile: string;
+    Link: string;
+    SymbolicLick: string;
+    CharacterDevice: string;
+    BlockDevice: string;
+    Directory: string;
+    FIFO: string;
+    ContiguousFile: string;
+    GlobalExtendedHeader: string;
+    ExtendedHeader: string;
+    SolarisACL: string;
+    GNUDumpDir: string;
+    INode: string;
+    NextFileHasLonLinkPath: string;
+    NextFileHasLongPath: string;
+    ContinuationFile: string;
+    TapeVolumeHeader: string;
+    OldExtendedHeader: string;
+};
+
+/**
+ * Values for the mode field
+ */
+export declare var modes: {
+    suid: number;
+    sgid: number;
+    svtx: number;
+    uread: number;
+    uwrite: number;
+    uexec: number;
+    gread: number;
+    gwrite: number;
+    gexec: number;
+    oread: number;
+    owrite: number;
+    oexec: number;
+};
+
+export declare var numeric: {
+    mode: boolean;
+    uid: boolean;
+    gid: boolean;
+    size: boolean;
+    mtime: boolean;
+    devmaj: boolean;
+    devmin: boolean;
+    cksum: boolean;
+    atime: boolean;
+    ctime: boolean;
+    dev: boolean;
+    ino: boolean;
+    nlink: boolean;
+};
+
+export declare var knownExtended: {
+    atime: boolean;
+    charset: boolean;
+    comment: boolean;
+    ctime: boolean;
+    gid: boolean;
+    gname: boolean;
+    linkpat: boolean;
+    mtime: boolean;
+    path: boolean;
+    realtime: boolean;
+    security: boolean;
+    size: boolean;
+    uid: boolean;
+    uname: boolean;
+};
+
+export declare var headerSize: number;
+export declare var blockSize: number;
+
+//#endregion
+
+//#region Global Methods
+
+/**
+ * Returns a writable stream. Write tar data to it and it will emit entry events for each entry parsed from the tarball. This is used by tar.Extract.
+ */
+export declare function Parse(): ParseStream;
+/**
+ * Returns a through stream. Use fstream to write files into the pack stream and you will receive tar archive data from the pack stream.
+ * This only works with directories, it does not work with individual files.
+ * The optional properties object are used to set properties in the tar 'Global Extended Header'.
+ */
+export declare function Pack(props?: HeaderProperties): PackStream;
+/**
+ * Returns a through stream. Write tar data to the stream and the files in the tarball will be extracted onto the filesystem.
+ */
+export declare function Extract(path: string): ExtractStream;
+/**
+ * Returns a through stream. Write tar data to the stream and the files in the tarball will be extracted onto the filesystem.
+ * options can be:
+ * ```
+ * {
+ *   path: '/path/to/extract/tar/into',
+ *   strip: 0, // how many path segments to strip from the root when extracting
+ * }
+ * ```
+ * options also get passed to the fstream.Writer instance that tar uses internally.
+ */
+export declare function Extract(opts: ExtractOptions): ExtractStream;
diff --git a/tar/tar-tests.ts b/tar/tar-tests.ts
index b23ad7d06b..41e645617f 100644
--- a/tar/tar-tests.ts
+++ b/tar/tar-tests.ts
@@ -4,8 +4,7 @@
  * Created by using code samples from https://github.com/npm/node-tar.
  */
 
-/// <reference path="../node/node.d.ts" />
-/// <reference path="tar.d.ts" />
+/// <reference types="node" />
 
 import tar = require("tar");
 import fs = require("fs");
diff --git a/tar/tar.d.ts b/tar/tar.d.ts
deleted file mode 100644
index 8f84d95d12..0000000000
--- a/tar/tar.d.ts
+++ /dev/null
@@ -1,230 +0,0 @@
-// Type definitions for tar v1.0.1
-// Project: https://github.com/npm/node-tar
-// Definitions by: Maxime LUCE <https://github.com/SomaticIT>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TODO: When/if typings for [fstream](https://github.com/npm/fstream) are written, refactor this typing to use it for the various streams.
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "tar" {
-    import stream = require("stream");
-
-    // #region Interfaces
-
-    export interface HeaderProperties {
-        path?: string;
-        mode?: number;
-        uid?: number;
-        gid?: number;
-        size?: number;
-        mtime?: number;
-        uname?: string;
-        gname?: string;
-        devmaj?: number;
-        devmin?: number;
-    }
-
-    export interface ExtractOptions {
-        type?: string;
-        Directory?: boolean;
-        path?: string;
-        strip?: number;
-    }
-
-    export interface ParseStream extends NodeJS.ReadWriteStream {
-        position: number;
-
-        _stream: stream.Stream;
-        _ended: boolean;
-
-        _streamEnd(): void;
-        _process(c: Buffer): void;
-        _startEntry(c: Buffer): void;
-    }
-
-    export interface PackStream extends NodeJS.ReadWriteStream {
-        writable: boolean;
-        readable: boolean;
-
-        _noProprietary: boolean;
-        _global: HeaderProperties;
-        _buffer: stream.Stream[];
-        _currentEntry: any;
-        _processing: boolean;
-        _pipeRoot: stream.Stream;
-        _needDrain: boolean;
-        _paused: boolean;
-
-        addGlobal(props: HeaderProperties): void;
-        add(stream: stream.Stream): boolean;
-        destroy(): void;
-
-        _process(): void;
-    }
-
-    export interface ExtractStream extends ParseStream {
-    }
-
-    // #endregion
-
-    // #region Enums
-
-    export var fields: {
-        path: number;
-        mode: number;
-        uid: number;
-        gid: number;
-        size: number;
-        mtime: number;
-        cksum: number;
-        type: number;
-        linkpath: number;
-        ustar: number;
-        ustarvar: number;
-        uname: number;
-        gname: number;
-        devmaj: number;
-        devmin: number;
-        prefix: number;
-        fill: number;
-    };
-
-    export var fieldSize: number[];
-    export var fieldOffs: number[];
-    export var fieldEnds: number[];
-
-    /**
-     * Different values of the 'type' field
-     * paths match the values of Stats.isX() functions, where appropriate
-     */
-    export var types: {
-        0: string;
-        "\0": string;
-        "": string;
-        1: string;
-        2: string;
-        3: string;
-        4: string;
-        5: string;
-        6: string;
-        7: string;
-        g: string;
-        x: string;
-        A: string;
-        D: string;
-        I: string;
-        K: string;
-        L: string;
-        M: string;
-        N: string;
-        S: string;
-        V: string;
-        X: string;
-        File: string;
-        OldFile: string;
-        Link: string;
-        SymbolicLick: string;
-        CharacterDevice: string;
-        BlockDevice: string;
-        Directory: string;
-        FIFO: string;
-        ContiguousFile: string;
-        GlobalExtendedHeader: string;
-        ExtendedHeader: string;
-        SolarisACL: string;
-        GNUDumpDir: string;
-        INode: string;
-        NextFileHasLonLinkPath: string;
-        NextFileHasLongPath: string;
-        ContinuationFile: string;
-        TapeVolumeHeader: string;
-        OldExtendedHeader: string;
-    };
-
-    /**
-     * Values for the mode field
-     */
-    export var modes: {
-        suid: number;
-        sgid: number;
-        svtx: number;
-        uread: number;
-        uwrite: number;
-        uexec: number;
-        gread: number;
-        gwrite: number;
-        gexec: number;
-        oread: number;
-        owrite: number;
-        oexec: number;
-    };
-
-    export var numeric: {
-        mode: boolean;
-        uid: boolean;
-        gid: boolean;
-        size: boolean;
-        mtime: boolean;
-        devmaj: boolean;
-        devmin: boolean;
-        cksum: boolean;
-        atime: boolean;
-        ctime: boolean;
-        dev: boolean;
-        ino: boolean;
-        nlink: boolean;
-    };
-
-    export var knownExtended: {
-        atime: boolean;
-        charset: boolean;
-        comment: boolean;
-        ctime: boolean;
-        gid: boolean;
-        gname: boolean;
-        linkpat: boolean;
-        mtime: boolean;
-        path: boolean;
-        realtime: boolean;
-        security: boolean;
-        size: boolean;
-        uid: boolean;
-        uname: boolean;
-    };
-
-    export var headerSize: number;
-    export var blockSize: number;
-
-    //#endregion
-
-    //#region Global Methods
-
-    /**
-     * Returns a writable stream. Write tar data to it and it will emit entry events for each entry parsed from the tarball. This is used by tar.Extract.
-     */
-    export function Parse(): ParseStream;
-    /**
-     * Returns a through stream. Use fstream to write files into the pack stream and you will receive tar archive data from the pack stream.
-     * This only works with directories, it does not work with individual files.
-     * The optional properties object are used to set properties in the tar 'Global Extended Header'.
-     */
-    export function Pack(props?: HeaderProperties): PackStream;
-    /**
-     * Returns a through stream. Write tar data to the stream and the files in the tarball will be extracted onto the filesystem.
-     */
-    export function Extract(path: string): ExtractStream;
-    /**
-     * Returns a through stream. Write tar data to the stream and the files in the tarball will be extracted onto the filesystem.
-     * options can be:
-     * ```
-     * {
-     *   path: '/path/to/extract/tar/into',
-     *   strip: 0, // how many path segments to strip from the root when extracting
-     * }
-     * ```
-     * options also get passed to the fstream.Writer instance that tar uses internally.
-     */
-    export function Extract(opts: ExtractOptions): ExtractStream;
-
-    //#endregion
-}
\ No newline at end of file
diff --git a/tar/tsconfig.json b/tar/tsconfig.json
new file mode 100644
index 0000000000..6869e0f5f4
--- /dev/null
+++ b/tar/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "tar-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tcomb/tcomb.d.ts b/tcomb/index.d.ts
similarity index 100%
rename from tcomb/tcomb.d.ts
rename to tcomb/index.d.ts
diff --git a/tcomb/tcomb-tests.ts b/tcomb/tcomb-tests.ts
index aafd5e55b2..2bf76261f3 100644
--- a/tcomb/tcomb-tests.ts
+++ b/tcomb/tcomb-tests.ts
@@ -1,8 +1,8 @@
 // ReSharper disable InconsistentNaming
 // ReSharper disable WrongExpressionStatement
-/// <reference path="./tcomb.d.ts"/>
-/// <reference path="../node/node.d.ts"/>
-/// <reference path="../jasmine/jasmine.d.ts" />
+
+/// <reference types="node"/>
+/// <reference types="jasmine" />
 
 // tests adapted from/for tcomb's test folder
 
diff --git a/tcomb/tsconfig.json b/tcomb/tsconfig.json
new file mode 100644
index 0000000000..4b69c91d9a
--- /dev/null
+++ b/tcomb/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "tcomb-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tea-merge/index.d.ts b/tea-merge/index.d.ts
new file mode 100644
index 0000000000..7aec947806
--- /dev/null
+++ b/tea-merge/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for tea-merge
+// Project: https://github.com/qualiancy/tea-merge
+// Definitions by: Mihhail Lapushkin <https://github.com/mihhail-lapushkin/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function e(destination: Object, ...sources: Object[]): Object;
+export = e;
diff --git a/tea-merge/tea-merge-tests.ts b/tea-merge/tea-merge-tests.ts
index 9d59bd65e1..7914b8ecc4 100644
--- a/tea-merge/tea-merge-tests.ts
+++ b/tea-merge/tea-merge-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="tea-merge.d.ts" />
 
 import merge = require('tea-merge');
 
diff --git a/tea-merge/tea-merge.d.ts b/tea-merge/tea-merge.d.ts
deleted file mode 100644
index cd9fc13def..0000000000
--- a/tea-merge/tea-merge.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for tea-merge
-// Project: https://github.com/qualiancy/tea-merge
-// Definitions by: Mihhail Lapushkin <https://github.com/mihhail-lapushkin/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "tea-merge" {
-    function e(destination: Object, ...sources: Object[]): Object;
-    export = e;
-}
\ No newline at end of file
diff --git a/tea-merge/tsconfig.json b/tea-merge/tsconfig.json
new file mode 100644
index 0000000000..abb035ff23
--- /dev/null
+++ b/tea-merge/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "tea-merge-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tedious-connection-pool/index.d.ts b/tedious-connection-pool/index.d.ts
new file mode 100644
index 0000000000..90543a2d73
--- /dev/null
+++ b/tedious-connection-pool/index.d.ts
@@ -0,0 +1,105 @@
+// Type definitions for tedious-connection-pool
+// Project: https://github.com/pekim/tedious-connection-pool
+// Definitions by: Cyprien Autexier <https://github.com/sandorfr>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import tedious = require('../tedious');
+
+declare namespace tcp {
+
+    /**
+     * Extends Tedious Connection with release function
+     */
+    export class PooledConnection extends tedious.Connection {
+        /**
+         * If the connection is issued from a connection pool returns the connection to the pool.
+         */
+        release(): void;
+    }
+
+    /**
+     * Acquire function callback signature
+     */
+    export interface ConnectionCallback {
+        /**
+         * Provides a connection or an error
+         * @param err error if any
+         * @param connection issued from the pool
+         */
+        (err: Error, connection: PooledConnection): void;
+    }
+
+    /**
+     *  Pool Configuration interface
+     */
+    export interface PoolConfig {
+
+        /**
+         * Minimum concurrent connections
+         */
+        min?: number;
+
+        /**
+         * Maximum concurrent connections
+         */
+        max?: number;
+
+        /**
+         * Defines if logging is activated
+         */
+        log?: boolean;
+
+        /**
+         * Idle timeout
+         */
+        idleTimeout?: number;
+
+        /**
+         * Retry delay
+         */
+        retryDelay?: number;
+
+        /**
+         * Acquire timeout
+         */
+        acquireTimeout?: number;
+    }
+
+
+}
+
+/**
+ * Tedious Connection Pool Class
+ */
+declare class tcp {
+
+    /**
+     * Connection Pool constructor
+     * @param poolConfig the pool configuration
+     * @param connectionConfig the connection configuration
+     */
+    constructor(poolConfig: tcp.PoolConfig, connectionConfig: tedious.ConnectionConfig);
+
+    /**
+     * acquires a connection from the pool
+     * @param callback invoked when the connection is retrieved and ready
+     */
+    acquire(callback: tcp.ConnectionCallback): void;
+
+    /**
+     * listens for a specific connection pool event
+     * @param event the event name
+     * @param callback invoked when the event is raised
+     */
+    on(event: string, callback: Function): void;
+
+    /**
+     * closes opened connections
+     */
+    drain(): void;
+}
+
+
+
+
+export = tcp;
diff --git a/tedious-connection-pool/tedious-connection-pool-tests.ts b/tedious-connection-pool/tedious-connection-pool-tests.ts
index e97f9001d6..31715e2090 100644
--- a/tedious-connection-pool/tedious-connection-pool-tests.ts
+++ b/tedious-connection-pool/tedious-connection-pool-tests.ts
@@ -3,7 +3,6 @@
 // Definitions by: Cyprien Autexier <https://github.com/sandorfr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./tedious-connection-pool.d.ts" />
 
 "use strict";
 
diff --git a/tedious-connection-pool/tedious-connection-pool.d.ts b/tedious-connection-pool/tedious-connection-pool.d.ts
deleted file mode 100644
index d4391f2dee..0000000000
--- a/tedious-connection-pool/tedious-connection-pool.d.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-// Type definitions for tedious-connection-pool
-// Project: https://github.com/pekim/tedious-connection-pool
-// Definitions by: Cyprien Autexier <https://github.com/sandorfr>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../tedious/tedious.d.ts" />
-
-declare module "tedious-connection-pool" {
-    import tedious = require('tedious');
-
-    namespace tcp {
-
-        /**
-         * Extends Tedious Connection with release function
-         */
-        export class PooledConnection extends tedious.Connection {
-            /**
-             * If the connection is issued from a connection pool returns the connection to the pool.
-             */
-            release():void;
-        }
-
-        /**
-         * Acquire function callback signature
-         */
-        export interface ConnectionCallback {
-            /**
-             * Provides a connection or an error
-             * @param err error if any
-             * @param connection issued from the pool
-             */
-            (err:Error, connection:PooledConnection): void;
-        }
-
-        /**
-         *  Pool Configuration interface
-         */
-        export interface PoolConfig {
-
-            /**
-             * Minimum concurrent connections
-             */
-            min?: number;
-
-            /**
-             * Maximum concurrent connections
-             */
-            max?: number;
-
-            /**
-             * Defines if logging is activated
-             */
-            log?: boolean;
-
-            /**
-             * Idle timeout
-             */
-            idleTimeout?: number;
-
-            /**
-             * Retry delay
-             */
-            retryDelay?: number;
-
-            /**
-             * Acquire timeout
-             */
-            acquireTimeout?: number;
-        }
-
-
-    }
-
-    /**
-     * Tedious Connection Pool Class
-     */
-    class tcp {
-
-        /**
-         * Connection Pool constructor
-         * @param poolConfig the pool configuration
-         * @param connectionConfig the connection configuration
-         */
-        constructor(poolConfig:tcp.PoolConfig, connectionConfig:tedious.ConnectionConfig);
-
-        /**
-         * acquires a connection from the pool
-         * @param callback invoked when the connection is retrieved and ready
-         */
-        acquire(callback:tcp.ConnectionCallback):void;
-
-        /**
-         * listens for a specific connection pool event
-         * @param event the event name
-         * @param callback invoked when the event is raised
-         */
-        on(event:string, callback:Function):void;
-
-        /**
-         * closes opened connections
-         */
-        drain():void;
-    }
-
-
-
-
-    export = tcp;
-}
diff --git a/tedious-connection-pool/tsconfig.json b/tedious-connection-pool/tsconfig.json
new file mode 100644
index 0000000000..80e6c1952b
--- /dev/null
+++ b/tedious-connection-pool/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "tedious-connection-pool-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tedious/index.d.ts b/tedious/index.d.ts
new file mode 100644
index 0000000000..33917ab280
--- /dev/null
+++ b/tedious/index.d.ts
@@ -0,0 +1,530 @@
+// Type definitions for tedious 1.8.0
+// Project: https://pekim.github.io/tedious
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="node" />
+
+
+
+import events = require("events");
+
+export interface ColumnType {
+    /**
+     * The column's type, such as VarChar, Int or Binary.
+     */
+    name: string;
+}
+
+export interface ColumnMetaData {
+    /**
+     * The column's name
+     */
+    colName: string;
+
+    /**
+     * The column type.
+     */
+    type: ColumnType;
+
+    /**
+     * The precision. Only applicable to numeric and decimal.
+     */
+    precision?: number;
+
+    /**
+     * The scale. Only applicable to numeric, decimal, time, datetime2 and datetimeoffset.
+     */
+    scale?: number;
+
+    /**
+     * The length, for char, varchar, nvarchar and varbinary.
+     */
+    dataLength?: number;
+}
+
+export interface DebugOptions {
+    /**
+     * A boolean, controlling whether debug events will be emitted with text describing packet details (default: false).
+     */
+    packet?: boolean;
+
+    /**
+     * A boolean, controlling whether debug events will be emitted with text describing packet data details (default: false).
+     */
+    data?: boolean;
+
+    /**
+     * A boolean, controlling whether debug events will be emitted with text describing packet payload details (default: false).
+     */
+    payload?: boolean;
+
+    /**
+     * A boolean, controlling whether debug events will be emitted with text describing token stream tokens (default: false).
+     */
+    token?: boolean;
+}
+
+export declare enum ISOLATION_LEVEL {
+    NO_CHANGE = 0x00,
+    READ_UNCOMMITTED = 0x01,
+    READ_COMMITTED = 0x02,
+    REPEATABLE_READ = 0x03,
+    SERIALIZABLE = 0x04,
+    SNAPSHOT = 0x05
+}
+
+/**
+ * Unfortunately these aren't valid JavaScript identifiers
+ * so I cannot list the values here as enum values
+      7_1 = 0x71000001,
+    7_2 = 0x72090002,
+    7_3_A = 0x730A0003,
+    7_3_B = 0x730B0003,
+    7_4 = 0x74000004
+ */
+export declare var TDS_VERSION: { [index: string]: number };
+
+export interface TediousType {
+    type: string;
+    name: string;
+}
+
+export interface TediousTypes {
+    BigInt: TediousType;
+    Binary: TediousType;
+    Bit: TediousType;
+    BitN: TediousType;
+    Char: TediousType;
+    Date: TediousType;
+    DateN: TediousType;
+    DateTime2: TediousType;
+    DateTime2N: TediousType;
+    DateTime: TediousType;
+    DateTimeN: TediousType;
+    DateTimeOffset: TediousType;
+    DateTimeOffsetN: TediousType;
+    Decimal: TediousType;
+    DecimalN: TediousType;
+    Float: TediousType;
+    FloatN: TediousType;
+    Image: TediousType;
+    Int: TediousType;
+    IntN: TediousType;
+    Money: TediousType;
+    MoneyN: TediousType;
+    NChar: TediousType;
+    NText: TediousType;
+    NVarChar: TediousType;
+    Null: TediousType;
+    Numeric: TediousType;
+    NumericN: TediousType;
+    Real: TediousType;
+    SmallDateTime: TediousType;
+    SmallInt: TediousType;
+    SmallMoney: TediousType;
+    TVP: TediousType;
+    Text: TediousType;
+    Time: TediousType;
+    TimeN: TediousType;
+    TinyInt: TediousType;
+    UDT: TediousType;
+    UniqueIdentifier: TediousType;
+    UniqueIdentifierN: TediousType;
+    VarBinary: TediousType;
+    VarChar: TediousType;
+    Xml: TediousType;
+}
+
+export declare var TYPES: TediousTypes;
+
+export interface ConnectionOptions {
+
+    /**
+     * Port to connect to (default: 1433). Mutually exclusive with options.instanceName.
+     */
+    port?: number;
+
+    /**
+     * The instance name to connect to. The SQL Server Browser service must be running on the database server,
+     * and UDP port 1444 on the database server must be reachable. (no default) Mutually exclusive with options.port.
+     */
+    instanceName?: string;
+
+    /**
+     * Database to connect to (default: dependent on server configuration).
+     */
+    database?: string;
+
+    /**
+     * By default, if the database requestion by options.database cannot be accessed,
+     * the connection will fail with an error. However, if options.fallbackToDefaultDb is set to true,
+     * then the user's default database will be  * used instead (Default: false).
+     */
+    fallbackToDefaultDb?: boolean;
+
+    /**
+     * The number of milliseconds before the attempt to connect is considered failed (default: 15000).
+     */
+    connectTimeout?: number;
+
+    /**
+     * The number of milliseconds before a request is considered failed, or 0 for no timeout (default: 15000).
+     */
+    requestTimeout?: number;
+
+    /**
+     * The number of milliseconds before the cancel (abort) of a request is considered failed (default: 5000).
+     */
+    cancelTimeout?: number;
+
+    /**
+     * The size of TDS packets (subject to negotiation with the server). Should be a power of 2. (default: 4096).
+     */
+    packetSize?: number;
+
+    /**
+     * A boolean determining whether to pass time values in UTC or local time. (default: true).
+     */
+    useUTC?: boolean;
+
+    /**
+     * A boolean determining whether to rollback a transaction automatically if any error is encountered
+     * during the given transaction's execution. This sets the value for SET XACT_ABORT during the initial
+     * SQL phase of a connection (documentation).
+     */
+    abortTransactionOnError?: boolean;
+
+    /**
+     * A string indicating which network interface (ip addres) to use when connecting to SQL Server.
+     */
+    localAddress?: string;
+
+    /**
+     * A boolean determining whether to return rows as arrays or key-value collections. (default: false).
+     */
+    useColumnNames?: boolean;
+
+    /**
+     * A boolean, controlling whether the column names returned will have the first letter converted
+     * to lower case (true) or not. This value is ignored if you provide a columnNameReplacer. (default: false).
+     */
+    camelCaseColumns?: boolean;
+
+    /**
+     * A function with parameters (columnName, index, columnMetaData) and returning a string. If provided,
+     * this will be called once per column per result-set. The returned value will be used instead of the
+     * SQL-provided column name on row and meta data objects. This allows you to dynamically convert between
+     * naming conventions. (default: null).
+     */
+    columnNameReplacer?: (columnName: string, index: number, columnMetaData: ColumnMetaData) => string;
+
+    /**
+     * Debug options
+     */
+    debug?: DebugOptions;
+
+    /**
+     * The default isolation level that transactions will be run with. (default: READ_COMMITED).
+     */
+    isolationLevel?: ISOLATION_LEVEL;
+
+    /**
+     * The default isolation level for new connections. All out-of-transaction queries are executed with this setting. (default: READ_COMMITED)
+     */
+    connectionIsolationLevel?: ISOLATION_LEVEL;
+
+    /**
+     * A boolean, determining whether the connection will request read only access from a SQL Server Availability Group. For more information, see here. (default: false).
+     */
+    readOnlyIntent?: boolean;
+
+    /**
+     * A boolean determining whether or not the connection will be encrypted. Set to true if you're on Windows Azure. (default: false).
+     */
+    encrypt?: boolean;
+
+    /**
+     * When encryption is used, an object may be supplied that will be used for the first argument when calling tls.createSecurePair (default: {}).
+     */
+    cryptoCredentialsDetails?: Object;
+
+    /**
+     * A boolean, that when true will expose received rows in Requests' done* events. See done, doneInProc and doneProc. (default: false)
+     * Caution: If many row are received, enabling this option could result in excessive memory usage.
+     */
+    rowCollectionOnDone?: boolean;
+
+    /**
+     * A boolean, that when true will expose received rows in Requests' completion callback. See new Request. (default: false)
+     * Caution: If many row are received, enabling this option could result in excessive memory usage.
+     */
+    rowCollectionOnRequestCompletion?: boolean;
+
+    /**
+     * The version of TDS to use. If server doesn't support specified version, negotiated version is used instead. (default: 7_4).
+     * Take this from tedious.TDS_VERSION.7_4 .
+     */
+    tdsVersion?: number;
+}
+
+export interface ConnectionConfig {
+    /**
+     * User name to use for authentication.
+     */
+    userName?: string;
+
+    /**
+     * Password to use for authentication.
+     */
+    password?: string;
+
+    /**
+     * Hostname to connect to.
+     */
+    server?: string;
+
+    /**
+     * Once you set domain, driver will connect to SQL Server using domain login.
+     */
+    domain?: string;
+
+    /**
+     * Further options
+     */
+    options?: ConnectionOptions;
+}
+
+export interface ParameterOptions {
+    //  for VarChar, NVarChar, VarBinary
+    length?: number;
+    // precision for Numeric, Decimal
+    precision?: number;
+    // scale for Numeric, Decimal, Time, DateTime2, DateTimeOffset
+    scale?: number;
+}
+
+/**
+ * Type of each column in the Request#row event
+ */
+export interface ColumnValue {
+    metadata: ColumnMetaData;
+    value: any;
+}
+
+/**
+ * A Request instance represents a request that can be executed on a connection
+ * @event  'columnMetadata' This event, describing result set columns, will be emitted before row events are emitted. This event may be emited multiple times when more than one recordset is produced by the statement.
+ * @event  'row' A row resulting from execution of the SQL statement
+ * @event  'done' All rows from a result set have been provided (through row events). This token is used to indicate the completion of a SQL statement. As multiple SQL statements can be sent to the server in a single SQL batch, multiple done events can be generated. An done event is emited for each SQL statement in the SQL batch except variable declarations. For execution of SQL statements within stored procedures, doneProc and doneInProc events are used in place of done events.
+ * @event  'doneInProc' Indicates the completion status of a SQL statement within a stored procedure. All rows from a statement in a stored procedure have been provided (through row events).
+ * @event  'doneProc' Indicates the completion status of a stored procedure. This is also generated for stored procedures executed through SQL statements.
+ * @event  'returnValue' A value for an output parameter (that was added to the request with addOutputParameter(...)). See also Using Parameters.
+ */
+export declare class Request extends events.EventEmitter {
+
+    /**
+     * Constructor
+     * @param sql The SQL statement to be executed (or a procedure name, if the request is to be used with connection.callProcedure).
+     * @param callback	The callback is called when the request has completed, either successfully or with an error. If an error occurs during execution of the statement(s), then err will describe the error.
+     * 					As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
+     * 					rowCount: The number of rows emitted as result of executing the SQL statement.
+     * 					rows: Rows as a result of executing the SQL statement. Will only be avaiable if Connection's config.options.rowCollectionOnRequestCompletion is true.
+     */
+    constructor(sql: string, callback: (error: Error, rowCount: number, rows: any[]) => void);
+
+    /**
+     * Add an input parameter to the request.
+     * @param name The parameter name. This should correspond to a parameter in the SQL, or a parameter that a called procedure expects. The name should not start '@'.
+     * @param type One of the supported data types.
+     * @param value The value that the parameter is to be given. The Javascript type of the argument should match that documented for data types.
+     * @param options Additional type options. Optional.
+     */
+    addParameter(name: string, type: TediousType, value: any, options?: ParameterOptions): void;
+
+    /**
+     * Add an output parameter to the request. The parameter's value will be provide by an emitted returnValue event.
+     * @param name The parameter name. This should correspond to a parameter in the SQL, or a parameter that a called procedure expects.
+     * @param type One of the supported data types.
+     * @param value The value that the parameter is to be given. The Javascript type of the argument should match that documented for data types. Optional.
+     * @param options Additional type options. Optional.
+     */
+    addOutputParameter(name: string, type: TediousType, value?: any, options?: ParameterOptions): void;
+}
+
+export interface BulkLoadColumnOpts extends ParameterOptions {
+    //  indicates whether the column accepts NULL values.
+    nullable: boolean;
+    //  If the name of the column is different from the name of the property found on rowObj arguments passed to , then you can use this option to specify the property name.
+    objName?: string;
+}
+
+export interface BulkLoad {
+
+    /**
+     * Adds a column to the bulk load. The column definitions should match the table you are trying to insert into. Attempting to call addColumn after the first row has been added will throw an exception.
+     * @param name	The name of the column.
+     * @param type	One of the supported data types.
+     * @param options	Additional column type information. At a minimum, nullable must be set to true or false.
+     */
+    addColumn(name: string, type: TediousType, options: BulkLoadColumnOpts): void;
+
+    /**
+     * Adds a row to the bulk insert. This method accepts arguments in three different formats:
+     * @param rowObj An object of key/value pairs representing column name (or objName) and value.
+     */
+    addRow(row: Object): void;
+    /**
+     * Adds a row to the bulk insert. This method accepts arguments in three different formats:
+     * @param columnArray	An array representing the values of each column in the same order which they were added to the bulkLoad object.
+     */
+    addRow(columnArray: any[]): void;
+    /**
+     * Adds a row to the bulk insert. This method accepts arguments in three different formats:
+     * @param args If there are at least two columns, values can be passed as multiple arguments instead of an array. They must be in the same order the columns were added in.
+     */
+    addRow(...args: any[]): void;
+
+    /**
+     * This is simply a helper utility function which returns a CREATE TABLE SQL statement based on the columns added to the bulkLoad object. This may be particularly handy when you want to insert into a temporary table (a table which starts with #). A side note on bulk inserting into temporary tables: if you want to access a local temporary table after executing the bulk load, you'll need to use the same connection and execute your requests using connection.execSqlBatch instead of .execSql.
+     */
+    getTableCreationSql(): string;
+}
+
+/**
+ * message interface used by the infoMessage and errorMessage events of Connection
+ */
+export interface InfoObject {
+    /**
+     * Error number
+     */
+    number: number;
+    /**
+     * The error state, used as a modifier to the error number.
+     */
+    state: any;
+    /**
+     * The class (severity) of the error. A class of less than 10 indicates an informational message.
+     */
+    class: number;
+    /**
+     * The message text.
+     */
+    message: string;
+    /**
+     * The stored procedure name (if a stored procedure generated the message).
+     */
+    procName: string;
+    /**
+     * The line number in the SQL batch or stored procedure that caused the error. Line numbers begin at 1; therefore, if the line number is not applicable to the message, the value of LineNumber will be 0.
+     */
+    lineNumber: number;
+}
+
+/**
+ * Connection
+ * @event  'connect' The attempt to connect and validate has completed.
+ * @event  'end' The connection has ended. This may be as a result of the client calling close(), the server closing the connection, or a network error.
+ * @event  'error' Internal error occurs.
+ * @event  'debug' A debug message is available. It may be logged or ignored.
+ * @event  'infoMessage' The server has issued an information message.
+ * @event  'errorMessage' The server has issued an error message.
+ * @event  'databaseChange' The server has reported that the active database has changed. This may be as a result of a sucessful login, or a use statement.
+ * @event  'languageChange' The server has reported that the language has changed.
+ * @event  'charsetChange' The server has reported that the charset has changed.
+ * @event  'secure' A secure connection has been established.
+ */
+export declare class Connection extends events.EventEmitter {
+
+    constructor(config: ConnectionConfig);
+
+    /**
+     * Start a transaction. As only one request at a time may be executed on
+     * a connection, another request should not be initiated until this callback is called.
+     * @param callback The callback is called when the request to start the transaction has completed, either successfully or with an error. If an error occured then err will describe the error.
+     * @param name A string representing a name to associate with the transaction. Optional, and defaults to an empty string. Required when isolationLevel is present.
+     * @param isolationLevel	The isolation level that the transaction is to be run with.
+     */
+    beginTransaction(callback: (error?: Error) => void, name?: string, isolationLevel?: ISOLATION_LEVEL): void;
+
+    /**
+     * Commit a transaction.
+     * There should be an active transaction. That is, beginTransaction should have been previously called.
+     * @param callback The callback is called when the request to commit the transaction has completed, either successfully or with an error. If an error occured then err will describe the error.
+     * 					As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
+     */
+    commitTransaction(callback: (error: Error) => void): void;
+
+    /**
+     * Rollback a transaction.	There should be an active transaction. That is, beginTransaction should have been previously called.
+     * @param callback	The callback is called when the request to rollback the transaction has completed, either successfully or with an error. If an error occured then err will describe the error.
+     * 						As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
+     */
+    rollbackTransaction(callback: (error: Error) => void): void;
+
+    /**
+     * Prepare the SQL represented by the request. The request can then be used in subsequent calls to execute and unprepare
+     * @param request A Request object representing the request. Parameters only require a name and type. Parameter values are ignored.
+     */
+    prepare(request: Request): void;
+
+    /**
+     * Release the SQL Server resources associated with a previously prepared request.
+     */
+    unprepare(request: Request): void;
+
+    /**
+     * Call a stored procedure represented by request.
+     */
+    callProcedure(request: Request): void;
+
+    /**
+     * Execute the SQL represented by request.
+     * As sp_executesql is used to execute the SQL, if the same SQL is executed multiples times using this function, the SQL Server query optimizer is likely to reuse the execution plan it generates for the first execution.
+     * Beware of the way that scoping rules apply, and how they may affect local temp tables. If you're running in to scoping issues, then execSqlBatch may be a better choice. See also issue #24.
+     */
+    execSql(request: Request): void;
+
+    /**
+     * Execute the SQL batch represented by request. There is no param support, and unlike execSql, it is not likely that SQL Server will reuse the execution plan it generates for the SQL.
+     * In almost all cases, execSql will be a better choice.
+     */
+    execSqlBatch(request: Request): void;
+
+    /**
+     * Execute previously prepared SQL, using the supplied parameters.
+     * @param request A previously prepared Request.
+     * @param parameters An object whose names correspond to the names of parameters that were added to the request before it was prepared. The object's values are passed as the parameters' values when the request is executed.
+     */
+    execute(request: Request, parameters: {}): void;
+
+    /**
+     * Creates a new BulkLoad instance.
+     * @param tableName The name of the table to bulk-insert into.
+     * @param callback A function which will be called after the BulkLoad finishes executing. rowCount will equal the number of rows inserted.
+     */
+    newBulkLoad(tableName: string, callback: (error: Error, rowCount: number) => void): BulkLoad;
+
+    /**
+     * Executes a BulkLoad.
+     */
+    execBulkLoad(bulkLoad: BulkLoad): void;
+
+    /**
+     * Reset the connection to its initial state. Can be useful for connection pool implementations.
+     * @param callback The callback is called when the connection reset has completed, either successfully or with an error. If an error occured then err will describe the error.
+     * 					As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
+     */
+    reset(callback: (error: Error) => void): void;
+
+    /**
+     * Cancel currently executed request.
+     */
+    cancel(): void;
+
+    /**
+     * Closes the connection to the database. The end will be emmited once the connection has been closed.
+     */
+    close(): void;
+
+}
diff --git a/tedious/tedious-tests.ts b/tedious/tedious-tests.ts
index bbfdb7629c..98993ca083 100644
--- a/tedious/tedious-tests.ts
+++ b/tedious/tedious-tests.ts
@@ -1,9 +1,6 @@
-
-/// <reference path="tedious.d.ts" />
-
 "use strict";
 
-import tedious = require("tedious");
+import tedious = require("./");
 
 var config: tedious.ConnectionConfig = {
 	userName: "rogier",
diff --git a/tedious/tedious.d.ts b/tedious/tedious.d.ts
deleted file mode 100644
index 0be051c91f..0000000000
--- a/tedious/tedious.d.ts
+++ /dev/null
@@ -1,531 +0,0 @@
-// Type definitions for tedious 1.8.0
-// Project: https://pekim.github.io/tedious
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path='../node/node.d.ts' />
-
-declare module 'tedious' {
-
-	import events = require("events");
-
-	export interface ColumnType {
-		/**
-		 * The column's type, such as VarChar, Int or Binary.
-		 */
-		name: string;
-	}
-
-	export interface ColumnMetaData {
-		/**
-		 * The column's name
-		 */
-		colName: string;
-
-		/**
-		 * The column type.
-		 */
-		type: ColumnType;
-
-		/**
-		 * The precision. Only applicable to numeric and decimal.
-		 */
-		precision?: number;
-
-		/**
-		 * The scale. Only applicable to numeric, decimal, time, datetime2 and datetimeoffset.
-		 */
-		scale?: number;
-
-		/**
-		 * The length, for char, varchar, nvarchar and varbinary.
-		 */
-		dataLength?: number;
-	}
-
-	export interface DebugOptions {
-		/**
-		 * A boolean, controlling whether debug events will be emitted with text describing packet details (default: false).
-		 */
-		packet?: boolean;
-
-		/**
-		 * A boolean, controlling whether debug events will be emitted with text describing packet data details (default: false).
-		 */
-		data?: boolean;
-
-		/**
-		 * A boolean, controlling whether debug events will be emitted with text describing packet payload details (default: false).
-		 */
-		payload?: boolean;
-
-		/**
-		 * A boolean, controlling whether debug events will be emitted with text describing token stream tokens (default: false).
-		 */
-		token?: boolean;
-	}
-
-	export enum ISOLATION_LEVEL {
-		NO_CHANGE = 0x00,
-		READ_UNCOMMITTED = 0x01,
-		READ_COMMITTED = 0x02,
-		REPEATABLE_READ = 0x03,
-		SERIALIZABLE = 0x04,
-		SNAPSHOT = 0x05
-	}
-
-	/**
-	 * Unfortunately these aren't valid JavaScript identifiers
-	 * so I cannot list the values here as enum values
-	 	7_1 = 0x71000001,
-		7_2 = 0x72090002,
-		7_3_A = 0x730A0003,
-		7_3_B = 0x730B0003,
-		7_4 = 0x74000004
-	 */
-	export var TDS_VERSION: { [index: string]: number };
-
-	export interface TediousType {
-		type: string;
-		name: string;
-	}
-
-	export interface TediousTypes {
-		BigInt: TediousType;
-		Binary: TediousType;
-		Bit: TediousType;
-		BitN: TediousType;
-		Char: TediousType;
-		Date: TediousType;
-		DateN: TediousType;
-		DateTime2: TediousType;
-		DateTime2N: TediousType;
-		DateTime: TediousType;
-		DateTimeN: TediousType;
-		DateTimeOffset: TediousType;
-		DateTimeOffsetN: TediousType;
-		Decimal: TediousType;
-		DecimalN: TediousType;
-		Float: TediousType;
-		FloatN: TediousType;
-		Image: TediousType;
-		Int: TediousType;
-		IntN: TediousType;
-		Money: TediousType;
-		MoneyN: TediousType;
-		NChar: TediousType;
-		NText: TediousType;
-		NVarChar: TediousType;
-		Null: TediousType;
-		Numeric: TediousType;
-		NumericN: TediousType;
-		Real: TediousType;
-		SmallDateTime: TediousType;
-		SmallInt		: TediousType;
-		SmallMoney: TediousType;
-		TVP: TediousType;
-		Text: TediousType;
-		Time: TediousType;
-		TimeN: TediousType;
-		TinyInt: TediousType;
-		UDT: TediousType;
-		UniqueIdentifier: TediousType;
-		UniqueIdentifierN: TediousType;
-		VarBinary: TediousType;
-		VarChar: TediousType;
-		Xml: TediousType;
-	}
-
-	export var TYPES: TediousTypes;
-
-	export interface ConnectionOptions {
-
-		/**
-		 * Port to connect to (default: 1433). Mutually exclusive with options.instanceName.
-		 */
-		port?: number;
-
-		/**
-		 * The instance name to connect to. The SQL Server Browser service must be running on the database server,
-		 * and UDP port 1444 on the database server must be reachable. (no default) Mutually exclusive with options.port.
-		 */
-		instanceName?: string;
-
-		/**
-		 * Database to connect to (default: dependent on server configuration).
-		 */
-		database?: string;
-
-		/**
-		 * By default, if the database requestion by options.database cannot be accessed,
-		 * the connection will fail with an error. However, if options.fallbackToDefaultDb is set to true,
-		 * then the user's default database will be  * used instead (Default: false).
-		 */
-		fallbackToDefaultDb?: boolean;
-
-		/**
-		 * The number of milliseconds before the attempt to connect is considered failed (default: 15000).
-		 */
-		connectTimeout?: number;
-
-		/**
-		 * The number of milliseconds before a request is considered failed, or 0 for no timeout (default: 15000).
-		 */
-		requestTimeout?: number;
-
-		/**
-		 * The number of milliseconds before the cancel (abort) of a request is considered failed (default: 5000).
-		 */
-		cancelTimeout?: number;
-
-		/**
-		 * The size of TDS packets (subject to negotiation with the server). Should be a power of 2. (default: 4096).
-		 */
-		packetSize?: number;
-
-		/**
-		 * A boolean determining whether to pass time values in UTC or local time. (default: true).
-		 */
-		useUTC?: boolean;
-
-		/**
-		 * A boolean determining whether to rollback a transaction automatically if any error is encountered
-		 * during the given transaction's execution. This sets the value for SET XACT_ABORT during the initial
-		 * SQL phase of a connection (documentation).
-		 */
-		abortTransactionOnError?: boolean;
-
-		/**
-		 * A string indicating which network interface (ip addres) to use when connecting to SQL Server.
-		 */
-		localAddress?: string;
-
-		/**
-		 * A boolean determining whether to return rows as arrays or key-value collections. (default: false).
-		 */
-		useColumnNames?: boolean;
-
-		/**
-		 * A boolean, controlling whether the column names returned will have the first letter converted
-		 * to lower case (true) or not. This value is ignored if you provide a columnNameReplacer. (default: false).
-		 */
-		camelCaseColumns?: boolean;
-
-		/**
-		 * A function with parameters (columnName, index, columnMetaData) and returning a string. If provided,
-		 * this will be called once per column per result-set. The returned value will be used instead of the
-		 * SQL-provided column name on row and meta data objects. This allows you to dynamically convert between
-		 * naming conventions. (default: null).
-		 */
-		columnNameReplacer?: (columnName: string, index: number, columnMetaData: ColumnMetaData) => string;
-
-		/**
-		 * Debug options
-		 */
-		debug?: DebugOptions;
-
-		/**
-		 * The default isolation level that transactions will be run with. (default: READ_COMMITED).
-		 */
-		isolationLevel?: ISOLATION_LEVEL;
-
-		/**
-		 * The default isolation level for new connections. All out-of-transaction queries are executed with this setting. (default: READ_COMMITED)
-		 */
-		connectionIsolationLevel?: ISOLATION_LEVEL;
-
-		/**
-		 * A boolean, determining whether the connection will request read only access from a SQL Server Availability Group. For more information, see here. (default: false).
-		 */
-		readOnlyIntent?: boolean;
-
-		/**
-		 * A boolean determining whether or not the connection will be encrypted. Set to true if you're on Windows Azure. (default: false).
-		 */
-		encrypt?: boolean;
-
-		/**
-		 * When encryption is used, an object may be supplied that will be used for the first argument when calling tls.createSecurePair (default: {}).
-		 */
-		cryptoCredentialsDetails?: Object;
-
-		/**
-		 * A boolean, that when true will expose received rows in Requests' done* events. See done, doneInProc and doneProc. (default: false)
-		 * Caution: If many row are received, enabling this option could result in excessive memory usage.
-		 */
-		rowCollectionOnDone?: boolean;
-
-		/**
-		 * A boolean, that when true will expose received rows in Requests' completion callback. See new Request. (default: false)
-		 * Caution: If many row are received, enabling this option could result in excessive memory usage.
-		 */
-		rowCollectionOnRequestCompletion?: boolean;
-
-		/**
-		 * The version of TDS to use. If server doesn't support specified version, negotiated version is used instead. (default: 7_4).
-		 * Take this from tedious.TDS_VERSION.7_4 .
-		 */
-		tdsVersion?: number;
-	}
-
-	export interface ConnectionConfig {
-		/**
-		 * User name to use for authentication.
-		 */
-		userName?: string;
-
-		/**
-		 * Password to use for authentication.
-		 */
-		password?: string;
-
-		/**
-		 * Hostname to connect to.
-		 */
-		server?: string;
-
-		/**
-		 * Once you set domain, driver will connect to SQL Server using domain login.
-		 */
-		domain?: string;
-
-		/**
-		 * Further options
-		 */
-		options?: ConnectionOptions;
-	}
-
-	export interface ParameterOptions {
-		//  for VarChar, NVarChar, VarBinary
-		length?: number;
-		// precision for Numeric, Decimal
-		precision?: number;
-		// scale for Numeric, Decimal, Time, DateTime2, DateTimeOffset
-		scale?: number;
-	}
-
-	/**
-	 * Type of each column in the Request#row event
-	 */
-	export interface ColumnValue {
-		metadata: ColumnMetaData;
-		value: any;
-	}
-
-	/**
-	 * A Request instance represents a request that can be executed on a connection
-	 * @event  'columnMetadata' This event, describing result set columns, will be emitted before row events are emitted. This event may be emited multiple times when more than one recordset is produced by the statement.
-	 * @event  'row' A row resulting from execution of the SQL statement
-	 * @event  'done' All rows from a result set have been provided (through row events). This token is used to indicate the completion of a SQL statement. As multiple SQL statements can be sent to the server in a single SQL batch, multiple done events can be generated. An done event is emited for each SQL statement in the SQL batch except variable declarations. For execution of SQL statements within stored procedures, doneProc and doneInProc events are used in place of done events.
-	 * @event  'doneInProc' Indicates the completion status of a SQL statement within a stored procedure. All rows from a statement in a stored procedure have been provided (through row events).
-	 * @event  'doneProc' Indicates the completion status of a stored procedure. This is also generated for stored procedures executed through SQL statements.
-	 * @event  'returnValue' A value for an output parameter (that was added to the request with addOutputParameter(...)). See also Using Parameters.
-	 */
-	export class Request extends events.EventEmitter {
-
-		/**
-		 * Constructor
-		 * @param sql The SQL statement to be executed (or a procedure name, if the request is to be used with connection.callProcedure).
-		 * @param callback	The callback is called when the request has completed, either successfully or with an error. If an error occurs during execution of the statement(s), then err will describe the error.
-		 * 					As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
-		 * 					rowCount: The number of rows emitted as result of executing the SQL statement.
-		 * 					rows: Rows as a result of executing the SQL statement. Will only be avaiable if Connection's config.options.rowCollectionOnRequestCompletion is true.
-		 */
-		constructor(sql: string, callback: (error: Error, rowCount: number, rows: any[]) => void);
-
-		/**
-		 * Add an input parameter to the request.
-		 * @param name The parameter name. This should correspond to a parameter in the SQL, or a parameter that a called procedure expects. The name should not start '@'.
-		 * @param type One of the supported data types.
-		 * @param value The value that the parameter is to be given. The Javascript type of the argument should match that documented for data types.
-		 * @param options Additional type options. Optional.
-		 */
-		addParameter(name: string, type: TediousType, value: any, options?: ParameterOptions): void;
-
-		/**
-		 * Add an output parameter to the request. The parameter's value will be provide by an emitted returnValue event.
-		 * @param name The parameter name. This should correspond to a parameter in the SQL, or a parameter that a called procedure expects.
-		 * @param type One of the supported data types.
-		 * @param value The value that the parameter is to be given. The Javascript type of the argument should match that documented for data types. Optional.
-		 * @param options Additional type options. Optional.
-		 */
-		addOutputParameter(name: string, type: TediousType, value?: any, options?: ParameterOptions): void;
-	}
-
-	export interface BulkLoadColumnOpts extends ParameterOptions {
-		//  indicates whether the column accepts NULL values.
-		nullable: boolean;
-		//  If the name of the column is different from the name of the property found on rowObj arguments passed to , then you can use this option to specify the property name.
-		objName?: string;
-	}
-
-	export interface BulkLoad {
-
-		/**
-		 * Adds a column to the bulk load. The column definitions should match the table you are trying to insert into. Attempting to call addColumn after the first row has been added will throw an exception.
-		 * @param name	The name of the column.
-		 * @param type	One of the supported data types.
-		 * @param options	Additional column type information. At a minimum, nullable must be set to true or false.
-		 */
-		addColumn(name: string, type: TediousType, options: BulkLoadColumnOpts): void;
-
-		/**
-		 * Adds a row to the bulk insert. This method accepts arguments in three different formats:
-		 * @param rowObj An object of key/value pairs representing column name (or objName) and value.
-		 */
-		addRow(row: Object): void;
-		/**
-		 * Adds a row to the bulk insert. This method accepts arguments in three different formats:
-		 * @param columnArray	An array representing the values of each column in the same order which they were added to the bulkLoad object.
-		 */
-		addRow(columnArray: any[]): void;
-		/**
-		 * Adds a row to the bulk insert. This method accepts arguments in three different formats:
-		 * @param args If there are at least two columns, values can be passed as multiple arguments instead of an array. They must be in the same order the columns were added in.
-		 */
-		addRow(...args: any[]): void;
-
-		/**
-		 * This is simply a helper utility function which returns a CREATE TABLE SQL statement based on the columns added to the bulkLoad object. This may be particularly handy when you want to insert into a temporary table (a table which starts with #). A side note on bulk inserting into temporary tables: if you want to access a local temporary table after executing the bulk load, you'll need to use the same connection and execute your requests using connection.execSqlBatch instead of .execSql.
-		 */
-		getTableCreationSql(): string;
-	}
-
-	/**
-	 * message interface used by the infoMessage and errorMessage events of Connection
-	 */
-	export interface InfoObject {
-		/**
-		 * Error number
-		 */
-		number: number;
-		/**
-		 * The error state, used as a modifier to the error number.
-		 */
-		state: any;
-		/**
-		 * The class (severity) of the error. A class of less than 10 indicates an informational message.
-		 */
-		class: number;
-		/**
-		 * The message text.
-		 */
-		message: string;
-		/**
-		 * The stored procedure name (if a stored procedure generated the message).
-		 */
-		procName: string;
-		/**
-		 * The line number in the SQL batch or stored procedure that caused the error. Line numbers begin at 1; therefore, if the line number is not applicable to the message, the value of LineNumber will be 0.
-		 */
-		lineNumber: number;
-	}
-
-	/**
-	 * Connection
-	 * @event  'connect' The attempt to connect and validate has completed.
-	 * @event  'end' The connection has ended. This may be as a result of the client calling close(), the server closing the connection, or a network error.
-	 * @event  'error' Internal error occurs.
-	 * @event  'debug' A debug message is available. It may be logged or ignored.
-	 * @event  'infoMessage' The server has issued an information message.
-	 * @event  'errorMessage' The server has issued an error message.
-	 * @event  'databaseChange' The server has reported that the active database has changed. This may be as a result of a sucessful login, or a use statement.
-	 * @event  'languageChange' The server has reported that the language has changed.
-	 * @event  'charsetChange' The server has reported that the charset has changed.
-	 * @event  'secure' A secure connection has been established.
-	 */
-	export class Connection extends events.EventEmitter {
-
-		constructor(config: ConnectionConfig);
-
-		/**
-		 * Start a transaction. As only one request at a time may be executed on
-		 * a connection, another request should not be initiated until this callback is called.
-		 * @param callback The callback is called when the request to start the transaction has completed, either successfully or with an error. If an error occured then err will describe the error.
-		 * @param name A string representing a name to associate with the transaction. Optional, and defaults to an empty string. Required when isolationLevel is present.
-		 * @param isolationLevel	The isolation level that the transaction is to be run with.
-		 */
-		beginTransaction(callback: (error?: Error) => void, name?: string, isolationLevel?: ISOLATION_LEVEL): void;
-
-		/**
-		 * Commit a transaction.
-		 * There should be an active transaction. That is, beginTransaction should have been previously called.
-		 * @param callback The callback is called when the request to commit the transaction has completed, either successfully or with an error. If an error occured then err will describe the error.
-		 * 					As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
-		 */
-		commitTransaction(callback: (error: Error) => void): void;
-
-		/**
-		 * Rollback a transaction.	There should be an active transaction. That is, beginTransaction should have been previously called.
-		 * @param callback	The callback is called when the request to rollback the transaction has completed, either successfully or with an error. If an error occured then err will describe the error.
-		 * 						As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
-		 */
-		rollbackTransaction(callback: (error: Error) => void): void;
-
-		/**
-		 * Prepare the SQL represented by the request. The request can then be used in subsequent calls to execute and unprepare
-		 * @param request A Request object representing the request. Parameters only require a name and type. Parameter values are ignored.
-		 */
-		prepare(request: Request): void;
-
-		/**
-		 * Release the SQL Server resources associated with a previously prepared request.
-		 */
-		unprepare(request: Request): void;
-
-		/**
-		 * Call a stored procedure represented by request.
-		 */
-		callProcedure(request: Request): void;
-
-		/**
-		 * Execute the SQL represented by request.
-		 * As sp_executesql is used to execute the SQL, if the same SQL is executed multiples times using this function, the SQL Server query optimizer is likely to reuse the execution plan it generates for the first execution.
-		 * Beware of the way that scoping rules apply, and how they may affect local temp tables. If you're running in to scoping issues, then execSqlBatch may be a better choice. See also issue #24.
-		 */
-		execSql(request: Request): void;
-
-		/**
-		 * Execute the SQL batch represented by request. There is no param support, and unlike execSql, it is not likely that SQL Server will reuse the execution plan it generates for the SQL.
-		 * In almost all cases, execSql will be a better choice.
-		 */
-		execSqlBatch(request: Request): void;
-
-		/**
-		 * Execute previously prepared SQL, using the supplied parameters.
-		 * @param request A previously prepared Request.
-		 * @param parameters An object whose names correspond to the names of parameters that were added to the request before it was prepared. The object's values are passed as the parameters' values when the request is executed.
-		 */
-		execute(request: Request, parameters: {}): void;
-
-		/**
-		 * Creates a new BulkLoad instance.
-		 * @param tableName The name of the table to bulk-insert into.
-		 * @param callback A function which will be called after the BulkLoad finishes executing. rowCount will equal the number of rows inserted.
-		 */
-		newBulkLoad(tableName: string, callback: (error: Error, rowCount: number) => void): BulkLoad;
-
-		/**
-		 * Executes a BulkLoad.
-		 */
-		execBulkLoad(bulkLoad: BulkLoad): void;
-
-		/**
-		 * Reset the connection to its initial state. Can be useful for connection pool implementations.
-		 * @param callback The callback is called when the connection reset has completed, either successfully or with an error. If an error occured then err will describe the error.
-		 * 					As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
-		 */
-		reset(callback: (error: Error) => void): void;
-
-		/**
-		 * Cancel currently executed request.
-		 */
-		cancel(): void;
-
-		/**
-		 * Closes the connection to the database. The end will be emmited once the connection has been closed.
-		 */
-		close(): void;
-
-	}
-}
diff --git a/tedious/tsconfig.json b/tedious/tsconfig.json
new file mode 100644
index 0000000000..84df78825c
--- /dev/null
+++ b/tedious/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "tedious-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/teechart/index.d.ts b/teechart/index.d.ts
new file mode 100644
index 0000000000..6fb0aa474e
--- /dev/null
+++ b/teechart/index.d.ts
@@ -0,0 +1,681 @@
+// Type definitions for TeeChart 1.3
+// Project: http://www.steema.com
+// Definitions by: Steema Software <https://steema.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/**
+ * TeeChart(tm) for TypeScript
+ *
+ * v1.3 October 2012
+ * Copyright(c) 2012 by Steema Software SL. All Rights Reserved.
+ * http://www.steema.com
+ *
+ * Licensed with commercial and non-commercial attributes,
+ * specifically: http://www.steema.com/licensing/html5
+ *
+ * TypeScript is a Microsoft product: www.typescriptlang.org
+ *
+ */
+
+/**
+ * @author <a href="mailto:david@steema.com">Steema Software</a>
+ * @version 1.3
+ */
+
+declare namespace Tee {
+  interface IPoint {
+    x: number;
+    y: number;
+  }
+
+  interface IRectangle {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+
+    contains(point: IPoint): boolean;
+  }
+
+  interface ITool {
+    active: boolean;
+    chart: IChart;
+
+    mousedown(event: any): boolean;
+    mousemove(event: any): boolean;
+    clicked(p: IPoint): boolean;
+    draw(): void;
+  }
+
+  interface IGradient {
+    chart: IChart;
+    visible: boolean;
+
+    colors: string[];
+    direction: string;
+    stops: number[];
+    offset: IPoint;
+  }
+
+  interface IShadow {
+    chart: IChart;
+    visible: boolean;
+    blur: number;
+    color: string;
+    width: number;
+    height: number;
+  }
+
+  interface IStroke {
+    chart: IChart;
+    fill: string;
+    size: number;
+    join: string;
+    cap: string;
+    dash: number[];
+    gradient: IGradient;
+  }
+
+  interface IFont {
+    chart: IChart;
+    style: string;
+    gradient: IGradient;
+    fill: string;
+    stroke: IStroke;
+    shadow: IShadow;
+    textAlign: string;
+    baseLine: string;
+
+    getSize(): number;
+    setSize(size: number): void;
+  }
+
+  interface IImage {
+    url: string;
+    chart: IChart;
+    visible: boolean;
+  }
+
+  interface IFormat {
+    font: IFont;
+    gradient: IGradient;
+    shadow: IShadow;
+    stroke: IStroke;
+    round: IPoint;
+    transparency: number;
+    image: IImage;
+    fill: string;
+
+    textHeight(text: string): number;
+    textWidth(text: string): number;
+    drawText(bounds: IRectangle, text: string): any;
+    rectangle(x: number, y: number, width: number, height: number): any;
+    poligon(points: IPoint[]): any;
+    ellipse(x: number, y: number, width: number, height: number): any;
+  }
+
+  interface IMargins {
+    left: number;
+    top: number;
+    right: number;
+    bottom: number;
+  }
+
+  interface IAnnotation extends ITool {
+    position: IPoint;
+    margins: IMargins;
+    items: IAnnotation[];
+    bounds: IRectangle;
+    visible: boolean;
+    transparent: boolean;
+    text: string;
+    format: IFormat;
+
+    add(text: string): IAnnotation;
+    resize(): void;
+    clicked(point: IPoint): boolean;
+    draw(): void;
+  }
+
+  interface IPanel {
+    format: IFormat;
+    transparent: boolean;
+    margins: IMargins;
+  }
+
+  interface ITitle extends IAnnotation {
+    expand: boolean;
+    padding: number;
+    transparent: boolean;
+  }
+
+  interface IPalette {
+    colors: string[];
+
+    get(index: number): string;
+  }
+
+  interface IArrow extends IFormat {
+    length: number;
+    underline: boolean;
+  }
+
+  interface IMarks extends IAnnotation {
+    arrow: IArrow;
+    series: ISeries;
+
+    style: string;
+
+    drawEvery: number;
+    visible: boolean;
+  }
+
+  interface ISeriesData {
+    values: number[];
+    labels: string[];
+    source: any;
+  }
+
+  interface ICursor {
+    cursor: string;
+  }
+
+  interface ISeriesNoBounds {
+    data: ISeriesData;
+    marks: IMarks;
+
+    yMandatory: boolean;
+    horizAxis: string;
+    vertAxis: string;
+
+    format: IFormat;
+    hover: IFormat;
+
+    visible: boolean;
+
+    cursor: ICursor;
+    over: number;
+
+    palette: IPalette;
+    colorEach: string;
+
+    useAxes: boolean;
+    decimals: number;
+
+    title: string;
+
+    //refresh(failure: function): void;
+
+    toPercent(index: number): string;
+    markText(index: number): string;
+
+    valueText(index: number): string;
+
+    associatedToAxis(axis: IAxis): boolean;
+
+    calc(index: number, position: IPoint): void;
+
+    clicked(position: IPoint): number;
+
+    minXValue(): number;
+    maxXValue(): number;
+
+    minYValue(): number;
+    maxYValue(): number;
+
+    count(): number;
+
+    addRandom(count: number, range?: number, x?: boolean): ISeries;
+  }
+
+  interface ISeries extends ISeriesNoBounds {
+    bounds(rectangle: IRectangle): void;
+  }
+
+  interface IAxisLabels {
+    chart: IChart;
+    format: IFormat;
+    decimals: number;
+    padding: number;
+    separation: number; // %
+    visible: boolean;
+    rotation: number;
+    alternate: boolean;
+    maxWidth: number;
+
+    labelStyle: string;
+    dateFormat: string;
+
+    getLabel(value: number): string;
+    width(value: number): number;
+
+  }
+
+  interface IGrid {
+    chart: IChart;
+    format: IFormat;
+    visible: boolean;
+    lineDash: boolean;
+  }
+
+  interface ITicks {
+    chart: IChart;
+    stroke: IStroke;
+    visible: boolean;
+    length: number;
+  }
+
+  interface IMinorTicks extends ITicks {
+    count: number;
+  }
+
+  interface IAxisTitle extends IAnnotation {
+    padding: number;
+    transparent: boolean;
+  }
+
+  interface IAxis {
+    chart: IChart;
+    visible: boolean;
+    inverted: boolean;
+
+    horizontal: boolean;  // readonly
+    otherSize: boolean; // readonly
+    bounds: IRectangle;  // readonly?
+
+    position: number;
+    format: IFormat;
+    custom: boolean; // readonly
+
+    grid: IGrid;
+    labels: IAxisLabels;
+    ticks: ITicks;
+    minorTicks: IMinorTicks;
+    innerTicks: ITicks;
+
+    title: IAxisTitle;
+
+    automatic: boolean;
+    minimum: number;
+    maximum: number;
+    increment: number;
+    log: boolean;
+
+    startPos: number;
+    endPos: number;
+
+    start: number; // %
+    end: number; // %
+
+    axisSize: number;
+
+    scale: number;
+    increm: number;
+
+    calc(value: number): number;
+    fromPos(position: number): number;
+    fromSize(size: number): number;
+
+    hasAnySeries(): boolean;
+    scroll(delta: number): void;
+    setMinMax(minimum: number, maximum: number): void;
+  }
+
+  interface IAxes {
+    chart: IChart;
+    visible: boolean;
+
+    left: IAxis;
+    top: IAxis;
+    right: IAxis;
+    bottom: IAxis;
+
+    items: IAxis[];
+
+    add(horizontal: boolean, otherSide: boolean): IAxis;
+    //each(f: function): void;
+  }
+
+  interface ISymbol {
+    chart: IChart;
+    format: IFormat;
+    width: number;
+    height: number;
+    padding: number;
+    visible: boolean;
+  }
+
+  interface ILegend {
+    chart: IChart;
+
+    transparent: boolean;
+
+    format: IFormat;
+    title: IAnnotation;
+
+    bounds: IRectangle;
+    position: string;
+    visible: boolean;
+    inverted: boolean;
+    padding: number;
+    align: number;
+
+    fontColor: boolean;
+
+    dividing: IStroke;
+    over: number;
+    symbol: ISymbol;
+
+    itemHeight: number;
+    innerOff: number;
+
+    legendStyle: string;
+    textStyle: string;
+
+    availRows(): number;
+    itemsCount(): number;
+    totalWidth(): number;
+    showValues(): boolean;
+    itemText(series: ISeries, index: number): string;
+    isVertical(): boolean;
+  }
+
+  interface IScroll {
+    chart: IChart;
+    active: boolean;
+    enabled: boolean;
+    direction: string;
+    mouseButton: number;
+
+    position: IPoint;
+  }
+
+  interface ISeriesList {
+    chart: IChart;
+    items: ISeries[];
+
+    anyUsesAxes(): boolean;
+    clicked(position: IPoint): boolean;
+    //each(f: function): void;
+    firstVisible(): ISeries;
+
+  }
+
+  interface ITools {
+    chart: IChart;
+    items: ITool[];
+
+    add(tool: ITool): ITool;
+  }
+
+  interface IWall {
+    format: IFormat;
+    visible: boolean;
+    bounds: IRectangle;
+  }
+
+  interface IWalls {
+    visible: boolean;
+    left: IWall;
+    right: IWall;
+    bottom: IWall;
+    back: IWall;
+  }
+
+  interface IZoom {
+    chart: IChart;
+    active: boolean;
+    direction: string;
+    enabled: boolean;
+    mouseButton: number;
+    format: IFormat;
+
+    reset(): void;
+  }
+
+  interface IChart {
+    addSeries(series: ISeries): ISeries;
+    draw(context?: CanvasRenderingContext2D): any;
+  }
+
+  // SERIES
+
+  interface ICustomBar extends ISeries {
+    sideMargins: number;
+    useOrigin: boolean;
+    origin: number;
+
+    offset: number;
+    barSize: number;
+    barStyle: string;
+
+    stacked: string;
+  }
+
+  interface ISeriesPointer {
+    chart: IChart;
+    format: IFormat;
+    visible: boolean;
+    colorEach: boolean;
+    style: string;
+    width: number;
+    height: number;
+  }
+
+  interface ICustomSeries extends ISeries {
+    pointer: ISeriesPointer;
+
+    stacked: string;
+    stairs: boolean;
+  }
+
+  interface ILine extends ICustomSeries {
+    smooth: number;
+  }
+
+  interface ISmoothLine extends ILine {
+    smooth: number;
+  }
+
+  interface IArea extends ISeries {
+    useOrigin: boolean;
+    origin: number;
+  }
+
+  interface IPie extends ISeries {
+    donut: number;
+    rotation: number;
+    sort: string;
+    orderAscending: boolean;
+    explode: number[];
+    concentric: boolean;
+
+    calcPos(angle: number, position: IPoint): void;
+  }
+
+  interface IBubbleData extends ISeriesData {
+    radius: number[];
+  }
+
+  interface IBubble extends ICustomSeries {
+    data: IBubbleData;
+  }
+
+  interface IGanttData extends ISeriesData {
+    start: number[];
+    x: number[];
+    end: number[];
+  }
+
+  interface IGantt extends ISeriesNoBounds {
+    data: IGanttData;
+    dateFormat: string;
+    colorEach: string;
+    height: number;
+    margin: IPoint;
+
+    add(index: number, label: string, start: number, end: number): void;
+    bounds(index: number, rectangle: IRectangle): void;
+  }
+
+  interface ICandleData extends ISeriesData {
+    open: number[];
+    close: number[];
+    high: number[];
+    low: number[];
+  }
+
+  interface ICandle extends ICustomSeries {
+    data: ICandleData;
+    higher: IFormat;
+    lower: IFormat;
+    style: string;
+  }
+
+  // TOOLS
+
+  interface IDragTool extends ITool {
+    series: ISeries;
+  }
+
+  interface ICursorTool extends ITool {
+    direction: string;
+    size: IPoint;
+
+    followMouse: boolean;
+    dragging: number;
+
+    format: IFormat;
+
+    horizAxis: IAxis;
+    vertAxis: IAxis;
+
+    render: string;
+
+    over(point: IPoint): boolean;
+    setRender(render: string): void;
+  }
+
+  interface IToolTip extends IAnnotation {
+    animated: number;
+    autoHide: boolean;
+    autoRedraw: boolean;
+    currentSeries: ISeries;
+    currentIndex: number;
+    delay: number;
+
+    hide(): void;
+    refresh(series: ISeries, index: number): void;
+  }
+
+  class Point implements IPoint {
+    public x: number;
+    public y: number;
+  }
+
+  class Chart implements IChart {
+    //public aspect: IAspect;
+
+    public axes: IAxes;
+    public footer: ITitle;
+    public legend: ILegend;
+    public panel: IPanel;
+    public scroll: IScroll;
+    public series: ISeriesList;
+    public title: ITitle;
+    public tools: ITools;
+    public walls: IWalls;
+    public zoom: IZoom;
+
+    public bounds: IRectangle;
+    public canvas: HTMLCanvasElement;
+    public chartRect: IRectangle;
+    public palette: IPalette;
+
+    constructor(canvas: string);
+    addSeries(series: ISeries): ISeries;
+    getSeries(index: number): ISeries;
+    removeSeries(series: ISeries): void;
+
+    draw(context?: CanvasRenderingContext2D): any;
+    toImage(image: HTMLImageElement, format: string, quality: number): void;
+  }
+
+  // SERIES
+
+  var Line: {
+    prototype: ILine;
+    new (values?: number[]): ILine;
+  }
+
+  var PointXY: {
+    prototype: ICustomSeries;
+    new (values?: number[]): ICustomSeries;
+  }
+
+  var Area: {
+    prototype: IArea;
+    new (values?: number[]): IArea;
+  }
+
+  var HorizArea: {
+    prototype: IArea;
+    new (values?: number[]): IArea;
+  }
+
+  var Bar: {
+    prototype: ICustomBar;
+    new (values?: number[]): ICustomBar;
+  }
+
+  var HorizBar: {
+    prototype: ICustomBar;
+    new (values?: number[]): ICustomBar;
+  }
+
+  var Pie: {
+    prototype: IPie;
+    new (values?: number[]): IPie;
+  }
+
+  var Donut: {
+    prototype: IPie;
+    new (values?: number[]): IPie;
+  }
+
+  var Bubble: {
+    prototype: IBubble;
+    new (values?: number[]): IBubble;
+  }
+
+  var Gantt: {
+    prototype: IGantt;
+    new (values?: number[]): IGantt;
+  }
+
+  var Volume: {
+    prototype: ICustomBar;
+    new (values?: number[]): ICustomBar;
+  }
+
+  var Candle: {
+    prototype: ICandle;
+    new (values?: number[]): ICandle;
+  }
+
+  // TOOLS
+
+  var CursorTool: {
+    prototype: ICursorTool;
+    new (chart?: Chart): ICursorTool;
+  }
+
+  var DragTool: {
+    prototype: IDragTool;
+    new (chart?: Chart): IDragTool;
+  }
+
+  var ToolTip: {
+    prototype: IToolTip;
+    new (chart?: Chart): IToolTip;
+  }
+}
diff --git a/teechart/teechart.d.ts b/teechart/teechart.d.ts
deleted file mode 100644
index 1858f05ae6..0000000000
--- a/teechart/teechart.d.ts
+++ /dev/null
@@ -1,683 +0,0 @@
-// Type definitions for TeeChart 1.3
-// Project: http://www.steema.com
-// Definitions by: Steema Software <https://steema.com/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/**
- * TeeChart(tm) for TypeScript
- *
- * v1.3 October 2012
- * Copyright(c) 2012 by Steema Software SL. All Rights Reserved.
- * http://www.steema.com
- *
- * Licensed with commercial and non-commercial attributes,
- * specifically: http://www.steema.com/licensing/html5
- *
- * TypeScript is a Microsoft product: www.typescriptlang.org
- *
- */
-
-/**
- * @author <a href="mailto:david@steema.com">Steema Software</a>
- * @version 1.3
- */
-
-
-declare namespace Tee {
-
-  interface IPoint {
-    x: number;
-    y: number;
-  }
-
-  interface IRectangle {
-    x: number;
-    y: number;
-    width: number;
-    height: number;
-
-    contains(point: IPoint): boolean;
-  }
-
-  interface ITool {
-    active: boolean;
-    chart: IChart;
-
-    mousedown(event): boolean;
-    mousemove(event): boolean;
-    clicked(p:IPoint): boolean;
-    draw(): void;
-  }
-
-  interface IGradient {
-    chart: IChart;
-    visible: boolean;
-
-    colors: string[];
-    direction: string;
-    stops: number[];
-    offset: IPoint;
-  }
-
-  interface IShadow {
-    chart: IChart;
-    visible: boolean;
-    blur:number;
-    color: string;
-    width:number;
-    height:number;
-  }
-
-  interface IStroke {
-    chart: IChart;
-    fill: string;
-    size: number;
-    join: string;
-    cap: string;
-    dash: number[];
-    gradient: IGradient;
-  }
-
-  interface IFont {
-    chart: IChart;
-    style: string;
-    gradient: IGradient;
-    fill: string;
-    stroke: IStroke;
-    shadow: IShadow;
-    textAlign: string;
-    baseLine: string;
-
-    getSize():number;
-    setSize(size:number):void;
-  }
-
-  interface IImage {
-    url: string;
-    chart: IChart;
-    visible: boolean;
-  }
-
-  interface IFormat {
-    font: IFont;
-    gradient: IGradient;
-    shadow: IShadow;
-    stroke: IStroke;
-    round: IPoint;
-    transparency: number;
-    image: IImage;
-    fill: string;
-
-    textHeight(text:string): number;
-    textWidth(text:string): number;
-    drawText(bounds:IRectangle, text:string);
-    rectangle(x:number, y:number, width:number, height:number);
-    poligon(points:IPoint[]);
-    ellipse(x:number, y:number, width:number, height:number);
-  }
-
-  interface IMargins {
-    left: number;
-    top: number;
-    right: number;
-    bottom: number;
-  }
-
-  interface IAnnotation extends ITool {
-    position: IPoint;
-    margins: IMargins;
-    items: IAnnotation[];
-    bounds: IRectangle;
-    visible: boolean;
-    transparent: boolean;
-    text: string;
-    format: IFormat;
-
-    add(text: string): IAnnotation;
-    resize(): void;
-    clicked(point: IPoint): boolean;
-    draw(): void;
-  }
-
-  interface IPanel {
-    format: IFormat;
-    transparent: boolean;
-    margins: IMargins;
-  }
-
-  interface ITitle extends IAnnotation {
-    expand: boolean;
-    padding: number;
-    transparent: boolean;
-  }
-
-  interface IPalette {
-    colors: string[];
-
-    get(index: number): string;
-  }
-
-  interface IArrow extends IFormat {
-    length: number;
-    underline: boolean;
-  }
-
-  interface IMarks extends IAnnotation {
-    arrow: IArrow;
-    series: ISeries;
-
-    style: string;
-
-    drawEvery: number;
-    visible: boolean;
-  }
-
-  interface ISeriesData {
-    values: number[];
-    labels: string[];
-    source: any;
-  }
-
-  interface ICursor {
-    cursor: string;
-  }
-
-  interface ISeriesNoBounds {
-    data: ISeriesData;
-    marks: IMarks;
-
-    yMandatory: boolean;
-    horizAxis: string;
-    vertAxis: string;
-
-    format: IFormat;
-    hover: IFormat;
-
-    visible: boolean;
-
-    cursor: ICursor;
-    over: number;
-
-    palette: IPalette;
-    colorEach: string;
-
-    useAxes: boolean;
-    decimals: number;
-
-    title: string;
-
-    //refresh(failure: function): void;
-
-    toPercent(index: number): string;
-    markText(index: number): string;
-
-    valueText(index: number): string;
-
-    associatedToAxis(axis: IAxis): boolean;
-
-    calc(index: number, position: IPoint): void;
-
-    clicked(position: IPoint): number;
-
-    minXValue(): number;
-    maxXValue(): number;
-
-    minYValue(): number;
-    maxYValue(): number;
-
-    count(): number;
-
-    addRandom(count: number, range?: number, x?: boolean): ISeries;
-  }
-
-  interface ISeries extends ISeriesNoBounds {
-    bounds(rectangle: IRectangle): void;
-  }
-
-  interface IAxisLabels {
-    chart: IChart;
-    format: IFormat;
-    decimals: number;
-    padding: number;
-    separation: number; // %
-    visible: boolean;
-    rotation: number;
-    alternate: boolean;
-    maxWidth: number;
-
-    labelStyle: string;
-    dateFormat: string;
-
-    getLabel(value: number): string;
-    width(value: number): number;
-
-  }
-
-  interface IGrid {
-    chart: IChart;
-    format: IFormat;
-    visible: boolean;
-    lineDash: boolean;
-  }
-
-  interface ITicks {
-    chart: IChart;
-    stroke: IStroke;
-    visible: boolean;
-    length: number;
-  }
-
-  interface IMinorTicks extends ITicks {
-    count: number;
-  }
-
-  interface IAxisTitle extends IAnnotation {
-    padding: number;
-    transparent: boolean;
-  }
-
-  interface IAxis {
-    chart: IChart;
-    visible: boolean;
-    inverted: boolean;
-
-    horizontal: boolean;  // readonly
-    otherSize: boolean; // readonly
-    bounds: IRectangle;  // readonly?
-
-    position: number;
-    format: IFormat;
-    custom: boolean; // readonly
-
-    grid: IGrid;
-    labels: IAxisLabels;
-    ticks: ITicks;
-    minorTicks: IMinorTicks;
-    innerTicks: ITicks;
-
-    title: IAxisTitle;
-
-    automatic: boolean;
-    minimum: number;
-    maximum: number;
-    increment: number;
-    log: boolean;
-
-    startPos: number;
-    endPos: number;
-
-    start: number; // %
-    end: number; // %
-
-    axisSize: number;
-
-    scale: number;
-    increm: number;
-
-    calc(value: number): number;
-    fromPos(position: number): number;
-    fromSize(size: number): number;
-
-    hasAnySeries(): boolean;
-    scroll(delta: number): void;
-    setMinMax(minimum: number, maximum: number): void;
-  }
-
-  interface IAxes {
-    chart: IChart;
-    visible: boolean;
-
-    left: IAxis;
-    top: IAxis;
-    right: IAxis;
-    bottom: IAxis;
-
-    items: IAxis[];
-
-    add(horizontal: boolean, otherSide: boolean): IAxis;
-    //each(f: function): void;
-  }
-
-  interface ISymbol {
-    chart: IChart;
-    format: IFormat;
-    width: number;
-    height: number;
-    padding: number;
-    visible: boolean;
-  }
-
-  interface ILegend {
-    chart: IChart;
-
-    transparent: boolean;
-
-    format: IFormat;
-    title: IAnnotation;
-
-    bounds: IRectangle;
-    position: string;
-    visible: boolean;
-    inverted: boolean;
-    padding: number;
-    align: number;
-
-    fontColor: boolean;
-
-    dividing: IStroke;
-    over: number;
-    symbol: ISymbol;
-
-    itemHeight: number;
-    innerOff: number;
-
-    legendStyle: string;
-    textStyle: string;
-
-    availRows(): number;
-    itemsCount(): number;
-    totalWidth(): number;
-    showValues(): boolean;
-    itemText(series: ISeries, index: number): string;
-    isVertical(): boolean;
-  }
-
-  interface IScroll {
-    chart: IChart;
-    active: boolean;
-    enabled: boolean;
-    direction: string;
-    mouseButton: number;
-
-    position: IPoint;
-  }
-
-  interface ISeriesList {
-    chart: IChart;
-    items: ISeries[];
-
-    anyUsesAxes(): boolean;
-    clicked(position: IPoint): boolean;
-    //each(f: function): void;
-    firstVisible(): ISeries;
-
-  }
-
-  interface ITools {
-    chart: IChart;
-    items: ITool[];
-
-    add(tool: ITool): ITool;
-  }
-
-  interface IWall {
-    format: IFormat;
-    visible: boolean;
-    bounds: IRectangle;
-  }
-
-  interface IWalls {
-    visible: boolean;
-    left: IWall;
-    right: IWall;
-    bottom: IWall;
-    back: IWall;
-  }
-
-  interface IZoom {
-    chart: IChart;
-    active: boolean;
-    direction: string;
-    enabled: boolean;
-    mouseButton: number;
-    format: IFormat;
-
-    reset(): void;
-  }
-
-  interface IChart {
-    addSeries(series:ISeries): ISeries;
-    draw(context?:CanvasRenderingContext2D);
-  }
-
-  // SERIES
-
-  interface ICustomBar extends ISeries {
-    sideMargins: number;
-    useOrigin: boolean;
-    origin: number;
-
-    offset: number;
-    barSize: number;
-    barStyle: string;
-
-    stacked: string;
-  }
-
-  interface ISeriesPointer {
-    chart: IChart;
-    format: IFormat;
-    visible: boolean;
-    colorEach: boolean;
-    style: string;
-    width: number;
-    height: number;
-  }
-
-  interface ICustomSeries extends ISeries {
-    pointer: ISeriesPointer;
-
-    stacked: string;
-    stairs: boolean;
-  }
-
-  interface ILine extends ICustomSeries {
-    smooth: number;
-  }
-
-  interface ISmoothLine extends ILine {
-    smooth: number;
-  }
-
-  interface IArea extends ISeries {
-    useOrigin: boolean;
-    origin: number;
-  }
-
-  interface IPie extends ISeries {
-    donut: number;
-    rotation: number;
-    sort: string;
-    orderAscending: boolean;
-    explode: number[];
-    concentric: boolean;
-
-    calcPos(angle: number, position: IPoint): void;
-  }
-
-  interface IBubbleData extends ISeriesData {
-    radius: number[];
-  }
-
-  interface IBubble extends ICustomSeries {
-    data: IBubbleData;
-  }
-
-  interface IGanttData extends ISeriesData {
-    start: number[];
-    x: number[];
-    end: number[];
-  }
-
-  interface IGantt extends ISeriesNoBounds {
-    data: IGanttData;
-    dateFormat: string;
-    colorEach: string;
-    height: number;
-    margin: IPoint;
-
-    add(index: number, label: string, start: number, end: number): void;
-    bounds(index: number, rectangle: IRectangle): void;
-  }
-
-  interface ICandleData extends ISeriesData {
-    open: number[];
-    close: number[];
-    high: number[];
-    low: number[];
-  }
-
-  interface ICandle extends ICustomSeries {
-    data: ICandleData;
-    higher: IFormat;
-    lower: IFormat;
-    style: string;
-  }
-
-  // TOOLS
-
-  interface IDragTool extends ITool {
-    series: ISeries;
-  }
-
-  interface ICursorTool extends ITool {
-    direction: string;
-    size: IPoint;
-
-    followMouse: boolean;
-    dragging: number;
-
-    format: IFormat;
-
-    horizAxis: IAxis;
-    vertAxis: IAxis;
-
-    render: string;
-
-    over(point: IPoint): boolean;
-    setRender(render: string): void;
-  }
-
-  interface IToolTip extends IAnnotation {
-    animated: number;
-    autoHide: boolean;
-    autoRedraw: boolean;
-    currentSeries: ISeries;
-    currentIndex: number;
-    delay: number;
-
-    hide(): void;
-    refresh(series: ISeries, index: number): void;
-  }
-
-  class Point implements IPoint {
-    public x:number;
-    public y:number;
-  }
-
-  class Chart implements IChart {
-    //public aspect: IAspect;
-
-    public axes: IAxes;
-    public footer: ITitle;
-    public legend: ILegend;
-    public panel: IPanel;
-    public scroll: IScroll;
-    public series: ISeriesList;
-    public title: ITitle;
-    public tools: ITools;
-    public walls: IWalls;
-    public zoom: IZoom;
-
-    public bounds: IRectangle;
-    public canvas: HTMLCanvasElement;
-    public chartRect: IRectangle;
-    public palette: IPalette;
-
-    constructor(canvas: string);
-    addSeries(series: ISeries): ISeries;
-    getSeries(index: number): ISeries;
-    removeSeries(series:ISeries): void;
-
-    draw(context?:CanvasRenderingContext2D);
-    toImage(image: HTMLImageElement, format:string, quality:number): void;
-  }
-
-  // SERIES
-
-  var Line: {
-    prototype: ILine;
-    new(values?:number[]): ILine;
-  }
-
-  var PointXY: {
-    prototype: ICustomSeries;
-    new(values?:number[]): ICustomSeries;
-  }
-
-  var Area: {
-    prototype: IArea;
-    new(values?:number[]): IArea;
-  }
-
-  var HorizArea: {
-    prototype: IArea;
-    new(values?:number[]): IArea;
-  }
-
-  var Bar: {
-    prototype: ICustomBar;
-    new(values?:number[]): ICustomBar;
-  }
-
-  var HorizBar: {
-    prototype: ICustomBar;
-    new(values?:number[]): ICustomBar;
-  }
-
-  var Pie: {
-    prototype: IPie;
-    new(values?:number[]): IPie;
-  }
-
-  var Donut: {
-    prototype: IPie;
-    new(values?:number[]): IPie;
-  }
-
-  var Bubble: {
-    prototype: IBubble;
-    new(values?:number[]): IBubble;
-  }
-
-  var Gantt: {
-    prototype: IGantt;
-    new(values?:number[]): IGantt;
-  }
-
-  var Volume: {
-    prototype: ICustomBar;
-    new(values?:number[]): ICustomBar;
-  }
-
-  var Candle: {
-    prototype: ICandle;
-    new(values?:number[]): ICandle;
-  }
-
-  // TOOLS
-
-  var CursorTool: {
-    prototype: ICursorTool;
-    new(chart?: Chart): ICursorTool;
-  }
-
-  var DragTool: {
-    prototype: IDragTool;
-    new(chart?: Chart): IDragTool;
-  }
-
-  var ToolTip: {
-    prototype: IToolTip;
-    new(chart?: Chart): IToolTip;
-  }
-}
diff --git a/teechart/teechart.d.ts.tscparams b/teechart/teechart.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/teechart/teechart.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/teechart/tsconfig.json b/teechart/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/teechart/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/temp-fs/index.d.ts b/temp-fs/index.d.ts
new file mode 100644
index 0000000000..3202d8ab3e
--- /dev/null
+++ b/temp-fs/index.d.ts
@@ -0,0 +1,206 @@
+// Type definitions for temp-fs v0.9.8
+// Project: https://github.com/jakwings/node-temp-fs
+// Definitions by: MEDIA CHECK s.r.o. <http://www.mediacheck.cz/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * A temporary file and directory creator.
+ */
+export = tempfs;
+
+declare namespace tempfs {
+
+    /**
+     * A tempdir.
+     */
+    interface dir {
+        /**
+         * The absolute path to the tempdir.
+         */
+        path: String;
+
+        /**
+         * Whether {@link dir#unlink} will remove the tempdir recursively.
+         */
+        recursive: Boolean;
+
+        /**
+         * A special function for you to remove the directory.
+         *
+         * If the directory is not tracked, it may throw when an error occurs or
+         * the first argument of the callback function will be an Error object.
+         *
+         * @param callback makes it asynchronous.
+         */
+        unlink(callback?:(error:Error)=>any): any;
+    }
+
+    /**
+     * A tempfile.
+     */
+    interface file {
+        /**
+         * The absolute path to the tempfile.
+         */
+        path: String;
+
+        /**
+         * An integer file descriptor.
+         */
+        fd: Number;
+
+        /**
+         * A special function for you to delete the file.
+         *
+         * If the file is not tracked, it may throw when an error occurs or the
+         * first argument of the callback function will be an Error object.
+         *
+         * @param callback makes it asynchronous.
+         */
+        unlink(callback?:(error:Error)=>any): any;
+    }
+
+    /**
+     * Options.
+     */
+    interface options {
+        /**
+         * Where to put the generated tempfile or tempdir.
+         *
+         * Also see {@link options#name}. Default: <code>tempfs.dir()</code>
+         */
+        dir?: String;
+
+        /**
+         * The maximum number of chance to retry before throwing an error.
+         *
+         * It should be a finite number. Default: 5
+         */
+        limit?: Number;
+
+        /**
+         * File mode (default: 0600) or directory mode (default: 0700) to use.
+         */
+        mode?: Number;
+
+        /**
+         * If set, join the two paths <code>{@link options#dir} ||
+         * tempfs.dir()</code> and {@link options#name} together and use the
+         * result as the customized filename/pathname.
+         */
+        name?: String;
+
+        /**
+         * The prefix for the generated random name.
+         *
+         * Default: "tmp-"
+         */
+        prefix?: String;
+
+        /**
+         * Whether {@link dir#unlink} should remove a directory recursively.
+         *
+         * Default: false
+         */
+        recursive?: Boolean;
+
+        /**
+         * The suffix for the generated random name.
+         *
+         * Default: ""
+         */
+        suffix?: String;
+
+        /**
+         * A string containing some capital letters Xs for substitution with
+         * random characters.
+         *
+         * Then it is used as part of the filename/dirname. Just like what you
+         * do with the <code>mktemp(3)</code> function in the C library.
+         */
+        template?: String;
+
+        /**
+         * If set to true, let temp-fs manage the the current file/directory for
+         * you even if the global tracking is off. If set to false, don't let
+         * temp-fs manage it even if the global tracking is on. Otherwise, use
+         * the current global setting.
+         */
+        track?: Boolean;
+    }
+
+    /**
+     * Remove all tracked files and directories asynchronously.
+     */
+    function clear(callback?:()=>any):any;
+
+    /**
+     * Remove all tracked files and directories synchronously.
+     */
+    function clearSync():any;
+
+    /**
+     * Return the path of a system-provided tempdir as
+     * <code>require('os').tmpdir()</code> does.
+     *
+     * You should not make any assumption about whether the path contains a
+     * trailing path separator, or it is a real path. On most system it is not a
+     * fixed path, and it can be changed by the user environment. When in doubt,
+     * check it first.
+     */
+    function dir():string;
+
+    /**
+     * Try to create a new tempdir asynchronously.
+     *
+     * @param callback function receives two arguments <code>error</code> and
+     *                 <code>dir</code>. If <code>error</code> is
+     *                 <code>null</code>, <code>dir</code> has the properties of
+     *                 {@link dir}.
+     */
+    function mkdir(options?:options, callback?:(err:any, dir:dir)=>any):any;
+
+    /**
+     * The synchronous version of {@link mkdir}.
+     *
+     * @throws when an error happens.
+     */
+    function mkdirSync(options?:options):dir;
+
+    /**
+     * Return a customized/random filename/dirname.
+     */
+    function name(options?:options):string;
+
+    /**
+     * Try to open a unique tempfile asynchronously.
+     *
+     * @param callback function receives two arguments <code>error</code> and
+     *                 <code>file</code>. If <code>error</code> is
+     *                 <code>null</code>, <code>file</code> has the properties
+     *                 of {@link file}.
+     */
+    function open(options?:options, callback?:(err:any, file:file)=>any):any;
+
+    /**
+     * The synchronous version of {@link open}.
+     *
+     * @throws when an error happens.
+     */
+    function openSync(options?:options):file;
+
+    /**
+     * Use it to switch global files/directories tracking on or off.
+     *
+     * Turn it on if you don't want to manually delete everything. When it is
+     * turned off, all recorded files and directories will not be removed but
+     * still kept in case it is turned on again before the program exits.
+     *
+     * This switch does not affect manually tracked files through
+     * {@link options#track}. They will be removed automatically on exit.
+     *
+     * <b>Note: When an uncaught exception occurs, all tracked temporary files
+     * and directories will be removed no matter it is on or off.</b>
+     */
+    function track(on?:Boolean):void;
+}
\ No newline at end of file
diff --git a/temp-fs/temp-fs-tests.ts b/temp-fs/temp-fs-tests.ts
index 9d01e31f37..c973e553d7 100644
--- a/temp-fs/temp-fs-tests.ts
+++ b/temp-fs/temp-fs-tests.ts
@@ -1,7 +1,7 @@
 // Copied from https://github.com/jakwings/node-temp-fs/blob/60a4d2586a81a7057bd4a395ec8c00b4100f84fe/README.md
 // and slightly modified.
+import tempfs = require("temp-fs");
 
-/// <reference path="temp-fs.d.ts" />
 
 // Create a tempfile in the system-provided tempdir.
 tempfs.open(function (err:any, file:tempfs.file) {
@@ -26,6 +26,6 @@ tempfs.mkdir({
     if (err) { throw err; }
 
     console.log(dir.path, dir.recursive);
-    throw new Error('Since it is tracked, tempfs will remove it for you.');
     dir.unlink();
+    throw new Error('Since it is tracked, tempfs will remove it for you.');
 });
diff --git a/temp-fs/temp-fs.d.ts b/temp-fs/temp-fs.d.ts
deleted file mode 100644
index ae1d0b4a0b..0000000000
--- a/temp-fs/temp-fs.d.ts
+++ /dev/null
@@ -1,211 +0,0 @@
-// Type definitions for temp-fs v0.9.8
-// Project: https://github.com/jakwings/node-temp-fs
-// Definitions by: MEDIA CHECK s.r.o. <http://www.mediacheck.cz/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/**
- * A temporary file and directory creator.
- */
-declare namespace tempfs {
-
-    /**
-     * A tempdir.
-     */
-    interface dir {
-        /**
-         * The absolute path to the tempdir.
-         */
-        path: String;
-
-        /**
-         * Whether {@link dir#unlink} will remove the tempdir recursively.
-         */
-        recursive: Boolean;
-
-        /**
-         * A special function for you to remove the directory.
-         *
-         * If the directory is not tracked, it may throw when an error occurs or
-         * the first argument of the callback function will be an Error object.
-         *
-         * @param callback makes it asynchronous.
-         */
-        unlink(callback?:(error:Error)=>any): any;
-    }
-
-    /**
-     * A tempfile.
-     */
-    interface file {
-        /**
-         * The absolute path to the tempfile.
-         */
-        path: String;
-
-        /**
-         * An integer file descriptor.
-         */
-        fd: Number;
-
-        /**
-         * A special function for you to delete the file.
-         *
-         * If the file is not tracked, it may throw when an error occurs or the
-         * first argument of the callback function will be an Error object.
-         *
-         * @param callback makes it asynchronous.
-         */
-        unlink(callback?:(error:Error)=>any): any;
-    }
-
-    /**
-     * Options.
-     */
-    interface options {
-        /**
-         * Where to put the generated tempfile or tempdir.
-         *
-         * Also see {@link options#name}. Default: <code>tempfs.dir()</code>
-         */
-        dir?: String;
-
-        /**
-         * The maximum number of chance to retry before throwing an error.
-         *
-         * It should be a finite number. Default: 5
-         */
-        limit?: Number;
-
-        /**
-         * File mode (default: 0600) or directory mode (default: 0700) to use.
-         */
-        mode?: Number;
-
-        /**
-         * If set, join the two paths <code>{@link options#dir} ||
-         * tempfs.dir()</code> and {@link options#name} together and use the
-         * result as the customized filename/pathname.
-         */
-        name?: String;
-
-        /**
-         * The prefix for the generated random name.
-         *
-         * Default: "tmp-"
-         */
-        prefix?: String;
-
-        /**
-         * Whether {@link dir#unlink} should remove a directory recursively.
-         *
-         * Default: false
-         */
-        recursive?: Boolean;
-
-        /**
-         * The suffix for the generated random name.
-         *
-         * Default: ""
-         */
-        suffix?: String;
-
-        /**
-         * A string containing some capital letters Xs for substitution with
-         * random characters.
-         *
-         * Then it is used as part of the filename/dirname. Just like what you
-         * do with the <code>mktemp(3)</code> function in the C library.
-         */
-        template?: String;
-
-        /**
-         * If set to true, let temp-fs manage the the current file/directory for
-         * you even if the global tracking is off. If set to false, don't let
-         * temp-fs manage it even if the global tracking is on. Otherwise, use
-         * the current global setting.
-         */
-        track?: Boolean;
-    }
-
-    /**
-     * Remove all tracked files and directories asynchronously.
-     */
-    function clear(callback?:()=>any):any;
-
-    /**
-     * Remove all tracked files and directories synchronously.
-     */
-    function clearSync():any;
-
-    /**
-     * Return the path of a system-provided tempdir as
-     * <code>require('os').tmpdir()</code> does.
-     *
-     * You should not make any assumption about whether the path contains a
-     * trailing path separator, or it is a real path. On most system it is not a
-     * fixed path, and it can be changed by the user environment. When in doubt,
-     * check it first.
-     */
-    function dir():string;
-
-    /**
-     * Try to create a new tempdir asynchronously.
-     *
-     * @param callback function receives two arguments <code>error</code> and
-     *                 <code>dir</code>. If <code>error</code> is
-     *                 <code>null</code>, <code>dir</code> has the properties of
-     *                 {@link dir}.
-     */
-    function mkdir(options?:options, callback?:(err:any, dir:dir)=>any):any;
-
-    /**
-     * The synchronous version of {@link mkdir}.
-     *
-     * @throws when an error happens.
-     */
-    function mkdirSync(options?:options):dir;
-
-    /**
-     * Return a customized/random filename/dirname.
-     */
-    function name(options?:options):string;
-
-    /**
-     * Try to open a unique tempfile asynchronously.
-     *
-     * @param callback function receives two arguments <code>error</code> and
-     *                 <code>file</code>. If <code>error</code> is
-     *                 <code>null</code>, <code>file</code> has the properties
-     *                 of {@link file}.
-     */
-    function open(options?:options, callback?:(err:any, file:file)=>any):any;
-
-    /**
-     * The synchronous version of {@link open}.
-     *
-     * @throws when an error happens.
-     */
-    function openSync(options?:options):file;
-
-    /**
-     * Use it to switch global files/directories tracking on or off.
-     *
-     * Turn it on if you don't want to manually delete everything. When it is
-     * turned off, all recorded files and directories will not be removed but
-     * still kept in case it is turned on again before the program exits.
-     *
-     * This switch does not affect manually tracked files through
-     * {@link options#track}. They will be removed automatically on exit.
-     *
-     * <b>Note: When an uncaught exception occurs, all tracked temporary files
-     * and directories will be removed no matter it is on or off.</b>
-     */
-    function track(on?:Boolean):void;
-}
-
-/**
- * A temporary file and directory creator.
- */
-declare module "temp-fs" {
-    export = tempfs;
-}
diff --git a/temp-fs/tsconfig.json b/temp-fs/tsconfig.json
new file mode 100644
index 0000000000..cbcf73738d
--- /dev/null
+++ b/temp-fs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "temp-fs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/temp/index.d.ts b/temp/index.d.ts
new file mode 100644
index 0000000000..bb2f1abbf7
--- /dev/null
+++ b/temp/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for temp 0.8.3
+// Project: https://www.npmjs.com/package/temp, https://github.com/bruce/node-temp
+// Definitions by: Daniel Rosenwasser <https://github.com/DanielRosenwasser>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as temp from "temp";
+import * as fs from "fs";
+
+export interface AffixOptions {
+    prefix?: string;
+    suffix?: string;
+    dir?: string;
+}
+
+export declare var dir: string;
+
+export declare function track(value?: boolean): typeof temp;
+
+export declare function mkdir(affixes: string, callback?: (err: any, dirPath: string) => void): void;
+export declare function mkdir(affixes: AffixOptions, callback?: (err: any, dirPath: string) => void): void;
+
+export declare function mkdirSync(affixes: string): string;
+export declare function mkdirSync(affixes: AffixOptions): string;
+
+export declare function open(affixes: string, callback?: (err: any, result: { path: string, fd: number }) => void): void;
+export declare function open(affixes: AffixOptions, callback?: (err: any, result: { path: string, fd: number }) => void): void;
+
+export declare function openSync(affixes: string): { path: string, fd: number };
+export declare function openSync(affixes: AffixOptions): { path: string, fd: number };
+
+export declare function path(affixes: string, defaultPrefix?: string): string;
+export declare function path(affixes: AffixOptions, defaultPrefix?: string): string;
+
+export declare function cleanup(callback?: (result: boolean | { files: number, dirs?: number }) => void): void;
+
+export declare function cleanupSync(): boolean | { files: number, dirs: number };
+
+export declare function createWriteStream(affixes: string): fs.WriteStream;
+export declare function createWriteStream(affixes: AffixOptions): fs.WriteStream;
diff --git a/temp/temp-tests.ts b/temp/temp-tests.ts
index 4fb0cc6f86..3f8ed01327 100644
--- a/temp/temp-tests.ts
+++ b/temp/temp-tests.ts
@@ -1,7 +1,5 @@
 // Author: Daniel Rosenwasser <https://github.com/DanielRosenwasser>
 
-/// <reference path="temp.d.ts" />
-
 import * as temp from "temp";
 
 function testCleanup() {
diff --git a/temp/temp.d.ts b/temp/temp.d.ts
deleted file mode 100644
index c8caab7467..0000000000
--- a/temp/temp.d.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-// Type definitions for temp 0.8.3
-// Project: https://www.npmjs.com/package/temp, https://github.com/bruce/node-temp
-// Definitions by: Daniel Rosenwasser <https://github.com/DanielRosenwasser>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "temp" {
-    import * as temp from "temp";
-    import * as fs from "fs";
-
-    export interface AffixOptions {
-        prefix?: string;
-        suffix?: string;
-        dir?: string;
-    }
-
-    export var dir: string;
-
-    export function track(value?: boolean): typeof temp;
-
-    export function mkdir(affixes: string, callback?: (err: any, dirPath: string) => void): void;
-    export function mkdir(affixes: AffixOptions, callback?: (err: any, dirPath: string) => void): void;
-
-    export function mkdirSync(affixes: string): string;
-    export function mkdirSync(affixes: AffixOptions): string;
-
-    export function open(affixes: string, callback?: (err: any, result: {path: string, fd: number}) => void): void;
-    export function open(affixes: AffixOptions, callback?: (err: any, result: {path: string, fd: number}) => void): void;
-
-    export function openSync(affixes: string): { path: string, fd: number };
-    export function openSync(affixes: AffixOptions): { path: string, fd: number };
-
-    export function path(affixes: string, defaultPrefix?: string): string;
-    export function path(affixes: AffixOptions, defaultPrefix?: string): string;
-
-    export function cleanup(callback?: (result: boolean | {files: number, dirs?: number}) => void): void;
-
-    export function cleanupSync(): boolean | {files: number, dirs: number};
-
-    export function createWriteStream(affixes: string): fs.WriteStream;
-    export function createWriteStream(affixes: AffixOptions): fs.WriteStream;
-}
\ No newline at end of file
diff --git a/temp/tsconfig.json b/temp/tsconfig.json
new file mode 100644
index 0000000000..acb68b5d51
--- /dev/null
+++ b/temp/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "temp-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tether-shepherd/tether-shepherd.d.ts b/tether-shepherd/index.d.ts
similarity index 100%
rename from tether-shepherd/tether-shepherd.d.ts
rename to tether-shepherd/index.d.ts
diff --git a/tether-shepherd/tether-shepherd-tests.ts b/tether-shepherd/tether-shepherd-tests.ts
index 085da575b9..a0265f8a34 100644
--- a/tether-shepherd/tether-shepherd-tests.ts
+++ b/tether-shepherd/tether-shepherd-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="tether-shepherd.d.ts" />
-
 var tour = new Shepherd.Tour({
     defaults: {
         classes: 'shepherd-theme-default'
diff --git a/tether-shepherd/tsconfig.json b/tether-shepherd/tsconfig.json
new file mode 100644
index 0000000000..7dc095f454
--- /dev/null
+++ b/tether-shepherd/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "tether-shepherd-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tether/index.d.ts b/tether/index.d.ts
new file mode 100644
index 0000000000..ae00278d9b
--- /dev/null
+++ b/tether/index.d.ts
@@ -0,0 +1,45 @@
+// Type definitions for Tether v1.1
+// Project: http://github.hubspot.com/tether/
+// Definitions by: Adi Dahiya <https://github.com/adidahiya>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = Tether;
+export as namespace Tether;
+
+// global Tether constructor
+declare class Tether {
+    constructor(options: Tether.ITetherOptions);
+
+    public setOptions(options: Tether.ITetherOptions): void;
+    public disable(): void;
+    public enable(): void;
+    public destroy(): void;
+    public position(): void;
+
+    public static position(): void;
+}
+
+declare namespace Tether {
+    interface ITetherOptions {
+        attachment?: string;
+        classes?: {[className: string]: boolean};
+        classPrefix?: string;
+        constraints?: ITetherConstraint[];
+        element?: HTMLElement | string | any /* JQuery */;
+        enabled?: boolean;
+        offset?: string;
+        optimizations?: any;
+        target?: HTMLElement | string | any /* JQuery */;
+        targetAttachment?: string;
+        targetOffset?: string;
+        targetModifier?: string;
+    }
+
+    interface ITetherConstraint {
+        attachment?: string;
+        outOfBoundsClass?: string;
+        pin?: boolean | string[];
+        pinnedClass?: string;
+        to?: string | HTMLElement | number[];
+    }
+}
diff --git a/tether/tether-tests.ts b/tether/tether-tests.ts
index 4d3295b509..5f78bb3b99 100644
--- a/tether/tether-tests.ts
+++ b/tether/tether-tests.ts
@@ -1,5 +1,5 @@
-///<reference path="../jquery/jquery.d.ts" />
-///<reference path="tether.d.ts" />
+///<reference types="jquery" />
+import Tether = require("tether");
 
 var yellowBox = document.querySelector(".yellow");
 var greenBox = document.querySelector(".green");
diff --git a/tether/tether.d.ts b/tether/tether.d.ts
deleted file mode 100644
index 50d7a8bad2..0000000000
--- a/tether/tether.d.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-// Type definitions for Tether v1.1
-// Project: http://github.hubspot.com/tether/
-// Definitions by: Adi Dahiya <https://github.com/adidahiya>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// global Tether constructor
-declare class Tether {
-    constructor(options: Tether.ITetherOptions);
-
-    public setOptions(options: Tether.ITetherOptions): void;
-    public disable(): void;
-    public enable(): void;
-    public destroy(): void;
-    public position(): void;
-
-    public static position(): void;
-}
-
-declare namespace Tether {
-    interface ITetherOptions {
-        attachment?: string;
-        classes?: {[className: string]: boolean};
-        classPrefix?: string;
-        constraints?: ITetherConstraint[];
-        element?: HTMLElement | string | any /* JQuery */;
-        enabled?: boolean;
-        offset?: string;
-        optimizations?: any;
-        target?: HTMLElement | string | any /* JQuery */;
-        targetAttachment?: string;
-        targetOffset?: string;
-        targetModifier?: string;
-    }
-
-    interface ITetherConstraint {
-        attachment?: string;
-        outOfBoundsClass?: string;
-        pin?: boolean | string[];
-        pinnedClass?: string;
-        to?: string | HTMLElement | number[];
-    }
-}
-
-declare module "tether" {
-    export = Tether;
-}
-
diff --git a/tether/tsconfig.json b/tether/tsconfig.json
new file mode 100644
index 0000000000..ff2683577d
--- /dev/null
+++ b/tether/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "tether-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/text-buffer/index.d.ts b/text-buffer/index.d.ts
new file mode 100644
index 0000000000..eb5911680a
--- /dev/null
+++ b/text-buffer/index.d.ts
@@ -0,0 +1,303 @@
+// Type definitions for text-buffer
+// Project: https://github.com/atom/text-buffer
+// Definitions by: vvakame <https://github.com/vvakame/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="atom" />
+/// <reference types="emissary" />
+/// <reference types="Q" />
+
+
+declare namespace TextBuffer {
+
+	interface IPointStatic {
+		new (row?:number, column?:number):IPoint;
+
+		fromObject(point:IPoint, copy?:boolean):IPoint;
+		fromObject(object:number[]):IPoint;
+		fromObject(object:{row:number; column:number;}):IPoint;
+
+		min(point1:IPoint, point2:IPoint):IPoint;
+		min(point1:number[], point2:IPoint):IPoint;
+		min(point1:{row:number; column:number;}, point2:IPoint):IPoint;
+
+		min(point1:IPoint, point2:number[]):IPoint;
+		min(point1:number[], point2:number[]):IPoint;
+		min(point1:{row:number; column:number;}, point2:number[]):IPoint;
+
+		min(point1:IPoint, point2:{row:number; column:number;}):IPoint;
+		min(point1:number[], point2:{row:number; column:number;}):IPoint;
+		min(point1:{row:number; column:number;}, point2:{row:number; column:number;}):IPoint;
+	}
+
+	interface IPoint {
+		constructor: IPointStatic;
+
+		row:number;
+		column:number;
+
+		copy():IPoint;
+		freeze():IPoint;
+
+		translate(delta:IPoint):IPoint;
+		translate(delta:number[]):IPoint;
+		translate(delta:{row:number; column:number;}):IPoint;
+
+		add(other:IPoint):IPoint;
+		add(other:number[]):IPoint;
+		add(other:{row:number; column:number;}):IPoint;
+
+		splitAt(column:number):IPoint[];
+		compare(other:IPoint):number;
+		isEqual(other:IPoint):boolean;
+		isLessThan(other:IPoint):boolean;
+		isLessThanOrEqual(other:IPoint):boolean;
+		isGreaterThan(other:IPoint):boolean;
+		isGreaterThanOrEqual(other:IPoint):boolean;
+		toArray():number[];
+		serialize():number[];
+	}
+
+	interface IRangeStatic {
+		deserialize(array:IPoint[]):IRange;
+
+		fromObject(object:IPoint[]):IRange;
+
+		fromObject(object:IRange, copy?:boolean):IRange;
+
+		fromObject(object:{start: IPoint; end: IPoint}):IRange;
+		fromObject(object:{start: number[]; end: IPoint}):IRange;
+		fromObject(object:{start: {row:number; column:number;}; end: IPoint}):IRange;
+
+		fromObject(object:{start: IPoint; end: number[]}):IRange;
+		fromObject(object:{start: number[]; end: number[]}):IRange;
+		fromObject(object:{start: {row:number; column:number;}; end: number[]}):IRange;
+
+		fromObject(object:{start: IPoint; end: {row:number; column:number;}}):IRange;
+		fromObject(object:{start: number[]; end: {row:number; column:number;}}):IRange;
+		fromObject(object:{start: {row:number; column:number;}; end: {row:number; column:number;}}):IRange;
+
+		fromText(point:IPoint, text:string):IRange;
+		fromText(point:number[], text:string):IRange;
+		fromText(point:{row:number; column:number;}, text:string):IRange;
+		fromText(text:string):IRange;
+
+		fromPointWithDelta(startPoint:IPoint, rowDelta:number, columnDelta:number):IRange;
+		fromPointWithDelta(startPoint:number[], rowDelta:number, columnDelta:number):IRange;
+		fromPointWithDelta(startPoint:{row:number; column:number;}, rowDelta:number, columnDelta:number):IRange;
+
+		new(point1:IPoint, point2:IPoint):IRange;
+		new(point1:number[], point2:IPoint):IRange;
+		new(point1:{row:number; column:number;}, point2:IPoint):IRange;
+
+		new(point1:IPoint, point2:number[]):IRange;
+		new(point1:number[], point2:number[]):IRange;
+		new(point1:{row:number; column:number;}, point2:number[]):IRange;
+
+		new(point1:IPoint, point2:{row:number; column:number;}):IRange;
+		new(point1:number[], point2:{row:number; column:number;}):IRange;
+		new(point1:{row:number; column:number;}, point2:{row:number; column:number;}):IRange;
+	}
+
+	interface IRange {
+		constructor:IRangeStatic;
+
+		start: IPoint;
+		end: IPoint;
+
+		serialize():number[][];
+		copy():IRange;
+		freeze():IRange;
+		isEqual(other:IRange):boolean;
+		isEqual(other:IPoint[]):boolean;
+
+		compare(object:IPoint[]):number;
+
+		compare(object:{start: IPoint; end: IPoint}):number;
+		compare(object:{start: number[]; end: IPoint}):number;
+		compare(object:{start: {row:number; column:number;}; end: IPoint}):number;
+
+		compare(object:{start: IPoint; end: number[]}):number;
+		compare(object:{start: number[]; end: number[]}):number;
+		compare(object:{start: {row:number; column:number;}; end: number[]}):number;
+
+		compare(object:{start: IPoint; end: {row:number; column:number;}}):number;
+		compare(object:{start: number[]; end: {row:number; column:number;}}):number;
+		compare(object:{start: {row:number; column:number;}; end: {row:number; column:number;}}):number;
+
+		isSingleLine():boolean;
+		coversSameRows(other:IRange):boolean;
+
+		add(object:IPoint[]):IRange;
+
+		add(object:{start: IPoint; end: IPoint}):IRange;
+		add(object:{start: number[]; end: IPoint}):IRange;
+		add(object:{start: {row:number; column:number;}; end: IPoint}):IRange;
+
+		add(object:{start: IPoint; end: number[]}):IRange;
+		add(object:{start: number[]; end: number[]}):IRange;
+		add(object:{start: {row:number; column:number;}; end: number[]}):IRange;
+
+		add(object:{start: IPoint; end: {row:number; column:number;}}):IRange;
+		add(object:{start: number[]; end: {row:number; column:number;}}):IRange;
+		add(object:{start: {row:number; column:number;}; end: {row:number; column:number;}}):IRange;
+
+		translate(startPoint:IPoint, endPoint:IPoint):IRange;
+		translate(startPoint:IPoint):IRange;
+
+		intersectsWith(otherRange:IRange):boolean;
+		containsRange(otherRange:IRange, exclusive:boolean):boolean;
+
+		containsPoint(point:IPoint, exclusive:boolean):boolean;
+		containsPoint(point:number[], exclusive:boolean):boolean;
+		containsPoint(point:{row:number; column:number;}, exclusive:boolean):boolean;
+
+		intersectsRow(row:number):boolean;
+		intersectsRowRange(startRow:number, endRow:number):boolean;
+		union(otherRange:IRange):IRange;
+		isEmpty():boolean;
+		toDelta():IPoint;
+		getRowCount():number;
+		getRows():number[];
+	}
+
+	interface IHistory {
+		// TBD
+	}
+
+	interface IMarkerManager {
+		// TBD
+	}
+
+	interface IMarker {
+		// TBD
+	}
+
+	interface IBufferPatch {
+		// TBD
+	}
+
+	interface ITextBufferStatic {
+		Point: IPointStatic;
+		Range: IRangeStatic;
+		newlineRegex:any;
+
+		new (text:string): ITextBuffer;
+		new (params:any): ITextBuffer;
+	}
+
+	interface ITextBuffer extends Emissary.IEmitter, Emissary.ISubscriber {
+		// Delegator.includeInto(TextBuffer);
+		// Serializable.includeInto(TextBuffer);
+
+		cachedText:string;
+		stoppedChangingDelay:number;
+		stoppedChangingTimeout:any;
+		cachedDiskContents:string;
+		conflict:boolean;
+		file:any; // pathwatcher.IFile
+		refcount:number;
+
+		lines:string[];
+		lineEndings:string[];
+		offsetIndex:any; // span-skip-list.SpanSkipList
+		history:IHistory;
+		markers:IMarkerManager;
+		loaded:boolean;
+		digestWhenLastPersisted:string;
+		modifiedWhenLastPersisted:boolean;
+		useSerializedText:boolean;
+
+		deserializeParams(params:any):any;
+		serializeParams():any;
+
+		getText():string;
+		getLines():string;
+		isEmpty():boolean;
+		getLineCount():number;
+		getLastRow():number;
+		lineForRow(row:number):string;
+		getLastLine():string;
+		lineEndingForRow(row:number):string;
+		lineLengthForRow(row:number):number;
+		setText(text:string):IRange;
+		setTextViaDiff(text:any):any[];
+		setTextInRange(range:IRange, text:string, normalizeLineEndings?:boolean):IRange;
+		insert(position:IPoint, text:string, normalizeLineEndings?:boolean):IRange;
+		append(text:string, normalizeLineEndings?:boolean):IRange;
+		delete(range:IRange):IRange;
+		deleteRow(row:number):IRange;
+		deleteRows(startRow:number, endRow:number):IRange;
+		buildPatch(oldRange:IRange, newText:string, normalizeLineEndings?:boolean):IBufferPatch;
+		applyPatch(patch:IBufferPatch):any;
+		getTextInRange(range:IRange):string;
+		clipRange(range:IRange):IRange;
+		clipPosition(position:IPoint):IPoint;
+		getFirstPosition():IPoint;
+		getEndPosition():IPoint;
+		getRange():IRange;
+		rangeForRow(row:number, includeNewline?:boolean):IRange;
+		characterIndexForPosition(position:IPoint):number;
+		positionForCharacterIndex(offset:number):IPoint;
+		getMaxCharacterIndex():number;
+		loadSync():ITextBuffer;
+		load():Q.IPromise<ITextBuffer>;
+		finishLoading():ITextBuffer;
+		handleTextChange(event:any):any;
+		destroy():any;
+		isAlive():boolean;
+		isDestroyed():boolean;
+		isRetained():boolean;
+		retain():ITextBuffer;
+		release():ITextBuffer;
+		subscribeToFile():any;
+		hasMultipleEditors():boolean;
+		reload():any;
+		updateCachedDiskContentsSync():string;
+		updateCachedDiskContents():Q.IPromise<string>;
+		getBaseName():string;
+		getPath():string;
+		getUri():string;
+		setPath(filePath:string):any;
+		save():void;
+		saveAs(filePath:string):any;
+		isModified():boolean;
+		isInConflict():boolean;
+		destroyMarker(id:any):any;
+		matchesInCharacterRange(regex:any, startIndex:any, endIndex:any):any[];
+		scan(regex:any, iterator:any):any;
+		backwardsScan(regex:any, iterator:any):any;
+		replace(regex:any, replacementText:any):any;
+		scanInRange(regex:any, range:any, iterator:any, reverse:any):any;
+		backwardsScanInRange(regex:any, range:any, iterator:any):any;
+		isRowBlank(row:number):boolean;
+		previousNonBlankRow(startRow:number):number;
+		nextNonBlankRow(startRow:number):number;
+		usesSoftTabs():boolean;
+		cancelStoppedChangingTimeout():any;
+		scheduleModifiedEvents():any;
+		emitModifiedStatusChanged(modifiedStatus:any):any;
+		logLines(start:number, end:number):void;
+
+		// delegate to history property
+		undo():any;
+		redo():any;
+		transact(fn:Function):any;
+		beginTransaction():any;
+		commitTransaction():any;
+		abortTransaction():any;
+		clearUndoStack():any;
+
+		// delegate to markers property
+		markRange(range:any, properties:any):any;
+		markPosition(range:any, properties:any):any;
+		getMarker(id:number):IMarker;
+		getMarkers():IMarker[];
+		getMarkerCount():number;
+	}
+}
+
+declare module "text-buffer" {
+	var _: TextBuffer.ITextBufferStatic;
+	export = _;
+}
diff --git a/text-buffer/text-buffer-tests.ts b/text-buffer/text-buffer-tests.ts
index 8621c30918..5b79f711cb 100644
--- a/text-buffer/text-buffer-tests.ts
+++ b/text-buffer/text-buffer-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./text-buffer.d.ts" />
+
 
 declare var Point: TextBuffer.IPointStatic;
 
diff --git a/text-buffer/text-buffer.d.ts b/text-buffer/text-buffer.d.ts
deleted file mode 100644
index 21f1ad8265..0000000000
--- a/text-buffer/text-buffer.d.ts
+++ /dev/null
@@ -1,303 +0,0 @@
-// Type definitions for text-buffer
-// Project: https://github.com/atom/text-buffer
-// Definitions by: vvakame <https://github.com/vvakame/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../atom/atom.d.ts" />
-/// <reference path="../emissary/emissary.d.ts" />
-/// <reference path="../q/Q.d.ts" />
-
-
-declare namespace TextBuffer {
-
-	interface IPointStatic {
-		new (row?:number, column?:number):IPoint;
-
-		fromObject(point:IPoint, copy?:boolean):IPoint;
-		fromObject(object:number[]):IPoint;
-		fromObject(object:{row:number; column:number;}):IPoint;
-
-		min(point1:IPoint, point2:IPoint):IPoint;
-		min(point1:number[], point2:IPoint):IPoint;
-		min(point1:{row:number; column:number;}, point2:IPoint):IPoint;
-
-		min(point1:IPoint, point2:number[]):IPoint;
-		min(point1:number[], point2:number[]):IPoint;
-		min(point1:{row:number; column:number;}, point2:number[]):IPoint;
-
-		min(point1:IPoint, point2:{row:number; column:number;}):IPoint;
-		min(point1:number[], point2:{row:number; column:number;}):IPoint;
-		min(point1:{row:number; column:number;}, point2:{row:number; column:number;}):IPoint;
-	}
-
-	interface IPoint {
-		constructor: IPointStatic;
-
-		row:number;
-		column:number;
-
-		copy():IPoint;
-		freeze():IPoint;
-
-		translate(delta:IPoint):IPoint;
-		translate(delta:number[]):IPoint;
-		translate(delta:{row:number; column:number;}):IPoint;
-
-		add(other:IPoint):IPoint;
-		add(other:number[]):IPoint;
-		add(other:{row:number; column:number;}):IPoint;
-
-		splitAt(column:number):IPoint[];
-		compare(other:IPoint):number;
-		isEqual(other:IPoint):boolean;
-		isLessThan(other:IPoint):boolean;
-		isLessThanOrEqual(other:IPoint):boolean;
-		isGreaterThan(other:IPoint):boolean;
-		isGreaterThanOrEqual(other:IPoint):boolean;
-		toArray():number[];
-		serialize():number[];
-	}
-
-	interface IRangeStatic {
-		deserialize(array:IPoint[]):IRange;
-
-		fromObject(object:IPoint[]):IRange;
-
-		fromObject(object:IRange, copy?:boolean):IRange;
-
-		fromObject(object:{start: IPoint; end: IPoint}):IRange;
-		fromObject(object:{start: number[]; end: IPoint}):IRange;
-		fromObject(object:{start: {row:number; column:number;}; end: IPoint}):IRange;
-
-		fromObject(object:{start: IPoint; end: number[]}):IRange;
-		fromObject(object:{start: number[]; end: number[]}):IRange;
-		fromObject(object:{start: {row:number; column:number;}; end: number[]}):IRange;
-
-		fromObject(object:{start: IPoint; end: {row:number; column:number;}}):IRange;
-		fromObject(object:{start: number[]; end: {row:number; column:number;}}):IRange;
-		fromObject(object:{start: {row:number; column:number;}; end: {row:number; column:number;}}):IRange;
-
-		fromText(point:IPoint, text:string):IRange;
-		fromText(point:number[], text:string):IRange;
-		fromText(point:{row:number; column:number;}, text:string):IRange;
-		fromText(text:string):IRange;
-
-		fromPointWithDelta(startPoint:IPoint, rowDelta:number, columnDelta:number):IRange;
-		fromPointWithDelta(startPoint:number[], rowDelta:number, columnDelta:number):IRange;
-		fromPointWithDelta(startPoint:{row:number; column:number;}, rowDelta:number, columnDelta:number):IRange;
-
-		new(point1:IPoint, point2:IPoint):IRange;
-		new(point1:number[], point2:IPoint):IRange;
-		new(point1:{row:number; column:number;}, point2:IPoint):IRange;
-
-		new(point1:IPoint, point2:number[]):IRange;
-		new(point1:number[], point2:number[]):IRange;
-		new(point1:{row:number; column:number;}, point2:number[]):IRange;
-
-		new(point1:IPoint, point2:{row:number; column:number;}):IRange;
-		new(point1:number[], point2:{row:number; column:number;}):IRange;
-		new(point1:{row:number; column:number;}, point2:{row:number; column:number;}):IRange;
-	}
-
-	interface IRange {
-		constructor:IRangeStatic;
-
-		start: IPoint;
-		end: IPoint;
-
-		serialize():number[][];
-		copy():IRange;
-		freeze():IRange;
-		isEqual(other:IRange):boolean;
-		isEqual(other:IPoint[]):boolean;
-
-		compare(object:IPoint[]):number;
-
-		compare(object:{start: IPoint; end: IPoint}):number;
-		compare(object:{start: number[]; end: IPoint}):number;
-		compare(object:{start: {row:number; column:number;}; end: IPoint}):number;
-
-		compare(object:{start: IPoint; end: number[]}):number;
-		compare(object:{start: number[]; end: number[]}):number;
-		compare(object:{start: {row:number; column:number;}; end: number[]}):number;
-
-		compare(object:{start: IPoint; end: {row:number; column:number;}}):number;
-		compare(object:{start: number[]; end: {row:number; column:number;}}):number;
-		compare(object:{start: {row:number; column:number;}; end: {row:number; column:number;}}):number;
-
-		isSingleLine():boolean;
-		coversSameRows(other:IRange):boolean;
-
-		add(object:IPoint[]):IRange;
-
-		add(object:{start: IPoint; end: IPoint}):IRange;
-		add(object:{start: number[]; end: IPoint}):IRange;
-		add(object:{start: {row:number; column:number;}; end: IPoint}):IRange;
-
-		add(object:{start: IPoint; end: number[]}):IRange;
-		add(object:{start: number[]; end: number[]}):IRange;
-		add(object:{start: {row:number; column:number;}; end: number[]}):IRange;
-
-		add(object:{start: IPoint; end: {row:number; column:number;}}):IRange;
-		add(object:{start: number[]; end: {row:number; column:number;}}):IRange;
-		add(object:{start: {row:number; column:number;}; end: {row:number; column:number;}}):IRange;
-
-		translate(startPoint:IPoint, endPoint:IPoint):IRange;
-		translate(startPoint:IPoint):IRange;
-
-		intersectsWith(otherRange:IRange):boolean;
-		containsRange(otherRange:IRange, exclusive:boolean):boolean;
-
-		containsPoint(point:IPoint, exclusive:boolean):boolean;
-		containsPoint(point:number[], exclusive:boolean):boolean;
-		containsPoint(point:{row:number; column:number;}, exclusive:boolean):boolean;
-
-		intersectsRow(row:number):boolean;
-		intersectsRowRange(startRow:number, endRow:number):boolean;
-		union(otherRange:IRange):IRange;
-		isEmpty():boolean;
-		toDelta():IPoint;
-		getRowCount():number;
-		getRows():number[];
-	}
-
-	interface IHistory {
-		// TBD
-	}
-
-	interface IMarkerManager {
-		// TBD
-	}
-
-	interface IMarker {
-		// TBD
-	}
-
-	interface IBufferPatch {
-		// TBD
-	}
-
-	interface ITextBufferStatic {
-		Point: IPointStatic;
-		Range: IRangeStatic;
-		newlineRegex:any;
-
-		new (text:string): ITextBuffer;
-		new (params:any): ITextBuffer;
-	}
-
-	interface ITextBuffer extends Emissary.IEmitter, Emissary.ISubscriber {
-		// Delegator.includeInto(TextBuffer);
-		// Serializable.includeInto(TextBuffer);
-
-		cachedText:string;
-		stoppedChangingDelay:number;
-		stoppedChangingTimeout:any;
-		cachedDiskContents:string;
-		conflict:boolean;
-		file:any; // pathwatcher.IFile
-		refcount:number;
-
-		lines:string[];
-		lineEndings:string[];
-		offsetIndex:any; // span-skip-list.SpanSkipList
-		history:IHistory;
-		markers:IMarkerManager;
-		loaded:boolean;
-		digestWhenLastPersisted:string;
-		modifiedWhenLastPersisted:boolean;
-		useSerializedText:boolean;
-
-		deserializeParams(params:any):any;
-		serializeParams():any;
-
-		getText():string;
-		getLines():string;
-		isEmpty():boolean;
-		getLineCount():number;
-		getLastRow():number;
-		lineForRow(row:number):string;
-		getLastLine():string;
-		lineEndingForRow(row:number):string;
-		lineLengthForRow(row:number):number;
-		setText(text:string):IRange;
-		setTextViaDiff(text:any):any[];
-		setTextInRange(range:IRange, text:string, normalizeLineEndings?:boolean):IRange;
-		insert(position:IPoint, text:string, normalizeLineEndings?:boolean):IRange;
-		append(text:string, normalizeLineEndings?:boolean):IRange;
-		delete(range:IRange):IRange;
-		deleteRow(row:number):IRange;
-		deleteRows(startRow:number, endRow:number):IRange;
-		buildPatch(oldRange:IRange, newText:string, normalizeLineEndings?:boolean):IBufferPatch;
-		applyPatch(patch:IBufferPatch):any;
-		getTextInRange(range:IRange):string;
-		clipRange(range:IRange):IRange;
-		clipPosition(position:IPoint):IPoint;
-		getFirstPosition():IPoint;
-		getEndPosition():IPoint;
-		getRange():IRange;
-		rangeForRow(row:number, includeNewline?:boolean):IRange;
-		characterIndexForPosition(position:IPoint):number;
-		positionForCharacterIndex(offset:number):IPoint;
-		getMaxCharacterIndex():number;
-		loadSync():ITextBuffer;
-		load():Q.IPromise<ITextBuffer>;
-		finishLoading():ITextBuffer;
-		handleTextChange(event:any):any;
-		destroy():any;
-		isAlive():boolean;
-		isDestroyed():boolean;
-		isRetained():boolean;
-		retain():ITextBuffer;
-		release():ITextBuffer;
-		subscribeToFile():any;
-		hasMultipleEditors():boolean;
-		reload():any;
-		updateCachedDiskContentsSync():string;
-		updateCachedDiskContents():Q.IPromise<string>;
-		getBaseName():string;
-		getPath():string;
-		getUri():string;
-		setPath(filePath:string):any;
-		save():void;
-		saveAs(filePath:string):any;
-		isModified():boolean;
-		isInConflict():boolean;
-		destroyMarker(id:any):any;
-		matchesInCharacterRange(regex:any, startIndex:any, endIndex:any):any[];
-		scan(regex:any, iterator:any):any;
-		backwardsScan(regex:any, iterator:any):any;
-		replace(regex:any, replacementText:any):any;
-		scanInRange(regex:any, range:any, iterator:any, reverse:any):any;
-		backwardsScanInRange(regex:any, range:any, iterator:any):any;
-		isRowBlank(row:number):boolean;
-		previousNonBlankRow(startRow:number):number;
-		nextNonBlankRow(startRow:number):number;
-		usesSoftTabs():boolean;
-		cancelStoppedChangingTimeout():any;
-		scheduleModifiedEvents():any;
-		emitModifiedStatusChanged(modifiedStatus:any):any;
-		logLines(start:number, end:number):void;
-
-		// delegate to history property
-		undo():any;
-		redo():any;
-		transact(fn:Function):any;
-		beginTransaction():any;
-		commitTransaction():any;
-		abortTransaction():any;
-		clearUndoStack():any;
-
-		// delegate to markers property
-		markRange(range:any, properties:any):any;
-		markPosition(range:any, properties:any):any;
-		getMarker(id:number):IMarker;
-		getMarkers():IMarker[];
-		getMarkerCount():number;
-	}
-}
-
-declare module "text-buffer" {
-	var _: TextBuffer.ITextBufferStatic;
-	export = _;
-}
diff --git a/text-buffer/tsconfig.json b/text-buffer/tsconfig.json
new file mode 100644
index 0000000000..1c1422dbb3
--- /dev/null
+++ b/text-buffer/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "text-buffer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/text-encoding/text-encoding.d.ts b/text-encoding/index.d.ts
similarity index 100%
rename from text-encoding/text-encoding.d.ts
rename to text-encoding/index.d.ts
diff --git a/text-encoding/text-encoding-tests.ts b/text-encoding/text-encoding-tests.ts
index e0274a04c0..f92e1f4bca 100644
--- a/text-encoding/text-encoding-tests.ts
+++ b/text-encoding/text-encoding-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="text-encoding.d.ts" />
+
 
 function test_encoder() {
     var text = "plain text";
diff --git a/text-encoding/tsconfig.json b/text-encoding/tsconfig.json
new file mode 100644
index 0000000000..7fb1077ff9
--- /dev/null
+++ b/text-encoding/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "text-encoding-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/threejs/detector.d.ts b/three/detector.d.ts
similarity index 100%
rename from threejs/detector.d.ts
rename to three/detector.d.ts
diff --git a/three/index.d.ts b/three/index.d.ts
new file mode 100644
index 0000000000..8a955d903a
--- /dev/null
+++ b/three/index.d.ts
@@ -0,0 +1,6582 @@
+// Type definitions for three.js r75
+// Project: http://mrdoob.github.com/three.js/
+// Definitions by: Kon <http://phyzkit.net/>, Satoru Kimura <https://github.com/gyohk>, Florent Poujol <https://github.com/florentpoujol>, SereznoKot <https://github.com/SereznoKot>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="detector.d.ts" />
+/// <reference path="three-canvasrenderer.d.ts" />
+/// <reference path="three-copyshader.d.ts" />
+/// <reference path="three-css3drenderer.d.ts" />
+/// <reference path="three-editorcontrols.d.ts" />
+/// <reference path="three-effectcomposer.d.ts" />
+/// <reference path="three-FirstPersonControls.d.ts" />
+/// <reference path="three-maskpass.d.ts" />
+/// <reference path="three-orbitcontrols.d.ts" />
+/// <reference path="three-orthographictrackballcontrols.d.ts" />
+/// <reference path="three-projector.d.ts" />
+/// <reference path="three-renderpass.d.ts" />
+/// <reference path="three-shaderpass.d.ts" />
+/// <reference path="three-trackballcontrols.d.ts" />
+/// <reference path="three-transformcontrols.d.ts" />
+/// <reference path="three-vrcontrols.d.ts" />
+/// <reference path="three-vreffect.d.ts" />
+
+declare namespace THREE {
+    export const REVISION: string;
+
+    // https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent.button
+    export enum MOUSE { LEFT, MIDDLE, RIGHT }
+
+    // GL STATE CONSTANTS
+    export enum CullFace { }
+    export const CullFaceNone: CullFace;
+    export const CullFaceBack: CullFace;
+    export const CullFaceFront: CullFace;
+    export const CullFaceFrontBack: CullFace;
+
+    export enum FrontFaceDirection { }
+    export const FrontFaceDirectionCW: FrontFaceDirection;
+    export const FrontFaceDirectionCCW: FrontFaceDirection;
+
+    // Shadowing Type
+    export enum ShadowMapType { }
+    export const BasicShadowMap: ShadowMapType;
+    export const PCFShadowMap: ShadowMapType;
+    export const PCFSoftShadowMap: ShadowMapType;
+
+    // MATERIAL CONSTANTS
+
+    // side
+    export enum Side { }
+    export const FrontSide: Side;
+    export const BackSide: Side;
+    export const DoubleSide: Side;
+
+    // shading
+    export enum Shading { }
+    export const FlatShading: Shading;
+    export const SmoothShading: Shading;
+
+    // colors
+    export enum Colors { }
+    export const NoColors: Colors;
+    export const FaceColors: Colors;
+    export const VertexColors: Colors;
+
+    // blending modes
+    export enum Blending { }
+    export const NoBlending: Blending;
+    export const NormalBlending: Blending;
+    export const AdditiveBlending: Blending;
+    export const SubtractiveBlending: Blending;
+    export const MultiplyBlending: Blending;
+    export const CustomBlending: Blending;
+
+    // custom blending equations
+    // (numbers start from 100 not to clash with other
+    //  mappings to OpenGL constants defined in Texture.js)
+    export enum BlendingEquation { }
+    export const AddEquation: BlendingEquation;
+    export const SubtractEquation: BlendingEquation;
+    export const ReverseSubtractEquation: BlendingEquation;
+    export const MinEquation: BlendingEquation;
+    export const MaxEquation: BlendingEquation;
+
+    // custom blending destination factors
+    export enum BlendingDstFactor { }
+    export const ZeroFactor: BlendingDstFactor;
+    export const OneFactor: BlendingDstFactor;
+    export const SrcColorFactor: BlendingDstFactor;
+    export const OneMinusSrcColorFactor: BlendingDstFactor;
+    export const SrcAlphaFactor: BlendingDstFactor;
+    export const OneMinusSrcAlphaFactor: BlendingDstFactor;
+    export const DstAlphaFactor: BlendingDstFactor;
+    export const OneMinusDstAlphaFactor: BlendingDstFactor;
+
+   // custom blending src factors
+    export enum BlendingSrcFactor { }
+    export const DstColorFactor: BlendingSrcFactor;
+    export const OneMinusDstColorFactor: BlendingSrcFactor;
+    export const SrcAlphaSaturateFactor: BlendingSrcFactor;
+
+    // depth modes
+    export enum DepthModes { }
+    export const NeverDepth: DepthModes;
+    export const AlwaysDepth: DepthModes;
+    export const LessDepth: DepthModes;
+    export const LessEqualDepth: DepthModes;
+    export const EqualDepth: DepthModes;
+    export const GreaterEqualDepth: DepthModes;
+    export const GreaterDepth: DepthModes;
+    export const NotEqualDepth: DepthModes;
+
+    // TEXTURE CONSTANTS
+    // Operations
+    export enum Combine { }
+    export const MultiplyOperation: Combine;
+    export const MixOperation: Combine;
+    export const AddOperation: Combine;
+
+    // Tone Mapping modes
+    export enum ToneMapping { }
+    export const NoToneMapping: ToneMapping;
+    export const LinearToneMapping: ToneMapping;
+    export const ReinhardToneMapping: ToneMapping;
+    export const Uncharted2ToneMapping: ToneMapping;
+    export const CineonToneMapping: ToneMapping;
+
+    // Mapping modes
+    export enum Mapping { }
+    export const UVMapping: Mapping;
+    export const CubeReflectionMapping: Mapping;
+    export const CubeRefractionMapping: Mapping;
+    export const EquirectangularReflectionMapping: Mapping;
+    export const EquirectangularRefractionMapping: Mapping;
+    export const SphericalReflectionMapping: Mapping;
+    export const CubeUVReflectionMapping: Mapping;
+    export const CubeUVRefractionMapping: Mapping;
+
+    // Wrapping modes
+    export enum Wrapping { }
+    export const RepeatWrapping: Wrapping;
+    export const ClampToEdgeWrapping: Wrapping;
+    export const MirroredRepeatWrapping: Wrapping;
+
+    // Filters
+    export enum TextureFilter { }
+    export const NearestFilter: TextureFilter;
+    export const NearestMipMapNearestFilter: TextureFilter;
+    export const NearestMipMapLinearFilter: TextureFilter;
+    export const LinearFilter: TextureFilter;
+    export const LinearMipMapNearestFilter: TextureFilter;
+    export const LinearMipMapLinearFilter: TextureFilter;
+
+    // Data types
+    export enum TextureDataType { }
+    export const UnsignedByteType: TextureDataType;
+    export const ByteType: TextureDataType;
+    export const ShortType: TextureDataType;
+    export const UnsignedShortType: TextureDataType;
+    export const IntType: TextureDataType;
+    export const UnsignedIntType: TextureDataType;
+    export const FloatType: TextureDataType;
+    export const HalfFloatType: TextureDataType;
+
+    // Pixel types
+    export enum PixelType { }
+    export const UnsignedShort4444Type: PixelType;
+    export const UnsignedShort5551Type: PixelType;
+    export const UnsignedShort565Type: PixelType;
+
+    // Pixel formats
+    export enum PixelFormat { }
+    export const AlphaFormat: PixelFormat;
+    export const RGBFormat: PixelFormat;
+    export const RGBAFormat: PixelFormat;
+    export const LuminanceFormat: PixelFormat;
+    export const LuminanceAlphaFormat: PixelFormat;
+    export const RGBEFormat: PixelFormat;
+
+    // Compressed texture formats
+    // DDS / ST3C Compressed texture formats
+    export enum CompressedPixelFormat { }
+    export const RGB_S3TC_DXT1_Format: CompressedPixelFormat;
+    export const RGBA_S3TC_DXT1_Format: CompressedPixelFormat;
+    export const RGBA_S3TC_DXT3_Format: CompressedPixelFormat;
+    export const RGBA_S3TC_DXT5_Format: CompressedPixelFormat;
+
+    // PVRTC compressed texture formats
+    export const RGB_PVRTC_4BPPV1_Format: CompressedPixelFormat;
+    export const RGB_PVRTC_2BPPV1_Format: CompressedPixelFormat;
+    export const RGBA_PVRTC_4BPPV1_Format: CompressedPixelFormat;
+    export const RGBA_PVRTC_2BPPV1_Format: CompressedPixelFormat;
+
+    // ETC compressed texture formats
+    export const RGB_ETC1_Format: CompressedPixelFormat;
+
+    // Loop styles for AnimationAction
+    export enum AnimationActionLoopStyles { }
+    export const LoopOnce: AnimationActionLoopStyles;
+    export const LoopRepeat: AnimationActionLoopStyles;
+    export const LoopPingPong: AnimationActionLoopStyles;
+
+    // Interpolation
+    export enum InterpolationModes { }
+    export const InterpolateDiscrete: InterpolationModes;
+    export const InterpolateLinear: InterpolationModes;
+    export const InterpolateSmooth: InterpolationModes;
+
+    // Interpolant ending modes
+    export enum InterpolationEndingModes { }
+    export const ZeroCurvatureEnding: InterpolationEndingModes;
+    export const ZeroSlopeEnding: InterpolationEndingModes;
+    export const WrapAroundEnding: InterpolationEndingModes;
+
+    // Triangle Draw modes
+    export enum TrianglesDrawModes { }
+    export const TrianglesDrawModesMode: TrianglesDrawModes;
+    export const TriangleStripDrawMode: TrianglesDrawModes;
+    export const TriangleFanDrawMode: TrianglesDrawModes;
+
+    // Texture Encodings
+    export enum TextureEncoding { }
+    export const LinearEncoding: TextureEncoding;
+    export const sRGBEncoding: TextureEncoding;
+    export const GammaEncoding: TextureEncoding;
+    export const RGBEEncoding: TextureEncoding;
+    export const LogLuvEncoding: TextureEncoding;
+    export const RGBM7Encoding: TextureEncoding;
+    export const RGBM16Encoding: TextureEncoding;
+    export const RGBDEncoding: TextureEncoding;
+
+    // log handlers
+    export function warn(message?: any, ...optionalParams: any[]): void;
+    export function error(message?: any, ...optionalParams: any[]): void;
+    export function log(message?: any, ...optionalParams: any[]): void;
+
+    // Animation ////////////////////////////////////////////////////////////////////////////////////////
+
+    export class AnimationClip {
+        constructor( name?: string, duration?: number, tracks?: KeyframeTrack[] );
+
+        name: string;
+        tracks: KeyframeTrack[];
+        duration: number;
+        results: any[];
+
+        resetDuration(): void;
+        trim(): AnimationClip;
+        optimize(): AnimationClip;
+
+        static CreateFromMorphTargetSequence( name: string, morphTargetSequence: MorphTarget[], fps: number ): AnimationClip;
+        static findByName( clipArray: AnimationClip, name: string ): AnimationClip;
+        static CreateClipsFromMorphTargetSequences( morphTargets: MorphTarget[], fps: number ): AnimationClip[];
+        static parse( json: any ): AnimationClip;
+        static parseAnimation( animation: any, bones: Bone[], nodeName: string ): AnimationClip;
+        static toJSON(): any;
+    }
+
+    export class AnimationMixer {
+        constructor(root: any);
+
+        time: number;
+        timeScale: number;
+
+        clipAction(clip: AnimationClip, root?: any): any; // returns THREE.AnimationMixer._Action
+        existingAction(clip: AnimationClip, root?: any): any; /// returns THREE.AnimationMixer._Action
+        stopAllAction(clip: AnimationClip, root?: any): AnimationMixer;
+        update(deltaTime: number): AnimationMixer;
+        getRoot(): any;
+        uncacheClip(clip: AnimationClip): void;
+        uncacheRoot(root: any): void;
+        uncazcheAction(clip: AnimationClip, root?: any): void;
+    }
+
+    export class AnimationObjectGroup {
+        constructor(...args: any[]);
+
+        uuid: string;
+        stats: {
+            bindingsPerObject: number;
+            objects: {
+                total: number;
+                inUse: number;
+            }
+        };
+
+        add(...args: any[]): void;
+        remove(...args: any[]): void;
+        uncache(...args: any[]): void;
+    }
+
+    export namespace AnimationUtils {
+        export function arraySlice(array: any, from: number, to: number): any;
+        export function convertArray(array: any, type: any, forceClone: boolean): any;
+        export function isTypedArray(object: any): boolean;
+        export function getKeyFrameOrder(times: number): number[];
+        export function sortedArray(values: any[], stride: number, order: number[]): any[];
+        export function flattenJSON(jsonKeys: string[], times: any[], values: any[], valuePropertyName: string): void;
+    }
+
+    export class KeyframeTrack {
+        constructor(name: string, times: any[], values: any[], interpolation: InterpolationModes);
+
+        name: string;
+        times: any[];
+        values: any[];
+
+        ValueTypeName: string;
+        TimeBufferType: Float32Array;
+        ValueBufferType: Float32Array;
+
+        DefaultInterpolation: InterpolationModes;
+
+        InterpolantFactoryMethodDiscrete(result: any): DiscreteInterpolant;
+        InterpolantFactoryMethodLinear(result: any): LinearInterpolant;
+        InterpolantFactoryMethodSmooth(result: any): CubicInterpolant;
+
+        setInterpolation(interpolation: InterpolationModes): void;
+        getInterpolation(): InterpolationModes;
+
+        getValuesize(): number;
+
+        shift( timeOffset: number ): KeyframeTrack;
+        scale( timeScale: number ): KeyframeTrack;
+        trim( startTime: number, endTime: number ): KeyframeTrack;
+        validate(): boolean;
+        optimize(): KeyframeTrack;
+
+        static parse(json: any): KeyframeTrack;
+        static toJSON(track: KeyframeTrack): any;
+    }
+
+    export class PropertyBinding {
+        constructor(rootNode: any, path: string, parsedPath?: any);
+
+        path: string;
+        parsedPath: any;
+        node: any;
+        rootNode: any;
+
+        getValue(targetArray: any, offset: number): any;
+        setValue(sourceArray: any, offset: number): void;
+        bind(): void;
+        unbind(): void;
+
+        BindingType: { [bindingType: string]: number };
+        Versioning: { [versioning: string]: number };
+
+        GetterByBindingType: Function[];
+        SetterByBindingTypeAndVersioning: Array<Function[]>;
+
+        static create(root: any, path: any, parsedPath?: any): PropertyBinding|PropertyBinding.Composite;
+        static parseTrackName(trackName: string): any;
+        static findNode(root: any, nodeName: string): any;
+    }
+
+    export namespace PropertyBinding {
+        export class Composite {
+            constructor(targetGroup: any, path: any, parsedPath?: any);
+
+            getValue(array: any, offset: number): any;
+            setValue(array: any, offset: number): void;
+            bind(): void;
+            unbind(): void;
+        }
+    }
+
+    export class PropertyMixer {
+        constructor(binding: any, typeName: string, valueSize: number);
+
+        binding: any;
+        valueSize: number;
+        buffer: any;
+        cumulativeWeight: number;
+        useCount: number;
+        referenceCount: number;
+
+        accumulate(accuIndex: number, weight: number): void;
+        apply(accuIndex: number): void;
+        saveOriginalState(): void;
+        restoreOriginalState(): void;
+    }
+
+    export class BooleanKeyframeTrack extends KeyframeTrack {
+        constructor(name: string, times: any[], values: any[]);
+    }
+
+    export class NumberKeyframeTrack extends KeyframeTrack {
+        constructor(name: string, times: any[], values: any[], interpolation: InterpolationModes);
+    }
+
+    export class QuaternionKeyframeTrack extends KeyframeTrack {
+        constructor(name: string, times: any[], values: any[], interpolation: InterpolationModes);
+    }
+
+    export class StringKeyframeTrack extends KeyframeTrack {
+        constructor(name: string, times: any[], values: any[], interpolation: InterpolationModes);
+    }
+
+    export class VectorKeyframeTrack extends KeyframeTrack {
+        constructor(name: string, times: any[], values: any[], interpolation: InterpolationModes);
+    }
+
+    // Cameras ////////////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Abstract base class for cameras. This class should always be inherited when you build a new camera.
+     */
+    export class Camera extends Object3D {
+        /**
+         * This constructor sets following properties to the correct type: matrixWorldInverse, projectionMatrix and projectionMatrixInverse.
+         */
+        constructor();
+
+        /**
+         * This is the inverse of matrixWorld. MatrixWorld contains the Matrix which has the world transform of the Camera.
+         */
+        matrixWorldInverse: Matrix4;
+
+        /**
+         * This is the matrix which contains the projection.
+         */
+        projectionMatrix: Matrix4;
+
+        getWorldDirection(optionalTarget?: Vector3): Vector3;
+
+        /**
+         * This make the camera look at the vector position in local space.
+         * @param vector point to look at
+         */
+        lookAt(vector: Vector3): void;
+
+        clone(): Camera;
+        copy(camera?: Camera): Camera;
+    }
+
+    export class CubeCamera extends Object3D {
+        constructor(near?: number, far?: number, cubeResolution?: number);
+
+        renderTarget: WebGLRenderTargetCube;
+
+        updateCubeMap(renderer: Renderer, scene: Scene): void;
+    }
+
+    /**
+     * Camera with orthographic projection
+     *
+     * @example
+     * var camera = new THREE.OrthographicCamera( width / - 2, width / 2, height / 2, height / - 2, 1, 1000 );
+     * scene.add( camera );
+     *
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/cameras/OrthographicCamera.js">src/cameras/OrthographicCamera.js</a>
+     */
+    export class OrthographicCamera extends Camera {
+        /**
+         * @param left Camera frustum left plane.
+         * @param right Camera frustum right plane.
+         * @param top Camera frustum top plane.
+         * @param bottom Camera frustum bottom plane.
+         * @param near Camera frustum near plane.
+         * @param far Camera frustum far plane.
+         */
+        constructor(left: number, right: number, top: number, bottom: number, near?: number, far?: number);
+
+        zoom: number;
+
+        /**
+         * Camera frustum left plane.
+         */
+        left: number;
+
+        /**
+         * Camera frustum right plane.
+         */
+        right: number;
+
+        /**
+         * Camera frustum top plane.
+         */
+        top: number;
+
+        /**
+         * Camera frustum bottom plane.
+         */
+        bottom: number;
+
+        /**
+         * Camera frustum near plane.
+         */
+        near: number;
+
+        /**
+         * Camera frustum far plane.
+         */
+        far: number;
+
+        /**
+         * Updates the camera projection matrix. Must be called after change of parameters.
+         */
+        updateProjectionMatrix(): void;
+        clone(): OrthographicCamera;
+        copy(source: OrthographicCamera): OrthographicCamera;
+        toJSON(meta?: any): any;
+    }
+
+    /**
+     * Camera with perspective projection.
+     *
+     * # example
+     *     var camera = new THREE.PerspectiveCamera( 45, width / height, 1, 1000 );
+     *     scene.add( camera );
+     *
+     * @source https://github.com/mrdoob/three.js/blob/master/src/cameras/PerspectiveCamera.js
+     */
+    export class PerspectiveCamera extends Camera {
+        /**
+         * @param fov Camera frustum vertical field of view. Default value is 50.
+         * @param aspect Camera frustum aspect ratio. Default value is 1.
+         * @param near Camera frustum near plane. Default value is 0.1.
+         * @param far Camera frustum far plane. Default value is 2000.
+         */
+        constructor(fov?: number, aspect?: number, near?: number, far?: number);
+
+        focalLength: number;
+        zoom: number;
+
+        /**
+         * Camera frustum vertical field of view, from bottom to top of view, in degrees.
+         */
+        fov: number;
+
+        /**
+         * Camera frustum aspect ratio, window width divided by window height.
+         */
+        aspect: number;
+
+        /**
+         * Camera frustum near plane.
+         */
+        near: number;
+
+        /**
+         * Camera frustum far plane.
+         */
+        far: number;
+
+        /**
+         * Uses focal length (in mm) to estimate and set FOV 35mm (fullframe) camera is used if frame size is not specified.
+         * Formula based on http://www.bobatkins.com/photography/technical/field_of_view.html
+         * @param focalLength focal length
+         * @param frameHeight frame size. Default value is 24.
+         */
+        setLens(focalLength: number, frameHeight?: number): void;
+
+        /**
+         * Sets an offset in a larger frustum. This is useful for multi-window or multi-monitor/multi-machine setups.
+         * For example, if you have 3x2 monitors and each monitor is 1920x1080 and the monitors are in grid like this:
+         *
+         *     +---+---+---+
+         *     | A | B | C |
+         *     +---+---+---+
+         *     | D | E | F |
+         *     +---+---+---+
+         *
+         * then for each monitor you would call it like this:
+         *
+         *     var w = 1920;
+         *     var h = 1080;
+         *     var fullWidth = w * 3;
+         *     var fullHeight = h * 2;
+         *
+         *     // A
+         *     camera.setViewOffset( fullWidth, fullHeight, w * 0, h * 0, w, h );
+         *     // B
+         *     camera.setViewOffset( fullWidth, fullHeight, w * 1, h * 0, w, h );
+         *     // C
+         *     camera.setViewOffset( fullWidth, fullHeight, w * 2, h * 0, w, h );
+         *     // D
+         *     camera.setViewOffset( fullWidth, fullHeight, w * 0, h * 1, w, h );
+         *     // E
+         *     camera.setViewOffset( fullWidth, fullHeight, w * 1, h * 1, w, h );
+         *     // F
+         *     camera.setViewOffset( fullWidth, fullHeight, w * 2, h * 1, w, h ); Note there is no reason monitors have to be the same size or in a grid.
+         *
+         * @param fullWidth full width of multiview setup
+         * @param fullHeight full height of multiview setup
+         * @param x horizontal offset of subcamera
+         * @param y vertical offset of subcamera
+         * @param width width of subcamera
+         * @param height height of subcamera
+         */
+        setViewOffset(fullWidth: number, fullHeight: number, x: number, y: number, width: number, height: number): void;
+
+        /**
+         * Updates the camera projection matrix. Must be called after change of parameters.
+         */
+        updateProjectionMatrix(): void;
+        clone(): PerspectiveCamera;
+        copy(source: PerspectiveCamera): PerspectiveCamera;
+        toJSON(meta?: any): any;
+    }
+
+    export class StereoCamera extends Camera {
+        constructor();
+
+        aspect: number;
+        cameraL: PerspectiveCamera;
+        cameraR: PerspectiveCamera;
+
+        update(camera: PerspectiveCamera): void;
+    }
+
+    // Core ///////////////////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/BufferAttribute.js">src/core/BufferAttribute.js</a>
+     */
+    export class BufferAttribute {
+        constructor(array: ArrayLike<number>, itemSize: number); // array parameter should be TypedArray.
+
+        uuid: string;
+        array: ArrayLike<number>;
+        itemSize: number;
+        dynamic: boolean;
+        updateRange: {offset:number, count:number};
+        version: number;
+        needsUpdate: boolean;
+        count: number;
+
+        setDynamic(dynamic: boolean): BufferAttribute;
+        clone(): BufferAttribute;
+        copy(source: BufferAttribute): BufferAttribute;
+        copyAt(index1: number, attribute: BufferAttribute, index2: number): BufferAttribute;
+        copyArray(array: ArrayLike<number>): BufferAttribute;
+        copyColorsArray(colors: {r:number, g:number, b:number}[]): BufferAttribute;
+        copyIndicesArray(indices: {a:number, b:number, c:number}[]): BufferAttribute;
+        copyVector2sArray(vectors: {x:number, y:number}[]): BufferAttribute;
+        copyVector3sArray(vectors: {x:number, y:number, z:number}[]): BufferAttribute;
+        copyVector4sArray(vectors: {x:number, y:number, z:number, w:number}[]): BufferAttribute;
+        set(value: ArrayLike<number>, offset?: number): BufferAttribute;
+        getX(index: number): number;
+        setX(index: number, x: number): BufferAttribute;
+        getY(index: number): number;
+        setY(index: number, y: number): BufferAttribute;
+        getZ(index: number): number;
+        setZ(index: number, z: number): BufferAttribute;
+        getW(index: number): number;
+        setW(index: number, z: number): BufferAttribute;
+        setXY(index: number, x: number, y: number): BufferAttribute;
+        setXYZ(index: number, x: number, y: number, z: number): BufferAttribute;
+        setXYZW(index: number, x: number, y: number, z: number, w: number): BufferAttribute;
+        clone(): BufferAttribute;
+
+        length: number; // deprecated, use count
+    }
+
+    export class Int8Attribute extends BufferAttribute {
+        constructor(array: any, itemSize: number);
+    }
+
+    export class Uint8Attribute extends BufferAttribute {
+        constructor(array: any, itemSize: number);
+    }
+
+    export class Uint8ClampedAttribute extends BufferAttribute {
+        constructor(array: any, itemSize: number);
+    }
+
+    export class Int16Attribute extends BufferAttribute {
+        constructor(array: any, itemSize: number);
+    }
+
+    export class Uint16Attribute extends BufferAttribute {
+        constructor(array: any, itemSize: number);
+    }
+
+    export class Int32Attribute extends BufferAttribute {
+        constructor(array: any, itemSize: number);
+    }
+
+    export class Uint32Attribute extends BufferAttribute {
+        constructor(array: any, itemSize: number);
+    }
+
+    export class Float32Attribute extends BufferAttribute {
+        constructor(array: any, itemSize: number);
+    }
+
+    export class Float64Attribute extends BufferAttribute {
+        constructor(array: any, itemSize: number);
+    }
+
+    // deprecated, use new THREE.BufferAttribute().setDynamic( true )
+    export class DynamicBufferAttribute extends BufferAttribute {}
+
+    /**
+     * This is a superefficent class for geometries because it saves all data in buffers.
+     * It reduces memory costs and cpu cycles. But it is not as easy to work with because of all the nessecary buffer calculations.
+     * It is mainly interesting when working with static objects.
+     *
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/BufferGeometry.js">src/core/BufferGeometry.js</a>
+     */
+    export class BufferGeometry {
+        /**
+         * This creates a new BufferGeometry. It also sets several properties to an default value.
+         */
+        constructor();
+
+        static MaxIndex: number;
+
+        /**
+         * Unique number of this buffergeometry instance
+         */
+        id: number;
+        uuid: string;
+        name: string;
+        type: string;
+        index: BufferAttribute;
+        attributes: BufferAttribute|InterleavedBufferAttribute[];
+        morphAttributes: any;
+        drawcalls: any; // deprecated, use groups
+        offsets: any; // deprecated, use groups
+        groups: {start: number, count: number, materialIndex?: number}[];
+        boundingBox: Box3;
+        boundingSphere: BoundingSphere;
+        drawRange: { start: number, count: number };
+
+        getIndex(): BufferAttribute;
+        setIndex( index: BufferAttribute ): void;
+
+        addAttribute(name: string, attribute: BufferAttribute|InterleavedBufferAttribute): BufferGeometry;
+
+        getAttribute(name: string): BufferAttribute|InterleavedBufferAttribute;
+        removeAttribute(name: string): BufferGeometry;
+
+        addGroup(start: number, count: number, materialIndex?: number): void;
+        clearGroups(): void;
+
+        setDrawRange(start: number, count: number): void;
+
+        /**
+         * Bakes matrix transform directly into vertex coordinates.
+         */
+        applyMatrix(matrix: Matrix4): BufferGeometry;
+
+        rotateX(angle: number): BufferGeometry;
+        rotateY(angle: number): BufferGeometry;
+        rotateZ(angle: number): BufferGeometry;
+        translate(x: number, y: number, z: number): BufferGeometry;
+        scale(x: number, y: number, z: number): BufferGeometry;
+        lookAt(v: Vector3): void;
+
+        center(): Vector3;
+
+        setFromObject(object: Object3D) : void;
+        updateFromObject(object: Object3D) : void;
+
+        fromGeometry(geometry: Geometry, settings?: any): BufferGeometry;
+
+        fromDirectGeometry(geometry: DirectGeometry): BufferGeometry;
+
+        /**
+         * Computes bounding box of the geometry, updating Geometry.boundingBox attribute.
+         * Bounding boxes aren't computed by default. They need to be explicitly computed, otherwise they are null.
+         */
+        computeBoundingBox(): void;
+
+        /**
+         * Computes bounding sphere of the geometry, updating Geometry.boundingSphere attribute.
+         * Bounding spheres aren't' computed by default. They need to be explicitly computed, otherwise they are null.
+         */
+        computeBoundingSphere(): void;
+
+        /**
+         * Computes vertex normals by averaging face normals.
+         */
+        computeVertexNormals(): void;
+
+        merge(geometry: BufferGeometry, offset: number): BufferGeometry;
+        normalizeNormals(): void;
+
+        toNonIndexed(): BufferGeometry;
+
+        toJSON(): any;
+        clone(): BufferGeometry;
+        copy(source: BufferGeometry): BufferGeometry;
+
+        /**
+         * Disposes the object from memory.
+         * You need to call this when you want the bufferGeometry removed while the application is running.
+         */
+        dispose(): void;
+
+        // EventDispatcher mixins
+        addEventListener(type: string, listener: (event: Event) => void ): void;
+        hasEventListener(type: string, listener: (event: Event) => void): void;
+        removeEventListener(type: string, listener: (event: Event) => void): void;
+        dispatchEvent(event: { type: string; [attachment: string]: any; }): void;
+
+        addIndex(index: any): void; // deprecated, use setIndex()
+        addAttribute(name: any, array: any, itemSize: any): any; // deprecated
+        addDrawCall(start: any, count: any, indexOffset?: any): void; // deprecated, use addGroup()
+        clearDrawCalls(): void; // deprecated, use clearGroups()
+        computeFaceNormals(): void; // deprecated
+    }
+
+    /**
+     * Object for keeping track of time.
+     *
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/Clock.js">src/core/Clock.js</a>
+     */
+    export class Clock {
+        /**
+         * @param autoStart Automatically start the clock.
+         */
+        constructor(autoStart?: boolean);
+
+        /**
+         * If set, starts the clock automatically when the first update is called.
+         */
+        autoStart: boolean;
+
+        /**
+         * When the clock is running, It holds the starttime of the clock.
+         * This counted from the number of milliseconds elapsed since 1 January 1970 00:00:00 UTC.
+         */
+        startTime: number;
+
+        /**
+         * When the clock is running, It holds the previous time from a update.
+         * This counted from the number of milliseconds elapsed since 1 January 1970 00:00:00 UTC.
+         */
+        oldTime: number;
+
+        /**
+         * When the clock is running, It holds the time elapsed between the start of the clock to the previous update.
+         * This parameter is in seconds of three decimal places.
+         */
+        elapsedTime: number;
+
+        /**
+         * This property keeps track whether the clock is running or not.
+         */
+        running: boolean;
+
+        /**
+         * Starts clock.
+         */
+        start(): void;
+
+        /**
+         * Stops clock.
+         */
+        stop(): void;
+
+        /**
+         * Get the seconds passed since the clock started.
+         */
+        getElapsedTime(): number;
+
+        /**
+         * Get the seconds passed since the last call to this method.
+         */
+        getDelta(): number;
+    }
+
+    /**
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/DirectGeometry.js">src/core/DirectGeometry.js</a>
+     */
+    export class DirectGeometry {
+        constructor();
+
+        id: number;
+        uuid: string;
+        name: string;
+        type: string;
+        indices: number[];
+        vertices: Vector3[];
+        normals: Vector3[];
+        colors: Color[];
+        uvs: Vector2[];
+        uvs2: Vector2[];
+        groups: {start: number, materialIndex: number}[];
+        morphTargets: MorphTarget[];
+        skinWeights: number[];
+        skinIndices: number[];
+        boundingBox: Box3;
+        boundingSphere: BoundingSphere;
+        verticesNeedUpdate: boolean;
+        normalsNeedUpdate: boolean;
+        colorsNeedUpdate: boolean;
+        uvsNeedUpdate: boolean;
+        groupsNeedUpdate: boolean;
+
+        computeBoundingBox(): void;
+        computeBoundingSphere(): void;
+        computeGroups(geometry: Geometry): void;
+        fromGeometry(geometry: Geometry): DirectGeometry;
+        dispose(): void;
+
+        // EventDispatcher mixins
+        addEventListener(type: string, listener: (event: Event) => void ): void;
+        hasEventListener(type: string, listener: (event: Event) => void): void;
+        removeEventListener(type: string, listener: (event: Event) => void): void;
+        dispatchEvent(event: { type: string; [attachment: string]: any; }): void;
+    }
+
+
+    /**
+     * JavaScript events for custom objects
+     *
+     * # Example
+     *     var Car = function () {
+     *
+     *         EventDispatcher.call( this );
+     *         this.start = function () {
+     *
+     *             this.dispatchEvent( { type: 'start', message: 'vroom vroom!' } );
+     *
+     *         };
+     *
+     *     };
+     *
+     *     var car = new Car();
+     *     car.addEventListener( 'start', function ( event ) {
+     *
+     *         alert( event.message );
+     *
+     *     } );
+     *     car.start();
+     *
+     * @source src/core/EventDispatcher.js
+     */
+    export class EventDispatcher {
+        /**
+         * Creates eventDispatcher object. It needs to be call with '.call' to add the functionality to an object.
+         */
+        constructor();
+
+        apply(object: any): void;
+
+        /**
+         * Adds a listener to an event type.
+         * @param type The type of the listener that gets removed.
+         * @param listener The listener function that gets removed.
+         */
+        addEventListener(type: string, listener: (event: Event) => void ): void;
+
+        /**
+         * Adds a listener to an event type.
+         * @param type The type of the listener that gets removed.
+         * @param listener The listener function that gets removed.
+         */
+        hasEventListener(type: string, listener: (event: Event) => void): void;
+
+        /**
+         * Removes a listener from an event type.
+         * @param type The type of the listener that gets removed.
+         * @param listener The listener function that gets removed.
+         */
+        removeEventListener(type: string, listener: (event: Event) => void): void;
+
+        /**
+         * Fire an event type.
+         * @param type The type of event that gets fired.
+         */
+        dispatchEvent(event: { type: string; [attachment: string]: any; }): void;
+    }
+
+    export interface Event {
+        type: string;
+        target: any;
+    }
+
+    /**
+     * Triangle face.
+     *
+     * # Example
+     *     var normal = new THREE.Vector3( 0, 1, 0 );
+     *     var color = new THREE.Color( 0xffaa00 );
+     *     var face = new THREE.Face3( 0, 1, 2, normal, color, 0 );
+     *
+     * @source https://github.com/mrdoob/three.js/blob/master/src/core/Face3.js
+     */
+    export class Face3 {
+        /**
+         * @param a Vertex A index.
+         * @param b Vertex B index.
+         * @param c Vertex C index.
+         * @param normal Face normal or array of vertex normals.
+         * @param color Face color or array of vertex colors.
+         * @param materialIndex Material index.
+         */
+        constructor(a: number, b: number, c: number, normal?: Vector3, color?: Color, materialIndex?: number);
+        constructor(a: number, b: number, c: number, normal?: Vector3, vertexColors?: Color[], materialIndex?: number);
+        constructor(a: number, b: number, c: number, vertexNormals?: Vector3[], color?: Color, materialIndex?: number);
+        constructor(a: number, b: number, c: number, vertexNormals?: Vector3[], vertexColors?: Color[], materialIndex?: number);
+
+        /**
+         * Vertex A index.
+         */
+        a: number;
+
+        /**
+         * Vertex B index.
+         */
+        b: number;
+
+        /**
+         * Vertex C index.
+         */
+        c: number;
+
+        /**
+         * Face normal.
+         */
+        normal: Vector3;
+
+        /**
+         * Array of 4 vertex normals.
+         */
+        vertexNormals: Vector3[];
+
+        /**
+         * Face color.
+         */
+        color: Color;
+
+        /**
+         * Array of 4 vertex normals.
+         */
+        vertexColors: Color[];
+
+        /**
+         * Material index (points to {@link Geometry.materials}).
+         */
+        materialIndex: number;
+
+        clone(): Face3;
+        copy(source: Face3): Face3;
+    }
+
+    export class Face4 extends Face3 {} // deprecated, use Face3
+
+    export interface MorphTarget {
+        name: string;
+        vertices: Vector3[];
+    }
+
+    export interface MorphColor {
+        name: string;
+        colors: Color[];
+    }
+
+    export interface MorphNormals {
+        name: string;
+        normals: Vector3[];
+    }
+
+    export interface BoundingSphere {
+        radius: number;
+    }
+
+    export let GeometryIdCount: number;
+
+    /**
+     * Base class for geometries
+     *
+     * # Example
+     *     var geometry = new THREE.Geometry();
+     *     geometry.vertices.push( new THREE.Vector3( -10, 10, 0 ) );
+     *     geometry.vertices.push( new THREE.Vector3( -10, -10, 0 ) );
+     *     geometry.vertices.push( new THREE.Vector3( 10, -10, 0 ) );
+     *     geometry.faces.push( new THREE.Face3( 0, 1, 2 ) );
+     *     geometry.computeBoundingSphere();
+     *
+     * @see https://github.com/mrdoob/three.js/blob/master/src/core/Geometry.js
+     */
+    export class Geometry {
+        constructor();
+
+        /**
+         * Unique number of this geometry instance
+         */
+        id: number;
+
+        uuid: string;
+
+        /**
+         * Name for this geometry. Default is an empty string.
+         */
+        name: string;
+
+        type: string;
+
+        /**
+         * The array of vertices hold every position of points of the model.
+         * To signal an update in this array, Geometry.verticesNeedUpdate needs to be set to true.
+         */
+        vertices: Vector3[];
+
+        /**
+         * Array of vertex colors, matching number and order of vertices.
+         * Used in ParticleSystem, Line and Ribbon.
+         * Meshes use per-face-use-of-vertex colors embedded directly in faces.
+         * To signal an update in this array, Geometry.colorsNeedUpdate needs to be set to true.
+         */
+        colors: Color[];
+
+        /**
+         * Array of triangles or/and quads.
+         * The array of faces describe how each vertex in the model is connected with each other.
+         * To signal an update in this array, Geometry.elementsNeedUpdate needs to be set to true.
+         */
+        faces: Face3[];
+
+        /**
+         * Array of face UV layers.
+         * Each UV layer is an array of UV matching order and number of vertices in faces.
+         * To signal an update in this array, Geometry.uvsNeedUpdate needs to be set to true.
+         */
+        faceVertexUvs: Vector2[][][];
+
+        /**
+         * Array of morph targets. Each morph target is a Javascript object:
+         *
+         *     { name: "targetName", vertices: [ new THREE.Vector3(), ... ] }
+         *
+         * Morph vertices match number and order of primary vertices.
+         */
+        morphTargets: MorphTarget[];
+
+        /**
+         * Array of morph normals. Morph normals have similar structure as morph targets, each normal set is a Javascript object:
+         *
+         *     morphNormal = { name: "NormalName", normals: [ new THREE.Vector3(), ... ] }
+         */
+        morphNormals: MorphNormals[];
+
+        /**
+         * Array of skinning weights, matching number and order of vertices.
+         */
+        skinWeights: number[];
+
+        /**
+         * Array of skinning indices, matching number and order of vertices.
+         */
+        skinIndices: number[];
+
+        /**
+         *
+         */
+        lineDistances: number[];
+
+        /**
+         * Bounding box.
+         */
+        boundingBox: Box3;
+
+        /**
+         * Bounding sphere.
+         */
+        boundingSphere: BoundingSphere;
+
+        /**
+         * Set to true if the vertices array has been updated.
+         */
+        verticesNeedUpdate: boolean;
+
+        /**
+         * Set to true if the faces array has been updated.
+         */
+        elementsNeedUpdate: boolean;
+
+        /**
+         * Set to true if the uvs array has been updated.
+         */
+        uvsNeedUpdate: boolean;
+
+        /**
+         * Set to true if the normals array has been updated.
+         */
+        normalsNeedUpdate: boolean;
+
+        /**
+         * Set to true if the colors array has been updated.
+         */
+        colorsNeedUpdate: boolean;
+
+        /**
+         * Set to true if the linedistances array has been updated.
+         */
+        lineDistancesNeedUpdate: boolean;
+
+        /**
+         *
+         */
+        groupsNeedUpdate: boolean;
+
+        /**
+         * Bakes matrix transform directly into vertex coordinates.
+         */
+        applyMatrix(matrix: Matrix4): Geometry;
+
+        rotateX(angle: number): Geometry;
+        rotateY(angle: number): Geometry;
+        rotateZ(angle: number): Geometry;
+
+        translate(x: number, y: number, z: number): Geometry;
+        scale(x: number, y: number, z: number): Geometry;
+        lookAt( vector: Vector3 ): void;
+
+        fromBufferGeometry(geometry: BufferGeometry): Geometry;
+
+        center(): Vector3;
+
+        normalize(): Geometry;
+
+        /**
+         * Computes face normals.
+         */
+        computeFaceNormals(): void;
+
+        /**
+         * Computes vertex normals by averaging face normals.
+         * Face normals must be existing / computed beforehand.
+         */
+        computeVertexNormals(areaWeighted?: boolean): void;
+
+        /**
+         * Computes morph normals.
+         */
+        computeMorphNormals(): void;
+
+        computeLineDistances(): void;
+
+        /**
+         * Computes bounding box of the geometry, updating {@link Geometry.boundingBox} attribute.
+         */
+        computeBoundingBox(): void;
+
+        /**
+         * Computes bounding sphere of the geometry, updating Geometry.boundingSphere attribute.
+         * Neither bounding boxes or bounding spheres are computed by default. They need to be explicitly computed, otherwise they are null.
+         */
+        computeBoundingSphere(): void;
+
+        merge(geometry: Geometry, matrix: Matrix, materialIndexOffset?: number): void;
+
+        mergeMesh(mesh: Mesh): void;
+
+        /**
+         * Checks for duplicate vertices using hashmap.
+         * Duplicated vertices are removed and faces' vertices are updated.
+         */
+        mergeVertices(): number;
+
+        sortFacesByMaterialIndex(): void;
+
+        toJSON(): any;
+
+        /**
+         * Creates a new clone of the Geometry.
+         */
+        clone(): Geometry;
+
+        copy(source: Geometry): Geometry;
+
+        /**
+         * Removes The object from memory.
+         * Don't forget to call this method when you remove an geometry because it can cuase meomory leaks.
+         */
+        dispose(): void;
+
+
+        //These properties do not exist in a normal Geometry class, but if you use the instance that was passed by JSONLoader, it will be added.
+        bones: Bone[];
+        animation: AnimationClip;
+        animations: AnimationClip[];
+
+        // EventDispatcher mixins
+        addEventListener(type: string, listener: (event: Event) => void ): void;
+        hasEventListener(type: string, listener: (event: Event) => void): void;
+        removeEventListener(type: string, listener: (event: Event) => void): void;
+        dispatchEvent(event: { type: string; [attachment: string]: any; }): void;
+    }
+
+    export namespace GeometryUtils { // deprecated
+        export function merge(goemetry1: any, goemetry2: any, materialIndexOffset?: any): any; // deprecated, use geometry.merge( geometry2, matrix, materialIndexOffset )
+        export function center(geometry: any): any; // deprecated, use geometry.center()
+    }
+
+    /**
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/InstancedBufferAttribute.js">src/core/InstancedBufferAttribute.js</a>
+     */
+    export class InstancedBufferAttribute extends BufferAttribute {
+        constructor(data: ArrayLike<number>, itemSize: number, meshPerAttribute?: number);
+        
+        meshPerAttribute: number;
+
+        clone(): InstancedBufferAttribute;
+        copy(source: InstancedBufferAttribute): InstancedBufferAttribute;
+    }
+
+    /**
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/InstancedBufferGeometry.js">src/core/InstancedBufferGeometry.js</a>
+     */
+    export class InstancedBufferGeometry extends BufferGeometry {
+        constructor();
+
+        groups: {start:number, count:number, instances:number}[];
+        maxInstancedCount: number;
+        
+        addGroup(start: number, count: number, instances: number): void;
+        clone(): InstancedBufferGeometry;
+        copy(source: InstancedBufferGeometry): InstancedBufferGeometry;
+    }
+
+    /**
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/InterleavedBuffer.js">src/core/InterleavedBuffer.js</a>
+     */
+    export class InterleavedBuffer {
+        constructor(array: ArrayLike<number>, stride: number);
+
+        array: ArrayLike<number>;
+        stride: number;
+        dynamic: boolean;
+        updateRange: { offset: number; count: number };
+        version: number;
+        length: number;
+        count: number;
+        needsUpdate: boolean;
+
+        setDynamic(dynamic: boolean): InterleavedBuffer;
+        clone(): InterleavedBuffer;
+        copy(source: InterleavedBuffer): InterleavedBuffer;
+        copyAt(index1: number, attribute: InterleavedBufferAttribute, index2: number): InterleavedBuffer;
+        set(value: ArrayLike<number>, index: number): InterleavedBuffer;
+        clone(): InterleavedBuffer;
+    }
+
+    /**
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/InstancedInterleavedBuffer.js">src/core/InstancedInterleavedBuffer.js</a>
+     */
+    export class InstancedInterleavedBuffer extends InterleavedBuffer {
+        constructor(array: ArrayLike<number>, stride: number, meshPerAttribute?: number);
+        
+        meshPerAttribute: number;
+
+        clone(): InstancedInterleavedBuffer;
+        copy(source: InstancedInterleavedBuffer): InstancedInterleavedBuffer;
+    }
+
+    /**
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/InterleavedBufferAttribute.js">src/core/InterleavedBufferAttribute.js</a>
+     */
+    export class InterleavedBufferAttribute {
+        constructor(interleavedBuffer: InterleavedBuffer, itemSize: number, offset: number);
+
+        uuid: string;
+        data: InterleavedBuffer;
+        itemSize: number;
+        offset: number;
+        count: number;
+
+        getX(index: number): number;
+        setX(index: number, x: number): InterleavedBufferAttribute;
+        getY(index: number): number;
+        setY(index: number, y: number): InterleavedBufferAttribute;
+        getZ(index: number): number;
+        setZ(index: number, z: number): InterleavedBufferAttribute;
+        getW(index: number): number;
+        setW(index: number, z: number): InterleavedBufferAttribute;
+        setXY(index: number, x: number, y: number): InterleavedBufferAttribute;
+        setXYZ(index: number, x: number, y: number, z: number): InterleavedBufferAttribute;
+        setXYZW(index: number, x: number, y: number, z: number, w: number): InterleavedBufferAttribute;
+
+        length: number; // deprecated, use count instead
+    }
+
+    export let Object3DIdCount: number;
+
+    /**
+     * Base class for scene graph objects
+     */
+    export class Object3D {
+        constructor();
+
+        /**
+         * Unique number of this object instance.
+         */
+        id: number;
+
+        /**
+         *
+         */
+        uuid: string;
+
+        /**
+         * Optional name of the object (doesn't need to be unique).
+         */
+        name: string;
+
+        type: string;
+
+        /**
+         * Object's parent in the scene graph.
+         */
+        parent: Object3D;
+
+        /**
+         * Array with object's children.
+         */
+        children: Object3D[];
+
+        /**
+         * Up direction.
+         */
+        up: Vector3;
+
+        /**
+         * Object's local position.
+         */
+        position: Vector3;
+
+        /**
+         * Object's local rotation (Euler angles), in radians.
+         */
+        rotation: Euler;
+        eulerOrder: string; // deprecated, use rotation.order
+
+        /**
+         * Global rotation.
+         */
+        quaternion: Quaternion;
+
+        /**
+         * Object's local scale.
+         */
+        scale: Vector3;
+
+        modelViewMatrix: Matrix4;
+
+        normalMatrix: Matrix3;
+
+        /**
+         * When this is set, then the rotationMatrix gets calculated every frame.
+         */
+        rotationAutoUpdate: boolean;
+
+        /**
+         * Local transform.
+         */
+        matrix: Matrix4;
+
+        /**
+         * The global transform of the object. If the Object3d has no parent, then it's identical to the local transform.
+         */
+        matrixWorld: Matrix4;
+
+        /**
+         * When this is set, it calculates the matrix of position, (rotation or quaternion) and scale every frame and also recalculates the matrixWorld property.
+         */
+        matrixAutoUpdate: boolean;
+
+        /**
+         * When this is set, it calculates the matrixWorld in that frame and resets this property to false.
+         */
+        matrixWorldNeedsUpdate: boolean;
+
+        layers: Layers;
+        /**
+         * Object gets rendered if true.
+         */
+        visible: boolean;
+
+        /**
+         * Gets rendered into shadow map.
+         */
+        castShadow: boolean;
+
+        /**
+         * Material gets baked in shadow receiving.
+         */
+        receiveShadow: boolean;
+
+        /**
+         * When this is set, it checks every frame if the object is in the frustum of the camera. Otherwise the object gets drawn every frame even if it isn't visible.
+         */
+        frustumCulled: boolean;
+
+        renderOrder: number;
+
+        /**
+         * An object that can be used to store custom data about the Object3d. It should not hold references to functions as these will not be cloned.
+         */
+        userData: any;
+
+        /**
+         *
+         */
+        static DefaultUp: Vector3;
+        static DefaultMatrixAutoUpdate: boolean;
+
+        /**
+         * This updates the position, rotation and scale with the matrix.
+         */
+        applyMatrix(matrix: Matrix4): void;
+
+        /**
+         *
+         */
+        setRotationFromAxisAngle(axis: Vector3, angle: number): void;
+
+        /**
+         *
+         */
+        setRotationFromEuler(euler: Euler): void;
+
+        /**
+         *
+         */
+        setRotationFromMatrix(m: Matrix4): void;
+
+        /**
+         *
+         */
+        setRotationFromQuaternion(q: Quaternion): void;
+
+        /**
+         * Rotate an object along an axis in object space. The axis is assumed to be normalized.
+         * @param axis  A normalized vector in object space.
+         * @param angle  The angle in radians.
+         */
+        rotateOnAxis(axis: Vector3, angle: number): Object3D;
+
+        /**
+         *
+         * @param angle
+         */
+        rotateX(angle: number): Object3D;
+
+        /**
+         *
+         * @param angle
+         */
+        rotateY(angle: number): Object3D;
+
+        /**
+         *
+         * @param angle
+         */
+        rotateZ(angle: number): Object3D;
+
+        /**
+         * @param axis  A normalized vector in object space.
+         * @param distance  The distance to translate.
+         */
+        translateOnAxis(axis: Vector3, distance: number): Object3D;
+        translate(distance: number, axis: Vector3): Object3D; // deprecated, use translateOnAxis(axis, distance)
+
+        /**
+         * Translates object along x axis by distance.
+         * @param distance Distance.
+         */
+        translateX(distance: number): Object3D;
+
+        /**
+         * Translates object along y axis by distance.
+         * @param distance Distance.
+         */
+        translateY(distance: number): Object3D;
+
+        /**
+         * Translates object along z axis by distance.
+         * @param distance Distance.
+         */
+        translateZ(distance: number): Object3D;
+
+        /**
+         * Updates the vector from local space to world space.
+         * @param vector A local vector.
+         */
+        localToWorld(vector: Vector3): Vector3;
+
+        /**
+         * Updates the vector from world space to local space.
+         * @param vector A world vector.
+         */
+        worldToLocal(vector: Vector3): Vector3;
+
+        /**
+         * Rotates object to face point in space.
+         * @param vector A world vector to look at.
+         */
+        lookAt(vector: Vector3): void;
+
+        /**
+         * Adds object as child of this object.
+         */
+        add(object: Object3D): void;
+
+        /**
+         * Removes object as child of this object.
+         */
+        remove(object: Object3D): void;
+
+        /**
+         * Searches through the object's children and returns the first with a matching id, optionally recursive.
+         * @param id  Unique number of the object instance
+         */
+        getObjectById(id: number): Object3D;
+
+        /**
+         * Searches through the object's children and returns the first with a matching name, optionally recursive.
+         * @param name  String to match to the children's Object3d.name property.
+         */
+        getObjectByName(name: string): Object3D;
+
+        getObjectByProperty( name: string, value: string ): Object3D;
+
+        getWorldPosition(optionalTarget?: Vector3): Vector3;
+        getWorldQuaternion(optionalTarget?: Quaternion): Quaternion;
+        getWorldRotation(optionalTarget?: Euler): Euler;
+        getWorldScale(optionalTarget?: Vector3): Vector3;
+        getWorldDirection(optionalTarget?: Vector3): Vector3;
+
+        raycast(raycaster: Raycaster, intersects: any): void;
+
+        traverse(callback: (object: Object3D) => any): void;
+
+        traverseVisible(callback: (object: Object3D) => any): void;
+
+        traverseAncestors(callback: (object: Object3D) => any): void;
+
+        /**
+         * Updates local transform.
+         */
+        updateMatrix(): void;
+
+        /**
+         * Updates global transform of the object and its children.
+         */
+        updateMatrixWorld(force: boolean): void;
+
+        toJSON(meta?: { geometries: any, materials: any, textures: any, images: any }): any;
+
+        clone(recursive?: boolean): Object3D;
+
+        /**
+         *
+         * @param object
+         * @param recursive
+         */
+        copy(source: Object3D, recursive?: boolean): Object3D;
+
+        // EventDispatcher mixins
+        addEventListener(type: string, listener: (event: Event) => void ): void;
+        hasEventListener(type: string, listener: (event: Event) => void): void;
+        removeEventListener(type: string, listener: (event: Event) => void): void;
+        dispatchEvent(event: { type: string; [attachment: string]: any; }): void;
+
+        getChildByName(name: string): Object3D; // deprecated, use getObjectByName()
+    }
+
+    export interface Intersection {
+        distance: number;
+        distanceToRay: number;
+        point: Vector3;
+        index: number;
+        face: Face3;
+        faceIndex: number;
+        object: Object3D;
+    }
+
+    export interface RaycasterParameters {
+        Mesh?: any;
+        Line?: any;
+        LOD?: any;
+        Points?: { threshold: number };
+        Sprite?: any;
+    }
+
+    export class Raycaster {
+        constructor(origin?: Vector3, direction?: Vector3, near?: number, far?: number);
+
+        ray: Ray;
+        near: number;
+        far: number;
+        params: RaycasterParameters;
+        precision: number;
+        linePrecision: number;
+        
+        set(origin: Vector3, direction: Vector3): void;
+        setFromCamera(coords: { x: number; y: number;}, camera: Camera ): void;
+        intersectObject(object: Object3D, recursive?: boolean): Intersection[];
+        intersectObjects(objects: Object3D[], recursive?: boolean): Intersection[];
+    }
+
+    export class Layers {
+        constructor();
+
+        mask: number;
+
+        set(channel: number): void;
+        enable(channel: number): void;
+        toggle(channel: number): void;
+        disable(channel: number): void;
+        test(layers: Layers): boolean;
+    }
+
+    export class Font {
+        constructor(data: any);
+
+        data: any;
+
+        generateShapes(text: string, size: number, divisions: number): any[];
+    }
+
+    // Lights //////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Abstract base class for lights.
+     */
+    export class Light extends Object3D {
+        constructor(hex?: number|string, intensity?: number);
+
+        color: Color;
+        intensity: number;
+        receiveShadow: boolean;
+        shadow: LightShadow;
+        shadowCameraFov: any; // deprecated, use shadow.camera.fov
+        shadowCameraLeft: any; // deprecated, use shadow.camera.left
+        shadowCameraRight: any; // deprecated, use shadow.camera.right
+        shadowCameraTop: any; // deprecated, use shadow.camera.top
+        shadowCameraBottom: any; // deprecated, use shadow.camera.bottom
+        shadowCameraNear: any; // deprecated, use shadow.camera.near
+        shadowCameraFar: any; // deprecated, use shadow.camera.far
+        shadowBias: any; // deprecated, use shadow.bias
+        shadowMapWidth: any; // deprecated, use shadow.mapSize.width
+        shadowMapHeight: any; // deprecated, use shadow.mapSize.height
+
+        copy(source: Light): Light;
+        clone(recursive?: boolean): Light;
+    }
+
+    export class LightShadow {
+        constructor(camera: Camera);
+
+        camera: Camera;
+        bias: number;
+        radius: number;
+        mapSize: Vector2;
+        map: RenderTarget;
+        matrix: Matrix4;
+
+        copy(source: LightShadow): LightShadow;
+        clone(recursive?: boolean): LightShadow;
+    }
+
+    /**
+     * This light's color gets applied to all the objects in the scene globally.
+     *
+     * # example
+     *     var light = new THREE.AmbientLight( 0x404040 ); // soft white light
+     *     scene.add( light );
+     *
+     * @source https://github.com/mrdoob/three.js/blob/master/src/lights/AmbientLight.js
+     */
+    export class AmbientLight extends Light {
+        /**
+         * This creates a Ambientlight with a color.
+         * @param hex Numeric value of the RGB component of the color.
+         */
+        constructor(hex?: number|string, intensity?: number);
+
+        castShadow: boolean;
+
+        copy(source: AmbientLight): AmbientLight;
+        clone(recursive?: boolean): AmbientLight;
+    }
+
+    /**
+     * Affects objects using MeshLambertMaterial or MeshPhongMaterial.
+     *
+     * @example
+     * // White directional light at half intensity shining from the top.
+     * var directionalLight = new THREE.DirectionalLight( 0xffffff, 0.5 );
+     * directionalLight.position.set( 0, 1, 0 );
+     * scene.add( directionalLight );
+     *
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/lights/DirectionalLight.js">src/lights/DirectionalLight.js</a>
+     */
+    export class DirectionalLight extends Light {
+        constructor(hex?: number|string, intensity?: number);
+
+        /**
+         * Target used for shadow camera orientation.
+         */
+        target: Object3D;
+
+        /**
+         * Light's intensity.
+         * Default — 1.0.
+         */
+        intensity: number;
+
+        shadow: LightShadow;
+
+        copy(source: DirectionalLight): DirectionalLight;
+        clone(recursive?: boolean): HemisphereLight;
+    }
+
+    export class HemisphereLight extends Light {
+        constructor(skyColorHex?: number|string, groundColorHex?: number|string, intensity?: number);
+
+        groundColor: Color;
+        intensity: number;
+
+        copy(source: HemisphereLight): HemisphereLight;
+        clone(recursive?: boolean): HemisphereLight;
+    }
+
+    /**
+     * Affects objects using {@link MeshLambertMaterial} or {@link MeshPhongMaterial}.
+     *
+     * @example
+     * var light = new THREE.PointLight( 0xff0000, 1, 100 );
+     * light.position.set( 50, 50, 50 );
+     * scene.add( light );
+     */
+    export class PointLight extends Light {
+        constructor(hex?: number|string, intensity?: number, distance?: number, decay?: number);
+
+        /*
+         * Light's intensity.
+         * Default - 1.0.
+         */
+        intensity: number;
+
+        /**
+         * If non-zero, light will attenuate linearly from maximum intensity at light position down to zero at distance.
+         * Default — 0.0.
+         */
+        distance: number;
+
+        decay: number;
+        shadow: LightShadow;
+        power: number;
+
+        copy(source: PointLight): PointLight;
+        clone(recursive?: boolean): PointLight;
+    }
+
+    /**
+     * A point light that can cast shadow in one direction.
+     */
+    export class SpotLight extends Light {
+        constructor(hex?: number|string, intensity?: number, distance?: number, angle?: number, exponent?: number, decay?: number);
+
+        /**
+         * Spotlight focus points at target.position.
+         * Default position — (0,0,0).
+         */
+        target: Object3D;
+
+        /**
+         * Light's intensity.
+         * Default — 1.0.
+         */
+        intensity: number;
+
+        /**
+         * If non-zero, light will attenuate linearly from maximum intensity at light position down to zero at distance.
+         * Default — 0.0.
+         */
+        distance: number;
+
+        /*
+         * Maximum extent of the spotlight, in radians, from its direction.
+         * Default — Math.PI/2.
+         */
+        angle: number;
+
+        /**
+         * Rapidity of the falloff of light from its target direction.
+         * Default — 10.0.
+         */
+        exponent: number;
+
+        decay: number;
+        shadow: LightShadow;
+        power: number;
+
+        clone(recursive?: boolean): SpotLight;
+        copy(source: PointLight): SpotLight;
+    }
+
+    // Loaders //////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Base class for implementing loaders.
+     *
+     * Events:
+     *     load
+     *         Dispatched when the image has completed loading
+     *         content — loaded image
+     *
+     *     error
+     *
+     *          Dispatched when the image can't be loaded
+     *          message — error message
+     */
+    export class Loader {
+        constructor();
+
+        /**
+         * Will be called when load starts.
+         * The default is a function with empty body.
+         */
+        onLoadStart: () => void;
+
+        /**
+         * Will be called while load progresses.
+         * The default is a function with empty body.
+         */
+        onLoadProgress: () => void;
+
+        /**
+         * Will be called when load completes.
+         * The default is a function with empty body.
+         */
+        onLoadComplete: () => void;
+
+        /**
+         * default — null.
+         * If set, assigns the crossOrigin attribute of the image to the value of crossOrigin, prior to starting the load.
+         */
+        crossOrigin: string;
+
+        extractUrlBase(url: string): string;
+        initMaterials(materials: Material[], texturePath: string): Material[];
+        createMaterial(m: Material, texturePath: string, crossOrigin?: string): boolean;
+
+        static Handlers: LoaderHandler;
+    }
+
+    export interface LoaderHandler{
+        handlers: any[];
+
+        add(regex: string, loader: Loader): void;
+        get(file: string): Loader;
+    }
+
+    export class XHRLoader {
+        constructor(manager?: LoadingManager);
+
+        manager: LoadingManager;
+        path: string;
+        responseType: string;
+        withCredentials: boolean;
+
+        load(url: string, onLoad?: (responseText: string) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): any;
+        setPath(path: string): void;
+        setResponseType(responseType: string): void;
+        setWithCredentials(withCredentials: boolean): void;
+    }
+
+    export class FontLoader {
+        constructor(manager?: LoadingManager);
+
+        manager: LoadingManager;
+
+        load(url: string, onLoad?: (responseText: string) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): void;
+    }
+
+    /**
+     * A loader for loading an image.
+     * Unlike other loaders, this one emits events instead of using predefined callbacks. So if you're interested in getting notified when things happen, you need to add listeners to the object.
+     */
+    export class ImageLoader {
+        constructor(manager?: LoadingManager);
+
+        manager: LoadingManager;
+        crossOrigin: string;
+        path: string;
+
+        /**
+         * Begin loading from url
+         * @param url
+         */
+        load(url: string, onLoad?: (image: HTMLImageElement) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): HTMLImageElement;
+        setCrossOrigin(crossOrigin: string): void;
+        setPath(value: any): void;
+    }
+
+    /**
+     * A loader for loading objects in JSON format.
+     */
+    export class JSONLoader extends Loader {
+        constructor(manager?: LoadingManager);
+
+        manager: LoadingManager;
+        withCredentials: boolean;
+        statusDomElement: HTMLElement; // readonly and deprecated
+
+        load(url: string, onLoad?: (geometry: Geometry, materials: Material[]) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): void;
+        setTexturePath( value: string ): void;
+        parse(json: any, texturePath?: string): { geometry: Geometry; materials?: Material[] };
+    }
+
+    /**
+     * Handles and keeps track of loaded and pending data.
+     */
+    export class LoadingManager {
+        constructor(onLoad?: () => void, onProgress?: (url: string, loaded: number, total: number) => void, onError?: () => void);
+
+        onStart: () => void;
+
+        /**
+         * Will be called when load starts.
+         * The default is a function with empty body.
+         */
+        onLoad: () => void;
+
+        /**
+         * Will be called while load progresses.
+         * The default is a function with empty body.
+         */
+        onProgress: (item: any, loaded: number, total: number) => void;
+
+        /**
+         * Will be called when each element in the scene completes loading.
+         * The default is a function with empty body.
+         */
+        onError: () => void;
+
+        itemStart(url: string): void;
+        itemEnd(url: string): void;
+        itemError(url: string): void;
+    }
+
+    export const DefaultLoadingManager: LoadingManager;
+
+    export class BufferGeometryLoader {
+        constructor(manager?: LoadingManager);
+
+        manager: LoadingManager;
+
+        load(url: string, onLoad: (bufferGeometry: BufferGeometry) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): void;
+        parse(json: any): BufferGeometry;
+    }
+
+    export class MaterialLoader {
+        constructor(manager?: LoadingManager);
+
+        manager: LoadingManager;
+        textures: { [key: string]: Texture };
+
+        load(url: string, onLoad: (material: Material) => void): void;
+        setTextures(textures: { [key: string]: Texture }): void;
+        getTexture(name: string): Texture;
+        parse(json: any): Material;
+    }
+
+    export class ObjectLoader {
+        constructor(manager?: LoadingManager);
+
+        manager: LoadingManager;
+        texturePass: string;
+        crossOrigin: string;
+
+        load(url: string, onLoad?: (object: Object3D) => void): void;
+        setTexturePath( value: string ): void;
+        setCrossOrigin(crossOrigin: string): void;
+        parse<T extends Object3D>(json: any, onLoad?: (object: Object3D) => void): T;
+        parseGeometries(json: any): any[]; // Array of BufferGeometry or Geometry or Geometry2.
+        parseMaterials(json: any, textures: Texture[]): Material[]; // Array of Classes that inherits from Matrial.
+        parseAnimations(json: any): AnimationClip[];
+        parseImages(json: any, onLoad: () => void): any[];
+        parseTextures(json: any, images: any): Texture[];
+        parseObject<T extends Object3D>(data: any, geometries: any[], materials: Material[]): T;
+    }
+
+    /**
+     * Class for loading a texture.
+     * Unlike other loaders, this one emits events instead of using predefined callbacks. So if you're interested in getting notified when things happen, you need to add listeners to the object.
+     */
+    export class TextureLoader {
+        constructor(manager?: LoadingManager);
+
+        manager: LoadingManager;
+        crossOrigin: string;
+        path: string;
+
+        /**
+         * Begin loading from url
+         *
+         * @param url
+         */
+        load(url: string, onLoad?: (texture: Texture) => void): Texture;
+        setCrossOrigin(crossOrigin: string): void;
+        setPath(path: string): void;
+    }
+
+    export class CubeTextureLoader {
+        constructor(manager?: LoadingManager);
+
+        manager: LoadingManager;
+        corssOrigin: string;
+        path: string;
+
+        load(urls: Array<string>, onLoad?: (texture: CubeTexture) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): void;
+        setCrossOrigin(crossOrigin: string): void;
+        setPath(path: string): void;
+    }
+
+    export class BinaryTextureLoader {
+        constructor(manager?: LoadingManager);
+
+        manager: LoadingManager;
+
+        load(url: string, onLoad: (dataTexture: DataTexture) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): void;
+    }
+    export class DataTextureLoader extends BinaryTextureLoader {}
+
+    export class CompressedTextureLoader {
+        constructor(manager?: LoadingManager);
+
+        manager: LoadingManager;
+        path: string;
+
+        load(url: string, onLoad: (texture: CompressedTexture) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): void;
+        setPath(path: string): void;
+    }
+
+    export namespace Cache {
+        export let enabled: boolean;
+        export let files: any;
+
+        export function add(key: string, file: any): void;
+        export function get(key: string): any;
+        export function remove(key: string): void;
+        export function clear(): void;
+    }
+
+    // Materials //////////////////////////////////////////////////////////////////////////////////
+    export let MaterialIdCount: number;
+
+    export interface MaterialParameters {
+        name?: string;
+        side?: Side;
+        opacity?: number;
+        transparent?: boolean;
+        blending?: Blending;
+        blendSrc?: BlendingDstFactor;
+        blendDst?: BlendingSrcFactor;
+        blendEquation?: BlendingEquation;
+        blendSrcAlpha?: number;
+        blendDstAlpha?: number;
+        blendEquationAlpha?: number;
+        depthFunc?: DepthModes;
+        depthTest?: boolean;
+        depthWrite?: boolean;
+        colorWrite?: boolean;
+        precision?: number;
+        polygonOffset?: boolean;
+        polygonOffsetFactor?: number;
+        polygonOffsetUnits?: number;
+        alphaTest?: number;
+        premultipliedAlpha?: boolean;
+        overdraw?: number;
+        visible?: boolean;
+    }
+
+    /**
+     * Materials describe the appearance of objects. They are defined in a (mostly) renderer-independent way, so you don't have to rewrite materials if you decide to use a different renderer.
+     */
+    export class Material {
+        constructor();
+
+        /**
+         * Unique number of this material instance.
+         */
+        id: number;
+
+        uuid: string;
+
+        /**
+         * Material name. Default is an empty string.
+         */
+        name: string;
+
+        type: string;
+
+        /**
+         * Defines which of the face sides will be rendered - front, back or both.
+         * Default is THREE.FrontSide. Other options are THREE.BackSide and THREE.DoubleSide.
+         */
+        side: Side;
+
+        /**
+         * Opacity. Default is 1.
+         */
+        opacity: number;
+
+        /**
+         * Defines whether this material is transparent. This has an effect on rendering, as transparent objects need an special treatment, and are rendered after the opaque (i.e. non transparent) objects. For a working example of this behaviour, check the {@link WebGLRenderer} code.
+         * Default is false.
+         */
+        transparent: boolean;
+
+        /**
+         * Which blending to use when displaying objects with this material. Default is {@link NormalBlending}.
+         */
+        blending: Blending;
+
+        /**
+         * Blending source. It's one of the blending mode constants defined in Three.js. Default is {@link SrcAlphaFactor}.
+         */
+        blendSrc: BlendingDstFactor;
+
+        /**
+         * Blending destination. It's one of the blending mode constants defined in Three.js. Default is {@link OneMinusSrcAlphaFactor}.
+         */
+        blendDst: BlendingSrcFactor;
+
+        /**
+         * Blending equation to use when applying blending. It's one of the constants defined in Three.js. Default is AddEquation.
+         */
+        blendEquation: BlendingEquation;
+
+        blendSrcAlpha: number;
+        blendDstAlpha: number;
+        blendEquationAlpha: number;
+
+        depthFunc: DepthModes;
+
+        /**
+         * Whether to have depth test enabled when rendering this material. Default is true.
+         */
+        depthTest: boolean;
+
+        /**
+         * Whether rendering this material has any effect on the depth buffer. Default is true.
+         * When drawing 2D overlays it can be useful to disable the depth writing in order to layer several things together without creating z-index artifacts.
+         */
+        depthWrite: boolean;
+
+        colorWrite: boolean;
+
+        precision: any;
+
+        /**
+         * Whether to use polygon offset. Default is false. This corresponds to the POLYGON_OFFSET_FILL WebGL feature.
+         */
+        polygonOffset: boolean;
+
+        /**
+         * Sets the polygon offset factor. Default is 0.
+         */
+        polygonOffsetFactor: number;
+
+        /**
+         * Sets the polygon offset units. Default is 0.
+         */
+        polygonOffsetUnits: number;
+
+        /**
+         * Sets the alpha value to be used when running an alpha test. Default is 0.
+         */
+        alphaTest: number;
+
+        premultipliedAlpha: boolean;
+
+        /**
+         * Enables/disables overdraw. If greater than zero, polygons are drawn slightly bigger in order to fix antialiasing gaps when using the CanvasRenderer. Default is 0.
+         */
+        overdraw: number;
+
+        /**
+         * Defines whether this material is visible. Default is true.
+         */
+        visible: boolean;
+
+        /**
+         * Specifies that the material needs to be updated, WebGL wise. Set it to true if you made changes that need to be reflected in WebGL.
+         * This property is automatically set to true when instancing a new material.
+         */
+        needsUpdate: boolean;
+
+        warpRGB: Color; // deprecated, returns a new Color intance
+
+        setValues(parameters: MaterialParameters): void;
+        toJSON(meta?: any): any;
+        clone(): Material;
+        copy(source: Material): Material;
+        update(): void;
+        dispose(): void;
+
+        // EventDispatcher mixins
+        addEventListener(type: string, listener: (event: Event) => void ): void;
+        hasEventListener(type: string, listener: (event: Event) => void): void;
+        removeEventListener(type: string, listener: (event: Event) => void): void;
+        dispatchEvent(event: { type: string; [attachment: string]: any; }): void;
+    }
+
+    export interface LineBasicMaterialParameters extends MaterialParameters {
+        color?: number|string;
+        linewidth?: number;
+        linecap?: string;
+        linejoin?: string;
+        blending?: Blending;
+        vertexColors?: Colors;
+        fog?: boolean;
+    }
+
+    export class LineBasicMaterial extends Material {
+        constructor(parameters?: LineBasicMaterialParameters);
+
+        color: Color;
+        linewidth: number;
+        linecap: string;
+        linejoin: string;
+        blending: Blending;
+        vertexColors: Colors;
+        fog: boolean;
+
+        setValues(parameters: LineBasicMaterialParameters): void;
+        clone(): LineBasicMaterial;
+        copy(source: LineBasicMaterial): LineBasicMaterial;
+    }
+
+    export interface LineDashedMaterialParameters extends MaterialParameters {
+        color?: number|string;
+        linewidth?: number;
+        scale?: number;
+        dashSize?: number;
+        gapSize?: number;
+        blending?: Blending;
+        vertexColors?: Colors;
+        fog?: boolean;
+    }
+
+    export class LineDashedMaterial extends Material {
+        constructor(parameters?: LineDashedMaterialParameters);
+
+        color: Color;
+        linewidth: number;
+        scale: number;
+        dashSize: number;
+        gapSize: number;
+        blending: Blending;
+        vertexColors: Colors;
+        fog: boolean;
+
+        setValues(parameters: LineDashedMaterialParameters): void;
+        clone(): LineDashedMaterial;
+        copy(source: LineDashedMaterial): LineDashedMaterial;
+    }
+
+    /**
+     * parameters is an object with one or more properties defining the material's appearance.
+     */
+    export interface MeshBasicMaterialParameters extends MaterialParameters {
+        color?: number|string;
+        opacity?: number;
+        map?: Texture;
+        aoMap?: Texture;
+        aoMapIntensity?: number;
+        specularMap?: Texture;
+        alphaMap?: Texture;
+        envMap?: Texture;
+        combine?: Combine;
+        reflectivity?: number;
+        refractionRatio?: number;
+        shading?: Shading;
+        blending?: Blending;
+        wireframe?: boolean;
+        wireframeLinewidth?: number;
+        wireframeLinecap?: string;
+        wireframeLinejoin?: string;
+        vertexColors?: Colors;
+        skinning?: boolean;
+        morphTargets?: boolean;
+        fog?: boolean;
+    }
+
+    export class MeshBasicMaterial extends Material {
+        constructor(parameters?: MeshBasicMaterialParameters);
+
+        color: Color;
+        map: Texture;
+        aoMap: Texture;
+        aoMapIntensity: number;
+        specularMap: Texture;
+        alphaMap: Texture;
+        envMap: Texture;
+        combine: Combine;
+        reflectivity: number;
+        refractionRatio: number;
+        fog: boolean;
+        shading: Shading;
+        blending: Blending;
+        wireframe: boolean;
+        wireframeLinewidth: number;
+        wireframeLinecap: string;
+        wireframeLinejoin: string;
+        vertexColors: Colors;
+        skinning: boolean;
+        morphTargets: boolean;
+
+        setValues(parameters: MeshBasicMaterialParameters): void;
+        clone(): MeshBasicMaterial;
+        copy(source: MeshBasicMaterial): MeshBasicMaterial;
+    }
+
+    export interface MeshDepthMaterialParameters extends MaterialParameters {
+        wireframe?: boolean;
+        wireframeLinewidth?: number;
+    }
+
+    export class MeshDepthMaterial extends Material {
+        constructor(parameters?: MeshDepthMaterialParameters);
+
+        wireframe: boolean;
+        wireframeLinewidth: number;
+
+        setValues(parameters: MeshDepthMaterialParameters): void;
+        clone(): MeshDepthMaterial;
+        copy(source: MeshDepthMaterial): MeshDepthMaterial;
+    }
+
+    export interface MeshLambertMaterialParameters extends MaterialParameters {
+        color?: number|string;
+        emissive?: number|string;
+        emissiveIntensity?: number;
+        emissiveMap?: Texture;
+        map?: Texture;
+        lighhtMap?: Texture;
+        lightMapIntensity?: number;
+        aoMap?: Texture;
+        aoMapIntensity?: number;
+        specularMap?: Texture;
+        alphaMap?: Texture;
+        envMap?: Texture;
+        combine?: Combine;
+        reflectivity?: number;
+        refractionRatio?: number;
+        fog?: boolean;
+        blending?: Blending;
+        wireframe?: boolean;
+        wireframeLinewidth?: number;
+        wireframeLinecap?: string;
+        wireframeLinejoin?: string;
+        vertexColors?: Colors;
+        skinning?: boolean;
+        morphTargets?: boolean;
+        morphNormals?: boolean;
+    }
+
+    export class MeshLambertMaterial extends Material {
+        constructor(parameters?: MeshLambertMaterialParameters);
+
+        color: Color;
+        emissive: number|string;
+        emissiveIntensity: number;
+        emissiveMap: Texture;
+        map: Texture;
+        lighhtMap: Texture;
+        lightMapIntensity: number;
+        aoMap: Texture;
+        aoMapIntensity: number;
+        specularMap: Texture;
+        alphaMap: Texture;
+        envMap: Texture;
+        combine: Combine;
+        reflectivity: number;
+        refractionRatio: number;
+        fog: boolean;
+        blending: Blending;
+        wireframe: boolean;
+        wireframeLinewidth: number;
+        wireframeLinecap: string;
+        wireframeLinejoin: string;
+        vertexColors: Colors;
+        skinning: boolean;
+        morphTargets: boolean;
+        morphNormals: boolean;
+
+        setValues(parameters: MeshLambertMaterialParameters): void;
+        clone(): MeshLambertMaterial;
+        copy(source: MeshLambertMaterial): MeshLambertMaterial;
+    }
+
+    export interface MeshStandardMaterialParameters extends MaterialParameters {
+        color?: number|string;
+        roughtness?: number;
+        metalness?: number;
+        lighhtMap?: Texture;
+        lightMapIntensity?: number;
+        aoMap?: Texture;
+        aoMapIntensity?: number;
+        emissive?: Color;
+        emissiveIntensity?: number;
+        emissiveMap?: Texture;
+        bumpMap?: Texture;
+        bumpScale?: number;
+        normalMap?: Texture;
+        normalScale?: number;
+        displacementMap?: Texture;
+        displacementScale?: number;
+        displacementBias?: number;
+        roughtnessMap?: Texture;
+        metalMap?: Texture;
+        alphaMap?: Texture;
+        envMap?: Texture;
+        envMapIntensity?: number;
+        refractionRatio?: number;
+        shading?: Shading;
+        blending?: Blending;
+        wireframe?: boolean;
+        wireframeLinewidth?: number;
+        vertexColors?: Colors;
+        skinning?: boolean;
+        morphTargets?: boolean;
+        morphNormals?: boolean;
+        fog?: boolean;
+    }
+
+    export class MeshStandardMaterial extends Material {
+        constructor(parameters?: MeshStandardMaterialParameters);
+
+        color: Color;
+        roughtness: number;
+        metalness: number;
+        map: Texture;
+        lighhtMap: Texture;
+        lightMapIntensity: number;
+        aoMap: Texture;
+        aoMapIntensity: number;
+        emissive: Color;
+        emissiveIntensity: number;
+        emissiveMap: Texture;
+        bumpMap: Texture;
+        bumpScale: number;
+        normalMap: Texture;
+        normalScale: number;
+        displacementMap: Texture;
+        displacementScale: number;
+        displacementBias: number;
+        roughtnessMap: Texture;
+        metalMap: Texture;
+        alphaMap: Texture;
+        envMap: Texture;
+        envMapIntensity: number;
+        refractionRatio: number;
+        shading: Shading;
+        blending: Blending;
+        wireframe: boolean;
+        wireframeLinewidth: number;
+        vertexColors: Colors;
+        skinning: boolean;
+        morphTargets: boolean;
+        morphNormals: boolean;
+        fog: boolean;
+
+        setValues(parameters: MeshStandardMaterialParameters): void;
+        clone(): MeshStandardMaterial;
+        copy(source: MeshStandardMaterial): MeshStandardMaterial;
+    }
+
+    export interface MeshNormalMaterialParameters extends MaterialParameters {
+        /** Render geometry as wireframe. Default is false (i.e. render as smooth shaded). */
+        wireframe?: boolean;
+        /** Controls wireframe thickness. Default is 1. */
+        wireframeLinewidth?: number;
+        morphTargets?: boolean;
+    }
+
+    export class MeshNormalMaterial extends Material {
+        constructor(parameters?: MeshNormalMaterialParameters);
+
+        wireframe: boolean;
+        wireframeLinewidth: number;
+        morphTargets: boolean;
+
+        setValues(parameters: MeshNormalMaterialParameters): void;
+        clone(): MeshNormalMaterial;
+        copy(source: MeshNormalMaterial): MeshNormalMaterial;
+    }
+
+    export interface MeshPhongMaterialParameters extends MaterialParameters {
+        /** geometry color in hexadecimal. Default is 0xffffff. */
+        color?: number|string;
+        specular?: number;
+        shininess?: number;
+        opacity?: number;
+        map?: Texture;
+        lightMap?: Texture;
+        lightMapIntensity?: number;
+        aoMap?: Texture;
+        aoMapIntensity?: number;
+        emissive?: number;
+        emissiveIntensity?: number;
+        emissiveMap?: Texture;
+        bumpMap?: Texture;
+        bumpScale?: number;
+        normalMap?: Texture;
+        normalScale?: Vector2;
+        displacementMap?: Texture;
+        displacementScale?: number;
+        displacementBias?: number;
+        specularMap?: Texture;
+        alphaMap?: Texture;
+        envMap?: Texture;
+        combine?: Combine;
+        reflectivity?: number;
+        refractionRatio?: number;
+        shading?: Shading;
+        blending?: Blending;
+        wireframe?: boolean;
+        wireframeLinewidth?: number;
+        wireframeLinecap?: string;
+        wireframeLinejoin?: string;
+        vertexColors?: Colors;
+        skinning?: boolean;
+        morphTargets?: boolean;
+        morphNormals?: boolean;
+        fog?: boolean;
+    }
+
+    export class MeshPhongMaterial extends Material {
+        constructor(parameters?: MeshPhongMaterialParameters);
+
+        color: Color; // diffuse
+        specular: Color;
+        shininess: number;
+        map: Texture;
+        lightMap: Texture;
+        lightMapIntensity: number;
+        aoMap: Texture;
+        aoMapIntensity: number;
+        emissive: Color;
+        emissiveIntensity: number;
+        emissiveMap: Texture;
+        bumpMap: Texture;
+        bumpScale: number;
+        normalMap: Texture;
+        normalScale: Vector2;
+        displacementMap: Texture;
+        displacementScale: number;
+        displacementBias: number;
+        specularMap: Texture;
+        alphaMap: Texture;
+        envMap: Texture;
+        combine: Combine;
+        reflectivity: number;
+        refractionRatio: number;
+        fog: boolean;
+        shading: Shading;
+        blending: Blending;
+        wireframe: boolean;
+        wireframeLinewidth: number;
+        wireframeLinecap: string;
+        wireframeLinejoin: string;
+        vertexColors: Colors;
+        skinning: boolean;
+        morphTargets: boolean;
+        morphNormals: boolean;
+        metal: boolean; // deprecated
+
+        setValues(parameters: MeshPhongMaterialParameters): void;
+        clone(): MeshPhongMaterial;
+        copy(source: MeshPhongMaterial): MeshPhongMaterial;
+    }
+
+    // MultiMaterial does not inherit the Material class in the original code. However, it should treat as Material class.
+    // See tests/canvas/canvas_materials.ts.
+    export class MultiMaterial extends Material {
+        constructor(materials?: Material[]);
+
+        materials: Material[];
+
+        toJSON(meta: any): any;
+        clone(): MultiMaterial;
+    }
+
+    export class MeshFaceMaterial extends MultiMaterial {} // deprecated, use MultiMaterial
+
+    export interface PointsMaterialParameters extends MaterialParameters {
+        color?: number|string;
+        map?: Texture;
+        size?: number;
+        sizeAttenuation?: boolean;
+        blending?: Blending;
+        vertexColors?: Colors;
+        fog?: boolean;
+    }
+
+    export class PointsMaterial extends Material {
+        constructor(parameters?: PointsMaterialParameters);
+
+        color: Color;
+        map: Texture;
+        size: number;
+        sizeAttenuation: boolean;
+        blending: Blending;
+        vertexColors: boolean;
+        fog: boolean;
+
+        setValues(parameters: PointsMaterialParameters): void;
+        clone(): PointsMaterial;
+        copy(source: PointsMaterial): PointsMaterial;
+    }
+
+    export class PointCloudMaterial extends PointsMaterial {} // deprecated, use PointsMaterial
+    export class ParticleBasicMaterial extends PointsMaterial {} // deprecated, use PointsMaterial
+    export class ParticleSystemMaterial extends PointsMaterial {} // deprecated, use PointsMaterial
+
+    export interface ShaderMaterialParameters extends MaterialParameters {
+        defines?: any;
+        uniforms?: any;
+        vertexShader?: string;
+        fragmentShader?: string;
+        shading?: Shading;
+        lineWidth?: number;
+        wireframe?: boolean;
+        wireframeLinewidth?: number;
+        fog?: boolean;
+        lights?: boolean;
+        vertexColors?: Colors;
+        skinning?: boolean;
+        morphTargets?: boolean;
+        morphNormals?: boolean;
+    }
+
+    export class ShaderMaterial extends Material {
+        constructor(parameters?: ShaderMaterialParameters);
+
+        defines: any;
+        uniforms: any;
+        vertexShader: string;
+        fragmentShader: string;
+        shading: Shading;
+        linewidth: number;
+        wireframe: boolean;
+        wireframeLinewidth: number;
+        fog: boolean;
+        lights: boolean;
+        vertexColors: Colors;
+        skinning: boolean;
+        morphTargets: boolean;
+        morphNormals: boolean;
+        derivatives: any; // deprecated, use extensions.derivatives
+        extensions: { derivatives: boolean; fragDepth: boolean; drawBuffers: boolean; shaderTextureLOD: boolean };
+        defaultAttributeValues: any;
+        index0AttributeName: string;
+
+        setValues(parameters: ShaderMaterialParameters): void;
+        clone(): ShaderMaterial;
+        copy(source: ShaderMaterial): ShaderMaterial;
+        toJSON(meta: any): any;
+    }
+
+    export class RawShaderMaterial extends ShaderMaterial {
+        constructor(parameters?: ShaderMaterialParameters);
+    }
+
+    export interface SpriteMaterialParameters extends MaterialParameters {
+        color?: number|string;
+        map?: Texture;
+        rotation?: number;
+        fog?: boolean;
+    }
+
+    export class SpriteMaterial extends Material {
+        constructor(parameters?: SpriteMaterialParameters);
+
+        color: Color;
+        map: Texture;
+        rotation: number;
+        fog: boolean;
+
+        setValues(parameters: SpriteMaterialParameters): void;
+        clone(): SpriteMaterial;
+        copy(source: SpriteMaterial): SpriteMaterial;
+    }
+
+    // Math //////////////////////////////////////////////////////////////////////////////////
+
+    export class Box2 {
+        constructor(min?: Vector2, max?: Vector2);
+
+        max: Vector2;
+        min: Vector2;
+
+        set(min: Vector2, max: Vector2): Box2;
+        setFromPoints(points: Vector2[]): Box2;
+        setFromCenterAndSize(center: Vector2, size: Vector2): Box2;
+        clone(): Box2;
+        copy(box: Box2): Box2;
+        makeEmpty(): Box2;
+        empty(): any; // deprecated, use isEmpty()
+        isEmpty(): boolean;
+        center(optionalTarget?: Vector2): Vector2;
+        size(optionalTarget?: Vector2): Vector2;
+        expandByPoint(point: Vector2): Box2;
+        expandByVector(vector: Vector2): Box2;
+        expandByScalar(scalar: number): Box2;
+        containsPoint(point: Vector2): boolean;
+        containsBox(box: Box2): boolean;
+        getParameter(point: Vector2): Vector2;
+        intersectsBox(box: Box2): boolean;
+        clampPoint(point: Vector2, optionalTarget?: Vector2): Vector2;
+        distanceToPoint(point: Vector2): number;
+        intersect(box: Box2): Box2;
+        union(box: Box2): Box2;
+        translate(offset: Vector2): Box2;
+        equals(box: Box2): boolean;
+
+        isIntersectionBox(b: any): any; // deprecated, use intersectsBox()
+    }
+
+    export class Box3 {
+        constructor(min?: Vector3, max?: Vector3);
+
+        max: Vector3;
+        min: Vector3;
+
+        set(min: Vector3, max: Vector3): Box3;
+        setFromArray(array: number[]): Box3;
+        setFromPoints(points: Vector3[]): Box3;
+        setFromCenterAndSize(center: Vector3, size: Vector3): Box3;
+        setFromObject(object: Object3D): Box3;
+        clone(): Box3;
+        copy(box: Box3): Box3;
+        makeEmpty(): Box3;
+        isEmpty(): boolean;
+        center(optionalTarget?: Vector3): Vector3;
+        size(optionalTarget?: Vector3): Vector3;
+        expandByPoint(point: Vector3): Box3;
+        expandByVector(vector: Vector3): Box3;
+        expandByScalar(scalar: number): Box3;
+        containsPoint(point: Vector3): boolean;
+        containsBox(box: Box3): boolean;
+        getParameter(point: Vector3): Vector3;
+        intersectsBox(box: Box3): boolean;
+        intersectsSphere(sphere: Sphere): boolean;
+        intersectsPlane(plane: Plane): boolean;
+        clampPoint(point: Vector3, optionalTarget?: Vector3): Vector3;
+        distanceToPoint(point: Vector3): number;
+        getBoundingSphere(optionalTarget?: Sphere): Sphere;
+        intersect(box: Box3): Box3;
+        union(box: Box3): Box3;
+        applyMatrix4(matrix: Matrix4): Box3;
+        translate(offset: Vector3): Box3;
+        equals(box: Box3): boolean;
+        
+        empty(): any; // deprecated, use isEmpty()
+        isIntersectionBox(b: any): any; // deprecated, use intersectsBox()
+        isIntersectionSphere(s: any): any; // deprecated, use intersectsSphere()
+    }
+
+    export interface HSL {
+        h: number;
+        s: number;
+        l: number;
+    }
+
+    /**
+     * Represents a color. See also {@link ColorUtils}.
+     *
+     * @example
+     * var color = new THREE.Color( 0xff0000 );
+     *
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/math/Color.js">src/math/Color.js</a>
+     */
+    export class Color {
+        constructor(color?: Color);
+        constructor(color?: string);
+        constructor(color?: number);
+        constructor(r: number, g: number, b: number);
+
+        /**
+         * Red channel value between 0 and 1. Default is 1.
+         */
+        r: number;
+
+        /**
+         * Green channel value between 0 and 1. Default is 1.
+         */
+        g: number;
+
+        /**
+         * Blue channel value between 0 and 1. Default is 1.
+         */
+        b: number;
+
+        set(color: Color): Color;
+        set(color: number): Color;
+        set(color: string): Color;
+        setScalar(scalar: number): Color;
+        setHex(hex: number): Color;
+
+        /**
+         * Sets this color from RGB values.
+         * @param r Red channel value between 0 and 1.
+         * @param g Green channel value between 0 and 1.
+         * @param b Blue channel value between 0 and 1.
+         */
+        setRGB(r: number, g: number, b: number): Color;
+
+        /**
+         * Sets this color from HSL values.
+         * Based on MochiKit implementation by Bob Ippolito.
+         *
+         * @param h Hue channel value between 0 and 1.
+         * @param s Saturation value channel between 0 and 1.
+         * @param l Value channel value between 0 and 1.
+         */
+        setHSL(h: number, s: number, l: number): Color;
+
+        /**
+         * Sets this color from a CSS context style string.
+         * @param contextStyle Color in CSS context style format.
+         */
+        setStyle(style: string): Color;
+
+        /**
+         * Clones this color.
+         */
+        clone(): Color;
+
+        /**
+         * Copies given color.
+         * @param color Color to copy.
+         */
+        copy(color: Color): Color;
+
+        /**
+         * Copies given color making conversion from gamma to linear space.
+         * @param color Color to copy.
+         */
+        copyGammaToLinear(color: Color, gammaFactor?: number): Color;
+
+        /**
+         * Copies given color making conversion from linear to gamma space.
+         * @param color Color to copy.
+         */
+        copyLinearToGamma(color: Color, gammaFactor?: number): Color;
+
+        /**
+         * Converts this color from gamma to linear space.
+         */
+        convertGammaToLinear(): Color;
+
+        /**
+         * Converts this color from linear to gamma space.
+         */
+        convertLinearToGamma(): Color;
+
+        /**
+         * Returns the hexadecimal value of this color.
+         */
+        getHex(): number;
+
+        /**
+         * Returns the string formated hexadecimal value of this color.
+         */
+        getHexString(): string;
+
+        getHSL(): HSL;
+
+        /**
+         * Returns the value of this color in CSS context style.
+         * Example: rgb(r, g, b)
+         */
+        getStyle(): string;
+
+        offsetHSL(h: number, s: number, l: number): Color;
+
+        add(color: Color): Color;
+        addColors(color1: Color, color2: Color): Color;
+        addScalar(s: number): Color;
+        multiply(color: Color): Color;
+        multiplyScalar(s: number): Color;
+        lerp(color: Color, alpha: number): Color;
+        equals(color: Color): boolean;
+        fromArray(rgb: number[], offset?: number): Color;
+        toArray(array?: number[], offset?: number): number[];
+    }
+
+    export namespace ColorKeywords {
+        export const aliceblue: number;
+        export const antiquewhite: number;
+        export const aqua: number;
+        export const aquamarine: number;
+        export const azure: number;
+        export const beige: number;
+        export const bisque: number;
+        export const black: number;
+        export const blanchedalmond: number;
+        export const blue: number;
+        export const blueviolet: number;
+        export const brown: number;
+        export const burlywood: number;
+        export const cadetblue: number;
+        export const chartreuse: number;
+        export const chocolate: number;
+        export const coral: number;
+        export const cornflowerblue: number;
+        export const cornsilk: number;
+        export const crimson: number;
+        export const cyan: number;
+        export const darkblue: number;
+        export const darkcyan: number;
+        export const darkgoldenrod: number;
+        export const darkgray: number;
+        export const darkgreen: number;
+        export const darkgrey: number;
+        export const darkkhaki: number;
+        export const darkmagenta: number;
+        export const darkolivegreen: number;
+        export const darkorange: number;
+        export const darkorchid: number;
+        export const darkred: number;
+        export const darksalmon: number;
+        export const darkseagreen: number;
+        export const darkslateblue: number;
+        export const darkslategray: number;
+        export const darkslategrey: number;
+        export const darkturquoise: number;
+        export const darkviolet: number;
+        export const deeppink: number;
+        export const deepskyblue: number;
+        export const dimgray: number;
+        export const dimgrey: number;
+        export const dodgerblue: number;
+        export const firebrick: number;
+        export const floralwhite: number;
+        export const forestgreen: number;
+        export const fuchsia: number;
+        export const gainsboro: number;
+        export const ghostwhite: number;
+        export const gold: number;
+        export const goldenrod: number;
+        export const gray: number;
+        export const green: number;
+        export const greenyellow: number;
+        export const grey: number;
+        export const honeydew: number;
+        export const hotpink: number;
+        export const indianred: number;
+        export const indigo: number;
+        export const ivory: number;
+        export const khaki: number;
+        export const lavender: number;
+        export const lavenderblush: number;
+        export const lawngreen: number;
+        export const lemonchiffon: number;
+        export const lightblue: number;
+        export const lightcoral: number;
+        export const lightcyan: number;
+        export const lightgoldenrodyellow: number;
+        export const lightgray: number;
+        export const lightgreen: number;
+        export const lightgrey: number;
+        export const lightpink: number;
+        export const lightsalmon: number;
+        export const lightseagreen: number;
+        export const lightskyblue: number;
+        export const lightslategray: number;
+        export const lightslategrey: number;
+        export const lightsteelblue: number;
+        export const lightyellow: number;
+        export const lime: number;
+        export const limegreen: number;
+        export const linen: number;
+        export const magenta: number;
+        export const maroon: number;
+        export const mediumaquamarine: number;
+        export const mediumblue: number;
+        export const mediumorchid: number;
+        export const mediumpurple: number;
+        export const mediumseagreen: number;
+        export const mediumslateblue: number;
+        export const mediumspringgreen: number;
+        export const mediumturquoise: number;
+        export const mediumvioletred: number;
+        export const midnightblue: number;
+        export const mintcream: number;
+        export const mistyrose: number;
+        export const moccasin: number;
+        export const navajowhite: number;
+        export const navy: number;
+        export const oldlace: number;
+        export const olive: number;
+        export const olivedrab: number;
+        export const orange: number;
+        export const orangered: number;
+        export const orchid: number;
+        export const palegoldenrod: number;
+        export const palegreen: number;
+        export const paleturquoise: number;
+        export const palevioletred: number;
+        export const papayawhip: number;
+        export const peachpuff: number;
+        export const peru: number;
+        export const pink: number;
+        export const plum: number;
+        export const powderblue: number;
+        export const purple: number;
+        export const red: number;
+        export const rosybrown: number;
+        export const royalblue: number;
+        export const saddlebrown: number;
+        export const salmon: number;
+        export const sandybrown: number;
+        export const seagreen: number;
+        export const seashell: number;
+        export const sienna: number;
+        export const silver: number;
+        export const skyblue: number;
+        export const slateblue: number;
+        export const slategray: number;
+        export const slategrey: number;
+        export const snow: number;
+        export const springgreen: number;
+        export const steelblue: number;
+        export const tan: number;
+        export const teal: number;
+        export const thistle: number;
+        export const tomato: number;
+        export const turquoise: number;
+        export const violet: number;
+        export const wheat: number;
+        export const white: number;
+        export const whitesmoke: number;
+        export const yellow: number;
+        export const yellowgreen: number;
+    }
+
+    export class Euler {
+        constructor(x?: number, y?: number, z?: number, order?: string);
+        
+        x: number;
+        y: number;
+        z: number;
+        order: string;
+        onChangeCallback: Function;
+
+        set(x: number, y: number, z: number, order?: string): Euler;
+        clone(): Euler;
+        copy(euler: Euler): Euler;
+        setFromRotationMatrix(m: Matrix4, order?: string, update?: boolean): Euler;
+        setFromQuaternion(q:Quaternion, order?: string, update?: boolean): Euler;
+        setFromVector3( v: Vector3, order?: string ): Euler;
+        reorder(newOrder: string): Euler;
+        equals(euler: Euler): boolean;
+        fromArray(xyzo: any[]): Euler;
+        toArray(array?: number[], offset?: number): number[];
+        toVector3(optionalResult?: Vector3): Vector3;
+        onChange(callback: Function): void;
+
+        static RotationOrders: string[];
+        static DefautlOrder: string;
+    }
+
+    /**
+     * Frustums are used to determine what is inside the camera's field of view. They help speed up the rendering process.
+     */
+    export class Frustum {
+        constructor(p0?: Plane, p1?: Plane, p2?: Plane, p3?: Plane, p4?: Plane, p5?: Plane);
+
+        /**
+         * Array of 6 vectors.
+         */
+        planes: Plane[];
+
+        set(p0?: number, p1?: number, p2?: number, p3?: number, p4?: number, p5?: number): Frustum;
+        clone(): Frustum;
+        copy(frustum: Frustum): Frustum;
+        setFromMatrix(m: Matrix4): Frustum;
+        intersectsObject(object: Object3D): boolean;
+        intersectsSphere(sphere: Sphere): boolean;
+        intersectsBox(box: Box3): boolean;
+        containsPoint(point: Vector3): boolean;
+    }
+
+    export class Line3 {
+        constructor(start?: Vector3, end?: Vector3);
+
+        start: Vector3;
+        end: Vector3;
+
+        set(start?: Vector3, end?: Vector3): Line3;
+        clone(): Line3;
+        copy(line: Line3): Line3;
+        center(optionalTarget?: Vector3): Vector3;
+        delta(optionalTarget?: Vector3): Vector3;
+        distanceSq(): number;
+        distance(): number;
+        at(t: number, optionalTarget?: Vector3): Vector3;
+        closestPointToPointParameter(point: Vector3, clampToLine?: boolean): number;
+        closestPointToPoint(point: Vector3, clampToLine?: boolean, optionalTarget?: Vector3): Vector3;
+        applyMatrix4(matrix: Matrix4): Line3;
+        equals(line: Line3): boolean;
+    }
+
+    /**
+     *
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/math/Math.js">src/math/Math.js</a>
+     */
+    export namespace Math {
+        export function generateUUID(): string;
+
+        /**
+         * Clamps the x to be between a and b.
+         *
+         * @param value Value to be clamped.
+         * @param min Minimum value
+         * @param max Maximum value.
+         */
+        export function clamp(value: number, min: number, max: number): number;
+        export function euclideanModulo( n: number, m: number ): number;
+
+        /**
+         * Linear mapping of x from range [a1, a2] to range [b1, b2].
+         *
+         * @param x Value to be mapped.
+         * @param a1 Minimum value for range A.
+         * @param a2 Maximum value for range A.
+         * @param b1 Minimum value for range B.
+         * @param b2 Maximum value for range B.
+         */
+        export function mapLinear(x: number, a1: number, a2: number, b1: number, b2: number): number;
+
+        export function smoothstep(x: number, min: number, max: number): number;
+
+        export function smootherstep(x: number, min: number, max: number): number;
+
+        /**
+         * Random float from 0 to 1 with 16 bits of randomness.
+         * Standard Math.random() creates repetitive patterns when applied over larger space.
+         */
+        export function random16(): number; // deprecated, use Math.random()
+
+        /**
+         * Random integer from low to high interval.
+         */
+        export function randInt(low: number, high: number): number;
+
+        /**
+         * Random float from low to high interval.
+         */
+        export function randFloat(low: number, high: number): number;
+
+        /**
+         * Random float from - range / 2 to range / 2 interval.
+         */
+        export function randFloatSpread(range: number): number;
+
+        export function degToRad(degrees: number): number;
+
+        export function radToDeg(radians: number): number;
+
+        export function isPowerOfTwo(value: number): boolean;
+
+        export function nearestPowerOfTwo(value: number): number;
+
+        export function nextPowerOfTwo(value: number): number;
+    }
+
+    /**
+     * ( interface Matrix&lt;T&gt; )
+     */
+    export interface Matrix {
+        /**
+         * Float32Array with matrix values.
+         */
+        elements: Float32Array;
+
+        /**
+         * identity():T;
+         */
+        identity(): Matrix;
+
+        /**
+         * copy(m:T):T;
+         */
+        copy(m: Matrix): Matrix;
+
+        /**
+         * multiplyScalar(s:number):T;
+         */
+        multiplyScalar(s: number): Matrix;
+
+        determinant(): number;
+
+        /**
+         * getInverse(matrix:T, throwOnInvertible?:boolean):T;
+         */
+        getInverse(matrix: Matrix, throwOnInvertible?: boolean): Matrix;
+
+        /**
+         * transpose():T;
+         */
+        transpose(): Matrix;
+
+        /**
+         * clone():T;
+         */
+        clone(): Matrix;
+    }
+
+    /**
+     * ( class Matrix3 implements Matrix&lt;Matrix3&gt; )
+     */
+    export class Matrix3 implements Matrix {
+        /**
+         * Creates an identity matrix.
+         */
+        constructor();
+
+        /**
+         * Float32Array with matrix values.
+         */
+        elements: Float32Array;
+
+        set(n11: number, n12: number, n13: number, n21: number, n22: number, n23: number, n31: number, n32: number, n33: number): Matrix3;
+        identity(): Matrix3;
+        clone(): Matrix3;
+        copy(m: Matrix3): Matrix3;
+        setFromMatix4(m: Matrix4): Matrix3;
+        multiplyVector3Array(a: any): any; // deprecated, use applyToVector3Array()
+        applyToVector3Array(array: number[], offset?: number, length?: number): number[];
+        applyToBuffer(buffer: BufferAttribute, offset?: number, length?: number): BufferAttribute;
+        multiplyScalar(s: number): Matrix3;
+        determinant(): number;
+        getInverse(matrix: Matrix3, throwOnDegenerate?: boolean): Matrix3;
+        getInverse(matrix: Matrix4, throwOnDegenerate?: boolean): Matrix3; // deprecated
+
+        /**
+         * Transposes this matrix in place.
+         */
+        transpose(): Matrix3;
+        flattenToArrayOffset(array: number[], offset: number): number[];
+        getNormalMatrix(matrix4: Matrix4): Matrix3;
+
+        /**
+         * Transposes this matrix into the supplied array r, and returns itself.
+         */
+        transposeIntoArray(r: number[]): number[];
+        fromArray(array: number[]): Matrix3;
+        toArray(): number[];
+
+        multiplyVector3(vector: Vector3): any; // deprecated, use vector.applyMatrix3( matrix )
+    }
+
+    /**
+     * A 4x4 Matrix.
+     *
+     * @example
+     * // Simple rig for rotating around 3 axes
+     * var m = new THREE.Matrix4();
+     * var m1 = new THREE.Matrix4();
+     * var m2 = new THREE.Matrix4();
+     * var m3 = new THREE.Matrix4();
+     * var alpha = 0;
+     * var beta = Math.PI;
+     * var gamma = Math.PI/2;
+     * m1.makeRotationX( alpha );
+     * m2.makeRotationY( beta );
+     * m3.makeRotationZ( gamma );
+     * m.multiplyMatrices( m1, m2 );
+     * m.multiply( m3 );
+     */
+    export class Matrix4 implements Matrix {
+        constructor();
+
+        /**
+         * Float32Array with matrix values.
+         */
+        elements: Float32Array;
+
+        /**
+         * Sets all fields of this matrix.
+         */
+        set(n11: number, n12: number, n13: number, n14: number, n21: number, n22: number, n23: number, n24: number, n31: number, n32: number, n33: number, n34: number, n41: number, n42: number, n43: number, n44: number): Matrix4;
+
+        /**
+         * Resets this matrix to identity.
+         */
+        identity(): Matrix4;
+        clone(): Matrix4;
+        copy(m: Matrix4): Matrix4;
+        extractPosition(m: Matrix4): Matrix4; // deprecated, use copyPosition()
+        copyPosition(m: Matrix4): Matrix4;
+        extractBasis( xAxis: Vector3, yAxis: Vector3, zAxis: Vector3): Matrix4;
+        makeBasis( xAxis: Vector3, yAxis: Vector3, zAxis: Vector3): Matrix4;
+
+        /**
+         * Copies the rotation component of the supplied matrix m into this matrix rotation component.
+         */
+        extractRotation(m: Matrix4): Matrix4;
+        makeRotationFromEuler(euler: Euler): Matrix4;
+        setRotationFromQuaternion(q: Quaternion): Matrix4; // deprecated, use makeRotationFromQuaternion()
+        makeRotationFromQuaternion(q: Quaternion): Matrix4;
+        /**
+         * Constructs a rotation matrix, looking from eye towards center with defined up vector.
+         */
+        lookAt(eye: Vector3, target: Vector3, up: Vector3): Matrix4;
+
+        /**
+         * Multiplies this matrix by m.
+         */
+        multiply(m: Matrix4): Matrix4;
+
+        /**
+         * Sets this matrix to a x b.
+         */
+        multiplyMatrices(a: Matrix4, b: Matrix4): Matrix4;
+
+        /**
+         * Sets this matrix to a x b and stores the result into the flat array r.
+         * r can be either a regular Array or a TypedArray.
+         */
+        multiplyToArray(a: Matrix4, b: Matrix4, r: number[]): Matrix4;
+
+        /**
+         * Multiplies this matrix by s.
+         */
+        multiplyScalar(s: number): Matrix4;
+        multiplyVector3Array(array: number[]): number[]; // deprecated, use applyToVector3Array()
+        applyToVector3Array(array: number[], offset?: number, length?: number): number[];
+        applyToBuffer( buffer: BufferAttribute, offset?: number, length?: number): BufferAttribute;
+        /**
+         * Computes determinant of this matrix.
+         * Based on http://www.euclideanspace.com/maths/algebra/matrix/functions/inverse/fourD/index.htm
+         */
+        determinant(): number;
+
+        /**
+         * Transposes this matrix.
+         */
+        transpose(): Matrix4;
+
+        /**
+         * Flattens this matrix into supplied flat array starting from offset position in the array.
+         */
+        flattenToArrayOffset(array: number[], offset: number): number[];
+
+        /**
+         * Sets the position component for this matrix from vector v.
+         */
+        setPosition(v: Vector3): Matrix4;
+        
+
+        /**
+         * Sets this matrix to the inverse of matrix m.
+         * Based on http://www.euclideanspace.com/maths/algebra/matrix/functions/inverse/fourD/index.htm.
+         */
+        getInverse(m: Matrix4, throwOnDegeneratee?: boolean): Matrix4;
+
+        /**
+         * Multiplies the columns of this matrix by vector v.
+         */
+        scale(v: Vector3): Matrix4;
+
+        getMaxScaleOnAxis(): number;
+        /**
+         * Sets this matrix as translation transform.
+         */
+        makeTranslation(x: number, y: number, z: number): Matrix4;
+
+        /**
+         * Sets this matrix as rotation transform around x axis by theta radians.
+         *
+         * @param theta Rotation angle in radians.
+         */
+        makeRotationX(theta: number): Matrix4;
+
+        /**
+         * Sets this matrix as rotation transform around y axis by theta radians.
+         *
+         * @param theta Rotation angle in radians.
+         */
+        makeRotationY(theta: number): Matrix4;
+
+        /**
+         * Sets this matrix as rotation transform around z axis by theta radians.
+         *
+         * @param theta Rotation angle in radians.
+         */
+        makeRotationZ(theta: number): Matrix4;
+
+        /**
+         * Sets this matrix as rotation transform around axis by angle radians.
+         * Based on http://www.gamedev.net/reference/articles/article1199.asp.
+         *
+         * @param axis Rotation axis.
+         * @param theta Rotation angle in radians.
+         */
+        makeRotationAxis(axis: Vector3, angle: number): Matrix4;
+
+        /**
+         * Sets this matrix as scale transform.
+         */
+        makeScale(x: number, y: number, z: number): Matrix4;
+
+        /**
+         * Sets this matrix to the transformation composed of translation, rotation and scale.
+         */
+        compose(translation: Vector3, rotation: Quaternion, scale: Vector3): Matrix4;
+
+        /**
+         * Decomposes this matrix into the translation, rotation and scale components.
+         * If parameters are not passed, new instances will be created.
+         */
+        decompose(translation?: Vector3, rotation?: Quaternion, scale?: Vector3): Object[]; // [Vector3, Quaternion, Vector3]
+
+        /**
+         * Creates a frustum matrix.
+         */
+        makeFrustum(left: number, right: number, bottom: number, top: number, near: number, far: number): Matrix4;
+
+        /**
+         * Creates a perspective projection matrix.
+         */
+        makePerspective(fov: number, aspect: number, near: number, far: number): Matrix4;
+
+        /**
+         * Creates an orthographic projection matrix.
+         */
+        makeOrthographic(left: number, right: number, top: number, bottom: number, near: number, far: number): Matrix4;
+        equals( matrix: Matrix4 ): boolean;
+        fromArray(array: number[]): Matrix4;
+        toArray(): number[];
+
+        getPosition(): any; // deprecated, use Vector3.setFromMatrixPosition( matrix )
+        multiplyVector3(v: any): any; // deprecated, use vector.applyMatrix4( matrix ) or vector.applyProjection( matrix )
+        multiplyVector4(v: any): any; // deprecated, use vector.applyMatrix4( matrix )
+        rotateAxis(v: any): void; // deprecated, use Vector3.transformDirection( matrix )
+        crossVector(v: any): void; // deprecated, use vector.applyMatrix( matrix )
+    }
+
+    export class Plane {
+        constructor(normal?: Vector3, constant?: number);
+
+        normal: Vector3;
+        constant: number;
+
+        set(normal: Vector3, constant: number): Plane;
+        setComponents(x: number, y: number, z: number, w: number): Plane;
+        setFromNormalAndCoplanarPoint(normal: Vector3, point: Vector3): Plane;
+        setFromCoplanarPoints(a: Vector3, b: Vector3, c: Vector3): Plane;
+        clone(): Plane;
+        copy(plane: Plane): Plane;
+        normalize(): Plane;
+        negate(): Plane;
+        distanceToPoint(point: Vector3): number;
+        distanceToSphere(sphere: Sphere): number;
+        projectPoint(point: Vector3, optionalTarget?: Vector3): Vector3;
+        orthoPoint(point: Vector3, optionalTarget?: Vector3): Vector3;
+        intersectLine(line: Line3, optionalTarget?: Vector3): Vector3;
+        intersectsLine(line: Line3): boolean;
+        intersectsBox(box: Box3): boolean;
+        coplanarPoint(optionalTarget?: boolean): Vector3;
+        applyMatrix4(matrix: Matrix4, optionalNormalMatrix?: Matrix3): Plane;
+        translate(offset: Vector3): Plane;
+        equals(plane: Plane): boolean;
+
+        isIntersectionLine(l: any): any; // deprecated, use instersectsLine()
+    }
+
+    export class Spherical {
+        constructor(radius?: number, phi?: number, theta?: number);
+
+        set(radius: number, phi: number, theta: number): void;
+        clone(): Spherical;
+        copy(other: Spherical): Spherical;
+        makeSafe(): void;
+        setFromVector3(vec3: Vector3): Spherical;
+    }
+
+    /**
+     * Implementation of a quaternion. This is used for rotating things without incurring in the dreaded gimbal lock issue, amongst other advantages.
+     *
+     * @example
+     * var quaternion = new THREE.Quaternion();
+     * quaternion.setFromAxisAngle( new THREE.Vector3( 0, 1, 0 ), Math.PI / 2 );
+     * var vector = new THREE.Vector3( 1, 0, 0 );
+     * vector.applyQuaternion( quaternion );
+     */
+    export class Quaternion {
+        /**
+         * @param x x coordinate
+         * @param y y coordinate
+         * @param z z coordinate
+         * @param w w coordinate
+         */
+        constructor(x?: number, y?: number, z?: number, w?: number);
+
+        x: number;
+        y: number;
+        z: number;
+        w: number;
+
+        /**
+         * Sets values of this quaternion.
+         */
+        set(x: number, y: number, z: number, w: number): Quaternion;
+
+        /**
+         * Clones this quaternion.
+         */
+        clone(): Quaternion;
+
+        /**
+         * Copies values of q to this quaternion.
+         */
+        copy(q: Quaternion): Quaternion;
+
+        /**
+         * Sets this quaternion from rotation specified by Euler angles.
+         */
+        setFromEuler(euler: Euler, update?: boolean): Quaternion;
+
+        /**
+         * Sets this quaternion from rotation specified by axis and angle.
+         * Adapted from http://www.euclideanspace.com/maths/geometry/rotations/conversions/angleToQuaternion/index.htm.
+         * Axis have to be normalized, angle is in radians.
+         */
+        setFromAxisAngle(axis: Vector3, angle: number): Quaternion;
+
+        /**
+         * Sets this quaternion from rotation component of m. Adapted from http://www.euclideanspace.com/maths/geometry/rotations/conversions/matrixToQuaternion/index.htm.
+         */
+        setFromRotationMatrix(m: Matrix4): Quaternion;
+        setFromUnitVectors(vFrom: Vector3, vTo: Vector3): Quaternion;
+        /**
+         * Inverts this quaternion.
+         */
+        inverse(): Quaternion;
+
+        conjugate(): Quaternion;
+        dot(v: Vector3): number;
+        lengthSq(): number;
+
+        /**
+         * Computes length of this quaternion.
+         */
+        length(): number;
+
+        /**
+         * Normalizes this quaternion.
+         */
+        normalize(): Quaternion;
+
+        /**
+         * Multiplies this quaternion by b.
+         */
+        multiply(q: Quaternion): Quaternion;
+
+        /**
+         * Sets this quaternion to a x b
+         * Adapted from http://www.euclideanspace.com/maths/algebra/realNormedAlgebra/quaternions/code/index.htm.
+         */
+        multiplyQuaternions(a: Quaternion, b: Quaternion): Quaternion;
+
+        multiplyVector3(v: any): any; // deprecated, use vector.applyQuaternion( quaternion )
+
+        slerp(qb: Quaternion, t: number): Quaternion;
+        equals(v: Quaternion): boolean;
+        fromArray(n: number[]): Quaternion;
+        toArray(): number[];
+
+        fromArray(xyzw: number[], offset?: number): Quaternion;
+        toArray(xyzw?: number[], offset?: number): number[];
+
+        onChange(callback: Function): Quaternion;
+        onChangeCallback: Function;
+
+        /**
+         * Adapted from http://www.euclideanspace.com/maths/algebra/realNormedAlgebra/quaternions/slerp/.
+         */
+        static slerp(qa: Quaternion, qb: Quaternion, qm: Quaternion, t: number): Quaternion;
+        
+        static slerpFlat(dst: number[], dstOffset: number, src0: number[], srcOffset: number, src1: number[], stcOffset1: number, t: number): Quaternion;
+    }
+
+    export class Ray {
+        constructor(origin?: Vector3, direction?: Vector3);
+
+        origin: Vector3;
+        direction: Vector3;
+
+        set(origin: Vector3, direction: Vector3): Ray;
+        clone(): Ray;
+        copy(ray: Ray): Ray;
+        at(t: number, optionalTarget?: Vector3): Vector3;
+        lookAt(v: Vector3): Vector3;
+        recast(t: number): Ray;
+        closestPointToPoint(point: Vector3, optionalTarget?: Vector3): Vector3;
+        distanceToPoint(point: Vector3): number;
+        distanceSqToPoint(point: Vector3): number;
+        distanceSqToSegment(v0: Vector3, v1: Vector3, optionalPointOnRay?: Vector3, optionalPointOnSegment?: Vector3): number;
+        intersectSphere(sphere: Sphere, optionalTarget?: Vector3): Vector3;
+        intersectsSphere(sphere: Sphere): boolean;
+        distanceToPlane(plane: Plane): number;
+        intersectPlane(plane: Plane, optionalTarget?: Vector3): Vector3;
+        intersectsPlane(plane: Plane): boolean;
+        intersectBox(box: Box3, optionalTarget?: Vector3): Vector3;
+        intersectsBox(box: Box3): boolean;
+        intersectTriangle(a: Vector3, b: Vector3, c: Vector3, backfaceCulling: boolean, optionalTarget?: Vector3): Vector3;
+        applyMatrix4(matrix4: Matrix4): Ray;
+        equals(ray: Ray): boolean;
+        
+        isIntersectionSphere(s: any): any; // deprecated, use intersectsSphere()
+        isIntersectionPlane(p: any): any; // deprecated, use intersectsPlane()
+        isIntersectionBox(b: any): any; // deprecated, use intersectsBox()
+    }
+
+    export class Sphere {
+        constructor(center?: Vector3, radius?: number);
+
+        center: Vector3;
+        radius: number;
+
+        set(center: Vector3, radius: number): Sphere;
+        setFromPoints(points: Vector3[], optionalCenter?: Vector3): Sphere;
+        clone(): Sphere;
+        copy(sphere: Sphere): Sphere;
+        empty(): boolean;
+        containsPoint(point: Vector3): boolean;
+        distanceToPoint(point: Vector3): number;
+        intersectsSphere(sphere: Sphere): boolean;
+        intersectsBox(box: Box3): boolean;
+        intersectsPlane(plane: Plane): boolean;
+        clampPoint(point: Vector3, optionalTarget?: Vector3): Vector3;
+        getBoundingBox(optionalTarget?: Box3): Box3;
+        applyMatrix4(matrix: Matrix4): Sphere;
+        translate(offset: Vector3): Sphere;
+        equals(sphere: Sphere): boolean;
+    }
+
+    export interface SplineControlPoint {
+        x: number;
+        y: number;
+        z: number;
+    }
+
+    /**
+     * Represents a spline.
+     *
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/math/Spline.js">src/math/Spline.js</a>
+     */
+    export class Spline {
+        /**
+         * Initialises the spline with points, which are the places through which the spline will go.
+         */
+        constructor(points: SplineControlPoint[]);
+
+        points: SplineControlPoint[];
+
+        /**
+         * Initialises using the data in the array as a series of points. Each value in a must be another array with three values, where a[n] is v, the value for the nth point, and v[0], v[1] and v[2] are the x, y and z coordinates of that point n, respectively.
+         *
+         * @param a array of triplets containing x, y, z coordinates
+         */
+        initFromArray(a: number[][]): void;
+
+        /**
+         * Return the interpolated point at k.
+         *
+         * @param k point index
+         */
+        getPoint(k: number): SplineControlPoint;
+
+        /**
+         * Returns an array with triplets of x, y, z coordinates that correspond to the current control points.
+         */
+        getControlPointsArray(): number[][];
+
+        /**
+         * Returns the length of the spline when using nSubDivisions.
+         * @param nSubDivisions number of subdivisions between control points. Default is 100.
+         */
+        getLength(nSubDivisions?: number): { chunks: number[]; total: number; };
+
+        /**
+         * Modifies the spline so that it looks similar to the original but has its points distributed in such way that moving along the spline it's done at a more or less constant speed. The points should also appear more uniformly spread along the curve.
+         * This is done by resampling the original spline, with the density of sampling controlled by samplingCoef. Here it's interesting to note that denser sampling is not necessarily better: if sampling is too high, you may get weird kinks in curvature.
+         *
+         * @param samplingCoef how many intermediate values to use between spline points
+         */
+        reparametrizeByArcLength(samplingCoef: number): void;
+    }
+
+    class Triangle {
+        constructor(a?: Vector3, b?: Vector3, c?: Vector3);
+
+        a: Vector3;
+        b: Vector3;
+        c: Vector3;
+
+        set(a: Vector3, b: Vector3, c: Vector3): Triangle;
+        setFromPointsAndIndices(points: Vector3[], i0: number, i1: number, i2: number): Triangle;
+        clone(): Triangle;
+        copy(triangle: Triangle): Triangle;
+        area(): number;
+        midpoint(optionalTarget?: Vector3): Vector3;
+        normal(optionalTarget?: Vector3): Vector3;
+        plane(optionalTarget?: Vector3): Plane;
+        barycoordFromPoint(point: Vector3, optionalTarget?: Vector3): Vector3;
+        containsPoint(point: Vector3): boolean;
+        equals(triangle: Triangle): boolean;
+
+        static normal(a: Vector3, b: Vector3, c: Vector3, optionalTarget?: Vector3): Vector3;
+        static barycoordFromPoint(point: Vector3, a: Vector3, b: Vector3, c: Vector3, optionalTarget: Vector3): Vector3;
+        static containsPoint(point: Vector3, a: Vector3, b: Vector3, c: Vector3): boolean;
+    }
+
+    /**
+     * ( interface Vector&lt;T&gt; )
+     *
+     * Abstract interface of Vector2, Vector3 and Vector4.
+     * Currently the members of Vector is NOT type safe because it accepts different typed vectors.
+     * Those definitions will be changed when TypeScript innovates Generics to be type safe.
+     *
+     * @example
+     * var v:THREE.Vector = new THREE.Vector3();
+     * v.addVectors(new THREE.Vector2(0, 1), new THREE.Vector2(2, 3));    // invalid but compiled successfully
+     */
+    export interface Vector {
+        setComponent(index: number, value: number): void;
+
+        getComponent(index: number): number;
+
+        /**
+         * copy(v:T):T;
+         */
+        copy(v: Vector): Vector;
+
+        /**
+         * add(v:T):T;
+         */
+        add(v: Vector): Vector;
+
+        /**
+         * addVectors(a:T, b:T):T;
+         */
+        addVectors(a: Vector, b: Vector): Vector;
+
+        /**
+         * sub(v:T):T;
+         */
+        sub(v: Vector): Vector;
+
+        /**
+         * subVectors(a:T, b:T):T;
+         */
+        subVectors(a: Vector, b: Vector): Vector;
+
+        /**
+         * multiplyScalar(s:number):T;
+         */
+        multiplyScalar(s: number): Vector;
+
+        /**
+         * divideScalar(s:number):T;
+         */
+        divideScalar(s: number): Vector;
+
+        /**
+         * negate():T;
+         */
+        negate(): Vector;
+
+        /**
+         * dot(v:T):T;
+         */
+        dot(v: Vector): number;
+
+        /**
+         * lengthSq():number;
+         */
+        lengthSq(): number;
+
+        /**
+         * length():number;
+         */
+        length(): number;
+
+        /**
+         * normalize():T;
+         */
+        normalize(): Vector;
+
+        /**
+         * NOTE: Vector4 doesn't have the property.
+         *
+         * distanceTo(v:T):number;
+         */
+        distanceTo?(v: Vector): number;
+
+        /**
+         * NOTE: Vector4 doesn't have the property.
+         *
+         * distanceToSquared(v:T):number;
+         */
+        distanceToSquared?(v: Vector): number;
+
+        /**
+         * setLength(l:number):T;
+         */
+        setLength(l: number): Vector;
+
+        /**
+         * lerp(v:T, alpha:number):T;
+         */
+        lerp(v: Vector, alpha: number): Vector;
+
+        /**
+         * equals(v:T):boolean;
+         */
+        equals(v: Vector): boolean;
+
+        /**
+         * clone():T;
+         */
+        clone(): Vector;
+    }
+
+    /**
+     * 2D vector.
+     *
+     * ( class Vector2 implements Vector<Vector2> )
+     */
+    export class Vector2 implements Vector {
+        constructor(x?: number, y?: number);
+
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+
+        /**
+         * Sets value of this vector.
+         */
+        set(x: number, y: number): Vector2;
+
+        setScalar(scalar: number): Vector2;
+
+        /**
+         * Sets X component of this vector.
+         */
+        setX(x: number): Vector2;
+
+        /**
+         * Sets Y component of this vector.
+         */
+        setY(y: number): Vector2;
+
+        /**
+         * Sets a component of this vector.
+         */
+        setComponent(index: number, value: number): void;
+
+        /**
+         * Gets a component of this vector.
+         */
+        getComponent(index: number): number;
+        /**
+         * Clones this vector.
+         */
+        clone(): Vector2;
+        /**
+         * Copies value of v to this vector.
+         */
+        copy(v: Vector2): Vector2;
+
+        /**
+         * Adds v to this vector.
+         */
+        add(v: Vector2): Vector2;
+
+        /**
+         * Sets this vector to a + b.
+         */
+        addScalar(s: number): Vector2;
+        addVectors(a: Vector2, b: Vector2): Vector2;
+        addScaledVector( v: Vector2, s: number ): Vector2;
+        /**
+         * Subtracts v from this vector.
+         */
+        sub(v: Vector2): Vector2;
+
+        /**
+         * Sets this vector to a - b.
+         */
+        subVectors(a: Vector2, b: Vector2): Vector2;
+
+        multiply(v: Vector2): Vector2;
+        /**
+         * Multiplies this vector by scalar s.
+         */
+        multiplyScalar(scalar: number): Vector2;
+
+        divide(v: Vector2): Vector2;
+        /**
+         * Divides this vector by scalar s.
+         * Set vector to ( 0, 0 ) if s == 0.
+         */
+        divideScalar(s: number): Vector2;
+
+        min(v: Vector2): Vector2;
+
+        max(v: Vector2): Vector2;
+        clamp(min: Vector2, max: Vector2): Vector2;
+        clampScalar(min: number, max: number): Vector2;
+        clampLength(min: number, max: number): Vector2;
+        floor(): Vector2;
+        ceil(): Vector2;
+        round(): Vector2;
+        roundToZero(): Vector2;
+
+        /**
+         * Inverts this vector.
+         */
+        negate(): Vector2;
+
+        /**
+         * Computes dot product of this vector and v.
+         */
+        dot(v: Vector2): number;
+
+        /**
+         * Computes squared length of this vector.
+         */
+        lengthSq(): number;
+
+        /**
+         * Computes length of this vector.
+         */
+        length(): number;
+        lengthManhattan(): number;
+
+        /**
+         * Normalizes this vector.
+         */
+        normalize(): Vector2;
+
+        /**
+         * computes the angle in radians with respect to the positive x-axis
+         */
+        angle(): number;
+
+        /**
+         * Computes distance of this vector to v.
+         */
+        distanceTo(v: Vector2): number;
+
+        /**
+         * Computes squared distance of this vector to v.
+         */
+        distanceToSquared(v: Vector2): number;
+
+        /**
+         * Normalizes this vector and multiplies it by l.
+         */
+        setLength(length: number): Vector2;
+
+        lerp(v: Vector2, alpha: number): Vector2;
+
+        lerpVectors(v1: Vector2, v2: Vector2, alpha: number): Vector2;
+
+        /**
+         * Checks for strict equality of this vector and v.
+         */
+        equals(v: Vector2): boolean;
+
+        fromArray(xy: number[], offset?: number): Vector2;
+
+        toArray(xy?: number[], offset?: number): number[];
+
+        fromAttribute( attribute: BufferAttribute, index: number, offset?: number): Vector2;
+
+        rotateAround( center: Vector2, angle: number ): Vector2;
+    }
+
+    /**
+     * 3D vector.
+     *
+     * @example
+     * var a = new THREE.Vector3( 1, 0, 0 );
+     * var b = new THREE.Vector3( 0, 1, 0 );
+     * var c = new THREE.Vector3();
+     * c.crossVectors( a, b );
+     *
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/math/Vector3.js">src/math/Vector3.js</a>
+     *
+     * ( class Vector3 implements Vector<Vector3> )
+     */
+    export class Vector3 implements Vector {
+        constructor(x?: number, y?: number, z?: number);
+
+        x: number;
+        y: number;
+        z: number;
+
+        /**
+         * Sets value of this vector.
+         */
+        set(x: number, y: number, z: number): Vector3;
+
+        /**
+         * Sets all values of this vector.
+         */
+        setScalar(scalar: number): Vector3;
+
+        /**
+         * Sets x value of this vector.
+         */
+        setX(x: number): Vector3;
+
+        /**
+         * Sets y value of this vector.
+         */
+        setY(y: number): Vector3;
+
+        /**
+         * Sets z value of this vector.
+         */
+        setZ(z: number): Vector3;
+
+        setComponent(index: number, value: number): void;
+        getComponent(index: number): number;
+        /**
+         * Clones this vector.
+         */
+        clone(): Vector3;
+        /**
+         * Copies value of v to this vector.
+         */
+        copy(v: Vector3): Vector3;
+
+        /**
+         * Adds v to this vector.
+         */
+        add(a: Vector3): Vector3;
+        addScalar(s: number): Vector3;
+        addScaledVector(v: Vector3, s: number): Vector3;
+
+        /**
+         * Sets this vector to a + b.
+         */
+        addVectors(a: Vector3, b: Vector3): Vector3;
+
+        /**
+         * Subtracts v from this vector.
+         */
+        sub(a: Vector3): Vector3;
+
+        subScalar( s: number ): Vector3;
+
+        /**
+         * Sets this vector to a - b.
+         */
+        subVectors(a: Vector3, b: Vector3): Vector3;
+
+        multiply(v: Vector3): Vector3;
+        /**
+         * Multiplies this vector by scalar s.
+         */
+        multiplyScalar(s: number): Vector3;
+        multiplyVectors(a: Vector3, b: Vector3): Vector3;
+        applyEuler(euler: Euler): Vector3;
+        applyAxisAngle(axis: Vector3, angle: number): Vector3;
+        applyMatrix3(m: Matrix3): Vector3;
+        applyMatrix4(m: Matrix4): Vector3;
+        applyProjection(m: Matrix4): Vector3;
+        applyQuaternion(q: Quaternion): Vector3;
+        project(camrea: Camera): Vector3;
+        unproject(camera: Camera): Vector3;
+        transformDirection(m: Matrix4): Vector3;
+        divide(v: Vector3): Vector3;
+
+        /**
+         * Divides this vector by scalar s.
+         * Set vector to ( 0, 0, 0 ) if s == 0.
+         */
+        divideScalar(s: number): Vector3;
+        min(v: Vector3): Vector3;
+        max(v: Vector3): Vector3;
+        clamp(min: Vector3, max: Vector3): Vector3;
+        clampScalar(min: number, max: number): Vector3;
+        clampLength(min: number, max: number): Vector3;
+        floor(): Vector3;
+        ceil(): Vector3;
+        round(): Vector3;
+        roundToZero(): Vector3;
+
+        /**
+         * Inverts this vector.
+         */
+        negate(): Vector3;
+
+        /**
+         * Computes dot product of this vector and v.
+         */
+        dot(v: Vector3): number;
+
+        /**
+         * Computes squared length of this vector.
+         */
+        lengthSq(): number;
+
+        /**
+         * Computes length of this vector.
+         */
+        length(): number;
+
+        /**
+         * Computes Manhattan length of this vector.
+         * http://en.wikipedia.org/wiki/Taxicab_geometry
+         */
+        lengthManhattan(): number;
+
+        /**
+         * Normalizes this vector.
+         */
+        normalize(): Vector3;
+
+        /**
+         * Normalizes this vector and multiplies it by l.
+         */
+        setLength(l: number): Vector3;
+        lerp(v: Vector3, alpha: number): Vector3;
+
+        lerpVectors(v1: Vector3, v2: Vector3, alpha: number): Vector3;
+
+        /**
+         * Sets this vector to cross product of itself and v.
+         */
+        cross(a: Vector3): Vector3;
+
+        /**
+         * Sets this vector to cross product of a and b.
+         */
+        crossVectors(a: Vector3, b: Vector3): Vector3;
+        projectOnVector(v: Vector3): Vector3;
+        projectOnPlane(planeNormal: Vector3): Vector3;
+        reflect(vector: Vector3): Vector3;
+        angleTo(v: Vector3): number;
+
+        /**
+         * Computes distance of this vector to v.
+         */
+        distanceTo(v: Vector3): number;
+
+        /**
+         * Computes squared distance of this vector to v.
+         */
+        distanceToSquared(v: Vector3): number;
+
+        setFromSpherical(s: Spherical): Matrix3;
+        getPositionFromMatrix(m: Matrix4): Vector3; // deprecated, use setFromMatrixPosition()
+        setFromMatrixPosition(m: Matrix4): Vector3;
+        getScaleFromMatrix(m: Matrix4): Vector3; // deprecated, use setFromMatrixScale()
+        setFromMatrixScale(m: Matrix4): Vector3;
+        getColumnFromMatrixColumn(index: number, matrix: Matrix4): Vector3; // deprecated, use setFromMatrixColumn()
+        setFromMatrixColumn(matrix: Matrix4, index: number): Vector3;
+        setFromMatrixColumn(index: number, matrix: Matrix4): Vector3; // deprecated, now expects ( matrix, index )
+
+        /**
+         * Checks for strict equality of this vector and v.
+         */
+        equals(v: Vector3): boolean;
+
+        fromArray(xyz: number[], offset?: number): Vector3;
+
+        toArray(xyz?: number[], offset?: number): number[];
+
+        fromAttribute( attribute: BufferAttribute, index: number, offset?: number): Vector3;
+    }
+
+    export class Vertex extends Vector3 {} // deprecated, use Vector3
+
+    /**
+     * 4D vector.
+     *
+     * ( class Vector4 implements Vector<Vector4> )
+     */
+    export class Vector4 implements Vector {
+        constructor(x?: number, y?: number, z?: number, w?: number);
+
+        x: number;
+        y: number;
+        z: number;
+        w: number;
+
+        /**
+         * Sets value of this vector.
+         */
+        set(x: number, y: number, z: number, w: number): Vector4;
+
+        /**
+         * Sets all values of this vector.
+         */
+        setScalar(scalar: number): Vector4;
+        
+        /**
+         * Sets X component of this vector.
+         */
+        setX(x: number): Vector4;
+
+        /**
+         * Sets Y component of this vector.
+         */
+        setY(y: number): Vector4;
+
+        /**
+         * Sets Z component of this vector.
+         */
+        setZ(z: number): Vector4;
+
+        /**
+         * Sets w component of this vector.
+         */
+        setW(w: number): Vector4;
+
+        setComponent(index: number, value: number): void;
+        getComponent(index: number): number;
+        /**
+         * Clones this vector.
+         */
+        clone(): Vector4;
+        /**
+         * Copies value of v to this vector.
+         */
+        copy(v: Vector4): Vector4;
+
+        /**
+         * Adds v to this vector.
+         */
+        add(v: Vector4): Vector4;
+        addScalar(s: number): Vector4;
+
+        /**
+         * Sets this vector to a + b.
+         */
+        addVectors(a: Vector4, b: Vector4): Vector4;
+        addScaledVector( v: Vector4, s: number ): Vector4;
+        /**
+         * Subtracts v from this vector.
+         */
+        sub(v: Vector4): Vector4;
+
+        subScalar(s: number): Vector4;
+
+        /**
+         * Sets this vector to a - b.
+         */
+        subVectors(a: Vector4, b: Vector4): Vector4;
+
+        /**
+         * Multiplies this vector by scalar s.
+         */
+        multiplyScalar(s: number): Vector4;
+        applyMatrix4(m: Matrix4): Vector4;
+
+        /**
+         * Divides this vector by scalar s.
+         * Set vector to ( 0, 0, 0 ) if s == 0.
+         */
+        divideScalar(s: number): Vector4;
+
+        /**
+         * http://www.euclideanspace.com/maths/geometry/rotations/conversions/quaternionToAngle/index.htm
+         * @param q is assumed to be normalized
+         */
+        setAxisAngleFromQuaternion(q: Quaternion): Vector4;
+
+        /**
+         * http://www.euclideanspace.com/maths/geometry/rotations/conversions/matrixToAngle/index.htm
+         * @param m assumes the upper 3x3 of m is a pure rotation matrix (i.e, unscaled)
+         */
+        setAxisAngleFromRotationMatrix(m: Matrix3): Vector4;
+
+        min(v: Vector4): Vector4;
+        max(v: Vector4): Vector4;
+        clamp(min: Vector4, max: Vector4): Vector4;
+        clampScalar(min: number, max: number): Vector4;
+        floor(): Vector4;
+        ceil(): Vector4;
+        round(): Vector4;
+        roundToZero(): Vector4;
+
+        /**
+         * Inverts this vector.
+         */
+        negate(): Vector4;
+
+        /**
+         * Computes dot product of this vector and v.
+         */
+        dot(v: Vector4): number;
+
+        /**
+         * Computes squared length of this vector.
+         */
+        lengthSq(): number;
+
+        /**
+         * Computes length of this vector.
+         */
+        length(): number;
+        lengthManhattan(): number;
+
+        /**
+         * Normalizes this vector.
+         */
+        normalize(): Vector4;
+        /**
+         * Normalizes this vector and multiplies it by l.
+         */
+        setLength(length: number): Vector4;
+
+        /**
+         * Linearly interpolate between this vector and v with alpha factor.
+         */
+        lerp(v: Vector4, alpha: number): Vector4;
+
+        lerpVectors(v1: Vector4, v2: Vector4, alpha: number): Vector4;
+
+        /**
+         * Checks for strict equality of this vector and v.
+         */
+        equals(v: Vector4): boolean;
+
+        fromArray(xyzw: number[], offset?: number): Vector4;
+
+        toArray(xyzw?: number[], offset?: number): number[];
+
+        fromAttribute( attribute: BufferAttribute, index: number, offset?: number): Vector4;
+    }
+
+    export abstract class Interpolant {
+        constructor(parameterPositions: any, samplesValues: any, sampleSize: number, resultBuffer?: any);
+
+        parameterPositions: any;
+        samplesValues: any;
+        valueSize: number;
+        resultBuffer: any;
+
+        evaluate(time: number): any;
+    }
+
+    export class CubicInterpolant extends Interpolant {
+        constructor(parameterPositions: any, samplesValues: any, sampleSize: number, resultBuffer?: any);
+
+        interpolate_(i1: number, t0: number, t: number, t1: number): any;
+    }
+    
+    export class DiscreteInterpolant extends Interpolant {
+        constructor(parameterPositions: any, samplesValues: any, sampleSize: number, resultBuffer?: any);
+
+        interpolate_(i1: number, t0: number, t: number, t1: number): any;
+    }
+
+    export class LinearInterpolant extends Interpolant {
+        constructor(parameterPositions: any, samplesValues: any, sampleSize: number, resultBuffer?: any);
+
+        interpolate_(i1: number, t0: number, t: number, t1: number): any;
+    }
+
+    export class QuaternionLinearInterpolant extends Interpolant {
+        constructor(parameterPositions: any, samplesValues: any, sampleSize: number, resultBuffer?: any);
+
+        interpolate_(i1: number, t0: number, t: number, t1: number): any;
+    }
+
+    // Objects //////////////////////////////////////////////////////////////////////////////////
+
+    export class Bone extends Object3D {
+        constructor(skin: SkinnedMesh);
+
+        skin: SkinnedMesh;
+
+        clone(): Bone;
+        copy(source: Bone): Bone;
+    }
+
+    export class Group extends Object3D {
+        constructor();
+    }
+
+    export class LOD extends Object3D {
+        constructor();
+
+        levels: any[];
+        objects: any[]; // deprecated, use .levels
+
+        addLevel(object: Object3D, distance?: number): void;
+        getObjectForDistance(distance: number): Object3D;
+        raycast(raycaster: Raycaster, intersects: any): void;
+        update(camera: Camera): void;
+
+        clone(): LOD;
+        copy(source: LOD): LOD;
+        toJSON(meta: any): any;
+    }
+
+    export interface LensFlareProperty {
+        texture: Texture;             // Texture
+        size: number;             // size in pixels (-1 = use texture.width)
+        distance: number;             // distance (0-1) from light source (0=at light source)
+        x: number;
+        y: number;
+        z: number;            // screen position (-1 =>  1) z = 0 is ontop z = 1 is back
+        scale: number;             // scale
+        rotation: number;             // rotation
+        opacity: number;            // opacity
+        color: Color;                // color
+        blending: Blending;
+    }
+
+    export class LensFlare extends Object3D {
+        constructor(texture?: Texture, size?: number, distance?: number, blending?: Blending, color?: Color);
+
+        lensFlares: LensFlareProperty[];
+        positionScreen: Vector3;
+        customUpdateCallback: (object: LensFlare) => void;
+
+        add(object: Object3D): void;
+        add(texture: Texture, size?: number, distance?: number, blending?: Blending, color?: Color): void;
+        updateLensFlares(): void;
+        clone(): LensFlare;
+        copy(source: LensFlare): LensFlare;
+    }
+
+    export class Line extends Object3D {
+        constructor(
+            geometry?: Geometry | BufferGeometry,
+            material?: LineDashedMaterial | LineBasicMaterial | ShaderMaterial,
+            mode?: number
+        );
+
+        geometry: Geometry|BufferGeometry;
+        material: Material; // LineDashedMaterial or LineBasicMaterial or ShaderMaterial
+
+        raycast(raycaster: Raycaster, intersects: any): void;
+        clone(): Line;
+        copy(source: Line): Line;
+    }
+
+    export class LineSegments extends Line {
+        constructor(
+            geometry?: Geometry | BufferGeometry,
+            material?: LineDashedMaterial | LineBasicMaterial | ShaderMaterial,
+            mode?: number
+        );
+
+        clone(): LineSegments;
+        copy(source: LineSegments): LineSegments;
+    }
+
+    enum LineMode {}
+    var LineStrip: LineMode; // deprecated
+    var LinePieces: LineMode; // deprecated
+
+    export class Mesh extends Object3D {
+        constructor(geometry?: Geometry, material?: Material);
+        constructor(geometry?: BufferGeometry, material?: Material);
+
+        geometry: Geometry|BufferGeometry;
+        material: Material;
+        drawMode: TrianglesDrawModes;
+
+        setDrawMode(drawMode: TrianglesDrawModes): void;
+        updateMorphTargets(): void;
+        getMorphTargetIndexByName(name: string): number;
+        raycast(raycaster: Raycaster, intersects: any): void;
+        clone(): Mesh;
+        copy(source: Mesh): Mesh;
+    }
+
+    /**
+     * A class for displaying particles in the form of variable size points. For example, if using the WebGLRenderer, the particles are displayed using GL_POINTS.
+     *
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/objects/ParticleSystem.js">src/objects/ParticleSystem.js</a>
+     */
+    export class Points extends Object3D {
+
+        /**
+         * @param geometry An instance of Geometry or BufferGeometry.
+         * @param material An instance of Material (optional).
+         */
+        constructor(
+            geometry?: Geometry | BufferGeometry,
+            material?: Material
+        );
+
+        /**
+         * An instance of Geometry or BufferGeometry, where each vertex designates the position of a particle in the system.
+         */
+        geometry: Geometry | BufferGeometry;
+
+        /**
+         * An instance of Material, defining the object's appearance. Default is a PointsMaterial with randomised colour.
+         */
+        material: Material;
+
+        raycast(raycaster: Raycaster, intersects: any): void;
+        clone(): Points;
+        copy(source: Points): Points;
+    }
+
+    export class PointCloud extends Points {} // deprecated, use Points
+    export class ParticleSystem extends Points {} // deprecated, use Points
+
+    export class Skeleton {
+        constructor(bones: Bone[], boneInverses?: Matrix4[], useVertexTexture?: boolean);
+
+        useVertexTexture: boolean;
+        identityMatrix: Matrix4;
+        bones: Bone[];
+        boneTextureWidth: number;
+        boneTextureHeight: number;
+        boneMatrices: Float32Array;
+        boneTexture: DataTexture;
+        boneInverses: Matrix4[];
+
+        calculateInverses(bone: Bone): void;
+        pose(): void;
+        update(): void;
+        clone(): Skeleton;
+    }
+
+    export class SkinnedMesh extends Mesh {
+        constructor(geometry?: Geometry|BufferGeometry, material?: MeshBasicMaterial, useVertexTexture?: boolean);
+        constructor(geometry?: Geometry|BufferGeometry, material?: MeshDepthMaterial, useVertexTexture?: boolean);
+        constructor(geometry?: Geometry|BufferGeometry, material?: MultiMaterial, useVertexTexture?: boolean);
+        constructor(geometry?: Geometry|BufferGeometry, material?: MeshLambertMaterial, useVertexTexture?: boolean);
+        constructor(geometry?: Geometry|BufferGeometry, material?: MeshNormalMaterial, useVertexTexture?: boolean);
+        constructor(geometry?: Geometry|BufferGeometry, material?: MeshPhongMaterial, useVertexTexture?: boolean);
+        constructor(geometry?: Geometry|BufferGeometry, material?: ShaderMaterial, useVertexTexture?: boolean);
+
+        bindMode: string;
+        bindMatrix: Matrix4;
+        bindMatrixInverse: Matrix4;
+        skeleton: Skeleton;
+
+        bind( skeleton: Skeleton, bindMatrix?: Matrix4 ): void;
+        pose(): void;
+        normalizeSkinWeights(): void;
+        updateMatrixWorld(force?: boolean): void;
+        clone(): SkinnedMesh;
+        copy(source: SkinnedMesh): SkinnedMesh;
+    }
+
+    export class Sprite extends Object3D {
+        constructor(material?: Material);
+
+        geometry: BufferGeometry;
+        material: SpriteMaterial;
+
+        raycast(raycaster: Raycaster, intersects: any): void;
+        clone(): Sprite;
+        copy(source: Sprite): Sprite;
+    }
+
+    export class Particle extends Sprite {} // deprecated, use Sprite
+
+
+    // Renderers //////////////////////////////////////////////////////////////////////////////////
+
+    export interface Renderer {
+        render(scene: Scene, camera: Camera): void;
+        setSize(width:number, height:number, updateStyle?:boolean): void;
+        domElement: HTMLCanvasElement;
+    }
+
+    export interface WebGLRendererParameters {
+        /**
+         * A Canvas where the renderer draws its output.
+         */
+        canvas?: HTMLCanvasElement;
+
+        /**
+         *  shader precision. Can be "highp", "mediump" or "lowp".
+         */
+        precision?: string;
+
+        /**
+         * default is true.
+         */
+        alpha?: boolean;
+
+        /**
+         * default is true.
+         */
+        premultipliedAlpha?: boolean;
+
+        /**
+         * default is false.
+         */
+        antialias?: boolean;
+
+        /**
+         * default is true.
+         */
+        stencil?: boolean;
+
+        /**
+         * default is false.
+         */
+        preserveDrawingBuffer?: boolean;
+
+        /**
+         * default is 0x000000.
+         */
+        clearColor?: number;
+
+        /**
+         * default is 0.
+         */
+        clearAlpha?: number;
+
+        devicePixelRatio?: number;
+
+        /**
+         * default is false.
+         */
+        logarithmicDepthBuffer?: boolean;
+    }
+
+
+    /**
+     * The WebGL renderer displays your beautifully crafted scenes using WebGL, if your device supports it.
+     * This renderer has way better performance than CanvasRenderer.
+     *
+     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/renderers/WebGLRenderer.js">src/renderers/WebGLRenderer.js</a>
+     */
+    export class WebGLRenderer implements Renderer {
+        /**
+         * parameters is an optional object with properties defining the renderer's behaviour. The constructor also accepts no parameters at all. In all cases, it will assume sane defaults when parameters are missing.
+         */
+        constructor(parameters?: WebGLRendererParameters);
+
+        /**
+         * A Canvas where the renderer draws its output.
+         * This is automatically created by the renderer in the constructor (if not provided already); you just need to add it to your page.
+         */
+        domElement: HTMLCanvasElement;
+
+        /**
+         * The HTML5 Canvas's 'webgl' context obtained from the canvas where the renderer will draw.
+         */
+        context: WebGLRenderingContext;
+
+        /**
+         * Defines whether the renderer should automatically clear its output before rendering.
+         */
+        autoClear: boolean;
+
+        /**
+         * If autoClear is true, defines whether the renderer should clear the color buffer. Default is true.
+         */
+        autoClearColor: boolean;
+
+        /**
+         * If autoClear is true, defines whether the renderer should clear the depth buffer. Default is true.
+         */
+        autoClearDepth: boolean;
+
+        /**
+         * If autoClear is true, defines whether the renderer should clear the stencil buffer. Default is true.
+         */
+        autoClearStencil: boolean;
+
+        /**
+         * Defines whether the renderer should sort objects. Default is true.
+         */
+        sortObjects: boolean;
+
+        extensions: WebGLExtensions;
+
+        gammaFactor: number; // deprecated
+
+        /**
+         * Default is false.
+         */
+        gammaInput: boolean;
+
+        /**
+         * Default is false.
+         */
+        gammaOutput: boolean;
+
+        physicallyCorrectLights: boolean;
+        toneMapping: ToneMapping;
+        toneMappingExposure: number;
+        toneMappingWhitePoint: number;
+
+        /**
+         * Default is false.
+         */
+        shadowMapDebug: boolean;
+
+        /**
+         * Default is 8.
+         */
+        maxMorphTargets: number;
+
+        /**
+         * Default is 4.
+         */
+        maxMorphNormals: number;
+
+        /**
+         * Default is true.
+         */
+        autoScaleCubemaps: boolean;
+
+        /**
+         * An object with a series of statistical information about the graphics board memory and the rendering process. Useful for debugging or just for the sake of curiosity. The object contains the following fields:
+         */
+        info: {
+            memory: {
+                geometries: number;
+                textures: number;
+            };
+            render: {
+                calls: number;
+                vertices: number;
+                faces: number;
+                points: number;
+            };
+            programs: number;
+        };
+
+        shadowMap: WebGLShadowMap;
+        shadowMapType: ShadowMapType; // deprecated, use shadowMap.type
+        shadowMapEnabled: boolean; // deprecated, use shadowMap.enabled
+        shadowMapCullFace: CullFace; // deprecated, use shadowMap.cullFace
+
+        pixelRation: number;
+
+        capabilities: WebGLCapabilities;
+        properties: WebGLProperties;
+        state: WebGLState;
+
+        /**
+         * Return the WebGL context.
+         */
+        getContext(): WebGLRenderingContext;
+        getContextAttributes(): any;
+        forceContextLoss(): void;
+
+        getMaxAnisotropy(): number;
+        getPrecision(): string;
+        getPixelRatio(): number;
+        setPixelRatio(value: number): void;
+        
+        getSize(): { width: number; height: number; };
+
+        /**
+         * Resizes the output canvas to (width, height), and also sets the viewport to fit that size, starting in (0, 0).
+         */
+        setSize(width: number, height: number, updateStyle?: boolean): void;
+
+        /**
+         * Sets the viewport to render from (x, y) to (x + width, y + height).
+         */
+        setViewport(x?: number, y?: number, width?: number, height?: number): void;
+
+        /**
+         * Sets the scissor area from (x, y) to (x + width, y + height).
+         */
+        setScissor(x: number, y: number, width: number, height: number): void;
+
+        /**
+         * Enable the scissor test. When this is enabled, only the pixels within the defined scissor area will be affected by further renderer actions.
+         */
+        setScissorTest(enable: boolean): void;
+
+        /**
+         * Returns a THREE.Color instance with the current clear color.
+         */
+        getClearColor(): Color;
+
+        /**
+         * Sets the clear color, using color for the color and alpha for the opacity.
+         */
+        setClearColor(color: Color, alpha?: number): void;
+        setClearColor(color: string, alpha?: number): void;
+        setClearColor(color: number, alpha?: number): void;
+        
+        /**
+         * Returns a float with the current clear alpha. Ranges from 0 to 1.
+         */
+        getClearAlpha(): number;
+        
+        setClearAlpha(alpha: number): void;
+
+        /**
+         * Tells the renderer to clear its color, depth or stencil drawing buffer(s).
+         * Arguments default to true
+         */
+        clear(color?: boolean, depth?: boolean, stencil?: boolean): void;
+
+        clearColor(): void;
+        clearDepth(): void;
+        clearStencil(): void;
+        clearTarget(renderTarget:WebGLRenderTarget, color: boolean, depth: boolean, stencil: boolean): void;
+        resetGLState(): void;
+        dispose(): void;
+
+        /**
+         * Tells the shadow map plugin to update using the passed scene and camera parameters.
+         *
+         * @param scene an instance of Scene
+         * @param camera — an instance of Camera
+         */
+        renderBufferImmediate(object: Object3D, program: Object, material: Material): void;
+
+        renderBufferDirect(camera: Camera, fog: Fog, material: Material, geometryGroup: any, object: Object3D): void;
+
+        /**
+         * Render a scene using a camera.
+         * The render is done to the renderTarget (if specified) or to the canvas as usual.
+         * If forceClear is true, the canvas will be cleared before rendering, even if the renderer's autoClear property is false.
+         */
+        render(scene: Scene, camera: Camera, renderTarget?: RenderTarget, forceClear?: boolean): void;
+
+        /**
+         * Used for setting the gl frontFace, cullFace states in the GPU, thus enabling/disabling face culling when rendering.
+         * If cullFace is false, culling will be disabled.
+         * @param cullFace "back", "front", "front_and_back", or false.
+         * @param frontFace "ccw" or "cw
+         */
+        setFaceCulling(cullFace?: CullFace, frontFace?: FrontFaceDirection): void;
+        setTexture(texture: Texture, slot: number): void;
+        getCurrentRenderTarget(): RenderTarget;
+        setRenderTarget(renderTarget: RenderTarget): void;
+        readRenderTargetPixels( renderTarget: RenderTarget, x: number, y: number, width: number, height: number, buffer: any ): void;
+
+        supportsFloatTextures(): any; // deprecated
+        supportsHalfFloatTextures(): any; // deprecated
+        supportsStandardDerivatives(): any; // deprecated
+        supportsCompressedTextureS3TC(): any; // deprecated
+        supportsCompressedTexturePVRTC(): any; // deprecated
+        supportsBlendMinMax(): any; // deprecated
+        supportsVertexTextures(): any; // deprecated
+        supportsInstancedArrays(): any; // deprecated
+        enableScissorTest(boolean: any): any; // deprecated
+    }
+
+    export interface RenderTarget {
+    }
+
+    export interface WebGLRenderTargetOptions {
+        wrapS?: Wrapping;
+        wrapT?: Wrapping;
+        magFilter?: TextureFilter;
+        minFilter?: TextureFilter;
+        format?: number; // RGBAFormat;
+        type?: TextureDataType; // UnsignedByteType;
+        anisotropy?: number; // 1;
+        depthBuffer?: boolean; // true;
+        stencilBuffer?: boolean; // true;
+    }
+
+    export class WebGLRenderTarget implements RenderTarget {
+        constructor(width: number, height: number, options?: WebGLRenderTargetOptions);
+
+        uuid: string;
+        width: number;
+        height: number;
+        scissor: Vector4;
+        scissorTest: boolean;
+        viewpport: Vector4;
+        texture: Texture;
+        depthBuffer: boolean;
+        stencilBuffer: boolean;
+        wrapS: any; // deprecated, use texture.wrapS
+        wrapT: any; // deprecated, use texture.wrapT
+        magFilter: any; // deprecated, use texture.magFilter
+        minFilter: any; // deprecated, use texture.minFilter
+        anisotropy: any; // deprecated, use texture.anisotropy
+        offset: any; // deprecated, use texture.offset
+        repeat: any; // deprecated, use texture.repeat
+        format: any; // deprecated, use texture.format
+        type: any; // deprecated, use texture.type
+        generateMipmaps: any; // deprecated, use texture.generateMipmaps
+
+        setSize(width: number, height: number): void;
+        clone(): WebGLRenderTarget;
+        copy(source: WebGLRenderTarget): WebGLRenderTarget;
+        dispose(): void;
+
+        // EventDispatcher mixins
+        addEventListener(type: string, listener: (event: Event) => void ): void;
+        hasEventListener(type: string, listener: (event: Event) => void): void;
+        removeEventListener(type: string, listener: (event: Event) => void): void;
+        dispatchEvent(event: { type: string; [attachment: string]: any; }): void;
+    }
+
+    export class WebGLRenderTargetCube extends WebGLRenderTarget {
+        constructor(width: number, height: number, options?: WebGLRenderTargetOptions);
+
+        activeCubeFace: number; // PX 0, NX 1, PY 2, NY 3, PZ 4, NZ 5
+        activeMipMapLevel: number;
+    }
+
+    // Renderers / Shaders /////////////////////////////////////////////////////////////////////
+    export let ShaderChunk: {
+        [name: string]: string;
+
+        alphamap_fragment: string;
+        alphamap_pars_fragment: string;
+        alphatest_fragment: string;
+        aomap_fragment: string;
+        aomap_pars_fragment: string;
+        begin_vertex: string;
+        beginnormal_vertex: string;
+        bsdfs: string;
+        bumpmap_pars_fragment: string;
+        color_fragment: string;
+        color_pars_fragment: string;
+        color_pars_vertex: string;
+        color_vertex: string;
+        common: string;
+        cube_frag: string;
+        cube_vert: string;
+        cube_uv_reflection_fragment: string;
+        defaultnormal_vertex: string;
+        depth_frag: string;
+        depth_vert: string;
+        depthRGBA_frag: string;
+        depthRGBA_vert: string;
+        distanceRGBA_frag: string;
+        distanceRGBA_vert: string;
+        displacementmap_vertex: string;
+        displacementmap_pars_vertex: string;
+        emissivemap_fragment: string;
+        emissivemap_pars_fragment: string;
+        encodings_pars_fragment: string;
+        encodings_fragment: string;
+        envmap_fragment: string;
+        envmap_pars_fragment: string;
+        envmap_pars_vertex: string;
+        envmap_vertex: string;
+        equirect_frag: string;
+        equirect_vert: string;
+        fog_fragment: string;
+        fog_pars_fragment: string;
+        linedashed_frag: string;
+        linedashed_vert: string;
+        lightmap_fragment: string;
+        lightmap_pars_fragment: string;
+        lights_lambert_vertex: string;
+        lights_pars: string;
+        lights_phong_fragment: string;
+        lights_phong_pars_fragment: string;
+        lights_phong_pars_vertex: string;
+        lights_phong_vertex: string;
+        lights_standard_fragment: string;
+        lights_standard_pars_fragment: string;
+        lights_template: string;
+        logdepthbuf_fragment: string;
+        logdepthbuf_pars_fragment: string;
+        logdepthbuf_pars_vertex: string;
+        logdepthbuf_vertex: string;
+        map_fragment: string;
+        map_pars_fragment: string;
+        map_particle_fragment: string;
+        map_particle_pars_fragment: string;
+        meshbasic_frag: string;
+        meshbasic_vert: string;
+        meshlambert_frag: string;
+        meshlambert_vert: string;
+        meshphong_frag: string;
+        meshphong_vert: string;
+        meshstandard_frag: string;
+        meshstandard_vert: string;
+        metalnessmap_fragment: string;
+        metalnessmap_pars_fragment: string;
+        morphnormal_vertex: string;
+        morphtarget_pars_vertex: string;
+        morphtarget_vertex: string;
+        normal_frag: string;
+        normal_fragment: string;
+        normal_vert: string;
+        normalmap_pars_fragment: string;
+        points_frag: string;
+        points_vert: string;
+        premultiplied_alpha_fragment: string;
+        project_vertex: string;
+        roughtnessmap_fragment: string;
+        roughtnessmap_pars_fragment: string;
+        shadowmap_pars_fragment: string;
+        shadowmap_pars_vertex: string;
+        shadowmap_vertex: string;
+        shadowmask_pars_fragment: string;
+        skinbase_vertex: string;
+        skinning_pars_vertex: string;
+        skinning_vertex: string;
+        skinnormal_vertex: string;
+        specularmap_fragment: string;
+        specularmap_pars_fragment: string;
+        tonemapping_fragment: string;
+        tonemapping_pars_fragment: string;
+        uv2_pars_fragment: string;
+        uv2_pars_vertex: string;
+        uv2_vertex: string;
+        uv_pars_fragment: string;
+        uv_pars_vertex: string;
+        uv_vertex: string;
+        worldpos_vertex: string;
+    }
+
+    export interface Shader {
+        uniforms: any;
+        vertexShader: string;
+        fragmentShader: string;
+    }
+
+    export let ShaderLib: {
+        [name: string]: Shader;
+        basic: Shader;
+        lambert: Shader;
+        phong: Shader;
+        standard: Shader;
+        points: Shader;
+        dashed: Shader;
+        depth: Shader;
+        normal: Shader;
+        cube: Shader;
+        equirect: Shader;
+        depthRGBA: Shader;
+        distanceRGBA: Shader;
+    };
+
+    export interface IUniform {
+        type: string;
+        value: any;
+    }
+
+    export let UniformsLib: {
+        common: {
+            diffuse: IUniform;
+            opacity: IUniform;
+            map: IUniform;
+            offsetRepeat: IUniform;
+            specularMap: IUniform;
+            alphaMap: IUniform;
+            envMap: IUniform;
+            flipEnvMap: IUniform;
+            reflectivity: IUniform;
+            refractionRation: IUniform;
+        };
+        aomap: {
+            aoMap: IUniform;
+            aoMapIntensity: IUniform;
+        };
+        lightmap: {
+            lightMap: IUniform;
+            lightMapIntensity: IUniform;
+        };
+        emissivemap: { emissiveMap: IUniform };
+        bumpmap: {
+            bumpMap: IUniform;
+            bumpScale: IUniform;
+        };
+        normalmap: {
+            normalMap: IUniform;
+            normalScale: IUniform;
+        };
+        displacementmap: {
+            displacementMap: IUniform;
+            displacementScale: IUniform;
+            displacementBias: IUniform;
+        };
+        roughtnessmap: { roughtnessMap: IUniform };
+        metalnessmap: { metalnessMap: IUniform };
+        fog: {
+            fogDensity: IUniform;
+            fogNear: IUniform;
+            fogFar: IUniform;
+            fogColor: IUniform;
+        };
+        lights: {
+            ambientLightColor: IUniform
+            directionalLights: {
+                type: string;
+                value: any[];
+                properties: {
+                    direction: { type: string };
+                    color: { type: string };
+                    shadow: { type: string };
+                    shadowBias: { type: string };
+                    shadowRadius: { type: string };
+                    shadowMapSize: { type: string };
+                };
+            };
+            directionalShadowMap: IUniform;
+            directionalShadowMatrix: IUniform;
+            spotLights: {
+                type: string;
+                value: any[];
+                properties: {
+                    color: { type: string };
+                    position: { type: string };
+                    direction: { type: string };
+                    distance: { type: string };
+                    coneCos: { type: string };
+                    penumbraCos: { type: string };
+                    decay: { type: string };
+                    shadow: { type: string };
+                    shadowBias: { type: string };
+                    shadowRadius: { type: string };
+                    shadowMapSize: { type: string };
+                };
+            };
+            spotShadowMap: IUniform;
+            spotShadowMatrix: IUniform;
+            pointLights: {
+                type: string;
+                value: any[];
+                properties: {
+                    color: { type: string };
+                    position: { type: string };
+                    decay: { type: string };
+                    distance: { type: string };
+                    shadow: { type: string };
+                    shadowBias: { type: string };
+                    shadowRadius: { type: string };
+                    shadowMapSize: { type: string };
+                };
+            };
+            pointShadowMap: IUniform;
+            pointShadowMatrix: IUniform;
+            hemisphereLigtts: {
+                type: string;
+                value: any[];
+                properties: {
+                    direction: { type: string };
+                    skycolor: { type: string };
+                    groundColor: { type: string };
+                };
+            };
+        };
+        points: {
+            diffuse: IUniform;
+            opacity: IUniform;
+            size: IUniform;
+            scale: IUniform;
+            map: IUniform;
+            offsetRepeat: IUniform;
+        };
+    };
+
+    export namespace UniformsUtils {
+        export function merge(uniforms: any[]): any;
+        export function clone(uniforms_src: any): any;
+    }
+
+    export class Uniform { 
+        constructor(type: string, value: string);
+
+        type: string;
+        value: string;
+        dynamic: boolean;
+        onUpdateCallback: Function;
+
+        onUpdate(callback: Function): Uniform;
+    }
+
+    // Renderers / WebGL /////////////////////////////////////////////////////////////////////
+    export class WebGLBufferRenderer {
+        constructor(_gl: WebGLRenderingContext, extensions: any, _infoRender: any);
+
+        setMode(value: any): void;
+        render(start: any, count: any): void;
+        renderInstances(geometry: any): void;
+    }
+
+    export interface WebGLCapabilitiesParameters {
+        precision?: any;
+        logarithmicDepthBuffer?: any;
+    }
+
+    export class WebGLCapabilities {
+        constructor(gl: WebGLRenderingContext, extensions: any, parameters: WebGLCapabilitiesParameters);
+
+        precision: any;
+        logarithmicDepthBuffer: any;
+        maxTextures: any;
+        maxVertexTextures: any;
+        maxTextureSize: any;
+        maxCubemapSize: any;
+        maxAttributes: any;
+        maxVertexUniforms: any;
+        maxVaryings: any;
+        maxFragmentUniforms: any;
+        vertexTextures: any;
+        floatFragmentTextures: any;
+        floatVertexTextures: any;
+
+        getMaxPrecision(precision: any): any;
+    }
+
+    export class WebGLExtensions {
+        constructor(gl: WebGLRenderingContext);
+
+        get(name: string): any;
+    }
+
+    export class WebGLGeometries {
+        constructor(gl: WebGLRenderingContext, extensions: any, _infoRender: any);
+
+        get(object: any): any;
+    }
+
+    export class WebGLLights {
+        constructor(gl: WebGLRenderingContext, properties: any, info: any);
+        
+        get(light: any): any;
+    }
+
+    export class WebGLIndexedBufferRenderer {
+        constructor(gl: WebGLRenderingContext, properties: any, info: any);
+
+        setMode(value: any): void;
+        setIndex(index: any): void;
+        render(start: any, count: number): void;
+        renderInstances(geometry: any, start: any, count: number): void;
+    }
+    
+    export class WebGLObjects {
+        constructor(gl: WebGLRenderingContext, properties: any, info: any);
+
+        getAttributeBuffer(attribute: any): any;
+        getWireframeAttribute(geometry: any): any;
+        update(object: any): void;
+    }
+
+    export class WebGLProgram {
+        constructor(renderer: WebGLRenderer, code: string, material: ShaderMaterial, parameters: WebGLRendererParameters);
+        
+        id: number;
+        code: string;
+        usedTimes: number;
+        program: any;
+        vertexShader: WebGLShader;
+        fragmentShader: WebGLShader;
+        uniforms: any; // deprecated, use getUniforms()
+        attributes: any; // deprecated, use getAttributes()
+
+        getUniforms(): any;
+        getAttributes(): any;
+        destroy(): void;
+    }
+
+    export class WebGLPrograms {
+        constructor(renderer: WebGLRenderer, capabilities: any);
+
+        programs: any[];
+
+        getParameters(material: ShaderMaterial, lights: any, fog: any, object: any): any[];
+        getProgramCode(material: ShaderMaterial, parameters: any): string;
+        acquireProgram(material: ShaderMaterial, parameters: any, code: string): WebGLProgram;
+        releaseProgram(program: WebGLProgram): void;
+    }
+    
+    export class WebGLProperties {
+        constructor();
+
+        get(object: any): any;
+        delete(object: any): void;
+        clear(): void;
+    }
+
+    export class WebGLShader {
+        constructor(gl: any, type: string, string: string);
+    }
+
+    export class WebGLShadowMap {
+        constructor(_renderer: Renderer, _lights: any[], _objects: any[]);
+
+        enabled: boolean;
+        autoUpdate: boolean;
+        needsUpdate: boolean;
+        type: ShadowMapType;
+        cullFace: CullFace;
+
+        render(scene: Scene, camera: Camera): void;
+    }
+    
+    export class WebGLState {
+        constructor(gl: any, extensions: any, paramThreeToGL: Function);
+
+        init(): void;
+        initAttributes(): void;
+        enableAttribute(attribute: string): void;
+        enableAttributeAndDivisor(attribute: string, meshPerAttribute: any, extension: any): void;
+        disableUnusedAttributes(): void;
+        enable(id: string): void;
+        disable(id: string): void;
+        getCompressedTextureFormats(): any[];
+        setBlending(blending: number, blendEquation: number, blendSrc: number, blendDst: number, blendEquationAlpha: number, blendSrcAlpha: number, blendDstAlpha: number): void;
+        setDepthFunc(func: Function): void;
+        setDepthTest(depthTest: number): void;
+        setDepthWrite(depthWrite: number): void;
+        setColorWrite(colorWrite: number): void;
+        setStencilFunc(stencilFunc: Function, stencilRef: any, stencilMask: any): void;
+        setStencilOp(stencilFail: any, stencilZFail: any, stencilZPass: any): void;
+        setStencilTest(stencilTest: boolean): void;
+        setStencilWrite(stencilWrite: any): void;
+        setFlipSided(flipSided: number): void;
+        setLineWidth(width: number): void;
+        setPolygonOffset(polygonoffset: number, factor: number, units: number): void;
+        setScissorTest(scissorTest: boolean): void;
+        getScissorTest(): boolean;
+        activeTexture(webglSlot: any): void;
+        bindTexture(webglType: any, webglTexture: any): void;
+        compressedTexImage2D(): void;
+        texImage2D(): void;
+        clearColor(r: number, g: number, b: number, a: number): void;
+        clearDepth(depth: number): void;
+        clearStencil(stencil: any): void;
+        scissor(scissor: any): void;
+        viewport(viewport: any): void;
+        reset(): void;
+    }
+
+    // Renderers / WebGL / Plugins /////////////////////////////////////////////////////////////////////
+    export class LensFlarePlugin {
+        constructor(renderer: WebGLRenderer, flares: any[]);
+        
+        render(scene: Scene, camera: Camera, viewportWidth: number, viewportHeight: number): void;
+    }
+
+    export class SpritePlugin {
+        constructor(renderer: WebGLRenderer, sprites: any[]);
+
+        render(scene: Scene, camera: Camera, viewportWidth: number, viewportHeight: number): void;
+    }
+
+    // Scenes /////////////////////////////////////////////////////////////////////
+    
+    /**
+     * Scenes allow you to set up what and where is to be rendered by three.js. This is where you place objects, lights and cameras.
+     */
+    export class Scene extends Object3D {
+        constructor();
+
+        /**
+         * A fog instance defining the type of fog that affects everything rendered in the scene. Default is null.
+         */
+        fog: IFog;
+
+        /**
+         * If not null, it will force everything in the scene to be rendered with that material. Default is null.
+         */
+        overrideMaterial: Material;
+        autoUpdate: boolean;
+
+        copy(source: Scene, recursive?: boolean): Scene;
+    }
+
+    export interface IFog {
+        name:string;
+        color: Color;
+        clone():IFog;
+    }
+
+    /**
+     * This class contains the parameters that define linear fog, i.e., that grows linearly denser with the distance.
+     */
+    export class Fog implements IFog {
+        constructor(hex: number, near?: number, far?: number);
+
+        name:string;
+
+        /**
+         * Fog color.
+         */
+        color: Color;
+
+        /**
+         * The minimum distance to start applying fog. Objects that are less than 'near' units from the active camera won't be affected by fog.
+         */
+        near: number;
+
+        /**
+         * The maximum distance at which fog stops being calculated and applied. Objects that are more than 'far' units away from the active camera won't be affected by fog.
+         * Default is 1000.
+         */
+        far: number;
+
+        clone(): Fog;
+    }
+
+    /**
+     * This class contains the parameters that define linear fog, i.e., that grows exponentially denser with the distance.
+     */
+    export class FogExp2 implements IFog {
+        constructor(hex: number|string, density?: number);
+
+        name: string;
+        color: Color;
+
+        /**
+         * Defines how fast the fog will grow dense.
+         * Default is 0.00025.
+         */
+        density: number;
+
+        clone(): FogExp2;
+    }
+
+    // Textures /////////////////////////////////////////////////////////////////////
+    export let TextureIdCount: number;
+
+    export class Texture {
+        constructor(
+            image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement,
+            mapping?: Mapping,
+            wrapS?: Wrapping,
+            wrapT?: Wrapping,
+            magFilter?: TextureFilter,
+            minFilter?: TextureFilter,
+            format?: PixelFormat,
+            type?: TextureDataType,
+            anisotropy?: number
+            );
+
+        id: number;
+        uuid: string;
+        name: string;
+        sourceFile: string;
+        image: any; // HTMLImageElement or ImageData ;
+        mipmaps: ImageData[];
+        mapping: Mapping;
+        wrapS: Wrapping;
+        wrapT: Wrapping;
+        magFilter: TextureFilter;
+        minFilter: TextureFilter;
+        anisotropy: number;
+        format: PixelFormat;
+        type: TextureDataType;
+        offset: Vector2;
+        repeat: Vector2;
+        generateMipmaps: boolean;
+        premultiplyAlpha: boolean;
+        flipY: boolean;
+        unpackAlignment: number;
+        encoding: TextureEncoding;
+        version: number;
+        needsUpdate: boolean;
+        onUpdate: () => void;
+        static DEFAULT_IMAGE: any;
+        static DEFAULT_MAPPING: any;
+
+        clone(): Texture;
+        copy(source: Texture): Texture;
+        toJSON(meta: any): any;
+        dispose(): void;
+        transformUv(uv: Vector): void;
+
+        // EventDispatcher mixins
+        addEventListener(type: string, listener: (event: Event) => void ): void;
+        hasEventListener(type: string, listener: (event: Event) => void): void;
+        removeEventListener(type: string, listener: (event: Event) => void): void;
+        dispatchEvent(event: { type: string; [attachment: string]: any; }): void;
+    }
+
+    export class CanvasTexture extends Texture {
+        constructor(
+            canvas: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement,
+            mapping?: Mapping,
+            wrapS?: Wrapping,
+            wrapT?: Wrapping,
+            magFilter?: TextureFilter,
+            minFilter?: TextureFilter,
+            format?: PixelFormat,
+            type?: TextureDataType,
+            anisotropy?: number
+        );
+
+        clone(): CanvasTexture;
+        copy(source: CanvasTexture): CanvasTexture;
+    }
+
+    export class CubeTexture extends Texture {
+        constructor(
+            images?: any[], // HTMLImageElement or HTMLCanvasElement
+            mapping?: Mapping,
+            wrapS?: Wrapping,
+            wrapT?: Wrapping,
+            magFilter?: TextureFilter,
+            minFilter?: TextureFilter,
+            format?: PixelFormat,
+            type?: TextureDataType,
+            anisotropy?: number
+        );
+
+        images: any; // returns and sets the value of Texture.image in the codde ?
+
+        copy(source: CubeTexture): CubeTexture;
+    }
+
+    export class CompressedTexture extends Texture {
+        constructor(
+            mipmaps: ImageData[],
+            width: number,
+            height: number,
+            format?: PixelFormat,
+            type?: TextureDataType,
+            mapping?: Mapping,
+            wrapS?: Wrapping,
+            wrapT?: Wrapping,
+            magFilter?: TextureFilter,
+            minFilter?: TextureFilter,
+            anisotropy?: number
+        );
+
+        image: { width: number; height: number; };
+
+        clone(): CompressedTexture;
+        copy(source: CompressedTexture): CompressedTexture;
+    }
+
+    export class DataTexture extends Texture {
+        constructor(
+            data: ArrayBuffer | Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array,
+            width: number,
+            height: number,
+            format: PixelFormat,
+            type: TextureDataType,
+            mapping: Mapping,
+            wrapS: Wrapping,
+            wrapT: Wrapping,
+            magFilter: TextureFilter,
+            minFilter: TextureFilter,
+            anisotropy?: number
+        );
+
+        image: { data: ImageData; width: number; height: number; };
+
+        clone(): DataTexture;
+        copy(source: DataTexture): DataTexture;
+    }
+
+    export class VideoTexture extends Texture {
+        constructor(
+            video: HTMLVideoElement,
+            mapping?: Mapping,
+            wrapS?: Wrapping,
+            wrapT?: Wrapping,
+            magFilter?: TextureFilter,
+            minFilter?: TextureFilter,
+            format?: PixelFormat,
+            type?: TextureDataType,
+            anisotropy?: number
+            );
+
+        clone(): VideoTexture;
+        copy(source: VideoTexture): VideoTexture;
+    }
+
+    // Extras /////////////////////////////////////////////////////////////////////
+    export namespace CurveUtils {
+        export function tangentQuadraticBezier(t: number, p0: number, p1: number, p2: number): number;
+        export function tangentCubicBezier(t: number, p0: number, p1: number, p2: number, p3: number): number;
+        export function tangentSpline(t: number, p0: number, p1: number, p2: number, p3: number): number;
+        export function interpolate(p0: number, p1: number, p2: number, p3: number, t: number): number;
+    }
+
+    export namespace ImageUtils { // deprecated
+        export let crossOrigin: string;
+
+        export function loadTexture(url: string, mapping?: Mapping, onLoad?: (texture: Texture) => void, onError?: (message: string) => void): Texture;
+        export function loadTextureCube(array: string[], mapping?: Mapping, onLoad?: (texture: Texture) => void , onError?: (message: string) => void ): Texture;
+    }
+
+    export namespace SceneUtils {
+        export function createMultiMaterialObject(geometry: Geometry, materials: Material[]): Object3D;
+        export function detach(child: Object3D, parent: Object3D, scene: Scene): void;
+        export function attach(child: Object3D, scene: Scene, parent: Object3D): void;
+    }
+
+    export namespace ShapeUtils {
+        export function area(contour: number[]): number;
+        export function triangulate(contour: number[], indices: boolean): number[];
+        export function triangulateShape(contour: number[], holes: any[]): number[];
+        export function isClockWise(pts: number[]): boolean;
+        export function b2(t: number, p0: number, p1: number, p2: number): number;
+        export function b3(t: number, p0: number, p1: number, p2: number, p3: number): number;
+    }
+
+    // Extras / Audio /////////////////////////////////////////////////////////////////////
+
+    export class Audio extends Object3D {
+        constructor(listener: AudioListener);
+
+        type: string;
+        context: AudioContext;
+        source: AudioBufferSourceNode;
+        gain: GainNode;
+        autoplay: boolean;
+        startTime: number;
+        playbackRate: number;
+        hasPlaybackControl: boolean;
+        isPlaying: boolean;
+        sourceType: string;
+        filter: any;
+
+        getOutput(): GainNode;
+        load(file: string): Audio;
+        setNodeSource(audioNode: AudioBufferSourceNode): Audio;
+        setBuffer(audioBuffer: AudioBuffer): Audio;
+        play(): void;
+        pause(): void;
+        stop(): void;
+        connect(): void;
+        disconnect(): void;
+        setFilter(value: any): void;
+        getFilter(): any;
+        setPlaybackRate(value: number): void;
+        getPlaybackRate(): number;
+        onEnded(): void;
+        setLoop(value: boolean): void;
+        getLoop(): boolean;
+        setVolume(value: number): void;
+        getVolume(): number;
+    }
+
+    export class AudioAnalyser {
+        constructor(audio: any, fftSize: number);
+
+        analyser: any;
+        data: Uint8Array;
+
+        getData(): Uint8Array;
+    }
+
+    export class AudioBuffer {
+        constructor(context: any);
+
+        context: any;
+        ready: boolean;
+        readyCallbacks: Function[];
+
+        load(file: string): AudioBuffer;
+        onReady(callback: Function): void;
+    }
+
+    export class PositionalAudio extends Audio {
+        constructor(listener: AudioListener);
+
+        panner: PannerNode;
+
+        setRefDistance(value: number): void;
+        getRefDistance(): number;
+        setRolloffFactor(value: number): void;
+        getRolloffFactor(): number;
+        setDistanceModel(value: number): void;
+        getDistanceModel(): number;
+        setMaxDistance(value: number): void;
+        getMaxDistance(): number;
+    }
+
+    export class AudioListener extends Object3D {
+        constructor();
+
+        type: string;
+        context: AudioContext;
+        gain: GainNode;
+
+        getInput(): GainNode;
+        removeFilter(): void;
+        setFilter(value: any): void;
+        getFilter(): any;
+        setMasterVolume(value: number): void;
+        getMasterVolume(): number;
+    }
+
+    // Extras / Core /////////////////////////////////////////////////////////////////////
+
+    /**
+     * An extensible curve object which contains methods for interpolation
+     * class Curve&lt;T extends Vector&gt;
+     */
+    export class Curve<T extends Vector> {
+        /**
+         * Returns a vector for point t of the curve where t is between 0 and 1
+         * getPoint(t: number): T;
+         */
+        getPoint(t: number): T;
+
+        /**
+         * Returns a vector for point at relative position in curve according to arc length
+         * getPointAt(u: number): T;
+         */
+        getPointAt(u: number):T;
+
+        /**
+         * Get sequence of points using getPoint( t )
+         * getPoints(divisions?: number): T[];
+         */
+        getPoints(divisions?: number): T[];
+
+        /**
+         * Get sequence of equi-spaced points using getPointAt( u )
+         * getSpacedPoints(divisions?: number): T[];
+         */
+        getSpacedPoints(divisions?: number): T[];
+
+        /**
+         * Get total curve arc length
+         */
+        getLength(): number;
+
+        /**
+         * Get list of cumulative segment lengths
+         */
+        getLengths(divisions?: number): number[];
+
+        /**
+         * Update the cumlative segment distance cache
+         */
+        updateArcLengths(): void;
+
+        /**
+         * Given u ( 0 .. 1 ), get a t to find p. This gives you points which are equi distance
+         */
+        getUtoTmapping(u: number, distance: number): number;
+
+        /**
+         * Returns a unit vector tangent at t. If the subclassed curve do not implement its tangent derivation, 2 points a small delta apart will be used to find its gradient which seems to give a reasonable approximation
+         * getTangent(t: number): T;
+         */
+        getTangent(t: number): T;
+
+        /**
+         * Returns tangent at equidistance point u on the curve
+         * getTangentAt(u: number): T;
+         */
+        getTangentAt(u: number): T;
+
+        static create(constructorFunc: Function, getPointFunc: Function): Function;
+    }
+
+    export class CurvePath<T extends Vector> extends Curve<T> {
+        constructor();
+
+        curves: Curve<T>[];
+        autoClose: boolean;
+
+        add(curve: Curve<T>): void;
+        checkConnection(): boolean;
+        closePath(): void;
+        getPoint(t: number): T;
+        getLength(): number;
+        getCurveLengths(): number[];
+        createPointsGeometry(divisions: number): Geometry;
+        createSpacedPointsGeometry(divisions: number): Geometry;
+        createGeometry(points: T[]): Geometry;
+    }
+
+    export enum PathActions {
+        MOVE_TO,
+        LINE_TO,
+        QUADRATIC_CURVE_TO, // Bezier quadratic curve
+        BEZIER_CURVE_TO,     // Bezier cubic curve
+        CSPLINE_THRU,        // Catmull-rom spline
+        ARC,                // Circle
+        ELLIPSE,
+    }
+
+    export interface PathAction {
+        action: PathActions;
+        args: any;
+    }
+
+    /**
+     * a 2d path representation, comprising of points, lines, and cubes, similar to the html5 2d canvas api. It extends CurvePath.
+     */
+    export class Path extends CurvePath<Vector2> {
+        constructor(points?: Vector2[]);
+
+        actions: PathAction[];
+
+        fromPoints(vectors: Vector2[]): void;
+        moveTo(x: number, y: number): void;
+        lineTo(x: number, y: number): void;
+        quadraticCurveTo(aCPx: number, aCPy: number, aX: number, aY: number): void;
+        bezierCurveTo(aCP1x: number, aCP1y: number, aCP2x: number, aCP2y: number, aX: number, aY: number): void;
+        splineThru(pts: Vector2[]): void;
+        arc(aX: number, aY: number, aRadius: number, aStartAngle: number, aEndAngle: number, aClockwise: boolean): void;
+        absarc(aX: number, aY: number, aRadius: number, aStartAngle: number, aEndAngle: number, aClockwise: boolean): void;
+        ellipse(aX: number, aY: number, xRadius: number, yRadius: number, aStartAngle: number, aEndAngle: number, aClockwise: boolean, aRotation: number): void;
+        absellipse(aX: number, aY: number, xRadius: number, yRadius: number, aStartAngle: number, aEndAngle: number, aClockwise: boolean, aRotation: number): void;
+        getSpacedPoints(divisions?: number): Vector2[];
+        getPoints(divisions?: number, closedPath?: boolean): Vector2[];
+        toShapes(isCCW: boolean, noHoles: any): Shape[];
+    }
+
+    /**
+     * Defines a 2d shape plane using paths.
+     */
+    export class Shape extends Path {
+        constructor(points?: Vector2[]);
+
+        holes: Path[];
+
+        extrude(options?: any): ExtrudeGeometry;
+        makeGeometry(options?: any): ShapeGeometry;
+        getPointsHoles(divisions: number): Vector2[][];
+        extractAllPoints(divisions: number): {
+            shape: Vector2[];
+            holes: Vector2[][];
+        };
+        extractPoints(divisions: number): Vector2[];
+    }
+
+    // Extras / Curves /////////////////////////////////////////////////////////////////////
+    export class CatmullRomCurve3 extends Curve<Vector3> {
+        constructor(points?: Vector3[]);
+
+        points: Vector3[];
+
+        getPoint(t: number): Vector3;
+    }
+
+    export class ClosedSplineCurve3 extends CatmullRomCurve3 {} // deprecated, use CatmullRomCurve3
+    export class SplineCurve3 extends CatmullRomCurve3 {} // will be deprecated, use CatmullRomCurve3
+        
+    export class CubicBezierCurve extends Curve<Vector2> {
+        constructor(v0: Vector2, v1: Vector2, v2: Vector2, v3: Vector2);
+
+        v0: Vector2;
+        v1: Vector2;
+        v2: Vector2;
+        v3: Vector2;
+    }
+
+    export class CubicBezierCurve3 extends Curve<Vector3> {
+        constructor(v0: Vector3, v1: Vector3, v2: Vector3, v3: Vector3);
+
+        v0: Vector3;
+        v1: Vector3;
+        v2: Vector3;
+        v3: Vector3;
+
+        getPoint(t: number): Vector3;
+    }
+    
+    export class EllipseCurve extends Curve<Vector2> {
+        constructor(aX: number, aY: number, xRadius: number, yRadius: number, aStartAngle: number, aEndAngle: number, aClockwise: boolean, aRotation: number);
+
+        aX: number;
+        aY: number;
+        xRadius: number;
+        yRadius: number;
+        aStartAngle: number;
+        aEndAngle: number;
+        aClockwise: boolean;
+        aRotation: number;
+    }
+    export class ArcCurve extends EllipseCurve {
+        constructor(aX: number, aY: number, aRadius: number, aStartAngle: number, aEndAngle: number, aClockwise: boolean );
+    }
+
+    export class LineCurve extends Curve<Vector2> {
+        constructor( v1: Vector2, v2: Vector2 );
+
+        v1: Vector2;
+        v2: Vector2;
+    }
+
+    export class LineCurve3 extends Curve<Vector3> {
+        constructor(v1: Vector3, v2: Vector3);
+
+        v1: Vector3;
+        v2: Vector3;
+
+        getPoint(t: number): Vector3;
+    }
+    
+    export class QuadraticBezierCurve extends Curve<Vector2> {
+        constructor( v0: Vector2, v1: Vector2, v2: Vector2 );
+
+        v0: Vector2;
+        v1: Vector2;
+        v2: Vector2;
+    }
+
+    export class QuadraticBezierCurve3 extends Curve<Vector3> {
+        constructor(v0: Vector3, v1: Vector3, v2: Vector3);
+
+        v0: Vector3;
+        v1: Vector3;
+        v2: Vector3;
+
+        getPoint(t: number): Vector3;
+    }
+
+    export class SplineCurve extends Curve<Vector2> {
+        constructor(points?: Vector2[]);
+
+        points: Vector2[];
+    }
+    
+
+    // Extras / Geomerties /////////////////////////////////////////////////////////////////////
+    export class BoxBufferGeometry extends BufferGeometry {
+        constructor(width: number, height: number, depth: number, widthSegments?: number, heightSegments?: number, depthSegments?: number);
+
+        parameters: {
+            width: number;
+            height: number;
+            depth: number;
+            widthSegments: number;
+            heightSegments: number;
+            depthSegments: number;
+        };
+    }
+
+    /**
+     * BoxGeometry is the quadrilateral primitive geometry class. It is typically used for creating a cube or irregular quadrilateral of the dimensions provided within the (optional) 'width', 'height', & 'depth' constructor arguments.
+     */
+    export class BoxGeometry extends Geometry {
+        /**
+         * @param width — Width of the sides on the X axis.
+         * @param height — Height of the sides on the Y axis.
+         * @param depth — Depth of the sides on the Z axis.
+         * @param widthSegments — Number of segmented faces along the width of the sides.
+         * @param heightSegments — Number of segmented faces along the height of the sides.
+         * @param depthSegments — Number of segmented faces along the depth of the sides.
+         */
+        constructor(width: number, height: number, depth: number, widthSegments?: number, heightSegments?: number, depthSegments?: number);
+
+        parameters: {
+            width: number;
+            height: number;
+            depth: number;
+            widthSegments: number;
+            heightSegments: number;
+            depthSegments: number;
+        };
+
+        clone(): BoxGeometry;
+    }
+
+    export class CubeGeometry extends BoxGeometry {} // deprecated, use BoxGeometry
+
+    export class CircleBufferGeometry extends BufferGeometry {
+        constructor(radius?: number, segments?: number, thetaStart?: number, thetaLength?: number);
+
+        parameters: {
+            radius: number;
+            segments: number;
+            thetaStart: number;
+            thetaLength: number;
+        };
+    }
+
+    export class CircleGeometry extends Geometry {
+        constructor(radius?: number, segments?: number, thetaStart?: number, thetaLength?: number);
+
+        parameters: {
+            radius: number;
+            segments: number;
+            thetaStart: number;
+            thetaLength: number;
+        };
+    }
+
+    export class CylinderBufferGeometry extends BufferGeometry {
+        constructor(radiusTop?: number, radiusBottom?: number, height?: number, radialSegments?: number, heightSegments?: number, openEnded?: boolean, thetaStart?: number, thetaLength?: number);
+
+        parameters: {
+            radiusTop: number;
+            radiusBottom: number;
+            height: number;
+            radialSegments: number;
+            heightSegments: number;
+            openEnded: boolean;
+            thetaStart: number;
+            thetaLength: number;
+        };
+    }
+
+    export class CylinderGeometry extends Geometry {
+        /**
+         * @param radiusTop — Radius of the cylinder at the top.
+         * @param radiusBottom — Radius of the cylinder at the bottom.
+         * @param height — Height of the cylinder.
+         * @param radiusSegments — Number of segmented faces around the circumference of the cylinder.
+         * @param heightSegments — Number of rows of faces along the height of the cylinder.
+         * @param openEnded - A Boolean indicating whether or not to cap the ends of the cylinder.
+         */
+        constructor(radiusTop?: number, radiusBottom?: number, height?: number, radiusSegments?: number, heightSegments?: number, openEnded?: boolean, thetaStart?: number, thetaLength?: number);
+
+        parameters: {
+            radiusTop: number;
+            radiusBottom: number;
+            height: number;
+            radialSegments: number;
+            heightSegments: number;
+            openEnded: boolean;
+            thetaStart: number;
+            thetaLength: number;
+        };
+    }
+
+    export class DodecahedronGeometry extends Geometry {
+        constructor(radius: number, detail: number);
+
+        parameters: {
+            radius: number;
+            detail: number;
+        };
+    }
+
+    export class EdgesGeometry extends BufferGeometry {
+        constructor(geometry: BufferGeometry, thresholdAngle: number);
+
+        clone(): EdgesGeometry;
+    }
+
+    export class ExtrudeGeometry extends Geometry {
+        constructor(shape?: Shape, options?: any);
+        constructor(shapes?: Shape[], options?: any);
+
+        static WorldUVGenerator: {
+            generateTopUV(geometry: Geometry, indexA: number, indexB: number, indexC: number): Vector2[];
+            generateSideWallUV(geometry: Geometry, indexA: number, indexB: number, indexC: number, indexD: number): Vector2[];
+        };
+
+        addShapeList(shapes: Shape[], options?: any): void;
+        addShape(shape: Shape, options?: any): void;
+    }
+
+    export class IcosahedronGeometry extends PolyhedronGeometry {
+        constructor(radius: number, detail: number);
+    }
+
+    export class LatheBufferGeometry extends BufferGeometry {
+        constructor(points: Vector3[], segments?: number, phiStart?: number, phiLength?: number);
+
+        parameters: {
+            points: Vector3[];
+            segments: number;
+            phiStart: number;
+            phiLength: number;
+        };
+    }
+
+    export class LatheGeometry extends Geometry {
+        constructor(points: Vector3[], segments?: number, phiStart?: number, phiLength?: number);
+
+        parameters: {
+            points: Vector3[];
+            segments: number;
+            phiStart: number;
+            phiLength: number;
+        };
+    }
+
+    export class OctahedronGeometry extends PolyhedronGeometry {
+        constructor(radius: number, detail: number);
+    }
+
+    export class ParametricGeometry extends Geometry {
+        constructor(func: (u: number, v: number) => Vector3, slices: number, stacks: number);
+
+        parameters: {
+            func: (u: number, v: number) => Vector3;
+            slices: number;
+            stacks: number;
+        };
+    }
+
+    export class PlaneBufferGeometry extends BufferGeometry {
+        constructor(width: number, height: number, widthSegments?: number, heightSegments?: number);
+
+        parameters: {
+            width: number;
+            height: number;
+            widthSegments: number;
+            heightSegments: number;
+        };
+    }
+
+    export class PlaneGeometry extends Geometry {
+        constructor(width: number, height: number, widthSegments?: number, heightSegments?: number);
+
+        parameters: {
+            width: number;
+            height: number;
+            widthSegments: number;
+            heightSegments: number;
+        };
+    }
+
+    export class PolyhedronGeometry extends Geometry {
+        constructor(vertices: Vector3[], faces: Face3[], radius?: number, detail?: number);
+
+        parameters: {
+            vertices: Vector3[];
+            faces: Face3[];
+            radius: number;
+            detail: number;
+        };
+        boundingSphere: Sphere;
+    }
+
+    export class RingBufferGeometry extends BufferGeometry {
+        constructor(innerRadius?: number, outerRadius?: number, thetaSegments?: number, phiSegments?: number, thetaStart?: number, thetaLength?: number);
+
+        parameters: {
+            innerRadius: number;
+            outerRadius: number;
+            thetaSegments: number;
+            phiSegments: number;
+            thetaStart: number;
+            thetaLength: number;
+        };
+    }
+
+    export class RingGeometry extends Geometry {
+        constructor(innerRadius?: number, outerRadius?: number, thetaSegments?: number, phiSegments?: number, thetaStart?: number, thetaLength?: number);
+
+        parameters: {
+            innerRadius: number;
+            outerRadius: number;
+            thetaSegments: number;
+            phiSegments: number;
+            thetaStart: number;
+            thetaLength: number;
+        };
+    }
+
+    export class ShapeGeometry extends Geometry {
+        constructor(shape: Shape, options?: any);
+        constructor(shapes: Shape[], options?: any);
+
+        addShapeList(shapes: Shape[], options: any): ShapeGeometry;
+        addShape(shape: Shape, options?: any): void;
+    }
+
+    export class SphereBufferGeometry extends BufferGeometry {
+        constructor(radius: number, widthSegments?: number, heightSegments?: number, phiStart?: number, phiLength?: number, thetaStart?: number, thetaLength?: number);
+
+        parameters: {
+            radius: number;
+            widthSegments: number;
+            heightSegments: number;
+            phiStart: number;
+            phiLength: number;
+            thetaStart: number;
+            thetaLength: number;
+        };
+    }
+
+    /**
+     * A class for generating sphere geometries
+     */
+    export class SphereGeometry extends Geometry {
+        /**
+         * The geometry is created by sweeping and calculating vertexes around the Y axis (horizontal sweep) and the Z axis (vertical sweep). Thus, incomplete spheres (akin to 'sphere slices') can be created through the use of different values of phiStart, phiLength, thetaStart and thetaLength, in order to define the points in which we start (or end) calculating those vertices.
+         *
+         * @param radius — sphere radius. Default is 50.
+         * @param widthSegments — number of horizontal segments. Minimum value is 3, and the default is 8.
+         * @param heightSegments — number of vertical segments. Minimum value is 2, and the default is 6.
+         * @param phiStart — specify horizontal starting angle. Default is 0.
+         * @param phiLength — specify horizontal sweep angle size. Default is Math.PI * 2.
+         * @param thetaStart — specify vertical starting angle. Default is 0.
+         * @param thetaLength — specify vertical sweep angle size. Default is Math.PI.
+         */
+        constructor(radius: number, widthSegments?: number, heightSegments?: number, phiStart?: number, phiLength?: number, thetaStart?: number, thetaLength?: number);
+
+        parameters: {
+            radius: number;
+            widthSegments: number;
+            heightSegments: number;
+            phiStart: number;
+            phiLength: number;
+            thetaStart: number;
+            thetaLength: number;
+        };
+    }
+
+    export class TetrahedronGeometry extends PolyhedronGeometry {
+        constructor(radius?: number, detail?: number);
+    }
+
+    export interface TextGeometryParameters {
+        font: Font;
+        size: number;
+        height: number;
+        curveSegments: number;
+        bevelEnabled: boolean;
+        bevelThickness: number;
+        bevelSize: number;
+    }
+
+    export class TextGeometry extends ExtrudeGeometry {
+        constructor(text: string, parameters?: TextGeometryParameters);
+
+        parameters: {
+            font: Font;
+            size: number;
+            height: number;
+            curveSegments: number;
+            bevelEnabled: boolean;
+            bevelThickness: number;
+            bevelSize: number;
+        }
+    }
+
+    export class TorusBufferGeometry extends BufferGeometry {
+        constructor(radius?: number, tube?: number, radialSegments?: number, tubularSegments?: number, arc?: number);
+
+        parameters: {
+            radius: number;
+            tube: number;
+            radialSegments: number;
+            tubularSegments: number;
+            arc: number;
+        };
+    }
+
+    export class TorusGeometry extends Geometry {
+        constructor(radius?: number, tube?: number, radialSegments?: number, tubularSegments?: number, arc?: number);
+
+        parameters: {
+            radius: number;
+            tube: number;
+            radialSegments: number;
+            tubularSegments: number;
+            arc: number;
+        };
+    }
+
+    export class TorusKnotBufferGeometry extends BufferGeometry {
+        constructor(radius?: number, tube?: number, radialSegments?: number, tubularSegments?: number, p?: number, q?: number, heightScale?: number);
+
+        parameters: {
+            radius: number;
+            tube: number;
+            radialSegments: number;
+            tubularSegments: number;
+            p: number;
+            q: number;
+            heightScale: number;
+        };
+    }
+
+    export class TorusKnotGeometry extends Geometry {
+        constructor(radius?: number, tube?: number, radialSegments?: number, tubularSegments?: number, p?: number, q?: number, heightScale?: number);
+
+        parameters: {
+            radius: number;
+            tube: number;
+            radialSegments: number;
+            tubularSegments: number;
+            p: number;
+            q: number;
+            heightScale: number;
+        };
+    }
+
+    export class TubeGeometry extends Geometry {
+        constructor(path: Path, segments?: number, radius?: number, radiusSegments?: number, closed?: boolean, taper?: (u: number) => number);
+
+        parameters: {
+            path: Path;
+            segments: number;
+            radius: number;
+            radialSegments: number;
+            closed: boolean;
+            taper: (u: number) => number; // NoTaper or SinusoidalTaper;
+        };
+        tangents: Vector3[];
+        normals: Vector3[];
+        binormals: Vector3[];
+
+        static NoTaper(u?: number): number;
+        static SinusoidalTaper(u: number): number;
+        static FrenetFrames(path: Path, segments: number, closed: boolean): void;
+    }
+
+    export class WireframeGeometry extends BufferGeometry {
+        constructor(geometry: Geometry | BufferGeometry);
+    }
+
+    // Extras / Helpers /////////////////////////////////////////////////////////////////////
+
+    export class ArrowHelper extends Object3D {
+        constructor(dir: Vector3, origin?: Vector3, length?: number, hex?: number, headLength?: number, headWidth?: number);
+
+        line: Line;
+        cone: Mesh;
+
+        setDirection(dir: Vector3): void;
+        setLength(length: number,  headLength?: number, headWidth?: number): void;
+        setColor(hex: number): void;
+    }
+
+    export class AxisHelper extends LineSegments {
+        constructor(size?: number);
+    }
+
+    export class BoundingBoxHelper extends Mesh {
+        constructor(object?: Object3D, hex?: number);
+
+        object: Object3D;
+        box: Box3;
+
+        update(): void;
+    }
+
+    export class BoxHelper extends LineSegments {
+        constructor(object?: Object3D);
+
+        update(object?: Object3D): void;
+    }
+
+    export class CameraHelper extends LineSegments {
+        constructor(camera: Camera);
+
+        camera: Camera;
+        pointMap: { [id: string]: number[]; };
+
+        update(): void;
+    }
+
+    export class DirectionalLightHelper extends Object3D {
+        constructor(light: Light, size?: number);
+
+        light: Light;
+        lightPlane: Line;
+        targetLine: Line;
+
+        dispose(): void;
+        update(): void;
+    }
+
+    export class EdgesHelper extends LineSegments {
+        constructor(object: Object3D, hex?: number, thresholdAngle?: number);
+    }
+
+    export class FaceNormalsHelper extends LineSegments {
+        constructor(object: Object3D, size?: number, hex?: number, linewidth?: number);
+
+        object: Object3D;
+        size: number;
+
+        update(object?: Object3D): void;
+    }
+
+    export class GridHelper extends LineSegments {
+        constructor(size: number, step: number);
+
+        color1: Color;
+        color2: Color;
+
+        setColors(colorCenterLine: number, colorGrid: number): void;
+    }
+
+    export class HemisphereLightHelper extends Object3D {
+        constructor(light: Light, sphereSize: number);
+
+        light: Light;
+        colors: Color[];
+        lightSphere: Mesh;
+
+        dispose(): void;
+        update(): void;
+    }
+
+    export class PointLightHelper extends Object3D {
+        constructor(light: Light, sphereSize: number);
+
+        light: Light;
+
+        dispose(): void;
+        update(): void;
+    }
+
+    export class SkeletonHelper extends LineSegments {
+        constructor(bone: Object3D);
+
+        bones: Bone[];
+        root: Object3D;
+
+        getBoneList(object: Object3D): Bone[];
+        update(): void;
+    }
+
+    export class SpotLightHelper extends Object3D {
+        constructor(light: Light, sphereSize: number, arrowLength: number);
+
+        light: Light;
+        cone: Mesh;
+
+        dispose(): void;
+        update(): void;
+    }
+
+    export class VertexNormalsHelper extends LineSegments {
+        constructor(object: Object3D, size?: number, hex?: number, linewidth?: number);
+
+        object: Object3D;
+        size: number;
+
+        update(object?: Object3D): void;
+    }
+
+    export class WireframeHelper extends LineSegments {
+        constructor(object: Object3D, hex?: number);
+    }
+
+    // Extras / Objects /////////////////////////////////////////////////////////////////////
+
+    export class ImmediateRenderObject extends Object3D {
+        constructor(material: Material);
+
+        material: Material;
+        render(renderCallback: Function): void;
+    }
+
+    export interface MorphBlendMeshAnimation {
+        start: number;
+        end: number;
+        length: number;
+        fps: number;
+        duration: number;
+        lastFrame: number;
+        currentFrame: number;
+        active: boolean;
+        time: number;
+        direction: number;
+        weight: number;
+        directionBackwards: boolean;
+        mirroredLoop: boolean;
+    }
+
+    export class MorphBlendMesh extends Mesh {
+        constructor(geometry: Geometry, material: Material);
+
+        animationsMap: { [name: string]: MorphBlendMeshAnimation; };
+        animationsList: MorphBlendMeshAnimation[];
+
+        createAnimation(name: string, start: number, end: number, fps: number): void;
+        autoCreateAnimations(fps: number): void;
+        setAnimationDirectionForward(name: string): void;
+        setAnimationDirectionBackward(name: string): void;
+        setAnimationFPS(name: string, fps: number): void;
+        setAnimationDuration(name: string, duration: number): void;
+        setAnimationWeight(name: string, weight: number): void;
+        setAnimationTime(name: string, time: number): void;
+        getAnimationTime(name: string): number;
+        getAnimationDuration(name: string): number;
+        playAnimation(name: string): void;
+        stopAnimation(name: string): void;
+        update(delta: number): void;
+    }
+}
+
+declare module 'three' {
+    export = THREE;
+}
diff --git a/threejs/tests/canvas/canvas_camera_orthographic.ts b/three/tests/canvas/canvas_camera_orthographic.ts
similarity index 98%
rename from threejs/tests/canvas/canvas_camera_orthographic.ts
rename to three/tests/canvas/canvas_camera_orthographic.ts
index 21cade450c..785512835f 100644
--- a/threejs/tests/canvas/canvas_camera_orthographic.ts
+++ b/three/tests/canvas/canvas_camera_orthographic.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/canvas_camera_orthographic.html
diff --git a/threejs/tests/canvas/canvas_geometry_cube.ts b/three/tests/canvas/canvas_geometry_cube.ts
similarity index 99%
rename from threejs/tests/canvas/canvas_geometry_cube.ts
rename to three/tests/canvas/canvas_geometry_cube.ts
index 80017a4025..b1af3f97a2 100644
--- a/threejs/tests/canvas/canvas_geometry_cube.ts
+++ b/three/tests/canvas/canvas_geometry_cube.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/canvas_geometry_cube.html
diff --git a/threejs/tests/canvas/canvas_interactive_cubes_tween.ts b/three/tests/canvas/canvas_interactive_cubes_tween.ts
similarity index 97%
rename from threejs/tests/canvas/canvas_interactive_cubes_tween.ts
rename to three/tests/canvas/canvas_interactive_cubes_tween.ts
index be4c46f053..4f85c068fb 100644
--- a/threejs/tests/canvas/canvas_interactive_cubes_tween.ts
+++ b/three/tests/canvas/canvas_interactive_cubes_tween.ts
@@ -1,6 +1,6 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
-/// <reference path="../../../tween.js/tween.js.d.ts" />
+/// <reference types="tween.js" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/canvas_interactive_cubes_tween.html
 
diff --git a/threejs/tests/canvas/canvas_lights_pointlights.ts b/three/tests/canvas/canvas_lights_pointlights.ts
similarity index 98%
rename from threejs/tests/canvas/canvas_lights_pointlights.ts
rename to three/tests/canvas/canvas_lights_pointlights.ts
index e9cb61cf19..ce3ac24c33 100644
--- a/threejs/tests/canvas/canvas_lights_pointlights.ts
+++ b/three/tests/canvas/canvas_lights_pointlights.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/canvas_lights_pointlights.html
diff --git a/threejs/tests/canvas/canvas_materials.ts b/three/tests/canvas/canvas_materials.ts
similarity index 99%
rename from threejs/tests/canvas/canvas_materials.ts
rename to three/tests/canvas/canvas_materials.ts
index e141785642..9fd59a6b4c 100644
--- a/threejs/tests/canvas/canvas_materials.ts
+++ b/three/tests/canvas/canvas_materials.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/canvas_materials.html
diff --git a/threejs/tests/canvas/canvas_particles_floor.ts b/three/tests/canvas/canvas_particles_floor.ts
similarity index 98%
rename from threejs/tests/canvas/canvas_particles_floor.ts
rename to three/tests/canvas/canvas_particles_floor.ts
index 69ff28da16..cf38f9a02d 100644
--- a/threejs/tests/canvas/canvas_particles_floor.ts
+++ b/three/tests/canvas/canvas_particles_floor.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/canvas_particles_floor.html
diff --git a/threejs/tests/css3d/css3d_periodictable.ts b/three/tests/css3d/css3d_periodictable.ts
similarity index 99%
rename from threejs/tests/css3d/css3d_periodictable.ts
rename to three/tests/css3d/css3d_periodictable.ts
index 95e668afe5..022628521c 100644
--- a/threejs/tests/css3d/css3d_periodictable.ts
+++ b/three/tests/css3d/css3d_periodictable.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../three.d.ts" />
-/// <reference path="../../../tween.js/tween.js.d.ts" />
+/// <reference types="three" />
+/// <reference types="tween.js" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/css3d_periodictable.html
diff --git a/threejs/tests/css3d/css3d_sprites.ts b/three/tests/css3d/css3d_sprites.ts
similarity index 97%
rename from threejs/tests/css3d/css3d_sprites.ts
rename to three/tests/css3d/css3d_sprites.ts
index 919c4a8bf0..0432009f46 100644
--- a/threejs/tests/css3d/css3d_sprites.ts
+++ b/three/tests/css3d/css3d_sprites.ts
@@ -1,6 +1,6 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
-/// <reference path="../../../tween.js/tween.js.d.ts" />
+/// <reference types="tween.js" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/css3d_sprites.html
 
diff --git a/threejs/tests/examples/controls/vrcontrols.ts b/three/tests/examples/controls/vrcontrols.ts
similarity index 76%
rename from threejs/tests/examples/controls/vrcontrols.ts
rename to three/tests/examples/controls/vrcontrols.ts
index 2576e14e8b..1d6e932a0e 100644
--- a/threejs/tests/examples/controls/vrcontrols.ts
+++ b/three/tests/examples/controls/vrcontrols.ts
@@ -1,5 +1,4 @@
-/// <reference path="../../../three.d.ts" />
-/// <reference path="../../../three-vrcontrols.d.ts" />
+/// <reference types="three" />
 
 var _vrControls = new THREE.VRControls(new THREE.Camera());
 
diff --git a/threejs/tests/examples/detector.ts b/three/tests/examples/detector.ts
similarity index 84%
rename from threejs/tests/examples/detector.ts
rename to three/tests/examples/detector.ts
index 0f30fdd318..8b7643592a 100644
--- a/threejs/tests/examples/detector.ts
+++ b/three/tests/examples/detector.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 
diff --git a/threejs/tests/examples/effects/vreffect.ts b/three/tests/examples/effects/vreffect.ts
similarity index 80%
rename from threejs/tests/examples/effects/vreffect.ts
rename to three/tests/examples/effects/vreffect.ts
index 2e0fbca8e5..67917a94ae 100644
--- a/threejs/tests/examples/effects/vreffect.ts
+++ b/three/tests/examples/effects/vreffect.ts
@@ -1,5 +1,4 @@
-/// <reference path="../../../three.d.ts" />
-/// <reference path="../../../three-vreffect.d.ts" />
+/// <reference types="three" />
 
 var _vrEffect: THREE.VREffect;
 
diff --git a/threejs/tests/math/test_unit_math.ts b/three/tests/math/test_unit_math.ts
similarity index 99%
rename from threejs/tests/math/test_unit_math.ts
rename to three/tests/math/test_unit_math.ts
index 5d095315dc..2dacb16fb6 100644
--- a/threejs/tests/math/test_unit_math.ts
+++ b/three/tests/math/test_unit_math.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../three.d.ts" />
-/// <reference path="../../../qunit/qunit.d.ts" />
+/// <reference types="three" />
+/// <reference types="qunit" />
 /// <reference path="../three-tests-setup.ts" />
 
 
diff --git a/three/tests/three-tests-setup.ts b/three/tests/three-tests-setup.ts
new file mode 100644
index 0000000000..f547699d81
--- /dev/null
+++ b/three/tests/three-tests-setup.ts
@@ -0,0 +1,25 @@
+/////////////////////////////////////////////////////////////
+// https://github.com/mrdoob/three.js/tree/master/examples
+//////////////////////////////////////////////////////////////
+
+/// <reference types="stats" />
+/// <reference types="dat-gui" />
+
+
+
+
+
+
+
+
+
+
+
+declare namespace THREE {
+    var AWDLoader: any;
+    var FlyControls: any;
+    var BloomPass: any;
+    var DotScreenShader: Shader;
+    var RGBShiftShader: Shader;
+    var FXAAShader: Shader;
+}
diff --git a/threejs/tests/webgl/webgl_animation_cloth.ts b/three/tests/webgl/webgl_animation_cloth.ts
similarity index 99%
rename from threejs/tests/webgl/webgl_animation_cloth.ts
rename to three/tests/webgl/webgl_animation_cloth.ts
index e58d460986..43feba3fc7 100644
--- a/threejs/tests/webgl/webgl_animation_cloth.ts
+++ b/three/tests/webgl/webgl_animation_cloth.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_animation_cloth.html
diff --git a/threejs/tests/webgl/webgl_animation_skinning_morph.ts b/three/tests/webgl/webgl_animation_skinning_morph.ts
similarity index 99%
rename from threejs/tests/webgl/webgl_animation_skinning_morph.ts
rename to three/tests/webgl/webgl_animation_skinning_morph.ts
index 50976c4547..8c6a4ff3c7 100644
--- a/threejs/tests/webgl/webgl_animation_skinning_morph.ts
+++ b/three/tests/webgl/webgl_animation_skinning_morph.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_sprites.html
diff --git a/threejs/tests/webgl/webgl_buffergeometry.ts b/three/tests/webgl/webgl_buffergeometry.ts
similarity index 99%
rename from threejs/tests/webgl/webgl_buffergeometry.ts
rename to three/tests/webgl/webgl_buffergeometry.ts
index c01b0dfe6c..57106f0aed 100644
--- a/threejs/tests/webgl/webgl_buffergeometry.ts
+++ b/three/tests/webgl/webgl_buffergeometry.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_buffergeometry.html
diff --git a/threejs/tests/webgl/webgl_camera.ts b/three/tests/webgl/webgl_camera.ts
similarity index 99%
rename from threejs/tests/webgl/webgl_camera.ts
rename to three/tests/webgl/webgl_camera.ts
index a10a4ad0d5..7f05840923 100644
--- a/threejs/tests/webgl/webgl_camera.ts
+++ b/three/tests/webgl/webgl_camera.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_camera.html
diff --git a/threejs/tests/webgl/webgl_custom_attributes.ts b/three/tests/webgl/webgl_custom_attributes.ts
similarity index 98%
rename from threejs/tests/webgl/webgl_custom_attributes.ts
rename to three/tests/webgl/webgl_custom_attributes.ts
index 94c892f62b..077b99424d 100644
--- a/threejs/tests/webgl/webgl_custom_attributes.ts
+++ b/three/tests/webgl/webgl_custom_attributes.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_custom_attributes.html
diff --git a/threejs/tests/webgl/webgl_geometries.ts b/three/tests/webgl/webgl_geometries.ts
similarity index 99%
rename from threejs/tests/webgl/webgl_geometries.ts
rename to three/tests/webgl/webgl_geometries.ts
index 7840641b2a..aed2b2e2b6 100644
--- a/threejs/tests/webgl/webgl_geometries.ts
+++ b/three/tests/webgl/webgl_geometries.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_geometries.html
diff --git a/threejs/tests/webgl/webgl_helpers.ts b/three/tests/webgl/webgl_helpers.ts
similarity index 98%
rename from threejs/tests/webgl/webgl_helpers.ts
rename to three/tests/webgl/webgl_helpers.ts
index 07f3f2db8a..3cab4ac547 100644
--- a/threejs/tests/webgl/webgl_helpers.ts
+++ b/three/tests/webgl/webgl_helpers.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_helpers.html
diff --git a/threejs/tests/webgl/webgl_interactive_cubes.ts b/three/tests/webgl/webgl_interactive_cubes.ts
similarity index 98%
rename from threejs/tests/webgl/webgl_interactive_cubes.ts
rename to three/tests/webgl/webgl_interactive_cubes.ts
index 26bd805906..2c574e2bad 100644
--- a/threejs/tests/webgl/webgl_interactive_cubes.ts
+++ b/three/tests/webgl/webgl_interactive_cubes.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_interactive_cubes.html
diff --git a/threejs/tests/webgl/webgl_interactive_raycasting_points.ts b/three/tests/webgl/webgl_interactive_raycasting_points.ts
similarity index 99%
rename from threejs/tests/webgl/webgl_interactive_raycasting_points.ts
rename to three/tests/webgl/webgl_interactive_raycasting_points.ts
index 550d4b4b94..86edace793 100644
--- a/threejs/tests/webgl/webgl_interactive_raycasting_points.ts
+++ b/three/tests/webgl/webgl_interactive_raycasting_points.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_sprites.html
diff --git a/threejs/tests/webgl/webgl_lensflares.ts b/three/tests/webgl/webgl_lensflares.ts
similarity index 99%
rename from threejs/tests/webgl/webgl_lensflares.ts
rename to three/tests/webgl/webgl_lensflares.ts
index f673d5c96a..5e2e3a1a20 100644
--- a/threejs/tests/webgl/webgl_lensflares.ts
+++ b/three/tests/webgl/webgl_lensflares.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_lensflares.html
diff --git a/threejs/tests/webgl/webgl_lights_hemisphere.ts b/three/tests/webgl/webgl_lights_hemisphere.ts
similarity index 99%
rename from threejs/tests/webgl/webgl_lights_hemisphere.ts
rename to three/tests/webgl/webgl_lights_hemisphere.ts
index 892b3ed4cc..fa4eb5c75d 100644
--- a/threejs/tests/webgl/webgl_lights_hemisphere.ts
+++ b/three/tests/webgl/webgl_lights_hemisphere.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_lights_hemisphere.html
diff --git a/threejs/tests/webgl/webgl_lines_colors.ts b/three/tests/webgl/webgl_lines_colors.ts
similarity index 99%
rename from threejs/tests/webgl/webgl_lines_colors.ts
rename to three/tests/webgl/webgl_lines_colors.ts
index 08501b53b1..be5f94d6d0 100644
--- a/threejs/tests/webgl/webgl_lines_colors.ts
+++ b/three/tests/webgl/webgl_lines_colors.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_lines_colors.html
diff --git a/threejs/tests/webgl/webgl_loader_awd.ts b/three/tests/webgl/webgl_loader_awd.ts
similarity index 98%
rename from threejs/tests/webgl/webgl_loader_awd.ts
rename to three/tests/webgl/webgl_loader_awd.ts
index 455d1a3750..fedc182619 100644
--- a/threejs/tests/webgl/webgl_loader_awd.ts
+++ b/three/tests/webgl/webgl_loader_awd.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_loader_awd.html
diff --git a/threejs/tests/webgl/webgl_materials.ts b/three/tests/webgl/webgl_materials.ts
similarity index 99%
rename from threejs/tests/webgl/webgl_materials.ts
rename to three/tests/webgl/webgl_materials.ts
index 5426a1fb2f..47356cad68 100644
--- a/threejs/tests/webgl/webgl_materials.ts
+++ b/three/tests/webgl/webgl_materials.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_materials.html
diff --git a/threejs/tests/webgl/webgl_morphtargets.ts b/three/tests/webgl/webgl_morphtargets.ts
similarity index 98%
rename from threejs/tests/webgl/webgl_morphtargets.ts
rename to three/tests/webgl/webgl_morphtargets.ts
index a8377ba6b2..7e8450b728 100644
--- a/threejs/tests/webgl/webgl_morphtargets.ts
+++ b/three/tests/webgl/webgl_morphtargets.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_morphtargets.html
diff --git a/threejs/tests/webgl/webgl_points_billboards.ts b/three/tests/webgl/webgl_points_billboards.ts
similarity index 98%
rename from threejs/tests/webgl/webgl_points_billboards.ts
rename to three/tests/webgl/webgl_points_billboards.ts
index 37c41424bc..0fb5283cd6 100644
--- a/threejs/tests/webgl/webgl_points_billboards.ts
+++ b/three/tests/webgl/webgl_points_billboards.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_particles_billboards.html
diff --git a/threejs/tests/webgl/webgl_postprocessing.ts b/three/tests/webgl/webgl_postprocessing.ts
similarity index 98%
rename from threejs/tests/webgl/webgl_postprocessing.ts
rename to three/tests/webgl/webgl_postprocessing.ts
index 440e73dddf..e9c557f59b 100644
--- a/threejs/tests/webgl/webgl_postprocessing.ts
+++ b/three/tests/webgl/webgl_postprocessing.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_postprocessing.html
diff --git a/threejs/tests/webgl/webgl_shader.ts b/three/tests/webgl/webgl_shader.ts
similarity index 97%
rename from threejs/tests/webgl/webgl_shader.ts
rename to three/tests/webgl/webgl_shader.ts
index a4937efaf9..8ddb9e5dd8 100644
--- a/threejs/tests/webgl/webgl_shader.ts
+++ b/three/tests/webgl/webgl_shader.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_shader.html
diff --git a/threejs/tests/webgl/webgl_sprites.ts b/three/tests/webgl/webgl_sprites.ts
similarity index 99%
rename from threejs/tests/webgl/webgl_sprites.ts
rename to three/tests/webgl/webgl_sprites.ts
index 3ec84bba15..a40fb77550 100644
--- a/threejs/tests/webgl/webgl_sprites.ts
+++ b/three/tests/webgl/webgl_sprites.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../three.d.ts" />
+/// <reference types="three" />
 /// <reference path="../three-tests-setup.ts" />
 
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_sprites.html
diff --git a/threejs/three-FirstPersonControls.d.ts b/three/three-FirstPersonControls.d.ts
similarity index 97%
rename from threejs/three-FirstPersonControls.d.ts
rename to three/three-FirstPersonControls.d.ts
index fc13ca8ed9..5aaf724161 100644
--- a/threejs/three-FirstPersonControls.d.ts
+++ b/three/three-FirstPersonControls.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 //Source : https://github.com/NTaylorMullen/CycleR/blob/master/CycleR/CycleR.Game.Client/Client/Interfaces/ThreeJS/Cameras/FirstPersonControls.d.ts
 
-/// <reference path="./three.d.ts" />
+
 declare namespace THREE {
     class FirstPersonControls {
         constructor(object: Camera, domElement?: HTMLElement);
diff --git a/threejs/three-canvasrenderer.d.ts b/three/three-canvasrenderer.d.ts
similarity index 98%
rename from threejs/three-canvasrenderer.d.ts
rename to three/three-canvasrenderer.d.ts
index 2d2d9e4930..074f1ae964 100644
--- a/threejs/three-canvasrenderer.d.ts
+++ b/three/three-canvasrenderer.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Satoru Kimura <https://github.com/gyohk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./three.d.ts" />
-
 declare namespace THREE {
     export interface SpriteCanvasMaterialParameters extends MaterialParameters{
         color?: number;
diff --git a/threejs/three-copyshader.d.ts b/three/three-copyshader.d.ts
similarity index 89%
rename from threejs/three-copyshader.d.ts
rename to three/three-copyshader.d.ts
index 601773bff2..ff28c682ee 100644
--- a/threejs/three-copyshader.d.ts
+++ b/three/three-copyshader.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Satoru Kimura <https://github.com/gyohk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./three.d.ts" />
+
 
 declare namespace THREE {
 	export var CopyShader: Shader;
diff --git a/threejs/three-css3drenderer.d.ts b/three/three-css3drenderer.d.ts
similarity index 95%
rename from threejs/three-css3drenderer.d.ts
rename to three/three-css3drenderer.d.ts
index dced257f0c..7f015d4e69 100644
--- a/threejs/three-css3drenderer.d.ts
+++ b/three/three-css3drenderer.d.ts
@@ -6,7 +6,7 @@
 // This renderer does not work in IE. Can be found here for more information.
 // https://github.com/mrdoob/three.js/issues/4783
 
-/// <reference path="./three.d.ts" />
+
 
 declare namespace THREE {
     class CSS3DObject extends Object3D {
diff --git a/threejs/three-editorcontrols.d.ts b/three/three-editorcontrols.d.ts
similarity index 94%
rename from threejs/three-editorcontrols.d.ts
rename to three/three-editorcontrols.d.ts
index e4d06f63ba..9ed2a0ceb5 100644
--- a/threejs/three-editorcontrols.d.ts
+++ b/three/three-editorcontrols.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Qinsi ZHU <https://github.com/qszhusightp>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./three.d.ts" />
+
 
 declare namespace THREE {
 
diff --git a/threejs/three-effectcomposer.d.ts b/three/three-effectcomposer.d.ts
similarity index 85%
rename from threejs/three-effectcomposer.d.ts
rename to three/three-effectcomposer.d.ts
index db7ba6087f..16ed7d33a5 100644
--- a/threejs/three-effectcomposer.d.ts
+++ b/three/three-effectcomposer.d.ts
@@ -3,9 +3,9 @@
 // Definitions by: Satoru Kimura <https://github.com/gyohk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./three.d.ts" />
-/// <reference path="./three-shaderpass.d.ts" />
-/// <reference path="./three-copyshader.d.ts" />
+
+
+
 
 declare namespace THREE {
 	export class EffectComposer {
diff --git a/threejs/three-maskpass.d.ts b/three/three-maskpass.d.ts
similarity index 95%
rename from threejs/three-maskpass.d.ts
rename to three/three-maskpass.d.ts
index 967f580d22..8cabf2b8ad 100644
--- a/threejs/three-maskpass.d.ts
+++ b/three/three-maskpass.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Satoru Kimura <https://github.com/gyohk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./three.d.ts" />
+
 
 declare namespace THREE {
 	export class MaskPass {
diff --git a/threejs/three-orbitcontrols.d.ts b/three/three-orbitcontrols.d.ts
similarity index 98%
rename from threejs/three-orbitcontrols.d.ts
rename to three/three-orbitcontrols.d.ts
index 910a658334..815201403c 100644
--- a/threejs/three-orbitcontrols.d.ts
+++ b/three/three-orbitcontrols.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Satoru Kimura <https://github.com/gyohk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./three.d.ts" />
+
 
 declare namespace THREE {
     class OrbitControls {
diff --git a/threejs/three-orthographictrackballcontrols.d.ts b/three/three-orthographictrackballcontrols.d.ts
similarity index 96%
rename from threejs/three-orthographictrackballcontrols.d.ts
rename to three/three-orthographictrackballcontrols.d.ts
index 259b51e7cc..ea19c2a73d 100644
--- a/threejs/three-orthographictrackballcontrols.d.ts
+++ b/three/three-orthographictrackballcontrols.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Stefan Profanter <https://github.com/pro>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-/// <reference path="./three.d.ts" />
+
 
 declare module THREE {
 	class OrthographicTrackballControls extends EventDispatcher {
diff --git a/threejs/three-projector.d.ts b/three/three-projector.d.ts
similarity index 98%
rename from threejs/three-projector.d.ts
rename to three/three-projector.d.ts
index dc9d90eb61..ef339b25e3 100644
--- a/threejs/three-projector.d.ts
+++ b/three/three-projector.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Satoru Kimura <https://github.com/gyohk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./three.d.ts" />
+
 
 declare namespace THREE {
     // Renderers / Renderables /////////////////////////////////////////////////////////////////////
diff --git a/threejs/three-renderpass.d.ts b/three/three-renderpass.d.ts
similarity index 96%
rename from threejs/three-renderpass.d.ts
rename to three/three-renderpass.d.ts
index f7b3a0027f..842ad7faf1 100644
--- a/threejs/three-renderpass.d.ts
+++ b/three/three-renderpass.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Satoru Kimura <https://github.com/gyohk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./three.d.ts" />
+
 
 declare namespace THREE {
 	export class RenderPass {
diff --git a/threejs/three-shaderpass.d.ts b/three/three-shaderpass.d.ts
similarity index 94%
rename from threejs/three-shaderpass.d.ts
rename to three/three-shaderpass.d.ts
index 7762147c45..cce304b523 100644
--- a/threejs/three-shaderpass.d.ts
+++ b/three/three-shaderpass.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Satoru Kimura <https://github.com/gyohk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./three.d.ts" />
+
 
 declare namespace THREE {
 	export class ShaderPass {
diff --git a/threejs/three-tests.ts b/three/three-tests.ts
similarity index 100%
rename from threejs/three-tests.ts
rename to three/three-tests.ts
diff --git a/threejs/three-trackballcontrols.d.ts b/three/three-trackballcontrols.d.ts
similarity index 97%
rename from threejs/three-trackballcontrols.d.ts
rename to three/three-trackballcontrols.d.ts
index 41b978fd3f..d98def7779 100644
--- a/threejs/three-trackballcontrols.d.ts
+++ b/three/three-trackballcontrols.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Satoru Kimura <https://github.com/gyohk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./three.d.ts" />
+
 
 declare namespace THREE {
     class TrackballControls extends EventDispatcher {
diff --git a/threejs/three-transformcontrols.d.ts b/three/three-transformcontrols.d.ts
similarity index 94%
rename from threejs/three-transformcontrols.d.ts
rename to three/three-transformcontrols.d.ts
index 82cccec15d..e6d2638540 100644
--- a/threejs/three-transformcontrols.d.ts
+++ b/three/three-transformcontrols.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Stefan Profanter <https://github.com/Pro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./three.d.ts" />
+
 
 declare namespace THREE {
 	class TransformControls extends Object3D {
diff --git a/threejs/three-vrcontrols.d.ts b/three/three-vrcontrols.d.ts
similarity index 93%
rename from threejs/three-vrcontrols.d.ts
rename to three/three-vrcontrols.d.ts
index 1e0b018a6a..0a02427c89 100644
--- a/threejs/three-vrcontrols.d.ts
+++ b/three/three-vrcontrols.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Toshiya Nakakura <https://github.com/nakakura>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./three.d.ts" />
+
 
 declare namespace THREE {
     export class VRControls {
diff --git a/threejs/three-vreffect.d.ts b/three/three-vreffect.d.ts
similarity index 96%
rename from threejs/three-vreffect.d.ts
rename to three/three-vreffect.d.ts
index 1e1684cc67..7f1bc84f40 100644
--- a/threejs/three-vreffect.d.ts
+++ b/three/three-vreffect.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Toshiya Nakakura <https://github.com/nakakura>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./three.d.ts" />
+
 
 declare namespace THREE {
     export class VREffect {
diff --git a/three/tsconfig.json b/three/tsconfig.json
new file mode 100644
index 0000000000..a36408b319
--- /dev/null
+++ b/three/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "three-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/threejs/tests/three-tests-setup.ts b/threejs/tests/three-tests-setup.ts
deleted file mode 100644
index 4ad96406d2..0000000000
--- a/threejs/tests/three-tests-setup.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/////////////////////////////////////////////////////////////
-// https://github.com/mrdoob/three.js/tree/master/examples
-//////////////////////////////////////////////////////////////
-
-/// <reference path="../../stats/stats.d.ts" />
-/// <reference path="../../dat-gui/dat-gui.d.ts" />
-/// <reference path="../detector.d.ts" />
-/// <reference path="../three-canvasrenderer.d.ts" />
-/// <reference path="../three-css3drenderer.d.ts" />
-/// <reference path="../three-projector.d.ts" />
-/// <reference path="../three-orbitcontrols.d.ts" />
-/// <reference path="../three-trackballcontrols.d.ts" />
-/// <reference path="../three-effectcomposer.d.ts" />
-/// <reference path="../three-renderpass.d.ts" />
-/// <reference path="../three-shaderpass.d.ts" />
-/// <reference path="../three-copyshader.d.ts" />
-
-declare namespace THREE {
-    var AWDLoader: any;
-    var FlyControls: any;
-    var BloomPass: any;
-    var DotScreenShader: Shader;
-    var RGBShiftShader: Shader;
-    var FXAAShader: Shader;
-}
diff --git a/threejs/three-tests.ts.tscparams b/threejs/three-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/threejs/three-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/threejs/three.d.ts b/threejs/three.d.ts
deleted file mode 100644
index e11a4ca231..0000000000
--- a/threejs/three.d.ts
+++ /dev/null
@@ -1,6373 +0,0 @@
-// Type definitions for three.js r74
-// Project: http://mrdoob.github.com/three.js/
-// Definitions by: Kon <http://phyzkit.net/>, Satoru Kimura <https://github.com/gyohk>, Florent Poujol <https://github.com/florentpoujol>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-declare namespace THREE {
-    export const REVISION: string;
-
-    // https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent.button
-    export enum MOUSE { LEFT, MIDDLE, RIGHT }
-
-    // GL STATE CONSTANTS
-    export enum CullFace { }
-    export const CullFaceNone: CullFace;
-    export const CullFaceBack: CullFace;
-    export const CullFaceFront: CullFace;
-    export const CullFaceFrontBack: CullFace;
-
-    export enum FrontFaceDirection { }
-    export const FrontFaceDirectionCW: FrontFaceDirection;
-    export const FrontFaceDirectionCCW: FrontFaceDirection;
-
-    // Shadowing Type
-    export enum ShadowMapType { }
-    export const BasicShadowMap: ShadowMapType;
-    export const PCFShadowMap: ShadowMapType;
-    export const PCFSoftShadowMap: ShadowMapType;
-
-    // MATERIAL CONSTANTS
-
-    // side
-    export enum Side { }
-    export const FrontSide: Side;
-    export const BackSide: Side;
-    export const DoubleSide: Side;
-
-    // shading
-    export enum Shading { }
-    export const FlatShading: Shading;
-    export const SmoothShading: Shading;
-
-    // colors
-    export enum Colors { }
-    export const NoColors: Colors;
-    export const FaceColors: Colors;
-    export const VertexColors: Colors;
-
-    // blending modes
-    export enum Blending { }
-    export const NoBlending: Blending;
-    export const NormalBlending: Blending;
-    export const AdditiveBlending: Blending;
-    export const SubtractiveBlending: Blending;
-    export const MultiplyBlending: Blending;
-    export const CustomBlending: Blending;
-
-    // custom blending equations
-    // (numbers start from 100 not to clash with other
-    //  mappings to OpenGL constants defined in Texture.js)
-    export enum BlendingEquation { }
-    export const AddEquation: BlendingEquation;
-    export const SubtractEquation: BlendingEquation;
-    export const ReverseSubtractEquation: BlendingEquation;
-    export const MinEquation: BlendingEquation;
-    export const MaxEquation: BlendingEquation;
-
-    // custom blending destination factors
-    export enum BlendingDstFactor { }
-    export const ZeroFactor: BlendingDstFactor;
-    export const OneFactor: BlendingDstFactor;
-    export const SrcColorFactor: BlendingDstFactor;
-    export const OneMinusSrcColorFactor: BlendingDstFactor;
-    export const SrcAlphaFactor: BlendingDstFactor;
-    export const OneMinusSrcAlphaFactor: BlendingDstFactor;
-    export const DstAlphaFactor: BlendingDstFactor;
-    export const OneMinusDstAlphaFactor: BlendingDstFactor;
-
-   // custom blending src factors
-    export enum BlendingSrcFactor { }
-    export const DstColorFactor: BlendingSrcFactor;
-    export const OneMinusDstColorFactor: BlendingSrcFactor;
-    export const SrcAlphaSaturateFactor: BlendingSrcFactor;
-
-    // depth modes
-    export enum DepthModes { }
-    export const NeverDepth: DepthModes;
-    export const AlwaysDepth: DepthModes;
-    export const LessDepth: DepthModes;
-    export const LessEqualDepth: DepthModes;
-    export const EqualDepth: DepthModes;
-    export const GreaterEqualDepth: DepthModes;
-    export const GreaterDepth: DepthModes;
-    export const NotEqualDepth: DepthModes;
-
-    // TEXTURE CONSTANTS
-    // Operations
-    export enum Combine { }
-    export const MultiplyOperation: Combine;
-    export const MixOperation: Combine;
-    export const AddOperation: Combine;
-
-    // Mapping modes
-    export enum Mapping { }
-    export const UVMapping: Mapping;
-    export const CubeReflectionMapping: Mapping;
-    export const CubeRefractionMapping: Mapping;
-    export const EquirectangularReflectionMapping: Mapping;
-    export const EquirectangularRefractionMapping: Mapping;
-    export const SphericalReflectionMapping: Mapping;
-
-    // Wrapping modes
-    export enum Wrapping { }
-    export const RepeatWrapping: Wrapping;
-    export const ClampToEdgeWrapping: Wrapping;
-    export const MirroredRepeatWrapping: Wrapping;
-
-    // Filters
-    export enum TextureFilter { }
-    export const NearestFilter: TextureFilter;
-    export const NearestMipMapNearestFilter: TextureFilter;
-    export const NearestMipMapLinearFilter: TextureFilter;
-    export const LinearFilter: TextureFilter;
-    export const LinearMipMapNearestFilter: TextureFilter;
-    export const LinearMipMapLinearFilter: TextureFilter;
-
-    // Data types
-    export enum TextureDataType { }
-    export const UnsignedByteType: TextureDataType;
-    export const ByteType: TextureDataType;
-    export const ShortType: TextureDataType;
-    export const UnsignedShortType: TextureDataType;
-    export const IntType: TextureDataType;
-    export const UnsignedIntType: TextureDataType;
-    export const FloatType: TextureDataType;
-    export const HalfFloatType: TextureDataType;
-
-    // Pixel types
-    export enum PixelType { }
-    export const UnsignedShort4444Type: PixelType;
-    export const UnsignedShort5551Type: PixelType;
-    export const UnsignedShort565Type: PixelType;
-
-    // Pixel formats
-    export enum PixelFormat { }
-    export const AlphaFormat: PixelFormat;
-    export const RGBFormat: PixelFormat;
-    export const RGBAFormat: PixelFormat;
-    export const LuminanceFormat: PixelFormat;
-    export const LuminanceAlphaFormat: PixelFormat;
-    export const RGBEFormat: PixelFormat;
-
-    // Compressed texture formats
-    // DDS / ST3C Compressed texture formats
-    export enum CompressedPixelFormat { }
-    export const RGB_S3TC_DXT1_Format: CompressedPixelFormat;
-    export const RGBA_S3TC_DXT1_Format: CompressedPixelFormat;
-    export const RGBA_S3TC_DXT3_Format: CompressedPixelFormat;
-    export const RGBA_S3TC_DXT5_Format: CompressedPixelFormat;
-
-    // PVRTC compressed texture formats
-    export const RGB_PVRTC_4BPPV1_Format: CompressedPixelFormat;
-    export const RGB_PVRTC_2BPPV1_Format: CompressedPixelFormat;
-    export const RGBA_PVRTC_4BPPV1_Format: CompressedPixelFormat;
-    export const RGBA_PVRTC_2BPPV1_Format: CompressedPixelFormat;
-
-    // ETC compressed texture formats
-    export const RGB_ETC1_Format: CompressedPixelFormat;
-
-    // Loop styles for AnimationAction
-    export enum AnimationActionLoopStyles { }
-    export const LoopOnce: AnimationActionLoopStyles;
-    export const LoopRepeat: AnimationActionLoopStyles;
-    export const LoopPingPong: AnimationActionLoopStyles;
-
-    // Interpolation
-    export enum InterpolationModes { }
-    export const InterpolateDiscrete: InterpolationModes;
-    export const InterpolateLinear: InterpolationModes;
-    export const InterpolateSmooth: InterpolationModes;
-
-    // Interpolant ending modes
-    export enum InterpolationEndingModes { }
-    export const ZeroCurvatureEnding: InterpolationEndingModes;
-    export const ZeroSlopeEnding: InterpolationEndingModes;
-    export const WrapAroundEnding: InterpolationEndingModes;
-
-    // Triangle Draw modes
-    export enum TrianglesDrawModes { }
-    export const TrianglesDrawModesMode: TrianglesDrawModes;
-    export const TriangleStripDrawMode: TrianglesDrawModes;
-    export const TriangleFanDrawMode: TrianglesDrawModes;
-
-    // log handlers
-    export function warn(message?: any, ...optionalParams: any[]): void;
-    export function error(message?: any, ...optionalParams: any[]): void;
-    export function log(message?: any, ...optionalParams: any[]): void;
-
-    // Animation ////////////////////////////////////////////////////////////////////////////////////////
-
-    export class AnimationClip {
-        constructor( name?: string, duration?: number, tracks?: KeyframeTrack[] );
-
-        name: string;
-        tracks: KeyframeTrack[];
-        duration: number;
-        results: any[];
-
-        resetDuration(): void;
-        trim(): AnimationClip;
-        optimize(): AnimationClip;
-
-        static CreateFromMorphTargetSequence( name: string, morphTargetSequence: MorphTarget[], fps: number ): AnimationClip;
-        static findByName( clipArray: AnimationClip, name: string ): AnimationClip;
-        static CreateClipsFromMorphTargetSequences( morphTargets: MorphTarget[], fps: number ): AnimationClip[];
-        static parse( json: any ): AnimationClip;
-        static parseAnimation( animation: any, bones: Bone[], nodeName: string ): AnimationClip;
-        static toJSON(): any;
-    }
-
-    export class AnimationMixer {
-        constructor(root: any);
-
-        time: number;
-        timeScale: number;
-
-        clipAction(clip: AnimationClip, root?: any): any; // returns THREE.AnimationMixer._Action
-        existingAction(clip: AnimationClip, root?: any): any; /// returns THREE.AnimationMixer._Action
-        stopAllAction(clip: AnimationClip, root?: any): AnimationMixer;
-        update(deltaTime: number): AnimationMixer;
-        getRoot(): any;
-        uncacheClip(clip: AnimationClip): void;
-        uncacheRoot(root: any): void;
-        uncazcheAction(clip: AnimationClip, root?: any): void;
-    }
-
-    export class AnimationObjectGroup {
-        constructor(...args: any[]);
-
-        uuid: string;
-        stats: {
-            bindingsPerObject: number;
-            objects: {
-                total: number;
-                inUse: number;
-            }
-        };
-
-        add(...args: any[]): void;
-        remove(...args: any[]): void;
-        uncache(...args: any[]): void;
-    }
-
-    export namespace AnimationUtils {
-        export function arraySlice(array: any, from: number, to: number): any;
-        export function convertArray(array: any, type: any, forceClone: boolean): any;
-        export function isTypedArray(object: any): boolean;
-        export function getKeyFrameOrder(times: number): number[];
-        export function sortedArray(values: any[], stride: number, order: number[]): any[];
-        export function flattenJSON(jsonKeys: string[], times: any[], values: any[], valuePropertyName: string): void;
-    }
-
-    export class KeyframeTrack {
-        constructor(name: string, times: any[], values: any[], interpolation: InterpolationModes);
-
-        name: string;
-        times: any[];
-        values: any[];
-
-        ValueTypeName: string;
-        TimeBufferType: Float32Array;
-        ValueBufferType: Float32Array;
-
-        DefaultInterpolation: InterpolationModes;
-
-        InterpolantFactoryMethodDiscrete(result: any): DiscreteInterpolant;
-        InterpolantFactoryMethodLinear(result: any): LinearInterpolant;
-        InterpolantFactoryMethodSmooth(result: any): CubicInterpolant;
-
-        setInterpolation(interpolation: InterpolationModes): void;
-        getInterpolation(): InterpolationModes;
-
-        getValuesize(): number;
-
-        shift( timeOffset: number ): KeyframeTrack;
-        scale( timeScale: number ): KeyframeTrack;
-        trim( startTime: number, endTime: number ): KeyframeTrack;
-        validate(): boolean;
-        optimize(): KeyframeTrack;
-
-        static parse(json: any): KeyframeTrack;
-        static toJSON(track: KeyframeTrack): any;
-    }
-
-    export class PropertyBinding {
-        constructor(rootNode: any, path: string, parsedPath?: any);
-
-        path: string;
-        parsedPath: any;
-        node: any;
-        rootNode: any;
-
-        getValue(targetArray: any, offset: number): any;
-        setValue(sourceArray: any, offset: number): void;
-        bind(): void;
-        unbind(): void;
-
-        BindingType: { [bindingType: string]: number };
-        Versioning: { [versioning: string]: number };
-
-        GetterByBindingType: Function[];
-        SetterByBindingTypeAndVersioning: Array<Function[]>;
-
-        static create(root: any, path: any, parsedPath?: any): PropertyBinding|PropertyBinding.Composite;
-        static parseTrackName(trackName: string): any;
-        static findNode(root: any, nodeName: string): any;
-    }
-
-    export namespace PropertyBinding {
-        export class Composite {
-            constructor(targetGroup: any, path: any, parsedPath?: any);
-
-            getValue(array: any, offset: number): any;
-            setValue(array: any, offset: number): void;
-            bind(): void;
-            unbind(): void;
-        }
-    }
-
-    export class PropertyMixer {
-        constructor(binding: any, typeName: string, valueSize: number);
-
-        binding: any;
-        valueSize: number;
-        buffer: any;
-        cumulativeWeight: number;
-        useCount: number;
-        referenceCount: number;
-
-        accumulate(accuIndex: number, weight: number): void;
-        apply(accuIndex: number): void;
-        saveOriginalState(): void;
-        restoreOriginalState(): void;
-    }
-
-    export class BooleanKeyframeTrack extends KeyframeTrack {
-        constructor(name: string, times: any[], values: any[]);
-    }
-
-    export class NumberKeyframeTrack extends KeyframeTrack {
-        constructor(name: string, times: any[], values: any[], interpolation: InterpolationModes);
-    }
-
-    export class QuaternionKeyframeTrack extends KeyframeTrack {
-        constructor(name: string, times: any[], values: any[], interpolation: InterpolationModes);
-    }
-
-    export class StringKeyframeTrack extends KeyframeTrack {
-        constructor(name: string, times: any[], values: any[], interpolation: InterpolationModes);
-    }
-
-    export class VectorKeyframeTrack extends KeyframeTrack {
-        constructor(name: string, times: any[], values: any[], interpolation: InterpolationModes);
-    }
-
-    // Cameras ////////////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Abstract base class for cameras. This class should always be inherited when you build a new camera.
-     */
-    export class Camera extends Object3D {
-        /**
-         * This constructor sets following properties to the correct type: matrixWorldInverse, projectionMatrix and projectionMatrixInverse.
-         */
-        constructor();
-
-        /**
-         * This is the inverse of matrixWorld. MatrixWorld contains the Matrix which has the world transform of the Camera.
-         */
-        matrixWorldInverse: Matrix4;
-
-        /**
-         * This is the matrix which contains the projection.
-         */
-        projectionMatrix: Matrix4;
-
-        getWorldDirection(optionalTarget?: Vector3): Vector3;
-
-        /**
-         * This make the camera look at the vector position in local space.
-         * @param vector point to look at
-         */
-        lookAt(vector: Vector3): void;
-
-        clone(): Camera;
-        copy(camera?: Camera): Camera;
-    }
-
-    export class CubeCamera extends Object3D {
-        constructor(near?: number, far?: number, cubeResolution?: number);
-
-        renderTarget: WebGLRenderTargetCube;
-
-        updateCubeMap(renderer: Renderer, scene: Scene): void;
-    }
-
-    /**
-     * Camera with orthographic projection
-     *
-     * @example
-     * var camera = new THREE.OrthographicCamera( width / - 2, width / 2, height / 2, height / - 2, 1, 1000 );
-     * scene.add( camera );
-     *
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/cameras/OrthographicCamera.js">src/cameras/OrthographicCamera.js</a>
-     */
-    export class OrthographicCamera extends Camera {
-        /**
-         * @param left Camera frustum left plane.
-         * @param right Camera frustum right plane.
-         * @param top Camera frustum top plane.
-         * @param bottom Camera frustum bottom plane.
-         * @param near Camera frustum near plane.
-         * @param far Camera frustum far plane.
-         */
-        constructor(left: number, right: number, top: number, bottom: number, near?: number, far?: number);
-
-        zoom: number;
-
-        /**
-         * Camera frustum left plane.
-         */
-        left: number;
-
-        /**
-         * Camera frustum right plane.
-         */
-        right: number;
-
-        /**
-         * Camera frustum top plane.
-         */
-        top: number;
-
-        /**
-         * Camera frustum bottom plane.
-         */
-        bottom: number;
-
-        /**
-         * Camera frustum near plane.
-         */
-        near: number;
-
-        /**
-         * Camera frustum far plane.
-         */
-        far: number;
-
-        /**
-         * Updates the camera projection matrix. Must be called after change of parameters.
-         */
-        updateProjectionMatrix(): void;
-        clone(): OrthographicCamera;
-        copy(source: OrthographicCamera): OrthographicCamera;
-        toJSON(meta?: any): any;
-    }
-
-    /**
-     * Camera with perspective projection.
-     *
-     * # example
-     *     var camera = new THREE.PerspectiveCamera( 45, width / height, 1, 1000 );
-     *     scene.add( camera );
-     *
-     * @source https://github.com/mrdoob/three.js/blob/master/src/cameras/PerspectiveCamera.js
-     */
-    export class PerspectiveCamera extends Camera {
-        /**
-         * @param fov Camera frustum vertical field of view. Default value is 50.
-         * @param aspect Camera frustum aspect ratio. Default value is 1.
-         * @param near Camera frustum near plane. Default value is 0.1.
-         * @param far Camera frustum far plane. Default value is 2000.
-         */
-        constructor(fov?: number, aspect?: number, near?: number, far?: number);
-
-        focalLength: number;
-        zoom: number;
-
-        /**
-         * Camera frustum vertical field of view, from bottom to top of view, in degrees.
-         */
-        fov: number;
-
-        /**
-         * Camera frustum aspect ratio, window width divided by window height.
-         */
-        aspect: number;
-
-        /**
-         * Camera frustum near plane.
-         */
-        near: number;
-
-        /**
-         * Camera frustum far plane.
-         */
-        far: number;
-
-        /**
-         * Uses focal length (in mm) to estimate and set FOV 35mm (fullframe) camera is used if frame size is not specified.
-         * Formula based on http://www.bobatkins.com/photography/technical/field_of_view.html
-         * @param focalLength focal length
-         * @param frameHeight frame size. Default value is 24.
-         */
-        setLens(focalLength: number, frameHeight?: number): void;
-
-        /**
-         * Sets an offset in a larger frustum. This is useful for multi-window or multi-monitor/multi-machine setups.
-         * For example, if you have 3x2 monitors and each monitor is 1920x1080 and the monitors are in grid like this:
-         *
-         *     +---+---+---+
-         *     | A | B | C |
-         *     +---+---+---+
-         *     | D | E | F |
-         *     +---+---+---+
-         *
-         * then for each monitor you would call it like this:
-         *
-         *     var w = 1920;
-         *     var h = 1080;
-         *     var fullWidth = w * 3;
-         *     var fullHeight = h * 2;
-         *
-         *     // A
-         *     camera.setViewOffset( fullWidth, fullHeight, w * 0, h * 0, w, h );
-         *     // B
-         *     camera.setViewOffset( fullWidth, fullHeight, w * 1, h * 0, w, h );
-         *     // C
-         *     camera.setViewOffset( fullWidth, fullHeight, w * 2, h * 0, w, h );
-         *     // D
-         *     camera.setViewOffset( fullWidth, fullHeight, w * 0, h * 1, w, h );
-         *     // E
-         *     camera.setViewOffset( fullWidth, fullHeight, w * 1, h * 1, w, h );
-         *     // F
-         *     camera.setViewOffset( fullWidth, fullHeight, w * 2, h * 1, w, h ); Note there is no reason monitors have to be the same size or in a grid.
-         *
-         * @param fullWidth full width of multiview setup
-         * @param fullHeight full height of multiview setup
-         * @param x horizontal offset of subcamera
-         * @param y vertical offset of subcamera
-         * @param width width of subcamera
-         * @param height height of subcamera
-         */
-        setViewOffset(fullWidth: number, fullHeight: number, x: number, y: number, width: number, height: number): void;
-
-        /**
-         * Updates the camera projection matrix. Must be called after change of parameters.
-         */
-        updateProjectionMatrix(): void;
-        clone(): PerspectiveCamera;
-        copy(source: PerspectiveCamera): PerspectiveCamera;
-        toJSON(meta?: any): any;
-    }
-
-    export class StereoCamera extends Camera {
-        constructor();
-
-        aspect: number;
-        cameraL: PerspectiveCamera;
-        cameraR: PerspectiveCamera;
-
-        update(camera: PerspectiveCamera): void;
-    }
-
-    // Core ///////////////////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/BufferAttribute.js">src/core/BufferAttribute.js</a>
-     */
-    export class BufferAttribute {
-        constructor(array: ArrayLike<number>, itemSize: number); // array parameter should be TypedArray.
-
-        uuid: string;
-        array: ArrayLike<number>;
-        itemSize: number;
-        dynamic: boolean;
-        updateRange: {offset:number, count:number};
-        version: number;
-        needsUpdate: boolean;
-        count: number;
-
-        setDynamic(dynamic: boolean): BufferAttribute;
-        clone(): BufferAttribute;
-        copy(source: BufferAttribute): BufferAttribute;
-        copyAt(index1: number, attribute: BufferAttribute, index2: number): BufferAttribute;
-        copyArray(array: ArrayLike<number>): BufferAttribute;
-        copyColorsArray(colors: {r:number, g:number, b:number}[]): BufferAttribute;
-        copyIndicesArray(indices: {a:number, b:number, c:number}[]): BufferAttribute;
-        copyVector2sArray(vectors: {x:number, y:number}[]): BufferAttribute;
-        copyVector3sArray(vectors: {x:number, y:number, z:number}[]): BufferAttribute;
-        copyVector4sArray(vectors: {x:number, y:number, z:number, w:number}[]): BufferAttribute;
-        set(value: ArrayLike<number>, offset?: number): BufferAttribute;
-        getX(index: number): number;
-        setX(index: number, x: number): BufferAttribute;
-        getY(index: number): number;
-        setY(index: number, y: number): BufferAttribute;
-        getZ(index: number): number;
-        setZ(index: number, z: number): BufferAttribute;
-        getW(index: number): number;
-        setW(index: number, z: number): BufferAttribute;
-        setXY(index: number, x: number, y: number): BufferAttribute;
-        setXYZ(index: number, x: number, y: number, z: number): BufferAttribute;
-        setXYZW(index: number, x: number, y: number, z: number, w: number): BufferAttribute;
-        clone(): BufferAttribute;
-
-        length: number; // deprecated, use count
-    }
-
-    export class Int8Attribute extends BufferAttribute {
-        constructor(array: any, itemSize: number);
-    }
-
-    export class Uint8Attribute extends BufferAttribute {
-        constructor(array: any, itemSize: number);
-    }
-
-    export class Uint8ClampedAttribute extends BufferAttribute {
-        constructor(array: any, itemSize: number);
-    }
-
-    export class Int16Attribute extends BufferAttribute {
-        constructor(array: any, itemSize: number);
-    }
-
-    export class Uint16Attribute extends BufferAttribute {
-        constructor(array: any, itemSize: number);
-    }
-
-    export class Int32Attribute extends BufferAttribute {
-        constructor(array: any, itemSize: number);
-    }
-
-    export class Uint32Attribute extends BufferAttribute {
-        constructor(array: any, itemSize: number);
-    }
-
-    export class Float32Attribute extends BufferAttribute {
-        constructor(array: any, itemSize: number);
-    }
-
-    export class Float64Attribute extends BufferAttribute {
-        constructor(array: any, itemSize: number);
-    }
-
-    // deprecated, use new THREE.BufferAttribute().setDynamic( true )
-    export class DynamicBufferAttribute extends BufferAttribute {}
-
-    /**
-     * This is a superefficent class for geometries because it saves all data in buffers.
-     * It reduces memory costs and cpu cycles. But it is not as easy to work with because of all the nessecary buffer calculations.
-     * It is mainly interesting when working with static objects.
-     *
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/BufferGeometry.js">src/core/BufferGeometry.js</a>
-     */
-    export class BufferGeometry {
-        /**
-         * This creates a new BufferGeometry. It also sets several properties to an default value.
-         */
-        constructor();
-
-        static MaxIndex: number;
-
-        /**
-         * Unique number of this buffergeometry instance
-         */
-        id: number;
-        uuid: string;
-        name: string;
-        type: string;
-        index: BufferAttribute;
-        attributes: BufferAttribute|InterleavedBufferAttribute[];
-        morphAttributes: any;
-        drawcalls: any; // deprecated, use groups
-        offsets: any; // deprecated, use groups
-        groups: {start: number, count: number, materialIndex?: number}[];
-        boundingBox: Box3;
-        boundingSphere: BoundingSphere;
-        drawRange: { start: number, count: number };
-
-        getIndex(): BufferAttribute;
-        setIndex( index: BufferAttribute ): void;
-
-        addAttribute(name: string, attribute: BufferAttribute|InterleavedBufferAttribute): BufferGeometry;
-
-        getAttribute(name: string): BufferAttribute|InterleavedBufferAttribute;
-        removeAttribute(name: string): BufferGeometry;
-
-        addGroup(start: number, count: number, materialIndex?: number): void;
-        clearGroups(): void;
-
-        setDrawRange(start: number, count: number): void;
-
-        /**
-         * Bakes matrix transform directly into vertex coordinates.
-         */
-        applyMatrix(matrix: Matrix4): void;
-
-        rotateX(angle: number): BufferGeometry;
-        rotateY(angle: number): BufferGeometry;
-        rotateZ(angle: number): BufferGeometry;
-        translate(x: number, y: number, z: number): BufferGeometry;
-        scale(x: number, y: number, z: number): BufferGeometry;
-        lookAt(v: Vector3): void;
-
-        center(): Vector3;
-
-        setFromObject(object: Object3D) : void;
-        updateFromObject(object: Object3D) : void;
-
-        fromGeometry(geometry: Geometry, settings?: any): BufferGeometry;
-
-        fromDirectGeometry(geometry: DirectGeometry): BufferGeometry;
-
-        /**
-         * Computes bounding box of the geometry, updating Geometry.boundingBox attribute.
-         * Bounding boxes aren't computed by default. They need to be explicitly computed, otherwise they are null.
-         */
-        computeBoundingBox(): void;
-
-        /**
-         * Computes bounding sphere of the geometry, updating Geometry.boundingSphere attribute.
-         * Bounding spheres aren't' computed by default. They need to be explicitly computed, otherwise they are null.
-         */
-        computeBoundingSphere(): void;
-
-        /**
-         * Computes vertex normals by averaging face normals.
-         */
-        computeVertexNormals(): void;
-
-        merge(geometry: BufferGeometry, offset: number): BufferGeometry;
-        normalizeNormals(): void;
-
-        toNonIndexed(): BufferGeometry;
-
-        toJSON(): any;
-        clone(): BufferGeometry;
-        copy(source: BufferGeometry): BufferGeometry;
-
-        /**
-         * Disposes the object from memory.
-         * You need to call this when you want the bufferGeometry removed while the application is running.
-         */
-        dispose(): void;
-
-        // EventDispatcher mixins
-        addEventListener(type: string, listener: (event: Event) => void ): void;
-        hasEventListener(type: string, listener: (event: Event) => void): void;
-        removeEventListener(type: string, listener: (event: Event) => void): void;
-        dispatchEvent(event: { type: string; [attachment: string]: any; }): void;
-
-        addIndex(index: any): void; // deprecated, use setIndex()
-        addAttribute(name: any, array: any, itemSize: any): any; // deprecated
-        addDrawCall(start: any, count: any, indexOffset?: any): void; // deprecated, use addGroup()
-        clearDrawCalls(): void; // deprecated, use clearGroups()
-        computeFaceNormals(): void; // deprecated
-    }
-
-    /**
-     * Object for keeping track of time.
-     *
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/Clock.js">src/core/Clock.js</a>
-     */
-    export class Clock {
-        /**
-         * @param autoStart Automatically start the clock.
-         */
-        constructor(autoStart?: boolean);
-
-        /**
-         * If set, starts the clock automatically when the first update is called.
-         */
-        autoStart: boolean;
-
-        /**
-         * When the clock is running, It holds the starttime of the clock.
-         * This counted from the number of milliseconds elapsed since 1 January 1970 00:00:00 UTC.
-         */
-        startTime: number;
-
-        /**
-         * When the clock is running, It holds the previous time from a update.
-         * This counted from the number of milliseconds elapsed since 1 January 1970 00:00:00 UTC.
-         */
-        oldTime: number;
-
-        /**
-         * When the clock is running, It holds the time elapsed between the start of the clock to the previous update.
-         * This parameter is in seconds of three decimal places.
-         */
-        elapsedTime: number;
-
-        /**
-         * This property keeps track whether the clock is running or not.
-         */
-        running: boolean;
-
-        /**
-         * Starts clock.
-         */
-        start(): void;
-
-        /**
-         * Stops clock.
-         */
-        stop(): void;
-
-        /**
-         * Get the seconds passed since the clock started.
-         */
-        getElapsedTime(): number;
-
-        /**
-         * Get the seconds passed since the last call to this method.
-         */
-        getDelta(): number;
-    }
-
-    /**
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/DirectGeometry.js">src/core/DirectGeometry.js</a>
-     */
-    export class DirectGeometry {
-        constructor();
-
-        id: number;
-        uuid: string;
-        name: string;
-        type: string;
-        indices: number[];
-        vertices: Vector3[];
-        normals: Vector3[];
-        colors: Color[];
-        uvs: Vector2[];
-        uvs2: Vector2[];
-        groups: {start: number, materialIndex: number}[];
-        morphTargets: MorphTarget[];
-        skinWeights: number[];
-        skinIndices: number[];
-        boundingBox: Box3;
-        boundingSphere: BoundingSphere;
-        verticesNeedUpdate: boolean;
-        normalsNeedUpdate: boolean;
-        colorsNeedUpdate: boolean;
-        uvsNeedUpdate: boolean;
-        groupsNeedUpdate: boolean;
-
-        computeBoundingBox(): void;
-        computeBoundingSphere(): void;
-        computeGroups(geometry: Geometry): void;
-        fromGeometry(geometry: Geometry): DirectGeometry;
-        dispose(): void;
-
-        // EventDispatcher mixins
-        addEventListener(type: string, listener: (event: Event) => void ): void;
-        hasEventListener(type: string, listener: (event: Event) => void): void;
-        removeEventListener(type: string, listener: (event: Event) => void): void;
-        dispatchEvent(event: { type: string; [attachment: string]: any; }): void;
-    }
-
-
-    /**
-     * JavaScript events for custom objects
-     *
-     * # Example
-     *     var Car = function () {
-     *
-     *         EventDispatcher.call( this );
-     *         this.start = function () {
-     *
-     *             this.dispatchEvent( { type: 'start', message: 'vroom vroom!' } );
-     *
-     *         };
-     *
-     *     };
-     *
-     *     var car = new Car();
-     *     car.addEventListener( 'start', function ( event ) {
-     *
-     *         alert( event.message );
-     *
-     *     } );
-     *     car.start();
-     *
-     * @source src/core/EventDispatcher.js
-     */
-    export class EventDispatcher {
-        /**
-         * Creates eventDispatcher object. It needs to be call with '.call' to add the functionality to an object.
-         */
-        constructor();
-
-        apply(object: any): void;
-
-        /**
-         * Adds a listener to an event type.
-         * @param type The type of the listener that gets removed.
-         * @param listener The listener function that gets removed.
-         */
-        addEventListener(type: string, listener: (event: Event) => void ): void;
-
-        /**
-         * Adds a listener to an event type.
-         * @param type The type of the listener that gets removed.
-         * @param listener The listener function that gets removed.
-         */
-        hasEventListener(type: string, listener: (event: Event) => void): void;
-
-        /**
-         * Removes a listener from an event type.
-         * @param type The type of the listener that gets removed.
-         * @param listener The listener function that gets removed.
-         */
-        removeEventListener(type: string, listener: (event: Event) => void): void;
-
-        /**
-         * Fire an event type.
-         * @param type The type of event that gets fired.
-         */
-        dispatchEvent(event: { type: string; [attachment: string]: any; }): void;
-    }
-
-    export interface Event {
-        type: string;
-        target: any;
-    }
-
-    /**
-     * Triangle face.
-     *
-     * # Example
-     *     var normal = new THREE.Vector3( 0, 1, 0 );
-     *     var color = new THREE.Color( 0xffaa00 );
-     *     var face = new THREE.Face3( 0, 1, 2, normal, color, 0 );
-     *
-     * @source https://github.com/mrdoob/three.js/blob/master/src/core/Face3.js
-     */
-    export class Face3 {
-        /**
-         * @param a Vertex A index.
-         * @param b Vertex B index.
-         * @param c Vertex C index.
-         * @param normal Face normal or array of vertex normals.
-         * @param color Face color or array of vertex colors.
-         * @param materialIndex Material index.
-         */
-        constructor(a: number, b: number, c: number, normal?: Vector3, color?: Color, materialIndex?: number);
-        constructor(a: number, b: number, c: number, normal?: Vector3, vertexColors?: Color[], materialIndex?: number);
-        constructor(a: number, b: number, c: number, vertexNormals?: Vector3[], color?: Color, materialIndex?: number);
-        constructor(a: number, b: number, c: number, vertexNormals?: Vector3[], vertexColors?: Color[], materialIndex?: number);
-
-        /**
-         * Vertex A index.
-         */
-        a: number;
-
-        /**
-         * Vertex B index.
-         */
-        b: number;
-
-        /**
-         * Vertex C index.
-         */
-        c: number;
-
-        /**
-         * Face normal.
-         */
-        normal: Vector3;
-
-        /**
-         * Array of 4 vertex normals.
-         */
-        vertexNormals: Vector3[];
-
-        /**
-         * Face color.
-         */
-        color: Color;
-
-        /**
-         * Array of 4 vertex normals.
-         */
-        vertexColors: Color[];
-
-        /**
-         * Material index (points to {@link Geometry.materials}).
-         */
-        materialIndex: number;
-
-        clone(): Face3;
-        copy(source: Face3): Face3;
-    }
-
-    export class Face4 extends Face3 {} // deprecated, use Face3
-
-    export interface MorphTarget {
-        name: string;
-        vertices: Vector3[];
-    }
-
-    export interface MorphColor {
-        name: string;
-        colors: Color[];
-    }
-
-    export interface MorphNormals {
-        name: string;
-        normals: Vector3[];
-    }
-
-    export interface BoundingSphere {
-        radius: number;
-    }
-
-    export let GeometryIdCount: number;
-
-    /**
-     * Base class for geometries
-     *
-     * # Example
-     *     var geometry = new THREE.Geometry();
-     *     geometry.vertices.push( new THREE.Vector3( -10, 10, 0 ) );
-     *     geometry.vertices.push( new THREE.Vector3( -10, -10, 0 ) );
-     *     geometry.vertices.push( new THREE.Vector3( 10, -10, 0 ) );
-     *     geometry.faces.push( new THREE.Face3( 0, 1, 2 ) );
-     *     geometry.computeBoundingSphere();
-     *
-     * @see https://github.com/mrdoob/three.js/blob/master/src/core/Geometry.js
-     */
-    export class Geometry {
-        constructor();
-
-        /**
-         * Unique number of this geometry instance
-         */
-        id: number;
-
-        uuid: string;
-
-        /**
-         * Name for this geometry. Default is an empty string.
-         */
-        name: string;
-
-        type: string;
-
-        /**
-         * The array of vertices hold every position of points of the model.
-         * To signal an update in this array, Geometry.verticesNeedUpdate needs to be set to true.
-         */
-        vertices: Vector3[];
-
-        /**
-         * Array of vertex colors, matching number and order of vertices.
-         * Used in ParticleSystem, Line and Ribbon.
-         * Meshes use per-face-use-of-vertex colors embedded directly in faces.
-         * To signal an update in this array, Geometry.colorsNeedUpdate needs to be set to true.
-         */
-        colors: Color[];
-
-        /**
-         * Array of triangles or/and quads.
-         * The array of faces describe how each vertex in the model is connected with each other.
-         * To signal an update in this array, Geometry.elementsNeedUpdate needs to be set to true.
-         */
-        faces: Face3[];
-
-        /**
-         * Array of face UV layers.
-         * Each UV layer is an array of UV matching order and number of vertices in faces.
-         * To signal an update in this array, Geometry.uvsNeedUpdate needs to be set to true.
-         */
-        faceVertexUvs: Vector2[][];
-
-        /**
-         * Array of morph targets. Each morph target is a Javascript object:
-         *
-         *     { name: "targetName", vertices: [ new THREE.Vector3(), ... ] }
-         *
-         * Morph vertices match number and order of primary vertices.
-         */
-        morphTargets: MorphTarget[];
-
-        /**
-         * Array of morph normals. Morph normals have similar structure as morph targets, each normal set is a Javascript object:
-         *
-         *     morphNormal = { name: "NormalName", normals: [ new THREE.Vector3(), ... ] }
-         */
-        morphNormals: MorphNormals[];
-
-        /**
-         * Array of skinning weights, matching number and order of vertices.
-         */
-        skinWeights: number[];
-
-        /**
-         * Array of skinning indices, matching number and order of vertices.
-         */
-        skinIndices: number[];
-
-        /**
-         *
-         */
-        lineDistances: number[];
-
-        /**
-         * Bounding box.
-         */
-        boundingBox: Box3;
-
-        /**
-         * Bounding sphere.
-         */
-        boundingSphere: BoundingSphere;
-
-        /**
-         * Set to true if the vertices array has been updated.
-         */
-        verticesNeedUpdate: boolean;
-
-        /**
-         * Set to true if the faces array has been updated.
-         */
-        elementsNeedUpdate: boolean;
-
-        /**
-         * Set to true if the uvs array has been updated.
-         */
-        uvsNeedUpdate: boolean;
-
-        /**
-         * Set to true if the normals array has been updated.
-         */
-        normalsNeedUpdate: boolean;
-
-        /**
-         * Set to true if the colors array has been updated.
-         */
-        colorsNeedUpdate: boolean;
-
-        /**
-         * Set to true if the linedistances array has been updated.
-         */
-        lineDistancesNeedUpdate: boolean;
-
-        /**
-         *
-         */
-        groupsNeedUpdate: boolean;
-
-        /**
-         * Bakes matrix transform directly into vertex coordinates.
-         */
-        applyMatrix(matrix: Matrix4): void;
-
-        rotateX(angle: number): Geometry;
-        rotateY(angle: number): Geometry;
-        rotateZ(angle: number): Geometry;
-
-        translate(x: number, y: number, z: number): Geometry;
-        scale(x: number, y: number, z: number): Geometry;
-        lookAt( vector: Vector3 ): void;
-
-        fromBufferGeometry(geometry: BufferGeometry): Geometry;
-
-        center(): Vector3;
-
-        normalize(): Geometry;
-
-        /**
-         * Computes face normals.
-         */
-        computeFaceNormals(): void;
-
-        /**
-         * Computes vertex normals by averaging face normals.
-         * Face normals must be existing / computed beforehand.
-         */
-        computeVertexNormals(areaWeighted?: boolean): void;
-
-        /**
-         * Computes morph normals.
-         */
-        computeMorphNormals(): void;
-
-        computeLineDistances(): void;
-
-        /**
-         * Computes bounding box of the geometry, updating {@link Geometry.boundingBox} attribute.
-         */
-        computeBoundingBox(): void;
-
-        /**
-         * Computes bounding sphere of the geometry, updating Geometry.boundingSphere attribute.
-         * Neither bounding boxes or bounding spheres are computed by default. They need to be explicitly computed, otherwise they are null.
-         */
-        computeBoundingSphere(): void;
-
-        merge(geometry: Geometry, matrix: Matrix, materialIndexOffset?: number): void;
-
-        mergeMesh(mesh: Mesh): void;
-
-        /**
-         * Checks for duplicate vertices using hashmap.
-         * Duplicated vertices are removed and faces' vertices are updated.
-         */
-        mergeVertices(): number;
-
-        sortFacesByMaterialIndex(): void;
-
-        toJSON(): any;
-
-        /**
-         * Creates a new clone of the Geometry.
-         */
-        clone(): Geometry;
-
-        copy(source: Geometry): Geometry;
-
-        /**
-         * Removes The object from memory.
-         * Don't forget to call this method when you remove an geometry because it can cuase meomory leaks.
-         */
-        dispose(): void;
-
-
-        //These properties do not exist in a normal Geometry class, but if you use the instance that was passed by JSONLoader, it will be added.
-        bones: Bone[];
-        animation: AnimationClip;
-        animations: AnimationClip[];
-
-        // EventDispatcher mixins
-        addEventListener(type: string, listener: (event: Event) => void ): void;
-        hasEventListener(type: string, listener: (event: Event) => void): void;
-        removeEventListener(type: string, listener: (event: Event) => void): void;
-        dispatchEvent(event: { type: string; [attachment: string]: any; }): void;
-    }
-
-    export namespace GeometryUtils { // deprecated
-        export function merge(goemetry1: any, goemetry2: any, materialIndexOffset?: any): any; // deprecated, use geometry.merge( geometry2, matrix, materialIndexOffset )
-        export function center(geometry: any): any; // deprecated, use geometry.center()
-    }
-
-    /**
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/InstancedBufferAttribute.js">src/core/InstancedBufferAttribute.js</a>
-     */
-    export class InstancedBufferAttribute extends BufferAttribute {
-        constructor(data: ArrayLike<number>, itemSize: number, meshPerAttribute?: number);
-        
-        meshPerAttribute: number;
-
-        clone(): InstancedBufferAttribute;
-        copy(source: InstancedBufferAttribute): InstancedBufferAttribute;
-    }
-
-    /**
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/InstancedBufferGeometry.js">src/core/InstancedBufferGeometry.js</a>
-     */
-    export class InstancedBufferGeometry extends BufferGeometry {
-        constructor();
-
-        groups: {start:number, count:number, instances:number}[];
-        maxInstancedCount: number;
-        
-        addGroup(start: number, count: number, instances: number): void;
-        clone(): InstancedBufferGeometry;
-        copy(source: InstancedBufferGeometry): InstancedBufferGeometry;
-    }
-
-    /**
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/InterleavedBuffer.js">src/core/InterleavedBuffer.js</a>
-     */
-    export class InterleavedBuffer {
-        constructor(array: ArrayLike<number>, stride: number);
-
-        array: ArrayLike<number>;
-        stride: number;
-        dynamic: boolean;
-        updateRange: { offset: number; count: number };
-        version: number;
-        length: number;
-        count: number;
-        needsUpdate: boolean;
-
-        setDynamic(dynamic: boolean): InterleavedBuffer;
-        clone(): InterleavedBuffer;
-        copy(source: InterleavedBuffer): InterleavedBuffer;
-        copyAt(index1: number, attribute: InterleavedBufferAttribute, index2: number): InterleavedBuffer;
-        set(value: ArrayLike<number>, index: number): InterleavedBuffer;
-        clone(): InterleavedBuffer;
-    }
-
-    /**
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/InstancedInterleavedBuffer.js">src/core/InstancedInterleavedBuffer.js</a>
-     */
-    export class InstancedInterleavedBuffer extends InterleavedBuffer {
-        constructor(array: ArrayLike<number>, stride: number, meshPerAttribute?: number);
-        
-        meshPerAttribute: number;
-
-        clone(): InstancedInterleavedBuffer;
-        copy(source: InstancedInterleavedBuffer): InstancedInterleavedBuffer;
-    }
-
-    /**
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/core/InterleavedBufferAttribute.js">src/core/InterleavedBufferAttribute.js</a>
-     */
-    export class InterleavedBufferAttribute {
-        constructor(interleavedBuffer: InterleavedBuffer, itemSize: number, offset: number);
-
-        uuid: string;
-        data: InterleavedBuffer;
-        itemSize: number;
-        offset: number;
-        count: number;
-
-        getX(index: number): number;
-        setX(index: number, x: number): InterleavedBufferAttribute;
-        getY(index: number): number;
-        setY(index: number, y: number): InterleavedBufferAttribute;
-        getZ(index: number): number;
-        setZ(index: number, z: number): InterleavedBufferAttribute;
-        getW(index: number): number;
-        setW(index: number, z: number): InterleavedBufferAttribute;
-        setXY(index: number, x: number, y: number): InterleavedBufferAttribute;
-        setXYZ(index: number, x: number, y: number, z: number): InterleavedBufferAttribute;
-        setXYZW(index: number, x: number, y: number, z: number, w: number): InterleavedBufferAttribute;
-
-        length: number; // deprecated, use count instead
-    }
-
-    export let Object3DIdCount: number;
-
-    /**
-     * Base class for scene graph objects
-     */
-    export class Object3D {
-        constructor();
-
-        /**
-         * Unique number of this object instance.
-         */
-        id: number;
-
-        /**
-         *
-         */
-        uuid: string;
-
-        /**
-         * Optional name of the object (doesn't need to be unique).
-         */
-        name: string;
-
-        type: string;
-
-        /**
-         * Object's parent in the scene graph.
-         */
-        parent: Object3D;
-
-        /**
-         * Array with object's children.
-         */
-        children: Object3D[];
-
-        /**
-         * Up direction.
-         */
-        up: Vector3;
-
-        /**
-         * Object's local position.
-         */
-        position: Vector3;
-
-        /**
-         * Object's local rotation (Euler angles), in radians.
-         */
-        rotation: Euler;
-        eulerOrder: string; // deprecated, use rotation.order
-
-        /**
-         * Global rotation.
-         */
-        quaternion: Quaternion;
-
-        /**
-         * Object's local scale.
-         */
-        scale: Vector3;
-
-        modelViewMatrix: Matrix4;
-
-        normalMatrix: Matrix3;
-
-        /**
-         * When this is set, then the rotationMatrix gets calculated every frame.
-         */
-        rotationAutoUpdate: boolean;
-
-        /**
-         * Local transform.
-         */
-        matrix: Matrix4;
-
-        /**
-         * The global transform of the object. If the Object3d has no parent, then it's identical to the local transform.
-         */
-        matrixWorld: Matrix4;
-
-        /**
-         * When this is set, it calculates the matrix of position, (rotation or quaternion) and scale every frame and also recalculates the matrixWorld property.
-         */
-        matrixAutoUpdate: boolean;
-
-        /**
-         * When this is set, it calculates the matrixWorld in that frame and resets this property to false.
-         */
-        matrixWorldNeedsUpdate: boolean;
-
-        layers: Layers;
-        /**
-         * Object gets rendered if true.
-         */
-        visible: boolean;
-
-        /**
-         * Gets rendered into shadow map.
-         */
-        castShadow: boolean;
-
-        /**
-         * Material gets baked in shadow receiving.
-         */
-        receiveShadow: boolean;
-
-        /**
-         * When this is set, it checks every frame if the object is in the frustum of the camera. Otherwise the object gets drawn every frame even if it isn't visible.
-         */
-        frustumCulled: boolean;
-
-        renderOrder: number;
-
-        /**
-         * An object that can be used to store custom data about the Object3d. It should not hold references to functions as these will not be cloned.
-         */
-        userData: any;
-
-        /**
-         *
-         */
-        static DefaultUp: Vector3;
-        static DefaultMatrixAutoUpdate: boolean;
-
-        /**
-         * This updates the position, rotation and scale with the matrix.
-         */
-        applyMatrix(matrix: Matrix4): void;
-
-        /**
-         *
-         */
-        setRotationFromAxisAngle(axis: Vector3, angle: number): void;
-
-        /**
-         *
-         */
-        setRotationFromEuler(euler: Euler): void;
-
-        /**
-         *
-         */
-        setRotationFromMatrix(m: Matrix4): void;
-
-        /**
-         *
-         */
-        setRotationFromQuaternion(q: Quaternion): void;
-
-        /**
-         * Rotate an object along an axis in object space. The axis is assumed to be normalized.
-         * @param axis  A normalized vector in object space.
-         * @param angle  The angle in radians.
-         */
-        rotateOnAxis(axis: Vector3, angle: number): Object3D;
-
-        /**
-         *
-         * @param angle
-         */
-        rotateX(angle: number): Object3D;
-
-        /**
-         *
-         * @param angle
-         */
-        rotateY(angle: number): Object3D;
-
-        /**
-         *
-         * @param angle
-         */
-        rotateZ(angle: number): Object3D;
-
-        /**
-         * @param axis  A normalized vector in object space.
-         * @param distance  The distance to translate.
-         */
-        translateOnAxis(axis: Vector3, distance: number): Object3D;
-        translate(distance: number, axis: Vector3): Object3D; // deprecated, use translateOnAxis(axis, distance)
-
-        /**
-         * Translates object along x axis by distance.
-         * @param distance Distance.
-         */
-        translateX(distance: number): Object3D;
-
-        /**
-         * Translates object along y axis by distance.
-         * @param distance Distance.
-         */
-        translateY(distance: number): Object3D;
-
-        /**
-         * Translates object along z axis by distance.
-         * @param distance Distance.
-         */
-        translateZ(distance: number): Object3D;
-
-        /**
-         * Updates the vector from local space to world space.
-         * @param vector A local vector.
-         */
-        localToWorld(vector: Vector3): Vector3;
-
-        /**
-         * Updates the vector from world space to local space.
-         * @param vector A world vector.
-         */
-        worldToLocal(vector: Vector3): Vector3;
-
-        /**
-         * Rotates object to face point in space.
-         * @param vector A world vector to look at.
-         */
-        lookAt(vector: Vector3): void;
-
-        /**
-         * Adds object as child of this object.
-         */
-        add(object: Object3D): void;
-
-        /**
-         * Removes object as child of this object.
-         */
-        remove(object: Object3D): void;
-
-        /**
-         * Searches through the object's children and returns the first with a matching id, optionally recursive.
-         * @param id  Unique number of the object instance
-         */
-        getObjectById(id: number): Object3D;
-
-        /**
-         * Searches through the object's children and returns the first with a matching name, optionally recursive.
-         * @param name  String to match to the children's Object3d.name property.
-         */
-        getObjectByName(name: string): Object3D;
-
-        getObjectByProperty( name: string, value: string ): Object3D;
-
-        getWorldPosition(optionalTarget?: Vector3): Vector3;
-        getWorldQuaternion(optionalTarget?: Quaternion): Quaternion;
-        getWorldRotation(optionalTarget?: Euler): Euler;
-        getWorldScale(optionalTarget?: Vector3): Vector3;
-        getWorldDirection(optionalTarget?: Vector3): Vector3;
-
-        raycast(raycaster: Raycaster, intersects: any): void;
-
-        traverse(callback: (object: Object3D) => any): void;
-
-        traverseVisible(callback: (object: Object3D) => any): void;
-
-        traverseAncestors(callback: (object: Object3D) => any): void;
-
-        /**
-         * Updates local transform.
-         */
-        updateMatrix(): void;
-
-        /**
-         * Updates global transform of the object and its children.
-         */
-        updateMatrixWorld(force: boolean): void;
-
-        toJSON(meta?: { geometries: any, materials: any, textures: any, images: any }): any;
-
-        clone(recursive?: boolean): Object3D;
-
-        /**
-         *
-         * @param object
-         * @param recursive
-         */
-        copy(source: Object3D, recursive?: boolean): Object3D;
-
-        // EventDispatcher mixins
-        addEventListener(type: string, listener: (event: Event) => void ): void;
-        hasEventListener(type: string, listener: (event: Event) => void): void;
-        removeEventListener(type: string, listener: (event: Event) => void): void;
-        dispatchEvent(event: { type: string; [attachment: string]: any; }): void;
-
-        getChildByName(name: string): Object3D; // deprecated, use getObjectByName()
-    }
-
-    export interface Intersection {
-        distance: number;
-        distanceToRay: number;
-        point: Vector3;
-        index: number;
-        face: Face3;
-        faceIndex: number;
-        object: Object3D;
-    }
-
-    export interface RaycasterParameters {
-        Mesh?: any;
-        Line?: any;
-        LOD?: any;
-        Points?: { threshold: number };
-        Sprite?: any;
-    }
-
-    export class Raycaster {
-        constructor(origin?: Vector3, direction?: Vector3, near?: number, far?: number);
-
-        ray: Ray;
-        near: number;
-        far: number;
-        params: RaycasterParameters;
-        precision: number;
-        linePrecision: number;
-        
-        set(origin: Vector3, direction: Vector3): void;
-        setFromCamera(coords: { x: number; y: number;}, camera: Camera ): void;
-        intersectObject(object: Object3D, recursive?: boolean): Intersection[];
-        intersectObjects(objects: Object3D[], recursive?: boolean): Intersection[];
-    }
-
-    export class Layers {
-        constructor();
-
-        mask: number;
-
-        set(channel: number): void;
-        enable(channel: number): void;
-        toggle(channel: number): void;
-        disable(channel: number): void;
-        test(layers: Layers): boolean;
-    }
-
-    export class Font {
-        constructor(data: any);
-
-        data: any;
-
-        generateShapes(text: string, size: number, divisions: number): any[];
-    }
-
-    // Lights //////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Abstract base class for lights.
-     */
-    export class Light extends Object3D {
-        constructor(hex?: number|string, intensity?: number);
-
-        color: Color;
-        intensity: number;
-        receiveShadow: boolean;
-        shadow: LightShadow;
-        shadowCameraFov: any; // deprecated, use shadow.camera.fov
-        shadowCameraLeft: any; // deprecated, use shadow.camera.left
-        shadowCameraRight: any; // deprecated, use shadow.camera.right
-        shadowCameraTop: any; // deprecated, use shadow.camera.top
-        shadowCameraBottom: any; // deprecated, use shadow.camera.bottom
-        shadowCameraNear: any; // deprecated, use shadow.camera.near
-        shadowCameraFar: any; // deprecated, use shadow.camera.far
-        shadowBias: any; // deprecated, use shadow.bias
-        shadowMapWidth: any; // deprecated, use shadow.mapSize.width
-        shadowMapHeight: any; // deprecated, use shadow.mapSize.height
-
-        copy(source: Light): Light;
-        clone(recursive?: boolean): Light;
-    }
-
-    export class LightShadow {
-        constructor(camera: Camera);
-
-        camera: Camera;
-        bias: number;
-        radius: number;
-        mapSize: Vector2;
-        map: RenderTarget;
-        matrix: Matrix4;
-
-        copy(source: LightShadow): LightShadow;
-        clone(recursive?: boolean): LightShadow;
-    }
-
-    /**
-     * This light's color gets applied to all the objects in the scene globally.
-     *
-     * # example
-     *     var light = new THREE.AmbientLight( 0x404040 ); // soft white light
-     *     scene.add( light );
-     *
-     * @source https://github.com/mrdoob/three.js/blob/master/src/lights/AmbientLight.js
-     */
-    export class AmbientLight extends Light {
-        /**
-         * This creates a Ambientlight with a color.
-         * @param hex Numeric value of the RGB component of the color.
-         */
-        constructor(hex?: number|string, intensity?: number);
-
-        castShadow: boolean;
-
-        copy(source: AmbientLight): AmbientLight;
-        clone(recursive?: boolean): AmbientLight;
-    }
-
-    /**
-     * Affects objects using MeshLambertMaterial or MeshPhongMaterial.
-     *
-     * @example
-     * // White directional light at half intensity shining from the top.
-     * var directionalLight = new THREE.DirectionalLight( 0xffffff, 0.5 );
-     * directionalLight.position.set( 0, 1, 0 );
-     * scene.add( directionalLight );
-     *
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/lights/DirectionalLight.js">src/lights/DirectionalLight.js</a>
-     */
-    export class DirectionalLight extends Light {
-        constructor(hex?: number|string, intensity?: number);
-
-        /**
-         * Target used for shadow camera orientation.
-         */
-        target: Object3D;
-
-        /**
-         * Light's intensity.
-         * Default — 1.0.
-         */
-        intensity: number;
-
-        shadow: LightShadow;
-
-        copy(source: DirectionalLight): DirectionalLight;
-        clone(recursive?: boolean): HemisphereLight;
-    }
-
-    export class HemisphereLight extends Light {
-        constructor(skyColorHex?: number|string, groundColorHex?: number|string, intensity?: number);
-
-        groundColor: Color;
-        intensity: number;
-
-        copy(source: HemisphereLight): HemisphereLight;
-        clone(recursive?: boolean): HemisphereLight;
-    }
-
-    /**
-     * Affects objects using {@link MeshLambertMaterial} or {@link MeshPhongMaterial}.
-     *
-     * @example
-     * var light = new THREE.PointLight( 0xff0000, 1, 100 );
-     * light.position.set( 50, 50, 50 );
-     * scene.add( light );
-     */
-    export class PointLight extends Light {
-        constructor(hex?: number|string, intensity?: number, distance?: number, decay?: number);
-
-        /*
-         * Light's intensity.
-         * Default - 1.0.
-         */
-        intensity: number;
-
-        /**
-         * If non-zero, light will attenuate linearly from maximum intensity at light position down to zero at distance.
-         * Default — 0.0.
-         */
-        distance: number;
-
-        decay: number;
-
-        shadow: LightShadow;
-
-        copy(source: PointLight): PointLight;
-        clone(recursive?: boolean): PointLight;
-    }
-
-    /**
-     * A point light that can cast shadow in one direction.
-     */
-    export class SpotLight extends Light {
-        constructor(hex?: number|string, intensity?: number, distance?: number, angle?: number, exponent?: number, decay?: number);
-
-        /**
-         * Spotlight focus points at target.position.
-         * Default position — (0,0,0).
-         */
-        target: Object3D;
-
-        /**
-         * Light's intensity.
-         * Default — 1.0.
-         */
-        intensity: number;
-
-        /**
-         * If non-zero, light will attenuate linearly from maximum intensity at light position down to zero at distance.
-         * Default — 0.0.
-         */
-        distance: number;
-
-        /*
-         * Maximum extent of the spotlight, in radians, from its direction.
-         * Default — Math.PI/2.
-         */
-        angle: number;
-
-        /**
-         * Rapidity of the falloff of light from its target direction.
-         * Default — 10.0.
-         */
-        exponent: number;
-
-        decay: number;
-
-        shadow: LightShadow;
-
-        clone(recursive?: boolean): SpotLight;
-        copy(source: PointLight): SpotLight;
-    }
-
-    // Loaders //////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Base class for implementing loaders.
-     *
-     * Events:
-     *     load
-     *         Dispatched when the image has completed loading
-     *         content — loaded image
-     *
-     *     error
-     *
-     *          Dispatched when the image can't be loaded
-     *          message — error message
-     */
-    export class Loader {
-        constructor();
-
-        /**
-         * Will be called when load starts.
-         * The default is a function with empty body.
-         */
-        onLoadStart: () => void;
-
-        /**
-         * Will be called while load progresses.
-         * The default is a function with empty body.
-         */
-        onLoadProgress: () => void;
-
-        /**
-         * Will be called when load completes.
-         * The default is a function with empty body.
-         */
-        onLoadComplete: () => void;
-
-        /**
-         * default — null.
-         * If set, assigns the crossOrigin attribute of the image to the value of crossOrigin, prior to starting the load.
-         */
-        crossOrigin: string;
-
-        extractUrlBase(url: string): string;
-        initMaterials(materials: Material[], texturePath: string): Material[];
-        createMaterial(m: Material, texturePath: string, crossOrigin?: string): boolean;
-
-        static Handlers: LoaderHandler;
-    }
-
-    export interface LoaderHandler{
-        handlers: any[];
-
-        add(regex: string, loader: Loader): void;
-        get(file: string): Loader;
-    }
-
-    export class XHRLoader {
-        constructor(manager?: LoadingManager);
-
-        manager: LoadingManager;
-        path: string;
-        responseType: string;
-        withCredentials: boolean;
-
-        load(url: string, onLoad?: (responseText: string) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): any;
-        setPath(path: string): void;
-        setResponseType(responseType: string): void;
-        setWithCredentials(withCredentials: boolean): void;
-    }
-
-    export class FontLoader {
-        constructor(manager?: LoadingManager);
-
-        manager: LoadingManager;
-
-        load(url: string, onLoad?: (responseText: string) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): void;
-    }
-
-    /**
-     * A loader for loading an image.
-     * Unlike other loaders, this one emits events instead of using predefined callbacks. So if you're interested in getting notified when things happen, you need to add listeners to the object.
-     */
-    export class ImageLoader {
-        constructor(manager?: LoadingManager);
-
-        manager: LoadingManager;
-        crossOrigin: string;
-        path: string;
-
-        /**
-         * Begin loading from url
-         * @param url
-         */
-        load(url: string, onLoad?: (image: HTMLImageElement) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): HTMLImageElement;
-        setCrossOrigin(crossOrigin: string): void;
-        setPath(value: any): void;
-    }
-
-    /**
-     * A loader for loading objects in JSON format.
-     */
-    export class JSONLoader extends Loader {
-        constructor(manager?: LoadingManager);
-
-        manager: LoadingManager;
-        withCredentials: boolean;
-        statusDomElement: HTMLElement; // readonly and deprecated
-
-        load(url: string, onLoad?: (geometry: Geometry, materials: Material[]) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): void;
-        setTexturePath( value: string ): void;
-        parse(json: any, texturePath?: string): { geometry: Geometry; materials?: Material[] };
-    }
-
-    /**
-     * Handles and keeps track of loaded and pending data.
-     */
-    export class LoadingManager {
-        constructor(onLoad?: () => void, onProgress?: (url: string, loaded: number, total: number) => void, onError?: () => void);
-
-        onStart: () => void;
-
-        /**
-         * Will be called when load starts.
-         * The default is a function with empty body.
-         */
-        onLoad: () => void;
-
-        /**
-         * Will be called while load progresses.
-         * The default is a function with empty body.
-         */
-        onProgress: (item: any, loaded: number, total: number) => void;
-
-        /**
-         * Will be called when each element in the scene completes loading.
-         * The default is a function with empty body.
-         */
-        onError: () => void;
-
-        itemStart(url: string): void;
-        itemEnd(url: string): void;
-        itemError(url: string): void;
-    }
-
-    export const DefaultLoadingManager: LoadingManager;
-
-    export class BufferGeometryLoader {
-        constructor(manager?: LoadingManager);
-
-        manager: LoadingManager;
-
-        load(url: string, onLoad: (bufferGeometry: BufferGeometry) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): void;
-        parse(json: any): BufferGeometry;
-    }
-
-    export class MaterialLoader {
-        constructor(manager?: LoadingManager);
-
-        manager: LoadingManager;
-        textures: { [key: string]: Texture };
-
-        load(url: string, onLoad: (material: Material) => void): void;
-        setTextures(textures: { [key: string]: Texture }): void;
-        getTexture(name: string): Texture;
-        parse(json: any): Material;
-    }
-
-    export class ObjectLoader {
-        constructor(manager?: LoadingManager);
-
-        manager: LoadingManager;
-        texturePass: string;
-        crossOrigin: string;
-
-        load(url: string, onLoad?: (object: Object3D) => void): void;
-        setTexturePath( value: string ): void;
-        setCrossOrigin(crossOrigin: string): void;
-        parse<T extends Object3D>(json: any, onLoad?: (object: Object3D) => void): T;
-        parseGeometries(json: any): any[]; // Array of BufferGeometry or Geometry or Geometry2.
-        parseMaterials(json: any, textures: Texture[]): Material[]; // Array of Classes that inherits from Matrial.
-        parseAnimations(json: any): AnimationClip[];
-        parseImages(json: any, onLoad: () => void): any[];
-        parseTextures(json: any, images: any): Texture[];
-        parseObject<T extends Object3D>(data: any, geometries: any[], materials: Material[]): T;
-    }
-
-    /**
-     * Class for loading a texture.
-     * Unlike other loaders, this one emits events instead of using predefined callbacks. So if you're interested in getting notified when things happen, you need to add listeners to the object.
-     */
-    export class TextureLoader {
-        constructor(manager?: LoadingManager);
-
-        manager: LoadingManager;
-        crossOrigin: string;
-        path: string;
-
-        /**
-         * Begin loading from url
-         *
-         * @param url
-         */
-        load(url: string, onLoad?: (texture: Texture) => void): Texture;
-        setCrossOrigin(crossOrigin: string): void;
-        setPath(path: string): void;
-    }
-
-    export class CubeTextureLoader {
-        constructor(manager?: LoadingManager);
-
-        manager: LoadingManager;
-        corssOrigin: string;
-        path: string;
-
-        load(urls: Array<string>, onLoad?: (texture: CubeTexture) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): void;
-        setCrossOrigin(crossOrigin: string): void;
-        setPath(path: string): void;
-    }
-
-    export class BinaryTextureLoader {
-        constructor(manager?: LoadingManager);
-
-        manager: LoadingManager;
-
-        load(url: string, onLoad: (dataTexture: DataTexture) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): void;
-    }
-    export class DataTextureLoader extends BinaryTextureLoader {}
-
-    export class CompressedTextureLoader {
-        constructor(manager?: LoadingManager);
-
-        manager: LoadingManager;
-        path: string;
-
-        load(url: string, onLoad: (texture: CompressedTexture) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): void;
-        setPath(path: string): void;
-    }
-
-    export namespace Cache {
-        export let enabled: boolean;
-        export let files: any;
-
-        export function add(key: string, file: any): void;
-        export function get(key: string): any;
-        export function remove(key: string): void;
-        export function clear(): void;
-    }
-
-    // Materials //////////////////////////////////////////////////////////////////////////////////
-    export let MaterialIdCount: number;
-
-    export interface MaterialParameters {
-        name?: string;
-        side?: Side;
-        opacity?: number;
-        transparent?: boolean;
-        blending?: Blending;
-        blendSrc?: BlendingDstFactor;
-        blendDst?: BlendingSrcFactor;
-        blendEquation?: BlendingEquation;
-        blendSrcAlpha?: number;
-        blendDstAlpha?: number;
-        blendEquationAlpha?: number;
-        depthFunc?: DepthModes;
-        depthTest?: boolean;
-        depthWrite?: boolean;
-        colorWrite?: boolean;
-        precision?: number;
-        polygonOffset?: boolean;
-        polygonOffsetFactor?: number;
-        polygonOffsetUnits?: number;
-        alphaTest?: number;
-        overdraw?: number;
-        visible?: boolean;
-    }
-
-    /**
-     * Materials describe the appearance of objects. They are defined in a (mostly) renderer-independent way, so you don't have to rewrite materials if you decide to use a different renderer.
-     */
-    export class Material {
-        constructor();
-
-        /**
-         * Unique number of this material instance.
-         */
-        id: number;
-
-        uuid: string;
-
-        /**
-         * Material name. Default is an empty string.
-         */
-        name: string;
-
-        type: string;
-
-        /**
-         * Defines which of the face sides will be rendered - front, back or both.
-         * Default is THREE.FrontSide. Other options are THREE.BackSide and THREE.DoubleSide.
-         */
-        side: Side;
-
-        /**
-         * Opacity. Default is 1.
-         */
-        opacity: number;
-
-        /**
-         * Defines whether this material is transparent. This has an effect on rendering, as transparent objects need an special treatment, and are rendered after the opaque (i.e. non transparent) objects. For a working example of this behaviour, check the {@link WebGLRenderer} code.
-         * Default is false.
-         */
-        transparent: boolean;
-
-        /**
-         * Which blending to use when displaying objects with this material. Default is {@link NormalBlending}.
-         */
-        blending: Blending;
-
-        /**
-         * Blending source. It's one of the blending mode constants defined in Three.js. Default is {@link SrcAlphaFactor}.
-         */
-        blendSrc: BlendingDstFactor;
-
-        /**
-         * Blending destination. It's one of the blending mode constants defined in Three.js. Default is {@link OneMinusSrcAlphaFactor}.
-         */
-        blendDst: BlendingSrcFactor;
-
-        /**
-         * Blending equation to use when applying blending. It's one of the constants defined in Three.js. Default is AddEquation.
-         */
-        blendEquation: BlendingEquation;
-
-        blendSrcAlpha: number;
-        blendDstAlpha: number;
-        blendEquationAlpha: number;
-
-        depthFunc: DepthModes;
-
-        /**
-         * Whether to have depth test enabled when rendering this material. Default is true.
-         */
-        depthTest: boolean;
-
-        /**
-         * Whether rendering this material has any effect on the depth buffer. Default is true.
-         * When drawing 2D overlays it can be useful to disable the depth writing in order to layer several things together without creating z-index artifacts.
-         */
-        depthWrite: boolean;
-
-        colorWrite: boolean;
-
-        precision: any;
-
-        /**
-         * Whether to use polygon offset. Default is false. This corresponds to the POLYGON_OFFSET_FILL WebGL feature.
-         */
-        polygonOffset: boolean;
-
-        /**
-         * Sets the polygon offset factor. Default is 0.
-         */
-        polygonOffsetFactor: number;
-
-        /**
-         * Sets the polygon offset units. Default is 0.
-         */
-        polygonOffsetUnits: number;
-
-        /**
-         * Sets the alpha value to be used when running an alpha test. Default is 0.
-         */
-        alphaTest: number;
-
-        /**
-         * Enables/disables overdraw. If greater than zero, polygons are drawn slightly bigger in order to fix antialiasing gaps when using the CanvasRenderer. Default is 0.
-         */
-        overdraw: number;
-
-        /**
-         * Defines whether this material is visible. Default is true.
-         */
-        visible: boolean;
-
-        /**
-         * Specifies that the material needs to be updated, WebGL wise. Set it to true if you made changes that need to be reflected in WebGL.
-         * This property is automatically set to true when instancing a new material.
-         */
-        needsUpdate: boolean;
-
-        warpRGB: Color; // deprecated, returns a new Color intance
-
-        setValues(parameters: MaterialParameters): void;
-        toJSON(meta?: any): any;
-        clone(): Material;
-        copy(source: Material): Material;
-        update(): void;
-        dispose(): void;
-
-        // EventDispatcher mixins
-        addEventListener(type: string, listener: (event: Event) => void ): void;
-        hasEventListener(type: string, listener: (event: Event) => void): void;
-        removeEventListener(type: string, listener: (event: Event) => void): void;
-        dispatchEvent(event: { type: string; [attachment: string]: any; }): void;
-    }
-
-    export interface LineBasicMaterialParameters extends MaterialParameters {
-        color?: number|string;
-        linewidth?: number;
-        linecap?: string;
-        linejoin?: string;
-        vertexColors?: Colors;
-        fog?: boolean;
-    }
-
-    export class LineBasicMaterial extends Material {
-        constructor(parameters?: LineBasicMaterialParameters);
-
-        color: Color;
-        linewidth: number;
-        linecap: string;
-        linejoin: string;
-        vertexColors: Colors;
-        fog: boolean;
-
-        setValues(parameters: LineBasicMaterialParameters): void;
-        clone(): LineBasicMaterial;
-        copy(source: LineBasicMaterial): LineBasicMaterial;
-    }
-
-    export interface LineDashedMaterialParameters extends MaterialParameters {
-        color?: number|string;
-        linewidth?: number;
-        scale?: number;
-        dashSize?: number;
-        gapSize?: number;
-        vertexColors?: Colors;
-        fog?: boolean;
-    }
-
-    export class LineDashedMaterial extends Material {
-        constructor(parameters?: LineDashedMaterialParameters);
-
-        color: Color;
-        linewidth: number;
-        scale: number;
-        dashSize: number;
-        gapSize: number;
-        vertexColors: Colors;
-        fog: boolean;
-
-        setValues(parameters: LineDashedMaterialParameters): void;
-        clone(): LineDashedMaterial;
-        copy(source: LineDashedMaterial): LineDashedMaterial;
-    }
-
-    /**
-     * parameters is an object with one or more properties defining the material's appearance.
-     */
-    export interface MeshBasicMaterialParameters extends MaterialParameters {
-        color?: number|string;
-        opacity?: number;
-        map?: Texture;
-        aoMap?: Texture;
-        aoMapIntensity?: number;
-        specularMap?: Texture;
-        alphaMap?: Texture;
-        envMap?: Texture;
-        combine?: Combine;
-        reflectivity?: number;
-        refractionRatio?: number;
-        shading?: Shading;
-        blending?: Blending;
-        depthTest?: boolean;
-        depthWrite?: boolean;
-        wireframe?: boolean;
-        wireframeLinewidth?: number;
-        wireframeLinecap?: string;
-        wireframeLinejoin?: string;
-        vertexColors?: Colors;
-        skinning?: boolean;
-        morphTargets?: boolean;
-        fog?: boolean;
-    }
-
-    export class MeshBasicMaterial extends Material {
-        constructor(parameters?: MeshBasicMaterialParameters);
-
-        color: Color;
-        map: Texture;
-        aoMap: Texture;
-        aoMapIntensity: number;
-        specularMap: Texture;
-        alphaMap: Texture;
-        envMap: Texture;
-        combine: Combine;
-        reflectivity: number;
-        refractionRatio: number;
-        fog: boolean;
-        shading: Shading;
-        wireframe: boolean;
-        wireframeLinewidth: number;
-        wireframeLinecap: string;
-        wireframeLinejoin: string;
-        vertexColors: Colors;
-        skinning: boolean;
-        morphTargets: boolean;
-
-        setValues(parameters: MeshBasicMaterialParameters): void;
-        clone(): MeshBasicMaterial;
-        copy(source: MeshBasicMaterial): MeshBasicMaterial;
-    }
-
-    export interface MeshDepthMaterialParameters extends MaterialParameters {
-        wireframe?: boolean;
-        wireframeLinewidth?: number;
-    }
-
-    export class MeshDepthMaterial extends Material {
-        constructor(parameters?: MeshDepthMaterialParameters);
-
-        wireframe: boolean;
-        wireframeLinewidth: number;
-
-        setValues(parameters: MeshDepthMaterialParameters): void;
-        clone(): MeshDepthMaterial;
-        copy(source: MeshDepthMaterial): MeshDepthMaterial;
-    }
-
-    export interface MeshLambertMaterialParameters extends MaterialParameters {
-        color?: number|string;
-        emissive?: number|string;
-        emissiveIntensity?: number;
-        emissiveMap?: Texture;
-        map?: Texture;
-        lighhtMap?: Texture;
-        lightMapIntensity?: number;
-        aoMap?: Texture;
-        aoMapIntensity?: number;
-        specularMap?: Texture;
-        alphaMap?: Texture;
-        envMap?: Texture;
-        combine?: Combine;
-        reflectivity?: number;
-        refractionRatio?: number;
-        fog?: boolean;
-        wireframe?: boolean;
-        wireframeLinewidth?: number;
-        wireframeLinecap?: string;
-        wireframeLinejoin?: string;
-        vertexColors?: Colors;
-        skinning?: boolean;
-        morphTargets?: boolean;
-        morphNormals?: boolean;
-    }
-
-    export class MeshLambertMaterial extends Material {
-        constructor(parameters?: MeshLambertMaterialParameters);
-
-        color: Color;
-        emissive: number|string;
-        emissiveIntensity: number;
-        emissiveMap: Texture;
-        map: Texture;
-        lighhtMap: Texture;
-        lightMapIntensity: number;
-        aoMap: Texture;
-        aoMapIntensity: number;
-        specularMap: Texture;
-        alphaMap: Texture;
-        envMap: Texture;
-        combine: Combine;
-        reflectivity: number;
-        refractionRatio: number;
-        fog: boolean;
-        wireframe: boolean;
-        wireframeLinewidth: number;
-        wireframeLinecap: string;
-        wireframeLinejoin: string;
-        vertexColors: Colors;
-        skinning: boolean;
-        morphTargets: boolean;
-        morphNormals: boolean;
-
-        setValues(parameters: MeshLambertMaterialParameters): void;
-        clone(): MeshLambertMaterial;
-        copy(source: MeshLambertMaterial): MeshLambertMaterial;
-    }
-
-    export interface MeshStandardMaterialParameters extends MaterialParameters {
-        color?: number|string;
-        roughtness?: number;
-        metalness?: number;
-        lighhtMap?: Texture;
-        lightMapIntensity?: number;
-        aoMap?: Texture;
-        aoMapIntensity?: number;
-        emissive?: Color;
-        emissiveIntensity?: number;
-        emissiveMap?: Texture;
-        bumpMap?: Texture;
-        bumpScale?: number;
-        normalMap?: Texture;
-        normalScale?: number;
-        displacementMap?: Texture;
-        displacementScale?: number;
-        displacementBias?: number;
-        roughtnessMap?: Texture;
-        metalMap?: Texture;
-        alphaMap?: Texture;
-        envMap?: Texture;
-        envMapIntensity?: number;
-        refractionRatio?: number;
-        shading?: Shading;
-        blending: Blending;
-        wireframe?: boolean;
-        wireframeLinewidth?: number;
-        vertexColors?: Colors;
-        skinning?: boolean;
-        morphTargets?: boolean;
-        morphNormals?: boolean;
-        fog?: boolean;
-    }
-
-    export class MeshStandardMaterial extends Material {
-        constructor(parameters?: MeshStandardMaterialParameters);
-
-        color: Color;
-        roughtness: number;
-        metalness: number;
-        map: Texture;
-        lighhtMap: Texture;
-        lightMapIntensity: number;
-        aoMap: Texture;
-        aoMapIntensity: number;
-        emissive: Color;
-        emissiveIntensity: number;
-        emissiveMap: Texture;
-        bumpMap: Texture;
-        bumpScale: number;
-        normalMap: Texture;
-        normalScale: number;
-        displacementMap: Texture;
-        displacementScale: number;
-        displacementBias: number;
-        roughtnessMap: Texture;
-        metalMap: Texture;
-        alphaMap: Texture;
-        envMap: Texture;
-        envMapIntensity: number;
-        refractionRatio: number;
-        shading: Shading;
-        blending: Blending;
-        wireframe: boolean;
-        wireframeLinewidth: number;
-        vertexColors: Colors;
-        skinning: boolean;
-        morphTargets: boolean;
-        morphNormals: boolean;
-        fog: boolean;
-
-        setValues(parameters: MeshStandardMaterialParameters): void;
-        clone(): MeshStandardMaterial;
-        copy(source: MeshStandardMaterial): MeshStandardMaterial;
-    }
-
-    export interface MeshNormalMaterialParameters extends MaterialParameters {
-        /** Render geometry as wireframe. Default is false (i.e. render as smooth shaded). */
-        wireframe?: boolean;
-        /** Controls wireframe thickness. Default is 1. */
-        wireframeLinewidth?: number;
-        morphTargets?: boolean;
-    }
-
-    export class MeshNormalMaterial extends Material {
-        constructor(parameters?: MeshNormalMaterialParameters);
-
-        wireframe: boolean;
-        wireframeLinewidth: number;
-        morphTargets: boolean;
-
-        setValues(parameters: MeshNormalMaterialParameters): void;
-        clone(): MeshNormalMaterial;
-        copy(source: MeshNormalMaterial): MeshNormalMaterial;
-    }
-
-    export interface MeshPhongMaterialParameters extends MaterialParameters {
-        /** geometry color in hexadecimal. Default is 0xffffff. */
-        color?: number|string;
-        specular?: number;
-        shininess?: number;
-        opacity?: number;
-        map?: Texture;
-        lightMap?: Texture;
-        lightMapIntensity?: number;
-        aoMap?: Texture;
-        aoMapIntensity?: number;
-        emissive?: number;
-        emissiveIntensity?: number;
-        emissiveMap?: Texture;
-        bumpMap?: Texture;
-        bumpScale?: number;
-        normalMap?: Texture;
-        normalScale?: Vector2;
-        displacementMap?: Texture;
-        displacementScale?: number;
-        displacementBias?: number;
-        specularMap?: Texture;
-        alphaMap?: Texture;
-        envMap?: Texture;
-        combine?: Combine;
-        reflectivity?: number;
-        refractionRatio?: number;
-        shading?: Shading;
-        blending?: Blending;
-        depthTest?: boolean;
-        depthWrite?: boolean;
-        wireframe?: boolean;
-        wireframeLinewidth?: number;
-        wireframeLinecap?: string;
-        wireframeLinejoin?: string;
-        vertexColors?: Colors;
-        skinning?: boolean;
-        morphTargets?: boolean;
-        morphNormals?: boolean;
-        fog?: boolean;
-    }
-
-    export class MeshPhongMaterial extends Material {
-        constructor(parameters?: MeshPhongMaterialParameters);
-
-        color: Color; // diffuse
-        specular: Color;
-        shininess: number;
-        map: Texture;
-        lightMap: Texture;
-        lightMapIntensity: number;
-        aoMap: Texture;
-        aoMapIntensity: number;
-        emissive: Color;
-        emissiveIntensity: number;
-        emissiveMap: Texture;
-        bumpMap: Texture;
-        bumpScale: number;
-        normalMap: Texture;
-        normalScale: Vector2;
-        displacementMap: Texture;
-        displacementScale: number;
-        displacementBias: number;
-        specularMap: Texture;
-        alphaMap: Texture;
-        envMap: Texture;
-        combine: Combine;
-        reflectivity: number;
-        refractionRatio: number;
-        fog: boolean;
-        shading: Shading;
-        wireframe: boolean;
-        wireframeLinewidth: number;
-        wireframeLinecap: string;
-        wireframeLinejoin: string;
-        vertexColors: Colors;
-        skinning: boolean;
-        morphTargets: boolean;
-        morphNormals: boolean;
-        metal: boolean; // deprecated
-
-        setValues(parameters: MeshPhongMaterialParameters): void;
-        clone(): MeshPhongMaterial;
-        copy(source: MeshPhongMaterial): MeshPhongMaterial;
-    }
-
-    // MultiMaterial does not inherit the Material class in the original code. However, it should treat as Material class.
-    // See tests/canvas/canvas_materials.ts.
-    export class MultiMaterial extends Material {
-        constructor(materials?: Material[]);
-
-        materials: Material[];
-
-        toJSON(meta: any): any;
-        clone(): MultiMaterial;
-    }
-
-    export class MeshFaceMaterial extends MultiMaterial {} // deprecated, use MultiMaterial
-
-    export interface PointsMaterialParameters extends MaterialParameters {
-        color?: number|string;
-        opacity?: number;
-        map?: Texture;
-        size?: number;
-        sizeAttenuation?: boolean;
-        blending?: Blending,
-        depthTest?: boolean;
-        depthWrite?: boolean;
-        vertexColors?: Colors;
-        fog?: boolean;
-    }
-
-    export class PointsMaterial extends Material {
-        constructor(parameters?: PointsMaterialParameters);
-
-        color: Color;
-        map: Texture;
-        size: number;
-        sizeAttenuation: boolean;
-        vertexColors: boolean;
-        fog: boolean;
-
-        setValues(parameters: PointsMaterialParameters): void;
-        clone(): PointsMaterial;
-        copy(source: PointsMaterial): PointsMaterial;
-    }
-
-    export class PointCloudMaterial extends PointsMaterial {} // deprecated, use PointsMaterial
-    export class ParticleBasicMaterial extends PointsMaterial {} // deprecated, use PointsMaterial
-    export class ParticleSystemMaterial extends PointsMaterial {} // deprecated, use PointsMaterial
-
-    export interface ShaderMaterialParameters extends MaterialParameters {
-        defines?: any;
-        uniforms?: any;
-        fragmentShader?: string;
-        vertexShader?: string;
-        shading?: Shading;
-        lineWidth?: number;
-        blending?: Blending;
-        depthTest?: boolean;
-        depthWrite?: boolean;
-        wireframe?: boolean;
-        wireframeLinewidth?: number;
-        lights?: boolean;
-        vertexColors?: Colors;
-        skinning?: boolean;
-        morphTargets?: boolean;
-        morphNormals?: boolean;
-        fog?: boolean;
-    }
-
-    export class ShaderMaterial extends Material {
-        constructor(parameters?: ShaderMaterialParameters);
-
-        defines: any;
-        uniforms: any;
-        vertexShader: string;
-        fragmentShader: string;
-        shading: Shading;
-        linewidth: number;
-        wireframe: boolean;
-        wireframeLinewidth: number;
-        fog: boolean;
-        lights: boolean;
-        vertexColors: Colors;
-        skinning: boolean;
-        morphTargets: boolean;
-        morphNormals: boolean;
-        derivatives: any; // deprecated, use extensions.derivatives
-        extensions: { derivatives: boolean; fragDepth: boolean; drawBuffers: boolean; shaderTextureLOD: boolean };
-        defaultAttributeValues: any;
-        index0AttributeName: string;
-
-        setValues(parameters: ShaderMaterialParameters): void;
-        clone(): ShaderMaterial;
-        copy(source: ShaderMaterial): ShaderMaterial;
-        toJSON(meta: any): any;
-    }
-
-    export class RawShaderMaterial extends ShaderMaterial {
-        constructor(parameters?: ShaderMaterialParameters);
-    }
-
-    export interface SpriteMaterialParameters extends MaterialParameters {
-        color?: number|string;
-        opacity?: number;
-        map?: Texture;
-        blending?: Blending;
-        depthTest?: boolean;
-        depthWrite?: boolean;
-        uvOffset?: Vector2;
-        uvScale?: Vector2;
-        fog?: boolean;
-    }
-
-    export class SpriteMaterial extends Material {
-        constructor(parameters?: SpriteMaterialParameters);
-
-        color: Color;
-        map: Texture;
-        rotation: number;
-        fog: boolean;
-
-        setValues(parameters: SpriteMaterialParameters): void;
-        clone(): SpriteMaterial;
-        copy(source: SpriteMaterial): SpriteMaterial;
-    }
-
-    // Math //////////////////////////////////////////////////////////////////////////////////
-
-    export class Box2 {
-        constructor(min?: Vector2, max?: Vector2);
-
-        max: Vector2;
-        min: Vector2;
-
-        set(min: Vector2, max: Vector2): Box2;
-        setFromPoints(points: Vector2[]): Box2;
-        setFromCenterAndSize(center: Vector2, size: Vector2): Box2;
-        clone(): Box2;
-        copy(box: Box2): Box2;
-        makeEmpty(): Box2;
-        empty(): any; // deprecated, use isEmpty()
-        isEmpty(): boolean;
-        center(optionalTarget?: Vector2): Vector2;
-        size(optionalTarget?: Vector2): Vector2;
-        expandByPoint(point: Vector2): Box2;
-        expandByVector(vector: Vector2): Box2;
-        expandByScalar(scalar: number): Box2;
-        containsPoint(point: Vector2): boolean;
-        containsBox(box: Box2): boolean;
-        getParameter(point: Vector2): Vector2;
-        intersectsBox(box: Box2): boolean;
-        clampPoint(point: Vector2, optionalTarget?: Vector2): Vector2;
-        distanceToPoint(point: Vector2): number;
-        intersect(box: Box2): Box2;
-        union(box: Box2): Box2;
-        translate(offset: Vector2): Box2;
-        equals(box: Box2): boolean;
-
-        isIntersectionBox(b: any): any; // deprecated, use intersectsBox()
-    }
-
-    export class Box3 {
-        constructor(min?: Vector3, max?: Vector3);
-
-        max: Vector3;
-        min: Vector3;
-
-        set(min: Vector3, max: Vector3): Box3;
-        setFromArray(array: number[]): Box3;
-        setFromPoints(points: Vector3[]): Box3;
-        setFromCenterAndSize(center: Vector3, size: Vector3): Box3;
-        setFromObject(object: Object3D): Box3;
-        clone(): Box3;
-        copy(box: Box3): Box3;
-        makeEmpty(): Box3;
-        isEmpty(): boolean;
-        center(optionalTarget?: Vector3): Vector3;
-        size(optionalTarget?: Vector3): Vector3;
-        expandByPoint(point: Vector3): Box3;
-        expandByVector(vector: Vector3): Box3;
-        expandByScalar(scalar: number): Box3;
-        containsPoint(point: Vector3): boolean;
-        containsBox(box: Box3): boolean;
-        getParameter(point: Vector3): Vector3;
-        intersectsBox(box: Box3): boolean;
-        intersectsSphere(sphere: Sphere): boolean;
-        intersectsPlane(plane: Plane): boolean;
-        clampPoint(point: Vector3, optionalTarget?: Vector3): Vector3;
-        distanceToPoint(point: Vector3): number;
-        getBoundingSphere(optionalTarget?: Sphere): Sphere;
-        intersect(box: Box3): Box3;
-        union(box: Box3): Box3;
-        applyMatrix4(matrix: Matrix4): Box3;
-        translate(offset: Vector3): Box3;
-        equals(box: Box3): boolean;
-        
-        empty(): any; // deprecated, use isEmpty()
-        isIntersectionBox(b: any): any; // deprecated, use intersectsBox()
-        isIntersectionSphere(s: any): any; // deprecated, use intersectsSphere()
-    }
-
-    export interface HSL {
-        h: number;
-        s: number;
-        l: number;
-    }
-
-    /**
-     * Represents a color. See also {@link ColorUtils}.
-     *
-     * @example
-     * var color = new THREE.Color( 0xff0000 );
-     *
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/math/Color.js">src/math/Color.js</a>
-     */
-    export class Color {
-        constructor(color?: Color);
-        constructor(color?: string);
-        constructor(color?: number);
-        constructor(r: number, g: number, b: number);
-
-        /**
-         * Red channel value between 0 and 1. Default is 1.
-         */
-        r: number;
-
-        /**
-         * Green channel value between 0 and 1. Default is 1.
-         */
-        g: number;
-
-        /**
-         * Blue channel value between 0 and 1. Default is 1.
-         */
-        b: number;
-
-        set(color: Color): Color;
-        set(color: number): Color;
-        set(color: string): Color;
-        setScalar(scalar: number): Color;
-        setHex(hex: number): Color;
-
-        /**
-         * Sets this color from RGB values.
-         * @param r Red channel value between 0 and 1.
-         * @param g Green channel value between 0 and 1.
-         * @param b Blue channel value between 0 and 1.
-         */
-        setRGB(r: number, g: number, b: number): Color;
-
-        /**
-         * Sets this color from HSL values.
-         * Based on MochiKit implementation by Bob Ippolito.
-         *
-         * @param h Hue channel value between 0 and 1.
-         * @param s Saturation value channel between 0 and 1.
-         * @param l Value channel value between 0 and 1.
-         */
-        setHSL(h: number, s: number, l: number): Color;
-
-        /**
-         * Sets this color from a CSS context style string.
-         * @param contextStyle Color in CSS context style format.
-         */
-        setStyle(style: string): Color;
-
-        /**
-         * Clones this color.
-         */
-        clone(): Color;
-
-        /**
-         * Copies given color.
-         * @param color Color to copy.
-         */
-        copy(color: Color): Color;
-
-        /**
-         * Copies given color making conversion from gamma to linear space.
-         * @param color Color to copy.
-         */
-        copyGammaToLinear(color: Color, gammaFactor?: number): Color;
-
-        /**
-         * Copies given color making conversion from linear to gamma space.
-         * @param color Color to copy.
-         */
-        copyLinearToGamma(color: Color, gammaFactor?: number): Color;
-
-        /**
-         * Converts this color from gamma to linear space.
-         */
-        convertGammaToLinear(): Color;
-
-        /**
-         * Converts this color from linear to gamma space.
-         */
-        convertLinearToGamma(): Color;
-
-        /**
-         * Returns the hexadecimal value of this color.
-         */
-        getHex(): number;
-
-        /**
-         * Returns the string formated hexadecimal value of this color.
-         */
-        getHexString(): string;
-
-        getHSL(): HSL;
-
-        /**
-         * Returns the value of this color in CSS context style.
-         * Example: rgb(r, g, b)
-         */
-        getStyle(): string;
-
-        offsetHSL(h: number, s: number, l: number): Color;
-
-        add(color: Color): Color;
-        addColors(color1: Color, color2: Color): Color;
-        addScalar(s: number): Color;
-        multiply(color: Color): Color;
-        multiplyScalar(s: number): Color;
-        lerp(color: Color, alpha: number): Color;
-        equals(color: Color): boolean;
-        fromArray(rgb: number[], offset?: number): Color;
-        toArray(array?: number[], offset?: number): number[];
-    }
-
-    export namespace ColorKeywords {
-        export const aliceblue: number;
-        export const antiquewhite: number;
-        export const aqua: number;
-        export const aquamarine: number;
-        export const azure: number;
-        export const beige: number;
-        export const bisque: number;
-        export const black: number;
-        export const blanchedalmond: number;
-        export const blue: number;
-        export const blueviolet: number;
-        export const brown: number;
-        export const burlywood: number;
-        export const cadetblue: number;
-        export const chartreuse: number;
-        export const chocolate: number;
-        export const coral: number;
-        export const cornflowerblue: number;
-        export const cornsilk: number;
-        export const crimson: number;
-        export const cyan: number;
-        export const darkblue: number;
-        export const darkcyan: number;
-        export const darkgoldenrod: number;
-        export const darkgray: number;
-        export const darkgreen: number;
-        export const darkgrey: number;
-        export const darkkhaki: number;
-        export const darkmagenta: number;
-        export const darkolivegreen: number;
-        export const darkorange: number;
-        export const darkorchid: number;
-        export const darkred: number;
-        export const darksalmon: number;
-        export const darkseagreen: number;
-        export const darkslateblue: number;
-        export const darkslategray: number;
-        export const darkslategrey: number;
-        export const darkturquoise: number;
-        export const darkviolet: number;
-        export const deeppink: number;
-        export const deepskyblue: number;
-        export const dimgray: number;
-        export const dimgrey: number;
-        export const dodgerblue: number;
-        export const firebrick: number;
-        export const floralwhite: number;
-        export const forestgreen: number;
-        export const fuchsia: number;
-        export const gainsboro: number;
-        export const ghostwhite: number;
-        export const gold: number;
-        export const goldenrod: number;
-        export const gray: number;
-        export const green: number;
-        export const greenyellow: number;
-        export const grey: number;
-        export const honeydew: number;
-        export const hotpink: number;
-        export const indianred: number;
-        export const indigo: number;
-        export const ivory: number;
-        export const khaki: number;
-        export const lavender: number;
-        export const lavenderblush: number;
-        export const lawngreen: number;
-        export const lemonchiffon: number;
-        export const lightblue: number;
-        export const lightcoral: number;
-        export const lightcyan: number;
-        export const lightgoldenrodyellow: number;
-        export const lightgray: number;
-        export const lightgreen: number;
-        export const lightgrey: number;
-        export const lightpink: number;
-        export const lightsalmon: number;
-        export const lightseagreen: number;
-        export const lightskyblue: number;
-        export const lightslategray: number;
-        export const lightslategrey: number;
-        export const lightsteelblue: number;
-        export const lightyellow: number;
-        export const lime: number;
-        export const limegreen: number;
-        export const linen: number;
-        export const magenta: number;
-        export const maroon: number;
-        export const mediumaquamarine: number;
-        export const mediumblue: number;
-        export const mediumorchid: number;
-        export const mediumpurple: number;
-        export const mediumseagreen: number;
-        export const mediumslateblue: number;
-        export const mediumspringgreen: number;
-        export const mediumturquoise: number;
-        export const mediumvioletred: number;
-        export const midnightblue: number;
-        export const mintcream: number;
-        export const mistyrose: number;
-        export const moccasin: number;
-        export const navajowhite: number;
-        export const navy: number;
-        export const oldlace: number;
-        export const olive: number;
-        export const olivedrab: number;
-        export const orange: number;
-        export const orangered: number;
-        export const orchid: number;
-        export const palegoldenrod: number;
-        export const palegreen: number;
-        export const paleturquoise: number;
-        export const palevioletred: number;
-        export const papayawhip: number;
-        export const peachpuff: number;
-        export const peru: number;
-        export const pink: number;
-        export const plum: number;
-        export const powderblue: number;
-        export const purple: number;
-        export const red: number;
-        export const rosybrown: number;
-        export const royalblue: number;
-        export const saddlebrown: number;
-        export const salmon: number;
-        export const sandybrown: number;
-        export const seagreen: number;
-        export const seashell: number;
-        export const sienna: number;
-        export const silver: number;
-        export const skyblue: number;
-        export const slateblue: number;
-        export const slategray: number;
-        export const slategrey: number;
-        export const snow: number;
-        export const springgreen: number;
-        export const steelblue: number;
-        export const tan: number;
-        export const teal: number;
-        export const thistle: number;
-        export const tomato: number;
-        export const turquoise: number;
-        export const violet: number;
-        export const wheat: number;
-        export const white: number;
-        export const whitesmoke: number;
-        export const yellow: number;
-        export const yellowgreen: number;
-    }
-
-    export class Euler {
-        constructor(x?: number, y?: number, z?: number, order?: string);
-        
-        x: number;
-        y: number;
-        z: number;
-        order: string;
-        onChangeCallback: Function;
-
-        set(x: number, y: number, z: number, order?: string): Euler;
-        clone(): Euler;
-        copy(euler: Euler): Euler;
-        setFromRotationMatrix(m: Matrix4, order?: string, update?: boolean): Euler;
-        setFromQuaternion(q:Quaternion, order?: string, update?: boolean): Euler;
-        setFromVector3( v: Vector3, order?: string ): Euler;
-        reorder(newOrder: string): Euler;
-        equals(euler: Euler): boolean;
-        fromArray(xyzo: any[]): Euler;
-        toArray(array?: number[], offset?: number): number[];
-        toVector3(optionalResult?: Vector3): Vector3;
-        onChange(callback: Function): void;
-
-        static RotationOrders: string[];
-        static DefautlOrder: string;
-    }
-
-    /**
-     * Frustums are used to determine what is inside the camera's field of view. They help speed up the rendering process.
-     */
-    export class Frustum {
-        constructor(p0?: Plane, p1?: Plane, p2?: Plane, p3?: Plane, p4?: Plane, p5?: Plane);
-
-        /**
-         * Array of 6 vectors.
-         */
-        planes: Plane[];
-
-        set(p0?: number, p1?: number, p2?: number, p3?: number, p4?: number, p5?: number): Frustum;
-        clone(): Frustum;
-        copy(frustum: Frustum): Frustum;
-        setFromMatrix(m: Matrix4): Frustum;
-        intersectsObject(object: Object3D): boolean;
-        intersectsSphere(sphere: Sphere): boolean;
-        intersectsBox(box: Box3): boolean;
-        containsPoint(point: Vector3): boolean;
-    }
-
-    export class Line3 {
-        constructor(start?: Vector3, end?: Vector3);
-
-        start: Vector3;
-        end: Vector3;
-
-        set(start?: Vector3, end?: Vector3): Line3;
-        clone(): Line3;
-        copy(line: Line3): Line3;
-        center(optionalTarget?: Vector3): Vector3;
-        delta(optionalTarget?: Vector3): Vector3;
-        distanceSq(): number;
-        distance(): number;
-        at(t: number, optionalTarget?: Vector3): Vector3;
-        closestPointToPointParameter(point: Vector3, clampToLine?: boolean): number;
-        closestPointToPoint(point: Vector3, clampToLine?: boolean, optionalTarget?: Vector3): Vector3;
-        applyMatrix4(matrix: Matrix4): Line3;
-        equals(line: Line3): boolean;
-    }
-
-    /**
-     *
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/math/Math.js">src/math/Math.js</a>
-     */
-    export namespace Math {
-        export function generateUUID(): string;
-
-        /**
-         * Clamps the x to be between a and b.
-         *
-         * @param value Value to be clamped.
-         * @param min Minimum value
-         * @param max Maximum value.
-         */
-        export function clamp(value: number, min: number, max: number): number;
-        export function euclideanModulo( n: number, m: number ): number;
-
-        /**
-         * Linear mapping of x from range [a1, a2] to range [b1, b2].
-         *
-         * @param x Value to be mapped.
-         * @param a1 Minimum value for range A.
-         * @param a2 Maximum value for range A.
-         * @param b1 Minimum value for range B.
-         * @param b2 Maximum value for range B.
-         */
-        export function mapLinear(x: number, a1: number, a2: number, b1: number, b2: number): number;
-
-        export function smoothstep(x: number, min: number, max: number): number;
-
-        export function smootherstep(x: number, min: number, max: number): number;
-
-        /**
-         * Random float from 0 to 1 with 16 bits of randomness.
-         * Standard Math.random() creates repetitive patterns when applied over larger space.
-         */
-        export function random16(): number; // deprecated, use Math.random()
-
-        /**
-         * Random integer from low to high interval.
-         */
-        export function randInt(low: number, high: number): number;
-
-        /**
-         * Random float from low to high interval.
-         */
-        export function randFloat(low: number, high: number): number;
-
-        /**
-         * Random float from - range / 2 to range / 2 interval.
-         */
-        export function randFloatSpread(range: number): number;
-
-        export function degToRad(degrees: number): number;
-
-        export function radToDeg(radians: number): number;
-
-        export function isPowerOfTwo(value: number): boolean;
-
-        export function nearestPowerOfTwo(value: number): number;
-
-        export function nextPowerOfTwo(value: number): number;
-    }
-
-    /**
-     * ( interface Matrix&lt;T&gt; )
-     */
-    export interface Matrix {
-        /**
-         * Float32Array with matrix values.
-         */
-        elements: Float32Array;
-
-        /**
-         * identity():T;
-         */
-        identity(): Matrix;
-
-        /**
-         * copy(m:T):T;
-         */
-        copy(m: Matrix): Matrix;
-
-        /**
-         * multiplyScalar(s:number):T;
-         */
-        multiplyScalar(s: number): Matrix;
-
-        determinant(): number;
-
-        /**
-         * getInverse(matrix:T, throwOnInvertible?:boolean):T;
-         */
-        getInverse(matrix: Matrix, throwOnInvertible?: boolean): Matrix;
-
-        /**
-         * transpose():T;
-         */
-        transpose(): Matrix;
-
-        /**
-         * clone():T;
-         */
-        clone(): Matrix;
-    }
-
-    /**
-     * ( class Matrix3 implements Matrix&lt;Matrix3&gt; )
-     */
-    export class Matrix3 implements Matrix {
-        /**
-         * Creates an identity matrix.
-         */
-        constructor();
-
-        /**
-         * Float32Array with matrix values.
-         */
-        elements: Float32Array;
-
-        set(n11: number, n12: number, n13: number, n21: number, n22: number, n23: number, n31: number, n32: number, n33: number): Matrix3;
-        identity(): Matrix3;
-        clone(): Matrix3;
-        copy(m: Matrix3): Matrix3;
-        multiplyVector3Array(a: any): any; // deprecated, use applyToVector3Array()
-        applyToVector3Array(array: number[], offset?: number, length?: number): number[];
-        applyToBuffer(buffer: BufferAttribute, offset?: number, length?: number): BufferAttribute;
-        multiplyScalar(s: number): Matrix3;
-        determinant(): number;
-        getInverse(matrix: Matrix3, throwOnDegenerate?: boolean): Matrix3;
-        getInverse(matrix: Matrix4, throwOnDegenerate?: boolean): Matrix3;
-
-        /**
-         * Transposes this matrix in place.
-         */
-        transpose(): Matrix3;
-        flattenToArrayOffset(array: number[], offset: number): number[];
-        getNormalMatrix(m: Matrix4): Matrix3;
-
-        /**
-         * Transposes this matrix into the supplied array r, and returns itself.
-         */
-        transposeIntoArray(r: number[]): number[];
-        fromArray(array: number[]): Matrix3;
-        toArray(): number[];
-
-        multiplyVector3(vector: Vector3): any; // deprecated, use vector.applyMatrix3( matrix )
-    }
-
-    /**
-     * A 4x4 Matrix.
-     *
-     * @example
-     * // Simple rig for rotating around 3 axes
-     * var m = new THREE.Matrix4();
-     * var m1 = new THREE.Matrix4();
-     * var m2 = new THREE.Matrix4();
-     * var m3 = new THREE.Matrix4();
-     * var alpha = 0;
-     * var beta = Math.PI;
-     * var gamma = Math.PI/2;
-     * m1.makeRotationX( alpha );
-     * m2.makeRotationY( beta );
-     * m3.makeRotationZ( gamma );
-     * m.multiplyMatrices( m1, m2 );
-     * m.multiply( m3 );
-     */
-    export class Matrix4 implements Matrix {
-        constructor();
-
-        /**
-         * Float32Array with matrix values.
-         */
-        elements: Float32Array;
-
-        /**
-         * Sets all fields of this matrix.
-         */
-        set(n11: number, n12: number, n13: number, n14: number, n21: number, n22: number, n23: number, n24: number, n31: number, n32: number, n33: number, n34: number, n41: number, n42: number, n43: number, n44: number): Matrix4;
-
-        /**
-         * Resets this matrix to identity.
-         */
-        identity(): Matrix4;
-        clone(): Matrix4;
-        copy(m: Matrix4): Matrix4;
-        extractPosition(m: Matrix4): Matrix4; // deprecated, use copyPosition()
-        copyPosition(m: Matrix4): Matrix4;
-        extractBasis( xAxis: Vector3, yAxis: Vector3, zAxis: Vector3): Matrix4;
-        makeBasis( xAxis: Vector3, yAxis: Vector3, zAxis: Vector3): Matrix4;
-
-        /**
-         * Copies the rotation component of the supplied matrix m into this matrix rotation component.
-         */
-        extractRotation(m: Matrix4): Matrix4;
-        makeRotationFromEuler(euler: Euler): Matrix4;
-        setRotationFromQuaternion(q: Quaternion): Matrix4; // deprecated, use makeRotationFromQuaternion()
-        makeRotationFromQuaternion(q: Quaternion): Matrix4;
-        /**
-         * Constructs a rotation matrix, looking from eye towards center with defined up vector.
-         */
-        lookAt(eye: Vector3, target: Vector3, up: Vector3): Matrix4;
-
-        /**
-         * Multiplies this matrix by m.
-         */
-        multiply(m: Matrix4): Matrix4;
-
-        /**
-         * Sets this matrix to a x b.
-         */
-        multiplyMatrices(a: Matrix4, b: Matrix4): Matrix4;
-
-        /**
-         * Sets this matrix to a x b and stores the result into the flat array r.
-         * r can be either a regular Array or a TypedArray.
-         */
-        multiplyToArray(a: Matrix4, b: Matrix4, r: number[]): Matrix4;
-
-        /**
-         * Multiplies this matrix by s.
-         */
-        multiplyScalar(s: number): Matrix4;
-        multiplyVector3Array(array: number[]): number[]; // deprecated, use applyToVector3Array()
-        applyToVector3Array(array: number[], offset?: number, length?: number): number[];
-        applyToBuffer( buffer: BufferAttribute, offset?: number, length?: number): BufferAttribute;
-        /**
-         * Computes determinant of this matrix.
-         * Based on http://www.euclideanspace.com/maths/algebra/matrix/functions/inverse/fourD/index.htm
-         */
-        determinant(): number;
-
-        /**
-         * Transposes this matrix.
-         */
-        transpose(): Matrix4;
-
-        /**
-         * Flattens this matrix into supplied flat array starting from offset position in the array.
-         */
-        flattenToArrayOffset(array: number[], offset: number): number[];
-
-        /**
-         * Sets the position component for this matrix from vector v.
-         */
-        setPosition(v: Vector3): Matrix4;
-        
-
-        /**
-         * Sets this matrix to the inverse of matrix m.
-         * Based on http://www.euclideanspace.com/maths/algebra/matrix/functions/inverse/fourD/index.htm.
-         */
-        getInverse(m: Matrix4, throwOnInvertible?: boolean): Matrix4;
-
-        /**
-         * Multiplies the columns of this matrix by vector v.
-         */
-        scale(v: Vector3): Matrix4;
-
-        getMaxScaleOnAxis(): number;
-        /**
-         * Sets this matrix as translation transform.
-         */
-        makeTranslation(x: number, y: number, z: number): Matrix4;
-
-        /**
-         * Sets this matrix as rotation transform around x axis by theta radians.
-         *
-         * @param theta Rotation angle in radians.
-         */
-        makeRotationX(theta: number): Matrix4;
-
-        /**
-         * Sets this matrix as rotation transform around y axis by theta radians.
-         *
-         * @param theta Rotation angle in radians.
-         */
-        makeRotationY(theta: number): Matrix4;
-
-        /**
-         * Sets this matrix as rotation transform around z axis by theta radians.
-         *
-         * @param theta Rotation angle in radians.
-         */
-        makeRotationZ(theta: number): Matrix4;
-
-        /**
-         * Sets this matrix as rotation transform around axis by angle radians.
-         * Based on http://www.gamedev.net/reference/articles/article1199.asp.
-         *
-         * @param axis Rotation axis.
-         * @param theta Rotation angle in radians.
-         */
-        makeRotationAxis(axis: Vector3, angle: number): Matrix4;
-
-        /**
-         * Sets this matrix as scale transform.
-         */
-        makeScale(x: number, y: number, z: number): Matrix4;
-
-        /**
-         * Sets this matrix to the transformation composed of translation, rotation and scale.
-         */
-        compose(translation: Vector3, rotation: Quaternion, scale: Vector3): Matrix4;
-
-        /**
-         * Decomposes this matrix into the translation, rotation and scale components.
-         * If parameters are not passed, new instances will be created.
-         */
-        decompose(translation?: Vector3, rotation?: Quaternion, scale?: Vector3): Object[]; // [Vector3, Quaternion, Vector3]
-
-        /**
-         * Creates a frustum matrix.
-         */
-        makeFrustum(left: number, right: number, bottom: number, top: number, near: number, far: number): Matrix4;
-
-        /**
-         * Creates a perspective projection matrix.
-         */
-        makePerspective(fov: number, aspect: number, near: number, far: number): Matrix4;
-
-        /**
-         * Creates an orthographic projection matrix.
-         */
-        makeOrthographic(left: number, right: number, top: number, bottom: number, near: number, far: number): Matrix4;
-        equals( matrix: Matrix4 ): boolean;
-        fromArray(array: number[]): Matrix4;
-        toArray(): number[];
-
-        getPosition(): any; // deprecated, use Vector3.setFromMatrixPosition( matrix )
-        multiplyVector3(v: any): any; // deprecated, use vector.applyMatrix4( matrix ) or vector.applyProjection( matrix )
-        multiplyVector4(v: any): any; // deprecated, use vector.applyMatrix4( matrix )
-        rotateAxis(v: any): void; // deprecated, use Vector3.transformDirection( matrix )
-        crossVector(v: any): void; // deprecated, use vector.applyMatrix( matrix )
-    }
-
-    export class Plane {
-        constructor(normal?: Vector3, constant?: number);
-
-        normal: Vector3;
-        constant: number;
-
-        set(normal: Vector3, constant: number): Plane;
-        setComponents(x: number, y: number, z: number, w: number): Plane;
-        setFromNormalAndCoplanarPoint(normal: Vector3, point: Vector3): Plane;
-        setFromCoplanarPoints(a: Vector3, b: Vector3, c: Vector3): Plane;
-        clone(): Plane;
-        copy(plane: Plane): Plane;
-        normalize(): Plane;
-        negate(): Plane;
-        distanceToPoint(point: Vector3): number;
-        distanceToSphere(sphere: Sphere): number;
-        projectPoint(point: Vector3, optionalTarget?: Vector3): Vector3;
-        orthoPoint(point: Vector3, optionalTarget?: Vector3): Vector3;
-        intersectLine(line: Line3, optionalTarget?: Vector3): Vector3;
-        intersectsLine(line: Line3): boolean;
-        intersectsBox(box: Box3): boolean;
-        coplanarPoint(optionalTarget?: boolean): Vector3;
-        applyMatrix4(matrix: Matrix4, optionalNormalMatrix?: Matrix3): Plane;
-        translate(offset: Vector3): Plane;
-        equals(plane: Plane): boolean;
-
-        isIntersectionLine(l: any): any; // deprecated, use instersectsLine()
-    }
-
-    /**
-     * Implementation of a quaternion. This is used for rotating things without incurring in the dreaded gimbal lock issue, amongst other advantages.
-     *
-     * @example
-     * var quaternion = new THREE.Quaternion();
-     * quaternion.setFromAxisAngle( new THREE.Vector3( 0, 1, 0 ), Math.PI / 2 );
-     * var vector = new THREE.Vector3( 1, 0, 0 );
-     * vector.applyQuaternion( quaternion );
-     */
-    export class Quaternion {
-        /**
-         * @param x x coordinate
-         * @param y y coordinate
-         * @param z z coordinate
-         * @param w w coordinate
-         */
-        constructor(x?: number, y?: number, z?: number, w?: number);
-
-        x: number;
-        y: number;
-        z: number;
-        w: number;
-
-        /**
-         * Sets values of this quaternion.
-         */
-        set(x: number, y: number, z: number, w: number): Quaternion;
-
-        /**
-         * Clones this quaternion.
-         */
-        clone(): Quaternion;
-
-        /**
-         * Copies values of q to this quaternion.
-         */
-        copy(q: Quaternion): Quaternion;
-
-        /**
-         * Sets this quaternion from rotation specified by Euler angles.
-         */
-        setFromEuler(euler: Euler, update?: boolean): Quaternion;
-
-        /**
-         * Sets this quaternion from rotation specified by axis and angle.
-         * Adapted from http://www.euclideanspace.com/maths/geometry/rotations/conversions/angleToQuaternion/index.htm.
-         * Axis have to be normalized, angle is in radians.
-         */
-        setFromAxisAngle(axis: Vector3, angle: number): Quaternion;
-
-        /**
-         * Sets this quaternion from rotation component of m. Adapted from http://www.euclideanspace.com/maths/geometry/rotations/conversions/matrixToQuaternion/index.htm.
-         */
-        setFromRotationMatrix(m: Matrix4): Quaternion;
-        setFromUnitVectors(vFrom: Vector3, vTo: Vector3): Quaternion;
-        /**
-         * Inverts this quaternion.
-         */
-        inverse(): Quaternion;
-
-        conjugate(): Quaternion;
-        dot(v: Vector3): number;
-        lengthSq(): number;
-
-        /**
-         * Computes length of this quaternion.
-         */
-        length(): number;
-
-        /**
-         * Normalizes this quaternion.
-         */
-        normalize(): Quaternion;
-
-        /**
-         * Multiplies this quaternion by b.
-         */
-        multiply(q: Quaternion): Quaternion;
-
-        /**
-         * Sets this quaternion to a x b
-         * Adapted from http://www.euclideanspace.com/maths/algebra/realNormedAlgebra/quaternions/code/index.htm.
-         */
-        multiplyQuaternions(a: Quaternion, b: Quaternion): Quaternion;
-
-        multiplyVector3(v: any): any; // deprecated, use vector.applyQuaternion( quaternion )
-
-        slerp(qb: Quaternion, t: number): Quaternion;
-        equals(v: Quaternion): boolean;
-        fromArray(n: number[]): Quaternion;
-        toArray(): number[];
-
-        fromArray(xyzw: number[], offset?: number): Quaternion;
-        toArray(xyzw?: number[], offset?: number): number[];
-
-        onChange(callback: Function): Quaternion;
-        onChangeCallback: Function;
-
-        /**
-         * Adapted from http://www.euclideanspace.com/maths/algebra/realNormedAlgebra/quaternions/slerp/.
-         */
-        static slerp(qa: Quaternion, qb: Quaternion, qm: Quaternion, t: number): Quaternion;
-        
-        static slerpFlat(dst: number[], dstOffset: number, src0: number[], srcOffset: number, src1: number[], stcOffset1: number, t: number): Quaternion;
-    }
-
-    export class Ray {
-        constructor(origin?: Vector3, direction?: Vector3);
-
-        origin: Vector3;
-        direction: Vector3;
-
-        set(origin: Vector3, direction: Vector3): Ray;
-        clone(): Ray;
-        copy(ray: Ray): Ray;
-        at(t: number, optionalTarget?: Vector3): Vector3;
-        lookAt(v: Vector3): Vector3;
-        recast(t: number): Ray;
-        closestPointToPoint(point: Vector3, optionalTarget?: Vector3): Vector3;
-        distanceToPoint(point: Vector3): number;
-        distanceSqToPoint(point: Vector3): number;
-        distanceSqToSegment(v0: Vector3, v1: Vector3, optionalPointOnRay?: Vector3, optionalPointOnSegment?: Vector3): number;
-        intersectSphere(sphere: Sphere, optionalTarget?: Vector3): Vector3;
-        intersectsSphere(sphere: Sphere): boolean;
-        distanceToPlane(plane: Plane): number;
-        intersectPlane(plane: Plane, optionalTarget?: Vector3): Vector3;
-        intersectsPlane(plane: Plane): boolean;
-        intersectBox(box: Box3, optionalTarget?: Vector3): Vector3;
-        intersectsBox(box: Box3): boolean;
-        intersectTriangle(a: Vector3, b: Vector3, c: Vector3, backfaceCulling: boolean, optionalTarget?: Vector3): Vector3;
-        applyMatrix4(matrix4: Matrix4): Ray;
-        equals(ray: Ray): boolean;
-        
-        isIntersectionSphere(s: any): any; // deprecated, use intersectsSphere()
-        isIntersectionPlane(p: any): any; // deprecated, use intersectsPlane()
-        isIntersectionBox(b: any): any; // deprecated, use intersectsBox()
-    }
-
-    export class Sphere {
-        constructor(center?: Vector3, radius?: number);
-
-        center: Vector3;
-        radius: number;
-
-        set(center: Vector3, radius: number): Sphere;
-        setFromPoints(points: Vector3[], optionalCenter?: Vector3): Sphere;
-        clone(): Sphere;
-        copy(sphere: Sphere): Sphere;
-        empty(): boolean;
-        containsPoint(point: Vector3): boolean;
-        distanceToPoint(point: Vector3): number;
-        intersectsSphere(sphere: Sphere): boolean;
-        intersectsBox(box: Box3): boolean;
-        intersectsPlane(plane: Plane): boolean;
-        clampPoint(point: Vector3, optionalTarget?: Vector3): Vector3;
-        getBoundingBox(optionalTarget?: Box3): Box3;
-        applyMatrix4(matrix: Matrix4): Sphere;
-        translate(offset: Vector3): Sphere;
-        equals(sphere: Sphere): boolean;
-    }
-
-    export interface SplineControlPoint {
-        x: number;
-        y: number;
-        z: number;
-    }
-
-    /**
-     * Represents a spline.
-     *
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/math/Spline.js">src/math/Spline.js</a>
-     */
-    export class Spline {
-        /**
-         * Initialises the spline with points, which are the places through which the spline will go.
-         */
-        constructor(points: SplineControlPoint[]);
-
-        points: SplineControlPoint[];
-
-        /**
-         * Initialises using the data in the array as a series of points. Each value in a must be another array with three values, where a[n] is v, the value for the nth point, and v[0], v[1] and v[2] are the x, y and z coordinates of that point n, respectively.
-         *
-         * @param a array of triplets containing x, y, z coordinates
-         */
-        initFromArray(a: number[][]): void;
-
-        /**
-         * Return the interpolated point at k.
-         *
-         * @param k point index
-         */
-        getPoint(k: number): SplineControlPoint;
-
-        /**
-         * Returns an array with triplets of x, y, z coordinates that correspond to the current control points.
-         */
-        getControlPointsArray(): number[][];
-
-        /**
-         * Returns the length of the spline when using nSubDivisions.
-         * @param nSubDivisions number of subdivisions between control points. Default is 100.
-         */
-        getLength(nSubDivisions?: number): { chunks: number[]; total: number; };
-
-        /**
-         * Modifies the spline so that it looks similar to the original but has its points distributed in such way that moving along the spline it's done at a more or less constant speed. The points should also appear more uniformly spread along the curve.
-         * This is done by resampling the original spline, with the density of sampling controlled by samplingCoef. Here it's interesting to note that denser sampling is not necessarily better: if sampling is too high, you may get weird kinks in curvature.
-         *
-         * @param samplingCoef how many intermediate values to use between spline points
-         */
-        reparametrizeByArcLength(samplingCoef: number): void;
-    }
-
-    class Triangle {
-        constructor(a?: Vector3, b?: Vector3, c?: Vector3);
-
-        a: Vector3;
-        b: Vector3;
-        c: Vector3;
-
-        set(a: Vector3, b: Vector3, c: Vector3): Triangle;
-        setFromPointsAndIndices(points: Vector3[], i0: number, i1: number, i2: number): Triangle;
-        clone(): Triangle;
-        copy(triangle: Triangle): Triangle;
-        area(): number;
-        midpoint(optionalTarget?: Vector3): Vector3;
-        normal(optionalTarget?: Vector3): Vector3;
-        plane(optionalTarget?: Vector3): Plane;
-        barycoordFromPoint(point: Vector3, optionalTarget?: Vector3): Vector3;
-        containsPoint(point: Vector3): boolean;
-        equals(triangle: Triangle): boolean;
-
-        static normal(a: Vector3, b: Vector3, c: Vector3, optionalTarget?: Vector3): Vector3;
-        static barycoordFromPoint(point: Vector3, a: Vector3, b: Vector3, c: Vector3, optionalTarget: Vector3): Vector3;
-        static containsPoint(point: Vector3, a: Vector3, b: Vector3, c: Vector3): boolean;
-    }
-
-    /**
-     * ( interface Vector&lt;T&gt; )
-     *
-     * Abstract interface of Vector2, Vector3 and Vector4.
-     * Currently the members of Vector is NOT type safe because it accepts different typed vectors.
-     * Those definitions will be changed when TypeScript innovates Generics to be type safe.
-     *
-     * @example
-     * var v:THREE.Vector = new THREE.Vector3();
-     * v.addVectors(new THREE.Vector2(0, 1), new THREE.Vector2(2, 3));    // invalid but compiled successfully
-     */
-    export interface Vector {
-        setComponent(index: number, value: number): void;
-
-        getComponent(index: number): number;
-
-        /**
-         * copy(v:T):T;
-         */
-        copy(v: Vector): Vector;
-
-        /**
-         * add(v:T):T;
-         */
-        add(v: Vector): Vector;
-
-        /**
-         * addVectors(a:T, b:T):T;
-         */
-        addVectors(a: Vector, b: Vector): Vector;
-
-        /**
-         * sub(v:T):T;
-         */
-        sub(v: Vector): Vector;
-
-        /**
-         * subVectors(a:T, b:T):T;
-         */
-        subVectors(a: Vector, b: Vector): Vector;
-
-        /**
-         * multiplyScalar(s:number):T;
-         */
-        multiplyScalar(s: number): Vector;
-
-        /**
-         * divideScalar(s:number):T;
-         */
-        divideScalar(s: number): Vector;
-
-        /**
-         * negate():T;
-         */
-        negate(): Vector;
-
-        /**
-         * dot(v:T):T;
-         */
-        dot(v: Vector): number;
-
-        /**
-         * lengthSq():number;
-         */
-        lengthSq(): number;
-
-        /**
-         * length():number;
-         */
-        length(): number;
-
-        /**
-         * normalize():T;
-         */
-        normalize(): Vector;
-
-        /**
-         * NOTE: Vector4 doesn't have the property.
-         *
-         * distanceTo(v:T):number;
-         */
-        distanceTo?(v: Vector): number;
-
-        /**
-         * NOTE: Vector4 doesn't have the property.
-         *
-         * distanceToSquared(v:T):number;
-         */
-        distanceToSquared?(v: Vector): number;
-
-        /**
-         * setLength(l:number):T;
-         */
-        setLength(l: number): Vector;
-
-        /**
-         * lerp(v:T, alpha:number):T;
-         */
-        lerp(v: Vector, alpha: number): Vector;
-
-        /**
-         * equals(v:T):boolean;
-         */
-        equals(v: Vector): boolean;
-
-        /**
-         * clone():T;
-         */
-        clone(): Vector;
-    }
-
-    /**
-     * 2D vector.
-     *
-     * ( class Vector2 implements Vector<Vector2> )
-     */
-    export class Vector2 implements Vector {
-        constructor(x?: number, y?: number);
-
-        x: number;
-        y: number;
-        width: number;
-        height: number;
-
-        /**
-         * Sets value of this vector.
-         */
-        set(x: number, y: number): Vector2;
-
-        setScalar(scalar: number): Vector2;
-
-        /**
-         * Sets X component of this vector.
-         */
-        setX(x: number): Vector2;
-
-        /**
-         * Sets Y component of this vector.
-         */
-        setY(y: number): Vector2;
-
-        /**
-         * Sets a component of this vector.
-         */
-        setComponent(index: number, value: number): void;
-
-        /**
-         * Gets a component of this vector.
-         */
-        getComponent(index: number): number;
-        /**
-         * Clones this vector.
-         */
-        clone(): Vector2;
-        /**
-         * Copies value of v to this vector.
-         */
-        copy(v: Vector2): Vector2;
-
-        /**
-         * Adds v to this vector.
-         */
-        add(v: Vector2): Vector2;
-
-        /**
-         * Sets this vector to a + b.
-         */
-        addScalar(s: number): Vector2;
-        addVectors(a: Vector2, b: Vector2): Vector2;
-        addScaledVector( v: Vector2, s: number ): Vector2;
-        /**
-         * Subtracts v from this vector.
-         */
-        sub(v: Vector2): Vector2;
-
-        /**
-         * Sets this vector to a - b.
-         */
-        subVectors(a: Vector2, b: Vector2): Vector2;
-
-        multiply(v: Vector2): Vector2;
-        /**
-         * Multiplies this vector by scalar s.
-         */
-        multiplyScalar(scalar: number): Vector2;
-
-        divide(v: Vector2): Vector2;
-        /**
-         * Divides this vector by scalar s.
-         * Set vector to ( 0, 0 ) if s == 0.
-         */
-        divideScalar(s: number): Vector2;
-
-        min(v: Vector2): Vector2;
-
-        max(v: Vector2): Vector2;
-        clamp(min: Vector2, max: Vector2): Vector2;
-        clampScalar(min: number, max: number): Vector2;
-        clampLength(min: number, max: number): Vector2;
-        floor(): Vector2;
-        ceil(): Vector2;
-        round(): Vector2;
-        roundToZero(): Vector2;
-
-        /**
-         * Inverts this vector.
-         */
-        negate(): Vector2;
-
-        /**
-         * Computes dot product of this vector and v.
-         */
-        dot(v: Vector2): number;
-
-        /**
-         * Computes squared length of this vector.
-         */
-        lengthSq(): number;
-
-        /**
-         * Computes length of this vector.
-         */
-        length(): number;
-        lengthManhattan(): number;
-
-        /**
-         * Normalizes this vector.
-         */
-        normalize(): Vector2;
-
-        /**
-         * computes the angle in radians with respect to the positive x-axis
-         */
-        angle(): number;
-
-        /**
-         * Computes distance of this vector to v.
-         */
-        distanceTo(v: Vector2): number;
-
-        /**
-         * Computes squared distance of this vector to v.
-         */
-        distanceToSquared(v: Vector2): number;
-
-        /**
-         * Normalizes this vector and multiplies it by l.
-         */
-        setLength(length: number): Vector2;
-
-        lerp(v: Vector2, alpha: number): Vector2;
-
-        lerpVectors(v1: Vector2, v2: Vector2, alpha: number): Vector2;
-
-        /**
-         * Checks for strict equality of this vector and v.
-         */
-        equals(v: Vector2): boolean;
-
-        fromArray(xy: number[], offset?: number): Vector2;
-
-        toArray(xy?: number[], offset?: number): number[];
-
-        fromAttribute( attribute: BufferAttribute, index: number, offset?: number): Vector2;
-
-        rotateAround( center: Vector2, angle: number ): Vector2;
-    }
-
-    /**
-     * 3D vector.
-     *
-     * @example
-     * var a = new THREE.Vector3( 1, 0, 0 );
-     * var b = new THREE.Vector3( 0, 1, 0 );
-     * var c = new THREE.Vector3();
-     * c.crossVectors( a, b );
-     *
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/math/Vector3.js">src/math/Vector3.js</a>
-     *
-     * ( class Vector3 implements Vector<Vector3> )
-     */
-    export class Vector3 implements Vector {
-        constructor(x?: number, y?: number, z?: number);
-
-        x: number;
-        y: number;
-        z: number;
-
-        /**
-         * Sets value of this vector.
-         */
-        set(x: number, y: number, z: number): Vector3;
-
-        /**
-         * Sets all values of this vector.
-         */
-        setScalar(scalar: number): Vector3;
-
-        /**
-         * Sets x value of this vector.
-         */
-        setX(x: number): Vector3;
-
-        /**
-         * Sets y value of this vector.
-         */
-        setY(y: number): Vector3;
-
-        /**
-         * Sets z value of this vector.
-         */
-        setZ(z: number): Vector3;
-
-        setComponent(index: number, value: number): void;
-        getComponent(index: number): number;
-        /**
-         * Clones this vector.
-         */
-        clone(): Vector3;
-        /**
-         * Copies value of v to this vector.
-         */
-        copy(v: Vector3): Vector3;
-
-        /**
-         * Adds v to this vector.
-         */
-        add(a: Vector3): Vector3;
-        addScalar(s: number): Vector3;
-        addScaledVector(v: Vector3, s: number): Vector3;
-
-        /**
-         * Sets this vector to a + b.
-         */
-        addVectors(a: Vector3, b: Vector3): Vector3;
-
-        /**
-         * Subtracts v from this vector.
-         */
-        sub(a: Vector3): Vector3;
-
-        subScalar( s: number ): Vector3;
-
-        /**
-         * Sets this vector to a - b.
-         */
-        subVectors(a: Vector3, b: Vector3): Vector3;
-
-        multiply(v: Vector3): Vector3;
-        /**
-         * Multiplies this vector by scalar s.
-         */
-        multiplyScalar(s: number): Vector3;
-        multiplyVectors(a: Vector3, b: Vector3): Vector3;
-        applyEuler(euler: Euler): Vector3;
-        applyAxisAngle(axis: Vector3, angle: number): Vector3;
-        applyMatrix3(m: Matrix3): Vector3;
-        applyMatrix4(m: Matrix4): Vector3;
-        applyProjection(m: Matrix4): Vector3;
-        applyQuaternion(q: Quaternion): Vector3;
-        project(camrea: Camera): Vector3;
-        unproject(camera: Camera): Vector3;
-        transformDirection(m: Matrix4): Vector3;
-        divide(v: Vector3): Vector3;
-
-        /**
-         * Divides this vector by scalar s.
-         * Set vector to ( 0, 0, 0 ) if s == 0.
-         */
-        divideScalar(s: number): Vector3;
-        min(v: Vector3): Vector3;
-        max(v: Vector3): Vector3;
-        clamp(min: Vector3, max: Vector3): Vector3;
-        clampScalar(min: number, max: number): Vector3;
-        clampLength(min: number, max: number): Vector3;
-        floor(): Vector3;
-        ceil(): Vector3;
-        round(): Vector3;
-        roundToZero(): Vector3;
-
-        /**
-         * Inverts this vector.
-         */
-        negate(): Vector3;
-
-        /**
-         * Computes dot product of this vector and v.
-         */
-        dot(v: Vector3): number;
-
-        /**
-         * Computes squared length of this vector.
-         */
-        lengthSq(): number;
-
-        /**
-         * Computes length of this vector.
-         */
-        length(): number;
-
-        /**
-         * Computes Manhattan length of this vector.
-         * http://en.wikipedia.org/wiki/Taxicab_geometry
-         */
-        lengthManhattan(): number;
-
-        /**
-         * Normalizes this vector.
-         */
-        normalize(): Vector3;
-
-        /**
-         * Normalizes this vector and multiplies it by l.
-         */
-        setLength(l: number): Vector3;
-        lerp(v: Vector3, alpha: number): Vector3;
-
-        lerpVectors(v1: Vector3, v2: Vector3, alpha: number): Vector3;
-
-        /**
-         * Sets this vector to cross product of itself and v.
-         */
-        cross(a: Vector3): Vector3;
-
-        /**
-         * Sets this vector to cross product of a and b.
-         */
-        crossVectors(a: Vector3, b: Vector3): Vector3;
-        projectOnVector(v: Vector3): Vector3;
-        projectOnPlane(planeNormal: Vector3): Vector3;
-        reflect(vector: Vector3): Vector3;
-        angleTo(v: Vector3): number;
-
-        /**
-         * Computes distance of this vector to v.
-         */
-        distanceTo(v: Vector3): number;
-
-        /**
-         * Computes squared distance of this vector to v.
-         */
-        distanceToSquared(v: Vector3): number;
-
-        getPositionFromMatrix(m: Matrix4): Vector3; // deprecated, use setFromMatrixPosition()
-        setFromMatrixPosition(m: Matrix4): Vector3;
-        getScaleFromMatrix(m: Matrix4): Vector3; // deprecated, use setFromMatrixScale()
-        setFromMatrixScale(m: Matrix4): Vector3;
-        getColumnFromMatrixColumn(index: number, matrix: Matrix4): Vector3; // deprecated, use setFromMatrixColumn()
-        setFromMatrixColumn(index: number, matrix: Matrix4): Vector3;
-
-        /**
-         * Checks for strict equality of this vector and v.
-         */
-        equals(v: Vector3): boolean;
-
-        fromArray(xyz: number[], offset?: number): Vector3;
-
-        toArray(xyz?: number[], offset?: number): number[];
-
-        fromAttribute( attribute: BufferAttribute, index: number, offset?: number): Vector3;
-    }
-
-    /**
-     * 4D vector.
-     *
-     * ( class Vector4 implements Vector<Vector4> )
-     */
-    export class Vector4 implements Vector {
-        constructor(x?: number, y?: number, z?: number, w?: number);
-
-        x: number;
-        y: number;
-        z: number;
-        w: number;
-
-        /**
-         * Sets value of this vector.
-         */
-        set(x: number, y: number, z: number, w: number): Vector4;
-
-        /**
-         * Sets all values of this vector.
-         */
-        setScalar(scalar: number): Vector4;
-        
-        /**
-         * Sets X component of this vector.
-         */
-        setX(x: number): Vector4;
-
-        /**
-         * Sets Y component of this vector.
-         */
-        setY(y: number): Vector4;
-
-        /**
-         * Sets Z component of this vector.
-         */
-        setZ(z: number): Vector4;
-
-        /**
-         * Sets w component of this vector.
-         */
-        setW(w: number): Vector4;
-
-        setComponent(index: number, value: number): void;
-        getComponent(index: number): number;
-        /**
-         * Clones this vector.
-         */
-        clone(): Vector4;
-        /**
-         * Copies value of v to this vector.
-         */
-        copy(v: Vector4): Vector4;
-
-        /**
-         * Adds v to this vector.
-         */
-        add(v: Vector4): Vector4;
-        addScalar(s: number): Vector4;
-
-        /**
-         * Sets this vector to a + b.
-         */
-        addVectors(a: Vector4, b: Vector4): Vector4;
-        addScaledVector( v: Vector4, s: number ): Vector4;
-        /**
-         * Subtracts v from this vector.
-         */
-        sub(v: Vector4): Vector4;
-
-        subScalar(s: number): Vector4;
-
-        /**
-         * Sets this vector to a - b.
-         */
-        subVectors(a: Vector4, b: Vector4): Vector4;
-
-        /**
-         * Multiplies this vector by scalar s.
-         */
-        multiplyScalar(s: number): Vector4;
-        applyMatrix4(m: Matrix4): Vector4;
-
-        /**
-         * Divides this vector by scalar s.
-         * Set vector to ( 0, 0, 0 ) if s == 0.
-         */
-        divideScalar(s: number): Vector4;
-
-        /**
-         * http://www.euclideanspace.com/maths/geometry/rotations/conversions/quaternionToAngle/index.htm
-         * @param q is assumed to be normalized
-         */
-        setAxisAngleFromQuaternion(q: Quaternion): Vector4;
-
-        /**
-         * http://www.euclideanspace.com/maths/geometry/rotations/conversions/matrixToAngle/index.htm
-         * @param m assumes the upper 3x3 of m is a pure rotation matrix (i.e, unscaled)
-         */
-        setAxisAngleFromRotationMatrix(m: Matrix3): Vector4;
-
-        min(v: Vector4): Vector4;
-        max(v: Vector4): Vector4;
-        clamp(min: Vector4, max: Vector4): Vector4;
-        clampScalar(min: number, max: number): Vector4;
-        floor(): Vector4;
-        ceil(): Vector4;
-        round(): Vector4;
-        roundToZero(): Vector4;
-
-        /**
-         * Inverts this vector.
-         */
-        negate(): Vector4;
-
-        /**
-         * Computes dot product of this vector and v.
-         */
-        dot(v: Vector4): number;
-
-        /**
-         * Computes squared length of this vector.
-         */
-        lengthSq(): number;
-
-        /**
-         * Computes length of this vector.
-         */
-        length(): number;
-        lengthManhattan(): number;
-
-        /**
-         * Normalizes this vector.
-         */
-        normalize(): Vector4;
-        /**
-         * Normalizes this vector and multiplies it by l.
-         */
-        setLength(length: number): Vector4;
-
-        /**
-         * Linearly interpolate between this vector and v with alpha factor.
-         */
-        lerp(v: Vector4, alpha: number): Vector4;
-
-        lerpVectors(v1: Vector4, v2: Vector4, alpha: number): Vector4;
-
-        /**
-         * Checks for strict equality of this vector and v.
-         */
-        equals(v: Vector4): boolean;
-
-        fromArray(xyzw: number[], offset?: number): Vector4;
-
-        toArray(xyzw?: number[], offset?: number): number[];
-
-        fromAttribute( attribute: BufferAttribute, index: number, offset?: number): Vector4;
-    }
-
-    export abstract class Interpolant {
-        constructor(parameterPositions: any, samplesValues: any, sampleSize: number, resultBuffer?: any);
-
-        parameterPositions: any;
-        samplesValues: any;
-        valueSize: number;
-        resultBuffer: any;
-
-        evaluate(time: number): any;
-    }
-
-    export class CubicInterpolant extends Interpolant {
-        constructor(parameterPositions: any, samplesValues: any, sampleSize: number, resultBuffer?: any);
-
-        interpolate_(i1: number, t0: number, t: number, t1: number): any;
-    }
-    
-    export class DiscreteInterpolant extends Interpolant {
-        constructor(parameterPositions: any, samplesValues: any, sampleSize: number, resultBuffer?: any);
-
-        interpolate_(i1: number, t0: number, t: number, t1: number): any;
-    }
-
-    export class LinearInterpolant extends Interpolant {
-        constructor(parameterPositions: any, samplesValues: any, sampleSize: number, resultBuffer?: any);
-
-        interpolate_(i1: number, t0: number, t: number, t1: number): any;
-    }
-
-    export class QuaternionLinearInterpolant extends Interpolant {
-        constructor(parameterPositions: any, samplesValues: any, sampleSize: number, resultBuffer?: any);
-
-        interpolate_(i1: number, t0: number, t: number, t1: number): any;
-    }
-
-    // Objects //////////////////////////////////////////////////////////////////////////////////
-
-    export class Bone extends Object3D {
-        constructor(skin: SkinnedMesh);
-
-        skin: SkinnedMesh;
-
-        clone(): Bone;
-        copy(source: Bone): Bone;
-    }
-
-    export class Group extends Object3D {
-        constructor();
-    }
-
-    export class LOD extends Object3D {
-        constructor();
-
-        levels: any[];
-        objects: any[]; // deprecated, use .levels
-
-        addLevel(object: Object3D, distance?: number): void;
-        getObjectForDistance(distance: number): Object3D;
-        raycast(raycaster: Raycaster, intersects: any): void;
-        update(camera: Camera): void;
-
-        clone(): LOD;
-        copy(source: LOD): LOD;
-        toJSON(meta: any): any;
-    }
-
-    export interface LensFlareProperty {
-        texture: Texture;             // Texture
-        size: number;             // size in pixels (-1 = use texture.width)
-        distance: number;             // distance (0-1) from light source (0=at light source)
-        x: number;
-        y: number;
-        z: number;            // screen position (-1 =>  1) z = 0 is ontop z = 1 is back
-        scale: number;             // scale
-        rotation: number;             // rotation
-        opacity: number;            // opacity
-        color: Color;                // color
-        blending: Blending;
-    }
-
-    export class LensFlare extends Object3D {
-        constructor(texture?: Texture, size?: number, distance?: number, blending?: Blending, color?: Color);
-
-        lensFlares: LensFlareProperty[];
-        positionScreen: Vector3;
-        customUpdateCallback: (object: LensFlare) => void;
-
-        add(object: Object3D): void;
-        add(texture: Texture, size?: number, distance?: number, blending?: Blending, color?: Color): void;
-        updateLensFlares(): void;
-        clone(): LensFlare;
-        copy(source: LensFlare): LensFlare;
-    }
-
-    export class Line extends Object3D {
-        constructor(
-            geometry?: Geometry | BufferGeometry,
-            material?: LineDashedMaterial | LineBasicMaterial | ShaderMaterial,
-            mode?: number
-        );
-
-        geometry: Geometry|BufferGeometry;
-        material: Material; // LineDashedMaterial or LineBasicMaterial or ShaderMaterial
-
-        raycast(raycaster: Raycaster, intersects: any): void;
-        clone(): Line;
-        copy(source: Line): Line;
-    }
-
-    export class LineSegments extends Line {
-        constructor(
-            geometry?: Geometry | BufferGeometry,
-            material?: LineDashedMaterial | LineBasicMaterial | ShaderMaterial,
-            mode?: number
-        );
-
-        clone(): LineSegments;
-        copy(source: LineSegments): LineSegments;
-    }
-
-    enum LineMode {}
-    var LineStrip: LineMode; // deprecated
-    var LinePieces: LineMode; // deprecated
-
-    export class Mesh extends Object3D {
-        constructor(geometry?: Geometry, material?: Material);
-        constructor(geometry?: BufferGeometry, material?: Material);
-
-        geometry: Geometry|BufferGeometry;
-        material: Material;
-        drawMode: TrianglesDrawModes;
-
-        setDrawMode(drawMode: TrianglesDrawModes): void;
-        updateMorphTargets(): void;
-        getMorphTargetIndexByName(name: string): number;
-        raycast(raycaster: Raycaster, intersects: any): void;
-        clone(): Mesh;
-        copy(source: Mesh): Mesh;
-    }
-
-    /**
-     * A class for displaying particles in the form of variable size points. For example, if using the WebGLRenderer, the particles are displayed using GL_POINTS.
-     *
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/objects/ParticleSystem.js">src/objects/ParticleSystem.js</a>
-     */
-    export class Points extends Object3D {
-
-        /**
-         * @param geometry An instance of Geometry or BufferGeometry.
-         * @param material An instance of Material (optional).
-         */
-        constructor(
-            geometry?: Geometry | BufferGeometry,
-            material?: Material
-        );
-
-        /**
-         * An instance of Geometry or BufferGeometry, where each vertex designates the position of a particle in the system.
-         */
-        geometry: Geometry | BufferGeometry;
-
-        /**
-         * An instance of Material, defining the object's appearance. Default is a PointsMaterial with randomised colour.
-         */
-        material: Material;
-
-        raycast(raycaster: Raycaster, intersects: any): void;
-        clone(): Points;
-        copy(source: Points): Points;
-    }
-
-    export class PointCloud extends Points {} // deprecated, use Points
-    export class ParticleSystem extends Points {} // deprecated, use Points
-
-    export class Skeleton {
-        constructor(bones: Bone[], boneInverses?: Matrix4[], useVertexTexture?: boolean);
-
-        useVertexTexture: boolean;
-        identityMatrix: Matrix4;
-        bones: Bone[];
-        boneTextureWidth: number;
-        boneTextureHeight: number;
-        boneMatrices: Float32Array;
-        boneTexture: DataTexture;
-        boneInverses: Matrix4[];
-
-        calculateInverses(bone: Bone): void;
-        pose(): void;
-        update(): void;
-        clone(): Skeleton;
-    }
-
-    export class SkinnedMesh extends Mesh {
-        constructor(geometry?: Geometry|BufferGeometry, material?: MeshBasicMaterial, useVertexTexture?: boolean);
-        constructor(geometry?: Geometry|BufferGeometry, material?: MeshDepthMaterial, useVertexTexture?: boolean);
-        constructor(geometry?: Geometry|BufferGeometry, material?: MultiMaterial, useVertexTexture?: boolean);
-        constructor(geometry?: Geometry|BufferGeometry, material?: MeshLambertMaterial, useVertexTexture?: boolean);
-        constructor(geometry?: Geometry|BufferGeometry, material?: MeshNormalMaterial, useVertexTexture?: boolean);
-        constructor(geometry?: Geometry|BufferGeometry, material?: MeshPhongMaterial, useVertexTexture?: boolean);
-        constructor(geometry?: Geometry|BufferGeometry, material?: ShaderMaterial, useVertexTexture?: boolean);
-
-        bindMode: string;
-        bindMatrix: Matrix4;
-        bindMatrixInverse: Matrix4;
-        skeleton: Skeleton;
-
-        bind( skeleton: Skeleton, bindMatrix?: Matrix4 ): void;
-        pose(): void;
-        normalizeSkinWeights(): void;
-        updateMatrixWorld(force?: boolean): void;
-        clone(): SkinnedMesh;
-        copy(source: SkinnedMesh): SkinnedMesh;
-    }
-
-    export class Sprite extends Object3D {
-        constructor(material?: Material);
-
-        geometry: BufferGeometry;
-        material: SpriteMaterial;
-
-        raycast(raycaster: Raycaster, intersects: any): void;
-        clone(): Sprite;
-        copy(source: Sprite): Sprite;
-    }
-
-    export class Particle extends Sprite {} // deprecated, use Sprite
-
-
-    // Renderers //////////////////////////////////////////////////////////////////////////////////
-
-    export interface Renderer {
-        render(scene: Scene, camera: Camera): void;
-        setSize(width:number, height:number, updateStyle?:boolean): void;
-        domElement: HTMLCanvasElement;
-    }
-
-    export interface WebGLRendererParameters {
-        /**
-         * A Canvas where the renderer draws its output.
-         */
-        canvas?: HTMLCanvasElement;
-
-        /**
-         *  shader precision. Can be "highp", "mediump" or "lowp".
-         */
-        precision?: string;
-
-        /**
-         * default is true.
-         */
-        alpha?: boolean;
-
-        /**
-         * default is true.
-         */
-        premultipliedAlpha?: boolean;
-
-        /**
-         * default is false.
-         */
-        antialias?: boolean;
-
-        /**
-         * default is true.
-         */
-        stencil?: boolean;
-
-        /**
-         * default is false.
-         */
-        preserveDrawingBuffer?: boolean;
-
-        /**
-         * default is 0x000000.
-         */
-        clearColor?: number;
-
-        /**
-         * default is 0.
-         */
-        clearAlpha?: number;
-
-        devicePixelRatio?: number;
-
-        /**
-         * default is false.
-         */
-        logarithmicDepthBuffer?: boolean;
-    }
-
-
-    /**
-     * The WebGL renderer displays your beautifully crafted scenes using WebGL, if your device supports it.
-     * This renderer has way better performance than CanvasRenderer.
-     *
-     * @see <a href="https://github.com/mrdoob/three.js/blob/master/src/renderers/WebGLRenderer.js">src/renderers/WebGLRenderer.js</a>
-     */
-    export class WebGLRenderer implements Renderer {
-        /**
-         * parameters is an optional object with properties defining the renderer's behaviour. The constructor also accepts no parameters at all. In all cases, it will assume sane defaults when parameters are missing.
-         */
-        constructor(parameters?: WebGLRendererParameters);
-
-        /**
-         * A Canvas where the renderer draws its output.
-         * This is automatically created by the renderer in the constructor (if not provided already); you just need to add it to your page.
-         */
-        domElement: HTMLCanvasElement;
-
-        /**
-         * The HTML5 Canvas's 'webgl' context obtained from the canvas where the renderer will draw.
-         */
-        context: WebGLRenderingContext;
-
-        /**
-         * Defines whether the renderer should automatically clear its output before rendering.
-         */
-        autoClear: boolean;
-
-        /**
-         * If autoClear is true, defines whether the renderer should clear the color buffer. Default is true.
-         */
-        autoClearColor: boolean;
-
-        /**
-         * If autoClear is true, defines whether the renderer should clear the depth buffer. Default is true.
-         */
-        autoClearDepth: boolean;
-
-        /**
-         * If autoClear is true, defines whether the renderer should clear the stencil buffer. Default is true.
-         */
-        autoClearStencil: boolean;
-
-        /**
-         * Defines whether the renderer should sort objects. Default is true.
-         */
-        sortObjects: boolean;
-
-        extensions: WebGLExtensions;
-
-        gammaFactor: number; // deprecated
-
-        /**
-         * Default is false.
-         */
-        gammaInput: boolean;
-
-        /**
-         * Default is false.
-         */
-        gammaOutput: boolean;
-
-        /**
-         * Default is false.
-         */
-        shadowMapDebug: boolean;
-
-        /**
-         * Default is 8.
-         */
-        maxMorphTargets: number;
-
-        /**
-         * Default is 4.
-         */
-        maxMorphNormals: number;
-
-        /**
-         * Default is true.
-         */
-        autoScaleCubemaps: boolean;
-
-        /**
-         * An object with a series of statistical information about the graphics board memory and the rendering process. Useful for debugging or just for the sake of curiosity. The object contains the following fields:
-         */
-        info: {
-            memory: {
-                geometries: number;
-                textures: number;
-            };
-            render: {
-                calls: number;
-                vertices: number;
-                faces: number;
-                points: number;
-            };
-            programs: number;
-        };
-
-        shadowMap: WebGLShadowMap;
-        shadowMapType: ShadowMapType; // deprecated, use shadowMap.type
-        shadowMapEnabled: boolean; // deprecated, use shadowMap.enabled
-        shadowMapCullFace: CullFace; // deprecated, use shadowMap.cullFace
-
-        pixelRation: number;
-
-        capabilities: WebGLCapabilities;
-        properties: WebGLProperties;
-        state: WebGLState;
-
-        /**
-         * Return the WebGL context.
-         */
-        getContext(): WebGLRenderingContext;
-        getContextAttributes(): any;
-        forceContextLoss(): void;
-
-        getMaxAnisotropy(): number;
-        getPrecision(): string;
-        getPixelRatio(): number;
-        setPixelRatio(value: number): void;
-        
-        getSize(): { width: number; height: number; };
-
-        /**
-         * Resizes the output canvas to (width, height), and also sets the viewport to fit that size, starting in (0, 0).
-         */
-        setSize(width: number, height: number, updateStyle?: boolean): void;
-
-        /**
-         * Sets the viewport to render from (x, y) to (x + width, y + height).
-         */
-        setViewport(x?: number, y?: number, width?: number, height?: number): void;
-
-        /**
-         * Sets the scissor area from (x, y) to (x + width, y + height).
-         */
-        setScissor(x: number, y: number, width: number, height: number): void;
-
-        /**
-         * Enable the scissor test. When this is enabled, only the pixels within the defined scissor area will be affected by further renderer actions.
-         */
-        setScissorTest(enable: boolean): void;
-
-        /**
-         * Returns a THREE.Color instance with the current clear color.
-         */
-        getClearColor(): Color;
-
-        /**
-         * Sets the clear color, using color for the color and alpha for the opacity.
-         */
-        setClearColor(color: Color, alpha?: number): void;
-        setClearColor(color: string, alpha?: number): void;
-        setClearColor(color: number, alpha?: number): void;
-        
-        /**
-         * Returns a float with the current clear alpha. Ranges from 0 to 1.
-         */
-        getClearAlpha(): number;
-        
-        setClearAlpha(alpha: number): void;
-
-        /**
-         * Tells the renderer to clear its color, depth or stencil drawing buffer(s).
-         * Arguments default to true
-         */
-        clear(color?: boolean, depth?: boolean, stencil?: boolean): void;
-
-        clearColor(): void;
-        clearDepth(): void;
-        clearStencil(): void;
-        clearTarget(renderTarget:WebGLRenderTarget, color: boolean, depth: boolean, stencil: boolean): void;
-        resetGLState(): void;
-        dispose(): void;
-
-        /**
-         * Tells the shadow map plugin to update using the passed scene and camera parameters.
-         *
-         * @param scene an instance of Scene
-         * @param camera — an instance of Camera
-         */
-        renderBufferImmediate(object: Object3D, program: Object, material: Material): void;
-
-        renderBufferDirect(camera: Camera, fog: Fog, material: Material, geometryGroup: any, object: Object3D): void;
-
-        /**
-         * Render a scene using a camera.
-         * The render is done to the renderTarget (if specified) or to the canvas as usual.
-         * If forceClear is true, the canvas will be cleared before rendering, even if the renderer's autoClear property is false.
-         */
-        render(scene: Scene, camera: Camera, renderTarget?: RenderTarget, forceClear?: boolean): void;
-
-        /**
-         * Used for setting the gl frontFace, cullFace states in the GPU, thus enabling/disabling face culling when rendering.
-         * If cullFace is false, culling will be disabled.
-         * @param cullFace "back", "front", "front_and_back", or false.
-         * @param frontFace "ccw" or "cw
-         */
-        setFaceCulling(cullFace?: CullFace, frontFace?: FrontFaceDirection): void;
-        setTexture(texture: Texture, slot: number): void;
-        setRenderTarget(renderTarget: RenderTarget): void;
-        readRenderTargetPixels( renderTarget: RenderTarget, x: number, y: number, width: number, height: number, buffer: any ): void;
-
-        supportsFloatTextures(): any; // deprecated
-        supportsHalfFloatTextures(): any; // deprecated
-        supportsStandardDerivatives(): any; // deprecated
-        supportsCompressedTextureS3TC(): any; // deprecated
-        supportsCompressedTexturePVRTC(): any; // deprecated
-        supportsBlendMinMax(): any; // deprecated
-        supportsVertexTextures(): any; // deprecated
-        supportsInstancedArrays(): any; // deprecated
-        enableScissorTest(boolean: any): any; // deprecated
-    }
-
-    export interface RenderTarget {
-    }
-
-    export interface WebGLRenderTargetOptions {
-        wrapS?: Wrapping;
-        wrapT?: Wrapping;
-        magFilter?: TextureFilter;
-        minFilter?: TextureFilter;
-        format?: number; // RGBAFormat;
-        type?: TextureDataType; // UnsignedByteType;
-        anisotropy?: number; // 1;
-        depthBuffer?: boolean; // true;
-        stencilBuffer?: boolean; // true;
-    }
-
-    export class WebGLRenderTarget implements RenderTarget {
-        constructor(width: number, height: number, options?: WebGLRenderTargetOptions);
-
-        uuid: string;
-        width: number;
-        height: number;
-        scissor: Vector4;
-        scissorTest: boolean;
-        viewpport: Vector4;
-        texture: Texture;
-        depthBuffer: boolean;
-        stencilBuffer: boolean;
-        shareDepthFrom: any;
-        wrapS: any; // deprecated, use texture.wrapS
-        wrapT: any; // deprecated, use texture.wrapT
-        magFilter: any; // deprecated, use texture.magFilter
-        minFilter: any; // deprecated, use texture.minFilter
-        anisotropy: any; // deprecated, use texture.anisotropy
-        offset: any; // deprecated, use texture.offset
-        repeat: any; // deprecated, use texture.repeat
-        format: any; // deprecated, use texture.format
-        type: any; // deprecated, use texture.type
-        generateMipmaps: any; // deprecated, use texture.generateMipmaps
-
-        setSize(width: number, height: number): void;
-        clone(): WebGLRenderTarget;
-        copy(source: WebGLRenderTarget): WebGLRenderTarget;
-        dispose(): void;
-
-        // EventDispatcher mixins
-        addEventListener(type: string, listener: (event: Event) => void ): void;
-        hasEventListener(type: string, listener: (event: Event) => void): void;
-        removeEventListener(type: string, listener: (event: Event) => void): void;
-        dispatchEvent(event: { type: string; [attachment: string]: any; }): void;
-    }
-
-    export class WebGLRenderTargetCube extends WebGLRenderTarget {
-        constructor(width: number, height: number, options?: WebGLRenderTargetOptions);
-
-        activeCubeFace: number; // PX 0, NX 1, PY 2, NY 3, PZ 4, NZ 5
-    }
-
-    // Renderers / Shaders /////////////////////////////////////////////////////////////////////
-    export let ShaderChunk: {
-        [name: string]: string;
-
-        alphamap_fragment: string;
-        alphamap_pars_fragment: string;
-        alphatest_fragment: string;
-        ambient_pars: string;
-        aomap_fragment: string;
-        aomap_pars_fragment: string;
-        begin_vertex: string;
-        beginnormal_vertex: string;
-        bsdfs: string;
-        bumpmap_pars_fragment: string;
-        color_fragment: string;
-        color_pars_fragment: string;
-        color_pars_vertex: string;
-        color_vertex: string;
-        common: string;
-        defaultnormal_vertex: string;
-        displacementmap_vertex: string;
-        displacementmap_pars_vertex: string;
-        emissivemap_fragment: string;
-        emissivemap_pars_fragment: string;
-        envmap_fragment: string;
-        envmap_pars_fragment: string;
-        envmap_pars_vertex: string;
-        envmap_vertex: string;
-        fog_fragment: string;
-        fog_pars_fragment: string;
-        lightmap_fragment: string;
-        lightmap_pars_fragment: string;
-        lights_lambert_vertex: string;
-        lights_pars: string;
-        lights_phong_fragment: string;
-        lights_phong_pars_fragment: string;
-        lights_phong_pars_vertex: string;
-        lights_phong_vertex: string;
-        lights_standard_fragment: string;
-        lights_standard_pars_fragment: string;
-        lights_template: string;
-        linear_to_gamma_fragment: string;
-        logdepthbuf_fragment: string;
-        logdepthbuf_pars_fragment: string;
-        logdepthbuf_pars_vertex: string;
-        logdepthbuf_vertex: string;
-        map_fragment: string;
-        map_pars_fragment: string;
-        map_particle_fragment: string;
-        map_particle_pars_fragment: string;
-        metalnessmap_fragment: string;
-        metalnessmap_pars_fragment: string;
-        morphnormal_vertex: string;
-        morphtarget_pars_vertex: string;
-        morphtarget_vertex: string;
-        normal_fragment: string;
-        normalmap_pars_fragment: string;
-        project_vertex: string;
-        roughtnessmap_fragment: string;
-        roughtnessmap_pars_fragment: string;
-        shadowmap_pars_fragment: string;
-        shadowmap_pars_vertex: string;
-        shadowmap_vertex: string;
-        shadowmask_pars_fragment: string;
-        skinbase_vertex: string;
-        skinning_pars_vertex: string;
-        skinning_vertex: string;
-        skinnormal_vertex: string;
-        specularmap_fragment: string;
-        specularmap_pars_fragment: string;
-        uv2_pars_fragment: string;
-        uv2_pars_vertex: string;
-        uv2_vertex: string;
-        uv_pars_fragment: string;
-        uv_pars_vertex: string;
-        uv_vertex: string;
-        worldpos_vertex: string;
-    }
-
-    export interface Shader {
-        uniforms: any;
-        vertexShader: string;
-        fragmentShader: string;
-    }
-
-    export let ShaderLib: {
-        [name: string]: Shader;
-        basic: Shader;
-        lambert: Shader;
-        phong: Shader;
-        standard: Shader;
-        points: Shader;
-        dashed: Shader;
-        depth: Shader;
-        normal: Shader;
-        cube: Shader;
-        equirect: Shader;
-        depthRGBA: Shader;
-        distanceRGBA: Shader;
-    };
-
-    export interface IUniform {
-        type: string;
-        value: any;
-    }
-
-    export let UniformsLib: {
-        common: {
-            diffuse: IUniform;
-            opacity: IUniform;
-            map: IUniform;
-            offsetRepeat: IUniform;
-            specularMap: IUniform;
-            alphaMap: IUniform;
-            envMap: IUniform;
-            flipEnvMap: IUniform;
-            reflectivity: IUniform;
-            refractionRation: IUniform;
-        };
-        aomap: {
-            aoMap: IUniform;
-            aoMapIntensity: IUniform;
-        };
-        lightmap: {
-            lightMap: IUniform;
-            lightMapIntensity: IUniform;
-        };
-        emissivemap: { emissiveMap: IUniform };
-        bumpmap: {
-            bumpMap: IUniform;
-            bumpScale: IUniform;
-        };
-        normalmap: {
-            normalMap: IUniform;
-            normalScale: IUniform;
-        };
-        displacementmap: {
-            displacementMap: IUniform;
-            displacementScale: IUniform;
-            displacementBias: IUniform;
-        };
-        roughtnessmap: { roughtnessMap: IUniform };
-        metalnessmap: { metalnessMap: IUniform };
-        fog: {
-            fogDensity: IUniform;
-            fogNear: IUniform;
-            fogFar: IUniform;
-            fogColor: IUniform;
-        };
-        ambient: { ambientLightColor: IUniform };
-        lights: {
-            directionalLights: any;
-            directionalShadowMap: IUniform;
-            directionalShadowMatrix: IUniform;
-            spotLights: any;
-            spotShadowMap: IUniform;
-            spotShadowMatrix: IUniform;
-            pointLights: any;
-            pointShadowMap: IUniform;
-            pointShadowMatrix: IUniform;
-            hemisphereLigtts: any;
-        };
-        points: {
-            diffuse: IUniform;
-            opacity: IUniform;
-            size: IUniform;
-            scale: IUniform;
-            map: IUniform;
-            offsetRepeat: IUniform;
-        };
-    };
-
-    export namespace UniformsUtils {
-        export function merge(uniforms: any[]): any;
-        export function clone(uniforms_src: any): any;
-    }
-
-    export class Uniform { 
-        constructor(type: string, value: string);
-
-        type: string;
-        value: string;
-        dynamic: boolean;
-        onUpdateCallback: Function;
-
-        onUpdate(callback: Function): Uniform;
-    }
-
-    // Renderers / WebGL /////////////////////////////////////////////////////////////////////
-    export class WebGLBufferRenderer {
-        constructor(_gl: any, extensions: any, _infoRender: any); // WebGLRenderingContext
-
-        setMode(value: any): void;
-        render(start: any, count: any): void;
-        renderInstances(geometry: any): void;
-    }
-
-    export interface WebGLCapabilitiesParameters {
-        precision?: any;
-        logarithmicDepthBuffer?: any;
-    }
-
-    export class WebGLCapabilities {
-        constructor(gl: any, extensions: any, parameters: WebGLCapabilitiesParameters); // WebGLRenderingContext
-
-        precision: any;
-        logarithmicDepthBuffer: any;
-        maxTextures: any;
-        maxVertexTextures: any;
-        maxTextureSize: any;
-        maxCubemapSize: any;
-        maxAttributes: any;
-        maxVertexUniforms: any;
-        maxVaryings: any;
-        maxFragmentUniforms: any;
-        vertexTextures: any;
-        floatFragmentTextures: any;
-        floatVertexTextures: any;
-
-        getMaxPrecision(precision: any): any;
-    }
-
-    export class WebGLExtensions {
-        constructor(gl: any); // WebGLRenderingContext
-
-        get(name: string): any;
-    }
-
-    export class WebGLGeometries {
-        constructor(_gl: any, extensions: any, _infoRender: any);
-
-        get(object: any): any;
-    }
-
-    export class WebGLLights {
-        constructor(gl: any, properties: any, info: any);
-        
-        get(light: any): any;
-    }
-
-    export class WebGLIndexedBufferRenderer {
-        constructor(gl: any, properties: any, info: any);
-
-        setMode(value: any): void;
-        setIndex(index: any): void;
-        render(start: any, count: number): void;
-        renderInstances(geometry: any, start: any, count: number): void;
-    }
-    
-    export class WebGLObjects {
-        constructor(gl: any, properties: any, info: any);
-
-        getAttributeBuffer(attribute: any): any;
-        getWireframeAttribute(geometry: any): any;
-        update(object: any): void;
-    }
-
-    export class WebGLProgram {
-        constructor(renderer: WebGLRenderer, code: string, material: ShaderMaterial, parameters: WebGLRendererParameters);
-        
-        id: number;
-        code: string;
-        usedTimes: number;
-        program: any;
-        vertexShader: WebGLShader;
-        fragmentShader: WebGLShader;
-        uniforms: any; // deprecated, use getUniforms()
-        attributes: any; // deprecated, use getAttributes()
-
-        getUniforms(): any;
-        getAttributes(): any;
-        destroy(): void;
-    }
-
-    export class WebGLPrograms {
-        constructor(renderer: WebGLRenderer, capabilities: any);
-
-        programs: any[];
-
-        getParameters(material: ShaderMaterial, lights: any, fog: any, object: any): any[];
-        getProgramCode(material: ShaderMaterial, parameters: any): string;
-        acquireProgram(material: ShaderMaterial, parameters: any, code: string): WebGLProgram;
-        releaseProgram(program: WebGLProgram): void;
-    }
-    
-    export class WebGLProperties {
-        constructor();
-
-        get(object: any): any;
-        delete(object: any): void;
-        clear(): void;
-    }
-
-    export class WebGLShader {
-        constructor(gl: any, type: string, string: string);
-    }
-
-    export class WebGLShadowMap {
-        constructor(_renderer: Renderer, _lights: any[], _objects: any[]);
-
-        enabled: boolean;
-        autoUpdate: boolean;
-        needsUpdate: boolean;
-        type: ShadowMapType;
-        cullFace: CullFace;
-
-        render(scene: Scene, camera: Camera): void;
-    }
-    
-    export class WebGLState {
-        constructor(gl: any, extensions: any, paramThreeToGL: Function);
-
-        init(): void;
-        initAttributes(): void;
-        enableAttribute(attribute: string): void;
-        enableAttributeAndDivisor(attribute: string, meshPerAttribute: any, extension: any): void;
-        disableUnusedAttributes(): void;
-        enable(id: string): void;
-        disable(id: string): void;
-        getCompressedTextureFormats(): any[];
-        setBlending(blending: number, blendEquation: number, blendSrc: number, blendDst: number, blendEquationAlpha: number, blendSrcAlpha: number, blendDstAlpha: number): void;
-        setDepthFunc(func: Function): void;
-        setDepthTest(depthTest: number): void;
-        setDepthWrite(depthWrite: number): void;
-        setColorWrite(colorWrite: number): void;
-        setStencilFunc(stencilFunc: Function, stencilRef: any, stencilMask: any): void;
-        setStencilOp(stencilFail: any, stencilZFail: any, stencilZPass: any): void;
-        setStencilTest(stencilTest: boolean): void;
-        setStencilWrite(stencilWrite: any): void;
-        setFlipSided(flipSided: number): void;
-        setLineWidth(width: number): void;
-        setPolygonOffset(polygonoffset: number, factor: number, units: number): void;
-        setScissorTest(scissorTest: boolean): void;
-        getScissorTest(): boolean;
-        activeTexture(webglSlot: any): void;
-        bindTexture(webglType: any, webglTexture: any): void;
-        compressedTexImage2D(): void;
-        texImage2D(): void;
-        clearColor(r: number, g: number, b: number, a: number): void;
-        clearDepth(depth: number): void;
-        clearStencil(stencil: any): void;
-        scissor(scissor: any): void;
-        viewport(viewport: any): void;
-        reset(): void;
-    }
-
-    // Renderers / WebGL / Plugins /////////////////////////////////////////////////////////////////////
-    export class LensFlarePlugin {
-        constructor(renderer: WebGLRenderer, flares: any[]);
-        
-        render(scene: Scene, camera: Camera, viewportWidth: number, viewportHeight: number): void;
-    }
-
-    export class SpritePlugin {
-        constructor(renderer: WebGLRenderer, sprites: any[]);
-
-        render(scene: Scene, camera: Camera, viewportWidth: number, viewportHeight: number): void;
-    }
-
-    // Scenes /////////////////////////////////////////////////////////////////////
-    
-    /**
-     * Scenes allow you to set up what and where is to be rendered by three.js. This is where you place objects, lights and cameras.
-     */
-    export class Scene extends Object3D {
-        constructor();
-
-        /**
-         * A fog instance defining the type of fog that affects everything rendered in the scene. Default is null.
-         */
-        fog: IFog;
-
-        /**
-         * If not null, it will force everything in the scene to be rendered with that material. Default is null.
-         */
-        overrideMaterial: Material;
-        autoUpdate: boolean;
-
-        copy(source: Scene, recursive?: boolean): Scene;
-    }
-
-    export interface IFog {
-        name:string;
-        color: Color;
-        clone():IFog;
-    }
-
-    /**
-     * This class contains the parameters that define linear fog, i.e., that grows linearly denser with the distance.
-     */
-    export class Fog implements IFog {
-        constructor(hex: number, near?: number, far?: number);
-
-        name:string;
-
-        /**
-         * Fog color.
-         */
-        color: Color;
-
-        /**
-         * The minimum distance to start applying fog. Objects that are less than 'near' units from the active camera won't be affected by fog.
-         */
-        near: number;
-
-        /**
-         * The maximum distance at which fog stops being calculated and applied. Objects that are more than 'far' units away from the active camera won't be affected by fog.
-         * Default is 1000.
-         */
-        far: number;
-
-        clone(): Fog;
-    }
-
-    /**
-     * This class contains the parameters that define linear fog, i.e., that grows exponentially denser with the distance.
-     */
-    export class FogExp2 implements IFog {
-        constructor(hex: number|string, density?: number);
-
-        name: string;
-        color: Color;
-
-        /**
-         * Defines how fast the fog will grow dense.
-         * Default is 0.00025.
-         */
-        density: number;
-
-        clone(): FogExp2;
-    }
-
-    // Textures /////////////////////////////////////////////////////////////////////
-    export let TextureIdCount: number;
-
-    export class Texture {
-        constructor(
-            image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement,
-            mapping?: Mapping,
-            wrapS?: Wrapping,
-            wrapT?: Wrapping,
-            magFilter?: TextureFilter,
-            minFilter?: TextureFilter,
-            format?: PixelFormat,
-            type?: TextureDataType,
-            anisotropy?: number
-            );
-
-        id: number;
-        uuid: string;
-        name: string;
-        sourceFile: string;
-        image: any; // HTMLImageElement or ImageData ;
-        mipmaps: ImageData[];
-        mapping: Mapping;
-        wrapS: Wrapping;
-        wrapT: Wrapping;
-        magFilter: TextureFilter;
-        minFilter: TextureFilter;
-        anisotropy: number;
-        format: PixelFormat;
-        type: TextureDataType;
-        offset: Vector2;
-        repeat: Vector2;
-        generateMipmaps: boolean;
-        premultiplyAlpha: boolean;
-        flipY: boolean;
-        unpackAlignment: number;
-        version: number;
-        needsUpdate: boolean;
-        onUpdate: () => void;
-        static DEFAULT_IMAGE: any;
-        static DEFAULT_MAPPING: any;
-
-        clone(): Texture;
-        copy(source: Texture): Texture;
-        toJSON(meta: any): any;
-        dispose(): void;
-        transformUv(uv: Vector): void;
-
-        // EventDispatcher mixins
-        addEventListener(type: string, listener: (event: Event) => void ): void;
-        hasEventListener(type: string, listener: (event: Event) => void): void;
-        removeEventListener(type: string, listener: (event: Event) => void): void;
-        dispatchEvent(event: { type: string; [attachment: string]: any; }): void;
-    }
-
-    export class CanvasTexture extends Texture {
-        constructor(
-            canvas: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement,
-            mapping?: Mapping,
-            wrapS?: Wrapping,
-            wrapT?: Wrapping,
-            magFilter?: TextureFilter,
-            minFilter?: TextureFilter,
-            format?: PixelFormat,
-            type?: TextureDataType,
-            anisotropy?: number
-        );
-
-        clone(): CanvasTexture;
-        copy(source: CanvasTexture): CanvasTexture;
-    }
-
-    export class CubeTexture extends Texture {
-        constructor(
-            images: any[], // HTMLImageElement or HTMLCanvasElement
-            mapping?: Mapping,
-            wrapS?: Wrapping,
-            wrapT?: Wrapping,
-            magFilter?: TextureFilter,
-            minFilter?: TextureFilter,
-            format?: PixelFormat,
-            type?: TextureDataType,
-            anisotropy?: number
-        );
-
-        images: any[];
-
-        copy(source: CubeTexture): CubeTexture;
-    }
-
-    export class CompressedTexture extends Texture {
-        constructor(
-            mipmaps: ImageData[],
-            width: number,
-            height: number,
-            format?: PixelFormat,
-            type?: TextureDataType,
-            mapping?: Mapping,
-            wrapS?: Wrapping,
-            wrapT?: Wrapping,
-            magFilter?: TextureFilter,
-            minFilter?: TextureFilter,
-            anisotropy?: number
-        );
-
-        image: { width: number; height: number; };
-
-        clone(): CompressedTexture;
-        copy(source: CompressedTexture): CompressedTexture;
-    }
-
-    export class DataTexture extends Texture {
-        constructor(
-            data: ImageData,
-            width: number,
-            height: number,
-            format: PixelFormat,
-            type: TextureDataType,
-            mapping: Mapping,
-            wrapS: Wrapping,
-            wrapT: Wrapping,
-            magFilter: TextureFilter,
-            minFilter: TextureFilter,
-            anisotropy?: number
-        );
-
-        image: { data: ImageData; width: number; height: number; };
-
-        clone(): DataTexture;
-        copy(source: DataTexture): DataTexture;
-    }
-
-    export class VideoTexture extends Texture {
-        constructor(
-            video: HTMLVideoElement,
-            mapping?: Mapping,
-            wrapS?: Wrapping,
-            wrapT?: Wrapping,
-            magFilter?: TextureFilter,
-            minFilter?: TextureFilter,
-            format?: PixelFormat,
-            type?: TextureDataType,
-            anisotropy?: number
-            );
-
-        clone(): VideoTexture;
-        copy(source: VideoTexture): VideoTexture;
-    }
-
-    // Extras /////////////////////////////////////////////////////////////////////
-    export namespace CurveUtils {
-        export function tangentQuadraticBezier(t: number, p0: number, p1: number, p2: number): number;
-        export function tangentCubicBezier(t: number, p0: number, p1: number, p2: number, p3: number): number;
-        export function tangentSpline(t: number, p0: number, p1: number, p2: number, p3: number): number;
-        export function interpolate(p0: number, p1: number, p2: number, p3: number, t: number): number;
-    }
-
-    export namespace ImageUtils { // deprecated
-        export let crossOrigin: string;
-
-        export function loadTexture(url: string, mapping?: Mapping, onLoad?: (texture: Texture) => void, onError?: (message: string) => void): Texture;
-        export function loadTextureCube(array: string[], mapping?: Mapping, onLoad?: (texture: Texture) => void , onError?: (message: string) => void ): Texture;
-    }
-
-    export namespace SceneUtils {
-        export function createMultiMaterialObject(geometry: Geometry, materials: Material[]): Object3D;
-        export function detach(child: Object3D, parent: Object3D, scene: Scene): void;
-        export function attach(child: Object3D, scene: Scene, parent: Object3D): void;
-    }
-
-    export namespace ShapeUtils {
-        export function area(contour: number[]): number;
-        export function triangulate(contour: number[], indices: boolean): number[];
-        export function triangulateShape(contour: number[], holes: any[]): number[];
-        export function isClockWise(pts: number[]): boolean;
-        export function b2(t: number, p0: number, p1: number, p2: number): number;
-        export function b3(t: number, p0: number, p1: number, p2: number, p3: number): number;
-    }
-
-    // Extras / Audio /////////////////////////////////////////////////////////////////////
-
-    export class Audio extends Object3D {
-        constructor(listener: AudioListener);
-
-        type: string;
-        context: AudioContext;
-        source: AudioBufferSourceNode;
-        gain: GainNode;
-        autoplay: boolean;
-        startTime: number;
-        playbackRate: number;
-        hasPlaybackControl: boolean;
-        isPlaying: boolean;
-        sourceType: string;
-        filter: any;
-
-        getOutput(): GainNode;
-        load(file: string): Audio;
-        setNodeSource(audioNode: AudioBufferSourceNode): Audio;
-        setBuffer(audioBuffer: AudioBuffer): Audio;
-        play(): void;
-        pause(): void;
-        stop(): void;
-        connect(): void;
-        disconnect(): void;
-        setFilter(value: any): void;
-        getFilter(): any;
-        setPlaybackRate(value: number): void;
-        getPlaybackRate(): number;
-        onEnded(): void;
-        setLoop(value: boolean): void;
-        getLoop(): boolean;
-        setVolume(value: number): void;
-        getVolume(): number;
-    }
-
-    export class AudioAnalyser {
-        constructor(audio: any, fftSize: number);
-
-        analyser: any;
-        data: Uint8Array;
-
-        getData(): Uint8Array;
-    }
-
-    export class AudioBuffer {
-        constructor(context: any);
-
-        context: any;
-        ready: boolean;
-        readyCallbacks: Function[];
-
-        load(file: string): AudioBuffer;
-        onReady(callback: Function): void;
-    }
-
-    export class PositionalAudio extends Audio {
-        constructor(listener: AudioListener);
-
-        panner: PannerNode;
-
-        setRefDistance(value: number): void;
-        getRefDistance(): number;
-        setRolloffFactor(value: number): void;
-        getRolloffFactor(): number;
-        setDistanceModel(value: number): void;
-        getDistanceModel(): number;
-        setMaxDistance(value: number): void;
-        getMaxDistance(): number;
-    }
-
-    export class AudioListener extends Object3D {
-        constructor();
-
-        type: string;
-        context: AudioContext;
-        gain: GainNode;
-
-        getInput(): GainNode;
-        removeFilter(): void;
-        setFilter(value: any): void;
-        getFilter(): any;
-        setMasterVolume(value: number): void;
-        getMasterVolume(): number;
-    }
-
-    // Extras / Core /////////////////////////////////////////////////////////////////////
-
-    /**
-     * An extensible curve object which contains methods for interpolation
-     * class Curve&lt;T extends Vector&gt;
-     */
-    export class Curve<T extends Vector> {
-        /**
-         * Returns a vector for point t of the curve where t is between 0 and 1
-         * getPoint(t: number): T;
-         */
-        getPoint(t: number): T;
-
-        /**
-         * Returns a vector for point at relative position in curve according to arc length
-         * getPointAt(u: number): T;
-         */
-        getPointAt(u: number):T;
-
-        /**
-         * Get sequence of points using getPoint( t )
-         * getPoints(divisions?: number): T[];
-         */
-        getPoints(divisions?: number): T[];
-
-        /**
-         * Get sequence of equi-spaced points using getPointAt( u )
-         * getSpacedPoints(divisions?: number): T[];
-         */
-        getSpacedPoints(divisions?: number): T[];
-
-        /**
-         * Get total curve arc length
-         */
-        getLength(): number;
-
-        /**
-         * Get list of cumulative segment lengths
-         */
-        getLengths(divisions?: number): number[];
-
-        /**
-         * Update the cumlative segment distance cache
-         */
-        updateArcLengths(): void;
-
-        /**
-         * Given u ( 0 .. 1 ), get a t to find p. This gives you points which are equi distance
-         */
-        getUtoTmapping(u: number, distance: number): number;
-
-        /**
-         * Returns a unit vector tangent at t. If the subclassed curve do not implement its tangent derivation, 2 points a small delta apart will be used to find its gradient which seems to give a reasonable approximation
-         * getTangent(t: number): T;
-         */
-        getTangent(t: number): T;
-
-        /**
-         * Returns tangent at equidistance point u on the curve
-         * getTangentAt(u: number): T;
-         */
-        getTangentAt(u: number): T;
-
-        static create(constructorFunc: Function, getPointFunc: Function): Function;
-    }
-
-    export class CurvePath<T extends Vector> extends Curve<T> {
-        constructor();
-
-        curves: Curve<T>[];
-        autoClose: boolean;
-
-        add(curve: Curve<T>): void;
-        checkConnection(): boolean;
-        closePath(): void;
-        getPoint(t: number): T;
-        getLength(): number;
-        getCurveLengths(): number[];
-        createPointsGeometry(divisions: number): Geometry;
-        createSpacedPointsGeometry(divisions: number): Geometry;
-        createGeometry(points: T[]): Geometry;
-    }
-
-    export enum PathActions {
-        MOVE_TO,
-        LINE_TO,
-        QUADRATIC_CURVE_TO, // Bezier quadratic curve
-        BEZIER_CURVE_TO,     // Bezier cubic curve
-        CSPLINE_THRU,        // Catmull-rom spline
-        ARC,                // Circle
-        ELLIPSE,
-    }
-
-    export interface PathAction {
-        action: PathActions;
-        args: any;
-    }
-
-    /**
-     * a 2d path representation, comprising of points, lines, and cubes, similar to the html5 2d canvas api. It extends CurvePath.
-     */
-    export class Path extends CurvePath<Vector2> {
-        constructor(points?: Vector2[]);
-
-        actions: PathAction[];
-
-        fromPoints(vectors: Vector2[]): void;
-        moveTo(x: number, y: number): void;
-        lineTo(x: number, y: number): void;
-        quadraticCurveTo(aCPx: number, aCPy: number, aX: number, aY: number): void;
-        bezierCurveTo(aCP1x: number, aCP1y: number, aCP2x: number, aCP2y: number, aX: number, aY: number): void;
-        splineThru(pts: Vector2[]): void;
-        arc(aX: number, aY: number, aRadius: number, aStartAngle: number, aEndAngle: number, aClockwise: boolean): void;
-        absarc(aX: number, aY: number, aRadius: number, aStartAngle: number, aEndAngle: number, aClockwise: boolean): void;
-        ellipse(aX: number, aY: number, xRadius: number, yRadius: number, aStartAngle: number, aEndAngle: number, aClockwise: boolean, aRotation: number): void;
-        absellipse(aX: number, aY: number, xRadius: number, yRadius: number, aStartAngle: number, aEndAngle: number, aClockwise: boolean, aRotation: number): void;
-        getSpacedPoints(divisions?: number): Vector2[];
-        getPoints(divisions?: number, closedPath?: boolean): Vector2[];
-        toShapes(isCCW: boolean, noHoles: any): Shape[];
-    }
-
-    /**
-     * Defines a 2d shape plane using paths.
-     */
-    export class Shape extends Path {
-        constructor(points?: Vector2[]);
-
-        holes: Path[];
-
-        extrude(options?: any): ExtrudeGeometry;
-        makeGeometry(options?: any): ShapeGeometry;
-        getPointsHoles(divisions: number): Vector2[][];
-        extractAllPoints(divisions: number): {
-            shape: Vector2[];
-            holes: Vector2[][];
-        };
-        extractPoints(divisions: number): Vector2[];
-    }
-
-    // Extras / Curves /////////////////////////////////////////////////////////////////////
-    export class CatmullRomCurve3 extends Curve<Vector3> {
-        constructor(points?: Vector3[]);
-
-        points: Vector3[];
-
-        getPoint(t: number): Vector3;
-    }
-
-    export class ClosedSplineCurve3 extends CatmullRomCurve3 {} // deprecated, use CatmullRomCurve3
-    export class SplineCurve3 extends CatmullRomCurve3 {} // will be deprecated, use CatmullRomCurve3
-        
-    export class CubicBezierCurve extends Curve<Vector2> {
-        constructor(v0: Vector2, v1: Vector2, v2: Vector2, v3: Vector2);
-
-        v0: Vector2;
-        v1: Vector2;
-        v2: Vector2;
-        v3: Vector2;
-    }
-
-    export class CubicBezierCurve3 extends Curve<Vector3> {
-        constructor(v0: Vector3, v1: Vector3, v2: Vector3, v3: Vector3);
-
-        v0: Vector3;
-        v1: Vector3;
-        v2: Vector3;
-        v3: Vector3;
-
-        getPoint(t: number): Vector3;
-    }
-    
-    export class EllipseCurve extends Curve<Vector2> {
-        constructor(aX: number, aY: number, xRadius: number, yRadius: number, aStartAngle: number, aEndAngle: number, aClockwise: boolean, aRotation: number);
-
-        aX: number;
-        aY: number;
-        xRadius: number;
-        yRadius: number;
-        aStartAngle: number;
-        aEndAngle: number;
-        aClockwise: boolean;
-        aRotation: number;
-    }
-    export class ArcCurve extends EllipseCurve {
-        constructor(aX: number, aY: number, aRadius: number, aStartAngle: number, aEndAngle: number, aClockwise: boolean );
-    }
-
-    export class LineCurve extends Curve<Vector2> {
-        constructor( v1: Vector2, v2: Vector2 );
-
-        v1: Vector2;
-        v2: Vector2;
-    }
-
-    export class LineCurve3 extends Curve<Vector3> {
-        constructor(v1: Vector3, v2: Vector3);
-
-        v1: Vector3;
-        v2: Vector3;
-
-        getPoint(t: number): Vector3;
-    }
-    
-    export class QuadraticBezierCurve extends Curve<Vector2> {
-        constructor( v0: Vector2, v1: Vector2, v2: Vector2 );
-
-        v0: Vector2;
-        v1: Vector2;
-        v2: Vector2;
-    }
-
-    export class QuadraticBezierCurve3 extends Curve<Vector3> {
-        constructor(v0: Vector3, v1: Vector3, v2: Vector3);
-
-        v0: Vector3;
-        v1: Vector3;
-        v2: Vector3;
-
-        getPoint(t: number): Vector3;
-    }
-
-    export class SplineCurve extends Curve<Vector2> {
-        constructor(points?: Vector2[]);
-
-        points: Vector2[];
-    }
-    
-
-    // Extras / Geomerties /////////////////////////////////////////////////////////////////////
-    /**
-     * BoxGeometry is the quadrilateral primitive geometry class. It is typically used for creating a cube or irregular quadrilateral of the dimensions provided within the (optional) 'width', 'height', & 'depth' constructor arguments.
-     */
-    export class BoxGeometry extends Geometry {
-        /**
-         * @param width — Width of the sides on the X axis.
-         * @param height — Height of the sides on the Y axis.
-         * @param depth — Depth of the sides on the Z axis.
-         * @param widthSegments — Number of segmented faces along the width of the sides.
-         * @param heightSegments — Number of segmented faces along the height of the sides.
-         * @param depthSegments — Number of segmented faces along the depth of the sides.
-         */
-        constructor(width: number, height: number, depth: number, widthSegments?: number, heightSegments?: number, depthSegments?: number);
-
-        parameters: {
-            width: number;
-            height: number;
-            depth: number;
-            widthSegments: number;
-            heightSegments: number;
-            depthSegments: number;
-        };
-        widthSegments: number
-        heightSegments: number;
-        depthSegments: number;
-
-        clone(): BoxGeometry;
-    }
-
-    export class CubeGeometry extends BoxGeometry {} // deprecated, use BoxGeometry
-
-    export class CircleGeometry extends Geometry {
-        constructor(radius?: number, segments?: number, thetaStart?: number, thetaLength?: number);
-
-        parameters: {
-            radius: number;
-            segments: number;
-            thetaStart: number;
-            thetaLength: number;
-        };
-    }
-
-    export class CircleBufferGeometry extends BufferGeometry {
-        constructor(radius?: number, segments?: number, thetaStart?: number, thetaLength?: number);
-
-        parameters: {
-            radius: number;
-            segments: number;
-            thetaStart: number;
-            thetaLength: number;
-        };
-    }
-
-    export class CylinderGeometry extends Geometry {
-        /**
-         * @param radiusTop — Radius of the cylinder at the top.
-         * @param radiusBottom — Radius of the cylinder at the bottom.
-         * @param height — Height of the cylinder.
-         * @param radiusSegments — Number of segmented faces around the circumference of the cylinder.
-         * @param heightSegments — Number of rows of faces along the height of the cylinder.
-         * @param openEnded - A Boolean indicating whether or not to cap the ends of the cylinder.
-         */
-        constructor(radiusTop?: number, radiusBottom?: number, height?: number, radiusSegments?: number, heightSegments?: number, openEnded?: boolean, thetaStart?: number, thetaLength?: number);
-
-        parameters: {
-            radiusTop: number;
-            radiusBottom: number;
-            height: number;
-            radialSegments: number;
-            heightSegments: number;
-            openEnded: boolean;
-            thetaStart: number;
-            thetaLength: number;
-        };
-    }
-
-    export class DodecahedronGeometry extends Geometry {
-        constructor(radius: number, detail: number);
-
-        parameters: {
-            radius: number;
-            detail: number;
-        };
-    }
-
-    export class EdgesGeometry extends BufferGeometry {
-        constructor(geometry: BufferGeometry, thresholdAngle: number);
-
-        clone(): EdgesGeometry;
-    }
-
-    export class ExtrudeGeometry extends Geometry {
-        constructor(shape?: Shape, options?: any);
-        constructor(shapes?: Shape[], options?: any);
-
-        static WorldUVGenerator: {
-            generateTopUV(geometry: Geometry, indexA: number, indexB: number, indexC: number): Vector2[];
-            generateSideWallUV(geometry: Geometry, indexA: number, indexB: number, indexC: number, indexD: number): Vector2[];
-        };
-
-        addShapeList(shapes: Shape[], options?: any): void;
-        addShape(shape: Shape, options?: any): void;
-    }
-
-    export class IcosahedronGeometry extends PolyhedronGeometry {
-        constructor(radius: number, detail: number);
-    }
-
-    export class LatheGeometry extends Geometry {
-        constructor(points: Vector3[], segments?: number, phiStart?: number, phiLength?: number);
-
-        parameters: {
-            points: Vector3[];
-            segments: number;
-            phiStart: number;
-            phiLength: number;
-        };
-    }
-
-    export class OctahedronGeometry extends PolyhedronGeometry {
-        constructor(radius: number, detail: number);
-    }
-
-    export class ParametricGeometry extends Geometry {
-        constructor(func: (u: number, v: number) => Vector3, slices: number, stacks: number);
-
-        parameters: {
-            func: (u: number, v: number) => Vector3;
-            slices: number;
-            stacks: number;
-        };
-    }
-
-    export class PlaneBufferGeometry extends BufferGeometry {
-        constructor(width: number, height: number, widthSegments?: number, heightSegments?: number);
-
-        parameters: {
-            width: number;
-            height: number;
-            widthSegments: number;
-            heightSegments: number;
-        };
-    }
-
-    export class PlaneGeometry extends Geometry {
-        constructor(width: number, height: number, widthSegments?: number, heightSegments?: number);
-
-        parameters: {
-            width: number;
-            height: number;
-            widthSegments: number;
-            heightSegments: number;
-        };
-    }
-
-    export class PolyhedronGeometry extends Geometry {
-        constructor(vertices: Vector3[], faces: Face3[], radius?: number, detail?: number);
-
-        parameters: {
-            vertices: Vector3[];
-            faces: Face3[];
-            radius: number;
-            detail: number;
-        };
-        boundingSphere: Sphere;
-    }
-
-    export class RingGeometry extends Geometry {
-        constructor(innerRadius?: number, outerRadius?: number, thetaSegments?: number, phiSegments?: number, thetaStart?: number, thetaLength?: number);
-
-        parameters: {
-            innerRadius: number;
-            outerRadius: number;
-            thetaSegments: number;
-            phiSegments: number;
-            thetaStart: number;
-            thetaLength: number;
-        };
-    }
-
-    export class ShapeGeometry extends Geometry {
-        constructor(shape: Shape, options?: any);
-        constructor(shapes: Shape[], options?: any);
-
-        addShapeList(shapes: Shape[], options: any): ShapeGeometry;
-        addShape(shape: Shape, options?: any): void;
-    }
-
-    export class SphereBufferGeometry extends BufferGeometry {
-        constructor(radius: number, widthSegments?: number, heightSegments?: number, phiStart?: number, phiLength?: number, thetaStart?: number, thetaLength?: number);
-
-        parameters: {
-            radius: number;
-            widthSegments: number;
-            heightSegments: number;
-            phiStart: number;
-            phiLength: number;
-            thetaStart: number;
-            thetaLength: number;
-        };
-    }
-
-    /**
-     * A class for generating sphere geometries
-     */
-    export class SphereGeometry extends Geometry {
-        /**
-         * The geometry is created by sweeping and calculating vertexes around the Y axis (horizontal sweep) and the Z axis (vertical sweep). Thus, incomplete spheres (akin to 'sphere slices') can be created through the use of different values of phiStart, phiLength, thetaStart and thetaLength, in order to define the points in which we start (or end) calculating those vertices.
-         *
-         * @param radius — sphere radius. Default is 50.
-         * @param widthSegments — number of horizontal segments. Minimum value is 3, and the default is 8.
-         * @param heightSegments — number of vertical segments. Minimum value is 2, and the default is 6.
-         * @param phiStart — specify horizontal starting angle. Default is 0.
-         * @param phiLength — specify horizontal sweep angle size. Default is Math.PI * 2.
-         * @param thetaStart — specify vertical starting angle. Default is 0.
-         * @param thetaLength — specify vertical sweep angle size. Default is Math.PI.
-         */
-        constructor(radius: number, widthSegments?: number, heightSegments?: number, phiStart?: number, phiLength?: number, thetaStart?: number, thetaLength?: number);
-
-        parameters: {
-            radius: number;
-            widthSegments: number;
-            heightSegments: number;
-            phiStart: number;
-            phiLength: number;
-            thetaStart: number;
-            thetaLength: number;
-        };
-    }
-
-    export class TetrahedronGeometry extends PolyhedronGeometry {
-        constructor(radius?: number, detail?: number);
-    }
-
-    export interface TextGeometryParameters {
-        font: Font;
-        site: number;
-        height: number;
-        curveSegments: number;
-        bevelEnabled: boolean;
-        bevelThickness: number;
-        bevelSize: number;
-    }
-
-    export class TextGeometry extends ExtrudeGeometry {
-        constructor(text: string, parameters?: TextGeometryParameters);
-
-        parameters: {
-            font: Font;
-            site: number;
-            height: number;
-            curveSegments: number;
-            bevelEnabled: boolean;
-            bevelThickness: number;
-            bevelSize: number;
-        }
-    }
-
-    export class TorusGeometry extends Geometry {
-        constructor(radius?: number, tube?: number, radialSegments?: number, tubularSegments?: number, arc?: number);
-
-        parameters: {
-            radius: number;
-            tube: number;
-            radialSegments: number;
-            tubularSegments: number;
-            arc: number;
-        };
-    }
-
-    export class TorusKnotGeometry extends Geometry {
-        constructor(radius?: number, tube?: number, radialSegments?: number, tubularSegments?: number, p?: number, q?: number, heightScale?: number);
-
-        parameters: {
-            radius: number;
-            tube: number;
-            radialSegments: number;
-            tubularSegments: number;
-            p: number;
-            q: number;
-            heightScale: number;
-        };
-    }
-
-    export class TubeGeometry extends Geometry {
-        constructor(path: Path, segments?: number, radius?: number, radiusSegments?: number, closed?: boolean, taper?: (u: number) => number);
-
-        parameters: {
-            path: Path;
-            segments: number;
-            radius: number;
-            radialSegments: number;
-            closed: boolean;
-            taper: (u: number) => number; // NoTaper or SinusoidalTaper;
-        };
-        tangents: Vector3[];
-        normals: Vector3[];
-        binormals: Vector3[];
-
-        static NoTaper(u?: number): number;
-        static SinusoidalTaper(u: number): number;
-        static FrenetFrames(path: Path, segments: number, closed: boolean): void;
-    }
-
-    export class WireframeGeometry extends BufferGeometry {
-        constructor(geometry: Geometry | BufferGeometry);
-    }
-
-    // Extras / Helpers /////////////////////////////////////////////////////////////////////
-
-    export class ArrowHelper extends Object3D {
-        constructor(dir: Vector3, origin?: Vector3, length?: number, hex?: number, headLength?: number, headWidth?: number);
-
-        line: Line;
-        cone: Mesh;
-
-        setDirection(dir: Vector3): void;
-        setLength(length: number,  headLength?: number, headWidth?: number): void;
-        setColor(hex: number): void;
-    }
-
-    export class AxisHelper extends LineSegments {
-        constructor(size?: number);
-    }
-
-    export class BoundingBoxHelper extends Mesh {
-        constructor(object?: Object3D, hex?: number);
-
-        object: Object3D;
-        box: Box3;
-
-        update(): void;
-    }
-
-    export class BoxHelper extends LineSegments {
-        constructor(object?: Object3D);
-
-        update(object?: Object3D): void;
-    }
-
-    export class CameraHelper extends LineSegments {
-        constructor(camera: Camera);
-
-        camera: Camera;
-        pointMap: { [id: string]: number[]; };
-
-        update(): void;
-    }
-
-    export class DirectionalLightHelper extends Object3D {
-        constructor(light: Light, size?: number);
-
-        light: Light;
-        lightPlane: Line;
-        targetLine: Line;
-
-        dispose(): void;
-        update(): void;
-    }
-
-    export class EdgesHelper extends LineSegments {
-        constructor(object: Object3D, hex?: number, thresholdAngle?: number);
-    }
-
-    export class FaceNormalsHelper extends LineSegments {
-        constructor(object: Object3D, size?: number, hex?: number, linewidth?: number);
-
-        object: Object3D;
-        size: number;
-
-        update(object?: Object3D): void;
-    }
-
-    export class GridHelper extends LineSegments {
-        constructor(size: number, step: number);
-
-        color1: Color;
-        color2: Color;
-
-        setColors(colorCenterLine: number, colorGrid: number): void;
-    }
-
-    export class HemisphereLightHelper extends Object3D {
-        constructor(light: Light, sphereSize: number);
-
-        light: Light;
-        colors: Color[];
-        lightSphere: Mesh;
-
-        dispose(): void;
-        update(): void;
-    }
-
-    export class PointLightHelper extends Object3D {
-        constructor(light: Light, sphereSize: number);
-
-        light: Light;
-
-        dispose(): void;
-        update(): void;
-    }
-
-    export class SkeletonHelper extends LineSegments {
-        constructor(bone: Object3D);
-
-        bones: Bone[];
-        root: Object3D;
-
-        getBoneList(object: Object3D): Bone[];
-        update(): void;
-    }
-
-    export class SpotLightHelper extends Object3D {
-        constructor(light: Light, sphereSize: number, arrowLength: number);
-
-        light: Light;
-        cone: Mesh;
-
-        dispose(): void;
-        update(): void;
-    }
-
-    export class VertexNormalsHelper extends LineSegments {
-        constructor(object: Object3D, size?: number, hex?: number, linewidth?: number);
-
-        object: Object3D;
-        size: number;
-
-        update(object?: Object3D): void;
-    }
-
-    export class WireframeHelper extends LineSegments {
-        constructor(object: Object3D, hex?: number);
-    }
-
-    // Extras / Objects /////////////////////////////////////////////////////////////////////
-
-    export class ImmediateRenderObject extends Object3D {
-        constructor(material: Material);
-
-        material: Material;
-        render(renderCallback: Function): void;
-    }
-
-    export interface MorphBlendMeshAnimation {
-        start: number;
-        end: number;
-        length: number;
-        fps: number;
-        duration: number;
-        lastFrame: number;
-        currentFrame: number;
-        active: boolean;
-        time: number;
-        direction: number;
-        weight: number;
-        directionBackwards: boolean;
-        mirroredLoop: boolean;
-    }
-
-    export class MorphBlendMesh extends Mesh {
-        constructor(geometry: Geometry, material: Material);
-
-        animationsMap: { [name: string]: MorphBlendMeshAnimation; };
-        animationsList: MorphBlendMeshAnimation[];
-
-        createAnimation(name: string, start: number, end: number, fps: number): void;
-        autoCreateAnimations(fps: number): void;
-        setAnimationDirectionForward(name: string): void;
-        setAnimationDirectionBackward(name: string): void;
-        setAnimationFPS(name: string, fps: number): void;
-        setAnimationDuration(name: string, duration: number): void;
-        setAnimationWeight(name: string, weight: number): void;
-        setAnimationTime(name: string, time: number): void;
-        getAnimationTime(name: string): number;
-        getAnimationDuration(name: string): number;
-        playAnimation(name: string): void;
-        stopAnimation(name: string): void;
-        update(delta: number): void;
-    }
-}
-
-declare module 'three' {
-    export = THREE;
-}
diff --git a/thrift/index.d.ts b/thrift/index.d.ts
new file mode 100644
index 0000000000..3db53d91d9
--- /dev/null
+++ b/thrift/index.d.ts
@@ -0,0 +1,280 @@
+// Type definitions for thrift 0.9.2
+// Project: https://www.npmjs.com/package/thrift
+// Definitions by: Zachary Collins <https://github.com/corps>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export declare module Thrift {
+    /**
+     * Thrift IDL type string to Id mapping.
+     * @property {number}    STOP     - End of a set of fields.
+     * @property {number}    VOID     - No value (only legal for return types).
+     * @property {number}    BOOL     - True/False integer.
+     * @property {number}    BYTE     - Signed 8 bit integer.
+     * @property {number}    I08        - Signed 8 bit integer.
+     * @property {number}    DOUBLE - 64 bit IEEE 854 floating point.
+     * @property {number}    I16        - Signed 16 bit integer.
+     * @property {number}    I32        - Signed 32 bit integer.
+     * @property {number}    I64        - Signed 64 bit integer.
+     * @property {number}    STRING - Array of bytes representing a string of characters.
+     * @property {number}    UTF7     - Array of bytes representing a string of UTF7 encoded characters.
+     * @property {number}    STRUCT - A multifield type.
+     * @property {number}    MAP        - A collection type (map/associative-array/dictionary).
+     * @property {number}    SET        - A collection type (unordered and without repeated values).
+     * @property {number}    LIST     - A collection type (unordered).
+     * @property {number}    UTF8     - Array of bytes representing a string of UTF8 encoded characters.
+     * @property {number}    UTF16    - Array of bytes representing a string of UTF16 encoded characters.
+     */
+    interface Type {
+        'STOP': number;
+        'VOID': number;
+        'BOOL': number;
+        'BYTE': number;
+        'I08': number;
+        'DOUBLE': number;
+        'I16': number;
+        'I32': number;
+        'I64': number;
+        'STRING': number;
+        'UTF7': number;
+        'STRUCT': number;
+        'MAP': number;
+        'SET': number;
+        'LIST': number;
+        'UTF8': number;
+        'UTF16': number;
+    }
+    var Type: Type;
+
+    /**
+     * Thrift RPC message type string to Id mapping.
+     * @property {number}    CALL            - RPC call sent from client to server.
+     * @property {number}    REPLY         - RPC call normal response from server to client.
+     * @property {number}    EXCEPTION - RPC call exception response from server to client.
+     * @property {number}    ONEWAY        - Oneway RPC call from client to server with no response.
+     */
+    interface MessageType {
+        'CALL': number;
+        'REPLY': number;
+        'EXCEPTION': number;
+        'ONEWAY': number;
+    }
+    var MessageType: MessageType;
+
+    /**
+     * Utility function returning the count of an object's own properties.
+     * @param {object} obj - Object to test.
+     * @returns {number} number of object's own properties
+     */
+    function objectLength(obj: Object): number;
+
+    /**
+     * Utility function to establish prototype inheritance.
+     * @param {function} constructor - Contstructor function to set as derived.
+     * @param {function} superConstructor - Contstructor function to set as base.
+     * @param {string} [name] - Type name to set as name property in derived prototype.
+     */
+    function inherits(constructor: Function, superConstructor: Function, name?: string): void;
+
+    /**
+     * TException is the base class for all Thrift exceptions types.
+     */
+    class TException implements Error {
+        name: string;
+        message: string;
+
+        /**
+         * Initializes a Thrift TException instance.
+         * @param {string} message - The TException message (distinct from the Error message).
+         */
+        constructor(message: string);
+
+        /**
+         * Returns the message set on the exception.
+         * @returns {string} exception message
+         */
+        getMessage(): string;
+    }
+
+    /**
+     * Thrift Application Exception type string to Id mapping.
+     * @property {number}    UNKNOWN                                 - Unknown/undefined.
+     * @property {number}    UNKNOWN_METHOD                    - Client attempted to call a method unknown to the server.
+     * @property {number}    INVALID_MESSAGE_TYPE        - Client passed an unknown/unsupported MessageType.
+     * @property {number}    WRONG_METHOD_NAME             - Unused.
+     * @property {number}    BAD_SEQUENCE_ID                 - Unused in Thrift RPC, used to flag proprietary sequence number errors.
+     * @property {number}    MISSING_RESULT                    - Raised by a server processor if a handler fails to supply the required return result.
+     * @property {number}    INTERNAL_ERROR                    - Something bad happened.
+     * @property {number}    PROTOCOL_ERROR                    - The protocol layer failed to serialize or deserialize data.
+     * @property {number}    INVALID_TRANSFORM             - Unused.
+     * @property {number}    INVALID_PROTOCOL                - The protocol (or version) is not supported.
+     * @property {number}    UNSUPPORTED_CLIENT_TYPE - Unused.
+     */
+    interface TApplicationExceptionType {
+        'UNKNOWN': number;
+        'UNKNOWN_METHOD': number;
+        'INVALID_MESSAGE_TYPE': number;
+        'WRONG_METHOD_NAME': number;
+        'BAD_SEQUENCE_ID': number;
+        'MISSING_RESULT': number;
+        'INTERNAL_ERROR': number;
+        'PROTOCOL_ERROR': number;
+        'INVALID_TRANSFORM': number;
+        'INVALID_PROTOCOL': number;
+        'UNSUPPORTED_CLIENT_TYPE': number;
+    }
+    var TApplicationExceptionType: TApplicationExceptionType;
+
+    /**
+     * TApplicationException is the exception class used to propagate exceptions from an RPC server back to a calling client.
+     */
+    class TApplicationException extends TException {
+        message: string;
+        code: number;
+
+        /**
+         * Initializes a Thrift TApplicationException instance.
+         * @param {string} message - The TApplicationException message (distinct from the Error message).
+         * @param {Thrift.TApplicationExceptionType} [code] - The TApplicationExceptionType code.
+         */
+        constructor(message: string, code?: number);
+
+        /**
+         * Read a TApplicationException from the supplied protocol.
+         * @param {object} input - The input protocol to read from.
+         */
+        read(input: Object): void;
+
+        /**
+         * Write a TApplicationException to the supplied protocol.
+         * @param {object} output - The output protocol to write to.
+         */
+        write(output: Object): void;
+
+        /**
+         * Returns the application exception code set on the exception.
+         * @returns {Thrift.TApplicationExceptionType} exception code
+         */
+        getCode(): number;
+    }
+
+    /**
+     * The Apache Thrift Transport layer performs byte level I/O between RPC
+     * clients and servers. The JavaScript Transport object type uses Http[s]/XHR and is
+     * the sole browser based Thrift transport. Target servers must implement the http[s]
+     * transport (see: node.js example server).
+     */
+    class TXHRTransport {
+        url: string;
+        wpos: number;
+        rpos: number;
+        useCORS: any;
+        send_buf: string;
+        recv_buf: string;
+
+        /**
+         * If you do not specify a url then you must handle XHR operations on
+         * your own. This type can also be constructed using the Transport alias
+         * for backward compatibility.
+         * @param {string} [url] - The URL to connect to.
+         * @param {object} [options] - Options.
+         */
+        constructor(url?: string, options?: Object);
+
+        /**
+         * Gets the browser specific XmlHttpRequest Object.
+         * @returns {object} the browser XHR interface object
+         */
+        getXmlHttpRequestObject(): Object;
+
+        /**
+         * Sends the current XRH request if the transport was created with a URL and
+         * the async parameter if false. If the transport was not created with a URL
+         * or the async parameter is True or the URL is an empty string, the current
+         * send buffer is returned.
+         * @param {object} async - If true the current send buffer is returned.
+         * @param {function} callback - Optional async completion callback.
+         * @returns {undefined|string} Nothing or the current send buffer.
+         */
+        flush(async: any, callback?: Function): string;
+
+        /**
+         * Creates a jQuery XHR object to be used for a Thrift server call.
+         * @param {object} client - The Thrift Service client object generated by the IDL compiler.
+         * @param {object} postData - The message to send to the server.
+         * @param {function} args - The function to call if the request succeeds.
+         * @param {function} recv_method - The Thrift Service Client receive method for the call.
+         * @returns {object} A new jQuery XHR object.
+         */
+        jqRequest(client: Object, postData: any, args: Function, recv_method: Function): Object;
+
+        /**
+         * Sets the buffer to use when receiving server responses.
+         * @param {string} buf - The buffer to receive server responses.
+         */
+        setRecvBuffer(buf: string): void;
+
+        /**
+         * Returns true if the transport is open, in browser based JavaScript
+         * this function always returns true.
+         * @returns {boolean} Always True.
+         */
+        isOpen(): boolean;
+
+        /**
+         * Opens the transport connection, in browser based JavaScript
+         * this function is a nop.
+         */
+        open(): void;
+
+        /**
+         * Closes the transport connection, in browser based JavaScript
+         * this function is a nop.
+         */
+        close(): void;
+
+        /**
+         * Returns the specified number of characters from the response
+         * buffer.
+         * @param {number} len - The number of characters to return.
+         * @returns {string} Characters sent by the server.
+         */
+        read(len: number): string;
+
+        /**
+         * Returns the entire response buffer.
+         * @returns {string} Characters sent by the server.
+         */
+        readAll(): string;
+
+        /**
+         * Sets the send buffer to buf.
+         * @param {string} buf - The buffer to send.
+         */
+        write(buf: string): void;
+
+        /**
+         * Returns the send buffer.
+         * @returns {string} The send buffer.
+         */
+        getSendBuffer(): string;
+    }
+}
diff --git a/thrift/thrift-tests.ts b/thrift/thrift-tests.ts
index abe39678af..f437764bc9 100644
--- a/thrift/thrift-tests.ts
+++ b/thrift/thrift-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="thrift.d.ts"/>
-/// <reference path="../evernote/evernote.d.ts"/>
-
 // Currently, the thrift bindings are minimal just to support the thrift generated
 // evernote bindings. Add more tests if you flesh out and plan to use the thrift 
 // bindings more deeply.
diff --git a/thrift/thrift.d.ts b/thrift/thrift.d.ts
deleted file mode 100644
index 766173c1e6..0000000000
--- a/thrift/thrift.d.ts
+++ /dev/null
@@ -1,281 +0,0 @@
-// Type definitions for thrift 0.9.2
-// Project: https://www.npmjs.com/package/thrift
-// Definitions by: Zachary Collins <https://github.com/corps>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-declare module "thrift" {
-    export module Thrift {
-        /**
-         * Thrift IDL type string to Id mapping.
-         * @property {number}    STOP     - End of a set of fields.
-         * @property {number}    VOID     - No value (only legal for return types).
-         * @property {number}    BOOL     - True/False integer.
-         * @property {number}    BYTE     - Signed 8 bit integer.
-         * @property {number}    I08        - Signed 8 bit integer.
-         * @property {number}    DOUBLE - 64 bit IEEE 854 floating point.
-         * @property {number}    I16        - Signed 16 bit integer.
-         * @property {number}    I32        - Signed 32 bit integer.
-         * @property {number}    I64        - Signed 64 bit integer.
-         * @property {number}    STRING - Array of bytes representing a string of characters.
-         * @property {number}    UTF7     - Array of bytes representing a string of UTF7 encoded characters.
-         * @property {number}    STRUCT - A multifield type.
-         * @property {number}    MAP        - A collection type (map/associative-array/dictionary).
-         * @property {number}    SET        - A collection type (unordered and without repeated values).
-         * @property {number}    LIST     - A collection type (unordered).
-         * @property {number}    UTF8     - Array of bytes representing a string of UTF8 encoded characters.
-         * @property {number}    UTF16    - Array of bytes representing a string of UTF16 encoded characters.
-         */
-        interface Type {
-            'STOP': number;
-            'VOID': number;
-            'BOOL': number;
-            'BYTE': number;
-            'I08': number;
-            'DOUBLE': number;
-            'I16': number;
-            'I32': number;
-            'I64': number;
-            'STRING': number;
-            'UTF7': number;
-            'STRUCT': number;
-            'MAP': number;
-            'SET': number;
-            'LIST': number;
-            'UTF8': number;
-            'UTF16': number;
-        }
-        var Type: Type;
-
-        /**
-         * Thrift RPC message type string to Id mapping.
-         * @property {number}    CALL            - RPC call sent from client to server.
-         * @property {number}    REPLY         - RPC call normal response from server to client.
-         * @property {number}    EXCEPTION - RPC call exception response from server to client.
-         * @property {number}    ONEWAY        - Oneway RPC call from client to server with no response.
-         */
-        interface MessageType {
-            'CALL': number;
-            'REPLY': number;
-            'EXCEPTION': number;
-            'ONEWAY': number;
-        }
-        var MessageType: MessageType;
-
-        /**
-         * Utility function returning the count of an object's own properties.
-         * @param {object} obj - Object to test.
-         * @returns {number} number of object's own properties
-         */
-        function objectLength(obj: Object): number;
-
-        /**
-         * Utility function to establish prototype inheritance.
-         * @param {function} constructor - Contstructor function to set as derived.
-         * @param {function} superConstructor - Contstructor function to set as base.
-         * @param {string} [name] - Type name to set as name property in derived prototype.
-         */
-        function inherits(constructor: Function, superConstructor: Function, name?: string): void;
-
-        /**
-         * TException is the base class for all Thrift exceptions types.
-         */
-        class TException implements Error {
-            name: string;
-            message: string;
-
-            /**
-             * Initializes a Thrift TException instance.
-             * @param {string} message - The TException message (distinct from the Error message).
-             */
-            constructor(message: string);
-
-            /**
-             * Returns the message set on the exception.
-             * @returns {string} exception message
-             */
-            getMessage(): string;
-        }
-
-        /**
-         * Thrift Application Exception type string to Id mapping.
-         * @property {number}    UNKNOWN                                 - Unknown/undefined.
-         * @property {number}    UNKNOWN_METHOD                    - Client attempted to call a method unknown to the server.
-         * @property {number}    INVALID_MESSAGE_TYPE        - Client passed an unknown/unsupported MessageType.
-         * @property {number}    WRONG_METHOD_NAME             - Unused.
-         * @property {number}    BAD_SEQUENCE_ID                 - Unused in Thrift RPC, used to flag proprietary sequence number errors.
-         * @property {number}    MISSING_RESULT                    - Raised by a server processor if a handler fails to supply the required return result.
-         * @property {number}    INTERNAL_ERROR                    - Something bad happened.
-         * @property {number}    PROTOCOL_ERROR                    - The protocol layer failed to serialize or deserialize data.
-         * @property {number}    INVALID_TRANSFORM             - Unused.
-         * @property {number}    INVALID_PROTOCOL                - The protocol (or version) is not supported.
-         * @property {number}    UNSUPPORTED_CLIENT_TYPE - Unused.
-         */
-        interface TApplicationExceptionType {
-            'UNKNOWN': number;
-            'UNKNOWN_METHOD': number;
-            'INVALID_MESSAGE_TYPE': number;
-            'WRONG_METHOD_NAME': number;
-            'BAD_SEQUENCE_ID': number;
-            'MISSING_RESULT': number;
-            'INTERNAL_ERROR': number;
-            'PROTOCOL_ERROR': number;
-            'INVALID_TRANSFORM': number;
-            'INVALID_PROTOCOL': number;
-            'UNSUPPORTED_CLIENT_TYPE': number;
-        }
-        var TApplicationExceptionType: TApplicationExceptionType;
-
-        /**
-         * TApplicationException is the exception class used to propagate exceptions from an RPC server back to a calling client.
-         */
-        class TApplicationException extends TException {
-            message: string;
-            code: number;
-
-            /**
-             * Initializes a Thrift TApplicationException instance.
-             * @param {string} message - The TApplicationException message (distinct from the Error message).
-             * @param {Thrift.TApplicationExceptionType} [code] - The TApplicationExceptionType code.
-             */
-            constructor(message: string, code?: number);
-
-            /**
-             * Read a TApplicationException from the supplied protocol.
-             * @param {object} input - The input protocol to read from.
-             */
-            read(input: Object): void;
-
-            /**
-             * Write a TApplicationException to the supplied protocol.
-             * @param {object} output - The output protocol to write to.
-             */
-            write(output: Object): void;
-
-            /**
-             * Returns the application exception code set on the exception.
-             * @returns {Thrift.TApplicationExceptionType} exception code
-             */
-            getCode(): number;
-        }
-
-        /**
-         * The Apache Thrift Transport layer performs byte level I/O between RPC
-         * clients and servers. The JavaScript Transport object type uses Http[s]/XHR and is
-         * the sole browser based Thrift transport. Target servers must implement the http[s]
-         * transport (see: node.js example server).
-         */
-        class TXHRTransport {
-            url: string;
-            wpos: number;
-            rpos: number;
-            useCORS: any;
-            send_buf: string;
-            recv_buf: string;
-
-            /**
-             * If you do not specify a url then you must handle XHR operations on
-             * your own. This type can also be constructed using the Transport alias
-             * for backward compatibility.
-             * @param {string} [url] - The URL to connect to.
-             * @param {object} [options] - Options.
-             */
-            constructor(url?: string, options?: Object);
-
-            /**
-             * Gets the browser specific XmlHttpRequest Object.
-             * @returns {object} the browser XHR interface object
-             */
-            getXmlHttpRequestObject(): Object;
-
-            /**
-             * Sends the current XRH request if the transport was created with a URL and
-             * the async parameter if false. If the transport was not created with a URL
-             * or the async parameter is True or the URL is an empty string, the current
-             * send buffer is returned.
-             * @param {object} async - If true the current send buffer is returned.
-             * @param {function} callback - Optional async completion callback.
-             * @returns {undefined|string} Nothing or the current send buffer.
-             */
-            flush(async: any, callback?: Function): string;
-
-            /**
-             * Creates a jQuery XHR object to be used for a Thrift server call.
-             * @param {object} client - The Thrift Service client object generated by the IDL compiler.
-             * @param {object} postData - The message to send to the server.
-             * @param {function} args - The function to call if the request succeeds.
-             * @param {function} recv_method - The Thrift Service Client receive method for the call.
-             * @returns {object} A new jQuery XHR object.
-             */
-            jqRequest(client: Object, postData: any, args: Function, recv_method: Function): Object;
-
-            /**
-             * Sets the buffer to use when receiving server responses.
-             * @param {string} buf - The buffer to receive server responses.
-             */
-            setRecvBuffer(buf: string): void;
-
-            /**
-             * Returns true if the transport is open, in browser based JavaScript
-             * this function always returns true.
-             * @returns {boolean} Always True.
-             */
-            isOpen(): boolean;
-
-            /**
-             * Opens the transport connection, in browser based JavaScript
-             * this function is a nop.
-             */
-            open(): void;
-
-            /**
-             * Closes the transport connection, in browser based JavaScript
-             * this function is a nop.
-             */
-            close(): void;
-
-            /**
-             * Returns the specified number of characters from the response
-             * buffer.
-             * @param {number} len - The number of characters to return.
-             * @returns {string} Characters sent by the server.
-             */
-            read(len: number): string;
-
-            /**
-             * Returns the entire response buffer.
-             * @returns {string} Characters sent by the server.
-             */
-            readAll(): string;
-
-            /**
-             * Sets the send buffer to buf.
-             * @param {string} buf - The buffer to send.
-             */
-            write(buf: string): void;
-
-            /**
-             * Returns the send buffer.
-             * @returns {string} The send buffer.
-             */
-            getSendBuffer(): string;
-        }
-    }
-}
diff --git a/thrift/tsconfig.json b/thrift/tsconfig.json
new file mode 100644
index 0000000000..cfbe779827
--- /dev/null
+++ b/thrift/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "thrift-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/through/index.d.ts b/through/index.d.ts
new file mode 100644
index 0000000000..71397ad8d9
--- /dev/null
+++ b/through/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for through
+// Project: https://github.com/dominictarr/through
+// Definitions by: Andrew Gaspar <https://github.com/AndrewGaspar/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import stream = require("stream");
+
+declare function through(write?: (data: any) => void,
+    end?: () => void,
+    opts?: {
+        autoDestroy: boolean;
+    }): through.ThroughStream;
+
+declare namespace through {
+    export interface ThroughStream extends stream.Transform {
+        autoDestroy: boolean;
+    }
+}
+
+export = through;
diff --git a/through/through-tests.ts b/through/through-tests.ts
index 83f8e8780e..55836a21b7 100644
--- a/through/through-tests.ts
+++ b/through/through-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./through.d.ts" />
 
 import through = require('through');
 
diff --git a/through/through.d.ts b/through/through.d.ts
deleted file mode 100644
index b0d49fc533..0000000000
--- a/through/through.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Type definitions for through
-// Project: https://github.com/dominictarr/through
-// Definitions by: Andrew Gaspar <https://github.com/AndrewGaspar/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "through" {
-    import stream = require("stream");
-
-    function through(write?: (data: any) => void,
-        end?: () => void,
-        opts?: {
-            autoDestroy: boolean;
-        }): through.ThroughStream;
-
-    namespace through {
-        export interface ThroughStream extends stream.Transform {
-            autoDestroy: boolean;
-        }
-    }
-
-    export = through;
-}
diff --git a/through/tsconfig.json b/through/tsconfig.json
new file mode 100644
index 0000000000..170450bffe
--- /dev/null
+++ b/through/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "through-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/through2/index.d.ts b/through2/index.d.ts
new file mode 100644
index 0000000000..7578f3cd26
--- /dev/null
+++ b/through2/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for through2 v 2.0.0
+// Project: https://github.com/rvagg/through2
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, jedmao <https://github.com/jedmao>, Georgios Valotasios <https://github.com/valotas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+import stream = require('stream');
+
+type TransfofmCallback = (err?: any, data?: any) => void;
+type TransformFunction = (chunk: any, enc: string, callback: TransfofmCallback) => void;
+type FlashCallback = (flushCallback: () => void) => void;
+
+declare function through2(transform?: TransformFunction, flush?: FlashCallback): NodeJS.ReadWriteStream;
+
+declare function through2(opts?: stream.DuplexOptions, transform?: TransformFunction, flush?: FlashCallback): NodeJS.ReadWriteStream;
+
+declare namespace through2 {
+
+    export function obj(transform?: TransformFunction, flush?: FlashCallback): NodeJS.ReadWriteStream;
+
+    export function push(data: any): void;
+
+}
+
+export = through2;
diff --git a/through2/through2-0.4.2-test.ts b/through2/through2-0.4.2-test.ts
index 79bfef2e27..9308908648 100644
--- a/through2/through2-0.4.2-test.ts
+++ b/through2/through2-0.4.2-test.ts
@@ -1,5 +1,5 @@
-/// <reference path="./through2-0.4.2.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import through2 = require('through2');
 
diff --git a/through2/through2-0.4.2.d.ts b/through2/through2-0.4.2.d.ts
index b2eddf0e9c..523a837346 100644
--- a/through2/through2-0.4.2.d.ts
+++ b/through2/through2-0.4.2.d.ts
@@ -3,24 +3,22 @@
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>, jedmao <https://github.com/jedmao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../node/node.d.ts" />
+/// <reference types="node" />
 
-declare module 'through2' {
 
-	import stream = require('stream');
 
-	function through2(transform?: (chunk: any, enc: string, callback: () => void) => void, flush?: () => void): NodeJS.ReadWriteStream;
+import stream = require('stream');
 
-	function through2(opts?: stream.DuplexOptions, transform?: (chunk: any, enc: string, callback: () => void) => void, flush?: () => void): NodeJS.ReadWriteStream;
+declare function through2(transform?: (chunk: any, enc: string, callback: () => void) => void, flush?: () => void): NodeJS.ReadWriteStream;
 
-	namespace through2 {
+declare function through2(opts?: stream.DuplexOptions, transform?: (chunk: any, enc: string, callback: () => void) => void, flush?: () => void): NodeJS.ReadWriteStream;
 
-		export function obj(transform?: (chunk: any, enc: string, callback: () => void) => void, flush?: () => void): NodeJS.ReadWriteStream;
+declare namespace through2 {
 
-		export function push(data: any): void;
+    export function obj(transform?: (chunk: any, enc: string, callback: () => void) => void, flush?: () => void): NodeJS.ReadWriteStream;
 
-	}
-
-	export = through2;
+    export function push(data: any): void;
 
 }
+
+export = through2;
diff --git a/through2/through2-tests.ts b/through2/through2-tests.ts
index e6f97fb712..8c6c410ddc 100644
--- a/through2/through2-tests.ts
+++ b/through2/through2-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="./through2.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import through2 = require('through2');
 
diff --git a/through2/through2.d.ts b/through2/through2.d.ts
deleted file mode 100644
index 77cc817caa..0000000000
--- a/through2/through2.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Type definitions for through2 v 2.0.0
-// Project: https://github.com/rvagg/through2
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, jedmao <https://github.com/jedmao>, Georgios Valotasios <https://github.com/valotas>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'through2' {
-
-	import stream = require('stream');
-
-	type TransfofmCallback = (err?: any, data?: any) => void;
-	type TransformFunction = (chunk: any, enc: string, callback: TransfofmCallback) => void;
-	type FlashCallback = (flushCallback: () => void) => void;
-
-	function through2(transform?: TransformFunction, flush?: FlashCallback): NodeJS.ReadWriteStream;
-
-	function through2(opts?: stream.DuplexOptions, transform?: TransformFunction, flush?: FlashCallback): NodeJS.ReadWriteStream;
-
-	namespace through2 {
-
-		export function obj(transform?: TransformFunction, flush?: FlashCallback): NodeJS.ReadWriteStream;
-
-		export function push(data: any): void;
-
-	}
-
-	export = through2;
-
-}
diff --git a/through2/tsconfig.json b/through2/tsconfig.json
new file mode 100644
index 0000000000..24f8701558
--- /dev/null
+++ b/through2/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "through2-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/timelinejs/timelinejs.d.ts b/timelinejs/index.d.ts
similarity index 100%
rename from timelinejs/timelinejs.d.ts
rename to timelinejs/index.d.ts
diff --git a/timelinejs/timelinejs-tests.ts b/timelinejs/timelinejs-tests.ts
index da6aef9669..62255b3590 100644
--- a/timelinejs/timelinejs-tests.ts
+++ b/timelinejs/timelinejs-tests.ts
@@ -1,7 +1,6 @@
 /**
  * Created by Roland on 6/15/2014.
  */
-///<reference path='timelinejs.d.ts'/>
 
 var timelineSource:knightlab.ITimelineModel = {
     timeline: {
diff --git a/timelinejs/tsconfig.json b/timelinejs/tsconfig.json
new file mode 100644
index 0000000000..09a409e115
--- /dev/null
+++ b/timelinejs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "timelinejs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/timezone-js/index.d.ts b/timezone-js/index.d.ts
new file mode 100644
index 0000000000..5a648ab41e
--- /dev/null
+++ b/timezone-js/index.d.ts
@@ -0,0 +1,92 @@
+// Type definitions for timezone-js
+// Project: https://github.com/mde/timezone-js
+// Definitions by: bonnici <https://github.com/bonnici>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/timezone-js.d.ts
+
+
+export declare var timezone: TimezoneJs;
+
+export declare class Date {
+    constructor(timezone?: string);
+    // Note due to naming conflict I have not found a way to introduce the constructor
+    // that takes a regular Date object. Instead, I defined it to take an Object.
+    constructor(date: Object, timezone?: string);
+    constructor(utcMillis: number, timezone?: string);
+    constructor(time: string, timezone?: string);
+    constructor(year?: number, month?: number, day?: number, hour?: number, minute?: number, second?: number, millisecond?: number, timezone?: string);
+    setTimezone: (timezone: string) => void;
+
+    // regular Date members
+    toString(): string;
+    toDateString(): string;
+    toTimeString(): string;
+    toLocaleString(): string;
+    toLocaleDateString(): string;
+    toLocaleTimeString(): string;
+    valueOf(): number;
+    getTime(): number;
+    getFullYear(): number;
+    getUTCFullYear(): number;
+    getMonth(): number;
+    getUTCMonth(): number;
+    getDate(): number;
+    getUTCDate(): number;
+    getDay(): number;
+    getUTCDay(): number;
+    getHours(): number;
+    getUTCHours(): number;
+    getMinutes(): number;
+    getUTCMinutes(): number;
+    getSeconds(): number;
+    getUTCSeconds(): number;
+    getMilliseconds(): number;
+    getUTCMilliseconds(): number;
+    getTimezoneOffset(): number;
+    setTime(time: number): number;
+
+    // Note the setters have a non-void return type. Date has them as well, according to TypeScript 
+    setMilliseconds(ms: number): number;
+    setUTCMilliseconds(ms: number): number;
+    setSeconds(sec: number, ms?: number): number;
+    setUTCSeconds(sec: number, ms?: number): number;
+    setMinutes(min: number, sec?: number, ms?: number): number;
+    setUTCMinutes(min: number, sec?: number, ms?: number): number;
+    setHours(hours: number, min?: number, sec?: number, ms?: number): number;
+    setUTCHours(hours: number, min?: number, sec?: number, ms?: number): number;
+    setDate(date: number): number;
+    setUTCDate(date: number): number;
+    setMonth(month: number, date?: number): number;
+    setUTCMonth(month: number, date?: number): number;
+    setFullYear(year: number, month?: number, date?: number): number;
+    setUTCFullYear(year: number, month?: number, date?: number): number;
+    toUTCString(): string;
+    toISOString(): string;
+    toJSON(key?: any): string;
+}
+
+
+export interface TimezoneJs {
+    zoneFileBasePath: string;
+    loadingScheme: number;
+    loadingSchemes: TimezoneJsLoadingSchemes;
+
+    transport(opts: TimezoneJsOptions): any;
+    init(opts?: TimezoneJsOptions): any;
+    getAllZones(): string[];
+    loadZoneDataFromObject(obj: Object): void;
+}
+
+export interface TimezoneJsOptions {
+    async?: boolean;
+    success?: (data: string) => void;
+    error?: (err: Error) => void;
+    url?: string;
+}
+
+export declare class TimezoneJsLoadingSchemes {
+    PRELOAD_ALL: number;
+    LAZY_LOAD: number;
+    MANUAL_LOAD: number;
+}
diff --git a/timezone-js/timezone-js-tests.ts b/timezone-js/timezone-js-tests.ts
index 9484d16406..c85e8329b9 100644
--- a/timezone-js/timezone-js-tests.ts
+++ b/timezone-js/timezone-js-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="timezone-js.d.ts" />
 
 import timezone = require('timezone-js');
 var tz = timezone.timezone;
diff --git a/timezone-js/timezone-js.d.ts b/timezone-js/timezone-js.d.ts
deleted file mode 100644
index 4af5c69762..0000000000
--- a/timezone-js/timezone-js.d.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-// Type definitions for timezone-js
-// Project: https://github.com/mde/timezone-js
-// Definitions by: bonnici <https://github.com/bonnici>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/timezone-js.d.ts
-
-declare module "timezone-js" {
-	export var timezone: TimezoneJs;
-
-	export class Date {
-		constructor(timezone?: string);
-		// Note due to naming conflict I have not found a way to introduce the constructor
-		// that takes a regular Date object. Instead, I defined it to take an Object.
-		constructor(date: Object, timezone?: string);
-		constructor(utcMillis: number, timezone?: string);
-		constructor(time: string, timezone?: string);
-		constructor(year?: number, month?: number, day?: number, hour?: number, minute?: number, second?: number, millisecond?: number, timezone?: string);
-		setTimezone: (timezone: string) => void;
-
-		// regular Date members
-		toString(): string;
-		toDateString(): string;
-		toTimeString(): string;
-		toLocaleString(): string;
-		toLocaleDateString(): string;
-		toLocaleTimeString(): string;
-		valueOf(): number;
-		getTime(): number;
-		getFullYear(): number;
-		getUTCFullYear(): number;
-		getMonth(): number;
-		getUTCMonth(): number;
-		getDate(): number;
-		getUTCDate(): number;
-		getDay(): number;
-		getUTCDay(): number;
-		getHours(): number;
-		getUTCHours(): number;
-		getMinutes(): number;
-		getUTCMinutes(): number;
-		getSeconds(): number;
-		getUTCSeconds(): number;
-		getMilliseconds(): number;
-		getUTCMilliseconds(): number;
-		getTimezoneOffset(): number;
-		setTime(time: number): number;
-
-		// Note the setters have a non-void return type. Date has them as well, according to TypeScript 
-		setMilliseconds(ms: number): number;
-		setUTCMilliseconds(ms: number): number;
-		setSeconds(sec: number, ms?: number): number;
-		setUTCSeconds(sec: number, ms?: number): number;
-		setMinutes(min: number, sec?: number, ms?: number): number;
-		setUTCMinutes(min: number, sec?: number, ms?: number): number;
-		setHours(hours: number, min?: number, sec?: number, ms?: number): number;
-		setUTCHours(hours: number, min?: number, sec?: number, ms?: number): number;
-		setDate(date: number): number;
-		setUTCDate(date: number): number;
-		setMonth(month: number, date?: number): number;
-		setUTCMonth(month: number, date?: number): number;
-		setFullYear(year: number, month?: number, date?: number): number;
-		setUTCFullYear(year: number, month?: number, date?: number): number;
-		toUTCString(): string;
-		toISOString(): string;
-		toJSON(key?: any): string;
-	}
-
-
-	export interface TimezoneJs {
-		zoneFileBasePath: string;
-		loadingScheme: number;
-		loadingSchemes: TimezoneJsLoadingSchemes;
-
-		transport(opts: TimezoneJsOptions): any;
-		init(opts?: TimezoneJsOptions): any;
-		getAllZones(): string[];
-		loadZoneDataFromObject(obj: Object): void;
-	}
-
-	export interface TimezoneJsOptions {
-		async?: boolean;
-		success?: (data: string) => void;
-		error?: (err: Error) => void;
-		url?: string;
-	}
-
-	export class TimezoneJsLoadingSchemes {
-		PRELOAD_ALL: number;
-		LAZY_LOAD: number;
-		MANUAL_LOAD: number;
-	}
- }
diff --git a/timezone-js/tsconfig.json b/timezone-js/tsconfig.json
new file mode 100644
index 0000000000..c1987a8f4d
--- /dev/null
+++ b/timezone-js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "timezone-js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/timezonecomplete/timezonecomplete.d.ts b/timezonecomplete/index.d.ts
similarity index 100%
rename from timezonecomplete/timezonecomplete.d.ts
rename to timezonecomplete/index.d.ts
diff --git a/timezonecomplete/timezonecomplete-tests.ts b/timezonecomplete/timezonecomplete-tests.ts
index b08cb20b64..8c6d14cad7 100644
--- a/timezonecomplete/timezonecomplete-tests.ts
+++ b/timezonecomplete/timezonecomplete-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="timezonecomplete.d.ts" />
+
 
 import tc = require("timezonecomplete");
 
diff --git a/timezonecomplete/tsconfig.json b/timezonecomplete/tsconfig.json
new file mode 100644
index 0000000000..3150a742c6
--- /dev/null
+++ b/timezonecomplete/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "timezonecomplete-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tinycolor/tinycolor.d.ts b/tinycolor/index.d.ts
similarity index 100%
rename from tinycolor/tinycolor.d.ts
rename to tinycolor/index.d.ts
diff --git a/tinycolor/tinycolor-tests.ts b/tinycolor/tinycolor-tests.ts
index b0903b5941..f7749fbf5d 100644
--- a/tinycolor/tinycolor-tests.ts
+++ b/tinycolor/tinycolor-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="tinycolor.d.ts" />
+
 
 /*
  * Not all possible formats for construction are displayed.
diff --git a/tinycolor/tsconfig.json b/tinycolor/tsconfig.json
new file mode 100644
index 0000000000..6c32f7cc7a
--- /dev/null
+++ b/tinycolor/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "tinycolor-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/titanium/titanium.d.ts b/titanium/index.d.ts
similarity index 100%
rename from titanium/titanium.d.ts
rename to titanium/index.d.ts
diff --git a/titanium/titanium-tests.ts b/titanium/titanium-tests.ts
index 79688cd5ff..9113f49835 100644
--- a/titanium/titanium-tests.ts
+++ b/titanium/titanium-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="titanium.d.ts" />
+
 
 function test_window() {
 	var window: Ti.UI.Window = Ti.UI.createWindow({
diff --git a/titanium/tsconfig.json b/titanium/tsconfig.json
new file mode 100644
index 0000000000..a16d84f634
--- /dev/null
+++ b/titanium/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "titanium-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/title-case/index.d.ts b/title-case/index.d.ts
new file mode 100644
index 0000000000..cec8a49c43
--- /dev/null
+++ b/title-case/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for title-case
+// Project: https://github.com/blakeembrey/title-case
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function titleCase(string1: string, string2?: string): string;
+export = titleCase;
diff --git a/title-case/title-case-tests.ts b/title-case/title-case-tests.ts
index d1183db8f1..aed51f2d2a 100644
--- a/title-case/title-case-tests.ts
+++ b/title-case/title-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="title-case.d.ts" />
 
 import titleCase = require('title-case');
 
diff --git a/title-case/title-case.d.ts b/title-case/title-case.d.ts
deleted file mode 100644
index 914b7f75c9..0000000000
--- a/title-case/title-case.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for title-case
-// Project: https://github.com/blakeembrey/title-case
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "title-case" {
-	function titleCase(string1: string, string2?: string): string;
-	export = titleCase;
-}
\ No newline at end of file
diff --git a/title-case/tsconfig.json b/title-case/tsconfig.json
new file mode 100644
index 0000000000..2fd9d404c1
--- /dev/null
+++ b/title-case/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "title-case-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tmp/index.d.ts b/tmp/index.d.ts
new file mode 100644
index 0000000000..d4597d0e37
--- /dev/null
+++ b/tmp/index.d.ts
@@ -0,0 +1,47 @@
+// Type definitions for tmp v0.0.28
+// Project: https://www.npmjs.com/package/tmp
+// Definitions by: Jared Klopper <https://github.com/optical>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare namespace tmp {
+    interface Options extends SimpleOptions {
+        mode?: number;
+    }
+
+    interface SimpleOptions {
+        prefix?: string;
+        postfix?: string;
+        template?: string;
+        dir?: string;
+        tries?: number;
+        keep?: boolean;
+        unsafeCleanup?: boolean;
+    }
+
+    interface SynchrounousResult {
+        name: string;
+        fd: number;
+        removeCallback: () => void;
+    }
+
+    function file(callback: (err: any, path: string, fd: number, cleanupCallback: () => void) => void): void;
+    function file(config: Options, callback?: (err: any, path: string, fd: number, cleanupCallback: () => void) => void): void;
+
+    function fileSync(config?: Options): SynchrounousResult;
+
+    function dir(callback: (err: any, path: string, cleanupCallback: () => void) => void): void;
+    function dir(config: Options, callback?: (err: any, path: string, cleanupCallback: () => void) => void): void;
+
+    function dirSync(config?: Options): SynchrounousResult;
+
+    function tmpName(callback: (err: any, path: string) => void): void;
+    function tmpName(config: SimpleOptions, callback?: (err: any, path: string) => void): void;
+
+    function tmpNameSync(config?: SimpleOptions): string;
+
+    function setGracefulCleanup(): void;
+}
+
+export = tmp;
diff --git a/tmp/tmp-tests.ts b/tmp/tmp-tests.ts
index c343f52788..fe8b31fd6a 100644
--- a/tmp/tmp-tests.ts
+++ b/tmp/tmp-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="tmp.d.ts" />
-import tmp = require('tmp');
+import tmp = require('tmp');
 
 tmp.file((err, path, fd, cleanupCallback) => {
 	if (err) throw err;
diff --git a/tmp/tmp.d.ts b/tmp/tmp.d.ts
deleted file mode 100644
index eb8e24ca1a..0000000000
--- a/tmp/tmp.d.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-// Type definitions for tmp v0.0.28
-// Project: https://www.npmjs.com/package/tmp
-// Definitions by: Jared Klopper <https://github.com/optical>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "tmp" {
-
-	namespace tmp {
-		interface Options extends SimpleOptions {
-			mode?: number;
-		}
-
-		interface SimpleOptions {
-			prefix?: string;
-			postfix?: string;
-			template?: string;
-			dir?: string;
-			tries?: number;
-			keep?: boolean;
-			unsafeCleanup?: boolean;
-		}
-
-		interface SynchrounousResult {
-			name: string;
-			fd: number;
-			removeCallback: () => void;
-		}
-
-		function file(callback: (err: any, path: string, fd: number, cleanupCallback: () => void) => void): void;
-		function file(config: Options, callback?: (err: any, path: string, fd: number, cleanupCallback: () => void) => void): void;
-
-		function fileSync(config?: Options): SynchrounousResult;
-
-		function dir(callback: (err: any, path: string, cleanupCallback: () => void) => void): void;
-		function dir(config: Options, callback?: (err: any, path: string, cleanupCallback: () => void) => void): void;
-
-		function dirSync(config?: Options): SynchrounousResult;
-
-		function tmpName(callback: (err: any, path: string) => void): void;
-		function tmpName(config: SimpleOptions, callback?: (err: any, path: string) => void): void;
-
-		function tmpNameSync(config?: SimpleOptions): string;
-
-		function setGracefulCleanup(): void;
-	}
-
-	export = tmp;
-}
diff --git a/tmp/tsconfig.json b/tmp/tsconfig.json
new file mode 100644
index 0000000000..dc2438af8c
--- /dev/null
+++ b/tmp/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "tmp-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/to-title-case-gouch/to-title-case-gouch.d.ts b/to-title-case-gouch/index.d.ts
similarity index 100%
rename from to-title-case-gouch/to-title-case-gouch.d.ts
rename to to-title-case-gouch/index.d.ts
diff --git a/to-title-case-gouch/to-title-case-gouch-tests.ts b/to-title-case-gouch/to-title-case-gouch-tests.ts
index 68e0a616b0..c574c9e683 100644
--- a/to-title-case-gouch/to-title-case-gouch-tests.ts
+++ b/to-title-case-gouch/to-title-case-gouch-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../node/node.d.ts" />
-/// <reference path="to-title-case-gouch.d.ts" />
+/// <reference types="node" />
+
 
 import fs = require('fs');
 
diff --git a/to-title-case-gouch/tsconfig.json b/to-title-case-gouch/tsconfig.json
new file mode 100644
index 0000000000..6953c571bd
--- /dev/null
+++ b/to-title-case-gouch/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "to-title-case-gouch-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/toastr/index.d.ts b/toastr/index.d.ts
new file mode 100644
index 0000000000..c042767a23
--- /dev/null
+++ b/toastr/index.d.ts
@@ -0,0 +1,209 @@
+// Type definitions for Toastr 2.0.1
+// Project: https://github.com/CodeSeven/toastr
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/// <reference types="jquery" />
+
+interface ToastrOptions {
+	/**
+	* Optionally override the animation easing to show or hide the toasts. Default is swing. swing and linear are built into jQuery.
+	*/
+	showEasing?: string;
+	/**
+	* Optionally override the animation easing to show or hide the toasts. Default is swing. swing and linear are built into jQuery.
+	*/
+	hideEasing?: string;
+	/**
+	* Use the jQuery show/hide method of your choice. These default to fadeIn/fadeOut. The methods fadeIn/fadeOut, slideDown/slideUp, and show/hide are built into jQuery.
+	*/
+	showMethod?: string;
+	/**
+	* Use the jQuery show/hide method of your choice. These default to fadeIn/fadeOut. The methods fadeIn/fadeOut, slideDown/slideUp, and show/hide are built into jQuery.
+	*/
+	hideMethod?: string;
+	/**
+	* Should a close button be shown
+	*/
+	closeButton?: boolean;
+	/**
+	* Html for the close button
+	*/
+	closeHtml?: string;
+	/**
+	* Should clicking on toast dismiss it?
+	*/
+	tapToDismiss?: boolean;
+	/**
+	* CSS class the toast element will be given
+	*/
+	toastClass?: string;
+	/**
+	* Id toast container will be given
+	*/
+	containerId?: string;
+	/**
+	* Should debug details be outputted to the console
+	*/
+	debug?: boolean;
+	/**
+	* Time in milliseconds the toast should take to show
+	*/
+	showDuration?: number;
+	/**
+	* onShown function callback
+	**/
+	onShown?: () => void;
+	/**
+	* Time in milliseconds the toast should take to hide
+	*/
+	hideDuration?: number;
+	/**
+	* onHidden function callback
+	**/
+	onHidden?: () => void;
+	/**
+	* Time in milliseconds the toast should be displayed after mouse over
+	*/
+	extendedTimeOut?: number;
+	iconClasses?: {
+		/**
+		* Icon to use on error toasts
+		*/
+		error: string;
+		/**
+		* Icon to use on info toasts
+		*/
+		info: string;
+		/**
+		* Icon to use on success toasts
+		*/
+		success: string;
+		/**
+		* Icon to use on warning toasts
+		*/
+		warning: string;
+	};
+	/**
+	* Icon to use for toast
+	*/
+	iconClass?: string;
+	/**
+	* Where toast should be displayed
+	*/
+	positionClass?: string;
+	/**
+	* Where toast should be displayed - background
+	*/
+	backgroundpositionClass?: string;
+	/**
+	* Time in milliseconds that the toast should be displayed
+	*/
+	timeOut?: number;
+	/**
+	* CSS class the title element will be given
+	*/
+	titleClass?: string;
+	/**
+	* CSS class the message element will be given
+	*/
+	messageClass?: string;
+	/**
+	* Set newest toast to appear on top
+	**/
+	newestOnTop?: boolean;
+	/**
+	* The element to put the toastr container
+	**/
+	target?: string;
+	/**
+	* Rather than having identical toasts stack, set the preventDuplicates property to true. Duplicates are matched to the previous toast based on their message content.
+	*/
+	preventDuplicates?: boolean;
+	/**
+	* Visually indicates how long before a toast expires.
+	*/
+	progressBar?: boolean;
+	/**
+	* Function to execute on toast click
+	*/
+	onclick?: () => void;
+	/**
+	* Set if toastr should parse containing html 
+	**/
+	allowHtml?: boolean;
+}
+
+interface ToastrDisplayMethod {
+	/**
+	* Create a toast
+	*
+	* @param message Message to display in toast
+	*/
+	(message: string): JQuery;
+	/**
+	* Create a toast
+	*
+	* @param message Message to display in toast
+	* @param title Title to display on toast
+	*/
+	(message: string, title: string): JQuery;
+	/**
+	* Create a toast
+	*
+	* @param message Message to display in toast
+	* @param title Title to display on toast
+	* @param overrides Option values for toast
+	*/
+	(message: string, title: string, overrides: ToastrOptions): JQuery;
+}
+
+interface Toastr {
+	/**
+	* Clear toasts
+	*/
+	clear: {
+		/**
+		* Clear all toasts
+		*/
+		(): void;
+		/**
+		* Clear specific toast
+		* 
+		* @param toast Toast to clear
+		*/
+		(toast: JQuery): void;
+	};
+	/**
+	* Create an error toast
+	*/
+	error: ToastrDisplayMethod;
+	/**
+	* Create an info toast
+	*/
+	info: ToastrDisplayMethod;
+	/**
+	* Create an options object
+	*/
+	options: ToastrOptions;
+	/**
+	* Create a success toast
+	*/
+	success: ToastrDisplayMethod;
+	/**
+	* Create a warning toast
+	*/
+	warning: ToastrDisplayMethod;
+	/**
+	* Get toastr version 
+	*/
+	version: string;
+
+	[key: string]: any;
+}
+
+declare var toastr: Toastr;
+declare module "toastr" {
+	export = toastr;
+}
diff --git a/toastr/toastr-tests.ts b/toastr/toastr-tests.ts
index adacb19340..d005191dd2 100644
--- a/toastr/toastr-tests.ts
+++ b/toastr/toastr-tests.ts
@@ -1,7 +1,7 @@
-/// <reference path="toastr.d.ts" />
+
 
 function test_basic() {
-    var t = [];
+    var t: any[] = [];
     t.push(toastr.info('Are you the 6 fingered man?'));
     t.push(toastr.warning('My name is Inigo Montoya. You Killed my father, prepare to die!'));
     t.push(toastr.success('Have fun storming the castle!', 'Miracle Max Says'));
@@ -19,7 +19,7 @@ function test_basic() {
 function test_fromdemo() {
     var i = -1,
         toastCount = 0,
-        $toastlast,
+        $toastlast: any,
         getMessage = function () {
             var msgs = ['My name is Inigo Montoya. You killed my father. Prepare to die!',
                 '<div><input class="input-small" value="textbox"/>&nbsp;<a href="http://johnpapa.net" target="_blank">This is a hyperlink</a></div><div><button type="button" id="okBtn" class="btn btn-primary">Close me</button><button type="button" id="surpriseBtn" class="btn" style="margin: 0 8px 0 8px">Surprise me</button></div>',
diff --git a/toastr/toastr-tests.ts.tscparams b/toastr/toastr-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/toastr/toastr-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/toastr/toastr.d.ts b/toastr/toastr.d.ts
deleted file mode 100644
index edf65d4073..0000000000
--- a/toastr/toastr.d.ts
+++ /dev/null
@@ -1,207 +0,0 @@
-// Type definitions for Toastr 2.0.1
-// Project: https://github.com/CodeSeven/toastr
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface ToastrOptions {
-	/**
-	* Optionally override the animation easing to show or hide the toasts. Default is swing. swing and linear are built into jQuery.
-	*/
-	showEasing?: string;
-	/**
-	* Optionally override the animation easing to show or hide the toasts. Default is swing. swing and linear are built into jQuery.
-	*/
-	hideEasing?: string;
-	/**
-	* Use the jQuery show/hide method of your choice. These default to fadeIn/fadeOut. The methods fadeIn/fadeOut, slideDown/slideUp, and show/hide are built into jQuery.
-	*/
-	showMethod?: string;
-	/**
-	* Use the jQuery show/hide method of your choice. These default to fadeIn/fadeOut. The methods fadeIn/fadeOut, slideDown/slideUp, and show/hide are built into jQuery.
-	*/
-	hideMethod?: string;
-	/**
-	* Should a close button be shown
-	*/
-	closeButton?: boolean;
-	/**
-	* Html for the close button
-	*/
-	closeHtml?: string;
-	/**
-	* Should clicking on toast dismiss it?
-	*/
-	tapToDismiss?: boolean;
-	/**
-	* CSS class the toast element will be given
-	*/
-	toastClass?: string;
-	/**
-	* Id toast container will be given
-	*/
-	containerId?: string;
-	/**
-	* Should debug details be outputted to the console
-	*/
-	debug?: boolean;
-	/**
-	* Time in milliseconds the toast should take to show
-	*/
-	showDuration?: number;
-	/**
-	* onShown function callback
-	**/
-	onShown?: () => void;
-	/**
-	* Time in milliseconds the toast should take to hide
-	*/
-	hideDuration?: number;
-	/**
-	* onHidden function callback
-	**/
-	onHidden?: () => void;
-	/**
-	* Time in milliseconds the toast should be displayed after mouse over
-	*/
-	extendedTimeOut?: number;
-	iconClasses?: {
-		/**
-		* Icon to use on error toasts
-		*/
-		error: string;
-		/**
-		* Icon to use on info toasts
-		*/
-		info: string;
-		/**
-		* Icon to use on success toasts
-		*/
-		success: string;
-		/**
-		* Icon to use on warning toasts
-		*/
-		warning: string;
-	};
-	/**
-	* Icon to use for toast
-	*/
-	iconClass?: string;
-	/**
-	* Where toast should be displayed
-	*/
-	positionClass?: string;
-	/**
-	* Where toast should be displayed - background
-	*/
-	backgroundpositionClass?: string;
-	/**
-	* Time in milliseconds that the toast should be displayed
-	*/
-	timeOut?: number;
-	/**
-	* CSS class the title element will be given
-	*/
-	titleClass?: string;
-	/**
-	* CSS class the message element will be given
-	*/
-	messageClass?: string;
-	/**
-	* Set newest toast to appear on top
-	**/
-	newestOnTop?: boolean;
-	/**
-	* The element to put the toastr container
-	**/
-	target?: string;
-	/**
-	* Rather than having identical toasts stack, set the preventDuplicates property to true. Duplicates are matched to the previous toast based on their message content.
-	*/
-	preventDuplicates?: boolean;
-	/**
-	* Visually indicates how long before a toast expires.
-	*/
-	progressBar?: boolean;
-	/**
-	* Function to execute on toast click
-	*/
-	onclick?: () => void;
-	/**
-	* Set if toastr should parse containing html 
-	**/
-	allowHtml?: boolean;
-}
-
-interface ToastrDisplayMethod {
-	/**
-	* Create a toast
-	*
-	* @param message Message to display in toast
-	*/
-	(message: string): JQuery;
-	/**
-	* Create a toast
-	*
-	* @param message Message to display in toast
-	* @param title Title to display on toast
-	*/
-	(message: string, title: string): JQuery;
-	/**
-	* Create a toast
-	*
-	* @param message Message to display in toast
-	* @param title Title to display on toast
-	* @param overrides Option values for toast
-	*/
-	(message: string, title: string, overrides: ToastrOptions): JQuery;
-}
-
-interface Toastr {
-	/**
-	* Clear toasts
-	*/
-	clear: {
-		/**
-		* Clear all toasts
-		*/
-		(): void;
-		/**
-		* Clear specific toast
-		* 
-		* @param toast Toast to clear
-		*/
-		(toast: JQuery): void;
-	};
-	/**
-	* Create an error toast
-	*/
-	error: ToastrDisplayMethod;
-	/**
-	* Create an info toast
-	*/
-	info: ToastrDisplayMethod;
-	/**
-	* Create an options object
-	*/
-	options: ToastrOptions;
-	/**
-	* Create a success toast
-	*/
-	success: ToastrDisplayMethod;
-	/**
-	* Create a warning toast
-	*/
-	warning: ToastrDisplayMethod;
-	/**
-	* Get toastr version 
-	*/
-	version: string;
-}
-
-declare var toastr: Toastr;
-declare module "toastr" {
-	export = toastr;
-}
diff --git a/toastr/tsconfig.json b/toastr/tsconfig.json
new file mode 100644
index 0000000000..48077330a0
--- /dev/null
+++ b/toastr/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "toastr-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tooltipster/index.d.ts b/tooltipster/index.d.ts
new file mode 100644
index 0000000000..b4450f794d
--- /dev/null
+++ b/tooltipster/index.d.ts
@@ -0,0 +1,278 @@
+// Type definitions for tooltipster
+// Project: https://github.com/iamceege/tooltipster
+// Definitions by: Stephen Lautier <https://github.com/stephenlautier>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+
+declare namespace JQueryTooltipster {
+	/**
+	* Tooltipster options @see http://iamceege.github.io/tooltipster/
+	*/
+	export interface ITooltipsterOptions {
+
+		/**
+		 * Determines how the tooltip will animate in and out. Feel free to modify or create custom transitions in the tooltipster.css file.
+		 * In IE9 and 8, all animations default to a JavaScript generated, fade animation. Default: 'fade'
+		 */
+		animation?: string;
+
+		/**
+		 * Adds the "speech bubble arrow" to the tooltip. Default: true
+		 */
+		arrow?: boolean;
+
+		/**
+		 * Select a specific color for the "speech bubble arrow". Default: will inherit the tooltip's background color
+		 */
+		arrowColor?: string;
+
+		/**
+		 * If autoClose is set to false, the tooltip will never close unless you call the 'hide' method yourself. Default: true
+		 */
+		autoClose?: boolean;
+
+		/**
+		 * If set, this will override the content of the tooltip. Default: null
+		 */
+		content?: string;
+
+		/**
+		 * If the content of the tooltip is provided as a string, it is displayed as plain text by default.
+		 * If this content should actually be interpreted as HTML, set this option to true. Default: false
+		 */
+		contentAsHTML?: boolean;
+
+		/**
+		 * If you provide a jQuery object to the 'content' option, this sets if it is a clone of this object that should actually be used. Default: true
+		 */
+		contentCloning?: boolean;
+
+		/**
+		 * Tooltipster logs notices into the console when you're doing something you ideally shouldn't be doing. Set to false to disable logging. Default: true
+		 */
+		debug?: boolean;
+
+		/**
+		 * Delay how long it takes (in milliseconds) for the tooltip to start animating in. Default: 200
+		 */
+		delay?: number;
+
+		/**
+		 * Set a minimum width for the tooltip. Default: 0 (auto width)
+		 */
+		minWidth?: number;
+
+		/**
+		 * Set a maximum width for the tooltip. Default: null (no max width)
+		 */
+		maxWidth?: number;
+
+		/**
+		 * Create a custom function to be fired only once at instantiation. If the function returns a value, this value will become the content of the tooltip.
+		 * @param origin
+		 * @param content
+		 */
+		functionInit?: (origin: JQuery, content: string) => void;
+
+		/**
+		 * Create a custom function to be fired before the tooltip opens. This function may prevent or hold off the opening.
+		 * @param origin
+		 * @param continueTooltip
+		 */
+		functionBefore?: (origin: JQuery, continueTooltip: () => void) => void;
+
+		/**
+		 * Create a custom function to be fired when the tooltip and its contents have been added to the DOM.
+		 * @param origin
+		 * @param tooltip
+		 */
+		functionReady?: (origin: JQuery, tooltip: JQuery) => void;
+
+		/**
+		 * Create a custom function to be fired once the tooltip has been closed and removed from the DOM.
+		 * @param origin
+		 */
+		functionAfter?: (origin: JQuery) => void;
+
+		/**
+		 * If true, the tooltip will close if its origin is clicked. This option only applies when 'trigger' is 'hover' and 'autoClose' is false. Default: false
+		 */
+		hideOnClick?: boolean;
+
+		/**
+		 * If using the iconDesktop or iconTouch options, this sets the content for your icon. Default: '(?)'
+		 */
+		icon?: string|JQuery;
+
+		/**
+		 * If you provide a jQuery object to the 'icon' option, this sets if it is a clone of this object that should actually be used. Default: true
+		 */
+		iconCloning?: boolean;
+
+		/**
+		 * Generate an icon next to your content that is responsible for activating the tooltip on non-touch devices. Default: false
+		 */
+		iconDesktop?: boolean;
+
+		/**
+		 * If using the iconDesktop or iconTouch options, this sets the class on the icon (used to style the icon). Default: 'tooltipster-icon'
+		 */
+		iconTheme?: string;
+
+		/**
+		 * Generate an icon next to your content that is responsible for activating the tooltip on touch devices (tablets, phones, etc). Default: false
+		 */
+		iconTouch?: boolean;
+
+		/**
+		 * Give users the possibility to interact with the tooltip. Unless autoClose is set to false, the tooltip will still close if the user moves away from or clicks out of the tooltip.
+		 * Default: false
+		 */
+		interactive?: boolean;
+
+		/**
+		 * If the tooltip is interactive and activated by a hover event, set the amount of time (milliseconds) allowed for a user to hover off
+		 * of the tooltip activator (origin) on to the tooltip itself - keeping the tooltip from closing. Default: 350
+		 */
+		interactiveTolerance?: number;
+
+		/**
+		 * Allows you to put multiple tooltips on a single element. Read further instructions down this page. Default: false
+		 */
+		multiple?: boolean;
+
+		/**
+		 * Offsets the tooltip (in pixels) farther left/right from the origin. Default: 0
+		 */
+		offsetX?: number;
+
+		/**
+		 * Offsets the tooltip (in pixels) farther up/down from the origin. Default: 0
+		 */
+		offsetY?: number;
+
+		/**
+		 * If true, only one tooltip will be allowed to be active at a time. Non-autoclosing tooltips will not be closed though. Default: false
+		 */
+		onlyOne?: boolean;
+
+		/**
+		 * Set the position of the tooltip. Default: 'top'
+		 * Possible values: right, left, top, top-right, top-left, bottom, bottom-right, bottom-left
+		 */
+		position?: string;
+
+		/**
+		 * Will reposition the tooltip if the origin moves. As this option may have an impact on performance, we suggest you enable it only if you need to. Default: false
+		 */
+		positionTracker?: boolean;
+
+		/**
+		 * Called after the tooltip has been repositioned by the position tracker (if enabled).
+		 * Default: A function that will close the tooltip if the trigger is 'hover' and autoClose is false.
+		 */
+		positionTrackerCallback?: Function;
+
+		/**
+		 * Specify if a TITLE attribute should be restored on the HTML element after a call to the 'destroy' method.
+		 * This attribute may be omitted, or be restored with the value that existed before Tooltipster was initialized, or be restored with the stringified value of the current content.
+		 * Note: in case of multiple tooltips on a single element, only the last destroyed tooltip may trigger a restoration. Default: 'current'
+		 *
+		 * Possible values: 'none', 'previous' or 'current'
+		 */
+		restoration?: string;
+
+		/**
+		 * Set the speed of the animation. Default: 350
+		 */
+		speed?: number;
+
+		/**
+		 * How long the tooltip should be allowed to live before closing. Default: 0 (disabled)
+		 */
+		timer?: number;
+
+		/**
+		 * Set the theme (CSS class) used for your tooltip. Default: 'tooltipster-default'
+		 */
+		theme?: string;
+
+		/**
+		 *
+		 * If set to false, tooltips will not show on pure-touch devices, unless you open them yourself with the 'show' method.
+		 * Touch gestures on devices which also have a mouse will still open the tooltips though. Default: true
+		 */
+		touchDevices?: boolean;
+
+		/**
+		 * Set how tooltips should be activated and closed.
+		 * Possible values: hover, click or custom.
+		 */
+		trigger?: string;
+
+		/**
+		 * If a tooltip is open while its content is updated, play a subtle animation when the content changes. Default: true
+		 */
+		updateAnimation?: boolean;
+	}
+
+	/**
+	* Tooltipster tooltip instance object.
+	*/
+	export interface ITooltipsterInstance {
+
+		/**
+		 * Updates the content of the tooltip.
+		 * @param value
+		 * @returns {}
+		 */
+		content(value: string): JQuery;
+
+		/**
+		 * Shows the tooltip.
+		 */
+		show(): void;
+
+		/**
+		 * Hides the tooltip (this will aslo causo it to be removed from the DOM, not simply hides it), however leaving the listeners.
+		 */
+		hide(): void;
+
+		/**
+		 * Disables the tooltip, causing it to not show unless its re-enabled.
+		 */
+		disable(): void;
+
+		/**
+		 * Enables the tooltip.
+		 */
+		enable(): void;
+
+		/**
+		 * Destroy the tooltip and its listeners.
+		 */
+		destroy(): void;
+
+		/**
+		 * Reposition and resize the tooltip.
+		 */
+		reposition(): void;
+
+		/**
+		 * Returns the root element of the tooltip.
+		 */
+		elementTooltip(): JQuery;
+
+		/**
+		 * Returns the root element of the icon if there is one, otherwise 'undefined'.
+		 */
+		elementIcon(): JQuery;
+	}
+}
+
+
+interface JQuery {
+	tooltipster(options?: JQueryTooltipster.ITooltipsterOptions): JQuery|JQueryTooltipster.ITooltipsterInstance[];
+}
diff --git a/tooltipster/tooltipster-tests.ts b/tooltipster/tooltipster-tests.ts
index 0af2cf4f32..8627989cc1 100644
--- a/tooltipster/tooltipster-tests.ts
+++ b/tooltipster/tooltipster-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="tooltipster.d.ts" />
+
 
 $(function() {
 	var tooltips = <JQueryTooltipster.ITooltipsterInstance[]>$("#tooltip").tooltipster({
diff --git a/tooltipster/tooltipster.d.ts b/tooltipster/tooltipster.d.ts
deleted file mode 100644
index 7f2fa644ec..0000000000
--- a/tooltipster/tooltipster.d.ts
+++ /dev/null
@@ -1,278 +0,0 @@
-// Type definitions for tooltipster
-// Project: https://github.com/iamceege/tooltipster
-// Definitions by: Stephen Lautier <https://github.com/stephenlautier>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-
-declare namespace JQueryTooltipster {
-	/**
-	* Tooltipster options @see http://iamceege.github.io/tooltipster/
-	*/
-	export interface ITooltipsterOptions {
-
-		/**
-		 * Determines how the tooltip will animate in and out. Feel free to modify or create custom transitions in the tooltipster.css file.
-		 * In IE9 and 8, all animations default to a JavaScript generated, fade animation. Default: 'fade'
-		 */
-		animation?: string;
-
-		/**
-		 * Adds the "speech bubble arrow" to the tooltip. Default: true
-		 */
-		arrow?: boolean;
-
-		/**
-		 * Select a specific color for the "speech bubble arrow". Default: will inherit the tooltip's background color
-		 */
-		arrowColor?: string;
-
-		/**
-		 * If autoClose is set to false, the tooltip will never close unless you call the 'hide' method yourself. Default: true
-		 */
-		autoClose?: boolean;
-
-		/**
-		 * If set, this will override the content of the tooltip. Default: null
-		 */
-		content?: string;
-
-		/**
-		 * If the content of the tooltip is provided as a string, it is displayed as plain text by default.
-		 * If this content should actually be interpreted as HTML, set this option to true. Default: false
-		 */
-		contentAsHTML?: boolean;
-
-		/**
-		 * If you provide a jQuery object to the 'content' option, this sets if it is a clone of this object that should actually be used. Default: true
-		 */
-		contentCloning?: boolean;
-
-		/**
-		 * Tooltipster logs notices into the console when you're doing something you ideally shouldn't be doing. Set to false to disable logging. Default: true
-		 */
-		debug?: boolean;
-
-		/**
-		 * Delay how long it takes (in milliseconds) for the tooltip to start animating in. Default: 200
-		 */
-		delay?: number;
-
-		/**
-		 * Set a minimum width for the tooltip. Default: 0 (auto width)
-		 */
-		minWidth?: number;
-
-		/**
-		 * Set a maximum width for the tooltip. Default: null (no max width)
-		 */
-		maxWidth?: number;
-
-		/**
-		 * Create a custom function to be fired only once at instantiation. If the function returns a value, this value will become the content of the tooltip.
-		 * @param origin
-		 * @param content
-		 */
-		functionInit?: (origin: JQuery, content: string) => void;
-
-		/**
-		 * Create a custom function to be fired before the tooltip opens. This function may prevent or hold off the opening.
-		 * @param origin
-		 * @param continueTooltip
-		 */
-		functionBefore?: (origin: JQuery, continueTooltip: () => void) => void;
-
-		/**
-		 * Create a custom function to be fired when the tooltip and its contents have been added to the DOM.
-		 * @param origin
-		 * @param tooltip
-		 */
-		functionReady?: (origin: JQuery, tooltip: JQuery) => void;
-
-		/**
-		 * Create a custom function to be fired once the tooltip has been closed and removed from the DOM.
-		 * @param origin
-		 */
-		functionAfter?: (origin: JQuery) => void;
-
-		/**
-		 * If true, the tooltip will close if its origin is clicked. This option only applies when 'trigger' is 'hover' and 'autoClose' is false. Default: false
-		 */
-		hideOnClick?: boolean;
-
-		/**
-		 * If using the iconDesktop or iconTouch options, this sets the content for your icon. Default: '(?)'
-		 */
-		icon?: string|JQuery;
-
-		/**
-		 * If you provide a jQuery object to the 'icon' option, this sets if it is a clone of this object that should actually be used. Default: true
-		 */
-		iconCloning?: boolean;
-
-		/**
-		 * Generate an icon next to your content that is responsible for activating the tooltip on non-touch devices. Default: false
-		 */
-		iconDesktop?: boolean;
-
-		/**
-		 * If using the iconDesktop or iconTouch options, this sets the class on the icon (used to style the icon). Default: 'tooltipster-icon'
-		 */
-		iconTheme?: string;
-
-		/**
-		 * Generate an icon next to your content that is responsible for activating the tooltip on touch devices (tablets, phones, etc). Default: false
-		 */
-		iconTouch?: boolean;
-
-		/**
-		 * Give users the possibility to interact with the tooltip. Unless autoClose is set to false, the tooltip will still close if the user moves away from or clicks out of the tooltip.
-		 * Default: false
-		 */
-		interactive?: boolean;
-
-		/**
-		 * If the tooltip is interactive and activated by a hover event, set the amount of time (milliseconds) allowed for a user to hover off
-		 * of the tooltip activator (origin) on to the tooltip itself - keeping the tooltip from closing. Default: 350
-		 */
-		interactiveTolerance?: number;
-
-		/**
-		 * Allows you to put multiple tooltips on a single element. Read further instructions down this page. Default: false
-		 */
-		multiple?: boolean;
-
-		/**
-		 * Offsets the tooltip (in pixels) farther left/right from the origin. Default: 0
-		 */
-		offsetX?: number;
-
-		/**
-		 * Offsets the tooltip (in pixels) farther up/down from the origin. Default: 0
-		 */
-		offsetY?: number;
-
-		/**
-		 * If true, only one tooltip will be allowed to be active at a time. Non-autoclosing tooltips will not be closed though. Default: false
-		 */
-		onlyOne?: boolean;
-
-		/**
-		 * Set the position of the tooltip. Default: 'top'
-		 * Possible values: right, left, top, top-right, top-left, bottom, bottom-right, bottom-left
-		 */
-		position?: string;
-
-		/**
-		 * Will reposition the tooltip if the origin moves. As this option may have an impact on performance, we suggest you enable it only if you need to. Default: false
-		 */
-		positionTracker?: boolean;
-
-		/**
-		 * Called after the tooltip has been repositioned by the position tracker (if enabled).
-		 * Default: A function that will close the tooltip if the trigger is 'hover' and autoClose is false.
-		 */
-		positionTrackerCallback?: Function;
-
-		/**
-		 * Specify if a TITLE attribute should be restored on the HTML element after a call to the 'destroy' method.
-		 * This attribute may be omitted, or be restored with the value that existed before Tooltipster was initialized, or be restored with the stringified value of the current content.
-		 * Note: in case of multiple tooltips on a single element, only the last destroyed tooltip may trigger a restoration. Default: 'current'
-		 *
-		 * Possible values: 'none', 'previous' or 'current'
-		 */
-		restoration?: string;
-
-		/**
-		 * Set the speed of the animation. Default: 350
-		 */
-		speed?: number;
-
-		/**
-		 * How long the tooltip should be allowed to live before closing. Default: 0 (disabled)
-		 */
-		timer?: number;
-
-		/**
-		 * Set the theme (CSS class) used for your tooltip. Default: 'tooltipster-default'
-		 */
-		theme?: string;
-
-		/**
-		 *
-		 * If set to false, tooltips will not show on pure-touch devices, unless you open them yourself with the 'show' method.
-		 * Touch gestures on devices which also have a mouse will still open the tooltips though. Default: true
-		 */
-		touchDevices?: boolean;
-
-		/**
-		 * Set how tooltips should be activated and closed.
-		 * Possible values: hover, click or custom.
-		 */
-		trigger?: string;
-
-		/**
-		 * If a tooltip is open while its content is updated, play a subtle animation when the content changes. Default: true
-		 */
-		updateAnimation?: boolean;
-	}
-
-	/**
-	* Tooltipster tooltip instance object.
-	*/
-	export interface ITooltipsterInstance {
-
-		/**
-		 * Updates the content of the tooltip.
-		 * @param value
-		 * @returns {}
-		 */
-		content(value: string): JQuery;
-
-		/**
-		 * Shows the tooltip.
-		 */
-		show(): void;
-
-		/**
-		 * Hides the tooltip (this will aslo causo it to be removed from the DOM, not simply hides it), however leaving the listeners.
-		 */
-		hide(): void;
-
-		/**
-		 * Disables the tooltip, causing it to not show unless its re-enabled.
-		 */
-		disable(): void;
-
-		/**
-		 * Enables the tooltip.
-		 */
-		enable(): void;
-
-		/**
-		 * Destroy the tooltip and its listeners.
-		 */
-		destroy(): void;
-
-		/**
-		 * Reposition and resize the tooltip.
-		 */
-		reposition(): void;
-
-		/**
-		 * Returns the root element of the tooltip.
-		 */
-		elementTooltip(): JQuery;
-
-		/**
-		 * Returns the root element of the icon if there is one, otherwise 'undefined'.
-		 */
-		elementIcon(): JQuery;
-	}
-}
-
-
-interface JQuery {
-	tooltipster(options?: JQueryTooltipster.ITooltipsterOptions): JQuery|JQueryTooltipster.ITooltipsterInstance[];
-}
diff --git a/tooltipster/tsconfig.json b/tooltipster/tsconfig.json
new file mode 100644
index 0000000000..a9bdeb71b4
--- /dev/null
+++ b/tooltipster/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "tooltipster-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/touch-events/touch-events.d.ts b/touch-events/index.d.ts
similarity index 100%
rename from touch-events/touch-events.d.ts
rename to touch-events/index.d.ts
diff --git a/touch-events/touch-event-tests.ts b/touch-events/touch-event-tests.ts
index 47dda3bb67..7ff9fda362 100644
--- a/touch-events/touch-event-tests.ts
+++ b/touch-events/touch-event-tests.ts
@@ -1,20 +1,18 @@
-/// <reference path="touch-events.d.ts"/>
-
-var touchEvent:TouchEvent;
-var list:TouchList;
-var touch:Touch;
+var touchEvent: TouchEvent;
+var list: TouchList;
+var touch: Touch;
 
 list = touchEvent.touches;
 list = touchEvent.targetTouches;
 list = touchEvent.changedTouches;
 
-var flag:boolean;
+var flag: boolean;
 flag = touchEvent.altKey;
 flag = touchEvent.metaKey;
 flag = touchEvent.ctrlKey;
 flag = touchEvent.shiftKey;
 
-var len:number = list.length;
+var len: number = list.length;
 touch = list.item(0);
 touch == list[0];
 
@@ -30,5 +28,5 @@ y = touch.clientY;
 x = touch.pageX;
 y = touch.pageY;
 
-var target:EventTarget;
+var target: EventTarget;
 target = touch.target;
diff --git a/touch-events/tsconfig.json b/touch-events/tsconfig.json
new file mode 100644
index 0000000000..176340a518
--- /dev/null
+++ b/touch-events/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "touch-event-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/traceback/traceback.d.ts b/traceback/index.d.ts
similarity index 100%
rename from traceback/traceback.d.ts
rename to traceback/index.d.ts
diff --git a/traceback/traceback-tests.ts b/traceback/traceback-tests.ts
index d0772b5972..89c2aea595 100644
--- a/traceback/traceback-tests.ts
+++ b/traceback/traceback-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="traceback.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 function testTraceback() {
 	var TracebackStaticClass: TracebackStatic = function () {
diff --git a/traceback/tsconfig.json b/traceback/tsconfig.json
new file mode 100644
index 0000000000..df4799a156
--- /dev/null
+++ b/traceback/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "traceback-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tracking/tracking.d.ts b/tracking/index.d.ts
similarity index 100%
rename from tracking/tracking.d.ts
rename to tracking/index.d.ts
diff --git a/tracking/tracking-tests.ts b/tracking/tracking-tests.ts
index e1fdd85607..66476a625b 100644
--- a/tracking/tracking-tests.ts
+++ b/tracking/tracking-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="tracking.d.ts" />
+
 
 // All tracking tests below are code taken verbatim (or, as close as possible) from the tracking docs: https://trackingjs.com/docs.html
 
diff --git a/tracking/tsconfig.json b/tracking/tsconfig.json
new file mode 100644
index 0000000000..c09c218159
--- /dev/null
+++ b/tracking/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "tracking-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/traverse/index.d.ts b/traverse/index.d.ts
new file mode 100644
index 0000000000..87933c76f2
--- /dev/null
+++ b/traverse/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for traverse 0.6.6
+// Project: https://github.com/substack/js-traverse
+// Definitions by: newclear <https://github.com/newclear>
+// Definitions: https://github.com/newclear/DefinitelyTyped
+
+
+interface Traverse {
+    get(paths: string[]): any;
+    has(paths: string[]): boolean;
+    set(paths: string[], value: any): any;
+    map(cb: (v: any) => void): any;
+    forEach(cb: (v: any) => void): any;
+    reduce(cb: (acc: any, v: any) => void, init?: any): any;
+    paths(): string[];
+    nodes(): any[];
+    clone(): any;
+}
+
+declare function traverse(obj: any): Traverse;
+
+export = traverse;
diff --git a/traverse/traverse-tests.ts b/traverse/traverse-tests.ts
index bc5bfa87c5..62d2c53f31 100644
--- a/traverse/traverse-tests.ts
+++ b/traverse/traverse-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="traverse.d.ts" />
 
 import traverse = require('traverse');
 
diff --git a/traverse/traverse.d.ts b/traverse/traverse.d.ts
deleted file mode 100644
index c45c3db03b..0000000000
--- a/traverse/traverse.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// Type definitions for traverse 0.6.6
-// Project: https://github.com/substack/js-traverse
-// Definitions by: newclear <https://github.com/newclear>
-// Definitions: https://github.com/newclear/DefinitelyTyped
-
-declare module "traverse" {
-    interface Traverse {
-        get(paths: string[]): any;
-        has(paths: string[]): boolean;
-        set(paths: string[], value: any): any;
-        map(cb: (v: any) => void): any;
-        forEach(cb: (v: any) => void): any;
-        reduce(cb: (acc: any, v: any) => void, init?: any): any;
-        paths(): string[];
-        nodes(): any[];
-        clone(): any;
-    }
-
-    function traverse(obj: any): Traverse;
-
-    export = traverse;
-}
diff --git a/traverse/tsconfig.json b/traverse/tsconfig.json
new file mode 100644
index 0000000000..2f2e23ad78
--- /dev/null
+++ b/traverse/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "traverse-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/traverson/index.d.ts b/traverson/index.d.ts
new file mode 100644
index 0000000000..8028a172ec
--- /dev/null
+++ b/traverson/index.d.ts
@@ -0,0 +1,57 @@
+// Type definitions for Traverson v2.0.1
+// Project: https://github.com/basti1302/traverson
+// Definitions by: Marcin Porębski <https://github.com/marcinporebski/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var traverson: Traverson.TraversonMethods;
+
+export = traverson;
+
+declare namespace Traverson
+{
+    interface TraversonMethods
+    {
+        from(uri: string): Builder;
+        registerMediaType(name: string, handler: any): TraversonMethods;
+    }
+
+    interface Builder
+    {
+        withRequestOptions(options: any): Builder;
+        withTemplateParameters(parameters: any): Builder;
+        json(): Builder;
+        jsonHal(): Builder;
+
+        setMediaType(type_name: string): Builder;
+
+        follow(first_pattern: string, ... rest_patterns: string[]): Builder;
+
+        get(callback: (err: any, document: any, traversal?: Traversal) => void): InAction;
+        getResource(callback: (err: any, document: any, traversal?: Traversal) => void): InAction;
+        getUrl(callback: (err: any, document: any, traversal?: Traversal) => void): InAction;
+        post(data: any, callback: (err: any, document: any, traversal?: Traversal) => void): InAction;
+        put(data: any, callback: (err: any, document: any, traversal?: Traversal) => void): InAction;
+        patch(data: any, callback: (err: any, document: any, traversal?: Traversal) => void): InAction;
+        delete(callback: (err: any, document: any, traversal?: Traversal) => void): InAction;
+
+        newRequest(): Builder;
+    }
+
+    interface Json
+    {
+        parseJson(): any;
+    }
+
+    interface Traversal
+    {
+        continue(): Builder;
+    }
+
+    interface InAction
+    {
+        abort(): void;
+    }
+
+
+
+}
diff --git a/traverson/traverson-tests.ts b/traverson/traverson-tests.ts
index 0aceced33b..669bae70ed 100644
--- a/traverson/traverson-tests.ts
+++ b/traverson/traverson-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="traverson.d.ts" />
+
 
 import traverson = require('traverson');
 
diff --git a/traverson/traverson.d.ts b/traverson/traverson.d.ts
deleted file mode 100644
index 687d3ebc84..0000000000
--- a/traverson/traverson.d.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-// Type definitions for Traverson v2.0.1
-// Project: https://github.com/basti1302/traverson
-// Definitions by: Marcin Porębski <https://github.com/marcinporebski/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace Traverson
-{
-    interface TraversonMethods
-    {
-        from(uri: string): Builder;
-        registerMediaType(name: string, handler: any): TraversonMethods;
-    }
-
-    interface Builder
-    {
-        withRequestOptions(options: any): Builder;
-        withTemplateParameters(parameters: any): Builder;
-        json(): Builder;
-        jsonHal(): Builder;
-
-        setMediaType(type_name: string): Builder;
-
-        follow(first_pattern: string, ... rest_patterns: string[]): Builder;
-
-        get(callback: (err: any, document: any, traversal?: Traversal) => void): InAction;
-        getResource(callback: (err: any, document: any, traversal?: Traversal) => void): InAction;
-        getUrl(callback: (err: any, document: any, traversal?: Traversal) => void): InAction;
-        post(data: any, callback: (err: any, document: any, traversal?: Traversal) => void): InAction;
-        put(data: any, callback: (err: any, document: any, traversal?: Traversal) => void): InAction;
-        patch(data: any, callback: (err: any, document: any, traversal?: Traversal) => void): InAction;
-        delete(callback: (err: any, document: any, traversal?: Traversal) => void): InAction;
-
-        newRequest(): Builder;
-    }
-
-    interface Json
-    {
-        parseJson(): any;
-    }
-
-    interface Traversal
-    {
-        continue(): Builder;
-    }
-
-    interface InAction
-    {
-        abort(): void;
-    }
-
-
-
-}
-
-declare module "traverson"
-{
-    var traverson: Traverson.TraversonMethods;
-
-    export = traverson;
-}
diff --git a/traverson/tsconfig.json b/traverson/tsconfig.json
new file mode 100644
index 0000000000..e9e9c7e6d1
--- /dev/null
+++ b/traverson/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "traverson-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/trunk8/index.d.ts b/trunk8/index.d.ts
new file mode 100644
index 0000000000..ff4e8d2370
--- /dev/null
+++ b/trunk8/index.d.ts
@@ -0,0 +1,51 @@
+// Type definitions for trunk8
+// Project: https://github.com/rviscomi/trunk8
+// Definitions by: Blake Niemyjski <https://github.com/niemyjski/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface Trunk8Options {
+    /**
+    (Default: '&hellip;') The string to insert in place of the omitted text. This value may include HTML.
+    @param {string} fill
+    */
+    fill?: string;
+    /**
+    (Default: 1) The number of lines of text-wrap to tolerate before truncating. This value must be an integer greater than or equal to 1.
+    @param {number} lines
+    */
+    lines?: number;
+    /**
+    (Default: 'right') The side of the text from which to truncate. Valid values include 'center', 'left', and 'right'.
+    @param {string} side
+    */
+    side?: string;
+    /**
+    (Default: true) When true, the title attribute of the targeted HTML element will be set to the original, untruncated string. Valid values include true and false.
+    @param {bool} tooltip
+    */
+    tooltip?: boolean;
+    /**
+    (Default: 'auto') The width, in characters, of the desired text. When set to 'auto', trunk8 will maximize the amount of text without spilling over.
+    @param {string} width
+    */
+    width?: string;
+}
+
+interface JQuery {
+    /**
+    Creates a trunk8 instance and calls a method.
+    @constructor
+    @param {string} method
+    @param {string} value
+    */
+    trunk8(method: string, value?: string): any;
+
+    /**
+    Creates a trunk8 instance with default options.
+    @constructor
+    @param {Trunk8Options} options
+    */
+    trunk8(options?: Trunk8Options): any;
+}
\ No newline at end of file
diff --git a/trunk8/trunk8.d.ts b/trunk8/trunk8.d.ts
deleted file mode 100644
index cd703a48e2..0000000000
--- a/trunk8/trunk8.d.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-// Type definitions for trunk8
-// Project: https://github.com/rviscomi/trunk8
-// Definitions by: Blake Niemyjski <https://github.com/niemyjski/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface Trunk8Options {
-    /**
-    (Default: '&hellip;') The string to insert in place of the omitted text. This value may include HTML.
-    @param {string} fill
-    */
-    fill?: string;
-    /**
-    (Default: 1) The number of lines of text-wrap to tolerate before truncating. This value must be an integer greater than or equal to 1.
-    @param {number} lines
-    */
-    lines?: number;
-    /**
-    (Default: 'right') The side of the text from which to truncate. Valid values include 'center', 'left', and 'right'.
-    @param {string} side
-    */
-    side?: string;
-    /**
-    (Default: true) When true, the title attribute of the targeted HTML element will be set to the original, untruncated string. Valid values include true and false.
-    @param {bool} tooltip
-    */
-    tooltip?: boolean;
-    /**
-    (Default: 'auto') The width, in characters, of the desired text. When set to 'auto', trunk8 will maximize the amount of text without spilling over.
-    @param {string} width
-    */
-    width?: string;
-}
-
-interface JQuery {
-    /**
-    Creates a trunk8 instance and calls a method.
-    @constructor
-    @param {string} method
-    @param {string} value
-    */
-    trunk8(method: string, value?: string): any;
-
-    /**
-    Creates a trunk8 instance with default options.
-    @constructor
-    @param {Trunk8Options} options
-    */
-    trunk8(options?: Trunk8Options): any;
-}
\ No newline at end of file
diff --git a/trunk8/tsconfig.json b/trunk8/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/trunk8/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tsmonad/tsmonad.d.ts b/tsmonad/index.d.ts
similarity index 100%
rename from tsmonad/tsmonad.d.ts
rename to tsmonad/index.d.ts
diff --git a/tsmonad/tests/either-tests.ts b/tsmonad/tests/either-tests.ts
index 4e49f534fa..f845f5ae15 100644
--- a/tsmonad/tests/either-tests.ts
+++ b/tsmonad/tests/either-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../tsmonad.d.ts" />
+
 
 class User {
 
diff --git a/tsmonad/tests/maybe-tests.ts b/tsmonad/tests/maybe-tests.ts
index 76f0a72567..f0c0cdaf16 100644
--- a/tsmonad/tests/maybe-tests.ts
+++ b/tsmonad/tests/maybe-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../tsmonad.d.ts" />
+
 
 var turns_out_to_be_100 = TsMonad.Maybe.just(10)
     .caseOf({
diff --git a/tsmonad/tests/writer-tests.ts b/tsmonad/tests/writer-tests.ts
index fd8200aeb3..dad647da95 100644
--- a/tsmonad/tests/writer-tests.ts
+++ b/tsmonad/tests/writer-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="../tsmonad.d.ts" />
+
 
 var is_true = TsMonad.Writer.writer(['Started with 0'], 0)
     .bind(x => TsMonad.Writer.writer(['+ 8'], x + 8))
diff --git a/tsmonad/tsconfig.json b/tsmonad/tsconfig.json
new file mode 100644
index 0000000000..a0057d9b69
--- /dev/null
+++ b/tsmonad/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "tsmonad-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tspromise/index.d.ts b/tspromise/index.d.ts
new file mode 100644
index 0000000000..a2e38426a3
--- /dev/null
+++ b/tspromise/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for tspromise 0.0.4
+// Project: https://github.com/soywiz/tspromise
+// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+declare class Thenable<T> {
+	then<TR>(onFulfilled: (value: T) => Thenable<TR>, onRejected?: (error: Error) => TR): Thenable<TR>;
+	then<TR>(onFulfilled: (value: T) => Thenable<TR>, onRejected?: (error: Error) => void): Thenable<TR>;
+	then<TR>(onFulfilled: (value: T) => TR, onRejected?: (error: Error) => void): Thenable<TR>;
+	then<TR>(onFulfilled: (value: T) => TR, onRejected?: (error: Error) => TR): Thenable<TR>;
+	catch(onRejected: (error: Error) => T): Thenable<T>;
+}
+
+interface NodeCallback<T> {
+	(err: Error, value: T): void;
+}
+
+declare module "tspromise" {
+	class Promise<T> extends Thenable<T> {
+		constructor(callback: (resolve: (value?: T) => void, reject?: (error: Error) => void) => void);
+		static resolve<T>(value?: T): Thenable<T>;
+		static resolve<T>(promise: Thenable<T>): Thenable<T>;
+		static reject<T>(error: Error): Thenable<T>;
+		static all(promises: Thenable<any>[]): Thenable<any[]>;
+		static async<TR>(callback: () => TR): () => Thenable<TR>;
+		static async<T1, TR>(callback: (p1: T1) => TR): (p1: T1) => Thenable<TR>;
+		static async<T1, T2, TR>(callback: (p1: T1, p2: T2) => TR): (p1: T1, p2: T2) => Thenable<TR>;
+		static async<T1, T2, T3, TR>(callback: (p1: T1, p2: T2, p3: T3) => TR): (p1: T1, p2: T2, p3: T3) => Thenable<TR>;
+		static async<T1, T2, T3, T4, TR>(callback: (p1: T1, p2: T2, p3: T3, p4: T4) => TR): (p1: T1, p2: T2, p3: T3, p4: T4) => Thenable<TR>;
+		static spawn<TR>(generatorFunction: () => TR): Thenable<TR>;
+		static rewriteFolderSync(path: string): void;
+		static waitAsync(time: number): Thenable<{}>;
+		static nfcall<T>(obj: any, methodName: String, ...args: any[]): Thenable<T>;
+	}
+
+	export = Promise;
+}
+
+declare function yield<T>(promise: Thenable<T>): T;
diff --git a/tspromise/tsconfig.json b/tspromise/tsconfig.json
new file mode 100644
index 0000000000..0eec415f97
--- /dev/null
+++ b/tspromise/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "tspromise-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tspromise/tspromise-tests.ts b/tspromise/tspromise-tests.ts
index aeed989cdd..304415072c 100644
--- a/tspromise/tspromise-tests.ts
+++ b/tspromise/tspromise-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="tspromise.d.ts" />
+
 
 import Promise = require('tspromise');
 
diff --git a/tspromise/tspromise.d.ts b/tspromise/tspromise.d.ts
deleted file mode 100644
index 4930321c2a..0000000000
--- a/tspromise/tspromise.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// Type definitions for tspromise 0.0.4
-// Project: https://github.com/soywiz/tspromise
-// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-declare class Thenable<T> {
-	then<TR>(onFulfilled: (value: T) => Thenable<TR>, onRejected?: (error: Error) => TR): Thenable<TR>;
-	then<TR>(onFulfilled: (value: T) => Thenable<TR>, onRejected?: (error: Error) => void): Thenable<TR>;
-	then<TR>(onFulfilled: (value: T) => TR, onRejected?: (error: Error) => void): Thenable<TR>;
-	then<TR>(onFulfilled: (value: T) => TR, onRejected?: (error: Error) => TR): Thenable<TR>;
-	catch(onRejected: (error: Error) => T): Thenable<T>;
-}
-
-interface NodeCallback<T> {
-	(err: Error, value: T): void;
-}
-
-declare module "tspromise" {
-	class Promise<T> extends Thenable<T> {
-		constructor(callback: (resolve: (value?: T) => void, reject?: (error: Error) => void) => void);
-		static resolve<T>(value?: T): Thenable<T>;
-		static resolve<T>(promise: Thenable<T>): Thenable<T>;
-		static reject<T>(error: Error): Thenable<T>;
-		static all(promises: Thenable<any>[]): Thenable<any[]>;
-		static async<TR>(callback: () => TR): () => Thenable<TR>;
-		static async<T1, TR>(callback: (p1: T1) => TR): (p1: T1) => Thenable<TR>;
-		static async<T1, T2, TR>(callback: (p1: T1, p2: T2) => TR): (p1: T1, p2: T2) => Thenable<TR>;
-		static async<T1, T2, T3, TR>(callback: (p1: T1, p2: T2, p3: T3) => TR): (p1: T1, p2: T2, p3: T3) => Thenable<TR>;
-		static async<T1, T2, T3, T4, TR>(callback: (p1: T1, p2: T2, p3: T3, p4: T4) => TR): (p1: T1, p2: T2, p3: T3, p4: T4) => Thenable<TR>;
-		static spawn<TR>(generatorFunction: () => TR): Thenable<TR>;
-		static rewriteFolderSync(path: string): void;
-		static waitAsync(time: number): Thenable<{}>;
-		static nfcall<T>(obj: any, methodName: String, ...args: any[]): Thenable<T>;
-	}
-
-	export = Promise;
-}
-
-declare function yield<T>(promise: Thenable<T>): T;
diff --git a/turf/index.d.ts b/turf/index.d.ts
new file mode 100644
index 0000000000..03eccd7641
--- /dev/null
+++ b/turf/index.d.ts
@@ -0,0 +1,579 @@
+// Type definitions for Turf 2.0
+// Project: http://turfjs.org/
+// Definitions by: Guillaume Croteau <https://github.com/gcroteau>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="geojson" />
+
+export= turf;
+export as namespace turf;
+
+declare namespace turf {
+    //////////////////////////////////////////////////////
+    // Aggregation
+    //////////////////////////////////////////////////////
+
+    /**
+    * Calculates a series of aggregations for a set of points within a set of polygons.
+    * Sum, average, count, min, max, and deviation are supported.
+    * @param polygons Polygons with values on which to aggregate
+    * @param points Points to be aggregated
+    * @param aggregations An array of aggregation objects
+    * @returns Polygons with properties listed based on outField values in aggregations
+    */
+    function aggregate(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, aggregations: Array<{aggregation: string, inField: string, outField: string}>): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
+
+    /**
+    * Calculates the average value of a field for a set of points within a set of polygons.
+    * @param polygons Polygons with values on which to average
+    * @param points Points from which to calculate the average
+    * @param field The field in the points features from which to pull values to average
+    * @param outField The field in polygons to put results of the averages
+    * @returns Polygons with the value of outField set to the calculated averages
+    */
+    function average(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, field: string, outField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
+
+    /**
+    * Takes a set of points and a set of polygons and calculates the number of points that fall within the set of polygons.
+    * @param polygons Input polygons
+    * @param points Input points
+    * @param countField A field to append to the attributes of the Polygon features representing Point counts
+    * @returns Polygons with countField appended
+    */
+    function count(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, countField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
+
+    /**
+    * Calculates the standard deviation value of a field for a set of points within a set of polygons.
+    * @param polygons Input polygons
+    * @param points Input points
+    * @param inField The field in points from which to aggregate
+    * @param outField The field to append to polygons representing deviation
+    * @returns Polygons with appended field representing deviation
+    */
+    function deviation(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, inField: string, outField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
+
+    /**
+    * Calculates the maximum value of a field for a set of points within a set of polygons.
+    * @param polygons Input polygons
+    * @param points Input points
+    * @param inField The field in input data to analyze
+    * @param outField The field in which to store results
+    * @returns Polygons with properties listed as outField values
+    */
+    function max(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, inField: string, outField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
+
+    /**
+    * Calculates the median value of a field for a set of points within a set of polygons.
+    * @param polygons Input polygons
+    * @param points Input points
+    * @param inField The field in input data to analyze
+    * @param outField The field in which to store results
+    * @returns Polygons with properties listed as outField values
+    */
+    function median(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, inField: string, outField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
+
+    /**
+    * Calculates the minimum value of a field for a set of points within a set of polygons.
+    * @param polygons Input polygons
+    * @param points Input points
+    * @param inField The field in input data to analyze
+    * @param outField The field in which to store results
+    * @returns Polygons with properties listed as outField values
+    */
+    function min(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, inField: string, outField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
+
+    /**
+    * Calculates the sum of a field for a set of points within a set of polygons.
+    * @param polygons Input polygons
+    * @param points Input points
+    * @param inField The field in input data to analyze
+    * @param outField The field in which to store results
+    * @returns Polygons with properties listed as outField
+    */
+    function sum(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, inField: string, outField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
+
+    /**
+    * Calculates the variance value of a field for a set of points within a set of polygons.
+    * @param polygons Input polygons
+    * @param points Input points
+    * @param inField The field in input data to analyze
+    * @param outField The field in which to store results
+    * @returns Polygons with properties listed as outField
+    */
+    function variance(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, inField: string, outField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
+
+    //////////////////////////////////////////////////////
+    // Measurement
+    //////////////////////////////////////////////////////
+
+    /**
+    * Takes a line and returns a point at a specified distance along the line.
+    * @param line Input line
+    * @param distance Distance along the line
+    * @param [units=miles] 'miles', 'kilometers', 'radians' or 'degrees'
+    * @returns Point along the line
+    */
+    function along(line: GeoJSON.Feature<GeoJSON.LineString>, distance: number, units?: string): GeoJSON.Feature<GeoJSON.Point>;
+
+    /**
+    * Takes one or more features and returns their area in square meters.
+    * @param input Input features
+    * @returns Area in square meters
+    */
+    function area(input: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): number;
+
+    /**
+    * Takes a bbox and returns an equivalent polygon.
+    * @param bbox An Array of bounding box coordinates in the form: [xLow, yLow, xHigh, yHigh]
+    * @returns A Polygon representation of the bounding box
+    */
+    function bboxPolygon(bbox: Array<number>): GeoJSON.Feature<GeoJSON.Polygon>;
+
+    /**
+    * Takes two points and finds the geographic bearing between them.
+    * @param start Starting Point
+    * @param end Ending point
+    * @returns Bearing in decimal degrees
+    */
+    function bearing(start: GeoJSON.Feature<GeoJSON.Point>, end: GeoJSON.Feature<GeoJSON.Point>): number;
+
+    /**
+    * Takes a FeatureCollection and returns the absolute center point of all features.
+    * @param features Input features
+    * @returns A Point feature at the absolute center point of all input features
+    */
+    function center(features: GeoJSON.FeatureCollection<any>): GeoJSON.Feature<GeoJSON.Point>;
+
+    /**
+    * Takes one or more features and calculates the centroid using the arithmetic mean of all vertices.
+    * This lessens the effect of small islands and artifacts when calculating the centroid of a set of polygons.
+    * @param features Input features
+    * @returns The centroid of the input features
+    */
+    function centroid(features: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): GeoJSON.Feature<GeoJSON.Point>;
+
+    /**
+    * Takes a Point and calculates the location of a destination point given a distance in degrees, radians, miles, or kilometers; and bearing in degrees.
+    * This uses the Haversine formula to account for global curvature.
+    * @param start Starting point
+    * @param distance Distance from the starting point
+    * @param bearing Ranging from -180 and 180
+    * @param units 'miles', 'kilometers', 'radians', or 'degrees'
+    * @returns Destination point
+    */
+    function destination(start: GeoJSON.Feature<GeoJSON.Point>, distance: number, bearing: number, units: string): GeoJSON.Feature<GeoJSON.Point>;
+
+    /**
+    * Calculates the distance between two points in degress, radians, miles, or kilometers.
+    * This uses the Haversine formula to account for global curvature.
+    * @param from Origin point
+    * @param to Destination point
+    * @param [units=kilometers] 'miles', 'kilometers', 'radians', or 'degrees'
+    * @returns Distance between the two points
+    */
+    function distance(from: GeoJSON.Feature<GeoJSON.Point>, to: GeoJSON.Feature<GeoJSON.Point>, units?: string): number;
+
+    /**
+    * Takes any number of features and returns a rectangular Polygon that encompasses all vertices.
+    * @param fc Input features
+    * @returns A rectangular Polygon feature that encompasses all vertices
+    */
+    function envelope(fc: GeoJSON.FeatureCollection<any>): GeoJSON.Feature<GeoJSON.Polygon>;
+
+    /**
+    * Takes a set of features, calculates the extent of all input features, and returns a bounding box.
+    * @param input Input features
+    * @returns The bounding box of input given as an array in WSEN order (west, south, east, north)
+    */
+    function extent(input: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): Array<number>;
+
+    /**
+    * Takes a line and measures its length in the specified units.
+    * @param line Line to measure
+    * @param units 'miles', 'kilometers', 'radians', or 'degrees'
+    * @returns Length of the input line
+    */
+    function lineDistance(line: GeoJSON.Feature<GeoJSON.LineString>, units: string): number;
+
+    /**
+    * Takes two points and returns a point midway between them.
+    * @param pt1 First point
+    * @param pt2 Second point
+    * @returns A point midway between pt1 and pt2
+    */
+    function midpoint(pt1: GeoJSON.Feature<GeoJSON.Point>, pt2: GeoJSON.Feature<GeoJSON.Point>): GeoJSON.Feature<GeoJSON.Point>;
+
+    /**
+    * Takes a feature and returns a Point guaranteed to be on the surface of the feature. Given a Polygon, the point will be in the area of the polygon.
+    * Given a LineString, the point will be along the string. Given a Point, the point will the same as the input.
+    * @param input Any feature or set of features
+    * @returns A point on the surface of input
+    */
+    function pointOnSurface(input: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): GeoJSON.Feature<any>;
+
+    /**
+    * Takes a bounding box and returns a new bounding box with a size expanded or contracted by a factor of X.
+    * @param bbox A bounding box
+    * @param factor The ratio of the new bbox to the input bbox
+    * @returns The resized bbox
+    */
+    function size(bbox: Array<number>, factor: number): Array<number>;
+
+    /**
+    * Takes a bounding box and calculates the minimum square bounding box that would contain the input.
+    * @param bbox A bounding box
+    * @returns A square surrounding bbox
+    */
+    function square(bbox: Array<number>): Array<number>;
+
+    //////////////////////////////////////////////////////
+    // Transformation
+    //////////////////////////////////////////////////////
+
+    /**
+    * Takes a line and returns a curved version by applying a Bezier spline algorithm.
+    * The bezier spline implementation is by Leszek Rybicki.
+    * @param line Input LineString
+    * @param [resolution=10000] Time in milliseconds between points
+    * @param [sharpness=0.85] A measure of how curvy the path should be between splines
+    * @returns Curved line
+    */
+    function bezier(line: GeoJSON.Feature<GeoJSON.LineString>, resolution?: number, sharpness?: number): GeoJSON.Feature<GeoJSON.LineString>;
+
+    /**
+    * Calculates a buffer for input features for a given radius. Units supported are miles, kilometers, and degrees.
+    * @param feature Input to be buffered
+    * @param distance Distance to draw the buffer
+    * @param units 'miles', 'kilometers', 'radians', or 'degrees'
+    * @returns Buffered features
+    */
+    function buffer(feature: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>, distance: number, units: string): GeoJSON.FeatureCollection<GeoJSON.Polygon> | GeoJSON.FeatureCollection<GeoJSON.MultiPolygon> | GeoJSON.Polygon | GeoJSON.MultiPolygon;
+
+    /**
+    * Takes a set of points and returns a concave hull polygon. Internally, this implements a Monotone chain algorithm.
+    * @param points Input points
+    * @param maxEdge The size of an edge necessary for part of the hull to become concave (in miles)
+    * @param units Used for maxEdge distance (miles or kilometers)
+    * @returns A concave hull
+    */
+    function concave(points: GeoJSON.FeatureCollection<GeoJSON.Point>, maxEdge: number, units: string): GeoJSON.Feature<GeoJSON.Polygon>;
+
+    /**
+    * Takes a set of points and returns a convex hull polygon. Internally this uses the convex-hull module that implements a monotone chain hull.
+    * @param input Input points
+    * @returns A convex hull
+    */
+    function convex(input: GeoJSON.FeatureCollection<GeoJSON.Point>): GeoJSON.Feature<GeoJSON.Polygon>;
+
+    /**
+    * Finds the difference between two polygons by clipping the second polygon from the first.
+    * @param poly1 Input Polygon feaure
+    * @param poly2 Polygon feature to difference from poly1
+    * @returns A Polygon feature showing the area of poly1 excluding the area of poly2
+    */
+    function difference(poly1: GeoJSON.Feature<GeoJSON.Polygon>, poly2: GeoJSON.Feature<GeoJSON.Polygon>): GeoJSON.Feature<GeoJSON.Polygon>;
+
+    /**
+    * Takes two polygons and finds their intersection.
+    *  If they share a border, returns the border; if they don't intersect, returns undefined.
+    * @param poly1 The first polygon
+    * @param poly2 The second polygon
+    * @returns If poly1 and poly2 overlap, returns a Polygon feature representing the area they overlap;
+    * if poly1 and poly2 do not overlap, returns undefined;
+    * if poly1 and poly2 share a border, a MultiLineString of the locations where their borders are shared
+    */
+    function intersect(poly1: GeoJSON.Feature<GeoJSON.Polygon>, poly2: GeoJSON.Feature<GeoJSON.Polygon>): GeoJSON.Feature<GeoJSON.Polygon | GeoJSON.MultiLineString> | typeof undefined;
+
+    /**
+    * Takes a set of polygons and returns a single merged polygon feature.
+    * If the input polygon features are not contiguous, this function returns a MultiPolygon feature.
+    * @param fc Input polygons
+    * @returns Merged polygon or multipolygon
+    */
+    function merge(fc: GeoJSON.FeatureCollection<GeoJSON.Polygon>): GeoJSON.Feature<GeoJSON.Polygon | GeoJSON.MultiPolygon>;
+
+    /**
+    * Takes a LineString or Polygon and returns a simplified version.
+    * Internally uses simplify-js to perform simplification.
+    * @param feature Feature to be simplified
+    * @param tolerance Simplification tolerance
+    * @param highQuality Whether or not to spend more time to create a higher-quality simplification with a different algorithm
+    * @returns A simplified feature
+    */
+    function simplify(feature: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any> | GeoJSON.GeometryCollection, tolerance: number, highQuality: boolean): GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any> | GeoJSON.GeometryCollection;
+
+    /**
+    * Takes two polygons and returns a combined polygon.
+    * If the input polygons are not contiguous, this function returns a MultiPolygon feature.
+    * @param poly1 Input polygon
+    * @param poly2 Another input polygon
+    * @returns A combined Polygon or MultiPolygon feature
+    */
+    function union(poly1: GeoJSON.Feature<GeoJSON.Polygon>, poly2: GeoJSON.Feature<GeoJSON.Polygon>): GeoJSON.Feature<GeoJSON.Polygon | GeoJSON.MultiPolygon>;
+
+    //////////////////////////////////////////////////////
+    // Misc
+    //////////////////////////////////////////////////////
+
+    /**
+    * Combines a FeatureCollection of Point, LineString, or Polygon features into MultiPoint, MultiLineString, or MultiPolygon features.
+    * @param fc A FeatureCollection of any type
+    * @returns A FeatureCollection of corresponding type to input
+    */
+    function combine(fc: GeoJSON.FeatureCollection<any>): GeoJSON.FeatureCollection<any>;
+
+    /**
+    * Takes a feature or set of features and returns all positions as points.
+    * @param input Input features
+    * @returns Points representing the exploded input features
+    */
+    function explode(input: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): GeoJSON.FeatureCollection<GeoJSON.Point>;
+
+    /**
+    * Takes input features and flips all of their coordinates from [x, y] to [y, x].
+    * @param input Input features
+    * @returns A feature or set of features of the same type as input with flipped coordinates
+    */
+    function flip(input: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>;
+
+    /**
+    * Takes a polygon and returns points at all self-intersections.
+    * @param polygon Input polygon
+    * @returns Self-intersections
+    */
+    function kinks(polygon: GeoJSON.Feature<GeoJSON.Polygon>): GeoJSON.FeatureCollection<GeoJSON.Point>;
+
+    /**
+    * Takes a line, a start Point, and a stop point and returns the line in between those points.
+    * @param point1 Starting point
+    * @param point2 Stopping point
+    * @param line Line to slice
+    * @returns Sliced line
+    */
+    function lineSlice(point1: GeoJSON.Feature<GeoJSON.Point>, point2: GeoJSON.Feature<GeoJSON.Point>, line: GeoJSON.Feature<GeoJSON.LineString>): GeoJSON.Feature<GeoJSON.LineString>;
+
+    /**
+    * Takes a Point and a LineString and calculates the closest Point on the LineString.
+    * @param line Line to snap to
+    * @param point Point to snap from
+    * @returns Closest point on the line to point
+    */
+    function pointOnLine(line: GeoJSON.Feature<GeoJSON.LineString>, point: GeoJSON.Feature<GeoJSON.Point>): GeoJSON.Feature<GeoJSON.Point>;
+
+    //////////////////////////////////////////////////////
+    // Helper
+    //////////////////////////////////////////////////////
+
+    /**
+    * Takes one or more Features and creates a FeatureCollection.
+    * @param features Input features
+    * @returns A FeatureCollection of input features
+    */
+    function featurecollection(features: Array<GeoJSON.Feature<any>>): GeoJSON.FeatureCollection<any>;
+
+    /**
+    * Creates a LineString based on a coordinate array. Properties can be added optionally.
+    * @param coordinates An array of Positions
+    * @param [properties] An Object of key-value pairs to add as properties
+    * @returns A LineString feature
+    */
+    function linestring(coordinates: Array<Array<number>>, properties?: any): GeoJSON.Feature<GeoJSON.LineString>;
+
+    /**
+    * Takes coordinates and properties (optional) and returns a new Point feature.
+    * @param coordinates Longitude, latitude position (each in decimal degrees)
+    * @param [properties] An Object of key-value pairs to add as properties
+    * @returns A Point feature
+    */
+    function point(coordinates: Array<number>, properties?: any): GeoJSON.Feature<GeoJSON.Point>;
+
+    /**
+    * Takes an array of LinearRings and optionally an Object with properties and returns a Polygon feature.
+    * @param rings An array of LinearRings
+    * @param [properties] An Object of key-value pairs to add as properties
+    * @returns A Polygon feature
+    */
+    function polygon(rings: Array<Array<Array<number>>>, properties?: any): GeoJSON.Feature<GeoJSON.Polygon>;
+
+    //////////////////////////////////////////////////////
+    // Data
+    //////////////////////////////////////////////////////
+
+    /**
+    * Takes a FeatureCollection and filters it by a given property and value.
+    * @param features Input features
+    * @param key The property on which to filter
+    * @param value The value of that property on which to filter
+    * @returns A filtered collection with only features that match input key and value
+    */
+    function filter(features: GeoJSON.FeatureCollection<any>, key: string, value: string): GeoJSON.FeatureCollection<any>;
+
+    /**
+    * Generates random GeoJSON data, including Points and Polygons, for testing and experimentation.
+    * @param [type='point'] Type of features desired: 'points' or 'polygons'
+    * @param [count=1] How many geometries should be generated.
+    * @param [options] Options relevant to the feature desired. Can include:
+    *   - A bounding box inside of which geometries are placed. In the case of Point features, they are guaranteed to be within this bounds, while Polygon features have their centroid within the bounds.
+    *   - The number of vertices added to polygon features. Default is 10;
+    *   - The total number of decimal degrees longitude or latitude that a polygon can extent outwards to from its center. Default is 10.
+    * @returns Generated random features
+    */
+    function random(type?: string, count?: number, options?: {bbox?: Array<number>; num_vertices?: number; max_radial_length?: number;}): GeoJSON.FeatureCollection<any>;
+
+    /**
+    * Takes a FeatureCollection of any type, a property, and a value and returns a FeatureCollection with features matching that property-value pair removed.
+    * @param features Set of input features
+    * @param property The property to remove
+    * @param value The value to remove
+    * @returns The resulting FeatureCollection without features that match the property-value pair
+    */
+    function remove(features: GeoJSON.FeatureCollection<any>, property: string, value: string): GeoJSON.FeatureCollection<any>;
+
+    /**
+    * Takes a FeatureCollection and returns a FeatureCollection with given number of features at random.
+    * @param features Set of input features
+    * @param n Number of features to select
+    * @returns A FeatureCollection with n features
+    */
+    function sample(features: GeoJSON.FeatureCollection<any>, n: number): GeoJSON.FeatureCollection<any>;
+
+    //////////////////////////////////////////////////////
+    // Interpolation
+    //////////////////////////////////////////////////////
+
+    /**
+    * Takes a bounding box and a cell size in degrees and returns a FeatureCollection of flat-topped hexagons (Polygon features) aligned in an "odd-q" vertical grid as described in Hexagonal Grids.
+    * @param bbox Bounding box in [minX, minY, maxX, maxY] order
+    * @param cellWidth Width of cell in specified units
+    * @param units Used in calculating cellWidth ('miles' or 'kilometers')
+    * @returns A hexagonal grid
+    */
+    function hexGrid(bbox: Array<number>, cellWidth: number, units: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
+
+    /**
+    * Takes points with z-values and an array of value breaks and generates isolines.
+    * @param points Input points
+    * @param z The property name in points from which z-values will be pulled
+    * @param resolution Resolution of the underlying grid
+    * @param breaks Where to draw contours
+    * @returns Isolines
+    */
+    function isolines(points: GeoJSON.FeatureCollection<GeoJSON.Point>, z: string, resolution: number, breaks: Array<number>): GeoJSON.FeatureCollection<GeoJSON.LineString>;
+
+    /**
+    * Takes a triangular plane as a Polygon and a Point within that triangle and returns the z-value at that point.
+    * The Polygon needs to have properties a, b, and c that define the values at its three corners.
+    * @param interpolatedPoint The Point for which a z-value will be calculated
+    * @param triangle A Polygon feature with three vertices
+    * @returns The z-value for interpolatedPoint
+    */
+    function planepoint(interpolatedpoint: GeoJSON.Feature<GeoJSON.Point>, triangle: GeoJSON.Feature<GeoJSON.Polygon>): number;
+
+    /**
+    * Takes a bounding box and a cell depth and returns a set of points in a grid.
+    * @param extent Extent in [minX, minY, maxX, maxY] order
+    * @param cellWidth The distance across each cell
+    * @param units Used in calculating cellWidth ('miles' or 'kilometers')
+    * @returns Grid of points
+    */
+    function pointGrid(extent: Array<number>, cellWidth: number, units: string): GeoJSON.FeatureCollection<GeoJSON.Point>;
+
+    /**
+    * Takes a bounding box and a cell depth and returns a set of square polygons in a grid.
+    * @param extent Extent in [minX, minY, maxX, maxY] order
+    * @param cellWidth Width of each cell
+    * @param units Used in calculating cellWidth ('miles' or 'kilometers')
+    * @returns Grid of polygons
+    */
+    function squareGrid(extent: Array<number>, cellWidth: number, units: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
+
+    /**
+    * Takes a set of points and the name of a z-value property and creates a Triangulated Irregular Network, or a TIN for short, returned as a collection of Polygons.
+    * These are often used for developing elevation contour maps or stepped heat visualizations.
+    * This triangulates the points, as well as adds properties called a, b, and c representing the value of the given propertyName at each of the points that represent the corners of the triangle.
+    * @param points Input points
+    * @param [propertyName] Name of the property from which to pull z values This is optional: if not given, then there will be no extra data added to the derived triangles.
+    * @returns TIN output
+    */
+    function tin(points: GeoJSON.FeatureCollection<GeoJSON.Point>, propertyName?: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
+
+    /**
+    * Takes a bounding box and a cell depth and returns a set of triangular polygons in a grid.
+    * @param extent Extent in [minX, minY, maxX, maxY] order
+    * @param cellWidth Width of each cell
+    * @param units Used in calculating cellWidth ('miles' or 'kilometers')
+    * @returns Grid of triangles
+    */
+    function triangleGrid(extent: Array<number>, cellWidth: number, units: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
+
+    //////////////////////////////////////////////////////
+    // Joins
+    //////////////////////////////////////////////////////
+
+    /**
+    * Takes a Point and a Polygon or MultiPolygon and determines if the point resides inside the polygon.
+    * The polygon can be convex or concave. The function accounts for holes.
+    * @param point Input point
+    * @param polygon Input polygon or multipolygon
+    * @returns true if the Point is inside the Polygon; false if the Point is not inside the Polygon
+    */
+    function inside(point: GeoJSON.Feature<GeoJSON.Point>, polygon: GeoJSON.Feature<GeoJSON.Polygon>): boolean;
+
+    /**
+    * Takes a set of points and a set of polygons and performs a spatial join.
+    * @param points Input points
+    * @param polygons Input polygons
+    * @param polyId Property in polygons to add to joined Point features
+    * @param containingPolyId Property in points in which to store joined property from polygons
+    * @returns Points with containingPolyId property containing values from polyId
+    */
+    function tag(points: GeoJSON.FeatureCollection<GeoJSON.Point>, polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, polyId: string, containingPolyId: string): GeoJSON.FeatureCollection<GeoJSON.Point>;
+
+    /**
+    * Takes a set of points and a set of polygons and returns the points that fall within the polygons.
+    * @param points Input points
+    * @param polygons Input polygons
+    * @returns Points that land within at least one polygon
+    */
+    function within(points: GeoJSON.FeatureCollection<GeoJSON.Point>, polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>): GeoJSON.FeatureCollection<GeoJSON.Point>;
+
+    //////////////////////////////////////////////////////
+    // Classification
+    //////////////////////////////////////////////////////
+
+    /**
+    * Takes a set of features and returns an array of the Jenks Natural breaks for a given property.
+    * @param input Input features
+    * @param field The property in input on which to calculate Jenks natural breaks
+    * @param numberOfBreaks Number of classes in which to group the data
+    * @returns The break number for each class plus the minimum and maximum values
+    */
+    function jenks(input: GeoJSON.FeatureCollection<any>, field: string, numberOfBreaks: number): Array<number>;
+
+    /**
+    * Takes a reference point and a set of points and returns the point from the set closest to the reference.
+    * @param point The reference point
+    * @param against Input point set
+    * @returns The closest point in the set to the reference point
+    */
+    function nearest(point: GeoJSON.Feature<GeoJSON.Point>, against: GeoJSON.FeatureCollection<GeoJSON.Point>): GeoJSON.Feature<GeoJSON.Point>;
+
+    /**
+    * Takes a FeatureCollection, a property name, and a set of percentiles and returns a quantile array.
+    * @param input Set of features
+    * @param field The property in input from which to retrieve quantile values
+    * @param percentiles An Array of percentiles on which to calculate quantile values
+    * @returns An array of the break values
+    */
+    function quantile(input: GeoJSON.FeatureCollection<any>, field: string, percentiles: Array<number>): Array<number>;
+
+    /**
+    * Takes a FeatureCollection, an input field, an output field, and an array of translations and outputs an identical FeatureCollection with the output field property populated.
+    * @param input Set of input features
+    * @param inField The field to translate
+    * @param outField The field in which to store translated results
+    * @param translations An array of translations
+    * @returns A FeatureCollection with identical geometries to input but with outField populated.
+    */
+    function reclass(input: GeoJSON.FeatureCollection<any>, inField: string, outField: string, translations: Array<any>): GeoJSON.FeatureCollection<any>;
+}
diff --git a/turf/tsconfig.json b/turf/tsconfig.json
new file mode 100644
index 0000000000..2ae020af75
--- /dev/null
+++ b/turf/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "turf-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/turf/turf-tests.ts b/turf/turf-tests.ts
index d0fc95ba18..e2c8fbeb6b 100644
--- a/turf/turf-tests.ts
+++ b/turf/turf-tests.ts
@@ -1,9 +1,9 @@
-/// <reference path="turf.d.ts"/>
-
 ///////////////////////////////////////////
 // Tests data initialisation
 ///////////////////////////////////////////
 
+import turf = require("turf");
+
 var point1 = {
   "type": "Feature",
   "properties": {},
diff --git a/turf/turf.d.ts b/turf/turf.d.ts
deleted file mode 100644
index 6ed1d617a3..0000000000
--- a/turf/turf.d.ts
+++ /dev/null
@@ -1,576 +0,0 @@
-// Type definitions for Turf 2.0
-// Project: http://turfjs.org/
-// Definitions by: Guillaume Croteau <https://github.com/gcroteau>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../geojson/geojson.d.ts" />
-
-declare namespace turf {
-    //////////////////////////////////////////////////////
-    // Aggregation
-    //////////////////////////////////////////////////////
-
-    /**
-    * Calculates a series of aggregations for a set of points within a set of polygons.
-    * Sum, average, count, min, max, and deviation are supported.
-    * @param polygons Polygons with values on which to aggregate
-    * @param points Points to be aggregated
-    * @param aggregations An array of aggregation objects
-    * @returns Polygons with properties listed based on outField values in aggregations
-    */
-    function aggregate(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, aggregations: Array<{aggregation: string, inField: string, outField: string}>): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-    * Calculates the average value of a field for a set of points within a set of polygons.
-    * @param polygons Polygons with values on which to average
-    * @param points Points from which to calculate the average
-    * @param field The field in the points features from which to pull values to average
-    * @param outField The field in polygons to put results of the averages
-    * @returns Polygons with the value of outField set to the calculated averages
-    */
-    function average(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, field: string, outField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-    * Takes a set of points and a set of polygons and calculates the number of points that fall within the set of polygons.
-    * @param polygons Input polygons
-    * @param points Input points
-    * @param countField A field to append to the attributes of the Polygon features representing Point counts
-    * @returns Polygons with countField appended
-    */
-    function count(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, countField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-    * Calculates the standard deviation value of a field for a set of points within a set of polygons.
-    * @param polygons Input polygons
-    * @param points Input points
-    * @param inField The field in points from which to aggregate
-    * @param outField The field to append to polygons representing deviation
-    * @returns Polygons with appended field representing deviation
-    */
-    function deviation(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, inField: string, outField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-    * Calculates the maximum value of a field for a set of points within a set of polygons.
-    * @param polygons Input polygons
-    * @param points Input points
-    * @param inField The field in input data to analyze
-    * @param outField The field in which to store results
-    * @returns Polygons with properties listed as outField values
-    */
-    function max(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, inField: string, outField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-    * Calculates the median value of a field for a set of points within a set of polygons.
-    * @param polygons Input polygons
-    * @param points Input points
-    * @param inField The field in input data to analyze
-    * @param outField The field in which to store results
-    * @returns Polygons with properties listed as outField values
-    */
-    function median(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, inField: string, outField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-    * Calculates the minimum value of a field for a set of points within a set of polygons.
-    * @param polygons Input polygons
-    * @param points Input points
-    * @param inField The field in input data to analyze
-    * @param outField The field in which to store results
-    * @returns Polygons with properties listed as outField values
-    */
-    function min(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, inField: string, outField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-    * Calculates the sum of a field for a set of points within a set of polygons.
-    * @param polygons Input polygons
-    * @param points Input points
-    * @param inField The field in input data to analyze
-    * @param outField The field in which to store results
-    * @returns Polygons with properties listed as outField
-    */
-    function sum(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, inField: string, outField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-    * Calculates the variance value of a field for a set of points within a set of polygons.
-    * @param polygons Input polygons
-    * @param points Input points
-    * @param inField The field in input data to analyze
-    * @param outField The field in which to store results
-    * @returns Polygons with properties listed as outField
-    */
-    function variance(polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, points: GeoJSON.FeatureCollection<GeoJSON.Point>, inField: string, outField: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    //////////////////////////////////////////////////////
-    // Measurement
-    //////////////////////////////////////////////////////
-
-    /**
-    * Takes a line and returns a point at a specified distance along the line.
-    * @param line Input line
-    * @param distance Distance along the line
-    * @param [units=miles] 'miles', 'kilometers', 'radians' or 'degrees'
-    * @returns Point along the line
-    */
-    function along(line: GeoJSON.Feature<GeoJSON.LineString>, distance: number, units?: string): GeoJSON.Feature<GeoJSON.Point>;
-
-    /**
-    * Takes one or more features and returns their area in square meters.
-    * @param input Input features
-    * @returns Area in square meters
-    */
-    function area(input: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): number;
-
-    /**
-    * Takes a bbox and returns an equivalent polygon.
-    * @param bbox An Array of bounding box coordinates in the form: [xLow, yLow, xHigh, yHigh]
-    * @returns A Polygon representation of the bounding box
-    */
-    function bboxPolygon(bbox: Array<number>): GeoJSON.Feature<GeoJSON.Polygon>;
-
-    /**
-    * Takes two points and finds the geographic bearing between them.
-    * @param start Starting Point
-    * @param end Ending point
-    * @returns Bearing in decimal degrees
-    */
-    function bearing(start: GeoJSON.Feature<GeoJSON.Point>, end: GeoJSON.Feature<GeoJSON.Point>): number;
-
-    /**
-    * Takes a FeatureCollection and returns the absolute center point of all features.
-    * @param features Input features
-    * @returns A Point feature at the absolute center point of all input features
-    */
-    function center(features: GeoJSON.FeatureCollection<any>): GeoJSON.Feature<GeoJSON.Point>;
-
-    /**
-    * Takes one or more features and calculates the centroid using the arithmetic mean of all vertices.
-    * This lessens the effect of small islands and artifacts when calculating the centroid of a set of polygons.
-    * @param features Input features
-    * @returns The centroid of the input features
-    */
-    function centroid(features: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): GeoJSON.Feature<GeoJSON.Point>;
-
-    /**
-    * Takes a Point and calculates the location of a destination point given a distance in degrees, radians, miles, or kilometers; and bearing in degrees.
-    * This uses the Haversine formula to account for global curvature.
-    * @param start Starting point
-    * @param distance Distance from the starting point
-    * @param bearing Ranging from -180 and 180
-    * @param units 'miles', 'kilometers', 'radians', or 'degrees'
-    * @returns Destination point
-    */
-    function destination(start: GeoJSON.Feature<GeoJSON.Point>, distance: number, bearing: number, units: string): GeoJSON.Feature<GeoJSON.Point>;
-
-    /**
-    * Calculates the distance between two points in degress, radians, miles, or kilometers.
-    * This uses the Haversine formula to account for global curvature.
-    * @param from Origin point
-    * @param to Destination point
-    * @param [units=kilometers] 'miles', 'kilometers', 'radians', or 'degrees'
-    * @returns Distance between the two points
-    */
-    function distance(from: GeoJSON.Feature<GeoJSON.Point>, to: GeoJSON.Feature<GeoJSON.Point>, units?: string): number;
-
-    /**
-    * Takes any number of features and returns a rectangular Polygon that encompasses all vertices.
-    * @param fc Input features
-    * @returns A rectangular Polygon feature that encompasses all vertices
-    */
-    function envelope(fc: GeoJSON.FeatureCollection<any>): GeoJSON.Feature<GeoJSON.Polygon>;
-
-    /**
-    * Takes a set of features, calculates the extent of all input features, and returns a bounding box.
-    * @param input Input features
-    * @returns The bounding box of input given as an array in WSEN order (west, south, east, north)
-    */
-    function extent(input: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): Array<number>;
-
-    /**
-    * Takes a line and measures its length in the specified units.
-    * @param line Line to measure
-    * @param units 'miles', 'kilometers', 'radians', or 'degrees'
-    * @returns Length of the input line
-    */
-    function lineDistance(line: GeoJSON.Feature<GeoJSON.LineString>, units: string): number;
-
-    /**
-    * Takes two points and returns a point midway between them.
-    * @param pt1 First point
-    * @param pt2 Second point
-    * @returns A point midway between pt1 and pt2
-    */
-    function midpoint(pt1: GeoJSON.Feature<GeoJSON.Point>, pt2: GeoJSON.Feature<GeoJSON.Point>): GeoJSON.Feature<GeoJSON.Point>;
-
-    /**
-    * Takes a feature and returns a Point guaranteed to be on the surface of the feature. Given a Polygon, the point will be in the area of the polygon.
-    * Given a LineString, the point will be along the string. Given a Point, the point will the same as the input.
-    * @param input Any feature or set of features
-    * @returns A point on the surface of input
-    */
-    function pointOnSurface(input: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): GeoJSON.Feature<any>;
-
-    /**
-    * Takes a bounding box and returns a new bounding box with a size expanded or contracted by a factor of X.
-    * @param bbox A bounding box
-    * @param factor The ratio of the new bbox to the input bbox
-    * @returns The resized bbox
-    */
-    function size(bbox: Array<number>, factor: number): Array<number>;
-
-    /**
-    * Takes a bounding box and calculates the minimum square bounding box that would contain the input.
-    * @param bbox A bounding box
-    * @returns A square surrounding bbox
-    */
-    function square(bbox: Array<number>): Array<number>;
-
-    //////////////////////////////////////////////////////
-    // Transformation
-    //////////////////////////////////////////////////////
-
-    /**
-    * Takes a line and returns a curved version by applying a Bezier spline algorithm.
-    * The bezier spline implementation is by Leszek Rybicki.
-    * @param line Input LineString
-    * @param [resolution=10000] Time in milliseconds between points
-    * @param [sharpness=0.85] A measure of how curvy the path should be between splines
-    * @returns Curved line
-    */
-    function bezier(line: GeoJSON.Feature<GeoJSON.LineString>, resolution?: number, sharpness?: number): GeoJSON.Feature<GeoJSON.LineString>;
-
-    /**
-    * Calculates a buffer for input features for a given radius. Units supported are miles, kilometers, and degrees.
-    * @param feature Input to be buffered
-    * @param distance Distance to draw the buffer
-    * @param units 'miles', 'kilometers', 'radians', or 'degrees'
-    * @returns Buffered features
-    */
-    function buffer(feature: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>, distance: number, units: string): GeoJSON.FeatureCollection<GeoJSON.Polygon> | GeoJSON.FeatureCollection<GeoJSON.MultiPolygon> | GeoJSON.Polygon | GeoJSON.MultiPolygon;
-
-    /**
-    * Takes a set of points and returns a concave hull polygon. Internally, this implements a Monotone chain algorithm.
-    * @param points Input points
-    * @param maxEdge The size of an edge necessary for part of the hull to become concave (in miles)
-    * @param units Used for maxEdge distance (miles or kilometers)
-    * @returns A concave hull
-    */
-    function concave(points: GeoJSON.FeatureCollection<GeoJSON.Point>, maxEdge: number, units: string): GeoJSON.Feature<GeoJSON.Polygon>;
-
-    /**
-    * Takes a set of points and returns a convex hull polygon. Internally this uses the convex-hull module that implements a monotone chain hull.
-    * @param input Input points
-    * @returns A convex hull
-    */
-    function convex(input: GeoJSON.FeatureCollection<GeoJSON.Point>): GeoJSON.Feature<GeoJSON.Polygon>;
-
-    /**
-    * Finds the difference between two polygons by clipping the second polygon from the first.
-    * @param poly1 Input Polygon feaure
-    * @param poly2 Polygon feature to difference from poly1
-    * @returns A Polygon feature showing the area of poly1 excluding the area of poly2
-    */
-    function difference(poly1: GeoJSON.Feature<GeoJSON.Polygon>, poly2: GeoJSON.Feature<GeoJSON.Polygon>): GeoJSON.Feature<GeoJSON.Polygon>;
-
-    /**
-    * Takes two polygons and finds their intersection.
-    *  If they share a border, returns the border; if they don't intersect, returns undefined.
-    * @param poly1 The first polygon
-    * @param poly2 The second polygon
-    * @returns If poly1 and poly2 overlap, returns a Polygon feature representing the area they overlap;
-    * if poly1 and poly2 do not overlap, returns undefined;
-    * if poly1 and poly2 share a border, a MultiLineString of the locations where their borders are shared
-    */
-    function intersect(poly1: GeoJSON.Feature<GeoJSON.Polygon>, poly2: GeoJSON.Feature<GeoJSON.Polygon>): GeoJSON.Feature<GeoJSON.Polygon | GeoJSON.MultiLineString> | typeof undefined;
-
-    /**
-    * Takes a set of polygons and returns a single merged polygon feature.
-    * If the input polygon features are not contiguous, this function returns a MultiPolygon feature.
-    * @param fc Input polygons
-    * @returns Merged polygon or multipolygon
-    */
-    function merge(fc: GeoJSON.FeatureCollection<GeoJSON.Polygon>): GeoJSON.Feature<GeoJSON.Polygon | GeoJSON.MultiPolygon>;
-
-    /**
-    * Takes a LineString or Polygon and returns a simplified version.
-    * Internally uses simplify-js to perform simplification.
-    * @param feature Feature to be simplified
-    * @param tolerance Simplification tolerance
-    * @param highQuality Whether or not to spend more time to create a higher-quality simplification with a different algorithm
-    * @returns A simplified feature
-    */
-    function simplify(feature: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any> | GeoJSON.GeometryCollection, tolerance: number, highQuality: boolean): GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any> | GeoJSON.GeometryCollection;
-
-    /**
-    * Takes two polygons and returns a combined polygon.
-    * If the input polygons are not contiguous, this function returns a MultiPolygon feature.
-    * @param poly1 Input polygon
-    * @param poly2 Another input polygon
-    * @returns A combined Polygon or MultiPolygon feature
-    */
-    function union(poly1: GeoJSON.Feature<GeoJSON.Polygon>, poly2: GeoJSON.Feature<GeoJSON.Polygon>): GeoJSON.Feature<GeoJSON.Polygon | GeoJSON.MultiPolygon>;
-
-    //////////////////////////////////////////////////////
-    // Misc
-    //////////////////////////////////////////////////////
-
-    /**
-    * Combines a FeatureCollection of Point, LineString, or Polygon features into MultiPoint, MultiLineString, or MultiPolygon features.
-    * @param fc A FeatureCollection of any type
-    * @returns A FeatureCollection of corresponding type to input
-    */
-    function combine(fc: GeoJSON.FeatureCollection<any>): GeoJSON.FeatureCollection<any>;
-
-    /**
-    * Takes a feature or set of features and returns all positions as points.
-    * @param input Input features
-    * @returns Points representing the exploded input features
-    */
-    function explode(input: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): GeoJSON.FeatureCollection<GeoJSON.Point>;
-
-    /**
-    * Takes input features and flips all of their coordinates from [x, y] to [y, x].
-    * @param input Input features
-    * @returns A feature or set of features of the same type as input with flipped coordinates
-    */
-    function flip(input: GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>): GeoJSON.Feature<any> | GeoJSON.FeatureCollection<any>;
-
-    /**
-    * Takes a polygon and returns points at all self-intersections.
-    * @param polygon Input polygon
-    * @returns Self-intersections
-    */
-    function kinks(polygon: GeoJSON.Feature<GeoJSON.Polygon>): GeoJSON.FeatureCollection<GeoJSON.Point>;
-
-    /**
-    * Takes a line, a start Point, and a stop point and returns the line in between those points.
-    * @param point1 Starting point
-    * @param point2 Stopping point
-    * @param line Line to slice
-    * @returns Sliced line
-    */
-    function lineSlice(point1: GeoJSON.Feature<GeoJSON.Point>, point2: GeoJSON.Feature<GeoJSON.Point>, line: GeoJSON.Feature<GeoJSON.LineString>): GeoJSON.Feature<GeoJSON.LineString>;
-
-    /**
-    * Takes a Point and a LineString and calculates the closest Point on the LineString.
-    * @param line Line to snap to
-    * @param point Point to snap from
-    * @returns Closest point on the line to point
-    */
-    function pointOnLine(line: GeoJSON.Feature<GeoJSON.LineString>, point: GeoJSON.Feature<GeoJSON.Point>): GeoJSON.Feature<GeoJSON.Point>;
-
-    //////////////////////////////////////////////////////
-    // Helper
-    //////////////////////////////////////////////////////
-
-    /**
-    * Takes one or more Features and creates a FeatureCollection.
-    * @param features Input features
-    * @returns A FeatureCollection of input features
-    */
-    function featurecollection(features: Array<GeoJSON.Feature<any>>): GeoJSON.FeatureCollection<any>;
-
-    /**
-    * Creates a LineString based on a coordinate array. Properties can be added optionally.
-    * @param coordinates An array of Positions
-    * @param [properties] An Object of key-value pairs to add as properties
-    * @returns A LineString feature
-    */
-    function linestring(coordinates: Array<Array<number>>, properties?: any): GeoJSON.Feature<GeoJSON.LineString>;
-
-    /**
-    * Takes coordinates and properties (optional) and returns a new Point feature.
-    * @param coordinates Longitude, latitude position (each in decimal degrees)
-    * @param [properties] An Object of key-value pairs to add as properties
-    * @returns A Point feature
-    */
-    function point(coordinates: Array<number>, properties?: any): GeoJSON.Feature<GeoJSON.Point>;
-
-    /**
-    * Takes an array of LinearRings and optionally an Object with properties and returns a Polygon feature.
-    * @param rings An array of LinearRings
-    * @param [properties] An Object of key-value pairs to add as properties
-    * @returns A Polygon feature
-    */
-    function polygon(rings: Array<Array<Array<number>>>, properties?: any): GeoJSON.Feature<GeoJSON.Polygon>;
-
-    //////////////////////////////////////////////////////
-    // Data
-    //////////////////////////////////////////////////////
-
-    /**
-    * Takes a FeatureCollection and filters it by a given property and value.
-    * @param features Input features
-    * @param key The property on which to filter
-    * @param value The value of that property on which to filter
-    * @returns A filtered collection with only features that match input key and value
-    */
-    function filter(features: GeoJSON.FeatureCollection<any>, key: string, value: string): GeoJSON.FeatureCollection<any>;
-
-    /**
-    * Generates random GeoJSON data, including Points and Polygons, for testing and experimentation.
-    * @param [type='point'] Type of features desired: 'points' or 'polygons'
-    * @param [count=1] How many geometries should be generated.
-    * @param [options] Options relevant to the feature desired. Can include:
-    *   - A bounding box inside of which geometries are placed. In the case of Point features, they are guaranteed to be within this bounds, while Polygon features have their centroid within the bounds.
-    *   - The number of vertices added to polygon features. Default is 10;
-    *   - The total number of decimal degrees longitude or latitude that a polygon can extent outwards to from its center. Default is 10.
-    * @returns Generated random features
-    */
-    function random(type?: string, count?: number, options?: {bbox?: Array<number>; num_vertices?: number; max_radial_length?: number;}): GeoJSON.FeatureCollection<any>;
-
-    /**
-    * Takes a FeatureCollection of any type, a property, and a value and returns a FeatureCollection with features matching that property-value pair removed.
-    * @param features Set of input features
-    * @param property The property to remove
-    * @param value The value to remove
-    * @returns The resulting FeatureCollection without features that match the property-value pair
-    */
-    function remove(features: GeoJSON.FeatureCollection<any>, property: string, value: string): GeoJSON.FeatureCollection<any>;
-
-    /**
-    * Takes a FeatureCollection and returns a FeatureCollection with given number of features at random.
-    * @param features Set of input features
-    * @param n Number of features to select
-    * @returns A FeatureCollection with n features
-    */
-    function sample(features: GeoJSON.FeatureCollection<any>, n: number): GeoJSON.FeatureCollection<any>;
-
-    //////////////////////////////////////////////////////
-    // Interpolation
-    //////////////////////////////////////////////////////
-
-    /**
-    * Takes a bounding box and a cell size in degrees and returns a FeatureCollection of flat-topped hexagons (Polygon features) aligned in an "odd-q" vertical grid as described in Hexagonal Grids.
-    * @param bbox Bounding box in [minX, minY, maxX, maxY] order
-    * @param cellWidth Width of cell in specified units
-    * @param units Used in calculating cellWidth ('miles' or 'kilometers')
-    * @returns A hexagonal grid
-    */
-    function hexGrid(bbox: Array<number>, cellWidth: number, units: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-    * Takes points with z-values and an array of value breaks and generates isolines.
-    * @param points Input points
-    * @param z The property name in points from which z-values will be pulled
-    * @param resolution Resolution of the underlying grid
-    * @param breaks Where to draw contours
-    * @returns Isolines
-    */
-    function isolines(points: GeoJSON.FeatureCollection<GeoJSON.Point>, z: string, resolution: number, breaks: Array<number>): GeoJSON.FeatureCollection<GeoJSON.LineString>;
-
-    /**
-    * Takes a triangular plane as a Polygon and a Point within that triangle and returns the z-value at that point.
-    * The Polygon needs to have properties a, b, and c that define the values at its three corners.
-    * @param interpolatedPoint The Point for which a z-value will be calculated
-    * @param triangle A Polygon feature with three vertices
-    * @returns The z-value for interpolatedPoint
-    */
-    function planepoint(interpolatedpoint: GeoJSON.Feature<GeoJSON.Point>, triangle: GeoJSON.Feature<GeoJSON.Polygon>): number;
-
-    /**
-    * Takes a bounding box and a cell depth and returns a set of points in a grid.
-    * @param extent Extent in [minX, minY, maxX, maxY] order
-    * @param cellWidth The distance across each cell
-    * @param units Used in calculating cellWidth ('miles' or 'kilometers')
-    * @returns Grid of points
-    */
-    function pointGrid(extent: Array<number>, cellWidth: number, units: string): GeoJSON.FeatureCollection<GeoJSON.Point>;
-
-    /**
-    * Takes a bounding box and a cell depth and returns a set of square polygons in a grid.
-    * @param extent Extent in [minX, minY, maxX, maxY] order
-    * @param cellWidth Width of each cell
-    * @param units Used in calculating cellWidth ('miles' or 'kilometers')
-    * @returns Grid of polygons
-    */
-    function squareGrid(extent: Array<number>, cellWidth: number, units: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-    * Takes a set of points and the name of a z-value property and creates a Triangulated Irregular Network, or a TIN for short, returned as a collection of Polygons.
-    * These are often used for developing elevation contour maps or stepped heat visualizations.
-    * This triangulates the points, as well as adds properties called a, b, and c representing the value of the given propertyName at each of the points that represent the corners of the triangle.
-    * @param points Input points
-    * @param [propertyName] Name of the property from which to pull z values This is optional: if not given, then there will be no extra data added to the derived triangles.
-    * @returns TIN output
-    */
-    function tin(points: GeoJSON.FeatureCollection<GeoJSON.Point>, propertyName?: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    /**
-    * Takes a bounding box and a cell depth and returns a set of triangular polygons in a grid.
-    * @param extent Extent in [minX, minY, maxX, maxY] order
-    * @param cellWidth Width of each cell
-    * @param units Used in calculating cellWidth ('miles' or 'kilometers')
-    * @returns Grid of triangles
-    */
-    function triangleGrid(extent: Array<number>, cellWidth: number, units: string): GeoJSON.FeatureCollection<GeoJSON.Polygon>;
-
-    //////////////////////////////////////////////////////
-    // Joins
-    //////////////////////////////////////////////////////
-
-    /**
-    * Takes a Point and a Polygon or MultiPolygon and determines if the point resides inside the polygon.
-    * The polygon can be convex or concave. The function accounts for holes.
-    * @param point Input point
-    * @param polygon Input polygon or multipolygon
-    * @returns true if the Point is inside the Polygon; false if the Point is not inside the Polygon
-    */
-    function inside(point: GeoJSON.Feature<GeoJSON.Point>, polygon: GeoJSON.Feature<GeoJSON.Polygon>): boolean;
-
-    /**
-    * Takes a set of points and a set of polygons and performs a spatial join.
-    * @param points Input points
-    * @param polygons Input polygons
-    * @param polyId Property in polygons to add to joined Point features
-    * @param containingPolyId Property in points in which to store joined property from polygons
-    * @returns Points with containingPolyId property containing values from polyId
-    */
-    function tag(points: GeoJSON.FeatureCollection<GeoJSON.Point>, polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>, polyId: string, containingPolyId: string): GeoJSON.FeatureCollection<GeoJSON.Point>;
-
-    /**
-    * Takes a set of points and a set of polygons and returns the points that fall within the polygons.
-    * @param points Input points
-    * @param polygons Input polygons
-    * @returns Points that land within at least one polygon
-    */
-    function within(points: GeoJSON.FeatureCollection<GeoJSON.Point>, polygons: GeoJSON.FeatureCollection<GeoJSON.Polygon>): GeoJSON.FeatureCollection<GeoJSON.Point>;
-
-    //////////////////////////////////////////////////////
-    // Classification
-    //////////////////////////////////////////////////////
-
-    /**
-    * Takes a set of features and returns an array of the Jenks Natural breaks for a given property.
-    * @param input Input features
-    * @param field The property in input on which to calculate Jenks natural breaks
-    * @param numberOfBreaks Number of classes in which to group the data
-    * @returns The break number for each class plus the minimum and maximum values
-    */
-    function jenks(input: GeoJSON.FeatureCollection<any>, field: string, numberOfBreaks: number): Array<number>;
-
-    /**
-    * Takes a reference point and a set of points and returns the point from the set closest to the reference.
-    * @param point The reference point
-    * @param against Input point set
-    * @returns The closest point in the set to the reference point
-    */
-    function nearest(point: GeoJSON.Feature<GeoJSON.Point>, against: GeoJSON.FeatureCollection<GeoJSON.Point>): GeoJSON.Feature<GeoJSON.Point>;
-
-    /**
-    * Takes a FeatureCollection, a property name, and a set of percentiles and returns a quantile array.
-    * @param input Set of features
-    * @param field The property in input from which to retrieve quantile values
-    * @param percentiles An Array of percentiles on which to calculate quantile values
-    * @returns An array of the break values
-    */
-    function quantile(input: GeoJSON.FeatureCollection<any>, field: string, percentiles: Array<number>): Array<number>;
-
-    /**
-    * Takes a FeatureCollection, an input field, an output field, and an array of translations and outputs an identical FeatureCollection with the output field property populated.
-    * @param input Set of input features
-    * @param inField The field to translate
-    * @param outField The field in which to store translated results
-    * @param translations An array of translations
-    * @returns A FeatureCollection with identical geometries to input but with outField populated.
-    */
-    function reclass(input: GeoJSON.FeatureCollection<any>, inField: string, outField: string, translations: Array<any>): GeoJSON.FeatureCollection<any>;
-}
diff --git a/tv4/index.d.ts b/tv4/index.d.ts
new file mode 100644
index 0000000000..52b4121c67
--- /dev/null
+++ b/tv4/index.d.ts
@@ -0,0 +1,102 @@
+// Type definitions for Tiny Validator tv4 1.2.5
+// Project: https://github.com/geraintluff/tv4
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Peter Snider <https://github.com/psnider>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace tv4 {
+
+    // Note that every top-level property is optional in json-schema
+    export interface JsonSchema {
+        [key: string]: any;
+        title?: string;          // used for humans only, and not used for computation
+        description?: string;    // used for humans only, and not used for computation
+        id?: string;
+        $schema?: string;
+        type?: string;
+        items?: any;
+        properties?: any;
+        patternProperties?: any;
+        additionalProperties?: boolean;
+        required?: string[];
+        definitions?: any;
+        default?: any;
+    }
+
+    export type SchemaMap = {[uri: string]: JsonSchema;};
+    // maps error codes/names to human readable error description for a single language
+    export type ErrorMap  = {[errorCode: string]: string;};
+
+
+    export interface ErrorCodes {
+        [key:string]:number;
+    }
+    export interface ValidationError {
+        code:number;
+        message:any;
+        dataPath?:string;
+        schemaPath?:string;
+        subErrors?: ValidationError[];
+    }
+    export interface ErrorVar extends ValidationError {
+        params: any;
+        subErrors: any;
+        stack: string;
+    }
+    export interface BaseResult {
+        missing:string[];
+        valid:boolean;
+    }
+    export interface SingleResult extends BaseResult {
+        error:ValidationError;
+    }
+    export interface MultiResult extends BaseResult {
+        errors:ValidationError[];
+    }
+    export type FormatValidationFunction = (data: any, schema: JsonSchema) => string;
+    // documentation doesnt agree with code in tv4, this type agrees with code
+    export type KeywordValidationFunction = (data: any, value: any, schema: JsonSchema, dataPointerPath: string) => string | ValidationError;
+    export type AsyncValidationCallback = (isValid: boolean, error: ValidationError) => void;
+    export interface TV4 {
+        error: ErrorVar;
+        missing: string[];
+        // primary API
+        validate(data: any, schema: JsonSchema, checkRecursive?: boolean): boolean;
+        validate(data: any, schema: JsonSchema, checkRecursive: boolean, banUnknownProperties: boolean): boolean;
+        validateResult(data: any, schema: JsonSchema, checkRecursive?: boolean): SingleResult;
+        validateResult(data: any, schema: JsonSchema, checkRecursive: boolean, banUnknownProperties: boolean): SingleResult;
+        validateMultiple(data: any, schema: JsonSchema, checkRecursive?: boolean): MultiResult;
+        validateMultiple(data: any, schema: JsonSchema, checkRecursive: boolean, banUnknownProperties: boolean): MultiResult;
+        // from including: tv4.async-jquery.js
+        validate(data: any, schema: JsonSchema, callback: AsyncValidationCallback, checkRecursive?: boolean): void;
+        validate(data: any, schema: JsonSchema, callback: AsyncValidationCallback, checkRecursive: boolean, banUnknownProperties: boolean): void;
+
+        // additional API for more complex cases
+        addSchema(schema: JsonSchema): void;
+        addSchema(uri:string, schema: JsonSchema): void;
+        getSchema(uri:string): JsonSchema;
+        getSchemaMap(): SchemaMap;
+        getSchemaUris(filter?: RegExp): string[];
+        getMissingUris(filter?: RegExp): string[];
+        dropSchemas(): void;
+        freshApi(): TV4;
+        reset(): void;
+        setErrorReporter(lang: string): void;
+        setErrorReporter(reporter: (error: ValidationError, data: any, schema: JsonSchema) => string): void;
+        language(code: string): void;
+        addLanguage(code: string, map: ErrorMap): void;
+        addFormat(format: string, validationFunction: FormatValidationFunction): void;
+        addFormat(formats: {[formatName: string]: FormatValidationFunction;}): void;
+        defineKeyword(keyword: string, validationFunction: KeywordValidationFunction): void;
+        defineError(codeName: string, codeNumber: number, defaultMessage: string): void;
+
+        // not documented
+        normSchema(schema: JsonSchema, baseUri:string):any;
+        resolveUrl(base:string, href:string):string;
+
+        errorCodes:ErrorCodes;
+    }
+}
+
+declare var tv4: tv4.TV4;
+export = tv4;
+export as namespace tv4;
diff --git a/tv4/tsconfig.json b/tv4/tsconfig.json
new file mode 100644
index 0000000000..69e9d63d4c
--- /dev/null
+++ b/tv4/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "tv4-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/tv4/tv4-tests.ts b/tv4/tv4-tests.ts
index 84a4ee328f..f1cf61171c 100644
--- a/tv4/tv4-tests.ts
+++ b/tv4/tv4-tests.ts
@@ -1,5 +1,4 @@
-///<reference path="tv4.d.ts" />
-
+import tv4 = require("tv4");
 var str:string;
 var strArr:string[];
 var bool:boolean;
diff --git a/tv4/tv4.d.ts b/tv4/tv4.d.ts
deleted file mode 100644
index 9171b953d7..0000000000
--- a/tv4/tv4.d.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-// Type definitions for Tiny Validator tv4 1.2.5
-// Project: https://github.com/geraintluff/tv4
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Peter Snider <https://github.com/psnider>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace tv4 {
-
-    // Note that every top-level property is optional in json-schema
-    export interface JsonSchema {
-        [key: string]: any;
-        title?: string;          // used for humans only, and not used for computation
-        description?: string;    // used for humans only, and not used for computation
-        id?: string;
-        $schema?: string;
-        type?: string;
-        items?: any;
-        properties?: any;
-        patternProperties?: any;
-        additionalProperties?: boolean;
-        required?: string[];
-        definitions?: any;
-        default?: any;
-    }
-
-    export type SchemaMap = {[uri: string]: JsonSchema;};
-    // maps error codes/names to human readable error description for a single language
-    export type ErrorMap  = {[errorCode: string]: string;};
-
-
-    export interface ErrorCodes {
-        [key:string]:number;
-    }
-    export interface ValidationError {
-        code:number;
-        message:any;
-        dataPath?:string;
-        schemaPath?:string;
-        subErrors?: ValidationError[];
-    }
-    export interface ErrorVar extends ValidationError {
-        params: any;
-        subErrors: any;
-        stack: string;
-    }
-    export interface BaseResult {
-        missing:string[];
-        valid:boolean;
-    }
-    export interface SingleResult extends BaseResult {
-        error:ValidationError;
-    }
-    export interface MultiResult extends BaseResult {
-        errors:ValidationError[];
-    }
-    export type FormatValidationFunction = (data: any, schema: JsonSchema) => string;
-    // documentation doesnt agree with code in tv4, this type agrees with code
-    export type KeywordValidationFunction = (data: any, value: any, schema: JsonSchema, dataPointerPath: string) => string | ValidationError;
-    export type AsyncValidationCallback = (isValid: boolean, error: ValidationError) => void;
-    export interface TV4 {
-        error: ErrorVar;
-        missing: string[];
-        // primary API
-        validate(data: any, schema: JsonSchema, checkRecursive?: boolean): boolean;
-        validate(data: any, schema: JsonSchema, checkRecursive: boolean, banUnknownProperties: boolean): boolean;
-        validateResult(data: any, schema: JsonSchema, checkRecursive?: boolean): SingleResult;
-        validateResult(data: any, schema: JsonSchema, checkRecursive: boolean, banUnknownProperties: boolean): SingleResult;
-        validateMultiple(data: any, schema: JsonSchema, checkRecursive?: boolean): MultiResult;
-        validateMultiple(data: any, schema: JsonSchema, checkRecursive: boolean, banUnknownProperties: boolean): MultiResult;
-        // from including: tv4.async-jquery.js
-        validate(data: any, schema: JsonSchema, callback: AsyncValidationCallback, checkRecursive?: boolean): void;
-        validate(data: any, schema: JsonSchema, callback: AsyncValidationCallback, checkRecursive: boolean, banUnknownProperties: boolean): void;
-
-        // additional API for more complex cases
-        addSchema(schema: JsonSchema): void;
-        addSchema(uri:string, schema: JsonSchema): void;
-        getSchema(uri:string): JsonSchema;
-        getSchemaMap(): SchemaMap;
-        getSchemaUris(filter?: RegExp): string[];
-        getMissingUris(filter?: RegExp): string[];
-        dropSchemas(): void;
-        freshApi(): TV4;
-        reset(): void;
-        setErrorReporter(lang: string): void;
-        setErrorReporter(reporter: (error: ValidationError, data: any, schema: JsonSchema) => string): void;
-        language(code: string): void;
-        addLanguage(code: string, map: ErrorMap): void;
-        addFormat(format: string, validationFunction: FormatValidationFunction): void;
-        addFormat(formats: {[formatName: string]: FormatValidationFunction;}): void;
-        defineKeyword(keyword: string, validationFunction: KeywordValidationFunction): void;
-        defineError(codeName: string, codeNumber: number, defaultMessage: string): void;
-
-        // not documented
-        normSchema(schema: JsonSchema, baseUri:string):any;
-        resolveUrl(base:string, href:string):string;
-
-        errorCodes:ErrorCodes;
-    }
-}
-
-declare module "tv4" {
-    var out: tv4.TV4
-    export = out;
-}
diff --git a/tween.js/tween.js.d.ts b/tween.js/index.d.ts
similarity index 100%
rename from tween.js/tween.js.d.ts
rename to tween.js/index.d.ts
diff --git a/tween.js/tsconfig.json b/tween.js/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/tween.js/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tweenjs/index.d.ts b/tweenjs/index.d.ts
new file mode 100644
index 0000000000..bcc3c87778
--- /dev/null
+++ b/tweenjs/index.d.ts
@@ -0,0 +1,166 @@
+// Type definitions for TweenJS 0.6.0
+// Project: http://www.createjs.com/#!/TweenJS
+// Definitions by: Pedro Ferreira <https://bitbucket.org/drk4>, Chris Smith <https://github.com/evilangelist>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*
+    Copyright (c) 2012 Pedro Ferreira
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+// Library documentation : http://www.createjs.com/Docs/TweenJS/modules/TweenJS.html
+
+/// <reference types="createjs-lib" />
+
+declare namespace createjs {
+    export class CSSPlugin {
+        constructor();
+
+        // properties
+        static cssSuffixMap: Object;
+
+        // methods
+        static install(): void;
+    }
+
+    export class Ease {
+        // methods
+        static backIn: (amount: number) => number;
+        static backInOut: (amount: number) => number;
+        static backOut: (amount: number) => number;
+        static bounceIn: (amount: number) => number;
+        static bounceInOut: (amount: number) => number;
+        static bounceOut: (amount: number) => number;
+        static circIn: (amount: number) => number;
+        static circInOut: (amount: number) => number;
+        static circOut: (amount: number) => number;
+        static cubicIn: (amount: number) => number;
+        static cubicInOut: (amount: number) => number;
+        static cubicOut: (amount: number) => number;
+        static elasticIn: (amount: number) => number;
+        static elasticInOut: (amount: number) => number;
+        static elasticOut: (amount: number) => number;
+        static get(amount: number): (amount: number) => number;
+        static getBackIn(amount: number): (amount: number) => number;
+        static getBackInOut(amount: number): (amount: number) => number;
+        static getBackOut(amount: number): (amount: number) => number;
+        static getElasticIn(amplitude: number, period: number): (amount: number) => number;
+        static getElasticInOut(amplitude: number, period: number): (amount: number) => number;
+        static getElasticOut(amplitude: number, period: number): (amount: number) => number;
+        static getPowIn(pow: number): (amount: number) => number;
+        static getPowInOut(pow: number): (amount: number) => number;
+        static getPowOut(pow: number): (amount: number) => number;
+        static linear: (amount: number) => number;
+        static none: (amount: number) => number;    // same as linear
+        static quadIn: (amount: number) => number;
+        static quadInOut: (amount: number) => number;
+        static quadOut: (amount: number) => number;
+        static quartIn: (amount: number) => number;
+        static quartInOut: (amount: number) => number;
+        static quartOut: (amount: number) => number;
+        static quintIn: (amount: number) => number;
+        static quintInOut: (amount: number) => number;
+        static quintOut: (amount: number) => number;
+        static sineIn: (amount: number) => number;
+        static sineInOut: (amount: number) => number;
+        static sineOut: (amount: number) => number;
+    }
+
+    export class MotionGuidePlugin {
+        constructor();
+
+        //methods
+        static install(): Object;
+    }
+
+    /*
+        NOTE: It is commented out because it conflicts with SamplePlugin Class of PreloadJS.
+              this class is mainly for documentation purposes.
+        http://www.createjs.com/Docs/TweenJS/classes/SamplePlugin.html
+    */
+    /*
+    export class SamplePlugin {
+        constructor();
+
+        // properties
+        static priority: any;
+
+        //methods
+        static init(tween: Tween, prop: string, value: any): any;
+        static step(tween: Tween, prop: string, startValue: any, injectProps: Object, endValue: any): void;
+        static install(): void;
+        static tween(tween: Tween, prop: string, value: any, startValues: Object, endValues: Object, ratio: number, wait: boolean, end: boolean): any;
+    }
+    */
+
+    export class Timeline extends EventDispatcher {
+        constructor (tweens: Tween[], labels: Object, props: Object);
+
+        // properties
+        duration: number;
+        ignoreGlobalPause: boolean;
+        loop: boolean;
+        position: Object;
+
+        // methods
+        addLabel(label: string, position: number): void;
+        addTween(...tween: Tween[]): void;
+        getCurrentLabel(): string;
+        getLabels(): Object[];
+        gotoAndPlay(positionOrLabel: string | number): void;
+        gotoAndStop(positionOrLabel: string | number): void;
+        removeTween(...tween: Tween[]): void;
+        resolve(positionOrLabel: string | number): number;
+        setLabels(o: Object): void;
+        setPaused(value: boolean): void;
+        setPosition(value: number, actionsMode?: number): boolean;
+        tick(delta: number): void;
+        updateDuration(): void;
+    }
+
+
+    export class Tween extends EventDispatcher {
+        constructor(target: Object, props?: Object, pluginData?: Object);
+
+        // properties
+        duration: number;
+        static IGNORE: Object;
+        ignoreGlobalPause: boolean;
+        static LOOP: number;
+        loop: boolean;
+        static NONE: number;
+        onChange: Function; // deprecated
+        passive: boolean;
+        pluginData: Object;
+        position: number;
+        static REVERSE: number;
+        target: Object;
+
+        // methods
+        call(callback: (tweenObject: Tween) => any, params?: any[], scope?: Object): Tween;    // when 'params' isn't given, the callback receives a tweenObject
+        call(callback: (...params: any[]) => any, params?: any[], scope?: Object): Tween; // otherwise, it receives the params only
+        static get(target: Object, props?: Object, pluginData?: Object, override?: boolean): Tween;
+        static hasActiveTweens(target?: Object): boolean;
+        static installPlugin(plugin: Object, properties: any[]): void;
+        pause(tween: Tween): Tween;
+        play(tween: Tween): Tween;
+        static removeAllTweens(): void;
+        static removeTweens(target: Object): void;
+        set(props: Object, target?: Object): Tween;
+        setPaused(value: boolean): Tween;
+        setPosition(value: number, actionsMode: number): boolean;
+        static tick(delta: number, paused: boolean): void;
+        tick(delta: number): void;
+        to(props: Object, duration?: number, ease?: (t: number) => number): Tween;
+        wait(duration: number, passive?: boolean): Tween;
+
+    }
+
+    export class TweenJS {
+        // properties
+        static buildDate: string;
+        static version: string;
+    }
+}
diff --git a/tweenjs/tsconfig.json b/tweenjs/tsconfig.json
new file mode 100644
index 0000000000..a3d7ddb4a2
--- /dev/null
+++ b/tweenjs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "tweenjs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tweenjs/tweenjs-tests.ts b/tweenjs/tweenjs-tests.ts
index 080c6c954b..c326d8f8f1 100644
--- a/tweenjs/tweenjs-tests.ts
+++ b/tweenjs/tweenjs-tests.ts
@@ -1,5 +1,4 @@
-///<reference path="./tweenjs.d.ts"/>
-///<reference path="../easeljs/easeljs.d.ts"/>
+/// <reference types="easeljs"/>
 
 var target = new createjs.DisplayObject();
 
diff --git a/tweenjs/tweenjs.d.ts b/tweenjs/tweenjs.d.ts
deleted file mode 100644
index 3d303cf173..0000000000
--- a/tweenjs/tweenjs.d.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-// Type definitions for TweenJS 0.6.0
-// Project: http://www.createjs.com/#!/TweenJS
-// Definitions by: Pedro Ferreira <https://bitbucket.org/drk4>, Chris Smith <https://github.com/evilangelist>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/*
-    Copyright (c) 2012 Pedro Ferreira
-    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-// Library documentation : http://www.createjs.com/Docs/TweenJS/modules/TweenJS.html
-
-/// <reference path="../createjs-lib/createjs-lib.d.ts" />
-
-declare namespace createjs {
-    export class CSSPlugin {
-        constructor();
-
-        // properties
-        static cssSuffixMap: Object;
-
-        // methods
-        static install(): void;
-    }
-
-    export class Ease {
-        // methods
-        static backIn: (amount: number) => number;
-        static backInOut: (amount: number) => number;
-        static backOut: (amount: number) => number;
-        static bounceIn: (amount: number) => number;
-        static bounceInOut: (amount: number) => number;
-        static bounceOut: (amount: number) => number;
-        static circIn: (amount: number) => number;
-        static circInOut: (amount: number) => number;
-        static circOut: (amount: number) => number;
-        static cubicIn: (amount: number) => number;
-        static cubicInOut: (amount: number) => number;
-        static cubicOut: (amount: number) => number;
-        static elasticIn: (amount: number) => number;
-        static elasticInOut: (amount: number) => number;
-        static elasticOut: (amount: number) => number;
-        static get(amount: number): (amount: number) => number;
-        static getBackIn(amount: number): (amount: number) => number;
-        static getBackInOut(amount: number): (amount: number) => number;
-        static getBackOut(amount: number): (amount: number) => number;
-        static getElasticIn(amplitude: number, period: number): (amount: number) => number;
-        static getElasticInOut(amplitude: number, period: number): (amount: number) => number;
-        static getElasticOut(amplitude: number, period: number): (amount: number) => number;
-        static getPowIn(pow: number): (amount: number) => number;
-        static getPowInOut(pow: number): (amount: number) => number;
-        static getPowOut(pow: number): (amount: number) => number;
-        static linear: (amount: number) => number;
-        static none: (amount: number) => number;    // same as linear
-        static quadIn: (amount: number) => number;
-        static quadInOut: (amount: number) => number;
-        static quadOut: (amount: number) => number;
-        static quartIn: (amount: number) => number;
-        static quartInOut: (amount: number) => number;
-        static quartOut: (amount: number) => number;
-        static quintIn: (amount: number) => number;
-        static quintInOut: (amount: number) => number;
-        static quintOut: (amount: number) => number;
-        static sineIn: (amount: number) => number;
-        static sineInOut: (amount: number) => number;
-        static sineOut: (amount: number) => number;
-    }
-
-    export class MotionGuidePlugin {
-        constructor();
-
-        //methods
-        static install(): Object;
-    }
-
-    /*
-        NOTE: It is commented out because it conflicts with SamplePlugin Class of PreloadJS.
-              this class is mainly for documentation purposes.
-        http://www.createjs.com/Docs/TweenJS/classes/SamplePlugin.html
-    */
-    /*
-    export class SamplePlugin {
-        constructor();
-
-        // properties
-        static priority: any;
-
-        //methods
-        static init(tween: Tween, prop: string, value: any): any;
-        static step(tween: Tween, prop: string, startValue: any, injectProps: Object, endValue: any): void;
-        static install(): void;
-        static tween(tween: Tween, prop: string, value: any, startValues: Object, endValues: Object, ratio: number, wait: boolean, end: boolean): any;
-    }
-    */
-
-    export class Timeline extends EventDispatcher {
-        constructor (tweens: Tween[], labels: Object, props: Object);
-
-        // properties
-        duration: number;
-        ignoreGlobalPause: boolean;
-        loop: boolean;
-        position: Object;
-
-        // methods
-        addLabel(label: string, position: number): void;
-        addTween(...tween: Tween[]): void;
-        getCurrentLabel(): string;
-        getLabels(): Object[];
-        gotoAndPlay(positionOrLabel: string | number): void;
-        gotoAndStop(positionOrLabel: string | number): void;
-        removeTween(...tween: Tween[]): void;
-        resolve(positionOrLabel: string | number): number;
-        setLabels(o: Object): void;
-        setPaused(value: boolean): void;
-        setPosition(value: number, actionsMode?: number): boolean;
-        tick(delta: number): void;
-        updateDuration(): void;
-    }
-
-
-    export class Tween extends EventDispatcher {
-        constructor(target: Object, props?: Object, pluginData?: Object);
-
-        // properties
-        duration: number;
-        static IGNORE: Object;
-        ignoreGlobalPause: boolean;
-        static LOOP: number;
-        loop: boolean;
-        static NONE: number;
-        onChange: Function; // deprecated
-        passive: boolean;
-        pluginData: Object;
-        position: number;
-        static REVERSE: number;
-        target: Object;
-
-        // methods
-        call(callback: (tweenObject: Tween) => any, params?: any[], scope?: Object): Tween;    // when 'params' isn't given, the callback receives a tweenObject
-        call(callback: (...params: any[]) => any, params?: any[], scope?: Object): Tween; // otherwise, it receives the params only
-        static get(target: Object, props?: Object, pluginData?: Object, override?: boolean): Tween;
-        static hasActiveTweens(target?: Object): boolean;
-        static installPlugin(plugin: Object, properties: any[]): void;
-        pause(tween: Tween): Tween;
-        play(tween: Tween): Tween;
-        static removeAllTweens(): void;
-        static removeTweens(target: Object): void;
-        set(props: Object, target?: Object): Tween;
-        setPaused(value: boolean): Tween;
-        setPosition(value: number, actionsMode: number): boolean;
-        static tick(delta: number, paused: boolean): void;
-        tick(delta: number): void;
-        to(props: Object, duration?: number, ease?: (t: number) => number): Tween;
-        wait(duration: number, passive?: boolean): Tween;
-
-    }
-
-    export class TweenJS {
-        // properties
-        static buildDate: string;
-        static version: string;
-    }
-}
diff --git a/twig/index.d.ts b/twig/index.d.ts
new file mode 100644
index 0000000000..309440c3b7
--- /dev/null
+++ b/twig/index.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for twig
+// Project: https://github.com/justjohn/twig.js
+// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/twig.d.ts
+
+
+export interface Parameters {
+    id?: any;
+    ref?: any;
+    href?: any;
+    path?: any;
+    debug?: boolean;
+    trace?: boolean;
+    strict_variables?: boolean;
+    data: any;
+}
+
+export interface Template {
+}
+
+export interface CompileOptions {
+    filename: string;
+    settings: any;
+}
+
+export declare function twig(params: Parameters): Template;
+export declare function extendFilter(name: string, definition: (left: any, ...params: any[]) => string): void;
+export declare function extendFunction(name: string, definition: (...params: any[]) => string): void;
+export declare function extendTest(name: string, definition: (value: any) => boolean): void;
+export declare function extendTag(definition: any): void;
+export declare function compile(markup: string, options: CompileOptions): (context: any) => any;
+export declare function renderFile(path: string, options: CompileOptions, fn: (err: Error, result: any) => void): void;
+export declare function __express(path: string, options: CompileOptions, fn: (err: Error, result: any) => void): void;
+export declare function cache(value: boolean): void;
diff --git a/twig/tsconfig.json b/twig/tsconfig.json
new file mode 100644
index 0000000000..62a3d2b195
--- /dev/null
+++ b/twig/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "twig-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/twig/twig-tests.ts b/twig/twig-tests.ts
index bf41affd1c..6b517d0c73 100644
--- a/twig/twig-tests.ts
+++ b/twig/twig-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="twig.d.ts" />
 
 import twig = require('twig');
 
diff --git a/twig/twig.d.ts b/twig/twig.d.ts
deleted file mode 100644
index d011eddd44..0000000000
--- a/twig/twig.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-// Type definitions for twig
-// Project: https://github.com/justjohn/twig.js
-// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/twig.d.ts
-
-declare module "twig" {
-	export interface Parameters {
-		id?: any;
-		ref?: any;
-		href?: any;
-		path?: any;
-		debug?: boolean;
-		trace?: boolean;
-		strict_variables?: boolean;
-		data: any;
-	}
-
-	export interface Template {
-	}
-
-	export interface CompileOptions {
-		filename: string;
-		settings: any;
-	}
-
-	export function twig(params: Parameters): Template;
-	export function extendFilter(name: string, definition: (left: any, ...params: any[]) => string): void;
-	export function extendFunction(name: string, definition: (...params: any[]) => string): void;
-	export function extendTest(name: string, definition: (value: any) => boolean): void;
-	export function extendTag(definition: any): void;
-	export function compile(markup: string, options: CompileOptions): (context: any) => any;
-	export function renderFile(path: string, options: CompileOptions, fn: (err: Error, result: any) => void): void;
-	export function __express(path: string, options: CompileOptions, fn: (err: Error, result: any) => void): void;
-	export function cache(value: boolean): void;
-}
diff --git a/twitter-text/index.d.ts b/twitter-text/index.d.ts
new file mode 100644
index 0000000000..6ecd657891
--- /dev/null
+++ b/twitter-text/index.d.ts
@@ -0,0 +1,102 @@
+// Type definitions for twitter-text v1.13.4
+// Project: https://github.com/twitter/twitter-text
+// Definitions by: rhysd <https://rhysd.github.io>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export interface HashtagWithIndices {
+    hashtag: string;
+    indices: [number, number];
+}
+export interface UrlWithIndices {
+    url: string;
+    indices: [number, number];
+}
+export interface MentionWithIndices {
+    screenName: string;
+    indices: [number, number];
+}
+export interface MentionOrListWithIndices {
+    screenName: string;
+    listSlug: string;
+    indices: [number, number];
+}
+export interface CashtagWithIndices {
+    cashtag: string;
+    indices: [number, number];
+}
+export type EntityWithIndices =
+    HashtagWithIndices |
+    UrlWithIndices |
+    MentionWithIndices |
+    MentionOrListWithIndices |
+    CashtagWithIndices;
+
+interface Indices {
+    indices: [number, number];
+}
+
+export declare function htmlEscape(text: string): string;
+export declare function splitTags(text: string): string[];
+
+export declare function extractHashtags(text: string): string[];
+export declare function extractHashtagsWithIndices(text: string): HashtagWithIndices[];
+export declare function extractUrls(text: string): string[];
+export declare function extractUrlsWithIndices(text: string): UrlWithIndices[];
+export declare function extractMentions(text: string): string[];
+export declare function extractMentionsWithIndices(text: string): MentionWithIndices[];
+export declare function extractMentionsOrListsWithIndices(text: string): MentionOrListWithIndices[];
+export declare function extractReplies(text: string): string[];
+export declare function extractCashtags(text: string): string[];
+export declare function extractCashtagsWithIndices(text: string): CashtagWithIndices[];
+export declare function extractEntitiesWithIndices(text: string): EntityWithIndices[];
+
+export declare function modifyIndicesFromUnicodeToUTF16<I>(i: I): I;
+export declare function modifyIndicesFromUTF16ToUnicode<I>(i: I): I;
+
+export interface UrlEntity {
+    url: string;
+    display_url: string;
+    expanded_url: string;
+    indices: [number, number];
+}
+export interface AutoLinkOptions {
+    hashtagClass?: string;
+    hashtagUrlBase?: string;
+    cashtagClass?: string;
+    cashtagUrlBase?: string;
+    listClass?: string;
+    usernameClass?: string;
+    usernameUrlBase?: string;
+    listUrlBase?: string;
+    htmlAttrs?: string;
+    invisibleTagAttrs?: string;
+    htmlEscapeNonEntities?: boolean;
+    urlEntities?: UrlEntity[];
+}
+
+export declare function autoLink(text: string, options?: AutoLinkOptions): string;
+export declare function autoLinkUsernamesOrLists(text: string, options?: AutoLinkOptions): string;
+export declare function autoLinkHashtags(text: string, options?: AutoLinkOptions): string;
+export declare function autoLinkCashtags(text: string, options?: AutoLinkOptions): string;
+export declare function autoLinkUrlsCustom(text: string, options?: AutoLinkOptions): string;
+export declare function autoLinkEntities(text: string, entities: EntityWithIndices[], options?: AutoLinkOptions): string;
+
+interface TweetLengthOptions {
+    short_url_length: number;
+    short_url_length_https: number;
+}
+export declare function getTweetLength(text: string, options?: TweetLengthOptions): number;
+
+export declare function isValidUsername(username: string): boolean;
+export declare function isValidList(usernameList: string): boolean;
+export declare function isValidHashtag(hashtag: string): boolean;
+// Note: unicodeDomainsa and requireProtocol can be null
+export declare function isValidUrl(url: string, unicodeDomains: boolean, requireProtocol: boolean): boolean;
+export declare function isInvalidTweet(text: string): string;
+
+export declare function getUnicodeTextLength(text: string): number;
+// Note: This function directly modify entities" indices
+export declare function convertUnicodeIndices(text: string, entities: EntityWithIndices[], indicesInUTF16?: boolean): void;
+
+export declare function hitHighlight(text: string, hits?: number[][], options?: { tag: string }): string;
diff --git a/twitter-text/tsconfig.json b/twitter-text/tsconfig.json
new file mode 100644
index 0000000000..92fc404553
--- /dev/null
+++ b/twitter-text/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "twitter-text-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/twitter-text/twitter-text-tests.ts b/twitter-text/twitter-text-tests.ts
new file mode 100644
index 0000000000..708bdcfcb1
--- /dev/null
+++ b/twitter-text/twitter-text-tests.ts
@@ -0,0 +1,61 @@
+
+import * as twitter from "twitter-text";
+
+const text: string = twitter.htmlEscape("@you #hello < @world > https://github.com");
+const entities = twitter.extractEntitiesWithIndices(text);
+
+function isHashtagEntity(e: twitter.EntityWithIndices): e is twitter.HashtagWithIndices {
+    return "hashtag" in e;
+}
+
+function isUrlEntity(e: twitter.EntityWithIndices): e is twitter.UrlWithIndices {
+    return "url" in e;
+}
+
+function isMentionEntity(e: twitter.EntityWithIndices): e is twitter.MentionWithIndices {
+    return "screenName" in e;
+}
+
+function isCashtagEntity(e: twitter.EntityWithIndices): e is twitter.CashtagWithIndices {
+    return "cashtag" in e;
+}
+
+for (let e of entities) {
+    e = twitter.modifyIndicesFromUnicodeToUTF16(e);
+    if (isHashtagEntity(e)) {
+        console.log("hashtag: ", e.hashtag);
+    } else if (isUrlEntity(e)) {
+        console.log("url: ", e.url);
+    } else if (isMentionEntity(e)) {
+        console.log("screenName: ", e.screenName);
+    } else if (isCashtagEntity(e)) {
+        console.log("cashtag: ", e.cashtag);
+    } else {
+        console.error("Unreachable");
+    }
+    console.log(`indices: (${e.indices[0]}, ${e.indices[1]})`);
+}
+
+let result: string;
+result = twitter.autoLink(text);
+result = twitter.autoLinkUsernamesOrLists(text);
+result = twitter.autoLinkHashtags(text);
+result = twitter.autoLinkCashtags(text);
+result = twitter.autoLinkUrlsCustom(text);
+
+const len: number = twitter.getTweetLength(text);
+
+const linked: string = twitter.autoLink("link @user, and expand url... http://t.co/0JG5Mcq", {
+    urlEntities: [
+        {
+            url: "http://t.co/0JG5Mcq",
+            display_url: "blog.twitter.com/2011/05/twitte…",
+            expanded_url: "http://blog.twitter.com/2011/05/twitter-for-mac-update.html",
+            indices: [
+                30,
+                48
+            ]
+        }
+    ]});
+
+const usernames: string[] = twitter.extractMentions("Mentioning @twitter and @jack");
diff --git a/twitter/twitter.d.ts b/twitter/index.d.ts
similarity index 100%
rename from twitter/twitter.d.ts
rename to twitter/index.d.ts
diff --git a/twitter/tsconfig.json b/twitter/tsconfig.json
new file mode 100644
index 0000000000..78e5b804c2
--- /dev/null
+++ b/twitter/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "twitter-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/twitter/twitter-tests.ts b/twitter/twitter-tests.ts
index 156a9d3568..c001e502be 100644
--- a/twitter/twitter-tests.ts
+++ b/twitter/twitter-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="twitter.d.ts" />
+
 
 function load() {
     twttr.widgets.load();
diff --git a/twix/index.d.ts b/twix/index.d.ts
new file mode 100644
index 0000000000..39296f3f42
--- /dev/null
+++ b/twix/index.d.ts
@@ -0,0 +1,132 @@
+// Type definitions for twix.js 0.6.3
+// Project: https://github.com/icambron/twix.js
+// Definitions by: j3ko <https://github.com/j3ko>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Moment, Duration } from '../moment';
+
+export interface TwixFormatOptions {
+    groupMeridiems?: boolean;
+    spaceBeforeMeridiem?: boolean;
+    showDate?: boolean;
+    showDayOfWeek?: boolean;
+    twentyFourHour?: boolean;
+    implicitMinutes?: boolean;
+    implicitYear?: boolean;
+    yearFormat?: string;
+    monthFormat?: string;
+    weekdayFormat?: string;
+    dayFormat?: string;
+    meridiemFormat?: string;
+    hourFormat?: string;
+    minuteFormat?: string;
+    allDay?: any; // boolean | string
+    explicitAllDay?: boolean;
+    lastNightEndsAt?: number;
+}
+
+export interface TwixParseAndFormatOptions extends TwixFormatOptions {
+    parseStrict?: boolean;
+}
+
+export interface TwixSimpleFormatOptions {
+    allDay?: string;
+    template?: (left: any, right: any) => any;
+}
+
+export interface TwixIter {
+    hasNext(): boolean;
+    next(): Twix;
+}
+
+export interface Twix {
+    isPast(): boolean;
+    isFuture(): boolean;
+    isCurrent(): boolean;
+    isSame(period: string): boolean;
+    contains(date: string): boolean;
+    contains(date: Date): boolean;
+    contains(date: Moment): boolean;
+    length(period: string): number;
+    count(period: string): number;
+    countInner(period: string): number;
+
+    iterate(period: string): TwixIter;
+    iterate(num: number, period: string): TwixIter;
+    iterate(duration: Duration): TwixIter;
+
+    iterateInner(period: string): TwixIter;
+    iterateInner(num: number, period: string): TwixIter;
+
+    overlaps(other: Twix): boolean;
+    engulfs(other: Twix): boolean;
+    equals(other: Twix): boolean;
+    union(other: Twix): string;
+    intersection(other: Twix): string;
+
+    xor(other: Twix): Twix[];
+    difference(other: Twix): Twix[];
+    split(num: number, period: string): Twix[];
+    split(other: Moment): Twix[];
+    split(start: Moment, end: Moment): Twix[];
+    split(duration: Duration): Twix[];
+
+    humanizeLength(): string;
+    simpleFormat(): string;
+    simpleFormat(format: string): string;
+    simpleFormat(format: string, options: TwixSimpleFormatOptions): string;
+
+    format(): string;
+    format(options: TwixFormatOptions): string;
+
+    asDuration(period: string): Duration;
+    isValid(): boolean;
+}
+
+export interface TwixStatic {
+    formatTemplate?: (left: any, right: any) => any;
+}
+
+declare module "../moment" {
+    interface Moment {
+        twix(date: Date): Twix;
+        twix(date: Date, allDay: boolean): Twix;
+        twix(date: Date, options: TwixParseAndFormatOptions): Twix;
+        twix(date: Date, format: string, options: TwixParseAndFormatOptions): Twix;
+
+        twix(date: Moment): Twix;
+        twix(date: Moment, allDay: boolean): Twix;
+        twix(date: Moment, options: TwixParseAndFormatOptions): Twix;
+        twix(date: Moment, format: string, options: TwixParseAndFormatOptions): Twix;
+
+        twix(date: MomentInput): Twix;
+        twix(date: MomentInput, allDay: boolean): Twix;
+        twix(date: MomentInput, options: TwixParseAndFormatOptions): Twix;
+        twix(date: MomentInput, format: string, options: TwixParseAndFormatOptions): Twix;
+
+        twix(date: number): Twix;
+        twix(date: number, allDay: boolean): Twix;
+        twix(date: number, options: TwixParseAndFormatOptions): Twix;
+        twix(date: number, format: string, options: TwixParseAndFormatOptions): Twix;
+
+        twix(date: number[]): Twix;
+        twix(date: number[], allDay: boolean): Twix;
+        twix(date: number[], options: TwixParseAndFormatOptions): Twix;
+        twix(date: number[], format: string, options: TwixParseAndFormatOptions): Twix;
+
+        twix(date: string): Twix;
+        twix(date: string, allDay: boolean): Twix;
+        twix(date: string, options: TwixParseAndFormatOptions): Twix;
+        twix(date: string, format: string, options: TwixParseAndFormatOptions): Twix;
+    }
+
+    interface MomentStatic {
+        twix(start: Moment, end: Moment): Twix;
+        twixClass: TwixStatic;
+    }
+
+    interface Duration {
+        afterMoment(date: string): string;
+        beforeMoment(date: string): string;
+    }
+}
diff --git a/twix/tsconfig.json b/twix/tsconfig.json
new file mode 100644
index 0000000000..4bc856646c
--- /dev/null
+++ b/twix/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "twix-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/twix/twix-tests.ts b/twix/twix-tests.ts
index bc0ef9ae1e..89c4754768 100644
--- a/twix/twix-tests.ts
+++ b/twix/twix-tests.ts
@@ -1,4 +1,6 @@
-/// <reference path="twix.d.ts" />
+
+
+import * as moment from 'moment';
 
 var someMoment = moment("20111031", "YYYYMMDD");
 var otherMoment = moment("20120620", "YYYYMMDD");
diff --git a/twix/twix.d.ts b/twix/twix.d.ts
deleted file mode 100644
index 112877036e..0000000000
--- a/twix/twix.d.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-// Type definitions for twix.js 0.6.3
-// Project: https://github.com/icambron/twix.js
-// Definitions by: j3ko <https://github.com/j3ko>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../moment/moment.d.ts" />
-
-declare namespace moment {
-    interface Moment {
-        twix(date: Date): Twix;
-        twix(date: Date, allDay: boolean): Twix;
-        twix(date: Date, options: TwixParseAndFormatOptions): Twix;
-        twix(date: Date, format: string, options: TwixParseAndFormatOptions): Twix;
-
-        twix(date: Moment): Twix;
-        twix(date: Moment, allDay: boolean): Twix;
-        twix(date: Moment, options: TwixParseAndFormatOptions): Twix;
-        twix(date: Moment, format: string, options: TwixParseAndFormatOptions): Twix;
-
-        twix(date: MomentInput): Twix;
-        twix(date: MomentInput, allDay: boolean): Twix;
-        twix(date: MomentInput, options: TwixParseAndFormatOptions): Twix;
-        twix(date: MomentInput, format: string, options: TwixParseAndFormatOptions): Twix;
-
-        twix(date: number): Twix;
-        twix(date: number, allDay: boolean): Twix;
-        twix(date: number, options: TwixParseAndFormatOptions): Twix;
-        twix(date: number, format: string, options: TwixParseAndFormatOptions): Twix;
-
-        twix(date: number[]): Twix;
-        twix(date: number[], allDay: boolean): Twix;
-        twix(date: number[], options: TwixParseAndFormatOptions): Twix;
-        twix(date: number[], format: string, options: TwixParseAndFormatOptions): Twix;
-
-        twix(date: string): Twix;
-        twix(date: string, allDay: boolean): Twix;
-        twix(date: string, options: TwixParseAndFormatOptions): Twix;
-        twix(date: string, format: string, options: TwixParseAndFormatOptions): Twix;
-    }
-
-    interface MomentStatic {
-        twix(start: Moment, end: Moment): Twix;
-        twixClass: TwixStatic;
-    }
-
-    interface TwixFormatOptions {
-        groupMeridiems?: boolean;
-        spaceBeforeMeridiem?: boolean;
-        showDate?: boolean;
-        showDayOfWeek?: boolean;
-        twentyFourHour?: boolean;
-        implicitMinutes?: boolean;
-        implicitYear?: boolean;
-        yearFormat?: string;
-        monthFormat?: string;
-        weekdayFormat?: string;
-        dayFormat?: string;
-        meridiemFormat?: string;
-        hourFormat?: string;
-        minuteFormat?: string;
-        allDay?: any; // boolean | string
-        explicitAllDay?: boolean;
-        lastNightEndsAt?: number;
-    }
-
-    interface TwixParseAndFormatOptions extends TwixFormatOptions {
-        parseStrict?: boolean;
-    }
-
-    interface TwixSimpleFormatOptions {
-        allDay?: string;
-        template?: (left: any, right: any) => any;
-    }
-
-    interface TwixIter {
-        hasNext(): boolean;
-        next(): Twix;
-    }
-
-    interface Duration {
-        afterMoment(date: string): string;
-        beforeMoment(date: string): string;
-    }
-
-    interface Twix {
-        isPast(): boolean;
-        isFuture(): boolean;
-        isCurrent(): boolean;
-        isSame(period: string): boolean;
-        contains(date: string): boolean;
-        contains(date: Date): boolean;
-        contains(date: Moment): boolean;
-        length(period: string): number;
-        count(period: string): number;
-        countInner(period: string): number;
-
-        iterate(period: string): TwixIter;
-        iterate(num: number, period: string): TwixIter;
-        iterate(duration: Duration): TwixIter;
-
-        iterateInner(period: string): TwixIter;
-        iterateInner(num: number, period: string): TwixIter;
-
-        overlaps(other: Twix): boolean;
-        engulfs(other: Twix): boolean;
-        equals(other: Twix): boolean;
-        union(other: Twix): string;
-        intersection(other: Twix): string;
-
-        xor(other: Twix): Twix[];
-        difference(other: Twix): Twix[];
-        split(num: number, period: string): Twix[];
-        split(other: Moment): Twix[];
-        split(start: Moment, end: Moment): Twix[];
-        split(duration: Duration): Twix[];
-
-        humanizeLength(): string;
-        simpleFormat(): string;
-        simpleFormat(format: string): string;
-        simpleFormat(format: string, options: TwixSimpleFormatOptions): string;
-
-        format(): string;
-        format(options: TwixFormatOptions): string;
-
-        asDuration(period: string): Duration;
-        isValid(): boolean;
-    }
-
-    interface TwixStatic {
-        formatTemplate?: (left: any, right: any) => any;
-    }
-}
-
-declare module 'twix' {
-    var _tmp: moment.MomentStatic;
-
-    export = _tmp;
-}
diff --git a/type-check/type-check.d.ts b/type-check/index.d.ts
similarity index 100%
rename from type-check/type-check.d.ts
rename to type-check/index.d.ts
diff --git a/type-check/tsconfig.json b/type-check/tsconfig.json
new file mode 100644
index 0000000000..00edbf6ace
--- /dev/null
+++ b/type-check/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "type-check-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/type-check/type-check-tests.ts b/type-check/type-check-tests.ts
index b1d629309d..5d29aab763 100644
--- a/type-check/type-check-tests.ts
+++ b/type-check/type-check-tests.ts
@@ -1,5 +1,5 @@
 // run this in node
-/// <reference path="./type-check.d.ts"/>
+
 import tchecker = require("type-check");
 
 var typeCheck = (i1:string,i2:any,i3?: TypeCheck.Options ) =>  {
diff --git a/type-detect/index.d.ts b/type-detect/index.d.ts
new file mode 100644
index 0000000000..8dbf9018aa
--- /dev/null
+++ b/type-detect/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for type-detect v0.1.2
+// Project: https://github.com/chaijs/type-detect
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function type(val: any): string;
+
+declare namespace type {
+    export class Library {
+        of(val: any): string;
+        define(type: string, test: RegExp): void;
+        define(type: string, test: (val: any) => boolean): void;
+        test(val: any, type: string): boolean;
+    }
+}
+export = type;
diff --git a/type-detect/tsconfig.json b/type-detect/tsconfig.json
new file mode 100644
index 0000000000..ade1752d49
--- /dev/null
+++ b/type-detect/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "type-detect-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/type-detect/type-detect-tests.ts b/type-detect/type-detect-tests.ts
index b747de2b98..2fbbfca0d2 100644
--- a/type-detect/type-detect-tests.ts
+++ b/type-detect/type-detect-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="type-detect.d.ts" />
 
 import td = require('type-detect');
 
diff --git a/type-detect/type-detect.d.ts b/type-detect/type-detect.d.ts
deleted file mode 100644
index 58956f3b71..0000000000
--- a/type-detect/type-detect.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Type definitions for type-detect v0.1.2
-// Project: https://github.com/chaijs/type-detect
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'type-detect' {
-	function type(val: any): string;
-
-	namespace type {
-		export class Library {
-			of(val: any): string;
-			define (type: string, test: RegExp): void;
-			define (type: string, test: (val: any) => boolean): void;
-			test (val: any, type: string): boolean;
-		}
-	}
-	export = type;
-}
diff --git a/type-name/index.d.ts b/type-name/index.d.ts
new file mode 100644
index 0000000000..1e6f7aa7cf
--- /dev/null
+++ b/type-name/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for type-name v1.0.1
+// Project: https://github.com/twada/type-name/
+// Definitions by: OKUNOKENTARO <https://github.com/armorik83>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function typeName(anyVar: any): string;
+declare namespace typeName {}
+
+export = typeName;
+export as namespace typeName;
+  
\ No newline at end of file
diff --git a/type-name/tsconfig.json b/type-name/tsconfig.json
new file mode 100644
index 0000000000..7f7fd2a7c1
--- /dev/null
+++ b/type-name/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "type-name-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/type-name/type-name-tests.ts b/type-name/type-name-tests.ts
index 57ae32d371..170807cd4c 100644
--- a/type-name/type-name-tests.ts
+++ b/type-name/type-name-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./type-name.d.ts" />
+
 
 import typeName = require("type-name");
 console.log(typeName('foo') === 'string');
diff --git a/type-name/type-name.d.ts b/type-name/type-name.d.ts
deleted file mode 100644
index e09dab022e..0000000000
--- a/type-name/type-name.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Type definitions for type-name v1.0.1
-// Project: https://github.com/twada/type-name/
-// Definitions by: OKUNOKENTARO <https://github.com/armorik83>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare function typeName(anyVar: any): string;
-declare namespace typeName {}
-
-declare module "type-name" {
-  export = typeName;
-}
diff --git a/typeahead/index.d.ts b/typeahead/index.d.ts
new file mode 100644
index 0000000000..95100bbbba
--- /dev/null
+++ b/typeahead/index.d.ts
@@ -0,0 +1,1207 @@
+// Type definitions for typeahead.js 0.11.1
+// Project: http://twitter.github.io/typeahead.js/
+// Definitions by: Ivaylo Gochkov <https://github.com/igochkov/>, Gidon Junge <https://github.com/gjunge/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface JQuery {
+    /**
+     * For a given input[type="text"], enables typeahead functionality.
+     *
+     * @constructor
+     * @param options Options hash that's used for configuration
+     * @param datasets Array of datasets
+     */
+    typeahead<T>(options: Twitter.Typeahead.Options, datasets: Twitter.Typeahead.Dataset<T>[]): JQuery;
+
+    /**
+      * For a given input[type="text"], enables typeahead functionality.
+      *
+      * @constructor
+      * @param options Options hash that's used for configuration
+      * @param dataset At least one dataset is required
+      * @param datasets Rest of the datasets.
+      */
+    typeahead<T>(options: Twitter.Typeahead.Options, dataset: Twitter.Typeahead.Dataset<T>, ...datasets: Twitter.Typeahead.Dataset<T>[]): JQuery;
+
+    /**
+     * Returns the current value of the typeahead.
+     * The value is the text the user has entered into the input element.
+     *
+     * @constructor
+     * @param methodName Method 'val'
+     */
+    typeahead(methodName: 'val'): string;
+
+    /**
+     * Accommodates the val overload.
+     *
+     * @constructor
+     * @param methodName Method 'val'
+     */
+    typeahead(methodName: string): string;
+
+    /**
+     * Sets the value of the typeahead. This should be used in place of jQuery#val.
+     *
+     * @constructor
+     * @param methodName Method 'val'
+     * @param val The value to be set
+     */
+    typeahead(methodName: 'val', val: string): JQuery;
+
+    /**
+     * Accommodates the set val overload.
+     *
+     * @constructor
+     * @param methodName Method 'val'
+     * @param val The value to be set
+     */
+    typeahead(methodName: string, val: string): JQuery;
+
+    /**
+     * Opens the suggestion menu.
+     *
+     * @constructor
+     * @param methodName Method 'open'
+     */
+    typeahead(methodName: 'open'): JQuery;
+
+    /**
+     * Closes the suggestion menu.
+     *
+     * @constructor
+     * @param methodName Method 'close'
+     */
+    typeahead(methodName: 'close'): JQuery;
+
+    /**
+     * Removes typeahead functionality and reverts the input element back to its original state.
+     *
+     * @constructor
+     * @param methodName Method 'destroy'
+     */
+    typeahead(methodName: 'destroy'): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:active event to the selected elements.
+     *
+     * @param events typeahead:active event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:active", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:active event to the selected elements.
+     *
+     * @param events typeahead:active event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:active", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:active event to the selected elements.
+     *
+     * @param events typeahead:active event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:active", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:active event to the selected elements.
+     *
+     * @param events typeahead:active event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:active", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:idle event to the selected elements.
+     *
+     * @param events typeahead:idle event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:idle", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:idle event to the selected elements.
+     *
+     * @param events typeahead:idle event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:idle", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:idle event to the selected elements.
+     *
+     * @param events typeahead:idle event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:idle", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:idle event to the selected elements.
+     *
+     * @param events typeahead:idle event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:idle", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:open event to the selected elements.
+     *
+     * @param events typeahead:open event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:open", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:open event to the selected elements.
+     *
+     * @param events typeahead:open event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:open", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:open event to the selected elements.
+     *
+     * @param events typeahead:open event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:open", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:open event to the selected elements.
+     *
+     * @param events typeahead:open event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:open", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:close event to the selected elements.
+     *
+     * @param events typeahead:close event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:close", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:close event to the selected elements.
+     *
+     * @param events typeahead:close event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:close", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:close event to the selected elements.
+     *
+     * @param events typeahead:close event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:close", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:close event to the selected elements.
+     *
+     * @param events typeahead:close event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:close", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:change event to the selected elements.
+     *
+     * @param events typeahead:change event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:change", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:change event to the selected elements.
+     *
+     * @param events typeahead:change event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:change", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:change event to the selected elements.
+     *
+     * @param events typeahead:change event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:change", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:change event to the selected elements.
+     *
+     * @param events typeahead:change event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:change", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:render event to the selected elements.
+     *
+     * @param events typeahead:render event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:render", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:render event to the selected elements.
+     *
+     * @param events typeahead:render event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:render", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:render event to the selected elements.
+     *
+     * @param events typeahead:render event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:render", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:render event to the selected elements.
+     *
+     * @param events typeahead:render event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:render", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:select event to the selected elements.
+     *
+     * @param events typeahead:select event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:select", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:select event to the selected elements.
+     *
+     * @param events typeahead:select event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:select", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:select event to the selected elements.
+     *
+     * @param events typeahead:select event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:select", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:select event to the selected elements.
+     *
+     * @param events typeahead:select event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:select", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:autocomplete event to the selected elements.
+     *
+     * @param events typeahead:autocomplete event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:autocomplete", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:autocomplete event to the selected elements.
+     *
+     * @param events typeahead:autocomplete event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:autocomplete", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:autocomplete event to the selected elements.
+     *
+     * @param events typeahead:autocomplete event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:autocomplete", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:autocomplete event to the selected elements.
+     *
+     * @param events typeahead:autocomplete event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:autocomplete", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:cursorchange event to the selected elements.
+     *
+     * @param events typeahead:cursorchange event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:cursorchange", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:cursorchange event to the selected elements.
+     *
+     * @param events typeahead:cursorchange event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:cursorchange", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:cursorchange event to the selected elements.
+     *
+     * @param events typeahead:cursorchange event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:cursorchange", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:cursorchange event to the selected elements.
+     *
+     * @param events typeahead:cursorchange event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:cursorchange", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asyncrequest event to the selected elements.
+     *
+     * @param events typeahead:asyncrequest event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:asyncrequest", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asyncrequest event to the selected elements.
+     *
+     * @param events typeahead:asyncrequest event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:asyncrequest", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asyncrequest event to the selected elements.
+     *
+     * @param events typeahead:asyncrequest event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:asyncrequest", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asyncrequest event to the selected elements.
+     *
+     * @param events typeahead:asyncrequest event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:asyncrequest", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asynccancel event to the selected elements.
+     *
+     * @param events typeahead:asynccancel event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:asynccancel", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asynccancel event to the selected elements.
+     *
+     * @param events typeahead:asynccancel event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:asynccancel", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asynccancel event to the selected elements.
+     *
+     * @param events typeahead:asynccancel event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:asynccancel", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asynccancel event to the selected elements.
+     *
+     * @param events typeahead:asynccancel event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:asynccancel", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asyncreceive event to the selected elements.
+     *
+     * @param events typeahead:asyncreceive event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:asyncreceive", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asyncreceive event to the selected elements.
+     *
+     * @param events typeahead:asyncreceive event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:asyncreceive", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asyncreceive event to the selected elements.
+     *
+     * @param events typeahead:asyncreceive event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:asyncreceive", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asyncreceive event to the selected elements.
+     *
+     * @param events typeahead:asyncreceive event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:asyncreceive", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:active event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:active", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:active event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:active", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:idle event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:idle", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:idle event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:idle", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:open event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:open", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:open event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:open", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:close event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:close", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:close event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:close", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:change event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:change", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:change event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:change", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:render event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:render", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:render event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:render", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:select event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:select", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:select event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:select", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:autocomplete event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:autocomplete", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:autocomplete event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:autocomplete", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:cursorchange event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:cursorchange", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:cursorchange event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:cursorchange", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:asyncrequest event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:asyncrequest", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:asyncrequest event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:asyncrequest", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:asynccancel event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:asynccancel", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:asynccancel event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:asynccancel", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:asyncreceive event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:asyncreceive", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:asyncreceive event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:asyncreceive", handler: (eventObject: JQueryEventObject) => any): JQuery;
+}
+
+declare namespace Twitter.Typeahead {
+    interface Options {
+        /**
+          * If true, when suggestions are rendered, pattern matches for the current query in text nodes will be wrapped in a strong element with its class set to {{classNames.highlight}}.
+          * Defaults to false.
+          */
+        highlight?: boolean;
+
+        /**
+          * If false, the typeahead will not show a hint.
+          * Defaults to true.
+          */
+        hint?: boolean;
+
+        /**
+          * The minimum character length needed before suggestions start getting rendered.
+          * Defaults to 1.
+          */
+        minLength?: number;
+
+        /**
+         * Used for overriding the default class names.
+         */
+        classNames?: ClassNames;
+    }
+
+    /**
+      * A typeahead is composed of one or more datasets. When an end-user
+      * modifies the value of a typeahead, each dataset will attempt to render
+      * suggestions for the new value.
+      * For most use cases, one dataset should suffice. It's only in the scenario
+      * where you want rendered suggestions to be grouped based on some sort of
+      * categorical relationship that you'd need to use multiple datasets. For
+      * example, on twitter.com, the search typeahead groups results into recent
+      * searches, trends, and accounts – that would be a great use case for using
+      * multiple datasets.
+      */
+    interface Dataset<T> {
+        /**
+         * The backing data source for suggestions.
+         * Expected to be a function with the signature (query, syncResults, asyncResults).
+         * syncResults should be called with suggestions computed synchronously and
+         *  asyncResults should be called with suggestions computed asynchronously
+         * (e.g. suggestions that come for an AJAX request).
+         *  source can also be a Bloodhound instance.
+         */
+        source: Bloodhound<T> | ((query: string, syncResults: (result: T[]) => void, asyncResults?: (result: T[]) => void) => void);
+
+        /**
+         * Lets the dataset know if async suggestions should be expected.
+         * If not set, this information is inferred from the signature of
+         * source i.e. if the source function expects 3 arguments, async will
+         * be set to true.
+         */
+        async?: boolean;
+
+        /**
+          * The name of the dataset.
+          * This will be appended to {{classNames.dataset}} - to form the class name of the containing DOM element.
+          * Must only consist of underscores, dashes, letters (a-z), and numbers.
+          * Defaults to a random number.
+          */
+        name?: string;
+
+        /**
+          * The max number of suggestions to be displayed. Defaults to 5.
+          */
+        limit?: number;
+
+        /**
+         * For a given suggestion, determines the string representation of it.
+         * This will be used when setting the value of the input control after
+         * a suggestion is selected. Can be either a key string or a function
+         * that transforms a suggestion object into a string.
+         * Defaults to stringifying the suggestion.
+         */
+        display?: string | ((obj: T) => string);
+
+        /**
+         * A hash of templates to be used when rendering the dataset. Note a
+         * precompiled template is a function that takes a JavaScript object as
+         * its first argument and returns a HTML string.
+         */
+        templates?: Templates<T>;
+    }
+
+    /**
+     * A hash of templates to be used when rendering the dataset. Note a
+     * precompiled template is a function that takes a JavaScript object as
+     * its first argument and returns a HTML string.
+     */
+    interface Templates<T> {
+        /**
+         * Rendered when 0 suggestions are available for the given query.
+         * Can be either a HTML string or a precompiled template.
+         * If it's a precompiled template, the passed in context will contain query.
+         */
+        notFound?: string | ((query: string) => string);
+
+        /**
+         * Rendered when 0 synchronous suggestions are available but asynchronous suggestions are expected.
+         * Can be either a HTML string or a precompiled template.
+         * If it's a precompiled template, the passed in context will contain query.
+         */
+        pending?: string | ((query: string) => string);
+
+        /**
+         * Rendered at the top of the dataset when suggestions are present. Can be either a HTML string or
+         * a precompiled template. If it's a precompiled template, the passed in context will contain
+         * query and suggestions.
+         */
+        header?: string | ((query: string, suggestions: T[]) => string);
+
+        /**
+         * Rendered at the bottom of the dataset when suggestions are present. Can be either a HTML string or
+         * a precompiled template. If it's a precompiled template, the passed in context will contain
+         * query and suggestions.
+         */
+        footer?: string | ((query: string, suggestions: T[]) => string);
+
+        /**
+         * Used to render a single suggestion. If set, this has to be a precompiled template.
+         * The associated suggestion object will serve as the context.
+         * Defaults to the value of display wrapped in a div tag i.e. <div>{{value}}</div>.
+          */
+        suggestion?: (suggestion: T) => string;
+    }
+
+    /**
+     * Used for overriding the default class names.
+     */
+    interface ClassNames {
+        /**
+         * Added to input that's initialized into a typeahead. Defaults to tt-input.
+         */
+        input?: string;
+
+        /**
+         * Added to hint input.Defaults to tt- hint.
+         */
+        hint?: string;
+
+        /**
+         * Added to menu element.Defaults to tt- menu.
+         */
+        menu?: string;
+
+        /**
+         * Added to dataset elements.to Defaults to tt- dataset.
+         */
+        dataset?: string;
+        /**
+         * Added to suggestion elements.Defaults to tt- suggestion.
+         */
+        suggestion?: string;
+
+        /**
+         * Added to menu element when it contains no content.Defaults to tt- empty.
+         */
+        empty?: string;
+
+        /**
+         * Added to menu element when it is opened.Defaults to tt- open.
+         */
+        open?: string;
+
+        /**
+         * Added to suggestion element when menu cursor moves to said suggestion.Defaults to tt- cursor.
+         */
+        cursor?: string;
+
+        /**
+         * Added to the element that wraps highlighted text.Defaults to tt- highlight.
+         */
+        highlight?: string;
+    }
+}
+
+declare namespace Bloodhound {
+    interface BloodhoundOptions<T> {
+        /**
+         * Transforms a datum into an array of string tokens.
+         *
+         * @param datum Suggestion.
+         * @returns An array of string tokens.
+         */
+        datumTokenizer: (datum: T) => string[];
+
+        /**
+         * Transforms a query into an array of string tokens.
+         *
+         * @param quiery Query.
+         * @returns An array of string tokens.
+         */
+        queryTokenizer: (query: string) => string[];
+
+        /**
+         * If set to false, the Bloodhound instance will not be implicitly
+         * initialized by the constructor function. Defaults to true.
+         */
+        initialize?: boolean;
+
+        /**
+         * Given a datum, returns a unique id for it.
+         * Defaults to JSON.stringify. Note that it is highly recommended
+         * to override this option.
+         *
+         * @param datum Suggestion.
+         * @returns Unique id for the suggestion.
+         */
+        identify?: (datum: T) => number;
+
+        /**
+         * If the number of datums provided from the internal search index is
+         * less than sufficient, remote will be used to backfill search
+         * requests triggered by calling #search. Defaults to 5.
+         */
+        sufficient?: number;
+
+        /**
+         * A compare function used to sort data returned from the internal search index.
+         *
+         * @param a First suggestion.
+         * @param b Second suggestion.
+         * @returns Comparison result.
+         */
+        sorter?: (a: T, b: T) => number;
+
+        /**
+         * An array of data or a function that returns an array of data.
+         * The data will be added to the internal search index when #initialize is called.
+         */
+        local?: T[] | (() => T[]);
+
+        /**
+         * Can be a URL to a JSON file containing an array of data or,
+         * if more configurability is needed, a prefetch options hash.
+         */
+        prefetch?: string | PrefetchOptions<T>;
+
+        /**
+         * Can be a URL to fetch data from when the data provided by the internal
+         * search index is insufficient or, if more configurability is needed,
+         * a remote options hash.
+         */
+        remote?: string | RemoteOptions<T>;
+    }
+
+    /**
+     * Prefetched data is fetched and processed on initialization. If the browser
+     * supports local storage, the processed data will be cached there to prevent
+     * additional network requests on subsequent page loads.
+     *
+     * WARNING: While it's possible to get away with it for smaller data sets,
+     * prefetched data isn't meant to contain entire sets of data. Rather, it should
+     * act as a first-level cache. Ignoring this warning means you'll run the risk
+     * of hitting local storage limits.
+     */
+    interface PrefetchOptions<T> {
+        /**
+         * The URL prefetch data should be loaded from.
+         */
+        url: string;
+
+        /**
+         * If false, will not attempt to read or write to local storage and
+         * will always load prefetch data from url on initialization. Defaults to true.
+         */
+        cache?: boolean;
+
+        /**
+         * The time (in milliseconds) the prefetched data should be cached in
+         * local storage. Defaults to 86400000 (1 day).
+         */
+        ttl?: number;
+
+        /**
+         * The key that data will be stored in local storage under.
+         * Defaults to value of url.
+         */
+        cacheKey?: string;
+
+        /**
+         * A string used for thumbprinting prefetched data. If this doesn't
+         * match what's stored in local storage, the data will be refetched.
+         */
+        thumbprint?: string;
+
+        /**
+         * A function that provides a hook to allow you to prepare the settings
+         * object passed to transport when a request is about to be made.
+         * Defaults to the identity function.
+         *
+         * @param settings The default settings object created internally by the Bloodhound instance.
+         * @returns A settings object.
+         */
+        prepare?: (settings: JQueryAjaxSettings) => JQueryAjaxSettings;
+
+        /**
+         * A function with the signature transform(response) that allows you to
+         * transform the prefetch response before the Bloodhound instance operates
+         * on it. Defaults to the identity function.
+         *
+         * @param response Prefetch response.
+         * @returns Transform response.
+         */
+        transform?: (response: T[]) => T[];
+    }
+
+    /**
+     * Bloodhound only goes to the network when the internal search engine cannot
+     * provide a sufficient number of results. In order to prevent an obscene
+     * number of requests being made to the remote endpoint, requests are rate-limited.
+     */
+    interface RemoteOptions<T> {
+        /**
+         * The URL remote data should be loaded from.
+         */
+        url: string;
+
+        /**
+         * A function that provides a hook to allow you to prepare the settings
+         * object passed to transport when a request is about to be made.
+         * The function signature should be prepare(query, settings), where query
+         * is the query #search was called with and settings is the default settings
+         * object created internally by the Bloodhound instance. The prepare function
+         * should return a settings object. Defaults to the identity function.
+         *
+         * @param query The query #search was called with.
+         * @param settings The default settings object created internally by Bloodhound.
+         * @returns A JqueryAjaxSettings object.
+         */
+        prepare?: (query: string, settings: JQueryAjaxSettings) => JQueryAjaxSettings;
+
+        /**
+         * A convenience option for prepare. If set, prepare will be a function
+         * that replaces the value of this option in url with the URI encoded query.
+         */
+        wildcard?: string;
+
+        /**
+         * The method used to rate-limit network requests.
+         * Can be either debounce or throttle. Defaults to debounce.
+         */
+        rateLimitby?: string;
+
+        /**
+         * The time interval in milliseconds that will be used by rateLimitBy.
+         * Defaults to 300.
+         */
+        rateLimitWait?: number;
+
+        /**
+         * A function with the signature transform(response) that allows you to
+         * transform the remote response before the Bloodhound instance operates on it.
+         * Defaults to the identity function.
+         *
+         * @param response Prefetch response.
+         * @returns Transform response.
+         */
+        transform?: (response: T[]) => T[];
+    }
+
+    /**
+    * Build-in tokenization methods.
+    */
+    interface Tokenizers {
+        /**
+         * Split a given string on whitespace characters.
+         */
+        whitespace(str: string): string[];
+
+        /**
+         * Split a given string on non-word characters.
+         */
+        nonword(str: string): string[];
+
+        /**
+         * Instances of the build-in tokenization methods.
+         */
+        obj: ObjTokenizer;
+    }
+
+    interface ObjTokenizer {
+        /**
+         * Split a given string on whitespace characters.
+         */
+        whitespace(str: string): string[];
+
+        /**
+         * Split a given string on non-word characters.
+         */
+        nonword(str: string): string[];
+    }
+}
+
+/**
+ * Bloodhound is the typeahead.js suggestion engine. Bloodhound is robust,
+ * flexible, and offers advanced functionalities such as prefetching,
+ * intelligent caching, fast lookups, and backfilling with remote data.
+ */
+declare class Bloodhound<T> {
+    /**
+     * The constructor function.
+     *
+     * @constructor
+     * @param options Options hash.
+     */
+    constructor(options: Bloodhound.BloodhoundOptions<T>);
+
+    /**
+     * Returns a reference to Bloodhound and reverts window.Bloodhound to its
+     * previous value. Can be used to avoid naming collisions.
+     */
+    public static noConflict(): Bloodhound<any>;
+
+    /**
+     * The Bloodhound suggestion engine is token-based, so how datums and queries are tokenized plays a vital role in the quality of search results.
+     * Specify how you want datums and queries tokenized.
+     */
+    public static tokenizers: Bloodhound.Tokenizers;
+
+    /**
+     * Kicks off the initialization of the suggestion engine. Initialization
+     * entails adding the data provided by local and prefetch to the internal
+     * search index as well as setting up transport mechanism used by remote.
+     * Before #initialize is called, the #get and #search methods will effectively be no-ops.
+     *
+     * Note, unless the initialize option is false, this method is implicitly called by the constructor.
+     *
+     * After initialization, how subsequent invocations of #initialize behave depends on
+     * the reinitialize argument. If reinitialize is falsy, the method will not execute the
+     * initialization logic and will just return the same jQuery promise returned
+     * by the initial invocation. If reinitialize is truthy, the method will behave
+     * as if it were being called for the first time.
+     *
+     * @param reinitialize How subsequent invocations of #initialize will behave.
+     * @returns jQuery promise.
+     */
+    public initialize(reinitialize?: boolean): JQueryPromise<T>;
+
+    /**
+     * Takes one argument, data, which is expected to be an array.
+     * The data passed in will get added to the internal search index.
+     *
+     * @param data Data to be added to the internal search index.
+     */
+    public add(data: T[]): void;
+
+    /**
+     * Returns the data in the local search index corresponding to ids.
+     *
+     * @param ids Data ids.
+     * @returns The corresponding data.
+     */
+    public get(ids: number[]): T[];
+
+    /**
+     * Returns the data that matches query. Matches found in the local search
+     * index will be passed to the sync callback. If the data passed to sync
+     * doesn't contain at least sufficient number of datums, remote data will
+     * be requested and then passed to the async callback.
+     *
+     * @param query Query.
+     * @param sync Sync callback
+     * @param async Async callback.
+     * @returns The data that matches query.
+     */
+    public search(query: string, sync: (datums: T[]) => void, async: (datums: T[]) => void): T[];
+
+    /**
+     * Returns all items from the internal search index.
+     */
+    public all(): T[];
+
+    /**
+     * Clears the internal search index that's powered by local, prefetch, and #add.
+     */
+    public clear(): Bloodhound<T>;
+
+    /**
+     * If you're using prefetch, data gets cached in local storage in an effort to cut down on unnecessary network requests.
+     * clearPrefetchCache offers a way to programmatically clear said cache.
+     */
+    public clearPrefetchCache(): Bloodhound<T>;
+
+    /**
+     * If you're using remote, Bloodhound will cache the 10 most recent responses in an effort to provide a better user experience.
+     * clearRemoteCache offers a way to programmatically clear said cache.
+     */
+    public clearRemoteCache(): Bloodhound<T>;
+}
+
+declare module "bloodhound" {
+    export = Bloodhound;
+}
diff --git a/typeahead/tsconfig.json b/typeahead/tsconfig.json
new file mode 100644
index 0000000000..829a25fc07
--- /dev/null
+++ b/typeahead/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "typeahead-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/typeahead/typeahead-tests.ts b/typeahead/typeahead-tests.ts
index 7debe0044f..1441a19397 100644
--- a/typeahead/typeahead-tests.ts
+++ b/typeahead/typeahead-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="typeahead.d.ts"/>
+/// <reference types="jquery"/>
 
 function test_typeahead() {
     var options: Twitter.Typeahead.Options = {};
diff --git a/typeahead/typeahead.d.ts b/typeahead/typeahead.d.ts
deleted file mode 100644
index eb71cdc74a..0000000000
--- a/typeahead/typeahead.d.ts
+++ /dev/null
@@ -1,1207 +0,0 @@
-// Type definitions for typeahead.js 0.11.1
-// Project: http://twitter.github.io/typeahead.js/
-// Definitions by: Ivaylo Gochkov <https://github.com/igochkov/>, Gidon Junge <https://github.com/gjunge/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface JQuery {
-    /**
-     * For a given input[type="text"], enables typeahead functionality.
-     *
-     * @constructor
-     * @param options Options hash that's used for configuration
-     * @param datasets Array of datasets
-     */
-    typeahead<T>(options: Twitter.Typeahead.Options, datasets: Twitter.Typeahead.Dataset<T>[]): JQuery;
-
-    /**
-      * For a given input[type="text"], enables typeahead functionality.
-      *
-      * @constructor
-      * @param options Options hash that's used for configuration
-      * @param dataset At least one dataset is required
-      * @param datasets Rest of the datasets.
-      */
-    typeahead<T>(options: Twitter.Typeahead.Options, dataset: Twitter.Typeahead.Dataset<T>, ...datasets: Twitter.Typeahead.Dataset<T>[]): JQuery;
-
-    /**
-     * Returns the current value of the typeahead.
-     * The value is the text the user has entered into the input element.
-     *
-     * @constructor
-     * @param methodName Method 'val'
-     */
-    typeahead(methodName: 'val'): string;
-
-    /**
-     * Accommodates the val overload.
-     *
-     * @constructor
-     * @param methodName Method 'val'
-     */
-    typeahead(methodName: string): string;
-
-    /**
-     * Sets the value of the typeahead. This should be used in place of jQuery#val.
-     *
-     * @constructor
-     * @param methodName Method 'val'
-     * @param val The value to be set
-     */
-    typeahead(methodName: 'val', val: string): JQuery;
-
-    /**
-     * Accommodates the set val overload.
-     *
-     * @constructor
-     * @param methodName Method 'val'
-     * @param val The value to be set
-     */
-    typeahead(methodName: string, val: string): JQuery;
-
-    /**
-     * Opens the suggestion menu.
-     *
-     * @constructor
-     * @param methodName Method 'open'
-     */
-    typeahead(methodName: 'open'): JQuery;
-
-    /**
-     * Closes the suggestion menu.
-     *
-     * @constructor
-     * @param methodName Method 'close'
-     */
-    typeahead(methodName: 'close'): JQuery;
-
-    /**
-     * Removes typeahead functionality and reverts the input element back to its original state.
-     *
-     * @constructor
-     * @param methodName Method 'destroy'
-     */
-    typeahead(methodName: 'destroy'): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:active event to the selected elements.
-     *
-     * @param events typeahead:active event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:active", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:active event to the selected elements.
-     *
-     * @param events typeahead:active event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:active", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:active event to the selected elements.
-     *
-     * @param events typeahead:active event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:active", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:active event to the selected elements.
-     *
-     * @param events typeahead:active event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:active", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:idle event to the selected elements.
-     *
-     * @param events typeahead:idle event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:idle", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:idle event to the selected elements.
-     *
-     * @param events typeahead:idle event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:idle", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:idle event to the selected elements.
-     *
-     * @param events typeahead:idle event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:idle", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:idle event to the selected elements.
-     *
-     * @param events typeahead:idle event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:idle", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:open event to the selected elements.
-     *
-     * @param events typeahead:open event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:open", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:open event to the selected elements.
-     *
-     * @param events typeahead:open event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:open", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:open event to the selected elements.
-     *
-     * @param events typeahead:open event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:open", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:open event to the selected elements.
-     *
-     * @param events typeahead:open event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:open", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:close event to the selected elements.
-     *
-     * @param events typeahead:close event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:close", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:close event to the selected elements.
-     *
-     * @param events typeahead:close event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:close", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:close event to the selected elements.
-     *
-     * @param events typeahead:close event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:close", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:close event to the selected elements.
-     *
-     * @param events typeahead:close event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:close", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:change event to the selected elements.
-     *
-     * @param events typeahead:change event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:change", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:change event to the selected elements.
-     *
-     * @param events typeahead:change event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:change", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:change event to the selected elements.
-     *
-     * @param events typeahead:change event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:change", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:change event to the selected elements.
-     *
-     * @param events typeahead:change event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:change", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:render event to the selected elements.
-     *
-     * @param events typeahead:render event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:render", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:render event to the selected elements.
-     *
-     * @param events typeahead:render event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:render", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:render event to the selected elements.
-     *
-     * @param events typeahead:render event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:render", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:render event to the selected elements.
-     *
-     * @param events typeahead:render event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:render", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:select event to the selected elements.
-     *
-     * @param events typeahead:select event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:select", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:select event to the selected elements.
-     *
-     * @param events typeahead:select event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:select", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:select event to the selected elements.
-     *
-     * @param events typeahead:select event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:select", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:select event to the selected elements.
-     *
-     * @param events typeahead:select event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:select", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:autocomplete event to the selected elements.
-     *
-     * @param events typeahead:autocomplete event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:autocomplete", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:autocomplete event to the selected elements.
-     *
-     * @param events typeahead:autocomplete event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:autocomplete", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:autocomplete event to the selected elements.
-     *
-     * @param events typeahead:autocomplete event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:autocomplete", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:autocomplete event to the selected elements.
-     *
-     * @param events typeahead:autocomplete event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:autocomplete", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:cursorchange event to the selected elements.
-     *
-     * @param events typeahead:cursorchange event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:cursorchange", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:cursorchange event to the selected elements.
-     *
-     * @param events typeahead:cursorchange event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:cursorchange", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:cursorchange event to the selected elements.
-     *
-     * @param events typeahead:cursorchange event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:cursorchange", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:cursorchange event to the selected elements.
-     *
-     * @param events typeahead:cursorchange event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:cursorchange", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asyncrequest event to the selected elements.
-     *
-     * @param events typeahead:asyncrequest event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:asyncrequest", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asyncrequest event to the selected elements.
-     *
-     * @param events typeahead:asyncrequest event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:asyncrequest", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asyncrequest event to the selected elements.
-     *
-     * @param events typeahead:asyncrequest event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:asyncrequest", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asyncrequest event to the selected elements.
-     *
-     * @param events typeahead:asyncrequest event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:asyncrequest", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asynccancel event to the selected elements.
-     *
-     * @param events typeahead:asynccancel event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:asynccancel", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asynccancel event to the selected elements.
-     *
-     * @param events typeahead:asynccancel event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:asynccancel", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asynccancel event to the selected elements.
-     *
-     * @param events typeahead:asynccancel event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:asynccancel", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asynccancel event to the selected elements.
-     *
-     * @param events typeahead:asynccancel event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:asynccancel", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asyncreceive event to the selected elements.
-     *
-     * @param events typeahead:asyncreceive event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:asyncreceive", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asyncreceive event to the selected elements.
-     *
-     * @param events typeahead:asyncreceive event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:asyncreceive", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asyncreceive event to the selected elements.
-     *
-     * @param events typeahead:asyncreceive event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:asyncreceive", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asyncreceive event to the selected elements.
-     *
-     * @param events typeahead:asyncreceive event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:asyncreceive", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:active event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:active", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:active event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:active", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:idle event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:idle", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:idle event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:idle", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:open event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:open", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:open event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:open", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:close event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:close", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:close event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:close", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:change event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:change", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:change event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:change", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:render event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:render", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:render event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:render", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:select event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:select", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:select event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:select", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:autocomplete event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:autocomplete", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:autocomplete event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:autocomplete", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:cursorchange event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:cursorchange", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:cursorchange event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:cursorchange", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:asyncrequest event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:asyncrequest", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:asyncrequest event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:asyncrequest", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:asynccancel event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:asynccancel", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:asynccancel event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:asynccancel", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:asyncreceive event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:asyncreceive", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:asyncreceive event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:asyncreceive", handler: (eventObject: JQueryEventObject) => any): JQuery;
-}
-
-declare namespace Twitter.Typeahead {
-    interface Options {
-        /**
-          * If true, when suggestions are rendered, pattern matches for the current query in text nodes will be wrapped in a strong element with its class set to {{classNames.highlight}}.
-          * Defaults to false.
-          */
-        highlight?: boolean;
-
-        /**
-          * If false, the typeahead will not show a hint.
-          * Defaults to true.
-          */
-        hint?: boolean;
-
-        /**
-          * The minimum character length needed before suggestions start getting rendered.
-          * Defaults to 1.
-          */
-        minLength?: number;
-
-        /**
-         * Used for overriding the default class names.
-         */
-        classNames?: ClassNames;
-    }
-
-    /**
-      * A typeahead is composed of one or more datasets. When an end-user
-      * modifies the value of a typeahead, each dataset will attempt to render
-      * suggestions for the new value.
-      * For most use cases, one dataset should suffice. It's only in the scenario
-      * where you want rendered suggestions to be grouped based on some sort of
-      * categorical relationship that you'd need to use multiple datasets. For
-      * example, on twitter.com, the search typeahead groups results into recent
-      * searches, trends, and accounts – that would be a great use case for using
-      * multiple datasets.
-      */
-    interface Dataset<T> {
-        /**
-         * The backing data source for suggestions.
-         * Expected to be a function with the signature (query, syncResults, asyncResults).
-         * syncResults should be called with suggestions computed synchronously and
-         *  asyncResults should be called with suggestions computed asynchronously
-         * (e.g. suggestions that come for an AJAX request).
-         *  source can also be a Bloodhound instance.
-         */
-        source: Bloodhound<T> | ((query: string, syncResults: (result: T[]) => void, asyncResults?: (result: T[]) => void) => void);
-
-        /**
-         * Lets the dataset know if async suggestions should be expected.
-         * If not set, this information is inferred from the signature of
-         * source i.e. if the source function expects 3 arguments, async will
-         * be set to true.
-         */
-        async?: boolean;
-
-        /**
-          * The name of the dataset.
-          * This will be appended to {{classNames.dataset}} - to form the class name of the containing DOM element.
-          * Must only consist of underscores, dashes, letters (a-z), and numbers.
-          * Defaults to a random number.
-          */
-        name?: string;
-
-        /**
-          * The max number of suggestions to be displayed. Defaults to 5.
-          */
-        limit?: number;
-
-        /**
-         * For a given suggestion, determines the string representation of it.
-         * This will be used when setting the value of the input control after
-         * a suggestion is selected. Can be either a key string or a function
-         * that transforms a suggestion object into a string.
-         * Defaults to stringifying the suggestion.
-         */
-        display?: string | ((obj: T) => string);
-
-        /**
-         * A hash of templates to be used when rendering the dataset. Note a
-         * precompiled template is a function that takes a JavaScript object as
-         * its first argument and returns a HTML string.
-         */
-        templates?: Templates<T>;
-    }
-
-    /**
-     * A hash of templates to be used when rendering the dataset. Note a
-     * precompiled template is a function that takes a JavaScript object as
-     * its first argument and returns a HTML string.
-     */
-    interface Templates<T> {
-        /**
-         * Rendered when 0 suggestions are available for the given query.
-         * Can be either a HTML string or a precompiled template.
-         * If it's a precompiled template, the passed in context will contain query.
-         */
-        notFound?: string | ((query: string) => string);
-
-        /**
-         * Rendered when 0 synchronous suggestions are available but asynchronous suggestions are expected.
-         * Can be either a HTML string or a precompiled template.
-         * If it's a precompiled template, the passed in context will contain query.
-         */
-        pending?: string | ((query: string) => string);
-
-        /**
-         * Rendered at the top of the dataset when suggestions are present. Can be either a HTML string or
-         * a precompiled template. If it's a precompiled template, the passed in context will contain
-         * query and suggestions.
-         */
-        header?: string | ((query: string, suggestions: T[]) => string);
-
-        /**
-         * Rendered at the bottom of the dataset when suggestions are present. Can be either a HTML string or
-         * a precompiled template. If it's a precompiled template, the passed in context will contain
-         * query and suggestions.
-         */
-        footer?: string | ((query: string, suggestions: T[]) => string);
-
-        /**
-         * Used to render a single suggestion. If set, this has to be a precompiled template.
-         * The associated suggestion object will serve as the context.
-         * Defaults to the value of display wrapped in a div tag i.e. <div>{{value}}</div>.
-          */
-        suggestion?: (suggestion: T) => string;
-    }
-
-    /**
-     * Used for overriding the default class names.
-     */
-    interface ClassNames {
-        /**
-         * Added to input that's initialized into a typeahead. Defaults to tt-input.
-         */
-        input?: string;
-
-        /**
-         * Added to hint input.Defaults to tt- hint.
-         */
-        hint?: string;
-
-        /**
-         * Added to menu element.Defaults to tt- menu.
-         */
-        menu?: string;
-
-        /**
-         * Added to dataset elements.to Defaults to tt- dataset.
-         */
-        dataset?: string;
-        /**
-         * Added to suggestion elements.Defaults to tt- suggestion.
-         */
-        suggestion?: string;
-
-        /**
-         * Added to menu element when it contains no content.Defaults to tt- empty.
-         */
-        empty?: string;
-
-        /**
-         * Added to menu element when it is opened.Defaults to tt- open.
-         */
-        open?: string;
-
-        /**
-         * Added to suggestion element when menu cursor moves to said suggestion.Defaults to tt- cursor.
-         */
-        cursor?: string;
-
-        /**
-         * Added to the element that wraps highlighted text.Defaults to tt- highlight.
-         */
-        highlight?: string;
-    }
-}
-
-declare namespace Bloodhound {
-    interface BloodhoundOptions<T> {
-        /**
-         * Transforms a datum into an array of string tokens.
-         *
-         * @param datum Suggestion.
-         * @returns An array of string tokens.
-         */
-        datumTokenizer: (datum: T) => string[];
-
-        /**
-         * Transforms a query into an array of string tokens.
-         *
-         * @param quiery Query.
-         * @returns An array of string tokens.
-         */
-        queryTokenizer: (query: string) => string[];
-
-        /**
-         * If set to false, the Bloodhound instance will not be implicitly
-         * initialized by the constructor function. Defaults to true.
-         */
-        initialize?: boolean;
-
-        /**
-         * Given a datum, returns a unique id for it.
-         * Defaults to JSON.stringify. Note that it is highly recommended
-         * to override this option.
-         *
-         * @param datum Suggestion.
-         * @returns Unique id for the suggestion.
-         */
-        identify?: (datum: T) => number;
-
-        /**
-         * If the number of datums provided from the internal search index is
-         * less than sufficient, remote will be used to backfill search
-         * requests triggered by calling #search. Defaults to 5.
-         */
-        sufficient?: number;
-
-        /**
-         * A compare function used to sort data returned from the internal search index.
-         *
-         * @param a First suggestion.
-         * @param b Second suggestion.
-         * @returns Comparison result.
-         */
-        sorter?: (a: T, b: T) => number;
-
-        /**
-         * An array of data or a function that returns an array of data.
-         * The data will be added to the internal search index when #initialize is called.
-         */
-        local?: T[] | (() => T[]);
-
-        /**
-         * Can be a URL to a JSON file containing an array of data or,
-         * if more configurability is needed, a prefetch options hash.
-         */
-        prefetch?: string | PrefetchOptions<T>;
-
-        /**
-         * Can be a URL to fetch data from when the data provided by the internal
-         * search index is insufficient or, if more configurability is needed,
-         * a remote options hash.
-         */
-        remote?: string | RemoteOptions<T>;
-    }
-
-    /**
-     * Prefetched data is fetched and processed on initialization. If the browser
-     * supports local storage, the processed data will be cached there to prevent
-     * additional network requests on subsequent page loads.
-     *
-     * WARNING: While it's possible to get away with it for smaller data sets,
-     * prefetched data isn't meant to contain entire sets of data. Rather, it should
-     * act as a first-level cache. Ignoring this warning means you'll run the risk
-     * of hitting local storage limits.
-     */
-    interface PrefetchOptions<T> {
-        /**
-         * The URL prefetch data should be loaded from.
-         */
-        url: string;
-
-        /**
-         * If false, will not attempt to read or write to local storage and
-         * will always load prefetch data from url on initialization. Defaults to true.
-         */
-        cache?: boolean;
-
-        /**
-         * The time (in milliseconds) the prefetched data should be cached in
-         * local storage. Defaults to 86400000 (1 day).
-         */
-        ttl?: number;
-
-        /**
-         * The key that data will be stored in local storage under.
-         * Defaults to value of url.
-         */
-        cacheKey?: string;
-
-        /**
-         * A string used for thumbprinting prefetched data. If this doesn't
-         * match what's stored in local storage, the data will be refetched.
-         */
-        thumbprint?: string;
-
-        /**
-         * A function that provides a hook to allow you to prepare the settings
-         * object passed to transport when a request is about to be made.
-         * Defaults to the identity function.
-         *
-         * @param settings The default settings object created internally by the Bloodhound instance.
-         * @returns A settings object.
-         */
-        prepare?: (settings: JQueryAjaxSettings) => JQueryAjaxSettings;
-
-        /**
-         * A function with the signature transform(response) that allows you to
-         * transform the prefetch response before the Bloodhound instance operates
-         * on it. Defaults to the identity function.
-         *
-         * @param response Prefetch response.
-         * @returns Transform response.
-         */
-        transform?: (response: T[]) => T[];
-    }
-
-    /**
-     * Bloodhound only goes to the network when the internal search engine cannot
-     * provide a sufficient number of results. In order to prevent an obscene
-     * number of requests being made to the remote endpoint, requests are rate-limited.
-     */
-    interface RemoteOptions<T> {
-        /**
-         * The URL remote data should be loaded from.
-         */
-        url: string;
-
-        /**
-         * A function that provides a hook to allow you to prepare the settings
-         * object passed to transport when a request is about to be made.
-         * The function signature should be prepare(query, settings), where query
-         * is the query #search was called with and settings is the default settings
-         * object created internally by the Bloodhound instance. The prepare function
-         * should return a settings object. Defaults to the identity function.
-         *
-         * @param query The query #search was called with.
-         * @param settings The default settings object created internally by Bloodhound.
-         * @returns A JqueryAjaxSettings object.
-         */
-        prepare?: (query: string, settings: JQueryAjaxSettings) => JQueryAjaxSettings;
-
-        /**
-         * A convenience option for prepare. If set, prepare will be a function
-         * that replaces the value of this option in url with the URI encoded query.
-         */
-        wildcard?: string;
-
-        /**
-         * The method used to rate-limit network requests.
-         * Can be either debounce or throttle. Defaults to debounce.
-         */
-        rateLimitby?: string;
-
-        /**
-         * The time interval in milliseconds that will be used by rateLimitBy.
-         * Defaults to 300.
-         */
-        rateLimitWait?: number;
-
-        /**
-         * A function with the signature transform(response) that allows you to
-         * transform the remote response before the Bloodhound instance operates on it.
-         * Defaults to the identity function.
-         *
-         * @param response Prefetch response.
-         * @returns Transform response.
-         */
-        transform?: (response: T[]) => T[];
-    }
-
-    /**
-    * Build-in tokenization methods.
-    */
-    interface Tokenizers {
-        /**
-         * Split a given string on whitespace characters.
-         */
-        whitespace(str: string): string[];
-
-        /**
-         * Split a given string on non-word characters.
-         */
-        nonword(str: string): string[];
-
-        /**
-         * Instances of the build-in tokenization methods.
-         */
-        obj: ObjTokenizer;
-    }
-
-    interface ObjTokenizer {
-        /**
-         * Split a given string on whitespace characters.
-         */
-        whitespace(str: string): string[];
-
-        /**
-         * Split a given string on non-word characters.
-         */
-        nonword(str: string): string[];
-    }
-}
-
-/**
- * Bloodhound is the typeahead.js suggestion engine. Bloodhound is robust,
- * flexible, and offers advanced functionalities such as prefetching,
- * intelligent caching, fast lookups, and backfilling with remote data.
- */
-declare class Bloodhound<T> {
-    /**
-     * The constructor function.
-     *
-     * @constructor
-     * @param options Options hash.
-     */
-    constructor(options: Bloodhound.BloodhoundOptions<T>);
-
-    /**
-     * Returns a reference to Bloodhound and reverts window.Bloodhound to its
-     * previous value. Can be used to avoid naming collisions.
-     */
-    public static noConflict(): Bloodhound<any>;
-
-    /**
-     * The Bloodhound suggestion engine is token-based, so how datums and queries are tokenized plays a vital role in the quality of search results.
-     * Specify how you want datums and queries tokenized.
-     */
-    public static tokenizers: Bloodhound.Tokenizers;
-
-    /**
-     * Kicks off the initialization of the suggestion engine. Initialization
-     * entails adding the data provided by local and prefetch to the internal
-     * search index as well as setting up transport mechanism used by remote.
-     * Before #initialize is called, the #get and #search methods will effectively be no-ops.
-     *
-     * Note, unless the initialize option is false, this method is implicitly called by the constructor.
-     *
-     * After initialization, how subsequent invocations of #initialize behave depends on
-     * the reinitialize argument. If reinitialize is falsy, the method will not execute the
-     * initialization logic and will just return the same jQuery promise returned
-     * by the initial invocation. If reinitialize is truthy, the method will behave
-     * as if it were being called for the first time.
-     *
-     * @param reinitialize How subsequent invocations of #initialize will behave.
-     * @returns jQuery promise.
-     */
-    public initialize(reinitialize?: boolean): JQueryPromise<T>;
-
-    /**
-     * Takes one argument, data, which is expected to be an array.
-     * The data passed in will get added to the internal search index.
-     *
-     * @param data Data to be added to the internal search index.
-     */
-    public add(data: T[]): void;
-
-    /**
-     * Returns the data in the local search index corresponding to ids.
-     *
-     * @param ids Data ids.
-     * @returns The corresponding data.
-     */
-    public get(ids: number[]): T[];
-
-    /**
-     * Returns the data that matches query. Matches found in the local search
-     * index will be passed to the sync callback. If the data passed to sync
-     * doesn't contain at least sufficient number of datums, remote data will
-     * be requested and then passed to the async callback.
-     *
-     * @param query Query.
-     * @param sync Sync callback
-     * @param async Async callback.
-     * @returns The data that matches query.
-     */
-    public search(query: string, sync: (datums: T[]) => void, async: (datums: T[]) => void): T[];
-
-    /**
-     * Returns all items from the internal search index.
-     */
-    public all(): T[];
-
-    /**
-     * Clears the internal search index that's powered by local, prefetch, and #add.
-     */
-    public clear(): Bloodhound<T>;
-
-    /**
-     * If you're using prefetch, data gets cached in local storage in an effort to cut down on unnecessary network requests.
-     * clearPrefetchCache offers a way to programmatically clear said cache.
-     */
-    public clearPrefetchCache(): Bloodhound<T>;
-
-    /**
-     * If you're using remote, Bloodhound will cache the 10 most recent responses in an effort to provide a better user experience.
-     * clearRemoteCache offers a way to programmatically clear said cache.
-     */
-    public clearRemoteCache(): Bloodhound<T>;
-}
-
-declare module "bloodhound" {
-    export = Bloodhound;
-}
diff --git a/types b/types
new file mode 100644
index 0000000000..8c33e8d31c
--- /dev/null
+++ b/types
@@ -0,0 +1,2 @@
+
+C:\github\DefinitelyTyped>git add -A *   && git commit -m "Start preparing for path- transition" 
diff --git a/typescript-deferred/index.d.ts b/typescript-deferred/index.d.ts
new file mode 100644
index 0000000000..af8e76f0b1
--- /dev/null
+++ b/typescript-deferred/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for typescript-deferred v0.1.5
+// Project: https://github.com/DirtyHairy/typescript-deferred
+// Definitions by: Christian Speckner <https://github.com/DirtyHairy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+export interface ImmediateSuccessCB<T, TP> {
+    (value: T): TP;
+}
+export interface ImmediateErrorCB<TP> {
+    (err: any): TP;
+}
+export interface DeferredSuccessCB<T, TP> {
+    (value: T): ThenableInterface<TP>;
+}
+export interface DeferredErrorCB<TP> {
+    (error: any): ThenableInterface<TP>;
+}
+export interface ThenableInterface<T> {
+    then<TP>(successCB?: DeferredSuccessCB<T, TP>, errorCB?: DeferredErrorCB<TP>): ThenableInterface<TP>;
+    then<TP>(successCB?: DeferredSuccessCB<T, TP>, errorCB?: ImmediateErrorCB<TP>): ThenableInterface<TP>;
+    then<TP>(successCB?: ImmediateSuccessCB<T, TP>, errorCB?: DeferredErrorCB<TP>): ThenableInterface<TP>;
+    then<TP>(successCB?: ImmediateSuccessCB<T, TP>, errorCB?: ImmediateErrorCB<TP>): ThenableInterface<TP>;
+}
+export interface PromiseInterface<T> extends ThenableInterface<T> {
+    then<TP>(successCB?: DeferredSuccessCB<T, TP>, errorCB?: DeferredErrorCB<TP>): PromiseInterface<TP>;
+    then<TP>(successCB?: DeferredSuccessCB<T, TP>, errorCB?: ImmediateErrorCB<TP>): PromiseInterface<TP>;
+    then<TP>(successCB?: ImmediateSuccessCB<T, TP>, errorCB?: DeferredErrorCB<TP>): PromiseInterface<TP>;
+    then<TP>(successCB?: ImmediateSuccessCB<T, TP>, errorCB?: ImmediateErrorCB<TP>): PromiseInterface<TP>;
+    otherwise(errorCB?: DeferredErrorCB<T>): PromiseInterface<T>;
+    otherwise(errorCB?: ImmediateErrorCB<T>): PromiseInterface<T>;
+    always<TP>(errorCB?: DeferredErrorCB<TP>): PromiseInterface<TP>;
+    always<TP>(errorCB?: ImmediateErrorCB<TP>): PromiseInterface<TP>;
+}
+export interface DeferredInterface<T> {
+    resolve(value?: ThenableInterface<T>): DeferredInterface<T>;
+    resolve(value?: T): DeferredInterface<T>;
+    reject(error?: any): DeferredInterface<T>;
+    promise: PromiseInterface<T>;
+}
+export declare function create<T>(): DeferredInterface<T>;
+export declare function when<T>(value?: ThenableInterface<T>): PromiseInterface<T>;
+export declare function when<T>(value?: T): PromiseInterface<T>;
diff --git a/typescript-deferred/tsconfig.json b/typescript-deferred/tsconfig.json
new file mode 100644
index 0000000000..c39bfb831e
--- /dev/null
+++ b/typescript-deferred/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "typescript-deferred-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/typescript-deferred/typescript-deferred-tests.ts b/typescript-deferred/typescript-deferred-tests.ts
index 0bfa825825..daaacf2313 100644
--- a/typescript-deferred/typescript-deferred-tests.ts
+++ b/typescript-deferred/typescript-deferred-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./typescript-deferred.d.ts"/>
-
 import tsd = require('typescript-deferred');
 
 var t1: tsd.PromiseInterface<string> = tsd.when(10)
diff --git a/typescript-deferred/typescript-deferred.d.ts b/typescript-deferred/typescript-deferred.d.ts
deleted file mode 100644
index 6d9820e187..0000000000
--- a/typescript-deferred/typescript-deferred.d.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-// Type definitions for typescript-deferred v0.1.5
-// Project: https://github.com/DirtyHairy/typescript-deferred
-// Definitions by: Christian Speckner <https://github.com/DirtyHairy>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "typescript-deferred" {
-
-    export interface ImmediateSuccessCB<T, TP> {
-        (value: T): TP;
-    }
-    export interface ImmediateErrorCB<TP> {
-        (err: any): TP;
-    }
-    export interface DeferredSuccessCB<T, TP> {
-        (value: T): ThenableInterface<TP>;
-    }
-    export interface DeferredErrorCB<TP> {
-        (error: any): ThenableInterface<TP>;
-    }
-    export interface ThenableInterface<T> {
-        then<TP>(successCB?: DeferredSuccessCB<T, TP>, errorCB?: DeferredErrorCB<TP>): ThenableInterface<TP>;
-        then<TP>(successCB?: DeferredSuccessCB<T, TP>, errorCB?: ImmediateErrorCB<TP>): ThenableInterface<TP>;
-        then<TP>(successCB?: ImmediateSuccessCB<T, TP>, errorCB?: DeferredErrorCB<TP>): ThenableInterface<TP>;
-        then<TP>(successCB?: ImmediateSuccessCB<T, TP>, errorCB?: ImmediateErrorCB<TP>): ThenableInterface<TP>;
-    }
-    export interface PromiseInterface<T> extends ThenableInterface<T> {
-        then<TP>(successCB?: DeferredSuccessCB<T, TP>, errorCB?: DeferredErrorCB<TP>): PromiseInterface<TP>;
-        then<TP>(successCB?: DeferredSuccessCB<T, TP>, errorCB?: ImmediateErrorCB<TP>): PromiseInterface<TP>;
-        then<TP>(successCB?: ImmediateSuccessCB<T, TP>, errorCB?: DeferredErrorCB<TP>): PromiseInterface<TP>;
-        then<TP>(successCB?: ImmediateSuccessCB<T, TP>, errorCB?: ImmediateErrorCB<TP>): PromiseInterface<TP>;
-        otherwise(errorCB?: DeferredErrorCB<T>): PromiseInterface<T>;
-        otherwise(errorCB?: ImmediateErrorCB<T>): PromiseInterface<T>;
-        always<TP>(errorCB?: DeferredErrorCB<TP>): PromiseInterface<TP>;
-        always<TP>(errorCB?: ImmediateErrorCB<TP>): PromiseInterface<TP>;
-    }
-    export interface DeferredInterface<T> {
-        resolve(value?: ThenableInterface<T>): DeferredInterface<T>;
-        resolve(value?: T): DeferredInterface<T>;
-        reject(error?: any): DeferredInterface<T>;
-        promise: PromiseInterface<T>;
-    }
-    export function create<T>(): DeferredInterface<T>;
-    export function when<T>(value?: ThenableInterface<T>): PromiseInterface<T>;
-    export function when<T>(value?: T): PromiseInterface<T>;
-
-
-}
diff --git a/typescript-services/typescriptServices.d.ts b/typescript-services/index.d.ts
similarity index 100%
rename from typescript-services/typescriptServices.d.ts
rename to typescript-services/index.d.ts
diff --git a/typescript-services/tsconfig.json b/typescript-services/tsconfig.json
new file mode 100644
index 0000000000..493c54dbc2
--- /dev/null
+++ b/typescript-services/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "typescriptServices-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/typescript-services/typescriptServices-tests.ts b/typescript-services/typescriptServices-tests.ts
index 57066d2b47..f79eee7243 100644
--- a/typescript-services/typescriptServices-tests.ts
+++ b/typescript-services/typescriptServices-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./typescriptServices.d.ts"/>
-
 // transpile
 function transpile(input: string): string {
     return ts.transpile(input, { module: ts.ModuleKind.CommonJS });
diff --git a/typescript/typescript.d.ts b/typescript/index.d.ts
similarity index 100%
rename from typescript/typescript.d.ts
rename to typescript/index.d.ts
diff --git a/typescript/tsconfig.json b/typescript/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/typescript/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ua-parser-js/index.d.ts b/ua-parser-js/index.d.ts
new file mode 100644
index 0000000000..aaf86d7596
--- /dev/null
+++ b/ua-parser-js/index.d.ts
@@ -0,0 +1,188 @@
+// Type definitions for ua-parser-js v0.7.10
+// Project: https://github.com/faisalman/ua-parser-js
+// Definitions by: Viktor Miroshnikov <https://github.com/superduper>, Lucas Woo <https://github.com/legendecas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export class UAParser {
+    static VERSION: string;
+    static BROWSER: UAParser.BROWSER;
+    static CPU: UAParser.CPU;
+    static DEVICE: UAParser.DEVICE;
+    static ENGINE: UAParser.ENGINE;
+    static OS: UAParser.OS;
+
+    /**
+    *  Returns browser information
+    */
+    getBrowser(): UAParser.IBrowser;
+    /**
+    *  Returns OS information
+    */
+    getOS(): UAParser.IOS;
+
+    /**
+    *  Returns browsers engine information
+    */
+    getEngine(): UAParser.IEngine;
+
+    /**
+    *  Returns device information
+    */
+    getDevice(): UAParser.IDevice;
+
+    /**
+    *  Returns parsed CPU information
+    */
+    getCPU(): UAParser.ICPU;
+
+    /**
+    *  Returns UA string of current instance
+    */
+    getUA(): string;
+
+    /**
+    *  Set & parse UA string
+    */
+    setUA(uastring: string): UAParser;
+
+    /**
+    *  Returns parse result
+    */
+    getResult(): UAParser.IResult;
+
+    /**
+     * Create a new parser with UA prepopulated and extensions extended
+     */
+    constructor(uastring?: string, extensions?: any);
+}
+export as namespace UAParser;
+
+
+declare namespace UAParser {
+
+    export interface IBrowser {
+        /**
+        * Possible values :
+        * Amaya, Android Browser, Arora, Avant, Baidu, Blazer, Bolt, Camino, Chimera, Chrome,
+        * Chromium, Comodo Dragon, Conkeror, Dillo, Dolphin, Doris, Edge, Epiphany, Fennec,
+        * Firebird, Firefox, Flock, GoBrowser, iCab, ICE Browser, IceApe, IceCat, IceDragon,
+        * Iceweasel, IE [Mobile], Iron, Jasmine, K-Meleon, Konqueror, Kindle, Links,
+        * Lunascape, Lynx, Maemo, Maxthon, Midori, Minimo, MIUI Browser, [Mobile] Safari,
+        * Mosaic, Mozilla, Netfront, Netscape, NetSurf, Nokia, OmniWeb, Opera [Mini/Mobi/Tablet],
+        * Phoenix, Polaris, QQBrowser, RockMelt, Silk, Skyfire, SeaMonkey, SlimBrowser, Swiftfox,
+        * Tizen, UCBrowser, Vivaldi, w3m, Yandex
+        *
+        */
+        name: string;
+
+        /**
+        * Determined dynamically
+        */
+        version: string;
+    }
+
+    export interface IDevice {
+        /**
+        * Determined dynamically
+        */
+        model: string;
+
+        /**
+        * Possible type:
+        * console, mobile, tablet, smarttv, wearable, embedded
+        */
+        type: string;
+
+        /**
+        * Possible vendor:
+        * Acer, Alcatel, Amazon, Apple, Archos, Asus, BenQ, BlackBerry, Dell, GeeksPhone,
+        * Google, HP, HTC, Huawei, Jolla, Lenovo, LG, Meizu, Microsoft, Motorola, Nexian,
+        * Nintendo, Nokia, Nvidia, Ouya, Palm, Panasonic, Polytron, RIM, Samsung, Sharp,
+        * Siemens, Sony-Ericsson, Sprint, Xbox, ZTE
+        */
+        vendor: string;
+    }
+
+    export interface IEngine {
+        /**
+        * Possible name:
+        * Amaya, EdgeHTML, Gecko, iCab, KHTML, Links, Lynx, NetFront, NetSurf, Presto,
+        * Tasman, Trident, w3m, WebKit
+        */
+        name: string;
+        /**
+        * Determined dynamically
+        */
+        version: string;
+    }
+
+    export interface IOS {
+        /**
+        * Possible 'os.name'
+        * AIX, Amiga OS, Android, Arch, Bada, BeOS, BlackBerry, CentOS, Chromium OS, Contiki,
+        * Fedora, Firefox OS, FreeBSD, Debian, DragonFly, Gentoo, GNU, Haiku, Hurd, iOS,
+        * Joli, Linpus, Linux, Mac OS, Mageia, Mandriva, MeeGo, Minix, Mint, Morph OS, NetBSD,
+        * Nintendo, OpenBSD, OpenVMS, OS/2, Palm, PCLinuxOS, Plan9, Playstation, QNX, RedHat,
+        * RIM Tablet OS, RISC OS, Sailfish, Series40, Slackware, Solaris, SUSE, Symbian, Tizen,
+        * Ubuntu, UNIX, VectorLinux, WebOS, Windows [Phone/Mobile], Zenwalk
+        */
+        name: string;
+        /**
+        * Determined dynamically
+        */
+        version: string;
+    }
+
+    export interface ICPU {
+        /**
+         * Possible architecture:
+         *  68k, amd64, arm, arm64, avr, ia32, ia64, irix, irix64, mips, mips64, pa-risc,
+         *  ppc, sparc, sparc64
+         */
+        architecture: string;
+    }
+
+    export interface IResult {
+        ua: string;
+        browser: IBrowser;
+        device: IDevice;
+        engine: IEngine;
+        os: IOS;
+        cpu: ICPU;
+    }
+
+    export interface BROWSER {
+        NAME: string,
+
+        // Deprecated
+        MAJOR: string,
+        VERSION: string
+    }
+
+    export interface CPU {
+        ARCHITECTURE: string
+    }
+
+    export interface DEVICE {
+        MODEL: string,
+        VENDOR: string,
+        TYPE: string,
+        CONSOLE: string,
+        MOBILE: string,
+        SMARTTV: string,
+        TABLET: string,
+        WEARABLE: string,
+        EMBEDDED: string
+    }
+
+    export interface ENGINE {
+        NAME: string,
+        VERSION: string
+    }
+
+    export interface OS {
+        NAME: string,
+        VERSION: string
+    }
+
+}
diff --git a/ua-parser-js/tsconfig.json b/ua-parser-js/tsconfig.json
new file mode 100644
index 0000000000..eefcc28702
--- /dev/null
+++ b/ua-parser-js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ua-parser-js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ua-parser-js/ua-parser-js-tests.ts b/ua-parser-js/ua-parser-js-tests.ts
index 7ff2c5db56..709ee380ff 100644
--- a/ua-parser-js/ua-parser-js-tests.ts
+++ b/ua-parser-js/ua-parser-js-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path='ua-parser-js.d.ts' />
-
 import {UAParser} from 'ua-parser-js';
 
 function test_parser() {
diff --git a/ua-parser-js/ua-parser-js.d.ts b/ua-parser-js/ua-parser-js.d.ts
deleted file mode 100644
index be212a7ba2..0000000000
--- a/ua-parser-js/ua-parser-js.d.ts
+++ /dev/null
@@ -1,190 +0,0 @@
-// Type definitions for ua-parser-js v0.7.10
-// Project: https://github.com/faisalman/ua-parser-js
-// Definitions by: Viktor Miroshnikov <https://github.com/superduper>, Lucas Woo <https://github.com/legendecas>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace UAParser {
-
-    export interface IBrowser {
-        /**
-        * Possible values :
-        * Amaya, Android Browser, Arora, Avant, Baidu, Blazer, Bolt, Camino, Chimera, Chrome,
-        * Chromium, Comodo Dragon, Conkeror, Dillo, Dolphin, Doris, Edge, Epiphany, Fennec,
-        * Firebird, Firefox, Flock, GoBrowser, iCab, ICE Browser, IceApe, IceCat, IceDragon,
-        * Iceweasel, IE [Mobile], Iron, Jasmine, K-Meleon, Konqueror, Kindle, Links,
-        * Lunascape, Lynx, Maemo, Maxthon, Midori, Minimo, MIUI Browser, [Mobile] Safari,
-        * Mosaic, Mozilla, Netfront, Netscape, NetSurf, Nokia, OmniWeb, Opera [Mini/Mobi/Tablet],
-        * Phoenix, Polaris, QQBrowser, RockMelt, Silk, Skyfire, SeaMonkey, SlimBrowser, Swiftfox,
-        * Tizen, UCBrowser, Vivaldi, w3m, Yandex
-        *
-        */
-        name: string;
-
-        /**
-        * Determined dynamically
-        */
-        version: string;
-    }
-
-    export interface IDevice {
-        /**
-        * Determined dynamically
-        */
-        model: string;
-
-        /**
-        * Possible type:
-        * console, mobile, tablet, smarttv, wearable, embedded
-        */
-        type: string;
-
-        /**
-        * Possible vendor:
-        * Acer, Alcatel, Amazon, Apple, Archos, Asus, BenQ, BlackBerry, Dell, GeeksPhone,
-        * Google, HP, HTC, Huawei, Jolla, Lenovo, LG, Meizu, Microsoft, Motorola, Nexian,
-        * Nintendo, Nokia, Nvidia, Ouya, Palm, Panasonic, Polytron, RIM, Samsung, Sharp,
-        * Siemens, Sony-Ericsson, Sprint, Xbox, ZTE
-        */
-        vendor: string;
-    }
-
-    export interface IEngine {
-        /**
-        * Possible name:
-        * Amaya, EdgeHTML, Gecko, iCab, KHTML, Links, Lynx, NetFront, NetSurf, Presto,
-        * Tasman, Trident, w3m, WebKit
-        */
-        name: string;
-        /**
-        * Determined dynamically
-        */
-        version: string;
-    }
-
-    export interface IOS {
-        /**
-        * Possible 'os.name'
-        * AIX, Amiga OS, Android, Arch, Bada, BeOS, BlackBerry, CentOS, Chromium OS, Contiki,
-        * Fedora, Firefox OS, FreeBSD, Debian, DragonFly, Gentoo, GNU, Haiku, Hurd, iOS,
-        * Joli, Linpus, Linux, Mac OS, Mageia, Mandriva, MeeGo, Minix, Mint, Morph OS, NetBSD,
-        * Nintendo, OpenBSD, OpenVMS, OS/2, Palm, PCLinuxOS, Plan9, Playstation, QNX, RedHat,
-        * RIM Tablet OS, RISC OS, Sailfish, Series40, Slackware, Solaris, SUSE, Symbian, Tizen,
-        * Ubuntu, UNIX, VectorLinux, WebOS, Windows [Phone/Mobile], Zenwalk
-        */
-        name: string;
-        /**
-        * Determined dynamically
-        */
-        version: string;
-    }
-
-    export interface ICPU {
-        /**
-         * Possible architecture:
-         *  68k, amd64, arm, arm64, avr, ia32, ia64, irix, irix64, mips, mips64, pa-risc,
-         *  ppc, sparc, sparc64
-         */
-        architecture: string;
-    }
-
-    export interface IResult {
-        ua: string;
-        browser: IBrowser;
-        device: IDevice;
-        engine: IEngine;
-        os: IOS;
-        cpu: ICPU;
-    }
-
-    export interface BROWSER {
-        NAME: string,
-
-        // Deprecated
-        MAJOR: string,
-        VERSION: string
-    }
-
-    export interface CPU {
-        ARCHITECTURE: string
-    }
-
-    export interface DEVICE {
-        MODEL: string,
-        VENDOR: string,
-        TYPE: string,
-        CONSOLE: string,
-        MOBILE: string,
-        SMARTTV: string,
-        TABLET: string,
-        WEARABLE: string,
-        EMBEDDED: string
-    }
-
-    export interface ENGINE {
-        NAME: string,
-        VERSION: string
-    }
-
-    export interface OS {
-        NAME: string,
-        VERSION: string
-    }
-
-}
-
-declare module "ua-parser-js" {
-
-    export class UAParser {
-        static VERSION: string;
-        static BROWSER: UAParser.BROWSER;
-        static CPU: UAParser.CPU;
-        static DEVICE: UAParser.DEVICE;
-        static ENGINE: UAParser.ENGINE;
-        static OS: UAParser.OS;
-
-        /**
-        *  Returns browser information
-        */
-        getBrowser(): UAParser.IBrowser;
-        /**
-        *  Returns OS information
-        */
-        getOS(): UAParser.IOS;
-
-        /**
-        *  Returns browsers engine information
-        */
-        getEngine(): UAParser.IEngine;
-
-        /**
-        *  Returns device information
-        */
-        getDevice(): UAParser.IDevice;
-
-        /**
-        *  Returns parsed CPU information
-        */
-        getCPU(): UAParser.ICPU;
-
-        /**
-        *  Returns UA string of current instance
-        */
-        getUA(): string;
-
-        /**
-        *  Set & parse UA string
-        */
-        setUA(uastring: string): UAParser;
-
-        /**
-        *  Returns parse result
-        */
-        getResult(): UAParser.IResult;
-
-        /**
-         * Create a new parser with UA prepopulated and extensions extended
-         */
-        constructor(uastring?: string, extensions?: any);
-    }
-
-}
diff --git a/uglify-js/index.d.ts b/uglify-js/index.d.ts
new file mode 100644
index 0000000000..d87c80aff6
--- /dev/null
+++ b/uglify-js/index.d.ts
@@ -0,0 +1,429 @@
+// Type definitions for UglifyJS 2 v2.6.1
+// Project: https://github.com/mishoo/UglifyJS2
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="source-map" />
+
+
+import * as MOZ_SourceMap from 'source-map';
+
+declare namespace UglifyJS {
+    interface Tokenizer {
+        /**
+         * The type of this token.
+         * Can be "num", "string", "regexp", "operator", "punc", "atom", "name", "keyword", "comment1" or "comment2".
+         * "comment1" and "comment2" are for single-line, respectively multi-line comments.
+         */
+        type: string;
+
+        /**
+         * The name of the file where this token originated from. Useful when compressing multiple files at once to generate the proper source map.
+         */
+        file: string;
+
+        /**
+         * The "value" of the token.
+         * That's additional information and depends on the token type: "num", "string" and "regexp" tokens you get their literal value.
+         * - For "operator" you get the operator.
+         * - For "punc" it's the punctuation sign (parens, comma, semicolon etc).
+         * - For "atom", "name" and "keyword" it's the name of the identifier
+         * - For comments it's the body of the comment (excluding the initial "//" and "/*".
+         */
+        value: string;
+
+        /**
+         * The line number of this token in the original code.
+         * 1-based index.
+         */
+        line: number;
+
+        /**
+         * The column number of this token in the original code.
+         * 0-based index.
+         */
+        col: number;
+
+        /**
+         * Short for "newline before", it's a boolean that tells us whether there was a newline before this node in the original source. It helps for automatic semicolon insertion.
+         * For multi-line comments in particular this will be set to true if there either was a newline before this comment, or * * if this comment contains a newline.
+         */
+        nlb: boolean;
+
+        /**
+         * This doesn't apply for comment tokens, but for all other token types it will be an array of comment tokens that were found before.
+         */
+        comments_before: string[];
+    }
+
+    interface AST_Node {
+        // The first token of this node
+        start: AST_Node;
+
+        // The last token of this node
+        end: AST_Node;
+
+        transform(tt: TreeTransformer): AST_Toplevel;
+    }
+
+    interface AST_Toplevel extends AST_Node {
+        // UglifyJS contains a scope analyzer which figures out variable/function definitions, references etc.
+        // You need to call it manually before compression or mangling.
+        // The figure_out_scope method is defined only on the AST_Toplevel node.
+        figure_out_scope(): void;
+
+        // Get names that are optimized for GZip compression (names will be generated using the most frequent characters first)
+        compute_char_frequency(): void;
+
+        mangle_names(): void;
+
+        print(stream: OutputStream): void;
+
+        print_to_string(options?: BeautifierOptions): string;
+    }
+
+    interface MinifyOptions {
+        spidermonkey?: boolean;
+        outSourceMap?: string;
+        sourceRoot?: string;
+        inSourceMap?: string;
+        fromString?: boolean;
+        warnings?: boolean;
+        mangle?: Object;
+        output?: MinifyOutput,
+        compress?: Object;
+    }
+
+    interface MinifyOutput {
+        code: string;
+        map: string;
+    }
+
+    function minify(files: string | Array<string>, options?: MinifyOptions): MinifyOutput;
+
+
+    interface ParseOptions {
+        // Default is false
+        strict?: boolean;
+
+        // Input file name, default is null
+        filename?: string;
+
+        // Default is null
+        toplevel?: AST_Toplevel;
+    }
+
+    /**
+     * The parser creates a custom abstract syntax tree given a piece of JavaScript code.
+     * Perhaps you should read about the AST first.
+     */
+    function parse(code: string, options?: ParseOptions): AST_Toplevel;
+
+
+    interface BeautifierOptions {
+        /**
+         * Start indentation on every line (only when `beautify`)
+         */
+        indent_start?: number;
+
+        /**
+         * Indentation level (only when `beautify`)
+         */
+        indent_level?: number;
+
+        /**
+         * Quote all keys in object literals?
+         */
+        quote_keys?: boolean;
+
+        /**
+         * Add a space after colon signs?
+         */
+        space_colon?: boolean;
+
+        /**
+         * Output ASCII-safe? (encodes Unicode characters as ASCII)
+         */
+        ascii_only?: boolean;
+
+        /**
+         * Escape "</script"?
+         */
+        inline_script?: boolean;
+
+        /**
+         * Informative maximum line width (for beautified output)
+         */
+        width?: number;
+
+        /**
+         * Maximum line length (for non-beautified output)
+         */
+        max_line_len?: number;
+
+        /**
+         * Output IE-safe code?
+         */
+        ie_proof?: boolean;
+
+        /**
+         * Beautify output?
+         */
+        beautify?: boolean;
+
+        /**
+         * Output a source map
+         */
+        source_map?: SourceMapOptions;
+
+        /**
+         * Use brackets every time?
+         */
+        bracketize?: boolean;
+
+        /**
+         * Output comments?
+         */
+        comments?: boolean;
+
+        /**
+         * Use semicolons to separate statements? (otherwise, newlines)
+         */
+        semicolons?: boolean;
+    }
+
+    interface OutputStream {
+        // Return the output so far as a string
+        get(): string;
+        toString(): string;
+
+        // Insert one indentation string (usually 4 characters).
+        // Optionally pass true to indent half the width (I'm using that for case and default lines in switch blocks.
+        // If beautify is off, this function does nothing.
+        indent(half?: boolean): void;
+
+        // Return the current indentation width (not level; for example if we're in level 2 and indent_level is 4, this method would return 8.
+        indentation(): number;
+
+        // return the width of the current line text minus indentation.
+        current_width(): number
+
+        // Return true if current_width() is bigger than options.width (assuming options.width is non-null, non-zero).
+        should_break(): boolean;
+
+        // If beautification is on, this inserts a newline. Otherwise it does nothing.
+        newline(): void;
+
+        // Include the given string into the output, adjusting current_line, current_col and current_pos accordingly.
+        print(str: string): void;
+
+        // If beautification is on this always includes a space character.
+        // Otherwise it saves a hint somewhere that a space might be needed at current point.
+        // The space will go in at the next output but only when absolutely required, for example it will insert the space in return 10 but not in return"stuff".
+        space(): void;
+
+        // Inserts a comma, and calls space() — that is, if beautification is on you'll get a space after the comma.
+        comma(): void;
+
+        // Inserts a colon, and calls space() if options.space_colon is set.
+        colon(): void;
+
+        // Returns the last printed chunk.
+        last(): string;
+
+        // If beautification is on it always inserts a semicolon.
+        // Otherwise it saves a hint that a semicolon might be needed at current point.
+        // The semicolon is inserted when the next output comes in, only if required to not break the JS syntax.
+        semicolon(): void;
+
+        // Always inserts a semicolon and clears the hint that a semicolon might be needed.
+        force_semicolon(): void;
+
+        // Encodes any non-ASCII characters in string with JavaScript's conventions (using \uCODE).
+        to_ascii(str: string): void;
+
+        // Prints an identifier. If options.ascii_only is set, non-ASCII chars will be encoded with JavaScript conventions.
+        print_name(name: string): void;
+
+        // Prints a string. It adds quotes automatically.
+        // It prefers double-quotes, but will actually count any quotes in the string and will use single-quotes if the output proves to be shorter (depending on how many backslashes it has to insert).
+        // It encodes to ASCII if options.ascii_only is set.
+        print_string(str: string): void;
+
+        // Returns the width of the next indentation level. For example if current level is 2 and options.indent_level is 4, it'll return 12.
+        next_indent(): number;
+
+        // Sets the current indentation to col (column), calls the function and thereafter restores the previous indentation level.
+        // If beautification is off it simply calls func.
+        with_indent(col: number, func: Function): void;
+
+        // This is used to output blocks in curly brackets.
+        // It'll print an open bracket at current point, then call newline() and with the next indentation level it calls your func.
+        // Lastly, it'll print an indented closing bracket. As usual, if beautification is off you'll just get {x} where x is whatever func outputs.
+        with_block(func: Function): void;
+
+        // Adds parens around the output that your function prints.
+        with_parens(func: Function): void;
+
+        // Adds square brackets around the output that your function prints.
+        with_square(func: Function): void;
+
+        // If options.source_map is set, this will generate a source mapping between the given token (which should be an AST_Token-like object) and the current line/col.
+        // The name is optional; in most cases it will be inferred from the token.
+        add_mapping(token: AST_Node, name?: string): void;
+
+        // Returns the option with the given name.
+        option(name: string): any;
+
+        // Returns the current line in the output (1-based).
+        line(): number;
+
+        // Returns the current column in the output (zero-based).
+        col(): number;
+
+        // Push the given node into an internal stack. This is used to keep track of current node's parent(s).
+        push_node(node: AST_Node): void;
+
+        // Pops the top of the stack and returns it.
+        pop_node(): AST_Node;
+
+        // Returns that internal stack.
+        stack(): any;
+
+        // Returns the n-th parent node (where zero means the direct parent).
+        parent(n: number): AST_Node;
+    }
+
+    /**
+     * The code generator is a recursive process of getting back source code from an AST returned by the parser.
+     * Every AST node has a “print” method that takes an OutputStream and dumps the code from that node into it.
+     * The stream object supports a lot of options that control the output.
+     * You can specify whether you'd like to get human-readable (indented) output, the indentation level, whether you'd like to quote all properties in object literals etc.
+     */
+    function OutputStream(options?: BeautifierOptions): OutputStream;
+
+
+    interface SourceMapOptions {
+        /**
+         * The compressed file name
+         */
+        file?: string;
+
+        /**
+         * The root URL to the original sources
+         */
+        root?: string;
+
+        /**
+         * The input source map.
+         * Useful when you compress code that was generated from some other source (possibly other programming language).
+         * If you have an input source map, pass it in this argument and UglifyJS will generate a mapping that maps back
+         * to the original source (as opposed to the compiled code that you are compressing).
+         */
+        orig?: Object | JSON;
+    }
+
+    interface SourceMap {
+        add(source: string, gen_line: number, gen_col: number, orig_line: number, orig_col: number, name?: string): void;
+        get(): MOZ_SourceMap.SourceMapGenerator;
+        toString(): string;
+    }
+
+    /**
+     * The output stream keeps track of the current line/column in the output and can trivially generate a source mapping to the original code via Mozilla's source-map library.
+     * To use this functionality, you must load this library (it's automatically require-d by UglifyJS in the NodeJS version, but in a browser you must load it yourself)
+     * and make it available via the global MOZ_SourceMap variable.
+     */
+    function SourceMap(options?: SourceMapOptions): SourceMap;
+
+
+    interface CompressorOptions {
+        // Join consecutive statemets with the “comma operator”
+        sequences?: boolean;
+
+        // Optimize property access: a["foo"] → a.foo
+        properties?: boolean;
+
+        // Discard unreachable code
+        dead_code?: boolean;
+
+        // Discard “debugger” statements
+        drop_debugger?: boolean;
+
+        // Some unsafe optimizations (see below)
+        unsafe?: boolean;
+
+        // Optimize if-s and conditional expressions
+        conditionals?: boolean;
+
+        // Optimize comparisons
+        comparisons?: boolean;
+
+        // Evaluate constant expressions
+        evaluate?: boolean;
+
+        // Optimize boolean expressions
+        booleans?: boolean;
+
+        // Optimize loops
+        loops?: boolean;
+
+        // Drop unused variables/functions
+        unused?: boolean;
+
+        // Hoist function declarations
+        hoist_funs?: boolean;
+
+        // Hoist variable declarations
+        hoist_vars?: boolean;
+
+        // Optimize if-s followed by return/continue
+        if_return?: boolean;
+
+        // Join var declarations
+        join_vars?: boolean;
+
+        // Try to cascade `right` into `left` in sequences
+        cascade?: boolean;
+
+        // Drop side-effect-free statements
+        side_effects?: boolean;
+
+        // Warn about potentially dangerous optimizations/code
+        warnings?: boolean;
+
+        // Global definitions
+        global_defs?: Object;
+    }
+
+    /**
+     * The compressor is a tree transformer which reduces the code size by applying various optimizations on the AST
+     */
+    function Compressor(options?: CompressorOptions): AST_Toplevel;
+
+
+    // TODO
+    interface TreeWalker {
+    }
+
+    type visitor = (node: AST_Node, descend: Function) => boolean;
+
+    /**
+     * UglifyJS provides a TreeWalker object and every node has a walk method that given a walker will apply your visitor to each node in the tree.
+     * Your visitor can return a non-falsy value in order to prevent descending the current node.
+     */
+    function TreeWalker(visitor: visitor): TreeWalker;
+
+
+    // TODO
+    interface TreeTransformer extends TreeWalker {
+    }
+
+    /**
+     * The tree transformer is a special case of a tree walker.
+     * In fact it even inherits from TreeWalker and you can use the same methods, but initialization and visitor protocol are a bit different.
+     */
+    function TreeTransformer(before: visitor, after: visitor): TreeTransformer;
+}
+
+export = UglifyJS;
diff --git a/uglify-js/tsconfig.json b/uglify-js/tsconfig.json
new file mode 100644
index 0000000000..5813f16767
--- /dev/null
+++ b/uglify-js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "uglify-js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/uglify-js/uglify-js-tests.ts b/uglify-js/uglify-js-tests.ts
index 23b935dec2..5de6c65b50 100644
--- a/uglify-js/uglify-js-tests.ts
+++ b/uglify-js/uglify-js-tests.ts
@@ -1,7 +1,6 @@
-/// <reference path="uglify-js.d.ts" />
-/// <reference path="../node/node.d.ts" />
+/// <reference types="node" />
 
-import * as UglifyJS from 'uglify-js';
+import * as UglifyJS from './';
 import * as fs from 'fs';
 
 var result = UglifyJS.minify("/path/to/file.js");
diff --git a/uglify-js/uglify-js.d.ts b/uglify-js/uglify-js.d.ts
deleted file mode 100644
index debb017c14..0000000000
--- a/uglify-js/uglify-js.d.ts
+++ /dev/null
@@ -1,430 +0,0 @@
-// Type definitions for UglifyJS 2 v2.6.1
-// Project: https://github.com/mishoo/UglifyJS2
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../source-map/source-map.d.ts" />
-
-declare module 'uglify-js' {
-  import * as MOZ_SourceMap from 'source-map';
-
-  namespace UglifyJS {
-    interface Tokenizer {
-      /**
-       * The type of this token.
-       * Can be "num", "string", "regexp", "operator", "punc", "atom", "name", "keyword", "comment1" or "comment2".
-       * "comment1" and "comment2" are for single-line, respectively multi-line comments.
-       */
-      type: string;
-
-      /**
-       * The name of the file where this token originated from. Useful when compressing multiple files at once to generate the proper source map.
-       */
-      file: string;
-
-      /**
-       * The "value" of the token.
-       * That's additional information and depends on the token type: "num", "string" and "regexp" tokens you get their literal value.
-       * - For "operator" you get the operator.
-       * - For "punc" it's the punctuation sign (parens, comma, semicolon etc).
-       * - For "atom", "name" and "keyword" it's the name of the identifier
-       * - For comments it's the body of the comment (excluding the initial "//" and "/*".
-       */
-      value: string;
-
-      /**
-       * The line number of this token in the original code.
-       * 1-based index.
-       */
-      line: number;
-
-      /**
-       * The column number of this token in the original code.
-       * 0-based index.
-       */
-      col: number;
-
-      /**
-       * Short for "newline before", it's a boolean that tells us whether there was a newline before this node in the original source. It helps for automatic semicolon insertion.
-       * For multi-line comments in particular this will be set to true if there either was a newline before this comment, or * * if this comment contains a newline.
-       */
-      nlb: boolean;
-
-      /**
-       * This doesn't apply for comment tokens, but for all other token types it will be an array of comment tokens that were found before.
-       */
-      comments_before: string[];
-    }
-
-    interface AST_Node {
-      // The first token of this node
-      start: AST_Node;
-
-      // The last token of this node
-      end: AST_Node;
-
-      transform(tt: TreeTransformer): AST_Toplevel;
-    }
-
-    interface AST_Toplevel extends AST_Node {
-      // UglifyJS contains a scope analyzer which figures out variable/function definitions, references etc.
-      // You need to call it manually before compression or mangling.
-      // The figure_out_scope method is defined only on the AST_Toplevel node.
-      figure_out_scope(): void;
-
-      // Get names that are optimized for GZip compression (names will be generated using the most frequent characters first)
-      compute_char_frequency(): void;
-
-      mangle_names(): void;
-
-      print(stream: OutputStream): void;
-
-      print_to_string(options?: BeautifierOptions): string;
-    }
-
-    interface MinifyOptions {
-      spidermonkey?: boolean;
-      outSourceMap?: string;
-      sourceRoot?: string;
-      inSourceMap?: string;
-      fromString?: boolean;
-      warnings?: boolean;
-      mangle?: Object;
-      output?: MinifyOutput,
-      compress?: Object;
-    }
-
-    interface MinifyOutput {
-      code: string;
-      map: string;
-    }
-
-    function minify(files: string | Array<string>, options?: MinifyOptions): MinifyOutput;
-
-
-    interface ParseOptions {
-      // Default is false
-      strict?: boolean;
-
-      // Input file name, default is null
-      filename?: string;
-
-      // Default is null
-      toplevel?: AST_Toplevel;
-    }
-
-    /**
-     * The parser creates a custom abstract syntax tree given a piece of JavaScript code.
-     * Perhaps you should read about the AST first.
-     */
-    function parse(code: string, options?: ParseOptions): AST_Toplevel;
-
-
-    interface BeautifierOptions {
-      /**
-       * Start indentation on every line (only when `beautify`)
-       */
-      indent_start?: number;
-
-      /**
-       * Indentation level (only when `beautify`)
-       */
-      indent_level?: number;
-
-      /**
-       * Quote all keys in object literals?
-       */
-      quote_keys?: boolean;
-
-      /**
-       * Add a space after colon signs?
-       */
-      space_colon?: boolean;
-
-      /**
-       * Output ASCII-safe? (encodes Unicode characters as ASCII)
-       */
-      ascii_only?: boolean;
-
-      /**
-       * Escape "</script"?
-       */
-      inline_script?: boolean;
-
-      /**
-       * Informative maximum line width (for beautified output)
-       */
-      width?: number;
-
-      /**
-       * Maximum line length (for non-beautified output)
-       */
-      max_line_len?: number;
-
-      /**
-       * Output IE-safe code?
-       */
-      ie_proof?: boolean;
-
-      /**
-       * Beautify output?
-       */
-      beautify?: boolean;
-
-      /**
-       * Output a source map
-       */
-      source_map?: SourceMapOptions;
-
-      /**
-       * Use brackets every time?
-       */
-      bracketize?: boolean;
-
-      /**
-       * Output comments?
-       */
-      comments?: boolean;
-
-      /**
-       * Use semicolons to separate statements? (otherwise, newlines)
-       */
-      semicolons?: boolean;
-    }
-
-    interface OutputStream {
-      // Return the output so far as a string
-      get(): string;
-      toString(): string;
-
-      // Insert one indentation string (usually 4 characters).
-      // Optionally pass true to indent half the width (I'm using that for case and default lines in switch blocks.
-      // If beautify is off, this function does nothing.
-      indent(half?: boolean): void;
-
-      // Return the current indentation width (not level; for example if we're in level 2 and indent_level is 4, this method would return 8.
-      indentation(): number;
-
-      // return the width of the current line text minus indentation.
-      current_width(): number
-
-      // Return true if current_width() is bigger than options.width (assuming options.width is non-null, non-zero).
-      should_break(): boolean;
-
-      // If beautification is on, this inserts a newline. Otherwise it does nothing.
-      newline(): void;
-
-      // Include the given string into the output, adjusting current_line, current_col and current_pos accordingly.
-      print(str: string): void;
-
-      // If beautification is on this always includes a space character.
-      // Otherwise it saves a hint somewhere that a space might be needed at current point.
-      // The space will go in at the next output but only when absolutely required, for example it will insert the space in return 10 but not in return"stuff".
-      space(): void;
-
-      // Inserts a comma, and calls space() — that is, if beautification is on you'll get a space after the comma.
-      comma(): void;
-
-      // Inserts a colon, and calls space() if options.space_colon is set.
-      colon(): void;
-
-      // Returns the last printed chunk.
-      last(): string;
-
-      // If beautification is on it always inserts a semicolon.
-      // Otherwise it saves a hint that a semicolon might be needed at current point.
-      // The semicolon is inserted when the next output comes in, only if required to not break the JS syntax.
-      semicolon(): void;
-
-      // Always inserts a semicolon and clears the hint that a semicolon might be needed.
-      force_semicolon(): void;
-
-      // Encodes any non-ASCII characters in string with JavaScript's conventions (using \uCODE).
-      to_ascii(str: string): void;
-
-      // Prints an identifier. If options.ascii_only is set, non-ASCII chars will be encoded with JavaScript conventions.
-      print_name(name: string): void;
-
-      // Prints a string. It adds quotes automatically.
-      // It prefers double-quotes, but will actually count any quotes in the string and will use single-quotes if the output proves to be shorter (depending on how many backslashes it has to insert).
-      // It encodes to ASCII if options.ascii_only is set.
-      print_string(str: string): void;
-
-      // Returns the width of the next indentation level. For example if current level is 2 and options.indent_level is 4, it'll return 12.
-      next_indent(): number;
-
-      // Sets the current indentation to col (column), calls the function and thereafter restores the previous indentation level.
-      // If beautification is off it simply calls func.
-      with_indent(col: number, func: Function): void;
-
-      // This is used to output blocks in curly brackets.
-      // It'll print an open bracket at current point, then call newline() and with the next indentation level it calls your func.
-      // Lastly, it'll print an indented closing bracket. As usual, if beautification is off you'll just get {x} where x is whatever func outputs.
-      with_block(func: Function): void;
-
-      // Adds parens around the output that your function prints.
-      with_parens(func: Function): void;
-
-      // Adds square brackets around the output that your function prints.
-      with_square(func: Function): void;
-
-      // If options.source_map is set, this will generate a source mapping between the given token (which should be an AST_Token-like object) and the current line/col.
-      // The name is optional; in most cases it will be inferred from the token.
-      add_mapping(token: AST_Node, name?: string): void;
-
-      // Returns the option with the given name.
-      option(name: string): any;
-
-      // Returns the current line in the output (1-based).
-      line(): number;
-
-      // Returns the current column in the output (zero-based).
-      col(): number;
-
-      // Push the given node into an internal stack. This is used to keep track of current node's parent(s).
-      push_node(node: AST_Node): void;
-
-      // Pops the top of the stack and returns it.
-      pop_node(): AST_Node;
-
-      // Returns that internal stack.
-      stack(): any;
-
-      // Returns the n-th parent node (where zero means the direct parent).
-      parent(n: number): AST_Node;
-    }
-
-    /**
-     * The code generator is a recursive process of getting back source code from an AST returned by the parser.
-     * Every AST node has a “print” method that takes an OutputStream and dumps the code from that node into it.
-     * The stream object supports a lot of options that control the output.
-     * You can specify whether you'd like to get human-readable (indented) output, the indentation level, whether you'd like to quote all properties in object literals etc.
-     */
-    function OutputStream(options?: BeautifierOptions): OutputStream;
-
-
-    interface SourceMapOptions {
-      /**
-       * The compressed file name
-       */
-      file?: string;
-
-      /**
-       * The root URL to the original sources
-       */
-      root?: string;
-
-      /**
-       * The input source map.
-       * Useful when you compress code that was generated from some other source (possibly other programming language).
-       * If you have an input source map, pass it in this argument and UglifyJS will generate a mapping that maps back
-       * to the original source (as opposed to the compiled code that you are compressing).
-       */
-      orig?: Object | JSON;
-    }
-
-    interface SourceMap {
-      add(source: string, gen_line: number, gen_col: number, orig_line: number, orig_col: number, name?: string): void;
-      get(): MOZ_SourceMap.SourceMapGenerator;
-      toString(): string;
-    }
-
-    /**
-     * The output stream keeps track of the current line/column in the output and can trivially generate a source mapping to the original code via Mozilla's source-map library.
-     * To use this functionality, you must load this library (it's automatically require-d by UglifyJS in the NodeJS version, but in a browser you must load it yourself)
-     * and make it available via the global MOZ_SourceMap variable.
-     */
-    function SourceMap(options?: SourceMapOptions): SourceMap;
-
-
-    interface CompressorOptions {
-      // Join consecutive statemets with the “comma operator”
-      sequences?: boolean;
-
-      // Optimize property access: a["foo"] → a.foo
-      properties?: boolean;
-
-      // Discard unreachable code
-      dead_code?: boolean;
-
-      // Discard “debugger” statements
-      drop_debugger?: boolean;
-
-      // Some unsafe optimizations (see below)
-      unsafe?: boolean;
-
-      // Optimize if-s and conditional expressions
-      conditionals?: boolean;
-
-      // Optimize comparisons
-      comparisons?: boolean;
-
-      // Evaluate constant expressions
-      evaluate?: boolean;
-
-      // Optimize boolean expressions
-      booleans?: boolean;
-
-      // Optimize loops
-      loops?: boolean;
-
-      // Drop unused variables/functions
-      unused?: boolean;
-
-      // Hoist function declarations
-      hoist_funs?: boolean;
-
-      // Hoist variable declarations
-      hoist_vars?: boolean;
-
-      // Optimize if-s followed by return/continue
-      if_return?: boolean;
-
-      // Join var declarations
-      join_vars?: boolean;
-
-      // Try to cascade `right` into `left` in sequences
-      cascade?: boolean;
-
-      // Drop side-effect-free statements
-      side_effects?: boolean;
-
-      // Warn about potentially dangerous optimizations/code
-      warnings?: boolean;
-
-      // Global definitions
-      global_defs?: Object;
-    }
-
-    /**
-     * The compressor is a tree transformer which reduces the code size by applying various optimizations on the AST
-     */
-    function Compressor(options?: CompressorOptions): AST_Toplevel;
-
-
-    // TODO
-    interface TreeWalker {
-    }
-
-    type visitor = (node: AST_Node, descend: Function) => boolean;
-
-    /**
-     * UglifyJS provides a TreeWalker object and every node has a walk method that given a walker will apply your visitor to each node in the tree.
-     * Your visitor can return a non-falsy value in order to prevent descending the current node.
-     */
-    function TreeWalker(visitor: visitor): TreeWalker;
-
-
-    // TODO
-    interface TreeTransformer extends TreeWalker {
-    }
-
-    /**
-     * The tree transformer is a special case of a tree walker.
-     * In fact it even inherits from TreeWalker and you can use the same methods, but initialization and visitor protocol are a bit different.
-     */
-    function TreeTransformer(before: visitor, after: visitor): TreeTransformer;
-  }
-
-  export = UglifyJS;
-}
diff --git a/ui-grid/index.d.ts b/ui-grid/index.d.ts
new file mode 100644
index 0000000000..5c7fa7ff54
--- /dev/null
+++ b/ui-grid/index.d.ts
@@ -0,0 +1,3896 @@
+// Type definitions for ui-grid
+// Project: http://www.ui-grid.info/
+// Definitions by: Ben Tesser <https://github.com/btesser>, Joe Skeen <http://github.com/joeskeen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// These are very definitely preliminary. Please feel free to improve.
+
+// Changelog:
+// 8/11/2015 ui-grid  v3.0.3
+//   Extensive plugin support added (Plugin specific API, ColumnDef, GridOptions, GridRow, Constants).
+//   Added docs for all existing interfaces.
+//   Fixed a few incorrect interfaces, updated interfaces to reflect latest version.
+//   Did some cleanup... Moved all plugins into their own modules
+// 7/8/2015 ui-grid v3.0.0-rc.22-482dc67
+//   Added primary interfaces for row, column, api, grid, columnDef, and gridOptions.  Needs more tests!
+
+/// <reference types="jquery" />
+/// <reference types="angularjs" />
+
+export = uiGrid;
+export as namespace uiGrid;
+
+declare namespace uiGrid {
+    export interface IUiGridConstants {
+        LOG_DEBUG_MESSAGES: boolean;
+        LOG_WARN_MESSAGES: boolean;
+        LOG_ERROR_MESSAGES: boolean;
+        CUSTOM_FILTERS: RegExp;
+        COL_FIELD: RegExp;
+        MODEL_COL_FIELD: RegExp;
+        TOOLTIP: RegExp;
+        DISPLAY_CELL_TEMPLATE: RegExp;
+        TEMPLATE_REGEXP: RegExp;
+        FUNC_REGEXP: RegExp;
+        DOT_REGEXP: RegExp;
+        APOS_REGEXP: RegExp;
+        BRACKET_REGEXP: RegExp;
+        COL_CLASS_PREFIX: string;
+        events: {
+            GRID_SCROLL: string;
+            COLUMN_MENU_SHOWN: string;
+            ITEM_DRAGGING: string;
+            COLUMN_HEADER_CLICK: string;
+        };
+        keymap: {
+            TAB: number;
+            STRG: number;
+            CAPSLOCK: number;
+            CTRL: number;
+            CTRLRIGHT: number;
+            CTRLR: number;
+            SHIFT: number;
+            RETURN: number;
+            ENTER: number;
+            BACKSPACE: number;
+            BCKSP: number;
+            ALT: number;
+            ALTR: number;
+            ALTRIGHT: number;
+            SPACE: number;
+            WIN: number;
+            MAC: number;
+            FN: number;
+            PG_UP: number;
+            PG_DOWN: number;
+            UP: number;
+            DOWN: number;
+            LEFT: number;
+            RIGHT: number;
+            ESC: number;
+            DEL: number;
+            F1: number;
+            F2: number;
+            F3: number;
+            F4: number;
+            F5: number;
+            F6: number;
+            F7: number;
+            F8: number;
+            F9: number;
+            F10: number;
+            F11: number;
+            F12: number;
+        };
+        ASC: string;
+        DESC: string;
+        filter: {
+            STARTS_WITH: number;
+            ENDS_WITH: number;
+            EXACT: number;
+            CONTAINS: number;
+            GREATER_THAN: number;
+            GREATER_THAN_OR_EQUAL: number;
+            LESS_THAN: number;
+            LESS_THAN_OR_EQUAL: number;
+            NOT_EQUAL: number;
+            SELECT: string;
+            INPUT: string;
+        };
+        scrollDirection: {
+            UP: string;
+            DOWN: string;
+            LEFT: string;
+            RIGHT: string;
+            NONE: string;
+        };
+        aggregationTypes: {
+            sum: number;
+            count: number;
+            avg: number;
+            min: number;
+            max: number;
+        };
+        CURRENCY_SYMBOLS: Array<string>;
+        dataChange: {
+            ALL: string;
+            EDIT: string;
+            ROW: string;
+            COLUMN: string;
+            OPTIONS: string;
+        };
+        scrollbars: {
+            NEVER: number;
+            ALWAYS: number;
+        };
+    }
+    export type IGridInstance = IGridInstanceOf<any>;
+    export interface IGridInstanceOf<TEntity> {
+        /**
+         * adds a row header column to the grid
+         * @param {IColumnDef} colDef The column definition
+         */
+        addRowHeaderColumn(colDef: IColumnDefOf<TEntity>): void;
+        /**
+         * uses the first row of data to assign colDef.type for any types not defined.
+         */
+        assignTypes(): void;
+        /**
+         * Populates columnDefs from the provided data
+         * @param {IRowBuilder} rowBuilder function to be called
+         */
+        buildColumnDefsFromData(rowBuilder: IRowBuilder<TEntity>): void;
+        /**
+         * creates GridColumn objects from the columnDefinition.
+         * Calls each registered columnBuilder to further process the column
+         * @param {IBuildColumnsOptions} options An object containing options to use when building columns
+         *        * orderByColumnDefs: defaults to false.  When true, buildColumns will order existing columns
+         *        according to the order within the column definitions
+         * @returns {ng.IPromise} A promise to load any needed column resources
+         */
+        buildColumns(options: IBuildColumnsOptions): ng.IPromise<any>;
+        /**
+         * calls each styleComputation function
+         */
+        buildStyles(): void;
+        /**
+         * Calls the callbacks based on the type of data change that has occurred.
+         * Always calls the ALL callbacks, calls the ROW, EDIT, COLUMN and OPTIONS callbacks
+         * if the event type is matching, or if the type is ALL.
+         * @param {number} type the type of event that occurred - one of the uiGridConstants.dataChange values
+         *        (ALL, ROW, EDIT, COLUMN, OPTIONS
+         */
+        callDataChangeCallbacks(type: number): void;
+        /**
+         * Clears all filters and optionally refreshes the visible rows.
+         * @param {boolean} [refreshRows=true] Refresh the rows?
+         * @param {boolean} [clearConditions=true] Clear conditions?
+         * @param {boolean} [clearFlags=true] Clear flags?
+         * @returns {ng.IPromise<any>} If refreshRows is true, returns a promise of the rows refreshing
+         */
+        clearAllFilters(refreshRows: boolean, clearConditions: boolean,
+            clearFlags: boolean): ng.IPromise<any>;
+        /**
+         * refreshes the grid when a column refresh is notified, which triggers handling of the visible flag.
+         * This is called on uiGridConstants.dataChange.COLUMN, and is registered as a dataChangeCallback in grid.js
+         * @param {string} name column name
+         */
+        columnRefreshCallback(name: string): void;
+        /**
+         * creates the left render container if it doesn't already exist
+         */
+        createLeftContainer(): void;
+        /**
+         * creates the right render container if it doesn't already exist
+         */
+        createRightContainer(): void;
+        /**
+         * sets isScrollingHorizontally to true and sets it to false in a debounced function
+         */
+        flagScrollingHorizontally(): void;
+        /**
+         * sets isScrollingVertically to true and sets it to false in a debounced function
+         */
+        flagScrollingVertically(): void;
+        /**
+         * Gets the displayed value of a cell after applying any the cellFilter
+         * @param {IGridRow} row Row to access
+         * @param {IGridColumn} col Column to access
+         * @returns {string} Cell display value
+         */
+        getCellDisplayValue(row: IGridRowOf<TEntity>, col: IGridColumnOf<TEntity>): string;
+        /**
+         * Gets the displayed value of a cell
+         * @param {IGridRow} row Row to access
+         * @param {IGridColumn} col Column to access
+         * @returns {any} Cell value
+         */
+        getCellValue(row: IGridRowOf<TEntity>, col: IGridColumnOf<TEntity>): any;
+        /**
+         * returns a grid colDef for the column name
+         * @param {string} name Column name
+         * @returns {IColumnDef} The column definition
+         */
+        getColDef(name: string): IColumnDefOf<TEntity>;
+        /**
+         * returns a grid column by name
+         * @param {string} name Column name
+         * @returns {IGridColumn} The column
+         */
+        getColumn(name: string): IGridColumnOf<TEntity>;
+        /**
+         * Return the columns that the grid is currently being sorted by
+         * @returns {Array<IGridColumn>} the columns that the grid is currently being sorted by
+         */
+        getColumnSorting(): Array<IGridColumnOf<TEntity>>;
+        /**
+         * Returns the $parse-able accessor for a column within its $scope
+         * @param {IGridColumn} col Column object
+         * @returns {string} $parse-able accessor for a column within its $scope
+         */
+        getGridQualifiedColField(col: IGridColumnOf<TEntity>): string;
+        /**
+         * returns all columns except for rowHeader columns
+         * @returns {Array<IGridColumn>} All data columns
+         */
+        getOnlyDataColumns(): Array<IGridColumnOf<TEntity>>;
+        /**
+         * returns the GridRow that contains the rowEntity
+         * @param {TEntity} rowEntity the gridOptionms.data array element instance
+         * @param {Array<IGridRow>} rows The rows to look in.  if not provided then it looks in grid.rows
+         */
+        getRow(rowEntity: TEntity, rows?: Array<IGridRowOf<TEntity>>): IGridRowOf<TEntity>;
+        /**
+         * Triggered when the browser window resizes; automatically resizes the grid
+         * @param {ng.IAngularEvent} $event Resize event
+         */
+        handleWindowResize($event: ng.IAngularEvent): void;
+        /**
+         * returns true if leftContainer exists
+         * @returns {boolean} container exists?
+         */
+        hasLeftContainer(): boolean;
+        /**
+         * returns true if rightContainer exists
+         * @returns {boolean} container exists?
+         */
+        hasRightContainer(): boolean;
+        /**
+         * returns true if leftContainer has columns
+         * @returns {boolean} container has columns
+         */
+        hasLeftContainerColumns(): boolean;
+        /**
+         * returns true if rightContainer has columns
+         * @returns {boolean} container has columns
+         */
+        hasRightContainerColumns(): boolean;
+        /**
+         * Is grid right to left
+         * @returns {boolean} true if grid is RTL
+         */
+        isRTL(): boolean;
+        /**
+         * Checks if column is a row header
+         * @param {IGridColumn} column The column
+         * @returns {boolean} true if the column is a row header
+         */
+        isRowHeaderColumn(column: IGridColumnOf<TEntity>): boolean;
+        /**
+         * creates or removes GridRow objects from the newRawData array.  Calls each registered
+         * rowBuilder to further process the row
+         *
+         * This method aims to achieve three things:
+         * 1. the resulting rows array is in the same order as the newRawData, we'll call
+         * rowsProcessors immediately after to sort the data anyway
+         * 2. if we have row hashing available, we try to use the rowHash to find the row
+         * 3. no memory leaks - rows that are no longer in newRawData need to be garbage collected
+         *
+         * The basic logic flow makes use of the newRawData, oldRows and oldHash, and creates
+         * the newRows and newHash
+         *
+         * Rows are identified using the hashKey if configured.  If not configured, then rows
+         * are identified using the gridOptions.rowEquality function
+         * @param {Array<TEntity>} newRawData The new grid data
+         * @return {ng.IPromise<any>} Promise which resolves when the rows have been created or removed
+         */
+        modifyRows(newRawData: Array<TEntity>): ng.IPromise<any>;
+        /**
+         * Notify the grid that a data or config change has occurred,
+         * where that change isn't something the grid was otherwise noticing.  This
+         * might be particularly relevant where you've changed values within the data
+         * and you'd like cell classes to be re-evaluated, or changed config within
+         * the columnDef and you'd like headerCellClasses to be re-evaluated.
+         * @param {string} type one of the uiGridConstants.dataChange values [ALL, ROW, EDIT, COLUMN], which tells
+         * us which refreshes to fire
+         */
+        notifyDataChange(type: string): void;
+        /**
+         * precompiles all cell templates
+         */
+        precompileCellTemplates(): void;
+        /**
+         * processes all RowBuilders for the gridRow
+         * @param {IGridRow} gridRow reference to gridRow
+         * @returns {IGridRow} the gridRow with all additional behavior added
+         */
+        processRowBuilders(gridRow: IGridRowOf<TEntity>): IGridRowOf<TEntity>;
+        /**
+         * calls the row processors, specifically
+         * intended to reset the sorting when an edit is called,
+         * registered as a dataChangeCallback on uiGridConstants.dataChange.EDIT
+         * @param {string} name column name
+         */
+        processRowsCallback(name: string): void;
+        /**
+         * queues a grid refresh, a way of debouncing all the refreshes we might otherwise issue
+         */
+        queueGridRefresh(): void;
+        /**
+         * queues a grid refreshCanvas, a way of debouncing all the refreshes we might otherwise issue
+         */
+        queueRefresh(): void;
+        /**
+         * Redraw the rows and columns based on our current scroll position
+         * @param {boolean} [rowsAdded] Optional to indicate rows are added and the scroll percentage must be
+         *        recalculated
+         */
+        redrawCanvas(rowsAdded?: boolean): void;
+        /**
+         * Refresh the rendered grid on screen.
+         * The refresh method re-runs both the columnProcessors and the
+         * rowProcessors, as well as calling refreshCanvas to update all
+         * the grid sizing.  In general you should prefer to use queueGridRefresh
+         * instead, which is basically a debounced version of refresh.
+         *
+         * If you only want to resize the grid, not regenerate all the rows
+         * and columns, you should consider directly calling refreshCanvas instead.
+         * @param {boolean} rowsAltered Optional flag for refreshing when the number of rows has changed
+         */
+        refresh(rowsAltered?: boolean): void;
+        /**
+         * Builds all styles and recalculates much of the grid sizing
+         * @param {boolean} buildStyles optional parameter.  Use TBD
+         * @returns {ng.IPromise<any>} promise that is resolved when the canvas
+         *          has been refreshed
+         */
+        refreshCanvas(buildStyles?: boolean): ng.IPromise<any>;
+        /**
+         * Refresh the rendered rows on screen?  Note: not functional at present
+         * @returns {ng.IPromise<any>} promise that is resolved when render completes?
+         */
+        refreshRows(): ng.IPromise<any>;
+        /**
+         * When the build creates columns from column definitions, the columnbuilders will be called to add
+         * additional properties to the column.
+         * @param {IColumnBuilder} columnBuilder function to be called
+         */
+        registerColumnBuilder(columnBuilder: IColumnBuilder<TEntity>): void;
+        /**
+         * Register a "columns processor" function. When the columns are updated,
+         * the grid calls each registered "columns processor", which has a chance
+         * to alter the set of columns, as long as the count is not modified.
+         * @param {IColumnProcessor} columnProcessor column processor function, which
+         *        is run in the context of the grid (i.e. this for the function will be the grid), and
+         *        which must return an updated renderedColumnsToProcess which can be passed to the next processor
+         *        in the chain
+         * @param {number} priority the priority of this processor.  In general we try to do them in 100s to leave room
+         * for other people to inject columns processors at intermediate priorities.
+         * Lower priority columnsProcessors run earlier.priority
+         */
+        registerColumnsProcessor(columnProcessor: IColumnProcessor<TEntity>, priority: number): void;
+        /**
+         * When a data change occurs, the data change callbacks of the specified type
+         * will be called.  The rules are:
+         *
+         * - when the data watch fires, that is considered a ROW change (the data watch only notices
+         *   added or removed rows)
+         * - when the api is called to inform us of a change, the declared type of that change is used
+         * - when a cell edit completes, the EDIT callbacks are triggered
+         * - when the columnDef watch fires, the COLUMN callbacks are triggered
+         * - when the options watch fires, the OPTIONS callbacks are triggered
+         *
+         * For a given event:
+         * - ALL calls ROW, EDIT, COLUMN, OPTIONS and ALL callbacks
+         * - ROW calls ROW and ALL callbacks
+         * - EDIT calls EDIT and ALL callbacks
+         * - COLUMN calls COLUMN and ALL callbacks
+         * - OPTIONS calls OPTIONS and ALL callbacks
+         *
+         * @param {(grid: IGridInstance) => void} callback function to be called
+         * @param {Array<string>} types the types of data change you want to be informed of.  Values from
+         * the uiGridConstants.dataChange values ( ALL, EDIT, ROW, COLUMN, OPTIONS ).  Optional and defaults to
+         * ALL
+         * @returns {Function} deregister function - a function that can be called to deregister this callback
+         */
+        registerDataChangeCallback(callback: (grid: IGridInstanceOf<TEntity>) => void, types?: Array<string>): Function;
+        /**
+         * When the build creates rows from gridOptions.data, the rowBuilders will be called to add
+         * additional properties to the row.
+         * @param {IRowBuilder} rowBuilder Function to be called
+         */
+        registerRowBuilder(rowBuilder: IRowBuilder<TEntity>): void;
+        /**
+         * Register a "rows processor" function. When the rows are updated,
+         * the grid calls each registered "rows processor", which has a chance
+         * to alter the set of rows (sorting, etc) as long as the count is not
+         * modified.
+         *
+         * @param {IRowProcessor} rowProcessor rows processor function, which
+         * is run in the context of the grid (i.e. this for the function will be the grid), and must
+         * return the updated rows list, which is passed to the next processor in the chain
+         * @param {number} priority the priority of this processor.
+         *        In general we try to do them in 100s to leave room for other people to inject rows processors at
+         *        intermediate priorities.  Lower priority rowsProcessors run earlier. At present all rows visible
+         *        is running at 50, filter is running at 100, sort is at 200, grouping at 400, selectable rows at
+         *        500, pagination at 900 (pagination will generally want to be last)
+         */
+        registerRowsProcessor(rowProcessor: IRowProcessor<TEntity>, priority: number): void;
+        /**
+         * registered a styleComputation function
+         *
+         * If the function returns a value it will be appended into the grid's `<style>` block
+         * @param {IStyleComputation} styleComputation function
+         */
+        registerStyleComputation(styleComputation: ($scope: ng.IScope) => string): void;
+        /**
+         * Remove a registered rows processor
+         * @param {IRowProcessor} rows processor function
+         */
+        removeRowsProcessor(rows: IRowProcessor<TEntity>): void;
+        /**
+         * Return the columns that the grid is currently being sorted by
+         * @param {IGridColumn} [excludedColumn] Optional GridColumn to exclude from having its sorting reset
+         */
+        resetColumnSorting(excludedColumn: IGridColumnOf<TEntity>): void;
+        /**
+         * Scroll the grid such that the specified
+         * row and column is in view
+         * @param {TEntity} rowEntity gridOptions.data[] array element to make visible
+         * @param {IColumnDef} colDef to make visible
+         * @returns {ng.IPromise<any>} a promise that is resolved after any scrolling is finished
+         */
+        scrollTo(rowEntity?: TEntity, colDef?: IColumnDefOf<TEntity>): ng.IPromise<any>;
+        /**
+         * Scrolls the grid to make a certain row and column combo visible,
+         * in the case that it is not completely visible on the screen already.
+         * @param {IGridRow} gridRow row to make visible
+         * @param {IGridColumn} gridCol column to make visible
+         * @returns {ng.IPromise<any>} a promise that is resolved when scrolling is complete
+         */
+        scrollToIfNecessary(gridRow: IGridRowOf<TEntity>, gridCol: IGridColumnOf<TEntity>): ng.IPromise<any>;
+        /**
+         * Set the sorting on a given column, optionally resetting any existing sorting on the Grid.
+         * Emits the sortChanged event whenever the sort criteria are changed.
+         * @param {IGridColumn} column Column to set the sorting on
+         * @param {uiGridConstants.ASC|uiGridConstants.DESC} [direction] Direction to sort by,
+         *        either descending or ascending.  If not provided, the column will iterate through the sort
+         *        directions: ascending, descending, unsorted.
+         * @param {boolean} [add] Add this column to the sorting. If not provided or set to `false`, the Grid will
+         *        reset any existing sorting and sort by this column only
+         * @returns {ng.IPromise<IGridColumn>} A resolved promise that supplies the column.
+         */
+        sortColumn(column: IGridColumnOf<TEntity>, direction?: string, add?: boolean)
+            : ng.IPromise<IGridColumnOf<TEntity>>;
+        /**
+         * flags all render containers to update their canvas height
+         */
+        updateCanvasHeight(): void;
+        /**
+         * recalculates the footer height,
+         * registered as a dataChangeCallback on uiGridConstants.dataChange.OPTIONS
+         * @param {string} name column name
+         */
+        updateFooterHeightCallback(name: string): void;
+        /**
+         * reference to the application scope (the parent scope of the ui-grid element). Assigned in ui-grid controller
+         * use gridOptions.appScopeProvider to override the default assignment of $scope.$parent with any reference
+         */
+        appScope?: ng.IScope;
+        /**
+        * returns an array of columns in the grid
+        */
+        columns: Array<IGridColumn>;
+        /**
+         * returns the total column footer height
+         */
+        columnFooterHeight?: number;
+        /**
+         * returns the total footer height gridFooter + columnFooter
+         */
+        footerHeight?: number;
+        /**
+         * returns or sets grid height in pixels
+         */
+        gridHeight?: number;
+        /**
+         * set to true when Grid is scrolling horizontally. Set to false via debounced method
+         */
+        isScrollingHorizontally?: boolean;
+        /**
+         * set to true when Grid is scrolling vertically. Set to false via debounced method
+         */
+        isScrollingVertically?: boolean;
+        /**
+         * set one of the uiGridConstants.scrollDirection values (UP, DOWN, LEFT, RIGHT, NONE),
+         * which tells us which direction we are scrolling. Set to NONE via debounced method
+         */
+        scrollDirection?: number;
+    }
+    export interface IBuildColumnsOptions {
+        orderByColumnDefs?: boolean;
+    }
+    export interface IStyleComputation {
+        ($scope: ng.IScope): string;
+    }
+    export interface IColumnBuilder<TEntity> {
+        (colDef: IColumnDefOf<TEntity>, col: IGridColumnOf<TEntity>, gridOptions: IGridOptionsOf<TEntity>): void;
+    }
+    export interface IRowBuilder<TEntity> {
+        (row: IGridRowOf<TEntity>, gridOptions: IGridOptionsOf<TEntity>): void;
+    }
+    export interface IRowProcessor<TEntity> {
+        (renderedRowsToProcess: Array<IGridRowOf<TEntity>>, columns: Array<IGridColumnOf<TEntity>>)
+            : Array<IGridRowOf<TEntity>>;
+    }
+    export interface IColumnProcessor<TEntity> {
+        (renderedColumnsToProcess: Array<IGridColumnOf<TEntity>>, rows: Array<IGridRowOf<TEntity>>)
+            : Array<IGridColumnOf<TEntity>>;
+    }
+    export type IGridOptions = IGridOptionsOf<any>;
+    export interface IGridOptionsOf<TEntity> extends cellNav.IGridOptions, edit.IGridOptions, expandable.IGridOptions,
+        exporter.IGridOptions<TEntity>, grouping.IGridOptions, importer.IGridOptions<TEntity>,
+        infiniteScroll.IGridOptions, moveColumns.IGridOptions, pagination.IGridOptions, pinning.IGridOptions,
+        resizeColumns.IGridOptions, rowEdit.IGridOptions, saveState.IGridOptions, selection.IGridOptions,
+        treeBase.IGridOptions<TEntity>, treeView.IGridOptions {
+        /**
+         * Default time in milliseconds to throttle aggregation calcuations, defaults to 500ms
+         */
+        aggregationCalcThrottle?: number;
+        /**
+         * by default, the parent scope of the ui-grid element will be assigned to grid.appScope
+         * this property allows you to assign any reference you want to grid.appScope
+         */
+        appScopeProvider?: ng.IScope | Object;
+        /**
+         * Array of columnDef objects.  Only required property is name.
+         */
+        columnDefs?: Array<IColumnDefOf<TEntity>>;
+        /**
+         * The height of the footer rows (column footer and grid footer) in pixels
+         */
+        columnFooterHeight?: number;
+        /**
+         * Turn virtualization on when number of columns goes over this number, defaults to 10
+         * @default 10
+         */
+        columnVirtualizationThreshold?: number;
+        /**
+         * (mandatory) Array of data to be rendered into the grid, providing the data source or data binding for
+         * the grid.
+         *
+         * Most commonly the data is an array of objects, where each object has a number of attributes.
+         * Each attribute automatically becomes a column in your grid.  This array could, for example, be sourced from
+         * an angularJS $resource query request.  The array can also contain complex objects, refer the binding tutorial
+         * for examples of that.
+         *
+         * The most flexible usage is to set your data on $scope:
+         *
+         * `$scope.data = data;`
+         *
+         * And then direct the grid to resolve whatever is in $scope.data:
+         *
+         * `$scope.gridOptions.data = 'data';`
+         *
+         * This is the most flexible approach as it allows you to replace $scope.data whenever you feel like it without
+         * getting pointer issues.
+         *
+         * Alternatively you can directly set the data array:
+         *
+         * `$scope.gridOptions.data = [ ];`
+         * or
+         *
+         * `$http.get('/data/100.json')
+         * .success(function(data) {
+         *   $scope.myData = data;
+         *   $scope.gridOptions.data = $scope.myData;
+         *  });`
+         *
+         * Where you do this, you need to take care in updating the data - you can't just update `$scope.myData` to some
+         * other array, you need to update $scope.gridOptions.data to point to that new array as well.
+         */
+        data?: Array<TEntity> | string;
+        /**
+         * True by default. When enabled, this setting displays a column
+         * menu within each column.
+         * @default true
+         */
+        enableColumnMenus?: boolean;
+        /**
+         * False by default. When enabled, this setting adds filter
+         * boxes to each column header, allowing filtering within the column for the entire grid.
+         * Filtering can then be disabled on individual columns using the columnDefs.
+         * @default false
+         */
+        enableFiltering?: boolean;
+        /**
+        * False by default. When enabled, this adds a settings icon in the top right of the grid,
+        * which floats above the column header. The menu by default gives access to show/hide columns,
+        * but can be customized to show additional actions.
+        * @default false
+        */
+        enableGridMenu?: boolean;
+        /**
+         * uiGridConstants.scrollbars.ALWAYS by default. This settings controls the horizontal scrollbar for the grid.
+         * Supported values: uiGridConstants.scrollbars.ALWAYS, uiGridConstants.scrollbars.NEVER
+         * @default 1
+         */
+        enableHorizontalScrollbar?: boolean | number;
+        /**
+         * True by default. When enabled, a newly initialized grid will check to see if it is tall enough to display
+         * at least one row of data.  If the grid is not tall enough, it will resize the DOM element to display
+         * minRowsToShow number of rows.
+         * @default true
+         */
+        enableMinHeightCheck?: boolean;
+        /**
+         * True by default. When enabled, this setting allows uiGrid to add
+         * `$$hashKey`-type properties (similar to Angular) to elements in the `data` array. This allows
+         * the grid to maintain state while vastly speeding up the process of altering `data` by
+         * adding/moving/removing rows.
+         *
+         * Note that this DOES add properties to your data that you may not want, but they are stripped out when
+         * using `angular.toJson()`. IF you do not want this at all you can disable this setting but you will take a
+         * performance hit if you are using large numbers of rows
+         * and are altering the data set often.
+         * @default true
+         */
+        enableRowHashing?: boolean;
+        /**
+         * True by default. When enabled, this setting adds sort
+         * widgets to the column headers, allowing sorting of the data for the entire grid.
+         * Sorting can then be disabled on individual columns using the columnDefs.
+         * @default true
+         */
+        enableSorting?: boolean;
+        /**
+         * uiGridConstants.scrollbars.ALWAYS by default. This settings controls the vertical scrollbar for the grid.
+         * Supported values: uiGridConstants.scrollbars.ALWAYS, uiGridConstants.scrollbars.NEVER
+         * @default 1
+         */
+        enableVerticalScrollbar?: boolean | number;
+        /**
+         * Extra columns to to render outside of the viewport, which helps with smoothness of scrolling.
+         * Defaults to 4
+         * @default 4
+         */
+        excessColumns?: number;
+        /**
+         * Extra rows to to render outside of the viewport, which helps with smoothness of scrolling.
+         * Defaults to 4
+         * @default 4
+         */
+        excessRows?: number;
+        /**
+         * Array of property names in data to ignore when auto-generating column names.  Provides the
+         * inverse of columnDefs - columnDefs is a list of columns to include, excludeProperties is a list of columns
+         * to exclude.
+         *
+         * If columnDefs is defined, this will be ignored.
+         *
+         * Defaults to ['$$hashKey']
+         */
+        excludeProperties?: Array<string>;
+        /**
+         * Set to true if your columns are all related directly to fields in a flat object structure - i.e.
+         * each of your columns associate directly with a propery one each of the entities in your data array.
+         *
+         * In that situation we can avoid all the logic associated with complex binding to functions or to properties
+         * of sub-objects, which can provide a significant speed improvement with large data sets, with filtering and
+         * with sorting.
+         *
+         * By default false
+         * @default false
+         */
+        flatEntityAccess?: boolean;
+        /**
+         * (optional) ui-grid/ui-grid-footer by default.  This footer shows the per-column
+         * aggregation totals.
+         * When provided, this setting uses a custom footer template. Can be set to either the name of a template
+         * file 'footer_template.html', inline html
+         * <pre>'<div class="ui-grid-bottom-panel" style="text-align: center">I am a Custom Grid Footer</div>'</pre>,
+         * or the id of a precompiled template (TBD how to use this).  Refer to the custom footer tutorial for more
+         * information.
+         * @default 'ui-grid/ui-grid-footer'
+         */
+        footerTemplate?: string;
+        /**
+         * (optional) ui-grid/ui-grid-grid-footer by default. This template by default shows the
+         * total items at the bottom of the grid, and the selected items if selection is enabled.
+         * @default 'ui-grid/ui-grid-grid-footer'
+         */
+        gridFooterTemplate?: string
+        /**
+         * Null by default. When provided, this setting uses a custom header
+         * template, rather than the default template. Can be set to either the name of a template file:
+         * <pre>  $scope.gridOptions.headerTemplate = 'header_template.html';</pre>
+         * inline html
+         * <pre>  $scope.gridOptions.headerTemplate = '<div class="ui-grid-top-panel" style="text-align: center">
+         *     I am a Custom Grid Header</div>'</pre>
+         * or the id of a precompiled template (TBD how to use this).
+         * </br>Refer to the custom header tutorial for more information.
+         * If you want no header at all, you can set to an empty div:
+         * <pre>  $scope.gridOptions.headerTemplate = '<div></div>';</pre>
+         *
+         * If you want to only have a static header, then you can set to static content.  If
+         * you want to tailor the existing column headers, then you should look at the
+         * current 'ui-grid-header.html' template in github as your starting point.
+         * @default null
+         */
+        headerTemplate?: string;
+        /**
+         * Defaults to 4
+         * @default 4
+         */
+        horizontalScrollThreshold?: number;
+        /**
+         * Number of rows from the end of the dataset
+         * at which infinite scroll will trigger a request
+         * for more data
+         * @default 20
+         */
+        infiniteScrollRowsFromEnd?: number;
+        /**
+         * Inform the grid of whether there are rows
+         * to load when scrolling up
+         * @default false
+         */
+        infiniteScrollUp?: boolean;
+        /**
+         * Inform the grid of whether there are rows
+         * to load scrolling down
+         * @default true
+         */
+        infiniteScrollDown?: boolean;
+        /**
+         * Defaults to 200
+         * @default 200
+         */
+        maxVisibleColumnCount?: number;
+        /**
+         * Minimum number of rows to show when the grid doesn't have a defined height. Defaults to "10".
+         * @default 10
+         */
+        minRowsToShow?: number;
+        /**
+         * Columns can't be smaller than this, defaults to 10 pixels
+         * @default 10
+         */
+        minimumColumnSize?: number;
+        /**
+         * A callback that returns the gridApi once the grid is instantiated, which is
+         * then used to interact with the grid programatically.
+         *
+         * Note that the gridApi.core.renderingComplete event is identical to this
+         * callback, but has the advantage that it can be called from multiple places
+         * if needed
+         * @param {IGridApi} gridApi
+         */
+        onRegisterApi?: (gridApi: IGridApiOf<TEntity>) => void;
+        /**
+         * The height of the row in pixels, defaults to 30
+         * @default 30
+         */
+        rowHeight?: number;
+        /**
+         * 'ui-grid/ui-grid-row' by default. When provided, this setting uses a
+         * custom row template.  Can be set to either the name of a template file:
+         * <pre> $scope.gridOptions.rowTemplate = 'row_template.html';</pre>
+         * inline html
+         * <pre>  $scope.gridOptions.rowTemplate =
+         * '<div style="background-color: aquamarine"
+         *       ng-click="grid.appScope.fnOne(row)"
+         *       ng-repeat="col in colContainer.renderedColumns track by col.colDef.name"
+         *       class="ui-grid-cell" ui-grid-cell></div>';</pre>
+         * or the id of a precompiled template (TBD how to use this) can be provided.
+         * </br>Refer to the custom row template tutorial for more information.
+         * @default 'ui-grid/ui-grid-row'
+         */
+        rowTemplate?: string;
+        /**
+         * Default time in milliseconds to debounce scroll events, defaults to 300ms
+         * @default 300
+         */
+        scrollDebounce?: number;
+        /**
+         * Defaults to 4
+         * @default 4
+         */
+        scrollThreshold?: number;
+        /**
+         * Whether or not to show the column footer, defaults to false
+         * The column footer displays column aggregates
+         * @default false
+         */
+        showColumnFooter?: boolean;
+        /**
+         * Whether or not to show the footer, defaults to false
+         * The footer display Total Rows and Visible Rows (filtered rows)
+         * @default false
+         */
+        showGridFooter?: boolean;
+        /**
+         * True by default. When set to false, this setting will replace the
+         * standard header template with '<div></div>', resulting in no header being shown.
+         * @default true
+         */
+        showHeader?: boolean;
+        /**
+         * Turn virtualization on when number of data elements goes over this number, defaults to 20
+         * @default 20
+         */
+        virtualizationThreshold?: number;
+        /**
+         * Disables client side filtering. When true, handle the filterChanged event and set data,
+         * defaults to false
+         * @default false
+         */
+        useExternalFiltering?: boolean;
+        /**
+         * Default time in milliseconds to throttle scroll events to, defaults to 70ms
+         * @default 70
+         */
+        wheelScrollThrottle?: number;
+        /**
+         * This function returns the identity value uniquely identifying this row,
+         * if one is not present it does not set it.
+         *
+         * By default it returns the `$$hashKey` property but can be overridden to use any property
+         * or set of properties you want.
+         * @param {IGridRow} row The row for which you want the unique id
+         * @returns {string} row uid
+         */
+        getRowIdentity?(row: IGridRowOf<TEntity>): any;
+        /**
+         * By default, rows are compared using object equality.  This option can be overridden
+         * to compare on any data item property or function
+         * @param {TEntity} entityA First Data Item to compare
+         * @param {TEntity} entityB Second Data Item to compare
+         */
+        rowEquality?(entityA: TEntity, entityB: TEntity): boolean;
+        /**
+         * This function is used to get and, if necessary, set the value uniquely identifying this row
+         * (i.e. if an identity is not present it will set one).
+         *
+         * By default it returns the `$$hashKey` property if it exists. If it doesn't it uses gridUtil.nextUid()
+         * to generate one
+         */
+        rowIdentity?(row: IGridRowOf<TEntity>): any;
+    }
+    export interface IGridCoreApi<TEntity> {
+        // Methods
+        /**
+         * adds a row header column to the grid
+         * @param {IColumnDef} column Column Definition
+         */
+        addRowHeaderColumn(column: IColumnDefOf<TEntity>): void;
+        /**
+         * add items to the grid menu.  Used by features
+         * to add their menu items if they are enabled, can also be used by
+         * end users to add menu items.  This method has the advantage of allowing
+         * remove again, which can simplify management of which items are included
+         * in the menu when.  (Noting that in most cases the shown and active functions
+         * provide a better way to handle visibility of menu items)
+         * @param {IGridInstance} grid the grid on which we are acting
+         * @param {Array<IMenuItem>} items menu items in the format as described in the tutorial, with
+         * the added note that if you want to use remove you must also specify an `id` field,
+         * which is provided when you want to remove an item.  The id should be unique.
+
+         */
+        addToGridMenu(grid: IGridInstanceOf<TEntity>, items: Array<IMenuItem>):  void;
+        /**
+         * Clears all filters and optionally refreshes the visible rows.
+         * @param {boolean} [refreshRows=true] Defaults to true.
+         * @param {boolean} [clearConditions=false] Defaults to false.
+         * @param {boolean} [clearFlags=false] Defaults to false.
+         * @returns {ng.IPromise<any>} If `refreshRows` is true, returns a promise of the rows refreshing.
+         */
+        clearAllFilters(refreshRows?: boolean, clearConditions?: boolean,
+            clearFlags?: boolean): ng.IPromise<Array<IGridRowOf<TEntity>>>;
+        /**
+         * Clears any override on visibility for the row so that it returns to
+         * using normal filtering and other visibility calculations.
+         * If the row is currently invisible then sets it to visible and calls
+         * both grid refresh and emits the rowsVisibleChanged event
+         * TODO: if a filter is active then we can't just set it to visible?
+         * @param {TEntity} rowEntity gridOptions.data[] array instance
+         */
+        clearRowInvisible(rowEntity: TEntity): void;
+        /**
+         * Returns all visible rows
+         * @param {IGridInstance} grid the grid you want to get visible rows from
+         * @returns {Array<IGridRow>} an array of gridRow
+         */
+        getVisibleRows(grid: IGridInstanceOf<TEntity>): Array<IGridRowOf<TEntity>>;
+        /**
+         * Trigger a grid resize, normally this would be picked
+         * up by a watch on window size, but in some circumstances it is necessary
+         * to call this manually
+         * @returns {ng.IPromise<any>} promise that is resolved when render completes?
+         */
+        handleWindowResize(): void;
+        /**
+         * Notify the grid that a data or config change has occurred,
+         * where that change isn't something the grid was otherwise noticing.  This
+         * might be particularly relevant where you've changed values within the data
+         * and you'd like cell classes to be re-evaluated, or changed config within
+         * the columnDef and you'd like headerCellClasses to be re-evaluated.
+         * @param {string} type one of the
+         *        uiGridConstants.dataChange values (ALL, ROW, EDIT, COLUMN), which tells
+         *        us which refreshes to fire.
+         */
+        notifyDataChange(type: string): void;
+        /**
+         * Refresh the rendered rows on screen?  Note: not functional at present
+         * @returns {ng.IPromise<any>} promise that is resolved when render completes?
+         */
+        refreshRows(): ng.IPromise<boolean>;
+        /**
+         * Register a "columns processor" function. When the columns are updated,
+         * the grid calls each registered "columns processor", which has a chance
+         * to alter the set of columns as long as the count is not
+         * modified.
+         *
+         * @param {IColumnProcessor} processorFunction columns processor function, which
+         *        is run in the context of the grid (i.e. this for the function will be the grid), and must
+         *        return the updated columns list, which is passed to the next processor in the chain
+         * @param {number} priority the priority of this processor.  In general we try to do them in 100s to leave room
+         *        for other people to inject columns processors at intermediate priorities.  Lower priority
+         *        columnsProcessors run earlier.
+         *
+         * At present allRowsVisible is running at 50, filter is running at 100, sort is at 200, grouping at 400,
+         * selectable rows at 500, pagination at 900 (pagination will generally want to be last)
+         */
+        registerColumnsProcessor(processorFunction: IColumnProcessor<TEntity>, priority: number): void;
+        /**
+         * Register a "rows processor" function. When the rows are updated,
+         * the grid calls each registered "rows processor", which has a chance
+         * to alter the set of rows (sorting, etc) as long as the count is not
+         * modified.
+         *
+         * @param {IRowProcessor} rowProcessor rows processor function, which
+         *        is run in the context of the grid (i.e. this for the function will be the grid), and must
+         *        return the updated rows list, which is passed to the next processor in the chain
+         * @param {number} priority the priority of this processor.  In general we try to do them in 100s to leave room
+         *        for other people to inject rows processors at intermediate priorities.  Lower priority rowsProcessors
+         *        run earlier.
+         *
+         * At present all rows visible is running at 50, filter is running at 100, sort is at 200, grouping at 400,
+         * selectable rows at 500, pagination at 900 (pagination will generally want to be last)
+         */
+        registerRowsProcessor(rowProcessor: IRowProcessor<TEntity>, priority: number): void;
+        /**
+         * Scroll the grid such that the specified
+         * row and column is in view
+         * @param {TEntity} entity gridOptions.data[] array instance to make visible
+         * @param {IColumnDef} colDef to make visible
+         * @returns {ng.IPromise<any>} a promise that is resolved after any scrolling is finished
+         */
+        scrollTo(entity: TEntity, colDef: IColumnDefOf<TEntity>): void; /*A row entity can be anything?*/
+        /**
+         * Scrolls the grid to make a certain row and column combo visible,
+         * in the case that it is not completely visible on the screen already.
+         * @param {IGridRow} gridRow row to make visible
+         * @param {IGridColumn} gridCol column to make visible
+         * @returns {ng.IPromise<any>} a promise that is resolved when scrolling is complete
+         */
+        scrollToIfNecessary(gridRow: IGridRowOf<TEntity>, gridCol: IGridColumnOf<TEntity>): void;
+        /**
+         * A null handling method that can be used when building custom sort
+         * functions
+         * @param {any} a Sort value a
+         * @param {any} b Sort value b
+         * @returns {number} null if there were no nulls/undefineds, otherwise returns
+         * a sort value that should be passed back from the sort function
+         */
+        sortHandleNulls(a: any, b: any): number;
+        /**
+         * queues a grid refresh, a way of debouncing all the refreshes we might otherwise issue
+         */
+        queueGridRefresh(): void;
+        /**
+         * queues a grid refreshCanvas, a way of debouncing all the refreshes we might otherwise issue
+         */
+        queueRefresh(): void;
+
+        // Events
+        on: {
+            /**
+             * is raised when the canvas height has changed
+             * @param {ng.IScope} scope Grid scope
+             * @param {canvasHeightChangedHandler} handler Callback
+             */
+            canvasHeightChanged: (scope: ng.IScope, handler: canvasHeightChangedHandler) => void;
+            /**
+             * The visibility of a column has changed, the column itself is passed out as a parameter of the event
+             * @param {ng.IScope} scope The scope of the controller. This is used to deregister this event when the
+             *        scope is destroyed
+             * @param {columnVisibilityChangedHandler} callBack Will be called when the event is emited.
+             *        The function passes back the GridCol that has changed
+             */
+            columnVisibilityChanged: (scope: ng.IScope, callBack: columnVisibilityChangedHandler<TEntity>) => void;
+            /**
+             * is raised after the filter is changed.
+             * The nature of the watch expression doesn't allow notification of what changed,
+             * so the receiver of this event will need to re-extract the filter conditions from the columns.
+             * @param {ng.IScope} scope Grid scope
+             * @param {filterChangedHandler} handler Callback
+             */
+            filterChanged: (scope: ng.IScope, handler: filterChangedHandler<TEntity>) => void;
+            /**
+             * is raised after the cache of visible rows is changed
+             * @param {ng.IScope} scope Grid scope
+             * @param {rowsRenderedHandler} handler callback
+             */
+            rowsRendered: (scope: ng.IScope, handler: rowsRenderedHandler<TEntity>) => void;
+            /**
+             * is raised after the rows that are visible change.
+             * The filtering is zero-based, so it isn't possible to say which rows changed
+             * (unlike in the selection feature). We can plausibly know which row was changed when setRowInvisible is
+             * called, but in that situation the user already knows which row they changed.
+             * When a filter runs we don't know what changed, and that is the one that would have been useful.
+             * @param {ng.IScope} scope Grid scope
+             * @param {rowsVisibleChangedHandler} handler callback
+             */
+            rowsVisibleChanged: (scope: ng.IScope, handler: rowsVisibleChangedHandler<TEntity>) => void;
+            /**
+             * is raised when scroll begins. Is throttled, so won't be raised too frequently
+             * @param {ng.IScope} scope Grid scope
+             * @param {scrollBeginHandler} handler callback
+             */
+            scrollBegin: (scope: ng.IScope, handler: scrollBeginHandler) => void;
+            /**
+             * is raised when scroll has finished. Is throttled, so won't be raised too frequently
+             * @param {ng.IScope} scope Grid scope
+             * @param {scrollEndHandler} handler callback
+             */
+            scrollEnd: (scope: ng.IScope, handler: scrollEndHandler) => void;
+            /**
+             * is raised after the sort criteria on one or more columns have changed
+             * @param {ng.IScope} scope Grid scope
+             * @param {sortChangedHandler} handler callback
+             */
+            sortChanged: (scope: ng.IScope, handler: sortChangedHandler<TEntity>) => void;
+        };
+    }
+    export interface columnVisibilityChangedHandler<TEntity> {
+        /**
+         * Column visibility changed event handler
+         * @param {IGridColumn} column Ui Grid column
+         */
+        (column: IGridColumnOf<TEntity>): void;
+    }
+    export interface canvasHeightChangedHandler {
+        /**
+         * Canvas height changed callback
+         * @param {number} oldHeight old Height
+         * @param {number} newHeight new Height
+         */
+        (oldHeight: number, newHeight: number): void;
+    }
+
+    export interface filterChangedHandler<TEntity> {
+        /**
+         * Filter changed event callback
+         * @param {IGridApi} gridApi grid api
+         */
+        (gridApi: IGridApiOf<TEntity>): void;
+    }
+
+    export interface rowsRenderedHandler<TEntity> {
+        /**
+         * Rows rendered event callback
+         * @param {IGridApi} gridApi Grid api object
+         */
+        (gridApi: IGridApiOf<TEntity>): void;
+    }
+
+    export interface rowsVisibleChangedHandler<TEntity> {
+        /**
+         * Rows visible changed event callback
+         * @param {IGridApi} gridApi grid api object
+         */
+        (gridApi: IGridApiOf<TEntity>): void;
+    }
+
+    export interface scrollBeginHandler {
+        /**
+         * Scroll begin event callback
+         * @param {JQueryMouseEventObject} scrollEvent Mouse scroll event
+         */
+        (scrollEvent: JQueryMouseEventObject): void;
+    }
+
+    export interface scrollEndHandler {
+        /**
+         * Scroll end event callback
+         * @param {JQueryMouseEventObject} scrollEvent Mouse scroll event
+         */
+        (scrollEvent: JQueryMouseEventObject): void;
+    }
+
+    export interface sortChangedHandler<TEntity> {
+        /**
+         * Sort change event callback
+         * @param {IGridInstance} grid instance
+         * @param {IGridColumn} array of gridColumns that have sorting on them, sorted in priority order
+         */
+        (grid: IGridInstanceOf<TEntity>, columns: Array<IGridColumnOf<TEntity>>): void;
+    }
+
+    export module cellNav {
+        /**
+         * Column Definitions for cellNav feature, these are available to be set using the ui-grid
+         * gridOptions.columnDefs
+         */
+        export interface IColumnDef {
+            /**
+             * Enable focus on a cell within this column.
+             * Defaults to true
+             * @default true
+             */
+            allowCellFocus?: boolean;
+        }
+
+        /**
+         * GridOptions for cellNav feature, these are available to be set using the ui-grid gridOptions
+         */
+        export interface IGridOptions {
+            /**
+             * Enable multiple cell selection only when using the ctrlKey or shiftKey.
+             * Defaults to false
+             * @default false
+             */
+            modifierKeysToMultiSelectCells?: boolean;
+        }
+
+        /**
+         * Cell Nav related grid row
+         */
+        export interface IGridRow {
+            /**
+             * Enable focus on a cell within this row. If set to false then no cells in this row can be focused
+             * Group header rows, for example, would set this to false.
+             * Defaults to true
+             */
+            allowCellFocus?: boolean;
+        }
+
+        export interface ICellNavApi<TEntity> {
+            // Methods
+            /**
+             * Gets the currently selected rows and columns.  array is empty if no selection has occurred
+             * @returns {Array<IRowCol>} an array containing the current selection
+             */
+            getCurrentSelection(): Array<IRowCol<TEntity>>;
+            /**
+             * Gets the current focused cell.  value is null if no selection has occurred
+             * @returns {IRowCol} the current (or last if Grid does not have focus) focused row and column
+             */
+            getFocusedCell(): IRowCol<TEntity>;
+            /**
+             * Gets the index of the passed rowCol.  Returns -1 if the RowCol isn't selected
+             * @param rowCol
+             * @returns the index in the order in which the RowCol was selected
+             */
+            rowColSelectIndex(rowCol: IRowCol<TEntity>): number;
+            /**
+             * Brings the specified row and column into view, and sets focus to that cell
+             * @param {TEntity} rowEntity gridOptions.data[] array instance to make visible and set focus
+             * @param {IColumnDef} colDef Column definition to make visible and set focus
+             */
+            scrollToFocus(rowEntity: TEntity, colDef: IColumnDef): ng.IPromise<any>;
+
+            // Events
+            on: {
+                /**
+                 * raised when the active cell is changed
+                 * @param {ng.IScope} scope The grid scope
+                 * @param {navigateHandler} handler Callback
+                 */
+                navigate: (scope: ng.IScope, handler: navigateHandler<TEntity>) => void;
+                /**
+                 * viewportKeyDown is raised when the viewPort receives a keyDown event.
+                 * Cells never get focus in uiGrid due to the difficulties of setting focus on a cell that is
+                 * not visible in the viewport. Use this event whenever you need a keydown event on a cell.
+                 * @param {ng.IScope} scope The grid scope
+                 * @param {viewportKeyDownHandler} handler Callback
+                 */
+                viewportKeyDown: (scope: ng.IScope, handler: viewportKeyDownHandler<TEntity>) => void;
+                /**
+                 * viewportKeyPress is raised when the viewPort receives a keyPress event.
+                 * Cells never get focus in uiGrid due to the difficulties of setting focus on a cell that is
+                 * not visible in the viewport. Use this event whenever you need a keypress event on a cell.
+                 * @param {ng.IScope} scope The grid scope
+                 * @param {viewportKeyPressHandler} handler Callback
+                 */
+                viewportKeyPress: (scope: ng.IScope, handler: viewportKeyPressHandler<TEntity>) => void;
+            };
+        }
+
+        export interface navigateHandler<TEntity> {
+            /**
+             * Callback for navigate event
+             * @param {IRowCol} newRowCol New position
+             * @param {IRowCol} oldRowCol Old position
+             */
+            (newRowCol: IRowCol<TEntity>, oldRowCol: IRowCol<TEntity>): void;
+        }
+
+        export interface viewportKeyDownHandler<TEntity> {
+            /**
+             * Callback for viewport key down event
+             * @param {JQueryKeyEventObject} event Keydown event
+             * @param {IRowCol} rowCol Current row Col position
+             */
+            (event: JQueryKeyEventObject, rowCol: IRowCol<TEntity>): void;
+        }
+
+        export interface viewportKeyPressHandler<TEntity> {
+            /**
+             * Callback for viewport key press event
+             * @param {JQueryKeyEventObject} event Keypress event
+             * @param {IRowCol} rowCol Current row Col position
+             */
+            (event: JQueryKeyEventObject, rowCol: IRowCol<TEntity>): void;
+        }
+
+        export interface IRowColConstructor<TEntity> {
+            new (row: uiGrid.IGridRowOf<TEntity>, col: IGridColumnOf<TEntity>): IRowCol<TEntity>;
+        }
+
+        /**
+         * A row and column pair that represents the intersection of these two entities
+         */
+        export interface IRowCol<TEntity> {
+            row: uiGrid.IGridRowOf<TEntity>;
+            col: IGridColumnOf<TEntity>;
+            /**
+             * Gets the intersection of where the row and column meet
+             * @returns The value from the grid data that this RowCol points to.  If the column has a cellFilter this
+             *          will NOT return the filtered value.
+             */
+            getIntersectionValueRaw(): String | Number | Object;
+            /**
+             * Gets the intersection of where the row and column meet.
+             * @returns The value from the grid data that this RowCol points to.  If the column has a cellFilter this
+             *          will also apply the filter to it and return the value that the filter displays
+             */
+            getIntersectionValueFiltered(): String | Number | Object;
+        }
+        /**
+         * constants available in cellNav
+         */
+        export interface IUiGridCellNavConstants {
+            FEATURE_NAME: string;
+            CELL_NAV_EVENT: string;
+            direction: {
+                LEFT: number;
+                RIGHT: number;
+                UP: number;
+                DOWN: number;
+                PG_UP: number;
+                PG_DOWN: number;
+            };
+            EVENT_TYPE: {
+                KEYDOWN: number;
+                CLICK: number;
+                CLEAR: number;
+            };
+        }
+    }
+
+    export module edit {
+        /**
+         * Edit related Column Definition
+         */
+        export interface IColumnDef<TEntity> {
+            /**
+             * If specified, either a value or function evaluated before editing cell.
+             * If falsy, then editing of cell is not allowed.
+             */
+            cellEditableCondition?: any | { ($scope: ng.IScope): boolean };
+            /** A filter that you would like to apply to the values in the options list of the dropdown */
+            editDropdownFilter?: string;
+            /** the label for the "id" field in the editDropdownOptionsArray. Defaults to 'id' */
+            editDropdownIdLabel?: string;
+            /** an array of values in the format [ {id: xxx, value: xxx} ], which is populated into the edit dropdown */
+            editDropdownOptionsArray?: Array<IEditDropdown>;
+            /**
+             * a path to a property on row.entity containing an array of values in the format `[{id: xxx, value:
+             * xxx}]`,
+             * which will be used to populate the edit dropdown.  This can be used when the dropdown values are
+             * dependent on the backing row entity.  If this property is set then editDropdownOptionsArray will be
+             * ignored.
+             */
+            editDropdownRowEntityOptionsArrayPath?: string;
+            /** the label of the 'value' field in the editDropdownOptionsArray.  Defaults to 'value' */
+            editDropdownValueLabel?: string;
+            /**
+             * A function that should be called when any files have been chosen by the user.
+             * You should use this to process the files appropriately for your application.
+             *
+             * It passes the gridCol, the gridRow (from which you can get gridRow.entity), and the files.
+             * The files are in the format as returned from the file chooser, an array of files,
+             * with each having useful information such as:
+             *
+             * * files[0].lastModifiedDate
+             * * files[0].name
+             * * files[0].size (appears to be in bytes)
+             * * files[0].type (MIME type)
+             *
+             * Typically you would do something with these files.
+             * Most commonly you would use the filename or read the file itself in. This example does both:
+             * @example
+             editFileChooserCallBack: (gridRow, gridCol, files) => {
+               // ignore all but the first file, it can only choose one anyway
+               // set the filename into this column
+               gridRow.entity.filename = file[0].name;
+
+               // read the file and set it into a hidden column, which we may do stuff with later
+               var setFile = function(fileContent){
+                   gridRow.entity.file = fileContent.currentTarget.result;
+               };
+               var reader = new FileReader();
+               reader.onload = setFile;
+               reader.readAsText( files[0] );
+           }
+             */
+            editFileChooserCallback?: (gridRow: uiGrid.IGridRowOf<TEntity>,
+                                       gridCol: IGridColumnOf<TEntity>,
+                                       files: FileList) => void;
+            /**
+             * A bindable string value that is used when binding to edit controls instead of colDef.field
+             * For example if you have a complex property on an object like:
+             * ```typescript
+             * state: {abbrev:'MS',name:'Mississippi'}.
+             * ```
+             * The grid should display `state.name` in the cell and sort/filter based on the state.name property, but
+             * the editor requires the full state object. so this let's you bind to that
+             * @example
+             colDef.field = 'state.name';
+             colDef.editModelField = 'state';
+             */
+            editModelField?: string;
+            /**
+             * Cell template to be used when editing this column. Can be Url or text template.
+             * Defaults to gridOptions.editableCellTemplate
+             */
+            editableCellTemplate?: string;
+            /** Enable editing on a column */
+            enableCellEdit?: boolean;
+            /** If true, then editor is invoked as soon as cell receives focus. Default false.
+             * _Requires both the cellNav feature and the edit feature to be enabled_
+             */
+            enableCellEditOnFocus?: boolean;
+        }
+
+        export interface IEditDropdown {
+            id: number | string;
+            value: any;
+        }
+
+        /**
+         * Options for configuring the edit feature, these are available to be set using the ui-grid gridOptions
+         */
+        export interface IGridOptions {
+            /**
+             * If specified, either a value or function to be used by all columns before editing.
+             * If falsy, then editing of cell is not allowed
+             */
+            cellEditableCondition?: any | { ($scope: ng.IScope): boolean };
+            /**
+             * If specified, cellTemplate to use as the editor for all columns.
+             * defaults to 'ui-grid/cellTextEditor'
+             * @default 'ui-grid/cellTextEditor'
+             */
+            editableCellTemplate?: string;
+            /**
+             * If defined, sets the default value for the editable flag on each individual colDefs if their individual
+             * enableCellEdit configuration is not defined.
+             * Defaults to undefined.
+             * @default undefined
+             */
+            enableCellEdit?: boolean;
+            /**
+             * If true, then editor is invoked as soon as cell receives focus.
+             * Default false.
+             * _requires cellNav feature and the edit feature to be enabled_
+             * @default false
+             */
+            enableCellEditOnFocus?: boolean;
+        }
+
+        /**
+         * GridRow options for edit feature, these are available to be set internally only, by other features
+         */
+        export interface IGridRow {
+            /** enable editing on row, grouping for example might disable editing on group header rows */
+            enableCellEdit?: boolean;
+        }
+
+        /**
+         * Public Api for edit feature
+         */
+        export interface IGridEditApi<TEntity> {
+            on: {
+                /**
+                 * raised when cell editing is complete
+                 * @param scope The grid scope
+                 * @param {afterCellEditHandler} handler Callback
+                 */
+                afterCellEdit: (scope: ng.IScope, handler: afterCellEditHandler<TEntity>) => void;
+                /**
+                 * raised when cell editing starts on a cell
+                 * @param scope The grid scope
+                 * @param {beginCellEditHandler} handler Callback
+                 */
+                beginCellEdit: (scope: ng.IScope, handler: beginCellEditHandler<TEntity>) => void;
+                /**
+                 * raised when cell editing is cancelled on a cell
+                 * @param scope The grid scope
+                 * @param {cancelCellEditHandler} handler Callback
+                 */
+                cancelCellEdit: (scope: ng.IScope, handler: cancelCellEditHandler<TEntity>) => void;
+            }
+        }
+        export interface afterCellEditHandler<TEntity> {
+            /**
+             * raised when cell editing is complete
+             * @param {TEntity} rowEntity the options.data element that was edited
+             * @param {IColumnDef} colDef The column that was edited
+             * @param {any} newValue New Value
+             * @param {any} oldValue Old Value
+             */
+            (rowEntity: TEntity, colDef: IColumnDef<TEntity>, newValue: any, oldValue: any): void;
+        }
+
+        /**
+         * raised when cell editing starts on a cell
+         * @param {TEntity} rowEntity the options.data element that was edited
+         * @param {IColumnDef} colDef The column that was edited
+         * @param {JQueryEventObject} triggerEvent the event that triggered the edit. Useful to prevent losing
+         *     keystrokes on some complex editors
+         */
+        export interface beginCellEditHandler<TEntity> {
+            (rowEntity: TEntity, colDef: IColumnDef<TEntity>, triggerEvent: JQueryEventObject): void;
+        }
+
+        /**
+         * raised when cell editing is cancelled on a cell
+         * @param {TEntity} rowEntity the options.data element that was edited
+         * @param {IColumnDef} colDef The column that was edited
+         */
+        export interface cancelCellEditHandler<TEntity> {
+            (rowEntity: TEntity, colDef: IColumnDef<TEntity>): void;
+        }
+
+        /**
+         * constants available in edit module
+         */
+        export interface IUiGridEditConstants {
+            EDITABLE_CELL_TEMPLATE: string;
+            EDITABLE_CELL_DIRECTIVE: string;
+            events: {
+                BEGIN_CELL_EDIT: string;
+                END_CELL_EDIT: string;
+                CANCEL_CELL_EDIT: string;
+            };
+        }
+    }
+
+    export module expandable {
+        /**
+         * Options for configuring the expandable feature, these are available to be set using the ui-grid gridOptions
+         */
+        export interface IGridOptions {
+            /**
+             * Width in pixels of the expandable column. Defaults to 40
+             */
+            expandableRowHeaderWidth?: number;
+            /**
+             * Whether or not to use expandable feature.  Allows you to turn off expandable on specific grids within
+             * your application, or in specific modes on this grid.
+             * Defaults to true.
+             */
+            enableExpandable?: boolean;
+            /**
+             * Show a rowHeader to provide the expandable buttons. If set to false then implies you're going to use a
+             * custom method for expanding and collapsing the subgrids.
+             * Defaults to true.
+             */
+            enableExpandableRowHeader?: boolean;
+            /**
+             * Height in pixels of the expanded subgrid.
+             * Defaults to 150
+             */
+            expandableRowHeight?: number;
+            /**
+             * reference to the parent grid scope (the parent scope of the sub-grid element)
+             */
+            expandableRowScope?: ng.IScope | Object;
+            /**
+             * Mandatory. The template for your expanded row
+             */
+            expandableRowTemplate?: string;
+        }
+
+        /**
+         * Public Api for expandable feature
+         */
+        export interface IGridExpandableApi<TEntity> {
+            // Methods
+            /**
+             * Collapse all subgrids.
+             */
+            collapseAllRows(): void;
+            /**
+             * expand all subgrids
+             */
+            expandAllRows(): void;
+            /**
+             * Toggle all subgrids
+             */
+            toggleAllRows(): void;
+            /**
+             * Toggle a specific row
+             * @param {TEntity} rowEntity The data entity for the row you want to expand
+             */
+            toggleRowExpansion(rowEntity: TEntity): void;
+
+            // Events
+            on: {
+                /**
+                 * raised when cell editing is complete
+                 * @param {ng.IScope} scope
+                 * @param {rowExpandedStateChangedHandler} handler
+                 */
+                rowExpandedStateChanged: (scope: ng.IScope, handler: rowExpandedStateChangedHandler<TEntity>) => void;
+            };
+        }
+
+        export interface rowExpandedStateChangedHandler<TEntity> {
+            /**
+             * Raised when cell editing is complete
+             * @param {IGridRow} row The row that was expanded
+             */
+            (row: IGridRowOf<TEntity>): void;
+        }
+
+        /**
+         * GridRow settings for expandable
+         */
+        export interface IGridRow {
+            /**
+             * If set to true, the row is expanded and the expanded view is visible
+             * Defaults to false
+             * @default false
+             */
+            isExpanded?: boolean;
+        }
+    }
+
+    export module exporter {
+        /**
+         * ColumnDef settings for exporter
+         */
+        export interface IColumnDef {
+            /**
+             * the alignment you'd like for this specific column when exported into a pdf.
+             * Can be 'left', 'right', 'center' or any other valid pdfMake alignment option.
+             */
+            exporterPdfAlign?: string;
+            /**
+             * Suppresses export for this column. Used by selection and expandable.
+             */
+            exporterSuppressExport?: boolean;
+        }
+
+        /**
+         * GridOptions for exporter feature, these are available to be set using the ui-grid gridOptions
+         */
+        export interface IGridOptions<TEntity> {
+            /**
+             * This promise is needed when exporting all rows, and the data need to be provided by server side.
+             * Default is null
+             * @default null
+             * @returns {ng.IPromise<Array<TEntity>>} A promise to load all data from server
+             */
+            exporterAllDataFn?: () => ng.IPromise<Array<TEntity>>;
+            /**
+             * @deprecated
+             * DEPRECATED - exporterAllDataFn used to be called this, but it wasn't a promise,
+             * it was a function that returned a promise. Deprecated, but supported for backward compatibility,
+             * use exporterAllDataFn instead.
+             * @returns {ng.IPromise<Array<TEntity>>} A promise to load all data from server
+             */
+            exporterAllDataPromise?: () => ng.IPromise<Array<TEntity>>;
+            /**
+             * The character to use as column separator link
+             * Defaults to ','
+             * @default ','
+             */
+            exporterCsvColumnSeparator?: string;
+            /**
+             * The default filename to use when saving the downloaded csv. This will only work in some browsers.
+             * Defaults to 'download.csv'
+             * @default 'download.csv'
+             */
+            exporterCsvFilename?: string;
+            /**
+             * A function to call for each field before exporting it.
+             * Allows massaging of raw data into a display format, for example if you have applied filters to convert
+             * codes into decodes, or you require a specific date format in the exported content.
+             * The method is called once for each field exported, and provides the grid,
+             * the gridCol, and the GridRow for you to use as context in massaging the data.
+             *
+             * @param {IGridInstance} grid The grid
+             * @param {IGridRow} row Current row
+             * @param {IGridColumn} col Current column
+             * @param {any} value The cell value
+             * @returns {any} Formatted value
+             */
+            exporterFieldCallback?: (grid: IGridInstanceOf<TEntity>,
+                                     row: uiGrid.IGridRowOf<TEntity>,
+                                     col: IGridColumnOf<TEntity>,
+                                     value: any) => any;
+            /**
+             * A function to apply to the header displayNames before exporting. Useful for internationalisation,
+             * for example if you were using angular-translate you'd set this to $translate.instant.
+             * Note that this call must be synchronous, it cannot be a call that returns a promise.
+             *
+             * Behaviour can be changed to pass in name instead of displayName through use
+             * of exporterHeaderFilterUseName: true.
+             * @param {string} displayName
+             * @returns {string} The filtered header
+             */
+            exporterHeaderFilter?: (displayName: string) => string;
+            /**
+             * Defaults to false, which leads to displayName being passed into the headerFilter.
+             * If set to true, then will pass name instead.
+             * @default false
+             */
+            exporterHeaderFilterUseName?: boolean;
+            /**
+             * Add csv export menu items to the ui-grid grid menu, if it's present. Defaults to true.
+             * @default true
+             */
+            exporterMenuCsv?: boolean;
+            /**
+             * The text to show on the exporter menu button link
+             * Defaults to 'Export'
+             * @default 'Export'
+             */
+            exporterMenuLabel?: string;
+            /**
+             * Add pdf export menu items to the ui-grid grid menu, if it's present.
+             * Defaults to true.
+             * @default true
+             */
+            exporterMenuPdf?: boolean;
+            /**
+             * Some versions of excel don't like the utf-16 BOM on the front,
+             * and it comes through as  in the first column header.
+             * Setting this option to false will suppress this,
+             * at the expense of proper utf-16 handling in applications that do recognise the BOM
+             * Defaults to false
+             * @default false
+             */
+            exporterOlderExcelCompatibility?: boolean;
+            /**
+             * A custom callback routine that changes the pdf document,
+             * adding any custom styling or content that is supported by pdfMake.
+             * Takes in the complete docDefinition, and must return an updated docDefinition ready for pdfMake.
+             * Example
+             * In this example we add a style to the style array, so that we can use it in our footer definition.
+             * @param {any} docDefinition Document definition in pdfMake format
+             */
+            exporterPdfCustomFormatter?: (docDefinition: any) => any;
+            /**
+             * The default style in pdfMake format
+             * @todo replace with pdfmake format
+             */
+            exporterPdfDefaultStyle?: any;
+            /**
+             * The default filename to use when saving the downloaded pdf,
+             * only used in IE (other browsers open pdfs in a new window)
+             * Defaults to 'download.pdf'
+             * @default 'download.pdf'
+             */
+            exporterPdfFilename?: string;
+            /**
+             * The footer section for pdf exports. Can be simple text, a more complex object in pdfMake format, or it
+             * can be a function, allowing page numbers and the like
+             * @todo replace any with pdfmake format
+             */
+            exporterPdfFooter?: string | any | { (currentPage: number, pageCount: number): string };
+            /**
+             * The header section for pdf exports. Can be simple text, a more complex object in pdfMake format, or it
+             * can be a function, allowing page numbers and the like
+             * @todo replace any with pdfmake format
+             */
+            exporterPdfHeader?: string | any | { (currentPage: number, pageCount: number): string };
+            /**
+             * The maxium grid width - the current grid width will be scaled to match this,
+             * with any fixed width columns being adjusted accordingly.
+             * Defaults to 720 (for A4 landscape), use 670 for LETTER
+             * @default 720
+             */
+            exporterPdfMaxGridWidth?: number;
+            /**
+             * The orientation, should be a valid pdfMake value, 'landscape' or 'portrait'
+             * Defaults to landscape
+             * @default 'landscape'
+             */
+            exporterPdfOrientation?: string;
+            /**
+             * The orientation, should be a valid pdfMake paper size, usually 'A4' or 'LETTER' pdfMake page sizes
+             * Defaults to A4
+             * @default 'A4'
+             */
+            exporterPdfPageSize?: string;
+            /**
+             * exporterPdfTableHeaderStyle
+             * @todo replace any with pdfmake format
+             */
+            exporterPdfTableHeaderStyle?: any;
+            /**
+             * A tableLayout in pdfMake format, controls gridlines and the like. We use the default layout usually.
+             * Defaults to null, which means no layout
+             * @default null
+             * @todo replace any with pdfmake format
+             */
+            exporterPdfTableLayout?: any;
+            /**
+             * The tableStyle in pdfMake format
+             * Defaults to ```{ margin: [0, 5, 0, 15] }```
+             * @default { margin: [0, 5, 0, 15] }
+             * @todo replace any with pdfmake format
+             */
+            exporterPdfTableStyle?: any;
+            /**
+             * Columns that should not be exported.
+             *
+             * The selectionRowHeader is already automatically suppressed,
+             * but if you had a button column or some other "system" column that shouldn't be shown in the output,
+             * then add it in this list.
+             *
+             * You should provide an array of column names.
+             * Defaults to: []
+             * @default []
+             */
+            exporterSuppressColumns?: Array<string>;
+            /**
+             * Don't show the export menu button, implying the user will roll their own UI for calling the exporter
+             * Defaults to false
+             * @default false
+             */
+            exporterSuppressMenu?: boolean;
+        }
+
+        /**
+         * GridRow settings for exporter
+         */
+        export interface IGridRow {
+            /**
+             * If set to false, then don't export this row, notwithstanding visible or other settings.
+             * Defaults to true
+             * @default true
+             */
+            exporterEnableExporting?: boolean;
+        }
+
+        /**
+         * Public Api for exporter feature
+         */
+        export interface IGridExporterApi {
+            /**
+             * Exports rows from the grid in csv format, the data exported is selected based on the provided options
+             * @param {string} rowTypes which rows to export, valid values are uiGridExporterConstants.ALL,
+             * uiGridExporterConstants.VISIBLE, uiGridExporterConstants.SELECTED
+             * @param {string} colTypes which columns to export, valid values are uiGridExporterConstants.ALL,
+             * uiGridExporterConstants.VISIBLE
+             */
+            csvExport(rowTypes: string, colTypes: string): void;
+            /**
+             * Exports rows from the grid in pdf format, the data exported is selected based on the provided options
+             * Note that this function has a dependency on pdfMake, all going well this has been installed for you. The
+             * resulting pdf opens in a new browser window.
+             * @param {string} rowTypes which rows to export, valid values are uiGridExporterConstants.ALL,
+             * uiGridExporterConstants.VISIBLE, uiGridExporterConstants.SELECTED
+             * @param {string} colTypes which columns to export, valid values are uiGridExporterConstants.ALL,
+             * uiGridExporterConstants.VISIBLE
+             */
+            pdfExport(rowTypes: string, colTypes: string): void;
+        }
+
+        /**
+         * constants available in exporter module
+         */
+        export interface IUiGridExporterConstants {
+            featureName: string;
+            /** export all data, including data not visible.  Can be set for either rowTypes or colTypes */
+            ALL: string;
+            /** export only visible data, including data not visible.  Can be set for either rowTypes or colTypes */
+            VISIBLE: string;
+            /**
+             * Export all data, including data not visible.
+             * Can be set only for rowTypes, selection of only some columns is not supported
+             */
+            SELECTED: string;
+            CSV_CONTENT: string;
+            BUTTON_LABEL: string;
+            FILE_NAME: string;
+        }
+    }
+
+    export module grouping {
+        /**
+         * ColumnDef for grouping feature, these are available to be set using the ui-grid gridOptions.columnDefs
+         */
+        export interface IColumnDef {
+            /** Enable grouping on this column.  Defaults to true. */
+            enableGrouping?: boolean;
+            /**
+             * Set the grouping for a column.
+             * Note that aggregation used to be included in grouping, but is now separately set on the column via
+             * treeAggregation setting in treeBase
+             *
+             * We group in the priority order given, this will also put these columns to the high order of the sort
+             * irrespective of the sort priority given them.
+             * If there is no sort defined then we sort ascending, if there is a sort defined then we use that sort.
+             *
+             * If the groupPriority is undefined or less than 0, then we expect to be aggregating,
+             * and we look at the aggregation types to determine what sort of aggregation we can do.
+             * Values are in the constants file, but include SUM, COUNT, MAX, MIN
+             *
+             * groupPriorities should generally be sequential, if they're not then the next time getGrouping is called
+             * we'll renumber them to be sequential.
+             * Defaults to undefined.
+             */
+            grouping?: {
+                /**
+                 * number, starts at 0, if less than 0 or undefined then we're aggregating in this column
+                 */
+                groupPriority: number
+            };
+            /**
+             * Show the aggregation menu on this column.  Defaults to true
+             * @default true
+             */
+            groupingShowAggregationMenu?: boolean;
+            /**
+             * Show the grouping (group and ungroup items) menu on this column.  Defaults to true
+             * @default true
+             */
+            groupingShowGroupingMenu?: boolean;
+        }
+
+        /**
+         * GridOptions for grouping feature, these are available to be set using the ui-grid gridOptions
+         */
+        export interface IGridOptions {
+            /**
+             * Allows group header rows to be selected.
+             * Defaults to false
+             * @default false
+             */
+            enableGrouping?: boolean;
+            /**
+             * Enable row grouping for entire grid.
+             * Defaults to true
+             * @default true
+             */
+            enableGroupHeaderSelection?: boolean;
+            /**
+             * The string to use for the grouping header row label on rows which contain
+             * a null or undefined value in the grouped column.
+             * Defaults to "Null"
+             * @default 'Null'
+             */
+            groupingNullLabel?: string;
+            /**
+             * Shows counts on the groupHeader rows.
+             * Note that if you are using a cellFilter or a sortingAlgorithm which relies on a specific format or data
+             * type, showing counts may cause that to break, since the group header rows will always be a string with
+             * groupingShowCounts enabled. Defaults to true except on columns of type 'date'
+             * @default true
+             */
+            groupingShowCounts?: boolean;
+        }
+
+        /**
+         * Public Api for grouping feature
+         */
+        export interface IGridGroupingApi<TEntity> {
+            // Methods
+            /**
+             * Sets the aggregation type on a column.
+             * If the column is currently grouped then it removes the grouping first.
+             * If the aggregationDef is null then will result in the aggregation being removed.
+             * @param {string} columnName The name of the column we want to aggregate
+             * @param {string | function} or aggregationDef one of the recognised types from uiGridGroupingConstants or
+             * a custom aggregation function.
+             * @param {string} [aggregationLabel] The label to use for aggregation
+             */
+            aggregateColumn(columnName: string, or: string | Function, aggregationLabel?: string): void;
+            /**
+             * Clear any grouped columns and any aggregations.
+             * Doesn't remove sorting, as we don't know whether that sorting was added by grouping or was there
+             * beforehand
+             */
+            clearGrouping(): void;
+            /**
+             * Get the grouping configuration for this grid, used by the saveState feature.
+             * Adds expandedState to the information provided by the internal getGrouping,
+             * and removes any aggregations that have a source of grouping
+             * (i.e. will be automatically reapplied when we regroup the column)
+             * @param {boolean} getExpanded whether or not to return the expanded state
+             */
+            getGrouping(getExpanded: boolean): IGridGroupingConfiguration;
+            /**
+             * Adds this column to the existing grouping, at the end of the priority order.
+             * If the column doesn't have a sort, adds one, by default ASC.
+             * This column will move to the left of any non-group columns.
+             * The move is handled in a columnProcessor, so it gets called as part of refresh.
+             * @param {string} columnName the name of the column we want to group
+             */
+            groupColumn(columnName: string): void;
+            /**
+             * Set the grouping configuration for this grid, used by the saveState feature,
+             * but can also be used by any user to specify a combined grouping and aggregation configuration
+             * @param {IGridGroupingConfiguration} config The config to apply, in the format provided out by getGrouping
+             */
+            setGrouping(config: IGridGroupingConfiguration): void;
+            /**
+             * Removes the groupPriority from this column.
+             * If the column was previously aggregated the aggregation will come back. The sort will remain.
+             *
+             * This column will move to the right of any other group columns, the move is handled in a columnProcessor,
+             * so it gets called as part of refresh
+             * @param {string} columnName the name of the column to ungroup
+             */
+            ungroupColumn(columnName: string): void;
+
+            // Events
+            on: {
+                /**
+                 * raised whenever aggregation is changed, added or removed from a column
+                 * @param {ng.IScope} scope Grid Scope
+                 * @param {aggregationChangedHandler} handler Callback method
+                 */
+                aggregationChanged: (scope: ng.IScope, handler: aggregationChangedHandler<TEntity>) => void;
+                /**
+                 * raised whenever the grouped columns change
+                 * @param {ng.IScope} scope Grid Scope
+                 * @param {groupingChangedHandler} handler Callback method
+                 */
+                groupingChanged: (scope: ng.IScope, handler: groupingChangedHandler<TEntity>) => void;
+            };
+        }
+        /**
+         * Grid grouping configuration for the grid.  Used by the saveState feature
+         */
+        export interface IGridGroupingConfiguration {
+            /**
+             * GroupArray.  Sorted by groupPriority
+             */
+            grouping: Array<IGripGroup>;
+            /**
+             * Array of aggregation objects
+             */
+            treeAggregations: Array<IGridTreeAggregations>;
+            /**
+             * Hash of currently expanded nodes
+             */
+            expandedState?: IGridExpandedHash;
+        }
+
+        export interface IGripGroup {
+            field: string;
+            colName: string;
+            groupPriority: number;
+        }
+
+        export interface IGridTreeAggregations {
+            field: string;
+            colName: string;
+            aggregation: string;
+        }
+
+        /**
+         * Recursive hash of the currently expanded and collapsed nodes.
+         */
+        export interface IGridExpandedHash {
+            [key: string]: IGridExpandedHash | string;
+        }
+        export interface aggregationChangedHandler<TEntity> {
+            /**
+             * raised whenever aggregation is changed, added or removed from a column
+             * @param {IGridColumn} col the column which on which aggregation changed.
+             *        The aggregation type is available as col.treeAggregation.type
+             */
+            (col: IGridColumnOf<TEntity>): void;
+        }
+
+        export interface groupingChangedHandler<TEntity> {
+            /**
+             * raised whenever the grouped columns changes
+             * @param {IGridColumn} col the column which on which grouping changed.
+             *   The new grouping is available as col.grouping
+             */
+            (col: IGridColumnOf<TEntity>): void;
+        }
+
+        /**
+         * Constants available in grouping module including all constants declared in the treeBase module.
+         * These are manually copied as there isn't an easy way to include constants in another constants file, and we
+         * don't want to make users include treeBase.
+         */
+        interface IUiGridGroupingConstants extends ISharedTreeConstants {
+            featureName: string;
+        }
+    }
+
+    export module importer {
+        /**
+         * GridOptions for importer feature, these are available to be set using the ui-grid gridOptions
+         */
+        export interface IGridOptions<TEntity> {
+            /**
+             * A mandatory callback function that adds data to the source data array.
+             * The grid generally doesn't add rows to the source data array,
+             * it is tidier to handle this through a user callback.
+             * @param {IGridInstance} grid The grid we're importing into, may be useful in some way
+             * @param {Array<TEntity>} newObjects An array of new objects that you should add to your data
+             */
+            importerDataAddCallback?: (grid: IGridInstanceOf<TEntity>, newObjects: Array<TEntity>) => void;
+            /**
+             * A callback function that provides custom error handling,
+             * rather than the standard grid behaviour of an alert box and a console message.
+             * You might use this to internationalise the console log messages,
+             * or to write to a custom logging routine that returned errors to the server.
+             * @param {IGridInstance} grid the grid we're importing into, may be useful if you're positioning messages
+             * @param {string} errorKey one of the i18n keys the importer can return -
+             *        * importer.noHeaders
+             *        * importer.noObjects
+             *        * importer.invalidCsv
+             *        * importer.invalidJson
+             *        * importer.jsonNotArray
+             * @param {string} consoleMessage the English console message that importer would have written
+             * @param {any} context the context data that importer would have appended to that console message,
+             *        often the file content itself or the element that is in error
+             */
+            importerErrorCallback?: (grid: IGridInstanceOf<TEntity>, errorKey: string, consoleMessage: string,
+                context: any) => void;
+            /**
+             * A callback function that will filter (usually translate) a single header.
+             * Used when you want to match the passed in column names to the column displayName after the header filter.
+             * Your callback routine needs to return the filtered header value.
+             * @param {string} displayName The displayName to translate
+             * @returns {string} The translated name
+             */
+            importerHeaderFilter?: (displayName: string) => string;
+            /**
+             * A callback that massages the data for each object.
+             * For example, you might have data stored as a code value, but display the decode.
+             * This callback can be used to change the decoded value back into a code.
+             * Defaults to angular.identity.
+             * @param {IGridInstance} grid The grid
+             * @param {TEntity} newObject The new object as importer has created it.  Modify it and return modified
+             * version
+             * @returns {TEntity} The modified object
+             * @default angular.identity
+             */
+            importerObjectCallback?: (grid: IGridInstanceOf<TEntity>, newObject: TEntity) => TEntity;
+            /**
+             * A callback function that will process headers using custom
+             * logic.  Set this callback function if the headers that your user will provide in their
+             * import file don't necessarily match the grid header or field names.  This might commonly
+             * occur where your application is internationalised, and therefore the field names
+             * that the user recognises are in a different language than the field names that
+             * ui-grid knows about.
+             *
+             * Defaults to the internal `processHeaders` method, which seeks to match using both
+             * displayName and column.name.  Any non-matching columns are discarded.
+             *
+             * Your callback routine should respond by processing the header array, and returning an array
+             * of matching column names.  A null value in any given position means "don't import this column"
+             * @param {IGridInstance} grid the grid we're importing into
+             * @param {Array<string>} headerArray an array of the text from the first row of the csv file,
+             * which you need to match to column.names
+             * @returns {Array<string>} array of matching column names, in the same order as the headerArray
+             */
+            importerProcessHeaders?: (grid: IGridInstanceOf<TEntity>, headerArray: Array<string>) => Array<string>;
+            /**
+             * Whether or not importer is enabled.  Automatically set
+             * to false if the user's browser does not support the required fileApi.
+             * Otherwise defaults to true.
+             * @default true
+             */
+            enableImporter?: boolean;
+            /**
+             * An object on which we call `new` to create each new row before inserting it into
+             * the data array.  Typically this would be a $resource entity, which means that if you're using
+             * the rowEdit feature, you can directly call save on this entity when the save event is triggered.
+             *
+             * Defaults to a vanilla javascript object
+             * @default {}
+             */
+            importerNewObject?: Function;
+            /**
+             * Whether or not to show an item in the grid menu.
+             * Defaults to true.
+             * @default true
+             */
+            importerShowMenu?: boolean;
+        }
+
+        /**
+         * Public Api for importer feature
+         */
+        export interface IGridImporterApi {
+            /**
+             * Imports a file into the grid using the file object provided. Bypasses the grid menu
+             * @param {File} fileObject The file we want to import as a javascript File object
+             */
+            importFile(fileObject: File): void;
+        }
+
+        /**
+         * constants available in importer module
+         */
+        export interface IUiGridImporterConstants {
+            featureName: string;
+        }
+    }
+
+    /**
+     * This module provides infinite scroll functionality to ui-grid
+     */
+    export module infiniteScroll {
+        /**
+         * GridOptions for infinite scroll feature, these are available to be set using the ui-grid gridOptions
+         */
+        export interface IGridOptions {
+            /**
+             * Enable infinite scrolling for this grid
+             * Defaults to true
+             * @default true
+             */
+            enableInfiniteScroll?: boolean;
+        }
+
+        /**
+         * Public API for infinite scroll feature
+         */
+        export interface IGridInfiniteScrollApi<TEntity> {
+            // Methods
+            /**
+             * Call this function when you have loaded the additional data requested.
+             * You should set scrollUp and scrollDown to indicate whether there are still more pages in each direction.
+             *
+             * If you call dataLoaded without first calling saveScrollPercentage, then we will scroll the user to the
+             * start of the newly loaded data.  This usually makes scrolling smooth, but be jumpy with large
+             * infiniteScrollRowsFromEnd values, and on variable speed internet connections.
+             * Using saveScrollPercentage as demonstrated in the tutorial should give a smoother scrolling experience
+             * for users.
+             *
+             * See infinite_scroll tutorial for example of usage
+             * @param {boolean} scrollUp if set to false flags that there are no more pages upwards, so don't fire any
+             *        more infinite scroll events upward
+             * @param {boolean} scrollDown if set to false flags that there are no more pages downwards, so don't fire
+             *        any more infinite scroll events downward
+             * @returns {ng.IPromise<any>} a promise that is resolved when the grid scrolling is fully adjusted.
+             *          If you're planning to remove pages, you should wait on this promise first, or you'll break the
+             *          scroll positioning
+             */
+            dataLoaded(scrollUp: boolean, scrollDown: boolean): ng.IPromise<any>;
+            /**
+             * Adjusts the scroll position after you've removed data at the bottom
+             * @param {boolean} scrollUp flag that there are pages upwards, fire infinite scroll events upward
+             * @param {boolean} scrollDown flag that there are pages downwards, so fire infinite scroll events downward
+             * @returns {ng.IPromise<any>} A promise that is resolved when scrolling finishes
+             */
+            dataRemovedBottom(scrollUp: boolean, scrollDown: boolean): ng.IPromise<any>;
+            /**
+             * Adjusts the scroll position after you've removed data at the bottom.
+             * You should have called saveScrollPercentage before you remove the data,
+             * and if you're doing this in response to a needMoreData you should wait
+             * until the promise from loadData has resolved before you start removing data
+             *
+             * @param {IGridInstance} grid the grid we're working on
+             * @param {boolean} scrollUp flag that there are pages upwards, fire infinite scroll events upward
+             * @param {boolean} scrollDown flag that there are pages downwards, so fire infinite scroll events downward
+             * @returns {ng.IPromise<any>} A promise that is resolved when scrolling finishes
+             */
+            dataRemovedBottom(grid: IGridInstanceOf<TEntity>, scrollUp: boolean, scrollDown: boolean): ng.IPromise<any>;
+            /**
+             * Adjusts the scroll position after you've removed data at the bottom
+             * @param {boolean} scrollUp flag that there are pages upwards, fire infinite scroll events upward
+             * @param {boolean} scrollDown flag that there are pages downwards, so fire infinite scroll events downward
+             * @returns {ng.IPromise<any>} A promise that is resolved when scrolling finishes
+             */
+            dataRemovedTop(scrollUp: boolean, scrollDown: boolean): ng.IPromise<any>;
+            /**
+             * Adjusts the scroll position after you've removed data at the bottom.
+             * You should have called saveScrollPercentage before you remove the data,
+             * and if you're doing this in response to a needMoreData you should wait
+             * until the promise from loadData has resolved before you start removing data
+             *
+             * @param {IGridInstance} grid the grid we're working on
+             * @param {boolean} scrollUp flag that there are pages upwards, fire infinite scroll events upward
+             * @param {boolean} scrollDown flag that there are pages downwards, so fire infinite scroll events downward
+             * @returns {ng.IPromise<any>} A promise that is resolved when scrolling finishes
+             */
+            dataRemovedTop(grid: IGridInstanceOf<TEntity>, scrollUp: boolean, scrollDown: boolean): ng.IPromise<any>;
+            /**
+             * Call this function when you have taken some action that makes the current scroll position invalid.
+             * For example, if you're using external sorting and you've resorted then you might reset the scroll,
+             * or if you've otherwise substantially changed the data, perhaps you've reused an
+             * existing grid for a new data set
+             *
+             * You must tell us whether there is data upwards or downwards after the reset
+             * @param {boolean} scrollUp flag that there are pages upwards, fire infinite scroll events upward
+             * @param {boolean} scrollDown flag that there are pages downwards, so fire infinite scroll events downward
+             * @returns {ng.IPromise<any>} A promise that is resolved when scrolling finishes
+             */
+            resetScroll(scrollUp: boolean, scrollDown: boolean): ng.IPromise<any>;
+            /**
+             * Saves the scroll percentage and number of visible rows before you adjust the data,
+             * used if you're subsequently going to call dataRemovedTop or dataRemovedBottom
+             */
+            saveScrollPercentage(): void;
+
+            // Events
+            on: {
+                /**
+                 * This event fires when scroll reaches bottom percentage of grid and needs to load data
+                 */
+                needLoadMoreData: Function;
+                /**
+                 * This event fires when scroll reaches top percentage of grid and needs to load data
+                 */
+                needLoadMoreDataTop: Function;
+            }
+        }
+    }
+
+    export module moveColumns {
+        /**
+         * Column Definition for move column features.
+         * These are available to be set using the ui-grid `gridOptions.columnDefs`
+         */
+        export interface IColumnDef {
+            /**
+             * Enable column moving for the column
+             */
+            enableColumnMoving?: boolean;
+        }
+
+        /**
+         * Options for configuring the move column feature, these are available to be set using the ui-grid gridOptions
+         */
+        export interface IGridOptions {
+            /**
+             * If defined, sets the default value for the colMovable flag on each individual colDefs
+             * if their individual enableColumnMoving configuration is not defined.
+             * Defaults to true.
+             * @default true
+             */
+            enableColumnMoving?: boolean;
+        }
+
+        export interface IGridMoveColumnsApi {
+            // Methods
+            /**
+             * Method can be used to change column position
+             * @param {number} originalPosition Original column position as a 0 indexed integer
+             * @param {number} newPosition New column position as a 0 indexed integer
+             */
+            moveColumn(originalPosition: number, newPosition: number): void;
+
+            // Events
+            on: {
+                /**
+                 * Raised when a column is moved
+                 * @param {ng.IScope} scope Grid Scope
+                 * @param {columnPositionChangedHandler} handler Callback Function
+                 */
+                columnPositionChanged?: (scope: ng.IScope, handler: columnPositionChangedHandler) => void;
+            };
+        }
+        export interface columnPositionChangedHandler {
+            (colDef: IColumnDef, originalPosition: number, finalPosition: number): void;
+        }
+    }
+
+    export module pagination {
+        /**
+         * Pagination related grid options
+         */
+        export interface IGridOptions {
+            /**
+             * Enables pagination, defaults to true
+             * @default true
+             */
+            enablePagination?: boolean;
+            /**
+             * Enables the paginator at the bottom of the grid. Turn this off, if you want to implement your own
+             * controls outside the grid
+             */
+            enablePaginationControls?: boolean;
+            /**
+             * Current page number, defaults to 1
+             * @default 1
+             */
+            paginationCurrentPage?: number;
+            /**
+             * Page size, defaults to the first item in paginationPageSizes, or 0 if paginationPageSizes is empty
+             */
+            paginationPageSize?: number;
+            /**
+             * Array of page sizes, defaults to [250, 500, 1000]
+             * @default [250, 500, 1000]
+             */
+            paginationPageSizes?: Array<number>;
+            /**
+             * A custom template for the pager, defaults to ui-grid/pagination
+             * @default 'ui-grid/pagination'
+             */
+            paginationTemplate?: string;
+            /**
+             * Total number of items, set automatically when client side pagination,
+             * needs set by user for server side pagination
+             */
+            totalItems?: number;
+            /**
+             * Disables client side pagination. When true, handle the paginationChanged event and set data and
+             * totalItems, defaults to false
+             * @default false
+             */
+            useExternalPagination?: boolean;
+        }
+        export interface IGridPaginationApi {
+            // Methods
+            /**
+             * Get the current page
+             * @returns {number} the number of the current page
+             */
+            getPage(): number;
+            /**
+             * Get the total number of pages
+             * @returns {number} the total number of pages
+             */
+            getTotalPages(): number;
+            /**
+             * Moves to the next page if possible
+             */
+            nextPage(): void;
+            /**
+             * Moves to the previous page if we're not on the first page.
+             */
+            previousPage(): void;
+            /**
+             * Moves to the requested page
+             * @param {number} page The number of the page that should be displayed
+             */
+            seek(page: number): void;
+
+            // Events
+            on: {
+                /**
+                 * This event fires when the pageSize or currentPage changes
+                 * @param {ng.IScope} scope The grid scope
+                 * @param {paginationChangedHandler} handler Callback
+                 */
+                paginationChanged: (scope: ng.IScope, handler: paginationChangedHandler) => void;
+            };
+        }
+
+        /**
+         * The callback for paginationChanged
+         * @param {number} newPage requested page number
+         * @param {number} pageSize requested page size
+         */
+        export interface paginationChangedHandler {
+            (newPage: number, pageSize: number): void;
+        }
+    }
+
+    export module pinning {
+        /**
+         * ColumnDef for pinning feature, these are available to be set using the ui-grid gridOptions.columnDefs
+         */
+        export interface IColumnDef {
+            /**
+             * Enable pinning for the individual column.  Defaults to true
+             * @default true
+             */
+            enablePinning?: boolean;
+            /**
+             * Column is pinned left when grid is rendered.  Defaults to false
+             * @default false
+             */
+            pinnedLeft?: boolean;
+            /**
+             * Column is pinned right when grid is rendered.  Defaults to false
+             * @default false
+             */
+            pinnedRight?: boolean;
+        }
+
+        /**
+         * Pinning related grid options
+         */
+        export interface IGridOptions {
+            /**
+             * Enable pinning for the entire grid.
+             * Defaults to true
+             * @default true
+             */
+            enablePinning?: boolean;
+        }
+
+        export interface IGridPinningApi<TEntity> {
+            // Methods
+            /**
+             * Pin column left, right, or none
+             * @param {IGridColumn} col The column being pinned
+             * @param {string} container One of the recognized container types from uiGridPinningConstants
+             */
+            pinColumn(col: IGridColumnOf<TEntity>, container: string): void;
+
+            // Events
+            /**
+             * raised when column pin state has changed
+             * @param {ng.IScope} scope The grid scope
+             * @param {columnPinHandler} handler Callback
+             */
+            columnPin: (scope: ng.IScope, handler: columnPinHandler) => void;
+        }
+
+        export interface columnPinHandler {
+            /**
+             * Callback to columnPin event
+             * @param {IColumnDef} colDef The column that was changed
+             * @param {string} container The render container the column is in.  Options:
+             *        * uiGridPinningConstants.container.LEFT
+             *        * uiGridPinningConstants.container.RIGHT,
+             *        * uiGridPinningConstants.container.NONE
+             */
+            (colDef: IColumnDef, container: string): void;
+        }
+
+        export interface IUiGridPinningConstants {
+            container: {
+                LEFT: string;
+                RIGHT: string;
+                NONE: string;
+            };
+        }
+    }
+
+    export module resizeColumns {
+        /**
+         * ColumnDef for resizeColumns feature, these are available to be set using the ui-grid gridOptions.columnDefs
+         */
+        export interface IColumnDef {
+            /**
+             * Enable column resizing on an individual column
+             * Defaults to GridOptions.enableColumnResizing
+             */
+            enableColumnResizing?: boolean;
+        }
+        /**
+         * Column Resizing Grid Options
+         */
+        export interface IGridOptions {
+            /**
+             * Enable column resizing on the entire grid
+             * Defaults to true
+             * @default true
+             */
+            enableColumnResizing?: boolean;
+        }
+
+        /**
+         * Public Api for column resize feature
+         */
+        export interface IGridResizeColumnsApi {
+            // Events
+            on: {
+                /**
+                 * Raised when column is resized
+                 * @param {ng.IScope} scope Grid Scope
+                 * @param {columnSizeChangedHandler} handler Callback
+                 */
+                columnSizeChanged: (scope: ng.IScope, handler: columnSizeChangedHandler) => void;
+            };
+        }
+
+        export interface columnSizeChangedHandler {
+            /**
+             * Callback when column size is changed
+             * @param {IColumnDef} colDef The column that was resized
+             * @param {number} delta The change in the size of the column
+             */
+            (colDef: IColumnDef, delta: number): void;
+        }
+    }
+
+    export module rowEdit {
+        /**
+         * Row Edit Grid Options
+         */
+        export interface IGridOptions {
+            /**
+             * How long the grid should wait for another change on this row before triggering a save (in milliseconds).
+             * If set to -1, then saves are never triggered by timer
+             * (implying that the user will call flushDirtyRows() manually)
+             */
+            rowEditWaitInterval?: number;
+        }
+
+        export interface IGridRowEditApi<TEntity> {
+            // Methods
+            /**
+             * Triggers a save event for all currently dirty rows.
+             * Could be used where user presses a save button or navigates away from the page
+             * @param {IGridInstance} grid The grid
+             * @returns {ng.IPromise<Array<any>>} a promise that represents the aggregate of all of the individual save
+             *          promises.  i.e. it will be resolved when all the individual save promises have been resolved.
+             */
+            flushDirtyRows(grid?: IGridInstanceOf<TEntity>): ng.IPromise<Array<any>>;
+            /**
+             * Returns all currently dirty rows
+             * @param {IGridInstance} grid The target grid
+             * @returns {Array<IGridRow>} An array of gridRows that are currently dirty
+             */
+            getDirtyRows(grid?: IGridInstanceOf<TEntity>): Array<IGridRowOf<TEntity>>;
+            /**
+             * Returns all currently errored rows
+             * @param {IGridInstance} grid The target grid
+             * @returns {Array<IGridRow>} An array of gridRows that are currently in error
+             */
+            getErrorRows(grid?: IGridInstanceOf<TEntity>): Array<IGridRowOf<TEntity>>;
+            /**
+             * Sets each of the rows passed in dataRows to be clean,
+             * removing them from the dirty cache and the error cache,
+             * and clearing the error flag and the dirty flag
+             * @param {Array<TEntity>} dataRows the data entities for which the gridRows should be set clean
+             */
+            setRowsClean(dataRows: Array<TEntity>): void;
+            /**
+             * Sets each of the rows passed in dataRows to be dirty,
+             * Note that if you have only just inserted the rows into your data,
+             * you will need to wait for a $digest cycle before the gridRows are present.  As a result, this is often
+             * wrapped with $interval or $timeout.
+             * @param {Array<TEntity>} dataRows the data entities for which the gridRows should be set dirty
+             */
+            setRowsDirty(dataRows: Array<TEntity>): void;
+            /**
+             * Sets the promise associated with the row save, mandatory that the saveRow event handler calls this method
+             * somewhere before returning
+             * @param {any} rowEntity A data row from the grid for which a save has been initiated
+             * @param {ng.IPromise<any>} savePromise A promise that will be resolved when the save is successful, or
+             *        rejected if the save fails
+             */
+            setSavePromise(rowEntity: Object, savePromise: ng.IPromise<any>): void;
+
+            // Events
+            on: {
+                /**
+                 * Raised when a row is ready for saving.
+                 * Once your row has saved you may need to use angular.extend to update the data entity
+                 * with any changed data from your save.
+                 * i.e. lock version information, or last update time/user information
+                 *
+                 * Your method should call setSavePromise somewhere in the body before returning control.
+                 * The feature will then wait, with the gridRow greyed out whilst this promise is being resolved.
+                 * @param {ng.IScope} scope The grid scope
+                 * @param {saveRowHandler} handler Callback
+                 */
+                saveRow: (scope: ng.IScope, handler: saveRowHandler<TEntity>) => void;
+            };
+        }
+
+        export interface saveRowHandler<TEntity> {
+            /**
+             * Callback method for save row
+             * @param {TEntity} rowEntity The options.data element that was edited
+             */
+            (rowEntity: TEntity): void;
+        }
+    }
+
+    export module saveState {
+        /**
+         * Save State Grid Options
+         */
+        export interface IGridOptions {
+            /**
+             * Save the current filter state for each column
+             * Defaults to true
+             * @default true
+             */
+            saveFilter?: boolean;
+            /**
+             * Save the current focused cell. On returning to this focused cell we'll also scroll.
+             * This option is preferred to the saveScroll option, so is set to true by default.
+             * If saveScroll is set to true then this option will be disabled.
+             *
+             * By default this option saves the current row number and column number, and returns to that row and
+             * column. However, if you define a saveRowIdentity function, then it will return you to the currently
+             * selected column within that row (in a business sense - so if some rows have been deleted, it will still
+             * find the same data, presuming it still exists in the list. If it isn't in the list then it will instead
+             * return to the same row number - i.e. scroll percentage)
+             *
+             * Note that this option will do nothing if the cellNav feature is not enabled.
+             *
+             * Defaults to true (unless saveScroll is true)
+             * @default true
+             */
+            saveFocus?: boolean;
+            /**
+             * Save the grouping configuration. If set to true and the grouping feature is not enabled then does
+             * nothing. Defaults to true
+             * @default true
+             */
+            saveGrouping?: boolean;
+            /**
+             * Save the grouping row expanded states.
+             * If set to true and the grouping feature is not enabled then does nothing.
+             *
+             * This can be quite a bit of data, in many cases you wouldn't want to save this information.
+             *
+             * Defaults to false
+             * @default false
+             */
+            saveGroupingExpandedStates?: boolean;
+            /**
+             * Restore the current column order.
+             * Note that unless you've provided the user with some way to reorder their columns
+             * (for example the move columns feature), this makes little sense.
+             * Defaults to true
+             * @default true
+             */
+            saveOrder?: boolean;
+            /**
+             * Save pinning state for columns.
+             * Defaults to true
+             * @default true
+             */
+            savePinning?: boolean;
+            /**
+             * A function that can be called, passing in a rowEntity, and that will return a unique id for that row.
+             * This might simply return the id field from that row (if you have one),
+             * or it might concatenate some fields within the row to make a unique value.
+             *
+             * This value will be used to find the same row again and set the focus to it, if it exists when we return.
+             *
+             * Defaults to undefined
+             * @default undefined
+             */
+            saveRowIdentity?: boolean;
+            /**
+             * Save the current scroll position.
+             * Note that this is saved as the percentage of the grid scrolled -
+             * so if your user returns to a grid with a significantly different number of rows
+             * (perhaps some data has been deleted) then the scroll won't actually show the same rows as before.
+             * If you want to scroll to a specific row then you should instead use the saveFocus option,
+             * which is the default.
+             *
+             * Note that this element will only be saved if the cellNav feature is enabled
+             *
+             * Defaults to false
+             * @default false
+             */
+            saveScroll?: boolean;
+            /**
+             * Save the currently selected rows.
+             * If the saveRowIdentity callback is defined, then it will save the id of the row and select that.
+             * If not, then it will attempt to select the rows by row number,
+             * which will give the wrong results if the data set has changed in the mean-time.
+             *
+             * Note that this option only does anything if the selection feature is enabled.
+             *
+             * Defaults to true
+             * @default true
+             */
+            saveSelection?: boolean;
+            /**
+             * Save the current sort state for each column
+             * Defaults to true
+             *
+             * @default true
+             */
+            saveSort?: boolean;
+            /**
+             * Save the treeView configuration. If set to true and the treeView feature is not enabled then does
+             * nothing.
+             *
+             * @default true;
+             */
+            saveTreeView?: boolean;
+            /**
+             * Save whether or not columns are visible
+             * Defaults to true
+             * @default true
+             */
+            saveVisible?: boolean;
+            /**
+             * Save the current column widths.
+             * Note that unless you've provided the user with some way to resize their columns
+             * (say the resize columns feature), then this makes little sense.
+             * Defaults to true
+             * @default true
+             */
+            saveWidths?: boolean;
+        }
+
+        export interface IGridSaveStateApi {
+            // Methods
+            /**
+             * Restores the provided state into the grid
+             * @param {ng.IScope} $scope A scope we can broadcast on
+             * @param {IGridSavedState} state The state that should ve restored into the grid
+             */
+            restore($scope: ng.IScope, state: IGridSavedState): void;
+            /**
+             * Packages the current state of the grid into an object, and provides it to the user for saving
+             * @returns {IGridSavedState} Current grid state as a POJO
+             */
+            save(): IGridSavedState;
+        }
+
+        export interface IGridSavedState {
+            columns?: Array<ISavedColumn>;
+            scrollFocus?: ISavedScrollFocus;
+            selection: Array<IRowVal>;
+            grouping: grouping.IGridGroupingConfiguration;
+            treeView: treeBase.ITreeState;
+        }
+
+        interface ISavedColumn {
+            name: string;
+            visible?: boolean;
+            width?: number;
+            sort?: ISortInfo;
+            filters?: Array<IFilterOptions>;
+            pinned?: string;
+        }
+
+        interface ISavedScrollFocus {
+            focus?: boolean;
+            colName?: string;
+            rowVal?: IRowVal;
+        }
+
+        interface IRowVal {
+            identity: boolean;
+            row: number | any;
+        }
+    }
+
+    export module selection {
+        /**
+         * GridOptions for selection feature, these are available to be set using the ui-grid gridOptions
+         */
+        export interface IGridOptions {
+            /**
+             * Shows the total number of selected items in footer if true.
+             * Defaults to true.
+             * GridOptions.showGridFooter must also be set to true.
+             * @default true
+             */
+            enableFooterTotalSelected?: boolean;
+            /**
+             * Enable selection by clicking anywhere on the row.
+             * Defaults to false if enableRowHeaderSelection is true, otherwise defaults to false.
+             */
+            enableFullRowSelection?: boolean;
+            /**
+             * Enable a row header to be used for selection
+             * Defaults to true
+             * @default true
+             */
+            enableRowHeaderSelection?: boolean;
+            /**
+             * Enable row selection for entire grid.
+             * Defaults to true
+             */
+            enableRowSelection?: boolean;
+            /**
+             * Enable the select all checkbox at the top of the selectionRowHeader
+             * Defaults to true
+             * @default true
+             */
+            enableSelectAll?: boolean;
+            /**
+             * If selected rows are changed in bulk, either via the API or via the selectAll checkbox,
+             * then a separate event is fired.
+             * Setting this option to false will cause the rowSelectionChanged event to be called multiple times instead
+             * Defaults to true
+             * @default true
+             */
+            enableSelectionBatchEvent?: boolean;
+            /**
+             * Makes it possible to specify a method that evaluates for each row and sets its "enableSelection"
+             * property.
+             */
+            isRowSelectable?: boolean;
+            /**
+             * Enable multiple row selection only when using the ctrlKey or shiftKey. Requires multiSelect to be true.
+             * Defaults to false
+             * @default false
+             */
+            modifierKeysToMultiSelect?: boolean;
+            /**
+             * Enable multiple row selection for entire grid
+             * Defaults to true
+             * @default true
+             */
+            multiSelect?: boolean;
+            /**
+             * Prevent a row from being unselected.
+             * Works in conjunction with multiselect = false and gridApi.selection.selectRow() to allow you to
+             * create a single selection only grid -
+             * a row is always selected, you can only select different rows, you can't unselect the row.
+             * Defaults to false
+             * @default false
+             */
+            noUnselect?: boolean;
+            /**
+             * can be used to set a custom width for the row header selection column
+             * Defaults to 30px
+             * @default 30
+             */
+            selectionRowHeaderWidth?: number;
+        }
+        /**
+         * Selection related grid row
+         */
+        export interface IGridRow {
+            /**
+             * Enable row selection for this row, only settable by internal code.
+             *
+             * The grouping feature, for example, might set group header rows to not be selectable.
+             * Defaults to true
+             * @default true
+             */
+            enableSelection?: boolean;
+            /**
+             * Selected state of row.
+             * Should be readonly.
+             * Make any changes to selected state using setSelected().
+             * Defaults to false
+             *
+             * @readonly
+             * @default false
+             */
+            isSelected?: boolean;
+            /**
+             * Sets the isSelected property and updates the selectedCount
+             * Changes to isSelected state should only be made via this function
+             * @param selected Value to set
+             */
+            setSelected(selected: boolean): void;
+        }
+        /**
+         * Public Api for selection feature
+         */
+        export interface IGridSelectionApi<TEntity> {
+            // Methods
+            /**
+             * Unselects All Rows
+             * @param {ng.IAngularEvent} event object if raised from event
+             */
+            clearSelectedRows(event?: ng.IAngularEvent): void;
+            /**
+             * Returns whether or not the selectAll checkbox is currently ticked.
+             * The grid doesn't automatically select rows when you add extra data -
+             * so when you add data you need to explicitly check whether the selectAll is set,
+             * and then call setVisible rows if it is
+             * @returns {boolean} Whether or not selectAll checkbox is ticked
+             */
+            getSelectAllState(): boolean;
+            /**
+             * returns all selected rows as gridRows
+             * @returns {Array<IGridRow>} The selected rows
+             */
+            getSelectedGridRows(): Array<uiGrid.IGridRowOf<TEntity>>;
+            /**
+             * Gets selected rows as entities
+             * @returns {Array<TEntity>} Selected row entities
+             */
+            getSelectedRows(): Array<TEntity>;
+            /**
+             * Selects all rows.  Does nothing if multiselect = false
+             * @param {ng.IAngularEvent} event object if raised from event
+             */
+            selectAllRows(event?: ng.IAngularEvent): void;
+            /**
+             * Selects all visible rows.  Does nothing if multiselect = false
+             * @param {ng.IAngularEvent} event object if raised from event
+             */
+            selectAllVisibleRows(event?: ng.IAngularEvent): void;
+            /**
+             * Select row by data
+             * @param {TEntity} rowEntity gridOptions.data[] array value
+             * @param {ng.IAngularEvent} event object if raised from event
+             */
+            selectRow(rowEntity: TEntity, event?: ng.IAngularEvent): void;
+            /**
+             * Select the specified row by visible index
+             * (i.e. if you specify row 0 you'll get the first visible row selected).
+             *
+             * In this context visible means of those rows that are theoretically visible (i.e. not filtered),
+             * rather than rows currently rendered on the screen.
+             *
+             * @param {number} index Index within rowsVisible array
+             * @param {ng.IAngularEvent} event object if raised from event
+             */
+            selectRowByVisibleIndex(index: number, event?: ng.IAngularEvent): void;
+            /**
+             * Sets the current gridOption.modifierKeysToMultiSelect to true or false
+             * @param {boolean} multiSelect true to only allow multiple rows when using ctrlKey or shiftKey is used
+             */
+            setModifierKeysToMultiSelect(multiSelect: boolean): void;
+            /**
+             * Sets the current gridOption.multiSelect to true or false
+             * @param {boolean} multiSelect true to allow multiple rows
+             */
+            setMultiSelect(multiSelect: boolean): void;
+            /**
+             * Toggles data row as selected or unselected
+             * @param {TEntity} rowEntity gridOptions.data[] array value
+             * @param {ng.IAngularEvent} event object if raised from event
+             */
+            toggleRowSelection(rowEntity: TEntity, event?: ng.IAngularEvent): void;
+            /**
+             * UnSelect the data row
+             * @param {TEntity} rowEntity gridOptions.data[] array value
+             * @param {ng.IAngularEvent} event object if raised from event
+             */
+            unSelectRow(rowEntity: TEntity, event?: ng.IAngularEvent): void;
+
+            // Events
+            on: {
+                /**
+                 * is raised after the row.isSelected state is changed
+                 * @param {ng.IScope} scope grid scope
+                 * @param {rowSelectionChangedHandler} handler callback
+                 */
+                rowSelectionChanged: (scope: ng.IScope, handler: rowSelectionChangedHandler<TEntity>) => void;
+                /**
+                 * is raised after the row.isSelected state is changed in bulk,
+                 * if the enableSelectionBatchEvent option is set to true (which it is by default).
+                 * This allows more efficient processing of bulk events.
+                 * @param {ng.IScope} scope grid scope
+                 * @param {rowSelectionChangedBatchHandler} handler callback
+                 */
+                rowSelectionChangedBatch: (scope: ng.IScope, handler: rowSelectionChangedBatchHandler<TEntity>) => void;
+            };
+        }
+        export interface rowSelectionChangedHandler<TEntity> {
+            /**
+             * Callback for row selection changed
+             * @param {IGridRow} row The selected rows
+             * @param {ng.IAngularEvent} event object if raised from event
+             */
+            (row: uiGrid.IGridRowOf<TEntity>, event?: ng.IAngularEvent): void;
+        }
+
+        export interface rowSelectionChangedBatchHandler<TEntity> {
+            /**
+             * Callback for row selection changed batch
+             * @param {IGridRow} row The selected rows
+             * @param {ng.IAngularEvent} event object if raised from event
+             */
+            (row: Array<uiGrid.IGridRowOf<TEntity>>, event?: ng.IAngularEvent): void;
+        }
+    }
+
+    export module treeBase {
+        /**
+         * ColumnDef for tree feature, these are available to be set using the ui-grid gridOptions.columnDefs
+         */
+        export interface IColumnDef<TEntity> {
+            /**
+             * A custom function that populates aggregation.rendered.
+             * This is called when a particular aggregation has been fully calculated, and we want to render the value.
+             *
+             * With the native aggregation options we just concatenate aggregation.label and aggregation.value,
+             * but if you wanted to apply a filter or otherwise manipulate the label or the value,
+             * you can do so with this function.
+             *
+             * This function will be called after the the default finalizerFn.  Defaults to undefined
+             * @default undefined
+             * @param {IGridTreeBaseAggregationObject} aggregation Aggregation object
+             */
+            customTreeAggregationFinalizerFn?: (aggregation: IGridTreeBaseAggregationObject) => void;
+            /**
+             * A custom function that aggregates rows into some form of total.
+             * Aggregations run row-by-row, the function needs to be capable of creating a running total.
+             *
+             * The function will be provided the aggregation item (in which you can store running totals),
+             * the row value that is to be aggregated,
+             * and that same row value converted to a number (most aggregations work on numbers)
+             * @param {IGridTreeBaseAggregationObject} aggregation
+             * @param {any} fieldValue Value of the field
+             * @param {number} numValue Numeric value of the field
+             * @param {IGridRow} row Row objet
+             */
+            customTreeAggregationFn?: (aggregation: IGridTreeBaseAggregationObject, fieldValue: any, numValue: number,
+                row: IGridRowOf<TEntity>) => void;
+            /**
+             * A custom label to use for this aggregation.  If providedm, we don't use native i18n
+             */
+            treeAggregationLabel?: string;
+            /**
+             * Use one of the native or grid-level aggregation methods for calculating aggregations on this column.
+             * Native method are in the constants file and include: SUM, COUNT, MIN, MAX, AVG.
+             * This may also be the name of an aggregation function defined with treeCustomAggregations.
+             *
+             * If you are using aggregations you should either:
+             * * also use grouping, in which case the aggregations are displayed in the group header, OR
+             * * use treeView, in which case you can set `treeAggregationUpdateEntity: true` in the colDef, and
+             * treeBase
+             *   will store the aggregation information in the entity, or you can set `treeAggregationUpdateEntity:
+             * false` in the colDef, and you need to manual retrieve the calculated aggregations from the
+             * row.treeNode.aggregations
+             *
+             * Takes precedence over a treeAggregationFn, the two options should not be used together.
+             * Defaults to undefined.
+             * @default undefined
+             */
+            treeAggregationType?: string;
+            /**
+             * Store calculated aggregations into the entity,
+             * allowing them to be displayed in the grid using a standard cellTemplate.
+             * This defaults to true.
+             * If you are using grouping then you shouldn't set it to false, as then the aggregations won't display.
+             *
+             * If you are using treeView in most cases you'll want to set this to true.
+             * This will result in getCellValue returning the aggregation rather than whatever was stored in the cell
+             * attribute on the entity.
+             *
+             * If you want to render the underlying entity value (and do something else with the aggregation),
+             * then you could use a custom cellTemplate to display row.entity.myAttribute, rather than using
+             * getCellValue.
+             *
+             * Defaults to true
+             * @default true
+             */
+            treeAggregationUpdateEntity?: boolean;
+        }
+
+        /**
+         * Tree Base Grid Options
+         */
+        export interface IGridOptions<TEntity> {
+            /**
+             * If set to true, show the expand/collapse button even if there are no children of a node.
+             * You'd use this if you're planning to dynamically load the children
+             * Defaults to true, grouping overrides to false
+             * @default true
+             */
+            showTreeExpandNoChildren?: boolean;
+            /**
+             * If set to false, don't create the row header. Youll need to programatically control the expand states
+             * Defaults to true
+             * @default true
+             */
+            showTreeRowHeader?: boolean;
+            /**
+             * Define custom aggregation functions.
+             * The properties of this object will be aggregation types available for use on columnDef
+             * with treeAggregationType or through the column menu.
+             *
+             * If a function defined here uses the same name as one of the native aggregations,
+             * this one will take precedence
+             *
+             * The finalizerFn may be used to manipulate the value before rendering, or to apply a custom rendered
+             * value. If aggregation.rendered is left undefined, the value will be rendered. Note that the native
+             * aggregation functions use an finalizerFn to concatenate the label and the value.
+             *
+             * Defaults to {}
+             * @default {}
+             */
+            treeCustomAggregations?: { [index: string]: IGridTreeBaseCustomAggregation<TEntity>; };
+            /**
+             * Number of pixels of indent for the icon at each tree level, wider indents are visually more pleasing,
+             * but will make the tree row header wider
+             * Defaults to 10
+             *
+             * @default 10
+             */
+            treeIndent?: number;
+            /**
+             * If set to true, row header even if there are no tree nodes
+             */
+            treeRowHeaderAlwaysVisible?: boolean;
+            /**
+             * Base width of the tree header, provides for a single level of tree.
+             * This is incremented by treeIndent for each extra level
+             * Defaults to 30
+             *
+             * @default 30
+             */
+            treeRowHeaderBaseWidth?: number;
+        }
+
+        export interface IGridTreeBaseCustomAggregation<TEntity> {
+            label: string;
+            aggregationFn: (aggregation: IGridTreeBaseAggregationObject, fieldValue: any, numValue: number,
+                row?: IGridRowOf<TEntity>) => void;
+            finalizerFn?: (aggregation: IGridTreeBaseAggregationObject) => void;
+        }
+        export interface IGridTreeBaseAggregationObject {
+            count: number;
+            sum: number;
+            value: number;
+            rendered?: string;
+        }
+
+        export interface IGridTreeBaseApi<TEntity> {
+            // Methods
+            /**
+             * Collapse all tree rows
+             */
+            collapseAllRows(): void;
+            /**
+             * collapse the specified row. When you expand the row again, all grandchildren will retain their state
+             * @param {IGridRow} row The row to collapse
+             */
+            collapseRow(row: IGridRowOf<TEntity>): void;
+            /**
+             * collapse all children of the specified row. When you expand the row again, all grandchildren will be
+             * collapsed
+             * @param {IGridRow} row The row to collapse children of
+             */
+            collapseRowChildren(row: IGridRowOf<TEntity>): void;
+            /**
+             * Expands all tree rows
+             */
+            expandAllRows(): void;
+            /**
+             * Expand the immediate children of the specified row
+             * @param {IGridRow} row The row to expand
+             */
+            expandRow(row: IGridRowOf<TEntity>): void;
+            /**
+             * Get the children of the specified row
+             * @param {IGridRow} row The row you want the children of
+             * @returns Array<IGridRow> Array of children rows
+             */
+            getRowChildren(row: IGridRowOf<TEntity>): Array<IGridRowOf<TEntity>>;
+            /**
+             * Get the tree state for this grid, used by the saveState feature Returned treeState as an object
+             * ```{ expandedState: { uid: 'expanded', uid: 'collapsed' } }```
+             * where expandedState is a hash of row uid and the current expanded state
+             * @returns {ITreeState} tree state
+             * NOTE this is an incomplete feature in uiGrid
+             */
+            getTreeState(): ITreeState;
+            /**
+             * Set the expanded states of the tree
+             * @param {ITreeState} config The config you want to apply, in the format provided by getTreeState
+             */
+            setTreeState(config: ITreeState): void;
+            /**
+             * call expand if row is collapsed, and collapse if it is expanded
+             * @param {IGridRow} row The row to toggle
+             */
+            toggleRowTreeState(row: IGridRowOf<TEntity>): void;
+
+            // Events
+            on: {
+                /**
+                 * Raised when a row is collapsed.  Doesn't really have a purpose at the moment.  Included for symmetry
+                 * @param {ng.IScope} scope Grid scope
+                 * @param {rowCollapsedHandler} handler Callback
+                 */
+                rowCollapsed: (scope: ng.IScope, handler: rowCollapsedHandler<TEntity>) => void;
+                /**
+                 * Raised whenever a row is expanded.
+                 *
+                 * If you are dynamically rendering your tree,
+                 * in your callback you can retrieve the children of this row and load them into the grid data.
+                 *
+                 * When the data is loaded, the grid will automatically refresh to show these new rows.
+                 * @param {ng.IScope} scope Grid Scope
+                 * @param {rowExpandedHandler} handler Callback
+                 */
+                rowExpanded: (scope: ng.IScope, handler: rowExpandedHandler<TEntity>) => void;
+            };
+        }
+
+        export interface ITreeState {
+            expandedState: {
+                [index: string]: string
+            };
+        }
+
+        export interface rowCollapsedHandler<TEntity> {
+            /**
+             * Row Collapsed callback
+             * @param {IGridRow} row The row that was collapsed.  You can also retrieve the grid from this row with
+             * row.grid
+             */
+            (row: IGridRowOf<TEntity>): void;
+        }
+
+        export interface rowExpandedHandler<TEntity> {
+            /**
+             * Row Expanded callback
+             * @param {IGridRow} row The row that was expanded.  You can also retrieve the grid from this row with
+             * row.grid
+             */
+            (row: IGridRowOf<TEntity>): void;
+        }
+
+        /**
+         * Constants available in treeBase module.
+         *
+         * These constants are manually copied into grouping and treeView,
+         * as I haven't found a way to simply include them,
+         * and it's not worth investing time in for something that changes very infrequently.
+         */
+        export interface IUiGridTreeBaseConstants extends ISharedTreeConstants {
+            featureName: string;
+        }
+    }
+
+    export module treeView {
+        /**
+         * GridOptions for treeView feature, these are available to be set using the ui-grid gridOptions
+         *
+         * Many tree options are set on treeBase, make sure to look at that feature in conjunction with these options
+         */
+        export interface IGridOptions {
+            /**
+             * Enable row tree view for entire grid.
+             * Defaults to true
+             * @default true
+             */
+            enableTreeView?: boolean;
+        }
+
+        export interface IUiGridTreeViewConstants extends ISharedTreeConstants {
+            featureName: string;
+        }
+    }
+
+    export interface ISharedTreeConstants {
+        rowHeaderColName: string;
+        EXPANDED: string;
+        COLLAPSED: string;
+        aggregation: {
+            COUNT: string;
+            SUM: string;
+            MAX: string;
+            MIN: string;
+            AVG: string;
+        };
+    }
+
+    // Tree View
+
+    export interface IGridApiConstructor<TEntity> {
+        new (grid: IGridInstanceOf<TEntity>): IGridApiOf<TEntity>;
+    }
+    export type IGridApi = IGridApiOf<any>;
+    export interface IGridApiOf<TEntity> {
+        /**
+         * Registers a new event for the given feature. The event will get a .raise and .on prepended to it
+         *
+         * .raise.eventName() - takes no arguments
+         *
+         * .on.eventName(scope, callBackFn, _this)
+         * scope - a scope reference to add a deregister call to the scopes .$on('destroy').
+         * Scope is optional and can be a null value, but in this case you must deregister it yourself via the returned
+         * deregister function
+         * callBackFn - The function to call
+         * _this - optional this context variable for callbackFn. If omitted, grid.api will be used for the context
+         *
+         * .on.eventName returns a dereg function that will remove the listener. It's not necessary to use it as the
+         * listener will be removed when the scope is destroyed.
+         * @param featureName name of the feature that raises the event
+         * @param eventName name of the event
+         */
+        registerEvent(featureName: string, eventName: string): void;
+        /**
+         * Registers features and events from a simple objectMap.
+         * eventObjectMap must be in this format (multiple features allowed)
+         * @param eventObjectMap map of feature/event names
+         */
+        registerEventsFromObject(eventObjectMap: any): void;
+        /**
+         * Registers a new event for the given feature
+         * @param featureName name of the feature
+         * @param methodName name of the method
+         * @param callBackFn function to execute
+         * @param _this binds to callBackFn. Defaults to gridApi.grid
+         */
+        registerMethod(featureName: string, methodName: string, callBackFn: Function, _this: any): void;
+        /**
+         * Registers features and methods from a simple objectMap.
+         * eventObjectMap must be in this format (multiple features allowed)
+         * {featureName: { methodNameOne:function(args){}, methodNameTwo:function(args){} }
+         * @param eventObjectMap map of feature/event names
+         * @param _this binds this to _this for all functions. Defaults to gridApi.grid
+         */
+        registerMethodsFromObject(eventObjectMap: any, _this: any): void;
+        /**
+         * Used to execute a function while disabling the specified event listeners.
+         * Disables the listenerFunctions, executes the callbackFn, and then enables the listenerFunctions again
+         * @param listenerFuncs listenerFunc or array of listenerFuncs to suppress.
+         *                      These must be the same functions that were used in the .on.eventName method
+         * @param callBackFn function to execute
+         */
+        suppressEvents(listenerFuncs: Function | Array<Function>, callBackFn: Function): void;
+
+        /**
+         * Core Api
+         */
+        core: IGridCoreApi<TEntity>;
+
+        /**
+         * Cell Nav Api
+         */
+        cellNav: cellNav.ICellNavApi<TEntity>;
+
+        /**
+         * Move Columns Api
+         */
+        colMovable: moveColumns.IGridMoveColumnsApi;
+
+        /**
+         * Grid row resizable Api
+         */
+        colResizable: resizeColumns.IGridResizeColumnsApi;
+
+        /**
+         * Edit Api
+         */
+        edit: edit.IGridEditApi<TEntity>;
+
+        /**
+         * Expandable Api
+         */
+        expandable: expandable.IGridExpandableApi<TEntity>;
+
+        /**
+         * Exporter Api
+         */
+        exporter: exporter.IGridExporterApi;
+
+        /**
+         * Grouping Api
+         */
+        grouping: grouping.IGridGroupingApi<TEntity>;
+
+        /**
+         * Importer Api
+         */
+        importer: importer.IGridImporterApi;
+
+        /**
+         * Infinite Scroll Api
+         */
+        infiniteScroll: infiniteScroll.IGridInfiniteScrollApi<TEntity>;
+
+        /**
+         * Pagination Api
+         */
+        pagination: pagination.IGridPaginationApi;
+
+        /**
+         * Pinning Api
+         */
+        pinning: pinning.IGridPinningApi<TEntity>;
+
+        /**
+         * Grid Row Edit Api
+         */
+        rowEdit: rowEdit.IGridRowEditApi<TEntity>;
+
+        /**
+         * Grid Save State Api
+         */
+        saveState: saveState.IGridSaveStateApi;
+        /**
+         * Selection Api
+         */
+        selection: selection.IGridSelectionApi<TEntity>;
+
+        /**
+         * Tree Base Api
+         */
+        treeBase: treeBase.IGridTreeBaseApi<TEntity>;
+
+        /**
+         * A grid instance is made available in the gridApi.
+         */
+        grid: IGridInstanceOf<TEntity>;
+    }
+    export interface IGridRowConstructor<TEntity> {
+        /**
+         * GridRow is the viewModel for one logical row on the grid.
+         * A grid Row is not necessarily a one-to-one relation to gridOptions.data.
+         * @param entity the array item from GridOptions.data
+         * @param index the current position of the row in the array
+         * @param reference to the parent grid
+         */
+        new(entity: TEntity, index: number, reference: IGridInstanceOf<TEntity>): IGridRowOf<TEntity>;
+    }
+    export type IGridRow = IGridRowOf<any>;
+    export interface IGridRowOf<TEntity> extends cellNav.IGridRow, edit.IGridRow, exporter.IGridRow,
+        selection.IGridRow, expandable.IGridRow {
+        /** A reference to an item in gridOptions.data[] */
+        entity: TEntity;
+        /** A reference back to the grid */
+        grid: IGridInstanceOf<TEntity>;
+        /**
+         * height of each individual row. changing the height will flag all
+         * row renderContainers to recalculate their canvas height
+         */
+        height: number;
+        /** uniqueId of row */
+        uid: string;
+        /** if true, row will be rendered */
+        visible: boolean;
+        // Additional features enabled by other modules
+        /**
+         * If set to false, then don't export this row,
+         * notwithstanding visible or other settings
+         * Defaults to true
+         * @default true
+         */
+        exporterEnableExporting: boolean;
+        /**
+         * Clears an override on the row that forces it to always be invisible.
+         * Emits the rowsVisibleChanged event if it changed the row visibility.
+         *
+         * This method can be called from the api, passing in the gridRow we want altered.
+         * It should really work by calling gridRow.clearRowInvisible,
+         * but that's not the way I coded it, and too late to change now.
+         * Changed to just call the internal function row.clearThisRowInvisible().
+         * @param row the row we want to clear the invisible flag
+         */
+        clearRowInvisible(row: IGridRowOf<TEntity>): void;
+        /**
+         * Clears any override on the row visibility, returning it to normal visibility calculations.
+         * Emits the rowsVisibleChanged event
+         * @param reason the reason (usually the module) for the row to be invisible. E.g. grouping, user, filter
+         * @param fromRowsProcessor whether we were called from a rowsProcessor, passed through to evaluateRowVisibility
+         */
+        clearRowInvisible(reason: string, fromRowsProcessor: boolean): void;
+        /**
+         * Determines whether the row should be visible based on invisibleReason,
+         * and if it changes the row visibility, then emits the rowsVisibleChanged event.
+         * Queues a grid refresh, but doesn't call it directly to avoid hitting lots of
+         * grid refreshes.
+         */
+        evaluateRowVisibility(fromRowProcessor: boolean): void;
+        /**
+         * returns the qualified field name minus the row path ie: entity.fieldA
+         * @param col column instance
+         * @returns resulting name that can be evaluated against a row
+         */
+        getEntityQualifiedColField(col: IGridColumnOf<TEntity>): string;
+        /**
+         * returns the qualified field name as it exists on scope ie: row.entity.fieldA
+         * @param col column instance
+         * @returns resulting name that can be evaluated on scope
+         */
+        getQualifiedColField(col: IGridColumnOf<TEntity>): string;
+        /**
+         * Sets an override on the row that forces it to always be invisible.
+         * Emits the rowsVisibleChanged event if it changed the row visibility.
+         * This method can be called from the api, passing in the gridRow we want altered.
+         * It should really work by calling gridRow.setRowInvisible,
+         * but that's not the way I coded it, and too late to change now.
+         * Changed to just call the internal function row.setThisRowInvisible().
+         * @param row the row we want to set to invisible
+         */
+        setRowInvisible(row: IGridRowOf<TEntity>): void;
+        /**
+         * Sets an override on the row that forces it to always be invisible.
+         * Emits the rowsVisibleChanged event if it changed the row visibility
+         * @param reason the reason (usually the module) for the row to be invisible. E.g. grouping, user, filter
+         * @param fromRowsProcessor whether we were called from a rowsProcessor, passed through to evaluateRowVisibility
+         */
+        setThisRowInvisible(reason: string, fromRowsProcessor: boolean): void;
+    }
+
+    export interface IGridColumnConstructor<TEntity> {
+        /**
+         * Represents the viewModel for each column.
+         * Any state or methods needed for a Grid Column are defined on this prototype
+         * @param gridCol Column definition
+         * @param index the current position of the column in the array
+         * @param grid reference to the grid
+         */
+        new(gridCol: IColumnDefOf<TEntity>, index: number, grid: IGridInstanceOf<TEntity>): IGridColumnOf<TEntity>;
+    }
+
+    export type IGridColumn = IGridColumnOf<any>;
+    export interface IGridColumnOf<TEntity> {
+        /** Column definition */
+        colDef: uiGrid.IColumnDefOf<TEntity>;
+        /**
+         * Column name that will be shown in the header.
+         * If displayName is not provided then one is generated using the name.
+         */
+        displayName?: string;
+        /**
+         * field must be provided if you wish to bind to a property in the data source.
+         * Should be an angular expression that evaluates against grid.options.data array element.
+         * Can be a complex expression: employee.address.city, or can be a function: employee.getFullAddress().
+         * See the angular docs on binding expressions.
+         */
+        field?: string;
+        /** Filter on this column */
+        filter?: IFilterOptions;
+        /** Filters for this column. Includes 'term' property bound to filter input elements */
+        filters?: Array<IFilterOptions>;
+        /** Reference to grid containing the column */
+        grid: IGridInstanceOf<TEntity>;
+        name?: string;
+        /** Sort on this column */
+        sort?: ISortInfo;
+        /** Algorithm to use for sorting this column. Takes 'a' and 'b' parameters like any normal sorting function. */
+        sortingAlgorithm?: (a: any, b: any) => number;
+        /** Column width */
+        width: number;
+        /**
+         * Initializes a column
+         * @param colDef the column def to associate with this column
+         * @param uid The unique and immutable uid we'd like to allocate to this column
+         * @param grid the grid we'd like to create this column in
+         */
+        GridColumn(colDef: IColumnDefOf<TEntity>, uid: number, grid: IGridInstanceOf<TEntity>): void;
+        /**
+         * Gets the aggregation label from colDef.aggregationLabel if specified or by using i18n,
+         * including deciding whether or not to display based on colDef.aggregationHideLabel.
+         * @param label the i18n lookup value to use for the column label
+         */
+        getAggregationText(label: string): void;
+        /**
+         * gets the aggregation value based on the aggregation type for this column.
+         * Debounced using scrollDebounce option setting
+         */
+        getAggregationValue(): string;
+        /**
+         * Returns the class name for the column
+         * @param prefixDot if true, will return .className instead of className
+         */
+        getColClass(prefixDot: boolean): string;
+        /** Returns the class definition for th column */
+        getColClassDefinition(): string;
+        /**
+         * Returns the render container object that this column belongs to.
+         * Columns will be default be in the body render container
+         * if they aren't allocated to one specifically.
+         */
+        getRenderContainer(): any; // @todo replace with interface for render container
+        /** Hides the column by setting colDef.visible = false */
+        hideColumn(): void;
+        /** Returns true if column is in the left render container */
+        isPinnedLeft(): boolean;
+        /** Returns true if column is in the right render container */
+        isPinnedRight(): boolean;
+        /**
+         * Sets a property on the column using the passed in columnDef,
+         * and setting the defaultValue if the value cannot be found on the colDef
+         * @param colDef the column def to look in for the property value
+         * @param propName the property name we'd like to set
+         * @param defaultValue the value to use if the colDef doesn't provide the setting
+         */
+        setPropertyOrDefault(colDef: IColumnDefOf<TEntity>, propName: string, defaultValue: any): void;
+        /** Makes the column visible by setting colDef.visible = true */
+        showColumn(): void;
+        /**
+         * Moves settings from the columnDef down onto the column, and sets properties as appropriate
+         * @param colDef the column def to look in for property value
+         * @param isNew whether the column is being newly created, if not we're updating an existing
+         *              column, and some items such as the sort shouldn't be copied down
+         */
+        updateColumnDef(colDef: IColumnDefOf<TEntity>, isNew: boolean): void;
+    }
+
+    /**
+     * Definition / configuration of an individual column,
+     * which would typically be one of many column definitions within the
+     * gridOptions.columnDefs array
+     */
+    export type IColumnDef = IColumnDefOf<any>;
+    export interface IColumnDefOf<TEntity> extends cellNav.IColumnDef, edit.IColumnDef<TEntity>, exporter.IColumnDef,
+        grouping.IColumnDef, moveColumns.IColumnDef, pinning.IColumnDef, resizeColumns.IColumnDef,
+        treeBase.IColumnDef<TEntity> {
+        /**
+         * defaults to false
+         * if set to true hides the label text in the aggregation footer, so only the value is displayed.
+         */
+        aggregationHideLabel?: boolean;
+        /**
+         * The aggregation that you'd like to show in the columnFooter for this column.
+         * Valid values are in uiGridConstants, and currently include:
+         * uiGridConstants.aggregationTypes.count, uiGridConstants.aggregationTypes.sum,
+         * uiGridConstants.aggregationTypes.avg, uiGridConstants.aggregationTypes.min,
+         * uiGridConstants.aggregationTypes.max.
+         *
+         * You can also provide a function as the aggregation type,
+         * in this case your function needs to accept the full set of visible rows,
+         * and return a value that should be shown
+         */
+        aggregationType?: number | Function;
+        /**
+         * cellClass can be a string specifying the class to append to a cell
+         * or it can be a function(row,rowRenderIndex, col, colRenderIndex)
+         * that returns a class name
+         */
+        cellClass?: string | ICellClassGetter<TEntity>;
+        /** cellFilter is a filter to apply to the content of each cell */
+        cellFilter?: string;
+        /**
+         * a custom template for each cell in this column.
+         * The default is ui-grid/uiGridCell.
+         * If you are using the cellNav feature,
+         * this template must contain a div that can receive focus.
+         */
+        cellTemplate?: string;
+        /**
+         * Whether or not to show a tooltip when a user hovers over the cell.
+         * If set to false, no tooltip.
+         * If true, the cell value is shown in the tooltip (useful if you have long values in your cells),
+         * if a function then that function is called passing in the row and the col cellTooltip(row, col)
+         * and the return value is shown in the tooltip,
+         * if it is a static string then displays that static string.
+         * Defaults to false
+         * @default false
+         */
+        cellTooltip?: boolean | string | ICellTooltipGetter<TEntity>;
+        /**
+         * Column name that will be shown in the header.
+         * If displayName is not provided then one is generated using the name.
+         */
+        displayName?: string;
+        /**
+         * if column menus are enabled, controls the column menus for this specific column
+         * (i.e. if gridOptions.enableColumnMenus, then you can control column menus using this option.
+         * If gridOptions.enableColumnMenus === false then you get no column menus irrespective of the value of this
+         * option
+         * ). Defaults to true.
+         * @default true
+         */
+        enableColumnMenu?: boolean;
+        /**
+         * Override for column menus everywhere - if set to false then you get no column menus.
+         * Defaults to true
+         * @default true
+         */
+        enableColumnMenus?: boolean;
+        /** turn off filtering for an individual column, where you've turned on filtering for the overall grid */
+        enableFiltering?: boolean;
+        /**
+         * When set to false, this setting prevents a user from hiding the column using the column menu or the grid
+         * menu.
+         * @default true
+         */
+        enableHiding?: boolean;
+        /**
+         * When enabled, this setting adds sort widgets to the column header, allowing sorting of the data in the
+         * individual column.
+         * @default true
+         */
+        enableSorting?: boolean;
+        /**
+         * field must be provided if you wish to bind to a property in the data source.
+         * Should be an angular expression that evaluates against grid.options.data array element
+         * Can be a complex expression: employee.address.city, or can be a function: employee.getFullAddress().
+         * See the angular docs on binding expressions.
+         */
+        field?: string;
+        /**
+         * Specify a single filter field on this column.
+         * A filter consists of a condition, a term, and a placeholder:
+         */
+        filter?: IFilterOptions;
+        /**
+         * @default false
+         * When true uiGrid will apply the cellFilter before applying search filters
+         */
+        filterCellFiltered?: boolean;
+        /**
+         * a custom template for the filter input. The default is ui-grid/ui-grid-filter
+         */
+        filterHeaderTemplate?: string;
+        /** Specify multiple filter fields */
+        filters?: Array<IFilterOptions>;
+        /**
+         * footerCellClass can be a string specifying the class to append to a cell or it can be
+         * a function(row,rowRenderIndex, col, colRenderIndex) that returns a class name
+         */
+        footerCellClass?: string | IHeaderFooterCellClassGetter<TEntity>;
+        /** footerCellFilter is a filter to apply to the content of the column footer */
+        footerCellFilter?: string;
+        /** a custom template for the footer for this column. The default is ui-grid/uiGridFooterCell */
+        footerCellTemplate?: string;
+        /**
+         * headerCellClass can be a string specifying the class to append to a cell or it can be
+         * a function(row,rowRenderIndex, col, colRenderIndex) that returns a class name
+         */
+        headerCellClass?: string | IHeaderFooterCellClassGetter<TEntity>;
+        /** headerCellFilter is a filter to apply to the content of the column header */
+        headerCellFilter?: string;
+        /** a custom template for the header for this column. The default is ui-grid/uiGridHeaderCell */
+        headerCellTemplate?: string;
+        /**
+         * Whether or not to show a tooltip when a user hovers over the header cell.
+         * If set to false, no tooltip.
+         * If true, the displayName is shown in the tooltip
+         * (useful if you have long values in your headers),
+         * if a function then that function is called passing in the row and the col
+         * headerTooltip( col ), and the return value is shown in the tooltip,
+         * if a static string then shows that static string.
+         * @default false
+         */
+        headerTooltip?: boolean | string | IHeaderTooltipGetter<TEntity>;
+        /** sets the maximum column width */
+        maxWidth?: number;
+        /** used to add menu items to a column. Refer to the tutorial on this functionality */
+        menuItems?: Array<IMenuItem>;
+        /** Sets the minimum column width */
+        minWidth?: number;
+        /**
+         * (mandatory) each column should have a name,
+         * although for backward compatibility with 2.x name can be omitted if field is present
+         */
+        name?: string;
+        /** An object of sort information */
+        sort?: ISortInfo;
+        /**
+         * @default false
+         * When true uiGrid will apply the cellFilter before sorting the data
+         * Note that when using this option uiGrid will assume that the displayed value is a string,
+         * and use the sortAlpha sortFn.
+         * It is possible to return a non-string value from an angularjs filter,
+         * in which case you should define a sortingAlgorithm for the column
+         * which handles the returned type.
+         * You may specify one of the sortingAlgorithms found in the rowSorter service.
+         */
+        sortCellFiltered?: boolean;
+        /**
+         *(optional) An array of sort directions, specifying the order that they should cycle through as
+         * the user repeatedly clicks on the column heading. The default is [null, uiGridConstants.ASC, uiGridConstants.DESC].
+         * Null refers to the unsorted state. This does not affect the initial sort direction; use the sort property for that.
+         * If suppressRemoveSort is also set, the unsorted state will be skipped even if it is listed here. Each direction may
+         * not appear in the list more than once (e.g. [ASC, DESC, DESC] is not allowed), and the list may not be empty.*
+         */
+        sortDirectionCycle?: Array<IUiGridConstants>;
+        /** Algorithm to use for sorting this column */
+        sortingAlgorithm?: (a: any, b: any) => number;
+        /**
+         * When enabled, this setting hides the removeSort option in the menu,
+         * and prevents users from manually removing the sort
+         * @default false
+         */
+        suppressRemoveSort?: boolean;
+        /**
+         * the type of the column, used in sorting. If not provided then the grid will guess the type.
+         * Add this only if the grid guessing is not to your satisfaction.
+         * Note that if you choose date, your dates should be in a javascript date type
+         * One of:
+         * 'string', 'boolean', 'number', 'date', 'object', 'numberStr'
+         */
+        type?: string;
+        /**
+         * sets whether or not the column is visible
+         * @default true
+         */
+        visible?: boolean;
+        /**
+         * sets the column width.  Can be either a number or a percentage, or an * for auto.
+         */
+        width?: number | string;
+    }
+
+    export interface ICellClassGetter<TEntity> {
+        (grid?: IGridInstanceOf<TEntity>, gridRow?: IGridRowOf<TEntity>, gridCol?: IGridColumnOf<TEntity>, rowRenderIndex?: number, colRenderIndex?: number): string;
+    }
+
+    export interface ICellTooltipGetter<TEntity> {
+        (gridRow: IGridRowOf<TEntity>, gridCol: IGridColumnOf<TEntity>): string;
+    }
+    export interface IHeaderTooltipGetter<TEntity> {
+        (gridCol: IGridColumnOf<TEntity>): string;
+    }
+    export interface IHeaderFooterCellClassGetter<TEntity> {
+        (grid: IGridInstanceOf<TEntity>, gridRow: IGridRowOf<TEntity>, gridCol: IGridColumnOf<TEntity>, rowRenderIndex: number, colRenderIndex: number)
+            : string;
+    }
+    export interface IMenuItem {
+        /** controls the title that is displayed in the menu */
+        title?: string;
+        /** the icon shown alongside that title */
+        icon?: string;
+        /** the method to call when the menu is clicked */
+        action?: ($event: ng.IAngularEvent) => void;
+        /** a function to evaluate to determine whether or not to show the item */
+        shown?: () => boolean;
+        /** a function to evaluate to determine whether or not the item is currently selected */
+        active?: () => boolean;
+        /** context to pass to the action function, available in this.context in your handler */
+        context?: any;
+        /** if set to true, the menu should stay open after the action, defaults to false */
+        leaveOpen?: boolean;
+    }
+    export interface ISortInfo {
+        direction?: string;
+        ignoreSort?: boolean;
+        priority?: number;
+    }
+
+    export interface IFilterOptions {
+        /**
+         * condition defines how rows are chosen as matching the filter term.
+         * This can be set to one of the constants in uiGridConstants.filter,
+         * or you can supply a custom filter function that gets passed the
+         * following arguments: [searchTerm, cellValue, row, column].
+         */
+        condition?: number | ((searchTerm: string, cellValue: any, row: IGridRow, column: IGridColumn) => boolean);
+        /**
+         * If set, the filter field will be pre-populated with this value
+         */
+        term?: string;
+        /** String that will be set to the <input>.placeholder attribute */
+        placeholder?: string;
+        /**
+         * set this to true if you have defined a custom function in condition,
+         * and your custom function doesn't require a term
+         * (so it can run even when the term is null)
+         */
+        noTerm?: boolean;
+        /**
+         * only flag currently available is caseSensitive, set to false if you don't want case sensitive matching
+         */
+        flags?: IFilterFlags;
+        /**
+         * defaults to uiGridConstants.filter.INPUT, which gives a text box. If set to uiGridConstants.filter.SELECT
+         * then a select box will be shown with options selectOptions
+         */
+        type?: number | string;
+        /**
+         * options in the format [{ value: 1, label: 'male' }]. No i18n filter is provided, you need to perform the i18n
+         * on the values before you provide them
+         */
+        selectOptions?: Array<ISelectOption>;
+        /**
+         * If set to true then the 'x' button that cancels/clears the filter will not be shown.
+         * @default false
+         */
+        disableCancelButton?: boolean;
+    }
+    export interface ISelectOption {
+        value: number | string;
+        label: string;
+    }
+
+    export interface IFilterFlags {
+        caseSensitive?: boolean;
+    }
+}
diff --git a/ui-grid/tsconfig.json b/ui-grid/tsconfig.json
new file mode 100644
index 0000000000..2ae0a3b955
--- /dev/null
+++ b/ui-grid/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ui-grid-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ui-grid/ui-grid-tests.ts b/ui-grid/ui-grid-tests.ts
index a4ff0ed006..4e4b56064d 100644
--- a/ui-grid/ui-grid-tests.ts
+++ b/ui-grid/ui-grid-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="ui-grid.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
+import uiGrid = require("ui-grid");
+/// <reference types="angularjs" />
 
 interface IMyEntity {
     name: string;
diff --git a/ui-grid/ui-grid.d.ts b/ui-grid/ui-grid.d.ts
deleted file mode 100644
index 7855c5e060..0000000000
--- a/ui-grid/ui-grid.d.ts
+++ /dev/null
@@ -1,3892 +0,0 @@
-// Type definitions for ui-grid
-// Project: http://www.ui-grid.info/
-// Definitions by: Ben Tesser <https://github.com/btesser>, Joe Skeen <http://github.com/joeskeen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// These are very definitely preliminary. Please feel free to improve.
-
-// Changelog:
-// 8/11/2015 ui-grid  v3.0.3
-//   Extensive plugin support added (Plugin specific API, ColumnDef, GridOptions, GridRow, Constants).
-//   Added docs for all existing interfaces.
-//   Fixed a few incorrect interfaces, updated interfaces to reflect latest version.
-//   Did some cleanup... Moved all plugins into their own modules
-// 7/8/2015 ui-grid v3.0.0-rc.22-482dc67
-//   Added primary interfaces for row, column, api, grid, columnDef, and gridOptions.  Needs more tests!
-/// <reference path='../jquery/jquery.d.ts' />
-/// <reference path='../angularjs/angular.d.ts' />
-
-declare namespace uiGrid {
-    export interface IUiGridConstants {
-        LOG_DEBUG_MESSAGES: boolean;
-        LOG_WARN_MESSAGES: boolean;
-        LOG_ERROR_MESSAGES: boolean;
-        CUSTOM_FILTERS: RegExp;
-        COL_FIELD: RegExp;
-        MODEL_COL_FIELD: RegExp;
-        TOOLTIP: RegExp;
-        DISPLAY_CELL_TEMPLATE: RegExp;
-        TEMPLATE_REGEXP: RegExp;
-        FUNC_REGEXP: RegExp;
-        DOT_REGEXP: RegExp;
-        APOS_REGEXP: RegExp;
-        BRACKET_REGEXP: RegExp;
-        COL_CLASS_PREFIX: string;
-        events: {
-            GRID_SCROLL: string;
-            COLUMN_MENU_SHOWN: string;
-            ITEM_DRAGGING: string;
-            COLUMN_HEADER_CLICK: string;
-        };
-        keymap: {
-            TAB: number;
-            STRG: number;
-            CAPSLOCK: number;
-            CTRL: number;
-            CTRLRIGHT: number;
-            CTRLR: number;
-            SHIFT: number;
-            RETURN: number;
-            ENTER: number;
-            BACKSPACE: number;
-            BCKSP: number;
-            ALT: number;
-            ALTR: number;
-            ALTRIGHT: number;
-            SPACE: number;
-            WIN: number;
-            MAC: number;
-            FN: number;
-            PG_UP: number;
-            PG_DOWN: number;
-            UP: number;
-            DOWN: number;
-            LEFT: number;
-            RIGHT: number;
-            ESC: number;
-            DEL: number;
-            F1: number;
-            F2: number;
-            F3: number;
-            F4: number;
-            F5: number;
-            F6: number;
-            F7: number;
-            F8: number;
-            F9: number;
-            F10: number;
-            F11: number;
-            F12: number;
-        };
-        ASC: string;
-        DESC: string;
-        filter: {
-            STARTS_WITH: number;
-            ENDS_WITH: number;
-            EXACT: number;
-            CONTAINS: number;
-            GREATER_THAN: number;
-            GREATER_THAN_OR_EQUAL: number;
-            LESS_THAN: number;
-            LESS_THAN_OR_EQUAL: number;
-            NOT_EQUAL: number;
-            SELECT: string;
-            INPUT: string;
-        };
-        scrollDirection: {
-            UP: string;
-            DOWN: string;
-            LEFT: string;
-            RIGHT: string;
-            NONE: string;
-        };
-        aggregationTypes: {
-            sum: number;
-            count: number;
-            avg: number;
-            min: number;
-            max: number;
-        };
-        CURRENCY_SYMBOLS: Array<string>;
-        dataChange: {
-            ALL: string;
-            EDIT: string;
-            ROW: string;
-            COLUMN: string;
-            OPTIONS: string;
-        };
-        scrollbars: {
-            NEVER: number;
-            ALWAYS: number;
-        };
-    }
-    export type IGridInstance = IGridInstanceOf<any>;
-    export interface IGridInstanceOf<TEntity> {
-        /**
-         * adds a row header column to the grid
-         * @param {IColumnDef} colDef The column definition
-         */
-        addRowHeaderColumn(colDef: IColumnDefOf<TEntity>): void;
-        /**
-         * uses the first row of data to assign colDef.type for any types not defined.
-         */
-        assignTypes(): void;
-        /**
-         * Populates columnDefs from the provided data
-         * @param {IRowBuilder} rowBuilder function to be called
-         */
-        buildColumnDefsFromData(rowBuilder: IRowBuilder<TEntity>): void;
-        /**
-         * creates GridColumn objects from the columnDefinition.
-         * Calls each registered columnBuilder to further process the column
-         * @param {IBuildColumnsOptions} options An object containing options to use when building columns
-         *        * orderByColumnDefs: defaults to false.  When true, buildColumns will order existing columns
-         *        according to the order within the column definitions
-         * @returns {ng.IPromise} A promise to load any needed column resources
-         */
-        buildColumns(options: IBuildColumnsOptions): ng.IPromise<any>;
-        /**
-         * calls each styleComputation function
-         */
-        buildStyles(): void;
-        /**
-         * Calls the callbacks based on the type of data change that has occurred.
-         * Always calls the ALL callbacks, calls the ROW, EDIT, COLUMN and OPTIONS callbacks
-         * if the event type is matching, or if the type is ALL.
-         * @param {number} type the type of event that occurred - one of the uiGridConstants.dataChange values
-         *        (ALL, ROW, EDIT, COLUMN, OPTIONS
-         */
-        callDataChangeCallbacks(type: number): void;
-        /**
-         * Clears all filters and optionally refreshes the visible rows.
-         * @param {boolean} [refreshRows=true] Refresh the rows?
-         * @param {boolean} [clearConditions=true] Clear conditions?
-         * @param {boolean} [clearFlags=true] Clear flags?
-         * @returns {ng.IPromise<any>} If refreshRows is true, returns a promise of the rows refreshing
-         */
-        clearAllFilters(refreshRows: boolean, clearConditions: boolean,
-            clearFlags: boolean): ng.IPromise<any>;
-        /**
-         * refreshes the grid when a column refresh is notified, which triggers handling of the visible flag.
-         * This is called on uiGridConstants.dataChange.COLUMN, and is registered as a dataChangeCallback in grid.js
-         * @param {string} name column name
-         */
-        columnRefreshCallback(name: string): void;
-        /**
-         * creates the left render container if it doesn't already exist
-         */
-        createLeftContainer(): void;
-        /**
-         * creates the right render container if it doesn't already exist
-         */
-        createRightContainer(): void;
-        /**
-         * sets isScrollingHorizontally to true and sets it to false in a debounced function
-         */
-        flagScrollingHorizontally(): void;
-        /**
-         * sets isScrollingVertically to true and sets it to false in a debounced function
-         */
-        flagScrollingVertically(): void;
-        /**
-         * Gets the displayed value of a cell after applying any the cellFilter
-         * @param {IGridRow} row Row to access
-         * @param {IGridColumn} col Column to access
-         * @returns {string} Cell display value
-         */
-        getCellDisplayValue(row: IGridRowOf<TEntity>, col: IGridColumnOf<TEntity>): string;
-        /**
-         * Gets the displayed value of a cell
-         * @param {IGridRow} row Row to access
-         * @param {IGridColumn} col Column to access
-         * @returns {any} Cell value
-         */
-        getCellValue(row: IGridRowOf<TEntity>, col: IGridColumnOf<TEntity>): any;
-        /**
-         * returns a grid colDef for the column name
-         * @param {string} name Column name
-         * @returns {IColumnDef} The column definition
-         */
-        getColDef(name: string): IColumnDefOf<TEntity>;
-        /**
-         * returns a grid column by name
-         * @param {string} name Column name
-         * @returns {IGridColumn} The column
-         */
-        getColumn(name: string): IGridColumnOf<TEntity>;
-        /**
-         * Return the columns that the grid is currently being sorted by
-         * @returns {Array<IGridColumn>} the columns that the grid is currently being sorted by
-         */
-        getColumnSorting(): Array<IGridColumnOf<TEntity>>;
-        /**
-         * Returns the $parse-able accessor for a column within its $scope
-         * @param {IGridColumn} col Column object
-         * @returns {string} $parse-able accessor for a column within its $scope
-         */
-        getGridQualifiedColField(col: IGridColumnOf<TEntity>): string;
-        /**
-         * returns all columns except for rowHeader columns
-         * @returns {Array<IGridColumn>} All data columns
-         */
-        getOnlyDataColumns(): Array<IGridColumnOf<TEntity>>;
-        /**
-         * returns the GridRow that contains the rowEntity
-         * @param {TEntity} rowEntity the gridOptionms.data array element instance
-         * @param {Array<IGridRow>} rows The rows to look in.  if not provided then it looks in grid.rows
-         */
-        getRow(rowEntity: TEntity, rows?: Array<IGridRowOf<TEntity>>): IGridRowOf<TEntity>;
-        /**
-         * Triggered when the browser window resizes; automatically resizes the grid
-         * @param {ng.IAngularEvent} $event Resize event
-         */
-        handleWindowResize($event: ng.IAngularEvent): void;
-        /**
-         * returns true if leftContainer exists
-         * @returns {boolean} container exists?
-         */
-        hasLeftContainer(): boolean;
-        /**
-         * returns true if rightContainer exists
-         * @returns {boolean} container exists?
-         */
-        hasRightContainer(): boolean;
-        /**
-         * returns true if leftContainer has columns
-         * @returns {boolean} container has columns
-         */
-        hasLeftContainerColumns(): boolean;
-        /**
-         * returns true if rightContainer has columns
-         * @returns {boolean} container has columns
-         */
-        hasRightContainerColumns(): boolean;
-        /**
-         * Is grid right to left
-         * @returns {boolean} true if grid is RTL
-         */
-        isRTL(): boolean;
-        /**
-         * Checks if column is a row header
-         * @param {IGridColumn} column The column
-         * @returns {boolean} true if the column is a row header
-         */
-        isRowHeaderColumn(column: IGridColumnOf<TEntity>): boolean;
-        /**
-         * creates or removes GridRow objects from the newRawData array.  Calls each registered
-         * rowBuilder to further process the row
-         *
-         * This method aims to achieve three things:
-         * 1. the resulting rows array is in the same order as the newRawData, we'll call
-         * rowsProcessors immediately after to sort the data anyway
-         * 2. if we have row hashing available, we try to use the rowHash to find the row
-         * 3. no memory leaks - rows that are no longer in newRawData need to be garbage collected
-         *
-         * The basic logic flow makes use of the newRawData, oldRows and oldHash, and creates
-         * the newRows and newHash
-         *
-         * Rows are identified using the hashKey if configured.  If not configured, then rows
-         * are identified using the gridOptions.rowEquality function
-         * @param {Array<TEntity>} newRawData The new grid data
-         * @return {ng.IPromise<any>} Promise which resolves when the rows have been created or removed
-         */
-        modifyRows(newRawData: Array<TEntity>): ng.IPromise<any>;
-        /**
-         * Notify the grid that a data or config change has occurred,
-         * where that change isn't something the grid was otherwise noticing.  This
-         * might be particularly relevant where you've changed values within the data
-         * and you'd like cell classes to be re-evaluated, or changed config within
-         * the columnDef and you'd like headerCellClasses to be re-evaluated.
-         * @param {string} type one of the uiGridConstants.dataChange values [ALL, ROW, EDIT, COLUMN], which tells
-         * us which refreshes to fire
-         */
-        notifyDataChange(type: string): void;
-        /**
-         * precompiles all cell templates
-         */
-        precompileCellTemplates(): void;
-        /**
-         * processes all RowBuilders for the gridRow
-         * @param {IGridRow} gridRow reference to gridRow
-         * @returns {IGridRow} the gridRow with all additional behavior added
-         */
-        processRowBuilders(gridRow: IGridRowOf<TEntity>): IGridRowOf<TEntity>;
-        /**
-         * calls the row processors, specifically
-         * intended to reset the sorting when an edit is called,
-         * registered as a dataChangeCallback on uiGridConstants.dataChange.EDIT
-         * @param {string} name column name
-         */
-        processRowsCallback(name: string): void;
-        /**
-         * queues a grid refresh, a way of debouncing all the refreshes we might otherwise issue
-         */
-        queueGridRefresh(): void;
-        /**
-         * queues a grid refreshCanvas, a way of debouncing all the refreshes we might otherwise issue
-         */
-        queueRefresh(): void;
-        /**
-         * Redraw the rows and columns based on our current scroll position
-         * @param {boolean} [rowsAdded] Optional to indicate rows are added and the scroll percentage must be
-         *        recalculated
-         */
-        redrawCanvas(rowsAdded?: boolean): void;
-        /**
-         * Refresh the rendered grid on screen.
-         * The refresh method re-runs both the columnProcessors and the
-         * rowProcessors, as well as calling refreshCanvas to update all
-         * the grid sizing.  In general you should prefer to use queueGridRefresh
-         * instead, which is basically a debounced version of refresh.
-         *
-         * If you only want to resize the grid, not regenerate all the rows
-         * and columns, you should consider directly calling refreshCanvas instead.
-         * @param {boolean} rowsAltered Optional flag for refreshing when the number of rows has changed
-         */
-        refresh(rowsAltered?: boolean): void;
-        /**
-         * Builds all styles and recalculates much of the grid sizing
-         * @param {boolean} buildStyles optional parameter.  Use TBD
-         * @returns {ng.IPromise<any>} promise that is resolved when the canvas
-         *          has been refreshed
-         */
-        refreshCanvas(buildStyles?: boolean): ng.IPromise<any>;
-        /**
-         * Refresh the rendered rows on screen?  Note: not functional at present
-         * @returns {ng.IPromise<any>} promise that is resolved when render completes?
-         */
-        refreshRows(): ng.IPromise<any>;
-        /**
-         * When the build creates columns from column definitions, the columnbuilders will be called to add
-         * additional properties to the column.
-         * @param {IColumnBuilder} columnBuilder function to be called
-         */
-        registerColumnBuilder(columnBuilder: IColumnBuilder<TEntity>): void;
-        /**
-         * Register a "columns processor" function. When the columns are updated,
-         * the grid calls each registered "columns processor", which has a chance
-         * to alter the set of columns, as long as the count is not modified.
-         * @param {IColumnProcessor} columnProcessor column processor function, which
-         *        is run in the context of the grid (i.e. this for the function will be the grid), and
-         *        which must return an updated renderedColumnsToProcess which can be passed to the next processor
-         *        in the chain
-         * @param {number} priority the priority of this processor.  In general we try to do them in 100s to leave room
-         * for other people to inject columns processors at intermediate priorities.
-         * Lower priority columnsProcessors run earlier.priority
-         */
-        registerColumnsProcessor(columnProcessor: IColumnProcessor<TEntity>, priority: number): void;
-        /**
-         * When a data change occurs, the data change callbacks of the specified type
-         * will be called.  The rules are:
-         *
-         * - when the data watch fires, that is considered a ROW change (the data watch only notices
-         *   added or removed rows)
-         * - when the api is called to inform us of a change, the declared type of that change is used
-         * - when a cell edit completes, the EDIT callbacks are triggered
-         * - when the columnDef watch fires, the COLUMN callbacks are triggered
-         * - when the options watch fires, the OPTIONS callbacks are triggered
-         *
-         * For a given event:
-         * - ALL calls ROW, EDIT, COLUMN, OPTIONS and ALL callbacks
-         * - ROW calls ROW and ALL callbacks
-         * - EDIT calls EDIT and ALL callbacks
-         * - COLUMN calls COLUMN and ALL callbacks
-         * - OPTIONS calls OPTIONS and ALL callbacks
-         *
-         * @param {(grid: IGridInstance) => void} callback function to be called
-         * @param {Array<string>} types the types of data change you want to be informed of.  Values from
-         * the uiGridConstants.dataChange values ( ALL, EDIT, ROW, COLUMN, OPTIONS ).  Optional and defaults to
-         * ALL
-         * @returns {Function} deregister function - a function that can be called to deregister this callback
-         */
-        registerDataChangeCallback(callback: (grid: IGridInstanceOf<TEntity>) => void, types: Array<string>): Function;
-        /**
-         * When the build creates rows from gridOptions.data, the rowBuilders will be called to add
-         * additional properties to the row.
-         * @param {IRowBuilder} rowBuilder Function to be called
-         */
-        registerRowBuilder(rowBuilder: IRowBuilder<TEntity>): void;
-        /**
-         * Register a "rows processor" function. When the rows are updated,
-         * the grid calls each registered "rows processor", which has a chance
-         * to alter the set of rows (sorting, etc) as long as the count is not
-         * modified.
-         *
-         * @param {IRowProcessor} rowProcessor rows processor function, which
-         * is run in the context of the grid (i.e. this for the function will be the grid), and must
-         * return the updated rows list, which is passed to the next processor in the chain
-         * @param {number} priority the priority of this processor.
-         *        In general we try to do them in 100s to leave room for other people to inject rows processors at
-         *        intermediate priorities.  Lower priority rowsProcessors run earlier. At present all rows visible
-         *        is running at 50, filter is running at 100, sort is at 200, grouping at 400, selectable rows at
-         *        500, pagination at 900 (pagination will generally want to be last)
-         */
-        registerRowsProcessor(rowProcessor: IRowProcessor<TEntity>, priority: number): void;
-        /**
-         * registered a styleComputation function
-         *
-         * If the function returns a value it will be appended into the grid's `<style>` block
-         * @param {IStyleComputation} styleComputation function
-         */
-        registerStyleComputation(styleComputation: ($scope: ng.IScope) => string): void;
-        /**
-         * Remove a registered rows processor
-         * @param {IRowProcessor} rows processor function
-         */
-        removeRowsProcessor(rows: IRowProcessor<TEntity>): void;
-        /**
-         * Return the columns that the grid is currently being sorted by
-         * @param {IGridColumn} [excludedColumn] Optional GridColumn to exclude from having its sorting reset
-         */
-        resetColumnSorting(excludedColumn: IGridColumnOf<TEntity>): void;
-        /**
-         * Scroll the grid such that the specified
-         * row and column is in view
-         * @param {TEntity} rowEntity gridOptions.data[] array element to make visible
-         * @param {IColumnDef} colDef to make visible
-         * @returns {ng.IPromise<any>} a promise that is resolved after any scrolling is finished
-         */
-        scrollTo(rowEntity?: TEntity, colDef?: IColumnDefOf<TEntity>): ng.IPromise<any>;
-        /**
-         * Scrolls the grid to make a certain row and column combo visible,
-         * in the case that it is not completely visible on the screen already.
-         * @param {IGridRow} gridRow row to make visible
-         * @param {IGridColumn} gridCol column to make visible
-         * @returns {ng.IPromise<any>} a promise that is resolved when scrolling is complete
-         */
-        scrollToIfNecessary(gridRow: IGridRowOf<TEntity>, gridCol: IGridColumnOf<TEntity>): ng.IPromise<any>;
-        /**
-         * Set the sorting on a given column, optionally resetting any existing sorting on the Grid.
-         * Emits the sortChanged event whenever the sort criteria are changed.
-         * @param {IGridColumn} column Column to set the sorting on
-         * @param {uiGridConstants.ASC|uiGridConstants.DESC} [direction] Direction to sort by,
-         *        either descending or ascending.  If not provided, the column will iterate through the sort
-         *        directions: ascending, descending, unsorted.
-         * @param {boolean} [add] Add this column to the sorting. If not provided or set to `false`, the Grid will
-         *        reset any existing sorting and sort by this column only
-         * @returns {ng.IPromise<IGridColumn>} A resolved promise that supplies the column.
-         */
-        sortColumn(column: IGridColumnOf<TEntity>, direction?: string, add?: boolean)
-            : ng.IPromise<IGridColumnOf<TEntity>>;
-        /**
-         * flags all render containers to update their canvas height
-         */
-        updateCanvasHeight(): void;
-        /**
-         * recalculates the footer height,
-         * registered as a dataChangeCallback on uiGridConstants.dataChange.OPTIONS
-         * @param {string} name column name
-         */
-        updateFooterHeightCallback(name: string): void;
-        /**
-         * reference to the application scope (the parent scope of the ui-grid element). Assigned in ui-grid controller
-         * use gridOptions.appScopeProvider to override the default assignment of $scope.$parent with any reference
-         */
-        appScope?: ng.IScope;
-        /**
-        * returns an array of columns in the grid
-        */
-        columns: Array<IGridColumn>;
-        /**
-         * returns the total column footer height
-         */
-        columnFooterHeight?: number;
-        /**
-         * returns the total footer height gridFooter + columnFooter
-         */
-        footerHeight?: number;
-        /**
-         * returns or sets grid height in pixels
-         */
-        gridHeight?: number;
-        /**
-         * set to true when Grid is scrolling horizontally. Set to false via debounced method
-         */
-        isScrollingHorizontally?: boolean;
-        /**
-         * set to true when Grid is scrolling vertically. Set to false via debounced method
-         */
-        isScrollingVertically?: boolean;
-        /**
-         * set one of the uiGridConstants.scrollDirection values (UP, DOWN, LEFT, RIGHT, NONE),
-         * which tells us which direction we are scrolling. Set to NONE via debounced method
-         */
-        scrollDirection?: number;
-    }
-    export interface IBuildColumnsOptions {
-        orderByColumnDefs?: boolean;
-    }
-    export interface IStyleComputation {
-        ($scope: ng.IScope): string;
-    }
-    export interface IColumnBuilder<TEntity> {
-        (colDef: IColumnDefOf<TEntity>, col: IGridColumnOf<TEntity>, gridOptions: IGridOptionsOf<TEntity>): void;
-    }
-    export interface IRowBuilder<TEntity> {
-        (row: IGridRowOf<TEntity>, gridOptions: IGridOptionsOf<TEntity>): void;
-    }
-    export interface IRowProcessor<TEntity> {
-        (renderedRowsToProcess: Array<IGridRowOf<TEntity>>, columns: Array<IGridColumnOf<TEntity>>)
-            : Array<IGridRowOf<TEntity>>;
-    }
-    export interface IColumnProcessor<TEntity> {
-        (renderedColumnsToProcess: Array<IGridColumnOf<TEntity>>, rows: Array<IGridRowOf<TEntity>>)
-            : Array<IGridColumnOf<TEntity>>;
-    }
-    export type IGridOptions = IGridOptionsOf<any>;
-    export interface IGridOptionsOf<TEntity> extends cellNav.IGridOptions, edit.IGridOptions, expandable.IGridOptions,
-        exporter.IGridOptions<TEntity>, grouping.IGridOptions, importer.IGridOptions<TEntity>,
-        infiniteScroll.IGridOptions, moveColumns.IGridOptions, pagination.IGridOptions, pinning.IGridOptions,
-        resizeColumns.IGridOptions, rowEdit.IGridOptions, saveState.IGridOptions, selection.IGridOptions,
-        treeBase.IGridOptions<TEntity>, treeView.IGridOptions {
-        /**
-         * Default time in milliseconds to throttle aggregation calcuations, defaults to 500ms
-         */
-        aggregationCalcThrottle?: number;
-        /**
-         * by default, the parent scope of the ui-grid element will be assigned to grid.appScope
-         * this property allows you to assign any reference you want to grid.appScope
-         */
-        appScopeProvider?: ng.IScope | Object;
-        /**
-         * Array of columnDef objects.  Only required property is name.
-         */
-        columnDefs?: Array<IColumnDefOf<TEntity>>;
-        /**
-         * The height of the footer rows (column footer and grid footer) in pixels
-         */
-        columnFooterHeight?: number;
-        /**
-         * Turn virtualization on when number of columns goes over this number, defaults to 10
-         * @default 10
-         */
-        columnVirtualizationThreshold?: number;
-        /**
-         * (mandatory) Array of data to be rendered into the grid, providing the data source or data binding for
-         * the grid.
-         *
-         * Most commonly the data is an array of objects, where each object has a number of attributes.
-         * Each attribute automatically becomes a column in your grid.  This array could, for example, be sourced from
-         * an angularJS $resource query request.  The array can also contain complex objects, refer the binding tutorial
-         * for examples of that.
-         *
-         * The most flexible usage is to set your data on $scope:
-         *
-         * `$scope.data = data;`
-         *
-         * And then direct the grid to resolve whatever is in $scope.data:
-         *
-         * `$scope.gridOptions.data = 'data';`
-         *
-         * This is the most flexible approach as it allows you to replace $scope.data whenever you feel like it without
-         * getting pointer issues.
-         *
-         * Alternatively you can directly set the data array:
-         *
-         * `$scope.gridOptions.data = [ ];`
-         * or
-         *
-         * `$http.get('/data/100.json')
-         * .success(function(data) {
-         *   $scope.myData = data;
-         *   $scope.gridOptions.data = $scope.myData;
-         *  });`
-         *
-         * Where you do this, you need to take care in updating the data - you can't just update `$scope.myData` to some
-         * other array, you need to update $scope.gridOptions.data to point to that new array as well.
-         */
-        data?: Array<TEntity> | string;
-        /**
-         * True by default. When enabled, this setting displays a column
-         * menu within each column.
-         * @default true
-         */
-        enableColumnMenus?: boolean;
-        /**
-         * False by default. When enabled, this setting adds filter
-         * boxes to each column header, allowing filtering within the column for the entire grid.
-         * Filtering can then be disabled on individual columns using the columnDefs.
-         * @default false
-         */
-        enableFiltering?: boolean;
-        /**
-        * False by default. When enabled, this adds a settings icon in the top right of the grid,
-        * which floats above the column header. The menu by default gives access to show/hide columns,
-        * but can be customized to show additional actions.
-        * @default false
-        */
-        enableGridMenu?: boolean;
-        /**
-         * uiGridConstants.scrollbars.ALWAYS by default. This settings controls the horizontal scrollbar for the grid.
-         * Supported values: uiGridConstants.scrollbars.ALWAYS, uiGridConstants.scrollbars.NEVER
-         * @default 1
-         */
-        enableHorizontalScrollbar?: boolean | number;
-        /**
-         * True by default. When enabled, a newly initialized grid will check to see if it is tall enough to display
-         * at least one row of data.  If the grid is not tall enough, it will resize the DOM element to display
-         * minRowsToShow number of rows.
-         * @default true
-         */
-        enableMinHeightCheck?: boolean;
-        /**
-         * True by default. When enabled, this setting allows uiGrid to add
-         * `$$hashKey`-type properties (similar to Angular) to elements in the `data` array. This allows
-         * the grid to maintain state while vastly speeding up the process of altering `data` by
-         * adding/moving/removing rows.
-         *
-         * Note that this DOES add properties to your data that you may not want, but they are stripped out when
-         * using `angular.toJson()`. IF you do not want this at all you can disable this setting but you will take a
-         * performance hit if you are using large numbers of rows
-         * and are altering the data set often.
-         * @default true
-         */
-        enableRowHashing?: boolean;
-        /**
-         * True by default. When enabled, this setting adds sort
-         * widgets to the column headers, allowing sorting of the data for the entire grid.
-         * Sorting can then be disabled on individual columns using the columnDefs.
-         * @default true
-         */
-        enableSorting?: boolean;
-        /**
-         * uiGridConstants.scrollbars.ALWAYS by default. This settings controls the vertical scrollbar for the grid.
-         * Supported values: uiGridConstants.scrollbars.ALWAYS, uiGridConstants.scrollbars.NEVER
-         * @default 1
-         */
-        enableVerticalScrollbar?: boolean | number;
-        /**
-         * Extra columns to to render outside of the viewport, which helps with smoothness of scrolling.
-         * Defaults to 4
-         * @default 4
-         */
-        excessColumns?: number;
-        /**
-         * Extra rows to to render outside of the viewport, which helps with smoothness of scrolling.
-         * Defaults to 4
-         * @default 4
-         */
-        excessRows?: number;
-        /**
-         * Array of property names in data to ignore when auto-generating column names.  Provides the
-         * inverse of columnDefs - columnDefs is a list of columns to include, excludeProperties is a list of columns
-         * to exclude.
-         *
-         * If columnDefs is defined, this will be ignored.
-         *
-         * Defaults to ['$$hashKey']
-         */
-        excludeProperties?: Array<string>;
-        /**
-         * Set to true if your columns are all related directly to fields in a flat object structure - i.e.
-         * each of your columns associate directly with a propery one each of the entities in your data array.
-         *
-         * In that situation we can avoid all the logic associated with complex binding to functions or to properties
-         * of sub-objects, which can provide a significant speed improvement with large data sets, with filtering and
-         * with sorting.
-         *
-         * By default false
-         * @default false
-         */
-        flatEntityAccess?: boolean;
-        /**
-         * (optional) ui-grid/ui-grid-footer by default.  This footer shows the per-column
-         * aggregation totals.
-         * When provided, this setting uses a custom footer template. Can be set to either the name of a template
-         * file 'footer_template.html', inline html
-         * <pre>'<div class="ui-grid-bottom-panel" style="text-align: center">I am a Custom Grid Footer</div>'</pre>,
-         * or the id of a precompiled template (TBD how to use this).  Refer to the custom footer tutorial for more
-         * information.
-         * @default 'ui-grid/ui-grid-footer'
-         */
-        footerTemplate?: string;
-        /**
-         * (optional) ui-grid/ui-grid-grid-footer by default. This template by default shows the
-         * total items at the bottom of the grid, and the selected items if selection is enabled.
-         * @default 'ui-grid/ui-grid-grid-footer'
-         */
-        gridFooterTemplate?: string
-        /**
-         * Null by default. When provided, this setting uses a custom header
-         * template, rather than the default template. Can be set to either the name of a template file:
-         * <pre>  $scope.gridOptions.headerTemplate = 'header_template.html';</pre>
-         * inline html
-         * <pre>  $scope.gridOptions.headerTemplate = '<div class="ui-grid-top-panel" style="text-align: center">
-         *     I am a Custom Grid Header</div>'</pre>
-         * or the id of a precompiled template (TBD how to use this).
-         * </br>Refer to the custom header tutorial for more information.
-         * If you want no header at all, you can set to an empty div:
-         * <pre>  $scope.gridOptions.headerTemplate = '<div></div>';</pre>
-         *
-         * If you want to only have a static header, then you can set to static content.  If
-         * you want to tailor the existing column headers, then you should look at the
-         * current 'ui-grid-header.html' template in github as your starting point.
-         * @default null
-         */
-        headerTemplate?: string;
-        /**
-         * Defaults to 4
-         * @default 4
-         */
-        horizontalScrollThreshold?: number;
-        /**
-         * Number of rows from the end of the dataset
-         * at which infinite scroll will trigger a request
-         * for more data
-         * @default 20
-         */
-        infiniteScrollRowsFromEnd?: number;
-        /**
-         * Inform the grid of whether there are rows
-         * to load when scrolling up
-         * @default false
-         */
-        infiniteScrollUp?: boolean;
-        /**
-         * Inform the grid of whether there are rows
-         * to load scrolling down
-         * @default true
-         */
-        infiniteScrollDown?: boolean;
-        /**
-         * Defaults to 200
-         * @default 200
-         */
-        maxVisibleColumnCount?: number;
-        /**
-         * Minimum number of rows to show when the grid doesn't have a defined height. Defaults to "10".
-         * @default 10
-         */
-        minRowsToShow?: number;
-        /**
-         * Columns can't be smaller than this, defaults to 10 pixels
-         * @default 10
-         */
-        minimumColumnSize?: number;
-        /**
-         * A callback that returns the gridApi once the grid is instantiated, which is
-         * then used to interact with the grid programatically.
-         *
-         * Note that the gridApi.core.renderingComplete event is identical to this
-         * callback, but has the advantage that it can be called from multiple places
-         * if needed
-         * @param {IGridApi} gridApi
-         */
-        onRegisterApi?: (gridApi: IGridApiOf<TEntity>) => void;
-        /**
-         * The height of the row in pixels, defaults to 30
-         * @default 30
-         */
-        rowHeight?: number;
-        /**
-         * 'ui-grid/ui-grid-row' by default. When provided, this setting uses a
-         * custom row template.  Can be set to either the name of a template file:
-         * <pre> $scope.gridOptions.rowTemplate = 'row_template.html';</pre>
-         * inline html
-         * <pre>  $scope.gridOptions.rowTemplate =
-         * '<div style="background-color: aquamarine"
-         *       ng-click="grid.appScope.fnOne(row)"
-         *       ng-repeat="col in colContainer.renderedColumns track by col.colDef.name"
-         *       class="ui-grid-cell" ui-grid-cell></div>';</pre>
-         * or the id of a precompiled template (TBD how to use this) can be provided.
-         * </br>Refer to the custom row template tutorial for more information.
-         * @default 'ui-grid/ui-grid-row'
-         */
-        rowTemplate?: string;
-        /**
-         * Default time in milliseconds to debounce scroll events, defaults to 300ms
-         * @default 300
-         */
-        scrollDebounce?: number;
-        /**
-         * Defaults to 4
-         * @default 4
-         */
-        scrollThreshold?: number;
-        /**
-         * Whether or not to show the column footer, defaults to false
-         * The column footer displays column aggregates
-         * @default false
-         */
-        showColumnFooter?: boolean;
-        /**
-         * Whether or not to show the footer, defaults to false
-         * The footer display Total Rows and Visible Rows (filtered rows)
-         * @default false
-         */
-        showGridFooter?: boolean;
-        /**
-         * True by default. When set to false, this setting will replace the
-         * standard header template with '<div></div>', resulting in no header being shown.
-         * @default true
-         */
-        showHeader?: boolean;
-        /**
-         * Turn virtualization on when number of data elements goes over this number, defaults to 20
-         * @default 20
-         */
-        virtualizationThreshold?: number;
-        /**
-         * Disables client side filtering. When true, handle the filterChanged event and set data,
-         * defaults to false
-         * @default false
-         */
-        useExternalFiltering?: boolean;
-        /**
-         * Default time in milliseconds to throttle scroll events to, defaults to 70ms
-         * @default 70
-         */
-        wheelScrollThrottle?: number;
-        /**
-         * This function returns the identity value uniquely identifying this row,
-         * if one is not present it does not set it.
-         *
-         * By default it returns the `$$hashKey` property but can be overridden to use any property
-         * or set of properties you want.
-         * @param {IGridRow} row The row for which you want the unique id
-         * @returns {string} row uid
-         */
-        getRowIdentity?(row: IGridRowOf<TEntity>): any;
-        /**
-         * By default, rows are compared using object equality.  This option can be overridden
-         * to compare on any data item property or function
-         * @param {TEntity} entityA First Data Item to compare
-         * @param {TEntity} entityB Second Data Item to compare
-         */
-        rowEquality?(entityA: TEntity, entityB: TEntity): boolean;
-        /**
-         * This function is used to get and, if necessary, set the value uniquely identifying this row
-         * (i.e. if an identity is not present it will set one).
-         *
-         * By default it returns the `$$hashKey` property if it exists. If it doesn't it uses gridUtil.nextUid()
-         * to generate one
-         */
-        rowIdentity?(): any;
-    }
-    export interface IGridCoreApi<TEntity> {
-        // Methods
-        /**
-         * adds a row header column to the grid
-         * @param {IColumnDef} column Column Definition
-         */
-        addRowHeaderColumn(column: IColumnDefOf<TEntity>): void;
-        /**
-         * add items to the grid menu.  Used by features
-         * to add their menu items if they are enabled, can also be used by
-         * end users to add menu items.  This method has the advantage of allowing
-         * remove again, which can simplify management of which items are included
-         * in the menu when.  (Noting that in most cases the shown and active functions
-         * provide a better way to handle visibility of menu items)
-         * @param {IGridInstance} grid the grid on which we are acting
-         * @param {Array<IMenuItem>} items menu items in the format as described in the tutorial, with
-         * the added note that if you want to use remove you must also specify an `id` field,
-         * which is provided when you want to remove an item.  The id should be unique.
-
-         */
-        addToGridMenu(grid: IGridInstanceOf<TEntity>, items: Array<IMenuItem>):  void;
-        /**
-         * Clears all filters and optionally refreshes the visible rows.
-         * @param {boolean} [refreshRows=true] Defaults to true.
-         * @param {boolean} [clearConditions=false] Defaults to false.
-         * @param {boolean} [clearFlags=false] Defaults to false.
-         * @returns {ng.IPromise<any>} If `refreshRows` is true, returns a promise of the rows refreshing.
-         */
-        clearAllFilters(refreshRows?: boolean, clearConditions?: boolean,
-            clearFlags?: boolean): ng.IPromise<Array<IGridRowOf<TEntity>>>;
-        /**
-         * Clears any override on visibility for the row so that it returns to
-         * using normal filtering and other visibility calculations.
-         * If the row is currently invisible then sets it to visible and calls
-         * both grid refresh and emits the rowsVisibleChanged event
-         * TODO: if a filter is active then we can't just set it to visible?
-         * @param {TEntity} rowEntity gridOptions.data[] array instance
-         */
-        clearRowInvisible(rowEntity: TEntity): void;
-        /**
-         * Returns all visible rows
-         * @param {IGridInstance} grid the grid you want to get visible rows from
-         * @returns {Array<IGridRow>} an array of gridRow
-         */
-        getVisibleRows(grid: IGridInstanceOf<TEntity>): Array<IGridRowOf<TEntity>>;
-        /**
-         * Trigger a grid resize, normally this would be picked
-         * up by a watch on window size, but in some circumstances it is necessary
-         * to call this manually
-         * @returns {ng.IPromise<any>} promise that is resolved when render completes?
-         */
-        handleWindowResize(): void;
-        /**
-         * Notify the grid that a data or config change has occurred,
-         * where that change isn't something the grid was otherwise noticing.  This
-         * might be particularly relevant where you've changed values within the data
-         * and you'd like cell classes to be re-evaluated, or changed config within
-         * the columnDef and you'd like headerCellClasses to be re-evaluated.
-         * @param {string} type one of the
-         *        uiGridConstants.dataChange values (ALL, ROW, EDIT, COLUMN), which tells
-         *        us which refreshes to fire.
-         */
-        notifyDataChange(type: string): void;
-        /**
-         * Refresh the rendered rows on screen?  Note: not functional at present
-         * @returns {ng.IPromise<any>} promise that is resolved when render completes?
-         */
-        refreshRows(): ng.IPromise<boolean>;
-        /**
-         * Register a "columns processor" function. When the columns are updated,
-         * the grid calls each registered "columns processor", which has a chance
-         * to alter the set of columns as long as the count is not
-         * modified.
-         *
-         * @param {IColumnProcessor} processorFunction columns processor function, which
-         *        is run in the context of the grid (i.e. this for the function will be the grid), and must
-         *        return the updated columns list, which is passed to the next processor in the chain
-         * @param {number} priority the priority of this processor.  In general we try to do them in 100s to leave room
-         *        for other people to inject columns processors at intermediate priorities.  Lower priority
-         *        columnsProcessors run earlier.
-         *
-         * At present allRowsVisible is running at 50, filter is running at 100, sort is at 200, grouping at 400,
-         * selectable rows at 500, pagination at 900 (pagination will generally want to be last)
-         */
-        registerColumnsProcessor(processorFunction: IColumnProcessor<TEntity>, priority: number): void;
-        /**
-         * Register a "rows processor" function. When the rows are updated,
-         * the grid calls each registered "rows processor", which has a chance
-         * to alter the set of rows (sorting, etc) as long as the count is not
-         * modified.
-         *
-         * @param {IRowProcessor} rowProcessor rows processor function, which
-         *        is run in the context of the grid (i.e. this for the function will be the grid), and must
-         *        return the updated rows list, which is passed to the next processor in the chain
-         * @param {number} priority the priority of this processor.  In general we try to do them in 100s to leave room
-         *        for other people to inject rows processors at intermediate priorities.  Lower priority rowsProcessors
-         *        run earlier.
-         *
-         * At present all rows visible is running at 50, filter is running at 100, sort is at 200, grouping at 400,
-         * selectable rows at 500, pagination at 900 (pagination will generally want to be last)
-         */
-        registerRowsProcessor(rowProcessor: IRowProcessor<TEntity>, priority: number): void;
-        /**
-         * Scroll the grid such that the specified
-         * row and column is in view
-         * @param {TEntity} entity gridOptions.data[] array instance to make visible
-         * @param {IColumnDef} colDef to make visible
-         * @returns {ng.IPromise<any>} a promise that is resolved after any scrolling is finished
-         */
-        scrollTo(entity: TEntity, colDef: IColumnDefOf<TEntity>): void; /*A row entity can be anything?*/
-        /**
-         * Scrolls the grid to make a certain row and column combo visible,
-         * in the case that it is not completely visible on the screen already.
-         * @param {IGridRow} gridRow row to make visible
-         * @param {IGridColumn} gridCol column to make visible
-         * @returns {ng.IPromise<any>} a promise that is resolved when scrolling is complete
-         */
-        scrollToIfNecessary(gridRow: IGridRowOf<TEntity>, gridCol: IGridColumnOf<TEntity>): void;
-        /**
-         * A null handling method that can be used when building custom sort
-         * functions
-         * @param {any} a Sort value a
-         * @param {any} b Sort value b
-         * @returns {number} null if there were no nulls/undefineds, otherwise returns
-         * a sort value that should be passed back from the sort function
-         */
-        sortHandleNulls(a: any, b: any): number;
-        /**
-         * queues a grid refresh, a way of debouncing all the refreshes we might otherwise issue
-         */
-        queueGridRefresh(): void;
-        /**
-         * queues a grid refreshCanvas, a way of debouncing all the refreshes we might otherwise issue
-         */
-        queueRefresh(): void;
-
-        // Events
-        on: {
-            /**
-             * is raised when the canvas height has changed
-             * @param {ng.IScope} scope Grid scope
-             * @param {canvasHeightChangedHandler} handler Callback
-             */
-            canvasHeightChanged: (scope: ng.IScope, handler: canvasHeightChangedHandler) => void;
-            /**
-             * The visibility of a column has changed, the column itself is passed out as a parameter of the event
-             * @param {ng.IScope} scope The scope of the controller. This is used to deregister this event when the
-             *        scope is destroyed
-             * @param {columnVisibilityChangedHandler} callBack Will be called when the event is emited.
-             *        The function passes back the GridCol that has changed
-             */
-            columnVisibilityChanged: (scope: ng.IScope, callBack: columnVisibilityChangedHandler<TEntity>) => void;
-            /**
-             * is raised after the filter is changed.
-             * The nature of the watch expression doesn't allow notification of what changed,
-             * so the receiver of this event will need to re-extract the filter conditions from the columns.
-             * @param {ng.IScope} scope Grid scope
-             * @param {filterChangedHandler} handler Callback
-             */
-            filterChanged: (scope: ng.IScope, handler: filterChangedHandler<TEntity>) => void;
-            /**
-             * is raised after the cache of visible rows is changed
-             * @param {ng.IScope} scope Grid scope
-             * @param {rowsRenderedHandler} handler callback
-             */
-            rowsRendered: (scope: ng.IScope, handler: rowsRenderedHandler<TEntity>) => void;
-            /**
-             * is raised after the rows that are visible change.
-             * The filtering is zero-based, so it isn't possible to say which rows changed
-             * (unlike in the selection feature). We can plausibly know which row was changed when setRowInvisible is
-             * called, but in that situation the user already knows which row they changed.
-             * When a filter runs we don't know what changed, and that is the one that would have been useful.
-             * @param {ng.IScope} scope Grid scope
-             * @param {rowsVisibleChangedHandler} handler callback
-             */
-            rowsVisibleChanged: (scope: ng.IScope, handler: rowsVisibleChangedHandler<TEntity>) => void;
-            /**
-             * is raised when scroll begins. Is throttled, so won't be raised too frequently
-             * @param {ng.IScope} scope Grid scope
-             * @param {scrollBeginHandler} handler callback
-             */
-            scrollBegin: (scope: ng.IScope, handler: scrollBeginHandler) => void;
-            /**
-             * is raised when scroll has finished. Is throttled, so won't be raised too frequently
-             * @param {ng.IScope} scope Grid scope
-             * @param {scrollEndHandler} handler callback
-             */
-            scrollEnd: (scope: ng.IScope, handler: scrollEndHandler) => void;
-            /**
-             * is raised after the sort criteria on one or more columns have changed
-             * @param {ng.IScope} scope Grid scope
-             * @param {sortChangedHandler} handler callback
-             */
-            sortChanged: (scope: ng.IScope, handler: sortChangedHandler<TEntity>) => void;
-        };
-    }
-    export interface columnVisibilityChangedHandler<TEntity> {
-        /**
-         * Column visibility changed event handler
-         * @param {IGridColumn} column Ui Grid column
-         */
-        (column: IGridColumnOf<TEntity>): void;
-    }
-    export interface canvasHeightChangedHandler {
-        /**
-         * Canvas height changed callback
-         * @param {number} oldHeight old Height
-         * @param {number} newHeight new Height
-         */
-        (oldHeight: number, newHeight: number): void;
-    }
-
-    export interface filterChangedHandler<TEntity> {
-        /**
-         * Filter changed event callback
-         * @param {IGridApi} gridApi grid api
-         */
-        (gridApi: IGridApiOf<TEntity>): void;
-    }
-
-    export interface rowsRenderedHandler<TEntity> {
-        /**
-         * Rows rendered event callback
-         * @param {IGridApi} gridApi Grid api object
-         */
-        (gridApi: IGridApiOf<TEntity>): void;
-    }
-
-    export interface rowsVisibleChangedHandler<TEntity> {
-        /**
-         * Rows visible changed event callback
-         * @param {IGridApi} gridApi grid api object
-         */
-        (gridApi: IGridApiOf<TEntity>): void;
-    }
-
-    export interface scrollBeginHandler {
-        /**
-         * Scroll begin event callback
-         * @param {JQueryMouseEventObject} scrollEvent Mouse scroll event
-         */
-        (scrollEvent: JQueryMouseEventObject): void;
-    }
-
-    export interface scrollEndHandler {
-        /**
-         * Scroll end event callback
-         * @param {JQueryMouseEventObject} scrollEvent Mouse scroll event
-         */
-        (scrollEvent: JQueryMouseEventObject): void;
-    }
-
-    export interface sortChangedHandler<TEntity> {
-        /**
-         * Sort change event callback
-         * @param {IGridInstance} grid instance
-         * @param {IGridColumn} array of gridColumns that have sorting on them, sorted in priority order
-         */
-        (grid: IGridInstanceOf<TEntity>, columns: Array<IGridColumnOf<TEntity>>): void;
-    }
-
-    export module cellNav {
-        /**
-         * Column Definitions for cellNav feature, these are available to be set using the ui-grid
-         * gridOptions.columnDefs
-         */
-        export interface IColumnDef {
-            /**
-             * Enable focus on a cell within this column.
-             * Defaults to true
-             * @default true
-             */
-            allowCellFocus?: boolean;
-        }
-
-        /**
-         * GridOptions for cellNav feature, these are available to be set using the ui-grid gridOptions
-         */
-        export interface IGridOptions {
-            /**
-             * Enable multiple cell selection only when using the ctrlKey or shiftKey.
-             * Defaults to false
-             * @default false
-             */
-            modifierKeysToMultiSelectCells?: boolean;
-        }
-
-        /**
-         * Cell Nav related grid row
-         */
-        export interface IGridRow {
-            /**
-             * Enable focus on a cell within this row. If set to false then no cells in this row can be focused
-             * Group header rows, for example, would set this to false.
-             * Defaults to true
-             */
-            allowCellFocus?: boolean;
-        }
-
-        export interface ICellNavApi<TEntity> {
-            // Methods
-            /**
-             * Gets the currently selected rows and columns.  array is empty if no selection has occurred
-             * @returns {Array<IRowCol>} an array containing the current selection
-             */
-            getCurrentSelection(): Array<IRowCol<TEntity>>;
-            /**
-             * Gets the current focused cell.  value is null if no selection has occurred
-             * @returns {IRowCol} the current (or last if Grid does not have focus) focused row and column
-             */
-            getFocusedCell(): IRowCol<TEntity>;
-            /**
-             * Gets the index of the passed rowCol.  Returns -1 if the RowCol isn't selected
-             * @param rowCol
-             * @returns the index in the order in which the RowCol was selected
-             */
-            rowColSelectIndex(rowCol: IRowCol<TEntity>): number;
-            /**
-             * Brings the specified row and column into view, and sets focus to that cell
-             * @param {TEntity} rowEntity gridOptions.data[] array instance to make visible and set focus
-             * @param {IColumnDef} colDef Column definition to make visible and set focus
-             */
-            scrollToFocus(rowEntity: TEntity, colDef: IColumnDef): ng.IPromise<any>;
-
-            // Events
-            on: {
-                /**
-                 * raised when the active cell is changed
-                 * @param {ng.IScope} scope The grid scope
-                 * @param {navigateHandler} handler Callback
-                 */
-                navigate: (scope: ng.IScope, handler: navigateHandler<TEntity>) => void;
-                /**
-                 * viewportKeyDown is raised when the viewPort receives a keyDown event.
-                 * Cells never get focus in uiGrid due to the difficulties of setting focus on a cell that is
-                 * not visible in the viewport. Use this event whenever you need a keydown event on a cell.
-                 * @param {ng.IScope} scope The grid scope
-                 * @param {viewportKeyDownHandler} handler Callback
-                 */
-                viewportKeyDown: (scope: ng.IScope, handler: viewportKeyDownHandler<TEntity>) => void;
-                /**
-                 * viewportKeyPress is raised when the viewPort receives a keyPress event.
-                 * Cells never get focus in uiGrid due to the difficulties of setting focus on a cell that is
-                 * not visible in the viewport. Use this event whenever you need a keypress event on a cell.
-                 * @param {ng.IScope} scope The grid scope
-                 * @param {viewportKeyPressHandler} handler Callback
-                 */
-                viewportKeyPress: (scope: ng.IScope, handler: viewportKeyPressHandler<TEntity>) => void;
-            };
-        }
-
-        export interface navigateHandler<TEntity> {
-            /**
-             * Callback for navigate event
-             * @param {IRowCol} newRowCol New position
-             * @param {IRowCol} oldRowCol Old position
-             */
-            (newRowCol: IRowCol<TEntity>, oldRowCol: IRowCol<TEntity>): void;
-        }
-
-        export interface viewportKeyDownHandler<TEntity> {
-            /**
-             * Callback for viewport key down event
-             * @param {JQueryKeyEventObject} event Keydown event
-             * @param {IRowCol} rowCol Current row Col position
-             */
-            (event: JQueryKeyEventObject, rowCol: IRowCol<TEntity>): void;
-        }
-
-        export interface viewportKeyPressHandler<TEntity> {
-            /**
-             * Callback for viewport key press event
-             * @param {JQueryKeyEventObject} event Keypress event
-             * @param {IRowCol} rowCol Current row Col position
-             */
-            (event: JQueryKeyEventObject, rowCol: IRowCol<TEntity>): void;
-        }
-
-        export interface IRowColConstructor<TEntity> {
-            new (row: uiGrid.IGridRowOf<TEntity>, col: IGridColumnOf<TEntity>): IRowCol<TEntity>;
-        }
-
-        /**
-         * A row and column pair that represents the intersection of these two entities
-         */
-        export interface IRowCol<TEntity> {
-            row: uiGrid.IGridRowOf<TEntity>;
-            col: IGridColumnOf<TEntity>;
-            /**
-             * Gets the intersection of where the row and column meet
-             * @returns The value from the grid data that this RowCol points to.  If the column has a cellFilter this
-             *          will NOT return the filtered value.
-             */
-            getIntersectionValueRaw(): String | Number | Object;
-            /**
-             * Gets the intersection of where the row and column meet.
-             * @returns The value from the grid data that this RowCol points to.  If the column has a cellFilter this
-             *          will also apply the filter to it and return the value that the filter displays
-             */
-            getIntersectionValueFiltered(): String | Number | Object;
-        }
-        /**
-         * constants available in cellNav
-         */
-        export interface IUiGridCellNavConstants {
-            FEATURE_NAME: string;
-            CELL_NAV_EVENT: string;
-            direction: {
-                LEFT: number;
-                RIGHT: number;
-                UP: number;
-                DOWN: number;
-                PG_UP: number;
-                PG_DOWN: number;
-            };
-            EVENT_TYPE: {
-                KEYDOWN: number;
-                CLICK: number;
-                CLEAR: number;
-            };
-        }
-    }
-
-    export module edit {
-        /**
-         * Edit related Column Definition
-         */
-        export interface IColumnDef<TEntity> {
-            /**
-             * If specified, either a value or function evaluated before editing cell.
-             * If falsy, then editing of cell is not allowed.
-             */
-            cellEditableCondition?: any | { ($scope: ng.IScope): boolean };
-            /** A filter that you would like to apply to the values in the options list of the dropdown */
-            editDropdownFilter?: string;
-            /** the label for the "id" field in the editDropdownOptionsArray. Defaults to 'id' */
-            editDropdownIdLabel?: string;
-            /** an array of values in the format [ {id: xxx, value: xxx} ], which is populated into the edit dropdown */
-            editDropdownOptionsArray?: Array<IEditDropdown>;
-            /**
-             * a path to a property on row.entity containing an array of values in the format `[{id: xxx, value:
-             * xxx}]`,
-             * which will be used to populate the edit dropdown.  This can be used when the dropdown values are
-             * dependent on the backing row entity.  If this property is set then editDropdownOptionsArray will be
-             * ignored.
-             */
-            editDropdownRowEntityOptionsArrayPath?: string;
-            /** the label of the 'value' field in the editDropdownOptionsArray.  Defaults to 'value' */
-            editDropdownValueLabel?: string;
-            /**
-             * A function that should be called when any files have been chosen by the user.
-             * You should use this to process the files appropriately for your application.
-             *
-             * It passes the gridCol, the gridRow (from which you can get gridRow.entity), and the files.
-             * The files are in the format as returned from the file chooser, an array of files,
-             * with each having useful information such as:
-             *
-             * * files[0].lastModifiedDate
-             * * files[0].name
-             * * files[0].size (appears to be in bytes)
-             * * files[0].type (MIME type)
-             *
-             * Typically you would do something with these files.
-             * Most commonly you would use the filename or read the file itself in. This example does both:
-             * @example
-             editFileChooserCallBack: (gridRow, gridCol, files) => {
-               // ignore all but the first file, it can only choose one anyway
-               // set the filename into this column
-               gridRow.entity.filename = file[0].name;
-
-               // read the file and set it into a hidden column, which we may do stuff with later
-               var setFile = function(fileContent){
-                   gridRow.entity.file = fileContent.currentTarget.result;
-               };
-               var reader = new FileReader();
-               reader.onload = setFile;
-               reader.readAsText( files[0] );
-           }
-             */
-            editFileChooserCallback?: (gridRow: uiGrid.IGridRowOf<TEntity>,
-                                       gridCol: IGridColumnOf<TEntity>,
-                                       files: FileList) => void;
-            /**
-             * A bindable string value that is used when binding to edit controls instead of colDef.field
-             * For example if you have a complex property on an object like:
-             * ```typescript
-             * state: {abbrev:'MS',name:'Mississippi'}.
-             * ```
-             * The grid should display `state.name` in the cell and sort/filter based on the state.name property, but
-             * the editor requires the full state object. so this let's you bind to that
-             * @example
-             colDef.field = 'state.name';
-             colDef.editModelField = 'state';
-             */
-            editModelField?: string;
-            /**
-             * Cell template to be used when editing this column. Can be Url or text template.
-             * Defaults to gridOptions.editableCellTemplate
-             */
-            editableCellTemplate?: string;
-            /** Enable editing on a column */
-            enableCellEdit?: boolean;
-            /** If true, then editor is invoked as soon as cell receives focus. Default false.
-             * _Requires both the cellNav feature and the edit feature to be enabled_
-             */
-            enableCellEditOnFocus?: boolean;
-        }
-
-        export interface IEditDropdown {
-            id: number | string;
-            value: any;
-        }
-
-        /**
-         * Options for configuring the edit feature, these are available to be set using the ui-grid gridOptions
-         */
-        export interface IGridOptions {
-            /**
-             * If specified, either a value or function to be used by all columns before editing.
-             * If falsy, then editing of cell is not allowed
-             */
-            cellEditableCondition?: any | { ($scope: ng.IScope): boolean };
-            /**
-             * If specified, cellTemplate to use as the editor for all columns.
-             * defaults to 'ui-grid/cellTextEditor'
-             * @default 'ui-grid/cellTextEditor'
-             */
-            editableCellTemplate?: string;
-            /**
-             * If defined, sets the default value for the editable flag on each individual colDefs if their individual
-             * enableCellEdit configuration is not defined.
-             * Defaults to undefined.
-             * @default undefined
-             */
-            enableCellEdit?: boolean;
-            /**
-             * If true, then editor is invoked as soon as cell receives focus.
-             * Default false.
-             * _requires cellNav feature and the edit feature to be enabled_
-             * @default false
-             */
-            enableCellEditOnFocus?: boolean;
-        }
-
-        /**
-         * GridRow options for edit feature, these are available to be set internally only, by other features
-         */
-        export interface IGridRow {
-            /** enable editing on row, grouping for example might disable editing on group header rows */
-            enableCellEdit?: boolean;
-        }
-
-        /**
-         * Public Api for edit feature
-         */
-        export interface IGridEditApi<TEntity> {
-            on: {
-                /**
-                 * raised when cell editing is complete
-                 * @param scope The grid scope
-                 * @param {afterCellEditHandler} handler Callback
-                 */
-                afterCellEdit: (scope: ng.IScope, handler: afterCellEditHandler<TEntity>) => void;
-                /**
-                 * raised when cell editing starts on a cell
-                 * @param scope The grid scope
-                 * @param {beginCellEditHandler} handler Callback
-                 */
-                beginCellEdit: (scope: ng.IScope, handler: beginCellEditHandler<TEntity>) => void;
-                /**
-                 * raised when cell editing is cancelled on a cell
-                 * @param scope The grid scope
-                 * @param {cancelCellEditHandler} handler Callback
-                 */
-                cancelCellEdit: (scope: ng.IScope, handler: cancelCellEditHandler<TEntity>) => void;
-            }
-        }
-        export interface afterCellEditHandler<TEntity> {
-            /**
-             * raised when cell editing is complete
-             * @param {TEntity} rowEntity the options.data element that was edited
-             * @param {IColumnDef} colDef The column that was edited
-             * @param {any} newValue New Value
-             * @param {any} oldValue Old Value
-             */
-            (rowEntity: TEntity, colDef: IColumnDef<TEntity>, newValue: any, oldValue: any): void;
-        }
-
-        /**
-         * raised when cell editing starts on a cell
-         * @param {TEntity} rowEntity the options.data element that was edited
-         * @param {IColumnDef} colDef The column that was edited
-         * @param {JQueryEventObject} triggerEvent the event that triggered the edit. Useful to prevent losing
-         *     keystrokes on some complex editors
-         */
-        export interface beginCellEditHandler<TEntity> {
-            (rowEntity: TEntity, colDef: IColumnDef<TEntity>, triggerEvent: JQueryEventObject): void;
-        }
-
-        /**
-         * raised when cell editing is cancelled on a cell
-         * @param {TEntity} rowEntity the options.data element that was edited
-         * @param {IColumnDef} colDef The column that was edited
-         */
-        export interface cancelCellEditHandler<TEntity> {
-            (rowEntity: TEntity, colDef: IColumnDef<TEntity>): void;
-        }
-
-        /**
-         * constants available in edit module
-         */
-        export interface IUiGridEditConstants {
-            EDITABLE_CELL_TEMPLATE: string;
-            EDITABLE_CELL_DIRECTIVE: string;
-            events: {
-                BEGIN_CELL_EDIT: string;
-                END_CELL_EDIT: string;
-                CANCEL_CELL_EDIT: string;
-            };
-        }
-    }
-
-    export module expandable {
-        /**
-         * Options for configuring the expandable feature, these are available to be set using the ui-grid gridOptions
-         */
-        export interface IGridOptions {
-            /**
-             * Width in pixels of the expandable column. Defaults to 40
-             */
-            expandableRowHeaderWidth?: number;
-            /**
-             * Whether or not to use expandable feature.  Allows you to turn off expandable on specific grids within
-             * your application, or in specific modes on this grid.
-             * Defaults to true.
-             */
-            enableExpandable?: boolean;
-            /**
-             * Show a rowHeader to provide the expandable buttons. If set to false then implies you're going to use a
-             * custom method for expanding and collapsing the subgrids.
-             * Defaults to true.
-             */
-            enableExpandableRowHeader?: boolean;
-            /**
-             * Height in pixels of the expanded subgrid.
-             * Defaults to 150
-             */
-            expandableRowHeight?: number;
-            /**
-             * Mandatory. The template for your expanded row
-             */
-            expandableRowTemplate?: string;
-        }
-
-        /**
-         * Public Api for expandable feature
-         */
-        export interface IGridExpandableApi<TEntity> {
-            // Methods
-            /**
-             * Collapse all subgrids.
-             */
-            collapseAllRows(): void;
-            /**
-             * expand all subgrids
-             */
-            expandAllRows(): void;
-            /**
-             * Toggle all subgrids
-             */
-            toggleAllRows(): void;
-            /**
-             * Toggle a specific row
-             * @param {TEntity} rowEntity The data entity for the row you want to expand
-             */
-            toggleRowExpansion(rowEntity: TEntity): void;
-
-            // Events
-            on: {
-                /**
-                 * raised when cell editing is complete
-                 * @param {ng.IScope} scope
-                 * @param {rowExpandedStateChangedHandler} handler
-                 */
-                rowExpandedStateChanged: (scope: ng.IScope, handler: rowExpandedStateChangedHandler<TEntity>) => void;
-            };
-        }
-
-        export interface rowExpandedStateChangedHandler<TEntity> {
-            /**
-             * Raised when cell editing is complete
-             * @param {IGridRow} row The row that was expanded
-             */
-            (row: IGridRowOf<TEntity>): void;
-        }
-
-        /**
-         * GridRow settings for expandable
-         */
-        export interface IGridRow {
-            /**
-             * If set to true, the row is expanded and the expanded view is visible
-             * Defaults to false
-             * @default false
-             */
-            isExpanded?: boolean;
-        }
-    }
-
-    export module exporter {
-        /**
-         * ColumnDef settings for exporter
-         */
-        export interface IColumnDef {
-            /**
-             * the alignment you'd like for this specific column when exported into a pdf.
-             * Can be 'left', 'right', 'center' or any other valid pdfMake alignment option.
-             */
-            exporterPdfAlign?: string;
-            /**
-             * Suppresses export for this column. Used by selection and expandable.
-             */
-            exporterSuppressExport?: boolean;
-        }
-
-        /**
-         * GridOptions for exporter feature, these are available to be set using the ui-grid gridOptions
-         */
-        export interface IGridOptions<TEntity> {
-            /**
-             * This promise is needed when exporting all rows, and the data need to be provided by server side.
-             * Default is null
-             * @default null
-             * @returns {ng.IPromise<Array<TEntity>>} A promise to load all data from server
-             */
-            exporterAllDataFn?: () => ng.IPromise<Array<TEntity>>;
-            /**
-             * @deprecated
-             * DEPRECATED - exporterAllDataFn used to be called this, but it wasn't a promise,
-             * it was a function that returned a promise. Deprecated, but supported for backward compatibility,
-             * use exporterAllDataFn instead.
-             * @returns {ng.IPromise<Array<TEntity>>} A promise to load all data from server
-             */
-            exporterAllDataPromise?: () => ng.IPromise<Array<TEntity>>;
-            /**
-             * The character to use as column separator link
-             * Defaults to ','
-             * @default ','
-             */
-            exporterCsvColumnSeparator?: string;
-            /**
-             * The default filename to use when saving the downloaded csv. This will only work in some browsers.
-             * Defaults to 'download.csv'
-             * @default 'download.csv'
-             */
-            exporterCsvFilename?: string;
-            /**
-             * A function to call for each field before exporting it.
-             * Allows massaging of raw data into a display format, for example if you have applied filters to convert
-             * codes into decodes, or you require a specific date format in the exported content.
-             * The method is called once for each field exported, and provides the grid,
-             * the gridCol, and the GridRow for you to use as context in massaging the data.
-             *
-             * @param {IGridInstance} grid The grid
-             * @param {IGridRow} row Current row
-             * @param {IGridColumn} col Current column
-             * @param {any} value The cell value
-             * @returns {any} Formatted value
-             */
-            exporterFieldCallback?: (grid: IGridInstanceOf<TEntity>,
-                                     row: uiGrid.IGridRowOf<TEntity>,
-                                     col: IGridColumnOf<TEntity>,
-                                     value: any) => any;
-            /**
-             * A function to apply to the header displayNames before exporting. Useful for internationalisation,
-             * for example if you were using angular-translate you'd set this to $translate.instant.
-             * Note that this call must be synchronous, it cannot be a call that returns a promise.
-             *
-             * Behaviour can be changed to pass in name instead of displayName through use
-             * of exporterHeaderFilterUseName: true.
-             * @param {string} displayName
-             * @returns {string} The filtered header
-             */
-            exporterHeaderFilter?: (displayName: string) => string;
-            /**
-             * Defaults to false, which leads to displayName being passed into the headerFilter.
-             * If set to true, then will pass name instead.
-             * @default false
-             */
-            exporterHeaderFilterUseName?: boolean;
-            /**
-             * Add csv export menu items to the ui-grid grid menu, if it's present. Defaults to true.
-             * @default true
-             */
-            exporterMenuCsv?: boolean;
-            /**
-             * The text to show on the exporter menu button link
-             * Defaults to 'Export'
-             * @default 'Export'
-             */
-            exporterMenuLabel?: string;
-            /**
-             * Add pdf export menu items to the ui-grid grid menu, if it's present.
-             * Defaults to true.
-             * @default true
-             */
-            exporterMenuPdf?: boolean;
-            /**
-             * Some versions of excel don't like the utf-16 BOM on the front,
-             * and it comes through as  in the first column header.
-             * Setting this option to false will suppress this,
-             * at the expense of proper utf-16 handling in applications that do recognise the BOM
-             * Defaults to false
-             * @default false
-             */
-            exporterOlderExcelCompatibility?: boolean;
-            /**
-             * A custom callback routine that changes the pdf document,
-             * adding any custom styling or content that is supported by pdfMake.
-             * Takes in the complete docDefinition, and must return an updated docDefinition ready for pdfMake.
-             * Example
-             * In this example we add a style to the style array, so that we can use it in our footer definition.
-             * @param {any} docDefinition Document definition in pdfMake format
-             */
-            exporterPdfCustomFormatter?: (docDefinition: any) => any;
-            /**
-             * The default style in pdfMake format
-             * @todo replace with pdfmake format
-             */
-            exporterPdfDefaultStyle?: any;
-            /**
-             * The default filename to use when saving the downloaded pdf,
-             * only used in IE (other browsers open pdfs in a new window)
-             * Defaults to 'download.pdf'
-             * @default 'download.pdf'
-             */
-            exporterPdfFilename?: string;
-            /**
-             * The footer section for pdf exports. Can be simple text, a more complex object in pdfMake format, or it
-             * can be a function, allowing page numbers and the like
-             * @todo replace any with pdfmake format
-             */
-            exporterPdfFooter?: string | any | { (currentPage: number, pageCount: number): string };
-            /**
-             * The header section for pdf exports. Can be simple text, a more complex object in pdfMake format, or it
-             * can be a function, allowing page numbers and the like
-             * @todo replace any with pdfmake format
-             */
-            exporterPdfHeader?: string | any | { (currentPage: number, pageCount: number): string };
-            /**
-             * The maxium grid width - the current grid width will be scaled to match this,
-             * with any fixed width columns being adjusted accordingly.
-             * Defaults to 720 (for A4 landscape), use 670 for LETTER
-             * @default 720
-             */
-            exporterPdfMaxGridWidth?: number;
-            /**
-             * The orientation, should be a valid pdfMake value, 'landscape' or 'portrait'
-             * Defaults to landscape
-             * @default 'landscape'
-             */
-            exporterPdfOrientation?: string;
-            /**
-             * The orientation, should be a valid pdfMake paper size, usually 'A4' or 'LETTER' pdfMake page sizes
-             * Defaults to A4
-             * @default 'A4'
-             */
-            exporterPdfPageSize?: string;
-            /**
-             * exporterPdfTableHeaderStyle
-             * @todo replace any with pdfmake format
-             */
-            exporterPdfTableHeaderStyle?: any;
-            /**
-             * A tableLayout in pdfMake format, controls gridlines and the like. We use the default layout usually.
-             * Defaults to null, which means no layout
-             * @default null
-             * @todo replace any with pdfmake format
-             */
-            exporterPdfTableLayout?: any;
-            /**
-             * The tableStyle in pdfMake format
-             * Defaults to ```{ margin: [0, 5, 0, 15] }```
-             * @default { margin: [0, 5, 0, 15] }
-             * @todo replace any with pdfmake format
-             */
-            exporterPdfTableStyle?: any;
-            /**
-             * Columns that should not be exported.
-             *
-             * The selectionRowHeader is already automatically suppressed,
-             * but if you had a button column or some other "system" column that shouldn't be shown in the output,
-             * then add it in this list.
-             *
-             * You should provide an array of column names.
-             * Defaults to: []
-             * @default []
-             */
-            exporterSuppressColumns?: Array<string>;
-            /**
-             * Don't show the export menu button, implying the user will roll their own UI for calling the exporter
-             * Defaults to false
-             * @default false
-             */
-            exporterSuppressMenu?: boolean;
-        }
-
-        /**
-         * GridRow settings for exporter
-         */
-        export interface IGridRow {
-            /**
-             * If set to false, then don't export this row, notwithstanding visible or other settings.
-             * Defaults to true
-             * @default true
-             */
-            exporterEnableExporting?: boolean;
-        }
-
-        /**
-         * Public Api for exporter feature
-         */
-        export interface IGridExporterApi {
-            /**
-             * Exports rows from the grid in csv format, the data exported is selected based on the provided options
-             * @param {string} rowTypes which rows to export, valid values are uiGridExporterConstants.ALL,
-             * uiGridExporterConstants.VISIBLE, uiGridExporterConstants.SELECTED
-             * @param {string} colTypes which columns to export, valid values are uiGridExporterConstants.ALL,
-             * uiGridExporterConstants.VISIBLE
-             */
-            csvExport(rowTypes: string, colTypes: string): void;
-            /**
-             * Exports rows from the grid in pdf format, the data exported is selected based on the provided options
-             * Note that this function has a dependency on pdfMake, all going well this has been installed for you. The
-             * resulting pdf opens in a new browser window.
-             * @param {string} rowTypes which rows to export, valid values are uiGridExporterConstants.ALL,
-             * uiGridExporterConstants.VISIBLE, uiGridExporterConstants.SELECTED
-             * @param {string} colTypes which columns to export, valid values are uiGridExporterConstants.ALL,
-             * uiGridExporterConstants.VISIBLE
-             */
-            pdfExport(rowTypes: string, colTypes: string): void;
-        }
-
-        /**
-         * constants available in exporter module
-         */
-        export interface IUiGridExporterConstants {
-            featureName: string;
-            /** export all data, including data not visible.  Can be set for either rowTypes or colTypes */
-            ALL: string;
-            /** export only visible data, including data not visible.  Can be set for either rowTypes or colTypes */
-            VISIBLE: string;
-            /**
-             * Export all data, including data not visible.
-             * Can be set only for rowTypes, selection of only some columns is not supported
-             */
-            SELECTED: string;
-            CSV_CONTENT: string;
-            BUTTON_LABEL: string;
-            FILE_NAME: string;
-        }
-    }
-
-    export module grouping {
-        /**
-         * ColumnDef for grouping feature, these are available to be set using the ui-grid gridOptions.columnDefs
-         */
-        export interface IColumnDef {
-            /** Enable grouping on this column.  Defaults to true. */
-            enableGrouping?: boolean;
-            /**
-             * Set the grouping for a column.
-             * Note that aggregation used to be included in grouping, but is now separately set on the column via
-             * treeAggregation setting in treeBase
-             *
-             * We group in the priority order given, this will also put these columns to the high order of the sort
-             * irrespective of the sort priority given them.
-             * If there is no sort defined then we sort ascending, if there is a sort defined then we use that sort.
-             *
-             * If the groupPriority is undefined or less than 0, then we expect to be aggregating,
-             * and we look at the aggregation types to determine what sort of aggregation we can do.
-             * Values are in the constants file, but include SUM, COUNT, MAX, MIN
-             *
-             * groupPriorities should generally be sequential, if they're not then the next time getGrouping is called
-             * we'll renumber them to be sequential.
-             * Defaults to undefined.
-             */
-            grouping?: {
-                /**
-                 * number, starts at 0, if less than 0 or undefined then we're aggregating in this column
-                 */
-                groupPriority: number
-            };
-            /**
-             * Show the aggregation menu on this column.  Defaults to true
-             * @default true
-             */
-            groupingShowAggregationMenu?: boolean;
-            /**
-             * Show the grouping (group and ungroup items) menu on this column.  Defaults to true
-             * @default true
-             */
-            groupingShowGroupingMenu?: boolean;
-        }
-
-        /**
-         * GridOptions for grouping feature, these are available to be set using the ui-grid gridOptions
-         */
-        export interface IGridOptions {
-            /**
-             * Allows group header rows to be selected.
-             * Defaults to false
-             * @default false
-             */
-            enableGrouping?: boolean;
-            /**
-             * Enable row grouping for entire grid.
-             * Defaults to true
-             * @default true
-             */
-            enableGroupHeaderSelection?: boolean;
-            /**
-             * The string to use for the grouping header row label on rows which contain
-             * a null or undefined value in the grouped column.
-             * Defaults to "Null"
-             * @default 'Null'
-             */
-            groupingNullLabel?: string;
-            /**
-             * Shows counts on the groupHeader rows.
-             * Note that if you are using a cellFilter or a sortingAlgorithm which relies on a specific format or data
-             * type, showing counts may cause that to break, since the group header rows will always be a string with
-             * groupingShowCounts enabled. Defaults to true except on columns of type 'date'
-             * @default true
-             */
-            groupingShowCounts?: boolean;
-        }
-
-        /**
-         * Public Api for grouping feature
-         */
-        export interface IGridGroupingApi<TEntity> {
-            // Methods
-            /**
-             * Sets the aggregation type on a column.
-             * If the column is currently grouped then it removes the grouping first.
-             * If the aggregationDef is null then will result in the aggregation being removed.
-             * @param {string} columnName The name of the column we want to aggregate
-             * @param {string | function} or aggregationDef one of the recognised types from uiGridGroupingConstants or
-             * a custom aggregation function.
-             * @param {string} [aggregationLabel] The label to use for aggregation
-             */
-            aggregateColumn(columnName: string, or: string | Function, aggregationLabel?: string): void;
-            /**
-             * Clear any grouped columns and any aggregations.
-             * Doesn't remove sorting, as we don't know whether that sorting was added by grouping or was there
-             * beforehand
-             */
-            clearGrouping(): void;
-            /**
-             * Get the grouping configuration for this grid, used by the saveState feature.
-             * Adds expandedState to the information provided by the internal getGrouping,
-             * and removes any aggregations that have a source of grouping
-             * (i.e. will be automatically reapplied when we regroup the column)
-             * @param {boolean} getExpanded whether or not to return the expanded state
-             */
-            getGrouping(getExpanded: boolean): IGridGroupingConfiguration;
-            /**
-             * Adds this column to the existing grouping, at the end of the priority order.
-             * If the column doesn't have a sort, adds one, by default ASC.
-             * This column will move to the left of any non-group columns.
-             * The move is handled in a columnProcessor, so it gets called as part of refresh.
-             * @param {string} columnName the name of the column we want to group
-             */
-            groupColumn(columnName: string): void;
-            /**
-             * Set the grouping configuration for this grid, used by the saveState feature,
-             * but can also be used by any user to specify a combined grouping and aggregation configuration
-             * @param {IGridGroupingConfiguration} config The config to apply, in the format provided out by getGrouping
-             */
-            setGrouping(config: IGridGroupingConfiguration): void;
-            /**
-             * Removes the groupPriority from this column.
-             * If the column was previously aggregated the aggregation will come back. The sort will remain.
-             *
-             * This column will move to the right of any other group columns, the move is handled in a columnProcessor,
-             * so it gets called as part of refresh
-             * @param {string} columnName the name of the column to ungroup
-             */
-            ungroupColumn(columnName: string): void;
-
-            // Events
-            on: {
-                /**
-                 * raised whenever aggregation is changed, added or removed from a column
-                 * @param {ng.IScope} scope Grid Scope
-                 * @param {aggregationChangedHandler} handler Callback method
-                 */
-                aggregationChanged: (scope: ng.IScope, handler: aggregationChangedHandler<TEntity>) => void;
-                /**
-                 * raised whenever the grouped columns change
-                 * @param {ng.IScope} scope Grid Scope
-                 * @param {groupingChangedHandler} handler Callback method
-                 */
-                groupingChanged: (scope: ng.IScope, handler: groupingChangedHandler<TEntity>) => void;
-            };
-        }
-        /**
-         * Grid grouping configuration for the grid.  Used by the saveState feature
-         */
-        export interface IGridGroupingConfiguration {
-            /**
-             * GroupArray.  Sorted by groupPriority
-             */
-            grouping: Array<IGripGroup>;
-            /**
-             * Array of aggregation objects
-             */
-            treeAggregations: Array<IGridTreeAggregations>;
-            /**
-             * Hash of currently expanded nodes
-             */
-            expandedState?: IGridExpandedHash;
-        }
-
-        export interface IGripGroup {
-            field: string;
-            colName: string;
-            groupPriority: number;
-        }
-
-        export interface IGridTreeAggregations {
-            field: string;
-            colName: string;
-            aggregation: string;
-        }
-
-        /**
-         * Recursive hash of the currently expanded and collapsed nodes.
-         */
-        export interface IGridExpandedHash {
-            [key: string]: IGridExpandedHash | string;
-        }
-        export interface aggregationChangedHandler<TEntity> {
-            /**
-             * raised whenever aggregation is changed, added or removed from a column
-             * @param {IGridColumn} col the column which on which aggregation changed.
-             *        The aggregation type is available as col.treeAggregation.type
-             */
-            (col: IGridColumnOf<TEntity>): void;
-        }
-
-        export interface groupingChangedHandler<TEntity> {
-            /**
-             * raised whenever the grouped columns changes
-             * @param {IGridColumn} col the column which on which grouping changed.
-             *   The new grouping is available as col.grouping
-             */
-            (col: IGridColumnOf<TEntity>): void;
-        }
-
-        /**
-         * Constants available in grouping module including all constants declared in the treeBase module.
-         * These are manually copied as there isn't an easy way to include constants in another constants file, and we
-         * don't want to make users include treeBase.
-         */
-        interface IUiGridGroupingConstants extends ISharedTreeConstants {
-            featureName: string;
-        }
-    }
-
-    export module importer {
-        /**
-         * GridOptions for importer feature, these are available to be set using the ui-grid gridOptions
-         */
-        export interface IGridOptions<TEntity> {
-            /**
-             * A mandatory callback function that adds data to the source data array.
-             * The grid generally doesn't add rows to the source data array,
-             * it is tidier to handle this through a user callback.
-             * @param {IGridInstance} grid The grid we're importing into, may be useful in some way
-             * @param {Array<TEntity>} newObjects An array of new objects that you should add to your data
-             */
-            importerDataAddCallback?: (grid: IGridInstanceOf<TEntity>, newObjects: Array<TEntity>) => void;
-            /**
-             * A callback function that provides custom error handling,
-             * rather than the standard grid behaviour of an alert box and a console message.
-             * You might use this to internationalise the console log messages,
-             * or to write to a custom logging routine that returned errors to the server.
-             * @param {IGridInstance} grid the grid we're importing into, may be useful if you're positioning messages
-             * @param {string} errorKey one of the i18n keys the importer can return -
-             *        * importer.noHeaders
-             *        * importer.noObjects
-             *        * importer.invalidCsv
-             *        * importer.invalidJson
-             *        * importer.jsonNotArray
-             * @param {string} consoleMessage the English console message that importer would have written
-             * @param {any} context the context data that importer would have appended to that console message,
-             *        often the file content itself or the element that is in error
-             */
-            importerErrorCallback?: (grid: IGridInstanceOf<TEntity>, errorKey: string, consoleMessage: string,
-                context: any) => void;
-            /**
-             * A callback function that will filter (usually translate) a single header.
-             * Used when you want to match the passed in column names to the column displayName after the header filter.
-             * Your callback routine needs to return the filtered header value.
-             * @param {string} displayName The displayName to translate
-             * @returns {string} The translated name
-             */
-            importerHeaderFilter?: (displayName: string) => string;
-            /**
-             * A callback that massages the data for each object.
-             * For example, you might have data stored as a code value, but display the decode.
-             * This callback can be used to change the decoded value back into a code.
-             * Defaults to angular.identity.
-             * @param {IGridInstance} grid The grid
-             * @param {TEntity} newObject The new object as importer has created it.  Modify it and return modified
-             * version
-             * @returns {TEntity} The modified object
-             * @default angular.identity
-             */
-            importerObjectCallback?: (grid: IGridInstanceOf<TEntity>, newObject: TEntity) => TEntity;
-            /**
-             * A callback function that will process headers using custom
-             * logic.  Set this callback function if the headers that your user will provide in their
-             * import file don't necessarily match the grid header or field names.  This might commonly
-             * occur where your application is internationalised, and therefore the field names
-             * that the user recognises are in a different language than the field names that
-             * ui-grid knows about.
-             *
-             * Defaults to the internal `processHeaders` method, which seeks to match using both
-             * displayName and column.name.  Any non-matching columns are discarded.
-             *
-             * Your callback routine should respond by processing the header array, and returning an array
-             * of matching column names.  A null value in any given position means "don't import this column"
-             * @param {IGridInstance} grid the grid we're importing into
-             * @param {Array<string>} headerArray an array of the text from the first row of the csv file,
-             * which you need to match to column.names
-             * @returns {Array<string>} array of matching column names, in the same order as the headerArray
-             */
-            importerProcessHeaders?: (grid: IGridInstanceOf<TEntity>, headerArray: Array<string>) => Array<string>;
-            /**
-             * Whether or not importer is enabled.  Automatically set
-             * to false if the user's browser does not support the required fileApi.
-             * Otherwise defaults to true.
-             * @default true
-             */
-            enableImporter?: boolean;
-            /**
-             * An object on which we call `new` to create each new row before inserting it into
-             * the data array.  Typically this would be a $resource entity, which means that if you're using
-             * the rowEdit feature, you can directly call save on this entity when the save event is triggered.
-             *
-             * Defaults to a vanilla javascript object
-             * @default {}
-             */
-            importerNewObject?: Function;
-            /**
-             * Whether or not to show an item in the grid menu.
-             * Defaults to true.
-             * @default true
-             */
-            importerShowMenu?: boolean;
-        }
-
-        /**
-         * Public Api for importer feature
-         */
-        export interface IGridImporterApi {
-            /**
-             * Imports a file into the grid using the file object provided. Bypasses the grid menu
-             * @param {File} fileObject The file we want to import as a javascript File object
-             */
-            importFile(fileObject: File): void;
-        }
-
-        /**
-         * constants available in importer module
-         */
-        export interface IUiGridImporterConstants {
-            featureName: string;
-        }
-    }
-
-    /**
-     * This module provides infinite scroll functionality to ui-grid
-     */
-    export module infiniteScroll {
-        /**
-         * GridOptions for infinite scroll feature, these are available to be set using the ui-grid gridOptions
-         */
-        export interface IGridOptions {
-            /**
-             * Enable infinite scrolling for this grid
-             * Defaults to true
-             * @default true
-             */
-            enableInfiniteScroll?: boolean;
-        }
-
-        /**
-         * Public API for infinite scroll feature
-         */
-        export interface IGridInfiniteScrollApi<TEntity> {
-            // Methods
-            /**
-             * Call this function when you have loaded the additional data requested.
-             * You should set scrollUp and scrollDown to indicate whether there are still more pages in each direction.
-             *
-             * If you call dataLoaded without first calling saveScrollPercentage, then we will scroll the user to the
-             * start of the newly loaded data.  This usually makes scrolling smooth, but be jumpy with large
-             * infiniteScrollRowsFromEnd values, and on variable speed internet connections.
-             * Using saveScrollPercentage as demonstrated in the tutorial should give a smoother scrolling experience
-             * for users.
-             *
-             * See infinite_scroll tutorial for example of usage
-             * @param {boolean} scrollUp if set to false flags that there are no more pages upwards, so don't fire any
-             *        more infinite scroll events upward
-             * @param {boolean} scrollDown if set to false flags that there are no more pages downwards, so don't fire
-             *        any more infinite scroll events downward
-             * @returns {ng.IPromise<any>} a promise that is resolved when the grid scrolling is fully adjusted.
-             *          If you're planning to remove pages, you should wait on this promise first, or you'll break the
-             *          scroll positioning
-             */
-            dataLoaded(scrollUp: boolean, scrollDown: boolean): ng.IPromise<any>;
-            /**
-             * Adjusts the scroll position after you've removed data at the bottom
-             * @param {boolean} scrollUp flag that there are pages upwards, fire infinite scroll events upward
-             * @param {boolean} scrollDown flag that there are pages downwards, so fire infinite scroll events downward
-             * @returns {ng.IPromise<any>} A promise that is resolved when scrolling finishes
-             */
-            dataRemovedBottom(scrollUp: boolean, scrollDown: boolean): ng.IPromise<any>;
-            /**
-             * Adjusts the scroll position after you've removed data at the bottom.
-             * You should have called saveScrollPercentage before you remove the data,
-             * and if you're doing this in response to a needMoreData you should wait
-             * until the promise from loadData has resolved before you start removing data
-             *
-             * @param {IGridInstance} grid the grid we're working on
-             * @param {boolean} scrollUp flag that there are pages upwards, fire infinite scroll events upward
-             * @param {boolean} scrollDown flag that there are pages downwards, so fire infinite scroll events downward
-             * @returns {ng.IPromise<any>} A promise that is resolved when scrolling finishes
-             */
-            dataRemovedBottom(grid: IGridInstanceOf<TEntity>, scrollUp: boolean, scrollDown: boolean): ng.IPromise<any>;
-            /**
-             * Adjusts the scroll position after you've removed data at the bottom
-             * @param {boolean} scrollUp flag that there are pages upwards, fire infinite scroll events upward
-             * @param {boolean} scrollDown flag that there are pages downwards, so fire infinite scroll events downward
-             * @returns {ng.IPromise<any>} A promise that is resolved when scrolling finishes
-             */
-            dataRemovedTop(scrollUp: boolean, scrollDown: boolean): ng.IPromise<any>;
-            /**
-             * Adjusts the scroll position after you've removed data at the bottom.
-             * You should have called saveScrollPercentage before you remove the data,
-             * and if you're doing this in response to a needMoreData you should wait
-             * until the promise from loadData has resolved before you start removing data
-             *
-             * @param {IGridInstance} grid the grid we're working on
-             * @param {boolean} scrollUp flag that there are pages upwards, fire infinite scroll events upward
-             * @param {boolean} scrollDown flag that there are pages downwards, so fire infinite scroll events downward
-             * @returns {ng.IPromise<any>} A promise that is resolved when scrolling finishes
-             */
-            dataRemovedTop(grid: IGridInstanceOf<TEntity>, scrollUp: boolean, scrollDown: boolean): ng.IPromise<any>;
-            /**
-             * Call this function when you have taken some action that makes the current scroll position invalid.
-             * For example, if you're using external sorting and you've resorted then you might reset the scroll,
-             * or if you've otherwise substantially changed the data, perhaps you've reused an
-             * existing grid for a new data set
-             *
-             * You must tell us whether there is data upwards or downwards after the reset
-             * @param {boolean} scrollUp flag that there are pages upwards, fire infinite scroll events upward
-             * @param {boolean} scrollDown flag that there are pages downwards, so fire infinite scroll events downward
-             * @returns {ng.IPromise<any>} A promise that is resolved when scrolling finishes
-             */
-            resetScroll(scrollUp: boolean, scrollDown: boolean): ng.IPromise<any>;
-            /**
-             * Saves the scroll percentage and number of visible rows before you adjust the data,
-             * used if you're subsequently going to call dataRemovedTop or dataRemovedBottom
-             */
-            saveScrollPercentage(): void;
-
-            // Events
-            on: {
-                /**
-                 * This event fires when scroll reaches bottom percentage of grid and needs to load data
-                 */
-                needLoadMoreData: Function;
-                /**
-                 * This event fires when scroll reaches top percentage of grid and needs to load data
-                 */
-                needLoadMoreDataTop: Function;
-            }
-        }
-    }
-
-    export module moveColumns {
-        /**
-         * Column Definition for move column features.
-         * These are available to be set using the ui-grid `gridOptions.columnDefs`
-         */
-        export interface IColumnDef {
-            /**
-             * Enable column moving for the column
-             */
-            enableColumnMoving?: boolean;
-        }
-
-        /**
-         * Options for configuring the move column feature, these are available to be set using the ui-grid gridOptions
-         */
-        export interface IGridOptions {
-            /**
-             * If defined, sets the default value for the colMovable flag on each individual colDefs
-             * if their individual enableColumnMoving configuration is not defined.
-             * Defaults to true.
-             * @default true
-             */
-            enableColumnMoving?: boolean;
-        }
-
-        export interface IGridMoveColumnsApi {
-            // Methods
-            /**
-             * Method can be used to change column position
-             * @param {number} originalPosition Original column position as a 0 indexed integer
-             * @param {number} newPosition New column position as a 0 indexed integer
-             */
-            moveColumn(originalPosition: number, newPosition: number): void;
-
-            // Events
-            on: {
-                /**
-                 * Raised when a column is moved
-                 * @param {ng.IScope} scope Grid Scope
-                 * @param {columnPositionChangedHandler} handler Callback Function
-                 */
-                columnPositionChanged?: (scope: ng.IScope, handler: columnPositionChangedHandler) => void;
-            };
-        }
-        export interface columnPositionChangedHandler {
-            (colDef: IColumnDef, originalPosition: number, finalPosition: number): void;
-        }
-    }
-
-    export module pagination {
-        /**
-         * Pagination related grid options
-         */
-        export interface IGridOptions {
-            /**
-             * Enables pagination, defaults to true
-             * @default true
-             */
-            enablePagination?: boolean;
-            /**
-             * Enables the paginator at the bottom of the grid. Turn this off, if you want to implement your own
-             * controls outside the grid
-             */
-            enablePaginationControls?: boolean;
-            /**
-             * Current page number, defaults to 1
-             * @default 1
-             */
-            paginationCurrentPage?: number;
-            /**
-             * Page size, defaults to the first item in paginationPageSizes, or 0 if paginationPageSizes is empty
-             */
-            paginationPageSize?: number;
-            /**
-             * Array of page sizes, defaults to [250, 500, 1000]
-             * @default [250, 500, 1000]
-             */
-            paginationPageSizes?: Array<number>;
-            /**
-             * A custom template for the pager, defaults to ui-grid/pagination
-             * @default 'ui-grid/pagination'
-             */
-            paginationTemplate?: string;
-            /**
-             * Total number of items, set automatically when client side pagination,
-             * needs set by user for server side pagination
-             */
-            totalItems?: number;
-            /**
-             * Disables client side pagination. When true, handle the paginationChanged event and set data and
-             * totalItems, defaults to false
-             * @default false
-             */
-            useExternalPagination?: boolean;
-        }
-        export interface IGridPaginationApi {
-            // Methods
-            /**
-             * Get the current page
-             * @returns {number} the number of the current page
-             */
-            getPage(): number;
-            /**
-             * Get the total number of pages
-             * @returns {number} the total number of pages
-             */
-            getTotalPages(): number;
-            /**
-             * Moves to the next page if possible
-             */
-            nextPage(): void;
-            /**
-             * Moves to the previous page if we're not on the first page.
-             */
-            previousPage(): void;
-            /**
-             * Moves to the requested page
-             * @param {number} page The number of the page that should be displayed
-             */
-            seek(page: number): void;
-
-            // Events
-            on: {
-                /**
-                 * This event fires when the pageSize or currentPage changes
-                 * @param {ng.IScope} scope The grid scope
-                 * @param {paginationChangedHandler} handler Callback
-                 */
-                paginationChanged: (scope: ng.IScope, handler: paginationChangedHandler) => void;
-            };
-        }
-
-        /**
-         * The callback for paginationChanged
-         * @param {number} newPage requested page number
-         * @param {number} pageSize requested page size
-         */
-        export interface paginationChangedHandler {
-            (newPage: number, pageSize: number): void;
-        }
-    }
-
-    export module pinning {
-        /**
-         * ColumnDef for pinning feature, these are available to be set using the ui-grid gridOptions.columnDefs
-         */
-        export interface IColumnDef {
-            /**
-             * Enable pinning for the individual column.  Defaults to true
-             * @default true
-             */
-            enablePinning?: boolean;
-            /**
-             * Column is pinned left when grid is rendered.  Defaults to false
-             * @default false
-             */
-            pinnedLeft?: boolean;
-            /**
-             * Column is pinned right when grid is rendered.  Defaults to false
-             * @default false
-             */
-            pinnedRight?: boolean;
-        }
-
-        /**
-         * Pinning related grid options
-         */
-        export interface IGridOptions {
-            /**
-             * Enable pinning for the entire grid.
-             * Defaults to true
-             * @default true
-             */
-            enablePinning?: boolean;
-        }
-
-        export interface IGridPinningApi<TEntity> {
-            // Methods
-            /**
-             * Pin column left, right, or none
-             * @param {IGridColumn} col The column being pinned
-             * @param {string} container One of the recognized container types from uiGridPinningConstants
-             */
-            pinColumn(col: IGridColumnOf<TEntity>, container: string): void;
-
-            // Events
-            /**
-             * raised when column pin state has changed
-             * @param {ng.IScope} scope The grid scope
-             * @param {columnPinHandler} handler Callback
-             */
-            columnPin: (scope: ng.IScope, handler: columnPinHandler) => void;
-        }
-
-        export interface columnPinHandler {
-            /**
-             * Callback to columnPin event
-             * @param {IColumnDef} colDef The column that was changed
-             * @param {string} container The render container the column is in.  Options:
-             *        * uiGridPinningConstants.container.LEFT
-             *        * uiGridPinningConstants.container.RIGHT,
-             *        * uiGridPinningConstants.container.NONE
-             */
-            (colDef: IColumnDef, container: string): void;
-        }
-
-        export interface IUiGridPinningConstants {
-            container: {
-                LEFT: string;
-                RIGHT: string;
-                NONE: string;
-            };
-        }
-    }
-
-    export module resizeColumns {
-        /**
-         * ColumnDef for resizeColumns feature, these are available to be set using the ui-grid gridOptions.columnDefs
-         */
-        export interface IColumnDef {
-            /**
-             * Enable column resizing on an individual column
-             * Defaults to GridOptions.enableColumnResizing
-             */
-            enableColumnResizing?: boolean;
-        }
-        /**
-         * Column Resizing Grid Options
-         */
-        export interface IGridOptions {
-            /**
-             * Enable column resizing on the entire grid
-             * Defaults to true
-             * @default true
-             */
-            enableColumnResizing?: boolean;
-        }
-
-        /**
-         * Public Api for column resize feature
-         */
-        export interface IGridResizeColumnsApi {
-            // Events
-            on: {
-                /**
-                 * Raised when column is resized
-                 * @param {ng.IScope} scope Grid Scope
-                 * @param {columnSizeChangedHandler} handler Callback
-                 */
-                columnSizeChanged: (scope: ng.IScope, handler: columnSizeChangedHandler) => void;
-            };
-        }
-
-        export interface columnSizeChangedHandler {
-            /**
-             * Callback when column size is changed
-             * @param {IColumnDef} colDef The column that was resized
-             * @param {number} delta The change in the size of the column
-             */
-            (colDef: IColumnDef, delta: number): void;
-        }
-    }
-
-    export module rowEdit {
-        /**
-         * Row Edit Grid Options
-         */
-        export interface IGridOptions {
-            /**
-             * How long the grid should wait for another change on this row before triggering a save (in milliseconds).
-             * If set to -1, then saves are never triggered by timer
-             * (implying that the user will call flushDirtyRows() manually)
-             */
-            rowEditWaitInterval?: number;
-        }
-
-        export interface IGridRowEditApi<TEntity> {
-            // Methods
-            /**
-             * Triggers a save event for all currently dirty rows.
-             * Could be used where user presses a save button or navigates away from the page
-             * @param {IGridInstance} grid The grid
-             * @returns {ng.IPromise<Array<any>>} a promise that represents the aggregate of all of the individual save
-             *          promises.  i.e. it will be resolved when all the individual save promises have been resolved.
-             */
-            flushDirtyRows(grid?: IGridInstanceOf<TEntity>): ng.IPromise<Array<any>>;
-            /**
-             * Returns all currently dirty rows
-             * @param {IGridInstance} grid The target grid
-             * @returns {Array<IGridRow>} An array of gridRows that are currently dirty
-             */
-            getDirtyRows(grid?: IGridInstanceOf<TEntity>): Array<IGridRowOf<TEntity>>;
-            /**
-             * Returns all currently errored rows
-             * @param {IGridInstance} grid The target grid
-             * @returns {Array<IGridRow>} An array of gridRows that are currently in error
-             */
-            getErrorRows(grid?: IGridInstanceOf<TEntity>): Array<IGridRowOf<TEntity>>;
-            /**
-             * Sets each of the rows passed in dataRows to be clean,
-             * removing them from the dirty cache and the error cache,
-             * and clearing the error flag and the dirty flag
-             * @param {Array<TEntity>} dataRows the data entities for which the gridRows should be set clean
-             */
-            setRowsClean(dataRows: Array<TEntity>): void;
-            /**
-             * Sets each of the rows passed in dataRows to be dirty,
-             * Note that if you have only just inserted the rows into your data,
-             * you will need to wait for a $digest cycle before the gridRows are present.  As a result, this is often
-             * wrapped with $interval or $timeout.
-             * @param {Array<TEntity>} dataRows the data entities for which the gridRows should be set dirty
-             */
-            setRowsDirty(dataRows: Array<TEntity>): void;
-            /**
-             * Sets the promise associated with the row save, mandatory that the saveRow event handler calls this method
-             * somewhere before returning
-             * @param {any} rowEntity A data row from the grid for which a save has been initiated
-             * @param {ng.IPromise<any>} savePromise A promise that will be resolved when the save is successful, or
-             *        rejected if the save fails
-             */
-            setSavePromise(rowEntity: Object, savePromise: ng.IPromise<any>): void;
-
-            // Events
-            on: {
-                /**
-                 * Raised when a row is ready for saving.
-                 * Once your row has saved you may need to use angular.extend to update the data entity
-                 * with any changed data from your save.
-                 * i.e. lock version information, or last update time/user information
-                 *
-                 * Your method should call setSavePromise somewhere in the body before returning control.
-                 * The feature will then wait, with the gridRow greyed out whilst this promise is being resolved.
-                 * @param {ng.IScope} scope The grid scope
-                 * @param {saveRowHandler} handler Callback
-                 */
-                saveRow: (scope: ng.IScope, handler: saveRowHandler<TEntity>) => void;
-            };
-        }
-
-        export interface saveRowHandler<TEntity> {
-            /**
-             * Callback method for save row
-             * @param {TEntity} rowEntity The options.data element that was edited
-             */
-            (rowEntity: TEntity): void;
-        }
-    }
-
-    export module saveState {
-        /**
-         * Save State Grid Options
-         */
-        export interface IGridOptions {
-            /**
-             * Save the current filter state for each column
-             * Defaults to true
-             * @default true
-             */
-            saveFilter?: boolean;
-            /**
-             * Save the current focused cell. On returning to this focused cell we'll also scroll.
-             * This option is preferred to the saveScroll option, so is set to true by default.
-             * If saveScroll is set to true then this option will be disabled.
-             *
-             * By default this option saves the current row number and column number, and returns to that row and
-             * column. However, if you define a saveRowIdentity function, then it will return you to the currently
-             * selected column within that row (in a business sense - so if some rows have been deleted, it will still
-             * find the same data, presuming it still exists in the list. If it isn't in the list then it will instead
-             * return to the same row number - i.e. scroll percentage)
-             *
-             * Note that this option will do nothing if the cellNav feature is not enabled.
-             *
-             * Defaults to true (unless saveScroll is true)
-             * @default true
-             */
-            saveFocus?: boolean;
-            /**
-             * Save the grouping configuration. If set to true and the grouping feature is not enabled then does
-             * nothing. Defaults to true
-             * @default true
-             */
-            saveGrouping?: boolean;
-            /**
-             * Save the grouping row expanded states.
-             * If set to true and the grouping feature is not enabled then does nothing.
-             *
-             * This can be quite a bit of data, in many cases you wouldn't want to save this information.
-             *
-             * Defaults to false
-             * @default false
-             */
-            saveGroupingExpandedStates?: boolean;
-            /**
-             * Restore the current column order.
-             * Note that unless you've provided the user with some way to reorder their columns
-             * (for example the move columns feature), this makes little sense.
-             * Defaults to true
-             * @default true
-             */
-            saveOrder?: boolean;
-            /**
-             * Save pinning state for columns.
-             * Defaults to true
-             * @default true
-             */
-            savePinning?: boolean;
-            /**
-             * A function that can be called, passing in a rowEntity, and that will return a unique id for that row.
-             * This might simply return the id field from that row (if you have one),
-             * or it might concatenate some fields within the row to make a unique value.
-             *
-             * This value will be used to find the same row again and set the focus to it, if it exists when we return.
-             *
-             * Defaults to undefined
-             * @default undefined
-             */
-            saveRowIdentity?: boolean;
-            /**
-             * Save the current scroll position.
-             * Note that this is saved as the percentage of the grid scrolled -
-             * so if your user returns to a grid with a significantly different number of rows
-             * (perhaps some data has been deleted) then the scroll won't actually show the same rows as before.
-             * If you want to scroll to a specific row then you should instead use the saveFocus option,
-             * which is the default.
-             *
-             * Note that this element will only be saved if the cellNav feature is enabled
-             *
-             * Defaults to false
-             * @default false
-             */
-            saveScroll?: boolean;
-            /**
-             * Save the currently selected rows.
-             * If the saveRowIdentity callback is defined, then it will save the id of the row and select that.
-             * If not, then it will attempt to select the rows by row number,
-             * which will give the wrong results if the data set has changed in the mean-time.
-             *
-             * Note that this option only does anything if the selection feature is enabled.
-             *
-             * Defaults to true
-             * @default true
-             */
-            saveSelection?: boolean;
-            /**
-             * Save the current sort state for each column
-             * Defaults to true
-             *
-             * @default true
-             */
-            saveSort?: boolean;
-            /**
-             * Save the treeView configuration. If set to true and the treeView feature is not enabled then does
-             * nothing.
-             *
-             * @default true;
-             */
-            saveTreeView?: boolean;
-            /**
-             * Save whether or not columns are visible
-             * Defaults to true
-             * @default true
-             */
-            saveVisible?: boolean;
-            /**
-             * Save the current column widths.
-             * Note that unless you've provided the user with some way to resize their columns
-             * (say the resize columns feature), then this makes little sense.
-             * Defaults to true
-             * @default true
-             */
-            saveWidths?: boolean;
-        }
-
-        export interface IGridSaveStateApi {
-            // Methods
-            /**
-             * Restores the provided state into the grid
-             * @param {ng.IScope} $scope A scope we can broadcast on
-             * @param {IGridSavedState} state The state that should ve restored into the grid
-             */
-            restore($scope: ng.IScope, state: IGridSavedState): void;
-            /**
-             * Packages the current state of the grid into an object, and provides it to the user for saving
-             * @returns {IGridSavedState} Current grid state as a POJO
-             */
-            save(): IGridSavedState;
-        }
-
-        export interface IGridSavedState {
-            columns?: Array<ISavedColumn>;
-            scrollFocus?: ISavedScrollFocus;
-            selection: Array<IRowVal>;
-            grouping: grouping.IGridGroupingConfiguration;
-            treeView: treeBase.ITreeState;
-        }
-
-        interface ISavedColumn {
-            name: string;
-            visible?: boolean;
-            width?: number;
-            sort?: ISortInfo;
-            filters?: Array<IFilterOptions>;
-            pinned?: string;
-        }
-
-        interface ISavedScrollFocus {
-            focus?: boolean;
-            colName?: string;
-            rowVal?: IRowVal;
-        }
-
-        interface IRowVal {
-            identity: boolean;
-            row: number | any;
-        }
-    }
-
-    export module selection {
-        /**
-         * GridOptions for selection feature, these are available to be set using the ui-grid gridOptions
-         */
-        export interface IGridOptions {
-            /**
-             * Shows the total number of selected items in footer if true.
-             * Defaults to true.
-             * GridOptions.showGridFooter must also be set to true.
-             * @default true
-             */
-            enableFooterTotalSelected?: boolean;
-            /**
-             * Enable selection by clicking anywhere on the row.
-             * Defaults to false if enableRowHeaderSelection is true, otherwise defaults to false.
-             */
-            enableFullRowSelection?: boolean;
-            /**
-             * Enable a row header to be used for selection
-             * Defaults to true
-             * @default true
-             */
-            enableRowHeaderSelection?: boolean;
-            /**
-             * Enable row selection for entire grid.
-             * Defaults to true
-             */
-            enableRowSelection?: boolean;
-            /**
-             * Enable the select all checkbox at the top of the selectionRowHeader
-             * Defaults to true
-             * @default true
-             */
-            enableSelectAll?: boolean;
-            /**
-             * If selected rows are changed in bulk, either via the API or via the selectAll checkbox,
-             * then a separate event is fired.
-             * Setting this option to false will cause the rowSelectionChanged event to be called multiple times instead
-             * Defaults to true
-             * @default true
-             */
-            enableSelectionBatchEvent?: boolean;
-            /**
-             * Makes it possible to specify a method that evaluates for each row and sets its "enableSelection"
-             * property.
-             */
-            isRowSelectable?: boolean;
-            /**
-             * Enable multiple row selection only when using the ctrlKey or shiftKey. Requires multiSelect to be true.
-             * Defaults to false
-             * @default false
-             */
-            modifierKeysToMultiSelect?: boolean;
-            /**
-             * Enable multiple row selection for entire grid
-             * Defaults to true
-             * @default true
-             */
-            multiSelect?: boolean;
-            /**
-             * Prevent a row from being unselected.
-             * Works in conjunction with multiselect = false and gridApi.selection.selectRow() to allow you to
-             * create a single selection only grid -
-             * a row is always selected, you can only select different rows, you can't unselect the row.
-             * Defaults to false
-             * @default false
-             */
-            noUnselect?: boolean;
-            /**
-             * can be used to set a custom width for the row header selection column
-             * Defaults to 30px
-             * @default 30
-             */
-            selectionRowHeaderWidth?: number;
-        }
-        /**
-         * Selection related grid row
-         */
-        export interface IGridRow {
-            /**
-             * Enable row selection for this row, only settable by internal code.
-             *
-             * The grouping feature, for example, might set group header rows to not be selectable.
-             * Defaults to true
-             * @default true
-             */
-            enableSelection?: boolean;
-            /**
-             * Selected state of row.
-             * Should be readonly.
-             * Make any changes to selected state using setSelected().
-             * Defaults to false
-             *
-             * @readonly
-             * @default false
-             */
-            isSelected?: boolean;
-            /**
-             * Sets the isSelected property and updates the selectedCount
-             * Changes to isSelected state should only be made via this function
-             * @param selected Value to set
-             */
-            setSelected(selected: boolean): void;
-        }
-        /**
-         * Public Api for selection feature
-         */
-        export interface IGridSelectionApi<TEntity> {
-            // Methods
-            /**
-             * Unselects All Rows
-             * @param {ng.IAngularEvent} event object if raised from event
-             */
-            clearSelectedRows(event?: ng.IAngularEvent): void;
-            /**
-             * Returns whether or not the selectAll checkbox is currently ticked.
-             * The grid doesn't automatically select rows when you add extra data -
-             * so when you add data you need to explicitly check whether the selectAll is set,
-             * and then call setVisible rows if it is
-             * @returns {boolean} Whether or not selectAll checkbox is ticked
-             */
-            getSelectAllState(): boolean;
-            /**
-             * returns all selected rows as gridRows
-             * @returns {Array<IGridRow>} The selected rows
-             */
-            getSelectedGridRows(): Array<uiGrid.IGridRowOf<TEntity>>;
-            /**
-             * Gets selected rows as entities
-             * @returns {Array<TEntity>} Selected row entities
-             */
-            getSelectedRows(): Array<TEntity>;
-            /**
-             * Selects all rows.  Does nothing if multiselect = false
-             * @param {ng.IAngularEvent} event object if raised from event
-             */
-            selectAllRows(event?: ng.IAngularEvent): void;
-            /**
-             * Selects all visible rows.  Does nothing if multiselect = false
-             * @param {ng.IAngularEvent} event object if raised from event
-             */
-            selectAllVisibleRows(event?: ng.IAngularEvent): void;
-            /**
-             * Select row by data
-             * @param {TEntity} rowEntity gridOptions.data[] array value
-             * @param {ng.IAngularEvent} event object if raised from event
-             */
-            selectRow(rowEntity: TEntity, event?: ng.IAngularEvent): void;
-            /**
-             * Select the specified row by visible index
-             * (i.e. if you specify row 0 you'll get the first visible row selected).
-             *
-             * In this context visible means of those rows that are theoretically visible (i.e. not filtered),
-             * rather than rows currently rendered on the screen.
-             *
-             * @param {number} index Index within rowsVisible array
-             * @param {ng.IAngularEvent} event object if raised from event
-             */
-            selectRowByVisibleIndex(index: number, event?: ng.IAngularEvent): void;
-            /**
-             * Sets the current gridOption.modifierKeysToMultiSelect to true or false
-             * @param {boolean} multiSelect true to only allow multiple rows when using ctrlKey or shiftKey is used
-             */
-            setModifierKeysToMultiSelect(multiSelect: boolean): void;
-            /**
-             * Sets the current gridOption.multiSelect to true or false
-             * @param {boolean} multiSelect true to allow multiple rows
-             */
-            setMultiSelect(multiSelect: boolean): void;
-            /**
-             * Toggles data row as selected or unselected
-             * @param {TEntity} rowEntity gridOptions.data[] array value
-             * @param {ng.IAngularEvent} event object if raised from event
-             */
-            toggleRowSelection(rowEntity: TEntity, event?: ng.IAngularEvent): void;
-            /**
-             * UnSelect the data row
-             * @param {TEntity} rowEntity gridOptions.data[] array value
-             * @param {ng.IAngularEvent} event object if raised from event
-             */
-            unSelectRow(rowEntity: TEntity, event?: ng.IAngularEvent): void;
-
-            // Events
-            on: {
-                /**
-                 * is raised after the row.isSelected state is changed
-                 * @param {ng.IScope} scope grid scope
-                 * @param {rowSelectionChangedHandler} handler callback
-                 */
-                rowSelectionChanged: (scope: ng.IScope, handler: rowSelectionChangedHandler<TEntity>) => void;
-                /**
-                 * is raised after the row.isSelected state is changed in bulk,
-                 * if the enableSelectionBatchEvent option is set to true (which it is by default).
-                 * This allows more efficient processing of bulk events.
-                 * @param {ng.IScope} scope grid scope
-                 * @param {rowSelectionChangedBatchHandler} handler callback
-                 */
-                rowSelectionChangedBatch: (scope: ng.IScope, handler: rowSelectionChangedBatchHandler<TEntity>) => void;
-            };
-        }
-        export interface rowSelectionChangedHandler<TEntity> {
-            /**
-             * Callback for row selection changed
-             * @param {IGridRow} row The selected rows
-             * @param {ng.IAngularEvent} event object if raised from event
-             */
-            (row: uiGrid.IGridRowOf<TEntity>, event?: ng.IAngularEvent): void;
-        }
-
-        export interface rowSelectionChangedBatchHandler<TEntity> {
-            /**
-             * Callback for row selection changed batch
-             * @param {IGridRow} row The selected rows
-             * @param {ng.IAngularEvent} event object if raised from event
-             */
-            (row: Array<uiGrid.IGridRowOf<TEntity>>, event?: ng.IAngularEvent): void;
-        }
-    }
-
-    export module treeBase {
-        /**
-         * ColumnDef for tree feature, these are available to be set using the ui-grid gridOptions.columnDefs
-         */
-        export interface IColumnDef<TEntity> {
-            /**
-             * A custom function that populates aggregation.rendered.
-             * This is called when a particular aggregation has been fully calculated, and we want to render the value.
-             *
-             * With the native aggregation options we just concatenate aggregation.label and aggregation.value,
-             * but if you wanted to apply a filter or otherwise manipulate the label or the value,
-             * you can do so with this function.
-             *
-             * This function will be called after the the default finalizerFn.  Defaults to undefined
-             * @default undefined
-             * @param {IGridTreeBaseAggregationObject} aggregation Aggregation object
-             */
-            customTreeAggregationFinalizerFn?: (aggregation: IGridTreeBaseAggregationObject) => void;
-            /**
-             * A custom function that aggregates rows into some form of total.
-             * Aggregations run row-by-row, the function needs to be capable of creating a running total.
-             *
-             * The function will be provided the aggregation item (in which you can store running totals),
-             * the row value that is to be aggregated,
-             * and that same row value converted to a number (most aggregations work on numbers)
-             * @param {IGridTreeBaseAggregationObject} aggregation
-             * @param {any} fieldValue Value of the field
-             * @param {number} numValue Numeric value of the field
-             * @param {IGridRow} row Row objet
-             */
-            customTreeAggregationFn?: (aggregation: IGridTreeBaseAggregationObject, fieldValue: any, numValue: number,
-                row: IGridRowOf<TEntity>) => void;
-            /**
-             * A custom label to use for this aggregation.  If providedm, we don't use native i18n
-             */
-            treeAggregationLabel?: string;
-            /**
-             * Use one of the native or grid-level aggregation methods for calculating aggregations on this column.
-             * Native method are in the constants file and include: SUM, COUNT, MIN, MAX, AVG.
-             * This may also be the name of an aggregation function defined with treeCustomAggregations.
-             *
-             * If you are using aggregations you should either:
-             * * also use grouping, in which case the aggregations are displayed in the group header, OR
-             * * use treeView, in which case you can set `treeAggregationUpdateEntity: true` in the colDef, and
-             * treeBase
-             *   will store the aggregation information in the entity, or you can set `treeAggregationUpdateEntity:
-             * false` in the colDef, and you need to manual retrieve the calculated aggregations from the
-             * row.treeNode.aggregations
-             *
-             * Takes precedence over a treeAggregationFn, the two options should not be used together.
-             * Defaults to undefined.
-             * @default undefined
-             */
-            treeAggregationType?: string;
-            /**
-             * Store calculated aggregations into the entity,
-             * allowing them to be displayed in the grid using a standard cellTemplate.
-             * This defaults to true.
-             * If you are using grouping then you shouldn't set it to false, as then the aggregations won't display.
-             *
-             * If you are using treeView in most cases you'll want to set this to true.
-             * This will result in getCellValue returning the aggregation rather than whatever was stored in the cell
-             * attribute on the entity.
-             *
-             * If you want to render the underlying entity value (and do something else with the aggregation),
-             * then you could use a custom cellTemplate to display row.entity.myAttribute, rather than using
-             * getCellValue.
-             *
-             * Defaults to true
-             * @default true
-             */
-            treeAggregationUpdateEntity?: boolean;
-        }
-
-        /**
-         * Tree Base Grid Options
-         */
-        export interface IGridOptions<TEntity> {
-            /**
-             * If set to true, show the expand/collapse button even if there are no children of a node.
-             * You'd use this if you're planning to dynamically load the children
-             * Defaults to true, grouping overrides to false
-             * @default true
-             */
-            showTreeExpandNoChildren?: boolean;
-            /**
-             * If set to false, don't create the row header. Youll need to programatically control the expand states
-             * Defaults to true
-             * @default true
-             */
-            showTreeRowHeader?: boolean;
-            /**
-             * Define custom aggregation functions.
-             * The properties of this object will be aggregation types available for use on columnDef
-             * with treeAggregationType or through the column menu.
-             *
-             * If a function defined here uses the same name as one of the native aggregations,
-             * this one will take precedence
-             *
-             * The finalizerFn may be used to manipulate the value before rendering, or to apply a custom rendered
-             * value. If aggregation.rendered is left undefined, the value will be rendered. Note that the native
-             * aggregation functions use an finalizerFn to concatenate the label and the value.
-             *
-             * Defaults to {}
-             * @default {}
-             */
-            treeCustomAggregations?: { [index: string]: IGridTreeBaseCustomAggregation<TEntity>; };
-            /**
-             * Number of pixels of indent for the icon at each tree level, wider indents are visually more pleasing,
-             * but will make the tree row header wider
-             * Defaults to 10
-             *
-             * @default 10
-             */
-            treeIndent?: number;
-            /**
-             * If set to true, row header even if there are no tree nodes
-             */
-            treeRowHeaderAlwaysVisible?: boolean;
-            /**
-             * Base width of the tree header, provides for a single level of tree.
-             * This is incremented by treeIndent for each extra level
-             * Defaults to 30
-             *
-             * @default 30
-             */
-            treeRowHeaderBaseWidth?: number;
-        }
-
-        export interface IGridTreeBaseCustomAggregation<TEntity> {
-            label: string;
-            aggregationFn: (aggregation: IGridTreeBaseAggregationObject, fieldValue: any, numValue: number,
-                row?: IGridRowOf<TEntity>) => void;
-            finalizerFn?: (aggregation: IGridTreeBaseAggregationObject) => void;
-        }
-        export interface IGridTreeBaseAggregationObject {
-            count: number;
-            sum: number;
-            value: number;
-            rendered?: string;
-        }
-
-        export interface IGridTreeBaseApi<TEntity> {
-            // Methods
-            /**
-             * Collapse all tree rows
-             */
-            collapseAllRows(): void;
-            /**
-             * collapse the specified row. When you expand the row again, all grandchildren will retain their state
-             * @param {IGridRow} row The row to collapse
-             */
-            collapseRow(row: IGridRowOf<TEntity>): void;
-            /**
-             * collapse all children of the specified row. When you expand the row again, all grandchildren will be
-             * collapsed
-             * @param {IGridRow} row The row to collapse children of
-             */
-            collapseRowChildren(row: IGridRowOf<TEntity>): void;
-            /**
-             * Expands all tree rows
-             */
-            expandAllRows(): void;
-            /**
-             * Expand the immediate children of the specified row
-             * @param {IGridRow} row The row to expand
-             */
-            expandRow(row: IGridRowOf<TEntity>): void;
-            /**
-             * Get the children of the specified row
-             * @param {IGridRow} row The row you want the children of
-             * @returns Array<IGridRow> Array of children rows
-             */
-            getRowChildren(row: IGridRowOf<TEntity>): Array<IGridRowOf<TEntity>>;
-            /**
-             * Get the tree state for this grid, used by the saveState feature Returned treeState as an object
-             * ```{ expandedState: { uid: 'expanded', uid: 'collapsed' } }```
-             * where expandedState is a hash of row uid and the current expanded state
-             * @returns {ITreeState} tree state
-             * NOTE this is an incomplete feature in uiGrid
-             */
-            getTreeState(): ITreeState;
-            /**
-             * Set the expanded states of the tree
-             * @param {ITreeState} config The config you want to apply, in the format provided by getTreeState
-             */
-            setTreeState(config: ITreeState): void;
-            /**
-             * call expand if row is collapsed, and collapse if it is expanded
-             * @param {IGridRow} row The row to toggle
-             */
-            toggleRowTreeState(row: IGridRowOf<TEntity>): void;
-
-            // Events
-            on: {
-                /**
-                 * Raised when a row is collapsed.  Doesn't really have a purpose at the moment.  Included for symmetry
-                 * @param {ng.IScope} scope Grid scope
-                 * @param {rowCollapsedHandler} handler Callback
-                 */
-                rowCollapsed: (scope: ng.IScope, handler: rowCollapsedHandler<TEntity>) => void;
-                /**
-                 * Raised whenever a row is expanded.
-                 *
-                 * If you are dynamically rendering your tree,
-                 * in your callback you can retrieve the children of this row and load them into the grid data.
-                 *
-                 * When the data is loaded, the grid will automatically refresh to show these new rows.
-                 * @param {ng.IScope} scope Grid Scope
-                 * @param {rowExpandedHandler} handler Callback
-                 */
-                rowExpanded: (scope: ng.IScope, handler: rowExpandedHandler<TEntity>) => void;
-            };
-        }
-
-        export interface ITreeState {
-            expandedState: {
-                [index: string]: string
-            };
-        }
-
-        export interface rowCollapsedHandler<TEntity> {
-            /**
-             * Row Collapsed callback
-             * @param {IGridRow} row The row that was collapsed.  You can also retrieve the grid from this row with
-             * row.grid
-             */
-            (row: IGridRowOf<TEntity>): void;
-        }
-
-        export interface rowExpandedHandler<TEntity> {
-            /**
-             * Row Expanded callback
-             * @param {IGridRow} row The row that was expanded.  You can also retrieve the grid from this row with
-             * row.grid
-             */
-            (row: IGridRowOf<TEntity>): void;
-        }
-
-        /**
-         * Constants available in treeBase module.
-         *
-         * These constants are manually copied into grouping and treeView,
-         * as I haven't found a way to simply include them,
-         * and it's not worth investing time in for something that changes very infrequently.
-         */
-        export interface IUiGridTreeBaseConstants extends ISharedTreeConstants {
-            featureName: string;
-        }
-    }
-
-    export module treeView {
-        /**
-         * GridOptions for treeView feature, these are available to be set using the ui-grid gridOptions
-         *
-         * Many tree options are set on treeBase, make sure to look at that feature in conjunction with these options
-         */
-        export interface IGridOptions {
-            /**
-             * Enable row tree view for entire grid.
-             * Defaults to true
-             * @default true
-             */
-            enableTreeView?: boolean;
-        }
-
-        export interface IUiGridTreeViewConstants extends ISharedTreeConstants {
-            featureName: string;
-        }
-    }
-
-    export interface ISharedTreeConstants {
-        rowHeaderColName: string;
-        EXPANDED: string;
-        COLLAPSED: string;
-        aggregation: {
-            COUNT: string;
-            SUM: string;
-            MAX: string;
-            MIN: string;
-            AVG: string;
-        };
-    }
-
-    // Tree View
-
-    export interface IGridApiConstructor<TEntity> {
-        new (grid: IGridInstanceOf<TEntity>): IGridApiOf<TEntity>;
-    }
-    export type IGridApi = IGridApiOf<any>;
-    export interface IGridApiOf<TEntity> {
-        /**
-         * Registers a new event for the given feature. The event will get a .raise and .on prepended to it
-         *
-         * .raise.eventName() - takes no arguments
-         *
-         * .on.eventName(scope, callBackFn, _this)
-         * scope - a scope reference to add a deregister call to the scopes .$on('destroy').
-         * Scope is optional and can be a null value, but in this case you must deregister it yourself via the returned
-         * deregister function
-         * callBackFn - The function to call
-         * _this - optional this context variable for callbackFn. If omitted, grid.api will be used for the context
-         *
-         * .on.eventName returns a dereg function that will remove the listener. It's not necessary to use it as the
-         * listener will be removed when the scope is destroyed.
-         * @param featureName name of the feature that raises the event
-         * @param eventName name of the event
-         */
-        registerEvent(featureName: string, eventName: string): void;
-        /**
-         * Registers features and events from a simple objectMap.
-         * eventObjectMap must be in this format (multiple features allowed)
-         * @param eventObjectMap map of feature/event names
-         */
-        registerEventsFromObject(eventObjectMap: any): void;
-        /**
-         * Registers a new event for the given feature
-         * @param featureName name of the feature
-         * @param methodName name of the method
-         * @param callBackFn function to execute
-         * @param _this binds to callBackFn. Defaults to gridApi.grid
-         */
-        registerMethod(featureName: string, methodName: string, callBackFn: Function, _this: any): void;
-        /**
-         * Registers features and methods from a simple objectMap.
-         * eventObjectMap must be in this format (multiple features allowed)
-         * {featureName: { methodNameOne:function(args){}, methodNameTwo:function(args){} }
-         * @param eventObjectMap map of feature/event names
-         * @param _this binds this to _this for all functions. Defaults to gridApi.grid
-         */
-        registerMethodsFromObject(eventObjectMap: any, _this: any): void;
-        /**
-         * Used to execute a function while disabling the specified event listeners.
-         * Disables the listenerFunctions, executes the callbackFn, and then enables the listenerFunctions again
-         * @param listenerFuncs listenerFunc or array of listenerFuncs to suppress.
-         *                      These must be the same functions that were used in the .on.eventName method
-         * @param callBackFn function to execute
-         */
-        suppressEvents(listenerFuncs: Function | Array<Function>, callBackFn: Function): void;
-
-        /**
-         * Core Api
-         */
-        core: IGridCoreApi<TEntity>;
-
-        /**
-         * Cell Nav Api
-         */
-        cellNav: cellNav.ICellNavApi<TEntity>;
-
-        /**
-         * Move Columns Api
-         */
-        colMovable: moveColumns.IGridMoveColumnsApi;
-
-        /**
-         * Grid row resizable Api
-         */
-        colResizable: resizeColumns.IGridResizeColumnsApi;
-
-        /**
-         * Edit Api
-         */
-        edit: edit.IGridEditApi<TEntity>;
-
-        /**
-         * Expandable Api
-         */
-        expandable: expandable.IGridExpandableApi<TEntity>;
-
-        /**
-         * Exporter Api
-         */
-        exporter: exporter.IGridExporterApi;
-
-        /**
-         * Grouping Api
-         */
-        grouping: grouping.IGridGroupingApi<TEntity>;
-
-        /**
-         * Importer Api
-         */
-        importer: importer.IGridImporterApi;
-
-        /**
-         * Infinite Scroll Api
-         */
-        infiniteScroll: infiniteScroll.IGridInfiniteScrollApi<TEntity>;
-
-        /**
-         * Pagination Api
-         */
-        pagination: pagination.IGridPaginationApi;
-
-        /**
-         * Pinning Api
-         */
-        pinning: pinning.IGridPinningApi<TEntity>;
-
-        /**
-         * Grid Row Edit Api
-         */
-        rowEdit: rowEdit.IGridRowEditApi<TEntity>;
-
-        /**
-         * Grid Save State Api
-         */
-        saveState: saveState.IGridSaveStateApi;
-        /**
-         * Selection Api
-         */
-        selection: selection.IGridSelectionApi<TEntity>;
-
-        /**
-         * Tree Base Api
-         */
-        treeBase: treeBase.IGridTreeBaseApi<TEntity>;
-
-        /**
-         * A grid instance is made available in the gridApi.
-         */
-        grid: IGridInstanceOf<TEntity>;
-    }
-    export interface IGridRowConstructor<TEntity> {
-        /**
-         * GridRow is the viewModel for one logical row on the grid.
-         * A grid Row is not necessarily a one-to-one relation to gridOptions.data.
-         * @param entity the array item from GridOptions.data
-         * @param index the current position of the row in the array
-         * @param reference to the parent grid
-         */
-        new(entity: TEntity, index: number, reference: IGridInstanceOf<TEntity>): IGridRowOf<TEntity>;
-    }
-    export type IGridRow = IGridRowOf<any>;
-    export interface IGridRowOf<TEntity> extends cellNav.IGridRow, edit.IGridRow, exporter.IGridRow,
-        selection.IGridRow, expandable.IGridRow {
-        /** A reference to an item in gridOptions.data[] */
-        entity: TEntity;
-        /** A reference back to the grid */
-        grid: IGridInstanceOf<TEntity>;
-        /**
-         * height of each individual row. changing the height will flag all
-         * row renderContainers to recalculate their canvas height
-         */
-        height: number;
-        /** uniqueId of row */
-        uid: string;
-        /** if true, row will be rendered */
-        visible: boolean;
-        // Additional features enabled by other modules
-        /**
-         * If set to false, then don't export this row,
-         * notwithstanding visible or other settings
-         * Defaults to true
-         * @default true
-         */
-        exporterEnableExporting: boolean;
-        /**
-         * Clears an override on the row that forces it to always be invisible.
-         * Emits the rowsVisibleChanged event if it changed the row visibility.
-         *
-         * This method can be called from the api, passing in the gridRow we want altered.
-         * It should really work by calling gridRow.clearRowInvisible,
-         * but that's not the way I coded it, and too late to change now.
-         * Changed to just call the internal function row.clearThisRowInvisible().
-         * @param row the row we want to clear the invisible flag
-         */
-        clearRowInvisible(row: IGridRowOf<TEntity>): void;
-        /**
-         * Clears any override on the row visibility, returning it to normal visibility calculations.
-         * Emits the rowsVisibleChanged event
-         * @param reason the reason (usually the module) for the row to be invisible. E.g. grouping, user, filter
-         * @param fromRowsProcessor whether we were called from a rowsProcessor, passed through to evaluateRowVisibility
-         */
-        clearRowInvisible(reason: string, fromRowsProcessor: boolean): void;
-        /**
-         * Determines whether the row should be visible based on invisibleReason,
-         * and if it changes the row visibility, then emits the rowsVisibleChanged event.
-         * Queues a grid refresh, but doesn't call it directly to avoid hitting lots of
-         * grid refreshes.
-         */
-        evaluateRowVisibility(fromRowProcessor: boolean): void;
-        /**
-         * returns the qualified field name minus the row path ie: entity.fieldA
-         * @param col column instance
-         * @returns resulting name that can be evaluated against a row
-         */
-        getEntityQualifiedColField(col: IGridColumnOf<TEntity>): string;
-        /**
-         * returns the qualified field name as it exists on scope ie: row.entity.fieldA
-         * @param col column instance
-         * @returns resulting name that can be evaluated on scope
-         */
-        getQualifiedColField(col: IGridColumnOf<TEntity>): string;
-        /**
-         * Sets an override on the row that forces it to always be invisible.
-         * Emits the rowsVisibleChanged event if it changed the row visibility.
-         * This method can be called from the api, passing in the gridRow we want altered.
-         * It should really work by calling gridRow.setRowInvisible,
-         * but that's not the way I coded it, and too late to change now.
-         * Changed to just call the internal function row.setThisRowInvisible().
-         * @param row the row we want to set to invisible
-         */
-        setRowInvisible(row: IGridRowOf<TEntity>): void;
-        /**
-         * Sets an override on the row that forces it to always be invisible.
-         * Emits the rowsVisibleChanged event if it changed the row visibility
-         * @param reason the reason (usually the module) for the row to be invisible. E.g. grouping, user, filter
-         * @param fromRowsProcessor whether we were called from a rowsProcessor, passed through to evaluateRowVisibility
-         */
-        setThisRowInvisible(reason: string, fromRowsProcessor: boolean): void;
-    }
-
-    export interface IGridColumnConstructor<TEntity> {
-        /**
-         * Represents the viewModel for each column.
-         * Any state or methods needed for a Grid Column are defined on this prototype
-         * @param gridCol Column definition
-         * @param index the current position of the column in the array
-         * @param grid reference to the grid
-         */
-        new(gridCol: IColumnDefOf<TEntity>, index: number, grid: IGridInstanceOf<TEntity>): IGridColumnOf<TEntity>;
-    }
-
-    export type IGridColumn = IGridColumnOf<any>;
-    export interface IGridColumnOf<TEntity> {
-        /** Column definition */
-        colDef: uiGrid.IColumnDefOf<TEntity>;
-        /**
-         * Column name that will be shown in the header.
-         * If displayName is not provided then one is generated using the name.
-         */
-        displayName?: string;
-        /**
-         * field must be provided if you wish to bind to a property in the data source.
-         * Should be an angular expression that evaluates against grid.options.data array element.
-         * Can be a complex expression: employee.address.city, or can be a function: employee.getFullAddress().
-         * See the angular docs on binding expressions.
-         */
-        field?: string;
-        /** Filter on this column */
-        filter?: IFilterOptions;
-        /** Filters for this column. Includes 'term' property bound to filter input elements */
-        filters?: Array<IFilterOptions>;
-        /** Reference to grid containing the column */
-        grid: IGridInstanceOf<TEntity>;
-        name?: string;
-        /** Sort on this column */
-        sort?: ISortInfo;
-        /** Algorithm to use for sorting this column. Takes 'a' and 'b' parameters like any normal sorting function. */
-        sortingAlgorithm?: (a: any, b: any) => number;
-        /** Column width */
-        width: number;
-        /**
-         * Initializes a column
-         * @param colDef the column def to associate with this column
-         * @param uid The unique and immutable uid we'd like to allocate to this column
-         * @param grid the grid we'd like to create this column in
-         */
-        GridColumn(colDef: IColumnDefOf<TEntity>, uid: number, grid: IGridInstanceOf<TEntity>): void;
-        /**
-         * Gets the aggregation label from colDef.aggregationLabel if specified or by using i18n,
-         * including deciding whether or not to display based on colDef.aggregationHideLabel.
-         * @param label the i18n lookup value to use for the column label
-         */
-        getAggregationText(label: string): void;
-        /**
-         * gets the aggregation value based on the aggregation type for this column.
-         * Debounced using scrollDebounce option setting
-         */
-        getAggregationValue(): string;
-        /**
-         * Returns the class name for the column
-         * @param prefixDot if true, will return .className instead of className
-         */
-        getColClass(prefixDot: boolean): string;
-        /** Returns the class definition for th column */
-        getColClassDefinition(): string;
-        /**
-         * Returns the render container object that this column belongs to.
-         * Columns will be default be in the body render container
-         * if they aren't allocated to one specifically.
-         */
-        getRenderContainer(): any; // @todo replace with interface for render container
-        /** Hides the column by setting colDef.visible = false */
-        hideColumn(): void;
-        /** Returns true if column is in the left render container */
-        isPinnedLeft(): boolean;
-        /** Returns true if column is in the right render container */
-        isPinnedRight(): boolean;
-        /**
-         * Sets a property on the column using the passed in columnDef,
-         * and setting the defaultValue if the value cannot be found on the colDef
-         * @param colDef the column def to look in for the property value
-         * @param propName the property name we'd like to set
-         * @param defaultValue the value to use if the colDef doesn't provide the setting
-         */
-        setPropertyOrDefault(colDef: IColumnDefOf<TEntity>, propName: string, defaultValue: any): void;
-        /** Makes the column visible by setting colDef.visible = true */
-        showColumn(): void;
-        /**
-         * Moves settings from the columnDef down onto the column, and sets properties as appropriate
-         * @param colDef the column def to look in for property value
-         * @param isNew whether the column is being newly created, if not we're updating an existing
-         *              column, and some items such as the sort shouldn't be copied down
-         */
-        updateColumnDef(colDef: IColumnDefOf<TEntity>, isNew: boolean): void;
-    }
-
-    /**
-     * Definition / configuration of an individual column,
-     * which would typically be one of many column definitions within the
-     * gridOptions.columnDefs array
-     */
-    export type IColumnDef = IColumnDefOf<any>;
-    export interface IColumnDefOf<TEntity> extends cellNav.IColumnDef, edit.IColumnDef<TEntity>, exporter.IColumnDef,
-        grouping.IColumnDef, moveColumns.IColumnDef, pinning.IColumnDef, resizeColumns.IColumnDef,
-        treeBase.IColumnDef<TEntity> {
-        /**
-         * defaults to false
-         * if set to true hides the label text in the aggregation footer, so only the value is displayed.
-         */
-        aggregationHideLabel?: boolean;
-        /**
-         * The aggregation that you'd like to show in the columnFooter for this column.
-         * Valid values are in uiGridConstants, and currently include:
-         * uiGridConstants.aggregationTypes.count, uiGridConstants.aggregationTypes.sum,
-         * uiGridConstants.aggregationTypes.avg, uiGridConstants.aggregationTypes.min,
-         * uiGridConstants.aggregationTypes.max.
-         *
-         * You can also provide a function as the aggregation type,
-         * in this case your function needs to accept the full set of visible rows,
-         * and return a value that should be shown
-         */
-        aggregationType?: number | Function;
-        /**
-         * cellClass can be a string specifying the class to append to a cell
-         * or it can be a function(row,rowRenderIndex, col, colRenderIndex)
-         * that returns a class name
-         */
-        cellClass?: string | ICellClassGetter<TEntity>;
-        /** cellFilter is a filter to apply to the content of each cell */
-        cellFilter?: string;
-        /**
-         * a custom template for each cell in this column.
-         * The default is ui-grid/uiGridCell.
-         * If you are using the cellNav feature,
-         * this template must contain a div that can receive focus.
-         */
-        cellTemplate?: string;
-        /**
-         * Whether or not to show a tooltip when a user hovers over the cell.
-         * If set to false, no tooltip.
-         * If true, the cell value is shown in the tooltip (useful if you have long values in your cells),
-         * if a function then that function is called passing in the row and the col cellTooltip(row, col)
-         * and the return value is shown in the tooltip,
-         * if it is a static string then displays that static string.
-         * Defaults to false
-         * @default false
-         */
-        cellTooltip?: boolean | string | ICellTooltipGetter<TEntity>;
-        /**
-         * Column name that will be shown in the header.
-         * If displayName is not provided then one is generated using the name.
-         */
-        displayName?: string;
-        /**
-         * if column menus are enabled, controls the column menus for this specific column
-         * (i.e. if gridOptions.enableColumnMenus, then you can control column menus using this option.
-         * If gridOptions.enableColumnMenus === false then you get no column menus irrespective of the value of this
-         * option
-         * ). Defaults to true.
-         * @default true
-         */
-        enableColumnMenu?: boolean;
-        /**
-         * Override for column menus everywhere - if set to false then you get no column menus.
-         * Defaults to true
-         * @default true
-         */
-        enableColumnMenus?: boolean;
-        /** turn off filtering for an individual column, where you've turned on filtering for the overall grid */
-        enableFiltering?: boolean;
-        /**
-         * When set to false, this setting prevents a user from hiding the column using the column menu or the grid
-         * menu.
-         * @default true
-         */
-        enableHiding?: boolean;
-        /**
-         * When enabled, this setting adds sort widgets to the column header, allowing sorting of the data in the
-         * individual column.
-         * @default true
-         */
-        enableSorting?: boolean;
-        /**
-         * field must be provided if you wish to bind to a property in the data source.
-         * Should be an angular expression that evaluates against grid.options.data array element
-         * Can be a complex expression: employee.address.city, or can be a function: employee.getFullAddress().
-         * See the angular docs on binding expressions.
-         */
-        field?: string;
-        /**
-         * Specify a single filter field on this column.
-         * A filter consists of a condition, a term, and a placeholder:
-         */
-        filter?: IFilterOptions;
-        /**
-         * @default false
-         * When true uiGrid will apply the cellFilter before applying search filters
-         */
-        filterCellFiltered?: boolean;
-        /**
-         * a custom template for the filter input. The default is ui-grid/ui-grid-filter
-         */
-        filterHeaderTemplate?: string;
-        /** Specify multiple filter fields */
-        filters?: Array<IFilterOptions>;
-        /**
-         * footerCellClass can be a string specifying the class to append to a cell or it can be
-         * a function(row,rowRenderIndex, col, colRenderIndex) that returns a class name
-         */
-        footerCellClass?: string | IHeaderFooterCellClassGetter<TEntity>;
-        /** footerCellFilter is a filter to apply to the content of the column footer */
-        footerCellFilter?: string;
-        /** a custom template for the footer for this column. The default is ui-grid/uiGridFooterCell */
-        footerCellTemplate?: string;
-        /**
-         * headerCellClass can be a string specifying the class to append to a cell or it can be
-         * a function(row,rowRenderIndex, col, colRenderIndex) that returns a class name
-         */
-        headerCellClass?: string | IHeaderFooterCellClassGetter<TEntity>;
-        /** headerCellFilter is a filter to apply to the content of the column header */
-        headerCellFilter?: string;
-        /** a custom template for the header for this column. The default is ui-grid/uiGridHeaderCell */
-        headerCellTemplate?: string;
-        /**
-         * Whether or not to show a tooltip when a user hovers over the header cell.
-         * If set to false, no tooltip.
-         * If true, the displayName is shown in the tooltip
-         * (useful if you have long values in your headers),
-         * if a function then that function is called passing in the row and the col
-         * headerTooltip( col ), and the return value is shown in the tooltip,
-         * if a static string then shows that static string.
-         * @default false
-         */
-        headerTooltip?: boolean | string | IHeaderTooltipGetter<TEntity>;
-        /** sets the maximum column width */
-        maxWidth?: number;
-        /** used to add menu items to a column. Refer to the tutorial on this functionality */
-        menuItems?: Array<IMenuItem>;
-        /** Sets the minimum column width */
-        minWidth?: number;
-        /**
-         * (mandatory) each column should have a name,
-         * although for backward compatibility with 2.x name can be omitted if field is present
-         */
-        name?: string;
-        /** An object of sort information */
-        sort?: ISortInfo;
-        /**
-         * @default false
-         * When true uiGrid will apply the cellFilter before sorting the data
-         * Note that when using this option uiGrid will assume that the displayed value is a string,
-         * and use the sortAlpha sortFn.
-         * It is possible to return a non-string value from an angularjs filter,
-         * in which case you should define a sortingAlgorithm for the column
-         * which handles the returned type.
-         * You may specify one of the sortingAlgorithms found in the rowSorter service.
-         */
-        sortCellFiltered?: boolean;
-        /**
-         *(optional) An array of sort directions, specifying the order that they should cycle through as
-         * the user repeatedly clicks on the column heading. The default is [null, uiGridConstants.ASC, uiGridConstants.DESC].
-         * Null refers to the unsorted state. This does not affect the initial sort direction; use the sort property for that.
-         * If suppressRemoveSort is also set, the unsorted state will be skipped even if it is listed here. Each direction may
-         * not appear in the list more than once (e.g. [ASC, DESC, DESC] is not allowed), and the list may not be empty.*
-         */
-        sortDirectionCycle?: Array<IUiGridConstants>;
-        /** Algorithm to use for sorting this column */
-        sortingAlgorithm?: (a: any, b: any) => number;
-        /**
-         * When enabled, this setting hides the removeSort option in the menu,
-         * and prevents users from manually removing the sort
-         * @default false
-         */
-        suppressRemoveSort?: boolean;
-        /**
-         * the type of the column, used in sorting. If not provided then the grid will guess the type.
-         * Add this only if the grid guessing is not to your satisfaction.
-         * Note that if you choose date, your dates should be in a javascript date type
-         * One of:
-         * 'string', 'boolean', 'number', 'date', 'object', 'numberStr'
-         */
-        type?: string;
-        /**
-         * sets whether or not the column is visible
-         * @default true
-         */
-        visible?: boolean;
-        /**
-         * sets the column width.  Can be either a number or a percentage, or an * for auto.
-         */
-        width?: number | string;
-    }
-
-    export interface ICellClassGetter<TEntity> {
-        (grid?: IGridInstanceOf<TEntity>, gridRow?: IGridRowOf<TEntity>, gridCol?: IGridColumnOf<TEntity>, rowRenderIndex?: number, colRenderIndex?: number): string;
-    }
-
-    export interface ICellTooltipGetter<TEntity> {
-        (gridRow: IGridRowOf<TEntity>, gridCol: IGridColumnOf<TEntity>): string;
-    }
-    export interface IHeaderTooltipGetter<TEntity> {
-        (gridCol: IGridColumnOf<TEntity>): string;
-    }
-    export interface IHeaderFooterCellClassGetter<TEntity> {
-        (grid: IGridInstanceOf<TEntity>, gridRow: IGridRowOf<TEntity>, gridCol: IGridColumnOf<TEntity>, rowRenderIndex: number, colRenderIndex: number)
-            : string;
-    }
-    export interface IMenuItem {
-        /** controls the title that is displayed in the menu */
-        title?: string;
-        /** the icon shown alongside that title */
-        icon?: string;
-        /** the method to call when the menu is clicked */
-        action?: ($event: ng.IAngularEvent) => void;
-        /** a function to evaluate to determine whether or not to show the item */
-        shown?: () => boolean;
-        /** a function to evaluate to determine whether or not the item is currently selected */
-        active?: () => boolean;
-        /** context to pass to the action function, available in this.context in your handler */
-        context?: any;
-        /** if set to true, the menu should stay open after the action, defaults to false */
-        leaveOpen?: boolean;
-    }
-    export interface ISortInfo {
-        direction?: string;
-        ignoreSort?: boolean;
-        priority?: number;
-    }
-
-    export interface IFilterOptions {
-        /**
-         * condition defines how rows are chosen as matching the filter term.
-         * This can be set to one of the constants in uiGridConstants.filter,
-         * or you can supply a custom filter function that gets passed the
-         * following arguments: [searchTerm, cellValue, row, column].
-         */
-        condition?: number | ((searchTerm: string, cellValue: any, row: IGridRow, column: IGridColumn) => boolean);
-        /**
-         * If set, the filter field will be pre-populated with this value
-         */
-        term?: string;
-        /** String that will be set to the <input>.placeholder attribute */
-        placeholder?: string;
-        /**
-         * set this to true if you have defined a custom function in condition,
-         * and your custom function doesn't require a term
-         * (so it can run even when the term is null)
-         */
-        noTerm?: boolean;
-        /**
-         * only flag currently available is caseSensitive, set to false if you don't want case sensitive matching
-         */
-        flags?: IFilterFlags;
-        /**
-         * defaults to uiGridConstants.filter.INPUT, which gives a text box. If set to uiGridConstants.filter.SELECT
-         * then a select box will be shown with options selectOptions
-         */
-        type?: number | string;
-        /**
-         * options in the format [{ value: 1, label: 'male' }]. No i18n filter is provided, you need to perform the i18n
-         * on the values before you provide them
-         */
-        selectOptions?: Array<ISelectOption>;
-        /**
-         * If set to true then the 'x' button that cancels/clears the filter will not be shown.
-         * @default false
-         */
-        disableCancelButton?: boolean;
-    }
-    export interface ISelectOption {
-        value: number | string;
-        label: string;
-    }
-
-    export interface IFilterFlags {
-        caseSensitive?: boolean;
-    }
-}
-
-declare module 'angular-ui-grid' {
-    export = uiGrid;
-}
diff --git a/ui-router-extras/index.d.ts b/ui-router-extras/index.d.ts
new file mode 100644
index 0000000000..37b06fc9a4
--- /dev/null
+++ b/ui-router-extras/index.d.ts
@@ -0,0 +1,151 @@
+// Type definitions for UI-Router Extras 0.0.14+ (ct.ui.router.extras module)
+// Project: https://github.com/christopherthielen/ui-router-extras
+// Definitions by: Michael Putters <https://github.com/mputters/>, Marcel van de Kamp <https://github.com/marcel-k/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="angular-ui-router" />
+
+import * as angular from 'angularjs';
+
+declare module 'angularjs' {
+    export namespace ui {
+
+
+        /*
+         * $deepStateRedirect
+         */
+        interface IDeepStateRedirectService {
+            /*
+             * This method resets stored $deepStateRedirect data so following transitions will behave like there have not been previous transitions.
+             * @param stateParams Can be passed in to select specific states to reset:
+             *  {
+             *    'paramName': 'paramvalue' | ['list', 'of', 'possible', 'paramvalues']
+             *  }
+             */
+            reset(stateName: string, stateParams?: { [key: string]: string | string[] }): void;
+        }
+
+        /*
+         * Docs: http://christopherthielen.github.io/ui-router-extras/#/dsr
+         */
+        interface IDeepStateRedirectConfig {
+            /*
+             * If no deep state has been recorded, DSR will instead redirect to the default substate and params that you specify.
+             * If default is a string it is interpreted as the substate.
+             */
+            default?: string | IRedirectParams;
+            /*
+             * Specify params: true if your DSR state takes parameters.
+             * If only a subset of the parameters should be included in the parameter grouping for recording deep states,
+             * specify an array of parameter names.
+             */
+            params?: boolean | string[];
+            /*
+             * A callback function that determines whether or not the redirect should actually occur, or changes the redirect to some other state.
+            * Return an object: IRedirectParams to change the redirect
+             */
+            fn?($dsr$: { redirect: IRedirectParams; to: IRedirectParams }): boolean | IRedirectParams;
+        }
+
+        interface IRedirectParams {
+            state: string;
+            params?: ui.IStateParamsService;
+        }
+
+        /*
+         * Previous state
+         */
+        interface IPreviousState {
+            state: IState;
+            params?: ui.IStateParamsService;
+        }
+
+        /**
+         * Previous state service
+         */
+        interface IPreviousStateService {
+
+            /**
+             * Get a previous state
+             * @param memoName Memo name
+             * @return Previous state
+             */
+            get(memoName?: string): IPreviousState;
+
+            /**
+             * Go to a state
+             * @param memoName Memo name
+             * @param options State options
+             * @return Promise
+             */
+            go(memoName: string, options?: IStateOptions): angular.IPromise<any>;
+
+            /**
+             * Memorize a state
+             * @param memoName Memo name
+             * @param defaultStateName Default state name
+             * @param defaultStateParams Default state parameters
+             */
+            memo(memoName: string, defaultStateName?: string, defaultStateParams?: {}): void;
+
+            /**
+             * Forget a memorized name
+             * @param memoName Memo name
+             */
+            forget(memoName: string): void;
+        }
+
+        /**
+        * Sticky state
+        */
+        interface IStickyState extends angular.ui.IState {
+            /*
+            * When marking a state sticky, the state must target its own unique named ui-view.
+            * Docs: http://christopherthielen.github.io/ui-router-extras/#/sticky
+            */
+            sticky?: boolean;
+            /*
+             * The most-recently-activate substate of the DSR marked state is remembered.
+             * When the DSR marked state is transitioned to directly, UI-Router Extras will instead redirect to the remembered state and parameters.
+             * Docs: http://christopherthielen.github.io/ui-router-extras/#/dsr
+             */
+            deepStateRedirect?: boolean | IDeepStateRedirectConfig;
+            /*
+             * Shortname deepStateRedirect prop
+             */
+            dsr?: boolean | IDeepStateRedirectConfig;
+            /*
+             * Function (injectable). Called when a sticky state is navigated away from (inactivated).
+             */
+            onInactivate?: Function;
+            /*
+             * Function (injectable). Called when an inactive sticky state is navigated to (reactivated).
+             */
+            onReactivate?: Function;
+            /*
+             * Note: named views are mandatory when using sticky states!
+             */
+            views?: { [name:string]: angular.ui.IState };
+        }
+
+
+        /**
+         * Sticky state service
+         */
+        interface IStickyStateService {
+            getInactiveStates(): IStickyState[];
+        }
+
+        /**
+         * Sticky state provider
+         */
+        interface IStickyStateProvider extends angular.IServiceProvider {
+            debugMode(): boolean;
+            enableDebug(enabled: boolean): boolean;
+            registerStickyState(state: IStickyState): void;
+        }
+
+    }
+}
+
+
diff --git a/ui-router-extras/tsconfig.json b/ui-router-extras/tsconfig.json
new file mode 100644
index 0000000000..82b2a1e773
--- /dev/null
+++ b/ui-router-extras/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ui-router-extras-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ui-router-extras/ui-router-extras-tests.ts b/ui-router-extras/ui-router-extras-tests.ts
index 045a3049c7..db6f69d486 100644
--- a/ui-router-extras/ui-router-extras-tests.ts
+++ b/ui-router-extras/ui-router-extras-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="ui-router-extras.d.ts"/>
-
+import * as angular from 'angularjs';
 var myApp = angular.module('testModule')
 
 myApp.config(($stateProvider: angular.ui.IStateProvider, $stickyStateProvider: angular.ui.IStickyStateProvider) => {
diff --git a/ui-router-extras/ui-router-extras.d.ts b/ui-router-extras/ui-router-extras.d.ts
deleted file mode 100644
index 0c4673e915..0000000000
--- a/ui-router-extras/ui-router-extras.d.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-// Type definitions for UI-Router Extras 0.0.14+ (ct.ui.router.extras module)
-// Project: https://github.com/christopherthielen/ui-router-extras
-// Definitions by: Michael Putters <https://github.com/mputters/>, Marcel van de Kamp <https://github.com/marcel-k/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../angular-ui-router/angular-ui-router.d.ts" />
-
-// Support for AMD require
-declare module 'angular-ui-router-extras' {
-    var _: string;
-    export = _;
-}
-
-declare namespace angular.ui {
-
-
-    /*
-     * $deepStateRedirect
-     */
-    interface IDeepStateRedirectService {
-        /*
-         * This method resets stored $deepStateRedirect data so following transitions will behave like there have not been previous transitions.
-         * @param stateParams Can be passed in to select specific states to reset:
-         *  {
-         *    'paramName': 'paramvalue' | ['list', 'of', 'possible', 'paramvalues']
-         *  }
-         */
-        reset(stateName: string, stateParams?: { [key: string]: string | string[] }): void;
-    }
-
-    /*
-     * Docs: http://christopherthielen.github.io/ui-router-extras/#/dsr
-     */
-    interface IDeepStateRedirectConfig {
-        /*
-         * If no deep state has been recorded, DSR will instead redirect to the default substate and params that you specify.
-         * If default is a string it is interpreted as the substate.
-         */
-        default?: string | IRedirectParams;
-        /*
-         * Specify params: true if your DSR state takes parameters.
-         * If only a subset of the parameters should be included in the parameter grouping for recording deep states,
-         * specify an array of parameter names.
-         */
-        params?: boolean | string[];
-        /*
-         * A callback function that determines whether or not the redirect should actually occur, or changes the redirect to some other state.
-        * Return an object: IRedirectParams to change the redirect
-         */
-        fn?($dsr$: { redirect: IRedirectParams; to: IRedirectParams }): boolean | IRedirectParams;
-    }
-
-    interface IRedirectParams {
-        state: string;
-        params?: ui.IStateParamsService;
-    }
-
-    /*
-     * Previous state
-     */
-    interface IPreviousState {
-        state: IState;
-        params?: ui.IStateParamsService;
-    }
-
-    /**
-     * Previous state service
-     */
-    interface IPreviousStateService {
-
-        /**
-         * Get a previous state
-         * @param memoName Memo name
-         * @return Previous state
-         */
-        get(memoName?: string): IPreviousState;
-
-        /**
-         * Go to a state
-         * @param memoName Memo name
-         * @param options State options
-         * @return Promise
-         */
-        go(memoName: string, options?: IStateOptions): angular.IPromise<any>;
-
-        /**
-         * Memorize a state
-         * @param memoName Memo name
-         * @param defaultStateName Default state name
-         * @param defaultStateParams Default state parameters
-         */
-        memo(memoName: string, defaultStateName?: string, defaultStateParams?: {}): void;
-
-        /**
-         * Forget a memorized name
-         * @param memoName Memo name
-         */
-        forget(memoName: string): void;
-    }
-
-    /**
-    * Sticky state
-    */
-    interface IStickyState extends angular.ui.IState {
-        /*
-        * When marking a state sticky, the state must target its own unique named ui-view.
-        * Docs: http://christopherthielen.github.io/ui-router-extras/#/sticky
-        */
-        sticky?: boolean;
-        /*
-         * The most-recently-activate substate of the DSR marked state is remembered.
-         * When the DSR marked state is transitioned to directly, UI-Router Extras will instead redirect to the remembered state and parameters.
-         * Docs: http://christopherthielen.github.io/ui-router-extras/#/dsr
-         */
-        deepStateRedirect?: boolean | IDeepStateRedirectConfig;
-        /*
-         * Shortname deepStateRedirect prop
-         */
-        dsr?: boolean | IDeepStateRedirectConfig;
-        /*
-         * Function (injectable). Called when a sticky state is navigated away from (inactivated).
-         */
-        onInactivate?: Function;
-        /*
-         * Function (injectable). Called when an inactive sticky state is navigated to (reactivated).
-         */
-        onReactivate?: Function;
-        /*
-         * Note: named views are mandatory when using sticky states!
-         */
-        views?: { [name:string]: angular.ui.IState };
-    }
-
-
-    /**
-     * Sticky state service
-     */
-    interface IStickyStateService {
-        getInactiveStates(): IStickyState[];
-    }
-
-    /**
-     * Sticky state provider
-     */
-    interface IStickyStateProvider extends angular.IServiceProvider {
-        debugMode(): boolean;
-        enableDebug(enabled: boolean): boolean;
-        registerStickyState(state: IStickyState): void;
-    }
-
-}
diff --git a/ui-select/index.d.ts b/ui-select/index.d.ts
new file mode 100644
index 0000000000..6e4cad78a7
--- /dev/null
+++ b/ui-select/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for ui-select 0.13.2
+// Project: https://github.com/angular-ui/ui-select
+// Definitions by: Niko Kovačič <https://github.com/nkovacic>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped 
+
+/// <reference types="angularjs" />
+
+import * as angular from 'angularjs';
+
+declare module 'angularjs' {
+	export namespace ui.select {
+	    interface ISelectConfig {
+	        appendToBody: boolean;
+	        resetSearchInput: boolean;
+	        theme: string;
+	    }
+	}
+}
\ No newline at end of file
diff --git a/ui-select/tsconfig.json b/ui-select/tsconfig.json
new file mode 100644
index 0000000000..2b28714ace
--- /dev/null
+++ b/ui-select/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ui-select-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ui-select/ui-select-tests.ts b/ui-select/ui-select-tests.ts
index e0017576f3..6bb9e3de80 100644
--- a/ui-select/ui-select-tests.ts
+++ b/ui-select/ui-select-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="ui-select.d.ts" />
+import * as angular from 'angularjs';
 
 angular
 	.module('main', ['ui-select'])
diff --git a/ui-select/ui-select.d.ts b/ui-select/ui-select.d.ts
deleted file mode 100644
index d9ca2821b1..0000000000
--- a/ui-select/ui-select.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Type definitions for ui-select 0.13.2
-// Project: https://github.com/angular-ui/ui-select
-// Definitions by: Niko Kovačič <https://github.com/nkovacic>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped 
-
-/// <reference path="../angularjs/angular.d.ts" />
-
-declare module "ui-select" {
-    var _: string;
-    export = _;
-}
-
-declare namespace angular.ui.select {
-    interface ISelectConfig {
-        appendToBody: boolean;
-        resetSearchInput: boolean;
-        theme: string;
-    }
-}
diff --git a/uikit/index.d.ts b/uikit/index.d.ts
new file mode 100644
index 0000000000..3c2f8ceb73
--- /dev/null
+++ b/uikit/index.d.ts
@@ -0,0 +1,1443 @@
+// Type definitions for uikit 2.23.0
+// Project: http://getuikit.org
+// Definitions by: Giovanni Silva <https://github.com/giovannicandido>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace UIkit {
+    interface ModalElement {
+        /**
+         * Show the modal
+         */
+        show(): void
+        /**
+         * Hide the modal
+         */
+        hide(): void
+        /**
+         * Return if the modal is active on the page
+         * @return {boolean} True if the modal is current active on the page, false otherwise
+         */
+        isActive(): boolean
+    }
+    /**
+     * Create modal dialogs with different styles and transitions
+     * Documentation: {@link http://getuikit.org/docs/modal.html}
+     *
+     * <h2>Events</h2>
+     *
+     * <table>
+     * <tr>
+     * <th>Name</th>
+     * <th>Parameter</th>
+     * <th>Description</th>
+     * </tr>
+
+     * <tr>
+     * <td><code>show.uk.modal</code></td>
+     * <td>event</td>
+     * <td>On modal show</td>
+     * </tr>
+     * <tr>
+     * <td><code>hide.uk.modal</code></td>
+     * <td>event</td>
+     * <td>On modal hide</td>
+     * </tr>
+     * </table>
+     * @example
+     * <pre><code>
+     * $('.modalSelector').on({
+	 *
+	 *	'show.uk.modal': function(){
+	 *    console.log("Modal is visible.");
+	 *	},
+	 *
+	 *   'hide.uk.modal': function(){
+	 *    console.log("Element is not visible.");
+	 *  }
+	 *	});
+     * </code></pre>
+     */
+    interface Modal {
+        /**
+         * Create a alert dialog
+         * @param  {string} message The message to display. Can be Html
+         */
+        alert(message:string): void
+        /**
+         * Create a confirm dialog and execute the function on positive confirmation
+         * @param  {string} message The message to display. Can be Html
+         * @param  {function}      fn      A function to execute on confirmation
+         */
+        confirm(message:string, fn:() => any): void
+        /**
+         * Create a prompt dialog, where the user enter information
+         * @param  {string} message The message to display. Can be Html
+         * @param  {function} fn  A function to execute on confirmation. The function
+         * receive the new value as a parameter
+         */
+        prompt(message:string, fn:(newValue:string) => any): void
+        /**
+         * Create a prompt dialog, where the user enter information
+         * @param  {string} message The message to display. Can be Html
+         * @param  {string} value   A value to init the input
+         * @param  {function} fn  A function to execute on confirmation. The function
+         * receive the new value as a parameter
+         */
+        prompt(message:string, value:string, fn:(newValue:string) => any): void
+        /**
+         * Create a modal that blocks the entire page
+         * @param {string} content A content to display. Can be Html
+         */
+        blockUI(content:string): ModalElement
+        /**
+         * Select a modal element on page and return it.
+         * @example
+         * <pre><code>
+         * var modal = UIkit.modal(".modalSelector");
+         *
+         * if ( modal.isActive() ) {
+	     *   modal.hide();
+	     *   } else {
+	     *   modal.show();
+	     * }
+         * </code></pre>
+         */
+        (selector:string|JQuery): ModalElement
+    }
+    /**
+     * Create a smooth off-canvas sidebar that slides in and out of the page
+     * Documentation: {@link http://getuikit.org/docs/offcanvas.html}
+     * <h2>Events:</h2>
+     * <table class="uk-table uk-table-striped uk-text-nowrap">
+     * <tr>
+     * <th>Name</th>
+     * <th>Parameter</th>
+     * <th>Description</th>
+     * </tr>
+     * <tr>
+     * <td><code>show.uk.offcanvas</code></td>
+     * <td>event, panel, bar</td>
+     * <td>On offcanvas show</td>
+     * </tr>
+     * <tr>
+     * <td><code>hide.uk.offcanvas</code></td>
+     * <td>event, panel, bar</td>
+     * <td>On offcanvas hide</td>
+     * </tr>
+     * </table>
+     */
+    interface OffCanvas {
+        /**
+         * Show an off-canvas matching the passed CSS selector
+         * @param  {string} selector A CSS selector
+         */
+        show(selector:string): void
+        /**
+         * Hide any active offcanvas. Set force to true, if you don't want any
+         * animation
+         * @param  {boolean} force When seted to true do not run animations.
+         * @default false
+         */
+        hide(force?:boolean): void
+    }
+    interface LightBoxOptions {
+        /**
+         * Group name to group elements as a gallery to show.
+         * @default false
+         */
+        group?: string
+        /**
+         * Animation duration between gallery item change
+         * @default 400
+         */
+        duration?: number
+        /**
+         * Allow keyboard navigation
+         * @default true
+         */
+        keyboard?: boolean
+    }
+    interface LightBoxItem {
+        source: string
+        type: string
+    }
+    interface LightBoxElement {
+        /**
+         * Open the lightbox
+         */
+        show(): void
+    }
+    /**
+     * Create a fancy lightbox for images and videos utilizing the @see {@link modal|Modal Component}
+     * Documentation {@link http://getuikit.org/docs/lightbox.html}
+     * <h2>Events:</h2>
+     * <table>
+     * <tr>
+     * <th>Name</th>
+     * <th>Parameter</th>
+     * <th>Description</th>
+     * </tr>
+     * <tr>
+     * <td><code>showitem.uk.lightbox</code></td>
+     * <td>event, data</td>
+     * <td>On lightbox show</td>
+     * </tr>
+     * </table>
+     */
+    interface LightBox {
+        /**
+         * Create dynamic lightbox
+         * @param  {Array<LightBoxItem>} items Group of items on the lightbox
+         * @return {LightBoxElement}           The lightbox element to show
+         */
+        create(items:Array<LightBoxItem>): LightBoxElement
+        /**
+         * Init element manually
+         */
+        (element:string|JQuery, options?:LightBoxOptions): LightBoxElement
+
+    }
+    type CallbackAutoComplete = () => string
+    interface AutoCompleteOptions {
+        /**
+         * Data source
+         * @default []
+         */
+        source?: string|string[]|CallbackAutoComplete
+        /**
+         * Min. input length before triggering autocomplete
+         * @default 3
+         */
+        minLength?: number
+        /**
+         * Query name when sending ajax request
+         * @default search
+         */
+        param?: string
+        /**
+         * Delay time after stop typing
+         * @default 300
+         */
+        delay?: number
+    }
+    /**
+     * Create inputs that allow users to choose from a list of pre-generated values while typing
+     * Documentation {@link http://getuikit.org/docs/autocomplete.html}
+     * <h2>Events</h2>
+     * <table>
+     * <tr>
+     * <th>Name</th>
+     * <th>Parameter</th>
+     * <th>Description</th>
+     * </tr>
+     * <tr>
+     * <td><code>selectitem.uk.autocomplete</code></td>
+     * <td>event, data, acobject</td>
+     * <td>On item selected</td>
+     * </tr>
+     * <tr>
+     * <td><code>show.uk.autocomplete</code></td>
+     * <td>event</td>
+     * <td>On autocomplete dropdown show</td>
+     * </tr>
+     * </table>
+     */
+    interface AutoComplete {
+        /**
+         * Init element manually
+         * @param element
+         * @param options
+         */
+        (element:string|JQuery, options?:AutoCompleteOptions): any
+    }
+    interface DatePickerOptions {
+        /**
+         * Start of the week
+         * integer (0..6)
+         * @default 1
+         */
+        weekstart?: number
+        /**
+         * Language string definitions
+         * @default { months:['January',...], weekdays:['Sun',..,'Sat'] }
+         */
+        i18n?: {}
+        /**
+         * Date format string
+         * @default 'DD.MM.YYYY'
+         */
+        format?: string
+        /**
+         * Offset to the input value
+         * @default 5
+         */
+        offsettop?: number
+        /**
+         * Min. date
+         * bool (false to ignore the option)
+         * string (date as in format)
+         * integer (offset in days from current date)
+         * @default false
+         */
+        minDate?: string|boolean|number
+        /**
+         * Max. date
+         * bool (false to ignore the option)
+         * string (date as in format)
+         * integer (offset in days from current date)
+         * @default false
+         */
+        maxDate?: string|boolean|number
+        /**
+         * Position of the datepicker
+         * 'auto', 'top', 'bottom'
+         * @default 'auto'
+         */
+        pos?: string
+
+    }
+    /**
+     * Create a toggleable dropdown with an datepicker
+     * Documentation {@link http://getuikit.org/docs/datepicker.html}
+     * <h2>Events</h2>
+     * <table>
+     * <tr>
+     * <th>Name</th>
+     * <th>Parameter</th>
+     * <th>Description</th>
+     * </tr>
+     * <tr>
+     * <td><code>show.uk.datepicker</code></td>
+     * <td>event</td>
+     * <td>On datepicker dropdown show</td>
+     * </tr>
+     * <tr>
+     * <td><code>hide.uk.datepicker</code></td>
+     * <td>event</td>
+     * <td>On datepicker dropdown hide</td>
+     * </tr>
+     * <tr>
+     * <td><code>update.uk.datepicker</code></td>
+     * <td>event</td>
+     * <td>On calendar rendering</td>
+     * </tr>
+     * </table>
+     */
+    interface DatePicker {
+        /**
+         * Init element manually
+         * @param element
+         * @param options
+         */
+        (element:string|JQuery, options?:DatePickerOptions): any
+    }
+    interface HtmlEditorOptions {
+        /**
+         * View mode
+         * Possible values 'split','tab'
+         * @default 'split'
+         */
+        mode?: string
+        /**
+         * Button list to appear in the toolbar
+         * @default [ "bold", "italic", "strike", "link", "picture", ... ]
+         */
+        toolbar?: string[]
+        /**
+         * Min. browser width when to switch to responsive tab mode when in split mode
+         * @default 1000
+         */
+        maxsplitsize?: number
+        /**
+         * Label string for preview mode
+         * @default 'Preview'
+         */
+        lblPreview?: string
+        /**
+         * Label string for code mode
+         * @default 'Markdown'
+         */
+        lblCodeview?: string
+    }
+    /**
+     * Create a rich HTML or markdown editor with an immediate preview and syntax highlighting
+     * Documentation {@link http://getuikit.org/docs/htmleditor.html}
+     */
+    interface HtmlEditor {
+        /**
+         * Init element manually
+         * @param element
+         * @param options
+         */
+        (element: string|JQuery, options?: HtmlEditorOptions): any
+    }
+    interface SliderOptions {
+        /**
+         * Center items mode
+         * @default false
+         */
+        center?: boolean
+        /**
+         * Mouse movement threshold in pixel until trigger element dragging
+         * @default true
+         */
+        threshold?: boolean
+        /**
+         * Infinite scrolling
+         * @default true
+         */
+        infinite?: boolean
+        /**
+         * Class added on active item in center mode
+         * @default uk-active
+         */
+        activecls?: string
+        /**
+         * Defines whether or not the slider items should switch automatically
+         * @default false
+         */
+        autoplay?: boolean
+        /**
+         * Pause autoplay when hovering a slider
+         * @default true
+         */
+        pauseOnHover?: boolean
+        /**
+         * Defines the timespan between switching slider items
+         * @default 7000
+         */
+        autoplayInterval?: number
+    }
+    /**
+     * Create a list of items to use as a responsive carousel slider
+     * Documentation {@link http://getuikit.org/docs/slider.html}
+     * <h2>Events</h2>
+     * <table class="uk-table uk-table-striped uk-text-nowrap">
+     * <tr>
+     * <th>Name</th>
+     * <th>Parameter</th>
+     * <th>Description</th>
+     * </tr>
+     * <tr>
+     * <td><code>focusitem.uk.slider</code></td>
+     * <td>event, index, item</td>
+     * <td>On item focus</td>
+     * </tr>
+     * </table>
+     */
+    interface Slider {
+        /**
+         * Init element manually
+         * @param element
+         * @param options
+         */
+        (element:string|JQuery, options?:SliderOptions): any
+    }
+    interface SlideSetOptions {
+        /**
+         * Default visible items in a set
+         * @default 1
+         */
+            default?: number
+        /**
+         * Visible items in a set at small breakpoint
+         * @default null
+         */
+        small?: number
+        /**
+         * Visible items in a set at medium breakpoint
+         * @default null
+         */
+        medium?: number
+        /**
+         * Visible items in a set at large breakpoint
+         * @default null
+         */
+        large?: number
+        /**
+         * Visible items in a set at xlarge breakpoint
+         * @default null
+         */
+        xlarge?: number
+        /**
+         * Animation name
+         * @default 'fade'
+         */
+        animation?: string
+        /**
+         * Animation duration in ms
+         * @default 200
+         */
+        duration?: number
+        /**
+         * Animation delay between items in a set
+         * @default 100
+         */
+        delay?: number
+        /**
+         * Items filter
+         * @default ""
+         */
+        filter?: string
+        /**
+         * Defines whether or not the slideset items should switch automatically.
+         * @default false
+         */
+        autoplay?: boolean
+        /**
+         * Pause autoplay when hovering a slideset.
+         * @default true
+         */
+        pauseOnHover?: boolean
+        /**
+         * Defines the timespan between switching slideset items.
+         * @default 7000
+         */
+        autoplayInterval?: number
+    }
+    /**
+     * Create sets and groups of items, allowing to loop through the sets.
+     * Documentation {@link http://getuikit.org/docs/slideset.html}
+     * <h2>Events</h2>
+     * <table>
+     * <tr>
+     * <th>Name</th>
+     * <th>Parameter</th>
+     * <th>Description</th>
+     * </tr>
+     * <tr>
+     * <td><code>show.uk.slideset</code></td>
+     * <td>event, set</td>
+     * <td>On set show</td>
+     * </tr>
+     * </table>
+     */
+    interface SlideSet {
+        /**
+         * Init element manually
+         * @param element
+         * @param options
+         */
+        (element:string|JQuery, options?:SlideSetOptions): any
+    }
+    interface SlideShowOptions {
+        /**
+         * Defines the preferred transition between items.
+         * @default 'fade
+         */
+        animation?: string
+
+        /**
+         * Defines the transition duration.
+         * @default 500
+         */
+        duration?: number
+
+        /**
+         * Defines the slideshow height.
+         * @default 'auto'
+         */
+        height?: string
+
+        /**
+         * Defines the first slideshow item to be displayed.
+         * @default 0
+         */
+        start?: number
+
+        /**
+         * Defines whether or not the slideshow items should switch automatically.
+         * @default false
+         */
+        autoplay?: boolean
+
+        /**
+         * Pause autoplay when hovering a slideshow.
+         * @default true
+         */
+        pauseOnHover?: boolean
+
+        /**
+         * Defines the timespan between switching slideshow items.
+         * @default 7000
+         */
+        autoplayInterval?: number
+
+        /**
+         * Defines whether or not a video starts automatically.
+         * @default true
+         */
+        videoautoplay?: boolean
+
+        /**
+         * Defines whether or not a video is muted.
+         * @default false
+         */
+        videomute?: boolean
+
+        /**
+         * Defines whether or not the Ken Burns effect is active. If kenburns is a numeric value, it will be used as
+         * the animation duration.
+         * @default false
+         */
+        kenburns?: boolean
+
+        /**
+         * Animation series.
+         * @default 'uk-animation-middle-left, uk-animation-top-right, uk-animation-bottom-left, uk-animation-top-center,uk-animation-bottom-right'
+         */
+        kenburnsanimations?: string
+
+        /**
+         * Defines the number of slices, if a "Slice" transition is set.
+         * @default 15
+         */
+        slices?: number
+    }
+    /**
+     * Create a responsive image or video slideshow with stunning transition effects, fullscreen mode and overlays.
+     * Documentation {@link http://getuikit.org/docs/slideshow.html}
+     * <h2>Events</h2>
+     * <table>
+     * <tr>
+     * <th>Name</th>
+     * <th>Parameter</th>
+     * <th>Description</th>
+     * </tr>
+     * <tr>
+     * <td><code>show.uk.slideshow</code></td>
+     * <td>event, next slide</td>
+     * <td>On showing a new slide (after animation is finished)</td>
+     * </tr>
+     * </table>
+     */
+    interface SlideShow {
+        /**
+         * Init element manually
+         * @param element
+         * @param options
+         */
+        (element:string|JQuery, options:SlideShowOptions): any
+    }
+    interface ParallaxOptions {
+
+        /**
+         * Animation velocity during scrolling
+         * @default 0.5
+         */
+        velocity?: number
+        /**
+         * Element dimension reference for animation duration.
+         * @default false
+         */
+        target?: boolean
+        /**
+         * Animation range depending on the viewport.
+         * <h2>Possible value</h2>
+         * float (0 to 1)
+         * @default false
+         */
+        viewport?: number
+        /**
+         * Condition for the active status with a width as integer (e.g. 640) or a css media query
+         * @default false
+         * <h2>Possible Value</h2>
+         * integer / string
+         */
+        media?: number|string
+
+    }
+    /**
+     * Animate CSS properties depending on the scroll position of the document.
+     * Documentation {@link http://getuikit.org/docs/parallax.html}
+     */
+    interface Parallax {
+        /**
+         * Init element manually
+         * @param element
+         * @param options
+         */
+        (element:string|JQuery, options:ParallaxOptions): any
+    }
+    interface AccordionOptions {
+        /**
+         * Show first item on init
+         * @default true
+         * <h2>Possible value</h2>
+         * boolean
+         */
+        showfirst?: boolean
+        /**
+         * Allow multiple open items
+         * @default true
+         * <h2>Possible value</h2>
+         * boolean
+         */
+        collapse?: boolean
+        /**
+         * Animate toggle
+         * @default true
+         * <h2>Possible value</h2>
+         * boolean
+         */
+        animate?: boolean
+        /**
+         * Animation function
+         * @default swing
+         * <h2>Possible value</h2>
+         * string
+         */
+        easing?: string
+        /**
+         * Animation duration
+         * @default 300
+         * <h2>Possible value</h2>
+         * integer
+         */
+        duration?: number
+        /**
+         * Css selector for toggles
+         * @default .uk-accordion-title
+         * <h2>Possible value</h2>
+         * string
+         */
+        toggle?: string
+        /**
+         * Css selector for content containers
+         * @default .uk-accordion-content
+         * <h2>Possible value</h2>
+         * string
+         */
+        containers?: string
+        /**
+         * Class to add when an item is active
+         * @default uk-active
+         * <h2>Possible value</h2>
+         * string
+         */
+        clsactive?: string
+    }
+    /**
+     * Create a list of items, allowing each item's content to be expanded and collapsed by clicking its header.
+     * Documentation {@link http://getuikit.org/docs/accordion.html}
+     * <h2>Events</h2>
+     * <table class="uk-table uk-table-striped uk-text-nowrap">
+     * <tr>
+     * <th>Name</th>
+     * <th>Parameter</th>
+     * <th>Description</th>
+     * </tr>
+     * <tr>
+     * <td><code>toggle.uk.accordion</code></td>
+     * <td>event, active, toggle, content</td>
+     * <td>On item toggle</td>
+     * </tr>
+     * </table>
+     */
+    interface Accordion {
+        /**
+         * Init element manually
+         * @param element
+         * @param options
+         */
+        (element:string|JQuery, options:AccordionOptions): any
+    }
+
+    interface NotifyOptions {
+        /**
+         * The message to display
+         */
+        message?: string
+
+        /**
+         * A notification can be styled by adding a status to the message to indicate an info, success, warning or a
+         * danger status.
+         * <h2>Possible values</h2>
+         * info, sucess, warning, danger
+         * If you want to create one set its style with the CSS class uk-notify-message-yourStatus
+         * @default 'info'
+         */
+        status?: string
+
+        /**
+         * Amount of tiem in milliseconds a messa is visible. Set to 0 for sticky message
+         * @default 5000
+         */
+        timeout?: number
+
+        /**
+         * Adjust the notification's position to different corners.
+         * @default  'top-center'
+         * <h2>Possible values</h2>
+         * top-center, top-left, top-right, bottom-center, bottom-left, bottom-right
+         * If you want to create one value set its style with the CSS uk-notify-yourPosition
+         */
+        pos?: string
+    }
+    /**
+     * Create toggleable notifications that fade out automatically
+     * Documentation {@link http://getuikit.org/docs/notify.html}
+     */
+    interface Notify {
+        /**
+         * Show a message with default options
+         * @param message The html message
+         */
+        (message:string): any
+        /**
+         * Show a message with a different status
+         * @param message The html message
+         * @param status The string status
+         */
+        (message:string, status:string): any
+        /**
+         * Show a message with diferente options
+         * @param message The html message
+         * @param options Options
+         */
+        (message:string, options:NotifyOptions): any
+        /**
+         * Show a message with diferent options
+         * @param options Options
+         */
+        (options:NotifyOptions): any
+    }
+    interface SearchOptions {
+        /**
+         * Data source url
+         * @default ''
+         * <h2>Possible value</h2>
+         * string
+         */
+        source?: string
+
+        /**
+         * Min. input length before triggering autocomplete
+         * @default 3
+         * <h2>Possible value</h2>
+         * integer
+         */
+        minLength?: number
+
+        /**
+         * Query name when sending ajax request
+         * @default search
+         * <h2>Possible value</h2>
+         * string
+         */
+        param?: string
+
+        /**
+         * Delay time after stop typing
+         * @default 300
+         * <h2>Possible value</h2>
+         * integer
+         */
+        delay?: number
+
+    }
+    /**
+     * Easily create a nicely looking search.
+     * Documentation {@link http://getuikit.org/docs/search.html}
+     */
+    interface Search {
+        /**
+         * Init element manually
+         * @param element
+         * @param options
+         */
+        (element:string|JQuery, options:SearchOptions): any
+    }
+    interface NestableOptions {
+        /**
+         * List group
+         * @default false
+         * <h2>Possible value</h2>
+         * string
+         */
+        group?: string
+        /**
+         * Max nesting level
+         * @default 10
+         * <h2>Possible value</h2>
+         * integer
+         */
+        maxDepth?: number
+        /**
+         * Pixel threshold before starting to drag
+         * @default 20
+         * <h2>Possible value</h2>
+         * integer
+         */
+        threshold?: number
+        /**
+         * List node name
+         * @default ul
+         * <h2>Possible value</h2>
+         * string
+         */
+        listNodeName?: string
+        /**
+         * Item node name
+         * @default li
+         * <h2>Possible value</h2>
+         * string
+         */
+        itemNodeName?: string
+        /**
+         * List base class
+         * @default uk-nestable
+         * <h2>Possible value</h2>
+         * string
+         */
+        listBaseClass?: string
+        /**
+         * List class
+         * @default uk-nestable-list
+         * <h2>Possible value</h2>
+         * string
+         */
+        listClass?: string
+        /**
+         * List item class
+         * @default uk-nestable-list-item
+         * <h2>Possible value</h2>
+         * string
+         */
+        listitemClass?: string
+        /**
+         * Item class
+         * @default uk-nestable-item
+         * <h2>Possible value</h2>
+         * string
+         */
+        itemClass?: string
+        /**
+         * Class added to dragged list
+         * @default uk-nestable-list-dragged
+         * <h2>Possible value</h2>
+         * string
+         */
+        dragClass?: string
+        /**
+         * Class added to <code>&lt;html&gt;</code> when moving
+         * @default uk-nestable-moving
+         * <h2>Possible value</h2>
+         * string
+         */
+        movingClass?: string
+        /**
+         * Class for drag handle
+         * @default uk-nestable-handle
+         * <h2>Possible value</h2>
+         * string
+         */
+        handleClass?: string
+        /**
+         * Class for collapsed items
+         * @default uk-nestable-collapsed
+         * <h2>Possible value</h2>
+         * string
+         */
+        collapsedClass?: string
+        /**
+         * Class for placeholder of currently dragged element
+         * @default uk-nestable-placeholder
+         * <h2>Possible value</h2>
+         * string
+         */
+        placeClass?: string
+        /**
+         * Elements with this class will not trigger dragging. Useful when having the complete item draggable and not
+         * just the handle.
+         * @default uk-nestable-nodrag
+         * <h2>Possible value</h2>
+         * string
+         */
+        noDragClass?: string
+        /**
+         * Class for empty lists
+         * @default uk-nestable-empty
+         * <h2>Possible value</h2>
+         * string
+         */
+        emptyClass?: string
+
+    }
+    /**
+     * Create nestable lists that can be sorted by drag and drop.
+     * Documentation {@link http://getuikit.org/docs/nestable.html}
+     * <h2>Events</h2>
+     * <table>
+     * <tr>
+     * <th>Name</th>
+     * <th>Parameter</th>
+     * <th>Description</th>
+     * </tr>
+     * <tr>
+     * <td><code>start.uk.nestable</code></td>
+     * <td>event, nestable object</td>
+     * <td>On nestable drag start</td>
+     * </tr>
+     * <tr>
+     * <td><code>move.uk.nestable</code></td>
+     * <td>event, nestable object</td>
+     * <td>On nestable move item</td>
+     * </tr>
+     * <tr>
+     * <td><code>stop.uk.nestable</code></td>
+     * <td>event, nestable object</td>
+     * <td>On nestable stop dragging</td>
+     * </tr>
+     * <tr>
+     * <td><code>change.uk.nestable</code></td>
+     * <td>event, sortable object, dragged element, action</td>
+     * <td>On nestable change item</td>
+     * </tr>
+     * </table>
+     */
+    interface Nestable {
+        /**
+         * Init element manually
+         * @param element
+         * @param options
+         */
+        (element:string|JQuery, options:NestableOptions): any
+    }
+    interface SortableOptions {
+        /**
+         * List group
+         * @default false
+         * <h2>Possible value</h2>
+         * string
+         */
+        group?: string
+        /**
+         * Animation speed in ms
+         * @default 150
+         * <h2>Possible value</h2>
+         * integer
+         */
+        animation?: string
+        /**
+         * Mouse movement threshold in pixel until trigger element dragging
+         * @default 10
+         * <h2>Possible value</h2>
+         * integer
+         */
+        threshold?: string
+        /**
+         * Custom class to define elements which can trigger sorting
+         * @default ''
+         * <h2>Possible value</h2>
+         * string
+         */
+        handleClass?: string
+        /**
+         * Custom class added to the dragged element
+         * @default ''
+         * <h2>Possible value</h2>
+         * string
+         */
+        dragCustomClass?: string
+
+    }
+    /**
+     * Create sortable grids and lists to rearrange the order of its elements.
+     * Documentation {@link http://getuikit.org/docs/sortable.html}
+     * <h2>Events</h2>
+     * <table class="uk-table uk-table-striped uk-text-nowrap">
+     * <tr>
+     * <th>Name</th>
+     * <th>Parameter</th>
+     * <th>Description</th>
+     * </tr>
+     * <tr>
+     * <td><code>start.uk.sortable</code></td>
+     * <td>event, sortable object, dragged element</td>
+     * <td>On sortable drag start</td>
+     * </tr>
+     * <tr>
+     * <td><code>move.uk.sortable</code></td>
+     * <td>event, sortable object</td>
+     * <td>On sortable move item</td>
+     * </tr>
+     * <tr>
+     * <td><code>stop.uk.sortable</code></td>
+     * <td>event, sortable object, dragged element</td>
+     * <td>On sortable stop dragging</td>
+     * </tr>
+     * <tr>
+     * <td><code>change.uk.sortable</code></td>
+     * <td>event, sortable object, dragged element, action</td>
+     * <td>On sortable change item</td>
+     * </tr>
+     * </table>
+     */
+    interface Sortable {
+        /**
+         * Init element manually
+         * @param element
+         * @param options
+         */
+        (element:string|JQuery, options:SortableOptions): any
+    }
+    interface StickyOptions {
+        /**
+         * Top offset whent sticky should be triggered
+         * @default 0
+         * <h2>Possible value</h2>
+         * integer
+         */
+        top?: number
+        /**
+         * UIkit animation class
+         * @default ''
+         * <h2>Possible value</h2>
+         * string
+         */
+        animation?: string
+        /**
+         * Init class when the element is sticky for the first time
+         * @default uk-sticky-init
+         * <h2>Possible value</h2>
+         * string
+         */
+        clsinit?: string
+        /**
+         * Active class to add, when element is sticky
+         * @default uk-active
+         * <h2>Possible value</h2>
+         * string
+         */
+        clsactive?: string
+        /**
+         * Class to add, when element is not sticky
+         * @default ''
+         * <h2>Possible value</h2>
+         * string
+         */
+        clsinactive?: string
+        /**
+         * Css selector where to get the width from in sticky mode. By default it takes the width from the created wrapper element.
+         * @default ''
+         * <h2>Possible value</h2>
+         * string
+         */
+        getWidthFrom?: string
+        /**
+         * Condition for the active status with a width as integer (e.g. 640) or a css media query
+         * @default false
+         * <h2>Possible value</h2>
+         * integer / string
+         */
+        media?: number|string
+        /**
+         * Make sure that a sticky element is not over a targeted element via location hash on dom-ready.
+         * @default false
+         * <h2>Possible value</h2>
+         * boolean
+         */
+        target?: boolean
+        /**
+         * Show sticky element only when scrolling up.
+         * @default false
+         * <h2>Possible value</h2>
+         * boolean
+         */
+        showup?: boolean
+        /**
+         * Set to <code>true</code> to bind sticky to the parent or a Css selector to bind sticky to a specific element.
+         * @default false
+         * <h2>Possible value</h2>
+         * mixed
+         */
+        boundary?: boolean|string
+
+    }
+    /**
+     * Make elements remain at the top of the viewport, like a sticky navbar.
+     * Documentation {@link http://getuikit.org/docs/sticky.html}
+     * <h2>Events</h2>
+     * <table class="uk-table uk-table-striped uk-text-nowrap">
+     * <tr>
+     * <th>Name</th>
+     * <th>Parameter</th>
+     * <th>Description</th>
+     * </tr>
+     * <tr>
+     * <td><code>active.uk.sticky</code></td>
+     * <td>event</td>
+     * <td>Element getting sticky</td>
+     * </tr>
+     * <tr>
+     * <td><code>inactive.uk.sticky</code></td>
+     * <td>event</td>
+     * <td>Element leaving sticky mode</td>
+     * </tr>
+     * </table>
+     */
+    interface Sticky {
+        /**
+         * Init the element manually
+         * @param element
+         * @param options
+         */
+        (element:string|JQuery, options:StickyOptions): any
+    }
+    interface TimepickerOptions {
+        /**
+         * Defines the preferred time notation
+         * @default '24h'
+         * <h2>Possible value</h2>
+         * '24h' or '12h'
+         */
+        format?: string
+        /**
+         * Start time
+         * @default 0
+         * <h2>Possible value</h2>
+         * Integer between 0 and 24
+         */
+        start?: number
+        /**
+         * End time
+         * @default 24
+         * <h2>Possible value</h2>
+         * Integer between 0 and 24
+         */
+        end?: number
+
+    }
+    /**
+     * Create a timepicker which can easily be used by selecting a time value from a pre filled dropdown.
+     * Documentation {@link http://getuikit.org/docs/timepicker.html}
+     */
+    interface Timepicker {
+        /**
+         * Init element manually
+         * @param element
+         * @param options
+         */
+        (element:string|JQuery, options:TimepickerOptions): any
+    }
+    interface TooltipOptions {
+        /**
+         * Offset to the source element
+         * @default 5
+         * <h2>Possible value</h2>
+         * integer
+         */
+        offset?: number
+        /**
+         * Tooltip position
+         * @default 'top'
+         * <h2>Possible value</h2>
+         * string
+         */
+        pos?: string
+        /**
+         * Fade in tooltip
+         * @default false
+         * <h2>Possible value</h2>
+         * boolean
+         */
+        animation?: boolean
+        /**
+         * Delay tooltip show in ms
+         * @default 0
+         * <h2>Possible value</h2>
+         * integer
+         */
+        delay?: number
+        /**
+         * Custom class to add on show
+         * @default ''
+         * <h2>Possible value</h2>
+         * string
+         */
+        cls?: string
+        /**
+         * Toggled active class
+         * @default 'uk-active'
+         * <h2>Possible value</h2>
+         * string
+         */
+        activeClass?: string
+
+    }
+    /**
+     * Easily create a nicely looking tooltip.
+     * Documentation {@link http://getuikit.org/docs/tooltip.html}
+     */
+    interface Tooltip {
+        /**
+         * Init element manually
+         * @param element
+         * @param options
+         */
+        (element:string|JQuery, options:TooltipOptions): any
+    }
+    interface UploadOptions {
+        /**
+         * Target url for the upload
+         * @default ''
+         * <h2>Possible value</h2>
+         * string
+         */
+        action?: string
+        /**
+         * Send each file one by one
+         * @default true
+         * <h2>Possible value</h2>
+         * boolean
+         */
+        single?: boolean
+        /**
+         * Post query name
+         * @default files[]
+         * <h2>Possible value</h2>
+         * string
+         */
+        param?: string
+        /**
+         * Additional request parameters
+         * @default {}
+         * <h2>Possible value</h2>
+         * JSON Object
+         */
+        params?: {}
+        /**
+         * File filter
+         * @default *.*
+         * <h2>Possible value</h2>
+         * string
+         */
+        allow?: string
+        /**
+         * Limit the number of files to upload
+         * @default false
+         * <h2>Possible value</h2>
+         * integer
+         */
+            filelimit?: number
+        /**
+         * Response type from server
+         * @default text
+         * <h2>Possible Value</h2>
+         * (text|json)
+         */
+        "type"?: string
+        before?: (settings: UploadOptions, files: string|string[]) => any
+        beforeAll?: (files: string|string[]) => any
+        beforeSend?: (xhr: XMLHttpRequest) => any
+        progress?: (percent: number) => any
+        complete?: (response: any, xhr: XMLHttpRequest) => any
+        allcomplete?: (response: any, xhr: XMLHttpRequest) => any
+        notallowed?: (file: string|string[], settings: UploadOptions) => any
+        loadstart?: (event: any) => any
+        load?: (event: any) => any
+        loadend?: (event: any) => any
+        error?: (event: any) => any
+        abort?: (event: any) => any
+        readystatechange?: (event: any) => any
+    }
+
+    /**
+     * Allow users to upload files through a file input form element or a placeholder area.
+     * Documentation {@link http://getuikit.org/docs/upload.html}
+     * <h2>Callbacks</h2>
+     * <table class="uk-table uk-table-striped">
+     * <tr>
+     * <th>Name</th>
+     * <th>Parameter</th>
+     * </tr>
+     * <tr>
+     * <td><code>before</code></td>
+     * <td>settings, files</td>
+     * </tr>
+     * <tr>
+     * <td><code>beforeAll</code></td>
+     * <td>files</td>
+     * </tr>
+     * <tr>
+     * <td><code>beforeSend</code></td>
+     * <td>xhr</td>
+     * </tr>
+     * <tr>
+     * <td><code>progress</code></td>
+     * <td>percent</td>
+     * </tr>
+     * <tr>
+     * <td><code>complete</code></td>
+     * <td>response, xhr</td>
+     * </tr>
+     * <tr>
+     * <td><code>allcomplete</code></td>
+     * <td>response, xhr</td>
+     * </tr>
+     * <tr>
+     * <td><code>notallowed</code></td>
+     * <td>file, settings</td>
+     * </tr>
+     * <tr>
+     * <td><code>loadstart</code></td>
+     * <td>event</td>
+     * </tr>
+     * <tr>
+     * <td><code>load</code></td>
+     * <td>event</td>
+     * </tr>
+     * <tr>
+     * <td><code>loadend</code></td>
+     * <td>event</td>
+     * </tr>
+     * <tr>
+     * <td><code>error</code></td>
+     * <td>event</td>
+     * </tr>
+     * <tr>
+     * <td><code>abort</code></td>
+     * <td>event</td>
+     * </tr>
+     * <tr>
+     * <td><code>readystatechange</code></td>
+     * <td>event</td>
+     * </tr>
+     * </table>
+     */
+    interface Upload {
+        /**
+         * Init element manually
+         * @param element
+         * @param options
+         */
+        (element:string|JQuery, options:UploadOptions): any
+    }
+    export var modal:Modal;
+    export var lightbox:LightBox;
+    export var offcanvas:OffCanvas;
+    export var autocomplete:AutoComplete;
+    export var datepicker:DatePicker;
+    export var htmleditor:HtmlEditor;
+    export var slider:Slider;
+    export var slideset:SlideSet;
+    export var slideshow:SlideShow;
+    export var parallax:Parallax;
+    export var accordion:Accordion;
+    export var notify:Notify;
+    export var search:Search;
+    export var nestable:Nestable;
+    export var sortable:Sortable;
+    export var sticky:Sticky;
+    export var timepicker:Timepicker;
+    export var tooltip:Tooltip;
+    export var uploadSelect: Upload;
+    export var uploadDrop: Upload;
+}
+
+declare module 'uikit' {
+    export = UIkit
+}
diff --git a/uikit/uikit-tests.ts b/uikit/uikit-tests.ts
index 8bc1f7b63a..402ae18d2f 100644
--- a/uikit/uikit-tests.ts
+++ b/uikit/uikit-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="uikit.d.ts" />
+
 
 function testModal() {
     UIkit.modal.alert("Attention!");
diff --git a/uikit/uikit.d.ts b/uikit/uikit.d.ts
deleted file mode 100644
index af85aa44dc..0000000000
--- a/uikit/uikit.d.ts
+++ /dev/null
@@ -1,1443 +0,0 @@
-// Type definitions for uikit 2.23.0
-// Project: http://getuikit.org
-// Definitions by: Giovanni Silva <https://github.com/giovannicandido>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace UIkit {
-    interface ModalElement {
-        /**
-         * Show the modal
-         */
-        show(): void
-        /**
-         * Hide the modal
-         */
-        hide(): void
-        /**
-         * Return if the modal is active on the page
-         * @return {boolean} True if the modal is current active on the page, false otherwise
-         */
-        isActive(): boolean
-    }
-    /**
-     * Create modal dialogs with different styles and transitions
-     * Documentation: {@link http://getuikit.org/docs/modal.html}
-     *
-     * <h2>Events</h2>
-     *
-     * <table>
-     * <tr>
-     * <th>Name</th>
-     * <th>Parameter</th>
-     * <th>Description</th>
-     * </tr>
-
-     * <tr>
-     * <td><code>show.uk.modal</code></td>
-     * <td>event</td>
-     * <td>On modal show</td>
-     * </tr>
-     * <tr>
-     * <td><code>hide.uk.modal</code></td>
-     * <td>event</td>
-     * <td>On modal hide</td>
-     * </tr>
-     * </table>
-     * @example
-     * <pre><code>
-     * $('.modalSelector').on({
-	 *
-	 *	'show.uk.modal': function(){
-	 *    console.log("Modal is visible.");
-	 *	},
-	 *
-	 *   'hide.uk.modal': function(){
-	 *    console.log("Element is not visible.");
-	 *  }
-	 *	});
-     * </code></pre>
-     */
-    interface Modal {
-        /**
-         * Create a alert dialog
-         * @param  {string} message The message to display. Can be Html
-         */
-        alert(message:string): void
-        /**
-         * Create a confirm dialog and execute the function on positive confirmation
-         * @param  {string} message The message to display. Can be Html
-         * @param  {function}      fn      A function to execute on confirmation
-         */
-        confirm(message:string, fn:() => any): void
-        /**
-         * Create a prompt dialog, where the user enter information
-         * @param  {string} message The message to display. Can be Html
-         * @param  {function} fn  A function to execute on confirmation. The function
-         * receive the new value as a parameter
-         */
-        prompt(message:string, fn:(newValue:string) => any): void
-        /**
-         * Create a prompt dialog, where the user enter information
-         * @param  {string} message The message to display. Can be Html
-         * @param  {string} value   A value to init the input
-         * @param  {function} fn  A function to execute on confirmation. The function
-         * receive the new value as a parameter
-         */
-        prompt(message:string, value:string, fn:(newValue:string) => any): void
-        /**
-         * Create a modal that blocks the entire page
-         * @param {string} content A content to display. Can be Html
-         */
-        blockUI(content:string): ModalElement
-        /**
-         * Select a modal element on page and return it.
-         * @example
-         * <pre><code>
-         * var modal = UIkit.modal(".modalSelector");
-         *
-         * if ( modal.isActive() ) {
-	     *   modal.hide();
-	     *   } else {
-	     *   modal.show();
-	     * }
-         * </code></pre>
-         */
-        (selector:string|JQuery): ModalElement
-    }
-    /**
-     * Create a smooth off-canvas sidebar that slides in and out of the page
-     * Documentation: {@link http://getuikit.org/docs/offcanvas.html}
-     * <h2>Events:</h2>
-     * <table class="uk-table uk-table-striped uk-text-nowrap">
-     * <tr>
-     * <th>Name</th>
-     * <th>Parameter</th>
-     * <th>Description</th>
-     * </tr>
-     * <tr>
-     * <td><code>show.uk.offcanvas</code></td>
-     * <td>event, panel, bar</td>
-     * <td>On offcanvas show</td>
-     * </tr>
-     * <tr>
-     * <td><code>hide.uk.offcanvas</code></td>
-     * <td>event, panel, bar</td>
-     * <td>On offcanvas hide</td>
-     * </tr>
-     * </table>
-     */
-    interface OffCanvas {
-        /**
-         * Show an off-canvas matching the passed CSS selector
-         * @param  {string} selector A CSS selector
-         */
-        show(selector:string): void
-        /**
-         * Hide any active offcanvas. Set force to true, if you don't want any
-         * animation
-         * @param  {boolean} force When seted to true do not run animations.
-         * @default false
-         */
-        hide(force?:boolean): void
-    }
-    interface LightBoxOptions {
-        /**
-         * Group name to group elements as a gallery to show.
-         * @default false
-         */
-        group?: string
-        /**
-         * Animation duration between gallery item change
-         * @default 400
-         */
-        duration?: number
-        /**
-         * Allow keyboard navigation
-         * @default true
-         */
-        keyboard?: boolean
-    }
-    interface LightBoxItem {
-        source: string
-        type: string
-    }
-    interface LightBoxElement {
-        /**
-         * Open the lightbox
-         */
-        show(): void
-    }
-    /**
-     * Create a fancy lightbox for images and videos utilizing the @see {@link modal|Modal Component}
-     * Documentation {@link http://getuikit.org/docs/lightbox.html}
-     * <h2>Events:</h2>
-     * <table>
-     * <tr>
-     * <th>Name</th>
-     * <th>Parameter</th>
-     * <th>Description</th>
-     * </tr>
-     * <tr>
-     * <td><code>showitem.uk.lightbox</code></td>
-     * <td>event, data</td>
-     * <td>On lightbox show</td>
-     * </tr>
-     * </table>
-     */
-    interface LightBox {
-        /**
-         * Create dynamic lightbox
-         * @param  {Array<LightBoxItem>} items Group of items on the lightbox
-         * @return {LightBoxElement}           The lightbox element to show
-         */
-        create(items:Array<LightBoxItem>): LightBoxElement
-        /**
-         * Init element manually
-         */
-        (element:string|JQuery, options?:LightBoxOptions): LightBoxElement
-
-    }
-    type CallbackAutoComplete = () => string
-    interface AutoCompleteOptions {
-        /**
-         * Data source
-         * @default []
-         */
-        source?: string|string[]|CallbackAutoComplete
-        /**
-         * Min. input length before triggering autocomplete
-         * @default 3
-         */
-        minLength?: number
-        /**
-         * Query name when sending ajax request
-         * @default search
-         */
-        param?: string
-        /**
-         * Delay time after stop typing
-         * @default 300
-         */
-        delay?: number
-    }
-    /**
-     * Create inputs that allow users to choose from a list of pre-generated values while typing
-     * Documentation {@link http://getuikit.org/docs/autocomplete.html}
-     * <h2>Events</h2>
-     * <table>
-     * <tr>
-     * <th>Name</th>
-     * <th>Parameter</th>
-     * <th>Description</th>
-     * </tr>
-     * <tr>
-     * <td><code>selectitem.uk.autocomplete</code></td>
-     * <td>event, data, acobject</td>
-     * <td>On item selected</td>
-     * </tr>
-     * <tr>
-     * <td><code>show.uk.autocomplete</code></td>
-     * <td>event</td>
-     * <td>On autocomplete dropdown show</td>
-     * </tr>
-     * </table>
-     */
-    interface AutoComplete {
-        /**
-         * Init element manually
-         * @param element
-         * @param options
-         */
-        (element:string|JQuery, options?:AutoCompleteOptions): any
-    }
-    interface DatePickerOptions {
-        /**
-         * Start of the week
-         * integer (0..6)
-         * @default 1
-         */
-        weekstart?: number
-        /**
-         * Language string definitions
-         * @default { months:['January',...], weekdays:['Sun',..,'Sat'] }
-         */
-        i18n?: {}
-        /**
-         * Date format string
-         * @default 'DD.MM.YYYY'
-         */
-        format?: string
-        /**
-         * Offset to the input value
-         * @default 5
-         */
-        offsettop?: number
-        /**
-         * Min. date
-         * bool (false to ignore the option)
-         * string (date as in format)
-         * integer (offset in days from current date)
-         * @default false
-         */
-        minDate?: string|boolean|number
-        /**
-         * Max. date
-         * bool (false to ignore the option)
-         * string (date as in format)
-         * integer (offset in days from current date)
-         * @default false
-         */
-        maxDate?: string|boolean|number
-        /**
-         * Position of the datepicker
-         * 'auto', 'top', 'bottom'
-         * @default 'auto'
-         */
-        pos?: string
-
-    }
-    /**
-     * Create a toggleable dropdown with an datepicker
-     * Documentation {@link http://getuikit.org/docs/datepicker.html}
-     * <h2>Events</h2>
-     * <table>
-     * <tr>
-     * <th>Name</th>
-     * <th>Parameter</th>
-     * <th>Description</th>
-     * </tr>
-     * <tr>
-     * <td><code>show.uk.datepicker</code></td>
-     * <td>event</td>
-     * <td>On datepicker dropdown show</td>
-     * </tr>
-     * <tr>
-     * <td><code>hide.uk.datepicker</code></td>
-     * <td>event</td>
-     * <td>On datepicker dropdown hide</td>
-     * </tr>
-     * <tr>
-     * <td><code>update.uk.datepicker</code></td>
-     * <td>event</td>
-     * <td>On calendar rendering</td>
-     * </tr>
-     * </table>
-     */
-    interface DatePicker {
-        /**
-         * Init element manually
-         * @param element
-         * @param options
-         */
-        (element:string|JQuery, options?:DatePickerOptions): any
-    }
-    interface HtmlEditorOptions {
-        /**
-         * View mode
-         * Possible values 'split','tab'
-         * @default 'split'
-         */
-        mode?: string
-        /**
-         * Button list to appear in the toolbar
-         * @default [ "bold", "italic", "strike", "link", "picture", ... ]
-         */
-        toolbar?: string[]
-        /**
-         * Min. browser width when to switch to responsive tab mode when in split mode
-         * @default 1000
-         */
-        maxsplitsize?: number
-        /**
-         * Label string for preview mode
-         * @default 'Preview'
-         */
-        lblPreview?: string
-        /**
-         * Label string for code mode
-         * @default 'Markdown'
-         */
-        lblCodeview?: string
-    }
-    /**
-     * Create a rich HTML or markdown editor with an immediate preview and syntax highlighting
-     * Documentation {@link http://getuikit.org/docs/htmleditor.html}
-     */
-    interface HtmlEditor {
-        /**
-         * Init element manually
-         * @param element
-         * @param options
-         */
-        (element: string|JQuery, options?: HtmlEditorOptions): any
-    }
-    interface SliderOptions {
-        /**
-         * Center items mode
-         * @default false
-         */
-        center?: boolean
-        /**
-         * Mouse movement threshold in pixel until trigger element dragging
-         * @default true
-         */
-        threshold?: boolean
-        /**
-         * Infinite scrolling
-         * @default true
-         */
-        infinite?: boolean
-        /**
-         * Class added on active item in center mode
-         * @default uk-active
-         */
-        activecls?: string
-        /**
-         * Defines whether or not the slider items should switch automatically
-         * @default false
-         */
-        autoplay?: boolean
-        /**
-         * Pause autoplay when hovering a slider
-         * @default true
-         */
-        pauseOnHover?: boolean
-        /**
-         * Defines the timespan between switching slider items
-         * @default 7000
-         */
-        autoplayInterval?: number
-    }
-    /**
-     * Create a list of items to use as a responsive carousel slider
-     * Documentation {@link http://getuikit.org/docs/slider.html}
-     * <h2>Events</h2>
-     * <table class="uk-table uk-table-striped uk-text-nowrap">
-     * <tr>
-     * <th>Name</th>
-     * <th>Parameter</th>
-     * <th>Description</th>
-     * </tr>
-     * <tr>
-     * <td><code>focusitem.uk.slider</code></td>
-     * <td>event, index, item</td>
-     * <td>On item focus</td>
-     * </tr>
-     * </table>
-     */
-    interface Slider {
-        /**
-         * Init element manually
-         * @param element
-         * @param options
-         */
-        (element:string|JQuery, options?:SliderOptions): any
-    }
-    interface SlideSetOptions {
-        /**
-         * Default visible items in a set
-         * @default 1
-         */
-            default?: number
-        /**
-         * Visible items in a set at small breakpoint
-         * @default null
-         */
-        small?: number
-        /**
-         * Visible items in a set at medium breakpoint
-         * @default null
-         */
-        medium?: number
-        /**
-         * Visible items in a set at large breakpoint
-         * @default null
-         */
-        large?: number
-        /**
-         * Visible items in a set at xlarge breakpoint
-         * @default null
-         */
-        xlarge?: number
-        /**
-         * Animation name
-         * @default 'fade'
-         */
-        animation?: string
-        /**
-         * Animation duration in ms
-         * @default 200
-         */
-        duration?: number
-        /**
-         * Animation delay between items in a set
-         * @default 100
-         */
-        delay?: number
-        /**
-         * Items filter
-         * @default ""
-         */
-        filter?: string
-        /**
-         * Defines whether or not the slideset items should switch automatically.
-         * @default false
-         */
-        autoplay?: boolean
-        /**
-         * Pause autoplay when hovering a slideset.
-         * @default true
-         */
-        pauseOnHover?: boolean
-        /**
-         * Defines the timespan between switching slideset items.
-         * @default 7000
-         */
-        autoplayInterval?: number
-    }
-    /**
-     * Create sets and groups of items, allowing to loop through the sets.
-     * Documentation {@link http://getuikit.org/docs/slideset.html}
-     * <h2>Events</h2>
-     * <table>
-     * <tr>
-     * <th>Name</th>
-     * <th>Parameter</th>
-     * <th>Description</th>
-     * </tr>
-     * <tr>
-     * <td><code>show.uk.slideset</code></td>
-     * <td>event, set</td>
-     * <td>On set show</td>
-     * </tr>
-     * </table>
-     */
-    interface SlideSet {
-        /**
-         * Init element manually
-         * @param element
-         * @param options
-         */
-        (element:string|JQuery, options?:SlideSetOptions): any
-    }
-    interface SlideShowOptions {
-        /**
-         * Defines the preferred transition between items.
-         * @default 'fade
-         */
-        animation?: string
-
-        /**
-         * Defines the transition duration.
-         * @default 500
-         */
-        duration?: number
-
-        /**
-         * Defines the slideshow height.
-         * @default 'auto'
-         */
-        height?: string
-
-        /**
-         * Defines the first slideshow item to be displayed.
-         * @default 0
-         */
-        start?: number
-
-        /**
-         * Defines whether or not the slideshow items should switch automatically.
-         * @default false
-         */
-        autoplay?: boolean
-
-        /**
-         * Pause autoplay when hovering a slideshow.
-         * @default true
-         */
-        pauseOnHover?: boolean
-
-        /**
-         * Defines the timespan between switching slideshow items.
-         * @default 7000
-         */
-        autoplayInterval?: number
-
-        /**
-         * Defines whether or not a video starts automatically.
-         * @default true
-         */
-        videoautoplay?: boolean
-
-        /**
-         * Defines whether or not a video is muted.
-         * @default false
-         */
-        videomute?: boolean
-
-        /**
-         * Defines whether or not the Ken Burns effect is active. If kenburns is a numeric value, it will be used as
-         * the animation duration.
-         * @default false
-         */
-        kenburns?: boolean
-
-        /**
-         * Animation series.
-         * @default 'uk-animation-middle-left, uk-animation-top-right, uk-animation-bottom-left, uk-animation-top-center,uk-animation-bottom-right'
-         */
-        kenburnsanimations?: string
-
-        /**
-         * Defines the number of slices, if a "Slice" transition is set.
-         * @default 15
-         */
-        slices?: number
-    }
-    /**
-     * Create a responsive image or video slideshow with stunning transition effects, fullscreen mode and overlays.
-     * Documentation {@link http://getuikit.org/docs/slideshow.html}
-     * <h2>Events</h2>
-     * <table>
-     * <tr>
-     * <th>Name</th>
-     * <th>Parameter</th>
-     * <th>Description</th>
-     * </tr>
-     * <tr>
-     * <td><code>show.uk.slideshow</code></td>
-     * <td>event, next slide</td>
-     * <td>On showing a new slide (after animation is finished)</td>
-     * </tr>
-     * </table>
-     */
-    interface SlideShow {
-        /**
-         * Init element manually
-         * @param element
-         * @param options
-         */
-        (element:string|JQuery, options:SlideShowOptions): any
-    }
-    interface ParallaxOptions {
-
-        /**
-         * Animation velocity during scrolling
-         * @default 0.5
-         */
-        velocity?: number
-        /**
-         * Element dimension reference for animation duration.
-         * @default false
-         */
-        target?: boolean
-        /**
-         * Animation range depending on the viewport.
-         * <h2>Possible value</h2>
-         * float (0 to 1)
-         * @default false
-         */
-        viewport?: number
-        /**
-         * Condition for the active status with a width as integer (e.g. 640) or a css media query
-         * @default false
-         * <h2>Possible Value</h2>
-         * integer / string
-         */
-        media?: number|string
-
-    }
-    /**
-     * Animate CSS properties depending on the scroll position of the document.
-     * Documentation {@link http://getuikit.org/docs/parallax.html}
-     */
-    interface Parallax {
-        /**
-         * Init element manually
-         * @param element
-         * @param options
-         */
-        (element:string|JQuery, options:ParallaxOptions): any
-    }
-    interface AccordionOptions {
-        /**
-         * Show first item on init
-         * @default true
-         * <h2>Possible value</h2>
-         * boolean
-         */
-        showfirst?: boolean
-        /**
-         * Allow multiple open items
-         * @default true
-         * <h2>Possible value</h2>
-         * boolean
-         */
-        collapse?: boolean
-        /**
-         * Animate toggle
-         * @default true
-         * <h2>Possible value</h2>
-         * boolean
-         */
-        animate?: boolean
-        /**
-         * Animation function
-         * @default swing
-         * <h2>Possible value</h2>
-         * string
-         */
-        easing?: string
-        /**
-         * Animation duration
-         * @default 300
-         * <h2>Possible value</h2>
-         * integer
-         */
-        duration?: number
-        /**
-         * Css selector for toggles
-         * @default .uk-accordion-title
-         * <h2>Possible value</h2>
-         * string
-         */
-        toggle?: string
-        /**
-         * Css selector for content containers
-         * @default .uk-accordion-content
-         * <h2>Possible value</h2>
-         * string
-         */
-        containers?: string
-        /**
-         * Class to add when an item is active
-         * @default uk-active
-         * <h2>Possible value</h2>
-         * string
-         */
-        clsactive?: string
-    }
-    /**
-     * Create a list of items, allowing each item's content to be expanded and collapsed by clicking its header.
-     * Documentation {@link http://getuikit.org/docs/accordion.html}
-     * <h2>Events</h2>
-     * <table class="uk-table uk-table-striped uk-text-nowrap">
-     * <tr>
-     * <th>Name</th>
-     * <th>Parameter</th>
-     * <th>Description</th>
-     * </tr>
-     * <tr>
-     * <td><code>toggle.uk.accordion</code></td>
-     * <td>event, active, toggle, content</td>
-     * <td>On item toggle</td>
-     * </tr>
-     * </table>
-     */
-    interface Accordion {
-        /**
-         * Init element manually
-         * @param element
-         * @param options
-         */
-        (element:string|JQuery, options:AccordionOptions): any
-    }
-
-    interface NotifyOptions {
-        /**
-         * The message to display
-         */
-        message?: string
-
-        /**
-         * A notification can be styled by adding a status to the message to indicate an info, success, warning or a
-         * danger status.
-         * <h2>Possible values</h2>
-         * info, sucess, warning, danger
-         * If you want to create one set its style with the CSS class uk-notify-message-yourStatus
-         * @default 'info'
-         */
-        status?: string
-
-        /**
-         * Amount of tiem in milliseconds a messa is visible. Set to 0 for sticky message
-         * @default 5000
-         */
-        timeout?: number
-
-        /**
-         * Adjust the notification's position to different corners.
-         * @default  'top-center'
-         * <h2>Possible values</h2>
-         * top-center, top-left, top-right, bottom-center, bottom-left, bottom-right
-         * If you want to create one value set its style with the CSS uk-notify-yourPosition
-         */
-        pos?: string
-    }
-    /**
-     * Create toggleable notifications that fade out automatically
-     * Documentation {@link http://getuikit.org/docs/notify.html}
-     */
-    interface Notify {
-        /**
-         * Show a message with default options
-         * @param message The html message
-         */
-        (message:string): any
-        /**
-         * Show a message with a different status
-         * @param message The html message
-         * @param status The string status
-         */
-        (message:string, status:string): any
-        /**
-         * Show a message with diferente options
-         * @param message The html message
-         * @param options Options
-         */
-        (message:string, options:NotifyOptions): any
-        /**
-         * Show a message with diferent options
-         * @param options Options
-         */
-        (options:NotifyOptions): any
-    }
-    interface SearchOptions {
-        /**
-         * Data source url
-         * @default ''
-         * <h2>Possible value</h2>
-         * string
-         */
-        source?: string
-
-        /**
-         * Min. input length before triggering autocomplete
-         * @default 3
-         * <h2>Possible value</h2>
-         * integer
-         */
-        minLength?: number
-
-        /**
-         * Query name when sending ajax request
-         * @default search
-         * <h2>Possible value</h2>
-         * string
-         */
-        param?: string
-
-        /**
-         * Delay time after stop typing
-         * @default 300
-         * <h2>Possible value</h2>
-         * integer
-         */
-        delay?: number
-
-    }
-    /**
-     * Easily create a nicely looking search.
-     * Documentation {@link http://getuikit.org/docs/search.html}
-     */
-    interface Search {
-        /**
-         * Init element manually
-         * @param element
-         * @param options
-         */
-        (element:string|JQuery, options:SearchOptions): any
-    }
-    interface NestableOptions {
-        /**
-         * List group
-         * @default false
-         * <h2>Possible value</h2>
-         * string
-         */
-        group?: string
-        /**
-         * Max nesting level
-         * @default 10
-         * <h2>Possible value</h2>
-         * integer
-         */
-        maxDepth?: number
-        /**
-         * Pixel threshold before starting to drag
-         * @default 20
-         * <h2>Possible value</h2>
-         * integer
-         */
-        threshold?: number
-        /**
-         * List node name
-         * @default ul
-         * <h2>Possible value</h2>
-         * string
-         */
-        listNodeName?: string
-        /**
-         * Item node name
-         * @default li
-         * <h2>Possible value</h2>
-         * string
-         */
-        itemNodeName?: string
-        /**
-         * List base class
-         * @default uk-nestable
-         * <h2>Possible value</h2>
-         * string
-         */
-        listBaseClass?: string
-        /**
-         * List class
-         * @default uk-nestable-list
-         * <h2>Possible value</h2>
-         * string
-         */
-        listClass?: string
-        /**
-         * List item class
-         * @default uk-nestable-list-item
-         * <h2>Possible value</h2>
-         * string
-         */
-        listitemClass?: string
-        /**
-         * Item class
-         * @default uk-nestable-item
-         * <h2>Possible value</h2>
-         * string
-         */
-        itemClass?: string
-        /**
-         * Class added to dragged list
-         * @default uk-nestable-list-dragged
-         * <h2>Possible value</h2>
-         * string
-         */
-        dragClass?: string
-        /**
-         * Class added to <code>&lt;html&gt;</code> when moving
-         * @default uk-nestable-moving
-         * <h2>Possible value</h2>
-         * string
-         */
-        movingClass?: string
-        /**
-         * Class for drag handle
-         * @default uk-nestable-handle
-         * <h2>Possible value</h2>
-         * string
-         */
-        handleClass?: string
-        /**
-         * Class for collapsed items
-         * @default uk-nestable-collapsed
-         * <h2>Possible value</h2>
-         * string
-         */
-        collapsedClass?: string
-        /**
-         * Class for placeholder of currently dragged element
-         * @default uk-nestable-placeholder
-         * <h2>Possible value</h2>
-         * string
-         */
-        placeClass?: string
-        /**
-         * Elements with this class will not trigger dragging. Useful when having the complete item draggable and not
-         * just the handle.
-         * @default uk-nestable-nodrag
-         * <h2>Possible value</h2>
-         * string
-         */
-        noDragClass?: string
-        /**
-         * Class for empty lists
-         * @default uk-nestable-empty
-         * <h2>Possible value</h2>
-         * string
-         */
-        emptyClass?: string
-
-    }
-    /**
-     * Create nestable lists that can be sorted by drag and drop.
-     * Documentation {@link http://getuikit.org/docs/nestable.html}
-     * <h2>Events</h2>
-     * <table>
-     * <tr>
-     * <th>Name</th>
-     * <th>Parameter</th>
-     * <th>Description</th>
-     * </tr>
-     * <tr>
-     * <td><code>start.uk.nestable</code></td>
-     * <td>event, nestable object</td>
-     * <td>On nestable drag start</td>
-     * </tr>
-     * <tr>
-     * <td><code>move.uk.nestable</code></td>
-     * <td>event, nestable object</td>
-     * <td>On nestable move item</td>
-     * </tr>
-     * <tr>
-     * <td><code>stop.uk.nestable</code></td>
-     * <td>event, nestable object</td>
-     * <td>On nestable stop dragging</td>
-     * </tr>
-     * <tr>
-     * <td><code>change.uk.nestable</code></td>
-     * <td>event, sortable object, dragged element, action</td>
-     * <td>On nestable change item</td>
-     * </tr>
-     * </table>
-     */
-    interface Nestable {
-        /**
-         * Init element manually
-         * @param element
-         * @param options
-         */
-        (element:string|JQuery, options:NestableOptions): any
-    }
-    interface SortableOptions {
-        /**
-         * List group
-         * @default false
-         * <h2>Possible value</h2>
-         * string
-         */
-        group?: string
-        /**
-         * Animation speed in ms
-         * @default 150
-         * <h2>Possible value</h2>
-         * integer
-         */
-        animation?: string
-        /**
-         * Mouse movement threshold in pixel until trigger element dragging
-         * @default 10
-         * <h2>Possible value</h2>
-         * integer
-         */
-        threshold?: string
-        /**
-         * Custom class to define elements which can trigger sorting
-         * @default ''
-         * <h2>Possible value</h2>
-         * string
-         */
-        handleClass?: string
-        /**
-         * Custom class added to the dragged element
-         * @default ''
-         * <h2>Possible value</h2>
-         * string
-         */
-        dragCustomClass?: string
-
-    }
-    /**
-     * Create sortable grids and lists to rearrange the order of its elements.
-     * Documentation {@link http://getuikit.org/docs/sortable.html}
-     * <h2>Events</h2>
-     * <table class="uk-table uk-table-striped uk-text-nowrap">
-     * <tr>
-     * <th>Name</th>
-     * <th>Parameter</th>
-     * <th>Description</th>
-     * </tr>
-     * <tr>
-     * <td><code>start.uk.sortable</code></td>
-     * <td>event, sortable object, dragged element</td>
-     * <td>On sortable drag start</td>
-     * </tr>
-     * <tr>
-     * <td><code>move.uk.sortable</code></td>
-     * <td>event, sortable object</td>
-     * <td>On sortable move item</td>
-     * </tr>
-     * <tr>
-     * <td><code>stop.uk.sortable</code></td>
-     * <td>event, sortable object, dragged element</td>
-     * <td>On sortable stop dragging</td>
-     * </tr>
-     * <tr>
-     * <td><code>change.uk.sortable</code></td>
-     * <td>event, sortable object, dragged element, action</td>
-     * <td>On sortable change item</td>
-     * </tr>
-     * </table>
-     */
-    interface Sortable {
-        /**
-         * Init element manually
-         * @param element
-         * @param options
-         */
-        (element:string|JQuery, options:SortableOptions): any
-    }
-    interface StickyOptions {
-        /**
-         * Top offset whent sticky should be triggered
-         * @default 0
-         * <h2>Possible value</h2>
-         * integer
-         */
-        top?: number
-        /**
-         * UIkit animation class
-         * @default ''
-         * <h2>Possible value</h2>
-         * string
-         */
-        animation?: string
-        /**
-         * Init class when the element is sticky for the first time
-         * @default uk-sticky-init
-         * <h2>Possible value</h2>
-         * string
-         */
-        clsinit?: string
-        /**
-         * Active class to add, when element is sticky
-         * @default uk-active
-         * <h2>Possible value</h2>
-         * string
-         */
-        clsactive?: string
-        /**
-         * Class to add, when element is not sticky
-         * @default ''
-         * <h2>Possible value</h2>
-         * string
-         */
-        clsinactive?: string
-        /**
-         * Css selector where to get the width from in sticky mode. By default it takes the width from the created wrapper element.
-         * @default ''
-         * <h2>Possible value</h2>
-         * string
-         */
-        getWidthFrom?: string
-        /**
-         * Condition for the active status with a width as integer (e.g. 640) or a css media query
-         * @default false
-         * <h2>Possible value</h2>
-         * integer / string
-         */
-        media?: number|string
-        /**
-         * Make sure that a sticky element is not over a targeted element via location hash on dom-ready.
-         * @default false
-         * <h2>Possible value</h2>
-         * boolean
-         */
-        target?: boolean
-        /**
-         * Show sticky element only when scrolling up.
-         * @default false
-         * <h2>Possible value</h2>
-         * boolean
-         */
-        showup?: boolean
-        /**
-         * Set to <code>true</code> to bind sticky to the parent or a Css selector to bind sticky to a specific element.
-         * @default false
-         * <h2>Possible value</h2>
-         * mixed
-         */
-        boundary?: boolean|string
-
-    }
-    /**
-     * Make elements remain at the top of the viewport, like a sticky navbar.
-     * Documentation {@link http://getuikit.org/docs/sticky.html}
-     * <h2>Events</h2>
-     * <table class="uk-table uk-table-striped uk-text-nowrap">
-     * <tr>
-     * <th>Name</th>
-     * <th>Parameter</th>
-     * <th>Description</th>
-     * </tr>
-     * <tr>
-     * <td><code>active.uk.sticky</code></td>
-     * <td>event</td>
-     * <td>Element getting sticky</td>
-     * </tr>
-     * <tr>
-     * <td><code>inactive.uk.sticky</code></td>
-     * <td>event</td>
-     * <td>Element leaving sticky mode</td>
-     * </tr>
-     * </table>
-     */
-    interface Sticky {
-        /**
-         * Init the element manually
-         * @param element
-         * @param options
-         */
-        (element:string|JQuery, options:StickyOptions): any
-    }
-    interface TimepickerOptions {
-        /**
-         * Defines the preferred time notation
-         * @default '24h'
-         * <h2>Possible value</h2>
-         * '24h' or '12h'
-         */
-        format?: string
-        /**
-         * Start time
-         * @default 0
-         * <h2>Possible value</h2>
-         * Integer between 0 and 24
-         */
-        start?: number
-        /**
-         * End time
-         * @default 24
-         * <h2>Possible value</h2>
-         * Integer between 0 and 24
-         */
-        end?: number
-
-    }
-    /**
-     * Create a timepicker which can easily be used by selecting a time value from a pre filled dropdown.
-     * Documentation {@link http://getuikit.org/docs/timepicker.html}
-     */
-    interface Timepicker {
-        /**
-         * Init element manually
-         * @param element
-         * @param options
-         */
-        (element:string|JQuery, options:TimepickerOptions): any
-    }
-    interface TooltipOptions {
-        /**
-         * Offset to the source element
-         * @default 5
-         * <h2>Possible value</h2>
-         * integer
-         */
-        offset?: number
-        /**
-         * Tooltip position
-         * @default 'top'
-         * <h2>Possible value</h2>
-         * string
-         */
-        pos?: string
-        /**
-         * Fade in tooltip
-         * @default false
-         * <h2>Possible value</h2>
-         * boolean
-         */
-        animation?: boolean
-        /**
-         * Delay tooltip show in ms
-         * @default 0
-         * <h2>Possible value</h2>
-         * integer
-         */
-        delay?: number
-        /**
-         * Custom class to add on show
-         * @default ''
-         * <h2>Possible value</h2>
-         * string
-         */
-        cls?: string
-        /**
-         * Toggled active class
-         * @default 'uk-active'
-         * <h2>Possible value</h2>
-         * string
-         */
-        activeClass?: string
-
-    }
-    /**
-     * Easily create a nicely looking tooltip.
-     * Documentation {@link http://getuikit.org/docs/tooltip.html}
-     */
-    interface Tooltip {
-        /**
-         * Init element manually
-         * @param element
-         * @param options
-         */
-        (element:string|JQuery, options:TooltipOptions): any
-    }
-    interface UploadOptions {
-        /**
-         * Target url for the upload
-         * @default ''
-         * <h2>Possible value</h2>
-         * string
-         */
-        action?: string
-        /**
-         * Send each file one by one
-         * @default true
-         * <h2>Possible value</h2>
-         * boolean
-         */
-        single?: boolean
-        /**
-         * Post query name
-         * @default files[]
-         * <h2>Possible value</h2>
-         * string
-         */
-        param?: string
-        /**
-         * Additional request parameters
-         * @default {}
-         * <h2>Possible value</h2>
-         * JSON Object
-         */
-        params?: {}
-        /**
-         * File filter
-         * @default *.*
-         * <h2>Possible value</h2>
-         * string
-         */
-        allow?: string
-        /**
-         * Limit the number of files to upload
-         * @default false
-         * <h2>Possible value</h2>
-         * integer
-         */
-            filelimit?: number
-        /**
-         * Response type from server
-         * @default text
-         * <h2>Possible Value</h2>
-         * (text|json)
-         */
-        "type"?: string
-        before?: (settings: UploadOptions, files: string|string[]) => any
-        beforeAll?: (files: string|string[]) => any
-        beforeSend?: (xhr: XMLHttpRequest) => any
-        progress?: (percent: number) => any
-        complete?: (response: any, xhr: XMLHttpRequest) => any
-        allcomplete?: (response: any, xhr: XMLHttpRequest) => any
-        notallowed?: (file: string|string[], settings: UploadOptions) => any
-        loadstart?: (event: any) => any
-        load?: (event: any) => any
-        loadend?: (event: any) => any
-        error?: (event: any) => any
-        abort?: (event: any) => any
-        readystatechange?: (event: any) => any
-    }
-
-    /**
-     * Allow users to upload files through a file input form element or a placeholder area.
-     * Documentation {@link http://getuikit.org/docs/upload.html}
-     * <h2>Callbacks</h2>
-     * <table class="uk-table uk-table-striped">
-     * <tr>
-     * <th>Name</th>
-     * <th>Parameter</th>
-     * </tr>
-     * <tr>
-     * <td><code>before</code></td>
-     * <td>settings, files</td>
-     * </tr>
-     * <tr>
-     * <td><code>beforeAll</code></td>
-     * <td>files</td>
-     * </tr>
-     * <tr>
-     * <td><code>beforeSend</code></td>
-     * <td>xhr</td>
-     * </tr>
-     * <tr>
-     * <td><code>progress</code></td>
-     * <td>percent</td>
-     * </tr>
-     * <tr>
-     * <td><code>complete</code></td>
-     * <td>response, xhr</td>
-     * </tr>
-     * <tr>
-     * <td><code>allcomplete</code></td>
-     * <td>response, xhr</td>
-     * </tr>
-     * <tr>
-     * <td><code>notallowed</code></td>
-     * <td>file, settings</td>
-     * </tr>
-     * <tr>
-     * <td><code>loadstart</code></td>
-     * <td>event</td>
-     * </tr>
-     * <tr>
-     * <td><code>load</code></td>
-     * <td>event</td>
-     * </tr>
-     * <tr>
-     * <td><code>loadend</code></td>
-     * <td>event</td>
-     * </tr>
-     * <tr>
-     * <td><code>error</code></td>
-     * <td>event</td>
-     * </tr>
-     * <tr>
-     * <td><code>abort</code></td>
-     * <td>event</td>
-     * </tr>
-     * <tr>
-     * <td><code>readystatechange</code></td>
-     * <td>event</td>
-     * </tr>
-     * </table>
-     */
-    interface Upload {
-        /**
-         * Init element manually
-         * @param element
-         * @param options
-         */
-        (element:string|JQuery, options:UploadOptions): any
-    }
-    export var modal:Modal;
-    export var lightbox:LightBox;
-    export var offcanvas:OffCanvas;
-    export var autocomplete:AutoComplete;
-    export var datepicker:DatePicker;
-    export var htmleditor:HtmlEditor;
-    export var slider:Slider;
-    export var slideset:SlideSet;
-    export var slideshow:SlideShow;
-    export var parallax:Parallax;
-    export var accordion:Accordion;
-    export var notify:Notify;
-    export var search:Search;
-    export var nestable:Nestable;
-    export var sortable:Sortable;
-    export var sticky:Sticky;
-    export var timepicker:Timepicker;
-    export var tooltip:Tooltip;
-    export var uploadSelect: Upload;
-    export var uploadDrop: Upload;
-}
-
-declare module 'uikit' {
-    export = UIkit
-}
diff --git a/umbraco/index.d.ts b/umbraco/index.d.ts
new file mode 100644
index 0000000000..b606a4ec06
--- /dev/null
+++ b/umbraco/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for Umbraco v7.2.8
+// Project: https://github.com/umbraco
+// Definitions by: DeCareSystemsIreland <https://github.com/DeCareSystemsIreland>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="umbraco-resources.d.ts" />
+/// <reference path="umbraco-services.d.ts" />
+
+export as namespace umb;
+export = umbraco;
diff --git a/umbraco/tsconfig.json b/umbraco/tsconfig.json
new file mode 100644
index 0000000000..bb8f046afe
--- /dev/null
+++ b/umbraco/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "umbraco-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/umbraco/umbraco-resources.d.ts b/umbraco/umbraco-resources.d.ts
index 09d70dd4e6..bcfbba4824 100644
--- a/umbraco/umbraco-resources.d.ts
+++ b/umbraco/umbraco-resources.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: DeCareSystemsIreland <https://github.com/DeCareSystemsIreland>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../angularjs/angular.d.ts" />
+/// <reference types="angularjs" />
 
 declare namespace umbraco.resources{
 
diff --git a/umbraco/umbraco-services.d.ts b/umbraco/umbraco-services.d.ts
index 10710492ab..ff446b0f8c 100644
--- a/umbraco/umbraco-services.d.ts
+++ b/umbraco/umbraco-services.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: DeCareSystemsIreland <https://github.com/DeCareSystemsIreland>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="umbraco.d.ts" />
-/// <reference path="../angularjs/angular.d.ts" />
+
+/// <reference types="angularjs" />
 
 declare namespace umbraco.services {
 
diff --git a/umbraco/umbraco-tests.ts b/umbraco/umbraco-tests.ts
index 9afccd4747..4564dadfde 100644
--- a/umbraco/umbraco-tests.ts
+++ b/umbraco/umbraco-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="umbraco.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../underscore/underscore.d.ts" />
+/// <reference types="jquery" />
 
 var navigationService: umb.services.INavigationService;
 var notificationsService: umb.services.INotificationsService;
@@ -60,7 +58,7 @@ var getCurrentNode = () => {
 var isPublishedNode = () => {
 
     // check that we have an active node
-    if (_.isUndefined(editorState.current)) {
+    if (editorState.current) {
         return false;
     }
     return editorState.current.published;
@@ -75,7 +73,7 @@ var isPublishedNode = () => {
 var getActiveNodeId = () => {
 
     // check that we have an active node
-    if (_.isUndefined(editorState.current)) {
+    if (editorState.current) {
         return 0;
     }
     // get the parent id of the current node - we get parent because if we create a new module then the current node will be unpublished and this "id" will be 0
diff --git a/umbraco/umbraco.d.ts b/umbraco/umbraco.d.ts
deleted file mode 100644
index de2d84cfbd..0000000000
--- a/umbraco/umbraco.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Type definitions for Umbraco v7.2.8
-// Project: https://github.com/umbraco
-// Definitions by: DeCareSystemsIreland <https://github.com/DeCareSystemsIreland>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="umbraco-services.d.ts" />
-/// <reference path="umbraco-resources.d.ts" />
-
-// Collapse umbraco into umb
-import umb = umbraco;
-
-// Support AMD require
-declare module 'umbraco' {
-    export = umbraco;
-}
-
-declare namespace umbraco {
-
-}
-
diff --git a/umzug/index.d.ts b/umzug/index.d.ts
new file mode 100644
index 0000000000..0fac758548
--- /dev/null
+++ b/umzug/index.d.ts
@@ -0,0 +1,191 @@
+// Type definitions for Umzug v1.8.0
+// Project: https://github.com/sequelize/umzug
+// Definitions by: Ivan Drinchev <https://github.com/drinchev/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="bluebird" />
+
+import Sequelize = require("../sequelize");
+
+declare namespace umzug {
+
+    interface MigrationOptions {
+
+        /*
+         * The params that gets passed to the migrations.
+         * Might be an array or a synchronous function which returns an array.
+         */
+        params?: Array<any>;
+
+        /** The path to the migrations directory. */
+        path?: string;
+
+        /** The pattern that determines whether or not a file is a migration. */
+        pattern?: RegExp;
+
+        /**
+         * A function that receives and returns the to be executed function.
+         * This can be used to modify the function.
+         */
+        wrap?: <T>(fn: T) => T;
+
+    }
+
+    interface JSONStorageOptions {
+
+        /**
+         * The path to the json storage.
+         * Defaults to process.cwd() + '/umzug.json';
+         */
+        path?: string;
+
+    }
+
+    interface SequelizeStorageOptions {
+
+        /**
+         * The configured instance of Sequelize.
+         * Optional if `model` is passed.
+         */
+        sequelize?: Sequelize.Sequelize;
+
+        /**
+         * The to be used Sequelize model.
+         * Must have column name matching `columnName` option
+         * Optional of `sequelize` is passed.
+         */
+        model?: Sequelize.Model<any, any>;
+
+        /**
+         * The name of the to be used model.
+         * Defaults to 'SequelizeMeta'
+         */
+        modelName?: string;
+
+        /**
+         * The name of table to create if `model` option is not supplied
+         * Defaults to `modelName`
+         */
+        tableName?: string;
+
+        /**
+         * The name of table column holding migration name.
+         * Defaults to 'name'.
+         */
+        columnName: string;
+
+        /**
+         * The type of the column holding migration name.
+         * Defaults to `Sequelize.STRING`
+         */
+        columnType: Sequelize.DataTypeAbstract;
+
+    }
+
+    interface ExecuteOptions {
+        migrations?: Array<string>;
+        method?: string;
+    }
+
+    interface UmzugOptions {
+
+        /**
+         * The storage.
+         * Possible values: 'json', 'sequelize', an object
+         */
+        storage?: string;
+
+        /**
+         * The options for the storage.
+         */
+        storageOptions?: JSONStorageOptions | SequelizeStorageOptions | Object;
+
+        /**
+         * The logging function.
+         * A function that gets executed everytime migrations start and have ended.
+         */
+        logging?: boolean | Function;
+
+        /**
+         * The name of the positive method in migrations.
+         */
+        upName?: string;
+
+        /**
+         * The name of the negative method in migrations.
+         */
+        downName?: string;
+
+        /**
+         * Options for defined migration
+         */
+        migrations?: MigrationOptions;
+
+    }
+
+    interface UpDownToOptions {
+
+        /**
+         * It is also possible to pass the name of a migration in order to
+         * just run the migrations from the current state to the passed
+         * migration name.
+         */
+        to: string;
+
+    }
+
+    interface UpDownMigrationsOptions {
+
+        /**
+         * Running specific migrations while ignoring the right order, can be
+         * done like this:
+         */
+        migrations: Array<string>;
+
+    }
+
+    interface Migration {
+        path: string;
+        file: string;
+    }
+
+    interface Umzug {
+        /**
+         * The execute method is a general purpose function that runs for
+         * every specified migrations the respective function.
+         */
+        execute(options?: ExecuteOptions): Promise<Migration[]>;
+
+        /**
+         * You can get a list of pending/not yet executed migrations like this:
+         */
+        pending(): Promise<Migration[]>;
+
+        /**
+         * You can get a list of already executed migrations like this:
+         */
+        executed(): Promise<Migration[]>;
+
+        /**
+         * The up method can be used to execute all pending migrations.
+         */
+        up(migration?: string): Promise<Migration[]>;
+        up(migrations?: string[]): Promise<Migration[]>;
+        up(options?: UpDownToOptions | UpDownMigrationsOptions): Promise<Migration[]>;
+
+        /**
+         * The down method can be used to revert the last executed migration.
+         */
+        down(migration?: string): Promise<Migration[]>;
+        down(migrations?: string[]): Promise<Migration[]>;
+        down(options?: UpDownToOptions | UpDownMigrationsOptions): Promise<Migration[]>;
+
+    }
+
+    interface UmzugStatic {
+        new (options?: UmzugOptions): Umzug;
+    }
+}
+
+declare var umzug: umzug.UmzugStatic;
+export = umzug;
diff --git a/umzug/tsconfig.json b/umzug/tsconfig.json
new file mode 100644
index 0000000000..1ce1589757
--- /dev/null
+++ b/umzug/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "umzug-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/umzug/umzug-tests.ts b/umzug/umzug-tests.ts
index fc3f5aea3e..1201ec178f 100644
--- a/umzug/umzug-tests.ts
+++ b/umzug/umzug-tests.ts
@@ -1,9 +1,7 @@
-/// <reference path="./umzug.d.ts" />
-/// <reference path="../sequelize/sequelize.d.ts" />
-/// <reference path="../node/node.d.ts" />
+/// <reference types="node" />
 
-import * as Umzug from "umzug";
-import * as Sequelize from "sequelize";
+import * as Umzug from "./";
+import * as Sequelize from "../sequelize";
 
 var someVar:Umzug.Umzug;
 var umzug = new Umzug({});
diff --git a/umzug/umzug.d.ts b/umzug/umzug.d.ts
deleted file mode 100644
index c15b165b4a..0000000000
--- a/umzug/umzug.d.ts
+++ /dev/null
@@ -1,194 +0,0 @@
-// Type definitions for Umzug v1.8.0
-// Project: https://github.com/sequelize/umzug
-// Definitions by: Ivan Drinchev <https://github.com/drinchev/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../bluebird/bluebird.d.ts" />
-/// <reference path="../sequelize/sequelize.d.ts" />
-
-declare module "umzug" {
-    import Sequelize = require("sequelize");
-
-    namespace umzug {
-
-        interface MigrationOptions {
-
-            /*
-             * The params that gets passed to the migrations.
-             * Might be an array or a synchronous function which returns an array.
-             */
-            params?: Array<any>;
-
-            /** The path to the migrations directory. */
-            path?: string;
-
-            /** The pattern that determines whether or not a file is a migration. */
-            pattern?: RegExp;
-
-            /**
-             * A function that receives and returns the to be executed function.
-             * This can be used to modify the function.
-             */
-            wrap?: <T>( fn : T ) => T;
-
-        }
-
-        interface JSONStorageOptions {
-
-            /**
-             * The path to the json storage.
-             * Defaults to process.cwd() + '/umzug.json';
-             */
-            path?: string;
-
-        }
-
-        interface SequelizeStorageOptions {
-
-            /**
-             * The configured instance of Sequelize.
-             * Optional if `model` is passed.
-             */
-            sequelize?: Sequelize.Sequelize;
-
-            /**
-             * The to be used Sequelize model.
-             * Must have column name matching `columnName` option
-             * Optional of `sequelize` is passed.
-             */
-            model?: Sequelize.Model<any, any>;
-
-            /**
-             * The name of the to be used model.
-             * Defaults to 'SequelizeMeta'
-             */
-            modelName?: string;
-
-            /**
-             * The name of table to create if `model` option is not supplied
-             * Defaults to `modelName`
-             */
-            tableName?: string;
-
-            /**
-             * The name of table column holding migration name.
-             * Defaults to 'name'.
-             */
-            columnName: string;
-
-            /**
-             * The type of the column holding migration name.
-             * Defaults to `Sequelize.STRING`
-             */
-            columnType: Sequelize.DataTypeAbstract;
-
-        }
-
-        interface ExecuteOptions {
-            migrations?: Array<string>;
-            method?: string;
-        }
-
-        interface UmzugOptions {
-
-            /**
-             * The storage.
-             * Possible values: 'json', 'sequelize', an object
-             */
-            storage?: string;
-
-            /**
-             * The options for the storage.
-             */
-            storageOptions?: JSONStorageOptions | SequelizeStorageOptions | Object;
-
-            /**
-             * The logging function.
-             * A function that gets executed everytime migrations start and have ended.
-             */
-            logging? : boolean | Function;
-
-            /**
-             * The name of the positive method in migrations.
-             */
-            upName? : string;
-
-            /**
-             * The name of the negative method in migrations.
-             */
-            downName? : string;
-
-            /**
-             * Options for defined migration
-             */
-            migrations? : MigrationOptions;
-
-        }
-
-        interface UpDownToOptions {
-
-            /**
-             * It is also possible to pass the name of a migration in order to
-             * just run the migrations from the current state to the passed
-             * migration name.
-             */
-            to: string;
-
-        }
-
-        interface UpDownMigrationsOptions {
-
-            /**
-             * Running specific migrations while ignoring the right order, can be
-             * done like this:
-             */
-            migrations: Array<string>;
-
-        }
-
-        interface Migration {
-            path: string;
-            file: string;
-        }
-
-        interface Umzug {
-            /**
-             * The execute method is a general purpose function that runs for
-             * every specified migrations the respective function.
-             */
-            execute(options? : ExecuteOptions) : Promise<Migration[]>;
-
-            /**
-             * You can get a list of pending/not yet executed migrations like this:
-             */
-            pending() : Promise<Migration[]>;
-
-            /**
-             * You can get a list of already executed migrations like this:
-             */
-            executed() : Promise<Migration[]>;
-
-            /**
-             * The up method can be used to execute all pending migrations.
-             */
-            up(migration?: string) : Promise<Migration[]>;
-            up(migrations?: string[]) : Promise<Migration[]>;
-            up(options?: UpDownToOptions | UpDownMigrationsOptions ) : Promise<Migration[]>;
-
-            /**
-             * The down method can be used to revert the last executed migration.
-             */
-            down(migration?: string) : Promise<Migration[]>;
-            down(migrations?: string[]) : Promise<Migration[]>;
-            down(options?: UpDownToOptions | UpDownMigrationsOptions ) : Promise<Migration[]>;
-
-        }
-
-        interface UmzugStatic {
-            new (options?: UmzugOptions) : Umzug;
-        }
-    }
-
-    var umzug : umzug.UmzugStatic;
-    export = umzug;
-}
diff --git a/underscore-ko/index.d.ts b/underscore-ko/index.d.ts
new file mode 100644
index 0000000000..8bc3eb2837
--- /dev/null
+++ b/underscore-ko/index.d.ts
@@ -0,0 +1,128 @@
+// Type definitions for Underscore-ko 1.2.2 with underscore 1.4
+// Project: https://github.com/kamranayub/UnderscoreKO
+// Definitions by: Maurits Elbers <https://github.com/MagicMau/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="knockout" />
+
+import * as _ from 'underscore';
+
+interface KnockoutObservableArrayFunctions<T> {
+
+  /****
+   Collections
+  *****/
+    each<TResult>(iterator: _.ListIterator<T, TResult>, context?: any): TResult[];
+    each<TResult>(iterator: _.ObjectIterator<T, TResult>, context?: any): TResult[];
+    forEach<TResult>(iterator: _.ObjectIterator<T, TResult>, context?: any): TResult[];
+    forEach<TResult>(iterator: _.ListIterator<T, TResult>, context?: any): TResult[];
+
+    map<TResult>(iterator: _.ListIterator<T, TResult>, context?: any): TResult[];
+    map<TResult>(iterator: _.ObjectIterator<T, TResult>, context?: any): TResult[];
+    collect<TResult>(iterator: _.ListIterator<T, TResult>, context?: any): TResult[];
+    collect<TResult>(iterator: _.ObjectIterator<T, TResult>, context?: any): TResult[];
+
+    reduce<TResult>(iterator: _.MemoIterator<T, TResult>, memo: TResult, context?: any): TResult;
+    inject<TResult>(iterator: _.MemoIterator<T, TResult>, memo: TResult, context?: any): TResult;
+    foldl<TResult>(iterator: _.MemoIterator<T, TResult>, memo: TResult, context?: any): TResult;
+
+    reduceRight<TResult>(iterator: _.MemoIterator<T, TResult>, memo: TResult, context?: any): TResult;
+    foldr<TResult>(iterator: _.MemoIterator<T, TResult>, memo: TResult, context?: any): TResult;
+
+    find(iterator: _.ListIterator<T, boolean>, context?: any): T;
+    detect(iterator: _.ListIterator<T, boolean>, context?: any): T;
+
+    filter(iterator: _.ListIterator<T, boolean>, context?: any): T[];
+    filter_(iterator: _.ListIterator<T, boolean>, context?: any): T[];
+    select(iterator: _.ListIterator<T, boolean>, context?: any): T[];
+    select_(iterator: _.ListIterator<T, boolean>, context?: any): T[];
+
+    where<U extends {}>(properties: U): T[];
+
+    reject(iterator: _.ListIterator<T, boolean>, context?: any): T[];
+    reject_(iterator: _.ListIterator<T, boolean>, context?: any): T[];
+
+    all(iterator: _.ListIterator<T, boolean>, context?: any): boolean;
+    every(iterator: _.ListIterator<T, boolean>, context?: any): boolean;
+
+    any(iterator?: _.ListIterator<T, boolean>, context?: any): boolean;
+    some(iterator?: _.ListIterator<T, boolean>, context?: any): boolean;
+
+    contains(value: T): boolean;
+    include(value: T): boolean;
+
+    invoke(methodName: string, ...args: any[]): any;
+    invoke_(methodName: string, ...args: any[]): any;
+
+    pluck(propertyName: string): T[];
+    max(iterator: _.ListIterator<T, any>, context?: any): any;
+    min(iterator: _.ListIterator<T, any>, context?: any): any;
+    sortBy<TSort>(iterator: _.ListIterator<T, TSort>, context?: any): T[];
+    sortBy(iterator: string, context?: any): T[];
+    sortBy_<TSort>(iterator: _.ListIterator<T, TSort>, context?: any): T[];
+    sortBy_(iterator: string, context?: any): T[];
+    groupBy<TSort>(iterator: _.ListIterator<T, TSort>): _.Dictionary<T[]>;
+    groupBy(iterator: string): _.Dictionary<T[]>;
+    groupBy_<TSort>(iterator: _.ListIterator<T, TSort>): _.Dictionary<T[]>;
+    groupBy_(iterator: string): _.Dictionary<T[]>;
+    countBy(iterator: _.ListIterator<T, any>): _.Dictionary<number[]>;
+    countBy(iterator: string): _.Dictionary<number[]>;
+    shuffle(): T[];
+    shuffle_(): T[];
+    size(): number;
+
+    /****
+     Arrays
+    *****/
+    first(): T;
+    first(n: number): T[];
+    head(): T;
+    head(n: number): T[];
+    take(): T;
+    take(n: number): T[];
+
+    initial(n?: number): T[];
+
+    last(): T;
+    last(n: number): T[];
+
+    rest(n?: number): T[];
+    rest_(n?: number): T[];
+    tail(n?: number): T[];
+    tail_(n?: number): T[];
+    drop(n?: number): T[];
+    drop_(n?: number): T[];
+
+    compact(): T[];
+    compact_(): T[];
+    flatten(shallow?: boolean): any[];
+    flatten_(shallow?: boolean): any[];
+    without(...values: T[]): T[];
+    without_(...values: T[]): T[];
+    union(...arrays: T[][]): T[];
+    union_(...arrays: T[][]): T[];
+    intersection(...arrays: T[][]): T[];
+    intersection_(...arrays: T[][]): T[];
+    difference(...others: T[][]): T[];
+    difference_(...others: T[][]): T[];
+
+    uniq<TSort>(isSorted?: boolean, iterator?: _.ListIterator<T, TSort>): T[];
+    uniq_<TSort>(isSorted?: boolean, iterator?: _.ListIterator<T, TSort>): T[];
+    unique<TSort>(isSorted?: boolean, iterator?: _.ListIterator<T, TSort>): T[];
+    unique_<TSort>(isSorted?: boolean, iterator?: _.ListIterator<T, TSort>): T[];
+
+    zip(...arrays: any[]): any[];
+    zip_(...arrays: any[]): any[];
+    object(): any;
+    indexOf(value: T, isSorted?: boolean): number;
+    lastIndexOf(value: T, fromIndex?: number): number;
+    lastIndexOf(value: T, isSorted?: boolean): number;
+    sortedIndex<TSort>(value: T, iterator?: _.ListIterator<T, TSort>): number;
+    range(stop: number): any[];
+    range(start: number, stop: number, step?: number): any[];
+
+    /****
+     Chaining
+    *****/
+    chain(object: any): any;
+}
diff --git a/underscore-ko/tsconfig.json b/underscore-ko/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/underscore-ko/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/underscore-ko/underscore-ko.d.ts b/underscore-ko/underscore-ko.d.ts
deleted file mode 100644
index f3d43d23f9..0000000000
--- a/underscore-ko/underscore-ko.d.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-// Type definitions for Underscore-ko 1.2.2 with underscore 1.4
-// Project: https://github.com/kamranayub/UnderscoreKO
-// Definitions by: Maurits Elbers <https://github.com/MagicMau/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../knockout/knockout.d.ts" />
-/// <reference path="../underscore/underscore.d.ts" />
-
-interface KnockoutObservableArrayFunctions<T> {
-
-  /****
-   Collections
-  *****/
-    each<TResult>(iterator: _.ListIterator<T, TResult>, context?: any): TResult[];
-    each<TResult>(iterator: _.ObjectIterator<T, TResult>, context?: any): TResult[];
-    forEach<TResult>(iterator: _.ObjectIterator<T, TResult>, context?: any): TResult[];
-    forEach<TResult>(iterator: _.ListIterator<T, TResult>, context?: any): TResult[];
-
-    map<TResult>(iterator: _.ListIterator<T, TResult>, context?: any): TResult[];
-    map<TResult>(iterator: _.ObjectIterator<T, TResult>, context?: any): TResult[];
-    collect<TResult>(iterator: _.ListIterator<T, TResult>, context?: any): TResult[];
-    collect<TResult>(iterator: _.ObjectIterator<T, TResult>, context?: any): TResult[];
-
-    reduce<TResult>(iterator: _.MemoIterator<T, TResult>, memo: TResult, context?: any): TResult;
-    inject<TResult>(iterator: _.MemoIterator<T, TResult>, memo: TResult, context?: any): TResult;
-    foldl<TResult>(iterator: _.MemoIterator<T, TResult>, memo: TResult, context?: any): TResult;
-
-    reduceRight<TResult>(iterator: _.MemoIterator<T, TResult>, memo: TResult, context?: any): TResult;
-    foldr<TResult>(iterator: _.MemoIterator<T, TResult>, memo: TResult, context?: any): TResult;
-
-    find(iterator: _.ListIterator<T, boolean>, context?: any): T;
-    detect(iterator: _.ListIterator<T, boolean>, context?: any): T;
-
-    filter(iterator: _.ListIterator<T, boolean>, context?: any): T[];
-    filter_(iterator: _.ListIterator<T, boolean>, context?: any): T[];
-    select(iterator: _.ListIterator<T, boolean>, context?: any): T[];
-    select_(iterator: _.ListIterator<T, boolean>, context?: any): T[];
-
-    where<U extends {}>(properties: U): T[];
-
-    reject(iterator: _.ListIterator<T, boolean>, context?: any): T[];
-    reject_(iterator: _.ListIterator<T, boolean>, context?: any): T[];
-
-    all(iterator: _.ListIterator<T, boolean>, context?: any): boolean;
-    every(iterator: _.ListIterator<T, boolean>, context?: any): boolean;
-
-    any(iterator?: _.ListIterator<T, boolean>, context?: any): boolean;
-    some(iterator?: _.ListIterator<T, boolean>, context?: any): boolean;
-
-    contains(value: T): boolean;
-    include(value: T): boolean;
-
-    invoke(methodName: string, ...arguments: any[]): any;
-    invoke_(methodName: string, ...arguments: any[]): any;
-
-    pluck(propertyName: string): T[];
-    max(iterator: _.ListIterator<T, any>, context?: any): any;
-    min(iterator: _.ListIterator<T, any>, context?: any): any;
-    sortBy<TSort>(iterator: _.ListIterator<T, TSort>, context?: any): T[];
-    sortBy(iterator: string, context?: any): T[];
-    sortBy_<TSort>(iterator: _.ListIterator<T, TSort>, context?: any): T[];
-    sortBy_(iterator: string, context?: any): T[];
-    groupBy<TSort>(iterator: _.ListIterator<T, TSort>): _.Dictionary<T[]>;
-    groupBy(iterator: string): _.Dictionary<T[]>;
-    groupBy_<TSort>(iterator: _.ListIterator<T, TSort>): _.Dictionary<T[]>;
-    groupBy_(iterator: string): _.Dictionary<T[]>;
-    countBy(iterator: _.ListIterator<T, any>): _.Dictionary<number[]>;
-    countBy(iterator: string): _.Dictionary<number[]>;
-    shuffle(): T[];
-    shuffle_(): T[];
-    size(): number;
-
-    /****
-     Arrays
-    *****/
-    first(): T;
-    first(n: number): T[];
-    head(): T;
-    head(n: number): T[];
-    take(): T;
-    take(n: number): T[];
-
-    initial(n?: number): T[];
-
-    last(): T;
-    last(n: number): T[];
-
-    rest(n?: number): T[];
-    rest_(n?: number): T[];
-    tail(n?: number): T[];
-    tail_(n?: number): T[];
-    drop(n?: number): T[];
-    drop_(n?: number): T[];
-
-    compact(): T[];
-    compact_(): T[];
-    flatten(shallow?: boolean): any[];
-    flatten_(shallow?: boolean): any[];
-    without(...values: T[]): T[];
-    without_(...values: T[]): T[];
-    union(...arrays: T[][]): T[];
-    union_(...arrays: T[][]): T[];
-    intersection(...arrays: T[][]): T[];
-    intersection_(...arrays: T[][]): T[];
-    difference(...others: T[][]): T[];
-    difference_(...others: T[][]): T[];
-
-    uniq<TSort>(isSorted?: boolean, iterator?: _.ListIterator<T, TSort>): T[];
-    uniq_<TSort>(isSorted?: boolean, iterator?: _.ListIterator<T, TSort>): T[];
-    unique<TSort>(isSorted?: boolean, iterator?: _.ListIterator<T, TSort>): T[];
-    unique_<TSort>(isSorted?: boolean, iterator?: _.ListIterator<T, TSort>): T[];
-
-    zip(...arrays: any[]): any[];
-    zip_(...arrays: any[]): any[];
-    object(): any;
-    indexOf(value: T, isSorted?: boolean): number;
-    lastIndexOf(value: T, fromIndex?: number): number;
-    lastIndexOf(value: T, isSorted?: boolean): number;
-    sortedIndex<TSort>(value: T, iterator?: _.ListIterator<T, TSort>): number;
-    range(stop: number): any[];
-    range(start: number, stop: number, step?: number): any[];
-
-    /****
-     Chaining
-    *****/
-    chain(object: any): any;
-}
diff --git a/underscore.string/index.d.ts b/underscore.string/index.d.ts
new file mode 100644
index 0000000000..cb5336fa3f
--- /dev/null
+++ b/underscore.string/index.d.ts
@@ -0,0 +1,573 @@
+// Type definitions for underscore.string
+// Project: https://github.com/epeli/underscore.string
+// Definitions by: Ry Racherbaumer <http://github.com/rygine>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as _ from 'underscore';
+
+declare var self: _.UnderscoreStringStatic;
+export = self;
+
+declare module 'underscore' {
+    interface UnderscoreStatic extends UnderscoreStringStatic {
+        str: UnderscoreStringStatic;
+        string: UnderscoreStringStatic;
+    }
+
+    export interface UnderscoreStringStatic extends UnderscoreStringStaticExports {
+        /**
+         * Tests if string contains a substring.
+         * ('foobar', 'ob') => true
+         * @param str
+         * @param needle
+         */
+        include(str: string, needle: string): boolean;
+
+        /**
+         * Tests if string contains a substring.
+         * ('foobar', 'ob') => true
+         * @param str
+         * @param needle
+         */
+        contains(str: string, needle: string): boolean;
+
+        /**
+         * Return reversed string.
+         * ('foobar') => 'raboof'
+         * @param str
+         */
+        reverse(str: string): string;
+    }
+
+    /**
+     * Functions exported for mixing with underscore object.
+     *
+     * Usage:
+     *   _.mixin(_.string.exports());
+     *   interface UnderscoreStatic extends UnderscoreStringStaticExports { }
+     */
+    export interface UnderscoreStringStaticExports {
+
+        exports(): UnderscoreStringStaticExports;
+
+        /**
+         * Determine if a string is 'blank.'
+         * @param str
+         */
+        isBlank(str: string): boolean;
+
+        /**
+         * Removes all html tags from string.
+         * @param str
+         */
+        stripTags(str: string): string;
+
+        /**
+         * Converts first letter of the string to uppercase.
+         * ('foo Bar') => 'Foo Bar'
+         * @param str
+         */
+        capitalize(str: string): string;
+
+        /**
+         * Chop a string into pieces.
+         * ('whitespace', 3) => ['whi','tes','pac','e']
+         * @param str String to chop
+         * @param step Size of the pieces
+         */
+        chop(str: string, step: number): any[];
+
+        /**
+         * Compress some whitespaces to one.
+         * (' foo    bar   ') => 'foo bar'
+         * @param str
+         */
+        clean(str: string): string;
+
+        /**
+         * Count occurences of a sub string.
+         * ('Hello world', 'l') => 3
+         * @param str
+         * @param substr
+         */
+        count(str: string, substr: string): number;
+
+        /**
+         * Convert string to an array of characters.
+         * ('Hello') => ['H','e','l','l','o']
+         * @param str
+         */
+        chars(str: string): any[];
+
+        /**
+         * Returns a copy of the string in which all the case-based characters have had their case swapped.
+         * ('hELLO') => 'Hello'
+         * @param str
+         */
+        swapCase(str: string): string;
+
+        /**
+         * Converts HTML special characters to their entity equivalents.
+         * ('<div>Blah blah blah</div>') => '&lt;div&gt;Blah blah blah&lt;/div&gt;'
+         * @param str
+         */
+        escapeHTML(str: string): string;
+
+        /**
+         * Converts entity characters to HTML equivalents.
+         * ('&lt;div&gt;Blah blah blah&lt;/div&gt;') => '<div>Blah blah blah</div>'
+         * @param str
+         */
+        unescapeHTML(str: string): string;
+
+        /**
+         * Escape a string for use in a regular expression.
+         * @param str
+         */
+        escapeRegExp(str: string): string;
+
+        /**
+         * Splice a string like an array.
+         * @param str
+         * @param i
+         * @param howmany
+         * @param substr
+         */
+        splice(str: string, i: number, howmany: number, substr?: string): string;
+
+        /**
+         * Insert a string at index.
+         * @param str
+         * @param i
+         * @param substr
+         */
+        insert(str: string, i: number, substr: string): string;
+
+        /**
+         * Joins strings together with given separator.
+         * (' ', 'foo', 'bar') => 'foo bar'
+         * @param separator
+         * @param args
+         */
+        join(separator: string, ...args: string[]): string;
+
+        /**
+         * Split string by newlines character.
+         * ('Hello\nWorld') => ['Hello', 'World']
+         * @param str
+         */
+        lines(str: string): any[];
+
+        /**
+         * Checks if string starts with another string.
+         * ('image.gif', 'image') => true
+         * @param str
+         * @param starts
+         */
+        startsWith(str: string, starts: string): boolean;
+
+        /**
+         * Checks if string ends with another string.
+         * ('image.gif', 'gif') => true
+         * @param value
+         * @param starts
+         */
+        endsWith(value: string, starts: string): boolean;
+
+        /**
+         * Returns the successor to passed string.
+         * ('a') => 'b'
+         * @param str
+         */
+        succ(str: string): string;
+
+        /**
+         * Capitalize first letter of every word in the string.
+         * ('my name is epeli') => 'My Name Is Epeli'
+         * @param str
+         */
+        titleize(str: string): string;
+
+        /**
+         * Converts underscored or dasherized string to a camelized one.
+         * ('-moz-transform') => 'MozTransform'
+         * @param str
+         */
+        camelize(str: string): string;
+
+        /**
+         * Converts a camelized or dasherized string into an underscored one.
+         * ('MozTransform') => 'moz_transform'
+         * @param str
+         */
+        underscored(str: string): string;
+
+        /**
+         * Converts a underscored or camelized string into an dasherized one.
+         * ('MozTransform') => '-moz-transform'
+         * @param str
+         */
+        dasherize(str: string): string;
+
+        /**
+         * Converts string to camelized class name.
+         * ('some_class_name') => 'SomeClassName'
+         * @param str
+         */
+        classify(str: string): string;
+
+        /**
+         * Converts an underscored, camelized, or dasherized string into a humanized one.
+         * Also removes beginning and ending whitespace, and removes the postfix '_id'.
+         * ('  capitalize dash-CamelCase_underscore trim  ') => 'Capitalize dash camel case underscore trim'
+         * @param str
+         */
+        humanize(str: string): string;
+
+        /**
+         * Trims defined characters from begining and ending of the string.
+         * Defaults to whitespace characters.
+         * ('  foobar   ') => 'foobar'
+         * ('_-foobar-_', '_-') => 'foobar'
+         * @param str
+         * @param characters
+         */
+        trim(str: string, characters?: string): string;
+
+        /**
+         * Trims defined characters from begining and ending of the string.
+         * Defaults to whitespace characters.
+         * ('  foobar   ') => 'foobar'
+         * ('_-foobar-_', '_-') => 'foobar'
+         * @param str
+         * @param characters
+         */
+        strip(str: string, characters?: string): string;
+
+        /**
+         * Left trim. Similar to trim, but only for left side.
+         * @param str
+         * @param characters
+         */
+        ltrim(str: string, characters?: string): string;
+
+        /**
+         * Left trim. Similar to trim, but only for left side.
+         * @param str
+         * @param characters
+         */
+        lstrip(str: string, characters?: string): string;
+
+        /**
+         * Right trim. Similar to trim, but only for right side.
+         * @param str
+         * @param characters
+         */
+        rtrim(str: string, characters?: string): string;
+
+        /**
+         * Right trim. Similar to trim, but only for right side.
+         * @param str
+         * @param characters
+         */
+        rstrip(str: string, characters?: string): string;
+
+        /**
+         * Truncate string to specified length.
+         * ('Hello world').truncate(5) => 'Hello...'
+         * ('Hello').truncate(10) => 'Hello'
+         * @param str
+         * @param length
+         * @param truncateStr
+         */
+        truncate(str: string, length: number, truncateStr?: string): string;
+
+        /**
+         * Elegant version of truncate.
+         * Makes sure the pruned string does not exceed the original length.
+         * Avoid half-chopped words when truncating.
+         * ('Hello, cruel world', 15) => 'Hello, cruel...'
+         * @param str
+         * @param length
+         * @param pruneStr
+         */
+        prune(str: string, length: number, pruneStr?: string): string;
+
+        /**
+         * Split string by delimiter (String or RegExp).
+         * /\s+/ by default.
+         * ('   I   love   you   ') => ['I','love','you']
+         * ('I_love_you', '_') => ['I','love','you']
+         * @param str
+         * @param delimiter
+         */
+        words(str: string): string[];
+
+        /**
+         * Split string by delimiter (String or RegExp).
+         * /\s+/ by default.
+         * ('   I   love   you   ') => ['I','love','you']
+         * ('I_love_you', '_') => ['I','love','you']
+         * @param str
+         * @param delimiter
+         */
+        words(str: string, delimiter: string): string[];
+
+        /**
+         * Split string by delimiter (String or RegExp).
+         * /\s+/ by default.
+         * ('   I   love   you   ') => ['I','love','you']
+         * ('I_love_you', '_') => ['I','love','you']
+         * @param str
+         * @param delimiter
+         */
+        words(str: string, delimiter: RegExp): string[];
+
+        /**
+         * Pads a string with characters until the total string length is equal to the passed length parameter.
+         * By default, pads on the left with the space char (' ').
+         * padStr is truncated to a single character if necessary.
+         * ('1', 8) => '       1'
+         * ('1', 8, '0') => '00000001'
+         * ('1', 8, '0', 'right') => '10000000'
+         * ('1', 8, '0', 'both') => '00001000'
+         * ('1', 8, 'bleepblorp', 'both') => 'bbbb1bbb'
+         * @param str
+         * @param length
+         * @param padStr
+         * @param type
+         */
+        pad(str: string, length: number, padStr?:string, type?: string): string;
+
+        /**
+         * Left-pad a string.
+         * Alias for pad(str, length, padStr, 'left')
+         * ('1', 8, '0') => '00000001'
+         * @param str
+         * @param length
+         * @param padStr
+         */
+        lpad(str: string, length: number, padStr?: string): string;
+
+        /**
+         * Left-pad a string.
+         * Alias for pad(str, length, padStr, 'left')
+         * ('1', 8, '0') => '00000001'
+         * @param str
+         * @param length
+         * @param padStr
+         */
+        rjust(str: string, length: number, padStr?: string): string;
+
+        /**
+         * Right-pad a string.
+         * Alias for pad(str, length, padStr, 'right')
+         * ('1', 8, '0') => '10000000'
+         * @param str
+         * @param length
+         * @param padStr
+         */
+        rpad(str: string, length: number, padStr?: string): string;
+
+        /**
+         * Right-pad a string.
+         * Alias for pad(str, length, padStr, 'right')
+         * ('1', 8, '0') => '10000000'
+         * @param str
+         * @param length
+         * @param padStr
+         */
+        ljust(str: string, length: number, padStr?: string): string;
+
+        /**
+         * Left/right-pad a string.
+         * Alias for pad(str, length, padStr, 'both')
+         * ('1', 8, '0') => '00001000'
+         * @param str
+         * @param length
+         * @param padStr
+         */
+        lrpad(str: string, length: number, padStr?: string): string;
+
+        /**
+         * Left/right-pad a string.
+         * Alias for pad(str, length, padStr, 'both')
+         * ('1', 8, '0') => '00001000'
+         * @param str
+         * @param length
+         * @param padStr
+         */
+        center(str: string, length: number, padStr?: string): string;
+
+        /**
+         * C like string formatting.
+         * _.sprintf('%.1f', 1.17) => '1.2'
+         * @param format
+         * @param args
+         */
+        sprintf(format: string, ...args: any[]): string;
+
+        /**
+         * Parse string to number.
+         * Returns NaN if string can't be parsed to number.
+         * ('2.556').toNumber() => 3
+         * ('2.556').toNumber(1) => 2.6
+         * @param str
+         * @param decimals
+         */
+        toNumber(str: string, decimals?: number): number;
+
+        /**
+         * Formats the numbers.
+         * (1000, 2) => '1,000.00'
+         * (123456789.123, 5, '.', ',') => '123,456,789.12300'
+         * @param number
+         * @param dec
+         * @param dsep
+         * @param tsep
+         */
+        numberFormat(number: number, dec?: number, dsep?: string, tsep?: string): string;
+
+        /**
+         * Searches a string from left to right for a pattern.
+         * Returns a substring consisting of the characters in the string that are to the right of the pattern.
+         * If no match found, returns entire string.
+         * ('This_is_a_test_string').strRight('_') => 'is_a_test_string'
+         * @param str
+         * @param sep
+         */
+        strRight(str: string, sep: string): string;
+
+        /**
+         * Searches a string from right to left for a pattern.
+         * Returns a substring consisting of the characters in the string that are to the right of the pattern.
+         * If no match found, returns entire string.
+         * ('This_is_a_test_string').strRightBack('_') => 'string'
+         * @param str
+         * @param sep
+         */
+        strRightBack(str: string, sep: string): string;
+
+        /**
+         * Searches a string from left to right for a pattern.
+         * Returns a substring consisting of the characters in the string that are to the left of the pattern.
+         * If no match found, returns entire string.
+         * ('This_is_a_test_string').strLeft('_') => 'This'
+         * @param str
+         * @param sep
+         */
+        strLeft(str: string, sep: string): string;
+
+        /**
+         * Searches a string from right to left for a pattern.
+         * Returns a substring consisting of the characters in the string that are to the left of the pattern.
+         * If no match found, returns entire string.
+         * ('This_is_a_test_string').strLeftBack('_') => 'This_is_a_test'
+         * @param str
+         * @param sep
+         */
+        strLeftBack(str: string, sep: string): string;
+
+        /**
+         * Join an array into a human readable sentence.
+         * (['jQuery', 'Mootools', 'Prototype']) => 'jQuery, Mootools and Prototype'
+         * (['jQuery', 'Mootools', 'Prototype'], ', ', ' unt ') => 'jQuery, Mootools unt Prototype'
+         * @param array
+         * @param separator
+         * @param lastSeparator
+         * @param serial
+         */
+        toSentence(array: any[], separator?: string, lastSeparator?: string, serial?: boolean): string;
+
+        /**
+         * The same as toSentence, but uses ', ' as default for lastSeparator.
+         * @param array
+         * @param separator
+         * @param lastSeparator
+         */
+        toSentenceSerial(array: any[], separator?: string, lastSeparator?: string): string;
+
+        /**
+         * Transform text into a URL slug. Replaces whitespaces, accentuated, and special characters with a dash.
+         * ('Un éléphant à l'orée du bois') => 'un-elephant-a-loree-du-bois'
+         * @param str
+         */
+        slugify(str: string): string;
+
+        /**
+         * Surround a string with another string.
+         * ('foo', 'ab') => 'abfooab'
+         * @param str
+         * @param wrapper
+         */
+        surround(str: string, wrapper: string): string;
+
+        /**
+         * Quotes a string.
+         * quoteChar defaults to "
+         * ('foo') => '"foo"'
+         * @param str
+         */
+        quote(str: string, quoteChar?: string): string;
+
+        /**
+         * Quotes a string.
+         * quoteChar defaults to "
+         * ('foo') => '"foo"'
+         * @param str
+         */
+        q(str: string, quoteChar?: string): string;
+
+        /**
+         * Unquotes a string.
+         * quoteChar defaults to "
+         * ('"foo"') => 'foo'
+         * ("'foo'", "'") => 'foo'
+         * @param str
+         */
+        unquote(str: string, quoteChar?: string): string;
+
+        /**
+         * Repeat a string with an optional separator.
+         * ('foo', 3) => 'foofoofoo'
+         * ('foo', 3, 'bar') => 'foobarfoobarfoo'
+         * @param value
+         * @param count
+         * @param separator
+         */
+        repeat(value: string, count: number, separator?:string): string;
+
+        /**
+         * Naturally sort strings like humans would do.
+         * Caution: this function is charset dependent.
+         * @param str1
+         * @param str2
+         */
+        naturalCmp(str1: string, str2: string): number;
+
+        /**
+         * Calculates Levenshtein distance between two strings.
+         * ('kitten', 'kittah') => 2
+         * @param str1
+         * @param str2
+         */
+        levenshtein(str1: string, str2: string): number;
+
+        /**
+         * Turn strings that can be commonly considered as booleans to real booleans.
+         * Such as "true", "false", "1" and "0". This function is case insensitive.
+         * ('true') => true
+         * ('FALSE') => false
+         * ('random') => undefined
+         * ('truthy', ['truthy'], ['falsy']) => true
+         * ('true only at start', [/^true/]) => true
+         * @param str
+         * @param trueValues
+         * @param falseValues
+         */
+        toBoolean(str: string, trueValues?: any[], falseValues?: any[]): boolean;
+
+    }
+}
+
+// TODO interface UnderscoreString extends Underscore<string>
diff --git a/underscore.string/tsconfig.json b/underscore.string/tsconfig.json
new file mode 100644
index 0000000000..8e9c24dca4
--- /dev/null
+++ b/underscore.string/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "underscore.string-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/underscore.string/underscore.string-tests.ts b/underscore.string/underscore.string-tests.ts
index 651cf51deb..8eed630854 100644
--- a/underscore.string/underscore.string-tests.ts
+++ b/underscore.string/underscore.string-tests.ts
@@ -1,8 +1,6 @@
-/// <reference path='../underscore/underscore.d.ts' />
-/// <reference path='underscore.string.d.ts' />
+import * as _ from 'underscore';
 
 _.mixin(_.string.exports());
-interface UnderscoreStatic extends UnderscoreStringStaticExports { }
 
 _.numberFormat(1000, 2);
 _.numberFormat(123456789.123, 5, '.', ',');
diff --git a/underscore.string/underscore.string.d.ts b/underscore.string/underscore.string.d.ts
deleted file mode 100644
index 97c01579e1..0000000000
--- a/underscore.string/underscore.string.d.ts
+++ /dev/null
@@ -1,573 +0,0 @@
-// Type definitions for underscore.string
-// Project: https://github.com/epeli/underscore.string
-// Definitions by: Ry Racherbaumer <http://github.com/rygine>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../underscore/underscore.d.ts" />
-
-interface UnderscoreStatic {
-    str: UnderscoreStringStatic;
-    string: UnderscoreStringStatic;
-}
-
-declare var s : UnderscoreStringStatic;
-
-interface UnderscoreStringStatic extends UnderscoreStringStaticExports {
-    /**
-     * Tests if string contains a substring.
-     * ('foobar', 'ob') => true
-     * @param str
-     * @param needle
-     */
-    include(str: string, needle: string): boolean;
-
-    /**
-     * Tests if string contains a substring.
-     * ('foobar', 'ob') => true
-     * @param str
-     * @param needle
-     */
-    contains(str: string, needle: string): boolean;
-
-    /**
-     * Return reversed string.
-     * ('foobar') => 'raboof'
-     * @param str
-     */
-    reverse(str: string): string;
-}
-
-/**
- * Functions exported for mixing with underscore object.
- *
- * Usage:
- *   _.mixin(_.string.exports());
- *   interface UnderscoreStatic extends UnderscoreStringStaticExports { }
- */
-interface UnderscoreStringStaticExports {
-
-    exports(): UnderscoreStringStaticExports;
-
-    /**
-     * Determine if a string is 'blank.'
-     * @param str
-     */
-    isBlank(str: string): boolean;
-
-    /**
-     * Removes all html tags from string.
-     * @param str
-     */
-    stripTags(str: string): string;
-
-    /**
-     * Converts first letter of the string to uppercase.
-     * ('foo Bar') => 'Foo Bar'
-     * @param str
-     */
-    capitalize(str: string): string;
-
-    /**
-     * Chop a string into pieces.
-     * ('whitespace', 3) => ['whi','tes','pac','e']
-     * @param str String to chop
-     * @param step Size of the pieces
-     */
-    chop(str: string, step: number): any[];
-
-    /**
-     * Compress some whitespaces to one.
-     * (' foo    bar   ') => 'foo bar'
-     * @param str
-     */
-    clean(str: string): string;
-
-    /**
-     * Count occurences of a sub string.
-     * ('Hello world', 'l') => 3
-     * @param str
-     * @param substr
-     */
-    count(str: string, substr: string): number;
-
-    /**
-     * Convert string to an array of characters.
-     * ('Hello') => ['H','e','l','l','o']
-     * @param str
-     */
-    chars(str: string): any[];
-
-    /**
-     * Returns a copy of the string in which all the case-based characters have had their case swapped.
-     * ('hELLO') => 'Hello'
-     * @param str
-     */
-    swapCase(str: string): string;
-
-    /**
-     * Converts HTML special characters to their entity equivalents.
-     * ('<div>Blah blah blah</div>') => '&lt;div&gt;Blah blah blah&lt;/div&gt;'
-     * @param str
-     */
-    escapeHTML(str: string): string;
-
-    /**
-     * Converts entity characters to HTML equivalents.
-     * ('&lt;div&gt;Blah blah blah&lt;/div&gt;') => '<div>Blah blah blah</div>'
-     * @param str
-     */
-    unescapeHTML(str: string): string;
-
-    /**
-     * Escape a string for use in a regular expression.
-     * @param str
-     */
-    escapeRegExp(str: string): string;
-
-    /**
-     * Splice a string like an array.
-     * @param str
-     * @param i
-     * @param howmany
-     * @param substr
-     */
-    splice(str: string, i: number, howmany: number, substr?: string): string;
-
-    /**
-     * Insert a string at index.
-     * @param str
-     * @param i
-     * @param substr
-     */
-    insert(str: string, i: number, substr: string): string;
-
-    /**
-     * Joins strings together with given separator.
-     * (' ', 'foo', 'bar') => 'foo bar'
-     * @param separator
-     * @param args
-     */
-    join(separator: string, ...args: string[]): string;
-
-    /**
-     * Split string by newlines character.
-     * ('Hello\nWorld') => ['Hello', 'World']
-     * @param str
-     */
-    lines(str: string): any[];
-
-    /**
-     * Checks if string starts with another string.
-     * ('image.gif', 'image') => true
-     * @param str
-     * @param starts
-     */
-    startsWith(str: string, starts: string): boolean;
-
-    /**
-     * Checks if string ends with another string.
-     * ('image.gif', 'gif') => true
-     * @param value
-     * @param starts
-     */
-    endsWith(value: string, starts: string): boolean;
-
-    /**
-     * Returns the successor to passed string.
-     * ('a') => 'b'
-     * @param str
-     */
-    succ(str: string): string;
-
-    /**
-     * Capitalize first letter of every word in the string.
-     * ('my name is epeli') => 'My Name Is Epeli'
-     * @param str
-     */
-    titleize(str: string): string;
-
-    /**
-     * Converts underscored or dasherized string to a camelized one.
-     * ('-moz-transform') => 'MozTransform'
-     * @param str
-     */
-    camelize(str: string): string;
-
-    /**
-     * Converts a camelized or dasherized string into an underscored one.
-     * ('MozTransform') => 'moz_transform'
-     * @param str
-     */
-    underscored(str: string): string;
-
-    /**
-     * Converts a underscored or camelized string into an dasherized one.
-     * ('MozTransform') => '-moz-transform'
-     * @param str
-     */
-    dasherize(str: string): string;
-
-    /**
-     * Converts string to camelized class name.
-     * ('some_class_name') => 'SomeClassName'
-     * @param str
-     */
-    classify(str: string): string;
-
-    /**
-     * Converts an underscored, camelized, or dasherized string into a humanized one.
-     * Also removes beginning and ending whitespace, and removes the postfix '_id'.
-     * ('  capitalize dash-CamelCase_underscore trim  ') => 'Capitalize dash camel case underscore trim'
-     * @param str
-     */
-    humanize(str: string): string;
-
-    /**
-     * Trims defined characters from begining and ending of the string.
-     * Defaults to whitespace characters.
-     * ('  foobar   ') => 'foobar'
-     * ('_-foobar-_', '_-') => 'foobar'
-     * @param str
-     * @param characters
-     */
-    trim(str: string, characters?: string): string;
-
-    /**
-     * Trims defined characters from begining and ending of the string.
-     * Defaults to whitespace characters.
-     * ('  foobar   ') => 'foobar'
-     * ('_-foobar-_', '_-') => 'foobar'
-     * @param str
-     * @param characters
-     */
-    strip(str: string, characters?: string): string;
-
-    /**
-     * Left trim. Similar to trim, but only for left side.
-     * @param str
-     * @param characters
-     */
-    ltrim(str: string, characters?: string): string;
-
-    /**
-     * Left trim. Similar to trim, but only for left side.
-     * @param str
-     * @param characters
-     */
-    lstrip(str: string, characters?: string): string;
-
-    /**
-     * Right trim. Similar to trim, but only for right side.
-     * @param str
-     * @param characters
-     */
-    rtrim(str: string, characters?: string): string;
-
-    /**
-     * Right trim. Similar to trim, but only for right side.
-     * @param str
-     * @param characters
-     */
-    rstrip(str: string, characters?: string): string;
-
-    /**
-     * Truncate string to specified length.
-     * ('Hello world').truncate(5) => 'Hello...'
-     * ('Hello').truncate(10) => 'Hello'
-     * @param str
-     * @param length
-     * @param truncateStr
-     */
-    truncate(str: string, length: number, truncateStr?: string): string;
-
-    /**
-     * Elegant version of truncate.
-     * Makes sure the pruned string does not exceed the original length.
-     * Avoid half-chopped words when truncating.
-     * ('Hello, cruel world', 15) => 'Hello, cruel...'
-     * @param str
-     * @param length
-     * @param pruneStr
-     */
-    prune(str: string, length: number, pruneStr?: string): string;
-
-    /**
-     * Split string by delimiter (String or RegExp).
-     * /\s+/ by default.
-     * ('   I   love   you   ') => ['I','love','you']
-     * ('I_love_you', '_') => ['I','love','you']
-     * @param str
-     * @param delimiter
-     */
-    words(str: string): string[];
-
-    /**
-     * Split string by delimiter (String or RegExp).
-     * /\s+/ by default.
-     * ('   I   love   you   ') => ['I','love','you']
-     * ('I_love_you', '_') => ['I','love','you']
-     * @param str
-     * @param delimiter
-     */
-    words(str: string, delimiter: string): string[];
-
-    /**
-     * Split string by delimiter (String or RegExp).
-     * /\s+/ by default.
-     * ('   I   love   you   ') => ['I','love','you']
-     * ('I_love_you', '_') => ['I','love','you']
-     * @param str
-     * @param delimiter
-     */
-    words(str: string, delimiter: RegExp): string[];
-
-    /**
-     * Pads a string with characters until the total string length is equal to the passed length parameter.
-     * By default, pads on the left with the space char (' ').
-     * padStr is truncated to a single character if necessary.
-     * ('1', 8) => '       1'
-     * ('1', 8, '0') => '00000001'
-     * ('1', 8, '0', 'right') => '10000000'
-     * ('1', 8, '0', 'both') => '00001000'
-     * ('1', 8, 'bleepblorp', 'both') => 'bbbb1bbb'
-     * @param str
-     * @param length
-     * @param padStr
-     * @param type
-     */
-    pad(str: string, length: number, padStr?:string, type?: string): string;
-
-    /**
-     * Left-pad a string.
-     * Alias for pad(str, length, padStr, 'left')
-     * ('1', 8, '0') => '00000001'
-     * @param str
-     * @param length
-     * @param padStr
-     */
-    lpad(str: string, length: number, padStr?: string): string;
-
-    /**
-     * Left-pad a string.
-     * Alias for pad(str, length, padStr, 'left')
-     * ('1', 8, '0') => '00000001'
-     * @param str
-     * @param length
-     * @param padStr
-     */
-    rjust(str: string, length: number, padStr?: string): string;
-
-    /**
-     * Right-pad a string.
-     * Alias for pad(str, length, padStr, 'right')
-     * ('1', 8, '0') => '10000000'
-     * @param str
-     * @param length
-     * @param padStr
-     */
-    rpad(str: string, length: number, padStr?: string): string;
-
-    /**
-     * Right-pad a string.
-     * Alias for pad(str, length, padStr, 'right')
-     * ('1', 8, '0') => '10000000'
-     * @param str
-     * @param length
-     * @param padStr
-     */
-    ljust(str: string, length: number, padStr?: string): string;
-
-    /**
-     * Left/right-pad a string.
-     * Alias for pad(str, length, padStr, 'both')
-     * ('1', 8, '0') => '00001000'
-     * @param str
-     * @param length
-     * @param padStr
-     */
-    lrpad(str: string, length: number, padStr?: string): string;
-
-    /**
-     * Left/right-pad a string.
-     * Alias for pad(str, length, padStr, 'both')
-     * ('1', 8, '0') => '00001000'
-     * @param str
-     * @param length
-     * @param padStr
-     */
-    center(str: string, length: number, padStr?: string): string;
-
-    /**
-     * C like string formatting.
-     * _.sprintf('%.1f', 1.17) => '1.2'
-     * @param format
-     * @param args
-     */
-    sprintf(format: string, ...args: any[]): string;
-
-    /**
-     * Parse string to number.
-     * Returns NaN if string can't be parsed to number.
-     * ('2.556').toNumber() => 3
-     * ('2.556').toNumber(1) => 2.6
-     * @param str
-     * @param decimals
-     */
-    toNumber(str: string, decimals?: number): number;
-
-    /**
-     * Formats the numbers.
-     * (1000, 2) => '1,000.00'
-     * (123456789.123, 5, '.', ',') => '123,456,789.12300'
-     * @param number
-     * @param dec
-     * @param dsep
-     * @param tsep
-     */
-    numberFormat(number: number, dec?: number, dsep?: string, tsep?: string): string;
-
-    /**
-     * Searches a string from left to right for a pattern.
-     * Returns a substring consisting of the characters in the string that are to the right of the pattern.
-     * If no match found, returns entire string.
-     * ('This_is_a_test_string').strRight('_') => 'is_a_test_string'
-     * @param str
-     * @param sep
-     */
-    strRight(str: string, sep: string): string;
-
-    /**
-     * Searches a string from right to left for a pattern.
-     * Returns a substring consisting of the characters in the string that are to the right of the pattern.
-     * If no match found, returns entire string.
-     * ('This_is_a_test_string').strRightBack('_') => 'string'
-     * @param str
-     * @param sep
-     */
-    strRightBack(str: string, sep: string): string;
-
-    /**
-     * Searches a string from left to right for a pattern.
-     * Returns a substring consisting of the characters in the string that are to the left of the pattern.
-     * If no match found, returns entire string.
-     * ('This_is_a_test_string').strLeft('_') => 'This'
-     * @param str
-     * @param sep
-     */
-    strLeft(str: string, sep: string): string;
-
-    /**
-     * Searches a string from right to left for a pattern.
-     * Returns a substring consisting of the characters in the string that are to the left of the pattern.
-     * If no match found, returns entire string.
-     * ('This_is_a_test_string').strLeftBack('_') => 'This_is_a_test'
-     * @param str
-     * @param sep
-     */
-    strLeftBack(str: string, sep: string): string;
-
-    /**
-     * Join an array into a human readable sentence.
-     * (['jQuery', 'Mootools', 'Prototype']) => 'jQuery, Mootools and Prototype'
-     * (['jQuery', 'Mootools', 'Prototype'], ', ', ' unt ') => 'jQuery, Mootools unt Prototype'
-     * @param array
-     * @param separator
-     * @param lastSeparator
-     * @param serial
-     */
-    toSentence(array: any[], separator?: string, lastSeparator?: string, serial?: boolean): string;
-
-    /**
-     * The same as toSentence, but uses ', ' as default for lastSeparator.
-     * @param array
-     * @param separator
-     * @param lastSeparator
-     */
-    toSentenceSerial(array: any[], separator?: string, lastSeparator?: string): string;
-
-    /**
-     * Transform text into a URL slug. Replaces whitespaces, accentuated, and special characters with a dash.
-     * ('Un éléphant à l'orée du bois') => 'un-elephant-a-loree-du-bois'
-     * @param str
-     */
-    slugify(str: string): string;
-
-    /**
-     * Surround a string with another string.
-     * ('foo', 'ab') => 'abfooab'
-     * @param str
-     * @param wrapper
-     */
-    surround(str: string, wrapper: string): string;
-
-    /**
-     * Quotes a string.
-     * quoteChar defaults to "
-     * ('foo') => '"foo"'
-     * @param str
-     */
-    quote(str: string, quoteChar?: string): string;
-
-    /**
-     * Quotes a string.
-     * quoteChar defaults to "
-     * ('foo') => '"foo"'
-     * @param str
-     */
-    q(str: string, quoteChar?: string): string;
-
-    /**
-     * Unquotes a string.
-     * quoteChar defaults to "
-     * ('"foo"') => 'foo'
-     * ("'foo'", "'") => 'foo'
-     * @param str
-     */
-    unquote(str: string, quoteChar?: string): string;
-
-    /**
-     * Repeat a string with an optional separator.
-     * ('foo', 3) => 'foofoofoo'
-     * ('foo', 3, 'bar') => 'foobarfoobarfoo'
-     * @param value
-     * @param count
-     * @param separator
-     */
-    repeat(value: string, count: number, separator?:string): string;
-
-    /**
-     * Naturally sort strings like humans would do.
-     * Caution: this function is charset dependent.
-     * @param str1
-     * @param str2
-     */
-    naturalCmp(str1: string, str2: string): number;
-
-    /**
-     * Calculates Levenshtein distance between two strings.
-     * ('kitten', 'kittah') => 2
-     * @param str1
-     * @param str2
-     */
-    levenshtein(str1: string, str2: string): number;
-
-    /**
-     * Turn strings that can be commonly considered as booleans to real booleans.
-     * Such as "true", "false", "1" and "0". This function is case insensitive.
-     * ('true') => true
-     * ('FALSE') => false
-     * ('random') => undefined
-     * ('truthy', ['truthy'], ['falsy']) => true
-     * ('true only at start', [/^true/]) => true
-     * @param str
-     * @param trueValues
-     * @param falseValues
-     */
-    toBoolean(str: string, trueValues?: any[], falseValues?: any[]): boolean;
-
-}
-declare module 'underscore.string' {
-    var underscoreString: UnderscoreStringStatic;
-    export = underscoreString;
-}
-// TODO interface UnderscoreString extends Underscore<string>
diff --git a/underscore/index.d.ts b/underscore/index.d.ts
new file mode 100644
index 0000000000..86565b6d6a
--- /dev/null
+++ b/underscore/index.d.ts
@@ -0,0 +1,5916 @@
+// Type definitions for Underscore 1.7.0
+// Project: http://underscorejs.org/
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Josh Baldwin <https://github.com/jbaldwin/>, Christopher Currens <https://github.com/ccurrens/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var _: _.UnderscoreStatic;
+export = _;
+export as namespace _;
+
+declare module _ {
+	/**
+	* underscore.js _.throttle options.
+	**/
+	interface ThrottleSettings {
+
+		/**
+		* If you'd like to disable the leading-edge call, pass this as false.
+		**/
+		leading?: boolean;
+
+		/**
+		* If you'd like to disable the execution on the trailing-edge, pass false.
+		**/
+		trailing?: boolean;
+	}
+
+	/**
+	* underscore.js template settings, set templateSettings or pass as an argument
+	* to 'template()' to override defaults.
+	**/
+	interface TemplateSettings {
+		/**
+		* Default value is '/<%([\s\S]+?)%>/g'.
+		**/
+		evaluate?: RegExp;
+
+		/**
+		* Default value is '/<%=([\s\S]+?)%>/g'.
+		**/
+		interpolate?: RegExp;
+
+		/**
+		* Default value is '/<%-([\s\S]+?)%>/g'.
+		**/
+		escape?: RegExp;
+
+		/**
+		* By default, 'template()' places the values from your data in the local scope via the 'with' statement.
+		* However, you can specify a single variable name with this setting.
+		**/
+		variable?: string;
+	}
+
+	interface Collection<T> { }
+
+	// Common interface between Arrays and jQuery objects
+	interface List<T> extends Collection<T> {
+		[index: number]: T;
+		length: number;
+	}
+
+	interface Dictionary<T> extends Collection<T> {
+		[index: string]: T;
+	}
+
+	interface ListIterator<T, TResult> {
+		(value: T, index: number, list: List<T>): TResult;
+	}
+
+	interface ObjectIterator<T, TResult> {
+		(element: T, key: string, list: Dictionary<T>): TResult;
+	}
+
+	interface MemoIterator<T, TResult> {
+		(prev: TResult, curr: T, index: number, list: List<T>): TResult;
+	}
+
+	interface MemoObjectIterator<T, TResult> {
+		(prev: TResult, curr: T, key: string, list: Dictionary<T>): TResult;
+	}
+
+	interface UnderscoreStatic {
+		/**
+		* Underscore OOP Wrapper, all Underscore functions that take an object
+		* as the first parameter can be invoked through this function.
+		* @param key First argument to Underscore object functions.
+		**/
+		<T>(value: _.Dictionary<T>): Underscore<T>;
+		<T>(value: Array<T>): Underscore<T>;
+		<T>(value: T): Underscore<T>;
+
+		/* *************
+		 * Collections *
+		 ************* */
+
+		/**
+		* Iterates over a list of elements, yielding each in turn to an iterator function. The iterator is
+		* bound to the context object, if one is passed. Each invocation of iterator is called with three
+		* arguments: (element, index, list). If list is a JavaScript object, iterator's arguments will be
+		* (value, key, object). Delegates to the native forEach function if it exists.
+		* @param list Iterates over this list of elements.
+		* @param iterator Iterator function for each element `list`.
+		* @param context 'this' object in `iterator`, optional.
+		**/
+		each<T>(
+			list: _.List<T>,
+			iterator: _.ListIterator<T, void>,
+			context?: any): _.List<T>;
+
+		/**
+		* @see _.each
+		* @param object Iterates over properties of this object.
+		* @param iterator Iterator function for each property on `object`.
+		* @param context 'this' object in `iterator`, optional.
+		**/
+		each<T>(
+			object: _.Dictionary<T>,
+			iterator: _.ObjectIterator<T, void>,
+			context?: any): _.Dictionary<T>;
+
+		/**
+		* @see _.each
+		**/
+		forEach<T>(
+			list: _.List<T>,
+			iterator: _.ListIterator<T, void>,
+			context?: any): _.List<T>;
+
+		/**
+		* @see _.each
+		**/
+		forEach<T>(
+			object: _.Dictionary<T>,
+			iterator: _.ObjectIterator<T, void>,
+			context?: any): _.Dictionary<T>;
+
+		/**
+		* Produces a new array of values by mapping each value in list through a transformation function
+		* (iterator). If the native map method exists, it will be used instead. If list is a JavaScript
+		* object, iterator's arguments will be (value, key, object).
+		* @param list Maps the elements of this array.
+		* @param iterator Map iterator function for each element in `list`.
+		* @param context `this` object in `iterator`, optional.
+		* @return The mapped array result.
+		**/
+		map<T, TResult>(
+			list: _.List<T>,
+			iterator: _.ListIterator<T, TResult>,
+			context?: any): TResult[];
+
+		/**
+		* @see _.map
+		* @param object Maps the properties of this object.
+		* @param iterator Map iterator function for each property on `object`.
+		* @param context `this` object in `iterator`, optional.
+		* @return The mapped object result.
+		**/
+		map<T, TResult>(
+			object: _.Dictionary<T>,
+			iterator: _.ObjectIterator<T, TResult>,
+			context?: any): TResult[];
+
+		/**
+		* @see _.map
+		**/
+		collect<T, TResult>(
+			list: _.List<T>,
+			iterator: _.ListIterator<T, TResult>,
+			context?: any): TResult[];
+
+		/**
+		* @see _.map
+		**/
+		collect<T, TResult>(
+			object: _.Dictionary<T>,
+			iterator: _.ObjectIterator<T, TResult>,
+			context?: any): TResult[];
+
+		/**
+		* Also known as inject and foldl, reduce boils down a list of values into a single value.
+		* Memo is the initial state of the reduction, and each successive step of it should be
+		* returned by iterator. The iterator is passed four arguments: the memo, then the value
+		* and index (or key) of the iteration, and finally a reference to the entire list.
+		* @param list Reduces the elements of this array.
+		* @param iterator Reduce iterator function for each element in `list`.
+		* @param memo Initial reduce state.
+		* @param context `this` object in `iterator`, optional.
+		* @return Reduced object result.
+		**/
+		reduce<T, TResult>(
+			list: _.Collection<T>,
+			iterator: _.MemoIterator<T, TResult>,
+			memo?: TResult,
+			context?: any): TResult;
+
+		reduce<T, TResult>(
+			list: _.Dictionary<T>,
+			iterator: _.MemoObjectIterator<T, TResult>,
+			memo?: TResult,
+			context?: any): TResult;
+
+		/**
+		* @see _.reduce
+		**/
+		inject<T, TResult>(
+			list: _.Collection<T>,
+			iterator: _.MemoIterator<T, TResult>,
+			memo?: TResult,
+			context?: any): TResult;
+
+		/**
+		* @see _.reduce
+		**/
+		foldl<T, TResult>(
+			list: _.Collection<T>,
+			iterator: _.MemoIterator<T, TResult>,
+			memo?: TResult,
+			context?: any): TResult;
+
+		/**
+		* The right-associative version of reduce. Delegates to the JavaScript 1.8 version of
+		* reduceRight, if it exists. `foldr` is not as useful in JavaScript as it would be in a
+		* language with lazy evaluation.
+		* @param list Reduces the elements of this array.
+		* @param iterator Reduce iterator function for each element in `list`.
+		* @param memo Initial reduce state.
+		* @param context `this` object in `iterator`, optional.
+		* @return Reduced object result.
+		**/
+		reduceRight<T, TResult>(
+			list: _.Collection<T>,
+			iterator: _.MemoIterator<T, TResult>,
+			memo?: TResult,
+			context?: any): TResult;
+
+		/**
+		* @see _.reduceRight
+		**/
+		foldr<T, TResult>(
+			list: _.Collection<T>,
+			iterator: _.MemoIterator<T, TResult>,
+			memo?: TResult,
+			context?: any): TResult;
+
+		/**
+		* Looks through each value in the list, returning the first one that passes a truth
+		* test (iterator). The function returns as soon as it finds an acceptable element,
+		* and doesn't traverse the entire list.
+		* @param list Searches for a value in this list.
+		* @param iterator Search iterator function for each element in `list`.
+		* @param context `this` object in `iterator`, optional.
+		* @return The first acceptable found element in `list`, if nothing is found undefined/null is returned.
+		**/
+		find<T>(
+			list: _.List<T>,
+			iterator: _.ListIterator<T, boolean>,
+			context?: any): T;
+
+		/**
+		* @see _.find
+		**/
+		find<T>(
+			object: _.Dictionary<T>,
+			iterator: _.ObjectIterator<T, boolean>,
+			context?: any): T;
+
+		/**
+		* @see _.find
+		**/
+		find<T, U extends {}>(
+			object: _.List<T> | _.Dictionary<T>,
+			iterator: U): T;
+
+		/**
+		* @see _.find
+		**/
+		find<T>(
+			object: _.List<T> | _.Dictionary<T>,
+			iterator: string): T;
+
+		/**
+		* @see _.find
+		**/
+		detect<T>(
+			list: _.List<T>,
+			iterator: _.ListIterator<T, boolean>,
+			context?: any): T;
+
+		/**
+		* @see _.find
+		**/
+		detect<T>(
+			object: _.Dictionary<T>,
+			iterator: _.ObjectIterator<T, boolean>,
+			context?: any): T;
+
+		/**
+		* @see _.find
+		**/
+		detect<T, U extends {}>(
+			object: _.List<T> | _.Dictionary<T>,
+			iterator: U): T;
+
+		/**
+		* @see _.find
+		**/
+		detect<T>(
+			object: _.List<T> | _.Dictionary<T>,
+			iterator: string): T;
+
+		/**
+		* Looks through each value in the list, returning the index of the first one that passes a truth
+		* test (iterator). The function returns as soon as it finds an acceptable element,
+		* and doesn't traverse the entire list.
+		* @param list Searches for a value in this list.
+		* @param iterator Search iterator function for each element in `list`.
+		* @param context `this` object in `iterator`, optional.
+		* @return The index of the first acceptable found element in `list`, if nothing is found -1 is returned.
+		**/
+		findIndex<T>(
+			list: _.List<T>,
+			iterator: _.ListIterator<T, boolean>,
+			context?: any): number;
+
+
+		/**
+		* Looks through each value in the list, returning an array of all the values that pass a truth
+		* test (iterator). Delegates to the native filter method, if it exists.
+		* @param list Filter elements out of this list.
+		* @param iterator Filter iterator function for each element in `list`.
+		* @param context `this` object in `iterator`, optional.
+		* @return The filtered list of elements.
+		**/
+		filter<T>(
+			list: _.List<T>,
+			iterator: _.ListIterator<T, boolean>,
+			context?: any): T[];
+
+		/**
+		* @see _.filter
+		**/
+		filter<T>(
+			object: _.Dictionary<T>,
+			iterator: _.ObjectIterator<T, boolean>,
+			context?: any): T[];
+
+		/**
+		* @see _.filter
+		**/
+		select<T>(
+			list: _.List<T>,
+			iterator: _.ListIterator<T, boolean>,
+			context?: any): T[];
+
+		/**
+		* @see _.filter
+		**/
+		select<T>(
+			object: _.Dictionary<T>,
+			iterator: _.ObjectIterator<T, boolean>,
+			context?: any): T[];
+
+		/**
+		* Looks through each value in the list, returning an array of all the values that contain all
+		* of the key-value pairs listed in properties.
+		* @param list List to match elements again `properties`.
+		* @param properties The properties to check for on each element within `list`.
+		* @return The elements within `list` that contain the required `properties`.
+		**/
+		where<T, U extends {}>(
+			list: _.List<T>,
+			properties: U): T[];
+
+		/**
+		* Looks through the list and returns the first value that matches all of the key-value pairs listed in properties.
+		* @param list Search through this list's elements for the first object with all `properties`.
+		* @param properties Properties to look for on the elements within `list`.
+		* @return The first element in `list` that has all `properties`.
+		**/
+		findWhere<T, U extends {}>(
+			list: _.List<T>,
+			properties: U): T;
+
+		/**
+		* Returns the values in list without the elements that the truth test (iterator) passes.
+		* The opposite of filter.
+		* Return all the elements for which a truth test fails.
+		* @param list Reject elements within this list.
+		* @param iterator Reject iterator function for each element in `list`.
+		* @param context `this` object in `iterator`, optional.
+		* @return The rejected list of elements.
+		**/
+		reject<T>(
+			list: _.List<T>,
+			iterator: _.ListIterator<T, boolean>,
+			context?: any): T[];
+
+		/**
+		* @see _.reject
+		**/
+		reject<T>(
+			object: _.Dictionary<T>,
+			iterator: _.ObjectIterator<T, boolean>,
+			context?: any): T[];
+
+		/**
+		* Returns true if all of the values in the list pass the iterator truth test. Delegates to the
+		* native method every, if present.
+		* @param list Truth test against all elements within this list.
+		* @param iterator Trust test iterator function for each element in `list`.
+		* @param context `this` object in `iterator`, optional.
+		* @return True if all elements passed the truth test, otherwise false.
+		**/
+		every<T>(
+			list: _.List<T>,
+			iterator?: _.ListIterator<T, boolean>,
+			context?: any): boolean;
+
+		/**
+		* @see _.every
+		**/
+		every<T>(
+			list: _.Dictionary<T>,
+			iterator?: _.ObjectIterator<T, boolean>,
+			context?: any): boolean;
+
+		/**
+		* @see _.every
+		**/
+		all<T>(
+			list: _.List<T>,
+			iterator?: _.ListIterator<T, boolean>,
+			context?: any): boolean;
+
+		/**
+		* @see _.every
+		**/
+		all<T>(
+			list: _.Dictionary<T>,
+			iterator?: _.ObjectIterator<T, boolean>,
+			context?: any): boolean;
+
+		/**
+		* Returns true if any of the values in the list pass the iterator truth test. Short-circuits and
+		* stops traversing the list if a true element is found. Delegates to the native method some, if present.
+		* @param list Truth test against all elements within this list.
+		* @param iterator Trust test iterator function for each element in `list`.
+		* @param context `this` object in `iterator`, optional.
+		* @return True if any elements passed the truth test, otherwise false.
+		**/
+		some<T>(
+			list: _.List<T>,
+			iterator?: _.ListIterator<T, boolean>,
+			context?: any): boolean;
+
+		/**
+		* @see _.some
+		**/
+		some<T>(
+			object: _.Dictionary<T>,
+			iterator?: _.ObjectIterator<T, boolean>,
+			context?: any): boolean;
+
+		/**
+		* @see _.some
+		**/
+		any<T>(
+			list: _.List<T>,
+			iterator?: _.ListIterator<T, boolean>,
+			context?: any): boolean;
+
+		/**
+		* @see _.some
+		**/
+		any<T>(
+			object: _.Dictionary<T>,
+			iterator?: _.ObjectIterator<T, boolean>,
+			context?: any): boolean;
+
+		/**
+		* Returns true if the value is present in the list. Uses indexOf internally,
+		* if list is an Array.
+		* @param list Checks each element to see if `value` is present.
+		* @param value The value to check for within `list`.
+		* @return True if `value` is present in `list`, otherwise false.
+		**/
+		contains<T>(
+			list: _.List<T>,
+			value: T): boolean;
+
+		/**
+		* @see _.contains
+		**/
+		contains<T>(
+			object: _.Dictionary<T>,
+			value: T): boolean;
+
+		/**
+		* @see _.contains
+		**/
+		include<T>(
+			list: _.Collection<T>,
+			value: T): boolean;
+
+		/**
+		* @see _.contains
+		**/
+		include<T>(
+			object: _.Dictionary<T>,
+			value: T): boolean;
+
+		/**
+		* Calls the method named by methodName on each value in the list. Any extra arguments passed to
+		* invoke will be forwarded on to the method invocation.
+		* @param list The element's in this list will each have the method `methodName` invoked.
+		* @param methodName The method's name to call on each element within `list`.
+		* @param arguments Additional arguments to pass to the method `methodName`.
+		**/
+		invoke<T extends {}>(
+			list: _.List<T>,
+			methodName: string,
+			...args: any[]): any;
+
+		/**
+		* A convenient version of what is perhaps the most common use-case for map: extracting a list of
+		* property values.
+		* @param list The list to pluck elements out of that have the property `propertyName`.
+		* @param propertyName The property to look for on each element within `list`.
+		* @return The list of elements within `list` that have the property `propertyName`.
+		**/
+		pluck<T extends {}>(
+			list: _.List<T>,
+			propertyName: string): any[];
+
+		/**
+		* Returns the maximum value in list.
+		* @param list Finds the maximum value in this list.
+		* @return Maximum value in `list`.
+		**/
+		max(list: _.List<number>): number;
+
+		/**
+		* Returns the maximum value in list. If iterator is passed, it will be used on each value to generate
+		* the criterion by which the value is ranked.
+		* @param list Finds the maximum value in this list.
+		* @param iterator Compares each element in `list` to find the maximum value.
+		* @param context `this` object in `iterator`, optional.
+		* @return The maximum element within `list`.
+		**/
+		max<T>(
+			list: _.List<T>,
+			iterator?: _.ListIterator<T, any>,
+			context?: any): T;
+
+		/**
+		* Returns the minimum value in list.
+		* @param list Finds the minimum value in this list.
+		* @return Minimum value in `list`.
+		**/
+		min(list: _.List<number>): number;
+
+		/**
+		* Returns the minimum value in list. If iterator is passed, it will be used on each value to generate
+		* the criterion by which the value is ranked.
+		* @param list Finds the minimum value in this list.
+		* @param iterator Compares each element in `list` to find the minimum value.
+		* @param context `this` object in `iterator`, optional.
+		* @return The minimum element within `list`.
+		**/
+		min<T>(
+			list: _.List<T>,
+			iterator?: _.ListIterator<T, any>,
+			context?: any): T;
+
+		/**
+		* Returns a sorted copy of list, ranked in ascending order by the results of running each value
+		* through iterator. Iterator may also be the string name of the property to sort by (eg. length).
+		* @param list Sorts this list.
+		* @param iterator Sort iterator for each element within `list`.
+		* @param context `this` object in `iterator`, optional.
+		* @return A sorted copy of `list`.
+		**/
+		sortBy<T, TSort>(
+			list: _.List<T>,
+			iterator?: _.ListIterator<T, TSort>,
+			context?: any): T[];
+
+		/**
+		* @see _.sortBy
+		* @param iterator Sort iterator for each element within `list`.
+		**/
+		sortBy<T>(
+			list: _.List<T>,
+			iterator: string,
+			context?: any): T[];
+
+		/**
+		* Splits a collection into sets, grouped by the result of running each value through iterator.
+		* If iterator is a string instead of a function, groups by the property named by iterator on
+		* each of the values.
+		* @param list Groups this list.
+		* @param iterator Group iterator for each element within `list`, return the key to group the element by.
+		* @param context `this` object in `iterator`, optional.
+		* @return An object with the group names as properties where each property contains the grouped elements from `list`.
+		**/
+		groupBy<T>(
+			list: _.List<T>,
+			iterator?: _.ListIterator<T, any>,
+			context?: any): _.Dictionary<T[]>;
+
+		/**
+		* @see _.groupBy
+		* @param iterator Property on each object to group them by.
+		**/
+		groupBy<T>(
+			list: _.List<T>,
+			iterator: string,
+			context?: any): _.Dictionary<T[]>;
+
+		/**
+		* Given a `list`, and an `iterator` function that returns a key for each element in the list (or a property name),
+		* returns an object with an index of each item.  Just like _.groupBy, but for when you know your keys are unique.
+		**/
+		indexBy<T>(
+			list: _.List<T>,
+			iterator: _.ListIterator<T, any>,
+			context?: any): _.Dictionary<T>;
+
+		/**
+		* @see _.indexBy
+		* @param iterator Property on each object to index them by.
+		**/
+		indexBy<T>(
+			list: _.List<T>,
+			iterator: string,
+			context?: any): _.Dictionary<T>;
+
+		/**
+		* Sorts a list into groups and returns a count for the number of objects in each group. Similar
+		* to groupBy, but instead of returning a list of values, returns a count for the number of values
+		* in that group.
+		* @param list Group elements in this list and then count the number of elements in each group.
+		* @param iterator Group iterator for each element within `list`, return the key to group the element by.
+		* @param context `this` object in `iterator`, optional.
+		* @return An object with the group names as properties where each property contains the number of elements in that group.
+		**/
+		countBy<T>(
+			list: _.List<T>,
+			iterator?: _.ListIterator<T, any>,
+			context?: any): _.Dictionary<number>;
+
+		/**
+		* @see _.countBy
+		* @param iterator Function name
+		**/
+		countBy<T>(
+			list: _.List<T>,
+			iterator: string,
+			context?: any): _.Dictionary<number>;
+
+		/**
+		* Returns a shuffled copy of the list, using a version of the Fisher-Yates shuffle.
+		* @param list List to shuffle.
+		* @return Shuffled copy of `list`.
+		**/
+		shuffle<T>(list: _.Collection<T>): T[];
+
+		/**
+		* Produce a random sample from the `list`.  Pass a number to return `n` random elements from the list.  Otherwise a single random item will be returned.
+		* @param list List to sample.
+		* @return Random sample of `n` elements in `list`.
+		**/
+		sample<T>(list: _.Collection<T>, n: number): T[];
+
+		/**
+		* @see _.sample
+		**/
+		sample<T>(list: _.Collection<T>): T;
+
+		/**
+		* Converts the list (anything that can be iterated over), into a real Array. Useful for transmuting
+		* the arguments object.
+		* @param list object to transform into an array.
+		* @return `list` as an array.
+		**/
+		toArray<T>(list: _.Collection<T>): T[];
+
+		/**
+		* Return the number of values in the list.
+		* @param list Count the number of values/elements in this list.
+		* @return Number of values in `list`.
+		**/
+		size<T>(list: _.Collection<T>): number;
+
+		/**
+		* Split array into two arrays:
+		* one whose elements all satisfy predicate and one whose elements all do not satisfy predicate.
+		* @param array Array to split in two.
+		* @param iterator Filter iterator function for each element in `array`.
+		* @param context `this` object in `iterator`, optional.
+		* @return Array where Array[0] are the elements in `array` that satisfies the predicate, and Array[1] the elements that did not.
+		**/
+		partition<T>(
+			array: Array<T>,
+			iterator: _.ListIterator<T, boolean>,
+			context?: any): T[][];
+
+		/*********
+		* Arrays *
+		**********/
+
+		/**
+		* Returns the first element of an array. Passing n will return the first n elements of the array.
+		* @param array Retrieves the first element of this array.
+		* @return Returns the first element of `array`.
+		**/
+		first<T>(array: _.List<T>): T;
+
+		/**
+		* @see _.first
+		* @param n Return more than one element from `array`.
+		**/
+		first<T>(
+			array: _.List<T>,
+			n: number): T[];
+
+		/**
+		* @see _.first
+		**/
+		head<T>(array: _.List<T>): T;
+
+		/**
+		* @see _.first
+		**/
+		head<T>(
+			array: _.List<T>,
+			n: number): T[];
+
+		/**
+		* @see _.first
+		**/
+		take<T>(array: _.List<T>): T;
+
+		/**
+		* @see _.first
+		**/
+		take<T>(
+			array: _.List<T>,
+			n: number): T[];
+
+		/**
+		* Returns everything but the last entry of the array. Especially useful on the arguments object.
+		* Pass n to exclude the last n elements from the result.
+		* @param array Retrieve all elements except the last `n`.
+		* @param n Leaves this many elements behind, optional.
+		* @return Returns everything but the last `n` elements of `array`.
+		**/
+		initial<T>(
+			array: _.List<T>,
+			n?: number): T[];
+
+		/**
+		* Returns the last element of an array. Passing n will return the last n elements of the array.
+		* @param array Retrieves the last element of this array.
+		* @return Returns the last element of `array`.
+		**/
+		last<T>(array: _.List<T>): T;
+
+		/**
+		* @see _.last
+		* @param n Return more than one element from `array`.
+		**/
+		last<T>(
+			array: _.List<T>,
+			n: number): T[];
+
+		/**
+		* Returns the rest of the elements in an array. Pass an index to return the values of the array
+		* from that index onward.
+		* @param array The array to retrieve all but the first `index` elements.
+		* @param n The index to start retrieving elements forward from, optional, default = 1.
+		* @return Returns the elements of `array` from `index` to the end of `array`.
+		**/
+		rest<T>(
+			array: _.List<T>,
+			n?: number): T[];
+
+		/**
+		* @see _.rest
+		**/
+		tail<T>(
+			array: _.List<T>,
+			n?: number): T[];
+
+		/**
+		* @see _.rest
+		**/
+		drop<T>(
+			array: _.List<T>,
+			n?: number): T[];
+
+		/**
+		* Returns a copy of the array with all falsy values removed. In JavaScript, false, null, 0, "",
+		* undefined and NaN are all falsy.
+		* @param array Array to compact.
+		* @return Copy of `array` without false values.
+		**/
+		compact<T>(array: _.List<T>): T[];
+
+		/**
+		* Flattens a nested array (the nesting can be to any depth). If you pass shallow, the array will
+		* only be flattened a single level.
+		* @param array The array to flatten.
+		* @param shallow If true then only flatten one level, optional, default = false.
+		* @return `array` flattened.
+		**/
+		flatten(
+			array: _.List<any>,
+			shallow?: boolean): any[];
+
+		/**
+		* Returns a copy of the array with all instances of the values removed.
+		* @param array The array to remove `values` from.
+		* @param values The values to remove from `array`.
+		* @return Copy of `array` without `values`.
+		**/
+		without<T>(
+			array: _.List<T>,
+			...values: T[]): T[];
+
+		/**
+		* Computes the union of the passed-in arrays: the list of unique items, in order, that are
+		* present in one or more of the arrays.
+		* @param arrays Array of arrays to compute the union of.
+		* @return The union of elements within `arrays`.
+		**/
+		union<T>(...arrays: _.List<T>[]): T[];
+
+		/**
+		* Computes the list of values that are the intersection of all the arrays. Each value in the result
+		* is present in each of the arrays.
+		* @param arrays Array of arrays to compute the intersection of.
+		* @return The intersection of elements within `arrays`.
+		**/
+		intersection<T>(...arrays: _.List<T>[]): T[];
+
+		/**
+		* Similar to without, but returns the values from array that are not present in the other arrays.
+		* @param array Keeps values that are within `others`.
+		* @param others The values to keep within `array`.
+		* @return Copy of `array` with only `others` values.
+		**/
+		difference<T>(
+			array: _.List<T>,
+			...others: _.List<T>[]): T[];
+
+		/**
+		* Produces a duplicate-free version of the array, using === to test object equality. If you know in
+		* advance that the array is sorted, passing true for isSorted will run a much faster algorithm. If
+		* you want to compute unique items based on a transformation, pass an iterator function.
+		* @param array Array to remove duplicates from.
+		* @param isSorted True if `array` is already sorted, optional, default = false.
+		* @param iterator Transform the elements of `array` before comparisons for uniqueness.
+		* @param context 'this' object in `iterator`, optional.
+		* @return Copy of `array` where all elements are unique.
+		**/
+		uniq<T, TSort>(
+			array: _.List<T>,
+			isSorted?: boolean,
+			iterator?: _.ListIterator<T, TSort>,
+			context?: any): T[];
+
+		/**
+		* @see _.uniq
+		**/
+		uniq<T, TSort>(
+			array: _.List<T>,
+			iterator?: _.ListIterator<T, TSort>,
+			context?: any): T[];
+
+		/**
+		* @see _.uniq
+		**/
+		unique<T, TSort>(
+			array: _.List<T>,
+			iterator?: _.ListIterator<T, TSort>,
+			context?: any): T[];
+
+		/**
+		* @see _.uniq
+		**/
+		unique<T, TSort>(
+			array: _.List<T>,
+			isSorted?: boolean,
+			iterator?: _.ListIterator<T, TSort>,
+			context?: any): T[];
+
+
+		/**
+		* Merges together the values of each of the arrays with the values at the corresponding position.
+		* Useful when you have separate data sources that are coordinated through matching array indexes.
+		* If you're working with a matrix of nested arrays, zip.apply can transpose the matrix in a similar fashion.
+		* @param arrays The arrays to merge/zip.
+		* @return Zipped version of `arrays`.
+		**/
+		zip(...arrays: any[][]): any[][];
+
+		/**
+		* @see _.zip
+		**/
+		zip(...arrays: any[]): any[];
+
+		/**
+		* The opposite of zip. Given a number of arrays, returns a series of new arrays, the first
+		* of which contains all of the first elements in the input arrays, the second of which
+		* contains all of the second elements, and so on. Use with apply to pass in an array
+		* of arrays
+		* @param arrays The arrays to unzip.
+		* @return Unzipped version of `arrays`.
+		**/
+		unzip(...arrays: any[][]): any[][];
+
+		/**
+		* Converts arrays into objects. Pass either a single list of [key, value] pairs, or a
+		* list of keys, and a list of values.
+		* @param keys Key array.
+		* @param values Value array.
+		* @return An object containing the `keys` as properties and `values` as the property values.
+		**/
+		object<TResult extends {}>(
+			keys: _.List<string>,
+			values: _.List<any>): TResult;
+
+		/**
+		* Converts arrays into objects. Pass either a single list of [key, value] pairs, or a
+		* list of keys, and a list of values.
+		* @param keyValuePairs Array of [key, value] pairs.
+		* @return An object containing the `keys` as properties and `values` as the property values.
+		**/
+		object<TResult extends {}>(...keyValuePairs: any[][]): TResult;
+
+		/**
+		* @see _.object
+		**/
+		object<TResult extends {}>(
+			list: _.List<any>,
+			values?: any): TResult;
+
+		/**
+		* Returns the index at which value can be found in the array, or -1 if value is not present in the array.
+		* Uses the native indexOf function unless it's missing. If you're working with a large array, and you know
+		* that the array is already sorted, pass true for isSorted to use a faster binary search ... or, pass a number
+		* as the third argument in order to look for the first matching value in the array after the given index.
+		* @param array The array to search for the index of `value`.
+		* @param value The value to search for within `array`.
+		* @param isSorted True if the array is already sorted, optional, default = false.
+		* @return The index of `value` within `array`.
+		**/
+		indexOf<T>(
+			array: _.List<T>,
+			value: T,
+			isSorted?: boolean): number;
+
+		/**
+		* @see _indexof
+		**/
+		indexOf<T>(
+			array: _.List<T>,
+			value: T,
+			startFrom: number): number;
+
+		/**
+		* Returns the index of the last occurrence of value in the array, or -1 if value is not present. Uses the
+		* native lastIndexOf function if possible. Pass fromIndex to start your search at a given index.
+		* @param array The array to search for the last index of `value`.
+		* @param value The value to search for within `array`.
+		* @param from The starting index for the search, optional.
+		* @return The index of the last occurrence of `value` within `array`.
+		**/
+		lastIndexOf<T>(
+			array: _.List<T>,
+			value: T,
+			from?: number): number;
+
+		/**
+		* Returns the first index of an element in `array` where the predicate truth test passes
+		* @param array The array to search for the index of the first element where the predicate truth test passes.
+		* @param predicate Predicate function.
+		* @param context `this` object in `predicate`, optional.
+		* @return Returns the index of an element in `array` where the predicate truth test passes or -1.`
+		**/
+		findIndex<T>(
+			array: _.List<T>,
+			predicate: _.ListIterator<T, boolean>,
+			context?: any): number;
+
+		/**
+		* Returns the last index of an element in `array` where the predicate truth test passes
+		* @param array The array to search for the index of the last element where the predicate truth test passes.
+		* @param predicate Predicate function.
+		* @param context `this` object in `predicate`, optional.
+		* @return Returns the index of an element in `array` where the predicate truth test passes or -1.`
+		**/
+		findLastIndex<T>(
+			array: _.List<T>,
+			predicate: _.ListIterator<T, boolean>,
+			context?: any): number;
+
+		/**
+		* Uses a binary search to determine the index at which the value should be inserted into the list in order
+		* to maintain the list's sorted order. If an iterator is passed, it will be used to compute the sort ranking
+		* of each value, including the value you pass.
+		* @param list The sorted list.
+		* @param value The value to determine its index within `list`.
+		* @param iterator Iterator to compute the sort ranking of each value, optional.
+		* @return The index where `value` should be inserted into `list`.
+		**/
+		sortedIndex<T, TSort>(
+			list: _.List<T>,
+			value: T,
+			iterator?: (x: T) => TSort, context?: any): number;
+
+		/**
+		* A function to create flexibly-numbered lists of integers, handy for each and map loops. start, if omitted,
+		* defaults to 0; step defaults to 1. Returns a list of integers from start to stop, incremented (or decremented)
+		* by step, exclusive.
+		* @param start Start here.
+		* @param stop Stop here.
+		* @param step The number to count up by each iteration, optional, default = 1.
+		* @return Array of numbers from `start` to `stop` with increments of `step`.
+		**/
+
+		range(
+			start: number,
+			stop: number,
+			step?: number): number[];
+
+		/**
+		* @see _.range
+		* @param stop Stop here.
+		* @return Array of numbers from 0 to `stop` with increments of 1.
+		* @note If start is not specified the implementation will never pull the step (step = arguments[2] || 0)
+		**/
+		range(stop: number): number[];
+
+		/*************
+		 * Functions *
+		 *************/
+
+		/**
+		* Bind a function to an object, meaning that whenever the function is called, the value of this will
+		* be the object. Optionally, bind arguments to the function to pre-fill them, also known as partial application.
+		* @param func The function to bind `this` to `object`.
+		* @param context The `this` pointer whenever `fn` is called.
+		* @param arguments Additional arguments to pass to `fn` when called.
+		* @return `fn` with `this` bound to `object`.
+		**/
+		bind(
+			func: Function,
+			context: any,
+			...args: any[]): () => any;
+
+		/**
+		* Binds a number of methods on the object, specified by methodNames, to be run in the context of that object
+		* whenever they are invoked. Very handy for binding functions that are going to be used as event handlers,
+		* which would otherwise be invoked with a fairly useless this. If no methodNames are provided, all of the
+		* object's function properties will be bound to it.
+		* @param object The object to bind the methods `methodName` to.
+		* @param methodNames The methods to bind to `object`, optional and if not provided all of `object`'s
+		* methods are bound.
+		**/
+		bindAll(
+			object: any,
+			...methodNames: string[]): any;
+
+		/**
+		* Partially apply a function by filling in any number of its arguments, without changing its dynamic this value.
+		* A close cousin of bind.  You may pass _ in your list of arguments to specify an argument that should not be
+		* pre-filled, but left open to supply at call-time.
+		* @param fn Function to partially fill in arguments.
+		* @param arguments The partial arguments.
+		* @return `fn` with partially filled in arguments.
+		**/
+
+		partial<T1, T2>(
+			fn: { (p1: T1): T2 },
+			p1: T1
+		): { (): T2 };
+
+		partial<T1, T2, T3>(
+			fn: { (p1: T1, p2: T2): T3 },
+			p1: T1
+		): { (p2: T2): T3 };
+
+		partial<T1, T2, T3>(
+			fn: { (p1: T1, p2: T2): T3 },
+			p1: T1,
+			p2: T2
+		): { (): T3 };
+
+		partial<T1, T2, T3>(
+			fn: { (p1: T1, p2: T2): T3 },
+			stub1: UnderscoreStatic,
+			p2: T2
+		): { (p1: T1): T3 };
+
+		partial<T1, T2, T3, T4>(
+			fn: { (p1: T1, p2: T2, p3: T3): T4 },
+			p1: T1
+		): { (p2: T2, p3: T3): T4 };
+
+		partial<T1, T2, T3, T4>(
+			fn: { (p1: T1, p2: T2, p3: T3): T4 },
+			p1: T1,
+			p2: T2
+		): { (p3: T3): T4 };
+
+		partial<T1, T2, T3, T4>(
+			fn: { (p1: T1, p2: T2, p3: T3): T4 },
+			stub1: UnderscoreStatic,
+			p2: T2
+		): { (p1: T1, p3: T3): T4 };
+
+		partial<T1, T2, T3, T4>(
+			fn: { (p1: T1, p2: T2, p3: T3): T4 },
+			p1: T1,
+			p2: T2,
+			p3: T3
+		): { (): T4 };
+
+		partial<T1, T2, T3, T4>(
+			fn: { (p1: T1, p2: T2, p3: T3): T4 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3
+		): { (p1: T1): T4 };
+
+		partial<T1, T2, T3, T4>(
+			fn: { (p1: T1, p2: T2, p3: T3): T4 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3
+		): { (p2: T2): T4 };
+
+		partial<T1, T2, T3, T4>(
+			fn: { (p1: T1, p2: T2, p3: T3): T4 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3
+		): { (p1: T1, p2: T2): T4 };
+
+		partial<T1, T2, T3, T4, T5>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4): T5 },
+			p1: T1
+		): { (p2: T2, p3: T3, p4: T4): T5 };
+
+		partial<T1, T2, T3, T4, T5>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4): T5 },
+			p1: T1,
+			p2: T2
+		): { (p3: T3, p4: T4): T5 };
+
+		partial<T1, T2, T3, T4, T5>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4): T5 },
+			stub1: UnderscoreStatic,
+			p2: T2
+		): { (p1: T1, p3: T3, p4: T4): T5 };
+
+		partial<T1, T2, T3, T4, T5>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4): T5 },
+			p1: T1,
+			p2: T2,
+			p3: T3
+		): { (p4: T4): T5 };
+
+		partial<T1, T2, T3, T4, T5>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4): T5 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3
+		): { (p1: T1, p4: T4): T5 };
+
+		partial<T1, T2, T3, T4, T5>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4): T5 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3
+		): { (p2: T2, p4: T4): T5 };
+
+		partial<T1, T2, T3, T4, T5>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4): T5 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3
+		): { (p1: T1, p2: T2, p4: T4): T5 };
+
+		partial<T1, T2, T3, T4, T5>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4): T5 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			p4: T4
+		): { (): T5 };
+
+		partial<T1, T2, T3, T4, T5>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4): T5 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			p4: T4
+		): { (p1: T1): T5 };
+
+		partial<T1, T2, T3, T4, T5>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4): T5 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4
+		): { (p2: T2): T5 };
+
+		partial<T1, T2, T3, T4, T5>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4): T5 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4
+		): { (p1: T1, p2: T2): T5 };
+
+		partial<T1, T2, T3, T4, T5>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4): T5 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4
+		): { (p3: T3): T5 };
+
+		partial<T1, T2, T3, T4, T5>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4): T5 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4
+		): { (p1: T1, p3: T3): T5 };
+
+		partial<T1, T2, T3, T4, T5>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4): T5 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4
+		): { (p2: T2, p3: T3): T5 };
+
+		partial<T1, T2, T3, T4, T5>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4): T5 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4
+		): { (p1: T1, p2: T2, p3: T3): T5 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			p1: T1
+		): { (p2: T2, p3: T3, p4: T4, p5: T5): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			p1: T1,
+			p2: T2
+		): { (p3: T3, p4: T4, p5: T5): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			stub1: UnderscoreStatic,
+			p2: T2
+		): { (p1: T1, p3: T3, p4: T4, p5: T5): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			p1: T1,
+			p2: T2,
+			p3: T3
+		): { (p4: T4, p5: T5): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3
+		): { (p1: T1, p4: T4, p5: T5): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3
+		): { (p2: T2, p4: T4, p5: T5): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3
+		): { (p1: T1, p2: T2, p4: T4, p5: T5): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			p4: T4
+		): { (p5: T5): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			p4: T4
+		): { (p1: T1, p5: T5): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4
+		): { (p2: T2, p5: T5): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4
+		): { (p1: T1, p2: T2, p5: T5): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4
+		): { (p3: T3, p5: T5): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4
+		): { (p1: T1, p3: T3, p5: T5): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4
+		): { (p2: T2, p3: T3, p5: T5): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4
+		): { (p1: T1, p2: T2, p3: T3, p5: T5): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			p4: T4,
+			p5: T5
+		): { (): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			p4: T4,
+			p5: T5
+		): { (p1: T1): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4,
+			p5: T5
+		): { (p2: T2): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4,
+			p5: T5
+		): { (p1: T1, p2: T2): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5
+		): { (p3: T3): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5
+		): { (p1: T1, p3: T3): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5
+		): { (p2: T2, p3: T3): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5
+		): { (p1: T1, p2: T2, p3: T3): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p4: T4): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p1: T1, p4: T4): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p2: T2, p4: T4): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p1: T1, p2: T2, p4: T4): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p3: T3, p4: T4): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p1: T1, p3: T3, p4: T4): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p2: T2, p3: T3, p4: T4): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T6 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p1: T1, p2: T2, p3: T3, p4: T4): T6 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1
+		): { (p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			p2: T2
+		): { (p3: T3, p4: T4, p5: T5, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			p2: T2
+		): { (p1: T1, p3: T3, p4: T4, p5: T5, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			p2: T2,
+			p3: T3
+		): { (p4: T4, p5: T5, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3
+		): { (p1: T1, p4: T4, p5: T5, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3
+		): { (p2: T2, p4: T4, p5: T5, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3
+		): { (p1: T1, p2: T2, p4: T4, p5: T5, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			p4: T4
+		): { (p5: T5, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			p4: T4
+		): { (p1: T1, p5: T5, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4
+		): { (p2: T2, p5: T5, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4
+		): { (p1: T1, p2: T2, p5: T5, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4
+		): { (p3: T3, p5: T5, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4
+		): { (p1: T1, p3: T3, p5: T5, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4
+		): { (p2: T2, p3: T3, p5: T5, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4
+		): { (p1: T1, p2: T2, p3: T3, p5: T5, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			p4: T4,
+			p5: T5
+		): { (p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			p4: T4,
+			p5: T5
+		): { (p1: T1, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4,
+			p5: T5
+		): { (p2: T2, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4,
+			p5: T5
+		): { (p1: T1, p2: T2, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5
+		): { (p3: T3, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5
+		): { (p1: T1, p3: T3, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5
+		): { (p2: T2, p3: T3, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5
+		): { (p1: T1, p2: T2, p3: T3, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p4: T4, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p1: T1, p4: T4, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p2: T2, p4: T4, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p1: T1, p2: T2, p4: T4, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p3: T3, p4: T4, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p1: T1, p3: T3, p4: T4, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p2: T2, p3: T3, p4: T4, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p1: T1, p2: T2, p3: T3, p4: T4, p6: T6): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			p4: T4,
+			p5: T5,
+			p6: T6
+		): { (): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			p4: T4,
+			p5: T5,
+			p6: T6
+		): { (p1: T1): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4,
+			p5: T5,
+			p6: T6
+		): { (p2: T2): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4,
+			p5: T5,
+			p6: T6
+		): { (p1: T1, p2: T2): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5,
+			p6: T6
+		): { (p3: T3): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5,
+			p6: T6
+		): { (p1: T1, p3: T3): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5,
+			p6: T6
+		): { (p2: T2, p3: T3): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5,
+			p6: T6
+		): { (p1: T1, p2: T2, p3: T3): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6
+		): { (p4: T4): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6
+		): { (p1: T1, p4: T4): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6
+		): { (p2: T2, p4: T4): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6
+		): { (p1: T1, p2: T2, p4: T4): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6
+		): { (p3: T3, p4: T4): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6
+		): { (p1: T1, p3: T3, p4: T4): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6
+		): { (p2: T2, p3: T3, p4: T4): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6
+		): { (p1: T1, p2: T2, p3: T3, p4: T4): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p5: T5): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p1: T1, p5: T5): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p2: T2, p5: T5): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p1: T1, p2: T2, p5: T5): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p3: T3, p5: T5): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p1: T1, p3: T3, p5: T5): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p2: T2, p3: T3, p5: T5): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p1: T1, p2: T2, p3: T3, p5: T5): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p4: T4, p5: T5): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p1: T1, p4: T4, p5: T5): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p2: T2, p4: T4, p5: T5): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p1: T1, p2: T2, p4: T4, p5: T5): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p3: T3, p4: T4, p5: T5): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p1: T1, p3: T3, p4: T4, p5: T5): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p2: T2, p3: T3, p4: T4, p5: T5): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T7 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1
+		): { (p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2
+		): { (p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2
+		): { (p1: T1, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			p3: T3
+		): { (p4: T4, p5: T5, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3
+		): { (p1: T1, p4: T4, p5: T5, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3
+		): { (p2: T2, p4: T4, p5: T5, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3
+		): { (p1: T1, p2: T2, p4: T4, p5: T5, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			p4: T4
+		): { (p5: T5, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			p4: T4
+		): { (p1: T1, p5: T5, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4
+		): { (p2: T2, p5: T5, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4
+		): { (p1: T1, p2: T2, p5: T5, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4
+		): { (p3: T3, p5: T5, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4
+		): { (p1: T1, p3: T3, p5: T5, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4
+		): { (p2: T2, p3: T3, p5: T5, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4
+		): { (p1: T1, p2: T2, p3: T3, p5: T5, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			p4: T4,
+			p5: T5
+		): { (p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			p4: T4,
+			p5: T5
+		): { (p1: T1, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4,
+			p5: T5
+		): { (p2: T2, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4,
+			p5: T5
+		): { (p1: T1, p2: T2, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5
+		): { (p3: T3, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5
+		): { (p1: T1, p3: T3, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5
+		): { (p2: T2, p3: T3, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5
+		): { (p1: T1, p2: T2, p3: T3, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p4: T4, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p1: T1, p4: T4, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p2: T2, p4: T4, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p1: T1, p2: T2, p4: T4, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p3: T3, p4: T4, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p1: T1, p3: T3, p4: T4, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p2: T2, p3: T3, p4: T4, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5
+		): { (p1: T1, p2: T2, p3: T3, p4: T4, p6: T6, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			p4: T4,
+			p5: T5,
+			p6: T6
+		): { (p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			p4: T4,
+			p5: T5,
+			p6: T6
+		): { (p1: T1, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4,
+			p5: T5,
+			p6: T6
+		): { (p2: T2, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4,
+			p5: T5,
+			p6: T6
+		): { (p1: T1, p2: T2, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5,
+			p6: T6
+		): { (p3: T3, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5,
+			p6: T6
+		): { (p1: T1, p3: T3, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5,
+			p6: T6
+		): { (p2: T2, p3: T3, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5,
+			p6: T6
+		): { (p1: T1, p2: T2, p3: T3, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6
+		): { (p4: T4, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6
+		): { (p1: T1, p4: T4, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6
+		): { (p2: T2, p4: T4, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6
+		): { (p1: T1, p2: T2, p4: T4, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6
+		): { (p3: T3, p4: T4, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6
+		): { (p1: T1, p3: T3, p4: T4, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6
+		): { (p2: T2, p3: T3, p4: T4, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6
+		): { (p1: T1, p2: T2, p3: T3, p4: T4, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p5: T5, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p1: T1, p5: T5, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p2: T2, p5: T5, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p1: T1, p2: T2, p5: T5, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p3: T3, p5: T5, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p1: T1, p3: T3, p5: T5, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p2: T2, p3: T3, p5: T5, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p1: T1, p2: T2, p3: T3, p5: T5, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p4: T4, p5: T5, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p1: T1, p4: T4, p5: T5, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p2: T2, p4: T4, p5: T5, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p1: T1, p2: T2, p4: T4, p5: T5, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p3: T3, p4: T4, p5: T5, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p1: T1, p3: T3, p4: T4, p5: T5, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p2: T2, p3: T3, p4: T4, p5: T5, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6
+		): { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p7: T7): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			p4: T4,
+			p5: T5,
+			p6: T6,
+			p7: T7
+		): { (): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			p4: T4,
+			p5: T5,
+			p6: T6,
+			p7: T7
+		): { (p1: T1): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4,
+			p5: T5,
+			p6: T6,
+			p7: T7
+		): { (p2: T2): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4,
+			p5: T5,
+			p6: T6,
+			p7: T7
+		): { (p1: T1, p2: T2): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5,
+			p6: T6,
+			p7: T7
+		): { (p3: T3): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5,
+			p6: T6,
+			p7: T7
+		): { (p1: T1, p3: T3): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5,
+			p6: T6,
+			p7: T7
+		): { (p2: T2, p3: T3): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5,
+			p6: T6,
+			p7: T7
+		): { (p1: T1, p2: T2, p3: T3): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6,
+			p7: T7
+		): { (p4: T4): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6,
+			p7: T7
+		): { (p1: T1, p4: T4): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6,
+			p7: T7
+		): { (p2: T2, p4: T4): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6,
+			p7: T7
+		): { (p1: T1, p2: T2, p4: T4): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6,
+			p7: T7
+		): { (p3: T3, p4: T4): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6,
+			p7: T7
+		): { (p1: T1, p3: T3, p4: T4): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6,
+			p7: T7
+		): { (p2: T2, p3: T3, p4: T4): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			p6: T6,
+			p7: T7
+		): { (p1: T1, p2: T2, p3: T3, p4: T4): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6,
+			p7: T7
+		): { (p5: T5): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6,
+			p7: T7
+		): { (p1: T1, p5: T5): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6,
+			p7: T7
+		): { (p2: T2, p5: T5): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6,
+			p7: T7
+		): { (p1: T1, p2: T2, p5: T5): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6,
+			p7: T7
+		): { (p3: T3, p5: T5): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6,
+			p7: T7
+		): { (p1: T1, p3: T3, p5: T5): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6,
+			p7: T7
+		): { (p2: T2, p3: T3, p5: T5): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			p6: T6,
+			p7: T7
+		): { (p1: T1, p2: T2, p3: T3, p5: T5): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6,
+			p7: T7
+		): { (p4: T4, p5: T5): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6,
+			p7: T7
+		): { (p1: T1, p4: T4, p5: T5): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6,
+			p7: T7
+		): { (p2: T2, p4: T4, p5: T5): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6,
+			p7: T7
+		): { (p1: T1, p2: T2, p4: T4, p5: T5): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6,
+			p7: T7
+		): { (p3: T3, p4: T4, p5: T5): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6,
+			p7: T7
+		): { (p1: T1, p3: T3, p4: T4, p5: T5): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6,
+			p7: T7
+		): { (p2: T2, p3: T3, p4: T4, p5: T5): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			p6: T6,
+			p7: T7
+		): { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			p4: T4,
+			p5: T5,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			p4: T4,
+			p5: T5,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p1: T1, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4,
+			p5: T5,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p2: T2, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4,
+			p5: T5,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p1: T1, p2: T2, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p3: T3, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p1: T1, p3: T3, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p2: T2, p3: T3, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			p5: T5,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p1: T1, p2: T2, p3: T3, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p4: T4, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p1: T1, p4: T4, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p2: T2, p4: T4, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p1: T1, p2: T2, p4: T4, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p3: T3, p4: T4, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p1: T1, p3: T3, p4: T4, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p2: T2, p3: T3, p4: T4, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			p5: T5,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p1: T1, p2: T2, p3: T3, p4: T4, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p5: T5, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p1: T1, p5: T5, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p2: T2, p5: T5, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p1: T1, p2: T2, p5: T5, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p3: T3, p5: T5, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p1: T1, p3: T3, p5: T5, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p2: T2, p3: T3, p5: T5, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			p4: T4,
+			stub5: UnderscoreStatic,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p1: T1, p2: T2, p3: T3, p5: T5, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p4: T4, p5: T5, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p1: T1, p4: T4, p5: T5, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p2: T2, p4: T4, p5: T5, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			p3: T3,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p1: T1, p2: T2, p4: T4, p5: T5, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p3: T3, p4: T4, p5: T5, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			p2: T2,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p1: T1, p3: T3, p4: T4, p5: T5, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			p1: T1,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T8 };
+
+		partial<T1, T2, T3, T4, T5, T6, T7, T8>(
+			fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 },
+			stub1: UnderscoreStatic,
+			stub2: UnderscoreStatic,
+			stub3: UnderscoreStatic,
+			stub4: UnderscoreStatic,
+			stub5: UnderscoreStatic,
+			stub6: UnderscoreStatic,
+			p7: T7
+		): { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T8 };
+
+		/**
+		* Memoizes a given function by caching the computed result. Useful for speeding up slow-running computations.
+		* If passed an optional hashFunction, it will be used to compute the hash key for storing the result, based
+		* on the arguments to the original function. The default hashFunction just uses the first argument to the
+		* memoized function as the key.
+		* @param fn Computationally expensive function that will now memoized results.
+		* @param hashFn Hash function for storing the result of `fn`.
+		* @return Memoized version of `fn`.
+		**/
+		memoize(
+			fn: Function,
+			hashFn?: (...args: any[]) => string): Function;
+
+		/**
+		* Much like setTimeout, invokes function after wait milliseconds. If you pass the optional arguments,
+		* they will be forwarded on to the function when it is invoked.
+		* @param func Function to delay `waitMS` amount of ms.
+		* @param wait The amount of milliseconds to delay `fn`.
+		* @arguments Additional arguments to pass to `fn`.
+		**/
+		delay(
+			func: Function,
+			wait: number,
+			...args: any[]): any;
+
+		/**
+		* @see _delay
+		**/
+		delay(
+			func: Function,
+			...args: any[]): any;
+
+		/**
+		* Defers invoking the function until the current call stack has cleared, similar to using setTimeout
+		* with a delay of 0. Useful for performing expensive computations or HTML rendering in chunks without
+		* blocking the UI thread from updating. If you pass the optional arguments, they will be forwarded on
+		* to the function when it is invoked.
+		* @param fn The function to defer.
+		* @param arguments Additional arguments to pass to `fn`.
+		**/
+		defer(
+			fn: Function,
+			...args: any[]): void;
+
+		/**
+		* Creates and returns a new, throttled version of the passed function, that, when invoked repeatedly,
+		* will only actually call the original function at most once per every wait milliseconds. Useful for
+		* rate-limiting events that occur faster than you can keep up with.
+		* By default, throttle will execute the function as soon as you call it for the first time, and,
+		* if you call it again any number of times during the wait period, as soon as that period is over.
+		* If you'd like to disable the leading-edge call, pass {leading: false}, and if you'd like to disable
+		* the execution on the trailing-edge, pass {trailing: false}.
+		* @param func Function to throttle `waitMS` ms.
+		* @param wait The number of milliseconds to wait before `fn` can be invoked again.
+		* @param options Allows for disabling execution of the throttled function on either the leading or trailing edge.
+		* @return `fn` with a throttle of `wait`.
+		**/
+		throttle<T extends Function>(
+			func: T,
+			wait: number,
+			options?: _.ThrottleSettings): T;
+
+		/**
+		* Creates and returns a new debounced version of the passed function that will postpone its execution
+		* until after wait milliseconds have elapsed since the last time it was invoked. Useful for implementing
+		* behavior that should only happen after the input has stopped arriving. For example: rendering a preview
+		* of a Markdown comment, recalculating a layout after the window has stopped being resized, and so on.
+		*
+		* Pass true for the immediate parameter to cause debounce to trigger the function on the leading instead
+		* of the trailing edge of the wait interval. Useful in circumstances like preventing accidental double
+		*-clicks on a "submit" button from firing a second time.
+		* @param fn Function to debounce `waitMS` ms.
+		* @param wait The number of milliseconds to wait before `fn` can be invoked again.
+		* @param immediate True if `fn` should be invoked on the leading edge of `waitMS` instead of the trailing edge.
+		* @return Debounced version of `fn` that waits `wait` ms when invoked.
+		**/
+		debounce<T extends Function>(
+			fn: T,
+			wait: number,
+			immediate?: boolean): T;
+
+		/**
+		* Creates a version of the function that can only be called one time. Repeated calls to the modified
+		* function will have no effect, returning the value from the original call. Useful for initialization
+		* functions, instead of having to set a boolean flag and then check it later.
+		* @param fn Function to only execute once.
+		* @return Copy of `fn` that can only be invoked once.
+		**/
+		once<T extends Function>(fn: T): T;
+
+		/**
+		* Creates a version of the function that will only be run after first being called count times. Useful
+		* for grouping asynchronous responses, where you want to be sure that all the async calls have finished,
+		* before proceeding.
+		* @param number count Number of times to be called before actually executing.
+		* @param Function fn The function to defer execution `count` times.
+		* @return Copy of `fn` that will not execute until it is invoked `count` times.
+		**/
+		after(
+			count: number,
+			fn: Function): Function;
+
+		/**
+		* Creates a version of the function that can be called no more than count times.  The result of
+		* the last function call is memoized and returned when count has been reached.
+		* @param number count  The maxmimum number of times the function can be called.
+		* @param Function fn The function to limit the number of times it can be called.
+		* @return Copy of `fn` that can only be called `count` times.
+		**/
+		before(
+			count: number,
+			fn: Function): Function;
+
+		/**
+		* Wraps the first function inside of the wrapper function, passing it as the first argument. This allows
+		* the wrapper to execute code before and after the function runs, adjust the arguments, and execute it
+		* conditionally.
+		* @param fn Function to wrap.
+		* @param wrapper The function that will wrap `fn`.
+		* @return Wrapped version of `fn.
+		**/
+		wrap(
+			fn: Function,
+			wrapper: (fn: Function, ...args: any[]) => any): Function;
+
+		/**
+		* Returns a negated version of the pass-in predicate.
+		* @param Function predicate
+		* @return boolean
+		**/
+		negate(predicate: Function): boolean;
+
+		/**
+		* Returns the composition of a list of functions, where each function consumes the return value of the
+		* function that follows. In math terms, composing the functions f(), g(), and h() produces f(g(h())).
+		* @param functions List of functions to compose.
+		* @return Composition of `functions`.
+		**/
+		compose(...functions: Function[]): Function;
+
+		/**********
+		* Objects *
+		***********/
+
+		/**
+		* Retrieve all the names of the object's properties.
+		* @param object Retrieve the key or property names from this object.
+		* @return List of all the property names on `object`.
+		**/
+		keys(object: any): string[];
+
+		/**
+		* Retrieve all the names of object's own and inherited properties.
+		* @param object Retrieve the key or property names from this object.
+		* @return List of all the property names on `object`.
+		**/
+		allKeys(object: any): string[];
+
+		/**
+		* Return all of the values of the object's properties.
+		* @param object Retrieve the values of all the properties on this object.
+		* @return List of all the values on `object`.
+		**/
+		values<T>(object: _.Dictionary<T>): T[];
+
+		/**
+		* Return all of the values of the object's properties.
+		* @param object Retrieve the values of all the properties on this object.
+		* @return List of all the values on `object`.
+		**/
+		values(object: any): any[];
+
+		/**
+		 * Like map, but for objects. Transform the value of each property in turn.
+		 * @param object The object to transform
+		 * @param iteratee The function that transforms property values
+		 * @param context The optional context (value of `this`) to bind to
+		 * @return a new _.Dictionary of property values
+		 */
+		mapObject<T, U>(object: _.Dictionary<T>, iteratee: (val: T, key: string, object: _.Dictionary<T>) => U, context?: any): _.Dictionary<U>;
+
+		/**
+		 * Like map, but for objects. Transform the value of each property in turn.
+		 * @param object The object to transform
+		 * @param iteratee The function that tranforms property values
+		 * @param context The optional context (value of `this`) to bind to
+		 */
+		mapObject<T>(object: any, iteratee: (val: any, key: string, object: any) => T, context?: any): _.Dictionary<T>;
+
+		/**
+		 * Like map, but for objects. Retrieves a property from each entry in the object, as if by _.property
+		 * @param object The object to transform
+		 * @param iteratee The property name to retrieve
+		 * @param context The optional context (value of `this`) to bind to
+		 */
+		mapObject(object: any, iteratee: string, context?: any): _.Dictionary<any>;
+
+		/**
+		* Convert an object into a list of [key, value] pairs.
+		* @param object Convert this object to a list of [key, value] pairs.
+		* @return List of [key, value] pairs on `object`.
+		**/
+		pairs(object: any): any[][];
+
+		/**
+		* Returns a copy of the object where the keys have become the values and the values the keys.
+		* For this to work, all of your object's values should be unique and string serializable.
+		* @param object Object to invert key/value pairs.
+		* @return An inverted key/value paired version of `object`.
+		**/
+		invert(object: any): any;
+
+		/**
+		* Returns a sorted list of the names of every method in an object - that is to say,
+		* the name of every function property of the object.
+		* @param object Object to pluck all function property names from.
+		* @return List of all the function names on `object`.
+		**/
+		functions(object: any): string[];
+
+		/**
+		* @see _functions
+		**/
+		methods(object: any): string[];
+
+		/**
+		* Copy all of the properties in the source objects over to the destination object, and return
+		* the destination object. It's in-order, so the last source will override properties of the
+		* same name in previous arguments.
+		* @param destination Object to extend all the properties from `sources`.
+		* @param sources Extends `destination` with all properties from these source objects.
+		* @return `destination` extended with all the properties from the `sources` objects.
+		**/
+		extend(
+			destination: any,
+			...sources: any[]): any;
+
+		/**
+		* Like extend, but only copies own properties over to the destination object. (alias: assign)
+		*/
+		extendOwn(
+			destination: any,
+			...source: any[]): any;
+
+		/**
+		* Like extend, but only copies own properties over to the destination object. (alias: extendOwn)
+		*/
+		assign(
+			destination: any,
+			...source: any[]): any;
+
+		/**
+		* Return a copy of the object, filtered to only have values for the whitelisted keys
+		* (or array of valid keys).
+		* @param object Object to strip unwanted key/value pairs.
+		* @keys The key/value pairs to keep on `object`.
+		* @return Copy of `object` with only the `keys` properties.
+		**/
+		pick(
+			object: any,
+			...keys: any[]): any;
+
+		/**
+		* @see _.pick
+		**/
+		pick(
+			object: any,
+			fn: (value: any, key: any, object: any) => any): any;
+
+		/**
+		* Return a copy of the object, filtered to omit the blacklisted keys (or array of keys).
+		* @param object Object to strip unwanted key/value pairs.
+		* @param keys The key/value pairs to remove on `object`.
+		* @return Copy of `object` without the `keys` properties.
+		**/
+		omit(
+			object: any,
+			...keys: string[]): any;
+
+		/**
+		* @see _.omit
+		**/
+		omit(
+			object: any,
+			keys: string[]): any;
+
+		/**
+		* @see _.omit
+		**/
+		omit(
+			object: any,
+			iteratee: Function): any;
+
+		/**
+		* Fill in null and undefined properties in object with values from the defaults objects,
+		* and return the object. As soon as the property is filled, further defaults will have no effect.
+		* @param object Fill this object with default values.
+		* @param defaults The default values to add to `object`.
+		* @return `object` with added `defaults` values.
+		**/
+		defaults(
+			object: any,
+			...defaults: any[]): any;
+
+		/**
+		* Create a shallow-copied clone of the object.
+		* Any nested objects or arrays will be copied by reference, not duplicated.
+		* @param object Object to clone.
+		* @return Copy of `object`.
+		**/
+		clone<T>(object: T): T;
+
+		/**
+		* Invokes interceptor with the object, and then returns object. The primary purpose of this method
+		* is to "tap into" a method chain, in order to perform operations on intermediate results within the chain.
+		* @param object Argument to `interceptor`.
+		* @param intercepter The function to modify `object` before continuing the method chain.
+		* @return Modified `object`.
+		**/
+		tap<T>(object: T, intercepter: Function): T;
+
+		/**
+		* Does the object contain the given key? Identical to object.hasOwnProperty(key), but uses a safe
+		* reference to the hasOwnProperty function, in case it's been overridden accidentally.
+		* @param object Object to check for `key`.
+		* @param key The key to check for on `object`.
+		* @return True if `key` is a property on `object`, otherwise false.
+		**/
+		has(object: any, key: string): boolean;
+
+		/**
+		* Returns a predicate function that will tell you if a passed in object contains all of the key/value properties present in attrs.
+		* @param attrs Object with key values pair
+		* @return Predicate function
+		**/
+		matches<T, TResult>(attrs: T): _.ListIterator<T, TResult>;
+
+		/**
+		* Returns a function that will itself return the key property of any passed-in object.
+		* @param key Property of the object.
+		* @return Function which accept an object an returns the value of key in that object.
+		**/
+		property(key: string): (object: Object) => any;
+
+		/**
+		* Returns a function that will itself return the value of a object key property.
+		* @param key The object to get the property value from.
+		* @return Function which accept a key property in `object` and returns its value.
+		**/
+		propertyOf(object: Object): (key: string) => any;
+
+		/**
+		* Performs an optimized deep comparison between the two objects,
+		* to determine if they should be considered equal.
+		* @param object Compare to `other`.
+		* @param other Compare to `object`.
+		* @return True if `object` is equal to `other`.
+		**/
+		isEqual(object: any, other: any): boolean;
+
+		/**
+		* Returns true if object contains no values.
+		* @param object Check if this object has no properties or values.
+		* @return True if `object` is empty.
+		**/
+		isEmpty(object: any): boolean;
+
+		/**
+		* Returns true if the keys and values in `properties` matches with the `object` properties.
+		* @param object Object to be compared with `properties`.
+		* @param properties Properties be compared with `object`
+		* @return True if `object` has matching keys and values, otherwise false.
+		**/
+		isMatch(object: any, properties: any): boolean;
+
+		/**
+		* Returns true if object is a DOM element.
+		* @param object Check if this object is a DOM element.
+		* @return True if `object` is a DOM element, otherwise false.
+		**/
+		isElement(object: any): object is Element;
+
+		/**
+		* Returns true if object is an Array.
+		* @param object Check if this object is an Array.
+		* @return True if `object` is an Array, otherwise false.
+		**/
+		isArray(object: any): object is [];
+
+		/**
+		* Returns true if object is an Array.
+		* @param object Check if this object is an Array.
+		* @return True if `object` is an Array, otherwise false.
+		**/
+		isArray<T>(object: any): object is T[];
+
+		/**
+		* Returns true if value is an Object. Note that JavaScript arrays and functions are objects,
+		* while (normal) strings and numbers are not.
+		* @param object Check if this object is an Object.
+		* @return True of `object` is an Object, otherwise false.
+		**/
+		isObject(object: any): boolean;
+
+		/**
+		* Returns true if object is an Arguments object.
+		* @param object Check if this object is an Arguments object.
+		* @return True if `object` is an Arguments object, otherwise false.
+		**/
+		isArguments(object: any): object is IArguments;
+
+		/**
+		* Returns true if object is a Function.
+		* @param object Check if this object is a Function.
+		* @return True if `object` is a Function, otherwise false.
+		**/
+		isFunction(object: any): object is Function;
+
+		/**
+		* Returns true if object inherits from an Error.
+		* @param object Check if this object is an Error.
+		* @return True if `object` is a Error, otherwise false.
+		**/
+		isError(object: any): object is Error;
+
+		/**
+		* Returns true if object is a String.
+		* @param object Check if this object is a String.
+		* @return True if `object` is a String, otherwise false.
+		**/
+		isString(object: any): object is string;
+
+		/**
+		* Returns true if object is a Number (including NaN).
+		* @param object Check if this object is a Number.
+		* @return True if `object` is a Number, otherwise false.
+		**/
+		isNumber(object: any): object is number;
+
+		/**
+		* Returns true if object is a finite Number.
+		* @param object Check if this object is a finite Number.
+		* @return True if `object` is a finite Number.
+		**/
+		isFinite(object: any): boolean;
+
+		/**
+		* Returns true if object is either true or false.
+		* @param object Check if this object is a bool.
+		* @return True if `object` is a bool, otherwise false.
+		**/
+		isBoolean(object: any): object is boolean;
+
+		/**
+		* Returns true if object is a Date.
+		* @param object Check if this object is a Date.
+		* @return True if `object` is a Date, otherwise false.
+		**/
+		isDate(object: any): object is Date;
+
+		/**
+		* Returns true if object is a RegExp.
+		* @param object Check if this object is a RegExp.
+		* @return True if `object` is a RegExp, otherwise false.
+		**/
+		isRegExp(object: any): object is RegExp;
+
+		/**
+		* Returns true if object is NaN.
+		* Note: this is not the same as the native isNaN function,
+		* which will also return true if the variable is undefined.
+		* @param object Check if this object is NaN.
+		* @return True if `object` is NaN, otherwise false.
+		**/
+		isNaN(object: any): boolean;
+
+		/**
+		* Returns true if the value of object is null.
+		* @param object Check if this object is null.
+		* @return True if `object` is null, otherwise false.
+		**/
+		isNull(object: any): boolean;
+
+		/**
+		* Returns true if value is undefined.
+		* @param object Check if this object is undefined.
+		* @return True if `object` is undefined, otherwise false.
+		**/
+		isUndefined(value: any): boolean;
+
+		/* *********
+		 * Utility *
+		********** */
+
+		/**
+		* Give control of the "_" variable back to its previous owner.
+		* Returns a reference to the Underscore object.
+		* @return Underscore object reference.
+		**/
+		noConflict(): any;
+
+		/**
+		* Returns the same value that is used as the argument. In math: f(x) = x
+		* This function looks useless, but is used throughout Underscore as a default iterator.
+		* @param value Identity of this object.
+		* @return `value`.
+		**/
+		identity<T>(value: T): T;
+
+		/**
+		* Creates a function that returns the same value that is used as the argument of _.constant
+		* @param value Identity of this object.
+		* @return Function that return value.
+		**/
+		constant<T>(value: T): () => T;
+
+		/**
+		* Returns undefined irrespective of the arguments passed to it.  Useful as the default
+		* for optional callback arguments.
+		* Note there is no way to indicate a 'undefined' return, so it is currently typed as void.
+		* @return undefined
+		**/
+		noop(): void;
+
+		/**
+		* Invokes the given iterator function n times.
+		* Each invocation of iterator is called with an index argument
+		* @param n Number of times to invoke `iterator`.
+		* @param iterator Function iterator to invoke `n` times.
+		* @param context `this` object in `iterator`, optional.
+		**/
+		times<TResult>(n: number, iterator: (n: number) => TResult, context?: any): TResult[];
+
+		/**
+		* Returns a random integer between min and max, inclusive. If you only pass one argument,
+		* it will return a number between 0 and that number.
+		* @param max The maximum random number.
+		* @return A random number between 0 and `max`.
+		**/
+		random(max: number): number;
+
+		/**
+		* @see _.random
+		* @param min The minimum random number.
+		* @return A random number between `min` and `max`.
+		**/
+		random(min: number, max: number): number;
+
+		/**
+		* Allows you to extend Underscore with your own utility functions. Pass a hash of
+		* {name: function} definitions to have your functions added to the Underscore object,
+		* as well as the OOP wrapper.
+		* @param object Mixin object containing key/function pairs to add to the Underscore object.
+		**/
+		mixin(object: any): void;
+
+		/**
+		* A mostly-internal function to generate callbacks that can be applied to each element
+		* in a collection, returning the desired result -- either identity, an arbitrary callback,
+		* a property matcher, or a propetery accessor.
+		* @param string|Function|Object value The value to iterate over, usually the key.
+		* @param any context
+		* @param number argCount
+		* @return Callback that can be applied to each element in a collection.
+		**/
+		iteratee(value: string): Function;
+		iteratee(value: Function, context?: any, argCount?: number): Function;
+		iteratee(value: Object): Function;
+
+		/**
+		* Generate a globally-unique id for client-side models or DOM elements that need one.
+		* If prefix is passed, the id will be appended to it. Without prefix, returns an integer.
+		* @param prefix A prefix string to start the unique ID with.
+		* @return Unique string ID beginning with `prefix`.
+		**/
+		uniqueId(prefix?: string): string;
+
+		/**
+		* Escapes a string for insertion into HTML, replacing &, <, >, ", ', and / characters.
+		* @param str Raw string to escape.
+		* @return `str` HTML escaped.
+		**/
+		escape(str: string): string;
+
+		/**
+		* The opposite of escape, replaces &amp;, &lt;, &gt;, &quot;, and &#x27; with their unescaped counterparts.
+		* @param str HTML escaped string.
+		* @return `str` Raw string.
+		**/
+		unescape(str: string): string;
+
+		/**
+		* If the value of the named property is a function then invoke it; otherwise, return it.
+		* @param object Object to maybe invoke function `property` on.
+		* @param property The function by name to invoke on `object`.
+		* @param defaultValue The value to be returned in case `property` doesn't exist or is undefined.
+		* @return The result of invoking the function `property` on `object.
+		**/
+		result(object: any, property: string, defaultValue?: any): any;
+
+		/**
+		* Compiles JavaScript templates into functions that can be evaluated for rendering. Useful
+		* for rendering complicated bits of HTML from JSON data sources. Template functions can both
+		* interpolate variables, using <%= ... %>, as well as execute arbitrary JavaScript code, with
+		* <% ... %>. If you wish to interpolate a value, and have it be HTML-escaped, use <%- ... %> When
+		* you evaluate a template function, pass in a data object that has properties corresponding to
+		* the template's free variables. If you're writing a one-off, you can pass the data object as
+		* the second parameter to template in order to render immediately instead of returning a template
+		* function. The settings argument should be a hash containing any _.templateSettings that should
+		* be overridden.
+		* @param templateString Underscore HTML template.
+		* @param data Data to use when compiling `templateString`.
+		* @param settings Settings to use while compiling.
+		* @return Returns the compiled Underscore HTML template.
+		**/
+		template(templateString: string, settings?: _.TemplateSettings): (...data: any[]) => string;
+
+		/**
+		* By default, Underscore uses ERB-style template delimiters, change the
+		* following template settings to use alternative delimiters.
+		**/
+		templateSettings: _.TemplateSettings;
+
+		/**
+		* Returns an integer timestamp for the current time, using the fastest method available in the runtime. Useful for implementing timing/animation functions.
+		**/
+		now(): number;
+
+		/* **********
+		 * Chaining *
+		*********** */
+
+		/**
+		* Returns a wrapped object. Calling methods on this object will continue to return wrapped objects
+		* until value() is used.
+		* @param obj Object to chain.
+		* @return Wrapped `obj`.
+		**/
+		chain<T>(obj: T[]): _Chain<T>;
+		chain<T>(obj: _.Dictionary<T>): _Chain<T>;
+		chain<T extends {}>(obj: T): _Chain<T>;
+	}
+
+	interface Underscore<T> {
+
+		/* *************
+		 * Collections *
+		 ************* */
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.each
+		**/
+		each(iterator: _.ListIterator<T, void>, context?: any): T[];
+
+		/**
+		* @see _.each
+		**/
+		each(iterator: _.ObjectIterator<T, void>, context?: any): T[];
+
+		/**
+		* @see _.each
+		**/
+		forEach(iterator: _.ListIterator<T, void>, context?: any): T[];
+
+		/**
+		* @see _.each
+		**/
+		forEach(iterator: _.ObjectIterator<T, void>, context?: any): T[];
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.map
+		**/
+		map<TResult>(iterator: _.ListIterator<T, TResult>, context?: any): TResult[];
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.map
+		**/
+		map<TResult>(iterator: _.ObjectIterator<T, TResult>, context?: any): TResult[];
+
+		/**
+		* @see _.map
+		**/
+		collect<TResult>(iterator: _.ListIterator<T, TResult>, context?: any): TResult[];
+
+		/**
+		* @see _.map
+		**/
+		collect<TResult>(iterator: _.ObjectIterator<T, TResult>, context?: any): TResult[];
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.reduce
+		**/
+		reduce<TResult>(iterator: _.MemoIterator<T, TResult>, memo?: TResult, context?: any): TResult;
+
+		/**
+		* @see _.reduce
+		**/
+		inject<TResult>(iterator: _.MemoIterator<T, TResult>, memo?: TResult, context?: any): TResult;
+
+		/**
+		* @see _.reduce
+		**/
+		foldl<TResult>(iterator: _.MemoIterator<T, TResult>, memo?: TResult, context?: any): TResult;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.reduceRight
+		**/
+		reduceRight<TResult>(iterator: _.MemoIterator<T, TResult>, memo?: TResult, context?: any): TResult;
+
+		/**
+		* @see _.reduceRight
+		**/
+		foldr<TResult>(iterator: _.MemoIterator<T, TResult>, memo?: TResult, context?: any): TResult;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.find
+		**/
+		find<T>(iterator: _.ListIterator<T, boolean> | _.ObjectIterator<T, boolean>, context?: any): T;
+
+		/**
+		* @see _.find
+		**/
+		find<T, U extends {}>(interator: U): T;
+
+		/**
+		* @see _.find
+		**/
+		find<T>(interator: string): T;
+
+		/**
+		* @see _.find
+		**/
+		detect<T>(iterator: _.ListIterator<T, boolean> | _.ObjectIterator<T, boolean>, context?: any): T;
+
+		/**
+		* @see _.find
+		**/
+		detect<T, U extends {}>(interator?: U): T;
+
+		/**
+		* @see _.find
+		**/
+		detect<T>(interator?: string): T;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.filter
+		**/
+		filter(iterator: _.ListIterator<T, boolean>, context?: any): T[];
+
+		/**
+		* @see _.filter
+		**/
+		select(iterator: _.ListIterator<T, boolean>, context?: any): T[];
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.where
+		**/
+		where<U extends {}>(properties: U): T[];
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.findWhere
+		**/
+		findWhere<U extends {}>(properties: U): T;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.reject
+		**/
+		reject(iterator: _.ListIterator<T, boolean>, context?: any): T[];
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.all
+		**/
+		all(iterator?: _.ListIterator<T, boolean>, context?: any): boolean;
+
+		/**
+		* @see _.all
+		**/
+		every(iterator?: _.ListIterator<T, boolean>, context?: any): boolean;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.any
+		**/
+		any(iterator?: _.ListIterator<T, boolean>, context?: any): boolean;
+
+		/**
+		* @see _.any
+		**/
+		some(iterator?: _.ListIterator<T, boolean>, context?: any): boolean;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.contains
+		**/
+		contains(value: T): boolean;
+
+		/**
+		* Alias for 'contains'.
+		* @see contains
+		**/
+		include(value: T): boolean;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.invoke
+		**/
+		invoke(methodName: string, ...args: any[]): any;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.pluck
+		**/
+		pluck(propertyName: string): any[];
+
+		/**
+		* Wrapped type `number[]`.
+		* @see _.max
+		**/
+		max(): number;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.max
+		**/
+		max(iterator: _.ListIterator<T, number>, context?: any): T;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.max
+		**/
+		max(iterator?: _.ListIterator<T, any>, context?: any): T;
+
+		/**
+		* Wrapped type `number[]`.
+		* @see _.min
+		**/
+		min(): number;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.min
+		**/
+		min(iterator: _.ListIterator<T, number>, context?: any): T;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.min
+		**/
+		min(iterator?: _.ListIterator<T, any>, context?: any): T;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.sortBy
+		**/
+		sortBy(iterator?: _.ListIterator<T, any>, context?: any): T[];
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.sortBy
+		**/
+		sortBy(iterator: string, context?: any): T[];
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.groupBy
+		**/
+		groupBy(iterator?: _.ListIterator<T, any>, context?: any): _.Dictionary<_.List<T>>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.groupBy
+		**/
+		groupBy(iterator: string, context?: any): _.Dictionary<T[]>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.indexBy
+		**/
+		indexBy(iterator: _.ListIterator<T, any>, context?: any): _.Dictionary<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.indexBy
+		**/
+		indexBy(iterator: string, context?: any): _.Dictionary<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.countBy
+		**/
+		countBy(iterator?: _.ListIterator<T, any>, context?: any): _.Dictionary<number>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.countBy
+		**/
+		countBy(iterator: string, context?: any): _.Dictionary<number>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.shuffle
+		**/
+		shuffle(): T[];
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.sample
+		**/
+		sample<T>(n: number): T[];
+
+		/**
+		* @see _.sample
+		**/
+		sample<T>(): T;
+
+		/**
+		* Wrapped type `any`.
+		* @see _.toArray
+		**/
+		toArray(): T[];
+
+		/**
+		* Wrapped type `any`.
+		* @see _.size
+		**/
+		size(): number;
+
+		/*********
+		* Arrays *
+		**********/
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.first
+		**/
+		first(): T;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.first
+		**/
+		first(n: number): T[];
+
+		/**
+		* @see _.first
+		**/
+		head(): T;
+
+		/**
+		* @see _.first
+		**/
+		head(n: number): T[];
+
+		/**
+		* @see _.first
+		**/
+		take(): T;
+
+		/**
+		* @see _.first
+		**/
+		take(n: number): T[];
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.initial
+		**/
+		initial(n?: number): T[];
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.last
+		**/
+		last(): T;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.last
+		**/
+		last(n: number): T[];
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.rest
+		**/
+		rest(n?: number): T[];
+
+		/**
+		* @see _.rest
+		**/
+		tail(n?: number): T[];
+
+		/**
+		* @see _.rest
+		**/
+		drop(n?: number): T[];
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.compact
+		**/
+		compact(): T[];
+
+		/**
+		* Wrapped type `any`.
+		* @see _.flatten
+		**/
+		flatten(shallow?: boolean): any[];
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.without
+		**/
+		without(...values: T[]): T[];
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.partition
+		**/
+		partition(iterator: _.ListIterator<T, boolean>, context?: any): T[][];
+
+		/**
+		* Wrapped type `any[][]`.
+		* @see _.union
+		**/
+		union(...arrays: _.List<T>[]): T[];
+
+		/**
+		* Wrapped type `any[][]`.
+		* @see _.intersection
+		**/
+		intersection(...arrays: _.List<T>[]): T[];
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.difference
+		**/
+		difference(...others: _.List<T>[]): T[];
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.uniq
+		**/
+		uniq(isSorted?: boolean, iterator?: _.ListIterator<T, any>): T[];
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.uniq
+		**/
+		uniq<TSort>(iterator?: _.ListIterator<T, TSort>, context?: any): T[];
+
+		/**
+		* @see _.uniq
+		**/
+		unique<TSort>(isSorted?: boolean, iterator?: _.ListIterator<T, TSort>): T[];
+
+		/**
+		* @see _.uniq
+		**/
+		unique<TSort>(iterator?: _.ListIterator<T, TSort>, context?: any): T[];
+
+		/**
+		* Wrapped type `any[][]`.
+		* @see _.zip
+		**/
+		zip(...arrays: any[][]): any[][];
+
+		/**
+		* Wrapped type `any[][]`.
+		* @see _.unzip
+		**/
+		unzip(...arrays: any[][]): any[][];
+
+		/**
+		* Wrapped type `any[][]`.
+		* @see _.object
+		**/
+		object(...keyValuePairs: any[][]): any;
+
+		/**
+		* @see _.object
+		**/
+		object(values?: any): any;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.indexOf
+		**/
+		indexOf(value: T, isSorted?: boolean): number;
+
+		/**
+		* @see _.indexOf
+		**/
+		indexOf(value: T, startFrom: number): number;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.lastIndexOf
+		**/
+		lastIndexOf(value: T, from?: number): number;
+
+		/**
+		* @see _.findIndex
+		**/
+		findIndex<T>(array: _.List<T>, predicate: _.ListIterator<T, boolean>, context?: any): number;
+
+		/**
+		* @see _.findLastIndex
+		**/
+		findLastIndex<T>(array: _.List<T>, predicate: _.ListIterator<T, boolean>, context?: any): number;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.sortedIndex
+		**/
+		sortedIndex(value: T, iterator?: (x: T) => any, context?: any): number;
+
+		/**
+		* Wrapped type `number`.
+		* @see _.range
+		**/
+		range(stop: number, step?: number): number[];
+
+		/**
+		* Wrapped type `number`.
+		* @see _.range
+		**/
+		range(): number[];
+
+		/* ***********
+		 * Functions *
+		************ */
+
+		/**
+		* Wrapped type `Function`.
+		* @see _.bind
+		**/
+		bind(object: any, ...args: any[]): Function;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.bindAll
+		**/
+		bindAll(...methodNames: string[]): any;
+
+		/**
+		* Wrapped type `Function`.
+		* @see _.partial
+		**/
+		partial(...args: any[]): Function;
+
+		/**
+		* Wrapped type `Function`.
+		* @see _.memoize
+		**/
+		memoize(hashFn?: (n: any) => string): Function;
+
+		/**
+		* Wrapped type `Function`.
+		* @see _.defer
+		**/
+		defer(...args: any[]): void;
+
+		/**
+		* Wrapped type `Function`.
+		* @see _.delay
+		**/
+		delay(wait: number, ...args: any[]): any;
+
+		/**
+		* @see _.delay
+		**/
+		delay(...args: any[]): any;
+
+		/**
+		* Wrapped type `Function`.
+		* @see _.throttle
+		**/
+		throttle(wait: number, options?: _.ThrottleSettings): Function;
+
+		/**
+		* Wrapped type `Function`.
+		* @see _.debounce
+		**/
+		debounce(wait: number, immediate?: boolean): Function;
+
+		/**
+		* Wrapped type `Function`.
+		* @see _.once
+		**/
+		once(): Function;
+
+		/**
+		* Wrapped type `number`.
+		* @see _.after
+		**/
+		after(fn: Function): Function;
+
+		/**
+		* Wrapped type `number`.
+		* @see _.before
+		**/
+		before(fn: Function): Function;
+
+		/**
+		* Wrapped type `Function`.
+		* @see _.wrap
+		**/
+		wrap(wrapper: Function): () => Function;
+
+		/**
+		* Wrapped type `Function`.
+		* @see _.negate
+		**/
+		negate(): boolean;
+
+		/**
+		* Wrapped type `Function[]`.
+		* @see _.compose
+		**/
+		compose(...functions: Function[]): Function;
+
+		/********* *
+		 * Objects *
+		********** */
+
+		/**
+		* Wrapped type `object`.
+		* @see _.keys
+		**/
+		keys(): string[];
+
+		/**
+		* Wrapped type `object`.
+		* @see _.allKeys
+		**/
+		allKeys(): string[];
+
+		/**
+		* Wrapped type `object`.
+		* @see _.values
+		**/
+		values(): T[];
+
+		/**
+		* Wrapped type `object`.
+		* @see _.pairs
+		**/
+		pairs(): any[][];
+
+		/**
+		* Wrapped type `object`.
+		* @see _.invert
+		**/
+		invert(): any;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.functions
+		**/
+		functions(): string[];
+
+		/**
+		* @see _.functions
+		**/
+		methods(): string[];
+
+		/**
+		* Wrapped type `object`.
+		* @see _.extend
+		**/
+		extend(...sources: any[]): any;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.pick
+		**/
+		pick(...keys: any[]): any;
+		pick(keys: any[]): any;
+		pick(fn: (value: any, key: any, object: any) => any): any;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.omit
+		**/
+		omit(...keys: string[]): any;
+		omit(keys: string[]): any;
+		omit(fn: Function): any;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.defaults
+		**/
+		defaults(...defaults: any[]): any;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.clone
+		**/
+		clone(): T;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.tap
+		**/
+		tap(interceptor: (...as: any[]) => any): any;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.has
+		**/
+		has(key: string): boolean;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.matches
+		**/
+		matches<TResult>(): _.ListIterator<T, TResult>;
+
+		/**
+		* Wrapped type `string`.
+		* @see _.property
+		**/
+		property(): (object: Object) => any;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.propertyOf
+		**/
+		propertyOf(): (key: string) => any;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isEqual
+		**/
+		isEqual(other: any): boolean;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isEmpty
+		**/
+		isEmpty(): boolean;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isMatch
+		**/
+		isMatch(): boolean;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isElement
+		**/
+		isElement(): boolean;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isArray
+		**/
+		isArray(): boolean;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isObject
+		**/
+		isObject(): boolean;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isArguments
+		**/
+		isArguments(): boolean;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isFunction
+		**/
+		isFunction(): boolean;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isError
+		**/
+		isError(): boolean;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isString
+		**/
+		isString(): boolean;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isNumber
+		**/
+		isNumber(): boolean;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isFinite
+		**/
+		isFinite(): boolean;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isBoolean
+		**/
+		isBoolean(): boolean;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isDate
+		**/
+		isDate(): boolean;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isRegExp
+		**/
+		isRegExp(): boolean;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isNaN
+		**/
+		isNaN(): boolean;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isNull
+		**/
+		isNull(): boolean;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isUndefined
+		**/
+		isUndefined(): boolean;
+
+		/********* *
+		 * Utility *
+		********** */
+
+		/**
+		* Wrapped type `any`.
+		* @see _.identity
+		**/
+		identity(): any;
+
+		/**
+		* Wrapped type `any`.
+		* @see _.constant
+		**/
+		constant(): () => T;
+
+		/**
+		* Wrapped type `any`.
+		* @see _.noop
+		**/
+		noop(): void;
+
+		/**
+		* Wrapped type `number`.
+		* @see _.times
+		**/
+		times<TResult>(iterator: (n: number) => TResult, context?: any): TResult[];
+
+		/**
+		* Wrapped type `number`.
+		* @see _.random
+		**/
+		random(): number;
+		/**
+		* Wrapped type `number`.
+		* @see _.random
+		**/
+		random(max: number): number;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.mixin
+		**/
+		mixin(): void;
+
+		/**
+		* Wrapped type `string|Function|Object`.
+		* @see _.iteratee
+		**/
+		iteratee(context?: any, argCount?: number): Function;
+
+		/**
+		* Wrapped type `string`.
+		* @see _.uniqueId
+		**/
+		uniqueId(): string;
+
+		/**
+		* Wrapped type `string`.
+		* @see _.escape
+		**/
+		escape(): string;
+
+		/**
+		* Wrapped type `string`.
+		* @see _.unescape
+		**/
+		unescape(): string;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.result
+		**/
+		result(property: string, defaultValue?: any): any;
+
+		/**
+		* Wrapped type `string`.
+		* @see _.template
+		**/
+		template(settings?: _.TemplateSettings): (...data: any[]) => string;
+
+		/********** *
+		 * Chaining *
+		*********** */
+
+		/**
+		* Wrapped type `any`.
+		* @see _.chain
+		**/
+		chain(): _Chain<T>;
+
+		/**
+		* Wrapped type `any`.
+		* Extracts the value of a wrapped object.
+		* @return Value of the wrapped object.
+		**/
+		value<TResult>(): TResult;
+	}
+
+	interface _Chain<T> {
+
+		/* *************
+		 * Collections *
+		 ************* */
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.each
+		**/
+		each(iterator: _.ListIterator<T, void>, context?: any): _Chain<T>;
+
+		/**
+		* @see _.each
+		**/
+		each(iterator: _.ObjectIterator<T, void>, context?: any): _Chain<T>;
+
+		/**
+		* @see _.each
+		**/
+		forEach(iterator: _.ListIterator<T, void>, context?: any): _Chain<T>;
+
+		/**
+		* @see _.each
+		**/
+		forEach(iterator: _.ObjectIterator<T, void>, context?: any): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.map
+		**/
+		map<TArray>(iterator: _.ListIterator<T, TArray[]>, context?: any): _ChainOfArrays<TArray>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.map
+		**/
+		map<TResult>(iterator: _.ListIterator<T, TResult>, context?: any): _Chain<TResult>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.map
+		**/
+		map<TArray>(iterator: _.ObjectIterator<T, TArray[]>, context?: any): _ChainOfArrays<TArray>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.map
+		**/
+		map<TResult>(iterator: _.ObjectIterator<T, TResult>, context?: any): _Chain<TResult>;
+
+		/**
+		* @see _.map
+		**/
+		collect<TResult>(iterator: _.ListIterator<T, TResult>, context?: any): _Chain<TResult>;
+
+		/**
+		* @see _.map
+		**/
+		collect<TResult>(iterator: _.ObjectIterator<T, TResult>, context?: any): _Chain<TResult>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.reduce
+		**/
+		reduce<TResult>(iterator: _.MemoIterator<T, TResult>, memo?: TResult, context?: any): _ChainSingle<TResult>;
+
+		/**
+		* @see _.reduce
+		**/
+		inject<TResult>(iterator: _.MemoIterator<T, TResult>, memo?: TResult, context?: any): _ChainSingle<TResult>;
+
+		/**
+		* @see _.reduce
+		**/
+		foldl<TResult>(iterator: _.MemoIterator<T, TResult>, memo?: TResult, context?: any): _ChainSingle<TResult>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.reduceRight
+		**/
+		reduceRight<TResult>(iterator: _.MemoIterator<T, TResult>, memo?: TResult, context?: any): _ChainSingle<TResult>;
+
+		/**
+		* @see _.reduceRight
+		**/
+		foldr<TResult>(iterator: _.MemoIterator<T, TResult>, memo?: TResult, context?: any): _ChainSingle<TResult>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.find
+		**/
+		find<T>(iterator: _.ListIterator<T, boolean> | _.ObjectIterator<T, boolean>, context?: any): _ChainSingle<T>;
+
+		/**
+		* @see _.find
+		**/
+		find<T, U extends {}>(interator: U): _ChainSingle<T>;
+
+		/**
+		* @see _.find
+		**/
+		find<T>(interator: string): _ChainSingle<T>;
+
+		/**
+		* @see _.find
+		**/
+		detect<T>(iterator: _.ListIterator<T, boolean> | _.ObjectIterator<T, boolean>, context?: any): _ChainSingle<T>;
+
+		/**
+		* @see _.find
+		**/
+		detect<T, U extends {}>(interator: U): _ChainSingle<T>;
+
+		/**
+		* @see _.find
+		**/
+		detect<T>(interator: string): _ChainSingle<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.filter
+		**/
+		filter(iterator: _.ListIterator<T, boolean>, context?: any): _Chain<T>;
+
+		/**
+		* @see _.filter
+		**/
+		select(iterator: _.ListIterator<T, boolean>, context?: any): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.where
+		**/
+		where<U extends {}>(properties: U): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.findWhere
+		**/
+		findWhere<U extends {}>(properties: U): _ChainSingle<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.reject
+		**/
+		reject(iterator: _.ListIterator<T, boolean>, context?: any): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.all
+		**/
+		all(iterator?: _.ListIterator<T, boolean>, context?: any): _Chain<T>;
+
+		/**
+		* @see _.all
+		**/
+		every(iterator?: _.ListIterator<T, boolean>, context?: any): _ChainSingle<boolean>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.any
+		**/
+		any(iterator?: _.ListIterator<T, boolean>, context?: any): _ChainSingle<boolean>;
+
+		/**
+		* @see _.any
+		**/
+		some(iterator?: _.ListIterator<T, boolean>, context?: any): _ChainSingle<boolean>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.contains
+		**/
+		contains(value: T): _ChainSingle<boolean>;
+
+		/**
+		* Alias for 'contains'.
+		* @see contains
+		**/
+		include(value: T): _ChainSingle<boolean>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.invoke
+		**/
+		invoke(methodName: string, ...args: any[]): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.pluck
+		**/
+		pluck(propertyName: string): _Chain<any>;
+
+		/**
+		* Wrapped type `number[]`.
+		* @see _.max
+		**/
+		max(): _ChainSingle<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.max
+		**/
+		max(iterator: _.ListIterator<T, number>, context?: any): _ChainSingle<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.max
+		**/
+		max(iterator?: _.ListIterator<T, any>, context?: any): _ChainSingle<T>;
+
+		/**
+		* Wrapped type `number[]`.
+		* @see _.min
+		**/
+		min(): _ChainSingle<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.min
+		**/
+		min(iterator: _.ListIterator<T, number>, context?: any): _ChainSingle<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.min
+		**/
+		min(iterator?: _.ListIterator<T, any>, context?: any): _ChainSingle<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.sortBy
+		**/
+		sortBy(iterator?: _.ListIterator<T, any>, context?: any): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.sortBy
+		**/
+		sortBy(iterator: string, context?: any): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.groupBy
+		**/
+		groupBy(iterator?: _.ListIterator<T, any>, context?: any): _ChainOfArrays<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.groupBy
+		**/
+		groupBy(iterator: string, context?: any): _ChainOfArrays<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.indexBy
+		**/
+		indexBy(iterator: _.ListIterator<T, any>, context?: any): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.indexBy
+		**/
+		indexBy(iterator: string, context?: any): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.countBy
+		**/
+		countBy(iterator?: _.ListIterator<T, any>, context?: any): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.countBy
+		**/
+		countBy(iterator: string, context?: any): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.shuffle
+		**/
+		shuffle(): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.sample
+		**/
+		sample<T>(n: number): _Chain<T>;
+
+		/**
+		* @see _.sample
+		**/
+		sample<T>(): _Chain<T>;
+
+		/**
+		* Wrapped type `any`.
+		* @see _.toArray
+		**/
+		toArray(): _Chain<T>;
+
+		/**
+		* Wrapped type `any`.
+		* @see _.size
+		**/
+		size(): _ChainSingle<number>;
+
+		/*********
+		* Arrays *
+		**********/
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.first
+		**/
+		first(): _ChainSingle<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.first
+		**/
+		first(n: number): _Chain<T>;
+
+		/**
+		* @see _.first
+		**/
+		head(): _Chain<T>;
+
+		/**
+		* @see _.first
+		**/
+		head(n: number): _Chain<T>;
+
+		/**
+		* @see _.first
+		**/
+		take(): _Chain<T>;
+
+		/**
+		* @see _.first
+		**/
+		take(n: number): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.initial
+		**/
+		initial(n?: number): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.last
+		**/
+		last(): _ChainSingle<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.last
+		**/
+		last(n: number): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.rest
+		**/
+		rest(n?: number): _Chain<T>;
+
+		/**
+		* @see _.rest
+		**/
+		tail(n?: number): _Chain<T>;
+
+		/**
+		* @see _.rest
+		**/
+		drop(n?: number): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.compact
+		**/
+		compact(): _Chain<T>;
+
+		/**
+		* Wrapped type `any`.
+		* @see _.flatten
+		**/
+		flatten(shallow?: boolean): _Chain<any>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.without
+		**/
+		without(...values: T[]): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.partition
+		**/
+		partition(iterator: _.ListIterator<T, boolean>, context?: any): _Chain<T[]>;
+
+		/**
+		* Wrapped type `any[][]`.
+		* @see _.union
+		**/
+		union(...arrays: _.List<T>[]): _Chain<T>;
+
+		/**
+		* Wrapped type `any[][]`.
+		* @see _.intersection
+		**/
+		intersection(...arrays: _.List<T>[]): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.difference
+		**/
+		difference(...others: _.List<T>[]): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.uniq
+		**/
+		uniq(isSorted?: boolean, iterator?: _.ListIterator<T, any>): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.uniq
+		**/
+		uniq<TSort>(iterator?: _.ListIterator<T, TSort>, context?: any): _Chain<T>;
+
+		/**
+		* @see _.uniq
+		**/
+		unique<TSort>(isSorted?: boolean, iterator?: _.ListIterator<T, TSort>): _Chain<T>;
+
+		/**
+		* @see _.uniq
+		**/
+		unique<TSort>(iterator?: _.ListIterator<T, TSort>, context?: any): _Chain<T>;
+
+		/**
+		* Wrapped type `any[][]`.
+		* @see _.zip
+		**/
+		zip(...arrays: any[][]): _Chain<T>;
+
+		/**
+		* Wrapped type `any[][]`.
+		* @see _.unzip
+		**/
+		unzip(...arrays: any[][]): _Chain<T>;
+
+		/**
+		* Wrapped type `any[][]`.
+		* @see _.object
+		**/
+		object(...keyValuePairs: any[][]): _Chain<T>;
+
+		/**
+		* @see _.object
+		**/
+		object(values?: any): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.indexOf
+		**/
+		indexOf(value: T, isSorted?: boolean): _ChainSingle<T>;
+
+		/**
+		* @see _.indexOf
+		**/
+		indexOf(value: T, startFrom: number): _ChainSingle<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.lastIndexOf
+		**/
+		lastIndexOf(value: T, from?: number): _ChainSingle<T>;
+
+		/**
+		* @see _.findIndex
+		**/
+		findIndex<T>(predicate: _.ListIterator<T, boolean>, context?: any): _Chain<T>;
+
+		/**
+		* @see _.findLastIndex
+		**/
+		findLastIndex<T>(predicate: _.ListIterator<T, boolean>, context?: any): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.sortedIndex
+		**/
+		sortedIndex(value: T, iterator?: (x: T) => any, context?: any): _Chain<T>;
+
+		/**
+		* Wrapped type `number`.
+		* @see _.range
+		**/
+		range(stop: number, step?: number): _Chain<T>;
+
+		/**
+		* Wrapped type `number`.
+		* @see _.range
+		**/
+		range(): _Chain<T>;
+
+		/* ***********
+		 * Functions *
+		************ */
+
+		/**
+		* Wrapped type `Function`.
+		* @see _.bind
+		**/
+		bind(object: any, ...args: any[]): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.bindAll
+		**/
+		bindAll(...methodNames: string[]): _Chain<T>;
+
+		/**
+		* Wrapped type `Function`.
+		* @see _.partial
+		**/
+		partial(...args: any[]): _Chain<T>;
+
+		/**
+		* Wrapped type `Function`.
+		* @see _.memoize
+		**/
+		memoize(hashFn?: (n: any) => string): _Chain<T>;
+
+		/**
+		* Wrapped type `Function`.
+		* @see _.defer
+		**/
+		defer(...args: any[]): _Chain<T>;
+
+		/**
+		* Wrapped type `Function`.
+		* @see _.delay
+		**/
+		delay(wait: number, ...args: any[]): _Chain<T>;
+
+		/**
+		* @see _.delay
+		**/
+		delay(...args: any[]): _Chain<T>;
+
+		/**
+		* Wrapped type `Function`.
+		* @see _.throttle
+		**/
+		throttle(wait: number, options?: _.ThrottleSettings): _Chain<T>;
+
+		/**
+		* Wrapped type `Function`.
+		* @see _.debounce
+		**/
+		debounce(wait: number, immediate?: boolean): _Chain<T>;
+
+		/**
+		* Wrapped type `Function`.
+		* @see _.once
+		**/
+		once(): _Chain<T>;
+
+		/**
+		* Wrapped type `number`.
+		* @see _.after
+		**/
+		after(func: Function): _Chain<T>;
+
+		/**
+		* Wrapped type `number`.
+		* @see _.before
+		**/
+		before(fn: Function): _Chain<T>;
+
+		/**
+		* Wrapped type `Function`.
+		* @see _.wrap
+		**/
+		wrap(wrapper: Function): () => _Chain<T>;
+
+		/**
+		* Wrapped type `Function`.
+		* @see _.negate
+		**/
+		negate(): _Chain<T>;
+
+		/**
+		* Wrapped type `Function[]`.
+		* @see _.compose
+		**/
+		compose(...functions: Function[]): _Chain<T>;
+
+		/********* *
+		 * Objects *
+		********** */
+
+		/**
+		* Wrapped type `object`.
+		* @see _.keys
+		**/
+		keys(): _Chain<string>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.allKeys
+		**/
+		allKeys(): _Chain<string>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.values
+		**/
+		values(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.pairs
+		**/
+		pairs(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.invert
+		**/
+		invert(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.functions
+		**/
+		functions(): _Chain<T>;
+
+		/**
+		* @see _.functions
+		**/
+		methods(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.extend
+		**/
+		extend(...sources: any[]): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.pick
+		**/
+		pick(...keys: any[]): _Chain<T>;
+		pick(keys: any[]): _Chain<T>;
+		pick(fn: (value: any, key: any, object: any) => any): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.omit
+		**/
+		omit(...keys: string[]): _Chain<T>;
+		omit(keys: string[]): _Chain<T>;
+		omit(iteratee: Function): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.defaults
+		**/
+		defaults(...defaults: any[]): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.clone
+		**/
+		clone(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.tap
+		**/
+		tap(interceptor: (...as: any[]) => any): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.has
+		**/
+		has(key: string): _Chain<T>;
+
+		/**
+		* Wrapped type `any[]`.
+		* @see _.matches
+		**/
+		matches<TResult>(): _Chain<T>;
+
+		/**
+		* Wrapped type `string`.
+		* @see _.property
+		**/
+		property(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.propertyOf
+		**/
+		propertyOf(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isEqual
+		**/
+		isEqual(other: any): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isEmpty
+		**/
+		isEmpty(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isMatch
+		**/
+		isMatch(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isElement
+		**/
+		isElement(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isArray
+		**/
+		isArray(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isObject
+		**/
+		isObject(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isArguments
+		**/
+		isArguments(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isFunction
+		**/
+		isFunction(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isError
+		**/
+		isError(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isString
+		**/
+		isString(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isNumber
+		**/
+		isNumber(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isFinite
+		**/
+		isFinite(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isBoolean
+		**/
+		isBoolean(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isDate
+		**/
+		isDate(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isRegExp
+		**/
+		isRegExp(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isNaN
+		**/
+		isNaN(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isNull
+		**/
+		isNull(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.isUndefined
+		**/
+		isUndefined(): _Chain<T>;
+
+		/********* *
+		 * Utility *
+		********** */
+
+		/**
+		* Wrapped type `any`.
+		* @see _.identity
+		**/
+		identity(): _Chain<T>;
+
+		/**
+		* Wrapped type `any`.
+		* @see _.constant
+		**/
+		constant(): _Chain<T>;
+
+		/**
+		* Wrapped type `any`.
+		* @see _.noop
+		**/
+		noop(): _Chain<T>;
+
+		/**
+		* Wrapped type `number`.
+		* @see _.times
+		**/
+		times<TResult>(iterator: (n: number) => TResult, context?: any): _Chain<T>;
+
+		/**
+		* Wrapped type `number`.
+		* @see _.random
+		**/
+		random(): _Chain<T>;
+		/**
+		* Wrapped type `number`.
+		* @see _.random
+		**/
+		random(max: number): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.mixin
+		**/
+		mixin(): _Chain<T>;
+
+		/**
+		* Wrapped type `string|Function|Object`.
+		* @see _.iteratee
+		**/
+		iteratee(context?: any, argCount?: number): _Chain<T>;
+
+		/**
+		* Wrapped type `string`.
+		* @see _.uniqueId
+		**/
+		uniqueId(): _Chain<T>;
+
+		/**
+		* Wrapped type `string`.
+		* @see _.escape
+		**/
+		escape(): _Chain<T>;
+
+		/**
+		* Wrapped type `string`.
+		* @see _.unescape
+		**/
+		unescape(): _Chain<T>;
+
+		/**
+		* Wrapped type `object`.
+		* @see _.result
+		**/
+		result(property: string, defaultValue?: any): _Chain<T>;
+
+		/**
+		* Wrapped type `string`.
+		* @see _.template
+		**/
+		template(settings?: _.TemplateSettings): (...data: any[]) => _Chain<T>;
+
+		/************* *
+		* Array proxy *
+		************** */
+
+		/**
+		* Returns a new array comprised of the array on which it is called
+		* joined with the array(s) and/or value(s) provided as arguments.
+		* @param arr Arrays and/or values to concatenate into a new array. See the discussion below for details.
+		* @return A new array comprised of the array on which it is called
+		**/
+		concat(...arr: Array<T[]>): _Chain<T>;
+
+		/**
+		* Join all elements of an array into a string.
+		* @param separator Optional. Specifies a string to separate each element of the array. The separator is converted to a string if necessary. If omitted, the array elements are separated with a comma.
+		* @return The string conversions of all array elements joined into one string.
+		**/
+		join(separator?: any): _ChainSingle<T>;
+
+		/**
+		* Removes the last element from an array and returns that element.
+		* @return Returns the popped element.
+		**/
+		pop(): _ChainSingle<T>;
+
+		/**
+		* Adds one or more elements to the end of an array and returns the new length of the array.
+		* @param item The elements to add to the end of the array.
+		* @return The array with the element added to the end.
+		**/
+		push(...item: Array<T>): _Chain<T>;
+
+		/**
+		* Reverses an array in place. The first array element becomes the last and the last becomes the first.
+		* @return The reversed array.
+		**/
+		reverse(): _Chain<T>;
+
+		/**
+		* Removes the first element from an array and returns that element. This method changes the length of the array.
+		* @return The shifted element.
+		**/
+		shift(): _ChainSingle<T>;
+
+		/**
+		* Returns a shallow copy of a portion of an array into a new array object.
+		* @param start Zero-based index at which to begin extraction.
+		* @param end Optional. Zero-based index at which to end extraction. slice extracts up to but not including end.
+		* @return A shallow copy of a portion of an array into a new array object.
+		**/
+		slice(start: number, end?: number): _Chain<T>;
+
+		/**
+		* Sorts the elements of an array in place and returns the array. The sort is not necessarily stable. The default sort order is according to string Unicode code points.
+		* @param compareFn Optional. Specifies a function that defines the sort order. If omitted, the array is sorted according to each character's Unicode code point value, according to the string conversion of each element.
+		* @return The sorted array.
+		**/
+		sort(compareFn: (a: T, b: T) => boolean): _Chain<T>;
+
+		/**
+		* Changes the content of an array by removing existing elements and/or adding new elements.
+		* @param index Index at which to start changing the array. If greater than the length of the array, actual starting index will be set to the length of the array. If negative, will begin that many elements from the end.
+		* @param quantity An integer indicating the number of old array elements to remove. If deleteCount is 0, no elements are removed. In this case, you should specify at least one new element. If deleteCount is greater than the number of elements left in the array starting at index, then all of the elements through the end of the array will be deleted.
+		* @param items The element to add to the array. If you don't specify any elements, splice will only remove elements from the array.
+		* @return An array containing the deleted elements. If only one element is removed, an array of one element is returned. If no elements are removed, an empty array is returned.
+		**/
+		splice(index: number, quantity: number, ...items: Array<T>): _Chain<T>;
+
+		/**
+		* A string representing the specified array and its elements.
+		* @return A string representing the specified array and its elements.
+		**/
+		toString(): _ChainSingle<T>;
+
+		/**
+		* Adds one or more elements to the beginning of an array and returns the new length of the array.
+		* @param items The elements to add to the front of the array.
+		* @return The array with the element added to the beginning.
+		**/
+		unshift(...items: Array<T>): _Chain<T>;
+
+		/********** *
+		 * Chaining *
+		*********** */
+
+		/**
+		* Wrapped type `any`.
+		* @see _.chain
+		**/
+		chain(): _Chain<T>;
+
+		/**
+		* Wrapped type `any`.
+		* @see _.value
+		**/
+		value<TResult>(): T[];
+	}
+	interface _ChainSingle<T> {
+		value(): T;
+	}
+	interface _ChainOfArrays<T> extends _Chain<T[]> {
+		flatten(shallow?: boolean): _Chain<T>;
+	}
+}
diff --git a/underscore/tsconfig.json b/underscore/tsconfig.json
new file mode 100644
index 0000000000..dca5a6a197
--- /dev/null
+++ b/underscore/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "underscore-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/underscore/underscore-tests.ts b/underscore/underscore-tests.ts
index ae0850df00..8f5ac4389b 100644
--- a/underscore/underscore-tests.ts
+++ b/underscore/underscore-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="underscore.d.ts" />
+
 
 declare var $: any;
 
diff --git a/underscore/underscore-tests.ts.tscparams b/underscore/underscore-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/underscore/underscore-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/underscore/underscore.d.ts b/underscore/underscore.d.ts
deleted file mode 100644
index 7c88662149..0000000000
--- a/underscore/underscore.d.ts
+++ /dev/null
@@ -1,5918 +0,0 @@
-// Type definitions for Underscore 1.7.0
-// Project: http://underscorejs.org/
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Josh Baldwin <https://github.com/jbaldwin/>, Christopher Currens <https://github.com/ccurrens/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module _ {
-	/**
-	* underscore.js _.throttle options.
-	**/
-	interface ThrottleSettings {
-
-		/**
-		* If you'd like to disable the leading-edge call, pass this as false.
-		**/
-		leading?: boolean;
-
-		/**
-		* If you'd like to disable the execution on the trailing-edge, pass false.
-		**/
-		trailing?: boolean;
-	}
-
-	/**
-	* underscore.js template settings, set templateSettings or pass as an argument
-	* to 'template()' to override defaults.
-	**/
-	interface TemplateSettings {
-		/**
-		* Default value is '/<%([\s\S]+?)%>/g'.
-		**/
-		evaluate?: RegExp;
-
-		/**
-		* Default value is '/<%=([\s\S]+?)%>/g'.
-		**/
-		interpolate?: RegExp;
-
-		/**
-		* Default value is '/<%-([\s\S]+?)%>/g'.
-		**/
-		escape?: RegExp;
-		
-		/**
-		* By default, 'template()' places the values from your data in the local scope via the 'with' statement.
-		* However, you can specify a single variable name with this setting.
-		**/
-		variable?: string;
-	}
-
-	interface Collection<T> { }
-
-	// Common interface between Arrays and jQuery objects
-	interface List<T> extends Collection<T> {
-		[index: number]: T;
-		length: number;
-	}
-
-	interface Dictionary<T> extends Collection<T> {
-		[index: string]: T;
-	}
-
-	interface ListIterator<T, TResult> {
-		(value: T, index: number, list: List<T>): TResult;
-	}
-
-	interface ObjectIterator<T, TResult> {
-		(element: T, key: string, list: Dictionary<T>): TResult;
-	}
-
-	interface MemoIterator<T, TResult> {
-		(prev: TResult, curr: T, index: number, list: List<T>): TResult;
-	}
-
-	interface MemoObjectIterator<T, TResult> {
-		(prev: TResult, curr: T, key: string, list: Dictionary<T>): TResult;
-	}
-}
-
-interface UnderscoreStatic {
-	/**
-	* Underscore OOP Wrapper, all Underscore functions that take an object
-	* as the first parameter can be invoked through this function.
-	* @param key First argument to Underscore object functions.
-	**/
-	<T>(value: _.Dictionary<T>): Underscore<T>;
-	<T>(value: Array<T>): Underscore<T>;
-	<T>(value: T): Underscore<T>;
-
-	/* *************
-	 * Collections *
-	 ************* */
-
-	/**
-	* Iterates over a list of elements, yielding each in turn to an iterator function. The iterator is
-	* bound to the context object, if one is passed. Each invocation of iterator is called with three
-	* arguments: (element, index, list). If list is a JavaScript object, iterator's arguments will be
-	* (value, key, object). Delegates to the native forEach function if it exists.
-	* @param list Iterates over this list of elements.
-	* @param iterator Iterator function for each element `list`.
-	* @param context 'this' object in `iterator`, optional.
-	**/
-	each<T>(
-		list: _.List<T>,
-		iterator: _.ListIterator<T, void>,
-		context?: any): _.List<T>;
-
-	/**
-	* @see _.each
-	* @param object Iterates over properties of this object.
-	* @param iterator Iterator function for each property on `object`.
-	* @param context 'this' object in `iterator`, optional.
-	**/
-	each<T>(
-		object: _.Dictionary<T>,
-		iterator: _.ObjectIterator<T, void>,
-		context?: any): _.Dictionary<T>;
-
-	/**
-	* @see _.each
-	**/
-	forEach<T>(
-		list: _.List<T>,
-		iterator: _.ListIterator<T, void>,
-		context?: any): _.List<T>;
-
-	/**
-	* @see _.each
-	**/
-	forEach<T>(
-		object: _.Dictionary<T>,
-		iterator: _.ObjectIterator<T, void>,
-		context?: any): _.Dictionary<T>;
-
-	/**
-	* Produces a new array of values by mapping each value in list through a transformation function
-	* (iterator). If the native map method exists, it will be used instead. If list is a JavaScript
-	* object, iterator's arguments will be (value, key, object).
-	* @param list Maps the elements of this array.
-	* @param iterator Map iterator function for each element in `list`.
-	* @param context `this` object in `iterator`, optional.
-	* @return The mapped array result.
-	**/
-	map<T, TResult>(
-		list: _.List<T>,
-		iterator: _.ListIterator<T, TResult>,
-		context?: any): TResult[];
-
-	/**
-	* @see _.map
-	* @param object Maps the properties of this object.
-	* @param iterator Map iterator function for each property on `object`.
-	* @param context `this` object in `iterator`, optional.
-	* @return The mapped object result.
-	**/
-	map<T, TResult>(
-		object: _.Dictionary<T>,
-		iterator: _.ObjectIterator<T, TResult>,
-		context?: any): TResult[];
-
-	/**
-	* @see _.map
-	**/
-	collect<T, TResult>(
-		list: _.List<T>,
-		iterator: _.ListIterator<T, TResult>,
-		context?: any): TResult[];
-
-	/**
-	* @see _.map
-	**/
-	collect<T, TResult>(
-		object: _.Dictionary<T>,
-		iterator: _.ObjectIterator<T, TResult>,
-		context?: any): TResult[];
-
-	/**
-	* Also known as inject and foldl, reduce boils down a list of values into a single value.
-	* Memo is the initial state of the reduction, and each successive step of it should be
-	* returned by iterator. The iterator is passed four arguments: the memo, then the value
-	* and index (or key) of the iteration, and finally a reference to the entire list.
-	* @param list Reduces the elements of this array.
-	* @param iterator Reduce iterator function for each element in `list`.
-	* @param memo Initial reduce state.
-	* @param context `this` object in `iterator`, optional.
-	* @return Reduced object result.
-	**/
-	reduce<T, TResult>(
-		list: _.Collection<T>,
-		iterator: _.MemoIterator<T, TResult>,
-		memo?: TResult,
-		context?: any): TResult;
-
-	reduce<T, TResult>(
-		list: _.Dictionary<T>,
-		iterator: _.MemoObjectIterator<T, TResult>,
-		memo?: TResult,
-		context?: any): TResult;
-
-	/**
-	* @see _.reduce
-	**/
-	inject<T, TResult>(
-		list: _.Collection<T>,
-		iterator: _.MemoIterator<T, TResult>,
-		memo?: TResult,
-		context?: any): TResult;
-
-	/**
-	* @see _.reduce
-	**/
-	foldl<T, TResult>(
-		list: _.Collection<T>,
-		iterator: _.MemoIterator<T, TResult>,
-		memo?: TResult,
-		context?: any): TResult;
-
-	/**
-	* The right-associative version of reduce. Delegates to the JavaScript 1.8 version of
-	* reduceRight, if it exists. `foldr` is not as useful in JavaScript as it would be in a
-	* language with lazy evaluation.
-	* @param list Reduces the elements of this array.
-	* @param iterator Reduce iterator function for each element in `list`.
-	* @param memo Initial reduce state.
-	* @param context `this` object in `iterator`, optional.
-	* @return Reduced object result.
-	**/
-	reduceRight<T, TResult>(
-		list: _.Collection<T>,
-		iterator: _.MemoIterator<T, TResult>,
-		memo?: TResult,
-		context?: any): TResult;
-
-	/**
-	* @see _.reduceRight
-	**/
-	foldr<T, TResult>(
-		list: _.Collection<T>,
-		iterator: _.MemoIterator<T, TResult>,
-		memo?: TResult,
-		context?: any): TResult;
-
-	/**
-	* Looks through each value in the list, returning the first one that passes a truth
-	* test (iterator). The function returns as soon as it finds an acceptable element,
-	* and doesn't traverse the entire list.
-	* @param list Searches for a value in this list.
-	* @param iterator Search iterator function for each element in `list`.
-	* @param context `this` object in `iterator`, optional.
-	* @return The first acceptable found element in `list`, if nothing is found undefined/null is returned.
-	**/
-	find<T>(
-		list: _.List<T>,
-		iterator: _.ListIterator<T, boolean>,
-		context?: any): T;
-
-	/**
-	* @see _.find
-	**/
-	find<T>(
-		object: _.Dictionary<T>,
-		iterator: _.ObjectIterator<T, boolean>,
-		context?: any): T;
-
-	/**
-	* @see _.find
-	**/
-	find<T, U extends {}>(
-		object: _.List<T>|_.Dictionary<T>,
-		iterator: U): T;
-
-	/**
-	* @see _.find
-	**/
-	find<T>(
-		object: _.List<T>|_.Dictionary<T>,
-		iterator: string): T;
-
-	/**
-	* @see _.find
-	**/
-	detect<T>(
-		list: _.List<T>,
-		iterator: _.ListIterator<T, boolean>,
-		context?: any): T;
-
-	/**
-	* @see _.find
-	**/
-	detect<T>(
-		object: _.Dictionary<T>,
-		iterator: _.ObjectIterator<T, boolean>,
-        context?: any): T;
-
-	/**
-	* @see _.find
-	**/
-	detect<T, U extends {}>(
-		object: _.List<T>|_.Dictionary<T>,
-		iterator: U): T;
-
-	/**
-	* @see _.find
-	**/
-	detect<T>(
-		object: _.List<T>|_.Dictionary<T>,
-		iterator: string): T;
-
-    /**
-	* Looks through each value in the list, returning the index of the first one that passes a truth
-	* test (iterator). The function returns as soon as it finds an acceptable element,
-	* and doesn't traverse the entire list.
-	* @param list Searches for a value in this list.
-	* @param iterator Search iterator function for each element in `list`.
-	* @param context `this` object in `iterator`, optional.
-	* @return The index of the first acceptable found element in `list`, if nothing is found -1 is returned.
-	**/
-    findIndex<T>(
-        list: _.List<T>,
-        iterator: _.ListIterator<T, boolean>,
-        context?: any): number;
-
-
-	/**
-	* Looks through each value in the list, returning an array of all the values that pass a truth
-	* test (iterator). Delegates to the native filter method, if it exists.
-	* @param list Filter elements out of this list.
-	* @param iterator Filter iterator function for each element in `list`.
-	* @param context `this` object in `iterator`, optional.
-	* @return The filtered list of elements.
-	**/
-	filter<T>(
-		list: _.List<T>,
-		iterator: _.ListIterator<T, boolean>,
-		context?: any): T[];
-
-	/**
-	* @see _.filter
-	**/
-	filter<T>(
-		object: _.Dictionary<T>,
-		iterator: _.ObjectIterator<T, boolean>,
-		context?: any): T[];
-
-	/**
-	* @see _.filter
-	**/
-	select<T>(
-		list: _.List<T>,
-		iterator: _.ListIterator<T, boolean>,
-		context?: any): T[];
-
-	/**
-	* @see _.filter
-	**/
-	select<T>(
-		object: _.Dictionary<T>,
-		iterator: _.ObjectIterator<T, boolean>,
-		context?: any): T[];
-
-	/**
-	* Looks through each value in the list, returning an array of all the values that contain all
-	* of the key-value pairs listed in properties.
-	* @param list List to match elements again `properties`.
-	* @param properties The properties to check for on each element within `list`.
-	* @return The elements within `list` that contain the required `properties`.
-	**/
-	where<T, U extends {}>(
-		list: _.List<T>,
-		properties: U): T[];
-
-	/**
-	* Looks through the list and returns the first value that matches all of the key-value pairs listed in properties.
-	* @param list Search through this list's elements for the first object with all `properties`.
-	* @param properties Properties to look for on the elements within `list`.
-	* @return The first element in `list` that has all `properties`.
-	**/
-	findWhere<T, U extends {}>(
-		list: _.List<T>,
-		properties: U): T;
-
-	/**
-	* Returns the values in list without the elements that the truth test (iterator) passes.
-	* The opposite of filter.
-	* Return all the elements for which a truth test fails.
-	* @param list Reject elements within this list.
-	* @param iterator Reject iterator function for each element in `list`.
-	* @param context `this` object in `iterator`, optional.
-	* @return The rejected list of elements.
-	**/
-	reject<T>(
-		list: _.List<T>,
-		iterator: _.ListIterator<T, boolean>,
-		context?: any): T[];
-
-	/**
-	* @see _.reject
-	**/
-	reject<T>(
-		object: _.Dictionary<T>,
-		iterator: _.ObjectIterator<T, boolean>,
-		context?: any): T[];
-
-	/**
-	* Returns true if all of the values in the list pass the iterator truth test. Delegates to the
-	* native method every, if present.
-	* @param list Truth test against all elements within this list.
-	* @param iterator Trust test iterator function for each element in `list`.
-	* @param context `this` object in `iterator`, optional.
-	* @return True if all elements passed the truth test, otherwise false.
-	**/
-	every<T>(
-		list: _.List<T>,
-		iterator?: _.ListIterator<T, boolean>,
-		context?: any): boolean;
-
-	/**
-	* @see _.every
-	**/
-	every<T>(
-		list: _.Dictionary<T>,
-		iterator?: _.ObjectIterator<T, boolean>,
-		context?: any): boolean;
-
-	/**
-	* @see _.every
-	**/
-	all<T>(
-		list: _.List<T>,
-		iterator?: _.ListIterator<T, boolean>,
-		context?: any): boolean;
-
-	/**
-	* @see _.every
-	**/
-	all<T>(
-		list: _.Dictionary<T>,
-		iterator?: _.ObjectIterator<T, boolean>,
-		context?: any): boolean;
-
-	/**
-	* Returns true if any of the values in the list pass the iterator truth test. Short-circuits and
-	* stops traversing the list if a true element is found. Delegates to the native method some, if present.
-	* @param list Truth test against all elements within this list.
-	* @param iterator Trust test iterator function for each element in `list`.
-	* @param context `this` object in `iterator`, optional.
-	* @return True if any elements passed the truth test, otherwise false.
-	**/
-	some<T>(
-		list: _.List<T>,
-		iterator?: _.ListIterator<T, boolean>,
-		context?: any): boolean;
-
-	/**
-	* @see _.some
-	**/
-	some<T>(
-		object: _.Dictionary<T>,
-		iterator?: _.ObjectIterator<T, boolean>,
-		context?: any): boolean;
-
-	/**
-	* @see _.some
-	**/
-	any<T>(
-		list: _.List<T>,
-		iterator?: _.ListIterator<T, boolean>,
-		context?: any): boolean;
-
-	/**
-	* @see _.some
-	**/
-	any<T>(
-		object: _.Dictionary<T>,
-		iterator?: _.ObjectIterator<T, boolean>,
-		context?: any): boolean;
-
-	/**
-	* Returns true if the value is present in the list. Uses indexOf internally,
-	* if list is an Array.
-	* @param list Checks each element to see if `value` is present.
-	* @param value The value to check for within `list`.
-	* @return True if `value` is present in `list`, otherwise false.
-	**/
-	contains<T>(
-		list: _.List<T>,
-		value: T): boolean;
-
-	/**
-	* @see _.contains
-	**/
-	contains<T>(
-		object: _.Dictionary<T>,
-		value: T): boolean;
-
-	/**
-	* @see _.contains
-	**/
-	include<T>(
-		list: _.Collection<T>,
-		value: T): boolean;
-
-	/**
-	* @see _.contains
-	**/
-	include<T>(
-		object: _.Dictionary<T>,
-		value: T): boolean;
-
-	/**
-	* Calls the method named by methodName on each value in the list. Any extra arguments passed to
-	* invoke will be forwarded on to the method invocation.
-	* @param list The element's in this list will each have the method `methodName` invoked.
-	* @param methodName The method's name to call on each element within `list`.
-	* @param arguments Additional arguments to pass to the method `methodName`.
-	**/
-	invoke<T extends {}>(
-		list: _.List<T>,
-		methodName: string,
-		...arguments: any[]): any;
-
-	/**
-	* A convenient version of what is perhaps the most common use-case for map: extracting a list of
-	* property values.
-	* @param list The list to pluck elements out of that have the property `propertyName`.
-	* @param propertyName The property to look for on each element within `list`.
-	* @return The list of elements within `list` that have the property `propertyName`.
-	**/
-	pluck<T extends {}>(
-		list: _.List<T>,
-		propertyName: string): any[];
-
-	/**
-	* Returns the maximum value in list.
-	* @param list Finds the maximum value in this list.
-	* @return Maximum value in `list`.
-	**/
-	max(list: _.List<number>): number;
-
-	/**
-	* Returns the maximum value in list. If iterator is passed, it will be used on each value to generate
-	* the criterion by which the value is ranked.
-	* @param list Finds the maximum value in this list.
-	* @param iterator Compares each element in `list` to find the maximum value.
-	* @param context `this` object in `iterator`, optional.
-	* @return The maximum element within `list`.
-	**/
-	max<T>(
-		list: _.List<T>,
-		iterator?: _.ListIterator<T, any>,
-		context?: any): T;
-
-	/**
-	* Returns the minimum value in list.
-	* @param list Finds the minimum value in this list.
-	* @return Minimum value in `list`.
-	**/
-	min(list: _.List<number>): number;
-
-	/**
-	* Returns the minimum value in list. If iterator is passed, it will be used on each value to generate
-	* the criterion by which the value is ranked.
-	* @param list Finds the minimum value in this list.
-	* @param iterator Compares each element in `list` to find the minimum value.
-	* @param context `this` object in `iterator`, optional.
-	* @return The minimum element within `list`.
-	**/
-	min<T>(
-		list: _.List<T>,
-		iterator?: _.ListIterator<T, any>,
-		context?: any): T;
-
-	/**
-	* Returns a sorted copy of list, ranked in ascending order by the results of running each value
-	* through iterator. Iterator may also be the string name of the property to sort by (eg. length).
-	* @param list Sorts this list.
-	* @param iterator Sort iterator for each element within `list`.
-	* @param context `this` object in `iterator`, optional.
-	* @return A sorted copy of `list`.
-	**/
-	sortBy<T, TSort>(
-		list: _.List<T>,
-		iterator?: _.ListIterator<T, TSort>,
-		context?: any): T[];
-
-	/**
-	* @see _.sortBy
-	* @param iterator Sort iterator for each element within `list`.
-	**/
-	sortBy<T>(
-		list: _.List<T>,
-		iterator: string,
-		context?: any): T[];
-
-	/**
-	* Splits a collection into sets, grouped by the result of running each value through iterator.
-	* If iterator is a string instead of a function, groups by the property named by iterator on
-	* each of the values.
-	* @param list Groups this list.
-	* @param iterator Group iterator for each element within `list`, return the key to group the element by.
-	* @param context `this` object in `iterator`, optional.
-	* @return An object with the group names as properties where each property contains the grouped elements from `list`.
-	**/
-	groupBy<T>(
-		list: _.List<T>,
-		iterator?: _.ListIterator<T, any>,
-		context?: any): _.Dictionary<T[]>;
-
-	/**
-	* @see _.groupBy
-	* @param iterator Property on each object to group them by.
-	**/
-	groupBy<T>(
-		list: _.List<T>,
-		iterator: string,
-		context?: any): _.Dictionary<T[]>;
-
-	/**
-	* Given a `list`, and an `iterator` function that returns a key for each element in the list (or a property name),
-	* returns an object with an index of each item.  Just like _.groupBy, but for when you know your keys are unique.
-	**/
-	indexBy<T>(
-		list: _.List<T>,
-		iterator: _.ListIterator<T, any>,
-		context?: any): _.Dictionary<T>;
-
-	/**
-	* @see _.indexBy
-	* @param iterator Property on each object to index them by.
-	**/
-	indexBy<T>(
-		list: _.List<T>,
-		iterator: string,
-		context?: any): _.Dictionary<T>;
-
-	/**
-	* Sorts a list into groups and returns a count for the number of objects in each group. Similar
-	* to groupBy, but instead of returning a list of values, returns a count for the number of values
-	* in that group.
-	* @param list Group elements in this list and then count the number of elements in each group.
-	* @param iterator Group iterator for each element within `list`, return the key to group the element by.
-	* @param context `this` object in `iterator`, optional.
-	* @return An object with the group names as properties where each property contains the number of elements in that group.
-	**/
-	countBy<T>(
-		list: _.List<T>,
-		iterator?: _.ListIterator<T, any>,
-		context?: any): _.Dictionary<number>;
-
-	/**
-	* @see _.countBy
-	* @param iterator Function name
-	**/
-	countBy<T>(
-		list: _.List<T>,
-		iterator: string,
-		context?: any): _.Dictionary<number>;
-
-	/**
-	* Returns a shuffled copy of the list, using a version of the Fisher-Yates shuffle.
-	* @param list List to shuffle.
-	* @return Shuffled copy of `list`.
-	**/
-	shuffle<T>(list: _.Collection<T>): T[];
-
-	/**
-	* Produce a random sample from the `list`.  Pass a number to return `n` random elements from the list.  Otherwise a single random item will be returned.
-	* @param list List to sample.
-	* @return Random sample of `n` elements in `list`.
-	**/
-	sample<T>(list: _.Collection<T>, n: number): T[];
-
-	/**
-	* @see _.sample
-	**/
-	sample<T>(list: _.Collection<T>): T;
-
-	/**
-	* Converts the list (anything that can be iterated over), into a real Array. Useful for transmuting
-	* the arguments object.
-	* @param list object to transform into an array.
-	* @return `list` as an array.
-	**/
-	toArray<T>(list: _.Collection<T>): T[];
-
-	/**
-	* Return the number of values in the list.
-	* @param list Count the number of values/elements in this list.
-	* @return Number of values in `list`.
-	**/
-	size<T>(list: _.Collection<T>): number;
-
-	/**
-	* Split array into two arrays:
-	* one whose elements all satisfy predicate and one whose elements all do not satisfy predicate.
-	* @param array Array to split in two.
-	* @param iterator Filter iterator function for each element in `array`.
-	* @param context `this` object in `iterator`, optional.
-	* @return Array where Array[0] are the elements in `array` that satisfies the predicate, and Array[1] the elements that did not.
-	**/
-	partition<T>(
-		array: Array<T>,
-		iterator: _.ListIterator<T, boolean>,
-		context?: any): T[][];
-
-	/*********
-	* Arrays *
-	**********/
-
-	/**
-	* Returns the first element of an array. Passing n will return the first n elements of the array.
-	* @param array Retrieves the first element of this array.
-	* @return Returns the first element of `array`.
-	**/
-	first<T>(array: _.List<T>): T;
-
-	/**
-	* @see _.first
-	* @param n Return more than one element from `array`.
-	**/
-	first<T>(
-		array: _.List<T>,
-		n: number): T[];
-
-	/**
-	* @see _.first
-	**/
-	head<T>(array: _.List<T>): T;
-
-	/**
-	* @see _.first
-	**/
-	head<T>(
-		array: _.List<T>,
-		n: number): T[];
-
-	/**
-	* @see _.first
-	**/
-	take<T>(array: _.List<T>): T;
-
-	/**
-	* @see _.first
-	**/
-	take<T>(
-		array: _.List<T>,
-		n: number): T[];
-
-	/**
-	* Returns everything but the last entry of the array. Especially useful on the arguments object.
-	* Pass n to exclude the last n elements from the result.
-	* @param array Retrieve all elements except the last `n`.
-	* @param n Leaves this many elements behind, optional.
-	* @return Returns everything but the last `n` elements of `array`.
-	**/
-	initial<T>(
-		array: _.List<T>,
-		n?: number): T[];
-
-	/**
-	* Returns the last element of an array. Passing n will return the last n elements of the array.
-	* @param array Retrieves the last element of this array.
-	* @return Returns the last element of `array`.
-	**/
-	last<T>(array: _.List<T>): T;
-
-	/**
-	* @see _.last
-	* @param n Return more than one element from `array`.
-	**/
-	last<T>(
-		array: _.List<T>,
-		n: number): T[];
-
-	/**
-	* Returns the rest of the elements in an array. Pass an index to return the values of the array
-	* from that index onward.
-	* @param array The array to retrieve all but the first `index` elements.
-	* @param n The index to start retrieving elements forward from, optional, default = 1.
-	* @return Returns the elements of `array` from `index` to the end of `array`.
-	**/
-	rest<T>(
-		array: _.List<T>,
-		n?: number): T[];
-
-	/**
-	* @see _.rest
-	**/
-	tail<T>(
-		array: _.List<T>,
-		n?: number): T[];
-
-	/**
-	* @see _.rest
-	**/
-	drop<T>(
-		array: _.List<T>,
-		n?: number): T[];
-
-	/**
-	* Returns a copy of the array with all falsy values removed. In JavaScript, false, null, 0, "",
-	* undefined and NaN are all falsy.
-	* @param array Array to compact.
-	* @return Copy of `array` without false values.
-	**/
-	compact<T>(array: _.List<T>): T[];
-
-	/**
-	* Flattens a nested array (the nesting can be to any depth). If you pass shallow, the array will
-	* only be flattened a single level.
-	* @param array The array to flatten.
-	* @param shallow If true then only flatten one level, optional, default = false.
-	* @return `array` flattened.
-	**/
-	flatten(
-		array: _.List<any>,
-		shallow?: boolean): any[];
-
-	/**
-	* Returns a copy of the array with all instances of the values removed.
-	* @param array The array to remove `values` from.
-	* @param values The values to remove from `array`.
-	* @return Copy of `array` without `values`.
-	**/
-	without<T>(
-		array: _.List<T>,
-		...values: T[]): T[];
-
-	/**
-	* Computes the union of the passed-in arrays: the list of unique items, in order, that are
-	* present in one or more of the arrays.
-	* @param arrays Array of arrays to compute the union of.
-	* @return The union of elements within `arrays`.
-	**/
-	union<T>(...arrays: _.List<T>[]): T[];
-
-	/**
-	* Computes the list of values that are the intersection of all the arrays. Each value in the result
-	* is present in each of the arrays.
-	* @param arrays Array of arrays to compute the intersection of.
-	* @return The intersection of elements within `arrays`.
-	**/
-	intersection<T>(...arrays: _.List<T>[]): T[];
-
-	/**
-	* Similar to without, but returns the values from array that are not present in the other arrays.
-	* @param array Keeps values that are within `others`.
-	* @param others The values to keep within `array`.
-	* @return Copy of `array` with only `others` values.
-	**/
-	difference<T>(
-		array: _.List<T>,
-		...others: _.List<T>[]): T[];
-
-	/**
-	* Produces a duplicate-free version of the array, using === to test object equality. If you know in
-	* advance that the array is sorted, passing true for isSorted will run a much faster algorithm. If
-	* you want to compute unique items based on a transformation, pass an iterator function.
-	* @param array Array to remove duplicates from.
-	* @param isSorted True if `array` is already sorted, optional, default = false.
-	* @param iterator Transform the elements of `array` before comparisons for uniqueness.
-	* @param context 'this' object in `iterator`, optional.
-	* @return Copy of `array` where all elements are unique.
-	**/
-	uniq<T, TSort>(
-		array: _.List<T>,
-		isSorted?: boolean,
-		iterator?: _.ListIterator<T, TSort>,
-		context?: any): T[];
-
-	/**
-	* @see _.uniq
-	**/
-	uniq<T, TSort>(
-		array: _.List<T>,
-		iterator?: _.ListIterator<T, TSort>,
-		context?: any): T[];
-
-	/**
-	* @see _.uniq
-	**/
-	unique<T, TSort>(
-		array: _.List<T>,
-		iterator?: _.ListIterator<T, TSort>,
-		context?: any): T[];
-
-	/**
-	* @see _.uniq
-	**/
-	unique<T, TSort>(
-		array: _.List<T>,
-		isSorted?: boolean,
-		iterator?: _.ListIterator<T, TSort>,
-		context?: any): T[];
-
-
-	/**
-	* Merges together the values of each of the arrays with the values at the corresponding position.
-	* Useful when you have separate data sources that are coordinated through matching array indexes.
-	* If you're working with a matrix of nested arrays, zip.apply can transpose the matrix in a similar fashion.
-	* @param arrays The arrays to merge/zip.
-	* @return Zipped version of `arrays`.
-	**/
-	zip(...arrays: any[][]): any[][];
-
-	/**
-	* @see _.zip
-	**/
-	zip(...arrays: any[]): any[];
-
-    /**
-    * The opposite of zip. Given a number of arrays, returns a series of new arrays, the first
-    * of which contains all of the first elements in the input arrays, the second of which
-    * contains all of the second elements, and so on. Use with apply to pass in an array
-    * of arrays
-    * @param arrays The arrays to unzip.
-    * @return Unzipped version of `arrays`.
-    **/
-    unzip(...arrays: any[][]): any[][];
-
-	/**
-	* Converts arrays into objects. Pass either a single list of [key, value] pairs, or a
-	* list of keys, and a list of values.
-	* @param keys Key array.
-	* @param values Value array.
-	* @return An object containing the `keys` as properties and `values` as the property values.
-	**/
-	object<TResult extends {}>(
-		keys: _.List<string>,
-		values: _.List<any>): TResult;
-
-	/**
-	* Converts arrays into objects. Pass either a single list of [key, value] pairs, or a
-	* list of keys, and a list of values.
-	* @param keyValuePairs Array of [key, value] pairs.
-	* @return An object containing the `keys` as properties and `values` as the property values.
-	**/
-	object<TResult extends {}>(...keyValuePairs: any[][]): TResult;
-
-	/**
-	* @see _.object
-	**/
-	object<TResult extends {}>(
-		list: _.List<any>,
-		values?: any): TResult;
-
-	/**
-	* Returns the index at which value can be found in the array, or -1 if value is not present in the array.
-	* Uses the native indexOf function unless it's missing. If you're working with a large array, and you know
-	* that the array is already sorted, pass true for isSorted to use a faster binary search ... or, pass a number
-	* as the third argument in order to look for the first matching value in the array after the given index.
-	* @param array The array to search for the index of `value`.
-	* @param value The value to search for within `array`.
-	* @param isSorted True if the array is already sorted, optional, default = false.
-	* @return The index of `value` within `array`.
-	**/
-	indexOf<T>(
-		array: _.List<T>,
-		value: T,
-		isSorted?: boolean): number;
-
-	/**
-	* @see _indexof
-	**/
-	indexOf<T>(
-		array: _.List<T>,
-		value: T,
-		startFrom: number): number;
-
-	/**
-	* Returns the index of the last occurrence of value in the array, or -1 if value is not present. Uses the
-	* native lastIndexOf function if possible. Pass fromIndex to start your search at a given index.
-	* @param array The array to search for the last index of `value`.
-	* @param value The value to search for within `array`.
-	* @param from The starting index for the search, optional.
-	* @return The index of the last occurrence of `value` within `array`.
-	**/
-	lastIndexOf<T>(
-		array: _.List<T>,
-		value: T,
-		from?: number): number;
-
-	/**
-	* Returns the first index of an element in `array` where the predicate truth test passes
-	* @param array The array to search for the index of the first element where the predicate truth test passes.
-	* @param predicate Predicate function.
-	* @param context `this` object in `predicate`, optional.
-	* @return Returns the index of an element in `array` where the predicate truth test passes or -1.`
-	**/
-	findIndex<T>(
-		array: _.List<T>,
-		predicate: _.ListIterator<T, boolean>,
-		context?: any): number;
-
-	/**
-	* Returns the last index of an element in `array` where the predicate truth test passes
-	* @param array The array to search for the index of the last element where the predicate truth test passes.
-	* @param predicate Predicate function.
-	* @param context `this` object in `predicate`, optional.
-	* @return Returns the index of an element in `array` where the predicate truth test passes or -1.`
-	**/
-	findLastIndex<T>(
-		array: _.List<T>,
-		predicate: _.ListIterator<T, boolean>,
-		context?: any): number;
-
-	/**
-	* Uses a binary search to determine the index at which the value should be inserted into the list in order
-	* to maintain the list's sorted order. If an iterator is passed, it will be used to compute the sort ranking
-	* of each value, including the value you pass.
-	* @param list The sorted list.
-	* @param value The value to determine its index within `list`.
-	* @param iterator Iterator to compute the sort ranking of each value, optional.
-	* @return The index where `value` should be inserted into `list`.
-	**/
-	sortedIndex<T, TSort>(
-		list: _.List<T>,
-		value: T,
-		iterator?: (x: T) => TSort, context?: any): number;
-
-	/**
-	* A function to create flexibly-numbered lists of integers, handy for each and map loops. start, if omitted,
-	* defaults to 0; step defaults to 1. Returns a list of integers from start to stop, incremented (or decremented)
-	* by step, exclusive.
-	* @param start Start here.
-	* @param stop Stop here.
-	* @param step The number to count up by each iteration, optional, default = 1.
-	* @return Array of numbers from `start` to `stop` with increments of `step`.
-	**/
-
-	range(
-		start: number,
-		stop: number,
-		step?: number): number[];
-
-	/**
-	* @see _.range
-	* @param stop Stop here.
-	* @return Array of numbers from 0 to `stop` with increments of 1.
-	* @note If start is not specified the implementation will never pull the step (step = arguments[2] || 0)
-	**/
-	range(stop: number): number[];
-
-	/*************
-	 * Functions *
-	 *************/
-
-	/**
-	* Bind a function to an object, meaning that whenever the function is called, the value of this will
-	* be the object. Optionally, bind arguments to the function to pre-fill them, also known as partial application.
-	* @param func The function to bind `this` to `object`.
-	* @param context The `this` pointer whenever `fn` is called.
-	* @param arguments Additional arguments to pass to `fn` when called.
-	* @return `fn` with `this` bound to `object`.
-	**/
-	bind(
-		func: Function,
-		context: any,
-		...arguments: any[]): () => any;
-
-	/**
-	* Binds a number of methods on the object, specified by methodNames, to be run in the context of that object
-	* whenever they are invoked. Very handy for binding functions that are going to be used as event handlers,
-	* which would otherwise be invoked with a fairly useless this. If no methodNames are provided, all of the
-	* object's function properties will be bound to it.
-	* @param object The object to bind the methods `methodName` to.
-	* @param methodNames The methods to bind to `object`, optional and if not provided all of `object`'s
-	* methods are bound.
-	**/
-	bindAll(
-		object: any,
-		...methodNames: string[]): any;
-
-	/**
-	* Partially apply a function by filling in any number of its arguments, without changing its dynamic this value.
-	* A close cousin of bind.  You may pass _ in your list of arguments to specify an argument that should not be
-	* pre-filled, but left open to supply at call-time.
-	* @param fn Function to partially fill in arguments.
-	* @param arguments The partial arguments.
-	* @return `fn` with partially filled in arguments.
-	**/
-
-	partial<T1, T2>(
-		fn: { (p1: T1):T2 },
-		p1: T1
-	): { (): T2 };
-
-	partial<T1, T2, T3>(
-		fn: { (p1: T1, p2: T2):T3 },
-		p1: T1
-	): { (p2: T2): T3 };
-
-	partial<T1, T2, T3>(
-		fn: { (p1: T1, p2: T2):T3 },
-		p1: T1,
-		p2: T2
-	): { (): T3 };
-
-	partial<T1, T2, T3>(
-		fn: { (p1: T1, p2: T2):T3 },
-		stub1: UnderscoreStatic,
-		p2: T2
-	): { (p1: T1): T3 };
-
-	partial<T1, T2, T3, T4>(
-		fn: { (p1: T1, p2: T2, p3: T3):T4 },
-		p1: T1
-	): { (p2: T2, p3: T3): T4 };
-
-	partial<T1, T2, T3, T4>(
-		fn: { (p1: T1, p2: T2, p3: T3):T4 },
-		p1: T1,
-		p2: T2
-	): { (p3: T3): T4 };
-
-	partial<T1, T2, T3, T4>(
-		fn: { (p1: T1, p2: T2, p3: T3):T4 },
-		stub1: UnderscoreStatic,
-		p2: T2
-	): { (p1: T1, p3: T3): T4 };
-
-	partial<T1, T2, T3, T4>(
-		fn: { (p1: T1, p2: T2, p3: T3):T4 },
-		p1: T1,
-		p2: T2,
-		p3: T3
-	): { (): T4 };
-
-	partial<T1, T2, T3, T4>(
-		fn: { (p1: T1, p2: T2, p3: T3):T4 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3
-	): { (p1: T1): T4 };
-
-	partial<T1, T2, T3, T4>(
-		fn: { (p1: T1, p2: T2, p3: T3):T4 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3
-	): { (p2: T2): T4 };
-
-	partial<T1, T2, T3, T4>(
-		fn: { (p1: T1, p2: T2, p3: T3):T4 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3
-	): { (p1: T1, p2: T2): T4 };
-
-	partial<T1, T2, T3, T4, T5>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4):T5 },
-		p1: T1
-	): { (p2: T2, p3: T3, p4: T4): T5 };
-
-	partial<T1, T2, T3, T4, T5>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4):T5 },
-		p1: T1,
-		p2: T2
-	): { (p3: T3, p4: T4): T5 };
-
-	partial<T1, T2, T3, T4, T5>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4):T5 },
-		stub1: UnderscoreStatic,
-		p2: T2
-	): { (p1: T1, p3: T3, p4: T4): T5 };
-
-	partial<T1, T2, T3, T4, T5>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4):T5 },
-		p1: T1,
-		p2: T2,
-		p3: T3
-	): { (p4: T4): T5 };
-
-	partial<T1, T2, T3, T4, T5>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4):T5 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3
-	): { (p1: T1, p4: T4): T5 };
-
-	partial<T1, T2, T3, T4, T5>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4):T5 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3
-	): { (p2: T2, p4: T4): T5 };
-
-	partial<T1, T2, T3, T4, T5>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4):T5 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3
-	): { (p1: T1, p2: T2, p4: T4): T5 };
-
-	partial<T1, T2, T3, T4, T5>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4):T5 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		p4: T4
-	): { (): T5 };
-
-	partial<T1, T2, T3, T4, T5>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4):T5 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		p4: T4
-	): { (p1: T1): T5 };
-
-	partial<T1, T2, T3, T4, T5>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4):T5 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4
-	): { (p2: T2): T5 };
-
-	partial<T1, T2, T3, T4, T5>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4):T5 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4
-	): { (p1: T1, p2: T2): T5 };
-
-	partial<T1, T2, T3, T4, T5>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4):T5 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4
-	): { (p3: T3): T5 };
-
-	partial<T1, T2, T3, T4, T5>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4):T5 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4
-	): { (p1: T1, p3: T3): T5 };
-
-	partial<T1, T2, T3, T4, T5>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4):T5 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4
-	): { (p2: T2, p3: T3): T5 };
-
-	partial<T1, T2, T3, T4, T5>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4):T5 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4
-	): { (p1: T1, p2: T2, p3: T3): T5 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		p1: T1
-	): { (p2: T2, p3: T3, p4: T4, p5: T5): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		p1: T1,
-		p2: T2
-	): { (p3: T3, p4: T4, p5: T5): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		stub1: UnderscoreStatic,
-		p2: T2
-	): { (p1: T1, p3: T3, p4: T4, p5: T5): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		p1: T1,
-		p2: T2,
-		p3: T3
-	): { (p4: T4, p5: T5): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3
-	): { (p1: T1, p4: T4, p5: T5): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3
-	): { (p2: T2, p4: T4, p5: T5): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3
-	): { (p1: T1, p2: T2, p4: T4, p5: T5): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		p4: T4
-	): { (p5: T5): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		p4: T4
-	): { (p1: T1, p5: T5): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4
-	): { (p2: T2, p5: T5): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4
-	): { (p1: T1, p2: T2, p5: T5): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4
-	): { (p3: T3, p5: T5): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4
-	): { (p1: T1, p3: T3, p5: T5): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4
-	): { (p2: T2, p3: T3, p5: T5): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4
-	): { (p1: T1, p2: T2, p3: T3, p5: T5): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		p4: T4,
-		p5: T5
-	): { (): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		p4: T4,
-		p5: T5
-	): { (p1: T1): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4,
-		p5: T5
-	): { (p2: T2): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4,
-		p5: T5
-	): { (p1: T1, p2: T2): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5
-	): { (p3: T3): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5
-	): { (p1: T1, p3: T3): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5
-	): { (p2: T2, p3: T3): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5
-	): { (p1: T1, p2: T2, p3: T3): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p4: T4): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p1: T1, p4: T4): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p2: T2, p4: T4): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p1: T1, p2: T2, p4: T4): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p3: T3, p4: T4): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p1: T1, p3: T3, p4: T4): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p2: T2, p3: T3, p4: T4): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5):T6 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p1: T1, p2: T2, p3: T3, p4: T4): T6 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1
-	): { (p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		p2: T2
-	): { (p3: T3, p4: T4, p5: T5, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		p2: T2
-	): { (p1: T1, p3: T3, p4: T4, p5: T5, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		p2: T2,
-		p3: T3
-	): { (p4: T4, p5: T5, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3
-	): { (p1: T1, p4: T4, p5: T5, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3
-	): { (p2: T2, p4: T4, p5: T5, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3
-	): { (p1: T1, p2: T2, p4: T4, p5: T5, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		p4: T4
-	): { (p5: T5, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		p4: T4
-	): { (p1: T1, p5: T5, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4
-	): { (p2: T2, p5: T5, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4
-	): { (p1: T1, p2: T2, p5: T5, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4
-	): { (p3: T3, p5: T5, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4
-	): { (p1: T1, p3: T3, p5: T5, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4
-	): { (p2: T2, p3: T3, p5: T5, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4
-	): { (p1: T1, p2: T2, p3: T3, p5: T5, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		p4: T4,
-		p5: T5
-	): { (p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		p4: T4,
-		p5: T5
-	): { (p1: T1, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4,
-		p5: T5
-	): { (p2: T2, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4,
-		p5: T5
-	): { (p1: T1, p2: T2, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5
-	): { (p3: T3, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5
-	): { (p1: T1, p3: T3, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5
-	): { (p2: T2, p3: T3, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5
-	): { (p1: T1, p2: T2, p3: T3, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p4: T4, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p1: T1, p4: T4, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p2: T2, p4: T4, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p1: T1, p2: T2, p4: T4, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p3: T3, p4: T4, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p1: T1, p3: T3, p4: T4, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p2: T2, p3: T3, p4: T4, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p1: T1, p2: T2, p3: T3, p4: T4, p6: T6): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		p4: T4,
-		p5: T5,
-		p6: T6
-	): { (): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		p4: T4,
-		p5: T5,
-		p6: T6
-	): { (p1: T1): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4,
-		p5: T5,
-		p6: T6
-	): { (p2: T2): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4,
-		p5: T5,
-		p6: T6
-	): { (p1: T1, p2: T2): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5,
-		p6: T6
-	): { (p3: T3): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5,
-		p6: T6
-	): { (p1: T1, p3: T3): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5,
-		p6: T6
-	): { (p2: T2, p3: T3): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5,
-		p6: T6
-	): { (p1: T1, p2: T2, p3: T3): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6
-	): { (p4: T4): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6
-	): { (p1: T1, p4: T4): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6
-	): { (p2: T2, p4: T4): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6
-	): { (p1: T1, p2: T2, p4: T4): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6
-	): { (p3: T3, p4: T4): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6
-	): { (p1: T1, p3: T3, p4: T4): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6
-	): { (p2: T2, p3: T3, p4: T4): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6
-	): { (p1: T1, p2: T2, p3: T3, p4: T4): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p5: T5): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p1: T1, p5: T5): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p2: T2, p5: T5): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p1: T1, p2: T2, p5: T5): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p3: T3, p5: T5): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p1: T1, p3: T3, p5: T5): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p2: T2, p3: T3, p5: T5): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p1: T1, p2: T2, p3: T3, p5: T5): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p4: T4, p5: T5): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p1: T1, p4: T4, p5: T5): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p2: T2, p4: T4, p5: T5): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p1: T1, p2: T2, p4: T4, p5: T5): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p3: T3, p4: T4, p5: T5): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p1: T1, p3: T3, p4: T4, p5: T5): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p2: T2, p3: T3, p4: T4, p5: T5): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6):T7 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T7 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1
-	): { (p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2
-	): { (p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2
-	): { (p1: T1, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		p3: T3
-	): { (p4: T4, p5: T5, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3
-	): { (p1: T1, p4: T4, p5: T5, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3
-	): { (p2: T2, p4: T4, p5: T5, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3
-	): { (p1: T1, p2: T2, p4: T4, p5: T5, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		p4: T4
-	): { (p5: T5, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		p4: T4
-	): { (p1: T1, p5: T5, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4
-	): { (p2: T2, p5: T5, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4
-	): { (p1: T1, p2: T2, p5: T5, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4
-	): { (p3: T3, p5: T5, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4
-	): { (p1: T1, p3: T3, p5: T5, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4
-	): { (p2: T2, p3: T3, p5: T5, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4
-	): { (p1: T1, p2: T2, p3: T3, p5: T5, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		p4: T4,
-		p5: T5
-	): { (p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		p4: T4,
-		p5: T5
-	): { (p1: T1, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4,
-		p5: T5
-	): { (p2: T2, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4,
-		p5: T5
-	): { (p1: T1, p2: T2, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5
-	): { (p3: T3, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5
-	): { (p1: T1, p3: T3, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5
-	): { (p2: T2, p3: T3, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5
-	): { (p1: T1, p2: T2, p3: T3, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p4: T4, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p1: T1, p4: T4, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p2: T2, p4: T4, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p1: T1, p2: T2, p4: T4, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p3: T3, p4: T4, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p1: T1, p3: T3, p4: T4, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p2: T2, p3: T3, p4: T4, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5
-	): { (p1: T1, p2: T2, p3: T3, p4: T4, p6: T6, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		p4: T4,
-		p5: T5,
-		p6: T6
-	): { (p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		p4: T4,
-		p5: T5,
-		p6: T6
-	): { (p1: T1, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4,
-		p5: T5,
-		p6: T6
-	): { (p2: T2, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4,
-		p5: T5,
-		p6: T6
-	): { (p1: T1, p2: T2, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5,
-		p6: T6
-	): { (p3: T3, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5,
-		p6: T6
-	): { (p1: T1, p3: T3, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5,
-		p6: T6
-	): { (p2: T2, p3: T3, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5,
-		p6: T6
-	): { (p1: T1, p2: T2, p3: T3, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6
-	): { (p4: T4, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6
-	): { (p1: T1, p4: T4, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6
-	): { (p2: T2, p4: T4, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6
-	): { (p1: T1, p2: T2, p4: T4, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6
-	): { (p3: T3, p4: T4, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6
-	): { (p1: T1, p3: T3, p4: T4, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6
-	): { (p2: T2, p3: T3, p4: T4, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6
-	): { (p1: T1, p2: T2, p3: T3, p4: T4, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p5: T5, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p1: T1, p5: T5, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p2: T2, p5: T5, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p1: T1, p2: T2, p5: T5, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p3: T3, p5: T5, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p1: T1, p3: T3, p5: T5, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p2: T2, p3: T3, p5: T5, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p1: T1, p2: T2, p3: T3, p5: T5, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p4: T4, p5: T5, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p1: T1, p4: T4, p5: T5, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p2: T2, p4: T4, p5: T5, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p1: T1, p2: T2, p4: T4, p5: T5, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p3: T3, p4: T4, p5: T5, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p1: T1, p3: T3, p4: T4, p5: T5, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p2: T2, p3: T3, p4: T4, p5: T5, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6
-	): { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p7: T7): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		p4: T4,
-		p5: T5,
-		p6: T6,
-		p7: T7
-	): { (): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		p4: T4,
-		p5: T5,
-		p6: T6,
-		p7: T7
-	): { (p1: T1): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4,
-		p5: T5,
-		p6: T6,
-		p7: T7
-	): { (p2: T2): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4,
-		p5: T5,
-		p6: T6,
-		p7: T7
-	): { (p1: T1, p2: T2): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5,
-		p6: T6,
-		p7: T7
-	): { (p3: T3): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5,
-		p6: T6,
-		p7: T7
-	): { (p1: T1, p3: T3): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5,
-		p6: T6,
-		p7: T7
-	): { (p2: T2, p3: T3): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5,
-		p6: T6,
-		p7: T7
-	): { (p1: T1, p2: T2, p3: T3): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6,
-		p7: T7
-	): { (p4: T4): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6,
-		p7: T7
-	): { (p1: T1, p4: T4): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6,
-		p7: T7
-	): { (p2: T2, p4: T4): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6,
-		p7: T7
-	): { (p1: T1, p2: T2, p4: T4): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6,
-		p7: T7
-	): { (p3: T3, p4: T4): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6,
-		p7: T7
-	): { (p1: T1, p3: T3, p4: T4): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6,
-		p7: T7
-	): { (p2: T2, p3: T3, p4: T4): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		p6: T6,
-		p7: T7
-	): { (p1: T1, p2: T2, p3: T3, p4: T4): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6,
-		p7: T7
-	): { (p5: T5): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6,
-		p7: T7
-	): { (p1: T1, p5: T5): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6,
-		p7: T7
-	): { (p2: T2, p5: T5): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6,
-		p7: T7
-	): { (p1: T1, p2: T2, p5: T5): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6,
-		p7: T7
-	): { (p3: T3, p5: T5): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6,
-		p7: T7
-	): { (p1: T1, p3: T3, p5: T5): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6,
-		p7: T7
-	): { (p2: T2, p3: T3, p5: T5): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		p6: T6,
-		p7: T7
-	): { (p1: T1, p2: T2, p3: T3, p5: T5): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6,
-		p7: T7
-	): { (p4: T4, p5: T5): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6,
-		p7: T7
-	): { (p1: T1, p4: T4, p5: T5): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6,
-		p7: T7
-	): { (p2: T2, p4: T4, p5: T5): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6,
-		p7: T7
-	): { (p1: T1, p2: T2, p4: T4, p5: T5): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6,
-		p7: T7
-	): { (p3: T3, p4: T4, p5: T5): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6,
-		p7: T7
-	): { (p1: T1, p3: T3, p4: T4, p5: T5): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6,
-		p7: T7
-	): { (p2: T2, p3: T3, p4: T4, p5: T5): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		p6: T6,
-		p7: T7
-	): { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		p4: T4,
-		p5: T5,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		p4: T4,
-		p5: T5,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p1: T1, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4,
-		p5: T5,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p2: T2, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4,
-		p5: T5,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p1: T1, p2: T2, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p3: T3, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p1: T1, p3: T3, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p2: T2, p3: T3, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		p5: T5,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p1: T1, p2: T2, p3: T3, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p4: T4, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p1: T1, p4: T4, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p2: T2, p4: T4, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p1: T1, p2: T2, p4: T4, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p3: T3, p4: T4, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p1: T1, p3: T3, p4: T4, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p2: T2, p3: T3, p4: T4, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		p5: T5,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p1: T1, p2: T2, p3: T3, p4: T4, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p5: T5, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p1: T1, p5: T5, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p2: T2, p5: T5, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p1: T1, p2: T2, p5: T5, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p3: T3, p5: T5, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p1: T1, p3: T3, p5: T5, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p2: T2, p3: T3, p5: T5, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		p4: T4,
-		stub5: UnderscoreStatic,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p1: T1, p2: T2, p3: T3, p5: T5, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p4: T4, p5: T5, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p1: T1, p4: T4, p5: T5, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p2: T2, p4: T4, p5: T5, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		p3: T3,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p1: T1, p2: T2, p4: T4, p5: T5, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p3: T3, p4: T4, p5: T5, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		p2: T2,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p1: T1, p3: T3, p4: T4, p5: T5, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		p1: T1,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T8 };
-
-	partial<T1, T2, T3, T4, T5, T6, T7, T8>(
-		fn: { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6, p7: T7):T8 },
-		stub1: UnderscoreStatic,
-		stub2: UnderscoreStatic,
-		stub3: UnderscoreStatic,
-		stub4: UnderscoreStatic,
-		stub5: UnderscoreStatic,
-		stub6: UnderscoreStatic,
-		p7: T7
-	): { (p1: T1, p2: T2, p3: T3, p4: T4, p5: T5, p6: T6): T8 };
-
-	/**
-	* Memoizes a given function by caching the computed result. Useful for speeding up slow-running computations.
-	* If passed an optional hashFunction, it will be used to compute the hash key for storing the result, based
-	* on the arguments to the original function. The default hashFunction just uses the first argument to the
-	* memoized function as the key.
-	* @param fn Computationally expensive function that will now memoized results.
-	* @param hashFn Hash function for storing the result of `fn`.
-	* @return Memoized version of `fn`.
-	**/
-	memoize(
-		fn: Function,
-		hashFn?: (...args: any[]) => string): Function;
-
-	/**
-	* Much like setTimeout, invokes function after wait milliseconds. If you pass the optional arguments,
-	* they will be forwarded on to the function when it is invoked.
-	* @param func Function to delay `waitMS` amount of ms.
-	* @param wait The amount of milliseconds to delay `fn`.
-	* @arguments Additional arguments to pass to `fn`.
-	**/
-	delay(
-		func: Function,
-		wait: number,
-		...arguments: any[]): any;
-
-	/**
-	* @see _delay
-	**/
-	delay(
-		func: Function,
-		...arguments: any[]): any;
-
-	/**
-	* Defers invoking the function until the current call stack has cleared, similar to using setTimeout
-	* with a delay of 0. Useful for performing expensive computations or HTML rendering in chunks without
-	* blocking the UI thread from updating. If you pass the optional arguments, they will be forwarded on
-	* to the function when it is invoked.
-	* @param fn The function to defer.
-	* @param arguments Additional arguments to pass to `fn`.
-	**/
-	defer(
-		fn: Function,
-		...arguments: any[]): void;
-
-	/**
-	* Creates and returns a new, throttled version of the passed function, that, when invoked repeatedly,
-	* will only actually call the original function at most once per every wait milliseconds. Useful for
-	* rate-limiting events that occur faster than you can keep up with.
-	* By default, throttle will execute the function as soon as you call it for the first time, and,
-	* if you call it again any number of times during the wait period, as soon as that period is over.
-	* If you'd like to disable the leading-edge call, pass {leading: false}, and if you'd like to disable
-	* the execution on the trailing-edge, pass {trailing: false}.
-	* @param func Function to throttle `waitMS` ms.
-	* @param wait The number of milliseconds to wait before `fn` can be invoked again.
-	* @param options Allows for disabling execution of the throttled function on either the leading or trailing edge.
-	* @return `fn` with a throttle of `wait`.
-	**/
-	throttle<T extends Function>(
-		func: T,
-		wait: number,
-		options?: _.ThrottleSettings): T;
-
-	/**
-	* Creates and returns a new debounced version of the passed function that will postpone its execution
-	* until after wait milliseconds have elapsed since the last time it was invoked. Useful for implementing
-	* behavior that should only happen after the input has stopped arriving. For example: rendering a preview
-	* of a Markdown comment, recalculating a layout after the window has stopped being resized, and so on.
-	*
-	* Pass true for the immediate parameter to cause debounce to trigger the function on the leading instead
-	* of the trailing edge of the wait interval. Useful in circumstances like preventing accidental double
-	*-clicks on a "submit" button from firing a second time.
-	* @param fn Function to debounce `waitMS` ms.
-	* @param wait The number of milliseconds to wait before `fn` can be invoked again.
-	* @param immediate True if `fn` should be invoked on the leading edge of `waitMS` instead of the trailing edge.
-	* @return Debounced version of `fn` that waits `wait` ms when invoked.
-	**/
-	debounce<T extends Function>(
-		fn: T,
-		wait: number,
-		immediate?: boolean): T;
-
-	/**
-	* Creates a version of the function that can only be called one time. Repeated calls to the modified
-	* function will have no effect, returning the value from the original call. Useful for initialization
-	* functions, instead of having to set a boolean flag and then check it later.
-	* @param fn Function to only execute once.
-	* @return Copy of `fn` that can only be invoked once.
-	**/
-	once<T extends Function>(fn: T): T;
-
-	/**
-	* Creates a version of the function that will only be run after first being called count times. Useful
-	* for grouping asynchronous responses, where you want to be sure that all the async calls have finished,
-	* before proceeding.
-	* @param number count Number of times to be called before actually executing.
-	* @param Function fn The function to defer execution `count` times.
-	* @return Copy of `fn` that will not execute until it is invoked `count` times.
-	**/
-	after(
-		count: number,
-		fn: Function): Function;
-
-	/**
-	* Creates a version of the function that can be called no more than count times.  The result of
-	* the last function call is memoized and returned when count has been reached.
-	* @param number count  The maxmimum number of times the function can be called.
-	* @param Function fn The function to limit the number of times it can be called.
-	* @return Copy of `fn` that can only be called `count` times.
-	**/
-	before(
-		count: number,
-		fn: Function): Function;
-
-	/**
-	* Wraps the first function inside of the wrapper function, passing it as the first argument. This allows
-	* the wrapper to execute code before and after the function runs, adjust the arguments, and execute it
-	* conditionally.
-	* @param fn Function to wrap.
-	* @param wrapper The function that will wrap `fn`.
-	* @return Wrapped version of `fn.
-	**/
-	wrap(
-		fn: Function,
-		wrapper: (fn: Function, ...args: any[]) => any): Function;
-
-	/**
-	* Returns a negated version of the pass-in predicate.
-	* @param Function predicate
-	* @return boolean
-	**/
-	negate(predicate: Function): boolean;
-
-	/**
-	* Returns the composition of a list of functions, where each function consumes the return value of the
-	* function that follows. In math terms, composing the functions f(), g(), and h() produces f(g(h())).
-	* @param functions List of functions to compose.
-	* @return Composition of `functions`.
-	**/
-	compose(...functions: Function[]): Function;
-
-	/**********
-	* Objects *
-	***********/
-
-	/**
-	* Retrieve all the names of the object's properties.
-	* @param object Retrieve the key or property names from this object.
-	* @return List of all the property names on `object`.
-	**/
-	keys(object: any): string[];
-
-    /**
-	* Retrieve all the names of object's own and inherited properties.
-	* @param object Retrieve the key or property names from this object.
-	* @return List of all the property names on `object`.
-	**/
-	allKeys(object: any): string[];
-
-	/**
-	* Return all of the values of the object's properties.
-	* @param object Retrieve the values of all the properties on this object.
-	* @return List of all the values on `object`.
-	**/
-	values<T>(object: _.Dictionary<T>): T[];
-
-	/**
-	* Return all of the values of the object's properties.
-	* @param object Retrieve the values of all the properties on this object.
-	* @return List of all the values on `object`.
-	**/
-	values(object: any): any[];
-
-    /**
-     * Like map, but for objects. Transform the value of each property in turn.
-     * @param object The object to transform
-     * @param iteratee The function that transforms property values
-     * @param context The optional context (value of `this`) to bind to
-     * @return a new _.Dictionary of property values
-     */
-    mapObject<T, U>(object: _.Dictionary<T>, iteratee: (val: T, key: string, object: _.Dictionary<T>) => U, context?: any): _.Dictionary<U>;
-
-    /**
-     * Like map, but for objects. Transform the value of each property in turn.
-     * @param object The object to transform
-     * @param iteratee The function that tranforms property values
-     * @param context The optional context (value of `this`) to bind to
-     */
-    mapObject<T>(object: any, iteratee: (val: any, key: string, object: any) => T, context?: any): _.Dictionary<T>;
-
-    /**
-     * Like map, but for objects. Retrieves a property from each entry in the object, as if by _.property
-     * @param object The object to transform
-     * @param iteratee The property name to retrieve
-     * @param context The optional context (value of `this`) to bind to
-     */
-    mapObject(object: any, iteratee: string, context?: any): _.Dictionary<any>;
-
-	/**
-	* Convert an object into a list of [key, value] pairs.
-	* @param object Convert this object to a list of [key, value] pairs.
-	* @return List of [key, value] pairs on `object`.
-	**/
-	pairs(object: any): any[][];
-
-	/**
-	* Returns a copy of the object where the keys have become the values and the values the keys.
-	* For this to work, all of your object's values should be unique and string serializable.
-	* @param object Object to invert key/value pairs.
-	* @return An inverted key/value paired version of `object`.
-	**/
-	invert(object: any): any;
-
-	/**
-	* Returns a sorted list of the names of every method in an object - that is to say,
-	* the name of every function property of the object.
-	* @param object Object to pluck all function property names from.
-	* @return List of all the function names on `object`.
-	**/
-	functions(object: any): string[];
-
-	/**
-	* @see _functions
-	**/
-	methods(object: any): string[];
-
-	/**
-	* Copy all of the properties in the source objects over to the destination object, and return
-	* the destination object. It's in-order, so the last source will override properties of the
-	* same name in previous arguments.
-	* @param destination Object to extend all the properties from `sources`.
-	* @param sources Extends `destination` with all properties from these source objects.
-	* @return `destination` extended with all the properties from the `sources` objects.
-	**/
-	extend(
-		destination: any,
-		...sources: any[]): any;
-
-	/**
-	* Like extend, but only copies own properties over to the destination object. (alias: assign)
-	*/
-	extendOwn(
-		destination: any,
-		...source: any[]): any;
-
-	/**
-	* Like extend, but only copies own properties over to the destination object. (alias: extendOwn)
-	*/
-	assign(
-		destination: any,
-		...source: any[]): any;
-
-	/**
-	* Return a copy of the object, filtered to only have values for the whitelisted keys
-	* (or array of valid keys).
-	* @param object Object to strip unwanted key/value pairs.
-	* @keys The key/value pairs to keep on `object`.
-	* @return Copy of `object` with only the `keys` properties.
-	**/
-	pick(
-		object: any,
-		...keys: any[]): any;
-
-	/**
-	* @see _.pick
-	**/
-	pick(
-		object: any,
-		fn: (value: any, key: any, object: any) => any): any;
-
-	/**
-	* Return a copy of the object, filtered to omit the blacklisted keys (or array of keys).
-	* @param object Object to strip unwanted key/value pairs.
-	* @param keys The key/value pairs to remove on `object`.
-	* @return Copy of `object` without the `keys` properties.
-	**/
-	omit(
-		object: any,
-		...keys: string[]): any;
-
-	/**
-	* @see _.omit
-	**/
-	omit(
-		object: any,
-		keys: string[]): any;
-
-	/**
-	* @see _.omit
-	**/
-	omit(
-		object: any,
-		iteratee: Function): any;
-
-	/**
-	* Fill in null and undefined properties in object with values from the defaults objects,
-	* and return the object. As soon as the property is filled, further defaults will have no effect.
-	* @param object Fill this object with default values.
-	* @param defaults The default values to add to `object`.
-	* @return `object` with added `defaults` values.
-	**/
-	defaults(
-		object: any,
-		...defaults: any[]): any;
-
-	/**
-	* Create a shallow-copied clone of the object.
-	* Any nested objects or arrays will be copied by reference, not duplicated.
-	* @param object Object to clone.
-	* @return Copy of `object`.
-	**/
-	clone<T>(object: T): T;
-
-	/**
-	* Invokes interceptor with the object, and then returns object. The primary purpose of this method
-	* is to "tap into" a method chain, in order to perform operations on intermediate results within the chain.
-	* @param object Argument to `interceptor`.
-	* @param intercepter The function to modify `object` before continuing the method chain.
-	* @return Modified `object`.
-	**/
-	tap<T>(object: T, intercepter: Function): T;
-
-	/**
-	* Does the object contain the given key? Identical to object.hasOwnProperty(key), but uses a safe
-	* reference to the hasOwnProperty function, in case it's been overridden accidentally.
-	* @param object Object to check for `key`.
-	* @param key The key to check for on `object`.
-	* @return True if `key` is a property on `object`, otherwise false.
-	**/
-	has(object: any, key: string): boolean;
-
-	/**
-	* Returns a predicate function that will tell you if a passed in object contains all of the key/value properties present in attrs.
-	* @param attrs Object with key values pair
-	* @return Predicate function
-	**/
-	matches<T, TResult>(attrs: T): _.ListIterator<T, TResult>;
-
-	/**
-	* Returns a function that will itself return the key property of any passed-in object.
-	* @param key Property of the object.
-	* @return Function which accept an object an returns the value of key in that object.
-	**/
-	property(key: string): (object: Object) => any;
-
-    /**
-	* Returns a function that will itself return the value of a object key property.
-	* @param key The object to get the property value from.
-	* @return Function which accept a key property in `object` and returns its value.
-	**/
-    propertyOf(object: Object): (key: string) => any;
-
-	/**
-	* Performs an optimized deep comparison between the two objects,
-	* to determine if they should be considered equal.
-	* @param object Compare to `other`.
-	* @param other Compare to `object`.
-	* @return True if `object` is equal to `other`.
-	**/
-	isEqual(object: any, other: any): boolean;
-
-	/**
-	* Returns true if object contains no values.
-	* @param object Check if this object has no properties or values.
-	* @return True if `object` is empty.
-	**/
-	isEmpty(object: any): boolean;
-
-	/**
-	* Returns true if the keys and values in `properties` matches with the `object` properties.
-	* @param object Object to be compared with `properties`.
-	* @param properties Properties be compared with `object`
-	* @return True if `object` has matching keys and values, otherwise false.
-	**/
-	isMatch(object:any, properties:any): boolean;
-
-	/**
-	* Returns true if object is a DOM element.
-	* @param object Check if this object is a DOM element.
-	* @return True if `object` is a DOM element, otherwise false.
-	**/
-	isElement(object: any): object is Element;
-
-	/**
-	* Returns true if object is an Array.
-	* @param object Check if this object is an Array.
-	* @return True if `object` is an Array, otherwise false.
-	**/
-	isArray(object: any): object is [];
-
-	/**
-	* Returns true if object is an Array.
-	* @param object Check if this object is an Array.
-	* @return True if `object` is an Array, otherwise false.
-	**/
-	isArray<T>(object: any): object is T[];
-
-	/**
-	* Returns true if value is an Object. Note that JavaScript arrays and functions are objects,
-	* while (normal) strings and numbers are not.
-	* @param object Check if this object is an Object.
-	* @return True of `object` is an Object, otherwise false.
-	**/
-	isObject(object: any): boolean;
-
-	/**
-	* Returns true if object is an Arguments object.
-	* @param object Check if this object is an Arguments object.
-	* @return True if `object` is an Arguments object, otherwise false.
-	**/
-	isArguments(object: any): object is IArguments;
-
-	/**
-	* Returns true if object is a Function.
-	* @param object Check if this object is a Function.
-	* @return True if `object` is a Function, otherwise false.
-	**/
-	isFunction(object: any): object is Function;
-
-	/**
-	* Returns true if object inherits from an Error.
-	* @param object Check if this object is an Error.
-	* @return True if `object` is a Error, otherwise false.
-	**/
-	isError(object:any): object is Error;
-
-	/**
-	* Returns true if object is a String.
-	* @param object Check if this object is a String.
-	* @return True if `object` is a String, otherwise false.
-	**/
-	isString(object: any): object is string;
-
-	/**
-	* Returns true if object is a Number (including NaN).
-	* @param object Check if this object is a Number.
-	* @return True if `object` is a Number, otherwise false.
-	**/
-	isNumber(object: any): object is number;
-
-	/**
-	* Returns true if object is a finite Number.
-	* @param object Check if this object is a finite Number.
-	* @return True if `object` is a finite Number.
-	**/
-	isFinite(object: any): boolean;
-
-	/**
-	* Returns true if object is either true or false.
-	* @param object Check if this object is a bool.
-	* @return True if `object` is a bool, otherwise false.
-	**/
-	isBoolean(object: any): object is boolean;
-
-	/**
-	* Returns true if object is a Date.
-	* @param object Check if this object is a Date.
-	* @return True if `object` is a Date, otherwise false.
-	**/
-	isDate(object: any): object is Date;
-
-	/**
-	* Returns true if object is a RegExp.
-	* @param object Check if this object is a RegExp.
-	* @return True if `object` is a RegExp, otherwise false.
-	**/
-	isRegExp(object: any): object is RegExp;
-
-	/**
-	* Returns true if object is NaN.
-	* Note: this is not the same as the native isNaN function,
-	* which will also return true if the variable is undefined.
-	* @param object Check if this object is NaN.
-	* @return True if `object` is NaN, otherwise false.
-	**/
-	isNaN(object: any): boolean;
-
-	/**
-	* Returns true if the value of object is null.
-	* @param object Check if this object is null.
-	* @return True if `object` is null, otherwise false.
-	**/
-	isNull(object: any): boolean;
-
-	/**
-	* Returns true if value is undefined.
-	* @param object Check if this object is undefined.
-	* @return True if `object` is undefined, otherwise false.
-	**/
-	isUndefined(value: any): boolean;
-
-	/* *********
-	 * Utility *
-	********** */
-
-	/**
-	* Give control of the "_" variable back to its previous owner.
-	* Returns a reference to the Underscore object.
-	* @return Underscore object reference.
-	**/
-	noConflict(): any;
-
-	/**
-	* Returns the same value that is used as the argument. In math: f(x) = x
-	* This function looks useless, but is used throughout Underscore as a default iterator.
-	* @param value Identity of this object.
-	* @return `value`.
-	**/
-	identity<T>(value: T): T;
-
-	/**
-	* Creates a function that returns the same value that is used as the argument of _.constant
-	* @param value Identity of this object.
-	* @return Function that return value.
-	**/
-	constant<T>(value: T): () => T;
-
-	/**
-	* Returns undefined irrespective of the arguments passed to it.  Useful as the default
-	* for optional callback arguments.
-	* Note there is no way to indicate a 'undefined' return, so it is currently typed as void.
-	* @return undefined
-	**/
-	noop(): void;
-
-	/**
-	* Invokes the given iterator function n times.
-	* Each invocation of iterator is called with an index argument
-	* @param n Number of times to invoke `iterator`.
-	* @param iterator Function iterator to invoke `n` times.
-	* @param context `this` object in `iterator`, optional.
-	**/
-	times<TResult>(n: number, iterator: (n: number) => TResult, context?: any): TResult[];
-
-	/**
-	* Returns a random integer between min and max, inclusive. If you only pass one argument,
-	* it will return a number between 0 and that number.
-	* @param max The maximum random number.
-	* @return A random number between 0 and `max`.
-	**/
-	random(max: number): number;
-
-	/**
-	* @see _.random
-	* @param min The minimum random number.
-	* @return A random number between `min` and `max`.
-	**/
-	random(min: number, max: number): number;
-
-	/**
-	* Allows you to extend Underscore with your own utility functions. Pass a hash of
-	* {name: function} definitions to have your functions added to the Underscore object,
-	* as well as the OOP wrapper.
-	* @param object Mixin object containing key/function pairs to add to the Underscore object.
-	**/
-	mixin(object: any): void;
-
-	/**
-	* A mostly-internal function to generate callbacks that can be applied to each element
-	* in a collection, returning the desired result -- either identity, an arbitrary callback,
-	* a property matcher, or a propetery accessor.
-	* @param string|Function|Object value The value to iterate over, usually the key.
-	* @param any context
-	* @param number argCount
-	* @return Callback that can be applied to each element in a collection.
-	**/
-	iteratee(value: string): Function;
-	iteratee(value: Function, context?: any, argCount?: number): Function;
-	iteratee(value: Object): Function;
-
-	/**
-	* Generate a globally-unique id for client-side models or DOM elements that need one.
-	* If prefix is passed, the id will be appended to it. Without prefix, returns an integer.
-	* @param prefix A prefix string to start the unique ID with.
-	* @return Unique string ID beginning with `prefix`.
-	**/
-	uniqueId(prefix?: string): string;
-
-	/**
-	* Escapes a string for insertion into HTML, replacing &, <, >, ", ', and / characters.
-	* @param str Raw string to escape.
-	* @return `str` HTML escaped.
-	**/
-	escape(str: string): string;
-
-	/**
-	* The opposite of escape, replaces &amp;, &lt;, &gt;, &quot;, and &#x27; with their unescaped counterparts.
-	* @param str HTML escaped string.
-	* @return `str` Raw string.
-	**/
-	unescape(str: string): string;
-
-	/**
-	* If the value of the named property is a function then invoke it; otherwise, return it.
-	* @param object Object to maybe invoke function `property` on.
-	* @param property The function by name to invoke on `object`.
-    * @param defaultValue The value to be returned in case `property` doesn't exist or is undefined.
-	* @return The result of invoking the function `property` on `object.
-	**/
-	result(object: any, property: string, defaultValue?:any): any;
-
-	/**
-	* Compiles JavaScript templates into functions that can be evaluated for rendering. Useful
-	* for rendering complicated bits of HTML from JSON data sources. Template functions can both
-	* interpolate variables, using <%= ... %>, as well as execute arbitrary JavaScript code, with
-	* <% ... %>. If you wish to interpolate a value, and have it be HTML-escaped, use <%- ... %> When
-	* you evaluate a template function, pass in a data object that has properties corresponding to
-	* the template's free variables. If you're writing a one-off, you can pass the data object as
-	* the second parameter to template in order to render immediately instead of returning a template
-	* function. The settings argument should be a hash containing any _.templateSettings that should
-	* be overridden.
-	* @param templateString Underscore HTML template.
-	* @param data Data to use when compiling `templateString`.
-	* @param settings Settings to use while compiling.
-	* @return Returns the compiled Underscore HTML template.
-	**/
-	template(templateString: string, settings?: _.TemplateSettings): (...data: any[]) => string;
-
-	/**
-	* By default, Underscore uses ERB-style template delimiters, change the
-	* following template settings to use alternative delimiters.
-	**/
-	templateSettings: _.TemplateSettings;
-
-	/**
-	* Returns an integer timestamp for the current time, using the fastest method available in the runtime. Useful for implementing timing/animation functions.
-	**/
-	now(): number;
-
-	/* **********
-	 * Chaining *
-	*********** */
-
-	/**
-	* Returns a wrapped object. Calling methods on this object will continue to return wrapped objects
-	* until value() is used.
-	* @param obj Object to chain.
-	* @return Wrapped `obj`.
-	**/
-	chain<T>(obj: T[]): _Chain<T>;
-	chain<T>(obj: _.Dictionary<T>): _Chain<T>;
-	chain<T extends {}>(obj: T): _Chain<T>;
-}
-
-interface Underscore<T> {
-
-	/* *************
-	 * Collections *
-	 ************* */
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.each
-	**/
-	each(iterator: _.ListIterator<T, void>, context?: any): T[];
-
-	/**
-	* @see _.each
-	**/
-	each(iterator: _.ObjectIterator<T, void>, context?: any): T[];
-
-	/**
-	* @see _.each
-	**/
-	forEach(iterator: _.ListIterator<T, void>, context?: any): T[];
-
-	/**
-	* @see _.each
-	**/
-	forEach(iterator: _.ObjectIterator<T, void>, context?: any): T[];
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.map
-	**/
-	map<TResult>(iterator: _.ListIterator<T, TResult>, context?: any): TResult[];
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.map
-	**/
-	map<TResult>(iterator: _.ObjectIterator<T, TResult>, context?: any): TResult[];
-
-	/**
-	* @see _.map
-	**/
-	collect<TResult>(iterator: _.ListIterator<T, TResult>, context?: any): TResult[];
-
-	/**
-	* @see _.map
-	**/
-	collect<TResult>(iterator: _.ObjectIterator<T, TResult>, context?: any): TResult[];
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.reduce
-	**/
-	reduce<TResult>(iterator: _.MemoIterator<T, TResult>, memo?: TResult, context?: any): TResult;
-
-	/**
-	* @see _.reduce
-	**/
-	inject<TResult>(iterator: _.MemoIterator<T, TResult>, memo?: TResult, context?: any): TResult;
-
-	/**
-	* @see _.reduce
-	**/
-	foldl<TResult>(iterator: _.MemoIterator<T, TResult>, memo?: TResult, context?: any): TResult;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.reduceRight
-	**/
-	reduceRight<TResult>(iterator: _.MemoIterator<T, TResult>, memo?: TResult, context?: any): TResult;
-
-	/**
-	* @see _.reduceRight
-	**/
-	foldr<TResult>(iterator: _.MemoIterator<T, TResult>, memo?: TResult, context?: any): TResult;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.find
-	**/
-	find<T>(iterator: _.ListIterator<T, boolean>|_.ObjectIterator<T, boolean>, context?: any): T;
-
-	/**
-	* @see _.find
-	**/
-	find<T, U extends {}>(interator: U): T;
-
-	/**
-	* @see _.find
-	**/
-	find<T>(interator: string): T;
-
-	/**
-	* @see _.find
-	**/
-	detect<T>(iterator: _.ListIterator<T, boolean>|_.ObjectIterator<T, boolean>, context?: any): T;
-
-	/**
-	* @see _.find
-	**/
-	detect<T, U extends {}>(interator?: U): T;
-
-	/**
-	* @see _.find
-	**/
-	detect<T>(interator?: string): T;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.filter
-	**/
-	filter(iterator: _.ListIterator<T, boolean>, context?: any): T[];
-
-	/**
-	* @see _.filter
-	**/
-	select(iterator: _.ListIterator<T, boolean>, context?: any): T[];
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.where
-	**/
-	where<U extends {}>(properties: U): T[];
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.findWhere
-	**/
-	findWhere<U extends {}>(properties: U): T;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.reject
-	**/
-	reject(iterator: _.ListIterator<T, boolean>, context?: any): T[];
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.all
-	**/
-	all(iterator?: _.ListIterator<T, boolean>, context?: any): boolean;
-
-	/**
-	* @see _.all
-	**/
-	every(iterator?: _.ListIterator<T, boolean>, context?: any): boolean;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.any
-	**/
-	any(iterator?: _.ListIterator<T, boolean>, context?: any): boolean;
-
-	/**
-	* @see _.any
-	**/
-	some(iterator?: _.ListIterator<T, boolean>, context?: any): boolean;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.contains
-	**/
-	contains(value: T): boolean;
-
-	/**
-	* Alias for 'contains'.
-	* @see contains
-	**/
-	include(value: T): boolean;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.invoke
-	**/
-	invoke(methodName: string, ...arguments: any[]): any;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.pluck
-	**/
-	pluck(propertyName: string): any[];
-
-	/**
-	* Wrapped type `number[]`.
-	* @see _.max
-	**/
-	max(): number;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.max
-	**/
-	max(iterator: _.ListIterator<T, number>, context?: any): T;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.max
-	**/
-	max(iterator?: _.ListIterator<T, any>, context?: any): T;
-
-	/**
-	* Wrapped type `number[]`.
-	* @see _.min
-	**/
-	min(): number;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.min
-	**/
-	min(iterator: _.ListIterator<T, number>, context?: any): T;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.min
-	**/
-	min(iterator?: _.ListIterator<T, any>, context?: any): T;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.sortBy
-	**/
-	sortBy(iterator?: _.ListIterator<T, any>, context?: any): T[];
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.sortBy
-	**/
-	sortBy(iterator: string, context?: any): T[];
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.groupBy
-	**/
-	groupBy(iterator?: _.ListIterator<T, any>, context?: any): _.Dictionary<_.List<T>>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.groupBy
-	**/
-	groupBy(iterator: string, context?: any): _.Dictionary<T[]>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.indexBy
-	**/
-	indexBy(iterator: _.ListIterator<T, any>, context?: any): _.Dictionary<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.indexBy
-	**/
-	indexBy(iterator: string, context?: any): _.Dictionary<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.countBy
-	**/
-	countBy(iterator?: _.ListIterator<T, any>, context?: any): _.Dictionary<number>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.countBy
-	**/
-	countBy(iterator: string, context?: any): _.Dictionary<number>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.shuffle
-	**/
-	shuffle(): T[];
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.sample
-	**/
-	sample<T>(n: number): T[];
-
-	/**
-	* @see _.sample
-	**/
-	sample<T>(): T;
-
-	/**
-	* Wrapped type `any`.
-	* @see _.toArray
-	**/
-	toArray(): T[];
-
-	/**
-	* Wrapped type `any`.
-	* @see _.size
-	**/
-	size(): number;
-
-	/*********
-	* Arrays *
-	**********/
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.first
-	**/
-	first(): T;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.first
-	**/
-	first(n: number): T[];
-
-	/**
-	* @see _.first
-	**/
-	head(): T;
-
-	/**
-	* @see _.first
-	**/
-	head(n: number): T[];
-
-	/**
-	* @see _.first
-	**/
-	take(): T;
-
-	/**
-	* @see _.first
-	**/
-	take(n: number): T[];
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.initial
-	**/
-	initial(n?: number): T[];
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.last
-	**/
-	last(): T;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.last
-	**/
-	last(n: number): T[];
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.rest
-	**/
-	rest(n?: number): T[];
-
-	/**
-	* @see _.rest
-	**/
-	tail(n?: number): T[];
-
-	/**
-	* @see _.rest
-	**/
-	drop(n?: number): T[];
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.compact
-	**/
-	compact(): T[];
-
-	/**
-	* Wrapped type `any`.
-	* @see _.flatten
-	**/
-	flatten(shallow?: boolean): any[];
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.without
-	**/
-	without(...values: T[]): T[];
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.partition
-	**/
-	partition(iterator: _.ListIterator<T, boolean>, context?: any): T[][];
-
-	/**
-	* Wrapped type `any[][]`.
-	* @see _.union
-	**/
-	union(...arrays: _.List<T>[]): T[];
-
-	/**
-	* Wrapped type `any[][]`.
-	* @see _.intersection
-	**/
-	intersection(...arrays: _.List<T>[]): T[];
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.difference
-	**/
-	difference(...others: _.List<T>[]): T[];
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.uniq
-	**/
-	uniq(isSorted?: boolean, iterator?: _.ListIterator<T, any>): T[];
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.uniq
-	**/
-	uniq<TSort>(iterator?: _.ListIterator<T, TSort>, context?: any): T[];
-
-	/**
-	* @see _.uniq
-	**/
-	unique<TSort>(isSorted?: boolean, iterator?: _.ListIterator<T, TSort>): T[];
-
-	/**
-	* @see _.uniq
-	**/
-	unique<TSort>(iterator?: _.ListIterator<T, TSort>, context?: any): T[];
-
-	/**
-	* Wrapped type `any[][]`.
-	* @see _.zip
-	**/
-	zip(...arrays: any[][]): any[][];
-
-    /**
-	* Wrapped type `any[][]`.
-	* @see _.unzip
-	**/
-	unzip(...arrays: any[][]): any[][];
-
-	/**
-	* Wrapped type `any[][]`.
-	* @see _.object
-	**/
-	object(...keyValuePairs: any[][]): any;
-
-	/**
-	* @see _.object
-	**/
-	object(values?: any): any;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.indexOf
-	**/
-	indexOf(value: T, isSorted?: boolean): number;
-
-	/**
-	* @see _.indexOf
-	**/
-	indexOf(value: T, startFrom: number): number;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.lastIndexOf
-	**/
-	lastIndexOf(value: T, from?: number): number;
-
-	/**
-	* @see _.findIndex
-	**/
-	findIndex<T>(array: _.List<T>, predicate: _.ListIterator<T, boolean>, context?: any): number;
-
-	/**
-	* @see _.findLastIndex
-	**/
-	findLastIndex<T>(array: _.List<T>, predicate: _.ListIterator<T, boolean>, context?: any): number;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.sortedIndex
-	**/
-	sortedIndex(value: T, iterator?: (x: T) => any, context?: any): number;
-
-	/**
-	* Wrapped type `number`.
-	* @see _.range
-	**/
-	range(stop: number, step?: number): number[];
-
-	/**
-	* Wrapped type `number`.
-	* @see _.range
-	**/
-	range(): number[];
-
-	/* ***********
-	 * Functions *
-	************ */
-
-	/**
-	* Wrapped type `Function`.
-	* @see _.bind
-	**/
-	bind(object: any, ...arguments: any[]): Function;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.bindAll
-	**/
-	bindAll(...methodNames: string[]): any;
-
-	/**
-	* Wrapped type `Function`.
-	* @see _.partial
-	**/
-	partial(...arguments: any[]): Function;
-
-	/**
-	* Wrapped type `Function`.
-	* @see _.memoize
-	**/
-	memoize(hashFn?: (n: any) => string): Function;
-
-	/**
-	* Wrapped type `Function`.
-	* @see _.defer
-	**/
-	defer(...arguments: any[]): void;
-
-	/**
-	* Wrapped type `Function`.
-	* @see _.delay
-	**/
-	delay(wait: number, ...arguments: any[]): any;
-
-	/**
-	* @see _.delay
-	**/
-	delay(...arguments: any[]): any;
-
-	/**
-	* Wrapped type `Function`.
-	* @see _.throttle
-	**/
-	throttle(wait: number, options?: _.ThrottleSettings): Function;
-
-	/**
-	* Wrapped type `Function`.
-	* @see _.debounce
-	**/
-	debounce(wait: number, immediate?: boolean): Function;
-
-	/**
-	* Wrapped type `Function`.
-	* @see _.once
-	**/
-	once(): Function;
-
-	/**
-	* Wrapped type `number`.
-	* @see _.after
-	**/
-	after(fn: Function): Function;
-
-	/**
-	* Wrapped type `number`.
-	* @see _.before
-	**/
-	before(fn: Function): Function;
-
-	/**
-	* Wrapped type `Function`.
-	* @see _.wrap
-	**/
-	wrap(wrapper: Function): () => Function;
-
-	/**
-	* Wrapped type `Function`.
-	* @see _.negate
-	**/
-	negate(): boolean;
-
-	/**
-	* Wrapped type `Function[]`.
-	* @see _.compose
-	**/
-	compose(...functions: Function[]): Function;
-
-	/********* *
-	 * Objects *
-	********** */
-
-	/**
-	* Wrapped type `object`.
-	* @see _.keys
-	**/
-	keys(): string[];
-
-    /**
-	* Wrapped type `object`.
-	* @see _.allKeys
-	**/
-    allKeys(): string[];
-
-	/**
-	* Wrapped type `object`.
-	* @see _.values
-	**/
-	values(): T[];
-
-	/**
-	* Wrapped type `object`.
-	* @see _.pairs
-	**/
-	pairs(): any[][];
-
-	/**
-	* Wrapped type `object`.
-	* @see _.invert
-	**/
-	invert(): any;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.functions
-	**/
-	functions(): string[];
-
-	/**
-	* @see _.functions
-	**/
-	methods(): string[];
-
-	/**
-	* Wrapped type `object`.
-	* @see _.extend
-	**/
-	extend(...sources: any[]): any;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.pick
-	**/
-	pick(...keys: any[]): any;
-	pick(keys: any[]): any;
-	pick(fn: (value: any, key: any, object: any) => any): any;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.omit
-	**/
-	omit(...keys: string[]): any;
-	omit(keys: string[]): any;
-	omit(fn: Function): any;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.defaults
-	**/
-	defaults(...defaults: any[]): any;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.clone
-	**/
-	clone(): T;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.tap
-	**/
-	tap(interceptor: (...as: any[]) => any): any;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.has
-	**/
-	has(key: string): boolean;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.matches
-	**/
-	matches<TResult>(): _.ListIterator<T, TResult>;
-
-	/**
-	* Wrapped type `string`.
-	* @see _.property
-	**/
-	property(): (object: Object) => any;
-
-    /**
-	* Wrapped type `object`.
-	* @see _.propertyOf
-	**/
-	propertyOf(): (key: string) => any;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isEqual
-	**/
-	isEqual(other: any): boolean;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isEmpty
-	**/
-	isEmpty(): boolean;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isMatch
-	**/
-	isMatch(): boolean;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isElement
-	**/
-	isElement(): boolean;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isArray
-	**/
-	isArray(): boolean;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isObject
-	**/
-	isObject(): boolean;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isArguments
-	**/
-	isArguments(): boolean;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isFunction
-	**/
-	isFunction(): boolean;
-
-    /**
-	* Wrapped type `object`.
-	* @see _.isError
-	**/
-	isError(): boolean;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isString
-	**/
-	isString(): boolean;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isNumber
-	**/
-	isNumber(): boolean;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isFinite
-	**/
-	isFinite(): boolean;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isBoolean
-	**/
-	isBoolean(): boolean;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isDate
-	**/
-	isDate(): boolean;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isRegExp
-	**/
-	isRegExp(): boolean;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isNaN
-	**/
-	isNaN(): boolean;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isNull
-	**/
-	isNull(): boolean;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isUndefined
-	**/
-	isUndefined(): boolean;
-
-	/********* *
-	 * Utility *
-	********** */
-
-	/**
-	* Wrapped type `any`.
-	* @see _.identity
-	**/
-	identity(): any;
-
-	/**
-	* Wrapped type `any`.
-	* @see _.constant
-	**/
-	constant(): () => T;
-
-	/**
-	* Wrapped type `any`.
-	* @see _.noop
-	**/
-	noop(): void;
-
-	/**
-	* Wrapped type `number`.
-	* @see _.times
-	**/
-	times<TResult>(iterator: (n: number) => TResult, context?: any): TResult[];
-
-	/**
-	* Wrapped type `number`.
-	* @see _.random
-	**/
-	random(): number;
-	/**
-	* Wrapped type `number`.
-	* @see _.random
-	**/
-	random(max: number): number;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.mixin
-	**/
-	mixin(): void;
-
-	/**
-	* Wrapped type `string|Function|Object`.
-	* @see _.iteratee
-	**/
-	iteratee(context?: any, argCount?: number): Function;
-
-	/**
-	* Wrapped type `string`.
-	* @see _.uniqueId
-	**/
-	uniqueId(): string;
-
-	/**
-	* Wrapped type `string`.
-	* @see _.escape
-	**/
-	escape(): string;
-
-	/**
-	* Wrapped type `string`.
-	* @see _.unescape
-	**/
-	unescape(): string;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.result
-	**/
-	result(property: string, defaultValue?:any): any;
-
-	/**
-	* Wrapped type `string`.
-	* @see _.template
-	**/
-	template(settings?: _.TemplateSettings): (...data: any[]) => string;
-
-	/********** *
-	 * Chaining *
-	*********** */
-
-	/**
-	* Wrapped type `any`.
-	* @see _.chain
-	**/
-	chain(): _Chain<T>;
-
-	/**
-	* Wrapped type `any`.
-	* Extracts the value of a wrapped object.
-	* @return Value of the wrapped object.
-	**/
-	value<TResult>(): TResult;
-}
-
-interface _Chain<T> {
-
-	/* *************
-	 * Collections *
-	 ************* */
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.each
-	**/
-	each(iterator: _.ListIterator<T, void>, context?: any): _Chain<T>;
-
-	/**
-	* @see _.each
-	**/
-	each(iterator: _.ObjectIterator<T, void>, context?: any): _Chain<T>;
-
-	/**
-	* @see _.each
-	**/
-	forEach(iterator: _.ListIterator<T, void>, context?: any): _Chain<T>;
-
-	/**
-	* @see _.each
-	**/
-	forEach(iterator: _.ObjectIterator<T, void>, context?: any): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.map
-	**/
-	map<TArray>(iterator: _.ListIterator<T, TArray[]>, context?: any): _ChainOfArrays<TArray>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.map
-	**/
-	map<TResult>(iterator: _.ListIterator<T, TResult>, context?: any): _Chain<TResult>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.map
-	**/
-	map<TArray>(iterator: _.ObjectIterator<T, TArray[]>, context?: any): _ChainOfArrays<TArray>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.map
-	**/
-	map<TResult>(iterator: _.ObjectIterator<T, TResult>, context?: any): _Chain<TResult>;
-
-	/**
-	* @see _.map
-	**/
-	collect<TResult>(iterator: _.ListIterator<T, TResult>, context?: any): _Chain<TResult>;
-
-	/**
-	* @see _.map
-	**/
-	collect<TResult>(iterator: _.ObjectIterator<T, TResult>, context?: any): _Chain<TResult>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.reduce
-	**/
-	reduce<TResult>(iterator: _.MemoIterator<T, TResult>, memo?: TResult, context?: any): _ChainSingle<TResult>;
-
-	/**
-	* @see _.reduce
-	**/
-	inject<TResult>(iterator: _.MemoIterator<T, TResult>, memo?: TResult, context?: any): _ChainSingle<TResult>;
-
-	/**
-	* @see _.reduce
-	**/
-	foldl<TResult>(iterator: _.MemoIterator<T, TResult>, memo?: TResult, context?: any): _ChainSingle<TResult>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.reduceRight
-	**/
-	reduceRight<TResult>(iterator: _.MemoIterator<T, TResult>, memo?: TResult, context?: any): _ChainSingle<TResult>;
-
-	/**
-	* @see _.reduceRight
-	**/
-	foldr<TResult>(iterator: _.MemoIterator<T, TResult>, memo?: TResult, context?: any): _ChainSingle<TResult>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.find
-	**/
-	find<T>(iterator: _.ListIterator<T, boolean>|_.ObjectIterator<T, boolean>, context?: any): _ChainSingle<T>;
-
-	/**
-	* @see _.find
-	**/
-	find<T, U extends {}>(interator: U): _ChainSingle<T>;
-
-	/**
-	* @see _.find
-	**/
-	find<T>(interator: string): _ChainSingle<T>;
-
-	/**
-	* @see _.find
-	**/
-	detect<T>(iterator: _.ListIterator<T, boolean>|_.ObjectIterator<T, boolean>, context?: any): _ChainSingle<T>;
-
-	/**
-	* @see _.find
-	**/
-	detect<T, U extends {}>(interator: U): _ChainSingle<T>;
-
-	/**
-	* @see _.find
-	**/
-	detect<T>(interator: string): _ChainSingle<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.filter
-	**/
-	filter(iterator: _.ListIterator<T, boolean>, context?: any): _Chain<T>;
-
-	/**
-	* @see _.filter
-	**/
-	select(iterator: _.ListIterator<T, boolean>, context?: any): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.where
-	**/
-	where<U extends {}>(properties: U): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.findWhere
-	**/
-	findWhere<U extends {}>(properties: U): _ChainSingle<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.reject
-	**/
-	reject(iterator: _.ListIterator<T, boolean>, context?: any): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.all
-	**/
-	all(iterator?: _.ListIterator<T, boolean>, context?: any): _Chain<T>;
-
-	/**
-	* @see _.all
-	**/
-	every(iterator?: _.ListIterator<T, boolean>, context?: any): _ChainSingle<boolean>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.any
-	**/
-	any(iterator?: _.ListIterator<T, boolean>, context?: any): _ChainSingle<boolean>;
-
-	/**
-	* @see _.any
-	**/
-	some(iterator?: _.ListIterator<T, boolean>, context?: any): _ChainSingle<boolean>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.contains
-	**/
-	contains(value: T): _ChainSingle<boolean>;
-
-	/**
-	* Alias for 'contains'.
-	* @see contains
-	**/
-	include(value: T): _ChainSingle<boolean>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.invoke
-	**/
-	invoke(methodName: string, ...arguments: any[]): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.pluck
-	**/
-	pluck(propertyName: string): _Chain<any>;
-
-	/**
-	* Wrapped type `number[]`.
-	* @see _.max
-	**/
-	max(): _ChainSingle<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.max
-	**/
-	max(iterator: _.ListIterator<T, number>, context?: any): _ChainSingle<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.max
-	**/
-	max(iterator?: _.ListIterator<T, any>, context?: any): _ChainSingle<T>;
-
-	/**
-	* Wrapped type `number[]`.
-	* @see _.min
-	**/
-	min(): _ChainSingle<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.min
-	**/
-	min(iterator: _.ListIterator<T, number>, context?: any): _ChainSingle<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.min
-	**/
-	min(iterator?: _.ListIterator<T, any>, context?: any): _ChainSingle<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.sortBy
-	**/
-	sortBy(iterator?: _.ListIterator<T, any>, context?: any): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.sortBy
-	**/
-	sortBy(iterator: string, context?: any): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.groupBy
-	**/
-	groupBy(iterator?: _.ListIterator<T, any>, context?: any): _ChainOfArrays<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.groupBy
-	**/
-	groupBy(iterator: string, context?: any): _ChainOfArrays<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.indexBy
-	**/
-	indexBy(iterator: _.ListIterator<T, any>, context?: any): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.indexBy
-	**/
-	indexBy(iterator: string, context?: any): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.countBy
-	**/
-	countBy(iterator?: _.ListIterator<T, any>, context?: any): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.countBy
-	**/
-	countBy(iterator: string, context?: any): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.shuffle
-	**/
-	shuffle(): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.sample
-	**/
-	sample<T>(n: number): _Chain<T>;
-
-	/**
-	* @see _.sample
-	**/
-	sample<T>(): _Chain<T>;
-
-	/**
-	* Wrapped type `any`.
-	* @see _.toArray
-	**/
-	toArray(): _Chain<T>;
-
-	/**
-	* Wrapped type `any`.
-	* @see _.size
-	**/
-	size(): _ChainSingle<number>;
-
-	/*********
-	* Arrays *
-	**********/
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.first
-	**/
-	first(): _ChainSingle<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.first
-	**/
-	first(n: number): _Chain<T>;
-
-	/**
-	* @see _.first
-	**/
-	head(): _Chain<T>;
-
-	/**
-	* @see _.first
-	**/
-	head(n: number): _Chain<T>;
-
-	/**
-	* @see _.first
-	**/
-	take(): _Chain<T>;
-
-	/**
-	* @see _.first
-	**/
-	take(n: number): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.initial
-	**/
-	initial(n?: number): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.last
-	**/
-	last(): _ChainSingle<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.last
-	**/
-	last(n: number): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.rest
-	**/
-	rest(n?: number): _Chain<T>;
-
-	/**
-	* @see _.rest
-	**/
-	tail(n?: number): _Chain<T>;
-
-	/**
-	* @see _.rest
-	**/
-	drop(n?: number): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.compact
-	**/
-	compact(): _Chain<T>;
-
-	/**
-	* Wrapped type `any`.
-	* @see _.flatten
-	**/
-	flatten(shallow?: boolean): _Chain<any>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.without
-	**/
-	without(...values: T[]): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.partition
-	**/
-	partition(iterator: _.ListIterator<T, boolean>, context?: any): _Chain<T[]>;
-
-	/**
-	* Wrapped type `any[][]`.
-	* @see _.union
-	**/
-	union(...arrays: _.List<T>[]): _Chain<T>;
-
-	/**
-	* Wrapped type `any[][]`.
-	* @see _.intersection
-	**/
-	intersection(...arrays: _.List<T>[]): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.difference
-	**/
-	difference(...others: _.List<T>[]): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.uniq
-	**/
-	uniq(isSorted?: boolean, iterator?: _.ListIterator<T, any>): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.uniq
-	**/
-	uniq<TSort>(iterator?: _.ListIterator<T, TSort>, context?: any): _Chain<T>;
-
-	/**
-	* @see _.uniq
-	**/
-	unique<TSort>(isSorted?: boolean, iterator?: _.ListIterator<T, TSort>): _Chain<T>;
-
-	/**
-	* @see _.uniq
-	**/
-	unique<TSort>(iterator?: _.ListIterator<T, TSort>, context?: any): _Chain<T>;
-
-	/**
-	* Wrapped type `any[][]`.
-	* @see _.zip
-	**/
-	zip(...arrays: any[][]): _Chain<T>;
-
-    /**
-	* Wrapped type `any[][]`.
-	* @see _.unzip
-	**/
-	unzip(...arrays: any[][]): _Chain<T>;
-
-	/**
-	* Wrapped type `any[][]`.
-	* @see _.object
-	**/
-	object(...keyValuePairs: any[][]): _Chain<T>;
-
-	/**
-	* @see _.object
-	**/
-	object(values?: any): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.indexOf
-	**/
-	indexOf(value: T, isSorted?: boolean): _ChainSingle<T>;
-
-	/**
-	* @see _.indexOf
-	**/
-	indexOf(value: T, startFrom: number): _ChainSingle<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.lastIndexOf
-	**/
-	lastIndexOf(value: T, from?: number): _ChainSingle<T>;
-
-	/**
-	* @see _.findIndex
-	**/
-	findIndex<T>(predicate: _.ListIterator<T, boolean>, context?: any): _Chain<T>;
-
-	/**
-	* @see _.findLastIndex
-	**/
-	findLastIndex<T>(predicate: _.ListIterator<T, boolean>, context?: any): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.sortedIndex
-	**/
-	sortedIndex(value: T, iterator?: (x: T) => any, context?: any): _Chain<T>;
-
-	/**
-	* Wrapped type `number`.
-	* @see _.range
-	**/
-	range(stop: number, step?: number): _Chain<T>;
-
-	/**
-	* Wrapped type `number`.
-	* @see _.range
-	**/
-	range(): _Chain<T>;
-
-	/* ***********
-	 * Functions *
-	************ */
-
-	/**
-	* Wrapped type `Function`.
-	* @see _.bind
-	**/
-	bind(object: any, ...arguments: any[]): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.bindAll
-	**/
-	bindAll(...methodNames: string[]): _Chain<T>;
-
-	/**
-	* Wrapped type `Function`.
-	* @see _.partial
-	**/
-	partial(...arguments: any[]): _Chain<T>;
-
-	/**
-	* Wrapped type `Function`.
-	* @see _.memoize
-	**/
-	memoize(hashFn?: (n: any) => string): _Chain<T>;
-
-	/**
-	* Wrapped type `Function`.
-	* @see _.defer
-	**/
-	defer(...arguments: any[]): _Chain<T>;
-
-	/**
-	* Wrapped type `Function`.
-	* @see _.delay
-	**/
-	delay(wait: number, ...arguments: any[]): _Chain<T>;
-
-	/**
-	* @see _.delay
-	**/
-	delay(...arguments: any[]): _Chain<T>;
-
-	/**
-	* Wrapped type `Function`.
-	* @see _.throttle
-	**/
-	throttle(wait: number, options?: _.ThrottleSettings): _Chain<T>;
-
-	/**
-	* Wrapped type `Function`.
-	* @see _.debounce
-	**/
-	debounce(wait: number, immediate?: boolean): _Chain<T>;
-
-	/**
-	* Wrapped type `Function`.
-	* @see _.once
-	**/
-	once(): _Chain<T>;
-
-	/**
-	* Wrapped type `number`.
-	* @see _.after
-	**/
-	after(func: Function): _Chain<T>;
-
-	/**
-	* Wrapped type `number`.
-	* @see _.before
-	**/
-	before(fn: Function): _Chain<T>;
-
-	/**
-	* Wrapped type `Function`.
-	* @see _.wrap
-	**/
-	wrap(wrapper: Function): () => _Chain<T>;
-
-	/**
-	* Wrapped type `Function`.
-	* @see _.negate
-	**/
-	negate(): _Chain<T>;
-
-	/**
-	* Wrapped type `Function[]`.
-	* @see _.compose
-	**/
-	compose(...functions: Function[]): _Chain<T>;
-
-	/********* *
-	 * Objects *
-	********** */
-
-	/**
-	* Wrapped type `object`.
-	* @see _.keys
-	**/
-	keys(): _Chain<string>;
-
-    /**
-	* Wrapped type `object`.
-	* @see _.allKeys
-	**/
-	allKeys(): _Chain<string>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.values
-	**/
-	values(): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.pairs
-	**/
-	pairs(): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.invert
-	**/
-	invert(): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.functions
-	**/
-	functions(): _Chain<T>;
-
-	/**
-	* @see _.functions
-	**/
-	methods(): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.extend
-	**/
-	extend(...sources: any[]): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.pick
-	**/
-	pick(...keys: any[]): _Chain<T>;
-	pick(keys: any[]): _Chain<T>;
-	pick(fn: (value: any, key: any, object: any) => any): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.omit
-	**/
-	omit(...keys: string[]): _Chain<T>;
-	omit(keys: string[]): _Chain<T>;
-	omit(iteratee: Function): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.defaults
-	**/
-	defaults(...defaults: any[]): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.clone
-	**/
-	clone(): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.tap
-	**/
-	tap(interceptor: (...as: any[]) => any): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.has
-	**/
-	has(key: string): _Chain<T>;
-
-	/**
-	* Wrapped type `any[]`.
-	* @see _.matches
-	**/
-	matches<TResult>(): _Chain<T>;
-
-	/**
-	* Wrapped type `string`.
-	* @see _.property
-	**/
-	property(): _Chain<T>;
-
-    /**
-	* Wrapped type `object`.
-	* @see _.propertyOf
-	**/
-	propertyOf(): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isEqual
-	**/
-	isEqual(other: any): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isEmpty
-	**/
-	isEmpty(): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isMatch
-	**/
-	isMatch(): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isElement
-	**/
-	isElement(): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isArray
-	**/
-	isArray(): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isObject
-	**/
-	isObject(): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isArguments
-	**/
-	isArguments(): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isFunction
-	**/
-	isFunction(): _Chain<T>;
-
-    /**
-	* Wrapped type `object`.
-	* @see _.isError
-	**/
-	isError(): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isString
-	**/
-	isString(): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isNumber
-	**/
-	isNumber(): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isFinite
-	**/
-	isFinite(): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isBoolean
-	**/
-	isBoolean(): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isDate
-	**/
-	isDate(): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isRegExp
-	**/
-	isRegExp(): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isNaN
-	**/
-	isNaN(): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isNull
-	**/
-	isNull(): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.isUndefined
-	**/
-	isUndefined(): _Chain<T>;
-
-	/********* *
-	 * Utility *
-	********** */
-
-	/**
-	* Wrapped type `any`.
-	* @see _.identity
-	**/
-	identity(): _Chain<T>;
-
-	/**
-	* Wrapped type `any`.
-	* @see _.constant
-	**/
-	constant(): _Chain<T>;
-
-	/**
-	* Wrapped type `any`.
-	* @see _.noop
-	**/
-	noop(): _Chain<T>;
-
-	/**
-	* Wrapped type `number`.
-	* @see _.times
-	**/
-	times<TResult>(iterator: (n: number) => TResult, context?: any): _Chain<T>;
-
-	/**
-	* Wrapped type `number`.
-	* @see _.random
-	**/
-	random(): _Chain<T>;
-	/**
-	* Wrapped type `number`.
-	* @see _.random
-	**/
-	random(max: number): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.mixin
-	**/
-	mixin(): _Chain<T>;
-
-	/**
-	* Wrapped type `string|Function|Object`.
-	* @see _.iteratee
-	**/
-	iteratee(context?: any, argCount?: number): _Chain<T>;
-
-	/**
-	* Wrapped type `string`.
-	* @see _.uniqueId
-	**/
-	uniqueId(): _Chain<T>;
-
-	/**
-	* Wrapped type `string`.
-	* @see _.escape
-	**/
-	escape(): _Chain<T>;
-
-	/**
-	* Wrapped type `string`.
-	* @see _.unescape
-	**/
-	unescape(): _Chain<T>;
-
-	/**
-	* Wrapped type `object`.
-	* @see _.result
-	**/
-	result(property: string, defaultValue?:any): _Chain<T>;
-
-	/**
-	* Wrapped type `string`.
-	* @see _.template
-	**/
-	template(settings?: _.TemplateSettings): (...data: any[]) => _Chain<T>;
-
-	/************* *
-	* Array proxy *
-	************** */
-
-	/**
-	* Returns a new array comprised of the array on which it is called
-	* joined with the array(s) and/or value(s) provided as arguments.
-	* @param arr Arrays and/or values to concatenate into a new array. See the discussion below for details.
-	* @return A new array comprised of the array on which it is called
-	**/
-	concat(...arr: Array<T[]>): _Chain<T>;
-
-	/**
-	* Join all elements of an array into a string.
-	* @param separator Optional. Specifies a string to separate each element of the array. The separator is converted to a string if necessary. If omitted, the array elements are separated with a comma.
-	* @return The string conversions of all array elements joined into one string.
-	**/
-	join(separator?: any): _ChainSingle<T>;
-
-	/**
-	* Removes the last element from an array and returns that element.
-	* @return Returns the popped element.
-	**/
-	pop(): _ChainSingle<T>;
-
-	/**
-	* Adds one or more elements to the end of an array and returns the new length of the array.
-	* @param item The elements to add to the end of the array.
-	* @return The array with the element added to the end.
-	**/
-	push(...item: Array<T>): _Chain<T>;
-
-	/**
-	* Reverses an array in place. The first array element becomes the last and the last becomes the first.
-	* @return The reversed array.
-	**/
-	reverse(): _Chain<T>;
-
-	/**
-	* Removes the first element from an array and returns that element. This method changes the length of the array.
-	* @return The shifted element.
-	**/
-	shift(): _ChainSingle<T>;
-
-	/**
-	* Returns a shallow copy of a portion of an array into a new array object.
-	* @param start Zero-based index at which to begin extraction.
-	* @param end Optional. Zero-based index at which to end extraction. slice extracts up to but not including end.
-	* @return A shallow copy of a portion of an array into a new array object.
-	**/
-	slice(start: number, end?: number): _Chain<T>;
-
-	/**
-	* Sorts the elements of an array in place and returns the array. The sort is not necessarily stable. The default sort order is according to string Unicode code points.
-	* @param compareFn Optional. Specifies a function that defines the sort order. If omitted, the array is sorted according to each character's Unicode code point value, according to the string conversion of each element.
-	* @return The sorted array.
-	**/
-	sort(compareFn: (a: T, b: T) => boolean): _Chain<T>;
-
-	/**
-	* Changes the content of an array by removing existing elements and/or adding new elements.
-	* @param index Index at which to start changing the array. If greater than the length of the array, actual starting index will be set to the length of the array. If negative, will begin that many elements from the end.
-	* @param quantity An integer indicating the number of old array elements to remove. If deleteCount is 0, no elements are removed. In this case, you should specify at least one new element. If deleteCount is greater than the number of elements left in the array starting at index, then all of the elements through the end of the array will be deleted.
-	* @param items The element to add to the array. If you don't specify any elements, splice will only remove elements from the array.
-	* @return An array containing the deleted elements. If only one element is removed, an array of one element is returned. If no elements are removed, an empty array is returned.
-	**/
-	splice(index: number, quantity: number, ...items: Array<T>): _Chain<T>;
-
-	/**
-	* A string representing the specified array and its elements.
-	* @return A string representing the specified array and its elements.
-	**/
-	toString(): _ChainSingle<T>;
-
-	/**
-	* Adds one or more elements to the beginning of an array and returns the new length of the array.
-	* @param items The elements to add to the front of the array.
-	* @return The array with the element added to the beginning.
-	**/
-	unshift(...items: Array<T>): _Chain<T>;
-
-	/********** *
-	 * Chaining *
-	*********** */
-
-	/**
-	* Wrapped type `any`.
-	* @see _.chain
-	**/
-	chain(): _Chain<T>;
-
-	/**
-	* Wrapped type `any`.
-	* @see _.value
-	**/
-	value<TResult>(): T[];
-}
-interface _ChainSingle<T> {
-	value(): T;
-}
-interface _ChainOfArrays<T> extends _Chain<T[]> {
-	flatten(): _Chain<T>;
-}
-
-declare var _: UnderscoreStatic;
-
-declare module "underscore" {
-	export = _;
-}
diff --git a/undertaker/index.d.ts b/undertaker/index.d.ts
new file mode 100644
index 0000000000..3c5da5dd99
--- /dev/null
+++ b/undertaker/index.d.ts
@@ -0,0 +1,115 @@
+// Type definitions for undertaker 0.12.0
+// Project: https://github.com/phated/undertaker
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+export interface UndertakerStatic {
+    new (registry?: Registry): Undertaker;
+}
+
+export interface Undertaker {
+    task: TaskMethod;
+    /**
+     * Takes a variable amount of strings (taskName) and/or functions (fn)
+     * and returns a function of the composed tasks or functions.
+     * Any taskNames are retrieved from the registry using the get method.
+     *
+     * When the returned function is executed, the tasks or functions will be executed in series,
+     * each waiting for the prior to finish. If an error occurs, execution will stop.
+     * @param task
+     */
+    series(...tasks: (string | Task)[]): Task;
+    /**
+     * Takes a variable amount of strings (taskName) and/or functions (fn)
+     * and returns a function of the composed tasks or functions.
+     * Any taskNames are retrieved from the registry using the get method.
+     *
+     * When the returned function is executed, the tasks or functions will be executed in parallel,
+     * all being executed at the same time. If an error occurs, all execution will complete.
+     * @param tasks
+     */
+    parallel(...tasks: (string | Task)[]): Task;
+    /**
+     * Returns the current registry object.
+     */
+    registry(): Registry;
+    /**
+     * The tasks from the current registry will be transferred to it
+     * and the current registry will be replaced with the new registry.
+     * @param registry
+     */
+    registry(registry: Registry): void;
+    /**
+     * Optionally takes an object (options) and returns an object representing the tree of registered tasks.
+     * @param options
+     */
+    tree(options?: { deep?: boolean }): Node[] | string[];
+    /**
+     * Takes a string or function (task) and returns a timestamp of the last time the task was run successfully.
+     * The time will be the time the task started.  Returns undefined if the task has not been run.
+     * @param task
+     * @param timeResolution
+     */
+    lastRun(task: string, timeResolution?: number): number;
+}
+
+export interface Task {
+    (cb?: Function): any;
+}
+
+export interface TaskMethod {
+    /**
+     * Returns the registered function.
+     * @param taskName
+     */
+    (taskName: string): Task;
+    /**
+     * Register the task by the taskName.
+     * @param taskName
+     * @param fn
+     */
+    (taskName: string, fn: Task): void;
+    /**
+     * Register the task by the name property of the function.
+     * @param fn
+     */
+    (fn: Task): void;
+    /**
+     * Register the task by the displayName property of the function.
+     * @param fn
+     */
+    (fn: Task & { displayName: string }): void;
+}
+
+export interface Registry {
+    /**
+     * receives the undertaker instance to set pre-defined tasks using the task(taskName, fn) method.
+     * @param taker
+     */
+    init(taker: Undertaker): void;
+    /**
+     * returns the task with that name or undefined if no task is registered with that name.
+     * @param taskName
+     */
+    get(taskName: string): Task;
+    /**
+     * add task to the registry. If set modifies a task, it should return the new task.
+     * @param taskName
+     * @param fn
+     */
+    set(taskName: string, fn: Task): void;
+    /**
+     * returns an object listing all tasks in the registry.
+     */
+    tasks(): { [taskName: string]: Task };
+}
+
+export interface Node {
+    label: string;
+    type: string;
+    nodes: Node[];
+}
+
+export default UndertakerStatic;
diff --git a/undertaker/tsconfig.json b/undertaker/tsconfig.json
new file mode 100644
index 0000000000..d07ac0bfd9
--- /dev/null
+++ b/undertaker/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "undertaker-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/undertaker/undertaker-tests.ts b/undertaker/undertaker-tests.ts
index 13e4e766d7..c8dc8dd4f5 100644
--- a/undertaker/undertaker-tests.ts
+++ b/undertaker/undertaker-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="undertaker.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 var fs = require('fs');
 var Undertaker = require('undertaker');
diff --git a/undertaker/undertaker.d.ts b/undertaker/undertaker.d.ts
deleted file mode 100644
index 7bffe57823..0000000000
--- a/undertaker/undertaker.d.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-// Type definitions for undertaker 0.12.0
-// Project: https://github.com/phated/undertaker
-// Definitions by: Qubo <https://github.com/tkqubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "undertaker" {
-
-    export interface UndertakerStatic {
-        new(registry?: Registry): Undertaker;
-    }
-
-    export interface Undertaker {
-        task: TaskMethod;
-        /**
-         * Takes a variable amount of strings (taskName) and/or functions (fn)
-         * and returns a function of the composed tasks or functions.
-         * Any taskNames are retrieved from the registry using the get method.
-         *
-         * When the returned function is executed, the tasks or functions will be executed in series,
-         * each waiting for the prior to finish. If an error occurs, execution will stop.
-         * @param task
-         */
-        series(...tasks: (string|Task)[]): Task;
-        /**
-         * Takes a variable amount of strings (taskName) and/or functions (fn)
-         * and returns a function of the composed tasks or functions.
-         * Any taskNames are retrieved from the registry using the get method.
-         *
-         * When the returned function is executed, the tasks or functions will be executed in parallel,
-         * all being executed at the same time. If an error occurs, all execution will complete.
-         * @param tasks
-         */
-        parallel(...tasks: (string|Task)[]): Task;
-        /**
-         * Returns the current registry object.
-         */
-        registry(): Registry;
-        /**
-         * The tasks from the current registry will be transferred to it
-         * and the current registry will be replaced with the new registry.
-         * @param registry
-         */
-        registry(registry: Registry): void;
-        /**
-         * Optionally takes an object (options) and returns an object representing the tree of registered tasks.
-         * @param options
-         */
-        tree(options?: { deep?: boolean }): Node[]|string[];
-        /**
-         * Takes a string or function (task) and returns a timestamp of the last time the task was run successfully.
-         * The time will be the time the task started.  Returns undefined if the task has not been run.
-         * @param task
-         * @param timeResolution
-         */
-        lastRun(task: string, timeResolution?: number): number;
-    }
-
-    export interface Task {
-        (cb?: Function): any;
-    }
-
-    export interface TaskMethod {
-        /**
-         * Returns the registered function.
-         * @param taskName
-         */
-        (taskName: string): Task;
-        /**
-         * Register the task by the taskName.
-         * @param taskName
-         * @param fn
-         */
-        (taskName: string, fn: Task): void;
-        /**
-         * Register the task by the name property of the function.
-         * @param fn
-         */
-        (fn: Task): void;
-        /**
-         * Register the task by the displayName property of the function.
-         * @param fn
-         */
-        (fn: Task & { displayName: string }): void;
-    }
-
-    export interface Registry {
-        /**
-         * receives the undertaker instance to set pre-defined tasks using the task(taskName, fn) method.
-         * @param taker
-         */
-        init(taker: Undertaker): void;
-        /**
-         * returns the task with that name or undefined if no task is registered with that name.
-         * @param taskName
-         */
-        get(taskName: string): Task;
-        /**
-         * add task to the registry. If set modifies a task, it should return the new task.
-         * @param taskName
-         * @param fn
-         */
-        set(taskName: string, fn: Task): void;
-        /**
-         * returns an object listing all tasks in the registry.
-         */
-        tasks(): { [taskName: string]: Task };
-    }
-
-    export interface Node {
-        label: string;
-        type: string;
-        nodes: Node[];
-    }
-
-    export default UndertakerStatic;
-}
-
diff --git a/uniq/uniq.d.ts b/uniq/index.d.ts
similarity index 100%
rename from uniq/uniq.d.ts
rename to uniq/index.d.ts
diff --git a/uniq/tsconfig.json b/uniq/tsconfig.json
new file mode 100644
index 0000000000..eeb1aee4ce
--- /dev/null
+++ b/uniq/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "uniq-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/uniq/uniq-tests.ts b/uniq/uniq-tests.ts
index 1dc3d6fd81..6efb74599e 100644
--- a/uniq/uniq-tests.ts
+++ b/uniq/uniq-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./uniq.d.ts" />
+
 
 import unique = require("uniq");
 var data = [1, 2, 2, 3, 4, 5, 5, 5, 6];
diff --git a/unique-random/index.d.ts b/unique-random/index.d.ts
new file mode 100644
index 0000000000..eb07d386b0
--- /dev/null
+++ b/unique-random/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for unique-random
+// Project: https://github.com/sindresorhus/unique-random
+// Definitions by: Yuki Kokubun <https://github.com/Kuniwak>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function uniqueRandom(min: number, max: number): () => number;
+
+export = uniqueRandom;
diff --git a/unique-random/tsconfig.json b/unique-random/tsconfig.json
new file mode 100644
index 0000000000..233f85f6e3
--- /dev/null
+++ b/unique-random/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "unique-random-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/unique-random/unique-random-tests.ts b/unique-random/unique-random-tests.ts
index 428d1c77ee..5029dc0358 100644
--- a/unique-random/unique-random-tests.ts
+++ b/unique-random/unique-random-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./unique-random.d.ts" />
 
 import uniqueRandom = require("unique-random");
 const rand = uniqueRandom(1, 10);
diff --git a/unique-random/unique-random.d.ts b/unique-random/unique-random.d.ts
deleted file mode 100644
index 8daab03b2b..0000000000
--- a/unique-random/unique-random.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Type definitions for unique-random
-// Project: https://github.com/sindresorhus/unique-random
-// Definitions by: Yuki Kokubun <https://github.com/Kuniwak>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "unique-random" {
-  function uniqueRandom(min: number, max: number): () => number;
-
-  export = uniqueRandom;
-}
diff --git a/unity-webapi/index.d.ts b/unity-webapi/index.d.ts
new file mode 100644
index 0000000000..9829d932d2
--- /dev/null
+++ b/unity-webapi/index.d.ts
@@ -0,0 +1,100 @@
+// Type definitions for Ubuntu Unity Web API 1.0
+// Project: https://launchpad.net/libunity-webapps
+// Definitions by: John Vrbanac <https://github.com/jmvrbanac>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface External {
+   getUnityObject(version: number): Unity;
+}
+
+declare class UnitySettings {
+   public name: string;
+   public iconUrl: string;
+   public onInit: Function;
+}
+
+declare enum UnityPlaybackState {
+   Playing,
+   Paused
+}
+
+declare class UnityTrackMetadata {
+   title: string;
+
+   // Optionals
+   album: string;
+   artist: string;
+   artLocation: string;
+}
+
+interface UnityMediaPlayer {
+   setTrack(trackMetadata: UnityTrackMetadata): any;
+
+   onPrevious(onPreviousCallback: Function): any;
+   onNext(onNextCallback: Function): any;
+   onPlayPause(onPlayPauseCallback: Function): any;
+
+   getPlaybackstate(response: Function): any;
+   setPlaybackstate(state: UnityPlaybackState): any;
+
+   setCanGoNext(cangonext: boolean): any;
+   setCanGoPrev(cangoprev: boolean): any;
+   setCanPlay(canplay: boolean): any;
+   setCanPause(canpause: boolean): any;
+}
+
+interface UnityNotification {
+   showNotification(summary: string, body: string, iconUrl?: string): any;
+}
+
+declare class UnityIndicatorProperties {
+   public count: number;
+   public time: Date;
+   public iconURI: string;
+   public onIndicatorActivated: Function;
+}
+
+interface UnityMessagingIndicator {
+   showIndicator(name: string, indicatorProperties: UnityIndicatorProperties): any;
+   clearIndicator(name: string): any;
+   clearIndicators(): any;
+
+   addAction(name: string, onActionInvoked: Function): any;
+   removeAction(name: string): any;
+   removeActions(): any;
+   onPresenceChanged(onPresenceChanged: Function): any;
+
+   // This is suppose to be readonly, but i'm not sure how to do this
+   // in a definition file.
+   presence: string;
+}
+
+interface UnityLauncher {
+   setCount(count: number): any;
+   clearCount(): any;
+
+   setProgress(progress: number): any;
+   clearProgress(): any;
+
+   setUrgent(urgent: boolean): any;
+
+   addAction(name: string, onActionInvoked: Function): any;
+   removeAction(name: string): any;
+   removeActions(): any;
+}
+
+interface Unity {
+   init(settings: UnitySettings): any;
+   addAction(name: string, callback: Function): any;
+   removeAction(actionName: string): any;
+   removeActions(): any;
+
+   Notification: UnityNotification;
+   MediaPlayer: UnityMediaPlayer;
+   MessagingIndicator: UnityMessagingIndicator;
+   Launcher: UnityLauncher;
+}
+
+interface BrowserPublic {
+   getUnityObject(version: number): Unity;
+}
diff --git a/unity-webapi/tsconfig.json b/unity-webapi/tsconfig.json
new file mode 100644
index 0000000000..2e4c3228f0
--- /dev/null
+++ b/unity-webapi/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "unity-webapi-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/unity-webapi/unity-webapi-tests.ts b/unity-webapi/unity-webapi-tests.ts
index 15703e2c96..98c26e6628 100644
--- a/unity-webapi/unity-webapi-tests.ts
+++ b/unity-webapi/unity-webapi-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="unity-webapi.d.ts" />
+
 
 var Unity = external.getUnityObject(1.0);
 var settings = new UnitySettings();
diff --git a/unity-webapi/unity-webapi-tests.ts.tscparams b/unity-webapi/unity-webapi-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/unity-webapi/unity-webapi-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/unity-webapi/unity-webapi.d.ts b/unity-webapi/unity-webapi.d.ts
deleted file mode 100644
index 54b0ab4eec..0000000000
--- a/unity-webapi/unity-webapi.d.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-// Type definitions for Ubuntu Unity Web API 1.0
-// Project: https://launchpad.net/libunity-webapps
-// Definitions by: John Vrbanac <https://github.com/jmvrbanac>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface External {
-	getUnityObject(version:number):Unity;
-}
-
-declare class UnitySettings {
-   public name:String;
-   public iconUrl:String;
-   public onInit:Function;
-}
-
-declare enum UnityPlaybackState {
-   Playing,
-   Paused
-}
-
-declare class UnityTrackMetadata {
-   title:String;
-
-   // Optionals
-   album:String;
-   artist:String;
-   artLocation:String;
-}
-
-interface UnityMediaPlayer {
-   setTrack(trackMetadata:UnityTrackMetadata);
-
-   onPrevious(onPreviousCallback:Function);
-   onNext(onNextCallback:Function);
-   onPlayPause(onPlayPauseCallback:Function);
-
-   getPlaybackstate(response:Function);
-   setPlaybackstate(state:UnityPlaybackState);
-
-   setCanGoNext(cangonext:Boolean);
-   setCanGoPrev(cangoprev:Boolean);
-   setCanPlay(canplay:Boolean);
-   setCanPause(canpause:Boolean);
-}
-
-interface UnityNotification {
-   showNotification (summary:String, body:String, iconUrl?:String);
-}
-
-declare class UnityIndicatorProperties {
-   public count:Number;
-   public time:Date;
-   public iconURI:String;
-   public onIndicatorActivated:Function;
-}
-
-interface UnityMessagingIndicator {
-   showIndicator(name:String, indicatorProperties:UnityIndicatorProperties);
-   clearIndicator(name:String);
-   clearIndicators();
-
-   addAction(name:String, onActionInvoked:Function);
-   removeAction(name:String);
-   removeActions();
-   onPresenceChanged(onPresenceChanged:Function);
-
-   // This is suppose to be readonly, but i'm not sure how to do this
-   // in a definition file.
-   presence:String;
-}
-
- interface UnityLauncher {
-   setCount(count:number);
-   clearCount();
-
-   setProgress(progress:number);
-   clearProgress();
-
-   setUrgent(urgent:Boolean);
-
-   addAction(name:String, onActionInvoked:Function);
-   removeAction(name:String);
-   removeActions();
-}
-
-interface Unity {
-	init(settings:UnitySettings);
-	addAction(name:String, callback:Function);
-	removeAction(actionName:String);
-   	removeActions();
-
-	Notification:UnityNotification;
-	MediaPlayer:UnityMediaPlayer;
-	MessagingIndicator:UnityMessagingIndicator;
-	Launcher:UnityLauncher;
-}
-
-interface BrowserPublic {
-	getUnityObject(version:number):Unity;
-}
diff --git a/unity-webapi/unity-webapi.d.ts.tscparams b/unity-webapi/unity-webapi.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/unity-webapi/unity-webapi.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/universal-analytics/index.d.ts b/universal-analytics/index.d.ts
new file mode 100644
index 0000000000..3642d1558d
--- /dev/null
+++ b/universal-analytics/index.d.ts
@@ -0,0 +1,92 @@
+// Type definitions for universal-analytics v0.3.2
+// Project: https://github.com/peaksandpies/universal-analytics
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface UniversalAnalytics {
+    (accountID:string, uuid?:string, opts?:Object):UniversalAnalytics.Client;
+}
+
+export = UniversalAnalytics;
+
+declare namespace UniversalAnalytics {
+
+    interface Client {
+        debug():UniversalAnalytics.Client;
+
+        send():void;
+
+        pageview(path:string):Client;
+        pageview(path:string, callback?:(err:any) => void):void;
+        pageview(params:Object):Client;
+        pageview(params:Object, callback?:(err:any) => void):void;
+        pageview(path:string, hostname:string):Client;
+        pageview(path:string, hostname:string, callback?:(err:any) => void):void;
+        pageview(path:string, title:string, hostname:string):Client;
+        pageview(path:string, title:string, hostname:string, callback?:(err:any) => void):void;
+
+
+        event(category:string, action:string):Client;
+        event(category:string, action:string, callback?:(err:any) => void):void;
+        event(category:string, action:string, label:string):Client;
+        event(category:string, action:string, label:string, callback?:(err:any) => void):void;
+        event(category:string, action:string, label:string, value:any):Client;
+        event(category:string, action:string, label:string, value:any, callback?:(err:any) => void):void;
+        event(category:string, action:string, label:string, value:any, params:Object, callback?:(err:any) => void):void;
+        event(params:Object):Client;
+        event(params:Object, callback:(err:any) => void):void;
+
+
+        transaction(id:string):Client;
+        transaction(id:string, callback:(err:any) => void):void;
+        transaction(id:string, revenue:number):Client;
+        transaction(id:string, revenue:number, callback:(err:any) => void):void;
+        transaction(id:string, revenue:number, shipping:number):Client;
+        transaction(id:string, revenue:number, shipping:number, callback:(err:any) => void):void;
+        transaction(id:string, revenue:number, shipping:number, taxping:number):Client;
+        transaction(id:string, revenue:number, shipping:number, taxping:number, callback:(err:any) => void):void;
+        transaction(id:string, revenue:number, shipping:number, taxping:number, affiliation:string):Client;
+        transaction(id:string, revenue:number, shipping:number, taxping:number, affiliation:string, callback:(err:any) => void):void;
+        transaction(params:Object):Client;
+        transaction(params:Object, callback:(err:any) => void):void;
+
+
+        item(price:number):Client;
+        item(price:number, callback:(err:any) => void):void;
+        item(price:number, quantity:number):Client;
+        item(price:number, quantity:number, callback:(err:any) => void):void;
+        item(price:number, quantity:number, sku:number):Client;
+        item(price:number, quantity:number, sku:number, callback:(err:any) => void):void;
+        item(price:number, quantity:number, sku:number, name:string):Client;
+        item(price:number, quantity:number, sku:number, name:string, callback:(err:any) => void):void;
+        item(price:number, quantity:number, sku:number, name:string, variation:string):Client;
+        item(price:number, quantity:number, sku:number, name:string, variation:string, callback:(err:any) => void):void;
+        item(price:number, quantity:number, sku:number, name:string, variation:string, params:Object):Client;
+        item(price:number, quantity:number, sku:number, name:string, variation:string, params:Object, callback:(err:any) => void):void;
+        item(params:Object):Client;
+        item(params:Object, callback:(err:any) => void):void;
+
+
+        exception(description:string):Client;
+        exception(description:string, callback:(err:any) => void):void;
+        exception(description:string, fatal:boolean):Client;
+        exception(description:string, fatal:boolean, callback:(err:any) => void):void;
+        exception(params:Object):Client;
+        exception(params:Object, callback:(err:any) => void):void;
+
+
+        timing(category:string):Client;
+        timing(category:string, callback:(err:any) => void):void;
+        timing(category:string, variable:string):Client;
+        timing(category:string, variable:string, callback:(err:any) => void):void;
+        timing(category:string, variable:string, time:number):Client;
+        timing(category:string, variable:string, time:number, callback:(err:any) => void):void;
+        timing(category:string, variable:string, time:number, label:string):Client;
+        timing(category:string, variable:string, time:number, label:string, callback:(err:any) => void):void;
+        timing(params:Object):Client;
+        timing(params:Object, callback:(err:any) => void):void;
+
+
+        middleware(accountID:string, options?:any):any;
+    }
+}
diff --git a/universal-analytics/tsconfig.json b/universal-analytics/tsconfig.json
new file mode 100644
index 0000000000..2e6659f6c8
--- /dev/null
+++ b/universal-analytics/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "universal-analytics-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/universal-analytics/universal-analytics-tests.ts b/universal-analytics/universal-analytics-tests.ts
index 90b68d6a27..1f37e27a66 100644
--- a/universal-analytics/universal-analytics-tests.ts
+++ b/universal-analytics/universal-analytics-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="universal-analytics.d.ts" />
+import UniversalAnalytics = require("universal-analytics");
 
 var ui:UniversalAnalytics;
 
diff --git a/universal-analytics/universal-analytics.d.ts b/universal-analytics/universal-analytics.d.ts
deleted file mode 100644
index f1e1490121..0000000000
--- a/universal-analytics/universal-analytics.d.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-// Type definitions for universal-analytics v0.3.2
-// Project: https://github.com/peaksandpies/universal-analytics
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface UniversalAnalytics {
-    (accountID:string, uuid?:string, opts?:Object):UniversalAnalytics.Client;
-}
-
-declare namespace UniversalAnalytics {
-
-    interface Client {
-        debug():UniversalAnalytics.Client;
-
-        send():void;
-
-        pageview(path:string):Client;
-        pageview(path:string, callback?:(err:any) => void):void;
-        pageview(params:Object):Client;
-        pageview(params:Object, callback?:(err:any) => void):void;
-        pageview(path:string, hostname:string):Client;
-        pageview(path:string, hostname:string, callback?:(err:any) => void):void;
-        pageview(path:string, title:string, hostname:string):Client;
-        pageview(path:string, title:string, hostname:string, callback?:(err:any) => void):void;
-
-
-        event(category:string, action:string):Client;
-        event(category:string, action:string, callback?:(err:any) => void):void;
-        event(category:string, action:string, label:string):Client;
-        event(category:string, action:string, label:string, callback?:(err:any) => void):void;
-        event(category:string, action:string, label:string, value:any):Client;
-        event(category:string, action:string, label:string, value:any, callback?:(err:any) => void):void;
-        event(category:string, action:string, label:string, value:any, params:Object, callback?:(err:any) => void):void;
-        event(params:Object):Client;
-        event(params:Object, callback:(err:any) => void):void;
-
-
-        transaction(id:string):Client;
-        transaction(id:string, callback:(err:any) => void):void;
-        transaction(id:string, revenue:number):Client;
-        transaction(id:string, revenue:number, callback:(err:any) => void):void;
-        transaction(id:string, revenue:number, shipping:number):Client;
-        transaction(id:string, revenue:number, shipping:number, callback:(err:any) => void):void;
-        transaction(id:string, revenue:number, shipping:number, taxping:number):Client;
-        transaction(id:string, revenue:number, shipping:number, taxping:number, callback:(err:any) => void):void;
-        transaction(id:string, revenue:number, shipping:number, taxping:number, affiliation:string):Client;
-        transaction(id:string, revenue:number, shipping:number, taxping:number, affiliation:string, callback:(err:any) => void):void;
-        transaction(params:Object):Client;
-        transaction(params:Object, callback:(err:any) => void):void;
-
-
-        item(price:number):Client;
-        item(price:number, callback:(err:any) => void):void;
-        item(price:number, quantity:number):Client;
-        item(price:number, quantity:number, callback:(err:any) => void):void;
-        item(price:number, quantity:number, sku:number):Client;
-        item(price:number, quantity:number, sku:number, callback:(err:any) => void):void;
-        item(price:number, quantity:number, sku:number, name:string):Client;
-        item(price:number, quantity:number, sku:number, name:string, callback:(err:any) => void):void;
-        item(price:number, quantity:number, sku:number, name:string, variation:string):Client;
-        item(price:number, quantity:number, sku:number, name:string, variation:string, callback:(err:any) => void):void;
-        item(price:number, quantity:number, sku:number, name:string, variation:string, params:Object):Client;
-        item(price:number, quantity:number, sku:number, name:string, variation:string, params:Object, callback:(err:any) => void):void;
-        item(params:Object):Client;
-        item(params:Object, callback:(err:any) => void):void;
-
-
-        exception(description:string):Client;
-        exception(description:string, callback:(err:any) => void):void;
-        exception(description:string, fatal:boolean):Client;
-        exception(description:string, fatal:boolean, callback:(err:any) => void):void;
-        exception(params:Object):Client;
-        exception(params:Object, callback:(err:any) => void):void;
-
-
-        timing(category:string):Client;
-        timing(category:string, callback:(err:any) => void):void;
-        timing(category:string, variable:string):Client;
-        timing(category:string, variable:string, callback:(err:any) => void):void;
-        timing(category:string, variable:string, time:number):Client;
-        timing(category:string, variable:string, time:number, callback:(err:any) => void):void;
-        timing(category:string, variable:string, time:number, label:string):Client;
-        timing(category:string, variable:string, time:number, label:string, callback:(err:any) => void):void;
-        timing(params:Object):Client;
-        timing(params:Object, callback:(err:any) => void):void;
-
-
-        middleware(accountID:string, options?:any):any;
-    }
-}
-
-declare module 'universal-analytics' {
-export = UniversalAnalytics;
-}
diff --git a/unorm/index.d.ts b/unorm/index.d.ts
new file mode 100644
index 0000000000..a4fbde61c6
--- /dev/null
+++ b/unorm/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for unorm 1.3.3
+// Project: https://github.com/walling/unorm
+// Definitions by: Christopher Brown <https://github.com/chbrown>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare var unorm: unorm.Static;
+export = unorm;
+export as namespace unorm;
+
+declare namespace unorm {
+  interface Static {
+    nfd(str: string): string;
+    nfkd(str: string): string;
+    nfc(str: string): string;
+    nfkc(str: string): string;
+  }
+}
\ No newline at end of file
diff --git a/unorm/tsconfig.json b/unorm/tsconfig.json
new file mode 100644
index 0000000000..5c6f7678de
--- /dev/null
+++ b/unorm/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "unorm-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/unorm/unorm-tests.ts b/unorm/unorm-tests.ts
index 6d2ba030dc..6cf98392a1 100644
--- a/unorm/unorm-tests.ts
+++ b/unorm/unorm-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="unorm.d.ts" />
+
 import unorm = require("unorm");
 
 function listNormalizations(raw: string) {
diff --git a/unorm/unorm.d.ts b/unorm/unorm.d.ts
deleted file mode 100644
index cd9a9a6a06..0000000000
--- a/unorm/unorm.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Type definitions for unorm 1.3.3
-// Project: https://github.com/walling/unorm
-// Definitions by: Christopher Brown <https://github.com/chbrown>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace unorm {
-  interface Static {
-    nfd(str: string): string;
-    nfkd(str: string): string;
-    nfc(str: string): string;
-    nfkc(str: string): string;
-  }
-}
-
-declare var unorm: unorm.Static;
-
-declare module "unorm" {
-  export = unorm;
-}
diff --git a/update-notifier/index.d.ts b/update-notifier/index.d.ts
new file mode 100644
index 0000000000..9818b3aeab
--- /dev/null
+++ b/update-notifier/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for update-notifier
+// Project: https://github.com/yeoman/update-notifier
+// Definitions by: vvakame <https://github.com/vvakame>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function t(settings?: t.ISettings): t.IResult;
+
+declare namespace t {
+
+    export interface IResult {
+        update: IUpdateInfo;
+        notify(message?: string): void;
+    }
+
+    export interface ISettings {
+        callback?: (error: any, update?: IUpdateInfo) => any; // default null
+        packagePath?: string; // default 'package.json'
+        packageName?: string; // default Inferred from packageFile
+        packageVersion?: string; // default Inferred from packageFile
+        updateCheckInterval?: number; // default 1000 * 60 * 60 * 24 (1 day)
+        updateCheckTimeout?: number; // default 20000 (20 secs)
+        registryUrl?: string; // default 'http://registry.npmjs.org/%s'
+    }
+
+    export interface IUpdateInfo {
+        latest: string;
+        current: string;
+        type: string;
+        date: string;
+        name: string;
+    }
+}
+
+export = t;
diff --git a/update-notifier/tsconfig.json b/update-notifier/tsconfig.json
new file mode 100644
index 0000000000..12f347ce48
--- /dev/null
+++ b/update-notifier/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "update-notifier-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/update-notifier/update-notifier-tests.ts b/update-notifier/update-notifier-tests.ts
index 58fdbd623e..585f2c421e 100644
--- a/update-notifier/update-notifier-tests.ts
+++ b/update-notifier/update-notifier-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./update-notifier.d.ts" />
 
 import updateNotifier = require('update-notifier');
 
diff --git a/update-notifier/update-notifier.d.ts b/update-notifier/update-notifier.d.ts
deleted file mode 100644
index bc3d296a06..0000000000
--- a/update-notifier/update-notifier.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Type definitions for update-notifier
-// Project: https://github.com/yeoman/update-notifier
-// Definitions by: vvakame <https://github.com/vvakame>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "update-notifier" {
-	function t(settings?:t.ISettings):t.IResult;
-
-	namespace t {
-
-		export interface IResult {
-			update: IUpdateInfo;
-			notify(message?:string):void;
-		}
-
-		export interface ISettings {
-			callback?:(error:any, update?:IUpdateInfo)=>any; // default null
-			packagePath?:string; // default 'package.json'
-			packageName?:string; // default Inferred from packageFile
-			packageVersion?:string; // default Inferred from packageFile
-			updateCheckInterval?:number; // default 1000 * 60 * 60 * 24 (1 day)
-			updateCheckTimeout?:number; // default 20000 (20 secs)
-			registryUrl?:string; // default 'http://registry.npmjs.org/%s'
-		}
-
-		export interface IUpdateInfo {
-			latest:string;
-			current:string;
-			type:string;
-			date:string;
-			name:string;
-		}
-	}
-
-	export = t;
-}
diff --git a/upper-case-first/index.d.ts b/upper-case-first/index.d.ts
new file mode 100644
index 0000000000..7d714974ef
--- /dev/null
+++ b/upper-case-first/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for upper-case-first
+// Project: https://github.com/blakeembrey/upper-case-first 
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens> 
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function upperCaseFirst(string: string): string;
+export = upperCaseFirst;
diff --git a/upper-case-first/tsconfig.json b/upper-case-first/tsconfig.json
new file mode 100644
index 0000000000..37189fdf62
--- /dev/null
+++ b/upper-case-first/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "upper-case-first-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/upper-case-first/upper-case-first-tests.ts b/upper-case-first/upper-case-first-tests.ts
index 2ca02dd74d..1e477b5378 100644
--- a/upper-case-first/upper-case-first-tests.ts
+++ b/upper-case-first/upper-case-first-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="upper-case-first.d.ts" />
 
 import upperCaseFirst = require('upper-case-first');
 
diff --git a/upper-case-first/upper-case-first.d.ts b/upper-case-first/upper-case-first.d.ts
deleted file mode 100644
index 9d8e9358b7..0000000000
--- a/upper-case-first/upper-case-first.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for upper-case-first
-// Project: https://github.com/blakeembrey/upper-case-first 
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens> 
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "upper-case-first" {
-	function upperCaseFirst(string: string): string;
-	export = upperCaseFirst;
-}
diff --git a/upper-case/index.d.ts b/upper-case/index.d.ts
new file mode 100644
index 0000000000..4568ae2b27
--- /dev/null
+++ b/upper-case/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for upper-case
+// Project: https://github.com/blakeembrey/upper-case 
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens> 
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function upperCase(string: any, locale?: string): string;
+export = upperCase;
diff --git a/upper-case/tsconfig.json b/upper-case/tsconfig.json
new file mode 100644
index 0000000000..bfc98f6c6e
--- /dev/null
+++ b/upper-case/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "upper-case-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/upper-case/upper-case-tests.ts b/upper-case/upper-case-tests.ts
index a7128bdf6d..124b138835 100644
--- a/upper-case/upper-case-tests.ts
+++ b/upper-case/upper-case-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="upper-case.d.ts" />
 
 import upperCase = require('upper-case');
 
diff --git a/upper-case/upper-case.d.ts b/upper-case/upper-case.d.ts
deleted file mode 100644
index 33ca4038c4..0000000000
--- a/upper-case/upper-case.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for upper-case
-// Project: https://github.com/blakeembrey/upper-case 
-// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens> 
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "upper-case" {
-	function upperCase(string: any, locale?: string): string;
-	export = upperCase;
-}
diff --git a/urbanairship-cordova/urbanairship-cordova.d.ts b/urbanairship-cordova/index.d.ts
similarity index 100%
rename from urbanairship-cordova/urbanairship-cordova.d.ts
rename to urbanairship-cordova/index.d.ts
diff --git a/urbanairship-cordova/tsconfig.json b/urbanairship-cordova/tsconfig.json
new file mode 100644
index 0000000000..bb683b57c2
--- /dev/null
+++ b/urbanairship-cordova/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "urbanairship-cordova-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/urbanairship-cordova/urbanairship-cordova-tests.ts b/urbanairship-cordova/urbanairship-cordova-tests.ts
index b8665be43b..c117770612 100644
--- a/urbanairship-cordova/urbanairship-cordova-tests.ts
+++ b/urbanairship-cordova/urbanairship-cordova-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="urbanairship-cordova.d.ts" />
+
 
 //#region Basic Example taken from http://docs.urbanairship.com/platform/phonegap.html#actions
 
diff --git a/uri-templates/index.d.ts b/uri-templates/index.d.ts
new file mode 100644
index 0000000000..ad8cead946
--- /dev/null
+++ b/uri-templates/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for uri-templates 0.1.2
+// Project: https://github.com/geraintluff/uri-templates
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function utpl(template: string): utpl.URITemplate;
+
+declare namespace utpl {
+    export interface URITemplate {
+        fillFromObject(vars: Object): string;
+        fill(callback: (varName: string) => string): string;
+        fromUri(uri: string): Object;
+    }
+}
+
+export = utpl;
diff --git a/uri-templates/tsconfig.json b/uri-templates/tsconfig.json
new file mode 100644
index 0000000000..183c280ad4
--- /dev/null
+++ b/uri-templates/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "uri-templates-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/uri-templates/uri-templates-tests.ts b/uri-templates/uri-templates-tests.ts
index 4809b7883a..0aeb5e0bfe 100644
--- a/uri-templates/uri-templates-tests.ts
+++ b/uri-templates/uri-templates-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="uri-templates.d.ts" />
 
 import utmpl = require('uri-templates');
 import URITemplate = utmpl.URITemplate;
diff --git a/uri-templates/uri-templates.d.ts b/uri-templates/uri-templates.d.ts
deleted file mode 100644
index b338d18bbb..0000000000
--- a/uri-templates/uri-templates.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Type definitions for uri-templates 0.1.2
-// Project: https://github.com/geraintluff/uri-templates
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'uri-templates' {
-	function utpl(template: string): utpl.URITemplate;
-
-	namespace utpl {
-		export interface URITemplate {
-			fillFromObject(vars: Object): string;
-			fill(callback: (varName: string) => string): string;
-			fromUri(uri: string): Object;
-		}
-	}
-
-	export = utpl;
-}
diff --git a/urijs/URIjs-tests.ts b/urijs/URIjs-tests.ts
index 502fb0e5e2..0c5e8dfb4b 100644
--- a/urijs/URIjs-tests.ts
+++ b/urijs/URIjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="URIjs.d.ts" />
+
 
 URI();
 URI('http://user:pass@example.org:80/foo/bar.html?foo=bar&bar=baz#frag');
diff --git a/urijs/URIjs.d.ts b/urijs/URIjs.d.ts
deleted file mode 100644
index c7a2630370..0000000000
--- a/urijs/URIjs.d.ts
+++ /dev/null
@@ -1,242 +0,0 @@
-// Type definitions for URI.js 1.15.1
-// Project: https://github.com/medialize/URI.js
-// Definitions by: RodneyJT <https://github.com/RodneyJT>, Brian Surowiec <https://github.com/xt0rted>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-declare namespace uri {
-
-    interface URI {
-        absoluteTo(path: string): URI;
-        absoluteTo(path: URI): URI;
-        addFragment(fragment: string): URI;
-        addQuery(qry: string): URI;
-        addQuery(qry: Object): URI;
-        addSearch(qry: string): URI;
-        addSearch(key: string, value:any): URI;
-        addSearch(qry: Object): URI;
-        authority(): string;
-        authority(authority: string): URI;
-
-        clone(): URI;
-
-        directory(): string;
-        directory(dir: boolean): string;
-        directory(dir: string): URI;
-        domain(): string;
-        domain(domain: boolean): string;
-        domain(domain: string): URI;
-
-        duplicateQueryParameters(val: boolean): URI;
-
-        equals(): boolean;
-        equals(url: string | URI): boolean;
-
-        filename(): string;
-        filename(file: boolean): string;
-        filename(file: string): URI;
-        fragment(): string;
-        fragment(fragment: string): URI;
-        fragmentPrefix(prefix: string): URI;
-
-        hash(): string;
-        hash(hash: string): URI;
-        host(): string;
-        host(host: string): URI;
-        hostname(): string;
-        hostname(hostname: string): URI;
-        href(): string;
-        href(url: string): void;
-
-        is(qry: string): boolean;
-        iso8859(): URI;
-
-        normalize(): URI;
-        normalizeFragment(): URI;
-        normalizeHash(): URI;
-        normalizeHostname(): URI;
-        normalizePath(): URI;
-        normalizePathname(): URI;
-        normalizePort(): URI;
-        normalizeProtocol(): URI;
-        normalizeQuery(): URI;
-        normalizeSearch(): URI;
-
-        password(): string;
-        password(pw: string): URI;
-        path(): string;
-        path(path: boolean): string;
-        path(path: string): URI;
-        pathname(): string;
-        pathname(path: boolean): string;
-        pathname(path: string): URI;
-        port(): string;
-        port(port: string): URI;
-        protocol(): string;
-        protocol(protocol: string): URI;
-
-        query(): string;
-        query(qry: string): URI;
-        query(qry: boolean): Object;
-        query(qry: Object): URI;
-
-        readable(): string;
-        relativeTo(path: string): URI;
-        removeQuery(qry: string): URI;
-        removeQuery(qry: Object): URI;
-        removeSearch(qry: string): URI;
-        removeSearch(qry: Object): URI;
-        resource(): string;
-        resource(resource: string): URI;
-
-        scheme(): string;
-        scheme(protocol: string): URI;
-        search(): string;
-        search(qry: string): URI;
-        search(qry: boolean): any;
-        search(qry: Object): URI;
-        segment(): string[];
-        segment(segments: string[]): URI;
-        segment(position: number): string;
-        segment(position: number, level: string): URI;
-        segment(segment: string): URI;
-        setQuery(key: string, value: string): URI;
-        setQuery(qry: Object): URI;
-        setSearch(key: string, value: string): URI;
-        setSearch(qry: Object): URI;
-        hasQuery(name: string | any, value?: string | number | boolean | Function | Array<string> | Array<number> | Array<boolean> | RegExp, withinArray?: boolean): boolean;
-        hasSearch(name: string | any, value?: string | number | boolean | Function | Array<string> | Array<number> | Array<boolean> | RegExp, withinArray?: boolean): boolean;
-        subdomain(): string;
-        subdomain(subdomain: string): URI;
-        suffix(): string;
-        suffix(suffix: boolean): string;
-        suffix(suffix: string): URI;
-
-        tld(): string;
-        tld(tld: boolean): string;
-        tld(tld: string): URI;
-
-        unicode(): URI;
-        userinfo(): string;
-        userinfo(userinfo: string): URI;
-        username(): string;
-        username(uname: string): URI;
-
-        valueOf(): string;
-    }
-
-    interface URIOptions {
-        protocol?: string;
-        username?: string;
-        password?: string;
-        hostname?: string;
-        port?: string;
-        path?: string;
-        query?: string;
-        fragment?: string;
-    }
-
-    interface URIStatic {
-        (): URI;
-        (value: string | URIOptions | HTMLElement): URI;
-
-        new (): URI;
-        new (value: string | URIOptions | HTMLElement): URI;
-
-        addQuery(data: Object, prop: string, value: string): Object;
-        addQuery(data: Object, qryObj: Object): Object;
-
-        build(parts: {
-            protocol: string;
-            username: string;
-            password: string;
-            hostname: string;
-            port: string;
-            path: string;
-            query: string;
-            fragment: string;
-        }): string;
-        buildAuthority(parts: {
-            username?: string;
-            password?: string;
-            hostname?: string;
-            port?: string;
-        }): string;
-        buildHost(parts: {
-            hostname?: string;
-            port?: string;
-        }): string;
-        buildQuery(qry: Object): string;
-        buildQuery(qry: Object, duplicates: boolean): string;
-        buildUserinfo(parts: {
-            username?: string;
-            password?: string;
-        }): string;
-
-        commonPath(path1: string, path2: string): string;
-
-        decode(str: string): string;
-        decodeQuery(qry: string): string;
-
-        encode(str: string): string;
-        encodeQuery(qry: string): string;
-        encodeReserved(str: string): string;
-        expand(template: string, vals: Object): URI;
-
-        iso8859(): void;
-
-        parse(url: string): {
-            protocol: string;
-            username: string;
-            password: string;
-            hostname: string;
-            port: string;
-            path: string;
-            query: string;
-            fragment: string;
-        };
-        parseAuthority(url: string, parts: {
-            username?: string;
-            password?: string;
-            hostname?: string;
-            port?: string;
-        }): string;
-        parseHost(url: string, parts: {
-            hostname?: string;
-            port?: string;
-        }): string;
-        parseQuery(url: string): Object;
-        parseUserinfo(url: string, parts: {
-            username?: string;
-            password?: string;
-        }): string;
-
-        removeQuery(data: Object, prop: string, value: string): Object;
-        removeQuery(data: Object, props: string[]): Object;
-        removeQuery(data: Object, props: Object): Object;
-
-        unicode(): void;
-
-        withinString(source: string, func: (url: string) => string): string;
-    }
-
-}
-
-interface JQuery {
-    uri(): uri.URI;
-}
-
-declare var URI: uri.URIStatic;
-
-declare module 'URI' {
-    export = URI;
-}
-
-declare module 'urijs' {
-    export = URI;
-}
-
-declare module 'urijs/src/URITemplate' {
-    export = URI;
-}
diff --git a/urijs/index.d.ts b/urijs/index.d.ts
new file mode 100644
index 0000000000..b876fbba82
--- /dev/null
+++ b/urijs/index.d.ts
@@ -0,0 +1,242 @@
+// Type definitions for URI.js 1.15.1
+// Project: https://github.com/medialize/URI.js
+// Definitions by: RodneyJT <https://github.com/RodneyJT>, Brian Surowiec <https://github.com/xt0rted>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+declare namespace uri {
+
+    interface URI {
+        absoluteTo(path: string): URI;
+        absoluteTo(path: URI): URI;
+        addFragment(fragment: string): URI;
+        addQuery(qry: string): URI;
+        addQuery(qry: Object): URI;
+        addSearch(qry: string): URI;
+        addSearch(key: string, value:any): URI;
+        addSearch(qry: Object): URI;
+        authority(): string;
+        authority(authority: string): URI;
+
+        clone(): URI;
+
+        directory(): string;
+        directory(dir: boolean): string;
+        directory(dir: string): URI;
+        domain(): string;
+        domain(domain: boolean): string;
+        domain(domain: string): URI;
+
+        duplicateQueryParameters(val: boolean): URI;
+
+        equals(): boolean;
+        equals(url: string | URI): boolean;
+
+        filename(): string;
+        filename(file: boolean): string;
+        filename(file: string): URI;
+        fragment(): string;
+        fragment(fragment: string): URI;
+        fragmentPrefix(prefix: string): URI;
+
+        hash(): string;
+        hash(hash: string): URI;
+        host(): string;
+        host(host: string): URI;
+        hostname(): string;
+        hostname(hostname: string): URI;
+        href(): string;
+        href(url: string): void;
+
+        is(qry: string): boolean;
+        iso8859(): URI;
+
+        normalize(): URI;
+        normalizeFragment(): URI;
+        normalizeHash(): URI;
+        normalizeHostname(): URI;
+        normalizePath(): URI;
+        normalizePathname(): URI;
+        normalizePort(): URI;
+        normalizeProtocol(): URI;
+        normalizeQuery(): URI;
+        normalizeSearch(): URI;
+
+        password(): string;
+        password(pw: string): URI;
+        path(): string;
+        path(path: boolean): string;
+        path(path: string): URI;
+        pathname(): string;
+        pathname(path: boolean): string;
+        pathname(path: string): URI;
+        port(): string;
+        port(port: string): URI;
+        protocol(): string;
+        protocol(protocol: string): URI;
+
+        query(): string;
+        query(qry: string): URI;
+        query(qry: boolean): Object;
+        query(qry: Object): URI;
+
+        readable(): string;
+        relativeTo(path: string): URI;
+        removeQuery(qry: string): URI;
+        removeQuery(qry: Object): URI;
+        removeSearch(qry: string): URI;
+        removeSearch(qry: Object): URI;
+        resource(): string;
+        resource(resource: string): URI;
+
+        scheme(): string;
+        scheme(protocol: string): URI;
+        search(): string;
+        search(qry: string): URI;
+        search(qry: boolean): any;
+        search(qry: Object): URI;
+        segment(): string[];
+        segment(segments: string[]): URI;
+        segment(position: number): string;
+        segment(position: number, level: string): URI;
+        segment(segment: string): URI;
+        setQuery(key: string, value: string): URI;
+        setQuery(qry: Object): URI;
+        setSearch(key: string, value: string): URI;
+        setSearch(qry: Object): URI;
+        hasQuery(name: string | any, value?: string | number | boolean | Function | Array<string> | Array<number> | Array<boolean> | RegExp, withinArray?: boolean): boolean;
+        hasSearch(name: string | any, value?: string | number | boolean | Function | Array<string> | Array<number> | Array<boolean> | RegExp, withinArray?: boolean): boolean;
+        subdomain(): string;
+        subdomain(subdomain: string): URI;
+        suffix(): string;
+        suffix(suffix: boolean): string;
+        suffix(suffix: string): URI;
+
+        tld(): string;
+        tld(tld: boolean): string;
+        tld(tld: string): URI;
+
+        unicode(): URI;
+        userinfo(): string;
+        userinfo(userinfo: string): URI;
+        username(): string;
+        username(uname: string): URI;
+
+        valueOf(): string;
+    }
+
+    interface URIOptions {
+        protocol?: string;
+        username?: string;
+        password?: string;
+        hostname?: string;
+        port?: string;
+        path?: string;
+        query?: string;
+        fragment?: string;
+    }
+
+    interface URIStatic {
+        (): URI;
+        (value: string | URIOptions | HTMLElement): URI;
+
+        new (): URI;
+        new (value: string | URIOptions | HTMLElement): URI;
+
+        addQuery(data: Object, prop: string, value: string): Object;
+        addQuery(data: Object, qryObj: Object): Object;
+
+        build(parts: {
+            protocol: string;
+            username: string;
+            password: string;
+            hostname: string;
+            port: string;
+            path: string;
+            query: string;
+            fragment: string;
+        }): string;
+        buildAuthority(parts: {
+            username?: string;
+            password?: string;
+            hostname?: string;
+            port?: string;
+        }): string;
+        buildHost(parts: {
+            hostname?: string;
+            port?: string;
+        }): string;
+        buildQuery(qry: Object): string;
+        buildQuery(qry: Object, duplicates: boolean): string;
+        buildUserinfo(parts: {
+            username?: string;
+            password?: string;
+        }): string;
+
+        commonPath(path1: string, path2: string): string;
+
+        decode(str: string): string;
+        decodeQuery(qry: string): string;
+
+        encode(str: string): string;
+        encodeQuery(qry: string): string;
+        encodeReserved(str: string): string;
+        expand(template: string, vals: Object): URI;
+
+        iso8859(): void;
+
+        parse(url: string): {
+            protocol: string;
+            username: string;
+            password: string;
+            hostname: string;
+            port: string;
+            path: string;
+            query: string;
+            fragment: string;
+        };
+        parseAuthority(url: string, parts: {
+            username?: string;
+            password?: string;
+            hostname?: string;
+            port?: string;
+        }): string;
+        parseHost(url: string, parts: {
+            hostname?: string;
+            port?: string;
+        }): string;
+        parseQuery(url: string): Object;
+        parseUserinfo(url: string, parts: {
+            username?: string;
+            password?: string;
+        }): string;
+
+        removeQuery(data: Object, prop: string, value: string): Object;
+        removeQuery(data: Object, props: string[]): Object;
+        removeQuery(data: Object, props: Object): Object;
+
+        unicode(): void;
+
+        withinString(source: string, func: (url: string) => string): string;
+    }
+
+}
+
+interface JQuery {
+    uri(): uri.URI;
+}
+
+declare var URI: uri.URIStatic;
+
+declare module 'URI' {
+    export = URI;
+}
+
+declare module 'urijs' {
+    export = URI;
+}
+
+declare module 'urijs/src/URITemplate' {
+    export = URI;
+}
diff --git a/urijs/tsconfig.json b/urijs/tsconfig.json
new file mode 100644
index 0000000000..55a6c99d32
--- /dev/null
+++ b/urijs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "urijs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/url-template/index.d.ts b/url-template/index.d.ts
new file mode 100644
index 0000000000..5f3d896002
--- /dev/null
+++ b/url-template/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for url-template 2.0.6
+// Project: https://github.com/bramstein/url-template
+// Definitions by: Marcin Porębski <https://github.com/marcinporebski/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var urlTemplate: UrlTemplate.TemplateParser;
+
+export = urlTemplate;
+export as namespace urltemplate;
+
+declare namespace UrlTemplate
+{
+    interface TemplateParser {
+        parse(template: string): Template;
+    }
+
+    interface Template {
+        expand(parameters: any): string;
+    }
+}
+
+
diff --git a/url-template/tsconfig.json b/url-template/tsconfig.json
new file mode 100644
index 0000000000..257de2074a
--- /dev/null
+++ b/url-template/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "url-template-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/url-template/url-template-tests.ts b/url-template/url-template-tests.ts
index f477a160a1..f6959dc391 100644
--- a/url-template/url-template-tests.ts
+++ b/url-template/url-template-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="url-template.d.ts" />
+
 
 
 import urlTemplate = require('url-template');
diff --git a/url-template/url-template.d.ts b/url-template/url-template.d.ts
deleted file mode 100644
index 14b3ece407..0000000000
--- a/url-template/url-template.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Type definitions for url-template 2.0.6
-// Project: https://github.com/bramstein/url-template
-// Definitions by: Marcin Porębski <https://github.com/marcinporebski/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace UrlTemplate
-{
-    interface TemplateParser {
-        parse(template: string): Template;
-    }
-
-    interface Template {
-        expand(parameters: any): string;
-    }
-}
-
-declare module "url-template"
-{
-    var urlTemplate: UrlTemplate.TemplateParser;
-
-    export = urlTemplate;
-}
-
-
diff --git a/urlrouter/index.d.ts b/urlrouter/index.d.ts
new file mode 100644
index 0000000000..03a6196664
--- /dev/null
+++ b/urlrouter/index.d.ts
@@ -0,0 +1,68 @@
+// Type definitions for urlrouter
+// Project: https://github.com/fengmk2/urlrouter
+// Definitions by: soywiz <https://github.com/soywiz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import http = require("http");
+
+declare function UrlRouterInternal(handler: (app: UrlRouterInternal.App) => void): UrlRouterInternal.HttpHandler;
+
+declare namespace UrlRouterInternal {
+
+
+    interface ServerRequest extends http.ServerRequest {
+        params: any;
+    }
+
+    interface ServerResponse extends http.ServerResponse {
+
+    }
+
+    interface App {
+        // https://github.com/visionmedia/node-methods/blob/master/index.js
+        get(urlpattern: string, handler: HttpHandler): void;
+        post(urlpattern: string, handler: HttpHandler): void;
+        put(urlpattern: string, handler: HttpHandler): void;
+        head(urlpattern: string, handler: HttpHandler): void;
+        delete(urlpattern: string, handler: HttpHandler): void;
+        options(urlpattern: string, handler: HttpHandler): void;
+        trace(urlpattern: string, handler: HttpHandler): void;
+        copy(urlpattern: string, handler: HttpHandler): void;
+        lock(urlpattern: string, handler: HttpHandler): void;
+        mkcol(urlpattern: string, handler: HttpHandler): void;
+        move(urlpattern: string, handler: HttpHandler): void;
+        propfind(urlpattern: string, handler: HttpHandler): void;
+        proppatch(urlpattern: string, handler: HttpHandler): void;
+        unlock(urlpattern: string, handler: HttpHandler): void;
+        report(urlpattern: string, handler: HttpHandler): void;
+        mkactivity(urlpattern: string, handler: HttpHandler): void;
+        checkout(urlpattern: string, handler: HttpHandler): void;
+        merge(urlpattern: string, handler: HttpHandler): void;
+        "m-search"(urlpattern: string, handler: HttpHandler): void;
+        notify(urlpattern: string, handler: HttpHandler): void;
+        subscribe(urlpattern: string, handler: HttpHandler): void;
+        unsubscribe(urlpattern: string, handler: HttpHandler): void;
+        patch(urlpattern: string, handler: HttpHandler): void;
+        search(urlpattern: string, handler: HttpHandler): void;
+
+        all(urlpattern: string, handler: HttpHandler): void;
+        redirect(urlpattern: string, to: string): void;
+    }
+
+    interface Options {
+        paramsName?: string;
+        pageNotFound?: (req: ServerRequest, res: ServerResponse) => void;
+        errorHandler?: (err: Error, req: ServerRequest, res: ServerResponse) => void;
+    }
+
+    function _UrlRouterfunc(handler: (app: App) => void, options?: any): void;
+
+    interface HttpHandler {
+        (req: ServerRequest, res: ServerResponse, next?: () => void): void;
+    }
+}
+
+export = UrlRouterInternal;
diff --git a/urlrouter/tsconfig.json b/urlrouter/tsconfig.json
new file mode 100644
index 0000000000..77cedade91
--- /dev/null
+++ b/urlrouter/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "urlrouter-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/urlrouter/urlrouter-tests.ts b/urlrouter/urlrouter-tests.ts
index ceb7e27d4d..6651a56c5a 100644
--- a/urlrouter/urlrouter-tests.ts
+++ b/urlrouter/urlrouter-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="urlrouter.d.ts" />
 
 import http = require("http");
 import urlrouter = require("urlrouter");
diff --git a/urlrouter/urlrouter.d.ts b/urlrouter/urlrouter.d.ts
deleted file mode 100644
index c7a741ac90..0000000000
--- a/urlrouter/urlrouter.d.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-// Type definitions for urlrouter
-// Project: https://github.com/fengmk2/urlrouter
-// Definitions by: soywiz <https://github.com/soywiz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "urlrouter" {
-	import http = require("http");
-
-	function UrlRouterInternal(handler:(app:UrlRouterInternal.App) => void):UrlRouterInternal.HttpHandler;
-
-	namespace UrlRouterInternal {
-
-
-		interface ServerRequest extends http.ServerRequest {
-			params: any;
-		}
-
-		interface ServerResponse extends http.ServerResponse {
-
-		}
-
-		interface App {
-			// https://github.com/visionmedia/node-methods/blob/master/index.js
-			get(urlpattern:string, handler:HttpHandler): void;
-			post(urlpattern:string, handler:HttpHandler): void;
-			put(urlpattern:string, handler:HttpHandler): void;
-			head(urlpattern:string, handler:HttpHandler): void;
-			delete(urlpattern:string, handler:HttpHandler): void;
-			options(urlpattern:string, handler:HttpHandler): void;
-			trace(urlpattern:string, handler:HttpHandler): void;
-			copy(urlpattern:string, handler:HttpHandler): void;
-			lock(urlpattern:string, handler:HttpHandler): void;
-			mkcol(urlpattern:string, handler:HttpHandler): void;
-			move(urlpattern:string, handler:HttpHandler): void;
-			propfind(urlpattern:string, handler:HttpHandler): void;
-			proppatch(urlpattern:string, handler:HttpHandler): void;
-			unlock(urlpattern:string, handler:HttpHandler): void;
-			report(urlpattern:string, handler:HttpHandler): void;
-			mkactivity(urlpattern:string, handler:HttpHandler): void;
-			checkout(urlpattern:string, handler:HttpHandler): void;
-			merge(urlpattern:string, handler:HttpHandler): void;
-			"m-search"(urlpattern:string, handler:HttpHandler): void;
-			notify(urlpattern:string, handler:HttpHandler): void;
-			subscribe(urlpattern:string, handler:HttpHandler): void;
-			unsubscribe(urlpattern:string, handler:HttpHandler): void;
-			patch(urlpattern:string, handler:HttpHandler): void;
-			search(urlpattern:string, handler:HttpHandler): void;
-
-			all(urlpattern:string, handler:HttpHandler): void;
-			redirect(urlpattern:string, to:string): void;
-		}
-
-		interface Options {
-			paramsName?: string;
-			pageNotFound?: (req:ServerRequest, res:ServerResponse) => void;
-			errorHandler?: (err:Error, req:ServerRequest, res:ServerResponse) => void;
-		}
-
-		function _UrlRouterfunc(handler:(app:App) => void, options?:any):void;
-
-		interface HttpHandler {
-			(req:ServerRequest, res:ServerResponse, next?:() => void): void;
-		}
-	}
-
-	export = UrlRouterInternal;
-}
diff --git a/urlsafe-base64/index.d.ts b/urlsafe-base64/index.d.ts
new file mode 100644
index 0000000000..b0dda43e4e
--- /dev/null
+++ b/urlsafe-base64/index.d.ts
@@ -0,0 +1,49 @@
+// Type definitions for urlsafe-base64 v1.0.0
+// Project: https://github.com/RGBboy/urlsafe-base64
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+/**
+ * Library version.
+ */
+export declare var version: string;
+
+/**
+ * .encode
+ *
+ * return an encoded Buffer as URL Safe Base64
+ *
+ * Note: This function encodes to the RFC 4648 Spec where '+' is encoded
+ *       as '-' and '/' is encoded as '_'. The padding character '=' is
+ *       removed.
+ *
+ * @param {Buffer} buffer
+ * @return {String}
+ * @api public
+ */
+export declare function encode(buffer: Buffer): string;
+
+/**
+ * .decode
+ *
+ * return an decoded URL Safe Base64 as Buffer
+ *
+ * @param {String}
+ * @return {Buffer}
+ * @api public
+ */
+export declare function decode(base64: string): Buffer;
+
+/**
+ * .validate
+ *
+ * Validates a string if it is URL Safe Base64 encoded.
+ *
+ * @param {String}
+ * @return {Boolean}
+ * @api public
+ */
+export declare function validate(base64: string): boolean;
diff --git a/urlsafe-base64/tsconfig.json b/urlsafe-base64/tsconfig.json
new file mode 100644
index 0000000000..d00902ce3d
--- /dev/null
+++ b/urlsafe-base64/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "urlsafe-base64-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/urlsafe-base64/urlsafe-base64-tests.ts b/urlsafe-base64/urlsafe-base64-tests.ts
index 2c7d4722fa..64930ac92f 100644
--- a/urlsafe-base64/urlsafe-base64-tests.ts
+++ b/urlsafe-base64/urlsafe-base64-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="urlsafe-base64.d.ts" />
 
 import URLSafeBase64 = require('urlsafe-base64');
 
diff --git a/urlsafe-base64/urlsafe-base64.d.ts b/urlsafe-base64/urlsafe-base64.d.ts
deleted file mode 100644
index cb7f5842fc..0000000000
--- a/urlsafe-base64/urlsafe-base64.d.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-// Type definitions for urlsafe-base64 v1.0.0
-// Project: https://github.com/RGBboy/urlsafe-base64
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare module 'urlsafe-base64' {
-    /**
-     * Library version.
-     */
-    export var version: string;
-
-    /**
-     * .encode
-     *
-     * return an encoded Buffer as URL Safe Base64
-     *
-     * Note: This function encodes to the RFC 4648 Spec where '+' is encoded
-     *       as '-' and '/' is encoded as '_'. The padding character '=' is
-     *       removed.
-     *
-     * @param {Buffer} buffer
-     * @return {String}
-     * @api public
-     */
-    export function encode(buffer: Buffer): string;
-
-    /**
-     * .decode
-     *
-     * return an decoded URL Safe Base64 as Buffer
-     *
-     * @param {String}
-     * @return {Buffer}
-     * @api public
-     */
-    export function decode(base64: string): Buffer;
-
-    /**
-     * .validate
-     *
-     * Validates a string if it is URL Safe Base64 encoded.
-     *
-     * @param {String}
-     * @return {Boolean}
-     * @api public
-     */
-    export function validate(base64: string): boolean;
-}
diff --git a/usage/index.d.ts b/usage/index.d.ts
new file mode 100644
index 0000000000..280bc653ff
--- /dev/null
+++ b/usage/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for usage
+// Project: https://github.com/arunoda/node-usage
+// Definitions by: Pascal Vomhoff <https://github.com/pvomhoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+export interface ResultObject {
+    memory: number;
+    memoryInfo: {
+        rss: number;
+        vsize: number;
+    }
+    cpu: number;
+}
+
+export interface Options {
+    keepHistory: boolean;
+}
+
+export declare function lookup(pid: number, callback: (err: Error, result: ResultObject) => void): void;
+export declare function lookup(pid: number, options: Options, callback: (err: Error, result: ResultObject) => void): void;
+
+//Only availible on linux
+export declare function clearHistory(pid?: number): void;
diff --git a/usage/tsconfig.json b/usage/tsconfig.json
new file mode 100644
index 0000000000..690dcd25d6
--- /dev/null
+++ b/usage/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "usage-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/usage/usage-tests.ts b/usage/usage-tests.ts
index af8a3b2751..8ddf15bdf5 100644
--- a/usage/usage-tests.ts
+++ b/usage/usage-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="usage.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import usage = require('usage');
 
diff --git a/usage/usage.d.ts b/usage/usage.d.ts
deleted file mode 100644
index bfe0fcb1ea..0000000000
--- a/usage/usage.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Type definitions for usage
-// Project: https://github.com/arunoda/node-usage
-// Definitions by: Pascal Vomhoff <https://github.com/pvomhoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "usage" {
-
-  export interface ResultObject {
-    memory:number;
-    memoryInfo: {
-      rss:number;
-      vsize:number;
-    }
-    cpu:number;
-  }
-
-  export interface Options {
-    keepHistory:boolean;
-  }
-
-  export function lookup(pid:number, callback:(err:Error, result:ResultObject) => void):void;
-  export function lookup(pid:number, options:Options, callback:(err:Error, result:ResultObject) => void):void;
-
-  //Only availible on linux
-  export function clearHistory(pid?:number):void;
-
-
-}
\ No newline at end of file
diff --git a/username/index.d.ts b/username/index.d.ts
new file mode 100644
index 0000000000..e0bceed481
--- /dev/null
+++ b/username/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for username v1.0.1
+// Project: https://www.npmjs.com/package/username
+// Definitions by: Klaus Reimer <https://github.com/kayahr>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/**
+ * Tries to get the username from the LOGNAME, USER, LNAME or USERNAME environment variables.
+ * Falls back to `id -un` on OS X / Linux and `whoami` on Windows in the rare case none of the environment
+ * variables are set. The result is cached.
+ *
+ * @param callback The callback function to call asynchronously with the result.
+ */
+declare function username(callback: (err: Error, result: string) => void): void;
+
+declare namespace username {
+    /**
+     * Tries to get the username from the LOGNAME, USER, LNAME or USERNAME environment variables. Falls back
+     * to returning an empty string in the reare case none of the environment variables are set.
+     *
+     * @return The username or empty string if not found.
+     */
+    function sync(): string;
+}
+
+export = username;
diff --git a/username/tsconfig.json b/username/tsconfig.json
new file mode 100644
index 0000000000..4489e83d70
--- /dev/null
+++ b/username/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "username-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/username/username-tests.ts b/username/username-tests.ts
index 46265958bb..c6e739c14f 100644
--- a/username/username-tests.ts
+++ b/username/username-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./username.d.ts" />
 
 import username = require("username");
 
diff --git a/username/username.d.ts b/username/username.d.ts
deleted file mode 100644
index bb329295de..0000000000
--- a/username/username.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// Type definitions for username v1.0.1
-// Project: https://www.npmjs.com/package/username
-// Definitions by: Klaus Reimer <https://github.com/kayahr>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "username" {
-    /**
-     * Tries to get the username from the LOGNAME, USER, LNAME or USERNAME environment variables.
-     * Falls back to `id -un` on OS X / Linux and `whoami` on Windows in the rare case none of the environment
-     * variables are set. The result is cached.
-     *
-     * @param callback The callback function to call asynchronously with the result.
-     */
-    function username(callback: (err: Error, result: string) => void): void;
-
-    namespace username {
-        /**
-         * Tries to get the username from the LOGNAME, USER, LNAME or USERNAME environment variables. Falls back
-         * to returning an empty string in the reare case none of the environment variables are set.
-         *
-         * @return The username or empty string if not found.
-         */
-        function sync(): string;
-    }
-
-    export = username;
-}
diff --git a/utils-merge/index.d.ts b/utils-merge/index.d.ts
new file mode 100644
index 0000000000..5868d7ddf4
--- /dev/null
+++ b/utils-merge/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for utils-merge
+// Project: https://github.com/jaredhanson/utils-merge
+// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function merge<TA, TB, TResult>(a: TA, b: TB): TResult;
+
+export default merge;
diff --git a/utils-merge/tsconfig.json b/utils-merge/tsconfig.json
new file mode 100644
index 0000000000..2e571972a4
--- /dev/null
+++ b/utils-merge/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "utils-merge-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/utils-merge/utils-merge-tests.ts b/utils-merge/utils-merge-tests.ts
index b4a4a1487d..a20237c900 100644
--- a/utils-merge/utils-merge-tests.ts
+++ b/utils-merge/utils-merge-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./utils-merge.d.ts" />
 
 import merge from "utils-merge";
 
diff --git a/utils-merge/utils-merge.d.ts b/utils-merge/utils-merge.d.ts
deleted file mode 100644
index 381821dfe1..0000000000
--- a/utils-merge/utils-merge.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Type definitions for utils-merge
-// Project: https://github.com/jaredhanson/utils-merge
-// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "utils-merge" {
-	function merge<TA, TB, TResult>(a: TA, b: TB): TResult;
-
-	export default merge;
-}
diff --git a/uuid-1345/index.d.ts b/uuid-1345/index.d.ts
new file mode 100644
index 0000000000..c8f6d6bc84
--- /dev/null
+++ b/uuid-1345/index.d.ts
@@ -0,0 +1,82 @@
+// Type definitions for uuid-1345 0.99
+// Project: https://github.com/scravy/uuid-1345
+// Definitions by: TANAKA Koichi <https://github.com/mugeso/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface UUID {
+    version: string;
+    variant: string;
+    toString(): string;
+    toBuffer(): Buffer;
+}
+
+type UuidTypes = string | Buffer | UUID;
+interface ASCIICallback {
+    (error: string, result: string): void;
+}
+
+interface BinaryCallback {
+    (error: string, result: Buffer): void;
+}
+
+interface ObjectCallback {
+    (error: string, result: UUID): void;
+}
+
+export declare var namespace: {
+    dns: UUID
+    url: UUID,
+    oid: UUID,
+    x500: UUID
+};
+
+export declare function check(uuid: string | Buffer): { version?: number, variant: string, format: string };
+export declare function parse(uuid: string): Buffer;
+export declare function stringify(uuid: Buffer): string;
+
+export declare function v1(): string;
+export declare function v1(options: { mac?: boolean }): string;
+export declare function v1(options: { encoding: 'ascii', mac?: boolean }): string;
+export declare function v1(options: { encoding: 'binary', mac?: boolean }): Buffer;
+export declare function v1(options: { encoding: 'object', mac?: boolean }): UUID;
+export declare function v1(options: { mac?: boolean }, callback: ASCIICallback): void;
+export declare function v1(options: { encoding: 'ascii', mac?: boolean }, callback: ASCIICallback): void;
+export declare function v1(options: { encoding: 'binary', mac?: boolean }, callback: BinaryCallback): void;
+export declare function v1(options: { encoding: 'object', mac?: boolean }, callback: ObjectCallback): void;
+export declare function v1(callback: ASCIICallback): void;
+
+export declare function v3(options: { namespace: UuidTypes, name: string }): string;
+export declare function v3(options: { encoding: 'ascii', namespace: UuidTypes, name: string }): string;
+export declare function v3(options: { encoding: 'binary', namespace: UuidTypes, name: string }): Buffer;
+export declare function v3(options: { encoding: 'object', namespace: UuidTypes, name: string }): UUID;
+export declare function v3(options: { namespace: UuidTypes, name: string }, callback: ASCIICallback): void;
+export declare function v3(options: { encoding: 'ascii', namespace: UuidTypes, name: string }, callback: ASCIICallback): void;
+export declare function v3(options: { encoding: 'binary', namespace: UuidTypes, name: string }, callback: BinaryCallback): void;
+export declare function v3(options: { encoding: 'object', namespace: UuidTypes, name: string }, callback: ObjectCallback): void;
+
+export declare function v4(): string;
+export declare function v4(options: { encoding: 'ascii' }): string;
+export declare function v4(options: { encoding: 'binary' }): Buffer;
+export declare function v4(options: { encoding: 'object' }): UUID;
+export declare function v4(options: { encoding: 'ascii' }, callback: ASCIICallback): void;
+export declare function v4(options: { encoding: 'binary' }, callback: BinaryCallback): void;
+export declare function v4(options: { encoding: 'object' }, callback: ObjectCallback): void;
+export declare function v4(callback: ASCIICallback): void;
+
+export declare function v4fast(): string;
+export declare function v4fast(options: { encoding: 'ascii' }): string;
+export declare function v4fast(options: { encoding: 'binary' }): Buffer;
+export declare function v4fast(options: { encoding: 'object' }): UUID;
+export declare function v4fast(options: { encoding: 'ascii' }, callback: ASCIICallback): void;
+export declare function v4fast(options: { encoding: 'binary' }, callback: BinaryCallback): void;
+export declare function v4fast(options: { encoding: 'object' }, callback: ObjectCallback): void;
+export declare function v4fast(callback: ASCIICallback): void;
+
+export declare function v5(options: { namespace: UuidTypes, name: string }): string;
+export declare function v5(options: { encoding: 'ascii', namespace: UuidTypes, name: string }): string;
+export declare function v5(options: { encoding: 'binary', namespace: UuidTypes, name: string }): Buffer;
+export declare function v5(options: { encoding: 'object', namespace: UuidTypes, name: string }): UUID;
+export declare function v5(options: { namespace: UuidTypes, name: string }, callback: ASCIICallback): void;
+export declare function v5(options: { encoding: 'ascii', namespace: UuidTypes, name: string }, callback: ASCIICallback): void;
+export declare function v5(options: { encoding: 'binary', namespace: UuidTypes, name: string }, callback: BinaryCallback): void;
+export declare function v5(options: { encoding: 'object', namespace: UuidTypes, name: string }, callback: ObjectCallback): void;
diff --git a/uuid-1345/tsconfig.json b/uuid-1345/tsconfig.json
new file mode 100644
index 0000000000..d9af1fe831
--- /dev/null
+++ b/uuid-1345/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "uuid-1345-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/uuid-1345/uuid-1345-tests.ts b/uuid-1345/uuid-1345-tests.ts
index b73a467554..e3eef2c939 100644
--- a/uuid-1345/uuid-1345-tests.ts
+++ b/uuid-1345/uuid-1345-tests.ts
@@ -1,5 +1,5 @@
-///<reference path="../node/node.d.ts" />
-///<reference path="./uuid-1345.d.ts" />
+///<reference types="node" />
+
 'use strict';
 import * as UUID from 'uuid-1345';
 
diff --git a/uuid-1345/uuid-1345.d.ts b/uuid-1345/uuid-1345.d.ts
deleted file mode 100644
index 92a5d1026d..0000000000
--- a/uuid-1345/uuid-1345.d.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-// Type definitions for uuid-1345 0.99
-// Project: https://github.com/scravy/uuid-1345
-// Definitions by: TANAKA Koichi <https://github.com/mugeso/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-///<reference path="../node/node" />
-declare module "uuid-1345" {
-    export interface UUID {
-        version: string;
-        variant: string;
-        toString(): string;
-        toBuffer(): Buffer;
-    }
-
-    type UuidTypes = string|Buffer|UUID;
-    interface ASCIICallback {
-        (error: string, result: string):void;
-    }
-
-    interface BinaryCallback {
-        (error: string, result: Buffer):void;
-    }
-
-    interface ObjectCallback {
-        (error: string, result: UUID):void;
-    }
-
-    export var namespace: {
-        dns: UUID
-        url: UUID,
-        oid: UUID,
-        x500: UUID
-    };
-
-    export function check(uuid:string|Buffer): {version?:number, variant: string, format: string};
-    export function parse(uuid:string): Buffer;
-    export function stringify(uuid:Buffer): string;
-
-    export function v1():string;
-    export function v1(options:{mac?:boolean}):string;
-    export function v1(options:{encoding:'ascii', mac?:boolean}):string;
-    export function v1(options:{encoding:'binary', mac?:boolean}):Buffer;
-    export function v1(options:{encoding:'object', mac?:boolean}):UUID;
-    export function v1(options:{mac?:boolean}, callback:ASCIICallback):void;
-    export function v1(options:{encoding:'ascii', mac?:boolean}, callback:ASCIICallback):void;
-    export function v1(options:{encoding:'binary', mac?:boolean}, callback:BinaryCallback):void;
-    export function v1(options:{encoding:'object', mac?:boolean}, callback:ObjectCallback):void;
-    export function v1(callback:ASCIICallback):void;
-
-    export function v3(options:{namespace:UuidTypes, name: string}):string;
-    export function v3(options:{encoding:'ascii', namespace:UuidTypes, name: string}):string;
-    export function v3(options:{encoding:'binary', namespace:UuidTypes, name: string}):Buffer;
-    export function v3(options:{encoding:'object', namespace:UuidTypes, name: string}):UUID;
-    export function v3(options:{namespace:UuidTypes, name: string}, callback:ASCIICallback):void;
-    export function v3(options:{encoding:'ascii', namespace:UuidTypes, name: string}, callback:ASCIICallback):void;
-    export function v3(options:{encoding:'binary', namespace:UuidTypes, name: string}, callback:BinaryCallback):void;
-    export function v3(options:{encoding:'object', namespace:UuidTypes, name: string}, callback:ObjectCallback):void;
-
-    export function v4():string;
-    export function v4(options:{encoding:'ascii'}):string;
-    export function v4(options:{encoding:'binary'}):Buffer;
-    export function v4(options:{encoding:'object'}):UUID;
-    export function v4(options:{encoding:'ascii'}, callback:ASCIICallback):void;
-    export function v4(options:{encoding:'binary'}, callback:BinaryCallback):void;
-    export function v4(options:{encoding:'object'}, callback:ObjectCallback):void;
-    export function v4(callback:ASCIICallback):void;
-
-    export function v4fast():string;
-    export function v4fast(options:{encoding:'ascii'}):string;
-    export function v4fast(options:{encoding:'binary'}):Buffer;
-    export function v4fast(options:{encoding:'object'}):UUID;
-    export function v4fast(options:{encoding:'ascii'}, callback:ASCIICallback):void;
-    export function v4fast(options:{encoding:'binary'}, callback:BinaryCallback):void;
-    export function v4fast(options:{encoding:'object'}, callback:ObjectCallback):void;
-    export function v4fast(callback:ASCIICallback):void;
-
-    export function v5(options:{namespace:UuidTypes, name: string}):string;
-    export function v5(options:{encoding:'ascii', namespace:UuidTypes, name: string}):string;
-    export function v5(options:{encoding:'binary', namespace:UuidTypes, name: string}):Buffer;
-    export function v5(options:{encoding:'object', namespace:UuidTypes, name: string}):UUID;
-    export function v5(options:{namespace:UuidTypes, name: string}, callback:ASCIICallback):void;
-    export function v5(options:{encoding:'ascii', namespace:UuidTypes, name: string}, callback:ASCIICallback):void;
-    export function v5(options:{encoding:'binary', namespace:UuidTypes, name: string}, callback:BinaryCallback):void;
-    export function v5(options:{encoding:'object', namespace:UuidTypes, name: string}, callback:ObjectCallback):void;
-}
diff --git a/uuid/UUID-tests.ts b/uuid/UUID-tests.ts
index ce40ddee15..5219c0c389 100644
--- a/uuid/UUID-tests.ts
+++ b/uuid/UUID-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="UUID.d.ts" />
-
 
 import UUID = require("UUID");
 
diff --git a/uuid/UUID.d.ts b/uuid/UUID.d.ts
deleted file mode 100644
index 164cf503c8..0000000000
--- a/uuid/UUID.d.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-// Type definitions for UUID.js v3.3.0
-// Project: https://github.com/LiosK/UUID.js
-// Definitions by: Jason Jarrett <https://github.com/staxmanade/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "UUID" {
-
-    interface UUID {
-        intFields: UUIDArray<number>;
-        bitFields: UUIDArray<string>;
-        hexFields: UUIDArray<string>;
-        version: number;
-        bitString: string;
-        hexString: string;
-        urn: string;
-
-
-        /**
-         * Tests if two {@link UUID} objects are equal.
-         * @param {UUID} uuid
-         * @returns {bool} True if two {@link UUID} objects are equal.
-         */
-        equals(uuid:UUID): boolean;
-
-        /**
-         * Returns UUID string representation.
-         * @returns {string} {@link UUID#hexString}.
-         */
-        toString(): string;
-    }
-
-    interface UUIDArray<T> extends Array<T> {
-        timeLow: string;
-        timeMid: string;
-        timeHiAndVersion: string;
-        clockSeqHiAndReserved: string;
-        clockSeqLow: string;
-        node: string;
-    }
-
-    /**
-     * The simplest function to get an UUID string.
-     * @returns {string} A version 4 UUID string.
-     */
-    export function generate(): string;
-
-    /**
-     * Generates a version 4 {@link UUID}.
-     * @returns {UUID} A version 4 {@link UUID} object.
-     * @since 3.0
-     */
-    export function genV4(): UUID;
-
-
-    /**
-     * Generates a version 1 {@link UUID}.
-     * @returns {UUID} A version 1 {@link UUID} object.
-     * @since 3.0
-     */
-    export function genV1(): UUID;
-
-    /**
-     * Converts hexadecimal UUID string to an {@link UUID} object.
-     * @param {string} uuid UUID hexadecimal string representation ("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx").
-     * @returns {UUID} {@link UUID} object or null.
-     * @since 3.0
-     */
-    export function parse(uuid:string): UUID;
-
-
-    /**
-     * Re-initializes version 1 UUID state.
-     * @since 3.0
-     */
-    export function resetState(): void;
-
-    /**
-     * Reinstalls {@link UUID.generate} method to emulate the interface of UUID.js version 2.x.
-     * @since 3.1
-     * @deprecated Version 2.x. compatible interface is not recommended.
-     */
-    export function makeBackwardCompatible(): void;
-}
diff --git a/uuid/index.d.ts b/uuid/index.d.ts
new file mode 100644
index 0000000000..24ab5eb160
--- /dev/null
+++ b/uuid/index.d.ts
@@ -0,0 +1,82 @@
+// Type definitions for UUID.js v3.3.0
+// Project: https://github.com/LiosK/UUID.js
+// Definitions by: Jason Jarrett <https://github.com/staxmanade/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+interface UUID {
+    intFields: UUIDArray<number>;
+    bitFields: UUIDArray<string>;
+    hexFields: UUIDArray<string>;
+    version: number;
+    bitString: string;
+    hexString: string;
+    urn: string;
+
+
+    /**
+     * Tests if two {@link UUID} objects are equal.
+     * @param {UUID} uuid
+     * @returns {bool} True if two {@link UUID} objects are equal.
+     */
+    equals(uuid: UUID): boolean;
+
+    /**
+     * Returns UUID string representation.
+     * @returns {string} {@link UUID#hexString}.
+     */
+    toString(): string;
+}
+
+interface UUIDArray<T> extends Array<T> {
+    timeLow: string;
+    timeMid: string;
+    timeHiAndVersion: string;
+    clockSeqHiAndReserved: string;
+    clockSeqLow: string;
+    node: string;
+}
+
+/**
+ * The simplest function to get an UUID string.
+ * @returns {string} A version 4 UUID string.
+ */
+export declare function generate(): string;
+
+/**
+ * Generates a version 4 {@link UUID}.
+ * @returns {UUID} A version 4 {@link UUID} object.
+ * @since 3.0
+ */
+export declare function genV4(): UUID;
+
+
+/**
+ * Generates a version 1 {@link UUID}.
+ * @returns {UUID} A version 1 {@link UUID} object.
+ * @since 3.0
+ */
+export declare function genV1(): UUID;
+
+/**
+ * Converts hexadecimal UUID string to an {@link UUID} object.
+ * @param {string} uuid UUID hexadecimal string representation ("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx").
+ * @returns {UUID} {@link UUID} object or null.
+ * @since 3.0
+ */
+export declare function parse(uuid: string): UUID;
+
+
+/**
+ * Re-initializes version 1 UUID state.
+ * @since 3.0
+ */
+export declare function resetState(): void;
+
+/**
+ * Reinstalls {@link UUID.generate} method to emulate the interface of UUID.js version 2.x.
+ * @since 3.1
+ * @deprecated Version 2.x. compatible interface is not recommended.
+ */
+export declare function makeBackwardCompatible(): void;
diff --git a/uuid/tsconfig.json b/uuid/tsconfig.json
new file mode 100644
index 0000000000..f703e64adc
--- /dev/null
+++ b/uuid/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "uuid-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/valerie/index.d.ts b/valerie/index.d.ts
new file mode 100644
index 0000000000..cab8ee7467
--- /dev/null
+++ b/valerie/index.d.ts
@@ -0,0 +1,727 @@
+// Type definitions for valerie
+// Project: https://github.com/davewatts/valerie
+// Definitions by: Howard Richards <https://github.com/conficient>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="knockout" />
+
+/**
+ *
+ * Extensions to KO functions to provide validation
+ *
+ * Version 1.2 - added more static methods to valerie object
+ *
+ */
+interface KnockoutObservable<T> {
+    // starts validation for observable
+    validate(validationOptions?: Valerie.ValidationOptions): Valerie.PropertyValidationState<KnockoutObservable<T>>;
+}
+
+interface KnockoutComputed<T> {
+    // starts validation for observable
+    validate(validationOptions?: Valerie.ValidationOptions): Valerie.PropertyValidationState<KnockoutComputed<T>>;
+}
+
+interface KnockoutObservableArray<T> {
+    validate(validationOptions?: Valerie.ValidationOptions): Valerie.PropertyValidationState<KnockoutObservableArray<T>>;
+}
+
+interface KnockoutObservableArrayFunctions<T> {
+    /**
+     * Creates and sets a model validation state on a Knockout observable array.<br/>
+     * <i>[fluent]</i>
+     * @name ko.observableArray#validateAsModel
+     * @method
+     * @fluent
+     * @param {valerie.ModelValidationState.options} [validationOptions] the options to use when creating the
+     * validation state
+     * @return {valerie.ModelValidationState} the validation state belonging to the observable array
+     */
+    validateAsModel(): Valerie.ValidatableModel<KnockoutObservableArray<T>>;
+}
+
+/**
+* Valerie BindingHandlers
+*/
+interface KnockoutBindingHandlers {
+    /**
+     * Validates entries that can be checked, i.e. check boxes and radio buttons.
+     * Functions in the same way as the <b>ko.bindingHandlers.checked</b> binding handler, with the following
+     * alterations:
+     * <ul>
+     *     <li>registers a blur event handler so validation messages for selections can be displayed</li>
+     *     <li>registers a click event handler so validation state can be marked as touched</i>
+     * </ul>
+     * @name ko.bindingHandlers.validatedChecked
+     */
+    validatedChecked: KnockoutBindingHandler;
+
+    /**
+     * Validates options selected in a select list.
+     * Functions in the same way as the <b>ko.bindingHandlers.selectedOptions</b> binding handler, with the
+     * following alterations:
+     * <ul>
+     *     <li>registers a blur event handler so validation messages for selections can be displayed</li>
+     *     <li>registers a click event handler so validation state can be marked as touched</i>
+     * </ul>
+     * @name ko.bindingHandlers.validatedSelectedOptions
+     */
+    validatedSelectedOptions: KnockoutBindingHandler;
+
+    /**
+     * Validates entries that can be keyed or selected.
+     * Functions in the same way as the <b>ko.bindingHandlers.value</b> binding handler, with the following
+     * alterations:
+     * <ul>
+     *     <li>registers a blur event handler:
+     *     <ul>
+     *         <li>to display validation messages as entries or selections lose focus</li>
+     *         <li>to reformat successfully parsed textual entries</li>
+     *     </ul>
+     *     </li>
+     *     <li>
+     *         registers a focus event handler to pause the update of any existing visible validation message
+     *     </li>
+     *     <li>
+     *         registers a key-up event handler which validates the entry as it's being entered; this allows other
+     *         entries that are shown conditionally to be available before the user tabs out of this entry
+     *     </li>
+     * </ul>
+     * @name ko.bindingHandlers.validatedValue
+     */
+    validatedValue: KnockoutBindingHandler;
+
+    /**
+     * Disables the element when the chosen property or model has failed or is pending validation, enabled
+     * otherwise.
+     * @name ko.bindingHandlers.disabledWhenNotValid
+     */
+    disabledWhenNotValid: KnockoutBindingHandler;
+
+    /**
+     * Disables the element when the chosen property or model has been touched and has failed or is pending
+     * validation, enabled otherwise.<br/>
+     * @name ko.bindingHandlers.disabledWhenTouchedAndNotValid
+     */
+    disabledWhenTouchedAndNotValid: KnockoutBindingHandler;
+
+    /**
+     * Enables the element when the chosen property or model is applicable, disabled otherwise.
+     * @name ko.bindingHandlers.enabledWhenApplicable
+     */
+    enabledWhenApplicable: KnockoutBindingHandler;
+
+    /**
+     * Sets the text of the element to be a formatted representation of the specified property.
+     * @name ko.bindingHandlers.formattedText
+     */
+    formattedText: KnockoutBindingHandler;
+
+    /**
+     * Sets CSS classes on the element based on the validation state of the chosen property or model.</br>
+     * The names of the CSS classes used are held in the <b>ko.bindingHandlers.validationCss.classNames</b> object,
+     * by default they are:
+     * <ul>
+     *     <li><b>failed</b> - if validation failed</li>
+     *     <li><b>focused</b> - if the element is in focus</li>
+     *     <li><b>passed</b> - if validation passed</li>
+     *     <li><b>pending</b> - if validation is pending</li>
+     *     <li><b>required</b> - if an entry is required</li>
+     *     <li><b>showMessage</b> - if a validation message should be shown</li>
+     *     <li><b>touched</b> - set if the model or entry has been "touched"</li>
+     *     <li><b>untouched</b> - set if the model or entry has not been "touched"</li>
+     * </ul>
+     * @name ko.bindingHandlers.validationCss
+     */
+    validationCss: KnockoutBindingHandler
+
+    /**
+     * Makes the element behave like a validation message for the chosen property or model:
+     * <ul>
+     *     <li>makes the element visible if the value is invalid</li>
+     *     <li>sets the text of the element to be the underlying validation state's message</li>
+     * </ul>
+     * @name ko.bindingHandlers.validationMessage
+     */
+    validationMessage: KnockoutBindingHandler;
+
+    /**
+     * Sets the text of the element to be the underlying validation state's message.
+     * @name ko.bindingHandlers.validationMessageText
+     */
+    validationMessageText: KnockoutBindingHandler;
+
+    /**
+     * Sets the text of the element to be the underlying validation state's name.
+     * @name ko.bindingHandlers.validationName
+     */
+    validationName: KnockoutBindingHandler;
+
+    /**
+     * Makes the element visible if the chosen property or model is applicable, invisible otherwise.
+     * @name ko.bindingHandlers.visibleWhenApplicable
+     */
+    visibleWhenApplicable: KnockoutBindingHandler;
+
+    /**
+     * Makes the element visible when the entry bound to the chosen property is in focus, invisible otherwise.
+     * @name ko.bindingHandlers.visibleWhenFocused
+     */
+    visibleWhenFocused: KnockoutBindingHandler;
+
+    /**
+     * Makes the element visible when the chosen property or model has failed validation, invisible otherwise.
+     * @name ko.bindingHandlers.visibleWhenInvalid
+     */
+    visibleWhenInvalid: KnockoutBindingHandler;
+
+    /**
+     * Makes the element visible when the summary for the chosen model is not empty, invisible otherwise.
+     * @name ko.bindingHandlers.visibleWhenSummaryNotEmpty
+     */
+    visibleWhenSummaryNotEmpty: KnockoutBindingHandler;
+
+    /**
+     * Makes the element visible if the chosen property or model has been touched, invisible otherwise.
+     * @name ko.bindingHandlers.visibleWhenTouched
+     */
+    visibleWhenTouched: KnockoutBindingHandler;
+
+    /**
+     * Makes the element visible if the chosen property or model is untouched, invisible otherwise.
+     * @name ko.bindingHandlers.visibleWhenUntouched
+     */
+    visibleWhenUntouched: KnockoutBindingHandler;
+
+    /**
+     * Makes the element visible if the chosen property or model has passed validation.
+     * @name ko.bindingHandlers.visibleWhenValid
+     */
+    visibleWhenValid: KnockoutBindingHandler;
+}
+
+//
+// root valerie namespace - static methods
+//
+declare var valerie: Valerie.Static;
+
+// additional types for Valerie (all inside this namespace)
+
+declare namespace Valerie {
+    //
+    // Static methods on valerie namespace
+    //
+    interface Static {
+        /**
+         * Maps a source model to a destination model, including only applicable properties
+         * @param {Object|Array} sourceModel the source model
+         * @return {*} the destination model
+         */
+        mapApplicableModel(sourceModel: any): any;
+
+        /**
+         * Maps a source model to a destination model.
+         * @param {Object|Array} sourceModel the source model
+         * @param {valerie.includePropertyCallback} [includeWrappedFunction] a function called before each source model
+         * property is unwrapped, the result of which determines if the property is included in the destination model
+         * @param {valerie.includePropertyCallback} [includeUnwrappedFunction] a function called after each source
+         * model property is unwrapped, the result of which determines if the property is included in the destination model
+         * @return {*} the destination model
+         */
+        mapModel(sourceModel: any,
+            includeWrappedFunction?: IncludePropertyCallback,
+            includeUnwrappedFunction?: IncludePropertyCallback): any;
+
+        /**
+         * Makes the passed-in model validatable. After invocation the model will have a validation state.
+         * <br/><b>fluent</b>
+         * @param {object|function} model the model to make validatable
+         * @param {valerie.ModelValidationState.options} [options] the options to use when creating the model's validation
+         * state
+         * @return {valerie.ModelValidationState} the validation state belonging to the model
+         */
+        validatableModel(model: any, options?: ValidationOptions): ModelValidationState;
+
+        // Makes the passed-in property validatable. After invocation the property will have a validation state.
+        // (value should be observable or computed)
+        validatableProperty<T>(value: T, options?: ValidationOptions): PropertyValidationState<T>;
+
+        // Validation result class
+        ValidationResult: ValidationResultStatic;
+
+        // additional namespaces for static methods:
+
+        converters: ConvertersStatic;
+
+        /*
+        //TODO: additional namespaces/statics not yet used
+        dom: DomStatic;
+        formatting: FormattingStatic;
+        koBindingsHelper: KoBindingsHelperStatic;
+        koExtras: KoExtrasStatic;
+        rules: RulesStatic;
+        */
+
+        utils: UtilsStatic;
+
+        validationState: ValidationState;
+
+    }
+
+    interface ValidationResultStatic {
+
+        passedInstance: ValidationResult;
+
+        // static method to create validatio failed message
+        createFailedResult(message: string): ValidationResult;
+    }
+
+    // Contains converters, always singletons.
+    interface ConvertersStatic {
+
+        //TODO: other converters to be added
+
+        passThrough: Valerie.IConverter;
+    }
+
+
+    interface UtilsStatic {
+
+        // Creates a function that returns the given value as an array of one item, or simply returns the given value if it is already an array.
+        asArray<T>(value: any): any[];
+
+        // Creates a function that returns the given value, or simply returns the given value if it is already a function
+        asFunction<T>(value: T): () => T;
+        asFunction<T>(fn: () => T): () => T;
+
+        // Tests whether the given value is an array
+        isArray(value: any): boolean;
+
+        // Tests whether the given value is an array or object.
+        isArrayOrObject(value: any): boolean;
+
+        // Tests whether the given value is a function.
+        isFunction(value: any): boolean;
+
+        // Tests whether the given value is "missing".undefined, null, an empty string or an empty array are considered to be "missing".
+        isMissing(value: any): boolean;
+
+        // Tests whether the given value is an object.
+        isObject(value: any): boolean;
+
+        // Tests whether the give value is a string.
+        isString(value: any): boolean;
+
+        //Merges the given default options with the given options.
+        //  - either parameter can be omitted and a clone of the other parameter will be returned
+        //  - the merge is shallow
+        //  - array properties are shallow cloned
+        mergeOptions(defaultOptions: ValidationOptions, options:any): ValidationOptions;
+
+    }
+
+    // callback interface (see mapModel above)
+    interface IncludePropertyCallback {
+        (value: any, sourceModel: any, index: any): boolean;
+    }
+
+    // Constructs the validation state for a model, which may comprise of simple properties and sub-models.
+    interface ModelValidationState {
+        // ctor
+        new: (model: any, options?: ModelValidationStateOptions) => ModelValidationState;
+
+        model: any;
+        options?: ModelValidationStateOptions
+
+        // methods
+
+         /**
+         * Adds validation states to this validation state.<br/>
+         * <i>[fluent]</i>
+         * @name valerie.ModelValidationState#addValidationStates
+         * @fluent
+         * @param {object|array.<valerie.IValidationState>} validationStateOrStates the validation states to add
+         * @return {valerie.ModelValidationState}
+         */
+        addValidationStates(validationStateOrStates: any): ModelValidationState;
+
+        /**
+         * Sets the value or function used to determine if the model is applicable.<br/>
+         * <i>[fluent]</i>
+         * @name valerie.ModelValidationState#applicable
+         * @fluent
+         * @param {boolean|function} [valueOrFunction = true] the value or function to use
+         * @return {valerie.ModelValidationState}
+         */
+        applicable(valueOrFunction: any): ModelValidationState;
+
+        /**
+         * Clears the static summary of validation states that are in a failure state.<br/>
+         * <i>[fluent]</i>
+         * @name valerie.ModelValidationState#clearSummary
+         * @fluent
+         * @param {boolean} [clearSubModelSummaries = false] whether to clear the static summaries for sub-models
+         * @return {valerie.ModelValidationState}
+         */
+        clearSummary(valueOrFunction: any): ModelValidationState;
+
+        /***
+         * Gets whether the model has failed validation.
+         * @return {boolean}
+         */
+        failed(): boolean;
+
+        /***
+         * Gets the validation states that belong to the model that are in a failure state.
+         * @return {Valerie.IValidationState[]}
+         */
+        failedStates(): Valerie.IValidationState[];
+
+        /***
+         * Gets the name of the model.
+         * @return {string}
+         */
+        getName(): string;
+
+        isApplicable(): boolean;
+        message(): string;
+        passed(): boolean;
+
+        /***
+         * Gets or sets whether the computation that updates the validation result has been paused.
+         * @param {boolean} [value = false] true if the computation should be paused, false if the computation should not be paused
+         * @return {boolean} true if computation is paused, false otherwise
+         */
+        paused(value: boolean): boolean;
+
+        pending(): boolean;
+
+        pendingStates(): IValidationState[];
+
+        refresh(): void;
+
+        result(): ValidationResult;
+
+        summary(): summaryItem[]
+
+        /***
+         * Gets or sets whether the model has been 'touched' by user action
+         */
+        touched(value: boolean): boolean;
+
+
+        validationStates(): IValidationState[];
+
+        /**
+         * Includes any validation failures for this model in a validation summary.<br/>
+         * <i>[fluent]</i>
+         * @fluent
+         * @return {valerie.ModelValidationState}
+         */
+        includeInSummary(): ModelValidationState;
+
+        /**
+         * Sets the value or function used to determine the name of the model.<br/>
+         * <i>[fluent]</i>
+         * @fluent
+         * @param {string|function} valueOrFunction the value or function to use
+         * @return {valerie.ModelValidationState}
+         */
+        name(valueOrFunction: any): ModelValidationState;
+
+        /**
+         * Removes validation states.<br/>
+         * <i>[fluent]</i>
+         * @fluent
+         * @param {object|array.<valerie.IValidationState>} validationStateOrStates the validation states to remove
+         * @return {valerie.ModelValidationState}
+         */
+        removeValidationStates(validationStateOrStates: any): ModelValidationState;
+
+        /**
+         * Stops validating the given sub-model by adding the validation state that belongs to it.
+         * @param {*} validatableSubModel the sub - model to start validating
+         * @return {valerie.ModelValidationState }
+         */
+        startValidatingSubModel(validatableSubModel: any): ModelValidationState;
+
+        /**
+         * Stops validating the given sub-model by removing the validation state that belongs to it.
+         * @param {*} validatableSubModel the sub-model to stop validating
+         * @return {valerie.ModelValidationState}
+         */
+        stopValidatingSubModel(validatableSubModel: any): ModelValidationState;
+
+        /**
+        * Updates the static summary of validation states that are in a failure state.<br/>
+        * <i>[fluent]</i>
+        * @fluent
+        * @param {boolean} [updateSubModelSummaries = false] whether to update the static summaries for sub-models
+        * @return {valerie.ModelValidationState}
+        */
+        updateSummary(updateSubModelSummaries: boolean): ModelValidationState;
+
+        /**
+        * Adds the validation states for all the descendant properties and sub-models that belong to the model.<br/>
+        * <i>[fluent]</i>
+        * @fluent
+        * @return {valerie.ModelValidationState}
+        */
+        validateAll(): ModelValidationState;
+
+        /**
+         * Adds the validation states for all the descendant properties that belong to the model.<br/>
+         * <i>[fluent]</i>
+         * @fluent
+         * @return {valerie.ModelValidationState}
+         */
+        validateAllProperties(): ModelValidationState;
+
+        /**
+         * Adds the validation states for all the child properties that belong to the model.<br/>
+         * <i>[fluent]</i>
+         * @fluent
+         * @return {valerie.ModelValidationState}
+         */
+        validateChildProperties(): ModelValidationState;
+
+        /**
+         * Adds the validation states for all the child properties and sub-models that belong to the model.<br/>
+         * <i>[fluent]</i>
+         * @fluent
+         * @return {valerie.ModelValidationState}
+         */
+        validateChildPropertiesAndSubModels(): ModelValidationState;
+
+
+        /**
+         * Ends a chain of fluent method calls on this model validation state.
+         * @return {function} the model the validation state is for
+         */
+        end(): any;
+    }
+
+    // Construction options for a model validation state.
+    interface ModelValidationStateOptions {
+        applicable(): boolean;
+        excludeFromSummary: boolean;
+        failureMessage: string;
+        name(): string;
+        paused(): boolean;
+    }
+
+    //
+    // PropertyValidationState
+    //
+    interface PropertyValidationState<T> {
+        // properties:
+
+        // the observable or computed the validation state is for
+        observableOrComputed: T;
+        // the options to use when creating the validation state
+        options: ValidationOptions;
+
+        // fluent methods (can be chanined):
+
+        /**
+         * Adds a rule to the chain of rules used to validate the property's value.<br/>
+         * <i>[fluent]</i>
+         * @fluent
+         * @param {valerie.IRule} rule the rule to add
+         * @return {valerie.PropertyValidationState}
+         */
+        addRule(rule: IRule): PropertyValidationState<T>;
+        applicable(value: boolean): PropertyValidationState<T>;
+        applicable(fn: () => boolean): PropertyValidationState<T>;
+        currencyMajor(options?: ValidationOptions): PropertyValidationState<T>;
+        currencyMajorMinor(options?: ValidationOptions): PropertyValidationState<T>;
+
+        date(): PropertyValidationState<T>;
+        during(earliest: Date, latest: Date, options?: ValidationOptions): PropertyValidationState<T>; // date + date
+        during(earliest: () => Date, latest: Date, options?: ValidationOptions): PropertyValidationState<T>; // dateFN + date
+        during(earliest: Date, latest: () => Date, options?: ValidationOptions): PropertyValidationState<T>; // date + dateFN
+        during(earliest: () => Date, latest: () => Date, options?: ValidationOptions): PropertyValidationState<T>; // dateFN + dateFN
+        earliest(earliest: Date, options?: ValidationOptions): PropertyValidationState<T>; // date value
+        earliest(earliest: () => Date, options?: ValidationOptions): PropertyValidationState<T>; // date function
+        email(): PropertyValidationState<T>;
+        entryFormat(format: string): PropertyValidationState<T>;
+        excludeFromSummary(): PropertyValidationState<T>;
+        expression(regularExpression: RegExp, options?: ValidationOptions): PropertyValidationState<T>; // regex
+        expression(regularExpressionString: string, options?: ValidationOptions): PropertyValidationState<T>; // regex string
+        float(options?: ValidationOptions): PropertyValidationState<T>;
+        integer(options?: ValidationOptions): PropertyValidationState<T>;
+        latest(latestValueOrFunction: Date, options?: ValidationOptions): PropertyValidationState<T>;
+        latest(latestValueOrFunction: () => Date, options?: ValidationOptions): PropertyValidationState<T>;
+        lengthBetween(shortest: number, longest: number, options?: ValidationOptions): PropertyValidationState<T>;
+        lengthBetween(shortest: number, longest: () => number, options?: ValidationOptions): PropertyValidationState<T>;
+        lengthBetween(shortest: () => number, longest: number, options?: ValidationOptions): PropertyValidationState<T>;
+        lengthBetween(shortest: () => number, longest: () => number, options?: ValidationOptions): PropertyValidationState<T>;
+        matches(permitted: any, options?: ValidationOptions): PropertyValidationState<T>;
+        matches(permitted: () => any, options?: ValidationOptions): PropertyValidationState<T>;
+
+        maximum(maximum: any, options?: ValidationOptions): PropertyValidationState<T>;
+        maximum(maximum: () => any, options?: ValidationOptions): PropertyValidationState<T>;
+        maximumLength(longest: number, options?: ValidationOptions): PropertyValidationState<T>;
+        maximumLength(longest: () => number, options?: ValidationOptions): PropertyValidationState<T>;
+        maximumNumberOfItems(maximum: number, options?: ValidationOptions): PropertyValidationState<T>;
+        maximumNumberOfItems(maximum: () => number, options?: ValidationOptions): PropertyValidationState<T>;
+
+        minimum(minimumValueOrFunction: any, options?: ValidationOptions): PropertyValidationState<T>;
+        minimumLength(shortest: number, options?: ValidationOptions): PropertyValidationState<T>;
+        minimumLength(shortest: () => number, options?: ValidationOptions): PropertyValidationState<T>;
+        minimumNumberOfItems(minimum: number, options?: ValidationOptions): PropertyValidationState<T>;
+        minimumNumberOfItems(minimum: () => number, options?: ValidationOptions): PropertyValidationState<T>;
+
+        name(value: string): PropertyValidationState<T>;
+        name(value: () => string): PropertyValidationState<T>;
+        noneOf(forbiddenValues: any[], options?: ValidationOptions): PropertyValidationState<T>;
+        noneOf(forbiddenValues: () => any[], options?: ValidationOptions): PropertyValidationState<T>;
+
+        not(forbiddenValueOrFunction: any, options?: ValidationOptions): PropertyValidationState<T>;
+        number(): PropertyValidationState<T>;
+        numberOfItems(minimumValueOrFunction: any, maximumValueOrFunction: any, options?: ValidationOptions): PropertyValidationState<T>;
+        oneOf(permittedValues: any[], options?: ValidationOptions): PropertyValidationState<T>;
+        oneOf(permittedValues: () => any[], options?: ValidationOptions): PropertyValidationState<T>;
+        postcode(): PropertyValidationState<T>;
+        range(minimumValueOrFunction: any, maximumValueOrFunction: any, options?: ValidationOptions): PropertyValidationState<T>;
+        required(valueOrFunction?: any): PropertyValidationState<T>;
+        rule(testFunction: () => any): PropertyValidationState<T>;
+        ruleMessage(failureMessageFormat: string): PropertyValidationState<T>;
+        string(): PropertyValidationState<T>;
+
+        valueFormat(format: string): PropertyValidationState<T>;
+
+        validateChildProperties(): PropertyValidationState<T>;
+
+        // return original observable
+        end(): T;
+
+        // other methods: not returning PropertyValidationState<T>
+        failed(): boolean;
+        getName(): string;
+        isApplicable(): boolean;
+        isRequired(): boolean;
+        message(): string;
+        passed(): boolean;
+        pending(): boolean;
+        showMessage(): boolean;
+        touched(): boolean;               // get touched state
+        touched(value: boolean): boolean; // set touched state
+        result(): ValidationResult;
+    }
+
+    interface ValidationResult {
+        state: any; // the result state
+        failed: boolean;	//true if the activity failed validation
+        passed: boolean;	//true if the activity passed validation
+        pending: boolean;	//true if the activity hasn't yet completed
+        message: string;	//a message from the activity
+        new: (state: any, message?: string) => ValidationResult;
+    }
+
+    interface IRule {
+        defaultOptions: ValidationOptions;
+        test(value: any): ValidationResult;
+    }
+
+    // The interface for a validation state.
+    interface IValidationState {
+        failed(): boolean;
+        getName(): string;
+        isApplicable(): boolean;
+        message(): string;
+        passed(): boolean;
+        pending(): boolean;
+        result(): ValidationResult;
+        touched(value?: boolean): boolean;
+    }
+
+    interface ValidatableModel<T> {
+        name: (value: string) => PropertyValidationState<T>;
+
+        // return original observableArray
+        end: () => T;
+    }
+
+    interface ValidationOptions {
+        applicable? (): any;  // the function used to determine if the property is applicable
+        converter?: IConverter;  // the converter used to parse user entries and format display of the property's value
+        entryFormat?: string;  // the string used to format the property's value for display in a user entry
+        excludeFromSummary?: boolean;  // whether any validation failures for this property are excluded from a summary
+        invalidFailureMessage?: string;  // the message shown when the user has entered an invalid value
+        missingFailureMessage?: string;  // the message shown when a value is required but is missing
+        name?: () => any;  // the function used to determine the name of the property; used in failure messages
+        required?: () => any;  // the function used to determine if a value is required
+        rules?: any; //Valerie.array.<IRule>;  // the chain of rules used to validate the property's value
+        valueFormat?: string;  // the string use to format the property's value for display in a message
+    }
+
+    // The interface for a converter, a pair of functions: format and parse, which work in tandem on a single type of value.
+    interface IConverter {
+        format: (value: any, format?: string) => string; // Formats the given value as a string.
+        parse: (value: string) => any; //Parses the given string as a particular value type.
+    }
+
+    // A helper for parsing and formatting numeric values.
+    interface NumericHelper {
+        // Adds thousands separators to the given numeric string.
+        addThousandsSeparator(numericString: string): string;
+
+        // Formats the given numeric value as a string.
+        format(value: number, format: string): string;
+
+        // Initialises the helper
+        init(decimalSeparator: string,
+            thousandsSeparator: string,
+            currencySign: string,
+            currencyMinorUnitPlaces: number): NumericHelper;
+
+        // Informs whether the given numeric string represents a currency value with major units only.
+        isCurrencyMajor(numericString: string): boolean;
+
+        // Informs whether the given numeric string represents a currency value with major units and optionally minor units.
+        isCurrencyMajorMinor(numericString: string): boolean;
+
+        // Informs whether the given numeric string represents a non-integer numeric value.
+        isFloat(numericString: string): boolean;
+
+        // Informs whether the given numeric string represents an integer value.
+        isInteger(numericString: string): boolean;
+
+        // Attempts to parse the given numeric string as a number value. The string is unformatted first.
+        parse(numericString: string): number;
+
+        // Unformats a numeric string; removes currency signs, thousands separators and normalises decimal separators.
+        unformat(numericString: string): string;
+    }
+
+    interface ValidationState {
+        // Finds and returns the validation states
+        findIn(model: any,
+            includeSubModels?: boolean,
+            recurse?: boolean,
+            validationStates?: IValidationState[]): IValidationState[];
+
+        // Gets the validation state for the given model, observable or computed.
+        getFor(modelOrObservableOrComputed: any): IValidationState;
+
+        // nforms if the given model, observable or computed has a validation state.
+        has(modelOrObservableOrComputed: any): boolean;
+
+        // Sets the validation state for the given model, observable or computed.
+        setFor(modelOrObservableOrComputed: any, state: IValidationState): void;
+    }
+
+    interface summaryItem {
+        name: string;
+        message: string;
+    }
+}
+
+declare namespace Valerie.Rules {
+    /*
+
+      Todo: add classes in valerie.rules namespace
+
+      */
+}
diff --git a/valerie/tsconfig.json b/valerie/tsconfig.json
new file mode 100644
index 0000000000..6660ef9500
--- /dev/null
+++ b/valerie/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "valerie-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/valerie/valerie-tests.ts b/valerie/valerie-tests.ts
index ea87aafaee..30ca6576b7 100644
--- a/valerie/valerie-tests.ts
+++ b/valerie/valerie-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="valerie.d.ts" />
-/// <reference path="../knockout/knockout.d.ts" />
+
+/// <reference types="knockout" />
 
 // Tests for valerie.d.ts
 // Project: https://github.com/davewatts/valerie
diff --git a/valerie/valerie.d.ts b/valerie/valerie.d.ts
deleted file mode 100644
index 053b8eb4f1..0000000000
--- a/valerie/valerie.d.ts
+++ /dev/null
@@ -1,727 +0,0 @@
-// Type definitions for valerie
-// Project: https://github.com/davewatts/valerie
-// Definitions by: Howard Richards <https://github.com/conficient>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../knockout/knockout.d.ts" />
-
-/**
- *
- * Extensions to KO functions to provide validation
- *
- * Version 1.2 - added more static methods to valerie object
- *
- */
-interface KnockoutObservable<T> {
-    // starts validation for observable
-    validate(validationOptions?: Valerie.ValidationOptions): Valerie.PropertyValidationState<KnockoutObservable<T>>;
-}
-
-interface KnockoutComputed<T> {
-    // starts validation for observable
-    validate(validationOptions?: Valerie.ValidationOptions): Valerie.PropertyValidationState<KnockoutComputed<T>>;
-}
-
-interface KnockoutObservableArray<T> {
-    validate(validationOptions?: Valerie.ValidationOptions): Valerie.PropertyValidationState<KnockoutObservableArray<T>>;
-}
-
-interface KnockoutObservableArrayFunctions<T> {
-    /**
-     * Creates and sets a model validation state on a Knockout observable array.<br/>
-     * <i>[fluent]</i>
-     * @name ko.observableArray#validateAsModel
-     * @method
-     * @fluent
-     * @param {valerie.ModelValidationState.options} [validationOptions] the options to use when creating the
-     * validation state
-     * @return {valerie.ModelValidationState} the validation state belonging to the observable array
-     */
-    validateAsModel(): Valerie.ValidatableModel<KnockoutObservableArray<T>>;
-}
-
-/**
-* Valerie BindingHandlers
-*/
-interface KnockoutBindingHandlers {
-    /**
-     * Validates entries that can be checked, i.e. check boxes and radio buttons.
-     * Functions in the same way as the <b>ko.bindingHandlers.checked</b> binding handler, with the following
-     * alterations:
-     * <ul>
-     *     <li>registers a blur event handler so validation messages for selections can be displayed</li>
-     *     <li>registers a click event handler so validation state can be marked as touched</i>
-     * </ul>
-     * @name ko.bindingHandlers.validatedChecked
-     */
-    validatedChecked: KnockoutBindingHandler;
-
-    /**
-     * Validates options selected in a select list.
-     * Functions in the same way as the <b>ko.bindingHandlers.selectedOptions</b> binding handler, with the
-     * following alterations:
-     * <ul>
-     *     <li>registers a blur event handler so validation messages for selections can be displayed</li>
-     *     <li>registers a click event handler so validation state can be marked as touched</i>
-     * </ul>
-     * @name ko.bindingHandlers.validatedSelectedOptions
-     */
-    validatedSelectedOptions: KnockoutBindingHandler;
-
-    /**
-     * Validates entries that can be keyed or selected.
-     * Functions in the same way as the <b>ko.bindingHandlers.value</b> binding handler, with the following
-     * alterations:
-     * <ul>
-     *     <li>registers a blur event handler:
-     *     <ul>
-     *         <li>to display validation messages as entries or selections lose focus</li>
-     *         <li>to reformat successfully parsed textual entries</li>
-     *     </ul>
-     *     </li>
-     *     <li>
-     *         registers a focus event handler to pause the update of any existing visible validation message
-     *     </li>
-     *     <li>
-     *         registers a key-up event handler which validates the entry as it's being entered; this allows other
-     *         entries that are shown conditionally to be available before the user tabs out of this entry
-     *     </li>
-     * </ul>
-     * @name ko.bindingHandlers.validatedValue
-     */
-    validatedValue: KnockoutBindingHandler;
-
-    /**
-     * Disables the element when the chosen property or model has failed or is pending validation, enabled
-     * otherwise.
-     * @name ko.bindingHandlers.disabledWhenNotValid
-     */
-    disabledWhenNotValid: KnockoutBindingHandler;
-
-    /**
-     * Disables the element when the chosen property or model has been touched and has failed or is pending
-     * validation, enabled otherwise.<br/>
-     * @name ko.bindingHandlers.disabledWhenTouchedAndNotValid
-     */
-    disabledWhenTouchedAndNotValid: KnockoutBindingHandler;
-
-    /**
-     * Enables the element when the chosen property or model is applicable, disabled otherwise.
-     * @name ko.bindingHandlers.enabledWhenApplicable
-     */
-    enabledWhenApplicable: KnockoutBindingHandler;
-
-    /**
-     * Sets the text of the element to be a formatted representation of the specified property.
-     * @name ko.bindingHandlers.formattedText
-     */
-    formattedText: KnockoutBindingHandler;
-
-    /**
-     * Sets CSS classes on the element based on the validation state of the chosen property or model.</br>
-     * The names of the CSS classes used are held in the <b>ko.bindingHandlers.validationCss.classNames</b> object,
-     * by default they are:
-     * <ul>
-     *     <li><b>failed</b> - if validation failed</li>
-     *     <li><b>focused</b> - if the element is in focus</li>
-     *     <li><b>passed</b> - if validation passed</li>
-     *     <li><b>pending</b> - if validation is pending</li>
-     *     <li><b>required</b> - if an entry is required</li>
-     *     <li><b>showMessage</b> - if a validation message should be shown</li>
-     *     <li><b>touched</b> - set if the model or entry has been "touched"</li>
-     *     <li><b>untouched</b> - set if the model or entry has not been "touched"</li>
-     * </ul>
-     * @name ko.bindingHandlers.validationCss
-     */
-    validationCss: KnockoutBindingHandler
-
-    /**
-     * Makes the element behave like a validation message for the chosen property or model:
-     * <ul>
-     *     <li>makes the element visible if the value is invalid</li>
-     *     <li>sets the text of the element to be the underlying validation state's message</li>
-     * </ul>
-     * @name ko.bindingHandlers.validationMessage
-     */
-    validationMessage: KnockoutBindingHandler;
-
-    /**
-     * Sets the text of the element to be the underlying validation state's message.
-     * @name ko.bindingHandlers.validationMessageText
-     */
-    validationMessageText: KnockoutBindingHandler;
-
-    /**
-     * Sets the text of the element to be the underlying validation state's name.
-     * @name ko.bindingHandlers.validationName
-     */
-    validationName: KnockoutBindingHandler;
-
-    /**
-     * Makes the element visible if the chosen property or model is applicable, invisible otherwise.
-     * @name ko.bindingHandlers.visibleWhenApplicable
-     */
-    visibleWhenApplicable: KnockoutBindingHandler;
-
-    /**
-     * Makes the element visible when the entry bound to the chosen property is in focus, invisible otherwise.
-     * @name ko.bindingHandlers.visibleWhenFocused
-     */
-    visibleWhenFocused: KnockoutBindingHandler;
-
-    /**
-     * Makes the element visible when the chosen property or model has failed validation, invisible otherwise.
-     * @name ko.bindingHandlers.visibleWhenInvalid
-     */
-    visibleWhenInvalid: KnockoutBindingHandler;
-
-    /**
-     * Makes the element visible when the summary for the chosen model is not empty, invisible otherwise.
-     * @name ko.bindingHandlers.visibleWhenSummaryNotEmpty
-     */
-    visibleWhenSummaryNotEmpty: KnockoutBindingHandler;
-
-    /**
-     * Makes the element visible if the chosen property or model has been touched, invisible otherwise.
-     * @name ko.bindingHandlers.visibleWhenTouched
-     */
-    visibleWhenTouched: KnockoutBindingHandler;
-
-    /**
-     * Makes the element visible if the chosen property or model is untouched, invisible otherwise.
-     * @name ko.bindingHandlers.visibleWhenUntouched
-     */
-    visibleWhenUntouched: KnockoutBindingHandler;
-
-    /**
-     * Makes the element visible if the chosen property or model has passed validation.
-     * @name ko.bindingHandlers.visibleWhenValid
-     */
-    visibleWhenValid: KnockoutBindingHandler;
-}
-
-//
-// root valerie namespace - static methods
-//
-declare var valerie: Valerie.Static;
-
-// additional types for Valerie (all inside this namespace)
-
-declare namespace Valerie {
-    //
-    // Static methods on valerie namespace
-    //
-    interface Static {
-        /**
-         * Maps a source model to a destination model, including only applicable properties
-         * @param {Object|Array} sourceModel the source model
-         * @return {*} the destination model
-         */
-        mapApplicableModel(sourceModel: any): any;
-
-        /**
-         * Maps a source model to a destination model.
-         * @param {Object|Array} sourceModel the source model
-         * @param {valerie.includePropertyCallback} [includeWrappedFunction] a function called before each source model
-         * property is unwrapped, the result of which determines if the property is included in the destination model
-         * @param {valerie.includePropertyCallback} [includeUnwrappedFunction] a function called after each source
-         * model property is unwrapped, the result of which determines if the property is included in the destination model
-         * @return {*} the destination model
-         */
-        mapModel(sourceModel: any,
-            includeWrappedFunction?: IncludePropertyCallback,
-            includeUnwrappedFunction?: IncludePropertyCallback): any;
-
-        /**
-         * Makes the passed-in model validatable. After invocation the model will have a validation state.
-         * <br/><b>fluent</b>
-         * @param {object|function} model the model to make validatable
-         * @param {valerie.ModelValidationState.options} [options] the options to use when creating the model's validation
-         * state
-         * @return {valerie.ModelValidationState} the validation state belonging to the model
-         */
-        validatableModel(model: any, options?: ValidationOptions): ModelValidationState;
-
-        // Makes the passed-in property validatable. After invocation the property will have a validation state.
-        // (value should be observable or computed)
-        validatableProperty<T>(value: T, options?: ValidationOptions): PropertyValidationState<T>;
-
-        // Validation result class
-        ValidationResult: ValidationResultStatic;
-
-        // additional namespaces for static methods:
-
-        converters: ConvertersStatic;
-
-        /*
-        //TODO: additional namespaces/statics not yet used
-        dom: DomStatic;
-        formatting: FormattingStatic;
-        koBindingsHelper: KoBindingsHelperStatic;
-        koExtras: KoExtrasStatic;
-        rules: RulesStatic;
-        */
-
-        utils: UtilsStatic;
-
-        validationState: ValidationState;
-
-    }
-
-    interface ValidationResultStatic {
-
-        passedInstance: ValidationResult;
-
-        // static method to create validatio failed message
-        createFailedResult(message: string): ValidationResult;
-    }
-
-    // Contains converters, always singletons.
-    interface ConvertersStatic {
-
-        //TODO: other converters to be added
-
-        passThrough: Valerie.IConverter;
-    }
-
-
-    interface UtilsStatic {
-
-        // Creates a function that returns the given value as an array of one item, or simply returns the given value if it is already an array.
-        asArray<T>(value: any): any[];
-
-        // Creates a function that returns the given value, or simply returns the given value if it is already a function
-        asFunction<T>(value: T): () => T;
-        asFunction<T>(fn: () => T): () => T;
-
-        // Tests whether the given value is an array
-        isArray(value: any): boolean;
-
-        // Tests whether the given value is an array or object.
-        isArrayOrObject(value: any): boolean;
-
-        // Tests whether the given value is a function.
-        isFunction(value: any): boolean;
-
-        // Tests whether the given value is "missing".undefined, null, an empty string or an empty array are considered to be "missing".
-        isMissing(value: any): boolean;
-
-        // Tests whether the given value is an object.
-        isObject(value: any): boolean;
-
-        // Tests whether the give value is a string.
-        isString(value: any): boolean;
-
-        //Merges the given default options with the given options.
-        //  - either parameter can be omitted and a clone of the other parameter will be returned
-        //  - the merge is shallow
-        //  - array properties are shallow cloned
-        mergeOptions(defaultOptions: ValidationOptions, options:any): ValidationOptions;
-
-    }
-
-    // callback interface (see mapModel above)
-    interface IncludePropertyCallback {
-        (value: any, sourceModel: any, index: any): boolean;
-    }
-
-    // Constructs the validation state for a model, which may comprise of simple properties and sub-models.
-    interface ModelValidationState {
-        // ctor
-        new: (model: any, options?: ModelValidationStateOptions) => ModelValidationState;
-
-        model: any;
-        options?: ModelValidationStateOptions
-
-        // methods
-
-         /**
-         * Adds validation states to this validation state.<br/>
-         * <i>[fluent]</i>
-         * @name valerie.ModelValidationState#addValidationStates
-         * @fluent
-         * @param {object|array.<valerie.IValidationState>} validationStateOrStates the validation states to add
-         * @return {valerie.ModelValidationState}
-         */
-        addValidationStates(validationStateOrStates: any): ModelValidationState;
-
-        /**
-         * Sets the value or function used to determine if the model is applicable.<br/>
-         * <i>[fluent]</i>
-         * @name valerie.ModelValidationState#applicable
-         * @fluent
-         * @param {boolean|function} [valueOrFunction = true] the value or function to use
-         * @return {valerie.ModelValidationState}
-         */
-        applicable(valueOrFunction: any): ModelValidationState;
-
-        /**
-         * Clears the static summary of validation states that are in a failure state.<br/>
-         * <i>[fluent]</i>
-         * @name valerie.ModelValidationState#clearSummary
-         * @fluent
-         * @param {boolean} [clearSubModelSummaries = false] whether to clear the static summaries for sub-models
-         * @return {valerie.ModelValidationState}
-         */
-        clearSummary(valueOrFunction: any): ModelValidationState;
-
-        /***
-         * Gets whether the model has failed validation.
-         * @return {boolean}
-         */
-        failed(): boolean;
-
-        /***
-         * Gets the validation states that belong to the model that are in a failure state.
-         * @return {Valerie.IValidationState[]}
-         */
-        failedStates(): Valerie.IValidationState[];
-
-        /***
-         * Gets the name of the model.
-         * @return {string}
-         */
-        getName(): string;
-
-        isApplicable(): boolean;
-        message(): string;
-        passed(): boolean;
-
-        /***
-         * Gets or sets whether the computation that updates the validation result has been paused.
-         * @param {boolean} [value = false] true if the computation should be paused, false if the computation should not be paused
-         * @return {boolean} true if computation is paused, false otherwise
-         */
-        paused(value: boolean): boolean;
-
-        pending(): boolean;
-
-        pendingStates(): IValidationState[];
-
-        refresh(): void;
-
-        result(): ValidationResult;
-
-        summary(): summaryItem[]
-
-        /***
-         * Gets or sets whether the model has been 'touched' by user action
-         */
-        touched(value: boolean): boolean;
-
-
-        validationStates(): IValidationState[];
-
-        /**
-         * Includes any validation failures for this model in a validation summary.<br/>
-         * <i>[fluent]</i>
-         * @fluent
-         * @return {valerie.ModelValidationState}
-         */
-        includeInSummary(): ModelValidationState;
-
-        /**
-         * Sets the value or function used to determine the name of the model.<br/>
-         * <i>[fluent]</i>
-         * @fluent
-         * @param {string|function} valueOrFunction the value or function to use
-         * @return {valerie.ModelValidationState}
-         */
-        name(valueOrFunction: any): ModelValidationState;
-
-        /**
-         * Removes validation states.<br/>
-         * <i>[fluent]</i>
-         * @fluent
-         * @param {object|array.<valerie.IValidationState>} validationStateOrStates the validation states to remove
-         * @return {valerie.ModelValidationState}
-         */
-        removeValidationStates(validationStateOrStates: any): ModelValidationState;
-
-        /**
-         * Stops validating the given sub-model by adding the validation state that belongs to it.
-         * @param {*} validatableSubModel the sub - model to start validating
-         * @return {valerie.ModelValidationState }
-         */
-        startValidatingSubModel(validatableSubModel: any): ModelValidationState;
-
-        /**
-         * Stops validating the given sub-model by removing the validation state that belongs to it.
-         * @param {*} validatableSubModel the sub-model to stop validating
-         * @return {valerie.ModelValidationState}
-         */
-        stopValidatingSubModel(validatableSubModel: any): ModelValidationState;
-
-        /**
-        * Updates the static summary of validation states that are in a failure state.<br/>
-        * <i>[fluent]</i>
-        * @fluent
-        * @param {boolean} [updateSubModelSummaries = false] whether to update the static summaries for sub-models
-        * @return {valerie.ModelValidationState}
-        */
-        updateSummary(updateSubModelSummaries: boolean): ModelValidationState;
-
-        /**
-        * Adds the validation states for all the descendant properties and sub-models that belong to the model.<br/>
-        * <i>[fluent]</i>
-        * @fluent
-        * @return {valerie.ModelValidationState}
-        */
-        validateAll(): ModelValidationState;
-
-        /**
-         * Adds the validation states for all the descendant properties that belong to the model.<br/>
-         * <i>[fluent]</i>
-         * @fluent
-         * @return {valerie.ModelValidationState}
-         */
-        validateAllProperties(): ModelValidationState;
-
-        /**
-         * Adds the validation states for all the child properties that belong to the model.<br/>
-         * <i>[fluent]</i>
-         * @fluent
-         * @return {valerie.ModelValidationState}
-         */
-        validateChildProperties(): ModelValidationState;
-
-        /**
-         * Adds the validation states for all the child properties and sub-models that belong to the model.<br/>
-         * <i>[fluent]</i>
-         * @fluent
-         * @return {valerie.ModelValidationState}
-         */
-        validateChildPropertiesAndSubModels(): ModelValidationState;
-
-
-        /**
-         * Ends a chain of fluent method calls on this model validation state.
-         * @return {function} the model the validation state is for
-         */
-        end(): any;
-    }
-
-    // Construction options for a model validation state.
-    interface ModelValidationStateOptions {
-        applicable(): boolean;
-        excludeFromSummary: boolean;
-        failureMessage: string;
-        name(): string;
-        paused(): boolean;
-    }
-
-    //
-    // PropertyValidationState
-    //
-    interface PropertyValidationState<T> {
-        // properties:
-
-        // the observable or computed the validation state is for
-        observableOrComputed: T;
-        // the options to use when creating the validation state
-        options: ValidationOptions;
-
-        // fluent methods (can be chanined):
-
-        /**
-         * Adds a rule to the chain of rules used to validate the property's value.<br/>
-         * <i>[fluent]</i>
-         * @fluent
-         * @param {valerie.IRule} rule the rule to add
-         * @return {valerie.PropertyValidationState}
-         */
-        addRule(rule: IRule): PropertyValidationState<T>;
-        applicable(value: boolean): PropertyValidationState<T>;
-        applicable(fn: () => boolean): PropertyValidationState<T>;
-        currencyMajor(options?: ValidationOptions): PropertyValidationState<T>;
-        currencyMajorMinor(options?: ValidationOptions): PropertyValidationState<T>;
-
-        date(): PropertyValidationState<T>;
-        during(earliest: Date, latest: Date, options?: ValidationOptions): PropertyValidationState<T>; // date + date
-        during(earliest: () => Date, latest: Date, options?: ValidationOptions): PropertyValidationState<T>; // dateFN + date
-        during(earliest: Date, latest: () => Date, options?: ValidationOptions): PropertyValidationState<T>; // date + dateFN
-        during(earliest: () => Date, latest: () => Date, options?: ValidationOptions): PropertyValidationState<T>; // dateFN + dateFN
-        earliest(earliest: Date, options?: ValidationOptions): PropertyValidationState<T>; // date value
-        earliest(earliest: () => Date, options?: ValidationOptions): PropertyValidationState<T>; // date function
-        email(): PropertyValidationState<T>;
-        entryFormat(format: string): PropertyValidationState<T>;
-        excludeFromSummary(): PropertyValidationState<T>;
-        expression(regularExpression: RegExp, options?: ValidationOptions): PropertyValidationState<T>; // regex
-        expression(regularExpressionString: string, options?: ValidationOptions): PropertyValidationState<T>; // regex string
-        float(options?: ValidationOptions): PropertyValidationState<T>;
-        integer(options?: ValidationOptions): PropertyValidationState<T>;
-        latest(latestValueOrFunction: Date, options?: ValidationOptions): PropertyValidationState<T>;
-        latest(latestValueOrFunction: () => Date, options?: ValidationOptions): PropertyValidationState<T>;
-        lengthBetween(shortest: number, longest: number, options?: ValidationOptions): PropertyValidationState<T>;
-        lengthBetween(shortest: number, longest: () => number, options?: ValidationOptions): PropertyValidationState<T>;
-        lengthBetween(shortest: () => number, longest: number, options?: ValidationOptions): PropertyValidationState<T>;
-        lengthBetween(shortest: () => number, longest: () => number, options?: ValidationOptions): PropertyValidationState<T>;
-        matches(permitted: any, options?: ValidationOptions): PropertyValidationState<T>;
-        matches(permitted: () => any, options?: ValidationOptions): PropertyValidationState<T>;
-
-        maximum(maximum: any, options?: ValidationOptions): PropertyValidationState<T>;
-        maximum(maximum: () => any, options?: ValidationOptions): PropertyValidationState<T>;
-        maximumLength(longest: number, options?: ValidationOptions): PropertyValidationState<T>;
-        maximumLength(longest: () => number, options?: ValidationOptions): PropertyValidationState<T>;
-        maximumNumberOfItems(maximum: number, options?: ValidationOptions): PropertyValidationState<T>;
-        maximumNumberOfItems(maximum: () => number, options?: ValidationOptions): PropertyValidationState<T>;
-
-        minimum(minimumValueOrFunction: any, options?: ValidationOptions): PropertyValidationState<T>;
-        minimumLength(shortest: number, options?: ValidationOptions): PropertyValidationState<T>;
-        minimumLength(shortest: () => number, options?: ValidationOptions): PropertyValidationState<T>;
-        minimumNumberOfItems(minimum: number, options?: ValidationOptions): PropertyValidationState<T>;
-        minimumNumberOfItems(minimum: () => number, options?: ValidationOptions): PropertyValidationState<T>;
-
-        name(value: string): PropertyValidationState<T>;
-        name(value: () => string): PropertyValidationState<T>;
-        noneOf(forbiddenValues: any[], options?: ValidationOptions): PropertyValidationState<T>;
-        noneOf(forbiddenValues: () => any[], options?: ValidationOptions): PropertyValidationState<T>;
-
-        not(forbiddenValueOrFunction: any, options?: ValidationOptions): PropertyValidationState<T>;
-        number(): PropertyValidationState<T>;
-        numberOfItems(minimumValueOrFunction: any, maximumValueOrFunction: any, options?: ValidationOptions): PropertyValidationState<T>;
-        oneOf(permittedValues: any[], options?: ValidationOptions): PropertyValidationState<T>;
-        oneOf(permittedValues: () => any[], options?: ValidationOptions): PropertyValidationState<T>;
-        postcode(): PropertyValidationState<T>;
-        range(minimumValueOrFunction: any, maximumValueOrFunction: any, options?: ValidationOptions): PropertyValidationState<T>;
-        required(valueOrFunction?: any): PropertyValidationState<T>;
-        rule(testFunction: () => any): PropertyValidationState<T>;
-        ruleMessage(failureMessageFormat: string): PropertyValidationState<T>;
-        string(): PropertyValidationState<T>;
-
-        valueFormat(format: string): PropertyValidationState<T>;
-
-        validateChildProperties(): PropertyValidationState<T>;
-
-        // return original observable
-        end(): T;
-
-        // other methods: not returning PropertyValidationState<T>
-        failed(): boolean;
-        getName(): string;
-        isApplicable(): boolean;
-        isRequired(): boolean;
-        message(): string;
-        passed(): boolean;
-        pending(): boolean;
-        showMessage(): boolean;
-        touched(): boolean;               // get touched state
-        touched(value: boolean): boolean; // set touched state
-        result(): ValidationResult;
-    }
-
-    interface ValidationResult {
-        state: any; // the result state
-        failed: boolean;	//true if the activity failed validation
-        passed: boolean;	//true if the activity passed validation
-        pending: boolean;	//true if the activity hasn't yet completed
-        message: string;	//a message from the activity
-        new: (state: any, message?: string) => ValidationResult;
-    }
-
-    interface IRule {
-        defaultOptions: ValidationOptions;
-        test(value: any): ValidationResult;
-    }
-
-    // The interface for a validation state.
-    interface IValidationState {
-        failed(): boolean;
-        getName(): string;
-        isApplicable(): boolean;
-        message(): string;
-        passed(): boolean;
-        pending(): boolean;
-        result(): ValidationResult;
-        touched(value?: boolean): boolean;
-    }
-
-    interface ValidatableModel<T> {
-        name: (value: string) => PropertyValidationState<T>;
-
-        // return original observableArray
-        end: () => T;
-    }
-
-    interface ValidationOptions {
-        applicable? (): any;  // the function used to determine if the property is applicable
-        converter?: IConverter;  // the converter used to parse user entries and format display of the property's value
-        entryFormat?: string;  // the string used to format the property's value for display in a user entry
-        excludeFromSummary?: boolean;  // whether any validation failures for this property are excluded from a summary
-        invalidFailureMessage?: string;  // the message shown when the user has entered an invalid value
-        missingFailureMessage?: string;  // the message shown when a value is required but is missing
-        name?: () => any;  // the function used to determine the name of the property; used in failure messages
-        required?: () => any;  // the function used to determine if a value is required
-        rules?: any; //Valerie.array.<IRule>;  // the chain of rules used to validate the property's value
-        valueFormat?: string;  // the string use to format the property's value for display in a message
-    }
-
-    // The interface for a converter, a pair of functions: format and parse, which work in tandem on a single type of value.
-    interface IConverter {
-        format: (value: any, format?: string) => string; // Formats the given value as a string.
-        parse: (value: string) => any; //Parses the given string as a particular value type.
-    }
-
-    // A helper for parsing and formatting numeric values.
-    interface NumericHelper {
-        // Adds thousands separators to the given numeric string.
-        addThousandsSeparator(numericString: string): string;
-
-        // Formats the given numeric value as a string.
-        format(value: number, format: string): string;
-
-        // Initialises the helper
-        init(decimalSeparator: string,
-            thousandsSeparator: string,
-            currencySign: string,
-            currencyMinorUnitPlaces: number): NumericHelper;
-
-        // Informs whether the given numeric string represents a currency value with major units only.
-        isCurrencyMajor(numericString: string): boolean;
-
-        // Informs whether the given numeric string represents a currency value with major units and optionally minor units.
-        isCurrencyMajorMinor(numericString: string): boolean;
-
-        // Informs whether the given numeric string represents a non-integer numeric value.
-        isFloat(numericString: string): boolean;
-
-        // Informs whether the given numeric string represents an integer value.
-        isInteger(numericString: string): boolean;
-
-        // Attempts to parse the given numeric string as a number value. The string is unformatted first.
-        parse(numericString: string): number;
-
-        // Unformats a numeric string; removes currency signs, thousands separators and normalises decimal separators.
-        unformat(numericString: string): string;
-    }
-
-    interface ValidationState {
-        // Finds and returns the validation states
-        findIn(model: any,
-            includeSubModels?: boolean,
-            recurse?: boolean,
-            validationStates?: IValidationState[]): IValidationState[];
-
-        // Gets the validation state for the given model, observable or computed.
-        getFor(modelOrObservableOrComputed: any): IValidationState;
-
-        // nforms if the given model, observable or computed has a validation state.
-        has(modelOrObservableOrComputed: any): boolean;
-
-        // Sets the validation state for the given model, observable or computed.
-        setFor(modelOrObservableOrComputed: any, state: IValidationState): void;
-    }
-
-    interface summaryItem {
-        name: string;
-        message: string;
-    }
-}
-
-declare namespace Valerie.Rules {
-    /*
-
-      Todo: add classes in valerie.rules namespace
-
-      */
-}
diff --git a/validator/validator.d.ts b/validator/index.d.ts
similarity index 100%
rename from validator/validator.d.ts
rename to validator/index.d.ts
diff --git a/validator/tsconfig.json b/validator/tsconfig.json
new file mode 100644
index 0000000000..845ca1b9db
--- /dev/null
+++ b/validator/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "validator-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/validator/validator-tests.ts b/validator/validator-tests.ts
index 8afabc2099..191502de11 100644
--- a/validator/validator-tests.ts
+++ b/validator/validator-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path='./validator.d.ts' />
-
 import * as validator from 'validator';
 
 let any: any;
diff --git a/vec3/index.d.ts b/vec3/index.d.ts
new file mode 100644
index 0000000000..b35fe8ac8c
--- /dev/null
+++ b/vec3/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for Vec3 Library
+// Project: https://www.npmjs.com/package/vec3
+// Definitions by: Xavier Stouder <https://github.com/xstoudi/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export declare class Vec3 {
+    constructor(x: number, y: number, z: number);
+    constructor(location: number[]);
+    constructor(location: { x: number; y: number; z: number });
+    constructor(locationStr: string);
+
+    set(x: number, y: number, z: number): Vec3;
+    update(other: Vec3): Vec3;
+    floored(): Vec3;
+    floor(): Vec3;
+    offset(dx: number, dy: number, dz: number): Vec3;
+    translate(dx: number, dy: number, dz: number): Vec3;
+    add(other: Vec3): Vec3;
+    substract(other: Vec3): Vec3;
+    plus(other: Vec3): Vec3;
+    minus(other: Vec3): Vec3;
+    scaled(scalar: number): Vec3;
+    abs(): Vec3
+    volume(): number;
+    modulus(): Vec3;
+    distanceTo(other: Vec3): number;
+    equals(other: Vec3): boolean;
+    toString(): string;
+    clone(): Vec3;
+    min(other: Vec3): Vec3;
+    max(other: Vec3): Vec3;
+}
diff --git a/vec3/tsconfig.json b/vec3/tsconfig.json
new file mode 100644
index 0000000000..2be4d44dae
--- /dev/null
+++ b/vec3/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "vec3-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/vec3/vec3-tests.ts b/vec3/vec3-tests.ts
index 8196b9d939..e3bd46c4be 100644
--- a/vec3/vec3-tests.ts
+++ b/vec3/vec3-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./vec3.d.ts" />
-
 import {Vec3} from "vec3";
 let myVector: Vec3 = new Vec3(10, 10, 10);
 console.log(myVector.toString());
\ No newline at end of file
diff --git a/vec3/vec3.d.ts b/vec3/vec3.d.ts
deleted file mode 100644
index 5f94ec1795..0000000000
--- a/vec3/vec3.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// Type definitions for Vec3 Librairy
-// Project: https://www.npmjs.com/package/vec3
-// Definitions by: Xavier Stouder <https://github.com/xstoudi/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "vec3" {
-    class Vec3 {
-        constructor(x: number, y: number, z: number);
-        constructor(location: number[]);
-        constructor(location: {x: number; y: number; z: number});
-        constructor(locationStr: string);
-
-        set(x: number, y: number, z: number): Vec3;
-        update(other: Vec3): Vec3;
-        floored(): Vec3;
-        floor(): Vec3;
-        offset(dx: number, dy: number, dz: number): Vec3;
-        translate(dx: number, dy: number, dz: number): Vec3;
-        add(other: Vec3): Vec3;
-        substract(other: Vec3): Vec3;
-        plus(other: Vec3): Vec3;
-        minus(other: Vec3): Vec3;
-        scaled(scalar: number): Vec3;
-        abs(): Vec3
-        volume(): number;
-        modulus(): Vec3;
-        distanceTo(other: Vec3): number;
-        equals(other: Vec3): boolean;
-        toString(): string;
-        clone(): Vec3;
-        min(other: Vec3): Vec3;
-        max(other: Vec3): Vec3;
-    }
-}
diff --git a/vega/vega.d.ts b/vega/index.d.ts
similarity index 100%
rename from vega/vega.d.ts
rename to vega/index.d.ts
diff --git a/vega/tsconfig.json b/vega/tsconfig.json
new file mode 100644
index 0000000000..f4a534cf0e
--- /dev/null
+++ b/vega/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "vega-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/vega/vega-tests.ts b/vega/vega-tests.ts
index 00aa4122d7..2e66d478f3 100644
--- a/vega/vega-tests.ts
+++ b/vega/vega-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="vega.d.ts" />
+
 
 // examples from http://trifacta.github.io/vega/editor/
 var specs: Vega.Spec[];
diff --git a/velocity-animate/index.d.ts b/velocity-animate/index.d.ts
new file mode 100644
index 0000000000..0d7489ad63
--- /dev/null
+++ b/velocity-animate/index.d.ts
@@ -0,0 +1,99 @@
+// Type definitions for Velocity 1.2.2
+// Project: http://velocityjs.org/
+// Definitions by: Greg Smith <https://github.com/smrq/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface JQuery {
+	velocity(name: string, options: jquery.velocity.RegisteredEffectOptions): JQuery;
+	velocity(options: {properties: jquery.velocity.Properties; options: jquery.velocity.Options}): JQuery;
+	velocity(properties: jquery.velocity.Properties, options: jquery.velocity.Options): JQuery;
+	velocity(properties: jquery.velocity.Properties, duration: number, easing: jquery.velocity.Easing, complete?: jquery.velocity.ElementCallback): JQuery;
+	velocity(properties: jquery.velocity.Properties, duration: number, complete?: jquery.velocity.ElementCallback): JQuery;
+	velocity(properties: jquery.velocity.Properties, easing: jquery.velocity.Easing, complete?: jquery.velocity.ElementCallback): JQuery;
+	velocity(properties: jquery.velocity.Properties, complete?: jquery.velocity.ElementCallback): JQuery;
+}
+
+interface JQueryStatic {
+	Velocity: jquery.velocity.VelocityStatic;
+}
+
+declare namespace jquery.velocity {
+	type Properties = Object;
+	type Easing = string|number[];
+	type ElementCallback = (elements: NodeListOf<HTMLElement>) => void;
+	type ProgressCallback = (elements: NodeListOf<HTMLElement>, percentComplete: number, timeRemaining: number, timeStart: number) => void;
+	type EffectCall =
+		[Properties] |
+		[Properties, number] |
+		[Properties, EffectCallOptions] |
+		[Properties, number, EffectCallOptions];
+
+	interface EffectCallOptions {
+		delay?: any;
+		easing?: any;
+	}
+
+	interface CommonOptions {
+		duration?: string|number;
+		begin?: ElementCallback;
+		complete?: ElementCallback;
+		display?: string|boolean;
+		delay?: number|boolean;
+		mobileHA?: boolean;
+		_cacheValues?: boolean;
+		container?: JQuery;
+		axis?: string;
+		offset?: number;
+	}
+
+	interface Options extends CommonOptions {
+		queue?: string|boolean;
+		easing?: Easing;
+		progress?: ProgressCallback;
+		loop?: number|boolean;
+	}
+
+	interface RegisterEffectOptions {
+		defaultDuration?: number;
+		calls: EffectCall[];
+		reset?: Object;
+	}
+
+	interface RegisteredEffectOptions extends CommonOptions {
+		stagger?: number;
+		drag?: boolean;
+		backwards?: boolean;
+	}
+
+	interface SequenceCall {
+		e: HTMLElement|JQuery;
+		p: Properties;
+		o: SequenceOptions;
+	}
+
+	interface SequenceOptions extends Options {
+		sequenceQueue?: boolean;
+	}
+
+	interface VelocityStatic {
+		Sequences: any;
+		animate(options: {elements: NodeListOf<HTMLElement>; properties: Properties; options: Options}): any;
+		animate(elements: HTMLElement|NodeListOf<HTMLElement>, properties: Properties, options: Options): any;
+		RegisterEffect(name: string, options: RegisterEffectOptions): VelocityStatic;
+		RunSequence(sequence: SequenceCall[]): VelocityStatic;
+
+		/**
+		 * Get a hook value. Hooks are the subvalues of multi-value CSS properties.
+		 * It features the same API as $.css().
+		 */
+		hook(element: HTMLElement|JQuery, cssKey: string): string;
+
+		/**
+		 * Set a hook value. Hooks are the subvalues of multi-value CSS properties.
+		 * It features the same API as $.css().
+		 */
+		hook(element: HTMLElement|JQuery, cssKey: string, cssValue: string): void;
+	}
+}
diff --git a/velocity-animate/tsconfig.json b/velocity-animate/tsconfig.json
new file mode 100644
index 0000000000..6a9a97994c
--- /dev/null
+++ b/velocity-animate/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "velocity-animate-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/velocity-animate/velocity-animate-tests.ts b/velocity-animate/velocity-animate-tests.ts
index afcd8b5633..3a4228ebcf 100644
--- a/velocity-animate/velocity-animate-tests.ts
+++ b/velocity-animate/velocity-animate-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="velocity-animate.d.ts" />
+
 
 function basics_arguments() {
 	var $el: JQuery;
diff --git a/velocity-animate/velocity-animate.d.ts b/velocity-animate/velocity-animate.d.ts
deleted file mode 100644
index 13f60d875c..0000000000
--- a/velocity-animate/velocity-animate.d.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-// Type definitions for Velocity 1.2.2
-// Project: http://velocityjs.org/
-// Definitions by: Greg Smith <https://github.com/smrq/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface JQuery {
-	velocity(name: string, options: jquery.velocity.RegisteredEffectOptions): JQuery;
-	velocity(options: {properties: jquery.velocity.Properties; options: jquery.velocity.Options}): JQuery;
-	velocity(properties: jquery.velocity.Properties, options: jquery.velocity.Options): JQuery;
-	velocity(properties: jquery.velocity.Properties, duration: number, easing: jquery.velocity.Easing, complete?: jquery.velocity.ElementCallback): JQuery;
-	velocity(properties: jquery.velocity.Properties, duration: number, complete?: jquery.velocity.ElementCallback): JQuery;
-	velocity(properties: jquery.velocity.Properties, easing: jquery.velocity.Easing, complete?: jquery.velocity.ElementCallback): JQuery;
-	velocity(properties: jquery.velocity.Properties, complete?: jquery.velocity.ElementCallback): JQuery;
-}
-
-interface JQueryStatic {
-	Velocity: jquery.velocity.VelocityStatic;
-}
-
-declare namespace jquery.velocity {
-	type Properties = Object;
-	type Easing = string|number[];
-	type ElementCallback = (elements: NodeListOf<HTMLElement>) => void;
-	type ProgressCallback = (elements: NodeListOf<HTMLElement>, percentComplete: number, timeRemaining: number, timeStart: number) => void;
-	type EffectCall =
-		[Properties] |
-		[Properties, number] |
-		[Properties, EffectCallOptions] |
-		[Properties, number, EffectCallOptions];
-
-	interface EffectCallOptions {
-		delay?: any;
-		easing?: any;
-	}
-
-	interface CommonOptions {
-		duration?: string|number;
-		begin?: ElementCallback;
-		complete?: ElementCallback;
-		display?: string|boolean;
-		delay?: number|boolean;
-		mobileHA?: boolean;
-		_cacheValues?: boolean;
-		container?: JQuery;
-		axis?: string;
-		offset?: number;
-	}
-
-	interface Options extends CommonOptions {
-		queue?: string|boolean;
-		easing?: Easing;
-		progress?: ProgressCallback;
-		loop?: number|boolean;
-	}
-
-	interface RegisterEffectOptions {
-		defaultDuration?: number;
-		calls: EffectCall[];
-		reset?: Object;
-	}
-
-	interface RegisteredEffectOptions extends CommonOptions {
-		stagger?: number;
-		drag?: boolean;
-		backwards?: boolean;
-	}
-
-	interface SequenceCall {
-		e: HTMLElement|JQuery;
-		p: Properties;
-		o: SequenceOptions;
-	}
-
-	interface SequenceOptions extends Options {
-		sequenceQueue?: boolean;
-	}
-
-	interface VelocityStatic {
-		Sequences: any;
-		animate(options: {elements: NodeListOf<HTMLElement>; properties: Properties; options: Options}): any;
-		animate(elements: HTMLElement|NodeListOf<HTMLElement>, properties: Properties, options: Options): any;
-		RegisterEffect(name: string, options: RegisterEffectOptions): VelocityStatic;
-		RunSequence(sequence: SequenceCall[]): VelocityStatic;
-
-		/**
-		 * Get a hook value. Hooks are the subvalues of multi-value CSS properties.
-		 * It features the same API as $.css().
-		 */
-		hook(element: HTMLElement|JQuery, cssKey: string): string;
-
-		/**
-		 * Set a hook value. Hooks are the subvalues of multi-value CSS properties.
-		 * It features the same API as $.css().
-		 */
-		hook(element: HTMLElement|JQuery, cssKey: string, cssValue: string): void;
-	}
-}
diff --git a/verror/index.d.ts b/verror/index.d.ts
new file mode 100644
index 0000000000..2c88ddb8e8
--- /dev/null
+++ b/verror/index.d.ts
@@ -0,0 +1,62 @@
+// Type definitions for verror v1.6.0
+// Project: https://github.com/davepacheco/node-verror
+// Definitions by: Sven Reglitzki <https://github.com/svi3c/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+/*
+ * VError([cause], fmt[, arg...]): Like JavaScript's built-in Error class, but
+ * supports a "cause" argument (another error) and a printf-style message.  The
+ * cause argument can be null or omitted entirely.
+ *
+ * Examples:
+ *
+ * CODE                                    MESSAGE
+ * new VError('something bad happened')    "something bad happened"
+ * new VError('missing file: "%s"', file)  "missing file: "/etc/passwd"
+ *   with file = '/etc/passwd'
+ * new VError(err, 'open failed')          "open failed: file not found"
+ *   with err.message = 'file not found'
+ */
+declare class VError extends Error {
+    static VError: typeof VError;
+    static SError: typeof SError;
+    static MultiError: typeof MultiError;
+    static WError: typeof WError;
+    cause(): Error;
+    constructor(cause: Error, message: string, ...params: any[]);
+    constructor(message: string, ...params: any[]);
+}
+
+/*
+ * SError is like VError, but stricter about types.  You cannot pass "null" or
+ * "undefined" as string arguments to the formatter.  Since SError is only a
+ * different function, not really a different class, we don't set
+ * SError.prototype.name.
+ */
+declare class SError extends VError {
+}
+
+/*
+ * Represents a collection of errors for the purpose of consumers that generally
+ * only deal with one error.  Callers can extract the individual errors
+ * contained in this object, but may also just treat it as a normal single
+ * error, in which case a summary message will be printed.
+ */
+declare class MultiError extends VError {
+    constructor(errors: Error[]);
+}
+
+/*
+ * Like JavaScript's built-in Error class, but supports a "cause" argument which
+ * is wrapped, not "folded in" as with VError.	Accepts a printf-style message.
+ * The cause argument can be null.
+ */
+declare class WError extends Error {
+    cause(): Error;
+    constructor(cause: Error, message: string, ...params: any[]);
+    constructor(message: string, ...params: any[]);
+}
+
+export = VError;
diff --git a/verror/tsconfig.json b/verror/tsconfig.json
new file mode 100644
index 0000000000..b23d7555ab
--- /dev/null
+++ b/verror/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "verror-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/verror/verror-tests.ts b/verror/verror-tests.ts
index 9364475ce6..1be9837645 100644
--- a/verror/verror-tests.ts
+++ b/verror/verror-tests.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sven Reglitzki <https://github.com/svi3c/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="verror.d.ts" />
 
 import VError = require("verror");
 
diff --git a/verror/verror.d.ts b/verror/verror.d.ts
deleted file mode 100644
index 65b73ef174..0000000000
--- a/verror/verror.d.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-// Type definitions for verror v1.6.0
-// Project: https://github.com/davepacheco/node-verror
-// Definitions by: Sven Reglitzki <https://github.com/svi3c/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "verror" {
-
-    /*
-     * VError([cause], fmt[, arg...]): Like JavaScript's built-in Error class, but
-     * supports a "cause" argument (another error) and a printf-style message.  The
-     * cause argument can be null or omitted entirely.
-     *
-     * Examples:
-     *
-     * CODE                                    MESSAGE
-     * new VError('something bad happened')    "something bad happened"
-     * new VError('missing file: "%s"', file)  "missing file: "/etc/passwd"
-     *   with file = '/etc/passwd'
-     * new VError(err, 'open failed')          "open failed: file not found"
-     *   with err.message = 'file not found'
-     */
-    class VError extends Error {
-        static VError: typeof VError;
-        static SError: typeof SError;
-        static MultiError: typeof MultiError;
-        static WError: typeof WError;
-        cause():Error;
-        constructor(cause: Error, message: string, ...params: any[]);
-        constructor(message: string, ...params: any[]);
-    }
-
-    /*
-     * SError is like VError, but stricter about types.  You cannot pass "null" or
-     * "undefined" as string arguments to the formatter.  Since SError is only a
-     * different function, not really a different class, we don't set
-     * SError.prototype.name.
-     */
-    class SError extends VError {
-    }
-
-    /*
-     * Represents a collection of errors for the purpose of consumers that generally
-     * only deal with one error.  Callers can extract the individual errors
-     * contained in this object, but may also just treat it as a normal single
-     * error, in which case a summary message will be printed.
-     */
-    class MultiError extends VError {
-        constructor(errors: Error[]);
-    }
-
-    /*
-     * Like JavaScript's built-in Error class, but supports a "cause" argument which
-     * is wrapped, not "folded in" as with VError.	Accepts a printf-style message.
-     * The cause argument can be null.
-     */
-    class WError extends Error {
-        cause():Error;
-        constructor(cause: Error, message: string, ...params: any[]);
-        constructor(message: string, ...params: any[]);
-    }
-
-    export = VError;
-}
diff --git a/vex-js/index.d.ts b/vex-js/index.d.ts
new file mode 100644
index 0000000000..ffd1d04dbf
--- /dev/null
+++ b/vex-js/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for Vex v2.3.2
+// Project: https://github.com/HubSpot/vex
+// Definitions by: Greg Cohan <https://github.com/gdcohan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///<reference types="jquery" />
+
+export = vex;
+export as namespace vex;
+
+declare namespace vex {
+
+  interface ICSSAttributes {
+    [property: string]: string | number;
+  }
+
+  interface IVexOptions {
+    afterClose?: (() => void);
+    afterOpen?: ((vexContent: JQuery) => void);
+    content?: string;
+    showCloseButton?: boolean;
+    escapeButtonCloses?: boolean;
+    overlayClosesOnClick?: boolean;
+    appendLocation?: HTMLElement | JQuery | string;
+    className?: string;
+    css?: ICSSAttributes;
+    overlayClassName?: string;
+    overlayCSS?: ICSSAttributes;
+    contentClassName?: string;
+    contentCSS?: ICSSAttributes;
+    closeClassName?: string;
+    closeCSS?: ICSSAttributes;
+  }
+
+  interface Vex {
+    open(options: IVexOptions): JQuery;
+    close(id?: number): boolean;
+    closeAll(): boolean;
+    closeByID(id: number): boolean;
+  }
+
+}
+
+declare var vex: vex.Vex;
diff --git a/vex-js/tsconfig.json b/vex-js/tsconfig.json
new file mode 100644
index 0000000000..8c128cedc1
--- /dev/null
+++ b/vex-js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "vex-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/vex-js/vex-js.d.ts b/vex-js/vex-js.d.ts
deleted file mode 100644
index eb7c166077..0000000000
--- a/vex-js/vex-js.d.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-// Type definitions for Vex v2.3.2
-// Project: https://github.com/HubSpot/vex
-// Definitions by: Greg Cohan <https://github.com/gdcohan>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path="../jquery/jquery.d.ts" />
-
-declare namespace vex {
-
-  interface ICSSAttributes {
-    [property: string]: string | number;
-  }
-
-  interface IVexOptions {
-    afterClose?: (() => void);
-    afterOpen?: ((vexContent: JQuery) => void);
-    content?: string;
-    showCloseButton?: boolean;
-    escapeButtonCloses?: boolean;
-    overlayClosesOnClick?: boolean;
-    appendLocation?: HTMLElement | JQuery | string;
-    className?: string;
-    css?: ICSSAttributes;
-    overlayClassName?: string;
-    overlayCSS?: ICSSAttributes;
-    contentClassName?: string;
-    contentCSS?: ICSSAttributes;
-    closeClassName?: string;
-    closeCSS?: ICSSAttributes;
-  }
-
-  interface Vex {
-    open(options: IVexOptions): JQuery;
-    close(id?: number): boolean;
-    closeAll(): boolean;
-    closeByID(id: number): boolean;
-  }
-
-}
-
-declare module "vex" {
-  export = vex;
-}
-
-declare var vex: vex.Vex;
diff --git a/vex-js/vex-tests.ts b/vex-js/vex-tests.ts
index ea1778d610..d4af6e9e6a 100644
--- a/vex-js/vex-tests.ts
+++ b/vex-js/vex-tests.ts
@@ -1,5 +1,5 @@
-///<reference path="../jquery/jquery.d.ts" />
-///<reference path="vex-js.d.ts" />
+///<reference types="jquery" />
+import vex = require("vex-js");
 
 var vexContent = vex.open({
   afterClose: (() => null),
diff --git a/vexflow/index.d.ts b/vexflow/index.d.ts
new file mode 100644
index 0000000000..a651c850d4
--- /dev/null
+++ b/vexflow/index.d.ts
@@ -0,0 +1,1417 @@
+// Type definitions for VexFlow v1.2.27
+// Project: http://vexflow.com
+// Definitions by: Roman Quiring <https://github.com/rquiring>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+//inconsistent namespace: this is a helper funtion from tables.js and should not pollute the global namespace!
+declare function sanitizeDuration(duration : string) : string;
+
+declare namespace Vex {
+
+    function L(block : string, args : any[]) : void;
+    function Merge<T extends Object>(destination : T, source : Object) : T;
+    function Min(a : number, b : number) : number;
+    function Max(a : number, b : number) : number;
+    function RoundN(x : number, n : number) : number;
+    function MidLine(a : number, b : number) : number;
+    function SortAndUnique<T extends any[]>(arr : T, cmp : Function, eq : Function) : T;
+    function Contains(a : any[], obj : any) : boolean;
+    function getCanvasContext(canvas_sel : string) : CanvasRenderingContext2D;
+    function drawDot(ctx : IRenderContext, x : number, y : number, color? : string) : void;
+    function BM(s : number, f : Function) : void;
+    function Inherit<T extends Object>(child : T, parent : Object, object : Object) : T;
+
+    class RuntimeError {
+        constructor(code : string, message : string);
+    }
+
+    class RERR {
+        constructor(code : string, message : string);
+    }
+
+    /**
+     * Helper interface for handling the different rendering contexts (i.e. CanvasContext, RaphaelContext, SVGContext). Not part of VexFlow!
+     */
+    interface IRenderContext {
+        clear() : void;
+        setFont(family : string, size : number, weight? : number) : IRenderContext;
+        setRawFont(font : string) : IRenderContext;
+        setFillStyle(style : string) : IRenderContext;
+        setBackgroundFillStyle(style : string) : IRenderContext;
+        setStrokeStyle(style : string) : IRenderContext;
+        setShadowColor(color : string) : IRenderContext;
+        setShadowBlur(blur : string) : IRenderContext;
+        setLineWidth(width : number) : IRenderContext;
+        setLineCap(cap_type : string) : IRenderContext;
+        setLineDash(dash : string) : IRenderContext;
+        scale(x : number, y : number) : IRenderContext;
+        resize(width : number, height : number) : IRenderContext;
+        fillRect(x : number, y : number, width : number, height : number) : IRenderContext;
+        clearRect(x : number, y : number, width : number, height : number) : IRenderContext;
+        beginPath() : IRenderContext;
+        moveTo(x : number, y : number) : IRenderContext;
+        lineTo(x : number, y : number) : IRenderContext;
+        bezierCurveToTo(x1 : number, y1 : number, x2 : number, y2 : number, x : number, y : number) : IRenderContext;
+        quadraticCurveToTo(x1 : number, y1 : number, x2 : number, y2 : number) : void;
+        arc(x : number, y : number, radius : number, startAngle : number, endAngle : number, antiClockwise : boolean) : IRenderContext;
+        glow() : IRenderContext;
+        fill() : IRenderContext;
+        stroke() : IRenderContext;
+        closePath() : IRenderContext;
+        fillText(text : string, x : number, y : number) : IRenderContext;
+        save() : IRenderContext;
+        restore() : IRenderContext;
+
+        /**
+         * canvas returns TextMetrics, SVG returns SVGRect, Raphael returns {width : number, height : number}. Only width is used throughout VexFlow.
+         */
+        measureText(text : string) : {width : number};
+    }
+
+    /**
+     * Helper interface for handling the Vex.Flow.Font object in Vex.Flow.Glyph. Not part of VexFlow!
+     */
+    interface IFont {
+        glyphs : {x_min : number, x_max : number, ha : number, o : string[]}[];
+        cssFontWeight : string;
+        ascender : number;
+        underlinePosition : number;
+        cssFontStyle : string;
+        boundingBox : {yMin : number, xMin : number, yMax : number, xMax : number};
+        resolution : number;
+        descender : number;
+        familyName : string;
+        lineHeight : number;
+        underlineThickness : number;
+
+        /**
+         * This property is missing in vexflow_font.js, but present in gonville_original.js and gonville_all.js.
+         */
+        original_font_information? : {postscript_name : string, version_string : string, vendor_url : string, full_font_name : string, font_family_name : string, copyright : string, description : string, trademark : string, designer : string, designer_url : string, unique_font_identifier : string, license_url : string, license_description : string, manufacturer_name : string, font_sub_family_name : string};
+    }
+
+    namespace Flow {
+
+        const RESOLUTION : number;
+
+        // from tables.js:
+        const STEM_WIDTH : number;
+        const STEM_HEIGHT : number;
+        const STAVE_LINE_THICKNESS : number;
+        const TIME4_4 : {num_beats : number, beat_value : number, resolution : number};
+        const unicode : {[name : string] : string}; //inconsistent API: this should be private and have a wrapper function like the other tables
+        function clefProperties(clef : string) : {line_shift : number};
+        function keyProperties(key : string, clef : string, params : {octave_shift? : number}) : {key : string, octave : number, line : number, int_value : number, accidental : string, code : number, stroke : number, shift_right : number, displaced : boolean};
+        function integerToNote(integer : number) : string;
+        function tabToGlyph(fret : string) : {text : string, code : number, width : number, shift_y : number};
+        function textWidth(text : string) : number;
+        function articulationCodes(artic : string) : {code : string, width : number, shift_right : number, shift_up : number, shift_down : number, between_lines : boolean};
+        function accidentalCodes(acc : string) : {code : string, width : number, gracenote_width : number, shift_right : number, shift_down : number};
+        function ornamentCodes(acc : string) : {code : string, shift_right : number, shift_up : number, shift_down : number, width : number};
+        function keySignature(spec : string) : {type: string, line: number}[];
+        function parseNoteDurationString(durationString : string) : {duration : string, dots : number, type : string};
+        function parseNoteData(noteData : {duration : string, dots : number, type : string}) : {duration : string, type : string, dots : number, ticks : number};
+        function durationToFraction(duration : string) : Fraction;
+        function durationToNumber(duration : string) : number;
+        function durationToTicks(duration : string) : number;
+        function durationToGlyph(duration : string, type : string) : {head_width : number, stem : boolean, stem_offset : number, flag : boolean, stem_up_extension : number, stem_down_extension : number, gracenote_stem_up_extension : number, gracenote_stem_down_extension : number, tabnote_stem_up_extension : number, tabnote_stem_down_extension : number, dot_shiftY : number, line_above : number, line_below : number, code_head? : string, rest? : boolean, position? : string};
+
+        // from glyph.js:
+        function renderGlyph(ctx : IRenderContext, x_pos : number, y_pos : number, point : number, val : string, nocache : boolean) : void;
+
+        // from vexflow_font.js / gonville_original.js / gonville_all.js
+        var Font : {
+            glyphs : {x_min : number, x_max : number, ha : number, o : string[]}[];
+            cssFontWeight : string;
+            ascender : number;
+            underlinePosition : number;
+            cssFontStyle : string;
+            boundingBox : {yMin : number, xMin : number, yMax : number, xMax : number};
+            resolution : number;
+            descender : number;
+            familyName : string;
+            lineHeight : number;
+            underlineThickness : number;
+
+            //inconsistent member : this is missing in vexflow_font.js, but present in gonville_original.js and gonville_all.js
+            original_font_information : {postscript_name : string, version_string : string, vendor_url : string, full_font_name : string, font_family_name : string, copyright : string, description : string, trademark : string, designer : string, designer_url : string, unique_font_identifier : string, license_url : string, license_description : string, manufacturer_name : string, font_sub_family_name : string};
+        }
+
+        class Accidental extends Modifier {
+            //TODO remove the following lines once TypeScript allows subclass overrides with type changes
+            setNote(note : Note) : Modifier;
+
+            constructor(type : string);
+            static DEBUG : boolean;
+            static format(accidentals : Accidental[], state : {left_shift : number, right_shift : number, text_line : number}) : void;
+            setNote(note : StaveNote) : void;
+            setAsCautionary() : Accidental;
+            draw() : void;
+            static applyAccidentals(voices : Voice[], keySignature? : string) : void;
+        }
+
+        namespace Accidental {
+            const CATEGORY : string;
+        }
+
+        class Annotation extends Modifier {
+            constructor(text : string);
+            static DEBUG : boolean;
+            static format(annotations : Annotation[], state : {left_shift : number, right_shift : number, text_line : number}) : boolean;
+            setTextLine(line : number) : Annotation;
+            setFont(family : string, size : number, weight : string) : Annotation;
+            setVerticalJustification(just : Annotation.VerticalJustify) : Annotation;
+            getJustification() : Annotation.Justify;
+            setJustification(justification : Annotation.Justify) : Annotation;
+            draw() : void;
+        }
+
+        namespace Annotation {
+            const enum Justify {LEFT = 1, CENTER, RIGHT, CENTER_STEM}
+            const enum VerticalJustify {TOP = 1, CENTER, BOTTOM, CENTER_STEM}
+            const CATEGORY : string;
+        }
+
+        class Articulation extends Modifier {
+            constructor(type : string);
+            static DEBUG : boolean;
+            static format(articulations : Articulation[], state : {left_shift : number, right_shift : number, text_line : number}) : boolean;
+            draw() : void;
+        }
+
+        namespace Articulation {
+            const CATEGORY : string;
+        }
+
+        class BarNote extends Note {
+            static DEBUG : boolean;
+            getType() : Barline.type;
+            setType(type : Barline.type) : BarNote;
+            getBoundingBox() : BoundingBox;
+            addToModifierContext() : BarNote;
+            preFormat() : BarNote;
+            draw() : void;
+        }
+
+        namespace Barline {
+            const enum type {SINGLE = 1, DOUBLE, END, REPEAT_BEGIN, REPEAT_END, REPEAT_BOTH, NONE}
+        }
+
+        class Barline extends StaveModifier {
+            constructor(type : Barline.type, x : number);
+            getCategory() : string;
+            setX(x : number) : Barline;
+            draw(stave : Stave, x_shift? : number) : void;
+            drawVerticalBar(stave : Stave, x : number, double_bar? : boolean) : void;
+            drawVerticalEndBar(stave : Stave, x : number) : void;
+            drawRepeatBar(stave : Stave, x : number, begin : boolean) : void;
+        }
+
+        class Beam {
+            constructor(notes : StemmableNote[], auto_stem? : boolean);
+            setContext(context : IRenderContext) : Beam;
+            getNotes() : StemmableNote[];
+            getBeamCount() : number;
+            breakSecondaryAt(indices : number[]) : Beam;
+            getSlopeY() : number;
+            calculateSlope() : void;
+            applyStemExtensions() : void;
+            getBeamLines(duration : string) : {start : number, end : number}[];
+            drawStems() : void;
+            drawBeamLines() : void;
+            preFormat() : Beam;
+            postFormat() : Beam;
+            draw() : boolean;
+            calculateStemDirection(notes : Note) : number;
+            static getDefaultBeamGroups(time_sig : string) : Fraction[];
+            static applyAndGetBeams(voice : Voice, stem_direction : number, groups : Fraction[]) : Beam[];
+            static generateBeams(notes : StemmableNote[], config? : {groups? : Fraction[], stem_direction? : number, beam_rests? : boolean, beam_middle_only? : boolean, show_stemlets? : boolean, maintain_stem_directions? : boolean}) : Beam[];
+        }
+
+        class Bend extends Modifier {
+            constructor(text : string, release? : boolean, phrase? : {type : number, text : string, width : number}[]);
+            static UP : number;
+            static DOWN : number;
+            static format(bends : Bend[], state : {left_shift : number, right_shift : number, text_line : number}) : boolean;
+            setXShift(value : number) : void;
+            setFont(font : string) : Bend;
+            getText() : string;
+            updateWidth() : Bend;
+            draw() : void;
+        }
+
+        namespace Bend {
+            const CATEGORY : string;
+        }
+
+        class BoundingBox {
+            constructor(x : number, y : number, w : number, h : number);
+            static copy(that : BoundingBox) : BoundingBox;
+            getX() : number;
+            getY() : number;
+            getW() : number;
+            getH() : number;
+            setX(x : number) : BoundingBox;
+            setY(y : number) : BoundingBox;
+            setW(w : number) : BoundingBox;
+            setH(h : number) : BoundingBox;
+            move(x : number, y : number) : void;
+            clone() : BoundingBox;
+            mergeWith(boundingBox : BoundingBox, ctx? : IRenderContext) : BoundingBox;
+            draw(ctx : IRenderContext, x : number, y : number) : void;
+        }
+
+        class CanvasContext implements IRenderContext {
+            //TODO remove the following lines once TypeScript allows subclass overrides with type changes or type inconsistencies mentioned below are fixed
+            setLineDash(dash : string) : CanvasContext;
+            scale(x : number, y : number) : CanvasContext;
+            resize(width : number, height : number) : CanvasContext;
+            fillRect(x : number, y : number, width : number, height : number) : CanvasContext;
+            clearRect(x : number, y : number, width : number, height : number) : CanvasContext;
+            beginPath() : CanvasContext;
+            moveTo(x : number, y : number) : CanvasContext;
+            lineTo(x : number, y : number) : CanvasContext;
+            bezierCurveToTo(x1 : number, y1 : number, x2 : number, y2 : number, x : number, y : number) : CanvasContext;
+            quadraticCurveToTo(x1 : number, y1 : number, x2 : number, y2 : number) : CanvasContext;
+            arc(x : number, y : number, radius : number, startAngle : number, endAngle : number, antiClockwise : boolean) : CanvasContext;
+            glow() : CanvasContext;
+            fill() : CanvasContext;
+            stroke() : CanvasContext;
+            closePath() : CanvasContext;
+            fillText(text : string, x : number, y : number) : CanvasContext;
+            save() : CanvasContext;
+            restore() : CanvasContext;
+
+            constructor(context : CanvasRenderingContext2D);
+            static WIDTH : number;
+            static HEIGHT : number;
+            clear() : void;
+            setFont(family : string, size : number, weight? : number) : CanvasContext;
+            setRawFont(font : string) : CanvasContext;
+            setFillStyle(style : string) : CanvasContext;
+            setBackgroundFillStyle(style : string) : CanvasContext;
+            setStrokeStyle(style : string) : CanvasContext;
+            setShadowColor(style : string) : CanvasContext; //inconsistent name: style -> color
+            setShadowBlur(blur : string) : CanvasContext;
+            setLineWidth(width : number) : CanvasContext;
+            setLineCap(cap_type : string) : CanvasContext;
+
+            //inconsistent type: void -> CanvasContext
+            setLineDash(dash : string) : void;
+            scale(x : number, y : number) : void;
+            resize(width : number, height : number) : void;
+            fillRect(x : number, y : number, width : number, height : number) : void;
+            clearRect(x : number, y : number, width : number, height : number) : void;
+            beginPath() : void;
+            moveTo(x : number, y : number) : void;
+            lineTo(x : number, y : number) : void;
+            bezierCurveToTo(x1 : number, y1 : number, x2 : number, y2 : number, x : number, y : number) : void;
+            quadraticCurveToTo(x1 : number, y1 : number, x : number, y : number) : void; //inconsistent name: x -> x2, y -> y2
+            arc(x : number, y : number, radius : number, startAngle : number, endAngle : number, antiClockwise : boolean) : void;
+            glow() : void;
+            fill() : void;
+            stroke() : void;
+            closePath() : void;
+            measureText(text : string) : TextMetrics;
+            fillText(text : string, x : number, y : number) : void;
+            save() : void;
+            restore() : void;
+        }
+
+        class Clef extends StaveModifier {
+            //TODO remove the following lines once TypeScript allows subclass overrides with type changes
+            addModifier() : void;
+            addEndModifier() : void;
+
+            constructor(clef : string, size? : string, annotation? : string);
+            static DEBUG : boolean;
+            addModifier(stave : Stave) : void;
+            addEndModifier(stave : Stave) : void;
+        }
+
+        class ClefNote extends Note {
+            //TODO remove the following lines once TypeScript allows subclass overrides with type changes
+            setStave(stave : Stave) : Note;
+
+            constructor(clef : string, size? : string, annotation? : string);
+            setClef(clef : string, size? : string, annotation? : string) : ClefNote;
+            getClef() : string;
+            setStave(stave : Stave) : void;
+            getBoundingBox() : BoundingBox;
+            addToModifierContext() : ClefNote;
+            getCategory() : string;
+            preFormat() : ClefNote;
+            draw() : void;
+        }
+
+        class Crescendo extends Note {
+            constructor(note_struct : {duration : number, line? : number});
+            static DEBUG : boolean;
+            setLine(line : number) : Crescendo;
+            setHeight(height : number) : Crescendo;
+            setDecrescendo(decresc : boolean) : Crescendo;
+            preFormat() : Crescendo;
+            draw() : void;
+        }
+
+        class Curve {
+            constructor(from : Note, to : Note, options? : {spacing? : number, thickness? : number, x_shift? : number, y_shift : number, position : Curve.Position, invert : boolean, cps? : {x : number, y : number}[]});
+            static DEBUG : boolean;
+            setContext(context : IRenderContext) : Curve;
+            setNotes(from : Note, to : Note) : Curve;
+            isPartial() : boolean;
+            renderCurve(params : {first_x : number, first_y : number, last_x : number, last_y : number, direction : number}) : void;
+            draw() : boolean;
+        }
+
+        namespace Curve {
+            const enum Position {NEAR_HEAD = 1, NEAR_TOP}
+        }
+
+        class Dot extends Modifier {
+            //TODO remove the following lines once TypeScript allows subclass overrides with type changes or type inconsistencies mentioned below are fixed
+            setNote(note : Note) : Dot;
+
+            static format(dots : number, state : {left_shift : number, right_shift : number, text_line : number}) : void;
+            setNote(note : Note) : void; //inconsistent type: void -> Dot
+            setDotShiftY(y : number) : Dot;
+            draw() : void;
+        }
+
+        namespace Dot {
+            const CATEGORY : string;
+        }
+
+        class Formatter {
+            static DEBUG : boolean;
+            static FormatAndDraw(ctx : IRenderContext, stave : Stave, notes : Note[], params? : {auto_beam : boolean, align_rests : boolean}) : BoundingBox;
+            static FormatAndDraw(ctx : IRenderContext, stave : Stave, notes : Note[], params? : boolean) : BoundingBox;
+            static FormatAndDrawTab(ctx : IRenderContext, tabstave : TabStave, stave : Stave, tabnotes : TabNote[], notes : Note[], autobeam? : boolean, params? : {auto_beam : boolean, align_rests : boolean}) : void;
+            static FormatAndDrawTab(ctx : IRenderContext, tabstave : TabStave, stave : Stave, tabnotes : TabNote[], notes : Note[], autobeam? : boolean, params? : boolean) : void;
+            static AlignRestsToNotes(notes : Note[], align_all_notes? : boolean, align_tuplets? : boolean) : Formatter;
+            alignRests(voices : Voice[], align_all_notes : boolean) : void;
+            preCalculateMinTotalWidth(voices : Voice[]) : number;
+            getMinTotalWidth() : number;
+            createModifierContexts(voices : Voice[]) : ModifierContext[];
+            createTickContexts(voices : Voice[]) : TickContext[];
+            preFormat(justifyWidth? : number, rendering_context? : IRenderContext, voices? : Voice[], stave? : Stave) : void;
+            postFormat() : Formatter;
+            joinVoices(voices : Voice[]) : Formatter;
+            format(voices : Voice[], justifyWidth : number, options? : {align_rests? : boolean, context : IRenderContext}) : Formatter;
+            formatToStave(voices : Voice[], stave : Stave, options? : {align_rests? : boolean, context : IRenderContext}) : Formatter;
+        }
+
+        class Fraction {
+            constructor(numerator : number, denominator : number);
+            static GCD(a : number, b : number) : number;
+            static LCM(a : number, b : number) : number;
+            static LCMM(a : number, b : number) : number;
+            set(numerator : number, denominator : number) : Fraction;
+            value() : number;
+            simplify() : Fraction;
+            add(param1 : Fraction, param2 : Fraction) : Fraction;
+            add(param1 : number, param2 : number) : Fraction;
+            subtract(param1 : Fraction, param2 : Fraction) : Fraction;
+            subtract(param1 : number, param2 : number) : Fraction;
+            multiply(param1 : Fraction, param2 : Fraction) : Fraction;
+            multiply(param1 : number, param2 : number) : Fraction;
+            divide(param1 : Fraction, param2 : Fraction) : Fraction;
+            divide(param1 : number, param2 : number) : Fraction;
+            equals(compare : Fraction) : boolean;
+            greaterThan(compare : Fraction) : boolean;
+            greaterThanEquals(compare : Fraction) : boolean;
+            lessThan(compare : Fraction) : boolean;
+            lessThanEquals(compare : Fraction) : boolean;
+            clone() : Fraction;
+            copy(copy : Fraction) : Fraction;
+            quotient() : number;
+            fraction() : number;
+            abs() : Fraction;
+            toString() : string;
+            toSimplifiedString() : string;
+            toMixedString() : string;
+            parse(str : string) : Fraction;
+        }
+
+        class FretHandFinger extends Modifier {
+            constructor(number : number);
+            static format(nums : FretHandFinger[], state : {left_shift : number, right_shift : number, text_line : number}) : void;
+            getNote() : Note;
+            setNote(note : Note) : FretHandFinger;
+            getIndex() : number;
+            setIndex(index : number) : FretHandFinger;
+            getPosition() : Modifier.Position;
+            setPosition(position : Modifier.Position) : FretHandFinger;
+            setFretHandFinger(number : number) : FretHandFinger;
+            setOffsetX(x : number) : FretHandFinger;
+            setOffsetY(y : number) : FretHandFinger;
+            draw() : void;
+        }
+
+        namespace FretHandFinger {
+            const CATEGORY : string;
+        }
+
+        class GhostNote extends StemmableNote {
+            //TODO remove the following lines once TypeScript allows subclass overrides with type changes or type inconsistencies mentioned below are fixed
+            setStave(stave : Stave) : Note;
+
+            constructor(duration : string);
+            constructor(note_struct : {type? : string, dots? : number, duration : string}); //inconsistent name : init struct is called 'duration', should be 'params'/'options' (may be string or Object)
+            isRest() : boolean;
+            setStave(stave : Stave) : void; //inconsistent type: void -> GhostNote
+            addToModifierContext() : GhostNote;
+            preFormat() : GhostNote;
+            draw() : void;
+        }
+
+        class Glyph {
+            constructor(code : string, point : number, options? : {cache? : boolean, font? : IFont});
+            setOptions(options : {cache? : boolean, font? : IFont}) : void;
+            setStave(stave : Stave) : Glyph;
+            setXShift(x_shift : number) : Glyph;
+            setYShift(y_shift : number) : Glyph;
+            setContext(context : IRenderContext) : Glyph;
+            getContext() : IRenderContext;
+            reset() : void;
+            setWidth(width : number) : Glyph;
+            getMetrics() : {x_min : number, x_max : number, width : number, height : number};
+            render(ctx : IRenderContext, x_pos : number, y_pos : number) : void;
+            renderToStave(x : number) : void;
+            static loadMetrics(font : IFont, code : string, cache : boolean) : {x_min : number, x_max : number, ha : number, outline : number[]};
+            static renderOutline(ctx : IRenderContext, outline : number[], scale : number, x_pos : number, y_pos : number) : void;
+        }
+
+        class GraceNote extends StaveNote {
+            constructor(note_struct : {slash? : boolean, type? : string, dots? : number, duration : string, clef? : string, keys : string[], octave_shift? : number, auto_stem? : boolean, stem_direction? : number});
+            getStemExtension() : number;
+            getCategory() : string;
+            draw() : void;
+        }
+
+        class GraceNoteGroup extends Modifier {
+            //TODO remove the following lines once TypeScript allows subclass overrides with type changes or type inconsistencies mentioned below are fixed
+            setWidth(width : number) : Modifier;
+            setNote(note : StaveNote) : Modifier;
+
+            constructor(grace_notes : GraceNote[], show_slur? : boolean); //inconsistent name: 'show_slur' is called 'config', suggesting object (is boolean)
+            static DEBUG : boolean;
+            static format(gracenote_groups : GraceNoteGroup[], state : {left_shift : number, right_shift : number, text_line : number}) : boolean;
+            preFormat() : void;
+            beamNotes() : GraceNoteGroup;
+            setNote(note : Note) : void; //inconsistent type: void -> GraceNoteGroup
+            setWidth(width : number) : void; //inconsistent type: void -> GraceNoteGroup
+            getWidth() : number;
+            setXShift(x_shift : number) : void;
+            draw() : void;
+        }
+
+        namespace GraceNoteGroup {
+            const CATEGORY : string;
+        }
+
+        class KeyManager {
+            constructor(key : string);
+            setKey(key : string) : KeyManager;
+            getKey() : string;
+            reset() : KeyManager;
+            getAccidental(key : string) : {note : string, accidental : string};
+            selectNote(note : string) : {note : string, accidental : string, change : boolean};
+        }
+
+        class KeySignature extends StaveModifier {
+             //TODO remove the following lines once TypeScript allows subclass overrides with type changes
+            addModifier() : void;
+
+            constructor(key_spec : string);
+            addAccToStave(stave : Stave, acc : {type : string, line : number}, next? : {type : string, line : number}) : void;
+            cancelKey(spec : string) : KeySignature;
+            addModifier(stave : Stave) : KeySignature;
+            addToStave(stave : Stave, firstGlyph? : boolean) : KeySignature;
+            convertAccLines(clef : string, type : string) : void;
+        }
+
+        class Modifier {
+            static DEBUG : boolean;
+            getCategory() : string;
+            getWidth() : number;
+            setWidth(width : number) : Modifier;
+            getNote() : Note;
+            setNote(note : Note) : Modifier;
+            getIndex() : number;
+            setIndex(index : number) : Modifier;
+            getContext() : IRenderContext;
+            setContext(context : IRenderContext) : Modifier;
+            getModifierContext() : ModifierContext;
+            setModifierContext(c : ModifierContext) : Modifier;
+            getPosition() : Modifier.Position;
+            setPosition(position : Modifier.Position) : Modifier;
+            setTextLine(line : number) : Modifier;
+            setYShift(y : number) : Modifier;
+            setXShift(x : number) : void; //inconsistent type: void -> Modifier
+            draw() : void;
+        }
+
+        namespace Modifier {
+            const enum Position {LEFT = 1, RIGHT, ABOVE, BELOW}
+            const CATEGORY : string
+        }
+
+        class ModifierContext {
+            static DEBUG : boolean;
+            addModifier(modifier : Modifier) : ModifierContext;
+            getModifiers(type : string) : Modifier[];
+            getWidth() : number;
+            getExtraLeftPx() : number;
+            getExtraRightPx() : number;
+            getState() : {left_shift : number, right_shift : number, text_line : number};
+            getMetrics() : {width : number, spacing : number, extra_left_px : number, extra_right_px : number};
+            preFormat() : void;
+            postFormat() : void;
+        }
+
+        class Music {
+            isValidNoteValue(note : number) : boolean;
+            isValidIntervalValue(interval : number) : boolean;
+            getNoteParts(noteString : string) : {root : string, accidental : string};
+            getKeyParts(noteString : string) : {root : string, accidental : string, type : string};
+            getNoteValue(noteString : string) : number;
+            getIntervalValue(intervalString : string) : number;
+            getCanonicalNoteName(noteValue : number) : string;
+            getCanonicalIntervalName(intervalValue : number) : string;
+            getRelativeNoteValue(noteValue : number, intervalValue : number, direction? : number) : number;
+            getRelativeNoteName(root : string, noteValue : number) : string;
+            getScaleTones(key : string, intervals : number[]) : number;
+            getIntervalBetween(note1 : number, note2 : number, direction? : number) : number;
+            createScaleMap(keySignature : string) : {[rootName : string] : string};
+        }
+
+        namespace Music {
+            const NUM_TONES : number;
+            const roots : string[];
+            const root_values : number[];
+            const root_indices : {[root : string] : number};
+            const canonical_notes : string[];
+            const diatonic_intervals : string[];
+            const diatonic_accidentals : {[diatonic_interval : string] : {note : number, accidental : number}};
+            const intervals : {[interval : string] : number};
+            const scales : {[scale : string] : number[]};
+            const accidentals : string[];
+            const noteValues : {[value : string] : {root_index : number, int_val : number}};
+        }
+
+        class Note implements Tickable {
+            //from tickable interface:
+            getTicks() : Fraction;
+            getCenterXShift() : number;
+            isCenterAligned() : boolean;
+            setCenterAlignment(align_center : boolean) : Note;
+            getTuplet() : Tuplet;
+            setTuplet(tuplet : Tuplet) : Note;
+            addToModifierContext(mc : ModifierContext) : void;
+            preFormat() : void;
+            postFormat() : Note;
+            getIntrinsicTicks() : Fraction;
+            setIntrinsicTicks(intrinsicTicks : Fraction) : void;
+            getTickMultiplier() : Fraction;
+            applyTickMultiplier(numerator : number, denominator : number) : void;
+            setDuration(duration : Fraction) : void;
+
+            constructor(note_struct : {type? : string, dots? : number, duration : string});
+            getPlayNote() : any;
+            setPlayNote(note : any) : Note;
+            isRest() : boolean;
+            addStroke(index : number, stroke : Stroke) : Note;
+            getStave() : Stave;
+            setStave(stave : Stave) : Note;
+            getCategory() : string;
+            setContext(context : IRenderContext) : Note;
+            getExtraLeftPx() : number;
+            getExtraRightPx() : number;
+            setExtraLeftPx(x : number) : Note;
+            setExtraRightPx(x : number) : Note;
+            shouldIgnoreTicks() : boolean;
+            getLineNumber() : number;
+            getLineForRest() : number;
+            getGlyph() : Glyph;
+            setYs(ys : number[]) : Note;
+            getYs() : number[];
+            getYForTopText(text_line : number) : number;
+            getBoundingBox() : BoundingBox;
+            getVoice() : Voice;
+            setVoice(voice : Voice) : Note;
+            getTickContext() : TickContext;
+            setTickContext(tc : TickContext) : Note;
+            getDuration() : string;
+            isDotted() : boolean;
+            hasStem() : boolean;
+            getDots() : number;
+            getNoteType() : string;
+            setBeam() : Note;
+            setModifierContext(mc : ModifierContext) : Note;
+            addModifier(modifier : Modifier, index? : number) : Note;
+            getModifierStartXY() : {x : number, y : number};
+            getMetrics() : {width : number, noteWidth : number, left_shift : number, modLeftPx : number, modRightPx : number, extraLeftPx : number, extraRightPx : number};
+            setWidth(width : number) : void;
+            getWidth() : number;
+            setXShift(x : number) : Note;
+            getX() : number;
+            getAbsoluteX() : number;
+            setPreFormatted(value : boolean) : void;
+        }
+
+        namespace Note {
+            const CATEGORY : string;
+        }
+
+        class NoteHead extends Note {
+            constructor(head_options : {x? : number, y? : number, note_type? : string, duration : string, displaced? : boolean, stem_direction? : number, line : number, x_shift : number, custom_glyph_code? : string, style? : string, slashed? : boolean, glyph_font_scale? : number});
+            static DEBUG : boolean;
+            getCategory() : string;
+            setContext(context : IRenderContext) : NoteHead;
+            getWidth() : number;
+            isDisplaced() : boolean;
+            getStyle() : {shadowColor? : string, shadowBlur? : string, fillStyle? : string, strokeStyle? : string};
+            setStyle(style : {shadowColor? : string, shadowBlur? : string, fillStyle? : string, strokeStyle? : string}) : NoteHead;
+            getGlyph() : Glyph;
+            setX(x : number) : NoteHead;
+            getY() : number;
+            setY(y : number) : NoteHead;
+            getLine() : number;
+            setLine(line : number) : NoteHead;
+            getAbsoluteX() : number;
+            getBoundingBox() : BoundingBox;
+            applyStyle(context : IRenderContext) : NoteHead;
+            setStave(stave : Stave) : NoteHead;
+            preFormat() : NoteHead;
+            draw() : void;
+        }
+
+        class Ornament extends Modifier {
+            constructor(type : string);
+            static DEBUG : boolean;
+            static format(ornaments : Ornament[], state : {left_shift : number, right_shift : number, text_line : number}) : boolean;
+            setDelayed(delayed : boolean) : Ornament;
+            setUpperAccidental(acc : string) : Ornament;
+            setLowerAccidental(acc : string) : Ornament;
+            draw() : void;
+        }
+
+        namespace Ornament {
+            const CATEGORY : string;
+        }
+
+        class PedalMarking {
+            constructor(notes : Note[]); //inconsistent name: 'notes' is called 'type', suggesting string (is Note[])
+            static DEBUG : boolean;
+            static createSustain(notes : Note[]) : PedalMarking;
+            static createSostenuto(notes : Note[]) : PedalMarking;
+            static createUnaCorda(notes : Note[]) : PedalMarking;
+            setCustomText(depress? : string, release? : string) : PedalMarking;
+            setStyle(style : PedalMarking.Styles) : PedalMarking;
+            setLine(line : number) : PedalMarking;
+            setContext(context : IRenderContext) : PedalMarking;
+            drawBracketed() : void;
+            drawText() : void;
+            draw() : void;
+        }
+
+        namespace PedalMarking {
+            const enum Styles {TEXT = 1, BRACKET, MIXED}
+            const GLYPHS : {[name : string] : {code : string, x_shift : number, y_shift : number}};
+        }
+
+        class RaphaelContext implements IRenderContext {
+            //TODO remove the following lines once TypeScript allows subclass overrides with type changes or type inconsistencies mentioned below are fixed
+            setLineWidth(width : number) : RaphaelContext;
+            glow() : RaphaelContext;
+
+            constructor(element : HTMLElement);
+            setFont(family : string, size : number, weight? : number) : RaphaelContext;
+            setRawFont(font : string) : RaphaelContext;
+            setFillStyle(style : string) : RaphaelContext;
+            setBackgroundFillStyle(style : string) : RaphaelContext;
+            setStrokeStyle(style : string) : RaphaelContext;
+            setShadowColor(style : string) : RaphaelContext; //inconsistent name: style -> color
+            setShadowBlur(blur : string) : RaphaelContext;
+            setLineWidth(width : number) : void; //inconsistent type: void -> RaphaelContext
+            setLineDash(dash : string) : RaphaelContext;
+            setLineCap(cap_type : string) : RaphaelContext;
+            scale(x : number, y : number) : RaphaelContext;
+            clear() : void;
+            resize(width : number, height : number) : RaphaelContext;
+            setViewBox(viewBox : string) : void;
+            rect(x : number, y : number, width : number, height : number) : void;
+            fillRect(x : number, y : number, width : number, height : number) : RaphaelContext;
+            clearRect(x : number, y : number, width : number, height : number) : RaphaelContext;
+            beginPath() : RaphaelContext;
+            moveTo(x : number, y : number) : RaphaelContext;
+            lineTo(x : number, y : number) : RaphaelContext;
+            bezierCurveToTo(x1 : number, y1 : number, x2 : number, y2 : number, x : number, y : number) : RaphaelContext;
+            quadraticCurveToTo(x1 : number, y1 : number, x : number, y : number) : RaphaelContext; //inconsistent name: x, y -> x2, y2
+            arc(x : number, y : number, radius : number, startAngle : number, endAngle : number, antiClockwise : boolean) : RaphaelContext;
+            glow() : {width : number, fill : boolean, opacity : number, offsetx : number, offsety : number, color : string}; //inconsistent type : Object -> RaphaelContext
+            fill() : RaphaelContext;
+            stroke() : RaphaelContext;
+            closePath() : RaphaelContext;
+            measureText(text : string) : {width : number, height : number};
+            fillText(text : string, x : number, y : number) : RaphaelContext;
+            save() : RaphaelContext;
+            restore() : RaphaelContext;
+        }
+
+        class Renderer {
+            constructor(sel : HTMLElement, backend : Renderer.Backends)
+            static USE_CANVAS_PROXY : boolean;
+            static buildContext(sel : HTMLElement, backend : Renderer.Backends, width? : number, height? : number, background? : string) : IRenderContext;
+            static getCanvasContext(sel : HTMLElement, backend : Renderer.Backends, width? : number, height? : number, background? : string) : CanvasContext;
+            static getRaphaelContext(sel : HTMLElement, backend : Renderer.Backends, width? : number, height? : number, background? : string) : RaphaelContext;
+            static getSVGContext(sel : HTMLElement, backend : Renderer.Backends, width? : number, height? : number, background? : string) : SVGContext;
+            static bolsterCanvasContext(ctx : CanvasRenderingContext2D) : CanvasContext;
+            static drawDashedLine(context : IRenderContext, fromX : number, fromY : number, toX : number, toY : number, dashPattern : number[]) : void;
+            resize(width : number, height : number) : Renderer;
+            getContext() : IRenderContext;
+        }
+
+        namespace Renderer {
+            const enum Backends {CANVAS = 1, RAPHAEL, SVG, VML}
+            const enum LineEndType {NONE = 1, UP, DOWN}
+        }
+
+        class Repetition extends StaveModifier {
+            constructor(type : Repetition.type, x : number, y_shift : number);
+            getCategory() : string;
+            setShiftX(x : number) : Repetition;
+            setShiftY(y : number) : Repetition;
+            draw(stave : Stave, x : number) : Repetition;
+            drawCodaFixed(stave : Stave, x : number) : Repetition;
+            drawSignoFixed(stave : Stave, x : number) : Repetition; //inconsistent name: drawSignoFixed -> drawSegnoFixed
+            drawSymbolText(stave : Stave, x : number, text : string, draw_coda : boolean) : Repetition;
+        }
+
+        namespace Repetition {
+            const enum type { NONE = 1, CODA_LEFT, CODA_RIGHT, SEGNO_LEFT, SEGNO_RIGHT, DC, DC_AL_CODA, DC_AL_FINE, DS, DS_AL_CODA, DS_AL_FINE, FINE }
+        }
+
+        class Stave {
+            constructor(x : number, y : number, width : number, options? : {vertical_bar_width? : number, glyph_spacing_px? : number, num_lines? : number, fill_style? : string, spacing_between_lines_px? : number, space_above_staff_ln? : number, space_below_staff_ln? : number, top_text_position? : number});
+            resetLines() : void;
+            setNoteStartX(x : number) : Stave;
+            getNoteStartX() : number;
+            getNoteEndX() : number;
+            getTieStartX() : number;
+            getTieEndX() : number;
+            setContext(context : IRenderContext) : Stave;
+            getContext() : IRenderContext;
+            getX() : number;
+            getNumLines() : number;
+            setY(y : number) : Stave;
+            setWidth(width : number) : Stave;
+            getWidth() : number;
+            setMeasure(measure : number) : Stave;
+            setBegBarType(type : Barline.type) : Stave;
+            setEndBarType(type : Barline.type) : Stave;
+            getModifierXShift(index : number) : number;
+            setRepetitionTypeLeft(type : Repetition.type, y : number) : Stave;
+            setRepetitionTypeRight(type : Repetition.type, y : number) : Stave;
+            setVoltaType(type : Volta.type, number_t : number, y : number) : Stave;
+            setSection(section : string, y : number) : Stave;
+            setTempo(tempo : {name? : string, duration : string, dots : number, bpm : number}, y : number) : Stave;
+            setText(text : string, position : Modifier.Position, options? : {shift_x? : number, shift_y? : number, justification? : TextNote.Justification}) : Stave;
+            getHeight() : number;
+            getSpacingBetweenLines() : number;
+            getBoundingBix() : BoundingBox;
+            getBottomY() : number;
+            getBottomLineY() : number;
+            getYForLine(line : number) : number;
+            getYForTopText(line? : number) : number;
+            getYForBottomText(line? : number) : number;
+            getYForNote(line? : number) : number;
+            getYForGlyphs() : number;
+            addGlyph(glypg : Glyph) : Stave;
+            addEndGlyph(glypg : Glyph) : Stave;
+            addModifier(modifier : StaveModifier) : Stave;
+            addEndModifier(modifier : StaveModifier) : Stave;
+            addKeySignature(keySpec : string) : Stave;
+            addClef(clef : string, size? : string, annotation? : string) : Stave;
+            addEndClef(clef : string, size? : string, annotation? : string) : Stave;
+            addTimeSignature(timeSpec : string, customPadding? : number) : void; //inconsistent type: void -> Stave
+            addTrebleGlyph() : Stave;
+            draw() : void;
+            drawVertical(x : number, isDouble : boolean) : void;
+            drawVerticalFixed(x : number, isDouble : boolean) : void;
+            drawVerticalBar(x : number) : void;
+            drawVerticalBarFixed(x : number) : void;
+            getConfigForLines() : {visible : boolean}[];
+            setConfigForLine(line_number : number, line_config : {visible : boolean}) : Stave;
+            setConfigForLines(lines_configuration : {visible : boolean}[]) : Stave;
+        }
+
+        class StaveConnector {
+            constructor(top_stave : Stave, bottom_stave : Stave);
+            setContext(ctx : IRenderContext) : StaveConnector;
+            setType(type : StaveConnector.type) : StaveConnector;
+            setText(text : string, text_options? : {shift_x? : number, shift_y? : number}) : StaveConnector;
+            setFont(font : {family? : string, size? : number, weight? : string}) : void; //inconsistent type: void -> StaveConnector
+            setXShift(x_shift : number) : StaveConnector;
+            draw() : void;
+            drawBoldDoubleLine(ctx : Object, type : StaveConnector.type, topX : number, topY : number, botY : number) : void;
+        }
+
+        namespace StaveConnector {
+            const enum type { SINGLE_RIGHT = 0, SINGLE_LEFT = 1, SINGLE = 1, DOUBLE = 2, BRACE = 3, BRACKET = 4, BOLD_DOUBLE_LEFT = 5, BOLD_DOUBLE_RIGHT = 6, THIN_DOUBLE = 7 }
+        }
+
+        class StaveHairpin {
+            constructor(notes : {first_note : Note, last_note : Note}, type : StaveHairpin.type);
+            static FormatByTicksAndDraw(ctx : IRenderContext, formatter : Formatter, notes : {first_note : Note, last_note : Note}, type : StaveHairpin.type, position : Modifier.Position, options? : {height : number, y_shift : number, left_shift_ticks : number, right_shift_ticks : number}) : void;
+            setContext(context : IRenderContext) : StaveHairpin;
+            setPosition(position : Modifier.Position) : StaveHairpin;
+            setRenderOptions(options : {height? : number, y_shift : number, left_shift_px : number, right_shift_px : number}) : StaveHairpin;
+            setNotes(notes : {first_note : Note, last_note : Note}) : StaveHairpin;
+            renderHairpin(params : {first_x : number, last_x : number, first_y : number, last_y : number, staff_height : number}) : void;
+            draw() : boolean;
+        }
+
+        namespace StaveHairpin {
+            const enum type { CRESC = 1, DECRESC }
+        }
+
+        class StaveLine {
+            constructor(notes : {first_note: Note, last_note: Note, first_indices : number[], last_indices : number[]});
+            setContext(context : Object) : StaveLine;
+            setFont(font : {family : string, size : number, weight : string}) : StaveLine;
+            setText(text : string) : StaveLine;
+            setNotes(notes : {first_note: Note, last_note: Note, first_indices? : number[], last_indices? : number[]}) : StaveLine;
+            applyLineStyle() : void;
+            applyFontStyle() : void;
+            draw() : StaveLine;
+
+            //inconsistent API: this should be set via an options object in the constructor
+            render_options : {padding_left : number, padding_right : number, line_width : number, line_dash : number[], rounded_end : boolean, color : string, draw_start_arrow : boolean, draw_end_arrow : boolean, arrowhead_length : number, arrowhead_angle : number, text_position_vertical : StaveLine.TextVerticalPosition, text_justification : StaveLine.TextJustification};
+        }
+
+        namespace StaveLine {
+            const enum TextVerticalPosition { TOP = 1, BOTTOM }
+            const enum TextJustification { LEFT = 1, CENTER, RIGHT }
+        }
+
+        class StaveModifier {
+            getCategory() : string;
+            makeSpacer(padding : number) : {getContext: Function, setStave: Function, renderToStave: Function, getMetrics: Function};
+            placeGlyphOnLine(glyph : Glyph, stave : Stave, line : number) : void;
+            setPadding(padding : number) : void;
+            addToStave(stave : Stave, firstGlyph : boolean) : StaveModifier;
+            addToStaveEnd(stave : Stave, firstGlyph : boolean) : StaveModifier;
+            addModifier() : void;
+            addEndModifier() : void;
+        }
+
+        class StaveNote extends StemmableNote {
+            //TODO remove the following lines once TypeScript allows subclass overrides with type changes and/or inconsistencies mentioned below are fixed
+            buildStem() : StemmableNote;
+            setStave(stave : Stave) : Note;
+            addModifier(modifier : Modifier, index? : number) : Note;
+            getModifierStartXY() : {x : number, y : number};
+            getDots() : number;
+
+            constructor(note_struct : {type? : string, dots? : number, duration : string, clef? : string, keys : string[], octave_shift? : number, auto_stem? : boolean, stem_direction? : number});
+            static DEBUG : boolean;
+            static format(notes : StaveNote[] , state : {left_shift : number, right_shift : number, text_line : number}) : boolean;
+            static formatByY(notes : StaveNote[] , state : {left_shift : number, right_shift : number, text_line : number}) : void;
+            static postFormat(notes : StaveNote[]) : boolean;
+            buildStem() : void; //inconsistent type: void -> StaveNote
+            buildNoteHeads() : void;
+            autoStem() : void;
+            calculateKeyProps() : void;
+            getBoundingBox() : BoundingBox;
+            getLineNumber() : number;
+            isRest() : boolean;
+            isChord() : boolean;
+            hasStem() : boolean;
+            getYForTopText(text_line : number) : number;
+            getYForBottomText(text_line : number) : number;
+            setStave(stave : Stave) : StaveNote;
+            getKeys() : string[];
+            getKeyProps() : {key : string, octave : number, line : number, int_value : number, accidental : string, code : number, stroke : number, shift_right : number, displaced : boolean}[];
+            isDisplaced() : boolean;
+            setNoteDisplaced(displaced : boolean) : StaveNote;
+            getTieRightX() : number;
+            getTieLeftX() : number;
+            getLineForRest() : number;
+            getModifierStartXY(position : Modifier.Position, index : number) : {x : number, y : number};
+            setStyle(style : {shadowColor? : string, shadowBlur? : string, fillStyle? : string, strokeStyle? : string}) : void; // inconsistent type: void -> StaveNote
+            setKeyStyle(index : number, style : {shadowColor? : string, shadowBlur? : string, fillStyle? : string, strokeStyle? : string}) : StaveNote;
+            setKeyLine(index : number, line : number) : StaveNote;
+            getKeyLine(index : number) : number;
+            addToModifierContext(mContext : ModifierContext) : StaveNote;
+            addModifier(index : number, modifier : Modifier) : StaveNote;
+            addAccidental(index : number, accidental : Accidental) : StaveNote;
+            addArticulation(index : number, articulation : Articulation) : StaveNote;
+            addAnnotation(index : number, annotation : Annotation) : StaveNote;
+            addDot(index : number) : StaveNote;
+            addDotToAll() : StaveNote;
+            getAccidentals() : Accidental[];
+            getDots() : Dot[];
+            getVoiceShiftWidth() : number;
+            calcExtraPx() : void;
+            preFormat() : void;
+            getNoteHeadBounds() : {y_top: number, y_bottom: number, highest_line: number, lowest_line: number};
+            getNoteHeadBeginX() : number;
+            getNoteHeadEndX() : number;
+            drawLedgerLines() : void;
+            drawModifiers() : void;
+            drawFlag() : void;
+            drawNoteHeads() : void;
+            drawStem(struct : {x_begin? : number, x_end? : number, y_top? : number, y_bottom? : number, y_extend? : number, stem_extension? : number, stem_direction? : number}) : void;
+            draw() : void;
+        }
+
+        namespace StaveNote {
+            const STEM_UP: number;
+            const STEM_DOWN: number;
+            const CATEGORY: string;
+        }
+
+        class StaveSection extends Modifier {
+            //TODO remove the following lines once TypeScript allows subclass overrides with type changes
+            draw() : void;
+
+            constructor(section : string, x : number, shift_y : number);
+            getCategory() : string;
+            setStaveSection(section : string) : StaveSection;
+            setShiftX(x : number) : StaveSection;
+            setShiftY(y : number) : StaveSection;
+            draw(stave : Stave, shift_x : number) : StaveSection;
+        }
+
+        class StaveTempo extends StaveModifier {
+            constructor(tempo : {name? : string, duration : string, dots : number, bpm : number}, x : number, shift_y : number);
+            getCategory() : string;
+            setTempo(tempo : {name? : string, duration : string, dots : number, bpm : number}) : StaveTempo;
+            setShiftX(x : number) : StaveTempo;
+            setShiftY(y : number) : StaveTempo;
+            draw(stave : Stave, shift_x : number) : StaveTempo;
+        }
+
+        class StaveText extends Modifier {
+            //TODO remove the following lines once TypeScript allows subclass overrides with type changes
+            draw() : void;
+
+            constructor(text : string, position : Modifier.Position, options? : {shift_x? : number, shift_y? : number, justification? : TextNote.Justification});
+            getCategory() : string;
+            setStaveText(text : string) : StaveText;
+            setShiftX(x : number) : StaveText;
+            setShiftY(y : number) : StaveText;
+            setFont(font : {family? : string, size? : number, weight? : number}) : void;
+            setText(text : string) : void;
+            draw(stave : Stave) : StaveText;
+        }
+
+        class StaveTie {
+            constructor(notes : {first_note: Note, last_note: Note, first_indices : number[], last_indices : number[]}, text? : string);
+            setContext(context : IRenderContext) : StaveTie;
+            setFont(font : {family : string, size : number, weight : string}) : StaveTie;
+            setNotes(notes : {first_note: Note, last_note: Note, first_indices : number[], last_indices : number[]}) : StaveTie;
+            isPartial() : boolean;
+            renderTie(params : {first_ys : number[], last_ys : number[], last_x_px : number, first_x_px : number, direction : number}) : void;
+            renderText(first_x_px : number, last_x_px : number) : void;
+            draw() : boolean;
+        }
+
+        class Stem {
+            constructor(options : {x_begin? : number, x_end? : number, y_top? : number, y_bottom? : number, y_extend? : number, stem_extension? : number, stem_direction? : number});
+            static DEBUG : boolean;
+            setNoteHeadXBounds(x_begin : number, x_end : number) : Stem;
+            setDirection(direction : number) : void;
+            setExtension(extension : number) : void;
+            setYBounds(y_top : number, y_bottom : number) : void;
+            getCategory() : string;
+            setContext(context : IRenderContext) : Stem;
+            getHeight() : number;
+            getBoundingBox() : BoundingBox;
+            getExtents() : {topY : number, baseY : number};
+            setStyle(style : {shadowColor? : string, shadowBlur? : string, fillStyle? : string, strokeStyle? : string}) : void;
+            getStyle() : {shadowColor? : string, shadowBlur? : string, fillStyle? : string, strokeStyle? : string};
+            applyStyle(context : IRenderContext) : Stem;
+            draw() : void;
+
+            //inconsistent API: this should be set via the options object in the constructor
+            hide : boolean;
+        }
+
+        namespace Stem {
+            const UP: number;
+            const DOWN: number;
+        }
+
+        class StemmableNote extends Note {
+            //TODO remove the following lines once TypeScript allows subclass overrides with type changes
+            setBeam() : Note;
+
+            constructor(note_struct : {type? : string, dots? : number, duration : string});
+            static DEBUG : boolean;
+            getStem() : Stem;
+            setStem(stem : Stem) : StemmableNote;
+            buildStem() : StemmableNote;
+            getStemLength() : number;
+            getBeamCount() : number;
+            getStemMinumumLength() : number; //inconsistent name: getStemMinumumLength -> getStemMinimumLength
+            getStemDirection() : number;
+            setStemDirection(direction : number) : StemmableNote;
+            getStemX() : number;
+            getCenterGlyphX() : number;
+            getStemExtension() : number;
+            setStemLength() : number;
+            getStemExtents() : {topY : number, baseY : number};
+            setBeam(beam : Beam) : StemmableNote;
+            getYForTopText(text_line : number) : number;
+            getYForBottomText(text_line : number) : number;
+            postFormat() : StemmableNote;
+            drawStem(stem_struct : {x_begin? : number, x_end? : number, y_top? : number, y_bottom? : number, y_extend? : number, stem_extension? : number, stem_direction? : number}) : void;
+        }
+
+        class StringNumber extends Modifier {
+            //TODO remove the following lines once TypeScript allows subclass overrides with type changes
+            setNote(note : Note) : StringNumber;
+
+            constructor(number : number);
+            static format(nums : StringNumber[], state : {left_shift : number, right_shift : number, text_line : number}) : boolean;
+            getNote()  : Note;
+            setNote(note : StemmableNote) : StringNumber;
+            getIndex() : number;
+            setIndex(index : number) : StringNumber;
+            setLineEndType(leg : Renderer.LineEndType) : StringNumber;
+            getPosition() : Modifier.Position;
+            setPosition(position : Modifier.Position) : StringNumber;
+            setStringNumber(number : number) : StringNumber;
+            setOffsetX(x : number) : StringNumber;
+            setOffsetY(y : number) : StringNumber;
+            setLastNote(note : StemmableNote) : StringNumber;
+            setDashed(dashed : boolean) : StringNumber;
+            draw() : void;
+        }
+
+        namespace StringNumber {
+            const CATEGORY: string;
+        }
+
+        class Stroke extends Modifier {
+            constructor(type : Stroke.Type, options : {all_voices? : boolean});
+            static format(strokes : Stroke[], state : {left_shift : number, right_shift : number, text_line : number}) : boolean;
+            getPosition() : Modifier.Position;
+            addEndNote(note : Note) : Stroke;
+            draw() : void;
+        }
+
+        namespace Stroke {
+            const enum Type {BRUSH_DOWN = 1, BRUSH_UP, ROLL_DOWN, ROLL_UP, RASQUEDO_DOWN, RASQUEDO_UP}
+            const CATEGORY : string;
+        }
+
+        class SVGContext implements IRenderContext {
+            constructor(element : HTMLElement);
+            iePolyfill() : boolean;
+            setFont(family : string, size : number, weight? : number) : SVGContext;
+            setRawFont(font : string) : SVGContext;
+            setFillStyle(style : string) : SVGContext;
+            setBackgroundFillStyle(style : string) : SVGContext;
+            setStrokeStyle(style : string) : SVGContext;
+            setShadowColor(style : string) : SVGContext; //inconsistent name: style -> color
+            setShadowBlur(blur : string) : SVGContext;
+            setLineWidth(width : number) : SVGContext;
+            setLineDash(dash : string) : SVGContext;
+            setLineCap(cap_type : string) : SVGContext;
+            resize(width : number, height : number) : SVGContext;
+            scale(x : number, y : number) : SVGContext;
+            setViewBox(xMin : number, yMin : number, width : number, height : number) : void;
+            clear() : void;
+            rect(x : number, y : number, width : number, height : number) : SVGContext;
+            fillRect(x : number, y : number, width : number, height : number) : SVGContext;
+            clearRect(x : number, y : number, width : number, height : number) : SVGContext;
+            beginPath() : SVGContext;
+            moveTo(x : number, y : number) : SVGContext;
+            lineTo(x : number, y : number) : SVGContext;
+            bezierCurveToTo(x1 : number, y1 : number, x2 : number, y2 : number, x : number, y : number) : SVGContext;
+            quadraticCurveToTo(x1 : number, y1 : number, x : number, y : number) : SVGContext; //inconsistent: x, y -> x2, y2
+            arc(x : number, y : number, radius : number, startAngle : number, endAngle : number, antiClockwise : boolean) : SVGContext;
+            closePath() : SVGContext;
+            glow() : SVGContext;
+            fill() : SVGContext;
+            stroke() : SVGContext;
+            measureText(text : string) : SVGRect;
+            ieMeasureTextFix(bbox : SVGRect, text : string) : {x : number, y : number, width : number, height : number};
+            fillText(text : string, x : number, y : number) : SVGContext;
+            save() : SVGContext;
+            restore() : SVGContext;
+        }
+
+        class TabNote extends StemmableNote {
+            //TODO remove the following lines once TypeScript allows subclass overrides with type changes
+            setStave(stave : Stave) : Note;
+            getModifierStartXY() : {x : number, y : number};
+
+            constructor(tab_struct : {positions : {str : number, fret : number}[], type? : string, dots? : number, duration : string, stem_direction? : boolean}, draw_stem? : boolean);
+            getCategory() : string;
+            setGhost(ghost : boolean) : TabNote;
+            hasStem() : boolean;
+            getStemExtension() : number;
+            addDot() : TabNote;
+            updateWidth() : void;
+            setStave(stave : Stave) : TabNote;
+            getPositions() : {str : number, fret : number}[];
+            addToModifierContext(mc : ModifierContext) : TabNote;
+            getTieRightX() : number;
+            getTieLeftX() : number;
+            getModifierStartXY(position : Modifier.Position, index : number) : {x : number, y : number};
+            getLineForRest() : number;
+            preFormat() : void;
+            getStemX() : number;
+            getStemY() : number;
+            getStemExtents() : {topY : number, baseY : number};
+            drawFlag() : void;
+            drawModifiers() : void;
+            drawStemThrough() : void;
+            draw() : void;
+        }
+
+        class TabSlide extends TabTie {
+            constructor(notes : {first_note: Note, last_note: Note, first_indices : number[], last_indices : number[]}, direction? : number);
+            static createSlideUp(notes : {first_note: Note, last_note: Note, first_indices : number[], last_indices : number[]}) : TabSlide;
+            static createSlideDown(notes : {first_note: Note, last_note: Note, first_indices : number[], last_indices : number[]}) : TabSlide;
+            renderTie(params : {first_ys : number[], last_ys : number[], last_x_px : number, first_x_px : number, direction : number}) : void;
+        }
+
+        namespace TabSlide {
+            const SLIDE_UP : number;
+            const SLIDE_DOWN : number;
+        }
+
+        class TabStave extends Stave {
+            constructor(x : number, y : number, width : number, options? : {vertical_bar_width? : number, glyph_spacing_px? : number, num_lines? : number, fill_style? : string, spacing_between_lines_px? : number, space_above_staff_ln? : number, space_below_staff_ln? : number, top_text_position? : number});
+            getYForGlyphs() : number;
+            addTabGlyph() : TabStave;
+        }
+
+        class TabTie extends StaveTie {
+            constructor(notes : {first_note: Note, last_note: Note, first_indices : number[], last_indices : number[]}, text? : string);
+            createHammeron(notes : {first_note: Note, last_note: Note, first_indices : number[], last_indices : number[]}) : TabTie;
+            createPulloff(notes : {first_note: Note, last_note: Note, first_indices : number[], last_indices : number[]}) : TabTie;
+            draw() : boolean;
+        }
+
+        class TextBracket {
+            constructor(bracket_data : {start : Note, stop : Note, text? : string, superscript? : string, position? : TextBracket.Positions});
+            static DEBUG : boolean;
+            applyStyle(context : IRenderContext) : TextBracket;
+            setDashed(dashed : boolean, dash? : number[]) : TextBracket;
+            setFont(font : {family : string, size : number, weight : string}) : TextBracket;
+            setContext(context : IRenderContext) : TextBracket;
+            setLine(line : number) : TextBracket;
+            draw() : void;
+        }
+
+        namespace TextBracket {
+            const enum Positions {TOP = 1, BOTTOM = -1}
+        }
+
+        class TextDynamics extends Note {
+            constructor(text_struct : {duration : string, text : string, line? : number});
+            static DEBUG : boolean;
+            setLine(line : number) : TextDynamics;
+            preFormat() : TextDynamics;
+            draw() : void;
+        }
+
+        class TextNote extends Note {
+            constructor(text_struct : {duration : string, text? : string, superscript? : boolean, subscript? : boolean, glyph? : string, font? : {family : string, size : number, weight : string}, line? : number, smooth? : boolean, ignore_ticks? : boolean});
+            setJustification(just : TextNote.Justification) : TextNote;
+            setLine(line : number) : TextNote;
+            preFormat() : void;
+            draw() : void;
+        }
+
+        namespace TextNote {
+            const enum Justification {LEFT = 1, CENTER, RIGHT}
+            const GLYPHS : {[name : string] : {code : string, point : number, x_shift : number, y_shift : number}}
+        }
+
+        interface Tickable {
+            setContext(context : IRenderContext) : void;
+            getBoundingBox() : BoundingBox;
+            getTicks() : Fraction;
+            shouldIgnoreTicks() : boolean;
+            getWidth() : number;
+            setXShift(x : number) : Tickable;
+            getCenterXShift() : number;
+            isCenterAligned() : boolean;
+            setCenterAlignment(align_center : boolean) : Tickable;
+            getVoice() : Voice;
+            setVoice(voice : Voice) : void;
+            getTuplet() : Tuplet;
+            setTuplet(tuplet : Tuplet) : Tickable;
+            addToModifierContext(mc : ModifierContext) : void;
+            addModifier(mod : Modifier) : Tickable;
+            setTickContext(tc : TickContext) : void;
+            preFormat() : void;
+            postFormat() : Tickable;
+            getIntrinsicTicks() : Fraction;
+            setIntrinsicTicks(intrinsicTicks : Fraction) : void;
+            getTickMultiplier() : Fraction;
+            applyTickMultiplier(numerator : number, denominator : number) : void;
+            setDuration(duration : Fraction) : void;
+        }
+
+        class TickContext {
+            setContext(context : IRenderContext) : void;
+            getContext() : IRenderContext;
+            shouldIgnoreTicks() : boolean;
+            getWidth() : number;
+            getX() : number;
+            setX(x : number) : TickContext;
+            getPixelsUsed() : number;
+            setPixelsUsed(pixelsUsed : number) : TickContext;
+            setPadding(padding : number) : TickContext;
+            getMaxTicks() : number;
+            getMinTicks() : number;
+            getTickables() : Tickable[];
+            getCenterAlignedTickables() : Tickable[];
+            getMetrics() : {width : number, notePx : number, extraLeftPx : number, extraRightPx : number};
+            getCurrentTick() : Fraction;
+            setCurrentTick(tick : Fraction) : void;
+            getExtraPx() : {left: number, right: number, extraLeft : number, extraRight : number};
+            addTickable(tickable : Tickable) : TickContext;
+            preFormat() : TickContext;
+            postFormat() : TickContext;
+            static getNextContext(tContext : TickContext) : TickContext;
+        }
+
+        class TimeSignature extends StaveModifier {
+             //TODO remove the following lines once TypeScript allows subclass overrides with type changes
+            addModifier() : void;
+            addEndModifier() : void;
+
+            constructor(timeSpec : string, customPadding? : number);
+            parseTimeSpec(timeSpec : string) : {num : number, glyph : Glyph};
+            makeTimeSignatureGlyph(topNums : number[], botNums : number[]) : Glyph;
+            getTimeSig() : {num : number, glyph : Glyph};
+            addModifier(stave : Stave) : void;
+            addEndModifier(stave : Stave) : void;
+        }
+
+        namespace TimeSignature {
+            const glyphs : {[name : string] : {code : string, point : number, line : number}};
+        }
+
+        class TimeSigNote extends Note {
+            //TODO remove the following lines once TypeScript allows subclass overrides with type changes or type inconsistencies mentioned below are fixed
+            setStave(stave : Stave) : Note;
+
+            constructor(timeSpec : string, customPadding : number);
+            setStave(stave : Stave) : void; //inconsistent type: void -> TimeSignote
+            getBoundingBox() : BoundingBox;
+            addToModifierContext() : TimeSigNote;
+            preFormat() : TimeSigNote;
+            draw() : void;
+        }
+
+        class Tremolo extends Modifier {
+            constructor(num : number);
+            getCategory() : string;
+            draw() : void;
+        }
+
+        class Tuning {
+            constructor(tuningString? : string);
+            noteToInteger(noteString : string) : number;
+            setTuning(tuningString : string) : void;
+            getValueForString(stringNum : string) : number;
+            getValueForFret(fretNum : string, stringNum : string) : number;
+            getNoteForFret(fretNum : string, stringNum : string) : string;
+        }
+
+        namespace Tuning {
+            const names: { [name: string]: string };
+        }
+
+        class Tuplet {
+            constructor(notes : StaveNote[], options : {num_notes? : number, beats_occupied? : number});
+            attach() : void;
+            detach() : void;
+            setContext(context : IRenderContext) : Tuplet;
+            setBracketed(bracketed : boolean) : Tuplet;
+            setRatioed(ratioed : boolean) : Tuplet;
+            setTupletLocation(location : number) : Tuplet;
+            getNotes() : StaveNote[];
+            getNoteCount() : number;
+            getBeatsOccupied() : number;
+            setBeatsOccupied(beats : number) : void;
+            resolveGlyphs() : void;
+            draw() : void;
+        }
+
+        namespace Tuplet {
+            const LOCATION_TOP : number;
+            const LOCATION_BOTTOM : number;
+        }
+
+        class Vibrato extends Modifier {
+            static format(vibratos : Vibrato[], state : {left_shift : number, right_shift : number, text_line : number}, context : ModifierContext) : boolean;
+            setHarsh(harsh : boolean) : Vibrato;
+            setVibratoWidth(width : number) : Vibrato;
+            draw() : void;
+        }
+
+        namespace Vibrato {
+            const CATEGORY : string;
+        }
+
+        class Voice {
+            constructor(time : {num_beats? : number, beat_value? : number, resolution? : number});
+            getTotalTicks() : Fraction;
+            getTicksUsed() : Fraction;
+            getLargestTickWidth() : number;
+            getSmallestTickCount() : Fraction;
+            getTickables() : Tickable[];
+            getMode() : number;
+            setMode(mode : number) : Voice;
+            getResolutionMultiplier() : number;
+            getActualResolution() : number;
+            setStave(stave : Stave) : Voice;
+            getBoundingBox() : BoundingBox;
+            getVoiceGroup() : VoiceGroup;
+            setVoiceGroup(g : VoiceGroup) : Voice;
+            setStrict(strict : boolean) : Voice;
+            isComplete() : boolean;
+            addTickable(tickable : Tickable) : Voice;
+            addTickables(tickables : Tickable[]) : Voice;
+            preFormat() : Voice;
+            draw(context : IRenderContext, stave? : Stave) : void;
+        }
+
+        namespace Voice {
+            const enum Mode {STRICT = 1, SOFT, FULL}
+        }
+
+        class VoiceGroup {
+            getVoices() : Voice[];
+            getModifierContexts() : ModifierContext[];
+            addVoice(voice : Voice) : void;
+        }
+
+        class Volta extends StaveModifier {
+            constructor(type : Volta.type, number : number, x : number, y_shift : number);
+            getCategory() : string;
+            setShiftY(y : number) : Volta;
+            draw(stave : Stave, x : number) : Volta;
+        }
+
+        namespace Volta {
+            const enum type {NONE = 1, BEGIN, MID, END, BEGIN_END}
+        }
+    }
+}
+
+declare module "vexflow" {
+  export = Vex;
+}
diff --git a/vexflow/tsconfig.json b/vexflow/tsconfig.json
new file mode 100644
index 0000000000..a02f848c78
--- /dev/null
+++ b/vexflow/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "vexflow-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/vexflow/vexflow-tests.ts b/vexflow/vexflow-tests.ts
index 742e3b00fa..52a031ac1b 100644
--- a/vexflow/vexflow-tests.ts
+++ b/vexflow/vexflow-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="vexflow.d.ts" />
+
 
 var canvas = document.getElementById("canvas");
 var renderer = new Vex.Flow.Renderer(canvas, Vex.Flow.Renderer.Backends.CANVAS);
diff --git a/vexflow/vexflow.d.ts b/vexflow/vexflow.d.ts
deleted file mode 100644
index 8fec777460..0000000000
--- a/vexflow/vexflow.d.ts
+++ /dev/null
@@ -1,1417 +0,0 @@
-// Type definitions for VexFlow v1.2.27
-// Project: http://vexflow.com
-// Definitions by: Roman Quiring <https://github.com/rquiring>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-//inconsistent namespace: this is a helper funtion from tables.js and should not pollute the global namespace!
-declare function sanitizeDuration(duration : string) : string;
-
-declare namespace Vex {
-
-    function L(block : string, args : any[]) : void;
-    function Merge<T extends Object>(destination : T, source : Object) : T;
-    function Min(a : number, b : number) : number;
-    function Max(a : number, b : number) : number;
-    function RoundN(x : number, n : number) : number;
-    function MidLine(a : number, b : number) : number;
-    function SortAndUnique<T extends any[]>(arr : T, cmp : Function, eq : Function) : T;
-    function Contains(a : any[], obj : any) : boolean;
-    function getCanvasContext(canvas_sel : string) : CanvasRenderingContext2D;
-    function drawDot(ctx : IRenderContext, x : number, y : number, color? : string) : void;
-    function BM(s : number, f : Function) : void;
-    function Inherit<T extends Object>(child : T, parent : Object, object : Object) : T;
-
-    class RuntimeError {
-        constructor(code : string, message : string);
-    }
-
-    class RERR {
-        constructor(code : string, message : string);
-    }
-
-    /**
-     * Helper interface for handling the different rendering contexts (i.e. CanvasContext, RaphaelContext, SVGContext). Not part of VexFlow!
-     */
-    interface IRenderContext {
-        clear() : void;
-        setFont(family : string, size : number, weight? : number) : IRenderContext;
-        setRawFont(font : string) : IRenderContext;
-        setFillStyle(style : string) : IRenderContext;
-        setBackgroundFillStyle(style : string) : IRenderContext;
-        setStrokeStyle(style : string) : IRenderContext;
-        setShadowColor(color : string) : IRenderContext;
-        setShadowBlur(blur : string) : IRenderContext;
-        setLineWidth(width : number) : IRenderContext;
-        setLineCap(cap_type : string) : IRenderContext;
-        setLineDash(dash : string) : IRenderContext;
-        scale(x : number, y : number) : IRenderContext;
-        resize(width : number, height : number) : IRenderContext;
-        fillRect(x : number, y : number, width : number, height : number) : IRenderContext;
-        clearRect(x : number, y : number, width : number, height : number) : IRenderContext;
-        beginPath() : IRenderContext;
-        moveTo(x : number, y : number) : IRenderContext;
-        lineTo(x : number, y : number) : IRenderContext;
-        bezierCurveToTo(x1 : number, y1 : number, x2 : number, y2 : number, x : number, y : number) : IRenderContext;
-        quadraticCurveToTo(x1 : number, y1 : number, x2 : number, y2 : number) : void;
-        arc(x : number, y : number, radius : number, startAngle : number, endAngle : number, antiClockwise : boolean) : IRenderContext;
-        glow() : IRenderContext;
-        fill() : IRenderContext;
-        stroke() : IRenderContext;
-        closePath() : IRenderContext;
-        fillText(text : string, x : number, y : number) : IRenderContext;
-        save() : IRenderContext;
-        restore() : IRenderContext;
-
-        /**
-         * canvas returns TextMetrics, SVG returns SVGRect, Raphael returns {width : number, height : number}. Only width is used throughout VexFlow.
-         */
-        measureText(text : string) : {width : number};
-    }
-
-    /**
-     * Helper interface for handling the Vex.Flow.Font object in Vex.Flow.Glyph. Not part of VexFlow!
-     */
-    interface IFont {
-        glyphs : {x_min : number, x_max : number, ha : number, o : string[]}[];
-        cssFontWeight : string;
-        ascender : number;
-        underlinePosition : number;
-        cssFontStyle : string;
-        boundingBox : {yMin : number, xMin : number, yMax : number, xMax : number};
-        resolution : number;
-        descender : number;
-        familyName : string;
-        lineHeight : number;
-        underlineThickness : number;
-
-        /**
-         * This property is missing in vexflow_font.js, but present in gonville_original.js and gonville_all.js.
-         */
-        original_font_information? : {postscript_name : string, version_string : string, vendor_url : string, full_font_name : string, font_family_name : string, copyright : string, description : string, trademark : string, designer : string, designer_url : string, unique_font_identifier : string, license_url : string, license_description : string, manufacturer_name : string, font_sub_family_name : string};
-    }
-
-    namespace Flow {
-
-        const RESOLUTION : number;
-
-        // from tables.js:
-        const STEM_WIDTH : number;
-        const STEM_HEIGHT : number;
-        const STAVE_LINE_THICKNESS : number;
-        const TIME4_4 : {num_beats : number, beat_value : number, resolution : number};
-        const unicode : {[name : string] : string}; //inconsistent API: this should be private and have a wrapper function like the other tables
-        function clefProperties(clef : string) : {line_shift : number};
-        function keyProperties(key : string, clef : string, params : {octave_shift? : number}) : {key : string, octave : number, line : number, int_value : number, accidental : string, code : number, stroke : number, shift_right : number, displaced : boolean};
-        function integerToNote(integer : number) : string;
-        function tabToGlyph(fret : string) : {text : string, code : number, width : number, shift_y : number};
-        function textWidth(text : string) : number;
-        function articulationCodes(artic : string) : {code : string, width : number, shift_right : number, shift_up : number, shift_down : number, between_lines : boolean};
-        function accidentalCodes(acc : string) : {code : string, width : number, gracenote_width : number, shift_right : number, shift_down : number};
-        function ornamentCodes(acc : string) : {code : string, shift_right : number, shift_up : number, shift_down : number, width : number};
-        function keySignature(spec : string) : {type: string, line: number}[];
-        function parseNoteDurationString(durationString : string) : {duration : string, dots : number, type : string};
-        function parseNoteData(noteData : {duration : string, dots : number, type : string}) : {duration : string, type : string, dots : number, ticks : number};
-        function durationToFraction(duration : string) : Fraction;
-        function durationToNumber(duration : string) : number;
-        function durationToTicks(duration : string) : number;
-        function durationToGlyph(duration : string, type : string) : {head_width : number, stem : boolean, stem_offset : number, flag : boolean, stem_up_extension : number, stem_down_extension : number, gracenote_stem_up_extension : number, gracenote_stem_down_extension : number, tabnote_stem_up_extension : number, tabnote_stem_down_extension : number, dot_shiftY : number, line_above : number, line_below : number, code_head? : string, rest? : boolean, position? : string};
-
-        // from glyph.js:
-        function renderGlyph(ctx : IRenderContext, x_pos : number, y_pos : number, point : number, val : string, nocache : boolean) : void;
-
-        // from vexflow_font.js / gonville_original.js / gonville_all.js
-        var Font : {
-            glyphs : {x_min : number, x_max : number, ha : number, o : string[]}[];
-            cssFontWeight : string;
-            ascender : number;
-            underlinePosition : number;
-            cssFontStyle : string;
-            boundingBox : {yMin : number, xMin : number, yMax : number, xMax : number};
-            resolution : number;
-            descender : number;
-            familyName : string;
-            lineHeight : number;
-            underlineThickness : number;
-
-            //inconsistent member : this is missing in vexflow_font.js, but present in gonville_original.js and gonville_all.js
-            original_font_information : {postscript_name : string, version_string : string, vendor_url : string, full_font_name : string, font_family_name : string, copyright : string, description : string, trademark : string, designer : string, designer_url : string, unique_font_identifier : string, license_url : string, license_description : string, manufacturer_name : string, font_sub_family_name : string};
-        }
-
-        class Accidental extends Modifier {
-            //TODO remove the following lines once TypeScript allows subclass overrides with type changes
-            setNote(note : Note) : Modifier;
-
-            constructor(type : string);
-            static DEBUG : boolean;
-            static format(accidentals : Accidental[], state : {left_shift : number, right_shift : number, text_line : number}) : void;
-            setNote(note : StaveNote) : void;
-            setAsCautionary() : Accidental;
-            draw() : void;
-            static applyAccidentals(voices : Voice[], keySignature? : string) : void;
-        }
-
-        namespace Accidental {
-            const CATEGORY : string;
-        }
-
-        class Annotation extends Modifier {
-            constructor(text : string);
-            static DEBUG : boolean;
-            static format(annotations : Annotation[], state : {left_shift : number, right_shift : number, text_line : number}) : boolean;
-            setTextLine(line : number) : Annotation;
-            setFont(family : string, size : number, weight : string) : Annotation;
-            setVerticalJustification(just : Annotation.VerticalJustify) : Annotation;
-            getJustification() : Annotation.Justify;
-            setJustification(justification : Annotation.Justify) : Annotation;
-            draw() : void;
-        }
-
-        namespace Annotation {
-            const enum Justify {LEFT, CENTER, RIGHT, CENTER_STEM}
-            const enum VerticalJustify {TOP, CENTER, BOTTOM, CENTER_STEM}
-            const CATEGORY : string;
-        }
-
-        class Articulation extends Modifier {
-            constructor(type : string);
-            static DEBUG : boolean;
-            static format(articulations : Articulation[], state : {left_shift : number, right_shift : number, text_line : number}) : boolean;
-            draw() : void;
-        }
-
-        namespace Articulation {
-            const CATEGORY : string;
-        }
-
-        class BarNote extends Note {
-            static DEBUG : boolean;
-            getType() : Barline.type;
-            setType(type : Barline.type) : BarNote;
-            getBoundingBox() : BoundingBox;
-            addToModifierContext() : BarNote;
-            preFormat() : BarNote;
-            draw() : void;
-        }
-
-        namespace Barline {
-            const enum type {SINGLE, DOUBLE, END, REPEAT_BEGIN, REPEAT_END, REPEAT_BOTH, NONE}
-        }
-
-        class Barline extends StaveModifier {
-            constructor(type : Barline.type, x : number);
-            getCategory() : string;
-            setX(x : number) : Barline;
-            draw(stave : Stave, x_shift? : number) : void;
-            drawVerticalBar(stave : Stave, x : number, double_bar? : boolean) : void;
-            drawVerticalEndBar(stave : Stave, x : number) : void;
-            drawRepeatBar(stave : Stave, x : number, begin : boolean) : void;
-        }
-
-        class Beam {
-            constructor(notes : StemmableNote[], auto_stem? : boolean);
-            setContext(context : IRenderContext) : Beam;
-            getNotes() : StemmableNote[];
-            getBeamCount() : number;
-            breakSecondaryAt(indices : number[]) : Beam;
-            getSlopeY() : number;
-            calculateSlope() : void;
-            applyStemExtensions() : void;
-            getBeamLines(duration : string) : {start : number, end : number}[];
-            drawStems() : void;
-            drawBeamLines() : void;
-            preFormat() : Beam;
-            postFormat() : Beam;
-            draw() : boolean;
-            calculateStemDirection(notes : Note) : number;
-            static getDefaultBeamGroups(time_sig : string) : Fraction[];
-            static applyAndGetBeams(voice : Voice, stem_direction : number, groups : Fraction[]) : Beam[];
-            static generateBeams(notes : StemmableNote[], config? : {groups? : Fraction[], stem_direction? : number, beam_rests? : boolean, beam_middle_only? : boolean, show_stemlets? : boolean, maintain_stem_directions? : boolean}) : Beam[];
-        }
-
-        class Bend extends Modifier {
-            constructor(text : string, release? : boolean, phrase? : {type : number, text : string, width : number}[]);
-            static UP : number;
-            static DOWN : number;
-            static format(bends : Bend[], state : {left_shift : number, right_shift : number, text_line : number}) : boolean;
-            setXShift(value : number) : void;
-            setFont(font : string) : Bend;
-            getText() : string;
-            updateWidth() : Bend;
-            draw() : void;
-        }
-
-        namespace Bend {
-            const CATEGORY : string;
-        }
-
-        class BoundingBox {
-            constructor(x : number, y : number, w : number, h : number);
-            static copy(that : BoundingBox) : BoundingBox;
-            getX() : number;
-            getY() : number;
-            getW() : number;
-            getH() : number;
-            setX(x : number) : BoundingBox;
-            setY(y : number) : BoundingBox;
-            setW(w : number) : BoundingBox;
-            setH(h : number) : BoundingBox;
-            move(x : number, y : number) : void;
-            clone() : BoundingBox;
-            mergeWith(boundingBox : BoundingBox, ctx? : IRenderContext) : BoundingBox;
-            draw(ctx : IRenderContext, x : number, y : number) : void;
-        }
-
-        class CanvasContext implements IRenderContext {
-            //TODO remove the following lines once TypeScript allows subclass overrides with type changes or type inconsistencies mentioned below are fixed
-            setLineDash(dash : string) : CanvasContext;
-            scale(x : number, y : number) : CanvasContext;
-            resize(width : number, height : number) : CanvasContext;
-            fillRect(x : number, y : number, width : number, height : number) : CanvasContext;
-            clearRect(x : number, y : number, width : number, height : number) : CanvasContext;
-            beginPath() : CanvasContext;
-            moveTo(x : number, y : number) : CanvasContext;
-            lineTo(x : number, y : number) : CanvasContext;
-            bezierCurveToTo(x1 : number, y1 : number, x2 : number, y2 : number, x : number, y : number) : CanvasContext;
-            quadraticCurveToTo(x1 : number, y1 : number, x2 : number, y2 : number) : CanvasContext;
-            arc(x : number, y : number, radius : number, startAngle : number, endAngle : number, antiClockwise : boolean) : CanvasContext;
-            glow() : CanvasContext;
-            fill() : CanvasContext;
-            stroke() : CanvasContext;
-            closePath() : CanvasContext;
-            fillText(text : string, x : number, y : number) : CanvasContext;
-            save() : CanvasContext;
-            restore() : CanvasContext;
-
-            constructor(context : CanvasRenderingContext2D);
-            static WIDTH : number;
-            static HEIGHT : number;
-            clear() : void;
-            setFont(family : string, size : number, weight? : number) : CanvasContext;
-            setRawFont(font : string) : CanvasContext;
-            setFillStyle(style : string) : CanvasContext;
-            setBackgroundFillStyle(style : string) : CanvasContext;
-            setStrokeStyle(style : string) : CanvasContext;
-            setShadowColor(style : string) : CanvasContext; //inconsistent name: style -> color
-            setShadowBlur(blur : string) : CanvasContext;
-            setLineWidth(width : number) : CanvasContext;
-            setLineCap(cap_type : string) : CanvasContext;
-
-            //inconsistent type: void -> CanvasContext
-            setLineDash(dash : string) : void;
-            scale(x : number, y : number) : void;
-            resize(width : number, height : number) : void;
-            fillRect(x : number, y : number, width : number, height : number) : void;
-            clearRect(x : number, y : number, width : number, height : number) : void;
-            beginPath() : void;
-            moveTo(x : number, y : number) : void;
-            lineTo(x : number, y : number) : void;
-            bezierCurveToTo(x1 : number, y1 : number, x2 : number, y2 : number, x : number, y : number) : void;
-            quadraticCurveToTo(x1 : number, y1 : number, x : number, y : number) : void; //inconsistent name: x -> x2, y -> y2
-            arc(x : number, y : number, radius : number, startAngle : number, endAngle : number, antiClockwise : boolean) : void;
-            glow() : void;
-            fill() : void;
-            stroke() : void;
-            closePath() : void;
-            measureText(text : string) : TextMetrics;
-            fillText(text : string, x : number, y : number) : void;
-            save() : void;
-            restore() : void;
-        }
-
-        class Clef extends StaveModifier {
-            //TODO remove the following lines once TypeScript allows subclass overrides with type changes
-            addModifier() : void;
-            addEndModifier() : void;
-
-            constructor(clef : string, size? : string, annotation? : string);
-            static DEBUG : boolean;
-            addModifier(stave : Stave) : void;
-            addEndModifier(stave : Stave) : void;
-        }
-
-        class ClefNote extends Note {
-            //TODO remove the following lines once TypeScript allows subclass overrides with type changes
-            setStave(stave : Stave) : Note;
-
-            constructor(clef : string, size? : string, annotation? : string);
-            setClef(clef : string, size? : string, annotation? : string) : ClefNote;
-            getClef() : string;
-            setStave(stave : Stave) : void;
-            getBoundingBox() : BoundingBox;
-            addToModifierContext() : ClefNote;
-            getCategory() : string;
-            preFormat() : ClefNote;
-            draw() : void;
-        }
-
-        class Crescendo extends Note {
-            constructor(note_struct : {duration : number, line? : number});
-            static DEBUG : boolean;
-            setLine(line : number) : Crescendo;
-            setHeight(height : number) : Crescendo;
-            setDecrescendo(decresc : boolean) : Crescendo;
-            preFormat() : Crescendo;
-            draw() : void;
-        }
-
-        class Curve {
-            constructor(from : Note, to : Note, options? : {spacing? : number, thickness? : number, x_shift? : number, y_shift : number, position : Curve.Position, invert : boolean, cps? : {x : number, y : number}[]});
-            static DEBUG : boolean;
-            setContext(context : IRenderContext) : Curve;
-            setNotes(from : Note, to : Note) : Curve;
-            isPartial() : boolean;
-            renderCurve(params : {first_x : number, first_y : number, last_x : number, last_y : number, direction : number}) : void;
-            draw() : boolean;
-        }
-
-        namespace Curve {
-            const enum Position {NEAR_HEAD, NEAR_TOP}
-        }
-
-        class Dot extends Modifier {
-            //TODO remove the following lines once TypeScript allows subclass overrides with type changes or type inconsistencies mentioned below are fixed
-            setNote(note : Note) : Dot;
-
-            static format(dots : number, state : {left_shift : number, right_shift : number, text_line : number}) : void;
-            setNote(note : Note) : void; //inconsistent type: void -> Dot
-            setDotShiftY(y : number) : Dot;
-            draw() : void;
-        }
-
-        namespace Dot {
-            const CATEGORY : string;
-        }
-
-        class Formatter {
-            static DEBUG : boolean;
-            static FormatAndDraw(ctx : IRenderContext, stave : Stave, notes : Note[], params? : {auto_beam : boolean, align_rests : boolean}) : BoundingBox;
-            static FormatAndDraw(ctx : IRenderContext, stave : Stave, notes : Note[], params? : boolean) : BoundingBox;
-            static FormatAndDrawTab(ctx : IRenderContext, tabstave : TabStave, stave : Stave, tabnotes : TabNote[], notes : Note[], autobeam? : boolean, params? : {auto_beam : boolean, align_rests : boolean}) : void;
-            static FormatAndDrawTab(ctx : IRenderContext, tabstave : TabStave, stave : Stave, tabnotes : TabNote[], notes : Note[], autobeam? : boolean, params? : boolean) : void;
-            static AlignRestsToNotes(notes : Note[], align_all_notes? : boolean, align_tuplets? : boolean) : Formatter;
-            alignRests(voices : Voice[], align_all_notes : boolean) : void;
-            preCalculateMinTotalWidth(voices : Voice[]) : number;
-            getMinTotalWidth() : number;
-            createModifierContexts(voices : Voice[]) : ModifierContext[];
-            createTickContexts(voices : Voice[]) : TickContext[];
-            preFormat(justifyWidth? : number, rendering_context? : IRenderContext, voices? : Voice[], stave? : Stave) : void;
-            postFormat() : Formatter;
-            joinVoices(voices : Voice[]) : Formatter;
-            format(voices : Voice[], justifyWidth : number, options? : {align_rests? : boolean, context : IRenderContext}) : Formatter;
-            formatToStave(voices : Voice[], stave : Stave, options? : {align_rests? : boolean, context : IRenderContext}) : Formatter;
-        }
-
-        class Fraction {
-            constructor(numerator : number, denominator : number);
-            static GCD(a : number, b : number) : number;
-            static LCM(a : number, b : number) : number;
-            static LCMM(a : number, b : number) : number;
-            set(numerator : number, denominator : number) : Fraction;
-            value() : number;
-            simplify() : Fraction;
-            add(param1 : Fraction, param2 : Fraction) : Fraction;
-            add(param1 : number, param2 : number) : Fraction;
-            subtract(param1 : Fraction, param2 : Fraction) : Fraction;
-            subtract(param1 : number, param2 : number) : Fraction;
-            multiply(param1 : Fraction, param2 : Fraction) : Fraction;
-            multiply(param1 : number, param2 : number) : Fraction;
-            divide(param1 : Fraction, param2 : Fraction) : Fraction;
-            divide(param1 : number, param2 : number) : Fraction;
-            equals(compare : Fraction) : boolean;
-            greaterThan(compare : Fraction) : boolean;
-            greaterThanEquals(compare : Fraction) : boolean;
-            lessThan(compare : Fraction) : boolean;
-            lessThanEquals(compare : Fraction) : boolean;
-            clone() : Fraction;
-            copy(copy : Fraction) : Fraction;
-            quotient() : number;
-            fraction() : number;
-            abs() : Fraction;
-            toString() : string;
-            toSimplifiedString() : string;
-            toMixedString() : string;
-            parse(str : string) : Fraction;
-        }
-
-        class FretHandFinger extends Modifier {
-            constructor(number : number);
-            static format(nums : FretHandFinger[], state : {left_shift : number, right_shift : number, text_line : number}) : void;
-            getNote() : Note;
-            setNote(note : Note) : FretHandFinger;
-            getIndex() : number;
-            setIndex(index : number) : FretHandFinger;
-            getPosition() : Modifier.Position;
-            setPosition(position : Modifier.Position) : FretHandFinger;
-            setFretHandFinger(number : number) : FretHandFinger;
-            setOffsetX(x : number) : FretHandFinger;
-            setOffsetY(y : number) : FretHandFinger;
-            draw() : void;
-        }
-
-        namespace FretHandFinger {
-            const CATEGORY : string;
-        }
-
-        class GhostNote extends StemmableNote {
-            //TODO remove the following lines once TypeScript allows subclass overrides with type changes or type inconsistencies mentioned below are fixed
-            setStave(stave : Stave) : Note;
-
-            constructor(duration : string);
-            constructor(note_struct : {type? : string, dots? : number, duration : string}); //inconsistent name : init struct is called 'duration', should be 'params'/'options' (may be string or Object)
-            isRest() : boolean;
-            setStave(stave : Stave) : void; //inconsistent type: void -> GhostNote
-            addToModifierContext() : GhostNote;
-            preFormat() : GhostNote;
-            draw() : void;
-        }
-
-        class Glyph {
-            constructor(code : string, point : number, options? : {cache? : boolean, font? : IFont});
-            setOptions(options : {cache? : boolean, font? : IFont}) : void;
-            setStave(stave : Stave) : Glyph;
-            setXShift(x_shift : number) : Glyph;
-            setYShift(y_shift : number) : Glyph;
-            setContext(context : IRenderContext) : Glyph;
-            getContext() : IRenderContext;
-            reset() : void;
-            setWidth(width : number) : Glyph;
-            getMetrics() : {x_min : number, x_max : number, width : number, height : number};
-            render(ctx : IRenderContext, x_pos : number, y_pos : number) : void;
-            renderToStave(x : number) : void;
-            static loadMetrics(font : IFont, code : string, cache : boolean) : {x_min : number, x_max : number, ha : number, outline : number[]};
-            static renderOutline(ctx : IRenderContext, outline : number[], scale : number, x_pos : number, y_pos : number) : void;
-        }
-
-        class GraceNote extends StaveNote {
-            constructor(note_struct : {slash? : boolean, type? : string, dots? : number, duration : string, clef? : string, keys : string[], octave_shift? : number, auto_stem? : boolean, stem_direction? : number});
-            getStemExtension() : number;
-            getCategory() : string;
-            draw() : void;
-        }
-
-        class GraceNoteGroup extends Modifier {
-            //TODO remove the following lines once TypeScript allows subclass overrides with type changes or type inconsistencies mentioned below are fixed
-            setWidth(width : number) : Modifier;
-            setNote(note : StaveNote) : Modifier;
-
-            constructor(grace_notes : GraceNote[], show_slur? : boolean); //inconsistent name: 'show_slur' is called 'config', suggesting object (is boolean)
-            static DEBUG : boolean;
-            static format(gracenote_groups : GraceNoteGroup[], state : {left_shift : number, right_shift : number, text_line : number}) : boolean;
-            preFormat() : void;
-            beamNotes() : GraceNoteGroup;
-            setNote(note : Note) : void; //inconsistent type: void -> GraceNoteGroup
-            setWidth(width : number) : void; //inconsistent type: void -> GraceNoteGroup
-            getWidth() : number;
-            setXShift(x_shift : number) : void;
-            draw() : void;
-        }
-
-        namespace GraceNoteGroup {
-            const CATEGORY : string;
-        }
-
-        class KeyManager {
-            constructor(key : string);
-            setKey(key : string) : KeyManager;
-            getKey() : string;
-            reset() : KeyManager;
-            getAccidental(key : string) : {note : string, accidental : string};
-            selectNote(note : string) : {note : string, accidental : string, change : boolean};
-        }
-
-        class KeySignature extends StaveModifier {
-             //TODO remove the following lines once TypeScript allows subclass overrides with type changes
-            addModifier() : void;
-
-            constructor(key_spec : string);
-            addAccToStave(stave : Stave, acc : {type : string, line : number}, next? : {type : string, line : number}) : void;
-            cancelKey(spec : string) : KeySignature;
-            addModifier(stave : Stave) : KeySignature;
-            addToStave(stave : Stave, firstGlyph? : boolean) : KeySignature;
-            convertAccLines(clef : string, type : string) : void;
-        }
-
-        class Modifier {
-            static DEBUG : boolean;
-            getCategory() : string;
-            getWidth() : number;
-            setWidth(width : number) : Modifier;
-            getNote() : Note;
-            setNote(note : Note) : Modifier;
-            getIndex() : number;
-            setIndex(index : number) : Modifier;
-            getContext() : IRenderContext;
-            setContext(context : IRenderContext) : Modifier;
-            getModifierContext() : ModifierContext;
-            setModifierContext(c : ModifierContext) : Modifier;
-            getPosition() : Modifier.Position;
-            setPosition(position : Modifier.Position) : Modifier;
-            setTextLine(line : number) : Modifier;
-            setYShift(y : number) : Modifier;
-            setXShift(x : number) : void; //inconsistent type: void -> Modifier
-            draw() : void;
-        }
-
-        namespace Modifier {
-            const enum Position {LEFT, RIGHT, ABOVE, BELOW}
-            const CATEGORY : string
-        }
-
-        class ModifierContext {
-            static DEBUG : boolean;
-            addModifier(modifier : Modifier) : ModifierContext;
-            getModifiers(type : string) : Modifier[];
-            getWidth() : number;
-            getExtraLeftPx() : number;
-            getExtraRightPx() : number;
-            getState() : {left_shift : number, right_shift : number, text_line : number};
-            getMetrics() : {width : number, spacing : number, extra_left_px : number, extra_right_px : number};
-            preFormat() : void;
-            postFormat() : void;
-        }
-
-        class Music {
-            isValidNoteValue(note : number) : boolean;
-            isValidIntervalValue(interval : number) : boolean;
-            getNoteParts(noteString : string) : {root : string, accidental : string};
-            getKeyParts(noteString : string) : {root : string, accidental : string, type : string};
-            getNoteValue(noteString : string) : number;
-            getIntervalValue(intervalString : string) : number;
-            getCanonicalNoteName(noteValue : number) : string;
-            getCanonicalIntervalName(intervalValue : number) : string;
-            getRelativeNoteValue(noteValue : number, intervalValue : number, direction? : number) : number;
-            getRelativeNoteName(root : string, noteValue : number) : string;
-            getScaleTones(key : string, intervals : number[]) : number;
-            getIntervalBetween(note1 : number, note2 : number, direction? : number) : number;
-            createScaleMap(keySignature : string) : {[rootName : string] : string};
-        }
-
-        namespace Music {
-            const NUM_TONES : number;
-            const roots : string[];
-            const root_values : number[];
-            const root_indices : {[root : string] : number};
-            const canonical_notes : string[];
-            const diatonic_intervals : string[];
-            const diatonic_accidentals : {[diatonic_interval : string] : {note : number, accidental : number}};
-            const intervals : {[interval : string] : number};
-            const scales : {[scale : string] : number[]};
-            const accidentals : string[];
-            const noteValues : {[value : string] : {root_index : number, int_val : number}};
-        }
-
-        class Note implements Tickable {
-            //from tickable interface:
-            getTicks() : Fraction;
-            getCenterXShift() : number;
-            isCenterAligned() : boolean;
-            setCenterAlignment(align_center : boolean) : Note;
-            getTuplet() : Tuplet;
-            setTuplet(tuplet : Tuplet) : Note;
-            addToModifierContext(mc : ModifierContext) : void;
-            preFormat() : void;
-            postFormat() : Note;
-            getIntrinsicTicks() : Fraction;
-            setIntrinsicTicks(intrinsicTicks : Fraction) : void;
-            getTickMultiplier() : Fraction;
-            applyTickMultiplier(numerator : number, denominator : number) : void;
-            setDuration(duration : Fraction) : void;
-
-            constructor(note_struct : {type? : string, dots? : number, duration : string});
-            getPlayNote() : any;
-            setPlayNote(note : any) : Note;
-            isRest() : boolean;
-            addStroke(index : number, stroke : Stroke) : Note;
-            getStave() : Stave;
-            setStave(stave : Stave) : Note;
-            getCategory() : string;
-            setContext(context : IRenderContext) : Note;
-            getExtraLeftPx() : number;
-            getExtraRightPx() : number;
-            setExtraLeftPx(x : number) : Note;
-            setExtraRightPx(x : number) : Note;
-            shouldIgnoreTicks() : boolean;
-            getLineNumber() : number;
-            getLineForRest() : number;
-            getGlyph() : Glyph;
-            setYs(ys : number[]) : Note;
-            getYs() : number[];
-            getYForTopText(text_line : number) : number;
-            getBoundingBox() : BoundingBox;
-            getVoice() : Voice;
-            setVoice(voice : Voice) : Note;
-            getTickContext() : TickContext;
-            setTickContext(tc : TickContext) : Note;
-            getDuration() : string;
-            isDotted() : boolean;
-            hasStem() : boolean;
-            getDots() : number;
-            getNoteType() : string;
-            setBeam() : Note;
-            setModifierContext(mc : ModifierContext) : Note;
-            addModifier(modifier : Modifier, index? : number) : Note;
-            getModifierStartXY() : {x : number, y : number};
-            getMetrics() : {width : number, noteWidth : number, left_shift : number, modLeftPx : number, modRightPx : number, extraLeftPx : number, extraRightPx : number};
-            setWidth(width : number) : void;
-            getWidth() : number;
-            setXShift(x : number) : Note;
-            getX() : number;
-            getAbsoluteX() : number;
-            setPreFormatted(value : boolean) : void;
-        }
-
-        namespace Note {
-            const CATEGORY : string;
-        }
-
-        class NoteHead extends Note {
-            constructor(head_options : {x? : number, y? : number, note_type? : string, duration : string, displaced? : boolean, stem_direction? : number, line : number, x_shift : number, custom_glyph_code? : string, style? : string, slashed? : boolean, glyph_font_scale? : number});
-            static DEBUG : boolean;
-            getCategory() : string;
-            setContext(context : IRenderContext) : NoteHead;
-            getWidth() : number;
-            isDisplaced() : boolean;
-            getStyle() : {shadowColor? : string, shadowBlur? : string, fillStyle? : string, strokeStyle? : string};
-            setStyle(style : {shadowColor? : string, shadowBlur? : string, fillStyle? : string, strokeStyle? : string}) : NoteHead;
-            getGlyph() : Glyph;
-            setX(x : number) : NoteHead;
-            getY() : number;
-            setY(y : number) : NoteHead;
-            getLine() : number;
-            setLine(line : number) : NoteHead;
-            getAbsoluteX() : number;
-            getBoundingBox() : BoundingBox;
-            applyStyle(context : IRenderContext) : NoteHead;
-            setStave(stave : Stave) : NoteHead;
-            preFormat() : NoteHead;
-            draw() : void;
-        }
-
-        class Ornament extends Modifier {
-            constructor(type : string);
-            static DEBUG : boolean;
-            static format(ornaments : Ornament[], state : {left_shift : number, right_shift : number, text_line : number}) : boolean;
-            setDelayed(delayed : boolean) : Ornament;
-            setUpperAccidental(acc : string) : Ornament;
-            setLowerAccidental(acc : string) : Ornament;
-            draw() : void;
-        }
-
-        namespace Ornament {
-            const CATEGORY : string;
-        }
-
-        class PedalMarking {
-            constructor(notes : Note[]); //inconsistent name: 'notes' is called 'type', suggesting string (is Note[])
-            static DEBUG : boolean;
-            static createSustain(notes : Note[]) : PedalMarking;
-            static createSostenuto(notes : Note[]) : PedalMarking;
-            static createUnaCorda(notes : Note[]) : PedalMarking;
-            setCustomText(depress? : string, release? : string) : PedalMarking;
-            setStyle(style : PedalMarking.Styles) : PedalMarking;
-            setLine(line : number) : PedalMarking;
-            setContext(context : IRenderContext) : PedalMarking;
-            drawBracketed() : void;
-            drawText() : void;
-            draw() : void;
-        }
-
-        namespace PedalMarking {
-            const enum Styles {TEXT, BRACKET, MIXED}
-            const GLYPHS : {[name : string] : {code : string, x_shift : number, y_shift : number}};
-        }
-
-        class RaphaelContext implements IRenderContext {
-            //TODO remove the following lines once TypeScript allows subclass overrides with type changes or type inconsistencies mentioned below are fixed
-            setLineWidth(width : number) : RaphaelContext;
-            glow() : RaphaelContext;
-
-            constructor(element : HTMLElement);
-            setFont(family : string, size : number, weight? : number) : RaphaelContext;
-            setRawFont(font : string) : RaphaelContext;
-            setFillStyle(style : string) : RaphaelContext;
-            setBackgroundFillStyle(style : string) : RaphaelContext;
-            setStrokeStyle(style : string) : RaphaelContext;
-            setShadowColor(style : string) : RaphaelContext; //inconsistent name: style -> color
-            setShadowBlur(blur : string) : RaphaelContext;
-            setLineWidth(width : number) : void; //inconsistent type: void -> RaphaelContext
-            setLineDash(dash : string) : RaphaelContext;
-            setLineCap(cap_type : string) : RaphaelContext;
-            scale(x : number, y : number) : RaphaelContext;
-            clear() : void;
-            resize(width : number, height : number) : RaphaelContext;
-            setViewBox(viewBox : string) : void;
-            rect(x : number, y : number, width : number, height : number) : void;
-            fillRect(x : number, y : number, width : number, height : number) : RaphaelContext;
-            clearRect(x : number, y : number, width : number, height : number) : RaphaelContext;
-            beginPath() : RaphaelContext;
-            moveTo(x : number, y : number) : RaphaelContext;
-            lineTo(x : number, y : number) : RaphaelContext;
-            bezierCurveToTo(x1 : number, y1 : number, x2 : number, y2 : number, x : number, y : number) : RaphaelContext;
-            quadraticCurveToTo(x1 : number, y1 : number, x : number, y : number) : RaphaelContext; //inconsistent name: x, y -> x2, y2
-            arc(x : number, y : number, radius : number, startAngle : number, endAngle : number, antiClockwise : boolean) : RaphaelContext;
-            glow() : {width : number, fill : boolean, opacity : number, offsetx : number, offsety : number, color : string}; //inconsistent type : Object -> RaphaelContext
-            fill() : RaphaelContext;
-            stroke() : RaphaelContext;
-            closePath() : RaphaelContext;
-            measureText(text : string) : {width : number, height : number};
-            fillText(text : string, x : number, y : number) : RaphaelContext;
-            save() : RaphaelContext;
-            restore() : RaphaelContext;
-        }
-
-        class Renderer {
-            constructor(sel : HTMLElement, backend : Renderer.Backends)
-            static USE_CANVAS_PROXY : boolean;
-            static buildContext(sel : HTMLElement, backend : Renderer.Backends, width? : number, height? : number, background? : string) : IRenderContext;
-            static getCanvasContext(sel : HTMLElement, backend : Renderer.Backends, width? : number, height? : number, background? : string) : CanvasContext;
-            static getRaphaelContext(sel : HTMLElement, backend : Renderer.Backends, width? : number, height? : number, background? : string) : RaphaelContext;
-            static getSVGContext(sel : HTMLElement, backend : Renderer.Backends, width? : number, height? : number, background? : string) : SVGContext;
-            static bolsterCanvasContext(ctx : CanvasRenderingContext2D) : CanvasContext;
-            static drawDashedLine(context : IRenderContext, fromX : number, fromY : number, toX : number, toY : number, dashPattern : number[]) : void;
-            resize(width : number, height : number) : Renderer;
-            getContext() : IRenderContext;
-        }
-
-        namespace Renderer {
-            const enum Backends {CANVAS, RAPHAEL, SVG, VML}
-            const enum LineEndType {NONE, UP, DOWN}
-        }
-
-        class Repetition extends StaveModifier {
-            constructor(type : Repetition.type, x : number, y_shift : number);
-            getCategory() : string;
-            setShiftX(x : number) : Repetition;
-            setShiftY(y : number) : Repetition;
-            draw(stave : Stave, x : number) : Repetition;
-            drawCodaFixed(stave : Stave, x : number) : Repetition;
-            drawSignoFixed(stave : Stave, x : number) : Repetition; //inconsistent name: drawSignoFixed -> drawSegnoFixed
-            drawSymbolText(stave : Stave, x : number, text : string, draw_coda : boolean) : Repetition;
-        }
-
-        namespace Repetition {
-            const enum type { NONE, CODA_LEFT, CODA_RIGHT, SEGNO_LEFT, SEGNO_RIGHT, DC, DC_AL_CODA, DC_AL_FINE, DS, DS_AL_CODA, DS_AL_FINE, FINE }
-        }
-
-        class Stave {
-            constructor(x : number, y : number, width : number, options? : {vertical_bar_width? : number, glyph_spacing_px? : number, num_lines? : number, fill_style? : string, spacing_between_lines_px? : number, space_above_staff_ln? : number, space_below_staff_ln? : number, top_text_position? : number});
-            resetLines() : void;
-            setNoteStartX(x : number) : Stave;
-            getNoteStartX() : number;
-            getNoteEndX() : number;
-            getTieStartX() : number;
-            getTieEndX() : number;
-            setContext(context : IRenderContext) : Stave;
-            getContext() : IRenderContext;
-            getX() : number;
-            getNumLines() : number;
-            setY(y : number) : Stave;
-            setWidth(width : number) : Stave;
-            getWidth() : number;
-            setMeasure(measure : number) : Stave;
-            setBegBarType(type : Barline.type) : Stave;
-            setEndBarType(type : Barline.type) : Stave;
-            getModifierXShift(index : number) : number;
-            setRepetitionTypeLeft(type : Repetition.type, y : number) : Stave;
-            setRepetitionTypeRight(type : Repetition.type, y : number) : Stave;
-            setVoltaType(type : Volta.type, number_t : number, y : number) : Stave;
-            setSection(section : string, y : number) : Stave;
-            setTempo(tempo : {name? : string, duration : string, dots : number, bpm : number}, y : number) : Stave;
-            setText(text : string, position : Modifier.Position, options? : {shift_x? : number, shift_y? : number, justification? : TextNote.Justification}) : Stave;
-            getHeight() : number;
-            getSpacingBetweenLines() : number;
-            getBoundingBix() : BoundingBox;
-            getBottomY() : number;
-            getBottomLineY() : number;
-            getYForLine(line : number) : number;
-            getYForTopText(line? : number) : number;
-            getYForBottomText(line? : number) : number;
-            getYForNote(line? : number) : number;
-            getYForGlyphs() : number;
-            addGlyph(glypg : Glyph) : Stave;
-            addEndGlyph(glypg : Glyph) : Stave;
-            addModifier(modifier : StaveModifier) : Stave;
-            addEndModifier(modifier : StaveModifier) : Stave;
-            addKeySignature(keySpec : string) : Stave;
-            addClef(clef : string, size? : string, annotation? : string) : Stave;
-            addEndClef(clef : string, size? : string, annotation? : string) : Stave;
-            addTimeSignature(timeSpec : string, customPadding? : number) : void; //inconsistent type: void -> Stave
-            addTrebleGlyph() : Stave;
-            draw() : void;
-            drawVertical(x : number, isDouble : boolean) : void;
-            drawVerticalFixed(x : number, isDouble : boolean) : void;
-            drawVerticalBar(x : number) : void;
-            drawVerticalBarFixed(x : number) : void;
-            getConfigForLines() : {visible : boolean}[];
-            setConfigForLine(line_number : number, line_config : {visible : boolean}) : Stave;
-            setConfigForLines(lines_configuration : {visible : boolean}[]) : Stave;
-        }
-
-        class StaveConnector {
-            constructor(top_stave : Stave, bottom_stave : Stave);
-            setContext(ctx : IRenderContext) : StaveConnector;
-            setType(type : StaveConnector.type) : StaveConnector;
-            setText(text : string, text_options? : {shift_x? : number, shift_y? : number}) : StaveConnector;
-            setFont(font : {family? : string, size? : number, weight? : string}) : void; //inconsistent type: void -> StaveConnector
-            setXShift(x_shift : number) : StaveConnector;
-            draw() : void;
-            drawBoldDoubleLine(ctx : Object, type : StaveConnector.type, topX : number, topY : number, botY : number) : void;
-        }
-
-        namespace StaveConnector {
-            const enum type { SINGLE_RIGHT, SINGLE_LEFT, SINGLE, DOUBLE, BRACE, BRACKET, BOLD_DOUBLE_LEFT, BOLD_DOUBLE_RIGHT, THIN_DOUBLE }
-        }
-
-        class StaveHairpin {
-            constructor(notes : {first_note : Note, last_note : Note}, type : StaveHairpin.type);
-            static FormatByTicksAndDraw(ctx : IRenderContext, formatter : Formatter, notes : {first_note : Note, last_note : Note}, type : StaveHairpin.type, position : Modifier.Position, options? : {height : number, y_shift : number, left_shift_ticks : number, right_shift_ticks : number}) : void;
-            setContext(context : IRenderContext) : StaveHairpin;
-            setPosition(position : Modifier.Position) : StaveHairpin;
-            setRenderOptions(options : {height? : number, y_shift : number, left_shift_px : number, right_shift_px : number}) : StaveHairpin;
-            setNotes(notes : {first_note : Note, last_note : Note}) : StaveHairpin;
-            renderHairpin(params : {first_x : number, last_x : number, first_y : number, last_y : number, staff_height : number}) : void;
-            draw() : boolean;
-        }
-
-        namespace StaveHairpin {
-            const enum type { CRESC, DECRESC }
-        }
-
-        class StaveLine {
-            constructor(notes : {first_note: Note, last_note: Note, first_indices : number[], last_indices : number[]});
-            setContext(context : Object) : StaveLine;
-            setFont(font : {family : string, size : number, weight : string}) : StaveLine;
-            setText(text : string) : StaveLine;
-            setNotes(notes : {first_note: Note, last_note: Note, first_indices? : number[], last_indices? : number[]}) : StaveLine;
-            applyLineStyle() : void;
-            applyFontStyle() : void;
-            draw() : StaveLine;
-
-            //inconsistent API: this should be set via an options object in the constructor
-            render_options : {padding_left : number, padding_right : number, line_width : number, line_dash : number[], rounded_end : boolean, color : string, draw_start_arrow : boolean, draw_end_arrow : boolean, arrowhead_length : number, arrowhead_angle : number, text_position_vertical : StaveLine.TextVerticalPosition, text_justification : StaveLine.TextJustification};
-        }
-
-        namespace StaveLine {
-            const enum TextVerticalPosition { TOP, BOTTOM }
-            const enum TextJustification { LEFT, CENTER, RIGHT }
-        }
-
-        class StaveModifier {
-            getCategory() : string;
-            makeSpacer(padding : number) : {getContext: Function, setStave: Function, renderToStave: Function, getMetrics: Function};
-            placeGlyphOnLine(glyph : Glyph, stave : Stave, line : number) : void;
-            setPadding(padding : number) : void;
-            addToStave(stave : Stave, firstGlyph : boolean) : StaveModifier;
-            addToStaveEnd(stave : Stave, firstGlyph : boolean) : StaveModifier;
-            addModifier() : void;
-            addEndModifier() : void;
-        }
-
-        class StaveNote extends StemmableNote {
-            //TODO remove the following lines once TypeScript allows subclass overrides with type changes and/or inconsistencies mentioned below are fixed
-            buildStem() : StemmableNote;
-            setStave(stave : Stave) : Note;
-            addModifier(modifier : Modifier, index? : number) : Note;
-            getModifierStartXY() : {x : number, y : number};
-            getDots() : number;
-
-            constructor(note_struct : {type? : string, dots? : number, duration : string, clef? : string, keys : string[], octave_shift? : number, auto_stem? : boolean, stem_direction? : number});
-            static DEBUG : boolean;
-            static format(notes : StaveNote[] , state : {left_shift : number, right_shift : number, text_line : number}) : boolean;
-            static formatByY(notes : StaveNote[] , state : {left_shift : number, right_shift : number, text_line : number}) : void;
-            static postFormat(notes : StaveNote[]) : boolean;
-            buildStem() : void; //inconsistent type: void -> StaveNote
-            buildNoteHeads() : void;
-            autoStem() : void;
-            calculateKeyProps() : void;
-            getBoundingBox() : BoundingBox;
-            getLineNumber() : number;
-            isRest() : boolean;
-            isChord() : boolean;
-            hasStem() : boolean;
-            getYForTopText(text_line : number) : number;
-            getYForBottomText(text_line : number) : number;
-            setStave(stave : Stave) : StaveNote;
-            getKeys() : string[];
-            getKeyProps() : {key : string, octave : number, line : number, int_value : number, accidental : string, code : number, stroke : number, shift_right : number, displaced : boolean}[];
-            isDisplaced() : boolean;
-            setNoteDisplaced(displaced : boolean) : StaveNote;
-            getTieRightX() : number;
-            getTieLeftX() : number;
-            getLineForRest() : number;
-            getModifierStartXY(position : Modifier.Position, index : number) : {x : number, y : number};
-            setStyle(style : {shadowColor? : string, shadowBlur? : string, fillStyle? : string, strokeStyle? : string}) : void; // inconsistent type: void -> StaveNote
-            setKeyStyle(index : number, style : {shadowColor? : string, shadowBlur? : string, fillStyle? : string, strokeStyle? : string}) : StaveNote;
-            setKeyLine(index : number, line : number) : StaveNote;
-            getKeyLine(index : number) : number;
-            addToModifierContext(mContext : ModifierContext) : StaveNote;
-            addModifier(index : number, modifier : Modifier) : StaveNote;
-            addAccidental(index : number, accidental : Accidental) : StaveNote;
-            addArticulation(index : number, articulation : Articulation) : StaveNote;
-            addAnnotation(index : number, annotation : Annotation) : StaveNote;
-            addDot(index : number) : StaveNote;
-            addDotToAll() : StaveNote;
-            getAccidentals() : Accidental[];
-            getDots() : Dot[];
-            getVoiceShiftWidth() : number;
-            calcExtraPx() : void;
-            preFormat() : void;
-            getNoteHeadBounds() : {y_top: number, y_bottom: number, highest_line: number, lowest_line: number};
-            getNoteHeadBeginX() : number;
-            getNoteHeadEndX() : number;
-            drawLedgerLines() : void;
-            drawModifiers() : void;
-            drawFlag() : void;
-            drawNoteHeads() : void;
-            drawStem(struct : {x_begin? : number, x_end? : number, y_top? : number, y_bottom? : number, y_extend? : number, stem_extension? : number, stem_direction? : number}) : void;
-            draw() : void;
-        }
-
-        namespace StaveNote {
-            const STEM_UP: number;
-            const STEM_DOWN: number;
-            const CATEGORY: string;
-        }
-
-        class StaveSection extends Modifier {
-            //TODO remove the following lines once TypeScript allows subclass overrides with type changes
-            draw() : void;
-
-            constructor(section : string, x : number, shift_y : number);
-            getCategory() : string;
-            setStaveSection(section : string) : StaveSection;
-            setShiftX(x : number) : StaveSection;
-            setShiftY(y : number) : StaveSection;
-            draw(stave : Stave, shift_x : number) : StaveSection;
-        }
-
-        class StaveTempo extends StaveModifier {
-            constructor(tempo : {name? : string, duration : string, dots : number, bpm : number}, x : number, shift_y : number);
-            getCategory() : string;
-            setTempo(tempo : {name? : string, duration : string, dots : number, bpm : number}) : StaveTempo;
-            setShiftX(x : number) : StaveTempo;
-            setShiftY(y : number) : StaveTempo;
-            draw(stave : Stave, shift_x : number) : StaveTempo;
-        }
-
-        class StaveText extends Modifier {
-            //TODO remove the following lines once TypeScript allows subclass overrides with type changes
-            draw() : void;
-
-            constructor(text : string, position : Modifier.Position, options? : {shift_x? : number, shift_y? : number, justification? : TextNote.Justification});
-            getCategory() : string;
-            setStaveText(text : string) : StaveText;
-            setShiftX(x : number) : StaveText;
-            setShiftY(y : number) : StaveText;
-            setFont(font : {family? : string, size? : number, weight? : number}) : void;
-            setText(text : string) : void;
-            draw(stave : Stave) : StaveText;
-        }
-
-        class StaveTie {
-            constructor(notes : {first_note: Note, last_note: Note, first_indices : number[], last_indices : number[]}, text? : string);
-            setContext(context : IRenderContext) : StaveTie;
-            setFont(font : {family : string, size : number, weight : string}) : StaveTie;
-            setNotes(notes : {first_note: Note, last_note: Note, first_indices : number[], last_indices : number[]}) : StaveTie;
-            isPartial() : boolean;
-            renderTie(params : {first_ys : number[], last_ys : number[], last_x_px : number, first_x_px : number, direction : number}) : void;
-            renderText(first_x_px : number, last_x_px : number) : void;
-            draw() : boolean;
-        }
-
-        class Stem {
-            constructor(options : {x_begin? : number, x_end? : number, y_top? : number, y_bottom? : number, y_extend? : number, stem_extension? : number, stem_direction? : number});
-            static DEBUG : boolean;
-            setNoteHeadXBounds(x_begin : number, x_end : number) : Stem;
-            setDirection(direction : number) : void;
-            setExtension(extension : number) : void;
-            setYBounds(y_top : number, y_bottom : number) : void;
-            getCategory() : string;
-            setContext(context : IRenderContext) : Stem;
-            getHeight() : number;
-            getBoundingBox() : BoundingBox;
-            getExtents() : {topY : number, baseY : number};
-            setStyle(style : {shadowColor? : string, shadowBlur? : string, fillStyle? : string, strokeStyle? : string}) : void;
-            getStyle() : {shadowColor? : string, shadowBlur? : string, fillStyle? : string, strokeStyle? : string};
-            applyStyle(context : IRenderContext) : Stem;
-            draw() : void;
-
-            //inconsistent API: this should be set via the options object in the constructor
-            hide : boolean;
-        }
-
-        namespace Stem {
-            const UP: number;
-            const DOWN: number;
-        }
-
-        class StemmableNote extends Note {
-            //TODO remove the following lines once TypeScript allows subclass overrides with type changes
-            setBeam() : Note;
-
-            constructor(note_struct : {type? : string, dots? : number, duration : string});
-            static DEBUG : boolean;
-            getStem() : Stem;
-            setStem(stem : Stem) : StemmableNote;
-            buildStem() : StemmableNote;
-            getStemLength() : number;
-            getBeamCount() : number;
-            getStemMinumumLength() : number; //inconsistent name: getStemMinumumLength -> getStemMinimumLength
-            getStemDirection() : number;
-            setStemDirection(direction : number) : StemmableNote;
-            getStemX() : number;
-            getCenterGlyphX() : number;
-            getStemExtension() : number;
-            setStemLength() : number;
-            getStemExtents() : {topY : number, baseY : number};
-            setBeam(beam : Beam) : StemmableNote;
-            getYForTopText(text_line : number) : number;
-            getYForBottomText(text_line : number) : number;
-            postFormat() : StemmableNote;
-            drawStem(stem_struct : {x_begin? : number, x_end? : number, y_top? : number, y_bottom? : number, y_extend? : number, stem_extension? : number, stem_direction? : number}) : void;
-        }
-
-        class StringNumber extends Modifier {
-            //TODO remove the following lines once TypeScript allows subclass overrides with type changes
-            setNote(note : Note) : StringNumber;
-
-            constructor(number : number);
-            static format(nums : StringNumber[], state : {left_shift : number, right_shift : number, text_line : number}) : boolean;
-            getNote()  : Note;
-            setNote(note : StemmableNote) : StringNumber;
-            getIndex() : number;
-            setIndex(index : number) : StringNumber;
-            setLineEndType(leg : Renderer.LineEndType) : StringNumber;
-            getPosition() : Modifier.Position;
-            setPosition(position : Modifier.Position) : StringNumber;
-            setStringNumber(number : number) : StringNumber;
-            setOffsetX(x : number) : StringNumber;
-            setOffsetY(y : number) : StringNumber;
-            setLastNote(note : StemmableNote) : StringNumber;
-            setDashed(dashed : boolean) : StringNumber;
-            draw() : void;
-        }
-
-        namespace StringNumber {
-            const CATEGORY: string;
-        }
-
-        class Stroke extends Modifier {
-            constructor(type : Stroke.Type, options : {all_voices? : boolean});
-            static format(strokes : Stroke[], state : {left_shift : number, right_shift : number, text_line : number}) : boolean;
-            getPosition() : Modifier.Position;
-            addEndNote(note : Note) : Stroke;
-            draw() : void;
-        }
-
-        namespace Stroke {
-            const enum Type {BRUSH_DOWN, BRUSH_UP, ROLL_DOWN, ROLL_UP, RASQUEDO_DOWN, RASQUEDO_UP}
-            const CATEGORY : string;
-        }
-
-        class SVGContext implements IRenderContext {
-            constructor(element : HTMLElement);
-            iePolyfill() : boolean;
-            setFont(family : string, size : number, weight? : number) : SVGContext;
-            setRawFont(font : string) : SVGContext;
-            setFillStyle(style : string) : SVGContext;
-            setBackgroundFillStyle(style : string) : SVGContext;
-            setStrokeStyle(style : string) : SVGContext;
-            setShadowColor(style : string) : SVGContext; //inconsistent name: style -> color
-            setShadowBlur(blur : string) : SVGContext;
-            setLineWidth(width : number) : SVGContext;
-            setLineDash(dash : string) : SVGContext;
-            setLineCap(cap_type : string) : SVGContext;
-            resize(width : number, height : number) : SVGContext;
-            scale(x : number, y : number) : SVGContext;
-            setViewBox(xMin : number, yMin : number, width : number, height : number) : void;
-            clear() : void;
-            rect(x : number, y : number, width : number, height : number) : SVGContext;
-            fillRect(x : number, y : number, width : number, height : number) : SVGContext;
-            clearRect(x : number, y : number, width : number, height : number) : SVGContext;
-            beginPath() : SVGContext;
-            moveTo(x : number, y : number) : SVGContext;
-            lineTo(x : number, y : number) : SVGContext;
-            bezierCurveToTo(x1 : number, y1 : number, x2 : number, y2 : number, x : number, y : number) : SVGContext;
-            quadraticCurveToTo(x1 : number, y1 : number, x : number, y : number) : SVGContext; //inconsistent: x, y -> x2, y2
-            arc(x : number, y : number, radius : number, startAngle : number, endAngle : number, antiClockwise : boolean) : SVGContext;
-            closePath() : SVGContext;
-            glow() : SVGContext;
-            fill() : SVGContext;
-            stroke() : SVGContext;
-            measureText(text : string) : SVGRect;
-            ieMeasureTextFix(bbox : SVGRect, text : string) : {x : number, y : number, width : number, height : number};
-            fillText(text : string, x : number, y : number) : SVGContext;
-            save() : SVGContext;
-            restore() : SVGContext;
-        }
-
-        class TabNote extends StemmableNote {
-            //TODO remove the following lines once TypeScript allows subclass overrides with type changes
-            setStave(stave : Stave) : Note;
-            getModifierStartXY() : {x : number, y : number};
-
-            constructor(tab_struct : {positions : {str : number, fret : number}[], type? : string, dots? : number, duration : string, stem_direction? : boolean}, draw_stem? : boolean);
-            getCategory() : string;
-            setGhost(ghost : boolean) : TabNote;
-            hasStem() : boolean;
-            getStemExtension() : number;
-            addDot() : TabNote;
-            updateWidth() : void;
-            setStave(stave : Stave) : TabNote;
-            getPositions() : {str : number, fret : number}[];
-            addToModifierContext(mc : ModifierContext) : TabNote;
-            getTieRightX() : number;
-            getTieLeftX() : number;
-            getModifierStartXY(position : Modifier.Position, index : number) : {x : number, y : number};
-            getLineForRest() : number;
-            preFormat() : void;
-            getStemX() : number;
-            getStemY() : number;
-            getStemExtents() : {topY : number, baseY : number};
-            drawFlag() : void;
-            drawModifiers() : void;
-            drawStemThrough() : void;
-            draw() : void;
-        }
-
-        class TabSlide extends TabTie {
-            constructor(notes : {first_note: Note, last_note: Note, first_indices : number[], last_indices : number[]}, direction? : number);
-            static createSlideUp(notes : {first_note: Note, last_note: Note, first_indices : number[], last_indices : number[]}) : TabSlide;
-            static createSlideDown(notes : {first_note: Note, last_note: Note, first_indices : number[], last_indices : number[]}) : TabSlide;
-            renderTie(params : {first_ys : number[], last_ys : number[], last_x_px : number, first_x_px : number, direction : number}) : void;
-        }
-
-        namespace TabSlide {
-            const SLIDE_UP : number;
-            const SLIDE_DOWN : number;
-        }
-
-        class TabStave extends Stave {
-            constructor(x : number, y : number, width : number, options? : {vertical_bar_width? : number, glyph_spacing_px? : number, num_lines? : number, fill_style? : string, spacing_between_lines_px? : number, space_above_staff_ln? : number, space_below_staff_ln? : number, top_text_position? : number});
-            getYForGlyphs() : number;
-            addTabGlyph() : TabStave;
-        }
-
-        class TabTie extends StaveTie {
-            constructor(notes : {first_note: Note, last_note: Note, first_indices : number[], last_indices : number[]}, text? : string);
-            createHammeron(notes : {first_note: Note, last_note: Note, first_indices : number[], last_indices : number[]}) : TabTie;
-            createPulloff(notes : {first_note: Note, last_note: Note, first_indices : number[], last_indices : number[]}) : TabTie;
-            draw() : boolean;
-        }
-
-        class TextBracket {
-            constructor(bracket_data : {start : Note, stop : Note, text? : string, superscript? : string, position? : TextBracket.Positions});
-            static DEBUG : boolean;
-            applyStyle(context : IRenderContext) : TextBracket;
-            setDashed(dashed : boolean, dash? : number[]) : TextBracket;
-            setFont(font : {family : string, size : number, weight : string}) : TextBracket;
-            setContext(context : IRenderContext) : TextBracket;
-            setLine(line : number) : TextBracket;
-            draw() : void;
-        }
-
-        namespace TextBracket {
-            const enum Positions {TOP, BOTTOM}
-        }
-
-        class TextDynamics extends Note {
-            constructor(text_struct : {duration : string, text : string, line? : number});
-            static DEBUG : boolean;
-            setLine(line : number) : TextDynamics;
-            preFormat() : TextDynamics;
-            draw() : void;
-        }
-
-        class TextNote extends Note {
-            constructor(text_struct : {duration : string, text? : string, superscript? : boolean, subscript? : boolean, glyph? : string, font? : {family : string, size : number, weight : string}, line? : number, smooth? : boolean, ignore_ticks? : boolean});
-            setJustification(just : TextNote.Justification) : TextNote;
-            setLine(line : number) : TextNote;
-            preFormat() : void;
-            draw() : void;
-        }
-
-        namespace TextNote {
-            const enum Justification {LEFT, CENTER, RIGHT}
-            const GLYPHS : {[name : string] : {code : string, point : number, x_shift : number, y_shift : number}}
-        }
-
-        interface Tickable {
-            setContext(context : IRenderContext) : void;
-            getBoundingBox() : BoundingBox;
-            getTicks() : Fraction;
-            shouldIgnoreTicks() : boolean;
-            getWidth() : number;
-            setXShift(x : number) : Tickable;
-            getCenterXShift() : number;
-            isCenterAligned() : boolean;
-            setCenterAlignment(align_center : boolean) : Tickable;
-            getVoice() : Voice;
-            setVoice(voice : Voice) : void;
-            getTuplet() : Tuplet;
-            setTuplet(tuplet : Tuplet) : Tickable;
-            addToModifierContext(mc : ModifierContext) : void;
-            addModifier(mod : Modifier) : Tickable;
-            setTickContext(tc : TickContext) : void;
-            preFormat() : void;
-            postFormat() : Tickable;
-            getIntrinsicTicks() : Fraction;
-            setIntrinsicTicks(intrinsicTicks : Fraction) : void;
-            getTickMultiplier() : Fraction;
-            applyTickMultiplier(numerator : number, denominator : number) : void;
-            setDuration(duration : Fraction) : void;
-        }
-
-        class TickContext {
-            setContext(context : IRenderContext) : void;
-            getContext() : IRenderContext;
-            shouldIgnoreTicks() : boolean;
-            getWidth() : number;
-            getX() : number;
-            setX(x : number) : TickContext;
-            getPixelsUsed() : number;
-            setPixelsUsed(pixelsUsed : number) : TickContext;
-            setPadding(padding : number) : TickContext;
-            getMaxTicks() : number;
-            getMinTicks() : number;
-            getTickables() : Tickable[];
-            getCenterAlignedTickables() : Tickable[];
-            getMetrics() : {width : number, notePx : number, extraLeftPx : number, extraRightPx : number};
-            getCurrentTick() : Fraction;
-            setCurrentTick(tick : Fraction) : void;
-            getExtraPx() : {left: number, right: number, extraLeft : number, extraRight : number};
-            addTickable(tickable : Tickable) : TickContext;
-            preFormat() : TickContext;
-            postFormat() : TickContext;
-            static getNextContext(tContext : TickContext) : TickContext;
-        }
-
-        class TimeSignature extends StaveModifier {
-             //TODO remove the following lines once TypeScript allows subclass overrides with type changes
-            addModifier() : void;
-            addEndModifier() : void;
-
-            constructor(timeSpec : string, customPadding? : number);
-            parseTimeSpec(timeSpec : string) : {num : number, glyph : Glyph};
-            makeTimeSignatureGlyph(topNums : number[], botNums : number[]) : Glyph;
-            getTimeSig() : {num : number, glyph : Glyph};
-            addModifier(stave : Stave) : void;
-            addEndModifier(stave : Stave) : void;
-        }
-
-        namespace TimeSignature {
-            const glyphs : {[name : string] : {code : string, point : number, line : number}};
-        }
-
-        class TimeSigNote extends Note {
-            //TODO remove the following lines once TypeScript allows subclass overrides with type changes or type inconsistencies mentioned below are fixed
-            setStave(stave : Stave) : Note;
-
-            constructor(timeSpec : string, customPadding : number);
-            setStave(stave : Stave) : void; //inconsistent type: void -> TimeSignote
-            getBoundingBox() : BoundingBox;
-            addToModifierContext() : TimeSigNote;
-            preFormat() : TimeSigNote;
-            draw() : void;
-        }
-
-        class Tremolo extends Modifier {
-            constructor(num : number);
-            getCategory() : string;
-            draw() : void;
-        }
-
-        class Tuning {
-            constructor(tuningString? : string);
-            noteToInteger(noteString : string) : number;
-            setTuning(tuningString : string) : void;
-            getValueForString(stringNum : string) : number;
-            getValueForFret(fretNum : string, stringNum : string) : number;
-            getNoteForFret(fretNum : string, stringNum : string) : string;
-        }
-
-        namespace Tuning {
-            const names: { [name: string]: string };
-        }
-
-        class Tuplet {
-            constructor(notes : StaveNote[], options : {num_notes? : number, beats_occupied? : number});
-            attach() : void;
-            detach() : void;
-            setContext(context : IRenderContext) : Tuplet;
-            setBracketed(bracketed : boolean) : Tuplet;
-            setRatioed(ratioed : boolean) : Tuplet;
-            setTupletLocation(location : number) : Tuplet;
-            getNotes() : StaveNote[];
-            getNoteCount() : number;
-            getBeatsOccupied() : number;
-            setBeatsOccupied(beats : number) : void;
-            resolveGlyphs() : void;
-            draw() : void;
-        }
-
-        namespace Tuplet {
-            const LOCATION_TOP : number;
-            const LOCATION_BOTTOM : number;
-        }
-
-        class Vibrato extends Modifier {
-            static format(vibratos : Vibrato[], state : {left_shift : number, right_shift : number, text_line : number}, context : ModifierContext) : boolean;
-            setHarsh(harsh : boolean) : Vibrato;
-            setVibratoWidth(width : number) : Vibrato;
-            draw() : void;
-        }
-
-        namespace Vibrato {
-            const CATEGORY : string;
-        }
-
-        class Voice {
-            constructor(time : {num_beats? : number, beat_value? : number, resolution? : number});
-            getTotalTicks() : Fraction;
-            getTicksUsed() : Fraction;
-            getLargestTickWidth() : number;
-            getSmallestTickCount() : Fraction;
-            getTickables() : Tickable[];
-            getMode() : number;
-            setMode(mode : number) : Voice;
-            getResolutionMultiplier() : number;
-            getActualResolution() : number;
-            setStave(stave : Stave) : Voice;
-            getBoundingBox() : BoundingBox;
-            getVoiceGroup() : VoiceGroup;
-            setVoiceGroup(g : VoiceGroup) : Voice;
-            setStrict(strict : boolean) : Voice;
-            isComplete() : boolean;
-            addTickable(tickable : Tickable) : Voice;
-            addTickables(tickables : Tickable[]) : Voice;
-            preFormat() : Voice;
-            draw(context : IRenderContext, stave? : Stave) : void;
-        }
-
-        namespace Voice {
-            const enum Mode {STRICT, SOFT, FULL}
-        }
-
-        class VoiceGroup {
-            getVoices() : Voice[];
-            getModifierContexts() : ModifierContext[];
-            addVoice(voice : Voice) : void;
-        }
-
-        class Volta extends StaveModifier {
-            constructor(type : Volta.type, number : number, x : number, y_shift : number);
-            getCategory() : string;
-            setShiftY(y : number) : Volta;
-            draw(stave : Stave, x : number) : Volta;
-        }
-
-        namespace Volta {
-            const enum type {NONE, BEGIN, MID, END, BEGIN_END}
-        }
-    }
-}
-
-declare module "vexflow" {
-  export = Vex;
-}
diff --git a/victor/index.d.ts b/victor/index.d.ts
new file mode 100644
index 0000000000..3eee2bd37b
--- /dev/null
+++ b/victor/index.d.ts
@@ -0,0 +1,379 @@
+// Type definitions for Victor.js 0.2.5
+// Project: http://victorjs.org/
+// Definitions by: Ivane Gegia <https://twitter.com/ivanegegia>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface VictorCoordinates
+{
+    x:number
+    y:number
+}
+
+declare class Victor
+{
+    x:number;
+    y:number;
+
+    /**
+     * Can be used without the new keyword.
+     * @param x The X component
+     * @param y The Y component
+     */
+    constructor(x:number,y:number);
+
+    /**
+     * Creates vector from array.
+     * @param arr array An array that contains the X component in the first element and the Y component in the second
+     */
+    static fromArray(arr:Array<number>):Victor;
+
+    /**
+     * Creates vector from object.
+     * @param obj An object containing the X component in the x property and the Y component in the y property
+     */
+    static fromObject(obj:VictorCoordinates):Victor;
+
+    /**
+     * Creates a new Victor with the same X and Y components.
+     */
+    clone():Victor;
+
+    /**
+     * Copies the X component of another vector in to itself.
+     * @param vector
+     */
+    copyX(vector:Victor):Victor;
+
+    /**
+     * Copies the Y component of another vector in to itself.
+     * @param vector
+     */
+    copyY(vector:Victor):Victor;
+
+    /**
+     * Copies the X and Y components of another vector in to itself.
+     * @param vector
+     */
+    copy(vector:Victor):Victor;
+
+    /**
+     * Returns a string representation of the X and Y components.
+     */
+    toString():string;
+
+    /**
+     * Returns an array representation of the X and Y components.
+     */
+    toArray():Array<number>;
+
+    /**
+     * Returns an object representation of tha X and Y components.
+     */
+    toObject():VictorCoordinates;
+
+    /**
+     * Adds another vector's X component to itself.
+     * @param vector
+     */
+    addX(vector:Victor):Victor;
+
+    /**
+     * Adds another vector's Y component to itself.
+     * @param vector
+     */
+    addY(vector:Victor):Victor;
+
+    /**
+     * Adds another vector to itself.
+     * @param vector
+     */
+    add(vector:Victor):Victor;
+
+    /**
+     * Subtracts another vector's X component from itself.
+     * @param vector
+     */
+    subtractX(vector:Victor):Victor;
+
+    /**
+     * Subtracts another vector's Y component from itself.
+     * @param vector
+     */
+    subtractY(vector:Victor):Victor;
+
+    /**
+     * Subtracts another vector from itself.
+     * @param vector
+     */
+    subtract(vector:Victor):Victor;
+
+    /**
+     * Multiplies the X component with the X component of another vector.
+     * @param vector
+     */
+    multiplyX(vector:Victor):Victor;
+
+    /**
+     * Multiplies the Y component with the Y component of another vector.
+     * @param vector
+     */
+    multiplyY(vector:Victor):Victor;
+
+    /**
+     * Multiplies both components with another vector.
+     * @param vector
+     */
+    multiply(vector:Victor):Victor;
+    
+    /**
+     * Multiplies both vector axis by the given scalar value
+     * 
+     * @param victor
+     */
+    multiplyScalar(scalar: number): Victor;
+
+    /**
+     * Multiplies the X axis by the given scalar
+     * 
+     * @param victor
+     */
+    multiplyScalarX(scalar: number): Victor;
+
+    /**
+     * Multiplies the Y axis by the given scalar
+     * 
+     * @param vector
+     */
+    multiplyScalarY(scalar: number): Victor;
+
+    /**
+     * Divides the X component by the X component of another vector.
+     * @param vector
+     */
+    divideX(vector:Victor):Victor;
+
+    /**
+     * Divides the Y component by the Y component of another vector.
+     * @param vector
+     */
+    divideY(vector:Victor):Victor;
+
+    /**
+     * Divides both components by another vector.
+     * @param scalar
+     */
+    divide(scalar:Victor):Victor;
+
+    /**
+     * Inverts the X component.
+     */
+    invertX():Victor;
+
+    /**
+     * Inverts the Y component.
+     */
+    invertY():Victor;
+
+    /**
+     * Inverts both components.
+     */
+    invert():Victor;
+
+    /**
+     * Performs a linear blend / interpolation of the X component towards another vector.
+     * @param vector Number amount Value between 0 and 1. Default: 0.5
+     * @param ammount
+     */
+    mixX(vector:Victor, ammount:number):Victor;
+
+    /**
+     * Performs a linear blend / interpolation of the Y component towards another vector.
+     * @param vector
+     * @param ammount
+     */
+    mixY(vector:Victor, ammount:number):Victor;
+
+    /**
+     * Performs a linear blend / interpolation towards another vector.
+     * @param vector
+     * @param ammount
+     */
+    mix(vector:Victor, ammount:number):Victor;
+
+    /**
+     * Normalizes the vector by scaling it down to a length of 1 while keeping its direction.
+     */
+    normalize():Victor;
+
+    /**
+     * Alias of normalize.
+     */
+    norm():Victor;
+
+    /**
+     * If either component is greater than max, multiplies the component by multiplier.
+     * @param max
+     * @param multiplier
+     */
+    limit(max:number, multiplier:number):Victor;
+
+    /**
+     * Rounds the components to integer numbers.
+     */
+    unfloat():Victor;
+
+    /**
+     * Rotates the vector to a certain angle, in radians CCW from +X axis.
+     * @param angle
+     */
+    rotate(angle:number):Victor;
+
+    /**
+     * Same as rotate but uses degrees
+     * @param angle
+     */
+    rotateDeg(angle:number):Victor;
+
+    /**
+     * Rotates the vector by a rotation angle, given in radians CCW from +X axis.
+     * @param rotation
+     */
+    rotateBy(rotation:number):Victor;
+
+    /**
+     * Same as rotateBy but uses degrees
+     * @param rotation
+     */
+    rotateByDeg(rotation:number):Victor;
+
+    /**
+     * Randomizes the X component with a value between topLeft and bottomRight.
+     * @param topLeft
+     * @param bottomRight
+     */
+    randomizeX(topLeft:Victor, bottomRight:Victor):Victor;
+
+    /**
+     * Randomizes the Y component with a value between topLeft and bottomRight.
+     * @param topLeft
+     * @param bottomRight
+     */
+    randomizeY(topLeft:Victor, bottomRight:Victor):Victor;
+
+    /**
+     * Randomizes the components with a value between topLeft and bottomRight.
+     * @param topLeft
+     * @param bottomRight
+     */
+    randomize(topLeft:Victor, bottomRight:Victor):Victor;
+
+    /**
+     * Randomly randomizes either the X component or the Y component with a value between topLeft and bottomRight.
+     * @param topLeft
+     * @param bottomRight
+     */
+    randomizeAny(topLeft:Victor, bottomRight:Victor):Victor;
+
+    /**
+     * Returns the dot product of two vectors.
+     * @param vector
+     */
+    dot(vector:Victor):number;
+
+    /**
+     * Returns the cross product of two vectors.
+     * @param vector
+     */
+    cross(vector:Victor):number;
+
+    /**
+     * Returns the length / magnitude.
+     */
+    length():number;
+
+    /**
+     * Alias for length.
+     */
+    magnitude():number;
+
+    /**
+     * Returns the squared length / magnitude. If the length is only needed for comparison, this function is faster than length.
+     */
+    lengthSq():number;
+
+    /**
+     * Returns the distance of the X component from another vector.
+     * @param vector
+     */
+    distanceX(vector:Victor):number;
+
+    /**
+     * Same as distanceX but always returns an absolute value.
+     * @param vector
+     */
+    absDistanceX(vector:Victor):number;
+
+    /**
+     * Returns the distance of the Y component from another vector.
+     * @param vector
+     */
+    distanceY(vector:Victor):number;
+
+    /**
+     * Same as distanceY but always returns an absolute value.
+     * @param vector
+     */
+    absDistanceY(vector:Victor):number;
+
+    /**
+     * Returns the euclidean distance between two vectors.
+     * @param vector
+     */
+    distance(vector:Victor):number;
+
+    /**
+     * Returns the squared euclidean distance between two vectors. If the distance is only needed for comparison, this function is faster than distance.
+     * @param vector
+     */
+    distanceSq(vector:Victor):number;
+
+    /**
+     * Returns the angle towards X in radians.
+     */
+    horizontalAngle():number;
+
+    /**
+     * Alias for horizontalAngle.
+     */
+    angle():number;
+
+    /**
+     * Alias for horizontalAngle.
+     */
+    direction():number;
+
+    /**
+     * Same as horizontalAngle but returns degrees.
+     */
+    horizontalAngleDeg():number;
+
+    /**
+     * Alias for horizontalAngleDeg.
+     */
+    angleDeg():number;
+
+    /**
+     * Returns the angle towards Y in radians.
+     */
+    verticalAngle():number;
+
+    /**
+     * Same as verticalAngle but returns degrees.
+     */
+    verticalAngleDeg():number;
+
+}
+
+declare module "victor" {
+	export = Victor;
+}
diff --git a/victor/tsconfig.json b/victor/tsconfig.json
new file mode 100644
index 0000000000..d0338c32a1
--- /dev/null
+++ b/victor/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "victor-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/victor/victor-tests.ts b/victor/victor-tests.ts
index 76eb79c220..67deff3e72 100644
--- a/victor/victor-tests.ts
+++ b/victor/victor-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="victor.d.ts"/>
-
 var vector1 = new Victor(10,10)
 var vector2 = new Victor(20,20)
 
diff --git a/victor/victor.d.ts b/victor/victor.d.ts
deleted file mode 100644
index e3a3bf1752..0000000000
--- a/victor/victor.d.ts
+++ /dev/null
@@ -1,380 +0,0 @@
-// Type definitions for Victor.js 0.2.5
-// Project: http://victorjs.org/
-// Definitions by: Ivane Gegia <https://twitter.com/ivanegegia>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-interface VictorCoordinates
-{
-    x:number
-    y:number
-}
-
-declare class Victor
-{
-    x:number;
-    y:number;
-
-    /**
-     * Can be used without the new keyword.
-     * @param x The X component
-     * @param y The Y component
-     */
-    constructor(x:number,y:number);
-
-    /**
-     * Creates vector from array.
-     * @param arr array An array that contains the X component in the first element and the Y component in the second
-     */
-    static fromArray(arr:Array<number>):Victor;
-
-    /**
-     * Creates vector from object.
-     * @param obj An object containing the X component in the x property and the Y component in the y property
-     */
-    static fromObject(obj:VictorCoordinates):Victor;
-
-    /**
-     * Creates a new Victor with the same X and Y components.
-     */
-    clone():Victor;
-
-    /**
-     * Copies the X component of another vector in to itself.
-     * @param vector
-     */
-    copyX(vector:Victor):Victor;
-
-    /**
-     * Copies the Y component of another vector in to itself.
-     * @param vector
-     */
-    copyY(vector:Victor):Victor;
-
-    /**
-     * Copies the X and Y components of another vector in to itself.
-     * @param vector
-     */
-    copy(vector:Victor):Victor;
-
-    /**
-     * Returns a string representation of the X and Y components.
-     */
-    toString():string;
-
-    /**
-     * Returns an array representation of the X and Y components.
-     */
-    toArray():Array<number>;
-
-    /**
-     * Returns an object representation of tha X and Y components.
-     */
-    toObject():VictorCoordinates;
-
-    /**
-     * Adds another vector's X component to itself.
-     * @param vector
-     */
-    addX(vector:Victor):Victor;
-
-    /**
-     * Adds another vector's Y component to itself.
-     * @param vector
-     */
-    addY(vector:Victor):Victor;
-
-    /**
-     * Adds another vector to itself.
-     * @param vector
-     */
-    add(vector:Victor):Victor;
-
-    /**
-     * Subtracts another vector's X component from itself.
-     * @param vector
-     */
-    subtractX(vector:Victor):Victor;
-
-    /**
-     * Subtracts another vector's Y component from itself.
-     * @param vector
-     */
-    subtractY(vector:Victor):Victor;
-
-    /**
-     * Subtracts another vector from itself.
-     * @param vector
-     */
-    subtract(vector:Victor):Victor;
-
-    /**
-     * Multiplies the X component with the X component of another vector.
-     * @param vector
-     */
-    multiplyX(vector:Victor):Victor;
-
-    /**
-     * Multiplies the Y component with the Y component of another vector.
-     * @param vector
-     */
-    multiplyY(vector:Victor):Victor;
-
-    /**
-     * Multiplies both components with another vector.
-     * @param vector
-     */
-    multiply(vector:Victor):Victor;
-    
-    /**
-     * Multiplies both vector axis by the given scalar value
-     * 
-     * @param victor
-     */
-    multiplyScalar(scalar: number): Victor;
-
-    /**
-     * Multiplies the X axis by the given scalar
-     * 
-     * @param victor
-     */
-    multiplyScalarX(scalar: number): Victor;
-
-    /**
-     * Multiplies the Y axis by the given scalar
-     * 
-     * @param vector
-     */
-    multiplyScalarY(scalar: number): Victor;
-
-    /**
-     * Divides the X component by the X component of another vector.
-     * @param vector
-     */
-    divideX(vector:Victor):Victor;
-
-    /**
-     * Divides the Y component by the Y component of another vector.
-     * @param vector
-     */
-    divideY(vector:Victor):Victor;
-
-    /**
-     * Divides both components by another vector.
-     * @param scalar
-     */
-    divide(scalar:Victor):Victor;
-
-    /**
-     * Inverts the X component.
-     */
-    invertX():Victor;
-
-    /**
-     * Inverts the Y component.
-     */
-    invertY():Victor;
-
-    /**
-     * Inverts both components.
-     */
-    invert():Victor;
-
-    /**
-     * Performs a linear blend / interpolation of the X component towards another vector.
-     * @param vector Number amount Value between 0 and 1. Default: 0.5
-     * @param ammount
-     */
-    mixX(vector:Victor, ammount:number):Victor;
-
-    /**
-     * Performs a linear blend / interpolation of the Y component towards another vector.
-     * @param vector
-     * @param ammount
-     */
-    mixY(vector:Victor, ammount:number):Victor;
-
-    /**
-     * Performs a linear blend / interpolation towards another vector.
-     * @param vector
-     * @param ammount
-     */
-    mix(vector:Victor, ammount:number):Victor;
-
-    /**
-     * Normalizes the vector by scaling it down to a length of 1 while keeping its direction.
-     */
-    normalize():Victor;
-
-    /**
-     * Alias of normalize.
-     */
-    norm():Victor;
-
-    /**
-     * If either component is greater than max, multiplies the component by multiplier.
-     * @param max
-     * @param multiplier
-     */
-    limit(max:number, multiplier:number):Victor;
-
-    /**
-     * Rounds the components to integer numbers.
-     */
-    unfloat():Victor;
-
-    /**
-     * Rotates the vector to a certain angle, in radians CCW from +X axis.
-     * @param angle
-     */
-    rotate(angle:number):Victor;
-
-    /**
-     * Same as rotate but uses degrees
-     * @param angle
-     */
-    rotateDeg(angle:number):Victor;
-
-    /**
-     * Rotates the vector by a rotation angle, given in radians CCW from +X axis.
-     * @param rotation
-     */
-    rotateBy(rotation:number):Victor;
-
-    /**
-     * Same as rotateBy but uses degrees
-     * @param rotation
-     */
-    rotateByDeg(rotation:number):Victor;
-
-    /**
-     * Randomizes the X component with a value between topLeft and bottomRight.
-     * @param topLeft
-     * @param bottomRight
-     */
-    randomizeX(topLeft:Victor, bottomRight:Victor):Victor;
-
-    /**
-     * Randomizes the Y component with a value between topLeft and bottomRight.
-     * @param topLeft
-     * @param bottomRight
-     */
-    randomizeY(topLeft:Victor, bottomRight:Victor):Victor;
-
-    /**
-     * Randomizes the components with a value between topLeft and bottomRight.
-     * @param topLeft
-     * @param bottomRight
-     */
-    randomize(topLeft:Victor, bottomRight:Victor):Victor;
-
-    /**
-     * Randomly randomizes either the X component or the Y component with a value between topLeft and bottomRight.
-     * @param topLeft
-     * @param bottomRight
-     */
-    randomizeAny(topLeft:Victor, bottomRight:Victor):Victor;
-
-    /**
-     * Returns the dot product of two vectors.
-     * @param vector
-     */
-    dot(vector:Victor):number;
-
-    /**
-     * Returns the cross product of two vectors.
-     * @param vector
-     */
-    cross(vector:Victor):number;
-
-    /**
-     * Returns the length / magnitude.
-     */
-    length():number;
-
-    /**
-     * Alias for length.
-     */
-    magnitude():number;
-
-    /**
-     * Returns the squared length / magnitude. If the length is only needed for comparison, this function is faster than length.
-     */
-    lengthSq():number;
-
-    /**
-     * Returns the distance of the X component from another vector.
-     * @param vector
-     */
-    distanceX(vector:Victor):number;
-
-    /**
-     * Same as distanceX but always returns an absolute value.
-     * @param vector
-     */
-    absDistanceX(vector:Victor):number;
-
-    /**
-     * Returns the distance of the Y component from another vector.
-     * @param vector
-     */
-    distanceY(vector:Victor):number;
-
-    /**
-     * Same as distanceY but always returns an absolute value.
-     * @param vector
-     */
-    absDistanceY(vector:Victor):number;
-
-    /**
-     * Returns the euclidean distance between two vectors.
-     * @param vector
-     */
-    distance(vector:Victor):number;
-
-    /**
-     * Returns the squared euclidean distance between two vectors. If the distance is only needed for comparison, this function is faster than distance.
-     * @param vector
-     */
-    distanceSq(vector:Victor):number;
-
-    /**
-     * Returns the angle towards X in radians.
-     */
-    horizontalAngle():number;
-
-    /**
-     * Alias for horizontalAngle.
-     */
-    angle():number;
-
-    /**
-     * Alias for horizontalAngle.
-     */
-    direction():number;
-
-    /**
-     * Same as horizontalAngle but returns degrees.
-     */
-    horizontalAngleDeg():number;
-
-    /**
-     * Alias for horizontalAngleDeg.
-     */
-    angleDeg():number;
-
-    /**
-     * Returns the angle towards Y in radians.
-     */
-    verticalAngle():number;
-
-    /**
-     * Same as verticalAngle but returns degrees.
-     */
-    verticalAngleDeg():number;
-
-}
-
-declare module "victor" {
-	export = Victor;
-}
diff --git a/videojs/videojs.d.ts b/videojs/index.d.ts
similarity index 100%
rename from videojs/videojs.d.ts
rename to videojs/index.d.ts
diff --git a/videojs/tsconfig.json b/videojs/tsconfig.json
new file mode 100644
index 0000000000..096889f617
--- /dev/null
+++ b/videojs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "videojs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/videojs/videojs-tests.ts b/videojs/videojs-tests.ts
index 15cbc2f8b8..6b2c90184e 100644
--- a/videojs/videojs-tests.ts
+++ b/videojs/videojs-tests.ts
@@ -1,5 +1,5 @@
 // Tests for Video.js API
-/// <reference path="videojs.d.ts" />
+
 
 videojs("example_video_1").ready(function(){
 
diff --git a/viewporter/viewporter.d.ts b/viewporter/index.d.ts
similarity index 100%
rename from viewporter/viewporter.d.ts
rename to viewporter/index.d.ts
diff --git a/viewporter/tsconfig.json b/viewporter/tsconfig.json
new file mode 100644
index 0000000000..112df1731a
--- /dev/null
+++ b/viewporter/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "viewporter-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/viewporter/viewporter-tests.ts b/viewporter/viewporter-tests.ts
index 532f80335a..9c720bec65 100644
--- a/viewporter/viewporter-tests.ts
+++ b/viewporter/viewporter-tests.ts
@@ -1,6 +1,5 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="../googlemaps/google.maps.d.ts"/>
-/// <reference path="viewporter.d.ts"/>
+/// <reference types="jquery"/>
+/// <reference types="google-maps"/>
 
 function test_map() {
     viewporter.preventPageScroll = true;
diff --git a/viewporter/viewporter-tests.ts.tscparams b/viewporter/viewporter-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/viewporter/viewporter-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/vimeo/froogaloop.d.ts b/vimeo/froogaloop.d.ts
deleted file mode 100644
index 8c02364cc5..0000000000
--- a/vimeo/froogaloop.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Type definitions for Vimeo
-// Project: http://developer.vimeo.com/player/js-api
-// Definitions by: Daz Wilkin <https://github.com/DazWilkin/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface VimeoParams {
-	name:string;
-	value:any;
-}
-interface VimeoPlayerAPI {
-    (method: string): any;
-    (method: string, callback: (value: any, player_id: any) =>void ): any;
-	(method: string, value: any): any;
-	(method: string, value: VimeoParams[]): any;
-}
-interface VimeoPlayer {
-    api: VimeoPlayerAPI;
-    addEvent(eventName: string, callback: (e: any) =>void ): any;
-    removeEvent(eventName: string): void;
-    postMessage(method: string, params:VimeoParams[], target): void;
-    onMessagReceived(event);
-    storeCallback(eventName: string, callback, target_id: string);
-    getCallback(eventName: string, target_id: string);
-    removeCallback(eventName: string, target_id: string);
-    getDomainFromUrl(url: string): string;
-}
-
-declare var $f: VimeoPlayerAPI;
\ No newline at end of file
diff --git a/vimeo/froogaloop.d.ts.tscparams b/vimeo/froogaloop.d.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/vimeo/froogaloop.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/vimeo/index.d.ts b/vimeo/index.d.ts
new file mode 100644
index 0000000000..93b3d7bd6f
--- /dev/null
+++ b/vimeo/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for Vimeo
+// Project: http://developer.vimeo.com/player/js-api
+// Definitions by: Daz Wilkin <https://github.com/DazWilkin/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface VimeoParams {
+	name:string;
+	value:any;
+}
+interface VimeoPlayerAPI {
+    (method: string): any;
+    (method: string, callback: (value: any, player_id: any) =>void ): any;
+	(method: string, value: any): any;
+	(method: string, value: VimeoParams[]): any;
+}
+interface VimeoPlayer {
+    api: VimeoPlayerAPI;
+    addEvent(eventName: string, callback: (e: any) => void): any;
+    removeEvent(eventName: string): void;
+    postMessage(method: string, params:VimeoParams[], target: any): void;
+    onMessageReceived(event: any): any;
+    storeCallback(eventName: string, callback: any, target_id: string): any;
+    getCallback(eventName: string, target_id: string): any;
+    removeCallback(eventName: string, target_id: string): any;
+    getDomainFromUrl(url: string): string;
+}
+
+declare var $f: VimeoPlayerAPI;
\ No newline at end of file
diff --git a/vimeo/tsconfig.json b/vimeo/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/vimeo/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/vinyl-buffer/index.d.ts b/vinyl-buffer/index.d.ts
new file mode 100644
index 0000000000..72d5067769
--- /dev/null
+++ b/vinyl-buffer/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for vinyl-buffer
+// Project: https://github.com/hughsk/vinyl-buffer
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+declare namespace buffer {
+    interface Buffer {
+        (): NodeJS.ReadWriteStream;
+    }
+}
+
+declare var buffer: buffer.Buffer;
+
+export = buffer;
diff --git a/vinyl-buffer/tsconfig.json b/vinyl-buffer/tsconfig.json
new file mode 100644
index 0000000000..9cf1681923
--- /dev/null
+++ b/vinyl-buffer/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "vinyl-buffer-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/vinyl-buffer/vinyl-buffer-tests.ts b/vinyl-buffer/vinyl-buffer-tests.ts
index 6a36d0f52b..b1311ccbc0 100644
--- a/vinyl-buffer/vinyl-buffer-tests.ts
+++ b/vinyl-buffer/vinyl-buffer-tests.ts
@@ -1,7 +1,3 @@
-/// <reference path="vinyl-buffer.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="../browserify/browserify.d.ts" />
-
 import buffer = require('vinyl-buffer');
 import gulp = require('gulp')
 import browserify = require('browserify');
diff --git a/vinyl-buffer/vinyl-buffer.d.ts b/vinyl-buffer/vinyl-buffer.d.ts
deleted file mode 100644
index 40fbb6f1f0..0000000000
--- a/vinyl-buffer/vinyl-buffer.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Type definitions for vinyl-buffer
-// Project: https://github.com/hughsk/vinyl-buffer
-// Definitions by: Qubo <https://github.com/tkQubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "vinyl-buffer" {
-    namespace buffer {
-        interface Buffer {
-            (): NodeJS.ReadWriteStream;
-        }
-    }
-
-    var buffer: buffer.Buffer;
-
-    export = buffer;
-}
-
diff --git a/vinyl-fs/index.d.ts b/vinyl-fs/index.d.ts
new file mode 100644
index 0000000000..bae28894d2
--- /dev/null
+++ b/vinyl-fs/index.d.ts
@@ -0,0 +1,165 @@
+// Type definitions for vinyl-fs
+// Project: https://github.com/wearefractal/vinyl-fs
+// Definitions by: vvakame <https://github.com/vvakame/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare global {
+   namespace NodeJS {
+      interface WritableStream {
+         write(buffer: any/* Vinyl.File */, cb?: Function): boolean;
+      }
+   }
+}
+
+import _events = require("events");
+import File = require("../vinyl");
+import globStream = require("../glob-stream");
+
+interface ISrcOptions extends globStream.Options {
+   /** Specifies the working directory the folder is relative to */
+   cwd?: string;
+
+   /**
+   * Specifies the folder relative to the cwd
+   * This is used to determine the file names when saving in .dest()
+   * Default is where the glob begins
+   */
+   base?: string;
+
+   /**
+   * Setting this to false will make file.contents a paused stream
+   * If true it will buffer the file contents
+   * Defaults to true
+   */
+   buffer?: boolean;
+
+   /**
+   * Setting this to false will ignore the contents of the file and disable writing to disk to speed up operations
+   * Defaults to true
+   */
+   read?: boolean;
+
+   /**  Only find files that have been modified since the time specified */
+   since?: Date|number;
+
+   /** Setting this to true will create a duplex stream, one that passes through items and emits globbed files.
+   * Defaults to false */
+   passthrough?: boolean;
+
+   /** Setting this to true will enable sourcemaps.
+   * Defaults to false */
+   sourcemaps?: boolean;
+}
+
+/**
+* Gets files that match the glob and converts them into the vinyl format
+* @param globs Takes a glob string or an array of glob strings as the first argument
+* Globs are executed in order, so negations should follow positive globs
+* fs.src(['!b*.js', '*.js']) would not exclude any files, but this would: fs.src(['*.js', '!b*.js'])
+* @param opt Options Vinyl source options, changes the way the files are read, found, or stored in the vinyl stream
+*/
+declare function src(globs: string|string[], opt?: ISrcOptions): NodeJS.ReadWriteStream;
+
+/**
+* This is just a glob-watcher
+*
+* @param globs Takes a glob string or an array of glob strings as the first argument
+* Globs are executed in order, so negations should follow positive globs
+* fs.src(['!b*.js', '*.js']) would not exclude any files, but this would: fs.src(['*.js', '!b*.js'])
+*/
+declare function watch(globs: string|string[], cb?: (outEvt: { type: any; path: any; old: any; }) => void): _events.EventEmitter;
+
+/**
+* This is just a glob-watcher
+*
+* @param globs Takes a glob string or an array of glob strings as the first argument
+* Globs are executed in order, so negations should follow positive globs
+* fs.src(['!b*.js', '*.js']) would not exclude any files, but this would: fs.src(['*.js', '!b*.js'])
+*/
+declare function watch(globs: string|string[], opt?: { interval?: number; debounceDelay?: number; cwd?: string; maxListeners?: Function; }, cb?: (outEvt: { type: any; path: any; old: any; }) => void): _events.EventEmitter;
+
+/**
+* On write the stream will save the vinyl File to disk at the folder/cwd specified.
+* After writing the file to disk, it will be emitted from the stream so you can keep piping these around.
+* The file will be modified after being written to this stream:
+* cwd, base, and path will be overwritten to match the folder
+* stat.mode will be overwritten if you used a mode parameter
+* contents will have it's position reset to the beginning if it is a stream
+* @param folder destination folder
+*/
+declare function dest(folder: string, opt?: {
+   /** Specify the working directory the folder is relative to
+   * Default is process.cwd()
+   */
+   cwd?: string;
+
+   /** Specify the mode the files should be created with
+   * Default is the mode of the input file (file.stat.mode)
+   * or the process mode if the input file has no mode property
+   */
+   mode?: number|string;
+
+   /** Specify the mode the directory should be created with. Default is the process mode */
+   dirMode?: number|string;
+
+   /** Specify if existing files with the same path should be overwritten or not. Default is true, to always overwrite existing files */
+   overwrite?: boolean;
+}): NodeJS.ReadWriteStream;
+
+/**
+* On write the stream will save the vinyl File to disk at the folder/cwd specified.
+* After writing the file to disk, it will be emitted from the stream so you can keep piping these around.
+* The file will be modified after being written to this stream:
+* cwd, base, and path will be overwritten to match the folder
+* stat.mode will be overwritten if you used a mode parameter
+* contents will have it's position reset to the beginning if it is a stream
+* @param getFolderPath function that takes in a file and returns a folder path
+*/
+declare function dest(getFolderPath: (file: File) => string): NodeJS.ReadWriteStream;
+
+/**
+* On write the stream will create a symbolic link (i.e. symlink) on disk at the folder/cwd specified.
+* After creating the symbolic link, it will be emitted from the stream so you can keep piping these around.
+* The file will be modified after being written to this stream:
+* cwd, base, and path will be overwritten to match the folder
+*/
+declare function symlink(folder: string, opts?: {
+   /**
+   * Specify the working directory the folder is relative to
+   * Default is process.cwd()
+   */
+   cwd?: string;
+
+   /** Specify the mode the directory should be created with. Default is the process mode */
+   mode?: number|string;
+
+   /**
+   * Specify the mode the directory should be created with
+   * Default is the process mode
+   */
+   dirMode?: number
+}): NodeJS.ReadWriteStream;
+
+/**
+* On write the stream will create a symbolic link (i.e. symlink) on disk at the folder/cwd generated from getFolderPath.
+* After creating the symbolic link, it will be emitted from the stream so you can keep piping these around.
+* The file will be modified after being written to this stream:
+* cwd, base, and path will be overwritten to match the folder
+*/
+declare function symlink(getFolderPath: (File: File) => string, opts?:
+   {
+      /**
+      * Specify the working directory the folder is relative to
+      * Default is process.cwd()
+      */
+      cwd?: string;
+
+      /**
+      * Specify the mode the directory should be created with
+      * Default is the process mode
+      */
+      dirMode?: number
+
+   }): NodeJS.ReadWriteStream;
diff --git a/vinyl-fs/tsconfig.json b/vinyl-fs/tsconfig.json
new file mode 100644
index 0000000000..599c557a67
--- /dev/null
+++ b/vinyl-fs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "vinyl-fs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/vinyl-fs/vinyl-fs-tests.ts b/vinyl-fs/vinyl-fs-tests.ts
index 09758e053c..795b38b4aa 100644
--- a/vinyl-fs/vinyl-fs-tests.ts
+++ b/vinyl-fs/vinyl-fs-tests.ts
@@ -1,10 +1,5 @@
-/// <reference path="../mocha/mocha.d.ts" />
-/// <reference path="../should/should.d.ts" />
-
-/// <reference path="../rimraf/rimraf.d.ts" />
-
-/// <reference path="./vinyl-fs.d.ts" />
-
+/// <reference types="mocha" />
+/// <reference types="should" />
 
 // from src
 
diff --git a/vinyl-fs/vinyl-fs.d.ts b/vinyl-fs/vinyl-fs.d.ts
deleted file mode 100644
index 9b03a1ddb7..0000000000
--- a/vinyl-fs/vinyl-fs.d.ts
+++ /dev/null
@@ -1,167 +0,0 @@
-// Type definitions for vinyl-fs
-// Project: https://github.com/wearefractal/vinyl-fs
-// Definitions by: vvakame <https://github.com/vvakame/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../glob-stream/glob-stream.d.ts" />
-/// <reference path="../vinyl/vinyl.d.ts" />
-
-declare namespace NodeJS {
-   interface WritableStream {
-      write(buffer: any/* Vinyl.File */, cb?: Function): boolean;
-   }
-}
-
-declare module "vinyl-fs" {
-   import _events = require("events");
-   import File = require("vinyl");
-   import globStream = require("glob-stream");
-
-   interface ISrcOptions extends globStream.Options {
-      /** Specifies the working directory the folder is relative to */
-      cwd?: string;
-
-      /**
-      * Specifies the folder relative to the cwd
-      * This is used to determine the file names when saving in .dest()
-      * Default is where the glob begins
-      */
-      base?: string;
-
-      /**
-      * Setting this to false will make file.contents a paused stream
-      * If true it will buffer the file contents
-      * Defaults to true
-      */
-      buffer?: boolean;
-
-      /**
-      * Setting this to false will ignore the contents of the file and disable writing to disk to speed up operations
-      * Defaults to true
-      */
-      read?: boolean;
-
-      /**  Only find files that have been modified since the time specified */
-      since?: Date|number;
-
-      /** Setting this to true will create a duplex stream, one that passes through items and emits globbed files.
-      * Defaults to false */
-      passthrough?: boolean;
-
-      /** Setting this to true will enable sourcemaps.
-      * Defaults to false */
-      sourcemaps?: boolean;
-   }
-
-   /**
-   * Gets files that match the glob and converts them into the vinyl format
-   * @param globs Takes a glob string or an array of glob strings as the first argument
-   * Globs are executed in order, so negations should follow positive globs
-   * fs.src(['!b*.js', '*.js']) would not exclude any files, but this would: fs.src(['*.js', '!b*.js'])
-   * @param opt Options Vinyl source options, changes the way the files are read, found, or stored in the vinyl stream
-   */
-   function src(globs: string|string[], opt?: ISrcOptions): NodeJS.ReadWriteStream;
-
-   /**
-   * This is just a glob-watcher
-   *
-   * @param globs Takes a glob string or an array of glob strings as the first argument
-   * Globs are executed in order, so negations should follow positive globs
-   * fs.src(['!b*.js', '*.js']) would not exclude any files, but this would: fs.src(['*.js', '!b*.js'])
-   */
-   function watch(globs: string|string[], cb?: (outEvt: { type: any; path: any; old: any; }) => void): _events.EventEmitter;
-
-   /**
-   * This is just a glob-watcher
-   *
-   * @param globs Takes a glob string or an array of glob strings as the first argument
-   * Globs are executed in order, so negations should follow positive globs
-   * fs.src(['!b*.js', '*.js']) would not exclude any files, but this would: fs.src(['*.js', '!b*.js'])
-   */
-   function watch(globs: string|string[], opt?: { interval?: number; debounceDelay?: number; cwd?: string; maxListeners?: Function; }, cb?: (outEvt: { type: any; path: any; old: any; }) => void): _events.EventEmitter;
-
-   /**
-   * On write the stream will save the vinyl File to disk at the folder/cwd specified.
-   * After writing the file to disk, it will be emitted from the stream so you can keep piping these around.
-   * The file will be modified after being written to this stream:
-   * cwd, base, and path will be overwritten to match the folder
-   * stat.mode will be overwritten if you used a mode parameter
-   * contents will have it's position reset to the beginning if it is a stream
-   * @param folder destination folder
-   */
-   function dest(folder: string, opt?: {
-      /** Specify the working directory the folder is relative to
-      * Default is process.cwd()
-      */
-      cwd?: string;
-
-      /** Specify the mode the files should be created with
-      * Default is the mode of the input file (file.stat.mode)
-      * or the process mode if the input file has no mode property
-      */
-      mode?: number|string;
-
-      /** Specify the mode the directory should be created with. Default is the process mode */
-      dirMode?: number|string;
-
-      /** Specify if existing files with the same path should be overwritten or not. Default is true, to always overwrite existing files */
-      overwrite?: boolean;
-   }): NodeJS.ReadWriteStream;
-
-   /**
-   * On write the stream will save the vinyl File to disk at the folder/cwd specified.
-   * After writing the file to disk, it will be emitted from the stream so you can keep piping these around.
-   * The file will be modified after being written to this stream:
-   * cwd, base, and path will be overwritten to match the folder
-   * stat.mode will be overwritten if you used a mode parameter
-   * contents will have it's position reset to the beginning if it is a stream
-   * @param getFolderPath function that takes in a file and returns a folder path
-   */
-   function dest(getFolderPath: (file: File) => string): NodeJS.ReadWriteStream;
-
-   /**
-   * On write the stream will create a symbolic link (i.e. symlink) on disk at the folder/cwd specified.
-   * After creating the symbolic link, it will be emitted from the stream so you can keep piping these around.
-   * The file will be modified after being written to this stream:
-   * cwd, base, and path will be overwritten to match the folder
-   */
-   function symlink(folder: string, opts?: {
-      /**
-      * Specify the working directory the folder is relative to
-      * Default is process.cwd()
-      */
-      cwd?: string;
-
-      /** Specify the mode the directory should be created with. Default is the process mode */
-      mode?: number|string;
-
-      /**
-      * Specify the mode the directory should be created with
-      * Default is the process mode
-      */
-      dirMode?: number
-   }): NodeJS.ReadWriteStream;
-
-   /**
-   * On write the stream will create a symbolic link (i.e. symlink) on disk at the folder/cwd generated from getFolderPath.
-   * After creating the symbolic link, it will be emitted from the stream so you can keep piping these around.
-   * The file will be modified after being written to this stream:
-   * cwd, base, and path will be overwritten to match the folder
-   */
-   function symlink(getFolderPath: (File: File) => string, opts?:
-      {
-         /**
-         * Specify the working directory the folder is relative to
-         * Default is process.cwd()
-         */
-         cwd?: string;
-
-         /**
-         * Specify the mode the directory should be created with
-         * Default is the process mode
-         */
-         dirMode?: number
-
-      }): NodeJS.ReadWriteStream;
-}
diff --git a/vinyl-paths/index.d.ts b/vinyl-paths/index.d.ts
new file mode 100644
index 0000000000..26878a2ac6
--- /dev/null
+++ b/vinyl-paths/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for vinyl-paths
+// Project: https://github.com/sindresorhus/vinyl-paths
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+declare namespace paths {
+    interface Paths extends NodeJS.ReadWriteStream {
+        paths: string[];
+    }
+
+    interface PathsStatic {
+        /**
+         * Use the file paths from a gulp pipeline in vanilla node module
+         * @param callback The optionally supplied callback will get a file path for every file and is expected
+         * to call the callback when done. An array of the file paths so far is available as a paths property
+         * on the stream.
+         */
+        (callback?: Callback): Paths;
+    }
+
+    interface Callback {
+        //TODO: Function is gulp.ITaskCallback, which is currently invisible
+        (path: string, callback: Function): any;
+    }
+}
+
+declare var paths: paths.PathsStatic;
+export = paths;
diff --git a/vinyl-paths/tsconfig.json b/vinyl-paths/tsconfig.json
new file mode 100644
index 0000000000..9bcbb4dc66
--- /dev/null
+++ b/vinyl-paths/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "vinyl-paths-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/vinyl-paths/vinyl-paths-tests.ts b/vinyl-paths/vinyl-paths-tests.ts
index e369dcb645..30e6a1c874 100644
--- a/vinyl-paths/vinyl-paths-tests.ts
+++ b/vinyl-paths/vinyl-paths-tests.ts
@@ -1,7 +1,3 @@
-/// <reference path="../gulp/gulp.d.ts" />
-/// <reference path="../del/del.d.ts" />
-/// <reference path="vinyl-paths.d.ts" />
-
 import gulp = require('gulp');
 import del = require('del');
 import paths = require('vinyl-paths');
diff --git a/vinyl-paths/vinyl-paths.d.ts b/vinyl-paths/vinyl-paths.d.ts
deleted file mode 100644
index 15730cbd33..0000000000
--- a/vinyl-paths/vinyl-paths.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// Type definitions for vinyl-paths
-// Project: https://github.com/sindresorhus/vinyl-paths
-// Definitions by: Qubo <https://github.com/tkQubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "vinyl-paths" {
-
-    namespace paths {
-        interface Paths extends NodeJS.ReadWriteStream {
-            paths: string[];
-        }
-
-        interface PathsStatic {
-            /**
-             * Use the file paths from a gulp pipeline in vanilla node module
-             * @param callback The optionally supplied callback will get a file path for every file and is expected
-             * to call the callback when done. An array of the file paths so far is available as a paths property
-             * on the stream.
-             */
-            (callback?: Callback): Paths;
-        }
-
-        interface Callback {
-            //TODO: Function is gulp.ITaskCallback, which is currently invisible
-            (path: string, callback: Function): any;
-        }
-    }
-
-    var paths: paths.PathsStatic;
-    export = paths;
-}
-
diff --git a/vinyl-source-stream/index.d.ts b/vinyl-source-stream/index.d.ts
new file mode 100644
index 0000000000..0d29f36831
--- /dev/null
+++ b/vinyl-source-stream/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for vinyl-source-stream
+// Project: https://github.com/hughsk/vinyl-source-stream
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+
+declare function vinylSourceStream(filename: string): NodeJS.ReadWriteStream;
+declare namespace vinylSourceStream { }
+export = vinylSourceStream;
diff --git a/vinyl-source-stream/tsconfig.json b/vinyl-source-stream/tsconfig.json
new file mode 100644
index 0000000000..69b489ab9d
--- /dev/null
+++ b/vinyl-source-stream/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "vinyl-source-stream-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/vinyl-source-stream/vinyl-source-stream-tests.ts b/vinyl-source-stream/vinyl-source-stream-tests.ts
index 02b902e819..feab418fe2 100644
--- a/vinyl-source-stream/vinyl-source-stream-tests.ts
+++ b/vinyl-source-stream/vinyl-source-stream-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./vinyl-source-stream.d.ts"/>
-/// <reference path="../gulp/gulp.d.ts"/>
 import gulp = require("gulp");
 import vinylSourceStream = require("vinyl-source-stream");
 
diff --git a/vinyl-source-stream/vinyl-source-stream.d.ts b/vinyl-source-stream/vinyl-source-stream.d.ts
deleted file mode 100644
index e8fadee5f5..0000000000
--- a/vinyl-source-stream/vinyl-source-stream.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for vinyl-source-stream
-// Project: https://github.com/hughsk/vinyl-source-stream
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare module "vinyl-source-stream" {
-    function vinylSourceStream(filename: string): NodeJS.ReadWriteStream;
-    namespace vinylSourceStream {}
-    export = vinylSourceStream;
-}
diff --git a/vinyl/index.d.ts b/vinyl/index.d.ts
new file mode 100644
index 0000000000..af72199d5d
--- /dev/null
+++ b/vinyl/index.d.ts
@@ -0,0 +1,150 @@
+// Type definitions for vinyl 1.1.0
+// Project: https://github.com/wearefractal/vinyl
+// Definitions by: vvakame <https://github.com/vvakame/>, jedmao <https://github.com/jedmao>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+import fs = require("fs");
+
+/**
+ * A virtual file format.
+ */
+declare class File {
+    constructor(options?: {
+
+        /**
+        * Default: process.cwd()
+        */
+        cwd?: string;
+
+        /**
+         * Used for relative pathing. Typically where a glob starts.
+         */
+        base?: string;
+
+        /**
+         * Full path to the file.
+         */
+        path?: string;
+
+        /**
+         * Path history. Has no effect if options.path is passed.
+         */
+        history?: string[];
+
+        /**
+         * The result of an fs.stat call. See fs.Stats for more information.
+         */
+        stat?: fs.Stats;
+
+        /**
+         * File contents.
+         * Type: Buffer, Stream, or null
+         */
+        contents?: Buffer | NodeJS.ReadWriteStream;
+    });
+
+    /**
+     * Default: process.cwd()
+     */
+    public cwd: string;
+
+    /**
+     * Used for relative pathing. Typically where a glob starts.
+     */
+    public dirname: string;
+    public basename: string;
+    public base: string;
+
+    /**
+     * Full path to the file.
+     */
+    public path: string;
+    public stat: fs.Stats;
+
+    /**
+     * Gets and sets stem (filename without suffix) for the file path.
+     */
+    public stem: string;
+
+    /**
+     * Gets and sets path.extname for the file path
+     */
+    public extname: string;
+
+    /**
+     * Array of path values the file object has had
+     */
+    public history: string[];
+
+    /**
+     * Type: Buffer|Stream|null (Default: null)
+     */
+    public contents: Buffer | NodeJS.ReadableStream;
+
+    /**
+     * Returns path.relative for the file base and file path.
+     * Example:
+     *  var file = new File({
+     *    cwd: "/",
+     *    base: "/test/",
+     *    path: "/test/file.js"
+     *  });
+     *  console.log(file.relative); // file.js
+     */
+    public relative: string;
+
+    /**
+     * Returns true if file.contents is a Buffer.
+     */
+    public isBuffer(): boolean;
+
+    /**
+     * Returns true if file.contents is a Stream.
+     */
+    public isStream(): boolean;
+
+    /**
+     * Returns true if file.contents is null.
+     */
+    public isNull(): boolean;
+
+    /**
+     * Returns true if this is a directory.
+     */
+    public isDirectory(): boolean;
+
+    /**
+     * Returns a new File object with all attributes cloned. Custom attributes are deep-cloned.
+     */
+    public clone(opts?: { contents?: boolean, deep?: boolean }): File;
+
+    /**
+     * If file.contents is a Buffer, it will write it to the stream.
+     * If file.contents is a Stream, it will pipe it to the stream.
+     * If file.contents is null, it will do nothing.
+     */
+    public pipe<T extends NodeJS.ReadWriteStream>(
+        stream: T,
+        opts?: {
+            /**
+             * If false, the destination stream will not be ended (same as node core).
+             */
+            end?: boolean;
+        }): T;
+
+    /**
+     * Returns a pretty String interpretation of the File. Useful for console.log.
+     */
+    public inspect(): string;
+
+    /**
+     * Checks if a given object is a vinyl file.
+     */
+    public static isVinyl(obj: any): boolean;
+}
+
+export = File;
diff --git a/vinyl/tsconfig.json b/vinyl/tsconfig.json
new file mode 100644
index 0000000000..35fe3af149
--- /dev/null
+++ b/vinyl/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "vinyl-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/vinyl/vinyl-0.4.3.d.ts b/vinyl/vinyl-0.4.3.d.ts
index 507d265a70..993805b24b 100644
--- a/vinyl/vinyl-0.4.3.d.ts
+++ b/vinyl/vinyl-0.4.3.d.ts
@@ -3,106 +3,104 @@
 // Definitions by: vvakame <https://github.com/vvakame/>, jedmao <https://github.com/jedmao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../node/node.d.ts" />
+/// <reference types="node" />
 
-declare module "vinyl" {
 
-	import fs = require("fs");
 
-	/**
-	 * A virtual file format.
-	 */
-	class File {
-		constructor(options?: {
-			/**
-			* Default: process.cwd()
-			*/
-			cwd?: string;
-			/**
-			 * Used for relative pathing. Typically where a glob starts.
-			 */
-			base?: string;
-			/**
-			 * Full path to the file.
-			 */
-			path?: string;
-			/**
-			 * Path history. Has no effect if options.path is passed.
-			 */
-			history?: string[];
-			/**
-			 * The result of an fs.stat call. See fs.Stats for more information.
-			 */
-			stat?: fs.Stats;
-			/**
-			 * File contents.
-			 * Type: Buffer, Stream, or null
-			 */
-			contents?: Buffer | NodeJS.ReadWriteStream;
-		});
+import fs = require("fs");
 
-		/**
-		 * Default: process.cwd()
-		 */
-		public cwd: string;
-		/**
-		 * Used for relative pathing. Typically where a glob starts.
-		 */
-		public base: string;
-		/**
-		 * Full path to the file.
-		 */
-		public path: string;
-		public stat: fs.Stats;
-		/**
-		 * Type: Buffer|Stream|null (Default: null)
-		 */
-		public contents: Buffer | NodeJS.ReadableStream;
-		/**
-		 * Returns path.relative for the file base and file path.
-		 * Example:
-		 *  var file = new File({
-		 *    cwd: "/",
-		 *    base: "/test/",
-		 *    path: "/test/file.js"
-		 *  });
-		 *  console.log(file.relative); // file.js
-		 */
-		public relative: string;
+/**
+ * A virtual file format.
+ */
+declare class File {
+    constructor(options?: {
+        /**
+        * Default: process.cwd()
+        */
+        cwd?: string;
+        /**
+         * Used for relative pathing. Typically where a glob starts.
+         */
+        base?: string;
+        /**
+         * Full path to the file.
+         */
+        path?: string;
+        /**
+         * Path history. Has no effect if options.path is passed.
+         */
+        history?: string[];
+        /**
+         * The result of an fs.stat call. See fs.Stats for more information.
+         */
+        stat?: fs.Stats;
+        /**
+         * File contents.
+         * Type: Buffer, Stream, or null
+         */
+        contents?: Buffer | NodeJS.ReadWriteStream;
+    });
 
-		public isBuffer(): boolean;
+    /**
+     * Default: process.cwd()
+     */
+    public cwd: string;
+    /**
+     * Used for relative pathing. Typically where a glob starts.
+     */
+    public base: string;
+    /**
+     * Full path to the file.
+     */
+    public path: string;
+    public stat: fs.Stats;
+    /**
+     * Type: Buffer|Stream|null (Default: null)
+     */
+    public contents: Buffer | NodeJS.ReadableStream;
+    /**
+     * Returns path.relative for the file base and file path.
+     * Example:
+     *  var file = new File({
+     *    cwd: "/",
+     *    base: "/test/",
+     *    path: "/test/file.js"
+     *  });
+     *  console.log(file.relative); // file.js
+     */
+    public relative: string;
 
-		public isStream(): boolean;
+    public isBuffer(): boolean;
 
-		public isNull(): boolean;
+    public isStream(): boolean;
 
-		public isDirectory(): boolean;
+    public isNull(): boolean;
 
-		/**
-		 * Returns a new File object with all attributes cloned. Custom attributes are deep-cloned.
-		 */
-		public clone(opts?: { contents?: boolean }): File;
+    public isDirectory(): boolean;
 
-		/**
-		 * If file.contents is a Buffer, it will write it to the stream.
-		 * If file.contents is a Stream, it will pipe it to the stream.
-		 * If file.contents is null, it will do nothing.
-		 */
-		public pipe<T extends NodeJS.ReadWriteStream>(
-			stream: T,
-			opts?: {
-				/**
-				 * If false, the destination stream will not be ended (same as node core).
-				 */
-				end?: boolean;
-			}): T;
+    /**
+     * Returns a new File object with all attributes cloned. Custom attributes are deep-cloned.
+     */
+    public clone(opts?: { contents?: boolean }): File;
 
-		/**
-		 * Returns a pretty String interpretation of the File. Useful for console.log.
-		 */
-		public inspect(): string;
-	}
+    /**
+     * If file.contents is a Buffer, it will write it to the stream.
+     * If file.contents is a Stream, it will pipe it to the stream.
+     * If file.contents is null, it will do nothing.
+     */
+    public pipe<T extends NodeJS.ReadWriteStream>(
+        stream: T,
+        opts?: {
+            /**
+             * If false, the destination stream will not be ended (same as node core).
+             */
+            end?: boolean;
+        }): T;
 
-	export = File;
+    /**
+     * Returns a pretty String interpretation of the File. Useful for console.log.
+     */
+    public inspect(): string;
+}
 
-}
\ No newline at end of file
+export = File;
diff --git a/vinyl/vinyl-0.4.3.tests.ts b/vinyl/vinyl-0.4.3.tests.ts
index 22a7d775a1..910b5b7bc7 100644
--- a/vinyl/vinyl-0.4.3.tests.ts
+++ b/vinyl/vinyl-0.4.3.tests.ts
@@ -1,7 +1,7 @@
-/// <reference path="../mocha/mocha.d.ts" />
-/// <reference path="../should/should.d.ts" />
+/// <reference types="mocha" />
+/// <reference types="should" />
+
 
-/// <reference path="./vinyl-0.4.3.d.ts" />
 
 import File = require('vinyl');
 import Stream = require('stream');
diff --git a/vinyl/vinyl-tests.ts b/vinyl/vinyl-tests.ts
index 1d39646b11..1218741f18 100644
--- a/vinyl/vinyl-tests.ts
+++ b/vinyl/vinyl-tests.ts
@@ -1,9 +1,7 @@
-/// <reference path="../mocha/mocha.d.ts" />
-/// <reference path="../should/should.d.ts" />
+/// <reference types="mocha" />
+/// <reference types="should" />
 
-/// <reference path="./vinyl.d.ts" />
-
-import File = require('vinyl');
+import File = require('../vinyl');
 import Stream = require('stream');
 import fs = require('fs');
 
diff --git a/vinyl/vinyl.d.ts b/vinyl/vinyl.d.ts
deleted file mode 100644
index bcee5c6614..0000000000
--- a/vinyl/vinyl.d.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-// Type definitions for vinyl 1.1.0
-// Project: https://github.com/wearefractal/vinyl
-// Definitions by: vvakame <https://github.com/vvakame/>, jedmao <https://github.com/jedmao>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "vinyl" {
-
-	import fs = require("fs");
-
-	/**
-	 * A virtual file format.
-	 */
-	class File {
-		constructor(options?: {
-
-			/**
-			* Default: process.cwd()
-			*/
-			cwd?: string;
-
-			/**
-			 * Used for relative pathing. Typically where a glob starts.
-			 */
-			base?: string;
-
-			/**
-			 * Full path to the file.
-			 */
-			path?: string;
-
-			/**
-			 * Path history. Has no effect if options.path is passed.
-			 */
-			history?: string[];
-
-			/**
-			 * The result of an fs.stat call. See fs.Stats for more information.
-			 */
-			stat?: fs.Stats;
-
-			/**
-			 * File contents.
-			 * Type: Buffer, Stream, or null
-			 */
-			contents?: Buffer | NodeJS.ReadWriteStream;
-		});
-
-		/**
-		 * Default: process.cwd()
-		 */
-		public cwd: string;
-
-		/**
-		 * Used for relative pathing. Typically where a glob starts.
-		 */
-		public dirname: string;
-		public basename: string;
-		public base: string;
-
-		/**
-		 * Full path to the file.
-		 */
-		public path: string;
-		public stat: fs.Stats;
-
-		/**
-		 * Gets and sets stem (filename without suffix) for the file path.
-		 */
-		public stem: string;
-
-		/**
-		 * Gets and sets path.extname for the file path
-		 */
-		public extname: string;
-
-		/**
-		 * Array of path values the file object has had
-		 */
-		public history: string[];
-
-		/**
-		 * Type: Buffer|Stream|null (Default: null)
-		 */
-		public contents: Buffer | NodeJS.ReadableStream;
-
-		/**
-		 * Returns path.relative for the file base and file path.
-		 * Example:
-		 *  var file = new File({
-		 *    cwd: "/",
-		 *    base: "/test/",
-		 *    path: "/test/file.js"
-		 *  });
-		 *  console.log(file.relative); // file.js
-		 */
-		public relative: string;
-
-		/**
-		 * Returns true if file.contents is a Buffer.
-		 */
-		public isBuffer(): boolean;
-
-		/**
-		 * Returns true if file.contents is a Stream.
-		 */
-		public isStream(): boolean;
-
-		/**
-		 * Returns true if file.contents is null.
-		 */
-		public isNull(): boolean;
-
-		/**
-		 * Returns a new File object with all attributes cloned. Custom attributes are deep-cloned.
-		 */
-		public clone(opts?: { contents?: boolean, deep?:boolean }): File;
-
-		/**
-		 * If file.contents is a Buffer, it will write it to the stream.
-		 * If file.contents is a Stream, it will pipe it to the stream.
-		 * If file.contents is null, it will do nothing.
-		 */
-		public pipe<T extends NodeJS.ReadWriteStream>(
-			stream: T,
-			opts?: {
-				/**
-				 * If false, the destination stream will not be ended (same as node core).
-				 */
-				end?: boolean;
-			}): T;
-
-		/**
-		 * Returns a pretty String interpretation of the File. Useful for console.log.
-		 */
-		public inspect(): string;
-
-		/**
-		 * Checks if a given object is a vinyl file.
-		 */
-		public static isVinyl(obj: any): boolean;
-	}
-
-	export = File;
-
-}
diff --git a/virtual-dom/virtual-dom.d.ts b/virtual-dom/index.d.ts
similarity index 100%
rename from virtual-dom/virtual-dom.d.ts
rename to virtual-dom/index.d.ts
diff --git a/virtual-dom/tsconfig.json b/virtual-dom/tsconfig.json
new file mode 100644
index 0000000000..4246b7fa49
--- /dev/null
+++ b/virtual-dom/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "virtual-dom-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/virtual-dom/virtual-dom-tests.ts b/virtual-dom/virtual-dom-tests.ts
index 98d5f16429..f11c7f343f 100644
--- a/virtual-dom/virtual-dom-tests.ts
+++ b/virtual-dom/virtual-dom-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="virtual-dom.d.ts" />
+
 import virtual_dom = require("virtual-dom");
 import VNode = virtual_dom.VNode;
 import h = virtual_dom.h;
diff --git a/vortex-web-client/vortex-web-client.d.ts b/vortex-web-client/index.d.ts
similarity index 100%
rename from vortex-web-client/vortex-web-client.d.ts
rename to vortex-web-client/index.d.ts
diff --git a/vortex-web-client/tsconfig.json b/vortex-web-client/tsconfig.json
new file mode 100644
index 0000000000..ffed9fffab
--- /dev/null
+++ b/vortex-web-client/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "vortex-web-client-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/vortex-web-client/vortex-web-client-tests.ts b/vortex-web-client/vortex-web-client-tests.ts
index bf6f72bbc2..787a4eda7c 100644
--- a/vortex-web-client/vortex-web-client-tests.ts
+++ b/vortex-web-client/vortex-web-client-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="vortex-web-client.d.ts" />
+
 
 var runtime = new dds.runtime.Runtime();
 runtime.connect("ws://localhost:9000", "user:pass");
diff --git a/voximplant-websdk/index.d.ts b/voximplant-websdk/index.d.ts
new file mode 100644
index 0000000000..c292338743
--- /dev/null
+++ b/voximplant-websdk/index.d.ts
@@ -0,0 +1,2036 @@
+// Type definitions for VoxImplant Web SDK 3.0.x
+// Project: http://voximplant.com/
+// Definitions by: Alexey Aylarov <https://github.com/aylarov/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = VoxImplant;
+export as namespace VoxImplant;
+
+declare namespace VoxImplant {
+
+	/**
+	*	VoxImplant.Client general events
+	*/
+	enum Events {
+		AuthResult,
+		ConnectionClosed,
+		ConnectionEstablished,
+		ConnectionFailed,
+		IncomingCall,
+		MicAccessResult,
+		NetStatsReceived,
+		PlaybackFinished,
+		SDKReady,
+		SourcesInfoUpdated
+	}
+
+	/**
+	*	VoxImplant.Client Instant Messaging and Presence events
+	*/
+	enum IMEvents {
+		ChatHistoryReceived,
+		ChatRoomBanList,
+		ChatRoomCreated,
+		ChatRoomError,
+		ChatRoomHistoryReceived,
+		ChatRoomInfo,
+		ChatRoomInvitation,
+		ChatRoomInviteDeclined,
+		ChatRoomMessageModified,
+		ChatRoomMessageNotModified,
+		ChatRoomMessageReceived,
+		ChatRoomMessageRemoved,
+		ChatRoomNewParticipant,
+		ChatRoomOperation,
+		ChatRoomParticipantExit,
+		ChatRoomParticipants,
+		ChatRoomPresenceUpdate,
+		ChatRoomStateUpdate,
+		ChatRoomSubjectChange,
+		ChatRoomsDataReceived,
+		ChatStateUpdate,
+		MessageModified,
+		MessageNotModified,
+		MessageReceived,
+		MessageRemoved,
+		MessageStatus,
+		PresenceUpdate,
+		RosterItemChange,
+		RosterPresenceUpdate,
+		RosterReceived,
+		SubscriptionRequest,
+		SystemError,
+		UCConnected,
+		UCDisconnected
+	}
+
+	/**
+	*	VoxImplant.Call events
+	*/
+	enum CallEvents {
+		Connected,
+		Disconnected,
+		Failed,
+		ICETimeout,
+		InfoReceived,
+		MessageReceived,
+		ProgressToneStart,
+		ProgressToneStop,
+		TransferComplete,
+		TransferFailed
+	}
+
+	namespace Events {
+
+		/**
+		*	Event dispatched after login , loginWithOneTimeKey, requestOneTimeLoginKey or loginWithCode function call
+		*/
+		interface AuthResult {
+			/**
+			*	Auth error code, possible values are: 301 - code for 'code' auth type was sent, 302 - key for 'onetimekey' auth type received, 401 - invalid password, 404 - invalid username, 403 - user account is frozen, 500 - internal error
+			*/
+			code? : number;
+			/**
+			*	Authorized user's display name
+			*/
+			displayName?: string;
+			/**
+			*	This parameter is used to calculate hash parameter for loginWithOneTimeKey method. AuthResult with the key dispatched after requestOneTimeLoginKey method was called
+			*/
+			key?: string;
+			/**
+			*	Application options
+			*/
+			options?: Object;
+			/**
+			*	True in case of successful authorization, false - otherwise
+			*/
+			result: boolean;
+		}
+
+		/**
+		*	Event dispatched if connection to VoxImplant Cloud was closed because of network problems. See connect function
+		*/
+		interface ConnectionClosed {}
+
+		/**
+		*	Event dispatched after connection to VoxImplant Cloud was established successfully. See connect function
+		*/
+		interface ConnectionEstablished {}
+
+		/**
+		*	Event dispatched if connection to VoxImplant Cloud couldn't be established. See connect function
+		*/
+		interface ConnectionFailed {
+			/**
+			*	Failure reason description
+			*/
+			message: string;
+		}
+
+		/**
+		*	Event dispatched when there is a new incoming call to current user
+		*/
+		interface IncomingCall {
+			/**
+			*	Incoming call instance. See VoxImplant.Call for details
+			*/
+			call: Call;
+			/**
+			*	Optional SIP headers received with the message
+			*/
+			headers?: Object;
+		}
+
+		/**
+		*	Event dispatched after user interaction with the mic access dialog.
+		*/
+		interface MicAccessResult {
+			/**
+			*	True is access was allowed, false - otherwise
+			*/
+			result: boolean;
+		}
+
+		/**
+		*	Event dispatched when packet loss data received from VoxImplant servers
+		*/
+		interface NetStatsReceived {
+			/**
+			*	Network info object
+			*/
+			stats: NetworkInfo;
+		}
+
+		/**
+		*	Event dispatched after sound playback was stopped. See playToneScript and stopPlayback functions
+		*/
+		interface PlaybackFinished {}
+
+		/**
+		*	Event dispatched after SDK was successfully initialized after init function call
+		*/
+		interface SDKReady {
+			/**
+			*	SDK version
+			*/
+			version: string;
+		}
+
+		/**
+		*	Event dispatched when audio and video sources information was updated. See audioSources and videoSources for details
+		*/
+		interface SourcesInfoUpdated {}
+
+	}
+
+	namespace CallEvents {
+
+		/**
+		*	Event dispatched after call was connected
+		*/
+		interface Connected {
+			/**
+			*	Call that dispatched the event
+			*/
+			call: Call;
+			/**
+			*	Optional SIP headers received with the message
+			*/
+			headers?: Object;
+		}
+
+		/**
+		*	Event dispatched after call was disconnected
+		*/
+		interface Disconnected {
+			/**
+			*	Call that dispatched the event
+			*/
+			call: Call;
+			/**
+			*	Optional SIP headers received with the message
+			*/
+			headers?: Object;
+		}
+
+		/**
+		*	Event dispatched after if call failed
+		*/
+		interface Failed {
+			/**
+			*	Call that dispatched the event
+			*/
+			call: Call;
+			/**
+			*	Status code of the call (i.e. 486)
+			*/
+			code: number;
+			/**
+			*	Optional SIP headers received with the message
+			*/
+			headers?: Object;
+			/**
+			*	Status message of call failure (i.e. Busy Here)
+			*/
+			reason: string;
+		}
+
+		/**
+		*	Event dispatched in case of network connection problem between 2 peers
+		*/
+		interface ICETimeout {
+			/**
+			*	Call that dispatched the event
+			*/
+			call: Call;
+		}
+
+		/**
+		*	Event dispatched when INFO message is received
+		*/
+		interface InfoReceived {
+			/**
+			*	Content of the message
+			*/
+			body: string;
+			/**
+			*	Call that dispatched the event
+			*/
+			call: Call;
+			/**
+			*	Optional SIP headers received with the message
+			*/
+			headers?: Object;
+			/**
+			*	MIME type of INFO message
+			*/
+			mimeType: string;
+		}
+
+		/**
+		*	Event dispatched when text message is received
+		*/
+		interface MessageReceived {
+			/**
+			*	Call that dispatched the event
+			*/
+			call: Call;
+			/**
+			*	Content of the message
+			*/
+			text: string;
+		}
+
+		/**
+		*	Event dispatched when progress tone playback starts
+		*/
+		interface ProgressToneStart {
+			/**
+			*	Call that dispatched the event
+			*/
+			call: Call;
+		}
+
+		/**
+		*	Event dispatched when progress tone playback stops
+		*/
+		interface ProgressToneStop {
+			/**
+			*	Call that dispatched the event
+			*/
+			call: Call;
+		}
+
+		/**
+		*	Event dispatched when call has been transferred successfully
+		*/
+		interface TransferComplete {
+			/**
+			*	Call that dispatched the event
+			*/
+			call: Call;
+		}
+
+		/**
+		*	Event dispatched when call transfer failed
+		*/
+		interface TransferFailed {
+			/**
+			*	Call that dispatched the event
+			*/
+			call: Call;
+		}
+	}
+
+	namespace IMEvents {
+
+		/**
+		*	Event dispatched when chat history received
+		*/
+		interface ChatHistoryReceived {
+			/**
+			* User id
+			*/
+			id: string;
+			/**
+			* Message id specified in getInstantMessagingHistory method
+			*/
+			message_id: string;
+			/**
+			* List of messages
+			*/
+			messages: IMHistoryMessage[];
+		}
+
+		/**
+		*	Event dispatched when info about banned chat room participants received
+		*/
+		interface ChatRoomBanList {
+			/**
+			* Participants list
+			*/
+			participants: ChatRoomParticipant[];
+			/**
+			* Room id
+			*/
+			room: string;
+		}
+
+		/**
+		* Event dispatched if chat room was created successfully
+		*/
+		interface ChatRoomCreated {
+			/**
+			* Room id
+			*/
+			room: string;
+		}
+
+		/**
+		* Event dispatched in case of error while chat room operation
+		*/
+		interface ChatRoomError {
+			/**
+			* Error code
+			*/
+			code: string;
+			/**
+			* Operation name
+			*/
+			operation: string;
+			/**
+			* Room id
+			*/
+			room: string;
+			/**
+			* Error description
+			*/
+			text: string;
+		}
+
+		/**
+		*	Event dispatched when chat room history received
+		*/
+		interface ChatRoomHistoryReceived {
+			/**
+			* Message id specified in getInstantMessagingHistory method
+			*/
+			message_id: string;
+			/**
+			* List of messages
+			*/
+			messages: VoxImplant.IMHistoryMessage[];
+			/**
+			* Room id
+			*/
+			room: string;
+		}
+
+		/**
+		*	Event dispatched when user joins chat room
+		*/
+		interface ChatRoomInfo {
+			/**
+			* Room features
+			*/
+			features: number;
+			/**
+			* Room info object
+			*/
+			info: ChatRoomInfo;
+			/**
+			* Room id
+			*/
+			room: string;
+			/**
+			* Room name
+			*/
+			room_name: string;
+		}
+
+		/**
+		*	Event dispatched when invitation to chat room received
+		*/
+		interface ChatRoomInvitation {
+			/**
+			* The body of the message
+			*/
+			body: string;
+			/**
+			* User id (inviter)
+			*/
+			from: string;
+			/**
+			* Password for the room
+			*/
+			password: string;
+			/**
+			* A reason of the invitation
+			*/
+			reason: string;
+			/**
+			* Room id
+			*/
+			room: string;
+		}
+
+		/**
+		*	Event dispatched if an invitation to chat room was declined by the invitee
+		*/
+		interface ChatRoomInviteDeclined {
+			/**
+			* User id (invitee)
+			*/
+			invitee: string;
+			/**
+			* A reason of the invitation
+			*/
+			reason: string;
+			/**
+			* Room id
+			*/
+			room: string;
+		}
+
+		/**
+		*	Event dispatched when chat room message modified
+		*/
+		interface ChatRoomMessageModified {
+			/**
+			* New message content
+			*/
+			content: string;
+			/**
+			* User id
+			*/
+			from: string;
+			/**
+			* Modified message id
+			*/
+			message_id: string;
+			/**
+			* Private/public message flag
+			*/
+			private_message: string;
+			/**
+			* Resource name
+			*/
+			resource: string;
+			/**
+			* Room id
+			*/
+			room: string;
+			/**
+			* Message timestamp
+			*/
+			timestamp: string;
+		}
+
+		/**
+		*	Event dispatched in case of error during chat room message modification
+		*/
+		interface ChatRoomMessageNotModified {
+			/**
+			* Error code
+			*/
+			code: number;
+			/**
+			* Message id
+			*/
+			message_id: string;
+			/**
+			* Private/public message flag
+			*/
+			private_message: string;
+			/**
+			* Room id
+			*/
+			room: string;
+		}
+
+		/**
+		*	Event dispatched when instant message was sent to chat room
+		*/
+		interface ChatRoomMessageReceived {
+			/**
+			* Message content
+			*/
+			content: string;
+			/**
+			* User id
+			*/
+			from: string;
+			/**
+			* Modified message id
+			*/
+			message_id: string;
+			/**
+			* Private/public message flag
+			*/
+			private_message: string;
+			/**
+			* Resource name
+			*/
+			resource: string;
+			/**
+			* Room id
+			*/
+			room: string;
+			/**
+			* Message timestamp
+			*/
+			timestamp: string;
+		}
+
+		/**
+		*	Event dispatched when chat room message removed
+		*/
+		interface ChatRoomMessageRemoved {
+			/**
+			* User id
+			*/
+			from: string;
+			/**
+			* Modified message id
+			*/
+			message_id: string;
+			/**
+			* Private/public message flag
+			*/
+			private_message: string;
+			/**
+			* Resource name
+			*/
+			resource: string;
+			/**
+			* Room id
+			*/
+			room: string;
+			/**
+			* Message timestamp
+			*/
+			timestamp: string;
+		}
+
+		/**
+		*	Event dispatched when new participant joined the chat room
+		*/
+		interface ChatRoomNewParticipant {
+			/**
+			* User display name
+			*/
+			displayName: string;
+			/**
+			* User id
+			*/
+			participant: string;
+			/**
+			* Room id
+			*/
+			room: string;
+		}
+
+		/**
+		*	Event dispatched when chat room participant was banned/unbanned
+		*/
+		interface ChatRoomOperation {
+			/**
+			* Room id
+			*/
+			room: string;
+			/**
+			* Operation type
+			*/
+			operation: ChatRoomOperationType;
+			/**
+			* Operation result: true/false - success/failure
+			*/
+			result: boolean;
+		}
+
+		/**
+		*	Event dispatched when participant left the chat room
+		*/
+		interface ChatRoomParticipantExit {
+			/**
+			* User id
+			*/
+			participant: string;
+			/**
+			* Room id
+			*/
+			room: string;
+		}
+
+		/**
+		*	Event dispatched when info about chat room participants received
+		*/
+		interface ChatRoomParticipants {
+			/**
+			* Participants list
+			*/
+			participants: ChatRoomParticipant[];
+			/**
+			* Room id
+			*/
+			room: string;
+		}
+
+		/**
+		*	Event dispatched if chat room participant presence status was updated
+		*/
+		interface ChatRoomPresenceUpdate {
+			/**
+			* Optional presence message
+			*/
+			message: string;
+			/**
+			* Participant info
+			*/
+			participant: ParticipantInfo;
+			/**
+			* Current presence status
+			*/
+			presence: UserStatuses;
+			/**
+			* Room id
+			*/
+			room: string;
+		}
+
+		/**
+		*	Event dispatched when chat session state updated
+		*/
+		interface ChatRoomStateUpdate {
+			/**
+			* User id
+			*/
+			from: string;
+			/**
+			* Resource name
+			*/
+			resource: string;
+			/**
+			* Room id
+			*/
+			room: string;
+			/**
+			* Current chat session state
+			*/
+			state: ChatStateType;
+		}
+
+		/**
+		*	Event dispatched if chat room subject was changed
+		*/
+		interface ChatRoomSubjectChange {
+			/**
+			* User id who changed the subject
+			*/
+			id: string;
+			/**
+			* Resource name
+			*/
+			resource: string;
+			/**
+			* Room id
+			*/
+			room: string;
+			/**
+			* New subject
+			*/
+			subject: string;
+		}
+
+		/**
+		*	Event dispatched when information about chat rooms where user participates received
+		*/
+		interface ChatRoomsDataReceived {
+			/**
+			* Rooms list
+			*/
+			rooms: ChatRoom[];
+		}
+
+		/**
+		*	Event dispatched when chat session state updated
+		*/
+		interface ChatStateUpdate {
+			/**
+			*	User id
+			*/
+			id: string;
+			/**
+			*	Resource name
+			*/
+			resource?: string;
+			/**
+			*	Current chat session state. See VoxImplant.ChatStateType enum
+			*/
+			state: ChatStateType;
+		}
+
+		/**
+		*	Event dispatched when instant message was modified by user
+		*/
+		interface MessageModified {
+			/**
+			*	Message new content
+			*/
+			content: string;
+			/**
+			*	User id (of the user who sent the message)
+			*/
+			id: string;
+			/**
+			*	Message id
+			*/
+			message_id: string;
+			/**
+			*	User id (of the user to whom the message was sent)
+			*/
+			to: string;
+		}
+
+		/**
+		*	Event dispatched if error happened during instant message modification
+		*/
+		interface MessageNotModified {
+			/**
+			*	Message new content
+			*/
+			code: number;
+			/**
+			*	Message id
+			*/
+			message_id: string;
+			/**
+			*	User id (of the user to whom the message was sent)
+			*/
+			to: string;
+		}
+
+		/**
+		*	Event dispatched when instant message received
+		*/
+		interface MessageReceived {
+			/**
+			*	Message content
+			*/
+			content: string;
+			/**
+			*	User id (of the user who sent the message)
+			*/
+			id: string;
+			/**
+			*	Message id
+			*/
+			message_id: string;
+			/**
+			*	Resource name
+			*/
+			resource?: string;
+			/**
+			*	User id (of the user to whom the message was sent)
+			*/
+			to: string;
+		}
+
+		/**
+		*	Event dispatched when instant message was removed by user
+		*/
+		interface MessageRemoved {
+			/**
+			*	User id (of the user who sent the message)
+			*/
+			id: string;
+			/**
+			*	Message id
+			*/
+			message_id: string;
+			/**
+			*	User id (of the user to whom the message was sent)
+			*/
+			to: string;
+		}
+
+		/**
+		*	Event dispatched when sent message status changed
+		*/
+		interface MessageStatus {
+			/**
+			*	User id
+			*/
+			id: string;
+			/**
+			*	Message id
+			*/
+			message_id: string;
+			/**
+			*	Resource name
+			*/
+			resource?: string;
+			/**
+			*	Message event type. See VoxImplant.MessageEventType enum
+			*/
+			type: MessageEventType;
+		}
+
+		/**
+		*	Event dispatched when self presence updated
+		*/
+		interface PresenceUpdate {
+			/**
+			* User id
+			*/
+			id: string;
+			/**
+			*	Status message
+			*/
+			message: string;
+			/**
+			*	Current presence status
+			*/
+			presence: UserStatuses;
+			/**
+			*	Resource name
+			*/
+			resource?: string;
+		}
+
+		/**
+		*	Event dispatched when roster item changed
+		*/
+		interface RosterItemChange {
+			/**
+			*	User display name
+			*/
+			displayName: string;
+			/**
+			*	Roster item groups
+			*/
+			groups: string[];
+			/**
+			*	User id
+			*/
+			id: string;
+			/**
+			*	Resource name
+			*/
+			resource?: string;
+			/**
+			*	Roster item event type. See VoxImplant.RosterItemEvent enum
+			*/
+			type: RosterItemEvent;
+		}
+
+		/**
+		*	Event dispatched when roster item presence update happened
+		*/
+		interface RosterPresenceUpdate {
+			/**
+			*	User id
+			*/
+			id: string;
+			/**
+			*	Status message
+			*/
+			message?: string;
+			/**
+			*	Current presence status
+			*/
+			presence: UserStatuses;
+			/**
+			*	Resource name
+			*/
+			resource?: string;
+		}
+
+		/**
+		*	Event dispatched when roster data received
+		*/
+		interface RosterReceived {
+			/**
+			*	User id
+			*/
+			id: string;
+			/**
+			*	Array contains VoxImplant.RosterItem elements
+			*/
+			roster: RosterItem[];
+		}
+
+		/**
+		*	Event dispatched when some user tries to add current user into his roster. Current user can confirm or reject the subscription, then VoxImplant.IMEvents.RosterItemChange will be dispatched on for user that made the request
+		*/
+		interface SubscriptionRequest {
+			/**
+			*	User id
+			*/
+			id: string;
+			/**
+			*	Optional message
+			*/
+			message?: string;
+			/**
+			*	Resource name
+			*/
+			resource?: string;
+			/**
+			*	Message event type. See VoxImplant.SubscriptionRequestType enum
+			*/
+			type: SubscriptionRequestType;
+		}
+
+		/**
+		*	Event dispatched in case of instant messaging subsystem error
+		*/
+		interface SystemError {
+			/**
+			*	Error data object, contains the error details
+			*/
+			errorData: Object;
+			/**
+			*	Error type
+			*/
+			errorType: IMErrorType;
+		}
+
+		/**
+		*	Event dispatched when instant messaging and presence subsystems (UC) are online
+		*/
+		interface UCConnected {}
+
+		/**
+		*	Event dispatched when instant messaging and presence subsystems (UC) are offline
+		*/
+		interface UCDisconnected { }
+
+	}
+
+	type VoxImplantEvent = Events.AuthResult | Events.ConnectionClosed | Events.ConnectionEstablished |
+		Events.ConnectionFailed | Events.IncomingCall | Events.MicAccessResult |
+		Events.NetStatsReceived | Events.PlaybackFinished | Events.SDKReady | Events.SourcesInfoUpdated;
+
+
+	type VoxImplantCallEvent = CallEvents.Connected | CallEvents.Disconnected | CallEvents.Failed |
+		CallEvents.InfoReceived | CallEvents.MessageReceived | CallEvents.ProgressToneStart |
+		CallEvents.ProgressToneStop | CallEvents.TransferComplete | CallEvents.TransferFailed;
+
+	type VoxImplantIMEvent = IMEvents.ChatHistoryReceived | IMEvents.ChatRoomBanList |
+		IMEvents.ChatRoomCreated | IMEvents.ChatRoomError | IMEvents.ChatRoomHistoryReceived |
+		IMEvents.ChatRoomInfo | IMEvents.ChatRoomInvitation | IMEvents.ChatRoomInviteDeclined |
+		IMEvents.ChatRoomMessageModified | IMEvents.ChatRoomMessageNotModified | IMEvents.ChatRoomMessageReceived |
+		IMEvents.ChatRoomMessageRemoved | IMEvents.ChatRoomNewParticipant | IMEvents.ChatRoomOperation |
+		IMEvents.ChatRoomParticipantExit | IMEvents.ChatRoomParticipants | IMEvents.ChatRoomPresenceUpdate |
+		IMEvents.ChatRoomStateUpdate | IMEvents.ChatRoomSubjectChange | IMEvents.ChatRoomsDataReceived |
+		IMEvents.ChatStateUpdate | IMEvents.MessageModified | IMEvents.MessageNotModified |
+		IMEvents.MessageReceived | IMEvents.MessageRemoved | IMEvents.MessageStatus |
+		IMEvents.PresenceUpdate | IMEvents.RosterItemChange | IMEvents.RosterPresenceUpdate |
+		IMEvents.RosterReceived | IMEvents.SubscriptionRequest | IMEvents.SystemError |
+		IMEvents.UCConnected | IMEvents.UCDisconnected;
+
+	/**
+	*	VoxImplant SDK Configuration
+	*/
+	interface Config {
+		/**
+		*	XSS protection for inbound instant messages that can contain HTML content
+		*/
+		imXSSprotection?: boolean;
+		/**
+		*	If set to true microphone access dialog will be shown and all functions will become available only after user allowed access
+		*/
+		micRequired?: boolean;
+		/**
+		*	Automatically plays progress tone by means of SDK according to specified progressToneCountry
+		*/
+		progressTone?: boolean;
+		/**
+		*	Country code for progress tone generated automatically if progressTone set to true
+		*/
+		progressToneCountry?: string;
+		/**
+		*	Show debug info in console
+		*/
+		showDebugInfo?: boolean;
+		/**
+		*	Show Flash Settings panel instead of standard Allow/Deny dialog (in Flash mode)
+		*/
+		showFlashSettings?: boolean;
+		/**
+		*	Id of HTMLElement that will be used as container for Flash component of SDK (Mic/cam access dialog will appear in the container). If micRequired set to true element should have size not less than 215x138 (px) for access dialog to be shown
+		*/
+		swfContainer?: string;
+		/**
+		*	Force VoxImplant to use Flash (WebRTC is used if available by default)
+		*/
+		useFlashOnly?: boolean;
+		/**
+		*	Force VoxImplant to use WebRTC (WebRTC is used if available by default). Error will be thrown if WebRTC in unavailable
+		*/
+		useRTCOnly?: boolean;
+		/**
+		*	Default constraints that will be applied while the next attachRecordingDevice function call or if micRequired set to true
+		*/
+		videoConstraints?: VideoSettings | boolean;
+		/**
+		*	Video support
+		*/
+		videoSupport?: boolean;
+	}
+
+	/**
+	*	VoxImplant login options
+	*/
+	interface LoginOptions {
+		/**
+		*	If set to false Web SDK can be used only for ACD status management
+		*/
+		receiveCalls?: boolean;
+		/**
+		*	If set to true user presence will be changed automatically while a call
+		*/
+		serverPresenceControl?: boolean;
+	}
+
+	/**
+	*	Audio playback device info
+	*/
+	interface AudioOutputInfo {
+		/**
+		*	Device id that can be used to choose audio playback device
+		*/
+		id: number | string;
+		/**
+		*	Device name , in WebRTC mode populated with real data only when app has been opened using HTTPS protocol
+		*/
+		name: string;
+	}
+
+	/**
+	*	Audio recording device info
+	*/
+	interface AudioSourceInfo {
+		/**
+		*	Device id that can be used to choose audio recording device
+		*/
+		id: number | string;
+		/**
+		*	Device name , in WebRTC mode populated with real data only when app has been opened using HTTPS protocol
+		*/
+		name: string;
+	}
+
+	/**
+	*	Video recording device info
+	*/
+	interface VideoSourceInfo {
+		/**
+		*	Device id that can be used to choose video recording device
+		*/
+		id: number | string;
+		/**
+		*	Device name , in WebRTC mode populated with real data only when app has been opened using HTTPS protocol
+		*/
+		name: string;
+	}
+
+	enum ChatStateType {
+		/**
+		*	User is actively participating in the chat session
+		*/
+		Active,
+		/**
+		*	User is composing a message
+		*/
+		Composing,
+		/**
+		*	User has effectively ended their participation in the chat session
+		*/
+		Gone,
+		/**
+		*	User has not been actively participating in the chat session
+		*/
+		Inactive,
+		/**
+		*	Invalid type
+		*/
+		Invalid,
+		/**
+		*	User had been composing but now has stopped
+		*/
+		Paused
+	}
+
+	enum IMErrorType {
+		RemoteFunctionError,
+		Error,
+		RosterError
+	}
+
+	enum MessageEventType {
+		/**
+		*	Cancels the 'Composing' event
+		*/
+		Cancel,
+		/**
+		*	Indicates that a reply is being composed
+		*/
+		Composing,
+		/**
+		*	Indicates that the message has been delivered to the recipient
+		*/
+		Delivered,
+		/**
+		*	Indicates that the message has been displayed
+		*/
+		Displayed,
+		/**
+		*	Invalid type
+		*/
+		Invalid,
+		/**
+		*	Indicates that the message has been stored offline by the intended recipient's server
+		*/
+		Offline
+	}
+
+	enum OperatorACDStatuses {
+		AfterService,
+		DND,
+		InService,
+		Offline,
+		Online,
+		Ready,
+		Timeout
+	}
+
+	enum RosterItemEvent {
+		/**
+		*	Roster item added
+		*/
+		Added,
+		/**
+		*	Roster item removed
+		*/
+		Removed,
+		/**
+		*	User subscribed on your status updates (authorized the request)
+		*/
+		Subscribed,
+		/**
+		*	User unsubscribed from your status updates (didn't authorize the request)
+		*/
+		Unsubscribed,
+		/**
+		*	Roster item updated
+		*/
+		Updated
+	}
+
+	enum SubscriptionRequestType {
+		/**
+		*	User is asking for permission to add you into his roster
+		*/
+		Subscribe,
+		/**
+		*	User removed you from his roster
+		*/
+		Unsubscribe
+	}
+
+	enum UserStatuses {
+		/**
+		*	User is away
+		*/
+		Away,
+		/**
+		*	User is available for chat
+		*/
+		Chat,
+		/**
+		*	User is in DND state (Do Not Disturbed)
+		*/
+		DND,
+		/**
+		*	User is offline
+		*/
+		Offline,
+		/**
+		*	User is online
+		*/
+		Online,
+		/**
+		*	User is in XA state (eXtended Away)
+		*/
+		XA
+	}
+
+	enum ChatRoomOperationType {
+		/**
+		* Ban operation
+		*/
+		Ban,
+		/**
+		* Unban operation
+		*/
+		Unban
+	}
+
+	/**
+	*	Chat room
+	*/
+	interface ChatRoom {
+		/**
+		* Chat room id
+		*/
+		id: string;
+		/**
+		* Chat room password
+		*/
+		pass: string;
+	}
+
+	/**
+	*	Chat room info
+	*/
+	interface ChatRoomInfo {
+		/**
+		* Creation date
+		*/
+		creationdate: string;
+		/**
+		* Room description
+		*/
+		description: string;
+		/**
+		* Number of chat room participants
+		*/
+		occupants: number;
+		/**
+		* Room's name / subject
+		*/
+		subject: string;
+	}
+
+	/**
+	*	Chat room participant
+	*/
+	interface ChatRoomParticipant {
+		/**
+		* User id
+		*/
+		id: string;
+		/**
+		* User display name
+		*/
+		name: string;
+		/**
+		* True if the user is owner/admin of the room
+		*/
+		owner?: boolean;
+	}
+
+	/**
+	*	Message received from history
+	*/
+	interface IMHistoryMessage {
+		/**
+		* Message body
+		*/
+		body: string;
+		/**
+		* User id - author of the message
+		*/
+		from: string;
+		/**
+		* Message id
+		*/
+		id: string;
+		/**
+		* Message creation time
+		*/
+		time: string;
+	}
+
+	/**
+	*	Participant info
+	*/
+	interface ParticipantInfo {
+		/**
+		* The participant's affiliation with the room
+		*/
+		affiliation: number;
+		/**
+		* Indicate conditions like: user has been kicked or banned from the room
+		*/
+		flags: number;
+		/**
+		* User id
+		*/
+		id: string;
+		/**
+		* Reason
+		*/
+		reason: string;
+		/**
+		* Resource name
+		*/
+		resource: string;
+		/**
+		* The participant's role with the room
+		*/
+		role: number;
+	}
+
+	/**
+	*	Client class used to control platform functions. Can't be instantiatied directly (singleton), please use VoxImplant.getInstance to get the class instance
+	*/
+	interface Client {
+		/**
+		*	Register handler for specified event
+		*
+		*	@param eventName Event name
+		*	@param eventHandler Handler function. A single parameter is passed - object with the event information
+		*/
+		addEventListener(eventName: VoxImplant.Events | VoxImplant.IMEvents, eventHandler: (eventObject: VoxImplantEvent | VoxImplantIMEvent) => any): void;
+		/**
+		*	Add roster item (IM)
+		*
+		*	@param user_id User id
+		*	@param name Display name
+		*	@param group User group
+		*/
+		addRosterItem(user_id: string, name: string, group?: string): void;
+		/**
+		*	Add roster item group (IM)
+		*
+		*	@param user_id User id
+		*	@param group Group name
+		*/
+		addRosterItemGroup(user_id: string, group: string): void;
+		/**
+		*	Enable microphone/camera if micRequired in VoxImplant.Config was set to false (WebRTC mode only)
+		*
+		*	@param successCallback A function called in case of successful audio recording device change
+		*	@param failedCallback A function called in case of problems while changing audio recording device
+		*/
+		attachRecordingDevice(successCallback?: () => any, failedCallback?: () => any): void;
+		/**
+		*	Get a list of all currently available audio playback devices
+		*/
+		audioOutputs(): AudioOutputInfo[];
+		/**
+		*	Get a list of all currently available audio sources / microphones
+		*/
+		audioSources(): AudioSourceInfo[];
+		/**
+		*	Ban user from the chat room
+		*
+		*	@param room Room id
+		*	@param user_id User id
+		*	@param reason Ban reason
+		*/
+		banChatRoomUser(room: string, user_id: string, reason?: string): void;
+		/**
+		*	Create call
+		*
+		*	@param number The number to call
+		*	@param useVideo Tells if video should be supported for the call
+		*	@param customData Custom string associated with the call session. It can be later obtained from Call History using HTTP API
+		*	@param extraHeaders Optional custom parameters (SIP headers) that should be passed with call (INVITE) message. Parameter names must start with "X-" to be processed by application. IMPORTANT: Headers size limit is 200 bytes
+		*/
+		call(number: string, useVideo?: boolean, customData?: string, extraHeaders?: Object): Call;
+		/**
+		*	Get current config
+		*/
+		config(): Config;
+		/**
+		*	Connect to VoxImplant Cloud
+		*/
+		connect(): void;
+		/**
+		*	Check if connected to VoxImplant Cloud
+		*/
+		connected(): boolean;
+		/**
+		*	Create multi-user chat room and join it
+		*
+		*	@param pass Password for room access
+		*	@param users User ids of the invited users to the chat room
+		*/
+		createChatRoom(pass?: string, users?: string[]): string;
+		/**
+		*	Decline invitation to join chat room
+		*
+		*	@param room Room id
+		*	@param user_id User id (inviter)
+		*	@param reason User-supplied decline reason
+		*/
+		declineChatRoomInvite(room: string, user_id: string, reason?: string): void;
+		/**
+		*	Disable microphone/camera if micRequired in VoxImplant.Config was set to false (WebRTC mode only)
+		*/
+		detachRecordingDevice(): void;
+		/**
+		*	Disconnect from VoxImplant Cloud
+		*/
+		disconnect(): void;
+		/**
+		*	Edit message in the chat room
+		*
+		*	@param room Room id
+		*	@param message_id Message id
+		*	@param msg New message content
+		*/
+		editChatRoomMessage(room: string, message_id: string, msg: string): void;
+		/**
+		*	Edit message sent to user
+		*
+		*	@param room Room id
+		*	@param message_id Message id
+		*	@param msg New message content
+		*/
+		editInstantMessage(room: string, message_id: string, msg: string): void;
+		/**
+		*	Get chat room history
+		*
+		*	@param room Room id
+		*	@param message_id Message id (to get messages sent before/after the message)
+		*	@param direction False/true to get messages older/newer than the message with specified id
+		*	@param count Number of messages
+		*/
+		getChatRoomHistory(room: string, message_id?: string, direction?: boolean, count?: number): void;
+		/**
+		*	Get messages in a conversation with particular use
+		*
+		*	@param user_id User id
+		*	@param message_id Message id (to get messages sent before/after the message)
+		*	@param direction False/true to get messages older/newer than the message with specified id
+		*	@param count Number of messages
+		*/
+		getInstantMessagingHistory(user_id: string, message_id?: string, direction?: boolean, count?: number): void;
+		/**
+		*	Initialize SDK. SDKReady event will be dispatched after succesful SDK initialization. SDK can't be used until it's initialized
+		*
+		*	@param config Client configuration options
+		*/
+		init(config?: Config): void;
+		/**
+		*	Invite user to join chat room
+		*
+		*	@param room Room id
+		*	@param user_id User id (invitee)
+		*	@param reason User-supplied reason for the invitation
+		*/
+		inviteToChatRoom(room: string, user_id: string, reason?: string): void;
+		/**
+		*	Check if WebRTC support is available
+		*/
+		isRTCsupported(): boolean;
+		/**
+		*	Join multi-user chat room
+		*
+		*	@param room Room id
+		*	@param pass Password for room access
+		*/
+		joinChatRoom(room: string, pass?: string): void;
+		/**
+		*	Leave multi-user chat room
+		*
+		*	@param room Room id
+		*	@param msg Message for other participants
+		*/
+		leaveChatRoom(room: string, msg?: string): void;
+		/**
+		*	Login into application
+		*
+		*	@param username
+		*	@param password
+		*	@param options Login options
+		*/
+		login(username: string, password: string, options?: LoginOptions): void;
+		/**
+		*	Login into application using 'code' auth method
+		*
+		*	@param username
+		*	@param code
+		*	@param options Login options
+		*/
+		loginWithCode(username: string, code: string, options?: LoginOptions): void;
+		/**
+		*	Login into application using 'onetimekey' auth method
+		*
+		*	@param username
+		*	@param hash
+		*	@param options Login options
+		*/
+		loginWithOneTimeKey(username: string, hash: string, options?: LoginOptions): void;
+		/**
+		*	Move roster item group (IM)
+		*
+		*	@param user_id User id
+		*	@param groupSrc Group name (source)
+		*	@param groupDst Group name (destination)
+		*/
+		moveRosterItemGroup(user_id: string, groupSrc: string, groupDst: string): void;
+		/**
+		*	Play ToneScript using WebAudio API
+		*
+		*	@param script Tonescript string
+		*	@param loop Loop playback if true
+		*/
+		playToneScript(script: string, loop?: boolean): void;
+		/**
+		*	Remove message in the chat room
+		*
+		*	@param room Room id
+		*	@param message_id Message id
+		*/
+		removeChatRoomMessage(room: string, message_id: string): void;
+		/**
+		*	Remove user from the chat room
+		*
+		*	@param room Room id
+		*	@param user_id User id
+		*	@param reason Reason
+		*/
+		removeChatRoomUser(room: string, user_id: string, reason?: string): void;
+		/**
+		*	Remove handler for specified event
+		*
+		*	@param eventName Event name
+		*	@param eventHandler Handler function
+		*/
+		removeEventListener(eventName: VoxImplant.Events | VoxImplant.IMEvents, eventHandler: () => any): void;
+		/**
+		*	Remove message sent to user
+		*
+		*	@param user_id User id
+		*	@param message_id Message id
+		*/
+		removeInstantMessage(user_id: string, message_id: string): void;
+		/**
+		*	Remove roster item (IM)
+		*
+		*	@param user_id User id
+		*/
+		removeRosterItem(user_id: string): void;
+		/**
+		*	Remove roster item group (IM)
+		*
+		*	@param user_id User id
+		*	@param group Group name
+		*/
+		remoteRosterItemGroup(user_id: string, group: string): void;
+		/**
+		*	Rename roster item (IM)
+		*
+		*	@param user_id User id
+		*	@param name New display name
+		*/
+		renameRosterItem(user_id: string, name: string): void;
+		/**
+		*	Request a key for 'onetimekey' auth method. Server will send the key in AuthResult event with code 302
+		*
+		*	@param username
+		*/
+		requestOneTimeLoginKey(username: string): void;
+		/**
+		*	Send message to chat room
+		*
+		*	@param room Room id
+		*	@param msg Message for other participants
+		*/
+		sendChatRoomMessage(room: string, msg: string): string;
+		/**
+		*	Send message to user (IM)
+		*
+		*	@param user_id User id
+		*	@param content Message content
+		*/
+		sendInstantMessage(user_id: string, content: string): string;
+		/**
+		*	Start/stop sending local video to remote party/parties
+		*
+		*	@param flag Start/stop - true/false
+		*/
+		sendVideo(flag: boolean): void;
+		/**
+		*	Set active call
+		*
+		*	@param call VoxImplant call instance
+		*	@param active If true make call active, otherwise make call inactive
+		*/
+		setCallActive(call: Call, active: boolean): void;
+		/**
+		*	Set chat room session state info
+		*
+		*	@param room Room id
+		*	@param status Chat session status
+		*/
+		setChatRoomState(room: string, status: ChatStateType): void;
+		/**
+		*	Set new chat room subject
+		*
+		*	@param room Room id
+		*	@param subject New subject
+		*/
+		setChatRoomSubject(room: string, subject: string): void;
+		/**
+		*	Set chat session state info
+		*
+		*	@param user_id User id
+		*	@param status Chat session status. See VoxImplant.ChatStateType enum
+		*/
+		setChatState(user_id: string, status: ChatStateType): void;
+		/**
+		*	Set local video position
+		*
+		*	@param x Horizontal position (px)
+		*	@param y Vertical position (px)
+		*/
+		setLocalVideoPosition(x: number, y: number): void;
+		/**
+		*	Set local video size
+		*
+		*	@param width Width in pixels
+		*	@param height Height in pixels
+		*/
+		setLocalVideoSize(width: number, height: number): void;
+		/**
+		*	Set local video size
+		*
+		*	@param user_id User id
+		*	@param type Message event type: VoxImplant.MessageEventType.Delivered or VoxImplant.MessageEventType.Displayed. See VoxImplant.MessageEventType enum
+		*	@param message_id Message id(s)
+		*/
+		setMessageStatus(user_id: string, type: MessageEventType, message_id: string[]): void;
+		/**
+		*	Set ACD status
+		*
+		*	@param status Presence status string, see VoxImplant.OperatorACDStatuses
+		*/
+		setOperatorACDStatus(status: OperatorACDStatuses): void;
+		/**
+		*	Set presence
+		*
+		*	@param status Presence status from VoxImplant.UserStatuses
+		*	@param msg Presence text message
+		*/
+		setPresenceStatus(status: UserStatuses, msg: string): void;
+		/**
+		*	Set background color of flash app (only for Flash mode)
+		*
+		*	@param color Color in web format (i.e. #000000 for black)
+		*/
+		setSwfColor(color: string): void;
+		/**
+		*	Set bandwidth limit for video calls. Currently supported by Chrome/Chromium. The limit will be applied for the next call. (WebRTC mode only)
+		*
+		*	@param bandwidth Bandwidth limit in kilobits per second (kbps)
+		*/
+		setVideoBandwidth(bandwidth: number): void;
+		/**
+		*	Set video settings globally. This settings will be used for the next call.
+		*
+		*	@param settings Video settings
+		*	@param successCallback Success callback function
+		*	@param failedCallback Failed callback function
+		*/
+		setVideoSettings(settings: VideoSettings | FlashVideoSettings, successCallback?: () => any, failedCallback?: () => any): void;
+		/**
+		*	Show flash settings panel
+		*
+		*	@param panel Settings type - default/microphone/camera/etc as described in SecurityPanel class
+		*/
+		showFlashSettingsPanel(panel?: string): void;
+		/**
+		*	Show/hide local video
+		*
+		*	@param flag Show/hide - true/false
+		*/
+		showLocalVideo(flag: boolean): void;
+		/**
+		*	Stop playing ToneScript using WebAudio API
+		*/
+		stopPlayback(): void;
+		/**
+		*	Transfer call, depending on the result VoxImplant.CallEvents.TransferComplete or VoxImplant.CallEvents.TransferFailed event will be dispatched
+		*
+		*	@param call1 Call which will be transferred
+		*	@param call2 Call where call1 will be transferred
+		*/
+		transferCall(call1: Call, call2: Call): void;
+		/**
+		*	Remove a ban on a user in the chat room
+		*
+		*	@param room Room id
+		*	@param user_id User id
+		*	@param reason Reason
+		*/
+		unbanChatRoomUser(room: string, user_id: string, reason?: string): void;
+		/**
+		*	Use specified audio source , use audioSources to get the list of available audio sources
+		*
+		*	@param id Id of the audio source
+		*	@param successCallback Called in WebRTC mode if audio source changed successfully
+		*	@param failedCallback Called in WebRTC mode if audio source couldn't be changed successfully
+		*/
+		useAudioSource(id: number | string, successCallback?: () => any, failedCallback?: () => any): void;
+		/**
+		*	Use specified audio source , use audioSources to get the list of available audio sources
+		*
+		*	@param id Id of the video source
+		*	@param successCallback Called in WebRTC mode if video source changed successfully
+		*	@param failedCallback Called in WebRTC mode if video source couldn't be changed successfully
+		*/
+		useVideoSource(id: number | string, successCallback?: () => any, failedCallback?: () => any): void;
+		/**
+		*	Get a list of all currently available video sources / cameras
+		*/
+		videoSources(): VideoSourceInfo[];
+	}
+
+	interface Call {
+		/**
+		*	Returns information about the call's media state (active/inactive)
+		*/
+		active(): boolean;
+		/**
+		*	Register handler for specified event
+		*
+		*	@param eventName Event name
+		*	@param eventHandler Handler function. A single parameter is passed - object with the event information
+		*/
+		addEventListener(eventName: VoxImplant.CallEvents, eventHandler: (eventObject: VoxImplantCallEvent) => any): void;
+		/**
+		*	Answer on incoming call
+		*
+		*	@param customData Set custom string associated with call session. It can be later obtained from Call History using HTTP API
+		*	@param extraHeaders Optional custom parameters (SIP headers) that should be sent after accepting incoming call. Parameter names must start with "X-" to be processed by application
+		*/
+		answer(customData?: string, extraHeaders?: Object): void;
+		/**
+		*	Reject incoming call
+		*
+		*	@param extraHeaders Optional custom parameters (SIP headers) that should be sent after accepting incoming call. Parameter names must start with "X-" to be processed by application
+		*/
+		decline(extraHeaders?: Object): void;
+		/**
+		*	Returns display name
+		*/
+		displayName(): string;
+		/**
+		*	Returns HTML video element's id for the call (WebRTC mode)
+		*/
+		getVideoElementId(): string;
+		/**
+		*	Hangup call
+		*
+		*	@param extraHeaders Optional custom parameters (SIP headers) that should be sent after disconnecting/cancelling call. Parameter names must start with "X-" to be processed by application
+		*/
+		hangup(extraHeaders?: Object): void;
+		/**
+		*	Returns headers object
+		*/
+		headers(): Object;
+		/**
+		*	Returns call id
+		*/
+		id(): string;
+		/**
+		*	Mute microphone
+		*/
+		muteMicrophone(): void;
+		/**
+		*	Mute sound
+		*/
+		mutePlayback(): void;
+		/**
+		*	Returns dialed number or caller id
+		*/
+		number(): string;
+		/**
+		*	Reject incoming call
+		*
+		*	@param extraHeaders Optional custom parameters (SIP headers) that should be sent after disconnecting/cancelling call. Parameter names must start with "X-" to be processed by application
+		*/
+		reject(extraHeaders?: Object): void;
+		/**
+		*	Remove handler for specified event
+		*
+		*	@param eventName Event name
+		*	@param eventHandler Handler function
+		*/
+		removeEventListener(eventName: VoxImplant.CallEvents, eventHandler: () => any): void;
+		/**
+		*	Send Info (SIP INFO) message inside the call
+		*
+		*	@param mimeType MIME type of the message
+		*	@param body Message content
+		*	@param extraHeaders Optional headers to be passed with the message
+		*/
+		sendInfo(mimeType: string, body: string, extraHeaders?: Object): void;
+		/**
+		*	Send text message
+		*
+		*	@param msg Message text
+		*/
+		sendMessage(msg: string): void;
+		/**
+		*	Send tone (DTMF)
+		*
+		*	@param key Send tone according to pressed key: 0-9 , * , #
+		*/
+		sendTone(key: string): void;
+		/**
+		*	Set remote video position
+		*
+		*	@param x Horizontal position (px)
+		*	@param y Vertical position (px)
+		*/
+		setRemoteVideoPosition(x: number, y: number): void;
+		/**
+		*	Set remote video size
+		*
+		*	@param width Width in pixels
+		*	@param height Height in pixels
+		*/
+		setRemoteVideoSize(width: number, height: number): void;
+		/**
+		*	Set video settings
+		*
+		*	@param settings Video settings for current call
+		*	@param successCallback Called in WebRTC mode if video settings were applied successfully
+		*	@param failedCallback Called in WebRTC mode if video settings couldn't be applied
+		*/
+		setVideoSettings(settings: VideoSettings | FlashVideoSettings, successCallback?: () => any, failedCallback?: () => any): void;
+		/**
+		*	Show/hide remote party video
+		*
+		*	@param flag Show/hide - true/false
+		*/
+		showRemoteVideo(flag: boolean): void;
+		/**
+		*	Get call's current state
+		*/
+		state(): string;
+		/**
+		*	Unmute microphone
+		*/
+		unmuteMicrophone(): void;
+		/**
+		*	Unmute sound
+		*/
+		unmutePlayback(): void;
+	}
+
+	/**
+	*	WebRTC Video Settings (aka Constraints)
+	*/
+	interface VideoSettings {
+		/**
+		* The width or width range, in pixels
+		*/
+		width?: number | any;
+		/**
+		* The height or height range, in pixels
+		*/
+		height?: number | any;
+		/**
+		* The exact aspect ratio (width in pixels divided by height in pixels, represented as a double rounded to the tenth decimal place) or aspect ratio range
+		*/
+		aspectRatio?: number | any;
+		/**
+		* The exact frame rate (frames per second) or frame rate range
+		*/
+		frameRate?: number | any;
+		/**
+		* This string (or each string, when a list) should be one of the members of VideoFacingModeEnum
+		*/
+		facingMode?: string | any;
+		/**
+		* The origin-unique identifier for the source of the MediaStreamTrack
+		*/
+		deviceId?: string;
+		/**
+		* The origin-unique group identifier for the source of the MediaStreamTrack. Two devices have the same group identifier if they belong to the same physical device
+		*/
+		groupId?: string;
+		/**
+		*	Mandatory constraints object
+		*/
+		mandatory?: Object;
+		/**
+		*	Optional constraints object
+		*/
+		optional?: Object;
+	}
+
+	/**
+	*	Flash Video Settings
+	*/
+	interface FlashVideoSettings {
+		/**
+		*	The maximum amount of bandwidth the current outgoing video feed can use, in bytes
+		*/
+		bandwidth?: number;
+		/**
+		*	The maximum rate at which the camera can capture data, in frames per second
+		*/
+		fps?: number;
+		/**
+		*	Height in pixels (should be set together with width)
+		*/
+		height?: number;
+		/**
+		*	Width in pixels (should be set together with height)
+		*/
+		width?: number;
+		/**
+		*	Keyframe interval (seconds)
+		*/
+		keyframeInterval?: number;
+		/**
+		*	H.264 video codec level
+		*/
+		level?: string;
+		/**
+		*	H.264 video codec profile
+		*/
+		profile?: string;
+		/**
+		*	The required level of picture quality, as determined by the amount of compression being applied to each video frame. Acceptable quality values range from 1 (lowest quality, maximum compression) to 100 (highest quality, no compression). The default value is 0, which means that picture quality can vary as needed to avoid exceeding available bandwidth
+		*/
+		quality?: number;
+	}
+
+	/**
+	*	Network information
+	*/
+	interface NetworkInfo {
+		/**
+		*	Packet loss percentage
+		*/
+		packetLoss: number;
+	}
+
+	/**
+	*	VoxImplant roster item
+	*/
+	interface RosterItem {
+		/**
+		*	Groups this roster item belongs to
+		*/
+		groups: string[],
+		/**
+		*	User id
+		*/
+		id: string,
+		/**
+		*	User display name
+		*/
+		name: string,
+		/**
+		*	Resources
+		*/
+		resources: string[],
+		/**
+		*	Subscription type
+		*/
+		subscription_type: number
+	}
+
+	/**
+	*	Get Client instance to use platform functions
+	*/
+	function getInstance(): Client;
+	/**
+	*	VoxImplant Web SDK lib version
+	*/
+	function version(): String;
+
+}
diff --git a/voximplant-websdk/tsconfig.json b/voximplant-websdk/tsconfig.json
new file mode 100644
index 0000000000..c4dcc1f855
--- /dev/null
+++ b/voximplant-websdk/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "voximplant-websdk-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/voximplant-websdk/voximplant-websdk-tests.ts b/voximplant-websdk/voximplant-websdk-tests.ts
index ace457cd26..76b15f789d 100644
--- a/voximplant-websdk/voximplant-websdk-tests.ts
+++ b/voximplant-websdk/voximplant-websdk-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="./voximplant-websdk.d.ts"/>
-
+import VoxImplant = require("voximplant-websdk");
 var vox: VoxImplant.Client = VoxImplant.getInstance(),
 	call: VoxImplant.Call,
 	room: string;
diff --git a/voximplant-websdk/voximplant-websdk.d.ts b/voximplant-websdk/voximplant-websdk.d.ts
deleted file mode 100644
index fb92f77b3f..0000000000
--- a/voximplant-websdk/voximplant-websdk.d.ts
+++ /dev/null
@@ -1,2037 +0,0 @@
-// Type definitions for VoxImplant Web SDK 3.0.x
-// Project: http://voximplant.com/
-// Definitions by: Alexey Aylarov <https://github.com/aylarov/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace VoxImplant {
-
-	/**
-	*	VoxImplant.Client general events
-	*/
-	enum Events {
-		AuthResult,
-		ConnectionClosed,
-		ConnectionEstablished,
-		ConnectionFailed,
-		IncomingCall,
-		MicAccessResult,
-		NetStatsReceived,
-		PlaybackFinished,
-		SDKReady,
-		SourcesInfoUpdated
-	}
-
-	/**
-	*	VoxImplant.Client Instant Messaging and Presence events
-	*/
-	enum IMEvents {
-		ChatHistoryReceived,
-		ChatRoomBanList,
-		ChatRoomCreated,
-		ChatRoomError,
-		ChatRoomHistoryReceived,
-		ChatRoomInfo,
-		ChatRoomInvitation,
-		ChatRoomInviteDeclined,
-		ChatRoomMessageModified,
-		ChatRoomMessageNotModified,
-		ChatRoomMessageReceived,
-		ChatRoomMessageRemoved,
-		ChatRoomNewParticipant,
-		ChatRoomOperation,
-		ChatRoomParticipantExit,
-		ChatRoomParticipants,
-		ChatRoomPresenceUpdate,
-		ChatRoomStateUpdate,
-		ChatRoomSubjectChange,
-		ChatRoomsDataReceived,
-		ChatStateUpdate,
-		MessageModified,
-		MessageNotModified,
-		MessageReceived,
-		MessageRemoved,
-		MessageStatus,
-		PresenceUpdate,
-		RosterItemChange,
-		RosterPresenceUpdate,
-		RosterReceived,
-		SubscriptionRequest,
-		SystemError,
-		UCConnected,
-		UCDisconnected
-	}
-
-	/**
-	*	VoxImplant.Call events
-	*/
-	enum CallEvents {
-		Connected,
-		Disconnected,
-		Failed,
-		ICETimeout,
-		InfoReceived,
-		MessageReceived,
-		ProgressToneStart,
-		ProgressToneStop,
-		TransferComplete,
-		TransferFailed
-	}
-
-	namespace Events {
-
-		/**
-		*	Event dispatched after login , loginWithOneTimeKey, requestOneTimeLoginKey or loginWithCode function call
-		*/
-		interface AuthResult {
-			/**
-			*	Auth error code, possible values are: 301 - code for 'code' auth type was sent, 302 - key for 'onetimekey' auth type received, 401 - invalid password, 404 - invalid username, 403 - user account is frozen, 500 - internal error
-			*/
-			code? : number;
-			/**
-			*	Authorized user's display name
-			*/
-			displayName?: string;
-			/**
-			*	This parameter is used to calculate hash parameter for loginWithOneTimeKey method. AuthResult with the key dispatched after requestOneTimeLoginKey method was called
-			*/
-			key?: string;
-			/**
-			*	Application options
-			*/
-			options?: Object;
-			/**
-			*	True in case of successful authorization, false - otherwise
-			*/
-			result: boolean;
-		}
-
-		/**
-		*	Event dispatched if connection to VoxImplant Cloud was closed because of network problems. See connect function
-		*/
-		interface ConnectionClosed {}
-
-		/**
-		*	Event dispatched after connection to VoxImplant Cloud was established successfully. See connect function
-		*/
-		interface ConnectionEstablished {}
-
-		/**
-		*	Event dispatched if connection to VoxImplant Cloud couldn't be established. See connect function
-		*/
-		interface ConnectionFailed {
-			/**
-			*	Failure reason description
-			*/
-			message: string;
-		}
-
-		/**
-		*	Event dispatched when there is a new incoming call to current user
-		*/
-		interface IncomingCall {
-			/**
-			*	Incoming call instance. See VoxImplant.Call for details
-			*/
-			call: Call;
-			/**
-			*	Optional SIP headers received with the message
-			*/
-			headers?: Object;
-		}
-
-		/**
-		*	Event dispatched after user interaction with the mic access dialog.
-		*/
-		interface MicAccessResult {
-			/**
-			*	True is access was allowed, false - otherwise
-			*/
-			result: boolean;
-		}
-
-		/**
-		*	Event dispatched when packet loss data received from VoxImplant servers
-		*/
-		interface NetStatsReceived {
-			/**
-			*	Network info object
-			*/
-			stats: NetworkInfo;
-		}
-
-		/**
-		*	Event dispatched after sound playback was stopped. See playToneScript and stopPlayback functions
-		*/
-		interface PlaybackFinished {}
-
-		/**
-		*	Event dispatched after SDK was successfully initialized after init function call
-		*/
-		interface SDKReady {
-			/**
-			*	SDK version
-			*/
-			version: string;
-		}
-
-		/**
-		*	Event dispatched when audio and video sources information was updated. See audioSources and videoSources for details
-		*/
-		interface SourcesInfoUpdated {}
-
-	}
-
-	namespace CallEvents {
-
-		/**
-		*	Event dispatched after call was connected
-		*/
-		interface Connected {
-			/**
-			*	Call that dispatched the event
-			*/
-			call: Call;
-			/**
-			*	Optional SIP headers received with the message
-			*/
-			headers?: Object;
-		}
-
-		/**
-		*	Event dispatched after call was disconnected
-		*/
-		interface Disconnected {
-			/**
-			*	Call that dispatched the event
-			*/
-			call: Call;
-			/**
-			*	Optional SIP headers received with the message
-			*/
-			headers?: Object;
-		}
-
-		/**
-		*	Event dispatched after if call failed
-		*/
-		interface Failed {
-			/**
-			*	Call that dispatched the event
-			*/
-			call: Call;
-			/**
-			*	Status code of the call (i.e. 486)
-			*/
-			code: number;
-			/**
-			*	Optional SIP headers received with the message
-			*/
-			headers?: Object;
-			/**
-			*	Status message of call failure (i.e. Busy Here)
-			*/
-			reason: string;
-		}
-
-		/**
-		*	Event dispatched in case of network connection problem between 2 peers
-		*/
-		interface ICETimeout {
-			/**
-			*	Call that dispatched the event
-			*/
-			call: Call;
-		}
-
-		/**
-		*	Event dispatched when INFO message is received
-		*/
-		interface InfoReceived {
-			/**
-			*	Content of the message
-			*/
-			body: string;
-			/**
-			*	Call that dispatched the event
-			*/
-			call: Call;
-			/**
-			*	Optional SIP headers received with the message
-			*/
-			headers?: Object;
-			/**
-			*	MIME type of INFO message
-			*/
-			mimeType: string;
-		}
-
-		/**
-		*	Event dispatched when text message is received
-		*/
-		interface MessageReceived {
-			/**
-			*	Call that dispatched the event
-			*/
-			call: Call;
-			/**
-			*	Content of the message
-			*/
-			text: string;
-		}
-
-		/**
-		*	Event dispatched when progress tone playback starts
-		*/
-		interface ProgressToneStart {
-			/**
-			*	Call that dispatched the event
-			*/
-			call: Call;
-		}
-
-		/**
-		*	Event dispatched when progress tone playback stops
-		*/
-		interface ProgressToneStop {
-			/**
-			*	Call that dispatched the event
-			*/
-			call: Call;
-		}
-
-		/**
-		*	Event dispatched when call has been transferred successfully
-		*/
-		interface TransferComplete {
-			/**
-			*	Call that dispatched the event
-			*/
-			call: Call;
-		}
-
-		/**
-		*	Event dispatched when call transfer failed
-		*/
-		interface TransferFailed {
-			/**
-			*	Call that dispatched the event
-			*/
-			call: Call;
-		}
-	}
-
-	namespace IMEvents {
-
-		/**
-		*	Event dispatched when chat history received
-		*/
-		interface ChatHistoryReceived {
-			/**
-			* User id
-			*/
-			id: string;
-			/**
-			* Message id specified in getInstantMessagingHistory method
-			*/
-			message_id: string;
-			/**
-			* List of messages
-			*/
-			messages: IMHistoryMessage[];
-		}
-
-		/**
-		*	Event dispatched when info about banned chat room participants received
-		*/
-		interface ChatRoomBanList {
-			/**
-			* Participants list
-			*/
-			participants: ChatRoomParticipant[];
-			/**
-			* Room id
-			*/
-			room: string;
-		}
-
-		/**
-		* Event dispatched if chat room was created successfully
-		*/
-		interface ChatRoomCreated {
-			/**
-			* Room id
-			*/
-			room: string;
-		}
-
-		/**
-		* Event dispatched in case of error while chat room operation
-		*/
-		interface ChatRoomError {
-			/**
-			* Error code
-			*/
-			code: string;
-			/**
-			* Operation name
-			*/
-			operation: string;
-			/**
-			* Room id
-			*/
-			room: string;
-			/**
-			* Error description
-			*/
-			text: string;
-		}
-
-		/**
-		*	Event dispatched when chat room history received
-		*/
-		interface ChatRoomHistoryReceived {
-			/**
-			* Message id specified in getInstantMessagingHistory method
-			*/
-			message_id: string;
-			/**
-			* List of messages
-			*/
-			messages: VoxImplant.IMHistoryMessage[];
-			/**
-			* Room id
-			*/
-			room: string;
-		}
-
-		/**
-		*	Event dispatched when user joins chat room
-		*/
-		interface ChatRoomInfo {
-			/**
-			* Room features
-			*/
-			features: number;
-			/**
-			* Room info object
-			*/
-			info: ChatRoomInfo;
-			/**
-			* Room id
-			*/
-			room: string;
-			/**
-			* Room name
-			*/
-			room_name: string;
-		}
-
-		/**
-		*	Event dispatched when invitation to chat room received
-		*/
-		interface ChatRoomInvitation {
-			/**
-			* The body of the message
-			*/
-			body: string;
-			/**
-			* User id (inviter)
-			*/
-			from: string;
-			/**
-			* Password for the room
-			*/
-			password: string;
-			/**
-			* A reason of the invitation
-			*/
-			reason: string;
-			/**
-			* Room id
-			*/
-			room: string;
-		}
-
-		/**
-		*	Event dispatched if an invitation to chat room was declined by the invitee
-		*/
-		interface ChatRoomInviteDeclined {
-			/**
-			* User id (invitee)
-			*/
-			invitee: string;
-			/**
-			* A reason of the invitation
-			*/
-			reason: string;
-			/**
-			* Room id
-			*/
-			room: string;
-		}
-
-		/**
-		*	Event dispatched when chat room message modified
-		*/
-		interface ChatRoomMessageModified {
-			/**
-			* New message content
-			*/
-			content: string;
-			/**
-			* User id
-			*/
-			from: string;
-			/**
-			* Modified message id
-			*/
-			message_id: string;
-			/**
-			* Private/public message flag
-			*/
-			private_message: string;
-			/**
-			* Resource name
-			*/
-			resource: string;
-			/**
-			* Room id
-			*/
-			room: string;
-			/**
-			* Message timestamp
-			*/
-			timestamp: string;
-		}
-
-		/**
-		*	Event dispatched in case of error during chat room message modification
-		*/
-		interface ChatRoomMessageNotModified {
-			/**
-			* Error code
-			*/
-			code: number;
-			/**
-			* Message id
-			*/
-			message_id: string;
-			/**
-			* Private/public message flag
-			*/
-			private_message: string;
-			/**
-			* Room id
-			*/
-			room: string;
-		}
-
-		/**
-		*	Event dispatched when instant message was sent to chat room
-		*/
-		interface ChatRoomMessageReceived {
-			/**
-			* Message content
-			*/
-			content: string;
-			/**
-			* User id
-			*/
-			from: string;
-			/**
-			* Modified message id
-			*/
-			message_id: string;
-			/**
-			* Private/public message flag
-			*/
-			private_message: string;
-			/**
-			* Resource name
-			*/
-			resource: string;
-			/**
-			* Room id
-			*/
-			room: string;
-			/**
-			* Message timestamp
-			*/
-			timestamp: string;
-		}
-
-		/**
-		*	Event dispatched when chat room message removed
-		*/
-		interface ChatRoomMessageRemoved {
-			/**
-			* User id
-			*/
-			from: string;
-			/**
-			* Modified message id
-			*/
-			message_id: string;
-			/**
-			* Private/public message flag
-			*/
-			private_message: string;
-			/**
-			* Resource name
-			*/
-			resource: string;
-			/**
-			* Room id
-			*/
-			room: string;
-			/**
-			* Message timestamp
-			*/
-			timestamp: string;
-		}
-
-		/**
-		*	Event dispatched when new participant joined the chat room
-		*/
-		interface ChatRoomNewParticipant {
-			/**
-			* User display name
-			*/
-			displayName: string;
-			/**
-			* User id
-			*/
-			participant: string;
-			/**
-			* Room id
-			*/
-			room: string;
-		}
-
-		/**
-		*	Event dispatched when chat room participant was banned/unbanned
-		*/
-		interface ChatRoomOperation {
-			/**
-			* Room id
-			*/
-			room: string;
-			/**
-			* Operation type
-			*/
-			operation: ChatRoomOperationType;
-			/**
-			* Operation result: true/false - success/failure
-			*/
-			result: boolean;
-		}
-
-		/**
-		*	Event dispatched when participant left the chat room
-		*/
-		interface ChatRoomParticipantExit {
-			/**
-			* User id
-			*/
-			participant: string;
-			/**
-			* Room id
-			*/
-			room: string;
-		}
-
-		/**
-		*	Event dispatched when info about chat room participants received
-		*/
-		interface ChatRoomParticipants {
-			/**
-			* Participants list
-			*/
-			participants: ChatRoomParticipant[];
-			/**
-			* Room id
-			*/
-			room: string;
-		}
-
-		/**
-		*	Event dispatched if chat room participant presence status was updated
-		*/
-		interface ChatRoomPresenceUpdate {
-			/**
-			* Optional presence message
-			*/
-			message: string;
-			/**
-			* Participant info
-			*/
-			participant: ParticipantInfo;
-			/**
-			* Current presence status
-			*/
-			presence: UserStatuses;
-			/**
-			* Room id
-			*/
-			room: string;
-		}
-
-		/**
-		*	Event dispatched when chat session state updated
-		*/
-		interface ChatRoomStateUpdate {
-			/**
-			* User id
-			*/
-			from: string;
-			/**
-			* Resource name
-			*/
-			resource: string;
-			/**
-			* Room id
-			*/
-			room: string;
-			/**
-			* Current chat session state
-			*/
-			state: ChatStateType;
-		}
-
-		/**
-		*	Event dispatched if chat room subject was changed
-		*/
-		interface ChatRoomSubjectChange {
-			/**
-			* User id who changed the subject
-			*/
-			id: string;
-			/**
-			* Resource name
-			*/
-			resource: string;
-			/**
-			* Room id
-			*/
-			room: string;
-			/**
-			* New subject
-			*/
-			subject: string;
-		}
-
-		/**
-		*	Event dispatched when information about chat rooms where user participates received
-		*/
-		interface ChatRoomsDataReceived {
-			/**
-			* Rooms list
-			*/
-			rooms: ChatRoom[];
-		}
-
-		/**
-		*	Event dispatched when chat session state updated
-		*/
-		interface ChatStateUpdate {
-			/**
-			*	User id
-			*/
-			id: string;
-			/**
-			*	Resource name
-			*/
-			resource?: string;
-			/**
-			*	Current chat session state. See VoxImplant.ChatStateType enum
-			*/
-			state: ChatStateType;
-		}
-
-		/**
-		*	Event dispatched when instant message was modified by user
-		*/
-		interface MessageModified {
-			/**
-			*	Message new content
-			*/
-			content: string;
-			/**
-			*	User id (of the user who sent the message)
-			*/
-			id: string;
-			/**
-			*	Message id
-			*/
-			message_id: string;
-			/**
-			*	User id (of the user to whom the message was sent)
-			*/
-			to: string;
-		}
-
-		/**
-		*	Event dispatched if error happened during instant message modification
-		*/
-		interface MessageNotModified {
-			/**
-			*	Message new content
-			*/
-			code: number;
-			/**
-			*	Message id
-			*/
-			message_id: string;
-			/**
-			*	User id (of the user to whom the message was sent)
-			*/
-			to: string;
-		}
-
-		/**
-		*	Event dispatched when instant message received
-		*/
-		interface MessageReceived {
-			/**
-			*	Message content
-			*/
-			content: string;
-			/**
-			*	User id (of the user who sent the message)
-			*/
-			id: string;
-			/**
-			*	Message id
-			*/
-			message_id: string;
-			/**
-			*	Resource name
-			*/
-			resource?: string;
-			/**
-			*	User id (of the user to whom the message was sent)
-			*/
-			to: string;
-		}
-
-		/**
-		*	Event dispatched when instant message was removed by user
-		*/
-		interface MessageRemoved {
-			/**
-			*	User id (of the user who sent the message)
-			*/
-			id: string;
-			/**
-			*	Message id
-			*/
-			message_id: string;
-			/**
-			*	User id (of the user to whom the message was sent)
-			*/
-			to: string;
-		}
-
-		/**
-		*	Event dispatched when sent message status changed
-		*/
-		interface MessageStatus {
-			/**
-			*	User id
-			*/
-			id: string;
-			/**
-			*	Message id
-			*/
-			message_id: string;
-			/**
-			*	Resource name
-			*/
-			resource?: string;
-			/**
-			*	Message event type. See VoxImplant.MessageEventType enum
-			*/
-			type: MessageEventType;
-		}
-
-		/**
-		*	Event dispatched when self presence updated
-		*/
-		interface PresenceUpdate {
-			/**
-			* User id
-			*/
-			id: string;
-			/**
-			*	Status message
-			*/
-			message: string;
-			/**
-			*	Current presence status
-			*/
-			presence: UserStatuses;
-			/**
-			*	Resource name
-			*/
-			resource?: string;
-		}
-
-		/**
-		*	Event dispatched when roster item changed
-		*/
-		interface RosterItemChange {
-			/**
-			*	User display name
-			*/
-			displayName: string;
-			/**
-			*	Roster item groups
-			*/
-			groups: string[];
-			/**
-			*	User id
-			*/
-			id: string;
-			/**
-			*	Resource name
-			*/
-			resource?: string;
-			/**
-			*	Roster item event type. See VoxImplant.RosterItemEvent enum
-			*/
-			type: RosterItemEvent;
-		}
-
-		/**
-		*	Event dispatched when roster item presence update happened
-		*/
-		interface RosterPresenceUpdate {
-			/**
-			*	User id
-			*/
-			id: string;
-			/**
-			*	Status message
-			*/
-			message?: string;
-			/**
-			*	Current presence status
-			*/
-			presence: UserStatuses;
-			/**
-			*	Resource name
-			*/
-			resource?: string;
-		}
-
-		/**
-		*	Event dispatched when roster data received
-		*/
-		interface RosterReceived {
-			/**
-			*	User id
-			*/
-			id: string;
-			/**
-			*	Array contains VoxImplant.RosterItem elements
-			*/
-			roster: RosterItem[];
-		}
-
-		/**
-		*	Event dispatched when some user tries to add current user into his roster. Current user can confirm or reject the subscription, then VoxImplant.IMEvents.RosterItemChange will be dispatched on for user that made the request
-		*/
-		interface SubscriptionRequest {
-			/**
-			*	User id
-			*/
-			id: string;
-			/**
-			*	Optional message
-			*/
-			message?: string;
-			/**
-			*	Resource name
-			*/
-			resource?: string;
-			/**
-			*	Message event type. See VoxImplant.SubscriptionRequestType enum
-			*/
-			type: SubscriptionRequestType;
-		}
-
-		/**
-		*	Event dispatched in case of instant messaging subsystem error
-		*/
-		interface SystemError {
-			/**
-			*	Error data object, contains the error details
-			*/
-			errorData: Object;
-			/**
-			*	Error type
-			*/
-			errorType: IMErrorType;
-		}
-
-		/**
-		*	Event dispatched when instant messaging and presence subsystems (UC) are online
-		*/
-		interface UCConnected {}
-
-		/**
-		*	Event dispatched when instant messaging and presence subsystems (UC) are offline
-		*/
-		interface UCDisconnected { }
-
-	}
-
-	type VoxImplantEvent = Events.AuthResult | Events.ConnectionClosed | Events.ConnectionEstablished |
-		Events.ConnectionFailed | Events.IncomingCall | Events.MicAccessResult |
-		Events.NetStatsReceived | Events.PlaybackFinished | Events.SDKReady | Events.SourcesInfoUpdated;
-
-
-	type VoxImplantCallEvent = CallEvents.Connected | CallEvents.Disconnected | CallEvents.Failed |
-		CallEvents.InfoReceived | CallEvents.MessageReceived | CallEvents.ProgressToneStart |
-		CallEvents.ProgressToneStop | CallEvents.TransferComplete | CallEvents.TransferFailed;
-
-	type VoxImplantIMEvent = IMEvents.ChatHistoryReceived | IMEvents.ChatRoomBanList |
-		IMEvents.ChatRoomCreated | IMEvents.ChatRoomError | IMEvents.ChatRoomHistoryReceived |
-		IMEvents.ChatRoomInfo | IMEvents.ChatRoomInvitation | IMEvents.ChatRoomInviteDeclined |
-		IMEvents.ChatRoomMessageModified | IMEvents.ChatRoomMessageNotModified | IMEvents.ChatRoomMessageReceived |
-		IMEvents.ChatRoomMessageRemoved | IMEvents.ChatRoomNewParticipant | IMEvents.ChatRoomOperation |
-		IMEvents.ChatRoomParticipantExit | IMEvents.ChatRoomParticipants | IMEvents.ChatRoomPresenceUpdate |
-		IMEvents.ChatRoomStateUpdate | IMEvents.ChatRoomSubjectChange | IMEvents.ChatRoomsDataReceived |
-		IMEvents.ChatStateUpdate | IMEvents.MessageModified | IMEvents.MessageNotModified |
-		IMEvents.MessageReceived | IMEvents.MessageRemoved | IMEvents.MessageStatus |
-		IMEvents.PresenceUpdate | IMEvents.RosterItemChange | IMEvents.RosterPresenceUpdate |
-		IMEvents.RosterReceived | IMEvents.SubscriptionRequest | IMEvents.SystemError |
-		IMEvents.UCConnected | IMEvents.UCDisconnected;
-
-	/**
-	*	VoxImplant SDK Configuration
-	*/
-	interface Config {
-		/**
-		*	XSS protection for inbound instant messages that can contain HTML content
-		*/
-		imXSSprotection?: boolean;
-		/**
-		*	If set to true microphone access dialog will be shown and all functions will become available only after user allowed access
-		*/
-		micRequired?: boolean;
-		/**
-		*	Automatically plays progress tone by means of SDK according to specified progressToneCountry
-		*/
-		progressTone?: boolean;
-		/**
-		*	Country code for progress tone generated automatically if progressTone set to true
-		*/
-		progressToneCountry?: string;
-		/**
-		*	Show debug info in console
-		*/
-		showDebugInfo?: boolean;
-		/**
-		*	Show Flash Settings panel instead of standard Allow/Deny dialog (in Flash mode)
-		*/
-		showFlashSettings?: boolean;
-		/**
-		*	Id of HTMLElement that will be used as container for Flash component of SDK (Mic/cam access dialog will appear in the container). If micRequired set to true element should have size not less than 215x138 (px) for access dialog to be shown
-		*/
-		swfContainer?: string;
-		/**
-		*	Force VoxImplant to use Flash (WebRTC is used if available by default)
-		*/
-		useFlashOnly?: boolean;
-		/**
-		*	Force VoxImplant to use WebRTC (WebRTC is used if available by default). Error will be thrown if WebRTC in unavailable
-		*/
-		useRTCOnly?: boolean;
-		/**
-		*	Default constraints that will be applied while the next attachRecordingDevice function call or if micRequired set to true
-		*/
-		videoConstraints?: VideoSettings | boolean;
-		/**
-		*	Video support
-		*/
-		videoSupport?: boolean;
-	}
-
-	/**
-	*	VoxImplant login options
-	*/
-	interface LoginOptions {
-		/**
-		*	If set to false Web SDK can be used only for ACD status management
-		*/
-		receiveCalls?: boolean;
-		/**
-		*	If set to true user presence will be changed automatically while a call
-		*/
-		serverPresenceControl?: boolean;
-	}
-
-	/**
-	*	Audio playback device info
-	*/
-	interface AudioOutputInfo {
-		/**
-		*	Device id that can be used to choose audio playback device
-		*/
-		id: number | string;
-		/**
-		*	Device name , in WebRTC mode populated with real data only when app has been opened using HTTPS protocol
-		*/
-		name: string;
-	}
-
-	/**
-	*	Audio recording device info
-	*/
-	interface AudioSourceInfo {
-		/**
-		*	Device id that can be used to choose audio recording device
-		*/
-		id: number | string;
-		/**
-		*	Device name , in WebRTC mode populated with real data only when app has been opened using HTTPS protocol
-		*/
-		name: string;
-	}
-
-	/**
-	*	Video recording device info
-	*/
-	interface VideoSourceInfo {
-		/**
-		*	Device id that can be used to choose video recording device
-		*/
-		id: number | string;
-		/**
-		*	Device name , in WebRTC mode populated with real data only when app has been opened using HTTPS protocol
-		*/
-		name: string;
-	}
-
-	enum ChatStateType {
-		/**
-		*	User is actively participating in the chat session
-		*/
-		Active,
-		/**
-		*	User is composing a message
-		*/
-		Composing,
-		/**
-		*	User has effectively ended their participation in the chat session
-		*/
-		Gone,
-		/**
-		*	User has not been actively participating in the chat session
-		*/
-		Inactive,
-		/**
-		*	Invalid type
-		*/
-		Invalid,
-		/**
-		*	User had been composing but now has stopped
-		*/
-		Paused
-	}
-
-	enum IMErrorType {
-		RemoteFunctionError,
-		Error,
-		RosterError
-	}
-
-	enum MessageEventType {
-		/**
-		*	Cancels the 'Composing' event
-		*/
-		Cancel,
-		/**
-		*	Indicates that a reply is being composed
-		*/
-		Composing,
-		/**
-		*	Indicates that the message has been delivered to the recipient
-		*/
-		Delivered,
-		/**
-		*	Indicates that the message has been displayed
-		*/
-		Displayed,
-		/**
-		*	Invalid type
-		*/
-		Invalid,
-		/**
-		*	Indicates that the message has been stored offline by the intended recipient's server
-		*/
-		Offline
-	}
-
-	enum OperatorACDStatuses {
-		AfterService,
-		DND,
-		InService,
-		Offline,
-		Online,
-		Ready,
-		Timeout
-	}
-
-	enum RosterItemEvent {
-		/**
-		*	Roster item added
-		*/
-		Added,
-		/**
-		*	Roster item removed
-		*/
-		Removed,
-		/**
-		*	User subscribed on your status updates (authorized the request)
-		*/
-		Subscribed,
-		/**
-		*	User unsubscribed from your status updates (didn't authorize the request)
-		*/
-		Unsubscribed,
-		/**
-		*	Roster item updated
-		*/
-		Updated
-	}
-
-	enum SubscriptionRequestType {
-		/**
-		*	User is asking for permission to add you into his roster
-		*/
-		Subscribe,
-		/**
-		*	User removed you from his roster
-		*/
-		Unsubscribe
-	}
-
-	enum UserStatuses {
-		/**
-		*	User is away
-		*/
-		Away,
-		/**
-		*	User is available for chat
-		*/
-		Chat,
-		/**
-		*	User is in DND state (Do Not Disturbed)
-		*/
-		DND,
-		/**
-		*	User is offline
-		*/
-		Offline,
-		/**
-		*	User is online
-		*/
-		Online,
-		/**
-		*	User is in XA state (eXtended Away)
-		*/
-		XA
-	}
-
-	enum ChatRoomOperationType {
-		/**
-		* Ban operation
-		*/
-		Ban,
-		/**
-		* Unban operation
-		*/
-		Unban
-	}
-
-	/**
-	*	Chat room
-	*/
-	interface ChatRoom {
-		/**
-		* Chat room id
-		*/
-		id: string;
-		/**
-		* Chat room password
-		*/
-		pass: string;
-	}
-
-	/**
-	*	Chat room info
-	*/
-	interface ChatRoomInfo {
-		/**
-		* Creation date
-		*/
-		creationdate: string;
-		/**
-		* Room description
-		*/
-		description: string;
-		/**
-		* Number of chat room participants
-		*/
-		occupants: number;
-		/**
-		* Room's name / subject
-		*/
-		subject: string;
-	}
-
-	/**
-	*	Chat room participant
-	*/
-	interface ChatRoomParticipant {
-		/**
-		* User id
-		*/
-		id: string;
-		/**
-		* User display name
-		*/
-		name: string;
-		/**
-		* True if the user is owner/admin of the room
-		*/
-		owner?: boolean;
-	}
-
-	/**
-	*	Message received from history
-	*/
-	interface IMHistoryMessage {
-		/**
-		* Message body
-		*/
-		body: string;
-		/**
-		* User id - author of the message
-		*/
-		from: string;
-		/**
-		* Message id
-		*/
-		id: string;
-		/**
-		* Message creation time
-		*/
-		time: string;
-	}
-
-	/**
-	*	Participant info
-	*/
-	interface ParticipantInfo {
-		/**
-		* The participant's affiliation with the room
-		*/
-		affiliation: number;
-		/**
-		* Indicate conditions like: user has been kicked or banned from the room
-		*/
-		flags: number;
-		/**
-		* User id
-		*/
-		id: string;
-		/**
-		* Reason
-		*/
-		reason: string;
-		/**
-		* Resource name
-		*/
-		resource: string;
-		/**
-		* The participant's role with the room
-		*/
-		role: number;
-	}
-
-	/**
-	*	Client class used to control platform functions. Can't be instantiatied directly (singleton), please use VoxImplant.getInstance to get the class instance
-	*/
-	interface Client {
-		/**
-		*	Register handler for specified event
-		*
-		*	@param eventName Event name
-		*	@param eventHandler Handler function. A single parameter is passed - object with the event information
-		*/
-		addEventListener(eventName: VoxImplant.Events | VoxImplant.IMEvents, eventHandler: (eventObject: VoxImplantEvent | VoxImplantIMEvent) => any): void;
-		/**
-		*	Add roster item (IM)
-		*
-		*	@param user_id User id
-		*	@param name Display name
-		*	@param group User group
-		*/
-		addRosterItem(user_id: string, name: string, group?: string): void;
-		/**
-		*	Add roster item group (IM)
-		*
-		*	@param user_id User id
-		*	@param group Group name
-		*/
-		addRosterItemGroup(user_id: string, group: string): void;
-		/**
-		*	Enable microphone/camera if micRequired in VoxImplant.Config was set to false (WebRTC mode only)
-		*
-		*	@param successCallback A function called in case of successful audio recording device change
-		*	@param failedCallback A function called in case of problems while changing audio recording device
-		*/
-		attachRecordingDevice(successCallback?: () => any, failedCallback?: () => any): void;
-		/**
-		*	Get a list of all currently available audio playback devices
-		*/
-		audioOutputs(): AudioOutputInfo[];
-		/**
-		*	Get a list of all currently available audio sources / microphones
-		*/
-		audioSources(): AudioSourceInfo[];
-		/**
-		*	Ban user from the chat room
-		*
-		*	@param room Room id
-		*	@param user_id User id
-		*	@param reason Ban reason
-		*/
-		banChatRoomUser(room: string, user_id: string, reason?: string): void;
-		/**
-		*	Create call
-		*
-		*	@param number The number to call
-		*	@param useVideo Tells if video should be supported for the call
-		*	@param customData Custom string associated with the call session. It can be later obtained from Call History using HTTP API
-		*	@param extraHeaders Optional custom parameters (SIP headers) that should be passed with call (INVITE) message. Parameter names must start with "X-" to be processed by application. IMPORTANT: Headers size limit is 200 bytes
-		*/
-		call(number: string, useVideo?: boolean, customData?: string, extraHeaders?: Object): Call;
-		/**
-		*	Get current config
-		*/
-		config(): Config;
-		/**
-		*	Connect to VoxImplant Cloud
-		*/
-		connect(): void;
-		/**
-		*	Check if connected to VoxImplant Cloud
-		*/
-		connected(): boolean;
-		/**
-		*	Create multi-user chat room and join it
-		*
-		*	@param pass Password for room access
-		*	@param users User ids of the invited users to the chat room
-		*/
-		createChatRoom(pass?: string, users?: string[]): string;
-		/**
-		*	Decline invitation to join chat room
-		*
-		*	@param room Room id
-		*	@param user_id User id (inviter)
-		*	@param reason User-supplied decline reason
-		*/
-		declineChatRoomInvite(room: string, user_id: string, reason?: string): void;
-		/**
-		*	Disable microphone/camera if micRequired in VoxImplant.Config was set to false (WebRTC mode only)
-		*/
-		detachRecordingDevice(): void;
-		/**
-		*	Disconnect from VoxImplant Cloud
-		*/
-		disconnect(): void;
-		/**
-		*	Edit message in the chat room
-		*
-		*	@param room Room id
-		*	@param message_id Message id
-		*	@param msg New message content
-		*/
-		editChatRoomMessage(room: string, message_id: string, msg: string): void;
-		/**
-		*	Edit message sent to user
-		*
-		*	@param room Room id
-		*	@param message_id Message id
-		*	@param msg New message content
-		*/
-		editInstantMessage(room: string, message_id: string, msg: string): void;
-		/**
-		*	Get chat room history
-		*
-		*	@param room Room id
-		*	@param message_id Message id (to get messages sent before/after the message)
-		*	@param direction False/true to get messages older/newer than the message with specified id
-		*	@param count Number of messages
-		*/
-		getChatRoomHistory(room: string, message_id?: string, direction?: boolean, count?: number): void;
-		/**
-		*	Get messages in a conversation with particular use
-		*
-		*	@param user_id User id
-		*	@param message_id Message id (to get messages sent before/after the message)
-		*	@param direction False/true to get messages older/newer than the message with specified id
-		*	@param count Number of messages
-		*/
-		getInstantMessagingHistory(user_id: string, message_id?: string, direction?: boolean, count?: number): void;
-		/**
-		*	Initialize SDK. SDKReady event will be dispatched after succesful SDK initialization. SDK can't be used until it's initialized
-		*
-		*	@param config Client configuration options
-		*/
-		init(config?: Config): void;
-		/**
-		*	Invite user to join chat room
-		*
-		*	@param room Room id
-		*	@param user_id User id (invitee)
-		*	@param reason User-supplied reason for the invitation
-		*/
-		inviteToChatRoom(room: string, user_id: string, reason?: string): void;
-		/**
-		*	Check if WebRTC support is available
-		*/
-		isRTCsupported(): boolean;
-		/**
-		*	Join multi-user chat room
-		*
-		*	@param room Room id
-		*	@param pass Password for room access
-		*/
-		joinChatRoom(room: string, pass?: string): void;
-		/**
-		*	Leave multi-user chat room
-		*
-		*	@param room Room id
-		*	@param msg Message for other participants
-		*/
-		leaveChatRoom(room: string, msg?: string): void;
-		/**
-		*	Login into application
-		*
-		*	@param username
-		*	@param password
-		*	@param options Login options
-		*/
-		login(username: string, password: string, options?: LoginOptions): void;
-		/**
-		*	Login into application using 'code' auth method
-		*
-		*	@param username
-		*	@param code
-		*	@param options Login options
-		*/
-		loginWithCode(username: string, code: string, options?: LoginOptions): void;
-		/**
-		*	Login into application using 'onetimekey' auth method
-		*
-		*	@param username
-		*	@param hash
-		*	@param options Login options
-		*/
-		loginWithOneTimeKey(username: string, hash: string, options?: LoginOptions): void;
-		/**
-		*	Move roster item group (IM)
-		*
-		*	@param user_id User id
-		*	@param groupSrc Group name (source)
-		*	@param groupDst Group name (destination)
-		*/
-		moveRosterItemGroup(user_id: string, groupSrc: string, groupDst: string): void;
-		/**
-		*	Play ToneScript using WebAudio API
-		*
-		*	@param script Tonescript string
-		*	@param loop Loop playback if true
-		*/
-		playToneScript(script: string, loop?: boolean): void;
-		/**
-		*	Remove message in the chat room
-		*
-		*	@param room Room id
-		*	@param message_id Message id
-		*/
-		removeChatRoomMessage(room: string, message_id: string): void;
-		/**
-		*	Remove user from the chat room
-		*
-		*	@param room Room id
-		*	@param user_id User id
-		*	@param reason Reason
-		*/
-		removeChatRoomUser(room: string, user_id: string, reason?: string): void;
-		/**
-		*	Remove handler for specified event
-		*
-		*	@param eventName Event name
-		*	@param eventHandler Handler function
-		*/
-		removeEventListener(eventName: VoxImplant.Events | VoxImplant.IMEvents, eventHandler: () => any): void;
-		/**
-		*	Remove message sent to user
-		*
-		*	@param user_id User id
-		*	@param message_id Message id
-		*/
-		removeInstantMessage(user_id: string, message_id: string): void;
-		/**
-		*	Remove roster item (IM)
-		*
-		*	@param user_id User id
-		*/
-		removeRosterItem(user_id: string): void;
-		/**
-		*	Remove roster item group (IM)
-		*
-		*	@param user_id User id
-		*	@param group Group name
-		*/
-		remoteRosterItemGroup(user_id: string, group: string): void;
-		/**
-		*	Rename roster item (IM)
-		*
-		*	@param user_id User id
-		*	@param name New display name
-		*/
-		renameRosterItem(user_id: string, name: string): void;
-		/**
-		*	Request a key for 'onetimekey' auth method. Server will send the key in AuthResult event with code 302
-		*
-		*	@param username
-		*/
-		requestOneTimeLoginKey(username: string): void;
-		/**
-		*	Send message to chat room
-		*
-		*	@param room Room id
-		*	@param msg Message for other participants
-		*/
-		sendChatRoomMessage(room: string, msg: string): string;
-		/**
-		*	Send message to user (IM)
-		*
-		*	@param user_id User id
-		*	@param content Message content
-		*/
-		sendInstantMessage(user_id: string, content: string): string;
-		/**
-		*	Start/stop sending local video to remote party/parties
-		*
-		*	@param flag Start/stop - true/false
-		*/
-		sendVideo(flag: boolean): void;
-		/**
-		*	Set active call
-		*
-		*	@param call VoxImplant call instance
-		*	@param active If true make call active, otherwise make call inactive
-		*/
-		setCallActive(call: Call, active: boolean): void;
-		/**
-		*	Set chat room session state info
-		*
-		*	@param room Room id
-		*	@param status Chat session status
-		*/
-		setChatRoomState(room: string, status: ChatStateType): void;
-		/**
-		*	Set new chat room subject
-		*
-		*	@param room Room id
-		*	@param subject New subject
-		*/
-		setChatRoomSubject(room: string, subject: string): void;
-		/**
-		*	Set chat session state info
-		*
-		*	@param user_id User id
-		*	@param status Chat session status. See VoxImplant.ChatStateType enum
-		*/
-		setChatState(user_id: string, status: ChatStateType): void;
-		/**
-		*	Set local video position
-		*
-		*	@param x Horizontal position (px)
-		*	@param y Vertical position (px)
-		*/
-		setLocalVideoPosition(x: number, y: number): void;
-		/**
-		*	Set local video size
-		*
-		*	@param width Width in pixels
-		*	@param height Height in pixels
-		*/
-		setLocalVideoSize(width: number, height: number): void;
-		/**
-		*	Set local video size
-		*
-		*	@param user_id User id
-		*	@param type Message event type: VoxImplant.MessageEventType.Delivered or VoxImplant.MessageEventType.Displayed. See VoxImplant.MessageEventType enum
-		*	@param message_id Message id(s)
-		*/
-		setMessageStatus(user_id: string, type: MessageEventType, message_id: string[]): void;
-		/**
-		*	Set ACD status
-		*
-		*	@param status Presence status string, see VoxImplant.OperatorACDStatuses
-		*/
-		setOperatorACDStatus(status: OperatorACDStatuses): void;
-		/**
-		*	Set presence
-		*
-		*	@param status Presence status from VoxImplant.UserStatuses
-		*	@param msg Presence text message
-		*/
-		setPresenceStatus(status: UserStatuses, msg: string): void;
-		/**
-		*	Set background color of flash app (only for Flash mode)
-		*
-		*	@param color Color in web format (i.e. #000000 for black)
-		*/
-		setSwfColor(color: string): void;
-		/**
-		*	Set bandwidth limit for video calls. Currently supported by Chrome/Chromium. The limit will be applied for the next call. (WebRTC mode only)
-		*
-		*	@param bandwidth Bandwidth limit in kilobits per second (kbps)
-		*/
-		setVideoBandwidth(bandwidth: number): void;
-		/**
-		*	Set video settings globally. This settings will be used for the next call.
-		*
-		*	@param settings Video settings
-		*	@param successCallback Success callback function
-		*	@param failedCallback Failed callback function
-		*/
-		setVideoSettings(settings: VideoSettings | FlashVideoSettings, successCallback?: () => any, failedCallback?: () => any): void;
-		/**
-		*	Show flash settings panel
-		*
-		*	@param panel Settings type - default/microphone/camera/etc as described in SecurityPanel class
-		*/
-		showFlashSettingsPanel(panel?: string): void;
-		/**
-		*	Show/hide local video
-		*
-		*	@param flag Show/hide - true/false
-		*/
-		showLocalVideo(flag: boolean): void;
-		/**
-		*	Stop playing ToneScript using WebAudio API
-		*/
-		stopPlayback(): void;
-		/**
-		*	Transfer call, depending on the result VoxImplant.CallEvents.TransferComplete or VoxImplant.CallEvents.TransferFailed event will be dispatched
-		*
-		*	@param call1 Call which will be transferred
-		*	@param call2 Call where call1 will be transferred
-		*/
-		transferCall(call1: Call, call2: Call): void;
-		/**
-		*	Remove a ban on a user in the chat room
-		*
-		*	@param room Room id
-		*	@param user_id User id
-		*	@param reason Reason
-		*/
-		unbanChatRoomUser(room: string, user_id: string, reason?: string): void;
-		/**
-		*	Use specified audio source , use audioSources to get the list of available audio sources
-		*
-		*	@param id Id of the audio source
-		*	@param successCallback Called in WebRTC mode if audio source changed successfully
-		*	@param failedCallback Called in WebRTC mode if audio source couldn't be changed successfully
-		*/
-		useAudioSource(id: number | string, successCallback?: () => any, failedCallback?: () => any): void;
-		/**
-		*	Use specified audio source , use audioSources to get the list of available audio sources
-		*
-		*	@param id Id of the video source
-		*	@param successCallback Called in WebRTC mode if video source changed successfully
-		*	@param failedCallback Called in WebRTC mode if video source couldn't be changed successfully
-		*/
-		useVideoSource(id: number | string, successCallback?: () => any, failedCallback?: () => any): void;
-		/**
-		*	Get a list of all currently available video sources / cameras
-		*/
-		videoSources(): VideoSourceInfo[];
-	}
-
-	interface Call {
-		/**
-		*	Returns information about the call's media state (active/inactive)
-		*/
-		active(): boolean;
-		/**
-		*	Register handler for specified event
-		*
-		*	@param eventName Event name
-		*	@param eventHandler Handler function. A single parameter is passed - object with the event information
-		*/
-		addEventListener(eventName: VoxImplant.CallEvents, eventHandler: (eventObject: VoxImplantCallEvent) => any): void;
-		/**
-		*	Answer on incoming call
-		*
-		*	@param customData Set custom string associated with call session. It can be later obtained from Call History using HTTP API
-		*	@param extraHeaders Optional custom parameters (SIP headers) that should be sent after accepting incoming call. Parameter names must start with "X-" to be processed by application
-		*/
-		answer(customData?: string, extraHeaders?: Object): void;
-		/**
-		*	Reject incoming call
-		*
-		*	@param extraHeaders Optional custom parameters (SIP headers) that should be sent after accepting incoming call. Parameter names must start with "X-" to be processed by application
-		*/
-		decline(extraHeaders?: Object): void;
-		/**
-		*	Returns display name
-		*/
-		displayName(): string;
-		/**
-		*	Returns HTML video element's id for the call (WebRTC mode)
-		*/
-		getVideoElementId(): string;
-		/**
-		*	Hangup call
-		*
-		*	@param extraHeaders Optional custom parameters (SIP headers) that should be sent after disconnecting/cancelling call. Parameter names must start with "X-" to be processed by application
-		*/
-		hangup(extraHeaders?: Object): void;
-		/**
-		*	Returns headers object
-		*/
-		headers(): Object;
-		/**
-		*	Returns call id
-		*/
-		id(): string;
-		/**
-		*	Mute microphone
-		*/
-		muteMicrophone(): void;
-		/**
-		*	Mute sound
-		*/
-		mutePlayback(): void;
-		/**
-		*	Returns dialed number or caller id
-		*/
-		number(): string;
-		/**
-		*	Reject incoming call
-		*
-		*	@param extraHeaders Optional custom parameters (SIP headers) that should be sent after disconnecting/cancelling call. Parameter names must start with "X-" to be processed by application
-		*/
-		reject(extraHeaders?: Object): void;
-		/**
-		*	Remove handler for specified event
-		*
-		*	@param eventName Event name
-		*	@param eventHandler Handler function
-		*/
-		removeEventListener(eventName: VoxImplant.CallEvents, eventHandler: () => any): void;
-		/**
-		*	Send Info (SIP INFO) message inside the call
-		*
-		*	@param mimeType MIME type of the message
-		*	@param body Message content
-		*	@param extraHeaders Optional headers to be passed with the message
-		*/
-		sendInfo(mimeType: string, body: string, extraHeaders?: Object): void;
-		/**
-		*	Send text message
-		*
-		*	@param msg Message text
-		*/
-		sendMessage(msg: string): void;
-		/**
-		*	Send tone (DTMF)
-		*
-		*	@param key Send tone according to pressed key: 0-9 , * , #
-		*/
-		sendTone(key: string): void;
-		/**
-		*	Set remote video position
-		*
-		*	@param x Horizontal position (px)
-		*	@param y Vertical position (px)
-		*/
-		setRemoteVideoPosition(x: number, y: number): void;
-		/**
-		*	Set remote video size
-		*
-		*	@param width Width in pixels
-		*	@param height Height in pixels
-		*/
-		setRemoteVideoSize(width: number, height: number): void;
-		/**
-		*	Set video settings
-		*
-		*	@param settings Video settings for current call
-		*	@param successCallback Called in WebRTC mode if video settings were applied successfully
-		*	@param failedCallback Called in WebRTC mode if video settings couldn't be applied
-		*/
-		setVideoSettings(settings: VideoSettings | FlashVideoSettings, successCallback?: () => any, failedCallback?: () => any): void;
-		/**
-		*	Show/hide remote party video
-		*
-		*	@param flag Show/hide - true/false
-		*/
-		showRemoteVideo(flag: boolean): void;
-		/**
-		*	Get call's current state
-		*/
-		state(): string;
-		/**
-		*	Unmute microphone
-		*/
-		unmuteMicrophone(): void;
-		/**
-		*	Unmute sound
-		*/
-		unmutePlayback(): void;
-	}
-
-	/**
-	*	WebRTC Video Settings (aka Constraints)
-	*/
-	interface VideoSettings {
-		/**
-		* The width or width range, in pixels
-		*/
-		width?: number | any;
-		/**
-		* The height or height range, in pixels
-		*/
-		height?: number | any;
-		/**
-		* The exact aspect ratio (width in pixels divided by height in pixels, represented as a double rounded to the tenth decimal place) or aspect ratio range
-		*/
-		aspectRatio?: number | any;
-		/**
-		* The exact frame rate (frames per second) or frame rate range
-		*/
-		frameRate?: number | any;
-		/**
-		* This string (or each string, when a list) should be one of the members of VideoFacingModeEnum
-		*/
-		facingMode?: string | any;
-		/**
-		* The origin-unique identifier for the source of the MediaStreamTrack
-		*/
-		deviceId?: string;
-		/**
-		* The origin-unique group identifier for the source of the MediaStreamTrack. Two devices have the same group identifier if they belong to the same physical device
-		*/
-		groupId?: string;
-		/**
-		*	Mandatory constraints object
-		*/
-		mandatory?: Object;
-		/**
-		*	Optional constraints object
-		*/
-		optional?: Object;
-	}
-
-	/**
-	*	Flash Video Settings
-	*/
-	interface FlashVideoSettings {
-		/**
-		*	The maximum amount of bandwidth the current outgoing video feed can use, in bytes
-		*/
-		bandwidth?: number;
-		/**
-		*	The maximum rate at which the camera can capture data, in frames per second
-		*/
-		fps?: number;
-		/**
-		*	Height in pixels (should be set together with width)
-		*/
-		height?: number;
-		/**
-		*	Width in pixels (should be set together with height)
-		*/
-		width?: number;
-		/**
-		*	Keyframe interval (seconds)
-		*/
-		keyframeInterval?: number;
-		/**
-		*	H.264 video codec level
-		*/
-		level?: string;
-		/**
-		*	H.264 video codec profile
-		*/
-		profile?: string;
-		/**
-		*	The required level of picture quality, as determined by the amount of compression being applied to each video frame. Acceptable quality values range from 1 (lowest quality, maximum compression) to 100 (highest quality, no compression). The default value is 0, which means that picture quality can vary as needed to avoid exceeding available bandwidth
-		*/
-		quality?: number;
-	}
-
-	/**
-	*	Network information
-	*/
-	interface NetworkInfo {
-		/**
-		*	Packet loss percentage
-		*/
-		packetLoss: number;
-	}
-
-	/**
-	*	VoxImplant roster item
-	*/
-	interface RosterItem {
-		/**
-		*	Groups this roster item belongs to
-		*/
-		groups: string[],
-		/**
-		*	User id
-		*/
-		id: string,
-		/**
-		*	User display name
-		*/
-		name: string,
-		/**
-		*	Resources
-		*/
-		resources: string[],
-		/**
-		*	Subscription type
-		*/
-		subscription_type: number
-	}
-
-	/**
-	*	Get Client instance to use platform functions
-	*/
-	function getInstance(): Client;
-	/**
-	*	VoxImplant Web SDK lib version
-	*/
-	function version(): String;
-
-}
-
-declare module "voximplant-websdk" {
-    export = VoxImplant;
-}
diff --git a/vso-node-api/index.d.ts b/vso-node-api/index.d.ts
new file mode 100644
index 0000000000..4d37ab49fb
--- /dev/null
+++ b/vso-node-api/index.d.ts
@@ -0,0 +1,13436 @@
+// Type definitions for vso-node-api v0.3.2
+// Project: https://github.com/Microsoft/vso-node-api
+// Definitions by: Teddy Ward <https://github.com/teddyward>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+/// <reference types="Q" />
+declare module 'vso-node-api/Serialization' {
+	/**
+	* Metadata for deserializing an enum field on a contract/type
+	*/
+	export interface ContractEnumMetadata {
+	    enumValues?: {
+	        [name: string]: number;
+	    };
+	}
+	export interface SerializationData {
+	    requestTypeMetadata?: ContractMetadata;
+	    responseTypeMetadata?: ContractMetadata;
+	    responseIsCollection: boolean;
+	}
+	/**
+	* Metadata for deserializing a particular field on a contract/type
+	*/
+	export interface ContractFieldMetadata {
+	    isArray?: boolean;
+	    isDate?: boolean;
+	    enumType?: ContractEnumMetadata;
+	    typeInfo?: ContractMetadata;
+	    isDictionary?: boolean;
+	    dictionaryKeyIsDate?: boolean;
+	    dictionaryValueIsDate?: boolean;
+	    dictionaryKeyEnumType?: ContractEnumMetadata;
+	    dictionaryValueEnumType?: ContractEnumMetadata;
+	    dictionaryValueTypeInfo?: ContractMetadata;
+	    dictionaryValueFieldInfo?: ContractFieldMetadata;
+	}
+	/**
+	* Metadata required for deserializing a given type
+	*/
+	export interface ContractMetadata {
+	    fields?: {
+	        [fieldName: string]: ContractFieldMetadata;
+	    };
+	}
+	export interface IWebApiArrayResult {
+	    count: number;
+	    value: any[];
+	}
+	/**
+	* Module for handling serialization and deserialization of data contracts
+	* (contracts sent from the server using the VSO default REST api serialization settings)
+	*/
+	export module ContractSerializer {
+	    /**
+	     * Process a contract in its raw form (e.g. date fields are Dates, and Enums are numbers) and
+	     * return a pure JSON object that can be posted to REST endpoint.
+	     *
+	     * @param data The object to serialize
+	     * @param contractMetadata The type info/metadata for the contract type being serialized
+	     * @param preserveOriginal If true, don't modify the original object. False modifies the original object (the return value points to the data argument).
+	     */
+	    function serialize(data: any, contractMetadata: ContractMetadata, preserveOriginal?: boolean): any;
+	    /**
+	     * Process a pure JSON object (e.g. that came from a REST call) and transform it into a JS object
+	     * where date strings are converted to Date objects and enum values are converted from strings into
+	     * their numerical value.
+	     *
+	     * @param data The object to deserialize
+	     * @param contractMetadata The type info/metadata for the contract type being deserialize
+	     * @param preserveOriginal If true, don't modify the original object. False modifies the original object (the return value points to the data argument).
+	     * @param unwrapWrappedCollections If true check for wrapped arrays (REST apis will not return arrays directly as the root result but will instead wrap them in a { values: [], count: 0 } object.
+	     */
+	    function deserialize(data: any, contractMetadata: ContractMetadata, preserveOriginal?: boolean, unwrapWrappedCollections?: boolean): any;
+	}
+
+}
+declare module 'vso-node-api/interfaces/common/VsoBaseInterfaces' {
+	import Serialization = require('vso-node-api/Serialization');
+	/**
+	 * Information about the location of a REST API resource
+	 */
+	export interface ApiResourceLocation {
+	    /**
+	     * Area name for this resource
+	     */
+	    area: string;
+	    /**
+	     * Unique Identifier for this location
+	     */
+	    id: string;
+	    /**
+	     * Maximum api version that this resource supports (current server version for this resource)
+	     */
+	    maxVersion: string;
+	    /**
+	     * Minimum api version that this resource supports
+	     */
+	    minVersion: string;
+	    /**
+	     * The latest version of this resource location that is in "Release" (non-preview) mode
+	     */
+	    releasedVersion: string;
+	    /**
+	     * Resource name
+	     */
+	    resourceName: string;
+	    /**
+	     * The current resource version supported by this resource location
+	     */
+	    resourceVersion: number;
+	    /**
+	     * This location's route template (templated relative path)
+	     */
+	    routeTemplate: string;
+	}
+	export interface IBasicCredentials {
+	    username: string;
+	    password: string;
+	}
+	export interface IRequestHandler {
+	    prepareRequest(options: any): void;
+	}
+	export interface IHttpResponse {
+	    statusCode?: number;
+	    headers: any;
+	}
+	export interface IQCoreApi {
+	    connect(): Q.Promise<void>;
+	}
+	export interface IHttpClient {
+	    get(verb: string, requestUrl: string, headers: any, onResult: (err: any, res: IHttpResponse, contents: string) => void): void;
+	    send(verb: string, requestUrl: string, objs: any, headers: any, onResult: (err: any, res: IHttpResponse, contents: string) => void): void;
+	    sendFile(verb: string, requestUrl: string, content: NodeJS.ReadableStream, headers: any, onResult: (err: any, res: IHttpResponse, contents: string) => void): void;
+	    getStream(requestUrl: string, apiVersion: string, headers: any, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    makeAcceptHeader(type: string, apiVersion: string): string;
+	    request(protocol: any, options: any, body: any, onResult: (err: any, res: IHttpResponse, contents: string) => void): void;
+	}
+	export interface IRestClient {
+	    baseUrl: string;
+	    httpClient: IHttpClient;
+	    getJson(relativeUrl: string, apiVersion: string, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	    getJsonWrappedArray(relativeUrl: string, apiVersion: string, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	    options(requestUrl: string, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	    create(relativeUrl: string, apiVersion: string, resources: any, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	    createJsonWrappedArray(relativeUrl: string, apiVersion: string, resources: any[], serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	    update(relativeUrl: string, apiVersion: string, resources: any, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	    updateJsonWrappedArray(relativeUrl: string, apiVersion: string, resources: any[], serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	    uploadFile(verb: string, relativeUrl: string, apiVersion: string, filePath: string, customHeaders: any, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	    uploadStream(verb: string, relativeUrl: string, apiVersion: string, contentStream: NodeJS.ReadableStream, customHeaders: any, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	    replace(relativeUrl: string, apiVersion: string, resources: any, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	}
+
+}
+declare module 'vso-node-api/HttpClient' {
+	/// <reference types="node" />
+	import http = require("http");
+	import ifm = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
+	export class HttpClient implements ifm.IHttpClient {
+	    userAgent: string;
+	    handlers: ifm.IRequestHandler[];
+	    socketTimeout: number;
+	    constructor(userAgent: string, handlers?: ifm.IRequestHandler[], socketTimeout?: number);
+	    get(verb: string, requestUrl: string, headers: any, onResult: (err: any, res: http.ClientResponse, contents: string) => void): void;
+	    send(verb: string, requestUrl: string, objs: any, headers: any, onResult: (err: any, res: http.ClientResponse, contents: string) => void): void;
+	    sendFile(verb: string, requestUrl: string, content: NodeJS.ReadableStream, headers: any, onResult: (err: any, res: http.ClientResponse, contents: string) => void): void;
+	    getStream(requestUrl: string, apiVersion: string, type: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    makeAcceptHeader(type: string, apiVersion: string): string;
+	    _getOptions(method: string, requestUrl: string, headers: any): any;
+	    request(protocol: any, options: any, objs: any, onResult: (err: any, res: http.ClientResponse, contents: string) => void): void;
+	}
+
+}
+declare module 'vso-node-api/RestClient' {
+	/// <reference types="node" />
+	import ifm = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
+	import Serialization = require('vso-node-api/Serialization');
+	export function processResponse(url: any, res: any, contents: any, serializationData: Serialization.SerializationData, onResult: any): void;
+	export function enumToString(enumType: any, enumValue: number, camelCase: boolean): any;
+	export class RestClient implements ifm.IRestClient {
+	    baseUrl: string;
+	    basePath: string;
+	    httpClient: ifm.IHttpClient;
+	    constructor(httpClient: ifm.IHttpClient);
+	    getJson(url: string, apiVersion: string, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	    getJsonWrappedArray(url: string, apiVersion: string, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	    options(url: string, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	    delete(url: string, apiVersion: string, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	    create(url: string, apiVersion: string, resources: any, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	    createJsonWrappedArray(url: string, apiVersion: string, resources: any[], serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, resources: any[]) => void): void;
+	    update(url: string, apiVersion: string, resources: any, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	    updateJsonWrappedArray(url: string, apiVersion: string, resources: any[], serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, resources: any[]) => void): void;
+	    uploadFile(verb: string, url: string, apiVersion: string, filePath: string, customHeaders: any, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	    uploadStream(verb: string, url: string, apiVersion: string, contentStream: NodeJS.ReadableStream, customHeaders: any, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	    replace(url: string, apiVersion: string, resources: any, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	    _sendWrappedJson(verb: string, url: string, apiVersion: string, resources: any[], serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, resources: any[]) => void): void;
+	    _getJson(verb: string, url: string, apiVersion: string, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	    _sendJson(verb: string, url: string, apiVersion: string, data: any, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	}
+
+}
+declare module 'vso-node-api/VsoClient' {
+	/// <reference types="Q" />
+	import Q = require("q");
+	import restm = require('vso-node-api/RestClient');
+	import ifm = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
+	export interface ClientVersioningData {
+	    /**
+	    * The api version string to send in the request (e.g. "1.0" or "2.0-preview.2")
+	    */
+	    apiVersion?: string;
+	    /**
+	    * The request path string to send the request to.  Looked up via an options request with the location id.
+	    */
+	    requestUrl?: string;
+	}
+	export class InvalidApiResourceVersionError implements Error {
+	    name: string;
+	    message: string;
+	    constructor(message?: string);
+	}
+	/**
+	* Base class that should be used (derived from) to make requests to VSS REST apis
+	*/
+	export class VsoClient {
+	    private static APIS_RELATIVE_PATH;
+	    private static PREVIEW_INDICATOR;
+	    private _locationsByAreaPromises;
+	    private _initializationPromise;
+	    restClient: ifm.IRestClient;
+	    baseUrl: string;
+	    basePath: string;
+	    constructor(baseUrl: string, restClient: restm.RestClient);
+	    /**
+	    * Compares the version on the server (locationVersion) to the api version given by the client (apiVersion).
+	    * Returns a negative value if the location version is older (less than) the api version
+	    * Returns 0 if the two are equal
+	    * Returns a positive value if the location version is newer (greater than) the api version
+	    */
+	    private compareResourceVersions(locationVersion, apiVersion);
+	    /**
+	    * Gets the route template for a resource based on its location ID and negotiates the api version
+	    */
+	    getVersioningData(apiVersion: string, area: string, locationId: string, routeValues: any, queryParams?: any): Q.Promise<ClientVersioningData>;
+	    /**
+	     * Sets a promise that is waited on before any requests are issued. Can be used to asynchronously
+	     * set the request url and auth token manager.
+	     */
+	    _setInitializationPromise(promise: Q.Promise<any>): void;
+	    /**
+	     * Gets information about an API resource location (route template, supported versions, etc.)
+	     *
+	     * @param area resource area name
+	     * @param locationId Guid of the location to get
+	     */
+	    _beginGetLocation(area: string, locationId: string): Q.Promise<ifm.ApiResourceLocation>;
+	    private beginGetAreaLocations(area);
+	    resolveUrl(relativeUrl: string): string;
+	    /**
+	    * Issues an OPTIONS request to get location objects from a location id
+	    */
+	    _issueOptionsRequest(requestUrl: string, onResult: (err: any, statusCode: number, locationsResult: any) => void): void;
+	    protected getRequestUrl(routeTemplate: string, area: string, resource: string, routeValues: any, queryParams?: any): string;
+	    private replaceRouteValues(routeTemplate, routeValues);
+	    _getLinkResponseHeaders(xhr: XMLHttpRequest): {
+	        [relName: string]: string;
+	    };
+	}
+
+}
+declare module 'vso-node-api/ClientApiBases' {
+	import Q = require('q');
+	import restm = require('vso-node-api/RestClient');
+	import httpm = require('vso-node-api/HttpClient');
+	import vsom = require('vso-node-api/VsoClient');
+	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
+	export class ClientApiBase {
+	    baseUrl: string;
+	    userAgent: string;
+	    httpClient: httpm.HttpClient;
+	    restClient: restm.RestClient;
+	    vsoClient: vsom.VsoClient;
+	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[], userAgent?: string);
+	    setUserAgent(userAgent: string): void;
+	    connect(onResult: (err: any, statusCode: number, obj: any) => void): void;
+	}
+	export class QClientApiBase {
+	    api: ClientApiBase;
+	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[], api: typeof ClientApiBase);
+	    connect(): Q.Promise<any>;
+	}
+
+}
+declare module 'vso-node-api/interfaces/common/TfsInterfaces' {
+	export interface TeamProjectCollectionReference {
+	    id: string;
+	    name: string;
+	    url: string;
+	}
+	export interface TeamProjectReference {
+	    abbreviation: string;
+	    description: string;
+	    id: string;
+	    name: string;
+	    revision: number;
+	    state: any;
+	    url: string;
+	}
+	export interface WebApiConnectedServiceRef {
+	    id: string;
+	    url: string;
+	}
+	export var TypeInfo: {
+	    TeamProjectCollectionReference: {
+	        fields: any;
+	    };
+	    TeamProjectReference: {
+	        fields: any;
+	    };
+	    WebApiConnectedServiceRef: {
+	        fields: any;
+	    };
+	};
+
+}
+declare module 'vso-node-api/interfaces/common/VSSInterfaces' {
+	export interface IdentityRef {
+	    displayName: string;
+	    id: string;
+	    imageUrl: string;
+	    isAadIdentity: boolean;
+	    isContainer: boolean;
+	    profileUrl: string;
+	    uniqueName: string;
+	    url: string;
+	}
+	export interface JsonPatchDocument {
+	}
+	/**
+	 * The JSON model for a JSON Patch operation
+	 */
+	export interface JsonPatchOperation {
+	    /**
+	     * The path to copy from for the Move/Copy operation.
+	     */
+	    from: string;
+	    /**
+	     * The patch operation
+	     */
+	    op: Operation;
+	    /**
+	     * The path for the operation
+	     */
+	    path: string;
+	    /**
+	     * The value for the operation. This is either a primitive or a JToken.
+	     */
+	    value: any;
+	}
+	export enum Operation {
+	    Add = 0,
+	    Remove = 1,
+	    Replace = 2,
+	    Move = 3,
+	    Copy = 4,
+	    Test = 5,
+	}
+	export interface ResourceRef {
+	    id: string;
+	    url: string;
+	}
+	export interface VssJsonCollectionWrapper extends VssJsonCollectionWrapperBase {
+	    value: any[];
+	}
+	export interface VssJsonCollectionWrapperV<T> extends VssJsonCollectionWrapperBase {
+	    value: T;
+	}
+	export interface VssJsonCollectionWrapperBase {
+	    count: number;
+	}
+	export var TypeInfo: {
+	    IdentityRef: {
+	        fields: any;
+	    };
+	    JsonPatchDocument: {
+	        fields: any;
+	    };
+	    JsonPatchOperation: {
+	        fields: any;
+	    };
+	    Operation: {
+	        enumValues: {
+	            "add": number;
+	            "remove": number;
+	            "replace": number;
+	            "move": number;
+	            "copy": number;
+	            "test": number;
+	        };
+	    };
+	    OperationReference: {
+	        fields: any;
+	    };
+	    ResourceRef: {
+	        fields: any;
+	    };
+	    VssJsonCollectionWrapper: {
+	        fields: any;
+	    };
+	    VssJsonCollectionWrapperV: {
+	        fields: any;
+	    };
+	    VssJsonCollectionWrapperBase: {
+	        fields: any;
+	    };
+	};
+
+}
+declare module 'vso-node-api/interfaces/BuildInterfaces' {
+	import TfsInterfaces = require('vso-node-api/interfaces/common/TfsInterfaces');
+	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
+	export interface AgentPoolQueue extends ShallowReference {
+	    _links: any;
+	    /**
+	     * The pool used by this queue.
+	     */
+	    pool: TaskAgentPoolReference;
+	}
+	export enum AgentStatus {
+	    /**
+	     * Indicates that the build agent cannot be contacted.
+	     */
+	    Unavailable = 0,
+	    /**
+	     * Indicates that the build agent is currently available.
+	     */
+	    Available = 1,
+	    /**
+	     * Indicates that the build agent has taken itself offline.
+	     */
+	    Offline = 2,
+	}
+	export interface ArtifactResource {
+	    /**
+	     * The type-specific resource data. For example, "#/10002/5/drop", "$/drops/5", "\\myshare\myfolder\mydrops\5"
+	     */
+	    data: string;
+	    /**
+	     * Link to the resource. This might include things like query parameters to download as a zip file
+	     */
+	    downloadUrl: string;
+	    /**
+	     * The type of the resource: File container, version control folder, UNC path, etc.
+	     */
+	    type: string;
+	    /**
+	     * Link to the resource
+	     */
+	    url: string;
+	}
+	export enum AuditAction {
+	    Add = 1,
+	    Update = 2,
+	    Delete = 3,
+	}
+	/**
+	 * Data representation of a build
+	 */
+	export interface Build {
+	    _links: any;
+	    /**
+	     * Build number/name of the build
+	     */
+	    buildNumber: string;
+	    /**
+	     * The build controller. This should only be set if the definition type is Xaml.
+	     */
+	    controller: BuildController;
+	    /**
+	     * The definition associated with the build
+	     */
+	    definition: DefinitionReference;
+	    /**
+	     * Indicates whether the build has been deleted.
+	     */
+	    deleted: boolean;
+	    /**
+	     * Demands
+	     */
+	    demands: any[];
+	    /**
+	     * Time that the build was completed
+	     */
+	    finishTime: Date;
+	    /**
+	     * Id of the build
+	     */
+	    id: number;
+	    keepForever: boolean;
+	    /**
+	     * Process or person that last changed the build
+	     */
+	    lastChangedBy: VSSInterfaces.IdentityRef;
+	    /**
+	     * Date the build was last changed
+	     */
+	    lastChangedDate: Date;
+	    /**
+	     * Log location of the build
+	     */
+	    logs: BuildLogReference;
+	    /**
+	     * Orchestration plan for the build
+	     */
+	    orchestrationPlan: TaskOrchestrationPlanReference;
+	    /**
+	     * Parameters for the build
+	     */
+	    parameters: string;
+	    /**
+	     * The build's priority
+	     */
+	    priority: QueuePriority;
+	    /**
+	     * The team project
+	     */
+	    project: TfsInterfaces.TeamProjectReference;
+	    properties: any;
+	    /**
+	     * Quality of the xaml build (good, bad, etc.)
+	     */
+	    quality: string;
+	    /**
+	     * The queue. This should only be set if the definition type is Build.
+	     */
+	    queue: AgentPoolQueue;
+	    /**
+	     * Queue option of the build.
+	     */
+	    queueOptions: QueueOptions;
+	    /**
+	     * The current position of the build in the queue
+	     */
+	    queuePosition: number;
+	    /**
+	     * Time that the build was queued
+	     */
+	    queueTime: Date;
+	    /**
+	     * Reason that the build was created
+	     */
+	    reason: BuildReason;
+	    /**
+	     * The repository
+	     */
+	    repository: BuildRepository;
+	    /**
+	     * The identity that queued the build
+	     */
+	    requestedBy: VSSInterfaces.IdentityRef;
+	    /**
+	     * The identity on whose behalf the build was queued
+	     */
+	    requestedFor: VSSInterfaces.IdentityRef;
+	    /**
+	     * The build result
+	     */
+	    result: BuildResult;
+	    /**
+	     * Source branch
+	     */
+	    sourceBranch: string;
+	    /**
+	     * Source version
+	     */
+	    sourceVersion: string;
+	    /**
+	     * Time that the build was started
+	     */
+	    startTime: Date;
+	    /**
+	     * Status of the build
+	     */
+	    status: BuildStatus;
+	    tags: string[];
+	    /**
+	     * Uri of the build
+	     */
+	    uri: string;
+	    /**
+	     * REST url of the build
+	     */
+	    url: string;
+	    validationResults: BuildRequestValidationResult[];
+	}
+	export interface BuildAgent {
+	    buildDirectory: string;
+	    controller: ShallowReference;
+	    createdDate: Date;
+	    description: string;
+	    enabled: boolean;
+	    id: number;
+	    messageQueueUrl: string;
+	    name: string;
+	    reservedForBuild: string;
+	    server: ShallowReference;
+	    status: AgentStatus;
+	    statusMessage: string;
+	    updatedDate: Date;
+	    uri: string;
+	    url: string;
+	}
+	export interface BuildArtifact {
+	    /**
+	     * The artifact id
+	     */
+	    id: number;
+	    /**
+	     * The name of the artifact
+	     */
+	    name: string;
+	    /**
+	     * The actual resource
+	     */
+	    resource: ArtifactResource;
+	}
+	export enum BuildAuthorizationScope {
+	    /**
+	     * The identity used should have build service account permissions scoped to the project collection. This is useful when resources for a single build are spread across multiple projects.
+	     */
+	    ProjectCollection = 1,
+	    /**
+	     * The identity used should have build service account permissions scoped to the project in which the build definition resides. This is useful for isolation of build jobs to a particular team project to avoid any unintentional escalation of privilege attacks during a build.
+	     */
+	    Project = 2,
+	}
+	export interface BuildCompletedEvent extends BuildUpdatedEvent {
+	}
+	export interface BuildController extends ShallowReference {
+	    _links: any;
+	    /**
+	     * The date the controller was created.
+	     */
+	    createdDate: Date;
+	    /**
+	     * The description of the controller.
+	     */
+	    description: string;
+	    /**
+	     * Indicates whether the controller is enabled.
+	     */
+	    enabled: boolean;
+	    /**
+	     * The status of the controller.
+	     */
+	    status: ControllerStatus;
+	    /**
+	     * The date the controller was last updated.
+	     */
+	    updatedDate: Date;
+	    /**
+	     * The controller's URI.
+	     */
+	    uri: string;
+	}
+	export interface BuildDefinition extends BuildDefinitionReference {
+	    _links: any;
+	    /**
+	     * Indicates whether badges are enabled for this definition
+	     */
+	    badgeEnabled: boolean;
+	    build: BuildDefinitionStep[];
+	    /**
+	     * The build number format
+	     */
+	    buildNumberFormat: string;
+	    /**
+	     * The comment entered when saving the definition
+	     */
+	    comment: string;
+	    /**
+	     * The date the definition was created
+	     */
+	    createdDate: Date;
+	    demands: any[];
+	    /**
+	     * The description
+	     */
+	    description: string;
+	    /**
+	     * The drop location for the definition
+	     */
+	    dropLocation: string;
+	    /**
+	     * Gets or sets the job authorization scope for builds which are queued against this definition
+	     */
+	    jobAuthorizationScope: BuildAuthorizationScope;
+	    /**
+	     * Gets or sets the job execution timeout in minutes for builds which are queued against this definition
+	     */
+	    jobTimeoutInMinutes: number;
+	    options: BuildOption[];
+	    properties: any;
+	    /**
+	     * The repository
+	     */
+	    repository: BuildRepository;
+	    retentionRules: RetentionPolicy[];
+	    triggers: BuildTrigger[];
+	    variables: {
+	        [key: string]: BuildDefinitionVariable;
+	    };
+	}
+	export interface BuildDefinitionChangedEvent {
+	    changeType: AuditAction;
+	    definition: BuildDefinition;
+	}
+	export interface BuildDefinitionChangingEvent {
+	    changeType: AuditAction;
+	    newDefinition: BuildDefinition;
+	    originalDefinition: BuildDefinition;
+	}
+	export interface BuildDefinitionReference extends DefinitionReference {
+	    /**
+	     * The author of the definition.
+	     */
+	    authoredBy: VSSInterfaces.IdentityRef;
+	    /**
+	     * If this is a draft definition, it might have a parent
+	     */
+	    draftOf: DefinitionReference;
+	    /**
+	     * The quality of the definition document (draft, etc.)
+	     */
+	    quality: DefinitionQuality;
+	    /**
+	     * The default queue which should be used for requests.
+	     */
+	    queue: AgentPoolQueue;
+	}
+	export interface BuildDefinitionRevision {
+	    changedBy: VSSInterfaces.IdentityRef;
+	    changedDate: Date;
+	    changeType: AuditAction;
+	    comment: string;
+	    definitionUrl: string;
+	    name: string;
+	    revision: number;
+	}
+	export interface BuildDefinitionSourceProvider {
+	    /**
+	     * Uri of the associated definition
+	     */
+	    definitionUri: string;
+	    /**
+	     * fields associated with this build definition
+	     */
+	    fields: {
+	        [key: string]: string;
+	    };
+	    /**
+	     * Id of this source provider
+	     */
+	    id: number;
+	    /**
+	     * The lst time this source provider was modified
+	     */
+	    lastModified: Date;
+	    /**
+	     * Name of the source provider
+	     */
+	    name: string;
+	    /**
+	     * Which trigger types are supported by this definition source provider
+	     */
+	    supportedTriggerTypes: DefinitionTriggerType;
+	}
+	export interface BuildDefinitionStep {
+	    alwaysRun: boolean;
+	    continueOnError: boolean;
+	    displayName: string;
+	    enabled: boolean;
+	    inputs: {
+	        [key: string]: string;
+	    };
+	    task: TaskDefinitionReference;
+	}
+	export interface BuildDefinitionTemplate {
+	    canDelete: boolean;
+	    category: string;
+	    description: string;
+	    iconTaskId: string;
+	    id: string;
+	    name: string;
+	    template: BuildDefinition;
+	}
+	export interface BuildDefinitionVariable {
+	    allowOverride: boolean;
+	    isSecret: boolean;
+	    value: string;
+	}
+	export interface BuildDeletedEvent extends RealtimeBuildEvent {
+	    build: Build;
+	}
+	export interface BuildDeployment {
+	    deployment: BuildSummary;
+	    sourceBuild: ShallowReference;
+	}
+	/**
+	 * Represents a build log.
+	 */
+	export interface BuildLog extends BuildLogReference {
+	    /**
+	     * The date the log was created.
+	     */
+	    createdOn: Date;
+	    /**
+	     * The date the log was last changed.
+	     */
+	    lastChangedOn: Date;
+	    /**
+	     * The number of lines in the log.
+	     */
+	    lineCount: number;
+	}
+	/**
+	 * Data representation of a build log reference
+	 */
+	export interface BuildLogReference {
+	    /**
+	     * The id of the log.
+	     */
+	    id: number;
+	    /**
+	     * The type of the log location.
+	     */
+	    type: string;
+	    /**
+	     * Full link to the log resource.
+	     */
+	    url: string;
+	}
+	export interface BuildOption {
+	    definition: BuildOptionDefinitionReference;
+	    enabled: boolean;
+	    inputs: {
+	        [key: string]: string;
+	    };
+	}
+	export interface BuildOptionDefinition extends BuildOptionDefinitionReference {
+	    description: string;
+	    groups: BuildOptionGroupDefinition[];
+	    inputs: BuildOptionInputDefinition[];
+	    name: string;
+	    ordinal: number;
+	}
+	export interface BuildOptionDefinitionReference {
+	    id: string;
+	}
+	export interface BuildOptionGroupDefinition {
+	    displayName: string;
+	    isExpanded: boolean;
+	    name: string;
+	}
+	export interface BuildOptionInputDefinition {
+	    defaultValue: string;
+	    groupName: string;
+	    help: {
+	        [key: string]: string;
+	    };
+	    label: string;
+	    name: string;
+	    options: {
+	        [key: string]: string;
+	    };
+	    required: boolean;
+	    type: BuildOptionInputType;
+	    visibleRule: string;
+	}
+	export enum BuildOptionInputType {
+	    String = 0,
+	    Boolean = 1,
+	    StringList = 2,
+	    Radio = 3,
+	    PickList = 4,
+	    MultiLine = 5,
+	}
+	export enum BuildPhaseStatus {
+	    /**
+	     * The state is not known.
+	     */
+	    Unknown = 0,
+	    /**
+	     * The build phase completed unsuccessfully.
+	     */
+	    Failed = 1,
+	    /**
+	     * The build phase completed successfully.
+	     */
+	    Succeeded = 2,
+	}
+	export interface BuildProcessTemplate {
+	    description: string;
+	    fileExists: boolean;
+	    id: number;
+	    parameters: string;
+	    serverPath: string;
+	    supportedReasons: BuildReason;
+	    teamProject: string;
+	    templateType: ProcessTemplateType;
+	    url: string;
+	    version: string;
+	}
+	export enum BuildQueryOrder {
+	    /**
+	     * Order by finish time ascending.
+	     */
+	    FinishTimeAscending = 2,
+	    /**
+	     * Order by finish time descending.
+	     */
+	    FinishTimeDescending = 3,
+	}
+	export enum BuildReason {
+	    /**
+	     * No reason. This value should not be used.
+	     */
+	    None = 0,
+	    /**
+	     * The build was started manually.
+	     */
+	    Manual = 1,
+	    /**
+	     * The build was started for the trigger TriggerType.ContinuousIntegration.
+	     */
+	    IndividualCI = 2,
+	    /**
+	     * The build was started for the trigger TriggerType.BatchedContinuousIntegration.
+	     */
+	    BatchedCI = 4,
+	    /**
+	     * The build was started for the trigger TriggerType.Schedule.
+	     */
+	    Schedule = 8,
+	    /**
+	     * The build was created by a user.
+	     */
+	    UserCreated = 32,
+	    /**
+	     * The build was started manually for private validation.
+	     */
+	    ValidateShelveset = 64,
+	    /**
+	     * The build was started for the trigger ContinuousIntegrationType.Gated.
+	     */
+	    CheckInShelveset = 128,
+	    /**
+	     * The build was triggered for retention policy purposes.
+	     */
+	    Triggered = 175,
+	    /**
+	     * All reasons.
+	     */
+	    All = 239,
+	}
+	export interface BuildRepository {
+	    checkoutSubmodules: boolean;
+	    /**
+	     * Indicates whether to clean the target folder when getting code from the repository. This is a String so that it can reference variables.
+	     */
+	    clean: string;
+	    /**
+	     * Gets or sets the name of the default branch.
+	     */
+	    defaultBranch: string;
+	    id: string;
+	    /**
+	     * Gets or sets the friendly name of the repository.
+	     */
+	    name: string;
+	    properties: {
+	        [key: string]: string;
+	    };
+	    /**
+	     * Gets or sets the root folder.
+	     */
+	    rootFolder: string;
+	    /**
+	     * Gets or sets the type of the repository.
+	     */
+	    type: string;
+	    /**
+	     * Gets or sets the url of the repository.
+	     */
+	    url: string;
+	}
+	export interface BuildRequestValidationResult {
+	    message: string;
+	    result: ValidationResult;
+	}
+	export enum BuildResult {
+	    /**
+	     * No result
+	     */
+	    None = 0,
+	    /**
+	     * The build completed successfully.
+	     */
+	    Succeeded = 2,
+	    /**
+	     * The build completed compilation successfully but had other errors.
+	     */
+	    PartiallySucceeded = 4,
+	    /**
+	     * The build completed unsuccessfully.
+	     */
+	    Failed = 8,
+	    /**
+	     * The build was canceled before starting.
+	     */
+	    Canceled = 32,
+	}
+	export interface BuildServer {
+	    agents: ShallowReference[];
+	    controller: ShallowReference;
+	    id: number;
+	    isVirtual: boolean;
+	    messageQueueUrl: string;
+	    name: string;
+	    requireClientCertificates: boolean;
+	    status: ServiceHostStatus;
+	    statusChangedDate: Date;
+	    uri: string;
+	    url: string;
+	    version: number;
+	}
+	export interface BuildSettings {
+	    defaultRetentionPolicy: RetentionPolicy;
+	    maximumRetentionPolicy: RetentionPolicy;
+	}
+	export interface BuildStartedEvent extends BuildUpdatedEvent {
+	}
+	export enum BuildStatus {
+	    /**
+	     * No status.
+	     */
+	    None = 0,
+	    /**
+	     * The build is currently in progress.
+	     */
+	    InProgress = 1,
+	    /**
+	     * The build has completed.
+	     */
+	    Completed = 2,
+	    /**
+	     * The build is cancelling
+	     */
+	    Cancelling = 4,
+	    /**
+	     * The build is inactive in the queue.
+	     */
+	    Postponed = 8,
+	    /**
+	     * The build has not yet started.
+	     */
+	    NotStarted = 32,
+	    /**
+	     * All status.
+	     */
+	    All = 47,
+	}
+	export interface BuildSummary {
+	    build: ShallowReference;
+	    finishTime: Date;
+	    keepForever: boolean;
+	    quality: string;
+	    reason: BuildReason;
+	    requestedFor: VSSInterfaces.IdentityRef;
+	    startTime: Date;
+	    status: BuildStatus;
+	}
+	export interface BuildTrigger {
+	    triggerType: DefinitionTriggerType;
+	}
+	export interface BuildUpdatedEvent extends RealtimeBuildEvent {
+	    build: Build;
+	}
+	export interface BuildWorkspace {
+	    mappings: MappingDetails[];
+	}
+	/**
+	 * Represents a change associated with a build.
+	 */
+	export interface Change {
+	    /**
+	     * The author of the change.
+	     */
+	    author: VSSInterfaces.IdentityRef;
+	    /**
+	     * The location of a user-friendly representation of the resource.
+	     */
+	    displayUri: string;
+	    /**
+	     * Something that identifies the change. For a commit, this would be the SHA1. For a TFVC changeset, this would be the changeset id.
+	     */
+	    id: string;
+	    /**
+	     * The location of the full representation of the resource.
+	     */
+	    location: string;
+	    /**
+	     * A description of the change. This might be a commit message or changeset description.
+	     */
+	    message: string;
+	    /**
+	     * Indicates whether the message was truncated
+	     */
+	    messageTruncated: boolean;
+	    /**
+	     * A timestamp for the change.
+	     */
+	    timestamp: Date;
+	    /**
+	     * The type of change. "commit", "changeset", etc.
+	     */
+	    type: string;
+	}
+	export interface ConsoleLogEvent extends RealtimeBuildEvent {
+	    lines: string[];
+	    timelineId: string;
+	    timelineRecordId: string;
+	}
+	export interface ContinuousDeploymentDefinition {
+	    /**
+	     * The connected service associated with the continuous deployment
+	     */
+	    connectedService: TfsInterfaces.WebApiConnectedServiceRef;
+	    /**
+	     * The definition associated with the continuous deployment
+	     */
+	    definition: ShallowReference;
+	    gitBranch: string;
+	    hostedServiceName: string;
+	    project: TfsInterfaces.TeamProjectReference;
+	    repositoryId: string;
+	    storageAccountName: string;
+	    subscriptionId: string;
+	    website: string;
+	    webspace: string;
+	}
+	export interface ContinuousIntegrationTrigger extends BuildTrigger {
+	    batchChanges: boolean;
+	    branchFilters: string[];
+	}
+	export enum ControllerStatus {
+	    /**
+	     * Indicates that the build controller cannot be contacted.
+	     */
+	    Unavailable = 0,
+	    /**
+	     * Indicates that the build controller is currently available.
+	     */
+	    Available = 1,
+	    /**
+	     * Indicates that the build controller has taken itself offline.
+	     */
+	    Offline = 2,
+	}
+	export enum DefinitionQuality {
+	    Definition = 1,
+	    Draft = 2,
+	}
+	export enum DefinitionQueueStatus {
+	    /**
+	     * When enabled the definition queue allows builds to be queued by users, the system will queue scheduled, gated and continuous integration builds, and the queued builds will be started by the system.
+	     */
+	    Enabled = 0,
+	    /**
+	     * When paused the definition queue allows builds to be queued by users and the system will queue scheduled, gated and continuous integration builds. Builds in the queue will not be started by the system.
+	     */
+	    Paused = 1,
+	    /**
+	     * When disabled the definition queue will not allow builds to be queued by users and the system will not queue scheduled, gated or continuous integration builds. Builds already in the queue will not be started by the system.
+	     */
+	    Disabled = 2,
+	}
+	/**
+	 * A reference to a definition.
+	 */
+	export interface DefinitionReference extends ShallowReference {
+	    /**
+	     * The project.
+	     */
+	    project: TfsInterfaces.TeamProjectReference;
+	    /**
+	     * If builds can be queued from this definition
+	     */
+	    queueStatus: DefinitionQueueStatus;
+	    /**
+	     * The definition revision number.
+	     */
+	    revision: number;
+	    /**
+	     * The type of the definition.
+	     */
+	    type: DefinitionType;
+	    /**
+	     * The Uri of the definition
+	     */
+	    uri: string;
+	}
+	export enum DefinitionTriggerType {
+	    /**
+	     * Manual builds only.
+	     */
+	    None = 1,
+	    /**
+	     * A build should be started for each changeset.
+	     */
+	    ContinuousIntegration = 2,
+	    /**
+	     * A build should be started for multiple changesets at a time at a specified interval.
+	     */
+	    BatchedContinuousIntegration = 4,
+	    /**
+	     * A build should be started on a specified schedule whether or not changesets exist.
+	     */
+	    Schedule = 8,
+	    /**
+	     * A validation build should be started for each check-in.
+	     */
+	    GatedCheckIn = 16,
+	    /**
+	     * A validation build should be started for each batch of check-ins.
+	     */
+	    BatchedGatedCheckIn = 32,
+	    /**
+	     * All types.
+	     */
+	    All = 63,
+	}
+	export enum DefinitionType {
+	    Xaml = 1,
+	    Build = 2,
+	}
+	export enum DeleteOptions {
+	    /**
+	     * No data should be deleted. This value should not be used.
+	     */
+	    None = 0,
+	    /**
+	     * The drop location should be deleted.
+	     */
+	    DropLocation = 1,
+	    /**
+	     * The test results should be deleted.
+	     */
+	    TestResults = 2,
+	    /**
+	     * The version control label should be deleted.
+	     */
+	    Label = 4,
+	    /**
+	     * The build should be deleted.
+	     */
+	    Details = 8,
+	    /**
+	     * Published symbols should be deleted.
+	     */
+	    Symbols = 16,
+	    /**
+	     * All data should be deleted.
+	     */
+	    All = 31,
+	}
+	/**
+	 * Represents the data from the build information nodes for type "DeploymentInformation" for xaml builds
+	 */
+	export interface Deployment {
+	    type: string;
+	}
+	/**
+	 * Deployment iformation for type "Build"
+	 */
+	export interface DeploymentBuild extends Deployment {
+	    buildId: number;
+	}
+	/**
+	 * Deployment iformation for type "Deploy"
+	 */
+	export interface DeploymentDeploy extends Deployment {
+	    message: string;
+	}
+	/**
+	 * Deployment iformation for type "Test"
+	 */
+	export interface DeploymentTest extends Deployment {
+	    runId: number;
+	}
+	export enum GetOption {
+	    /**
+	     * Use the latest changeset at the time the build is queued.
+	     */
+	    LatestOnQueue = 0,
+	    /**
+	     * Use the latest changeset at the time the build is started.
+	     */
+	    LatestOnBuild = 1,
+	    /**
+	     * A user-specified version has been supplied.
+	     */
+	    Custom = 2,
+	}
+	/**
+	 * Data representation of an information node associated with a build
+	 */
+	export interface InformationNode {
+	    /**
+	     * Fields of the information node
+	     */
+	    fields: {
+	        [key: string]: string;
+	    };
+	    /**
+	     * Process or person that last modified this node
+	     */
+	    lastModifiedBy: string;
+	    /**
+	     * Date this node was last modified
+	     */
+	    lastModifiedDate: Date;
+	    /**
+	     * Node Id of this information node
+	     */
+	    nodeId: number;
+	    /**
+	     * Id of parent node (xml tree)
+	     */
+	    parentId: number;
+	    /**
+	     * The type of the information node
+	     */
+	    type: string;
+	}
+	export interface Issue {
+	    category: string;
+	    data: {
+	        [key: string]: string;
+	    };
+	    message: string;
+	    type: IssueType;
+	}
+	export enum IssueType {
+	    Error = 1,
+	    Warning = 2,
+	}
+	export interface MappingDetails {
+	    mappingType: string;
+	    serverPath: string;
+	}
+	export enum ProcessTemplateType {
+	    /**
+	     * Indicates a custom template.
+	     */
+	    Custom = 0,
+	    /**
+	     * Indicates a default template.
+	     */
+	    Default = 1,
+	    /**
+	     * Indicates an upgrade template.
+	     */
+	    Upgrade = 2,
+	}
+	export interface PropertyValue {
+	    /**
+	     * Guid of identity that changed this property value
+	     */
+	    changedBy: string;
+	    /**
+	     * The date this property value was changed
+	     */
+	    changedDate: Date;
+	    /**
+	     * Name in the name value mapping
+	     */
+	    propertyName: string;
+	    /**
+	     * Value in the name value mapping
+	     */
+	    value: any;
+	}
+	export enum QueryDeletedOption {
+	    /**
+	     * Include only non-deleted builds.
+	     */
+	    ExcludeDeleted = 0,
+	    /**
+	     * Include deleted and non-deleted builds.
+	     */
+	    IncludeDeleted = 1,
+	    /**
+	     * Include only deleted builds.
+	     */
+	    OnlyDeleted = 2,
+	}
+	export enum QueueOptions {
+	    /**
+	     * No queue options
+	     */
+	    None = 0,
+	    /**
+	     * Create a plan Id for the build, do not run it
+	     */
+	    DoNotRun = 1,
+	}
+	export enum QueuePriority {
+	    /**
+	     * Low priority.
+	     */
+	    Low = 5,
+	    /**
+	     * Below normal priority.
+	     */
+	    BelowNormal = 4,
+	    /**
+	     * Normal priority.
+	     */
+	    Normal = 3,
+	    /**
+	     * Above normal priority.
+	     */
+	    AboveNormal = 2,
+	    /**
+	     * High priority.
+	     */
+	    High = 1,
+	}
+	export interface RealtimeBuildEvent {
+	    buildId: number;
+	}
+	export interface RequestReference {
+	    /**
+	     * Id of the resource
+	     */
+	    id: number;
+	    /**
+	     * Name of the requestor
+	     */
+	    requestedFor: VSSInterfaces.IdentityRef;
+	    /**
+	     * Full http link to the resource
+	     */
+	    url: string;
+	}
+	export interface RetentionPolicy {
+	    branches: string[];
+	    daysToKeep: number;
+	    deleteBuildRecord: boolean;
+	}
+	export interface Schedule {
+	    branchFilters: string[];
+	    /**
+	     * Days for a build (flags enum for days of the week)
+	     */
+	    daysToBuild: ScheduleDays;
+	    /**
+	     * The Job Id of the Scheduled job that will queue the scheduled build. Since a single trigger can have multiple schedules and we want a single job to process a single schedule (since each schedule has a list of branches to build), the schedule itself needs to define the Job Id. This value will be filled in when a definition is added or updated.  The UI does not provide it or use it.
+	     */
+	    scheduleJobId: string;
+	    /**
+	     * Local timezone hour to start
+	     */
+	    startHours: number;
+	    /**
+	     * Local timezone minute to start
+	     */
+	    startMinutes: number;
+	    /**
+	     * Time zone of the build schedule (string representation of the time zone id)
+	     */
+	    timeZoneId: string;
+	}
+	export enum ScheduleDays {
+	    /**
+	     * Do not run.
+	     */
+	    None = 0,
+	    /**
+	     * Run on Monday.
+	     */
+	    Monday = 1,
+	    /**
+	     * Run on Tuesday.
+	     */
+	    Tuesday = 2,
+	    /**
+	     * Run on Wednesday.
+	     */
+	    Wednesday = 4,
+	    /**
+	     * Run on Thursday.
+	     */
+	    Thursday = 8,
+	    /**
+	     * Run on Friday.
+	     */
+	    Friday = 16,
+	    /**
+	     * Run on Saturday.
+	     */
+	    Saturday = 32,
+	    /**
+	     * Run on Sunday.
+	     */
+	    Sunday = 64,
+	    /**
+	     * Run on all days of the week.
+	     */
+	    All = 127,
+	}
+	export interface ScheduleTrigger extends BuildTrigger {
+	    schedules: Schedule[];
+	}
+	export enum ServiceHostStatus {
+	    /**
+	     * The service host is currently connected and accepting commands.
+	     */
+	    Online = 1,
+	    /**
+	     * The service host is currently disconnected and not accepting commands.
+	     */
+	    Offline = 2,
+	}
+	/**
+	 * An abstracted reference to some other resource. This class is used to provide the build data contracts with a uniform way to reference other resources in a way that provides easy traversal through links.
+	 */
+	export interface ShallowReference {
+	    /**
+	     * Id of the resource
+	     */
+	    id: number;
+	    /**
+	     * Name of the linked resource (definition name, controller name, etc.)
+	     */
+	    name: string;
+	    /**
+	     * Full http link to the resource
+	     */
+	    url: string;
+	}
+	export interface TaskAgentPoolReference {
+	    id: number;
+	    name: string;
+	}
+	export interface TaskDefinitionReference {
+	    id: string;
+	    versionSpec: string;
+	}
+	export interface TaskOrchestrationPlanReference {
+	    planId: string;
+	}
+	export enum TaskResult {
+	    Succeeded = 0,
+	    SucceededWithIssues = 1,
+	    Failed = 2,
+	    Canceled = 3,
+	    Skipped = 4,
+	    Abandoned = 5,
+	}
+	export interface Timeline extends TimelineReference {
+	    lastChangedBy: string;
+	    lastChangedOn: Date;
+	    records: TimelineRecord[];
+	}
+	export interface TimelineRecord {
+	    _links: any;
+	    changeId: number;
+	    currentOperation: string;
+	    details: TimelineReference;
+	    errorCount: number;
+	    finishTime: Date;
+	    id: string;
+	    issues: Issue[];
+	    lastModified: Date;
+	    log: BuildLogReference;
+	    name: string;
+	    order: number;
+	    parentId: string;
+	    percentComplete: number;
+	    result: TaskResult;
+	    resultCode: string;
+	    startTime: Date;
+	    state: TimelineRecordState;
+	    type: string;
+	    url: string;
+	    warningCount: number;
+	    workerName: string;
+	}
+	export enum TimelineRecordState {
+	    Pending = 0,
+	    InProgress = 1,
+	    Completed = 2,
+	}
+	export interface TimelineRecordsUpdatedEvent extends RealtimeBuildEvent {
+	    timelineRecords: TimelineRecord[];
+	}
+	export interface TimelineReference {
+	    changeId: number;
+	    id: string;
+	    url: string;
+	}
+	export enum ValidationResult {
+	    OK = 0,
+	    Warning = 1,
+	    Error = 2,
+	}
+	/**
+	 * Mapping for a workspace
+	 */
+	export interface WorkspaceMapping {
+	    /**
+	     * Uri of the associated definition
+	     */
+	    definitionUri: string;
+	    /**
+	     * Depth of this mapping
+	     */
+	    depth: number;
+	    /**
+	     * local location of the definition
+	     */
+	    localItem: string;
+	    /**
+	     * type of workspace mapping
+	     */
+	    mappingType: WorkspaceMappingType;
+	    /**
+	     * Server location of the definition
+	     */
+	    serverItem: string;
+	    /**
+	     * Id of the workspace
+	     */
+	    workspaceId: number;
+	}
+	export enum WorkspaceMappingType {
+	    /**
+	     * The path is mapped in the workspace.
+	     */
+	    Map = 0,
+	    /**
+	     * The path is cloaked in the workspace.
+	     */
+	    Cloak = 1,
+	}
+	export interface WorkspaceTemplate {
+	    /**
+	     * Uri of the associated definition
+	     */
+	    definitionUri: string;
+	    /**
+	     * The identity that last modified this template
+	     */
+	    lastModifiedBy: string;
+	    /**
+	     * The last time this template was modified
+	     */
+	    lastModifiedDate: Date;
+	    /**
+	     * List of workspace mappings
+	     */
+	    mappings: WorkspaceMapping[];
+	    /**
+	     * Id of the workspace for this template
+	     */
+	    workspaceId: number;
+	}
+	export interface XamlBuildDefinition extends DefinitionReference {
+	    _links: any;
+	    /**
+	     * Batch size of the definition
+	     */
+	    batchSize: number;
+	    buildArgs: string;
+	    /**
+	     * The continuous integration quiet period
+	     */
+	    continuousIntegrationQuietPeriod: number;
+	    /**
+	     * The build controller
+	     */
+	    controller: BuildController;
+	    /**
+	     * The date this definition was created
+	     */
+	    createdOn: Date;
+	    /**
+	     * Default drop location for builds from this definition
+	     */
+	    defaultDropLocation: string;
+	    /**
+	     * Description of the definition
+	     */
+	    description: string;
+	    /**
+	     * The last build on this definition
+	     */
+	    lastBuild: ShallowReference;
+	    /**
+	     * The repository
+	     */
+	    repository: BuildRepository;
+	    /**
+	     * The reasons supported by the template
+	     */
+	    supportedReasons: BuildReason;
+	    /**
+	     * How builds are triggered from this definition
+	     */
+	    triggerType: DefinitionTriggerType;
+	}
+	export var TypeInfo: {
+	    AgentPoolQueue: {
+	        fields: any;
+	    };
+	    AgentStatus: {
+	        enumValues: {
+	            "unavailable": number;
+	            "available": number;
+	            "offline": number;
+	        };
+	    };
+	    ArtifactResource: {
+	        fields: any;
+	    };
+	    AuditAction: {
+	        enumValues: {
+	            "add": number;
+	            "update": number;
+	            "delete": number;
+	        };
+	    };
+	    Build: {
+	        fields: any;
+	    };
+	    BuildAgent: {
+	        fields: any;
+	    };
+	    BuildArtifact: {
+	        fields: any;
+	    };
+	    BuildAuthorizationScope: {
+	        enumValues: {
+	            "projectCollection": number;
+	            "project": number;
+	        };
+	    };
+	    BuildCompletedEvent: {
+	        fields: any;
+	    };
+	    BuildController: {
+	        fields: any;
+	    };
+	    BuildDefinition: {
+	        fields: any;
+	    };
+	    BuildDefinitionChangedEvent: {
+	        fields: any;
+	    };
+	    BuildDefinitionChangingEvent: {
+	        fields: any;
+	    };
+	    BuildDefinitionReference: {
+	        fields: any;
+	    };
+	    BuildDefinitionRevision: {
+	        fields: any;
+	    };
+	    BuildDefinitionSourceProvider: {
+	        fields: any;
+	    };
+	    BuildDefinitionStep: {
+	        fields: any;
+	    };
+	    BuildDefinitionTemplate: {
+	        fields: any;
+	    };
+	    BuildDefinitionVariable: {
+	        fields: any;
+	    };
+	    BuildDeletedEvent: {
+	        fields: any;
+	    };
+	    BuildDeployment: {
+	        fields: any;
+	    };
+	    BuildLog: {
+	        fields: any;
+	    };
+	    BuildLogReference: {
+	        fields: any;
+	    };
+	    BuildOption: {
+	        fields: any;
+	    };
+	    BuildOptionDefinition: {
+	        fields: any;
+	    };
+	    BuildOptionDefinitionReference: {
+	        fields: any;
+	    };
+	    BuildOptionGroupDefinition: {
+	        fields: any;
+	    };
+	    BuildOptionInputDefinition: {
+	        fields: any;
+	    };
+	    BuildOptionInputType: {
+	        enumValues: {
+	            "string": number;
+	            "boolean": number;
+	            "stringList": number;
+	            "radio": number;
+	            "pickList": number;
+	            "multiLine": number;
+	        };
+	    };
+	    BuildPhaseStatus: {
+	        enumValues: {
+	            "unknown": number;
+	            "failed": number;
+	            "succeeded": number;
+	        };
+	    };
+	    BuildProcessTemplate: {
+	        fields: any;
+	    };
+	    BuildQueryOrder: {
+	        enumValues: {
+	            "finishTimeAscending": number;
+	            "finishTimeDescending": number;
+	        };
+	    };
+	    BuildReason: {
+	        enumValues: {
+	            "none": number;
+	            "manual": number;
+	            "individualCI": number;
+	            "batchedCI": number;
+	            "schedule": number;
+	            "userCreated": number;
+	            "validateShelveset": number;
+	            "checkInShelveset": number;
+	            "triggered": number;
+	            "all": number;
+	        };
+	    };
+	    BuildRepository: {
+	        fields: any;
+	    };
+	    BuildRequestValidationResult: {
+	        fields: any;
+	    };
+	    BuildResult: {
+	        enumValues: {
+	            "none": number;
+	            "succeeded": number;
+	            "partiallySucceeded": number;
+	            "failed": number;
+	            "canceled": number;
+	        };
+	    };
+	    BuildServer: {
+	        fields: any;
+	    };
+	    BuildSettings: {
+	        fields: any;
+	    };
+	    BuildStartedEvent: {
+	        fields: any;
+	    };
+	    BuildStatus: {
+	        enumValues: {
+	            "none": number;
+	            "inProgress": number;
+	            "completed": number;
+	            "cancelling": number;
+	            "postponed": number;
+	            "notStarted": number;
+	            "all": number;
+	        };
+	    };
+	    BuildSummary: {
+	        fields: any;
+	    };
+	    BuildTrigger: {
+	        fields: any;
+	    };
+	    BuildUpdatedEvent: {
+	        fields: any;
+	    };
+	    BuildWorkspace: {
+	        fields: any;
+	    };
+	    Change: {
+	        fields: any;
+	    };
+	    ConsoleLogEvent: {
+	        fields: any;
+	    };
+	    ContinuousDeploymentDefinition: {
+	        fields: any;
+	    };
+	    ContinuousIntegrationTrigger: {
+	        fields: any;
+	    };
+	    ControllerStatus: {
+	        enumValues: {
+	            "unavailable": number;
+	            "available": number;
+	            "offline": number;
+	        };
+	    };
+	    DefinitionQuality: {
+	        enumValues: {
+	            "definition": number;
+	            "draft": number;
+	        };
+	    };
+	    DefinitionQueueStatus: {
+	        enumValues: {
+	            "enabled": number;
+	            "paused": number;
+	            "disabled": number;
+	        };
+	    };
+	    DefinitionReference: {
+	        fields: any;
+	    };
+	    DefinitionTriggerType: {
+	        enumValues: {
+	            "none": number;
+	            "continuousIntegration": number;
+	            "batchedContinuousIntegration": number;
+	            "schedule": number;
+	            "gatedCheckIn": number;
+	            "batchedGatedCheckIn": number;
+	            "all": number;
+	        };
+	    };
+	    DefinitionType: {
+	        enumValues: {
+	            "xaml": number;
+	            "build": number;
+	        };
+	    };
+	    DeleteOptions: {
+	        enumValues: {
+	            "none": number;
+	            "dropLocation": number;
+	            "testResults": number;
+	            "label": number;
+	            "details": number;
+	            "symbols": number;
+	            "all": number;
+	        };
+	    };
+	    Deployment: {
+	        fields: any;
+	    };
+	    DeploymentBuild: {
+	        fields: any;
+	    };
+	    DeploymentDeploy: {
+	        fields: any;
+	    };
+	    DeploymentTest: {
+	        fields: any;
+	    };
+	    GetOption: {
+	        enumValues: {
+	            "latestOnQueue": number;
+	            "latestOnBuild": number;
+	            "custom": number;
+	        };
+	    };
+	    InformationNode: {
+	        fields: any;
+	    };
+	    Issue: {
+	        fields: any;
+	    };
+	    IssueType: {
+	        enumValues: {
+	            "error": number;
+	            "warning": number;
+	        };
+	    };
+	    MappingDetails: {
+	        fields: any;
+	    };
+	    ProcessTemplateType: {
+	        enumValues: {
+	            "custom": number;
+	            "default": number;
+	            "upgrade": number;
+	        };
+	    };
+	    PropertyValue: {
+	        fields: any;
+	    };
+	    QueryDeletedOption: {
+	        enumValues: {
+	            "excludeDeleted": number;
+	            "includeDeleted": number;
+	            "onlyDeleted": number;
+	        };
+	    };
+	    QueueOptions: {
+	        enumValues: {
+	            "none": number;
+	            "doNotRun": number;
+	        };
+	    };
+	    QueuePriority: {
+	        enumValues: {
+	            "low": number;
+	            "belowNormal": number;
+	            "normal": number;
+	            "aboveNormal": number;
+	            "high": number;
+	        };
+	    };
+	    RealtimeBuildEvent: {
+	        fields: any;
+	    };
+	    RequestReference: {
+	        fields: any;
+	    };
+	    RetentionPolicy: {
+	        fields: any;
+	    };
+	    Schedule: {
+	        fields: any;
+	    };
+	    ScheduleDays: {
+	        enumValues: {
+	            "none": number;
+	            "monday": number;
+	            "tuesday": number;
+	            "wednesday": number;
+	            "thursday": number;
+	            "friday": number;
+	            "saturday": number;
+	            "sunday": number;
+	            "all": number;
+	        };
+	    };
+	    ScheduleTrigger: {
+	        fields: any;
+	    };
+	    ServiceHostStatus: {
+	        enumValues: {
+	            "online": number;
+	            "offline": number;
+	        };
+	    };
+	    ShallowReference: {
+	        fields: any;
+	    };
+	    TaskAgentPoolReference: {
+	        fields: any;
+	    };
+	    TaskDefinitionReference: {
+	        fields: any;
+	    };
+	    TaskOrchestrationPlanReference: {
+	        fields: any;
+	    };
+	    TaskResult: {
+	        enumValues: {
+	            "succeeded": number;
+	            "succeededWithIssues": number;
+	            "failed": number;
+	            "canceled": number;
+	            "skipped": number;
+	            "abandoned": number;
+	        };
+	    };
+	    Timeline: {
+	        fields: any;
+	    };
+	    TimelineRecord: {
+	        fields: any;
+	    };
+	    TimelineRecordState: {
+	        enumValues: {
+	            "pending": number;
+	            "inProgress": number;
+	            "completed": number;
+	        };
+	    };
+	    TimelineRecordsUpdatedEvent: {
+	        fields: any;
+	    };
+	    TimelineReference: {
+	        fields: any;
+	    };
+	    ValidationResult: {
+	        enumValues: {
+	            "oK": number;
+	            "warning": number;
+	            "error": number;
+	        };
+	    };
+	    WorkspaceMapping: {
+	        fields: any;
+	    };
+	    WorkspaceMappingType: {
+	        enumValues: {
+	            "map": number;
+	            "cloak": number;
+	        };
+	    };
+	    WorkspaceTemplate: {
+	        fields: any;
+	    };
+	    XamlBuildDefinition: {
+	        fields: any;
+	    };
+	};
+
+}
+declare module 'vso-node-api/BuildApi' {
+	/// <reference types="node" />
+	/// <reference types="Q" />
+	import Q = require('q');
+	import basem = require('vso-node-api/ClientApiBases');
+	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
+	import BuildInterfaces = require('vso-node-api/interfaces/BuildInterfaces');
+	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
+	export interface IBuildApi extends basem.ClientApiBase {
+	    createArtifact(artifact: BuildInterfaces.BuildArtifact, buildId: number, project: string, onResult: (err: any, statusCode: number, artifact: BuildInterfaces.BuildArtifact) => void): void;
+	    getArtifact(buildId: number, artifactName: string, project: string, onResult: (err: any, statusCode: number, artifact: BuildInterfaces.BuildArtifact) => void): void;
+	    getArtifactContentZip(buildId: number, artifactName: string, project: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    getArtifacts(buildId: number, project: string, onResult: (err: any, statusCode: number, artifacts: BuildInterfaces.BuildArtifact[]) => void): void;
+	    getBadge(project: string, definitionId: number, branchName: string, onResult: (err: any, statusCode: number, badge: string) => void): void;
+	    deleteBuild(buildId: number, project: string, onResult: (err: any, statusCode: number) => void): void;
+	    getBuild(buildId: number, project: string, propertyFilters: string, onResult: (err: any, statusCode: number, build: BuildInterfaces.Build) => void): void;
+	    getBuilds(project: string, definitions: number[], queues: number[], buildNumber: string, minFinishTime: Date, maxFinishTime: Date, requestedFor: string, reasonFilter: BuildInterfaces.BuildReason, statusFilter: BuildInterfaces.BuildStatus, resultFilter: BuildInterfaces.BuildResult, tagFilters: string[], properties: string[], type: BuildInterfaces.DefinitionType, top: number, continuationToken: string, maxBuildsPerDefinition: number, deletedFilter: BuildInterfaces.QueryDeletedOption, queryOrder: BuildInterfaces.BuildQueryOrder, onResult: (err: any, statusCode: number, builds: BuildInterfaces.Build[]) => void): void;
+	    queueBuild(build: BuildInterfaces.Build, project: string, ignoreWarnings: boolean, onResult: (err: any, statusCode: number, build: BuildInterfaces.Build) => void): void;
+	    updateBuild(build: BuildInterfaces.Build, buildId: number, project: string, onResult: (err: any, statusCode: number, build: BuildInterfaces.Build) => void): void;
+	    getBuildCommits(project: string, buildId: number, top: number, onResult: (err: any, statusCode: number, changes: BuildInterfaces.Change[]) => void): void;
+	    getBuildController(controllerId: number, onResult: (err: any, statusCode: number, Controller: BuildInterfaces.BuildController) => void): void;
+	    getBuildControllers(name: string, onResult: (err: any, statusCode: number, Controllers: BuildInterfaces.BuildController[]) => void): void;
+	    createDefinition(definition: BuildInterfaces.BuildDefinition, project: string, definitionToCloneId: number, definitionToCloneRevision: number, onResult: (err: any, statusCode: number, definition: BuildInterfaces.BuildDefinition) => void): void;
+	    deleteDefinition(definitionId: number, project: string, onResult: (err: any, statusCode: number) => void): void;
+	    getDefinition(definitionId: number, project: string, revision: number, propertyFilters: string[], onResult: (err: any, statusCode: number, definition: BuildInterfaces.DefinitionReference) => void): void;
+	    getDefinitions(project: string, name: string, type: BuildInterfaces.DefinitionType, onResult: (err: any, statusCode: number, definitions: BuildInterfaces.DefinitionReference[]) => void): void;
+	    updateDefinition(definition: BuildInterfaces.BuildDefinition, definitionId: number, project: string, secretsSourceDefinitionId: number, secretsSourceDefinitionRevision: number, onResult: (err: any, statusCode: number, definition: BuildInterfaces.BuildDefinition) => void): void;
+	    getBuildDeployments(project: string, buildId: number, onResult: (err: any, statusCode: number, deployments: BuildInterfaces.Deployment[]) => void): void;
+	    getBuildLog(project: string, buildId: number, logId: number, startLine: number, endLine: number, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    getBuildLogs(project: string, buildId: number, onResult: (err: any, statusCode: number, logs: BuildInterfaces.BuildLog[]) => void): void;
+	    getBuildLogsZip(project: string, buildId: number, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    getBuildOptionDefinitions(onResult: (err: any, statusCode: number, options: BuildInterfaces.BuildOptionDefinition[]) => void): void;
+	    createQueue(queue: BuildInterfaces.AgentPoolQueue, onResult: (err: any, statusCode: number, queue: BuildInterfaces.AgentPoolQueue) => void): void;
+	    deleteQueue(id: number, onResult: (err: any, statusCode: number) => void): void;
+	    getAgentPoolQueue(controllerId: number, onResult: (err: any, statusCode: number, queue: BuildInterfaces.AgentPoolQueue) => void): void;
+	    getQueues(name: string, onResult: (err: any, statusCode: number, queues: BuildInterfaces.AgentPoolQueue[]) => void): void;
+	    getDefinitionRevisions(project: string, definitionId: number, onResult: (err: any, statusCode: number, revisions: BuildInterfaces.BuildDefinitionRevision[]) => void): void;
+	    getBuildSettings(onResult: (err: any, statusCode: number, setting: BuildInterfaces.BuildSettings) => void): void;
+	    updateBuildSettings(settings: BuildInterfaces.BuildSettings, onResult: (err: any, statusCode: number, setting: BuildInterfaces.BuildSettings) => void): void;
+	    addBuildTag(project: string, buildId: number, tag: string, onResult: (err: any, statusCode: number, tags: string[]) => void): void;
+	    addBuildTags(tags: string[], project: string, buildId: number, onResult: (err: any, statusCode: number, tags: string[]) => void): void;
+	    deleteBuildTag(project: string, buildId: number, tag: string, onResult: (err: any, statusCode: number, tags: string[]) => void): void;
+	    getBuildTags(project: string, buildId: number, onResult: (err: any, statusCode: number, tags: string[]) => void): void;
+	    getTags(project: string, onResult: (err: any, statusCode: number, tags: string[]) => void): void;
+	    deleteTemplate(project: string, templateId: string, onResult: (err: any, statusCode: number) => void): void;
+	    getTemplate(project: string, templateId: string, onResult: (err: any, statusCode: number, template: BuildInterfaces.BuildDefinitionTemplate) => void): void;
+	    getTemplates(project: string, onResult: (err: any, statusCode: number, templates: BuildInterfaces.BuildDefinitionTemplate[]) => void): void;
+	    saveTemplate(template: BuildInterfaces.BuildDefinitionTemplate, project: string, templateId: string, onResult: (err: any, statusCode: number, template: BuildInterfaces.BuildDefinitionTemplate) => void): void;
+	    getBuildTimeline(project: string, buildId: number, timelineId: string, changeId: number, onResult: (err: any, statusCode: number, Timeline: BuildInterfaces.Timeline) => void): void;
+	    getBuildWorkItemsRefs(project: string, buildId: number, top: number, onResult: (err: any, statusCode: number, workitems: VSSInterfaces.ResourceRef[]) => void): void;
+	    getBuildWorkItemsRefsFromCommits(commitIds: string[], project: string, buildId: number, top: number, onResult: (err: any, statusCode: number, workitems: VSSInterfaces.ResourceRef[]) => void): void;
+	}
+	export interface IQBuildApi extends basem.QClientApiBase {
+	    createArtifact(artifact: BuildInterfaces.BuildArtifact, buildId: number, project?: string): Q.Promise<BuildInterfaces.BuildArtifact>;
+	    getArtifact(buildId: number, artifactName: string, project?: string): Q.Promise<BuildInterfaces.BuildArtifact>;
+	    getArtifacts(buildId: number, project?: string): Q.Promise<BuildInterfaces.BuildArtifact[]>;
+	    getBadge(project: string, definitionId: number, branchName?: string): Q.Promise<string>;
+	    getBuild(buildId: number, project?: string, propertyFilters?: string): Q.Promise<BuildInterfaces.Build>;
+	    getBuilds(project?: string, definitions?: number[], queues?: number[], buildNumber?: string, minFinishTime?: Date, maxFinishTime?: Date, requestedFor?: string, reasonFilter?: BuildInterfaces.BuildReason, statusFilter?: BuildInterfaces.BuildStatus, resultFilter?: BuildInterfaces.BuildResult, tagFilters?: string[], properties?: string[], type?: BuildInterfaces.DefinitionType, top?: number, continuationToken?: string, maxBuildsPerDefinition?: number, deletedFilter?: BuildInterfaces.QueryDeletedOption, queryOrder?: BuildInterfaces.BuildQueryOrder): Q.Promise<BuildInterfaces.Build[]>;
+	    queueBuild(build: BuildInterfaces.Build, project?: string, ignoreWarnings?: boolean): Q.Promise<BuildInterfaces.Build>;
+	    updateBuild(build: BuildInterfaces.Build, buildId: number, project?: string): Q.Promise<BuildInterfaces.Build>;
+	    getBuildCommits(project: string, buildId: number, top?: number): Q.Promise<BuildInterfaces.Change[]>;
+	    getBuildController(controllerId: number): Q.Promise<BuildInterfaces.BuildController>;
+	    getBuildControllers(name?: string): Q.Promise<BuildInterfaces.BuildController[]>;
+	    createDefinition(definition: BuildInterfaces.BuildDefinition, project?: string, definitionToCloneId?: number, definitionToCloneRevision?: number): Q.Promise<BuildInterfaces.BuildDefinition>;
+	    getDefinition(definitionId: number, project?: string, revision?: number, propertyFilters?: string[]): Q.Promise<BuildInterfaces.DefinitionReference>;
+	    getDefinitions(project?: string, name?: string, type?: BuildInterfaces.DefinitionType): Q.Promise<BuildInterfaces.DefinitionReference[]>;
+	    updateDefinition(definition: BuildInterfaces.BuildDefinition, definitionId: number, project?: string, secretsSourceDefinitionId?: number, secretsSourceDefinitionRevision?: number): Q.Promise<BuildInterfaces.BuildDefinition>;
+	    getBuildDeployments(project: string, buildId: number): Q.Promise<BuildInterfaces.Deployment[]>;
+	    getBuildLogs(project: string, buildId: number): Q.Promise<BuildInterfaces.BuildLog[]>;
+	    getBuildOptionDefinitions(): Q.Promise<BuildInterfaces.BuildOptionDefinition[]>;
+	    createQueue(queue: BuildInterfaces.AgentPoolQueue): Q.Promise<BuildInterfaces.AgentPoolQueue>;
+	    getAgentPoolQueue(controllerId: number): Q.Promise<BuildInterfaces.AgentPoolQueue>;
+	    getQueues(name?: string): Q.Promise<BuildInterfaces.AgentPoolQueue[]>;
+	    getDefinitionRevisions(project: string, definitionId: number): Q.Promise<BuildInterfaces.BuildDefinitionRevision[]>;
+	    getBuildSettings(): Q.Promise<BuildInterfaces.BuildSettings>;
+	    updateBuildSettings(settings: BuildInterfaces.BuildSettings): Q.Promise<BuildInterfaces.BuildSettings>;
+	    addBuildTag(project: string, buildId: number, tag: string): Q.Promise<string[]>;
+	    addBuildTags(tags: string[], project: string, buildId: number): Q.Promise<string[]>;
+	    deleteBuildTag(project: string, buildId: number, tag: string): Q.Promise<string[]>;
+	    getBuildTags(project: string, buildId: number): Q.Promise<string[]>;
+	    getTags(project: string): Q.Promise<string[]>;
+	    getTemplate(project: string, templateId: string): Q.Promise<BuildInterfaces.BuildDefinitionTemplate>;
+	    getTemplates(project: string): Q.Promise<BuildInterfaces.BuildDefinitionTemplate[]>;
+	    saveTemplate(template: BuildInterfaces.BuildDefinitionTemplate, project: string, templateId: string): Q.Promise<BuildInterfaces.BuildDefinitionTemplate>;
+	    getBuildTimeline(project: string, buildId: number, timelineId?: string, changeId?: number): Q.Promise<BuildInterfaces.Timeline>;
+	    getBuildWorkItemsRefs(project: string, buildId: number, top?: number): Q.Promise<VSSInterfaces.ResourceRef[]>;
+	    getBuildWorkItemsRefsFromCommits(commitIds: string[], project: string, buildId: number, top?: number): Q.Promise<VSSInterfaces.ResourceRef[]>;
+	}
+	export class BuildApi extends basem.ClientApiBase implements IBuildApi {
+	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
+	    /**
+	     * Associates an artifact with a build
+	     *
+	     * @param {BuildInterfaces.BuildArtifact} artifact
+	     * @param {number} buildId
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting BuildInterfaces.BuildArtifact
+	     */
+	    createArtifact(artifact: BuildInterfaces.BuildArtifact, buildId: number, project: string, onResult: (err: any, statusCode: number, artifact: BuildInterfaces.BuildArtifact) => void): void;
+	    /**
+	     * Gets a specific artifact for a build
+	     *
+	     * @param {number} buildId
+	     * @param {string} artifactName
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting BuildInterfaces.BuildArtifact
+	     */
+	    getArtifact(buildId: number, artifactName: string, project: string, onResult: (err: any, statusCode: number, artifact: BuildInterfaces.BuildArtifact) => void): void;
+	    /**
+	     * Gets a specific artifact for a build
+	     *
+	     * @param {number} buildId
+	     * @param {string} artifactName
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting ArrayBuffer
+	     */
+	    getArtifactContentZip(buildId: number, artifactName: string, project: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    /**
+	     * Gets all artifacts for a build
+	     *
+	     * @param {number} buildId
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting BuildInterfaces.BuildArtifact[]
+	     */
+	    getArtifacts(buildId: number, project: string, onResult: (err: any, statusCode: number, artifacts: BuildInterfaces.BuildArtifact[]) => void): void;
+	    /**
+	     * @param {string} project
+	     * @param {number} definitionId
+	     * @param {string} branchName
+	     * @param onResult callback function with the resulting string
+	     */
+	    getBadge(project: string, definitionId: number, branchName: string, onResult: (err: any, statusCode: number, badge: string) => void): void;
+	    /**
+	     * Deletes a build
+	     *
+	     * @param {number} buildId
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function
+	     */
+	    deleteBuild(buildId: number, project: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * Gets a build
+	     *
+	     * @param {number} buildId
+	     * @param {string} project - Project ID or project name
+	     * @param {string} propertyFilters - A comma-delimited list of properties to include in the results
+	     * @param onResult callback function with the resulting BuildInterfaces.Build
+	     */
+	    getBuild(buildId: number, project: string, propertyFilters: string, onResult: (err: any, statusCode: number, build: BuildInterfaces.Build) => void): void;
+	    /**
+	     * Gets builds
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {number[]} definitions - A comma-delimited list of definition ids
+	     * @param {number[]} queues - A comma-delimited list of queue ids
+	     * @param {string} buildNumber
+	     * @param {Date} minFinishTime
+	     * @param {Date} maxFinishTime
+	     * @param {string} requestedFor
+	     * @param {BuildInterfaces.BuildReason} reasonFilter
+	     * @param {BuildInterfaces.BuildStatus} statusFilter
+	     * @param {BuildInterfaces.BuildResult} resultFilter
+	     * @param {string[]} tagFilters - A comma-delimited list of tags
+	     * @param {string[]} properties - A comma-delimited list of properties to include in the results
+	     * @param {BuildInterfaces.DefinitionType} type - The definition type
+	     * @param {number} top - The maximum number of builds to retrieve
+	     * @param {string} continuationToken
+	     * @param {number} maxBuildsPerDefinition
+	     * @param {BuildInterfaces.QueryDeletedOption} deletedFilter
+	     * @param {BuildInterfaces.BuildQueryOrder} queryOrder
+	     * @param onResult callback function with the resulting BuildInterfaces.Build[]
+	     */
+	    getBuilds(project: string, definitions: number[], queues: number[], buildNumber: string, minFinishTime: Date, maxFinishTime: Date, requestedFor: string, reasonFilter: BuildInterfaces.BuildReason, statusFilter: BuildInterfaces.BuildStatus, resultFilter: BuildInterfaces.BuildResult, tagFilters: string[], properties: string[], type: BuildInterfaces.DefinitionType, top: number, continuationToken: string, maxBuildsPerDefinition: number, deletedFilter: BuildInterfaces.QueryDeletedOption, queryOrder: BuildInterfaces.BuildQueryOrder, onResult: (err: any, statusCode: number, builds: BuildInterfaces.Build[]) => void): void;
+	    /**
+	     * Queues a build
+	     *
+	     * @param {BuildInterfaces.Build} build
+	     * @param {string} project - Project ID or project name
+	     * @param {boolean} ignoreWarnings
+	     * @param onResult callback function with the resulting BuildInterfaces.Build
+	     */
+	    queueBuild(build: BuildInterfaces.Build, project: string, ignoreWarnings: boolean, onResult: (err: any, statusCode: number, build: BuildInterfaces.Build) => void): void;
+	    /**
+	     * Updates a build
+	     *
+	     * @param {BuildInterfaces.Build} build
+	     * @param {number} buildId
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting BuildInterfaces.Build
+	     */
+	    updateBuild(build: BuildInterfaces.Build, buildId: number, project: string, onResult: (err: any, statusCode: number, build: BuildInterfaces.Build) => void): void;
+	    /**
+	     * Gets the changes associated with a build
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {number} buildId
+	     * @param {number} top - The maximum number of changes to return
+	     * @param onResult callback function with the resulting BuildInterfaces.Change[]
+	     */
+	    getBuildCommits(project: string, buildId: number, top: number, onResult: (err: any, statusCode: number, changes: BuildInterfaces.Change[]) => void): void;
+	    /**
+	     * Gets a controller
+	     *
+	     * @param {number} controllerId
+	     * @param onResult callback function with the resulting BuildInterfaces.BuildController
+	     */
+	    getBuildController(controllerId: number, onResult: (err: any, statusCode: number, Controller: BuildInterfaces.BuildController) => void): void;
+	    /**
+	     * Gets controller, optionally filtered by name
+	     *
+	     * @param {string} name
+	     * @param onResult callback function with the resulting BuildInterfaces.BuildController[]
+	     */
+	    getBuildControllers(name: string, onResult: (err: any, statusCode: number, Controllers: BuildInterfaces.BuildController[]) => void): void;
+	    /**
+	     * Creates a new definition
+	     *
+	     * @param {BuildInterfaces.BuildDefinition} definition
+	     * @param {string} project - Project ID or project name
+	     * @param {number} definitionToCloneId
+	     * @param {number} definitionToCloneRevision
+	     * @param onResult callback function with the resulting BuildInterfaces.BuildDefinition
+	     */
+	    createDefinition(definition: BuildInterfaces.BuildDefinition, project: string, definitionToCloneId: number, definitionToCloneRevision: number, onResult: (err: any, statusCode: number, definition: BuildInterfaces.BuildDefinition) => void): void;
+	    /**
+	     * Deletes a definition and all associated builds
+	     *
+	     * @param {number} definitionId
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function
+	     */
+	    deleteDefinition(definitionId: number, project: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * Gets a definition, optionally at a specific revision
+	     *
+	     * @param {number} definitionId
+	     * @param {string} project - Project ID or project name
+	     * @param {number} revision
+	     * @param {string[]} propertyFilters
+	     * @param onResult callback function with the resulting BuildInterfaces.DefinitionReference
+	     */
+	    getDefinition(definitionId: number, project: string, revision: number, propertyFilters: string[], onResult: (err: any, statusCode: number, definition: BuildInterfaces.DefinitionReference) => void): void;
+	    /**
+	     * Gets definitions, optionally filtered by name
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {string} name
+	     * @param {BuildInterfaces.DefinitionType} type
+	     * @param onResult callback function with the resulting BuildInterfaces.DefinitionReference[]
+	     */
+	    getDefinitions(project: string, name: string, type: BuildInterfaces.DefinitionType, onResult: (err: any, statusCode: number, definitions: BuildInterfaces.DefinitionReference[]) => void): void;
+	    /**
+	     * Updates an existing definition
+	     *
+	     * @param {BuildInterfaces.BuildDefinition} definition
+	     * @param {number} definitionId
+	     * @param {string} project - Project ID or project name
+	     * @param {number} secretsSourceDefinitionId
+	     * @param {number} secretsSourceDefinitionRevision
+	     * @param onResult callback function with the resulting BuildInterfaces.BuildDefinition
+	     */
+	    updateDefinition(definition: BuildInterfaces.BuildDefinition, definitionId: number, project: string, secretsSourceDefinitionId: number, secretsSourceDefinitionRevision: number, onResult: (err: any, statusCode: number, definition: BuildInterfaces.BuildDefinition) => void): void;
+	    /**
+	     * Gets the deployment information associated with a build
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {number} buildId
+	     * @param onResult callback function with the resulting BuildInterfaces.Deployment[]
+	     */
+	    getBuildDeployments(project: string, buildId: number, onResult: (err: any, statusCode: number, deployments: BuildInterfaces.Deployment[]) => void): void;
+	    /**
+	     * Gets a log
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {number} buildId
+	     * @param {number} logId
+	     * @param {number} startLine
+	     * @param {number} endLine
+	     * @param onResult callback function with the resulting ArrayBuffer
+	     */
+	    getBuildLog(project: string, buildId: number, logId: number, startLine: number, endLine: number, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    /**
+	     * Gets logs for a build
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {number} buildId
+	     * @param onResult callback function with the resulting BuildInterfaces.BuildLog[]
+	     */
+	    getBuildLogs(project: string, buildId: number, onResult: (err: any, statusCode: number, logs: BuildInterfaces.BuildLog[]) => void): void;
+	    /**
+	     * Gets logs for a build
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {number} buildId
+	     * @param onResult callback function with the resulting ArrayBuffer
+	     */
+	    getBuildLogsZip(project: string, buildId: number, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    /**
+	     * @param onResult callback function with the resulting BuildInterfaces.BuildOptionDefinition[]
+	     */
+	    getBuildOptionDefinitions(onResult: (err: any, statusCode: number, options: BuildInterfaces.BuildOptionDefinition[]) => void): void;
+	    /**
+	     * Creates a build queue
+	     *
+	     * @param {BuildInterfaces.AgentPoolQueue} queue
+	     * @param onResult callback function with the resulting BuildInterfaces.AgentPoolQueue
+	     */
+	    createQueue(queue: BuildInterfaces.AgentPoolQueue, onResult: (err: any, statusCode: number, queue: BuildInterfaces.AgentPoolQueue) => void): void;
+	    /**
+	     * Deletes a build queue
+	     *
+	     * @param {number} id
+	     * @param onResult callback function
+	     */
+	    deleteQueue(id: number, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * Gets a queue
+	     *
+	     * @param {number} controllerId
+	     * @param onResult callback function with the resulting BuildInterfaces.AgentPoolQueue
+	     */
+	    getAgentPoolQueue(controllerId: number, onResult: (err: any, statusCode: number, queue: BuildInterfaces.AgentPoolQueue) => void): void;
+	    /**
+	     * Gets queues, optionally filtered by name
+	     *
+	     * @param {string} name
+	     * @param onResult callback function with the resulting BuildInterfaces.AgentPoolQueue[]
+	     */
+	    getQueues(name: string, onResult: (err: any, statusCode: number, queues: BuildInterfaces.AgentPoolQueue[]) => void): void;
+	    /**
+	     * Gets revisions of a definition
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {number} definitionId
+	     * @param onResult callback function with the resulting BuildInterfaces.BuildDefinitionRevision[]
+	     */
+	    getDefinitionRevisions(project: string, definitionId: number, onResult: (err: any, statusCode: number, revisions: BuildInterfaces.BuildDefinitionRevision[]) => void): void;
+	    /**
+	     * @param onResult callback function with the resulting BuildInterfaces.BuildSettings
+	     */
+	    getBuildSettings(onResult: (err: any, statusCode: number, setting: BuildInterfaces.BuildSettings) => void): void;
+	    /**
+	     * Updates the build settings
+	     *
+	     * @param {BuildInterfaces.BuildSettings} settings
+	     * @param onResult callback function with the resulting BuildInterfaces.BuildSettings
+	     */
+	    updateBuildSettings(settings: BuildInterfaces.BuildSettings, onResult: (err: any, statusCode: number, setting: BuildInterfaces.BuildSettings) => void): void;
+	    /**
+	     * Adds a tag to a build
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {number} buildId
+	     * @param {string} tag
+	     * @param onResult callback function with the resulting string[]
+	     */
+	    addBuildTag(project: string, buildId: number, tag: string, onResult: (err: any, statusCode: number, tags: string[]) => void): void;
+	    /**
+	     * Adds tag to a build
+	     *
+	     * @param {string[]} tags
+	     * @param {string} project - Project ID or project name
+	     * @param {number} buildId
+	     * @param onResult callback function with the resulting string[]
+	     */
+	    addBuildTags(tags: string[], project: string, buildId: number, onResult: (err: any, statusCode: number, tags: string[]) => void): void;
+	    /**
+	     * Deletes a tag from a build
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {number} buildId
+	     * @param {string} tag
+	     * @param onResult callback function with the resulting string[]
+	     */
+	    deleteBuildTag(project: string, buildId: number, tag: string, onResult: (err: any, statusCode: number, tags: string[]) => void): void;
+	    /**
+	     * Gets the tags for a build
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {number} buildId
+	     * @param onResult callback function with the resulting string[]
+	     */
+	    getBuildTags(project: string, buildId: number, onResult: (err: any, statusCode: number, tags: string[]) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting string[]
+	     */
+	    getTags(project: string, onResult: (err: any, statusCode: number, tags: string[]) => void): void;
+	    /**
+	     * Deletes a definition template
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {string} templateId
+	     * @param onResult callback function
+	     */
+	    deleteTemplate(project: string, templateId: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * Gets definition template filtered by id
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {string} templateId
+	     * @param onResult callback function with the resulting BuildInterfaces.BuildDefinitionTemplate
+	     */
+	    getTemplate(project: string, templateId: string, onResult: (err: any, statusCode: number, template: BuildInterfaces.BuildDefinitionTemplate) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting BuildInterfaces.BuildDefinitionTemplate[]
+	     */
+	    getTemplates(project: string, onResult: (err: any, statusCode: number, templates: BuildInterfaces.BuildDefinitionTemplate[]) => void): void;
+	    /**
+	     * Saves a definition template
+	     *
+	     * @param {BuildInterfaces.BuildDefinitionTemplate} template
+	     * @param {string} project - Project ID or project name
+	     * @param {string} templateId
+	     * @param onResult callback function with the resulting BuildInterfaces.BuildDefinitionTemplate
+	     */
+	    saveTemplate(template: BuildInterfaces.BuildDefinitionTemplate, project: string, templateId: string, onResult: (err: any, statusCode: number, template: BuildInterfaces.BuildDefinitionTemplate) => void): void;
+	    /**
+	     * Gets details for a build
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {number} buildId
+	     * @param {string} timelineId
+	     * @param {number} changeId
+	     * @param onResult callback function with the resulting BuildInterfaces.Timeline
+	     */
+	    getBuildTimeline(project: string, buildId: number, timelineId: string, changeId: number, onResult: (err: any, statusCode: number, Timeline: BuildInterfaces.Timeline) => void): void;
+	    /**
+	     * Gets the work item ids associated with a build
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {number} buildId
+	     * @param {number} top - The maximum number of workitems to return
+	     * @param onResult callback function with the resulting VSSInterfaces.ResourceRef[]
+	     */
+	    getBuildWorkItemsRefs(project: string, buildId: number, top: number, onResult: (err: any, statusCode: number, workitems: VSSInterfaces.ResourceRef[]) => void): void;
+	    /**
+	     * Gets the work item ids associated with build commits
+	     *
+	     * @param {string[]} commitIds
+	     * @param {string} project - Project ID or project name
+	     * @param {number} buildId
+	     * @param {number} top - The maximum number of workitems to return, also number of commits to consider if commitids are not sent
+	     * @param onResult callback function with the resulting VSSInterfaces.ResourceRef[]
+	     */
+	    getBuildWorkItemsRefsFromCommits(commitIds: string[], project: string, buildId: number, top: number, onResult: (err: any, statusCode: number, workitems: VSSInterfaces.ResourceRef[]) => void): void;
+	}
+	export class QBuildApi extends basem.QClientApiBase implements IQBuildApi {
+	    api: BuildApi;
+	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
+	    /**
+	    * Associates an artifact with a build
+	    *
+	    * @param {BuildInterfaces.BuildArtifact} artifact
+	    * @param {number} buildId
+	    * @param {string} project - Project ID or project name
+	    */
+	    createArtifact(artifact: BuildInterfaces.BuildArtifact, buildId: number, project?: string): Q.Promise<BuildInterfaces.BuildArtifact>;
+	    /**
+	    * Gets a specific artifact for a build
+	    *
+	    * @param {number} buildId
+	    * @param {string} artifactName
+	    * @param {string} project - Project ID or project name
+	    */
+	    getArtifact(buildId: number, artifactName: string, project?: string): Q.Promise<BuildInterfaces.BuildArtifact>;
+	    /**
+	    * Gets all artifacts for a build
+	    *
+	    * @param {number} buildId
+	    * @param {string} project - Project ID or project name
+	    */
+	    getArtifacts(buildId: number, project?: string): Q.Promise<BuildInterfaces.BuildArtifact[]>;
+	    /**
+	    * @param {string} project
+	    * @param {number} definitionId
+	    * @param {string} branchName
+	    */
+	    getBadge(project: string, definitionId: number, branchName?: string): Q.Promise<string>;
+	    /**
+	    * Gets a build
+	    *
+	    * @param {number} buildId
+	    * @param {string} project - Project ID or project name
+	    * @param {string} propertyFilters - A comma-delimited list of properties to include in the results
+	    */
+	    getBuild(buildId: number, project?: string, propertyFilters?: string): Q.Promise<BuildInterfaces.Build>;
+	    /**
+	    * Gets builds
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {number[]} definitions - A comma-delimited list of definition ids
+	    * @param {number[]} queues - A comma-delimited list of queue ids
+	    * @param {string} buildNumber
+	    * @param {Date} minFinishTime
+	    * @param {Date} maxFinishTime
+	    * @param {string} requestedFor
+	    * @param {BuildInterfaces.BuildReason} reasonFilter
+	    * @param {BuildInterfaces.BuildStatus} statusFilter
+	    * @param {BuildInterfaces.BuildResult} resultFilter
+	    * @param {string[]} tagFilters - A comma-delimited list of tags
+	    * @param {string[]} properties - A comma-delimited list of properties to include in the results
+	    * @param {BuildInterfaces.DefinitionType} type - The definition type
+	    * @param {number} top - The maximum number of builds to retrieve
+	    * @param {string} continuationToken
+	    * @param {number} maxBuildsPerDefinition
+	    * @param {BuildInterfaces.QueryDeletedOption} deletedFilter
+	    * @param {BuildInterfaces.BuildQueryOrder} queryOrder
+	    */
+	    getBuilds(project?: string, definitions?: number[], queues?: number[], buildNumber?: string, minFinishTime?: Date, maxFinishTime?: Date, requestedFor?: string, reasonFilter?: BuildInterfaces.BuildReason, statusFilter?: BuildInterfaces.BuildStatus, resultFilter?: BuildInterfaces.BuildResult, tagFilters?: string[], properties?: string[], type?: BuildInterfaces.DefinitionType, top?: number, continuationToken?: string, maxBuildsPerDefinition?: number, deletedFilter?: BuildInterfaces.QueryDeletedOption, queryOrder?: BuildInterfaces.BuildQueryOrder): Q.Promise<BuildInterfaces.Build[]>;
+	    /**
+	    * Queues a build
+	    *
+	    * @param {BuildInterfaces.Build} build
+	    * @param {string} project - Project ID or project name
+	    * @param {boolean} ignoreWarnings
+	    */
+	    queueBuild(build: BuildInterfaces.Build, project?: string, ignoreWarnings?: boolean): Q.Promise<BuildInterfaces.Build>;
+	    /**
+	    * Updates a build
+	    *
+	    * @param {BuildInterfaces.Build} build
+	    * @param {number} buildId
+	    * @param {string} project - Project ID or project name
+	    */
+	    updateBuild(build: BuildInterfaces.Build, buildId: number, project?: string): Q.Promise<BuildInterfaces.Build>;
+	    /**
+	    * Gets the changes associated with a build
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {number} buildId
+	    * @param {number} top - The maximum number of changes to return
+	    */
+	    getBuildCommits(project: string, buildId: number, top?: number): Q.Promise<BuildInterfaces.Change[]>;
+	    /**
+	    * Gets a controller
+	    *
+	    * @param {number} controllerId
+	    */
+	    getBuildController(controllerId: number): Q.Promise<BuildInterfaces.BuildController>;
+	    /**
+	    * Gets controller, optionally filtered by name
+	    *
+	    * @param {string} name
+	    */
+	    getBuildControllers(name?: string): Q.Promise<BuildInterfaces.BuildController[]>;
+	    /**
+	    * Creates a new definition
+	    *
+	    * @param {BuildInterfaces.BuildDefinition} definition
+	    * @param {string} project - Project ID or project name
+	    * @param {number} definitionToCloneId
+	    * @param {number} definitionToCloneRevision
+	    */
+	    createDefinition(definition: BuildInterfaces.BuildDefinition, project?: string, definitionToCloneId?: number, definitionToCloneRevision?: number): Q.Promise<BuildInterfaces.BuildDefinition>;
+	    /**
+	    * Gets a definition, optionally at a specific revision
+	    *
+	    * @param {number} definitionId
+	    * @param {string} project - Project ID or project name
+	    * @param {number} revision
+	    * @param {string[]} propertyFilters
+	    */
+	    getDefinition(definitionId: number, project?: string, revision?: number, propertyFilters?: string[]): Q.Promise<BuildInterfaces.DefinitionReference>;
+	    /**
+	    * Gets definitions, optionally filtered by name
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {string} name
+	    * @param {BuildInterfaces.DefinitionType} type
+	    */
+	    getDefinitions(project?: string, name?: string, type?: BuildInterfaces.DefinitionType): Q.Promise<BuildInterfaces.DefinitionReference[]>;
+	    /**
+	    * Updates an existing definition
+	    *
+	    * @param {BuildInterfaces.BuildDefinition} definition
+	    * @param {number} definitionId
+	    * @param {string} project - Project ID or project name
+	    * @param {number} secretsSourceDefinitionId
+	    * @param {number} secretsSourceDefinitionRevision
+	    */
+	    updateDefinition(definition: BuildInterfaces.BuildDefinition, definitionId: number, project?: string, secretsSourceDefinitionId?: number, secretsSourceDefinitionRevision?: number): Q.Promise<BuildInterfaces.BuildDefinition>;
+	    /**
+	    * Gets the deployment information associated with a build
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {number} buildId
+	    */
+	    getBuildDeployments(project: string, buildId: number): Q.Promise<BuildInterfaces.Deployment[]>;
+	    /**
+	    * Gets logs for a build
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {number} buildId
+	    */
+	    getBuildLogs(project: string, buildId: number): Q.Promise<BuildInterfaces.BuildLog[]>;
+	    /**
+	    */
+	    getBuildOptionDefinitions(): Q.Promise<BuildInterfaces.BuildOptionDefinition[]>;
+	    /**
+	    * Creates a build queue
+	    *
+	    * @param {BuildInterfaces.AgentPoolQueue} queue
+	    */
+	    createQueue(queue: BuildInterfaces.AgentPoolQueue): Q.Promise<BuildInterfaces.AgentPoolQueue>;
+	    /**
+	    * Gets a queue
+	    *
+	    * @param {number} controllerId
+	    */
+	    getAgentPoolQueue(controllerId: number): Q.Promise<BuildInterfaces.AgentPoolQueue>;
+	    /**
+	    * Gets queues, optionally filtered by name
+	    *
+	    * @param {string} name
+	    */
+	    getQueues(name?: string): Q.Promise<BuildInterfaces.AgentPoolQueue[]>;
+	    /**
+	    * Gets revisions of a definition
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {number} definitionId
+	    */
+	    getDefinitionRevisions(project: string, definitionId: number): Q.Promise<BuildInterfaces.BuildDefinitionRevision[]>;
+	    /**
+	    */
+	    getBuildSettings(): Q.Promise<BuildInterfaces.BuildSettings>;
+	    /**
+	    * Updates the build settings
+	    *
+	    * @param {BuildInterfaces.BuildSettings} settings
+	    */
+	    updateBuildSettings(settings: BuildInterfaces.BuildSettings): Q.Promise<BuildInterfaces.BuildSettings>;
+	    /**
+	    * Adds a tag to a build
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {number} buildId
+	    * @param {string} tag
+	    */
+	    addBuildTag(project: string, buildId: number, tag: string): Q.Promise<string[]>;
+	    /**
+	    * Adds tag to a build
+	    *
+	    * @param {string[]} tags
+	    * @param {string} project - Project ID or project name
+	    * @param {number} buildId
+	    */
+	    addBuildTags(tags: string[], project: string, buildId: number): Q.Promise<string[]>;
+	    /**
+	    * Deletes a tag from a build
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {number} buildId
+	    * @param {string} tag
+	    */
+	    deleteBuildTag(project: string, buildId: number, tag: string): Q.Promise<string[]>;
+	    /**
+	    * Gets the tags for a build
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {number} buildId
+	    */
+	    getBuildTags(project: string, buildId: number): Q.Promise<string[]>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    */
+	    getTags(project: string): Q.Promise<string[]>;
+	    /**
+	    * Gets definition template filtered by id
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {string} templateId
+	    */
+	    getTemplate(project: string, templateId: string): Q.Promise<BuildInterfaces.BuildDefinitionTemplate>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    */
+	    getTemplates(project: string): Q.Promise<BuildInterfaces.BuildDefinitionTemplate[]>;
+	    /**
+	    * Saves a definition template
+	    *
+	    * @param {BuildInterfaces.BuildDefinitionTemplate} template
+	    * @param {string} project - Project ID or project name
+	    * @param {string} templateId
+	    */
+	    saveTemplate(template: BuildInterfaces.BuildDefinitionTemplate, project: string, templateId: string): Q.Promise<BuildInterfaces.BuildDefinitionTemplate>;
+	    /**
+	    * Gets details for a build
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {number} buildId
+	    * @param {string} timelineId
+	    * @param {number} changeId
+	    */
+	    getBuildTimeline(project: string, buildId: number, timelineId?: string, changeId?: number): Q.Promise<BuildInterfaces.Timeline>;
+	    /**
+	    * Gets the work item ids associated with a build
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {number} buildId
+	    * @param {number} top - The maximum number of workitems to return
+	    */
+	    getBuildWorkItemsRefs(project: string, buildId: number, top?: number): Q.Promise<VSSInterfaces.ResourceRef[]>;
+	    /**
+	    * Gets the work item ids associated with build commits
+	    *
+	    * @param {string[]} commitIds
+	    * @param {string} project - Project ID or project name
+	    * @param {number} buildId
+	    * @param {number} top - The maximum number of workitems to return, also number of commits to consider if commitids are not sent
+	    */
+	    getBuildWorkItemsRefsFromCommits(commitIds: string[], project: string, buildId: number, top?: number): Q.Promise<VSSInterfaces.ResourceRef[]>;
+	}
+
+}
+declare module 'vso-node-api/interfaces/CoreInterfaces' {
+	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
+	export enum ConnectedServiceKind {
+	    /**
+	     * Custom or unknown service
+	     */
+	    Custom = 0,
+	    /**
+	     * Azure Subscription
+	     */
+	    AzureSubscription = 1,
+	    /**
+	     * Chef Connection
+	     */
+	    Chef = 2,
+	    /**
+	     * Generic Connection
+	     */
+	    Generic = 3,
+	}
+	export interface IdentityData {
+	    identityIds: string[];
+	}
+	export interface Process extends ProcessReference {
+	    _links: any;
+	    description: string;
+	    id: string;
+	    isDefault: boolean;
+	}
+	export interface ProcessReference {
+	    name: string;
+	    url: string;
+	}
+	export enum ProjectChangeType {
+	    Modified = 0,
+	    Deleted = 1,
+	    Added = 2,
+	}
+	/**
+	 * Contains information of the project
+	 */
+	export interface ProjectInfo {
+	    abbreviation: string;
+	    description: string;
+	    id: string;
+	    lastUpdateTime: Date;
+	    name: string;
+	    properties: ProjectProperty[];
+	    /**
+	     * Current revision of the project
+	     */
+	    revision: number;
+	    state: any;
+	    uri: string;
+	    version: number;
+	}
+	export interface ProjectMessage {
+	    project: ProjectInfo;
+	    projectChangeType: ProjectChangeType;
+	}
+	export interface ProjectProperty {
+	    name: string;
+	    value: string;
+	}
+	export interface Proxy {
+	    /**
+	     * This is a description string
+	     */
+	    description: string;
+	    /**
+	     * The friendly name of the server
+	     */
+	    friendlyName: string;
+	    globalDefault: boolean;
+	    /**
+	     * This is a string representation of the site that the proxy server is located in (e.g. "NA-WA-RED")
+	     */
+	    site: string;
+	    siteDefault: boolean;
+	    /**
+	     * The URL of the proxy server
+	     */
+	    url: string;
+	}
+	export enum SourceControlTypes {
+	    Tfvc = 1,
+	    Git = 2,
+	}
+	/**
+	 * The Team Context for an operation.
+	 */
+	export interface TeamContext {
+	    /**
+	     * The team project Id or name.  Ignored if ProjectId is set.
+	     */
+	    project: string;
+	    /**
+	     * The Team Project ID.  Required if Project is not set.
+	     */
+	    projectId: string;
+	    /**
+	     * The Team Id or name.  Ignored if TeamId is set.
+	     */
+	    team: string;
+	    /**
+	     * The Team Id
+	     */
+	    teamId: string;
+	}
+	/**
+	 * Represents a Team Project object.
+	 */
+	export interface TeamProject extends TeamProjectReference {
+	    /**
+	     * The links to other objects related to this object.
+	     */
+	    _links: any;
+	    capabilities: {
+	        [key: string]: {
+	            [key: string]: string;
+	        };
+	    };
+	    /**
+	     * The shallow ref to the default team.
+	     */
+	    defaultTeam: WebApiTeamRef;
+	}
+	/**
+	 * Data contract for a TeamProjectCollection.
+	 */
+	export interface TeamProjectCollection extends TeamProjectCollectionReference {
+	    /**
+	     * The links to other objects related to this object.
+	     */
+	    _links: any;
+	    /**
+	     * Project collection description.
+	     */
+	    description: string;
+	    /**
+	     * Project collection state.
+	     */
+	    state: string;
+	}
+	/**
+	 * Reference object for a TeamProjectCollection.
+	 */
+	export interface TeamProjectCollectionReference {
+	    /**
+	     * Collection Id.
+	     */
+	    id: string;
+	    /**
+	     * Collection Name.
+	     */
+	    name: string;
+	    /**
+	     * Collection REST Url.
+	     */
+	    url: string;
+	}
+	/**
+	 * Represents a shallow reference to a TeamProject.
+	 */
+	export interface TeamProjectReference {
+	    /**
+	     * Project abbreviation.
+	     */
+	    abbreviation: string;
+	    /**
+	     * The project's description (if any).
+	     */
+	    description: string;
+	    /**
+	     * Project identifier.
+	     */
+	    id: string;
+	    /**
+	     * Project name.
+	     */
+	    name: string;
+	    /**
+	     * Project revision.
+	     */
+	    revision: number;
+	    /**
+	     * Project state.
+	     */
+	    state: any;
+	    /**
+	     * Url to the full version of the object.
+	     */
+	    url: string;
+	}
+	export interface WebApiConnectedService extends WebApiConnectedServiceRef {
+	    /**
+	     * The user who did the OAuth authentication to created this service
+	     */
+	    authenticatedBy: VSSInterfaces.IdentityRef;
+	    /**
+	     * Extra description on the service.
+	     */
+	    description: string;
+	    /**
+	     * Friendly Name of service connection
+	     */
+	    friendlyName: string;
+	    /**
+	     * Id/Name of the connection service. For Ex: Subscription Id for Azure Connection
+	     */
+	    id: string;
+	    /**
+	     * The kind of service.
+	     */
+	    kind: string;
+	    /**
+	     * The project associated with this service
+	     */
+	    project: TeamProjectReference;
+	    /**
+	     * Optional uri to connect directly to the service such as https://windows.azure.com
+	     */
+	    serviceUri: string;
+	}
+	export interface WebApiConnectedServiceDetails extends WebApiConnectedServiceRef {
+	    /**
+	     * Meta data for service connection
+	     */
+	    connectedServiceMetaData: WebApiConnectedService;
+	    /**
+	     * Credential info
+	     */
+	    credentialsXml: string;
+	    /**
+	     * Optional uri to connect directly to the service such as https://windows.azure.com
+	     */
+	    endPoint: string;
+	}
+	export interface WebApiConnectedServiceRef {
+	    id: string;
+	    url: string;
+	}
+	/**
+	 * The representation of data needed to create a tag definition which is sent across the wire.
+	 */
+	export interface WebApiCreateTagRequestData {
+	    name: string;
+	}
+	export interface WebApiProject extends TeamProjectReference {
+	    /**
+	     * Set of capabilities this project has
+	     */
+	    capabilities: {
+	        [key: string]: {
+	            [key: string]: string;
+	        };
+	    };
+	    /**
+	     * Reference to collection which contains this project
+	     */
+	    collection: WebApiProjectCollectionRef;
+	    /**
+	     * Default team for this project
+	     */
+	    defaultTeam: WebApiTeamRef;
+	}
+	export interface WebApiProjectCollection extends WebApiProjectCollectionRef {
+	    /**
+	     * Project collection description
+	     */
+	    description: string;
+	    /**
+	     * Project collection state
+	     */
+	    state: string;
+	}
+	export interface WebApiProjectCollectionRef {
+	    /**
+	     * Collection Tfs Url (Host Url)
+	     */
+	    collectionUrl: string;
+	    /**
+	     * Collection Guid
+	     */
+	    id: string;
+	    /**
+	     * Collection Name
+	     */
+	    name: string;
+	    /**
+	     * Collection REST Url
+	     */
+	    url: string;
+	}
+	/**
+	 * The representation of a tag definition which is sent across the wire.
+	 */
+	export interface WebApiTagDefinition {
+	    active: boolean;
+	    id: string;
+	    name: string;
+	    url: string;
+	}
+	export interface WebApiTeam extends WebApiTeamRef {
+	    /**
+	     * Team description
+	     */
+	    description: string;
+	    /**
+	     * Identity REST API Url to this team
+	     */
+	    identityUrl: string;
+	}
+	export interface WebApiTeamRef {
+	    /**
+	     * Team (Identity) Guid. A Team Foundation ID.
+	     */
+	    id: string;
+	    /**
+	     * Team name
+	     */
+	    name: string;
+	    /**
+	     * Team REST API Url
+	     */
+	    url: string;
+	}
+	export var TypeInfo: {
+	    ConnectedServiceKind: {
+	        enumValues: {
+	            "custom": number;
+	            "azureSubscription": number;
+	            "chef": number;
+	            "generic": number;
+	        };
+	    };
+	    IdentityData: {
+	        fields: any;
+	    };
+	    Process: {
+	        fields: any;
+	    };
+	    ProcessReference: {
+	        fields: any;
+	    };
+	    ProjectChangeType: {
+	        enumValues: {
+	            "modified": number;
+	            "deleted": number;
+	            "added": number;
+	        };
+	    };
+	    ProjectInfo: {
+	        fields: any;
+	    };
+	    ProjectMessage: {
+	        fields: any;
+	    };
+	    ProjectProperty: {
+	        fields: any;
+	    };
+	    Proxy: {
+	        fields: any;
+	    };
+	    SourceControlTypes: {
+	        enumValues: {
+	            "tfvc": number;
+	            "git": number;
+	        };
+	    };
+	    TeamContext: {
+	        fields: any;
+	    };
+	    TeamProject: {
+	        fields: any;
+	    };
+	    TeamProjectCollection: {
+	        fields: any;
+	    };
+	    TeamProjectCollectionReference: {
+	        fields: any;
+	    };
+	    TeamProjectReference: {
+	        fields: any;
+	    };
+	    WebApiConnectedService: {
+	        fields: any;
+	    };
+	    WebApiConnectedServiceDetails: {
+	        fields: any;
+	    };
+	    WebApiConnectedServiceRef: {
+	        fields: any;
+	    };
+	    WebApiCreateTagRequestData: {
+	        fields: any;
+	    };
+	    WebApiProject: {
+	        fields: any;
+	    };
+	    WebApiProjectCollection: {
+	        fields: any;
+	    };
+	    WebApiProjectCollectionRef: {
+	        fields: any;
+	    };
+	    WebApiTagDefinition: {
+	        fields: any;
+	    };
+	    WebApiTeam: {
+	        fields: any;
+	    };
+	    WebApiTeamRef: {
+	        fields: any;
+	    };
+	};
+
+}
+declare module 'vso-node-api/interfaces/common/OperationsInterfaces' {
+	/**
+	 * Reference for an async operation.
+	 */
+	export interface OperationReference {
+	    /**
+	     * The identifier for this operation.
+	     */
+	    id: string;
+	    /**
+	     * The current status of the operation.
+	     */
+	    status: OperationStatus;
+	    /**
+	     * Url to get the full object.
+	     */
+	    url: string;
+	}
+	export enum OperationStatus {
+	    /**
+	     * The operation object does not have the status set.
+	     */
+	    NotSet = 0,
+	    /**
+	     * The operation has been queued.
+	     */
+	    Queued = 1,
+	    /**
+	     * The operation is in progress.
+	     */
+	    InProgress = 2,
+	    /**
+	     * The operation was cancelled by the user.
+	     */
+	    Cancelled = 3,
+	    /**
+	     * The operation completed successfully.
+	     */
+	    Succeeded = 4,
+	    /**
+	     * The operation completed with a failure.
+	     */
+	    Failed = 5,
+	}
+	export var TypeInfo: {
+	    OperationReference: {
+	        fields: any;
+	    };
+	    OperationStatus: {
+	        enumValues: {
+	            "notSet": number;
+	            "queued": number;
+	            "inProgress": number;
+	            "cancelled": number;
+	            "succeeded": number;
+	            "failed": number;
+	        };
+	    };
+	};
+
+}
+declare module 'vso-node-api/CoreApi' {
+	/// <reference types="node" />
+	/// <reference types="Q" />
+	import Q = require('q');
+	import basem = require('vso-node-api/ClientApiBases');
+	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
+	import CoreInterfaces = require('vso-node-api/interfaces/CoreInterfaces');
+	import OperationsInterfaces = require('vso-node-api/interfaces/common/OperationsInterfaces');
+	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
+	export interface ICoreApi extends basem.ClientApiBase {
+	    createConnectedService(connectedServiceCreationData: CoreInterfaces.WebApiConnectedServiceDetails, projectId: string, onResult: (err: any, statusCode: number, connectedService: CoreInterfaces.WebApiConnectedService) => void): void;
+	    getConnectedServiceDetails(projectId: string, name: string, onResult: (err: any, statusCode: number, connectedService: CoreInterfaces.WebApiConnectedServiceDetails) => void): void;
+	    getConnectedServices(projectId: string, kind: CoreInterfaces.ConnectedServiceKind, onResult: (err: any, statusCode: number, connectedServices: CoreInterfaces.WebApiConnectedService[]) => void): void;
+	    createIdentityMru(mruData: CoreInterfaces.IdentityData, mruName: string, onResult: (err: any, statusCode: number) => void): void;
+	    deleteIdentityMru(mruData: CoreInterfaces.IdentityData, mruName: string, onResult: (err: any, statusCode: number) => void): void;
+	    getIdentityMru(mruName: string, onResult: (err: any, statusCode: number, identityMru: VSSInterfaces.IdentityRef[]) => void): void;
+	    updateIdentityMru(mruData: CoreInterfaces.IdentityData, mruName: string, onResult: (err: any, statusCode: number) => void): void;
+	    getTeamMembers(projectId: string, teamId: string, top: number, skip: number, onResult: (err: any, statusCode: number, members: VSSInterfaces.IdentityRef[]) => void): void;
+	    getProjectCollection(collectionId: string, onResult: (err: any, statusCode: number, projectCollection: CoreInterfaces.TeamProjectCollection) => void): void;
+	    getProjectCollections(top: number, skip: number, onResult: (err: any, statusCode: number, projectCollections: CoreInterfaces.TeamProjectCollectionReference[]) => void): void;
+	    getProjectHistory(minRevision: number, onResult: (err: any, statusCode: number, projectHistory: CoreInterfaces.TeamProjectReference[]) => void): void;
+	    getProject(projectId: string, includeCapabilities: boolean, includeHistory: boolean, onResult: (err: any, statusCode: number, project: CoreInterfaces.TeamProject) => void): void;
+	    getProjects(stateFilter: any, top: number, skip: number, onResult: (err: any, statusCode: number, projects: CoreInterfaces.TeamProjectReference[]) => void): void;
+	    queueCreateProject(projectToCreate: CoreInterfaces.TeamProject, onResult: (err: any, statusCode: number, project: OperationsInterfaces.OperationReference) => void): void;
+	    queueDeleteProject(projectId: string, onResult: (err: any, statusCode: number, project: OperationsInterfaces.OperationReference) => void): void;
+	    updateProject(projectUpdate: CoreInterfaces.TeamProject, projectId: string, onResult: (err: any, statusCode: number, project: OperationsInterfaces.OperationReference) => void): void;
+	    getProxies(proxyUrl: string, onResult: (err: any, statusCode: number, proxies: CoreInterfaces.Proxy[]) => void): void;
+	    getTeams(projectId: string, teamId: string, top: number, skip: number, onResult: (err: any, statusCode: number, team: CoreInterfaces.WebApiTeam) => void): void;
+	}
+	export interface IQCoreApi extends basem.QClientApiBase {
+	    createConnectedService(connectedServiceCreationData: CoreInterfaces.WebApiConnectedServiceDetails, projectId: string): Q.Promise<CoreInterfaces.WebApiConnectedService>;
+	    getConnectedServiceDetails(projectId: string, name: string): Q.Promise<CoreInterfaces.WebApiConnectedServiceDetails>;
+	    getConnectedServices(projectId: string, kind?: CoreInterfaces.ConnectedServiceKind): Q.Promise<CoreInterfaces.WebApiConnectedService[]>;
+	    getIdentityMru(mruName: string): Q.Promise<VSSInterfaces.IdentityRef[]>;
+	    getTeamMembers(projectId: string, teamId: string, top?: number, skip?: number): Q.Promise<VSSInterfaces.IdentityRef[]>;
+	    getProjectCollection(collectionId: string): Q.Promise<CoreInterfaces.TeamProjectCollection>;
+	    getProjectCollections(top?: number, skip?: number): Q.Promise<CoreInterfaces.TeamProjectCollectionReference[]>;
+	    getProjectHistory(minRevision?: number): Q.Promise<CoreInterfaces.TeamProjectReference[]>;
+	    getProject(projectId: string, includeCapabilities?: boolean, includeHistory?: boolean): Q.Promise<CoreInterfaces.TeamProject>;
+	    getProjects(stateFilter?: any, top?: number, skip?: number): Q.Promise<CoreInterfaces.TeamProjectReference[]>;
+	    queueCreateProject(projectToCreate: CoreInterfaces.TeamProject): Q.Promise<OperationsInterfaces.OperationReference>;
+	    queueDeleteProject(projectId: string): Q.Promise<OperationsInterfaces.OperationReference>;
+	    updateProject(projectUpdate: CoreInterfaces.TeamProject, projectId: string): Q.Promise<OperationsInterfaces.OperationReference>;
+	    getProxies(proxyUrl?: string): Q.Promise<CoreInterfaces.Proxy[]>;
+	    getTeams(projectId: string, teamId?: string, top?: number, skip?: number): Q.Promise<CoreInterfaces.WebApiTeam>;
+	}
+	export class CoreApi extends basem.ClientApiBase implements ICoreApi {
+	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
+	    /**
+	     * @param {CoreInterfaces.WebApiConnectedServiceDetails} connectedServiceCreationData
+	     * @param {string} projectId
+	     * @param onResult callback function with the resulting CoreInterfaces.WebApiConnectedService
+	     */
+	    createConnectedService(connectedServiceCreationData: CoreInterfaces.WebApiConnectedServiceDetails, projectId: string, onResult: (err: any, statusCode: number, connectedService: CoreInterfaces.WebApiConnectedService) => void): void;
+	    /**
+	     * @param {string} projectId
+	     * @param {string} name
+	     * @param onResult callback function with the resulting CoreInterfaces.WebApiConnectedServiceDetails
+	     */
+	    getConnectedServiceDetails(projectId: string, name: string, onResult: (err: any, statusCode: number, connectedService: CoreInterfaces.WebApiConnectedServiceDetails) => void): void;
+	    /**
+	     * @param {string} projectId
+	     * @param {CoreInterfaces.ConnectedServiceKind} kind
+	     * @param onResult callback function with the resulting CoreInterfaces.WebApiConnectedService[]
+	     */
+	    getConnectedServices(projectId: string, kind: CoreInterfaces.ConnectedServiceKind, onResult: (err: any, statusCode: number, connectedServices: CoreInterfaces.WebApiConnectedService[]) => void): void;
+	    /**
+	     * @param {CoreInterfaces.IdentityData} mruData
+	     * @param {string} mruName
+	     * @param onResult callback function
+	     */
+	    createIdentityMru(mruData: CoreInterfaces.IdentityData, mruName: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {CoreInterfaces.IdentityData} mruData
+	     * @param {string} mruName
+	     * @param onResult callback function
+	     */
+	    deleteIdentityMru(mruData: CoreInterfaces.IdentityData, mruName: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {string} mruName
+	     * @param onResult callback function with the resulting VSSInterfaces.IdentityRef[]
+	     */
+	    getIdentityMru(mruName: string, onResult: (err: any, statusCode: number, identityMru: VSSInterfaces.IdentityRef[]) => void): void;
+	    /**
+	     * @param {CoreInterfaces.IdentityData} mruData
+	     * @param {string} mruName
+	     * @param onResult callback function
+	     */
+	    updateIdentityMru(mruData: CoreInterfaces.IdentityData, mruName: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {string} projectId
+	     * @param {string} teamId
+	     * @param {number} top
+	     * @param {number} skip
+	     * @param onResult callback function with the resulting VSSInterfaces.IdentityRef[]
+	     */
+	    getTeamMembers(projectId: string, teamId: string, top: number, skip: number, onResult: (err: any, statusCode: number, members: VSSInterfaces.IdentityRef[]) => void): void;
+	    /**
+	     * Get project collection with the specified id or name.
+	     *
+	     * @param {string} collectionId
+	     * @param onResult callback function with the resulting CoreInterfaces.TeamProjectCollection
+	     */
+	    getProjectCollection(collectionId: string, onResult: (err: any, statusCode: number, projectCollection: CoreInterfaces.TeamProjectCollection) => void): void;
+	    /**
+	     * Get project collection references for this application.
+	     *
+	     * @param {number} top
+	     * @param {number} skip
+	     * @param onResult callback function with the resulting CoreInterfaces.TeamProjectCollectionReference[]
+	     */
+	    getProjectCollections(top: number, skip: number, onResult: (err: any, statusCode: number, projectCollections: CoreInterfaces.TeamProjectCollectionReference[]) => void): void;
+	    /**
+	     * @param {number} minRevision
+	     * @param onResult callback function with the resulting CoreInterfaces.TeamProjectReference[]
+	     */
+	    getProjectHistory(minRevision: number, onResult: (err: any, statusCode: number, projectHistory: CoreInterfaces.TeamProjectReference[]) => void): void;
+	    /**
+	     * Get project with the specified id or name, optionally including capabilities.
+	     *
+	     * @param {string} projectId
+	     * @param {boolean} includeCapabilities - Include capabilities (such as source control) in the team project result (default: false).
+	     * @param {boolean} includeHistory - Search within renamed projects (that had such name in the past).
+	     * @param onResult callback function with the resulting CoreInterfaces.TeamProject
+	     */
+	    getProject(projectId: string, includeCapabilities: boolean, includeHistory: boolean, onResult: (err: any, statusCode: number, project: CoreInterfaces.TeamProject) => void): void;
+	    /**
+	     * Get project references with the specified state
+	     *
+	     * @param {any} stateFilter - Filter on team projects in a specific team project state (default: WellFormed).
+	     * @param {number} top
+	     * @param {number} skip
+	     * @param onResult callback function with the resulting CoreInterfaces.TeamProjectReference[]
+	     */
+	    getProjects(stateFilter: any, top: number, skip: number, onResult: (err: any, statusCode: number, projects: CoreInterfaces.TeamProjectReference[]) => void): void;
+	    /**
+	     * Queue a project creation.
+	     *
+	     * @param {CoreInterfaces.TeamProject} projectToCreate - The project to create.
+	     * @param onResult callback function with the resulting OperationsInterfaces.OperationReference
+	     */
+	    queueCreateProject(projectToCreate: CoreInterfaces.TeamProject, onResult: (err: any, statusCode: number, project: OperationsInterfaces.OperationReference) => void): void;
+	    /**
+	     * Queue a project deletion.
+	     *
+	     * @param {string} projectId - The project id of the project to delete.
+	     * @param onResult callback function with the resulting OperationsInterfaces.OperationReference
+	     */
+	    queueDeleteProject(projectId: string, onResult: (err: any, statusCode: number, project: OperationsInterfaces.OperationReference) => void): void;
+	    /**
+	     * Update an existing project's name, abbreviation, or description.
+	     *
+	     * @param {CoreInterfaces.TeamProject} projectUpdate - The updates for the project.
+	     * @param {string} projectId - The project id of the project to update.
+	     * @param onResult callback function with the resulting OperationsInterfaces.OperationReference
+	     */
+	    updateProject(projectUpdate: CoreInterfaces.TeamProject, projectId: string, onResult: (err: any, statusCode: number, project: OperationsInterfaces.OperationReference) => void): void;
+	    /**
+	     * @param {string} proxyUrl
+	     * @param onResult callback function with the resulting CoreInterfaces.Proxy[]
+	     */
+	    getProxies(proxyUrl: string, onResult: (err: any, statusCode: number, proxies: CoreInterfaces.Proxy[]) => void): void;
+	    /**
+	     * @param {string} projectId
+	     * @param {string} teamId
+	     * @param {number} top
+	     * @param {number} skip
+	     * @param onResult callback function with the resulting CoreInterfaces.WebApiTeam
+	     */
+	    getTeams(projectId: string, teamId: string, top: number, skip: number, onResult: (err: any, statusCode: number, team: CoreInterfaces.WebApiTeam) => void): void;
+	}
+	export class QCoreApi extends basem.QClientApiBase implements IQCoreApi {
+	    api: CoreApi;
+	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
+	    /**
+	    * @param {CoreInterfaces.WebApiConnectedServiceDetails} connectedServiceCreationData
+	    * @param {string} projectId
+	    */
+	    createConnectedService(connectedServiceCreationData: CoreInterfaces.WebApiConnectedServiceDetails, projectId: string): Q.Promise<CoreInterfaces.WebApiConnectedService>;
+	    /**
+	    * @param {string} projectId
+	    * @param {string} name
+	    */
+	    getConnectedServiceDetails(projectId: string, name: string): Q.Promise<CoreInterfaces.WebApiConnectedServiceDetails>;
+	    /**
+	    * @param {string} projectId
+	    * @param {CoreInterfaces.ConnectedServiceKind} kind
+	    */
+	    getConnectedServices(projectId: string, kind?: CoreInterfaces.ConnectedServiceKind): Q.Promise<CoreInterfaces.WebApiConnectedService[]>;
+	    /**
+	    * @param {string} mruName
+	    */
+	    getIdentityMru(mruName: string): Q.Promise<VSSInterfaces.IdentityRef[]>;
+	    /**
+	    * @param {string} projectId
+	    * @param {string} teamId
+	    * @param {number} top
+	    * @param {number} skip
+	    */
+	    getTeamMembers(projectId: string, teamId: string, top?: number, skip?: number): Q.Promise<VSSInterfaces.IdentityRef[]>;
+	    /**
+	    * Get project collection with the specified id or name.
+	    *
+	    * @param {string} collectionId
+	    */
+	    getProjectCollection(collectionId: string): Q.Promise<CoreInterfaces.TeamProjectCollection>;
+	    /**
+	    * Get project collection references for this application.
+	    *
+	    * @param {number} top
+	    * @param {number} skip
+	    */
+	    getProjectCollections(top?: number, skip?: number): Q.Promise<CoreInterfaces.TeamProjectCollectionReference[]>;
+	    /**
+	    * @param {number} minRevision
+	    */
+	    getProjectHistory(minRevision?: number): Q.Promise<CoreInterfaces.TeamProjectReference[]>;
+	    /**
+	    * Get project with the specified id or name, optionally including capabilities.
+	    *
+	    * @param {string} projectId
+	    * @param {boolean} includeCapabilities - Include capabilities (such as source control) in the team project result (default: false).
+	    * @param {boolean} includeHistory - Search within renamed projects (that had such name in the past).
+	    */
+	    getProject(projectId: string, includeCapabilities?: boolean, includeHistory?: boolean): Q.Promise<CoreInterfaces.TeamProject>;
+	    /**
+	    * Get project references with the specified state
+	    *
+	    * @param {any} stateFilter - Filter on team projects in a specific team project state (default: WellFormed).
+	    * @param {number} top
+	    * @param {number} skip
+	    */
+	    getProjects(stateFilter?: any, top?: number, skip?: number): Q.Promise<CoreInterfaces.TeamProjectReference[]>;
+	    /**
+	    * Queue a project creation.
+	    *
+	    * @param {CoreInterfaces.TeamProject} projectToCreate - The project to create.
+	    */
+	    queueCreateProject(projectToCreate: CoreInterfaces.TeamProject): Q.Promise<OperationsInterfaces.OperationReference>;
+	    /**
+	    * Queue a project deletion.
+	    *
+	    * @param {string} projectId - The project id of the project to delete.
+	    */
+	    queueDeleteProject(projectId: string): Q.Promise<OperationsInterfaces.OperationReference>;
+	    /**
+	    * Update an existing project's name, abbreviation, or description.
+	    *
+	    * @param {CoreInterfaces.TeamProject} projectUpdate - The updates for the project.
+	    * @param {string} projectId - The project id of the project to update.
+	    */
+	    updateProject(projectUpdate: CoreInterfaces.TeamProject, projectId: string): Q.Promise<OperationsInterfaces.OperationReference>;
+	    /**
+	    * @param {string} proxyUrl
+	    */
+	    getProxies(proxyUrl?: string): Q.Promise<CoreInterfaces.Proxy[]>;
+	    /**
+	    * @param {string} projectId
+	    * @param {string} teamId
+	    * @param {number} top
+	    * @param {number} skip
+	    */
+	    getTeams(projectId: string, teamId?: string, top?: number, skip?: number): Q.Promise<CoreInterfaces.WebApiTeam>;
+	}
+
+}
+declare module 'vso-node-api/interfaces/FileContainerInterfaces' {
+	export enum ContainerItemStatus {
+	    /**
+	     * Item is created.
+	     */
+	    Created = 1,
+	    /**
+	     * Item is a file pending for upload.
+	     */
+	    PendingUpload = 2,
+	}
+	export enum ContainerItemType {
+	    /**
+	     * Any item type.
+	     */
+	    Any = 0,
+	    /**
+	     * Item is a folder which can have child items.
+	     */
+	    Folder = 1,
+	    /**
+	     * Item is a file which is stored in the file service.
+	     */
+	    File = 2,
+	}
+	export enum ContainerOptions {
+	    /**
+	     * No option.
+	     */
+	    None = 0,
+	}
+	/**
+	 * Represents a container that encapsulates a hierarchical file system.
+	 */
+	export interface FileContainer {
+	    /**
+	     * Uri of the artifact associated with the container.
+	     */
+	    artifactUri: string;
+	    contentLocation: string;
+	    /**
+	     * Owner.
+	     */
+	    createdBy: string;
+	    /**
+	     * Creation date.
+	     */
+	    dateCreated: Date;
+	    /**
+	     * Description.
+	     */
+	    description: string;
+	    /**
+	     * Id.
+	     */
+	    id: number;
+	    /**
+	     * Location of the item resource.
+	     */
+	    itemLocation: string;
+	    /**
+	     * Name.
+	     */
+	    name: string;
+	    /**
+	     * Options the container can have.
+	     */
+	    options: ContainerOptions;
+	    /**
+	     * Project Id.
+	     */
+	    scopeIdentifier: string;
+	    /**
+	     * Security token of the artifact associated with the container.
+	     */
+	    securityToken: string;
+	    /**
+	     * Identifier of the optional encryption key.
+	     */
+	    signingKeyId: string;
+	    /**
+	     * Total size of the files in bytes.
+	     */
+	    size: number;
+	}
+	/**
+	 * Represents an item in a container.
+	 */
+	export interface FileContainerItem {
+	    /**
+	     * Container Id.
+	     */
+	    containerId: number;
+	    contentId: number[];
+	    contentLocation: string;
+	    /**
+	     * Creator.
+	     */
+	    createdBy: string;
+	    /**
+	     * Creation date.
+	     */
+	    dateCreated: Date;
+	    /**
+	     * Last modified date.
+	     */
+	    dateLastModified: Date;
+	    /**
+	     * Encoding of the file. Zero if not a file.
+	     */
+	    fileEncoding: number;
+	    /**
+	     * Hash value of the file. Null if not a file.
+	     */
+	    fileHash: number[];
+	    /**
+	     * Length of the file. Zero if not of a file.
+	     */
+	    fileLength: number;
+	    /**
+	     * Type of the file. Zero if not a file.
+	     */
+	    fileType: number;
+	    /**
+	     * Location of the item resource.
+	     */
+	    itemLocation: string;
+	    /**
+	     * Type of the item: Folder, File or String.
+	     */
+	    itemType: ContainerItemType;
+	    /**
+	     * Modifier.
+	     */
+	    lastModifiedBy: string;
+	    /**
+	     * Unique path that identifies the item.
+	     */
+	    path: string;
+	    /**
+	     * Project Id.
+	     */
+	    scopeIdentifier: string;
+	    /**
+	     * Status of the item: Created or Pending Upload.
+	     */
+	    status: ContainerItemStatus;
+	    ticket: string;
+	}
+	export var TypeInfo: {
+	    ContainerItemStatus: {
+	        enumValues: {
+	            "created": number;
+	            "pendingUpload": number;
+	        };
+	    };
+	    ContainerItemType: {
+	        enumValues: {
+	            "any": number;
+	            "folder": number;
+	            "file": number;
+	        };
+	    };
+	    ContainerOptions: {
+	        enumValues: {
+	            "none": number;
+	        };
+	    };
+	    FileContainer: {
+	        fields: any;
+	    };
+	    FileContainerItem: {
+	        fields: any;
+	    };
+	};
+
+}
+declare module 'vso-node-api/FileContainerApi' {
+	/// <reference types="node" />
+	/// <reference types="Q" />
+	import Q = require('q');
+	import basem = require('vso-node-api/ClientApiBases');
+	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
+	import FileContainerInterfaces = require('vso-node-api/interfaces/FileContainerInterfaces');
+	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
+	export interface IFileContainerApi extends basem.ClientApiBase {
+	    createItem(customHeaders: any, contentStream: NodeJS.ReadableStream, containerId: number, itemPath: string, scope: string, onResult: (err: any, statusCode: number, Container: FileContainerInterfaces.FileContainerItem) => void): void;
+	    createItems(items: VSSInterfaces.VssJsonCollectionWrapperV<FileContainerInterfaces.FileContainerItem[]>, containerId: number, scope: string, onResult: (err: any, statusCode: number, Container: FileContainerInterfaces.FileContainerItem[]) => void): void;
+	    deleteItem(containerId: number, itemPath: string, scope: string, onResult: (err: any, statusCode: number) => void): void;
+	    getContainers(scope: string, artifactUris: string, onResult: (err: any, statusCode: number, Containers: FileContainerInterfaces.FileContainer[]) => void): void;
+	    getItems(containerId: number, scope: string, itemPath: string, metadata: boolean, format: string, downloadFileName: string, includeDownloadTickets: boolean, onResult: (err: any, statusCode: number, Containers: FileContainerInterfaces.FileContainerItem[]) => void): void;
+	}
+	export interface IQFileContainerApi extends basem.QClientApiBase {
+	    createItem(customHeaders: any, contentStream: NodeJS.ReadableStream, containerId: number, itemPath: string, scope?: string): Q.Promise<FileContainerInterfaces.FileContainerItem>;
+	    createItems(items: VSSInterfaces.VssJsonCollectionWrapperV<FileContainerInterfaces.FileContainerItem[]>, containerId: number, scope?: string): Q.Promise<FileContainerInterfaces.FileContainerItem[]>;
+	    getContainers(scope?: string, artifactUris?: string): Q.Promise<FileContainerInterfaces.FileContainer[]>;
+	    getItems(containerId: number, scope?: string, itemPath?: string, metadata?: boolean, format?: string, downloadFileName?: string, includeDownloadTickets?: boolean): Q.Promise<FileContainerInterfaces.FileContainerItem[]>;
+	}
+	export class FileContainerApi extends basem.ClientApiBase implements IFileContainerApi {
+	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
+	    /**
+	     * Creates the specified item in the container referenced container.
+	     *
+	     * @param {NodeJS.ReadableStream} contentStream
+	     * @param {number} containerId
+	     * @param {string} itemPath
+	     * @param {string} scope - A guid representing the scope of the container. This is often the project id.
+	     * @param onResult callback function with the resulting FileContainerInterfaces.FileContainerItem
+	     */
+	    createItem(customHeaders: any, contentStream: NodeJS.ReadableStream, containerId: number, itemPath: string, scope: string, onResult: (err: any, statusCode: number, Container: FileContainerInterfaces.FileContainerItem) => void): void;
+	    /**
+	     * Creates the specified items in in the referenced container.
+	     *
+	     * @param {VSSInterfaces.VssJsonCollectionWrapperV<FileContainerInterfaces.FileContainerItem[]>} items
+	     * @param {number} containerId
+	     * @param {string} scope - A guid representing the scope of the container. This is often the project id.
+	     * @param onResult callback function with the resulting FileContainerInterfaces.FileContainerItem[]
+	     */
+	    createItems(items: VSSInterfaces.VssJsonCollectionWrapperV<FileContainerInterfaces.FileContainerItem[]>, containerId: number, scope: string, onResult: (err: any, statusCode: number, Container: FileContainerInterfaces.FileContainerItem[]) => void): void;
+	    /**
+	     * Deletes the specified items in a container.
+	     *
+	     * @param {number} containerId - Container Id.
+	     * @param {string} itemPath - Path to delete.
+	     * @param {string} scope - A guid representing the scope of the container. This is often the project id.
+	     * @param onResult callback function
+	     */
+	    deleteItem(containerId: number, itemPath: string, scope: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * Gets containers filtered by a comma separated list of artifact uris within the same scope, if not specified returns all containers
+	     *
+	     * @param {string} scope - A guid representing the scope of the container. This is often the project id.
+	     * @param {string} artifactUris
+	     * @param onResult callback function with the resulting FileContainerInterfaces.FileContainer[]
+	     */
+	    getContainers(scope: string, artifactUris: string, onResult: (err: any, statusCode: number, Containers: FileContainerInterfaces.FileContainer[]) => void): void;
+	    /**
+	     * Gets the specified file container object in a format dependent upon the given parameters or HTTP Accept request header
+	     *
+	     * @param {number} containerId - The requested container Id
+	     * @param {string} scope - A guid representing the scope of the container. This is often the project id.
+	     * @param {string} itemPath - The path to the item of interest
+	     * @param {boolean} metadata - If true, this overrides any specified format parameter or HTTP Accept request header to provide non-recursive information for the given itemPath
+	     * @param {string} format - If specified, this overrides the HTTP Accept request header to return either 'json' or 'zip'.  If $format is specified, then api-version should also be specified as a query parameter.
+	     * @param {string} downloadFileName - If specified and returning other than JSON format, then this download name will be used (else defaults to itemPath)
+	     * @param {boolean} includeDownloadTickets
+	     * @param onResult callback function with the resulting FileContainerInterfaces.FileContainerItem[]
+	     */
+	    getItems(containerId: number, scope: string, itemPath: string, metadata: boolean, format: string, downloadFileName: string, includeDownloadTickets: boolean, onResult: (err: any, statusCode: number, Containers: FileContainerInterfaces.FileContainerItem[]) => void): void;
+	}
+	export class QFileContainerApi extends basem.QClientApiBase implements IQFileContainerApi {
+	    api: FileContainerApi;
+	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
+	    /**
+	    * Creates the specified item in the container referenced container.
+	    *
+	    * @param {NodeJS.ReadableStream} contentStream
+	    * @param {number} containerId
+	    * @param {string} itemPath
+	    * @param {string} scope - A guid representing the scope of the container. This is often the project id.
+	    */
+	    createItem(customHeaders: any, contentStream: NodeJS.ReadableStream, containerId: number, itemPath: string, scope?: string): Q.Promise<FileContainerInterfaces.FileContainerItem>;
+	    /**
+	    * Creates the specified items in in the referenced container.
+	    *
+	    * @param {VSSInterfaces.VssJsonCollectionWrapperV<FileContainerInterfaces.FileContainerItem[]>} items
+	    * @param {number} containerId
+	    * @param {string} scope - A guid representing the scope of the container. This is often the project id.
+	    */
+	    createItems(items: VSSInterfaces.VssJsonCollectionWrapperV<FileContainerInterfaces.FileContainerItem[]>, containerId: number, scope?: string): Q.Promise<FileContainerInterfaces.FileContainerItem[]>;
+	    /**
+	    * Gets containers filtered by a comma separated list of artifact uris within the same scope, if not specified returns all containers
+	    *
+	    * @param {string} scope - A guid representing the scope of the container. This is often the project id.
+	    * @param {string} artifactUris
+	    */
+	    getContainers(scope?: string, artifactUris?: string): Q.Promise<FileContainerInterfaces.FileContainer[]>;
+	    /**
+	    * Gets the specified file container object in a format dependent upon the given parameters or HTTP Accept request header
+	    *
+	    * @param {number} containerId - The requested container Id
+	    * @param {string} scope - A guid representing the scope of the container. This is often the project id.
+	    * @param {string} itemPath - The path to the item of interest
+	    * @param {boolean} metadata - If true, this overrides any specified format parameter or HTTP Accept request header to provide non-recursive information for the given itemPath
+	    * @param {string} format - If specified, this overrides the HTTP Accept request header to return either 'json' or 'zip'.  If $format is specified, then api-version should also be specified as a query parameter.
+	    * @param {string} downloadFileName - If specified and returning other than JSON format, then this download name will be used (else defaults to itemPath)
+	    * @param {boolean} includeDownloadTickets
+	    */
+	    getItems(containerId: number, scope?: string, itemPath?: string, metadata?: boolean, format?: string, downloadFileName?: string, includeDownloadTickets?: boolean): Q.Promise<FileContainerInterfaces.FileContainerItem[]>;
+	}
+
+}
+declare module 'vso-node-api/interfaces/GalleryInterfaces' {
+	export interface ExtensionAccount {
+	    accountId: string;
+	    accountName: string;
+	}
+	export interface ExtensionFile {
+	    assetType: string;
+	    contentType: string;
+	    fileId: number;
+	    shortDescription: string;
+	    version: string;
+	}
+	/**
+	 * The FilterResult is the set of extensions that matched a particular query filter.
+	 */
+	export interface ExtensionFilterResult {
+	    /**
+	     * This is the set of appplications that matched the query filter supplied.
+	     */
+	    extensions: PublishedExtension[];
+	    /**
+	     * The PagingToken is returned from a request when more records exist that match the result than were requested or could be returned. A follow-up query with this paging token can be used to retrieve more results.
+	     */
+	    pagingToken: string;
+	}
+	/**
+	 * Package that will be used to create or update a published extension
+	 */
+	export interface ExtensionPackage {
+	    /**
+	     * Base 64 encoded extension package
+	     */
+	    extensionManifest: string;
+	}
+	/**
+	 * An ExtensionQuery is used to search the gallery for a set of extensions that match one of many filter values.
+	 */
+	export interface ExtensionQuery {
+	    /**
+	     * Each filter is a unique query and will have matching set of extensions returned from the request. Each result will have the same index in the resulting array that the filter had in the incoming query.
+	     */
+	    filters: QueryFilter[];
+	    /**
+	     * The Flags are used to deterine which set of information the caller would like returned for the matched extensions.
+	     */
+	    flags: ExtensionQueryFlags;
+	}
+	export enum ExtensionQueryFilterType {
+	    /**
+	     * The values are used as tags. All tags are treated as "OR" conditions with each other. There may be some value put on the number of matched tags from the query.
+	     */
+	    Tag = 1,
+	    /**
+	     * The Values are an ExtensionName or fragment that is used to match other extension names.
+	     */
+	    DisplayName = 2,
+	    /**
+	     * The Filter is one or more tokens that define what scope to return private extensions for.
+	     */
+	    Private = 3,
+	    /**
+	     * Retrieve a set of extensions based on their id's. The values should be the extension id's encoded as strings.
+	     */
+	    Id = 4,
+	    /**
+	     * The catgeory is unlike other filters. It is AND'd with the other filters instead of being a seperate query.
+	     */
+	    Category = 5,
+	    /**
+	     * Certain contribution types may be indexed to allow for query by type. User defined types can't be indexed at the moment.
+	     */
+	    ContributionType = 6,
+	}
+	export enum ExtensionQueryFlags {
+	    /**
+	     * None is used to retrieve only the basic extension details.
+	     */
+	    None = 0,
+	    /**
+	     * IncludeVersions will return version information for extensions returned
+	     */
+	    IncludeVersions = 1,
+	    /**
+	     * IncludeFiles will return information about which files were found within the extension that were stored independant of the manifest. When asking for files, versions will be included as well since files are returned as a property of the versions.  These files can be retrieved using the path to the file without requiring the entire manifest be downloaded.
+	     */
+	    IncludeFiles = 2,
+	    /**
+	     * Include the Categories and Tags that were added to the extension definition.
+	     */
+	    IncludeCategoryAndTags = 4,
+	    /**
+	     * Include the details about which accounts the extension has been shared with if the extesion is a private extension.
+	     */
+	    IncludeSharedAccounts = 8,
+	    /**
+	     * Include properties associated with versions of the extension
+	     */
+	    IncludeVersionProperties = 16,
+	    /**
+	     * Excluding non-validated extensions will remove any extension versions that either are in the process of being validated or have failed validation.
+	     */
+	    ExcludeNonValidated = 32,
+	    /**
+	     * AllAttributes is designed to be a mask that defines all sub-elements of the extension should be returned.
+	     */
+	    AllAttributes = 31,
+	}
+	/**
+	 * This is the set of extensions that matched a supplied query through the filters given.
+	 */
+	export interface ExtensionQueryResult {
+	    /**
+	     * For each filter supplied in the query, a filter result will be returned in the query result.
+	     */
+	    results: ExtensionFilterResult[];
+	}
+	export interface ExtensionVersion {
+	    files: ExtensionFile[];
+	    flags: ExtensionVersionFlags;
+	    lastUpdated: Date;
+	    properties: {
+	        key: string;
+	        value: string;
+	    }[];
+	    validationResultMessage: string;
+	    version: string;
+	    versionDescription: string;
+	}
+	export enum ExtensionVersionFlags {
+	    /**
+	     * No flags exist for this version.
+	     */
+	    None = 0,
+	    /**
+	     * The Validated flag for a version means the extension version has passed validation and can be used..
+	     */
+	    Validated = 1,
+	}
+	/**
+	 * One condition in a QueryFilter.
+	 */
+	export interface FilterCriteria {
+	    filterType: number;
+	    /**
+	     * The value used in the match based on the filter type.
+	     */
+	    value: string;
+	}
+	export enum PagingDirection {
+	    /**
+	     * Backward will return results from earlier in the resultset.
+	     */
+	    Backward = 1,
+	    /**
+	     * Forward will return results from later in the resultset.
+	     */
+	    Forward = 2,
+	}
+	export interface PublishedExtension {
+	    allowedAccounts: ExtensionAccount[];
+	    categories: string[];
+	    displayName: string;
+	    extensionId: string;
+	    extensionName: string;
+	    flags: PublishedExtensionFlags;
+	    lastUpdated: Date;
+	    longDescription: string;
+	    publisher: PublisherFacts;
+	    shortDescription: string;
+	    tags: string[];
+	    versions: ExtensionVersion[];
+	}
+	export enum PublishedExtensionFlags {
+	    /**
+	     * This should never be returned, it is used to represent a extension who's flags havent changed during update calls.
+	     */
+	    UnChanged = 1073741824,
+	    /**
+	     * No flags exist for this extension.
+	     */
+	    None = 0,
+	    /**
+	     * The Disabled flag for an extension means the extension can't be changed and won't be used by consumers. The disabled flag is managed by the service and can't be supplied by the Extension Developers.
+	     */
+	    Disabled = 1,
+	    /**
+	     * BuiltIn Extension are available to all Tenants. An explicit registration is not required. This attribute is reserved and can't be supplied by Extension Developers.  BuiltIn extensions are by definition Public. There is no need to set the public flag for extensions marked BuiltIn.
+	     */
+	    BuiltIn = 2,
+	    /**
+	     * This extension has been validated by the service. The extension meets the requirements specified. This attribute is reserved and can't be supplied by the Extension Developers. Validation is a process that ensures that all contributions are well formed. They meet the requirements defined by the contribution type they are extending. Note this attribute will be updated asynchronously as the extension is validated by the developer of the contribution type. There will be restricted access to the extension while this process is performed.
+	     */
+	    Validated = 4,
+	    /**
+	     * This extension registration is public, making its visibilty open to the public. This means all tenants have the ability to install this extension. Without this flag the extension will be private and will need to be shared with the tenants that can install it.
+	     */
+	    Public = 256,
+	    /**
+	     * This extension has multiple versions active at one time and version discovery should be done usig the defined "Version Discovery" protocol to determine the version available to a specific user or tenant.  @TODO: Link to Version Discovery Protocol.
+	     */
+	    MultiVersion = 512,
+	    /**
+	     * The system flag is reserved, and cant be used by publishers.
+	     */
+	    System = 1024,
+	    /**
+	     * This is the set of flags that can't be supplied by the developer and is managed by the service itself.
+	     */
+	    ServiceFlags = 1029,
+	}
+	export interface Publisher {
+	    displayName: string;
+	    extensions: PublishedExtension[];
+	    flags: PublisherFlags;
+	    lastUpdated: Date;
+	    longDescription: string;
+	    publisherId: string;
+	    publisherName: string;
+	    shortDescription: string;
+	}
+	/**
+	 * High-level information about the publisher, like id's and names
+	 */
+	export interface PublisherFacts {
+	    displayName: string;
+	    publisherId: string;
+	    publisherName: string;
+	}
+	/**
+	 * The FilterResult is the set of publishers that matched a particular query filter.
+	 */
+	export interface PublisherFilterResult {
+	    /**
+	     * This is the set of appplications that matched the query filter supplied.
+	     */
+	    publishers: Publisher[];
+	}
+	export enum PublisherFlags {
+	    /**
+	     * This should never be returned, it is used to represent a publisher who's flags havent changed during update calls.
+	     */
+	    UnChanged = 1073741824,
+	    /**
+	     * No flags exist for this publisher.
+	     */
+	    None = 0,
+	    /**
+	     * The Disabled flag for a publisher means the publisher can't be changed and won't be used by consumers, this extends to extensions owned by the publisher as well. The disabled flag is managed by the service and can't be supplied by the Extension Developers.
+	     */
+	    Disabled = 1,
+	    /**
+	     * This is the set of flags that can't be supplied by the developer and is managed by the service itself.
+	     */
+	    ServiceFlags = 1,
+	}
+	export enum PublisherPermissions {
+	    /**
+	     * This gives the bearer the rights to read Publishers and Extensions.
+	     */
+	    Read = 1,
+	    /**
+	     * This gives the bearer the rights to update Publishers and Extensions (but not the ability to Create them).
+	     */
+	    Write = 2,
+	    /**
+	     * This gives the bearer the rights to create new Publishers at the root of the namespace.
+	     */
+	    Create = 4,
+	    /**
+	     * This gives the bearer the rights to create new Extensions within a publisher.
+	     */
+	    Publish = 8,
+	    /**
+	     * Admin gives the bearer the rights to manage restricted attributes of Publishers and Extensions.
+	     */
+	    Admin = 16,
+	    /**
+	     * TrustedPartner gives the bearer the rights to publish a extensions with restricted capabilities.
+	     */
+	    TrustedPartner = 32,
+	    /**
+	     * PrivateRead is another form of read designed to allow higher privilege accessors the ability to read private extensions.
+	     */
+	    PrivateRead = 64,
+	}
+	/**
+	 * An PublisherQuery is used to search the gallery for a set of publishers that match one of many filter values.
+	 */
+	export interface PublisherQuery {
+	    /**
+	     * Each filter is a unique query and will have matching set of publishers returned from the request. Each result will have the same index in the resulting array that the filter had in the incoming query.
+	     */
+	    filters: QueryFilter[];
+	    /**
+	     * The Flags are used to deterine which set of information the caller would like returned for the matched publishers.
+	     */
+	    flags: PublisherQueryFlags;
+	}
+	export enum PublisherQueryFilterType {
+	    /**
+	     * The values are used as tags. All tags are treated as "OR" conditions with each other. There may be some value put on the number of matched tags from the query.
+	     */
+	    Tag = 1,
+	    /**
+	     * The Values are an PublisherName or fragment that is used to match other extension names.
+	     */
+	    DisplayName = 2,
+	    /**
+	     * The My Query filter is used to retrieve the set of publishers that I have access to publish extesions into. All Values are ignored and the calling user is used as the filter in this case.
+	     */
+	    My = 3,
+	}
+	export enum PublisherQueryFlags {
+	    /**
+	     * None is used to retrieve only the basic publisher details.
+	     */
+	    None = 0,
+	    /**
+	     * Is used to include a list of basic extension details for all extensions published by the requested publisher.
+	     */
+	    IncludeExtensions = 1,
+	}
+	/**
+	 * This is the set of publishers that matched a supplied query through the filters given.
+	 */
+	export interface PublisherQueryResult {
+	    /**
+	     * For each filter supplied in the query, a filter result will be returned in the query result.
+	     */
+	    results: PublisherFilterResult[];
+	}
+	/**
+	 * A filter used to define a set of extensions to return during a query.
+	 */
+	export interface QueryFilter {
+	    /**
+	     * The filter values define the set of values in this query. They are applied based on the QueryFilterType.
+	     */
+	    criteria: FilterCriteria[];
+	    /**
+	     * The PagingDirection is applied to a paging token if one exists. If not the direction is ignored, and Forward from the start of the resultset is used. Direction should be left out of the request unless a paging token is used to help prevent future issues.
+	     */
+	    direction: PagingDirection;
+	    /**
+	     * The page size defines the number of results the caller wants for this filter. The count can't exceed the overall query size limits.
+	     */
+	    pageSize: number;
+	    /**
+	     * The paging token is a distinct type of filter and the other filter fields are ignored. The paging token represents the continuation of a previously executed query. The information about where in the result and what fields are being filtered are embeded in the token.
+	     */
+	    pagingToken: string;
+	}
+	export enum SigningKeyPermissions {
+	    Read = 1,
+	    Write = 2,
+	}
+	export var TypeInfo: {
+	    ExtensionAccount: {
+	        fields: any;
+	    };
+	    ExtensionFile: {
+	        fields: any;
+	    };
+	    ExtensionFilterResult: {
+	        fields: any;
+	    };
+	    ExtensionPackage: {
+	        fields: any;
+	    };
+	    ExtensionQuery: {
+	        fields: any;
+	    };
+	    ExtensionQueryFilterType: {
+	        enumValues: {
+	            "tag": number;
+	            "displayName": number;
+	            "private": number;
+	            "id": number;
+	            "category": number;
+	            "contributionType": number;
+	        };
+	    };
+	    ExtensionQueryFlags: {
+	        enumValues: {
+	            "none": number;
+	            "includeVersions": number;
+	            "includeFiles": number;
+	            "includeCategoryAndTags": number;
+	            "includeSharedAccounts": number;
+	            "includeVersionProperties": number;
+	            "excludeNonValidated": number;
+	            "allAttributes": number;
+	        };
+	    };
+	    ExtensionQueryResult: {
+	        fields: any;
+	    };
+	    ExtensionVersion: {
+	        fields: any;
+	    };
+	    ExtensionVersionFlags: {
+	        enumValues: {
+	            "none": number;
+	            "validated": number;
+	        };
+	    };
+	    FilterCriteria: {
+	        fields: any;
+	    };
+	    PagingDirection: {
+	        enumValues: {
+	            "backward": number;
+	            "forward": number;
+	        };
+	    };
+	    PublishedExtension: {
+	        fields: any;
+	    };
+	    PublishedExtensionFlags: {
+	        enumValues: {
+	            "unChanged": number;
+	            "none": number;
+	            "disabled": number;
+	            "builtIn": number;
+	            "validated": number;
+	            "public": number;
+	            "multiVersion": number;
+	            "system": number;
+	            "serviceFlags": number;
+	        };
+	    };
+	    Publisher: {
+	        fields: any;
+	    };
+	    PublisherFacts: {
+	        fields: any;
+	    };
+	    PublisherFilterResult: {
+	        fields: any;
+	    };
+	    PublisherFlags: {
+	        enumValues: {
+	            "unChanged": number;
+	            "none": number;
+	            "disabled": number;
+	            "serviceFlags": number;
+	        };
+	    };
+	    PublisherPermissions: {
+	        enumValues: {
+	            "read": number;
+	            "write": number;
+	            "create": number;
+	            "publish": number;
+	            "admin": number;
+	            "trustedPartner": number;
+	            "privateRead": number;
+	        };
+	    };
+	    PublisherQuery: {
+	        fields: any;
+	    };
+	    PublisherQueryFilterType: {
+	        enumValues: {
+	            "tag": number;
+	            "displayName": number;
+	            "my": number;
+	        };
+	    };
+	    PublisherQueryFlags: {
+	        enumValues: {
+	            "none": number;
+	            "includeExtensions": number;
+	        };
+	    };
+	    PublisherQueryResult: {
+	        fields: any;
+	    };
+	    QueryFilter: {
+	        fields: any;
+	    };
+	    SigningKeyPermissions: {
+	        enumValues: {
+	            "read": number;
+	            "write": number;
+	        };
+	    };
+	};
+
+}
+declare module 'vso-node-api/GalleryApi' {
+	/// <reference types="node" />
+	/// <reference types="Q" />
+	import Q = require('q');
+	import basem = require('vso-node-api/ClientApiBases');
+	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
+	import GalleryInterfaces = require('vso-node-api/interfaces/GalleryInterfaces');
+	export interface IGalleryApi extends basem.ClientApiBase {
+	    shareExtensionById(extensionId: string, accountName: string, onResult: (err: any, statusCode: number) => void): void;
+	    unshareExtensionById(extensionId: string, accountName: string, onResult: (err: any, statusCode: number) => void): void;
+	    shareExtension(publisherName: string, extensionName: string, accountName: string, onResult: (err: any, statusCode: number) => void): void;
+	    unshareExtension(publisherName: string, extensionName: string, accountName: string, onResult: (err: any, statusCode: number) => void): void;
+	    getAsset(extensionId: string, version: string, assetType: string, accountToken: string, acceptDefault: boolean, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    getCategories(languages: string, onResult: (err: any, statusCode: number, categories: string[]) => void): void;
+	    getCertificate(publisherName: string, extensionName: string, version: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    queryExtensions(extensionQuery: GalleryInterfaces.ExtensionQuery, accountToken: string, onResult: (err: any, statusCode: number, extensionquery: GalleryInterfaces.ExtensionQueryResult) => void): void;
+	    createExtension(extensionPackage: GalleryInterfaces.ExtensionPackage, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
+	    deleteExtensionById(extensionId: string, version: string, onResult: (err: any, statusCode: number) => void): void;
+	    getExtensionById(extensionId: string, version: string, flags: GalleryInterfaces.ExtensionQueryFlags, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
+	    updateExtensionById(extensionPackage: GalleryInterfaces.ExtensionPackage, extensionId: string, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
+	    createExtensionWithPublisher(extensionPackage: GalleryInterfaces.ExtensionPackage, publisherName: string, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
+	    deleteExtension(publisherName: string, extensionName: string, version: string, onResult: (err: any, statusCode: number) => void): void;
+	    getExtension(publisherName: string, extensionName: string, version: string, flags: GalleryInterfaces.ExtensionQueryFlags, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
+	    updateExtension(extensionPackage: GalleryInterfaces.ExtensionPackage, publisherName: string, extensionName: string, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
+	    queryPublishers(publisherQuery: GalleryInterfaces.PublisherQuery, onResult: (err: any, statusCode: number, publisherquery: GalleryInterfaces.PublisherQueryResult) => void): void;
+	    createPublisher(publisher: GalleryInterfaces.Publisher, onResult: (err: any, statusCode: number, publisher: GalleryInterfaces.Publisher) => void): void;
+	    deletePublisher(publisherName: string, onResult: (err: any, statusCode: number) => void): void;
+	    getPublisher(publisherName: string, flags: number, onResult: (err: any, statusCode: number, publisher: GalleryInterfaces.Publisher) => void): void;
+	    updatePublisher(publisher: GalleryInterfaces.Publisher, publisherName: string, onResult: (err: any, statusCode: number, publisher: GalleryInterfaces.Publisher) => void): void;
+	    generateKey(keyType: string, expireCurrentSeconds: number, onResult: (err: any, statusCode: number) => void): void;
+	    getSigningKey(keyType: string, onResult: (err: any, statusCode: number, signingkey: string) => void): void;
+	}
+	export interface IQGalleryApi extends basem.QClientApiBase {
+	    getCategories(languages?: string): Q.Promise<string[]>;
+	    queryExtensions(extensionQuery: GalleryInterfaces.ExtensionQuery, accountToken?: string): Q.Promise<GalleryInterfaces.ExtensionQueryResult>;
+	    createExtension(extensionPackage: GalleryInterfaces.ExtensionPackage): Q.Promise<GalleryInterfaces.PublishedExtension>;
+	    getExtensionById(extensionId: string, version?: string, flags?: GalleryInterfaces.ExtensionQueryFlags): Q.Promise<GalleryInterfaces.PublishedExtension>;
+	    updateExtensionById(extensionPackage: GalleryInterfaces.ExtensionPackage, extensionId: string): Q.Promise<GalleryInterfaces.PublishedExtension>;
+	    createExtensionWithPublisher(extensionPackage: GalleryInterfaces.ExtensionPackage, publisherName: string): Q.Promise<GalleryInterfaces.PublishedExtension>;
+	    getExtension(publisherName: string, extensionName: string, version?: string, flags?: GalleryInterfaces.ExtensionQueryFlags): Q.Promise<GalleryInterfaces.PublishedExtension>;
+	    updateExtension(extensionPackage: GalleryInterfaces.ExtensionPackage, publisherName: string, extensionName: string): Q.Promise<GalleryInterfaces.PublishedExtension>;
+	    queryPublishers(publisherQuery: GalleryInterfaces.PublisherQuery): Q.Promise<GalleryInterfaces.PublisherQueryResult>;
+	    createPublisher(publisher: GalleryInterfaces.Publisher): Q.Promise<GalleryInterfaces.Publisher>;
+	    getPublisher(publisherName: string, flags?: number): Q.Promise<GalleryInterfaces.Publisher>;
+	    updatePublisher(publisher: GalleryInterfaces.Publisher, publisherName: string): Q.Promise<GalleryInterfaces.Publisher>;
+	    getSigningKey(keyType: string): Q.Promise<string>;
+	}
+	export class GalleryApi extends basem.ClientApiBase implements IGalleryApi {
+	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
+	    /**
+	     * @param {string} extensionId
+	     * @param {string} accountName
+	     * @param onResult callback function
+	     */
+	    shareExtensionById(extensionId: string, accountName: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {string} extensionId
+	     * @param {string} accountName
+	     * @param onResult callback function
+	     */
+	    unshareExtensionById(extensionId: string, accountName: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {string} publisherName
+	     * @param {string} extensionName
+	     * @param {string} accountName
+	     * @param onResult callback function
+	     */
+	    shareExtension(publisherName: string, extensionName: string, accountName: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {string} publisherName
+	     * @param {string} extensionName
+	     * @param {string} accountName
+	     * @param onResult callback function
+	     */
+	    unshareExtension(publisherName: string, extensionName: string, accountName: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {string} extensionId
+	     * @param {string} version
+	     * @param {string} assetType
+	     * @param {string} accountToken
+	     * @param {boolean} acceptDefault
+	     * @param onResult callback function with the resulting ArrayBuffer
+	     */
+	    getAsset(extensionId: string, version: string, assetType: string, accountToken: string, acceptDefault: boolean, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    /**
+	     * @param {string} languages
+	     * @param onResult callback function with the resulting string[]
+	     */
+	    getCategories(languages: string, onResult: (err: any, statusCode: number, categories: string[]) => void): void;
+	    /**
+	     * @param {string} publisherName
+	     * @param {string} extensionName
+	     * @param {string} version
+	     * @param onResult callback function with the resulting ArrayBuffer
+	     */
+	    getCertificate(publisherName: string, extensionName: string, version: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    /**
+	     * @param {GalleryInterfaces.ExtensionQuery} extensionQuery
+	     * @param {string} accountToken
+	     * @param onResult callback function with the resulting GalleryInterfaces.ExtensionQueryResult
+	     */
+	    queryExtensions(extensionQuery: GalleryInterfaces.ExtensionQuery, accountToken: string, onResult: (err: any, statusCode: number, extensionquery: GalleryInterfaces.ExtensionQueryResult) => void): void;
+	    /**
+	     * @param {GalleryInterfaces.ExtensionPackage} extensionPackage
+	     * @param onResult callback function with the resulting GalleryInterfaces.PublishedExtension
+	     */
+	    createExtension(extensionPackage: GalleryInterfaces.ExtensionPackage, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
+	    /**
+	     * @param {string} extensionId
+	     * @param {string} version
+	     * @param onResult callback function
+	     */
+	    deleteExtensionById(extensionId: string, version: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {string} extensionId
+	     * @param {string} version
+	     * @param {GalleryInterfaces.ExtensionQueryFlags} flags
+	     * @param onResult callback function with the resulting GalleryInterfaces.PublishedExtension
+	     */
+	    getExtensionById(extensionId: string, version: string, flags: GalleryInterfaces.ExtensionQueryFlags, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
+	    /**
+	     * @param {GalleryInterfaces.ExtensionPackage} extensionPackage
+	     * @param {string} extensionId
+	     * @param onResult callback function with the resulting GalleryInterfaces.PublishedExtension
+	     */
+	    updateExtensionById(extensionPackage: GalleryInterfaces.ExtensionPackage, extensionId: string, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
+	    /**
+	     * @param {GalleryInterfaces.ExtensionPackage} extensionPackage
+	     * @param {string} publisherName
+	     * @param onResult callback function with the resulting GalleryInterfaces.PublishedExtension
+	     */
+	    createExtensionWithPublisher(extensionPackage: GalleryInterfaces.ExtensionPackage, publisherName: string, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
+	    /**
+	     * @param {string} publisherName
+	     * @param {string} extensionName
+	     * @param {string} version
+	     * @param onResult callback function
+	     */
+	    deleteExtension(publisherName: string, extensionName: string, version: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {string} publisherName
+	     * @param {string} extensionName
+	     * @param {string} version
+	     * @param {GalleryInterfaces.ExtensionQueryFlags} flags
+	     * @param onResult callback function with the resulting GalleryInterfaces.PublishedExtension
+	     */
+	    getExtension(publisherName: string, extensionName: string, version: string, flags: GalleryInterfaces.ExtensionQueryFlags, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
+	    /**
+	     * @param {GalleryInterfaces.ExtensionPackage} extensionPackage
+	     * @param {string} publisherName
+	     * @param {string} extensionName
+	     * @param onResult callback function with the resulting GalleryInterfaces.PublishedExtension
+	     */
+	    updateExtension(extensionPackage: GalleryInterfaces.ExtensionPackage, publisherName: string, extensionName: string, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
+	    /**
+	     * @param {GalleryInterfaces.PublisherQuery} publisherQuery
+	     * @param onResult callback function with the resulting GalleryInterfaces.PublisherQueryResult
+	     */
+	    queryPublishers(publisherQuery: GalleryInterfaces.PublisherQuery, onResult: (err: any, statusCode: number, publisherquery: GalleryInterfaces.PublisherQueryResult) => void): void;
+	    /**
+	     * @param {GalleryInterfaces.Publisher} publisher
+	     * @param onResult callback function with the resulting GalleryInterfaces.Publisher
+	     */
+	    createPublisher(publisher: GalleryInterfaces.Publisher, onResult: (err: any, statusCode: number, publisher: GalleryInterfaces.Publisher) => void): void;
+	    /**
+	     * @param {string} publisherName
+	     * @param onResult callback function
+	     */
+	    deletePublisher(publisherName: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {string} publisherName
+	     * @param {number} flags
+	     * @param onResult callback function with the resulting GalleryInterfaces.Publisher
+	     */
+	    getPublisher(publisherName: string, flags: number, onResult: (err: any, statusCode: number, publisher: GalleryInterfaces.Publisher) => void): void;
+	    /**
+	     * @param {GalleryInterfaces.Publisher} publisher
+	     * @param {string} publisherName
+	     * @param onResult callback function with the resulting GalleryInterfaces.Publisher
+	     */
+	    updatePublisher(publisher: GalleryInterfaces.Publisher, publisherName: string, onResult: (err: any, statusCode: number, publisher: GalleryInterfaces.Publisher) => void): void;
+	    /**
+	     * @param {string} keyType
+	     * @param {number} expireCurrentSeconds
+	     * @param onResult callback function
+	     */
+	    generateKey(keyType: string, expireCurrentSeconds: number, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {string} keyType
+	     * @param onResult callback function with the resulting string
+	     */
+	    getSigningKey(keyType: string, onResult: (err: any, statusCode: number, signingkey: string) => void): void;
+	}
+	export class QGalleryApi extends basem.QClientApiBase implements IQGalleryApi {
+	    api: GalleryApi;
+	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
+	    /**
+	    * @param {string} languages
+	    */
+	    getCategories(languages?: string): Q.Promise<string[]>;
+	    /**
+	    * @param {GalleryInterfaces.ExtensionQuery} extensionQuery
+	    * @param {string} accountToken
+	    */
+	    queryExtensions(extensionQuery: GalleryInterfaces.ExtensionQuery, accountToken?: string): Q.Promise<GalleryInterfaces.ExtensionQueryResult>;
+	    /**
+	    * @param {GalleryInterfaces.ExtensionPackage} extensionPackage
+	    */
+	    createExtension(extensionPackage: GalleryInterfaces.ExtensionPackage): Q.Promise<GalleryInterfaces.PublishedExtension>;
+	    /**
+	    * @param {string} extensionId
+	    * @param {string} version
+	    * @param {GalleryInterfaces.ExtensionQueryFlags} flags
+	    */
+	    getExtensionById(extensionId: string, version?: string, flags?: GalleryInterfaces.ExtensionQueryFlags): Q.Promise<GalleryInterfaces.PublishedExtension>;
+	    /**
+	    * @param {GalleryInterfaces.ExtensionPackage} extensionPackage
+	    * @param {string} extensionId
+	    */
+	    updateExtensionById(extensionPackage: GalleryInterfaces.ExtensionPackage, extensionId: string): Q.Promise<GalleryInterfaces.PublishedExtension>;
+	    /**
+	    * @param {GalleryInterfaces.ExtensionPackage} extensionPackage
+	    * @param {string} publisherName
+	    */
+	    createExtensionWithPublisher(extensionPackage: GalleryInterfaces.ExtensionPackage, publisherName: string): Q.Promise<GalleryInterfaces.PublishedExtension>;
+	    /**
+	    * @param {string} publisherName
+	    * @param {string} extensionName
+	    * @param {string} version
+	    * @param {GalleryInterfaces.ExtensionQueryFlags} flags
+	    */
+	    getExtension(publisherName: string, extensionName: string, version?: string, flags?: GalleryInterfaces.ExtensionQueryFlags): Q.Promise<GalleryInterfaces.PublishedExtension>;
+	    /**
+	    * @param {GalleryInterfaces.ExtensionPackage} extensionPackage
+	    * @param {string} publisherName
+	    * @param {string} extensionName
+	    */
+	    updateExtension(extensionPackage: GalleryInterfaces.ExtensionPackage, publisherName: string, extensionName: string): Q.Promise<GalleryInterfaces.PublishedExtension>;
+	    /**
+	    * @param {GalleryInterfaces.PublisherQuery} publisherQuery
+	    */
+	    queryPublishers(publisherQuery: GalleryInterfaces.PublisherQuery): Q.Promise<GalleryInterfaces.PublisherQueryResult>;
+	    /**
+	    * @param {GalleryInterfaces.Publisher} publisher
+	    */
+	    createPublisher(publisher: GalleryInterfaces.Publisher): Q.Promise<GalleryInterfaces.Publisher>;
+	    /**
+	    * @param {string} publisherName
+	    * @param {number} flags
+	    */
+	    getPublisher(publisherName: string, flags?: number): Q.Promise<GalleryInterfaces.Publisher>;
+	    /**
+	    * @param {GalleryInterfaces.Publisher} publisher
+	    * @param {string} publisherName
+	    */
+	    updatePublisher(publisher: GalleryInterfaces.Publisher, publisherName: string): Q.Promise<GalleryInterfaces.Publisher>;
+	    /**
+	    * @param {string} keyType
+	    */
+	    getSigningKey(keyType: string): Q.Promise<string>;
+	}
+
+}
+declare module 'vso-node-api/interfaces/GitInterfaces' {
+	import TfsInterfaces = require('vso-node-api/interfaces/common/TfsInterfaces');
+	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
+	export interface AssociatedWorkItem {
+	    assignedTo: string;
+	    id: number;
+	    state: string;
+	    title: string;
+	    /**
+	     * REST url
+	     */
+	    url: string;
+	    webUrl: string;
+	    workItemType: string;
+	}
+	export interface Change<T> {
+	    changeType: VersionControlChangeType;
+	    item: T;
+	    newContent: ItemContent;
+	    sourceServerItem: string;
+	    url: string;
+	}
+	export interface ChangeCountDictionary {
+	}
+	export interface ChangeList<T> {
+	    allChangesIncluded: boolean;
+	    changeCounts: {
+	        [key: number]: number;
+	    };
+	    changes: Change<T>[];
+	    comment: string;
+	    commentTruncated: boolean;
+	    creationDate: Date;
+	    notes: CheckinNote[];
+	    owner: string;
+	    ownerDisplayName: string;
+	    ownerId: string;
+	    sortDate: Date;
+	    version: string;
+	}
+	/**
+	 * Criteria used in a search for change lists
+	 */
+	export interface ChangeListSearchCriteria {
+	    /**
+	     * If provided, a version descriptor to compare against base
+	     */
+	    compareVersion: string;
+	    /**
+	     * If true, don't include delete history entries
+	     */
+	    excludeDeletes: boolean;
+	    /**
+	     * Whether or not to follow renames for the given item being queried
+	     */
+	    followRenames: boolean;
+	    /**
+	     * If provided, only include history entries created after this date (string)
+	     */
+	    fromDate: string;
+	    /**
+	     * If provided, a version descriptor for the earliest change list to include
+	     */
+	    fromVersion: string;
+	    /**
+	     * Path of item to search under
+	     */
+	    itemPath: string;
+	    /**
+	     * Version of the items to search
+	     */
+	    itemVersion: string;
+	    /**
+	     * Number of results to skip (used when clicking more...)
+	     */
+	    skip: number;
+	    /**
+	     * If provided, only include history entries created before this date (string)
+	     */
+	    toDate: string;
+	    /**
+	     * If provided, the maximum number of history entries to return
+	     */
+	    top: number;
+	    /**
+	     * If provided, a version descriptor for the latest change list to include
+	     */
+	    toVersion: string;
+	    /**
+	     * Alias or display name of user who made the changes
+	     */
+	    user: string;
+	}
+	export interface CheckinNote {
+	    name: string;
+	    value: string;
+	}
+	export interface FileContentMetadata {
+	    contentType: string;
+	    encoding: number;
+	    extension: string;
+	    fileName: string;
+	    isBinary: boolean;
+	    isImage: boolean;
+	    vsLink: string;
+	}
+	export interface GitBaseVersionDescriptor extends GitVersionDescriptor {
+	    /**
+	     * Version string identifier (name of tag/branch, SHA1 of commit)
+	     */
+	    baseVersion: string;
+	    /**
+	     * Version options - Specify additional modifiers to version (e.g Previous)
+	     */
+	    baseVersionOptions: GitVersionOptions;
+	    /**
+	     * Version type (branch, tag, or commit). Determines how Id is interpreted
+	     */
+	    baseVersionType: GitVersionType;
+	}
+	export interface GitBlobRef {
+	    _links: any;
+	    /**
+	     * SHA1 hash of git object
+	     */
+	    objectId: string;
+	    /**
+	     * Size of blob content (in bytes)
+	     */
+	    size: number;
+	    url: string;
+	}
+	export interface GitBranchStats {
+	    aheadCount: number;
+	    behindCount: number;
+	    commit: GitCommitRef;
+	    isBaseVersion: boolean;
+	    name: string;
+	}
+	export interface GitChange extends Change<GitItem> {
+	}
+	export interface GitCommit extends GitCommitRef {
+	    push: GitPushRef;
+	    treeId: string;
+	}
+	export interface GitCommitChanges {
+	    changeCounts: ChangeCountDictionary;
+	    changes: GitChange[];
+	}
+	export interface GitCommitDiffs {
+	    aheadCount: number;
+	    allChangesIncluded: boolean;
+	    baseCommit: string;
+	    behindCount: number;
+	    changeCounts: {
+	        [key: number]: number;
+	    };
+	    changes: GitChange[];
+	    commonCommit: string;
+	    targetCommit: string;
+	}
+	export interface GitCommitRef {
+	    _links: any;
+	    author: GitUserDate;
+	    changeCounts: ChangeCountDictionary;
+	    changes: GitChange[];
+	    comment: string;
+	    commentTruncated: boolean;
+	    commitId: string;
+	    committer: GitUserDate;
+	    parents: string[];
+	    remoteUrl: string;
+	    url: string;
+	}
+	export interface GitCommitToCreate {
+	    baseRef: GitRef;
+	    comment: string;
+	    pathActions: GitPathAction[];
+	}
+	export interface GitHistoryQueryResults extends HistoryQueryResults<GitItem> {
+	    /**
+	     * Seed commit used for querying history.  Used for skip feature.
+	     */
+	    startingCommitId: string;
+	    unpopulatedCount: number;
+	    unprocessedCount: number;
+	}
+	export interface GitItem extends ItemModel {
+	    /**
+	     * SHA1 of commit item was fetched at
+	     */
+	    commitId: string;
+	    /**
+	     * Type of object (Commit, Tree, Blob, Tag, ...)
+	     */
+	    gitObjectType: GitObjectType;
+	    /**
+	     * Shallow ref to commit that last changed this item Only populated if latestProcessedChange is requested May not be accurate if latest change is not yet cached
+	     */
+	    latestProcessedChange: GitCommitRef;
+	    /**
+	     * Git object id
+	     */
+	    objectId: string;
+	    /**
+	     * Git object id
+	     */
+	    originalObjectId: string;
+	}
+	export interface GitItemDescriptor {
+	    /**
+	     * Path to item
+	     */
+	    path: string;
+	    /**
+	     * Specifies whether to include children (OneLevel), all descendants (Full), or None
+	     */
+	    recursionLevel: VersionControlRecursionType;
+	    /**
+	     * Version string (interpretation based on VersionType defined in subclass
+	     */
+	    version: string;
+	    /**
+	     * Version modifiers (e.g. previous)
+	     */
+	    versionOptions: GitVersionOptions;
+	    /**
+	     * How to interpret version (branch,tag,commit)
+	     */
+	    versionType: GitVersionType;
+	}
+	export interface GitItemRequestData {
+	    /**
+	     * Whether to include metadata for all items
+	     */
+	    includeContentMetadata: boolean;
+	    /**
+	     * Whether to include the _links field on the shallow references
+	     */
+	    includeLinks: boolean;
+	    /**
+	     * Collection of items to fetch, including path, version, and recursion level
+	     */
+	    itemDescriptors: GitItemDescriptor[];
+	    /**
+	     * Whether to include shallow ref to commit that last changed each item
+	     */
+	    latestProcessedChange: boolean;
+	}
+	/**
+	 * Encapsulates the reference metadata of a Git media object.
+	 */
+	export interface GitMediaObjectRef {
+	    /**
+	     * Gets or sets the reference links of the Git media object.
+	     */
+	    _links: any;
+	    /**
+	     * Gets or sets the Git media object identifier. This Id property duplicates the Oid property, but is required by the VSO REST specification.
+	     */
+	    id: string;
+	    /**
+	     * Gets or sets the Git media object identifier. This property exists for adherence to the GitHub Git Media contract.
+	     */
+	    oid: string;
+	    /**
+	     * Gets or sets the size of the Git media object in bytes. This property exists for adherence to the GitHub Git Media contract.
+	     */
+	    size: number;
+	    /**
+	     * Gets or sets the URL for the Git media object.
+	     */
+	    url: string;
+	}
+	export enum GitObjectType {
+	    Bad = 0,
+	    Commit = 1,
+	    Tree = 2,
+	    Blob = 3,
+	    Tag = 4,
+	    Ext2 = 5,
+	    OfsDelta = 6,
+	    RefDelta = 7,
+	}
+	export interface GitPathAction {
+	    action: GitPathActions;
+	    base64Content: string;
+	    path: string;
+	    rawTextContent: string;
+	    targetPath: string;
+	}
+	export enum GitPathActions {
+	    None = 0,
+	    Edit = 1,
+	    Delete = 2,
+	    Add = 3,
+	    Rename = 4,
+	}
+	export interface GitPullRequest {
+	    _links: any;
+	    closedDate: Date;
+	    codeReviewId: number;
+	    createdBy: VSSInterfaces.IdentityRef;
+	    creationDate: Date;
+	    description: string;
+	    lastMergeCommit: GitCommitRef;
+	    lastMergeSourceCommit: GitCommitRef;
+	    lastMergeTargetCommit: GitCommitRef;
+	    mergeId: string;
+	    mergeStatus: PullRequestAsyncStatus;
+	    pullRequestId: number;
+	    remoteUrl: string;
+	    repository: GitRepository;
+	    reviewers: IdentityRefWithVote[];
+	    sourceRefName: string;
+	    status: PullRequestStatus;
+	    targetRefName: string;
+	    title: string;
+	    upgraded: boolean;
+	    url: string;
+	}
+	export interface GitPullRequestSearchCriteria {
+	    creatorId: string;
+	    /**
+	     * Whether to include the _links field on the shallow references
+	     */
+	    includeLinks: boolean;
+	    repositoryId: string;
+	    reviewerId: string;
+	    sourceRefName: string;
+	    status: PullRequestStatus;
+	    targetRefName: string;
+	}
+	export interface GitPush extends GitPushRef {
+	    commits: GitCommitRef[];
+	    refUpdates: GitRefUpdate[];
+	    repository: GitRepository;
+	}
+	export interface GitPushEventData {
+	    afterId: string;
+	    beforeId: string;
+	    branch: string;
+	    commits: GitCommit[];
+	    repository: GitRepository;
+	}
+	export interface GitPushRef {
+	    _links: any;
+	    date: Date;
+	    pushCorrelationId: string;
+	    pushedBy: VSSInterfaces.IdentityRef;
+	    pushId: number;
+	    url: string;
+	}
+	export interface GitPushSearchCriteria {
+	    fromDate: Date;
+	    /**
+	     * Whether to include the _links field on the shallow references
+	     */
+	    includeLinks: boolean;
+	    includeRefUpdates: boolean;
+	    pusherId: string;
+	    refName: string;
+	    toDate: Date;
+	}
+	export interface GitQueryCommitsCriteria {
+	    /**
+	     * Number of entries to skip
+	     */
+	    $skip: number;
+	    /**
+	     * Maximum number of entries to retrieve
+	     */
+	    $top: number;
+	    /**
+	     * Alias or display name of the author
+	     */
+	    author: string;
+	    /**
+	     * If provided, the earliest commit in the graph to search
+	     */
+	    compareVersion: GitVersionDescriptor;
+	    /**
+	     * If true, don't include delete history entries
+	     */
+	    excludeDeletes: boolean;
+	    /**
+	     * If provided, a lower bound for filtering commits alphabetically
+	     */
+	    fromCommitId: string;
+	    /**
+	     * If provided, only include history entries created after this date (string)
+	     */
+	    fromDate: string;
+	    /**
+	     * If provided, specifies the exact commit ids of the commits to fetch. May not be combined with other parameters.
+	     */
+	    ids: string[];
+	    /**
+	     * Whether to include the _links field on the shallow references
+	     */
+	    includeLinks: boolean;
+	    /**
+	     * Path of item to search under
+	     */
+	    itemPath: string;
+	    /**
+	     * If provided, identifies the commit or branch to search
+	     */
+	    itemVersion: GitVersionDescriptor;
+	    /**
+	     * If provided, an upper bound for filtering commits alphabetically
+	     */
+	    toCommitId: string;
+	    /**
+	     * If provided, only include history entries created before this date (string)
+	     */
+	    toDate: string;
+	    /**
+	     * Alias or display name of the committer
+	     */
+	    user: string;
+	}
+	export interface GitRef {
+	    _links: any;
+	    isLockedBy: VSSInterfaces.IdentityRef;
+	    name: string;
+	    objectId: string;
+	    url: string;
+	}
+	export interface GitRefUpdate {
+	    name: string;
+	    newObjectId: string;
+	    oldObjectId: string;
+	    repositoryId: string;
+	}
+	export enum GitRefUpdateMode {
+	    /**
+	     * Indicates the Git protocol model where any refs that can be updated will be updated, but any failures will not prevent other updates from succeeding.
+	     */
+	    BestEffort = 0,
+	    /**
+	     * Indicates that all ref updates must succeed or none will succeed. All ref updates will be atomically written. If any failure is encountered, previously successful updates will be rolled back and the entire operation will fail.
+	     */
+	    AllOrNone = 1,
+	}
+	export interface GitRefUpdateResult {
+	    /**
+	     * Custom message for the result object For instance, Reason for failing.
+	     */
+	    customMessage: string;
+	    /**
+	     * Ref name
+	     */
+	    name: string;
+	    /**
+	     * New object ID
+	     */
+	    newObjectId: string;
+	    /**
+	     * Old object ID
+	     */
+	    oldObjectId: string;
+	    /**
+	     * Name of the plugin that rejected the updated.
+	     */
+	    rejectedBy: string;
+	    /**
+	     * Repository ID
+	     */
+	    repositoryId: string;
+	    /**
+	     * True if the ref update succeeded, false otherwise
+	     */
+	    success: boolean;
+	    /**
+	     * Status of the update from the TFS server.
+	     */
+	    updateStatus: GitRefUpdateStatus;
+	}
+	export interface GitRefUpdateResultSet {
+	    countFailed: number;
+	    countSucceeded: number;
+	    pushCorrelationId: string;
+	    pushIds: {
+	        [key: number]: number;
+	    };
+	    pushTime: Date;
+	    results: GitRefUpdateResult[];
+	}
+	export enum GitRefUpdateStatus {
+	    /**
+	     * Indicates that the ref update request was completed successfully.
+	     */
+	    Succeeded = 0,
+	    /**
+	     * Indicates that the ref update request could not be completed because part of the graph would be disconnected by this change, and the caller does not have ForcePush permission on the repository.
+	     */
+	    ForcePushRequired = 1,
+	    /**
+	     * Indicates that the ref update request could not be completed because the old object ID presented in the request was not the object ID of the ref when the database attempted the update. The most likely scenario is that the caller lost a race to update the ref.
+	     */
+	    StaleOldObjectId = 2,
+	    /**
+	     * Indicates that the ref update request could not be completed because the ref name presented in the request was not valid.
+	     */
+	    InvalidRefName = 3,
+	    /**
+	     * The request was not processed
+	     */
+	    Unprocessed = 4,
+	    /**
+	     * The ref update request could not be completed because the new object ID for the ref could not be resolved to a commit object (potentially through any number of tags)
+	     */
+	    UnresolvableToCommit = 5,
+	    /**
+	     * The ref update request could not be completed because the user lacks write permissions required to write this ref
+	     */
+	    WritePermissionRequired = 6,
+	    /**
+	     * The ref update request could not be completed because the user lacks note creation permissions required to write this note
+	     */
+	    ManageNotePermissionRequired = 7,
+	    /**
+	     * The ref update request could not be completed because the user lacks the permission to create a branch
+	     */
+	    CreateBranchPermissionRequired = 8,
+	    /**
+	     * The ref update request could not be completed because the user lacks the permission to create a tag
+	     */
+	    CreateTagPermissionRequired = 9,
+	    /**
+	     * The ref update could not be completed because it was rejected by the plugin.
+	     */
+	    RejectedByPlugin = 10,
+	    /**
+	     * The ref update could not be completed because the ref is locked by another user.
+	     */
+	    Locked = 11,
+	    /**
+	     * The ref update could not be completed because, in case-insensitive mode, the ref name conflicts with an existing, differently-cased ref name.
+	     */
+	    RefNameConflict = 12,
+	    /**
+	     * The ref update could not be completed because it was rejected by policy.
+	     */
+	    RejectedByPolicy = 13,
+	    /**
+	     * Indicates that the ref update request was completed successfully, but the ref doesn't actually exist so no changes were made.  This should only happen during deletes.
+	     */
+	    SucceededNonExistentRef = 14,
+	    /**
+	     * Indicates that the ref update request was completed successfully, but the passed-in ref was corrupt - as in, the old object ID was bad.  This should only happen during deletes.
+	     */
+	    SucceededCorruptRef = 15,
+	}
+	export interface GitRepository {
+	    _links: any;
+	    defaultBranch: string;
+	    id: string;
+	    name: string;
+	    project: TfsInterfaces.TeamProjectReference;
+	    remoteUrl: string;
+	    url: string;
+	}
+	export enum GitRepositoryPermissions {
+	    None = 0,
+	    Administer = 1,
+	    GenericRead = 2,
+	    GenericContribute = 4,
+	    ForcePush = 8,
+	    CreateBranch = 16,
+	    CreateTag = 32,
+	    ManageNote = 64,
+	    PolicyExempt = 128,
+	    /**
+	     * This defines the set of bits that are valid for the git permission space. When reading or writing git permissions, these are the only bits paid attention too.
+	     */
+	    All = 255,
+	    BranchLevelPermissions = 141,
+	}
+	export interface GitTargetVersionDescriptor extends GitVersionDescriptor {
+	    /**
+	     * Version string identifier (name of tag/branch, SHA1 of commit)
+	     */
+	    targetVersion: string;
+	    /**
+	     * Version options - Specify additional modifiers to version (e.g Previous)
+	     */
+	    targetVersionOptions: GitVersionOptions;
+	    /**
+	     * Version type (branch, tag, or commit). Determines how Id is interpreted
+	     */
+	    targetVersionType: GitVersionType;
+	}
+	export interface GitTreeEntryRef {
+	    /**
+	     * Blob or tree
+	     */
+	    gitObjectType: GitObjectType;
+	    /**
+	     * Mode represented as octal string
+	     */
+	    mode: string;
+	    /**
+	     * SHA1 hash of git object
+	     */
+	    objectId: string;
+	    /**
+	     * Path relative to parent tree object
+	     */
+	    relativePath: string;
+	    /**
+	     * Size of content
+	     */
+	    size: number;
+	    /**
+	     * url to retrieve tree or blob
+	     */
+	    url: string;
+	}
+	export interface GitTreeRef {
+	    _links: any;
+	    /**
+	     * SHA1 hash of git object
+	     */
+	    objectId: string;
+	    /**
+	     * Sum of sizes of all children
+	     */
+	    size: number;
+	    /**
+	     * Blobs and trees under this tree
+	     */
+	    treeEntries: GitTreeEntryRef[];
+	    /**
+	     * Url to tree
+	     */
+	    url: string;
+	}
+	export interface GitUserDate {
+	    date: Date;
+	    email: string;
+	    name: string;
+	}
+	export interface GitVersionDescriptor {
+	    /**
+	     * Version string identifier (name of tag/branch/index, SHA1 of commit)
+	     */
+	    version: string;
+	    /**
+	     * Version options - Specify additional modifiers to version (e.g Previous)
+	     */
+	    versionOptions: GitVersionOptions;
+	    /**
+	     * Version type (branch, tag, commit, or index). Determines how Id is interpreted
+	     */
+	    versionType: GitVersionType;
+	}
+	export enum GitVersionOptions {
+	    /**
+	     * Not specified
+	     */
+	    None = 0,
+	    /**
+	     * Commit that changed item prior to the current version
+	     */
+	    PreviousChange = 1,
+	    /**
+	     * First parent of commit (HEAD^)
+	     */
+	    FirstParent = 2,
+	}
+	export enum GitVersionType {
+	    /**
+	     * Interpret the version as a branch name
+	     */
+	    Branch = 0,
+	    /**
+	     * Interpret the version as a tag name
+	     */
+	    Tag = 1,
+	    /**
+	     * Interpret the version as a commit ID (SHA1)
+	     */
+	    Commit = 2,
+	    /**
+	     * Interpret the version as an index name
+	     */
+	    Index = 3,
+	}
+	export interface HistoryEntry<T> {
+	    /**
+	     * The Change list (changeset/commit/shelveset) for this point in history
+	     */
+	    changeList: ChangeList<T>;
+	    /**
+	     * The change made to the item from this change list (only relevant for File history, not folders)
+	     */
+	    itemChangeType: VersionControlChangeType;
+	    /**
+	     * The path of the item at this point in history (only relevant for File history, not folders)
+	     */
+	    serverItem: string;
+	}
+	export interface HistoryQueryResults<T> {
+	    /**
+	     * True if there are more results available to fetch (we're returning the max # of items requested) A more RESTy solution would be to include a Link header
+	     */
+	    moreResultsAvailable: boolean;
+	    /**
+	     * The history entries (results) from this query
+	     */
+	    results: HistoryEntry<T>[];
+	}
+	export interface IdentityRefWithVote extends VSSInterfaces.IdentityRef {
+	    isRequired: boolean;
+	    reviewerUrl: string;
+	    vote: number;
+	    votedFor: IdentityRefWithVote[];
+	}
+	export interface IncludedGitCommit {
+	    commitId: string;
+	    commitTime: Date;
+	    parentCommitIds: string[];
+	    repositoryId: string;
+	}
+	export interface ItemContent {
+	    content: string;
+	    contentType: ItemContentType;
+	}
+	export enum ItemContentType {
+	    RawText = 0,
+	    Base64Encoded = 1,
+	}
+	/**
+	 * Optional details to include when returning an item model
+	 */
+	export interface ItemDetailsOptions {
+	    /**
+	     * If true, include metadata about the file type
+	     */
+	    includeContentMetadata: boolean;
+	    /**
+	     * Specifies whether to include children (OneLevel), all descendants (Full) or None for folder items
+	     */
+	    recursionLevel: VersionControlRecursionType;
+	}
+	export interface ItemModel {
+	    _links: any;
+	    contentMetadata: FileContentMetadata;
+	    isFolder: boolean;
+	    isSymLink: boolean;
+	    path: string;
+	    url: string;
+	}
+	export enum PullRequestAsyncStatus {
+	    NotSet = 0,
+	    Queued = 1,
+	    Conflicts = 2,
+	    Succeeded = 3,
+	    RejectedByPolicy = 4,
+	    Failure = 5,
+	}
+	export enum PullRequestStatus {
+	    NotSet = 0,
+	    Active = 1,
+	    Abandoned = 2,
+	    Completed = 3,
+	}
+	export interface TfvcBranch extends TfvcBranchRef {
+	    children: TfvcBranch[];
+	    mappings: TfvcBranchMapping[];
+	    parent: TfvcShallowBranchRef;
+	    relatedBranches: TfvcShallowBranchRef[];
+	}
+	export interface TfvcBranchMapping {
+	    depth: string;
+	    serverItem: string;
+	    type: string;
+	}
+	export interface TfvcBranchRef extends TfvcShallowBranchRef {
+	    _links: any;
+	    createdDate: Date;
+	    description: string;
+	    isDeleted: boolean;
+	    owner: VSSInterfaces.IdentityRef;
+	    url: string;
+	}
+	export interface TfvcChange extends Change<TfvcItem> {
+	    /**
+	     * List of merge sources in case of rename or branch creation.
+	     */
+	    mergeSources: TfvcMergeSource[];
+	    /**
+	     * Version at which a (shelved) change was pended against
+	     */
+	    pendingVersion: number;
+	}
+	export interface TfvcChangeset extends TfvcChangesetRef {
+	    accountId: string;
+	    changes: TfvcChange[];
+	    checkinNotes: CheckinNote[];
+	    collectionId: string;
+	    hasMoreChanges: boolean;
+	    policyOverride: TfvcPolicyOverrideInfo;
+	    workItems: AssociatedWorkItem[];
+	}
+	export interface TfvcChangesetRef {
+	    _links: any;
+	    author: VSSInterfaces.IdentityRef;
+	    changesetId: number;
+	    checkedInBy: VSSInterfaces.IdentityRef;
+	    comment: string;
+	    commentTruncated: boolean;
+	    createdDate: Date;
+	    url: string;
+	}
+	/**
+	 * Criteria used in a search for change lists
+	 */
+	export interface TfvcChangesetSearchCriteria {
+	    /**
+	     * Alias or display name of user who made the changes
+	     */
+	    author: string;
+	    /**
+	     * Whether or not to follow renames for the given item being queried
+	     */
+	    followRenames: boolean;
+	    /**
+	     * If provided, only include changesets created after this date (string) Think of a better name for this.
+	     */
+	    fromDate: string;
+	    /**
+	     * If provided, only include changesets after this changesetID
+	     */
+	    fromId: number;
+	    /**
+	     * Whether to include the _links field on the shallow references
+	     */
+	    includeLinks: boolean;
+	    /**
+	     * Path of item to search under
+	     */
+	    path: string;
+	    /**
+	     * If provided, only include changesets created before this date (string) Think of a better name for this.
+	     */
+	    toDate: string;
+	    /**
+	     * If provided, a version descriptor for the latest change list to include
+	     */
+	    toId: number;
+	}
+	export interface TfvcChangesetsRequestData {
+	    changesetIds: number[];
+	    commentLength: number;
+	    /**
+	     * Whether to include the _links field on the shallow references
+	     */
+	    includeLinks: boolean;
+	}
+	export interface TfvcCheckinEventData {
+	    changeset: TfvcChangeset;
+	    project: TfsInterfaces.TeamProjectReference;
+	}
+	export interface TfvcHistoryEntry extends HistoryEntry<TfvcItem> {
+	    /**
+	     * The encoding of the item at this point in history (only relevant for File history, not folders)
+	     */
+	    encoding: number;
+	    /**
+	     * The file id of the item at this point in history (only relevant for File history, not folders)
+	     */
+	    fileId: number;
+	}
+	export interface TfvcItem extends ItemModel {
+	    changeDate: Date;
+	    deletionId: number;
+	    isBranch: boolean;
+	    isPendingChange: boolean;
+	    version: number;
+	}
+	/**
+	 * Item path and Version descriptor properties
+	 */
+	export interface TfvcItemDescriptor {
+	    path: string;
+	    recursionLevel: VersionControlRecursionType;
+	    version: string;
+	    versionOption: TfvcVersionOption;
+	    versionType: TfvcVersionType;
+	}
+	export interface TfvcItemRequestData {
+	    /**
+	     * If true, include metadata about the file type
+	     */
+	    includeContentMetadata: boolean;
+	    /**
+	     * Whether to include the _links field on the shallow references
+	     */
+	    includeLinks: boolean;
+	    itemDescriptors: TfvcItemDescriptor[];
+	}
+	export interface TfvcLabel extends TfvcLabelRef {
+	    items: TfvcItem[];
+	}
+	export interface TfvcLabelRef {
+	    _links: any;
+	    description: string;
+	    id: number;
+	    labelScope: string;
+	    modifiedDate: Date;
+	    name: string;
+	    owner: VSSInterfaces.IdentityRef;
+	    url: string;
+	}
+	export interface TfvcLabelRequestData {
+	    /**
+	     * Whether to include the _links field on the shallow references
+	     */
+	    includeLinks: boolean;
+	    itemLabelFilter: string;
+	    labelScope: string;
+	    maxItemCount: number;
+	    name: string;
+	    owner: string;
+	}
+	export interface TfvcMergeSource {
+	    /**
+	     * Indicates if this a rename source. If false, it is a merge source.
+	     */
+	    isRename: boolean;
+	    /**
+	     * The server item of the merge source
+	     */
+	    serverItem: string;
+	    /**
+	     * Start of the version range
+	     */
+	    versionFrom: number;
+	    /**
+	     * End of the version range
+	     */
+	    versionTo: number;
+	}
+	export interface TfvcPolicyFailureInfo {
+	    message: string;
+	    policyName: string;
+	}
+	export interface TfvcPolicyOverrideInfo {
+	    comment: string;
+	    policyFailures: TfvcPolicyFailureInfo[];
+	}
+	export interface TfvcShallowBranchRef {
+	    path: string;
+	}
+	export interface TfvcShelveset extends TfvcShelvesetRef {
+	    changes: TfvcChange[];
+	    notes: CheckinNote[];
+	    policyOverride: TfvcPolicyOverrideInfo;
+	    workItems: AssociatedWorkItem[];
+	}
+	export interface TfvcShelvesetRef {
+	    _links: any;
+	    comment: string;
+	    commentTruncated: boolean;
+	    createdDate: Date;
+	    id: string;
+	    name: string;
+	    owner: VSSInterfaces.IdentityRef;
+	    url: string;
+	}
+	export interface TfvcShelvesetRequestData {
+	    /**
+	     * Whether to include policyOverride and notes
+	     */
+	    includeDetails: boolean;
+	    /**
+	     * Whether to include the _links field on the shallow references
+	     */
+	    includeLinks: boolean;
+	    /**
+	     * Whether to include workItems
+	     */
+	    includeWorkItems: boolean;
+	    /**
+	     * Max number of changes to include
+	     */
+	    maxChangeCount: number;
+	    /**
+	     * Max length of comment
+	     */
+	    maxCommentLength: number;
+	    /**
+	     * Shelveset's name
+	     */
+	    name: string;
+	    /**
+	     * Owner's ID. Could be a name or a guid.
+	     */
+	    owner: string;
+	}
+	export interface TfvcVersionDescriptor {
+	    version: string;
+	    versionOption: TfvcVersionOption;
+	    versionType: TfvcVersionType;
+	}
+	export enum TfvcVersionOption {
+	    None = 0,
+	    Previous = 1,
+	    UseRename = 2,
+	}
+	export enum TfvcVersionType {
+	    None = 0,
+	    Changeset = 1,
+	    Shelveset = 2,
+	    Change = 3,
+	    Date = 4,
+	    Latest = 5,
+	    Tip = 6,
+	    MergeSource = 7,
+	}
+	export interface UpdateRefsRequest {
+	    refUpdateRequests: GitRefUpdate[];
+	    updateMode: GitRefUpdateMode;
+	}
+	export enum VersionControlChangeType {
+	    None = 0,
+	    Add = 1,
+	    Edit = 2,
+	    Encoding = 4,
+	    Rename = 8,
+	    Delete = 16,
+	    Undelete = 32,
+	    Branch = 64,
+	    Merge = 128,
+	    Lock = 256,
+	    Rollback = 512,
+	    SourceRename = 1024,
+	    TargetRename = 2048,
+	    Property = 4096,
+	    All = 8191,
+	}
+	export interface VersionControlProjectInfo {
+	    project: TfsInterfaces.TeamProjectReference;
+	    supportsGit: boolean;
+	    supportsTFVC: boolean;
+	}
+	export enum VersionControlRecursionType {
+	    None = 0,
+	    OneLevel = 1,
+	    Full = 120,
+	}
+	export var TypeInfo: {
+	    AssociatedWorkItem: {
+	        fields: any;
+	    };
+	    Change: {
+	        fields: any;
+	    };
+	    ChangeCountDictionary: {
+	        fields: any;
+	    };
+	    ChangeList: {
+	        fields: any;
+	    };
+	    ChangeListSearchCriteria: {
+	        fields: any;
+	    };
+	    CheckinNote: {
+	        fields: any;
+	    };
+	    FileContentMetadata: {
+	        fields: any;
+	    };
+	    GitBaseVersionDescriptor: {
+	        fields: any;
+	    };
+	    GitBlobRef: {
+	        fields: any;
+	    };
+	    GitBranchStats: {
+	        fields: any;
+	    };
+	    GitChange: {
+	        fields: any;
+	    };
+	    GitCommit: {
+	        fields: any;
+	    };
+	    GitCommitChanges: {
+	        fields: any;
+	    };
+	    GitCommitDiffs: {
+	        fields: any;
+	    };
+	    GitCommitRef: {
+	        fields: any;
+	    };
+	    GitCommitToCreate: {
+	        fields: any;
+	    };
+	    GitHistoryQueryResults: {
+	        fields: any;
+	    };
+	    GitItem: {
+	        fields: any;
+	    };
+	    GitItemDescriptor: {
+	        fields: any;
+	    };
+	    GitItemRequestData: {
+	        fields: any;
+	    };
+	    GitMediaObjectRef: {
+	        fields: any;
+	    };
+	    GitObjectType: {
+	        enumValues: {
+	            "bad": number;
+	            "commit": number;
+	            "tree": number;
+	            "blob": number;
+	            "tag": number;
+	            "ext2": number;
+	            "ofsDelta": number;
+	            "refDelta": number;
+	        };
+	    };
+	    GitPathAction: {
+	        fields: any;
+	    };
+	    GitPathActions: {
+	        enumValues: {
+	            "none": number;
+	            "edit": number;
+	            "delete": number;
+	            "add": number;
+	            "rename": number;
+	        };
+	    };
+	    GitPullRequest: {
+	        fields: any;
+	    };
+	    GitPullRequestSearchCriteria: {
+	        fields: any;
+	    };
+	    GitPush: {
+	        fields: any;
+	    };
+	    GitPushEventData: {
+	        fields: any;
+	    };
+	    GitPushRef: {
+	        fields: any;
+	    };
+	    GitPushSearchCriteria: {
+	        fields: any;
+	    };
+	    GitQueryCommitsCriteria: {
+	        fields: any;
+	    };
+	    GitRef: {
+	        fields: any;
+	    };
+	    GitRefUpdate: {
+	        fields: any;
+	    };
+	    GitRefUpdateMode: {
+	        enumValues: {
+	            "bestEffort": number;
+	            "allOrNone": number;
+	        };
+	    };
+	    GitRefUpdateResult: {
+	        fields: any;
+	    };
+	    GitRefUpdateResultSet: {
+	        fields: any;
+	    };
+	    GitRefUpdateStatus: {
+	        enumValues: {
+	            "succeeded": number;
+	            "forcePushRequired": number;
+	            "staleOldObjectId": number;
+	            "invalidRefName": number;
+	            "unprocessed": number;
+	            "unresolvableToCommit": number;
+	            "writePermissionRequired": number;
+	            "manageNotePermissionRequired": number;
+	            "createBranchPermissionRequired": number;
+	            "createTagPermissionRequired": number;
+	            "rejectedByPlugin": number;
+	            "locked": number;
+	            "refNameConflict": number;
+	            "rejectedByPolicy": number;
+	            "succeededNonExistentRef": number;
+	            "succeededCorruptRef": number;
+	        };
+	    };
+	    GitRepository: {
+	        fields: any;
+	    };
+	    GitRepositoryPermissions: {
+	        enumValues: {
+	            "none": number;
+	            "administer": number;
+	            "genericRead": number;
+	            "genericContribute": number;
+	            "forcePush": number;
+	            "createBranch": number;
+	            "createTag": number;
+	            "manageNote": number;
+	            "policyExempt": number;
+	            "all": number;
+	            "branchLevelPermissions": number;
+	        };
+	    };
+	    GitTargetVersionDescriptor: {
+	        fields: any;
+	    };
+	    GitTreeEntryRef: {
+	        fields: any;
+	    };
+	    GitTreeRef: {
+	        fields: any;
+	    };
+	    GitUserDate: {
+	        fields: any;
+	    };
+	    GitVersionDescriptor: {
+	        fields: any;
+	    };
+	    GitVersionOptions: {
+	        enumValues: {
+	            "none": number;
+	            "previousChange": number;
+	            "firstParent": number;
+	        };
+	    };
+	    GitVersionType: {
+	        enumValues: {
+	            "branch": number;
+	            "tag": number;
+	            "commit": number;
+	            "index": number;
+	        };
+	    };
+	    HistoryEntry: {
+	        fields: any;
+	    };
+	    HistoryQueryResults: {
+	        fields: any;
+	    };
+	    IdentityRefWithVote: {
+	        fields: any;
+	    };
+	    IncludedGitCommit: {
+	        fields: any;
+	    };
+	    ItemContent: {
+	        fields: any;
+	    };
+	    ItemContentType: {
+	        enumValues: {
+	            "rawText": number;
+	            "base64Encoded": number;
+	        };
+	    };
+	    ItemDetailsOptions: {
+	        fields: any;
+	    };
+	    ItemModel: {
+	        fields: any;
+	    };
+	    PullRequestAsyncStatus: {
+	        enumValues: {
+	            "notSet": number;
+	            "queued": number;
+	            "conflicts": number;
+	            "succeeded": number;
+	            "rejectedByPolicy": number;
+	            "failure": number;
+	        };
+	    };
+	    PullRequestStatus: {
+	        enumValues: {
+	            "notSet": number;
+	            "active": number;
+	            "abandoned": number;
+	            "completed": number;
+	        };
+	    };
+	    TfvcBranch: {
+	        fields: any;
+	    };
+	    TfvcBranchMapping: {
+	        fields: any;
+	    };
+	    TfvcBranchRef: {
+	        fields: any;
+	    };
+	    TfvcChange: {
+	        fields: any;
+	    };
+	    TfvcChangeset: {
+	        fields: any;
+	    };
+	    TfvcChangesetRef: {
+	        fields: any;
+	    };
+	    TfvcChangesetSearchCriteria: {
+	        fields: any;
+	    };
+	    TfvcChangesetsRequestData: {
+	        fields: any;
+	    };
+	    TfvcCheckinEventData: {
+	        fields: any;
+	    };
+	    TfvcHistoryEntry: {
+	        fields: any;
+	    };
+	    TfvcItem: {
+	        fields: any;
+	    };
+	    TfvcItemDescriptor: {
+	        fields: any;
+	    };
+	    TfvcItemRequestData: {
+	        fields: any;
+	    };
+	    TfvcLabel: {
+	        fields: any;
+	    };
+	    TfvcLabelRef: {
+	        fields: any;
+	    };
+	    TfvcLabelRequestData: {
+	        fields: any;
+	    };
+	    TfvcMergeSource: {
+	        fields: any;
+	    };
+	    TfvcPolicyFailureInfo: {
+	        fields: any;
+	    };
+	    TfvcPolicyOverrideInfo: {
+	        fields: any;
+	    };
+	    TfvcShallowBranchRef: {
+	        fields: any;
+	    };
+	    TfvcShelveset: {
+	        fields: any;
+	    };
+	    TfvcShelvesetRef: {
+	        fields: any;
+	    };
+	    TfvcShelvesetRequestData: {
+	        fields: any;
+	    };
+	    TfvcVersionDescriptor: {
+	        fields: any;
+	    };
+	    TfvcVersionOption: {
+	        enumValues: {
+	            "none": number;
+	            "previous": number;
+	            "useRename": number;
+	        };
+	    };
+	    TfvcVersionType: {
+	        enumValues: {
+	            "none": number;
+	            "changeset": number;
+	            "shelveset": number;
+	            "change": number;
+	            "date": number;
+	            "latest": number;
+	            "tip": number;
+	            "mergeSource": number;
+	        };
+	    };
+	    UpdateRefsRequest: {
+	        fields: any;
+	    };
+	    VersionControlChangeType: {
+	        enumValues: {
+	            "none": number;
+	            "add": number;
+	            "edit": number;
+	            "encoding": number;
+	            "rename": number;
+	            "delete": number;
+	            "undelete": number;
+	            "branch": number;
+	            "merge": number;
+	            "lock": number;
+	            "rollback": number;
+	            "sourceRename": number;
+	            "targetRename": number;
+	            "property": number;
+	            "all": number;
+	        };
+	    };
+	    VersionControlProjectInfo: {
+	        fields: any;
+	    };
+	    VersionControlRecursionType: {
+	        enumValues: {
+	            "none": number;
+	            "oneLevel": number;
+	            "full": number;
+	        };
+	    };
+	};
+
+}
+declare module 'vso-node-api/GitApi' {
+	/// <reference types="node" />
+	/// <reference types="Q" />
+	import Q = require('q');
+	import basem = require('vso-node-api/ClientApiBases');
+	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
+	import GitInterfaces = require('vso-node-api/interfaces/GitInterfaces');
+	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
+	export interface IGitApi extends basem.ClientApiBase {
+	    getBlob(repositoryId: string, sha1: string, project: string, download: boolean, fileName: string, onResult: (err: any, statusCode: number, Blob: GitInterfaces.GitBlobRef) => void): void;
+	    getBlobContent(repositoryId: string, sha1: string, project: string, download: boolean, fileName: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    getBlobsZip(blobIds: string[], repositoryId: string, project: string, filename: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    getBlobZip(repositoryId: string, sha1: string, project: string, download: boolean, fileName: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    getBranch(repositoryId: string, name: string, project: string, baseVersionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, BranchStat: GitInterfaces.GitBranchStats) => void): void;
+	    getBranches(repositoryId: string, project: string, baseVersionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, BranchStats: GitInterfaces.GitBranchStats[]) => void): void;
+	    getChanges(commitId: string, repositoryId: string, project: string, top: number, skip: number, onResult: (err: any, statusCode: number, Change: GitInterfaces.GitCommitChanges) => void): void;
+	    createCommit(repositoryId: string, project: string, onResult: (err: any, statusCode: number, Commit: GitInterfaces.GitCommit) => void): void;
+	    getCommit(commitId: string, repositoryId: string, project: string, changeCount: number, onResult: (err: any, statusCode: number, Commit: GitInterfaces.GitCommit) => void): void;
+	    getCommits(repositoryId: string, searchCriteria: GitInterfaces.GitQueryCommitsCriteria, project: string, skip: number, top: number, onResult: (err: any, statusCode: number, Commits: GitInterfaces.GitCommitRef[]) => void): void;
+	    getPushCommits(repositoryId: string, pushId: number, project: string, top: number, skip: number, includeLinks: boolean, onResult: (err: any, statusCode: number, Commits: GitInterfaces.GitCommitRef[]) => void): void;
+	    getCommitsBatch(searchCriteria: GitInterfaces.GitQueryCommitsCriteria, repositoryId: string, project: string, skip: number, top: number, onResult: (err: any, statusCode: number, CommitsBatch: GitInterfaces.GitCommitRef[]) => void): void;
+	    getItem(repositoryId: string, path: string, project: string, scopePath: string, recursionLevel: GitInterfaces.VersionControlRecursionType, includeContentMetadata: boolean, latestProcessedChange: boolean, download: boolean, versionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, Item: GitInterfaces.GitItem) => void): void;
+	    getItemContent(repositoryId: string, path: string, project: string, scopePath: string, recursionLevel: GitInterfaces.VersionControlRecursionType, includeContentMetadata: boolean, latestProcessedChange: boolean, download: boolean, versionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    getItems(repositoryId: string, project: string, scopePath: string, recursionLevel: GitInterfaces.VersionControlRecursionType, includeContentMetadata: boolean, latestProcessedChange: boolean, download: boolean, includeLinks: boolean, versionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, Items: GitInterfaces.GitItem[]) => void): void;
+	    getItemText(repositoryId: string, path: string, project: string, scopePath: string, recursionLevel: GitInterfaces.VersionControlRecursionType, includeContentMetadata: boolean, latestProcessedChange: boolean, download: boolean, versionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    getItemZip(repositoryId: string, path: string, project: string, scopePath: string, recursionLevel: GitInterfaces.VersionControlRecursionType, includeContentMetadata: boolean, latestProcessedChange: boolean, download: boolean, versionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    getItemsBatch(requestData: GitInterfaces.GitItemRequestData, repositoryId: string, project: string, onResult: (err: any, statusCode: number, ItemsBatch: GitInterfaces.GitItem[][]) => void): void;
+	    createPullRequestReviewer(reviewer: GitInterfaces.IdentityRefWithVote, repositoryId: string, pullRequestId: number, reviewerId: string, project: string, onResult: (err: any, statusCode: number, PullRequestReviewer: GitInterfaces.IdentityRefWithVote) => void): void;
+	    createPullRequestReviewers(reviewers: VSSInterfaces.IdentityRef[], repositoryId: string, pullRequestId: number, project: string, onResult: (err: any, statusCode: number, PullRequestReviewers: GitInterfaces.IdentityRefWithVote[]) => void): void;
+	    deletePullRequestReviewer(repositoryId: string, pullRequestId: number, reviewerId: string, project: string, onResult: (err: any, statusCode: number) => void): void;
+	    getPullRequestReviewer(repositoryId: string, pullRequestId: number, reviewerId: string, project: string, onResult: (err: any, statusCode: number, PullRequestReviewer: GitInterfaces.IdentityRefWithVote) => void): void;
+	    getPullRequestReviewers(repositoryId: string, pullRequestId: number, project: string, onResult: (err: any, statusCode: number, PullRequestReviewers: GitInterfaces.IdentityRefWithVote[]) => void): void;
+	    createPullRequest(gitPullRequestToCreate: GitInterfaces.GitPullRequest, repositoryId: string, project: string, onResult: (err: any, statusCode: number, PullRequest: GitInterfaces.GitPullRequest) => void): void;
+	    getPullRequest(repositoryId: string, pullRequestId: number, project: string, maxCommentLength: number, skip: number, top: number, onResult: (err: any, statusCode: number, PullRequest: GitInterfaces.GitPullRequest) => void): void;
+	    getPullRequests(repositoryId: string, searchCriteria: GitInterfaces.GitPullRequestSearchCriteria, project: string, maxCommentLength: number, skip: number, top: number, onResult: (err: any, statusCode: number, PullRequests: GitInterfaces.GitPullRequest[]) => void): void;
+	    updatePullRequest(gitPullRequestToUpdate: GitInterfaces.GitPullRequest, repositoryId: string, pullRequestId: number, project: string, onResult: (err: any, statusCode: number, PullRequest: GitInterfaces.GitPullRequest) => void): void;
+	    getPullRequestWorkItems(repositoryId: string, pullRequestId: number, project: string, commitsTop: number, commitsSkip: number, onResult: (err: any, statusCode: number, PullRequestWorkItems: GitInterfaces.AssociatedWorkItem[]) => void): void;
+	    createPush(push: GitInterfaces.GitPush, repositoryId: string, project: string, onResult: (err: any, statusCode: number, pushe: GitInterfaces.GitPush) => void): void;
+	    getPush(repositoryId: string, pushId: number, project: string, includeCommits: number, includeRefUpdates: boolean, onResult: (err: any, statusCode: number, pushe: GitInterfaces.GitPush) => void): void;
+	    getPushes(repositoryId: string, project: string, skip: number, top: number, searchCriteria: GitInterfaces.GitPushSearchCriteria, onResult: (err: any, statusCode: number, pushes: GitInterfaces.GitPush[]) => void): void;
+	    getRefs(repositoryId: string, project: string, filter: string, includeLinks: boolean, onResult: (err: any, statusCode: number, refs: GitInterfaces.GitRef[]) => void): void;
+	    updateRefs(refUpdates: GitInterfaces.GitRefUpdate[], repositoryId: string, project: string, projectId: string, onResult: (err: any, statusCode: number, refs: GitInterfaces.GitRefUpdateResult[]) => void): void;
+	    createRepository(gitRepositoryToCreate: GitInterfaces.GitRepository, project: string, onResult: (err: any, statusCode: number, Repositorie: GitInterfaces.GitRepository) => void): void;
+	    deleteRepository(repositoryId: string, project: string, onResult: (err: any, statusCode: number) => void): void;
+	    getRepositories(project: string, includeLinks: boolean, onResult: (err: any, statusCode: number, Repositories: GitInterfaces.GitRepository[]) => void): void;
+	    getRepository(repositoryId: string, project: string, onResult: (err: any, statusCode: number, Repositorie: GitInterfaces.GitRepository) => void): void;
+	    updateRepository(newRepositoryInfo: GitInterfaces.GitRepository, repositoryId: string, project: string, onResult: (err: any, statusCode: number, Repositorie: GitInterfaces.GitRepository) => void): void;
+	    getTree(repositoryId: string, sha1: string, project: string, projectId: string, recursive: boolean, fileName: string, onResult: (err: any, statusCode: number, Tree: GitInterfaces.GitTreeRef) => void): void;
+	    getTreeZip(repositoryId: string, sha1: string, project: string, projectId: string, recursive: boolean, fileName: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	}
+	export interface IQGitApi extends basem.QClientApiBase {
+	    getBlob(repositoryId: string, sha1: string, project?: string, download?: boolean, fileName?: string): Q.Promise<GitInterfaces.GitBlobRef>;
+	    getBranch(repositoryId: string, name: string, project?: string, baseVersionDescriptor?: GitInterfaces.GitVersionDescriptor): Q.Promise<GitInterfaces.GitBranchStats>;
+	    getBranches(repositoryId: string, project?: string, baseVersionDescriptor?: GitInterfaces.GitVersionDescriptor): Q.Promise<GitInterfaces.GitBranchStats[]>;
+	    getChanges(commitId: string, repositoryId: string, project?: string, top?: number, skip?: number): Q.Promise<GitInterfaces.GitCommitChanges>;
+	    createCommit(repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitCommit>;
+	    getCommit(commitId: string, repositoryId: string, project?: string, changeCount?: number): Q.Promise<GitInterfaces.GitCommit>;
+	    getCommits(repositoryId: string, searchCriteria: GitInterfaces.GitQueryCommitsCriteria, project?: string, skip?: number, top?: number): Q.Promise<GitInterfaces.GitCommitRef[]>;
+	    getPushCommits(repositoryId: string, pushId: number, project?: string, top?: number, skip?: number, includeLinks?: boolean): Q.Promise<GitInterfaces.GitCommitRef[]>;
+	    getCommitsBatch(searchCriteria: GitInterfaces.GitQueryCommitsCriteria, repositoryId: string, project?: string, skip?: number, top?: number): Q.Promise<GitInterfaces.GitCommitRef[]>;
+	    getItem(repositoryId: string, path: string, project?: string, scopePath?: string, recursionLevel?: GitInterfaces.VersionControlRecursionType, includeContentMetadata?: boolean, latestProcessedChange?: boolean, download?: boolean, versionDescriptor?: GitInterfaces.GitVersionDescriptor): Q.Promise<GitInterfaces.GitItem>;
+	    getItems(repositoryId: string, project?: string, scopePath?: string, recursionLevel?: GitInterfaces.VersionControlRecursionType, includeContentMetadata?: boolean, latestProcessedChange?: boolean, download?: boolean, includeLinks?: boolean, versionDescriptor?: GitInterfaces.GitVersionDescriptor): Q.Promise<GitInterfaces.GitItem[]>;
+	    getItemsBatch(requestData: GitInterfaces.GitItemRequestData, repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitItem[][]>;
+	    createPullRequestReviewer(reviewer: GitInterfaces.IdentityRefWithVote, repositoryId: string, pullRequestId: number, reviewerId: string, project?: string): Q.Promise<GitInterfaces.IdentityRefWithVote>;
+	    createPullRequestReviewers(reviewers: VSSInterfaces.IdentityRef[], repositoryId: string, pullRequestId: number, project?: string): Q.Promise<GitInterfaces.IdentityRefWithVote[]>;
+	    getPullRequestReviewer(repositoryId: string, pullRequestId: number, reviewerId: string, project?: string): Q.Promise<GitInterfaces.IdentityRefWithVote>;
+	    getPullRequestReviewers(repositoryId: string, pullRequestId: number, project?: string): Q.Promise<GitInterfaces.IdentityRefWithVote[]>;
+	    createPullRequest(gitPullRequestToCreate: GitInterfaces.GitPullRequest, repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitPullRequest>;
+	    getPullRequest(repositoryId: string, pullRequestId: number, project?: string, maxCommentLength?: number, skip?: number, top?: number): Q.Promise<GitInterfaces.GitPullRequest>;
+	    getPullRequests(repositoryId: string, searchCriteria: GitInterfaces.GitPullRequestSearchCriteria, project?: string, maxCommentLength?: number, skip?: number, top?: number): Q.Promise<GitInterfaces.GitPullRequest[]>;
+	    updatePullRequest(gitPullRequestToUpdate: GitInterfaces.GitPullRequest, repositoryId: string, pullRequestId: number, project?: string): Q.Promise<GitInterfaces.GitPullRequest>;
+	    getPullRequestWorkItems(repositoryId: string, pullRequestId: number, project?: string, commitsTop?: number, commitsSkip?: number): Q.Promise<GitInterfaces.AssociatedWorkItem[]>;
+	    createPush(push: GitInterfaces.GitPush, repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitPush>;
+	    getPush(repositoryId: string, pushId: number, project?: string, includeCommits?: number, includeRefUpdates?: boolean): Q.Promise<GitInterfaces.GitPush>;
+	    getPushes(repositoryId: string, project?: string, skip?: number, top?: number, searchCriteria?: GitInterfaces.GitPushSearchCriteria): Q.Promise<GitInterfaces.GitPush[]>;
+	    getRefs(repositoryId: string, project?: string, filter?: string, includeLinks?: boolean): Q.Promise<GitInterfaces.GitRef[]>;
+	    updateRefs(refUpdates: GitInterfaces.GitRefUpdate[], repositoryId: string, project?: string, projectId?: string): Q.Promise<GitInterfaces.GitRefUpdateResult[]>;
+	    createRepository(gitRepositoryToCreate: GitInterfaces.GitRepository, project?: string): Q.Promise<GitInterfaces.GitRepository>;
+	    getRepositories(project?: string, includeLinks?: boolean): Q.Promise<GitInterfaces.GitRepository[]>;
+	    getRepository(repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitRepository>;
+	    updateRepository(newRepositoryInfo: GitInterfaces.GitRepository, repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitRepository>;
+	    getTree(repositoryId: string, sha1: string, project?: string, projectId?: string, recursive?: boolean, fileName?: string): Q.Promise<GitInterfaces.GitTreeRef>;
+	}
+	export class GitApi extends basem.ClientApiBase implements IGitApi {
+	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
+	    /**
+	     * Gets a single blob.
+	     *
+	     * @param {string} repositoryId
+	     * @param {string} sha1
+	     * @param {string} project - Project ID or project name
+	     * @param {boolean} download
+	     * @param {string} fileName
+	     * @param onResult callback function with the resulting GitInterfaces.GitBlobRef
+	     */
+	    getBlob(repositoryId: string, sha1: string, project: string, download: boolean, fileName: string, onResult: (err: any, statusCode: number, Blob: GitInterfaces.GitBlobRef) => void): void;
+	    /**
+	     * Gets a single blob.
+	     *
+	     * @param {string} repositoryId
+	     * @param {string} sha1
+	     * @param {string} project - Project ID or project name
+	     * @param {boolean} download
+	     * @param {string} fileName
+	     * @param onResult callback function with the resulting ArrayBuffer
+	     */
+	    getBlobContent(repositoryId: string, sha1: string, project: string, download: boolean, fileName: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    /**
+	     * Gets one or more blobs in a zip file download.
+	     *
+	     * @param {string[]} blobIds
+	     * @param {string} repositoryId
+	     * @param {string} project - Project ID or project name
+	     * @param {string} filename
+	     * @param onResult callback function with the resulting ArrayBuffer
+	     */
+	    getBlobsZip(blobIds: string[], repositoryId: string, project: string, filename: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    /**
+	     * Gets a single blob.
+	     *
+	     * @param {string} repositoryId
+	     * @param {string} sha1
+	     * @param {string} project - Project ID or project name
+	     * @param {boolean} download
+	     * @param {string} fileName
+	     * @param onResult callback function with the resulting ArrayBuffer
+	     */
+	    getBlobZip(repositoryId: string, sha1: string, project: string, download: boolean, fileName: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    /**
+	     * Retrieve statistics about a single branch.
+	     *
+	     * @param {string} repositoryId - Friendly name or guid of repository
+	     * @param {string} name - Name of the branch
+	     * @param {string} project - Project ID or project name
+	     * @param {GitInterfaces.GitVersionDescriptor} baseVersionDescriptor
+	     * @param onResult callback function with the resulting GitInterfaces.GitBranchStats
+	     */
+	    getBranch(repositoryId: string, name: string, project: string, baseVersionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, BranchStat: GitInterfaces.GitBranchStats) => void): void;
+	    /**
+	     * Retrieve statistics about all branches within a repository.
+	     *
+	     * @param {string} repositoryId - Friendly name or guid of repository
+	     * @param {string} project - Project ID or project name
+	     * @param {GitInterfaces.GitVersionDescriptor} baseVersionDescriptor
+	     * @param onResult callback function with the resulting GitInterfaces.GitBranchStats[]
+	     */
+	    getBranches(repositoryId: string, project: string, baseVersionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, BranchStats: GitInterfaces.GitBranchStats[]) => void): void;
+	    /**
+	     * Retrieve changes for a particular commit.
+	     *
+	     * @param {string} commitId - The id of the commit.
+	     * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
+	     * @param {string} project - Project ID or project name
+	     * @param {number} top - The maximum number of changes to return.
+	     * @param {number} skip - The number of changes to skip.
+	     * @param onResult callback function with the resulting GitInterfaces.GitCommitChanges
+	     */
+	    getChanges(commitId: string, repositoryId: string, project: string, top: number, skip: number, onResult: (err: any, statusCode: number, Change: GitInterfaces.GitCommitChanges) => void): void;
+	    /**
+	     * Create a git commit for a project
+	     *
+	     * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting GitInterfaces.GitCommit
+	     */
+	    createCommit(repositoryId: string, project: string, onResult: (err: any, statusCode: number, Commit: GitInterfaces.GitCommit) => void): void;
+	    /**
+	     * Retrieve a particular commit.
+	     *
+	     * @param {string} commitId - The id of the commit.
+	     * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
+	     * @param {string} project - Project ID or project name
+	     * @param {number} changeCount - The number of changes to include in the result.
+	     * @param onResult callback function with the resulting GitInterfaces.GitCommit
+	     */
+	    getCommit(commitId: string, repositoryId: string, project: string, changeCount: number, onResult: (err: any, statusCode: number, Commit: GitInterfaces.GitCommit) => void): void;
+	    /**
+	     * Retrieve git commits for a project
+	     *
+	     * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
+	     * @param {GitInterfaces.GitQueryCommitsCriteria} searchCriteria
+	     * @param {string} project - Project ID or project name
+	     * @param {number} skip
+	     * @param {number} top
+	     * @param onResult callback function with the resulting GitInterfaces.GitCommitRef[]
+	     */
+	    getCommits(repositoryId: string, searchCriteria: GitInterfaces.GitQueryCommitsCriteria, project: string, skip: number, top: number, onResult: (err: any, statusCode: number, Commits: GitInterfaces.GitCommitRef[]) => void): void;
+	    /**
+	     * Retrieve a list of commits associated with a particular push.
+	     *
+	     * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
+	     * @param {number} pushId - The id of the push.
+	     * @param {string} project - Project ID or project name
+	     * @param {number} top - The maximum number of commits to return ("get the top x commits").
+	     * @param {number} skip - The number of commits to skip.
+	     * @param {boolean} includeLinks
+	     * @param onResult callback function with the resulting GitInterfaces.GitCommitRef[]
+	     */
+	    getPushCommits(repositoryId: string, pushId: number, project: string, top: number, skip: number, includeLinks: boolean, onResult: (err: any, statusCode: number, Commits: GitInterfaces.GitCommitRef[]) => void): void;
+	    /**
+	     * Retrieve git commits for a project
+	     *
+	     * @param {GitInterfaces.GitQueryCommitsCriteria} searchCriteria - Search options
+	     * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
+	     * @param {string} project - Project ID or project name
+	     * @param {number} skip
+	     * @param {number} top
+	     * @param onResult callback function with the resulting GitInterfaces.GitCommitRef[]
+	     */
+	    getCommitsBatch(searchCriteria: GitInterfaces.GitQueryCommitsCriteria, repositoryId: string, project: string, skip: number, top: number, onResult: (err: any, statusCode: number, CommitsBatch: GitInterfaces.GitCommitRef[]) => void): void;
+	    /**
+	     * Get Item Metadata and/or Content for a single item. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
+	     *
+	     * @param {string} repositoryId
+	     * @param {string} path
+	     * @param {string} project - Project ID or project name
+	     * @param {string} scopePath
+	     * @param {GitInterfaces.VersionControlRecursionType} recursionLevel
+	     * @param {boolean} includeContentMetadata
+	     * @param {boolean} latestProcessedChange
+	     * @param {boolean} download
+	     * @param {GitInterfaces.GitVersionDescriptor} versionDescriptor
+	     * @param onResult callback function with the resulting GitInterfaces.GitItem
+	     */
+	    getItem(repositoryId: string, path: string, project: string, scopePath: string, recursionLevel: GitInterfaces.VersionControlRecursionType, includeContentMetadata: boolean, latestProcessedChange: boolean, download: boolean, versionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, Item: GitInterfaces.GitItem) => void): void;
+	    /**
+	     * Get Item Metadata and/or Content for a single item. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
+	     *
+	     * @param {string} repositoryId
+	     * @param {string} path
+	     * @param {string} project - Project ID or project name
+	     * @param {string} scopePath
+	     * @param {GitInterfaces.VersionControlRecursionType} recursionLevel
+	     * @param {boolean} includeContentMetadata
+	     * @param {boolean} latestProcessedChange
+	     * @param {boolean} download
+	     * @param {GitInterfaces.GitVersionDescriptor} versionDescriptor
+	     * @param onResult callback function with the resulting ArrayBuffer
+	     */
+	    getItemContent(repositoryId: string, path: string, project: string, scopePath: string, recursionLevel: GitInterfaces.VersionControlRecursionType, includeContentMetadata: boolean, latestProcessedChange: boolean, download: boolean, versionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    /**
+	     * Get Item Metadata and/or Content for a collection of items. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
+	     *
+	     * @param {string} repositoryId
+	     * @param {string} project - Project ID or project name
+	     * @param {string} scopePath
+	     * @param {GitInterfaces.VersionControlRecursionType} recursionLevel
+	     * @param {boolean} includeContentMetadata
+	     * @param {boolean} latestProcessedChange
+	     * @param {boolean} download
+	     * @param {boolean} includeLinks
+	     * @param {GitInterfaces.GitVersionDescriptor} versionDescriptor
+	     * @param onResult callback function with the resulting GitInterfaces.GitItem[]
+	     */
+	    getItems(repositoryId: string, project: string, scopePath: string, recursionLevel: GitInterfaces.VersionControlRecursionType, includeContentMetadata: boolean, latestProcessedChange: boolean, download: boolean, includeLinks: boolean, versionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, Items: GitInterfaces.GitItem[]) => void): void;
+	    /**
+	     * Get Item Metadata and/or Content for a single item. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
+	     *
+	     * @param {string} repositoryId
+	     * @param {string} path
+	     * @param {string} project - Project ID or project name
+	     * @param {string} scopePath
+	     * @param {GitInterfaces.VersionControlRecursionType} recursionLevel
+	     * @param {boolean} includeContentMetadata
+	     * @param {boolean} latestProcessedChange
+	     * @param {boolean} download
+	     * @param {GitInterfaces.GitVersionDescriptor} versionDescriptor
+	     * @param onResult callback function with the resulting string
+	     */
+	    getItemText(repositoryId: string, path: string, project: string, scopePath: string, recursionLevel: GitInterfaces.VersionControlRecursionType, includeContentMetadata: boolean, latestProcessedChange: boolean, download: boolean, versionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    /**
+	     * Get Item Metadata and/or Content for a single item. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
+	     *
+	     * @param {string} repositoryId
+	     * @param {string} path
+	     * @param {string} project - Project ID or project name
+	     * @param {string} scopePath
+	     * @param {GitInterfaces.VersionControlRecursionType} recursionLevel
+	     * @param {boolean} includeContentMetadata
+	     * @param {boolean} latestProcessedChange
+	     * @param {boolean} download
+	     * @param {GitInterfaces.GitVersionDescriptor} versionDescriptor
+	     * @param onResult callback function with the resulting ArrayBuffer
+	     */
+	    getItemZip(repositoryId: string, path: string, project: string, scopePath: string, recursionLevel: GitInterfaces.VersionControlRecursionType, includeContentMetadata: boolean, latestProcessedChange: boolean, download: boolean, versionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    /**
+	     * Post for retrieving a creating a batch out of a set of items in a repo / project given a list of paths or a long path
+	     *
+	     * @param {GitInterfaces.GitItemRequestData} requestData
+	     * @param {string} repositoryId
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting GitInterfaces.GitItem[][]
+	     */
+	    getItemsBatch(requestData: GitInterfaces.GitItemRequestData, repositoryId: string, project: string, onResult: (err: any, statusCode: number, ItemsBatch: GitInterfaces.GitItem[][]) => void): void;
+	    /**
+	     * Adds a reviewer to a git pull request
+	     *
+	     * @param {GitInterfaces.IdentityRefWithVote} reviewer
+	     * @param {string} repositoryId
+	     * @param {number} pullRequestId
+	     * @param {string} reviewerId
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting GitInterfaces.IdentityRefWithVote
+	     */
+	    createPullRequestReviewer(reviewer: GitInterfaces.IdentityRefWithVote, repositoryId: string, pullRequestId: number, reviewerId: string, project: string, onResult: (err: any, statusCode: number, PullRequestReviewer: GitInterfaces.IdentityRefWithVote) => void): void;
+	    /**
+	     * Adds reviewers to a git pull request
+	     *
+	     * @param {VSSInterfaces.IdentityRef[]} reviewers
+	     * @param {string} repositoryId
+	     * @param {number} pullRequestId
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting GitInterfaces.IdentityRefWithVote[]
+	     */
+	    createPullRequestReviewers(reviewers: VSSInterfaces.IdentityRef[], repositoryId: string, pullRequestId: number, project: string, onResult: (err: any, statusCode: number, PullRequestReviewers: GitInterfaces.IdentityRefWithVote[]) => void): void;
+	    /**
+	     * Adds reviewers to a git pull request
+	     *
+	     * @param {string} repositoryId
+	     * @param {number} pullRequestId
+	     * @param {string} reviewerId
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function
+	     */
+	    deletePullRequestReviewer(repositoryId: string, pullRequestId: number, reviewerId: string, project: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * Retrieve a reviewer from a pull request
+	     *
+	     * @param {string} repositoryId
+	     * @param {number} pullRequestId
+	     * @param {string} reviewerId
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting GitInterfaces.IdentityRefWithVote
+	     */
+	    getPullRequestReviewer(repositoryId: string, pullRequestId: number, reviewerId: string, project: string, onResult: (err: any, statusCode: number, PullRequestReviewer: GitInterfaces.IdentityRefWithVote) => void): void;
+	    /**
+	     * Retrieve a pull request reviewers
+	     *
+	     * @param {string} repositoryId
+	     * @param {number} pullRequestId
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting GitInterfaces.IdentityRefWithVote[]
+	     */
+	    getPullRequestReviewers(repositoryId: string, pullRequestId: number, project: string, onResult: (err: any, statusCode: number, PullRequestReviewers: GitInterfaces.IdentityRefWithVote[]) => void): void;
+	    /**
+	     * Create a git pull request
+	     *
+	     * @param {GitInterfaces.GitPullRequest} gitPullRequestToCreate
+	     * @param {string} repositoryId
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting GitInterfaces.GitPullRequest
+	     */
+	    createPullRequest(gitPullRequestToCreate: GitInterfaces.GitPullRequest, repositoryId: string, project: string, onResult: (err: any, statusCode: number, PullRequest: GitInterfaces.GitPullRequest) => void): void;
+	    /**
+	     * Retrieve a pull request
+	     *
+	     * @param {string} repositoryId
+	     * @param {number} pullRequestId
+	     * @param {string} project - Project ID or project name
+	     * @param {number} maxCommentLength
+	     * @param {number} skip
+	     * @param {number} top
+	     * @param onResult callback function with the resulting GitInterfaces.GitPullRequest
+	     */
+	    getPullRequest(repositoryId: string, pullRequestId: number, project: string, maxCommentLength: number, skip: number, top: number, onResult: (err: any, statusCode: number, PullRequest: GitInterfaces.GitPullRequest) => void): void;
+	    /**
+	     * Query for pull requests
+	     *
+	     * @param {string} repositoryId
+	     * @param {GitInterfaces.GitPullRequestSearchCriteria} searchCriteria
+	     * @param {string} project - Project ID or project name
+	     * @param {number} maxCommentLength
+	     * @param {number} skip
+	     * @param {number} top
+	     * @param onResult callback function with the resulting GitInterfaces.GitPullRequest[]
+	     */
+	    getPullRequests(repositoryId: string, searchCriteria: GitInterfaces.GitPullRequestSearchCriteria, project: string, maxCommentLength: number, skip: number, top: number, onResult: (err: any, statusCode: number, PullRequests: GitInterfaces.GitPullRequest[]) => void): void;
+	    /**
+	     * Updates a pull request
+	     *
+	     * @param {GitInterfaces.GitPullRequest} gitPullRequestToUpdate
+	     * @param {string} repositoryId
+	     * @param {number} pullRequestId
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting GitInterfaces.GitPullRequest
+	     */
+	    updatePullRequest(gitPullRequestToUpdate: GitInterfaces.GitPullRequest, repositoryId: string, pullRequestId: number, project: string, onResult: (err: any, statusCode: number, PullRequest: GitInterfaces.GitPullRequest) => void): void;
+	    /**
+	     * Retrieve a pull request work items
+	     *
+	     * @param {string} repositoryId
+	     * @param {number} pullRequestId
+	     * @param {string} project - Project ID or project name
+	     * @param {number} commitsTop
+	     * @param {number} commitsSkip
+	     * @param onResult callback function with the resulting GitInterfaces.AssociatedWorkItem[]
+	     */
+	    getPullRequestWorkItems(repositoryId: string, pullRequestId: number, project: string, commitsTop: number, commitsSkip: number, onResult: (err: any, statusCode: number, PullRequestWorkItems: GitInterfaces.AssociatedWorkItem[]) => void): void;
+	    /**
+	     * Push changes to the repository.
+	     *
+	     * @param {GitInterfaces.GitPush} push
+	     * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, a project-scoped route must be used.
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting GitInterfaces.GitPush
+	     */
+	    createPush(push: GitInterfaces.GitPush, repositoryId: string, project: string, onResult: (err: any, statusCode: number, pushe: GitInterfaces.GitPush) => void): void;
+	    /**
+	     * Retrieve a particular push.
+	     *
+	     * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
+	     * @param {number} pushId - The id of the push.
+	     * @param {string} project - Project ID or project name
+	     * @param {number} includeCommits - The number of commits to include in the result.
+	     * @param {boolean} includeRefUpdates
+	     * @param onResult callback function with the resulting GitInterfaces.GitPush
+	     */
+	    getPush(repositoryId: string, pushId: number, project: string, includeCommits: number, includeRefUpdates: boolean, onResult: (err: any, statusCode: number, pushe: GitInterfaces.GitPush) => void): void;
+	    /**
+	     * Retrieves pushes associated with the specified repository.
+	     *
+	     * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
+	     * @param {string} project - Project ID or project name
+	     * @param {number} skip
+	     * @param {number} top
+	     * @param {GitInterfaces.GitPushSearchCriteria} searchCriteria
+	     * @param onResult callback function with the resulting GitInterfaces.GitPush[]
+	     */
+	    getPushes(repositoryId: string, project: string, skip: number, top: number, searchCriteria: GitInterfaces.GitPushSearchCriteria, onResult: (err: any, statusCode: number, pushes: GitInterfaces.GitPush[]) => void): void;
+	    /**
+	     * Queries the provided repository for its refs and returns them.
+	     *
+	     * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
+	     * @param {string} project - Project ID or project name
+	     * @param {string} filter - [optional] A filter to apply to the refs.
+	     * @param {boolean} includeLinks - [optional] Specifies if referenceLinks should be included in the result. default is false.
+	     * @param onResult callback function with the resulting GitInterfaces.GitRef[]
+	     */
+	    getRefs(repositoryId: string, project: string, filter: string, includeLinks: boolean, onResult: (err: any, statusCode: number, refs: GitInterfaces.GitRef[]) => void): void;
+	    /**
+	     * Creates or updates refs with the given information
+	     *
+	     * @param {GitInterfaces.GitRefUpdate[]} refUpdates - List of ref updates to attempt to perform
+	     * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
+	     * @param {string} project - Project ID or project name
+	     * @param {string} projectId - The id of the project.
+	     * @param onResult callback function with the resulting GitInterfaces.GitRefUpdateResult[]
+	     */
+	    updateRefs(refUpdates: GitInterfaces.GitRefUpdate[], repositoryId: string, project: string, projectId: string, onResult: (err: any, statusCode: number, refs: GitInterfaces.GitRefUpdateResult[]) => void): void;
+	    /**
+	     * Create a git repository
+	     *
+	     * @param {GitInterfaces.GitRepository} gitRepositoryToCreate
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting GitInterfaces.GitRepository
+	     */
+	    createRepository(gitRepositoryToCreate: GitInterfaces.GitRepository, project: string, onResult: (err: any, statusCode: number, Repositorie: GitInterfaces.GitRepository) => void): void;
+	    /**
+	     * Delete a git repository
+	     *
+	     * @param {string} repositoryId
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function
+	     */
+	    deleteRepository(repositoryId: string, project: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * Retrieve git repositories.
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {boolean} includeLinks
+	     * @param onResult callback function with the resulting GitInterfaces.GitRepository[]
+	     */
+	    getRepositories(project: string, includeLinks: boolean, onResult: (err: any, statusCode: number, Repositories: GitInterfaces.GitRepository[]) => void): void;
+	    /**
+	     * @param {string} repositoryId
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting GitInterfaces.GitRepository
+	     */
+	    getRepository(repositoryId: string, project: string, onResult: (err: any, statusCode: number, Repositorie: GitInterfaces.GitRepository) => void): void;
+	    /**
+	     * Updates the Git repository with the single populated change in the specified repository information.
+	     *
+	     * @param {GitInterfaces.GitRepository} newRepositoryInfo
+	     * @param {string} repositoryId
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting GitInterfaces.GitRepository
+	     */
+	    updateRepository(newRepositoryInfo: GitInterfaces.GitRepository, repositoryId: string, project: string, onResult: (err: any, statusCode: number, Repositorie: GitInterfaces.GitRepository) => void): void;
+	    /**
+	     * @param {string} repositoryId
+	     * @param {string} sha1
+	     * @param {string} project - Project ID or project name
+	     * @param {string} projectId
+	     * @param {boolean} recursive
+	     * @param {string} fileName
+	     * @param onResult callback function with the resulting GitInterfaces.GitTreeRef
+	     */
+	    getTree(repositoryId: string, sha1: string, project: string, projectId: string, recursive: boolean, fileName: string, onResult: (err: any, statusCode: number, Tree: GitInterfaces.GitTreeRef) => void): void;
+	    /**
+	     * @param {string} repositoryId
+	     * @param {string} sha1
+	     * @param {string} project - Project ID or project name
+	     * @param {string} projectId
+	     * @param {boolean} recursive
+	     * @param {string} fileName
+	     * @param onResult callback function with the resulting ArrayBuffer
+	     */
+	    getTreeZip(repositoryId: string, sha1: string, project: string, projectId: string, recursive: boolean, fileName: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	}
+	export class QGitApi extends basem.QClientApiBase implements IQGitApi {
+	    api: GitApi;
+	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
+	    /**
+	    * Gets a single blob.
+	    *
+	    * @param {string} repositoryId
+	    * @param {string} sha1
+	    * @param {string} project - Project ID or project name
+	    * @param {boolean} download
+	    * @param {string} fileName
+	    */
+	    getBlob(repositoryId: string, sha1: string, project?: string, download?: boolean, fileName?: string): Q.Promise<GitInterfaces.GitBlobRef>;
+	    /**
+	    * Retrieve statistics about a single branch.
+	    *
+	    * @param {string} repositoryId - Friendly name or guid of repository
+	    * @param {string} name - Name of the branch
+	    * @param {string} project - Project ID or project name
+	    * @param {GitInterfaces.GitVersionDescriptor} baseVersionDescriptor
+	    */
+	    getBranch(repositoryId: string, name: string, project?: string, baseVersionDescriptor?: GitInterfaces.GitVersionDescriptor): Q.Promise<GitInterfaces.GitBranchStats>;
+	    /**
+	    * Retrieve statistics about all branches within a repository.
+	    *
+	    * @param {string} repositoryId - Friendly name or guid of repository
+	    * @param {string} project - Project ID or project name
+	    * @param {GitInterfaces.GitVersionDescriptor} baseVersionDescriptor
+	    */
+	    getBranches(repositoryId: string, project?: string, baseVersionDescriptor?: GitInterfaces.GitVersionDescriptor): Q.Promise<GitInterfaces.GitBranchStats[]>;
+	    /**
+	    * Retrieve changes for a particular commit.
+	    *
+	    * @param {string} commitId - The id of the commit.
+	    * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
+	    * @param {string} project - Project ID or project name
+	    * @param {number} top - The maximum number of changes to return.
+	    * @param {number} skip - The number of changes to skip.
+	    */
+	    getChanges(commitId: string, repositoryId: string, project?: string, top?: number, skip?: number): Q.Promise<GitInterfaces.GitCommitChanges>;
+	    /**
+	    * Create a git commit for a project
+	    *
+	    * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
+	    * @param {string} project - Project ID or project name
+	    */
+	    createCommit(repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitCommit>;
+	    /**
+	    * Retrieve a particular commit.
+	    *
+	    * @param {string} commitId - The id of the commit.
+	    * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
+	    * @param {string} project - Project ID or project name
+	    * @param {number} changeCount - The number of changes to include in the result.
+	    */
+	    getCommit(commitId: string, repositoryId: string, project?: string, changeCount?: number): Q.Promise<GitInterfaces.GitCommit>;
+	    /**
+	    * Retrieve git commits for a project
+	    *
+	    * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
+	    * @param {GitInterfaces.GitQueryCommitsCriteria} searchCriteria
+	    * @param {string} project - Project ID or project name
+	    * @param {number} skip
+	    * @param {number} top
+	    */
+	    getCommits(repositoryId: string, searchCriteria: GitInterfaces.GitQueryCommitsCriteria, project?: string, skip?: number, top?: number): Q.Promise<GitInterfaces.GitCommitRef[]>;
+	    /**
+	    * Retrieve a list of commits associated with a particular push.
+	    *
+	    * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
+	    * @param {number} pushId - The id of the push.
+	    * @param {string} project - Project ID or project name
+	    * @param {number} top - The maximum number of commits to return ("get the top x commits").
+	    * @param {number} skip - The number of commits to skip.
+	    * @param {boolean} includeLinks
+	    */
+	    getPushCommits(repositoryId: string, pushId: number, project?: string, top?: number, skip?: number, includeLinks?: boolean): Q.Promise<GitInterfaces.GitCommitRef[]>;
+	    /**
+	    * Retrieve git commits for a project
+	    *
+	    * @param {GitInterfaces.GitQueryCommitsCriteria} searchCriteria - Search options
+	    * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
+	    * @param {string} project - Project ID or project name
+	    * @param {number} skip
+	    * @param {number} top
+	    */
+	    getCommitsBatch(searchCriteria: GitInterfaces.GitQueryCommitsCriteria, repositoryId: string, project?: string, skip?: number, top?: number): Q.Promise<GitInterfaces.GitCommitRef[]>;
+	    /**
+	    * Get Item Metadata and/or Content for a single item. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
+	    *
+	    * @param {string} repositoryId
+	    * @param {string} path
+	    * @param {string} project - Project ID or project name
+	    * @param {string} scopePath
+	    * @param {GitInterfaces.VersionControlRecursionType} recursionLevel
+	    * @param {boolean} includeContentMetadata
+	    * @param {boolean} latestProcessedChange
+	    * @param {boolean} download
+	    * @param {GitInterfaces.GitVersionDescriptor} versionDescriptor
+	    */
+	    getItem(repositoryId: string, path: string, project?: string, scopePath?: string, recursionLevel?: GitInterfaces.VersionControlRecursionType, includeContentMetadata?: boolean, latestProcessedChange?: boolean, download?: boolean, versionDescriptor?: GitInterfaces.GitVersionDescriptor): Q.Promise<GitInterfaces.GitItem>;
+	    /**
+	    * Get Item Metadata and/or Content for a collection of items. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
+	    *
+	    * @param {string} repositoryId
+	    * @param {string} project - Project ID or project name
+	    * @param {string} scopePath
+	    * @param {GitInterfaces.VersionControlRecursionType} recursionLevel
+	    * @param {boolean} includeContentMetadata
+	    * @param {boolean} latestProcessedChange
+	    * @param {boolean} download
+	    * @param {boolean} includeLinks
+	    * @param {GitInterfaces.GitVersionDescriptor} versionDescriptor
+	    */
+	    getItems(repositoryId: string, project?: string, scopePath?: string, recursionLevel?: GitInterfaces.VersionControlRecursionType, includeContentMetadata?: boolean, latestProcessedChange?: boolean, download?: boolean, includeLinks?: boolean, versionDescriptor?: GitInterfaces.GitVersionDescriptor): Q.Promise<GitInterfaces.GitItem[]>;
+	    /**
+	    * Post for retrieving a creating a batch out of a set of items in a repo / project given a list of paths or a long path
+	    *
+	    * @param {GitInterfaces.GitItemRequestData} requestData
+	    * @param {string} repositoryId
+	    * @param {string} project - Project ID or project name
+	    */
+	    getItemsBatch(requestData: GitInterfaces.GitItemRequestData, repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitItem[][]>;
+	    /**
+	    * Adds a reviewer to a git pull request
+	    *
+	    * @param {GitInterfaces.IdentityRefWithVote} reviewer
+	    * @param {string} repositoryId
+	    * @param {number} pullRequestId
+	    * @param {string} reviewerId
+	    * @param {string} project - Project ID or project name
+	    */
+	    createPullRequestReviewer(reviewer: GitInterfaces.IdentityRefWithVote, repositoryId: string, pullRequestId: number, reviewerId: string, project?: string): Q.Promise<GitInterfaces.IdentityRefWithVote>;
+	    /**
+	    * Adds reviewers to a git pull request
+	    *
+	    * @param {VSSInterfaces.IdentityRef[]} reviewers
+	    * @param {string} repositoryId
+	    * @param {number} pullRequestId
+	    * @param {string} project - Project ID or project name
+	    */
+	    createPullRequestReviewers(reviewers: VSSInterfaces.IdentityRef[], repositoryId: string, pullRequestId: number, project?: string): Q.Promise<GitInterfaces.IdentityRefWithVote[]>;
+	    /**
+	    * Retrieve a reviewer from a pull request
+	    *
+	    * @param {string} repositoryId
+	    * @param {number} pullRequestId
+	    * @param {string} reviewerId
+	    * @param {string} project - Project ID or project name
+	    */
+	    getPullRequestReviewer(repositoryId: string, pullRequestId: number, reviewerId: string, project?: string): Q.Promise<GitInterfaces.IdentityRefWithVote>;
+	    /**
+	    * Retrieve a pull request reviewers
+	    *
+	    * @param {string} repositoryId
+	    * @param {number} pullRequestId
+	    * @param {string} project - Project ID or project name
+	    */
+	    getPullRequestReviewers(repositoryId: string, pullRequestId: number, project?: string): Q.Promise<GitInterfaces.IdentityRefWithVote[]>;
+	    /**
+	    * Create a git pull request
+	    *
+	    * @param {GitInterfaces.GitPullRequest} gitPullRequestToCreate
+	    * @param {string} repositoryId
+	    * @param {string} project - Project ID or project name
+	    */
+	    createPullRequest(gitPullRequestToCreate: GitInterfaces.GitPullRequest, repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitPullRequest>;
+	    /**
+	    * Retrieve a pull request
+	    *
+	    * @param {string} repositoryId
+	    * @param {number} pullRequestId
+	    * @param {string} project - Project ID or project name
+	    * @param {number} maxCommentLength
+	    * @param {number} skip
+	    * @param {number} top
+	    */
+	    getPullRequest(repositoryId: string, pullRequestId: number, project?: string, maxCommentLength?: number, skip?: number, top?: number): Q.Promise<GitInterfaces.GitPullRequest>;
+	    /**
+	    * Query for pull requests
+	    *
+	    * @param {string} repositoryId
+	    * @param {GitInterfaces.GitPullRequestSearchCriteria} searchCriteria
+	    * @param {string} project - Project ID or project name
+	    * @param {number} maxCommentLength
+	    * @param {number} skip
+	    * @param {number} top
+	    */
+	    getPullRequests(repositoryId: string, searchCriteria: GitInterfaces.GitPullRequestSearchCriteria, project?: string, maxCommentLength?: number, skip?: number, top?: number): Q.Promise<GitInterfaces.GitPullRequest[]>;
+	    /**
+	    * Updates a pull request
+	    *
+	    * @param {GitInterfaces.GitPullRequest} gitPullRequestToUpdate
+	    * @param {string} repositoryId
+	    * @param {number} pullRequestId
+	    * @param {string} project - Project ID or project name
+	    */
+	    updatePullRequest(gitPullRequestToUpdate: GitInterfaces.GitPullRequest, repositoryId: string, pullRequestId: number, project?: string): Q.Promise<GitInterfaces.GitPullRequest>;
+	    /**
+	    * Retrieve a pull request work items
+	    *
+	    * @param {string} repositoryId
+	    * @param {number} pullRequestId
+	    * @param {string} project - Project ID or project name
+	    * @param {number} commitsTop
+	    * @param {number} commitsSkip
+	    */
+	    getPullRequestWorkItems(repositoryId: string, pullRequestId: number, project?: string, commitsTop?: number, commitsSkip?: number): Q.Promise<GitInterfaces.AssociatedWorkItem[]>;
+	    /**
+	    * Push changes to the repository.
+	    *
+	    * @param {GitInterfaces.GitPush} push
+	    * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, a project-scoped route must be used.
+	    * @param {string} project - Project ID or project name
+	    */
+	    createPush(push: GitInterfaces.GitPush, repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitPush>;
+	    /**
+	    * Retrieve a particular push.
+	    *
+	    * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
+	    * @param {number} pushId - The id of the push.
+	    * @param {string} project - Project ID or project name
+	    * @param {number} includeCommits - The number of commits to include in the result.
+	    * @param {boolean} includeRefUpdates
+	    */
+	    getPush(repositoryId: string, pushId: number, project?: string, includeCommits?: number, includeRefUpdates?: boolean): Q.Promise<GitInterfaces.GitPush>;
+	    /**
+	    * Retrieves pushes associated with the specified repository.
+	    *
+	    * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
+	    * @param {string} project - Project ID or project name
+	    * @param {number} skip
+	    * @param {number} top
+	    * @param {GitInterfaces.GitPushSearchCriteria} searchCriteria
+	    */
+	    getPushes(repositoryId: string, project?: string, skip?: number, top?: number, searchCriteria?: GitInterfaces.GitPushSearchCriteria): Q.Promise<GitInterfaces.GitPush[]>;
+	    /**
+	    * Queries the provided repository for its refs and returns them.
+	    *
+	    * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
+	    * @param {string} project - Project ID or project name
+	    * @param {string} filter - [optional] A filter to apply to the refs.
+	    * @param {boolean} includeLinks - [optional] Specifies if referenceLinks should be included in the result. default is false.
+	    */
+	    getRefs(repositoryId: string, project?: string, filter?: string, includeLinks?: boolean): Q.Promise<GitInterfaces.GitRef[]>;
+	    /**
+	    * Creates or updates refs with the given information
+	    *
+	    * @param {GitInterfaces.GitRefUpdate[]} refUpdates - List of ref updates to attempt to perform
+	    * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
+	    * @param {string} project - Project ID or project name
+	    * @param {string} projectId - The id of the project.
+	    */
+	    updateRefs(refUpdates: GitInterfaces.GitRefUpdate[], repositoryId: string, project?: string, projectId?: string): Q.Promise<GitInterfaces.GitRefUpdateResult[]>;
+	    /**
+	    * Create a git repository
+	    *
+	    * @param {GitInterfaces.GitRepository} gitRepositoryToCreate
+	    * @param {string} project - Project ID or project name
+	    */
+	    createRepository(gitRepositoryToCreate: GitInterfaces.GitRepository, project?: string): Q.Promise<GitInterfaces.GitRepository>;
+	    /**
+	    * Retrieve git repositories.
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {boolean} includeLinks
+	    */
+	    getRepositories(project?: string, includeLinks?: boolean): Q.Promise<GitInterfaces.GitRepository[]>;
+	    /**
+	    * @param {string} repositoryId
+	    * @param {string} project - Project ID or project name
+	    */
+	    getRepository(repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitRepository>;
+	    /**
+	    * Updates the Git repository with the single populated change in the specified repository information.
+	    *
+	    * @param {GitInterfaces.GitRepository} newRepositoryInfo
+	    * @param {string} repositoryId
+	    * @param {string} project - Project ID or project name
+	    */
+	    updateRepository(newRepositoryInfo: GitInterfaces.GitRepository, repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitRepository>;
+	    /**
+	    * @param {string} repositoryId
+	    * @param {string} sha1
+	    * @param {string} project - Project ID or project name
+	    * @param {string} projectId
+	    * @param {boolean} recursive
+	    * @param {string} fileName
+	    */
+	    getTree(repositoryId: string, sha1: string, project?: string, projectId?: string, recursive?: boolean, fileName?: string): Q.Promise<GitInterfaces.GitTreeRef>;
+	}
+
+}
+declare module 'vso-node-api/interfaces/TaskAgentInterfaces' {
+	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
+	export interface AgentPoolEvent {
+	    eventType: string;
+	    pool: TaskAgentPool;
+	}
+	export interface AgentQueueEvent {
+	    eventType: string;
+	    queue: TaskAgentQueue;
+	}
+	export interface AgentRefreshMessage {
+	    agentId: number;
+	    timeout: any;
+	}
+	export enum ConnectedServiceKind {
+	    /**
+	     * Custom or unknown service
+	     */
+	    Custom = 0,
+	    /**
+	     * Azure Subscription
+	     */
+	    AzureSubscription = 1,
+	    /**
+	     * Chef Connection
+	     */
+	    Chef = 2,
+	    /**
+	     * Generic Connection
+	     */
+	    Generic = 3,
+	    /**
+	     * GitHub Connection
+	     */
+	    GitHub = 4,
+	}
+	export interface EndpointAuthorization {
+	    parameters: {
+	        [key: string]: string;
+	    };
+	    scheme: string;
+	}
+	export interface Issue {
+	    category: string;
+	    data: {
+	        [key: string]: string;
+	    };
+	    message: string;
+	    type: IssueType;
+	}
+	export enum IssueType {
+	    Error = 1,
+	    Warning = 2,
+	}
+	export interface JobAssignedEvent extends JobEvent {
+	    request: TaskAgentJobRequest;
+	}
+	export interface JobCancelMessage {
+	    jobId: string;
+	    timeout: any;
+	}
+	export interface JobCompletedEvent extends JobEvent {
+	    result: TaskResult;
+	}
+	/**
+	 * Represents the context of variables and vectors for a job request.
+	 */
+	export interface JobEnvironment {
+	    endpoints: ServiceEndpoint[];
+	    mask: MaskHint[];
+	    options: {
+	        [key: number]: JobOption;
+	    };
+	    /**
+	     * Gets or sets the endpoint used for communicating back to the calling service.
+	     */
+	    systemConnection: ServiceEndpoint;
+	    variables: {
+	        [key: string]: string;
+	    };
+	}
+	export interface JobEvent {
+	    jobId: string;
+	    name: string;
+	}
+	/**
+	 * Represents an option that may affect the way an agent runs the job.
+	 */
+	export interface JobOption {
+	    data: {
+	        [key: string]: string;
+	    };
+	    /**
+	     * Gets the id of the option.
+	     */
+	    id: string;
+	}
+	export interface JobRequestMessage {
+	    environment: JobEnvironment;
+	    jobId: string;
+	    jobName: string;
+	    lockedUntil: Date;
+	    lockToken: string;
+	    plan: TaskOrchestrationPlanReference;
+	    requestId: number;
+	    tasks: TaskInstance[];
+	    timeline: TimelineReference;
+	}
+	export interface MaskHint {
+	    type: MaskType;
+	    value: string;
+	}
+	export enum MaskType {
+	    Variable = 1,
+	    Regex = 2,
+	}
+	export interface PlanEnvironment {
+	    mask: MaskHint[];
+	    options: {
+	        [key: number]: JobOption;
+	    };
+	    variables: {
+	        [key: string]: string;
+	    };
+	}
+	/**
+	 * Represents an endpoint which may be used by an orchestration job.
+	 */
+	export interface ServiceEndpoint {
+	    administratorsGroup: VSSInterfaces.IdentityRef;
+	    /**
+	     * Gets or sets the authorization data for talking to the endpoint.
+	     */
+	    authorization: EndpointAuthorization;
+	    /**
+	     * The Gets or sets Identity reference for the user who created the Service endpoint
+	     */
+	    createdBy: VSSInterfaces.IdentityRef;
+	    data: {
+	        [key: string]: string;
+	    };
+	    /**
+	     * Gets or Sets description of endpoint
+	     */
+	    description: string;
+	    groupScopeId: string;
+	    /**
+	     * Gets or sets the identifier of this endpoint.
+	     */
+	    id: string;
+	    /**
+	     * Gets or sets the friendly name of the endpoint.
+	     */
+	    name: string;
+	    readersGroup: VSSInterfaces.IdentityRef;
+	    /**
+	     * Gets or sets the type of the endpoint.
+	     */
+	    type: string;
+	    /**
+	     * Gets or sets the url of the endpoint.
+	     */
+	    url: string;
+	}
+	export interface TaskAgent extends TaskAgentReference {
+	    /**
+	     * Gets the date on which this agent was created.
+	     */
+	    createdOn: Date;
+	    /**
+	     * Gets or sets a value indicating whether or not this agent should be enabled for job execution.
+	     */
+	    enabled: boolean;
+	    /**
+	     * Gets or sets the maximum job parallelism allowed on this host.
+	     */
+	    maxParallelism: number;
+	    properties: any;
+	    /**
+	     * Gets the current connectivity status of the agent.
+	     */
+	    status: TaskAgentStatus;
+	    /**
+	     * Gets the date on which the last connectivity status change occurred.
+	     */
+	    statusChangedOn: Date;
+	    systemCapabilities: {
+	        [key: string]: string;
+	    };
+	    userCapabilities: {
+	        [key: string]: string;
+	    };
+	}
+	export interface TaskAgentJobRequest {
+	    assignTime: Date;
+	    demands: any[];
+	    finishTime: Date;
+	    hostId: string;
+	    jobId: string;
+	    lockedUntil: Date;
+	    planId: string;
+	    planType: string;
+	    queueTime: Date;
+	    receiveTime: Date;
+	    requestId: number;
+	    reservedAgent: TaskAgentReference;
+	    result: TaskResult;
+	    scopeId: string;
+	    serviceOwner: string;
+	}
+	export interface TaskAgentMessage {
+	    body: string;
+	    messageId: number;
+	    messageType: string;
+	}
+	export interface TaskAgentPool extends TaskAgentPoolReference {
+	    /**
+	     * Gets the administrators group for this agent pool.
+	     */
+	    administratorsGroup: VSSInterfaces.IdentityRef;
+	    /**
+	     * Gets or sets a value indicating whether or not a queue should be automatically provisioned for each project collection or not.
+	     */
+	    autoProvision: boolean;
+	    /**
+	     * Gets the identity who created this pool. The creator of the pool is automatically added into the administrators group for the pool on creation.
+	     */
+	    createdBy: VSSInterfaces.IdentityRef;
+	    /**
+	     * Gets the date/time of the pool creation.
+	     */
+	    createdOn: Date;
+	    /**
+	     * Gets the scope identifier for groups/roles which are owned by this pool.
+	     */
+	    groupScopeId: string;
+	    /**
+	     * Gets or sets a value indicating whether or not this pool is managed by the service.
+	     */
+	    isHosted: boolean;
+	    properties: any;
+	    /**
+	     * Gets the service accounts group for this agent pool.
+	     */
+	    serviceAccountsGroup: VSSInterfaces.IdentityRef;
+	    /**
+	     * Gets the current size of the pool.
+	     */
+	    size: number;
+	}
+	export interface TaskAgentPoolReference {
+	    id: number;
+	    name: string;
+	    scope: string;
+	}
+	export interface TaskAgentQueue {
+	    id: number;
+	    name: string;
+	    pool: TaskAgentPoolReference;
+	}
+	export interface TaskAgentReference {
+	    /**
+	     * Gets the identifier of the agent.
+	     */
+	    id: number;
+	    /**
+	     * Gets the name of the agent.
+	     */
+	    name: string;
+	    /**
+	     * Gets the version of the agent.
+	     */
+	    version: string;
+	}
+	export interface TaskAgentSession {
+	    agent: TaskAgentReference;
+	    ownerName: string;
+	    sessionId: string;
+	    systemCapabilities: {
+	        [key: string]: string;
+	    };
+	}
+	export enum TaskAgentStatus {
+	    Offline = 1,
+	    Online = 2,
+	}
+	export interface TaskAttachment {
+	    _links: any;
+	    createdOn: Date;
+	    lastChangedBy: string;
+	    lastChangedOn: Date;
+	    name: string;
+	    type: string;
+	}
+	export interface TaskDefinition {
+	    agentExecution: TaskExecution;
+	    author: string;
+	    category: string;
+	    contentsUploaded: boolean;
+	    demands: any[];
+	    description: string;
+	    friendlyName: string;
+	    groups: TaskGroupDefinition[];
+	    helpMarkDown: string;
+	    hostType: string;
+	    iconUrl: string;
+	    id: string;
+	    inputs: TaskInputDefinition[];
+	    instanceNameFormat: string;
+	    minimumAgentVersion: string;
+	    name: string;
+	    packageLocation: string;
+	    packageType: string;
+	    serverOwned: boolean;
+	    sourceDefinitions: TaskSourceDefinition[];
+	    sourceLocation: string;
+	    version: TaskVersion;
+	    visibility: string[];
+	}
+	export interface TaskDefinitionEndpoint {
+	    /**
+	     * An ID that identifies a service connection to be used for authenticating endpoint requests.
+	     */
+	    connectionId: string;
+	    /**
+	     * The scope as understood by Connected Services. Essentialy, a project-id for now.
+	     */
+	    scope: string;
+	    /**
+	     * An XPath/Json based selector to filter response returned by fetching the endpoint Url. An XPath based selector must be prefixed with the string "xpath:". A Json based selector must be prefixed with "json:".  The following selector defines an XPath for extracting nodes named 'ServiceName'.  endpoint.Selector = "xpath://ServiceName";
+	     */
+	    selector: string;
+	    /**
+	     * TaskId that this endpoint belongs to.
+	     */
+	    taskId: string;
+	    /**
+	     * URL to GET.
+	     */
+	    url: string;
+	}
+	export interface TaskExecution {
+	    /**
+	     * The utility task to run.  Specifying this means that this task definition is simply a meta task to call another task. This is useful for tasks that call utility tasks like powershell and commandline
+	     */
+	    execTask: TaskReference;
+	    /**
+	     * If a task is going to run code, then this provides the type/script etc... information by platform. For example, it might look like. net45: { typeName: "Microsoft.TeamFoundation.Automation.Tasks.PowerShellTask", assemblyName: "Microsoft.TeamFoundation.Automation.Tasks.PowerShell.dll" } net20: { typeName: "Microsoft.TeamFoundation.Automation.Tasks.PowerShellTask", assemblyName: "Microsoft.TeamFoundation.Automation.Tasks.PowerShell.dll" } java: { jar: "powershelltask.tasks.automation.teamfoundation.microsoft.com", } node: { script: "powershellhost.js", }
+	     */
+	    platformInstructions: {
+	        [key: string]: {
+	            [key: string]: string;
+	        };
+	    };
+	}
+	export interface TaskGroupDefinition {
+	    displayName: string;
+	    isExpanded: boolean;
+	    name: string;
+	}
+	export interface TaskInputDefinition {
+	    defaultValue: string;
+	    groupName: string;
+	    helpMarkDown: string;
+	    label: string;
+	    name: string;
+	    options: {
+	        [key: string]: string;
+	    };
+	    properties: {
+	        [key: string]: string;
+	    };
+	    required: boolean;
+	    type: string;
+	    visibleRule: string;
+	}
+	export interface TaskInstance extends TaskReference {
+	    alwaysRun: boolean;
+	    continueOnError: boolean;
+	    displayName: string;
+	    enabled: boolean;
+	    instanceId: string;
+	}
+	export interface TaskLog extends TaskLogReference {
+	    createdOn: Date;
+	    indexLocation: string;
+	    lastChangedOn: Date;
+	    lineCount: number;
+	    path: string;
+	}
+	export interface TaskLogReference {
+	    id: number;
+	    location: string;
+	}
+	export interface TaskOrchestrationContainer extends TaskOrchestrationItem {
+	    children: TaskOrchestrationItem[];
+	    continueOnError: boolean;
+	    parallel: boolean;
+	    rollback: TaskOrchestrationContainer;
+	}
+	export interface TaskOrchestrationItem {
+	    itemType: TaskOrchestrationItemType;
+	}
+	export enum TaskOrchestrationItemType {
+	    Container = 0,
+	    Job = 1,
+	}
+	export interface TaskOrchestrationJob extends TaskOrchestrationItem {
+	    demands: any[];
+	    executeAs: VSSInterfaces.IdentityRef;
+	    executionTimeout: any;
+	    instanceId: string;
+	    name: string;
+	    tasks: TaskInstance[];
+	    variables: {
+	        [key: string]: string;
+	    };
+	}
+	export interface TaskOrchestrationPlan extends TaskOrchestrationPlanReference {
+	    environment: PlanEnvironment;
+	    finishTime: Date;
+	    implementation: TaskOrchestrationContainer;
+	    result: TaskResult;
+	    resultCode: string;
+	    startTime: Date;
+	    state: TaskOrchestrationPlanState;
+	    timeline: TimelineReference;
+	}
+	export interface TaskOrchestrationPlanReference {
+	    artifactLocation: string;
+	    artifactUri: string;
+	    planId: string;
+	    planType: string;
+	    scopeIdentifier: string;
+	    version: number;
+	}
+	export enum TaskOrchestrationPlanState {
+	    InProgress = 1,
+	    Queued = 2,
+	    Completed = 4,
+	}
+	export interface TaskPackageMetadata {
+	    /**
+	     * Gets the name of the package.
+	     */
+	    type: string;
+	    /**
+	     * Gets the url of the package.
+	     */
+	    url: string;
+	    /**
+	     * Gets the version of the package.
+	     */
+	    version: string;
+	}
+	export interface TaskReference {
+	    id: string;
+	    inputs: {
+	        [key: string]: string;
+	    };
+	    name: string;
+	    version: string;
+	}
+	export enum TaskResult {
+	    Succeeded = 0,
+	    SucceededWithIssues = 1,
+	    Failed = 2,
+	    Canceled = 3,
+	    Skipped = 4,
+	    Abandoned = 5,
+	}
+	export interface TaskSourceDefinition {
+	    authKey: string;
+	    endpoint: string;
+	    selector: string;
+	    target: string;
+	}
+	export interface TaskVersion {
+	    isTest: boolean;
+	    major: number;
+	    minor: number;
+	    patch: number;
+	}
+	/**
+	 * Represents a shallow reference to a TeamProject.
+	 */
+	export interface TeamProjectReference {
+	    /**
+	     * Project abbreviation.
+	     */
+	    abbreviation: string;
+	    /**
+	     * The project's description (if any).
+	     */
+	    description: string;
+	    /**
+	     * Project identifier.
+	     */
+	    id: string;
+	    /**
+	     * Project name.
+	     */
+	    name: string;
+	    /**
+	     * Project state.
+	     */
+	    state: any;
+	    /**
+	     * Url to the full version of the object.
+	     */
+	    url: string;
+	}
+	export interface Timeline extends TimelineReference {
+	    lastChangedBy: string;
+	    lastChangedOn: Date;
+	    records: TimelineRecord[];
+	}
+	export interface TimelineRecord {
+	    changeId: number;
+	    currentOperation: string;
+	    details: TimelineReference;
+	    errorCount: number;
+	    finishTime: Date;
+	    id: string;
+	    issues: Issue[];
+	    lastModified: Date;
+	    location: string;
+	    log: TaskLogReference;
+	    name: string;
+	    order: number;
+	    parentId: string;
+	    percentComplete: number;
+	    result: TaskResult;
+	    resultCode: string;
+	    startTime: Date;
+	    state: TimelineRecordState;
+	    type: string;
+	    warningCount: number;
+	    workerName: string;
+	}
+	export enum TimelineRecordState {
+	    Pending = 0,
+	    InProgress = 1,
+	    Completed = 2,
+	}
+	export interface TimelineReference {
+	    changeId: number;
+	    id: string;
+	    location: string;
+	}
+	export interface WebApiConnectedService extends WebApiConnectedServiceRef {
+	    /**
+	     * The user who did the OAuth authentication to created this service
+	     */
+	    authenticatedBy: VSSInterfaces.IdentityRef;
+	    /**
+	     * Extra description on the service.
+	     */
+	    description: string;
+	    /**
+	     * Friendly Name of service connection
+	     */
+	    friendlyName: string;
+	    /**
+	     * Id/Name of the connection service. For Ex: Subscription Id for Azure Connection
+	     */
+	    id: string;
+	    /**
+	     * The kind of service.
+	     */
+	    kind: string;
+	    /**
+	     * The project associated with this service
+	     */
+	    project: TeamProjectReference;
+	    /**
+	     * Optional uri to connect directly to the service such as https://windows.azure.com
+	     */
+	    serviceUri: string;
+	}
+	export interface WebApiConnectedServiceDetails extends WebApiConnectedServiceRef {
+	    /**
+	     * Meta data for service connection
+	     */
+	    connectedServiceMetaData: WebApiConnectedService;
+	    /**
+	     * Credential info
+	     */
+	    credentialsXml: string;
+	    /**
+	     * Optional uri to connect directly to the service such as https://windows.azure.com
+	     */
+	    endPoint: string;
+	}
+	export interface WebApiConnectedServiceRef {
+	    id: string;
+	    url: string;
+	}
+	export var TypeInfo: {
+	    AgentPoolEvent: {
+	        fields: any;
+	    };
+	    AgentQueueEvent: {
+	        fields: any;
+	    };
+	    AgentRefreshMessage: {
+	        fields: any;
+	    };
+	    ConnectedServiceKind: {
+	        enumValues: {
+	            "custom": number;
+	            "azureSubscription": number;
+	            "chef": number;
+	            "generic": number;
+	            "gitHub": number;
+	        };
+	    };
+	    EndpointAuthorization: {
+	        fields: any;
+	    };
+	    Issue: {
+	        fields: any;
+	    };
+	    IssueType: {
+	        enumValues: {
+	            "error": number;
+	            "warning": number;
+	        };
+	    };
+	    JobAssignedEvent: {
+	        fields: any;
+	    };
+	    JobCancelMessage: {
+	        fields: any;
+	    };
+	    JobCompletedEvent: {
+	        fields: any;
+	    };
+	    JobEnvironment: {
+	        fields: any;
+	    };
+	    JobEvent: {
+	        fields: any;
+	    };
+	    JobOption: {
+	        fields: any;
+	    };
+	    JobRequestMessage: {
+	        fields: any;
+	    };
+	    MaskHint: {
+	        fields: any;
+	    };
+	    MaskType: {
+	        enumValues: {
+	            "variable": number;
+	            "regex": number;
+	        };
+	    };
+	    PlanEnvironment: {
+	        fields: any;
+	    };
+	    ServiceEndpoint: {
+	        fields: any;
+	    };
+	    TaskAgent: {
+	        fields: any;
+	    };
+	    TaskAgentJobRequest: {
+	        fields: any;
+	    };
+	    TaskAgentMessage: {
+	        fields: any;
+	    };
+	    TaskAgentPool: {
+	        fields: any;
+	    };
+	    TaskAgentPoolReference: {
+	        fields: any;
+	    };
+	    TaskAgentQueue: {
+	        fields: any;
+	    };
+	    TaskAgentReference: {
+	        fields: any;
+	    };
+	    TaskAgentSession: {
+	        fields: any;
+	    };
+	    TaskAgentStatus: {
+	        enumValues: {
+	            "offline": number;
+	            "online": number;
+	        };
+	    };
+	    TaskAttachment: {
+	        fields: any;
+	    };
+	    TaskDefinition: {
+	        fields: any;
+	    };
+	    TaskDefinitionEndpoint: {
+	        fields: any;
+	    };
+	    TaskExecution: {
+	        fields: any;
+	    };
+	    TaskGroupDefinition: {
+	        fields: any;
+	    };
+	    TaskInputDefinition: {
+	        fields: any;
+	    };
+	    TaskInstance: {
+	        fields: any;
+	    };
+	    TaskLog: {
+	        fields: any;
+	    };
+	    TaskLogReference: {
+	        fields: any;
+	    };
+	    TaskOrchestrationContainer: {
+	        fields: any;
+	    };
+	    TaskOrchestrationItem: {
+	        fields: any;
+	    };
+	    TaskOrchestrationItemType: {
+	        enumValues: {
+	            "container": number;
+	            "job": number;
+	        };
+	    };
+	    TaskOrchestrationJob: {
+	        fields: any;
+	    };
+	    TaskOrchestrationPlan: {
+	        fields: any;
+	    };
+	    TaskOrchestrationPlanReference: {
+	        fields: any;
+	    };
+	    TaskOrchestrationPlanState: {
+	        enumValues: {
+	            "inProgress": number;
+	            "queued": number;
+	            "completed": number;
+	        };
+	    };
+	    TaskPackageMetadata: {
+	        fields: any;
+	    };
+	    TaskReference: {
+	        fields: any;
+	    };
+	    TaskResult: {
+	        enumValues: {
+	            "succeeded": number;
+	            "succeededWithIssues": number;
+	            "failed": number;
+	            "canceled": number;
+	            "skipped": number;
+	            "abandoned": number;
+	        };
+	    };
+	    TaskSourceDefinition: {
+	        fields: any;
+	    };
+	    TaskVersion: {
+	        fields: any;
+	    };
+	    TeamProjectReference: {
+	        fields: any;
+	    };
+	    Timeline: {
+	        fields: any;
+	    };
+	    TimelineRecord: {
+	        fields: any;
+	    };
+	    TimelineRecordState: {
+	        enumValues: {
+	            "pending": number;
+	            "inProgress": number;
+	            "completed": number;
+	        };
+	    };
+	    TimelineReference: {
+	        fields: any;
+	    };
+	    WebApiConnectedService: {
+	        fields: any;
+	    };
+	    WebApiConnectedServiceDetails: {
+	        fields: any;
+	    };
+	    WebApiConnectedServiceRef: {
+	        fields: any;
+	    };
+	};
+
+}
+declare module 'vso-node-api/TaskAgentApi' {
+	/// <reference types="node" />
+	/// <reference types="Q" />
+	import Q = require('q');
+	import basem = require('vso-node-api/ClientApiBases');
+	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
+	import TaskAgentInterfaces = require('vso-node-api/interfaces/TaskAgentInterfaces');
+	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
+	export interface ITaskAgentApi extends basem.ClientApiBase {
+	    createAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number, onResult: (err: any, statusCode: number, agent: TaskAgentInterfaces.TaskAgent) => void): void;
+	    deleteAgent(poolId: number, agentId: number, onResult: (err: any, statusCode: number) => void): void;
+	    getAgent(poolId: number, agentId: number, includeCapabilities: boolean, propertyFilters: string, onResult: (err: any, statusCode: number, agent: TaskAgentInterfaces.TaskAgent) => void): void;
+	    getAgents(poolId: number, agentName: string, includeCapabilities: boolean, propertyFilters: string, demands: string, onResult: (err: any, statusCode: number, agents: TaskAgentInterfaces.TaskAgent[]) => void): void;
+	    replaceAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number, agentId: number, onResult: (err: any, statusCode: number, agent: TaskAgentInterfaces.TaskAgent) => void): void;
+	    updateAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number, agentId: number, onResult: (err: any, statusCode: number, agent: TaskAgentInterfaces.TaskAgent) => void): void;
+	    queryEndpoint(endpoint: TaskAgentInterfaces.TaskDefinitionEndpoint, onResult: (err: any, statusCode: number, endpoint: string[]) => void): void;
+	    deleteRequest(poolId: number, requestId: number, lockToken: string, onResult: (err: any, statusCode: number) => void): void;
+	    getRequest(poolId: number, requestId: number, onResult: (err: any, statusCode: number, jobrequest: TaskAgentInterfaces.TaskAgentJobRequest) => void): void;
+	    queueRequest(request: TaskAgentInterfaces.TaskAgentJobRequest, poolId: number, onResult: (err: any, statusCode: number, jobrequest: TaskAgentInterfaces.TaskAgentJobRequest) => void): void;
+	    updateRequest(request: TaskAgentInterfaces.TaskAgentJobRequest, poolId: number, requestId: number, lockToken: string, onResult: (err: any, statusCode: number, jobrequest: TaskAgentInterfaces.TaskAgentJobRequest) => void): void;
+	    deleteMessage(poolId: number, messageId: number, sessionId: string, onResult: (err: any, statusCode: number) => void): void;
+	    getMessage(poolId: number, sessionId: string, lastMessageId: number, onResult: (err: any, statusCode: number, message: TaskAgentInterfaces.TaskAgentMessage) => void): void;
+	    refreshAgent(poolId: number, agentId: number, onResult: (err: any, statusCode: number) => void): void;
+	    refreshAgents(poolId: number, onResult: (err: any, statusCode: number) => void): void;
+	    sendMessage(message: TaskAgentInterfaces.TaskAgentMessage, poolId: number, requestId: number, onResult: (err: any, statusCode: number) => void): void;
+	    createPool(pool: TaskAgentInterfaces.TaskAgentPool, onResult: (err: any, statusCode: number, pool: TaskAgentInterfaces.TaskAgentPool) => void): void;
+	    deletePool(poolId: number, onResult: (err: any, statusCode: number) => void): void;
+	    getPool(poolId: number, properties: string, onResult: (err: any, statusCode: number, pool: TaskAgentInterfaces.TaskAgentPool) => void): void;
+	    getPools(poolName: string, properties: string, onResult: (err: any, statusCode: number, pools: TaskAgentInterfaces.TaskAgentPool[]) => void): void;
+	    updatePool(pool: TaskAgentInterfaces.TaskAgentPool, poolId: number, onResult: (err: any, statusCode: number, pool: TaskAgentInterfaces.TaskAgentPool) => void): void;
+	    createQueue(queue: TaskAgentInterfaces.TaskAgentQueue, onResult: (err: any, statusCode: number, queue: TaskAgentInterfaces.TaskAgentQueue) => void): void;
+	    deleteQueue(queueId: number, onResult: (err: any, statusCode: number) => void): void;
+	    getQueue(queueId: number, onResult: (err: any, statusCode: number, queue: TaskAgentInterfaces.TaskAgentQueue) => void): void;
+	    getQueues(queueName: string, onResult: (err: any, statusCode: number, queues: TaskAgentInterfaces.TaskAgentQueue[]) => void): void;
+	    getAgentPoolRoles(poolId: number, onResult: (err: any, statusCode: number, roles: VSSInterfaces.IdentityRef[]) => void): void;
+	    createServiceEndpoint(endpoint: TaskAgentInterfaces.ServiceEndpoint, scopeIdentifier: string, endpointId: string, onResult: (err: any, statusCode: number, serviceendpoint: TaskAgentInterfaces.ServiceEndpoint) => void): void;
+	    deleteServiceEndpoint(scopeIdentifier: string, endpointId: string, onResult: (err: any, statusCode: number) => void): void;
+	    getServiceEndpointDetails(scopeIdentifier: string, endpointId: string, onResult: (err: any, statusCode: number, serviceendpoint: TaskAgentInterfaces.ServiceEndpoint) => void): void;
+	    getServiceEndpoints(scopeIdentifier: string, type: string, onResult: (err: any, statusCode: number, serviceendpoints: TaskAgentInterfaces.ServiceEndpoint[]) => void): void;
+	    createSession(session: TaskAgentInterfaces.TaskAgentSession, poolId: number, onResult: (err: any, statusCode: number, session: TaskAgentInterfaces.TaskAgentSession) => void): void;
+	    deleteSession(poolId: number, sessionId: string, onResult: (err: any, statusCode: number) => void): void;
+	    deleteTaskDefinition(taskId: string, onResult: (err: any, statusCode: number) => void): void;
+	    getTaskContent(taskId: string, versionString: string, onResult: (err: any, statusCode: number, tasks: TaskAgentInterfaces.TaskDefinition[]) => void): void;
+	    getTaskContentZip(taskId: string, versionString: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    getTaskDefinitions(visibility: string[], onResult: (err: any, statusCode: number, tasks: TaskAgentInterfaces.TaskDefinition[]) => void): void;
+	    uploadTaskDefinition(customHeaders: any, contentStream: NodeJS.ReadableStream, taskId: string, overwrite: boolean, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	    updateUserCapabilities(userCapabilities: {
+	        [key: string]: string;
+	    }, poolId: number, agentId: number, onResult: (err: any, statusCode: number, usercapabilitie: TaskAgentInterfaces.TaskAgent) => void): void;
+	}
+	export interface IQTaskAgentApi extends basem.QClientApiBase {
+	    createAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number): Q.Promise<TaskAgentInterfaces.TaskAgent>;
+	    getAgent(poolId: number, agentId: number, includeCapabilities?: boolean, propertyFilters?: string): Q.Promise<TaskAgentInterfaces.TaskAgent>;
+	    getAgents(poolId: number, agentName?: string, includeCapabilities?: boolean, propertyFilters?: string, demands?: string): Q.Promise<TaskAgentInterfaces.TaskAgent[]>;
+	    replaceAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number, agentId: number): Q.Promise<TaskAgentInterfaces.TaskAgent>;
+	    updateAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number, agentId: number): Q.Promise<TaskAgentInterfaces.TaskAgent>;
+	    queryEndpoint(endpoint: TaskAgentInterfaces.TaskDefinitionEndpoint): Q.Promise<string[]>;
+	    getRequest(poolId: number, requestId: number): Q.Promise<TaskAgentInterfaces.TaskAgentJobRequest>;
+	    queueRequest(request: TaskAgentInterfaces.TaskAgentJobRequest, poolId: number): Q.Promise<TaskAgentInterfaces.TaskAgentJobRequest>;
+	    updateRequest(request: TaskAgentInterfaces.TaskAgentJobRequest, poolId: number, requestId: number, lockToken: string): Q.Promise<TaskAgentInterfaces.TaskAgentJobRequest>;
+	    getMessage(poolId: number, sessionId: string, lastMessageId?: number): Q.Promise<TaskAgentInterfaces.TaskAgentMessage>;
+	    createPool(pool: TaskAgentInterfaces.TaskAgentPool): Q.Promise<TaskAgentInterfaces.TaskAgentPool>;
+	    getPool(poolId: number, properties?: string): Q.Promise<TaskAgentInterfaces.TaskAgentPool>;
+	    getPools(poolName?: string, properties?: string): Q.Promise<TaskAgentInterfaces.TaskAgentPool[]>;
+	    updatePool(pool: TaskAgentInterfaces.TaskAgentPool, poolId: number): Q.Promise<TaskAgentInterfaces.TaskAgentPool>;
+	    createQueue(queue: TaskAgentInterfaces.TaskAgentQueue): Q.Promise<TaskAgentInterfaces.TaskAgentQueue>;
+	    getQueue(queueId: number): Q.Promise<TaskAgentInterfaces.TaskAgentQueue>;
+	    getQueues(queueName?: string): Q.Promise<TaskAgentInterfaces.TaskAgentQueue[]>;
+	    getAgentPoolRoles(poolId?: number): Q.Promise<VSSInterfaces.IdentityRef[]>;
+	    createServiceEndpoint(endpoint: TaskAgentInterfaces.ServiceEndpoint, scopeIdentifier: string, endpointId: string): Q.Promise<TaskAgentInterfaces.ServiceEndpoint>;
+	    getServiceEndpointDetails(scopeIdentifier: string, endpointId: string): Q.Promise<TaskAgentInterfaces.ServiceEndpoint>;
+	    getServiceEndpoints(scopeIdentifier: string, type?: string): Q.Promise<TaskAgentInterfaces.ServiceEndpoint[]>;
+	    createSession(session: TaskAgentInterfaces.TaskAgentSession, poolId: number): Q.Promise<TaskAgentInterfaces.TaskAgentSession>;
+	    getTaskContent(taskId: string, versionString?: string): Q.Promise<TaskAgentInterfaces.TaskDefinition[]>;
+	    getTaskDefinitions(visibility: string[]): Q.Promise<TaskAgentInterfaces.TaskDefinition[]>;
+	    updateUserCapabilities(userCapabilities: {
+	        [key: string]: string;
+	    }, poolId: number, agentId: number): Q.Promise<TaskAgentInterfaces.TaskAgent>;
+	}
+	export class TaskAgentApi extends basem.ClientApiBase implements ITaskAgentApi {
+	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
+	    /**
+	     * @param {TaskAgentInterfaces.TaskAgent} agent
+	     * @param {number} poolId
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgent
+	     */
+	    createAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number, onResult: (err: any, statusCode: number, agent: TaskAgentInterfaces.TaskAgent) => void): void;
+	    /**
+	     * @param {number} poolId
+	     * @param {number} agentId
+	     * @param onResult callback function
+	     */
+	    deleteAgent(poolId: number, agentId: number, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {number} poolId
+	     * @param {number} agentId
+	     * @param {boolean} includeCapabilities
+	     * @param {string} propertyFilters
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgent
+	     */
+	    getAgent(poolId: number, agentId: number, includeCapabilities: boolean, propertyFilters: string, onResult: (err: any, statusCode: number, agent: TaskAgentInterfaces.TaskAgent) => void): void;
+	    /**
+	     * @param {number} poolId
+	     * @param {string} agentName
+	     * @param {boolean} includeCapabilities
+	     * @param {string} propertyFilters
+	     * @param {string} demands
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgent[]
+	     */
+	    getAgents(poolId: number, agentName: string, includeCapabilities: boolean, propertyFilters: string, demands: string, onResult: (err: any, statusCode: number, agents: TaskAgentInterfaces.TaskAgent[]) => void): void;
+	    /**
+	     * @param {TaskAgentInterfaces.TaskAgent} agent
+	     * @param {number} poolId
+	     * @param {number} agentId
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgent
+	     */
+	    replaceAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number, agentId: number, onResult: (err: any, statusCode: number, agent: TaskAgentInterfaces.TaskAgent) => void): void;
+	    /**
+	     * @param {TaskAgentInterfaces.TaskAgent} agent
+	     * @param {number} poolId
+	     * @param {number} agentId
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgent
+	     */
+	    updateAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number, agentId: number, onResult: (err: any, statusCode: number, agent: TaskAgentInterfaces.TaskAgent) => void): void;
+	    /**
+	     * Proxy for a GET request defined by an 'endpoint'. The request is authorized using a service connection. The response is filtered using an XPath/Json based selector.
+	     *
+	     * @param {TaskAgentInterfaces.TaskDefinitionEndpoint} endpoint - Describes the URL to fetch.
+	     * @param onResult callback function with the resulting string[]
+	     */
+	    queryEndpoint(endpoint: TaskAgentInterfaces.TaskDefinitionEndpoint, onResult: (err: any, statusCode: number, endpoint: string[]) => void): void;
+	    /**
+	     * @param {number} poolId
+	     * @param {number} requestId
+	     * @param {string} lockToken
+	     * @param onResult callback function
+	     */
+	    deleteRequest(poolId: number, requestId: number, lockToken: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {number} poolId
+	     * @param {number} requestId
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentJobRequest
+	     */
+	    getRequest(poolId: number, requestId: number, onResult: (err: any, statusCode: number, jobrequest: TaskAgentInterfaces.TaskAgentJobRequest) => void): void;
+	    /**
+	     * @param {TaskAgentInterfaces.TaskAgentJobRequest} request
+	     * @param {number} poolId
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentJobRequest
+	     */
+	    queueRequest(request: TaskAgentInterfaces.TaskAgentJobRequest, poolId: number, onResult: (err: any, statusCode: number, jobrequest: TaskAgentInterfaces.TaskAgentJobRequest) => void): void;
+	    /**
+	     * @param {TaskAgentInterfaces.TaskAgentJobRequest} request
+	     * @param {number} poolId
+	     * @param {number} requestId
+	     * @param {string} lockToken
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentJobRequest
+	     */
+	    updateRequest(request: TaskAgentInterfaces.TaskAgentJobRequest, poolId: number, requestId: number, lockToken: string, onResult: (err: any, statusCode: number, jobrequest: TaskAgentInterfaces.TaskAgentJobRequest) => void): void;
+	    /**
+	     * @param {number} poolId
+	     * @param {number} messageId
+	     * @param {string} sessionId
+	     * @param onResult callback function
+	     */
+	    deleteMessage(poolId: number, messageId: number, sessionId: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {number} poolId
+	     * @param {string} sessionId
+	     * @param {number} lastMessageId
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentMessage
+	     */
+	    getMessage(poolId: number, sessionId: string, lastMessageId: number, onResult: (err: any, statusCode: number, message: TaskAgentInterfaces.TaskAgentMessage) => void): void;
+	    /**
+	     * @param {number} poolId
+	     * @param {number} agentId
+	     * @param onResult callback function
+	     */
+	    refreshAgent(poolId: number, agentId: number, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {number} poolId
+	     * @param onResult callback function
+	     */
+	    refreshAgents(poolId: number, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {TaskAgentInterfaces.TaskAgentMessage} message
+	     * @param {number} poolId
+	     * @param {number} requestId
+	     * @param onResult callback function
+	     */
+	    sendMessage(message: TaskAgentInterfaces.TaskAgentMessage, poolId: number, requestId: number, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {TaskAgentInterfaces.TaskAgentPool} pool
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentPool
+	     */
+	    createPool(pool: TaskAgentInterfaces.TaskAgentPool, onResult: (err: any, statusCode: number, pool: TaskAgentInterfaces.TaskAgentPool) => void): void;
+	    /**
+	     * @param {number} poolId
+	     * @param onResult callback function
+	     */
+	    deletePool(poolId: number, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {number} poolId
+	     * @param {string} properties
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentPool
+	     */
+	    getPool(poolId: number, properties: string, onResult: (err: any, statusCode: number, pool: TaskAgentInterfaces.TaskAgentPool) => void): void;
+	    /**
+	     * @param {string} poolName
+	     * @param {string} properties
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentPool[]
+	     */
+	    getPools(poolName: string, properties: string, onResult: (err: any, statusCode: number, pools: TaskAgentInterfaces.TaskAgentPool[]) => void): void;
+	    /**
+	     * @param {TaskAgentInterfaces.TaskAgentPool} pool
+	     * @param {number} poolId
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentPool
+	     */
+	    updatePool(pool: TaskAgentInterfaces.TaskAgentPool, poolId: number, onResult: (err: any, statusCode: number, pool: TaskAgentInterfaces.TaskAgentPool) => void): void;
+	    /**
+	     * @param {TaskAgentInterfaces.TaskAgentQueue} queue
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentQueue
+	     */
+	    createQueue(queue: TaskAgentInterfaces.TaskAgentQueue, onResult: (err: any, statusCode: number, queue: TaskAgentInterfaces.TaskAgentQueue) => void): void;
+	    /**
+	     * @param {number} queueId
+	     * @param onResult callback function
+	     */
+	    deleteQueue(queueId: number, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {number} queueId
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentQueue
+	     */
+	    getQueue(queueId: number, onResult: (err: any, statusCode: number, queue: TaskAgentInterfaces.TaskAgentQueue) => void): void;
+	    /**
+	     * @param {string} queueName
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentQueue[]
+	     */
+	    getQueues(queueName: string, onResult: (err: any, statusCode: number, queues: TaskAgentInterfaces.TaskAgentQueue[]) => void): void;
+	    /**
+	     * @param {number} poolId
+	     * @param onResult callback function with the resulting VSSInterfaces.IdentityRef[]
+	     */
+	    getAgentPoolRoles(poolId: number, onResult: (err: any, statusCode: number, roles: VSSInterfaces.IdentityRef[]) => void): void;
+	    /**
+	     * @param {TaskAgentInterfaces.ServiceEndpoint} endpoint
+	     * @param {string} scopeIdentifier - The project GUID to scope the request
+	     * @param {string} endpointId
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.ServiceEndpoint
+	     */
+	    createServiceEndpoint(endpoint: TaskAgentInterfaces.ServiceEndpoint, scopeIdentifier: string, endpointId: string, onResult: (err: any, statusCode: number, serviceendpoint: TaskAgentInterfaces.ServiceEndpoint) => void): void;
+	    /**
+	     * @param {string} scopeIdentifier - The project GUID to scope the request
+	     * @param {string} endpointId
+	     * @param onResult callback function
+	     */
+	    deleteServiceEndpoint(scopeIdentifier: string, endpointId: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {string} scopeIdentifier - The project GUID to scope the request
+	     * @param {string} endpointId
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.ServiceEndpoint
+	     */
+	    getServiceEndpointDetails(scopeIdentifier: string, endpointId: string, onResult: (err: any, statusCode: number, serviceendpoint: TaskAgentInterfaces.ServiceEndpoint) => void): void;
+	    /**
+	     * @param {string} scopeIdentifier - The project GUID to scope the request
+	     * @param {string} type
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.ServiceEndpoint[]
+	     */
+	    getServiceEndpoints(scopeIdentifier: string, type: string, onResult: (err: any, statusCode: number, serviceendpoints: TaskAgentInterfaces.ServiceEndpoint[]) => void): void;
+	    /**
+	     * @param {TaskAgentInterfaces.TaskAgentSession} session
+	     * @param {number} poolId
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentSession
+	     */
+	    createSession(session: TaskAgentInterfaces.TaskAgentSession, poolId: number, onResult: (err: any, statusCode: number, session: TaskAgentInterfaces.TaskAgentSession) => void): void;
+	    /**
+	     * @param {number} poolId
+	     * @param {string} sessionId
+	     * @param onResult callback function
+	     */
+	    deleteSession(poolId: number, sessionId: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {string} taskId
+	     * @param onResult callback function
+	     */
+	    deleteTaskDefinition(taskId: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {string} taskId
+	     * @param {string} versionString
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskDefinition[]
+	     */
+	    getTaskContent(taskId: string, versionString: string, onResult: (err: any, statusCode: number, tasks: TaskAgentInterfaces.TaskDefinition[]) => void): void;
+	    /**
+	     * @param {string} taskId
+	     * @param {string} versionString
+	     * @param onResult callback function with the resulting ArrayBuffer
+	     */
+	    getTaskContentZip(taskId: string, versionString: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    /**
+	     * @param {string[]} visibility
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskDefinition[]
+	     */
+	    getTaskDefinitions(visibility: string[], onResult: (err: any, statusCode: number, tasks: TaskAgentInterfaces.TaskDefinition[]) => void): void;
+	    /**
+	     * @param {NodeJS.ReadableStream} contentStream
+	     * @param {string} taskId
+	     * @param {boolean} overwrite
+	     * @param onResult callback function
+	     */
+	    uploadTaskDefinition(customHeaders: any, contentStream: NodeJS.ReadableStream, taskId: string, overwrite: boolean, onResult: (err: any, statusCode: number, obj: any) => void): void;
+	    /**
+	     * @param {{ [key: string] : string; }} userCapabilities
+	     * @param {number} poolId
+	     * @param {number} agentId
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgent
+	     */
+	    updateUserCapabilities(userCapabilities: {
+	        [key: string]: string;
+	    }, poolId: number, agentId: number, onResult: (err: any, statusCode: number, usercapabilitie: TaskAgentInterfaces.TaskAgent) => void): void;
+	}
+	export class QTaskAgentApi extends basem.QClientApiBase implements IQTaskAgentApi {
+	    api: TaskAgentApi;
+	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
+	    /**
+	    * @param {TaskAgentInterfaces.TaskAgent} agent
+	    * @param {number} poolId
+	    */
+	    createAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number): Q.Promise<TaskAgentInterfaces.TaskAgent>;
+	    /**
+	    * @param {number} poolId
+	    * @param {number} agentId
+	    * @param {boolean} includeCapabilities
+	    * @param {string} propertyFilters
+	    */
+	    getAgent(poolId: number, agentId: number, includeCapabilities?: boolean, propertyFilters?: string): Q.Promise<TaskAgentInterfaces.TaskAgent>;
+	    /**
+	    * @param {number} poolId
+	    * @param {string} agentName
+	    * @param {boolean} includeCapabilities
+	    * @param {string} propertyFilters
+	    * @param {string} demands
+	    */
+	    getAgents(poolId: number, agentName?: string, includeCapabilities?: boolean, propertyFilters?: string, demands?: string): Q.Promise<TaskAgentInterfaces.TaskAgent[]>;
+	    /**
+	    * @param {TaskAgentInterfaces.TaskAgent} agent
+	    * @param {number} poolId
+	    * @param {number} agentId
+	    */
+	    replaceAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number, agentId: number): Q.Promise<TaskAgentInterfaces.TaskAgent>;
+	    /**
+	    * @param {TaskAgentInterfaces.TaskAgent} agent
+	    * @param {number} poolId
+	    * @param {number} agentId
+	    */
+	    updateAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number, agentId: number): Q.Promise<TaskAgentInterfaces.TaskAgent>;
+	    /**
+	    * Proxy for a GET request defined by an 'endpoint'. The request is authorized using a service connection. The response is filtered using an XPath/Json based selector.
+	    *
+	    * @param {TaskAgentInterfaces.TaskDefinitionEndpoint} endpoint - Describes the URL to fetch.
+	    */
+	    queryEndpoint(endpoint: TaskAgentInterfaces.TaskDefinitionEndpoint): Q.Promise<string[]>;
+	    /**
+	    * @param {number} poolId
+	    * @param {number} requestId
+	    */
+	    getRequest(poolId: number, requestId: number): Q.Promise<TaskAgentInterfaces.TaskAgentJobRequest>;
+	    /**
+	    * @param {TaskAgentInterfaces.TaskAgentJobRequest} request
+	    * @param {number} poolId
+	    */
+	    queueRequest(request: TaskAgentInterfaces.TaskAgentJobRequest, poolId: number): Q.Promise<TaskAgentInterfaces.TaskAgentJobRequest>;
+	    /**
+	    * @param {TaskAgentInterfaces.TaskAgentJobRequest} request
+	    * @param {number} poolId
+	    * @param {number} requestId
+	    * @param {string} lockToken
+	    */
+	    updateRequest(request: TaskAgentInterfaces.TaskAgentJobRequest, poolId: number, requestId: number, lockToken: string): Q.Promise<TaskAgentInterfaces.TaskAgentJobRequest>;
+	    /**
+	    * @param {number} poolId
+	    * @param {string} sessionId
+	    * @param {number} lastMessageId
+	    */
+	    getMessage(poolId: number, sessionId: string, lastMessageId?: number): Q.Promise<TaskAgentInterfaces.TaskAgentMessage>;
+	    /**
+	    * @param {TaskAgentInterfaces.TaskAgentPool} pool
+	    */
+	    createPool(pool: TaskAgentInterfaces.TaskAgentPool): Q.Promise<TaskAgentInterfaces.TaskAgentPool>;
+	    /**
+	    * @param {number} poolId
+	    * @param {string} properties
+	    */
+	    getPool(poolId: number, properties?: string): Q.Promise<TaskAgentInterfaces.TaskAgentPool>;
+	    /**
+	    * @param {string} poolName
+	    * @param {string} properties
+	    */
+	    getPools(poolName?: string, properties?: string): Q.Promise<TaskAgentInterfaces.TaskAgentPool[]>;
+	    /**
+	    * @param {TaskAgentInterfaces.TaskAgentPool} pool
+	    * @param {number} poolId
+	    */
+	    updatePool(pool: TaskAgentInterfaces.TaskAgentPool, poolId: number): Q.Promise<TaskAgentInterfaces.TaskAgentPool>;
+	    /**
+	    * @param {TaskAgentInterfaces.TaskAgentQueue} queue
+	    */
+	    createQueue(queue: TaskAgentInterfaces.TaskAgentQueue): Q.Promise<TaskAgentInterfaces.TaskAgentQueue>;
+	    /**
+	    * @param {number} queueId
+	    */
+	    getQueue(queueId: number): Q.Promise<TaskAgentInterfaces.TaskAgentQueue>;
+	    /**
+	    * @param {string} queueName
+	    */
+	    getQueues(queueName?: string): Q.Promise<TaskAgentInterfaces.TaskAgentQueue[]>;
+	    /**
+	    * @param {number} poolId
+	    */
+	    getAgentPoolRoles(poolId?: number): Q.Promise<VSSInterfaces.IdentityRef[]>;
+	    /**
+	    * @param {TaskAgentInterfaces.ServiceEndpoint} endpoint
+	    * @param {string} scopeIdentifier - The project GUID to scope the request
+	    * @param {string} endpointId
+	    */
+	    createServiceEndpoint(endpoint: TaskAgentInterfaces.ServiceEndpoint, scopeIdentifier: string, endpointId: string): Q.Promise<TaskAgentInterfaces.ServiceEndpoint>;
+	    /**
+	    * @param {string} scopeIdentifier - The project GUID to scope the request
+	    * @param {string} endpointId
+	    */
+	    getServiceEndpointDetails(scopeIdentifier: string, endpointId: string): Q.Promise<TaskAgentInterfaces.ServiceEndpoint>;
+	    /**
+	    * @param {string} scopeIdentifier - The project GUID to scope the request
+	    * @param {string} type
+	    */
+	    getServiceEndpoints(scopeIdentifier: string, type?: string): Q.Promise<TaskAgentInterfaces.ServiceEndpoint[]>;
+	    /**
+	    * @param {TaskAgentInterfaces.TaskAgentSession} session
+	    * @param {number} poolId
+	    */
+	    createSession(session: TaskAgentInterfaces.TaskAgentSession, poolId: number): Q.Promise<TaskAgentInterfaces.TaskAgentSession>;
+	    /**
+	    * @param {string} taskId
+	    * @param {string} versionString
+	    */
+	    getTaskContent(taskId: string, versionString?: string): Q.Promise<TaskAgentInterfaces.TaskDefinition[]>;
+	    /**
+	    * @param {string[]} visibility
+	    */
+	    getTaskDefinitions(visibility: string[]): Q.Promise<TaskAgentInterfaces.TaskDefinition[]>;
+	    /**
+	    * @param {{ [key: string] : string; }} userCapabilities
+	    * @param {number} poolId
+	    * @param {number} agentId
+	    */
+	    updateUserCapabilities(userCapabilities: {
+	        [key: string]: string;
+	    }, poolId: number, agentId: number): Q.Promise<TaskAgentInterfaces.TaskAgent>;
+	}
+
+}
+declare module 'vso-node-api/TaskApi' {
+	/// <reference types="node" />
+	/// <reference types="Q" />
+	import Q = require('q');
+	import basem = require('vso-node-api/ClientApiBases');
+	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
+	import TaskAgentInterfaces = require('vso-node-api/interfaces/TaskAgentInterfaces');
+	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
+	export interface ITaskApi extends basem.ClientApiBase {
+	    getPlanAttachments(scopeIdentifier: string, hubName: string, planId: string, type: string, onResult: (err: any, statusCode: number, attachments: TaskAgentInterfaces.TaskAttachment[]) => void): void;
+	    createAttachment(customHeaders: any, contentStream: NodeJS.ReadableStream, scopeIdentifier: string, hubName: string, planId: string, timelineId: string, recordId: string, type: string, name: string, onResult: (err: any, statusCode: number, attachment: TaskAgentInterfaces.TaskAttachment) => void): void;
+	    getAttachments(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, recordId: string, type: string, onResult: (err: any, statusCode: number, attachments: TaskAgentInterfaces.TaskAttachment[]) => void): void;
+	    postEvent(eventData: TaskAgentInterfaces.JobEvent, scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number) => void): void;
+	    postLines(lines: VSSInterfaces.VssJsonCollectionWrapperV<string[]>, scopeIdentifier: string, hubName: string, planId: string, timelineId: string, recordId: string, onResult: (err: any, statusCode: number) => void): void;
+	    appendLog(customHeaders: any, contentStream: NodeJS.ReadableStream, scopeIdentifier: string, hubName: string, planId: string, logId: number, onResult: (err: any, statusCode: number, log: TaskAgentInterfaces.TaskLog) => void): void;
+	    createLog(log: TaskAgentInterfaces.TaskLog, scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number, log: TaskAgentInterfaces.TaskLog) => void): void;
+	    getLog(scopeIdentifier: string, hubName: string, planId: string, logId: number, startLine: number, endLine: number, onResult: (err: any, statusCode: number, logs: string[]) => void): void;
+	    getLogs(scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number, logs: TaskAgentInterfaces.TaskLog[]) => void): void;
+	    getPlan(scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number, plan: TaskAgentInterfaces.TaskOrchestrationPlan) => void): void;
+	    getRecords(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, changeId: number, onResult: (err: any, statusCode: number, records: TaskAgentInterfaces.TimelineRecord[]) => void): void;
+	    updateRecords(records: VSSInterfaces.VssJsonCollectionWrapperV<TaskAgentInterfaces.TimelineRecord[]>, scopeIdentifier: string, hubName: string, planId: string, timelineId: string, onResult: (err: any, statusCode: number, record: TaskAgentInterfaces.TimelineRecord[]) => void): void;
+	    createTimeline(timeline: TaskAgentInterfaces.Timeline, scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number, timeline: TaskAgentInterfaces.Timeline) => void): void;
+	    deleteTimeline(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, onResult: (err: any, statusCode: number) => void): void;
+	    getTimeline(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, changeId: number, includeRecords: boolean, onResult: (err: any, statusCode: number, timeline: TaskAgentInterfaces.Timeline) => void): void;
+	    getTimelines(scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number, timelines: TaskAgentInterfaces.Timeline[]) => void): void;
+	}
+	export interface IQTaskApi extends basem.QClientApiBase {
+	    getPlanAttachments(scopeIdentifier: string, hubName: string, planId: string, type: string): Q.Promise<TaskAgentInterfaces.TaskAttachment[]>;
+	    createAttachment(customHeaders: any, contentStream: NodeJS.ReadableStream, scopeIdentifier: string, hubName: string, planId: string, timelineId: string, recordId: string, type: string, name: string): Q.Promise<TaskAgentInterfaces.TaskAttachment>;
+	    getAttachments(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, recordId: string, type: string): Q.Promise<TaskAgentInterfaces.TaskAttachment[]>;
+	    appendLog(customHeaders: any, contentStream: NodeJS.ReadableStream, scopeIdentifier: string, hubName: string, planId: string, logId: number): Q.Promise<TaskAgentInterfaces.TaskLog>;
+	    createLog(log: TaskAgentInterfaces.TaskLog, scopeIdentifier: string, hubName: string, planId: string): Q.Promise<TaskAgentInterfaces.TaskLog>;
+	    getLog(scopeIdentifier: string, hubName: string, planId: string, logId: number, startLine?: number, endLine?: number): Q.Promise<string[]>;
+	    getLogs(scopeIdentifier: string, hubName: string, planId: string): Q.Promise<TaskAgentInterfaces.TaskLog[]>;
+	    getPlan(scopeIdentifier: string, hubName: string, planId: string): Q.Promise<TaskAgentInterfaces.TaskOrchestrationPlan>;
+	    getRecords(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, changeId?: number): Q.Promise<TaskAgentInterfaces.TimelineRecord[]>;
+	    updateRecords(records: VSSInterfaces.VssJsonCollectionWrapperV<TaskAgentInterfaces.TimelineRecord[]>, scopeIdentifier: string, hubName: string, planId: string, timelineId: string): Q.Promise<TaskAgentInterfaces.TimelineRecord[]>;
+	    createTimeline(timeline: TaskAgentInterfaces.Timeline, scopeIdentifier: string, hubName: string, planId: string): Q.Promise<TaskAgentInterfaces.Timeline>;
+	    getTimeline(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, changeId?: number, includeRecords?: boolean): Q.Promise<TaskAgentInterfaces.Timeline>;
+	    getTimelines(scopeIdentifier: string, hubName: string, planId: string): Q.Promise<TaskAgentInterfaces.Timeline[]>;
+	}
+	export class TaskApi extends basem.ClientApiBase implements ITaskApi {
+	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
+	    /**
+	     * @param {string} scopeIdentifier - The project GUID to scope the request
+	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	     * @param {string} planId
+	     * @param {string} type
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAttachment[]
+	     */
+	    getPlanAttachments(scopeIdentifier: string, hubName: string, planId: string, type: string, onResult: (err: any, statusCode: number, attachments: TaskAgentInterfaces.TaskAttachment[]) => void): void;
+	    /**
+	     * @param {NodeJS.ReadableStream} contentStream
+	     * @param {string} scopeIdentifier - The project GUID to scope the request
+	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	     * @param {string} planId
+	     * @param {string} timelineId
+	     * @param {string} recordId
+	     * @param {string} type
+	     * @param {string} name
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAttachment
+	     */
+	    createAttachment(customHeaders: any, contentStream: NodeJS.ReadableStream, scopeIdentifier: string, hubName: string, planId: string, timelineId: string, recordId: string, type: string, name: string, onResult: (err: any, statusCode: number, attachment: TaskAgentInterfaces.TaskAttachment) => void): void;
+	    /**
+	     * @param {string} scopeIdentifier - The project GUID to scope the request
+	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	     * @param {string} planId
+	     * @param {string} timelineId
+	     * @param {string} recordId
+	     * @param {string} type
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAttachment[]
+	     */
+	    getAttachments(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, recordId: string, type: string, onResult: (err: any, statusCode: number, attachments: TaskAgentInterfaces.TaskAttachment[]) => void): void;
+	    /**
+	     * @param {TaskAgentInterfaces.JobEvent} eventData
+	     * @param {string} scopeIdentifier - The project GUID to scope the request
+	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	     * @param {string} planId
+	     * @param onResult callback function
+	     */
+	    postEvent(eventData: TaskAgentInterfaces.JobEvent, scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {VSSInterfaces.VssJsonCollectionWrapperV<string[]>} lines
+	     * @param {string} scopeIdentifier - The project GUID to scope the request
+	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	     * @param {string} planId
+	     * @param {string} timelineId
+	     * @param {string} recordId
+	     * @param onResult callback function
+	     */
+	    postLines(lines: VSSInterfaces.VssJsonCollectionWrapperV<string[]>, scopeIdentifier: string, hubName: string, planId: string, timelineId: string, recordId: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {NodeJS.ReadableStream} contentStream
+	     * @param {string} scopeIdentifier - The project GUID to scope the request
+	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	     * @param {string} planId
+	     * @param {number} logId
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskLog
+	     */
+	    appendLog(customHeaders: any, contentStream: NodeJS.ReadableStream, scopeIdentifier: string, hubName: string, planId: string, logId: number, onResult: (err: any, statusCode: number, log: TaskAgentInterfaces.TaskLog) => void): void;
+	    /**
+	     * @param {TaskAgentInterfaces.TaskLog} log
+	     * @param {string} scopeIdentifier - The project GUID to scope the request
+	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	     * @param {string} planId
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskLog
+	     */
+	    createLog(log: TaskAgentInterfaces.TaskLog, scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number, log: TaskAgentInterfaces.TaskLog) => void): void;
+	    /**
+	     * @param {string} scopeIdentifier - The project GUID to scope the request
+	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	     * @param {string} planId
+	     * @param {number} logId
+	     * @param {number} startLine
+	     * @param {number} endLine
+	     * @param onResult callback function with the resulting string[]
+	     */
+	    getLog(scopeIdentifier: string, hubName: string, planId: string, logId: number, startLine: number, endLine: number, onResult: (err: any, statusCode: number, logs: string[]) => void): void;
+	    /**
+	     * @param {string} scopeIdentifier - The project GUID to scope the request
+	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	     * @param {string} planId
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskLog[]
+	     */
+	    getLogs(scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number, logs: TaskAgentInterfaces.TaskLog[]) => void): void;
+	    /**
+	     * @param {string} scopeIdentifier - The project GUID to scope the request
+	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	     * @param {string} planId
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskOrchestrationPlan
+	     */
+	    getPlan(scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number, plan: TaskAgentInterfaces.TaskOrchestrationPlan) => void): void;
+	    /**
+	     * @param {string} scopeIdentifier - The project GUID to scope the request
+	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	     * @param {string} planId
+	     * @param {string} timelineId
+	     * @param {number} changeId
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TimelineRecord[]
+	     */
+	    getRecords(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, changeId: number, onResult: (err: any, statusCode: number, records: TaskAgentInterfaces.TimelineRecord[]) => void): void;
+	    /**
+	     * @param {VSSInterfaces.VssJsonCollectionWrapperV<TaskAgentInterfaces.TimelineRecord[]>} records
+	     * @param {string} scopeIdentifier - The project GUID to scope the request
+	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	     * @param {string} planId
+	     * @param {string} timelineId
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.TimelineRecord[]
+	     */
+	    updateRecords(records: VSSInterfaces.VssJsonCollectionWrapperV<TaskAgentInterfaces.TimelineRecord[]>, scopeIdentifier: string, hubName: string, planId: string, timelineId: string, onResult: (err: any, statusCode: number, record: TaskAgentInterfaces.TimelineRecord[]) => void): void;
+	    /**
+	     * @param {TaskAgentInterfaces.Timeline} timeline
+	     * @param {string} scopeIdentifier - The project GUID to scope the request
+	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	     * @param {string} planId
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.Timeline
+	     */
+	    createTimeline(timeline: TaskAgentInterfaces.Timeline, scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number, timeline: TaskAgentInterfaces.Timeline) => void): void;
+	    /**
+	     * @param {string} scopeIdentifier - The project GUID to scope the request
+	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	     * @param {string} planId
+	     * @param {string} timelineId
+	     * @param onResult callback function
+	     */
+	    deleteTimeline(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {string} scopeIdentifier - The project GUID to scope the request
+	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	     * @param {string} planId
+	     * @param {string} timelineId
+	     * @param {number} changeId
+	     * @param {boolean} includeRecords
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.Timeline
+	     */
+	    getTimeline(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, changeId: number, includeRecords: boolean, onResult: (err: any, statusCode: number, timeline: TaskAgentInterfaces.Timeline) => void): void;
+	    /**
+	     * @param {string} scopeIdentifier - The project GUID to scope the request
+	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	     * @param {string} planId
+	     * @param onResult callback function with the resulting TaskAgentInterfaces.Timeline[]
+	     */
+	    getTimelines(scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number, timelines: TaskAgentInterfaces.Timeline[]) => void): void;
+	}
+	export class QTaskApi extends basem.QClientApiBase implements IQTaskApi {
+	    api: TaskApi;
+	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
+	    /**
+	    * @param {string} scopeIdentifier - The project GUID to scope the request
+	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	    * @param {string} planId
+	    * @param {string} type
+	    */
+	    getPlanAttachments(scopeIdentifier: string, hubName: string, planId: string, type: string): Q.Promise<TaskAgentInterfaces.TaskAttachment[]>;
+	    /**
+	    * @param {NodeJS.ReadableStream} contentStream
+	    * @param {string} scopeIdentifier - The project GUID to scope the request
+	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	    * @param {string} planId
+	    * @param {string} timelineId
+	    * @param {string} recordId
+	    * @param {string} type
+	    * @param {string} name
+	    */
+	    createAttachment(customHeaders: any, contentStream: NodeJS.ReadableStream, scopeIdentifier: string, hubName: string, planId: string, timelineId: string, recordId: string, type: string, name: string): Q.Promise<TaskAgentInterfaces.TaskAttachment>;
+	    /**
+	    * @param {string} scopeIdentifier - The project GUID to scope the request
+	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	    * @param {string} planId
+	    * @param {string} timelineId
+	    * @param {string} recordId
+	    * @param {string} type
+	    */
+	    getAttachments(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, recordId: string, type: string): Q.Promise<TaskAgentInterfaces.TaskAttachment[]>;
+	    /**
+	    * @param {NodeJS.ReadableStream} contentStream
+	    * @param {string} scopeIdentifier - The project GUID to scope the request
+	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	    * @param {string} planId
+	    * @param {number} logId
+	    */
+	    appendLog(customHeaders: any, contentStream: NodeJS.ReadableStream, scopeIdentifier: string, hubName: string, planId: string, logId: number): Q.Promise<TaskAgentInterfaces.TaskLog>;
+	    /**
+	    * @param {TaskAgentInterfaces.TaskLog} log
+	    * @param {string} scopeIdentifier - The project GUID to scope the request
+	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	    * @param {string} planId
+	    */
+	    createLog(log: TaskAgentInterfaces.TaskLog, scopeIdentifier: string, hubName: string, planId: string): Q.Promise<TaskAgentInterfaces.TaskLog>;
+	    /**
+	    * @param {string} scopeIdentifier - The project GUID to scope the request
+	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	    * @param {string} planId
+	    * @param {number} logId
+	    * @param {number} startLine
+	    * @param {number} endLine
+	    */
+	    getLog(scopeIdentifier: string, hubName: string, planId: string, logId: number, startLine?: number, endLine?: number): Q.Promise<string[]>;
+	    /**
+	    * @param {string} scopeIdentifier - The project GUID to scope the request
+	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	    * @param {string} planId
+	    */
+	    getLogs(scopeIdentifier: string, hubName: string, planId: string): Q.Promise<TaskAgentInterfaces.TaskLog[]>;
+	    /**
+	    * @param {string} scopeIdentifier - The project GUID to scope the request
+	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	    * @param {string} planId
+	    */
+	    getPlan(scopeIdentifier: string, hubName: string, planId: string): Q.Promise<TaskAgentInterfaces.TaskOrchestrationPlan>;
+	    /**
+	    * @param {string} scopeIdentifier - The project GUID to scope the request
+	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	    * @param {string} planId
+	    * @param {string} timelineId
+	    * @param {number} changeId
+	    */
+	    getRecords(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, changeId?: number): Q.Promise<TaskAgentInterfaces.TimelineRecord[]>;
+	    /**
+	    * @param {VSSInterfaces.VssJsonCollectionWrapperV<TaskAgentInterfaces.TimelineRecord[]>} records
+	    * @param {string} scopeIdentifier - The project GUID to scope the request
+	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	    * @param {string} planId
+	    * @param {string} timelineId
+	    */
+	    updateRecords(records: VSSInterfaces.VssJsonCollectionWrapperV<TaskAgentInterfaces.TimelineRecord[]>, scopeIdentifier: string, hubName: string, planId: string, timelineId: string): Q.Promise<TaskAgentInterfaces.TimelineRecord[]>;
+	    /**
+	    * @param {TaskAgentInterfaces.Timeline} timeline
+	    * @param {string} scopeIdentifier - The project GUID to scope the request
+	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	    * @param {string} planId
+	    */
+	    createTimeline(timeline: TaskAgentInterfaces.Timeline, scopeIdentifier: string, hubName: string, planId: string): Q.Promise<TaskAgentInterfaces.Timeline>;
+	    /**
+	    * @param {string} scopeIdentifier - The project GUID to scope the request
+	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	    * @param {string} planId
+	    * @param {string} timelineId
+	    * @param {number} changeId
+	    * @param {boolean} includeRecords
+	    */
+	    getTimeline(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, changeId?: number, includeRecords?: boolean): Q.Promise<TaskAgentInterfaces.Timeline>;
+	    /**
+	    * @param {string} scopeIdentifier - The project GUID to scope the request
+	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
+	    * @param {string} planId
+	    */
+	    getTimelines(scopeIdentifier: string, hubName: string, planId: string): Q.Promise<TaskAgentInterfaces.Timeline[]>;
+	}
+
+}
+declare module 'vso-node-api/interfaces/common/SystemDataInterfaces' {
+	/**
+	 * Specifies SQL Server-specific data type of a field, property, for use in a System.Data.SqlClient.SqlParameter.
+	 */
+	export enum SqlDbType {
+	    /**
+	     * A 64-bit signed integer.
+	     */
+	    BigInt = 0,
+	    /**
+	     * Array of type Byte. A fixed-length stream of binary data ranging between 1 and 8,000 bytes.
+	     */
+	    Binary = 1,
+	    /**
+	     * Boolean. An unsigned numeric value that can be 0, 1, or null.
+	     */
+	    Bit = 2,
+	    /**
+	     * String. A fixed-length stream of non-Unicode characters ranging between 1 and 8,000 characters.
+	     */
+	    Char = 3,
+	    /**
+	     * DateTime. Date and time data ranging in value from January 1, 1753 to December 31, 9999 to an accuracy of 3.33 milliseconds.
+	     */
+	    DateTime = 4,
+	    /**
+	     * Decimal. A fixed precision and scale numeric value between -10 38 -1 and 10 38 -1.
+	     */
+	    Decimal = 5,
+	    /**
+	     * Double. A floating point number within the range of -1.79E +308 through 1.79E +308.
+	     */
+	    Float = 6,
+	    /**
+	     * Array of type Byte. A variable-length stream of binary data ranging from 0 to 2 31 -1 (or 2,147,483,647) bytes.
+	     */
+	    Image = 7,
+	    /**
+	     * Int32. A 32-bit signed integer.
+	     */
+	    Int = 8,
+	    /**
+	     * Decimal. A currency value ranging from -2 63 (or -9,223,372,036,854,775,808) to 2 63 -1 (or +9,223,372,036,854,775,807) with an accuracy to a ten-thousandth of a currency unit.
+	     */
+	    Money = 9,
+	    /**
+	     * String. A fixed-length stream of Unicode characters ranging between 1 and 4,000 characters.
+	     */
+	    NChar = 10,
+	    /**
+	     * String. A variable-length stream of Unicode data with a maximum length of 2 30 - 1 (or 1,073,741,823) characters.
+	     */
+	    NText = 11,
+	    /**
+	     * String. A variable-length stream of Unicode characters ranging between 1 and 4,000 characters. Implicit conversion fails if the string is greater than 4,000 characters. Explicitly set the object when working with strings longer than 4,000 characters. Use System.Data.SqlDbType.NVarChar when the database column is nvarchar(max).
+	     */
+	    NVarChar = 12,
+	    /**
+	     * Single. A floating point number within the range of -3.40E +38 through 3.40E +38.
+	     */
+	    Real = 13,
+	    /**
+	     * Guid. A globally unique identifier (or GUID).
+	     */
+	    UniqueIdentifier = 14,
+	    /**
+	     * DateTime. Date and time data ranging in value from January 1, 1900 to June 6, 2079 to an accuracy of one minute.
+	     */
+	    SmallDateTime = 15,
+	    /**
+	     * Int16. A 16-bit signed integer.
+	     */
+	    SmallInt = 16,
+	    /**
+	     * Decimal. A currency value ranging from -214,748.3648 to +214,748.3647 with an accuracy to a ten-thousandth of a currency unit.
+	     */
+	    SmallMoney = 17,
+	    /**
+	     * String. A variable-length stream of non-Unicode data with a maximum length of 2 31 -1 (or 2,147,483,647) characters.
+	     */
+	    Text = 18,
+	    /**
+	     * Array of type System.Byte. Automatically generated binary numbers, which are guaranteed to be unique within a database. timestamp is used typically as a mechanism for version-stamping table rows. The storage size is 8 bytes.
+	     */
+	    Timestamp = 19,
+	    /**
+	     * Byte. An 8-bit unsigned integer.
+	     */
+	    TinyInt = 20,
+	    /**
+	     * Array of type Byte. A variable-length stream of binary data ranging between 1 and 8,000 bytes. Implicit conversion fails if the byte array is greater than 8,000 bytes. Explicitly set the object when working with byte arrays larger than 8,000 bytes.
+	     */
+	    VarBinary = 21,
+	    /**
+	     * String. A variable-length stream of non-Unicode characters ranging between 1 and 8,000 characters. Use System.Data.SqlDbType.VarChar when the database column is varchar(max).
+	     */
+	    VarChar = 22,
+	    /**
+	     * Object. A special data type that can contain numeric, string, binary, or date data as well as the SQL Server values Empty and Null, which is assumed if no other type is declared.
+	     */
+	    Variant = 23,
+	    /**
+	     * An XML value. Obtain the XML as a string using the System.Data.SqlClient.SqlDataReader.GetValue(System.Int32) method or System.Data.SqlTypes.SqlXml.Value property, or as an System.Xml.XmlReader by calling the System.Data.SqlTypes.SqlXml.CreateReader method.
+	     */
+	    Xml = 25,
+	    /**
+	     * A SQL Server user-defined type (UDT).
+	     */
+	    Udt = 29,
+	    /**
+	     * A special data type for specifying structured data contained in table-valued parameters.
+	     */
+	    Structured = 30,
+	    /**
+	     * Date data ranging in value from January 1,1 AD through December 31, 9999 AD.
+	     */
+	    Date = 31,
+	    /**
+	     * Time data based on a 24-hour clock. Time value range is 00:00:00 through 23:59:59.9999999 with an accuracy of 100 nanoseconds. Corresponds to a SQL Server time value.
+	     */
+	    Time = 32,
+	    /**
+	     * Date and time data. Date value range is from January 1,1 AD through December 31, 9999 AD. Time value range is 00:00:00 through 23:59:59.9999999 with an accuracy of 100 nanoseconds.
+	     */
+	    DateTime2 = 33,
+	    /**
+	     * Date and time data with time zone awareness. Date value range is from January 1,1 AD through December 31, 9999 AD. Time value range is 00:00:00 through 23:59:59.9999999 with an accuracy of 100 nanoseconds. Time zone value range is -14:00 through +14:00.
+	     */
+	    DateTimeOffset = 34,
+	}
+	export var TypeInfo: {
+	    SqlDbType: {
+	        enumValues: {
+	            "BigInt": number;
+	            "Binary": number;
+	            "Bit": number;
+	            "Char": number;
+	            "DateTime": number;
+	            "Decimal": number;
+	            "Float": number;
+	            "Image": number;
+	            "Int": number;
+	            "Money": number;
+	            "NChar": number;
+	            "NText": number;
+	            "NVarChar": number;
+	            "Real": number;
+	            "UniqueIdentifier": number;
+	            "SmallDateTime": number;
+	            "SmallInt": number;
+	            "SmallMoney": number;
+	            "Text": number;
+	            "Timestamp": number;
+	            "TinyInt": number;
+	            "VarBinary": number;
+	            "VarChar": number;
+	            "Variant": number;
+	            "Xml": number;
+	            "Udt": number;
+	            "Structured": number;
+	            "Date": number;
+	            "Time": number;
+	            "DateTime2": number;
+	            "DateTimeOffset": number;
+	        };
+	    };
+	};
+
+}
+declare module 'vso-node-api/interfaces/TestInterfaces' {
+	import SystemData = require('vso-node-api/interfaces/common/SystemDataInterfaces');
+	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
+	export interface AdditionalTestField {
+	    fieldName: string;
+	    value: any;
+	}
+	export interface AddtionalTestFieldDefinition {
+	    fieldName: string;
+	    scope: TestExtensionFieldScope;
+	    value: SystemData.SqlDbType;
+	}
+	export interface AggregatedResultsByPivot {
+	    count: number;
+	    duration: any;
+	    pivot: string;
+	}
+	export interface AggregatedTestResults {
+	    duration: any;
+	    resultsByPivot: AggregatedResultsByPivot[];
+	    self: ShallowReference;
+	    totalTests: number;
+	}
+	export enum AttachmentType {
+	    GeneralAttachment = 0,
+	    AfnStrip = 1,
+	    BugFilingData = 2,
+	    CodeCoverage = 3,
+	    IntermediateCollectorData = 4,
+	    RunConfig = 5,
+	    TestImpactDetails = 6,
+	    TmiTestRunDeploymentFiles = 7,
+	    TmiTestRunReverseDeploymentFiles = 8,
+	    TmiTestResultDetail = 9,
+	    TmiTestRunSummary = 10,
+	}
+	export interface BatchResponse {
+	    error: string;
+	    responses: Response[];
+	    status: string;
+	}
+	export interface BuildConfiguration {
+	    flavor: string;
+	    id: number;
+	    platform: string;
+	    project: ShallowReference;
+	    uri: string;
+	}
+	export interface BuildCoverage {
+	    codeCoverageFileUrl: string;
+	    configuration: BuildConfiguration;
+	    lastError: string;
+	    modules: ModuleCoverage[];
+	    state: string;
+	}
+	/**
+	 * Represents the build configuration (platform, flavor) and coverage data for the build
+	 */
+	export interface CodeCoverageData {
+	    /**
+	     * Flavor of build for which data is retrieved/published
+	     */
+	    buildFlavor: string;
+	    /**
+	     * Platform of build for which data is retrieved/published
+	     */
+	    buildPlatform: string;
+	    /**
+	     * List of coverage data for the build
+	     */
+	    coverageStats: CodeCoverageStatistics[];
+	}
+	/**
+	 * Represents the code coverage statistics for a particular coverage label (modules, statements, blocks, etc.)
+	 */
+	export interface CodeCoverageStatistics {
+	    /**
+	     * Covered units
+	     */
+	    covered: number;
+	    /**
+	     * Delta of coverage
+	     */
+	    delta: number;
+	    /**
+	     * Position of label
+	     */
+	    index: number;
+	    /**
+	     * Is delta valid
+	     */
+	    isDeltaAvailable: boolean;
+	    /**
+	     * Label of coverage data ("Blocks", "Statements", "Modules", etc.)
+	     */
+	    label: string;
+	    /**
+	     * Total units
+	     */
+	    total: number;
+	}
+	/**
+	 * Represents the code coverage summary results Used to publish or retrieve code coverage summary against a build
+	 */
+	export interface CodeCoverageSummary {
+	    /**
+	     * Uri of build for which data is retrieved/published
+	     */
+	    buildUri: string;
+	    /**
+	     * List of coverage data and details for the build
+	     */
+	    coverageData: CodeCoverageData[];
+	    /**
+	     * Uri of build against which difference in coverage is computed
+	     */
+	    deltaBuildUri: string;
+	}
+	export enum CoverageQueryFlags {
+	    /**
+	     * If set, the Coverage.Modules property will be populated.
+	     */
+	    Modules = 1,
+	    /**
+	     * If set, the ModuleCoverage.Functions properties will be populated.
+	     */
+	    Functions = 2,
+	    /**
+	     * If set, the ModuleCoverage.CoverageData field will be populated.
+	     */
+	    BlockData = 4,
+	}
+	export interface CoverageStatistics {
+	    blocksCovered: number;
+	    blocksNotCovered: number;
+	    linesCovered: number;
+	    linesNotCovered: number;
+	    linesPartiallyCovered: number;
+	}
+	/**
+	 * This is a temporary class to provide the details for the test run environment.
+	 */
+	export interface DtlEnvironmentDetails {
+	    csmContent: string;
+	    csmParameters: string;
+	    subscriptionName: string;
+	}
+	export interface FunctionCoverage {
+	    class: string;
+	    name: string;
+	    namespace: string;
+	    sourceFile: string;
+	    statistics: CoverageStatistics;
+	}
+	export interface ModuleCoverage {
+	    blockCount: number;
+	    blockData: number[];
+	    functions: FunctionCoverage[];
+	    name: string;
+	    signature: string;
+	    signatureAge: number;
+	    statistics: CoverageStatistics;
+	}
+	export interface PlanUpdateModel {
+	    area: ShallowReference;
+	    automatedTestEnvironment: TestEnvironment;
+	    automatedTestSettings: TestSettings;
+	    build: ShallowReference;
+	    configurationIds: number[];
+	    description: string;
+	    endDate: string;
+	    iteration: string;
+	    manualTestEnvironment: TestEnvironment;
+	    manualTestSettings: TestSettings;
+	    name: string;
+	    owner: VSSInterfaces.IdentityRef;
+	    startDate: string;
+	    state: string;
+	    status: string;
+	}
+	export interface PointAssignment {
+	    configuration: ShallowReference;
+	    tester: VSSInterfaces.IdentityRef;
+	}
+	export interface PointUpdateModel {
+	}
+	export interface PointWorkItemProperty {
+	    workItem: {
+	        key: string;
+	        value: any;
+	    };
+	}
+	export interface QueryModel {
+	    query: string;
+	}
+	export interface Response {
+	    error: string;
+	    id: string;
+	    status: string;
+	    url: string;
+	}
+	export enum ResultOutcome {
+	    Pass = 1,
+	    Fail = 2,
+	    Pending = 3,
+	}
+	export interface ResultUpdateRequestModel {
+	    actionResultDeletes: TestActionResultModel[];
+	    actionResults: TestActionResultModel[];
+	    parameterDeletes: TestResultParameterModel[];
+	    parameters: TestResultParameterModel[];
+	    testCaseResult: TestCaseResultUpdateModel;
+	}
+	export interface ResultUpdateResponseModel {
+	    revision: number;
+	}
+	export interface RunCreateModel {
+	    additionalTestFields: AdditionalTestField[];
+	    automated: boolean;
+	    build: ShallowReference;
+	    buildDropLocation: string;
+	    buildFlavor: string;
+	    buildPlatform: string;
+	    comment: string;
+	    completeDate: string;
+	    configurationIds: number[];
+	    controller: string;
+	    dtlAutEnvironment: ShallowReference;
+	    dtlTestEnvironment: ShallowReference;
+	    dueDate: string;
+	    environmentDetails: DtlEnvironmentDetails;
+	    errorMessage: string;
+	    filter: RunFilter;
+	    iteration: string;
+	    name: string;
+	    owner: VSSInterfaces.IdentityRef;
+	    plan: ShallowReference;
+	    pointIds: number[];
+	    releaseEnvironmentUri: string;
+	    releaseUri: string;
+	    runTimeout: any;
+	    startDate: string;
+	    state: string;
+	    testConfigurationsMapping: string;
+	    testEnvironmentId: string;
+	    testSettings: ShallowReference;
+	    type: string;
+	}
+	/**
+	 * This class is used to provide the filters used for discovery
+	 */
+	export interface RunFilter {
+	    /**
+	     * filter for the test case sources (test containers)
+	     */
+	    sourceFilter: string;
+	    /**
+	     * filter for the test cases
+	     */
+	    testCaseFilter: string;
+	}
+	export interface RunStatistic {
+	    count: number;
+	    outcome: string;
+	    resolutionState: TestResolutionState;
+	    state: string;
+	}
+	export interface RunUpdateModel {
+	    build: ShallowReference;
+	    comment: string;
+	    completedDate: string;
+	    controller: string;
+	    deleteInProgressResults: boolean;
+	    dtlAutEnvironment: ShallowReference;
+	    dtlEnvironment: ShallowReference;
+	    dtlEnvironmentDetails: DtlEnvironmentDetails;
+	    dueDate: string;
+	    errorMessage: string;
+	    iteration: string;
+	    logEntries: TestMessageLogDetails[];
+	    name: string;
+	    startedDate: string;
+	    state: string;
+	    substate: TestRunSubstate;
+	    testEnvironmentId: string;
+	    testSettings: ShallowReference;
+	}
+	/**
+	 * An abstracted reference to some other resource. This class is used to provide the build data contracts with a uniform way to reference other resources in a way that provides easy traversal through links.
+	 */
+	export interface ShallowReference {
+	    /**
+	     * Id of the resource
+	     */
+	    id: string;
+	    /**
+	     * Name of the linked resource (definition name, controller name, etc.)
+	     */
+	    name: string;
+	    /**
+	     * Full http link to the resource
+	     */
+	    url: string;
+	}
+	export interface SharedStepModel {
+	    id: number;
+	    revision: number;
+	}
+	export interface SuiteCreateModel {
+	}
+	export interface SuiteTestCase {
+	    pointAssignments: PointAssignment[];
+	    testCase: WorkItemReference;
+	}
+	export interface SuiteUpdateModel {
+	}
+	export interface TestActionResultModel extends TestResultModelBase {
+	    actionPath: string;
+	    iterationId: number;
+	    sharedStepModel: SharedStepModel;
+	    url: string;
+	}
+	export interface TestAttachmentReference {
+	    id: number;
+	    url: string;
+	}
+	export interface TestAttachmentRequestModel {
+	    attachmentType: string;
+	    comment: string;
+	    fileName: string;
+	    stream: string;
+	}
+	export interface TestCaseResult {
+	    additionalFields: AdditionalTestField[];
+	    afnStripId: number;
+	    area: ShallowReference;
+	    associatedBugs: ShallowReference[];
+	    automatedTestId: string;
+	    automatedTestName: string;
+	    automatedTestStorage: string;
+	    automatedTestType: string;
+	    automatedTestTypeId: string;
+	    build: ShallowReference;
+	    comment: string;
+	    completedDate: Date;
+	    computerName: string;
+	    configuration: ShallowReference;
+	    createdDate: Date;
+	    durationInMs: number;
+	    errorMessage: string;
+	    failureType: string;
+	    id: number;
+	    iterationDetails: TestIterationDetailsModel[];
+	    lastUpdatedBy: VSSInterfaces.IdentityRef;
+	    lastUpdatedDate: Date;
+	    outcome: string;
+	    owner: VSSInterfaces.IdentityRef;
+	    priority: number;
+	    project: ShallowReference;
+	    resetCount: number;
+	    resolutionState: string;
+	    resolutionStateId: number;
+	    revision: number;
+	    runBy: VSSInterfaces.IdentityRef;
+	    stackTrace: string;
+	    startedDate: Date;
+	    state: string;
+	    testCase: ShallowReference;
+	    testCaseTitle: string;
+	    testPoint: ShallowReference;
+	    testRun: ShallowReference;
+	    url: string;
+	}
+	export interface TestCaseResult2 {
+	    componentId: string;
+	    custom: any;
+	    endTime: Date;
+	    exceptionStack: string;
+	    externalArtifacts: string[];
+	    externalRunId: string;
+	    externalSystem: string;
+	    externalTestId: string;
+	    failureReasons: string[];
+	    failureSummary: string;
+	    investigationNotes: string;
+	    isSuperseded: boolean;
+	    isValid: boolean;
+	    outcome: ResultOutcome;
+	    resultCustomPropertiesTypeName: string;
+	    resultId: string;
+	    resultName: string;
+	    runId: string;
+	    startTime: Date;
+	    testId: string;
+	    tfsSecurityKey: string;
+	}
+	export interface TestCaseResultAttachmentModel {
+	    id: number;
+	    iterationId: number;
+	    name: string;
+	    size: number;
+	    url: string;
+	}
+	export interface TestCaseResultIdentifier {
+	}
+	export interface TestCaseResultUpdateModel {
+	    additionalFields: AdditionalTestField[];
+	    associatedWorkItems: number[];
+	    automatedTestTypeId: string;
+	    comment: string;
+	    completedDate: string;
+	    computerName: string;
+	    durationInMs: string;
+	    errorMessage: string;
+	    failureType: string;
+	    outcome: string;
+	    owner: VSSInterfaces.IdentityRef;
+	    resolutionState: string;
+	    runBy: VSSInterfaces.IdentityRef;
+	    stackTrace: string;
+	    startedDate: string;
+	    state: string;
+	    testCasePriority: string;
+	    testResult: ShallowReference;
+	}
+	export interface TestEnvironment {
+	    environmentId: string;
+	    environmentName: string;
+	}
+	export enum TestExtensionFieldScope {
+	    None = 0,
+	    TestRun = 1,
+	    TestResult = 2,
+	    System = 4,
+	}
+	export interface TestInsightDetails {
+	    count: number;
+	    previousBuild: ShallowReference;
+	    self: ShallowReference;
+	    testResults: ShallowReference[];
+	}
+	export interface TestInsights {
+	    existingFailures: TestInsightDetails;
+	    fixedTests: TestInsightDetails;
+	    newFailures: TestInsightDetails;
+	    self: ShallowReference;
+	}
+	export interface TestIterationDetailsModel {
+	    actionResults: TestActionResultModel[];
+	    attachments: TestCaseResultAttachmentModel[];
+	    comment: string;
+	    completedDate: Date;
+	    durationInMs: number;
+	    errorMessage: string;
+	    id: number;
+	    outcome: string;
+	    parameters: TestResultParameterModel[];
+	    startedDate: Date;
+	    url: string;
+	}
+	/**
+	 * An abstracted reference to some other resource. This class is used to provide the build data contracts with a uniform way to reference other resources in a way that provides easy traversal through links.
+	 */
+	export interface TestMessageLogDetails {
+	    /**
+	     * Date when the resource is created
+	     */
+	    dateCreated: Date;
+	    /**
+	     * Id of the resource
+	     */
+	    entryId: number;
+	    /**
+	     * Message of the resource
+	     */
+	    message: string;
+	}
+	export interface TestPlan {
+	    area: ShallowReference;
+	    automatedTestEnvironment: TestEnvironment;
+	    automatedTestSettings: TestSettings;
+	    build: ShallowReference;
+	    clientUrl: string;
+	    description: string;
+	    endDate: Date;
+	    id: number;
+	    iteration: string;
+	    manualTestEnvironment: TestEnvironment;
+	    manualTestSettings: TestSettings;
+	    name: string;
+	    owner: VSSInterfaces.IdentityRef;
+	    previousBuild: ShallowReference;
+	    project: ShallowReference;
+	    revision: number;
+	    rootSuite: ShallowReference;
+	    startDate: Date;
+	    state: string;
+	    updatedBy: VSSInterfaces.IdentityRef;
+	    updatedDate: Date;
+	    url: string;
+	}
+	export interface TestPlansWithSelection {
+	    lastSelectedPlan: number;
+	    lastSelectedSuite: number;
+	    plans: TestPlan[];
+	}
+	export interface TestPoint {
+	    assignedTo: VSSInterfaces.IdentityRef;
+	    automated: boolean;
+	    comment: string;
+	    configuration: ShallowReference;
+	    failureType: string;
+	    id: number;
+	    lastResolutionStateId: number;
+	    lastResult: ShallowReference;
+	    lastTestRun: ShallowReference;
+	    lastUpdatedBy: VSSInterfaces.IdentityRef;
+	    lastUpdatedDate: Date;
+	    outcome: string;
+	    revision: number;
+	    state: string;
+	    suite: ShallowReference;
+	    testCase: WorkItemReference;
+	    testPlan: ShallowReference;
+	    url: string;
+	    workItemProperties: any[];
+	}
+	export interface TestReport {
+	    aggregatedResults: AggregatedTestResults;
+	    build: ShallowReference;
+	    self: ShallowReference;
+	    teamProject: ShallowReference;
+	    testInsights: TestInsights;
+	}
+	export interface TestResolutionState {
+	    id: number;
+	    name: string;
+	    project: ShallowReference;
+	}
+	export interface TestResultCreateModel {
+	    additionalFields: AdditionalTestField[];
+	    area: ShallowReference;
+	    associatedWorkItems: number[];
+	    automatedTestId: string;
+	    automatedTestName: string;
+	    automatedTestStorage: string;
+	    automatedTestType: string;
+	    automatedTestTypeId: string;
+	    comment: string;
+	    completedDate: string;
+	    computerName: string;
+	    configuration: ShallowReference;
+	    durationInMs: string;
+	    errorMessage: string;
+	    failureType: string;
+	    outcome: string;
+	    owner: VSSInterfaces.IdentityRef;
+	    resolutionState: string;
+	    runBy: VSSInterfaces.IdentityRef;
+	    stackTrace: string;
+	    startedDate: string;
+	    state: string;
+	    testCase: ShallowReference;
+	    testCasePriority: string;
+	    testCaseTitle: string;
+	    testPoint: ShallowReference;
+	}
+	export interface TestResultModelBase {
+	    comment: string;
+	    completedDate: Date;
+	    durationInMs: number;
+	    errorMessage: string;
+	    outcome: string;
+	    startedDate: Date;
+	}
+	export interface TestResultParameterModel {
+	    actionPath: string;
+	    iterationId: number;
+	    parameterName: string;
+	    url: string;
+	    value: string;
+	}
+	export interface TestRun {
+	    additionalFields: AdditionalTestField[];
+	    build: ShallowReference;
+	    buildConfiguration: BuildConfiguration;
+	    comment: string;
+	    completedDate: Date;
+	    controller: string;
+	    createdDate: Date;
+	    dropLocation: string;
+	    dtlAutEnvironment: ShallowReference;
+	    dtlEnvironment: ShallowReference;
+	    dtlEnvironmentCreationDetails: DtlEnvironmentDetails;
+	    dueDate: Date;
+	    errorMessage: string;
+	    filter: RunFilter;
+	    id: number;
+	    incompleteTests: number;
+	    isAutomated: boolean;
+	    iteration: string;
+	    lastUpdatedBy: VSSInterfaces.IdentityRef;
+	    lastUpdatedDate: Date;
+	    name: string;
+	    notApplicableTests: number;
+	    owner: VSSInterfaces.IdentityRef;
+	    passedTests: number;
+	    phase: string;
+	    plan: ShallowReference;
+	    postProcessState: string;
+	    project: ShallowReference;
+	    releaseEnvironmentUri: string;
+	    releaseUri: string;
+	    revision: number;
+	    runStatistics: RunStatistic[];
+	    startedDate: Date;
+	    state: string;
+	    substate: TestRunSubstate;
+	    testEnvironment: TestEnvironment;
+	    testMessageLogId: number;
+	    testSettings: ShallowReference;
+	    totalTests: number;
+	    unanalyzedTests: number;
+	    url: string;
+	    webAccessUrl: string;
+	}
+	export interface TestRunCoverage {
+	    lastError: string;
+	    modules: ModuleCoverage[];
+	    state: string;
+	    testRun: ShallowReference;
+	}
+	export enum TestRunState {
+	    /**
+	     * Only used during an update to preserve the existing value.
+	     */
+	    Unspecified = 0,
+	    /**
+	     * The run is still being created.  No tests have started yet.
+	     */
+	    NotStarted = 1,
+	    /**
+	     * Tests are running.
+	     */
+	    InProgress = 2,
+	    /**
+	     * All tests have completed or been skipped.
+	     */
+	    Completed = 3,
+	    /**
+	     * Run is stopped and remaing tests have been aborted
+	     */
+	    Aborted = 4,
+	    /**
+	     * Run is currently initializing This is a legacy state and should not be used any more
+	     */
+	    Waiting = 5,
+	    /**
+	     * Run requires investigation because of a test point failure This is a legacy state and should not be used any more
+	     */
+	    NeedsInvestigation = 6,
+	}
+	export interface TestRunStatistic {
+	    run: ShallowReference;
+	    runStatistics: RunStatistic[];
+	}
+	export enum TestRunSubstate {
+	    None = 0,
+	    CreatingEnvironment = 1,
+	    RunningTests = 2,
+	    CanceledByUser = 3,
+	    AbortedBySystem = 4,
+	    TimedOut = 5,
+	    PendingAnalysis = 6,
+	    Analyzed = 7,
+	    CancellationInProgress = 8,
+	}
+	/**
+	 * Represents the test settings of the run. Used to create test settings and fetch test settings
+	 */
+	export interface TestSettings {
+	    /**
+	     * Area path required to create test settings
+	     */
+	    areaPath: string;
+	    /**
+	     * Description of the test settings. Used in create test settings.
+	     */
+	    description: string;
+	    /**
+	     * Indicates if the tests settings is public or private.Used in create test settings.
+	     */
+	    isPublic: boolean;
+	    /**
+	     * Xml string of machine roles. Used in create test settings.
+	     */
+	    machineRoles: string;
+	    /**
+	     * Test settings content.
+	     */
+	    testSettingsContent: string;
+	    /**
+	     * Test settings id.
+	     */
+	    testSettingsId: number;
+	    /**
+	     * Test settings name.
+	     */
+	    testSettingsName: string;
+	}
+	export interface TestSuite {
+	    areaUri: string;
+	    defaultConfigurations: ShallowReference[];
+	    id: number;
+	    inheritDefaultConfigurations: boolean;
+	    lastError: string;
+	    lastPopulatedDate: Date;
+	    lastUpdatedBy: VSSInterfaces.IdentityRef;
+	    lastUpdatedDate: Date;
+	    name: string;
+	    parent: ShallowReference;
+	    plan: ShallowReference;
+	    project: ShallowReference;
+	    queryString: string;
+	    requirementId: number;
+	    revision: number;
+	    state: string;
+	    suites: ShallowReference[];
+	    suiteType: string;
+	    testCaseCount: number;
+	    testCasesUrl: string;
+	    url: string;
+	}
+	export interface WorkItemReference {
+	    id: string;
+	    url: string;
+	    webUrl: string;
+	}
+	export var TypeInfo: {
+	    AdditionalTestField: {
+	        fields: any;
+	    };
+	    AddtionalTestFieldDefinition: {
+	        fields: any;
+	    };
+	    AggregatedResultsByPivot: {
+	        fields: any;
+	    };
+	    AggregatedTestResults: {
+	        fields: any;
+	    };
+	    AttachmentType: {
+	        enumValues: {
+	            "generalAttachment": number;
+	            "afnStrip": number;
+	            "bugFilingData": number;
+	            "codeCoverage": number;
+	            "intermediateCollectorData": number;
+	            "runConfig": number;
+	            "testImpactDetails": number;
+	            "tmiTestRunDeploymentFiles": number;
+	            "tmiTestRunReverseDeploymentFiles": number;
+	            "tmiTestResultDetail": number;
+	            "tmiTestRunSummary": number;
+	        };
+	    };
+	    BatchResponse: {
+	        fields: any;
+	    };
+	    BuildConfiguration: {
+	        fields: any;
+	    };
+	    BuildCoverage: {
+	        fields: any;
+	    };
+	    CodeCoverageData: {
+	        fields: any;
+	    };
+	    CodeCoverageStatistics: {
+	        fields: any;
+	    };
+	    CodeCoverageSummary: {
+	        fields: any;
+	    };
+	    CoverageQueryFlags: {
+	        enumValues: {
+	            "modules": number;
+	            "functions": number;
+	            "blockData": number;
+	        };
+	    };
+	    CoverageStatistics: {
+	        fields: any;
+	    };
+	    DtlEnvironmentDetails: {
+	        fields: any;
+	    };
+	    FunctionCoverage: {
+	        fields: any;
+	    };
+	    ModuleCoverage: {
+	        fields: any;
+	    };
+	    PlanUpdateModel: {
+	        fields: any;
+	    };
+	    PointAssignment: {
+	        fields: any;
+	    };
+	    PointUpdateModel: {
+	        fields: any;
+	    };
+	    PointWorkItemProperty: {
+	        fields: any;
+	    };
+	    QueryModel: {
+	        fields: any;
+	    };
+	    Response: {
+	        fields: any;
+	    };
+	    ResultOutcome: {
+	        enumValues: {
+	            "pass": number;
+	            "fail": number;
+	            "pending": number;
+	        };
+	    };
+	    ResultUpdateRequestModel: {
+	        fields: any;
+	    };
+	    ResultUpdateResponseModel: {
+	        fields: any;
+	    };
+	    RunCreateModel: {
+	        fields: any;
+	    };
+	    RunFilter: {
+	        fields: any;
+	    };
+	    RunStatistic: {
+	        fields: any;
+	    };
+	    RunUpdateModel: {
+	        fields: any;
+	    };
+	    ShallowReference: {
+	        fields: any;
+	    };
+	    SharedStepModel: {
+	        fields: any;
+	    };
+	    SuiteCreateModel: {
+	        fields: any;
+	    };
+	    SuiteTestCase: {
+	        fields: any;
+	    };
+	    SuiteUpdateModel: {
+	        fields: any;
+	    };
+	    TestActionResultModel: {
+	        fields: any;
+	    };
+	    TestAttachmentReference: {
+	        fields: any;
+	    };
+	    TestAttachmentRequestModel: {
+	        fields: any;
+	    };
+	    TestCaseResult: {
+	        fields: any;
+	    };
+	    TestCaseResult2: {
+	        fields: any;
+	    };
+	    TestCaseResultAttachmentModel: {
+	        fields: any;
+	    };
+	    TestCaseResultIdentifier: {
+	        fields: any;
+	    };
+	    TestCaseResultUpdateModel: {
+	        fields: any;
+	    };
+	    TestEnvironment: {
+	        fields: any;
+	    };
+	    TestExtensionFieldScope: {
+	        enumValues: {
+	            "none": number;
+	            "testRun": number;
+	            "testResult": number;
+	            "system": number;
+	        };
+	    };
+	    TestInsightDetails: {
+	        fields: any;
+	    };
+	    TestInsights: {
+	        fields: any;
+	    };
+	    TestIterationDetailsModel: {
+	        fields: any;
+	    };
+	    TestMessageLogDetails: {
+	        fields: any;
+	    };
+	    TestPlan: {
+	        fields: any;
+	    };
+	    TestPlansWithSelection: {
+	        fields: any;
+	    };
+	    TestPoint: {
+	        fields: any;
+	    };
+	    TestReport: {
+	        fields: any;
+	    };
+	    TestResolutionState: {
+	        fields: any;
+	    };
+	    TestResultCreateModel: {
+	        fields: any;
+	    };
+	    TestResultModelBase: {
+	        fields: any;
+	    };
+	    TestResultParameterModel: {
+	        fields: any;
+	    };
+	    TestRun: {
+	        fields: any;
+	    };
+	    TestRunCoverage: {
+	        fields: any;
+	    };
+	    TestRunState: {
+	        enumValues: {
+	            "unspecified": number;
+	            "notStarted": number;
+	            "inProgress": number;
+	            "completed": number;
+	            "aborted": number;
+	            "waiting": number;
+	            "needsInvestigation": number;
+	        };
+	    };
+	    TestRunStatistic: {
+	        fields: any;
+	    };
+	    TestRunSubstate: {
+	        enumValues: {
+	            "none": number;
+	            "creatingEnvironment": number;
+	            "runningTests": number;
+	            "canceledByUser": number;
+	            "abortedBySystem": number;
+	            "timedOut": number;
+	            "pendingAnalysis": number;
+	            "analyzed": number;
+	            "cancellationInProgress": number;
+	        };
+	    };
+	    TestSettings: {
+	        fields: any;
+	    };
+	    TestSuite: {
+	        fields: any;
+	    };
+	    WorkItemReference: {
+	        fields: any;
+	    };
+	};
+
+}
+declare module 'vso-node-api/TestApi' {
+	/// <reference types="node" />
+	/// <reference types="Q" />
+	import Q = require('q');
+	import basem = require('vso-node-api/ClientApiBases');
+	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
+	import TestInterfaces = require('vso-node-api/interfaces/TestInterfaces');
+	export interface ITestApi extends basem.ClientApiBase {
+	    createTestResultAttachment(attachmentRequestModel: TestInterfaces.TestAttachmentRequestModel, project: string, runId: number, testCaseResultId: number, onResult: (err: any, statusCode: number, Attachment: TestInterfaces.TestAttachmentReference) => void): void;
+	    createTestRunAttachment(attachmentRequestModel: TestInterfaces.TestAttachmentRequestModel, project: string, runId: number, onResult: (err: any, statusCode: number, Attachment: TestInterfaces.TestAttachmentReference) => void): void;
+	    getBuildCodeCoverage(project: string, buildId: number, flags: number, onResult: (err: any, statusCode: number, CodeCoverage: TestInterfaces.BuildCoverage[]) => void): void;
+	    getCodeCoverageSummary(project: string, buildId: number, deltaBuildId: number, onResult: (err: any, statusCode: number, CodeCoverage: TestInterfaces.CodeCoverageSummary) => void): void;
+	    updateCodeCoverageSummary(coverageData: TestInterfaces.CodeCoverageData, project: string, build: number, onResult: (err: any, statusCode: number) => void): void;
+	    getTestRunCodeCoverage(project: string, runId: number, flags: number, onResult: (err: any, statusCode: number, CodeCoverage: TestInterfaces.TestRunCoverage[]) => void): void;
+	    getTestRunLogs(project: string, runId: number, onResult: (err: any, statusCode: number, MessageLogs: TestInterfaces.TestMessageLogDetails[]) => void): void;
+	    createTestPlan(testPlan: TestInterfaces.PlanUpdateModel, project: string, onResult: (err: any, statusCode: number, Plan: TestInterfaces.TestPlan) => void): void;
+	    getPlanById(project: string, planId: number, onResult: (err: any, statusCode: number, Plan: TestInterfaces.TestPlan) => void): void;
+	    getPlans(project: string, owner: string, skip: number, top: number, includePlanDetails: boolean, filterActivePlans: boolean, onResult: (err: any, statusCode: number, Plans: TestInterfaces.TestPlan[]) => void): void;
+	    updateTestPlan(planUpdateModel: TestInterfaces.PlanUpdateModel, project: string, planId: number, onResult: (err: any, statusCode: number, Plan: TestInterfaces.TestPlan) => void): void;
+	    getPoint(project: string, planId: number, suiteId: number, pointIds: number, witFields: string, onResult: (err: any, statusCode: number, Point: TestInterfaces.TestPoint) => void): void;
+	    getPoints(project: string, planId: number, suiteId: number, witFields: string, configurationId: string, testCaseId: string, testPointIds: string, includePointDetails: boolean, skip: number, top: number, onResult: (err: any, statusCode: number, Points: TestInterfaces.TestPoint[]) => void): void;
+	    updateTestPoints(pointUpdateModel: TestInterfaces.PointUpdateModel, project: string, planId: number, suiteId: number, pointIds: string, onResult: (err: any, statusCode: number, Point: TestInterfaces.TestPoint[]) => void): void;
+	    getTestIteration(project: string, runId: number, testCaseResultId: number, iterationId: number, includeActionResults: boolean, onResult: (err: any, statusCode: number, Result: TestInterfaces.TestIterationDetailsModel) => void): void;
+	    getTestIterations(project: string, runId: number, testCaseResultId: number, includeActionResults: boolean, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestIterationDetailsModel[]) => void): void;
+	    addTestResultsToTestRun(resultCreateModels: TestInterfaces.TestResultCreateModel[], project: string, runId: number, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestCaseResult[]) => void): void;
+	    bulkUpdateTestResults(resultUpdateModel: TestInterfaces.TestCaseResultUpdateModel, project: string, runId: number, resultIds: number[], onResult: (err: any, statusCode: number, Result: TestInterfaces.TestCaseResult[]) => void): void;
+	    getTestCaseResultById(project: string, runId: number, testCaseResultId: number, includeIterationDetails: boolean, onResult: (err: any, statusCode: number, Result: TestInterfaces.TestCaseResult) => void): void;
+	    getTestCaseResults(project: string, runId: number, includeIterationDetails: boolean, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestCaseResult[]) => void): void;
+	    updateTestResults(resultUpdateModels: TestInterfaces.TestCaseResultUpdateModel[], project: string, runId: number, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestCaseResult[]) => void): void;
+	    getActionResults(project: string, runId: number, testCaseResultId: number, iterationId: number, actionPath: string, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestActionResultModel[]) => void): void;
+	    getResultParameters(project: string, runId: number, testCaseResultId: number, iterationId: number, paramName: string, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestResultParameterModel[]) => void): void;
+	    getTestResultsByQuery(query: TestInterfaces.QueryModel, project: string, includeResultDetails: boolean, includeIterationDetails: boolean, skip: number, top: number, onResult: (err: any, statusCode: number, Result: TestInterfaces.TestCaseResult[]) => void): void;
+	    getTestRunStatistics(project: string, runId: number, onResult: (err: any, statusCode: number, Run: TestInterfaces.TestRunStatistic) => void): void;
+	    getTestRunsByQuery(query: TestInterfaces.QueryModel, project: string, includeRunDetails: boolean, skip: number, top: number, onResult: (err: any, statusCode: number, Run: TestInterfaces.TestRun[]) => void): void;
+	    createTestRun(testRun: TestInterfaces.RunCreateModel, project: string, onResult: (err: any, statusCode: number, Run: TestInterfaces.TestRun) => void): void;
+	    deleteTestRun(project: string, runId: number, onResult: (err: any, statusCode: number) => void): void;
+	    getTestRunById(project: string, runId: number, onResult: (err: any, statusCode: number, Run: TestInterfaces.TestRun) => void): void;
+	    getTestRuns(project: string, buildUri: string, owner: string, tmiRunId: string, planId: number, includeRunDetails: boolean, automated: boolean, skip: number, top: number, onResult: (err: any, statusCode: number, Runs: TestInterfaces.TestRun[]) => void): void;
+	    updateTestRun(runUpdateModel: TestInterfaces.RunUpdateModel, project: string, runId: number, onResult: (err: any, statusCode: number, Run: TestInterfaces.TestRun) => void): void;
+	    addTestCasesToSuite(project: string, planId: number, suiteId: number, testCaseIds: string, onResult: (err: any, statusCode: number, Suites: TestInterfaces.SuiteTestCase[]) => void): void;
+	    getTestCaseById(project: string, planId: number, suiteId: number, testCaseIds: number, onResult: (err: any, statusCode: number, Suite: TestInterfaces.SuiteTestCase) => void): void;
+	    getTestCases(project: string, planId: number, suiteId: number, onResult: (err: any, statusCode: number, Suites: TestInterfaces.SuiteTestCase[]) => void): void;
+	    removeTestCasesFromSuiteUrl(project: string, planId: number, suiteId: number, testCaseIds: string, onResult: (err: any, statusCode: number) => void): void;
+	    createTestSuite(testSuite: TestInterfaces.SuiteCreateModel, project: string, planId: number, suiteId: number, onResult: (err: any, statusCode: number, Suite: TestInterfaces.TestSuite[]) => void): void;
+	    deleteTestSuite(project: string, planId: number, suiteId: number, onResult: (err: any, statusCode: number) => void): void;
+	    getTestSuiteById(project: string, planId: number, suiteId: number, includeChildSuites: boolean, onResult: (err: any, statusCode: number, Suite: TestInterfaces.TestSuite) => void): void;
+	    getTestSuitesForPlan(project: string, planId: number, includeSuites: boolean, skip: number, top: number, onResult: (err: any, statusCode: number, Suites: TestInterfaces.TestSuite[]) => void): void;
+	    updateTestSuite(suiteUpdateModel: TestInterfaces.SuiteUpdateModel, project: string, planId: number, suiteId: number, onResult: (err: any, statusCode: number, Suite: TestInterfaces.TestSuite) => void): void;
+	    getSuitesByTestCaseId(testCaseId: number, onResult: (err: any, statusCode: number, Suites: TestInterfaces.TestSuite[]) => void): void;
+	    createTestSettings(testSettings: TestInterfaces.TestSettings, project: string, onResult: (err: any, statusCode: number, TestSetting: number) => void): void;
+	    deleteTestSettings(project: string, testSettingsId: number, onResult: (err: any, statusCode: number) => void): void;
+	    getTestSettingsById(project: string, testSettingsId: number, onResult: (err: any, statusCode: number, TestSetting: TestInterfaces.TestSettings) => void): void;
+	}
+	export interface IQTestApi extends basem.QClientApiBase {
+	    createTestResultAttachment(attachmentRequestModel: TestInterfaces.TestAttachmentRequestModel, project: string, runId: number, testCaseResultId: number): Q.Promise<TestInterfaces.TestAttachmentReference>;
+	    createTestRunAttachment(attachmentRequestModel: TestInterfaces.TestAttachmentRequestModel, project: string, runId: number): Q.Promise<TestInterfaces.TestAttachmentReference>;
+	    getBuildCodeCoverage(project: string, buildId: number, flags: number): Q.Promise<TestInterfaces.BuildCoverage[]>;
+	    getCodeCoverageSummary(project: string, buildId: number, deltaBuildId?: number): Q.Promise<TestInterfaces.CodeCoverageSummary>;
+	    getTestRunCodeCoverage(project: string, runId: number, flags: number): Q.Promise<TestInterfaces.TestRunCoverage[]>;
+	    getTestRunLogs(project: string, runId: number): Q.Promise<TestInterfaces.TestMessageLogDetails[]>;
+	    createTestPlan(testPlan: TestInterfaces.PlanUpdateModel, project: string): Q.Promise<TestInterfaces.TestPlan>;
+	    getPlanById(project: string, planId: number): Q.Promise<TestInterfaces.TestPlan>;
+	    getPlans(project: string, owner?: string, skip?: number, top?: number, includePlanDetails?: boolean, filterActivePlans?: boolean): Q.Promise<TestInterfaces.TestPlan[]>;
+	    updateTestPlan(planUpdateModel: TestInterfaces.PlanUpdateModel, project: string, planId: number): Q.Promise<TestInterfaces.TestPlan>;
+	    getPoint(project: string, planId: number, suiteId: number, pointIds: number, witFields?: string): Q.Promise<TestInterfaces.TestPoint>;
+	    getPoints(project: string, planId: number, suiteId: number, witFields?: string, configurationId?: string, testCaseId?: string, testPointIds?: string, includePointDetails?: boolean, skip?: number, top?: number): Q.Promise<TestInterfaces.TestPoint[]>;
+	    updateTestPoints(pointUpdateModel: TestInterfaces.PointUpdateModel, project: string, planId: number, suiteId: number, pointIds: string): Q.Promise<TestInterfaces.TestPoint[]>;
+	    getTestIteration(project: string, runId: number, testCaseResultId: number, iterationId: number, includeActionResults?: boolean): Q.Promise<TestInterfaces.TestIterationDetailsModel>;
+	    getTestIterations(project: string, runId: number, testCaseResultId: number, includeActionResults?: boolean): Q.Promise<TestInterfaces.TestIterationDetailsModel[]>;
+	    addTestResultsToTestRun(resultCreateModels: TestInterfaces.TestResultCreateModel[], project: string, runId: number): Q.Promise<TestInterfaces.TestCaseResult[]>;
+	    bulkUpdateTestResults(resultUpdateModel: TestInterfaces.TestCaseResultUpdateModel, project: string, runId: number, resultIds: number[]): Q.Promise<TestInterfaces.TestCaseResult[]>;
+	    getTestCaseResultById(project: string, runId: number, testCaseResultId: number, includeIterationDetails?: boolean): Q.Promise<TestInterfaces.TestCaseResult>;
+	    getTestCaseResults(project: string, runId: number, includeIterationDetails?: boolean): Q.Promise<TestInterfaces.TestCaseResult[]>;
+	    updateTestResults(resultUpdateModels: TestInterfaces.TestCaseResultUpdateModel[], project: string, runId: number): Q.Promise<TestInterfaces.TestCaseResult[]>;
+	    getActionResults(project: string, runId: number, testCaseResultId: number, iterationId: number, actionPath?: string): Q.Promise<TestInterfaces.TestActionResultModel[]>;
+	    getResultParameters(project: string, runId: number, testCaseResultId: number, iterationId: number, paramName?: string): Q.Promise<TestInterfaces.TestResultParameterModel[]>;
+	    getTestResultsByQuery(query: TestInterfaces.QueryModel, project: string, includeResultDetails?: boolean, includeIterationDetails?: boolean, skip?: number, top?: number): Q.Promise<TestInterfaces.TestCaseResult[]>;
+	    getTestRunStatistics(project: string, runId: number): Q.Promise<TestInterfaces.TestRunStatistic>;
+	    getTestRunsByQuery(query: TestInterfaces.QueryModel, project: string, includeRunDetails?: boolean, skip?: number, top?: number): Q.Promise<TestInterfaces.TestRun[]>;
+	    createTestRun(testRun: TestInterfaces.RunCreateModel, project: string): Q.Promise<TestInterfaces.TestRun>;
+	    getTestRunById(project: string, runId: number): Q.Promise<TestInterfaces.TestRun>;
+	    getTestRuns(project: string, buildUri?: string, owner?: string, tmiRunId?: string, planId?: number, includeRunDetails?: boolean, automated?: boolean, skip?: number, top?: number): Q.Promise<TestInterfaces.TestRun[]>;
+	    updateTestRun(runUpdateModel: TestInterfaces.RunUpdateModel, project: string, runId: number): Q.Promise<TestInterfaces.TestRun>;
+	    addTestCasesToSuite(project: string, planId: number, suiteId: number, testCaseIds: string): Q.Promise<TestInterfaces.SuiteTestCase[]>;
+	    getTestCaseById(project: string, planId: number, suiteId: number, testCaseIds: number): Q.Promise<TestInterfaces.SuiteTestCase>;
+	    getTestCases(project: string, planId: number, suiteId: number): Q.Promise<TestInterfaces.SuiteTestCase[]>;
+	    createTestSuite(testSuite: TestInterfaces.SuiteCreateModel, project: string, planId: number, suiteId: number): Q.Promise<TestInterfaces.TestSuite[]>;
+	    getTestSuiteById(project: string, planId: number, suiteId: number, includeChildSuites?: boolean): Q.Promise<TestInterfaces.TestSuite>;
+	    getTestSuitesForPlan(project: string, planId: number, includeSuites?: boolean, skip?: number, top?: number): Q.Promise<TestInterfaces.TestSuite[]>;
+	    updateTestSuite(suiteUpdateModel: TestInterfaces.SuiteUpdateModel, project: string, planId: number, suiteId: number): Q.Promise<TestInterfaces.TestSuite>;
+	    getSuitesByTestCaseId(testCaseId: number): Q.Promise<TestInterfaces.TestSuite[]>;
+	    createTestSettings(testSettings: TestInterfaces.TestSettings, project: string): Q.Promise<number>;
+	    getTestSettingsById(project: string, testSettingsId: number): Q.Promise<TestInterfaces.TestSettings>;
+	}
+	export class TestApi extends basem.ClientApiBase implements ITestApi {
+	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
+	    /**
+	     * @param {TestInterfaces.TestAttachmentRequestModel} attachmentRequestModel
+	     * @param {string} project - Project ID or project name
+	     * @param {number} runId
+	     * @param {number} testCaseResultId
+	     * @param onResult callback function with the resulting TestInterfaces.TestAttachmentReference
+	     */
+	    createTestResultAttachment(attachmentRequestModel: TestInterfaces.TestAttachmentRequestModel, project: string, runId: number, testCaseResultId: number, onResult: (err: any, statusCode: number, Attachment: TestInterfaces.TestAttachmentReference) => void): void;
+	    /**
+	     * @param {TestInterfaces.TestAttachmentRequestModel} attachmentRequestModel
+	     * @param {string} project - Project ID or project name
+	     * @param {number} runId
+	     * @param onResult callback function with the resulting TestInterfaces.TestAttachmentReference
+	     */
+	    createTestRunAttachment(attachmentRequestModel: TestInterfaces.TestAttachmentRequestModel, project: string, runId: number, onResult: (err: any, statusCode: number, Attachment: TestInterfaces.TestAttachmentReference) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} buildId
+	     * @param {number} flags
+	     * @param onResult callback function with the resulting TestInterfaces.BuildCoverage[]
+	     */
+	    getBuildCodeCoverage(project: string, buildId: number, flags: number, onResult: (err: any, statusCode: number, CodeCoverage: TestInterfaces.BuildCoverage[]) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} buildId
+	     * @param {number} deltaBuildId
+	     * @param onResult callback function with the resulting TestInterfaces.CodeCoverageSummary
+	     */
+	    getCodeCoverageSummary(project: string, buildId: number, deltaBuildId: number, onResult: (err: any, statusCode: number, CodeCoverage: TestInterfaces.CodeCoverageSummary) => void): void;
+	    /**
+	     * http://(tfsserver):8080/tfs/DefaultCollection/_apis/test/CodeCoverage?build=10 Request: Json of code coverage summary
+	     *
+	     * @param {TestInterfaces.CodeCoverageData} coverageData
+	     * @param {string} project - Project ID or project name
+	     * @param {number} build
+	     * @param onResult callback function
+	     */
+	    updateCodeCoverageSummary(coverageData: TestInterfaces.CodeCoverageData, project: string, build: number, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} runId
+	     * @param {number} flags
+	     * @param onResult callback function with the resulting TestInterfaces.TestRunCoverage[]
+	     */
+	    getTestRunCodeCoverage(project: string, runId: number, flags: number, onResult: (err: any, statusCode: number, CodeCoverage: TestInterfaces.TestRunCoverage[]) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} runId
+	     * @param onResult callback function with the resulting TestInterfaces.TestMessageLogDetails[]
+	     */
+	    getTestRunLogs(project: string, runId: number, onResult: (err: any, statusCode: number, MessageLogs: TestInterfaces.TestMessageLogDetails[]) => void): void;
+	    /**
+	     * @param {TestInterfaces.PlanUpdateModel} testPlan
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting TestInterfaces.TestPlan
+	     */
+	    createTestPlan(testPlan: TestInterfaces.PlanUpdateModel, project: string, onResult: (err: any, statusCode: number, Plan: TestInterfaces.TestPlan) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} planId
+	     * @param onResult callback function with the resulting TestInterfaces.TestPlan
+	     */
+	    getPlanById(project: string, planId: number, onResult: (err: any, statusCode: number, Plan: TestInterfaces.TestPlan) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {string} owner
+	     * @param {number} skip
+	     * @param {number} top
+	     * @param {boolean} includePlanDetails
+	     * @param {boolean} filterActivePlans
+	     * @param onResult callback function with the resulting TestInterfaces.TestPlan[]
+	     */
+	    getPlans(project: string, owner: string, skip: number, top: number, includePlanDetails: boolean, filterActivePlans: boolean, onResult: (err: any, statusCode: number, Plans: TestInterfaces.TestPlan[]) => void): void;
+	    /**
+	     * @param {TestInterfaces.PlanUpdateModel} planUpdateModel
+	     * @param {string} project - Project ID or project name
+	     * @param {number} planId
+	     * @param onResult callback function with the resulting TestInterfaces.TestPlan
+	     */
+	    updateTestPlan(planUpdateModel: TestInterfaces.PlanUpdateModel, project: string, planId: number, onResult: (err: any, statusCode: number, Plan: TestInterfaces.TestPlan) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} planId
+	     * @param {number} suiteId
+	     * @param {number} pointIds
+	     * @param {string} witFields
+	     * @param onResult callback function with the resulting TestInterfaces.TestPoint
+	     */
+	    getPoint(project: string, planId: number, suiteId: number, pointIds: number, witFields: string, onResult: (err: any, statusCode: number, Point: TestInterfaces.TestPoint) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} planId
+	     * @param {number} suiteId
+	     * @param {string} witFields
+	     * @param {string} configurationId
+	     * @param {string} testCaseId
+	     * @param {string} testPointIds
+	     * @param {boolean} includePointDetails
+	     * @param {number} skip
+	     * @param {number} top
+	     * @param onResult callback function with the resulting TestInterfaces.TestPoint[]
+	     */
+	    getPoints(project: string, planId: number, suiteId: number, witFields: string, configurationId: string, testCaseId: string, testPointIds: string, includePointDetails: boolean, skip: number, top: number, onResult: (err: any, statusCode: number, Points: TestInterfaces.TestPoint[]) => void): void;
+	    /**
+	     * @param {TestInterfaces.PointUpdateModel} pointUpdateModel
+	     * @param {string} project - Project ID or project name
+	     * @param {number} planId
+	     * @param {number} suiteId
+	     * @param {string} pointIds
+	     * @param onResult callback function with the resulting TestInterfaces.TestPoint[]
+	     */
+	    updateTestPoints(pointUpdateModel: TestInterfaces.PointUpdateModel, project: string, planId: number, suiteId: number, pointIds: string, onResult: (err: any, statusCode: number, Point: TestInterfaces.TestPoint[]) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} runId
+	     * @param {number} testCaseResultId
+	     * @param {number} iterationId
+	     * @param {boolean} includeActionResults
+	     * @param onResult callback function with the resulting TestInterfaces.TestIterationDetailsModel
+	     */
+	    getTestIteration(project: string, runId: number, testCaseResultId: number, iterationId: number, includeActionResults: boolean, onResult: (err: any, statusCode: number, Result: TestInterfaces.TestIterationDetailsModel) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} runId
+	     * @param {number} testCaseResultId
+	     * @param {boolean} includeActionResults
+	     * @param onResult callback function with the resulting TestInterfaces.TestIterationDetailsModel[]
+	     */
+	    getTestIterations(project: string, runId: number, testCaseResultId: number, includeActionResults: boolean, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestIterationDetailsModel[]) => void): void;
+	    /**
+	     * @param {TestInterfaces.TestResultCreateModel[]} resultCreateModels
+	     * @param {string} project - Project ID or project name
+	     * @param {number} runId
+	     * @param onResult callback function with the resulting TestInterfaces.TestCaseResult[]
+	     */
+	    addTestResultsToTestRun(resultCreateModels: TestInterfaces.TestResultCreateModel[], project: string, runId: number, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestCaseResult[]) => void): void;
+	    /**
+	     * @param {TestInterfaces.TestCaseResultUpdateModel} resultUpdateModel
+	     * @param {string} project - Project ID or project name
+	     * @param {number} runId
+	     * @param {number[]} resultIds
+	     * @param onResult callback function with the resulting TestInterfaces.TestCaseResult[]
+	     */
+	    bulkUpdateTestResults(resultUpdateModel: TestInterfaces.TestCaseResultUpdateModel, project: string, runId: number, resultIds: number[], onResult: (err: any, statusCode: number, Result: TestInterfaces.TestCaseResult[]) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} runId
+	     * @param {number} testCaseResultId
+	     * @param {boolean} includeIterationDetails
+	     * @param onResult callback function with the resulting TestInterfaces.TestCaseResult
+	     */
+	    getTestCaseResultById(project: string, runId: number, testCaseResultId: number, includeIterationDetails: boolean, onResult: (err: any, statusCode: number, Result: TestInterfaces.TestCaseResult) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} runId
+	     * @param {boolean} includeIterationDetails
+	     * @param onResult callback function with the resulting TestInterfaces.TestCaseResult[]
+	     */
+	    getTestCaseResults(project: string, runId: number, includeIterationDetails: boolean, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestCaseResult[]) => void): void;
+	    /**
+	     * @param {TestInterfaces.TestCaseResultUpdateModel[]} resultUpdateModels
+	     * @param {string} project - Project ID or project name
+	     * @param {number} runId
+	     * @param onResult callback function with the resulting TestInterfaces.TestCaseResult[]
+	     */
+	    updateTestResults(resultUpdateModels: TestInterfaces.TestCaseResultUpdateModel[], project: string, runId: number, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestCaseResult[]) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} runId
+	     * @param {number} testCaseResultId
+	     * @param {number} iterationId
+	     * @param {string} actionPath
+	     * @param onResult callback function with the resulting TestInterfaces.TestActionResultModel[]
+	     */
+	    getActionResults(project: string, runId: number, testCaseResultId: number, iterationId: number, actionPath: string, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestActionResultModel[]) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} runId
+	     * @param {number} testCaseResultId
+	     * @param {number} iterationId
+	     * @param {string} paramName
+	     * @param onResult callback function with the resulting TestInterfaces.TestResultParameterModel[]
+	     */
+	    getResultParameters(project: string, runId: number, testCaseResultId: number, iterationId: number, paramName: string, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestResultParameterModel[]) => void): void;
+	    /**
+	     * @param {TestInterfaces.QueryModel} query
+	     * @param {string} project - Project ID or project name
+	     * @param {boolean} includeResultDetails
+	     * @param {boolean} includeIterationDetails
+	     * @param {number} skip
+	     * @param {number} top
+	     * @param onResult callback function with the resulting TestInterfaces.TestCaseResult[]
+	     */
+	    getTestResultsByQuery(query: TestInterfaces.QueryModel, project: string, includeResultDetails: boolean, includeIterationDetails: boolean, skip: number, top: number, onResult: (err: any, statusCode: number, Result: TestInterfaces.TestCaseResult[]) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} runId
+	     * @param onResult callback function with the resulting TestInterfaces.TestRunStatistic
+	     */
+	    getTestRunStatistics(project: string, runId: number, onResult: (err: any, statusCode: number, Run: TestInterfaces.TestRunStatistic) => void): void;
+	    /**
+	     * @param {TestInterfaces.QueryModel} query
+	     * @param {string} project - Project ID or project name
+	     * @param {boolean} includeRunDetails
+	     * @param {number} skip
+	     * @param {number} top
+	     * @param onResult callback function with the resulting TestInterfaces.TestRun[]
+	     */
+	    getTestRunsByQuery(query: TestInterfaces.QueryModel, project: string, includeRunDetails: boolean, skip: number, top: number, onResult: (err: any, statusCode: number, Run: TestInterfaces.TestRun[]) => void): void;
+	    /**
+	     * @param {TestInterfaces.RunCreateModel} testRun
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting TestInterfaces.TestRun
+	     */
+	    createTestRun(testRun: TestInterfaces.RunCreateModel, project: string, onResult: (err: any, statusCode: number, Run: TestInterfaces.TestRun) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} runId
+	     * @param onResult callback function
+	     */
+	    deleteTestRun(project: string, runId: number, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} runId
+	     * @param onResult callback function with the resulting TestInterfaces.TestRun
+	     */
+	    getTestRunById(project: string, runId: number, onResult: (err: any, statusCode: number, Run: TestInterfaces.TestRun) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {string} buildUri
+	     * @param {string} owner
+	     * @param {string} tmiRunId
+	     * @param {number} planId
+	     * @param {boolean} includeRunDetails
+	     * @param {boolean} automated
+	     * @param {number} skip
+	     * @param {number} top
+	     * @param onResult callback function with the resulting TestInterfaces.TestRun[]
+	     */
+	    getTestRuns(project: string, buildUri: string, owner: string, tmiRunId: string, planId: number, includeRunDetails: boolean, automated: boolean, skip: number, top: number, onResult: (err: any, statusCode: number, Runs: TestInterfaces.TestRun[]) => void): void;
+	    /**
+	     * @param {TestInterfaces.RunUpdateModel} runUpdateModel
+	     * @param {string} project - Project ID or project name
+	     * @param {number} runId
+	     * @param onResult callback function with the resulting TestInterfaces.TestRun
+	     */
+	    updateTestRun(runUpdateModel: TestInterfaces.RunUpdateModel, project: string, runId: number, onResult: (err: any, statusCode: number, Run: TestInterfaces.TestRun) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} planId
+	     * @param {number} suiteId
+	     * @param {string} testCaseIds
+	     * @param onResult callback function with the resulting TestInterfaces.SuiteTestCase[]
+	     */
+	    addTestCasesToSuite(project: string, planId: number, suiteId: number, testCaseIds: string, onResult: (err: any, statusCode: number, Suites: TestInterfaces.SuiteTestCase[]) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} planId
+	     * @param {number} suiteId
+	     * @param {number} testCaseIds
+	     * @param onResult callback function with the resulting TestInterfaces.SuiteTestCase
+	     */
+	    getTestCaseById(project: string, planId: number, suiteId: number, testCaseIds: number, onResult: (err: any, statusCode: number, Suite: TestInterfaces.SuiteTestCase) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} planId
+	     * @param {number} suiteId
+	     * @param onResult callback function with the resulting TestInterfaces.SuiteTestCase[]
+	     */
+	    getTestCases(project: string, planId: number, suiteId: number, onResult: (err: any, statusCode: number, Suites: TestInterfaces.SuiteTestCase[]) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} planId
+	     * @param {number} suiteId
+	     * @param {string} testCaseIds
+	     * @param onResult callback function
+	     */
+	    removeTestCasesFromSuiteUrl(project: string, planId: number, suiteId: number, testCaseIds: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {TestInterfaces.SuiteCreateModel} testSuite
+	     * @param {string} project - Project ID or project name
+	     * @param {number} planId
+	     * @param {number} suiteId
+	     * @param onResult callback function with the resulting TestInterfaces.TestSuite[]
+	     */
+	    createTestSuite(testSuite: TestInterfaces.SuiteCreateModel, project: string, planId: number, suiteId: number, onResult: (err: any, statusCode: number, Suite: TestInterfaces.TestSuite[]) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} planId
+	     * @param {number} suiteId
+	     * @param onResult callback function
+	     */
+	    deleteTestSuite(project: string, planId: number, suiteId: number, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} planId
+	     * @param {number} suiteId
+	     * @param {boolean} includeChildSuites
+	     * @param onResult callback function with the resulting TestInterfaces.TestSuite
+	     */
+	    getTestSuiteById(project: string, planId: number, suiteId: number, includeChildSuites: boolean, onResult: (err: any, statusCode: number, Suite: TestInterfaces.TestSuite) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} planId
+	     * @param {boolean} includeSuites
+	     * @param {number} skip
+	     * @param {number} top
+	     * @param onResult callback function with the resulting TestInterfaces.TestSuite[]
+	     */
+	    getTestSuitesForPlan(project: string, planId: number, includeSuites: boolean, skip: number, top: number, onResult: (err: any, statusCode: number, Suites: TestInterfaces.TestSuite[]) => void): void;
+	    /**
+	     * @param {TestInterfaces.SuiteUpdateModel} suiteUpdateModel
+	     * @param {string} project - Project ID or project name
+	     * @param {number} planId
+	     * @param {number} suiteId
+	     * @param onResult callback function with the resulting TestInterfaces.TestSuite
+	     */
+	    updateTestSuite(suiteUpdateModel: TestInterfaces.SuiteUpdateModel, project: string, planId: number, suiteId: number, onResult: (err: any, statusCode: number, Suite: TestInterfaces.TestSuite) => void): void;
+	    /**
+	     * @param {number} testCaseId
+	     * @param onResult callback function with the resulting TestInterfaces.TestSuite[]
+	     */
+	    getSuitesByTestCaseId(testCaseId: number, onResult: (err: any, statusCode: number, Suites: TestInterfaces.TestSuite[]) => void): void;
+	    /**
+	     * @param {TestInterfaces.TestSettings} testSettings
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting number
+	     */
+	    createTestSettings(testSettings: TestInterfaces.TestSettings, project: string, onResult: (err: any, statusCode: number, TestSetting: number) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} testSettingsId
+	     * @param onResult callback function
+	     */
+	    deleteTestSettings(project: string, testSettingsId: number, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} testSettingsId
+	     * @param onResult callback function with the resulting TestInterfaces.TestSettings
+	     */
+	    getTestSettingsById(project: string, testSettingsId: number, onResult: (err: any, statusCode: number, TestSetting: TestInterfaces.TestSettings) => void): void;
+	}
+	export class QTestApi extends basem.QClientApiBase implements IQTestApi {
+	    api: TestApi;
+	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
+	    /**
+	    * @param {TestInterfaces.TestAttachmentRequestModel} attachmentRequestModel
+	    * @param {string} project - Project ID or project name
+	    * @param {number} runId
+	    * @param {number} testCaseResultId
+	    */
+	    createTestResultAttachment(attachmentRequestModel: TestInterfaces.TestAttachmentRequestModel, project: string, runId: number, testCaseResultId: number): Q.Promise<TestInterfaces.TestAttachmentReference>;
+	    /**
+	    * @param {TestInterfaces.TestAttachmentRequestModel} attachmentRequestModel
+	    * @param {string} project - Project ID or project name
+	    * @param {number} runId
+	    */
+	    createTestRunAttachment(attachmentRequestModel: TestInterfaces.TestAttachmentRequestModel, project: string, runId: number): Q.Promise<TestInterfaces.TestAttachmentReference>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {number} buildId
+	    * @param {number} flags
+	    */
+	    getBuildCodeCoverage(project: string, buildId: number, flags: number): Q.Promise<TestInterfaces.BuildCoverage[]>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {number} buildId
+	    * @param {number} deltaBuildId
+	    */
+	    getCodeCoverageSummary(project: string, buildId: number, deltaBuildId?: number): Q.Promise<TestInterfaces.CodeCoverageSummary>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {number} runId
+	    * @param {number} flags
+	    */
+	    getTestRunCodeCoverage(project: string, runId: number, flags: number): Q.Promise<TestInterfaces.TestRunCoverage[]>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {number} runId
+	    */
+	    getTestRunLogs(project: string, runId: number): Q.Promise<TestInterfaces.TestMessageLogDetails[]>;
+	    /**
+	    * @param {TestInterfaces.PlanUpdateModel} testPlan
+	    * @param {string} project - Project ID or project name
+	    */
+	    createTestPlan(testPlan: TestInterfaces.PlanUpdateModel, project: string): Q.Promise<TestInterfaces.TestPlan>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {number} planId
+	    */
+	    getPlanById(project: string, planId: number): Q.Promise<TestInterfaces.TestPlan>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {string} owner
+	    * @param {number} skip
+	    * @param {number} top
+	    * @param {boolean} includePlanDetails
+	    * @param {boolean} filterActivePlans
+	    */
+	    getPlans(project: string, owner?: string, skip?: number, top?: number, includePlanDetails?: boolean, filterActivePlans?: boolean): Q.Promise<TestInterfaces.TestPlan[]>;
+	    /**
+	    * @param {TestInterfaces.PlanUpdateModel} planUpdateModel
+	    * @param {string} project - Project ID or project name
+	    * @param {number} planId
+	    */
+	    updateTestPlan(planUpdateModel: TestInterfaces.PlanUpdateModel, project: string, planId: number): Q.Promise<TestInterfaces.TestPlan>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {number} planId
+	    * @param {number} suiteId
+	    * @param {number} pointIds
+	    * @param {string} witFields
+	    */
+	    getPoint(project: string, planId: number, suiteId: number, pointIds: number, witFields?: string): Q.Promise<TestInterfaces.TestPoint>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {number} planId
+	    * @param {number} suiteId
+	    * @param {string} witFields
+	    * @param {string} configurationId
+	    * @param {string} testCaseId
+	    * @param {string} testPointIds
+	    * @param {boolean} includePointDetails
+	    * @param {number} skip
+	    * @param {number} top
+	    */
+	    getPoints(project: string, planId: number, suiteId: number, witFields?: string, configurationId?: string, testCaseId?: string, testPointIds?: string, includePointDetails?: boolean, skip?: number, top?: number): Q.Promise<TestInterfaces.TestPoint[]>;
+	    /**
+	    * @param {TestInterfaces.PointUpdateModel} pointUpdateModel
+	    * @param {string} project - Project ID or project name
+	    * @param {number} planId
+	    * @param {number} suiteId
+	    * @param {string} pointIds
+	    */
+	    updateTestPoints(pointUpdateModel: TestInterfaces.PointUpdateModel, project: string, planId: number, suiteId: number, pointIds: string): Q.Promise<TestInterfaces.TestPoint[]>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {number} runId
+	    * @param {number} testCaseResultId
+	    * @param {number} iterationId
+	    * @param {boolean} includeActionResults
+	    */
+	    getTestIteration(project: string, runId: number, testCaseResultId: number, iterationId: number, includeActionResults?: boolean): Q.Promise<TestInterfaces.TestIterationDetailsModel>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {number} runId
+	    * @param {number} testCaseResultId
+	    * @param {boolean} includeActionResults
+	    */
+	    getTestIterations(project: string, runId: number, testCaseResultId: number, includeActionResults?: boolean): Q.Promise<TestInterfaces.TestIterationDetailsModel[]>;
+	    /**
+	    * @param {TestInterfaces.TestResultCreateModel[]} resultCreateModels
+	    * @param {string} project - Project ID or project name
+	    * @param {number} runId
+	    */
+	    addTestResultsToTestRun(resultCreateModels: TestInterfaces.TestResultCreateModel[], project: string, runId: number): Q.Promise<TestInterfaces.TestCaseResult[]>;
+	    /**
+	    * @param {TestInterfaces.TestCaseResultUpdateModel} resultUpdateModel
+	    * @param {string} project - Project ID or project name
+	    * @param {number} runId
+	    * @param {number[]} resultIds
+	    */
+	    bulkUpdateTestResults(resultUpdateModel: TestInterfaces.TestCaseResultUpdateModel, project: string, runId: number, resultIds: number[]): Q.Promise<TestInterfaces.TestCaseResult[]>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {number} runId
+	    * @param {number} testCaseResultId
+	    * @param {boolean} includeIterationDetails
+	    */
+	    getTestCaseResultById(project: string, runId: number, testCaseResultId: number, includeIterationDetails?: boolean): Q.Promise<TestInterfaces.TestCaseResult>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {number} runId
+	    * @param {boolean} includeIterationDetails
+	    */
+	    getTestCaseResults(project: string, runId: number, includeIterationDetails?: boolean): Q.Promise<TestInterfaces.TestCaseResult[]>;
+	    /**
+	    * @param {TestInterfaces.TestCaseResultUpdateModel[]} resultUpdateModels
+	    * @param {string} project - Project ID or project name
+	    * @param {number} runId
+	    */
+	    updateTestResults(resultUpdateModels: TestInterfaces.TestCaseResultUpdateModel[], project: string, runId: number): Q.Promise<TestInterfaces.TestCaseResult[]>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {number} runId
+	    * @param {number} testCaseResultId
+	    * @param {number} iterationId
+	    * @param {string} actionPath
+	    */
+	    getActionResults(project: string, runId: number, testCaseResultId: number, iterationId: number, actionPath?: string): Q.Promise<TestInterfaces.TestActionResultModel[]>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {number} runId
+	    * @param {number} testCaseResultId
+	    * @param {number} iterationId
+	    * @param {string} paramName
+	    */
+	    getResultParameters(project: string, runId: number, testCaseResultId: number, iterationId: number, paramName?: string): Q.Promise<TestInterfaces.TestResultParameterModel[]>;
+	    /**
+	    * @param {TestInterfaces.QueryModel} query
+	    * @param {string} project - Project ID or project name
+	    * @param {boolean} includeResultDetails
+	    * @param {boolean} includeIterationDetails
+	    * @param {number} skip
+	    * @param {number} top
+	    */
+	    getTestResultsByQuery(query: TestInterfaces.QueryModel, project: string, includeResultDetails?: boolean, includeIterationDetails?: boolean, skip?: number, top?: number): Q.Promise<TestInterfaces.TestCaseResult[]>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {number} runId
+	    */
+	    getTestRunStatistics(project: string, runId: number): Q.Promise<TestInterfaces.TestRunStatistic>;
+	    /**
+	    * @param {TestInterfaces.QueryModel} query
+	    * @param {string} project - Project ID or project name
+	    * @param {boolean} includeRunDetails
+	    * @param {number} skip
+	    * @param {number} top
+	    */
+	    getTestRunsByQuery(query: TestInterfaces.QueryModel, project: string, includeRunDetails?: boolean, skip?: number, top?: number): Q.Promise<TestInterfaces.TestRun[]>;
+	    /**
+	    * @param {TestInterfaces.RunCreateModel} testRun
+	    * @param {string} project - Project ID or project name
+	    */
+	    createTestRun(testRun: TestInterfaces.RunCreateModel, project: string): Q.Promise<TestInterfaces.TestRun>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {number} runId
+	    */
+	    getTestRunById(project: string, runId: number): Q.Promise<TestInterfaces.TestRun>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {string} buildUri
+	    * @param {string} owner
+	    * @param {string} tmiRunId
+	    * @param {number} planId
+	    * @param {boolean} includeRunDetails
+	    * @param {boolean} automated
+	    * @param {number} skip
+	    * @param {number} top
+	    */
+	    getTestRuns(project: string, buildUri?: string, owner?: string, tmiRunId?: string, planId?: number, includeRunDetails?: boolean, automated?: boolean, skip?: number, top?: number): Q.Promise<TestInterfaces.TestRun[]>;
+	    /**
+	    * @param {TestInterfaces.RunUpdateModel} runUpdateModel
+	    * @param {string} project - Project ID or project name
+	    * @param {number} runId
+	    */
+	    updateTestRun(runUpdateModel: TestInterfaces.RunUpdateModel, project: string, runId: number): Q.Promise<TestInterfaces.TestRun>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {number} planId
+	    * @param {number} suiteId
+	    * @param {string} testCaseIds
+	    */
+	    addTestCasesToSuite(project: string, planId: number, suiteId: number, testCaseIds: string): Q.Promise<TestInterfaces.SuiteTestCase[]>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {number} planId
+	    * @param {number} suiteId
+	    * @param {number} testCaseIds
+	    */
+	    getTestCaseById(project: string, planId: number, suiteId: number, testCaseIds: number): Q.Promise<TestInterfaces.SuiteTestCase>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {number} planId
+	    * @param {number} suiteId
+	    */
+	    getTestCases(project: string, planId: number, suiteId: number): Q.Promise<TestInterfaces.SuiteTestCase[]>;
+	    /**
+	    * @param {TestInterfaces.SuiteCreateModel} testSuite
+	    * @param {string} project - Project ID or project name
+	    * @param {number} planId
+	    * @param {number} suiteId
+	    */
+	    createTestSuite(testSuite: TestInterfaces.SuiteCreateModel, project: string, planId: number, suiteId: number): Q.Promise<TestInterfaces.TestSuite[]>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {number} planId
+	    * @param {number} suiteId
+	    * @param {boolean} includeChildSuites
+	    */
+	    getTestSuiteById(project: string, planId: number, suiteId: number, includeChildSuites?: boolean): Q.Promise<TestInterfaces.TestSuite>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {number} planId
+	    * @param {boolean} includeSuites
+	    * @param {number} skip
+	    * @param {number} top
+	    */
+	    getTestSuitesForPlan(project: string, planId: number, includeSuites?: boolean, skip?: number, top?: number): Q.Promise<TestInterfaces.TestSuite[]>;
+	    /**
+	    * @param {TestInterfaces.SuiteUpdateModel} suiteUpdateModel
+	    * @param {string} project - Project ID or project name
+	    * @param {number} planId
+	    * @param {number} suiteId
+	    */
+	    updateTestSuite(suiteUpdateModel: TestInterfaces.SuiteUpdateModel, project: string, planId: number, suiteId: number): Q.Promise<TestInterfaces.TestSuite>;
+	    /**
+	    * @param {number} testCaseId
+	    */
+	    getSuitesByTestCaseId(testCaseId: number): Q.Promise<TestInterfaces.TestSuite[]>;
+	    /**
+	    * @param {TestInterfaces.TestSettings} testSettings
+	    * @param {string} project - Project ID or project name
+	    */
+	    createTestSettings(testSettings: TestInterfaces.TestSettings, project: string): Q.Promise<number>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {number} testSettingsId
+	    */
+	    getTestSettingsById(project: string, testSettingsId: number): Q.Promise<TestInterfaces.TestSettings>;
+	}
+
+}
+declare module 'vso-node-api/interfaces/TfvcInterfaces' {
+	import TfsInterfaces = require('vso-node-api/interfaces/common/TfsInterfaces');
+	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
+	export interface AssociatedWorkItem {
+	    assignedTo: string;
+	    id: number;
+	    state: string;
+	    title: string;
+	    /**
+	     * REST url
+	     */
+	    url: string;
+	    webUrl: string;
+	    workItemType: string;
+	}
+	export interface Change<T> {
+	    changeType: VersionControlChangeType;
+	    item: T;
+	    newContent: ItemContent;
+	    sourceServerItem: string;
+	    url: string;
+	}
+	export interface ChangeCountDictionary {
+	}
+	export interface ChangeList<T> {
+	    allChangesIncluded: boolean;
+	    changeCounts: {
+	        [key: number]: number;
+	    };
+	    changes: Change<T>[];
+	    comment: string;
+	    commentTruncated: boolean;
+	    creationDate: Date;
+	    notes: CheckinNote[];
+	    owner: string;
+	    ownerDisplayName: string;
+	    ownerId: string;
+	    sortDate: Date;
+	    version: string;
+	}
+	/**
+	 * Criteria used in a search for change lists
+	 */
+	export interface ChangeListSearchCriteria {
+	    /**
+	     * If provided, a version descriptor to compare against base
+	     */
+	    compareVersion: string;
+	    /**
+	     * If true, don't include delete history entries
+	     */
+	    excludeDeletes: boolean;
+	    /**
+	     * Whether or not to follow renames for the given item being queried
+	     */
+	    followRenames: boolean;
+	    /**
+	     * If provided, only include history entries created after this date (string)
+	     */
+	    fromDate: string;
+	    /**
+	     * If provided, a version descriptor for the earliest change list to include
+	     */
+	    fromVersion: string;
+	    /**
+	     * Path of item to search under
+	     */
+	    itemPath: string;
+	    /**
+	     * Version of the items to search
+	     */
+	    itemVersion: string;
+	    /**
+	     * Number of results to skip (used when clicking more...)
+	     */
+	    skip: number;
+	    /**
+	     * If provided, only include history entries created before this date (string)
+	     */
+	    toDate: string;
+	    /**
+	     * If provided, the maximum number of history entries to return
+	     */
+	    top: number;
+	    /**
+	     * If provided, a version descriptor for the latest change list to include
+	     */
+	    toVersion: string;
+	    /**
+	     * Alias or display name of user who made the changes
+	     */
+	    user: string;
+	}
+	export interface CheckinNote {
+	    name: string;
+	    value: string;
+	}
+	export interface FileContentMetadata {
+	    contentType: string;
+	    encoding: number;
+	    extension: string;
+	    fileName: string;
+	    isBinary: boolean;
+	    isImage: boolean;
+	    vsLink: string;
+	}
+	export interface GitBaseVersionDescriptor extends GitVersionDescriptor {
+	    /**
+	     * Version string identifier (name of tag/branch, SHA1 of commit)
+	     */
+	    baseVersion: string;
+	    /**
+	     * Version options - Specify additional modifiers to version (e.g Previous)
+	     */
+	    baseVersionOptions: GitVersionOptions;
+	    /**
+	     * Version type (branch, tag, or commit). Determines how Id is interpreted
+	     */
+	    baseVersionType: GitVersionType;
+	}
+	export interface GitBlobRef {
+	    _links: any;
+	    /**
+	     * SHA1 hash of git object
+	     */
+	    objectId: string;
+	    /**
+	     * Size of blob content (in bytes)
+	     */
+	    size: number;
+	    url: string;
+	}
+	export interface GitBranchStats {
+	    aheadCount: number;
+	    behindCount: number;
+	    commit: GitCommitRef;
+	    isBaseVersion: boolean;
+	    name: string;
+	}
+	export interface GitChange extends Change<GitItem> {
+	}
+	export interface GitCommit extends GitCommitRef {
+	    push: GitPushRef;
+	    treeId: string;
+	}
+	export interface GitCommitChanges {
+	    changeCounts: ChangeCountDictionary;
+	    changes: GitChange[];
+	}
+	export interface GitCommitDiffs {
+	    aheadCount: number;
+	    allChangesIncluded: boolean;
+	    baseCommit: string;
+	    behindCount: number;
+	    changeCounts: {
+	        [key: number]: number;
+	    };
+	    changes: GitChange[];
+	    commonCommit: string;
+	    targetCommit: string;
+	}
+	export interface GitCommitRef {
+	    _links: any;
+	    author: GitUserDate;
+	    changeCounts: ChangeCountDictionary;
+	    changes: GitChange[];
+	    comment: string;
+	    commentTruncated: boolean;
+	    commitId: string;
+	    committer: GitUserDate;
+	    parents: string[];
+	    remoteUrl: string;
+	    url: string;
+	}
+	export interface GitCommitToCreate {
+	    baseRef: GitRef;
+	    comment: string;
+	    pathActions: GitPathAction[];
+	}
+	export interface GitHistoryQueryResults extends HistoryQueryResults<GitItem> {
+	    /**
+	     * Seed commit used for querying history.  Used for skip feature.
+	     */
+	    startingCommitId: string;
+	    unpopulatedCount: number;
+	    unprocessedCount: number;
+	}
+	export interface GitItem extends ItemModel {
+	    /**
+	     * SHA1 of commit item was fetched at
+	     */
+	    commitId: string;
+	    /**
+	     * Type of object (Commit, Tree, Blob, Tag, ...)
+	     */
+	    gitObjectType: GitObjectType;
+	    /**
+	     * Shallow ref to commit that last changed this item Only populated if latestProcessedChange is requested May not be accurate if latest change is not yet cached
+	     */
+	    latestProcessedChange: GitCommitRef;
+	    /**
+	     * Git object id
+	     */
+	    objectId: string;
+	    /**
+	     * Git object id
+	     */
+	    originalObjectId: string;
+	}
+	export interface GitItemDescriptor {
+	    /**
+	     * Path to item
+	     */
+	    path: string;
+	    /**
+	     * Specifies whether to include children (OneLevel), all descendants (Full), or None
+	     */
+	    recursionLevel: VersionControlRecursionType;
+	    /**
+	     * Version string (interpretation based on VersionType defined in subclass
+	     */
+	    version: string;
+	    /**
+	     * Version modifiers (e.g. previous)
+	     */
+	    versionOptions: GitVersionOptions;
+	    /**
+	     * How to interpret version (branch,tag,commit)
+	     */
+	    versionType: GitVersionType;
+	}
+	export interface GitItemRequestData {
+	    /**
+	     * Whether to include metadata for all items
+	     */
+	    includeContentMetadata: boolean;
+	    /**
+	     * Whether to include the _links field on the shallow references
+	     */
+	    includeLinks: boolean;
+	    /**
+	     * Collection of items to fetch, including path, version, and recursion level
+	     */
+	    itemDescriptors: GitItemDescriptor[];
+	    /**
+	     * Whether to include shallow ref to commit that last changed each item
+	     */
+	    latestProcessedChange: boolean;
+	}
+	/**
+	 * Encapsulates the reference metadata of a Git media object.
+	 */
+	export interface GitMediaObjectRef {
+	    /**
+	     * Gets or sets the reference links of the Git media object.
+	     */
+	    _links: any;
+	    /**
+	     * Gets or sets the Git media object identifier. This Id property duplicates the Oid property, but is required by the VSO REST specification.
+	     */
+	    id: string;
+	    /**
+	     * Gets or sets the Git media object identifier. This property exists for adherence to the GitHub Git Media contract.
+	     */
+	    oid: string;
+	    /**
+	     * Gets or sets the size of the Git media object in bytes. This property exists for adherence to the GitHub Git Media contract.
+	     */
+	    size: number;
+	    /**
+	     * Gets or sets the URL for the Git media object.
+	     */
+	    url: string;
+	}
+	export enum GitObjectType {
+	    Bad = 0,
+	    Commit = 1,
+	    Tree = 2,
+	    Blob = 3,
+	    Tag = 4,
+	    Ext2 = 5,
+	    OfsDelta = 6,
+	    RefDelta = 7,
+	}
+	export interface GitPathAction {
+	    action: GitPathActions;
+	    base64Content: string;
+	    path: string;
+	    rawTextContent: string;
+	    targetPath: string;
+	}
+	export enum GitPathActions {
+	    None = 0,
+	    Edit = 1,
+	    Delete = 2,
+	    Add = 3,
+	    Rename = 4,
+	}
+	export interface GitPullRequest {
+	    _links: any;
+	    closedDate: Date;
+	    codeReviewId: number;
+	    createdBy: VSSInterfaces.IdentityRef;
+	    creationDate: Date;
+	    description: string;
+	    lastMergeCommit: GitCommitRef;
+	    lastMergeSourceCommit: GitCommitRef;
+	    lastMergeTargetCommit: GitCommitRef;
+	    mergeId: string;
+	    mergeStatus: PullRequestAsyncStatus;
+	    pullRequestId: number;
+	    remoteUrl: string;
+	    repository: GitRepository;
+	    reviewers: IdentityRefWithVote[];
+	    sourceRefName: string;
+	    status: PullRequestStatus;
+	    targetRefName: string;
+	    title: string;
+	    upgraded: boolean;
+	    url: string;
+	}
+	export interface GitPullRequestSearchCriteria {
+	    creatorId: string;
+	    /**
+	     * Whether to include the _links field on the shallow references
+	     */
+	    includeLinks: boolean;
+	    repositoryId: string;
+	    reviewerId: string;
+	    sourceRefName: string;
+	    status: PullRequestStatus;
+	    targetRefName: string;
+	}
+	export interface GitPush extends GitPushRef {
+	    commits: GitCommitRef[];
+	    refUpdates: GitRefUpdate[];
+	    repository: GitRepository;
+	}
+	export interface GitPushEventData {
+	    afterId: string;
+	    beforeId: string;
+	    branch: string;
+	    commits: GitCommit[];
+	    repository: GitRepository;
+	}
+	export interface GitPushRef {
+	    _links: any;
+	    date: Date;
+	    pushCorrelationId: string;
+	    pushedBy: VSSInterfaces.IdentityRef;
+	    pushId: number;
+	    url: string;
+	}
+	export interface GitPushSearchCriteria {
+	    fromDate: Date;
+	    /**
+	     * Whether to include the _links field on the shallow references
+	     */
+	    includeLinks: boolean;
+	    includeRefUpdates: boolean;
+	    pusherId: string;
+	    refName: string;
+	    toDate: Date;
+	}
+	export interface GitQueryCommitsCriteria {
+	    /**
+	     * Number of entries to skip
+	     */
+	    $skip: number;
+	    /**
+	     * Maximum number of entries to retrieve
+	     */
+	    $top: number;
+	    /**
+	     * Alias or display name of the author
+	     */
+	    author: string;
+	    /**
+	     * If provided, the earliest commit in the graph to search
+	     */
+	    compareVersion: GitVersionDescriptor;
+	    /**
+	     * If true, don't include delete history entries
+	     */
+	    excludeDeletes: boolean;
+	    /**
+	     * If provided, a lower bound for filtering commits alphabetically
+	     */
+	    fromCommitId: string;
+	    /**
+	     * If provided, only include history entries created after this date (string)
+	     */
+	    fromDate: string;
+	    /**
+	     * If provided, specifies the exact commit ids of the commits to fetch. May not be combined with other parameters.
+	     */
+	    ids: string[];
+	    /**
+	     * Whether to include the _links field on the shallow references
+	     */
+	    includeLinks: boolean;
+	    /**
+	     * Path of item to search under
+	     */
+	    itemPath: string;
+	    /**
+	     * If provided, identifies the commit or branch to search
+	     */
+	    itemVersion: GitVersionDescriptor;
+	    /**
+	     * If provided, an upper bound for filtering commits alphabetically
+	     */
+	    toCommitId: string;
+	    /**
+	     * If provided, only include history entries created before this date (string)
+	     */
+	    toDate: string;
+	    /**
+	     * Alias or display name of the committer
+	     */
+	    user: string;
+	}
+	export interface GitRef {
+	    _links: any;
+	    isLockedBy: VSSInterfaces.IdentityRef;
+	    name: string;
+	    objectId: string;
+	    url: string;
+	}
+	export interface GitRefUpdate {
+	    name: string;
+	    newObjectId: string;
+	    oldObjectId: string;
+	    repositoryId: string;
+	}
+	export enum GitRefUpdateMode {
+	    /**
+	     * Indicates the Git protocol model where any refs that can be updated will be updated, but any failures will not prevent other updates from succeeding.
+	     */
+	    BestEffort = 0,
+	    /**
+	     * Indicates that all ref updates must succeed or none will succeed. All ref updates will be atomically written. If any failure is encountered, previously successful updates will be rolled back and the entire operation will fail.
+	     */
+	    AllOrNone = 1,
+	}
+	export interface GitRefUpdateResult {
+	    /**
+	     * Custom message for the result object For instance, Reason for failing.
+	     */
+	    customMessage: string;
+	    /**
+	     * Ref name
+	     */
+	    name: string;
+	    /**
+	     * New object ID
+	     */
+	    newObjectId: string;
+	    /**
+	     * Old object ID
+	     */
+	    oldObjectId: string;
+	    /**
+	     * Name of the plugin that rejected the updated.
+	     */
+	    rejectedBy: string;
+	    /**
+	     * Repository ID
+	     */
+	    repositoryId: string;
+	    /**
+	     * True if the ref update succeeded, false otherwise
+	     */
+	    success: boolean;
+	    /**
+	     * Status of the update from the TFS server.
+	     */
+	    updateStatus: GitRefUpdateStatus;
+	}
+	export interface GitRefUpdateResultSet {
+	    countFailed: number;
+	    countSucceeded: number;
+	    pushCorrelationId: string;
+	    pushIds: {
+	        [key: number]: number;
+	    };
+	    pushTime: Date;
+	    results: GitRefUpdateResult[];
+	}
+	export enum GitRefUpdateStatus {
+	    /**
+	     * Indicates that the ref update request was completed successfully.
+	     */
+	    Succeeded = 0,
+	    /**
+	     * Indicates that the ref update request could not be completed because part of the graph would be disconnected by this change, and the caller does not have ForcePush permission on the repository.
+	     */
+	    ForcePushRequired = 1,
+	    /**
+	     * Indicates that the ref update request could not be completed because the old object ID presented in the request was not the object ID of the ref when the database attempted the update. The most likely scenario is that the caller lost a race to update the ref.
+	     */
+	    StaleOldObjectId = 2,
+	    /**
+	     * Indicates that the ref update request could not be completed because the ref name presented in the request was not valid.
+	     */
+	    InvalidRefName = 3,
+	    /**
+	     * The request was not processed
+	     */
+	    Unprocessed = 4,
+	    /**
+	     * The ref update request could not be completed because the new object ID for the ref could not be resolved to a commit object (potentially through any number of tags)
+	     */
+	    UnresolvableToCommit = 5,
+	    /**
+	     * The ref update request could not be completed because the user lacks write permissions required to write this ref
+	     */
+	    WritePermissionRequired = 6,
+	    /**
+	     * The ref update request could not be completed because the user lacks note creation permissions required to write this note
+	     */
+	    ManageNotePermissionRequired = 7,
+	    /**
+	     * The ref update request could not be completed because the user lacks the permission to create a branch
+	     */
+	    CreateBranchPermissionRequired = 8,
+	    /**
+	     * The ref update request could not be completed because the user lacks the permission to create a tag
+	     */
+	    CreateTagPermissionRequired = 9,
+	    /**
+	     * The ref update could not be completed because it was rejected by the plugin.
+	     */
+	    RejectedByPlugin = 10,
+	    /**
+	     * The ref update could not be completed because the ref is locked by another user.
+	     */
+	    Locked = 11,
+	    /**
+	     * The ref update could not be completed because, in case-insensitive mode, the ref name conflicts with an existing, differently-cased ref name.
+	     */
+	    RefNameConflict = 12,
+	    /**
+	     * The ref update could not be completed because it was rejected by policy.
+	     */
+	    RejectedByPolicy = 13,
+	    /**
+	     * Indicates that the ref update request was completed successfully, but the ref doesn't actually exist so no changes were made.  This should only happen during deletes.
+	     */
+	    SucceededNonExistentRef = 14,
+	    /**
+	     * Indicates that the ref update request was completed successfully, but the passed-in ref was corrupt - as in, the old object ID was bad.  This should only happen during deletes.
+	     */
+	    SucceededCorruptRef = 15,
+	}
+	export interface GitRepository {
+	    _links: any;
+	    defaultBranch: string;
+	    id: string;
+	    name: string;
+	    project: TfsInterfaces.TeamProjectReference;
+	    remoteUrl: string;
+	    url: string;
+	}
+	export enum GitRepositoryPermissions {
+	    None = 0,
+	    Administer = 1,
+	    GenericRead = 2,
+	    GenericContribute = 4,
+	    ForcePush = 8,
+	    CreateBranch = 16,
+	    CreateTag = 32,
+	    ManageNote = 64,
+	    PolicyExempt = 128,
+	    /**
+	     * This defines the set of bits that are valid for the git permission space. When reading or writing git permissions, these are the only bits paid attention too.
+	     */
+	    All = 255,
+	    BranchLevelPermissions = 141,
+	}
+	export interface GitTargetVersionDescriptor extends GitVersionDescriptor {
+	    /**
+	     * Version string identifier (name of tag/branch, SHA1 of commit)
+	     */
+	    targetVersion: string;
+	    /**
+	     * Version options - Specify additional modifiers to version (e.g Previous)
+	     */
+	    targetVersionOptions: GitVersionOptions;
+	    /**
+	     * Version type (branch, tag, or commit). Determines how Id is interpreted
+	     */
+	    targetVersionType: GitVersionType;
+	}
+	export interface GitTreeEntryRef {
+	    /**
+	     * Blob or tree
+	     */
+	    gitObjectType: GitObjectType;
+	    /**
+	     * Mode represented as octal string
+	     */
+	    mode: string;
+	    /**
+	     * SHA1 hash of git object
+	     */
+	    objectId: string;
+	    /**
+	     * Path relative to parent tree object
+	     */
+	    relativePath: string;
+	    /**
+	     * Size of content
+	     */
+	    size: number;
+	    /**
+	     * url to retrieve tree or blob
+	     */
+	    url: string;
+	}
+	export interface GitTreeRef {
+	    _links: any;
+	    /**
+	     * SHA1 hash of git object
+	     */
+	    objectId: string;
+	    /**
+	     * Sum of sizes of all children
+	     */
+	    size: number;
+	    /**
+	     * Blobs and trees under this tree
+	     */
+	    treeEntries: GitTreeEntryRef[];
+	    /**
+	     * Url to tree
+	     */
+	    url: string;
+	}
+	export interface GitUserDate {
+	    date: Date;
+	    email: string;
+	    name: string;
+	}
+	export interface GitVersionDescriptor {
+	    /**
+	     * Version string identifier (name of tag/branch/index, SHA1 of commit)
+	     */
+	    version: string;
+	    /**
+	     * Version options - Specify additional modifiers to version (e.g Previous)
+	     */
+	    versionOptions: GitVersionOptions;
+	    /**
+	     * Version type (branch, tag, commit, or index). Determines how Id is interpreted
+	     */
+	    versionType: GitVersionType;
+	}
+	export enum GitVersionOptions {
+	    /**
+	     * Not specified
+	     */
+	    None = 0,
+	    /**
+	     * Commit that changed item prior to the current version
+	     */
+	    PreviousChange = 1,
+	    /**
+	     * First parent of commit (HEAD^)
+	     */
+	    FirstParent = 2,
+	}
+	export enum GitVersionType {
+	    /**
+	     * Interpret the version as a branch name
+	     */
+	    Branch = 0,
+	    /**
+	     * Interpret the version as a tag name
+	     */
+	    Tag = 1,
+	    /**
+	     * Interpret the version as a commit ID (SHA1)
+	     */
+	    Commit = 2,
+	    /**
+	     * Interpret the version as an index name
+	     */
+	    Index = 3,
+	}
+	export interface HistoryEntry<T> {
+	    /**
+	     * The Change list (changeset/commit/shelveset) for this point in history
+	     */
+	    changeList: ChangeList<T>;
+	    /**
+	     * The change made to the item from this change list (only relevant for File history, not folders)
+	     */
+	    itemChangeType: VersionControlChangeType;
+	    /**
+	     * The path of the item at this point in history (only relevant for File history, not folders)
+	     */
+	    serverItem: string;
+	}
+	export interface HistoryQueryResults<T> {
+	    /**
+	     * True if there are more results available to fetch (we're returning the max # of items requested) A more RESTy solution would be to include a Link header
+	     */
+	    moreResultsAvailable: boolean;
+	    /**
+	     * The history entries (results) from this query
+	     */
+	    results: HistoryEntry<T>[];
+	}
+	export interface IdentityRefWithVote extends VSSInterfaces.IdentityRef {
+	    isRequired: boolean;
+	    reviewerUrl: string;
+	    vote: number;
+	    votedFor: IdentityRefWithVote[];
+	}
+	export interface IncludedGitCommit {
+	    commitId: string;
+	    commitTime: Date;
+	    parentCommitIds: string[];
+	    repositoryId: string;
+	}
+	export interface ItemContent {
+	    content: string;
+	    contentType: ItemContentType;
+	}
+	export enum ItemContentType {
+	    RawText = 0,
+	    Base64Encoded = 1,
+	}
+	/**
+	 * Optional details to include when returning an item model
+	 */
+	export interface ItemDetailsOptions {
+	    /**
+	     * If true, include metadata about the file type
+	     */
+	    includeContentMetadata: boolean;
+	    /**
+	     * Specifies whether to include children (OneLevel), all descendants (Full) or None for folder items
+	     */
+	    recursionLevel: VersionControlRecursionType;
+	}
+	export interface ItemModel {
+	    _links: any;
+	    contentMetadata: FileContentMetadata;
+	    isFolder: boolean;
+	    isSymLink: boolean;
+	    path: string;
+	    url: string;
+	}
+	export enum PullRequestAsyncStatus {
+	    NotSet = 0,
+	    Queued = 1,
+	    Conflicts = 2,
+	    Succeeded = 3,
+	    RejectedByPolicy = 4,
+	    Failure = 5,
+	}
+	export enum PullRequestStatus {
+	    NotSet = 0,
+	    Active = 1,
+	    Abandoned = 2,
+	    Completed = 3,
+	}
+	export interface TfvcBranch extends TfvcBranchRef {
+	    children: TfvcBranch[];
+	    mappings: TfvcBranchMapping[];
+	    parent: TfvcShallowBranchRef;
+	    relatedBranches: TfvcShallowBranchRef[];
+	}
+	export interface TfvcBranchMapping {
+	    depth: string;
+	    serverItem: string;
+	    type: string;
+	}
+	export interface TfvcBranchRef extends TfvcShallowBranchRef {
+	    _links: any;
+	    createdDate: Date;
+	    description: string;
+	    isDeleted: boolean;
+	    owner: VSSInterfaces.IdentityRef;
+	    url: string;
+	}
+	export interface TfvcChange extends Change<TfvcItem> {
+	    /**
+	     * List of merge sources in case of rename or branch creation.
+	     */
+	    mergeSources: TfvcMergeSource[];
+	    /**
+	     * Version at which a (shelved) change was pended against
+	     */
+	    pendingVersion: number;
+	}
+	export interface TfvcChangeset extends TfvcChangesetRef {
+	    accountId: string;
+	    changes: TfvcChange[];
+	    checkinNotes: CheckinNote[];
+	    collectionId: string;
+	    hasMoreChanges: boolean;
+	    policyOverride: TfvcPolicyOverrideInfo;
+	    workItems: AssociatedWorkItem[];
+	}
+	export interface TfvcChangesetRef {
+	    _links: any;
+	    author: VSSInterfaces.IdentityRef;
+	    changesetId: number;
+	    checkedInBy: VSSInterfaces.IdentityRef;
+	    comment: string;
+	    commentTruncated: boolean;
+	    createdDate: Date;
+	    url: string;
+	}
+	/**
+	 * Criteria used in a search for change lists
+	 */
+	export interface TfvcChangesetSearchCriteria {
+	    /**
+	     * Alias or display name of user who made the changes
+	     */
+	    author: string;
+	    /**
+	     * Whether or not to follow renames for the given item being queried
+	     */
+	    followRenames: boolean;
+	    /**
+	     * If provided, only include changesets created after this date (string) Think of a better name for this.
+	     */
+	    fromDate: string;
+	    /**
+	     * If provided, only include changesets after this changesetID
+	     */
+	    fromId: number;
+	    /**
+	     * Whether to include the _links field on the shallow references
+	     */
+	    includeLinks: boolean;
+	    /**
+	     * Path of item to search under
+	     */
+	    path: string;
+	    /**
+	     * If provided, only include changesets created before this date (string) Think of a better name for this.
+	     */
+	    toDate: string;
+	    /**
+	     * If provided, a version descriptor for the latest change list to include
+	     */
+	    toId: number;
+	}
+	export interface TfvcChangesetsRequestData {
+	    changesetIds: number[];
+	    commentLength: number;
+	    /**
+	     * Whether to include the _links field on the shallow references
+	     */
+	    includeLinks: boolean;
+	}
+	export interface TfvcCheckinEventData {
+	    changeset: TfvcChangeset;
+	    project: TfsInterfaces.TeamProjectReference;
+	}
+	export interface TfvcHistoryEntry extends HistoryEntry<TfvcItem> {
+	    /**
+	     * The encoding of the item at this point in history (only relevant for File history, not folders)
+	     */
+	    encoding: number;
+	    /**
+	     * The file id of the item at this point in history (only relevant for File history, not folders)
+	     */
+	    fileId: number;
+	}
+	export interface TfvcItem extends ItemModel {
+	    changeDate: Date;
+	    deletionId: number;
+	    isBranch: boolean;
+	    isPendingChange: boolean;
+	    version: number;
+	}
+	/**
+	 * Item path and Version descriptor properties
+	 */
+	export interface TfvcItemDescriptor {
+	    path: string;
+	    recursionLevel: VersionControlRecursionType;
+	    version: string;
+	    versionOption: TfvcVersionOption;
+	    versionType: TfvcVersionType;
+	}
+	export interface TfvcItemRequestData {
+	    /**
+	     * If true, include metadata about the file type
+	     */
+	    includeContentMetadata: boolean;
+	    /**
+	     * Whether to include the _links field on the shallow references
+	     */
+	    includeLinks: boolean;
+	    itemDescriptors: TfvcItemDescriptor[];
+	}
+	export interface TfvcLabel extends TfvcLabelRef {
+	    items: TfvcItem[];
+	}
+	export interface TfvcLabelRef {
+	    _links: any;
+	    description: string;
+	    id: number;
+	    labelScope: string;
+	    modifiedDate: Date;
+	    name: string;
+	    owner: VSSInterfaces.IdentityRef;
+	    url: string;
+	}
+	export interface TfvcLabelRequestData {
+	    /**
+	     * Whether to include the _links field on the shallow references
+	     */
+	    includeLinks: boolean;
+	    itemLabelFilter: string;
+	    labelScope: string;
+	    maxItemCount: number;
+	    name: string;
+	    owner: string;
+	}
+	export interface TfvcMergeSource {
+	    /**
+	     * Indicates if this a rename source. If false, it is a merge source.
+	     */
+	    isRename: boolean;
+	    /**
+	     * The server item of the merge source
+	     */
+	    serverItem: string;
+	    /**
+	     * Start of the version range
+	     */
+	    versionFrom: number;
+	    /**
+	     * End of the version range
+	     */
+	    versionTo: number;
+	}
+	export interface TfvcPolicyFailureInfo {
+	    message: string;
+	    policyName: string;
+	}
+	export interface TfvcPolicyOverrideInfo {
+	    comment: string;
+	    policyFailures: TfvcPolicyFailureInfo[];
+	}
+	export interface TfvcShallowBranchRef {
+	    path: string;
+	}
+	export interface TfvcShelveset extends TfvcShelvesetRef {
+	    changes: TfvcChange[];
+	    notes: CheckinNote[];
+	    policyOverride: TfvcPolicyOverrideInfo;
+	    workItems: AssociatedWorkItem[];
+	}
+	export interface TfvcShelvesetRef {
+	    _links: any;
+	    comment: string;
+	    commentTruncated: boolean;
+	    createdDate: Date;
+	    id: string;
+	    name: string;
+	    owner: VSSInterfaces.IdentityRef;
+	    url: string;
+	}
+	export interface TfvcShelvesetRequestData {
+	    /**
+	     * Whether to include policyOverride and notes
+	     */
+	    includeDetails: boolean;
+	    /**
+	     * Whether to include the _links field on the shallow references
+	     */
+	    includeLinks: boolean;
+	    /**
+	     * Whether to include workItems
+	     */
+	    includeWorkItems: boolean;
+	    /**
+	     * Max number of changes to include
+	     */
+	    maxChangeCount: number;
+	    /**
+	     * Max length of comment
+	     */
+	    maxCommentLength: number;
+	    /**
+	     * Shelveset's name
+	     */
+	    name: string;
+	    /**
+	     * Owner's ID. Could be a name or a guid.
+	     */
+	    owner: string;
+	}
+	export interface TfvcVersionDescriptor {
+	    version: string;
+	    versionOption: TfvcVersionOption;
+	    versionType: TfvcVersionType;
+	}
+	export enum TfvcVersionOption {
+	    None = 0,
+	    Previous = 1,
+	    UseRename = 2,
+	}
+	export enum TfvcVersionType {
+	    None = 0,
+	    Changeset = 1,
+	    Shelveset = 2,
+	    Change = 3,
+	    Date = 4,
+	    Latest = 5,
+	    Tip = 6,
+	    MergeSource = 7,
+	}
+	export interface UpdateRefsRequest {
+	    refUpdateRequests: GitRefUpdate[];
+	    updateMode: GitRefUpdateMode;
+	}
+	export enum VersionControlChangeType {
+	    None = 0,
+	    Add = 1,
+	    Edit = 2,
+	    Encoding = 4,
+	    Rename = 8,
+	    Delete = 16,
+	    Undelete = 32,
+	    Branch = 64,
+	    Merge = 128,
+	    Lock = 256,
+	    Rollback = 512,
+	    SourceRename = 1024,
+	    TargetRename = 2048,
+	    Property = 4096,
+	    All = 8191,
+	}
+	export interface VersionControlProjectInfo {
+	    project: TfsInterfaces.TeamProjectReference;
+	    supportsGit: boolean;
+	    supportsTFVC: boolean;
+	}
+	export enum VersionControlRecursionType {
+	    None = 0,
+	    OneLevel = 1,
+	    Full = 120,
+	}
+	export var TypeInfo: {
+	    AssociatedWorkItem: {
+	        fields: any;
+	    };
+	    Change: {
+	        fields: any;
+	    };
+	    ChangeCountDictionary: {
+	        fields: any;
+	    };
+	    ChangeList: {
+	        fields: any;
+	    };
+	    ChangeListSearchCriteria: {
+	        fields: any;
+	    };
+	    CheckinNote: {
+	        fields: any;
+	    };
+	    FileContentMetadata: {
+	        fields: any;
+	    };
+	    GitBaseVersionDescriptor: {
+	        fields: any;
+	    };
+	    GitBlobRef: {
+	        fields: any;
+	    };
+	    GitBranchStats: {
+	        fields: any;
+	    };
+	    GitChange: {
+	        fields: any;
+	    };
+	    GitCommit: {
+	        fields: any;
+	    };
+	    GitCommitChanges: {
+	        fields: any;
+	    };
+	    GitCommitDiffs: {
+	        fields: any;
+	    };
+	    GitCommitRef: {
+	        fields: any;
+	    };
+	    GitCommitToCreate: {
+	        fields: any;
+	    };
+	    GitHistoryQueryResults: {
+	        fields: any;
+	    };
+	    GitItem: {
+	        fields: any;
+	    };
+	    GitItemDescriptor: {
+	        fields: any;
+	    };
+	    GitItemRequestData: {
+	        fields: any;
+	    };
+	    GitMediaObjectRef: {
+	        fields: any;
+	    };
+	    GitObjectType: {
+	        enumValues: {
+	            "bad": number;
+	            "commit": number;
+	            "tree": number;
+	            "blob": number;
+	            "tag": number;
+	            "ext2": number;
+	            "ofsDelta": number;
+	            "refDelta": number;
+	        };
+	    };
+	    GitPathAction: {
+	        fields: any;
+	    };
+	    GitPathActions: {
+	        enumValues: {
+	            "none": number;
+	            "edit": number;
+	            "delete": number;
+	            "add": number;
+	            "rename": number;
+	        };
+	    };
+	    GitPullRequest: {
+	        fields: any;
+	    };
+	    GitPullRequestSearchCriteria: {
+	        fields: any;
+	    };
+	    GitPush: {
+	        fields: any;
+	    };
+	    GitPushEventData: {
+	        fields: any;
+	    };
+	    GitPushRef: {
+	        fields: any;
+	    };
+	    GitPushSearchCriteria: {
+	        fields: any;
+	    };
+	    GitQueryCommitsCriteria: {
+	        fields: any;
+	    };
+	    GitRef: {
+	        fields: any;
+	    };
+	    GitRefUpdate: {
+	        fields: any;
+	    };
+	    GitRefUpdateMode: {
+	        enumValues: {
+	            "bestEffort": number;
+	            "allOrNone": number;
+	        };
+	    };
+	    GitRefUpdateResult: {
+	        fields: any;
+	    };
+	    GitRefUpdateResultSet: {
+	        fields: any;
+	    };
+	    GitRefUpdateStatus: {
+	        enumValues: {
+	            "succeeded": number;
+	            "forcePushRequired": number;
+	            "staleOldObjectId": number;
+	            "invalidRefName": number;
+	            "unprocessed": number;
+	            "unresolvableToCommit": number;
+	            "writePermissionRequired": number;
+	            "manageNotePermissionRequired": number;
+	            "createBranchPermissionRequired": number;
+	            "createTagPermissionRequired": number;
+	            "rejectedByPlugin": number;
+	            "locked": number;
+	            "refNameConflict": number;
+	            "rejectedByPolicy": number;
+	            "succeededNonExistentRef": number;
+	            "succeededCorruptRef": number;
+	        };
+	    };
+	    GitRepository: {
+	        fields: any;
+	    };
+	    GitRepositoryPermissions: {
+	        enumValues: {
+	            "none": number;
+	            "administer": number;
+	            "genericRead": number;
+	            "genericContribute": number;
+	            "forcePush": number;
+	            "createBranch": number;
+	            "createTag": number;
+	            "manageNote": number;
+	            "policyExempt": number;
+	            "all": number;
+	            "branchLevelPermissions": number;
+	        };
+	    };
+	    GitTargetVersionDescriptor: {
+	        fields: any;
+	    };
+	    GitTreeEntryRef: {
+	        fields: any;
+	    };
+	    GitTreeRef: {
+	        fields: any;
+	    };
+	    GitUserDate: {
+	        fields: any;
+	    };
+	    GitVersionDescriptor: {
+	        fields: any;
+	    };
+	    GitVersionOptions: {
+	        enumValues: {
+	            "none": number;
+	            "previousChange": number;
+	            "firstParent": number;
+	        };
+	    };
+	    GitVersionType: {
+	        enumValues: {
+	            "branch": number;
+	            "tag": number;
+	            "commit": number;
+	            "index": number;
+	        };
+	    };
+	    HistoryEntry: {
+	        fields: any;
+	    };
+	    HistoryQueryResults: {
+	        fields: any;
+	    };
+	    IdentityRefWithVote: {
+	        fields: any;
+	    };
+	    IncludedGitCommit: {
+	        fields: any;
+	    };
+	    ItemContent: {
+	        fields: any;
+	    };
+	    ItemContentType: {
+	        enumValues: {
+	            "rawText": number;
+	            "base64Encoded": number;
+	        };
+	    };
+	    ItemDetailsOptions: {
+	        fields: any;
+	    };
+	    ItemModel: {
+	        fields: any;
+	    };
+	    PullRequestAsyncStatus: {
+	        enumValues: {
+	            "notSet": number;
+	            "queued": number;
+	            "conflicts": number;
+	            "succeeded": number;
+	            "rejectedByPolicy": number;
+	            "failure": number;
+	        };
+	    };
+	    PullRequestStatus: {
+	        enumValues: {
+	            "notSet": number;
+	            "active": number;
+	            "abandoned": number;
+	            "completed": number;
+	        };
+	    };
+	    TfvcBranch: {
+	        fields: any;
+	    };
+	    TfvcBranchMapping: {
+	        fields: any;
+	    };
+	    TfvcBranchRef: {
+	        fields: any;
+	    };
+	    TfvcChange: {
+	        fields: any;
+	    };
+	    TfvcChangeset: {
+	        fields: any;
+	    };
+	    TfvcChangesetRef: {
+	        fields: any;
+	    };
+	    TfvcChangesetSearchCriteria: {
+	        fields: any;
+	    };
+	    TfvcChangesetsRequestData: {
+	        fields: any;
+	    };
+	    TfvcCheckinEventData: {
+	        fields: any;
+	    };
+	    TfvcHistoryEntry: {
+	        fields: any;
+	    };
+	    TfvcItem: {
+	        fields: any;
+	    };
+	    TfvcItemDescriptor: {
+	        fields: any;
+	    };
+	    TfvcItemRequestData: {
+	        fields: any;
+	    };
+	    TfvcLabel: {
+	        fields: any;
+	    };
+	    TfvcLabelRef: {
+	        fields: any;
+	    };
+	    TfvcLabelRequestData: {
+	        fields: any;
+	    };
+	    TfvcMergeSource: {
+	        fields: any;
+	    };
+	    TfvcPolicyFailureInfo: {
+	        fields: any;
+	    };
+	    TfvcPolicyOverrideInfo: {
+	        fields: any;
+	    };
+	    TfvcShallowBranchRef: {
+	        fields: any;
+	    };
+	    TfvcShelveset: {
+	        fields: any;
+	    };
+	    TfvcShelvesetRef: {
+	        fields: any;
+	    };
+	    TfvcShelvesetRequestData: {
+	        fields: any;
+	    };
+	    TfvcVersionDescriptor: {
+	        fields: any;
+	    };
+	    TfvcVersionOption: {
+	        enumValues: {
+	            "none": number;
+	            "previous": number;
+	            "useRename": number;
+	        };
+	    };
+	    TfvcVersionType: {
+	        enumValues: {
+	            "none": number;
+	            "changeset": number;
+	            "shelveset": number;
+	            "change": number;
+	            "date": number;
+	            "latest": number;
+	            "tip": number;
+	            "mergeSource": number;
+	        };
+	    };
+	    UpdateRefsRequest: {
+	        fields: any;
+	    };
+	    VersionControlChangeType: {
+	        enumValues: {
+	            "none": number;
+	            "add": number;
+	            "edit": number;
+	            "encoding": number;
+	            "rename": number;
+	            "delete": number;
+	            "undelete": number;
+	            "branch": number;
+	            "merge": number;
+	            "lock": number;
+	            "rollback": number;
+	            "sourceRename": number;
+	            "targetRename": number;
+	            "property": number;
+	            "all": number;
+	        };
+	    };
+	    VersionControlProjectInfo: {
+	        fields: any;
+	    };
+	    VersionControlRecursionType: {
+	        enumValues: {
+	            "none": number;
+	            "oneLevel": number;
+	            "full": number;
+	        };
+	    };
+	};
+
+}
+declare module 'vso-node-api/TfvcApi' {
+	/// <reference types="node" />
+	/// <reference types="Q" />
+	import Q = require('q');
+	import basem = require('vso-node-api/ClientApiBases');
+	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
+	import TfvcInterfaces = require('vso-node-api/interfaces/TfvcInterfaces');
+	export interface ITfvcApi extends basem.ClientApiBase {
+	    getBranch(path: string, project: string, includeParent: boolean, includeChildren: boolean, onResult: (err: any, statusCode: number, Branche: TfvcInterfaces.TfvcBranch) => void): void;
+	    getBranches(project: string, includeParent: boolean, includeChildren: boolean, includeDeleted: boolean, includeLinks: boolean, onResult: (err: any, statusCode: number, Branches: TfvcInterfaces.TfvcBranch[]) => void): void;
+	    getBranchRefs(scopePath: string, project: string, includeDeleted: boolean, includeLinks: boolean, onResult: (err: any, statusCode: number, Branches: TfvcInterfaces.TfvcBranchRef[]) => void): void;
+	    getChangesetChanges(id: number, skip: number, top: number, onResult: (err: any, statusCode: number, ChangesetChanges: TfvcInterfaces.TfvcChange[]) => void): void;
+	    createChangeset(changeset: TfvcInterfaces.TfvcChangeset, project: string, onResult: (err: any, statusCode: number, Changeset: TfvcInterfaces.TfvcChangesetRef) => void): void;
+	    getChangeset(id: number, project: string, maxChangeCount: number, includeDetails: boolean, includeWorkItems: boolean, maxCommentLength: number, includeSourceRename: boolean, skip: number, top: number, orderby: string, searchCriteria: TfvcInterfaces.TfvcChangesetSearchCriteria, onResult: (err: any, statusCode: number, Changeset: TfvcInterfaces.TfvcChangeset) => void): void;
+	    getChangesets(project: string, maxChangeCount: number, includeDetails: boolean, includeWorkItems: boolean, maxCommentLength: number, includeSourceRename: boolean, skip: number, top: number, orderby: string, searchCriteria: TfvcInterfaces.TfvcChangesetSearchCriteria, onResult: (err: any, statusCode: number, Changesets: TfvcInterfaces.TfvcChangesetRef[]) => void): void;
+	    getBatchedChangesets(changesetsRequestData: TfvcInterfaces.TfvcChangesetsRequestData, onResult: (err: any, statusCode: number, ChangesetsBatch: TfvcInterfaces.TfvcChangesetRef[]) => void): void;
+	    getChangesetWorkItems(id: number, onResult: (err: any, statusCode: number, ChangesetWorkItems: TfvcInterfaces.AssociatedWorkItem[]) => void): void;
+	    getItemsBatch(itemRequestData: TfvcInterfaces.TfvcItemRequestData, project: string, onResult: (err: any, statusCode: number, ItemBatch: TfvcInterfaces.TfvcItem[][]) => void): void;
+	    getItem(path: string, project: string, fileName: string, download: boolean, scopePath: string, recursionLevel: TfvcInterfaces.VersionControlRecursionType, versionDescriptor: TfvcInterfaces.TfvcVersionDescriptor, onResult: (err: any, statusCode: number, Item: TfvcInterfaces.TfvcItem) => void): void;
+	    getItemContent(path: string, project: string, fileName: string, download: boolean, scopePath: string, recursionLevel: TfvcInterfaces.VersionControlRecursionType, versionDescriptor: TfvcInterfaces.TfvcVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    getItems(project: string, scopePath: string, recursionLevel: TfvcInterfaces.VersionControlRecursionType, includeLinks: boolean, versionDescriptor: TfvcInterfaces.TfvcVersionDescriptor, onResult: (err: any, statusCode: number, Items: TfvcInterfaces.TfvcItem[]) => void): void;
+	    getItemText(path: string, project: string, fileName: string, download: boolean, scopePath: string, recursionLevel: TfvcInterfaces.VersionControlRecursionType, versionDescriptor: TfvcInterfaces.TfvcVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    getItemZip(path: string, project: string, fileName: string, download: boolean, scopePath: string, recursionLevel: TfvcInterfaces.VersionControlRecursionType, versionDescriptor: TfvcInterfaces.TfvcVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    getLabelItems(labelId: string, top: number, skip: number, onResult: (err: any, statusCode: number, LabelItems: TfvcInterfaces.TfvcItem[]) => void): void;
+	    getLabel(labelId: string, requestData: TfvcInterfaces.TfvcLabelRequestData, project: string, onResult: (err: any, statusCode: number, Label: TfvcInterfaces.TfvcLabel) => void): void;
+	    getLabels(requestData: TfvcInterfaces.TfvcLabelRequestData, project: string, top: number, skip: number, onResult: (err: any, statusCode: number, Labels: TfvcInterfaces.TfvcLabelRef[]) => void): void;
+	    getProjectInfo(projectId: string, project: string, onResult: (err: any, statusCode: number, ProjectInfo: TfvcInterfaces.VersionControlProjectInfo) => void): void;
+	    getProjectInfos(project: string, onResult: (err: any, statusCode: number, ProjectInfo: TfvcInterfaces.VersionControlProjectInfo[]) => void): void;
+	    getShelvesetChanges(shelvesetId: string, top: number, skip: number, onResult: (err: any, statusCode: number, ShelvesetChanges: TfvcInterfaces.TfvcChange[]) => void): void;
+	    getShelveset(shelvesetId: string, requestData: TfvcInterfaces.TfvcShelvesetRequestData, onResult: (err: any, statusCode: number, Shelveset: TfvcInterfaces.TfvcShelveset) => void): void;
+	    getShelvesets(requestData: TfvcInterfaces.TfvcShelvesetRequestData, top: number, skip: number, onResult: (err: any, statusCode: number, Shelvesets: TfvcInterfaces.TfvcShelvesetRef[]) => void): void;
+	    getShelvesetWorkItems(shelvesetId: string, onResult: (err: any, statusCode: number, ShelvesetWorkItems: TfvcInterfaces.AssociatedWorkItem[]) => void): void;
+	}
+	export interface IQTfvcApi extends basem.QClientApiBase {
+	    getBranch(path: string, project?: string, includeParent?: boolean, includeChildren?: boolean): Q.Promise<TfvcInterfaces.TfvcBranch>;
+	    getBranches(project?: string, includeParent?: boolean, includeChildren?: boolean, includeDeleted?: boolean, includeLinks?: boolean): Q.Promise<TfvcInterfaces.TfvcBranch[]>;
+	    getBranchRefs(scopePath: string, project?: string, includeDeleted?: boolean, includeLinks?: boolean): Q.Promise<TfvcInterfaces.TfvcBranchRef[]>;
+	    getChangesetChanges(id?: number, skip?: number, top?: number): Q.Promise<TfvcInterfaces.TfvcChange[]>;
+	    createChangeset(changeset: TfvcInterfaces.TfvcChangeset, project?: string): Q.Promise<TfvcInterfaces.TfvcChangesetRef>;
+	    getChangeset(id: number, project?: string, maxChangeCount?: number, includeDetails?: boolean, includeWorkItems?: boolean, maxCommentLength?: number, includeSourceRename?: boolean, skip?: number, top?: number, orderby?: string, searchCriteria?: TfvcInterfaces.TfvcChangesetSearchCriteria): Q.Promise<TfvcInterfaces.TfvcChangeset>;
+	    getChangesets(project?: string, maxChangeCount?: number, includeDetails?: boolean, includeWorkItems?: boolean, maxCommentLength?: number, includeSourceRename?: boolean, skip?: number, top?: number, orderby?: string, searchCriteria?: TfvcInterfaces.TfvcChangesetSearchCriteria): Q.Promise<TfvcInterfaces.TfvcChangesetRef[]>;
+	    getBatchedChangesets(changesetsRequestData: TfvcInterfaces.TfvcChangesetsRequestData): Q.Promise<TfvcInterfaces.TfvcChangesetRef[]>;
+	    getChangesetWorkItems(id?: number): Q.Promise<TfvcInterfaces.AssociatedWorkItem[]>;
+	    getItemsBatch(itemRequestData: TfvcInterfaces.TfvcItemRequestData, project?: string): Q.Promise<TfvcInterfaces.TfvcItem[][]>;
+	    getItem(path: string, project?: string, fileName?: string, download?: boolean, scopePath?: string, recursionLevel?: TfvcInterfaces.VersionControlRecursionType, versionDescriptor?: TfvcInterfaces.TfvcVersionDescriptor): Q.Promise<TfvcInterfaces.TfvcItem>;
+	    getItems(project?: string, scopePath?: string, recursionLevel?: TfvcInterfaces.VersionControlRecursionType, includeLinks?: boolean, versionDescriptor?: TfvcInterfaces.TfvcVersionDescriptor): Q.Promise<TfvcInterfaces.TfvcItem[]>;
+	    getLabelItems(labelId: string, top?: number, skip?: number): Q.Promise<TfvcInterfaces.TfvcItem[]>;
+	    getLabel(labelId: string, requestData: TfvcInterfaces.TfvcLabelRequestData, project?: string): Q.Promise<TfvcInterfaces.TfvcLabel>;
+	    getLabels(requestData: TfvcInterfaces.TfvcLabelRequestData, project?: string, top?: number, skip?: number): Q.Promise<TfvcInterfaces.TfvcLabelRef[]>;
+	    getProjectInfo(projectId: string, project?: string): Q.Promise<TfvcInterfaces.VersionControlProjectInfo>;
+	    getProjectInfos(project?: string): Q.Promise<TfvcInterfaces.VersionControlProjectInfo[]>;
+	    getShelvesetChanges(shelvesetId: string, top?: number, skip?: number): Q.Promise<TfvcInterfaces.TfvcChange[]>;
+	    getShelveset(shelvesetId: string, requestData: TfvcInterfaces.TfvcShelvesetRequestData): Q.Promise<TfvcInterfaces.TfvcShelveset>;
+	    getShelvesets(requestData: TfvcInterfaces.TfvcShelvesetRequestData, top?: number, skip?: number): Q.Promise<TfvcInterfaces.TfvcShelvesetRef[]>;
+	    getShelvesetWorkItems(shelvesetId: string): Q.Promise<TfvcInterfaces.AssociatedWorkItem[]>;
+	}
+	export class TfvcApi extends basem.ClientApiBase implements ITfvcApi {
+	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
+	    /**
+	     * Get a single branch hierarchy at the given path with parents or children (if specified)
+	     *
+	     * @param {string} path
+	     * @param {string} project - Project ID or project name
+	     * @param {boolean} includeParent
+	     * @param {boolean} includeChildren
+	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcBranch
+	     */
+	    getBranch(path: string, project: string, includeParent: boolean, includeChildren: boolean, onResult: (err: any, statusCode: number, Branche: TfvcInterfaces.TfvcBranch) => void): void;
+	    /**
+	     * Get a collection of branch roots -- first-level children, branches with no parents
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {boolean} includeParent
+	     * @param {boolean} includeChildren
+	     * @param {boolean} includeDeleted
+	     * @param {boolean} includeLinks
+	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcBranch[]
+	     */
+	    getBranches(project: string, includeParent: boolean, includeChildren: boolean, includeDeleted: boolean, includeLinks: boolean, onResult: (err: any, statusCode: number, Branches: TfvcInterfaces.TfvcBranch[]) => void): void;
+	    /**
+	     * Get branch hierarchies below the specified scopePath
+	     *
+	     * @param {string} scopePath
+	     * @param {string} project - Project ID or project name
+	     * @param {boolean} includeDeleted
+	     * @param {boolean} includeLinks
+	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcBranchRef[]
+	     */
+	    getBranchRefs(scopePath: string, project: string, includeDeleted: boolean, includeLinks: boolean, onResult: (err: any, statusCode: number, Branches: TfvcInterfaces.TfvcBranchRef[]) => void): void;
+	    /**
+	     * Retrieve Tfvc changes for a given changeset
+	     *
+	     * @param {number} id
+	     * @param {number} skip
+	     * @param {number} top
+	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcChange[]
+	     */
+	    getChangesetChanges(id: number, skip: number, top: number, onResult: (err: any, statusCode: number, ChangesetChanges: TfvcInterfaces.TfvcChange[]) => void): void;
+	    /**
+	     * @param {TfvcInterfaces.TfvcChangeset} changeset
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcChangesetRef
+	     */
+	    createChangeset(changeset: TfvcInterfaces.TfvcChangeset, project: string, onResult: (err: any, statusCode: number, Changeset: TfvcInterfaces.TfvcChangesetRef) => void): void;
+	    /**
+	     * Retrieve a Tfvc Changeset
+	     *
+	     * @param {number} id
+	     * @param {string} project - Project ID or project name
+	     * @param {number} maxChangeCount
+	     * @param {boolean} includeDetails
+	     * @param {boolean} includeWorkItems
+	     * @param {number} maxCommentLength
+	     * @param {boolean} includeSourceRename
+	     * @param {number} skip
+	     * @param {number} top
+	     * @param {string} orderby
+	     * @param {TfvcInterfaces.TfvcChangesetSearchCriteria} searchCriteria
+	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcChangeset
+	     */
+	    getChangeset(id: number, project: string, maxChangeCount: number, includeDetails: boolean, includeWorkItems: boolean, maxCommentLength: number, includeSourceRename: boolean, skip: number, top: number, orderby: string, searchCriteria: TfvcInterfaces.TfvcChangesetSearchCriteria, onResult: (err: any, statusCode: number, Changeset: TfvcInterfaces.TfvcChangeset) => void): void;
+	    /**
+	     * Retrieve Tfvc changesets
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {number} maxChangeCount
+	     * @param {boolean} includeDetails
+	     * @param {boolean} includeWorkItems
+	     * @param {number} maxCommentLength
+	     * @param {boolean} includeSourceRename
+	     * @param {number} skip
+	     * @param {number} top
+	     * @param {string} orderby
+	     * @param {TfvcInterfaces.TfvcChangesetSearchCriteria} searchCriteria
+	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcChangesetRef[]
+	     */
+	    getChangesets(project: string, maxChangeCount: number, includeDetails: boolean, includeWorkItems: boolean, maxCommentLength: number, includeSourceRename: boolean, skip: number, top: number, orderby: string, searchCriteria: TfvcInterfaces.TfvcChangesetSearchCriteria, onResult: (err: any, statusCode: number, Changesets: TfvcInterfaces.TfvcChangesetRef[]) => void): void;
+	    /**
+	     * @param {TfvcInterfaces.TfvcChangesetsRequestData} changesetsRequestData
+	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcChangesetRef[]
+	     */
+	    getBatchedChangesets(changesetsRequestData: TfvcInterfaces.TfvcChangesetsRequestData, onResult: (err: any, statusCode: number, ChangesetsBatch: TfvcInterfaces.TfvcChangesetRef[]) => void): void;
+	    /**
+	     * @param {number} id
+	     * @param onResult callback function with the resulting TfvcInterfaces.AssociatedWorkItem[]
+	     */
+	    getChangesetWorkItems(id: number, onResult: (err: any, statusCode: number, ChangesetWorkItems: TfvcInterfaces.AssociatedWorkItem[]) => void): void;
+	    /**
+	     * Post for retrieving a set of items given a list of paths or a long path. Allows for specifying the recursionLevel and version descriptors for each path.
+	     *
+	     * @param {TfvcInterfaces.TfvcItemRequestData} itemRequestData
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcItem[][]
+	     */
+	    getItemsBatch(itemRequestData: TfvcInterfaces.TfvcItemRequestData, project: string, onResult: (err: any, statusCode: number, ItemBatch: TfvcInterfaces.TfvcItem[][]) => void): void;
+	    /**
+	     * Get Item Metadata and/or Content. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
+	     *
+	     * @param {string} path
+	     * @param {string} project - Project ID or project name
+	     * @param {string} fileName
+	     * @param {boolean} download
+	     * @param {string} scopePath
+	     * @param {TfvcInterfaces.VersionControlRecursionType} recursionLevel
+	     * @param {TfvcInterfaces.TfvcVersionDescriptor} versionDescriptor
+	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcItem
+	     */
+	    getItem(path: string, project: string, fileName: string, download: boolean, scopePath: string, recursionLevel: TfvcInterfaces.VersionControlRecursionType, versionDescriptor: TfvcInterfaces.TfvcVersionDescriptor, onResult: (err: any, statusCode: number, Item: TfvcInterfaces.TfvcItem) => void): void;
+	    /**
+	     * Get Item Metadata and/or Content. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
+	     *
+	     * @param {string} path
+	     * @param {string} project - Project ID or project name
+	     * @param {string} fileName
+	     * @param {boolean} download
+	     * @param {string} scopePath
+	     * @param {TfvcInterfaces.VersionControlRecursionType} recursionLevel
+	     * @param {TfvcInterfaces.TfvcVersionDescriptor} versionDescriptor
+	     * @param onResult callback function with the resulting ArrayBuffer
+	     */
+	    getItemContent(path: string, project: string, fileName: string, download: boolean, scopePath: string, recursionLevel: TfvcInterfaces.VersionControlRecursionType, versionDescriptor: TfvcInterfaces.TfvcVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    /**
+	     * Get a list of Tfvc items
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {string} scopePath
+	     * @param {TfvcInterfaces.VersionControlRecursionType} recursionLevel
+	     * @param {boolean} includeLinks
+	     * @param {TfvcInterfaces.TfvcVersionDescriptor} versionDescriptor
+	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcItem[]
+	     */
+	    getItems(project: string, scopePath: string, recursionLevel: TfvcInterfaces.VersionControlRecursionType, includeLinks: boolean, versionDescriptor: TfvcInterfaces.TfvcVersionDescriptor, onResult: (err: any, statusCode: number, Items: TfvcInterfaces.TfvcItem[]) => void): void;
+	    /**
+	     * Get Item Metadata and/or Content. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
+	     *
+	     * @param {string} path
+	     * @param {string} project - Project ID or project name
+	     * @param {string} fileName
+	     * @param {boolean} download
+	     * @param {string} scopePath
+	     * @param {TfvcInterfaces.VersionControlRecursionType} recursionLevel
+	     * @param {TfvcInterfaces.TfvcVersionDescriptor} versionDescriptor
+	     * @param onResult callback function with the resulting string
+	     */
+	    getItemText(path: string, project: string, fileName: string, download: boolean, scopePath: string, recursionLevel: TfvcInterfaces.VersionControlRecursionType, versionDescriptor: TfvcInterfaces.TfvcVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    /**
+	     * Get Item Metadata and/or Content. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
+	     *
+	     * @param {string} path
+	     * @param {string} project - Project ID or project name
+	     * @param {string} fileName
+	     * @param {boolean} download
+	     * @param {string} scopePath
+	     * @param {TfvcInterfaces.VersionControlRecursionType} recursionLevel
+	     * @param {TfvcInterfaces.TfvcVersionDescriptor} versionDescriptor
+	     * @param onResult callback function with the resulting ArrayBuffer
+	     */
+	    getItemZip(path: string, project: string, fileName: string, download: boolean, scopePath: string, recursionLevel: TfvcInterfaces.VersionControlRecursionType, versionDescriptor: TfvcInterfaces.TfvcVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    /**
+	     * Get items under a label.
+	     *
+	     * @param {string} labelId - Unique identifier of label
+	     * @param {number} top - Max number of items to return
+	     * @param {number} skip - Number of items to skip
+	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcItem[]
+	     */
+	    getLabelItems(labelId: string, top: number, skip: number, onResult: (err: any, statusCode: number, LabelItems: TfvcInterfaces.TfvcItem[]) => void): void;
+	    /**
+	     * Get a single deep label.
+	     *
+	     * @param {string} labelId - Unique identifier of label
+	     * @param {TfvcInterfaces.TfvcLabelRequestData} requestData - maxItemCount
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcLabel
+	     */
+	    getLabel(labelId: string, requestData: TfvcInterfaces.TfvcLabelRequestData, project: string, onResult: (err: any, statusCode: number, Label: TfvcInterfaces.TfvcLabel) => void): void;
+	    /**
+	     * Get a collection of shallow label references.
+	     *
+	     * @param {TfvcInterfaces.TfvcLabelRequestData} requestData - labelScope, name, owner, and itemLabelFilter
+	     * @param {string} project - Project ID or project name
+	     * @param {number} top - Max number of labels to return
+	     * @param {number} skip - Number of labels to skip
+	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcLabelRef[]
+	     */
+	    getLabels(requestData: TfvcInterfaces.TfvcLabelRequestData, project: string, top: number, skip: number, onResult: (err: any, statusCode: number, Labels: TfvcInterfaces.TfvcLabelRef[]) => void): void;
+	    /**
+	     * Retrieve the version control information for a given Team Project
+	     *
+	     * @param {string} projectId - The id (or name) of the team project
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting TfvcInterfaces.VersionControlProjectInfo
+	     */
+	    getProjectInfo(projectId: string, project: string, onResult: (err: any, statusCode: number, ProjectInfo: TfvcInterfaces.VersionControlProjectInfo) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting TfvcInterfaces.VersionControlProjectInfo[]
+	     */
+	    getProjectInfos(project: string, onResult: (err: any, statusCode: number, ProjectInfo: TfvcInterfaces.VersionControlProjectInfo[]) => void): void;
+	    /**
+	     * Get changes included in a shelveset.
+	     *
+	     * @param {string} shelvesetId - Shelveset's unique ID
+	     * @param {number} top - Max number of changes to return
+	     * @param {number} skip - Number of changes to skip
+	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcChange[]
+	     */
+	    getShelvesetChanges(shelvesetId: string, top: number, skip: number, onResult: (err: any, statusCode: number, ShelvesetChanges: TfvcInterfaces.TfvcChange[]) => void): void;
+	    /**
+	     * Get a single deep shelveset.
+	     *
+	     * @param {string} shelvesetId - Shelveset's unique ID
+	     * @param {TfvcInterfaces.TfvcShelvesetRequestData} requestData - includeDetails, includeWorkItems, maxChangeCount, and maxCommentLength
+	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcShelveset
+	     */
+	    getShelveset(shelvesetId: string, requestData: TfvcInterfaces.TfvcShelvesetRequestData, onResult: (err: any, statusCode: number, Shelveset: TfvcInterfaces.TfvcShelveset) => void): void;
+	    /**
+	     * Return a collection of shallow shelveset references.
+	     *
+	     * @param {TfvcInterfaces.TfvcShelvesetRequestData} requestData - name, owner, and maxCommentLength
+	     * @param {number} top - Max number of shelvesets to return
+	     * @param {number} skip - Number of shelvesets to skip
+	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcShelvesetRef[]
+	     */
+	    getShelvesets(requestData: TfvcInterfaces.TfvcShelvesetRequestData, top: number, skip: number, onResult: (err: any, statusCode: number, Shelvesets: TfvcInterfaces.TfvcShelvesetRef[]) => void): void;
+	    /**
+	     * Get work items associated with a shelveset.
+	     *
+	     * @param {string} shelvesetId - Shelveset's unique ID
+	     * @param onResult callback function with the resulting TfvcInterfaces.AssociatedWorkItem[]
+	     */
+	    getShelvesetWorkItems(shelvesetId: string, onResult: (err: any, statusCode: number, ShelvesetWorkItems: TfvcInterfaces.AssociatedWorkItem[]) => void): void;
+	}
+	export class QTfvcApi extends basem.QClientApiBase implements IQTfvcApi {
+	    api: TfvcApi;
+	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
+	    /**
+	    * Get a single branch hierarchy at the given path with parents or children (if specified)
+	    *
+	    * @param {string} path
+	    * @param {string} project - Project ID or project name
+	    * @param {boolean} includeParent
+	    * @param {boolean} includeChildren
+	    */
+	    getBranch(path: string, project?: string, includeParent?: boolean, includeChildren?: boolean): Q.Promise<TfvcInterfaces.TfvcBranch>;
+	    /**
+	    * Get a collection of branch roots -- first-level children, branches with no parents
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {boolean} includeParent
+	    * @param {boolean} includeChildren
+	    * @param {boolean} includeDeleted
+	    * @param {boolean} includeLinks
+	    */
+	    getBranches(project?: string, includeParent?: boolean, includeChildren?: boolean, includeDeleted?: boolean, includeLinks?: boolean): Q.Promise<TfvcInterfaces.TfvcBranch[]>;
+	    /**
+	    * Get branch hierarchies below the specified scopePath
+	    *
+	    * @param {string} scopePath
+	    * @param {string} project - Project ID or project name
+	    * @param {boolean} includeDeleted
+	    * @param {boolean} includeLinks
+	    */
+	    getBranchRefs(scopePath: string, project?: string, includeDeleted?: boolean, includeLinks?: boolean): Q.Promise<TfvcInterfaces.TfvcBranchRef[]>;
+	    /**
+	    * Retrieve Tfvc changes for a given changeset
+	    *
+	    * @param {number} id
+	    * @param {number} skip
+	    * @param {number} top
+	    */
+	    getChangesetChanges(id?: number, skip?: number, top?: number): Q.Promise<TfvcInterfaces.TfvcChange[]>;
+	    /**
+	    * @param {TfvcInterfaces.TfvcChangeset} changeset
+	    * @param {string} project - Project ID or project name
+	    */
+	    createChangeset(changeset: TfvcInterfaces.TfvcChangeset, project?: string): Q.Promise<TfvcInterfaces.TfvcChangesetRef>;
+	    /**
+	    * Retrieve a Tfvc Changeset
+	    *
+	    * @param {number} id
+	    * @param {string} project - Project ID or project name
+	    * @param {number} maxChangeCount
+	    * @param {boolean} includeDetails
+	    * @param {boolean} includeWorkItems
+	    * @param {number} maxCommentLength
+	    * @param {boolean} includeSourceRename
+	    * @param {number} skip
+	    * @param {number} top
+	    * @param {string} orderby
+	    * @param {TfvcInterfaces.TfvcChangesetSearchCriteria} searchCriteria
+	    */
+	    getChangeset(id: number, project?: string, maxChangeCount?: number, includeDetails?: boolean, includeWorkItems?: boolean, maxCommentLength?: number, includeSourceRename?: boolean, skip?: number, top?: number, orderby?: string, searchCriteria?: TfvcInterfaces.TfvcChangesetSearchCriteria): Q.Promise<TfvcInterfaces.TfvcChangeset>;
+	    /**
+	    * Retrieve Tfvc changesets
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {number} maxChangeCount
+	    * @param {boolean} includeDetails
+	    * @param {boolean} includeWorkItems
+	    * @param {number} maxCommentLength
+	    * @param {boolean} includeSourceRename
+	    * @param {number} skip
+	    * @param {number} top
+	    * @param {string} orderby
+	    * @param {TfvcInterfaces.TfvcChangesetSearchCriteria} searchCriteria
+	    */
+	    getChangesets(project?: string, maxChangeCount?: number, includeDetails?: boolean, includeWorkItems?: boolean, maxCommentLength?: number, includeSourceRename?: boolean, skip?: number, top?: number, orderby?: string, searchCriteria?: TfvcInterfaces.TfvcChangesetSearchCriteria): Q.Promise<TfvcInterfaces.TfvcChangesetRef[]>;
+	    /**
+	    * @param {TfvcInterfaces.TfvcChangesetsRequestData} changesetsRequestData
+	    */
+	    getBatchedChangesets(changesetsRequestData: TfvcInterfaces.TfvcChangesetsRequestData): Q.Promise<TfvcInterfaces.TfvcChangesetRef[]>;
+	    /**
+	    * @param {number} id
+	    */
+	    getChangesetWorkItems(id?: number): Q.Promise<TfvcInterfaces.AssociatedWorkItem[]>;
+	    /**
+	    * Post for retrieving a set of items given a list of paths or a long path. Allows for specifying the recursionLevel and version descriptors for each path.
+	    *
+	    * @param {TfvcInterfaces.TfvcItemRequestData} itemRequestData
+	    * @param {string} project - Project ID or project name
+	    */
+	    getItemsBatch(itemRequestData: TfvcInterfaces.TfvcItemRequestData, project?: string): Q.Promise<TfvcInterfaces.TfvcItem[][]>;
+	    /**
+	    * Get Item Metadata and/or Content. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
+	    *
+	    * @param {string} path
+	    * @param {string} project - Project ID or project name
+	    * @param {string} fileName
+	    * @param {boolean} download
+	    * @param {string} scopePath
+	    * @param {TfvcInterfaces.VersionControlRecursionType} recursionLevel
+	    * @param {TfvcInterfaces.TfvcVersionDescriptor} versionDescriptor
+	    */
+	    getItem(path: string, project?: string, fileName?: string, download?: boolean, scopePath?: string, recursionLevel?: TfvcInterfaces.VersionControlRecursionType, versionDescriptor?: TfvcInterfaces.TfvcVersionDescriptor): Q.Promise<TfvcInterfaces.TfvcItem>;
+	    /**
+	    * Get a list of Tfvc items
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {string} scopePath
+	    * @param {TfvcInterfaces.VersionControlRecursionType} recursionLevel
+	    * @param {boolean} includeLinks
+	    * @param {TfvcInterfaces.TfvcVersionDescriptor} versionDescriptor
+	    */
+	    getItems(project?: string, scopePath?: string, recursionLevel?: TfvcInterfaces.VersionControlRecursionType, includeLinks?: boolean, versionDescriptor?: TfvcInterfaces.TfvcVersionDescriptor): Q.Promise<TfvcInterfaces.TfvcItem[]>;
+	    /**
+	    * Get items under a label.
+	    *
+	    * @param {string} labelId - Unique identifier of label
+	    * @param {number} top - Max number of items to return
+	    * @param {number} skip - Number of items to skip
+	    */
+	    getLabelItems(labelId: string, top?: number, skip?: number): Q.Promise<TfvcInterfaces.TfvcItem[]>;
+	    /**
+	    * Get a single deep label.
+	    *
+	    * @param {string} labelId - Unique identifier of label
+	    * @param {TfvcInterfaces.TfvcLabelRequestData} requestData - maxItemCount
+	    * @param {string} project - Project ID or project name
+	    */
+	    getLabel(labelId: string, requestData: TfvcInterfaces.TfvcLabelRequestData, project?: string): Q.Promise<TfvcInterfaces.TfvcLabel>;
+	    /**
+	    * Get a collection of shallow label references.
+	    *
+	    * @param {TfvcInterfaces.TfvcLabelRequestData} requestData - labelScope, name, owner, and itemLabelFilter
+	    * @param {string} project - Project ID or project name
+	    * @param {number} top - Max number of labels to return
+	    * @param {number} skip - Number of labels to skip
+	    */
+	    getLabels(requestData: TfvcInterfaces.TfvcLabelRequestData, project?: string, top?: number, skip?: number): Q.Promise<TfvcInterfaces.TfvcLabelRef[]>;
+	    /**
+	    * Retrieve the version control information for a given Team Project
+	    *
+	    * @param {string} projectId - The id (or name) of the team project
+	    * @param {string} project - Project ID or project name
+	    */
+	    getProjectInfo(projectId: string, project?: string): Q.Promise<TfvcInterfaces.VersionControlProjectInfo>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    */
+	    getProjectInfos(project?: string): Q.Promise<TfvcInterfaces.VersionControlProjectInfo[]>;
+	    /**
+	    * Get changes included in a shelveset.
+	    *
+	    * @param {string} shelvesetId - Shelveset's unique ID
+	    * @param {number} top - Max number of changes to return
+	    * @param {number} skip - Number of changes to skip
+	    */
+	    getShelvesetChanges(shelvesetId: string, top?: number, skip?: number): Q.Promise<TfvcInterfaces.TfvcChange[]>;
+	    /**
+	    * Get a single deep shelveset.
+	    *
+	    * @param {string} shelvesetId - Shelveset's unique ID
+	    * @param {TfvcInterfaces.TfvcShelvesetRequestData} requestData - includeDetails, includeWorkItems, maxChangeCount, and maxCommentLength
+	    */
+	    getShelveset(shelvesetId: string, requestData: TfvcInterfaces.TfvcShelvesetRequestData): Q.Promise<TfvcInterfaces.TfvcShelveset>;
+	    /**
+	    * Return a collection of shallow shelveset references.
+	    *
+	    * @param {TfvcInterfaces.TfvcShelvesetRequestData} requestData - name, owner, and maxCommentLength
+	    * @param {number} top - Max number of shelvesets to return
+	    * @param {number} skip - Number of shelvesets to skip
+	    */
+	    getShelvesets(requestData: TfvcInterfaces.TfvcShelvesetRequestData, top?: number, skip?: number): Q.Promise<TfvcInterfaces.TfvcShelvesetRef[]>;
+	    /**
+	    * Get work items associated with a shelveset.
+	    *
+	    * @param {string} shelvesetId - Shelveset's unique ID
+	    */
+	    getShelvesetWorkItems(shelvesetId: string): Q.Promise<TfvcInterfaces.AssociatedWorkItem[]>;
+	}
+
+}
+declare module 'vso-node-api/interfaces/WorkItemTrackingInterfaces' {
+	export interface AttachmentReference {
+	    id: string;
+	    url: string;
+	}
+	export interface FieldDependentRule extends WorkItemTrackingResource {
+	    dependentFields: WorkItemFieldReference[];
+	}
+	export interface FieldsToEvaluate {
+	    fields: string[];
+	    fieldUpdates: {
+	        [key: string]: any;
+	    };
+	    fieldValues: {
+	        [key: string]: any;
+	    };
+	    rulesFrom: string[];
+	}
+	export enum FieldType {
+	    String = 0,
+	    Integer = 1,
+	    DateTime = 2,
+	    PlainText = 3,
+	    Html = 4,
+	    TreePath = 5,
+	    History = 6,
+	    Double = 7,
+	    Guid = 8,
+	    Boolean = 9,
+	}
+	export enum FieldUsage {
+	    None = 0,
+	    WorkItem = 1,
+	    WorkItemLink = 2,
+	    Tree = 3,
+	    WorkItemTypeExtension = 4,
+	}
+	export interface IdentityReference {
+	    id: string;
+	    name: string;
+	    url: string;
+	}
+	export interface Link {
+	    attributes: {
+	        [key: string]: any;
+	    };
+	    rel: string;
+	    title: string;
+	    url: string;
+	}
+	export enum LinkQueryMode {
+	    WorkItems = 0,
+	    LinksOneHopMustContain = 1,
+	    LinksOneHopMayContain = 2,
+	    LinksOneHopDoesNotContain = 3,
+	    LinksRecursiveMustContain = 4,
+	    LinksRecursiveMayContain = 5,
+	    LinksRecursiveDoesNotContain = 6,
+	}
+	export enum LogicalOperation {
+	    NONE = 0,
+	    AND = 1,
+	    OR = 2,
+	}
+	export interface ProjectReference {
+	    id: string;
+	    name: string;
+	    url: string;
+	}
+	export enum ProvisioningActionType {
+	    Import = 0,
+	    Validate = 1,
+	}
+	export interface ProvisioningResult {
+	    provisioningImportEvents: string[];
+	}
+	export enum QueryExpand {
+	    None = 0,
+	    Wiql = 1,
+	    Clauses = 2,
+	    All = 3,
+	}
+	export interface QueryHierarchyItem extends WorkItemTrackingResource {
+	    children: QueryHierarchyItem[];
+	    clauses: WorkItemQueryClause;
+	    columns: WorkItemFieldReference[];
+	    filterOptions: LinkQueryMode;
+	    hasChildren: boolean;
+	    id: string;
+	    isDeleted: boolean;
+	    isFolder: boolean;
+	    isInvalidSyntax: boolean;
+	    isPublic: boolean;
+	    linkClauses: WorkItemQueryClause;
+	    name: string;
+	    path: string;
+	    queryType: QueryType;
+	    sortColumns: WorkItemQuerySortColumn[];
+	    sourceClauses: WorkItemQueryClause;
+	    targetClauses: WorkItemQueryClause;
+	    wiql: string;
+	}
+	export enum QueryResultType {
+	    WorkItem = 1,
+	    WorkItemLink = 2,
+	}
+	export enum QueryType {
+	    Flat = 1,
+	    Tree = 2,
+	    OneHop = 3,
+	}
+	export interface ReportingWorkItemLink {
+	    changedDate: Date;
+	    isActive: boolean;
+	    rel: string;
+	    sourceId: number;
+	    targetId: number;
+	}
+	export interface ReportingWorkItemLinksBatch extends StreamedBatch<ReportingWorkItemLink> {
+	}
+	export interface ReportingWorkItemRevisionsBatch extends StreamedBatch<WorkItem> {
+	}
+	export interface ReportingWorkItemRevisionsFilter {
+	    fields: string[];
+	    types: string[];
+	}
+	export interface StreamedBatch<T> {
+	    isLastBatch: boolean;
+	    nextLink: string;
+	    values: T[];
+	}
+	export enum TemplateType {
+	    WorkItemType = 0,
+	    GlobalWorkflow = 1,
+	}
+	export enum TreeNodeStructureType {
+	    Area = 0,
+	    Iteration = 1,
+	}
+	export enum TreeStructureGroup {
+	    Areas = 0,
+	    Iterations = 1,
+	}
+	export interface Wiql {
+	    query: string;
+	}
+	export interface WorkItem extends WorkItemTrackingResource {
+	    fields: {
+	        [key: string]: any;
+	    };
+	    id: number;
+	    relations: WorkItemRelation[];
+	    rev: number;
+	}
+	export interface WorkItemClassificationNode extends WorkItemTrackingResource {
+	    attributes: {
+	        [key: string]: any;
+	    };
+	    children: WorkItemClassificationNode[];
+	    id: number;
+	    name: string;
+	    structureType: TreeNodeStructureType;
+	}
+	export enum WorkItemExpand {
+	    None = 0,
+	    Relations = 1,
+	    Fields = 2,
+	    All = 3,
+	}
+	export interface WorkItemField extends WorkItemTrackingResource {
+	    name: string;
+	    readOnly: boolean;
+	    referenceName: string;
+	    supportedOperations: WorkItemFieldOperation[];
+	    type: FieldType;
+	}
+	export interface WorkItemFieldOperation {
+	    name: string;
+	    referenceName: string;
+	}
+	export interface WorkItemFieldReference {
+	    name: string;
+	    referenceName: string;
+	    url: string;
+	}
+	export interface WorkItemFieldUpdate {
+	    newValue: any;
+	    oldValue: any;
+	}
+	export interface WorkItemHistory extends WorkItemTrackingResource {
+	    rev: number;
+	    revisedBy: IdentityReference;
+	    revisedDate: Date;
+	    value: string;
+	}
+	export interface WorkItemLink {
+	    rel: string;
+	    source: WorkItemReference;
+	    target: WorkItemReference;
+	}
+	export interface WorkItemQueryClause {
+	    clauses: WorkItemQueryClause[];
+	    field: WorkItemFieldReference;
+	    fieldValue: WorkItemFieldReference;
+	    isFieldValue: boolean;
+	    logicalOperator: LogicalOperation;
+	    operator: WorkItemFieldOperation;
+	    value: string;
+	}
+	export interface WorkItemQueryResult {
+	    asOf: Date;
+	    columns: WorkItemFieldReference[];
+	    queryResultType: QueryResultType;
+	    queryType: QueryType;
+	    sortColumns: WorkItemQuerySortColumn[];
+	    workItemRelations: WorkItemLink[];
+	    workItems: WorkItemReference[];
+	}
+	export interface WorkItemQuerySortColumn {
+	    descending: boolean;
+	    field: WorkItemFieldReference;
+	}
+	export interface WorkItemReference {
+	    id: number;
+	    url: string;
+	}
+	export interface WorkItemRelation extends Link {
+	}
+	export interface WorkItemRelationType extends WorkItemTrackingReference {
+	    attributes: {
+	        [key: string]: any;
+	    };
+	}
+	export interface WorkItemRelationUpdates {
+	    added: WorkItemRelation[];
+	    removed: WorkItemRelation[];
+	    updated: WorkItemRelation[];
+	}
+	export interface WorkItemRevisionReference extends WorkItemReference {
+	    rev: number;
+	}
+	export interface WorkItemTrackingReference extends WorkItemTrackingResource {
+	    name: string;
+	    referenceName: string;
+	}
+	export interface WorkItemTrackingResource extends WorkItemTrackingResourceReference {
+	    _links: any;
+	}
+	export interface WorkItemTrackingResourceReference {
+	    url: string;
+	}
+	export interface WorkItemType extends WorkItemTrackingResource {
+	    description: string;
+	    fields: WorkItemTypeFieldInstance[];
+	    name: string;
+	    xmlForm: string;
+	}
+	export interface WorkItemTypeCategory extends WorkItemTrackingResource {
+	    defaultWorkItemType: WorkItemTypeReference;
+	    name: string;
+	    referenceName: string;
+	    workItemTypes: WorkItemTypeReference[];
+	}
+	export interface WorkItemTypeFieldInstance {
+	    field: WorkItemFieldReference;
+	    helpText: string;
+	}
+	export interface WorkItemTypeReference extends WorkItemTrackingResourceReference {
+	    name: string;
+	}
+	export interface WorkItemTypeTemplate {
+	    template: string;
+	}
+	export interface WorkItemTypeTemplateUpdateModel {
+	    actionType: ProvisioningActionType;
+	    methodology: string;
+	    template: string;
+	    templateType: TemplateType;
+	}
+	export interface WorkItemUpdate extends WorkItemTrackingResourceReference {
+	    fields: {
+	        [key: string]: WorkItemFieldUpdate;
+	    };
+	    id: number;
+	    relations: WorkItemRelationUpdates;
+	    rev: number;
+	    revisedBy: IdentityReference;
+	    revisedDate: Date;
+	    workItemId: number;
+	}
+	export var TypeInfo: {
+	    AttachmentReference: {
+	        fields: any;
+	    };
+	    FieldDependentRule: {
+	        fields: any;
+	    };
+	    FieldsToEvaluate: {
+	        fields: any;
+	    };
+	    FieldType: {
+	        enumValues: {
+	            "string": number;
+	            "integer": number;
+	            "dateTime": number;
+	            "plainText": number;
+	            "html": number;
+	            "treePath": number;
+	            "history": number;
+	            "double": number;
+	            "guid": number;
+	            "boolean": number;
+	        };
+	    };
+	    FieldUsage: {
+	        enumValues: {
+	            "none": number;
+	            "workItem": number;
+	            "workItemLink": number;
+	            "tree": number;
+	            "workItemTypeExtension": number;
+	        };
+	    };
+	    IdentityReference: {
+	        fields: any;
+	    };
+	    Link: {
+	        fields: any;
+	    };
+	    LinkQueryMode: {
+	        enumValues: {
+	            "workItems": number;
+	            "linksOneHopMustContain": number;
+	            "linksOneHopMayContain": number;
+	            "linksOneHopDoesNotContain": number;
+	            "linksRecursiveMustContain": number;
+	            "linksRecursiveMayContain": number;
+	            "linksRecursiveDoesNotContain": number;
+	        };
+	    };
+	    LogicalOperation: {
+	        enumValues: {
+	            "nONE": number;
+	            "aND": number;
+	            "oR": number;
+	        };
+	    };
+	    ProjectReference: {
+	        fields: any;
+	    };
+	    ProvisioningActionType: {
+	        enumValues: {
+	            "import": number;
+	            "validate": number;
+	        };
+	    };
+	    ProvisioningResult: {
+	        fields: any;
+	    };
+	    QueryExpand: {
+	        enumValues: {
+	            "none": number;
+	            "wiql": number;
+	            "clauses": number;
+	            "all": number;
+	        };
+	    };
+	    QueryHierarchyItem: {
+	        fields: any;
+	    };
+	    QueryResultType: {
+	        enumValues: {
+	            "workItem": number;
+	            "workItemLink": number;
+	        };
+	    };
+	    QueryType: {
+	        enumValues: {
+	            "flat": number;
+	            "tree": number;
+	            "oneHop": number;
+	        };
+	    };
+	    ReportingWorkItemLink: {
+	        fields: any;
+	    };
+	    ReportingWorkItemLinksBatch: {
+	        fields: any;
+	    };
+	    ReportingWorkItemRevisionsBatch: {
+	        fields: any;
+	    };
+	    ReportingWorkItemRevisionsFilter: {
+	        fields: any;
+	    };
+	    StreamedBatch: {
+	        fields: any;
+	    };
+	    TemplateType: {
+	        enumValues: {
+	            "workItemType": number;
+	            "globalWorkflow": number;
+	        };
+	    };
+	    TreeNodeStructureType: {
+	        enumValues: {
+	            "area": number;
+	            "iteration": number;
+	        };
+	    };
+	    TreeStructureGroup: {
+	        enumValues: {
+	            "areas": number;
+	            "iterations": number;
+	        };
+	    };
+	    Wiql: {
+	        fields: any;
+	    };
+	    WorkItem: {
+	        fields: any;
+	    };
+	    WorkItemClassificationNode: {
+	        fields: any;
+	    };
+	    WorkItemExpand: {
+	        enumValues: {
+	            "none": number;
+	            "relations": number;
+	            "fields": number;
+	            "all": number;
+	        };
+	    };
+	    WorkItemField: {
+	        fields: any;
+	    };
+	    WorkItemFieldOperation: {
+	        fields: any;
+	    };
+	    WorkItemFieldReference: {
+	        fields: any;
+	    };
+	    WorkItemFieldUpdate: {
+	        fields: any;
+	    };
+	    WorkItemHistory: {
+	        fields: any;
+	    };
+	    WorkItemLink: {
+	        fields: any;
+	    };
+	    WorkItemQueryClause: {
+	        fields: any;
+	    };
+	    WorkItemQueryResult: {
+	        fields: any;
+	    };
+	    WorkItemQuerySortColumn: {
+	        fields: any;
+	    };
+	    WorkItemReference: {
+	        fields: any;
+	    };
+	    WorkItemRelation: {
+	        fields: any;
+	    };
+	    WorkItemRelationType: {
+	        fields: any;
+	    };
+	    WorkItemRelationUpdates: {
+	        fields: any;
+	    };
+	    WorkItemRevisionReference: {
+	        fields: any;
+	    };
+	    WorkItemTrackingReference: {
+	        fields: any;
+	    };
+	    WorkItemTrackingResource: {
+	        fields: any;
+	    };
+	    WorkItemTrackingResourceReference: {
+	        fields: any;
+	    };
+	    WorkItemType: {
+	        fields: any;
+	    };
+	    WorkItemTypeCategory: {
+	        fields: any;
+	    };
+	    WorkItemTypeFieldInstance: {
+	        fields: any;
+	    };
+	    WorkItemTypeReference: {
+	        fields: any;
+	    };
+	    WorkItemTypeTemplate: {
+	        fields: any;
+	    };
+	    WorkItemTypeTemplateUpdateModel: {
+	        fields: any;
+	    };
+	    WorkItemUpdate: {
+	        fields: any;
+	    };
+	};
+
+}
+declare module 'vso-node-api/WorkItemTrackingApi' {
+	/// <reference types="node" />
+	/// <reference types="Q" />
+	import Q = require('q');
+	import basem = require('vso-node-api/ClientApiBases');
+	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
+	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
+	import WorkItemTrackingInterfaces = require('vso-node-api/interfaces/WorkItemTrackingInterfaces');
+	export interface IWorkItemTrackingApi extends basem.ClientApiBase {
+	    createAttachment(customHeaders: any, contentStream: NodeJS.ReadableStream, fileName: string, uploadType: string, onResult: (err: any, statusCode: number, attachment: WorkItemTrackingInterfaces.AttachmentReference) => void): void;
+	    getAttachmentContent(id: string, fileName: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    getAttachmentZip(id: string, fileName: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    getRootNodes(project: string, depth: number, onResult: (err: any, statusCode: number, classificationNodes: WorkItemTrackingInterfaces.WorkItemClassificationNode[]) => void): void;
+	    createOrUpdateClassificationNode(postedNode: WorkItemTrackingInterfaces.WorkItemClassificationNode, project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path: string, onResult: (err: any, statusCode: number, classificationNode: WorkItemTrackingInterfaces.WorkItemClassificationNode) => void): void;
+	    deleteClassificationNode(project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path: string, reclassifyId: number, onResult: (err: any, statusCode: number) => void): void;
+	    getClassificationNode(project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path: string, depth: number, onResult: (err: any, statusCode: number, classificationNode: WorkItemTrackingInterfaces.WorkItemClassificationNode) => void): void;
+	    updateClassificationNode(postedNode: WorkItemTrackingInterfaces.WorkItemClassificationNode, project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path: string, onResult: (err: any, statusCode: number, classificationNode: WorkItemTrackingInterfaces.WorkItemClassificationNode) => void): void;
+	    getField(field: string, onResult: (err: any, statusCode: number, field: WorkItemTrackingInterfaces.WorkItemField) => void): void;
+	    getFields(onResult: (err: any, statusCode: number, fields: WorkItemTrackingInterfaces.WorkItemField[]) => void): void;
+	    getHistory(id: number, top: number, skip: number, onResult: (err: any, statusCode: number, history: WorkItemTrackingInterfaces.WorkItemHistory[]) => void): void;
+	    getHistoryById(id: number, revisionNumber: number, onResult: (err: any, statusCode: number, history: WorkItemTrackingInterfaces.WorkItemHistory) => void): void;
+	    createQuery(postedQuery: WorkItemTrackingInterfaces.QueryHierarchyItem, project: string, query: string, onResult: (err: any, statusCode: number, querie: WorkItemTrackingInterfaces.QueryHierarchyItem) => void): void;
+	    deleteQuery(project: string, query: string, onResult: (err: any, statusCode: number) => void): void;
+	    getQueries(project: string, expand: WorkItemTrackingInterfaces.QueryExpand, depth: number, includeDeleted: boolean, onResult: (err: any, statusCode: number, queries: WorkItemTrackingInterfaces.QueryHierarchyItem[]) => void): void;
+	    getQuery(project: string, query: string, expand: WorkItemTrackingInterfaces.QueryExpand, depth: number, includeDeleted: boolean, onResult: (err: any, statusCode: number, querie: WorkItemTrackingInterfaces.QueryHierarchyItem) => void): void;
+	    updateQuery(queryUpdate: WorkItemTrackingInterfaces.QueryHierarchyItem, project: string, query: string, undeleteDescendants: boolean, onResult: (err: any, statusCode: number, querie: WorkItemTrackingInterfaces.QueryHierarchyItem) => void): void;
+	    getRevision(id: number, revisionNumber: number, expand: WorkItemTrackingInterfaces.WorkItemExpand, onResult: (err: any, statusCode: number, revision: WorkItemTrackingInterfaces.WorkItem) => void): void;
+	    getRevisions(id: number, top: number, skip: number, expand: WorkItemTrackingInterfaces.WorkItemExpand, onResult: (err: any, statusCode: number, revisions: WorkItemTrackingInterfaces.WorkItem[]) => void): void;
+	    evaluateRulesOnField(ruleEngineInput: WorkItemTrackingInterfaces.FieldsToEvaluate, onResult: (err: any, statusCode: number) => void): void;
+	    getUpdate(id: number, updateNumber: number, onResult: (err: any, statusCode: number, update: WorkItemTrackingInterfaces.WorkItemUpdate) => void): void;
+	    getUpdates(id: number, top: number, skip: number, onResult: (err: any, statusCode: number, updates: WorkItemTrackingInterfaces.WorkItemUpdate[]) => void): void;
+	    queryByWiql(wiql: WorkItemTrackingInterfaces.Wiql, project: string, onResult: (err: any, statusCode: number, wiql: WorkItemTrackingInterfaces.WorkItemQueryResult) => void): void;
+	    queryById(id: string, project: string, onResult: (err: any, statusCode: number, wiql: WorkItemTrackingInterfaces.WorkItemQueryResult) => void): void;
+	    getReportingLinks(project: string, types: string[], watermark: number, onResult: (err: any, statusCode: number, workItemLink: WorkItemTrackingInterfaces.ReportingWorkItemLinksBatch) => void): void;
+	    getRelationType(relation: string, onResult: (err: any, statusCode: number, workItemRelationType: WorkItemTrackingInterfaces.WorkItemRelationType) => void): void;
+	    getRelationTypes(onResult: (err: any, statusCode: number, workItemRelationTypes: WorkItemTrackingInterfaces.WorkItemRelationType[]) => void): void;
+	    readReportingRevisionsGet(project: string, fields: string[], types: string[], watermark: number, onResult: (err: any, statusCode: number, workItemRevision: WorkItemTrackingInterfaces.ReportingWorkItemRevisionsBatch) => void): void;
+	    readReportingRevisionsPost(filter: WorkItemTrackingInterfaces.ReportingWorkItemRevisionsFilter, project: string, watermark: number, onResult: (err: any, statusCode: number, workItemRevision: WorkItemTrackingInterfaces.ReportingWorkItemRevisionsBatch) => void): void;
+	    getWorkItem(id: number, fields: string[], asOf: Date, expand: WorkItemTrackingInterfaces.WorkItemExpand, onResult: (err: any, statusCode: number, workItem: WorkItemTrackingInterfaces.WorkItem) => void): void;
+	    getWorkItems(ids: number[], fields: string[], asOf: Date, expand: WorkItemTrackingInterfaces.WorkItemExpand, onResult: (err: any, statusCode: number, workItems: WorkItemTrackingInterfaces.WorkItem[]) => void): void;
+	    updateWorkItem(customHeaders: any, document: VSSInterfaces.JsonPatchDocument, id: number, validateOnly: boolean, bypassRules: boolean, onResult: (err: any, statusCode: number, workItem: WorkItemTrackingInterfaces.WorkItem) => void): void;
+	    getWorkItemTemplate(project: string, type: string, fields: string, asOf: Date, expand: WorkItemTrackingInterfaces.WorkItemExpand, onResult: (err: any, statusCode: number, workItem: WorkItemTrackingInterfaces.WorkItem) => void): void;
+	    updateWorkItemTemplate(customHeaders: any, document: VSSInterfaces.JsonPatchDocument, project: string, type: string, validateOnly: boolean, bypassRules: boolean, onResult: (err: any, statusCode: number, workItem: WorkItemTrackingInterfaces.WorkItem) => void): void;
+	    getWorkItemTypeCategories(project: string, onResult: (err: any, statusCode: number, workItemTypeCategories: WorkItemTrackingInterfaces.WorkItemTypeCategory[]) => void): void;
+	    getWorkItemTypeCategory(project: string, category: string, onResult: (err: any, statusCode: number, workItemTypeCategorie: WorkItemTrackingInterfaces.WorkItemTypeCategory) => void): void;
+	    getWorkItemType(project: string, type: string, onResult: (err: any, statusCode: number, workItemType: WorkItemTrackingInterfaces.WorkItemType) => void): void;
+	    getWorkItemTypes(project: string, onResult: (err: any, statusCode: number, workItemTypes: WorkItemTrackingInterfaces.WorkItemType[]) => void): void;
+	    getDependentFields(project: string, type: string, field: string, onResult: (err: any, statusCode: number, workItemTypesField: WorkItemTrackingInterfaces.FieldDependentRule) => void): void;
+	    exportWorkItemTypeDefinition(project: string, type: string, exportGlobalLists: boolean, onResult: (err: any, statusCode: number, workItemTypeTemplate: WorkItemTrackingInterfaces.WorkItemTypeTemplate) => void): void;
+	    updateWorkItemTypeDefinition(updateModel: WorkItemTrackingInterfaces.WorkItemTypeTemplateUpdateModel, project: string, onResult: (err: any, statusCode: number, workItemTypeTemplate: WorkItemTrackingInterfaces.ProvisioningResult) => void): void;
+	}
+	export interface IQWorkItemTrackingApi extends basem.QClientApiBase {
+	    createAttachment(customHeaders: any, contentStream: NodeJS.ReadableStream, fileName?: string, uploadType?: string): Q.Promise<WorkItemTrackingInterfaces.AttachmentReference>;
+	    getRootNodes(project: string, depth?: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemClassificationNode[]>;
+	    createOrUpdateClassificationNode(postedNode: WorkItemTrackingInterfaces.WorkItemClassificationNode, project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path?: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemClassificationNode>;
+	    getClassificationNode(project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path?: string, depth?: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemClassificationNode>;
+	    updateClassificationNode(postedNode: WorkItemTrackingInterfaces.WorkItemClassificationNode, project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path?: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemClassificationNode>;
+	    getField(field: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemField>;
+	    getFields(): Q.Promise<WorkItemTrackingInterfaces.WorkItemField[]>;
+	    getHistory(id: number, top?: number, skip?: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemHistory[]>;
+	    getHistoryById(id: number, revisionNumber: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemHistory>;
+	    createQuery(postedQuery: WorkItemTrackingInterfaces.QueryHierarchyItem, project: string, query: string): Q.Promise<WorkItemTrackingInterfaces.QueryHierarchyItem>;
+	    getQueries(project: string, expand?: WorkItemTrackingInterfaces.QueryExpand, depth?: number, includeDeleted?: boolean): Q.Promise<WorkItemTrackingInterfaces.QueryHierarchyItem[]>;
+	    getQuery(project: string, query: string, expand?: WorkItemTrackingInterfaces.QueryExpand, depth?: number, includeDeleted?: boolean): Q.Promise<WorkItemTrackingInterfaces.QueryHierarchyItem>;
+	    updateQuery(queryUpdate: WorkItemTrackingInterfaces.QueryHierarchyItem, project: string, query: string, undeleteDescendants?: boolean): Q.Promise<WorkItemTrackingInterfaces.QueryHierarchyItem>;
+	    getRevision(id: number, revisionNumber: number, expand?: WorkItemTrackingInterfaces.WorkItemExpand): Q.Promise<WorkItemTrackingInterfaces.WorkItem>;
+	    getRevisions(id: number, top?: number, skip?: number, expand?: WorkItemTrackingInterfaces.WorkItemExpand): Q.Promise<WorkItemTrackingInterfaces.WorkItem[]>;
+	    getUpdate(id: number, updateNumber: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemUpdate>;
+	    getUpdates(id: number, top?: number, skip?: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemUpdate[]>;
+	    queryByWiql(wiql: WorkItemTrackingInterfaces.Wiql, project?: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemQueryResult>;
+	    queryById(id: string, project?: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemQueryResult>;
+	    getReportingLinks(project?: string, types?: string[], watermark?: number): Q.Promise<WorkItemTrackingInterfaces.ReportingWorkItemLinksBatch>;
+	    getRelationType(relation: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemRelationType>;
+	    getRelationTypes(): Q.Promise<WorkItemTrackingInterfaces.WorkItemRelationType[]>;
+	    readReportingRevisionsGet(project?: string, fields?: string[], types?: string[], watermark?: number): Q.Promise<WorkItemTrackingInterfaces.ReportingWorkItemRevisionsBatch>;
+	    readReportingRevisionsPost(filter: WorkItemTrackingInterfaces.ReportingWorkItemRevisionsFilter, project?: string, watermark?: number): Q.Promise<WorkItemTrackingInterfaces.ReportingWorkItemRevisionsBatch>;
+	    getWorkItem(id: number, fields?: string[], asOf?: Date, expand?: WorkItemTrackingInterfaces.WorkItemExpand): Q.Promise<WorkItemTrackingInterfaces.WorkItem>;
+	    getWorkItems(ids: number[], fields?: string[], asOf?: Date, expand?: WorkItemTrackingInterfaces.WorkItemExpand): Q.Promise<WorkItemTrackingInterfaces.WorkItem[]>;
+	    updateWorkItem(customHeaders: any, document: VSSInterfaces.JsonPatchDocument, id: number, validateOnly?: boolean, bypassRules?: boolean): Q.Promise<WorkItemTrackingInterfaces.WorkItem>;
+	    getWorkItemTemplate(project: string, type: string, fields?: string, asOf?: Date, expand?: WorkItemTrackingInterfaces.WorkItemExpand): Q.Promise<WorkItemTrackingInterfaces.WorkItem>;
+	    updateWorkItemTemplate(customHeaders: any, document: VSSInterfaces.JsonPatchDocument, project: string, type: string, validateOnly?: boolean, bypassRules?: boolean): Q.Promise<WorkItemTrackingInterfaces.WorkItem>;
+	    getWorkItemTypeCategories(project: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemTypeCategory[]>;
+	    getWorkItemTypeCategory(project: string, category: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemTypeCategory>;
+	    getWorkItemType(project: string, type: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemType>;
+	    getWorkItemTypes(project: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemType[]>;
+	    getDependentFields(project: string, type: string, field: string): Q.Promise<WorkItemTrackingInterfaces.FieldDependentRule>;
+	    exportWorkItemTypeDefinition(project?: string, type?: string, exportGlobalLists?: boolean): Q.Promise<WorkItemTrackingInterfaces.WorkItemTypeTemplate>;
+	    updateWorkItemTypeDefinition(updateModel: WorkItemTrackingInterfaces.WorkItemTypeTemplateUpdateModel, project?: string): Q.Promise<WorkItemTrackingInterfaces.ProvisioningResult>;
+	}
+	export class WorkItemTrackingApi extends basem.ClientApiBase implements IWorkItemTrackingApi {
+	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
+	    /**
+	     * Creates an attachment.
+	     *
+	     * @param {NodeJS.ReadableStream} contentStream
+	     * @param {string} fileName
+	     * @param {string} uploadType
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.AttachmentReference
+	     */
+	    createAttachment(customHeaders: any, contentStream: NodeJS.ReadableStream, fileName: string, uploadType: string, onResult: (err: any, statusCode: number, attachment: WorkItemTrackingInterfaces.AttachmentReference) => void): void;
+	    /**
+	     * Returns an attachment
+	     *
+	     * @param {string} id
+	     * @param {string} fileName
+	     * @param onResult callback function with the resulting ArrayBuffer
+	     */
+	    getAttachmentContent(id: string, fileName: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    /**
+	     * Returns an attachment
+	     *
+	     * @param {string} id
+	     * @param {string} fileName
+	     * @param onResult callback function with the resulting ArrayBuffer
+	     */
+	    getAttachmentZip(id: string, fileName: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {number} depth
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemClassificationNode[]
+	     */
+	    getRootNodes(project: string, depth: number, onResult: (err: any, statusCode: number, classificationNodes: WorkItemTrackingInterfaces.WorkItemClassificationNode[]) => void): void;
+	    /**
+	     * @param {WorkItemTrackingInterfaces.WorkItemClassificationNode} postedNode
+	     * @param {string} project - Project ID or project name
+	     * @param {WorkItemTrackingInterfaces.TreeStructureGroup} structureGroup
+	     * @param {string} path
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemClassificationNode
+	     */
+	    createOrUpdateClassificationNode(postedNode: WorkItemTrackingInterfaces.WorkItemClassificationNode, project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path: string, onResult: (err: any, statusCode: number, classificationNode: WorkItemTrackingInterfaces.WorkItemClassificationNode) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {WorkItemTrackingInterfaces.TreeStructureGroup} structureGroup
+	     * @param {string} path
+	     * @param {number} reclassifyId
+	     * @param onResult callback function
+	     */
+	    deleteClassificationNode(project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path: string, reclassifyId: number, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {WorkItemTrackingInterfaces.TreeStructureGroup} structureGroup
+	     * @param {string} path
+	     * @param {number} depth
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemClassificationNode
+	     */
+	    getClassificationNode(project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path: string, depth: number, onResult: (err: any, statusCode: number, classificationNode: WorkItemTrackingInterfaces.WorkItemClassificationNode) => void): void;
+	    /**
+	     * @param {WorkItemTrackingInterfaces.WorkItemClassificationNode} postedNode
+	     * @param {string} project - Project ID or project name
+	     * @param {WorkItemTrackingInterfaces.TreeStructureGroup} structureGroup
+	     * @param {string} path
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemClassificationNode
+	     */
+	    updateClassificationNode(postedNode: WorkItemTrackingInterfaces.WorkItemClassificationNode, project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path: string, onResult: (err: any, statusCode: number, classificationNode: WorkItemTrackingInterfaces.WorkItemClassificationNode) => void): void;
+	    /**
+	     * @param {string} field
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemField
+	     */
+	    getField(field: string, onResult: (err: any, statusCode: number, field: WorkItemTrackingInterfaces.WorkItemField) => void): void;
+	    /**
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemField[]
+	     */
+	    getFields(onResult: (err: any, statusCode: number, fields: WorkItemTrackingInterfaces.WorkItemField[]) => void): void;
+	    /**
+	     * Returns history of all revision for a given work item ID
+	     *
+	     * @param {number} id
+	     * @param {number} top
+	     * @param {number} skip
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemHistory[]
+	     */
+	    getHistory(id: number, top: number, skip: number, onResult: (err: any, statusCode: number, history: WorkItemTrackingInterfaces.WorkItemHistory[]) => void): void;
+	    /**
+	     * Returns the history value of particular revision
+	     *
+	     * @param {number} id
+	     * @param {number} revisionNumber
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemHistory
+	     */
+	    getHistoryById(id: number, revisionNumber: number, onResult: (err: any, statusCode: number, history: WorkItemTrackingInterfaces.WorkItemHistory) => void): void;
+	    /**
+	     * Creates a query, or moves a query.
+	     *
+	     * @param {WorkItemTrackingInterfaces.QueryHierarchyItem} postedQuery - The query to create.
+	     * @param {string} project - Project ID or project name
+	     * @param {string} query - The parent path for the query to create.
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.QueryHierarchyItem
+	     */
+	    createQuery(postedQuery: WorkItemTrackingInterfaces.QueryHierarchyItem, project: string, query: string, onResult: (err: any, statusCode: number, querie: WorkItemTrackingInterfaces.QueryHierarchyItem) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {string} query
+	     * @param onResult callback function
+	     */
+	    deleteQuery(project: string, query: string, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * Retrieves all queries the user has access to in the current project
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {WorkItemTrackingInterfaces.QueryExpand} expand
+	     * @param {number} depth
+	     * @param {boolean} includeDeleted
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.QueryHierarchyItem[]
+	     */
+	    getQueries(project: string, expand: WorkItemTrackingInterfaces.QueryExpand, depth: number, includeDeleted: boolean, onResult: (err: any, statusCode: number, queries: WorkItemTrackingInterfaces.QueryHierarchyItem[]) => void): void;
+	    /**
+	     * Retrieves a single query by project and either id or path
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {string} query
+	     * @param {WorkItemTrackingInterfaces.QueryExpand} expand
+	     * @param {number} depth
+	     * @param {boolean} includeDeleted
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.QueryHierarchyItem
+	     */
+	    getQuery(project: string, query: string, expand: WorkItemTrackingInterfaces.QueryExpand, depth: number, includeDeleted: boolean, onResult: (err: any, statusCode: number, querie: WorkItemTrackingInterfaces.QueryHierarchyItem) => void): void;
+	    /**
+	     * @param {WorkItemTrackingInterfaces.QueryHierarchyItem} queryUpdate
+	     * @param {string} project - Project ID or project name
+	     * @param {string} query
+	     * @param {boolean} undeleteDescendants
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.QueryHierarchyItem
+	     */
+	    updateQuery(queryUpdate: WorkItemTrackingInterfaces.QueryHierarchyItem, project: string, query: string, undeleteDescendants: boolean, onResult: (err: any, statusCode: number, querie: WorkItemTrackingInterfaces.QueryHierarchyItem) => void): void;
+	    /**
+	     * Returns a fully hydrated work item for the requested revision
+	     *
+	     * @param {number} id
+	     * @param {number} revisionNumber
+	     * @param {WorkItemTrackingInterfaces.WorkItemExpand} expand
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItem
+	     */
+	    getRevision(id: number, revisionNumber: number, expand: WorkItemTrackingInterfaces.WorkItemExpand, onResult: (err: any, statusCode: number, revision: WorkItemTrackingInterfaces.WorkItem) => void): void;
+	    /**
+	     * Returns the list of fully hydrated work item revisions, paged.
+	     *
+	     * @param {number} id
+	     * @param {number} top
+	     * @param {number} skip
+	     * @param {WorkItemTrackingInterfaces.WorkItemExpand} expand
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItem[]
+	     */
+	    getRevisions(id: number, top: number, skip: number, expand: WorkItemTrackingInterfaces.WorkItemExpand, onResult: (err: any, statusCode: number, revisions: WorkItemTrackingInterfaces.WorkItem[]) => void): void;
+	    /**
+	     * Validates the fields values.
+	     *
+	     * @param {WorkItemTrackingInterfaces.FieldsToEvaluate} ruleEngineInput
+	     * @param onResult callback function
+	     */
+	    evaluateRulesOnField(ruleEngineInput: WorkItemTrackingInterfaces.FieldsToEvaluate, onResult: (err: any, statusCode: number) => void): void;
+	    /**
+	     * Returns a single update for a work item
+	     *
+	     * @param {number} id
+	     * @param {number} updateNumber
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemUpdate
+	     */
+	    getUpdate(id: number, updateNumber: number, onResult: (err: any, statusCode: number, update: WorkItemTrackingInterfaces.WorkItemUpdate) => void): void;
+	    /**
+	     * Returns a the deltas between work item revisions
+	     *
+	     * @param {number} id
+	     * @param {number} top
+	     * @param {number} skip
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemUpdate[]
+	     */
+	    getUpdates(id: number, top: number, skip: number, onResult: (err: any, statusCode: number, updates: WorkItemTrackingInterfaces.WorkItemUpdate[]) => void): void;
+	    /**
+	     * Gets the results of the query.
+	     *
+	     * @param {WorkItemTrackingInterfaces.Wiql} wiql - The query containing the wiql.
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemQueryResult
+	     */
+	    queryByWiql(wiql: WorkItemTrackingInterfaces.Wiql, project: string, onResult: (err: any, statusCode: number, wiql: WorkItemTrackingInterfaces.WorkItemQueryResult) => void): void;
+	    /**
+	     * Gets the results of the query by id.
+	     *
+	     * @param {string} id - The query id.
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemQueryResult
+	     */
+	    queryById(id: string, project: string, onResult: (err: any, statusCode: number, wiql: WorkItemTrackingInterfaces.WorkItemQueryResult) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {string[]} types
+	     * @param {number} watermark
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.ReportingWorkItemLinksBatch
+	     */
+	    getReportingLinks(project: string, types: string[], watermark: number, onResult: (err: any, statusCode: number, workItemLink: WorkItemTrackingInterfaces.ReportingWorkItemLinksBatch) => void): void;
+	    /**
+	     * Gets the work item relation types.
+	     *
+	     * @param {string} relation
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemRelationType
+	     */
+	    getRelationType(relation: string, onResult: (err: any, statusCode: number, workItemRelationType: WorkItemTrackingInterfaces.WorkItemRelationType) => void): void;
+	    /**
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemRelationType[]
+	     */
+	    getRelationTypes(onResult: (err: any, statusCode: number, workItemRelationTypes: WorkItemTrackingInterfaces.WorkItemRelationType[]) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param {string[]} fields
+	     * @param {string[]} types
+	     * @param {number} watermark
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.ReportingWorkItemRevisionsBatch
+	     */
+	    readReportingRevisionsGet(project: string, fields: string[], types: string[], watermark: number, onResult: (err: any, statusCode: number, workItemRevision: WorkItemTrackingInterfaces.ReportingWorkItemRevisionsBatch) => void): void;
+	    /**
+	     * @param {WorkItemTrackingInterfaces.ReportingWorkItemRevisionsFilter} filter
+	     * @param {string} project - Project ID or project name
+	     * @param {number} watermark
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.ReportingWorkItemRevisionsBatch
+	     */
+	    readReportingRevisionsPost(filter: WorkItemTrackingInterfaces.ReportingWorkItemRevisionsFilter, project: string, watermark: number, onResult: (err: any, statusCode: number, workItemRevision: WorkItemTrackingInterfaces.ReportingWorkItemRevisionsBatch) => void): void;
+	    /**
+	     * Returns a single work item
+	     *
+	     * @param {number} id
+	     * @param {string[]} fields
+	     * @param {Date} asOf
+	     * @param {WorkItemTrackingInterfaces.WorkItemExpand} expand
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItem
+	     */
+	    getWorkItem(id: number, fields: string[], asOf: Date, expand: WorkItemTrackingInterfaces.WorkItemExpand, onResult: (err: any, statusCode: number, workItem: WorkItemTrackingInterfaces.WorkItem) => void): void;
+	    /**
+	     * Returns a list of work items
+	     *
+	     * @param {number[]} ids
+	     * @param {string[]} fields
+	     * @param {Date} asOf
+	     * @param {WorkItemTrackingInterfaces.WorkItemExpand} expand
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItem[]
+	     */
+	    getWorkItems(ids: number[], fields: string[], asOf: Date, expand: WorkItemTrackingInterfaces.WorkItemExpand, onResult: (err: any, statusCode: number, workItems: WorkItemTrackingInterfaces.WorkItem[]) => void): void;
+	    /**
+	     * @param {VSSInterfaces.JsonPatchDocument} document
+	     * @param {number} id
+	     * @param {boolean} validateOnly
+	     * @param {boolean} bypassRules
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItem
+	     */
+	    updateWorkItem(customHeaders: any, document: VSSInterfaces.JsonPatchDocument, id: number, validateOnly: boolean, bypassRules: boolean, onResult: (err: any, statusCode: number, workItem: WorkItemTrackingInterfaces.WorkItem) => void): void;
+	    /**
+	     * Returns a single work item from a template
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {string} type
+	     * @param {string} fields
+	     * @param {Date} asOf
+	     * @param {WorkItemTrackingInterfaces.WorkItemExpand} expand
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItem
+	     */
+	    getWorkItemTemplate(project: string, type: string, fields: string, asOf: Date, expand: WorkItemTrackingInterfaces.WorkItemExpand, onResult: (err: any, statusCode: number, workItem: WorkItemTrackingInterfaces.WorkItem) => void): void;
+	    /**
+	     * @param {VSSInterfaces.JsonPatchDocument} document
+	     * @param {string} project - Project ID or project name
+	     * @param {string} type
+	     * @param {boolean} validateOnly
+	     * @param {boolean} bypassRules
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItem
+	     */
+	    updateWorkItemTemplate(customHeaders: any, document: VSSInterfaces.JsonPatchDocument, project: string, type: string, validateOnly: boolean, bypassRules: boolean, onResult: (err: any, statusCode: number, workItem: WorkItemTrackingInterfaces.WorkItem) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemTypeCategory[]
+	     */
+	    getWorkItemTypeCategories(project: string, onResult: (err: any, statusCode: number, workItemTypeCategories: WorkItemTrackingInterfaces.WorkItemTypeCategory[]) => void): void;
+	    /**
+	     * Returns a the deltas between work item revisions
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {string} category
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemTypeCategory
+	     */
+	    getWorkItemTypeCategory(project: string, category: string, onResult: (err: any, statusCode: number, workItemTypeCategorie: WorkItemTrackingInterfaces.WorkItemTypeCategory) => void): void;
+	    /**
+	     * Returns a the deltas between work item revisions
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {string} type
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemType
+	     */
+	    getWorkItemType(project: string, type: string, onResult: (err: any, statusCode: number, workItemType: WorkItemTrackingInterfaces.WorkItemType) => void): void;
+	    /**
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemType[]
+	     */
+	    getWorkItemTypes(project: string, onResult: (err: any, statusCode: number, workItemTypes: WorkItemTrackingInterfaces.WorkItemType[]) => void): void;
+	    /**
+	     * Returns the dependent fields for the corresponding workitem type and fieldname
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {string} type
+	     * @param {string} field
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.FieldDependentRule
+	     */
+	    getDependentFields(project: string, type: string, field: string, onResult: (err: any, statusCode: number, workItemTypesField: WorkItemTrackingInterfaces.FieldDependentRule) => void): void;
+	    /**
+	     * Export work item type
+	     *
+	     * @param {string} project - Project ID or project name
+	     * @param {string} type
+	     * @param {boolean} exportGlobalLists
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemTypeTemplate
+	     */
+	    exportWorkItemTypeDefinition(project: string, type: string, exportGlobalLists: boolean, onResult: (err: any, statusCode: number, workItemTypeTemplate: WorkItemTrackingInterfaces.WorkItemTypeTemplate) => void): void;
+	    /**
+	     * Add/updates a work item type
+	     *
+	     * @param {WorkItemTrackingInterfaces.WorkItemTypeTemplateUpdateModel} updateModel
+	     * @param {string} project - Project ID or project name
+	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.ProvisioningResult
+	     */
+	    updateWorkItemTypeDefinition(updateModel: WorkItemTrackingInterfaces.WorkItemTypeTemplateUpdateModel, project: string, onResult: (err: any, statusCode: number, workItemTypeTemplate: WorkItemTrackingInterfaces.ProvisioningResult) => void): void;
+	}
+	export class QWorkItemTrackingApi extends basem.QClientApiBase implements IQWorkItemTrackingApi {
+	    api: WorkItemTrackingApi;
+	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
+	    /**
+	    * Creates an attachment.
+	    *
+	    * @param {NodeJS.ReadableStream} contentStream
+	    * @param {string} fileName
+	    * @param {string} uploadType
+	    */
+	    createAttachment(customHeaders: any, contentStream: NodeJS.ReadableStream, fileName?: string, uploadType?: string): Q.Promise<WorkItemTrackingInterfaces.AttachmentReference>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {number} depth
+	    */
+	    getRootNodes(project: string, depth?: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemClassificationNode[]>;
+	    /**
+	    * @param {WorkItemTrackingInterfaces.WorkItemClassificationNode} postedNode
+	    * @param {string} project - Project ID or project name
+	    * @param {WorkItemTrackingInterfaces.TreeStructureGroup} structureGroup
+	    * @param {string} path
+	    */
+	    createOrUpdateClassificationNode(postedNode: WorkItemTrackingInterfaces.WorkItemClassificationNode, project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path?: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemClassificationNode>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {WorkItemTrackingInterfaces.TreeStructureGroup} structureGroup
+	    * @param {string} path
+	    * @param {number} depth
+	    */
+	    getClassificationNode(project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path?: string, depth?: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemClassificationNode>;
+	    /**
+	    * @param {WorkItemTrackingInterfaces.WorkItemClassificationNode} postedNode
+	    * @param {string} project - Project ID or project name
+	    * @param {WorkItemTrackingInterfaces.TreeStructureGroup} structureGroup
+	    * @param {string} path
+	    */
+	    updateClassificationNode(postedNode: WorkItemTrackingInterfaces.WorkItemClassificationNode, project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path?: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemClassificationNode>;
+	    /**
+	    * @param {string} field
+	    */
+	    getField(field: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemField>;
+	    /**
+	    */
+	    getFields(): Q.Promise<WorkItemTrackingInterfaces.WorkItemField[]>;
+	    /**
+	    * Returns history of all revision for a given work item ID
+	    *
+	    * @param {number} id
+	    * @param {number} top
+	    * @param {number} skip
+	    */
+	    getHistory(id: number, top?: number, skip?: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemHistory[]>;
+	    /**
+	    * Returns the history value of particular revision
+	    *
+	    * @param {number} id
+	    * @param {number} revisionNumber
+	    */
+	    getHistoryById(id: number, revisionNumber: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemHistory>;
+	    /**
+	    * Creates a query, or moves a query.
+	    *
+	    * @param {WorkItemTrackingInterfaces.QueryHierarchyItem} postedQuery - The query to create.
+	    * @param {string} project - Project ID or project name
+	    * @param {string} query - The parent path for the query to create.
+	    */
+	    createQuery(postedQuery: WorkItemTrackingInterfaces.QueryHierarchyItem, project: string, query: string): Q.Promise<WorkItemTrackingInterfaces.QueryHierarchyItem>;
+	    /**
+	    * Retrieves all queries the user has access to in the current project
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {WorkItemTrackingInterfaces.QueryExpand} expand
+	    * @param {number} depth
+	    * @param {boolean} includeDeleted
+	    */
+	    getQueries(project: string, expand?: WorkItemTrackingInterfaces.QueryExpand, depth?: number, includeDeleted?: boolean): Q.Promise<WorkItemTrackingInterfaces.QueryHierarchyItem[]>;
+	    /**
+	    * Retrieves a single query by project and either id or path
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {string} query
+	    * @param {WorkItemTrackingInterfaces.QueryExpand} expand
+	    * @param {number} depth
+	    * @param {boolean} includeDeleted
+	    */
+	    getQuery(project: string, query: string, expand?: WorkItemTrackingInterfaces.QueryExpand, depth?: number, includeDeleted?: boolean): Q.Promise<WorkItemTrackingInterfaces.QueryHierarchyItem>;
+	    /**
+	    * @param {WorkItemTrackingInterfaces.QueryHierarchyItem} queryUpdate
+	    * @param {string} project - Project ID or project name
+	    * @param {string} query
+	    * @param {boolean} undeleteDescendants
+	    */
+	    updateQuery(queryUpdate: WorkItemTrackingInterfaces.QueryHierarchyItem, project: string, query: string, undeleteDescendants?: boolean): Q.Promise<WorkItemTrackingInterfaces.QueryHierarchyItem>;
+	    /**
+	    * Returns a fully hydrated work item for the requested revision
+	    *
+	    * @param {number} id
+	    * @param {number} revisionNumber
+	    * @param {WorkItemTrackingInterfaces.WorkItemExpand} expand
+	    */
+	    getRevision(id: number, revisionNumber: number, expand?: WorkItemTrackingInterfaces.WorkItemExpand): Q.Promise<WorkItemTrackingInterfaces.WorkItem>;
+	    /**
+	    * Returns the list of fully hydrated work item revisions, paged.
+	    *
+	    * @param {number} id
+	    * @param {number} top
+	    * @param {number} skip
+	    * @param {WorkItemTrackingInterfaces.WorkItemExpand} expand
+	    */
+	    getRevisions(id: number, top?: number, skip?: number, expand?: WorkItemTrackingInterfaces.WorkItemExpand): Q.Promise<WorkItemTrackingInterfaces.WorkItem[]>;
+	    /**
+	    * Returns a single update for a work item
+	    *
+	    * @param {number} id
+	    * @param {number} updateNumber
+	    */
+	    getUpdate(id: number, updateNumber: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemUpdate>;
+	    /**
+	    * Returns a the deltas between work item revisions
+	    *
+	    * @param {number} id
+	    * @param {number} top
+	    * @param {number} skip
+	    */
+	    getUpdates(id: number, top?: number, skip?: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemUpdate[]>;
+	    /**
+	    * Gets the results of the query.
+	    *
+	    * @param {WorkItemTrackingInterfaces.Wiql} wiql - The query containing the wiql.
+	    * @param {string} project - Project ID or project name
+	    */
+	    queryByWiql(wiql: WorkItemTrackingInterfaces.Wiql, project?: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemQueryResult>;
+	    /**
+	    * Gets the results of the query by id.
+	    *
+	    * @param {string} id - The query id.
+	    * @param {string} project - Project ID or project name
+	    */
+	    queryById(id: string, project?: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemQueryResult>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {string[]} types
+	    * @param {number} watermark
+	    */
+	    getReportingLinks(project?: string, types?: string[], watermark?: number): Q.Promise<WorkItemTrackingInterfaces.ReportingWorkItemLinksBatch>;
+	    /**
+	    * Gets the work item relation types.
+	    *
+	    * @param {string} relation
+	    */
+	    getRelationType(relation: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemRelationType>;
+	    /**
+	    */
+	    getRelationTypes(): Q.Promise<WorkItemTrackingInterfaces.WorkItemRelationType[]>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    * @param {string[]} fields
+	    * @param {string[]} types
+	    * @param {number} watermark
+	    */
+	    readReportingRevisionsGet(project?: string, fields?: string[], types?: string[], watermark?: number): Q.Promise<WorkItemTrackingInterfaces.ReportingWorkItemRevisionsBatch>;
+	    /**
+	    * @param {WorkItemTrackingInterfaces.ReportingWorkItemRevisionsFilter} filter
+	    * @param {string} project - Project ID or project name
+	    * @param {number} watermark
+	    */
+	    readReportingRevisionsPost(filter: WorkItemTrackingInterfaces.ReportingWorkItemRevisionsFilter, project?: string, watermark?: number): Q.Promise<WorkItemTrackingInterfaces.ReportingWorkItemRevisionsBatch>;
+	    /**
+	    * Returns a single work item
+	    *
+	    * @param {number} id
+	    * @param {string[]} fields
+	    * @param {Date} asOf
+	    * @param {WorkItemTrackingInterfaces.WorkItemExpand} expand
+	    */
+	    getWorkItem(id: number, fields?: string[], asOf?: Date, expand?: WorkItemTrackingInterfaces.WorkItemExpand): Q.Promise<WorkItemTrackingInterfaces.WorkItem>;
+	    /**
+	    * Returns a list of work items
+	    *
+	    * @param {number[]} ids
+	    * @param {string[]} fields
+	    * @param {Date} asOf
+	    * @param {WorkItemTrackingInterfaces.WorkItemExpand} expand
+	    */
+	    getWorkItems(ids: number[], fields?: string[], asOf?: Date, expand?: WorkItemTrackingInterfaces.WorkItemExpand): Q.Promise<WorkItemTrackingInterfaces.WorkItem[]>;
+	    /**
+	    * @param {VSSInterfaces.JsonPatchDocument} document
+	    * @param {number} id
+	    * @param {boolean} validateOnly
+	    * @param {boolean} bypassRules
+	    */
+	    updateWorkItem(customHeaders: any, document: VSSInterfaces.JsonPatchDocument, id: number, validateOnly?: boolean, bypassRules?: boolean): Q.Promise<WorkItemTrackingInterfaces.WorkItem>;
+	    /**
+	    * Returns a single work item from a template
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {string} type
+	    * @param {string} fields
+	    * @param {Date} asOf
+	    * @param {WorkItemTrackingInterfaces.WorkItemExpand} expand
+	    */
+	    getWorkItemTemplate(project: string, type: string, fields?: string, asOf?: Date, expand?: WorkItemTrackingInterfaces.WorkItemExpand): Q.Promise<WorkItemTrackingInterfaces.WorkItem>;
+	    /**
+	    * @param {VSSInterfaces.JsonPatchDocument} document
+	    * @param {string} project - Project ID or project name
+	    * @param {string} type
+	    * @param {boolean} validateOnly
+	    * @param {boolean} bypassRules
+	    */
+	    updateWorkItemTemplate(customHeaders: any, document: VSSInterfaces.JsonPatchDocument, project: string, type: string, validateOnly?: boolean, bypassRules?: boolean): Q.Promise<WorkItemTrackingInterfaces.WorkItem>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    */
+	    getWorkItemTypeCategories(project: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemTypeCategory[]>;
+	    /**
+	    * Returns a the deltas between work item revisions
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {string} category
+	    */
+	    getWorkItemTypeCategory(project: string, category: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemTypeCategory>;
+	    /**
+	    * Returns a the deltas between work item revisions
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {string} type
+	    */
+	    getWorkItemType(project: string, type: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemType>;
+	    /**
+	    * @param {string} project - Project ID or project name
+	    */
+	    getWorkItemTypes(project: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemType[]>;
+	    /**
+	    * Returns the dependent fields for the corresponding workitem type and fieldname
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {string} type
+	    * @param {string} field
+	    */
+	    getDependentFields(project: string, type: string, field: string): Q.Promise<WorkItemTrackingInterfaces.FieldDependentRule>;
+	    /**
+	    * Export work item type
+	    *
+	    * @param {string} project - Project ID or project name
+	    * @param {string} type
+	    * @param {boolean} exportGlobalLists
+	    */
+	    exportWorkItemTypeDefinition(project?: string, type?: string, exportGlobalLists?: boolean): Q.Promise<WorkItemTrackingInterfaces.WorkItemTypeTemplate>;
+	    /**
+	    * Add/updates a work item type
+	    *
+	    * @param {WorkItemTrackingInterfaces.WorkItemTypeTemplateUpdateModel} updateModel
+	    * @param {string} project - Project ID or project name
+	    */
+	    updateWorkItemTypeDefinition(updateModel: WorkItemTrackingInterfaces.WorkItemTypeTemplateUpdateModel, project?: string): Q.Promise<WorkItemTrackingInterfaces.ProvisioningResult>;
+	}
+
+}
+declare module 'vso-node-api/handlers/apiversion' {
+	/// <reference types="node" />
+	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
+	export class ApiVersionHandler implements VsoBaseInterfaces.IRequestHandler {
+	    apiVersion: string;
+	    constructor(apiVersion: string);
+	    prepareRequest(options: any): void;
+	}
+
+}
+declare module 'vso-node-api/handlers/basiccreds' {
+	/// <reference types="node" />
+	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
+	export class BasicCredentialHandler implements VsoBaseInterfaces.IRequestHandler {
+	    username: string;
+	    password: string;
+	    constructor(username: string, password: string);
+	    prepareRequest(options: any): void;
+	}
+
+}
+declare module 'vso-node-api/handlers/bearertoken' {
+	/// <reference types="node" />
+	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
+	export class BearerCredentialHandler implements VsoBaseInterfaces.IRequestHandler {
+	    token: string;
+	    constructor(token: string);
+	    prepareRequest(options: any): void;
+	}
+
+}
+declare module 'vso-node-api/WebApi' {
+	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
+	import buildm = require('vso-node-api/BuildApi');
+	import corem = require('vso-node-api/CoreApi');
+	import filecontainerm = require('vso-node-api/FileContainerApi');
+	import gallerym = require('vso-node-api/GalleryApi');
+	import gitm = require('vso-node-api/GitApi');
+	import taskagentm = require('vso-node-api/TaskAgentApi');
+	import taskm = require('vso-node-api/TaskApi');
+	import testm = require('vso-node-api/TestApi');
+	import tfvcm = require('vso-node-api/TfvcApi');
+	import workitemtrackingm = require('vso-node-api/WorkItemTrackingApi');
+	import apivm = require('vso-node-api/handlers/apiversion');
+	import basicm = require('vso-node-api/handlers/basiccreds');
+	import bearm = require('vso-node-api/handlers/bearertoken');
+	/**
+	 * Methods to return handler objects (see handlers folder)
+	 */
+	export function getVersionHandler(apiVersion: string): apivm.ApiVersionHandler;
+	export function getBasicHandler(username: string, password: string): basicm.BasicCredentialHandler;
+	export function getBearerHandler(token: any): bearm.BearerCredentialHandler;
+	export class WebApi {
+	    serverUrl: string;
+	    authHandler: VsoBaseInterfaces.IRequestHandler;
+	    constructor(serverUrl: string, authHandler: VsoBaseInterfaces.IRequestHandler);
+	    /**
+	     * Each factory method can take a serverUrl and a list of handlers
+	     * if these aren't provided, the default url and auth handler given to the constructor for this class will be used
+	     */
+	    getBuildApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): buildm.IBuildApi;
+	    /**
+	     * Each API has a method here to create the "vanilla" API as well as one with a Q Promise wrapper.
+	     */
+	    getQBuildApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): buildm.IQBuildApi;
+	    getCoreApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): corem.ICoreApi;
+	    getQCoreApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): corem.IQCoreApi;
+	    getFileContainerApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): filecontainerm.IFileContainerApi;
+	    getQFileContainerApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): filecontainerm.IQFileContainerApi;
+	    getGalleryApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): gallerym.IGalleryApi;
+	    getQGalleryApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): gallerym.IQGalleryApi;
+	    getGitApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): gitm.IGitApi;
+	    getQGitApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): gitm.IQGitApi;
+	    getTaskApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): taskm.ITaskApi;
+	    getQTaskApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): taskm.IQTaskApi;
+	    getTaskAgentApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): taskagentm.ITaskAgentApi;
+	    getQTaskAgentApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): taskagentm.IQTaskAgentApi;
+	    getTestApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): testm.ITestApi;
+	    getQTestApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): testm.IQTestApi;
+	    getTfvcApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): tfvcm.ITfvcApi;
+	    getQTfvcApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): tfvcm.IQTfvcApi;
+	    getWorkItemTrackingApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): workitemtrackingm.IWorkItemTrackingApi;
+	    getQWorkItemTrackingApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): workitemtrackingm.IQWorkItemTrackingApi;
+	}
+
+}
diff --git a/vso-node-api/tsconfig.json b/vso-node-api/tsconfig.json
new file mode 100644
index 0000000000..8fdc8255ba
--- /dev/null
+++ b/vso-node-api/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "vso-node-api-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/vso-node-api/vso-node-api-tests.ts b/vso-node-api/vso-node-api-tests.ts
index 3e0d4f977c..f1102002b6 100644
--- a/vso-node-api/vso-node-api-tests.ts
+++ b/vso-node-api/vso-node-api-tests.ts
@@ -3,7 +3,7 @@
 // Verify that the new user agent names are printed when running this file.
 // This just verifies that the WebApi is instantiating the APIs correctly... up to you to test that they actually work.
 
-/// <reference path="vso-node-api.d.ts" />
+
 
 import webapim = require('vso-node-api/WebApi');
 import basem = require('vso-node-api/ClientApiBases');
diff --git a/vso-node-api/vso-node-api.d.ts b/vso-node-api/vso-node-api.d.ts
deleted file mode 100644
index 55fd857703..0000000000
--- a/vso-node-api/vso-node-api.d.ts
+++ /dev/null
@@ -1,13436 +0,0 @@
-// Type definitions for vso-node-api v0.3.2
-// Project: https://github.com/Microsoft/vso-node-api
-// Definitions by: Teddy Ward <https://github.com/teddyward>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../q/Q.d.ts" />
-declare module 'vso-node-api/Serialization' {
-	/**
-	* Metadata for deserializing an enum field on a contract/type
-	*/
-	export interface ContractEnumMetadata {
-	    enumValues?: {
-	        [name: string]: number;
-	    };
-	}
-	export interface SerializationData {
-	    requestTypeMetadata?: ContractMetadata;
-	    responseTypeMetadata?: ContractMetadata;
-	    responseIsCollection: boolean;
-	}
-	/**
-	* Metadata for deserializing a particular field on a contract/type
-	*/
-	export interface ContractFieldMetadata {
-	    isArray?: boolean;
-	    isDate?: boolean;
-	    enumType?: ContractEnumMetadata;
-	    typeInfo?: ContractMetadata;
-	    isDictionary?: boolean;
-	    dictionaryKeyIsDate?: boolean;
-	    dictionaryValueIsDate?: boolean;
-	    dictionaryKeyEnumType?: ContractEnumMetadata;
-	    dictionaryValueEnumType?: ContractEnumMetadata;
-	    dictionaryValueTypeInfo?: ContractMetadata;
-	    dictionaryValueFieldInfo?: ContractFieldMetadata;
-	}
-	/**
-	* Metadata required for deserializing a given type
-	*/
-	export interface ContractMetadata {
-	    fields?: {
-	        [fieldName: string]: ContractFieldMetadata;
-	    };
-	}
-	export interface IWebApiArrayResult {
-	    count: number;
-	    value: any[];
-	}
-	/**
-	* Module for handling serialization and deserialization of data contracts
-	* (contracts sent from the server using the VSO default REST api serialization settings)
-	*/
-	export module ContractSerializer {
-	    /**
-	     * Process a contract in its raw form (e.g. date fields are Dates, and Enums are numbers) and
-	     * return a pure JSON object that can be posted to REST endpoint.
-	     *
-	     * @param data The object to serialize
-	     * @param contractMetadata The type info/metadata for the contract type being serialized
-	     * @param preserveOriginal If true, don't modify the original object. False modifies the original object (the return value points to the data argument).
-	     */
-	    function serialize(data: any, contractMetadata: ContractMetadata, preserveOriginal?: boolean): any;
-	    /**
-	     * Process a pure JSON object (e.g. that came from a REST call) and transform it into a JS object
-	     * where date strings are converted to Date objects and enum values are converted from strings into
-	     * their numerical value.
-	     *
-	     * @param data The object to deserialize
-	     * @param contractMetadata The type info/metadata for the contract type being deserialize
-	     * @param preserveOriginal If true, don't modify the original object. False modifies the original object (the return value points to the data argument).
-	     * @param unwrapWrappedCollections If true check for wrapped arrays (REST apis will not return arrays directly as the root result but will instead wrap them in a { values: [], count: 0 } object.
-	     */
-	    function deserialize(data: any, contractMetadata: ContractMetadata, preserveOriginal?: boolean, unwrapWrappedCollections?: boolean): any;
-	}
-
-}
-declare module 'vso-node-api/interfaces/common/VsoBaseInterfaces' {
-	import Serialization = require('vso-node-api/Serialization');
-	/**
-	 * Information about the location of a REST API resource
-	 */
-	export interface ApiResourceLocation {
-	    /**
-	     * Area name for this resource
-	     */
-	    area: string;
-	    /**
-	     * Unique Identifier for this location
-	     */
-	    id: string;
-	    /**
-	     * Maximum api version that this resource supports (current server version for this resource)
-	     */
-	    maxVersion: string;
-	    /**
-	     * Minimum api version that this resource supports
-	     */
-	    minVersion: string;
-	    /**
-	     * The latest version of this resource location that is in "Release" (non-preview) mode
-	     */
-	    releasedVersion: string;
-	    /**
-	     * Resource name
-	     */
-	    resourceName: string;
-	    /**
-	     * The current resource version supported by this resource location
-	     */
-	    resourceVersion: number;
-	    /**
-	     * This location's route template (templated relative path)
-	     */
-	    routeTemplate: string;
-	}
-	export interface IBasicCredentials {
-	    username: string;
-	    password: string;
-	}
-	export interface IRequestHandler {
-	    prepareRequest(options: any): void;
-	}
-	export interface IHttpResponse {
-	    statusCode?: number;
-	    headers: any;
-	}
-	export interface IQCoreApi {
-	    connect(): Q.Promise<void>;
-	}
-	export interface IHttpClient {
-	    get(verb: string, requestUrl: string, headers: any, onResult: (err: any, res: IHttpResponse, contents: string) => void): void;
-	    send(verb: string, requestUrl: string, objs: any, headers: any, onResult: (err: any, res: IHttpResponse, contents: string) => void): void;
-	    sendFile(verb: string, requestUrl: string, content: NodeJS.ReadableStream, headers: any, onResult: (err: any, res: IHttpResponse, contents: string) => void): void;
-	    getStream(requestUrl: string, apiVersion: string, headers: any, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    makeAcceptHeader(type: string, apiVersion: string): string;
-	    request(protocol: any, options: any, body: any, onResult: (err: any, res: IHttpResponse, contents: string) => void): void;
-	}
-	export interface IRestClient {
-	    baseUrl: string;
-	    httpClient: IHttpClient;
-	    getJson(relativeUrl: string, apiVersion: string, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	    getJsonWrappedArray(relativeUrl: string, apiVersion: string, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	    options(requestUrl: string, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	    create(relativeUrl: string, apiVersion: string, resources: any, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	    createJsonWrappedArray(relativeUrl: string, apiVersion: string, resources: any[], serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	    update(relativeUrl: string, apiVersion: string, resources: any, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	    updateJsonWrappedArray(relativeUrl: string, apiVersion: string, resources: any[], serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	    uploadFile(verb: string, relativeUrl: string, apiVersion: string, filePath: string, customHeaders: any, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	    uploadStream(verb: string, relativeUrl: string, apiVersion: string, contentStream: NodeJS.ReadableStream, customHeaders: any, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	    replace(relativeUrl: string, apiVersion: string, resources: any, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	}
-
-}
-declare module 'vso-node-api/HttpClient' {
-	/// <reference path="../node/node.d.ts" />
-	import http = require("http");
-	import ifm = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
-	export class HttpClient implements ifm.IHttpClient {
-	    userAgent: string;
-	    handlers: ifm.IRequestHandler[];
-	    socketTimeout: number;
-	    constructor(userAgent: string, handlers?: ifm.IRequestHandler[], socketTimeout?: number);
-	    get(verb: string, requestUrl: string, headers: any, onResult: (err: any, res: http.ClientResponse, contents: string) => void): void;
-	    send(verb: string, requestUrl: string, objs: any, headers: any, onResult: (err: any, res: http.ClientResponse, contents: string) => void): void;
-	    sendFile(verb: string, requestUrl: string, content: NodeJS.ReadableStream, headers: any, onResult: (err: any, res: http.ClientResponse, contents: string) => void): void;
-	    getStream(requestUrl: string, apiVersion: string, type: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    makeAcceptHeader(type: string, apiVersion: string): string;
-	    _getOptions(method: string, requestUrl: string, headers: any): any;
-	    request(protocol: any, options: any, objs: any, onResult: (err: any, res: http.ClientResponse, contents: string) => void): void;
-	}
-
-}
-declare module 'vso-node-api/RestClient' {
-	/// <reference path="../node/node.d.ts" />
-	import ifm = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
-	import Serialization = require('vso-node-api/Serialization');
-	export function processResponse(url: any, res: any, contents: any, serializationData: Serialization.SerializationData, onResult: any): void;
-	export function enumToString(enumType: any, enumValue: number, camelCase: boolean): any;
-	export class RestClient implements ifm.IRestClient {
-	    baseUrl: string;
-	    basePath: string;
-	    httpClient: ifm.IHttpClient;
-	    constructor(httpClient: ifm.IHttpClient);
-	    getJson(url: string, apiVersion: string, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	    getJsonWrappedArray(url: string, apiVersion: string, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	    options(url: string, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	    delete(url: string, apiVersion: string, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	    create(url: string, apiVersion: string, resources: any, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	    createJsonWrappedArray(url: string, apiVersion: string, resources: any[], serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, resources: any[]) => void): void;
-	    update(url: string, apiVersion: string, resources: any, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	    updateJsonWrappedArray(url: string, apiVersion: string, resources: any[], serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, resources: any[]) => void): void;
-	    uploadFile(verb: string, url: string, apiVersion: string, filePath: string, customHeaders: any, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	    uploadStream(verb: string, url: string, apiVersion: string, contentStream: NodeJS.ReadableStream, customHeaders: any, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	    replace(url: string, apiVersion: string, resources: any, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	    _sendWrappedJson(verb: string, url: string, apiVersion: string, resources: any[], serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, resources: any[]) => void): void;
-	    _getJson(verb: string, url: string, apiVersion: string, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	    _sendJson(verb: string, url: string, apiVersion: string, data: any, serializationData: Serialization.SerializationData, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	}
-
-}
-declare module 'vso-node-api/VsoClient' {
-	/// <reference path="../q/Q.d.ts" />
-	import Q = require("q");
-	import restm = require('vso-node-api/RestClient');
-	import ifm = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
-	export interface ClientVersioningData {
-	    /**
-	    * The api version string to send in the request (e.g. "1.0" or "2.0-preview.2")
-	    */
-	    apiVersion?: string;
-	    /**
-	    * The request path string to send the request to.  Looked up via an options request with the location id.
-	    */
-	    requestUrl?: string;
-	}
-	export class InvalidApiResourceVersionError implements Error {
-	    name: string;
-	    message: string;
-	    constructor(message?: string);
-	}
-	/**
-	* Base class that should be used (derived from) to make requests to VSS REST apis
-	*/
-	export class VsoClient {
-	    private static APIS_RELATIVE_PATH;
-	    private static PREVIEW_INDICATOR;
-	    private _locationsByAreaPromises;
-	    private _initializationPromise;
-	    restClient: ifm.IRestClient;
-	    baseUrl: string;
-	    basePath: string;
-	    constructor(baseUrl: string, restClient: restm.RestClient);
-	    /**
-	    * Compares the version on the server (locationVersion) to the api version given by the client (apiVersion).
-	    * Returns a negative value if the location version is older (less than) the api version
-	    * Returns 0 if the two are equal
-	    * Returns a positive value if the location version is newer (greater than) the api version
-	    */
-	    private compareResourceVersions(locationVersion, apiVersion);
-	    /**
-	    * Gets the route template for a resource based on its location ID and negotiates the api version
-	    */
-	    getVersioningData(apiVersion: string, area: string, locationId: string, routeValues: any, queryParams?: any): Q.Promise<ClientVersioningData>;
-	    /**
-	     * Sets a promise that is waited on before any requests are issued. Can be used to asynchronously
-	     * set the request url and auth token manager.
-	     */
-	    _setInitializationPromise(promise: Q.Promise<any>): void;
-	    /**
-	     * Gets information about an API resource location (route template, supported versions, etc.)
-	     *
-	     * @param area resource area name
-	     * @param locationId Guid of the location to get
-	     */
-	    _beginGetLocation(area: string, locationId: string): Q.Promise<ifm.ApiResourceLocation>;
-	    private beginGetAreaLocations(area);
-	    resolveUrl(relativeUrl: string): string;
-	    /**
-	    * Issues an OPTIONS request to get location objects from a location id
-	    */
-	    _issueOptionsRequest(requestUrl: string, onResult: (err: any, statusCode: number, locationsResult: any) => void): void;
-	    protected getRequestUrl(routeTemplate: string, area: string, resource: string, routeValues: any, queryParams?: any): string;
-	    private replaceRouteValues(routeTemplate, routeValues);
-	    _getLinkResponseHeaders(xhr: XMLHttpRequest): {
-	        [relName: string]: string;
-	    };
-	}
-
-}
-declare module 'vso-node-api/ClientApiBases' {
-	import Q = require('q');
-	import restm = require('vso-node-api/RestClient');
-	import httpm = require('vso-node-api/HttpClient');
-	import vsom = require('vso-node-api/VsoClient');
-	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
-	export class ClientApiBase {
-	    baseUrl: string;
-	    userAgent: string;
-	    httpClient: httpm.HttpClient;
-	    restClient: restm.RestClient;
-	    vsoClient: vsom.VsoClient;
-	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[], userAgent?: string);
-	    setUserAgent(userAgent: string): void;
-	    connect(onResult: (err: any, statusCode: number, obj: any) => void): void;
-	}
-	export class QClientApiBase {
-	    api: ClientApiBase;
-	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[], api: typeof ClientApiBase);
-	    connect(): Q.Promise<any>;
-	}
-
-}
-declare module 'vso-node-api/interfaces/common/TfsInterfaces' {
-	export interface TeamProjectCollectionReference {
-	    id: string;
-	    name: string;
-	    url: string;
-	}
-	export interface TeamProjectReference {
-	    abbreviation: string;
-	    description: string;
-	    id: string;
-	    name: string;
-	    revision: number;
-	    state: any;
-	    url: string;
-	}
-	export interface WebApiConnectedServiceRef {
-	    id: string;
-	    url: string;
-	}
-	export var TypeInfo: {
-	    TeamProjectCollectionReference: {
-	        fields: any;
-	    };
-	    TeamProjectReference: {
-	        fields: any;
-	    };
-	    WebApiConnectedServiceRef: {
-	        fields: any;
-	    };
-	};
-
-}
-declare module 'vso-node-api/interfaces/common/VSSInterfaces' {
-	export interface IdentityRef {
-	    displayName: string;
-	    id: string;
-	    imageUrl: string;
-	    isAadIdentity: boolean;
-	    isContainer: boolean;
-	    profileUrl: string;
-	    uniqueName: string;
-	    url: string;
-	}
-	export interface JsonPatchDocument {
-	}
-	/**
-	 * The JSON model for a JSON Patch operation
-	 */
-	export interface JsonPatchOperation {
-	    /**
-	     * The path to copy from for the Move/Copy operation.
-	     */
-	    from: string;
-	    /**
-	     * The patch operation
-	     */
-	    op: Operation;
-	    /**
-	     * The path for the operation
-	     */
-	    path: string;
-	    /**
-	     * The value for the operation. This is either a primitive or a JToken.
-	     */
-	    value: any;
-	}
-	export enum Operation {
-	    Add = 0,
-	    Remove = 1,
-	    Replace = 2,
-	    Move = 3,
-	    Copy = 4,
-	    Test = 5,
-	}
-	export interface ResourceRef {
-	    id: string;
-	    url: string;
-	}
-	export interface VssJsonCollectionWrapper extends VssJsonCollectionWrapperBase {
-	    value: any[];
-	}
-	export interface VssJsonCollectionWrapperV<T> extends VssJsonCollectionWrapperBase {
-	    value: T;
-	}
-	export interface VssJsonCollectionWrapperBase {
-	    count: number;
-	}
-	export var TypeInfo: {
-	    IdentityRef: {
-	        fields: any;
-	    };
-	    JsonPatchDocument: {
-	        fields: any;
-	    };
-	    JsonPatchOperation: {
-	        fields: any;
-	    };
-	    Operation: {
-	        enumValues: {
-	            "add": number;
-	            "remove": number;
-	            "replace": number;
-	            "move": number;
-	            "copy": number;
-	            "test": number;
-	        };
-	    };
-	    OperationReference: {
-	        fields: any;
-	    };
-	    ResourceRef: {
-	        fields: any;
-	    };
-	    VssJsonCollectionWrapper: {
-	        fields: any;
-	    };
-	    VssJsonCollectionWrapperV: {
-	        fields: any;
-	    };
-	    VssJsonCollectionWrapperBase: {
-	        fields: any;
-	    };
-	};
-
-}
-declare module 'vso-node-api/interfaces/BuildInterfaces' {
-	import TfsInterfaces = require('vso-node-api/interfaces/common/TfsInterfaces');
-	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
-	export interface AgentPoolQueue extends ShallowReference {
-	    _links: any;
-	    /**
-	     * The pool used by this queue.
-	     */
-	    pool: TaskAgentPoolReference;
-	}
-	export enum AgentStatus {
-	    /**
-	     * Indicates that the build agent cannot be contacted.
-	     */
-	    Unavailable = 0,
-	    /**
-	     * Indicates that the build agent is currently available.
-	     */
-	    Available = 1,
-	    /**
-	     * Indicates that the build agent has taken itself offline.
-	     */
-	    Offline = 2,
-	}
-	export interface ArtifactResource {
-	    /**
-	     * The type-specific resource data. For example, "#/10002/5/drop", "$/drops/5", "\\myshare\myfolder\mydrops\5"
-	     */
-	    data: string;
-	    /**
-	     * Link to the resource. This might include things like query parameters to download as a zip file
-	     */
-	    downloadUrl: string;
-	    /**
-	     * The type of the resource: File container, version control folder, UNC path, etc.
-	     */
-	    type: string;
-	    /**
-	     * Link to the resource
-	     */
-	    url: string;
-	}
-	export enum AuditAction {
-	    Add = 1,
-	    Update = 2,
-	    Delete = 3,
-	}
-	/**
-	 * Data representation of a build
-	 */
-	export interface Build {
-	    _links: any;
-	    /**
-	     * Build number/name of the build
-	     */
-	    buildNumber: string;
-	    /**
-	     * The build controller. This should only be set if the definition type is Xaml.
-	     */
-	    controller: BuildController;
-	    /**
-	     * The definition associated with the build
-	     */
-	    definition: DefinitionReference;
-	    /**
-	     * Indicates whether the build has been deleted.
-	     */
-	    deleted: boolean;
-	    /**
-	     * Demands
-	     */
-	    demands: any[];
-	    /**
-	     * Time that the build was completed
-	     */
-	    finishTime: Date;
-	    /**
-	     * Id of the build
-	     */
-	    id: number;
-	    keepForever: boolean;
-	    /**
-	     * Process or person that last changed the build
-	     */
-	    lastChangedBy: VSSInterfaces.IdentityRef;
-	    /**
-	     * Date the build was last changed
-	     */
-	    lastChangedDate: Date;
-	    /**
-	     * Log location of the build
-	     */
-	    logs: BuildLogReference;
-	    /**
-	     * Orchestration plan for the build
-	     */
-	    orchestrationPlan: TaskOrchestrationPlanReference;
-	    /**
-	     * Parameters for the build
-	     */
-	    parameters: string;
-	    /**
-	     * The build's priority
-	     */
-	    priority: QueuePriority;
-	    /**
-	     * The team project
-	     */
-	    project: TfsInterfaces.TeamProjectReference;
-	    properties: any;
-	    /**
-	     * Quality of the xaml build (good, bad, etc.)
-	     */
-	    quality: string;
-	    /**
-	     * The queue. This should only be set if the definition type is Build.
-	     */
-	    queue: AgentPoolQueue;
-	    /**
-	     * Queue option of the build.
-	     */
-	    queueOptions: QueueOptions;
-	    /**
-	     * The current position of the build in the queue
-	     */
-	    queuePosition: number;
-	    /**
-	     * Time that the build was queued
-	     */
-	    queueTime: Date;
-	    /**
-	     * Reason that the build was created
-	     */
-	    reason: BuildReason;
-	    /**
-	     * The repository
-	     */
-	    repository: BuildRepository;
-	    /**
-	     * The identity that queued the build
-	     */
-	    requestedBy: VSSInterfaces.IdentityRef;
-	    /**
-	     * The identity on whose behalf the build was queued
-	     */
-	    requestedFor: VSSInterfaces.IdentityRef;
-	    /**
-	     * The build result
-	     */
-	    result: BuildResult;
-	    /**
-	     * Source branch
-	     */
-	    sourceBranch: string;
-	    /**
-	     * Source version
-	     */
-	    sourceVersion: string;
-	    /**
-	     * Time that the build was started
-	     */
-	    startTime: Date;
-	    /**
-	     * Status of the build
-	     */
-	    status: BuildStatus;
-	    tags: string[];
-	    /**
-	     * Uri of the build
-	     */
-	    uri: string;
-	    /**
-	     * REST url of the build
-	     */
-	    url: string;
-	    validationResults: BuildRequestValidationResult[];
-	}
-	export interface BuildAgent {
-	    buildDirectory: string;
-	    controller: ShallowReference;
-	    createdDate: Date;
-	    description: string;
-	    enabled: boolean;
-	    id: number;
-	    messageQueueUrl: string;
-	    name: string;
-	    reservedForBuild: string;
-	    server: ShallowReference;
-	    status: AgentStatus;
-	    statusMessage: string;
-	    updatedDate: Date;
-	    uri: string;
-	    url: string;
-	}
-	export interface BuildArtifact {
-	    /**
-	     * The artifact id
-	     */
-	    id: number;
-	    /**
-	     * The name of the artifact
-	     */
-	    name: string;
-	    /**
-	     * The actual resource
-	     */
-	    resource: ArtifactResource;
-	}
-	export enum BuildAuthorizationScope {
-	    /**
-	     * The identity used should have build service account permissions scoped to the project collection. This is useful when resources for a single build are spread across multiple projects.
-	     */
-	    ProjectCollection = 1,
-	    /**
-	     * The identity used should have build service account permissions scoped to the project in which the build definition resides. This is useful for isolation of build jobs to a particular team project to avoid any unintentional escalation of privilege attacks during a build.
-	     */
-	    Project = 2,
-	}
-	export interface BuildCompletedEvent extends BuildUpdatedEvent {
-	}
-	export interface BuildController extends ShallowReference {
-	    _links: any;
-	    /**
-	     * The date the controller was created.
-	     */
-	    createdDate: Date;
-	    /**
-	     * The description of the controller.
-	     */
-	    description: string;
-	    /**
-	     * Indicates whether the controller is enabled.
-	     */
-	    enabled: boolean;
-	    /**
-	     * The status of the controller.
-	     */
-	    status: ControllerStatus;
-	    /**
-	     * The date the controller was last updated.
-	     */
-	    updatedDate: Date;
-	    /**
-	     * The controller's URI.
-	     */
-	    uri: string;
-	}
-	export interface BuildDefinition extends BuildDefinitionReference {
-	    _links: any;
-	    /**
-	     * Indicates whether badges are enabled for this definition
-	     */
-	    badgeEnabled: boolean;
-	    build: BuildDefinitionStep[];
-	    /**
-	     * The build number format
-	     */
-	    buildNumberFormat: string;
-	    /**
-	     * The comment entered when saving the definition
-	     */
-	    comment: string;
-	    /**
-	     * The date the definition was created
-	     */
-	    createdDate: Date;
-	    demands: any[];
-	    /**
-	     * The description
-	     */
-	    description: string;
-	    /**
-	     * The drop location for the definition
-	     */
-	    dropLocation: string;
-	    /**
-	     * Gets or sets the job authorization scope for builds which are queued against this definition
-	     */
-	    jobAuthorizationScope: BuildAuthorizationScope;
-	    /**
-	     * Gets or sets the job execution timeout in minutes for builds which are queued against this definition
-	     */
-	    jobTimeoutInMinutes: number;
-	    options: BuildOption[];
-	    properties: any;
-	    /**
-	     * The repository
-	     */
-	    repository: BuildRepository;
-	    retentionRules: RetentionPolicy[];
-	    triggers: BuildTrigger[];
-	    variables: {
-	        [key: string]: BuildDefinitionVariable;
-	    };
-	}
-	export interface BuildDefinitionChangedEvent {
-	    changeType: AuditAction;
-	    definition: BuildDefinition;
-	}
-	export interface BuildDefinitionChangingEvent {
-	    changeType: AuditAction;
-	    newDefinition: BuildDefinition;
-	    originalDefinition: BuildDefinition;
-	}
-	export interface BuildDefinitionReference extends DefinitionReference {
-	    /**
-	     * The author of the definition.
-	     */
-	    authoredBy: VSSInterfaces.IdentityRef;
-	    /**
-	     * If this is a draft definition, it might have a parent
-	     */
-	    draftOf: DefinitionReference;
-	    /**
-	     * The quality of the definition document (draft, etc.)
-	     */
-	    quality: DefinitionQuality;
-	    /**
-	     * The default queue which should be used for requests.
-	     */
-	    queue: AgentPoolQueue;
-	}
-	export interface BuildDefinitionRevision {
-	    changedBy: VSSInterfaces.IdentityRef;
-	    changedDate: Date;
-	    changeType: AuditAction;
-	    comment: string;
-	    definitionUrl: string;
-	    name: string;
-	    revision: number;
-	}
-	export interface BuildDefinitionSourceProvider {
-	    /**
-	     * Uri of the associated definition
-	     */
-	    definitionUri: string;
-	    /**
-	     * fields associated with this build definition
-	     */
-	    fields: {
-	        [key: string]: string;
-	    };
-	    /**
-	     * Id of this source provider
-	     */
-	    id: number;
-	    /**
-	     * The lst time this source provider was modified
-	     */
-	    lastModified: Date;
-	    /**
-	     * Name of the source provider
-	     */
-	    name: string;
-	    /**
-	     * Which trigger types are supported by this definition source provider
-	     */
-	    supportedTriggerTypes: DefinitionTriggerType;
-	}
-	export interface BuildDefinitionStep {
-	    alwaysRun: boolean;
-	    continueOnError: boolean;
-	    displayName: string;
-	    enabled: boolean;
-	    inputs: {
-	        [key: string]: string;
-	    };
-	    task: TaskDefinitionReference;
-	}
-	export interface BuildDefinitionTemplate {
-	    canDelete: boolean;
-	    category: string;
-	    description: string;
-	    iconTaskId: string;
-	    id: string;
-	    name: string;
-	    template: BuildDefinition;
-	}
-	export interface BuildDefinitionVariable {
-	    allowOverride: boolean;
-	    isSecret: boolean;
-	    value: string;
-	}
-	export interface BuildDeletedEvent extends RealtimeBuildEvent {
-	    build: Build;
-	}
-	export interface BuildDeployment {
-	    deployment: BuildSummary;
-	    sourceBuild: ShallowReference;
-	}
-	/**
-	 * Represents a build log.
-	 */
-	export interface BuildLog extends BuildLogReference {
-	    /**
-	     * The date the log was created.
-	     */
-	    createdOn: Date;
-	    /**
-	     * The date the log was last changed.
-	     */
-	    lastChangedOn: Date;
-	    /**
-	     * The number of lines in the log.
-	     */
-	    lineCount: number;
-	}
-	/**
-	 * Data representation of a build log reference
-	 */
-	export interface BuildLogReference {
-	    /**
-	     * The id of the log.
-	     */
-	    id: number;
-	    /**
-	     * The type of the log location.
-	     */
-	    type: string;
-	    /**
-	     * Full link to the log resource.
-	     */
-	    url: string;
-	}
-	export interface BuildOption {
-	    definition: BuildOptionDefinitionReference;
-	    enabled: boolean;
-	    inputs: {
-	        [key: string]: string;
-	    };
-	}
-	export interface BuildOptionDefinition extends BuildOptionDefinitionReference {
-	    description: string;
-	    groups: BuildOptionGroupDefinition[];
-	    inputs: BuildOptionInputDefinition[];
-	    name: string;
-	    ordinal: number;
-	}
-	export interface BuildOptionDefinitionReference {
-	    id: string;
-	}
-	export interface BuildOptionGroupDefinition {
-	    displayName: string;
-	    isExpanded: boolean;
-	    name: string;
-	}
-	export interface BuildOptionInputDefinition {
-	    defaultValue: string;
-	    groupName: string;
-	    help: {
-	        [key: string]: string;
-	    };
-	    label: string;
-	    name: string;
-	    options: {
-	        [key: string]: string;
-	    };
-	    required: boolean;
-	    type: BuildOptionInputType;
-	    visibleRule: string;
-	}
-	export enum BuildOptionInputType {
-	    String = 0,
-	    Boolean = 1,
-	    StringList = 2,
-	    Radio = 3,
-	    PickList = 4,
-	    MultiLine = 5,
-	}
-	export enum BuildPhaseStatus {
-	    /**
-	     * The state is not known.
-	     */
-	    Unknown = 0,
-	    /**
-	     * The build phase completed unsuccessfully.
-	     */
-	    Failed = 1,
-	    /**
-	     * The build phase completed successfully.
-	     */
-	    Succeeded = 2,
-	}
-	export interface BuildProcessTemplate {
-	    description: string;
-	    fileExists: boolean;
-	    id: number;
-	    parameters: string;
-	    serverPath: string;
-	    supportedReasons: BuildReason;
-	    teamProject: string;
-	    templateType: ProcessTemplateType;
-	    url: string;
-	    version: string;
-	}
-	export enum BuildQueryOrder {
-	    /**
-	     * Order by finish time ascending.
-	     */
-	    FinishTimeAscending = 2,
-	    /**
-	     * Order by finish time descending.
-	     */
-	    FinishTimeDescending = 3,
-	}
-	export enum BuildReason {
-	    /**
-	     * No reason. This value should not be used.
-	     */
-	    None = 0,
-	    /**
-	     * The build was started manually.
-	     */
-	    Manual = 1,
-	    /**
-	     * The build was started for the trigger TriggerType.ContinuousIntegration.
-	     */
-	    IndividualCI = 2,
-	    /**
-	     * The build was started for the trigger TriggerType.BatchedContinuousIntegration.
-	     */
-	    BatchedCI = 4,
-	    /**
-	     * The build was started for the trigger TriggerType.Schedule.
-	     */
-	    Schedule = 8,
-	    /**
-	     * The build was created by a user.
-	     */
-	    UserCreated = 32,
-	    /**
-	     * The build was started manually for private validation.
-	     */
-	    ValidateShelveset = 64,
-	    /**
-	     * The build was started for the trigger ContinuousIntegrationType.Gated.
-	     */
-	    CheckInShelveset = 128,
-	    /**
-	     * The build was triggered for retention policy purposes.
-	     */
-	    Triggered = 175,
-	    /**
-	     * All reasons.
-	     */
-	    All = 239,
-	}
-	export interface BuildRepository {
-	    checkoutSubmodules: boolean;
-	    /**
-	     * Indicates whether to clean the target folder when getting code from the repository. This is a String so that it can reference variables.
-	     */
-	    clean: string;
-	    /**
-	     * Gets or sets the name of the default branch.
-	     */
-	    defaultBranch: string;
-	    id: string;
-	    /**
-	     * Gets or sets the friendly name of the repository.
-	     */
-	    name: string;
-	    properties: {
-	        [key: string]: string;
-	    };
-	    /**
-	     * Gets or sets the root folder.
-	     */
-	    rootFolder: string;
-	    /**
-	     * Gets or sets the type of the repository.
-	     */
-	    type: string;
-	    /**
-	     * Gets or sets the url of the repository.
-	     */
-	    url: string;
-	}
-	export interface BuildRequestValidationResult {
-	    message: string;
-	    result: ValidationResult;
-	}
-	export enum BuildResult {
-	    /**
-	     * No result
-	     */
-	    None = 0,
-	    /**
-	     * The build completed successfully.
-	     */
-	    Succeeded = 2,
-	    /**
-	     * The build completed compilation successfully but had other errors.
-	     */
-	    PartiallySucceeded = 4,
-	    /**
-	     * The build completed unsuccessfully.
-	     */
-	    Failed = 8,
-	    /**
-	     * The build was canceled before starting.
-	     */
-	    Canceled = 32,
-	}
-	export interface BuildServer {
-	    agents: ShallowReference[];
-	    controller: ShallowReference;
-	    id: number;
-	    isVirtual: boolean;
-	    messageQueueUrl: string;
-	    name: string;
-	    requireClientCertificates: boolean;
-	    status: ServiceHostStatus;
-	    statusChangedDate: Date;
-	    uri: string;
-	    url: string;
-	    version: number;
-	}
-	export interface BuildSettings {
-	    defaultRetentionPolicy: RetentionPolicy;
-	    maximumRetentionPolicy: RetentionPolicy;
-	}
-	export interface BuildStartedEvent extends BuildUpdatedEvent {
-	}
-	export enum BuildStatus {
-	    /**
-	     * No status.
-	     */
-	    None = 0,
-	    /**
-	     * The build is currently in progress.
-	     */
-	    InProgress = 1,
-	    /**
-	     * The build has completed.
-	     */
-	    Completed = 2,
-	    /**
-	     * The build is cancelling
-	     */
-	    Cancelling = 4,
-	    /**
-	     * The build is inactive in the queue.
-	     */
-	    Postponed = 8,
-	    /**
-	     * The build has not yet started.
-	     */
-	    NotStarted = 32,
-	    /**
-	     * All status.
-	     */
-	    All = 47,
-	}
-	export interface BuildSummary {
-	    build: ShallowReference;
-	    finishTime: Date;
-	    keepForever: boolean;
-	    quality: string;
-	    reason: BuildReason;
-	    requestedFor: VSSInterfaces.IdentityRef;
-	    startTime: Date;
-	    status: BuildStatus;
-	}
-	export interface BuildTrigger {
-	    triggerType: DefinitionTriggerType;
-	}
-	export interface BuildUpdatedEvent extends RealtimeBuildEvent {
-	    build: Build;
-	}
-	export interface BuildWorkspace {
-	    mappings: MappingDetails[];
-	}
-	/**
-	 * Represents a change associated with a build.
-	 */
-	export interface Change {
-	    /**
-	     * The author of the change.
-	     */
-	    author: VSSInterfaces.IdentityRef;
-	    /**
-	     * The location of a user-friendly representation of the resource.
-	     */
-	    displayUri: string;
-	    /**
-	     * Something that identifies the change. For a commit, this would be the SHA1. For a TFVC changeset, this would be the changeset id.
-	     */
-	    id: string;
-	    /**
-	     * The location of the full representation of the resource.
-	     */
-	    location: string;
-	    /**
-	     * A description of the change. This might be a commit message or changeset description.
-	     */
-	    message: string;
-	    /**
-	     * Indicates whether the message was truncated
-	     */
-	    messageTruncated: boolean;
-	    /**
-	     * A timestamp for the change.
-	     */
-	    timestamp: Date;
-	    /**
-	     * The type of change. "commit", "changeset", etc.
-	     */
-	    type: string;
-	}
-	export interface ConsoleLogEvent extends RealtimeBuildEvent {
-	    lines: string[];
-	    timelineId: string;
-	    timelineRecordId: string;
-	}
-	export interface ContinuousDeploymentDefinition {
-	    /**
-	     * The connected service associated with the continuous deployment
-	     */
-	    connectedService: TfsInterfaces.WebApiConnectedServiceRef;
-	    /**
-	     * The definition associated with the continuous deployment
-	     */
-	    definition: ShallowReference;
-	    gitBranch: string;
-	    hostedServiceName: string;
-	    project: TfsInterfaces.TeamProjectReference;
-	    repositoryId: string;
-	    storageAccountName: string;
-	    subscriptionId: string;
-	    website: string;
-	    webspace: string;
-	}
-	export interface ContinuousIntegrationTrigger extends BuildTrigger {
-	    batchChanges: boolean;
-	    branchFilters: string[];
-	}
-	export enum ControllerStatus {
-	    /**
-	     * Indicates that the build controller cannot be contacted.
-	     */
-	    Unavailable = 0,
-	    /**
-	     * Indicates that the build controller is currently available.
-	     */
-	    Available = 1,
-	    /**
-	     * Indicates that the build controller has taken itself offline.
-	     */
-	    Offline = 2,
-	}
-	export enum DefinitionQuality {
-	    Definition = 1,
-	    Draft = 2,
-	}
-	export enum DefinitionQueueStatus {
-	    /**
-	     * When enabled the definition queue allows builds to be queued by users, the system will queue scheduled, gated and continuous integration builds, and the queued builds will be started by the system.
-	     */
-	    Enabled = 0,
-	    /**
-	     * When paused the definition queue allows builds to be queued by users and the system will queue scheduled, gated and continuous integration builds. Builds in the queue will not be started by the system.
-	     */
-	    Paused = 1,
-	    /**
-	     * When disabled the definition queue will not allow builds to be queued by users and the system will not queue scheduled, gated or continuous integration builds. Builds already in the queue will not be started by the system.
-	     */
-	    Disabled = 2,
-	}
-	/**
-	 * A reference to a definition.
-	 */
-	export interface DefinitionReference extends ShallowReference {
-	    /**
-	     * The project.
-	     */
-	    project: TfsInterfaces.TeamProjectReference;
-	    /**
-	     * If builds can be queued from this definition
-	     */
-	    queueStatus: DefinitionQueueStatus;
-	    /**
-	     * The definition revision number.
-	     */
-	    revision: number;
-	    /**
-	     * The type of the definition.
-	     */
-	    type: DefinitionType;
-	    /**
-	     * The Uri of the definition
-	     */
-	    uri: string;
-	}
-	export enum DefinitionTriggerType {
-	    /**
-	     * Manual builds only.
-	     */
-	    None = 1,
-	    /**
-	     * A build should be started for each changeset.
-	     */
-	    ContinuousIntegration = 2,
-	    /**
-	     * A build should be started for multiple changesets at a time at a specified interval.
-	     */
-	    BatchedContinuousIntegration = 4,
-	    /**
-	     * A build should be started on a specified schedule whether or not changesets exist.
-	     */
-	    Schedule = 8,
-	    /**
-	     * A validation build should be started for each check-in.
-	     */
-	    GatedCheckIn = 16,
-	    /**
-	     * A validation build should be started for each batch of check-ins.
-	     */
-	    BatchedGatedCheckIn = 32,
-	    /**
-	     * All types.
-	     */
-	    All = 63,
-	}
-	export enum DefinitionType {
-	    Xaml = 1,
-	    Build = 2,
-	}
-	export enum DeleteOptions {
-	    /**
-	     * No data should be deleted. This value should not be used.
-	     */
-	    None = 0,
-	    /**
-	     * The drop location should be deleted.
-	     */
-	    DropLocation = 1,
-	    /**
-	     * The test results should be deleted.
-	     */
-	    TestResults = 2,
-	    /**
-	     * The version control label should be deleted.
-	     */
-	    Label = 4,
-	    /**
-	     * The build should be deleted.
-	     */
-	    Details = 8,
-	    /**
-	     * Published symbols should be deleted.
-	     */
-	    Symbols = 16,
-	    /**
-	     * All data should be deleted.
-	     */
-	    All = 31,
-	}
-	/**
-	 * Represents the data from the build information nodes for type "DeploymentInformation" for xaml builds
-	 */
-	export interface Deployment {
-	    type: string;
-	}
-	/**
-	 * Deployment iformation for type "Build"
-	 */
-	export interface DeploymentBuild extends Deployment {
-	    buildId: number;
-	}
-	/**
-	 * Deployment iformation for type "Deploy"
-	 */
-	export interface DeploymentDeploy extends Deployment {
-	    message: string;
-	}
-	/**
-	 * Deployment iformation for type "Test"
-	 */
-	export interface DeploymentTest extends Deployment {
-	    runId: number;
-	}
-	export enum GetOption {
-	    /**
-	     * Use the latest changeset at the time the build is queued.
-	     */
-	    LatestOnQueue = 0,
-	    /**
-	     * Use the latest changeset at the time the build is started.
-	     */
-	    LatestOnBuild = 1,
-	    /**
-	     * A user-specified version has been supplied.
-	     */
-	    Custom = 2,
-	}
-	/**
-	 * Data representation of an information node associated with a build
-	 */
-	export interface InformationNode {
-	    /**
-	     * Fields of the information node
-	     */
-	    fields: {
-	        [key: string]: string;
-	    };
-	    /**
-	     * Process or person that last modified this node
-	     */
-	    lastModifiedBy: string;
-	    /**
-	     * Date this node was last modified
-	     */
-	    lastModifiedDate: Date;
-	    /**
-	     * Node Id of this information node
-	     */
-	    nodeId: number;
-	    /**
-	     * Id of parent node (xml tree)
-	     */
-	    parentId: number;
-	    /**
-	     * The type of the information node
-	     */
-	    type: string;
-	}
-	export interface Issue {
-	    category: string;
-	    data: {
-	        [key: string]: string;
-	    };
-	    message: string;
-	    type: IssueType;
-	}
-	export enum IssueType {
-	    Error = 1,
-	    Warning = 2,
-	}
-	export interface MappingDetails {
-	    mappingType: string;
-	    serverPath: string;
-	}
-	export enum ProcessTemplateType {
-	    /**
-	     * Indicates a custom template.
-	     */
-	    Custom = 0,
-	    /**
-	     * Indicates a default template.
-	     */
-	    Default = 1,
-	    /**
-	     * Indicates an upgrade template.
-	     */
-	    Upgrade = 2,
-	}
-	export interface PropertyValue {
-	    /**
-	     * Guid of identity that changed this property value
-	     */
-	    changedBy: string;
-	    /**
-	     * The date this property value was changed
-	     */
-	    changedDate: Date;
-	    /**
-	     * Name in the name value mapping
-	     */
-	    propertyName: string;
-	    /**
-	     * Value in the name value mapping
-	     */
-	    value: any;
-	}
-	export enum QueryDeletedOption {
-	    /**
-	     * Include only non-deleted builds.
-	     */
-	    ExcludeDeleted = 0,
-	    /**
-	     * Include deleted and non-deleted builds.
-	     */
-	    IncludeDeleted = 1,
-	    /**
-	     * Include only deleted builds.
-	     */
-	    OnlyDeleted = 2,
-	}
-	export enum QueueOptions {
-	    /**
-	     * No queue options
-	     */
-	    None = 0,
-	    /**
-	     * Create a plan Id for the build, do not run it
-	     */
-	    DoNotRun = 1,
-	}
-	export enum QueuePriority {
-	    /**
-	     * Low priority.
-	     */
-	    Low = 5,
-	    /**
-	     * Below normal priority.
-	     */
-	    BelowNormal = 4,
-	    /**
-	     * Normal priority.
-	     */
-	    Normal = 3,
-	    /**
-	     * Above normal priority.
-	     */
-	    AboveNormal = 2,
-	    /**
-	     * High priority.
-	     */
-	    High = 1,
-	}
-	export interface RealtimeBuildEvent {
-	    buildId: number;
-	}
-	export interface RequestReference {
-	    /**
-	     * Id of the resource
-	     */
-	    id: number;
-	    /**
-	     * Name of the requestor
-	     */
-	    requestedFor: VSSInterfaces.IdentityRef;
-	    /**
-	     * Full http link to the resource
-	     */
-	    url: string;
-	}
-	export interface RetentionPolicy {
-	    branches: string[];
-	    daysToKeep: number;
-	    deleteBuildRecord: boolean;
-	}
-	export interface Schedule {
-	    branchFilters: string[];
-	    /**
-	     * Days for a build (flags enum for days of the week)
-	     */
-	    daysToBuild: ScheduleDays;
-	    /**
-	     * The Job Id of the Scheduled job that will queue the scheduled build. Since a single trigger can have multiple schedules and we want a single job to process a single schedule (since each schedule has a list of branches to build), the schedule itself needs to define the Job Id. This value will be filled in when a definition is added or updated.  The UI does not provide it or use it.
-	     */
-	    scheduleJobId: string;
-	    /**
-	     * Local timezone hour to start
-	     */
-	    startHours: number;
-	    /**
-	     * Local timezone minute to start
-	     */
-	    startMinutes: number;
-	    /**
-	     * Time zone of the build schedule (string representation of the time zone id)
-	     */
-	    timeZoneId: string;
-	}
-	export enum ScheduleDays {
-	    /**
-	     * Do not run.
-	     */
-	    None = 0,
-	    /**
-	     * Run on Monday.
-	     */
-	    Monday = 1,
-	    /**
-	     * Run on Tuesday.
-	     */
-	    Tuesday = 2,
-	    /**
-	     * Run on Wednesday.
-	     */
-	    Wednesday = 4,
-	    /**
-	     * Run on Thursday.
-	     */
-	    Thursday = 8,
-	    /**
-	     * Run on Friday.
-	     */
-	    Friday = 16,
-	    /**
-	     * Run on Saturday.
-	     */
-	    Saturday = 32,
-	    /**
-	     * Run on Sunday.
-	     */
-	    Sunday = 64,
-	    /**
-	     * Run on all days of the week.
-	     */
-	    All = 127,
-	}
-	export interface ScheduleTrigger extends BuildTrigger {
-	    schedules: Schedule[];
-	}
-	export enum ServiceHostStatus {
-	    /**
-	     * The service host is currently connected and accepting commands.
-	     */
-	    Online = 1,
-	    /**
-	     * The service host is currently disconnected and not accepting commands.
-	     */
-	    Offline = 2,
-	}
-	/**
-	 * An abstracted reference to some other resource. This class is used to provide the build data contracts with a uniform way to reference other resources in a way that provides easy traversal through links.
-	 */
-	export interface ShallowReference {
-	    /**
-	     * Id of the resource
-	     */
-	    id: number;
-	    /**
-	     * Name of the linked resource (definition name, controller name, etc.)
-	     */
-	    name: string;
-	    /**
-	     * Full http link to the resource
-	     */
-	    url: string;
-	}
-	export interface TaskAgentPoolReference {
-	    id: number;
-	    name: string;
-	}
-	export interface TaskDefinitionReference {
-	    id: string;
-	    versionSpec: string;
-	}
-	export interface TaskOrchestrationPlanReference {
-	    planId: string;
-	}
-	export enum TaskResult {
-	    Succeeded = 0,
-	    SucceededWithIssues = 1,
-	    Failed = 2,
-	    Canceled = 3,
-	    Skipped = 4,
-	    Abandoned = 5,
-	}
-	export interface Timeline extends TimelineReference {
-	    lastChangedBy: string;
-	    lastChangedOn: Date;
-	    records: TimelineRecord[];
-	}
-	export interface TimelineRecord {
-	    _links: any;
-	    changeId: number;
-	    currentOperation: string;
-	    details: TimelineReference;
-	    errorCount: number;
-	    finishTime: Date;
-	    id: string;
-	    issues: Issue[];
-	    lastModified: Date;
-	    log: BuildLogReference;
-	    name: string;
-	    order: number;
-	    parentId: string;
-	    percentComplete: number;
-	    result: TaskResult;
-	    resultCode: string;
-	    startTime: Date;
-	    state: TimelineRecordState;
-	    type: string;
-	    url: string;
-	    warningCount: number;
-	    workerName: string;
-	}
-	export enum TimelineRecordState {
-	    Pending = 0,
-	    InProgress = 1,
-	    Completed = 2,
-	}
-	export interface TimelineRecordsUpdatedEvent extends RealtimeBuildEvent {
-	    timelineRecords: TimelineRecord[];
-	}
-	export interface TimelineReference {
-	    changeId: number;
-	    id: string;
-	    url: string;
-	}
-	export enum ValidationResult {
-	    OK = 0,
-	    Warning = 1,
-	    Error = 2,
-	}
-	/**
-	 * Mapping for a workspace
-	 */
-	export interface WorkspaceMapping {
-	    /**
-	     * Uri of the associated definition
-	     */
-	    definitionUri: string;
-	    /**
-	     * Depth of this mapping
-	     */
-	    depth: number;
-	    /**
-	     * local location of the definition
-	     */
-	    localItem: string;
-	    /**
-	     * type of workspace mapping
-	     */
-	    mappingType: WorkspaceMappingType;
-	    /**
-	     * Server location of the definition
-	     */
-	    serverItem: string;
-	    /**
-	     * Id of the workspace
-	     */
-	    workspaceId: number;
-	}
-	export enum WorkspaceMappingType {
-	    /**
-	     * The path is mapped in the workspace.
-	     */
-	    Map = 0,
-	    /**
-	     * The path is cloaked in the workspace.
-	     */
-	    Cloak = 1,
-	}
-	export interface WorkspaceTemplate {
-	    /**
-	     * Uri of the associated definition
-	     */
-	    definitionUri: string;
-	    /**
-	     * The identity that last modified this template
-	     */
-	    lastModifiedBy: string;
-	    /**
-	     * The last time this template was modified
-	     */
-	    lastModifiedDate: Date;
-	    /**
-	     * List of workspace mappings
-	     */
-	    mappings: WorkspaceMapping[];
-	    /**
-	     * Id of the workspace for this template
-	     */
-	    workspaceId: number;
-	}
-	export interface XamlBuildDefinition extends DefinitionReference {
-	    _links: any;
-	    /**
-	     * Batch size of the definition
-	     */
-	    batchSize: number;
-	    buildArgs: string;
-	    /**
-	     * The continuous integration quiet period
-	     */
-	    continuousIntegrationQuietPeriod: number;
-	    /**
-	     * The build controller
-	     */
-	    controller: BuildController;
-	    /**
-	     * The date this definition was created
-	     */
-	    createdOn: Date;
-	    /**
-	     * Default drop location for builds from this definition
-	     */
-	    defaultDropLocation: string;
-	    /**
-	     * Description of the definition
-	     */
-	    description: string;
-	    /**
-	     * The last build on this definition
-	     */
-	    lastBuild: ShallowReference;
-	    /**
-	     * The repository
-	     */
-	    repository: BuildRepository;
-	    /**
-	     * The reasons supported by the template
-	     */
-	    supportedReasons: BuildReason;
-	    /**
-	     * How builds are triggered from this definition
-	     */
-	    triggerType: DefinitionTriggerType;
-	}
-	export var TypeInfo: {
-	    AgentPoolQueue: {
-	        fields: any;
-	    };
-	    AgentStatus: {
-	        enumValues: {
-	            "unavailable": number;
-	            "available": number;
-	            "offline": number;
-	        };
-	    };
-	    ArtifactResource: {
-	        fields: any;
-	    };
-	    AuditAction: {
-	        enumValues: {
-	            "add": number;
-	            "update": number;
-	            "delete": number;
-	        };
-	    };
-	    Build: {
-	        fields: any;
-	    };
-	    BuildAgent: {
-	        fields: any;
-	    };
-	    BuildArtifact: {
-	        fields: any;
-	    };
-	    BuildAuthorizationScope: {
-	        enumValues: {
-	            "projectCollection": number;
-	            "project": number;
-	        };
-	    };
-	    BuildCompletedEvent: {
-	        fields: any;
-	    };
-	    BuildController: {
-	        fields: any;
-	    };
-	    BuildDefinition: {
-	        fields: any;
-	    };
-	    BuildDefinitionChangedEvent: {
-	        fields: any;
-	    };
-	    BuildDefinitionChangingEvent: {
-	        fields: any;
-	    };
-	    BuildDefinitionReference: {
-	        fields: any;
-	    };
-	    BuildDefinitionRevision: {
-	        fields: any;
-	    };
-	    BuildDefinitionSourceProvider: {
-	        fields: any;
-	    };
-	    BuildDefinitionStep: {
-	        fields: any;
-	    };
-	    BuildDefinitionTemplate: {
-	        fields: any;
-	    };
-	    BuildDefinitionVariable: {
-	        fields: any;
-	    };
-	    BuildDeletedEvent: {
-	        fields: any;
-	    };
-	    BuildDeployment: {
-	        fields: any;
-	    };
-	    BuildLog: {
-	        fields: any;
-	    };
-	    BuildLogReference: {
-	        fields: any;
-	    };
-	    BuildOption: {
-	        fields: any;
-	    };
-	    BuildOptionDefinition: {
-	        fields: any;
-	    };
-	    BuildOptionDefinitionReference: {
-	        fields: any;
-	    };
-	    BuildOptionGroupDefinition: {
-	        fields: any;
-	    };
-	    BuildOptionInputDefinition: {
-	        fields: any;
-	    };
-	    BuildOptionInputType: {
-	        enumValues: {
-	            "string": number;
-	            "boolean": number;
-	            "stringList": number;
-	            "radio": number;
-	            "pickList": number;
-	            "multiLine": number;
-	        };
-	    };
-	    BuildPhaseStatus: {
-	        enumValues: {
-	            "unknown": number;
-	            "failed": number;
-	            "succeeded": number;
-	        };
-	    };
-	    BuildProcessTemplate: {
-	        fields: any;
-	    };
-	    BuildQueryOrder: {
-	        enumValues: {
-	            "finishTimeAscending": number;
-	            "finishTimeDescending": number;
-	        };
-	    };
-	    BuildReason: {
-	        enumValues: {
-	            "none": number;
-	            "manual": number;
-	            "individualCI": number;
-	            "batchedCI": number;
-	            "schedule": number;
-	            "userCreated": number;
-	            "validateShelveset": number;
-	            "checkInShelveset": number;
-	            "triggered": number;
-	            "all": number;
-	        };
-	    };
-	    BuildRepository: {
-	        fields: any;
-	    };
-	    BuildRequestValidationResult: {
-	        fields: any;
-	    };
-	    BuildResult: {
-	        enumValues: {
-	            "none": number;
-	            "succeeded": number;
-	            "partiallySucceeded": number;
-	            "failed": number;
-	            "canceled": number;
-	        };
-	    };
-	    BuildServer: {
-	        fields: any;
-	    };
-	    BuildSettings: {
-	        fields: any;
-	    };
-	    BuildStartedEvent: {
-	        fields: any;
-	    };
-	    BuildStatus: {
-	        enumValues: {
-	            "none": number;
-	            "inProgress": number;
-	            "completed": number;
-	            "cancelling": number;
-	            "postponed": number;
-	            "notStarted": number;
-	            "all": number;
-	        };
-	    };
-	    BuildSummary: {
-	        fields: any;
-	    };
-	    BuildTrigger: {
-	        fields: any;
-	    };
-	    BuildUpdatedEvent: {
-	        fields: any;
-	    };
-	    BuildWorkspace: {
-	        fields: any;
-	    };
-	    Change: {
-	        fields: any;
-	    };
-	    ConsoleLogEvent: {
-	        fields: any;
-	    };
-	    ContinuousDeploymentDefinition: {
-	        fields: any;
-	    };
-	    ContinuousIntegrationTrigger: {
-	        fields: any;
-	    };
-	    ControllerStatus: {
-	        enumValues: {
-	            "unavailable": number;
-	            "available": number;
-	            "offline": number;
-	        };
-	    };
-	    DefinitionQuality: {
-	        enumValues: {
-	            "definition": number;
-	            "draft": number;
-	        };
-	    };
-	    DefinitionQueueStatus: {
-	        enumValues: {
-	            "enabled": number;
-	            "paused": number;
-	            "disabled": number;
-	        };
-	    };
-	    DefinitionReference: {
-	        fields: any;
-	    };
-	    DefinitionTriggerType: {
-	        enumValues: {
-	            "none": number;
-	            "continuousIntegration": number;
-	            "batchedContinuousIntegration": number;
-	            "schedule": number;
-	            "gatedCheckIn": number;
-	            "batchedGatedCheckIn": number;
-	            "all": number;
-	        };
-	    };
-	    DefinitionType: {
-	        enumValues: {
-	            "xaml": number;
-	            "build": number;
-	        };
-	    };
-	    DeleteOptions: {
-	        enumValues: {
-	            "none": number;
-	            "dropLocation": number;
-	            "testResults": number;
-	            "label": number;
-	            "details": number;
-	            "symbols": number;
-	            "all": number;
-	        };
-	    };
-	    Deployment: {
-	        fields: any;
-	    };
-	    DeploymentBuild: {
-	        fields: any;
-	    };
-	    DeploymentDeploy: {
-	        fields: any;
-	    };
-	    DeploymentTest: {
-	        fields: any;
-	    };
-	    GetOption: {
-	        enumValues: {
-	            "latestOnQueue": number;
-	            "latestOnBuild": number;
-	            "custom": number;
-	        };
-	    };
-	    InformationNode: {
-	        fields: any;
-	    };
-	    Issue: {
-	        fields: any;
-	    };
-	    IssueType: {
-	        enumValues: {
-	            "error": number;
-	            "warning": number;
-	        };
-	    };
-	    MappingDetails: {
-	        fields: any;
-	    };
-	    ProcessTemplateType: {
-	        enumValues: {
-	            "custom": number;
-	            "default": number;
-	            "upgrade": number;
-	        };
-	    };
-	    PropertyValue: {
-	        fields: any;
-	    };
-	    QueryDeletedOption: {
-	        enumValues: {
-	            "excludeDeleted": number;
-	            "includeDeleted": number;
-	            "onlyDeleted": number;
-	        };
-	    };
-	    QueueOptions: {
-	        enumValues: {
-	            "none": number;
-	            "doNotRun": number;
-	        };
-	    };
-	    QueuePriority: {
-	        enumValues: {
-	            "low": number;
-	            "belowNormal": number;
-	            "normal": number;
-	            "aboveNormal": number;
-	            "high": number;
-	        };
-	    };
-	    RealtimeBuildEvent: {
-	        fields: any;
-	    };
-	    RequestReference: {
-	        fields: any;
-	    };
-	    RetentionPolicy: {
-	        fields: any;
-	    };
-	    Schedule: {
-	        fields: any;
-	    };
-	    ScheduleDays: {
-	        enumValues: {
-	            "none": number;
-	            "monday": number;
-	            "tuesday": number;
-	            "wednesday": number;
-	            "thursday": number;
-	            "friday": number;
-	            "saturday": number;
-	            "sunday": number;
-	            "all": number;
-	        };
-	    };
-	    ScheduleTrigger: {
-	        fields: any;
-	    };
-	    ServiceHostStatus: {
-	        enumValues: {
-	            "online": number;
-	            "offline": number;
-	        };
-	    };
-	    ShallowReference: {
-	        fields: any;
-	    };
-	    TaskAgentPoolReference: {
-	        fields: any;
-	    };
-	    TaskDefinitionReference: {
-	        fields: any;
-	    };
-	    TaskOrchestrationPlanReference: {
-	        fields: any;
-	    };
-	    TaskResult: {
-	        enumValues: {
-	            "succeeded": number;
-	            "succeededWithIssues": number;
-	            "failed": number;
-	            "canceled": number;
-	            "skipped": number;
-	            "abandoned": number;
-	        };
-	    };
-	    Timeline: {
-	        fields: any;
-	    };
-	    TimelineRecord: {
-	        fields: any;
-	    };
-	    TimelineRecordState: {
-	        enumValues: {
-	            "pending": number;
-	            "inProgress": number;
-	            "completed": number;
-	        };
-	    };
-	    TimelineRecordsUpdatedEvent: {
-	        fields: any;
-	    };
-	    TimelineReference: {
-	        fields: any;
-	    };
-	    ValidationResult: {
-	        enumValues: {
-	            "oK": number;
-	            "warning": number;
-	            "error": number;
-	        };
-	    };
-	    WorkspaceMapping: {
-	        fields: any;
-	    };
-	    WorkspaceMappingType: {
-	        enumValues: {
-	            "map": number;
-	            "cloak": number;
-	        };
-	    };
-	    WorkspaceTemplate: {
-	        fields: any;
-	    };
-	    XamlBuildDefinition: {
-	        fields: any;
-	    };
-	};
-
-}
-declare module 'vso-node-api/BuildApi' {
-	/// <reference path="../node/node.d.ts" />
-	/// <reference path="../q/Q.d.ts" />
-	import Q = require('q');
-	import basem = require('vso-node-api/ClientApiBases');
-	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
-	import BuildInterfaces = require('vso-node-api/interfaces/BuildInterfaces');
-	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
-	export interface IBuildApi extends basem.ClientApiBase {
-	    createArtifact(artifact: BuildInterfaces.BuildArtifact, buildId: number, project: string, onResult: (err: any, statusCode: number, artifact: BuildInterfaces.BuildArtifact) => void): void;
-	    getArtifact(buildId: number, artifactName: string, project: string, onResult: (err: any, statusCode: number, artifact: BuildInterfaces.BuildArtifact) => void): void;
-	    getArtifactContentZip(buildId: number, artifactName: string, project: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    getArtifacts(buildId: number, project: string, onResult: (err: any, statusCode: number, artifacts: BuildInterfaces.BuildArtifact[]) => void): void;
-	    getBadge(project: string, definitionId: number, branchName: string, onResult: (err: any, statusCode: number, badge: string) => void): void;
-	    deleteBuild(buildId: number, project: string, onResult: (err: any, statusCode: number) => void): void;
-	    getBuild(buildId: number, project: string, propertyFilters: string, onResult: (err: any, statusCode: number, build: BuildInterfaces.Build) => void): void;
-	    getBuilds(project: string, definitions: number[], queues: number[], buildNumber: string, minFinishTime: Date, maxFinishTime: Date, requestedFor: string, reasonFilter: BuildInterfaces.BuildReason, statusFilter: BuildInterfaces.BuildStatus, resultFilter: BuildInterfaces.BuildResult, tagFilters: string[], properties: string[], type: BuildInterfaces.DefinitionType, top: number, continuationToken: string, maxBuildsPerDefinition: number, deletedFilter: BuildInterfaces.QueryDeletedOption, queryOrder: BuildInterfaces.BuildQueryOrder, onResult: (err: any, statusCode: number, builds: BuildInterfaces.Build[]) => void): void;
-	    queueBuild(build: BuildInterfaces.Build, project: string, ignoreWarnings: boolean, onResult: (err: any, statusCode: number, build: BuildInterfaces.Build) => void): void;
-	    updateBuild(build: BuildInterfaces.Build, buildId: number, project: string, onResult: (err: any, statusCode: number, build: BuildInterfaces.Build) => void): void;
-	    getBuildCommits(project: string, buildId: number, top: number, onResult: (err: any, statusCode: number, changes: BuildInterfaces.Change[]) => void): void;
-	    getBuildController(controllerId: number, onResult: (err: any, statusCode: number, Controller: BuildInterfaces.BuildController) => void): void;
-	    getBuildControllers(name: string, onResult: (err: any, statusCode: number, Controllers: BuildInterfaces.BuildController[]) => void): void;
-	    createDefinition(definition: BuildInterfaces.BuildDefinition, project: string, definitionToCloneId: number, definitionToCloneRevision: number, onResult: (err: any, statusCode: number, definition: BuildInterfaces.BuildDefinition) => void): void;
-	    deleteDefinition(definitionId: number, project: string, onResult: (err: any, statusCode: number) => void): void;
-	    getDefinition(definitionId: number, project: string, revision: number, propertyFilters: string[], onResult: (err: any, statusCode: number, definition: BuildInterfaces.DefinitionReference) => void): void;
-	    getDefinitions(project: string, name: string, type: BuildInterfaces.DefinitionType, onResult: (err: any, statusCode: number, definitions: BuildInterfaces.DefinitionReference[]) => void): void;
-	    updateDefinition(definition: BuildInterfaces.BuildDefinition, definitionId: number, project: string, secretsSourceDefinitionId: number, secretsSourceDefinitionRevision: number, onResult: (err: any, statusCode: number, definition: BuildInterfaces.BuildDefinition) => void): void;
-	    getBuildDeployments(project: string, buildId: number, onResult: (err: any, statusCode: number, deployments: BuildInterfaces.Deployment[]) => void): void;
-	    getBuildLog(project: string, buildId: number, logId: number, startLine: number, endLine: number, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    getBuildLogs(project: string, buildId: number, onResult: (err: any, statusCode: number, logs: BuildInterfaces.BuildLog[]) => void): void;
-	    getBuildLogsZip(project: string, buildId: number, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    getBuildOptionDefinitions(onResult: (err: any, statusCode: number, options: BuildInterfaces.BuildOptionDefinition[]) => void): void;
-	    createQueue(queue: BuildInterfaces.AgentPoolQueue, onResult: (err: any, statusCode: number, queue: BuildInterfaces.AgentPoolQueue) => void): void;
-	    deleteQueue(id: number, onResult: (err: any, statusCode: number) => void): void;
-	    getAgentPoolQueue(controllerId: number, onResult: (err: any, statusCode: number, queue: BuildInterfaces.AgentPoolQueue) => void): void;
-	    getQueues(name: string, onResult: (err: any, statusCode: number, queues: BuildInterfaces.AgentPoolQueue[]) => void): void;
-	    getDefinitionRevisions(project: string, definitionId: number, onResult: (err: any, statusCode: number, revisions: BuildInterfaces.BuildDefinitionRevision[]) => void): void;
-	    getBuildSettings(onResult: (err: any, statusCode: number, setting: BuildInterfaces.BuildSettings) => void): void;
-	    updateBuildSettings(settings: BuildInterfaces.BuildSettings, onResult: (err: any, statusCode: number, setting: BuildInterfaces.BuildSettings) => void): void;
-	    addBuildTag(project: string, buildId: number, tag: string, onResult: (err: any, statusCode: number, tags: string[]) => void): void;
-	    addBuildTags(tags: string[], project: string, buildId: number, onResult: (err: any, statusCode: number, tags: string[]) => void): void;
-	    deleteBuildTag(project: string, buildId: number, tag: string, onResult: (err: any, statusCode: number, tags: string[]) => void): void;
-	    getBuildTags(project: string, buildId: number, onResult: (err: any, statusCode: number, tags: string[]) => void): void;
-	    getTags(project: string, onResult: (err: any, statusCode: number, tags: string[]) => void): void;
-	    deleteTemplate(project: string, templateId: string, onResult: (err: any, statusCode: number) => void): void;
-	    getTemplate(project: string, templateId: string, onResult: (err: any, statusCode: number, template: BuildInterfaces.BuildDefinitionTemplate) => void): void;
-	    getTemplates(project: string, onResult: (err: any, statusCode: number, templates: BuildInterfaces.BuildDefinitionTemplate[]) => void): void;
-	    saveTemplate(template: BuildInterfaces.BuildDefinitionTemplate, project: string, templateId: string, onResult: (err: any, statusCode: number, template: BuildInterfaces.BuildDefinitionTemplate) => void): void;
-	    getBuildTimeline(project: string, buildId: number, timelineId: string, changeId: number, onResult: (err: any, statusCode: number, Timeline: BuildInterfaces.Timeline) => void): void;
-	    getBuildWorkItemsRefs(project: string, buildId: number, top: number, onResult: (err: any, statusCode: number, workitems: VSSInterfaces.ResourceRef[]) => void): void;
-	    getBuildWorkItemsRefsFromCommits(commitIds: string[], project: string, buildId: number, top: number, onResult: (err: any, statusCode: number, workitems: VSSInterfaces.ResourceRef[]) => void): void;
-	}
-	export interface IQBuildApi extends basem.QClientApiBase {
-	    createArtifact(artifact: BuildInterfaces.BuildArtifact, buildId: number, project?: string): Q.Promise<BuildInterfaces.BuildArtifact>;
-	    getArtifact(buildId: number, artifactName: string, project?: string): Q.Promise<BuildInterfaces.BuildArtifact>;
-	    getArtifacts(buildId: number, project?: string): Q.Promise<BuildInterfaces.BuildArtifact[]>;
-	    getBadge(project: string, definitionId: number, branchName?: string): Q.Promise<string>;
-	    getBuild(buildId: number, project?: string, propertyFilters?: string): Q.Promise<BuildInterfaces.Build>;
-	    getBuilds(project?: string, definitions?: number[], queues?: number[], buildNumber?: string, minFinishTime?: Date, maxFinishTime?: Date, requestedFor?: string, reasonFilter?: BuildInterfaces.BuildReason, statusFilter?: BuildInterfaces.BuildStatus, resultFilter?: BuildInterfaces.BuildResult, tagFilters?: string[], properties?: string[], type?: BuildInterfaces.DefinitionType, top?: number, continuationToken?: string, maxBuildsPerDefinition?: number, deletedFilter?: BuildInterfaces.QueryDeletedOption, queryOrder?: BuildInterfaces.BuildQueryOrder): Q.Promise<BuildInterfaces.Build[]>;
-	    queueBuild(build: BuildInterfaces.Build, project?: string, ignoreWarnings?: boolean): Q.Promise<BuildInterfaces.Build>;
-	    updateBuild(build: BuildInterfaces.Build, buildId: number, project?: string): Q.Promise<BuildInterfaces.Build>;
-	    getBuildCommits(project: string, buildId: number, top?: number): Q.Promise<BuildInterfaces.Change[]>;
-	    getBuildController(controllerId: number): Q.Promise<BuildInterfaces.BuildController>;
-	    getBuildControllers(name?: string): Q.Promise<BuildInterfaces.BuildController[]>;
-	    createDefinition(definition: BuildInterfaces.BuildDefinition, project?: string, definitionToCloneId?: number, definitionToCloneRevision?: number): Q.Promise<BuildInterfaces.BuildDefinition>;
-	    getDefinition(definitionId: number, project?: string, revision?: number, propertyFilters?: string[]): Q.Promise<BuildInterfaces.DefinitionReference>;
-	    getDefinitions(project?: string, name?: string, type?: BuildInterfaces.DefinitionType): Q.Promise<BuildInterfaces.DefinitionReference[]>;
-	    updateDefinition(definition: BuildInterfaces.BuildDefinition, definitionId: number, project?: string, secretsSourceDefinitionId?: number, secretsSourceDefinitionRevision?: number): Q.Promise<BuildInterfaces.BuildDefinition>;
-	    getBuildDeployments(project: string, buildId: number): Q.Promise<BuildInterfaces.Deployment[]>;
-	    getBuildLogs(project: string, buildId: number): Q.Promise<BuildInterfaces.BuildLog[]>;
-	    getBuildOptionDefinitions(): Q.Promise<BuildInterfaces.BuildOptionDefinition[]>;
-	    createQueue(queue: BuildInterfaces.AgentPoolQueue): Q.Promise<BuildInterfaces.AgentPoolQueue>;
-	    getAgentPoolQueue(controllerId: number): Q.Promise<BuildInterfaces.AgentPoolQueue>;
-	    getQueues(name?: string): Q.Promise<BuildInterfaces.AgentPoolQueue[]>;
-	    getDefinitionRevisions(project: string, definitionId: number): Q.Promise<BuildInterfaces.BuildDefinitionRevision[]>;
-	    getBuildSettings(): Q.Promise<BuildInterfaces.BuildSettings>;
-	    updateBuildSettings(settings: BuildInterfaces.BuildSettings): Q.Promise<BuildInterfaces.BuildSettings>;
-	    addBuildTag(project: string, buildId: number, tag: string): Q.Promise<string[]>;
-	    addBuildTags(tags: string[], project: string, buildId: number): Q.Promise<string[]>;
-	    deleteBuildTag(project: string, buildId: number, tag: string): Q.Promise<string[]>;
-	    getBuildTags(project: string, buildId: number): Q.Promise<string[]>;
-	    getTags(project: string): Q.Promise<string[]>;
-	    getTemplate(project: string, templateId: string): Q.Promise<BuildInterfaces.BuildDefinitionTemplate>;
-	    getTemplates(project: string): Q.Promise<BuildInterfaces.BuildDefinitionTemplate[]>;
-	    saveTemplate(template: BuildInterfaces.BuildDefinitionTemplate, project: string, templateId: string): Q.Promise<BuildInterfaces.BuildDefinitionTemplate>;
-	    getBuildTimeline(project: string, buildId: number, timelineId?: string, changeId?: number): Q.Promise<BuildInterfaces.Timeline>;
-	    getBuildWorkItemsRefs(project: string, buildId: number, top?: number): Q.Promise<VSSInterfaces.ResourceRef[]>;
-	    getBuildWorkItemsRefsFromCommits(commitIds: string[], project: string, buildId: number, top?: number): Q.Promise<VSSInterfaces.ResourceRef[]>;
-	}
-	export class BuildApi extends basem.ClientApiBase implements IBuildApi {
-	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
-	    /**
-	     * Associates an artifact with a build
-	     *
-	     * @param {BuildInterfaces.BuildArtifact} artifact
-	     * @param {number} buildId
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting BuildInterfaces.BuildArtifact
-	     */
-	    createArtifact(artifact: BuildInterfaces.BuildArtifact, buildId: number, project: string, onResult: (err: any, statusCode: number, artifact: BuildInterfaces.BuildArtifact) => void): void;
-	    /**
-	     * Gets a specific artifact for a build
-	     *
-	     * @param {number} buildId
-	     * @param {string} artifactName
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting BuildInterfaces.BuildArtifact
-	     */
-	    getArtifact(buildId: number, artifactName: string, project: string, onResult: (err: any, statusCode: number, artifact: BuildInterfaces.BuildArtifact) => void): void;
-	    /**
-	     * Gets a specific artifact for a build
-	     *
-	     * @param {number} buildId
-	     * @param {string} artifactName
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting ArrayBuffer
-	     */
-	    getArtifactContentZip(buildId: number, artifactName: string, project: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    /**
-	     * Gets all artifacts for a build
-	     *
-	     * @param {number} buildId
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting BuildInterfaces.BuildArtifact[]
-	     */
-	    getArtifacts(buildId: number, project: string, onResult: (err: any, statusCode: number, artifacts: BuildInterfaces.BuildArtifact[]) => void): void;
-	    /**
-	     * @param {string} project
-	     * @param {number} definitionId
-	     * @param {string} branchName
-	     * @param onResult callback function with the resulting string
-	     */
-	    getBadge(project: string, definitionId: number, branchName: string, onResult: (err: any, statusCode: number, badge: string) => void): void;
-	    /**
-	     * Deletes a build
-	     *
-	     * @param {number} buildId
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function
-	     */
-	    deleteBuild(buildId: number, project: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * Gets a build
-	     *
-	     * @param {number} buildId
-	     * @param {string} project - Project ID or project name
-	     * @param {string} propertyFilters - A comma-delimited list of properties to include in the results
-	     * @param onResult callback function with the resulting BuildInterfaces.Build
-	     */
-	    getBuild(buildId: number, project: string, propertyFilters: string, onResult: (err: any, statusCode: number, build: BuildInterfaces.Build) => void): void;
-	    /**
-	     * Gets builds
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {number[]} definitions - A comma-delimited list of definition ids
-	     * @param {number[]} queues - A comma-delimited list of queue ids
-	     * @param {string} buildNumber
-	     * @param {Date} minFinishTime
-	     * @param {Date} maxFinishTime
-	     * @param {string} requestedFor
-	     * @param {BuildInterfaces.BuildReason} reasonFilter
-	     * @param {BuildInterfaces.BuildStatus} statusFilter
-	     * @param {BuildInterfaces.BuildResult} resultFilter
-	     * @param {string[]} tagFilters - A comma-delimited list of tags
-	     * @param {string[]} properties - A comma-delimited list of properties to include in the results
-	     * @param {BuildInterfaces.DefinitionType} type - The definition type
-	     * @param {number} top - The maximum number of builds to retrieve
-	     * @param {string} continuationToken
-	     * @param {number} maxBuildsPerDefinition
-	     * @param {BuildInterfaces.QueryDeletedOption} deletedFilter
-	     * @param {BuildInterfaces.BuildQueryOrder} queryOrder
-	     * @param onResult callback function with the resulting BuildInterfaces.Build[]
-	     */
-	    getBuilds(project: string, definitions: number[], queues: number[], buildNumber: string, minFinishTime: Date, maxFinishTime: Date, requestedFor: string, reasonFilter: BuildInterfaces.BuildReason, statusFilter: BuildInterfaces.BuildStatus, resultFilter: BuildInterfaces.BuildResult, tagFilters: string[], properties: string[], type: BuildInterfaces.DefinitionType, top: number, continuationToken: string, maxBuildsPerDefinition: number, deletedFilter: BuildInterfaces.QueryDeletedOption, queryOrder: BuildInterfaces.BuildQueryOrder, onResult: (err: any, statusCode: number, builds: BuildInterfaces.Build[]) => void): void;
-	    /**
-	     * Queues a build
-	     *
-	     * @param {BuildInterfaces.Build} build
-	     * @param {string} project - Project ID or project name
-	     * @param {boolean} ignoreWarnings
-	     * @param onResult callback function with the resulting BuildInterfaces.Build
-	     */
-	    queueBuild(build: BuildInterfaces.Build, project: string, ignoreWarnings: boolean, onResult: (err: any, statusCode: number, build: BuildInterfaces.Build) => void): void;
-	    /**
-	     * Updates a build
-	     *
-	     * @param {BuildInterfaces.Build} build
-	     * @param {number} buildId
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting BuildInterfaces.Build
-	     */
-	    updateBuild(build: BuildInterfaces.Build, buildId: number, project: string, onResult: (err: any, statusCode: number, build: BuildInterfaces.Build) => void): void;
-	    /**
-	     * Gets the changes associated with a build
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {number} buildId
-	     * @param {number} top - The maximum number of changes to return
-	     * @param onResult callback function with the resulting BuildInterfaces.Change[]
-	     */
-	    getBuildCommits(project: string, buildId: number, top: number, onResult: (err: any, statusCode: number, changes: BuildInterfaces.Change[]) => void): void;
-	    /**
-	     * Gets a controller
-	     *
-	     * @param {number} controllerId
-	     * @param onResult callback function with the resulting BuildInterfaces.BuildController
-	     */
-	    getBuildController(controllerId: number, onResult: (err: any, statusCode: number, Controller: BuildInterfaces.BuildController) => void): void;
-	    /**
-	     * Gets controller, optionally filtered by name
-	     *
-	     * @param {string} name
-	     * @param onResult callback function with the resulting BuildInterfaces.BuildController[]
-	     */
-	    getBuildControllers(name: string, onResult: (err: any, statusCode: number, Controllers: BuildInterfaces.BuildController[]) => void): void;
-	    /**
-	     * Creates a new definition
-	     *
-	     * @param {BuildInterfaces.BuildDefinition} definition
-	     * @param {string} project - Project ID or project name
-	     * @param {number} definitionToCloneId
-	     * @param {number} definitionToCloneRevision
-	     * @param onResult callback function with the resulting BuildInterfaces.BuildDefinition
-	     */
-	    createDefinition(definition: BuildInterfaces.BuildDefinition, project: string, definitionToCloneId: number, definitionToCloneRevision: number, onResult: (err: any, statusCode: number, definition: BuildInterfaces.BuildDefinition) => void): void;
-	    /**
-	     * Deletes a definition and all associated builds
-	     *
-	     * @param {number} definitionId
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function
-	     */
-	    deleteDefinition(definitionId: number, project: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * Gets a definition, optionally at a specific revision
-	     *
-	     * @param {number} definitionId
-	     * @param {string} project - Project ID or project name
-	     * @param {number} revision
-	     * @param {string[]} propertyFilters
-	     * @param onResult callback function with the resulting BuildInterfaces.DefinitionReference
-	     */
-	    getDefinition(definitionId: number, project: string, revision: number, propertyFilters: string[], onResult: (err: any, statusCode: number, definition: BuildInterfaces.DefinitionReference) => void): void;
-	    /**
-	     * Gets definitions, optionally filtered by name
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {string} name
-	     * @param {BuildInterfaces.DefinitionType} type
-	     * @param onResult callback function with the resulting BuildInterfaces.DefinitionReference[]
-	     */
-	    getDefinitions(project: string, name: string, type: BuildInterfaces.DefinitionType, onResult: (err: any, statusCode: number, definitions: BuildInterfaces.DefinitionReference[]) => void): void;
-	    /**
-	     * Updates an existing definition
-	     *
-	     * @param {BuildInterfaces.BuildDefinition} definition
-	     * @param {number} definitionId
-	     * @param {string} project - Project ID or project name
-	     * @param {number} secretsSourceDefinitionId
-	     * @param {number} secretsSourceDefinitionRevision
-	     * @param onResult callback function with the resulting BuildInterfaces.BuildDefinition
-	     */
-	    updateDefinition(definition: BuildInterfaces.BuildDefinition, definitionId: number, project: string, secretsSourceDefinitionId: number, secretsSourceDefinitionRevision: number, onResult: (err: any, statusCode: number, definition: BuildInterfaces.BuildDefinition) => void): void;
-	    /**
-	     * Gets the deployment information associated with a build
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {number} buildId
-	     * @param onResult callback function with the resulting BuildInterfaces.Deployment[]
-	     */
-	    getBuildDeployments(project: string, buildId: number, onResult: (err: any, statusCode: number, deployments: BuildInterfaces.Deployment[]) => void): void;
-	    /**
-	     * Gets a log
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {number} buildId
-	     * @param {number} logId
-	     * @param {number} startLine
-	     * @param {number} endLine
-	     * @param onResult callback function with the resulting ArrayBuffer
-	     */
-	    getBuildLog(project: string, buildId: number, logId: number, startLine: number, endLine: number, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    /**
-	     * Gets logs for a build
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {number} buildId
-	     * @param onResult callback function with the resulting BuildInterfaces.BuildLog[]
-	     */
-	    getBuildLogs(project: string, buildId: number, onResult: (err: any, statusCode: number, logs: BuildInterfaces.BuildLog[]) => void): void;
-	    /**
-	     * Gets logs for a build
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {number} buildId
-	     * @param onResult callback function with the resulting ArrayBuffer
-	     */
-	    getBuildLogsZip(project: string, buildId: number, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    /**
-	     * @param onResult callback function with the resulting BuildInterfaces.BuildOptionDefinition[]
-	     */
-	    getBuildOptionDefinitions(onResult: (err: any, statusCode: number, options: BuildInterfaces.BuildOptionDefinition[]) => void): void;
-	    /**
-	     * Creates a build queue
-	     *
-	     * @param {BuildInterfaces.AgentPoolQueue} queue
-	     * @param onResult callback function with the resulting BuildInterfaces.AgentPoolQueue
-	     */
-	    createQueue(queue: BuildInterfaces.AgentPoolQueue, onResult: (err: any, statusCode: number, queue: BuildInterfaces.AgentPoolQueue) => void): void;
-	    /**
-	     * Deletes a build queue
-	     *
-	     * @param {number} id
-	     * @param onResult callback function
-	     */
-	    deleteQueue(id: number, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * Gets a queue
-	     *
-	     * @param {number} controllerId
-	     * @param onResult callback function with the resulting BuildInterfaces.AgentPoolQueue
-	     */
-	    getAgentPoolQueue(controllerId: number, onResult: (err: any, statusCode: number, queue: BuildInterfaces.AgentPoolQueue) => void): void;
-	    /**
-	     * Gets queues, optionally filtered by name
-	     *
-	     * @param {string} name
-	     * @param onResult callback function with the resulting BuildInterfaces.AgentPoolQueue[]
-	     */
-	    getQueues(name: string, onResult: (err: any, statusCode: number, queues: BuildInterfaces.AgentPoolQueue[]) => void): void;
-	    /**
-	     * Gets revisions of a definition
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {number} definitionId
-	     * @param onResult callback function with the resulting BuildInterfaces.BuildDefinitionRevision[]
-	     */
-	    getDefinitionRevisions(project: string, definitionId: number, onResult: (err: any, statusCode: number, revisions: BuildInterfaces.BuildDefinitionRevision[]) => void): void;
-	    /**
-	     * @param onResult callback function with the resulting BuildInterfaces.BuildSettings
-	     */
-	    getBuildSettings(onResult: (err: any, statusCode: number, setting: BuildInterfaces.BuildSettings) => void): void;
-	    /**
-	     * Updates the build settings
-	     *
-	     * @param {BuildInterfaces.BuildSettings} settings
-	     * @param onResult callback function with the resulting BuildInterfaces.BuildSettings
-	     */
-	    updateBuildSettings(settings: BuildInterfaces.BuildSettings, onResult: (err: any, statusCode: number, setting: BuildInterfaces.BuildSettings) => void): void;
-	    /**
-	     * Adds a tag to a build
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {number} buildId
-	     * @param {string} tag
-	     * @param onResult callback function with the resulting string[]
-	     */
-	    addBuildTag(project: string, buildId: number, tag: string, onResult: (err: any, statusCode: number, tags: string[]) => void): void;
-	    /**
-	     * Adds tag to a build
-	     *
-	     * @param {string[]} tags
-	     * @param {string} project - Project ID or project name
-	     * @param {number} buildId
-	     * @param onResult callback function with the resulting string[]
-	     */
-	    addBuildTags(tags: string[], project: string, buildId: number, onResult: (err: any, statusCode: number, tags: string[]) => void): void;
-	    /**
-	     * Deletes a tag from a build
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {number} buildId
-	     * @param {string} tag
-	     * @param onResult callback function with the resulting string[]
-	     */
-	    deleteBuildTag(project: string, buildId: number, tag: string, onResult: (err: any, statusCode: number, tags: string[]) => void): void;
-	    /**
-	     * Gets the tags for a build
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {number} buildId
-	     * @param onResult callback function with the resulting string[]
-	     */
-	    getBuildTags(project: string, buildId: number, onResult: (err: any, statusCode: number, tags: string[]) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting string[]
-	     */
-	    getTags(project: string, onResult: (err: any, statusCode: number, tags: string[]) => void): void;
-	    /**
-	     * Deletes a definition template
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {string} templateId
-	     * @param onResult callback function
-	     */
-	    deleteTemplate(project: string, templateId: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * Gets definition template filtered by id
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {string} templateId
-	     * @param onResult callback function with the resulting BuildInterfaces.BuildDefinitionTemplate
-	     */
-	    getTemplate(project: string, templateId: string, onResult: (err: any, statusCode: number, template: BuildInterfaces.BuildDefinitionTemplate) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting BuildInterfaces.BuildDefinitionTemplate[]
-	     */
-	    getTemplates(project: string, onResult: (err: any, statusCode: number, templates: BuildInterfaces.BuildDefinitionTemplate[]) => void): void;
-	    /**
-	     * Saves a definition template
-	     *
-	     * @param {BuildInterfaces.BuildDefinitionTemplate} template
-	     * @param {string} project - Project ID or project name
-	     * @param {string} templateId
-	     * @param onResult callback function with the resulting BuildInterfaces.BuildDefinitionTemplate
-	     */
-	    saveTemplate(template: BuildInterfaces.BuildDefinitionTemplate, project: string, templateId: string, onResult: (err: any, statusCode: number, template: BuildInterfaces.BuildDefinitionTemplate) => void): void;
-	    /**
-	     * Gets details for a build
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {number} buildId
-	     * @param {string} timelineId
-	     * @param {number} changeId
-	     * @param onResult callback function with the resulting BuildInterfaces.Timeline
-	     */
-	    getBuildTimeline(project: string, buildId: number, timelineId: string, changeId: number, onResult: (err: any, statusCode: number, Timeline: BuildInterfaces.Timeline) => void): void;
-	    /**
-	     * Gets the work item ids associated with a build
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {number} buildId
-	     * @param {number} top - The maximum number of workitems to return
-	     * @param onResult callback function with the resulting VSSInterfaces.ResourceRef[]
-	     */
-	    getBuildWorkItemsRefs(project: string, buildId: number, top: number, onResult: (err: any, statusCode: number, workitems: VSSInterfaces.ResourceRef[]) => void): void;
-	    /**
-	     * Gets the work item ids associated with build commits
-	     *
-	     * @param {string[]} commitIds
-	     * @param {string} project - Project ID or project name
-	     * @param {number} buildId
-	     * @param {number} top - The maximum number of workitems to return, also number of commits to consider if commitids are not sent
-	     * @param onResult callback function with the resulting VSSInterfaces.ResourceRef[]
-	     */
-	    getBuildWorkItemsRefsFromCommits(commitIds: string[], project: string, buildId: number, top: number, onResult: (err: any, statusCode: number, workitems: VSSInterfaces.ResourceRef[]) => void): void;
-	}
-	export class QBuildApi extends basem.QClientApiBase implements IQBuildApi {
-	    api: BuildApi;
-	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
-	    /**
-	    * Associates an artifact with a build
-	    *
-	    * @param {BuildInterfaces.BuildArtifact} artifact
-	    * @param {number} buildId
-	    * @param {string} project - Project ID or project name
-	    */
-	    createArtifact(artifact: BuildInterfaces.BuildArtifact, buildId: number, project?: string): Q.Promise<BuildInterfaces.BuildArtifact>;
-	    /**
-	    * Gets a specific artifact for a build
-	    *
-	    * @param {number} buildId
-	    * @param {string} artifactName
-	    * @param {string} project - Project ID or project name
-	    */
-	    getArtifact(buildId: number, artifactName: string, project?: string): Q.Promise<BuildInterfaces.BuildArtifact>;
-	    /**
-	    * Gets all artifacts for a build
-	    *
-	    * @param {number} buildId
-	    * @param {string} project - Project ID or project name
-	    */
-	    getArtifacts(buildId: number, project?: string): Q.Promise<BuildInterfaces.BuildArtifact[]>;
-	    /**
-	    * @param {string} project
-	    * @param {number} definitionId
-	    * @param {string} branchName
-	    */
-	    getBadge(project: string, definitionId: number, branchName?: string): Q.Promise<string>;
-	    /**
-	    * Gets a build
-	    *
-	    * @param {number} buildId
-	    * @param {string} project - Project ID or project name
-	    * @param {string} propertyFilters - A comma-delimited list of properties to include in the results
-	    */
-	    getBuild(buildId: number, project?: string, propertyFilters?: string): Q.Promise<BuildInterfaces.Build>;
-	    /**
-	    * Gets builds
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {number[]} definitions - A comma-delimited list of definition ids
-	    * @param {number[]} queues - A comma-delimited list of queue ids
-	    * @param {string} buildNumber
-	    * @param {Date} minFinishTime
-	    * @param {Date} maxFinishTime
-	    * @param {string} requestedFor
-	    * @param {BuildInterfaces.BuildReason} reasonFilter
-	    * @param {BuildInterfaces.BuildStatus} statusFilter
-	    * @param {BuildInterfaces.BuildResult} resultFilter
-	    * @param {string[]} tagFilters - A comma-delimited list of tags
-	    * @param {string[]} properties - A comma-delimited list of properties to include in the results
-	    * @param {BuildInterfaces.DefinitionType} type - The definition type
-	    * @param {number} top - The maximum number of builds to retrieve
-	    * @param {string} continuationToken
-	    * @param {number} maxBuildsPerDefinition
-	    * @param {BuildInterfaces.QueryDeletedOption} deletedFilter
-	    * @param {BuildInterfaces.BuildQueryOrder} queryOrder
-	    */
-	    getBuilds(project?: string, definitions?: number[], queues?: number[], buildNumber?: string, minFinishTime?: Date, maxFinishTime?: Date, requestedFor?: string, reasonFilter?: BuildInterfaces.BuildReason, statusFilter?: BuildInterfaces.BuildStatus, resultFilter?: BuildInterfaces.BuildResult, tagFilters?: string[], properties?: string[], type?: BuildInterfaces.DefinitionType, top?: number, continuationToken?: string, maxBuildsPerDefinition?: number, deletedFilter?: BuildInterfaces.QueryDeletedOption, queryOrder?: BuildInterfaces.BuildQueryOrder): Q.Promise<BuildInterfaces.Build[]>;
-	    /**
-	    * Queues a build
-	    *
-	    * @param {BuildInterfaces.Build} build
-	    * @param {string} project - Project ID or project name
-	    * @param {boolean} ignoreWarnings
-	    */
-	    queueBuild(build: BuildInterfaces.Build, project?: string, ignoreWarnings?: boolean): Q.Promise<BuildInterfaces.Build>;
-	    /**
-	    * Updates a build
-	    *
-	    * @param {BuildInterfaces.Build} build
-	    * @param {number} buildId
-	    * @param {string} project - Project ID or project name
-	    */
-	    updateBuild(build: BuildInterfaces.Build, buildId: number, project?: string): Q.Promise<BuildInterfaces.Build>;
-	    /**
-	    * Gets the changes associated with a build
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {number} buildId
-	    * @param {number} top - The maximum number of changes to return
-	    */
-	    getBuildCommits(project: string, buildId: number, top?: number): Q.Promise<BuildInterfaces.Change[]>;
-	    /**
-	    * Gets a controller
-	    *
-	    * @param {number} controllerId
-	    */
-	    getBuildController(controllerId: number): Q.Promise<BuildInterfaces.BuildController>;
-	    /**
-	    * Gets controller, optionally filtered by name
-	    *
-	    * @param {string} name
-	    */
-	    getBuildControllers(name?: string): Q.Promise<BuildInterfaces.BuildController[]>;
-	    /**
-	    * Creates a new definition
-	    *
-	    * @param {BuildInterfaces.BuildDefinition} definition
-	    * @param {string} project - Project ID or project name
-	    * @param {number} definitionToCloneId
-	    * @param {number} definitionToCloneRevision
-	    */
-	    createDefinition(definition: BuildInterfaces.BuildDefinition, project?: string, definitionToCloneId?: number, definitionToCloneRevision?: number): Q.Promise<BuildInterfaces.BuildDefinition>;
-	    /**
-	    * Gets a definition, optionally at a specific revision
-	    *
-	    * @param {number} definitionId
-	    * @param {string} project - Project ID or project name
-	    * @param {number} revision
-	    * @param {string[]} propertyFilters
-	    */
-	    getDefinition(definitionId: number, project?: string, revision?: number, propertyFilters?: string[]): Q.Promise<BuildInterfaces.DefinitionReference>;
-	    /**
-	    * Gets definitions, optionally filtered by name
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {string} name
-	    * @param {BuildInterfaces.DefinitionType} type
-	    */
-	    getDefinitions(project?: string, name?: string, type?: BuildInterfaces.DefinitionType): Q.Promise<BuildInterfaces.DefinitionReference[]>;
-	    /**
-	    * Updates an existing definition
-	    *
-	    * @param {BuildInterfaces.BuildDefinition} definition
-	    * @param {number} definitionId
-	    * @param {string} project - Project ID or project name
-	    * @param {number} secretsSourceDefinitionId
-	    * @param {number} secretsSourceDefinitionRevision
-	    */
-	    updateDefinition(definition: BuildInterfaces.BuildDefinition, definitionId: number, project?: string, secretsSourceDefinitionId?: number, secretsSourceDefinitionRevision?: number): Q.Promise<BuildInterfaces.BuildDefinition>;
-	    /**
-	    * Gets the deployment information associated with a build
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {number} buildId
-	    */
-	    getBuildDeployments(project: string, buildId: number): Q.Promise<BuildInterfaces.Deployment[]>;
-	    /**
-	    * Gets logs for a build
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {number} buildId
-	    */
-	    getBuildLogs(project: string, buildId: number): Q.Promise<BuildInterfaces.BuildLog[]>;
-	    /**
-	    */
-	    getBuildOptionDefinitions(): Q.Promise<BuildInterfaces.BuildOptionDefinition[]>;
-	    /**
-	    * Creates a build queue
-	    *
-	    * @param {BuildInterfaces.AgentPoolQueue} queue
-	    */
-	    createQueue(queue: BuildInterfaces.AgentPoolQueue): Q.Promise<BuildInterfaces.AgentPoolQueue>;
-	    /**
-	    * Gets a queue
-	    *
-	    * @param {number} controllerId
-	    */
-	    getAgentPoolQueue(controllerId: number): Q.Promise<BuildInterfaces.AgentPoolQueue>;
-	    /**
-	    * Gets queues, optionally filtered by name
-	    *
-	    * @param {string} name
-	    */
-	    getQueues(name?: string): Q.Promise<BuildInterfaces.AgentPoolQueue[]>;
-	    /**
-	    * Gets revisions of a definition
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {number} definitionId
-	    */
-	    getDefinitionRevisions(project: string, definitionId: number): Q.Promise<BuildInterfaces.BuildDefinitionRevision[]>;
-	    /**
-	    */
-	    getBuildSettings(): Q.Promise<BuildInterfaces.BuildSettings>;
-	    /**
-	    * Updates the build settings
-	    *
-	    * @param {BuildInterfaces.BuildSettings} settings
-	    */
-	    updateBuildSettings(settings: BuildInterfaces.BuildSettings): Q.Promise<BuildInterfaces.BuildSettings>;
-	    /**
-	    * Adds a tag to a build
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {number} buildId
-	    * @param {string} tag
-	    */
-	    addBuildTag(project: string, buildId: number, tag: string): Q.Promise<string[]>;
-	    /**
-	    * Adds tag to a build
-	    *
-	    * @param {string[]} tags
-	    * @param {string} project - Project ID or project name
-	    * @param {number} buildId
-	    */
-	    addBuildTags(tags: string[], project: string, buildId: number): Q.Promise<string[]>;
-	    /**
-	    * Deletes a tag from a build
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {number} buildId
-	    * @param {string} tag
-	    */
-	    deleteBuildTag(project: string, buildId: number, tag: string): Q.Promise<string[]>;
-	    /**
-	    * Gets the tags for a build
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {number} buildId
-	    */
-	    getBuildTags(project: string, buildId: number): Q.Promise<string[]>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    */
-	    getTags(project: string): Q.Promise<string[]>;
-	    /**
-	    * Gets definition template filtered by id
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {string} templateId
-	    */
-	    getTemplate(project: string, templateId: string): Q.Promise<BuildInterfaces.BuildDefinitionTemplate>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    */
-	    getTemplates(project: string): Q.Promise<BuildInterfaces.BuildDefinitionTemplate[]>;
-	    /**
-	    * Saves a definition template
-	    *
-	    * @param {BuildInterfaces.BuildDefinitionTemplate} template
-	    * @param {string} project - Project ID or project name
-	    * @param {string} templateId
-	    */
-	    saveTemplate(template: BuildInterfaces.BuildDefinitionTemplate, project: string, templateId: string): Q.Promise<BuildInterfaces.BuildDefinitionTemplate>;
-	    /**
-	    * Gets details for a build
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {number} buildId
-	    * @param {string} timelineId
-	    * @param {number} changeId
-	    */
-	    getBuildTimeline(project: string, buildId: number, timelineId?: string, changeId?: number): Q.Promise<BuildInterfaces.Timeline>;
-	    /**
-	    * Gets the work item ids associated with a build
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {number} buildId
-	    * @param {number} top - The maximum number of workitems to return
-	    */
-	    getBuildWorkItemsRefs(project: string, buildId: number, top?: number): Q.Promise<VSSInterfaces.ResourceRef[]>;
-	    /**
-	    * Gets the work item ids associated with build commits
-	    *
-	    * @param {string[]} commitIds
-	    * @param {string} project - Project ID or project name
-	    * @param {number} buildId
-	    * @param {number} top - The maximum number of workitems to return, also number of commits to consider if commitids are not sent
-	    */
-	    getBuildWorkItemsRefsFromCommits(commitIds: string[], project: string, buildId: number, top?: number): Q.Promise<VSSInterfaces.ResourceRef[]>;
-	}
-
-}
-declare module 'vso-node-api/interfaces/CoreInterfaces' {
-	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
-	export enum ConnectedServiceKind {
-	    /**
-	     * Custom or unknown service
-	     */
-	    Custom = 0,
-	    /**
-	     * Azure Subscription
-	     */
-	    AzureSubscription = 1,
-	    /**
-	     * Chef Connection
-	     */
-	    Chef = 2,
-	    /**
-	     * Generic Connection
-	     */
-	    Generic = 3,
-	}
-	export interface IdentityData {
-	    identityIds: string[];
-	}
-	export interface Process extends ProcessReference {
-	    _links: any;
-	    description: string;
-	    id: string;
-	    isDefault: boolean;
-	}
-	export interface ProcessReference {
-	    name: string;
-	    url: string;
-	}
-	export enum ProjectChangeType {
-	    Modified = 0,
-	    Deleted = 1,
-	    Added = 2,
-	}
-	/**
-	 * Contains information of the project
-	 */
-	export interface ProjectInfo {
-	    abbreviation: string;
-	    description: string;
-	    id: string;
-	    lastUpdateTime: Date;
-	    name: string;
-	    properties: ProjectProperty[];
-	    /**
-	     * Current revision of the project
-	     */
-	    revision: number;
-	    state: any;
-	    uri: string;
-	    version: number;
-	}
-	export interface ProjectMessage {
-	    project: ProjectInfo;
-	    projectChangeType: ProjectChangeType;
-	}
-	export interface ProjectProperty {
-	    name: string;
-	    value: string;
-	}
-	export interface Proxy {
-	    /**
-	     * This is a description string
-	     */
-	    description: string;
-	    /**
-	     * The friendly name of the server
-	     */
-	    friendlyName: string;
-	    globalDefault: boolean;
-	    /**
-	     * This is a string representation of the site that the proxy server is located in (e.g. "NA-WA-RED")
-	     */
-	    site: string;
-	    siteDefault: boolean;
-	    /**
-	     * The URL of the proxy server
-	     */
-	    url: string;
-	}
-	export enum SourceControlTypes {
-	    Tfvc = 1,
-	    Git = 2,
-	}
-	/**
-	 * The Team Context for an operation.
-	 */
-	export interface TeamContext {
-	    /**
-	     * The team project Id or name.  Ignored if ProjectId is set.
-	     */
-	    project: string;
-	    /**
-	     * The Team Project ID.  Required if Project is not set.
-	     */
-	    projectId: string;
-	    /**
-	     * The Team Id or name.  Ignored if TeamId is set.
-	     */
-	    team: string;
-	    /**
-	     * The Team Id
-	     */
-	    teamId: string;
-	}
-	/**
-	 * Represents a Team Project object.
-	 */
-	export interface TeamProject extends TeamProjectReference {
-	    /**
-	     * The links to other objects related to this object.
-	     */
-	    _links: any;
-	    capabilities: {
-	        [key: string]: {
-	            [key: string]: string;
-	        };
-	    };
-	    /**
-	     * The shallow ref to the default team.
-	     */
-	    defaultTeam: WebApiTeamRef;
-	}
-	/**
-	 * Data contract for a TeamProjectCollection.
-	 */
-	export interface TeamProjectCollection extends TeamProjectCollectionReference {
-	    /**
-	     * The links to other objects related to this object.
-	     */
-	    _links: any;
-	    /**
-	     * Project collection description.
-	     */
-	    description: string;
-	    /**
-	     * Project collection state.
-	     */
-	    state: string;
-	}
-	/**
-	 * Reference object for a TeamProjectCollection.
-	 */
-	export interface TeamProjectCollectionReference {
-	    /**
-	     * Collection Id.
-	     */
-	    id: string;
-	    /**
-	     * Collection Name.
-	     */
-	    name: string;
-	    /**
-	     * Collection REST Url.
-	     */
-	    url: string;
-	}
-	/**
-	 * Represents a shallow reference to a TeamProject.
-	 */
-	export interface TeamProjectReference {
-	    /**
-	     * Project abbreviation.
-	     */
-	    abbreviation: string;
-	    /**
-	     * The project's description (if any).
-	     */
-	    description: string;
-	    /**
-	     * Project identifier.
-	     */
-	    id: string;
-	    /**
-	     * Project name.
-	     */
-	    name: string;
-	    /**
-	     * Project revision.
-	     */
-	    revision: number;
-	    /**
-	     * Project state.
-	     */
-	    state: any;
-	    /**
-	     * Url to the full version of the object.
-	     */
-	    url: string;
-	}
-	export interface WebApiConnectedService extends WebApiConnectedServiceRef {
-	    /**
-	     * The user who did the OAuth authentication to created this service
-	     */
-	    authenticatedBy: VSSInterfaces.IdentityRef;
-	    /**
-	     * Extra description on the service.
-	     */
-	    description: string;
-	    /**
-	     * Friendly Name of service connection
-	     */
-	    friendlyName: string;
-	    /**
-	     * Id/Name of the connection service. For Ex: Subscription Id for Azure Connection
-	     */
-	    id: string;
-	    /**
-	     * The kind of service.
-	     */
-	    kind: string;
-	    /**
-	     * The project associated with this service
-	     */
-	    project: TeamProjectReference;
-	    /**
-	     * Optional uri to connect directly to the service such as https://windows.azure.com
-	     */
-	    serviceUri: string;
-	}
-	export interface WebApiConnectedServiceDetails extends WebApiConnectedServiceRef {
-	    /**
-	     * Meta data for service connection
-	     */
-	    connectedServiceMetaData: WebApiConnectedService;
-	    /**
-	     * Credential info
-	     */
-	    credentialsXml: string;
-	    /**
-	     * Optional uri to connect directly to the service such as https://windows.azure.com
-	     */
-	    endPoint: string;
-	}
-	export interface WebApiConnectedServiceRef {
-	    id: string;
-	    url: string;
-	}
-	/**
-	 * The representation of data needed to create a tag definition which is sent across the wire.
-	 */
-	export interface WebApiCreateTagRequestData {
-	    name: string;
-	}
-	export interface WebApiProject extends TeamProjectReference {
-	    /**
-	     * Set of capabilities this project has
-	     */
-	    capabilities: {
-	        [key: string]: {
-	            [key: string]: string;
-	        };
-	    };
-	    /**
-	     * Reference to collection which contains this project
-	     */
-	    collection: WebApiProjectCollectionRef;
-	    /**
-	     * Default team for this project
-	     */
-	    defaultTeam: WebApiTeamRef;
-	}
-	export interface WebApiProjectCollection extends WebApiProjectCollectionRef {
-	    /**
-	     * Project collection description
-	     */
-	    description: string;
-	    /**
-	     * Project collection state
-	     */
-	    state: string;
-	}
-	export interface WebApiProjectCollectionRef {
-	    /**
-	     * Collection Tfs Url (Host Url)
-	     */
-	    collectionUrl: string;
-	    /**
-	     * Collection Guid
-	     */
-	    id: string;
-	    /**
-	     * Collection Name
-	     */
-	    name: string;
-	    /**
-	     * Collection REST Url
-	     */
-	    url: string;
-	}
-	/**
-	 * The representation of a tag definition which is sent across the wire.
-	 */
-	export interface WebApiTagDefinition {
-	    active: boolean;
-	    id: string;
-	    name: string;
-	    url: string;
-	}
-	export interface WebApiTeam extends WebApiTeamRef {
-	    /**
-	     * Team description
-	     */
-	    description: string;
-	    /**
-	     * Identity REST API Url to this team
-	     */
-	    identityUrl: string;
-	}
-	export interface WebApiTeamRef {
-	    /**
-	     * Team (Identity) Guid. A Team Foundation ID.
-	     */
-	    id: string;
-	    /**
-	     * Team name
-	     */
-	    name: string;
-	    /**
-	     * Team REST API Url
-	     */
-	    url: string;
-	}
-	export var TypeInfo: {
-	    ConnectedServiceKind: {
-	        enumValues: {
-	            "custom": number;
-	            "azureSubscription": number;
-	            "chef": number;
-	            "generic": number;
-	        };
-	    };
-	    IdentityData: {
-	        fields: any;
-	    };
-	    Process: {
-	        fields: any;
-	    };
-	    ProcessReference: {
-	        fields: any;
-	    };
-	    ProjectChangeType: {
-	        enumValues: {
-	            "modified": number;
-	            "deleted": number;
-	            "added": number;
-	        };
-	    };
-	    ProjectInfo: {
-	        fields: any;
-	    };
-	    ProjectMessage: {
-	        fields: any;
-	    };
-	    ProjectProperty: {
-	        fields: any;
-	    };
-	    Proxy: {
-	        fields: any;
-	    };
-	    SourceControlTypes: {
-	        enumValues: {
-	            "tfvc": number;
-	            "git": number;
-	        };
-	    };
-	    TeamContext: {
-	        fields: any;
-	    };
-	    TeamProject: {
-	        fields: any;
-	    };
-	    TeamProjectCollection: {
-	        fields: any;
-	    };
-	    TeamProjectCollectionReference: {
-	        fields: any;
-	    };
-	    TeamProjectReference: {
-	        fields: any;
-	    };
-	    WebApiConnectedService: {
-	        fields: any;
-	    };
-	    WebApiConnectedServiceDetails: {
-	        fields: any;
-	    };
-	    WebApiConnectedServiceRef: {
-	        fields: any;
-	    };
-	    WebApiCreateTagRequestData: {
-	        fields: any;
-	    };
-	    WebApiProject: {
-	        fields: any;
-	    };
-	    WebApiProjectCollection: {
-	        fields: any;
-	    };
-	    WebApiProjectCollectionRef: {
-	        fields: any;
-	    };
-	    WebApiTagDefinition: {
-	        fields: any;
-	    };
-	    WebApiTeam: {
-	        fields: any;
-	    };
-	    WebApiTeamRef: {
-	        fields: any;
-	    };
-	};
-
-}
-declare module 'vso-node-api/interfaces/common/OperationsInterfaces' {
-	/**
-	 * Reference for an async operation.
-	 */
-	export interface OperationReference {
-	    /**
-	     * The identifier for this operation.
-	     */
-	    id: string;
-	    /**
-	     * The current status of the operation.
-	     */
-	    status: OperationStatus;
-	    /**
-	     * Url to get the full object.
-	     */
-	    url: string;
-	}
-	export enum OperationStatus {
-	    /**
-	     * The operation object does not have the status set.
-	     */
-	    NotSet = 0,
-	    /**
-	     * The operation has been queued.
-	     */
-	    Queued = 1,
-	    /**
-	     * The operation is in progress.
-	     */
-	    InProgress = 2,
-	    /**
-	     * The operation was cancelled by the user.
-	     */
-	    Cancelled = 3,
-	    /**
-	     * The operation completed successfully.
-	     */
-	    Succeeded = 4,
-	    /**
-	     * The operation completed with a failure.
-	     */
-	    Failed = 5,
-	}
-	export var TypeInfo: {
-	    OperationReference: {
-	        fields: any;
-	    };
-	    OperationStatus: {
-	        enumValues: {
-	            "notSet": number;
-	            "queued": number;
-	            "inProgress": number;
-	            "cancelled": number;
-	            "succeeded": number;
-	            "failed": number;
-	        };
-	    };
-	};
-
-}
-declare module 'vso-node-api/CoreApi' {
-	/// <reference path="../node/node.d.ts" />
-	/// <reference path="../q/Q.d.ts" />
-	import Q = require('q');
-	import basem = require('vso-node-api/ClientApiBases');
-	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
-	import CoreInterfaces = require('vso-node-api/interfaces/CoreInterfaces');
-	import OperationsInterfaces = require('vso-node-api/interfaces/common/OperationsInterfaces');
-	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
-	export interface ICoreApi extends basem.ClientApiBase {
-	    createConnectedService(connectedServiceCreationData: CoreInterfaces.WebApiConnectedServiceDetails, projectId: string, onResult: (err: any, statusCode: number, connectedService: CoreInterfaces.WebApiConnectedService) => void): void;
-	    getConnectedServiceDetails(projectId: string, name: string, onResult: (err: any, statusCode: number, connectedService: CoreInterfaces.WebApiConnectedServiceDetails) => void): void;
-	    getConnectedServices(projectId: string, kind: CoreInterfaces.ConnectedServiceKind, onResult: (err: any, statusCode: number, connectedServices: CoreInterfaces.WebApiConnectedService[]) => void): void;
-	    createIdentityMru(mruData: CoreInterfaces.IdentityData, mruName: string, onResult: (err: any, statusCode: number) => void): void;
-	    deleteIdentityMru(mruData: CoreInterfaces.IdentityData, mruName: string, onResult: (err: any, statusCode: number) => void): void;
-	    getIdentityMru(mruName: string, onResult: (err: any, statusCode: number, identityMru: VSSInterfaces.IdentityRef[]) => void): void;
-	    updateIdentityMru(mruData: CoreInterfaces.IdentityData, mruName: string, onResult: (err: any, statusCode: number) => void): void;
-	    getTeamMembers(projectId: string, teamId: string, top: number, skip: number, onResult: (err: any, statusCode: number, members: VSSInterfaces.IdentityRef[]) => void): void;
-	    getProjectCollection(collectionId: string, onResult: (err: any, statusCode: number, projectCollection: CoreInterfaces.TeamProjectCollection) => void): void;
-	    getProjectCollections(top: number, skip: number, onResult: (err: any, statusCode: number, projectCollections: CoreInterfaces.TeamProjectCollectionReference[]) => void): void;
-	    getProjectHistory(minRevision: number, onResult: (err: any, statusCode: number, projectHistory: CoreInterfaces.TeamProjectReference[]) => void): void;
-	    getProject(projectId: string, includeCapabilities: boolean, includeHistory: boolean, onResult: (err: any, statusCode: number, project: CoreInterfaces.TeamProject) => void): void;
-	    getProjects(stateFilter: any, top: number, skip: number, onResult: (err: any, statusCode: number, projects: CoreInterfaces.TeamProjectReference[]) => void): void;
-	    queueCreateProject(projectToCreate: CoreInterfaces.TeamProject, onResult: (err: any, statusCode: number, project: OperationsInterfaces.OperationReference) => void): void;
-	    queueDeleteProject(projectId: string, onResult: (err: any, statusCode: number, project: OperationsInterfaces.OperationReference) => void): void;
-	    updateProject(projectUpdate: CoreInterfaces.TeamProject, projectId: string, onResult: (err: any, statusCode: number, project: OperationsInterfaces.OperationReference) => void): void;
-	    getProxies(proxyUrl: string, onResult: (err: any, statusCode: number, proxies: CoreInterfaces.Proxy[]) => void): void;
-	    getTeams(projectId: string, teamId: string, top: number, skip: number, onResult: (err: any, statusCode: number, team: CoreInterfaces.WebApiTeam) => void): void;
-	}
-	export interface IQCoreApi extends basem.QClientApiBase {
-	    createConnectedService(connectedServiceCreationData: CoreInterfaces.WebApiConnectedServiceDetails, projectId: string): Q.Promise<CoreInterfaces.WebApiConnectedService>;
-	    getConnectedServiceDetails(projectId: string, name: string): Q.Promise<CoreInterfaces.WebApiConnectedServiceDetails>;
-	    getConnectedServices(projectId: string, kind?: CoreInterfaces.ConnectedServiceKind): Q.Promise<CoreInterfaces.WebApiConnectedService[]>;
-	    getIdentityMru(mruName: string): Q.Promise<VSSInterfaces.IdentityRef[]>;
-	    getTeamMembers(projectId: string, teamId: string, top?: number, skip?: number): Q.Promise<VSSInterfaces.IdentityRef[]>;
-	    getProjectCollection(collectionId: string): Q.Promise<CoreInterfaces.TeamProjectCollection>;
-	    getProjectCollections(top?: number, skip?: number): Q.Promise<CoreInterfaces.TeamProjectCollectionReference[]>;
-	    getProjectHistory(minRevision?: number): Q.Promise<CoreInterfaces.TeamProjectReference[]>;
-	    getProject(projectId: string, includeCapabilities?: boolean, includeHistory?: boolean): Q.Promise<CoreInterfaces.TeamProject>;
-	    getProjects(stateFilter?: any, top?: number, skip?: number): Q.Promise<CoreInterfaces.TeamProjectReference[]>;
-	    queueCreateProject(projectToCreate: CoreInterfaces.TeamProject): Q.Promise<OperationsInterfaces.OperationReference>;
-	    queueDeleteProject(projectId: string): Q.Promise<OperationsInterfaces.OperationReference>;
-	    updateProject(projectUpdate: CoreInterfaces.TeamProject, projectId: string): Q.Promise<OperationsInterfaces.OperationReference>;
-	    getProxies(proxyUrl?: string): Q.Promise<CoreInterfaces.Proxy[]>;
-	    getTeams(projectId: string, teamId?: string, top?: number, skip?: number): Q.Promise<CoreInterfaces.WebApiTeam>;
-	}
-	export class CoreApi extends basem.ClientApiBase implements ICoreApi {
-	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
-	    /**
-	     * @param {CoreInterfaces.WebApiConnectedServiceDetails} connectedServiceCreationData
-	     * @param {string} projectId
-	     * @param onResult callback function with the resulting CoreInterfaces.WebApiConnectedService
-	     */
-	    createConnectedService(connectedServiceCreationData: CoreInterfaces.WebApiConnectedServiceDetails, projectId: string, onResult: (err: any, statusCode: number, connectedService: CoreInterfaces.WebApiConnectedService) => void): void;
-	    /**
-	     * @param {string} projectId
-	     * @param {string} name
-	     * @param onResult callback function with the resulting CoreInterfaces.WebApiConnectedServiceDetails
-	     */
-	    getConnectedServiceDetails(projectId: string, name: string, onResult: (err: any, statusCode: number, connectedService: CoreInterfaces.WebApiConnectedServiceDetails) => void): void;
-	    /**
-	     * @param {string} projectId
-	     * @param {CoreInterfaces.ConnectedServiceKind} kind
-	     * @param onResult callback function with the resulting CoreInterfaces.WebApiConnectedService[]
-	     */
-	    getConnectedServices(projectId: string, kind: CoreInterfaces.ConnectedServiceKind, onResult: (err: any, statusCode: number, connectedServices: CoreInterfaces.WebApiConnectedService[]) => void): void;
-	    /**
-	     * @param {CoreInterfaces.IdentityData} mruData
-	     * @param {string} mruName
-	     * @param onResult callback function
-	     */
-	    createIdentityMru(mruData: CoreInterfaces.IdentityData, mruName: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {CoreInterfaces.IdentityData} mruData
-	     * @param {string} mruName
-	     * @param onResult callback function
-	     */
-	    deleteIdentityMru(mruData: CoreInterfaces.IdentityData, mruName: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {string} mruName
-	     * @param onResult callback function with the resulting VSSInterfaces.IdentityRef[]
-	     */
-	    getIdentityMru(mruName: string, onResult: (err: any, statusCode: number, identityMru: VSSInterfaces.IdentityRef[]) => void): void;
-	    /**
-	     * @param {CoreInterfaces.IdentityData} mruData
-	     * @param {string} mruName
-	     * @param onResult callback function
-	     */
-	    updateIdentityMru(mruData: CoreInterfaces.IdentityData, mruName: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {string} projectId
-	     * @param {string} teamId
-	     * @param {number} top
-	     * @param {number} skip
-	     * @param onResult callback function with the resulting VSSInterfaces.IdentityRef[]
-	     */
-	    getTeamMembers(projectId: string, teamId: string, top: number, skip: number, onResult: (err: any, statusCode: number, members: VSSInterfaces.IdentityRef[]) => void): void;
-	    /**
-	     * Get project collection with the specified id or name.
-	     *
-	     * @param {string} collectionId
-	     * @param onResult callback function with the resulting CoreInterfaces.TeamProjectCollection
-	     */
-	    getProjectCollection(collectionId: string, onResult: (err: any, statusCode: number, projectCollection: CoreInterfaces.TeamProjectCollection) => void): void;
-	    /**
-	     * Get project collection references for this application.
-	     *
-	     * @param {number} top
-	     * @param {number} skip
-	     * @param onResult callback function with the resulting CoreInterfaces.TeamProjectCollectionReference[]
-	     */
-	    getProjectCollections(top: number, skip: number, onResult: (err: any, statusCode: number, projectCollections: CoreInterfaces.TeamProjectCollectionReference[]) => void): void;
-	    /**
-	     * @param {number} minRevision
-	     * @param onResult callback function with the resulting CoreInterfaces.TeamProjectReference[]
-	     */
-	    getProjectHistory(minRevision: number, onResult: (err: any, statusCode: number, projectHistory: CoreInterfaces.TeamProjectReference[]) => void): void;
-	    /**
-	     * Get project with the specified id or name, optionally including capabilities.
-	     *
-	     * @param {string} projectId
-	     * @param {boolean} includeCapabilities - Include capabilities (such as source control) in the team project result (default: false).
-	     * @param {boolean} includeHistory - Search within renamed projects (that had such name in the past).
-	     * @param onResult callback function with the resulting CoreInterfaces.TeamProject
-	     */
-	    getProject(projectId: string, includeCapabilities: boolean, includeHistory: boolean, onResult: (err: any, statusCode: number, project: CoreInterfaces.TeamProject) => void): void;
-	    /**
-	     * Get project references with the specified state
-	     *
-	     * @param {any} stateFilter - Filter on team projects in a specific team project state (default: WellFormed).
-	     * @param {number} top
-	     * @param {number} skip
-	     * @param onResult callback function with the resulting CoreInterfaces.TeamProjectReference[]
-	     */
-	    getProjects(stateFilter: any, top: number, skip: number, onResult: (err: any, statusCode: number, projects: CoreInterfaces.TeamProjectReference[]) => void): void;
-	    /**
-	     * Queue a project creation.
-	     *
-	     * @param {CoreInterfaces.TeamProject} projectToCreate - The project to create.
-	     * @param onResult callback function with the resulting OperationsInterfaces.OperationReference
-	     */
-	    queueCreateProject(projectToCreate: CoreInterfaces.TeamProject, onResult: (err: any, statusCode: number, project: OperationsInterfaces.OperationReference) => void): void;
-	    /**
-	     * Queue a project deletion.
-	     *
-	     * @param {string} projectId - The project id of the project to delete.
-	     * @param onResult callback function with the resulting OperationsInterfaces.OperationReference
-	     */
-	    queueDeleteProject(projectId: string, onResult: (err: any, statusCode: number, project: OperationsInterfaces.OperationReference) => void): void;
-	    /**
-	     * Update an existing project's name, abbreviation, or description.
-	     *
-	     * @param {CoreInterfaces.TeamProject} projectUpdate - The updates for the project.
-	     * @param {string} projectId - The project id of the project to update.
-	     * @param onResult callback function with the resulting OperationsInterfaces.OperationReference
-	     */
-	    updateProject(projectUpdate: CoreInterfaces.TeamProject, projectId: string, onResult: (err: any, statusCode: number, project: OperationsInterfaces.OperationReference) => void): void;
-	    /**
-	     * @param {string} proxyUrl
-	     * @param onResult callback function with the resulting CoreInterfaces.Proxy[]
-	     */
-	    getProxies(proxyUrl: string, onResult: (err: any, statusCode: number, proxies: CoreInterfaces.Proxy[]) => void): void;
-	    /**
-	     * @param {string} projectId
-	     * @param {string} teamId
-	     * @param {number} top
-	     * @param {number} skip
-	     * @param onResult callback function with the resulting CoreInterfaces.WebApiTeam
-	     */
-	    getTeams(projectId: string, teamId: string, top: number, skip: number, onResult: (err: any, statusCode: number, team: CoreInterfaces.WebApiTeam) => void): void;
-	}
-	export class QCoreApi extends basem.QClientApiBase implements IQCoreApi {
-	    api: CoreApi;
-	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
-	    /**
-	    * @param {CoreInterfaces.WebApiConnectedServiceDetails} connectedServiceCreationData
-	    * @param {string} projectId
-	    */
-	    createConnectedService(connectedServiceCreationData: CoreInterfaces.WebApiConnectedServiceDetails, projectId: string): Q.Promise<CoreInterfaces.WebApiConnectedService>;
-	    /**
-	    * @param {string} projectId
-	    * @param {string} name
-	    */
-	    getConnectedServiceDetails(projectId: string, name: string): Q.Promise<CoreInterfaces.WebApiConnectedServiceDetails>;
-	    /**
-	    * @param {string} projectId
-	    * @param {CoreInterfaces.ConnectedServiceKind} kind
-	    */
-	    getConnectedServices(projectId: string, kind?: CoreInterfaces.ConnectedServiceKind): Q.Promise<CoreInterfaces.WebApiConnectedService[]>;
-	    /**
-	    * @param {string} mruName
-	    */
-	    getIdentityMru(mruName: string): Q.Promise<VSSInterfaces.IdentityRef[]>;
-	    /**
-	    * @param {string} projectId
-	    * @param {string} teamId
-	    * @param {number} top
-	    * @param {number} skip
-	    */
-	    getTeamMembers(projectId: string, teamId: string, top?: number, skip?: number): Q.Promise<VSSInterfaces.IdentityRef[]>;
-	    /**
-	    * Get project collection with the specified id or name.
-	    *
-	    * @param {string} collectionId
-	    */
-	    getProjectCollection(collectionId: string): Q.Promise<CoreInterfaces.TeamProjectCollection>;
-	    /**
-	    * Get project collection references for this application.
-	    *
-	    * @param {number} top
-	    * @param {number} skip
-	    */
-	    getProjectCollections(top?: number, skip?: number): Q.Promise<CoreInterfaces.TeamProjectCollectionReference[]>;
-	    /**
-	    * @param {number} minRevision
-	    */
-	    getProjectHistory(minRevision?: number): Q.Promise<CoreInterfaces.TeamProjectReference[]>;
-	    /**
-	    * Get project with the specified id or name, optionally including capabilities.
-	    *
-	    * @param {string} projectId
-	    * @param {boolean} includeCapabilities - Include capabilities (such as source control) in the team project result (default: false).
-	    * @param {boolean} includeHistory - Search within renamed projects (that had such name in the past).
-	    */
-	    getProject(projectId: string, includeCapabilities?: boolean, includeHistory?: boolean): Q.Promise<CoreInterfaces.TeamProject>;
-	    /**
-	    * Get project references with the specified state
-	    *
-	    * @param {any} stateFilter - Filter on team projects in a specific team project state (default: WellFormed).
-	    * @param {number} top
-	    * @param {number} skip
-	    */
-	    getProjects(stateFilter?: any, top?: number, skip?: number): Q.Promise<CoreInterfaces.TeamProjectReference[]>;
-	    /**
-	    * Queue a project creation.
-	    *
-	    * @param {CoreInterfaces.TeamProject} projectToCreate - The project to create.
-	    */
-	    queueCreateProject(projectToCreate: CoreInterfaces.TeamProject): Q.Promise<OperationsInterfaces.OperationReference>;
-	    /**
-	    * Queue a project deletion.
-	    *
-	    * @param {string} projectId - The project id of the project to delete.
-	    */
-	    queueDeleteProject(projectId: string): Q.Promise<OperationsInterfaces.OperationReference>;
-	    /**
-	    * Update an existing project's name, abbreviation, or description.
-	    *
-	    * @param {CoreInterfaces.TeamProject} projectUpdate - The updates for the project.
-	    * @param {string} projectId - The project id of the project to update.
-	    */
-	    updateProject(projectUpdate: CoreInterfaces.TeamProject, projectId: string): Q.Promise<OperationsInterfaces.OperationReference>;
-	    /**
-	    * @param {string} proxyUrl
-	    */
-	    getProxies(proxyUrl?: string): Q.Promise<CoreInterfaces.Proxy[]>;
-	    /**
-	    * @param {string} projectId
-	    * @param {string} teamId
-	    * @param {number} top
-	    * @param {number} skip
-	    */
-	    getTeams(projectId: string, teamId?: string, top?: number, skip?: number): Q.Promise<CoreInterfaces.WebApiTeam>;
-	}
-
-}
-declare module 'vso-node-api/interfaces/FileContainerInterfaces' {
-	export enum ContainerItemStatus {
-	    /**
-	     * Item is created.
-	     */
-	    Created = 1,
-	    /**
-	     * Item is a file pending for upload.
-	     */
-	    PendingUpload = 2,
-	}
-	export enum ContainerItemType {
-	    /**
-	     * Any item type.
-	     */
-	    Any = 0,
-	    /**
-	     * Item is a folder which can have child items.
-	     */
-	    Folder = 1,
-	    /**
-	     * Item is a file which is stored in the file service.
-	     */
-	    File = 2,
-	}
-	export enum ContainerOptions {
-	    /**
-	     * No option.
-	     */
-	    None = 0,
-	}
-	/**
-	 * Represents a container that encapsulates a hierarchical file system.
-	 */
-	export interface FileContainer {
-	    /**
-	     * Uri of the artifact associated with the container.
-	     */
-	    artifactUri: string;
-	    contentLocation: string;
-	    /**
-	     * Owner.
-	     */
-	    createdBy: string;
-	    /**
-	     * Creation date.
-	     */
-	    dateCreated: Date;
-	    /**
-	     * Description.
-	     */
-	    description: string;
-	    /**
-	     * Id.
-	     */
-	    id: number;
-	    /**
-	     * Location of the item resource.
-	     */
-	    itemLocation: string;
-	    /**
-	     * Name.
-	     */
-	    name: string;
-	    /**
-	     * Options the container can have.
-	     */
-	    options: ContainerOptions;
-	    /**
-	     * Project Id.
-	     */
-	    scopeIdentifier: string;
-	    /**
-	     * Security token of the artifact associated with the container.
-	     */
-	    securityToken: string;
-	    /**
-	     * Identifier of the optional encryption key.
-	     */
-	    signingKeyId: string;
-	    /**
-	     * Total size of the files in bytes.
-	     */
-	    size: number;
-	}
-	/**
-	 * Represents an item in a container.
-	 */
-	export interface FileContainerItem {
-	    /**
-	     * Container Id.
-	     */
-	    containerId: number;
-	    contentId: number[];
-	    contentLocation: string;
-	    /**
-	     * Creator.
-	     */
-	    createdBy: string;
-	    /**
-	     * Creation date.
-	     */
-	    dateCreated: Date;
-	    /**
-	     * Last modified date.
-	     */
-	    dateLastModified: Date;
-	    /**
-	     * Encoding of the file. Zero if not a file.
-	     */
-	    fileEncoding: number;
-	    /**
-	     * Hash value of the file. Null if not a file.
-	     */
-	    fileHash: number[];
-	    /**
-	     * Length of the file. Zero if not of a file.
-	     */
-	    fileLength: number;
-	    /**
-	     * Type of the file. Zero if not a file.
-	     */
-	    fileType: number;
-	    /**
-	     * Location of the item resource.
-	     */
-	    itemLocation: string;
-	    /**
-	     * Type of the item: Folder, File or String.
-	     */
-	    itemType: ContainerItemType;
-	    /**
-	     * Modifier.
-	     */
-	    lastModifiedBy: string;
-	    /**
-	     * Unique path that identifies the item.
-	     */
-	    path: string;
-	    /**
-	     * Project Id.
-	     */
-	    scopeIdentifier: string;
-	    /**
-	     * Status of the item: Created or Pending Upload.
-	     */
-	    status: ContainerItemStatus;
-	    ticket: string;
-	}
-	export var TypeInfo: {
-	    ContainerItemStatus: {
-	        enumValues: {
-	            "created": number;
-	            "pendingUpload": number;
-	        };
-	    };
-	    ContainerItemType: {
-	        enumValues: {
-	            "any": number;
-	            "folder": number;
-	            "file": number;
-	        };
-	    };
-	    ContainerOptions: {
-	        enumValues: {
-	            "none": number;
-	        };
-	    };
-	    FileContainer: {
-	        fields: any;
-	    };
-	    FileContainerItem: {
-	        fields: any;
-	    };
-	};
-
-}
-declare module 'vso-node-api/FileContainerApi' {
-	/// <reference path="../node/node.d.ts" />
-	/// <reference path="../q/Q.d.ts" />
-	import Q = require('q');
-	import basem = require('vso-node-api/ClientApiBases');
-	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
-	import FileContainerInterfaces = require('vso-node-api/interfaces/FileContainerInterfaces');
-	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
-	export interface IFileContainerApi extends basem.ClientApiBase {
-	    createItem(customHeaders: any, contentStream: NodeJS.ReadableStream, containerId: number, itemPath: string, scope: string, onResult: (err: any, statusCode: number, Container: FileContainerInterfaces.FileContainerItem) => void): void;
-	    createItems(items: VSSInterfaces.VssJsonCollectionWrapperV<FileContainerInterfaces.FileContainerItem[]>, containerId: number, scope: string, onResult: (err: any, statusCode: number, Container: FileContainerInterfaces.FileContainerItem[]) => void): void;
-	    deleteItem(containerId: number, itemPath: string, scope: string, onResult: (err: any, statusCode: number) => void): void;
-	    getContainers(scope: string, artifactUris: string, onResult: (err: any, statusCode: number, Containers: FileContainerInterfaces.FileContainer[]) => void): void;
-	    getItems(containerId: number, scope: string, itemPath: string, metadata: boolean, format: string, downloadFileName: string, includeDownloadTickets: boolean, onResult: (err: any, statusCode: number, Containers: FileContainerInterfaces.FileContainerItem[]) => void): void;
-	}
-	export interface IQFileContainerApi extends basem.QClientApiBase {
-	    createItem(customHeaders: any, contentStream: NodeJS.ReadableStream, containerId: number, itemPath: string, scope?: string): Q.Promise<FileContainerInterfaces.FileContainerItem>;
-	    createItems(items: VSSInterfaces.VssJsonCollectionWrapperV<FileContainerInterfaces.FileContainerItem[]>, containerId: number, scope?: string): Q.Promise<FileContainerInterfaces.FileContainerItem[]>;
-	    getContainers(scope?: string, artifactUris?: string): Q.Promise<FileContainerInterfaces.FileContainer[]>;
-	    getItems(containerId: number, scope?: string, itemPath?: string, metadata?: boolean, format?: string, downloadFileName?: string, includeDownloadTickets?: boolean): Q.Promise<FileContainerInterfaces.FileContainerItem[]>;
-	}
-	export class FileContainerApi extends basem.ClientApiBase implements IFileContainerApi {
-	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
-	    /**
-	     * Creates the specified item in the container referenced container.
-	     *
-	     * @param {NodeJS.ReadableStream} contentStream
-	     * @param {number} containerId
-	     * @param {string} itemPath
-	     * @param {string} scope - A guid representing the scope of the container. This is often the project id.
-	     * @param onResult callback function with the resulting FileContainerInterfaces.FileContainerItem
-	     */
-	    createItem(customHeaders: any, contentStream: NodeJS.ReadableStream, containerId: number, itemPath: string, scope: string, onResult: (err: any, statusCode: number, Container: FileContainerInterfaces.FileContainerItem) => void): void;
-	    /**
-	     * Creates the specified items in in the referenced container.
-	     *
-	     * @param {VSSInterfaces.VssJsonCollectionWrapperV<FileContainerInterfaces.FileContainerItem[]>} items
-	     * @param {number} containerId
-	     * @param {string} scope - A guid representing the scope of the container. This is often the project id.
-	     * @param onResult callback function with the resulting FileContainerInterfaces.FileContainerItem[]
-	     */
-	    createItems(items: VSSInterfaces.VssJsonCollectionWrapperV<FileContainerInterfaces.FileContainerItem[]>, containerId: number, scope: string, onResult: (err: any, statusCode: number, Container: FileContainerInterfaces.FileContainerItem[]) => void): void;
-	    /**
-	     * Deletes the specified items in a container.
-	     *
-	     * @param {number} containerId - Container Id.
-	     * @param {string} itemPath - Path to delete.
-	     * @param {string} scope - A guid representing the scope of the container. This is often the project id.
-	     * @param onResult callback function
-	     */
-	    deleteItem(containerId: number, itemPath: string, scope: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * Gets containers filtered by a comma separated list of artifact uris within the same scope, if not specified returns all containers
-	     *
-	     * @param {string} scope - A guid representing the scope of the container. This is often the project id.
-	     * @param {string} artifactUris
-	     * @param onResult callback function with the resulting FileContainerInterfaces.FileContainer[]
-	     */
-	    getContainers(scope: string, artifactUris: string, onResult: (err: any, statusCode: number, Containers: FileContainerInterfaces.FileContainer[]) => void): void;
-	    /**
-	     * Gets the specified file container object in a format dependent upon the given parameters or HTTP Accept request header
-	     *
-	     * @param {number} containerId - The requested container Id
-	     * @param {string} scope - A guid representing the scope of the container. This is often the project id.
-	     * @param {string} itemPath - The path to the item of interest
-	     * @param {boolean} metadata - If true, this overrides any specified format parameter or HTTP Accept request header to provide non-recursive information for the given itemPath
-	     * @param {string} format - If specified, this overrides the HTTP Accept request header to return either 'json' or 'zip'.  If $format is specified, then api-version should also be specified as a query parameter.
-	     * @param {string} downloadFileName - If specified and returning other than JSON format, then this download name will be used (else defaults to itemPath)
-	     * @param {boolean} includeDownloadTickets
-	     * @param onResult callback function with the resulting FileContainerInterfaces.FileContainerItem[]
-	     */
-	    getItems(containerId: number, scope: string, itemPath: string, metadata: boolean, format: string, downloadFileName: string, includeDownloadTickets: boolean, onResult: (err: any, statusCode: number, Containers: FileContainerInterfaces.FileContainerItem[]) => void): void;
-	}
-	export class QFileContainerApi extends basem.QClientApiBase implements IQFileContainerApi {
-	    api: FileContainerApi;
-	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
-	    /**
-	    * Creates the specified item in the container referenced container.
-	    *
-	    * @param {NodeJS.ReadableStream} contentStream
-	    * @param {number} containerId
-	    * @param {string} itemPath
-	    * @param {string} scope - A guid representing the scope of the container. This is often the project id.
-	    */
-	    createItem(customHeaders: any, contentStream: NodeJS.ReadableStream, containerId: number, itemPath: string, scope?: string): Q.Promise<FileContainerInterfaces.FileContainerItem>;
-	    /**
-	    * Creates the specified items in in the referenced container.
-	    *
-	    * @param {VSSInterfaces.VssJsonCollectionWrapperV<FileContainerInterfaces.FileContainerItem[]>} items
-	    * @param {number} containerId
-	    * @param {string} scope - A guid representing the scope of the container. This is often the project id.
-	    */
-	    createItems(items: VSSInterfaces.VssJsonCollectionWrapperV<FileContainerInterfaces.FileContainerItem[]>, containerId: number, scope?: string): Q.Promise<FileContainerInterfaces.FileContainerItem[]>;
-	    /**
-	    * Gets containers filtered by a comma separated list of artifact uris within the same scope, if not specified returns all containers
-	    *
-	    * @param {string} scope - A guid representing the scope of the container. This is often the project id.
-	    * @param {string} artifactUris
-	    */
-	    getContainers(scope?: string, artifactUris?: string): Q.Promise<FileContainerInterfaces.FileContainer[]>;
-	    /**
-	    * Gets the specified file container object in a format dependent upon the given parameters or HTTP Accept request header
-	    *
-	    * @param {number} containerId - The requested container Id
-	    * @param {string} scope - A guid representing the scope of the container. This is often the project id.
-	    * @param {string} itemPath - The path to the item of interest
-	    * @param {boolean} metadata - If true, this overrides any specified format parameter or HTTP Accept request header to provide non-recursive information for the given itemPath
-	    * @param {string} format - If specified, this overrides the HTTP Accept request header to return either 'json' or 'zip'.  If $format is specified, then api-version should also be specified as a query parameter.
-	    * @param {string} downloadFileName - If specified and returning other than JSON format, then this download name will be used (else defaults to itemPath)
-	    * @param {boolean} includeDownloadTickets
-	    */
-	    getItems(containerId: number, scope?: string, itemPath?: string, metadata?: boolean, format?: string, downloadFileName?: string, includeDownloadTickets?: boolean): Q.Promise<FileContainerInterfaces.FileContainerItem[]>;
-	}
-
-}
-declare module 'vso-node-api/interfaces/GalleryInterfaces' {
-	export interface ExtensionAccount {
-	    accountId: string;
-	    accountName: string;
-	}
-	export interface ExtensionFile {
-	    assetType: string;
-	    contentType: string;
-	    fileId: number;
-	    shortDescription: string;
-	    version: string;
-	}
-	/**
-	 * The FilterResult is the set of extensions that matched a particular query filter.
-	 */
-	export interface ExtensionFilterResult {
-	    /**
-	     * This is the set of appplications that matched the query filter supplied.
-	     */
-	    extensions: PublishedExtension[];
-	    /**
-	     * The PagingToken is returned from a request when more records exist that match the result than were requested or could be returned. A follow-up query with this paging token can be used to retrieve more results.
-	     */
-	    pagingToken: string;
-	}
-	/**
-	 * Package that will be used to create or update a published extension
-	 */
-	export interface ExtensionPackage {
-	    /**
-	     * Base 64 encoded extension package
-	     */
-	    extensionManifest: string;
-	}
-	/**
-	 * An ExtensionQuery is used to search the gallery for a set of extensions that match one of many filter values.
-	 */
-	export interface ExtensionQuery {
-	    /**
-	     * Each filter is a unique query and will have matching set of extensions returned from the request. Each result will have the same index in the resulting array that the filter had in the incoming query.
-	     */
-	    filters: QueryFilter[];
-	    /**
-	     * The Flags are used to deterine which set of information the caller would like returned for the matched extensions.
-	     */
-	    flags: ExtensionQueryFlags;
-	}
-	export enum ExtensionQueryFilterType {
-	    /**
-	     * The values are used as tags. All tags are treated as "OR" conditions with each other. There may be some value put on the number of matched tags from the query.
-	     */
-	    Tag = 1,
-	    /**
-	     * The Values are an ExtensionName or fragment that is used to match other extension names.
-	     */
-	    DisplayName = 2,
-	    /**
-	     * The Filter is one or more tokens that define what scope to return private extensions for.
-	     */
-	    Private = 3,
-	    /**
-	     * Retrieve a set of extensions based on their id's. The values should be the extension id's encoded as strings.
-	     */
-	    Id = 4,
-	    /**
-	     * The catgeory is unlike other filters. It is AND'd with the other filters instead of being a seperate query.
-	     */
-	    Category = 5,
-	    /**
-	     * Certain contribution types may be indexed to allow for query by type. User defined types can't be indexed at the moment.
-	     */
-	    ContributionType = 6,
-	}
-	export enum ExtensionQueryFlags {
-	    /**
-	     * None is used to retrieve only the basic extension details.
-	     */
-	    None = 0,
-	    /**
-	     * IncludeVersions will return version information for extensions returned
-	     */
-	    IncludeVersions = 1,
-	    /**
-	     * IncludeFiles will return information about which files were found within the extension that were stored independant of the manifest. When asking for files, versions will be included as well since files are returned as a property of the versions.  These files can be retrieved using the path to the file without requiring the entire manifest be downloaded.
-	     */
-	    IncludeFiles = 2,
-	    /**
-	     * Include the Categories and Tags that were added to the extension definition.
-	     */
-	    IncludeCategoryAndTags = 4,
-	    /**
-	     * Include the details about which accounts the extension has been shared with if the extesion is a private extension.
-	     */
-	    IncludeSharedAccounts = 8,
-	    /**
-	     * Include properties associated with versions of the extension
-	     */
-	    IncludeVersionProperties = 16,
-	    /**
-	     * Excluding non-validated extensions will remove any extension versions that either are in the process of being validated or have failed validation.
-	     */
-	    ExcludeNonValidated = 32,
-	    /**
-	     * AllAttributes is designed to be a mask that defines all sub-elements of the extension should be returned.
-	     */
-	    AllAttributes = 31,
-	}
-	/**
-	 * This is the set of extensions that matched a supplied query through the filters given.
-	 */
-	export interface ExtensionQueryResult {
-	    /**
-	     * For each filter supplied in the query, a filter result will be returned in the query result.
-	     */
-	    results: ExtensionFilterResult[];
-	}
-	export interface ExtensionVersion {
-	    files: ExtensionFile[];
-	    flags: ExtensionVersionFlags;
-	    lastUpdated: Date;
-	    properties: {
-	        key: string;
-	        value: string;
-	    }[];
-	    validationResultMessage: string;
-	    version: string;
-	    versionDescription: string;
-	}
-	export enum ExtensionVersionFlags {
-	    /**
-	     * No flags exist for this version.
-	     */
-	    None = 0,
-	    /**
-	     * The Validated flag for a version means the extension version has passed validation and can be used..
-	     */
-	    Validated = 1,
-	}
-	/**
-	 * One condition in a QueryFilter.
-	 */
-	export interface FilterCriteria {
-	    filterType: number;
-	    /**
-	     * The value used in the match based on the filter type.
-	     */
-	    value: string;
-	}
-	export enum PagingDirection {
-	    /**
-	     * Backward will return results from earlier in the resultset.
-	     */
-	    Backward = 1,
-	    /**
-	     * Forward will return results from later in the resultset.
-	     */
-	    Forward = 2,
-	}
-	export interface PublishedExtension {
-	    allowedAccounts: ExtensionAccount[];
-	    categories: string[];
-	    displayName: string;
-	    extensionId: string;
-	    extensionName: string;
-	    flags: PublishedExtensionFlags;
-	    lastUpdated: Date;
-	    longDescription: string;
-	    publisher: PublisherFacts;
-	    shortDescription: string;
-	    tags: string[];
-	    versions: ExtensionVersion[];
-	}
-	export enum PublishedExtensionFlags {
-	    /**
-	     * This should never be returned, it is used to represent a extension who's flags havent changed during update calls.
-	     */
-	    UnChanged = 1073741824,
-	    /**
-	     * No flags exist for this extension.
-	     */
-	    None = 0,
-	    /**
-	     * The Disabled flag for an extension means the extension can't be changed and won't be used by consumers. The disabled flag is managed by the service and can't be supplied by the Extension Developers.
-	     */
-	    Disabled = 1,
-	    /**
-	     * BuiltIn Extension are available to all Tenants. An explicit registration is not required. This attribute is reserved and can't be supplied by Extension Developers.  BuiltIn extensions are by definition Public. There is no need to set the public flag for extensions marked BuiltIn.
-	     */
-	    BuiltIn = 2,
-	    /**
-	     * This extension has been validated by the service. The extension meets the requirements specified. This attribute is reserved and can't be supplied by the Extension Developers. Validation is a process that ensures that all contributions are well formed. They meet the requirements defined by the contribution type they are extending. Note this attribute will be updated asynchronously as the extension is validated by the developer of the contribution type. There will be restricted access to the extension while this process is performed.
-	     */
-	    Validated = 4,
-	    /**
-	     * This extension registration is public, making its visibilty open to the public. This means all tenants have the ability to install this extension. Without this flag the extension will be private and will need to be shared with the tenants that can install it.
-	     */
-	    Public = 256,
-	    /**
-	     * This extension has multiple versions active at one time and version discovery should be done usig the defined "Version Discovery" protocol to determine the version available to a specific user or tenant.  @TODO: Link to Version Discovery Protocol.
-	     */
-	    MultiVersion = 512,
-	    /**
-	     * The system flag is reserved, and cant be used by publishers.
-	     */
-	    System = 1024,
-	    /**
-	     * This is the set of flags that can't be supplied by the developer and is managed by the service itself.
-	     */
-	    ServiceFlags = 1029,
-	}
-	export interface Publisher {
-	    displayName: string;
-	    extensions: PublishedExtension[];
-	    flags: PublisherFlags;
-	    lastUpdated: Date;
-	    longDescription: string;
-	    publisherId: string;
-	    publisherName: string;
-	    shortDescription: string;
-	}
-	/**
-	 * High-level information about the publisher, like id's and names
-	 */
-	export interface PublisherFacts {
-	    displayName: string;
-	    publisherId: string;
-	    publisherName: string;
-	}
-	/**
-	 * The FilterResult is the set of publishers that matched a particular query filter.
-	 */
-	export interface PublisherFilterResult {
-	    /**
-	     * This is the set of appplications that matched the query filter supplied.
-	     */
-	    publishers: Publisher[];
-	}
-	export enum PublisherFlags {
-	    /**
-	     * This should never be returned, it is used to represent a publisher who's flags havent changed during update calls.
-	     */
-	    UnChanged = 1073741824,
-	    /**
-	     * No flags exist for this publisher.
-	     */
-	    None = 0,
-	    /**
-	     * The Disabled flag for a publisher means the publisher can't be changed and won't be used by consumers, this extends to extensions owned by the publisher as well. The disabled flag is managed by the service and can't be supplied by the Extension Developers.
-	     */
-	    Disabled = 1,
-	    /**
-	     * This is the set of flags that can't be supplied by the developer and is managed by the service itself.
-	     */
-	    ServiceFlags = 1,
-	}
-	export enum PublisherPermissions {
-	    /**
-	     * This gives the bearer the rights to read Publishers and Extensions.
-	     */
-	    Read = 1,
-	    /**
-	     * This gives the bearer the rights to update Publishers and Extensions (but not the ability to Create them).
-	     */
-	    Write = 2,
-	    /**
-	     * This gives the bearer the rights to create new Publishers at the root of the namespace.
-	     */
-	    Create = 4,
-	    /**
-	     * This gives the bearer the rights to create new Extensions within a publisher.
-	     */
-	    Publish = 8,
-	    /**
-	     * Admin gives the bearer the rights to manage restricted attributes of Publishers and Extensions.
-	     */
-	    Admin = 16,
-	    /**
-	     * TrustedPartner gives the bearer the rights to publish a extensions with restricted capabilities.
-	     */
-	    TrustedPartner = 32,
-	    /**
-	     * PrivateRead is another form of read designed to allow higher privilege accessors the ability to read private extensions.
-	     */
-	    PrivateRead = 64,
-	}
-	/**
-	 * An PublisherQuery is used to search the gallery for a set of publishers that match one of many filter values.
-	 */
-	export interface PublisherQuery {
-	    /**
-	     * Each filter is a unique query and will have matching set of publishers returned from the request. Each result will have the same index in the resulting array that the filter had in the incoming query.
-	     */
-	    filters: QueryFilter[];
-	    /**
-	     * The Flags are used to deterine which set of information the caller would like returned for the matched publishers.
-	     */
-	    flags: PublisherQueryFlags;
-	}
-	export enum PublisherQueryFilterType {
-	    /**
-	     * The values are used as tags. All tags are treated as "OR" conditions with each other. There may be some value put on the number of matched tags from the query.
-	     */
-	    Tag = 1,
-	    /**
-	     * The Values are an PublisherName or fragment that is used to match other extension names.
-	     */
-	    DisplayName = 2,
-	    /**
-	     * The My Query filter is used to retrieve the set of publishers that I have access to publish extesions into. All Values are ignored and the calling user is used as the filter in this case.
-	     */
-	    My = 3,
-	}
-	export enum PublisherQueryFlags {
-	    /**
-	     * None is used to retrieve only the basic publisher details.
-	     */
-	    None = 0,
-	    /**
-	     * Is used to include a list of basic extension details for all extensions published by the requested publisher.
-	     */
-	    IncludeExtensions = 1,
-	}
-	/**
-	 * This is the set of publishers that matched a supplied query through the filters given.
-	 */
-	export interface PublisherQueryResult {
-	    /**
-	     * For each filter supplied in the query, a filter result will be returned in the query result.
-	     */
-	    results: PublisherFilterResult[];
-	}
-	/**
-	 * A filter used to define a set of extensions to return during a query.
-	 */
-	export interface QueryFilter {
-	    /**
-	     * The filter values define the set of values in this query. They are applied based on the QueryFilterType.
-	     */
-	    criteria: FilterCriteria[];
-	    /**
-	     * The PagingDirection is applied to a paging token if one exists. If not the direction is ignored, and Forward from the start of the resultset is used. Direction should be left out of the request unless a paging token is used to help prevent future issues.
-	     */
-	    direction: PagingDirection;
-	    /**
-	     * The page size defines the number of results the caller wants for this filter. The count can't exceed the overall query size limits.
-	     */
-	    pageSize: number;
-	    /**
-	     * The paging token is a distinct type of filter and the other filter fields are ignored. The paging token represents the continuation of a previously executed query. The information about where in the result and what fields are being filtered are embeded in the token.
-	     */
-	    pagingToken: string;
-	}
-	export enum SigningKeyPermissions {
-	    Read = 1,
-	    Write = 2,
-	}
-	export var TypeInfo: {
-	    ExtensionAccount: {
-	        fields: any;
-	    };
-	    ExtensionFile: {
-	        fields: any;
-	    };
-	    ExtensionFilterResult: {
-	        fields: any;
-	    };
-	    ExtensionPackage: {
-	        fields: any;
-	    };
-	    ExtensionQuery: {
-	        fields: any;
-	    };
-	    ExtensionQueryFilterType: {
-	        enumValues: {
-	            "tag": number;
-	            "displayName": number;
-	            "private": number;
-	            "id": number;
-	            "category": number;
-	            "contributionType": number;
-	        };
-	    };
-	    ExtensionQueryFlags: {
-	        enumValues: {
-	            "none": number;
-	            "includeVersions": number;
-	            "includeFiles": number;
-	            "includeCategoryAndTags": number;
-	            "includeSharedAccounts": number;
-	            "includeVersionProperties": number;
-	            "excludeNonValidated": number;
-	            "allAttributes": number;
-	        };
-	    };
-	    ExtensionQueryResult: {
-	        fields: any;
-	    };
-	    ExtensionVersion: {
-	        fields: any;
-	    };
-	    ExtensionVersionFlags: {
-	        enumValues: {
-	            "none": number;
-	            "validated": number;
-	        };
-	    };
-	    FilterCriteria: {
-	        fields: any;
-	    };
-	    PagingDirection: {
-	        enumValues: {
-	            "backward": number;
-	            "forward": number;
-	        };
-	    };
-	    PublishedExtension: {
-	        fields: any;
-	    };
-	    PublishedExtensionFlags: {
-	        enumValues: {
-	            "unChanged": number;
-	            "none": number;
-	            "disabled": number;
-	            "builtIn": number;
-	            "validated": number;
-	            "public": number;
-	            "multiVersion": number;
-	            "system": number;
-	            "serviceFlags": number;
-	        };
-	    };
-	    Publisher: {
-	        fields: any;
-	    };
-	    PublisherFacts: {
-	        fields: any;
-	    };
-	    PublisherFilterResult: {
-	        fields: any;
-	    };
-	    PublisherFlags: {
-	        enumValues: {
-	            "unChanged": number;
-	            "none": number;
-	            "disabled": number;
-	            "serviceFlags": number;
-	        };
-	    };
-	    PublisherPermissions: {
-	        enumValues: {
-	            "read": number;
-	            "write": number;
-	            "create": number;
-	            "publish": number;
-	            "admin": number;
-	            "trustedPartner": number;
-	            "privateRead": number;
-	        };
-	    };
-	    PublisherQuery: {
-	        fields: any;
-	    };
-	    PublisherQueryFilterType: {
-	        enumValues: {
-	            "tag": number;
-	            "displayName": number;
-	            "my": number;
-	        };
-	    };
-	    PublisherQueryFlags: {
-	        enumValues: {
-	            "none": number;
-	            "includeExtensions": number;
-	        };
-	    };
-	    PublisherQueryResult: {
-	        fields: any;
-	    };
-	    QueryFilter: {
-	        fields: any;
-	    };
-	    SigningKeyPermissions: {
-	        enumValues: {
-	            "read": number;
-	            "write": number;
-	        };
-	    };
-	};
-
-}
-declare module 'vso-node-api/GalleryApi' {
-	/// <reference path="../node/node.d.ts" />
-	/// <reference path="../q/Q.d.ts" />
-	import Q = require('q');
-	import basem = require('vso-node-api/ClientApiBases');
-	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
-	import GalleryInterfaces = require('vso-node-api/interfaces/GalleryInterfaces');
-	export interface IGalleryApi extends basem.ClientApiBase {
-	    shareExtensionById(extensionId: string, accountName: string, onResult: (err: any, statusCode: number) => void): void;
-	    unshareExtensionById(extensionId: string, accountName: string, onResult: (err: any, statusCode: number) => void): void;
-	    shareExtension(publisherName: string, extensionName: string, accountName: string, onResult: (err: any, statusCode: number) => void): void;
-	    unshareExtension(publisherName: string, extensionName: string, accountName: string, onResult: (err: any, statusCode: number) => void): void;
-	    getAsset(extensionId: string, version: string, assetType: string, accountToken: string, acceptDefault: boolean, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    getCategories(languages: string, onResult: (err: any, statusCode: number, categories: string[]) => void): void;
-	    getCertificate(publisherName: string, extensionName: string, version: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    queryExtensions(extensionQuery: GalleryInterfaces.ExtensionQuery, accountToken: string, onResult: (err: any, statusCode: number, extensionquery: GalleryInterfaces.ExtensionQueryResult) => void): void;
-	    createExtension(extensionPackage: GalleryInterfaces.ExtensionPackage, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
-	    deleteExtensionById(extensionId: string, version: string, onResult: (err: any, statusCode: number) => void): void;
-	    getExtensionById(extensionId: string, version: string, flags: GalleryInterfaces.ExtensionQueryFlags, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
-	    updateExtensionById(extensionPackage: GalleryInterfaces.ExtensionPackage, extensionId: string, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
-	    createExtensionWithPublisher(extensionPackage: GalleryInterfaces.ExtensionPackage, publisherName: string, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
-	    deleteExtension(publisherName: string, extensionName: string, version: string, onResult: (err: any, statusCode: number) => void): void;
-	    getExtension(publisherName: string, extensionName: string, version: string, flags: GalleryInterfaces.ExtensionQueryFlags, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
-	    updateExtension(extensionPackage: GalleryInterfaces.ExtensionPackage, publisherName: string, extensionName: string, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
-	    queryPublishers(publisherQuery: GalleryInterfaces.PublisherQuery, onResult: (err: any, statusCode: number, publisherquery: GalleryInterfaces.PublisherQueryResult) => void): void;
-	    createPublisher(publisher: GalleryInterfaces.Publisher, onResult: (err: any, statusCode: number, publisher: GalleryInterfaces.Publisher) => void): void;
-	    deletePublisher(publisherName: string, onResult: (err: any, statusCode: number) => void): void;
-	    getPublisher(publisherName: string, flags: number, onResult: (err: any, statusCode: number, publisher: GalleryInterfaces.Publisher) => void): void;
-	    updatePublisher(publisher: GalleryInterfaces.Publisher, publisherName: string, onResult: (err: any, statusCode: number, publisher: GalleryInterfaces.Publisher) => void): void;
-	    generateKey(keyType: string, expireCurrentSeconds: number, onResult: (err: any, statusCode: number) => void): void;
-	    getSigningKey(keyType: string, onResult: (err: any, statusCode: number, signingkey: string) => void): void;
-	}
-	export interface IQGalleryApi extends basem.QClientApiBase {
-	    getCategories(languages?: string): Q.Promise<string[]>;
-	    queryExtensions(extensionQuery: GalleryInterfaces.ExtensionQuery, accountToken?: string): Q.Promise<GalleryInterfaces.ExtensionQueryResult>;
-	    createExtension(extensionPackage: GalleryInterfaces.ExtensionPackage): Q.Promise<GalleryInterfaces.PublishedExtension>;
-	    getExtensionById(extensionId: string, version?: string, flags?: GalleryInterfaces.ExtensionQueryFlags): Q.Promise<GalleryInterfaces.PublishedExtension>;
-	    updateExtensionById(extensionPackage: GalleryInterfaces.ExtensionPackage, extensionId: string): Q.Promise<GalleryInterfaces.PublishedExtension>;
-	    createExtensionWithPublisher(extensionPackage: GalleryInterfaces.ExtensionPackage, publisherName: string): Q.Promise<GalleryInterfaces.PublishedExtension>;
-	    getExtension(publisherName: string, extensionName: string, version?: string, flags?: GalleryInterfaces.ExtensionQueryFlags): Q.Promise<GalleryInterfaces.PublishedExtension>;
-	    updateExtension(extensionPackage: GalleryInterfaces.ExtensionPackage, publisherName: string, extensionName: string): Q.Promise<GalleryInterfaces.PublishedExtension>;
-	    queryPublishers(publisherQuery: GalleryInterfaces.PublisherQuery): Q.Promise<GalleryInterfaces.PublisherQueryResult>;
-	    createPublisher(publisher: GalleryInterfaces.Publisher): Q.Promise<GalleryInterfaces.Publisher>;
-	    getPublisher(publisherName: string, flags?: number): Q.Promise<GalleryInterfaces.Publisher>;
-	    updatePublisher(publisher: GalleryInterfaces.Publisher, publisherName: string): Q.Promise<GalleryInterfaces.Publisher>;
-	    getSigningKey(keyType: string): Q.Promise<string>;
-	}
-	export class GalleryApi extends basem.ClientApiBase implements IGalleryApi {
-	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
-	    /**
-	     * @param {string} extensionId
-	     * @param {string} accountName
-	     * @param onResult callback function
-	     */
-	    shareExtensionById(extensionId: string, accountName: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {string} extensionId
-	     * @param {string} accountName
-	     * @param onResult callback function
-	     */
-	    unshareExtensionById(extensionId: string, accountName: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {string} publisherName
-	     * @param {string} extensionName
-	     * @param {string} accountName
-	     * @param onResult callback function
-	     */
-	    shareExtension(publisherName: string, extensionName: string, accountName: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {string} publisherName
-	     * @param {string} extensionName
-	     * @param {string} accountName
-	     * @param onResult callback function
-	     */
-	    unshareExtension(publisherName: string, extensionName: string, accountName: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {string} extensionId
-	     * @param {string} version
-	     * @param {string} assetType
-	     * @param {string} accountToken
-	     * @param {boolean} acceptDefault
-	     * @param onResult callback function with the resulting ArrayBuffer
-	     */
-	    getAsset(extensionId: string, version: string, assetType: string, accountToken: string, acceptDefault: boolean, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    /**
-	     * @param {string} languages
-	     * @param onResult callback function with the resulting string[]
-	     */
-	    getCategories(languages: string, onResult: (err: any, statusCode: number, categories: string[]) => void): void;
-	    /**
-	     * @param {string} publisherName
-	     * @param {string} extensionName
-	     * @param {string} version
-	     * @param onResult callback function with the resulting ArrayBuffer
-	     */
-	    getCertificate(publisherName: string, extensionName: string, version: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    /**
-	     * @param {GalleryInterfaces.ExtensionQuery} extensionQuery
-	     * @param {string} accountToken
-	     * @param onResult callback function with the resulting GalleryInterfaces.ExtensionQueryResult
-	     */
-	    queryExtensions(extensionQuery: GalleryInterfaces.ExtensionQuery, accountToken: string, onResult: (err: any, statusCode: number, extensionquery: GalleryInterfaces.ExtensionQueryResult) => void): void;
-	    /**
-	     * @param {GalleryInterfaces.ExtensionPackage} extensionPackage
-	     * @param onResult callback function with the resulting GalleryInterfaces.PublishedExtension
-	     */
-	    createExtension(extensionPackage: GalleryInterfaces.ExtensionPackage, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
-	    /**
-	     * @param {string} extensionId
-	     * @param {string} version
-	     * @param onResult callback function
-	     */
-	    deleteExtensionById(extensionId: string, version: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {string} extensionId
-	     * @param {string} version
-	     * @param {GalleryInterfaces.ExtensionQueryFlags} flags
-	     * @param onResult callback function with the resulting GalleryInterfaces.PublishedExtension
-	     */
-	    getExtensionById(extensionId: string, version: string, flags: GalleryInterfaces.ExtensionQueryFlags, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
-	    /**
-	     * @param {GalleryInterfaces.ExtensionPackage} extensionPackage
-	     * @param {string} extensionId
-	     * @param onResult callback function with the resulting GalleryInterfaces.PublishedExtension
-	     */
-	    updateExtensionById(extensionPackage: GalleryInterfaces.ExtensionPackage, extensionId: string, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
-	    /**
-	     * @param {GalleryInterfaces.ExtensionPackage} extensionPackage
-	     * @param {string} publisherName
-	     * @param onResult callback function with the resulting GalleryInterfaces.PublishedExtension
-	     */
-	    createExtensionWithPublisher(extensionPackage: GalleryInterfaces.ExtensionPackage, publisherName: string, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
-	    /**
-	     * @param {string} publisherName
-	     * @param {string} extensionName
-	     * @param {string} version
-	     * @param onResult callback function
-	     */
-	    deleteExtension(publisherName: string, extensionName: string, version: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {string} publisherName
-	     * @param {string} extensionName
-	     * @param {string} version
-	     * @param {GalleryInterfaces.ExtensionQueryFlags} flags
-	     * @param onResult callback function with the resulting GalleryInterfaces.PublishedExtension
-	     */
-	    getExtension(publisherName: string, extensionName: string, version: string, flags: GalleryInterfaces.ExtensionQueryFlags, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
-	    /**
-	     * @param {GalleryInterfaces.ExtensionPackage} extensionPackage
-	     * @param {string} publisherName
-	     * @param {string} extensionName
-	     * @param onResult callback function with the resulting GalleryInterfaces.PublishedExtension
-	     */
-	    updateExtension(extensionPackage: GalleryInterfaces.ExtensionPackage, publisherName: string, extensionName: string, onResult: (err: any, statusCode: number, extension: GalleryInterfaces.PublishedExtension) => void): void;
-	    /**
-	     * @param {GalleryInterfaces.PublisherQuery} publisherQuery
-	     * @param onResult callback function with the resulting GalleryInterfaces.PublisherQueryResult
-	     */
-	    queryPublishers(publisherQuery: GalleryInterfaces.PublisherQuery, onResult: (err: any, statusCode: number, publisherquery: GalleryInterfaces.PublisherQueryResult) => void): void;
-	    /**
-	     * @param {GalleryInterfaces.Publisher} publisher
-	     * @param onResult callback function with the resulting GalleryInterfaces.Publisher
-	     */
-	    createPublisher(publisher: GalleryInterfaces.Publisher, onResult: (err: any, statusCode: number, publisher: GalleryInterfaces.Publisher) => void): void;
-	    /**
-	     * @param {string} publisherName
-	     * @param onResult callback function
-	     */
-	    deletePublisher(publisherName: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {string} publisherName
-	     * @param {number} flags
-	     * @param onResult callback function with the resulting GalleryInterfaces.Publisher
-	     */
-	    getPublisher(publisherName: string, flags: number, onResult: (err: any, statusCode: number, publisher: GalleryInterfaces.Publisher) => void): void;
-	    /**
-	     * @param {GalleryInterfaces.Publisher} publisher
-	     * @param {string} publisherName
-	     * @param onResult callback function with the resulting GalleryInterfaces.Publisher
-	     */
-	    updatePublisher(publisher: GalleryInterfaces.Publisher, publisherName: string, onResult: (err: any, statusCode: number, publisher: GalleryInterfaces.Publisher) => void): void;
-	    /**
-	     * @param {string} keyType
-	     * @param {number} expireCurrentSeconds
-	     * @param onResult callback function
-	     */
-	    generateKey(keyType: string, expireCurrentSeconds: number, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {string} keyType
-	     * @param onResult callback function with the resulting string
-	     */
-	    getSigningKey(keyType: string, onResult: (err: any, statusCode: number, signingkey: string) => void): void;
-	}
-	export class QGalleryApi extends basem.QClientApiBase implements IQGalleryApi {
-	    api: GalleryApi;
-	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
-	    /**
-	    * @param {string} languages
-	    */
-	    getCategories(languages?: string): Q.Promise<string[]>;
-	    /**
-	    * @param {GalleryInterfaces.ExtensionQuery} extensionQuery
-	    * @param {string} accountToken
-	    */
-	    queryExtensions(extensionQuery: GalleryInterfaces.ExtensionQuery, accountToken?: string): Q.Promise<GalleryInterfaces.ExtensionQueryResult>;
-	    /**
-	    * @param {GalleryInterfaces.ExtensionPackage} extensionPackage
-	    */
-	    createExtension(extensionPackage: GalleryInterfaces.ExtensionPackage): Q.Promise<GalleryInterfaces.PublishedExtension>;
-	    /**
-	    * @param {string} extensionId
-	    * @param {string} version
-	    * @param {GalleryInterfaces.ExtensionQueryFlags} flags
-	    */
-	    getExtensionById(extensionId: string, version?: string, flags?: GalleryInterfaces.ExtensionQueryFlags): Q.Promise<GalleryInterfaces.PublishedExtension>;
-	    /**
-	    * @param {GalleryInterfaces.ExtensionPackage} extensionPackage
-	    * @param {string} extensionId
-	    */
-	    updateExtensionById(extensionPackage: GalleryInterfaces.ExtensionPackage, extensionId: string): Q.Promise<GalleryInterfaces.PublishedExtension>;
-	    /**
-	    * @param {GalleryInterfaces.ExtensionPackage} extensionPackage
-	    * @param {string} publisherName
-	    */
-	    createExtensionWithPublisher(extensionPackage: GalleryInterfaces.ExtensionPackage, publisherName: string): Q.Promise<GalleryInterfaces.PublishedExtension>;
-	    /**
-	    * @param {string} publisherName
-	    * @param {string} extensionName
-	    * @param {string} version
-	    * @param {GalleryInterfaces.ExtensionQueryFlags} flags
-	    */
-	    getExtension(publisherName: string, extensionName: string, version?: string, flags?: GalleryInterfaces.ExtensionQueryFlags): Q.Promise<GalleryInterfaces.PublishedExtension>;
-	    /**
-	    * @param {GalleryInterfaces.ExtensionPackage} extensionPackage
-	    * @param {string} publisherName
-	    * @param {string} extensionName
-	    */
-	    updateExtension(extensionPackage: GalleryInterfaces.ExtensionPackage, publisherName: string, extensionName: string): Q.Promise<GalleryInterfaces.PublishedExtension>;
-	    /**
-	    * @param {GalleryInterfaces.PublisherQuery} publisherQuery
-	    */
-	    queryPublishers(publisherQuery: GalleryInterfaces.PublisherQuery): Q.Promise<GalleryInterfaces.PublisherQueryResult>;
-	    /**
-	    * @param {GalleryInterfaces.Publisher} publisher
-	    */
-	    createPublisher(publisher: GalleryInterfaces.Publisher): Q.Promise<GalleryInterfaces.Publisher>;
-	    /**
-	    * @param {string} publisherName
-	    * @param {number} flags
-	    */
-	    getPublisher(publisherName: string, flags?: number): Q.Promise<GalleryInterfaces.Publisher>;
-	    /**
-	    * @param {GalleryInterfaces.Publisher} publisher
-	    * @param {string} publisherName
-	    */
-	    updatePublisher(publisher: GalleryInterfaces.Publisher, publisherName: string): Q.Promise<GalleryInterfaces.Publisher>;
-	    /**
-	    * @param {string} keyType
-	    */
-	    getSigningKey(keyType: string): Q.Promise<string>;
-	}
-
-}
-declare module 'vso-node-api/interfaces/GitInterfaces' {
-	import TfsInterfaces = require('vso-node-api/interfaces/common/TfsInterfaces');
-	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
-	export interface AssociatedWorkItem {
-	    assignedTo: string;
-	    id: number;
-	    state: string;
-	    title: string;
-	    /**
-	     * REST url
-	     */
-	    url: string;
-	    webUrl: string;
-	    workItemType: string;
-	}
-	export interface Change<T> {
-	    changeType: VersionControlChangeType;
-	    item: T;
-	    newContent: ItemContent;
-	    sourceServerItem: string;
-	    url: string;
-	}
-	export interface ChangeCountDictionary {
-	}
-	export interface ChangeList<T> {
-	    allChangesIncluded: boolean;
-	    changeCounts: {
-	        [key: number]: number;
-	    };
-	    changes: Change<T>[];
-	    comment: string;
-	    commentTruncated: boolean;
-	    creationDate: Date;
-	    notes: CheckinNote[];
-	    owner: string;
-	    ownerDisplayName: string;
-	    ownerId: string;
-	    sortDate: Date;
-	    version: string;
-	}
-	/**
-	 * Criteria used in a search for change lists
-	 */
-	export interface ChangeListSearchCriteria {
-	    /**
-	     * If provided, a version descriptor to compare against base
-	     */
-	    compareVersion: string;
-	    /**
-	     * If true, don't include delete history entries
-	     */
-	    excludeDeletes: boolean;
-	    /**
-	     * Whether or not to follow renames for the given item being queried
-	     */
-	    followRenames: boolean;
-	    /**
-	     * If provided, only include history entries created after this date (string)
-	     */
-	    fromDate: string;
-	    /**
-	     * If provided, a version descriptor for the earliest change list to include
-	     */
-	    fromVersion: string;
-	    /**
-	     * Path of item to search under
-	     */
-	    itemPath: string;
-	    /**
-	     * Version of the items to search
-	     */
-	    itemVersion: string;
-	    /**
-	     * Number of results to skip (used when clicking more...)
-	     */
-	    skip: number;
-	    /**
-	     * If provided, only include history entries created before this date (string)
-	     */
-	    toDate: string;
-	    /**
-	     * If provided, the maximum number of history entries to return
-	     */
-	    top: number;
-	    /**
-	     * If provided, a version descriptor for the latest change list to include
-	     */
-	    toVersion: string;
-	    /**
-	     * Alias or display name of user who made the changes
-	     */
-	    user: string;
-	}
-	export interface CheckinNote {
-	    name: string;
-	    value: string;
-	}
-	export interface FileContentMetadata {
-	    contentType: string;
-	    encoding: number;
-	    extension: string;
-	    fileName: string;
-	    isBinary: boolean;
-	    isImage: boolean;
-	    vsLink: string;
-	}
-	export interface GitBaseVersionDescriptor extends GitVersionDescriptor {
-	    /**
-	     * Version string identifier (name of tag/branch, SHA1 of commit)
-	     */
-	    baseVersion: string;
-	    /**
-	     * Version options - Specify additional modifiers to version (e.g Previous)
-	     */
-	    baseVersionOptions: GitVersionOptions;
-	    /**
-	     * Version type (branch, tag, or commit). Determines how Id is interpreted
-	     */
-	    baseVersionType: GitVersionType;
-	}
-	export interface GitBlobRef {
-	    _links: any;
-	    /**
-	     * SHA1 hash of git object
-	     */
-	    objectId: string;
-	    /**
-	     * Size of blob content (in bytes)
-	     */
-	    size: number;
-	    url: string;
-	}
-	export interface GitBranchStats {
-	    aheadCount: number;
-	    behindCount: number;
-	    commit: GitCommitRef;
-	    isBaseVersion: boolean;
-	    name: string;
-	}
-	export interface GitChange extends Change<GitItem> {
-	}
-	export interface GitCommit extends GitCommitRef {
-	    push: GitPushRef;
-	    treeId: string;
-	}
-	export interface GitCommitChanges {
-	    changeCounts: ChangeCountDictionary;
-	    changes: GitChange[];
-	}
-	export interface GitCommitDiffs {
-	    aheadCount: number;
-	    allChangesIncluded: boolean;
-	    baseCommit: string;
-	    behindCount: number;
-	    changeCounts: {
-	        [key: number]: number;
-	    };
-	    changes: GitChange[];
-	    commonCommit: string;
-	    targetCommit: string;
-	}
-	export interface GitCommitRef {
-	    _links: any;
-	    author: GitUserDate;
-	    changeCounts: ChangeCountDictionary;
-	    changes: GitChange[];
-	    comment: string;
-	    commentTruncated: boolean;
-	    commitId: string;
-	    committer: GitUserDate;
-	    parents: string[];
-	    remoteUrl: string;
-	    url: string;
-	}
-	export interface GitCommitToCreate {
-	    baseRef: GitRef;
-	    comment: string;
-	    pathActions: GitPathAction[];
-	}
-	export interface GitHistoryQueryResults extends HistoryQueryResults<GitItem> {
-	    /**
-	     * Seed commit used for querying history.  Used for skip feature.
-	     */
-	    startingCommitId: string;
-	    unpopulatedCount: number;
-	    unprocessedCount: number;
-	}
-	export interface GitItem extends ItemModel {
-	    /**
-	     * SHA1 of commit item was fetched at
-	     */
-	    commitId: string;
-	    /**
-	     * Type of object (Commit, Tree, Blob, Tag, ...)
-	     */
-	    gitObjectType: GitObjectType;
-	    /**
-	     * Shallow ref to commit that last changed this item Only populated if latestProcessedChange is requested May not be accurate if latest change is not yet cached
-	     */
-	    latestProcessedChange: GitCommitRef;
-	    /**
-	     * Git object id
-	     */
-	    objectId: string;
-	    /**
-	     * Git object id
-	     */
-	    originalObjectId: string;
-	}
-	export interface GitItemDescriptor {
-	    /**
-	     * Path to item
-	     */
-	    path: string;
-	    /**
-	     * Specifies whether to include children (OneLevel), all descendants (Full), or None
-	     */
-	    recursionLevel: VersionControlRecursionType;
-	    /**
-	     * Version string (interpretation based on VersionType defined in subclass
-	     */
-	    version: string;
-	    /**
-	     * Version modifiers (e.g. previous)
-	     */
-	    versionOptions: GitVersionOptions;
-	    /**
-	     * How to interpret version (branch,tag,commit)
-	     */
-	    versionType: GitVersionType;
-	}
-	export interface GitItemRequestData {
-	    /**
-	     * Whether to include metadata for all items
-	     */
-	    includeContentMetadata: boolean;
-	    /**
-	     * Whether to include the _links field on the shallow references
-	     */
-	    includeLinks: boolean;
-	    /**
-	     * Collection of items to fetch, including path, version, and recursion level
-	     */
-	    itemDescriptors: GitItemDescriptor[];
-	    /**
-	     * Whether to include shallow ref to commit that last changed each item
-	     */
-	    latestProcessedChange: boolean;
-	}
-	/**
-	 * Encapsulates the reference metadata of a Git media object.
-	 */
-	export interface GitMediaObjectRef {
-	    /**
-	     * Gets or sets the reference links of the Git media object.
-	     */
-	    _links: any;
-	    /**
-	     * Gets or sets the Git media object identifier. This Id property duplicates the Oid property, but is required by the VSO REST specification.
-	     */
-	    id: string;
-	    /**
-	     * Gets or sets the Git media object identifier. This property exists for adherence to the GitHub Git Media contract.
-	     */
-	    oid: string;
-	    /**
-	     * Gets or sets the size of the Git media object in bytes. This property exists for adherence to the GitHub Git Media contract.
-	     */
-	    size: number;
-	    /**
-	     * Gets or sets the URL for the Git media object.
-	     */
-	    url: string;
-	}
-	export enum GitObjectType {
-	    Bad = 0,
-	    Commit = 1,
-	    Tree = 2,
-	    Blob = 3,
-	    Tag = 4,
-	    Ext2 = 5,
-	    OfsDelta = 6,
-	    RefDelta = 7,
-	}
-	export interface GitPathAction {
-	    action: GitPathActions;
-	    base64Content: string;
-	    path: string;
-	    rawTextContent: string;
-	    targetPath: string;
-	}
-	export enum GitPathActions {
-	    None = 0,
-	    Edit = 1,
-	    Delete = 2,
-	    Add = 3,
-	    Rename = 4,
-	}
-	export interface GitPullRequest {
-	    _links: any;
-	    closedDate: Date;
-	    codeReviewId: number;
-	    createdBy: VSSInterfaces.IdentityRef;
-	    creationDate: Date;
-	    description: string;
-	    lastMergeCommit: GitCommitRef;
-	    lastMergeSourceCommit: GitCommitRef;
-	    lastMergeTargetCommit: GitCommitRef;
-	    mergeId: string;
-	    mergeStatus: PullRequestAsyncStatus;
-	    pullRequestId: number;
-	    remoteUrl: string;
-	    repository: GitRepository;
-	    reviewers: IdentityRefWithVote[];
-	    sourceRefName: string;
-	    status: PullRequestStatus;
-	    targetRefName: string;
-	    title: string;
-	    upgraded: boolean;
-	    url: string;
-	}
-	export interface GitPullRequestSearchCriteria {
-	    creatorId: string;
-	    /**
-	     * Whether to include the _links field on the shallow references
-	     */
-	    includeLinks: boolean;
-	    repositoryId: string;
-	    reviewerId: string;
-	    sourceRefName: string;
-	    status: PullRequestStatus;
-	    targetRefName: string;
-	}
-	export interface GitPush extends GitPushRef {
-	    commits: GitCommitRef[];
-	    refUpdates: GitRefUpdate[];
-	    repository: GitRepository;
-	}
-	export interface GitPushEventData {
-	    afterId: string;
-	    beforeId: string;
-	    branch: string;
-	    commits: GitCommit[];
-	    repository: GitRepository;
-	}
-	export interface GitPushRef {
-	    _links: any;
-	    date: Date;
-	    pushCorrelationId: string;
-	    pushedBy: VSSInterfaces.IdentityRef;
-	    pushId: number;
-	    url: string;
-	}
-	export interface GitPushSearchCriteria {
-	    fromDate: Date;
-	    /**
-	     * Whether to include the _links field on the shallow references
-	     */
-	    includeLinks: boolean;
-	    includeRefUpdates: boolean;
-	    pusherId: string;
-	    refName: string;
-	    toDate: Date;
-	}
-	export interface GitQueryCommitsCriteria {
-	    /**
-	     * Number of entries to skip
-	     */
-	    $skip: number;
-	    /**
-	     * Maximum number of entries to retrieve
-	     */
-	    $top: number;
-	    /**
-	     * Alias or display name of the author
-	     */
-	    author: string;
-	    /**
-	     * If provided, the earliest commit in the graph to search
-	     */
-	    compareVersion: GitVersionDescriptor;
-	    /**
-	     * If true, don't include delete history entries
-	     */
-	    excludeDeletes: boolean;
-	    /**
-	     * If provided, a lower bound for filtering commits alphabetically
-	     */
-	    fromCommitId: string;
-	    /**
-	     * If provided, only include history entries created after this date (string)
-	     */
-	    fromDate: string;
-	    /**
-	     * If provided, specifies the exact commit ids of the commits to fetch. May not be combined with other parameters.
-	     */
-	    ids: string[];
-	    /**
-	     * Whether to include the _links field on the shallow references
-	     */
-	    includeLinks: boolean;
-	    /**
-	     * Path of item to search under
-	     */
-	    itemPath: string;
-	    /**
-	     * If provided, identifies the commit or branch to search
-	     */
-	    itemVersion: GitVersionDescriptor;
-	    /**
-	     * If provided, an upper bound for filtering commits alphabetically
-	     */
-	    toCommitId: string;
-	    /**
-	     * If provided, only include history entries created before this date (string)
-	     */
-	    toDate: string;
-	    /**
-	     * Alias or display name of the committer
-	     */
-	    user: string;
-	}
-	export interface GitRef {
-	    _links: any;
-	    isLockedBy: VSSInterfaces.IdentityRef;
-	    name: string;
-	    objectId: string;
-	    url: string;
-	}
-	export interface GitRefUpdate {
-	    name: string;
-	    newObjectId: string;
-	    oldObjectId: string;
-	    repositoryId: string;
-	}
-	export enum GitRefUpdateMode {
-	    /**
-	     * Indicates the Git protocol model where any refs that can be updated will be updated, but any failures will not prevent other updates from succeeding.
-	     */
-	    BestEffort = 0,
-	    /**
-	     * Indicates that all ref updates must succeed or none will succeed. All ref updates will be atomically written. If any failure is encountered, previously successful updates will be rolled back and the entire operation will fail.
-	     */
-	    AllOrNone = 1,
-	}
-	export interface GitRefUpdateResult {
-	    /**
-	     * Custom message for the result object For instance, Reason for failing.
-	     */
-	    customMessage: string;
-	    /**
-	     * Ref name
-	     */
-	    name: string;
-	    /**
-	     * New object ID
-	     */
-	    newObjectId: string;
-	    /**
-	     * Old object ID
-	     */
-	    oldObjectId: string;
-	    /**
-	     * Name of the plugin that rejected the updated.
-	     */
-	    rejectedBy: string;
-	    /**
-	     * Repository ID
-	     */
-	    repositoryId: string;
-	    /**
-	     * True if the ref update succeeded, false otherwise
-	     */
-	    success: boolean;
-	    /**
-	     * Status of the update from the TFS server.
-	     */
-	    updateStatus: GitRefUpdateStatus;
-	}
-	export interface GitRefUpdateResultSet {
-	    countFailed: number;
-	    countSucceeded: number;
-	    pushCorrelationId: string;
-	    pushIds: {
-	        [key: number]: number;
-	    };
-	    pushTime: Date;
-	    results: GitRefUpdateResult[];
-	}
-	export enum GitRefUpdateStatus {
-	    /**
-	     * Indicates that the ref update request was completed successfully.
-	     */
-	    Succeeded = 0,
-	    /**
-	     * Indicates that the ref update request could not be completed because part of the graph would be disconnected by this change, and the caller does not have ForcePush permission on the repository.
-	     */
-	    ForcePushRequired = 1,
-	    /**
-	     * Indicates that the ref update request could not be completed because the old object ID presented in the request was not the object ID of the ref when the database attempted the update. The most likely scenario is that the caller lost a race to update the ref.
-	     */
-	    StaleOldObjectId = 2,
-	    /**
-	     * Indicates that the ref update request could not be completed because the ref name presented in the request was not valid.
-	     */
-	    InvalidRefName = 3,
-	    /**
-	     * The request was not processed
-	     */
-	    Unprocessed = 4,
-	    /**
-	     * The ref update request could not be completed because the new object ID for the ref could not be resolved to a commit object (potentially through any number of tags)
-	     */
-	    UnresolvableToCommit = 5,
-	    /**
-	     * The ref update request could not be completed because the user lacks write permissions required to write this ref
-	     */
-	    WritePermissionRequired = 6,
-	    /**
-	     * The ref update request could not be completed because the user lacks note creation permissions required to write this note
-	     */
-	    ManageNotePermissionRequired = 7,
-	    /**
-	     * The ref update request could not be completed because the user lacks the permission to create a branch
-	     */
-	    CreateBranchPermissionRequired = 8,
-	    /**
-	     * The ref update request could not be completed because the user lacks the permission to create a tag
-	     */
-	    CreateTagPermissionRequired = 9,
-	    /**
-	     * The ref update could not be completed because it was rejected by the plugin.
-	     */
-	    RejectedByPlugin = 10,
-	    /**
-	     * The ref update could not be completed because the ref is locked by another user.
-	     */
-	    Locked = 11,
-	    /**
-	     * The ref update could not be completed because, in case-insensitive mode, the ref name conflicts with an existing, differently-cased ref name.
-	     */
-	    RefNameConflict = 12,
-	    /**
-	     * The ref update could not be completed because it was rejected by policy.
-	     */
-	    RejectedByPolicy = 13,
-	    /**
-	     * Indicates that the ref update request was completed successfully, but the ref doesn't actually exist so no changes were made.  This should only happen during deletes.
-	     */
-	    SucceededNonExistentRef = 14,
-	    /**
-	     * Indicates that the ref update request was completed successfully, but the passed-in ref was corrupt - as in, the old object ID was bad.  This should only happen during deletes.
-	     */
-	    SucceededCorruptRef = 15,
-	}
-	export interface GitRepository {
-	    _links: any;
-	    defaultBranch: string;
-	    id: string;
-	    name: string;
-	    project: TfsInterfaces.TeamProjectReference;
-	    remoteUrl: string;
-	    url: string;
-	}
-	export enum GitRepositoryPermissions {
-	    None = 0,
-	    Administer = 1,
-	    GenericRead = 2,
-	    GenericContribute = 4,
-	    ForcePush = 8,
-	    CreateBranch = 16,
-	    CreateTag = 32,
-	    ManageNote = 64,
-	    PolicyExempt = 128,
-	    /**
-	     * This defines the set of bits that are valid for the git permission space. When reading or writing git permissions, these are the only bits paid attention too.
-	     */
-	    All = 255,
-	    BranchLevelPermissions = 141,
-	}
-	export interface GitTargetVersionDescriptor extends GitVersionDescriptor {
-	    /**
-	     * Version string identifier (name of tag/branch, SHA1 of commit)
-	     */
-	    targetVersion: string;
-	    /**
-	     * Version options - Specify additional modifiers to version (e.g Previous)
-	     */
-	    targetVersionOptions: GitVersionOptions;
-	    /**
-	     * Version type (branch, tag, or commit). Determines how Id is interpreted
-	     */
-	    targetVersionType: GitVersionType;
-	}
-	export interface GitTreeEntryRef {
-	    /**
-	     * Blob or tree
-	     */
-	    gitObjectType: GitObjectType;
-	    /**
-	     * Mode represented as octal string
-	     */
-	    mode: string;
-	    /**
-	     * SHA1 hash of git object
-	     */
-	    objectId: string;
-	    /**
-	     * Path relative to parent tree object
-	     */
-	    relativePath: string;
-	    /**
-	     * Size of content
-	     */
-	    size: number;
-	    /**
-	     * url to retrieve tree or blob
-	     */
-	    url: string;
-	}
-	export interface GitTreeRef {
-	    _links: any;
-	    /**
-	     * SHA1 hash of git object
-	     */
-	    objectId: string;
-	    /**
-	     * Sum of sizes of all children
-	     */
-	    size: number;
-	    /**
-	     * Blobs and trees under this tree
-	     */
-	    treeEntries: GitTreeEntryRef[];
-	    /**
-	     * Url to tree
-	     */
-	    url: string;
-	}
-	export interface GitUserDate {
-	    date: Date;
-	    email: string;
-	    name: string;
-	}
-	export interface GitVersionDescriptor {
-	    /**
-	     * Version string identifier (name of tag/branch/index, SHA1 of commit)
-	     */
-	    version: string;
-	    /**
-	     * Version options - Specify additional modifiers to version (e.g Previous)
-	     */
-	    versionOptions: GitVersionOptions;
-	    /**
-	     * Version type (branch, tag, commit, or index). Determines how Id is interpreted
-	     */
-	    versionType: GitVersionType;
-	}
-	export enum GitVersionOptions {
-	    /**
-	     * Not specified
-	     */
-	    None = 0,
-	    /**
-	     * Commit that changed item prior to the current version
-	     */
-	    PreviousChange = 1,
-	    /**
-	     * First parent of commit (HEAD^)
-	     */
-	    FirstParent = 2,
-	}
-	export enum GitVersionType {
-	    /**
-	     * Interpret the version as a branch name
-	     */
-	    Branch = 0,
-	    /**
-	     * Interpret the version as a tag name
-	     */
-	    Tag = 1,
-	    /**
-	     * Interpret the version as a commit ID (SHA1)
-	     */
-	    Commit = 2,
-	    /**
-	     * Interpret the version as an index name
-	     */
-	    Index = 3,
-	}
-	export interface HistoryEntry<T> {
-	    /**
-	     * The Change list (changeset/commit/shelveset) for this point in history
-	     */
-	    changeList: ChangeList<T>;
-	    /**
-	     * The change made to the item from this change list (only relevant for File history, not folders)
-	     */
-	    itemChangeType: VersionControlChangeType;
-	    /**
-	     * The path of the item at this point in history (only relevant for File history, not folders)
-	     */
-	    serverItem: string;
-	}
-	export interface HistoryQueryResults<T> {
-	    /**
-	     * True if there are more results available to fetch (we're returning the max # of items requested) A more RESTy solution would be to include a Link header
-	     */
-	    moreResultsAvailable: boolean;
-	    /**
-	     * The history entries (results) from this query
-	     */
-	    results: HistoryEntry<T>[];
-	}
-	export interface IdentityRefWithVote extends VSSInterfaces.IdentityRef {
-	    isRequired: boolean;
-	    reviewerUrl: string;
-	    vote: number;
-	    votedFor: IdentityRefWithVote[];
-	}
-	export interface IncludedGitCommit {
-	    commitId: string;
-	    commitTime: Date;
-	    parentCommitIds: string[];
-	    repositoryId: string;
-	}
-	export interface ItemContent {
-	    content: string;
-	    contentType: ItemContentType;
-	}
-	export enum ItemContentType {
-	    RawText = 0,
-	    Base64Encoded = 1,
-	}
-	/**
-	 * Optional details to include when returning an item model
-	 */
-	export interface ItemDetailsOptions {
-	    /**
-	     * If true, include metadata about the file type
-	     */
-	    includeContentMetadata: boolean;
-	    /**
-	     * Specifies whether to include children (OneLevel), all descendants (Full) or None for folder items
-	     */
-	    recursionLevel: VersionControlRecursionType;
-	}
-	export interface ItemModel {
-	    _links: any;
-	    contentMetadata: FileContentMetadata;
-	    isFolder: boolean;
-	    isSymLink: boolean;
-	    path: string;
-	    url: string;
-	}
-	export enum PullRequestAsyncStatus {
-	    NotSet = 0,
-	    Queued = 1,
-	    Conflicts = 2,
-	    Succeeded = 3,
-	    RejectedByPolicy = 4,
-	    Failure = 5,
-	}
-	export enum PullRequestStatus {
-	    NotSet = 0,
-	    Active = 1,
-	    Abandoned = 2,
-	    Completed = 3,
-	}
-	export interface TfvcBranch extends TfvcBranchRef {
-	    children: TfvcBranch[];
-	    mappings: TfvcBranchMapping[];
-	    parent: TfvcShallowBranchRef;
-	    relatedBranches: TfvcShallowBranchRef[];
-	}
-	export interface TfvcBranchMapping {
-	    depth: string;
-	    serverItem: string;
-	    type: string;
-	}
-	export interface TfvcBranchRef extends TfvcShallowBranchRef {
-	    _links: any;
-	    createdDate: Date;
-	    description: string;
-	    isDeleted: boolean;
-	    owner: VSSInterfaces.IdentityRef;
-	    url: string;
-	}
-	export interface TfvcChange extends Change<TfvcItem> {
-	    /**
-	     * List of merge sources in case of rename or branch creation.
-	     */
-	    mergeSources: TfvcMergeSource[];
-	    /**
-	     * Version at which a (shelved) change was pended against
-	     */
-	    pendingVersion: number;
-	}
-	export interface TfvcChangeset extends TfvcChangesetRef {
-	    accountId: string;
-	    changes: TfvcChange[];
-	    checkinNotes: CheckinNote[];
-	    collectionId: string;
-	    hasMoreChanges: boolean;
-	    policyOverride: TfvcPolicyOverrideInfo;
-	    workItems: AssociatedWorkItem[];
-	}
-	export interface TfvcChangesetRef {
-	    _links: any;
-	    author: VSSInterfaces.IdentityRef;
-	    changesetId: number;
-	    checkedInBy: VSSInterfaces.IdentityRef;
-	    comment: string;
-	    commentTruncated: boolean;
-	    createdDate: Date;
-	    url: string;
-	}
-	/**
-	 * Criteria used in a search for change lists
-	 */
-	export interface TfvcChangesetSearchCriteria {
-	    /**
-	     * Alias or display name of user who made the changes
-	     */
-	    author: string;
-	    /**
-	     * Whether or not to follow renames for the given item being queried
-	     */
-	    followRenames: boolean;
-	    /**
-	     * If provided, only include changesets created after this date (string) Think of a better name for this.
-	     */
-	    fromDate: string;
-	    /**
-	     * If provided, only include changesets after this changesetID
-	     */
-	    fromId: number;
-	    /**
-	     * Whether to include the _links field on the shallow references
-	     */
-	    includeLinks: boolean;
-	    /**
-	     * Path of item to search under
-	     */
-	    path: string;
-	    /**
-	     * If provided, only include changesets created before this date (string) Think of a better name for this.
-	     */
-	    toDate: string;
-	    /**
-	     * If provided, a version descriptor for the latest change list to include
-	     */
-	    toId: number;
-	}
-	export interface TfvcChangesetsRequestData {
-	    changesetIds: number[];
-	    commentLength: number;
-	    /**
-	     * Whether to include the _links field on the shallow references
-	     */
-	    includeLinks: boolean;
-	}
-	export interface TfvcCheckinEventData {
-	    changeset: TfvcChangeset;
-	    project: TfsInterfaces.TeamProjectReference;
-	}
-	export interface TfvcHistoryEntry extends HistoryEntry<TfvcItem> {
-	    /**
-	     * The encoding of the item at this point in history (only relevant for File history, not folders)
-	     */
-	    encoding: number;
-	    /**
-	     * The file id of the item at this point in history (only relevant for File history, not folders)
-	     */
-	    fileId: number;
-	}
-	export interface TfvcItem extends ItemModel {
-	    changeDate: Date;
-	    deletionId: number;
-	    isBranch: boolean;
-	    isPendingChange: boolean;
-	    version: number;
-	}
-	/**
-	 * Item path and Version descriptor properties
-	 */
-	export interface TfvcItemDescriptor {
-	    path: string;
-	    recursionLevel: VersionControlRecursionType;
-	    version: string;
-	    versionOption: TfvcVersionOption;
-	    versionType: TfvcVersionType;
-	}
-	export interface TfvcItemRequestData {
-	    /**
-	     * If true, include metadata about the file type
-	     */
-	    includeContentMetadata: boolean;
-	    /**
-	     * Whether to include the _links field on the shallow references
-	     */
-	    includeLinks: boolean;
-	    itemDescriptors: TfvcItemDescriptor[];
-	}
-	export interface TfvcLabel extends TfvcLabelRef {
-	    items: TfvcItem[];
-	}
-	export interface TfvcLabelRef {
-	    _links: any;
-	    description: string;
-	    id: number;
-	    labelScope: string;
-	    modifiedDate: Date;
-	    name: string;
-	    owner: VSSInterfaces.IdentityRef;
-	    url: string;
-	}
-	export interface TfvcLabelRequestData {
-	    /**
-	     * Whether to include the _links field on the shallow references
-	     */
-	    includeLinks: boolean;
-	    itemLabelFilter: string;
-	    labelScope: string;
-	    maxItemCount: number;
-	    name: string;
-	    owner: string;
-	}
-	export interface TfvcMergeSource {
-	    /**
-	     * Indicates if this a rename source. If false, it is a merge source.
-	     */
-	    isRename: boolean;
-	    /**
-	     * The server item of the merge source
-	     */
-	    serverItem: string;
-	    /**
-	     * Start of the version range
-	     */
-	    versionFrom: number;
-	    /**
-	     * End of the version range
-	     */
-	    versionTo: number;
-	}
-	export interface TfvcPolicyFailureInfo {
-	    message: string;
-	    policyName: string;
-	}
-	export interface TfvcPolicyOverrideInfo {
-	    comment: string;
-	    policyFailures: TfvcPolicyFailureInfo[];
-	}
-	export interface TfvcShallowBranchRef {
-	    path: string;
-	}
-	export interface TfvcShelveset extends TfvcShelvesetRef {
-	    changes: TfvcChange[];
-	    notes: CheckinNote[];
-	    policyOverride: TfvcPolicyOverrideInfo;
-	    workItems: AssociatedWorkItem[];
-	}
-	export interface TfvcShelvesetRef {
-	    _links: any;
-	    comment: string;
-	    commentTruncated: boolean;
-	    createdDate: Date;
-	    id: string;
-	    name: string;
-	    owner: VSSInterfaces.IdentityRef;
-	    url: string;
-	}
-	export interface TfvcShelvesetRequestData {
-	    /**
-	     * Whether to include policyOverride and notes
-	     */
-	    includeDetails: boolean;
-	    /**
-	     * Whether to include the _links field on the shallow references
-	     */
-	    includeLinks: boolean;
-	    /**
-	     * Whether to include workItems
-	     */
-	    includeWorkItems: boolean;
-	    /**
-	     * Max number of changes to include
-	     */
-	    maxChangeCount: number;
-	    /**
-	     * Max length of comment
-	     */
-	    maxCommentLength: number;
-	    /**
-	     * Shelveset's name
-	     */
-	    name: string;
-	    /**
-	     * Owner's ID. Could be a name or a guid.
-	     */
-	    owner: string;
-	}
-	export interface TfvcVersionDescriptor {
-	    version: string;
-	    versionOption: TfvcVersionOption;
-	    versionType: TfvcVersionType;
-	}
-	export enum TfvcVersionOption {
-	    None = 0,
-	    Previous = 1,
-	    UseRename = 2,
-	}
-	export enum TfvcVersionType {
-	    None = 0,
-	    Changeset = 1,
-	    Shelveset = 2,
-	    Change = 3,
-	    Date = 4,
-	    Latest = 5,
-	    Tip = 6,
-	    MergeSource = 7,
-	}
-	export interface UpdateRefsRequest {
-	    refUpdateRequests: GitRefUpdate[];
-	    updateMode: GitRefUpdateMode;
-	}
-	export enum VersionControlChangeType {
-	    None = 0,
-	    Add = 1,
-	    Edit = 2,
-	    Encoding = 4,
-	    Rename = 8,
-	    Delete = 16,
-	    Undelete = 32,
-	    Branch = 64,
-	    Merge = 128,
-	    Lock = 256,
-	    Rollback = 512,
-	    SourceRename = 1024,
-	    TargetRename = 2048,
-	    Property = 4096,
-	    All = 8191,
-	}
-	export interface VersionControlProjectInfo {
-	    project: TfsInterfaces.TeamProjectReference;
-	    supportsGit: boolean;
-	    supportsTFVC: boolean;
-	}
-	export enum VersionControlRecursionType {
-	    None = 0,
-	    OneLevel = 1,
-	    Full = 120,
-	}
-	export var TypeInfo: {
-	    AssociatedWorkItem: {
-	        fields: any;
-	    };
-	    Change: {
-	        fields: any;
-	    };
-	    ChangeCountDictionary: {
-	        fields: any;
-	    };
-	    ChangeList: {
-	        fields: any;
-	    };
-	    ChangeListSearchCriteria: {
-	        fields: any;
-	    };
-	    CheckinNote: {
-	        fields: any;
-	    };
-	    FileContentMetadata: {
-	        fields: any;
-	    };
-	    GitBaseVersionDescriptor: {
-	        fields: any;
-	    };
-	    GitBlobRef: {
-	        fields: any;
-	    };
-	    GitBranchStats: {
-	        fields: any;
-	    };
-	    GitChange: {
-	        fields: any;
-	    };
-	    GitCommit: {
-	        fields: any;
-	    };
-	    GitCommitChanges: {
-	        fields: any;
-	    };
-	    GitCommitDiffs: {
-	        fields: any;
-	    };
-	    GitCommitRef: {
-	        fields: any;
-	    };
-	    GitCommitToCreate: {
-	        fields: any;
-	    };
-	    GitHistoryQueryResults: {
-	        fields: any;
-	    };
-	    GitItem: {
-	        fields: any;
-	    };
-	    GitItemDescriptor: {
-	        fields: any;
-	    };
-	    GitItemRequestData: {
-	        fields: any;
-	    };
-	    GitMediaObjectRef: {
-	        fields: any;
-	    };
-	    GitObjectType: {
-	        enumValues: {
-	            "bad": number;
-	            "commit": number;
-	            "tree": number;
-	            "blob": number;
-	            "tag": number;
-	            "ext2": number;
-	            "ofsDelta": number;
-	            "refDelta": number;
-	        };
-	    };
-	    GitPathAction: {
-	        fields: any;
-	    };
-	    GitPathActions: {
-	        enumValues: {
-	            "none": number;
-	            "edit": number;
-	            "delete": number;
-	            "add": number;
-	            "rename": number;
-	        };
-	    };
-	    GitPullRequest: {
-	        fields: any;
-	    };
-	    GitPullRequestSearchCriteria: {
-	        fields: any;
-	    };
-	    GitPush: {
-	        fields: any;
-	    };
-	    GitPushEventData: {
-	        fields: any;
-	    };
-	    GitPushRef: {
-	        fields: any;
-	    };
-	    GitPushSearchCriteria: {
-	        fields: any;
-	    };
-	    GitQueryCommitsCriteria: {
-	        fields: any;
-	    };
-	    GitRef: {
-	        fields: any;
-	    };
-	    GitRefUpdate: {
-	        fields: any;
-	    };
-	    GitRefUpdateMode: {
-	        enumValues: {
-	            "bestEffort": number;
-	            "allOrNone": number;
-	        };
-	    };
-	    GitRefUpdateResult: {
-	        fields: any;
-	    };
-	    GitRefUpdateResultSet: {
-	        fields: any;
-	    };
-	    GitRefUpdateStatus: {
-	        enumValues: {
-	            "succeeded": number;
-	            "forcePushRequired": number;
-	            "staleOldObjectId": number;
-	            "invalidRefName": number;
-	            "unprocessed": number;
-	            "unresolvableToCommit": number;
-	            "writePermissionRequired": number;
-	            "manageNotePermissionRequired": number;
-	            "createBranchPermissionRequired": number;
-	            "createTagPermissionRequired": number;
-	            "rejectedByPlugin": number;
-	            "locked": number;
-	            "refNameConflict": number;
-	            "rejectedByPolicy": number;
-	            "succeededNonExistentRef": number;
-	            "succeededCorruptRef": number;
-	        };
-	    };
-	    GitRepository: {
-	        fields: any;
-	    };
-	    GitRepositoryPermissions: {
-	        enumValues: {
-	            "none": number;
-	            "administer": number;
-	            "genericRead": number;
-	            "genericContribute": number;
-	            "forcePush": number;
-	            "createBranch": number;
-	            "createTag": number;
-	            "manageNote": number;
-	            "policyExempt": number;
-	            "all": number;
-	            "branchLevelPermissions": number;
-	        };
-	    };
-	    GitTargetVersionDescriptor: {
-	        fields: any;
-	    };
-	    GitTreeEntryRef: {
-	        fields: any;
-	    };
-	    GitTreeRef: {
-	        fields: any;
-	    };
-	    GitUserDate: {
-	        fields: any;
-	    };
-	    GitVersionDescriptor: {
-	        fields: any;
-	    };
-	    GitVersionOptions: {
-	        enumValues: {
-	            "none": number;
-	            "previousChange": number;
-	            "firstParent": number;
-	        };
-	    };
-	    GitVersionType: {
-	        enumValues: {
-	            "branch": number;
-	            "tag": number;
-	            "commit": number;
-	            "index": number;
-	        };
-	    };
-	    HistoryEntry: {
-	        fields: any;
-	    };
-	    HistoryQueryResults: {
-	        fields: any;
-	    };
-	    IdentityRefWithVote: {
-	        fields: any;
-	    };
-	    IncludedGitCommit: {
-	        fields: any;
-	    };
-	    ItemContent: {
-	        fields: any;
-	    };
-	    ItemContentType: {
-	        enumValues: {
-	            "rawText": number;
-	            "base64Encoded": number;
-	        };
-	    };
-	    ItemDetailsOptions: {
-	        fields: any;
-	    };
-	    ItemModel: {
-	        fields: any;
-	    };
-	    PullRequestAsyncStatus: {
-	        enumValues: {
-	            "notSet": number;
-	            "queued": number;
-	            "conflicts": number;
-	            "succeeded": number;
-	            "rejectedByPolicy": number;
-	            "failure": number;
-	        };
-	    };
-	    PullRequestStatus: {
-	        enumValues: {
-	            "notSet": number;
-	            "active": number;
-	            "abandoned": number;
-	            "completed": number;
-	        };
-	    };
-	    TfvcBranch: {
-	        fields: any;
-	    };
-	    TfvcBranchMapping: {
-	        fields: any;
-	    };
-	    TfvcBranchRef: {
-	        fields: any;
-	    };
-	    TfvcChange: {
-	        fields: any;
-	    };
-	    TfvcChangeset: {
-	        fields: any;
-	    };
-	    TfvcChangesetRef: {
-	        fields: any;
-	    };
-	    TfvcChangesetSearchCriteria: {
-	        fields: any;
-	    };
-	    TfvcChangesetsRequestData: {
-	        fields: any;
-	    };
-	    TfvcCheckinEventData: {
-	        fields: any;
-	    };
-	    TfvcHistoryEntry: {
-	        fields: any;
-	    };
-	    TfvcItem: {
-	        fields: any;
-	    };
-	    TfvcItemDescriptor: {
-	        fields: any;
-	    };
-	    TfvcItemRequestData: {
-	        fields: any;
-	    };
-	    TfvcLabel: {
-	        fields: any;
-	    };
-	    TfvcLabelRef: {
-	        fields: any;
-	    };
-	    TfvcLabelRequestData: {
-	        fields: any;
-	    };
-	    TfvcMergeSource: {
-	        fields: any;
-	    };
-	    TfvcPolicyFailureInfo: {
-	        fields: any;
-	    };
-	    TfvcPolicyOverrideInfo: {
-	        fields: any;
-	    };
-	    TfvcShallowBranchRef: {
-	        fields: any;
-	    };
-	    TfvcShelveset: {
-	        fields: any;
-	    };
-	    TfvcShelvesetRef: {
-	        fields: any;
-	    };
-	    TfvcShelvesetRequestData: {
-	        fields: any;
-	    };
-	    TfvcVersionDescriptor: {
-	        fields: any;
-	    };
-	    TfvcVersionOption: {
-	        enumValues: {
-	            "none": number;
-	            "previous": number;
-	            "useRename": number;
-	        };
-	    };
-	    TfvcVersionType: {
-	        enumValues: {
-	            "none": number;
-	            "changeset": number;
-	            "shelveset": number;
-	            "change": number;
-	            "date": number;
-	            "latest": number;
-	            "tip": number;
-	            "mergeSource": number;
-	        };
-	    };
-	    UpdateRefsRequest: {
-	        fields: any;
-	    };
-	    VersionControlChangeType: {
-	        enumValues: {
-	            "none": number;
-	            "add": number;
-	            "edit": number;
-	            "encoding": number;
-	            "rename": number;
-	            "delete": number;
-	            "undelete": number;
-	            "branch": number;
-	            "merge": number;
-	            "lock": number;
-	            "rollback": number;
-	            "sourceRename": number;
-	            "targetRename": number;
-	            "property": number;
-	            "all": number;
-	        };
-	    };
-	    VersionControlProjectInfo: {
-	        fields: any;
-	    };
-	    VersionControlRecursionType: {
-	        enumValues: {
-	            "none": number;
-	            "oneLevel": number;
-	            "full": number;
-	        };
-	    };
-	};
-
-}
-declare module 'vso-node-api/GitApi' {
-	/// <reference path="../node/node.d.ts" />
-	/// <reference path="../q/Q.d.ts" />
-	import Q = require('q');
-	import basem = require('vso-node-api/ClientApiBases');
-	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
-	import GitInterfaces = require('vso-node-api/interfaces/GitInterfaces');
-	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
-	export interface IGitApi extends basem.ClientApiBase {
-	    getBlob(repositoryId: string, sha1: string, project: string, download: boolean, fileName: string, onResult: (err: any, statusCode: number, Blob: GitInterfaces.GitBlobRef) => void): void;
-	    getBlobContent(repositoryId: string, sha1: string, project: string, download: boolean, fileName: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    getBlobsZip(blobIds: string[], repositoryId: string, project: string, filename: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    getBlobZip(repositoryId: string, sha1: string, project: string, download: boolean, fileName: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    getBranch(repositoryId: string, name: string, project: string, baseVersionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, BranchStat: GitInterfaces.GitBranchStats) => void): void;
-	    getBranches(repositoryId: string, project: string, baseVersionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, BranchStats: GitInterfaces.GitBranchStats[]) => void): void;
-	    getChanges(commitId: string, repositoryId: string, project: string, top: number, skip: number, onResult: (err: any, statusCode: number, Change: GitInterfaces.GitCommitChanges) => void): void;
-	    createCommit(repositoryId: string, project: string, onResult: (err: any, statusCode: number, Commit: GitInterfaces.GitCommit) => void): void;
-	    getCommit(commitId: string, repositoryId: string, project: string, changeCount: number, onResult: (err: any, statusCode: number, Commit: GitInterfaces.GitCommit) => void): void;
-	    getCommits(repositoryId: string, searchCriteria: GitInterfaces.GitQueryCommitsCriteria, project: string, skip: number, top: number, onResult: (err: any, statusCode: number, Commits: GitInterfaces.GitCommitRef[]) => void): void;
-	    getPushCommits(repositoryId: string, pushId: number, project: string, top: number, skip: number, includeLinks: boolean, onResult: (err: any, statusCode: number, Commits: GitInterfaces.GitCommitRef[]) => void): void;
-	    getCommitsBatch(searchCriteria: GitInterfaces.GitQueryCommitsCriteria, repositoryId: string, project: string, skip: number, top: number, onResult: (err: any, statusCode: number, CommitsBatch: GitInterfaces.GitCommitRef[]) => void): void;
-	    getItem(repositoryId: string, path: string, project: string, scopePath: string, recursionLevel: GitInterfaces.VersionControlRecursionType, includeContentMetadata: boolean, latestProcessedChange: boolean, download: boolean, versionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, Item: GitInterfaces.GitItem) => void): void;
-	    getItemContent(repositoryId: string, path: string, project: string, scopePath: string, recursionLevel: GitInterfaces.VersionControlRecursionType, includeContentMetadata: boolean, latestProcessedChange: boolean, download: boolean, versionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    getItems(repositoryId: string, project: string, scopePath: string, recursionLevel: GitInterfaces.VersionControlRecursionType, includeContentMetadata: boolean, latestProcessedChange: boolean, download: boolean, includeLinks: boolean, versionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, Items: GitInterfaces.GitItem[]) => void): void;
-	    getItemText(repositoryId: string, path: string, project: string, scopePath: string, recursionLevel: GitInterfaces.VersionControlRecursionType, includeContentMetadata: boolean, latestProcessedChange: boolean, download: boolean, versionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    getItemZip(repositoryId: string, path: string, project: string, scopePath: string, recursionLevel: GitInterfaces.VersionControlRecursionType, includeContentMetadata: boolean, latestProcessedChange: boolean, download: boolean, versionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    getItemsBatch(requestData: GitInterfaces.GitItemRequestData, repositoryId: string, project: string, onResult: (err: any, statusCode: number, ItemsBatch: GitInterfaces.GitItem[][]) => void): void;
-	    createPullRequestReviewer(reviewer: GitInterfaces.IdentityRefWithVote, repositoryId: string, pullRequestId: number, reviewerId: string, project: string, onResult: (err: any, statusCode: number, PullRequestReviewer: GitInterfaces.IdentityRefWithVote) => void): void;
-	    createPullRequestReviewers(reviewers: VSSInterfaces.IdentityRef[], repositoryId: string, pullRequestId: number, project: string, onResult: (err: any, statusCode: number, PullRequestReviewers: GitInterfaces.IdentityRefWithVote[]) => void): void;
-	    deletePullRequestReviewer(repositoryId: string, pullRequestId: number, reviewerId: string, project: string, onResult: (err: any, statusCode: number) => void): void;
-	    getPullRequestReviewer(repositoryId: string, pullRequestId: number, reviewerId: string, project: string, onResult: (err: any, statusCode: number, PullRequestReviewer: GitInterfaces.IdentityRefWithVote) => void): void;
-	    getPullRequestReviewers(repositoryId: string, pullRequestId: number, project: string, onResult: (err: any, statusCode: number, PullRequestReviewers: GitInterfaces.IdentityRefWithVote[]) => void): void;
-	    createPullRequest(gitPullRequestToCreate: GitInterfaces.GitPullRequest, repositoryId: string, project: string, onResult: (err: any, statusCode: number, PullRequest: GitInterfaces.GitPullRequest) => void): void;
-	    getPullRequest(repositoryId: string, pullRequestId: number, project: string, maxCommentLength: number, skip: number, top: number, onResult: (err: any, statusCode: number, PullRequest: GitInterfaces.GitPullRequest) => void): void;
-	    getPullRequests(repositoryId: string, searchCriteria: GitInterfaces.GitPullRequestSearchCriteria, project: string, maxCommentLength: number, skip: number, top: number, onResult: (err: any, statusCode: number, PullRequests: GitInterfaces.GitPullRequest[]) => void): void;
-	    updatePullRequest(gitPullRequestToUpdate: GitInterfaces.GitPullRequest, repositoryId: string, pullRequestId: number, project: string, onResult: (err: any, statusCode: number, PullRequest: GitInterfaces.GitPullRequest) => void): void;
-	    getPullRequestWorkItems(repositoryId: string, pullRequestId: number, project: string, commitsTop: number, commitsSkip: number, onResult: (err: any, statusCode: number, PullRequestWorkItems: GitInterfaces.AssociatedWorkItem[]) => void): void;
-	    createPush(push: GitInterfaces.GitPush, repositoryId: string, project: string, onResult: (err: any, statusCode: number, pushe: GitInterfaces.GitPush) => void): void;
-	    getPush(repositoryId: string, pushId: number, project: string, includeCommits: number, includeRefUpdates: boolean, onResult: (err: any, statusCode: number, pushe: GitInterfaces.GitPush) => void): void;
-	    getPushes(repositoryId: string, project: string, skip: number, top: number, searchCriteria: GitInterfaces.GitPushSearchCriteria, onResult: (err: any, statusCode: number, pushes: GitInterfaces.GitPush[]) => void): void;
-	    getRefs(repositoryId: string, project: string, filter: string, includeLinks: boolean, onResult: (err: any, statusCode: number, refs: GitInterfaces.GitRef[]) => void): void;
-	    updateRefs(refUpdates: GitInterfaces.GitRefUpdate[], repositoryId: string, project: string, projectId: string, onResult: (err: any, statusCode: number, refs: GitInterfaces.GitRefUpdateResult[]) => void): void;
-	    createRepository(gitRepositoryToCreate: GitInterfaces.GitRepository, project: string, onResult: (err: any, statusCode: number, Repositorie: GitInterfaces.GitRepository) => void): void;
-	    deleteRepository(repositoryId: string, project: string, onResult: (err: any, statusCode: number) => void): void;
-	    getRepositories(project: string, includeLinks: boolean, onResult: (err: any, statusCode: number, Repositories: GitInterfaces.GitRepository[]) => void): void;
-	    getRepository(repositoryId: string, project: string, onResult: (err: any, statusCode: number, Repositorie: GitInterfaces.GitRepository) => void): void;
-	    updateRepository(newRepositoryInfo: GitInterfaces.GitRepository, repositoryId: string, project: string, onResult: (err: any, statusCode: number, Repositorie: GitInterfaces.GitRepository) => void): void;
-	    getTree(repositoryId: string, sha1: string, project: string, projectId: string, recursive: boolean, fileName: string, onResult: (err: any, statusCode: number, Tree: GitInterfaces.GitTreeRef) => void): void;
-	    getTreeZip(repositoryId: string, sha1: string, project: string, projectId: string, recursive: boolean, fileName: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	}
-	export interface IQGitApi extends basem.QClientApiBase {
-	    getBlob(repositoryId: string, sha1: string, project?: string, download?: boolean, fileName?: string): Q.Promise<GitInterfaces.GitBlobRef>;
-	    getBranch(repositoryId: string, name: string, project?: string, baseVersionDescriptor?: GitInterfaces.GitVersionDescriptor): Q.Promise<GitInterfaces.GitBranchStats>;
-	    getBranches(repositoryId: string, project?: string, baseVersionDescriptor?: GitInterfaces.GitVersionDescriptor): Q.Promise<GitInterfaces.GitBranchStats[]>;
-	    getChanges(commitId: string, repositoryId: string, project?: string, top?: number, skip?: number): Q.Promise<GitInterfaces.GitCommitChanges>;
-	    createCommit(repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitCommit>;
-	    getCommit(commitId: string, repositoryId: string, project?: string, changeCount?: number): Q.Promise<GitInterfaces.GitCommit>;
-	    getCommits(repositoryId: string, searchCriteria: GitInterfaces.GitQueryCommitsCriteria, project?: string, skip?: number, top?: number): Q.Promise<GitInterfaces.GitCommitRef[]>;
-	    getPushCommits(repositoryId: string, pushId: number, project?: string, top?: number, skip?: number, includeLinks?: boolean): Q.Promise<GitInterfaces.GitCommitRef[]>;
-	    getCommitsBatch(searchCriteria: GitInterfaces.GitQueryCommitsCriteria, repositoryId: string, project?: string, skip?: number, top?: number): Q.Promise<GitInterfaces.GitCommitRef[]>;
-	    getItem(repositoryId: string, path: string, project?: string, scopePath?: string, recursionLevel?: GitInterfaces.VersionControlRecursionType, includeContentMetadata?: boolean, latestProcessedChange?: boolean, download?: boolean, versionDescriptor?: GitInterfaces.GitVersionDescriptor): Q.Promise<GitInterfaces.GitItem>;
-	    getItems(repositoryId: string, project?: string, scopePath?: string, recursionLevel?: GitInterfaces.VersionControlRecursionType, includeContentMetadata?: boolean, latestProcessedChange?: boolean, download?: boolean, includeLinks?: boolean, versionDescriptor?: GitInterfaces.GitVersionDescriptor): Q.Promise<GitInterfaces.GitItem[]>;
-	    getItemsBatch(requestData: GitInterfaces.GitItemRequestData, repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitItem[][]>;
-	    createPullRequestReviewer(reviewer: GitInterfaces.IdentityRefWithVote, repositoryId: string, pullRequestId: number, reviewerId: string, project?: string): Q.Promise<GitInterfaces.IdentityRefWithVote>;
-	    createPullRequestReviewers(reviewers: VSSInterfaces.IdentityRef[], repositoryId: string, pullRequestId: number, project?: string): Q.Promise<GitInterfaces.IdentityRefWithVote[]>;
-	    getPullRequestReviewer(repositoryId: string, pullRequestId: number, reviewerId: string, project?: string): Q.Promise<GitInterfaces.IdentityRefWithVote>;
-	    getPullRequestReviewers(repositoryId: string, pullRequestId: number, project?: string): Q.Promise<GitInterfaces.IdentityRefWithVote[]>;
-	    createPullRequest(gitPullRequestToCreate: GitInterfaces.GitPullRequest, repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitPullRequest>;
-	    getPullRequest(repositoryId: string, pullRequestId: number, project?: string, maxCommentLength?: number, skip?: number, top?: number): Q.Promise<GitInterfaces.GitPullRequest>;
-	    getPullRequests(repositoryId: string, searchCriteria: GitInterfaces.GitPullRequestSearchCriteria, project?: string, maxCommentLength?: number, skip?: number, top?: number): Q.Promise<GitInterfaces.GitPullRequest[]>;
-	    updatePullRequest(gitPullRequestToUpdate: GitInterfaces.GitPullRequest, repositoryId: string, pullRequestId: number, project?: string): Q.Promise<GitInterfaces.GitPullRequest>;
-	    getPullRequestWorkItems(repositoryId: string, pullRequestId: number, project?: string, commitsTop?: number, commitsSkip?: number): Q.Promise<GitInterfaces.AssociatedWorkItem[]>;
-	    createPush(push: GitInterfaces.GitPush, repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitPush>;
-	    getPush(repositoryId: string, pushId: number, project?: string, includeCommits?: number, includeRefUpdates?: boolean): Q.Promise<GitInterfaces.GitPush>;
-	    getPushes(repositoryId: string, project?: string, skip?: number, top?: number, searchCriteria?: GitInterfaces.GitPushSearchCriteria): Q.Promise<GitInterfaces.GitPush[]>;
-	    getRefs(repositoryId: string, project?: string, filter?: string, includeLinks?: boolean): Q.Promise<GitInterfaces.GitRef[]>;
-	    updateRefs(refUpdates: GitInterfaces.GitRefUpdate[], repositoryId: string, project?: string, projectId?: string): Q.Promise<GitInterfaces.GitRefUpdateResult[]>;
-	    createRepository(gitRepositoryToCreate: GitInterfaces.GitRepository, project?: string): Q.Promise<GitInterfaces.GitRepository>;
-	    getRepositories(project?: string, includeLinks?: boolean): Q.Promise<GitInterfaces.GitRepository[]>;
-	    getRepository(repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitRepository>;
-	    updateRepository(newRepositoryInfo: GitInterfaces.GitRepository, repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitRepository>;
-	    getTree(repositoryId: string, sha1: string, project?: string, projectId?: string, recursive?: boolean, fileName?: string): Q.Promise<GitInterfaces.GitTreeRef>;
-	}
-	export class GitApi extends basem.ClientApiBase implements IGitApi {
-	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
-	    /**
-	     * Gets a single blob.
-	     *
-	     * @param {string} repositoryId
-	     * @param {string} sha1
-	     * @param {string} project - Project ID or project name
-	     * @param {boolean} download
-	     * @param {string} fileName
-	     * @param onResult callback function with the resulting GitInterfaces.GitBlobRef
-	     */
-	    getBlob(repositoryId: string, sha1: string, project: string, download: boolean, fileName: string, onResult: (err: any, statusCode: number, Blob: GitInterfaces.GitBlobRef) => void): void;
-	    /**
-	     * Gets a single blob.
-	     *
-	     * @param {string} repositoryId
-	     * @param {string} sha1
-	     * @param {string} project - Project ID or project name
-	     * @param {boolean} download
-	     * @param {string} fileName
-	     * @param onResult callback function with the resulting ArrayBuffer
-	     */
-	    getBlobContent(repositoryId: string, sha1: string, project: string, download: boolean, fileName: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    /**
-	     * Gets one or more blobs in a zip file download.
-	     *
-	     * @param {string[]} blobIds
-	     * @param {string} repositoryId
-	     * @param {string} project - Project ID or project name
-	     * @param {string} filename
-	     * @param onResult callback function with the resulting ArrayBuffer
-	     */
-	    getBlobsZip(blobIds: string[], repositoryId: string, project: string, filename: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    /**
-	     * Gets a single blob.
-	     *
-	     * @param {string} repositoryId
-	     * @param {string} sha1
-	     * @param {string} project - Project ID or project name
-	     * @param {boolean} download
-	     * @param {string} fileName
-	     * @param onResult callback function with the resulting ArrayBuffer
-	     */
-	    getBlobZip(repositoryId: string, sha1: string, project: string, download: boolean, fileName: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    /**
-	     * Retrieve statistics about a single branch.
-	     *
-	     * @param {string} repositoryId - Friendly name or guid of repository
-	     * @param {string} name - Name of the branch
-	     * @param {string} project - Project ID or project name
-	     * @param {GitInterfaces.GitVersionDescriptor} baseVersionDescriptor
-	     * @param onResult callback function with the resulting GitInterfaces.GitBranchStats
-	     */
-	    getBranch(repositoryId: string, name: string, project: string, baseVersionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, BranchStat: GitInterfaces.GitBranchStats) => void): void;
-	    /**
-	     * Retrieve statistics about all branches within a repository.
-	     *
-	     * @param {string} repositoryId - Friendly name or guid of repository
-	     * @param {string} project - Project ID or project name
-	     * @param {GitInterfaces.GitVersionDescriptor} baseVersionDescriptor
-	     * @param onResult callback function with the resulting GitInterfaces.GitBranchStats[]
-	     */
-	    getBranches(repositoryId: string, project: string, baseVersionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, BranchStats: GitInterfaces.GitBranchStats[]) => void): void;
-	    /**
-	     * Retrieve changes for a particular commit.
-	     *
-	     * @param {string} commitId - The id of the commit.
-	     * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
-	     * @param {string} project - Project ID or project name
-	     * @param {number} top - The maximum number of changes to return.
-	     * @param {number} skip - The number of changes to skip.
-	     * @param onResult callback function with the resulting GitInterfaces.GitCommitChanges
-	     */
-	    getChanges(commitId: string, repositoryId: string, project: string, top: number, skip: number, onResult: (err: any, statusCode: number, Change: GitInterfaces.GitCommitChanges) => void): void;
-	    /**
-	     * Create a git commit for a project
-	     *
-	     * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting GitInterfaces.GitCommit
-	     */
-	    createCommit(repositoryId: string, project: string, onResult: (err: any, statusCode: number, Commit: GitInterfaces.GitCommit) => void): void;
-	    /**
-	     * Retrieve a particular commit.
-	     *
-	     * @param {string} commitId - The id of the commit.
-	     * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
-	     * @param {string} project - Project ID or project name
-	     * @param {number} changeCount - The number of changes to include in the result.
-	     * @param onResult callback function with the resulting GitInterfaces.GitCommit
-	     */
-	    getCommit(commitId: string, repositoryId: string, project: string, changeCount: number, onResult: (err: any, statusCode: number, Commit: GitInterfaces.GitCommit) => void): void;
-	    /**
-	     * Retrieve git commits for a project
-	     *
-	     * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
-	     * @param {GitInterfaces.GitQueryCommitsCriteria} searchCriteria
-	     * @param {string} project - Project ID or project name
-	     * @param {number} skip
-	     * @param {number} top
-	     * @param onResult callback function with the resulting GitInterfaces.GitCommitRef[]
-	     */
-	    getCommits(repositoryId: string, searchCriteria: GitInterfaces.GitQueryCommitsCriteria, project: string, skip: number, top: number, onResult: (err: any, statusCode: number, Commits: GitInterfaces.GitCommitRef[]) => void): void;
-	    /**
-	     * Retrieve a list of commits associated with a particular push.
-	     *
-	     * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
-	     * @param {number} pushId - The id of the push.
-	     * @param {string} project - Project ID or project name
-	     * @param {number} top - The maximum number of commits to return ("get the top x commits").
-	     * @param {number} skip - The number of commits to skip.
-	     * @param {boolean} includeLinks
-	     * @param onResult callback function with the resulting GitInterfaces.GitCommitRef[]
-	     */
-	    getPushCommits(repositoryId: string, pushId: number, project: string, top: number, skip: number, includeLinks: boolean, onResult: (err: any, statusCode: number, Commits: GitInterfaces.GitCommitRef[]) => void): void;
-	    /**
-	     * Retrieve git commits for a project
-	     *
-	     * @param {GitInterfaces.GitQueryCommitsCriteria} searchCriteria - Search options
-	     * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
-	     * @param {string} project - Project ID or project name
-	     * @param {number} skip
-	     * @param {number} top
-	     * @param onResult callback function with the resulting GitInterfaces.GitCommitRef[]
-	     */
-	    getCommitsBatch(searchCriteria: GitInterfaces.GitQueryCommitsCriteria, repositoryId: string, project: string, skip: number, top: number, onResult: (err: any, statusCode: number, CommitsBatch: GitInterfaces.GitCommitRef[]) => void): void;
-	    /**
-	     * Get Item Metadata and/or Content for a single item. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
-	     *
-	     * @param {string} repositoryId
-	     * @param {string} path
-	     * @param {string} project - Project ID or project name
-	     * @param {string} scopePath
-	     * @param {GitInterfaces.VersionControlRecursionType} recursionLevel
-	     * @param {boolean} includeContentMetadata
-	     * @param {boolean} latestProcessedChange
-	     * @param {boolean} download
-	     * @param {GitInterfaces.GitVersionDescriptor} versionDescriptor
-	     * @param onResult callback function with the resulting GitInterfaces.GitItem
-	     */
-	    getItem(repositoryId: string, path: string, project: string, scopePath: string, recursionLevel: GitInterfaces.VersionControlRecursionType, includeContentMetadata: boolean, latestProcessedChange: boolean, download: boolean, versionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, Item: GitInterfaces.GitItem) => void): void;
-	    /**
-	     * Get Item Metadata and/or Content for a single item. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
-	     *
-	     * @param {string} repositoryId
-	     * @param {string} path
-	     * @param {string} project - Project ID or project name
-	     * @param {string} scopePath
-	     * @param {GitInterfaces.VersionControlRecursionType} recursionLevel
-	     * @param {boolean} includeContentMetadata
-	     * @param {boolean} latestProcessedChange
-	     * @param {boolean} download
-	     * @param {GitInterfaces.GitVersionDescriptor} versionDescriptor
-	     * @param onResult callback function with the resulting ArrayBuffer
-	     */
-	    getItemContent(repositoryId: string, path: string, project: string, scopePath: string, recursionLevel: GitInterfaces.VersionControlRecursionType, includeContentMetadata: boolean, latestProcessedChange: boolean, download: boolean, versionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    /**
-	     * Get Item Metadata and/or Content for a collection of items. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
-	     *
-	     * @param {string} repositoryId
-	     * @param {string} project - Project ID or project name
-	     * @param {string} scopePath
-	     * @param {GitInterfaces.VersionControlRecursionType} recursionLevel
-	     * @param {boolean} includeContentMetadata
-	     * @param {boolean} latestProcessedChange
-	     * @param {boolean} download
-	     * @param {boolean} includeLinks
-	     * @param {GitInterfaces.GitVersionDescriptor} versionDescriptor
-	     * @param onResult callback function with the resulting GitInterfaces.GitItem[]
-	     */
-	    getItems(repositoryId: string, project: string, scopePath: string, recursionLevel: GitInterfaces.VersionControlRecursionType, includeContentMetadata: boolean, latestProcessedChange: boolean, download: boolean, includeLinks: boolean, versionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, Items: GitInterfaces.GitItem[]) => void): void;
-	    /**
-	     * Get Item Metadata and/or Content for a single item. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
-	     *
-	     * @param {string} repositoryId
-	     * @param {string} path
-	     * @param {string} project - Project ID or project name
-	     * @param {string} scopePath
-	     * @param {GitInterfaces.VersionControlRecursionType} recursionLevel
-	     * @param {boolean} includeContentMetadata
-	     * @param {boolean} latestProcessedChange
-	     * @param {boolean} download
-	     * @param {GitInterfaces.GitVersionDescriptor} versionDescriptor
-	     * @param onResult callback function with the resulting string
-	     */
-	    getItemText(repositoryId: string, path: string, project: string, scopePath: string, recursionLevel: GitInterfaces.VersionControlRecursionType, includeContentMetadata: boolean, latestProcessedChange: boolean, download: boolean, versionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    /**
-	     * Get Item Metadata and/or Content for a single item. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
-	     *
-	     * @param {string} repositoryId
-	     * @param {string} path
-	     * @param {string} project - Project ID or project name
-	     * @param {string} scopePath
-	     * @param {GitInterfaces.VersionControlRecursionType} recursionLevel
-	     * @param {boolean} includeContentMetadata
-	     * @param {boolean} latestProcessedChange
-	     * @param {boolean} download
-	     * @param {GitInterfaces.GitVersionDescriptor} versionDescriptor
-	     * @param onResult callback function with the resulting ArrayBuffer
-	     */
-	    getItemZip(repositoryId: string, path: string, project: string, scopePath: string, recursionLevel: GitInterfaces.VersionControlRecursionType, includeContentMetadata: boolean, latestProcessedChange: boolean, download: boolean, versionDescriptor: GitInterfaces.GitVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    /**
-	     * Post for retrieving a creating a batch out of a set of items in a repo / project given a list of paths or a long path
-	     *
-	     * @param {GitInterfaces.GitItemRequestData} requestData
-	     * @param {string} repositoryId
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting GitInterfaces.GitItem[][]
-	     */
-	    getItemsBatch(requestData: GitInterfaces.GitItemRequestData, repositoryId: string, project: string, onResult: (err: any, statusCode: number, ItemsBatch: GitInterfaces.GitItem[][]) => void): void;
-	    /**
-	     * Adds a reviewer to a git pull request
-	     *
-	     * @param {GitInterfaces.IdentityRefWithVote} reviewer
-	     * @param {string} repositoryId
-	     * @param {number} pullRequestId
-	     * @param {string} reviewerId
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting GitInterfaces.IdentityRefWithVote
-	     */
-	    createPullRequestReviewer(reviewer: GitInterfaces.IdentityRefWithVote, repositoryId: string, pullRequestId: number, reviewerId: string, project: string, onResult: (err: any, statusCode: number, PullRequestReviewer: GitInterfaces.IdentityRefWithVote) => void): void;
-	    /**
-	     * Adds reviewers to a git pull request
-	     *
-	     * @param {VSSInterfaces.IdentityRef[]} reviewers
-	     * @param {string} repositoryId
-	     * @param {number} pullRequestId
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting GitInterfaces.IdentityRefWithVote[]
-	     */
-	    createPullRequestReviewers(reviewers: VSSInterfaces.IdentityRef[], repositoryId: string, pullRequestId: number, project: string, onResult: (err: any, statusCode: number, PullRequestReviewers: GitInterfaces.IdentityRefWithVote[]) => void): void;
-	    /**
-	     * Adds reviewers to a git pull request
-	     *
-	     * @param {string} repositoryId
-	     * @param {number} pullRequestId
-	     * @param {string} reviewerId
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function
-	     */
-	    deletePullRequestReviewer(repositoryId: string, pullRequestId: number, reviewerId: string, project: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * Retrieve a reviewer from a pull request
-	     *
-	     * @param {string} repositoryId
-	     * @param {number} pullRequestId
-	     * @param {string} reviewerId
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting GitInterfaces.IdentityRefWithVote
-	     */
-	    getPullRequestReviewer(repositoryId: string, pullRequestId: number, reviewerId: string, project: string, onResult: (err: any, statusCode: number, PullRequestReviewer: GitInterfaces.IdentityRefWithVote) => void): void;
-	    /**
-	     * Retrieve a pull request reviewers
-	     *
-	     * @param {string} repositoryId
-	     * @param {number} pullRequestId
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting GitInterfaces.IdentityRefWithVote[]
-	     */
-	    getPullRequestReviewers(repositoryId: string, pullRequestId: number, project: string, onResult: (err: any, statusCode: number, PullRequestReviewers: GitInterfaces.IdentityRefWithVote[]) => void): void;
-	    /**
-	     * Create a git pull request
-	     *
-	     * @param {GitInterfaces.GitPullRequest} gitPullRequestToCreate
-	     * @param {string} repositoryId
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting GitInterfaces.GitPullRequest
-	     */
-	    createPullRequest(gitPullRequestToCreate: GitInterfaces.GitPullRequest, repositoryId: string, project: string, onResult: (err: any, statusCode: number, PullRequest: GitInterfaces.GitPullRequest) => void): void;
-	    /**
-	     * Retrieve a pull request
-	     *
-	     * @param {string} repositoryId
-	     * @param {number} pullRequestId
-	     * @param {string} project - Project ID or project name
-	     * @param {number} maxCommentLength
-	     * @param {number} skip
-	     * @param {number} top
-	     * @param onResult callback function with the resulting GitInterfaces.GitPullRequest
-	     */
-	    getPullRequest(repositoryId: string, pullRequestId: number, project: string, maxCommentLength: number, skip: number, top: number, onResult: (err: any, statusCode: number, PullRequest: GitInterfaces.GitPullRequest) => void): void;
-	    /**
-	     * Query for pull requests
-	     *
-	     * @param {string} repositoryId
-	     * @param {GitInterfaces.GitPullRequestSearchCriteria} searchCriteria
-	     * @param {string} project - Project ID or project name
-	     * @param {number} maxCommentLength
-	     * @param {number} skip
-	     * @param {number} top
-	     * @param onResult callback function with the resulting GitInterfaces.GitPullRequest[]
-	     */
-	    getPullRequests(repositoryId: string, searchCriteria: GitInterfaces.GitPullRequestSearchCriteria, project: string, maxCommentLength: number, skip: number, top: number, onResult: (err: any, statusCode: number, PullRequests: GitInterfaces.GitPullRequest[]) => void): void;
-	    /**
-	     * Updates a pull request
-	     *
-	     * @param {GitInterfaces.GitPullRequest} gitPullRequestToUpdate
-	     * @param {string} repositoryId
-	     * @param {number} pullRequestId
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting GitInterfaces.GitPullRequest
-	     */
-	    updatePullRequest(gitPullRequestToUpdate: GitInterfaces.GitPullRequest, repositoryId: string, pullRequestId: number, project: string, onResult: (err: any, statusCode: number, PullRequest: GitInterfaces.GitPullRequest) => void): void;
-	    /**
-	     * Retrieve a pull request work items
-	     *
-	     * @param {string} repositoryId
-	     * @param {number} pullRequestId
-	     * @param {string} project - Project ID or project name
-	     * @param {number} commitsTop
-	     * @param {number} commitsSkip
-	     * @param onResult callback function with the resulting GitInterfaces.AssociatedWorkItem[]
-	     */
-	    getPullRequestWorkItems(repositoryId: string, pullRequestId: number, project: string, commitsTop: number, commitsSkip: number, onResult: (err: any, statusCode: number, PullRequestWorkItems: GitInterfaces.AssociatedWorkItem[]) => void): void;
-	    /**
-	     * Push changes to the repository.
-	     *
-	     * @param {GitInterfaces.GitPush} push
-	     * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, a project-scoped route must be used.
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting GitInterfaces.GitPush
-	     */
-	    createPush(push: GitInterfaces.GitPush, repositoryId: string, project: string, onResult: (err: any, statusCode: number, pushe: GitInterfaces.GitPush) => void): void;
-	    /**
-	     * Retrieve a particular push.
-	     *
-	     * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
-	     * @param {number} pushId - The id of the push.
-	     * @param {string} project - Project ID or project name
-	     * @param {number} includeCommits - The number of commits to include in the result.
-	     * @param {boolean} includeRefUpdates
-	     * @param onResult callback function with the resulting GitInterfaces.GitPush
-	     */
-	    getPush(repositoryId: string, pushId: number, project: string, includeCommits: number, includeRefUpdates: boolean, onResult: (err: any, statusCode: number, pushe: GitInterfaces.GitPush) => void): void;
-	    /**
-	     * Retrieves pushes associated with the specified repository.
-	     *
-	     * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
-	     * @param {string} project - Project ID or project name
-	     * @param {number} skip
-	     * @param {number} top
-	     * @param {GitInterfaces.GitPushSearchCriteria} searchCriteria
-	     * @param onResult callback function with the resulting GitInterfaces.GitPush[]
-	     */
-	    getPushes(repositoryId: string, project: string, skip: number, top: number, searchCriteria: GitInterfaces.GitPushSearchCriteria, onResult: (err: any, statusCode: number, pushes: GitInterfaces.GitPush[]) => void): void;
-	    /**
-	     * Queries the provided repository for its refs and returns them.
-	     *
-	     * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
-	     * @param {string} project - Project ID or project name
-	     * @param {string} filter - [optional] A filter to apply to the refs.
-	     * @param {boolean} includeLinks - [optional] Specifies if referenceLinks should be included in the result. default is false.
-	     * @param onResult callback function with the resulting GitInterfaces.GitRef[]
-	     */
-	    getRefs(repositoryId: string, project: string, filter: string, includeLinks: boolean, onResult: (err: any, statusCode: number, refs: GitInterfaces.GitRef[]) => void): void;
-	    /**
-	     * Creates or updates refs with the given information
-	     *
-	     * @param {GitInterfaces.GitRefUpdate[]} refUpdates - List of ref updates to attempt to perform
-	     * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
-	     * @param {string} project - Project ID or project name
-	     * @param {string} projectId - The id of the project.
-	     * @param onResult callback function with the resulting GitInterfaces.GitRefUpdateResult[]
-	     */
-	    updateRefs(refUpdates: GitInterfaces.GitRefUpdate[], repositoryId: string, project: string, projectId: string, onResult: (err: any, statusCode: number, refs: GitInterfaces.GitRefUpdateResult[]) => void): void;
-	    /**
-	     * Create a git repository
-	     *
-	     * @param {GitInterfaces.GitRepository} gitRepositoryToCreate
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting GitInterfaces.GitRepository
-	     */
-	    createRepository(gitRepositoryToCreate: GitInterfaces.GitRepository, project: string, onResult: (err: any, statusCode: number, Repositorie: GitInterfaces.GitRepository) => void): void;
-	    /**
-	     * Delete a git repository
-	     *
-	     * @param {string} repositoryId
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function
-	     */
-	    deleteRepository(repositoryId: string, project: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * Retrieve git repositories.
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {boolean} includeLinks
-	     * @param onResult callback function with the resulting GitInterfaces.GitRepository[]
-	     */
-	    getRepositories(project: string, includeLinks: boolean, onResult: (err: any, statusCode: number, Repositories: GitInterfaces.GitRepository[]) => void): void;
-	    /**
-	     * @param {string} repositoryId
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting GitInterfaces.GitRepository
-	     */
-	    getRepository(repositoryId: string, project: string, onResult: (err: any, statusCode: number, Repositorie: GitInterfaces.GitRepository) => void): void;
-	    /**
-	     * Updates the Git repository with the single populated change in the specified repository information.
-	     *
-	     * @param {GitInterfaces.GitRepository} newRepositoryInfo
-	     * @param {string} repositoryId
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting GitInterfaces.GitRepository
-	     */
-	    updateRepository(newRepositoryInfo: GitInterfaces.GitRepository, repositoryId: string, project: string, onResult: (err: any, statusCode: number, Repositorie: GitInterfaces.GitRepository) => void): void;
-	    /**
-	     * @param {string} repositoryId
-	     * @param {string} sha1
-	     * @param {string} project - Project ID or project name
-	     * @param {string} projectId
-	     * @param {boolean} recursive
-	     * @param {string} fileName
-	     * @param onResult callback function with the resulting GitInterfaces.GitTreeRef
-	     */
-	    getTree(repositoryId: string, sha1: string, project: string, projectId: string, recursive: boolean, fileName: string, onResult: (err: any, statusCode: number, Tree: GitInterfaces.GitTreeRef) => void): void;
-	    /**
-	     * @param {string} repositoryId
-	     * @param {string} sha1
-	     * @param {string} project - Project ID or project name
-	     * @param {string} projectId
-	     * @param {boolean} recursive
-	     * @param {string} fileName
-	     * @param onResult callback function with the resulting ArrayBuffer
-	     */
-	    getTreeZip(repositoryId: string, sha1: string, project: string, projectId: string, recursive: boolean, fileName: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	}
-	export class QGitApi extends basem.QClientApiBase implements IQGitApi {
-	    api: GitApi;
-	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
-	    /**
-	    * Gets a single blob.
-	    *
-	    * @param {string} repositoryId
-	    * @param {string} sha1
-	    * @param {string} project - Project ID or project name
-	    * @param {boolean} download
-	    * @param {string} fileName
-	    */
-	    getBlob(repositoryId: string, sha1: string, project?: string, download?: boolean, fileName?: string): Q.Promise<GitInterfaces.GitBlobRef>;
-	    /**
-	    * Retrieve statistics about a single branch.
-	    *
-	    * @param {string} repositoryId - Friendly name or guid of repository
-	    * @param {string} name - Name of the branch
-	    * @param {string} project - Project ID or project name
-	    * @param {GitInterfaces.GitVersionDescriptor} baseVersionDescriptor
-	    */
-	    getBranch(repositoryId: string, name: string, project?: string, baseVersionDescriptor?: GitInterfaces.GitVersionDescriptor): Q.Promise<GitInterfaces.GitBranchStats>;
-	    /**
-	    * Retrieve statistics about all branches within a repository.
-	    *
-	    * @param {string} repositoryId - Friendly name or guid of repository
-	    * @param {string} project - Project ID or project name
-	    * @param {GitInterfaces.GitVersionDescriptor} baseVersionDescriptor
-	    */
-	    getBranches(repositoryId: string, project?: string, baseVersionDescriptor?: GitInterfaces.GitVersionDescriptor): Q.Promise<GitInterfaces.GitBranchStats[]>;
-	    /**
-	    * Retrieve changes for a particular commit.
-	    *
-	    * @param {string} commitId - The id of the commit.
-	    * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
-	    * @param {string} project - Project ID or project name
-	    * @param {number} top - The maximum number of changes to return.
-	    * @param {number} skip - The number of changes to skip.
-	    */
-	    getChanges(commitId: string, repositoryId: string, project?: string, top?: number, skip?: number): Q.Promise<GitInterfaces.GitCommitChanges>;
-	    /**
-	    * Create a git commit for a project
-	    *
-	    * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
-	    * @param {string} project - Project ID or project name
-	    */
-	    createCommit(repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitCommit>;
-	    /**
-	    * Retrieve a particular commit.
-	    *
-	    * @param {string} commitId - The id of the commit.
-	    * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
-	    * @param {string} project - Project ID or project name
-	    * @param {number} changeCount - The number of changes to include in the result.
-	    */
-	    getCommit(commitId: string, repositoryId: string, project?: string, changeCount?: number): Q.Promise<GitInterfaces.GitCommit>;
-	    /**
-	    * Retrieve git commits for a project
-	    *
-	    * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
-	    * @param {GitInterfaces.GitQueryCommitsCriteria} searchCriteria
-	    * @param {string} project - Project ID or project name
-	    * @param {number} skip
-	    * @param {number} top
-	    */
-	    getCommits(repositoryId: string, searchCriteria: GitInterfaces.GitQueryCommitsCriteria, project?: string, skip?: number, top?: number): Q.Promise<GitInterfaces.GitCommitRef[]>;
-	    /**
-	    * Retrieve a list of commits associated with a particular push.
-	    *
-	    * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
-	    * @param {number} pushId - The id of the push.
-	    * @param {string} project - Project ID or project name
-	    * @param {number} top - The maximum number of commits to return ("get the top x commits").
-	    * @param {number} skip - The number of commits to skip.
-	    * @param {boolean} includeLinks
-	    */
-	    getPushCommits(repositoryId: string, pushId: number, project?: string, top?: number, skip?: number, includeLinks?: boolean): Q.Promise<GitInterfaces.GitCommitRef[]>;
-	    /**
-	    * Retrieve git commits for a project
-	    *
-	    * @param {GitInterfaces.GitQueryCommitsCriteria} searchCriteria - Search options
-	    * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
-	    * @param {string} project - Project ID or project name
-	    * @param {number} skip
-	    * @param {number} top
-	    */
-	    getCommitsBatch(searchCriteria: GitInterfaces.GitQueryCommitsCriteria, repositoryId: string, project?: string, skip?: number, top?: number): Q.Promise<GitInterfaces.GitCommitRef[]>;
-	    /**
-	    * Get Item Metadata and/or Content for a single item. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
-	    *
-	    * @param {string} repositoryId
-	    * @param {string} path
-	    * @param {string} project - Project ID or project name
-	    * @param {string} scopePath
-	    * @param {GitInterfaces.VersionControlRecursionType} recursionLevel
-	    * @param {boolean} includeContentMetadata
-	    * @param {boolean} latestProcessedChange
-	    * @param {boolean} download
-	    * @param {GitInterfaces.GitVersionDescriptor} versionDescriptor
-	    */
-	    getItem(repositoryId: string, path: string, project?: string, scopePath?: string, recursionLevel?: GitInterfaces.VersionControlRecursionType, includeContentMetadata?: boolean, latestProcessedChange?: boolean, download?: boolean, versionDescriptor?: GitInterfaces.GitVersionDescriptor): Q.Promise<GitInterfaces.GitItem>;
-	    /**
-	    * Get Item Metadata and/or Content for a collection of items. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
-	    *
-	    * @param {string} repositoryId
-	    * @param {string} project - Project ID or project name
-	    * @param {string} scopePath
-	    * @param {GitInterfaces.VersionControlRecursionType} recursionLevel
-	    * @param {boolean} includeContentMetadata
-	    * @param {boolean} latestProcessedChange
-	    * @param {boolean} download
-	    * @param {boolean} includeLinks
-	    * @param {GitInterfaces.GitVersionDescriptor} versionDescriptor
-	    */
-	    getItems(repositoryId: string, project?: string, scopePath?: string, recursionLevel?: GitInterfaces.VersionControlRecursionType, includeContentMetadata?: boolean, latestProcessedChange?: boolean, download?: boolean, includeLinks?: boolean, versionDescriptor?: GitInterfaces.GitVersionDescriptor): Q.Promise<GitInterfaces.GitItem[]>;
-	    /**
-	    * Post for retrieving a creating a batch out of a set of items in a repo / project given a list of paths or a long path
-	    *
-	    * @param {GitInterfaces.GitItemRequestData} requestData
-	    * @param {string} repositoryId
-	    * @param {string} project - Project ID or project name
-	    */
-	    getItemsBatch(requestData: GitInterfaces.GitItemRequestData, repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitItem[][]>;
-	    /**
-	    * Adds a reviewer to a git pull request
-	    *
-	    * @param {GitInterfaces.IdentityRefWithVote} reviewer
-	    * @param {string} repositoryId
-	    * @param {number} pullRequestId
-	    * @param {string} reviewerId
-	    * @param {string} project - Project ID or project name
-	    */
-	    createPullRequestReviewer(reviewer: GitInterfaces.IdentityRefWithVote, repositoryId: string, pullRequestId: number, reviewerId: string, project?: string): Q.Promise<GitInterfaces.IdentityRefWithVote>;
-	    /**
-	    * Adds reviewers to a git pull request
-	    *
-	    * @param {VSSInterfaces.IdentityRef[]} reviewers
-	    * @param {string} repositoryId
-	    * @param {number} pullRequestId
-	    * @param {string} project - Project ID or project name
-	    */
-	    createPullRequestReviewers(reviewers: VSSInterfaces.IdentityRef[], repositoryId: string, pullRequestId: number, project?: string): Q.Promise<GitInterfaces.IdentityRefWithVote[]>;
-	    /**
-	    * Retrieve a reviewer from a pull request
-	    *
-	    * @param {string} repositoryId
-	    * @param {number} pullRequestId
-	    * @param {string} reviewerId
-	    * @param {string} project - Project ID or project name
-	    */
-	    getPullRequestReviewer(repositoryId: string, pullRequestId: number, reviewerId: string, project?: string): Q.Promise<GitInterfaces.IdentityRefWithVote>;
-	    /**
-	    * Retrieve a pull request reviewers
-	    *
-	    * @param {string} repositoryId
-	    * @param {number} pullRequestId
-	    * @param {string} project - Project ID or project name
-	    */
-	    getPullRequestReviewers(repositoryId: string, pullRequestId: number, project?: string): Q.Promise<GitInterfaces.IdentityRefWithVote[]>;
-	    /**
-	    * Create a git pull request
-	    *
-	    * @param {GitInterfaces.GitPullRequest} gitPullRequestToCreate
-	    * @param {string} repositoryId
-	    * @param {string} project - Project ID or project name
-	    */
-	    createPullRequest(gitPullRequestToCreate: GitInterfaces.GitPullRequest, repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitPullRequest>;
-	    /**
-	    * Retrieve a pull request
-	    *
-	    * @param {string} repositoryId
-	    * @param {number} pullRequestId
-	    * @param {string} project - Project ID or project name
-	    * @param {number} maxCommentLength
-	    * @param {number} skip
-	    * @param {number} top
-	    */
-	    getPullRequest(repositoryId: string, pullRequestId: number, project?: string, maxCommentLength?: number, skip?: number, top?: number): Q.Promise<GitInterfaces.GitPullRequest>;
-	    /**
-	    * Query for pull requests
-	    *
-	    * @param {string} repositoryId
-	    * @param {GitInterfaces.GitPullRequestSearchCriteria} searchCriteria
-	    * @param {string} project - Project ID or project name
-	    * @param {number} maxCommentLength
-	    * @param {number} skip
-	    * @param {number} top
-	    */
-	    getPullRequests(repositoryId: string, searchCriteria: GitInterfaces.GitPullRequestSearchCriteria, project?: string, maxCommentLength?: number, skip?: number, top?: number): Q.Promise<GitInterfaces.GitPullRequest[]>;
-	    /**
-	    * Updates a pull request
-	    *
-	    * @param {GitInterfaces.GitPullRequest} gitPullRequestToUpdate
-	    * @param {string} repositoryId
-	    * @param {number} pullRequestId
-	    * @param {string} project - Project ID or project name
-	    */
-	    updatePullRequest(gitPullRequestToUpdate: GitInterfaces.GitPullRequest, repositoryId: string, pullRequestId: number, project?: string): Q.Promise<GitInterfaces.GitPullRequest>;
-	    /**
-	    * Retrieve a pull request work items
-	    *
-	    * @param {string} repositoryId
-	    * @param {number} pullRequestId
-	    * @param {string} project - Project ID or project name
-	    * @param {number} commitsTop
-	    * @param {number} commitsSkip
-	    */
-	    getPullRequestWorkItems(repositoryId: string, pullRequestId: number, project?: string, commitsTop?: number, commitsSkip?: number): Q.Promise<GitInterfaces.AssociatedWorkItem[]>;
-	    /**
-	    * Push changes to the repository.
-	    *
-	    * @param {GitInterfaces.GitPush} push
-	    * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, a project-scoped route must be used.
-	    * @param {string} project - Project ID or project name
-	    */
-	    createPush(push: GitInterfaces.GitPush, repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitPush>;
-	    /**
-	    * Retrieve a particular push.
-	    *
-	    * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
-	    * @param {number} pushId - The id of the push.
-	    * @param {string} project - Project ID or project name
-	    * @param {number} includeCommits - The number of commits to include in the result.
-	    * @param {boolean} includeRefUpdates
-	    */
-	    getPush(repositoryId: string, pushId: number, project?: string, includeCommits?: number, includeRefUpdates?: boolean): Q.Promise<GitInterfaces.GitPush>;
-	    /**
-	    * Retrieves pushes associated with the specified repository.
-	    *
-	    * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
-	    * @param {string} project - Project ID or project name
-	    * @param {number} skip
-	    * @param {number} top
-	    * @param {GitInterfaces.GitPushSearchCriteria} searchCriteria
-	    */
-	    getPushes(repositoryId: string, project?: string, skip?: number, top?: number, searchCriteria?: GitInterfaces.GitPushSearchCriteria): Q.Promise<GitInterfaces.GitPush[]>;
-	    /**
-	    * Queries the provided repository for its refs and returns them.
-	    *
-	    * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
-	    * @param {string} project - Project ID or project name
-	    * @param {string} filter - [optional] A filter to apply to the refs.
-	    * @param {boolean} includeLinks - [optional] Specifies if referenceLinks should be included in the result. default is false.
-	    */
-	    getRefs(repositoryId: string, project?: string, filter?: string, includeLinks?: boolean): Q.Promise<GitInterfaces.GitRef[]>;
-	    /**
-	    * Creates or updates refs with the given information
-	    *
-	    * @param {GitInterfaces.GitRefUpdate[]} refUpdates - List of ref updates to attempt to perform
-	    * @param {string} repositoryId - The id or friendly name of the repository. To use the friendly name, projectId must also be specified.
-	    * @param {string} project - Project ID or project name
-	    * @param {string} projectId - The id of the project.
-	    */
-	    updateRefs(refUpdates: GitInterfaces.GitRefUpdate[], repositoryId: string, project?: string, projectId?: string): Q.Promise<GitInterfaces.GitRefUpdateResult[]>;
-	    /**
-	    * Create a git repository
-	    *
-	    * @param {GitInterfaces.GitRepository} gitRepositoryToCreate
-	    * @param {string} project - Project ID or project name
-	    */
-	    createRepository(gitRepositoryToCreate: GitInterfaces.GitRepository, project?: string): Q.Promise<GitInterfaces.GitRepository>;
-	    /**
-	    * Retrieve git repositories.
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {boolean} includeLinks
-	    */
-	    getRepositories(project?: string, includeLinks?: boolean): Q.Promise<GitInterfaces.GitRepository[]>;
-	    /**
-	    * @param {string} repositoryId
-	    * @param {string} project - Project ID or project name
-	    */
-	    getRepository(repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitRepository>;
-	    /**
-	    * Updates the Git repository with the single populated change in the specified repository information.
-	    *
-	    * @param {GitInterfaces.GitRepository} newRepositoryInfo
-	    * @param {string} repositoryId
-	    * @param {string} project - Project ID or project name
-	    */
-	    updateRepository(newRepositoryInfo: GitInterfaces.GitRepository, repositoryId: string, project?: string): Q.Promise<GitInterfaces.GitRepository>;
-	    /**
-	    * @param {string} repositoryId
-	    * @param {string} sha1
-	    * @param {string} project - Project ID or project name
-	    * @param {string} projectId
-	    * @param {boolean} recursive
-	    * @param {string} fileName
-	    */
-	    getTree(repositoryId: string, sha1: string, project?: string, projectId?: string, recursive?: boolean, fileName?: string): Q.Promise<GitInterfaces.GitTreeRef>;
-	}
-
-}
-declare module 'vso-node-api/interfaces/TaskAgentInterfaces' {
-	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
-	export interface AgentPoolEvent {
-	    eventType: string;
-	    pool: TaskAgentPool;
-	}
-	export interface AgentQueueEvent {
-	    eventType: string;
-	    queue: TaskAgentQueue;
-	}
-	export interface AgentRefreshMessage {
-	    agentId: number;
-	    timeout: any;
-	}
-	export enum ConnectedServiceKind {
-	    /**
-	     * Custom or unknown service
-	     */
-	    Custom = 0,
-	    /**
-	     * Azure Subscription
-	     */
-	    AzureSubscription = 1,
-	    /**
-	     * Chef Connection
-	     */
-	    Chef = 2,
-	    /**
-	     * Generic Connection
-	     */
-	    Generic = 3,
-	    /**
-	     * GitHub Connection
-	     */
-	    GitHub = 4,
-	}
-	export interface EndpointAuthorization {
-	    parameters: {
-	        [key: string]: string;
-	    };
-	    scheme: string;
-	}
-	export interface Issue {
-	    category: string;
-	    data: {
-	        [key: string]: string;
-	    };
-	    message: string;
-	    type: IssueType;
-	}
-	export enum IssueType {
-	    Error = 1,
-	    Warning = 2,
-	}
-	export interface JobAssignedEvent extends JobEvent {
-	    request: TaskAgentJobRequest;
-	}
-	export interface JobCancelMessage {
-	    jobId: string;
-	    timeout: any;
-	}
-	export interface JobCompletedEvent extends JobEvent {
-	    result: TaskResult;
-	}
-	/**
-	 * Represents the context of variables and vectors for a job request.
-	 */
-	export interface JobEnvironment {
-	    endpoints: ServiceEndpoint[];
-	    mask: MaskHint[];
-	    options: {
-	        [key: number]: JobOption;
-	    };
-	    /**
-	     * Gets or sets the endpoint used for communicating back to the calling service.
-	     */
-	    systemConnection: ServiceEndpoint;
-	    variables: {
-	        [key: string]: string;
-	    };
-	}
-	export interface JobEvent {
-	    jobId: string;
-	    name: string;
-	}
-	/**
-	 * Represents an option that may affect the way an agent runs the job.
-	 */
-	export interface JobOption {
-	    data: {
-	        [key: string]: string;
-	    };
-	    /**
-	     * Gets the id of the option.
-	     */
-	    id: string;
-	}
-	export interface JobRequestMessage {
-	    environment: JobEnvironment;
-	    jobId: string;
-	    jobName: string;
-	    lockedUntil: Date;
-	    lockToken: string;
-	    plan: TaskOrchestrationPlanReference;
-	    requestId: number;
-	    tasks: TaskInstance[];
-	    timeline: TimelineReference;
-	}
-	export interface MaskHint {
-	    type: MaskType;
-	    value: string;
-	}
-	export enum MaskType {
-	    Variable = 1,
-	    Regex = 2,
-	}
-	export interface PlanEnvironment {
-	    mask: MaskHint[];
-	    options: {
-	        [key: number]: JobOption;
-	    };
-	    variables: {
-	        [key: string]: string;
-	    };
-	}
-	/**
-	 * Represents an endpoint which may be used by an orchestration job.
-	 */
-	export interface ServiceEndpoint {
-	    administratorsGroup: VSSInterfaces.IdentityRef;
-	    /**
-	     * Gets or sets the authorization data for talking to the endpoint.
-	     */
-	    authorization: EndpointAuthorization;
-	    /**
-	     * The Gets or sets Identity reference for the user who created the Service endpoint
-	     */
-	    createdBy: VSSInterfaces.IdentityRef;
-	    data: {
-	        [key: string]: string;
-	    };
-	    /**
-	     * Gets or Sets description of endpoint
-	     */
-	    description: string;
-	    groupScopeId: string;
-	    /**
-	     * Gets or sets the identifier of this endpoint.
-	     */
-	    id: string;
-	    /**
-	     * Gets or sets the friendly name of the endpoint.
-	     */
-	    name: string;
-	    readersGroup: VSSInterfaces.IdentityRef;
-	    /**
-	     * Gets or sets the type of the endpoint.
-	     */
-	    type: string;
-	    /**
-	     * Gets or sets the url of the endpoint.
-	     */
-	    url: string;
-	}
-	export interface TaskAgent extends TaskAgentReference {
-	    /**
-	     * Gets the date on which this agent was created.
-	     */
-	    createdOn: Date;
-	    /**
-	     * Gets or sets a value indicating whether or not this agent should be enabled for job execution.
-	     */
-	    enabled: boolean;
-	    /**
-	     * Gets or sets the maximum job parallelism allowed on this host.
-	     */
-	    maxParallelism: number;
-	    properties: any;
-	    /**
-	     * Gets the current connectivity status of the agent.
-	     */
-	    status: TaskAgentStatus;
-	    /**
-	     * Gets the date on which the last connectivity status change occurred.
-	     */
-	    statusChangedOn: Date;
-	    systemCapabilities: {
-	        [key: string]: string;
-	    };
-	    userCapabilities: {
-	        [key: string]: string;
-	    };
-	}
-	export interface TaskAgentJobRequest {
-	    assignTime: Date;
-	    demands: any[];
-	    finishTime: Date;
-	    hostId: string;
-	    jobId: string;
-	    lockedUntil: Date;
-	    planId: string;
-	    planType: string;
-	    queueTime: Date;
-	    receiveTime: Date;
-	    requestId: number;
-	    reservedAgent: TaskAgentReference;
-	    result: TaskResult;
-	    scopeId: string;
-	    serviceOwner: string;
-	}
-	export interface TaskAgentMessage {
-	    body: string;
-	    messageId: number;
-	    messageType: string;
-	}
-	export interface TaskAgentPool extends TaskAgentPoolReference {
-	    /**
-	     * Gets the administrators group for this agent pool.
-	     */
-	    administratorsGroup: VSSInterfaces.IdentityRef;
-	    /**
-	     * Gets or sets a value indicating whether or not a queue should be automatically provisioned for each project collection or not.
-	     */
-	    autoProvision: boolean;
-	    /**
-	     * Gets the identity who created this pool. The creator of the pool is automatically added into the administrators group for the pool on creation.
-	     */
-	    createdBy: VSSInterfaces.IdentityRef;
-	    /**
-	     * Gets the date/time of the pool creation.
-	     */
-	    createdOn: Date;
-	    /**
-	     * Gets the scope identifier for groups/roles which are owned by this pool.
-	     */
-	    groupScopeId: string;
-	    /**
-	     * Gets or sets a value indicating whether or not this pool is managed by the service.
-	     */
-	    isHosted: boolean;
-	    properties: any;
-	    /**
-	     * Gets the service accounts group for this agent pool.
-	     */
-	    serviceAccountsGroup: VSSInterfaces.IdentityRef;
-	    /**
-	     * Gets the current size of the pool.
-	     */
-	    size: number;
-	}
-	export interface TaskAgentPoolReference {
-	    id: number;
-	    name: string;
-	    scope: string;
-	}
-	export interface TaskAgentQueue {
-	    id: number;
-	    name: string;
-	    pool: TaskAgentPoolReference;
-	}
-	export interface TaskAgentReference {
-	    /**
-	     * Gets the identifier of the agent.
-	     */
-	    id: number;
-	    /**
-	     * Gets the name of the agent.
-	     */
-	    name: string;
-	    /**
-	     * Gets the version of the agent.
-	     */
-	    version: string;
-	}
-	export interface TaskAgentSession {
-	    agent: TaskAgentReference;
-	    ownerName: string;
-	    sessionId: string;
-	    systemCapabilities: {
-	        [key: string]: string;
-	    };
-	}
-	export enum TaskAgentStatus {
-	    Offline = 1,
-	    Online = 2,
-	}
-	export interface TaskAttachment {
-	    _links: any;
-	    createdOn: Date;
-	    lastChangedBy: string;
-	    lastChangedOn: Date;
-	    name: string;
-	    type: string;
-	}
-	export interface TaskDefinition {
-	    agentExecution: TaskExecution;
-	    author: string;
-	    category: string;
-	    contentsUploaded: boolean;
-	    demands: any[];
-	    description: string;
-	    friendlyName: string;
-	    groups: TaskGroupDefinition[];
-	    helpMarkDown: string;
-	    hostType: string;
-	    iconUrl: string;
-	    id: string;
-	    inputs: TaskInputDefinition[];
-	    instanceNameFormat: string;
-	    minimumAgentVersion: string;
-	    name: string;
-	    packageLocation: string;
-	    packageType: string;
-	    serverOwned: boolean;
-	    sourceDefinitions: TaskSourceDefinition[];
-	    sourceLocation: string;
-	    version: TaskVersion;
-	    visibility: string[];
-	}
-	export interface TaskDefinitionEndpoint {
-	    /**
-	     * An ID that identifies a service connection to be used for authenticating endpoint requests.
-	     */
-	    connectionId: string;
-	    /**
-	     * The scope as understood by Connected Services. Essentialy, a project-id for now.
-	     */
-	    scope: string;
-	    /**
-	     * An XPath/Json based selector to filter response returned by fetching the endpoint Url. An XPath based selector must be prefixed with the string "xpath:". A Json based selector must be prefixed with "json:".  The following selector defines an XPath for extracting nodes named 'ServiceName'.  endpoint.Selector = "xpath://ServiceName";
-	     */
-	    selector: string;
-	    /**
-	     * TaskId that this endpoint belongs to.
-	     */
-	    taskId: string;
-	    /**
-	     * URL to GET.
-	     */
-	    url: string;
-	}
-	export interface TaskExecution {
-	    /**
-	     * The utility task to run.  Specifying this means that this task definition is simply a meta task to call another task. This is useful for tasks that call utility tasks like powershell and commandline
-	     */
-	    execTask: TaskReference;
-	    /**
-	     * If a task is going to run code, then this provides the type/script etc... information by platform. For example, it might look like. net45: { typeName: "Microsoft.TeamFoundation.Automation.Tasks.PowerShellTask", assemblyName: "Microsoft.TeamFoundation.Automation.Tasks.PowerShell.dll" } net20: { typeName: "Microsoft.TeamFoundation.Automation.Tasks.PowerShellTask", assemblyName: "Microsoft.TeamFoundation.Automation.Tasks.PowerShell.dll" } java: { jar: "powershelltask.tasks.automation.teamfoundation.microsoft.com", } node: { script: "powershellhost.js", }
-	     */
-	    platformInstructions: {
-	        [key: string]: {
-	            [key: string]: string;
-	        };
-	    };
-	}
-	export interface TaskGroupDefinition {
-	    displayName: string;
-	    isExpanded: boolean;
-	    name: string;
-	}
-	export interface TaskInputDefinition {
-	    defaultValue: string;
-	    groupName: string;
-	    helpMarkDown: string;
-	    label: string;
-	    name: string;
-	    options: {
-	        [key: string]: string;
-	    };
-	    properties: {
-	        [key: string]: string;
-	    };
-	    required: boolean;
-	    type: string;
-	    visibleRule: string;
-	}
-	export interface TaskInstance extends TaskReference {
-	    alwaysRun: boolean;
-	    continueOnError: boolean;
-	    displayName: string;
-	    enabled: boolean;
-	    instanceId: string;
-	}
-	export interface TaskLog extends TaskLogReference {
-	    createdOn: Date;
-	    indexLocation: string;
-	    lastChangedOn: Date;
-	    lineCount: number;
-	    path: string;
-	}
-	export interface TaskLogReference {
-	    id: number;
-	    location: string;
-	}
-	export interface TaskOrchestrationContainer extends TaskOrchestrationItem {
-	    children: TaskOrchestrationItem[];
-	    continueOnError: boolean;
-	    parallel: boolean;
-	    rollback: TaskOrchestrationContainer;
-	}
-	export interface TaskOrchestrationItem {
-	    itemType: TaskOrchestrationItemType;
-	}
-	export enum TaskOrchestrationItemType {
-	    Container = 0,
-	    Job = 1,
-	}
-	export interface TaskOrchestrationJob extends TaskOrchestrationItem {
-	    demands: any[];
-	    executeAs: VSSInterfaces.IdentityRef;
-	    executionTimeout: any;
-	    instanceId: string;
-	    name: string;
-	    tasks: TaskInstance[];
-	    variables: {
-	        [key: string]: string;
-	    };
-	}
-	export interface TaskOrchestrationPlan extends TaskOrchestrationPlanReference {
-	    environment: PlanEnvironment;
-	    finishTime: Date;
-	    implementation: TaskOrchestrationContainer;
-	    result: TaskResult;
-	    resultCode: string;
-	    startTime: Date;
-	    state: TaskOrchestrationPlanState;
-	    timeline: TimelineReference;
-	}
-	export interface TaskOrchestrationPlanReference {
-	    artifactLocation: string;
-	    artifactUri: string;
-	    planId: string;
-	    planType: string;
-	    scopeIdentifier: string;
-	    version: number;
-	}
-	export enum TaskOrchestrationPlanState {
-	    InProgress = 1,
-	    Queued = 2,
-	    Completed = 4,
-	}
-	export interface TaskPackageMetadata {
-	    /**
-	     * Gets the name of the package.
-	     */
-	    type: string;
-	    /**
-	     * Gets the url of the package.
-	     */
-	    url: string;
-	    /**
-	     * Gets the version of the package.
-	     */
-	    version: string;
-	}
-	export interface TaskReference {
-	    id: string;
-	    inputs: {
-	        [key: string]: string;
-	    };
-	    name: string;
-	    version: string;
-	}
-	export enum TaskResult {
-	    Succeeded = 0,
-	    SucceededWithIssues = 1,
-	    Failed = 2,
-	    Canceled = 3,
-	    Skipped = 4,
-	    Abandoned = 5,
-	}
-	export interface TaskSourceDefinition {
-	    authKey: string;
-	    endpoint: string;
-	    selector: string;
-	    target: string;
-	}
-	export interface TaskVersion {
-	    isTest: boolean;
-	    major: number;
-	    minor: number;
-	    patch: number;
-	}
-	/**
-	 * Represents a shallow reference to a TeamProject.
-	 */
-	export interface TeamProjectReference {
-	    /**
-	     * Project abbreviation.
-	     */
-	    abbreviation: string;
-	    /**
-	     * The project's description (if any).
-	     */
-	    description: string;
-	    /**
-	     * Project identifier.
-	     */
-	    id: string;
-	    /**
-	     * Project name.
-	     */
-	    name: string;
-	    /**
-	     * Project state.
-	     */
-	    state: any;
-	    /**
-	     * Url to the full version of the object.
-	     */
-	    url: string;
-	}
-	export interface Timeline extends TimelineReference {
-	    lastChangedBy: string;
-	    lastChangedOn: Date;
-	    records: TimelineRecord[];
-	}
-	export interface TimelineRecord {
-	    changeId: number;
-	    currentOperation: string;
-	    details: TimelineReference;
-	    errorCount: number;
-	    finishTime: Date;
-	    id: string;
-	    issues: Issue[];
-	    lastModified: Date;
-	    location: string;
-	    log: TaskLogReference;
-	    name: string;
-	    order: number;
-	    parentId: string;
-	    percentComplete: number;
-	    result: TaskResult;
-	    resultCode: string;
-	    startTime: Date;
-	    state: TimelineRecordState;
-	    type: string;
-	    warningCount: number;
-	    workerName: string;
-	}
-	export enum TimelineRecordState {
-	    Pending = 0,
-	    InProgress = 1,
-	    Completed = 2,
-	}
-	export interface TimelineReference {
-	    changeId: number;
-	    id: string;
-	    location: string;
-	}
-	export interface WebApiConnectedService extends WebApiConnectedServiceRef {
-	    /**
-	     * The user who did the OAuth authentication to created this service
-	     */
-	    authenticatedBy: VSSInterfaces.IdentityRef;
-	    /**
-	     * Extra description on the service.
-	     */
-	    description: string;
-	    /**
-	     * Friendly Name of service connection
-	     */
-	    friendlyName: string;
-	    /**
-	     * Id/Name of the connection service. For Ex: Subscription Id for Azure Connection
-	     */
-	    id: string;
-	    /**
-	     * The kind of service.
-	     */
-	    kind: string;
-	    /**
-	     * The project associated with this service
-	     */
-	    project: TeamProjectReference;
-	    /**
-	     * Optional uri to connect directly to the service such as https://windows.azure.com
-	     */
-	    serviceUri: string;
-	}
-	export interface WebApiConnectedServiceDetails extends WebApiConnectedServiceRef {
-	    /**
-	     * Meta data for service connection
-	     */
-	    connectedServiceMetaData: WebApiConnectedService;
-	    /**
-	     * Credential info
-	     */
-	    credentialsXml: string;
-	    /**
-	     * Optional uri to connect directly to the service such as https://windows.azure.com
-	     */
-	    endPoint: string;
-	}
-	export interface WebApiConnectedServiceRef {
-	    id: string;
-	    url: string;
-	}
-	export var TypeInfo: {
-	    AgentPoolEvent: {
-	        fields: any;
-	    };
-	    AgentQueueEvent: {
-	        fields: any;
-	    };
-	    AgentRefreshMessage: {
-	        fields: any;
-	    };
-	    ConnectedServiceKind: {
-	        enumValues: {
-	            "custom": number;
-	            "azureSubscription": number;
-	            "chef": number;
-	            "generic": number;
-	            "gitHub": number;
-	        };
-	    };
-	    EndpointAuthorization: {
-	        fields: any;
-	    };
-	    Issue: {
-	        fields: any;
-	    };
-	    IssueType: {
-	        enumValues: {
-	            "error": number;
-	            "warning": number;
-	        };
-	    };
-	    JobAssignedEvent: {
-	        fields: any;
-	    };
-	    JobCancelMessage: {
-	        fields: any;
-	    };
-	    JobCompletedEvent: {
-	        fields: any;
-	    };
-	    JobEnvironment: {
-	        fields: any;
-	    };
-	    JobEvent: {
-	        fields: any;
-	    };
-	    JobOption: {
-	        fields: any;
-	    };
-	    JobRequestMessage: {
-	        fields: any;
-	    };
-	    MaskHint: {
-	        fields: any;
-	    };
-	    MaskType: {
-	        enumValues: {
-	            "variable": number;
-	            "regex": number;
-	        };
-	    };
-	    PlanEnvironment: {
-	        fields: any;
-	    };
-	    ServiceEndpoint: {
-	        fields: any;
-	    };
-	    TaskAgent: {
-	        fields: any;
-	    };
-	    TaskAgentJobRequest: {
-	        fields: any;
-	    };
-	    TaskAgentMessage: {
-	        fields: any;
-	    };
-	    TaskAgentPool: {
-	        fields: any;
-	    };
-	    TaskAgentPoolReference: {
-	        fields: any;
-	    };
-	    TaskAgentQueue: {
-	        fields: any;
-	    };
-	    TaskAgentReference: {
-	        fields: any;
-	    };
-	    TaskAgentSession: {
-	        fields: any;
-	    };
-	    TaskAgentStatus: {
-	        enumValues: {
-	            "offline": number;
-	            "online": number;
-	        };
-	    };
-	    TaskAttachment: {
-	        fields: any;
-	    };
-	    TaskDefinition: {
-	        fields: any;
-	    };
-	    TaskDefinitionEndpoint: {
-	        fields: any;
-	    };
-	    TaskExecution: {
-	        fields: any;
-	    };
-	    TaskGroupDefinition: {
-	        fields: any;
-	    };
-	    TaskInputDefinition: {
-	        fields: any;
-	    };
-	    TaskInstance: {
-	        fields: any;
-	    };
-	    TaskLog: {
-	        fields: any;
-	    };
-	    TaskLogReference: {
-	        fields: any;
-	    };
-	    TaskOrchestrationContainer: {
-	        fields: any;
-	    };
-	    TaskOrchestrationItem: {
-	        fields: any;
-	    };
-	    TaskOrchestrationItemType: {
-	        enumValues: {
-	            "container": number;
-	            "job": number;
-	        };
-	    };
-	    TaskOrchestrationJob: {
-	        fields: any;
-	    };
-	    TaskOrchestrationPlan: {
-	        fields: any;
-	    };
-	    TaskOrchestrationPlanReference: {
-	        fields: any;
-	    };
-	    TaskOrchestrationPlanState: {
-	        enumValues: {
-	            "inProgress": number;
-	            "queued": number;
-	            "completed": number;
-	        };
-	    };
-	    TaskPackageMetadata: {
-	        fields: any;
-	    };
-	    TaskReference: {
-	        fields: any;
-	    };
-	    TaskResult: {
-	        enumValues: {
-	            "succeeded": number;
-	            "succeededWithIssues": number;
-	            "failed": number;
-	            "canceled": number;
-	            "skipped": number;
-	            "abandoned": number;
-	        };
-	    };
-	    TaskSourceDefinition: {
-	        fields: any;
-	    };
-	    TaskVersion: {
-	        fields: any;
-	    };
-	    TeamProjectReference: {
-	        fields: any;
-	    };
-	    Timeline: {
-	        fields: any;
-	    };
-	    TimelineRecord: {
-	        fields: any;
-	    };
-	    TimelineRecordState: {
-	        enumValues: {
-	            "pending": number;
-	            "inProgress": number;
-	            "completed": number;
-	        };
-	    };
-	    TimelineReference: {
-	        fields: any;
-	    };
-	    WebApiConnectedService: {
-	        fields: any;
-	    };
-	    WebApiConnectedServiceDetails: {
-	        fields: any;
-	    };
-	    WebApiConnectedServiceRef: {
-	        fields: any;
-	    };
-	};
-
-}
-declare module 'vso-node-api/TaskAgentApi' {
-	/// <reference path="../node/node.d.ts" />
-	/// <reference path="../q/Q.d.ts" />
-	import Q = require('q');
-	import basem = require('vso-node-api/ClientApiBases');
-	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
-	import TaskAgentInterfaces = require('vso-node-api/interfaces/TaskAgentInterfaces');
-	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
-	export interface ITaskAgentApi extends basem.ClientApiBase {
-	    createAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number, onResult: (err: any, statusCode: number, agent: TaskAgentInterfaces.TaskAgent) => void): void;
-	    deleteAgent(poolId: number, agentId: number, onResult: (err: any, statusCode: number) => void): void;
-	    getAgent(poolId: number, agentId: number, includeCapabilities: boolean, propertyFilters: string, onResult: (err: any, statusCode: number, agent: TaskAgentInterfaces.TaskAgent) => void): void;
-	    getAgents(poolId: number, agentName: string, includeCapabilities: boolean, propertyFilters: string, demands: string, onResult: (err: any, statusCode: number, agents: TaskAgentInterfaces.TaskAgent[]) => void): void;
-	    replaceAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number, agentId: number, onResult: (err: any, statusCode: number, agent: TaskAgentInterfaces.TaskAgent) => void): void;
-	    updateAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number, agentId: number, onResult: (err: any, statusCode: number, agent: TaskAgentInterfaces.TaskAgent) => void): void;
-	    queryEndpoint(endpoint: TaskAgentInterfaces.TaskDefinitionEndpoint, onResult: (err: any, statusCode: number, endpoint: string[]) => void): void;
-	    deleteRequest(poolId: number, requestId: number, lockToken: string, onResult: (err: any, statusCode: number) => void): void;
-	    getRequest(poolId: number, requestId: number, onResult: (err: any, statusCode: number, jobrequest: TaskAgentInterfaces.TaskAgentJobRequest) => void): void;
-	    queueRequest(request: TaskAgentInterfaces.TaskAgentJobRequest, poolId: number, onResult: (err: any, statusCode: number, jobrequest: TaskAgentInterfaces.TaskAgentJobRequest) => void): void;
-	    updateRequest(request: TaskAgentInterfaces.TaskAgentJobRequest, poolId: number, requestId: number, lockToken: string, onResult: (err: any, statusCode: number, jobrequest: TaskAgentInterfaces.TaskAgentJobRequest) => void): void;
-	    deleteMessage(poolId: number, messageId: number, sessionId: string, onResult: (err: any, statusCode: number) => void): void;
-	    getMessage(poolId: number, sessionId: string, lastMessageId: number, onResult: (err: any, statusCode: number, message: TaskAgentInterfaces.TaskAgentMessage) => void): void;
-	    refreshAgent(poolId: number, agentId: number, onResult: (err: any, statusCode: number) => void): void;
-	    refreshAgents(poolId: number, onResult: (err: any, statusCode: number) => void): void;
-	    sendMessage(message: TaskAgentInterfaces.TaskAgentMessage, poolId: number, requestId: number, onResult: (err: any, statusCode: number) => void): void;
-	    createPool(pool: TaskAgentInterfaces.TaskAgentPool, onResult: (err: any, statusCode: number, pool: TaskAgentInterfaces.TaskAgentPool) => void): void;
-	    deletePool(poolId: number, onResult: (err: any, statusCode: number) => void): void;
-	    getPool(poolId: number, properties: string, onResult: (err: any, statusCode: number, pool: TaskAgentInterfaces.TaskAgentPool) => void): void;
-	    getPools(poolName: string, properties: string, onResult: (err: any, statusCode: number, pools: TaskAgentInterfaces.TaskAgentPool[]) => void): void;
-	    updatePool(pool: TaskAgentInterfaces.TaskAgentPool, poolId: number, onResult: (err: any, statusCode: number, pool: TaskAgentInterfaces.TaskAgentPool) => void): void;
-	    createQueue(queue: TaskAgentInterfaces.TaskAgentQueue, onResult: (err: any, statusCode: number, queue: TaskAgentInterfaces.TaskAgentQueue) => void): void;
-	    deleteQueue(queueId: number, onResult: (err: any, statusCode: number) => void): void;
-	    getQueue(queueId: number, onResult: (err: any, statusCode: number, queue: TaskAgentInterfaces.TaskAgentQueue) => void): void;
-	    getQueues(queueName: string, onResult: (err: any, statusCode: number, queues: TaskAgentInterfaces.TaskAgentQueue[]) => void): void;
-	    getAgentPoolRoles(poolId: number, onResult: (err: any, statusCode: number, roles: VSSInterfaces.IdentityRef[]) => void): void;
-	    createServiceEndpoint(endpoint: TaskAgentInterfaces.ServiceEndpoint, scopeIdentifier: string, endpointId: string, onResult: (err: any, statusCode: number, serviceendpoint: TaskAgentInterfaces.ServiceEndpoint) => void): void;
-	    deleteServiceEndpoint(scopeIdentifier: string, endpointId: string, onResult: (err: any, statusCode: number) => void): void;
-	    getServiceEndpointDetails(scopeIdentifier: string, endpointId: string, onResult: (err: any, statusCode: number, serviceendpoint: TaskAgentInterfaces.ServiceEndpoint) => void): void;
-	    getServiceEndpoints(scopeIdentifier: string, type: string, onResult: (err: any, statusCode: number, serviceendpoints: TaskAgentInterfaces.ServiceEndpoint[]) => void): void;
-	    createSession(session: TaskAgentInterfaces.TaskAgentSession, poolId: number, onResult: (err: any, statusCode: number, session: TaskAgentInterfaces.TaskAgentSession) => void): void;
-	    deleteSession(poolId: number, sessionId: string, onResult: (err: any, statusCode: number) => void): void;
-	    deleteTaskDefinition(taskId: string, onResult: (err: any, statusCode: number) => void): void;
-	    getTaskContent(taskId: string, versionString: string, onResult: (err: any, statusCode: number, tasks: TaskAgentInterfaces.TaskDefinition[]) => void): void;
-	    getTaskContentZip(taskId: string, versionString: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    getTaskDefinitions(visibility: string[], onResult: (err: any, statusCode: number, tasks: TaskAgentInterfaces.TaskDefinition[]) => void): void;
-	    uploadTaskDefinition(customHeaders: any, contentStream: NodeJS.ReadableStream, taskId: string, overwrite: boolean, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	    updateUserCapabilities(userCapabilities: {
-	        [key: string]: string;
-	    }, poolId: number, agentId: number, onResult: (err: any, statusCode: number, usercapabilitie: TaskAgentInterfaces.TaskAgent) => void): void;
-	}
-	export interface IQTaskAgentApi extends basem.QClientApiBase {
-	    createAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number): Q.Promise<TaskAgentInterfaces.TaskAgent>;
-	    getAgent(poolId: number, agentId: number, includeCapabilities?: boolean, propertyFilters?: string): Q.Promise<TaskAgentInterfaces.TaskAgent>;
-	    getAgents(poolId: number, agentName?: string, includeCapabilities?: boolean, propertyFilters?: string, demands?: string): Q.Promise<TaskAgentInterfaces.TaskAgent[]>;
-	    replaceAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number, agentId: number): Q.Promise<TaskAgentInterfaces.TaskAgent>;
-	    updateAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number, agentId: number): Q.Promise<TaskAgentInterfaces.TaskAgent>;
-	    queryEndpoint(endpoint: TaskAgentInterfaces.TaskDefinitionEndpoint): Q.Promise<string[]>;
-	    getRequest(poolId: number, requestId: number): Q.Promise<TaskAgentInterfaces.TaskAgentJobRequest>;
-	    queueRequest(request: TaskAgentInterfaces.TaskAgentJobRequest, poolId: number): Q.Promise<TaskAgentInterfaces.TaskAgentJobRequest>;
-	    updateRequest(request: TaskAgentInterfaces.TaskAgentJobRequest, poolId: number, requestId: number, lockToken: string): Q.Promise<TaskAgentInterfaces.TaskAgentJobRequest>;
-	    getMessage(poolId: number, sessionId: string, lastMessageId?: number): Q.Promise<TaskAgentInterfaces.TaskAgentMessage>;
-	    createPool(pool: TaskAgentInterfaces.TaskAgentPool): Q.Promise<TaskAgentInterfaces.TaskAgentPool>;
-	    getPool(poolId: number, properties?: string): Q.Promise<TaskAgentInterfaces.TaskAgentPool>;
-	    getPools(poolName?: string, properties?: string): Q.Promise<TaskAgentInterfaces.TaskAgentPool[]>;
-	    updatePool(pool: TaskAgentInterfaces.TaskAgentPool, poolId: number): Q.Promise<TaskAgentInterfaces.TaskAgentPool>;
-	    createQueue(queue: TaskAgentInterfaces.TaskAgentQueue): Q.Promise<TaskAgentInterfaces.TaskAgentQueue>;
-	    getQueue(queueId: number): Q.Promise<TaskAgentInterfaces.TaskAgentQueue>;
-	    getQueues(queueName?: string): Q.Promise<TaskAgentInterfaces.TaskAgentQueue[]>;
-	    getAgentPoolRoles(poolId?: number): Q.Promise<VSSInterfaces.IdentityRef[]>;
-	    createServiceEndpoint(endpoint: TaskAgentInterfaces.ServiceEndpoint, scopeIdentifier: string, endpointId: string): Q.Promise<TaskAgentInterfaces.ServiceEndpoint>;
-	    getServiceEndpointDetails(scopeIdentifier: string, endpointId: string): Q.Promise<TaskAgentInterfaces.ServiceEndpoint>;
-	    getServiceEndpoints(scopeIdentifier: string, type?: string): Q.Promise<TaskAgentInterfaces.ServiceEndpoint[]>;
-	    createSession(session: TaskAgentInterfaces.TaskAgentSession, poolId: number): Q.Promise<TaskAgentInterfaces.TaskAgentSession>;
-	    getTaskContent(taskId: string, versionString?: string): Q.Promise<TaskAgentInterfaces.TaskDefinition[]>;
-	    getTaskDefinitions(visibility: string[]): Q.Promise<TaskAgentInterfaces.TaskDefinition[]>;
-	    updateUserCapabilities(userCapabilities: {
-	        [key: string]: string;
-	    }, poolId: number, agentId: number): Q.Promise<TaskAgentInterfaces.TaskAgent>;
-	}
-	export class TaskAgentApi extends basem.ClientApiBase implements ITaskAgentApi {
-	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
-	    /**
-	     * @param {TaskAgentInterfaces.TaskAgent} agent
-	     * @param {number} poolId
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgent
-	     */
-	    createAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number, onResult: (err: any, statusCode: number, agent: TaskAgentInterfaces.TaskAgent) => void): void;
-	    /**
-	     * @param {number} poolId
-	     * @param {number} agentId
-	     * @param onResult callback function
-	     */
-	    deleteAgent(poolId: number, agentId: number, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {number} poolId
-	     * @param {number} agentId
-	     * @param {boolean} includeCapabilities
-	     * @param {string} propertyFilters
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgent
-	     */
-	    getAgent(poolId: number, agentId: number, includeCapabilities: boolean, propertyFilters: string, onResult: (err: any, statusCode: number, agent: TaskAgentInterfaces.TaskAgent) => void): void;
-	    /**
-	     * @param {number} poolId
-	     * @param {string} agentName
-	     * @param {boolean} includeCapabilities
-	     * @param {string} propertyFilters
-	     * @param {string} demands
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgent[]
-	     */
-	    getAgents(poolId: number, agentName: string, includeCapabilities: boolean, propertyFilters: string, demands: string, onResult: (err: any, statusCode: number, agents: TaskAgentInterfaces.TaskAgent[]) => void): void;
-	    /**
-	     * @param {TaskAgentInterfaces.TaskAgent} agent
-	     * @param {number} poolId
-	     * @param {number} agentId
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgent
-	     */
-	    replaceAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number, agentId: number, onResult: (err: any, statusCode: number, agent: TaskAgentInterfaces.TaskAgent) => void): void;
-	    /**
-	     * @param {TaskAgentInterfaces.TaskAgent} agent
-	     * @param {number} poolId
-	     * @param {number} agentId
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgent
-	     */
-	    updateAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number, agentId: number, onResult: (err: any, statusCode: number, agent: TaskAgentInterfaces.TaskAgent) => void): void;
-	    /**
-	     * Proxy for a GET request defined by an 'endpoint'. The request is authorized using a service connection. The response is filtered using an XPath/Json based selector.
-	     *
-	     * @param {TaskAgentInterfaces.TaskDefinitionEndpoint} endpoint - Describes the URL to fetch.
-	     * @param onResult callback function with the resulting string[]
-	     */
-	    queryEndpoint(endpoint: TaskAgentInterfaces.TaskDefinitionEndpoint, onResult: (err: any, statusCode: number, endpoint: string[]) => void): void;
-	    /**
-	     * @param {number} poolId
-	     * @param {number} requestId
-	     * @param {string} lockToken
-	     * @param onResult callback function
-	     */
-	    deleteRequest(poolId: number, requestId: number, lockToken: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {number} poolId
-	     * @param {number} requestId
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentJobRequest
-	     */
-	    getRequest(poolId: number, requestId: number, onResult: (err: any, statusCode: number, jobrequest: TaskAgentInterfaces.TaskAgentJobRequest) => void): void;
-	    /**
-	     * @param {TaskAgentInterfaces.TaskAgentJobRequest} request
-	     * @param {number} poolId
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentJobRequest
-	     */
-	    queueRequest(request: TaskAgentInterfaces.TaskAgentJobRequest, poolId: number, onResult: (err: any, statusCode: number, jobrequest: TaskAgentInterfaces.TaskAgentJobRequest) => void): void;
-	    /**
-	     * @param {TaskAgentInterfaces.TaskAgentJobRequest} request
-	     * @param {number} poolId
-	     * @param {number} requestId
-	     * @param {string} lockToken
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentJobRequest
-	     */
-	    updateRequest(request: TaskAgentInterfaces.TaskAgentJobRequest, poolId: number, requestId: number, lockToken: string, onResult: (err: any, statusCode: number, jobrequest: TaskAgentInterfaces.TaskAgentJobRequest) => void): void;
-	    /**
-	     * @param {number} poolId
-	     * @param {number} messageId
-	     * @param {string} sessionId
-	     * @param onResult callback function
-	     */
-	    deleteMessage(poolId: number, messageId: number, sessionId: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {number} poolId
-	     * @param {string} sessionId
-	     * @param {number} lastMessageId
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentMessage
-	     */
-	    getMessage(poolId: number, sessionId: string, lastMessageId: number, onResult: (err: any, statusCode: number, message: TaskAgentInterfaces.TaskAgentMessage) => void): void;
-	    /**
-	     * @param {number} poolId
-	     * @param {number} agentId
-	     * @param onResult callback function
-	     */
-	    refreshAgent(poolId: number, agentId: number, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {number} poolId
-	     * @param onResult callback function
-	     */
-	    refreshAgents(poolId: number, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {TaskAgentInterfaces.TaskAgentMessage} message
-	     * @param {number} poolId
-	     * @param {number} requestId
-	     * @param onResult callback function
-	     */
-	    sendMessage(message: TaskAgentInterfaces.TaskAgentMessage, poolId: number, requestId: number, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {TaskAgentInterfaces.TaskAgentPool} pool
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentPool
-	     */
-	    createPool(pool: TaskAgentInterfaces.TaskAgentPool, onResult: (err: any, statusCode: number, pool: TaskAgentInterfaces.TaskAgentPool) => void): void;
-	    /**
-	     * @param {number} poolId
-	     * @param onResult callback function
-	     */
-	    deletePool(poolId: number, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {number} poolId
-	     * @param {string} properties
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentPool
-	     */
-	    getPool(poolId: number, properties: string, onResult: (err: any, statusCode: number, pool: TaskAgentInterfaces.TaskAgentPool) => void): void;
-	    /**
-	     * @param {string} poolName
-	     * @param {string} properties
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentPool[]
-	     */
-	    getPools(poolName: string, properties: string, onResult: (err: any, statusCode: number, pools: TaskAgentInterfaces.TaskAgentPool[]) => void): void;
-	    /**
-	     * @param {TaskAgentInterfaces.TaskAgentPool} pool
-	     * @param {number} poolId
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentPool
-	     */
-	    updatePool(pool: TaskAgentInterfaces.TaskAgentPool, poolId: number, onResult: (err: any, statusCode: number, pool: TaskAgentInterfaces.TaskAgentPool) => void): void;
-	    /**
-	     * @param {TaskAgentInterfaces.TaskAgentQueue} queue
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentQueue
-	     */
-	    createQueue(queue: TaskAgentInterfaces.TaskAgentQueue, onResult: (err: any, statusCode: number, queue: TaskAgentInterfaces.TaskAgentQueue) => void): void;
-	    /**
-	     * @param {number} queueId
-	     * @param onResult callback function
-	     */
-	    deleteQueue(queueId: number, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {number} queueId
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentQueue
-	     */
-	    getQueue(queueId: number, onResult: (err: any, statusCode: number, queue: TaskAgentInterfaces.TaskAgentQueue) => void): void;
-	    /**
-	     * @param {string} queueName
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentQueue[]
-	     */
-	    getQueues(queueName: string, onResult: (err: any, statusCode: number, queues: TaskAgentInterfaces.TaskAgentQueue[]) => void): void;
-	    /**
-	     * @param {number} poolId
-	     * @param onResult callback function with the resulting VSSInterfaces.IdentityRef[]
-	     */
-	    getAgentPoolRoles(poolId: number, onResult: (err: any, statusCode: number, roles: VSSInterfaces.IdentityRef[]) => void): void;
-	    /**
-	     * @param {TaskAgentInterfaces.ServiceEndpoint} endpoint
-	     * @param {string} scopeIdentifier - The project GUID to scope the request
-	     * @param {string} endpointId
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.ServiceEndpoint
-	     */
-	    createServiceEndpoint(endpoint: TaskAgentInterfaces.ServiceEndpoint, scopeIdentifier: string, endpointId: string, onResult: (err: any, statusCode: number, serviceendpoint: TaskAgentInterfaces.ServiceEndpoint) => void): void;
-	    /**
-	     * @param {string} scopeIdentifier - The project GUID to scope the request
-	     * @param {string} endpointId
-	     * @param onResult callback function
-	     */
-	    deleteServiceEndpoint(scopeIdentifier: string, endpointId: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {string} scopeIdentifier - The project GUID to scope the request
-	     * @param {string} endpointId
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.ServiceEndpoint
-	     */
-	    getServiceEndpointDetails(scopeIdentifier: string, endpointId: string, onResult: (err: any, statusCode: number, serviceendpoint: TaskAgentInterfaces.ServiceEndpoint) => void): void;
-	    /**
-	     * @param {string} scopeIdentifier - The project GUID to scope the request
-	     * @param {string} type
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.ServiceEndpoint[]
-	     */
-	    getServiceEndpoints(scopeIdentifier: string, type: string, onResult: (err: any, statusCode: number, serviceendpoints: TaskAgentInterfaces.ServiceEndpoint[]) => void): void;
-	    /**
-	     * @param {TaskAgentInterfaces.TaskAgentSession} session
-	     * @param {number} poolId
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgentSession
-	     */
-	    createSession(session: TaskAgentInterfaces.TaskAgentSession, poolId: number, onResult: (err: any, statusCode: number, session: TaskAgentInterfaces.TaskAgentSession) => void): void;
-	    /**
-	     * @param {number} poolId
-	     * @param {string} sessionId
-	     * @param onResult callback function
-	     */
-	    deleteSession(poolId: number, sessionId: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {string} taskId
-	     * @param onResult callback function
-	     */
-	    deleteTaskDefinition(taskId: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {string} taskId
-	     * @param {string} versionString
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskDefinition[]
-	     */
-	    getTaskContent(taskId: string, versionString: string, onResult: (err: any, statusCode: number, tasks: TaskAgentInterfaces.TaskDefinition[]) => void): void;
-	    /**
-	     * @param {string} taskId
-	     * @param {string} versionString
-	     * @param onResult callback function with the resulting ArrayBuffer
-	     */
-	    getTaskContentZip(taskId: string, versionString: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    /**
-	     * @param {string[]} visibility
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskDefinition[]
-	     */
-	    getTaskDefinitions(visibility: string[], onResult: (err: any, statusCode: number, tasks: TaskAgentInterfaces.TaskDefinition[]) => void): void;
-	    /**
-	     * @param {NodeJS.ReadableStream} contentStream
-	     * @param {string} taskId
-	     * @param {boolean} overwrite
-	     * @param onResult callback function
-	     */
-	    uploadTaskDefinition(customHeaders: any, contentStream: NodeJS.ReadableStream, taskId: string, overwrite: boolean, onResult: (err: any, statusCode: number, obj: any) => void): void;
-	    /**
-	     * @param {{ [key: string] : string; }} userCapabilities
-	     * @param {number} poolId
-	     * @param {number} agentId
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAgent
-	     */
-	    updateUserCapabilities(userCapabilities: {
-	        [key: string]: string;
-	    }, poolId: number, agentId: number, onResult: (err: any, statusCode: number, usercapabilitie: TaskAgentInterfaces.TaskAgent) => void): void;
-	}
-	export class QTaskAgentApi extends basem.QClientApiBase implements IQTaskAgentApi {
-	    api: TaskAgentApi;
-	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
-	    /**
-	    * @param {TaskAgentInterfaces.TaskAgent} agent
-	    * @param {number} poolId
-	    */
-	    createAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number): Q.Promise<TaskAgentInterfaces.TaskAgent>;
-	    /**
-	    * @param {number} poolId
-	    * @param {number} agentId
-	    * @param {boolean} includeCapabilities
-	    * @param {string} propertyFilters
-	    */
-	    getAgent(poolId: number, agentId: number, includeCapabilities?: boolean, propertyFilters?: string): Q.Promise<TaskAgentInterfaces.TaskAgent>;
-	    /**
-	    * @param {number} poolId
-	    * @param {string} agentName
-	    * @param {boolean} includeCapabilities
-	    * @param {string} propertyFilters
-	    * @param {string} demands
-	    */
-	    getAgents(poolId: number, agentName?: string, includeCapabilities?: boolean, propertyFilters?: string, demands?: string): Q.Promise<TaskAgentInterfaces.TaskAgent[]>;
-	    /**
-	    * @param {TaskAgentInterfaces.TaskAgent} agent
-	    * @param {number} poolId
-	    * @param {number} agentId
-	    */
-	    replaceAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number, agentId: number): Q.Promise<TaskAgentInterfaces.TaskAgent>;
-	    /**
-	    * @param {TaskAgentInterfaces.TaskAgent} agent
-	    * @param {number} poolId
-	    * @param {number} agentId
-	    */
-	    updateAgent(agent: TaskAgentInterfaces.TaskAgent, poolId: number, agentId: number): Q.Promise<TaskAgentInterfaces.TaskAgent>;
-	    /**
-	    * Proxy for a GET request defined by an 'endpoint'. The request is authorized using a service connection. The response is filtered using an XPath/Json based selector.
-	    *
-	    * @param {TaskAgentInterfaces.TaskDefinitionEndpoint} endpoint - Describes the URL to fetch.
-	    */
-	    queryEndpoint(endpoint: TaskAgentInterfaces.TaskDefinitionEndpoint): Q.Promise<string[]>;
-	    /**
-	    * @param {number} poolId
-	    * @param {number} requestId
-	    */
-	    getRequest(poolId: number, requestId: number): Q.Promise<TaskAgentInterfaces.TaskAgentJobRequest>;
-	    /**
-	    * @param {TaskAgentInterfaces.TaskAgentJobRequest} request
-	    * @param {number} poolId
-	    */
-	    queueRequest(request: TaskAgentInterfaces.TaskAgentJobRequest, poolId: number): Q.Promise<TaskAgentInterfaces.TaskAgentJobRequest>;
-	    /**
-	    * @param {TaskAgentInterfaces.TaskAgentJobRequest} request
-	    * @param {number} poolId
-	    * @param {number} requestId
-	    * @param {string} lockToken
-	    */
-	    updateRequest(request: TaskAgentInterfaces.TaskAgentJobRequest, poolId: number, requestId: number, lockToken: string): Q.Promise<TaskAgentInterfaces.TaskAgentJobRequest>;
-	    /**
-	    * @param {number} poolId
-	    * @param {string} sessionId
-	    * @param {number} lastMessageId
-	    */
-	    getMessage(poolId: number, sessionId: string, lastMessageId?: number): Q.Promise<TaskAgentInterfaces.TaskAgentMessage>;
-	    /**
-	    * @param {TaskAgentInterfaces.TaskAgentPool} pool
-	    */
-	    createPool(pool: TaskAgentInterfaces.TaskAgentPool): Q.Promise<TaskAgentInterfaces.TaskAgentPool>;
-	    /**
-	    * @param {number} poolId
-	    * @param {string} properties
-	    */
-	    getPool(poolId: number, properties?: string): Q.Promise<TaskAgentInterfaces.TaskAgentPool>;
-	    /**
-	    * @param {string} poolName
-	    * @param {string} properties
-	    */
-	    getPools(poolName?: string, properties?: string): Q.Promise<TaskAgentInterfaces.TaskAgentPool[]>;
-	    /**
-	    * @param {TaskAgentInterfaces.TaskAgentPool} pool
-	    * @param {number} poolId
-	    */
-	    updatePool(pool: TaskAgentInterfaces.TaskAgentPool, poolId: number): Q.Promise<TaskAgentInterfaces.TaskAgentPool>;
-	    /**
-	    * @param {TaskAgentInterfaces.TaskAgentQueue} queue
-	    */
-	    createQueue(queue: TaskAgentInterfaces.TaskAgentQueue): Q.Promise<TaskAgentInterfaces.TaskAgentQueue>;
-	    /**
-	    * @param {number} queueId
-	    */
-	    getQueue(queueId: number): Q.Promise<TaskAgentInterfaces.TaskAgentQueue>;
-	    /**
-	    * @param {string} queueName
-	    */
-	    getQueues(queueName?: string): Q.Promise<TaskAgentInterfaces.TaskAgentQueue[]>;
-	    /**
-	    * @param {number} poolId
-	    */
-	    getAgentPoolRoles(poolId?: number): Q.Promise<VSSInterfaces.IdentityRef[]>;
-	    /**
-	    * @param {TaskAgentInterfaces.ServiceEndpoint} endpoint
-	    * @param {string} scopeIdentifier - The project GUID to scope the request
-	    * @param {string} endpointId
-	    */
-	    createServiceEndpoint(endpoint: TaskAgentInterfaces.ServiceEndpoint, scopeIdentifier: string, endpointId: string): Q.Promise<TaskAgentInterfaces.ServiceEndpoint>;
-	    /**
-	    * @param {string} scopeIdentifier - The project GUID to scope the request
-	    * @param {string} endpointId
-	    */
-	    getServiceEndpointDetails(scopeIdentifier: string, endpointId: string): Q.Promise<TaskAgentInterfaces.ServiceEndpoint>;
-	    /**
-	    * @param {string} scopeIdentifier - The project GUID to scope the request
-	    * @param {string} type
-	    */
-	    getServiceEndpoints(scopeIdentifier: string, type?: string): Q.Promise<TaskAgentInterfaces.ServiceEndpoint[]>;
-	    /**
-	    * @param {TaskAgentInterfaces.TaskAgentSession} session
-	    * @param {number} poolId
-	    */
-	    createSession(session: TaskAgentInterfaces.TaskAgentSession, poolId: number): Q.Promise<TaskAgentInterfaces.TaskAgentSession>;
-	    /**
-	    * @param {string} taskId
-	    * @param {string} versionString
-	    */
-	    getTaskContent(taskId: string, versionString?: string): Q.Promise<TaskAgentInterfaces.TaskDefinition[]>;
-	    /**
-	    * @param {string[]} visibility
-	    */
-	    getTaskDefinitions(visibility: string[]): Q.Promise<TaskAgentInterfaces.TaskDefinition[]>;
-	    /**
-	    * @param {{ [key: string] : string; }} userCapabilities
-	    * @param {number} poolId
-	    * @param {number} agentId
-	    */
-	    updateUserCapabilities(userCapabilities: {
-	        [key: string]: string;
-	    }, poolId: number, agentId: number): Q.Promise<TaskAgentInterfaces.TaskAgent>;
-	}
-
-}
-declare module 'vso-node-api/TaskApi' {
-	/// <reference path="../node/node.d.ts" />
-	/// <reference path="../q/Q.d.ts" />
-	import Q = require('q');
-	import basem = require('vso-node-api/ClientApiBases');
-	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
-	import TaskAgentInterfaces = require('vso-node-api/interfaces/TaskAgentInterfaces');
-	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
-	export interface ITaskApi extends basem.ClientApiBase {
-	    getPlanAttachments(scopeIdentifier: string, hubName: string, planId: string, type: string, onResult: (err: any, statusCode: number, attachments: TaskAgentInterfaces.TaskAttachment[]) => void): void;
-	    createAttachment(customHeaders: any, contentStream: NodeJS.ReadableStream, scopeIdentifier: string, hubName: string, planId: string, timelineId: string, recordId: string, type: string, name: string, onResult: (err: any, statusCode: number, attachment: TaskAgentInterfaces.TaskAttachment) => void): void;
-	    getAttachments(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, recordId: string, type: string, onResult: (err: any, statusCode: number, attachments: TaskAgentInterfaces.TaskAttachment[]) => void): void;
-	    postEvent(eventData: TaskAgentInterfaces.JobEvent, scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number) => void): void;
-	    postLines(lines: VSSInterfaces.VssJsonCollectionWrapperV<string[]>, scopeIdentifier: string, hubName: string, planId: string, timelineId: string, recordId: string, onResult: (err: any, statusCode: number) => void): void;
-	    appendLog(customHeaders: any, contentStream: NodeJS.ReadableStream, scopeIdentifier: string, hubName: string, planId: string, logId: number, onResult: (err: any, statusCode: number, log: TaskAgentInterfaces.TaskLog) => void): void;
-	    createLog(log: TaskAgentInterfaces.TaskLog, scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number, log: TaskAgentInterfaces.TaskLog) => void): void;
-	    getLog(scopeIdentifier: string, hubName: string, planId: string, logId: number, startLine: number, endLine: number, onResult: (err: any, statusCode: number, logs: string[]) => void): void;
-	    getLogs(scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number, logs: TaskAgentInterfaces.TaskLog[]) => void): void;
-	    getPlan(scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number, plan: TaskAgentInterfaces.TaskOrchestrationPlan) => void): void;
-	    getRecords(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, changeId: number, onResult: (err: any, statusCode: number, records: TaskAgentInterfaces.TimelineRecord[]) => void): void;
-	    updateRecords(records: VSSInterfaces.VssJsonCollectionWrapperV<TaskAgentInterfaces.TimelineRecord[]>, scopeIdentifier: string, hubName: string, planId: string, timelineId: string, onResult: (err: any, statusCode: number, record: TaskAgentInterfaces.TimelineRecord[]) => void): void;
-	    createTimeline(timeline: TaskAgentInterfaces.Timeline, scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number, timeline: TaskAgentInterfaces.Timeline) => void): void;
-	    deleteTimeline(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, onResult: (err: any, statusCode: number) => void): void;
-	    getTimeline(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, changeId: number, includeRecords: boolean, onResult: (err: any, statusCode: number, timeline: TaskAgentInterfaces.Timeline) => void): void;
-	    getTimelines(scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number, timelines: TaskAgentInterfaces.Timeline[]) => void): void;
-	}
-	export interface IQTaskApi extends basem.QClientApiBase {
-	    getPlanAttachments(scopeIdentifier: string, hubName: string, planId: string, type: string): Q.Promise<TaskAgentInterfaces.TaskAttachment[]>;
-	    createAttachment(customHeaders: any, contentStream: NodeJS.ReadableStream, scopeIdentifier: string, hubName: string, planId: string, timelineId: string, recordId: string, type: string, name: string): Q.Promise<TaskAgentInterfaces.TaskAttachment>;
-	    getAttachments(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, recordId: string, type: string): Q.Promise<TaskAgentInterfaces.TaskAttachment[]>;
-	    appendLog(customHeaders: any, contentStream: NodeJS.ReadableStream, scopeIdentifier: string, hubName: string, planId: string, logId: number): Q.Promise<TaskAgentInterfaces.TaskLog>;
-	    createLog(log: TaskAgentInterfaces.TaskLog, scopeIdentifier: string, hubName: string, planId: string): Q.Promise<TaskAgentInterfaces.TaskLog>;
-	    getLog(scopeIdentifier: string, hubName: string, planId: string, logId: number, startLine?: number, endLine?: number): Q.Promise<string[]>;
-	    getLogs(scopeIdentifier: string, hubName: string, planId: string): Q.Promise<TaskAgentInterfaces.TaskLog[]>;
-	    getPlan(scopeIdentifier: string, hubName: string, planId: string): Q.Promise<TaskAgentInterfaces.TaskOrchestrationPlan>;
-	    getRecords(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, changeId?: number): Q.Promise<TaskAgentInterfaces.TimelineRecord[]>;
-	    updateRecords(records: VSSInterfaces.VssJsonCollectionWrapperV<TaskAgentInterfaces.TimelineRecord[]>, scopeIdentifier: string, hubName: string, planId: string, timelineId: string): Q.Promise<TaskAgentInterfaces.TimelineRecord[]>;
-	    createTimeline(timeline: TaskAgentInterfaces.Timeline, scopeIdentifier: string, hubName: string, planId: string): Q.Promise<TaskAgentInterfaces.Timeline>;
-	    getTimeline(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, changeId?: number, includeRecords?: boolean): Q.Promise<TaskAgentInterfaces.Timeline>;
-	    getTimelines(scopeIdentifier: string, hubName: string, planId: string): Q.Promise<TaskAgentInterfaces.Timeline[]>;
-	}
-	export class TaskApi extends basem.ClientApiBase implements ITaskApi {
-	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
-	    /**
-	     * @param {string} scopeIdentifier - The project GUID to scope the request
-	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	     * @param {string} planId
-	     * @param {string} type
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAttachment[]
-	     */
-	    getPlanAttachments(scopeIdentifier: string, hubName: string, planId: string, type: string, onResult: (err: any, statusCode: number, attachments: TaskAgentInterfaces.TaskAttachment[]) => void): void;
-	    /**
-	     * @param {NodeJS.ReadableStream} contentStream
-	     * @param {string} scopeIdentifier - The project GUID to scope the request
-	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	     * @param {string} planId
-	     * @param {string} timelineId
-	     * @param {string} recordId
-	     * @param {string} type
-	     * @param {string} name
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAttachment
-	     */
-	    createAttachment(customHeaders: any, contentStream: NodeJS.ReadableStream, scopeIdentifier: string, hubName: string, planId: string, timelineId: string, recordId: string, type: string, name: string, onResult: (err: any, statusCode: number, attachment: TaskAgentInterfaces.TaskAttachment) => void): void;
-	    /**
-	     * @param {string} scopeIdentifier - The project GUID to scope the request
-	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	     * @param {string} planId
-	     * @param {string} timelineId
-	     * @param {string} recordId
-	     * @param {string} type
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskAttachment[]
-	     */
-	    getAttachments(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, recordId: string, type: string, onResult: (err: any, statusCode: number, attachments: TaskAgentInterfaces.TaskAttachment[]) => void): void;
-	    /**
-	     * @param {TaskAgentInterfaces.JobEvent} eventData
-	     * @param {string} scopeIdentifier - The project GUID to scope the request
-	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	     * @param {string} planId
-	     * @param onResult callback function
-	     */
-	    postEvent(eventData: TaskAgentInterfaces.JobEvent, scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {VSSInterfaces.VssJsonCollectionWrapperV<string[]>} lines
-	     * @param {string} scopeIdentifier - The project GUID to scope the request
-	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	     * @param {string} planId
-	     * @param {string} timelineId
-	     * @param {string} recordId
-	     * @param onResult callback function
-	     */
-	    postLines(lines: VSSInterfaces.VssJsonCollectionWrapperV<string[]>, scopeIdentifier: string, hubName: string, planId: string, timelineId: string, recordId: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {NodeJS.ReadableStream} contentStream
-	     * @param {string} scopeIdentifier - The project GUID to scope the request
-	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	     * @param {string} planId
-	     * @param {number} logId
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskLog
-	     */
-	    appendLog(customHeaders: any, contentStream: NodeJS.ReadableStream, scopeIdentifier: string, hubName: string, planId: string, logId: number, onResult: (err: any, statusCode: number, log: TaskAgentInterfaces.TaskLog) => void): void;
-	    /**
-	     * @param {TaskAgentInterfaces.TaskLog} log
-	     * @param {string} scopeIdentifier - The project GUID to scope the request
-	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	     * @param {string} planId
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskLog
-	     */
-	    createLog(log: TaskAgentInterfaces.TaskLog, scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number, log: TaskAgentInterfaces.TaskLog) => void): void;
-	    /**
-	     * @param {string} scopeIdentifier - The project GUID to scope the request
-	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	     * @param {string} planId
-	     * @param {number} logId
-	     * @param {number} startLine
-	     * @param {number} endLine
-	     * @param onResult callback function with the resulting string[]
-	     */
-	    getLog(scopeIdentifier: string, hubName: string, planId: string, logId: number, startLine: number, endLine: number, onResult: (err: any, statusCode: number, logs: string[]) => void): void;
-	    /**
-	     * @param {string} scopeIdentifier - The project GUID to scope the request
-	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	     * @param {string} planId
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskLog[]
-	     */
-	    getLogs(scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number, logs: TaskAgentInterfaces.TaskLog[]) => void): void;
-	    /**
-	     * @param {string} scopeIdentifier - The project GUID to scope the request
-	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	     * @param {string} planId
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TaskOrchestrationPlan
-	     */
-	    getPlan(scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number, plan: TaskAgentInterfaces.TaskOrchestrationPlan) => void): void;
-	    /**
-	     * @param {string} scopeIdentifier - The project GUID to scope the request
-	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	     * @param {string} planId
-	     * @param {string} timelineId
-	     * @param {number} changeId
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TimelineRecord[]
-	     */
-	    getRecords(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, changeId: number, onResult: (err: any, statusCode: number, records: TaskAgentInterfaces.TimelineRecord[]) => void): void;
-	    /**
-	     * @param {VSSInterfaces.VssJsonCollectionWrapperV<TaskAgentInterfaces.TimelineRecord[]>} records
-	     * @param {string} scopeIdentifier - The project GUID to scope the request
-	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	     * @param {string} planId
-	     * @param {string} timelineId
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.TimelineRecord[]
-	     */
-	    updateRecords(records: VSSInterfaces.VssJsonCollectionWrapperV<TaskAgentInterfaces.TimelineRecord[]>, scopeIdentifier: string, hubName: string, planId: string, timelineId: string, onResult: (err: any, statusCode: number, record: TaskAgentInterfaces.TimelineRecord[]) => void): void;
-	    /**
-	     * @param {TaskAgentInterfaces.Timeline} timeline
-	     * @param {string} scopeIdentifier - The project GUID to scope the request
-	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	     * @param {string} planId
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.Timeline
-	     */
-	    createTimeline(timeline: TaskAgentInterfaces.Timeline, scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number, timeline: TaskAgentInterfaces.Timeline) => void): void;
-	    /**
-	     * @param {string} scopeIdentifier - The project GUID to scope the request
-	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	     * @param {string} planId
-	     * @param {string} timelineId
-	     * @param onResult callback function
-	     */
-	    deleteTimeline(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {string} scopeIdentifier - The project GUID to scope the request
-	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	     * @param {string} planId
-	     * @param {string} timelineId
-	     * @param {number} changeId
-	     * @param {boolean} includeRecords
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.Timeline
-	     */
-	    getTimeline(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, changeId: number, includeRecords: boolean, onResult: (err: any, statusCode: number, timeline: TaskAgentInterfaces.Timeline) => void): void;
-	    /**
-	     * @param {string} scopeIdentifier - The project GUID to scope the request
-	     * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	     * @param {string} planId
-	     * @param onResult callback function with the resulting TaskAgentInterfaces.Timeline[]
-	     */
-	    getTimelines(scopeIdentifier: string, hubName: string, planId: string, onResult: (err: any, statusCode: number, timelines: TaskAgentInterfaces.Timeline[]) => void): void;
-	}
-	export class QTaskApi extends basem.QClientApiBase implements IQTaskApi {
-	    api: TaskApi;
-	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
-	    /**
-	    * @param {string} scopeIdentifier - The project GUID to scope the request
-	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	    * @param {string} planId
-	    * @param {string} type
-	    */
-	    getPlanAttachments(scopeIdentifier: string, hubName: string, planId: string, type: string): Q.Promise<TaskAgentInterfaces.TaskAttachment[]>;
-	    /**
-	    * @param {NodeJS.ReadableStream} contentStream
-	    * @param {string} scopeIdentifier - The project GUID to scope the request
-	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	    * @param {string} planId
-	    * @param {string} timelineId
-	    * @param {string} recordId
-	    * @param {string} type
-	    * @param {string} name
-	    */
-	    createAttachment(customHeaders: any, contentStream: NodeJS.ReadableStream, scopeIdentifier: string, hubName: string, planId: string, timelineId: string, recordId: string, type: string, name: string): Q.Promise<TaskAgentInterfaces.TaskAttachment>;
-	    /**
-	    * @param {string} scopeIdentifier - The project GUID to scope the request
-	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	    * @param {string} planId
-	    * @param {string} timelineId
-	    * @param {string} recordId
-	    * @param {string} type
-	    */
-	    getAttachments(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, recordId: string, type: string): Q.Promise<TaskAgentInterfaces.TaskAttachment[]>;
-	    /**
-	    * @param {NodeJS.ReadableStream} contentStream
-	    * @param {string} scopeIdentifier - The project GUID to scope the request
-	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	    * @param {string} planId
-	    * @param {number} logId
-	    */
-	    appendLog(customHeaders: any, contentStream: NodeJS.ReadableStream, scopeIdentifier: string, hubName: string, planId: string, logId: number): Q.Promise<TaskAgentInterfaces.TaskLog>;
-	    /**
-	    * @param {TaskAgentInterfaces.TaskLog} log
-	    * @param {string} scopeIdentifier - The project GUID to scope the request
-	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	    * @param {string} planId
-	    */
-	    createLog(log: TaskAgentInterfaces.TaskLog, scopeIdentifier: string, hubName: string, planId: string): Q.Promise<TaskAgentInterfaces.TaskLog>;
-	    /**
-	    * @param {string} scopeIdentifier - The project GUID to scope the request
-	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	    * @param {string} planId
-	    * @param {number} logId
-	    * @param {number} startLine
-	    * @param {number} endLine
-	    */
-	    getLog(scopeIdentifier: string, hubName: string, planId: string, logId: number, startLine?: number, endLine?: number): Q.Promise<string[]>;
-	    /**
-	    * @param {string} scopeIdentifier - The project GUID to scope the request
-	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	    * @param {string} planId
-	    */
-	    getLogs(scopeIdentifier: string, hubName: string, planId: string): Q.Promise<TaskAgentInterfaces.TaskLog[]>;
-	    /**
-	    * @param {string} scopeIdentifier - The project GUID to scope the request
-	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	    * @param {string} planId
-	    */
-	    getPlan(scopeIdentifier: string, hubName: string, planId: string): Q.Promise<TaskAgentInterfaces.TaskOrchestrationPlan>;
-	    /**
-	    * @param {string} scopeIdentifier - The project GUID to scope the request
-	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	    * @param {string} planId
-	    * @param {string} timelineId
-	    * @param {number} changeId
-	    */
-	    getRecords(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, changeId?: number): Q.Promise<TaskAgentInterfaces.TimelineRecord[]>;
-	    /**
-	    * @param {VSSInterfaces.VssJsonCollectionWrapperV<TaskAgentInterfaces.TimelineRecord[]>} records
-	    * @param {string} scopeIdentifier - The project GUID to scope the request
-	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	    * @param {string} planId
-	    * @param {string} timelineId
-	    */
-	    updateRecords(records: VSSInterfaces.VssJsonCollectionWrapperV<TaskAgentInterfaces.TimelineRecord[]>, scopeIdentifier: string, hubName: string, planId: string, timelineId: string): Q.Promise<TaskAgentInterfaces.TimelineRecord[]>;
-	    /**
-	    * @param {TaskAgentInterfaces.Timeline} timeline
-	    * @param {string} scopeIdentifier - The project GUID to scope the request
-	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	    * @param {string} planId
-	    */
-	    createTimeline(timeline: TaskAgentInterfaces.Timeline, scopeIdentifier: string, hubName: string, planId: string): Q.Promise<TaskAgentInterfaces.Timeline>;
-	    /**
-	    * @param {string} scopeIdentifier - The project GUID to scope the request
-	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	    * @param {string} planId
-	    * @param {string} timelineId
-	    * @param {number} changeId
-	    * @param {boolean} includeRecords
-	    */
-	    getTimeline(scopeIdentifier: string, hubName: string, planId: string, timelineId: string, changeId?: number, includeRecords?: boolean): Q.Promise<TaskAgentInterfaces.Timeline>;
-	    /**
-	    * @param {string} scopeIdentifier - The project GUID to scope the request
-	    * @param {string} hubName - The name of the server hub: "build" for the Build server or "rm" for the Release Management server
-	    * @param {string} planId
-	    */
-	    getTimelines(scopeIdentifier: string, hubName: string, planId: string): Q.Promise<TaskAgentInterfaces.Timeline[]>;
-	}
-
-}
-declare module 'vso-node-api/interfaces/common/SystemDataInterfaces' {
-	/**
-	 * Specifies SQL Server-specific data type of a field, property, for use in a System.Data.SqlClient.SqlParameter.
-	 */
-	export enum SqlDbType {
-	    /**
-	     * A 64-bit signed integer.
-	     */
-	    BigInt = 0,
-	    /**
-	     * Array of type Byte. A fixed-length stream of binary data ranging between 1 and 8,000 bytes.
-	     */
-	    Binary = 1,
-	    /**
-	     * Boolean. An unsigned numeric value that can be 0, 1, or null.
-	     */
-	    Bit = 2,
-	    /**
-	     * String. A fixed-length stream of non-Unicode characters ranging between 1 and 8,000 characters.
-	     */
-	    Char = 3,
-	    /**
-	     * DateTime. Date and time data ranging in value from January 1, 1753 to December 31, 9999 to an accuracy of 3.33 milliseconds.
-	     */
-	    DateTime = 4,
-	    /**
-	     * Decimal. A fixed precision and scale numeric value between -10 38 -1 and 10 38 -1.
-	     */
-	    Decimal = 5,
-	    /**
-	     * Double. A floating point number within the range of -1.79E +308 through 1.79E +308.
-	     */
-	    Float = 6,
-	    /**
-	     * Array of type Byte. A variable-length stream of binary data ranging from 0 to 2 31 -1 (or 2,147,483,647) bytes.
-	     */
-	    Image = 7,
-	    /**
-	     * Int32. A 32-bit signed integer.
-	     */
-	    Int = 8,
-	    /**
-	     * Decimal. A currency value ranging from -2 63 (or -9,223,372,036,854,775,808) to 2 63 -1 (or +9,223,372,036,854,775,807) with an accuracy to a ten-thousandth of a currency unit.
-	     */
-	    Money = 9,
-	    /**
-	     * String. A fixed-length stream of Unicode characters ranging between 1 and 4,000 characters.
-	     */
-	    NChar = 10,
-	    /**
-	     * String. A variable-length stream of Unicode data with a maximum length of 2 30 - 1 (or 1,073,741,823) characters.
-	     */
-	    NText = 11,
-	    /**
-	     * String. A variable-length stream of Unicode characters ranging between 1 and 4,000 characters. Implicit conversion fails if the string is greater than 4,000 characters. Explicitly set the object when working with strings longer than 4,000 characters. Use System.Data.SqlDbType.NVarChar when the database column is nvarchar(max).
-	     */
-	    NVarChar = 12,
-	    /**
-	     * Single. A floating point number within the range of -3.40E +38 through 3.40E +38.
-	     */
-	    Real = 13,
-	    /**
-	     * Guid. A globally unique identifier (or GUID).
-	     */
-	    UniqueIdentifier = 14,
-	    /**
-	     * DateTime. Date and time data ranging in value from January 1, 1900 to June 6, 2079 to an accuracy of one minute.
-	     */
-	    SmallDateTime = 15,
-	    /**
-	     * Int16. A 16-bit signed integer.
-	     */
-	    SmallInt = 16,
-	    /**
-	     * Decimal. A currency value ranging from -214,748.3648 to +214,748.3647 with an accuracy to a ten-thousandth of a currency unit.
-	     */
-	    SmallMoney = 17,
-	    /**
-	     * String. A variable-length stream of non-Unicode data with a maximum length of 2 31 -1 (or 2,147,483,647) characters.
-	     */
-	    Text = 18,
-	    /**
-	     * Array of type System.Byte. Automatically generated binary numbers, which are guaranteed to be unique within a database. timestamp is used typically as a mechanism for version-stamping table rows. The storage size is 8 bytes.
-	     */
-	    Timestamp = 19,
-	    /**
-	     * Byte. An 8-bit unsigned integer.
-	     */
-	    TinyInt = 20,
-	    /**
-	     * Array of type Byte. A variable-length stream of binary data ranging between 1 and 8,000 bytes. Implicit conversion fails if the byte array is greater than 8,000 bytes. Explicitly set the object when working with byte arrays larger than 8,000 bytes.
-	     */
-	    VarBinary = 21,
-	    /**
-	     * String. A variable-length stream of non-Unicode characters ranging between 1 and 8,000 characters. Use System.Data.SqlDbType.VarChar when the database column is varchar(max).
-	     */
-	    VarChar = 22,
-	    /**
-	     * Object. A special data type that can contain numeric, string, binary, or date data as well as the SQL Server values Empty and Null, which is assumed if no other type is declared.
-	     */
-	    Variant = 23,
-	    /**
-	     * An XML value. Obtain the XML as a string using the System.Data.SqlClient.SqlDataReader.GetValue(System.Int32) method or System.Data.SqlTypes.SqlXml.Value property, or as an System.Xml.XmlReader by calling the System.Data.SqlTypes.SqlXml.CreateReader method.
-	     */
-	    Xml = 25,
-	    /**
-	     * A SQL Server user-defined type (UDT).
-	     */
-	    Udt = 29,
-	    /**
-	     * A special data type for specifying structured data contained in table-valued parameters.
-	     */
-	    Structured = 30,
-	    /**
-	     * Date data ranging in value from January 1,1 AD through December 31, 9999 AD.
-	     */
-	    Date = 31,
-	    /**
-	     * Time data based on a 24-hour clock. Time value range is 00:00:00 through 23:59:59.9999999 with an accuracy of 100 nanoseconds. Corresponds to a SQL Server time value.
-	     */
-	    Time = 32,
-	    /**
-	     * Date and time data. Date value range is from January 1,1 AD through December 31, 9999 AD. Time value range is 00:00:00 through 23:59:59.9999999 with an accuracy of 100 nanoseconds.
-	     */
-	    DateTime2 = 33,
-	    /**
-	     * Date and time data with time zone awareness. Date value range is from January 1,1 AD through December 31, 9999 AD. Time value range is 00:00:00 through 23:59:59.9999999 with an accuracy of 100 nanoseconds. Time zone value range is -14:00 through +14:00.
-	     */
-	    DateTimeOffset = 34,
-	}
-	export var TypeInfo: {
-	    SqlDbType: {
-	        enumValues: {
-	            "BigInt": number;
-	            "Binary": number;
-	            "Bit": number;
-	            "Char": number;
-	            "DateTime": number;
-	            "Decimal": number;
-	            "Float": number;
-	            "Image": number;
-	            "Int": number;
-	            "Money": number;
-	            "NChar": number;
-	            "NText": number;
-	            "NVarChar": number;
-	            "Real": number;
-	            "UniqueIdentifier": number;
-	            "SmallDateTime": number;
-	            "SmallInt": number;
-	            "SmallMoney": number;
-	            "Text": number;
-	            "Timestamp": number;
-	            "TinyInt": number;
-	            "VarBinary": number;
-	            "VarChar": number;
-	            "Variant": number;
-	            "Xml": number;
-	            "Udt": number;
-	            "Structured": number;
-	            "Date": number;
-	            "Time": number;
-	            "DateTime2": number;
-	            "DateTimeOffset": number;
-	        };
-	    };
-	};
-
-}
-declare module 'vso-node-api/interfaces/TestInterfaces' {
-	import SystemData = require('vso-node-api/interfaces/common/SystemDataInterfaces');
-	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
-	export interface AdditionalTestField {
-	    fieldName: string;
-	    value: any;
-	}
-	export interface AddtionalTestFieldDefinition {
-	    fieldName: string;
-	    scope: TestExtensionFieldScope;
-	    value: SystemData.SqlDbType;
-	}
-	export interface AggregatedResultsByPivot {
-	    count: number;
-	    duration: any;
-	    pivot: string;
-	}
-	export interface AggregatedTestResults {
-	    duration: any;
-	    resultsByPivot: AggregatedResultsByPivot[];
-	    self: ShallowReference;
-	    totalTests: number;
-	}
-	export enum AttachmentType {
-	    GeneralAttachment = 0,
-	    AfnStrip = 1,
-	    BugFilingData = 2,
-	    CodeCoverage = 3,
-	    IntermediateCollectorData = 4,
-	    RunConfig = 5,
-	    TestImpactDetails = 6,
-	    TmiTestRunDeploymentFiles = 7,
-	    TmiTestRunReverseDeploymentFiles = 8,
-	    TmiTestResultDetail = 9,
-	    TmiTestRunSummary = 10,
-	}
-	export interface BatchResponse {
-	    error: string;
-	    responses: Response[];
-	    status: string;
-	}
-	export interface BuildConfiguration {
-	    flavor: string;
-	    id: number;
-	    platform: string;
-	    project: ShallowReference;
-	    uri: string;
-	}
-	export interface BuildCoverage {
-	    codeCoverageFileUrl: string;
-	    configuration: BuildConfiguration;
-	    lastError: string;
-	    modules: ModuleCoverage[];
-	    state: string;
-	}
-	/**
-	 * Represents the build configuration (platform, flavor) and coverage data for the build
-	 */
-	export interface CodeCoverageData {
-	    /**
-	     * Flavor of build for which data is retrieved/published
-	     */
-	    buildFlavor: string;
-	    /**
-	     * Platform of build for which data is retrieved/published
-	     */
-	    buildPlatform: string;
-	    /**
-	     * List of coverage data for the build
-	     */
-	    coverageStats: CodeCoverageStatistics[];
-	}
-	/**
-	 * Represents the code coverage statistics for a particular coverage label (modules, statements, blocks, etc.)
-	 */
-	export interface CodeCoverageStatistics {
-	    /**
-	     * Covered units
-	     */
-	    covered: number;
-	    /**
-	     * Delta of coverage
-	     */
-	    delta: number;
-	    /**
-	     * Position of label
-	     */
-	    index: number;
-	    /**
-	     * Is delta valid
-	     */
-	    isDeltaAvailable: boolean;
-	    /**
-	     * Label of coverage data ("Blocks", "Statements", "Modules", etc.)
-	     */
-	    label: string;
-	    /**
-	     * Total units
-	     */
-	    total: number;
-	}
-	/**
-	 * Represents the code coverage summary results Used to publish or retrieve code coverage summary against a build
-	 */
-	export interface CodeCoverageSummary {
-	    /**
-	     * Uri of build for which data is retrieved/published
-	     */
-	    buildUri: string;
-	    /**
-	     * List of coverage data and details for the build
-	     */
-	    coverageData: CodeCoverageData[];
-	    /**
-	     * Uri of build against which difference in coverage is computed
-	     */
-	    deltaBuildUri: string;
-	}
-	export enum CoverageQueryFlags {
-	    /**
-	     * If set, the Coverage.Modules property will be populated.
-	     */
-	    Modules = 1,
-	    /**
-	     * If set, the ModuleCoverage.Functions properties will be populated.
-	     */
-	    Functions = 2,
-	    /**
-	     * If set, the ModuleCoverage.CoverageData field will be populated.
-	     */
-	    BlockData = 4,
-	}
-	export interface CoverageStatistics {
-	    blocksCovered: number;
-	    blocksNotCovered: number;
-	    linesCovered: number;
-	    linesNotCovered: number;
-	    linesPartiallyCovered: number;
-	}
-	/**
-	 * This is a temporary class to provide the details for the test run environment.
-	 */
-	export interface DtlEnvironmentDetails {
-	    csmContent: string;
-	    csmParameters: string;
-	    subscriptionName: string;
-	}
-	export interface FunctionCoverage {
-	    class: string;
-	    name: string;
-	    namespace: string;
-	    sourceFile: string;
-	    statistics: CoverageStatistics;
-	}
-	export interface ModuleCoverage {
-	    blockCount: number;
-	    blockData: number[];
-	    functions: FunctionCoverage[];
-	    name: string;
-	    signature: string;
-	    signatureAge: number;
-	    statistics: CoverageStatistics;
-	}
-	export interface PlanUpdateModel {
-	    area: ShallowReference;
-	    automatedTestEnvironment: TestEnvironment;
-	    automatedTestSettings: TestSettings;
-	    build: ShallowReference;
-	    configurationIds: number[];
-	    description: string;
-	    endDate: string;
-	    iteration: string;
-	    manualTestEnvironment: TestEnvironment;
-	    manualTestSettings: TestSettings;
-	    name: string;
-	    owner: VSSInterfaces.IdentityRef;
-	    startDate: string;
-	    state: string;
-	    status: string;
-	}
-	export interface PointAssignment {
-	    configuration: ShallowReference;
-	    tester: VSSInterfaces.IdentityRef;
-	}
-	export interface PointUpdateModel {
-	}
-	export interface PointWorkItemProperty {
-	    workItem: {
-	        key: string;
-	        value: any;
-	    };
-	}
-	export interface QueryModel {
-	    query: string;
-	}
-	export interface Response {
-	    error: string;
-	    id: string;
-	    status: string;
-	    url: string;
-	}
-	export enum ResultOutcome {
-	    Pass = 1,
-	    Fail = 2,
-	    Pending = 3,
-	}
-	export interface ResultUpdateRequestModel {
-	    actionResultDeletes: TestActionResultModel[];
-	    actionResults: TestActionResultModel[];
-	    parameterDeletes: TestResultParameterModel[];
-	    parameters: TestResultParameterModel[];
-	    testCaseResult: TestCaseResultUpdateModel;
-	}
-	export interface ResultUpdateResponseModel {
-	    revision: number;
-	}
-	export interface RunCreateModel {
-	    additionalTestFields: AdditionalTestField[];
-	    automated: boolean;
-	    build: ShallowReference;
-	    buildDropLocation: string;
-	    buildFlavor: string;
-	    buildPlatform: string;
-	    comment: string;
-	    completeDate: string;
-	    configurationIds: number[];
-	    controller: string;
-	    dtlAutEnvironment: ShallowReference;
-	    dtlTestEnvironment: ShallowReference;
-	    dueDate: string;
-	    environmentDetails: DtlEnvironmentDetails;
-	    errorMessage: string;
-	    filter: RunFilter;
-	    iteration: string;
-	    name: string;
-	    owner: VSSInterfaces.IdentityRef;
-	    plan: ShallowReference;
-	    pointIds: number[];
-	    releaseEnvironmentUri: string;
-	    releaseUri: string;
-	    runTimeout: any;
-	    startDate: string;
-	    state: string;
-	    testConfigurationsMapping: string;
-	    testEnvironmentId: string;
-	    testSettings: ShallowReference;
-	    type: string;
-	}
-	/**
-	 * This class is used to provide the filters used for discovery
-	 */
-	export interface RunFilter {
-	    /**
-	     * filter for the test case sources (test containers)
-	     */
-	    sourceFilter: string;
-	    /**
-	     * filter for the test cases
-	     */
-	    testCaseFilter: string;
-	}
-	export interface RunStatistic {
-	    count: number;
-	    outcome: string;
-	    resolutionState: TestResolutionState;
-	    state: string;
-	}
-	export interface RunUpdateModel {
-	    build: ShallowReference;
-	    comment: string;
-	    completedDate: string;
-	    controller: string;
-	    deleteInProgressResults: boolean;
-	    dtlAutEnvironment: ShallowReference;
-	    dtlEnvironment: ShallowReference;
-	    dtlEnvironmentDetails: DtlEnvironmentDetails;
-	    dueDate: string;
-	    errorMessage: string;
-	    iteration: string;
-	    logEntries: TestMessageLogDetails[];
-	    name: string;
-	    startedDate: string;
-	    state: string;
-	    substate: TestRunSubstate;
-	    testEnvironmentId: string;
-	    testSettings: ShallowReference;
-	}
-	/**
-	 * An abstracted reference to some other resource. This class is used to provide the build data contracts with a uniform way to reference other resources in a way that provides easy traversal through links.
-	 */
-	export interface ShallowReference {
-	    /**
-	     * Id of the resource
-	     */
-	    id: string;
-	    /**
-	     * Name of the linked resource (definition name, controller name, etc.)
-	     */
-	    name: string;
-	    /**
-	     * Full http link to the resource
-	     */
-	    url: string;
-	}
-	export interface SharedStepModel {
-	    id: number;
-	    revision: number;
-	}
-	export interface SuiteCreateModel {
-	}
-	export interface SuiteTestCase {
-	    pointAssignments: PointAssignment[];
-	    testCase: WorkItemReference;
-	}
-	export interface SuiteUpdateModel {
-	}
-	export interface TestActionResultModel extends TestResultModelBase {
-	    actionPath: string;
-	    iterationId: number;
-	    sharedStepModel: SharedStepModel;
-	    url: string;
-	}
-	export interface TestAttachmentReference {
-	    id: number;
-	    url: string;
-	}
-	export interface TestAttachmentRequestModel {
-	    attachmentType: string;
-	    comment: string;
-	    fileName: string;
-	    stream: string;
-	}
-	export interface TestCaseResult {
-	    additionalFields: AdditionalTestField[];
-	    afnStripId: number;
-	    area: ShallowReference;
-	    associatedBugs: ShallowReference[];
-	    automatedTestId: string;
-	    automatedTestName: string;
-	    automatedTestStorage: string;
-	    automatedTestType: string;
-	    automatedTestTypeId: string;
-	    build: ShallowReference;
-	    comment: string;
-	    completedDate: Date;
-	    computerName: string;
-	    configuration: ShallowReference;
-	    createdDate: Date;
-	    durationInMs: number;
-	    errorMessage: string;
-	    failureType: string;
-	    id: number;
-	    iterationDetails: TestIterationDetailsModel[];
-	    lastUpdatedBy: VSSInterfaces.IdentityRef;
-	    lastUpdatedDate: Date;
-	    outcome: string;
-	    owner: VSSInterfaces.IdentityRef;
-	    priority: number;
-	    project: ShallowReference;
-	    resetCount: number;
-	    resolutionState: string;
-	    resolutionStateId: number;
-	    revision: number;
-	    runBy: VSSInterfaces.IdentityRef;
-	    stackTrace: string;
-	    startedDate: Date;
-	    state: string;
-	    testCase: ShallowReference;
-	    testCaseTitle: string;
-	    testPoint: ShallowReference;
-	    testRun: ShallowReference;
-	    url: string;
-	}
-	export interface TestCaseResult2 {
-	    componentId: string;
-	    custom: any;
-	    endTime: Date;
-	    exceptionStack: string;
-	    externalArtifacts: string[];
-	    externalRunId: string;
-	    externalSystem: string;
-	    externalTestId: string;
-	    failureReasons: string[];
-	    failureSummary: string;
-	    investigationNotes: string;
-	    isSuperseded: boolean;
-	    isValid: boolean;
-	    outcome: ResultOutcome;
-	    resultCustomPropertiesTypeName: string;
-	    resultId: string;
-	    resultName: string;
-	    runId: string;
-	    startTime: Date;
-	    testId: string;
-	    tfsSecurityKey: string;
-	}
-	export interface TestCaseResultAttachmentModel {
-	    id: number;
-	    iterationId: number;
-	    name: string;
-	    size: number;
-	    url: string;
-	}
-	export interface TestCaseResultIdentifier {
-	}
-	export interface TestCaseResultUpdateModel {
-	    additionalFields: AdditionalTestField[];
-	    associatedWorkItems: number[];
-	    automatedTestTypeId: string;
-	    comment: string;
-	    completedDate: string;
-	    computerName: string;
-	    durationInMs: string;
-	    errorMessage: string;
-	    failureType: string;
-	    outcome: string;
-	    owner: VSSInterfaces.IdentityRef;
-	    resolutionState: string;
-	    runBy: VSSInterfaces.IdentityRef;
-	    stackTrace: string;
-	    startedDate: string;
-	    state: string;
-	    testCasePriority: string;
-	    testResult: ShallowReference;
-	}
-	export interface TestEnvironment {
-	    environmentId: string;
-	    environmentName: string;
-	}
-	export enum TestExtensionFieldScope {
-	    None = 0,
-	    TestRun = 1,
-	    TestResult = 2,
-	    System = 4,
-	}
-	export interface TestInsightDetails {
-	    count: number;
-	    previousBuild: ShallowReference;
-	    self: ShallowReference;
-	    testResults: ShallowReference[];
-	}
-	export interface TestInsights {
-	    existingFailures: TestInsightDetails;
-	    fixedTests: TestInsightDetails;
-	    newFailures: TestInsightDetails;
-	    self: ShallowReference;
-	}
-	export interface TestIterationDetailsModel {
-	    actionResults: TestActionResultModel[];
-	    attachments: TestCaseResultAttachmentModel[];
-	    comment: string;
-	    completedDate: Date;
-	    durationInMs: number;
-	    errorMessage: string;
-	    id: number;
-	    outcome: string;
-	    parameters: TestResultParameterModel[];
-	    startedDate: Date;
-	    url: string;
-	}
-	/**
-	 * An abstracted reference to some other resource. This class is used to provide the build data contracts with a uniform way to reference other resources in a way that provides easy traversal through links.
-	 */
-	export interface TestMessageLogDetails {
-	    /**
-	     * Date when the resource is created
-	     */
-	    dateCreated: Date;
-	    /**
-	     * Id of the resource
-	     */
-	    entryId: number;
-	    /**
-	     * Message of the resource
-	     */
-	    message: string;
-	}
-	export interface TestPlan {
-	    area: ShallowReference;
-	    automatedTestEnvironment: TestEnvironment;
-	    automatedTestSettings: TestSettings;
-	    build: ShallowReference;
-	    clientUrl: string;
-	    description: string;
-	    endDate: Date;
-	    id: number;
-	    iteration: string;
-	    manualTestEnvironment: TestEnvironment;
-	    manualTestSettings: TestSettings;
-	    name: string;
-	    owner: VSSInterfaces.IdentityRef;
-	    previousBuild: ShallowReference;
-	    project: ShallowReference;
-	    revision: number;
-	    rootSuite: ShallowReference;
-	    startDate: Date;
-	    state: string;
-	    updatedBy: VSSInterfaces.IdentityRef;
-	    updatedDate: Date;
-	    url: string;
-	}
-	export interface TestPlansWithSelection {
-	    lastSelectedPlan: number;
-	    lastSelectedSuite: number;
-	    plans: TestPlan[];
-	}
-	export interface TestPoint {
-	    assignedTo: VSSInterfaces.IdentityRef;
-	    automated: boolean;
-	    comment: string;
-	    configuration: ShallowReference;
-	    failureType: string;
-	    id: number;
-	    lastResolutionStateId: number;
-	    lastResult: ShallowReference;
-	    lastTestRun: ShallowReference;
-	    lastUpdatedBy: VSSInterfaces.IdentityRef;
-	    lastUpdatedDate: Date;
-	    outcome: string;
-	    revision: number;
-	    state: string;
-	    suite: ShallowReference;
-	    testCase: WorkItemReference;
-	    testPlan: ShallowReference;
-	    url: string;
-	    workItemProperties: any[];
-	}
-	export interface TestReport {
-	    aggregatedResults: AggregatedTestResults;
-	    build: ShallowReference;
-	    self: ShallowReference;
-	    teamProject: ShallowReference;
-	    testInsights: TestInsights;
-	}
-	export interface TestResolutionState {
-	    id: number;
-	    name: string;
-	    project: ShallowReference;
-	}
-	export interface TestResultCreateModel {
-	    additionalFields: AdditionalTestField[];
-	    area: ShallowReference;
-	    associatedWorkItems: number[];
-	    automatedTestId: string;
-	    automatedTestName: string;
-	    automatedTestStorage: string;
-	    automatedTestType: string;
-	    automatedTestTypeId: string;
-	    comment: string;
-	    completedDate: string;
-	    computerName: string;
-	    configuration: ShallowReference;
-	    durationInMs: string;
-	    errorMessage: string;
-	    failureType: string;
-	    outcome: string;
-	    owner: VSSInterfaces.IdentityRef;
-	    resolutionState: string;
-	    runBy: VSSInterfaces.IdentityRef;
-	    stackTrace: string;
-	    startedDate: string;
-	    state: string;
-	    testCase: ShallowReference;
-	    testCasePriority: string;
-	    testCaseTitle: string;
-	    testPoint: ShallowReference;
-	}
-	export interface TestResultModelBase {
-	    comment: string;
-	    completedDate: Date;
-	    durationInMs: number;
-	    errorMessage: string;
-	    outcome: string;
-	    startedDate: Date;
-	}
-	export interface TestResultParameterModel {
-	    actionPath: string;
-	    iterationId: number;
-	    parameterName: string;
-	    url: string;
-	    value: string;
-	}
-	export interface TestRun {
-	    additionalFields: AdditionalTestField[];
-	    build: ShallowReference;
-	    buildConfiguration: BuildConfiguration;
-	    comment: string;
-	    completedDate: Date;
-	    controller: string;
-	    createdDate: Date;
-	    dropLocation: string;
-	    dtlAutEnvironment: ShallowReference;
-	    dtlEnvironment: ShallowReference;
-	    dtlEnvironmentCreationDetails: DtlEnvironmentDetails;
-	    dueDate: Date;
-	    errorMessage: string;
-	    filter: RunFilter;
-	    id: number;
-	    incompleteTests: number;
-	    isAutomated: boolean;
-	    iteration: string;
-	    lastUpdatedBy: VSSInterfaces.IdentityRef;
-	    lastUpdatedDate: Date;
-	    name: string;
-	    notApplicableTests: number;
-	    owner: VSSInterfaces.IdentityRef;
-	    passedTests: number;
-	    phase: string;
-	    plan: ShallowReference;
-	    postProcessState: string;
-	    project: ShallowReference;
-	    releaseEnvironmentUri: string;
-	    releaseUri: string;
-	    revision: number;
-	    runStatistics: RunStatistic[];
-	    startedDate: Date;
-	    state: string;
-	    substate: TestRunSubstate;
-	    testEnvironment: TestEnvironment;
-	    testMessageLogId: number;
-	    testSettings: ShallowReference;
-	    totalTests: number;
-	    unanalyzedTests: number;
-	    url: string;
-	    webAccessUrl: string;
-	}
-	export interface TestRunCoverage {
-	    lastError: string;
-	    modules: ModuleCoverage[];
-	    state: string;
-	    testRun: ShallowReference;
-	}
-	export enum TestRunState {
-	    /**
-	     * Only used during an update to preserve the existing value.
-	     */
-	    Unspecified = 0,
-	    /**
-	     * The run is still being created.  No tests have started yet.
-	     */
-	    NotStarted = 1,
-	    /**
-	     * Tests are running.
-	     */
-	    InProgress = 2,
-	    /**
-	     * All tests have completed or been skipped.
-	     */
-	    Completed = 3,
-	    /**
-	     * Run is stopped and remaing tests have been aborted
-	     */
-	    Aborted = 4,
-	    /**
-	     * Run is currently initializing This is a legacy state and should not be used any more
-	     */
-	    Waiting = 5,
-	    /**
-	     * Run requires investigation because of a test point failure This is a legacy state and should not be used any more
-	     */
-	    NeedsInvestigation = 6,
-	}
-	export interface TestRunStatistic {
-	    run: ShallowReference;
-	    runStatistics: RunStatistic[];
-	}
-	export enum TestRunSubstate {
-	    None = 0,
-	    CreatingEnvironment = 1,
-	    RunningTests = 2,
-	    CanceledByUser = 3,
-	    AbortedBySystem = 4,
-	    TimedOut = 5,
-	    PendingAnalysis = 6,
-	    Analyzed = 7,
-	    CancellationInProgress = 8,
-	}
-	/**
-	 * Represents the test settings of the run. Used to create test settings and fetch test settings
-	 */
-	export interface TestSettings {
-	    /**
-	     * Area path required to create test settings
-	     */
-	    areaPath: string;
-	    /**
-	     * Description of the test settings. Used in create test settings.
-	     */
-	    description: string;
-	    /**
-	     * Indicates if the tests settings is public or private.Used in create test settings.
-	     */
-	    isPublic: boolean;
-	    /**
-	     * Xml string of machine roles. Used in create test settings.
-	     */
-	    machineRoles: string;
-	    /**
-	     * Test settings content.
-	     */
-	    testSettingsContent: string;
-	    /**
-	     * Test settings id.
-	     */
-	    testSettingsId: number;
-	    /**
-	     * Test settings name.
-	     */
-	    testSettingsName: string;
-	}
-	export interface TestSuite {
-	    areaUri: string;
-	    defaultConfigurations: ShallowReference[];
-	    id: number;
-	    inheritDefaultConfigurations: boolean;
-	    lastError: string;
-	    lastPopulatedDate: Date;
-	    lastUpdatedBy: VSSInterfaces.IdentityRef;
-	    lastUpdatedDate: Date;
-	    name: string;
-	    parent: ShallowReference;
-	    plan: ShallowReference;
-	    project: ShallowReference;
-	    queryString: string;
-	    requirementId: number;
-	    revision: number;
-	    state: string;
-	    suites: ShallowReference[];
-	    suiteType: string;
-	    testCaseCount: number;
-	    testCasesUrl: string;
-	    url: string;
-	}
-	export interface WorkItemReference {
-	    id: string;
-	    url: string;
-	    webUrl: string;
-	}
-	export var TypeInfo: {
-	    AdditionalTestField: {
-	        fields: any;
-	    };
-	    AddtionalTestFieldDefinition: {
-	        fields: any;
-	    };
-	    AggregatedResultsByPivot: {
-	        fields: any;
-	    };
-	    AggregatedTestResults: {
-	        fields: any;
-	    };
-	    AttachmentType: {
-	        enumValues: {
-	            "generalAttachment": number;
-	            "afnStrip": number;
-	            "bugFilingData": number;
-	            "codeCoverage": number;
-	            "intermediateCollectorData": number;
-	            "runConfig": number;
-	            "testImpactDetails": number;
-	            "tmiTestRunDeploymentFiles": number;
-	            "tmiTestRunReverseDeploymentFiles": number;
-	            "tmiTestResultDetail": number;
-	            "tmiTestRunSummary": number;
-	        };
-	    };
-	    BatchResponse: {
-	        fields: any;
-	    };
-	    BuildConfiguration: {
-	        fields: any;
-	    };
-	    BuildCoverage: {
-	        fields: any;
-	    };
-	    CodeCoverageData: {
-	        fields: any;
-	    };
-	    CodeCoverageStatistics: {
-	        fields: any;
-	    };
-	    CodeCoverageSummary: {
-	        fields: any;
-	    };
-	    CoverageQueryFlags: {
-	        enumValues: {
-	            "modules": number;
-	            "functions": number;
-	            "blockData": number;
-	        };
-	    };
-	    CoverageStatistics: {
-	        fields: any;
-	    };
-	    DtlEnvironmentDetails: {
-	        fields: any;
-	    };
-	    FunctionCoverage: {
-	        fields: any;
-	    };
-	    ModuleCoverage: {
-	        fields: any;
-	    };
-	    PlanUpdateModel: {
-	        fields: any;
-	    };
-	    PointAssignment: {
-	        fields: any;
-	    };
-	    PointUpdateModel: {
-	        fields: any;
-	    };
-	    PointWorkItemProperty: {
-	        fields: any;
-	    };
-	    QueryModel: {
-	        fields: any;
-	    };
-	    Response: {
-	        fields: any;
-	    };
-	    ResultOutcome: {
-	        enumValues: {
-	            "pass": number;
-	            "fail": number;
-	            "pending": number;
-	        };
-	    };
-	    ResultUpdateRequestModel: {
-	        fields: any;
-	    };
-	    ResultUpdateResponseModel: {
-	        fields: any;
-	    };
-	    RunCreateModel: {
-	        fields: any;
-	    };
-	    RunFilter: {
-	        fields: any;
-	    };
-	    RunStatistic: {
-	        fields: any;
-	    };
-	    RunUpdateModel: {
-	        fields: any;
-	    };
-	    ShallowReference: {
-	        fields: any;
-	    };
-	    SharedStepModel: {
-	        fields: any;
-	    };
-	    SuiteCreateModel: {
-	        fields: any;
-	    };
-	    SuiteTestCase: {
-	        fields: any;
-	    };
-	    SuiteUpdateModel: {
-	        fields: any;
-	    };
-	    TestActionResultModel: {
-	        fields: any;
-	    };
-	    TestAttachmentReference: {
-	        fields: any;
-	    };
-	    TestAttachmentRequestModel: {
-	        fields: any;
-	    };
-	    TestCaseResult: {
-	        fields: any;
-	    };
-	    TestCaseResult2: {
-	        fields: any;
-	    };
-	    TestCaseResultAttachmentModel: {
-	        fields: any;
-	    };
-	    TestCaseResultIdentifier: {
-	        fields: any;
-	    };
-	    TestCaseResultUpdateModel: {
-	        fields: any;
-	    };
-	    TestEnvironment: {
-	        fields: any;
-	    };
-	    TestExtensionFieldScope: {
-	        enumValues: {
-	            "none": number;
-	            "testRun": number;
-	            "testResult": number;
-	            "system": number;
-	        };
-	    };
-	    TestInsightDetails: {
-	        fields: any;
-	    };
-	    TestInsights: {
-	        fields: any;
-	    };
-	    TestIterationDetailsModel: {
-	        fields: any;
-	    };
-	    TestMessageLogDetails: {
-	        fields: any;
-	    };
-	    TestPlan: {
-	        fields: any;
-	    };
-	    TestPlansWithSelection: {
-	        fields: any;
-	    };
-	    TestPoint: {
-	        fields: any;
-	    };
-	    TestReport: {
-	        fields: any;
-	    };
-	    TestResolutionState: {
-	        fields: any;
-	    };
-	    TestResultCreateModel: {
-	        fields: any;
-	    };
-	    TestResultModelBase: {
-	        fields: any;
-	    };
-	    TestResultParameterModel: {
-	        fields: any;
-	    };
-	    TestRun: {
-	        fields: any;
-	    };
-	    TestRunCoverage: {
-	        fields: any;
-	    };
-	    TestRunState: {
-	        enumValues: {
-	            "unspecified": number;
-	            "notStarted": number;
-	            "inProgress": number;
-	            "completed": number;
-	            "aborted": number;
-	            "waiting": number;
-	            "needsInvestigation": number;
-	        };
-	    };
-	    TestRunStatistic: {
-	        fields: any;
-	    };
-	    TestRunSubstate: {
-	        enumValues: {
-	            "none": number;
-	            "creatingEnvironment": number;
-	            "runningTests": number;
-	            "canceledByUser": number;
-	            "abortedBySystem": number;
-	            "timedOut": number;
-	            "pendingAnalysis": number;
-	            "analyzed": number;
-	            "cancellationInProgress": number;
-	        };
-	    };
-	    TestSettings: {
-	        fields: any;
-	    };
-	    TestSuite: {
-	        fields: any;
-	    };
-	    WorkItemReference: {
-	        fields: any;
-	    };
-	};
-
-}
-declare module 'vso-node-api/TestApi' {
-	/// <reference path="../node/node.d.ts" />
-	/// <reference path="../q/Q.d.ts" />
-	import Q = require('q');
-	import basem = require('vso-node-api/ClientApiBases');
-	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
-	import TestInterfaces = require('vso-node-api/interfaces/TestInterfaces');
-	export interface ITestApi extends basem.ClientApiBase {
-	    createTestResultAttachment(attachmentRequestModel: TestInterfaces.TestAttachmentRequestModel, project: string, runId: number, testCaseResultId: number, onResult: (err: any, statusCode: number, Attachment: TestInterfaces.TestAttachmentReference) => void): void;
-	    createTestRunAttachment(attachmentRequestModel: TestInterfaces.TestAttachmentRequestModel, project: string, runId: number, onResult: (err: any, statusCode: number, Attachment: TestInterfaces.TestAttachmentReference) => void): void;
-	    getBuildCodeCoverage(project: string, buildId: number, flags: number, onResult: (err: any, statusCode: number, CodeCoverage: TestInterfaces.BuildCoverage[]) => void): void;
-	    getCodeCoverageSummary(project: string, buildId: number, deltaBuildId: number, onResult: (err: any, statusCode: number, CodeCoverage: TestInterfaces.CodeCoverageSummary) => void): void;
-	    updateCodeCoverageSummary(coverageData: TestInterfaces.CodeCoverageData, project: string, build: number, onResult: (err: any, statusCode: number) => void): void;
-	    getTestRunCodeCoverage(project: string, runId: number, flags: number, onResult: (err: any, statusCode: number, CodeCoverage: TestInterfaces.TestRunCoverage[]) => void): void;
-	    getTestRunLogs(project: string, runId: number, onResult: (err: any, statusCode: number, MessageLogs: TestInterfaces.TestMessageLogDetails[]) => void): void;
-	    createTestPlan(testPlan: TestInterfaces.PlanUpdateModel, project: string, onResult: (err: any, statusCode: number, Plan: TestInterfaces.TestPlan) => void): void;
-	    getPlanById(project: string, planId: number, onResult: (err: any, statusCode: number, Plan: TestInterfaces.TestPlan) => void): void;
-	    getPlans(project: string, owner: string, skip: number, top: number, includePlanDetails: boolean, filterActivePlans: boolean, onResult: (err: any, statusCode: number, Plans: TestInterfaces.TestPlan[]) => void): void;
-	    updateTestPlan(planUpdateModel: TestInterfaces.PlanUpdateModel, project: string, planId: number, onResult: (err: any, statusCode: number, Plan: TestInterfaces.TestPlan) => void): void;
-	    getPoint(project: string, planId: number, suiteId: number, pointIds: number, witFields: string, onResult: (err: any, statusCode: number, Point: TestInterfaces.TestPoint) => void): void;
-	    getPoints(project: string, planId: number, suiteId: number, witFields: string, configurationId: string, testCaseId: string, testPointIds: string, includePointDetails: boolean, skip: number, top: number, onResult: (err: any, statusCode: number, Points: TestInterfaces.TestPoint[]) => void): void;
-	    updateTestPoints(pointUpdateModel: TestInterfaces.PointUpdateModel, project: string, planId: number, suiteId: number, pointIds: string, onResult: (err: any, statusCode: number, Point: TestInterfaces.TestPoint[]) => void): void;
-	    getTestIteration(project: string, runId: number, testCaseResultId: number, iterationId: number, includeActionResults: boolean, onResult: (err: any, statusCode: number, Result: TestInterfaces.TestIterationDetailsModel) => void): void;
-	    getTestIterations(project: string, runId: number, testCaseResultId: number, includeActionResults: boolean, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestIterationDetailsModel[]) => void): void;
-	    addTestResultsToTestRun(resultCreateModels: TestInterfaces.TestResultCreateModel[], project: string, runId: number, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestCaseResult[]) => void): void;
-	    bulkUpdateTestResults(resultUpdateModel: TestInterfaces.TestCaseResultUpdateModel, project: string, runId: number, resultIds: number[], onResult: (err: any, statusCode: number, Result: TestInterfaces.TestCaseResult[]) => void): void;
-	    getTestCaseResultById(project: string, runId: number, testCaseResultId: number, includeIterationDetails: boolean, onResult: (err: any, statusCode: number, Result: TestInterfaces.TestCaseResult) => void): void;
-	    getTestCaseResults(project: string, runId: number, includeIterationDetails: boolean, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestCaseResult[]) => void): void;
-	    updateTestResults(resultUpdateModels: TestInterfaces.TestCaseResultUpdateModel[], project: string, runId: number, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestCaseResult[]) => void): void;
-	    getActionResults(project: string, runId: number, testCaseResultId: number, iterationId: number, actionPath: string, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestActionResultModel[]) => void): void;
-	    getResultParameters(project: string, runId: number, testCaseResultId: number, iterationId: number, paramName: string, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestResultParameterModel[]) => void): void;
-	    getTestResultsByQuery(query: TestInterfaces.QueryModel, project: string, includeResultDetails: boolean, includeIterationDetails: boolean, skip: number, top: number, onResult: (err: any, statusCode: number, Result: TestInterfaces.TestCaseResult[]) => void): void;
-	    getTestRunStatistics(project: string, runId: number, onResult: (err: any, statusCode: number, Run: TestInterfaces.TestRunStatistic) => void): void;
-	    getTestRunsByQuery(query: TestInterfaces.QueryModel, project: string, includeRunDetails: boolean, skip: number, top: number, onResult: (err: any, statusCode: number, Run: TestInterfaces.TestRun[]) => void): void;
-	    createTestRun(testRun: TestInterfaces.RunCreateModel, project: string, onResult: (err: any, statusCode: number, Run: TestInterfaces.TestRun) => void): void;
-	    deleteTestRun(project: string, runId: number, onResult: (err: any, statusCode: number) => void): void;
-	    getTestRunById(project: string, runId: number, onResult: (err: any, statusCode: number, Run: TestInterfaces.TestRun) => void): void;
-	    getTestRuns(project: string, buildUri: string, owner: string, tmiRunId: string, planId: number, includeRunDetails: boolean, automated: boolean, skip: number, top: number, onResult: (err: any, statusCode: number, Runs: TestInterfaces.TestRun[]) => void): void;
-	    updateTestRun(runUpdateModel: TestInterfaces.RunUpdateModel, project: string, runId: number, onResult: (err: any, statusCode: number, Run: TestInterfaces.TestRun) => void): void;
-	    addTestCasesToSuite(project: string, planId: number, suiteId: number, testCaseIds: string, onResult: (err: any, statusCode: number, Suites: TestInterfaces.SuiteTestCase[]) => void): void;
-	    getTestCaseById(project: string, planId: number, suiteId: number, testCaseIds: number, onResult: (err: any, statusCode: number, Suite: TestInterfaces.SuiteTestCase) => void): void;
-	    getTestCases(project: string, planId: number, suiteId: number, onResult: (err: any, statusCode: number, Suites: TestInterfaces.SuiteTestCase[]) => void): void;
-	    removeTestCasesFromSuiteUrl(project: string, planId: number, suiteId: number, testCaseIds: string, onResult: (err: any, statusCode: number) => void): void;
-	    createTestSuite(testSuite: TestInterfaces.SuiteCreateModel, project: string, planId: number, suiteId: number, onResult: (err: any, statusCode: number, Suite: TestInterfaces.TestSuite[]) => void): void;
-	    deleteTestSuite(project: string, planId: number, suiteId: number, onResult: (err: any, statusCode: number) => void): void;
-	    getTestSuiteById(project: string, planId: number, suiteId: number, includeChildSuites: boolean, onResult: (err: any, statusCode: number, Suite: TestInterfaces.TestSuite) => void): void;
-	    getTestSuitesForPlan(project: string, planId: number, includeSuites: boolean, skip: number, top: number, onResult: (err: any, statusCode: number, Suites: TestInterfaces.TestSuite[]) => void): void;
-	    updateTestSuite(suiteUpdateModel: TestInterfaces.SuiteUpdateModel, project: string, planId: number, suiteId: number, onResult: (err: any, statusCode: number, Suite: TestInterfaces.TestSuite) => void): void;
-	    getSuitesByTestCaseId(testCaseId: number, onResult: (err: any, statusCode: number, Suites: TestInterfaces.TestSuite[]) => void): void;
-	    createTestSettings(testSettings: TestInterfaces.TestSettings, project: string, onResult: (err: any, statusCode: number, TestSetting: number) => void): void;
-	    deleteTestSettings(project: string, testSettingsId: number, onResult: (err: any, statusCode: number) => void): void;
-	    getTestSettingsById(project: string, testSettingsId: number, onResult: (err: any, statusCode: number, TestSetting: TestInterfaces.TestSettings) => void): void;
-	}
-	export interface IQTestApi extends basem.QClientApiBase {
-	    createTestResultAttachment(attachmentRequestModel: TestInterfaces.TestAttachmentRequestModel, project: string, runId: number, testCaseResultId: number): Q.Promise<TestInterfaces.TestAttachmentReference>;
-	    createTestRunAttachment(attachmentRequestModel: TestInterfaces.TestAttachmentRequestModel, project: string, runId: number): Q.Promise<TestInterfaces.TestAttachmentReference>;
-	    getBuildCodeCoverage(project: string, buildId: number, flags: number): Q.Promise<TestInterfaces.BuildCoverage[]>;
-	    getCodeCoverageSummary(project: string, buildId: number, deltaBuildId?: number): Q.Promise<TestInterfaces.CodeCoverageSummary>;
-	    getTestRunCodeCoverage(project: string, runId: number, flags: number): Q.Promise<TestInterfaces.TestRunCoverage[]>;
-	    getTestRunLogs(project: string, runId: number): Q.Promise<TestInterfaces.TestMessageLogDetails[]>;
-	    createTestPlan(testPlan: TestInterfaces.PlanUpdateModel, project: string): Q.Promise<TestInterfaces.TestPlan>;
-	    getPlanById(project: string, planId: number): Q.Promise<TestInterfaces.TestPlan>;
-	    getPlans(project: string, owner?: string, skip?: number, top?: number, includePlanDetails?: boolean, filterActivePlans?: boolean): Q.Promise<TestInterfaces.TestPlan[]>;
-	    updateTestPlan(planUpdateModel: TestInterfaces.PlanUpdateModel, project: string, planId: number): Q.Promise<TestInterfaces.TestPlan>;
-	    getPoint(project: string, planId: number, suiteId: number, pointIds: number, witFields?: string): Q.Promise<TestInterfaces.TestPoint>;
-	    getPoints(project: string, planId: number, suiteId: number, witFields?: string, configurationId?: string, testCaseId?: string, testPointIds?: string, includePointDetails?: boolean, skip?: number, top?: number): Q.Promise<TestInterfaces.TestPoint[]>;
-	    updateTestPoints(pointUpdateModel: TestInterfaces.PointUpdateModel, project: string, planId: number, suiteId: number, pointIds: string): Q.Promise<TestInterfaces.TestPoint[]>;
-	    getTestIteration(project: string, runId: number, testCaseResultId: number, iterationId: number, includeActionResults?: boolean): Q.Promise<TestInterfaces.TestIterationDetailsModel>;
-	    getTestIterations(project: string, runId: number, testCaseResultId: number, includeActionResults?: boolean): Q.Promise<TestInterfaces.TestIterationDetailsModel[]>;
-	    addTestResultsToTestRun(resultCreateModels: TestInterfaces.TestResultCreateModel[], project: string, runId: number): Q.Promise<TestInterfaces.TestCaseResult[]>;
-	    bulkUpdateTestResults(resultUpdateModel: TestInterfaces.TestCaseResultUpdateModel, project: string, runId: number, resultIds: number[]): Q.Promise<TestInterfaces.TestCaseResult[]>;
-	    getTestCaseResultById(project: string, runId: number, testCaseResultId: number, includeIterationDetails?: boolean): Q.Promise<TestInterfaces.TestCaseResult>;
-	    getTestCaseResults(project: string, runId: number, includeIterationDetails?: boolean): Q.Promise<TestInterfaces.TestCaseResult[]>;
-	    updateTestResults(resultUpdateModels: TestInterfaces.TestCaseResultUpdateModel[], project: string, runId: number): Q.Promise<TestInterfaces.TestCaseResult[]>;
-	    getActionResults(project: string, runId: number, testCaseResultId: number, iterationId: number, actionPath?: string): Q.Promise<TestInterfaces.TestActionResultModel[]>;
-	    getResultParameters(project: string, runId: number, testCaseResultId: number, iterationId: number, paramName?: string): Q.Promise<TestInterfaces.TestResultParameterModel[]>;
-	    getTestResultsByQuery(query: TestInterfaces.QueryModel, project: string, includeResultDetails?: boolean, includeIterationDetails?: boolean, skip?: number, top?: number): Q.Promise<TestInterfaces.TestCaseResult[]>;
-	    getTestRunStatistics(project: string, runId: number): Q.Promise<TestInterfaces.TestRunStatistic>;
-	    getTestRunsByQuery(query: TestInterfaces.QueryModel, project: string, includeRunDetails?: boolean, skip?: number, top?: number): Q.Promise<TestInterfaces.TestRun[]>;
-	    createTestRun(testRun: TestInterfaces.RunCreateModel, project: string): Q.Promise<TestInterfaces.TestRun>;
-	    getTestRunById(project: string, runId: number): Q.Promise<TestInterfaces.TestRun>;
-	    getTestRuns(project: string, buildUri?: string, owner?: string, tmiRunId?: string, planId?: number, includeRunDetails?: boolean, automated?: boolean, skip?: number, top?: number): Q.Promise<TestInterfaces.TestRun[]>;
-	    updateTestRun(runUpdateModel: TestInterfaces.RunUpdateModel, project: string, runId: number): Q.Promise<TestInterfaces.TestRun>;
-	    addTestCasesToSuite(project: string, planId: number, suiteId: number, testCaseIds: string): Q.Promise<TestInterfaces.SuiteTestCase[]>;
-	    getTestCaseById(project: string, planId: number, suiteId: number, testCaseIds: number): Q.Promise<TestInterfaces.SuiteTestCase>;
-	    getTestCases(project: string, planId: number, suiteId: number): Q.Promise<TestInterfaces.SuiteTestCase[]>;
-	    createTestSuite(testSuite: TestInterfaces.SuiteCreateModel, project: string, planId: number, suiteId: number): Q.Promise<TestInterfaces.TestSuite[]>;
-	    getTestSuiteById(project: string, planId: number, suiteId: number, includeChildSuites?: boolean): Q.Promise<TestInterfaces.TestSuite>;
-	    getTestSuitesForPlan(project: string, planId: number, includeSuites?: boolean, skip?: number, top?: number): Q.Promise<TestInterfaces.TestSuite[]>;
-	    updateTestSuite(suiteUpdateModel: TestInterfaces.SuiteUpdateModel, project: string, planId: number, suiteId: number): Q.Promise<TestInterfaces.TestSuite>;
-	    getSuitesByTestCaseId(testCaseId: number): Q.Promise<TestInterfaces.TestSuite[]>;
-	    createTestSettings(testSettings: TestInterfaces.TestSettings, project: string): Q.Promise<number>;
-	    getTestSettingsById(project: string, testSettingsId: number): Q.Promise<TestInterfaces.TestSettings>;
-	}
-	export class TestApi extends basem.ClientApiBase implements ITestApi {
-	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
-	    /**
-	     * @param {TestInterfaces.TestAttachmentRequestModel} attachmentRequestModel
-	     * @param {string} project - Project ID or project name
-	     * @param {number} runId
-	     * @param {number} testCaseResultId
-	     * @param onResult callback function with the resulting TestInterfaces.TestAttachmentReference
-	     */
-	    createTestResultAttachment(attachmentRequestModel: TestInterfaces.TestAttachmentRequestModel, project: string, runId: number, testCaseResultId: number, onResult: (err: any, statusCode: number, Attachment: TestInterfaces.TestAttachmentReference) => void): void;
-	    /**
-	     * @param {TestInterfaces.TestAttachmentRequestModel} attachmentRequestModel
-	     * @param {string} project - Project ID or project name
-	     * @param {number} runId
-	     * @param onResult callback function with the resulting TestInterfaces.TestAttachmentReference
-	     */
-	    createTestRunAttachment(attachmentRequestModel: TestInterfaces.TestAttachmentRequestModel, project: string, runId: number, onResult: (err: any, statusCode: number, Attachment: TestInterfaces.TestAttachmentReference) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} buildId
-	     * @param {number} flags
-	     * @param onResult callback function with the resulting TestInterfaces.BuildCoverage[]
-	     */
-	    getBuildCodeCoverage(project: string, buildId: number, flags: number, onResult: (err: any, statusCode: number, CodeCoverage: TestInterfaces.BuildCoverage[]) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} buildId
-	     * @param {number} deltaBuildId
-	     * @param onResult callback function with the resulting TestInterfaces.CodeCoverageSummary
-	     */
-	    getCodeCoverageSummary(project: string, buildId: number, deltaBuildId: number, onResult: (err: any, statusCode: number, CodeCoverage: TestInterfaces.CodeCoverageSummary) => void): void;
-	    /**
-	     * http://(tfsserver):8080/tfs/DefaultCollection/_apis/test/CodeCoverage?build=10 Request: Json of code coverage summary
-	     *
-	     * @param {TestInterfaces.CodeCoverageData} coverageData
-	     * @param {string} project - Project ID or project name
-	     * @param {number} build
-	     * @param onResult callback function
-	     */
-	    updateCodeCoverageSummary(coverageData: TestInterfaces.CodeCoverageData, project: string, build: number, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} runId
-	     * @param {number} flags
-	     * @param onResult callback function with the resulting TestInterfaces.TestRunCoverage[]
-	     */
-	    getTestRunCodeCoverage(project: string, runId: number, flags: number, onResult: (err: any, statusCode: number, CodeCoverage: TestInterfaces.TestRunCoverage[]) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} runId
-	     * @param onResult callback function with the resulting TestInterfaces.TestMessageLogDetails[]
-	     */
-	    getTestRunLogs(project: string, runId: number, onResult: (err: any, statusCode: number, MessageLogs: TestInterfaces.TestMessageLogDetails[]) => void): void;
-	    /**
-	     * @param {TestInterfaces.PlanUpdateModel} testPlan
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting TestInterfaces.TestPlan
-	     */
-	    createTestPlan(testPlan: TestInterfaces.PlanUpdateModel, project: string, onResult: (err: any, statusCode: number, Plan: TestInterfaces.TestPlan) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} planId
-	     * @param onResult callback function with the resulting TestInterfaces.TestPlan
-	     */
-	    getPlanById(project: string, planId: number, onResult: (err: any, statusCode: number, Plan: TestInterfaces.TestPlan) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {string} owner
-	     * @param {number} skip
-	     * @param {number} top
-	     * @param {boolean} includePlanDetails
-	     * @param {boolean} filterActivePlans
-	     * @param onResult callback function with the resulting TestInterfaces.TestPlan[]
-	     */
-	    getPlans(project: string, owner: string, skip: number, top: number, includePlanDetails: boolean, filterActivePlans: boolean, onResult: (err: any, statusCode: number, Plans: TestInterfaces.TestPlan[]) => void): void;
-	    /**
-	     * @param {TestInterfaces.PlanUpdateModel} planUpdateModel
-	     * @param {string} project - Project ID or project name
-	     * @param {number} planId
-	     * @param onResult callback function with the resulting TestInterfaces.TestPlan
-	     */
-	    updateTestPlan(planUpdateModel: TestInterfaces.PlanUpdateModel, project: string, planId: number, onResult: (err: any, statusCode: number, Plan: TestInterfaces.TestPlan) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} planId
-	     * @param {number} suiteId
-	     * @param {number} pointIds
-	     * @param {string} witFields
-	     * @param onResult callback function with the resulting TestInterfaces.TestPoint
-	     */
-	    getPoint(project: string, planId: number, suiteId: number, pointIds: number, witFields: string, onResult: (err: any, statusCode: number, Point: TestInterfaces.TestPoint) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} planId
-	     * @param {number} suiteId
-	     * @param {string} witFields
-	     * @param {string} configurationId
-	     * @param {string} testCaseId
-	     * @param {string} testPointIds
-	     * @param {boolean} includePointDetails
-	     * @param {number} skip
-	     * @param {number} top
-	     * @param onResult callback function with the resulting TestInterfaces.TestPoint[]
-	     */
-	    getPoints(project: string, planId: number, suiteId: number, witFields: string, configurationId: string, testCaseId: string, testPointIds: string, includePointDetails: boolean, skip: number, top: number, onResult: (err: any, statusCode: number, Points: TestInterfaces.TestPoint[]) => void): void;
-	    /**
-	     * @param {TestInterfaces.PointUpdateModel} pointUpdateModel
-	     * @param {string} project - Project ID or project name
-	     * @param {number} planId
-	     * @param {number} suiteId
-	     * @param {string} pointIds
-	     * @param onResult callback function with the resulting TestInterfaces.TestPoint[]
-	     */
-	    updateTestPoints(pointUpdateModel: TestInterfaces.PointUpdateModel, project: string, planId: number, suiteId: number, pointIds: string, onResult: (err: any, statusCode: number, Point: TestInterfaces.TestPoint[]) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} runId
-	     * @param {number} testCaseResultId
-	     * @param {number} iterationId
-	     * @param {boolean} includeActionResults
-	     * @param onResult callback function with the resulting TestInterfaces.TestIterationDetailsModel
-	     */
-	    getTestIteration(project: string, runId: number, testCaseResultId: number, iterationId: number, includeActionResults: boolean, onResult: (err: any, statusCode: number, Result: TestInterfaces.TestIterationDetailsModel) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} runId
-	     * @param {number} testCaseResultId
-	     * @param {boolean} includeActionResults
-	     * @param onResult callback function with the resulting TestInterfaces.TestIterationDetailsModel[]
-	     */
-	    getTestIterations(project: string, runId: number, testCaseResultId: number, includeActionResults: boolean, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestIterationDetailsModel[]) => void): void;
-	    /**
-	     * @param {TestInterfaces.TestResultCreateModel[]} resultCreateModels
-	     * @param {string} project - Project ID or project name
-	     * @param {number} runId
-	     * @param onResult callback function with the resulting TestInterfaces.TestCaseResult[]
-	     */
-	    addTestResultsToTestRun(resultCreateModels: TestInterfaces.TestResultCreateModel[], project: string, runId: number, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestCaseResult[]) => void): void;
-	    /**
-	     * @param {TestInterfaces.TestCaseResultUpdateModel} resultUpdateModel
-	     * @param {string} project - Project ID or project name
-	     * @param {number} runId
-	     * @param {number[]} resultIds
-	     * @param onResult callback function with the resulting TestInterfaces.TestCaseResult[]
-	     */
-	    bulkUpdateTestResults(resultUpdateModel: TestInterfaces.TestCaseResultUpdateModel, project: string, runId: number, resultIds: number[], onResult: (err: any, statusCode: number, Result: TestInterfaces.TestCaseResult[]) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} runId
-	     * @param {number} testCaseResultId
-	     * @param {boolean} includeIterationDetails
-	     * @param onResult callback function with the resulting TestInterfaces.TestCaseResult
-	     */
-	    getTestCaseResultById(project: string, runId: number, testCaseResultId: number, includeIterationDetails: boolean, onResult: (err: any, statusCode: number, Result: TestInterfaces.TestCaseResult) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} runId
-	     * @param {boolean} includeIterationDetails
-	     * @param onResult callback function with the resulting TestInterfaces.TestCaseResult[]
-	     */
-	    getTestCaseResults(project: string, runId: number, includeIterationDetails: boolean, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestCaseResult[]) => void): void;
-	    /**
-	     * @param {TestInterfaces.TestCaseResultUpdateModel[]} resultUpdateModels
-	     * @param {string} project - Project ID or project name
-	     * @param {number} runId
-	     * @param onResult callback function with the resulting TestInterfaces.TestCaseResult[]
-	     */
-	    updateTestResults(resultUpdateModels: TestInterfaces.TestCaseResultUpdateModel[], project: string, runId: number, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestCaseResult[]) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} runId
-	     * @param {number} testCaseResultId
-	     * @param {number} iterationId
-	     * @param {string} actionPath
-	     * @param onResult callback function with the resulting TestInterfaces.TestActionResultModel[]
-	     */
-	    getActionResults(project: string, runId: number, testCaseResultId: number, iterationId: number, actionPath: string, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestActionResultModel[]) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} runId
-	     * @param {number} testCaseResultId
-	     * @param {number} iterationId
-	     * @param {string} paramName
-	     * @param onResult callback function with the resulting TestInterfaces.TestResultParameterModel[]
-	     */
-	    getResultParameters(project: string, runId: number, testCaseResultId: number, iterationId: number, paramName: string, onResult: (err: any, statusCode: number, Results: TestInterfaces.TestResultParameterModel[]) => void): void;
-	    /**
-	     * @param {TestInterfaces.QueryModel} query
-	     * @param {string} project - Project ID or project name
-	     * @param {boolean} includeResultDetails
-	     * @param {boolean} includeIterationDetails
-	     * @param {number} skip
-	     * @param {number} top
-	     * @param onResult callback function with the resulting TestInterfaces.TestCaseResult[]
-	     */
-	    getTestResultsByQuery(query: TestInterfaces.QueryModel, project: string, includeResultDetails: boolean, includeIterationDetails: boolean, skip: number, top: number, onResult: (err: any, statusCode: number, Result: TestInterfaces.TestCaseResult[]) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} runId
-	     * @param onResult callback function with the resulting TestInterfaces.TestRunStatistic
-	     */
-	    getTestRunStatistics(project: string, runId: number, onResult: (err: any, statusCode: number, Run: TestInterfaces.TestRunStatistic) => void): void;
-	    /**
-	     * @param {TestInterfaces.QueryModel} query
-	     * @param {string} project - Project ID or project name
-	     * @param {boolean} includeRunDetails
-	     * @param {number} skip
-	     * @param {number} top
-	     * @param onResult callback function with the resulting TestInterfaces.TestRun[]
-	     */
-	    getTestRunsByQuery(query: TestInterfaces.QueryModel, project: string, includeRunDetails: boolean, skip: number, top: number, onResult: (err: any, statusCode: number, Run: TestInterfaces.TestRun[]) => void): void;
-	    /**
-	     * @param {TestInterfaces.RunCreateModel} testRun
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting TestInterfaces.TestRun
-	     */
-	    createTestRun(testRun: TestInterfaces.RunCreateModel, project: string, onResult: (err: any, statusCode: number, Run: TestInterfaces.TestRun) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} runId
-	     * @param onResult callback function
-	     */
-	    deleteTestRun(project: string, runId: number, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} runId
-	     * @param onResult callback function with the resulting TestInterfaces.TestRun
-	     */
-	    getTestRunById(project: string, runId: number, onResult: (err: any, statusCode: number, Run: TestInterfaces.TestRun) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {string} buildUri
-	     * @param {string} owner
-	     * @param {string} tmiRunId
-	     * @param {number} planId
-	     * @param {boolean} includeRunDetails
-	     * @param {boolean} automated
-	     * @param {number} skip
-	     * @param {number} top
-	     * @param onResult callback function with the resulting TestInterfaces.TestRun[]
-	     */
-	    getTestRuns(project: string, buildUri: string, owner: string, tmiRunId: string, planId: number, includeRunDetails: boolean, automated: boolean, skip: number, top: number, onResult: (err: any, statusCode: number, Runs: TestInterfaces.TestRun[]) => void): void;
-	    /**
-	     * @param {TestInterfaces.RunUpdateModel} runUpdateModel
-	     * @param {string} project - Project ID or project name
-	     * @param {number} runId
-	     * @param onResult callback function with the resulting TestInterfaces.TestRun
-	     */
-	    updateTestRun(runUpdateModel: TestInterfaces.RunUpdateModel, project: string, runId: number, onResult: (err: any, statusCode: number, Run: TestInterfaces.TestRun) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} planId
-	     * @param {number} suiteId
-	     * @param {string} testCaseIds
-	     * @param onResult callback function with the resulting TestInterfaces.SuiteTestCase[]
-	     */
-	    addTestCasesToSuite(project: string, planId: number, suiteId: number, testCaseIds: string, onResult: (err: any, statusCode: number, Suites: TestInterfaces.SuiteTestCase[]) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} planId
-	     * @param {number} suiteId
-	     * @param {number} testCaseIds
-	     * @param onResult callback function with the resulting TestInterfaces.SuiteTestCase
-	     */
-	    getTestCaseById(project: string, planId: number, suiteId: number, testCaseIds: number, onResult: (err: any, statusCode: number, Suite: TestInterfaces.SuiteTestCase) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} planId
-	     * @param {number} suiteId
-	     * @param onResult callback function with the resulting TestInterfaces.SuiteTestCase[]
-	     */
-	    getTestCases(project: string, planId: number, suiteId: number, onResult: (err: any, statusCode: number, Suites: TestInterfaces.SuiteTestCase[]) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} planId
-	     * @param {number} suiteId
-	     * @param {string} testCaseIds
-	     * @param onResult callback function
-	     */
-	    removeTestCasesFromSuiteUrl(project: string, planId: number, suiteId: number, testCaseIds: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {TestInterfaces.SuiteCreateModel} testSuite
-	     * @param {string} project - Project ID or project name
-	     * @param {number} planId
-	     * @param {number} suiteId
-	     * @param onResult callback function with the resulting TestInterfaces.TestSuite[]
-	     */
-	    createTestSuite(testSuite: TestInterfaces.SuiteCreateModel, project: string, planId: number, suiteId: number, onResult: (err: any, statusCode: number, Suite: TestInterfaces.TestSuite[]) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} planId
-	     * @param {number} suiteId
-	     * @param onResult callback function
-	     */
-	    deleteTestSuite(project: string, planId: number, suiteId: number, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} planId
-	     * @param {number} suiteId
-	     * @param {boolean} includeChildSuites
-	     * @param onResult callback function with the resulting TestInterfaces.TestSuite
-	     */
-	    getTestSuiteById(project: string, planId: number, suiteId: number, includeChildSuites: boolean, onResult: (err: any, statusCode: number, Suite: TestInterfaces.TestSuite) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} planId
-	     * @param {boolean} includeSuites
-	     * @param {number} skip
-	     * @param {number} top
-	     * @param onResult callback function with the resulting TestInterfaces.TestSuite[]
-	     */
-	    getTestSuitesForPlan(project: string, planId: number, includeSuites: boolean, skip: number, top: number, onResult: (err: any, statusCode: number, Suites: TestInterfaces.TestSuite[]) => void): void;
-	    /**
-	     * @param {TestInterfaces.SuiteUpdateModel} suiteUpdateModel
-	     * @param {string} project - Project ID or project name
-	     * @param {number} planId
-	     * @param {number} suiteId
-	     * @param onResult callback function with the resulting TestInterfaces.TestSuite
-	     */
-	    updateTestSuite(suiteUpdateModel: TestInterfaces.SuiteUpdateModel, project: string, planId: number, suiteId: number, onResult: (err: any, statusCode: number, Suite: TestInterfaces.TestSuite) => void): void;
-	    /**
-	     * @param {number} testCaseId
-	     * @param onResult callback function with the resulting TestInterfaces.TestSuite[]
-	     */
-	    getSuitesByTestCaseId(testCaseId: number, onResult: (err: any, statusCode: number, Suites: TestInterfaces.TestSuite[]) => void): void;
-	    /**
-	     * @param {TestInterfaces.TestSettings} testSettings
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting number
-	     */
-	    createTestSettings(testSettings: TestInterfaces.TestSettings, project: string, onResult: (err: any, statusCode: number, TestSetting: number) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} testSettingsId
-	     * @param onResult callback function
-	     */
-	    deleteTestSettings(project: string, testSettingsId: number, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} testSettingsId
-	     * @param onResult callback function with the resulting TestInterfaces.TestSettings
-	     */
-	    getTestSettingsById(project: string, testSettingsId: number, onResult: (err: any, statusCode: number, TestSetting: TestInterfaces.TestSettings) => void): void;
-	}
-	export class QTestApi extends basem.QClientApiBase implements IQTestApi {
-	    api: TestApi;
-	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
-	    /**
-	    * @param {TestInterfaces.TestAttachmentRequestModel} attachmentRequestModel
-	    * @param {string} project - Project ID or project name
-	    * @param {number} runId
-	    * @param {number} testCaseResultId
-	    */
-	    createTestResultAttachment(attachmentRequestModel: TestInterfaces.TestAttachmentRequestModel, project: string, runId: number, testCaseResultId: number): Q.Promise<TestInterfaces.TestAttachmentReference>;
-	    /**
-	    * @param {TestInterfaces.TestAttachmentRequestModel} attachmentRequestModel
-	    * @param {string} project - Project ID or project name
-	    * @param {number} runId
-	    */
-	    createTestRunAttachment(attachmentRequestModel: TestInterfaces.TestAttachmentRequestModel, project: string, runId: number): Q.Promise<TestInterfaces.TestAttachmentReference>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {number} buildId
-	    * @param {number} flags
-	    */
-	    getBuildCodeCoverage(project: string, buildId: number, flags: number): Q.Promise<TestInterfaces.BuildCoverage[]>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {number} buildId
-	    * @param {number} deltaBuildId
-	    */
-	    getCodeCoverageSummary(project: string, buildId: number, deltaBuildId?: number): Q.Promise<TestInterfaces.CodeCoverageSummary>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {number} runId
-	    * @param {number} flags
-	    */
-	    getTestRunCodeCoverage(project: string, runId: number, flags: number): Q.Promise<TestInterfaces.TestRunCoverage[]>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {number} runId
-	    */
-	    getTestRunLogs(project: string, runId: number): Q.Promise<TestInterfaces.TestMessageLogDetails[]>;
-	    /**
-	    * @param {TestInterfaces.PlanUpdateModel} testPlan
-	    * @param {string} project - Project ID or project name
-	    */
-	    createTestPlan(testPlan: TestInterfaces.PlanUpdateModel, project: string): Q.Promise<TestInterfaces.TestPlan>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {number} planId
-	    */
-	    getPlanById(project: string, planId: number): Q.Promise<TestInterfaces.TestPlan>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {string} owner
-	    * @param {number} skip
-	    * @param {number} top
-	    * @param {boolean} includePlanDetails
-	    * @param {boolean} filterActivePlans
-	    */
-	    getPlans(project: string, owner?: string, skip?: number, top?: number, includePlanDetails?: boolean, filterActivePlans?: boolean): Q.Promise<TestInterfaces.TestPlan[]>;
-	    /**
-	    * @param {TestInterfaces.PlanUpdateModel} planUpdateModel
-	    * @param {string} project - Project ID or project name
-	    * @param {number} planId
-	    */
-	    updateTestPlan(planUpdateModel: TestInterfaces.PlanUpdateModel, project: string, planId: number): Q.Promise<TestInterfaces.TestPlan>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {number} planId
-	    * @param {number} suiteId
-	    * @param {number} pointIds
-	    * @param {string} witFields
-	    */
-	    getPoint(project: string, planId: number, suiteId: number, pointIds: number, witFields?: string): Q.Promise<TestInterfaces.TestPoint>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {number} planId
-	    * @param {number} suiteId
-	    * @param {string} witFields
-	    * @param {string} configurationId
-	    * @param {string} testCaseId
-	    * @param {string} testPointIds
-	    * @param {boolean} includePointDetails
-	    * @param {number} skip
-	    * @param {number} top
-	    */
-	    getPoints(project: string, planId: number, suiteId: number, witFields?: string, configurationId?: string, testCaseId?: string, testPointIds?: string, includePointDetails?: boolean, skip?: number, top?: number): Q.Promise<TestInterfaces.TestPoint[]>;
-	    /**
-	    * @param {TestInterfaces.PointUpdateModel} pointUpdateModel
-	    * @param {string} project - Project ID or project name
-	    * @param {number} planId
-	    * @param {number} suiteId
-	    * @param {string} pointIds
-	    */
-	    updateTestPoints(pointUpdateModel: TestInterfaces.PointUpdateModel, project: string, planId: number, suiteId: number, pointIds: string): Q.Promise<TestInterfaces.TestPoint[]>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {number} runId
-	    * @param {number} testCaseResultId
-	    * @param {number} iterationId
-	    * @param {boolean} includeActionResults
-	    */
-	    getTestIteration(project: string, runId: number, testCaseResultId: number, iterationId: number, includeActionResults?: boolean): Q.Promise<TestInterfaces.TestIterationDetailsModel>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {number} runId
-	    * @param {number} testCaseResultId
-	    * @param {boolean} includeActionResults
-	    */
-	    getTestIterations(project: string, runId: number, testCaseResultId: number, includeActionResults?: boolean): Q.Promise<TestInterfaces.TestIterationDetailsModel[]>;
-	    /**
-	    * @param {TestInterfaces.TestResultCreateModel[]} resultCreateModels
-	    * @param {string} project - Project ID or project name
-	    * @param {number} runId
-	    */
-	    addTestResultsToTestRun(resultCreateModels: TestInterfaces.TestResultCreateModel[], project: string, runId: number): Q.Promise<TestInterfaces.TestCaseResult[]>;
-	    /**
-	    * @param {TestInterfaces.TestCaseResultUpdateModel} resultUpdateModel
-	    * @param {string} project - Project ID or project name
-	    * @param {number} runId
-	    * @param {number[]} resultIds
-	    */
-	    bulkUpdateTestResults(resultUpdateModel: TestInterfaces.TestCaseResultUpdateModel, project: string, runId: number, resultIds: number[]): Q.Promise<TestInterfaces.TestCaseResult[]>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {number} runId
-	    * @param {number} testCaseResultId
-	    * @param {boolean} includeIterationDetails
-	    */
-	    getTestCaseResultById(project: string, runId: number, testCaseResultId: number, includeIterationDetails?: boolean): Q.Promise<TestInterfaces.TestCaseResult>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {number} runId
-	    * @param {boolean} includeIterationDetails
-	    */
-	    getTestCaseResults(project: string, runId: number, includeIterationDetails?: boolean): Q.Promise<TestInterfaces.TestCaseResult[]>;
-	    /**
-	    * @param {TestInterfaces.TestCaseResultUpdateModel[]} resultUpdateModels
-	    * @param {string} project - Project ID or project name
-	    * @param {number} runId
-	    */
-	    updateTestResults(resultUpdateModels: TestInterfaces.TestCaseResultUpdateModel[], project: string, runId: number): Q.Promise<TestInterfaces.TestCaseResult[]>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {number} runId
-	    * @param {number} testCaseResultId
-	    * @param {number} iterationId
-	    * @param {string} actionPath
-	    */
-	    getActionResults(project: string, runId: number, testCaseResultId: number, iterationId: number, actionPath?: string): Q.Promise<TestInterfaces.TestActionResultModel[]>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {number} runId
-	    * @param {number} testCaseResultId
-	    * @param {number} iterationId
-	    * @param {string} paramName
-	    */
-	    getResultParameters(project: string, runId: number, testCaseResultId: number, iterationId: number, paramName?: string): Q.Promise<TestInterfaces.TestResultParameterModel[]>;
-	    /**
-	    * @param {TestInterfaces.QueryModel} query
-	    * @param {string} project - Project ID or project name
-	    * @param {boolean} includeResultDetails
-	    * @param {boolean} includeIterationDetails
-	    * @param {number} skip
-	    * @param {number} top
-	    */
-	    getTestResultsByQuery(query: TestInterfaces.QueryModel, project: string, includeResultDetails?: boolean, includeIterationDetails?: boolean, skip?: number, top?: number): Q.Promise<TestInterfaces.TestCaseResult[]>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {number} runId
-	    */
-	    getTestRunStatistics(project: string, runId: number): Q.Promise<TestInterfaces.TestRunStatistic>;
-	    /**
-	    * @param {TestInterfaces.QueryModel} query
-	    * @param {string} project - Project ID or project name
-	    * @param {boolean} includeRunDetails
-	    * @param {number} skip
-	    * @param {number} top
-	    */
-	    getTestRunsByQuery(query: TestInterfaces.QueryModel, project: string, includeRunDetails?: boolean, skip?: number, top?: number): Q.Promise<TestInterfaces.TestRun[]>;
-	    /**
-	    * @param {TestInterfaces.RunCreateModel} testRun
-	    * @param {string} project - Project ID or project name
-	    */
-	    createTestRun(testRun: TestInterfaces.RunCreateModel, project: string): Q.Promise<TestInterfaces.TestRun>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {number} runId
-	    */
-	    getTestRunById(project: string, runId: number): Q.Promise<TestInterfaces.TestRun>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {string} buildUri
-	    * @param {string} owner
-	    * @param {string} tmiRunId
-	    * @param {number} planId
-	    * @param {boolean} includeRunDetails
-	    * @param {boolean} automated
-	    * @param {number} skip
-	    * @param {number} top
-	    */
-	    getTestRuns(project: string, buildUri?: string, owner?: string, tmiRunId?: string, planId?: number, includeRunDetails?: boolean, automated?: boolean, skip?: number, top?: number): Q.Promise<TestInterfaces.TestRun[]>;
-	    /**
-	    * @param {TestInterfaces.RunUpdateModel} runUpdateModel
-	    * @param {string} project - Project ID or project name
-	    * @param {number} runId
-	    */
-	    updateTestRun(runUpdateModel: TestInterfaces.RunUpdateModel, project: string, runId: number): Q.Promise<TestInterfaces.TestRun>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {number} planId
-	    * @param {number} suiteId
-	    * @param {string} testCaseIds
-	    */
-	    addTestCasesToSuite(project: string, planId: number, suiteId: number, testCaseIds: string): Q.Promise<TestInterfaces.SuiteTestCase[]>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {number} planId
-	    * @param {number} suiteId
-	    * @param {number} testCaseIds
-	    */
-	    getTestCaseById(project: string, planId: number, suiteId: number, testCaseIds: number): Q.Promise<TestInterfaces.SuiteTestCase>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {number} planId
-	    * @param {number} suiteId
-	    */
-	    getTestCases(project: string, planId: number, suiteId: number): Q.Promise<TestInterfaces.SuiteTestCase[]>;
-	    /**
-	    * @param {TestInterfaces.SuiteCreateModel} testSuite
-	    * @param {string} project - Project ID or project name
-	    * @param {number} planId
-	    * @param {number} suiteId
-	    */
-	    createTestSuite(testSuite: TestInterfaces.SuiteCreateModel, project: string, planId: number, suiteId: number): Q.Promise<TestInterfaces.TestSuite[]>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {number} planId
-	    * @param {number} suiteId
-	    * @param {boolean} includeChildSuites
-	    */
-	    getTestSuiteById(project: string, planId: number, suiteId: number, includeChildSuites?: boolean): Q.Promise<TestInterfaces.TestSuite>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {number} planId
-	    * @param {boolean} includeSuites
-	    * @param {number} skip
-	    * @param {number} top
-	    */
-	    getTestSuitesForPlan(project: string, planId: number, includeSuites?: boolean, skip?: number, top?: number): Q.Promise<TestInterfaces.TestSuite[]>;
-	    /**
-	    * @param {TestInterfaces.SuiteUpdateModel} suiteUpdateModel
-	    * @param {string} project - Project ID or project name
-	    * @param {number} planId
-	    * @param {number} suiteId
-	    */
-	    updateTestSuite(suiteUpdateModel: TestInterfaces.SuiteUpdateModel, project: string, planId: number, suiteId: number): Q.Promise<TestInterfaces.TestSuite>;
-	    /**
-	    * @param {number} testCaseId
-	    */
-	    getSuitesByTestCaseId(testCaseId: number): Q.Promise<TestInterfaces.TestSuite[]>;
-	    /**
-	    * @param {TestInterfaces.TestSettings} testSettings
-	    * @param {string} project - Project ID or project name
-	    */
-	    createTestSettings(testSettings: TestInterfaces.TestSettings, project: string): Q.Promise<number>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {number} testSettingsId
-	    */
-	    getTestSettingsById(project: string, testSettingsId: number): Q.Promise<TestInterfaces.TestSettings>;
-	}
-
-}
-declare module 'vso-node-api/interfaces/TfvcInterfaces' {
-	import TfsInterfaces = require('vso-node-api/interfaces/common/TfsInterfaces');
-	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
-	export interface AssociatedWorkItem {
-	    assignedTo: string;
-	    id: number;
-	    state: string;
-	    title: string;
-	    /**
-	     * REST url
-	     */
-	    url: string;
-	    webUrl: string;
-	    workItemType: string;
-	}
-	export interface Change<T> {
-	    changeType: VersionControlChangeType;
-	    item: T;
-	    newContent: ItemContent;
-	    sourceServerItem: string;
-	    url: string;
-	}
-	export interface ChangeCountDictionary {
-	}
-	export interface ChangeList<T> {
-	    allChangesIncluded: boolean;
-	    changeCounts: {
-	        [key: number]: number;
-	    };
-	    changes: Change<T>[];
-	    comment: string;
-	    commentTruncated: boolean;
-	    creationDate: Date;
-	    notes: CheckinNote[];
-	    owner: string;
-	    ownerDisplayName: string;
-	    ownerId: string;
-	    sortDate: Date;
-	    version: string;
-	}
-	/**
-	 * Criteria used in a search for change lists
-	 */
-	export interface ChangeListSearchCriteria {
-	    /**
-	     * If provided, a version descriptor to compare against base
-	     */
-	    compareVersion: string;
-	    /**
-	     * If true, don't include delete history entries
-	     */
-	    excludeDeletes: boolean;
-	    /**
-	     * Whether or not to follow renames for the given item being queried
-	     */
-	    followRenames: boolean;
-	    /**
-	     * If provided, only include history entries created after this date (string)
-	     */
-	    fromDate: string;
-	    /**
-	     * If provided, a version descriptor for the earliest change list to include
-	     */
-	    fromVersion: string;
-	    /**
-	     * Path of item to search under
-	     */
-	    itemPath: string;
-	    /**
-	     * Version of the items to search
-	     */
-	    itemVersion: string;
-	    /**
-	     * Number of results to skip (used when clicking more...)
-	     */
-	    skip: number;
-	    /**
-	     * If provided, only include history entries created before this date (string)
-	     */
-	    toDate: string;
-	    /**
-	     * If provided, the maximum number of history entries to return
-	     */
-	    top: number;
-	    /**
-	     * If provided, a version descriptor for the latest change list to include
-	     */
-	    toVersion: string;
-	    /**
-	     * Alias or display name of user who made the changes
-	     */
-	    user: string;
-	}
-	export interface CheckinNote {
-	    name: string;
-	    value: string;
-	}
-	export interface FileContentMetadata {
-	    contentType: string;
-	    encoding: number;
-	    extension: string;
-	    fileName: string;
-	    isBinary: boolean;
-	    isImage: boolean;
-	    vsLink: string;
-	}
-	export interface GitBaseVersionDescriptor extends GitVersionDescriptor {
-	    /**
-	     * Version string identifier (name of tag/branch, SHA1 of commit)
-	     */
-	    baseVersion: string;
-	    /**
-	     * Version options - Specify additional modifiers to version (e.g Previous)
-	     */
-	    baseVersionOptions: GitVersionOptions;
-	    /**
-	     * Version type (branch, tag, or commit). Determines how Id is interpreted
-	     */
-	    baseVersionType: GitVersionType;
-	}
-	export interface GitBlobRef {
-	    _links: any;
-	    /**
-	     * SHA1 hash of git object
-	     */
-	    objectId: string;
-	    /**
-	     * Size of blob content (in bytes)
-	     */
-	    size: number;
-	    url: string;
-	}
-	export interface GitBranchStats {
-	    aheadCount: number;
-	    behindCount: number;
-	    commit: GitCommitRef;
-	    isBaseVersion: boolean;
-	    name: string;
-	}
-	export interface GitChange extends Change<GitItem> {
-	}
-	export interface GitCommit extends GitCommitRef {
-	    push: GitPushRef;
-	    treeId: string;
-	}
-	export interface GitCommitChanges {
-	    changeCounts: ChangeCountDictionary;
-	    changes: GitChange[];
-	}
-	export interface GitCommitDiffs {
-	    aheadCount: number;
-	    allChangesIncluded: boolean;
-	    baseCommit: string;
-	    behindCount: number;
-	    changeCounts: {
-	        [key: number]: number;
-	    };
-	    changes: GitChange[];
-	    commonCommit: string;
-	    targetCommit: string;
-	}
-	export interface GitCommitRef {
-	    _links: any;
-	    author: GitUserDate;
-	    changeCounts: ChangeCountDictionary;
-	    changes: GitChange[];
-	    comment: string;
-	    commentTruncated: boolean;
-	    commitId: string;
-	    committer: GitUserDate;
-	    parents: string[];
-	    remoteUrl: string;
-	    url: string;
-	}
-	export interface GitCommitToCreate {
-	    baseRef: GitRef;
-	    comment: string;
-	    pathActions: GitPathAction[];
-	}
-	export interface GitHistoryQueryResults extends HistoryQueryResults<GitItem> {
-	    /**
-	     * Seed commit used for querying history.  Used for skip feature.
-	     */
-	    startingCommitId: string;
-	    unpopulatedCount: number;
-	    unprocessedCount: number;
-	}
-	export interface GitItem extends ItemModel {
-	    /**
-	     * SHA1 of commit item was fetched at
-	     */
-	    commitId: string;
-	    /**
-	     * Type of object (Commit, Tree, Blob, Tag, ...)
-	     */
-	    gitObjectType: GitObjectType;
-	    /**
-	     * Shallow ref to commit that last changed this item Only populated if latestProcessedChange is requested May not be accurate if latest change is not yet cached
-	     */
-	    latestProcessedChange: GitCommitRef;
-	    /**
-	     * Git object id
-	     */
-	    objectId: string;
-	    /**
-	     * Git object id
-	     */
-	    originalObjectId: string;
-	}
-	export interface GitItemDescriptor {
-	    /**
-	     * Path to item
-	     */
-	    path: string;
-	    /**
-	     * Specifies whether to include children (OneLevel), all descendants (Full), or None
-	     */
-	    recursionLevel: VersionControlRecursionType;
-	    /**
-	     * Version string (interpretation based on VersionType defined in subclass
-	     */
-	    version: string;
-	    /**
-	     * Version modifiers (e.g. previous)
-	     */
-	    versionOptions: GitVersionOptions;
-	    /**
-	     * How to interpret version (branch,tag,commit)
-	     */
-	    versionType: GitVersionType;
-	}
-	export interface GitItemRequestData {
-	    /**
-	     * Whether to include metadata for all items
-	     */
-	    includeContentMetadata: boolean;
-	    /**
-	     * Whether to include the _links field on the shallow references
-	     */
-	    includeLinks: boolean;
-	    /**
-	     * Collection of items to fetch, including path, version, and recursion level
-	     */
-	    itemDescriptors: GitItemDescriptor[];
-	    /**
-	     * Whether to include shallow ref to commit that last changed each item
-	     */
-	    latestProcessedChange: boolean;
-	}
-	/**
-	 * Encapsulates the reference metadata of a Git media object.
-	 */
-	export interface GitMediaObjectRef {
-	    /**
-	     * Gets or sets the reference links of the Git media object.
-	     */
-	    _links: any;
-	    /**
-	     * Gets or sets the Git media object identifier. This Id property duplicates the Oid property, but is required by the VSO REST specification.
-	     */
-	    id: string;
-	    /**
-	     * Gets or sets the Git media object identifier. This property exists for adherence to the GitHub Git Media contract.
-	     */
-	    oid: string;
-	    /**
-	     * Gets or sets the size of the Git media object in bytes. This property exists for adherence to the GitHub Git Media contract.
-	     */
-	    size: number;
-	    /**
-	     * Gets or sets the URL for the Git media object.
-	     */
-	    url: string;
-	}
-	export enum GitObjectType {
-	    Bad = 0,
-	    Commit = 1,
-	    Tree = 2,
-	    Blob = 3,
-	    Tag = 4,
-	    Ext2 = 5,
-	    OfsDelta = 6,
-	    RefDelta = 7,
-	}
-	export interface GitPathAction {
-	    action: GitPathActions;
-	    base64Content: string;
-	    path: string;
-	    rawTextContent: string;
-	    targetPath: string;
-	}
-	export enum GitPathActions {
-	    None = 0,
-	    Edit = 1,
-	    Delete = 2,
-	    Add = 3,
-	    Rename = 4,
-	}
-	export interface GitPullRequest {
-	    _links: any;
-	    closedDate: Date;
-	    codeReviewId: number;
-	    createdBy: VSSInterfaces.IdentityRef;
-	    creationDate: Date;
-	    description: string;
-	    lastMergeCommit: GitCommitRef;
-	    lastMergeSourceCommit: GitCommitRef;
-	    lastMergeTargetCommit: GitCommitRef;
-	    mergeId: string;
-	    mergeStatus: PullRequestAsyncStatus;
-	    pullRequestId: number;
-	    remoteUrl: string;
-	    repository: GitRepository;
-	    reviewers: IdentityRefWithVote[];
-	    sourceRefName: string;
-	    status: PullRequestStatus;
-	    targetRefName: string;
-	    title: string;
-	    upgraded: boolean;
-	    url: string;
-	}
-	export interface GitPullRequestSearchCriteria {
-	    creatorId: string;
-	    /**
-	     * Whether to include the _links field on the shallow references
-	     */
-	    includeLinks: boolean;
-	    repositoryId: string;
-	    reviewerId: string;
-	    sourceRefName: string;
-	    status: PullRequestStatus;
-	    targetRefName: string;
-	}
-	export interface GitPush extends GitPushRef {
-	    commits: GitCommitRef[];
-	    refUpdates: GitRefUpdate[];
-	    repository: GitRepository;
-	}
-	export interface GitPushEventData {
-	    afterId: string;
-	    beforeId: string;
-	    branch: string;
-	    commits: GitCommit[];
-	    repository: GitRepository;
-	}
-	export interface GitPushRef {
-	    _links: any;
-	    date: Date;
-	    pushCorrelationId: string;
-	    pushedBy: VSSInterfaces.IdentityRef;
-	    pushId: number;
-	    url: string;
-	}
-	export interface GitPushSearchCriteria {
-	    fromDate: Date;
-	    /**
-	     * Whether to include the _links field on the shallow references
-	     */
-	    includeLinks: boolean;
-	    includeRefUpdates: boolean;
-	    pusherId: string;
-	    refName: string;
-	    toDate: Date;
-	}
-	export interface GitQueryCommitsCriteria {
-	    /**
-	     * Number of entries to skip
-	     */
-	    $skip: number;
-	    /**
-	     * Maximum number of entries to retrieve
-	     */
-	    $top: number;
-	    /**
-	     * Alias or display name of the author
-	     */
-	    author: string;
-	    /**
-	     * If provided, the earliest commit in the graph to search
-	     */
-	    compareVersion: GitVersionDescriptor;
-	    /**
-	     * If true, don't include delete history entries
-	     */
-	    excludeDeletes: boolean;
-	    /**
-	     * If provided, a lower bound for filtering commits alphabetically
-	     */
-	    fromCommitId: string;
-	    /**
-	     * If provided, only include history entries created after this date (string)
-	     */
-	    fromDate: string;
-	    /**
-	     * If provided, specifies the exact commit ids of the commits to fetch. May not be combined with other parameters.
-	     */
-	    ids: string[];
-	    /**
-	     * Whether to include the _links field on the shallow references
-	     */
-	    includeLinks: boolean;
-	    /**
-	     * Path of item to search under
-	     */
-	    itemPath: string;
-	    /**
-	     * If provided, identifies the commit or branch to search
-	     */
-	    itemVersion: GitVersionDescriptor;
-	    /**
-	     * If provided, an upper bound for filtering commits alphabetically
-	     */
-	    toCommitId: string;
-	    /**
-	     * If provided, only include history entries created before this date (string)
-	     */
-	    toDate: string;
-	    /**
-	     * Alias or display name of the committer
-	     */
-	    user: string;
-	}
-	export interface GitRef {
-	    _links: any;
-	    isLockedBy: VSSInterfaces.IdentityRef;
-	    name: string;
-	    objectId: string;
-	    url: string;
-	}
-	export interface GitRefUpdate {
-	    name: string;
-	    newObjectId: string;
-	    oldObjectId: string;
-	    repositoryId: string;
-	}
-	export enum GitRefUpdateMode {
-	    /**
-	     * Indicates the Git protocol model where any refs that can be updated will be updated, but any failures will not prevent other updates from succeeding.
-	     */
-	    BestEffort = 0,
-	    /**
-	     * Indicates that all ref updates must succeed or none will succeed. All ref updates will be atomically written. If any failure is encountered, previously successful updates will be rolled back and the entire operation will fail.
-	     */
-	    AllOrNone = 1,
-	}
-	export interface GitRefUpdateResult {
-	    /**
-	     * Custom message for the result object For instance, Reason for failing.
-	     */
-	    customMessage: string;
-	    /**
-	     * Ref name
-	     */
-	    name: string;
-	    /**
-	     * New object ID
-	     */
-	    newObjectId: string;
-	    /**
-	     * Old object ID
-	     */
-	    oldObjectId: string;
-	    /**
-	     * Name of the plugin that rejected the updated.
-	     */
-	    rejectedBy: string;
-	    /**
-	     * Repository ID
-	     */
-	    repositoryId: string;
-	    /**
-	     * True if the ref update succeeded, false otherwise
-	     */
-	    success: boolean;
-	    /**
-	     * Status of the update from the TFS server.
-	     */
-	    updateStatus: GitRefUpdateStatus;
-	}
-	export interface GitRefUpdateResultSet {
-	    countFailed: number;
-	    countSucceeded: number;
-	    pushCorrelationId: string;
-	    pushIds: {
-	        [key: number]: number;
-	    };
-	    pushTime: Date;
-	    results: GitRefUpdateResult[];
-	}
-	export enum GitRefUpdateStatus {
-	    /**
-	     * Indicates that the ref update request was completed successfully.
-	     */
-	    Succeeded = 0,
-	    /**
-	     * Indicates that the ref update request could not be completed because part of the graph would be disconnected by this change, and the caller does not have ForcePush permission on the repository.
-	     */
-	    ForcePushRequired = 1,
-	    /**
-	     * Indicates that the ref update request could not be completed because the old object ID presented in the request was not the object ID of the ref when the database attempted the update. The most likely scenario is that the caller lost a race to update the ref.
-	     */
-	    StaleOldObjectId = 2,
-	    /**
-	     * Indicates that the ref update request could not be completed because the ref name presented in the request was not valid.
-	     */
-	    InvalidRefName = 3,
-	    /**
-	     * The request was not processed
-	     */
-	    Unprocessed = 4,
-	    /**
-	     * The ref update request could not be completed because the new object ID for the ref could not be resolved to a commit object (potentially through any number of tags)
-	     */
-	    UnresolvableToCommit = 5,
-	    /**
-	     * The ref update request could not be completed because the user lacks write permissions required to write this ref
-	     */
-	    WritePermissionRequired = 6,
-	    /**
-	     * The ref update request could not be completed because the user lacks note creation permissions required to write this note
-	     */
-	    ManageNotePermissionRequired = 7,
-	    /**
-	     * The ref update request could not be completed because the user lacks the permission to create a branch
-	     */
-	    CreateBranchPermissionRequired = 8,
-	    /**
-	     * The ref update request could not be completed because the user lacks the permission to create a tag
-	     */
-	    CreateTagPermissionRequired = 9,
-	    /**
-	     * The ref update could not be completed because it was rejected by the plugin.
-	     */
-	    RejectedByPlugin = 10,
-	    /**
-	     * The ref update could not be completed because the ref is locked by another user.
-	     */
-	    Locked = 11,
-	    /**
-	     * The ref update could not be completed because, in case-insensitive mode, the ref name conflicts with an existing, differently-cased ref name.
-	     */
-	    RefNameConflict = 12,
-	    /**
-	     * The ref update could not be completed because it was rejected by policy.
-	     */
-	    RejectedByPolicy = 13,
-	    /**
-	     * Indicates that the ref update request was completed successfully, but the ref doesn't actually exist so no changes were made.  This should only happen during deletes.
-	     */
-	    SucceededNonExistentRef = 14,
-	    /**
-	     * Indicates that the ref update request was completed successfully, but the passed-in ref was corrupt - as in, the old object ID was bad.  This should only happen during deletes.
-	     */
-	    SucceededCorruptRef = 15,
-	}
-	export interface GitRepository {
-	    _links: any;
-	    defaultBranch: string;
-	    id: string;
-	    name: string;
-	    project: TfsInterfaces.TeamProjectReference;
-	    remoteUrl: string;
-	    url: string;
-	}
-	export enum GitRepositoryPermissions {
-	    None = 0,
-	    Administer = 1,
-	    GenericRead = 2,
-	    GenericContribute = 4,
-	    ForcePush = 8,
-	    CreateBranch = 16,
-	    CreateTag = 32,
-	    ManageNote = 64,
-	    PolicyExempt = 128,
-	    /**
-	     * This defines the set of bits that are valid for the git permission space. When reading or writing git permissions, these are the only bits paid attention too.
-	     */
-	    All = 255,
-	    BranchLevelPermissions = 141,
-	}
-	export interface GitTargetVersionDescriptor extends GitVersionDescriptor {
-	    /**
-	     * Version string identifier (name of tag/branch, SHA1 of commit)
-	     */
-	    targetVersion: string;
-	    /**
-	     * Version options - Specify additional modifiers to version (e.g Previous)
-	     */
-	    targetVersionOptions: GitVersionOptions;
-	    /**
-	     * Version type (branch, tag, or commit). Determines how Id is interpreted
-	     */
-	    targetVersionType: GitVersionType;
-	}
-	export interface GitTreeEntryRef {
-	    /**
-	     * Blob or tree
-	     */
-	    gitObjectType: GitObjectType;
-	    /**
-	     * Mode represented as octal string
-	     */
-	    mode: string;
-	    /**
-	     * SHA1 hash of git object
-	     */
-	    objectId: string;
-	    /**
-	     * Path relative to parent tree object
-	     */
-	    relativePath: string;
-	    /**
-	     * Size of content
-	     */
-	    size: number;
-	    /**
-	     * url to retrieve tree or blob
-	     */
-	    url: string;
-	}
-	export interface GitTreeRef {
-	    _links: any;
-	    /**
-	     * SHA1 hash of git object
-	     */
-	    objectId: string;
-	    /**
-	     * Sum of sizes of all children
-	     */
-	    size: number;
-	    /**
-	     * Blobs and trees under this tree
-	     */
-	    treeEntries: GitTreeEntryRef[];
-	    /**
-	     * Url to tree
-	     */
-	    url: string;
-	}
-	export interface GitUserDate {
-	    date: Date;
-	    email: string;
-	    name: string;
-	}
-	export interface GitVersionDescriptor {
-	    /**
-	     * Version string identifier (name of tag/branch/index, SHA1 of commit)
-	     */
-	    version: string;
-	    /**
-	     * Version options - Specify additional modifiers to version (e.g Previous)
-	     */
-	    versionOptions: GitVersionOptions;
-	    /**
-	     * Version type (branch, tag, commit, or index). Determines how Id is interpreted
-	     */
-	    versionType: GitVersionType;
-	}
-	export enum GitVersionOptions {
-	    /**
-	     * Not specified
-	     */
-	    None = 0,
-	    /**
-	     * Commit that changed item prior to the current version
-	     */
-	    PreviousChange = 1,
-	    /**
-	     * First parent of commit (HEAD^)
-	     */
-	    FirstParent = 2,
-	}
-	export enum GitVersionType {
-	    /**
-	     * Interpret the version as a branch name
-	     */
-	    Branch = 0,
-	    /**
-	     * Interpret the version as a tag name
-	     */
-	    Tag = 1,
-	    /**
-	     * Interpret the version as a commit ID (SHA1)
-	     */
-	    Commit = 2,
-	    /**
-	     * Interpret the version as an index name
-	     */
-	    Index = 3,
-	}
-	export interface HistoryEntry<T> {
-	    /**
-	     * The Change list (changeset/commit/shelveset) for this point in history
-	     */
-	    changeList: ChangeList<T>;
-	    /**
-	     * The change made to the item from this change list (only relevant for File history, not folders)
-	     */
-	    itemChangeType: VersionControlChangeType;
-	    /**
-	     * The path of the item at this point in history (only relevant for File history, not folders)
-	     */
-	    serverItem: string;
-	}
-	export interface HistoryQueryResults<T> {
-	    /**
-	     * True if there are more results available to fetch (we're returning the max # of items requested) A more RESTy solution would be to include a Link header
-	     */
-	    moreResultsAvailable: boolean;
-	    /**
-	     * The history entries (results) from this query
-	     */
-	    results: HistoryEntry<T>[];
-	}
-	export interface IdentityRefWithVote extends VSSInterfaces.IdentityRef {
-	    isRequired: boolean;
-	    reviewerUrl: string;
-	    vote: number;
-	    votedFor: IdentityRefWithVote[];
-	}
-	export interface IncludedGitCommit {
-	    commitId: string;
-	    commitTime: Date;
-	    parentCommitIds: string[];
-	    repositoryId: string;
-	}
-	export interface ItemContent {
-	    content: string;
-	    contentType: ItemContentType;
-	}
-	export enum ItemContentType {
-	    RawText = 0,
-	    Base64Encoded = 1,
-	}
-	/**
-	 * Optional details to include when returning an item model
-	 */
-	export interface ItemDetailsOptions {
-	    /**
-	     * If true, include metadata about the file type
-	     */
-	    includeContentMetadata: boolean;
-	    /**
-	     * Specifies whether to include children (OneLevel), all descendants (Full) or None for folder items
-	     */
-	    recursionLevel: VersionControlRecursionType;
-	}
-	export interface ItemModel {
-	    _links: any;
-	    contentMetadata: FileContentMetadata;
-	    isFolder: boolean;
-	    isSymLink: boolean;
-	    path: string;
-	    url: string;
-	}
-	export enum PullRequestAsyncStatus {
-	    NotSet = 0,
-	    Queued = 1,
-	    Conflicts = 2,
-	    Succeeded = 3,
-	    RejectedByPolicy = 4,
-	    Failure = 5,
-	}
-	export enum PullRequestStatus {
-	    NotSet = 0,
-	    Active = 1,
-	    Abandoned = 2,
-	    Completed = 3,
-	}
-	export interface TfvcBranch extends TfvcBranchRef {
-	    children: TfvcBranch[];
-	    mappings: TfvcBranchMapping[];
-	    parent: TfvcShallowBranchRef;
-	    relatedBranches: TfvcShallowBranchRef[];
-	}
-	export interface TfvcBranchMapping {
-	    depth: string;
-	    serverItem: string;
-	    type: string;
-	}
-	export interface TfvcBranchRef extends TfvcShallowBranchRef {
-	    _links: any;
-	    createdDate: Date;
-	    description: string;
-	    isDeleted: boolean;
-	    owner: VSSInterfaces.IdentityRef;
-	    url: string;
-	}
-	export interface TfvcChange extends Change<TfvcItem> {
-	    /**
-	     * List of merge sources in case of rename or branch creation.
-	     */
-	    mergeSources: TfvcMergeSource[];
-	    /**
-	     * Version at which a (shelved) change was pended against
-	     */
-	    pendingVersion: number;
-	}
-	export interface TfvcChangeset extends TfvcChangesetRef {
-	    accountId: string;
-	    changes: TfvcChange[];
-	    checkinNotes: CheckinNote[];
-	    collectionId: string;
-	    hasMoreChanges: boolean;
-	    policyOverride: TfvcPolicyOverrideInfo;
-	    workItems: AssociatedWorkItem[];
-	}
-	export interface TfvcChangesetRef {
-	    _links: any;
-	    author: VSSInterfaces.IdentityRef;
-	    changesetId: number;
-	    checkedInBy: VSSInterfaces.IdentityRef;
-	    comment: string;
-	    commentTruncated: boolean;
-	    createdDate: Date;
-	    url: string;
-	}
-	/**
-	 * Criteria used in a search for change lists
-	 */
-	export interface TfvcChangesetSearchCriteria {
-	    /**
-	     * Alias or display name of user who made the changes
-	     */
-	    author: string;
-	    /**
-	     * Whether or not to follow renames for the given item being queried
-	     */
-	    followRenames: boolean;
-	    /**
-	     * If provided, only include changesets created after this date (string) Think of a better name for this.
-	     */
-	    fromDate: string;
-	    /**
-	     * If provided, only include changesets after this changesetID
-	     */
-	    fromId: number;
-	    /**
-	     * Whether to include the _links field on the shallow references
-	     */
-	    includeLinks: boolean;
-	    /**
-	     * Path of item to search under
-	     */
-	    path: string;
-	    /**
-	     * If provided, only include changesets created before this date (string) Think of a better name for this.
-	     */
-	    toDate: string;
-	    /**
-	     * If provided, a version descriptor for the latest change list to include
-	     */
-	    toId: number;
-	}
-	export interface TfvcChangesetsRequestData {
-	    changesetIds: number[];
-	    commentLength: number;
-	    /**
-	     * Whether to include the _links field on the shallow references
-	     */
-	    includeLinks: boolean;
-	}
-	export interface TfvcCheckinEventData {
-	    changeset: TfvcChangeset;
-	    project: TfsInterfaces.TeamProjectReference;
-	}
-	export interface TfvcHistoryEntry extends HistoryEntry<TfvcItem> {
-	    /**
-	     * The encoding of the item at this point in history (only relevant for File history, not folders)
-	     */
-	    encoding: number;
-	    /**
-	     * The file id of the item at this point in history (only relevant for File history, not folders)
-	     */
-	    fileId: number;
-	}
-	export interface TfvcItem extends ItemModel {
-	    changeDate: Date;
-	    deletionId: number;
-	    isBranch: boolean;
-	    isPendingChange: boolean;
-	    version: number;
-	}
-	/**
-	 * Item path and Version descriptor properties
-	 */
-	export interface TfvcItemDescriptor {
-	    path: string;
-	    recursionLevel: VersionControlRecursionType;
-	    version: string;
-	    versionOption: TfvcVersionOption;
-	    versionType: TfvcVersionType;
-	}
-	export interface TfvcItemRequestData {
-	    /**
-	     * If true, include metadata about the file type
-	     */
-	    includeContentMetadata: boolean;
-	    /**
-	     * Whether to include the _links field on the shallow references
-	     */
-	    includeLinks: boolean;
-	    itemDescriptors: TfvcItemDescriptor[];
-	}
-	export interface TfvcLabel extends TfvcLabelRef {
-	    items: TfvcItem[];
-	}
-	export interface TfvcLabelRef {
-	    _links: any;
-	    description: string;
-	    id: number;
-	    labelScope: string;
-	    modifiedDate: Date;
-	    name: string;
-	    owner: VSSInterfaces.IdentityRef;
-	    url: string;
-	}
-	export interface TfvcLabelRequestData {
-	    /**
-	     * Whether to include the _links field on the shallow references
-	     */
-	    includeLinks: boolean;
-	    itemLabelFilter: string;
-	    labelScope: string;
-	    maxItemCount: number;
-	    name: string;
-	    owner: string;
-	}
-	export interface TfvcMergeSource {
-	    /**
-	     * Indicates if this a rename source. If false, it is a merge source.
-	     */
-	    isRename: boolean;
-	    /**
-	     * The server item of the merge source
-	     */
-	    serverItem: string;
-	    /**
-	     * Start of the version range
-	     */
-	    versionFrom: number;
-	    /**
-	     * End of the version range
-	     */
-	    versionTo: number;
-	}
-	export interface TfvcPolicyFailureInfo {
-	    message: string;
-	    policyName: string;
-	}
-	export interface TfvcPolicyOverrideInfo {
-	    comment: string;
-	    policyFailures: TfvcPolicyFailureInfo[];
-	}
-	export interface TfvcShallowBranchRef {
-	    path: string;
-	}
-	export interface TfvcShelveset extends TfvcShelvesetRef {
-	    changes: TfvcChange[];
-	    notes: CheckinNote[];
-	    policyOverride: TfvcPolicyOverrideInfo;
-	    workItems: AssociatedWorkItem[];
-	}
-	export interface TfvcShelvesetRef {
-	    _links: any;
-	    comment: string;
-	    commentTruncated: boolean;
-	    createdDate: Date;
-	    id: string;
-	    name: string;
-	    owner: VSSInterfaces.IdentityRef;
-	    url: string;
-	}
-	export interface TfvcShelvesetRequestData {
-	    /**
-	     * Whether to include policyOverride and notes
-	     */
-	    includeDetails: boolean;
-	    /**
-	     * Whether to include the _links field on the shallow references
-	     */
-	    includeLinks: boolean;
-	    /**
-	     * Whether to include workItems
-	     */
-	    includeWorkItems: boolean;
-	    /**
-	     * Max number of changes to include
-	     */
-	    maxChangeCount: number;
-	    /**
-	     * Max length of comment
-	     */
-	    maxCommentLength: number;
-	    /**
-	     * Shelveset's name
-	     */
-	    name: string;
-	    /**
-	     * Owner's ID. Could be a name or a guid.
-	     */
-	    owner: string;
-	}
-	export interface TfvcVersionDescriptor {
-	    version: string;
-	    versionOption: TfvcVersionOption;
-	    versionType: TfvcVersionType;
-	}
-	export enum TfvcVersionOption {
-	    None = 0,
-	    Previous = 1,
-	    UseRename = 2,
-	}
-	export enum TfvcVersionType {
-	    None = 0,
-	    Changeset = 1,
-	    Shelveset = 2,
-	    Change = 3,
-	    Date = 4,
-	    Latest = 5,
-	    Tip = 6,
-	    MergeSource = 7,
-	}
-	export interface UpdateRefsRequest {
-	    refUpdateRequests: GitRefUpdate[];
-	    updateMode: GitRefUpdateMode;
-	}
-	export enum VersionControlChangeType {
-	    None = 0,
-	    Add = 1,
-	    Edit = 2,
-	    Encoding = 4,
-	    Rename = 8,
-	    Delete = 16,
-	    Undelete = 32,
-	    Branch = 64,
-	    Merge = 128,
-	    Lock = 256,
-	    Rollback = 512,
-	    SourceRename = 1024,
-	    TargetRename = 2048,
-	    Property = 4096,
-	    All = 8191,
-	}
-	export interface VersionControlProjectInfo {
-	    project: TfsInterfaces.TeamProjectReference;
-	    supportsGit: boolean;
-	    supportsTFVC: boolean;
-	}
-	export enum VersionControlRecursionType {
-	    None = 0,
-	    OneLevel = 1,
-	    Full = 120,
-	}
-	export var TypeInfo: {
-	    AssociatedWorkItem: {
-	        fields: any;
-	    };
-	    Change: {
-	        fields: any;
-	    };
-	    ChangeCountDictionary: {
-	        fields: any;
-	    };
-	    ChangeList: {
-	        fields: any;
-	    };
-	    ChangeListSearchCriteria: {
-	        fields: any;
-	    };
-	    CheckinNote: {
-	        fields: any;
-	    };
-	    FileContentMetadata: {
-	        fields: any;
-	    };
-	    GitBaseVersionDescriptor: {
-	        fields: any;
-	    };
-	    GitBlobRef: {
-	        fields: any;
-	    };
-	    GitBranchStats: {
-	        fields: any;
-	    };
-	    GitChange: {
-	        fields: any;
-	    };
-	    GitCommit: {
-	        fields: any;
-	    };
-	    GitCommitChanges: {
-	        fields: any;
-	    };
-	    GitCommitDiffs: {
-	        fields: any;
-	    };
-	    GitCommitRef: {
-	        fields: any;
-	    };
-	    GitCommitToCreate: {
-	        fields: any;
-	    };
-	    GitHistoryQueryResults: {
-	        fields: any;
-	    };
-	    GitItem: {
-	        fields: any;
-	    };
-	    GitItemDescriptor: {
-	        fields: any;
-	    };
-	    GitItemRequestData: {
-	        fields: any;
-	    };
-	    GitMediaObjectRef: {
-	        fields: any;
-	    };
-	    GitObjectType: {
-	        enumValues: {
-	            "bad": number;
-	            "commit": number;
-	            "tree": number;
-	            "blob": number;
-	            "tag": number;
-	            "ext2": number;
-	            "ofsDelta": number;
-	            "refDelta": number;
-	        };
-	    };
-	    GitPathAction: {
-	        fields: any;
-	    };
-	    GitPathActions: {
-	        enumValues: {
-	            "none": number;
-	            "edit": number;
-	            "delete": number;
-	            "add": number;
-	            "rename": number;
-	        };
-	    };
-	    GitPullRequest: {
-	        fields: any;
-	    };
-	    GitPullRequestSearchCriteria: {
-	        fields: any;
-	    };
-	    GitPush: {
-	        fields: any;
-	    };
-	    GitPushEventData: {
-	        fields: any;
-	    };
-	    GitPushRef: {
-	        fields: any;
-	    };
-	    GitPushSearchCriteria: {
-	        fields: any;
-	    };
-	    GitQueryCommitsCriteria: {
-	        fields: any;
-	    };
-	    GitRef: {
-	        fields: any;
-	    };
-	    GitRefUpdate: {
-	        fields: any;
-	    };
-	    GitRefUpdateMode: {
-	        enumValues: {
-	            "bestEffort": number;
-	            "allOrNone": number;
-	        };
-	    };
-	    GitRefUpdateResult: {
-	        fields: any;
-	    };
-	    GitRefUpdateResultSet: {
-	        fields: any;
-	    };
-	    GitRefUpdateStatus: {
-	        enumValues: {
-	            "succeeded": number;
-	            "forcePushRequired": number;
-	            "staleOldObjectId": number;
-	            "invalidRefName": number;
-	            "unprocessed": number;
-	            "unresolvableToCommit": number;
-	            "writePermissionRequired": number;
-	            "manageNotePermissionRequired": number;
-	            "createBranchPermissionRequired": number;
-	            "createTagPermissionRequired": number;
-	            "rejectedByPlugin": number;
-	            "locked": number;
-	            "refNameConflict": number;
-	            "rejectedByPolicy": number;
-	            "succeededNonExistentRef": number;
-	            "succeededCorruptRef": number;
-	        };
-	    };
-	    GitRepository: {
-	        fields: any;
-	    };
-	    GitRepositoryPermissions: {
-	        enumValues: {
-	            "none": number;
-	            "administer": number;
-	            "genericRead": number;
-	            "genericContribute": number;
-	            "forcePush": number;
-	            "createBranch": number;
-	            "createTag": number;
-	            "manageNote": number;
-	            "policyExempt": number;
-	            "all": number;
-	            "branchLevelPermissions": number;
-	        };
-	    };
-	    GitTargetVersionDescriptor: {
-	        fields: any;
-	    };
-	    GitTreeEntryRef: {
-	        fields: any;
-	    };
-	    GitTreeRef: {
-	        fields: any;
-	    };
-	    GitUserDate: {
-	        fields: any;
-	    };
-	    GitVersionDescriptor: {
-	        fields: any;
-	    };
-	    GitVersionOptions: {
-	        enumValues: {
-	            "none": number;
-	            "previousChange": number;
-	            "firstParent": number;
-	        };
-	    };
-	    GitVersionType: {
-	        enumValues: {
-	            "branch": number;
-	            "tag": number;
-	            "commit": number;
-	            "index": number;
-	        };
-	    };
-	    HistoryEntry: {
-	        fields: any;
-	    };
-	    HistoryQueryResults: {
-	        fields: any;
-	    };
-	    IdentityRefWithVote: {
-	        fields: any;
-	    };
-	    IncludedGitCommit: {
-	        fields: any;
-	    };
-	    ItemContent: {
-	        fields: any;
-	    };
-	    ItemContentType: {
-	        enumValues: {
-	            "rawText": number;
-	            "base64Encoded": number;
-	        };
-	    };
-	    ItemDetailsOptions: {
-	        fields: any;
-	    };
-	    ItemModel: {
-	        fields: any;
-	    };
-	    PullRequestAsyncStatus: {
-	        enumValues: {
-	            "notSet": number;
-	            "queued": number;
-	            "conflicts": number;
-	            "succeeded": number;
-	            "rejectedByPolicy": number;
-	            "failure": number;
-	        };
-	    };
-	    PullRequestStatus: {
-	        enumValues: {
-	            "notSet": number;
-	            "active": number;
-	            "abandoned": number;
-	            "completed": number;
-	        };
-	    };
-	    TfvcBranch: {
-	        fields: any;
-	    };
-	    TfvcBranchMapping: {
-	        fields: any;
-	    };
-	    TfvcBranchRef: {
-	        fields: any;
-	    };
-	    TfvcChange: {
-	        fields: any;
-	    };
-	    TfvcChangeset: {
-	        fields: any;
-	    };
-	    TfvcChangesetRef: {
-	        fields: any;
-	    };
-	    TfvcChangesetSearchCriteria: {
-	        fields: any;
-	    };
-	    TfvcChangesetsRequestData: {
-	        fields: any;
-	    };
-	    TfvcCheckinEventData: {
-	        fields: any;
-	    };
-	    TfvcHistoryEntry: {
-	        fields: any;
-	    };
-	    TfvcItem: {
-	        fields: any;
-	    };
-	    TfvcItemDescriptor: {
-	        fields: any;
-	    };
-	    TfvcItemRequestData: {
-	        fields: any;
-	    };
-	    TfvcLabel: {
-	        fields: any;
-	    };
-	    TfvcLabelRef: {
-	        fields: any;
-	    };
-	    TfvcLabelRequestData: {
-	        fields: any;
-	    };
-	    TfvcMergeSource: {
-	        fields: any;
-	    };
-	    TfvcPolicyFailureInfo: {
-	        fields: any;
-	    };
-	    TfvcPolicyOverrideInfo: {
-	        fields: any;
-	    };
-	    TfvcShallowBranchRef: {
-	        fields: any;
-	    };
-	    TfvcShelveset: {
-	        fields: any;
-	    };
-	    TfvcShelvesetRef: {
-	        fields: any;
-	    };
-	    TfvcShelvesetRequestData: {
-	        fields: any;
-	    };
-	    TfvcVersionDescriptor: {
-	        fields: any;
-	    };
-	    TfvcVersionOption: {
-	        enumValues: {
-	            "none": number;
-	            "previous": number;
-	            "useRename": number;
-	        };
-	    };
-	    TfvcVersionType: {
-	        enumValues: {
-	            "none": number;
-	            "changeset": number;
-	            "shelveset": number;
-	            "change": number;
-	            "date": number;
-	            "latest": number;
-	            "tip": number;
-	            "mergeSource": number;
-	        };
-	    };
-	    UpdateRefsRequest: {
-	        fields: any;
-	    };
-	    VersionControlChangeType: {
-	        enumValues: {
-	            "none": number;
-	            "add": number;
-	            "edit": number;
-	            "encoding": number;
-	            "rename": number;
-	            "delete": number;
-	            "undelete": number;
-	            "branch": number;
-	            "merge": number;
-	            "lock": number;
-	            "rollback": number;
-	            "sourceRename": number;
-	            "targetRename": number;
-	            "property": number;
-	            "all": number;
-	        };
-	    };
-	    VersionControlProjectInfo: {
-	        fields: any;
-	    };
-	    VersionControlRecursionType: {
-	        enumValues: {
-	            "none": number;
-	            "oneLevel": number;
-	            "full": number;
-	        };
-	    };
-	};
-
-}
-declare module 'vso-node-api/TfvcApi' {
-	/// <reference path="../node/node.d.ts" />
-	/// <reference path="../q/Q.d.ts" />
-	import Q = require('q');
-	import basem = require('vso-node-api/ClientApiBases');
-	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
-	import TfvcInterfaces = require('vso-node-api/interfaces/TfvcInterfaces');
-	export interface ITfvcApi extends basem.ClientApiBase {
-	    getBranch(path: string, project: string, includeParent: boolean, includeChildren: boolean, onResult: (err: any, statusCode: number, Branche: TfvcInterfaces.TfvcBranch) => void): void;
-	    getBranches(project: string, includeParent: boolean, includeChildren: boolean, includeDeleted: boolean, includeLinks: boolean, onResult: (err: any, statusCode: number, Branches: TfvcInterfaces.TfvcBranch[]) => void): void;
-	    getBranchRefs(scopePath: string, project: string, includeDeleted: boolean, includeLinks: boolean, onResult: (err: any, statusCode: number, Branches: TfvcInterfaces.TfvcBranchRef[]) => void): void;
-	    getChangesetChanges(id: number, skip: number, top: number, onResult: (err: any, statusCode: number, ChangesetChanges: TfvcInterfaces.TfvcChange[]) => void): void;
-	    createChangeset(changeset: TfvcInterfaces.TfvcChangeset, project: string, onResult: (err: any, statusCode: number, Changeset: TfvcInterfaces.TfvcChangesetRef) => void): void;
-	    getChangeset(id: number, project: string, maxChangeCount: number, includeDetails: boolean, includeWorkItems: boolean, maxCommentLength: number, includeSourceRename: boolean, skip: number, top: number, orderby: string, searchCriteria: TfvcInterfaces.TfvcChangesetSearchCriteria, onResult: (err: any, statusCode: number, Changeset: TfvcInterfaces.TfvcChangeset) => void): void;
-	    getChangesets(project: string, maxChangeCount: number, includeDetails: boolean, includeWorkItems: boolean, maxCommentLength: number, includeSourceRename: boolean, skip: number, top: number, orderby: string, searchCriteria: TfvcInterfaces.TfvcChangesetSearchCriteria, onResult: (err: any, statusCode: number, Changesets: TfvcInterfaces.TfvcChangesetRef[]) => void): void;
-	    getBatchedChangesets(changesetsRequestData: TfvcInterfaces.TfvcChangesetsRequestData, onResult: (err: any, statusCode: number, ChangesetsBatch: TfvcInterfaces.TfvcChangesetRef[]) => void): void;
-	    getChangesetWorkItems(id: number, onResult: (err: any, statusCode: number, ChangesetWorkItems: TfvcInterfaces.AssociatedWorkItem[]) => void): void;
-	    getItemsBatch(itemRequestData: TfvcInterfaces.TfvcItemRequestData, project: string, onResult: (err: any, statusCode: number, ItemBatch: TfvcInterfaces.TfvcItem[][]) => void): void;
-	    getItem(path: string, project: string, fileName: string, download: boolean, scopePath: string, recursionLevel: TfvcInterfaces.VersionControlRecursionType, versionDescriptor: TfvcInterfaces.TfvcVersionDescriptor, onResult: (err: any, statusCode: number, Item: TfvcInterfaces.TfvcItem) => void): void;
-	    getItemContent(path: string, project: string, fileName: string, download: boolean, scopePath: string, recursionLevel: TfvcInterfaces.VersionControlRecursionType, versionDescriptor: TfvcInterfaces.TfvcVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    getItems(project: string, scopePath: string, recursionLevel: TfvcInterfaces.VersionControlRecursionType, includeLinks: boolean, versionDescriptor: TfvcInterfaces.TfvcVersionDescriptor, onResult: (err: any, statusCode: number, Items: TfvcInterfaces.TfvcItem[]) => void): void;
-	    getItemText(path: string, project: string, fileName: string, download: boolean, scopePath: string, recursionLevel: TfvcInterfaces.VersionControlRecursionType, versionDescriptor: TfvcInterfaces.TfvcVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    getItemZip(path: string, project: string, fileName: string, download: boolean, scopePath: string, recursionLevel: TfvcInterfaces.VersionControlRecursionType, versionDescriptor: TfvcInterfaces.TfvcVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    getLabelItems(labelId: string, top: number, skip: number, onResult: (err: any, statusCode: number, LabelItems: TfvcInterfaces.TfvcItem[]) => void): void;
-	    getLabel(labelId: string, requestData: TfvcInterfaces.TfvcLabelRequestData, project: string, onResult: (err: any, statusCode: number, Label: TfvcInterfaces.TfvcLabel) => void): void;
-	    getLabels(requestData: TfvcInterfaces.TfvcLabelRequestData, project: string, top: number, skip: number, onResult: (err: any, statusCode: number, Labels: TfvcInterfaces.TfvcLabelRef[]) => void): void;
-	    getProjectInfo(projectId: string, project: string, onResult: (err: any, statusCode: number, ProjectInfo: TfvcInterfaces.VersionControlProjectInfo) => void): void;
-	    getProjectInfos(project: string, onResult: (err: any, statusCode: number, ProjectInfo: TfvcInterfaces.VersionControlProjectInfo[]) => void): void;
-	    getShelvesetChanges(shelvesetId: string, top: number, skip: number, onResult: (err: any, statusCode: number, ShelvesetChanges: TfvcInterfaces.TfvcChange[]) => void): void;
-	    getShelveset(shelvesetId: string, requestData: TfvcInterfaces.TfvcShelvesetRequestData, onResult: (err: any, statusCode: number, Shelveset: TfvcInterfaces.TfvcShelveset) => void): void;
-	    getShelvesets(requestData: TfvcInterfaces.TfvcShelvesetRequestData, top: number, skip: number, onResult: (err: any, statusCode: number, Shelvesets: TfvcInterfaces.TfvcShelvesetRef[]) => void): void;
-	    getShelvesetWorkItems(shelvesetId: string, onResult: (err: any, statusCode: number, ShelvesetWorkItems: TfvcInterfaces.AssociatedWorkItem[]) => void): void;
-	}
-	export interface IQTfvcApi extends basem.QClientApiBase {
-	    getBranch(path: string, project?: string, includeParent?: boolean, includeChildren?: boolean): Q.Promise<TfvcInterfaces.TfvcBranch>;
-	    getBranches(project?: string, includeParent?: boolean, includeChildren?: boolean, includeDeleted?: boolean, includeLinks?: boolean): Q.Promise<TfvcInterfaces.TfvcBranch[]>;
-	    getBranchRefs(scopePath: string, project?: string, includeDeleted?: boolean, includeLinks?: boolean): Q.Promise<TfvcInterfaces.TfvcBranchRef[]>;
-	    getChangesetChanges(id?: number, skip?: number, top?: number): Q.Promise<TfvcInterfaces.TfvcChange[]>;
-	    createChangeset(changeset: TfvcInterfaces.TfvcChangeset, project?: string): Q.Promise<TfvcInterfaces.TfvcChangesetRef>;
-	    getChangeset(id: number, project?: string, maxChangeCount?: number, includeDetails?: boolean, includeWorkItems?: boolean, maxCommentLength?: number, includeSourceRename?: boolean, skip?: number, top?: number, orderby?: string, searchCriteria?: TfvcInterfaces.TfvcChangesetSearchCriteria): Q.Promise<TfvcInterfaces.TfvcChangeset>;
-	    getChangesets(project?: string, maxChangeCount?: number, includeDetails?: boolean, includeWorkItems?: boolean, maxCommentLength?: number, includeSourceRename?: boolean, skip?: number, top?: number, orderby?: string, searchCriteria?: TfvcInterfaces.TfvcChangesetSearchCriteria): Q.Promise<TfvcInterfaces.TfvcChangesetRef[]>;
-	    getBatchedChangesets(changesetsRequestData: TfvcInterfaces.TfvcChangesetsRequestData): Q.Promise<TfvcInterfaces.TfvcChangesetRef[]>;
-	    getChangesetWorkItems(id?: number): Q.Promise<TfvcInterfaces.AssociatedWorkItem[]>;
-	    getItemsBatch(itemRequestData: TfvcInterfaces.TfvcItemRequestData, project?: string): Q.Promise<TfvcInterfaces.TfvcItem[][]>;
-	    getItem(path: string, project?: string, fileName?: string, download?: boolean, scopePath?: string, recursionLevel?: TfvcInterfaces.VersionControlRecursionType, versionDescriptor?: TfvcInterfaces.TfvcVersionDescriptor): Q.Promise<TfvcInterfaces.TfvcItem>;
-	    getItems(project?: string, scopePath?: string, recursionLevel?: TfvcInterfaces.VersionControlRecursionType, includeLinks?: boolean, versionDescriptor?: TfvcInterfaces.TfvcVersionDescriptor): Q.Promise<TfvcInterfaces.TfvcItem[]>;
-	    getLabelItems(labelId: string, top?: number, skip?: number): Q.Promise<TfvcInterfaces.TfvcItem[]>;
-	    getLabel(labelId: string, requestData: TfvcInterfaces.TfvcLabelRequestData, project?: string): Q.Promise<TfvcInterfaces.TfvcLabel>;
-	    getLabels(requestData: TfvcInterfaces.TfvcLabelRequestData, project?: string, top?: number, skip?: number): Q.Promise<TfvcInterfaces.TfvcLabelRef[]>;
-	    getProjectInfo(projectId: string, project?: string): Q.Promise<TfvcInterfaces.VersionControlProjectInfo>;
-	    getProjectInfos(project?: string): Q.Promise<TfvcInterfaces.VersionControlProjectInfo[]>;
-	    getShelvesetChanges(shelvesetId: string, top?: number, skip?: number): Q.Promise<TfvcInterfaces.TfvcChange[]>;
-	    getShelveset(shelvesetId: string, requestData: TfvcInterfaces.TfvcShelvesetRequestData): Q.Promise<TfvcInterfaces.TfvcShelveset>;
-	    getShelvesets(requestData: TfvcInterfaces.TfvcShelvesetRequestData, top?: number, skip?: number): Q.Promise<TfvcInterfaces.TfvcShelvesetRef[]>;
-	    getShelvesetWorkItems(shelvesetId: string): Q.Promise<TfvcInterfaces.AssociatedWorkItem[]>;
-	}
-	export class TfvcApi extends basem.ClientApiBase implements ITfvcApi {
-	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
-	    /**
-	     * Get a single branch hierarchy at the given path with parents or children (if specified)
-	     *
-	     * @param {string} path
-	     * @param {string} project - Project ID or project name
-	     * @param {boolean} includeParent
-	     * @param {boolean} includeChildren
-	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcBranch
-	     */
-	    getBranch(path: string, project: string, includeParent: boolean, includeChildren: boolean, onResult: (err: any, statusCode: number, Branche: TfvcInterfaces.TfvcBranch) => void): void;
-	    /**
-	     * Get a collection of branch roots -- first-level children, branches with no parents
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {boolean} includeParent
-	     * @param {boolean} includeChildren
-	     * @param {boolean} includeDeleted
-	     * @param {boolean} includeLinks
-	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcBranch[]
-	     */
-	    getBranches(project: string, includeParent: boolean, includeChildren: boolean, includeDeleted: boolean, includeLinks: boolean, onResult: (err: any, statusCode: number, Branches: TfvcInterfaces.TfvcBranch[]) => void): void;
-	    /**
-	     * Get branch hierarchies below the specified scopePath
-	     *
-	     * @param {string} scopePath
-	     * @param {string} project - Project ID or project name
-	     * @param {boolean} includeDeleted
-	     * @param {boolean} includeLinks
-	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcBranchRef[]
-	     */
-	    getBranchRefs(scopePath: string, project: string, includeDeleted: boolean, includeLinks: boolean, onResult: (err: any, statusCode: number, Branches: TfvcInterfaces.TfvcBranchRef[]) => void): void;
-	    /**
-	     * Retrieve Tfvc changes for a given changeset
-	     *
-	     * @param {number} id
-	     * @param {number} skip
-	     * @param {number} top
-	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcChange[]
-	     */
-	    getChangesetChanges(id: number, skip: number, top: number, onResult: (err: any, statusCode: number, ChangesetChanges: TfvcInterfaces.TfvcChange[]) => void): void;
-	    /**
-	     * @param {TfvcInterfaces.TfvcChangeset} changeset
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcChangesetRef
-	     */
-	    createChangeset(changeset: TfvcInterfaces.TfvcChangeset, project: string, onResult: (err: any, statusCode: number, Changeset: TfvcInterfaces.TfvcChangesetRef) => void): void;
-	    /**
-	     * Retrieve a Tfvc Changeset
-	     *
-	     * @param {number} id
-	     * @param {string} project - Project ID or project name
-	     * @param {number} maxChangeCount
-	     * @param {boolean} includeDetails
-	     * @param {boolean} includeWorkItems
-	     * @param {number} maxCommentLength
-	     * @param {boolean} includeSourceRename
-	     * @param {number} skip
-	     * @param {number} top
-	     * @param {string} orderby
-	     * @param {TfvcInterfaces.TfvcChangesetSearchCriteria} searchCriteria
-	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcChangeset
-	     */
-	    getChangeset(id: number, project: string, maxChangeCount: number, includeDetails: boolean, includeWorkItems: boolean, maxCommentLength: number, includeSourceRename: boolean, skip: number, top: number, orderby: string, searchCriteria: TfvcInterfaces.TfvcChangesetSearchCriteria, onResult: (err: any, statusCode: number, Changeset: TfvcInterfaces.TfvcChangeset) => void): void;
-	    /**
-	     * Retrieve Tfvc changesets
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {number} maxChangeCount
-	     * @param {boolean} includeDetails
-	     * @param {boolean} includeWorkItems
-	     * @param {number} maxCommentLength
-	     * @param {boolean} includeSourceRename
-	     * @param {number} skip
-	     * @param {number} top
-	     * @param {string} orderby
-	     * @param {TfvcInterfaces.TfvcChangesetSearchCriteria} searchCriteria
-	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcChangesetRef[]
-	     */
-	    getChangesets(project: string, maxChangeCount: number, includeDetails: boolean, includeWorkItems: boolean, maxCommentLength: number, includeSourceRename: boolean, skip: number, top: number, orderby: string, searchCriteria: TfvcInterfaces.TfvcChangesetSearchCriteria, onResult: (err: any, statusCode: number, Changesets: TfvcInterfaces.TfvcChangesetRef[]) => void): void;
-	    /**
-	     * @param {TfvcInterfaces.TfvcChangesetsRequestData} changesetsRequestData
-	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcChangesetRef[]
-	     */
-	    getBatchedChangesets(changesetsRequestData: TfvcInterfaces.TfvcChangesetsRequestData, onResult: (err: any, statusCode: number, ChangesetsBatch: TfvcInterfaces.TfvcChangesetRef[]) => void): void;
-	    /**
-	     * @param {number} id
-	     * @param onResult callback function with the resulting TfvcInterfaces.AssociatedWorkItem[]
-	     */
-	    getChangesetWorkItems(id: number, onResult: (err: any, statusCode: number, ChangesetWorkItems: TfvcInterfaces.AssociatedWorkItem[]) => void): void;
-	    /**
-	     * Post for retrieving a set of items given a list of paths or a long path. Allows for specifying the recursionLevel and version descriptors for each path.
-	     *
-	     * @param {TfvcInterfaces.TfvcItemRequestData} itemRequestData
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcItem[][]
-	     */
-	    getItemsBatch(itemRequestData: TfvcInterfaces.TfvcItemRequestData, project: string, onResult: (err: any, statusCode: number, ItemBatch: TfvcInterfaces.TfvcItem[][]) => void): void;
-	    /**
-	     * Get Item Metadata and/or Content. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
-	     *
-	     * @param {string} path
-	     * @param {string} project - Project ID or project name
-	     * @param {string} fileName
-	     * @param {boolean} download
-	     * @param {string} scopePath
-	     * @param {TfvcInterfaces.VersionControlRecursionType} recursionLevel
-	     * @param {TfvcInterfaces.TfvcVersionDescriptor} versionDescriptor
-	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcItem
-	     */
-	    getItem(path: string, project: string, fileName: string, download: boolean, scopePath: string, recursionLevel: TfvcInterfaces.VersionControlRecursionType, versionDescriptor: TfvcInterfaces.TfvcVersionDescriptor, onResult: (err: any, statusCode: number, Item: TfvcInterfaces.TfvcItem) => void): void;
-	    /**
-	     * Get Item Metadata and/or Content. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
-	     *
-	     * @param {string} path
-	     * @param {string} project - Project ID or project name
-	     * @param {string} fileName
-	     * @param {boolean} download
-	     * @param {string} scopePath
-	     * @param {TfvcInterfaces.VersionControlRecursionType} recursionLevel
-	     * @param {TfvcInterfaces.TfvcVersionDescriptor} versionDescriptor
-	     * @param onResult callback function with the resulting ArrayBuffer
-	     */
-	    getItemContent(path: string, project: string, fileName: string, download: boolean, scopePath: string, recursionLevel: TfvcInterfaces.VersionControlRecursionType, versionDescriptor: TfvcInterfaces.TfvcVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    /**
-	     * Get a list of Tfvc items
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {string} scopePath
-	     * @param {TfvcInterfaces.VersionControlRecursionType} recursionLevel
-	     * @param {boolean} includeLinks
-	     * @param {TfvcInterfaces.TfvcVersionDescriptor} versionDescriptor
-	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcItem[]
-	     */
-	    getItems(project: string, scopePath: string, recursionLevel: TfvcInterfaces.VersionControlRecursionType, includeLinks: boolean, versionDescriptor: TfvcInterfaces.TfvcVersionDescriptor, onResult: (err: any, statusCode: number, Items: TfvcInterfaces.TfvcItem[]) => void): void;
-	    /**
-	     * Get Item Metadata and/or Content. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
-	     *
-	     * @param {string} path
-	     * @param {string} project - Project ID or project name
-	     * @param {string} fileName
-	     * @param {boolean} download
-	     * @param {string} scopePath
-	     * @param {TfvcInterfaces.VersionControlRecursionType} recursionLevel
-	     * @param {TfvcInterfaces.TfvcVersionDescriptor} versionDescriptor
-	     * @param onResult callback function with the resulting string
-	     */
-	    getItemText(path: string, project: string, fileName: string, download: boolean, scopePath: string, recursionLevel: TfvcInterfaces.VersionControlRecursionType, versionDescriptor: TfvcInterfaces.TfvcVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    /**
-	     * Get Item Metadata and/or Content. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
-	     *
-	     * @param {string} path
-	     * @param {string} project - Project ID or project name
-	     * @param {string} fileName
-	     * @param {boolean} download
-	     * @param {string} scopePath
-	     * @param {TfvcInterfaces.VersionControlRecursionType} recursionLevel
-	     * @param {TfvcInterfaces.TfvcVersionDescriptor} versionDescriptor
-	     * @param onResult callback function with the resulting ArrayBuffer
-	     */
-	    getItemZip(path: string, project: string, fileName: string, download: boolean, scopePath: string, recursionLevel: TfvcInterfaces.VersionControlRecursionType, versionDescriptor: TfvcInterfaces.TfvcVersionDescriptor, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    /**
-	     * Get items under a label.
-	     *
-	     * @param {string} labelId - Unique identifier of label
-	     * @param {number} top - Max number of items to return
-	     * @param {number} skip - Number of items to skip
-	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcItem[]
-	     */
-	    getLabelItems(labelId: string, top: number, skip: number, onResult: (err: any, statusCode: number, LabelItems: TfvcInterfaces.TfvcItem[]) => void): void;
-	    /**
-	     * Get a single deep label.
-	     *
-	     * @param {string} labelId - Unique identifier of label
-	     * @param {TfvcInterfaces.TfvcLabelRequestData} requestData - maxItemCount
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcLabel
-	     */
-	    getLabel(labelId: string, requestData: TfvcInterfaces.TfvcLabelRequestData, project: string, onResult: (err: any, statusCode: number, Label: TfvcInterfaces.TfvcLabel) => void): void;
-	    /**
-	     * Get a collection of shallow label references.
-	     *
-	     * @param {TfvcInterfaces.TfvcLabelRequestData} requestData - labelScope, name, owner, and itemLabelFilter
-	     * @param {string} project - Project ID or project name
-	     * @param {number} top - Max number of labels to return
-	     * @param {number} skip - Number of labels to skip
-	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcLabelRef[]
-	     */
-	    getLabels(requestData: TfvcInterfaces.TfvcLabelRequestData, project: string, top: number, skip: number, onResult: (err: any, statusCode: number, Labels: TfvcInterfaces.TfvcLabelRef[]) => void): void;
-	    /**
-	     * Retrieve the version control information for a given Team Project
-	     *
-	     * @param {string} projectId - The id (or name) of the team project
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting TfvcInterfaces.VersionControlProjectInfo
-	     */
-	    getProjectInfo(projectId: string, project: string, onResult: (err: any, statusCode: number, ProjectInfo: TfvcInterfaces.VersionControlProjectInfo) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting TfvcInterfaces.VersionControlProjectInfo[]
-	     */
-	    getProjectInfos(project: string, onResult: (err: any, statusCode: number, ProjectInfo: TfvcInterfaces.VersionControlProjectInfo[]) => void): void;
-	    /**
-	     * Get changes included in a shelveset.
-	     *
-	     * @param {string} shelvesetId - Shelveset's unique ID
-	     * @param {number} top - Max number of changes to return
-	     * @param {number} skip - Number of changes to skip
-	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcChange[]
-	     */
-	    getShelvesetChanges(shelvesetId: string, top: number, skip: number, onResult: (err: any, statusCode: number, ShelvesetChanges: TfvcInterfaces.TfvcChange[]) => void): void;
-	    /**
-	     * Get a single deep shelveset.
-	     *
-	     * @param {string} shelvesetId - Shelveset's unique ID
-	     * @param {TfvcInterfaces.TfvcShelvesetRequestData} requestData - includeDetails, includeWorkItems, maxChangeCount, and maxCommentLength
-	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcShelveset
-	     */
-	    getShelveset(shelvesetId: string, requestData: TfvcInterfaces.TfvcShelvesetRequestData, onResult: (err: any, statusCode: number, Shelveset: TfvcInterfaces.TfvcShelveset) => void): void;
-	    /**
-	     * Return a collection of shallow shelveset references.
-	     *
-	     * @param {TfvcInterfaces.TfvcShelvesetRequestData} requestData - name, owner, and maxCommentLength
-	     * @param {number} top - Max number of shelvesets to return
-	     * @param {number} skip - Number of shelvesets to skip
-	     * @param onResult callback function with the resulting TfvcInterfaces.TfvcShelvesetRef[]
-	     */
-	    getShelvesets(requestData: TfvcInterfaces.TfvcShelvesetRequestData, top: number, skip: number, onResult: (err: any, statusCode: number, Shelvesets: TfvcInterfaces.TfvcShelvesetRef[]) => void): void;
-	    /**
-	     * Get work items associated with a shelveset.
-	     *
-	     * @param {string} shelvesetId - Shelveset's unique ID
-	     * @param onResult callback function with the resulting TfvcInterfaces.AssociatedWorkItem[]
-	     */
-	    getShelvesetWorkItems(shelvesetId: string, onResult: (err: any, statusCode: number, ShelvesetWorkItems: TfvcInterfaces.AssociatedWorkItem[]) => void): void;
-	}
-	export class QTfvcApi extends basem.QClientApiBase implements IQTfvcApi {
-	    api: TfvcApi;
-	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
-	    /**
-	    * Get a single branch hierarchy at the given path with parents or children (if specified)
-	    *
-	    * @param {string} path
-	    * @param {string} project - Project ID or project name
-	    * @param {boolean} includeParent
-	    * @param {boolean} includeChildren
-	    */
-	    getBranch(path: string, project?: string, includeParent?: boolean, includeChildren?: boolean): Q.Promise<TfvcInterfaces.TfvcBranch>;
-	    /**
-	    * Get a collection of branch roots -- first-level children, branches with no parents
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {boolean} includeParent
-	    * @param {boolean} includeChildren
-	    * @param {boolean} includeDeleted
-	    * @param {boolean} includeLinks
-	    */
-	    getBranches(project?: string, includeParent?: boolean, includeChildren?: boolean, includeDeleted?: boolean, includeLinks?: boolean): Q.Promise<TfvcInterfaces.TfvcBranch[]>;
-	    /**
-	    * Get branch hierarchies below the specified scopePath
-	    *
-	    * @param {string} scopePath
-	    * @param {string} project - Project ID or project name
-	    * @param {boolean} includeDeleted
-	    * @param {boolean} includeLinks
-	    */
-	    getBranchRefs(scopePath: string, project?: string, includeDeleted?: boolean, includeLinks?: boolean): Q.Promise<TfvcInterfaces.TfvcBranchRef[]>;
-	    /**
-	    * Retrieve Tfvc changes for a given changeset
-	    *
-	    * @param {number} id
-	    * @param {number} skip
-	    * @param {number} top
-	    */
-	    getChangesetChanges(id?: number, skip?: number, top?: number): Q.Promise<TfvcInterfaces.TfvcChange[]>;
-	    /**
-	    * @param {TfvcInterfaces.TfvcChangeset} changeset
-	    * @param {string} project - Project ID or project name
-	    */
-	    createChangeset(changeset: TfvcInterfaces.TfvcChangeset, project?: string): Q.Promise<TfvcInterfaces.TfvcChangesetRef>;
-	    /**
-	    * Retrieve a Tfvc Changeset
-	    *
-	    * @param {number} id
-	    * @param {string} project - Project ID or project name
-	    * @param {number} maxChangeCount
-	    * @param {boolean} includeDetails
-	    * @param {boolean} includeWorkItems
-	    * @param {number} maxCommentLength
-	    * @param {boolean} includeSourceRename
-	    * @param {number} skip
-	    * @param {number} top
-	    * @param {string} orderby
-	    * @param {TfvcInterfaces.TfvcChangesetSearchCriteria} searchCriteria
-	    */
-	    getChangeset(id: number, project?: string, maxChangeCount?: number, includeDetails?: boolean, includeWorkItems?: boolean, maxCommentLength?: number, includeSourceRename?: boolean, skip?: number, top?: number, orderby?: string, searchCriteria?: TfvcInterfaces.TfvcChangesetSearchCriteria): Q.Promise<TfvcInterfaces.TfvcChangeset>;
-	    /**
-	    * Retrieve Tfvc changesets
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {number} maxChangeCount
-	    * @param {boolean} includeDetails
-	    * @param {boolean} includeWorkItems
-	    * @param {number} maxCommentLength
-	    * @param {boolean} includeSourceRename
-	    * @param {number} skip
-	    * @param {number} top
-	    * @param {string} orderby
-	    * @param {TfvcInterfaces.TfvcChangesetSearchCriteria} searchCriteria
-	    */
-	    getChangesets(project?: string, maxChangeCount?: number, includeDetails?: boolean, includeWorkItems?: boolean, maxCommentLength?: number, includeSourceRename?: boolean, skip?: number, top?: number, orderby?: string, searchCriteria?: TfvcInterfaces.TfvcChangesetSearchCriteria): Q.Promise<TfvcInterfaces.TfvcChangesetRef[]>;
-	    /**
-	    * @param {TfvcInterfaces.TfvcChangesetsRequestData} changesetsRequestData
-	    */
-	    getBatchedChangesets(changesetsRequestData: TfvcInterfaces.TfvcChangesetsRequestData): Q.Promise<TfvcInterfaces.TfvcChangesetRef[]>;
-	    /**
-	    * @param {number} id
-	    */
-	    getChangesetWorkItems(id?: number): Q.Promise<TfvcInterfaces.AssociatedWorkItem[]>;
-	    /**
-	    * Post for retrieving a set of items given a list of paths or a long path. Allows for specifying the recursionLevel and version descriptors for each path.
-	    *
-	    * @param {TfvcInterfaces.TfvcItemRequestData} itemRequestData
-	    * @param {string} project - Project ID or project name
-	    */
-	    getItemsBatch(itemRequestData: TfvcInterfaces.TfvcItemRequestData, project?: string): Q.Promise<TfvcInterfaces.TfvcItem[][]>;
-	    /**
-	    * Get Item Metadata and/or Content. The download parameter is to indicate whether the content should be available as a download or just sent as a stream in the response. Doesn't apply to zipped content which is always returned as a download.
-	    *
-	    * @param {string} path
-	    * @param {string} project - Project ID or project name
-	    * @param {string} fileName
-	    * @param {boolean} download
-	    * @param {string} scopePath
-	    * @param {TfvcInterfaces.VersionControlRecursionType} recursionLevel
-	    * @param {TfvcInterfaces.TfvcVersionDescriptor} versionDescriptor
-	    */
-	    getItem(path: string, project?: string, fileName?: string, download?: boolean, scopePath?: string, recursionLevel?: TfvcInterfaces.VersionControlRecursionType, versionDescriptor?: TfvcInterfaces.TfvcVersionDescriptor): Q.Promise<TfvcInterfaces.TfvcItem>;
-	    /**
-	    * Get a list of Tfvc items
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {string} scopePath
-	    * @param {TfvcInterfaces.VersionControlRecursionType} recursionLevel
-	    * @param {boolean} includeLinks
-	    * @param {TfvcInterfaces.TfvcVersionDescriptor} versionDescriptor
-	    */
-	    getItems(project?: string, scopePath?: string, recursionLevel?: TfvcInterfaces.VersionControlRecursionType, includeLinks?: boolean, versionDescriptor?: TfvcInterfaces.TfvcVersionDescriptor): Q.Promise<TfvcInterfaces.TfvcItem[]>;
-	    /**
-	    * Get items under a label.
-	    *
-	    * @param {string} labelId - Unique identifier of label
-	    * @param {number} top - Max number of items to return
-	    * @param {number} skip - Number of items to skip
-	    */
-	    getLabelItems(labelId: string, top?: number, skip?: number): Q.Promise<TfvcInterfaces.TfvcItem[]>;
-	    /**
-	    * Get a single deep label.
-	    *
-	    * @param {string} labelId - Unique identifier of label
-	    * @param {TfvcInterfaces.TfvcLabelRequestData} requestData - maxItemCount
-	    * @param {string} project - Project ID or project name
-	    */
-	    getLabel(labelId: string, requestData: TfvcInterfaces.TfvcLabelRequestData, project?: string): Q.Promise<TfvcInterfaces.TfvcLabel>;
-	    /**
-	    * Get a collection of shallow label references.
-	    *
-	    * @param {TfvcInterfaces.TfvcLabelRequestData} requestData - labelScope, name, owner, and itemLabelFilter
-	    * @param {string} project - Project ID or project name
-	    * @param {number} top - Max number of labels to return
-	    * @param {number} skip - Number of labels to skip
-	    */
-	    getLabels(requestData: TfvcInterfaces.TfvcLabelRequestData, project?: string, top?: number, skip?: number): Q.Promise<TfvcInterfaces.TfvcLabelRef[]>;
-	    /**
-	    * Retrieve the version control information for a given Team Project
-	    *
-	    * @param {string} projectId - The id (or name) of the team project
-	    * @param {string} project - Project ID or project name
-	    */
-	    getProjectInfo(projectId: string, project?: string): Q.Promise<TfvcInterfaces.VersionControlProjectInfo>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    */
-	    getProjectInfos(project?: string): Q.Promise<TfvcInterfaces.VersionControlProjectInfo[]>;
-	    /**
-	    * Get changes included in a shelveset.
-	    *
-	    * @param {string} shelvesetId - Shelveset's unique ID
-	    * @param {number} top - Max number of changes to return
-	    * @param {number} skip - Number of changes to skip
-	    */
-	    getShelvesetChanges(shelvesetId: string, top?: number, skip?: number): Q.Promise<TfvcInterfaces.TfvcChange[]>;
-	    /**
-	    * Get a single deep shelveset.
-	    *
-	    * @param {string} shelvesetId - Shelveset's unique ID
-	    * @param {TfvcInterfaces.TfvcShelvesetRequestData} requestData - includeDetails, includeWorkItems, maxChangeCount, and maxCommentLength
-	    */
-	    getShelveset(shelvesetId: string, requestData: TfvcInterfaces.TfvcShelvesetRequestData): Q.Promise<TfvcInterfaces.TfvcShelveset>;
-	    /**
-	    * Return a collection of shallow shelveset references.
-	    *
-	    * @param {TfvcInterfaces.TfvcShelvesetRequestData} requestData - name, owner, and maxCommentLength
-	    * @param {number} top - Max number of shelvesets to return
-	    * @param {number} skip - Number of shelvesets to skip
-	    */
-	    getShelvesets(requestData: TfvcInterfaces.TfvcShelvesetRequestData, top?: number, skip?: number): Q.Promise<TfvcInterfaces.TfvcShelvesetRef[]>;
-	    /**
-	    * Get work items associated with a shelveset.
-	    *
-	    * @param {string} shelvesetId - Shelveset's unique ID
-	    */
-	    getShelvesetWorkItems(shelvesetId: string): Q.Promise<TfvcInterfaces.AssociatedWorkItem[]>;
-	}
-
-}
-declare module 'vso-node-api/interfaces/WorkItemTrackingInterfaces' {
-	export interface AttachmentReference {
-	    id: string;
-	    url: string;
-	}
-	export interface FieldDependentRule extends WorkItemTrackingResource {
-	    dependentFields: WorkItemFieldReference[];
-	}
-	export interface FieldsToEvaluate {
-	    fields: string[];
-	    fieldUpdates: {
-	        [key: string]: any;
-	    };
-	    fieldValues: {
-	        [key: string]: any;
-	    };
-	    rulesFrom: string[];
-	}
-	export enum FieldType {
-	    String = 0,
-	    Integer = 1,
-	    DateTime = 2,
-	    PlainText = 3,
-	    Html = 4,
-	    TreePath = 5,
-	    History = 6,
-	    Double = 7,
-	    Guid = 8,
-	    Boolean = 9,
-	}
-	export enum FieldUsage {
-	    None = 0,
-	    WorkItem = 1,
-	    WorkItemLink = 2,
-	    Tree = 3,
-	    WorkItemTypeExtension = 4,
-	}
-	export interface IdentityReference {
-	    id: string;
-	    name: string;
-	    url: string;
-	}
-	export interface Link {
-	    attributes: {
-	        [key: string]: any;
-	    };
-	    rel: string;
-	    title: string;
-	    url: string;
-	}
-	export enum LinkQueryMode {
-	    WorkItems = 0,
-	    LinksOneHopMustContain = 1,
-	    LinksOneHopMayContain = 2,
-	    LinksOneHopDoesNotContain = 3,
-	    LinksRecursiveMustContain = 4,
-	    LinksRecursiveMayContain = 5,
-	    LinksRecursiveDoesNotContain = 6,
-	}
-	export enum LogicalOperation {
-	    NONE = 0,
-	    AND = 1,
-	    OR = 2,
-	}
-	export interface ProjectReference {
-	    id: string;
-	    name: string;
-	    url: string;
-	}
-	export enum ProvisioningActionType {
-	    Import = 0,
-	    Validate = 1,
-	}
-	export interface ProvisioningResult {
-	    provisioningImportEvents: string[];
-	}
-	export enum QueryExpand {
-	    None = 0,
-	    Wiql = 1,
-	    Clauses = 2,
-	    All = 3,
-	}
-	export interface QueryHierarchyItem extends WorkItemTrackingResource {
-	    children: QueryHierarchyItem[];
-	    clauses: WorkItemQueryClause;
-	    columns: WorkItemFieldReference[];
-	    filterOptions: LinkQueryMode;
-	    hasChildren: boolean;
-	    id: string;
-	    isDeleted: boolean;
-	    isFolder: boolean;
-	    isInvalidSyntax: boolean;
-	    isPublic: boolean;
-	    linkClauses: WorkItemQueryClause;
-	    name: string;
-	    path: string;
-	    queryType: QueryType;
-	    sortColumns: WorkItemQuerySortColumn[];
-	    sourceClauses: WorkItemQueryClause;
-	    targetClauses: WorkItemQueryClause;
-	    wiql: string;
-	}
-	export enum QueryResultType {
-	    WorkItem = 1,
-	    WorkItemLink = 2,
-	}
-	export enum QueryType {
-	    Flat = 1,
-	    Tree = 2,
-	    OneHop = 3,
-	}
-	export interface ReportingWorkItemLink {
-	    changedDate: Date;
-	    isActive: boolean;
-	    rel: string;
-	    sourceId: number;
-	    targetId: number;
-	}
-	export interface ReportingWorkItemLinksBatch extends StreamedBatch<ReportingWorkItemLink> {
-	}
-	export interface ReportingWorkItemRevisionsBatch extends StreamedBatch<WorkItem> {
-	}
-	export interface ReportingWorkItemRevisionsFilter {
-	    fields: string[];
-	    types: string[];
-	}
-	export interface StreamedBatch<T> {
-	    isLastBatch: boolean;
-	    nextLink: string;
-	    values: T[];
-	}
-	export enum TemplateType {
-	    WorkItemType = 0,
-	    GlobalWorkflow = 1,
-	}
-	export enum TreeNodeStructureType {
-	    Area = 0,
-	    Iteration = 1,
-	}
-	export enum TreeStructureGroup {
-	    Areas = 0,
-	    Iterations = 1,
-	}
-	export interface Wiql {
-	    query: string;
-	}
-	export interface WorkItem extends WorkItemTrackingResource {
-	    fields: {
-	        [key: string]: any;
-	    };
-	    id: number;
-	    relations: WorkItemRelation[];
-	    rev: number;
-	}
-	export interface WorkItemClassificationNode extends WorkItemTrackingResource {
-	    attributes: {
-	        [key: string]: any;
-	    };
-	    children: WorkItemClassificationNode[];
-	    id: number;
-	    name: string;
-	    structureType: TreeNodeStructureType;
-	}
-	export enum WorkItemExpand {
-	    None = 0,
-	    Relations = 1,
-	    Fields = 2,
-	    All = 3,
-	}
-	export interface WorkItemField extends WorkItemTrackingResource {
-	    name: string;
-	    readOnly: boolean;
-	    referenceName: string;
-	    supportedOperations: WorkItemFieldOperation[];
-	    type: FieldType;
-	}
-	export interface WorkItemFieldOperation {
-	    name: string;
-	    referenceName: string;
-	}
-	export interface WorkItemFieldReference {
-	    name: string;
-	    referenceName: string;
-	    url: string;
-	}
-	export interface WorkItemFieldUpdate {
-	    newValue: any;
-	    oldValue: any;
-	}
-	export interface WorkItemHistory extends WorkItemTrackingResource {
-	    rev: number;
-	    revisedBy: IdentityReference;
-	    revisedDate: Date;
-	    value: string;
-	}
-	export interface WorkItemLink {
-	    rel: string;
-	    source: WorkItemReference;
-	    target: WorkItemReference;
-	}
-	export interface WorkItemQueryClause {
-	    clauses: WorkItemQueryClause[];
-	    field: WorkItemFieldReference;
-	    fieldValue: WorkItemFieldReference;
-	    isFieldValue: boolean;
-	    logicalOperator: LogicalOperation;
-	    operator: WorkItemFieldOperation;
-	    value: string;
-	}
-	export interface WorkItemQueryResult {
-	    asOf: Date;
-	    columns: WorkItemFieldReference[];
-	    queryResultType: QueryResultType;
-	    queryType: QueryType;
-	    sortColumns: WorkItemQuerySortColumn[];
-	    workItemRelations: WorkItemLink[];
-	    workItems: WorkItemReference[];
-	}
-	export interface WorkItemQuerySortColumn {
-	    descending: boolean;
-	    field: WorkItemFieldReference;
-	}
-	export interface WorkItemReference {
-	    id: number;
-	    url: string;
-	}
-	export interface WorkItemRelation extends Link {
-	}
-	export interface WorkItemRelationType extends WorkItemTrackingReference {
-	    attributes: {
-	        [key: string]: any;
-	    };
-	}
-	export interface WorkItemRelationUpdates {
-	    added: WorkItemRelation[];
-	    removed: WorkItemRelation[];
-	    updated: WorkItemRelation[];
-	}
-	export interface WorkItemRevisionReference extends WorkItemReference {
-	    rev: number;
-	}
-	export interface WorkItemTrackingReference extends WorkItemTrackingResource {
-	    name: string;
-	    referenceName: string;
-	}
-	export interface WorkItemTrackingResource extends WorkItemTrackingResourceReference {
-	    _links: any;
-	}
-	export interface WorkItemTrackingResourceReference {
-	    url: string;
-	}
-	export interface WorkItemType extends WorkItemTrackingResource {
-	    description: string;
-	    fields: WorkItemTypeFieldInstance[];
-	    name: string;
-	    xmlForm: string;
-	}
-	export interface WorkItemTypeCategory extends WorkItemTrackingResource {
-	    defaultWorkItemType: WorkItemTypeReference;
-	    name: string;
-	    referenceName: string;
-	    workItemTypes: WorkItemTypeReference[];
-	}
-	export interface WorkItemTypeFieldInstance {
-	    field: WorkItemFieldReference;
-	    helpText: string;
-	}
-	export interface WorkItemTypeReference extends WorkItemTrackingResourceReference {
-	    name: string;
-	}
-	export interface WorkItemTypeTemplate {
-	    template: string;
-	}
-	export interface WorkItemTypeTemplateUpdateModel {
-	    actionType: ProvisioningActionType;
-	    methodology: string;
-	    template: string;
-	    templateType: TemplateType;
-	}
-	export interface WorkItemUpdate extends WorkItemTrackingResourceReference {
-	    fields: {
-	        [key: string]: WorkItemFieldUpdate;
-	    };
-	    id: number;
-	    relations: WorkItemRelationUpdates;
-	    rev: number;
-	    revisedBy: IdentityReference;
-	    revisedDate: Date;
-	    workItemId: number;
-	}
-	export var TypeInfo: {
-	    AttachmentReference: {
-	        fields: any;
-	    };
-	    FieldDependentRule: {
-	        fields: any;
-	    };
-	    FieldsToEvaluate: {
-	        fields: any;
-	    };
-	    FieldType: {
-	        enumValues: {
-	            "string": number;
-	            "integer": number;
-	            "dateTime": number;
-	            "plainText": number;
-	            "html": number;
-	            "treePath": number;
-	            "history": number;
-	            "double": number;
-	            "guid": number;
-	            "boolean": number;
-	        };
-	    };
-	    FieldUsage: {
-	        enumValues: {
-	            "none": number;
-	            "workItem": number;
-	            "workItemLink": number;
-	            "tree": number;
-	            "workItemTypeExtension": number;
-	        };
-	    };
-	    IdentityReference: {
-	        fields: any;
-	    };
-	    Link: {
-	        fields: any;
-	    };
-	    LinkQueryMode: {
-	        enumValues: {
-	            "workItems": number;
-	            "linksOneHopMustContain": number;
-	            "linksOneHopMayContain": number;
-	            "linksOneHopDoesNotContain": number;
-	            "linksRecursiveMustContain": number;
-	            "linksRecursiveMayContain": number;
-	            "linksRecursiveDoesNotContain": number;
-	        };
-	    };
-	    LogicalOperation: {
-	        enumValues: {
-	            "nONE": number;
-	            "aND": number;
-	            "oR": number;
-	        };
-	    };
-	    ProjectReference: {
-	        fields: any;
-	    };
-	    ProvisioningActionType: {
-	        enumValues: {
-	            "import": number;
-	            "validate": number;
-	        };
-	    };
-	    ProvisioningResult: {
-	        fields: any;
-	    };
-	    QueryExpand: {
-	        enumValues: {
-	            "none": number;
-	            "wiql": number;
-	            "clauses": number;
-	            "all": number;
-	        };
-	    };
-	    QueryHierarchyItem: {
-	        fields: any;
-	    };
-	    QueryResultType: {
-	        enumValues: {
-	            "workItem": number;
-	            "workItemLink": number;
-	        };
-	    };
-	    QueryType: {
-	        enumValues: {
-	            "flat": number;
-	            "tree": number;
-	            "oneHop": number;
-	        };
-	    };
-	    ReportingWorkItemLink: {
-	        fields: any;
-	    };
-	    ReportingWorkItemLinksBatch: {
-	        fields: any;
-	    };
-	    ReportingWorkItemRevisionsBatch: {
-	        fields: any;
-	    };
-	    ReportingWorkItemRevisionsFilter: {
-	        fields: any;
-	    };
-	    StreamedBatch: {
-	        fields: any;
-	    };
-	    TemplateType: {
-	        enumValues: {
-	            "workItemType": number;
-	            "globalWorkflow": number;
-	        };
-	    };
-	    TreeNodeStructureType: {
-	        enumValues: {
-	            "area": number;
-	            "iteration": number;
-	        };
-	    };
-	    TreeStructureGroup: {
-	        enumValues: {
-	            "areas": number;
-	            "iterations": number;
-	        };
-	    };
-	    Wiql: {
-	        fields: any;
-	    };
-	    WorkItem: {
-	        fields: any;
-	    };
-	    WorkItemClassificationNode: {
-	        fields: any;
-	    };
-	    WorkItemExpand: {
-	        enumValues: {
-	            "none": number;
-	            "relations": number;
-	            "fields": number;
-	            "all": number;
-	        };
-	    };
-	    WorkItemField: {
-	        fields: any;
-	    };
-	    WorkItemFieldOperation: {
-	        fields: any;
-	    };
-	    WorkItemFieldReference: {
-	        fields: any;
-	    };
-	    WorkItemFieldUpdate: {
-	        fields: any;
-	    };
-	    WorkItemHistory: {
-	        fields: any;
-	    };
-	    WorkItemLink: {
-	        fields: any;
-	    };
-	    WorkItemQueryClause: {
-	        fields: any;
-	    };
-	    WorkItemQueryResult: {
-	        fields: any;
-	    };
-	    WorkItemQuerySortColumn: {
-	        fields: any;
-	    };
-	    WorkItemReference: {
-	        fields: any;
-	    };
-	    WorkItemRelation: {
-	        fields: any;
-	    };
-	    WorkItemRelationType: {
-	        fields: any;
-	    };
-	    WorkItemRelationUpdates: {
-	        fields: any;
-	    };
-	    WorkItemRevisionReference: {
-	        fields: any;
-	    };
-	    WorkItemTrackingReference: {
-	        fields: any;
-	    };
-	    WorkItemTrackingResource: {
-	        fields: any;
-	    };
-	    WorkItemTrackingResourceReference: {
-	        fields: any;
-	    };
-	    WorkItemType: {
-	        fields: any;
-	    };
-	    WorkItemTypeCategory: {
-	        fields: any;
-	    };
-	    WorkItemTypeFieldInstance: {
-	        fields: any;
-	    };
-	    WorkItemTypeReference: {
-	        fields: any;
-	    };
-	    WorkItemTypeTemplate: {
-	        fields: any;
-	    };
-	    WorkItemTypeTemplateUpdateModel: {
-	        fields: any;
-	    };
-	    WorkItemUpdate: {
-	        fields: any;
-	    };
-	};
-
-}
-declare module 'vso-node-api/WorkItemTrackingApi' {
-	/// <reference path="../node/node.d.ts" />
-	/// <reference path="../q/Q.d.ts" />
-	import Q = require('q');
-	import basem = require('vso-node-api/ClientApiBases');
-	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
-	import VSSInterfaces = require('vso-node-api/interfaces/common/VSSInterfaces');
-	import WorkItemTrackingInterfaces = require('vso-node-api/interfaces/WorkItemTrackingInterfaces');
-	export interface IWorkItemTrackingApi extends basem.ClientApiBase {
-	    createAttachment(customHeaders: any, contentStream: NodeJS.ReadableStream, fileName: string, uploadType: string, onResult: (err: any, statusCode: number, attachment: WorkItemTrackingInterfaces.AttachmentReference) => void): void;
-	    getAttachmentContent(id: string, fileName: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    getAttachmentZip(id: string, fileName: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    getRootNodes(project: string, depth: number, onResult: (err: any, statusCode: number, classificationNodes: WorkItemTrackingInterfaces.WorkItemClassificationNode[]) => void): void;
-	    createOrUpdateClassificationNode(postedNode: WorkItemTrackingInterfaces.WorkItemClassificationNode, project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path: string, onResult: (err: any, statusCode: number, classificationNode: WorkItemTrackingInterfaces.WorkItemClassificationNode) => void): void;
-	    deleteClassificationNode(project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path: string, reclassifyId: number, onResult: (err: any, statusCode: number) => void): void;
-	    getClassificationNode(project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path: string, depth: number, onResult: (err: any, statusCode: number, classificationNode: WorkItemTrackingInterfaces.WorkItemClassificationNode) => void): void;
-	    updateClassificationNode(postedNode: WorkItemTrackingInterfaces.WorkItemClassificationNode, project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path: string, onResult: (err: any, statusCode: number, classificationNode: WorkItemTrackingInterfaces.WorkItemClassificationNode) => void): void;
-	    getField(field: string, onResult: (err: any, statusCode: number, field: WorkItemTrackingInterfaces.WorkItemField) => void): void;
-	    getFields(onResult: (err: any, statusCode: number, fields: WorkItemTrackingInterfaces.WorkItemField[]) => void): void;
-	    getHistory(id: number, top: number, skip: number, onResult: (err: any, statusCode: number, history: WorkItemTrackingInterfaces.WorkItemHistory[]) => void): void;
-	    getHistoryById(id: number, revisionNumber: number, onResult: (err: any, statusCode: number, history: WorkItemTrackingInterfaces.WorkItemHistory) => void): void;
-	    createQuery(postedQuery: WorkItemTrackingInterfaces.QueryHierarchyItem, project: string, query: string, onResult: (err: any, statusCode: number, querie: WorkItemTrackingInterfaces.QueryHierarchyItem) => void): void;
-	    deleteQuery(project: string, query: string, onResult: (err: any, statusCode: number) => void): void;
-	    getQueries(project: string, expand: WorkItemTrackingInterfaces.QueryExpand, depth: number, includeDeleted: boolean, onResult: (err: any, statusCode: number, queries: WorkItemTrackingInterfaces.QueryHierarchyItem[]) => void): void;
-	    getQuery(project: string, query: string, expand: WorkItemTrackingInterfaces.QueryExpand, depth: number, includeDeleted: boolean, onResult: (err: any, statusCode: number, querie: WorkItemTrackingInterfaces.QueryHierarchyItem) => void): void;
-	    updateQuery(queryUpdate: WorkItemTrackingInterfaces.QueryHierarchyItem, project: string, query: string, undeleteDescendants: boolean, onResult: (err: any, statusCode: number, querie: WorkItemTrackingInterfaces.QueryHierarchyItem) => void): void;
-	    getRevision(id: number, revisionNumber: number, expand: WorkItemTrackingInterfaces.WorkItemExpand, onResult: (err: any, statusCode: number, revision: WorkItemTrackingInterfaces.WorkItem) => void): void;
-	    getRevisions(id: number, top: number, skip: number, expand: WorkItemTrackingInterfaces.WorkItemExpand, onResult: (err: any, statusCode: number, revisions: WorkItemTrackingInterfaces.WorkItem[]) => void): void;
-	    evaluateRulesOnField(ruleEngineInput: WorkItemTrackingInterfaces.FieldsToEvaluate, onResult: (err: any, statusCode: number) => void): void;
-	    getUpdate(id: number, updateNumber: number, onResult: (err: any, statusCode: number, update: WorkItemTrackingInterfaces.WorkItemUpdate) => void): void;
-	    getUpdates(id: number, top: number, skip: number, onResult: (err: any, statusCode: number, updates: WorkItemTrackingInterfaces.WorkItemUpdate[]) => void): void;
-	    queryByWiql(wiql: WorkItemTrackingInterfaces.Wiql, project: string, onResult: (err: any, statusCode: number, wiql: WorkItemTrackingInterfaces.WorkItemQueryResult) => void): void;
-	    queryById(id: string, project: string, onResult: (err: any, statusCode: number, wiql: WorkItemTrackingInterfaces.WorkItemQueryResult) => void): void;
-	    getReportingLinks(project: string, types: string[], watermark: number, onResult: (err: any, statusCode: number, workItemLink: WorkItemTrackingInterfaces.ReportingWorkItemLinksBatch) => void): void;
-	    getRelationType(relation: string, onResult: (err: any, statusCode: number, workItemRelationType: WorkItemTrackingInterfaces.WorkItemRelationType) => void): void;
-	    getRelationTypes(onResult: (err: any, statusCode: number, workItemRelationTypes: WorkItemTrackingInterfaces.WorkItemRelationType[]) => void): void;
-	    readReportingRevisionsGet(project: string, fields: string[], types: string[], watermark: number, onResult: (err: any, statusCode: number, workItemRevision: WorkItemTrackingInterfaces.ReportingWorkItemRevisionsBatch) => void): void;
-	    readReportingRevisionsPost(filter: WorkItemTrackingInterfaces.ReportingWorkItemRevisionsFilter, project: string, watermark: number, onResult: (err: any, statusCode: number, workItemRevision: WorkItemTrackingInterfaces.ReportingWorkItemRevisionsBatch) => void): void;
-	    getWorkItem(id: number, fields: string[], asOf: Date, expand: WorkItemTrackingInterfaces.WorkItemExpand, onResult: (err: any, statusCode: number, workItem: WorkItemTrackingInterfaces.WorkItem) => void): void;
-	    getWorkItems(ids: number[], fields: string[], asOf: Date, expand: WorkItemTrackingInterfaces.WorkItemExpand, onResult: (err: any, statusCode: number, workItems: WorkItemTrackingInterfaces.WorkItem[]) => void): void;
-	    updateWorkItem(customHeaders: any, document: VSSInterfaces.JsonPatchDocument, id: number, validateOnly: boolean, bypassRules: boolean, onResult: (err: any, statusCode: number, workItem: WorkItemTrackingInterfaces.WorkItem) => void): void;
-	    getWorkItemTemplate(project: string, type: string, fields: string, asOf: Date, expand: WorkItemTrackingInterfaces.WorkItemExpand, onResult: (err: any, statusCode: number, workItem: WorkItemTrackingInterfaces.WorkItem) => void): void;
-	    updateWorkItemTemplate(customHeaders: any, document: VSSInterfaces.JsonPatchDocument, project: string, type: string, validateOnly: boolean, bypassRules: boolean, onResult: (err: any, statusCode: number, workItem: WorkItemTrackingInterfaces.WorkItem) => void): void;
-	    getWorkItemTypeCategories(project: string, onResult: (err: any, statusCode: number, workItemTypeCategories: WorkItemTrackingInterfaces.WorkItemTypeCategory[]) => void): void;
-	    getWorkItemTypeCategory(project: string, category: string, onResult: (err: any, statusCode: number, workItemTypeCategorie: WorkItemTrackingInterfaces.WorkItemTypeCategory) => void): void;
-	    getWorkItemType(project: string, type: string, onResult: (err: any, statusCode: number, workItemType: WorkItemTrackingInterfaces.WorkItemType) => void): void;
-	    getWorkItemTypes(project: string, onResult: (err: any, statusCode: number, workItemTypes: WorkItemTrackingInterfaces.WorkItemType[]) => void): void;
-	    getDependentFields(project: string, type: string, field: string, onResult: (err: any, statusCode: number, workItemTypesField: WorkItemTrackingInterfaces.FieldDependentRule) => void): void;
-	    exportWorkItemTypeDefinition(project: string, type: string, exportGlobalLists: boolean, onResult: (err: any, statusCode: number, workItemTypeTemplate: WorkItemTrackingInterfaces.WorkItemTypeTemplate) => void): void;
-	    updateWorkItemTypeDefinition(updateModel: WorkItemTrackingInterfaces.WorkItemTypeTemplateUpdateModel, project: string, onResult: (err: any, statusCode: number, workItemTypeTemplate: WorkItemTrackingInterfaces.ProvisioningResult) => void): void;
-	}
-	export interface IQWorkItemTrackingApi extends basem.QClientApiBase {
-	    createAttachment(customHeaders: any, contentStream: NodeJS.ReadableStream, fileName?: string, uploadType?: string): Q.Promise<WorkItemTrackingInterfaces.AttachmentReference>;
-	    getRootNodes(project: string, depth?: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemClassificationNode[]>;
-	    createOrUpdateClassificationNode(postedNode: WorkItemTrackingInterfaces.WorkItemClassificationNode, project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path?: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemClassificationNode>;
-	    getClassificationNode(project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path?: string, depth?: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemClassificationNode>;
-	    updateClassificationNode(postedNode: WorkItemTrackingInterfaces.WorkItemClassificationNode, project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path?: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemClassificationNode>;
-	    getField(field: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemField>;
-	    getFields(): Q.Promise<WorkItemTrackingInterfaces.WorkItemField[]>;
-	    getHistory(id: number, top?: number, skip?: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemHistory[]>;
-	    getHistoryById(id: number, revisionNumber: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemHistory>;
-	    createQuery(postedQuery: WorkItemTrackingInterfaces.QueryHierarchyItem, project: string, query: string): Q.Promise<WorkItemTrackingInterfaces.QueryHierarchyItem>;
-	    getQueries(project: string, expand?: WorkItemTrackingInterfaces.QueryExpand, depth?: number, includeDeleted?: boolean): Q.Promise<WorkItemTrackingInterfaces.QueryHierarchyItem[]>;
-	    getQuery(project: string, query: string, expand?: WorkItemTrackingInterfaces.QueryExpand, depth?: number, includeDeleted?: boolean): Q.Promise<WorkItemTrackingInterfaces.QueryHierarchyItem>;
-	    updateQuery(queryUpdate: WorkItemTrackingInterfaces.QueryHierarchyItem, project: string, query: string, undeleteDescendants?: boolean): Q.Promise<WorkItemTrackingInterfaces.QueryHierarchyItem>;
-	    getRevision(id: number, revisionNumber: number, expand?: WorkItemTrackingInterfaces.WorkItemExpand): Q.Promise<WorkItemTrackingInterfaces.WorkItem>;
-	    getRevisions(id: number, top?: number, skip?: number, expand?: WorkItemTrackingInterfaces.WorkItemExpand): Q.Promise<WorkItemTrackingInterfaces.WorkItem[]>;
-	    getUpdate(id: number, updateNumber: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemUpdate>;
-	    getUpdates(id: number, top?: number, skip?: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemUpdate[]>;
-	    queryByWiql(wiql: WorkItemTrackingInterfaces.Wiql, project?: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemQueryResult>;
-	    queryById(id: string, project?: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemQueryResult>;
-	    getReportingLinks(project?: string, types?: string[], watermark?: number): Q.Promise<WorkItemTrackingInterfaces.ReportingWorkItemLinksBatch>;
-	    getRelationType(relation: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemRelationType>;
-	    getRelationTypes(): Q.Promise<WorkItemTrackingInterfaces.WorkItemRelationType[]>;
-	    readReportingRevisionsGet(project?: string, fields?: string[], types?: string[], watermark?: number): Q.Promise<WorkItemTrackingInterfaces.ReportingWorkItemRevisionsBatch>;
-	    readReportingRevisionsPost(filter: WorkItemTrackingInterfaces.ReportingWorkItemRevisionsFilter, project?: string, watermark?: number): Q.Promise<WorkItemTrackingInterfaces.ReportingWorkItemRevisionsBatch>;
-	    getWorkItem(id: number, fields?: string[], asOf?: Date, expand?: WorkItemTrackingInterfaces.WorkItemExpand): Q.Promise<WorkItemTrackingInterfaces.WorkItem>;
-	    getWorkItems(ids: number[], fields?: string[], asOf?: Date, expand?: WorkItemTrackingInterfaces.WorkItemExpand): Q.Promise<WorkItemTrackingInterfaces.WorkItem[]>;
-	    updateWorkItem(customHeaders: any, document: VSSInterfaces.JsonPatchDocument, id: number, validateOnly?: boolean, bypassRules?: boolean): Q.Promise<WorkItemTrackingInterfaces.WorkItem>;
-	    getWorkItemTemplate(project: string, type: string, fields?: string, asOf?: Date, expand?: WorkItemTrackingInterfaces.WorkItemExpand): Q.Promise<WorkItemTrackingInterfaces.WorkItem>;
-	    updateWorkItemTemplate(customHeaders: any, document: VSSInterfaces.JsonPatchDocument, project: string, type: string, validateOnly?: boolean, bypassRules?: boolean): Q.Promise<WorkItemTrackingInterfaces.WorkItem>;
-	    getWorkItemTypeCategories(project: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemTypeCategory[]>;
-	    getWorkItemTypeCategory(project: string, category: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemTypeCategory>;
-	    getWorkItemType(project: string, type: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemType>;
-	    getWorkItemTypes(project: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemType[]>;
-	    getDependentFields(project: string, type: string, field: string): Q.Promise<WorkItemTrackingInterfaces.FieldDependentRule>;
-	    exportWorkItemTypeDefinition(project?: string, type?: string, exportGlobalLists?: boolean): Q.Promise<WorkItemTrackingInterfaces.WorkItemTypeTemplate>;
-	    updateWorkItemTypeDefinition(updateModel: WorkItemTrackingInterfaces.WorkItemTypeTemplateUpdateModel, project?: string): Q.Promise<WorkItemTrackingInterfaces.ProvisioningResult>;
-	}
-	export class WorkItemTrackingApi extends basem.ClientApiBase implements IWorkItemTrackingApi {
-	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
-	    /**
-	     * Creates an attachment.
-	     *
-	     * @param {NodeJS.ReadableStream} contentStream
-	     * @param {string} fileName
-	     * @param {string} uploadType
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.AttachmentReference
-	     */
-	    createAttachment(customHeaders: any, contentStream: NodeJS.ReadableStream, fileName: string, uploadType: string, onResult: (err: any, statusCode: number, attachment: WorkItemTrackingInterfaces.AttachmentReference) => void): void;
-	    /**
-	     * Returns an attachment
-	     *
-	     * @param {string} id
-	     * @param {string} fileName
-	     * @param onResult callback function with the resulting ArrayBuffer
-	     */
-	    getAttachmentContent(id: string, fileName: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    /**
-	     * Returns an attachment
-	     *
-	     * @param {string} id
-	     * @param {string} fileName
-	     * @param onResult callback function with the resulting ArrayBuffer
-	     */
-	    getAttachmentZip(id: string, fileName: string, onResult: (err: any, statusCode: number, res: NodeJS.ReadableStream) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {number} depth
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemClassificationNode[]
-	     */
-	    getRootNodes(project: string, depth: number, onResult: (err: any, statusCode: number, classificationNodes: WorkItemTrackingInterfaces.WorkItemClassificationNode[]) => void): void;
-	    /**
-	     * @param {WorkItemTrackingInterfaces.WorkItemClassificationNode} postedNode
-	     * @param {string} project - Project ID or project name
-	     * @param {WorkItemTrackingInterfaces.TreeStructureGroup} structureGroup
-	     * @param {string} path
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemClassificationNode
-	     */
-	    createOrUpdateClassificationNode(postedNode: WorkItemTrackingInterfaces.WorkItemClassificationNode, project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path: string, onResult: (err: any, statusCode: number, classificationNode: WorkItemTrackingInterfaces.WorkItemClassificationNode) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {WorkItemTrackingInterfaces.TreeStructureGroup} structureGroup
-	     * @param {string} path
-	     * @param {number} reclassifyId
-	     * @param onResult callback function
-	     */
-	    deleteClassificationNode(project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path: string, reclassifyId: number, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {WorkItemTrackingInterfaces.TreeStructureGroup} structureGroup
-	     * @param {string} path
-	     * @param {number} depth
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemClassificationNode
-	     */
-	    getClassificationNode(project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path: string, depth: number, onResult: (err: any, statusCode: number, classificationNode: WorkItemTrackingInterfaces.WorkItemClassificationNode) => void): void;
-	    /**
-	     * @param {WorkItemTrackingInterfaces.WorkItemClassificationNode} postedNode
-	     * @param {string} project - Project ID or project name
-	     * @param {WorkItemTrackingInterfaces.TreeStructureGroup} structureGroup
-	     * @param {string} path
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemClassificationNode
-	     */
-	    updateClassificationNode(postedNode: WorkItemTrackingInterfaces.WorkItemClassificationNode, project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path: string, onResult: (err: any, statusCode: number, classificationNode: WorkItemTrackingInterfaces.WorkItemClassificationNode) => void): void;
-	    /**
-	     * @param {string} field
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemField
-	     */
-	    getField(field: string, onResult: (err: any, statusCode: number, field: WorkItemTrackingInterfaces.WorkItemField) => void): void;
-	    /**
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemField[]
-	     */
-	    getFields(onResult: (err: any, statusCode: number, fields: WorkItemTrackingInterfaces.WorkItemField[]) => void): void;
-	    /**
-	     * Returns history of all revision for a given work item ID
-	     *
-	     * @param {number} id
-	     * @param {number} top
-	     * @param {number} skip
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemHistory[]
-	     */
-	    getHistory(id: number, top: number, skip: number, onResult: (err: any, statusCode: number, history: WorkItemTrackingInterfaces.WorkItemHistory[]) => void): void;
-	    /**
-	     * Returns the history value of particular revision
-	     *
-	     * @param {number} id
-	     * @param {number} revisionNumber
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemHistory
-	     */
-	    getHistoryById(id: number, revisionNumber: number, onResult: (err: any, statusCode: number, history: WorkItemTrackingInterfaces.WorkItemHistory) => void): void;
-	    /**
-	     * Creates a query, or moves a query.
-	     *
-	     * @param {WorkItemTrackingInterfaces.QueryHierarchyItem} postedQuery - The query to create.
-	     * @param {string} project - Project ID or project name
-	     * @param {string} query - The parent path for the query to create.
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.QueryHierarchyItem
-	     */
-	    createQuery(postedQuery: WorkItemTrackingInterfaces.QueryHierarchyItem, project: string, query: string, onResult: (err: any, statusCode: number, querie: WorkItemTrackingInterfaces.QueryHierarchyItem) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {string} query
-	     * @param onResult callback function
-	     */
-	    deleteQuery(project: string, query: string, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * Retrieves all queries the user has access to in the current project
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {WorkItemTrackingInterfaces.QueryExpand} expand
-	     * @param {number} depth
-	     * @param {boolean} includeDeleted
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.QueryHierarchyItem[]
-	     */
-	    getQueries(project: string, expand: WorkItemTrackingInterfaces.QueryExpand, depth: number, includeDeleted: boolean, onResult: (err: any, statusCode: number, queries: WorkItemTrackingInterfaces.QueryHierarchyItem[]) => void): void;
-	    /**
-	     * Retrieves a single query by project and either id or path
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {string} query
-	     * @param {WorkItemTrackingInterfaces.QueryExpand} expand
-	     * @param {number} depth
-	     * @param {boolean} includeDeleted
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.QueryHierarchyItem
-	     */
-	    getQuery(project: string, query: string, expand: WorkItemTrackingInterfaces.QueryExpand, depth: number, includeDeleted: boolean, onResult: (err: any, statusCode: number, querie: WorkItemTrackingInterfaces.QueryHierarchyItem) => void): void;
-	    /**
-	     * @param {WorkItemTrackingInterfaces.QueryHierarchyItem} queryUpdate
-	     * @param {string} project - Project ID or project name
-	     * @param {string} query
-	     * @param {boolean} undeleteDescendants
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.QueryHierarchyItem
-	     */
-	    updateQuery(queryUpdate: WorkItemTrackingInterfaces.QueryHierarchyItem, project: string, query: string, undeleteDescendants: boolean, onResult: (err: any, statusCode: number, querie: WorkItemTrackingInterfaces.QueryHierarchyItem) => void): void;
-	    /**
-	     * Returns a fully hydrated work item for the requested revision
-	     *
-	     * @param {number} id
-	     * @param {number} revisionNumber
-	     * @param {WorkItemTrackingInterfaces.WorkItemExpand} expand
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItem
-	     */
-	    getRevision(id: number, revisionNumber: number, expand: WorkItemTrackingInterfaces.WorkItemExpand, onResult: (err: any, statusCode: number, revision: WorkItemTrackingInterfaces.WorkItem) => void): void;
-	    /**
-	     * Returns the list of fully hydrated work item revisions, paged.
-	     *
-	     * @param {number} id
-	     * @param {number} top
-	     * @param {number} skip
-	     * @param {WorkItemTrackingInterfaces.WorkItemExpand} expand
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItem[]
-	     */
-	    getRevisions(id: number, top: number, skip: number, expand: WorkItemTrackingInterfaces.WorkItemExpand, onResult: (err: any, statusCode: number, revisions: WorkItemTrackingInterfaces.WorkItem[]) => void): void;
-	    /**
-	     * Validates the fields values.
-	     *
-	     * @param {WorkItemTrackingInterfaces.FieldsToEvaluate} ruleEngineInput
-	     * @param onResult callback function
-	     */
-	    evaluateRulesOnField(ruleEngineInput: WorkItemTrackingInterfaces.FieldsToEvaluate, onResult: (err: any, statusCode: number) => void): void;
-	    /**
-	     * Returns a single update for a work item
-	     *
-	     * @param {number} id
-	     * @param {number} updateNumber
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemUpdate
-	     */
-	    getUpdate(id: number, updateNumber: number, onResult: (err: any, statusCode: number, update: WorkItemTrackingInterfaces.WorkItemUpdate) => void): void;
-	    /**
-	     * Returns a the deltas between work item revisions
-	     *
-	     * @param {number} id
-	     * @param {number} top
-	     * @param {number} skip
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemUpdate[]
-	     */
-	    getUpdates(id: number, top: number, skip: number, onResult: (err: any, statusCode: number, updates: WorkItemTrackingInterfaces.WorkItemUpdate[]) => void): void;
-	    /**
-	     * Gets the results of the query.
-	     *
-	     * @param {WorkItemTrackingInterfaces.Wiql} wiql - The query containing the wiql.
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemQueryResult
-	     */
-	    queryByWiql(wiql: WorkItemTrackingInterfaces.Wiql, project: string, onResult: (err: any, statusCode: number, wiql: WorkItemTrackingInterfaces.WorkItemQueryResult) => void): void;
-	    /**
-	     * Gets the results of the query by id.
-	     *
-	     * @param {string} id - The query id.
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemQueryResult
-	     */
-	    queryById(id: string, project: string, onResult: (err: any, statusCode: number, wiql: WorkItemTrackingInterfaces.WorkItemQueryResult) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {string[]} types
-	     * @param {number} watermark
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.ReportingWorkItemLinksBatch
-	     */
-	    getReportingLinks(project: string, types: string[], watermark: number, onResult: (err: any, statusCode: number, workItemLink: WorkItemTrackingInterfaces.ReportingWorkItemLinksBatch) => void): void;
-	    /**
-	     * Gets the work item relation types.
-	     *
-	     * @param {string} relation
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemRelationType
-	     */
-	    getRelationType(relation: string, onResult: (err: any, statusCode: number, workItemRelationType: WorkItemTrackingInterfaces.WorkItemRelationType) => void): void;
-	    /**
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemRelationType[]
-	     */
-	    getRelationTypes(onResult: (err: any, statusCode: number, workItemRelationTypes: WorkItemTrackingInterfaces.WorkItemRelationType[]) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param {string[]} fields
-	     * @param {string[]} types
-	     * @param {number} watermark
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.ReportingWorkItemRevisionsBatch
-	     */
-	    readReportingRevisionsGet(project: string, fields: string[], types: string[], watermark: number, onResult: (err: any, statusCode: number, workItemRevision: WorkItemTrackingInterfaces.ReportingWorkItemRevisionsBatch) => void): void;
-	    /**
-	     * @param {WorkItemTrackingInterfaces.ReportingWorkItemRevisionsFilter} filter
-	     * @param {string} project - Project ID or project name
-	     * @param {number} watermark
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.ReportingWorkItemRevisionsBatch
-	     */
-	    readReportingRevisionsPost(filter: WorkItemTrackingInterfaces.ReportingWorkItemRevisionsFilter, project: string, watermark: number, onResult: (err: any, statusCode: number, workItemRevision: WorkItemTrackingInterfaces.ReportingWorkItemRevisionsBatch) => void): void;
-	    /**
-	     * Returns a single work item
-	     *
-	     * @param {number} id
-	     * @param {string[]} fields
-	     * @param {Date} asOf
-	     * @param {WorkItemTrackingInterfaces.WorkItemExpand} expand
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItem
-	     */
-	    getWorkItem(id: number, fields: string[], asOf: Date, expand: WorkItemTrackingInterfaces.WorkItemExpand, onResult: (err: any, statusCode: number, workItem: WorkItemTrackingInterfaces.WorkItem) => void): void;
-	    /**
-	     * Returns a list of work items
-	     *
-	     * @param {number[]} ids
-	     * @param {string[]} fields
-	     * @param {Date} asOf
-	     * @param {WorkItemTrackingInterfaces.WorkItemExpand} expand
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItem[]
-	     */
-	    getWorkItems(ids: number[], fields: string[], asOf: Date, expand: WorkItemTrackingInterfaces.WorkItemExpand, onResult: (err: any, statusCode: number, workItems: WorkItemTrackingInterfaces.WorkItem[]) => void): void;
-	    /**
-	     * @param {VSSInterfaces.JsonPatchDocument} document
-	     * @param {number} id
-	     * @param {boolean} validateOnly
-	     * @param {boolean} bypassRules
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItem
-	     */
-	    updateWorkItem(customHeaders: any, document: VSSInterfaces.JsonPatchDocument, id: number, validateOnly: boolean, bypassRules: boolean, onResult: (err: any, statusCode: number, workItem: WorkItemTrackingInterfaces.WorkItem) => void): void;
-	    /**
-	     * Returns a single work item from a template
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {string} type
-	     * @param {string} fields
-	     * @param {Date} asOf
-	     * @param {WorkItemTrackingInterfaces.WorkItemExpand} expand
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItem
-	     */
-	    getWorkItemTemplate(project: string, type: string, fields: string, asOf: Date, expand: WorkItemTrackingInterfaces.WorkItemExpand, onResult: (err: any, statusCode: number, workItem: WorkItemTrackingInterfaces.WorkItem) => void): void;
-	    /**
-	     * @param {VSSInterfaces.JsonPatchDocument} document
-	     * @param {string} project - Project ID or project name
-	     * @param {string} type
-	     * @param {boolean} validateOnly
-	     * @param {boolean} bypassRules
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItem
-	     */
-	    updateWorkItemTemplate(customHeaders: any, document: VSSInterfaces.JsonPatchDocument, project: string, type: string, validateOnly: boolean, bypassRules: boolean, onResult: (err: any, statusCode: number, workItem: WorkItemTrackingInterfaces.WorkItem) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemTypeCategory[]
-	     */
-	    getWorkItemTypeCategories(project: string, onResult: (err: any, statusCode: number, workItemTypeCategories: WorkItemTrackingInterfaces.WorkItemTypeCategory[]) => void): void;
-	    /**
-	     * Returns a the deltas between work item revisions
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {string} category
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemTypeCategory
-	     */
-	    getWorkItemTypeCategory(project: string, category: string, onResult: (err: any, statusCode: number, workItemTypeCategorie: WorkItemTrackingInterfaces.WorkItemTypeCategory) => void): void;
-	    /**
-	     * Returns a the deltas between work item revisions
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {string} type
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemType
-	     */
-	    getWorkItemType(project: string, type: string, onResult: (err: any, statusCode: number, workItemType: WorkItemTrackingInterfaces.WorkItemType) => void): void;
-	    /**
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemType[]
-	     */
-	    getWorkItemTypes(project: string, onResult: (err: any, statusCode: number, workItemTypes: WorkItemTrackingInterfaces.WorkItemType[]) => void): void;
-	    /**
-	     * Returns the dependent fields for the corresponding workitem type and fieldname
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {string} type
-	     * @param {string} field
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.FieldDependentRule
-	     */
-	    getDependentFields(project: string, type: string, field: string, onResult: (err: any, statusCode: number, workItemTypesField: WorkItemTrackingInterfaces.FieldDependentRule) => void): void;
-	    /**
-	     * Export work item type
-	     *
-	     * @param {string} project - Project ID or project name
-	     * @param {string} type
-	     * @param {boolean} exportGlobalLists
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.WorkItemTypeTemplate
-	     */
-	    exportWorkItemTypeDefinition(project: string, type: string, exportGlobalLists: boolean, onResult: (err: any, statusCode: number, workItemTypeTemplate: WorkItemTrackingInterfaces.WorkItemTypeTemplate) => void): void;
-	    /**
-	     * Add/updates a work item type
-	     *
-	     * @param {WorkItemTrackingInterfaces.WorkItemTypeTemplateUpdateModel} updateModel
-	     * @param {string} project - Project ID or project name
-	     * @param onResult callback function with the resulting WorkItemTrackingInterfaces.ProvisioningResult
-	     */
-	    updateWorkItemTypeDefinition(updateModel: WorkItemTrackingInterfaces.WorkItemTypeTemplateUpdateModel, project: string, onResult: (err: any, statusCode: number, workItemTypeTemplate: WorkItemTrackingInterfaces.ProvisioningResult) => void): void;
-	}
-	export class QWorkItemTrackingApi extends basem.QClientApiBase implements IQWorkItemTrackingApi {
-	    api: WorkItemTrackingApi;
-	    constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[]);
-	    /**
-	    * Creates an attachment.
-	    *
-	    * @param {NodeJS.ReadableStream} contentStream
-	    * @param {string} fileName
-	    * @param {string} uploadType
-	    */
-	    createAttachment(customHeaders: any, contentStream: NodeJS.ReadableStream, fileName?: string, uploadType?: string): Q.Promise<WorkItemTrackingInterfaces.AttachmentReference>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {number} depth
-	    */
-	    getRootNodes(project: string, depth?: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemClassificationNode[]>;
-	    /**
-	    * @param {WorkItemTrackingInterfaces.WorkItemClassificationNode} postedNode
-	    * @param {string} project - Project ID or project name
-	    * @param {WorkItemTrackingInterfaces.TreeStructureGroup} structureGroup
-	    * @param {string} path
-	    */
-	    createOrUpdateClassificationNode(postedNode: WorkItemTrackingInterfaces.WorkItemClassificationNode, project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path?: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemClassificationNode>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {WorkItemTrackingInterfaces.TreeStructureGroup} structureGroup
-	    * @param {string} path
-	    * @param {number} depth
-	    */
-	    getClassificationNode(project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path?: string, depth?: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemClassificationNode>;
-	    /**
-	    * @param {WorkItemTrackingInterfaces.WorkItemClassificationNode} postedNode
-	    * @param {string} project - Project ID or project name
-	    * @param {WorkItemTrackingInterfaces.TreeStructureGroup} structureGroup
-	    * @param {string} path
-	    */
-	    updateClassificationNode(postedNode: WorkItemTrackingInterfaces.WorkItemClassificationNode, project: string, structureGroup: WorkItemTrackingInterfaces.TreeStructureGroup, path?: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemClassificationNode>;
-	    /**
-	    * @param {string} field
-	    */
-	    getField(field: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemField>;
-	    /**
-	    */
-	    getFields(): Q.Promise<WorkItemTrackingInterfaces.WorkItemField[]>;
-	    /**
-	    * Returns history of all revision for a given work item ID
-	    *
-	    * @param {number} id
-	    * @param {number} top
-	    * @param {number} skip
-	    */
-	    getHistory(id: number, top?: number, skip?: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemHistory[]>;
-	    /**
-	    * Returns the history value of particular revision
-	    *
-	    * @param {number} id
-	    * @param {number} revisionNumber
-	    */
-	    getHistoryById(id: number, revisionNumber: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemHistory>;
-	    /**
-	    * Creates a query, or moves a query.
-	    *
-	    * @param {WorkItemTrackingInterfaces.QueryHierarchyItem} postedQuery - The query to create.
-	    * @param {string} project - Project ID or project name
-	    * @param {string} query - The parent path for the query to create.
-	    */
-	    createQuery(postedQuery: WorkItemTrackingInterfaces.QueryHierarchyItem, project: string, query: string): Q.Promise<WorkItemTrackingInterfaces.QueryHierarchyItem>;
-	    /**
-	    * Retrieves all queries the user has access to in the current project
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {WorkItemTrackingInterfaces.QueryExpand} expand
-	    * @param {number} depth
-	    * @param {boolean} includeDeleted
-	    */
-	    getQueries(project: string, expand?: WorkItemTrackingInterfaces.QueryExpand, depth?: number, includeDeleted?: boolean): Q.Promise<WorkItemTrackingInterfaces.QueryHierarchyItem[]>;
-	    /**
-	    * Retrieves a single query by project and either id or path
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {string} query
-	    * @param {WorkItemTrackingInterfaces.QueryExpand} expand
-	    * @param {number} depth
-	    * @param {boolean} includeDeleted
-	    */
-	    getQuery(project: string, query: string, expand?: WorkItemTrackingInterfaces.QueryExpand, depth?: number, includeDeleted?: boolean): Q.Promise<WorkItemTrackingInterfaces.QueryHierarchyItem>;
-	    /**
-	    * @param {WorkItemTrackingInterfaces.QueryHierarchyItem} queryUpdate
-	    * @param {string} project - Project ID or project name
-	    * @param {string} query
-	    * @param {boolean} undeleteDescendants
-	    */
-	    updateQuery(queryUpdate: WorkItemTrackingInterfaces.QueryHierarchyItem, project: string, query: string, undeleteDescendants?: boolean): Q.Promise<WorkItemTrackingInterfaces.QueryHierarchyItem>;
-	    /**
-	    * Returns a fully hydrated work item for the requested revision
-	    *
-	    * @param {number} id
-	    * @param {number} revisionNumber
-	    * @param {WorkItemTrackingInterfaces.WorkItemExpand} expand
-	    */
-	    getRevision(id: number, revisionNumber: number, expand?: WorkItemTrackingInterfaces.WorkItemExpand): Q.Promise<WorkItemTrackingInterfaces.WorkItem>;
-	    /**
-	    * Returns the list of fully hydrated work item revisions, paged.
-	    *
-	    * @param {number} id
-	    * @param {number} top
-	    * @param {number} skip
-	    * @param {WorkItemTrackingInterfaces.WorkItemExpand} expand
-	    */
-	    getRevisions(id: number, top?: number, skip?: number, expand?: WorkItemTrackingInterfaces.WorkItemExpand): Q.Promise<WorkItemTrackingInterfaces.WorkItem[]>;
-	    /**
-	    * Returns a single update for a work item
-	    *
-	    * @param {number} id
-	    * @param {number} updateNumber
-	    */
-	    getUpdate(id: number, updateNumber: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemUpdate>;
-	    /**
-	    * Returns a the deltas between work item revisions
-	    *
-	    * @param {number} id
-	    * @param {number} top
-	    * @param {number} skip
-	    */
-	    getUpdates(id: number, top?: number, skip?: number): Q.Promise<WorkItemTrackingInterfaces.WorkItemUpdate[]>;
-	    /**
-	    * Gets the results of the query.
-	    *
-	    * @param {WorkItemTrackingInterfaces.Wiql} wiql - The query containing the wiql.
-	    * @param {string} project - Project ID or project name
-	    */
-	    queryByWiql(wiql: WorkItemTrackingInterfaces.Wiql, project?: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemQueryResult>;
-	    /**
-	    * Gets the results of the query by id.
-	    *
-	    * @param {string} id - The query id.
-	    * @param {string} project - Project ID or project name
-	    */
-	    queryById(id: string, project?: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemQueryResult>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {string[]} types
-	    * @param {number} watermark
-	    */
-	    getReportingLinks(project?: string, types?: string[], watermark?: number): Q.Promise<WorkItemTrackingInterfaces.ReportingWorkItemLinksBatch>;
-	    /**
-	    * Gets the work item relation types.
-	    *
-	    * @param {string} relation
-	    */
-	    getRelationType(relation: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemRelationType>;
-	    /**
-	    */
-	    getRelationTypes(): Q.Promise<WorkItemTrackingInterfaces.WorkItemRelationType[]>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    * @param {string[]} fields
-	    * @param {string[]} types
-	    * @param {number} watermark
-	    */
-	    readReportingRevisionsGet(project?: string, fields?: string[], types?: string[], watermark?: number): Q.Promise<WorkItemTrackingInterfaces.ReportingWorkItemRevisionsBatch>;
-	    /**
-	    * @param {WorkItemTrackingInterfaces.ReportingWorkItemRevisionsFilter} filter
-	    * @param {string} project - Project ID or project name
-	    * @param {number} watermark
-	    */
-	    readReportingRevisionsPost(filter: WorkItemTrackingInterfaces.ReportingWorkItemRevisionsFilter, project?: string, watermark?: number): Q.Promise<WorkItemTrackingInterfaces.ReportingWorkItemRevisionsBatch>;
-	    /**
-	    * Returns a single work item
-	    *
-	    * @param {number} id
-	    * @param {string[]} fields
-	    * @param {Date} asOf
-	    * @param {WorkItemTrackingInterfaces.WorkItemExpand} expand
-	    */
-	    getWorkItem(id: number, fields?: string[], asOf?: Date, expand?: WorkItemTrackingInterfaces.WorkItemExpand): Q.Promise<WorkItemTrackingInterfaces.WorkItem>;
-	    /**
-	    * Returns a list of work items
-	    *
-	    * @param {number[]} ids
-	    * @param {string[]} fields
-	    * @param {Date} asOf
-	    * @param {WorkItemTrackingInterfaces.WorkItemExpand} expand
-	    */
-	    getWorkItems(ids: number[], fields?: string[], asOf?: Date, expand?: WorkItemTrackingInterfaces.WorkItemExpand): Q.Promise<WorkItemTrackingInterfaces.WorkItem[]>;
-	    /**
-	    * @param {VSSInterfaces.JsonPatchDocument} document
-	    * @param {number} id
-	    * @param {boolean} validateOnly
-	    * @param {boolean} bypassRules
-	    */
-	    updateWorkItem(customHeaders: any, document: VSSInterfaces.JsonPatchDocument, id: number, validateOnly?: boolean, bypassRules?: boolean): Q.Promise<WorkItemTrackingInterfaces.WorkItem>;
-	    /**
-	    * Returns a single work item from a template
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {string} type
-	    * @param {string} fields
-	    * @param {Date} asOf
-	    * @param {WorkItemTrackingInterfaces.WorkItemExpand} expand
-	    */
-	    getWorkItemTemplate(project: string, type: string, fields?: string, asOf?: Date, expand?: WorkItemTrackingInterfaces.WorkItemExpand): Q.Promise<WorkItemTrackingInterfaces.WorkItem>;
-	    /**
-	    * @param {VSSInterfaces.JsonPatchDocument} document
-	    * @param {string} project - Project ID or project name
-	    * @param {string} type
-	    * @param {boolean} validateOnly
-	    * @param {boolean} bypassRules
-	    */
-	    updateWorkItemTemplate(customHeaders: any, document: VSSInterfaces.JsonPatchDocument, project: string, type: string, validateOnly?: boolean, bypassRules?: boolean): Q.Promise<WorkItemTrackingInterfaces.WorkItem>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    */
-	    getWorkItemTypeCategories(project: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemTypeCategory[]>;
-	    /**
-	    * Returns a the deltas between work item revisions
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {string} category
-	    */
-	    getWorkItemTypeCategory(project: string, category: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemTypeCategory>;
-	    /**
-	    * Returns a the deltas between work item revisions
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {string} type
-	    */
-	    getWorkItemType(project: string, type: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemType>;
-	    /**
-	    * @param {string} project - Project ID or project name
-	    */
-	    getWorkItemTypes(project: string): Q.Promise<WorkItemTrackingInterfaces.WorkItemType[]>;
-	    /**
-	    * Returns the dependent fields for the corresponding workitem type and fieldname
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {string} type
-	    * @param {string} field
-	    */
-	    getDependentFields(project: string, type: string, field: string): Q.Promise<WorkItemTrackingInterfaces.FieldDependentRule>;
-	    /**
-	    * Export work item type
-	    *
-	    * @param {string} project - Project ID or project name
-	    * @param {string} type
-	    * @param {boolean} exportGlobalLists
-	    */
-	    exportWorkItemTypeDefinition(project?: string, type?: string, exportGlobalLists?: boolean): Q.Promise<WorkItemTrackingInterfaces.WorkItemTypeTemplate>;
-	    /**
-	    * Add/updates a work item type
-	    *
-	    * @param {WorkItemTrackingInterfaces.WorkItemTypeTemplateUpdateModel} updateModel
-	    * @param {string} project - Project ID or project name
-	    */
-	    updateWorkItemTypeDefinition(updateModel: WorkItemTrackingInterfaces.WorkItemTypeTemplateUpdateModel, project?: string): Q.Promise<WorkItemTrackingInterfaces.ProvisioningResult>;
-	}
-
-}
-declare module 'vso-node-api/handlers/apiversion' {
-	/// <reference path="../../node/node.d.ts" />
-	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
-	export class ApiVersionHandler implements VsoBaseInterfaces.IRequestHandler {
-	    apiVersion: string;
-	    constructor(apiVersion: string);
-	    prepareRequest(options: any): void;
-	}
-
-}
-declare module 'vso-node-api/handlers/basiccreds' {
-	/// <reference path="../../node/node.d.ts" />
-	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
-	export class BasicCredentialHandler implements VsoBaseInterfaces.IRequestHandler {
-	    username: string;
-	    password: string;
-	    constructor(username: string, password: string);
-	    prepareRequest(options: any): void;
-	}
-
-}
-declare module 'vso-node-api/handlers/bearertoken' {
-	/// <reference path="../../node/node.d.ts" />
-	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
-	export class BearerCredentialHandler implements VsoBaseInterfaces.IRequestHandler {
-	    token: string;
-	    constructor(token: string);
-	    prepareRequest(options: any): void;
-	}
-
-}
-declare module 'vso-node-api/WebApi' {
-	import VsoBaseInterfaces = require('vso-node-api/interfaces/common/VsoBaseInterfaces');
-	import buildm = require('vso-node-api/BuildApi');
-	import corem = require('vso-node-api/CoreApi');
-	import filecontainerm = require('vso-node-api/FileContainerApi');
-	import gallerym = require('vso-node-api/GalleryApi');
-	import gitm = require('vso-node-api/GitApi');
-	import taskagentm = require('vso-node-api/TaskAgentApi');
-	import taskm = require('vso-node-api/TaskApi');
-	import testm = require('vso-node-api/TestApi');
-	import tfvcm = require('vso-node-api/TfvcApi');
-	import workitemtrackingm = require('vso-node-api/WorkItemTrackingApi');
-	import apivm = require('vso-node-api/handlers/apiversion');
-	import basicm = require('vso-node-api/handlers/basiccreds');
-	import bearm = require('vso-node-api/handlers/bearertoken');
-	/**
-	 * Methods to return handler objects (see handlers folder)
-	 */
-	export function getVersionHandler(apiVersion: string): apivm.ApiVersionHandler;
-	export function getBasicHandler(username: string, password: string): basicm.BasicCredentialHandler;
-	export function getBearerHandler(token: any): bearm.BearerCredentialHandler;
-	export class WebApi {
-	    serverUrl: string;
-	    authHandler: VsoBaseInterfaces.IRequestHandler;
-	    constructor(serverUrl: string, authHandler: VsoBaseInterfaces.IRequestHandler);
-	    /**
-	     * Each factory method can take a serverUrl and a list of handlers
-	     * if these aren't provided, the default url and auth handler given to the constructor for this class will be used
-	     */
-	    getBuildApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): buildm.IBuildApi;
-	    /**
-	     * Each API has a method here to create the "vanilla" API as well as one with a Q Promise wrapper.
-	     */
-	    getQBuildApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): buildm.IQBuildApi;
-	    getCoreApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): corem.ICoreApi;
-	    getQCoreApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): corem.IQCoreApi;
-	    getFileContainerApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): filecontainerm.IFileContainerApi;
-	    getQFileContainerApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): filecontainerm.IQFileContainerApi;
-	    getGalleryApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): gallerym.IGalleryApi;
-	    getQGalleryApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): gallerym.IQGalleryApi;
-	    getGitApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): gitm.IGitApi;
-	    getQGitApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): gitm.IQGitApi;
-	    getTaskApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): taskm.ITaskApi;
-	    getQTaskApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): taskm.IQTaskApi;
-	    getTaskAgentApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): taskagentm.ITaskAgentApi;
-	    getQTaskAgentApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): taskagentm.IQTaskAgentApi;
-	    getTestApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): testm.ITestApi;
-	    getQTestApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): testm.IQTestApi;
-	    getTfvcApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): tfvcm.ITfvcApi;
-	    getQTfvcApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): tfvcm.IQTfvcApi;
-	    getWorkItemTrackingApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): workitemtrackingm.IWorkItemTrackingApi;
-	    getQWorkItemTrackingApi(serverUrl?: string, handlers?: VsoBaseInterfaces.IRequestHandler[]): workitemtrackingm.IQWorkItemTrackingApi;
-	}
-
-}
diff --git a/vue-resource/index.d.ts b/vue-resource/index.d.ts
new file mode 100644
index 0000000000..735ec967bb
--- /dev/null
+++ b/vue-resource/index.d.ts
@@ -0,0 +1,123 @@
+// Type definitions for vue-resoure 0.7.0
+// Project: https://github.com/vuejs/vue-resource
+// Definitions by: kaorun343 <https://github.com/kaorun343>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="vue" />
+
+declare namespace vuejs {
+
+    interface HttpHeaders {
+        put?: { [key: string]: string };
+        post?: { [key: string]: string };
+        patch?: { [key: string]: string };
+        delete?: { [key: string]: string };
+        common?: { [key: string]: string };
+        custom?: { [key: string]: string };
+        [key: string]: any;
+    }
+
+    interface HttpResponse {
+        data: Object;
+        ok: boolean;
+        status: number;
+        statusText: string;
+        headers: Function;
+    }
+
+    interface HttpOptions {
+        url?: string;
+        method?: string;
+        data?: any;
+        params?: any;
+        headers?: any;
+        beforeSend?(request: any): any;
+        emulateHTTP?: boolean;
+        emulateJSON?: boolean;
+        xhr?: any;
+        upload?: any;
+        jsonp?: string;
+        timeout?: string;
+    }
+
+    interface $http {
+        (url: string, data?: any, options?: HttpOptions): PromiseLike<HttpResponse>;
+        (url: string, options?: HttpOptions): PromiseLike<HttpResponse>;
+    }
+
+    interface HttpInterceptor {
+        request?(request: HttpOptions): HttpOptions;
+        response?(response: HttpResponse): HttpResponse;
+    }
+
+    interface Http {
+        options: HttpOptions & { root: string };
+        headers: HttpHeaders;
+        interceptors: (HttpInterceptor | (() => HttpInterceptor))[];
+        get: $http;
+        post: $http;
+        put: $http;
+        patch: $http;
+        delete: $http;
+        jsonp: $http;
+    }
+
+    interface ResourceActions {
+        get: { method: string };
+        save: { method: string };
+        query: { method: string };
+        update: { method: string };
+        remove: { method: string };
+        delete: { method: string };
+    }
+
+    interface ResourceMethod {
+        (params: any, data?: any, success?: Function, error?: Function): PromiseLike<HttpResponse>;
+        (params: any, success?: Function, error?: Function): PromiseLike<HttpResponse>;
+        (success?: Function, error?: Function): PromiseLike<HttpResponse>;
+    }
+
+    interface ResourceMethods {
+        get: ResourceMethod;
+        save: ResourceMethod;
+        query: ResourceMethod;
+        update: ResourceMethod;
+        remove: ResourceMethod;
+        delete: ResourceMethod;
+    }
+
+    interface $resource {
+        (url: string, params?: Object, actions?: any, options?: HttpOptions): ResourceMethods;
+    }
+
+    interface Resource extends $resource {
+        actions: ResourceActions;
+    }
+
+    interface Vue {
+        $http: {
+            (options: HttpOptions): PromiseLike<HttpResponse>;
+            get: $http;
+            post: $http;
+            put: $http;
+            patch: $http;
+            delete: $http;
+            jsonp: $http;
+        };
+        $resource: $resource;
+    }
+
+    interface VueStatic {
+        http: Http;
+        resource: Resource;
+    }
+
+    interface ComponentOption {
+        http?: (HttpOptions & { headers?: HttpHeaders } & { [key: string]: any })
+    }
+}
+
+declare module "vue-resource" {
+    const install: (vue: vuejs.VueStatic) => void;
+    export = install;
+}
diff --git a/vue-resource/tsconfig.json b/vue-resource/tsconfig.json
new file mode 100644
index 0000000000..e0adbaad78
--- /dev/null
+++ b/vue-resource/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "vue-resource-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/vue-resource/vue-resource-tests.ts b/vue-resource/vue-resource-tests.ts
index 28ae5abe09..22cf64e74e 100644
--- a/vue-resource/vue-resource-tests.ts
+++ b/vue-resource/vue-resource-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./vue-resource.d.ts" />
+
 
 Vue.http.options.root = '/root';
 Vue.http.headers.common['Authorization'] = 'Basic YXBpOnBhc3N3b3Jk';
diff --git a/vue-resource/vue-resource.d.ts b/vue-resource/vue-resource.d.ts
deleted file mode 100644
index 2276634e68..0000000000
--- a/vue-resource/vue-resource.d.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-// Type definitions for vue-resoure 0.7.0
-// Project: https://github.com/vuejs/vue-resource
-// Definitions by: kaorun343 <https://github.com/kaorun343>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../vue/vue.d.ts" />
-
-declare namespace vuejs {
-
-    interface HttpHeaders {
-        put?: { [key: string]: string };
-        post?: { [key: string]: string };
-        patch?: { [key: string]: string };
-        delete?: { [key: string]: string };
-        common?: { [key: string]: string };
-        custom?: { [key: string]: string };
-        [key: string]: any;
-    }
-
-    interface HttpResponse {
-        data: Object;
-        ok: boolean;
-        status: number;
-        statusText: string;
-        headers: Function;
-    }
-
-    interface HttpOptions {
-        url?: string;
-        method?: string;
-        data?: any;
-        params?: any;
-        headers?: any;
-        beforeSend?(request: any): any;
-        emulateHTTP?: boolean;
-        emulateJSON?: boolean;
-        xhr?: any;
-        upload?: any;
-        jsonp?: string;
-        timeout?: string;
-    }
-
-    interface $http {
-        (url: string, data?: any, options?: HttpOptions): PromiseLike<HttpResponse>;
-        (url: string, options?: HttpOptions): PromiseLike<HttpResponse>;
-    }
-
-    interface HttpInterceptor {
-        request?(request: HttpOptions): HttpOptions;
-        response?(response: HttpResponse): HttpResponse;
-    }
-
-    interface Http {
-        options: HttpOptions & { root: string };
-        headers: HttpHeaders;
-        interceptors: (HttpInterceptor | (() => HttpInterceptor))[];
-        get: $http;
-        post: $http;
-        put: $http;
-        patch: $http;
-        delete: $http;
-        jsonp: $http;
-    }
-
-    interface ResourceActions {
-        get: { method: string };
-        save: { method: string };
-        query: { method: string };
-        update: { method: string };
-        remove: { method: string };
-        delete: { method: string };
-    }
-
-    interface ResourceMethod {
-        (params: any, data?: any, success?: Function, error?: Function): PromiseLike<HttpResponse>;
-        (params: any, success?: Function, error?: Function): PromiseLike<HttpResponse>;
-        (success?: Function, error?: Function): PromiseLike<HttpResponse>;
-    }
-
-    interface ResourceMethods {
-        get: ResourceMethod;
-        save: ResourceMethod;
-        query: ResourceMethod;
-        update: ResourceMethod;
-        remove: ResourceMethod;
-        delete: ResourceMethod;
-    }
-
-    interface $resource {
-        (url: string, params?: Object, actions?: any, options?: HttpOptions): ResourceMethods;
-    }
-
-    interface Resource extends $resource {
-        actions: ResourceActions;
-    }
-
-    interface Vue {
-        $http: {
-            (options: HttpOptions): PromiseLike<HttpResponse>;
-            get: $http;
-            post: $http;
-            put: $http;
-            patch: $http;
-            delete: $http;
-            jsonp: $http;
-        };
-        $resource: $resource;
-    }
-
-    interface VueStatic {
-        http: Http;
-        resource: Resource;
-    }
-
-    interface ComponentOption {
-        http?: (HttpOptions & { headers?: HttpHeaders } & { [key: string]: any })
-    }
-}
-
-declare module "vue-resource" {
-    const install: (vue: vuejs.VueStatic) => void;
-    export = install;
-}
diff --git a/vue-router/index.d.ts b/vue-router/index.d.ts
new file mode 100644
index 0000000000..9f5d1ef0c3
--- /dev/null
+++ b/vue-router/index.d.ts
@@ -0,0 +1,89 @@
+// Type definitions for vue-router 0.7.10
+// Project: https://github.com/vuejs/vue-router
+// Definitions by: kaorun343 <https://github.com/kaorun343>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="vue" />
+
+declare namespace vuejs {
+
+    interface Transition<RootVueApp, FromParams, FromQuery, ToParams, ToQuery> {
+        from: $route<RootVueApp, FromParams, FromQuery>;
+        to: $route<RootVueApp, ToParams, ToQuery>;
+        next(data?: any): void;
+        abort(reason?: any): void;
+        redirect(path: string): void;
+    }
+
+    interface RouterOption {
+        hashbang?: boolean;
+        history?: boolean;
+        abstract?: boolean;
+        root?: string;
+        linkActiveClass?: string;
+        saveScrollPosition?: boolean;
+        transitionOnLoad?: boolean;
+        suppressTransitionError?: boolean;
+    }
+
+    interface RouterStatic {
+        new <RootVueApp>(option?: RouterOption): Router<RootVueApp>;
+    }
+
+    interface RouteMapObject {
+        component: any;
+        subRoutes?: { [key: string]: RouteMapObject };
+        [key: string]: any;
+    }
+
+    interface Router<RootVueApp> {
+
+        app: RootVueApp;
+        mode: string;
+
+        start(App: any, el: string | Element): void;
+        stop(): void;
+        map(routeMap: { [path: string]: RouteMapObject }): void;
+        on(path: string, config: Object): void;
+        go(path: string | Object): void;
+        replace(path: string): void;
+        redirect(redirectMap: Object): void;
+        alias(aliasMap: Object): void;
+        beforeEach<FP, FQ, TP, TQ>(hook: (transition: Transition<RootVueApp, FP, FQ, TP, TQ>) => any): void;
+        afterEach<FP, FQ, TP, TQ>(hook: (transition: Transition<RootVueApp, FP, FQ, TP, TQ>) => any): void;
+    }
+
+    interface $route<RootVueApp, Params, Query> {
+        path: string;
+        params: Params;
+        query: Query;
+        router: Router<RootVueApp>;
+        matched: string[];
+        name: string;
+        [key: string]: any;
+    }
+
+    interface TransitionHook<Root, FP, FQ, TP, TQ> {
+        data?(transition?: Transition<Root, FP, FQ, TP, TQ>): PromiseLike<any> | void;
+        activate?(transition?: Transition<Root, FP, FQ, TP, TQ>): PromiseLike<any> | void;
+        deactivate?(transition?: Transition<Root, FP, FQ, TP, TQ>): PromiseLike<any> | void;
+        canActivate?(transition?: Transition<Root, FP, FQ, TP, TQ>): PromiseLike<any> | boolean | void;
+        canDeactivate?(transition?: Transition<Root, FP, FQ, TP, TQ>): PromiseLike<any> | boolean | void;
+        canReuse?: boolean | ((transition: Transition<Root, FP, FQ, TP, TQ>) => boolean);
+    }
+
+    interface Vue {
+        $route: vuejs.$route<any, any, any>;
+        $router: vuejs.Router<any>;
+    }
+
+    interface ComponentOption {
+        route?: vuejs.TransitionHook<any, any, any, any, any>;
+    }
+}
+
+declare var VueRouter: vuejs.RouterStatic;
+
+declare module "vue-router" {
+    export = VueRouter;
+}
diff --git a/vue-router/tsconfig.json b/vue-router/tsconfig.json
new file mode 100644
index 0000000000..05bc688a35
--- /dev/null
+++ b/vue-router/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "vue-router-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/vue-router/vue-router-tests.ts b/vue-router/vue-router-tests.ts
index 12588db47d..70eb436132 100644
--- a/vue-router/vue-router-tests.ts
+++ b/vue-router/vue-router-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./vue-router.d.ts" />
+
 
 Vue.use(VueRouter);
 
diff --git a/vue-router/vue-router.d.ts b/vue-router/vue-router.d.ts
deleted file mode 100644
index dccd312a6c..0000000000
--- a/vue-router/vue-router.d.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-// Type definitions for vue-router 0.7.10
-// Project: https://github.com/vuejs/vue-router
-// Definitions by: kaorun343 <https://github.com/kaorun343>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../vue/vue.d.ts" />
-
-declare namespace vuejs {
-
-    interface Transition<RootVueApp, FromParams, FromQuery, ToParams, ToQuery> {
-        from: $route<RootVueApp, FromParams, FromQuery>;
-        to: $route<RootVueApp, ToParams, ToQuery>;
-        next(data?: any): void;
-        abort(reason?: any): void;
-        redirect(path: string): void;
-    }
-
-    interface RouterOption {
-        hashbang?: boolean;
-        history?: boolean;
-        abstract?: boolean;
-        root?: string;
-        linkActiveClass?: string;
-        saveScrollPosition?: boolean;
-        transitionOnLoad?: boolean;
-        suppressTransitionError?: boolean;
-    }
-
-    interface RouterStatic {
-        new <RootVueApp>(option?: RouterOption): Router<RootVueApp>;
-    }
-
-    interface RouteMapObject {
-        component: any;
-        subRoutes?: { [key: string]: RouteMapObject };
-        [key: string]: any;
-    }
-
-    interface Router<RootVueApp> {
-
-        app: RootVueApp;
-        mode: string;
-
-        start(App: any, el: string | Element): void;
-        stop(): void;
-        map(routeMap: { [path: string]: RouteMapObject }): void;
-        on(path: string, config: Object): void;
-        go(path: string | Object): void;
-        replace(path: string): void;
-        redirect(redirectMap: Object): void;
-        alias(aliasMap: Object): void;
-        beforeEach<FP, FQ, TP, TQ>(hook: (transition: Transition<RootVueApp, FP, FQ, TP, TQ>) => any): void;
-        afterEach<FP, FQ, TP, TQ>(hook: (transition: Transition<RootVueApp, FP, FQ, TP, TQ>) => any): void;
-    }
-
-    interface $route<RootVueApp, Params, Query> {
-        path: string;
-        params: Params;
-        query: Query;
-        router: Router<RootVueApp>;
-        matched: string[];
-        name: string;
-        [key: string]: any;
-    }
-
-    interface TransitionHook<Root, FP, FQ, TP, TQ> {
-        data?(transition?: Transition<Root, FP, FQ, TP, TQ>): PromiseLike<any> | void;
-        activate?(transition?: Transition<Root, FP, FQ, TP, TQ>): PromiseLike<any> | void;
-        deactivate?(transition?: Transition<Root, FP, FQ, TP, TQ>): PromiseLike<any> | void;
-        canActivate?(transition?: Transition<Root, FP, FQ, TP, TQ>): PromiseLike<any> | boolean | void;
-        canDeactivate?(transition?: Transition<Root, FP, FQ, TP, TQ>): PromiseLike<any> | boolean | void;
-        canReuse?: boolean | ((transition: Transition<Root, FP, FQ, TP, TQ>) => boolean);
-    }
-
-    interface Vue {
-        $route: vuejs.$route<any, any, any>;
-        $router: vuejs.Router<any>;
-    }
-
-    interface ComponentOption {
-        route?: vuejs.TransitionHook<any, any, any, any, any>;
-    }
-}
-
-declare var VueRouter: vuejs.RouterStatic;
-
-declare module "vue-router" {
-    export = VueRouter;
-}
diff --git a/vue/index.d.ts b/vue/index.d.ts
new file mode 100644
index 0000000000..faee50af8f
--- /dev/null
+++ b/vue/index.d.ts
@@ -0,0 +1,256 @@
+// Type definitions for vuejs 1.0.21
+// Project: https://github.com/vuejs/vue
+// Definitions by: odangosan <https://github.com/odangosan>, kaorun343 <https://github.com/kaorun343>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface Array<T> {
+    $remove(item: T): Array<T>;
+    $set(index: any, val: T): T;
+}
+
+declare namespace vuejs {
+
+    interface PropOption {
+        type?: { new (...args: any[]): any; } | { new (...args: any[]): any; }[];
+        required?: boolean;
+        default?: any;
+        twoWay?: boolean;
+        validator?(value: any): boolean;
+        coerce?(value: any): any;
+    }
+
+    interface ComputedOption {
+        get(): any;
+        set(value: any): void;
+    }
+
+    interface WatchOption {
+        handler(val: any, oldVal: any): void;
+        deep?: boolean;
+        immidiate?: boolean;
+    }
+
+    interface DirectiveOption {
+        bind?(): any;
+        update?(newVal?: any, oldVal?: any): any;
+        unbind?(): any;
+        params?: string[];
+        deep?: boolean;
+        twoWay?: boolean;
+        acceptStatement?: boolean;
+        priority?: number;
+        [key: string]: any;
+    }
+
+    interface FilterOption {
+        read?: Function;
+        write?: Function;
+    }
+
+    interface TransitionOption {
+        css?: boolean;
+        animation?: string;
+        enterClass?: string;
+        leaveClass?: string;
+        beforeEnter?(el: HTMLElement): void;
+        enter?(el: HTMLElement, done?: () => void): void;
+        afterEnter?(el: HTMLElement): void;
+        enterCancelled?(el: HTMLElement): void;
+        beforeLeave?(el: HTMLElement): void;
+        leave?(el: HTMLElement, done?: () => void): void;
+        afterLeave?(el: HTMLElement): void;
+        leaveCancelled?(el: HTMLElement): void;
+        stagger?(index: number): number;
+        enterStagger?(index: number): number;
+        leaveStagger?(index: number): number;
+        [key: string]: any;
+    }
+
+    interface ComponentOption {
+        data?: { [key: string]: any } | Function;
+        props?: string[] | { [key: string]: (PropOption | { new (...args: any[]): any; } | { new (...args: any[]): any; }[]) };
+        computed?: { [key: string]: (Function | ComputedOption) };
+        methods?: { [key: string]: Function };
+        watch?: { [key: string]: ((val: any, oldVal: any) => void) | string | WatchOption };
+        el?: string | HTMLElement | (() => HTMLElement);
+        template?: string;
+        replace?: boolean;
+        init?(): void;
+        created?(): void;
+        beforeCompile?(): void;
+        compiled?(): void;
+        ready?(): void;
+        attached?(): void;
+        detached?(): void;
+        beforeDestroy?(): void;
+        destroyed?(): void;
+        activate?(): void;
+        directives?: { [key: string]: (DirectiveOption | Function) };
+        elementDirectives?: { [key: string]: (DirectiveOption | Function) };
+        filters?: { [key: string]: (Function | FilterOption) };
+        components?: { [key: string]: any };
+        transitions?: { [key: string]: TransitionOption };
+        partials?: { [key: string]: string };
+        parent?: Vue;
+        events?: { [key: string]: ((...args: any[]) => (boolean | void)) | string };
+        mixins?: Object[];
+        name?: string;
+        [key: string]: any;
+    }
+
+    interface Vue {
+        $data: any;
+        $el: HTMLElement;
+        $options: Object;
+        $parent: Vue;
+        $root: Vue;
+        $children: Vue[];
+        $refs: Object;
+        $els: Object;
+
+        // instance/api/data.js
+        $get(exp: string, asStatement?: boolean): any;
+        $set<T>(key: string | number, value: T): T;
+        $delete(key: string): void;
+        $eval(expression: string): string;
+        $interpolate(expression: string): string;
+        $log(keypath?: string): void;
+        $watch(expOrFn: string | Function, callback: ((newVal: any, oldVal?: any) => any) | string, options?: { deep?: boolean, immidiate?: boolean }): Function;
+        // instance/api/dom.js
+        $nextTick(callback: Function): void;
+        $appendTo(target: (HTMLElement | string), callback?: Function, withTransition?: boolean): this;
+        $prependTo(target: (HTMLElement | string), callback?: Function, withTransition?: boolean): this;
+        $before(target: (HTMLElement | string), callback?: Function, withTransition?: boolean): this;
+        $after(target: (HTMLElement | string), callback?: Function, withTransition?: boolean): this;
+        $remove(callback?: Function): this;
+        // instance/api/events.js
+        $on(event: string, callback: Function): this;
+        $once(event: string, callback: Function): this;
+        $off(event: string, callback?: Function): this;
+        $emit(event: string, ...args: any[]): this;
+        $broadcast(event: string, ...args: any[]): this;
+        $dispatch(event: string, ...args: any[]): this;
+        // instance/api/lifecycle.js
+        $mount(elementOrSelector?: (HTMLElement | string)): this;
+        $destroy(remove?: boolean): void;
+        $compile(el: Element | DocumentFragment, host?: Vue): Function;
+
+        _init(options?: ComponentOption): void;
+    }
+
+    interface VueConfig {
+        debug: boolean;
+        delimiters: [string, string];
+        unsafeDelimiters: [string, string];
+        silent: boolean;
+        async: boolean;
+        devtools: boolean;
+    }
+
+    interface VueUtil {
+        // util/lang.js
+        set(obj: Object, key: string, value: any): void;
+        del(obj: Object, key: string): void;
+        hasOwn(obj: Object, key: string): boolean;
+        isLiteral(exp: string): boolean;
+        isReserved(str: string): boolean;
+        _toString(value: any): string;
+        toNumber<T>(value: T): T | number;
+        toBoolean<T>(value: T): T | boolean;
+        stripQuotes(str: string): string;
+        camelize(str: string): string;
+        hyphenate(str: string): string;
+        classify(str: string): string;
+        bind(fn: Function, ctx: Object): Function;
+        toAarray<T>(list: ArrayLike<T>, start?: number): Array<T>;
+        extend<T, F>(to: T, from: F): (T & F);
+        isObject(obj: any): boolean;
+        isPlainObject(obj: any): boolean;
+        isArray: typeof Array.isArray;
+        def(obj: Object, key: string, value: any, enumerable?: boolean): void;
+        debounce(func: Function, wait: number): Function;
+        indexOf<T>(arr: Array<T>, obj: T): number;
+        cancellable(fn: Function): Function;
+        looseEqual(a: any, b: any): boolean;
+        // util/env.js
+        hasProto: boolean;
+        inBrowser: boolean;
+        isIE9: boolean;
+        isAndroid: boolean;
+        transitionProp: string;
+        transitionEndEvent: string;
+        animationProp: string;
+        animationEndEvent: string;
+        nextTick(cb: Function, ctx?: Object): void;
+        // util/dom.js
+        query(el: string | Element): Element;
+        inDoc(node: Node): boolean;
+        getAttr(node: Node, _attr: string): string;
+        getBindAttr(node: Node, name: string): string;
+        before(el: Element, target: Element): void;
+        after(el: Element, target: Element): void;
+        remove(el: Element): void;
+        prepend(el: Element, target: Element): void;
+        replace(target: Element, el: Element): void;
+        on(el: Element, event: string, cb: Function): void;
+        off(el: Element, event: string, cb: Function): void;
+        addClass(el: Element, cls: string): void;
+        removeClass(el: Element, cls: string): void;
+        extractContent(el: Element, asFragment: boolean): (HTMLDivElement | DocumentFragment);
+        trimNode(node: Node): void;
+        isTemplate(el: Element): boolean;
+        createAnchor(content: string, persist: boolean): (Comment | Text);
+        findRef(node: Element): string;
+        mapNodeRange(node: Node, end: Node, op: Function): void;
+        removeNodeRange(start: Node, end: Node, vm: any, frag: DocumentFragment, cb: Function): void;
+        // util/options.js
+        mergeOptions<P, C>(parent: P, child: C, vm?: any): (P & C);
+        resolveAsset(options: Object, type: string, id: string): (Object | Function);
+        assertAsset(val: any, type: string, id: string): void;
+        // util/component.js
+        commonTagRE: RegExp;
+        checkComponentAttr(el: Element, options?: Object): Object;
+        initProp(vm: Vue, prop: Object, value: any): void;
+        assertProp(prop: Object, value: any): boolean;
+        // util/debug.js
+        warn(msg: string, e?: Error): void;
+        // observer/index.js
+        defineReactive(obj: Object, key: string, val: any): void;
+    }
+
+    // instance/api/global.js
+    interface VueStatic {
+        new (options?: ComponentOption): Vue;
+        prototype: Vue;
+        util: VueUtil;
+        config: VueConfig;
+        set(object: Object, key: string, value: any): void;
+        delete(object: Object, key: string): void;
+        nextTick(callback: Function): any;
+
+        cid: number;
+
+        extend(options?: ComponentOption): VueStatic;
+        use(callback: Function | { install: Function, [key: string]: any }, option?: Object): VueStatic;
+        mixin(mixin: Object): void;
+
+        directive<T extends (Function | DirectiveOption)>(id: string, definition: T): T;
+        directive(id: string): any;
+        elementDirective<T extends (Function | DirectiveOption)>(id: string, definition: T): T;
+        elementDirective(id: string): any;
+        filter<T extends (Function | FilterOption)>(id: string, definition: T): T;
+        filter(id: string): any;
+        component(id: string, definition: ComponentOption): any;
+        component(id: string): any;
+        transition<T extends TransitionOption>(id: string, hooks: T): T;
+        transition(id: string): TransitionOption;
+        partial(id: string, partial: string): string;
+        partial(id: string): string;
+    }
+}
+
+declare var Vue: vuejs.VueStatic;
+
+declare module "vue" {
+    export = Vue;
+}
diff --git a/vue/tsconfig.json b/vue/tsconfig.json
new file mode 100644
index 0000000000..bd13888bdd
--- /dev/null
+++ b/vue/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "vue-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/vue/vue-tests.ts b/vue/vue-tests.ts
index 360625f05d..5b8662d313 100644
--- a/vue/vue-tests.ts
+++ b/vue/vue-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="vue.d.ts" />
+
 
 namespace TestConfig {
   "use strict";
@@ -8,7 +8,7 @@ namespace TestConfig {
   Vue.config.unsafeDelimiters = ['{!!', '!!}'];
   Vue.config.silent = true;
   Vue.config.async = false;
-  Vue.config.convertAllProperties = true;
+  Vue.config.devtools = true;
 }
 
 namespace TestGlobalAPI {
@@ -67,6 +67,16 @@ namespace TestGlobalAPI {
       }
     }
   });
+  Vue.component("component", {
+    props: {
+      a: [String, Number],
+      b: {
+        type: [Number, Function],
+        required: true
+      }
+    },
+    init: function() {}
+  });
   var transition = Vue.transition("transition");
   Vue.transition("transition", transition);
   Vue.transition("transition", {
diff --git a/vue/vue.d.ts b/vue/vue.d.ts
deleted file mode 100644
index b655cf6d9b..0000000000
--- a/vue/vue.d.ts
+++ /dev/null
@@ -1,255 +0,0 @@
-// Type definitions for vuejs 1.0.16
-// Project: https://github.com/vuejs/vue
-// Definitions by: odangosan <https://github.com/odangosan>, kaorun343 <https://github.com/kaorun343>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface Array<T> {
-    $remove(item: T): Array<T>;
-    $set(index: any, val: T): T;
-}
-
-declare namespace vuejs {
-
-    interface PropOption {
-        type?: { new (...args: any[]): any; };
-        required?: boolean;
-        default?: any;
-        twoWay?: boolean;
-        validator?(value: any): boolean;
-        coerce?(value: any): any;
-    }
-
-    interface ComputedOption {
-        get(): any;
-        set(value: any): void;
-    }
-
-    interface WatchOption {
-        handler(val: any, oldVal: any): void;
-        deep?: boolean;
-        immidiate?: boolean;
-    }
-
-    interface DirectiveOption {
-        bind?(): any;
-        update?(newVal?: any, oldVal?: any): any;
-        unbind?(): any;
-        params?: string[];
-        deep?: boolean;
-        twoWay?: boolean;
-        acceptStatement?: boolean;
-        priority?: number;
-        [key: string]: any;
-    }
-
-    interface FilterOption {
-        read?: Function;
-        write?: Function;
-    }
-
-    interface TransitionOption {
-        css?: boolean;
-        animation?: string;
-        enterClass?: string;
-        leaveClass?: string;
-        beforeEnter?(el: HTMLElement): void;
-        enter?(el: HTMLElement, done?: () => void): void;
-        afterEnter?(el: HTMLElement): void;
-        enterCancelled?(el: HTMLElement): void;
-        beforeLeave?(el: HTMLElement): void;
-        leave?(el: HTMLElement, done?: () => void): void;
-        afterLeave?(el: HTMLElement): void;
-        leaveCancelled?(el: HTMLElement): void;
-        stagger?(index: number): number;
-        enterStagger?(index: number): number;
-        leaveStagger?(index: number): number;
-        [key: string]: any;
-    }
-
-    interface ComponentOption {
-        data?: { [key: string]: any } | Function;
-        props?: string[] | { [key: string]: (PropOption | { new (...args: any[]): any; }) };
-        computed?: { [key: string]: (Function | ComputedOption) };
-        methods?: { [key: string]: Function };
-        watch?: { [key: string]: ((val: any, oldVal: any) => void) | string | WatchOption };
-        el?: string | HTMLElement | (() => HTMLElement);
-        template?: string;
-        replace?: boolean;
-        created?(): void;
-        beforeCompile?(): void;
-        compiled?(): void;
-        ready?(): void;
-        attached?(): void;
-        detached?(): void;
-        beforeDestroy?(): void;
-        destroyed?(): void;
-        activate?(): void;
-        directives?: { [key: string]: (DirectiveOption | Function) };
-        elementDirectives?: { [key: string]: (DirectiveOption | Function) };
-        filters?: { [key: string]: (Function | FilterOption) };
-        components?: { [key: string]: any };
-        transitions?: { [key: string]: TransitionOption };
-        partials?: { [key: string]: string };
-        parent?: Vue;
-        events?: { [key: string]: ((...args: any[]) => (boolean | void)) | string };
-        mixins?: Object[];
-        name?: string;
-        [key: string]: any;
-    }
-
-    interface Vue {
-        $data: any;
-        $el: HTMLElement;
-        $options: Object;
-        $parent: Vue;
-        $root: Vue;
-        $children: Vue[];
-        $refs: Object;
-        $els: Object;
-
-        // instance/api/data.js
-        $get(exp: string, asStatement?: boolean): any;
-        $set<T>(key: string | number, value: T): T;
-        $delete(key: string): void;
-        $eval(expression: string): string;
-        $interpolate(expression: string): string;
-        $log(keypath?: string): void;
-        $watch(expOrFn: string | Function, callback: ((newVal: any, oldVal?: any) => any) | string, options?: { deep?: boolean, immidiate?: boolean }): Function;
-        // instance/api/dom.js
-        $nextTick(callback: Function): void;
-        $appendTo(target: (HTMLElement | string), callback?: Function, withTransition?: boolean): this;
-        $prependTo(target: (HTMLElement | string), callback?: Function, withTransition?: boolean): this;
-        $before(target: (HTMLElement | string), callback?: Function, withTransition?: boolean): this;
-        $after(target: (HTMLElement | string), callback?: Function, withTransition?: boolean): this;
-        $remove(callback?: Function): this;
-        // instance/api/events.js
-        $on(event: string, callback: Function): this;
-        $once(event: string, callback: Function): this;
-        $off(event: string, callback?: Function): this;
-        $emit(event: string, ...args: any[]): this;
-        $broadcast(event: string, ...args: any[]): this;
-        $dispatch(event: string, ...args: any[]): this;
-        // instance/api/lifecycle.js
-        $mount(elementOrSelector?: (HTMLElement | string)): this;
-        $destroy(remove?: boolean): void;
-        $compile(el: Element | DocumentFragment, host?: Vue): Function;
-
-        _init(options?: ComponentOption): void;
-    }
-
-    interface VueConfig {
-        debug: boolean;
-        delimiters: [string, string];
-        unsafeDelimiters: [string, string];
-        silent: boolean;
-        async: boolean;
-        convertAllProperties: boolean;
-    }
-
-    interface VueUtil {
-        // util/lang.js
-        set(obj: Object, key: string, value: any): void;
-        del(obj: Object, key: string): void;
-        hasOwn(obj: Object, key: string): boolean;
-        isLiteral(exp: string): boolean;
-        isReserved(str: string): boolean;
-        _toString(value: any): string;
-        toNumber<T>(value: T): T | number;
-        toBoolean<T>(value: T): T | boolean;
-        stripQuotes(str: string): string;
-        camelize(str: string): string;
-        hyphenate(str: string): string;
-        classify(str: string): string;
-        bind(fn: Function, ctx: Object): Function;
-        toAarray<T>(list: ArrayLike<T>, start?: number): Array<T>;
-        extend<T, F>(to: T, from: F): (T & F);
-        isObject(obj: any): boolean;
-        isPlainObject(obj: any): boolean;
-        isArray: typeof Array.isArray;
-        def(obj: Object, key: string, value: any, enumerable?: boolean): void;
-        debounce(func: Function, wait: number): Function;
-        indexOf<T>(arr: Array<T>, obj: T): number;
-        cancellable(fn: Function): Function;
-        looseEqual(a: any, b: any): boolean;
-        // util/env.js
-        hasProto: boolean;
-        inBrowser: boolean;
-        isIE9: boolean;
-        isAndroid: boolean;
-        transitionProp: string;
-        transitionEndEvent: string;
-        animationProp: string;
-        animationEndEvent: string;
-        nextTick(cb: Function, ctx?: Object): void;
-        // util/dom.js
-        query(el: string | Element): Element;
-        inDoc(node: Node): boolean;
-        getAttr(node: Node, _attr: string): string;
-        getBindAttr(node: Node, name: string): string;
-        before(el: Element, target: Element): void;
-        after(el: Element, target: Element): void;
-        remove(el: Element): void;
-        prepend(el: Element, target: Element): void;
-        replace(target: Element, el: Element): void;
-        on(el: Element, event: string, cb: Function): void;
-        off(el: Element, event: string, cb: Function): void;
-        addClass(el: Element, cls: string): void;
-        removeClass(el: Element, cls: string): void;
-        extractContent(el: Element, asFragment: boolean): (HTMLDivElement | DocumentFragment);
-        trimNode(node: Node): void;
-        isTemplate(el: Element): boolean;
-        createAnchor(content: string, persist: boolean): (Comment | Text);
-        findRef(node: Element): string;
-        mapNodeRange(node: Node, end: Node, op: Function): void;
-        removeNodeRange(start: Node, end: Node, vm: any, frag: DocumentFragment, cb: Function): void;
-        // util/options.js
-        mergeOptions<P, C>(parent: P, child: C, vm?: any): (P & C);
-        resolveAsset(options: Object, type: string, id: string): (Object | Function);
-        assertAsset(val: any, type: string, id: string): void;
-        // util/component.js
-        commonTagRE: RegExp;
-        checkComponentAttr(el: Element, options?: Object): Object;
-        initProp(vm: Vue, prop: Object, value: any): void;
-        assertProp(prop: Object, value: any): boolean;
-        // util/debug.js
-        warn(msg: string, e?: Error): void;
-        // observer/index.js
-        defineReactive(obj: Object, key: string, val: any): void;
-    }
-
-    // instance/api/global.js
-    interface VueStatic {
-        new (options?: ComponentOption): Vue;
-        prototype: Vue;
-        util: VueUtil;
-        config: VueConfig;
-        set(object: Object, key: string, value: any): void;
-        delete(object: Object, key: string): void;
-        nextTick(callback: Function): any;
-
-        cid: number;
-
-        extend(options?: ComponentOption): VueStatic;
-        use(callback: Function | { install: Function, [key: string]: any }, option?: Object): VueStatic;
-        mixin(mixin: Object): void;
-
-        directive<T extends (Function | DirectiveOption)>(id: string, definition: T): T;
-        directive(id: string): any;
-        elementDirective<T extends (Function | DirectiveOption)>(id: string, definition: T): T;
-        elementDirective(id: string): any;
-        filter<T extends (Function | FilterOption)>(id: string, definition: T): T;
-        filter(id: string): any;
-        component(id: string, definition: ComponentOption): any;
-        component(id: string): any;
-        transition<T extends TransitionOption>(id: string, hooks: T): T;
-        transition(id: string): TransitionOption;
-        partial(id: string, partial: string): string;
-        partial(id: string): string;
-    }
-}
-
-declare var Vue: vuejs.VueStatic;
-
-declare module "vue" {
-    export = Vue;
-}
diff --git a/w2ui/index.d.ts b/w2ui/index.d.ts
new file mode 100644
index 0000000000..97e6f396c4
--- /dev/null
+++ b/w2ui/index.d.ts
@@ -0,0 +1,407 @@
+// Type definitions for w2ui 1.4.3
+// Project: http://w2ui.com/
+// Definitions by: Valentin Robert <https://github.com/Ptival/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jquery" />
+
+interface JQuery {
+    w2layout(options: Object): W2UI.W2Layout;
+    w2grid(options: Object): W2UI.W2Grid;
+    w2toolbar(options: Object): W2UI.W2Toolbar;
+    w2sidebar(options: Object): W2UI.W2Sidebar;
+    w2tabs(options: Object): W2UI.W2Tabs;
+    w2form(options: Object): W2UI.W2Form;
+    w2popup(options: Object): W2UI.W2Popup;
+}
+
+declare var w2popup: W2UI.W2Popup
+declare var w2ui: W2UI.W2UI
+
+declare namespace W2UI {
+
+    interface W2Event {
+        target: string;
+    }
+
+    type W2EventHandler = ((e: W2Event) => void) | ((id: string, e: W2Event) => void)
+
+    /* Primitives (first alphabetically, then by documentation order) */
+
+    interface W2Item {
+        checked?: boolean;
+        caption?: string;
+        group?: string;
+        id?: string;
+        img?: string;
+        items?: W2Item[];
+        onClick?: Function;
+        text?: string;
+        type?: string;
+    }
+
+    type W2Object = W2Layout | W2Grid | W2Toolbar | W2Sidebar | W2Tabs | W2Form | W2Popup
+
+    interface W2Panel {
+        content?: string | JQuery;
+        hidden?: boolean;
+        overflow?: string;
+        resizable?: boolean;
+        size?: number | string;
+        style?: string;
+        title?: string;
+        tabs?: W2Tabs;
+        type?: string;
+    }
+
+    interface W2Tab {
+        caption?: string;
+        id?: string;
+    }
+
+    interface W2UI {
+        // morally, [s: string]<T extends W2Common>: T;
+        [s: string]: any;
+    }
+
+    interface W2Common {
+        box: HTMLElement;
+        handlers: Function[];
+        name: string;
+        style: string;
+        destroy(): void;
+        off(type: string | Object, handler?: Function): void;
+        on(type: string | Object, handler?: Function): void;
+        refresh(id?: string): number;
+        render(box?: Object): number;
+        resize(): number;
+        trigger(eventData: Object): Object;
+    }
+
+    interface W2Layout extends W2Common {
+        padding: number;
+        panels: W2Panel[];
+        resizer: number;
+        tmp: Object;
+        content(type: string): HTMLElement[] | W2Object;
+        content(type: string, content: HTMLElement | Object, transition?: string): void;
+        el(type: string): HTMLElement;
+        get(type: string): W2Panel;
+        hide(type: string, immediate?: boolean): void;
+        hideTabs(type: string): void;
+        hideToolbar(type: string): void;
+        html(type: string): string;
+        html(type: string, content?: string | Object, transition?: string): void;
+        load(type: string, url: string, transition?: string, onLoad?: Function): void;
+        lock(panel: string, message: string, showSpinner?: boolean): void;
+        set(type: string, panel: Object): void;
+        show(type: string, immediate?: boolean): void;
+        showTabs(type: string): void;
+        showToolbar(type: string): void;
+        sizeTo(type: string, size: number): void;
+        toggle(type: string, immediate?: boolean): void;
+        toggleTabs(type: string): void;
+        toggleToolbar(type: string): void;
+        unlock(panel: string): void;
+    }
+
+    namespace W2Grid {
+        interface Columns { }
+        interface Ranges { }
+        interface Records { }
+    }
+
+    interface W2Grid extends W2Common, W2OnClickable {
+        autoLoad: boolean;
+        buttons: Object;
+        columnGroups: Object[];
+        columns: Object[];
+        fixedBody: boolean;
+        header: string;
+        keyboard: boolean;
+        last: Object;
+        limit: number;
+        markSearch: boolean;
+        menu: Object[];
+        method: string;
+        msgAJAXerror: string;
+        msgDelete: string;
+        msgNotJSON: string;
+        msgRefresh: string;
+        multiSearch: boolean;
+        multiSelect: boolean;
+        multiSort: boolean;
+        offset: number;
+        parser: Function;
+        postData: Object;
+        ranges: Object[];
+        recid: string;
+        recordHeight: number;
+        records: Object[];
+        reorderColumns: boolean;
+        reorderRows: boolean;
+        routeData: string;
+        searchData: Object[];
+        searches: Object[];
+        selectType: string;
+        show: Object;
+        sortData: Object[];
+        summary: Object[];
+        toolbar: Object;
+        total: number;
+        url: string;
+        add(record: W2Grid.Records | W2Grid.Records[]): number;
+        addColumn(column: W2Grid.Columns | W2Grid.Columns[]): number;
+        addColumn(before: string | number, column: W2Grid.Columns | W2Grid.Columns[]): number;
+        addRange(range: W2Grid.Ranges | W2Grid.Ranges[]): number;
+        addSearch(search: Object | Object[]): number;
+        addSearch(before: string | number, search: Object | Object[]): number;
+        clear(noRefresh?: boolean): void;
+        click(recid: string, event?: Object): void;
+        collapse(recid: string): boolean;
+        columnClick(field: string, event?: Object): boolean;
+        columnOnOff(el: HTMLElement, event: Object, field: string, value: number): void;
+        contextMenu(recid: string, event?: Object): void;
+        copy(): string;
+        dblClick(recid: string, event?: Object): void;
+        delete(force: boolean): void;
+        editField(recid: string, column: number, value?: string, event?: Object): void;
+        error(msg: string): void;
+        expand(recid: string): boolean;
+        find(match: Object, returnIndex?: boolean): Object[] | number[];
+        get(recid: string, returnIndex?: boolean): Object | number | void;
+        getCellHTML(index: number, columnIndex: number, summary?: boolean): string;
+        getCellValue(index: number, columnIndex: number, summary?: boolean): string;
+        getChanges(): Object[];
+        getColumn(field: string, returnIndex?: boolean): Object | number | void;
+        getColumnsHTML(): string;
+        getFooterHTML(): string;
+        getRangeData(range: Object, extra?: boolean): Object[][];
+        getRecordHTML(index: number, lineNumber: number, summary?: boolean): string;
+        getRecordsHTML(): string;
+        getSearch(field: string, returnIndex?: boolean): Object | number | void;
+        getSearchData(field: string): Object | void;
+        getSearchesHTML(): string;
+        getSelection(): Object[]; // the doc is weird here
+        getSummaryHTML(): string;
+        hideColumn(...fields: string[]): number;
+        hideSearch(...fields: string[]): number;
+        initAllField(field: string, value?: string): void;
+        initColumnOnOff(): void;
+        //initOperator(el, searchInd): void; // this is used internally
+        initResize(): void;
+        initSearches(): void;
+        initToolbar(): void;
+        keydown(event: Object): void;
+        load(url: string, callback?: Function): void;
+        localSearch(silent?: boolean): number;
+        localSort(silent?: boolean): number;
+        lock(message: string, showSpinner?: boolean): void;
+        menuClick(recid: string, index: number, event: Object): void;
+        mergeChanges(): void;
+        nextCell(colInd: number, editable: boolean): number | void;
+        nextRow(index: number): number | void;
+        parseField(obj: Object, field: string): any;
+        paste(text: string): void;
+        prevCell(colInd: number, editable: boolean): number | void;
+        prevRow(index: number): number | void;
+        refreshCell(recid: string, field: string): void;
+        refreshRanges(): number;
+        refreshRow(recid: string): void;
+        reload(callback?: Function): void;
+        remove(...recids: string[]): number;
+        removeColumn(...fields: string[]): number;
+        removeRange(...rangeNames: string[]): number;
+        removeSearch(...fields: string[]): number;
+        request(cmd: string, params?: Object, url?: string, callback?: Function): void;
+        requestComplete(status: string, cmd: string, callback?: Function): void;
+        reset(noRefresh?: boolean): void;
+        resizeBoxes(): void;
+        resizeRecords(): void;
+        save(): void;
+        scroll(event: Object): void;
+        scrollIntoView(ind: number): void;
+        search(field: string, value: string): void;
+        search(searches: Object[], logic?: string): void;
+        searchClose(): void;
+        searchOpen(): void;
+        searchReset(noRefresh?: boolean): void;
+        searchShowFields(): void;
+        select(...recids: string[]): number;
+        selectAll(): void;
+        selectNone(): void;
+        set(record: Object, noRefresh?: boolean): boolean;
+        set(recid: string, record: Object, noRefresh?: boolean): boolean;
+        showColumn(...fields: string[]): number;
+        showSearch(...fields: string[]): number;
+        skip(offset: number): number;
+        sort(): void;
+        sort(field: string, direction?: string, multiField?: boolean): void;
+        stateReset(): void;
+        stateRestore(stateObj?: Object): Object | void;
+        stateSave(returnOnly?: boolean): Object | void;
+        status(msg?: string): void;
+        toggle(recid: string): void;
+        toggleColumn(...fields: string[]): number;
+        toggleSearch(...fields: string[]): number;
+        toolbarAdd(): void;
+        toolbarDelete(force?: boolean): void;
+        unlock(): void;
+        unselect(...recids: string[]): number;
+    }
+
+    interface W2Toolbar extends W2Common, W2OnClickable {
+        items: W2Item[];
+        right: string;
+        routeData: string;
+        add(items: Object | Object[]): void;
+        check(...ids: string[]): number;
+        click(id: string, event?: Object): void;
+        disable(...ids: string[]): number;
+        enable(...ids: string[]): number;
+        get(id: string, returnIndex?: boolean): Object | number | void;
+        getItemHTML(item: Object): string;
+        hide(...ids: string[]): number;
+        insert(before: string, items: Object | Object[]): void;
+        menuClick(id: string, menuIndex: number, event?: Object): void;
+        remove(...ids: string[]): number;
+        set(id: string, item: Object): boolean;
+        show(...ids: string[]): number;
+        uncheck(...ids: string[]): number;
+    }
+
+    interface W2Sidebar extends W2Common, W2OnClickable {
+        bottomHTML: string;
+        icon: string;
+        img: string;
+        keyboard: boolean;
+        menu: Object[];
+        nodes: Object[];
+        parent: W2Common;
+        routeData: string;
+        selected: string;
+        sidebar: Object;
+        topHTML: string;
+        add(nodes: Object | Object[]): Object;
+        add(parent: string, nodes: Object | Object[]): Object;
+        click(id: string, event?: Object): void;
+        collapse(id: string): void;
+        collapseAll(parent?: string): void;
+        contextMenu(id: string, event?: Object): void;
+        dblClick(id: string, event?: Object): void;
+        disable(...ids: string[]): number;
+        enable(...ids: string[]): number;
+        expand(id: string): void;
+        expandAll(parent?: string): void;
+        expandParents(id: string): void;
+        find(attrs: Object): Object[];
+        find(parent: string, attrs: Object): Object[];
+        get(): Object | number | void;
+        get(id: string, returnIndex?: boolean): Object | number | void;
+        get(parent: string, id: string, returnIndex?: boolean): Object | number | void;
+        hide(...ids: string[]): number;
+        insert(before: string | Object, nodes: Object | Object[]): Object;
+        insert(parent: string, before: string | Object, nodes: Object | Object[]): Object;
+        keydown(event: Object): void;
+        lock(message: string, showSpinner?: boolean): void;
+        menuClick(id: string, index: number, event?: Object): void;
+        remove(...ids: string[]): number;
+        scrollIntoView(id?: string): void;
+        select(id: string): void;
+        set(id: string, node: Object): boolean;
+        set(parent: string, id: string, node: Object): boolean;
+        show(...ids: string[]): number;
+        toggle(id: string): void;
+        unlock(): void;
+        unselect(id: string): boolean;
+    }
+
+    interface W2Tabs extends W2Common, W2OnClickable {
+        active: string;
+        right: string;
+        routeData: string;
+        tabs: W2Tab[];
+        add(tabs: Object | Object[]): void;
+        animateClose(id: string, event?: Object | Object[]): void;
+        animateInsert(before: string, tabs: Object | Object[]): void;
+        click(id: string, event?: Object): void;
+        disable(...ids: string[]): number;
+        enable(...ids: string[]): number;
+        get(id: string, returnIndex?: boolean): Object | number | void;
+        hide(...ids: string[]): number;
+        insert(before: string, tabs: Object | Object[]): void;
+        remove(...ids: string[]): number;
+        select(id: string): boolean;
+        set(id: string, tab: Object): boolean;
+        show(...ids: string[]): number;
+    }
+
+    interface W2Form extends W2Common {
+        actions: Object;
+        fields: Object[];
+        focus: number;
+        formHTML: string;
+        formURL: string;
+        header: string;
+        isGenerated: boolean;
+        last: Object;
+        msgAJAXerror: string;
+        msgNotJSON: string;
+        msgRefresh: string;
+        msgSaving: string;
+        original: Object;
+        page: number;
+        postData: Object;
+        recid: number;
+        record: Object;
+        routeData: string;
+        tabs: Object;
+        toolbar: Object;
+        url: string;
+        action(action: string, event?: Object): void;
+        clear(): void;
+        error(msg: string): void;
+        generateHTML(): string;
+        get(): Object | number | void;
+        get(field: string, returnIndex?: boolean): Object | number | void;
+        getChanges(): Object;
+        goto(page: number): void;
+        lock(message: string, showSpinner?: boolean): void;
+        reload(callback?: Function): void;
+        request(postData?: Object, callback?: Function): void;
+        save(postData?: Object, callback?: Function): void;
+        set(field: string, obj: Object): boolean;
+        submit(postData?: Object, callback?: Function): void;
+        unlock(): void;
+        validate(showErrors?: boolean): Object[];
+    }
+
+    interface W2Popup extends W2Common {
+        defaults: Object;
+        status: string;
+        clear(): void;
+        close(): void;
+        get(): Object;
+        keydown(event: Object): void;
+        load(options: Object): void;
+        lock(message: string, showSpinner?: boolean): void;
+        lockScreen(options?: Object): void;
+        max(): void;
+        message(msgOptions: Object): void;
+        min(): void;
+        open(options: Object): void;
+        reset(): void;
+        resize(): void;
+        resize(width?: number, height?: number, callback?: Function): number;
+        set(options: Object): void;
+        toggle(): void;
+        unlock(): void;
+        unlockScreen(): void;
+    }
+
+    interface W2OnClickable {
+      onClick(event: W2Event): void;
+      onClick(id: string, data: W2Event): void;
+    }
+
+}
diff --git a/w2ui/tsconfig.json b/w2ui/tsconfig.json
new file mode 100644
index 0000000000..6278c38806
--- /dev/null
+++ b/w2ui/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "w2ui-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/w2ui/w2ui-tests.ts b/w2ui/w2ui-tests.ts
index ba858cde5f..e2f6c76092 100644
--- a/w2ui/w2ui-tests.ts
+++ b/w2ui/w2ui-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="w2ui.d.ts" />
+
 
 $(function() {
 
diff --git a/w2ui/w2ui.d.ts b/w2ui/w2ui.d.ts
deleted file mode 100644
index d75777b8f0..0000000000
--- a/w2ui/w2ui.d.ts
+++ /dev/null
@@ -1,407 +0,0 @@
-// Type definitions for w2ui 1.4.3
-// Project: http://w2ui.com/
-// Definitions by: Valentin Robert <https://github.com/Ptival/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface JQuery {
-    w2layout(options: Object): W2UI.W2Layout;
-    w2grid(options: Object): W2UI.W2Grid;
-    w2toolbar(options: Object): W2UI.W2Toolbar;
-    w2sidebar(options: Object): W2UI.W2Sidebar;
-    w2tabs(options: Object): W2UI.W2Tabs;
-    w2form(options: Object): W2UI.W2Form;
-    w2popup(options: Object): W2UI.W2Popup;
-}
-
-declare var w2popup: W2UI.W2Popup
-declare var w2ui: W2UI.W2UI
-
-declare namespace W2UI {
-
-    interface W2Event {
-        target: string;
-    }
-
-    type W2EventHandler = ((e: W2Event) => void) | ((id: string, e: W2Event) => void)
-
-    /* Primitives (first alphabetically, then by documentation order) */
-
-    interface W2Item {
-        checked?: boolean;
-        caption?: string;
-        group?: string;
-        id?: string;
-        img?: string;
-        items?: W2Item[];
-        onClick?: Function;
-        text?: string;
-        type?: string;
-    }
-
-    type W2Object = W2Layout | W2Grid | W2Toolbar | W2Sidebar | W2Tabs | W2Form | W2Popup
-
-    interface W2Panel {
-        content?: string | JQuery;
-        hidden?: boolean;
-        overflow?: string;
-        resizable?: boolean;
-        size?: number | string;
-        style?: string;
-        title?: string;
-        tabs?: W2Tabs;
-        type?: string;
-    }
-
-    interface W2Tab {
-        caption?: string;
-        id?: string;
-    }
-
-    interface W2UI {
-        // morally, [s: string]<T extends W2Common>: T;
-        [s: string]: any;
-    }
-
-    interface W2Common {
-        box: HTMLElement;
-        handlers: Function[];
-        name: string;
-        style: string;
-        destroy(): void;
-        off(type: string | Object, handler?: Function): void;
-        on(type: string | Object, handler?: Function): void;
-        refresh(id?: string): number;
-        render(box?: Object): number;
-        resize(): number;
-        trigger(eventData: Object): Object;
-    }
-
-    interface W2Layout extends W2Common {
-        padding: number;
-        panels: W2Panel[];
-        resizer: number;
-        tmp: Object;
-        content(type: string): HTMLElement[] | W2Object;
-        content(type: string, content: HTMLElement | Object, transition?: string): void;
-        el(type: string): HTMLElement;
-        get(type: string): W2Panel;
-        hide(type: string, immediate?: boolean): void;
-        hideTabs(type: string): void;
-        hideToolbar(type: string): void;
-        html(type: string): string;
-        html(type: string, content?: string | Object, transition?: string): void;
-        load(type: string, url: string, transition?: string, onLoad?: Function): void;
-        lock(panel: string, message: string, showSpinner?: boolean): void;
-        set(type: string, panel: Object): void;
-        show(type: string, immediate?: boolean): void;
-        showTabs(type: string): void;
-        showToolbar(type: string): void;
-        sizeTo(type: string, size: number): void;
-        toggle(type: string, immediate?: boolean): void;
-        toggleTabs(type: string): void;
-        toggleToolbar(type: string): void;
-        unlock(panel: string): void;
-    }
-
-    namespace W2Grid {
-        interface Columns { }
-        interface Ranges { }
-        interface Records { }
-    }
-
-    interface W2Grid extends W2Common, W2OnClickable {
-        autoLoad: boolean;
-        buttons: Object;
-        columnGroups: Object[];
-        columns: Object[];
-        fixedBody: boolean;
-        header: string;
-        keyboard: boolean;
-        last: Object;
-        limit: number;
-        markSearch: boolean;
-        menu: Object[];
-        method: string;
-        msgAJAXerror: string;
-        msgDelete: string;
-        msgNotJSON: string;
-        msgRefresh: string;
-        multiSearch: boolean;
-        multiSelect: boolean;
-        multiSort: boolean;
-        offset: number;
-        parser: Function;
-        postData: Object;
-        ranges: Object[];
-        recid: string;
-        recordHeight: number;
-        records: Object[];
-        reorderColumns: boolean;
-        reorderRows: boolean;
-        routeData: string;
-        searchData: Object[];
-        searches: Object[];
-        selectType: string;
-        show: Object;
-        sortData: Object[];
-        summary: Object[];
-        toolbar: Object;
-        total: number;
-        url: string;
-        add(record: W2Grid.Records | W2Grid.Records[]): number;
-        addColumn(column: W2Grid.Columns | W2Grid.Columns[]): number;
-        addColumn(before: string | number, column: W2Grid.Columns | W2Grid.Columns[]): number;
-        addRange(range: W2Grid.Ranges | W2Grid.Ranges[]): number;
-        addSearch(search: Object | Object[]): number;
-        addSearch(before: string | number, search: Object | Object[]): number;
-        clear(noRefresh?: boolean): void;
-        click(recid: string, event?: Object): void;
-        collapse(recid: string): boolean;
-        columnClick(field: string, event?: Object): boolean;
-        columnOnOff(el: HTMLElement, event: Object, field: string, value: number): void;
-        contextMenu(recid: string, event?: Object): void;
-        copy(): string;
-        dblClick(recid: string, event?: Object): void;
-        delete(force: boolean): void;
-        editField(recid: string, column: number, value?: string, event?: Object): void;
-        error(msg: string): void;
-        expand(recid: string): boolean;
-        find(match: Object, returnIndex?: boolean): Object[] | number[];
-        get(recid: string, returnIndex?: boolean): Object | number | void;
-        getCellHTML(index: number, columnIndex: number, summary?: boolean): string;
-        getCellValue(index: number, columnIndex: number, summary?: boolean): string;
-        getChanges(): Object[];
-        getColumn(field: string, returnIndex?: boolean): Object | number | void;
-        getColumnsHTML(): string;
-        getFooterHTML(): string;
-        getRangeData(range: Object, extra?: boolean): Object[][];
-        getRecordHTML(index: number, lineNumber: number, summary?: boolean): string;
-        getRecordsHTML(): string;
-        getSearch(field: string, returnIndex?: boolean): Object | number | void;
-        getSearchData(field: string): Object | void;
-        getSearchesHTML(): string;
-        getSelection(): Object[]; // the doc is weird here
-        getSummaryHTML(): string;
-        hideColumn(...fields: string[]): number;
-        hideSearch(...fields: string[]): number;
-        initAllField(field: string, value?: string): void;
-        initColumnOnOff(): void;
-        //initOperator(el, searchInd): void; // this is used internally
-        initResize(): void;
-        initSearches(): void;
-        initToolbar(): void;
-        keydown(event: Object): void;
-        load(url: string, callback?: Function): void;
-        localSearch(silent?: boolean): number;
-        localSort(silent?: boolean): number;
-        lock(message: string, showSpinner?: boolean): void;
-        menuClick(recid: string, index: number, event: Object): void;
-        mergeChanges(): void;
-        nextCell(colInd: number, editable: boolean): number | void;
-        nextRow(index: number): number | void;
-        parseField(obj: Object, field: string): any;
-        paste(text: string): void;
-        prevCell(colInd: number, editable: boolean): number | void;
-        prevRow(index: number): number | void;
-        refreshCell(recid: string, field: string): void;
-        refreshRanges(): number;
-        refreshRow(recid: string): void;
-        reload(callback?: Function): void;
-        remove(...recids: string[]): number;
-        removeColumn(...fields: string[]): number;
-        removeRange(...rangeNames: string[]): number;
-        removeSearch(...fields: string[]): number;
-        request(cmd: string, params?: Object, url?: string, callback?: Function): void;
-        requestComplete(status: string, cmd: string, callback?: Function): void;
-        reset(noRefresh?: boolean): void;
-        resizeBoxes(): void;
-        resizeRecords(): void;
-        save(): void;
-        scroll(event: Object): void;
-        scrollIntoView(ind: number): void;
-        search(field: string, value: string): void;
-        search(searches: Object[], logic?: string): void;
-        searchClose(): void;
-        searchOpen(): void;
-        searchReset(noRefresh?: boolean): void;
-        searchShowFields(): void;
-        select(...recids: string[]): number;
-        selectAll(): void;
-        selectNone(): void;
-        set(record: Object, noRefresh?: boolean): boolean;
-        set(recid: string, record: Object, noRefresh?: boolean): boolean;
-        showColumn(...fields: string[]): number;
-        showSearch(...fields: string[]): number;
-        skip(offset: number): number;
-        sort(): void;
-        sort(field: string, direction?: string, multiField?: boolean): void;
-        stateReset(): void;
-        stateRestore(stateObj?: Object): Object | void;
-        stateSave(returnOnly?: boolean): Object | void;
-        status(msg?: string): void;
-        toggle(recid: string): void;
-        toggleColumn(...fields: string[]): number;
-        toggleSearch(...fields: string[]): number;
-        toolbarAdd(): void;
-        toolbarDelete(force?: boolean): void;
-        unlock(): void;
-        unselect(...recids: string[]): number;
-    }
-
-    interface W2Toolbar extends W2Common, W2OnClickable {
-        items: W2Item[];
-        right: string;
-        routeData: string;
-        add(items: Object | Object[]): void;
-        check(...ids: string[]): number;
-        click(id: string, event?: Object): void;
-        disable(...ids: string[]): number;
-        enable(...ids: string[]): number;
-        get(id: string, returnIndex?: boolean): Object | number | void;
-        getItemHTML(item: Object): string;
-        hide(...ids: string[]): number;
-        insert(before: string, items: Object | Object[]): void;
-        menuClick(id: string, menuIndex: number, event?: Object): void;
-        remove(...ids: string[]): number;
-        set(id: string, item: Object): boolean;
-        show(...ids: string[]): number;
-        uncheck(...ids: string[]): number;
-    }
-
-    interface W2Sidebar extends W2Common, W2OnClickable {
-        bottomHTML: string;
-        icon: string;
-        img: string;
-        keyboard: boolean;
-        menu: Object[];
-        nodes: Object[];
-        parent: W2Common;
-        routeData: string;
-        selected: string;
-        sidebar: Object;
-        topHTML: string;
-        add(nodes: Object | Object[]): Object;
-        add(parent: string, nodes: Object | Object[]): Object;
-        click(id: string, event?: Object): void;
-        collapse(id: string): void;
-        collapseAll(parent?: string): void;
-        contextMenu(id: string, event?: Object): void;
-        dblClick(id: string, event?: Object): void;
-        disable(...ids: string[]): number;
-        enable(...ids: string[]): number;
-        expand(id: string): void;
-        expandAll(parent?: string): void;
-        expandParents(id: string): void;
-        find(attrs: Object): Object[];
-        find(parent: string, attrs: Object): Object[];
-        get(): Object | number | void;
-        get(id: string, returnIndex?: boolean): Object | number | void;
-        get(parent: string, id: string, returnIndex?: boolean): Object | number | void;
-        hide(...ids: string[]): number;
-        insert(before: string | Object, nodes: Object | Object[]): Object;
-        insert(parent: string, before: string | Object, nodes: Object | Object[]): Object;
-        keydown(event: Object): void;
-        lock(message: string, showSpinner?: boolean): void;
-        menuClick(id: string, index: number, event?: Object): void;
-        remove(...ids: string[]): number;
-        scrollIntoView(id?: string): void;
-        select(id: string): void;
-        set(id: string, node: Object): boolean;
-        set(parent: string, id: string, node: Object): boolean;
-        show(...ids: string[]): number;
-        toggle(id: string): void;
-        unlock(): void;
-        unselect(id: string): boolean;
-    }
-
-    interface W2Tabs extends W2Common, W2OnClickable {
-        active: string;
-        right: string;
-        routeData: string;
-        tabs: W2Tab[];
-        add(tabs: Object | Object[]): void;
-        animateClose(id: string, event?: Object | Object[]): void;
-        animateInsert(before: string, tabs: Object | Object[]): void;
-        click(id: string, event?: Object): void;
-        disable(...ids: string[]): number;
-        enable(...ids: string[]): number;
-        get(id: string, returnIndex?: boolean): Object | number | void;
-        hide(...ids: string[]): number;
-        insert(before: string, tabs: Object | Object[]): void;
-        remove(...ids: string[]): number;
-        select(id: string): boolean;
-        set(id: string, tab: Object): boolean;
-        show(...ids: string[]): number;
-    }
-
-    interface W2Form extends W2Common {
-        actions: Object;
-        fields: Object[];
-        focus: number;
-        formHTML: string;
-        formURL: string;
-        header: string;
-        isGenerated: boolean;
-        last: Object;
-        msgAJAXerror: string;
-        msgNotJSON: string;
-        msgRefresh: string;
-        msgSaving: string;
-        original: Object;
-        page: number;
-        postData: Object;
-        recid: number;
-        record: Object;
-        routeData: string;
-        tabs: Object;
-        toolbar: Object;
-        url: string;
-        action(action: string, event?: Object): void;
-        clear(): void;
-        error(msg: string): void;
-        generateHTML(): string;
-        get(): Object | number | void;
-        get(field: string, returnIndex?: boolean): Object | number | void;
-        getChanges(): Object;
-        goto(page: number): void;
-        lock(message: string, showSpinner?: boolean): void;
-        reload(callback?: Function): void;
-        request(postData?: Object, callback?: Function): void;
-        save(postData?: Object, callback?: Function): void;
-        set(field: string, obj: Object): boolean;
-        submit(postData?: Object, callback?: Function): void;
-        unlock(): void;
-        validate(showErrors?: boolean): Object[];
-    }
-
-    interface W2Popup extends W2Common {
-        defaults: Object;
-        status: string;
-        clear(): void;
-        close(): void;
-        get(): Object;
-        keydown(event: Object): void;
-        load(options: Object): void;
-        lock(message: string, showSpinner?: boolean): void;
-        lockScreen(options?: Object): void;
-        max(): void;
-        message(msgOptions: Object): void;
-        min(): void;
-        open(options: Object): void;
-        reset(): void;
-        resize(): void;
-        resize(width?: number, height?: number, callback?: Function): number;
-        set(options: Object): void;
-        toggle(): void;
-        unlock(): void;
-        unlockScreen(): void;
-    }
-
-    interface W2OnClickable {
-      onClick(event: W2Event): void;
-      onClick(id: string, data: W2Event): void;
-    }
-
-}
diff --git a/wake_on_lan/index.d.ts b/wake_on_lan/index.d.ts
new file mode 100644
index 0000000000..22358c02b1
--- /dev/null
+++ b/wake_on_lan/index.d.ts
@@ -0,0 +1,71 @@
+// Type definitions for wake_on_lan
+// Project: https://github.com/agnat/node_wake_on_lan
+// Definitions by: Tobias Kahlert <https://github.com/SrTobi>
+// Definitions: https://github.com/SrTobi/DefinitelyTyped
+
+/// <reference types="node"/>
+
+declare var wol: wol.Wol;
+export = wol;
+
+declare namespace wol {
+
+	export interface WakeOptions {
+
+		/**
+		 * The ip address to which the packet is send  (default: 255.255.255.255)
+		 */
+		address?:string;
+
+		/**
+		 * Number of packets to send (default: 3)
+		 */
+		num_packets?:number;
+
+		/**
+		 * The interval between packets (default: 100ms)
+		 */
+		interval?:number;
+
+		/**
+		 * The port to send to (default: 9)
+		 */
+		port?:number;
+	}
+
+	type ErrorCallback = (Error:any) => void;
+
+	export interface Wol {
+		/**
+		 * Send a sequence of Wake-on-LAN magic packets to the given MAC address.
+		 *
+		 * @param {string} macAddress the mac address of the target device
+		 */
+		wake(macAddress:string):void;
+
+		/**
+		 * Send a sequence of Wake-on-LAN magic packets to the given MAC address.
+		 *
+		 * @param {string} macAddress the mac address of the target device
+		 * @param {ErrorCallback} callback is called when all packets have been sent or an error occurs.
+		 */
+		wake(macAddress:string, callback:ErrorCallback):void;
+
+		/**
+		 * Send a sequence of Wake-on-LAN magic packets to the given MAC address.
+		 *
+		 * @param {string} macAddress the mac address of the target device
+		 * @param {WakeOptions} opts additional options to send the packet
+		 * @param {ErrorCallback} callback is called when all packets have been sent or an error occurs.
+		 */
+		wake(macAddress:string, opts:WakeOptions, callback?:Function):void;
+
+		/**
+		 * Creates a buffer with a magic packet for the given MAC address.
+		 *
+		 * @param {string} macAddress mac address of the target device
+		 * @return {Buffer} the magic packet
+		 */
+		createMagicPacket(macAddress:string):Buffer;
+	}
+}
diff --git a/wake_on_lan/tsconfig.json b/wake_on_lan/tsconfig.json
new file mode 100644
index 0000000000..df6caa12a7
--- /dev/null
+++ b/wake_on_lan/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "wake_on_lan-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/wake_on_lan/wake_on_lan-tests.ts b/wake_on_lan/wake_on_lan-tests.ts
index 35c8754cde..3403d5c9fe 100644
--- a/wake_on_lan/wake_on_lan-tests.ts
+++ b/wake_on_lan/wake_on_lan-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="wake_on_lan.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import wol = require('wake_on_lan');
 
diff --git a/wake_on_lan/wake_on_lan.d.ts b/wake_on_lan/wake_on_lan.d.ts
deleted file mode 100644
index a50d9d24f0..0000000000
--- a/wake_on_lan/wake_on_lan.d.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-// Type definitions for wake_on_lan
-// Project: https://github.com/agnat/node_wake_on_lan
-// Definitions by: Tobias Kahlert <https://github.com/SrTobi>
-// Definitions: https://github.com/SrTobi/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-
-declare namespace wol {
-
-	export interface WakeOptions {
-
-		/**
-		 * The ip address to which the packet is send  (default: 255.255.255.255)
-		 */
-		address?:string;
-
-		/**
-		 * Number of packets to send (default: 3)
-		 */
-		num_packets?:number;
-
-		/**
-		 * The interval between packets (default: 100ms)
-		 */
-		interval?:number;
-
-		/**
-		 * The port to send to (default: 9)
-		 */
-		port?:number;
-	}
-
-	type ErrorCallback = (Error:any) => void;
-
-	export interface Wol {
-		/**
-		 * Send a sequence of Wake-on-LAN magic packets to the given MAC address.
-		 *
-		 * @param {string} macAddress the mac address of the target device
-		 */
-		wake(macAddress:string):void;
-
-		/**
-		 * Send a sequence of Wake-on-LAN magic packets to the given MAC address.
-		 *
-		 * @param {string} macAddress the mac address of the target device
-		 * @param {ErrorCallback} callback is called when all packets have been sent or an error occurs.
-		 */
-		wake(macAddress:string, callback:ErrorCallback):void;
-
-		/**
-		 * Send a sequence of Wake-on-LAN magic packets to the given MAC address.
-		 *
-		 * @param {string} macAddress the mac address of the target device
-		 * @param {WakeOptions} opts additional options to send the packet
-		 * @param {ErrorCallback} callback is called when all packets have been sent or an error occurs.
-		 */
-		wake(macAddress:string, opts:WakeOptions, callback?:Function):void;
-
-		/**
-		 * Creates a buffer with a magic packet for the given MAC address.
-		 *
-		 * @param {string} macAddress mac address of the target device
-		 * @return {Buffer} the magic packet
-		 */
-		createMagicPacket(macAddress:string):Buffer;
-	}
-}
-
-declare module 'wake_on_lan' {
-	var wol: wol.Wol;
-	export = wol;
-}
diff --git a/wampy/index.d.ts b/wampy/index.d.ts
new file mode 100644
index 0000000000..658b82368e
--- /dev/null
+++ b/wampy/index.d.ts
@@ -0,0 +1,92 @@
+// Type definitions for wampy.js v2.0.1
+// Project: https://github.com/KSDaemon/wampy.js
+// Definitions by: Konstantin Burkalev <https://github.com/KSDaemon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+interface WampyOptions {
+    autoReconnect?: boolean;
+    reconnectInterval?: number;
+    maxRetries?: number;
+    transportEncoding?: string;
+    realm?: string;
+    helloCustomDetails?: any;
+    onConnect?: () => void;
+    onClose?: () => void;
+    onError?: () => void;
+    onReconnect?: () => void;
+    ws?: any;
+    msgpackCoder?: any;
+}
+
+interface WampyOpStatus {
+    code: number;
+    description: string;
+    reqId?: number;
+}
+
+interface SuccessErrorCallbacksHash {
+    onSuccess?: (data: any) => void;
+    onError?: (err: string) => void;
+}
+
+interface SubscribeCallbacksHash extends SuccessErrorCallbacksHash {
+    onEvent: (data: any) => void;
+}
+
+interface RegisterCallbacksHash extends SuccessErrorCallbacksHash {
+    rpc: (data: any) => any;
+}
+
+interface CallSuccessErrorCallbacksHash {
+    onSuccess: (data: any) => any;
+    onError?: (err: string) => void;
+}
+
+interface AdvancedOptions {
+    exclude?: number | number[];
+    eligible?: number | number[];
+    exclude_me?: boolean;
+    disclose_me?: boolean;
+}
+
+interface CallAdvancedOptions extends AdvancedOptions {
+    receive_progress?: boolean;
+}
+
+interface CancelAdvancedOptions {
+    mode?: "skip" | "kill" | "killnowait";
+}
+
+interface Wampy {
+    options(opts?: WampyOptions): WampyOptions | Wampy;
+    getOpStatus(): WampyOpStatus;
+    getSessionId(): number;
+    connect(url?: string): Wampy;
+    disconnect(): Wampy;
+    abort(): Wampy;
+    subscribe(topicURI: string, callbacks: (((data: any) => void) | SubscribeCallbacksHash)): Wampy;
+    unsubscribe(topicURI: string, callbacks?: (((data: any) => void) | SubscribeCallbacksHash)): Wampy;
+    publish(topicURI: string,
+        payload?: any,
+        callbacks?: SuccessErrorCallbacksHash,
+        advancedOptions?: AdvancedOptions): Wampy;
+    call(topicURI: string,
+        payload?: any,
+        callbacks?: (((data: any) => void) | CallSuccessErrorCallbacksHash),
+        advancedOptions?: CallAdvancedOptions): Wampy;
+    cancel(reqId: number,
+        callbacks?: ((() => void) | SuccessErrorCallbacksHash),
+        advancedOptions?: CancelAdvancedOptions): Wampy;
+    register(topicURI: string, callbacks: (((data: any) => any) | RegisterCallbacksHash)): Wampy;
+    unregister(topicURI: string, callbacks?: ((() => void) | SuccessErrorCallbacksHash)): Wampy;
+}
+
+interface WampyInstance {
+    new (url?: string, options?: WampyOptions): Wampy;
+}
+
+declare var wampy: WampyInstance;
+
+export default wampy;
diff --git a/wampy/tsconfig.json b/wampy/tsconfig.json
new file mode 100644
index 0000000000..d77105b4f5
--- /dev/null
+++ b/wampy/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "wampy-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/wampy/wampy-tests.ts b/wampy/wampy-tests.ts
index f7dcf9fe52..b74c31a5fd 100644
--- a/wampy/wampy-tests.ts
+++ b/wampy/wampy-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="wampy.d.ts" />
-/// <reference path="../node/node.d.ts" />
+
+/// <reference types="node" />
 
 import Wampy from 'wampy';
 
diff --git a/wampy/wampy.d.ts b/wampy/wampy.d.ts
deleted file mode 100644
index 650a8a91a5..0000000000
--- a/wampy/wampy.d.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-// Type definitions for wampy.js v2.0.1
-// Project: https://github.com/KSDaemon/wampy.js
-// Definitions by: Konstantin Burkalev <https://github.com/KSDaemon>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "wampy" {
-
-    interface WampyOptions {
-        autoReconnect?: boolean;
-        reconnectInterval?: number;
-        maxRetries?: number;
-        transportEncoding?: string;
-        realm?: string;
-        helloCustomDetails?: any;
-        onConnect?: () => void;
-        onClose?: () => void;
-        onError?: () => void;
-        onReconnect?: () => void;
-        ws?: any;
-        msgpackCoder?: any;
-    }
-
-    interface WampyOpStatus {
-        code: number;
-        description: string;
-        reqId?: number;
-    }
-
-    interface SuccessErrorCallbacksHash {
-        onSuccess?: (data: any) => void;
-        onError?: (err: string) => void;
-    }
-
-    interface SubscribeCallbacksHash extends SuccessErrorCallbacksHash {
-        onEvent: (data: any) => void;
-    }
-
-    interface RegisterCallbacksHash extends SuccessErrorCallbacksHash {
-        rpc: (data: any) => any;
-    }
-
-    interface CallSuccessErrorCallbacksHash {
-        onSuccess: (data: any) => any;
-        onError?: (err: string) => void;
-    }
-
-    interface AdvancedOptions {
-        exclude?: number | number[];
-        eligible?: number | number[];
-        exclude_me?: boolean;
-        disclose_me?: boolean;
-    }
-
-    interface CallAdvancedOptions extends AdvancedOptions {
-        receive_progress?: boolean;
-    }
-
-    interface CancelAdvancedOptions {
-        mode?: "skip" | "kill" | "killnowait";
-    }
-
-    interface Wampy {
-        options(opts?: WampyOptions): WampyOptions | Wampy;
-        getOpStatus(): WampyOpStatus;
-        getSessionId(): number;
-        connect(url?: string): Wampy;
-        disconnect(): Wampy;
-        abort(): Wampy;
-        subscribe(topicURI: string, callbacks: (((data: any) => void) | SubscribeCallbacksHash)): Wampy;
-        unsubscribe(topicURI: string, callbacks?: (((data: any) => void) | SubscribeCallbacksHash)): Wampy;
-        publish(topicURI: string,
-                payload?: any,
-                callbacks?: SuccessErrorCallbacksHash,
-                advancedOptions?: AdvancedOptions): Wampy;
-        call(topicURI: string,
-             payload?: any,
-             callbacks?: (((data: any) => void) | CallSuccessErrorCallbacksHash),
-             advancedOptions?: CallAdvancedOptions): Wampy;
-        cancel(reqId: number,
-               callbacks?: ((() => void) | SuccessErrorCallbacksHash),
-               advancedOptions?: CancelAdvancedOptions): Wampy;
-        register(topicURI: string, callbacks: (((data: any) => any) | RegisterCallbacksHash)): Wampy;
-        unregister(topicURI: string, callbacks?: ((() => void) | SuccessErrorCallbacksHash)): Wampy;
-    }
-
-    interface WampyInstance {
-        new(url?: string, options?: WampyOptions): Wampy;
-    }
-
-    var wampy: WampyInstance;
-
-    export default wampy;
-}
diff --git a/watch/index.d.ts b/watch/index.d.ts
new file mode 100644
index 0000000000..78ffdca016
--- /dev/null
+++ b/watch/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for watch
+// Project: https://github.com/mikeal/watch
+// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/watch.d.ts
+
+/// <reference types="node" />
+
+
+import fs = require("fs");
+import events = require("events");
+
+export interface Monitor extends events.EventEmitter {
+    // event: created
+    // event: removed
+    // event: changed
+
+    // export function onCreated(callback, function(f, stat: fs.Stats) { });
+    // export function onChanged(callback, function(f, curr: fs.Stats, prev: fs.Stats) { });
+    // export function onRemoved(callback, function(f, stat: fs.Stats) { });
+}
+
+export interface Options {
+    persistent?: boolean;
+    ignoreDotFiles?: boolean;
+    filter?: any;
+    interval?: number;
+}
+
+export declare function watchTree(root: string, callback: (f: any, curr: fs.Stats, prev: fs.Stats) => void): void;
+export declare function watchTree(root: string, options: Options, callback: (f: any, curr: fs.Stats, prev: fs.Stats) => void): void;
+export declare function unwatchTree(root: string): void;
+export declare function createMonitor(root: string, callback: (monitor: Monitor) => void): void;
+export declare function createMonitor(root: string, options: Options, callback: (monitor: Monitor) => void): void;
diff --git a/watch/tsconfig.json b/watch/tsconfig.json
new file mode 100644
index 0000000000..616487b79b
--- /dev/null
+++ b/watch/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "watch-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/watch/watch-tests.ts b/watch/watch-tests.ts
index d6be4092dc..9510d6dfb7 100644
--- a/watch/watch-tests.ts
+++ b/watch/watch-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="watch.d.ts" />
 
 import watch = require('watch');
 import fs = require('fs');
diff --git a/watch/watch.d.ts b/watch/watch.d.ts
deleted file mode 100644
index 77e1c0d66a..0000000000
--- a/watch/watch.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Type definitions for watch
-// Project: https://github.com/mikeal/watch
-// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/watch.d.ts
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "watch" {
-	import fs = require("fs");
-	import events = require("events");
-
-	export interface Monitor extends events.EventEmitter {
-		// event: created
-		// event: removed
-		// event: changed
-
-		// export function onCreated(callback, function(f, stat: fs.Stats) { });
-		// export function onChanged(callback, function(f, curr: fs.Stats, prev: fs.Stats) { });
-		// export function onRemoved(callback, function(f, stat: fs.Stats) { });
-	}
-
-	export interface Options {
-		persistent?: boolean;
-		ignoreDotFiles?: boolean;
-		filter?: any;
-		interval?: number;
-	}
-
-	export function watchTree(root: string, callback: (f: any, curr: fs.Stats, prev: fs.Stats) => void): void;
-	export function watchTree(root: string, options: Options, callback: (f: any, curr: fs.Stats, prev: fs.Stats) => void): void;
-	export function unwatchTree(root: string): void;
-	export function createMonitor(root: string, callback: (monitor: Monitor) => void): void;
-	export function createMonitor(root: string, options: Options, callback: (monitor: Monitor) => void): void;
-}
diff --git a/webaudioapi/index.d.ts b/webaudioapi/index.d.ts
new file mode 100644
index 0000000000..21ecc842a0
--- /dev/null
+++ b/webaudioapi/index.d.ts
@@ -0,0 +1,208 @@
+// Type definitions for Web Audio API
+// Project: http://www.w3.org/TR/webaudio/
+// Definitions by: Baruch Berger <https://github.com/bbss>, Kon <http://phyzkit.net/>, kubosho <https://github.com/kubosho>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+//
+// This file refers to the latest published working draft (currently from 10 october 2013) http://www.w3.org/TR/2013/WD-webaudio-20131010/, not to be confused with the latest editor's draft http://webaudio.github.io/web-audio-api/
+
+// DEPRECATED: use TypeScript 1.5.3
+
+declare var webkitAudioContext: {
+    new (): AudioContext;
+}
+
+declare var webkitOfflineAudioContext: {
+    new (numberOfChannels: number, length: number, sampleRate: number): OfflineAudioContext;
+}
+
+declare enum ChannelCountMode {
+    'max',
+    'clamped-max',
+    'explicit'
+}
+
+declare enum ChannelInterpretation {
+    speakers,
+    discrete
+}
+
+declare enum PanningModelType {
+    /**
+     * A simple and efficient spatialization algorithm using equal-power panning.
+     */
+    equalpower,
+
+    /**
+     * A higher quality spatialization algorithm using a convolution with measured impulse responses from human subjects. This panning method renders stereo output.
+     */
+    HRTF
+}
+
+declare enum DistanceModelType {
+    /**
+     * A linear distance model which calculates distanceGain according to:
+     *     1 - rolloffFactor * (distance - refDistance) / (maxDistance - refDistance)
+     */
+    linear,
+
+    /**
+     * An inverse distance model which calculates distanceGain according to:
+     *     refDistance / (refDistance + rolloffFactor * (distance - refDistance))
+     */
+    inverse,
+
+    /**
+     * An exponential distance model which calculates distanceGain according to:
+     *     pow(distance / refDistance, -rolloffFactor)
+     */
+    exponential
+}
+
+declare enum BiquadFilterType {
+    /**
+     * A lowpass filter allows frequencies below the cutoff frequency to pass through and attenuates frequencies above the cutoff. It implements a standard second-order resonant lowpass filter with 12dB/octave rolloff.
+     *
+     * ## frequency
+     * The cutoff frequency
+     * ## Q
+     * Controls how peaked the response will be at the cutoff frequency. A large value makes the response more peaked. Please note that for this filter type, this value is not a traditional Q, but is a resonance value in decibels.
+     * ## gain
+     * Not used in this filter type
+     */
+    lowpass,
+
+    /**
+     * A highpass filter is the opposite of a lowpass filter. Frequencies above the cutoff frequency are passed through, but frequencies below the cutoff are attenuated. It implements a standard second-order resonant highpass filter with 12dB/octave rolloff.
+     *
+     * ## frequency
+     * The cutoff frequency below which the frequencies are attenuated
+     * ## Q
+     * Controls how peaked the response will be at the cutoff frequency. A large value makes the response more peaked. Please note that for this filter type, this value is not a traditional Q, but is a resonance value in decibels.
+     * ## gain
+     * Not used in this filter type
+     */
+    highpass,
+
+    /**
+     * A bandpass filter allows a range of frequencies to pass through and attenuates the frequencies below and above this frequency range. It implements a second-order bandpass filter.
+     *
+     * ## frequency
+     * The center of the frequency band
+     * ## Q
+     * Controls the width of the band. The width becomes narrower as the Q value increases.
+     * ## gain
+     * Not used in this filter type
+     */
+    bandpass,
+
+    /**
+     * The lowshelf filter allows all frequencies through, but adds a boost (or attenuation) to the lower frequencies. It implements a second-order lowshelf filter.
+     *
+     * ## frequency
+     * The upper limit of the frequences where the boost (or attenuation) is applied.
+     * ## Q
+     * Not used in this filter type.
+     * ## gain
+     * The boost, in dB, to be applied. If the value is negative, the frequencies are attenuated.
+     */
+    lowshelf,
+
+    /**
+     * The highshelf filter is the opposite of the lowshelf filter and allows all frequencies through, but adds a boost to the higher frequencies. It implements a second-order highshelf filter
+     *
+     * ## frequency
+     * The lower limit of the frequences where the boost (or attenuation) is applied.
+     * ## Q
+     * Not used in this filter type.
+     * ## gain
+     * The boost, in dB, to be applied. If the value is negative, the frequencies are attenuated.
+     */
+    highshelf,
+
+    /**
+     * The peaking filter allows all frequencies through, but adds a boost (or attenuation) to a range of frequencies.
+     *
+     * ## frequency
+     * The center frequency of where the boost is applied.
+     * ## Q
+     * Controls the width of the band of frequencies that are boosted. A large value implies a narrow width.
+     * ## gain
+     * The boost, in dB, to be applied. If the value is negative, the frequencies are attenuated.
+     */
+    peaking,
+
+    /**
+     * The notch filter (also known as a band-stop or band-rejection filter) is the opposite of a bandpass filter. It allows all frequencies through, except for a set of frequencies.
+     *
+     * ## frequency
+     * The center frequency of where the notch is applied.
+     * ## Q
+     * Controls the width of the band of frequencies that are attenuated. A large value implies a narrow width.
+     * ## gain
+     * Not used in this filter type.
+     */
+    notch,
+
+    /**
+     * An allpass filter allows all frequencies through, but changes the phase relationship between the various frequencies. It implements a second-order allpass filter
+     *
+     * ## frequency
+     * The frequency where the center of the phase transition occurs. Viewed another way, this is the frequency with maximal group delay.
+     * ## Q
+     * Controls how sharp the phase transition is at the center frequency. A larger value implies a sharper transition and a larger group delay.
+     * ## gain
+     * Not used in this filter type.
+     */
+    allpass
+}
+
+declare enum OverSampleType {
+    'none',
+    '2x',
+    '4x'
+}
+
+declare enum OscillatorType {
+  sine,
+  square,
+  sawtooth,
+  triangle,
+  custom
+}
+
+interface AudioContextConstructor {
+    new(): AudioContext;
+}
+
+interface Window {
+    AudioContext: AudioContextConstructor;
+}
+
+interface AudioContext {
+    createMediaStreamSource(stream: MediaStream): MediaStreamAudioSourceNode;
+}
+
+interface MediaStreamAudioSourceNode extends AudioNode {
+
+}
+
+interface MediaStreamAudioDestinationNode extends AudioNode {
+    stream: MediaStream;
+}
+
+interface AudioBuffer {
+    copyFromChannel(destination: Float32Array, channelNumber: number, startInChannel?: number): void;
+
+    copyToChannel(source: Float32Array, channelNumber: number, startInChannel?: number): void;
+}
+
+interface AudioNode {
+    disconnect(destination: AudioNode): void;
+}
+
+interface AudioContext {
+    suspend(): Promise<void>;
+    resume(): Promise<void>;
+    close(): Promise<void>;
+    createMediaStreamDestination(): MediaStreamAudioDestinationNode; 
+}
diff --git a/webaudioapi/readme.md b/webaudioapi/readme.md
index 715eeda42d..0b30648116 100644
--- a/webaudioapi/readme.md
+++ b/webaudioapi/readme.md
@@ -11,8 +11,8 @@ The WebKit nightly builds try to keep up with the editors draft version of the s
 
 ### Adding the reference to your project
 
-    /// <reference path="waa.d.ts" />
+    
 
 or
 
-    /// <reference path="waa-nightly.d.ts" />
+    
diff --git a/webaudioapi/tsconfig.json b/webaudioapi/tsconfig.json
new file mode 100644
index 0000000000..590347cd39
--- /dev/null
+++ b/webaudioapi/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "waa-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/webaudioapi/waa-tests.ts b/webaudioapi/waa-tests.ts
index fc92bd06a0..d5727d531b 100644
--- a/webaudioapi/waa-tests.ts
+++ b/webaudioapi/waa-tests.ts
@@ -1,6 +1,6 @@
 // http://www.w3.org/TR/2012/WD-webaudio-20121213/
 
-/// <reference path="waa.d.ts" />
+
 
 declare var dogBarkingBuffer: any;
 
diff --git a/webaudioapi/waa.d.ts b/webaudioapi/waa.d.ts
deleted file mode 100644
index 0cdcdc0160..0000000000
--- a/webaudioapi/waa.d.ts
+++ /dev/null
@@ -1,210 +0,0 @@
-// Type definitions for Web Audio API
-// Project: http://www.w3.org/TR/webaudio/
-// Definitions by: Baruch Berger <https://github.com/bbss>, Kon <http://phyzkit.net/>, kubosho <https://github.com/kubosho>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-//
-// This file refers to the latest published working draft (currently from 10 october 2013) http://www.w3.org/TR/2013/WD-webaudio-20131010/, not to be confused with the latest editor's draft http://webaudio.github.io/web-audio-api/
-
-// DEPRECATED: use TypeScript 1.5.3
-
-/// <reference path='../webrtc/MediaStream.d.ts' />
-
-declare var webkitAudioContext: {
-    new (): AudioContext;
-}
-
-declare var webkitOfflineAudioContext: {
-    new (numberOfChannels: number, length: number, sampleRate: number): OfflineAudioContext;
-}
-
-declare enum ChannelCountMode {
-    'max',
-    'clamped-max',
-    'explicit'
-}
-
-declare enum ChannelInterpretation {
-    speakers,
-    discrete
-}
-
-declare enum PanningModelType {
-    /**
-     * A simple and efficient spatialization algorithm using equal-power panning.
-     */
-    equalpower,
-
-    /**
-     * A higher quality spatialization algorithm using a convolution with measured impulse responses from human subjects. This panning method renders stereo output.
-     */
-    HRTF
-}
-
-declare enum DistanceModelType {
-    /**
-     * A linear distance model which calculates distanceGain according to:
-     *     1 - rolloffFactor * (distance - refDistance) / (maxDistance - refDistance)
-     */
-    linear,
-
-    /**
-     * An inverse distance model which calculates distanceGain according to:
-     *     refDistance / (refDistance + rolloffFactor * (distance - refDistance))
-     */
-    inverse,
-
-    /**
-     * An exponential distance model which calculates distanceGain according to:
-     *     pow(distance / refDistance, -rolloffFactor)
-     */
-    exponential
-}
-
-declare enum BiquadFilterType {
-    /**
-     * A lowpass filter allows frequencies below the cutoff frequency to pass through and attenuates frequencies above the cutoff. It implements a standard second-order resonant lowpass filter with 12dB/octave rolloff.
-     *
-     * ## frequency
-     * The cutoff frequency
-     * ## Q
-     * Controls how peaked the response will be at the cutoff frequency. A large value makes the response more peaked. Please note that for this filter type, this value is not a traditional Q, but is a resonance value in decibels.
-     * ## gain
-     * Not used in this filter type
-     */
-    lowpass,
-
-    /**
-     * A highpass filter is the opposite of a lowpass filter. Frequencies above the cutoff frequency are passed through, but frequencies below the cutoff are attenuated. It implements a standard second-order resonant highpass filter with 12dB/octave rolloff.
-     *
-     * ## frequency
-     * The cutoff frequency below which the frequencies are attenuated
-     * ## Q
-     * Controls how peaked the response will be at the cutoff frequency. A large value makes the response more peaked. Please note that for this filter type, this value is not a traditional Q, but is a resonance value in decibels.
-     * ## gain
-     * Not used in this filter type
-     */
-    highpass,
-
-    /**
-     * A bandpass filter allows a range of frequencies to pass through and attenuates the frequencies below and above this frequency range. It implements a second-order bandpass filter.
-     *
-     * ## frequency
-     * The center of the frequency band
-     * ## Q
-     * Controls the width of the band. The width becomes narrower as the Q value increases.
-     * ## gain
-     * Not used in this filter type
-     */
-    bandpass,
-
-    /**
-     * The lowshelf filter allows all frequencies through, but adds a boost (or attenuation) to the lower frequencies. It implements a second-order lowshelf filter.
-     *
-     * ## frequency
-     * The upper limit of the frequences where the boost (or attenuation) is applied.
-     * ## Q
-     * Not used in this filter type.
-     * ## gain
-     * The boost, in dB, to be applied. If the value is negative, the frequencies are attenuated.
-     */
-    lowshelf,
-
-    /**
-     * The highshelf filter is the opposite of the lowshelf filter and allows all frequencies through, but adds a boost to the higher frequencies. It implements a second-order highshelf filter
-     *
-     * ## frequency
-     * The lower limit of the frequences where the boost (or attenuation) is applied.
-     * ## Q
-     * Not used in this filter type.
-     * ## gain
-     * The boost, in dB, to be applied. If the value is negative, the frequencies are attenuated.
-     */
-    highshelf,
-
-    /**
-     * The peaking filter allows all frequencies through, but adds a boost (or attenuation) to a range of frequencies.
-     *
-     * ## frequency
-     * The center frequency of where the boost is applied.
-     * ## Q
-     * Controls the width of the band of frequencies that are boosted. A large value implies a narrow width.
-     * ## gain
-     * The boost, in dB, to be applied. If the value is negative, the frequencies are attenuated.
-     */
-    peaking,
-
-    /**
-     * The notch filter (also known as a band-stop or band-rejection filter) is the opposite of a bandpass filter. It allows all frequencies through, except for a set of frequencies.
-     *
-     * ## frequency
-     * The center frequency of where the notch is applied.
-     * ## Q
-     * Controls the width of the band of frequencies that are attenuated. A large value implies a narrow width.
-     * ## gain
-     * Not used in this filter type.
-     */
-    notch,
-
-    /**
-     * An allpass filter allows all frequencies through, but changes the phase relationship between the various frequencies. It implements a second-order allpass filter
-     *
-     * ## frequency
-     * The frequency where the center of the phase transition occurs. Viewed another way, this is the frequency with maximal group delay.
-     * ## Q
-     * Controls how sharp the phase transition is at the center frequency. A larger value implies a sharper transition and a larger group delay.
-     * ## gain
-     * Not used in this filter type.
-     */
-    allpass
-}
-
-declare enum OverSampleType {
-    'none',
-    '2x',
-    '4x'
-}
-
-declare enum OscillatorType {
-  sine,
-  square,
-  sawtooth,
-  triangle,
-  custom
-}
-
-interface AudioContextConstructor {
-    new(): AudioContext;
-}
-
-interface Window {
-    AudioContext: AudioContextConstructor;
-}
-
-interface AudioContext {
-    createMediaStreamSource(stream: MediaStream): MediaStreamAudioSourceNode;
-}
-
-interface MediaStreamAudioSourceNode extends AudioNode {
-
-}
-
-interface MediaStreamAudioDestinationNode extends AudioNode {
-    stream: MediaStream;
-}
-
-interface AudioBuffer {
-    copyFromChannel(destination: Float32Array, channelNumber: number, startInChannel?: number): void;
-
-    copyToChannel(source: Float32Array, channelNumber: number, startInChannel?: number): void;
-}
-
-interface AudioNode {
-    disconnect(destination: AudioNode): void;
-}
-
-interface AudioContext {
-    suspend(): Promise<void>;
-    resume(): Promise<void>;
-    close(): Promise<void>;
-    createMediaStreamDestination(): MediaStreamAudioDestinationNode; 
-}
diff --git a/webcl/webcl.d.ts b/webcl/index.d.ts
similarity index 100%
rename from webcl/webcl.d.ts
rename to webcl/index.d.ts
diff --git a/webcl/tsconfig.json b/webcl/tsconfig.json
new file mode 100644
index 0000000000..c81e792804
--- /dev/null
+++ b/webcl/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "webcl-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/webcl/webcl-tests.ts b/webcl/webcl-tests.ts
index 34c3841ddb..c6f94cd0a7 100644
--- a/webcl/webcl-tests.ts
+++ b/webcl/webcl-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="webcl.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+
+/// <reference types="jquery" />
 
 class CLHException {
     constructor(
diff --git a/webcola/index.d.ts b/webcola/index.d.ts
new file mode 100644
index 0000000000..07974c2619
--- /dev/null
+++ b/webcola/index.d.ts
@@ -0,0 +1,1097 @@
+// Type definitions for webcola 3.1.1
+// Project: https://github.com/tgdwyer/WebCola
+// Definitions by: Qinfeng Chen <https://github.com/qinfchen>, Tim Dwyer <https://github.com/tgdwyer>, Noah Chen <https://github.com/nchen63>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace cola {
+    function applyPacking(graphs: Array<any>, w: any, h: any, node_size: any, desired_ratio?: number): void;
+    /**
+     * connected components of graph
+     * returns an array of {}
+     */
+    function separateGraphs(nodes: any, links: any): any[];
+}
+declare namespace cola.vpsc {
+    class PositionStats {
+        scale: number;
+        AB: number;
+        AD: number;
+        A2: number;
+        constructor(scale: number);
+        addVariable(v: Variable): void;
+        getPosn(): number;
+    }
+    class Constraint {
+        left: Variable;
+        right: Variable;
+        gap: number;
+        equality: boolean;
+        lm: number;
+        active: boolean;
+        unsatisfiable: boolean;
+        constructor(left: Variable, right: Variable, gap: number, equality?: boolean);
+        slack(): number;
+    }
+    class Variable {
+        desiredPosition: number;
+        weight: number;
+        scale: number;
+        offset: number;
+        block: Block;
+        cIn: Constraint[];
+        cOut: Constraint[];
+        constructor(desiredPosition: number, weight?: number, scale?: number);
+        dfdv(): number;
+        position(): number;
+        visitNeighbours(prev: Variable, f: (c: Constraint, next: Variable) => void): void;
+    }
+    class Block {
+        vars: Variable[];
+        posn: number;
+        ps: PositionStats;
+        blockInd: number;
+        constructor(v: Variable);
+        private addVariable(v);
+        updateWeightedPosition(): void;
+        private compute_lm(v, u, postAction);
+        private populateSplitBlock(v, prev);
+        traverse(visit: (c: Constraint) => any, acc: any[], v?: Variable, prev?: Variable): void;
+        findMinLM(): Constraint;
+        private findMinLMBetween(lv, rv);
+        private findPath(v, prev, to, visit);
+        isActiveDirectedPathBetween(u: Variable, v: Variable): boolean;
+        static split(c: Constraint): Block[];
+        private static createSplitBlock(startVar);
+        splitBetween(vl: Variable, vr: Variable): {
+            constraint: Constraint;
+            lb: Block;
+            rb: Block;
+        };
+        mergeAcross(b: Block, c: Constraint, dist: number): void;
+        cost(): number;
+    }
+    class Blocks {
+        vs: Variable[];
+        private list;
+        constructor(vs: Variable[]);
+        cost(): number;
+        insert(b: Block): void;
+        remove(b: Block): void;
+        merge(c: Constraint): void;
+        forEach(f: (b: Block, i: number) => void): void;
+        updateBlockPositions(): void;
+        split(inactive: Constraint[]): void;
+    }
+    class Solver {
+        vs: Variable[];
+        cs: Constraint[];
+        bs: Blocks;
+        inactive: Constraint[];
+        static LAGRANGIAN_TOLERANCE: number;
+        static ZERO_UPPERBOUND: number;
+        constructor(vs: Variable[], cs: Constraint[]);
+        cost(): number;
+        setStartingPositions(ps: number[]): void;
+        setDesiredPositions(ps: number[]): void;
+        private mostViolated();
+        satisfy(): void;
+        solve(): number;
+    }
+}
+declare namespace cola.vpsc {
+    class TreeBase {
+        _root: any;
+        size: any;
+        _comparator: any;
+        clear(): void;
+        find(data: any): any;
+        findIter: (data: any) => any;
+        lowerBound(data: any): Iterator;
+        upperBound(data: any): Iterator;
+        min(): any;
+        max(): any;
+        iterator(): Iterator;
+        each(cb: any): void;
+        reach(cb: any): void;
+        _bound(data: any, cmp: any): Iterator;
+    }
+    class Iterator {
+        _tree: any;
+        _ancestors: any;
+        _cursor: any;
+        constructor(tree: any);
+        data(): any;
+        next(): any;
+        prev(): any;
+        _minNode(start: any): void;
+        _maxNode(start: any): void;
+    }
+    class RBTree<T> extends TreeBase {
+        _root: any;
+        _comparator: any;
+        size: any;
+        constructor(comparator: (a: T, b: T) => number);
+        insert(data: any): boolean;
+        remove(data: any): boolean;
+        static is_red(node: any): any;
+        static single_rotate(root: any, dir: any): any;
+        static double_rotate(root: any, dir: any): any;
+    }
+}
+
+
+declare namespace cola.vpsc {
+    interface Point {
+        x: number;
+        y: number;
+    }
+    interface Leaf {
+        bounds: Rectangle;
+        variable: Variable;
+    }
+    interface Group {
+        bounds: Rectangle;
+        padding: number;
+        stiffness: number;
+        leaves: Leaf[];
+        groups: Group[];
+        minVar: Variable;
+        maxVar: Variable;
+    }
+    function computeGroupBounds(g: Group): Rectangle;
+    class Rectangle {
+        x: number;
+        X: number;
+        y: number;
+        Y: number;
+        constructor(x: number, X: number, y: number, Y: number);
+        static empty(): Rectangle;
+        cx(): number;
+        cy(): number;
+        overlapX(r: Rectangle): number;
+        overlapY(r: Rectangle): number;
+        setXCentre(cx: number): void;
+        setYCentre(cy: number): void;
+        width(): number;
+        height(): number;
+        union(r: Rectangle): Rectangle;
+        /**
+         * return any intersection points between the given line and the sides of this rectangle
+         * @method lineIntersection
+         * @param x1 number first x coord of line
+         * @param y1 number first y coord of line
+         * @param x2 number second x coord of line
+         * @param y2 number second y coord of line
+         * @return any intersection points found
+         */
+        lineIntersections(x1: number, y1: number, x2: number, y2: number): Array<Point>;
+        /**
+         * return any intersection points between a line extending from the centre of this rectangle to the given point,
+         *  and the sides of this rectangle
+         * @method lineIntersection
+         * @param x2 number second x coord of line
+         * @param y2 number second y coord of line
+         * @return any intersection points found
+         */
+        rayIntersection(x2: number, y2: number): Point;
+        vertices(): Point[];
+        static lineIntersection(x1: number, y1: number, x2: number, y2: number, x3: number, y3: number, x4: number, y4: number): Point;
+        inflate(pad: number): Rectangle;
+    }
+    function makeEdgeBetween(source: Rectangle, target: Rectangle, ah: number): {
+        sourceIntersection: Point;
+        targetIntersection: Point;
+        arrowStart: Point;
+    };
+    function makeEdgeTo(s: {
+        x: number;
+        y: number;
+    }, target: Rectangle, ah: number): Point;
+    function generateXConstraints(rs: Rectangle[], vars: Variable[]): Constraint[];
+    function generateYConstraints(rs: Rectangle[], vars: Variable[]): Constraint[];
+    function generateXGroupConstraints(root: Group): Constraint[];
+    function generateYGroupConstraints(root: Group): Constraint[];
+    function removeOverlaps(rs: Rectangle[]): void;
+    interface GraphNode extends Leaf {
+        fixed: boolean;
+        fixedWeight?: number;
+        width: number;
+        height: number;
+        x: number;
+        y: number;
+        px: number;
+        py: number;
+    }
+    class IndexedVariable extends Variable {
+        index: number;
+        constructor(index: number, w: number);
+    }
+    class Projection {
+        private nodes;
+        private groups;
+        private rootGroup;
+        private avoidOverlaps;
+        private xConstraints;
+        private yConstraints;
+        private variables;
+        constructor(nodes: GraphNode[], groups: Group[], rootGroup?: Group, constraints?: any[], avoidOverlaps?: boolean);
+        private createSeparation(c);
+        private makeFeasible(c);
+        private createAlignment(c);
+        private createConstraints(constraints);
+        private setupVariablesAndBounds(x0, y0, desired, getDesired);
+        xProject(x0: number[], y0: number[], x: number[]): void;
+        yProject(x0: number[], y0: number[], y: number[]): void;
+        projectFunctions(): {
+            (x0: number[], y0: number[], r: number[]): void;
+        }[];
+        private project(x0, y0, start, desired, getDesired, cs, generateConstraints, updateNodeBounds, updateGroupBounds);
+        private solve(vs, cs, starting, desired);
+    }
+}
+
+
+declare namespace cola.geom {
+    class Point {
+        x: number;
+        y: number;
+    }
+    class LineSegment {
+        x1: number;
+        y1: number;
+        x2: number;
+        y2: number;
+        constructor(x1: number, y1: number, x2: number, y2: number);
+    }
+    class PolyPoint extends Point {
+        polyIndex: number;
+    }
+    /** tests if a point is Left|On|Right of an infinite line.
+     * @param points P0, P1, and P2
+     * @return >0 for P2 left of the line through P0 and P1
+     *            =0 for P2 on the line
+     *            <0 for P2 right of the line
+     */
+    function isLeft(P0: Point, P1: Point, P2: Point): number;
+    /**
+     * returns the convex hull of a set of points using Andrew's monotone chain algorithm
+     * see: http://geomalgorithms.com/a10-_hull-1.html#Monotone%20Chain
+     * @param S array of points
+     * @return the convex hull as an array of points
+     */
+    function ConvexHull(S: Point[]): Point[];
+    function clockwiseRadialSweep(p: Point, P: Point[], f: (p: Point) => void): void;
+    function tangent_PolyPolyC(V: Point[], W: Point[], t1: (a: Point, b: Point[]) => number, t2: (a: Point, b: Point[]) => number, cmp1: (a: Point, b: Point, c: Point) => boolean, cmp2: (a: Point, b: Point, c: Point) => boolean): {
+        t1: number;
+        t2: number;
+    };
+    function LRtangent_PolyPolyC(V: Point[], W: Point[]): {
+        t1: number;
+        t2: number;
+    };
+    function RLtangent_PolyPolyC(V: Point[], W: Point[]): {
+        t1: number;
+        t2: number;
+    };
+    function LLtangent_PolyPolyC(V: Point[], W: Point[]): {
+        t1: number;
+        t2: number;
+    };
+    function RRtangent_PolyPolyC(V: Point[], W: Point[]): {
+        t1: number;
+        t2: number;
+    };
+    class BiTangent {
+        t1: number;
+        t2: number;
+        constructor(t1: number, t2: number);
+    }
+    class BiTangents {
+        rl: BiTangent;
+        lr: BiTangent;
+        ll: BiTangent;
+        rr: BiTangent;
+    }
+    class TVGPoint extends Point {
+        vv: VisibilityVertex;
+    }
+    class VisibilityVertex {
+        id: number;
+        polyid: number;
+        polyvertid: number;
+        p: TVGPoint;
+        constructor(id: number, polyid: number, polyvertid: number, p: TVGPoint);
+    }
+    class VisibilityEdge {
+        source: VisibilityVertex;
+        target: VisibilityVertex;
+        constructor(source: VisibilityVertex, target: VisibilityVertex);
+        length(): number;
+    }
+    class TangentVisibilityGraph {
+        P: TVGPoint[][];
+        V: VisibilityVertex[];
+        E: VisibilityEdge[];
+        constructor(P: TVGPoint[][], g0?: {
+            V: VisibilityVertex[];
+            E: VisibilityEdge[];
+        });
+        addEdgeIfVisible(u: TVGPoint, v: TVGPoint, i1: number, i2: number): void;
+        addPoint(p: TVGPoint, i1: number): VisibilityVertex;
+        private intersectsPolys(l, i1, i2);
+    }
+    function tangents(V: Point[], W: Point[]): BiTangents;
+    function polysOverlap(p: Point[], q: Point[]): boolean;
+}
+/**
+ * @module cola
+ */
+declare namespace cola {
+    /**
+     * Descent respects a collection of locks over nodes that should not move
+     * @class Locks
+     */
+    class Locks {
+        locks: any;
+        /**
+         * add a lock on the node at index id
+         * @method add
+         * @param id index of node to be locked
+         * @param x required position for node
+         */
+        add(id: number, x: number[]): void;
+        /**
+         * @method clear clear all locks
+         */
+        clear(): void;
+        /**
+         * @isEmpty
+         * @returns false if no locks exist
+         */
+        isEmpty(): boolean;
+        /**
+         * perform an operation on each lock
+         * @apply
+         */
+        apply(f: (id: number, x: number[]) => void): void;
+    }
+    /**
+     * Uses a gradient descent approach to reduce a stress or p-stress goal function over a graph with specified ideal edge lengths or a square matrix of dissimilarities.
+     * The standard stress function over a graph nodes with position vectors x,y,z is (mathematica input):
+     *   stress[x_,y_,z_,D_,w_]:=Sum[w[[i,j]] (length[x[[i]],y[[i]],z[[i]],x[[j]],y[[j]],z[[j]]]-d[[i,j]])^2,{i,Length[x]-1},{j,i+1,Length[x]}]
+     * where: D is a square matrix of ideal separations between nodes, w is matrix of weights for those separations
+     *        length[x1_, y1_, z1_, x2_, y2_, z2_] = Sqrt[(x1 - x2)^2 + (y1 - y2)^2 + (z1 - z2)^2]
+     * below, we use wij = 1/(Dij^2)
+     *
+     * @class Descent
+     */
+    class Descent {
+        D: number[][];
+        G: number[][];
+        threshold: number;
+        /** Hessian Matrix
+         * @property H {number[][][]}
+         */
+        H: number[][][];
+        /** gradient vector
+         * @property G {number[][]}
+         */
+        g: number[][];
+        /** positions vector
+         * @property x {number[][]}
+         */
+        x: number[][];
+        /**
+         * @property k {number} dimensionality
+         */
+        k: number;
+        /**
+         * number of data-points / nodes / size of vectors/matrices
+         * @property n {number}
+         */
+        n: number;
+        locks: Locks;
+        private static zeroDistance;
+        private minD;
+        private Hd;
+        private a;
+        private b;
+        private c;
+        private d;
+        private e;
+        private ia;
+        private ib;
+        private xtmp;
+        numGridSnapNodes: number;
+        snapGridSize: number;
+        snapStrength: number;
+        scaleSnapByMaxH: boolean;
+        private random;
+        project: {
+            (x0: number[], y0: number[], r: number[]): void;
+        }[];
+        /**
+         * @method constructor
+         * @param x {number[][]} initial coordinates for nodes
+         * @param D {number[][]} matrix of desired distances between pairs of nodes
+         * @param G {number[][]} [default=null] if specified, G is a matrix of weights for goal terms between pairs of nodes.
+         * If G[i][j] > 1 and the separation between nodes i and j is greater than their ideal distance, then there is no contribution for this pair to the goal
+         * If G[i][j] <= 1 then it is used as a weighting on the contribution of the variance between ideal and actual separation between i and j to the goal function
+         */
+        constructor(x: number[][], D: number[][], G?: number[][]);
+        static createSquareMatrix(n: number, f: (i: number, j: number) => number): number[][];
+        private offsetDir();
+        computeDerivatives(x: number[][]): void;
+        private static dotProd(a, b);
+        private static rightMultiply(m, v, r);
+        computeStepSize(d: number[][]): number;
+        reduceStress(): number;
+        private static copy(a, b);
+        private stepAndProject(x0, r, d, stepSize);
+        private static mApply(m, n, f);
+        private matrixApply(f);
+        private computeNextPosition(x0, r);
+        run(iterations: number): number;
+        rungeKutta(): number;
+        private static mid(a, b, m);
+        takeDescentStep(x: number[], d: number[], stepSize: number): void;
+        computeStress(): number;
+    }
+    class PseudoRandom {
+        seed: number;
+        private a;
+        private c;
+        private m;
+        private range;
+        constructor(seed?: number);
+        getNext(): number;
+        getNextBetween(min: number, max: number): number;
+    }
+}
+declare namespace cola.powergraph {
+    interface LinkAccessor<Link> {
+        getSourceIndex(l: Link): number;
+        getTargetIndex(l: Link): number;
+        getType(l: Link): number;
+    }
+    class PowerEdge {
+        source: any;
+        target: any;
+        type: number;
+        constructor(source: any, target: any, type: number);
+    }
+    class Configuration<Link> {
+        private linkAccessor;
+        modules: Module[];
+        roots: ModuleSet[];
+        R: number;
+        constructor(n: number, edges: Link[], linkAccessor: LinkAccessor<Link>, rootGroup?: any[]);
+        private initModulesFromGroup(group);
+        merge(a: Module, b: Module, k?: number): Module;
+        private rootMerges(k?);
+        greedyMerge(): boolean;
+        private nEdges(a, b);
+        getGroupHierarchy(retargetedEdges: PowerEdge[]): any[];
+        allEdges(): PowerEdge[];
+        static getEdges(modules: ModuleSet, es: PowerEdge[]): void;
+    }
+    class Module {
+        id: number;
+        outgoing: LinkSets;
+        incoming: LinkSets;
+        children: ModuleSet;
+        definition: any;
+        gid: number;
+        constructor(id: number, outgoing?: LinkSets, incoming?: LinkSets, children?: ModuleSet, definition?: any);
+        getEdges(es: PowerEdge[]): void;
+        isLeaf(): boolean;
+        isIsland(): boolean;
+        isPredefined(): boolean;
+    }
+    class ModuleSet {
+        table: any;
+        count(): number;
+        intersection(other: ModuleSet): ModuleSet;
+        intersectionCount(other: ModuleSet): number;
+        contains(id: number): boolean;
+        add(m: Module): void;
+        remove(m: Module): void;
+        forAll(f: (m: Module) => void): void;
+        modules(): Module[];
+    }
+    class LinkSets {
+        sets: any;
+        n: number;
+        count(): number;
+        contains(id: number): boolean;
+        add(linktype: number, m: Module): void;
+        remove(linktype: number, m: Module): void;
+        forAll(f: (ms: ModuleSet, linktype: number) => void): void;
+        forAllModules(f: (m: Module) => void): void;
+        intersection(other: LinkSets): LinkSets;
+    }
+    function getGroups<Link>(nodes: any[], links: Link[], la: LinkAccessor<Link>, rootGroup?: any[]): {
+        groups: any[];
+        powerEdges: PowerEdge[];
+    };
+}
+/**
+ * @module cola
+ */
+declare namespace cola {
+    interface LinkAccessor<Link> {
+        getSourceIndex(l: Link): number;
+        getTargetIndex(l: Link): number;
+    }
+    interface LinkLengthAccessor<Link> extends LinkAccessor<Link> {
+        setLength(l: Link, value: number): void;
+    }
+    /** modify the specified link lengths based on the symmetric difference of their neighbours
+     * @class symmetricDiffLinkLengths
+     */
+    function symmetricDiffLinkLengths<Link>(links: Link[], la: LinkLengthAccessor<Link>, w?: number): void;
+    /** modify the specified links lengths based on the jaccard difference between their neighbours
+     * @class jaccardLinkLengths
+     */
+    function jaccardLinkLengths<Link>(links: Link[], la: LinkLengthAccessor<Link>, w?: number): void;
+    interface IConstraint {
+        left: number;
+        right: number;
+        gap: number;
+    }
+    interface DirectedEdgeConstraints {
+        axis: string;
+        gap: number;
+    }
+    interface LinkSepAccessor<Link> extends LinkAccessor<Link> {
+        getMinSeparation(l: Link): number;
+    }
+    /** generate separation constraints for all edges unless both their source and sink are in the same strongly connected component
+     * @class generateDirectedEdgeConstraints
+     */
+    function generateDirectedEdgeConstraints<Link>(n: number, links: Link[], axis: string, la: LinkSepAccessor<Link>): IConstraint[];
+    /**
+     * Tarjan's strongly connected components algorithm for directed graphs
+     * returns an array of arrays of node indicies in each of the strongly connected components.
+     * a vertex not in a SCC of two or more nodes is it's own SCC.
+     * adaptation of https://en.wikipedia.org/wiki/Tarjan%27s_strongly_connected_components_algorithm
+     */
+    function stronglyConnectedComponents<Link>(numVertices: number, edges: Link[], la: LinkAccessor<Link>): number[][];
+}
+declare class PairingHeap<T> {
+    elem: T;
+    private subheaps;
+    constructor(elem: T);
+    toString(selector: any): string;
+    forEach(f: any): void;
+    count(): number;
+    min(): T;
+    empty(): boolean;
+    contains(h: PairingHeap<T>): boolean;
+    isHeap(lessThan: (a: T, b: T) => boolean): boolean;
+    insert(obj: T, lessThan: any): PairingHeap<T>;
+    merge(heap2: PairingHeap<T>, lessThan: any): PairingHeap<T>;
+    removeMin(lessThan: (a: T, b: T) => boolean): PairingHeap<T>;
+    mergePairs(lessThan: (a: T, b: T) => boolean): PairingHeap<T>;
+    decreaseKey(subheap: PairingHeap<T>, newValue: T, setHeapNode: (e: T, h: PairingHeap<T>) => void, lessThan: (a: T, b: T) => boolean): PairingHeap<T>;
+}
+/**
+ * @class PriorityQueue a min priority queue backed by a pairing heap
+ */
+declare class PriorityQueue<T> {
+    private lessThan;
+    private root;
+    constructor(lessThan: (a: T, b: T) => boolean);
+    /**
+     * @method top
+     * @return the top element (the min element as defined by lessThan)
+     */
+    top(): T;
+    /**
+     * @method push
+     * put things on the heap
+     */
+    push(...args: T[]): PairingHeap<T>;
+    /**
+     * @method empty
+     * @return true if no more elements in queue
+     */
+    empty(): boolean;
+    /**
+     * @method isHeap check heap condition (for testing)
+     * @return true if queue is in valid state
+     */
+    isHeap(): boolean;
+    /**
+     * @method forEach apply f to each element of the queue
+     * @param f function to apply
+     */
+    forEach(f: any): void;
+    /**
+     * @method pop remove and return the min element from the queue
+     */
+    pop(): T;
+    /**
+     * @method reduceKey reduce the key value of the specified heap node
+     */
+    reduceKey(heapNode: PairingHeap<T>, newKey: T, setHeapNode?: (e: T, h: PairingHeap<T>) => void): void;
+    toString(selector: any): string;
+    /**
+     * @method count
+     * @return number of elements in queue
+     */
+    count(): number;
+}
+
+/**
+ * @module shortestpaths
+ */
+declare namespace cola.shortestpaths {
+    /**
+     * calculates all-pairs shortest paths or shortest paths from a single node
+     * @class Calculator
+     * @constructor
+     * @param n {number} number of nodes
+     * @param es {Edge[]} array of edges
+     */
+    class Calculator<Link> {
+        n: number;
+        es: Link[];
+        private neighbours;
+        constructor(n: number, es: Link[], getSourceIndex: (l: Link) => number, getTargetIndex: (l: Link) => number, getLength: (l: Link) => number);
+        /**
+         * compute shortest paths for graph over n nodes with edges an array of source/target pairs
+         * edges may optionally have a length attribute.  1 is the default.
+         * Uses Johnson's algorithm.
+         *
+         * @method DistanceMatrix
+         * @return the distance matrix
+         */
+        DistanceMatrix(): number[][];
+        /**
+         * get shortest paths from a specified start node
+         * @method DistancesFromNode
+         * @param start node index
+         * @return array of path lengths
+         */
+        DistancesFromNode(start: number): number[];
+        PathFromNodeToNode(start: number, end: number): number[];
+        PathFromNodeToNodeWithPrevCost(start: number, end: number, prevCost: (u: number, v: number, w: number) => number): number[];
+        private dijkstraNeighbours(start, dest?);
+    }
+}
+
+
+
+
+
+
+/**
+ * @module cola
+ */
+declare namespace cola {
+    /**
+     * The layout process fires three events:
+     *  - start: layout iterations started
+     *  - tick: fired once per iteration, listen to this to animate
+     *  - end: layout converged, you might like to zoom-to-fit or something at notification of this event
+     */
+    enum EventType {
+        start = 0,
+        tick = 1,
+        end = 2,
+    }
+    interface Event {
+        type: EventType;
+        alpha: number;
+        stress?: number;
+        listener?: () => void;
+    }
+    interface Node {
+        /**
+         * x and y will be computed by layout as the Node's centroid
+         */
+        x: number;
+        /**
+         * x and y will be computed by layout as the Node's centroid
+         */
+        y: number;
+        /**
+         * specify a width and height of the node's bounding box if you turn on avoidOverlaps
+         */
+        width?: number;
+        /**
+         * specify a width and height of the node's bounding box if you turn on avoidOverlaps
+         */
+        height?: any;
+        number: any;
+    }
+    interface Link<NodeType> {
+        source: NodeType;
+        target: NodeType;
+        length?: number;
+        weight?: number;
+    }
+    /**
+     * Main interface to cola layout.
+     * @class Layout
+     */
+    class Layout {
+        private _canvasSize;
+        private _linkDistance;
+        private _defaultNodeSize;
+        private _linkLengthCalculator;
+        private _linkType;
+        private _avoidOverlaps;
+        private _handleDisconnected;
+        private _alpha;
+        private _lastStress;
+        private _running;
+        private _nodes;
+        private _groups;
+        private _rootGroup;
+        private _links;
+        private _constraints;
+        private _distanceMatrix;
+        private _descent;
+        private _directedLinkConstraints;
+        private _threshold;
+        private _visibilityGraph;
+        private _groupCompactness;
+        protected event: any;
+        on(e: EventType | string, listener: (event: Event) => void): Layout;
+        protected trigger(e: Event): void;
+        protected kick(): void;
+        /**
+         * iterate the layout.  Returns true when layout converged.
+         */
+        protected tick(): boolean;
+        private updateNodePositions();
+        /**
+         * the list of nodes.
+         * If nodes has not been set, but links has, then we instantiate a nodes list here, of the correct size,
+         * before returning it.
+         * @property nodes {Array}
+         * @default empty list
+         */
+        nodes(): Array<Node>;
+        nodes(v: Array<Node>): Layout;
+        /**
+         * a list of hierarchical groups defined over nodes
+         * @property groups {Array}
+         * @default empty list
+         */
+        groups(): Array<any>;
+        groups(x: Array<any>): Layout;
+        powerGraphGroups(f: Function): Layout;
+        /**
+         * if true, the layout will not permit overlaps of the node bounding boxes (defined by the width and height properties on nodes)
+         * @property avoidOverlaps
+         * @type bool
+         * @default false
+         */
+        avoidOverlaps(): boolean;
+        avoidOverlaps(v: boolean): Layout;
+        /**
+         * if true, the final step of the start method will be to nicely pack connected components of the graph.
+         * works best if start() is called with a reasonable number of iterations specified and
+         * each node has a bounding box (defined by the width and height properties on nodes).
+         * @property handleDisconnected
+         * @type bool
+         * @default true
+         */
+        handleDisconnected(): boolean;
+        handleDisconnected(v: boolean): Layout;
+        /**
+         * causes constraints to be generated such that directed graphs are laid out either from left-to-right or top-to-bottom.
+         * a separation constraint is generated in the selected axis for each edge that is not involved in a cycle (part of a strongly connected component)
+         * @param axis {string} 'x' for left-to-right, 'y' for top-to-bottom
+         * @param minSeparation {number|link=>number} either a number specifying a minimum spacing required across all links or a function to return the minimum spacing for each link
+         */
+        flowLayout(axis: string, minSeparation: number | ((t: any) => number)): Layout;
+        /**
+         * links defined as source, target pairs over nodes
+         * @property links {array}
+         * @default empty list
+         */
+        links(): Array<Link<Node | number>>;
+        links(x: Array<Link<Node | number>>): Layout;
+        /**
+         * list of constraints of various types
+         * @property constraints
+         * @type {array}
+         * @default empty list
+         */
+        constraints(): Array<any>;
+        constraints(c: Array<any>): Layout;
+        /**
+         * Matrix of ideal distances between all pairs of nodes.
+         * If unspecified, the ideal distances for pairs of nodes will be based on the shortest path distance between them.
+         * @property distanceMatrix
+         * @type {Array of Array of Number}
+         * @default null
+         */
+        distanceMatrix(): Array<Array<number>>;
+        distanceMatrix(d: Array<Array<number>>): Layout;
+        /**
+         * Size of the layout canvas dimensions [x,y]. Currently only used to determine the midpoint which is taken as the starting position
+         * for nodes with no preassigned x and y.
+         * @property size
+         * @type {Array of Number}
+         */
+        size(): Array<number>;
+        size(x: Array<number>): Layout;
+        /**
+         * Default size (assume nodes are square so both width and height) to use in packing if node width/height are not specified.
+         * @property defaultNodeSize
+         * @type {Number}
+         */
+        defaultNodeSize(): number;
+        defaultNodeSize(x: number): Layout;
+        /**
+         * The strength of attraction between the group boundaries to each other.
+         * @property defaultNodeSize
+         * @type {Number}
+         */
+        groupCompactness(): number;
+        groupCompactness(x: number): Layout;
+        /**
+         * links have an ideal distance, The automatic layout will compute layout that tries to keep links (AKA edges) as close as possible to this length.
+         */
+        linkDistance(): number;
+        linkDistance(): (t: any) => number;
+        linkDistance(x: number): Layout;
+        linkDistance(x: (t: any) => number): Layout;
+        linkType(f: Function | number): Layout;
+        convergenceThreshold(): number;
+        convergenceThreshold(x: number): Layout;
+        alpha(): number;
+        alpha(x: number): Layout;
+        getLinkLength(link: any): number;
+        static setLinkLength(link: any, length: number): void;
+        getLinkType(link: any): number;
+        linkAccessor: {
+            getSourceIndex: (e: any) => any;
+            getTargetIndex: (e: any) => any;
+            setLength: (link: any, length: number) => void;
+            getType: (l: any) => any;
+        };
+        /**
+         * compute an ideal length for each link based on the graph structure around that link.
+         * you can use this (for example) to create extra space around hub-nodes in dense graphs.
+         * In particular this calculation is based on the "symmetric difference" in the neighbour sets of the source and target:
+         * i.e. if neighbours of source is a and neighbours of target are b then calculation is: sqrt(|a union b| - |a intersection b|)
+         * Actual computation based on inspection of link structure occurs in start(), so links themselves
+         * don't have to have been assigned before invoking this function.
+         * @param {number} [idealLength] the base length for an edge when its source and start have no other common neighbours (e.g. 40)
+         * @param {number} [w] a multiplier for the effect of the length adjustment (e.g. 0.7)
+         */
+        symmetricDiffLinkLengths(idealLength: number, w?: number): Layout;
+        /**
+         * compute an ideal length for each link based on the graph structure around that link.
+         * you can use this (for example) to create extra space around hub-nodes in dense graphs.
+         * In particular this calculation is based on the "symmetric difference" in the neighbour sets of the source and target:
+         * i.e. if neighbours of source is a and neighbours of target are b then calculation is: |a intersection b|/|a union b|
+         * Actual computation based on inspection of link structure occurs in start(), so links themselves
+         * don't have to have been assigned before invoking this function.
+         * @param {number} [idealLength] the base length for an edge when its source and start have no other common neighbours (e.g. 40)
+         * @param {number} [w] a multiplier for the effect of the length adjustment (e.g. 0.7)
+         */
+        jaccardLinkLengths(idealLength: number, w?: number): Layout;
+        /**
+         * start the layout process
+         * @method start
+         * @param {number} [initialUnconstrainedIterations=0] unconstrained initial layout iterations
+         * @param {number} [initialUserConstraintIterations=0] initial layout iterations with user-specified constraints
+         * @param {number} [initialAllConstraintsIterations=0] initial layout iterations with all constraints including non-overlap
+         * @param {number} [gridSnapIterations=0] iterations of "grid snap", which pulls nodes towards grid cell centers - grid of size node[0].width - only really makes sense if all nodes have the same width and height
+         * @param [keepRunning=true] keep iterating asynchronously via the tick method
+         */
+        start(initialUnconstrainedIterations?: number, initialUserConstraintIterations?: number, initialAllConstraintsIterations?: number, gridSnapIterations?: number, keepRunning?: boolean): Layout;
+        private separateOverlappingComponents(width, height);
+        resume(): Layout;
+        stop(): Layout;
+        prepareEdgeRouting(nodeMargin?: number): void;
+        routeEdge(edge: any, draw: any): any[];
+        static getSourceIndex(e: any): any;
+        static getTargetIndex(e: any): any;
+        static linkId(e: any): string;
+        static dragStart(d: any): void;
+        static dragEnd(d: any): void;
+        static mouseOver(d: any): void;
+        static mouseOut(d: any): void;
+    }
+}
+
+declare namespace cola {
+    class LayoutAdaptor extends Layout {
+        trigger(e: Event): void;
+        kick(): void;
+        drag(): void;
+        on(eventType: EventType | string, listener: () => void): LayoutAdaptor;
+        dragstart: (d: any) => void;
+        dragStart: (d: any) => void;
+        dragend: (d: any) => void;
+        dragEnd: (d: any) => void;
+        constructor(options: any);
+    }
+    /**
+     * provides an interface for use with any external graph system (e.g. Cytoscape.js):
+     */
+    function adaptor(options: any): LayoutAdaptor;
+}
+declare namespace cola {
+    function gridify(pgLayout: any, nudgeGap: any, margin: any, groupMargin: any): geom.Point[][][];
+    function powerGraphGridLayout(graph: {
+        nodes: Node[];
+        links: Link<Node>[];
+    }, size: number[], grouppadding: number, margin: number, groupMargin: number): {
+        cola: Layout;
+        powerGraph: any;
+    };
+}
+
+declare namespace cola {
+    class D3StyleLayoutAdaptor extends Layout {
+        event: any;
+        trigger(e: Event): void;
+        kick(): void;
+        drag: () => any;
+        constructor();
+        on(eventType: EventType | string, listener: () => void): D3StyleLayoutAdaptor;
+    }
+    /**
+     * provides an interface for use with d3:
+     * - uses the d3 event system to dispatch layout events such as:
+     *   o "start" (start layout process)
+     *   o "tick" (after each layout iteration)
+     *   o "end" (layout converged and complete).
+     * - uses the d3 timer to queue layout iterations.
+     * - sets up d3.behavior.drag to drag nodes
+     *   o use `node.call(<the returned instance of Layout>.drag)` to make nodes draggable
+     * returns an instance of the cola.Layout itself with which the user
+     * can interact directly.
+     */
+    function d3adaptor(): D3StyleLayoutAdaptor;
+}
+
+
+
+
+declare namespace cola {
+    interface NodeAccessor<Node> {
+        getChildren(v: Node): number[];
+        getBounds(v: Node): cola.vpsc.Rectangle;
+    }
+    class NodeWrapper {
+        id: number;
+        rect: cola.vpsc.Rectangle;
+        children: number[];
+        leaf: boolean;
+        parent: NodeWrapper;
+        ports: Vert[];
+        constructor(id: number, rect: cola.vpsc.Rectangle, children: number[]);
+    }
+    class Vert {
+        id: number;
+        x: number;
+        y: number;
+        node: NodeWrapper;
+        line: any;
+        constructor(id: number, x: number, y: number, node?: NodeWrapper, line?: any);
+    }
+    class LongestCommonSubsequence<T> {
+        s: T[];
+        t: T[];
+        length: number;
+        si: number;
+        ti: number;
+        reversed: boolean;
+        constructor(s: T[], t: T[]);
+        private static findMatch<T>(s, t);
+        getSequence(): T[];
+    }
+    interface GridLine {
+        nodes: NodeWrapper[];
+        pos: number;
+    }
+    class GridRouter<Node> {
+        originalnodes: Node[];
+        groupPadding: number;
+        leaves: NodeWrapper[];
+        groups: NodeWrapper[];
+        nodes: NodeWrapper[];
+        cols: GridLine[];
+        rows: GridLine[];
+        root: any;
+        verts: Vert[];
+        edges: any;
+        backToFront: any;
+        obstacles: any;
+        passableEdges: any;
+        private avg(a);
+        private getGridLines(axis);
+        private getDepth(v);
+        private midPoints(a);
+        constructor(originalnodes: Node[], accessor: NodeAccessor<Node>, groupPadding?: number);
+        private findLineage(v);
+        private findAncestorPathBetween(a, b);
+        siblingObstacles(a: any, b: any): any;
+        static getSegmentSets(routes: any, x: any, y: any): any[];
+        static nudgeSegs(x: string, y: string, routes: any, segments: any, leftOf: any, gap: number): void;
+        static nudgeSegments(routes: any, x: string, y: string, leftOf: (e1: number, e2: number) => boolean, gap: number): void;
+        routeEdges<Edge>(edges: Edge[], nudgeGap: number, source: (e: Edge) => number, target: (e: Edge) => number): geom.Point[][][];
+        static unreverseEdges(routes: any, routePaths: any): void;
+        static angleBetween2Lines(line1: geom.Point[], line2: geom.Point[]): number;
+        private static isLeft(a, b, c);
+        private static getOrder(pairs);
+        static orderEdges(edges: any): (l: number, r: number) => boolean;
+        static makeSegments(path: geom.Point[]): geom.Point[][];
+        route(s: number, t: number): geom.Point[];
+        static getRoutePath(route: geom.Point[][], cornerradius: number, arrowwidth: number, arrowheight: number): {
+            routepath: string;
+            arrowpath: string;
+        };
+    }
+}
+/**
+ * Use cola to do a layout in 3D!! Yay.
+ * Pretty simple for the moment.
+ */
+declare namespace cola {
+    class Link3D {
+        source: number;
+        target: number;
+        length: number;
+        constructor(source: number, target: number);
+        actualLength(x: number[][]): number;
+    }
+    class Node3D implements vpsc.GraphNode {
+        x: number;
+        y: number;
+        z: number;
+        fixed: boolean;
+        width: number;
+        height: number;
+        px: number;
+        py: number;
+        bounds: vpsc.Rectangle;
+        variable: vpsc.Variable;
+        constructor(x?: number, y?: number, z?: number);
+    }
+    class Layout3D {
+        nodes: Node3D[];
+        links: Link3D[];
+        idealLinkLength: number;
+        static dims: string[];
+        static k: number;
+        result: number[][];
+        constraints: any[];
+        constructor(nodes: Node3D[], links: Link3D[], idealLinkLength?: number);
+        linkLength(l: Link3D): number;
+        useJaccardLinkLengths: boolean;
+        descent: cola.Descent;
+        start(iterations?: number): Layout3D;
+        tick(): number;
+    }
+}
diff --git a/webcola/tsconfig.json b/webcola/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/webcola/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/webcola/webcola.d.ts b/webcola/webcola.d.ts
deleted file mode 100644
index 5b9efd5cbf..0000000000
--- a/webcola/webcola.d.ts
+++ /dev/null
@@ -1,1097 +0,0 @@
-// Type definitions for webcola 3.1.1
-// Project: https://github.com/tgdwyer/WebCola
-// Definitions by: Qinfeng Chen <https://github.com/qinfchen>, Tim Dwyer <https://github.com/tgdwyer>, Noah Chen <https://github.com/nchen63>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace cola {
-    function applyPacking(graphs: Array<any>, w: any, h: any, node_size: any, desired_ratio?: number): void;
-    /**
-     * connected components of graph
-     * returns an array of {}
-     */
-    function separateGraphs(nodes: any, links: any): any[];
-}
-declare namespace cola.vpsc {
-    class PositionStats {
-        scale: number;
-        AB: number;
-        AD: number;
-        A2: number;
-        constructor(scale: number);
-        addVariable(v: Variable): void;
-        getPosn(): number;
-    }
-    class Constraint {
-        left: Variable;
-        right: Variable;
-        gap: number;
-        equality: boolean;
-        lm: number;
-        active: boolean;
-        unsatisfiable: boolean;
-        constructor(left: Variable, right: Variable, gap: number, equality?: boolean);
-        slack(): number;
-    }
-    class Variable {
-        desiredPosition: number;
-        weight: number;
-        scale: number;
-        offset: number;
-        block: Block;
-        cIn: Constraint[];
-        cOut: Constraint[];
-        constructor(desiredPosition: number, weight?: number, scale?: number);
-        dfdv(): number;
-        position(): number;
-        visitNeighbours(prev: Variable, f: (c: Constraint, next: Variable) => void): void;
-    }
-    class Block {
-        vars: Variable[];
-        posn: number;
-        ps: PositionStats;
-        blockInd: number;
-        constructor(v: Variable);
-        private addVariable(v);
-        updateWeightedPosition(): void;
-        private compute_lm(v, u, postAction);
-        private populateSplitBlock(v, prev);
-        traverse(visit: (c: Constraint) => any, acc: any[], v?: Variable, prev?: Variable): void;
-        findMinLM(): Constraint;
-        private findMinLMBetween(lv, rv);
-        private findPath(v, prev, to, visit);
-        isActiveDirectedPathBetween(u: Variable, v: Variable): boolean;
-        static split(c: Constraint): Block[];
-        private static createSplitBlock(startVar);
-        splitBetween(vl: Variable, vr: Variable): {
-            constraint: Constraint;
-            lb: Block;
-            rb: Block;
-        };
-        mergeAcross(b: Block, c: Constraint, dist: number): void;
-        cost(): number;
-    }
-    class Blocks {
-        vs: Variable[];
-        private list;
-        constructor(vs: Variable[]);
-        cost(): number;
-        insert(b: Block): void;
-        remove(b: Block): void;
-        merge(c: Constraint): void;
-        forEach(f: (b: Block, i: number) => void): void;
-        updateBlockPositions(): void;
-        split(inactive: Constraint[]): void;
-    }
-    class Solver {
-        vs: Variable[];
-        cs: Constraint[];
-        bs: Blocks;
-        inactive: Constraint[];
-        static LAGRANGIAN_TOLERANCE: number;
-        static ZERO_UPPERBOUND: number;
-        constructor(vs: Variable[], cs: Constraint[]);
-        cost(): number;
-        setStartingPositions(ps: number[]): void;
-        setDesiredPositions(ps: number[]): void;
-        private mostViolated();
-        satisfy(): void;
-        solve(): number;
-    }
-}
-declare namespace cola.vpsc {
-    class TreeBase {
-        _root: any;
-        size: any;
-        _comparator: any;
-        clear(): void;
-        find(data: any): any;
-        findIter: (data: any) => any;
-        lowerBound(data: any): Iterator;
-        upperBound(data: any): Iterator;
-        min(): any;
-        max(): any;
-        iterator(): Iterator;
-        each(cb: any): void;
-        reach(cb: any): void;
-        _bound(data: any, cmp: any): Iterator;
-    }
-    class Iterator {
-        _tree: any;
-        _ancestors: any;
-        _cursor: any;
-        constructor(tree: any);
-        data(): any;
-        next(): any;
-        prev(): any;
-        _minNode(start: any): void;
-        _maxNode(start: any): void;
-    }
-    class RBTree<T> extends TreeBase {
-        _root: any;
-        _comparator: any;
-        size: any;
-        constructor(comparator: (a: T, b: T) => number);
-        insert(data: any): boolean;
-        remove(data: any): boolean;
-        static is_red(node: any): any;
-        static single_rotate(root: any, dir: any): any;
-        static double_rotate(root: any, dir: any): any;
-    }
-}
-/// <reference path="vpsc.d.ts" />
-/// <reference path="rbtree.d.ts" />
-declare namespace cola.vpsc {
-    interface Point {
-        x: number;
-        y: number;
-    }
-    interface Leaf {
-        bounds: Rectangle;
-        variable: Variable;
-    }
-    interface Group {
-        bounds: Rectangle;
-        padding: number;
-        stiffness: number;
-        leaves: Leaf[];
-        groups: Group[];
-        minVar: Variable;
-        maxVar: Variable;
-    }
-    function computeGroupBounds(g: Group): Rectangle;
-    class Rectangle {
-        x: number;
-        X: number;
-        y: number;
-        Y: number;
-        constructor(x: number, X: number, y: number, Y: number);
-        static empty(): Rectangle;
-        cx(): number;
-        cy(): number;
-        overlapX(r: Rectangle): number;
-        overlapY(r: Rectangle): number;
-        setXCentre(cx: number): void;
-        setYCentre(cy: number): void;
-        width(): number;
-        height(): number;
-        union(r: Rectangle): Rectangle;
-        /**
-         * return any intersection points between the given line and the sides of this rectangle
-         * @method lineIntersection
-         * @param x1 number first x coord of line
-         * @param y1 number first y coord of line
-         * @param x2 number second x coord of line
-         * @param y2 number second y coord of line
-         * @return any intersection points found
-         */
-        lineIntersections(x1: number, y1: number, x2: number, y2: number): Array<Point>;
-        /**
-         * return any intersection points between a line extending from the centre of this rectangle to the given point,
-         *  and the sides of this rectangle
-         * @method lineIntersection
-         * @param x2 number second x coord of line
-         * @param y2 number second y coord of line
-         * @return any intersection points found
-         */
-        rayIntersection(x2: number, y2: number): Point;
-        vertices(): Point[];
-        static lineIntersection(x1: number, y1: number, x2: number, y2: number, x3: number, y3: number, x4: number, y4: number): Point;
-        inflate(pad: number): Rectangle;
-    }
-    function makeEdgeBetween(source: Rectangle, target: Rectangle, ah: number): {
-        sourceIntersection: Point;
-        targetIntersection: Point;
-        arrowStart: Point;
-    };
-    function makeEdgeTo(s: {
-        x: number;
-        y: number;
-    }, target: Rectangle, ah: number): Point;
-    function generateXConstraints(rs: Rectangle[], vars: Variable[]): Constraint[];
-    function generateYConstraints(rs: Rectangle[], vars: Variable[]): Constraint[];
-    function generateXGroupConstraints(root: Group): Constraint[];
-    function generateYGroupConstraints(root: Group): Constraint[];
-    function removeOverlaps(rs: Rectangle[]): void;
-    interface GraphNode extends Leaf {
-        fixed: boolean;
-        fixedWeight?: number;
-        width: number;
-        height: number;
-        x: number;
-        y: number;
-        px: number;
-        py: number;
-    }
-    class IndexedVariable extends Variable {
-        index: number;
-        constructor(index: number, w: number);
-    }
-    class Projection {
-        private nodes;
-        private groups;
-        private rootGroup;
-        private avoidOverlaps;
-        private xConstraints;
-        private yConstraints;
-        private variables;
-        constructor(nodes: GraphNode[], groups: Group[], rootGroup?: Group, constraints?: any[], avoidOverlaps?: boolean);
-        private createSeparation(c);
-        private makeFeasible(c);
-        private createAlignment(c);
-        private createConstraints(constraints);
-        private setupVariablesAndBounds(x0, y0, desired, getDesired);
-        xProject(x0: number[], y0: number[], x: number[]): void;
-        yProject(x0: number[], y0: number[], y: number[]): void;
-        projectFunctions(): {
-            (x0: number[], y0: number[], r: number[]): void;
-        }[];
-        private project(x0, y0, start, desired, getDesired, cs, generateConstraints, updateNodeBounds, updateGroupBounds);
-        private solve(vs, cs, starting, desired);
-    }
-}
-/// <reference path="vpsc.d.ts" />
-/// <reference path="rectangle.d.ts" />
-declare namespace cola.geom {
-    class Point {
-        x: number;
-        y: number;
-    }
-    class LineSegment {
-        x1: number;
-        y1: number;
-        x2: number;
-        y2: number;
-        constructor(x1: number, y1: number, x2: number, y2: number);
-    }
-    class PolyPoint extends Point {
-        polyIndex: number;
-    }
-    /** tests if a point is Left|On|Right of an infinite line.
-     * @param points P0, P1, and P2
-     * @return >0 for P2 left of the line through P0 and P1
-     *            =0 for P2 on the line
-     *            <0 for P2 right of the line
-     */
-    function isLeft(P0: Point, P1: Point, P2: Point): number;
-    /**
-     * returns the convex hull of a set of points using Andrew's monotone chain algorithm
-     * see: http://geomalgorithms.com/a10-_hull-1.html#Monotone%20Chain
-     * @param S array of points
-     * @return the convex hull as an array of points
-     */
-    function ConvexHull(S: Point[]): Point[];
-    function clockwiseRadialSweep(p: Point, P: Point[], f: (p: Point) => void): void;
-    function tangent_PolyPolyC(V: Point[], W: Point[], t1: (a: Point, b: Point[]) => number, t2: (a: Point, b: Point[]) => number, cmp1: (a: Point, b: Point, c: Point) => boolean, cmp2: (a: Point, b: Point, c: Point) => boolean): {
-        t1: number;
-        t2: number;
-    };
-    function LRtangent_PolyPolyC(V: Point[], W: Point[]): {
-        t1: number;
-        t2: number;
-    };
-    function RLtangent_PolyPolyC(V: Point[], W: Point[]): {
-        t1: number;
-        t2: number;
-    };
-    function LLtangent_PolyPolyC(V: Point[], W: Point[]): {
-        t1: number;
-        t2: number;
-    };
-    function RRtangent_PolyPolyC(V: Point[], W: Point[]): {
-        t1: number;
-        t2: number;
-    };
-    class BiTangent {
-        t1: number;
-        t2: number;
-        constructor(t1: number, t2: number);
-    }
-    class BiTangents {
-        rl: BiTangent;
-        lr: BiTangent;
-        ll: BiTangent;
-        rr: BiTangent;
-    }
-    class TVGPoint extends Point {
-        vv: VisibilityVertex;
-    }
-    class VisibilityVertex {
-        id: number;
-        polyid: number;
-        polyvertid: number;
-        p: TVGPoint;
-        constructor(id: number, polyid: number, polyvertid: number, p: TVGPoint);
-    }
-    class VisibilityEdge {
-        source: VisibilityVertex;
-        target: VisibilityVertex;
-        constructor(source: VisibilityVertex, target: VisibilityVertex);
-        length(): number;
-    }
-    class TangentVisibilityGraph {
-        P: TVGPoint[][];
-        V: VisibilityVertex[];
-        E: VisibilityEdge[];
-        constructor(P: TVGPoint[][], g0?: {
-            V: VisibilityVertex[];
-            E: VisibilityEdge[];
-        });
-        addEdgeIfVisible(u: TVGPoint, v: TVGPoint, i1: number, i2: number): void;
-        addPoint(p: TVGPoint, i1: number): VisibilityVertex;
-        private intersectsPolys(l, i1, i2);
-    }
-    function tangents(V: Point[], W: Point[]): BiTangents;
-    function polysOverlap(p: Point[], q: Point[]): boolean;
-}
-/**
- * @module cola
- */
-declare namespace cola {
-    /**
-     * Descent respects a collection of locks over nodes that should not move
-     * @class Locks
-     */
-    class Locks {
-        locks: any;
-        /**
-         * add a lock on the node at index id
-         * @method add
-         * @param id index of node to be locked
-         * @param x required position for node
-         */
-        add(id: number, x: number[]): void;
-        /**
-         * @method clear clear all locks
-         */
-        clear(): void;
-        /**
-         * @isEmpty
-         * @returns false if no locks exist
-         */
-        isEmpty(): boolean;
-        /**
-         * perform an operation on each lock
-         * @apply
-         */
-        apply(f: (id: number, x: number[]) => void): void;
-    }
-    /**
-     * Uses a gradient descent approach to reduce a stress or p-stress goal function over a graph with specified ideal edge lengths or a square matrix of dissimilarities.
-     * The standard stress function over a graph nodes with position vectors x,y,z is (mathematica input):
-     *   stress[x_,y_,z_,D_,w_]:=Sum[w[[i,j]] (length[x[[i]],y[[i]],z[[i]],x[[j]],y[[j]],z[[j]]]-d[[i,j]])^2,{i,Length[x]-1},{j,i+1,Length[x]}]
-     * where: D is a square matrix of ideal separations between nodes, w is matrix of weights for those separations
-     *        length[x1_, y1_, z1_, x2_, y2_, z2_] = Sqrt[(x1 - x2)^2 + (y1 - y2)^2 + (z1 - z2)^2]
-     * below, we use wij = 1/(Dij^2)
-     *
-     * @class Descent
-     */
-    class Descent {
-        D: number[][];
-        G: number[][];
-        threshold: number;
-        /** Hessian Matrix
-         * @property H {number[][][]}
-         */
-        H: number[][][];
-        /** gradient vector
-         * @property G {number[][]}
-         */
-        g: number[][];
-        /** positions vector
-         * @property x {number[][]}
-         */
-        x: number[][];
-        /**
-         * @property k {number} dimensionality
-         */
-        k: number;
-        /**
-         * number of data-points / nodes / size of vectors/matrices
-         * @property n {number}
-         */
-        n: number;
-        locks: Locks;
-        private static zeroDistance;
-        private minD;
-        private Hd;
-        private a;
-        private b;
-        private c;
-        private d;
-        private e;
-        private ia;
-        private ib;
-        private xtmp;
-        numGridSnapNodes: number;
-        snapGridSize: number;
-        snapStrength: number;
-        scaleSnapByMaxH: boolean;
-        private random;
-        project: {
-            (x0: number[], y0: number[], r: number[]): void;
-        }[];
-        /**
-         * @method constructor
-         * @param x {number[][]} initial coordinates for nodes
-         * @param D {number[][]} matrix of desired distances between pairs of nodes
-         * @param G {number[][]} [default=null] if specified, G is a matrix of weights for goal terms between pairs of nodes.
-         * If G[i][j] > 1 and the separation between nodes i and j is greater than their ideal distance, then there is no contribution for this pair to the goal
-         * If G[i][j] <= 1 then it is used as a weighting on the contribution of the variance between ideal and actual separation between i and j to the goal function
-         */
-        constructor(x: number[][], D: number[][], G?: number[][]);
-        static createSquareMatrix(n: number, f: (i: number, j: number) => number): number[][];
-        private offsetDir();
-        computeDerivatives(x: number[][]): void;
-        private static dotProd(a, b);
-        private static rightMultiply(m, v, r);
-        computeStepSize(d: number[][]): number;
-        reduceStress(): number;
-        private static copy(a, b);
-        private stepAndProject(x0, r, d, stepSize);
-        private static mApply(m, n, f);
-        private matrixApply(f);
-        private computeNextPosition(x0, r);
-        run(iterations: number): number;
-        rungeKutta(): number;
-        private static mid(a, b, m);
-        takeDescentStep(x: number[], d: number[], stepSize: number): void;
-        computeStress(): number;
-    }
-    class PseudoRandom {
-        seed: number;
-        private a;
-        private c;
-        private m;
-        private range;
-        constructor(seed?: number);
-        getNext(): number;
-        getNextBetween(min: number, max: number): number;
-    }
-}
-declare namespace cola.powergraph {
-    interface LinkAccessor<Link> {
-        getSourceIndex(l: Link): number;
-        getTargetIndex(l: Link): number;
-        getType(l: Link): number;
-    }
-    class PowerEdge {
-        source: any;
-        target: any;
-        type: number;
-        constructor(source: any, target: any, type: number);
-    }
-    class Configuration<Link> {
-        private linkAccessor;
-        modules: Module[];
-        roots: ModuleSet[];
-        R: number;
-        constructor(n: number, edges: Link[], linkAccessor: LinkAccessor<Link>, rootGroup?: any[]);
-        private initModulesFromGroup(group);
-        merge(a: Module, b: Module, k?: number): Module;
-        private rootMerges(k?);
-        greedyMerge(): boolean;
-        private nEdges(a, b);
-        getGroupHierarchy(retargetedEdges: PowerEdge[]): any[];
-        allEdges(): PowerEdge[];
-        static getEdges(modules: ModuleSet, es: PowerEdge[]): void;
-    }
-    class Module {
-        id: number;
-        outgoing: LinkSets;
-        incoming: LinkSets;
-        children: ModuleSet;
-        definition: any;
-        gid: number;
-        constructor(id: number, outgoing?: LinkSets, incoming?: LinkSets, children?: ModuleSet, definition?: any);
-        getEdges(es: PowerEdge[]): void;
-        isLeaf(): boolean;
-        isIsland(): boolean;
-        isPredefined(): boolean;
-    }
-    class ModuleSet {
-        table: any;
-        count(): number;
-        intersection(other: ModuleSet): ModuleSet;
-        intersectionCount(other: ModuleSet): number;
-        contains(id: number): boolean;
-        add(m: Module): void;
-        remove(m: Module): void;
-        forAll(f: (m: Module) => void): void;
-        modules(): Module[];
-    }
-    class LinkSets {
-        sets: any;
-        n: number;
-        count(): number;
-        contains(id: number): boolean;
-        add(linktype: number, m: Module): void;
-        remove(linktype: number, m: Module): void;
-        forAll(f: (ms: ModuleSet, linktype: number) => void): void;
-        forAllModules(f: (m: Module) => void): void;
-        intersection(other: LinkSets): LinkSets;
-    }
-    function getGroups<Link>(nodes: any[], links: Link[], la: LinkAccessor<Link>, rootGroup?: any[]): {
-        groups: any[];
-        powerEdges: PowerEdge[];
-    };
-}
-/**
- * @module cola
- */
-declare namespace cola {
-    interface LinkAccessor<Link> {
-        getSourceIndex(l: Link): number;
-        getTargetIndex(l: Link): number;
-    }
-    interface LinkLengthAccessor<Link> extends LinkAccessor<Link> {
-        setLength(l: Link, value: number): void;
-    }
-    /** modify the specified link lengths based on the symmetric difference of their neighbours
-     * @class symmetricDiffLinkLengths
-     */
-    function symmetricDiffLinkLengths<Link>(links: Link[], la: LinkLengthAccessor<Link>, w?: number): void;
-    /** modify the specified links lengths based on the jaccard difference between their neighbours
-     * @class jaccardLinkLengths
-     */
-    function jaccardLinkLengths<Link>(links: Link[], la: LinkLengthAccessor<Link>, w?: number): void;
-    interface IConstraint {
-        left: number;
-        right: number;
-        gap: number;
-    }
-    interface DirectedEdgeConstraints {
-        axis: string;
-        gap: number;
-    }
-    interface LinkSepAccessor<Link> extends LinkAccessor<Link> {
-        getMinSeparation(l: Link): number;
-    }
-    /** generate separation constraints for all edges unless both their source and sink are in the same strongly connected component
-     * @class generateDirectedEdgeConstraints
-     */
-    function generateDirectedEdgeConstraints<Link>(n: number, links: Link[], axis: string, la: LinkSepAccessor<Link>): IConstraint[];
-    /**
-     * Tarjan's strongly connected components algorithm for directed graphs
-     * returns an array of arrays of node indicies in each of the strongly connected components.
-     * a vertex not in a SCC of two or more nodes is it's own SCC.
-     * adaptation of https://en.wikipedia.org/wiki/Tarjan%27s_strongly_connected_components_algorithm
-     */
-    function stronglyConnectedComponents<Link>(numVertices: number, edges: Link[], la: LinkAccessor<Link>): number[][];
-}
-declare class PairingHeap<T> {
-    elem: T;
-    private subheaps;
-    constructor(elem: T);
-    toString(selector: any): string;
-    forEach(f: any): void;
-    count(): number;
-    min(): T;
-    empty(): boolean;
-    contains(h: PairingHeap<T>): boolean;
-    isHeap(lessThan: (a: T, b: T) => boolean): boolean;
-    insert(obj: T, lessThan: any): PairingHeap<T>;
-    merge(heap2: PairingHeap<T>, lessThan: any): PairingHeap<T>;
-    removeMin(lessThan: (a: T, b: T) => boolean): PairingHeap<T>;
-    mergePairs(lessThan: (a: T, b: T) => boolean): PairingHeap<T>;
-    decreaseKey(subheap: PairingHeap<T>, newValue: T, setHeapNode: (e: T, h: PairingHeap<T>) => void, lessThan: (a: T, b: T) => boolean): PairingHeap<T>;
-}
-/**
- * @class PriorityQueue a min priority queue backed by a pairing heap
- */
-declare class PriorityQueue<T> {
-    private lessThan;
-    private root;
-    constructor(lessThan: (a: T, b: T) => boolean);
-    /**
-     * @method top
-     * @return the top element (the min element as defined by lessThan)
-     */
-    top(): T;
-    /**
-     * @method push
-     * put things on the heap
-     */
-    push(...args: T[]): PairingHeap<T>;
-    /**
-     * @method empty
-     * @return true if no more elements in queue
-     */
-    empty(): boolean;
-    /**
-     * @method isHeap check heap condition (for testing)
-     * @return true if queue is in valid state
-     */
-    isHeap(): boolean;
-    /**
-     * @method forEach apply f to each element of the queue
-     * @param f function to apply
-     */
-    forEach(f: any): void;
-    /**
-     * @method pop remove and return the min element from the queue
-     */
-    pop(): T;
-    /**
-     * @method reduceKey reduce the key value of the specified heap node
-     */
-    reduceKey(heapNode: PairingHeap<T>, newKey: T, setHeapNode?: (e: T, h: PairingHeap<T>) => void): void;
-    toString(selector: any): string;
-    /**
-     * @method count
-     * @return number of elements in queue
-     */
-    count(): number;
-}
-/// <reference path="pqueue.d.ts" />
-/**
- * @module shortestpaths
- */
-declare namespace cola.shortestpaths {
-    /**
-     * calculates all-pairs shortest paths or shortest paths from a single node
-     * @class Calculator
-     * @constructor
-     * @param n {number} number of nodes
-     * @param es {Edge[]} array of edges
-     */
-    class Calculator<Link> {
-        n: number;
-        es: Link[];
-        private neighbours;
-        constructor(n: number, es: Link[], getSourceIndex: (l: Link) => number, getTargetIndex: (l: Link) => number, getLength: (l: Link) => number);
-        /**
-         * compute shortest paths for graph over n nodes with edges an array of source/target pairs
-         * edges may optionally have a length attribute.  1 is the default.
-         * Uses Johnson's algorithm.
-         *
-         * @method DistanceMatrix
-         * @return the distance matrix
-         */
-        DistanceMatrix(): number[][];
-        /**
-         * get shortest paths from a specified start node
-         * @method DistancesFromNode
-         * @param start node index
-         * @return array of path lengths
-         */
-        DistancesFromNode(start: number): number[];
-        PathFromNodeToNode(start: number, end: number): number[];
-        PathFromNodeToNodeWithPrevCost(start: number, end: number, prevCost: (u: number, v: number, w: number) => number): number[];
-        private dijkstraNeighbours(start, dest?);
-    }
-}
-/// <reference path="handledisconnected.d.ts" />
-/// <reference path="geom.d.ts" />
-/// <reference path="descent.d.ts" />
-/// <reference path="powergraph.d.ts" />
-/// <reference path="linklengths.d.ts" />
-/// <reference path="shortestpaths.d.ts" />
-/**
- * @module cola
- */
-declare namespace cola {
-    /**
-     * The layout process fires three events:
-     *  - start: layout iterations started
-     *  - tick: fired once per iteration, listen to this to animate
-     *  - end: layout converged, you might like to zoom-to-fit or something at notification of this event
-     */
-    enum EventType {
-        start = 0,
-        tick = 1,
-        end = 2,
-    }
-    interface Event {
-        type: EventType;
-        alpha: number;
-        stress?: number;
-        listener?: () => void;
-    }
-    interface Node {
-        /**
-         * x and y will be computed by layout as the Node's centroid
-         */
-        x: number;
-        /**
-         * x and y will be computed by layout as the Node's centroid
-         */
-        y: number;
-        /**
-         * specify a width and height of the node's bounding box if you turn on avoidOverlaps
-         */
-        width?: number;
-        /**
-         * specify a width and height of the node's bounding box if you turn on avoidOverlaps
-         */
-        height?: any;
-        number: any;
-    }
-    interface Link<NodeType> {
-        source: NodeType;
-        target: NodeType;
-        length?: number;
-        weight?: number;
-    }
-    /**
-     * Main interface to cola layout.
-     * @class Layout
-     */
-    class Layout {
-        private _canvasSize;
-        private _linkDistance;
-        private _defaultNodeSize;
-        private _linkLengthCalculator;
-        private _linkType;
-        private _avoidOverlaps;
-        private _handleDisconnected;
-        private _alpha;
-        private _lastStress;
-        private _running;
-        private _nodes;
-        private _groups;
-        private _rootGroup;
-        private _links;
-        private _constraints;
-        private _distanceMatrix;
-        private _descent;
-        private _directedLinkConstraints;
-        private _threshold;
-        private _visibilityGraph;
-        private _groupCompactness;
-        protected event: any;
-        on(e: EventType | string, listener: (event: Event) => void): Layout;
-        protected trigger(e: Event): void;
-        protected kick(): void;
-        /**
-         * iterate the layout.  Returns true when layout converged.
-         */
-        protected tick(): boolean;
-        private updateNodePositions();
-        /**
-         * the list of nodes.
-         * If nodes has not been set, but links has, then we instantiate a nodes list here, of the correct size,
-         * before returning it.
-         * @property nodes {Array}
-         * @default empty list
-         */
-        nodes(): Array<Node>;
-        nodes(v: Array<Node>): Layout;
-        /**
-         * a list of hierarchical groups defined over nodes
-         * @property groups {Array}
-         * @default empty list
-         */
-        groups(): Array<any>;
-        groups(x: Array<any>): Layout;
-        powerGraphGroups(f: Function): Layout;
-        /**
-         * if true, the layout will not permit overlaps of the node bounding boxes (defined by the width and height properties on nodes)
-         * @property avoidOverlaps
-         * @type bool
-         * @default false
-         */
-        avoidOverlaps(): boolean;
-        avoidOverlaps(v: boolean): Layout;
-        /**
-         * if true, the final step of the start method will be to nicely pack connected components of the graph.
-         * works best if start() is called with a reasonable number of iterations specified and
-         * each node has a bounding box (defined by the width and height properties on nodes).
-         * @property handleDisconnected
-         * @type bool
-         * @default true
-         */
-        handleDisconnected(): boolean;
-        handleDisconnected(v: boolean): Layout;
-        /**
-         * causes constraints to be generated such that directed graphs are laid out either from left-to-right or top-to-bottom.
-         * a separation constraint is generated in the selected axis for each edge that is not involved in a cycle (part of a strongly connected component)
-         * @param axis {string} 'x' for left-to-right, 'y' for top-to-bottom
-         * @param minSeparation {number|link=>number} either a number specifying a minimum spacing required across all links or a function to return the minimum spacing for each link
-         */
-        flowLayout(axis: string, minSeparation: number | ((t: any) => number)): Layout;
-        /**
-         * links defined as source, target pairs over nodes
-         * @property links {array}
-         * @default empty list
-         */
-        links(): Array<Link<Node | number>>;
-        links(x: Array<Link<Node | number>>): Layout;
-        /**
-         * list of constraints of various types
-         * @property constraints
-         * @type {array}
-         * @default empty list
-         */
-        constraints(): Array<any>;
-        constraints(c: Array<any>): Layout;
-        /**
-         * Matrix of ideal distances between all pairs of nodes.
-         * If unspecified, the ideal distances for pairs of nodes will be based on the shortest path distance between them.
-         * @property distanceMatrix
-         * @type {Array of Array of Number}
-         * @default null
-         */
-        distanceMatrix(): Array<Array<number>>;
-        distanceMatrix(d: Array<Array<number>>): Layout;
-        /**
-         * Size of the layout canvas dimensions [x,y]. Currently only used to determine the midpoint which is taken as the starting position
-         * for nodes with no preassigned x and y.
-         * @property size
-         * @type {Array of Number}
-         */
-        size(): Array<number>;
-        size(x: Array<number>): Layout;
-        /**
-         * Default size (assume nodes are square so both width and height) to use in packing if node width/height are not specified.
-         * @property defaultNodeSize
-         * @type {Number}
-         */
-        defaultNodeSize(): number;
-        defaultNodeSize(x: number): Layout;
-        /**
-         * The strength of attraction between the group boundaries to each other.
-         * @property defaultNodeSize
-         * @type {Number}
-         */
-        groupCompactness(): number;
-        groupCompactness(x: number): Layout;
-        /**
-         * links have an ideal distance, The automatic layout will compute layout that tries to keep links (AKA edges) as close as possible to this length.
-         */
-        linkDistance(): number;
-        linkDistance(): (t: any) => number;
-        linkDistance(x: number): Layout;
-        linkDistance(x: (t: any) => number): Layout;
-        linkType(f: Function | number): Layout;
-        convergenceThreshold(): number;
-        convergenceThreshold(x: number): Layout;
-        alpha(): number;
-        alpha(x: number): Layout;
-        getLinkLength(link: any): number;
-        static setLinkLength(link: any, length: number): void;
-        getLinkType(link: any): number;
-        linkAccessor: {
-            getSourceIndex: (e: any) => any;
-            getTargetIndex: (e: any) => any;
-            setLength: (link: any, length: number) => void;
-            getType: (l: any) => any;
-        };
-        /**
-         * compute an ideal length for each link based on the graph structure around that link.
-         * you can use this (for example) to create extra space around hub-nodes in dense graphs.
-         * In particular this calculation is based on the "symmetric difference" in the neighbour sets of the source and target:
-         * i.e. if neighbours of source is a and neighbours of target are b then calculation is: sqrt(|a union b| - |a intersection b|)
-         * Actual computation based on inspection of link structure occurs in start(), so links themselves
-         * don't have to have been assigned before invoking this function.
-         * @param {number} [idealLength] the base length for an edge when its source and start have no other common neighbours (e.g. 40)
-         * @param {number} [w] a multiplier for the effect of the length adjustment (e.g. 0.7)
-         */
-        symmetricDiffLinkLengths(idealLength: number, w?: number): Layout;
-        /**
-         * compute an ideal length for each link based on the graph structure around that link.
-         * you can use this (for example) to create extra space around hub-nodes in dense graphs.
-         * In particular this calculation is based on the "symmetric difference" in the neighbour sets of the source and target:
-         * i.e. if neighbours of source is a and neighbours of target are b then calculation is: |a intersection b|/|a union b|
-         * Actual computation based on inspection of link structure occurs in start(), so links themselves
-         * don't have to have been assigned before invoking this function.
-         * @param {number} [idealLength] the base length for an edge when its source and start have no other common neighbours (e.g. 40)
-         * @param {number} [w] a multiplier for the effect of the length adjustment (e.g. 0.7)
-         */
-        jaccardLinkLengths(idealLength: number, w?: number): Layout;
-        /**
-         * start the layout process
-         * @method start
-         * @param {number} [initialUnconstrainedIterations=0] unconstrained initial layout iterations
-         * @param {number} [initialUserConstraintIterations=0] initial layout iterations with user-specified constraints
-         * @param {number} [initialAllConstraintsIterations=0] initial layout iterations with all constraints including non-overlap
-         * @param {number} [gridSnapIterations=0] iterations of "grid snap", which pulls nodes towards grid cell centers - grid of size node[0].width - only really makes sense if all nodes have the same width and height
-         * @param [keepRunning=true] keep iterating asynchronously via the tick method
-         */
-        start(initialUnconstrainedIterations?: number, initialUserConstraintIterations?: number, initialAllConstraintsIterations?: number, gridSnapIterations?: number, keepRunning?: boolean): Layout;
-        private separateOverlappingComponents(width, height);
-        resume(): Layout;
-        stop(): Layout;
-        prepareEdgeRouting(nodeMargin?: number): void;
-        routeEdge(edge: any, draw: any): any[];
-        static getSourceIndex(e: any): any;
-        static getTargetIndex(e: any): any;
-        static linkId(e: any): string;
-        static dragStart(d: any): void;
-        static dragEnd(d: any): void;
-        static mouseOver(d: any): void;
-        static mouseOut(d: any): void;
-    }
-}
-/// <reference path="layout.d.ts" />
-declare namespace cola {
-    class LayoutAdaptor extends Layout {
-        trigger(e: Event): void;
-        kick(): void;
-        drag(): void;
-        on(eventType: EventType | string, listener: () => void): LayoutAdaptor;
-        dragstart: (d: any) => void;
-        dragStart: (d: any) => void;
-        dragend: (d: any) => void;
-        dragEnd: (d: any) => void;
-        constructor(options: any);
-    }
-    /**
-     * provides an interface for use with any external graph system (e.g. Cytoscape.js):
-     */
-    function adaptor(options: any): LayoutAdaptor;
-}
-declare namespace cola {
-    function gridify(pgLayout: any, nudgeGap: any, margin: any, groupMargin: any): geom.Point[][][];
-    function powerGraphGridLayout(graph: {
-        nodes: Node[];
-        links: Link<Node>[];
-    }, size: number[], grouppadding: number, margin: number, groupMargin: number): {
-        cola: Layout;
-        powerGraph: any;
-    };
-}
-/// <reference path="layout.d.ts" />
-declare namespace cola {
-    class D3StyleLayoutAdaptor extends Layout {
-        event: any;
-        trigger(e: Event): void;
-        kick(): void;
-        drag: () => any;
-        constructor();
-        on(eventType: EventType | string, listener: () => void): D3StyleLayoutAdaptor;
-    }
-    /**
-     * provides an interface for use with d3:
-     * - uses the d3 event system to dispatch layout events such as:
-     *   o "start" (start layout process)
-     *   o "tick" (after each layout iteration)
-     *   o "end" (layout converged and complete).
-     * - uses the d3 timer to queue layout iterations.
-     * - sets up d3.behavior.drag to drag nodes
-     *   o use `node.call(<the returned instance of Layout>.drag)` to make nodes draggable
-     * returns an instance of the cola.Layout itself with which the user
-     * can interact directly.
-     */
-    function d3adaptor(): D3StyleLayoutAdaptor;
-}
-/// <reference path="rectangle.d.ts" />
-/// <reference path="shortestpaths.d.ts" />
-/// <reference path="geom.d.ts" />
-/// <reference path="vpsc.d.ts" />
-declare namespace cola {
-    interface NodeAccessor<Node> {
-        getChildren(v: Node): number[];
-        getBounds(v: Node): cola.vpsc.Rectangle;
-    }
-    class NodeWrapper {
-        id: number;
-        rect: cola.vpsc.Rectangle;
-        children: number[];
-        leaf: boolean;
-        parent: NodeWrapper;
-        ports: Vert[];
-        constructor(id: number, rect: cola.vpsc.Rectangle, children: number[]);
-    }
-    class Vert {
-        id: number;
-        x: number;
-        y: number;
-        node: NodeWrapper;
-        line: any;
-        constructor(id: number, x: number, y: number, node?: NodeWrapper, line?: any);
-    }
-    class LongestCommonSubsequence<T> {
-        s: T[];
-        t: T[];
-        length: number;
-        si: number;
-        ti: number;
-        reversed: boolean;
-        constructor(s: T[], t: T[]);
-        private static findMatch<T>(s, t);
-        getSequence(): T[];
-    }
-    interface GridLine {
-        nodes: NodeWrapper[];
-        pos: number;
-    }
-    class GridRouter<Node> {
-        originalnodes: Node[];
-        groupPadding: number;
-        leaves: NodeWrapper[];
-        groups: NodeWrapper[];
-        nodes: NodeWrapper[];
-        cols: GridLine[];
-        rows: GridLine[];
-        root: any;
-        verts: Vert[];
-        edges: any;
-        backToFront: any;
-        obstacles: any;
-        passableEdges: any;
-        private avg(a);
-        private getGridLines(axis);
-        private getDepth(v);
-        private midPoints(a);
-        constructor(originalnodes: Node[], accessor: NodeAccessor<Node>, groupPadding?: number);
-        private findLineage(v);
-        private findAncestorPathBetween(a, b);
-        siblingObstacles(a: any, b: any): any;
-        static getSegmentSets(routes: any, x: any, y: any): any[];
-        static nudgeSegs(x: string, y: string, routes: any, segments: any, leftOf: any, gap: number): void;
-        static nudgeSegments(routes: any, x: string, y: string, leftOf: (e1: number, e2: number) => boolean, gap: number): void;
-        routeEdges<Edge>(edges: Edge[], nudgeGap: number, source: (e: Edge) => number, target: (e: Edge) => number): geom.Point[][][];
-        static unreverseEdges(routes: any, routePaths: any): void;
-        static angleBetween2Lines(line1: geom.Point[], line2: geom.Point[]): number;
-        private static isLeft(a, b, c);
-        private static getOrder(pairs);
-        static orderEdges(edges: any): (l: number, r: number) => boolean;
-        static makeSegments(path: geom.Point[]): geom.Point[][];
-        route(s: number, t: number): geom.Point[];
-        static getRoutePath(route: geom.Point[][], cornerradius: number, arrowwidth: number, arrowheight: number): {
-            routepath: string;
-            arrowpath: string;
-        };
-    }
-}
-/**
- * Use cola to do a layout in 3D!! Yay.
- * Pretty simple for the moment.
- */
-declare namespace cola {
-    class Link3D {
-        source: number;
-        target: number;
-        length: number;
-        constructor(source: number, target: number);
-        actualLength(x: number[][]): number;
-    }
-    class Node3D implements vpsc.GraphNode {
-        x: number;
-        y: number;
-        z: number;
-        fixed: boolean;
-        width: number;
-        height: number;
-        px: number;
-        py: number;
-        bounds: vpsc.Rectangle;
-        variable: vpsc.Variable;
-        constructor(x?: number, y?: number, z?: number);
-    }
-    class Layout3D {
-        nodes: Node3D[];
-        links: Link3D[];
-        idealLinkLength: number;
-        static dims: string[];
-        static k: number;
-        result: number[][];
-        constraints: any[];
-        constructor(nodes: Node3D[], links: Link3D[], idealLinkLength?: number);
-        linkLength(l: Link3D): number;
-        useJaccardLinkLengths: boolean;
-        descent: cola.Descent;
-        start(iterations?: number): Layout3D;
-        tick(): number;
-    }
-}
diff --git a/webcomponents.js/webcomponents.js.d.ts b/webcomponents.js/index.d.ts
similarity index 100%
rename from webcomponents.js/webcomponents.js.d.ts
rename to webcomponents.js/index.d.ts
diff --git a/webcomponents.js/tsconfig.json b/webcomponents.js/tsconfig.json
new file mode 100644
index 0000000000..92a00714e0
--- /dev/null
+++ b/webcomponents.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "webcomponents.js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/webcomponents.js/webcomponents.js-tests.ts b/webcomponents.js/webcomponents.js-tests.ts
index b5e67abb93..2afcc5a421 100644
--- a/webcomponents.js/webcomponents.js-tests.ts
+++ b/webcomponents.js/webcomponents.js-tests.ts
@@ -1,10 +1,10 @@
-/// <reference path="webcomponents.js.d.ts" />
+
 
 /*
  * Custom Elements
  */
 var fooProto = Object.create(HTMLElement.prototype, {
-    createdCallback() {
+    createdCallback(this: HTMLElement) {
         // `this` should be the created element
         this.getElementsByTagName("a");
     }
diff --git a/webcrypto/WebCrypto.d.ts b/webcrypto/index.d.ts
similarity index 100%
rename from webcrypto/WebCrypto.d.ts
rename to webcrypto/index.d.ts
diff --git a/webcrypto/tsconfig.json b/webcrypto/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/webcrypto/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/webdriverio/index.d.ts b/webdriverio/index.d.ts
new file mode 100644
index 0000000000..4b596cbbe7
--- /dev/null
+++ b/webdriverio/index.d.ts
@@ -0,0 +1,1064 @@
+// Type definitions for webdriverio 3.3.0
+// Project: http://www.webdriver.io/
+// Definitions by: Nick Malaguti <https://github.com/nmalaguti/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+/// <reference types="Q"/>
+
+declare namespace WebdriverIO {
+    // EventEmitter
+    export interface Client<T> {
+        addListener(event: string, listener: Function): Client<T>;
+        on(event: string, listener: Function): Client<T>;
+        once(event: string, listener: Function): Client<T>;
+        removeListener(event: string, listener: Function): Client<T>;
+        removeAllListeners(event?: string): Client<T>;
+        setMaxListeners(n: number): Client<T>;
+        listeners(event: string): Client<T>;
+        emit(event: string, ...args: any[]): Client<T>;
+    }
+
+    // Promise
+    export interface Client<T> {
+        call(callback: () => any): Client<void>;
+        finally(callback: () => any): Client<T>;
+        then<P>(onFulfilled?: (value: T) => P | Client<P>, onRejected?: (err: any) => P | Client<P>): Client<P>;
+        catch<P>(onRejected?: (err: any) => P | Client<P>): Client<P>;
+        inspect(): Q.PromiseState<T>;
+    }
+
+    // Action
+    export interface Client<T> {
+        addValue(selector: string, value: string | number): Client<void>;
+        addValue<P>(
+            selector: string,
+            value: string | number,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        clearElement(selector: string): Client<void>;
+        clearElement<P>(
+            selector: string,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        click(selector: string): Client<void>;
+        click<P>(
+            selector: string,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        doubleClick(selector: string): Client<void>;
+        doubleClick<P>(
+            selector: string,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        dragAndDrop(sourceElem: string, destinationElem: string): Client<void>;
+        dragAndDrop<P>(
+            sourceElem: string,
+            destinationElem: string, callback: (err: any) => P
+        ): Client<P>;
+
+        leftClick(selector: string): Client<void>;
+        leftClick<P>(
+            selector: string,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        middleClick(selector: string): Client<void>;
+        middleClick<P>(
+            selector: string,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        moveToObject(selector: string): Client<void>;
+        moveToObject(selector: string, xoffset: number, yoffset: number): Client<void>;
+        moveToObject<P>(
+            selector: string,
+            callback: (err: any) => P
+        ): Client<P>;
+        moveToObject<P>(
+            selector: string,
+            xoffset: number,
+            yoffset: number,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        rightClick(selector: string): Client<void>;
+        rightClick<P>(
+            selector: string,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        selectByIndex(selectElem: string, index: number): Client<void>;
+        selectByIndex<P>(
+            selectElem: string,
+            index: number,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        selectByValue(selectElem: string, value: string): Client<void>;
+        selectByValue<P>(
+            selectElem: string,
+            value: string,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        selectByVisibleText(selectElem: string, text: string): Client<void>;
+        selectByVisibleText<P>(
+            selectElem: string,
+            text: string,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        selectorExecute<P>(
+            selectors: string | string[],
+            script: (elements: HTMLElement | HTMLElement[], ...args: any[]) => P,
+            ...args: any[]
+        ): Client<P>;
+
+        selectorExecuteAsync<P>(
+            selectors: string | string[],
+            script: (elements: HTMLElement | HTMLElement[], ...args: any[]) => P,
+            ...args: any[]
+        ): Client<P>;
+
+        setValue(selector: string, values: number | string | Array<string>): Client<void>;
+        setValue<P>(
+            selector: string,
+            values: number | string | Array<string>,
+            callback: (err: any) => P
+        ): Client<void>;
+
+        submitForm(selector: string): Client<void>;
+        submitForm<P>(
+            selector: string,
+            callback: (err: any) => P
+        ): Client<void>;
+    }
+
+    // Appium
+    export interface Client<T> {
+        // backgroundApp
+        // closeApp
+        // context
+        // contexts
+        // deviceKeyEvent
+        // getAppStrings
+        // getCurrentDeviceActivity
+        // getNetworkConnection
+        // hideDeviceKeyboard
+        // installAppOnDevice
+        // isAppInstalledOnDevice
+        // launchApp
+        // lock
+        // openNotifications
+        // performMultiAction
+        // performTouchAction
+        // pullFileFromDevice
+        // pushFileToDevice
+        // removeAppFromDevice
+        // resetApp
+        // rotate
+        // setImmediateValueInApp
+        // setNetworkConnection
+        // shake
+        // toggleAirplaneModeOnDevice
+        // toggleDataOnDevice
+        // toggleLocationServicesOnDevice
+        // toggleWiFiOnDevice
+    }
+
+    export interface Cookie {
+        name: string;
+        value: string;
+    }
+
+    // Cookie
+    export interface Client<T> {
+        deleteCookie(name?: string): Client<void>;
+        deleteCookie<P>(
+            callback: (err: any) => P
+        ): Client<P>;
+        deleteCookie<P>(
+            name: string,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        getCookie(): Client<Cookie[]>;
+        getCookie(name: string): Client<Cookie>;
+        getCookie<P>(
+            callback: (err: any, cookies: Cookie[]) => P
+        ): Client<P>;
+        getCookie<P>(
+            name: string,
+            callback: (err: any, cookie: Cookie) => P
+        ): Client<P>;
+
+        setCookie(cookie: Cookie): Client<void>;
+        setCookie<P>(
+            cookie: Cookie,
+            callback: (err: any) => P
+        ): Client<P>;
+    }
+
+    // Mobile
+    export interface Client<T> {
+        // flick
+        // flickDown
+        // flickLeft
+        // flickRight
+        // flickUp
+        // getGeoLocation
+        // getOrientation
+        // hold
+        // release
+        // setGeoLocation
+        // setOrientation
+        // touch
+    }
+
+    export interface CssProperty {
+        property: string;
+        value: string;
+        parsed: ParsedCssProperty;
+    }
+
+    export interface ParsedCssProperty {
+        type: string;
+        string: string;
+        quote: string;
+        unit: string;
+        value: string | number | string[] | number[];
+    }
+
+    export interface Size {
+        width: number;
+        height: number;
+    }
+
+    export interface Location {
+        x: number;
+        y: number;
+    }
+
+    // Property
+    export interface Client<T> {
+        getAttribute(selector: string, attributeName: string): Client<string | string[]>;
+        getAttribute<P>(
+            selector: string,
+            attributeName: string,
+            callback: (err: any, attribute: string | string[]) => P
+        ): Client<P>;
+
+        getCssProperty(selector: string, cssProperty: string): Client<CssProperty | CssProperty[]>;
+        getCssProperty<P>(
+            selector: string,
+            cssProperty: string,
+            callback: (err: any, cssProperty: CssProperty | CssProperty[]) => P
+        ): Client<P>;
+
+        getElementSize(selector: string): Client<Size | Size[]>;
+        getElementSize(selector: string, dimension: string): Client<number | number[]>;
+        getElementSize<P>(
+            selector: string,
+            callback: (err: any, size: Size | Size[]) => P
+        ): Client<P>;
+        getElementSize<P>(
+            selector: string,
+            dimension: string,
+            callback: (err: any, elementSize: number | number[]) => P
+        ): Client<P>;
+
+        getHTML(selector: string, includeSelectorTag?: boolean): Client<string | string[]>;
+        getHTML<P>(
+            selector: string,
+            callback: (err: any, html: string | string[]) => P
+        ): Client<P>;
+        getHTML<P>(
+            selector: string,
+            includeSelectorTag: boolean,
+            callback: (err: any, html: string | string[]) => P
+        ): Client<P>;
+
+        getLocation(selector: string): Client<Size>;
+        getLocation(selector: string, axis: string): Client<number>;
+        getLocation<P>(
+            selector: string,
+            callback: (err: any, size: Size) => P
+        ): Client<P>;
+        getLocation<P>(
+            selector: string,
+            axis: string,
+            callback: (err: any, location: number) => P
+        ): Client<P>;
+
+        getLocationInView(selector: string): Client<Size | Size[]>;
+        getLocationInView(selector: string, axis: string): Client<number | number[]>;
+        getLocationInView<P>(
+            selector: string,
+            callback: (err: any, size: Size | Size[]) => P
+        ): Client<P>;
+        getLocationInView<P>(
+            selector: string,
+            axis: string,
+            callback: (err: any, location: number | number[]) => P
+        ): Client<P>;
+
+        getSource(): Client<string>;
+        getSource<P>(callback: (err: any, source: string) => P): Client<P>;
+
+        getTagName(selector: string): Client<string | string[]>;
+        getTagName<P>(
+            selector: string,
+            callback: (err: any, tagName: string | string[]) => P
+        ): Client<P>;
+
+        getText(selector: string): Client<string | string[]>;
+        getText<P>(
+            selector: string,
+            callback: (err: any, text: string | string[]) => P
+        ): Client<P>;
+
+        getTitle(): Client<string>;
+        getTitle<P>(
+            callback: (err: any, title: string) => P
+        ): Client<P>;
+
+        getUrl(): Client<string>;
+        getUrl<P>(
+            callback: (err: any, title: string) => P
+        ): Client<P>;
+
+        getValue(selector: string): Client<string | string[]>;
+        getValue<P>(
+            selector: string,
+            callback: (err: any, value: string | string[]) => P
+        ): Client<P>;
+    }
+
+    export interface LogEntry {
+        timestamp: number;
+        level: string;
+        message: string;
+    }
+
+    export enum ApplicationCacheStatus {
+        UNCACHED = 0,
+        IDLE = 1,
+        CHECKING = 2,
+        DOWNLOADING = 3,
+        UPDATE_READY = 4,
+        OBSOLETE = 5
+    }
+
+    export enum Button {
+        left = 0,
+        middle = 1,
+        right = 2
+    }
+
+    export interface StorageItem {
+        key: string;
+        value: any;
+    }
+
+    export interface Location {
+        latitude: number;
+        longitude: number;
+        altitude: number;
+    }
+
+    export interface Session {
+        id: string;
+        capabilities: any;
+    }
+
+    export interface RawResult<T> {
+        value: T;
+    }
+
+    // Navigation
+    export interface Client<T> {
+        back(): Client<void>;
+        back<P>(
+            callback: (err: any) => P
+        ): Client<P>;
+
+        forward(): Client<void>;
+        forward<P>(
+            callback: (err: any) => P
+        ): Client<P>;
+
+        refresh(): Client<void>;
+        refresh<P>(
+            callback: (err: any) => P
+        ): Client<P>;
+
+        url(): Client<RawResult<string>>;
+        url(url: string): Client<void>;
+        url<P>(
+            callback: (err: any, result: RawResult<string>) => P
+        ): Client<P>;
+        url<P>(
+            url: string,
+            callback: (err: any) => P
+        ): Client<P>;
+    }
+
+    // Advanced input
+    export interface Client<T> {
+        // you probably want to use the click and drag and drop commands instead
+        buttonDown(button?: string | Button): Client<void>;
+        buttonDown<P>(
+            callback: (err: any) => P
+        ): Client<P>;
+        buttonDown<P>(
+            button: string | Button,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        // you probably want to use the click and drag and drop commands instead
+        buttonPress(button?: string | Button): Client<void>;
+        buttonPress<P>(
+            callback: (err: any) => P
+        ): Client<P>;
+        buttonPress<P>(
+            button: string | Button,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        // you probably want to use the click and drag and drop commands instead
+        buttonUp(button?: string | Button): Client<void>;
+        buttonUp<P>(
+            callback: (err: any) => P
+        ): Client<P>;
+        buttonUp(button?: string | Button): Client<void>;
+        buttonUp<P>(
+            button: string | Button,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        // you probably want to use the click and drag and drop commands instead
+        doDoubleClick(): Client<void>;
+        doDoubleClick<P>(
+            callback: (err: any) => P
+        ): Client<P>;
+
+        // you probably want to use addValue and setValue instead
+        keys(value: string | string[]): Client<void>;
+        keys<P>(
+            value: string | string[],
+            callback: (err: any) => P
+        ): Client<P>;
+
+        // you probably want to use the moveToObject command instead
+        moveTo(id: ElementId, xoffset?: number, yoffset?: number): Client<void>;
+        moveTo(xoffset?: number, yoffset?: number): Client<void>;
+        moveTo<P>(
+            id: ElementId,
+            callback: (err: any) => P
+        ): Client<P>;
+        moveTo<P>(
+            id: ElementId,
+            xoffset: number,
+            callback: (err: any) => P
+        ): Client<P>;
+        moveTo<P>(
+            id: ElementId,
+            xoffset: number,
+            yoffset: number,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        // touchClick
+        // touchDoubleClick
+        // touchDown
+        // touchFlick
+        // touchLongClick
+        // touchMove
+        // touchScroll
+        // touchUp
+    }
+
+    // Useful Protocol
+    export interface Client<T> {
+        alertAccept(): Client<void>;
+        alertAccept<P>(
+            callback: (err: any) => P
+        ): Client<P>;
+
+        alertDismiss(): Client<void>;
+        alertDismiss<P>(
+            callback: (err: any) => P
+        ): Client<P>;
+
+        alertText(text?: string): Client<string>;
+        alertText<P>(
+            callback: (err: any, text: string) => P
+        ): Client<P>;
+        alertText<P>(
+            text: string,
+            callback: (err: any, text: string) => P
+        ): Client<P>;
+
+        frame(id: any): Client<void>;
+        frame<P>(
+            id: any,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        frameParent(): Client<void>;
+        frameParent<P>(
+            callback: (err: any) => P
+        ): Client<P>;
+
+        init(capabilities?: DesiredCapabilities): Client<void>;
+        init<P>(
+            callback: (err: any) => P
+        ): Client<P>;
+        init<P>(
+            capabilities: DesiredCapabilities,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        log(type: string): Client<RawResult<LogEntry[]>>;
+        log<P>(
+            type: string,
+            callback: (err: any, result: RawResult<LogEntry[]>) => P
+        ): Client<P>;
+
+        logTypes(): Client<RawResult<string[]>>;
+        logTypes<P>(
+            callback: (err: any, result: RawResult<string[]>) => P
+        ): Client<P>;
+
+        session(action?: string, sessionId?: string): Client<RawResult<any>>;
+        session<P>(
+            callback: (err: any, result: RawResult<any>) => P
+        ): Client<P>;
+        session<P>(
+            action: string,
+            callback: (err: any, result: RawResult<any>) => P
+        ): Client<P>;
+        session<P>(
+            action: string,
+            sessionId: string,
+            callback: (err: any, result: RawResult<any>) => P
+        ): Client<P>;
+
+        sessions(): Client<RawResult<Session[]>>;
+        sessions<P>(
+            callback: (err: any, sessions: RawResult<Session[]>) => P
+        ): Client<P>;
+
+        // timeouts
+        // timeoutsAsyncScript
+        // timeoutsImplicitWait
+
+        // window
+        // windowHandle
+        // windowHandleMaximize
+        // windowHandlePosition
+        // windowHandleSize
+        // windowHandles
+    }
+
+    export type ElementId = string;
+
+    export interface Element {
+        ELEMENT: ElementId;
+    }
+
+    // Element
+    export interface Client<T> {
+        element(selector: string): Client<RawResult<Element>>;
+        element<P>(
+            selector: string,
+            callback: (err: any, result: RawResult<Element>) => P
+        ): Client<P>;
+
+        elementActive(): Client<RawResult<Element>>;
+        elementActive<P>(
+            callback: (err: any, element: Element) => P
+        ): Client<P>;
+
+        elementIdAttribute(id: ElementId, attributeName: string): Client<RawResult<string>>;
+        elementIdAttribute<P>(
+            id: ElementId,
+            attributeName: string,
+            callback: (err: any, result: RawResult<string>) => P
+        ): Client<P>;
+
+        elementIdClear(id: ElementId): Client<void>;
+        elementIdClear<P>(
+            id: ElementId,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        elementIdClick(id: ElementId): Client<void>;
+        elementIdClick<P>(
+            id: ElementId,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        elementIdCssProperty(id: ElementId, propertyName: string): Client<RawResult<string>>;
+        elementIdCssProperty<P>(
+            id: ElementId,
+            propertyName: string,
+            callback: (err: any, result: RawResult<string>) => P
+        ): Client<P>;
+
+        elementIdDisplayed(id: ElementId): Client<RawResult<boolean>>;
+        elementIdDisplayed<P>(
+            id: ElementId,
+            callback: (err: any, result: RawResult<boolean>) => P
+        ): Client<P>;
+
+        elementIdElement(id: ElementId, selector: string): Client<RawResult<Element>>;
+        elementIdElement<P>(
+            id: ElementId,
+            selector: string,
+            callback: (err: any, result: RawResult<Element>) => P
+        ): Client<P>;
+
+        elementIdElements(id: ElementId, selector: string): Client<RawResult<Element[]>>;
+        elementIdElements<P>(
+            id: ElementId,
+            selector: string,
+            callback: (err: any, result: RawResult<Element[]>) => P
+        ): Client<P>;
+
+        elementIdEnabled(id: ElementId): Client<RawResult<boolean>>;
+        elementIdEnabled<P>(
+            id: ElementId,
+            callback: (err: any, result: RawResult<boolean>) => P
+        ): Client<P>;
+
+        elementIdLocation(id: ElementId): Client<RawResult<Location>>;
+        elementIdLocation<P>(
+            id: ElementId,
+            callback: (err: any, result: RawResult<Location>) => P
+        ): Client<P>;
+
+        elementIdLocationInView(id: ElementId): Client<RawResult<Location>>;
+        elementIdLocationInView<P>(
+            id: ElementId,
+            callback: (err: any, result: RawResult<Location>) => P
+        ): Client<P>;
+
+        elementIdName(id: ElementId): Client<RawResult<string>>;
+        elementIdName<P>(
+            id: ElementId,
+            callback: (err: any, result: RawResult<string>) => P
+        ): Client<P>;
+
+        elementIdSelected(id: ElementId): Client<RawResult<boolean>>;
+        elementIdSelected<P>(
+            id: ElementId,
+            callback: (err: any, result: RawResult<boolean>) => P
+        ): Client<P>;
+
+        elementIdSize(id: ElementId): Client<RawResult<Size>>;
+        elementIdSize<P>(
+            id: ElementId,
+            callback: (err: any, result: RawResult<Size>) => P
+        ): Client<P>;
+
+        elementIdText(id: ElementId): Client<RawResult<string>>;
+        elementIdText<P>(
+            id: ElementId,
+            callback: (err: any, result: RawResult<string>) => P
+        ): Client<P>;
+
+        elementIdValue(id: ElementId, values: string | string[]): Client<RawResult<void>>;
+        elementIdValue<P>(
+            id: ElementId,
+            values: string | string[],
+            callback: (err: any, result: RawResult<void>) => P
+        ): Client<P>;
+
+        elements(selector: string): Client<RawResult<Element[]>>;
+        elements<P>(
+            selector: string,
+            callback: (err: any, result: RawResult<Element[]>) => P
+        ): Client<P>;
+    }
+
+    // Unuseful Protocol
+    export interface Client<T> {
+        // applicationCacheStatus
+        // cookie
+
+        // use selectorExecute instead
+        execute(script: string | Function, ...args: any[]): Client<RawResult<any>>;
+
+        // use selectorExecuteAsync instead
+        executeAsync(script: string | Function, ...args: any[]): Client<RawResult<any>>;
+
+        // file
+        // imeActivate
+        // imeActivated
+        // imeActiveEngine
+        // imeAvailableEngines
+        // imeDeactivated
+        // localStorage
+        // localStorageSize
+        // location
+        // orientation
+        // screenshot
+        // sessionStorage
+        // sessionStorageSize
+        // source
+        // status
+
+        // use submitForm instead
+        submit(id: ElementId): Client<void>;
+        submit<P>(
+            id: ElementId,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        // title
+    }
+
+    // State
+    export interface Client<T> {
+        isEnabled(selector: string): Client<boolean>;
+        isEnabled<P>(
+            selector: string,
+            callback: (err: any, isEnabled: boolean) => P
+        ): Client<P>;
+
+        isExisting(selector: string): Client<boolean>;
+        isExisting<P>(
+            selector: string,
+            callback: (err: any, isExisting: boolean) => P
+        ): Client<P>;
+
+        isSelected(selector: string): Client<boolean>;
+        isSelected<P>(
+            selector: string,
+            callback: (err: any, isSelected: boolean) => P
+        ): Client<P>;
+
+        isVisible(selector: string): Client<boolean>;
+        isVisible<P>(
+            selector: string,
+            callback: (err: any, isVisible: boolean) => P
+        ): Client<P>;
+
+        isVisibleWithinViewport(selector: string): Client<boolean>;
+        isVisibleWithinViewport<P>(
+            selector: string,
+            callback: (err: any, isVisible: boolean) => P
+        ): Client<P>;
+    }
+
+    export interface CommandHistoryEntry {
+        command: string;
+        args: any[];
+    }
+
+    // Utility
+    export interface Client<T> {
+        addCommand(commandName: string, customMethod: Function, overwrite?: boolean): Client<void>;
+        addCommand<P>(
+            commandName: string,
+            customMethod: Function,
+            callback: (err: any) => P
+        ): Client<P>;
+        addCommand<P>(
+            commandName: string,
+            customMethod: Function,
+            overwrite: boolean,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        chooseFile(selector: string, localPath: string): Client<void>;
+        chooseFile<P>(
+            selector: string,
+            localPath: string,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        debug(): Client<void>;
+        debug<P>(
+            callback: (err: any) => P
+        ): Client<P>;
+
+        end(): Client<void>;
+        end<P>(
+            callback: (err: any) => P
+        ): Client<P>;
+
+        endAll(): Client<void>;
+        endAll<P>(
+            callback: (err: any) => P
+        ): Client<P>;
+
+        getCommandHistory(): Client<CommandHistoryEntry[]>;
+        getCommandHistory<P>(
+            callback: (err: any, history: CommandHistoryEntry[]) => P
+        ): Client<P>;
+
+        pause(milliseconds: number): Client<void>;
+        pause<P>(milliseconds: number, callback: (err: any) => P): Client<P>;
+
+        saveScreenshot(filename?: string): Client<Buffer>;
+        saveScreenshot<P>(
+            callback: (err: any, screenshot: Buffer) => P
+        ): Client<P>;
+        saveScreenshot<P>(
+            filename: string,
+            callback: (err: any, screenshot: Buffer) => P
+        ): Client<P>;
+
+        scroll(selector: string): Client<void>;
+        scroll(selector: string, xoffset: number, yoffset: number): Client<void>;
+        scroll(xoffset: number, yoffset: number): Client<void>;
+        scroll<P>(
+            selector: string,
+            callback: (err: any) => P
+        ): Client<P>;
+        scroll<P>(
+            selector: string,
+            xoffset: number,
+            yoffset: number,
+            callback: (err: any) => P
+        ): Client<P>;
+        scroll<P>(
+            xoffset: number,
+            yoffset: number,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        uploadFile(localPath: string): Client<void>;
+        uploadFile<P>(
+            localPath: string,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        waitForEnabled(selector: string, milliseconds?: number, reverse?: boolean): Client<boolean>;
+        waitForEnabled<P>(
+            selector: string,
+            callback: (err: any, enabled: boolean) => P
+        ): Client<P>;
+        waitForEnabled<P>(
+            selector: string,
+            milliseconds: number,
+            callback: (err: any, enabled: boolean) => P
+        ): Client<P>;
+        waitForEnabled<P>(
+            selector: string,
+            milliseconds: number,
+            reverse: boolean,
+            callback: (err: any, enabled: boolean) => P
+        ): Client<P>;
+
+        waitForExist(selector: string, milliseconds?: number, reverse?: boolean): Client<boolean>;
+        waitForExist<P>(
+            selector: string,
+            callback: (err: any, enabled: boolean) => P
+        ): Client<P>;
+        waitForExist<P>(
+            selector: string,
+            milliseconds: number,
+            callback: (err: any, enabled: boolean) => P
+        ): Client<P>;
+        waitForExist<P>(
+            selector: string,
+            milliseconds: number,
+            reverse: boolean,
+            callback: (err: any, enabled: boolean) => P
+        ): Client<P>;
+
+        waitForSelected(selector: string, milliseconds?: number, reverse?: boolean): Client<boolean>;
+        waitForSelected<P>(
+            selector: string,
+            callback: (err: any, enabled: boolean) => P
+        ): Client<P>;
+        waitForSelected<P>(
+            selector: string,
+            milliseconds: number,
+            callback: (err: any, enabled: boolean) => P
+        ): Client<P>;
+        waitForSelected<P>(
+            selector: string,
+            milliseconds: number,
+            reverse: boolean,
+            callback: (err: any, enabled: boolean) => P
+        ): Client<P>;
+
+        waitForText(selector: string, milliseconds?: number, reverse?: boolean): Client<boolean>;
+        waitForText<P>(
+            selector: string,
+            callback: (err: any, enabled: boolean) => P
+        ): Client<P>;
+        waitForText<P>(
+            selector: string,
+            milliseconds: number,
+            callback: (err: any, enabled: boolean) => P
+        ): Client<P>;
+        waitForText<P>(
+            selector: string,
+            milliseconds: number,
+            reverse: boolean,
+            callback: (err: any, enabled: boolean) => P
+        ): Client<P>;
+
+        waitForValue(selector: string, milliseconds?: number, reverse?: boolean): Client<boolean>;
+        waitForValue<P>(
+            selector: string,
+            callback: (err: any, enabled: boolean) => P
+        ): Client<P>;
+        waitForValue<P>(
+            selector: string,
+            milliseconds: number,
+            callback: (err: any, enabled: boolean) => P
+        ): Client<P>;
+        waitForValue<P>(
+            selector: string,
+            milliseconds: number,
+            reverse: boolean,
+            callback: (err: any, enabled: boolean) => P
+        ): Client<P>;
+
+        waitForVisible(selector: string, milliseconds?: number, reverse?: boolean): Client<boolean>;
+        waitForVisible<P>(
+            selector: string,
+            callback: (err: any, enabled: boolean) => P
+        ): Client<P>;
+        waitForVisible<P>(
+            selector: string,
+            milliseconds: number,
+            callback: (err: any, enabled: boolean) => P
+        ): Client<P>;
+        waitForVisible<P>(
+            selector: string,
+            milliseconds: number,
+            reverse: boolean,
+            callback: (err: any, enabled: boolean) => P
+        ): Client<P>;
+
+        waitUntil(
+            condition: () => boolean | Q.IPromise<boolean>,
+            timeout?: number,
+            interval?: number
+        ): Client<boolean>;
+        waitUntil<P>(
+            condition: () => boolean | Q.IPromise<boolean>,
+            callback: (err: any, enabled: boolean) => P
+        ): Client<P>;
+        waitUntil<P>(
+            condition: () => boolean | Q.IPromise<boolean>,
+            timeout: number,
+            callback: (err: any, enabled: boolean) => P
+        ): Client<P>;
+        waitUntil<P>(
+            condition: () => boolean | Q.IPromise<boolean>,
+            timeout: number,
+            interval: number,
+            callback: (err: any, enabled: boolean) => P
+        ): Client<P>;
+    }
+
+    // Window
+    export interface Client<T> {
+        close(windowHandle?: string): Client<void>;
+        close<P>(
+            callback: (err: any) => P
+        ): Client<P>;
+        close<P>(
+            windowHandle: string,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        getCurrentTabId(): Client<string>;
+        getCurrentTabId<P>(
+            callback: (err: any, tabId: string) => P
+        ): Client<P>;
+
+        getTabIds(): Client<string[]>;
+        getTabIds<P>(
+            callback: (err: any, tabIds: string[]) => P
+        ): Client<P>;
+
+        getViewportSize(): Client<Size>;
+        getViewportSize(dimension: string): Client<number>;
+        getViewportSize<P>(
+            callback: (err: any, size: Size) => P
+        ): Client<P>;
+        getViewportSize<P>(
+            dimension: string,
+            callback: (err: any, viewportSize: number) => P
+        ): Client<P>;
+
+        newWindow(url: string, windowName: string, windowFeatures: string): Client<string>;
+        newWindow<P>(
+            url: string,
+            windowName: string,
+            windowFeatures: string,
+            callback: (err: any, windowId: string) => P
+        ): Client<P>;
+
+        setViewportSize(size: Size, type: boolean): Client<void>;
+        setViewportSize<P>(
+            size: Size,
+            type: boolean,
+            callback: (err: any) => P
+        ): Client<P>;
+
+        switchTab(windowHandle?: string): Client<void>;
+        switchTab<P>(
+            callback: (err: any) => P
+        ): Client<P>;
+        switchTab<P>(
+            windowHandle: string,
+            callback: (err: any) => P
+        ): Client<P>;
+    }
+
+    export interface Options {
+        protocol: string;
+        waitforTimeout: number;
+        coloredLogs: boolean;
+        logLevel: string;
+        baseUrl: string;
+        desiredCapabilities: DesiredCapabilities;
+        screenshotPath: string;
+    }
+
+    // Options
+    export interface Client<T> {
+        options: Options;
+    }
+
+    export type DesiredCapabilities = any;
+
+    export interface RemoteOptions {
+        protocol?: string;
+        waitforTimeout?: number;
+        waitforInterval?: number;
+        coloredLogs?: boolean;
+        logLevel?: string;
+        baseUrl?: string;
+        desiredCapabilities?: DesiredCapabilities;
+    }
+
+    export interface MultiremoteOptions {
+        [key: string]: RemoteOptions;
+    }
+
+    export function remote(options?: RemoteOptions | string): Client<void>;
+
+    export function multiremote(options?: MultiremoteOptions): Client<void>;
+}
+
+declare var browser: WebdriverIO.Client<void>;
+
+declare module "webdriverio" {
+    export = WebdriverIO;
+}
diff --git a/webdriverio/tsconfig.json b/webdriverio/tsconfig.json
new file mode 100644
index 0000000000..07a8c33140
--- /dev/null
+++ b/webdriverio/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "webdriverio-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/webdriverio/webdriverio-tests.ts b/webdriverio/webdriverio-tests.ts
index 205a2c6a6e..0e752e93ce 100644
--- a/webdriverio/webdriverio-tests.ts
+++ b/webdriverio/webdriverio-tests.ts
@@ -1,6 +1,6 @@
-/// <reference path="webdriverio.d.ts" />
-/// <reference path="../mocha/mocha.d.ts" />
-/// <reference path="../chai/chai.d.ts" />
+
+/// <reference types="mocha" />
+/// <reference types="chai" />
 
 import {assert} from "chai";
 
diff --git a/webdriverio/webdriverio.d.ts b/webdriverio/webdriverio.d.ts
deleted file mode 100644
index b0aa6fb5be..0000000000
--- a/webdriverio/webdriverio.d.ts
+++ /dev/null
@@ -1,1064 +0,0 @@
-// Type definitions for webdriverio 3.3.0
-// Project: http://www.webdriver.io/
-// Definitions by: Nick Malaguti <https://github.com/nmalaguti/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts"/>
-/// <reference path="../q/Q.d.ts"/>
-
-declare namespace WebdriverIO {
-    // EventEmitter
-    export interface Client<T> {
-        addListener(event: string, listener: Function): Client<T>;
-        on(event: string, listener: Function): Client<T>;
-        once(event: string, listener: Function): Client<T>;
-        removeListener(event: string, listener: Function): Client<T>;
-        removeAllListeners(event?: string): Client<T>;
-        setMaxListeners(n: number): Client<T>;
-        listeners(event: string): Client<T>;
-        emit(event: string, ...args: any[]): Client<T>;
-    }
-
-    // Promise
-    export interface Client<T> {
-        call(callback: () => any): Client<void>;
-        finally(callback: () => any): Client<T>;
-        then<P>(onFulfilled?: (value: T) => P | Client<P>, onRejected?: (err: any) => P | Client<P>): Client<P>;
-        catch<P>(onRejected?: (err: any) => P | Client<P>): Client<P>;
-        inspect(): Q.PromiseState<T>;
-    }
-
-    // Action
-    export interface Client<T> {
-        addValue(selector: string, value: string | number): Client<void>;
-        addValue<P>(
-            selector: string,
-            value: string | number,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        clearElement(selector: string): Client<void>;
-        clearElement<P>(
-            selector: string,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        click(selector: string): Client<void>;
-        click<P>(
-            selector: string,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        doubleClick(selector: string): Client<void>;
-        doubleClick<P>(
-            selector: string,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        dragAndDrop(sourceElem: string, destinationElem: string): Client<void>;
-        dragAndDrop<P>(
-            sourceElem: string,
-            destinationElem: string, callback: (err: any) => P
-        ): Client<P>;
-
-        leftClick(selector: string): Client<void>;
-        leftClick<P>(
-            selector: string,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        middleClick(selector: string): Client<void>;
-        middleClick<P>(
-            selector: string,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        moveToObject(selector: string): Client<void>;
-        moveToObject(selector: string, xoffset: number, yoffset: number): Client<void>;
-        moveToObject<P>(
-            selector: string,
-            callback: (err: any) => P
-        ): Client<P>;
-        moveToObject<P>(
-            selector: string,
-            xoffset: number,
-            yoffset: number,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        rightClick(selector: string): Client<void>;
-        rightClick<P>(
-            selector: string,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        selectByIndex(selectElem: string, index: number): Client<void>;
-        selectByIndex<P>(
-            selectElem: string,
-            index: number,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        selectByValue(selectElem: string, value: string): Client<void>;
-        selectByValue<P>(
-            selectElem: string,
-            value: string,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        selectByVisibleText(selectElem: string, text: string): Client<void>;
-        selectByVisibleText<P>(
-            selectElem: string,
-            text: string,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        selectorExecute<P>(
-            selectors: string | string[],
-            script: (elements: HTMLElement | HTMLElement[], ...args: any[]) => P,
-            ...args: any[]
-        ): Client<P>;
-
-        selectorExecuteAsync<P>(
-            selectors: string | string[],
-            script: (elements: HTMLElement | HTMLElement[], ...args: any[]) => P,
-            ...args: any[]
-        ): Client<P>;
-
-        setValue(selector: string, values: number | string | Array<string>): Client<void>;
-        setValue<P>(
-            selector: string,
-            values: number | string | Array<string>,
-            callback: (err: any) => P
-        ): Client<void>;
-
-        submitForm(selector: string): Client<void>;
-        submitForm<P>(
-            selector: string,
-            callback: (err: any) => P
-        ): Client<void>;
-    }
-
-    // Appium
-    export interface Client<T> {
-        // backgroundApp
-        // closeApp
-        // context
-        // contexts
-        // deviceKeyEvent
-        // getAppStrings
-        // getCurrentDeviceActivity
-        // getNetworkConnection
-        // hideDeviceKeyboard
-        // installAppOnDevice
-        // isAppInstalledOnDevice
-        // launchApp
-        // lock
-        // openNotifications
-        // performMultiAction
-        // performTouchAction
-        // pullFileFromDevice
-        // pushFileToDevice
-        // removeAppFromDevice
-        // resetApp
-        // rotate
-        // setImmediateValueInApp
-        // setNetworkConnection
-        // shake
-        // toggleAirplaneModeOnDevice
-        // toggleDataOnDevice
-        // toggleLocationServicesOnDevice
-        // toggleWiFiOnDevice
-    }
-
-    export interface Cookie {
-        name: string;
-        value: string;
-    }
-
-    // Cookie
-    export interface Client<T> {
-        deleteCookie(name?: string): Client<void>;
-        deleteCookie<P>(
-            callback: (err: any) => P
-        ): Client<P>;
-        deleteCookie<P>(
-            name: string,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        getCookie(): Client<Cookie[]>;
-        getCookie(name: string): Client<Cookie>;
-        getCookie<P>(
-            callback: (err: any, cookies: Cookie[]) => P
-        ): Client<P>;
-        getCookie<P>(
-            name: string,
-            callback: (err: any, cookie: Cookie) => P
-        ): Client<P>;
-
-        setCookie(cookie: Cookie): Client<void>;
-        setCookie<P>(
-            cookie: Cookie,
-            callback: (err: any) => P
-        ): Client<P>;
-    }
-
-    // Mobile
-    export interface Client<T> {
-        // flick
-        // flickDown
-        // flickLeft
-        // flickRight
-        // flickUp
-        // getGeoLocation
-        // getOrientation
-        // hold
-        // release
-        // setGeoLocation
-        // setOrientation
-        // touch
-    }
-
-    export interface CssProperty {
-        property: string;
-        value: string;
-        parsed: ParsedCssProperty;
-    }
-
-    export interface ParsedCssProperty {
-        type: string;
-        string: string;
-        quote: string;
-        unit: string;
-        value: string | number | string[] | number[];
-    }
-
-    export interface Size {
-        width: number;
-        height: number;
-    }
-
-    export interface Location {
-        x: number;
-        y: number;
-    }
-
-    // Property
-    export interface Client<T> {
-        getAttribute(selector: string, attributeName: string): Client<string | string[]>;
-        getAttribute<P>(
-            selector: string,
-            attributeName: string,
-            callback: (err: any, attribute: string | string[]) => P
-        ): Client<P>;
-
-        getCssProperty(selector: string, cssProperty: string): Client<CssProperty | CssProperty[]>;
-        getCssProperty<P>(
-            selector: string,
-            cssProperty: string,
-            callback: (err: any, cssProperty: CssProperty | CssProperty[]) => P
-        ): Client<P>;
-
-        getElementSize(selector: string): Client<Size | Size[]>;
-        getElementSize(selector: string, dimension: string): Client<number | number[]>;
-        getElementSize<P>(
-            selector: string,
-            callback: (err: any, size: Size | Size[]) => P
-        ): Client<P>;
-        getElementSize<P>(
-            selector: string,
-            dimension: string,
-            callback: (err: any, elementSize: number | number[]) => P
-        ): Client<P>;
-
-        getHTML(selector: string, includeSelectorTag?: boolean): Client<string | string[]>;
-        getHTML<P>(
-            selector: string,
-            callback: (err: any, html: string | string[]) => P
-        ): Client<P>;
-        getHTML<P>(
-            selector: string,
-            includeSelectorTag: boolean,
-            callback: (err: any, html: string | string[]) => P
-        ): Client<P>;
-
-        getLocation(selector: string): Client<Size>;
-        getLocation(selector: string, axis: string): Client<number>;
-        getLocation<P>(
-            selector: string,
-            callback: (err: any, size: Size) => P
-        ): Client<P>;
-        getLocation<P>(
-            selector: string,
-            axis: string,
-            callback: (err: any, location: number) => P
-        ): Client<P>;
-
-        getLocationInView(selector: string): Client<Size | Size[]>;
-        getLocationInView(selector: string, axis: string): Client<number | number[]>;
-        getLocationInView<P>(
-            selector: string,
-            callback: (err: any, size: Size | Size[]) => P
-        ): Client<P>;
-        getLocationInView<P>(
-            selector: string,
-            axis: string,
-            callback: (err: any, location: number | number[]) => P
-        ): Client<P>;
-
-        getSource(): Client<string>;
-        getSource<P>(callback: (err: any, source: string) => P): Client<P>;
-
-        getTagName(selector: string): Client<string | string[]>;
-        getTagName<P>(
-            selector: string,
-            callback: (err: any, tagName: string | string[]) => P
-        ): Client<P>;
-
-        getText(selector: string): Client<string | string[]>;
-        getText<P>(
-            selector: string,
-            callback: (err: any, text: string | string[]) => P
-        ): Client<P>;
-
-        getTitle(): Client<string>;
-        getTitle<P>(
-            callback: (err: any, title: string) => P
-        ): Client<P>;
-
-        getUrl(): Client<string>;
-        getUrl<P>(
-            callback: (err: any, title: string) => P
-        ): Client<P>;
-
-        getValue(selector: string): Client<string | string[]>;
-        getValue<P>(
-            selector: string,
-            callback: (err: any, value: string | string[]) => P
-        ): Client<P>;
-    }
-
-    export interface LogEntry {
-        timestamp: number;
-        level: string;
-        message: string;
-    }
-
-    export enum ApplicationCacheStatus {
-        UNCACHED = 0,
-        IDLE = 1,
-        CHECKING = 2,
-        DOWNLOADING = 3,
-        UPDATE_READY = 4,
-        OBSOLETE = 5
-    }
-
-    export enum Button {
-        left = 0,
-        middle = 1,
-        right = 2
-    }
-
-    export interface StorageItem {
-        key: string;
-        value: any;
-    }
-
-    export interface Location {
-        latitude: number;
-        longitude: number;
-        altitude: number;
-    }
-
-    export interface Session {
-        id: string;
-        capabilities: any;
-    }
-
-    export interface RawResult<T> {
-        value: T;
-    }
-
-    // Navigation
-    export interface Client<T> {
-        back(): Client<void>;
-        back<P>(
-            callback: (err: any) => P
-        ): Client<P>;
-
-        forward(): Client<void>;
-        forward<P>(
-            callback: (err: any) => P
-        ): Client<P>;
-
-        refresh(): Client<void>;
-        refresh<P>(
-            callback: (err: any) => P
-        ): Client<P>;
-
-        url(): Client<RawResult<string>>;
-        url(url: string): Client<void>;
-        url<P>(
-            callback: (err: any, result: RawResult<string>) => P
-        ): Client<P>;
-        url<P>(
-            url: string,
-            callback: (err: any) => P
-        ): Client<P>;
-    }
-
-    // Advanced input
-    export interface Client<T> {
-        // you probably want to use the click and drag and drop commands instead
-        buttonDown(button?: string | Button): Client<void>;
-        buttonDown<P>(
-            callback: (err: any) => P
-        ): Client<P>;
-        buttonDown<P>(
-            button: string | Button,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        // you probably want to use the click and drag and drop commands instead
-        buttonPress(button?: string | Button): Client<void>;
-        buttonPress<P>(
-            callback: (err: any) => P
-        ): Client<P>;
-        buttonPress<P>(
-            button: string | Button,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        // you probably want to use the click and drag and drop commands instead
-        buttonUp(button?: string | Button): Client<void>;
-        buttonUp<P>(
-            callback: (err: any) => P
-        ): Client<P>;
-        buttonUp(button?: string | Button): Client<void>;
-        buttonUp<P>(
-            button: string | Button,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        // you probably want to use the click and drag and drop commands instead
-        doDoubleClick(): Client<void>;
-        doDoubleClick<P>(
-            callback: (err: any) => P
-        ): Client<P>;
-
-        // you probably want to use addValue and setValue instead
-        keys(value: string | string[]): Client<void>;
-        keys<P>(
-            value: string | string[],
-            callback: (err: any) => P
-        ): Client<P>;
-
-        // you probably want to use the moveToObject command instead
-        moveTo(id: ElementId, xoffset?: number, yoffset?: number): Client<void>;
-        moveTo(xoffset?: number, yoffset?: number): Client<void>;
-        moveTo<P>(
-            id: ElementId,
-            callback: (err: any) => P
-        ): Client<P>;
-        moveTo<P>(
-            id: ElementId,
-            xoffset: number,
-            callback: (err: any) => P
-        ): Client<P>;
-        moveTo<P>(
-            id: ElementId,
-            xoffset: number,
-            yoffset: number,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        // touchClick
-        // touchDoubleClick
-        // touchDown
-        // touchFlick
-        // touchLongClick
-        // touchMove
-        // touchScroll
-        // touchUp
-    }
-
-    // Useful Protocol
-    export interface Client<T> {
-        alertAccept(): Client<void>;
-        alertAccept<P>(
-            callback: (err: any) => P
-        ): Client<P>;
-
-        alertDismiss(): Client<void>;
-        alertDismiss<P>(
-            callback: (err: any) => P
-        ): Client<P>;
-
-        alertText(text?: string): Client<string>;
-        alertText<P>(
-            callback: (err: any, text: string) => P
-        ): Client<P>;
-        alertText<P>(
-            text: string,
-            callback: (err: any, text: string) => P
-        ): Client<P>;
-
-        frame(id: any): Client<void>;
-        frame<P>(
-            id: any,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        frameParent(): Client<void>;
-        frameParent<P>(
-            callback: (err: any) => P
-        ): Client<P>;
-
-        init(capabilities?: DesiredCapabilities): Client<void>;
-        init<P>(
-            callback: (err: any) => P
-        ): Client<P>;
-        init<P>(
-            capabilities: DesiredCapabilities,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        log(type: string): Client<RawResult<LogEntry[]>>;
-        log<P>(
-            type: string,
-            callback: (err: any, result: RawResult<LogEntry[]>) => P
-        ): Client<P>;
-
-        logTypes(): Client<RawResult<string[]>>;
-        logTypes<P>(
-            callback: (err: any, result: RawResult<string[]>) => P
-        ): Client<P>;
-
-        session(action?: string, sessionId?: string): Client<RawResult<any>>;
-        session<P>(
-            callback: (err: any, result: RawResult<any>) => P
-        ): Client<P>;
-        session<P>(
-            action: string,
-            callback: (err: any, result: RawResult<any>) => P
-        ): Client<P>;
-        session<P>(
-            action: string,
-            sessionId: string,
-            callback: (err: any, result: RawResult<any>) => P
-        ): Client<P>;
-
-        sessions(): Client<RawResult<Session[]>>;
-        sessions<P>(
-            callback: (err: any, sessions: RawResult<Session[]>) => P
-        ): Client<P>;
-
-        // timeouts
-        // timeoutsAsyncScript
-        // timeoutsImplicitWait
-
-        // window
-        // windowHandle
-        // windowHandleMaximize
-        // windowHandlePosition
-        // windowHandleSize
-        // windowHandles
-    }
-
-    export type ElementId = string;
-
-    export interface Element {
-        ELEMENT: ElementId;
-    }
-
-    // Element
-    export interface Client<T> {
-        element(selector: string): Client<RawResult<Element>>;
-        element<P>(
-            selector: string,
-            callback: (err: any, result: RawResult<Element>) => P
-        ): Client<P>;
-
-        elementActive(): Client<RawResult<Element>>;
-        elementActive<P>(
-            callback: (err: any, element: Element) => P
-        ): Client<P>;
-
-        elementIdAttribute(id: ElementId, attributeName: string): Client<RawResult<string>>;
-        elementIdAttribute<P>(
-            id: ElementId,
-            attributeName: string,
-            callback: (err: any, result: RawResult<string>) => P
-        ): Client<P>;
-
-        elementIdClear(id: ElementId): Client<void>;
-        elementIdClear<P>(
-            id: ElementId,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        elementIdClick(id: ElementId): Client<void>;
-        elementIdClick<P>(
-            id: ElementId,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        elementIdCssProperty(id: ElementId, propertyName: string): Client<RawResult<string>>;
-        elementIdCssProperty<P>(
-            id: ElementId,
-            propertyName: string,
-            callback: (err: any, result: RawResult<string>) => P
-        ): Client<P>;
-
-        elementIdDisplayed(id: ElementId): Client<RawResult<boolean>>;
-        elementIdDisplayed<P>(
-            id: ElementId,
-            callback: (err: any, result: RawResult<boolean>) => P
-        ): Client<P>;
-
-        elementIdElement(id: ElementId, selector: string): Client<RawResult<Element>>;
-        elementIdElement<P>(
-            id: ElementId,
-            selector: string,
-            callback: (err: any, result: RawResult<Element>) => P
-        ): Client<P>;
-
-        elementIdElements(id: ElementId, selector: string): Client<RawResult<Element[]>>;
-        elementIdElements<P>(
-            id: ElementId,
-            selector: string,
-            callback: (err: any, result: RawResult<Element[]>) => P
-        ): Client<P>;
-
-        elementIdEnabled(id: ElementId): Client<RawResult<boolean>>;
-        elementIdEnabled<P>(
-            id: ElementId,
-            callback: (err: any, result: RawResult<boolean>) => P
-        ): Client<P>;
-
-        elementIdLocation(id: ElementId): Client<RawResult<Location>>;
-        elementIdLocation<P>(
-            id: ElementId,
-            callback: (err: any, result: RawResult<Location>) => P
-        ): Client<P>;
-
-        elementIdLocationInView(id: ElementId): Client<RawResult<Location>>;
-        elementIdLocationInView<P>(
-            id: ElementId,
-            callback: (err: any, result: RawResult<Location>) => P
-        ): Client<P>;
-
-        elementIdName(id: ElementId): Client<RawResult<string>>;
-        elementIdName<P>(
-            id: ElementId,
-            callback: (err: any, result: RawResult<string>) => P
-        ): Client<P>;
-
-        elementIdSelected(id: ElementId): Client<RawResult<boolean>>;
-        elementIdSelected<P>(
-            id: ElementId,
-            callback: (err: any, result: RawResult<boolean>) => P
-        ): Client<P>;
-
-        elementIdSize(id: ElementId): Client<RawResult<Size>>;
-        elementIdSize<P>(
-            id: ElementId,
-            callback: (err: any, result: RawResult<Size>) => P
-        ): Client<P>;
-
-        elementIdText(id: ElementId): Client<RawResult<string>>;
-        elementIdText<P>(
-            id: ElementId,
-            callback: (err: any, result: RawResult<string>) => P
-        ): Client<P>;
-
-        elementIdValue(id: ElementId, values: string | string[]): Client<RawResult<void>>;
-        elementIdValue<P>(
-            id: ElementId,
-            values: string | string[],
-            callback: (err: any, result: RawResult<void>) => P
-        ): Client<P>;
-
-        elements(selector: string): Client<RawResult<Element[]>>;
-        elements<P>(
-            selector: string,
-            callback: (err: any, result: RawResult<Element[]>) => P
-        ): Client<P>;
-    }
-
-    // Unuseful Protocol
-    export interface Client<T> {
-        // applicationCacheStatus
-        // cookie
-
-        // use selectorExecute instead
-        execute(script: string | Function, ...args: any[]): Client<RawResult<any>>;
-
-        // use selectorExecuteAsync instead
-        executeAsync(script: string | Function, ...args: any[]): Client<RawResult<any>>;
-
-        // file
-        // imeActivate
-        // imeActivated
-        // imeActiveEngine
-        // imeAvailableEngines
-        // imeDeactivated
-        // localStorage
-        // localStorageSize
-        // location
-        // orientation
-        // screenshot
-        // sessionStorage
-        // sessionStorageSize
-        // source
-        // status
-
-        // use submitForm instead
-        submit(id: ElementId): Client<void>;
-        submit<P>(
-            id: ElementId,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        // title
-    }
-
-    // State
-    export interface Client<T> {
-        isEnabled(selector: string): Client<boolean>;
-        isEnabled<P>(
-            selector: string,
-            callback: (err: any, isEnabled: boolean) => P
-        ): Client<P>;
-
-        isExisting(selector: string): Client<boolean>;
-        isExisting<P>(
-            selector: string,
-            callback: (err: any, isExisting: boolean) => P
-        ): Client<P>;
-
-        isSelected(selector: string): Client<boolean>;
-        isSelected<P>(
-            selector: string,
-            callback: (err: any, isSelected: boolean) => P
-        ): Client<P>;
-
-        isVisible(selector: string): Client<boolean>;
-        isVisible<P>(
-            selector: string,
-            callback: (err: any, isVisible: boolean) => P
-        ): Client<P>;
-
-        isVisibleWithinViewport(selector: string): Client<boolean>;
-        isVisibleWithinViewport<P>(
-            selector: string,
-            callback: (err: any, isVisible: boolean) => P
-        ): Client<P>;
-    }
-
-    export interface CommandHistoryEntry {
-        command: string;
-        args: any[];
-    }
-
-    // Utility
-    export interface Client<T> {
-        addCommand(commandName: string, customMethod: Function, overwrite?: boolean): Client<void>;
-        addCommand<P>(
-            commandName: string,
-            customMethod: Function,
-            callback: (err: any) => P
-        ): Client<P>;
-        addCommand<P>(
-            commandName: string,
-            customMethod: Function,
-            overwrite: boolean,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        chooseFile(selector: string, localPath: string): Client<void>;
-        chooseFile<P>(
-            selector: string,
-            localPath: string,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        debug(): Client<void>;
-        debug<P>(
-            callback: (err: any) => P
-        ): Client<P>;
-
-        end(): Client<void>;
-        end<P>(
-            callback: (err: any) => P
-        ): Client<P>;
-
-        endAll(): Client<void>;
-        endAll<P>(
-            callback: (err: any) => P
-        ): Client<P>;
-
-        getCommandHistory(): Client<CommandHistoryEntry[]>;
-        getCommandHistory<P>(
-            callback: (err: any, history: CommandHistoryEntry[]) => P
-        ): Client<P>;
-
-        pause(milliseconds: number): Client<void>;
-        pause<P>(milliseconds: number, callback: (err: any) => P): Client<P>;
-
-        saveScreenshot(filename?: string): Client<Buffer>;
-        saveScreenshot<P>(
-            callback: (err: any, screenshot: Buffer) => P
-        ): Client<P>;
-        saveScreenshot<P>(
-            filename: string,
-            callback: (err: any, screenshot: Buffer) => P
-        ): Client<P>;
-
-        scroll(selector: string): Client<void>;
-        scroll(selector: string, xoffset: number, yoffset: number): Client<void>;
-        scroll(xoffset: number, yoffset: number): Client<void>;
-        scroll<P>(
-            selector: string,
-            callback: (err: any) => P
-        ): Client<P>;
-        scroll<P>(
-            selector: string,
-            xoffset: number,
-            yoffset: number,
-            callback: (err: any) => P
-        ): Client<P>;
-        scroll<P>(
-            xoffset: number,
-            yoffset: number,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        uploadFile(localPath: string): Client<void>;
-        uploadFile<P>(
-            localPath: string,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        waitForEnabled(selector: string, milliseconds?: number, reverse?: boolean): Client<boolean>;
-        waitForEnabled<P>(
-            selector: string,
-            callback: (err: any, enabled: boolean) => P
-        ): Client<P>;
-        waitForEnabled<P>(
-            selector: string,
-            milliseconds: number,
-            callback: (err: any, enabled: boolean) => P
-        ): Client<P>;
-        waitForEnabled<P>(
-            selector: string,
-            milliseconds: number,
-            reverse: boolean,
-            callback: (err: any, enabled: boolean) => P
-        ): Client<P>;
-
-        waitForExist(selector: string, milliseconds?: number, reverse?: boolean): Client<boolean>;
-        waitForExist<P>(
-            selector: string,
-            callback: (err: any, enabled: boolean) => P
-        ): Client<P>;
-        waitForExist<P>(
-            selector: string,
-            milliseconds: number,
-            callback: (err: any, enabled: boolean) => P
-        ): Client<P>;
-        waitForExist<P>(
-            selector: string,
-            milliseconds: number,
-            reverse: boolean,
-            callback: (err: any, enabled: boolean) => P
-        ): Client<P>;
-
-        waitForSelected(selector: string, milliseconds?: number, reverse?: boolean): Client<boolean>;
-        waitForSelected<P>(
-            selector: string,
-            callback: (err: any, enabled: boolean) => P
-        ): Client<P>;
-        waitForSelected<P>(
-            selector: string,
-            milliseconds: number,
-            callback: (err: any, enabled: boolean) => P
-        ): Client<P>;
-        waitForSelected<P>(
-            selector: string,
-            milliseconds: number,
-            reverse: boolean,
-            callback: (err: any, enabled: boolean) => P
-        ): Client<P>;
-
-        waitForText(selector: string, milliseconds?: number, reverse?: boolean): Client<boolean>;
-        waitForText<P>(
-            selector: string,
-            callback: (err: any, enabled: boolean) => P
-        ): Client<P>;
-        waitForText<P>(
-            selector: string,
-            milliseconds: number,
-            callback: (err: any, enabled: boolean) => P
-        ): Client<P>;
-        waitForText<P>(
-            selector: string,
-            milliseconds: number,
-            reverse: boolean,
-            callback: (err: any, enabled: boolean) => P
-        ): Client<P>;
-
-        waitForValue(selector: string, milliseconds?: number, reverse?: boolean): Client<boolean>;
-        waitForValue<P>(
-            selector: string,
-            callback: (err: any, enabled: boolean) => P
-        ): Client<P>;
-        waitForValue<P>(
-            selector: string,
-            milliseconds: number,
-            callback: (err: any, enabled: boolean) => P
-        ): Client<P>;
-        waitForValue<P>(
-            selector: string,
-            milliseconds: number,
-            reverse: boolean,
-            callback: (err: any, enabled: boolean) => P
-        ): Client<P>;
-
-        waitForVisible(selector: string, milliseconds?: number, reverse?: boolean): Client<boolean>;
-        waitForVisible<P>(
-            selector: string,
-            callback: (err: any, enabled: boolean) => P
-        ): Client<P>;
-        waitForVisible<P>(
-            selector: string,
-            milliseconds: number,
-            callback: (err: any, enabled: boolean) => P
-        ): Client<P>;
-        waitForVisible<P>(
-            selector: string,
-            milliseconds: number,
-            reverse: boolean,
-            callback: (err: any, enabled: boolean) => P
-        ): Client<P>;
-
-        waitUntil(
-            condition: () => boolean | Q.IPromise<boolean>,
-            timeout?: number,
-            interval?: number
-        ): Client<boolean>;
-        waitUntil<P>(
-            condition: () => boolean | Q.IPromise<boolean>,
-            callback: (err: any, enabled: boolean) => P
-        ): Client<P>;
-        waitUntil<P>(
-            condition: () => boolean | Q.IPromise<boolean>,
-            timeout: number,
-            callback: (err: any, enabled: boolean) => P
-        ): Client<P>;
-        waitUntil<P>(
-            condition: () => boolean | Q.IPromise<boolean>,
-            timeout: number,
-            interval: number,
-            callback: (err: any, enabled: boolean) => P
-        ): Client<P>;
-    }
-
-    // Window
-    export interface Client<T> {
-        close(windowHandle?: string): Client<void>;
-        close<P>(
-            callback: (err: any) => P
-        ): Client<P>;
-        close<P>(
-            windowHandle: string,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        getCurrentTabId(): Client<string>;
-        getCurrentTabId<P>(
-            callback: (err: any, tabId: string) => P
-        ): Client<P>;
-
-        getTabIds(): Client<string[]>;
-        getTabIds<P>(
-            callback: (err: any, tabIds: string[]) => P
-        ): Client<P>;
-
-        getViewportSize(): Client<Size>;
-        getViewportSize(dimension: string): Client<number>;
-        getViewportSize<P>(
-            callback: (err: any, size: Size) => P
-        ): Client<P>;
-        getViewportSize<P>(
-            dimension: string,
-            callback: (err: any, viewportSize: number) => P
-        ): Client<P>;
-
-        newWindow(url: string, windowName: string, windowFeatures: string): Client<string>;
-        newWindow<P>(
-            url: string,
-            windowName: string,
-            windowFeatures: string,
-            callback: (err: any, windowId: string) => P
-        ): Client<P>;
-
-        setViewportSize(size: Size, type: boolean): Client<void>;
-        setViewportSize<P>(
-            size: Size,
-            type: boolean,
-            callback: (err: any) => P
-        ): Client<P>;
-
-        switchTab(windowHandle?: string): Client<void>;
-        switchTab<P>(
-            callback: (err: any) => P
-        ): Client<P>;
-        switchTab<P>(
-            windowHandle: string,
-            callback: (err: any) => P
-        ): Client<P>;
-    }
-
-    export interface Options {
-        protocol: string;
-        waitforTimeout: number;
-        coloredLogs: boolean;
-        logLevel: string;
-        baseUrl: string;
-        desiredCapabilities: DesiredCapabilities;
-        screenshotPath: string;
-    }
-
-    // Options
-    export interface Client<T> {
-        options: Options;
-    }
-
-    export type DesiredCapabilities = any;
-
-    export interface RemoteOptions {
-        protocol?: string;
-        waitforTimeout?: number;
-        waitforInterval?: number;
-        coloredLogs?: boolean;
-        logLevel?: string;
-        baseUrl?: string;
-        desiredCapabilities?: DesiredCapabilities;
-    }
-
-    export interface MultiremoteOptions {
-        [key: string]: RemoteOptions;
-    }
-
-    export function remote(options?: RemoteOptions | string): Client<void>;
-
-    export function multiremote(options?: MultiremoteOptions): Client<void>;
-}
-
-declare var browser: WebdriverIO.Client<void>;
-
-declare module "webdriverio" {
-    export = WebdriverIO;
-}
diff --git a/webfontloader/index.d.ts b/webfontloader/index.d.ts
new file mode 100644
index 0000000000..44e43a0811
--- /dev/null
+++ b/webfontloader/index.d.ts
@@ -0,0 +1,60 @@
+// Type definitions for typekit-webfontloader 1.6.4
+// Project: https://github.com/typekit/webfontloader
+// Definitions by: doskallemaskin <https://github.com/doskallemaskin/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = WebFont;
+export as namespace WebFont;
+
+declare namespace WebFont {
+	export function load(config:WebFont.Config):void;
+	export interface Config {
+		/** Setting this to false will disable html classes (defaults to true) */
+		classes?:boolean;
+		/** Settings this to false will disable callbacks/events (defaults to true) */
+		events?:boolean;
+		/** Time (in ms) until the fontinactive callback will be triggered (defaults to 5000) */
+		timeout?:number;
+		/** This event is triggered when all fonts have been requested. */
+		loading?():void;
+		/** This event is triggered when the fonts have rendered. */
+		active?():void;
+		/** This event is triggered when the browser does not support linked fonts or if none of the fonts could be loaded. */
+		inactive?():void;
+		/** This event is triggered once for each font that's loaded. */
+		fontloading?(familyName:string, fvd:string):void;
+		/** This event is triggered once for each font that renders. */
+		fontactive?(familyName:string, fvd:string):void;
+		/** This event is triggered if the font can't be loaded. */
+		fontinactive?(familyName:string, fvd:string):void;
+
+		/** Child window or iframes to manage fonts for */
+		context?:Array<string>;
+
+		custom?:Custom;
+		google?:Google;
+		typekit?:Typekit;
+		fontdeck?:Fontdeck;
+		monotype?:Monotype;
+	}
+	export interface Google {
+		families:Array<string>;
+		text?: string;
+	}
+	export interface Typekit {
+		id?:Array<string>;
+	}
+	export interface Custom {
+		families?:Array<string>;
+		urls?:Array<string>;
+		testStrings?:{[fontFamily:string]:string};
+	}
+	export interface Fontdeck {
+		id?:string;
+	}
+	export interface Monotype {
+		projectId?:string;
+		version?:number;
+	}
+
+}
diff --git a/webfontloader/tsconfig.json b/webfontloader/tsconfig.json
new file mode 100644
index 0000000000..7484acdb4a
--- /dev/null
+++ b/webfontloader/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "webfontloader-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/webfontloader/webfontloader-tests.ts b/webfontloader/webfontloader-tests.ts
index 92711d7067..00c3216b25 100644
--- a/webfontloader/webfontloader-tests.ts
+++ b/webfontloader/webfontloader-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="webfontloader" />
+
 import webfontloader = require("webfontloader");
 
 var config: webfontloader.Config = {
diff --git a/webfontloader/webfontloader.d.ts b/webfontloader/webfontloader.d.ts
deleted file mode 100644
index 1d67516d4b..0000000000
--- a/webfontloader/webfontloader.d.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-// Type definitions for typekit-webfontloader 1.6.4
-// Project: https://github.com/typekit/webfontloader
-// Definitions by: doskallemaskin <https://github.com/doskallemaskin/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace WebFont {
-	export function load(config:WebFont.Config):void;
-	export interface Config {
-		/** Setting this to false will disable html classes (defaults to true) */
-		classes?:boolean;
-		/** Settings this to false will disable callbacks/events (defaults to true) */
-		events?:boolean;
-		/** Time (in ms) until the fontinactive callback will be triggered (defaults to 5000) */
-		timeout?:number;
-		/** This event is triggered when all fonts have been requested. */
-		loading?():void;
-		/** This event is triggered when the fonts have rendered. */
-		active?():void;
-		/** This event is triggered when the browser does not support linked fonts or if none of the fonts could be loaded. */
-		inactive?():void;
-		/** This event is triggered once for each font that's loaded. */
-		fontloading?(familyName:string, fvd:string):void;
-		/** This event is triggered once for each font that renders. */
-		fontactive?(familyName:string, fvd:string):void;
-		/** This event is triggered if the font can't be loaded. */
-		fontinactive?(familyName:string, fvd:string):void;
-
-		/** Child window or iframes to manage fonts for */
-		context?:Array<string>;
-
-		custom?:Custom;
-		google?:Google;
-		typekit?:Typekit;
-		fontdeck?:Fontdeck;
-		monotype?:Monotype;
-	}
-	export interface Google {
-		families:Array<string>;
-		text?: string;
-	}
-	export interface Typekit {
-		id?:Array<string>;
-	}
-	export interface Custom {
-		families?:Array<string>;
-		urls?:Array<string>;
-		testStrings?:{[fontFamily:string]:string};
-	}
-	export interface Fontdeck {
-		id?:string;
-	}
-	export interface Monotype {
-		projectId?:string;
-		version?:number;
-	}
-
-}
-declare module "webfontloader" {
-    export = WebFont;
-}
diff --git a/webgl-ext/webgl-ext.d.ts b/webgl-ext/index.d.ts
similarity index 100%
rename from webgl-ext/webgl-ext.d.ts
rename to webgl-ext/index.d.ts
diff --git a/webgl-ext/tsconfig.json b/webgl-ext/tsconfig.json
new file mode 100644
index 0000000000..046ebefd96
--- /dev/null
+++ b/webgl-ext/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "webgl-ext-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/webgl-ext/webgl-ext-tests.ts b/webgl-ext/webgl-ext-tests.ts
index 9ddcd22f9f..6e0580643b 100644
--- a/webgl-ext/webgl-ext-tests.ts
+++ b/webgl-ext/webgl-ext-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="webgl-ext.d.ts" />
+
 
 var canvas = document.createElement("canvas");
 var gl = canvas.getContext("webgl");
diff --git a/webix/webix.d.ts b/webix/index.d.ts
similarity index 100%
rename from webix/webix.d.ts
rename to webix/index.d.ts
diff --git a/webix/tsconfig.json b/webix/tsconfig.json
new file mode 100644
index 0000000000..d772bb8f74
--- /dev/null
+++ b/webix/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "webix-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/webix/webix-tests.ts b/webix/webix-tests.ts
index 128bc666c7..de9b965818 100644
--- a/webix/webix-tests.ts
+++ b/webix/webix-tests.ts
@@ -1,5 +1,3 @@
-///  <reference path="webix.d.ts" />
-
 //ajax operations
 webix.ready(function(){
     webix.ajax().get("te").then(function(){
diff --git a/webmidi/webmidi.d.ts b/webmidi/index.d.ts
similarity index 100%
rename from webmidi/webmidi.d.ts
rename to webmidi/index.d.ts
diff --git a/webmidi/tsconfig.json b/webmidi/tsconfig.json
new file mode 100644
index 0000000000..45386d5fa3
--- /dev/null
+++ b/webmidi/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "webmidi-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/webmidi/webmidi-tests.ts b/webmidi/webmidi-tests.ts
index 8f6b0531af..82cc2a1232 100644
--- a/webmidi/webmidi-tests.ts
+++ b/webmidi/webmidi-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="webmidi.d.ts" />
+
 
 if (navigator.requestMIDIAccess !== undefined) {
     navigator.requestMIDIAccess().then(onSuccessCallback, onErrorCallback);
diff --git a/webpack/index.d.ts b/webpack/index.d.ts
new file mode 100644
index 0000000000..af70c6b3d2
--- /dev/null
+++ b/webpack/index.d.ts
@@ -0,0 +1,534 @@
+// Type definitions for webpack 1.12.9
+// Project: https://github.com/webpack/webpack
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as UglifyJS from '../uglify-js';
+
+declare namespace webpack {
+    interface Configuration {
+        context?: string;
+        entry?: string | string[] | Entry;
+        /** Choose a developer tool to enhance debugging. */
+        devtool?: string;
+        /** Options affecting the output. */
+        output?: Output;
+        /** Options affecting the normal modules (NormalModuleFactory) */
+        module?: Module;
+        /** Options affecting the resolving of modules. */
+        resolve?: Resolve;
+        /** Like resolve but for loaders. */
+        resolveLoader?: ResolveLoader;
+        /**
+         *  Specify dependencies that shouldn’t be resolved by webpack, but should become dependencies of the resulting bundle.
+         *  The kind of the dependency depends on output.libraryTarget.
+         */
+        externals?: ExternalsElement | ExternalsElement[];
+        /**
+         * <ul>
+         *   <li>"web" Compile for usage in a browser-like environment (default)</li>
+         *   <li>"webworker" Compile as WebWorker</li>
+         *   <li>"node" Compile for usage in a node.js-like environment (use require to load chunks)</li>
+         *   <li>"async-node" Compile for usage in a node.js-like environment (use fs and vm to load chunks async)</li>
+         *   <li>"node-webkit" Compile for usage in webkit, uses jsonp chunk loading but also supports builtin node.js modules plus require(“nw.gui”) (experimental)</li>
+         *   <li>"atom" Compile for usage in electron (formerly known as atom-shell), supports require for modules necessary to run Electron.</li>
+         * <ul>
+         */
+        target?: string;
+        /** Report the first error as a hard error instead of tolerating it. */
+        bail?: boolean;
+        /** Capture timing information for each module. */
+        profile?: boolean;
+        /** Cache generated modules and chunks to improve performance for multiple incremental builds. */
+        cache?: boolean | any;
+        /** Enter watch mode, which rebuilds on file change. */
+        watch?: boolean;
+        watchOptions?: WatchOptions;
+        /** Switch loaders to debug mode. */
+        debug?: boolean;
+        /** Can be used to configure the behaviour of webpack-dev-server when the webpack config is passed to webpack-dev-server CLI. */
+        devServer?: any; // TODO: Type this
+        /** Include polyfills or mocks for various node stuff */
+        node?: Node;
+        /** Set the value of require.amd and define.amd. */
+        amd?: { [moduleName: string]: boolean };
+        /** Used for recordsInputPath and recordsOutputPath */
+        recordsPath?: string;
+        /** Load compiler state from a json file. */
+        recordsInputPath?: string;
+        /** Store compiler state to a json file. */
+        recordsOutputPath?: string;
+        /** Add additional plugins to the compiler. */
+        plugins?: (Plugin | Function)[];
+    }
+
+    interface Entry {
+        [name: string]: string | string[];
+    }
+
+    interface Output {
+        /** The output directory as absolute path (required). */
+        path?: string;
+        /** The filename of the entry chunk as relative path inside the output.path directory. */
+        filename?: string;
+        /** The filename of non-entry chunks as relative path inside the output.path directory. */
+        chunkFilename?: string;
+        /** The filename of the SourceMaps for the JavaScript files. They are inside the output.path directory. */
+        sourceMapFilename?: string;
+        /** Filename template string of function for the sources array in a generated SourceMap. */
+        devtoolModuleFilenameTemplate?: string;
+        /** Similar to output.devtoolModuleFilenameTemplate, but used in the case of duplicate module identifiers. */
+        devtoolFallbackModuleFilenameTemplate?: string;
+        /**
+         * Enable line to line mapped mode for all/specified modules.
+         * Line to line mapped mode uses a simple SourceMap where each line of the generated source is mapped to the same line of the original source.
+         * It’s a performance optimization. Only use it if your performance need to be better and you are sure that input lines match which generated lines.
+         * true enables it for all modules (not recommended)
+         */
+        devtoolLineToLine?: boolean;
+        /** The filename of the Hot Update Chunks. They are inside the output.path directory. */
+        hotUpdateChunkFilename?: string;
+        /** The filename of the Hot Update Main File. It is inside the output.path directory. */
+        hotUpdateMainFilename?: string;
+        /** The output.path from the view of the Javascript / HTML page. */
+        publicPath?: string;
+        /** The JSONP function used by webpack for asnyc loading of chunks. */
+        jsonpFunction?: string;
+        /** The JSONP function used by webpack for async loading of hot update chunks. */
+        hotUpdateFunction?: string;
+        /** Include comments with information about the modules. */
+        pathinfo?: boolean;
+        /** If set, export the bundle as library. output.library is the name. */
+        library?: boolean;
+        /**
+         * Which format to export the library:
+         * <ul>
+         *   <li>"var" - Export by setting a variable: var Library = xxx (default)</li>
+         *   <li>"this" - Export by setting a property of this: this["Library"] = xxx</li>
+         *   <li>"commonjs" - Export by setting a property of exports: exports["Library"] = xxx</li>
+         *   <li>"commonjs2" - Export by setting module.exports: module.exports = xxx</li>
+         *   <li>"amd" - Export to AMD (optionally named)</li>
+         *   <li>"umd" - Export to AMD, CommonJS2 or as property in root</li>
+         * </ul>
+         */
+        libraryTarget?: string;
+        /** If output.libraryTarget is set to umd and output.library is set, setting this to true will name the AMD module. */
+        umdNamedDefine?: boolean;
+        /** Prefixes every line of the source in the bundle with this string. */
+        sourcePrefix?: string;
+        /** This option enables cross-origin loading of chunks. */
+        crossOriginLoading?: string | boolean;
+    }
+
+    interface Module {
+        /** A array of automatically applied loaders. */
+        loaders?: Loader[];
+        /** A array of applied pre loaders. */
+        preLoaders?: Loader[];
+        /** A array of applied post loaders. */
+        postLoaders?: Loader[];
+        /** A RegExp or an array of RegExps. Don’t parse files matching. */
+        noParse?: RegExp | RegExp[];
+        unknownContextRequest?: string;
+        unknownContextRecursive?: boolean;
+        unknownContextRegExp?: RegExp;
+        unknownContextCritical?: boolean;
+        exprContextRequest?: string;
+        exprContextRegExp?: RegExp;
+        exprContextRecursive?: boolean;
+        exprContextCritical?: boolean;
+        wrappedContextRegExp?: RegExp;
+        wrappedContextRecursive?: boolean;
+        wrappedContextCritical?: boolean;
+    }
+
+    interface Resolve {
+        /** Replace modules by other modules or paths. */
+        alias?: { [key: string]: string; };
+        /**
+         * The directory (absolute path) that contains your modules.
+         * May also be an array of directories.
+         * This setting should be used to add individual directories to the search path. */
+        root?: string | string[];
+        /**
+         * An array of directory names to be resolved to the current directory as well as its ancestors, and searched for modules.
+         * This functions similarly to how node finds “node_modules” directories.
+         * For example, if the value is ["mydir"], webpack will look in “./mydir”, “../mydir”, “../../mydir”, etc.
+         */
+        modulesDirectories?: string[];
+        /**
+         * A directory (or array of directories absolute paths),
+         * in which webpack should look for modules that weren’t found in resolve.root or resolve.modulesDirectories.
+         */
+        fallback?: string | string[];
+        /**
+         * An array of extensions that should be used to resolve modules.
+         * For example, in order to discover CoffeeScript files, your array should contain the string ".coffee".
+         */
+        extensions?: string[];
+        /** Check these fields in the package.json for suitable files. */
+        packageMains?: (string | string[])[];
+        /** Check this field in the package.json for an object. Key-value-pairs are threaded as aliasing according to this spec */
+        packageAlias?: (string | string[])[];
+        /**
+         * Enable aggressive but unsafe caching for the resolving of a part of your files.
+         * Changes to cached paths may cause failure (in rare cases). An array of RegExps, only a RegExp or true (all files) is expected.
+         * If the resolved path matches, it’ll be cached.
+         */
+        unsafeCache?: RegExp | RegExp[] | boolean;
+    }
+
+    interface ResolveLoader extends Resolve {
+        /** It describes alternatives for the module name that are tried. */
+        moduleTemplates?: string[];
+    }
+
+    type ExternalsElement = string | RegExp | ExternalsObjectElement | ExternalsFunctionElement;
+
+    interface ExternalsObjectElement {
+        [key: string]: boolean | string;
+    }
+
+    interface ExternalsFunctionElement {
+        (context: any, request: any, callback: (error: any, result: any) => void): any;
+    }
+
+    interface WatchOptions {
+        /** Delay the rebuilt after the first change. Value is a time in ms. */
+        aggregateTimeout?: number;
+        /** true: use polling, number: use polling with specified interval */
+        poll?: boolean | number;
+    }
+
+    interface Node {
+        console?: boolean;
+        global?: boolean;
+        process?: boolean;
+        Buffer?: boolean;
+        __filename?: boolean | string;
+        __dirname?: boolean | string;
+        [nodeBuiltin: string]: boolean | string;
+    }
+
+    type LoaderCondition = string | RegExp | ((absPath: string) => boolean);
+
+    interface Loader {
+        /** A condition that must not be met */
+        exclude?: LoaderCondition | LoaderCondition[];
+        /** A condition that must be met */
+        include?: LoaderCondition | LoaderCondition[];
+        /** A condition that must be met */
+        test: LoaderCondition | LoaderCondition[];
+        /** A string of “!” separated loaders */
+        loader?: string;
+        /** A array of loaders as string */
+        loaders?: string[];
+        query?: {
+            [name: string]: any;
+        }
+    }
+
+    interface Plugin { }
+
+    interface Webpack {
+        (config: Configuration, callback?: compiler.CompilerCallback): compiler.Compiler;
+        /**
+         * optimize namespace
+         */
+        optimize: Optimize;
+        /**
+         * dependencies namespace
+         */
+        dependencies: Dependencies;
+        /**
+         * Replace resources that matches resourceRegExp with newResource.
+         * If newResource is relative, it is resolve relative to the previous resource.
+         * If newResource is a function, it is expected to overwrite the ‘request’ attribute of the supplied object.
+         */
+        NormalModuleReplacementPlugin: NormalModuleReplacementPluginStatic;
+        /**
+         * Replaces the default resource, recursive flag or regExp generated by parsing with newContentResource,
+         * newContentRecursive resp. newContextRegExp if the resource (directory) matches resourceRegExp.
+         * If newContentResource is relative, it is resolve relative to the previous resource.
+         * If newContentResource is a function, it is expected to overwrite the ‘request’ attribute of the supplied object.
+         */
+        ContextReplacementPlugin: ContextReplacementPluginStatic;
+        /**
+         * Don’t generate modules for requests matching the provided RegExp.
+         */
+        IgnorePlugin: IgnorePluginStatic;
+        /**
+         * A request for a normal module, which is resolved and built even before a require to it occurs.
+         * This can boost performance. Try to profile the build first to determine clever prefetching points.
+         */
+        PrefetchPlugin: PrefetchPluginStatic;
+        /**
+         * Apply a plugin (or array of plugins) to one or more resolvers (as specified in types).
+         */
+        ResolverPlugin: ResolverPluginStatic;
+        /**
+         * Adds a banner to the top of each generated chunk.
+         */
+        BannerPlugin: BannerPluginStatic;
+        /**
+         * Define free variables. Useful for having development builds with debug logging or adding global constants.
+         */
+        DefinePlugin: DefinePluginStatic;
+        /**
+         * Automatically loaded modules.
+         * Module (value) is loaded when the identifier (key) is used as free variable in a module.
+         * The identifier is filled with the exports of the loaded module.
+         */
+        ProvidePlugin: ProvidePluginStatic;
+        /**
+         * Adds SourceMaps for assets.
+         */
+        SourceMapDevToolPlugin: SourceMapDevToolPluginStatic;
+        /**
+         * Enables Hot Module Replacement. (This requires records data if not in dev-server mode, recordsPath)
+         * Generates Hot Update Chunks of each chunk in the records.
+         * It also enables the API and makes __webpack_hash__ available in the bundle.
+         */
+        HotModuleReplacementPlugin: HotModuleReplacementPluginStatic;
+        /**
+         * Adds useful free vars to the bundle.
+         */
+        ExtendedAPIPlugin: ExtendedAPIPluginStatic;
+        /**
+         * When there are errors while compiling this plugin skips the emitting phase (and recording phase),
+         * so there are no assets emitted that include errors. The emitted flag in the stats is false for all assets.
+         */
+        NoErrorsPlugin: NoErrorsPluginStatic;
+        /**
+         * Does not watch specified files matching provided paths or RegExps.
+         */
+        WatchIgnorePlugin: WatchIgnorePluginStatic;
+    }
+
+    interface Optimize {
+        /**
+         * Search for equal or similar files and deduplicate them in the output.
+         * This comes with some overhead for the entry chunk, but can reduce file size effectively.
+         * This is experimental and may crash, because of some missing implementations. (Report an issue)
+         */
+        DedupePlugin: optimize.DedupePluginStatic;
+        /**
+         * Limit the chunk count to a defined value. Chunks are merged until it fits.
+         */
+        LimitChunkCountPlugin: optimize.LimitChunkCountPluginStatic;
+        /**
+         * Merge small chunks that are lower than this min size (in chars). Size is approximated.
+         */
+        MinChunkSizePlugin: optimize.MinChunkSizePluginStatic;
+        /**
+         * Assign the module and chunk ids by occurrence count. Ids that are used often get lower (shorter) ids.
+         * This make ids predictable, reduces to total file size and is recommended.
+         */
+        OccurenceOrderPlugin: optimize.OccurenceOrderPluginStatic;
+        /**
+         * Minimize all JavaScript output of chunks. Loaders are switched into minimizing mode.
+         * You can pass an object containing UglifyJs options.
+         */
+        UglifyJsPlugin: optimize.UglifyJsPluginStatic;
+        CommonsChunkPlugin: optimize.CommonsChunkPluginStatic;
+        /**
+         * A plugin for a more aggressive chunk merging strategy.
+         * Even similar chunks are merged if the total size is reduced enough.
+         * As an option modules that are not common in these chunks can be moved up the chunk tree to the parents.
+         */
+        AggressiveMergingPlugin: optimize.AggressiveMergingPluginStatic;
+    }
+
+    interface Dependencies {
+        /**
+         * Support Labeled Modules.
+         */
+        LabeledModulesPlugin: dependencies.LabeledModulesPluginStatic;
+    }
+
+    interface DirectoryDescriptionFilePluginStatic {
+        new (file: string, files: string[]): Plugin;
+    }
+
+    interface NormalModuleReplacementPluginStatic {
+        new (resourceRegExp: any, newResource: any): Plugin;
+    }
+
+    interface ContextReplacementPluginStatic {
+        new (resourceRegExp: any, newContentResource?: any, newContentRecursive?: any, newContentRegExp?: any): Plugin
+    }
+
+    interface IgnorePluginStatic {
+        new (requestRegExp: any, contextRegExp?: any): Plugin;
+    }
+
+    interface PrefetchPluginStatic {
+        new (context: any, request: any): Plugin;
+        new (request: any): Plugin;
+    }
+
+    interface ResolverPluginStatic {
+        new (plugins: Plugin[], files?: string[]): Plugin;
+        DirectoryDescriptionFilePlugin: DirectoryDescriptionFilePluginStatic;
+        /**
+         * This plugin will append a path to the module directory to find a match,
+         * which can be useful if you have a module which has an incorrect “main” entry in its package.json/bower.json etc (e.g. "main": "Gruntfile.js").
+         * You can use this plugin as a special case to load the correct file for this module. Example:
+         */
+        FileAppendPlugin: FileAppendPluginStatic;
+    }
+
+    interface FileAppendPluginStatic {
+        new (files: string[]): Plugin;
+    }
+
+    interface BannerPluginStatic {
+        new (banner: any, options: any): Plugin;
+    }
+
+    interface DefinePluginStatic {
+        new (definitions: any): Plugin;
+    }
+
+    interface ProvidePluginStatic {
+        new (definitions: any): Plugin;
+    }
+
+    interface SourceMapDevToolPluginStatic {
+        new (options: any): Plugin;
+    }
+
+    interface HotModuleReplacementPluginStatic {
+        new (): Plugin;
+    }
+
+    interface ExtendedAPIPluginStatic {
+        new (): Plugin;
+    }
+
+    interface NoErrorsPluginStatic {
+        new (): Plugin;
+    }
+
+    interface WatchIgnorePluginStatic {
+        new (paths: RegExp[]): Plugin;
+    }
+
+    namespace optimize {
+        interface DedupePluginStatic {
+            new (): Plugin;
+        }
+        interface LimitChunkCountPluginStatic {
+            new (options: any): Plugin
+        }
+        interface MinChunkSizePluginStatic {
+            new (options: any): Plugin;
+        }
+        interface OccurenceOrderPluginStatic {
+            new (preferEntry: boolean): Plugin;
+        }
+        interface UglifyJsPluginStatic {
+            new (options?: UglifyJS.MinifyOptions): Plugin;
+        }
+        interface CommonsChunkPluginStatic {
+            new (chunkName: string, filenames?: string | string[]): Plugin;
+            new (options?: any): Plugin;
+        }
+        interface AggressiveMergingPluginStatic {
+            new (options: any): Plugin;
+        }
+    }
+
+    namespace dependencies {
+        interface LabeledModulesPluginStatic {
+            new (): Plugin;
+        }
+    }
+
+    namespace compiler {
+        interface Compiler {
+            /** Builds the bundle(s). */
+            run(callback: CompilerCallback): void;
+            /**
+             * Builds the bundle(s) then starts the watcher, which rebuilds bundles whenever their source files change.
+             * Returns a Watching instance. Note: since this will automatically run an initial build, so you only need to run watch (and not run).
+             */
+            watch(watchOptions: WatchOptions, handler: CompilerCallback): Watching;
+            //TODO: below are some of the undocumented properties. needs typings
+            outputFileSystem: any;
+            name: string;
+            options: Configuration;
+        }
+
+        interface Watching {
+            close(callback: () => void): void;
+        }
+
+        interface WatchOptions {
+            /** After a change the watcher waits that time (in milliseconds) for more changes. Default: 300. */
+            aggregateTimeout?: number;
+            /** The watcher uses polling instead of native watchers. true uses the default interval, a number specifies a interval in milliseconds. Default: undefined (automatic). */
+            poll?: number | boolean;
+        }
+
+        interface Stats {
+            /** Returns true if there were errors while compiling */
+            hasErrors(): boolean;
+            /** Returns true if there were warnings while compiling. */
+            hasWarnings(): boolean;
+            /** Return information as json object */
+            toJson(options?: StatsToJsonOptions): any; //TODO: type this
+            /** Returns a formatted string of the result. */
+            toString(options?: StatsToStringOptions): string;
+        }
+
+        interface StatsToJsonOptions {
+            /** context directory for request shortening */
+            context?: boolean;
+            /** add the hash of the compilation */
+            hash?: boolean;
+            /** add webpack version information */
+            version?: boolean;
+            /** add timing information */
+            timings?: boolean;
+            /** add assets information */
+            assets?: boolean;
+            /** add chunk information */
+            chunks?: boolean;
+            /** add built modules information to chunk information */
+            chunkModules?: boolean;
+            /** add built modules information */
+            modules?: boolean;
+            /** add children information */
+            children?: boolean;
+            /** add also information about cached (not built) modules */
+            cached?: boolean;
+            /** add information about the reasons why modules are included */
+            reasons?: boolean;
+            /** add the source code of modules */
+            source?: boolean;
+            /** add details to errors (like resolving log) */
+            errorDetails?: boolean;
+            /** add the origins of chunks and chunk merging info */
+            chunkOrigins?: boolean;
+            /** sort the modules by that field */
+            modulesSort?: string;
+            /** sort the chunks by that field */
+            chunksSort?: string;
+            /** sort the assets by that field */
+            assetsSort?: string;
+        }
+
+        interface StatsToStringOptions extends StatsToJsonOptions {
+            /** With console colors */
+            colors?: boolean;
+        }
+
+        type CompilerCallback = (err: Error, stats: Stats) => void
+    }
+}
+
+declare var webpack: webpack.Webpack;
+
+//export default webpack;
+export = webpack;
diff --git a/webpack/tsconfig.json b/webpack/tsconfig.json
new file mode 100644
index 0000000000..0c4248e6d3
--- /dev/null
+++ b/webpack/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "webpack-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/webpack/webpack-env-tests.ts b/webpack/webpack-env-tests.ts
index f219a3e740..43d1ff3605 100644
--- a/webpack/webpack-env-tests.ts
+++ b/webpack/webpack-env-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./webpack-env.d.ts" />
+
 
 interface SomeModule {
     someMethod(): void;
diff --git a/webpack/webpack-tests.ts b/webpack/webpack-tests.ts
index 9f2efe15c4..696bd7d571 100644
--- a/webpack/webpack-tests.ts
+++ b/webpack/webpack-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="webpack.d.ts" />
 
 import * as webpack from 'webpack';
 
diff --git a/webpack/webpack.d.ts b/webpack/webpack.d.ts
deleted file mode 100644
index 035b49b014..0000000000
--- a/webpack/webpack.d.ts
+++ /dev/null
@@ -1,538 +0,0 @@
-// Type definitions for webpack 1.12.9
-// Project: https://github.com/webpack/webpack
-// Definitions by: Qubo <https://github.com/tkqubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../uglify-js/uglify-js.d.ts"/>
-
-declare module "webpack" {
-    import * as UglifyJS from 'uglify-js';
-
-    namespace webpack {
-        interface Configuration {
-            context?: string;
-            entry?: string|string[]|Entry;
-            /** Choose a developer tool to enhance debugging. */
-            devtool?: string;
-            /** Options affecting the output. */
-            output?: Output;
-            /** Options affecting the normal modules (NormalModuleFactory) */
-            module?: Module;
-            /** Options affecting the resolving of modules. */
-            resolve?: Resolve;
-            /** Like resolve but for loaders. */
-            resolveLoader?: ResolveLoader;
-            /**
-             *  Specify dependencies that shouldn’t be resolved by webpack, but should become dependencies of the resulting bundle.
-             *  The kind of the dependency depends on output.libraryTarget.
-             */
-            externals?: ExternalsElement|ExternalsElement[];
-            /**
-             * <ul>
-             *   <li>"web" Compile for usage in a browser-like environment (default)</li>
-             *   <li>"webworker" Compile as WebWorker</li>
-             *   <li>"node" Compile for usage in a node.js-like environment (use require to load chunks)</li>
-             *   <li>"async-node" Compile for usage in a node.js-like environment (use fs and vm to load chunks async)</li>
-             *   <li>"node-webkit" Compile for usage in webkit, uses jsonp chunk loading but also supports builtin node.js modules plus require(“nw.gui”) (experimental)</li>
-             *   <li>"atom" Compile for usage in electron (formerly known as atom-shell), supports require for modules necessary to run Electron.</li>
-             * <ul>
-             */
-            target?: string;
-            /** Report the first error as a hard error instead of tolerating it. */
-            bail?: boolean;
-            /** Capture timing information for each module. */
-            profile?: boolean;
-            /** Cache generated modules and chunks to improve performance for multiple incremental builds. */
-            cache?: boolean|any;
-            /** Enter watch mode, which rebuilds on file change. */
-            watch?: boolean;
-            watchOptions?: WatchOptions;
-            /** Switch loaders to debug mode. */
-            debug?: boolean;
-            /** Can be used to configure the behaviour of webpack-dev-server when the webpack config is passed to webpack-dev-server CLI. */
-            devServer?: any; // TODO: Type this
-            /** Include polyfills or mocks for various node stuff */
-            node?: Node;
-            /** Set the value of require.amd and define.amd. */
-            amd?: { [moduleName: string]: boolean };
-            /** Used for recordsInputPath and recordsOutputPath */
-            recordsPath?: string;
-            /** Load compiler state from a json file. */
-            recordsInputPath?: string;
-            /** Store compiler state to a json file. */
-            recordsOutputPath?: string;
-            /** Add additional plugins to the compiler. */
-            plugins?: (Plugin|Function)[];
-        }
-
-        interface Entry {
-            [name: string]: string|string[];
-        }
-
-        interface Output {
-            /** The output directory as absolute path (required). */
-            path?: string;
-            /** The filename of the entry chunk as relative path inside the output.path directory. */
-            filename?: string;
-            /** The filename of non-entry chunks as relative path inside the output.path directory. */
-            chunkFilename?: string;
-            /** The filename of the SourceMaps for the JavaScript files. They are inside the output.path directory. */
-            sourceMapFilename?: string;
-            /** Filename template string of function for the sources array in a generated SourceMap. */
-            devtoolModuleFilenameTemplate?: string;
-            /** Similar to output.devtoolModuleFilenameTemplate, but used in the case of duplicate module identifiers. */
-            devtoolFallbackModuleFilenameTemplate?: string;
-            /**
-             * Enable line to line mapped mode for all/specified modules.
-             * Line to line mapped mode uses a simple SourceMap where each line of the generated source is mapped to the same line of the original source.
-             * It’s a performance optimization. Only use it if your performance need to be better and you are sure that input lines match which generated lines.
-             * true enables it for all modules (not recommended)
-             */
-            devtoolLineToLine?: boolean;
-            /** The filename of the Hot Update Chunks. They are inside the output.path directory. */
-            hotUpdateChunkFilename?: string;
-            /** The filename of the Hot Update Main File. It is inside the output.path directory. */
-            hotUpdateMainFilename?: string;
-            /** The output.path from the view of the Javascript / HTML page. */
-            publicPath?: string;
-            /** The JSONP function used by webpack for asnyc loading of chunks. */
-            jsonpFunction?: string;
-            /** The JSONP function used by webpack for async loading of hot update chunks. */
-            hotUpdateFunction?: string;
-            /** Include comments with information about the modules. */
-            pathinfo?: boolean;
-            /** If set, export the bundle as library. output.library is the name. */
-            library?: boolean;
-            /**
-             * Which format to export the library:
-             * <ul>
-             *   <li>"var" - Export by setting a variable: var Library = xxx (default)</li>
-             *   <li>"this" - Export by setting a property of this: this["Library"] = xxx</li>
-             *   <li>"commonjs" - Export by setting a property of exports: exports["Library"] = xxx</li>
-             *   <li>"commonjs2" - Export by setting module.exports: module.exports = xxx</li>
-             *   <li>"amd" - Export to AMD (optionally named)</li>
-             *   <li>"umd" - Export to AMD, CommonJS2 or as property in root</li>
-             * </ul>
-             */
-            libraryTarget?: string;
-            /** If output.libraryTarget is set to umd and output.library is set, setting this to true will name the AMD module. */
-            umdNamedDefine?: boolean;
-            /** Prefixes every line of the source in the bundle with this string. */
-            sourcePrefix?: string;
-            /** This option enables cross-origin loading of chunks. */
-            crossOriginLoading?: string|boolean;
-        }
-
-        interface Module {
-            /** A array of automatically applied loaders. */
-            loaders?: Loader[];
-            /** A array of applied pre loaders. */
-            preLoaders?: Loader[];
-            /** A array of applied post loaders. */
-            postLoaders?: Loader[];
-            /** A RegExp or an array of RegExps. Don’t parse files matching. */
-            noParse?: RegExp|RegExp[];
-            unknownContextRequest?: string;
-            unknownContextRecursive?: boolean;
-            unknownContextRegExp?: RegExp;
-            unknownContextCritical?: boolean;
-            exprContextRequest?: string;
-            exprContextRegExp?: RegExp;
-            exprContextRecursive?: boolean;
-            exprContextCritical?: boolean;
-            wrappedContextRegExp?: RegExp;
-            wrappedContextRecursive?: boolean;
-            wrappedContextCritical?: boolean;
-        }
-
-        interface Resolve {
-            /** Replace modules by other modules or paths. */
-            alias?: { [key: string]: string; };
-            /**
-             * The directory (absolute path) that contains your modules.
-             * May also be an array of directories.
-             * This setting should be used to add individual directories to the search path. */
-            root?: string|string[];
-            /**
-             * An array of directory names to be resolved to the current directory as well as its ancestors, and searched for modules.
-             * This functions similarly to how node finds “node_modules” directories.
-             * For example, if the value is ["mydir"], webpack will look in “./mydir”, “../mydir”, “../../mydir”, etc.
-             */
-            modulesDirectories?: string[];
-            /**
-             * A directory (or array of directories absolute paths),
-             * in which webpack should look for modules that weren’t found in resolve.root or resolve.modulesDirectories.
-             */
-            fallback?: string|string[];
-            /**
-             * An array of extensions that should be used to resolve modules.
-             * For example, in order to discover CoffeeScript files, your array should contain the string ".coffee".
-             */
-            extensions?: string[];
-            /** Check these fields in the package.json for suitable files. */
-            packageMains?: (string|string[])[];
-            /** Check this field in the package.json for an object. Key-value-pairs are threaded as aliasing according to this spec */
-            packageAlias?: (string|string[])[];
-            /**
-             * Enable aggressive but unsafe caching for the resolving of a part of your files.
-             * Changes to cached paths may cause failure (in rare cases). An array of RegExps, only a RegExp or true (all files) is expected.
-             * If the resolved path matches, it’ll be cached.
-             */
-            unsafeCache?: RegExp|RegExp[]|boolean;
-        }
-
-        interface ResolveLoader extends Resolve {
-            /** It describes alternatives for the module name that are tried. */
-            moduleTemplates?: string[];
-        }
-
-        type ExternalsElement = string|RegExp|ExternalsObjectElement|ExternalsFunctionElement;
-
-        interface ExternalsObjectElement {
-            [key: string]: boolean|string;
-        }
-
-        interface ExternalsFunctionElement {
-            (context: any, request: any, callback: (error: any, result: any) => void): any;
-        }
-
-        interface WatchOptions {
-            /** Delay the rebuilt after the first change. Value is a time in ms. */
-            aggregateTimeout?: number;
-            /** true: use polling, number: use polling with specified interval */
-            poll?: boolean|number;
-        }
-
-        interface Node {
-            console?: boolean;
-            global?: boolean;
-            process?: boolean;
-            Buffer?: boolean;
-            __filename?: boolean|string;
-            __dirname?: boolean|string;
-            [nodeBuiltin: string]: boolean|string;
-        }
-
-        type LoaderCondition = string|RegExp|((absPath: string) => boolean);
-
-        interface Loader {
-            /** A condition that must not be met */
-            exclude?: LoaderCondition|LoaderCondition[];
-            /** A condition that must be met */
-            include?: LoaderCondition|LoaderCondition[];
-            /** A condition that must be met */
-            test: LoaderCondition|LoaderCondition[];
-            /** A string of “!” separated loaders */
-            loader?: string;
-            /** A array of loaders as string */
-            loaders?: string[];
-            query?: {
-                [name: string]: any;
-            }
-        }
-
-        interface Plugin { }
-
-        interface Webpack {
-            (config: Configuration, callback?: compiler.CompilerCallback): compiler.Compiler;
-            /**
-             * optimize namespace
-             */
-            optimize: Optimize;
-            /**
-             * dependencies namespace
-             */
-            dependencies: Dependencies;
-            /**
-             * Replace resources that matches resourceRegExp with newResource.
-             * If newResource is relative, it is resolve relative to the previous resource.
-             * If newResource is a function, it is expected to overwrite the ‘request’ attribute of the supplied object.
-             */
-            NormalModuleReplacementPlugin: NormalModuleReplacementPluginStatic;
-            /**
-             * Replaces the default resource, recursive flag or regExp generated by parsing with newContentResource,
-             * newContentRecursive resp. newContextRegExp if the resource (directory) matches resourceRegExp.
-             * If newContentResource is relative, it is resolve relative to the previous resource.
-             * If newContentResource is a function, it is expected to overwrite the ‘request’ attribute of the supplied object.
-             */
-            ContextReplacementPlugin: ContextReplacementPluginStatic;
-            /**
-             * Don’t generate modules for requests matching the provided RegExp.
-             */
-            IgnorePlugin: IgnorePluginStatic;
-            /**
-             * A request for a normal module, which is resolved and built even before a require to it occurs.
-             * This can boost performance. Try to profile the build first to determine clever prefetching points.
-             */
-            PrefetchPlugin: PrefetchPluginStatic;
-            /**
-             * Apply a plugin (or array of plugins) to one or more resolvers (as specified in types).
-             */
-            ResolverPlugin: ResolverPluginStatic;
-            /**
-             * Adds a banner to the top of each generated chunk.
-             */
-            BannerPlugin: BannerPluginStatic;
-            /**
-             * Define free variables. Useful for having development builds with debug logging or adding global constants.
-             */
-            DefinePlugin: DefinePluginStatic;
-            /**
-             * Automatically loaded modules.
-             * Module (value) is loaded when the identifier (key) is used as free variable in a module.
-             * The identifier is filled with the exports of the loaded module.
-             */
-            ProvidePlugin: ProvidePluginStatic;
-            /**
-             * Adds SourceMaps for assets.
-             */
-            SourceMapDevToolPlugin: SourceMapDevToolPluginStatic;
-            /**
-             * Enables Hot Module Replacement. (This requires records data if not in dev-server mode, recordsPath)
-             * Generates Hot Update Chunks of each chunk in the records.
-             * It also enables the API and makes __webpack_hash__ available in the bundle.
-             */
-            HotModuleReplacementPlugin: HotModuleReplacementPluginStatic;
-            /**
-             * Adds useful free vars to the bundle.
-             */
-            ExtendedAPIPlugin: ExtendedAPIPluginStatic;
-            /**
-             * When there are errors while compiling this plugin skips the emitting phase (and recording phase),
-             * so there are no assets emitted that include errors. The emitted flag in the stats is false for all assets.
-             */
-            NoErrorsPlugin: NoErrorsPluginStatic;
-            /**
-             * Does not watch specified files matching provided paths or RegExps.
-             */
-            WatchIgnorePlugin: WatchIgnorePluginStatic;
-        }
-
-        interface Optimize {
-            /**
-             * Search for equal or similar files and deduplicate them in the output.
-             * This comes with some overhead for the entry chunk, but can reduce file size effectively.
-             * This is experimental and may crash, because of some missing implementations. (Report an issue)
-             */
-            DedupePlugin: optimize.DedupePluginStatic;
-            /**
-             * Limit the chunk count to a defined value. Chunks are merged until it fits.
-             */
-            LimitChunkCountPlugin: optimize.LimitChunkCountPluginStatic;
-            /**
-             * Merge small chunks that are lower than this min size (in chars). Size is approximated.
-             */
-            MinChunkSizePlugin: optimize.MinChunkSizePluginStatic;
-            /**
-             * Assign the module and chunk ids by occurrence count. Ids that are used often get lower (shorter) ids.
-             * This make ids predictable, reduces to total file size and is recommended.
-             */
-            OccurenceOrderPlugin: optimize.OccurenceOrderPluginStatic;
-            /**
-             * Minimize all JavaScript output of chunks. Loaders are switched into minimizing mode.
-             * You can pass an object containing UglifyJs options.
-             */
-            UglifyJsPlugin: optimize.UglifyJsPluginStatic;
-            CommonsChunkPlugin: optimize.CommonsChunkPluginStatic;
-            /**
-             * A plugin for a more aggressive chunk merging strategy.
-             * Even similar chunks are merged if the total size is reduced enough.
-             * As an option modules that are not common in these chunks can be moved up the chunk tree to the parents.
-             */
-            AggressiveMergingPlugin: optimize.AggressiveMergingPluginStatic;
-        }
-
-        interface Dependencies {
-            /**
-             * Support Labeled Modules.
-             */
-            LabeledModulesPlugin: dependencies.LabeledModulesPluginStatic;
-        }
-
-        interface DirectoryDescriptionFilePluginStatic {
-            new(file: string, files: string[]): Plugin;
-        }
-
-        interface NormalModuleReplacementPluginStatic {
-            new(resourceRegExp: any, newResource: any): Plugin;
-        }
-
-        interface ContextReplacementPluginStatic {
-            new(resourceRegExp: any, newContentResource?: any, newContentRecursive?: any, newContentRegExp?: any): Plugin
-        }
-
-        interface IgnorePluginStatic {
-            new(requestRegExp: any, contextRegExp?: any): Plugin;
-        }
-
-        interface PrefetchPluginStatic {
-            new(context: any, request: any): Plugin;
-            new(request: any): Plugin;
-        }
-
-        interface ResolverPluginStatic {
-            new(plugins: Plugin[], files?: string[]): Plugin;
-            DirectoryDescriptionFilePlugin: DirectoryDescriptionFilePluginStatic;
-            /**
-             * This plugin will append a path to the module directory to find a match,
-             * which can be useful if you have a module which has an incorrect “main” entry in its package.json/bower.json etc (e.g. "main": "Gruntfile.js").
-             * You can use this plugin as a special case to load the correct file for this module. Example:
-             */
-            FileAppendPlugin: FileAppendPluginStatic;
-        }
-
-        interface FileAppendPluginStatic {
-            new(files: string[]): Plugin;
-        }
-
-        interface BannerPluginStatic {
-            new(banner: any, options: any): Plugin;
-        }
-
-        interface DefinePluginStatic {
-            new(definitions: any): Plugin;
-        }
-
-        interface ProvidePluginStatic {
-            new(definitions: any): Plugin;
-        }
-
-        interface SourceMapDevToolPluginStatic {
-            new(options: any): Plugin;
-        }
-
-        interface HotModuleReplacementPluginStatic {
-            new(): Plugin;
-        }
-
-        interface ExtendedAPIPluginStatic {
-            new(): Plugin;
-        }
-
-        interface NoErrorsPluginStatic {
-            new(): Plugin;
-        }
-
-        interface WatchIgnorePluginStatic {
-            new(paths: RegExp[]): Plugin;
-        }
-
-        namespace optimize {
-            interface DedupePluginStatic {
-                new(): Plugin;
-            }
-            interface LimitChunkCountPluginStatic {
-                new(options: any): Plugin
-            }
-            interface MinChunkSizePluginStatic {
-                new(options: any): Plugin;
-            }
-            interface OccurenceOrderPluginStatic {
-                new(preferEntry: boolean): Plugin;
-            }
-            interface UglifyJsPluginStatic {
-                new(options?: UglifyJS.MinifyOptions): Plugin;
-            }
-            interface CommonsChunkPluginStatic {
-                new(chunkName: string, filenames?: string|string[]): Plugin;
-                new(options?: any): Plugin;
-            }
-            interface AggressiveMergingPluginStatic {
-                new(options: any): Plugin;
-            }
-        }
-
-        namespace dependencies {
-            interface LabeledModulesPluginStatic {
-                new(): Plugin;
-            }
-        }
-
-        namespace compiler {
-            interface Compiler {
-                /** Builds the bundle(s). */
-                run(callback: CompilerCallback): void;
-                /**
-                 * Builds the bundle(s) then starts the watcher, which rebuilds bundles whenever their source files change.
-                 * Returns a Watching instance. Note: since this will automatically run an initial build, so you only need to run watch (and not run).
-                 */
-                watch(watchOptions: WatchOptions, handler: CompilerCallback): Watching;
-                //TODO: below are some of the undocumented properties. needs typings
-                outputFileSystem: any;
-                name: string;
-                options: Configuration;
-            }
-
-            interface Watching {
-                close(callback: () => void): void;
-            }
-
-            interface WatchOptions {
-                /** After a change the watcher waits that time (in milliseconds) for more changes. Default: 300. */
-                aggregateTimeout?: number;
-                /** The watcher uses polling instead of native watchers. true uses the default interval, a number specifies a interval in milliseconds. Default: undefined (automatic). */
-                poll?: number|boolean;
-            }
-
-            interface Stats {
-                /** Returns true if there were errors while compiling */
-                hasErrors(): boolean;
-                /** Returns true if there were warnings while compiling. */
-                hasWarnings(): boolean;
-                /** Return information as json object */
-                toJson(options?: StatsToJsonOptions): any; //TODO: type this
-                /** Returns a formatted string of the result. */
-                toString(options?: StatsToStringOptions): string;
-            }
-
-            interface StatsToJsonOptions {
-                /** context directory for request shortening */
-                context?: boolean;
-                /** add the hash of the compilation */
-                hash?: boolean;
-                /** add webpack version information */
-                version?: boolean;
-                /** add timing information */
-                timings?: boolean;
-                /** add assets information */
-                assets?: boolean;
-                /** add chunk information */
-                chunks?: boolean;
-                /** add built modules information to chunk information */
-                chunkModules?: boolean;
-                /** add built modules information */
-                modules?: boolean;
-                /** add children information */
-                children?: boolean;
-                /** add also information about cached (not built) modules */
-                cached?: boolean;
-                /** add information about the reasons why modules are included */
-                reasons?: boolean;
-                /** add the source code of modules */
-                source?: boolean;
-                /** add details to errors (like resolving log) */
-                errorDetails?: boolean;
-                /** add the origins of chunks and chunk merging info */
-                chunkOrigins?: boolean;
-                /** sort the modules by that field */
-                modulesSort?: string;
-                /** sort the chunks by that field */
-                chunksSort?: string;
-                /** sort the assets by that field */
-                assetsSort?: string;
-            }
-
-            interface StatsToStringOptions extends StatsToJsonOptions {
-                /** With console colors */
-                colors?: boolean;
-            }
-
-            type CompilerCallback = (err: Error, stats: Stats) => void
-        }
-    }
-
-    var webpack: webpack.Webpack;
-
-    //export default webpack;
-    export = webpack;
-}
diff --git a/webrtc/MediaStream.d.ts b/webrtc/MediaStream.d.ts
index 5408569ffe..e10d742427 100644
--- a/webrtc/MediaStream.d.ts
+++ b/webrtc/MediaStream.d.ts
@@ -6,11 +6,6 @@
 // Taken from http://dev.w3.org/2011/webrtc/editor/getusermedia.html
 // version: W3C Editor's Draft 29 June 2015
 
-interface ConstrainBooleanParameters {
-    exact?: boolean;
-    ideal?: boolean;
-}
-
 interface NumberRange {
     max?: number;
     min?: number;
@@ -26,11 +21,6 @@ interface ConstrainStringParameters {
     ideal?: string | string[];
 }
 
-interface MediaStreamConstraints {
-    video?: boolean | MediaTrackConstraints;
-    audio?: boolean | MediaTrackConstraints;
-}
-
 declare namespace W3C {
     type LongRange = NumberRange;
     type DoubleRange = NumberRange;
@@ -41,49 +31,16 @@ declare namespace W3C {
     type ConstrainString = string | string[] | ConstrainStringParameters;
 }
 
-interface MediaTrackConstraints extends MediaTrackConstraintSet {
-    advanced?: MediaTrackConstraintSet[];
-}
-
 interface MediaTrackConstraintSet {
-    width?: W3C.ConstrainLong;
-    height?: W3C.ConstrainLong;
-    aspectRatio?: W3C.ConstrainDouble;
-    frameRate?: W3C.ConstrainDouble;
-    facingMode?: W3C.ConstrainString;
-    volume?: W3C.ConstrainDouble;
-    sampleRate?: W3C.ConstrainLong;
-    sampleSize?: W3C.ConstrainLong;
     echoCancellation?: W3C.ConstrainBoolean;
     latency?: W3C.ConstrainDouble;
-    deviceId?: W3C.ConstrainString;
-    groupId?: W3C.ConstrainString;
 }
 
 interface MediaTrackSupportedConstraints {
-    width?: boolean;
-    height?: boolean;
-    aspectRatio?: boolean;
-    frameRate?: boolean;
-    facingMode?: boolean;
-    volume?: boolean;
-    sampleRate?: boolean;
-    sampleSize?: boolean;
-    echoCancellation?: boolean;
     latency?: boolean;
-    deviceId?: boolean;
-    groupId?: boolean;
 }
 
 interface MediaStream extends EventTarget {
-    id: string;
-    active: boolean;
-
-    onactive: EventListener;
-    oninactive: EventListener;
-    onaddtrack: (event: MediaStreamTrackEvent) => any;
-    onremovetrack: (event: MediaStreamTrackEvent) => any;
-
     clone(): MediaStream;
     stop(): void;
 
@@ -97,29 +54,12 @@ interface MediaStream extends EventTarget {
     removeTrack(track: MediaStreamTrack): void;
 }
 
-interface MediaStreamTrackEvent extends Event {
-    track: MediaStreamTrack;
-}
-
 declare enum MediaStreamTrackState {
 	"live",
     "ended"
 }
 
 interface MediaStreamTrack extends EventTarget {
-    id: string;
-    kind: string;
-    label: string;
-    enabled: boolean;
-    muted: boolean;
-    remote: boolean;
-    readyState: MediaStreamTrackState;
-
-    onmute: EventListener;
-    onunmute: EventListener;
-    onended: EventListener;
-    onoverconstrained: EventListener;
-
     clone(): MediaStreamTrack;
 
     stop(): void;
@@ -131,39 +71,11 @@ interface MediaStreamTrack extends EventTarget {
 }
 
 interface MediaTrackCapabilities {
-    width: number | W3C.LongRange;
-    height: number | W3C.LongRange;
-    aspectRatio: number | W3C.DoubleRange;
-    frameRate: number | W3C.DoubleRange;
-    facingMode: string;
-    volume: number | W3C.DoubleRange;
-    sampleRate: number | W3C.LongRange;
-    sampleSize: number | W3C.LongRange;
-    echoCancellation: boolean[];
     latency: number | W3C.DoubleRange;
-    deviceId: string;
-    groupId: string;
 }
 
 interface MediaTrackSettings {
-    width: number;
-    height: number;
-    aspectRatio: number;
-    frameRate: number;
-    facingMode: string;
-    volume: number;
-    sampleRate: number;
-    sampleSize: number;
-    echoCancellation: boolean;
     latency: number;
-    deviceId: string;
-    groupId: string;
-}
-
-interface MediaStreamError {
-    name: string;
-    message: string;
-    constraintName: string;
 }
 
 interface NavigatorGetUserMedia {
@@ -193,10 +105,3 @@ interface MediaDevices {
     getUserMedia(constraints: MediaStreamConstraints): Promise<MediaStream>;
     enumerateDevices(): Promise<MediaDeviceInfo[]>;
 }
-
-interface MediaDeviceInfo {
-    label: string;
-    deviceId: string;
-    kind: string;
-    groupId: string;
-}
diff --git a/webrtc/RTCPeerConnection-tests.ts b/webrtc/RTCPeerConnection-tests.ts
index 1ed79bf2cc..5dcbd44fe6 100644
--- a/webrtc/RTCPeerConnection-tests.ts
+++ b/webrtc/RTCPeerConnection-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="MediaStream.d.ts" />
-/// <reference path="RTCPeerConnection.d.ts" />
+
+
 
 var config: RTCConfiguration =
     { iceServers: [{ urls: "stun.l.google.com:19302" }] };
diff --git a/webrtc/RTCPeerConnection.d.ts b/webrtc/RTCPeerConnection.d.ts
index b95b0b0a5c..403ef55321 100644
--- a/webrtc/RTCPeerConnection.d.ts
+++ b/webrtc/RTCPeerConnection.d.ts
@@ -28,10 +28,6 @@ declare var RTCConfiguration: {
   new (): RTCConfiguration;
 };
 
-interface RTCIceServer {
-  urls: string;
-  credential?: string;
-}
 declare var RTCIceServer: {
   prototype: RTCIceServer;
   new (): RTCIceServer;
diff --git a/webrtc/index.d.ts b/webrtc/index.d.ts
new file mode 100644
index 0000000000..f950da1943
--- /dev/null
+++ b/webrtc/index.d.ts
@@ -0,0 +1,2 @@
+/// <reference path="RTCPeerConnection.d.ts" />
+/// <reference path="MediaStream.d.ts" />
diff --git a/webrtc/readme.md b/webrtc/readme.md
index 1cc42b2d73..fed66b04ee 100644
--- a/webrtc/readme.md
+++ b/webrtc/readme.md
@@ -10,5 +10,5 @@ but anyone who wants, feel free to add the Mozilla-specific prefixes.
 
 ### Adding the reference to your project
 
-    /// <reference path="MediaStream.d.ts" />
-    /// <reference path="RTCPeerConnection.d.ts" />
\ No newline at end of file
+    
+    
\ No newline at end of file
diff --git a/webrtc/tsconfig.json b/webrtc/tsconfig.json
new file mode 100644
index 0000000000..1b89eee01f
--- /dev/null
+++ b/webrtc/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "webrtc-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/webrtc/webrtc-tests.ts b/webrtc/webrtc-tests.ts
new file mode 100644
index 0000000000..1ecc9545f4
--- /dev/null
+++ b/webrtc/webrtc-tests.ts
@@ -0,0 +1,2 @@
+/// <reference path="MediaStream-tests.ts" />
+/// <reference path="RTCPeerConnection-tests.ts" />
diff --git a/websocket/index.d.ts b/websocket/index.d.ts
new file mode 100644
index 0000000000..4fef1acb97
--- /dev/null
+++ b/websocket/index.d.ts
@@ -0,0 +1,657 @@
+// Type definitions for websocket
+// Project: https://github.com/Worlize/WebSocket-Node
+// Definitions by: Paul Loyd <https://github.com/loyd>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import events = require('events');
+import http = require('http');
+import net = require('net');
+import url = require('url');
+
+export interface IStringified {
+    toString: (...args: any[]) => string;
+}
+
+export interface IConfig {
+    /**
+     * The maximum allowed received frame size in bytes.
+     * Single frame messages will also be limited to this maximum.
+     */
+    maxReceivedFrameSize?: number;
+
+    /** The maximum allowed aggregate message size (for fragmented messages) in bytes */
+    maxReceivedMessageSize?: number;
+
+    /**
+     * Whether or not to fragment outgoing messages. If true, messages will be
+     * automatically fragmented into chunks of up to `fragmentationThreshold` bytes.
+     * @default true
+     */
+    fragmentOutgoingMessages?: boolean;
+
+    /**
+     * The maximum size of a frame in bytes before it is automatically fragmented.
+     * @default 16KiB
+     */
+    fragmentationThreshold?: number;
+
+    /**
+     * If true, fragmented messages will be automatically assembled and the full
+     * message will be emitted via a `message` event. If false, each frame will be
+     * emitted on the `connection` object via a `frame` event and the application
+     * will be responsible for aggregating multiple fragmented frames. Single-frame
+     * messages will emit a `message` event in addition to the `frame` event.
+     * @default true
+     */
+    assembleFragments?: boolean;
+
+    /**
+     * The number of milliseconds to wait after sending a close frame for an
+     * `acknowledgement` to come back before giving up and just closing the socket.
+     * @default 5000
+     */
+    closeTimeout?: number;
+}
+
+export interface IServerConfig extends IConfig {
+    /** The http server instance to attach to */
+    httpServer: http.Server;
+
+    /**
+     * The maximum allowed received frame size in bytes.
+     * Single frame messages will also be limited to this maximum.
+     * @default 64KiB
+     */
+    maxReceivedFrameSize?: number;
+
+    /**
+     * The maximum allowed aggregate message size (for fragmented messages) in bytes.
+     * @default 1MiB
+     */
+    maxReceivedMessageSize?: number;
+
+    /**
+     * If true, the server will automatically send a ping to all clients every
+     * `keepaliveInterval` milliseconds. Each client has an independent `keepalive`
+     * timer, which is reset when any data is received from that client.
+     * @default true
+     */
+    keepalive?: boolean;
+
+    /**
+     * The interval in milliseconds to send `keepalive` pings to connected clients.
+     * @default 20000
+     */
+    keepaliveInterval?: number;
+
+    /**
+     * If true, the server will consider any connection that has not received any
+     * data within the amount of time specified by `keepaliveGracePeriod` after a
+     * `keepalive` ping has been sent. Ignored if `keepalive` is false.
+     * @default true
+     */
+    dropConnectionOnKeepaliveTimeout?: boolean;
+
+    /**
+     * The amount of time to wait after sending a `keepalive` ping before closing
+     * the connection if the connected peer does not respond. Ignored if `keepalive`
+     * or `dropConnectionOnKeepaliveTimeout` are false. The grace period timer is
+     * reset when any data is received from the client.
+     * @default 10000
+     */
+    keepaliveGracePeriod?: number;
+
+    /**
+     * If this is true, websocket connections will be accepted regardless of the path
+     * and protocol specified by the client. The protocol accepted will be the first
+     * that was requested by the client.
+     * @default false
+     */
+    autoAcceptConnections?: boolean;
+
+    /**
+     * The Nagle Algorithm makes more efficient use of network resources by introducing a
+     * small delay before sending small packets so that multiple messages can be batched
+     * together before going onto the wire. This however comes at the cost of latency.
+     * @default true
+     */
+    disableNagleAlgorithm?: boolean;
+}
+
+export declare class server extends events.EventEmitter {
+    config: IServerConfig;
+    connections: connection[];
+
+    constructor(serverConfig?: IServerConfig);
+
+    /** Send binary message for each connection */
+    broadcast(data: Buffer): void;
+    /** Send UTF-8 message for each connection */
+    broadcast(data: IStringified): void;
+    /** Send binary message for each connection */
+    broadcastBytes(data: Buffer): void;
+    /** Send UTF-8 message for each connection */
+    broadcastUTF(data: IStringified): void;
+    /** Attach the `server` instance to a Node http.Server instance */
+    mount(serverConfig: IServerConfig): void;
+
+    /**
+     * Detach the `server` instance from the Node http.Server instance.
+     * All existing connections are left alone and will not be affected,
+     * but no new WebSocket connections will be accepted.
+     */
+    unmount(): void;
+
+    /** Close all open WebSocket connections */
+    closeAllConnections(): void;
+    /** Close all open WebSocket connections and unmount the server */
+    shutDown(): void;
+
+    // Events
+    on(event: string, listener: () => void): this;
+    on(event: 'request', cb: (request: request) => void): this;
+    on(event: 'connect', cb: (connection: connection) => void): this;
+    on(event: 'close', cb: (connection: connection, reason: number, desc: string) => void): this;
+    addListener(event: string, listener: () => void): this;
+    addListener(event: 'request', cb: (request: request) => void): this;
+    addListener(event: 'connect', cb: (connection: connection) => void): this;
+    addListener(event: 'close', cb: (connection: connection, reason: number, desc: string) => void): this;
+}
+
+export interface ICookie {
+    name: string;
+    value: string;
+    path?: string;
+    domain?: string;
+    expires?: Date;
+    maxage?: number;
+    secure?: boolean;
+    httponly?: boolean;
+}
+
+export interface IExtension {
+    name: string;
+    value: string;
+}
+
+export declare class request extends events.EventEmitter {
+    /** A reference to the original Node HTTP request object */
+    httpRequest: http.ClientRequest;
+    /** This will include the port number if a non-standard port is used */
+    host: string;
+    /** A string containing the path that was requested by the client */
+    resource: string;
+    /** `Sec-WebSocket-Key` */
+    key: string;
+    /** Parsed resource, including the query string parameters */
+    resourceURL: url.Url;
+
+    /**
+     * Client's IP. If an `X-Forwarded-For` header is present, the value will be taken
+     * from that header to facilitate WebSocket servers that live behind a reverse-proxy
+     */
+    remoteAddress: string;
+
+    /**
+     * If the client is a web browser, origin will be a string containing the URL
+     * of the page containing the script that opened the connection.
+     * If the client is not a web browser, origin may be `null` or "*".
+     */
+    origin: string;
+
+    /** The version of the WebSocket protocol requested by the client */
+    webSocketVersion: number;
+    /** An array containing a list of extensions requested by the client */
+    requestedExtensions: any[];
+
+    cookies: ICookie[];
+    socket: net.Socket;
+
+    /**
+     * List of strings that indicate the subprotocols the client would like to speak.
+     * The server should select the best one that it can support from the list and
+     * pass it to the `accept` function when accepting the connection.
+     * Note that all the strings in the `requestedProtocols` array will have been
+     * converted to lower case.
+     */
+    requestedProtocols: string[];
+    protocolFullCaseMap: { [key: string]: string };
+
+    constructor(socket: net.Socket, httpRequest: http.ClientRequest, config: IServerConfig);
+
+    /**
+     * After inspecting the `request` properties, call this function on the
+     * request object to accept the connection. If you don't have a particular subprotocol
+     * you wish to speak, you may pass `null` for the `acceptedProtocol` parameter.
+     *
+     * @param [acceptedProtocol] case-insensitive value that was requested by the client
+     */
+    accept(acceptedProtocol?: string, allowedOrigin?: string, cookies?: ICookie[]): connection;
+
+    /**
+     * Reject connection.
+     * You may optionally pass in an HTTP Status code (such as 404) and a textual
+     * description that will be sent to the client in the form of an
+     * `X-WebSocket-Reject-Reason` header.
+     */
+    reject(httpStatus?: number, reason?: string): void;
+
+    // Events
+    on(event: string, listener: () => void): this;
+    on(event: 'requestAccepted', cb: (connection: connection) => void): this;
+    on(event: 'requestRejected', cb: () => void): this;
+    addListener(event: string, listener: () => void): this;
+    addListener(event: 'requestAccepted', cb: (connection: connection) => void): this;
+    addListener(event: 'requestRejected', cb: () => void): this;
+}
+
+export interface IMessage {
+    type: string;
+    utf8Data?: string;
+    binaryData?: Buffer;
+}
+
+export interface IBufferList extends events.EventEmitter {
+    encoding: string;
+    length: number;
+    write(buf: Buffer): boolean;
+    end(buf: Buffer): void;
+
+    /**
+     * For each buffer, perform some action.
+     * If fn's result is a true value, cut out early.
+     */
+    forEach(fn: (buf: Buffer) => boolean): void;
+
+    /** Create a single buffer out of all the chunks */
+    join(start: number, end: number): Buffer;
+
+    /** Join all the chunks to existing buffer */
+    joinInto(buf: Buffer, offset: number, start: number, end: number): Buffer;
+
+    /**
+     * Advance the buffer stream by `n` bytes.
+     * If `n` the aggregate advance offset passes the end of the buffer list,
+     * operations such as `take` will return empty strings until enough data is pushed.
+     */
+    advance(n: number): IBufferList;
+
+    /**
+     * Take `n` bytes from the start of the buffers.
+     * If there are less than `n` bytes in all the buffers or `n` is undefined,
+     * returns the entire concatenated buffer string.
+     */
+    take(n: number, encoding?: string): any;
+    take(encoding?: string): any;
+
+    // Events
+    on(event: string, listener: () => void): this;
+    on(event: 'advance', cb: (n: number) => void): this;
+    on(event: 'write', cb: (buf: Buffer) => void): this;
+    addListener(event: string, listener: () => void): this;
+    addListener(event: 'advance', cb: (n: number) => void): this;
+    addListener(event: 'write', cb: (buf: Buffer) => void): this;
+}
+
+declare class connection extends events.EventEmitter {
+    static CLOSE_REASON_NORMAL: number;
+    static CLOSE_REASON_GOING_AWAY: number;
+    static CLOSE_REASON_PROTOCOL_ERROR: number;
+    static CLOSE_REASON_UNPROCESSABLE_INPUT: number;
+    static CLOSE_REASON_RESERVED: number;
+    static CLOSE_REASON_NOT_PROVIDED: number;
+    static CLOSE_REASON_ABNORMAL: number;
+    static CLOSE_REASON_INVALID_DATA: number;
+    static CLOSE_REASON_POLICY_VIOLATION: number;
+    static CLOSE_REASON_MESSAGE_TOO_BIG: number;
+    static CLOSE_REASON_EXTENSION_REQUIRED: number;
+
+    /**
+     * After the connection is closed, contains a textual description of the reason for
+     * the connection closure, or `null` if the connection is still open.
+     */
+    closeDescription: string;
+
+    /**
+     * After the connection is closed, contains the numeric close reason status code,
+     * or `-1` if the connection is still open.
+     */
+    closeReasonCode: number;
+
+    /**
+     * The subprotocol that was chosen to be spoken on this connection. This field
+     * will have been converted to lower case.
+     */
+    protocol: string;
+
+    config: IConfig;
+    socket: net.Socket;
+    maskOutgoingPackets: boolean;
+    maskBytes: Buffer;
+    frameHeader: Buffer;
+    bufferList: IBufferList;
+    currentFrame: frame;
+    fragmentationSize: number;
+    frameQueue: frame[];
+    state: string;
+    waitingForCloseResponse: boolean;
+    closeTimeout: number;
+    assembleFragments: number;
+    maxReceivedMessageSize: number;
+    outputPaused: boolean;
+    bytesWaitingToFlush: number;
+    socketHadError: boolean;
+
+    /** An array of extensions that were negotiated for this connection */
+    extensions: IExtension[];
+
+    /**
+     * The IP address of the remote peer as a string. In the case of a server,
+     * the `X-Forwarded-For` header will be respected and preferred for the purposes
+     * of populating this field. If you need to get to the actual remote IP address,
+     * `socket.remoteAddress` will provide it.
+     */
+    remoteAddress: string;
+
+    /** The version of the WebSocket protocol requested by the client */
+    webSocketVersion: number;
+    /** Whether or not the connection is still connected. Read-only */
+    connected: boolean;
+
+    constructor(socket: net.Socket, extensions: IExtension[], protocol: string,
+        maskOutgoingPackets: boolean, config: IConfig);
+
+    /**
+     * Close the connection. A close frame will be sent to the remote peer indicating
+     * that we wish to close the connection, and we will then wait for up to
+     * `config.closeTimeout` milliseconds for an acknowledgment from the remote peer
+     * before terminating the underlying socket connection.
+     */
+    close(): void;
+
+    /**
+     * Send a close frame to the remote peer and immediately close the socket without
+     * waiting for a response. This should generally be used only in error conditions.
+     */
+    drop(reasonCode?: number, description?: string): void;
+
+    /**
+     * Immediately sends the specified string as a UTF-8 WebSocket message to the remote
+     * peer. If `config.fragmentOutgoingMessages` is true the message may be sent as
+     * multiple fragments if it exceeds `config.fragmentationThreshold` bytes.
+     */
+    sendUTF(data: IStringified): void;
+
+    /**
+     * Immediately sends the specified Node Buffer object as a Binary WebSocket message
+     * to the remote peer. If config.fragmentOutgoingMessages is true the message may be
+     * sent as multiple fragments if it exceeds config.fragmentationThreshold bytes.
+     */
+    sendBytes(buffer: Buffer): void;
+
+    /** Auto-detect the data type and send UTF-8 or Binary message */
+    send(data: Buffer): void;
+    send(data: IStringified): void;
+
+    /** Sends a ping frame. Ping frames must not exceed 125 bytes in length. */
+    ping(data: Buffer): void;
+    ping(data: IStringified): void;
+
+    /**
+     * Sends a pong frame. Pong frames may be sent unsolicited and such pong frames will
+     * trigger no action on the receiving peer. Pong frames sent in response to a ping
+     * frame must mirror the payload data of the ping frame exactly.
+     * The `connection` object handles this internally for you, so there should
+     * be no need to use this method to respond to pings.
+     * Pong frames must not exceed 125 bytes in length.
+     */
+    pong(buffer: Buffer): void;
+
+    /**
+     * Serializes a `frame` object into binary data and immediately sends it to
+     * the remote peer. This is an advanced function, requiring you to manually compose
+     * your own `frame`. You should probably use sendUTF or sendBytes instead.
+     */
+    sendFrame(frame: frame): void;
+
+    /** Set or reset the `keepalive` timer when data is received */
+    setKeepaliveTimer(): void;
+    setGracePeriodTimer(): void;
+    setCloseTimer(): void;
+    clearCloseTimer(): void;
+    processFrame(frame: frame): void;
+    fragmentAndSend(frame: frame, cb?: (err: Error) => void): void;
+    sendCloseFrame(reasonCode: number, reasonText: string, force: boolean): void;
+    sendCloseFrame(): void;
+    sendFrame(frame: frame, force: boolean, cb?: (msg: string) => void): void;
+    sendFrame(frame: frame, cb?: (msg: string) => void): void;
+
+    // Events
+    on(event: string, listener: () => void): this;
+    on(event: 'message', cb: (data: IMessage) => void): this;
+    on(event: 'frame', cb: (frame: frame) => void): this;
+    on(event: 'close', cb: (code: number, desc: string) => void): this;
+    on(event: 'error', cb: (err: Error) => void): this;
+    addListener(event: string, listener: () => void): this;
+    addListener(event: 'message', cb: (data: IMessage) => void): this;
+    addListener(event: 'frame', cb: (frame: frame) => void): this;
+    addListener(event: 'close', cb: (code: number, desc: string) => void): this;
+    addListener(event: 'error', cb: (err: Error) => void): this;
+}
+
+declare class frame {
+    /** Whether or not this is last frame in a fragmentation sequence */
+    fin: boolean;
+
+    /**
+     * Represents the RSV1 field in the framing. Setting this to true will result in
+     * a Protocol Error on the receiving peer.
+     */
+    rsv1: boolean;
+
+    /**
+     * Represents the RSV1 field in the framing. Setting this to true will result in
+     * a Protocol Error on the receiving peer.
+     */
+    rsv2: boolean;
+
+    /**
+     * Represents the RSV1 field in the framing. Setting this to true will result in
+     * a Protocol Error on the receiving peer.
+     */
+    rsv3: boolean;
+
+    /**
+     * Whether or not this frame is (or should be) masked. For outgoing frames, when
+     * connected as a client, this flag is automatically forced to true by `connection`.
+     * Outgoing frames sent from the server-side of a connection are not masked.
+     */
+    mask: number;
+
+    /**
+     * Identifies which kind of frame this is.
+     *
+     * Hex  - Dec - Description
+     * 0x00 -   0 - Continuation
+     * 0x01 -   1 - Text Frame
+     * 0x02 -   2 - Binary Frame
+     * 0x08 -   8 - Close Frame
+     * 0x09 -   9 - Ping Frame
+     * 0x0A -  10 - Pong Frame
+     */
+    opcode: number;
+
+    /**
+     * Identifies the length of the payload data on a received frame.
+     * When sending a frame, will be automatically calculated from `binaryPayload` object.
+     */
+    length: number;
+
+    /**
+     * The binary payload data.
+     * Even text frames are sent with a Buffer providing the binary payload data.
+     */
+    binaryPayload: Buffer;
+
+    maskBytes: Buffer;
+    frameHeader: Buffer;
+    config: IConfig;
+    maxReceivedFrameSize: number;
+    protocolError: boolean;
+    frameTooLarge: boolean;
+    invalidCloseFrameLength: boolean;
+    closeStatus: number;
+
+    addData(bufferList: IBufferList): boolean;
+    throwAwayPayload(bufferList: IBufferList): boolean;
+    toBuffer(nullMask: boolean): Buffer;
+}
+
+export interface IClientConfig extends IConfig {
+    /**
+     * Which version of the WebSocket protocol to use when making the connection.
+     * Currently supported values are 8 and 13. This option will be removed once the
+     * protocol is finalized by the IETF It is only available to ease the transition
+     * through the intermediate draft protocol versions. The only thing this affects
+     * the name of the Origin header.
+     * @default 13
+     */
+    webSocketVersion?: number;
+
+    /**
+     * The maximum allowed received frame size in bytes.
+     * Single frame messages will also be limited to this maximum.
+     * @default 1MiB
+     */
+    maxReceivedFrameSize?: number;
+
+    /**
+     * The maximum allowed aggregate message size (for fragmented messages) in bytes.
+     * @default 8MiB
+     */
+    maxReceivedMessageSize?: number;
+}
+
+declare class client extends events.EventEmitter {
+    protocols: string[];
+    origin: string;
+    url: url.Url;
+    secure: boolean;
+    socket: net.Socket;
+    response: http.ClientResponse;
+
+    constructor(clientConfig?: IClientConfig);
+
+    /**
+     * Establish a connection. The remote server will select the best subprotocol that
+     * it supports and send that back when establishing the connection.
+     *
+     * @param [origin] can be used in user-agent scenarios to identify the page containing
+     *                 any scripting content that caused the connection to be requested.
+     * @param requestUrl should be a standard websocket url
+     */
+    connect(requestUrl: url.Url, protocols?: string[], origin?: string, headers?: any[]): void;
+    connect(requestUrl: string, protocols?: string[], origin?: string, headers?: any[]): void;
+    connect(requestUrl: url.Url, protocols?: string, origin?: string, headers?: any[]): void;
+    connect(requestUrl: string, protocols?: string, origin?: string, headers?: any[]): void;
+
+    // Events
+    on(event: string, listener: () => void): this;
+    on(event: 'connect', cb: (connection: connection) => void): this;
+    on(event: 'connectFailed', cb: (err: Error) => void): this;
+    addListener(event: string, listener: () => void): this;
+    addListener(event: 'connect', cb: (connection: connection) => void): this;
+    addListener(event: 'connectFailed', cb: (err: Error) => void): this;
+}
+
+declare class routerRequest extends events.EventEmitter {
+
+    /** A reference to the original Node HTTP request object */
+    httpRequest: http.ClientRequest;
+    /** A string containing the path that was requested by the client */
+    resource: string;
+    /** Parsed resource, including the query string parameters */
+    resourceURL: url.Url;
+
+    /**
+     * Client's IP. If an `X-Forwarded-For` header is present, the value will be taken
+     * from that header to facilitate WebSocket servers that live behind a reverse-proxy
+     */
+    remoteAddress: string;
+
+    /**
+     * If the client is a web browser, origin will be a string containing the URL
+     * of the page containing the script that opened the connection.
+     * If the client is not a web browser, origin may be `null` or "*".
+     */
+    origin: string;
+
+    /** The version of the WebSocket protocol requested by the client */
+    webSocketVersion: number;
+    /** An array containing a list of extensions requested by the client */
+    requestedExtensions: any[];
+
+    cookies: ICookie[];
+
+    constructor(webSocketRequest: request, resolvedProtocol: string);
+
+    /**
+     * After inspecting the `request` properties, call this function on the
+     * request object to accept the connection. If you don't have a particular subprotocol
+     * you wish to speak, you may pass `null` for the `acceptedProtocol` parameter.
+     *
+     * @param [acceptedProtocol] case-insensitive value that was requested by the client
+     */
+    accept(acceptedProtocol?: string, allowedOrigin?: string, cookies?: ICookie[]): connection;
+
+    /**
+     * Reject connection.
+     * You may optionally pass in an HTTP Status code (such as 404) and a textual
+     * description that will be sent to the client in the form of an
+     * `X-WebSocket-Reject-Reason` header.
+     */
+    reject(httpStatus?: number, reason?: string): void;
+
+    // Events
+    on(event: string, listener: () => void): this;
+    on(event: 'requestAccepted', cb: (connection: connection) => void): this;
+    on(event: 'requestRejected', cb: () => void): this;
+    addListener(event: string, listener: () => void): this;
+    addListener(event: 'requestAccepted', cb: (connection: connection) => void): this;
+    addListener(event: 'requestRejected', cb: () => void): this;
+}
+
+interface IRouterConfig {
+    /*
+     * The WebSocketServer instance to attach to.
+     */
+    server: server
+}
+
+declare class router extends events.EventEmitter {
+
+    constructor(config?: IRouterConfig);
+
+    /** Attach to WebSocket server */
+    attachServer(server: server): void;
+
+    /** Detach from WebSocket server */
+    detachServer(): void;
+
+    mount(path: string, cb: (request: routerRequest) => void): void;
+    mount(path: string, protocol: string, cb: (request: routerRequest) => void): void;
+    mount(path: RegExp, cb: (request: routerRequest) => void): void;
+    mount(path: RegExp, protocol: string, cb: (request: routerRequest) => void): void;
+
+    unmount(path: string, protocol?: string): void;
+    unmount(path: RegExp, protocol?: string): void;
+
+}
+
+export declare var version: string;
+export declare var constants: {
+    DEBUG: boolean;
+};
diff --git a/websocket/tsconfig.json b/websocket/tsconfig.json
new file mode 100644
index 0000000000..86662a46cf
--- /dev/null
+++ b/websocket/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "websocket-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/websocket/websocket-tests.ts b/websocket/websocket-tests.ts
index c30ddd3e93..5ecee0080d 100644
--- a/websocket/websocket-tests.ts
+++ b/websocket/websocket-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="websocket.d.ts" />
 
 import websocket = require('websocket');
 import http = require('http');
diff --git a/websocket/websocket.d.ts b/websocket/websocket.d.ts
deleted file mode 100644
index bbcd7e04d8..0000000000
--- a/websocket/websocket.d.ts
+++ /dev/null
@@ -1,658 +0,0 @@
-// Type definitions for websocket
-// Project: https://github.com/Worlize/WebSocket-Node
-// Definitions by: Paul Loyd <https://github.com/loyd>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "websocket" {
-    import events = require('events');
-    import http   = require('http');
-    import net    = require('net');
-    import url    = require('url');
-
-    export interface IStringified {
-        toString: (...args: any[]) => string;
-    }
-
-    export interface IConfig {
-        /**
-         * The maximum allowed received frame size in bytes.
-         * Single frame messages will also be limited to this maximum.
-         */
-        maxReceivedFrameSize?: number;
-
-        /** The maximum allowed aggregate message size (for fragmented messages) in bytes */
-        maxReceivedMessageSize?: number;
-
-        /**
-         * Whether or not to fragment outgoing messages. If true, messages will be
-         * automatically fragmented into chunks of up to `fragmentationThreshold` bytes.
-         * @default true
-         */
-        fragmentOutgoingMessages?: boolean;
-
-        /**
-         * The maximum size of a frame in bytes before it is automatically fragmented.
-         * @default 16KiB
-         */
-        fragmentationThreshold?: number;
-
-        /**
-         * If true, fragmented messages will be automatically assembled and the full
-         * message will be emitted via a `message` event. If false, each frame will be
-         * emitted on the `connection` object via a `frame` event and the application
-         * will be responsible for aggregating multiple fragmented frames. Single-frame
-         * messages will emit a `message` event in addition to the `frame` event.
-         * @default true
-         */
-        assembleFragments?: boolean;
-
-        /**
-         * The number of milliseconds to wait after sending a close frame for an
-         * `acknowledgement` to come back before giving up and just closing the socket.
-         * @default 5000
-         */
-        closeTimeout?: number;
-    }
-
-    export interface IServerConfig extends IConfig {
-        /** The http server instance to attach to */
-        httpServer: http.Server;
-
-        /**
-         * The maximum allowed received frame size in bytes.
-         * Single frame messages will also be limited to this maximum.
-         * @default 64KiB
-         */
-        maxReceivedFrameSize?: number;
-
-        /**
-         * The maximum allowed aggregate message size (for fragmented messages) in bytes.
-         * @default 1MiB
-         */
-        maxReceivedMessageSize?: number;
-
-        /**
-         * If true, the server will automatically send a ping to all clients every
-         * `keepaliveInterval` milliseconds. Each client has an independent `keepalive`
-         * timer, which is reset when any data is received from that client.
-         * @default true
-         */
-        keepalive?: boolean;
-
-        /**
-         * The interval in milliseconds to send `keepalive` pings to connected clients.
-         * @default 20000
-         */
-        keepaliveInterval?: number;
-
-        /**
-         * If true, the server will consider any connection that has not received any
-         * data within the amount of time specified by `keepaliveGracePeriod` after a
-         * `keepalive` ping has been sent. Ignored if `keepalive` is false.
-         * @default true
-         */
-        dropConnectionOnKeepaliveTimeout?: boolean;
-
-        /**
-         * The amount of time to wait after sending a `keepalive` ping before closing
-         * the connection if the connected peer does not respond. Ignored if `keepalive`
-         * or `dropConnectionOnKeepaliveTimeout` are false. The grace period timer is
-         * reset when any data is received from the client.
-         * @default 10000
-         */
-        keepaliveGracePeriod?: number;
-
-        /**
-         * If this is true, websocket connections will be accepted regardless of the path
-         * and protocol specified by the client. The protocol accepted will be the first
-         * that was requested by the client.
-         * @default false
-         */
-        autoAcceptConnections?: boolean;
-
-        /**
-         * The Nagle Algorithm makes more efficient use of network resources by introducing a
-         * small delay before sending small packets so that multiple messages can be batched
-         * together before going onto the wire. This however comes at the cost of latency.
-         * @default true
-         */
-        disableNagleAlgorithm?: boolean;
-    }
-
-    export class server extends events.EventEmitter {
-        config: IServerConfig;
-        connections: connection[];
-
-        constructor(serverConfig?: IServerConfig);
-
-        /** Send binary message for each connection */
-        broadcast(data: Buffer): void;
-        /** Send UTF-8 message for each connection */
-        broadcast(data: IStringified): void;
-        /** Send binary message for each connection */
-        broadcastBytes(data: Buffer): void;
-        /** Send UTF-8 message for each connection */
-        broadcastUTF(data: IStringified): void;
-        /** Attach the `server` instance to a Node http.Server instance */
-        mount(serverConfig: IServerConfig): void;
-
-        /**
-         * Detach the `server` instance from the Node http.Server instance.
-         * All existing connections are left alone and will not be affected,
-         * but no new WebSocket connections will be accepted.
-         */
-        unmount(): void;
-
-        /** Close all open WebSocket connections */
-        closeAllConnections(): void;
-        /** Close all open WebSocket connections and unmount the server */
-        shutDown(): void;
-
-        // Events
-        on(event: string, listener: () => void): this;
-        on(event: 'request', cb: (request: request) => void): this;
-        on(event: 'connect', cb: (connection: connection) => void): this;
-        on(event: 'close', cb: (connection: connection, reason: number, desc: string) => void): this;
-        addListener(event: string, listener: () => void): this;
-        addListener(event: 'request', cb: (request: request) => void): this;
-        addListener(event: 'connect', cb: (connection: connection) => void): this;
-        addListener(event: 'close', cb: (connection: connection, reason: number, desc: string) => void): this;
-    }
-
-    export interface ICookie {
-        name: string;
-        value: string;
-        path?: string;
-        domain?: string;
-        expires?: Date;
-        maxage?: number;
-        secure?: boolean;
-        httponly?: boolean;
-    }
-
-    export interface IExtension {
-        name: string;
-        value: string;
-    }
-
-    export class request extends events.EventEmitter {
-        /** A reference to the original Node HTTP request object */
-        httpRequest: http.ClientRequest;
-        /** This will include the port number if a non-standard port is used */
-        host: string;
-        /** A string containing the path that was requested by the client */
-        resource: string;
-        /** `Sec-WebSocket-Key` */
-        key: string;
-        /** Parsed resource, including the query string parameters */
-        resourceURL: url.Url;
-
-        /**
-         * Client's IP. If an `X-Forwarded-For` header is present, the value will be taken
-         * from that header to facilitate WebSocket servers that live behind a reverse-proxy
-         */
-        remoteAddress: string;
-
-        /**
-         * If the client is a web browser, origin will be a string containing the URL
-         * of the page containing the script that opened the connection.
-         * If the client is not a web browser, origin may be `null` or "*".
-         */
-        origin: string;
-
-        /** The version of the WebSocket protocol requested by the client */
-        webSocketVersion: number;
-        /** An array containing a list of extensions requested by the client */
-        requestedExtensions: any[];
-
-        cookies: ICookie[];
-        socket: net.Socket;
-
-        /**
-         * List of strings that indicate the subprotocols the client would like to speak.
-         * The server should select the best one that it can support from the list and
-         * pass it to the `accept` function when accepting the connection.
-         * Note that all the strings in the `requestedProtocols` array will have been
-         * converted to lower case.
-         */
-        requestedProtocols: string[];
-        protocolFullCaseMap: {[key: string]: string};
-
-        constructor(socket: net.Socket, httpRequest: http.ClientRequest, config: IServerConfig);
-
-        /**
-         * After inspecting the `request` properties, call this function on the
-         * request object to accept the connection. If you don't have a particular subprotocol
-         * you wish to speak, you may pass `null` for the `acceptedProtocol` parameter.
-         *
-         * @param [acceptedProtocol] case-insensitive value that was requested by the client
-         */
-        accept(acceptedProtocol?: string, allowedOrigin?: string, cookies?: ICookie[]): connection;
-
-        /**
-         * Reject connection.
-         * You may optionally pass in an HTTP Status code (such as 404) and a textual
-         * description that will be sent to the client in the form of an
-         * `X-WebSocket-Reject-Reason` header.
-         */
-        reject(httpStatus?: number, reason?: string): void;
-
-        // Events
-        on(event: string, listener: () => void): this;
-        on(event: 'requestAccepted', cb: (connection: connection) => void): this;
-        on(event: 'requestRejected', cb: () => void): this;
-        addListener(event: string, listener: () => void): this;
-        addListener(event: 'requestAccepted', cb: (connection: connection) => void): this;
-        addListener(event: 'requestRejected', cb: () => void): this;
-    }
-
-    export interface IMessage {
-        type: string;
-        utf8Data?: string;
-        binaryData?: Buffer;
-    }
-
-    export interface IBufferList extends events.EventEmitter {
-        encoding: string;
-        length: number;
-        write(buf: Buffer): boolean;
-        end(buf: Buffer): void;
-
-        /**
-         * For each buffer, perform some action.
-         * If fn's result is a true value, cut out early.
-         */
-        forEach(fn: (buf: Buffer) => boolean): void;
-
-        /** Create a single buffer out of all the chunks */
-        join(start: number, end: number): Buffer;
-
-        /** Join all the chunks to existing buffer */
-        joinInto(buf: Buffer, offset: number, start: number, end: number): Buffer;
-
-        /**
-         * Advance the buffer stream by `n` bytes.
-         * If `n` the aggregate advance offset passes the end of the buffer list,
-         * operations such as `take` will return empty strings until enough data is pushed.
-         */
-        advance(n: number): IBufferList;
-
-        /**
-         * Take `n` bytes from the start of the buffers.
-         * If there are less than `n` bytes in all the buffers or `n` is undefined,
-         * returns the entire concatenated buffer string.
-         */
-        take(n: number, encoding?: string): any;
-        take(encoding?: string): any;
-
-        // Events
-        on(event: string, listener: () => void): this;
-        on(event: 'advance', cb: (n: number) => void): this;
-        on(event: 'write', cb: (buf: Buffer) => void): this;
-        addListener(event: string, listener: () => void): this;
-        addListener(event: 'advance', cb: (n: number) => void): this;
-        addListener(event: 'write', cb: (buf: Buffer) => void): this;
-    }
-
-    class connection extends events.EventEmitter {
-        static CLOSE_REASON_NORMAL: number;
-        static CLOSE_REASON_GOING_AWAY: number;
-        static CLOSE_REASON_PROTOCOL_ERROR: number;
-        static CLOSE_REASON_UNPROCESSABLE_INPUT: number;
-        static CLOSE_REASON_RESERVED: number;
-        static CLOSE_REASON_NOT_PROVIDED: number;
-        static CLOSE_REASON_ABNORMAL: number;
-        static CLOSE_REASON_INVALID_DATA: number;
-        static CLOSE_REASON_POLICY_VIOLATION: number;
-        static CLOSE_REASON_MESSAGE_TOO_BIG: number;
-        static CLOSE_REASON_EXTENSION_REQUIRED: number;
-
-        /**
-         * After the connection is closed, contains a textual description of the reason for
-         * the connection closure, or `null` if the connection is still open.
-         */
-        closeDescription: string;
-
-        /**
-         * After the connection is closed, contains the numeric close reason status code,
-         * or `-1` if the connection is still open.
-         */
-        closeReasonCode: number;
-
-        /**
-         * The subprotocol that was chosen to be spoken on this connection. This field
-         * will have been converted to lower case.
-         */
-        protocol: string;
-
-        config: IConfig;
-        socket: net.Socket;
-        maskOutgoingPackets: boolean;
-        maskBytes: Buffer;
-        frameHeader: Buffer;
-        bufferList: IBufferList;
-        currentFrame: frame;
-        fragmentationSize: number;
-        frameQueue: frame[];
-        state: string;
-        waitingForCloseResponse: boolean;
-        closeTimeout: number;
-        assembleFragments: number;
-        maxReceivedMessageSize: number;
-        outputPaused: boolean;
-        bytesWaitingToFlush: number;
-        socketHadError: boolean;
-
-        /** An array of extensions that were negotiated for this connection */
-        extensions: IExtension[];
-
-        /**
-         * The IP address of the remote peer as a string. In the case of a server,
-         * the `X-Forwarded-For` header will be respected and preferred for the purposes
-         * of populating this field. If you need to get to the actual remote IP address,
-         * `socket.remoteAddress` will provide it.
-         */
-        remoteAddress: string;
-
-        /** The version of the WebSocket protocol requested by the client */
-        webSocketVersion: number;
-        /** Whether or not the connection is still connected. Read-only */
-        connected: boolean;
-
-        constructor(socket: net.Socket, extensions: IExtension[], protocol: string,
-                    maskOutgoingPackets: boolean, config: IConfig);
-
-        /**
-         * Close the connection. A close frame will be sent to the remote peer indicating
-         * that we wish to close the connection, and we will then wait for up to
-         * `config.closeTimeout` milliseconds for an acknowledgment from the remote peer
-         * before terminating the underlying socket connection.
-         */
-        close(): void;
-
-        /**
-         * Send a close frame to the remote peer and immediately close the socket without
-         * waiting for a response. This should generally be used only in error conditions.
-         */
-        drop(reasonCode?: number, description?: string): void;
-
-        /**
-         * Immediately sends the specified string as a UTF-8 WebSocket message to the remote
-         * peer. If `config.fragmentOutgoingMessages` is true the message may be sent as
-         * multiple fragments if it exceeds `config.fragmentationThreshold` bytes.
-         */
-        sendUTF(data: IStringified): void;
-
-        /**
-         * Immediately sends the specified Node Buffer object as a Binary WebSocket message
-         * to the remote peer. If config.fragmentOutgoingMessages is true the message may be
-         * sent as multiple fragments if it exceeds config.fragmentationThreshold bytes.
-         */
-        sendBytes(buffer: Buffer): void;
-
-        /** Auto-detect the data type and send UTF-8 or Binary message */
-        send(data: Buffer): void;
-        send(data: IStringified): void;
-
-        /** Sends a ping frame. Ping frames must not exceed 125 bytes in length. */
-        ping(data: Buffer): void;
-        ping(data: IStringified): void;
-
-        /**
-         * Sends a pong frame. Pong frames may be sent unsolicited and such pong frames will
-         * trigger no action on the receiving peer. Pong frames sent in response to a ping
-         * frame must mirror the payload data of the ping frame exactly.
-         * The `connection` object handles this internally for you, so there should
-         * be no need to use this method to respond to pings.
-         * Pong frames must not exceed 125 bytes in length.
-         */
-        pong(buffer: Buffer): void;
-
-        /**
-         * Serializes a `frame` object into binary data and immediately sends it to
-         * the remote peer. This is an advanced function, requiring you to manually compose
-         * your own `frame`. You should probably use sendUTF or sendBytes instead.
-         */
-        sendFrame(frame: frame): void;
-
-        /** Set or reset the `keepalive` timer when data is received */
-        setKeepaliveTimer(): void;
-        setGracePeriodTimer(): void;
-        setCloseTimer(): void;
-        clearCloseTimer(): void;
-        processFrame(frame: frame): void;
-        fragmentAndSend(frame: frame, cb?: (err: Error) => void): void;
-        sendCloseFrame(reasonCode: number, reasonText: string, force: boolean): void;
-        sendCloseFrame(): void;
-        sendFrame(frame: frame, force: boolean, cb?: (msg: string) => void): void;
-        sendFrame(frame: frame, cb?: (msg: string) => void): void;
-
-        // Events
-        on(event: string, listener: () => void): this;
-        on(event: 'message', cb: (data: IMessage) => void): this;
-        on(event: 'frame', cb: (frame: frame) => void): this;
-        on(event: 'close', cb: (code: number, desc: string) => void): this;
-        on(event: 'error', cb: (err: Error) => void): this;
-        addListener(event: string, listener: () => void): this;
-        addListener(event: 'message', cb: (data: IMessage) => void): this;
-        addListener(event: 'frame', cb: (frame: frame) => void): this;
-        addListener(event: 'close', cb: (code: number, desc: string) => void): this;
-        addListener(event: 'error', cb: (err: Error) => void): this;
-    }
-
-    class frame {
-        /** Whether or not this is last frame in a fragmentation sequence */
-        fin: boolean;
-
-        /**
-         * Represents the RSV1 field in the framing. Setting this to true will result in
-         * a Protocol Error on the receiving peer.
-         */
-        rsv1: boolean;
-
-        /**
-         * Represents the RSV1 field in the framing. Setting this to true will result in
-         * a Protocol Error on the receiving peer.
-         */
-        rsv2: boolean;
-
-        /**
-         * Represents the RSV1 field in the framing. Setting this to true will result in
-         * a Protocol Error on the receiving peer.
-         */
-        rsv3: boolean;
-
-        /**
-         * Whether or not this frame is (or should be) masked. For outgoing frames, when
-         * connected as a client, this flag is automatically forced to true by `connection`.
-         * Outgoing frames sent from the server-side of a connection are not masked.
-         */
-        mask: number;
-
-        /**
-         * Identifies which kind of frame this is.
-         *
-         * Hex  - Dec - Description
-         * 0x00 -   0 - Continuation
-         * 0x01 -   1 - Text Frame
-         * 0x02 -   2 - Binary Frame
-         * 0x08 -   8 - Close Frame
-         * 0x09 -   9 - Ping Frame
-         * 0x0A -  10 - Pong Frame
-         */
-        opcode: number;
-
-        /**
-         * Identifies the length of the payload data on a received frame.
-         * When sending a frame, will be automatically calculated from `binaryPayload` object.
-         */
-        length: number;
-
-        /**
-         * The binary payload data.
-         * Even text frames are sent with a Buffer providing the binary payload data.
-         */
-        binaryPayload: Buffer;
-
-        maskBytes: Buffer;
-        frameHeader: Buffer;
-        config: IConfig;
-        maxReceivedFrameSize: number;
-        protocolError: boolean;
-        frameTooLarge: boolean;
-        invalidCloseFrameLength: boolean;
-        closeStatus: number;
-
-        addData(bufferList: IBufferList): boolean;
-        throwAwayPayload(bufferList: IBufferList): boolean;
-        toBuffer(nullMask: boolean): Buffer;
-    }
-
-    export interface IClientConfig extends IConfig {
-        /**
-         * Which version of the WebSocket protocol to use when making the connection.
-         * Currently supported values are 8 and 13. This option will be removed once the
-         * protocol is finalized by the IETF It is only available to ease the transition
-         * through the intermediate draft protocol versions. The only thing this affects
-         * the name of the Origin header.
-         * @default 13
-         */
-        webSocketVersion?: number;
-
-        /**
-         * The maximum allowed received frame size in bytes.
-         * Single frame messages will also be limited to this maximum.
-         * @default 1MiB
-         */
-        maxReceivedFrameSize?: number;
-
-        /**
-         * The maximum allowed aggregate message size (for fragmented messages) in bytes.
-         * @default 8MiB
-         */
-        maxReceivedMessageSize?: number;
-    }
-
-    class client extends events.EventEmitter {
-        protocols: string[];
-        origin: string;
-        url: url.Url;
-        secure: boolean;
-        socket: net.Socket;
-        response: http.ClientResponse;
-
-        constructor(clientConfig?: IClientConfig);
-
-        /**
-         * Establish a connection. The remote server will select the best subprotocol that
-         * it supports and send that back when establishing the connection.
-         *
-         * @param [origin] can be used in user-agent scenarios to identify the page containing
-         *                 any scripting content that caused the connection to be requested.
-         * @param requestUrl should be a standard websocket url
-         */
-        connect(requestUrl: url.Url, protocols?: string[], origin?: string, headers?: any[]): void;
-        connect(requestUrl: string,  protocols?: string[], origin?: string, headers?: any[]): void;
-        connect(requestUrl: url.Url, protocols?: string,   origin?: string, headers?: any[]): void;
-        connect(requestUrl: string,  protocols?: string,   origin?: string, headers?: any[]): void;
-
-        // Events
-        on(event: string, listener: () => void): this;
-        on(event: 'connect', cb: (connection: connection) => void): this;
-        on(event: 'connectFailed', cb: (err: Error) => void): this;
-        addListener(event: string, listener: () => void): this;
-        addListener(event: 'connect', cb: (connection: connection) => void): this;
-        addListener(event: 'connectFailed', cb: (err: Error) => void): this;
-    }
-
-    class routerRequest extends events.EventEmitter {
-
-      /** A reference to the original Node HTTP request object */
-      httpRequest: http.ClientRequest;
-      /** A string containing the path that was requested by the client */
-      resource: string;
-      /** Parsed resource, including the query string parameters */
-      resourceURL: url.Url;
-
-      /**
-       * Client's IP. If an `X-Forwarded-For` header is present, the value will be taken
-       * from that header to facilitate WebSocket servers that live behind a reverse-proxy
-       */
-      remoteAddress: string;
-
-      /**
-       * If the client is a web browser, origin will be a string containing the URL
-       * of the page containing the script that opened the connection.
-       * If the client is not a web browser, origin may be `null` or "*".
-       */
-      origin: string;
-
-      /** The version of the WebSocket protocol requested by the client */
-      webSocketVersion: number;
-      /** An array containing a list of extensions requested by the client */
-      requestedExtensions: any[];
-
-      cookies: ICookie[];
-
-      constructor(webSocketRequest: request, resolvedProtocol: string);
-
-      /**
-       * After inspecting the `request` properties, call this function on the
-       * request object to accept the connection. If you don't have a particular subprotocol
-       * you wish to speak, you may pass `null` for the `acceptedProtocol` parameter.
-       *
-       * @param [acceptedProtocol] case-insensitive value that was requested by the client
-       */
-      accept(acceptedProtocol?: string, allowedOrigin?: string, cookies?: ICookie[]): connection;
-
-      /**
-       * Reject connection.
-       * You may optionally pass in an HTTP Status code (such as 404) and a textual
-       * description that will be sent to the client in the form of an
-       * `X-WebSocket-Reject-Reason` header.
-       */
-      reject(httpStatus?: number, reason?: string): void;
-
-      // Events
-      on(event: string, listener: () => void): this;
-      on(event: 'requestAccepted', cb: (connection: connection) => void): this;
-      on(event: 'requestRejected', cb: () => void): this;
-      addListener(event: string, listener: () => void): this;
-      addListener(event: 'requestAccepted', cb: (connection: connection) => void): this;
-      addListener(event: 'requestRejected', cb: () => void): this;
-    }
-
-    interface IRouterConfig {
-      /*
-       * The WebSocketServer instance to attach to.
-       */
-      server: server
-    }
-
-    class router extends events.EventEmitter {
-
-      constructor(config?: IRouterConfig);
-
-      /** Attach to WebSocket server */
-      attachServer(server: server): void;
-
-      /** Detach from WebSocket server */
-      detachServer(): void;
-
-      mount(path: string, cb: (request: routerRequest) => void): void;
-      mount(path: string, protocol: string, cb: (request: routerRequest) => void): void;
-      mount(path: RegExp, cb: (request: routerRequest) => void): void;
-      mount(path: RegExp, protocol: string, cb: (request: routerRequest) => void): void;
-
-      unmount(path: string, protocol?: string): void;
-      unmount(path: RegExp, protocol?: string): void;
-
-    }
-
-    export var version: string;
-    export var constants: {
-        DEBUG: boolean;
-    };
-}
diff --git a/webspeechapi/webspeechapi.d.ts b/webspeechapi/index.d.ts
similarity index 100%
rename from webspeechapi/webspeechapi.d.ts
rename to webspeechapi/index.d.ts
diff --git a/webspeechapi/tsconfig.json b/webspeechapi/tsconfig.json
new file mode 100644
index 0000000000..717f7f6f48
--- /dev/null
+++ b/webspeechapi/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "webspeechapi-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/webspeechapi/webspeechapi-tests.ts b/webspeechapi/webspeechapi-tests.ts
index 91e623b0ff..191f58d742 100644
--- a/webspeechapi/webspeechapi-tests.ts
+++ b/webspeechapi/webspeechapi-tests.ts
@@ -1,6 +1,4 @@
-///<reference path="webspeechapi.d.ts" />
-
-/*
+/*
 Examples from the spec:
 https://dvcs.w3.org/hg/speech-api/raw-file/tip/speechapi.html#examples-recognition
 */
@@ -35,7 +33,7 @@ declare var select: HTMLSelectElement;
     }
 
     function start() {
-        select.options.length = 0;
+        let x: number = select.options.length;
         recognition.start();
     }
 }
diff --git a/websql/websql.d.ts b/websql/index.d.ts
similarity index 100%
rename from websql/websql.d.ts
rename to websql/index.d.ts
diff --git a/websql/tsconfig.json b/websql/tsconfig.json
new file mode 100644
index 0000000000..e3433909a6
--- /dev/null
+++ b/websql/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "websql-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/websql/websql-tests.ts b/websql/websql-tests.ts
index 5cf0300548..2daf5e5644 100644
--- a/websql/websql-tests.ts
+++ b/websql/websql-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="websql.d.ts" />
+
 
 interface DbState {
     database: Database;
diff --git a/webtorrent/index.d.ts b/webtorrent/index.d.ts
new file mode 100644
index 0000000000..b6e55823f5
--- /dev/null
+++ b/webtorrent/index.d.ts
@@ -0,0 +1,339 @@
+// Type definitions for WebTorrent
+// Project: https://webtorrent.io/
+// Definitions by: Bazyli Brzóska <https://invent.life>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+/// <reference types="parse-torrent" />
+
+declare var webTorrentStatic:WebTorrent.ClientConstructor;
+export = webTorrentStatic;
+export as namespace WebTorrent;
+
+declare namespace WebTorrent {
+  export interface ClientOptions {
+    dht?: boolean|Object,   // Enable DHT (default=true), or options object for DHT
+    maxConns?: number,      // Max number of connections per torrent (default=55)
+    nodeId?: string|Buffer, // DHT protocol node ID (default=randomly generated)
+    peerId?: string|Buffer, // Wire protocol peer ID (default=randomly generated)
+    rtcConfig?: Object,     // RTCPeerConnection configuration object (default=STUN only)
+    tracker?: boolean,      // Whether or not to enable trackers (default=true)
+    wrtc?: Object           // Custom webrtc implementation (in node, specify the [wrtc](https://www.npmjs.com/package/wrtc) package)
+  }
+
+  export interface TorrentOptions {
+    announce?: Array<string>,   // Torrent trackers to use (added to list in .torrent or magnet uri)
+    path?: string,   // Folder to download files to (default=`/tmp/webtorrent/`)
+    store?: Function // Custom chunk store (must follow [abstract-chunk-store](https://www.npmjs.com/package/abstract-chunk-store) API)
+  }
+
+  export interface ClientConstructor {
+    new (config?:ClientOptions):Client;
+  }
+
+  export interface Client extends NodeJS.EventEmitter, ClientConstructor {
+    on(event: string, listener: Function): this;
+
+    /**
+     * Start downloading a new torrent. Aliased as client.download.
+
+      torrentId can be one of:
+
+      * magnet uri (string)
+      * torrent file (buffer)
+      * info hash (hex string or buffer)
+      * parsed torrent (from parse-torrent)
+      * http/https url to a torrent file (string)
+      * filesystem path to a torrent file (string)
+
+      If ontorrent is specified, then it will be called when this torrent is ready to be used (i.e. metadata is available). Note: this is distinct from the 'torrent' event which will fire for all torrents.
+
+      If you want access to the torrent object immediately in order to listen to events as the metadata is fetched from the network, then use the return value of client.add. If you just want the file data, then use ontorrent or the 'torrent' event.
+     */
+    // add(torrentFileBufferOrMagnetUriOrPathOrInfoHash:string|Buffer|ParsedTorrent, opts?:TorrentOptions, onTorrentCallback?:(torrent:Torrent)=>void):Torrent;
+    add(magnetUriOrPathOrInfoHash:string, opts?:TorrentOptions, onTorrentCallback?:(torrent:Torrent)=>void):Torrent;
+    add(torrentFileOrInfoHash:Buffer, opts?:TorrentOptions, onTorrentCallback?:(torrent:Torrent)=>void):Torrent;
+    add(parsedTorrent:ParseTorrent.ParsedTorrent, opts?:TorrentOptions, onTorrentCallback?:(torrent:Torrent)=>void):Torrent;
+
+    add(magnetUriOrPathOrInfoHash:string, onTorrentCallback?:(torrent:Torrent)=>void):Torrent;
+    add(torrentFileOrInfoHash:Buffer, onTorrentCallback?:(torrent:Torrent)=>void):Torrent;
+    add(parsedTorrent:ParseTorrent.ParsedTorrent, onTorrentCallback?:(torrent:Torrent)=>void):Torrent;
+
+    /**
+     * Emitted when a torrent is ready to be used (i.e. metadata is available and store is ready). See the torrent section for more info on what methods a torrent has.
+     */
+    on(event:'torrent', callback:(torrent:Torrent)=>void): this;
+
+    /**
+     * Start seeding a new torrent.
+
+        input can be any of the following:
+
+        path to the file or folder on filesystem (string) (Node.js only)
+        W3C File object (from an <input> or drag and drop)
+        W3C FileList object (basically an array of File objects)
+        Node Buffer object (works in the browser)
+        Or, an array of string, File, or Buffer objects.
+
+        If opts is specified, it should contain the following types of options:
+
+        options for create-torrent (to allow configuration of the .torrent file that is created)
+        options for client.add (see above)
+        If onseed is specified, it will be called when the client has begun seeding the file.
+     */
+    seed(inputFileOrFolderPath:string, opts?:TorrentOptions|any, onSeed?:(torrent:Torrent)=>void):void;
+    seed(inputFile:File, opts?:TorrentOptions|any, onSeed?:(torrent:Torrent)=>void):void;
+    seed(inputFileList:FileList, opts?:TorrentOptions|any, onSeed?:(torrent:Torrent)=>void):void;
+    seed(inputBuffer:Buffer, opts?:TorrentOptions|any, onSeed?:(torrent:Torrent)=>void):void;
+    seed(inputBuffersFilesOrPaths:Array<string|File|Buffer>, opts?:TorrentOptions|any, onSeed?:(torrent:Torrent)=>void):void;
+
+    seed(inputFileOrFolderPath:string, onSeed?:(torrent:Torrent)=>void):void;
+    seed(inputFile:File, onSeed?:(torrent:Torrent)=>void):void;
+    seed(inputFileList:FileList, onSeed?:(torrent:Torrent)=>void):void;
+    seed(inputBuffer:Buffer, onSeed?:(torrent:Torrent)=>void):void;
+    seed(inputBuffersFilesOrPaths:Array<string|File|Buffer>, onSeed?:(torrent:Torrent)=>void):void;
+    //TODO: opts
+
+    /**
+     * Remove a torrent from the client. Destroy all connections to peers and delete all saved file data. If callback is specified, it will be called when file data is removed.
+     */
+    remove(torrentId:string, callback?:(err:Error)=>void):void;
+
+    /**
+     * Destroy the client, including all torrents and connections to peers. If callback is specified, it will be called when the client has gracefully closed.
+     */
+    destroy(callback?:(err:Error)=>void):void;
+
+    /**
+     * An array of all torrents in the client.
+     */
+    torrents:Array<Torrent>;
+
+    /**
+     * Returns the torrent with the given torrentId. Convenience method. Easier than searching through the client.torrents array. Returns null if no matching torrent found.
+     */
+    get(torrentId:string):Torrent;
+
+    /**
+     * Seed ratio for all torrents in the client.
+     */
+    ratio:number;
+  }
+
+  export interface Torrent extends NodeJS.EventEmitter {
+    on(event: string, listener: Function): this;
+
+    /**
+     * Get the info hash of the torrent.
+     */
+    infoHash:string;
+
+    /**
+     * Get the magnet URI of the torrent.
+     */
+    magnetURI:string;
+
+    /**
+     * An array of all files in the torrent. See the file section for more info on what methods the file has.
+     */
+    files:Array<InTorrentFile>;
+
+    /**
+     * The attached bittorrent-swarm instance.
+     */
+    swarm:any; // TODO: return type
+
+    /**
+     * Get total bytes received from peers (including invalid data).
+     */
+    recieved:number;
+
+    /**
+     * Get total bytes received from peers (excluding invalid data).
+     */
+    downloaded:number;
+
+    /**
+     * Get the time remaining in millis if downloading.
+     */
+    timeRemaining:number;
+
+    /**
+     * Get the total progress from 0 to 1.
+     */
+    progress:number;
+
+    /**
+     * Get the torrent ratio (seeded/downloaded).
+     */
+    ratio:number;
+
+    /**
+     * Returns the download speed.
+     */
+    downloadSpeed():number;
+
+    /**
+     * Returns the current upload speed.
+     */
+    uploadSpeed():number;
+
+    /**
+     * Get the torrent download location.
+     */
+    path:string;
+
+    /**
+     * Alias for client.remove(torrent).
+     */
+    destroy():void;
+
+    /**
+     * Adds a peer to the underlying bittorrent-swarm instance.
+
+    Returns true if peer was added, false if peer was blocked by the loaded blocklist.
+     */
+    addPeer(addr:string):boolean;
+
+    /**
+     * Selects a range of pieces to prioritize starting with start and ending with end (both inclusive) at the given priority. notify is an optional callback to be called when the selection is updated with new data.
+     */
+    select(start:number, end:number, priority?:number, notifyCallback?:() => void):void;
+
+    /**
+     * Deprioritizes a range of previously selected pieces.
+     */
+    deselect(start:number, end:number, priority:number):void;
+
+    /**
+     * Marks a range of pieces as critical priority to be downloaded ASAP. From start to end (both inclusive).
+     */
+    critical(start:number, end:number):void;
+
+    /**
+     * Create an http server to serve the contents of this torrent, dynamically fetching the needed torrent pieces to satisfy http requests. Range requests are supported.
+
+    Returns an http.Server instance (got from calling http.createServer). If opts is specified, it is passed to the http.createServer function.
+
+    Visiting the root of the server / will show a list of links to individual files. Access individual files at /<index> where <index> is the index in the torrent.files array (e.g. /0, /1, etc.)
+     */
+    createServer(opts?:any):any; // TODO: :http.Server;
+
+    /**
+     * Temporarily stop connecting to new peers. Note that this does not pause new incoming connections, nor does it pause the streams of existing connections or their wires.
+     */
+    pause():void;
+
+    /**
+     * Resume connecting to new peers.
+     */
+    resume():void;
+
+    /**
+     * Emitted when all the torrent's files have been downloaded.
+     */
+    on(event: 'done', callback:()=>void): this;
+
+    /**
+     * Emitted every time a new chunk of data arrives, it's useful for reporting the current torrent status.
+     */
+    on(event: 'download', callback:(chunkSize:number)=>void): this;
+
+    /**
+     * Emitted whenever a new peer is connected for this torrent. wire is an instance of bittorrent-protocol, which is a node.js-style duplex stream to the remote peer. This event can be used to specify custom BitTorrent protocol extensions.
+     */
+    on(event: 'wire', callback:(wire:any)=>void): this;
+  }
+
+  export interface InTorrentFile extends NodeJS.EventEmitter {
+    on(event: string, listener: Function): this;
+
+    /**
+     * File name, as specified by the torrent. Example: 'some-filename.txt'
+     */
+    name:string;
+
+    /**
+     * File path, as specified by the torrent. Example: 'some-folder/some-filename.txt'
+     */
+    path:string;
+
+    /**
+     * File length (in bytes), as specified by the torrent. Example: 12345
+     */
+    length:number;
+
+    /**
+     * Selects the file to be downloaded, but at a lower priority than files with streams. Useful if you know you need the file at a later stage.
+     */
+    select():void;
+
+    /**
+     * Deselects the file, which means it won't be downloaded unless someone creates a stream for it.
+     */
+    deselect():void;
+
+    /**
+     * Create a readable stream to the file. Pieces needed by the stream will be prioritized highly and fetched from the swarm first.
+     * You can pass opts to stream only a slice of a file.
+     * Both start and end bytes are inclusive.
+     */
+    createReadStream(opts?:{start:number, end:number}):NodeJS.ReadableStream;
+
+    /**
+     * Get the file contents as a Buffer.
+
+      The file will be fetched from the network with highest priority, and callback will be called once the file is ready. callback must be specified, and will be called with a an Error (or null) and the file contents as a Buffer.
+
+      file.getBuffer(function (err, buffer) {
+        if (err) throw err
+        console.log(buffer) // <Buffer 00 98 00 01 01 00 00 00 50 ae 07 04 01 00 00 00 0a 00 00 00 00 00 00 00 78 ae 07 04 01 00 00 00 05 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ...>
+      })
+
+     */
+    getBuffer(callback: (err:Error, buffer:Buffer) => void):void;
+
+    /**
+     * Show the file in a the browser by appending it to the DOM. This is a powerful function that handles many file types like video (.mp4, .webm, .m4v, etc.), audio (.m4a, .mp3, .wav, etc.), images (.jpg, .gif, .png, etc.), and other file formats (.pdf, .md, .txt, etc.).
+
+    The file will be fetched from the network with highest priority and streamed into the page (if it's video or audio). In some cases, video or audio files will not be streamable because they're not in a format that the browser can stream so the file will be fully downloaded before being played. For other non-streamable file types like images and PDFs, the file will be downloaded then displayed.
+
+    rootElem is a container element (CSS selector or reference to DOM node) that the content will be shown in. A new DOM node will be created for the content and appended to rootElem.
+
+    callback will be called once the file is visible to the user. callback must be specified, and will be called with a an Error (or null) and the new DOM node that is displaying the content.
+
+    file.appendTo('#containerElement', function (err, elem) {
+      if (err) throw err // file failed to download or display in the DOM
+      console.log('New DOM node with the content', elem)
+    })
+
+     */
+    appendTo(rootElem:Element|string, callback?:(err:Error, elem:Element) => void):void;
+
+    /**
+     * Like file.appendTo but renders directly into given element (or CSS selector).
+     */
+    renderTo(elem:Element|string, callback?:(err:Error, elem:Element) => void):void;
+
+    /**
+     * Get a url which can be used in the browser to refer to the file.
+
+    The file will be fetched from the network with highest priority, and callback will be called once the file is ready. callback must be specified, and will be called with a an Error (or null) and the Blob URL (String).
+
+    file.getBlobURL(function (err, url) {
+      if (err) throw err
+      var a = document.createElement('a')
+      a.download = file.name
+      a.href = url
+      a.textContent = 'Download ' + file.name
+      document.body.appendChild(a)
+    })
+     */
+    getBlobURL(callback:(err:Error, url:string) => void):void;
+
+    /**
+     * Emitted when the file have been downloaded.
+     */
+    on(event: 'done', callback:()=>void): this;
+  }
+}
diff --git a/webtorrent/tsconfig.json b/webtorrent/tsconfig.json
new file mode 100644
index 0000000000..3685b6951b
--- /dev/null
+++ b/webtorrent/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "webtorrent-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/webtorrent/webtorrent-tests.ts b/webtorrent/webtorrent-tests.ts
index 5d3c9f7761..5493a895b2 100644
--- a/webtorrent/webtorrent-tests.ts
+++ b/webtorrent/webtorrent-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="webtorrent.d.ts" />
+
 
 import WebTorrent = require('webtorrent');
 import * as fs from 'fs';
diff --git a/webtorrent/webtorrent.d.ts b/webtorrent/webtorrent.d.ts
deleted file mode 100644
index 6dc007ae8d..0000000000
--- a/webtorrent/webtorrent.d.ts
+++ /dev/null
@@ -1,340 +0,0 @@
-// Type definitions for WebTorrent
-// Project: https://webtorrent.io/
-// Definitions by: Bazyli Brzóska <https://invent.life>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path='../node/node.d.ts' />
-/// <reference path='../parse-torrent/parse-torrent.d.ts' />
-
-declare namespace WebTorrent {
-  export interface ClientOptions {
-    dht?: boolean|Object,   // Enable DHT (default=true), or options object for DHT
-    maxConns?: number,      // Max number of connections per torrent (default=55)
-    nodeId?: string|Buffer, // DHT protocol node ID (default=randomly generated)
-    peerId?: string|Buffer, // Wire protocol peer ID (default=randomly generated)
-    rtcConfig?: Object,     // RTCPeerConnection configuration object (default=STUN only)
-    tracker?: boolean,      // Whether or not to enable trackers (default=true)
-    wrtc?: Object           // Custom webrtc implementation (in node, specify the [wrtc](https://www.npmjs.com/package/wrtc) package)
-  }
-
-  export interface TorrentOptions {
-    announce?: Array<string>,   // Torrent trackers to use (added to list in .torrent or magnet uri)
-    path?: string,   // Folder to download files to (default=`/tmp/webtorrent/`)
-    store?: Function // Custom chunk store (must follow [abstract-chunk-store](https://www.npmjs.com/package/abstract-chunk-store) API)
-  }
-
-  export interface ClientConstructor {
-    new (config?:ClientOptions):Client;
-  }
-
-  export interface Client extends NodeJS.EventEmitter, ClientConstructor {
-    on(event: string, listener: Function): this;
-
-    /**
-     * Start downloading a new torrent. Aliased as client.download.
-
-      torrentId can be one of:
-
-      * magnet uri (string)
-      * torrent file (buffer)
-      * info hash (hex string or buffer)
-      * parsed torrent (from parse-torrent)
-      * http/https url to a torrent file (string)
-      * filesystem path to a torrent file (string)
-
-      If ontorrent is specified, then it will be called when this torrent is ready to be used (i.e. metadata is available). Note: this is distinct from the 'torrent' event which will fire for all torrents.
-
-      If you want access to the torrent object immediately in order to listen to events as the metadata is fetched from the network, then use the return value of client.add. If you just want the file data, then use ontorrent or the 'torrent' event.
-     */
-    // add(torrentFileBufferOrMagnetUriOrPathOrInfoHash:string|Buffer|ParsedTorrent, opts?:TorrentOptions, onTorrentCallback?:(torrent:Torrent)=>void):Torrent;
-    add(magnetUriOrPathOrInfoHash:string, opts?:TorrentOptions, onTorrentCallback?:(torrent:Torrent)=>void):Torrent;
-    add(torrentFileOrInfoHash:Buffer, opts?:TorrentOptions, onTorrentCallback?:(torrent:Torrent)=>void):Torrent;
-    add(parsedTorrent:ParseTorrent.ParsedTorrent, opts?:TorrentOptions, onTorrentCallback?:(torrent:Torrent)=>void):Torrent;
-
-    add(magnetUriOrPathOrInfoHash:string, onTorrentCallback?:(torrent:Torrent)=>void):Torrent;
-    add(torrentFileOrInfoHash:Buffer, onTorrentCallback?:(torrent:Torrent)=>void):Torrent;
-    add(parsedTorrent:ParseTorrent.ParsedTorrent, onTorrentCallback?:(torrent:Torrent)=>void):Torrent;
-
-    /**
-     * Emitted when a torrent is ready to be used (i.e. metadata is available and store is ready). See the torrent section for more info on what methods a torrent has.
-     */
-    on(event:'torrent', callback:(torrent:Torrent)=>void): this;
-
-    /**
-     * Start seeding a new torrent.
-
-        input can be any of the following:
-
-        path to the file or folder on filesystem (string) (Node.js only)
-        W3C File object (from an <input> or drag and drop)
-        W3C FileList object (basically an array of File objects)
-        Node Buffer object (works in the browser)
-        Or, an array of string, File, or Buffer objects.
-
-        If opts is specified, it should contain the following types of options:
-
-        options for create-torrent (to allow configuration of the .torrent file that is created)
-        options for client.add (see above)
-        If onseed is specified, it will be called when the client has begun seeding the file.
-     */
-    seed(inputFileOrFolderPath:string, opts?:TorrentOptions|any, onSeed?:(torrent:Torrent)=>void):void;
-    seed(inputFile:File, opts?:TorrentOptions|any, onSeed?:(torrent:Torrent)=>void):void;
-    seed(inputFileList:FileList, opts?:TorrentOptions|any, onSeed?:(torrent:Torrent)=>void):void;
-    seed(inputBuffer:Buffer, opts?:TorrentOptions|any, onSeed?:(torrent:Torrent)=>void):void;
-    seed(inputBuffersFilesOrPaths:Array<string|File|Buffer>, opts?:TorrentOptions|any, onSeed?:(torrent:Torrent)=>void):void;
-
-    seed(inputFileOrFolderPath:string, onSeed?:(torrent:Torrent)=>void):void;
-    seed(inputFile:File, onSeed?:(torrent:Torrent)=>void):void;
-    seed(inputFileList:FileList, onSeed?:(torrent:Torrent)=>void):void;
-    seed(inputBuffer:Buffer, onSeed?:(torrent:Torrent)=>void):void;
-    seed(inputBuffersFilesOrPaths:Array<string|File|Buffer>, onSeed?:(torrent:Torrent)=>void):void;
-    //TODO: opts
-
-    /**
-     * Remove a torrent from the client. Destroy all connections to peers and delete all saved file data. If callback is specified, it will be called when file data is removed.
-     */
-    remove(torrentId:string, callback?:(err:Error)=>void):void;
-
-    /**
-     * Destroy the client, including all torrents and connections to peers. If callback is specified, it will be called when the client has gracefully closed.
-     */
-    destroy(callback?:(err:Error)=>void):void;
-
-    /**
-     * An array of all torrents in the client.
-     */
-    torrents:Array<Torrent>;
-
-    /**
-     * Returns the torrent with the given torrentId. Convenience method. Easier than searching through the client.torrents array. Returns null if no matching torrent found.
-     */
-    get(torrentId:string):Torrent;
-
-    /**
-     * Seed ratio for all torrents in the client.
-     */
-    ratio:number;
-  }
-
-  export interface Torrent extends NodeJS.EventEmitter {
-    on(event: string, listener: Function): this;
-
-    /**
-     * Get the info hash of the torrent.
-     */
-    infoHash:string;
-
-    /**
-     * Get the magnet URI of the torrent.
-     */
-    magnetURI:string;
-
-    /**
-     * An array of all files in the torrent. See the file section for more info on what methods the file has.
-     */
-    files:Array<InTorrentFile>;
-
-    /**
-     * The attached bittorrent-swarm instance.
-     */
-    swarm:any; // TODO: return type
-
-    /**
-     * Get total bytes received from peers (including invalid data).
-     */
-    recieved:number;
-
-    /**
-     * Get total bytes received from peers (excluding invalid data).
-     */
-    downloaded:number;
-
-    /**
-     * Get the time remaining in millis if downloading.
-     */
-    timeRemaining:number;
-
-    /**
-     * Get the total progress from 0 to 1.
-     */
-    progress:number;
-
-    /**
-     * Get the torrent ratio (seeded/downloaded).
-     */
-    ratio:number;
-
-    /**
-     * Returns the download speed.
-     */
-    downloadSpeed():number;
-
-    /**
-     * Returns the current upload speed.
-     */
-    uploadSpeed():number;
-
-    /**
-     * Get the torrent download location.
-     */
-    path:string;
-
-    /**
-     * Alias for client.remove(torrent).
-     */
-    destroy():void;
-
-    /**
-     * Adds a peer to the underlying bittorrent-swarm instance.
-
-    Returns true if peer was added, false if peer was blocked by the loaded blocklist.
-     */
-    addPeer(addr:string):boolean;
-
-    /**
-     * Selects a range of pieces to prioritize starting with start and ending with end (both inclusive) at the given priority. notify is an optional callback to be called when the selection is updated with new data.
-     */
-    select(start:number, end:number, priority?:number, notifyCallback?:() => void):void;
-
-    /**
-     * Deprioritizes a range of previously selected pieces.
-     */
-    deselect(start:number, end:number, priority:number):void;
-
-    /**
-     * Marks a range of pieces as critical priority to be downloaded ASAP. From start to end (both inclusive).
-     */
-    critical(start:number, end:number):void;
-
-    /**
-     * Create an http server to serve the contents of this torrent, dynamically fetching the needed torrent pieces to satisfy http requests. Range requests are supported.
-
-    Returns an http.Server instance (got from calling http.createServer). If opts is specified, it is passed to the http.createServer function.
-
-    Visiting the root of the server / will show a list of links to individual files. Access individual files at /<index> where <index> is the index in the torrent.files array (e.g. /0, /1, etc.)
-     */
-    createServer(opts?:any):any; // TODO: :http.Server;
-
-    /**
-     * Temporarily stop connecting to new peers. Note that this does not pause new incoming connections, nor does it pause the streams of existing connections or their wires.
-     */
-    pause():void;
-
-    /**
-     * Resume connecting to new peers.
-     */
-    resume():void;
-
-    /**
-     * Emitted when all the torrent's files have been downloaded.
-     */
-    on(event: 'done', callback:()=>void): this;
-
-    /**
-     * Emitted every time a new chunk of data arrives, it's useful for reporting the current torrent status.
-     */
-    on(event: 'download', callback:(chunkSize:number)=>void): this;
-
-    /**
-     * Emitted whenever a new peer is connected for this torrent. wire is an instance of bittorrent-protocol, which is a node.js-style duplex stream to the remote peer. This event can be used to specify custom BitTorrent protocol extensions.
-     */
-    on(event: 'wire', callback:(wire:any)=>void): this;
-  }
-
-  export interface InTorrentFile extends NodeJS.EventEmitter {
-    on(event: string, listener: Function): this;
-
-    /**
-     * File name, as specified by the torrent. Example: 'some-filename.txt'
-     */
-    name:string;
-
-    /**
-     * File path, as specified by the torrent. Example: 'some-folder/some-filename.txt'
-     */
-    path:string;
-
-    /**
-     * File length (in bytes), as specified by the torrent. Example: 12345
-     */
-    length:number;
-
-    /**
-     * Selects the file to be downloaded, but at a lower priority than files with streams. Useful if you know you need the file at a later stage.
-     */
-    select():void;
-
-    /**
-     * Deselects the file, which means it won't be downloaded unless someone creates a stream for it.
-     */
-    deselect():void;
-
-    /**
-     * Create a readable stream to the file. Pieces needed by the stream will be prioritized highly and fetched from the swarm first.
-     * You can pass opts to stream only a slice of a file.
-     * Both start and end bytes are inclusive.
-     */
-    createReadStream(opts?:{start:number, end:number}):NodeJS.ReadableStream;
-
-    /**
-     * Get the file contents as a Buffer.
-
-      The file will be fetched from the network with highest priority, and callback will be called once the file is ready. callback must be specified, and will be called with a an Error (or null) and the file contents as a Buffer.
-
-      file.getBuffer(function (err, buffer) {
-        if (err) throw err
-        console.log(buffer) // <Buffer 00 98 00 01 01 00 00 00 50 ae 07 04 01 00 00 00 0a 00 00 00 00 00 00 00 78 ae 07 04 01 00 00 00 05 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ...>
-      })
-
-     */
-    getBuffer(callback: (err:Error, buffer:Buffer) => void):void;
-
-    /**
-     * Show the file in a the browser by appending it to the DOM. This is a powerful function that handles many file types like video (.mp4, .webm, .m4v, etc.), audio (.m4a, .mp3, .wav, etc.), images (.jpg, .gif, .png, etc.), and other file formats (.pdf, .md, .txt, etc.).
-
-    The file will be fetched from the network with highest priority and streamed into the page (if it's video or audio). In some cases, video or audio files will not be streamable because they're not in a format that the browser can stream so the file will be fully downloaded before being played. For other non-streamable file types like images and PDFs, the file will be downloaded then displayed.
-
-    rootElem is a container element (CSS selector or reference to DOM node) that the content will be shown in. A new DOM node will be created for the content and appended to rootElem.
-
-    callback will be called once the file is visible to the user. callback must be specified, and will be called with a an Error (or null) and the new DOM node that is displaying the content.
-
-    file.appendTo('#containerElement', function (err, elem) {
-      if (err) throw err // file failed to download or display in the DOM
-      console.log('New DOM node with the content', elem)
-    })
-
-     */
-    appendTo(rootElem:Element|string, callback?:(err:Error, elem:Element) => void):void;
-
-    /**
-     * Like file.appendTo but renders directly into given element (or CSS selector).
-     */
-    renderTo(elem:Element|string, callback?:(err:Error, elem:Element) => void):void;
-
-    /**
-     * Get a url which can be used in the browser to refer to the file.
-
-    The file will be fetched from the network with highest priority, and callback will be called once the file is ready. callback must be specified, and will be called with a an Error (or null) and the Blob URL (String).
-
-    file.getBlobURL(function (err, url) {
-      if (err) throw err
-      var a = document.createElement('a')
-      a.download = file.name
-      a.href = url
-      a.textContent = 'Download ' + file.name
-      document.body.appendChild(a)
-    })
-     */
-    getBlobURL(callback:(err:Error, url:string) => void):void;
-
-    /**
-     * Emitted when the file have been downloaded.
-     */
-    on(event: 'done', callback:()=>void): this;
-  }
-}
-
-declare module "webtorrent" {
-  const webTorrentStatic:WebTorrent.ClientConstructor;
-  export = webTorrentStatic;
-}
diff --git a/webvr-api/index.d.ts b/webvr-api/index.d.ts
new file mode 100644
index 0000000000..881de68ece
--- /dev/null
+++ b/webvr-api/index.d.ts
@@ -0,0 +1,173 @@
+// Type definitions for WebVR API
+// Project: http://mozvr.github.io/webvr-spec/webvr.html
+// Definitions by: Toshiya Nakakura <https://github.com/nakakura>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="geometry-dom" />
+
+declare type VREye = string;
+
+declare namespace WebVRApi {
+    export interface VRFieldOfViewReadOnly {
+        upDegrees: number;
+        rightDegrees: number;
+        downDegrees: number;
+        leftDegrees: number;
+    }
+
+    export interface VRFieldOfViewInit {
+        upDegrees: number;
+        rightDegrees: number;
+        downDegrees: number;
+        leftDegrees: number;
+    }
+
+    export interface VRFieldOfView extends VRFieldOfViewReadOnly {
+        constructor(upDegrees:number, rightDegrees:number, downDegrees:number, leftDegrees:number): VRFieldOfView;
+        upDegrees: number;
+        rightDegrees: number;
+        downDegrees: number;
+        leftDegrees: number;
+    }
+
+    export interface VRPositionState {
+        /**
+         * Monotonically increasing value that allows the author to determine if position state data been updated from the hardware.
+         */
+        timeStamp: number;
+        /**
+         * True if the position attribute is valid. If false position MUST be null.
+         */
+        hasPosition: boolean;
+        /**
+         * Position of the sensor at timeStamp as a 3D vector.
+         */
+        position?: GeometryDom.DOMPoint;
+        /**
+         * Linear velocity of the sensor at timeStamp.
+         */
+        linearVelocity?: GeometryDom.DOMPoint;
+        /**
+         * Linear acceleration of the sensor at timeStamp.
+         */
+        linearAcceleration?: GeometryDom.DOMPoint;
+        /**
+         * True if the orientation attribute is valid. If false orientation MUST be null.
+         */
+        hasOrientation: boolean;
+        /**
+         * Orientation of the sensor at timeStamp as a quaternion.
+         */
+        orientation?: GeometryDom.DOMPoint;
+        /**
+         * Angular velocity of the sensor at timeStamp.
+         */
+        angularVelocity?: GeometryDom.DOMPoint;
+        /**
+         * Angular acceleration of the sensor at timeStamp.
+         */
+        angularAcceleration?: GeometryDom.DOMPoint;
+    }
+
+    export interface VREyeParameters {
+        /**
+         * Describes the minimum supported field of view for the eye.
+         */
+        minimumFieldOfView: VRFieldOfView;
+        /**
+         * Describes the maximum supported field of view for the eye.
+         */
+        maximumFieldOfView: VRFieldOfView;
+        /**
+         * Describes the recommended field of view for the eye.
+         */
+        recommendedFieldOfView: VRFieldOfView;
+        /**
+         * Offset from the center of the users head to the eye in meters.
+         */
+        eyeTranslation: GeometryDom.DOMPoint;
+        /**
+         * The current field of view for the eye, as specified by setFieldOfView.
+         */
+        currentFieldOfView: VRFieldOfView;
+        /**
+         * Describes the viewport of a canvas into which visuals for this eye should be rendered.
+         */
+        renderRect: GeometryDom.DOMRect;
+    }
+
+    export interface VRDevice {
+        /**
+         * An identifier for the distinct hardware unit that this VRDevice is a part of.
+         */
+        hardwareUnitId: string;
+        /**
+         * An identifier for this distinct sensor/device on a physical hardware device.
+         */
+        deviceId: string;
+        /**
+         * A user-readable name identifying the device.
+         */
+        deviceName: string;
+    }
+}
+
+declare class HMDVRDevice implements WebVRApi.VRDevice {
+    /**
+     * An identifier for the distinct hardware unit that this VRDevice is a part of.
+     */
+    hardwareUnitId: string;
+    /**
+     * An identifier for this distinct sensor/device on a physical hardware device.
+     */
+    deviceId: string;
+    /**
+     * A user-readable name identifying the device.
+     */
+    deviceName: string;
+
+    /**
+     * Return the current VREyeParameters for the given eye.
+     */
+    getEyeParameters(whichEye: VREye): WebVRApi.VREyeParameters;
+    /**
+     * Set the field of view for both eyes. If
+     */
+    setFieldOfView(leftFOV?: WebVRApi.VRFieldOfViewInit, rightFOV?: WebVRApi.VRFieldOfViewInit, zNear?: number, zFar?: number): void;
+}
+
+declare class PositionSensorVRDevice implements WebVRApi.VRDevice {
+    /**
+     * An identifier for the distinct hardware unit that this VRDevice is a part of.
+     */
+    hardwareUnitId: string;
+    /**
+     * An identifier for this distinct sensor/device on a physical hardware device.
+     */
+    deviceId: string;
+    /**
+     * A user-readable name identifying the device.
+     */
+    deviceName: string;
+
+    /**
+     * Return a VRPositionState dictionary containing the state of this position sensor state for the current frame (if within a requestAnimationFrame context) or for the previous frame.
+     */
+    getState(): WebVRApi.VRPositionState;
+    /**
+     * Return the current instantaneous sensor state.
+     */
+    getImmediateState(): WebVRApi.VRPositionState;
+
+    /**
+     * Reset this sensor, treating its current position and orientation yaw as the "origin/zero" values.
+     */
+    resetSensor(): void;
+}
+
+interface Navigator {
+    /**
+     * Return a Promise which resolves to a list of available VRDevices.
+     */
+    getVRDevices(): Promise<Array<WebVRApi.VRDevice>>;
+}
diff --git a/webvr-api/tsconfig.json b/webvr-api/tsconfig.json
new file mode 100644
index 0000000000..db2a6c3d17
--- /dev/null
+++ b/webvr-api/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "webvr-api-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/webvr-api/webvr-api-tests.ts b/webvr-api/webvr-api-tests.ts
index df2a72438a..fd685640fd 100644
--- a/webvr-api/webvr-api-tests.ts
+++ b/webvr-api/webvr-api-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./webvr-api.d.ts" />
+
 
 function fieldOfViewToProjectionMatrix(fov: WebVRApi.VRFieldOfView, zNear: number, zFar: number) {
     var upTan = Math.tan(fov.upDegrees * Math.PI/180.0);
diff --git a/webvr-api/webvr-api.d.ts b/webvr-api/webvr-api.d.ts
deleted file mode 100644
index 7915f9fcff..0000000000
--- a/webvr-api/webvr-api.d.ts
+++ /dev/null
@@ -1,173 +0,0 @@
-// Type definitions for WebVR API
-// Project: http://mozvr.github.io/webvr-spec/webvr.html
-// Definitions by: Toshiya Nakakura <https://github.com/nakakura>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../geometry-dom/geometry-dom.d.ts" />
-
-declare type VREye = string;
-
-declare namespace WebVRApi {
-    export interface VRFieldOfViewReadOnly {
-        upDegrees: number;
-        rightDegrees: number;
-        downDegrees: number;
-        leftDegrees: number;
-    }
-
-    export interface VRFieldOfViewInit {
-        upDegrees: number;
-        rightDegrees: number;
-        downDegrees: number;
-        leftDegrees: number;
-    }
-
-    export interface VRFieldOfView extends VRFieldOfViewReadOnly {
-        constructor(upDegrees:number, rightDegrees:number, downDegrees:number, leftDegrees:number): VRFieldOfView;
-        upDegrees: number;
-        rightDegrees: number;
-        downDegrees: number;
-        leftDegrees: number;
-    }
-
-    export interface VRPositionState {
-        /**
-         * Monotonically increasing value that allows the author to determine if position state data been updated from the hardware.
-         */
-        timeStamp: number;
-        /**
-         * True if the position attribute is valid. If false position MUST be null.
-         */
-        hasPosition: boolean;
-        /**
-         * Position of the sensor at timeStamp as a 3D vector.
-         */
-        position?: GeometryDom.DOMPoint;
-        /**
-         * Linear velocity of the sensor at timeStamp.
-         */
-        linearVelocity?: GeometryDom.DOMPoint;
-        /**
-         * Linear acceleration of the sensor at timeStamp.
-         */
-        linearAcceleration?: GeometryDom.DOMPoint;
-        /**
-         * True if the orientation attribute is valid. If false orientation MUST be null.
-         */
-        hasOrientation: boolean;
-        /**
-         * Orientation of the sensor at timeStamp as a quaternion.
-         */
-        orientation?: GeometryDom.DOMPoint;
-        /**
-         * Angular velocity of the sensor at timeStamp.
-         */
-        angularVelocity?: GeometryDom.DOMPoint;
-        /**
-         * Angular acceleration of the sensor at timeStamp.
-         */
-        angularAcceleration?: GeometryDom.DOMPoint;
-    }
-
-    export interface VREyeParameters {
-        /**
-         * Describes the minimum supported field of view for the eye.
-         */
-        minimumFieldOfView: VRFieldOfView;
-        /**
-         * Describes the maximum supported field of view for the eye.
-         */
-        maximumFieldOfView: VRFieldOfView;
-        /**
-         * Describes the recommended field of view for the eye.
-         */
-        recommendedFieldOfView: VRFieldOfView;
-        /**
-         * Offset from the center of the users head to the eye in meters.
-         */
-        eyeTranslation: GeometryDom.DOMPoint;
-        /**
-         * The current field of view for the eye, as specified by setFieldOfView.
-         */
-        currentFieldOfView: VRFieldOfView;
-        /**
-         * Describes the viewport of a canvas into which visuals for this eye should be rendered.
-         */
-        renderRect: GeometryDom.DOMRect;
-    }
-
-    export interface VRDevice {
-        /**
-         * An identifier for the distinct hardware unit that this VRDevice is a part of.
-         */
-        hardwareUnitId: string;
-        /**
-         * An identifier for this distinct sensor/device on a physical hardware device.
-         */
-        deviceId: string;
-        /**
-         * A user-readable name identifying the device.
-         */
-        deviceName: string;
-    }
-}
-
-declare class HMDVRDevice implements WebVRApi.VRDevice {
-    /**
-     * An identifier for the distinct hardware unit that this VRDevice is a part of.
-     */
-    hardwareUnitId: string;
-    /**
-     * An identifier for this distinct sensor/device on a physical hardware device.
-     */
-    deviceId: string;
-    /**
-     * A user-readable name identifying the device.
-     */
-    deviceName: string;
-
-    /**
-     * Return the current VREyeParameters for the given eye.
-     */
-    getEyeParameters(whichEye: VREye): WebVRApi.VREyeParameters;
-    /**
-     * Set the field of view for both eyes. If
-     */
-    setFieldOfView(leftFOV?: WebVRApi.VRFieldOfViewInit, rightFOV?: WebVRApi.VRFieldOfViewInit, zNear?: number, zFar?: number): void;
-}
-
-declare class PositionSensorVRDevice implements WebVRApi.VRDevice {
-    /**
-     * An identifier for the distinct hardware unit that this VRDevice is a part of.
-     */
-    hardwareUnitId: string;
-    /**
-     * An identifier for this distinct sensor/device on a physical hardware device.
-     */
-    deviceId: string;
-    /**
-     * A user-readable name identifying the device.
-     */
-    deviceName: string;
-
-    /**
-     * Return a VRPositionState dictionary containing the state of this position sensor state for the current frame (if within a requestAnimationFrame context) or for the previous frame.
-     */
-    getState(): WebVRApi.VRPositionState;
-    /**
-     * Return the current instantaneous sensor state.
-     */
-    getImmediateState(): WebVRApi.VRPositionState;
-
-    /**
-     * Reset this sensor, treating its current position and orientation yaw as the "origin/zero" values.
-     */
-    resetSensor(): void;
-}
-
-interface Navigator {
-    /**
-     * Return a Promise which resolves to a list of available VRDevices.
-     */
-    getVRDevices(): Promise<Array<WebVRApi.VRDevice>>;
-}
diff --git a/whatwg-fetch/index.d.ts b/whatwg-fetch/index.d.ts
new file mode 100644
index 0000000000..32e681bb9b
--- /dev/null
+++ b/whatwg-fetch/index.d.ts
@@ -0,0 +1,89 @@
+// Type definitions for fetch API
+// Project: https://github.com/github/fetch
+// Definitions by: Ryan Graham <https://github.com/ryan-codingintrigue>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class Request extends Body {
+	constructor(input: string|Request, init?:RequestInit);
+	method: string;
+	url: string;
+	headers: Headers;
+	context: RequestContext;
+	referrer: string;
+	mode: RequestMode;
+	credentials: RequestCredentials;
+	cache: RequestCache;
+}
+
+interface RequestInit {
+	method?: string;
+	headers?: HeaderInit|{ [index: string]: string };
+	body?: BodyInit;
+	mode?: RequestMode;
+	credentials?: RequestCredentials;
+	cache?: RequestCache;
+}
+
+type RequestContext =
+	"audio" | "beacon" | "cspreport" | "download" | "embed" |
+	"eventsource" | "favicon" | "fetch" | "font" | "form" | "frame" |
+	"hyperlink" | "iframe" | "image" | "imageset" | "import" |
+	"internal" | "location" | "manifest" | "object" | "ping" | "plugin" |
+	"prefetch" | "script" | "serviceworker" | "sharedworker" |
+	"subresource" | "style" | "track" | "video" | "worker" |
+	"xmlhttprequest" | "xslt";
+type RequestMode = "same-origin" | "no-cors" | "cors";
+type RequestCredentials = "omit" | "same-origin" | "include";
+type RequestCache =
+	"default" | "no-store" | "reload" | "no-cache" |
+	"force-cache" | "only-if-cached";
+
+declare class Headers {
+	append(name: string, value: string): void;
+	delete(name: string):void;
+	get(name: string): string;
+	getAll(name: string): Array<string>;
+	has(name: string): boolean;
+	set(name: string, value: string): void;
+	forEach(callback: (value: string, name: string) => void): void;
+}
+
+declare class Body {
+	bodyUsed: boolean;
+	arrayBuffer(): Promise<ArrayBuffer>;
+	blob(): Promise<Blob>;
+	formData(): Promise<FormData>;
+	json(): Promise<any>;
+	json<T>(): Promise<T>;
+	text(): Promise<string>;
+}
+declare class Response extends Body {
+	constructor(body?: BodyInit, init?: ResponseInit);
+	static error(): Response;
+	static redirect(url: string, status: number): Response;
+	type: ResponseType;
+	url: string;
+	status: number;
+	ok: boolean;
+	statusText: string;
+	headers: Headers;
+	clone(): Response;
+}
+
+type ResponseType = "basic" | "cors" | "default" | "error" | "opaque";
+
+interface ResponseInit {
+	status: number;
+	statusText?: string;
+	headers?: HeaderInit;
+}
+
+declare type HeaderInit = Headers|Array<string>;
+declare type BodyInit = Blob|FormData|string;
+declare type RequestInfo = Request|string;
+
+interface Window {
+	fetch(url: string|Request, init?: RequestInit): Promise<Response>;
+}
+
+declare var fetch: typeof window.fetch;
diff --git a/whatwg-fetch/tsconfig.json b/whatwg-fetch/tsconfig.json
new file mode 100644
index 0000000000..36ae7b860e
--- /dev/null
+++ b/whatwg-fetch/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "whatwg-fetch-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/whatwg-fetch/whatwg-fetch-tests.ts b/whatwg-fetch/whatwg-fetch-tests.ts
index 32e5b73a6d..10570b9c26 100644
--- a/whatwg-fetch/whatwg-fetch-tests.ts
+++ b/whatwg-fetch/whatwg-fetch-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="whatwg-fetch.d.ts" />
+
 
 function test_fetchUrlWithOptions() {
 	var headers = new Headers();
diff --git a/whatwg-fetch/whatwg-fetch.d.ts b/whatwg-fetch/whatwg-fetch.d.ts
deleted file mode 100644
index e2d781081d..0000000000
--- a/whatwg-fetch/whatwg-fetch.d.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-// Type definitions for fetch API
-// Project: https://github.com/github/fetch
-// Definitions by: Ryan Graham <https://github.com/ryan-codingintrigue>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare class Request extends Body {
-	constructor(input: string|Request, init?:RequestInit);
-	method: string;
-	url: string;
-	headers: Headers;
-	context: RequestContext;
-	referrer: string;
-	mode: RequestMode;
-	credentials: RequestCredentials;
-	cache: RequestCache;
-}
-
-interface RequestInit {
-	method?: string;
-	headers?: HeaderInit|{ [index: string]: string };
-	body?: BodyInit;
-	mode?: RequestMode;
-	credentials?: RequestCredentials;
-	cache?: RequestCache;
-}
-
-type RequestContext =
-	"audio" | "beacon" | "cspreport" | "download" | "embed" |
-	"eventsource" | "favicon" | "fetch" | "font" | "form" | "frame" |
-	"hyperlink" | "iframe" | "image" | "imageset" | "import" |
-	"internal" | "location" | "manifest" | "object" | "ping" | "plugin" |
-	"prefetch" | "script" | "serviceworker" | "sharedworker" |
-	"subresource" | "style" | "track" | "video" | "worker" |
-	"xmlhttprequest" | "xslt";
-type RequestMode = "same-origin" | "no-cors" | "cors";
-type RequestCredentials = "omit" | "same-origin" | "include";
-type RequestCache =
-	"default" | "no-store" | "reload" | "no-cache" |
-	"force-cache" | "only-if-cached";
-
-declare class Headers {
-	append(name: string, value: string): void;
-	delete(name: string):void;
-	get(name: string): string;
-	getAll(name: string): Array<string>;
-	has(name: string): boolean;
-	set(name: string, value: string): void;
-	forEach(callback: (value: string, name: string) => void): void;
-}
-
-declare class Body {
-	bodyUsed: boolean;
-	arrayBuffer(): Promise<ArrayBuffer>;
-	blob(): Promise<Blob>;
-	formData(): Promise<FormData>;
-	json(): Promise<any>;
-	json<T>(): Promise<T>;
-	text(): Promise<string>;
-}
-declare class Response extends Body {
-	constructor(body?: BodyInit, init?: ResponseInit);
-	error(): Response;
-	redirect(url: string, status: number): Response;
-	type: ResponseType;
-	url: string;
-	status: number;
-	ok: boolean;
-	statusText: string;
-	headers: Headers;
-	clone(): Response;
-}
-
-type ResponseType = "basic" | "cors" | "default" | "error" | "opaque";
-
-interface ResponseInit {
-	status: number;
-	statusText?: string;
-	headers?: HeaderInit;
-}
-
-declare type HeaderInit = Headers|Array<string>;
-declare type BodyInit = Blob|FormData|string;
-declare type RequestInfo = Request|string;
-
-interface Window {
-	fetch(url: string|Request, init?: RequestInit): Promise<Response>;
-}
-
-declare var fetch: typeof window.fetch;
diff --git a/when/when.d.ts b/when/index.d.ts
similarity index 100%
rename from when/when.d.ts
rename to when/index.d.ts
diff --git a/when/tsconfig.json b/when/tsconfig.json
new file mode 100644
index 0000000000..f5d4ad28f6
--- /dev/null
+++ b/when/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "when-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/when/when-tests.ts b/when/when-tests.ts
index cdf252de88..9ae3416b1f 100644
--- a/when/when-tests.ts
+++ b/when/when-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="../node/node.d.ts" />
-/// <reference path="when.d.ts" />
+/// <reference types="node" />
+
 
 import fs = require('fs');
 import dns = require('dns');
diff --git a/which/index.d.ts b/which/index.d.ts
new file mode 100644
index 0000000000..1fcfbc60e3
--- /dev/null
+++ b/which/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for which 1.0.8
+// Project: https://github.com/isaacs/node-which
+// Definitions by: vvakame <https://github.com/vvakame>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare function when(cmd: string, cb: (err: Error, path: string) => void): void;
+declare namespace when {
+    function sync(cmd: string): string;
+}
+
+export = when;
diff --git a/which/tsconfig.json b/which/tsconfig.json
new file mode 100644
index 0000000000..1eaeb88852
--- /dev/null
+++ b/which/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "which-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/which/which-tests.ts b/which/which-tests.ts
index 45a376dcb3..68cd2c03ac 100644
--- a/which/which-tests.ts
+++ b/which/which-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./which.d.ts" />
 
 import which = require("which");
 
diff --git a/which/which.d.ts b/which/which.d.ts
deleted file mode 100644
index 56d235d251..0000000000
--- a/which/which.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Type definitions for which 1.0.8
-// Project: https://github.com/isaacs/node-which
-// Definitions by: vvakame <https://github.com/vvakame>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "which" {
-  function when (cmd: string, cb: (err: Error, path: string) => void): void;
-  namespace when {
-    function sync(cmd: string): string;
-  }
-
-  export = when;
-}
diff --git a/wiiu/wiiu.d.ts b/wiiu/index.d.ts
similarity index 100%
rename from wiiu/wiiu.d.ts
rename to wiiu/index.d.ts
diff --git a/wiiu/tsconfig.json b/wiiu/tsconfig.json
new file mode 100644
index 0000000000..d432f6235a
--- /dev/null
+++ b/wiiu/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "wiiu-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/wiiu/wiiu-tests.ts b/wiiu/wiiu-tests.ts
index 0417e252a0..bfb65248ac 100644
--- a/wiiu/wiiu-tests.ts
+++ b/wiiu/wiiu-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./wiiu.d.ts" />
+
 
 var state = window.wiiu.gamepad.update();
 if( !state.isEnabled || !state.isDataValid ){
diff --git a/windows-1251/index.d.ts b/windows-1251/index.d.ts
new file mode 100644
index 0000000000..0a90439090
--- /dev/null
+++ b/windows-1251/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for windows-1251 v0.1.2
+// Project: https://github.com/mathiasbynens/windows-1251
+// Definitions by: RomanGolovanov <https://github.com/RomanGolovanov>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var windows1251: {
+    encode(input:string, options?:{ mode?: windows1251.EncoderMode }):string;
+    decode(text: string, options?:{ mode?: windows1251.DecoderMode }): string;
+    version: string;
+    labels: string[];
+}
+
+export = windows1251;
+export as namespace windows1251;
+
+declare namespace windows1251 {
+
+    type EncoderMode = 'fatal' | 'html';
+    type DecoderMode = 'replacement' | 'fatal';
+
+    interface windows1251 {
+        encode(input:string, options?:{ mode?: EncoderMode }):string;
+        decode(text: string, options?:{ mode?: DecoderMode }): string;
+    }
+
+}
diff --git a/windows-1251/tsconfig.json b/windows-1251/tsconfig.json
new file mode 100644
index 0000000000..6d47703d58
--- /dev/null
+++ b/windows-1251/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "windows-1251-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/windows-1251/windows-1251-tests.ts b/windows-1251/windows-1251-tests.ts
index ec231c6ef2..29f768fc4b 100644
--- a/windows-1251/windows-1251-tests.ts
+++ b/windows-1251/windows-1251-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path='windows-1251.d.ts' />
-
 import * as windows1251 from 'windows-1251';
 
 var text:string = "some text", byteString:string, decodedText:string;
diff --git a/windows-1251/windows-1251.d.ts b/windows-1251/windows-1251.d.ts
deleted file mode 100644
index 48883637bd..0000000000
--- a/windows-1251/windows-1251.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// Type definitions for windows-1251 v0.1.2
-// Project: https://github.com/mathiasbynens/windows-1251
-// Definitions by: RomanGolovanov <https://github.com/RomanGolovanov>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-declare namespace windows1251 {
-
-    type EncoderMode = 'fatal' | 'html';
-    type DecoderMode = 'replacement' | 'fatal';
-
-    interface windows1251 {
-        encode(input:string, options?:{ mode?: EncoderMode }):string;
-        decode(text: string, options?:{ mode?: DecoderMode }): string;
-    }
-
-}
-
-declare module 'windows-1251' {
-    var windows1251: {
-        encode(input:string, options?:{ mode?: windows1251.EncoderMode }):string;
-        decode(text: string, options?:{ mode?: windows1251.DecoderMode }): string;
-        version: string;
-        labels: string[];
-    }
-
-    export = windows1251;
-}
diff --git a/windows-service/index.d.ts b/windows-service/index.d.ts
new file mode 100644
index 0000000000..5792c2191f
--- /dev/null
+++ b/windows-service/index.d.ts
@@ -0,0 +1,73 @@
+// Type definitions for windows-service 1.0.4
+// Project: https://bitbucket.org/stephenwvickers/node-windows-service
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import stream = require("stream");
+
+/**
+ * Options for the add() function.
+ */
+export interface AddOptions {
+    /**
+     * The services display name, defaults to the name parameter
+     */
+    displayName?: string;
+    /**
+     * The fully qualified path to the node binary used to run the service (i.e. c:\Program Files\nodejs\node.exe, defaults to the value of process.execPath
+     */
+    nodePath?: string;
+    /**
+     * An array of strings specifying parameters to pass to nodePath, defaults to []
+     */
+    nodeArgs?: string[];
+    /**
+     * The program to run using nodePath, defaults to the value of process.argv[1]
+     */
+    programPath?: string;
+    /**
+     * An array of strings specifying parameters to pass to programPath, defaults to []
+     */
+    programArgs?: string[];
+}
+
+/**
+ * The add() function adds a Windows service. The service will be set to automatically start at boot time, but not started.
+ * The service can be started using the net start "My Service" command. An exception will be thrown if the service could
+ * not be added. The error will be an instance of the Error class.
+ *
+ * @param name The name parameter specifies the name of the created service.
+ * @param opts Options
+ */
+export declare function add(name: string, opts?: AddOptions): void;
+
+
+/**
+ * The remove() function removes a Windows service.
+ * The name parameter specifies the name of the service to remove. This will be the same name parameter specified when adding the service.
+ * The service must be in a stopped state for it to be removed. The net stop "My Service" command can be used to stop the service before
+ * it is to be removed.
+ * An exception will be thrown if the service could not be removed. The error will be an instance of the Error class.
+ */
+export declare function remove(name: string): void;
+
+/**
+ * The run() function will connect the calling program to the Windows Service Control Manager, allowing the program to run as a Windows service.
+ * The programs process.stdout stream will be replaced with the stdoutLogStream parameter, and the programs process.stderr stream replaced with
+ * the stdoutLogStream parameter (this allows the redirection of all console.log() type calls to a service specific log file). If the stderrLogStream
+ * parameter is not specified the programs process.stderr stream will be replaced with the stdoutLogStream parameter. The callback function will be
+ * called when the service receives a stop request, e.g. because the Windows Service Controller was used to send a stop request to the service.
+ * The program should perform cleanup tasks and then call the service.stop() function.
+ */
+export declare function run(stdoutLogStream: stream.Writable, callback: () => void): void;
+export declare function run(stdoutLogStream: stream.Writable, stderrLogStream: stream.Writable, callback: () => void): void;
+
+/**
+ * The stop() function will cause the service to stop, and the calling program to exit.
+ * Once the service has been stopped this function will terminate the program by calling the process.exit() function, passing to it the rcode
+ * parameter which defaults to 0. Before calling this function ensure the program has finished performing cleanup tasks.
+ * BE AWARE, THIS FUNCTION WILL NOT RETURN.
+ */
+export declare function stop(rcode?: number): void;
diff --git a/windows-service/tsconfig.json b/windows-service/tsconfig.json
new file mode 100644
index 0000000000..074e366d79
--- /dev/null
+++ b/windows-service/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "windows-service-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/windows-service/windows-service-tests.ts b/windows-service/windows-service-tests.ts
index 52ed0d91e4..662b7fef1a 100644
--- a/windows-service/windows-service-tests.ts
+++ b/windows-service/windows-service-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="windows-service.d.ts" />
 
 import stream = require("stream");
 import service = require("windows-service");
diff --git a/windows-service/windows-service.d.ts b/windows-service/windows-service.d.ts
deleted file mode 100644
index 3d670f585d..0000000000
--- a/windows-service/windows-service.d.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-// Type definitions for windows-service 1.0.4
-// Project: https://bitbucket.org/stephenwvickers/node-windows-service
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-declare module "windows-service" {
-	import stream = require("stream");
-
-	/**
-	 * Options for the add() function.
-	 */
-	export interface AddOptions {
-		/**
-		 * The services display name, defaults to the name parameter
-		 */
-		displayName?: string;
-		/**
-		 * The fully qualified path to the node binary used to run the service (i.e. c:\Program Files\nodejs\node.exe, defaults to the value of process.execPath
-		 */
-		nodePath?: string;
-		/**
-		 * An array of strings specifying parameters to pass to nodePath, defaults to []
-		 */
-		nodeArgs?: string[];
-		/**
-		 * The program to run using nodePath, defaults to the value of process.argv[1]
-		 */
-		programPath?: string;
-		/**
-		 * An array of strings specifying parameters to pass to programPath, defaults to []
-		 */
-		programArgs?: string[];
-	}
-
-	/**
-	 * The add() function adds a Windows service. The service will be set to automatically start at boot time, but not started.
-	 * The service can be started using the net start "My Service" command. An exception will be thrown if the service could
-	 * not be added. The error will be an instance of the Error class.
-	 *
-	 * @param name The name parameter specifies the name of the created service.
-	 * @param opts Options
-	 */
-	export function add(name: string, opts?: AddOptions): void;
-
-
-	/**
-	 * The remove() function removes a Windows service.
-	 * The name parameter specifies the name of the service to remove. This will be the same name parameter specified when adding the service.
-	 * The service must be in a stopped state for it to be removed. The net stop "My Service" command can be used to stop the service before
-	 * it is to be removed.
-	 * An exception will be thrown if the service could not be removed. The error will be an instance of the Error class.
-	 */
-	export function remove(name: string): void;
-
-	/**
-	 * The run() function will connect the calling program to the Windows Service Control Manager, allowing the program to run as a Windows service.
-	 * The programs process.stdout stream will be replaced with the stdoutLogStream parameter, and the programs process.stderr stream replaced with
-	 * the stdoutLogStream parameter (this allows the redirection of all console.log() type calls to a service specific log file). If the stderrLogStream
-	 * parameter is not specified the programs process.stderr stream will be replaced with the stdoutLogStream parameter. The callback function will be
-	 * called when the service receives a stop request, e.g. because the Windows Service Controller was used to send a stop request to the service.
-	 * The program should perform cleanup tasks and then call the service.stop() function.
-	 */
-	export function run(stdoutLogStream: stream.Writable, callback: () => void): void;
-	export function run(stdoutLogStream: stream.Writable, stderrLogStream: stream.Writable, callback: () => void): void;
-
-	/**
-	 * The stop() function will cause the service to stop, and the calling program to exit.
-	 * Once the service has been stopped this function will terminate the program by calling the process.exit() function, passing to it the rcode
-	 * parameter which defaults to 0. Before calling this function ensure the program has finished performing cleanup tasks.
-	 * BE AWARE, THIS FUNCTION WILL NOT RETURN.
-	 */
-	export function stop(rcode?: number): void;
-}
diff --git a/winjs/index.d.ts b/winjs/index.d.ts
new file mode 100644
index 0000000000..4903936fac
--- /dev/null
+++ b/winjs/index.d.ts
@@ -0,0 +1,10626 @@
+// Type definitions for WinJS
+// Project: http://try.buildwinjs.com/
+// Definitions by: TypeScript samples <https://www.typescriptlang.org/>, Adam Hewitt <https://github.com/adamhewitt627>, Craig Treasure <https://github.com/craigktreasure>, Jeff Fisher <https://github.com/xirzec>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ""Software""), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+***************************************************************************** */
+
+/**
+ * Defines an Element object.
+**/
+interface Element {
+    winControl: any;
+}
+
+/**
+ * Utility class for easy access to operations on application folders
+**/
+interface IOHelper {
+    /**
+     * Determines whether the specified file exists in the folder.
+     * @param filename The name of the file.
+     * @returns A promise that completes with a value of either true (if the file exists) or false.
+    **/
+    exists(filename: string): WinJS.Promise<boolean>;
+
+    /**
+     * Reads the specified file. If the file doesn't exist, the specified default value is returned.
+     * @param fileName The file to read from.
+     * @param def The default value to be returned if the file failed to open.
+     * @returns A promise that completes with a value that is either the contents of the file, or the specified default value.
+     **/
+    readText(fileName: string, def?: string): WinJS.Promise<string>;
+
+    /**
+     * Deletes a file from the folder.
+     * @param fileName The file to be deleted.
+     * @returns A promise that is fulfilled when the file has been deleted.
+    **/
+    remove(fileName: string): WinJS.Promise<void>;
+
+    /**
+     * Writes the specified text to the specified file.
+     * @param fileName The name of the file.
+     * @param text The content to be written to the file.
+     * @returns A promise that is completed when the file has been written.
+     **/
+    writeText(fileName: string, text: string): WinJS.Promise<number>;
+
+    /**
+     * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+    **/
+    storage: any;
+}
+
+/**
+ * Provides application-level functionality, for example activation, storage, and application events.
+**/
+declare namespace WinJS.Application {
+    //#region Objects
+
+    /**
+     * The local storage of the application.
+    **/
+    var local: IOHelper;
+
+    /**
+     * The roaming storage of the application.
+    **/
+    var roaming: IOHelper;
+
+    /**
+     * The temp storage of the application.
+    **/
+    var temp: IOHelper;
+
+    /**
+     * An object used for storing app information that can be used to restore the app's state after it has been suspended and then resumed. Data that can usefully be contained in this object includes the current navigation page or any information the user has added to the input controls on the page. You should not add information about customization (for example colors) or user-defined lists of content.
+    **/
+    var sessionState: any;
+
+    //#endregion Objects
+
+    //#region Functions
+
+    /**
+     * Adds an event listener for application-level events: activated, checkpoint, error, loaded, ready, settings, and unload.
+     * @param type The type (name) of the event. You can use any of the following:"activated", "checkpoint", "error", "loaded", "ready", "settings", and" unload".
+     * @param listener The listener to invoke when the event is raised.
+     * @param capture true to initiate capture, otherwise false.
+    **/
+    function addEventListener(type: string, listener: Function, capture?: boolean): void;
+
+    /**
+     * Queues a checkpoint event.
+    **/
+    function checkpoint(): void;
+
+    /**
+     * Queues an event to be processed by the WinJS.Application event queue.
+     * @param eventRecord The event object is expected to have a type property that is used as the event name when dispatching on the WinJS.Application event queue. The entire object is provided to event listeners in the detail property of the event.
+    **/
+    function queueEvent(eventRecord: any): void;
+
+    /**
+     * Removes an event listener from the control.
+     * @param type The type (name) of the event.
+     * @param listener The listener to remove.
+     * @param useCapture Specifies whether or not to initiate capture.
+    **/
+    function removeEventListener(type: string, listener: Function, useCapture?: any): void;
+
+    /**
+     * Starts dispatching application events (the activated, checkpoint, error, loaded, ready, settings, and unload events).
+    **/
+    function start(): void;
+
+    /**
+     * Stops application event processing and resets WinJS.Application to its initial state. All WinJS.Application event listeners (for the activated, checkpoint, error, loaded, ready, settings, and unload events) are removed.
+    **/
+    function stop(): void;
+
+    //#endregion Functions
+
+    //#region Events
+
+    interface IPromiseEvent extends CustomEvent {
+        /**
+         * Informs the application object that asynchronous work is being performed, and that this event handler should not be considered complete until the promise completes. This function can be set inside the handlers for all WinJS.Application events: onactivated oncheckpoint onerror onloaded onready onsettings onunload.
+         * @param promise The promise that should complete before processing is complete.
+        **/
+        setPromise(promise: IPromise<any>): void;
+    }
+
+    /**
+     * Occurs when WinRT activation has occurred. The name of this event is "activated" (and also "mainwindowactivated"). This event occurs after the loaded event and before the ready event.
+     * @param eventInfo An object that contains information about the event. For more information about event arguments, see the WinRT event argument classes: WebUICachedFileUpdaterActivatedEventArgs, WebUICameraSettingsActivatedEventArgs, WebUIContactPickerActivatedEventArgs, WebUIDeviceActivatedEventArgs, WebUIFileActivatedEventArgs, WebUIFileOpenPickerActivatedEventArgs, WebUIFileSavePickerActivatedEventArgs, WebUILaunchActivatedEventArgs, WebUIPrintTaskSettingsActivatedEventArgs, WebUIProtocolActivatedEventArgs, WebUISearchActivatedEventArgs, WebUIShareTargetActivatedEventArgs.
+    **/
+    function onactivated(eventInfo: IPromiseEvent): void;
+
+    /**
+     * Occurs when receiving PLM notification or when the checkpoint function is called.
+     * @param eventInfo An object that contains information about the event. The detail property of this object includes the following subproperties: type, setPromise.
+    **/
+    function oncheckpoint(eventInfo: IPromiseEvent): void;
+
+    /**
+     * Occurs when an unhandled error has been raised.
+     * @param eventInfo An object that contains information about the event.
+    **/
+    function onerror(eventInfo: IPromiseEvent): void;
+
+    /**
+     * Occurs after the DOMContentLoaded event, which fires after the page has been parsed but before all the resources are loaded. This event occurs before the activated event and the ready event.
+     * @param eventInfo An object that contains information about the event. The detail property of this object includes the following subproperties: type, setPromise.
+    **/
+    function onloaded(eventInfo: IPromiseEvent): void;
+
+    /**
+     * Occurs when the application is ready. This event occurs after the loaded event and the activated event.
+     * @param eventInfo An object that contains information about the event. The detail property of this object includes the following sub-properties: type, setPromise.
+    **/
+    function onready(eventInfo: IPromiseEvent): void;
+
+    /**
+     * Occurs when the settings charm is invoked.
+     * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: type, applicationcommands.
+    **/
+    function onsettings(eventInfo: IPromiseEvent): void;
+
+    /**
+     * Occurs when the application is about to be unloaded.
+     * @param eventInfo An object that contains information about the event. The detail property of this object includes the following sub-properties: type, setPromise.
+    **/
+    function onunload(eventInfo: IPromiseEvent): void;
+
+    /**
+     * Occurs whenever a user clicks the hardware backbutton.
+     * @param eventInfo An object that contains information about the event. The detail property of this object includes the following sub-properties: type
+    **/
+    function onbackclick(eventInfo: IPromiseEvent): void;
+
+    //#endregion Events
+
+}
+/**
+ * Provides functionality for data and template binding.
+**/
+declare namespace WinJS.Binding {
+    //#region Properties
+
+    //#endregion Properties
+
+    //#region Objects
+
+    /**
+     * Allows you to add bindable properties dynamically.
+    **/
+    var dynamicObservableMixin: {
+        //#region Methods
+
+        /**
+         * Adds a property with change notification to this object, including a ECMAScript5 property definition.
+         * @param name The name of the property to add.
+         * @param value This object is returned.
+        **/
+        addProperty(name: string, value: any): void;
+
+        /**
+         * Links the specified action to the property specified in the name parameter. This function is invoked when the value of the property may have changed. It is not guaranteed that the action will be called only when a value has actually changed, nor is it guaranteed that the action will be called for every value change. The implementation of this function coalesces change notifications, such that multiple updates to a property value may result in only a single call to the specified action.
+         * @param name The name of the property to which to bind the action.
+         * @param action The function to invoke asynchronously when the property may have changed.
+         * @returns This object is returned.
+        **/
+        bind(name: string, action: any): Function;
+
+        /**
+         * Gets a property value by name.
+         * @param name The name of the property to get.
+         * @returns The value of the property as an observable object.
+        **/
+        getProperty(name: string): any;
+
+        /**
+         * Notifies listeners that a property value was updated.
+         * @param name The name of the property that is being updated.
+         * @param newValue The new value for the property.
+         * @param oldValue The old value for the property.
+         * @returns A promise that is completed when the notifications are complete.
+        **/
+        notify(name: string, newValue: string, oldValue: string): Promise<any>;
+
+        /**
+         * Removes a property value.
+         * @param name The name of the property to remove.
+         * @returns This object is returned.
+        **/
+        removeProperty(name: string): any;
+
+        /**
+         * Updates a property value and notifies any listeners.
+         * @param name The name of the property to update.
+         * @param value The new value of the property.
+         * @returns This object is returned.
+        **/
+        setProperty(name: string, value: any): any;
+
+        /**
+         * Removes one or more listeners from the notification list for a given property.
+         * @param name The name of the property to unbind. If this parameter is omitted, all listeners for all events are removed.
+         * @param action The function to remove from the listener list for the specified property. If this parameter is omitted, all listeners are removed for the specific property.
+         * @returns This object is returned.
+        **/
+        unbind(name: string, action: Function): any;
+
+        /**
+         * Updates a property value and notifies any listeners.
+         * @param name The name of the property to update.
+         * @param value The new value of the property.
+         * @returns A promise that completes when the notifications for this property change have been processed. If multiple notifications are coalesced, the promise may be canceled or the value of the promise may be updated. The fulfilled value of the promise is the new value of the property for which the notifications have been completed.
+        **/
+        updateProperty(name: string, value: any): Promise<any>;
+
+        //#endregion Methods
+
+    };
+
+    /**
+     * Do not instantiate. A list returned by the createFiltered method.
+    **/
+    interface FilteredListProjection<T> extends ListProjection<T> {
+        //#region Methods
+
+        /**
+         * Returns a key/data pair for the specified index.
+         * @param index The index of the value to retrieve.
+         * @returns An object that has two properties: key and data.
+        **/
+        getItem(index: number): IKeyDataPair<T>;
+
+        /**
+         * Returns the index of the first occurrence of a key in a list.
+         * @param key The key to locate in the list.
+         * @returns The index of the first occurrence of a key in a list, or -1 if not found.
+        **/
+        indexOfKey(key: string): number;
+
+        /**
+         * Forces the list to send a itemmutated notification to any listeners for the value at the specified index.
+         * @param index The index of the value that was mutated.
+        **/
+        notifyMutated(index: number): void;
+
+        /**
+         * Replaces the value at the specified index with a new value.
+         * @param index The index of the value that was replaced.
+         * @param newValue The new value.
+        **/
+        setAt(index: number, newValue: T): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * The length of the list. Returns an integer value one higher than the highest element defined in an list.
+        **/
+        length: number;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * A list of groups.
+    **/
+    interface GroupsListProjection<T> extends ListBase<T> {
+        //#region Methods
+
+        /**
+         * Gets a key/data pair for the specified index.
+         * @param index The index of the value to retrieve.
+         * @returns An object that has two properties: key and data.
+        **/
+        getItem(index: number): IKeyDataPair<T>;
+
+        /**
+         * Gets a key/data pair for the specified key.
+         * @param key The key of the value to retrieve.
+         * @returns An object with two properties: key and data.
+        **/
+        getItemFromKey(key: string): IKeyDataPair<T>;
+
+        /**
+         * Returns the index of the first occurrence of a key in a list.
+         * @param key The key to locate in the list.
+         * @returns The index of the first occurrence of a key in a list, or -1 if not found.
+        **/
+        indexOfKey(key: string): number;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * The length of the list. Returns an integer value one higher than the highest element defined in an list.
+        **/
+        length: number;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Do not instantiate. Sorts the underlying list by group key and within a group respects the position of the item in the underlying list. Returned by createGrouped.
+    **/
+    interface GroupedSortedListProjection<T, G> extends SortedListProjection<T> {
+        //#region Properties
+
+        /**
+         * Gets a List, which is a projection of the groups that were identified in this list.
+        **/
+        groups: GroupsListProjection<G>;
+
+        //#endregion Properties
+
+        /**
+         * Returns a key/data pair for the specified index.
+         * @param index The index of the value to retrieve.
+         * @returns An object that has two properties: key and data.
+        **/
+        getItem(index: number): IGroupKeyDataPair<T>;
+    }
+
+    /**
+     * Represents a list of objects that can be accessed by index or by a string key. Provides methods to search, sort, filter, and manipulate the data.
+    **/
+    class List<T> implements ListBaseWithMutators<T> {
+        //#region Constructors
+
+        /**
+         * Creates a List object.
+         * @constructor
+         * @param list The array containing the elements to initalize the list.
+         * @param options You can set two Boolean options: binding and proxy. If options.binding is true, the list contains the result of calling as on the element values. If options.proxy is true, the list specified as the first parameter is used as the storage for the List. This option should be used with care, because uncoordinated edits to the data storage may result in errors.
+        **/
+        constructor(list?: T[], options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * An item in the list has changed its value.
+         * @param eventInfo An object that contains information about the event. The detail contains the following information: index, key, newItem, newValue, oldItem, oldValue.
+        **/
+        onitemchanged(eventInfo: CustomEvent): void;
+
+        /**
+         * A new item has been inserted into the list.
+         * @param eventInfo An object that contains information about the event. The detail contains the following information: index, key, value.
+        **/
+        oniteminserted(eventInfo: CustomEvent): void;
+
+        /**
+         * An item has been changed locations in the list.
+         * @param eventInfo An object that contains information about the event. The detail contains the following information: index, key, value.
+        **/
+        onitemmoved(eventInfo: CustomEvent): void;
+
+        /**
+         * An item has been mutated. This event occurs as a result of calling the notifyMutated method.
+         * @param eventInfo An object that contains information about the event. The detail contains the following information: index, key, value.
+        **/
+        onitemmutated(eventInfo: CustomEvent): void;
+
+        /**
+         * An item has been removed from the list.
+         * @param eventInfo An object that contains information about the event. The detail contains the following information: index, key, value.
+        **/
+        onitemremoved(eventInfo: CustomEvent): void;
+
+        /**
+         * The list has been refreshed. Any references to items in the list may be incorrect.
+         * @param eventInfo An object that contains information about the event. The detail property of this object is null.
+        **/
+        onreload(eventInfo: CustomEvent): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Adds an event listener to the control.
+         * @param type The type (name) of the event.
+         * @param listener The listener to invoke when the event gets raised.
+         * @param useCapture If true, initiates capture, otherwise false.
+        **/
+        addEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+        /**
+         * Links the specified action to the property specified in the name parameter. This function is invoked when the value of the property may have changed. It is not guaranteed that the action will be called only when a value has actually changed, nor is it guaranteed that the action will be called for every value change. The implementation of this function coalesces change notifications, such that multiple updates to a property value may result in only a single call to the specified action.
+         * @param name The name of the property to which to bind the action.
+         * @param action The function to invoke asynchronously when the property may have changed.
+         * @returns A reference to this observableMixin object.
+        **/
+        bind(name: string, action: Function): any;
+
+        /**
+         * Returns a new list consisting of a combination of two arrays.
+         * @param item Additional items to add to the end of the list.
+         * @returns An array containing the concatenation of the list and any other supplied items.
+        **/
+        concat(...item: T[]): T[];
+
+        /**
+         * Creates a live filtered projection over this list. As the list changes, the filtered projection reacts to those changes and may also change.
+         * @param predicate A function that accepts a single argument. The createFiltered function calls the callback with each element in the list. If the function returns true, that element will be included in the filtered list. This function must always return the same results, given the same inputs. The results should not depend on values that are subject to change. You must call notifyMutated each time an item changes. Do not batch change notifications.
+         * @returns A filtered projection over the list.
+        **/
+        createFiltered(predicate: (x: T) => boolean): FilteredListProjection<T>;
+
+        /**
+         * Creates a live grouped projection over this list. As the list changes, the grouped projection reacts to those changes and may also change. The grouped projection sorts all the elements of the list to be in group-contiguous order. The grouped projection also contains a .groups property, which is a List representing the groups that were found in the list.
+         * @param groupKey A function that accepts a single argument. The function is called with each element in the list, the function should return a string representing the group containing the element. This function must always return the same results, given the same inputs. The results should not depend on values that are subject to change. You must call notifyMutated each time an item changes. Do not batch change notifications.
+         * @param groupData A function that accepts a single argument. The function is called once, on one element per group. It should return the value that should be set as the data of the .groups list element for this group. The data value usually serves as summary or header information for the group.
+         * @param groupSorter A function that accepts two arguments. The function is called with pairs of group keys found in the list. It must return one of the following numeric values: negative if the first argument is less than the second (sorted before), zero if the two arguments are equivalent, positive if the first argument is greater than the second (sorted after).
+         * @returns A grouped projection over the list.
+        **/
+        createGrouped<G>(groupKey: (x: T) => string, groupData: (x: T) => G, groupSorter?: (left: string, right: string) => number): GroupedSortedListProjection<T, G>;
+
+        /**
+         * Creates a live sorted projection over this list. As the list changes, the sorted projection reacts to those changes and may also change.
+         * @param sorter A function that accepts two arguments. The function is called with elements in the list. It must return one of the following numeric values: negative if the first argument is less than the second, zero if the two arguments are equivalent, positive if the first argument is greater than the second. This function must always return the same results, given the same inputs. The results should not depend on values that are subject to change. You must call notifyMutated each time an item changes. Do not batch change notifications.
+         * @returns A sorted projection over the list.
+        **/
+        createSorted(sorter: (left: T, right: T) => number): SortedListProjection<T>;
+
+        /**
+        * Raises an event of the specified type and with the specified additional properties.
+        * @param type The type (name) of the event.
+        * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+        * @returns true if preventDefault was called on the event.
+       **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Checks whether the specified callback function returns true for all elements in a list.
+         * @param callback A function that accepts up to three arguments. This function is called for each element in the list until it returns false or the end of the list is reached.
+         * @param thisArg An object to which the this keyword can refer in the callback function. If thisArg is omitted, undefined is used.
+         * @returns true if the callback returns true for all elements in the list.
+        **/
+        every(callback: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
+
+        /**
+         * Returns the elements of a list that meet the condition specified in a callback function.
+         * @param callback A function that accepts up to three arguments. The function is called for each element in the list. This function must always return the same results, given the same inputs. The results should not depend on values that are subject to change. You must call notifyMutated each time an item changes. Do not batch change notifications.
+         * @param thisArg An object to which the this keyword can refer in the callback function. If thisArg is omitted, undefined is used.
+         * @returns An array containing the elements that meet the condition specified in the callback function.
+        **/
+        filter(callback: (value: T, index: number, array: T[]) => any, thisArg?: any): T[];
+
+        /**
+         * Calls the specified callback function for each element in a list.
+         * @param callback A function that accepts up to three arguments. The function is called for each element in the list. The arguments are as follows: value, index, array.
+         * @param thisArg An object to which the this keyword can refer in the callback function. If thisArg is omitted, undefined is used.
+        **/
+        forEach(callback: (value: T, index: number, array: T[]) => void, thisArg?: any): void;
+
+        /**
+         * Gets the value at the specified index.
+         * @param index The index of the value to get.
+         * @returns The value at the specified index.
+        **/
+        getAt(index: number): T;
+
+        /**
+         * Gets a key/data pair for the specified list index.
+         * @param index The index of value to retrieve.
+         * @returns An object with .key and .data properties.
+        **/
+        getItem(index: number): IKeyDataPair<T>;
+
+        /**
+         * Gets a key/data pair for the list item key specified.
+         * @param key The key of the value to retrieve.
+         * @returns An object with .key and .data properties.
+        **/
+        getItemFromKey(key: string): IKeyDataPair<T>;
+
+        /**
+         * Gets the index of the first occurrence of the specified value in a list.
+         * @param searchElement The value to locate in the list.
+         * @param fromIndex The index at which to begin the search. If fromIndex is omitted, the search starts at index 0.
+         * @returns The index of the first occurrence of a value in a list or -1 if not found.
+        **/
+        indexOf(searchElement: T, fromIndex?: number): number;
+
+        /**
+         * Gets the index of the first occurrence of a key in a list.
+         * @param key The key to locate in the list.
+         * @returns The index of the first occurrence of a key in a list, or -1 if not found.
+        **/
+        indexOfKey(key: string): number;
+
+        /**
+         * Returns a string consisting of all the elements of a list separated by the specified separator string.
+         * @param separator A string used to separate the elements of a list. If this parameter is omitted, the list elements are separated with a comma.
+         * @returns The elements of a list separated by the specified separator string.
+        **/
+        join(separator?: string): string;
+
+        /**
+         * Gets the index of the last occurrence of the specified value in a list.
+         * @param searchElement The value to locate in the list.
+         * @param fromIndex The index at which to begin the search. If fromIndex is omitted, the search starts at the last index in the list.
+         * @returns The index of the last occurrence of a value in a list, or -1 if not found.
+        **/
+        lastIndexOf(searchElement: T, fromIndex?: number): number;
+
+        /**
+         * Calls the specified callback function on each element of a list, and returns an array that contains the results.
+         * @param callback A function that accepts up to three arguments. The function is called for each element in the list.
+         * @param thisArg n object to which the this keyword can refer in the callback function. If thisArg is omitted, undefined is used.
+         * @returns An array containing the result of calling the callback function on each element in the list.
+        **/
+        map<G>(callback: (value: T, index: number, array: T[]) => G, thisArg?: any): G[];
+
+        /**
+         * Moves the value at index to the specified position.
+         * @param index The original index of the value.
+         * @param newIndex The index of the value after the move.
+        **/
+        move(index: number, newIndex: number): void;
+
+        /**
+         * Notifies listeners that a property value was updated.
+         * @param name The name of the property that is being updated.
+         * @param newValue The new value for the property.
+         * @param oldValue The old value for the property.
+         * @returns A promise that is completed when the notifications are complete.
+        **/
+        notify(name: string, newValue: any, oldValue: any): Promise<any>;
+
+        /**
+         * Forces the list to send a itemmutated notification to any listeners for the value at the specified index.
+         * @param index The index of the value that was mutated.
+        **/
+        notifyMutated(index: number): void;
+
+        /**
+         * Forces the list to send a reload notification to any listeners.
+        **/
+        notifyReload(): void;
+
+        /**
+         * Removes the last element from a list and returns it.
+         * @returns The last element from the list.
+        **/
+        pop(): T;
+
+        /**
+         * Appends new element(s) to a list, and returns the new length of the list.
+         * @param value The element to insert at the end of the list.
+         * @returns The new length of the list.
+        **/
+        push(value: T): number;
+        push(...values: T[]): number;
+
+        /**
+         * Accumulates a single result by calling the specified callback function for all elements in a list. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+         * @param callback A function that accepts up to four arguments. These arguments are: previousValue, currentValue, currentIndex, array. The function is called for each element in the list.
+         * @param initiallValue If initialValue is specified, it is used as the value with which to start the accumulation. The first call to the function provides this value as an argument instead of a list value.
+         * @returns The return value from the last call to the callback function.
+        **/
+        reduce(callback: (previousValue: any, currentValue: any, currentIndex: number, array: T[]) => T, initiallValue?: T): T;
+
+        /**
+         * Accumulates a single result by calling the specified callback function for all elements in a list, starting with the last member of the list. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+         * @param callback A function that accepts up to four arguments. These arguments are: previousValue, currentValue, currentIndex, array. The function is called for each element in the list.
+         * @param initialValue If initialValue is specified, it is used as the value with which to start the accumulation. The first call to the callback function provides this value as an argument instead of a list value.
+         * @returns The return value from the last call to callback function.
+        **/
+        reduceRight(callback: (previousValue: any, currentValue: any, currentIndex: number, array: T[]) => T, initialValue?: T): T;
+
+        /**
+         * Removes an event listener from the control.
+         * @param type The type (name) of the event.
+         * @param listener The listener to remove.
+         * @param useCapture true if capture is to be initiated, otherwise false.
+        **/
+        removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+        /**
+         * Returns a list with the elements reversed. This method reverses the elements of a list object in place. It does not create a new list object during execution.
+        **/
+        reverse(): void;
+
+        /**
+         * Replaces the value at the specified index with a new value.
+         * @param index The index of the value that was replaced.
+         * @param newValue The new value.
+        **/
+        setAt(index: number, newValue: T): void;
+
+        /**
+         * Removes the first element from a list and returns it.
+         * @returns The first element from the list.
+        **/
+        shift(): T;
+
+        /**
+         * Extracts a section of a list and returns a new list.
+         * @param begin The index that specifies the beginning of the section.
+         * @param end The index that specifies the end of the section.
+         * @returns Returns a section of list.
+        **/
+        slice(begin: number, end?: number): T[];
+
+        /**
+         * Checks whether the specified callback function returns true for any element of a list.
+         * @param callback A function that accepts up to three arguments. The function is called for each element in the list until it returns true, or until the end of the list.
+         * @param thisArg An object to which the this keyword can refer in the callback function. If thisArg is omitted, undefined is used.
+         * @returns true if callback returns true for any element in the list.
+        **/
+        some(callback: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
+
+        /**
+         * Returns a list with the elements sorted. This method sorts the elements of a list object in place. It does not create a new list object during execution.
+         * @param sortFunction The function used to determine the order of the elements. If omitted, the elements are sorted in ascending, ASCII character order. This function must always return the same results, given the same inputs. The results should not depend on values that are subject to change. You must call notifyMutated each time an item changes. Do not batch change notifications.
+        **/
+        sort(sortFunction?: (left: T, right: T) => number): void;
+
+        /**
+         * Removes elements from a list and, if necessary, inserts new elements in their place, returning the deleted elements.
+         * @param start The zero-based location in the list from which to start removing elements.
+         * @param howMany The number of elements to remove.
+         * @param item The elements to insert into the list in place of the deleted elements.
+         * @returns The deleted elements.
+        **/
+        splice(start: number, howMany?: number, ...item: T[]): T[];
+
+        /**
+         * Removes one or more listeners from the notification list for a given property.
+         * @param name The name of the property to unbind. If this parameter is omitted, all listeners for all events are removed.
+         * @param action The function to remove from the listener list for the specified property. If this parameter is omitted, all listeners are removed for the specific property.
+         * @returns This object is returned.
+        **/
+        unbind(name: string, action: Function): any;
+
+        /**
+         * Appends new element(s) to a list, and returns the new length of the list.
+         * @param value The element to insert at the start of the list.
+         * @returns The new length of the list.
+        **/
+        unshift(value: T): number;
+        unshift(...values: T[]): number;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets the IListDataSource for the list. The only purpose of this property is to adapt a List to the data model that is used by ListView and FlipView.
+        **/
+        dataSource: WinJS.UI.IListDataSource<T>;
+
+        /**
+         * Gets or sets the length of the list, which is an integer value one higher than the highest element defined in the list.
+        **/
+        length: number;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+    }
+
+    /**
+     * Represents a base class for lists.
+    **/
+    interface ListBase<T> {
+        //#region Events
+
+        /**
+         * An item in the list has changed its value.
+         * @param eventInfo An object that contains information about the event. The detail contains the following information: index, key, newItem, newValue, oldItem, oldValue.
+        **/
+        onitemchanged(eventInfo: CustomEvent): void;
+
+        /**
+         * A new item has been inserted into the list.
+         * @param eventInfo An object that contains information about the event. The detail contains the following information: index, key, value.
+        **/
+        oniteminserted(eventInfo: CustomEvent): void;
+
+        /**
+         * An item has been changed locations in the list.
+         * @param eventInfo An object that contains information about the event. The detail contains the following information: index, key, value.
+        **/
+        onitemmoved(eventInfo: CustomEvent): void;
+
+        /**
+         * An item has been mutated. This event occurs as a result of calling the notifyMutated method.
+         * @param eventInfo An object that contains information about the event. The detail contains the following information: index, key, value.
+        **/
+        onitemmutated(eventInfo: CustomEvent): void;
+
+        /**
+         * An item has been removed from the list.
+         * @param eventInfo An object that contains information about the event. The detail contains the following information: index, key, value.
+        **/
+        onitemremoved(eventInfo: CustomEvent): void;
+
+        /**
+         * The list has been refreshed. Any references to items in the list may be incorrect.
+         * @param eventInfo An object that contains information about the event. The detail property of this object is null.
+        **/
+        onreload(eventInfo: CustomEvent): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Adds an event listener to the control.
+         * @param type The type (name) of the event.
+         * @param listener The listener to invoke when the event gets raised.
+         * @param useCapture If true, initiates capture, otherwise false.
+        **/
+        addEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+        /**
+         * Links the specified action to the property specified in the name parameter. This function is invoked when the value of the property may have changed. It is not guaranteed that the action will be called only when a value has actually changed, nor is it guaranteed that the action will be called for every value change. The implementation of this function coalesces change notifications, such that multiple updates to a property value may result in only a single call to the specified action.
+         * @param name The name of the property to which to bind the action.
+         * @param action The function to invoke asynchronously when the property may have changed.
+         * @returns A reference to this observableMixin object.
+        **/
+        bind(name: string, action: Function): any;
+
+        /**
+         * Returns a new list consisting of a combination of two arrays.
+         * @param item Additional items to add to the end of the list.
+         * @returns An array containing the concatenation of the list and any other supplied items.
+        **/
+        concat(...item: T[]): T[];
+
+        /**
+         * Creates a live filtered projection over this list. As the list changes, the filtered projection reacts to those changes and may also change.
+         * @param predicate A function that accepts a single argument. The createFiltered function calls the callback with each element in the list. If the function returns true, that element will be included in the filtered list. This function must always return the same results, given the same inputs. The results should not depend on values that are subject to change. You must call notifyMutated each time an item changes. Do not batch change notifications.
+         * @returns A filtered projection over the list.
+        **/
+        createFiltered(predicate: (x: T) => boolean): FilteredListProjection<T>;
+
+        /**
+         * Creates a live grouped projection over this list. As the list changes, the grouped projection reacts to those changes and may also change. The grouped projection sorts all the elements of the list to be in group-contiguous order. The grouped projection also contains a .groups property, which is a List representing the groups that were found in the list.
+         * @param groupKey A function that accepts a single argument. The function is called with each element in the list, the function should return a string representing the group containing the element. This function must always return the same results, given the same inputs. The results should not depend on values that are subject to change. You must call notifyMutated each time an item changes. Do not batch change notifications.
+         * @param groupData A function that accepts a single argument. The function is called once, on one element per group. It should return the value that should be set as the data of the .groups list element for this group. The data value usually serves as summary or header information for the group.
+         * @param groupSorter A function that accepts two arguments. The function is called with pairs of group keys found in the list. It must return one of the following numeric values: negative if the first argument is less than the second (sorted before), zero if the two arguments are equivalent, positive if the first argument is greater than the second (sorted after).
+         * @returns A grouped projection over the list.
+        **/
+        createGrouped<G>(groupKey: (x: T) => string, groupData: (x: T) => G, groupSorter?: (left: string, right: string) => number): GroupedSortedListProjection<T, G>;
+
+        /**
+         * Creates a live sorted projection over this list. As the list changes, the sorted projection reacts to those changes and may also change.
+         * @param sorter A function that accepts two arguments. The function is called with elements in the list. It must return one of the following numeric values: negative if the first argument is less than the second, zero if the two arguments are equivalent, positive if the first argument is greater than the second. This function must always return the same results, given the same inputs. The results should not depend on values that are subject to change. You must call notifyMutated each time an item changes. Do not batch change notifications.
+         * @returns A sorted projection over the list.
+        **/
+        createSorted(sorter: (left: T, right: T) => number): SortedListProjection<T>;
+
+        /**
+         * Raises an event of the specified type and with the specified additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Checks whether the specified callback function returns true for all elements in a list.
+         * @param callback A function that accepts up to three arguments. This function is called for each element in the list until it returns false or the end of the list is reached.
+         * @param thisArg An object to which the this keyword can refer in the callback function. If thisArg is omitted, undefined is used.
+         * @returns true if the callback returns true for all elements in the list.
+        **/
+        every(callback: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
+
+        /**
+         * Returns the elements of a list that meet the condition specified in a callback function.
+         * @param callback A function that accepts up to three arguments. The function is called for each element in the list. This function must always return the same results, given the same inputs. The results should not depend on values that are subject to change. You must call notifyMutated each time an item changes. Do not batch change notifications.
+         * @param thisArg An object to which the this keyword can refer in the callback function. If thisArg is omitted, undefined is used.
+         * @returns An array containing the elements that meet the condition specified in the callback function.
+        **/
+        filter(callback: (value: T, index: number, array: T[]) => any, thisArg?: any): T[];
+
+        /**
+         * Calls the specified callback function for each element in a list.
+         * @param callback A function that accepts up to three arguments. The function is called for each element in the list. The arguments are as follows: value, index, array.
+         * @param thisArg An object to which the this keyword can refer in the callback function. If thisArg is omitted, undefined is used.
+        **/
+        forEach(callback: (value: T, index: number, array: T[]) => void, thisArg?: any): void;
+
+        /**
+         * Gets the value at the specified index.
+         * @param index The index of the value to get.
+         * @returns The value at the specified index.
+        **/
+        getAt(index: number): T;
+
+        /**
+         * Gets the index of the first occurrence of the specified value in a list.
+         * @param searchElement The value to locate in the list.
+         * @param fromIndex The index at which to begin the search. If fromIndex is omitted, the search starts at index 0.
+         * @returns The index of the first occurrence of a value in a list or -1 if not found.
+        **/
+        indexOf(searchElement: T, fromIndex?: number): number;
+
+        /**
+         * Returns a string consisting of all the elements of a list separated by the specified separator string.
+         * @param separator A string used to separate the elements of a list. If this parameter is omitted, the list elements are separated with a comma.
+         * @returns The elements of a list separated by the specified separator string.
+        **/
+        join(separator?: string): string;
+
+        /**
+         * Gets the index of the last occurrence of the specified value in a list.
+         * @param searchElement The value to locate in the list.
+         * @param fromIndex The index at which to begin the search. If fromIndex is omitted, the search starts at the last index in the list.
+         * @returns The index of the last occurrence of a value in a list, or -1 if not found.
+        **/
+        lastIndexOf(searchElement: T, fromIndex?: number): number;
+
+        /**
+         * Calls the specified callback function on each element of a list, and returns an array that contains the results.
+         * @param callback A function that accepts up to three arguments. The function is called for each element in the list.
+         * @param thisArg n object to which the this keyword can refer in the callback function. If thisArg is omitted, undefined is used.
+         * @returns An array containing the result of calling the callback function on each element in the list.
+        **/
+        map<G>(callback: (value: T, index: number, array: T[]) => G, thisArg?: any): G[];
+
+        /**
+         * Notifies listeners that a property value was updated.
+         * @param name The name of the property that is being updated.
+         * @param newValue The new value for the property.
+         * @param oldValue The old value for the property.
+         * @returns A promise that is completed when the notifications are complete.
+        **/
+        notify(name: string, newValue: any, oldValue: any): Promise<any>;
+
+        /**
+         * Forces the list to send a reload notification to any listeners.
+        **/
+        notifyReload(): void;
+
+        /**
+         * Accumulates a single result by calling the specified callback function for all elements in a list. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+         * @param callback A function that accepts up to four arguments. These arguments are: previousValue, currentValue, currentIndex, array. The function is called for each element in the list.
+         * @param initiallValue If initialValue is specified, it is used as the value with which to start the accumulation. The first call to the function provides this value as an argument instead of a list value.
+         * @returns The return value from the last call to the callback function.
+        **/
+        reduce(callback: (previousValue: any, currentValue: any, currentIndex: number, array: T[]) => T, initiallValue?: T): T;
+
+        /**
+         * Accumulates a single result by calling the specified callback function for all elements in a list, starting with the last member of the list. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+         * @param callback A function that accepts up to four arguments. These arguments are: previousValue, currentValue, currentIndex, array. The function is called for each element in the list.
+         * @param initialValue If initialValue is specified, it is used as the value with which to start the accumulation. The first call to the callback function provides this value as an argument instead of a list value.
+         * @returns The return value from the last call to callback function.
+        **/
+        reduceRight(callback: (previousValue: any, currentValue: any, currentIndex: number, array: T[]) => T, initialValue?: T): T;
+
+        /**
+         * Removes an event listener from the control.
+         * @param type The type (name) of the event.
+         * @param listener The listener to remove.
+         * @param useCapture true if capture is to be initiated, otherwise false.
+        **/
+        removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+        /**
+         * Extracts a section of a list and returns a new list.
+         * @param begin The index that specifies the beginning of the section.
+         * @param end The index that specifies the end of the section.
+         * @returns Returns a section of list.
+        **/
+        slice(begin: number, end?: number): T[];
+
+        /**
+         * Checks whether the specified callback function returns true for any element of a list.
+         * @param callback A function that accepts up to three arguments. The function is called for each element in the list until it returns true, or until the end of the list.
+         * @param thisArg An object to which the this keyword can refer in the callback function. If thisArg is omitted, undefined is used.
+         * @returns true if callback returns true for any element in the list.
+        **/
+        some(callback: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
+
+        /**
+         * Removes one or more listeners from the notification list for a given property.
+         * @param name The name of the property to unbind. If this parameter is omitted, all listeners for all events are removed.
+         * @param action The function to remove from the listener list for the specified property. If this parameter is omitted, all listeners are removed for the specific property.
+         * @returns This object is returned.
+        **/
+        unbind(name: string, action: Function): any;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets the IListDataSource for the list. The only purpose of this property is to adapt a List to the data model that is used by ListView and FlipView.
+        **/
+        dataSource: WinJS.UI.IListDataSource<T>;
+
+        //#endregion Properties
+    }
+
+    /**
+     * Represents a base class for normal list modifying operations.
+    **/
+    interface ListBaseWithMutators<T> extends ListBase<T> {
+        //#region Methods
+
+        /**
+         * Removes the last element from a list and returns it.
+         * @returns The last element from the list.
+        **/
+        pop(): T;
+
+        /**
+         * Appends new element(s) to a list, and returns the new length of the list.
+         * @param value The element to insert at the end of the list.
+         * @returns The new length of the list.
+        **/
+        push(value: T): number;
+        push(...values: T[]): number;
+
+        /**
+         * Removes the first element from a list and returns it.
+         * @returns The first element from the list.
+        **/
+        shift(): T;
+
+        /**
+         * Appends new element(s) to a list, and returns the new length of the list.
+         * @param value The element to insert at the start of the list.
+         * @returns The new length of the list.
+        **/
+        unshift(value: T): number;
+        unshift(...values: T[]): number;
+
+        //#endregion Methods
+    }
+
+    /**
+     * Represents a base class for list projections.
+    **/
+    interface ListProjection<T> extends ListBaseWithMutators<T> {
+        //#region Methods
+
+        /**
+         * Disconnects a WinJS.Binding.List projection from its underlying WinJS.Binding.List. It's only important to call this method when the WinJS.Binding.List projection and the WinJS.Binding.List have different lifetimes. (Call this method on the WinJS.Binding.List projection, not the underlying WinJS.Binding.List.)
+        **/
+        dispose(): void;
+
+        /**
+         * Gets a key/data pair for the specified key.
+         * @param key The key of the value to retrieve.
+         * @returns An object with two properties: key and data.
+        **/
+        getItemFromKey(key: string): IKeyDataPair<T>;
+
+        /**
+         * Moves the value at index to position newIndex.
+         * @param index The original index of the value.
+         * @param newIndex The index of the value after the move.
+        **/
+        move(index: number, newIndex: number): void;
+
+        /**
+         * Removes elements from a list and, if necessary, inserts new elements in their place, returning the deleted elements.
+         * @param start The zero-based location in the list from which to start removing elements.
+         * @param howMany The number of elements to remove.
+         * @param item The elements to insert into the list in place of the deleted elements.
+         * @returns The deleted elements.
+        **/
+        splice(start: number, howMany?: number, ...item: T[]): T[];
+
+        //#endregion Methods
+    }
+
+    /**
+     * Provides a standard implementation of the bindable contract, as well as a basic storage mechanism that participates in change notification and an asynchronous notification implementation.
+    **/
+    var mixin: {
+        //#region Methods
+
+        /**
+         * Adds a property to the object. The property includes change notification and an ECMAScript 5 property definition .
+         * @param name The name of the property to add.
+         * @param value The value of the property.
+         * @returns This object is returned.
+        **/
+        addProperty(name: string, value: any): any;
+
+        /**
+         * Links the specified action to the property specified in the name parameter. This function is invoked when the value of the property may have changed. It is not guaranteed that the action will be called only when a value has actually changed, nor is it guaranteed that the action will be called for every value change. The implementation of this function coalesces change notifications, such that multiple updates to a property value may result in only a single call to the specified action.
+         * @param name The name of the property to which to bind the action.
+         * @param action The function to invoke asynchronously when the property may have changed.
+         * @returns This object is returned.
+        **/
+        bind(name: string, action: any): Function;
+
+        /**
+         * Gets a property value by name.
+         * @param name The name of the property to get.
+         * @returns The value of the property as an observable object.
+        **/
+        getProperty(name: string): any;
+
+        /**
+         * Notifies listeners that a property value was updated.
+         * @param name The name of the property that is being updated.
+         * @param newValue The new value for the property.
+         * @param oldValue The old value for the property.
+         * @returns A promise that is completed when the notifications are complete.
+        **/
+        notify(name: string, newValue: string, oldValue: string): Promise<any>;
+
+        /**
+         * Removes a property value.
+         * @param name The name of the property to remove.
+         * @returns This object is returned.
+        **/
+        removeProperty(name: string): any;
+
+        /**
+         * Updates a property value and notifies any listeners.
+         * @param name The name of the property to update.
+         * @param value The new value of the property.
+         * @returns This object is returned.
+        **/
+        setProperty(name: string, value: any): any;
+
+        /**
+         * Removes one or more listeners from the notification list for a given property.
+         * @param name The name of the property to unbind. If this parameter is omitted, all listeners for all events are removed.
+         * @param action The function to remove from the listener list for the specified property. If this parameter is omitted, all listeners are removed for the specific property.
+         * @returns This object is returned.
+        **/
+        unbind(name: string, action: Function): any;
+
+        /**
+         * Updates a property value and notifies any listeners.
+         * @param name The name of the property to update.
+         * @param value The new value of the property.
+         * @returns A promise that completes when the notifications for this property change have been processed. If multiple notifications are coalesced, the promise may be canceled or the value of the promise may be updated. The fulfilled value of the promise is the new value of the property for which the notifications have been completed.
+        **/
+        updateProperty(name: string, value: any): Promise<any>;
+
+        //#endregion Methods
+
+    };
+
+    /**
+     * Provides functions that can make an object observable.
+    **/
+    var observableMixin: {
+        //#region Methods
+
+        /**
+         * Links the specified action to the property specified in the name parameter. This function is invoked when the value of the property may have changed. It is not guaranteed that the action will be called only when a value has actually changed, nor is it guaranteed that the action will be called for every value change. The implementation of this function coalesces change notifications, such that multiple updates to a property value may result in only a single call to the specified action.
+         * @param name The name of the property to which to bind the action.
+         * @param action The function to invoke asynchronously when the property may have changed.
+         * @returns A reference to this observableMixin object.
+        **/
+        bind(name: string, action: Function): any;
+
+        /**
+         * Notifies listeners that a property value was updated.
+         * @param name The name of the property that is being updated.
+         * @param newValue The new value for the property.
+         * @param oldValue The old value for the property.
+         * @returns A promise that is completed when the notifications are complete.
+        **/
+        notify(name: string, newValue: any, oldValue: any): Promise<any>;
+
+        /**
+         * Removes one or more listeners from the notification list for a given property.
+         * @param name The name of the property to unbind. If this parameter is omitted, all listeners for all events are removed.
+         * @param action The function to remove from the listener list for the specified property. If this parameter is omitted, all listeners are removed for the specific property.
+         * @returns This object is returned.
+        **/
+        unbind(name: string, action: Function): any;
+
+        //#endregion Methods
+
+    };
+
+    /**
+     * Do not instantiate. Returned by the createSorted method.
+    **/
+    interface SortedListProjection<T> extends ListProjection<T> {
+        //#region Methods
+
+        /**
+         * Returns a key/data pair for the specified index.
+         * @param index The index of the value to retrieve.
+         * @returns An object that has two properties: key and data.
+        **/
+        getItem(index: number): IKeyDataPair<T>;
+
+        /**
+         * Returns the index of the first occurrence of a key.
+         * @param key The key to locate in the list.
+         * @returns The index of the first occurrence of a key in a list, or -1 if not found.
+        **/
+        indexOfKey(key: string): number;
+
+        /**
+         * Forces the list to send a itemmutated notification to any listeners for the value at the specified index.
+         * @param index The index of the value that was mutated.
+        **/
+        notifyMutated(index: number): void;
+
+        /**
+         * Replaces the value at the specified index with a new value.
+         * @param index The index of the value to be replaced.
+         * @param newValue The new value.
+        **/
+        setAt(index: number, newValue: T): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets the length of the list. Returns an integer value one higher than the highest element defined in a list.
+        **/
+        length: number;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Provides a reusable declarative binding element.
+    **/
+    class Template {
+        //#region Constructors
+
+        /**
+         * Creates a template that provides a reusable declarative binding element.
+         * @constructor
+         * @param element The DOM element to convert to a template.
+         * @param options If this parameter is supplied, the template is loaded from the URI and the content of the element parameter is ignored. You can add the following options: href.
+        **/
+        constructor(element: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Methods
+
+        /**
+         * Binds values from the specified data context to elements that are descendants of the specified root element that have the declarative binding attributes specified (data-win-bind).
+         * @param dataContext The object to use for default data binding.
+         * @param container The element to which to add this rendered template. If this parameter is omitted, a new DIV is created.
+         * @returns A Promise that will be completed after binding has finished. The value is either container or the created DIV. promise that is completed after binding has finished.
+        **/
+        render(dataContext: any, container?: HTMLElement): Promise<HTMLElement>;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code. Use render instead.
+        **/
+        renderItem<T>(item: WinJS.Promise<T>, recyled: HTMLElement): { element: WinJS.Promise<HTMLElement>; renderComplete: WinJS.Promise<any>; };
+
+        /**
+         * Renders a template based on the specified URI (static method).
+         * @param href The URI from which to load the template.
+         * @param dataContext The object to use for default data binding.
+         * @param container The element to which to add this rendered template. If this parameter is omitted, a new DIV is created.
+         * @returns A promise that is completed after binding has finished. The value is either the object in the container parameter or the created DIV.
+        **/
+        static render(href: string, dataContext: any, container?: HTMLElement): Promise<HTMLElement>;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets the default binding initializer for the template.
+        **/
+        bindingInitializer: any;
+
+        /**
+         * Gets or sets a value that specifies whether a debug break is inserted into the first rendering of each template. This property only has an effect when the app is in debug mode.
+        **/
+        debugBreakOnRender: boolean;
+
+        /**
+         * This property is deprecated and might not be available in future versions of the WinJS. Gets or sets a value that specifies whether optimized template processing has been disabled.
+        **/
+        disableOptimizedProcessing: boolean;
+
+        /**
+         * Gets the DOM element that is used as the template.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets a value that specifies whether templates should be instantiated without the creation of an additional child element.
+        **/
+        extractChild: boolean;
+
+        /**
+         * Gets or sets the Number of milliseconds to delay instantiating declarative controls. Zero (0) will result in no delay, any negative number
+         * will result in a setImmediate delay, any positive number will be treated as the number of milliseconds.
+        **/
+        processTimeout: number;
+
+        /**
+         * Determines whether the Template contains declarative controls that must be processed separately. This property is always true. The controls that belong to a Template object's children are instantiated when a Template instance is rendered.
+        **/
+        static isDeclarativeControlContainer: boolean;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+    }
+
+    //#endregion Objects
+
+    //#region Functions
+
+    /**
+     * Adds a CSS class from the specified path of the source object to a destination object.
+     * @param source The source object that has the class to copy.
+     * @param sourceProperties The path on the source object to the source class.
+     * @param dest The destination object.
+    **/
+    function addClassOneTime(source: any, sourceProperties: any[], dest: HTMLElement): void;
+
+    /**
+     * Returns an observable object. This may be an observable proxy for the specified object, an existing proxy, or the specified object itself if it directly supports observation.
+     * @param data The object to observe.
+     * @returns The observable object.
+    **/
+    function as<U>(data: U): U;
+
+    /**
+     * Binds to one or more properties on the observable object or or on child values of that object.
+     * @param observable The object to bind to.
+     * @param bindingDescriptor An object literal containing the binding declarations. Binding declarations take the form: { propertyName: (function | bindingDeclaration), ... }.
+     * @returns An object that contains at least a "cancel" field, which is a function that removes all bindings associated with this bind request.
+    **/
+    function bind(observable: any, bindingDescriptor: any): any;
+
+    /**
+     * Creates a default binding initializer for binding between a source property and a destination property with the specified converter function that is executed on the value of the source property.
+     * @param convert The conversion function that takes the source property and produces a value that is set to the destination property. This function must be accessible from the global namespace.
+     * @returns The binding initializer.
+    **/
+    function converter(convert: Function): Function;
+
+    /**
+     * Creates a one-way binding between the source object and the destination object. Warning Do not attempt to bind data to the ID of an HTML element.
+     * @param source The source object.
+     * @param sourceProperties The path on the source object to the source property.
+     * @param dest The destination object.
+     * @param destProperties The path on the destination object to the destination property.
+     * @returns An object with a cancel method that is used to coalesce bindings.
+    **/
+    function defaultBind(source: any, sourceProperties: any, dest: any, destProperties: any): any;
+
+    /**
+     * Creates a new constructor function that supports observability with the specified set of properties.
+     * @param data The object to use as the pattern for defining the set of properties.
+     * @returns A constructor function with 1 optional argument that is the initial state of the properties.
+    **/
+    function define(data: any): Function;
+
+    /**
+     * Wraps the specified object so that all its properties are instrumented for binding. This is meant to be used in conjunction with the binding mixin.
+     * @param shape The specification for the bindable object.
+     * @returns An object with a set of properties all of which are wired for binding.
+    **/
+    function expandProperties(shape: any): any;
+
+    /**
+     * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+    **/
+    function getValue(obj: any, path?: any): any;
+
+    /**
+     * Marks a custom initializer function as being compatible with declarative data binding.
+     * @param customInitializer The custom initializer to be marked as compatible with declarative data binding.
+     * @returns The input customInitializer.
+    **/
+    function initializer(customInitializer: Function): Function;
+
+    /**
+     * Sets the destination property to the value of the source property.
+     * @param source The source object.
+     * @param sourceProperties The path on the source object to the source property.
+     * @param dest The destination object.
+     * @param destProperties The path on the destination object to the destination property.
+     * @returns An object with a cancel method that is used to coalesce bindings.
+    **/
+    function oneTime(source: any, sourceProperties: any, dest: any, destProperties: any): any;
+
+    /**
+     * Binds the values of an object to the values of a DOM element that has the data-win-bind attribute. If multiple DOM elements are to be bound, you must set the attribute on all of them. See the example below for details.
+     * @param rootElement Optional. The element at which to start traversing to find elements to bind to. If this parameter is omitted, the entire document is searched.
+     * @param dataContext The object that contains the values to which the DOM element should be bound.
+     * @param skipRoot If true, specifies that only the children of rootElement should be bound, otherwise rootElement should be bound as well.
+     * @param bindingCache The cached binding data.
+     * @param defaultInitializer The binding initializer to use in the case that one is not specified in a binding expression. If not provided, the behavior is the same as Binding.defaultBind.
+     * @returns A Promise that completes when every item that contains the data-win-bind attribute has been processed and the update has started.
+    **/
+    function processAll(rootElement?: Element, dataContext?: any, skipRoot?: boolean, bindingCache?: any, defaultInitializer?: Function): Promise<void>;
+
+    /**
+     * Creates a one-way binding between the source object and an attribute on the destination element.
+     * @param source The source object.
+     * @param sourceProperties The path on the source object to the source property.
+     * @param dest The destination object.
+     * @param destProperties The path on the destination object to the destination property. This must be a single name.
+     * @returns An object with a cancel() method that is used to coalesce bindings.
+    **/
+    function setAttribute(source: any, sourceProperties: any[], dest: Element, destProperties: any[]): any;
+
+    /**
+     * Sets an attribute on the destination element to the value of the source property.
+     * @param source The source object.
+     * @param sourceProperties The path on the source object to the source property.
+     * @param dest The destination object.
+     * @param destProperties The path on the destination object to the destination property. This must be a single name.
+    **/
+    function setAttributeOneTime(source: any, sourceProperties: any[], dest: Element, destProperties: any[]): void;
+
+    /**
+     * Returns the original (non-observable) object is returned if the specified object is an observable proxy,
+     * @param data The object for which to retrieve the original value.
+     * @returns If the specified object is an observable proxy, the original object is returned, otherwise the same object is returned.
+    **/
+    function unwrap(data: any): any;
+
+    //#endregion Functions
+
+    //#region Interfaces
+
+    interface IKeyDataPair<T> {
+        key: string;
+        data: T;
+    }
+
+    interface IGroupKeyDataPair<T> extends IKeyDataPair<T> {
+        groupSize: number;
+        firstItemIndexHint: number;
+        firstItemKey: string;
+    }
+
+    //#endregion Interfaces
+
+}
+/**
+ * Provides helper functions for defining Classes.
+**/
+declare namespace WinJS.Class {
+    //#region Functions
+
+    /**
+     * Defines a class using the given constructor and the specified instance members.
+     * @param constructor A constructor function that is used to instantiate this type.
+     * @param instanceMembers The set of instance fields, properties, and methods made available on the type.
+     * @param staticMembers The set of static fields, properties, and methods made available on the type.
+     * @returns The newly-defined type.
+    **/
+    function define(constructor?: Function, instanceMembers?: any, staticMembers?: any): any;
+
+    /**
+     * Creates a sub-class based on the specified baseClass parameter, using prototype inheritance.
+     * @param baseClass The type to inherit from.
+     * @param constructor A constructor function that is used to instantiate this type.
+     * @param instanceMembers The set of instance fields, properties, and methods to be made available on the type.
+     * @param staticMembers The set of static fields, properties, and methods to be made available on the type.
+     * @returns The newly-defined type.
+    **/
+    function derive(baseClass: any, constructor: Function, instanceMembers?: any, staticMembers?: any): any;
+
+    /**
+     * Defines a class using the given constructor and the union of the set of instance members specified by all the mixin objects. The mixin parameter list is of variable length. For more information, see Adding functionality with WinJS mixins.
+     * @param constructor A constructor function that will be used to instantiate this class.
+     * @param mixin An object declaring the set of instance members. The mixin parameter list is of variable length.
+     * @returns The newly defined class.
+    **/
+    function mix(constructor: Function, ...mixin: any[]): any;
+
+    //#endregion Functions
+
+}
+/**
+ * The WinJS namespace provides special Windows Library for JavaScript functionality, including Promise and xhr.
+**/
+declare namespace WinJS {
+    //#region Properties
+
+    /**
+     * Can be set to show the results of a validation process.
+    **/
+    var validation: boolean;
+
+    //#endregion Properties
+
+    //#region Objects
+
+    /**
+     * An error object.
+    **/
+    class ErrorFromName {
+        //#region Constructors
+
+        /**
+         * Creates an Error object with the specified name and message properties.
+         * @constructor
+         * @param name The name of this error. The name is meant to be consumed programmatically and should not be localized.
+         * @param message The message for this error. The message is meant to be consumed by humans and should be localized.
+        **/
+        constructor(name: string, message?: string);
+
+        //#endregion Constructors
+
+        //#region Properties
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+    }
+
+    interface IPromise<T> {
+        cancel(): void;
+        done<U>(onComplete?: (value: T) => any, onError?: (error: any) => any, onProgress?: (progress: any) => void): void;
+        then<U>(onComplete?: (value: T) => IPromise<U>, onError?: (error: any) => IPromise<U>, onProgress?: (progress: any) => void): IPromise<U>;
+        then<U>(onComplete?: (value: T) => IPromise<U>, onError?: (error: any) => U, onProgress?: (progress: any) => void): IPromise<U>;
+        then<U>(onComplete?: (value: T) => IPromise<U>, onError?: (error: any) => void, onProgress?: (progress: any) => void): IPromise<U>;
+        then<U>(onComplete?: (value: T) => U, onError?: (error: any) => IPromise<U>, onProgress?: (progress: any) => void): IPromise<U>;
+        then<U>(onComplete?: (value: T) => U, onError?: (error: any) => U, onProgress?: (progress: any) => void): IPromise<U>;
+        then<U>(onComplete?: (value: T) => U, onError?: (error: any) => void, onProgress?: (progress: any) => void): IPromise<U>;
+        then<U>(onComplete?: (value: T) => void, onError?: (error: any) => IPromise<U>, onProgress?: (progress: any) => void): IPromise<U>;
+        then<U>(onComplete?: (value: T) => void, onError?: (error: any) => U, onProgress?: (progress: any) => void): IPromise<U>;
+        then<U>(onComplete?: (value: T) => void, onError?: (error: any) => void, onProgress?: (progress: any) => void): IPromise<U>;
+    }
+
+    /**
+     * Provides a mechanism to schedule work to be done on a value that has not yet been computed. It is an abstraction for managing interactions with asynchronous APIs. For more information about asynchronous programming, see Asynchronous programming. For more information about promises in JavaScript, see Asynchronous programming in JavaScript. For more information about using promises, see the WinJS Promise sample.
+    **/
+    class Promise<T> implements IPromise<T> {
+        //#region Constructors
+
+        /**
+         * A promise provides a mechanism to schedule work to be done on a value that has not yet been computed. It is a convenient abstraction for managing interactions with asynchronous APIs. For more information about asynchronous programming, see Asynchronous programming. For more information about promises in JavaScript, see Asynchronous programming in JavaScript. For more information about using promises, see the WinJS Promise sample.
+         * @constructor
+         * @param init The function that is called during construction of the Promise that contains the implementation of the operation that the Promise will represent. This can be synchronous or asynchronous, depending on the nature of the operation. Note that placing code within this function does not automatically run it asynchronously; that must be done explicitly with other asynchronous APIs such as setImmediate, setTimeout, requestAnimationFrame, and the Windows Runtime asynchronous APIs. The init function is given three arguments: completeDispatch, errorDispatch, progressDispatch. This parameter is optional.
+         * @param onCancel The function to call if a consumer of this promise wants to cancel its undone work. Promises are not required to support cancellation.
+        **/
+        constructor(init?: (completeDispatch: any, errorDispatch: any, progressDispatch: any) => void, onCancel?: Function);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * Occurs when there is an error in processing a promise.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        static onerror(eventInfo: CustomEvent): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Adds an event listener for the promise.
+         * @param type The type (name) of the event.
+         * @param listener The listener to invoke when the event is raised.
+         * @param capture true to initiate capture, otherwise false.
+        **/
+        static addEventListener(type: string, listener: Function, capture?: boolean): void;
+
+        /**
+         * Returns a promise that is fulfilled when one of the input promises has been fulfilled.
+         * @param value An array that contains Promise objects or objects whose property values include Promise objects.
+         * @returns A promise that on fulfillment yields the value of the input (complete or error).
+        **/
+        static any(value: IPromise<any>[]): IPromise<any>;
+        static any(value: any): IPromise<any>;
+
+        /**
+         * Returns a promise. If the object is already a Promise it is returned; otherwise the object is wrapped in a Promise. You can use this function when you need to treat a non-Promise object like a Promise, for example when you are calling a function that expects a promise, but already have the value needed rather than needing to get it asynchronously.
+         * @param value The value to be treated as a Promise.
+         * @returns The promise.
+        **/
+        static as<U>(value?: U): IPromise<U>;
+
+        /**
+         * Attempts to cancel the fulfillment of a promised value. If the promise hasn't already been fulfilled and cancellation is supported, the promise enters the error state with a value of Error("Canceled").
+        **/
+        cancel(): void;
+
+        /**
+         * Canceled promise value, can be returned from a promise completion handler to indicate cancelation of the promise chain.
+         */
+        static cancel: IPromise<any>;
+
+        /**
+         * Raises an event of the specified type and properties.
+         * @param type The type (name) of the event.
+         * @param details The set of additional properties to be attached to the event object.
+         * @returns true if preventDefault was called on the event; otherwise, false.
+        **/
+        static dispatchEvent(type: string, details: any): boolean;
+
+        /**
+         * Allows you to specify the work to be done on the fulfillment of the promised value, the error handling to be performed if the promise fails to fulfill a value, and the handling of progress notifications along the way. After the handlers have finished executing, this function throws any error that would have been returned from then as a promise in the error state. For more information about the differences between then and done, see the following topics: Quickstart: using promises in JavaScript How to handle errors when using promises in JavaScript Chaining promises in JavaScript.
+         * @param onComplete The function to be called if the promise is fulfilled successfully with a value. The fulfilled value is passed as the single argument. If the value is null, the fulfilled value is returned. The value returned from the function becomes the fulfilled value of the promise returned by then. If an exception is thrown while executing the function, the promise returned by then moves into the error state.
+         * @param onError The function to be called if the promise is fulfilled with an error. The error is passed as the single argument. If it is null, the error is forwarded. The value returned from the function is the fulfilled value of the promise returned by then.
+         * @param onProgress The function to be called if the promise reports progress. Data about the progress is passed as the single argument. Promises are not required to support progress.
+        **/
+        done<U>(onComplete?: (value: T) => any, onError?: (error: any) => any, onProgress?: (progress: any) => void): void;
+
+        /**
+         * Determines whether a value fulfills the promise contract.
+         * @param value A value that may be a promise.
+         * @returns true if the object conforms to the promise contract (has a then function), otherwise false.
+        **/
+        static is(value: any): boolean;
+
+        /**
+         * Creates a Promise that is fulfilled when all the values are fulfilled.
+         * @param values An object whose members contain values, some of which may be promises.
+         * @returns A Promise whose value is an object with the same field names as those of the object in the values parameter, where each field value is the fulfilled value of a promise.
+        **/
+        static join(values: any): IPromise<any>;
+
+        /**
+         * Removes an event listener from the control.
+         * @param eventType The type (name) of the event.
+         * @param listener The listener to remove.
+         * @param capture Specifies whether or not to initiate capture.
+        **/
+        static removeEventListener(eventType: string, listener: Function, capture?: boolean): void;
+
+        /**
+         * Allows you to specify the work to be done on the fulfillment of the promised value, the error handling to be performed if the promise fails to fulfill a value, and the handling of progress notifications along the way. For more information about the differences between then and done, see the following topics: Quickstart: using promises in JavaScript How to handle errors when using promises in JavaScript Chaining promises in JavaScript.
+         * @param onComplete The function to be called if the promise is fulfilled successfully with a value. The value is passed as the single argument. If the value is null, the value is returned. The value returned from the function becomes the fulfilled value of the promise returned by then. If an exception is thrown while this function is being executed, the promise returned by then moves into the error state.
+         * @param onError The function to be called if the promise is fulfilled with an error. The error is passed as the single argument. In different cases this object may be of different types, so it is necessary to test the object for the properties you expect. If the error is null, it is forwarded. The value returned from the function becomes the value of the promise returned by the then function.
+         * @param onProgress The function to be called if the promise reports progress. Data about the progress is passed as the single argument. Promises are not required to support progress.
+         * @returns The promise whose value is the result of executing the onComplete function.
+        **/
+        then<U>(onComplete?: (value: T) => IPromise<U>, onError?: (error: any) => IPromise<U>, onProgress?: (progress: any) => void): IPromise<U>;
+
+        /**
+         * Allows you to specify the work to be done on the fulfillment of the promised value, the error handling to be performed if the promise fails to fulfill a value, and the handling of progress notifications along the way. For more information about the differences between then and done, see the following topics: Quickstart: using promises in JavaScript How to handle errors when using promises in JavaScript Chaining promises in JavaScript.
+         * @param onComplete The function to be called if the promise is fulfilled successfully with a value. The value is passed as the single argument. If the value is null, the value is returned. The value returned from the function becomes the fulfilled value of the promise returned by then. If an exception is thrown while this function is being executed, the promise returned by then moves into the error state.
+         * @param onError The function to be called if the promise is fulfilled with an error. The error is passed as the single argument. In different cases this object may be of different types, so it is necessary to test the object for the properties you expect. If the error is null, it is forwarded. The value returned from the function becomes the value of the promise returned by the then function.
+         * @param onProgress The function to be called if the promise reports progress. Data about the progress is passed as the single argument. Promises are not required to support progress.
+         * @returns The promise whose value is the result of executing the onComplete function.
+        **/
+        then<U>(onComplete?: (value: T) => IPromise<U>, onError?: (error: any) => U, onProgress?: (progress: any) => void): IPromise<U>;
+
+        /**
+         * Allows you to specify the work to be done on the fulfillment of the promised value, the error handling to be performed if the promise fails to fulfill a value, and the handling of progress notifications along the way. For more information about the differences between then and done, see the following topics: Quickstart: using promises in JavaScript How to handle errors when using promises in JavaScript Chaining promises in JavaScript.
+         * @param onComplete The function to be called if the promise is fulfilled successfully with a value. The value is passed as the single argument. If the value is null, the value is returned. The value returned from the function becomes the fulfilled value of the promise returned by then. If an exception is thrown while this function is being executed, the promise returned by then moves into the error state.
+         * @param onError The function to be called if the promise is fulfilled with an error. The error is passed as the single argument. In different cases this object may be of different types, so it is necessary to test the object for the properties you expect. If the error is null, it is forwarded. The value returned from the function becomes the value of the promise returned by the then function.
+         * @param onProgress The function to be called if the promise reports progress. Data about the progress is passed as the single argument. Promises are not required to support progress.
+         * @returns The promise whose value is the result of executing the onComplete function.
+        **/
+        then<U>(onComplete?: (value: T) => IPromise<U>, onError?: (error: any) => void, onProgress?: (progress: any) => void): IPromise<U>;
+
+        /**
+         * Allows you to specify the work to be done on the fulfillment of the promised value, the error handling to be performed if the promise fails to fulfill a value, and the handling of progress notifications along the way. For more information about the differences between then and done, see the following topics: Quickstart: using promises in JavaScript How to handle errors when using promises in JavaScript Chaining promises in JavaScript.
+         * @param onComplete The function to be called if the promise is fulfilled successfully with a value. The value is passed as the single argument. If the value is null, the value is returned. The value returned from the function becomes the fulfilled value of the promise returned by then. If an exception is thrown while this function is being executed, the promise returned by then moves into the error state.
+         * @param onError The function to be called if the promise is fulfilled with an error. The error is passed as the single argument. In different cases this object may be of different types, so it is necessary to test the object for the properties you expect. If the error is null, it is forwarded. The value returned from the function becomes the value of the promise returned by the then function.
+         * @param onProgress The function to be called if the promise reports progress. Data about the progress is passed as the single argument. Promises are not required to support progress.
+         * @returns The promise whose value is the result of executing the onComplete function.
+        **/
+        then<U>(onComplete?: (value: T) => U, onError?: (error: any) => IPromise<U>, onProgress?: (progress: any) => void): IPromise<U>;
+
+        /**
+         * Allows you to specify the work to be done on the fulfillment of the promised value, the error handling to be performed if the promise fails to fulfill a value, and the handling of progress notifications along the way. For more information about the differences between then and done, see the following topics: Quickstart: using promises in JavaScript How to handle errors when using promises in JavaScript Chaining promises in JavaScript.
+         * @param onComplete The function to be called if the promise is fulfilled successfully with a value. The value is passed as the single argument. If the value is null, the value is returned. The value returned from the function becomes the fulfilled value of the promise returned by then. If an exception is thrown while this function is being executed, the promise returned by then moves into the error state.
+         * @param onError The function to be called if the promise is fulfilled with an error. The error is passed as the single argument. In different cases this object may be of different types, so it is necessary to test the object for the properties you expect. If the error is null, it is forwarded. The value returned from the function becomes the value of the promise returned by the then function.
+         * @param onProgress The function to be called if the promise reports progress. Data about the progress is passed as the single argument. Promises are not required to support progress.
+         * @returns The promise whose value is the result of executing the onComplete function.
+        **/
+        then<U>(onComplete?: (value: T) => U, onError?: (error: any) => U, onProgress?: (progress: any) => void): IPromise<U>;
+
+        /**
+         * Allows you to specify the work to be done on the fulfillment of the promised value, the error handling to be performed if the promise fails to fulfill a value, and the handling of progress notifications along the way. For more information about the differences between then and done, see the following topics: Quickstart: using promises in JavaScript How to handle errors when using promises in JavaScript Chaining promises in JavaScript.
+         * @param onComplete The function to be called if the promise is fulfilled successfully with a value. The value is passed as the single argument. If the value is null, the value is returned. The value returned from the function becomes the fulfilled value of the promise returned by then. If an exception is thrown while this function is being executed, the promise returned by then moves into the error state.
+         * @param onError The function to be called if the promise is fulfilled with an error. The error is passed as the single argument. In different cases this object may be of different types, so it is necessary to test the object for the properties you expect. If the error is null, it is forwarded. The value returned from the function becomes the value of the promise returned by the then function.
+         * @param onProgress The function to be called if the promise reports progress. Data about the progress is passed as the single argument. Promises are not required to support progress.
+         * @returns The promise whose value is the result of executing the onComplete function.
+        **/
+        then<U>(onComplete?: (value: T) => U, onError?: (error: any) => void, onProgress?: (progress: any) => void): IPromise<U>;
+
+        /**
+         * Allows you to specify the work to be done on the fulfillment of the promised value, the error handling to be performed if the promise fails to fulfill a value, and the handling of progress notifications along the way. For more information about the differences between then and done, see the following topics: Quickstart: using promises in JavaScript How to handle errors when using promises in JavaScript Chaining promises in JavaScript.
+         * @param onComplete The function to be called if the promise is fulfilled successfully with a value. The value is passed as the single argument. If the value is null, the value is returned. The value returned from the function becomes the fulfilled value of the promise returned by then. If an exception is thrown while this function is being executed, the promise returned by then moves into the error state.
+         * @param onError The function to be called if the promise is fulfilled with an error. The error is passed as the single argument. In different cases this object may be of different types, so it is necessary to test the object for the properties you expect. If the error is null, it is forwarded. The value returned from the function becomes the value of the promise returned by the then function.
+         * @param onProgress The function to be called if the promise reports progress. Data about the progress is passed as the single argument. Promises are not required to support progress.
+         * @returns The promise whose value is the result of executing the onComplete function.
+        **/
+        then<U>(onComplete?: (value: T) => void, onError?: (error: any) => IPromise<U>, onProgress?: (progress: any) => void): IPromise<U>;
+
+        /**
+         * Allows you to specify the work to be done on the fulfillment of the promised value, the error handling to be performed if the promise fails to fulfill a value, and the handling of progress notifications along the way. For more information about the differences between then and done, see the following topics: Quickstart: using promises in JavaScript How to handle errors when using promises in JavaScript Chaining promises in JavaScript.
+         * @param onComplete The function to be called if the promise is fulfilled successfully with a value. The value is passed as the single argument. If the value is null, the value is returned. The value returned from the function becomes the fulfilled value of the promise returned by then. If an exception is thrown while this function is being executed, the promise returned by then moves into the error state.
+         * @param onError The function to be called if the promise is fulfilled with an error. The error is passed as the single argument. In different cases this object may be of different types, so it is necessary to test the object for the properties you expect. If the error is null, it is forwarded. The value returned from the function becomes the value of the promise returned by the then function.
+         * @param onProgress The function to be called if the promise reports progress. Data about the progress is passed as the single argument. Promises are not required to support progress.
+         * @returns The promise whose value is the result of executing the onComplete function.
+        **/
+        then<U>(onComplete?: (value: T) => void, onError?: (error: any) => U, onProgress?: (progress: any) => void): IPromise<U>;
+
+        /**
+         * Allows you to specify the work to be done on the fulfillment of the promised value, the error handling to be performed if the promise fails to fulfill a value, and the handling of progress notifications along the way. For more information about the differences between then and done, see the following topics: Quickstart: using promises in JavaScript How to handle errors when using promises in JavaScript Chaining promises in JavaScript.
+         * @param onComplete The function to be called if the promise is fulfilled successfully with a value. The value is passed as the single argument. If the value is null, the value is returned. The value returned from the function becomes the fulfilled value of the promise returned by then. If an exception is thrown while this function is being executed, the promise returned by then moves into the error state.
+         * @param onError The function to be called if the promise is fulfilled with an error. The error is passed as the single argument. In different cases this object may be of different types, so it is necessary to test the object for the properties you expect. If the error is null, it is forwarded. The value returned from the function becomes the value of the promise returned by the then function.
+         * @param onProgress The function to be called if the promise reports progress. Data about the progress is passed as the single argument. Promises are not required to support progress.
+         * @returns The promise whose value is the result of executing the onComplete function.
+        **/
+        then<U>(onComplete?: (value: T) => void, onError?: (error: any) => void, onProgress?: (progress: any) => void): IPromise<U>;
+
+
+        /**
+         * A static helper that functions identically to then() off a promise instance.
+         * @param promise The promise to chain from.
+         * @param onComplete The function to be called if the promise is fulfilled successfully with a value. The value is passed as the single argument. If the value is null, the value is returned. The value returned from the function becomes the fulfilled value of the promise returned by then. If an exception is thrown while this function is being executed, the promise returned by then moves into the error state.
+         * @param onError The function to be called if the promise is fulfilled with an error. The error is passed as the single argument. In different cases this object may be of different types, so it is necessary to test the object for the properties you expect. If the error is null, it is forwarded. The value returned from the function becomes the value of the promise returned by the then function.
+         * @param onProgress The function to be called if the promise reports progress. Data about the progress is passed as the single argument. Promises are not required to support progress.
+         * @returns The promise whose value is the result of executing the onComplete function.
+        **/
+        static then(promise: IPromise<any>, onComplete?: (value: any) => any, onError?: (error: any) => any, onProgress?: (progress: any) => void): IPromise<any>;
+
+        /**
+         * Performs an operation on all the input promises and returns a promise that has the shape of the input and contains the result of the operation that has been performed on each input.
+         * @param values A set of values (which could be either an array or an object) of which some or all are promises..
+         * @param complete The function to be called if the promise is fulfilled with a value. This function takes a single argument, which is the fulfilled value of the promise.
+         * @param error The function to be called if the promise is fulfilled with an error. This function takes a single argument, which is the error value of the promise.
+         * @param progress The function to be called if the promise reports progress. This function takes a single argument, which is the data about the progress of the promise. Promises are not required to support progress.
+         * @returns A Promise that is the result of calling join on the values parameter.
+        **/
+        static thenEach(values: any, complete?: (value: any) => void, error?: (error: any) => void, progress?: (progress: any) => void): IPromise<any>;
+
+        /**
+         * This method has two forms: WinJS.Promise.timeout(timeout) and WinJS.Promise.timeout(timeout, promise). WinJS.Promise.timeout(timeout) creates a promise that is completed asynchronously after the specified timeout, essentially wrapping a call to setTimeout within a promise. WinJS.Promise.timeout(timeout, promise) sets a timeout period for completion of the specified promise, automatically canceling the promise if it is not completed within the timeout period.
+         * @param timeout The timeout period in milliseconds. If this value is zero or not specified, msSetImmediate is called, otherwise setTimeout is called.
+         * @param promise Optional. A promise that will be canceled if it doesn't complete within the timeout period.
+         * @returns If the promise parameter is omitted, returns a promise that will be fulfilled after the timeout period. If the promise paramater is provided, the same promise is returned.
+        **/
+        static timeout(timeout?: number, promise?: IPromise<any>): IPromise<any>;
+
+        /**
+         * Wraps a non-promise value in a promise. This method is like wrapError, which allows you to produce a Promise in error conditions, in that it allows you to return a Promise in success conditions.
+         * @param value Some non-promise value to be wrapped in a promise.
+         * @returns A promise that is successfully fulfilled with the specified value.
+        **/
+        static wrap<U>(value?: U): IPromise<U>;
+
+        /**
+         * Wraps a non-promise error value in a promise. You can use this function if you need to pass an error to a function that requires a promise.
+         * @param error A non-promise error value to be wrapped in a promise.
+         * @returns A promise that is in an error state with the specified value.
+        **/
+        static wrapError<U>(error: U): IPromise<U>;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+    }
+
+    //#endregion Objects
+
+    //#region Functions
+
+    /**
+     * You can provide an implementation of this method yourself, or use WinJS.Utilities.startLog to create one that logs to the JavaScript console.
+     * @param message The message to log.
+     * @param tags The tag or tags to categorize the message (winjs, winjs controls, etc.).
+     * @param type The type of message (error, warning, info, etc.).
+    **/
+    function log(message: string, tags?: string, type?: string): void;
+    function log(message: () => string, tags?: string, type?: string): void;
+
+    /**
+     * Wraps calls to XMLHttpRequest in a promise.
+     * @param options The options that are applied to the XMLHttpRequest object, as follows: type, url, user, password, responseType, headers, data, customRequestInitializer.
+     * @returns A promise that returns the XMLHttpRequest object when it completes.
+    **/
+    function xhr(options: IXHROptions): Promise<XMLHttpRequest>;
+
+    //#endregion Functions
+
+    //#region Interfaces
+
+    interface IXHROptions {
+        type?: string;
+        url: string;
+        user?: string;
+        password?: string;
+        headers?: any;
+        data?: any;
+        responseType?: string;
+        customRequestInitializer?: (request: XMLHttpRequest) => void;
+    }
+
+    //#endregion Interfaces
+}
+/**
+ * Provides helper functions for defining namespaces. For more information, see Organizing your code with WinJS.Namespace.
+**/
+declare namespace WinJS.Namespace {
+    //#region Functions
+
+    /**
+     * Defines a new namespace with the specified name. For more information, see Organizing your code with WinJS.Namespace.
+     * @param name The name of the namespace. This could be a dot-separated name for nested namespaces.
+     * @param members The members of the new namespace.
+     * @returns The newly-defined namespace.
+    **/
+    function define(name?: string, members?: any): any;
+
+    /**
+     * Defines a new namespace with the specified name under the specified parent namespace. For more information, see Organizing your code with WinJS.Namespace.
+     * @param parentNamespace The parent namespace.
+     * @param name The name of the new namespace.
+     * @param members The members of the new namespace.
+     * @returns The newly-defined namespace.
+    **/
+    function defineWithParent(parentNamespace?: any, name?: string, members?: any): any;
+
+    //#endregion Functions
+
+}
+/**
+ * Provides functionality for dealing with basic navigation, including the navigation stack.
+**/
+declare namespace WinJS.Navigation {
+    //#region Properties
+
+    /**
+     * Determines whether it is possible to navigate backwards.
+    **/
+    var canGoBack: boolean;
+
+    /**
+     * Determines if it is possible to navigate forwards.
+    **/
+    var canGoForward: boolean;
+
+    /**
+     * Gets or sets the navigation history.
+    **/
+    var history: any;
+
+    /**
+     * Gets or sets the current location.
+    **/
+    var location: string;
+
+    /**
+     * Gets or sets a user-defined object that represents the state associated with the current location.
+    **/
+    var state: any;
+
+    //#endregion Properties
+
+    //#region Functions
+
+    /**
+     * Adds an event listener to the control.
+     * @param eventType The type (name) of the event.
+     * @param listener The listener to invoke when the event gets raised.
+     * @param capture If true, specifies that capture should be initiated, otherwise false.
+    **/
+    function addEventListener(eventType: string, listener: Function, capture?: boolean): void;
+
+    /**
+     * Navigates backwards.
+     * @param distance The number of entries to go back into the history.
+     * @returns A promise that is completed with a value that indicates whether or not the navigation was successful.
+    **/
+    function back(distance?: number): Promise<boolean>;
+
+    /**
+     * Navigates forwards.
+     * @param distance The number of entries to go forward.
+     * @returns A promise that is completed with a value that indicates whether or not the navigation was successful.
+    **/
+    function forward(distance?: number): Promise<boolean>;
+
+    /**
+     * Navigates to a location.
+     * @param location The location to navigate to. Generally the location is a string containing the URL, but it may be anything.
+     * @param initialState A user-defined object that represents the navigation state that may be accessed through state.
+     * @returns A promise that is completed with a value that indicates whether or not the navigation was successful (true if successful, otherwise false).
+    **/
+    function navigate(location: any, initialState?: any): Promise<boolean>;
+
+    /**
+     * Removes an event listener from the control.
+     * @param eventType The type (name) of the event.
+     * @param listener The listener to remove.
+     * @param useCapture Specifies whether or not to initiate capture.
+    **/
+    function removeEventListener(eventType: string, listener: Function, useCapture?: boolean): void;
+
+    //#endregion Functions
+
+    //#region Events
+
+    /**
+     * Occurs before navigation.
+     * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: location, state.
+    **/
+    function onbeforenavigate(eventInfo: CustomEvent): void;
+
+    /**
+     * Occurs after navigation has taken place.
+     * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: location, state.
+    **/
+    function onnavigated(eventInfo: CustomEvent): void;
+
+    /**
+     * Occurs when navigation is taking place.
+     * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: location, state.
+    **/
+    function onnavigating(eventInfo: CustomEvent): void;
+
+    //#endregion Events
+
+}
+/**
+ * Provides functions for accessing resources and localizing content.
+**/
+declare namespace WinJS.Resources {
+    //#region Functions
+
+    /**
+     * Registers an event handler for the specified event. Use this method to register for events that are related to resources, such as when the app's language, scale, or contrast changes.
+     * @param type The name of the event to handle.
+     * @param listener The listener (event handler function) to associate with the event.
+     * @param useCapture Set to true to register the listener for the capturing phase; otherwise, set to false to register the listener for the bubbling phase.
+    **/
+    function addEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+    /**
+     * Raises an event of the specified type and with the specified additional properties.
+     * @param type The name of the event to raise.
+     * @param details The set of additional properties to attach to the event object.
+    **/
+    function dispatchEvent(type: string, details: any): void;
+
+    /**
+     * Retrieves the resource string that has the specified resource identifier.
+     * @param resourceId The resource ID of the string to retrieve.
+     * @returns An object that can contain these properties: value, empty, lang.
+    **/
+    function getString(resourceId: string): { value: string; empty?: boolean; lang?: string; };
+
+    /**
+     * Processes data-win-res attributes on elements and replaces attributes and properties with resource strings.
+     * @param rootElement The element to process. The element and its child elements will be processed. If an element isn't specified, the entire document is processed.
+    **/
+    function processAll(rootElement?: HTMLElement): Promise<void>;
+
+    /**
+     * Removes an event listener that the addEventListener method registered.
+     * @param type The name of the event that the event listener is registered for.
+     * @param listener The listener (event handler function) to remove.
+     * @param useCapture Set to true to remove the capturing phase listener; set to false to remove the bubbling phase listener.
+    **/
+    function removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+    //#endregion Functions
+
+    //#region Events
+
+    /**
+     * Occurs when the user changes the system's language or contrast, or the scale of the display, or when the user changes any of the items in the current context's qualifier values list. For more info about the current context's qualifier values list, see the Remarks section.
+     * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.qualifier, detail.changed.
+    **/
+    function oncontextchanged(eventInfo: CustomEvent): void;
+
+    //#endregion Events
+
+}
+/**
+ * Provides access to the Windows animations. These functions provide developers with the ability to use animations in their custom controls that are consistent with animations used by Windows controls.
+**/
+declare namespace WinJS.UI.Animation {
+    //#region Functions
+
+    /**
+     * Creates an object that performs an animation that adds an item or items to a list.
+     * @param added Element or elements to add to the list.
+     * @param affected Element or elements affected by the added items. Typically, this is all other items displayed in the list.
+     * @returns An object whose execute method is used to execute the animation. The execute method returns a Promise that completes when the animation is finished.
+    **/
+    function createAddToListAnimation(added: any, affected: any): IAnimationMethodResponse;
+
+    /**
+     * Creates an object that performs an animation that adds an item or items to a list of search results.
+     * @param added Element or elements to add to the list.
+     * @param affected Element or elements affected by the added items. Typically, this is all other items displayed in the list.
+     * @returns An object whose execute method is used to execute the animation. The execute method returns a Promise that completes when the animation is finished.
+    **/
+    function createAddToSearchListAnimation(added: any, affected: any): IAnimationMethodResponse;
+
+    /**
+     * Creates an object that performs an animation that collapses a list.
+     * @param hidden Element or elements hidden as a result of the collapse.
+     * @param affected Element or elements affected by the hidden items. Typically, this is all other items displayed in the list.
+     * @returns An object whose execute method is used to execute the animation. The execute method returns a Promise that completes when the animation is finished.
+    **/
+    function createCollapseAnimation(hidden: any, affected: any): IAnimationMethodResponse;
+
+    /**
+     * Creates an object that performs an animation that removes an item or items from a list.
+     * @param deleted Element or elements to delete from the list.
+     * @param remaining Element or elements affected by the removal of the deleted items. Typically, this is all other items displayed in the list.
+     * @returns An object whose execute method is used to execute the animation. The execute method returns a Promise that completes when the animation is finished.
+    **/
+    function createDeleteFromListAnimation(deleted: any, remaining: any): IAnimationMethodResponse;
+
+    /**
+     * Creates an object that performs an animation that removes an item or items from a list of search results.
+     * @param deleted Element or elements to delete from the list.
+     * @param remaining Element or elements affected by the removal of the deleted items. Typically, this is all other items displayed in the list.
+     * @returns An object whose execute method is used to execute the animation. The execute method returns a Promise that completes when the animation is finished.
+    **/
+    function createDeleteFromSearchListAnimation(deleted: any, remaining: any): IAnimationMethodResponse;
+
+    /**
+     * Creates an object that performs an animation that expands a list.
+     * @param revealed Element or elements revealed by the expansion.
+     * @param affected Element or elements affected by the newly revealed items. Typically, this is all other items displayed in the list.
+     * @returns An object whose execute method is used to execute the animation. The execute method returns a Promise that completes when the animation is finished.
+    **/
+    function createExpandAnimation(revealed: any, affected: any): IAnimationMethodResponse;
+
+    /**
+     * Creates an exit and entrance animation to play for a page navigation given the current and incoming pages'
+     * animation preferences and whether the pages are navigating forwards or backwards.
+     * @param currentPreferredAnimation A value from WinJS.UI.PageNavigationAnimation describing the animation the current page prefers to use.
+     * @param A value from nextPreferredAnimation WinJS.UI.PageNavigationAnimation describing the animation the incoming page prefers to use.
+     * @param movingBackwards Boolean value for whether the navigation is moving backwards.
+     * @returns an object containing the exit and entrance animations to play based on the parameters given.
+    **/
+    function createPageNavigationAnimations(currentPreferredAnimation: string, nextPreferredAnimation: string, movingBackwards: boolean): { exit: Function; entrance: Function };
+
+    /**
+     * Creates an object that performs a peek animation.
+     * @param element Element or elements involved in the peek.
+     * @returns An object whose execute method is used to execute the animation. The execute method returns a Promise that completes when the animation is finished.
+    **/
+    function createPeekAnimation(element: any): IAnimationMethodResponse;
+
+    /**
+     * Creates an object that performs an animation that moves an item or items.
+     * @param element Element or elements involved in the reposition.
+     * @returns An object whose execute method is used to execute the animation. The execute method returns a Promise object that completes when the animation is finished.
+    **/
+    function createRepositionAnimation(element: any): IAnimationMethodResponse;
+
+    /**
+     * Performs an animation that fades an item or items in, fading out existing items that occupy the same space.
+     * @param incoming Element or elements being faded in.
+     * @param outgoing Element or elements being replaced.
+     * @returns An object that completes when the animation has finished.
+    **/
+    function crossFade(incoming: any, outgoing: any): Promise<any>;
+
+    /**
+     * Performs an animation when a dragged object is moved such that dropping it in that position would move other items. The potentially affected items are animated out of the way to show where the object would be dropped.
+     * @param target Element or elements that the dragged object would cause to be moved if it were dropped.
+     * @param offset Initial offsets where the animated objects begin relative to their final position at the end of the animation. Set this parameter to null to use the recommended default offset. Note When the incoming parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
+     * @returns An object that completes when the animation is finished.
+    **/
+    function dragBetweenEnter(target: any, offset?: any): Promise<any>;
+
+    /**
+     * Performs an animation when a dragged object is moved away from items that it had previously involved in a dragBetweenEnter animation. The affected objects are animated back to their original positions.
+     * @param target Element or elements that the dragged object would no longer cause to be displaced, due to its moving away. This should be the same element or element collection passed as the target parameter in the dragBetweenEnter animation.
+     * @returns An object that completes when the animation is finished.
+    **/
+    function dragBetweenLeave(target: any): Promise<any>;
+
+    /**
+     * Performs an animation when the user finishes dragging an object.
+     * @param dragSource Element or elements that were dragged.
+     * @param offset Initial offset from the drop point. The dropped object begins at the offset and animates to its final position at the drop point. Note When the element parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
+     * @param affected Element or elements whose position the dropped object affects. Typically, this is all other items in a reorderable list. This should be the same element or element collection passed as the affected parameter in the dragSourceStart animation.
+     * @returns An object that completes when the animation is finished.
+    **/
+    function dragSourceEnd(dragSource: any, offset?: any, affected?: any): Promise<any>;
+
+    /**
+     * Performs an animation when the user begins to drag an object.
+     * @param dragSource Element or elements being dragged.
+     * @param affected Element or elements whose position is affected by the movement of the dragged object. Typically, this is all other items in a reorderable list.
+     * @returns An object that completes when the animation is finished.
+    **/
+    function dragSourceStart(dragSource: any, affected?: any): Promise<any>;
+
+    /**
+     * Execute the incoming phase of the drill in animation, scaling up the incoming page while fading it in.
+     * @param incomingPage Element to be scaled up and faded in.
+     * @returns Promise object that completes when the animation is complete.
+    **/
+    function drillInIncoming(incomingPage: HTMLElement): Promise<any>;
+
+    /**
+     * Execute the outgoing phase of the drill in animation, scaling up the outgoing page while fading it out.
+     * @param incomingPage Element to be scaled up and faded out.
+     * @returns Promise object that completes when the animation is complete.
+    **/
+    function drillInOutgoing(outgoingPage: HTMLElement): Promise<any>;
+
+    /**
+     * Execute the incoming phase of the drill out animation, scaling down the incoming page while fading it in.
+     * @param incomingPage Element to be scaled up and faded in.
+     * @returns Promise object that completes when the animation is complete.
+    **/
+    function drillOutIncoming(incomingPage: HTMLElement): Promise<any>;
+
+    /**
+     * Execute the outgoing phase of the drill out animation, scaling down the outgoing page while fading it out.
+     * @param outgoingPage Element to be scaled down and faded out.
+     * @returns Promise object that completes when the animation is complete.
+    **/
+    function drillOutOutgoing(outgoingPage: HTMLElement): Promise<any>;
+
+    /**
+     * Performs an animation that displays one or more elements on a page.
+     * @param incoming Element or elements that compose the incoming content.
+     * @param offset Initial offsets where the animated objects begin relative to their final position at the end of the animation. Set this parameter to null to use the recommended default offset. Note When the incoming parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
+     * @param options Optional. Set this value to { mechanism: "transition" } to play the animation using CSS transitions instead of the default CSS animations. In some cases this can result in improved performance.
+     * @returns An object that completes when the animation is finished.
+    **/
+    function enterContent(incoming: any, offset?: any, options?: any): Promise<any>;
+
+    /**
+     * Performs an animation that shows a new page of content, either when transitioning between pages in a running app or when displaying the first content in a newly launched app.
+     * @param element Element or an array of elements that represent the content. If element refers to an array of elements, the elements enter in array order.
+     * @param offset An initial offset where the element or elements begin relative to their final position at the end of the animation. Set this parameter to null to use the recommended default offset. Note When the element parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
+     * @returns An object that completes when the animation is finished.
+    **/
+    function enterPage(element: any, offset?: any): Promise<any>;
+
+    /**
+     * Performs an animation that hides one or more elements on a page.
+     * @param outgoing Element or elements that compose the outgoing content.
+     * @param offset Initial offsets where the animated objects begin relative to their final position at the end of the animation. Set this parameter to null to use the recommended default offset. Note When the incoming parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
+     * @returns An object that completes when the animation is finished.
+    **/
+    function exitContent(outgoing: any, offset?: any): Promise<any>;
+
+    /**
+     * Performs an animation that dismisses the current page when transitioning between pages in an app.
+     * @param outgoing Element or elements that compose the outgoing page.
+     * @param offset Initial offsets where the animated objects begin relative to their final position at the end of the animation. Set this parameter to null to use the recommended default offset. Note When the incoming parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
+     * @returns An object that completes when the animation is finished.
+    **/
+    function exitPage(outgoing: any, offset?: any): Promise<any>;
+
+    /**
+     * Performs an animation that fades an item or set of items into view.
+     * @param shown Element or elements being faded in.
+     * @returns An object that completes when the animation has finished. Use this object when subsequent actions need this animation to finish before they take place.
+    **/
+    function fadeIn(shown: any): Promise<any>;
+
+    /**
+     * Performs an animation that fades an item or set of items out of view.
+     * @param hidden Element or elements being faded out.
+     * @returns An object that completes when the animation is finished.
+    **/
+    function fadeOut(hidden: any): Promise<any>;
+
+    /**
+     * Performs an animation that hides edge-based user interface (UI).
+     * @param element Element or elements that are being hidden.
+     * @param offset Initial offsets where the animated objects begin relative to their final position at the end of the animation. Offsets should be the chosen so that the elements end the animation just off-screen. Note When the element parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
+     * @param options Optional. Set this value to { mechanism: "transition" } to play the animation using CSS transitions instead of the default CSS animations. In some cases this can result in improved performance.
+     * @returns An object that completes when the animation is finished.
+    **/
+    function hideEdgeUI(element: any, offset?: any, options?: any): Promise<any>;
+
+    /**
+     * Performs an animation that hides a panel.
+     * @param element Element or elements that are being hidden.
+     * @param offset Initial offsets where the animated objects begin relative to their final position at the end of the animation. Offsets should be the chosen so that the elements end the animation just off-screen. Note When the element parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
+     * @returns An object that completes when the animation is finished.
+    **/
+    function hidePanel(element: any, offset?: any): Promise<any>;
+
+    /**
+     * Performs an animation that removes pop-up user interface (UI).
+     * @param element Element or elements that are being hidden.
+     * @returns An object that completes when the animation is finished.
+    **/
+    function hidePopup(element: any): Promise<any>;
+
+    /**
+     * Performs an animation when a pointer is pressed on an object.
+     * @param element Element or elements on which the pointer is pressed.
+     * @returns An object that completes when the animation is finished.
+    **/
+    function pointerDown(element: any): Promise<any>;
+
+    /**
+     * Performs an animation when a pointer is released.
+     * @param element Element or elements that the pointer was pressed on.
+     * @returns An object that completes when the animation is finished.
+    **/
+    function pointerUp(element: any): Promise<any>;
+
+    /**
+     * Performs an animation that slides a narrow, edge-based user interface (UI) into view.
+     * @param element Element or elements that are being shown.
+     * @param offset Initial offsets where the animated objects begin relative to their final position at the end of the animation. Offsets should be the chosen so that the elements begin the animation from just off-screen. Note When the element parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
+     * @param options Optional. Set this value to { mechanism: "transition" } to play the animation using CSS transitions instead of the default CSS animations. In some cases this can result in improved performance.
+     * @returns An object that completes when the animation is finished.
+    **/
+    function showEdgeUI(element: any, offset?: any, options?: any): Promise<any>;
+
+    /**
+     * Performs an animation that slides a large panel user interface (UI) into view.
+     * @param element Element or elements that are being shown.
+     * @param offset Initial offsets where the animated objects begin relative to their final position at the end of the animation. Offsets should be the chosen so that the elements begin the animation from just off-screen. Note When the element parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
+     * @returns An object that completes when the animation is finished.
+    **/
+    function showPanel(element: any, offset?: any): Promise<any>;
+
+    /**
+     * Performs an animation that displays a pop-up user interface (UI).
+     * @param element Element or elements that are being shown.
+     * @param offset Initial offsets where the animated objects begin relative to their final position at the end of the animation. Offsets should be the chosen so that the elements begin the animation from just off-screen. Set this parameter to null to use the recommended default offset. Note When the element parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
+     * @returns An object that completes when the animation is finished.
+    **/
+    function showPopup(element: any, offset?: any): Promise<any>;
+
+    /**
+     * Performs a deselection animation in response to a swipe interaction.
+     * @param deselected Element or elements that become unselected.
+     * @param selection Element or elements that represent the selection, typically a check mark.
+     * @returns An object that completes when the animation is finished.
+    **/
+    function swipeDeselect(deselected: any, selection: any): Promise<any>;
+
+    /**
+     * Performs an animation that reveals an item or items in response to a swipe interaction.
+     * @param target Element or elements being revealed.
+     * @param offset An initial offset where the animated objects begin relative to their final position at the end of the animation. Set this parameter to null to use the recommended default offset. Note When the incoming parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
+     * @returns An object that completes when the animation is finished.
+    **/
+    function swipeReveal(target: any, offset?: any): Promise<any>;
+
+    /**
+     * Performs a selection animation in response to a swipe interaction.
+     * @param selected Element or elements being selected.
+     * @param selection Element or elements that show that something is selected, typically a check mark.
+     * @returns An object that completes when the animation is finished.
+    **/
+    function swipeSelect(selected: any, selection: any): Promise<any>;
+
+    /**
+     * Performs an animation that updates a badge.
+     * @param incoming Element or elements that comprise the new badge.
+     * @param offset Initial offsets where incoming animated objects begin relative to their final position at the end of the animation. Set this parameter to null to use the recommended default offset. Note When the incoming parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
+     * @returns An object that completes when the animation is finished.
+    **/
+    function updateBadge(incoming: any, offset?: any): Promise<any>;
+
+    /**
+     * Execute a slide up animation.
+     * @param incoming Single element or collection of elements to animate sliding up.
+     * @returns A Promise that completes when the animation is finished.
+    **/
+    function slideUp(incoming: any): Promise<any>;
+
+    /**
+     * Execute a slide down animation.
+     * @param incoming Single element or collection of elements to animate sliding down.
+     * @returns A Promise that completes when the animation is finished.
+    **/
+    function slideDown(incoming: any): Promise<any>;
+
+    /**
+     * Execute a slide in from right to left animation.
+     * @param page The page containing all elements to slide.
+     * @param first First element or collection of elements to animate sliding in.
+     * @param second Second element or collection of elements to animate sliding in, which will be offset slightly farther than the first.
+     * @param third Third element or collection of elements to animate sliding in, which will be offset slightly farther than the second.
+     * @returns A Promise that completes when the animation is finished.
+    **/
+    function slideLeftIn(page: any, first: any, second: any, third: any): Promise<any>;
+
+    /**
+     * Execute a slide out from right to left animation.
+     * @param page The page containing all elements to slide.
+     * @param first First element or collection of elements to animate sliding out.
+     * @param second Second element or collection of elements to animate sliding out, which will be offset slightly farther than the first.
+     * @param third Third element or collection of elements to animate sliding out, which will be offset slightly farther than the second.
+     * @returns A Promise that completes when the animation is finished.
+    **/
+    function slideLeftOut(page: any, first: any, second: any, third: any): Promise<any>;
+
+    /**
+     * Execute a slide in from left to right animation.
+     * @param page The page containing all elements to slide.
+     * @param first First element or collection of elements to animate sliding in.
+     * @param second Second element or collection of elements to animate sliding in, which will be offset slightly farther than the first.
+     * @param third Third element or collection of elements to animate sliding in, which will be offset slightly farther than the second.
+     * @returns A Promise that completes when the animation is finished.
+    **/
+    function slideRightIn(page: any, first: any, second: any, third: any): Promise<any>;
+
+    /**
+     * Execute a slide out from left to right animation.
+     * @param page The page containing all elements to slide.
+     * @param first First element or collection of elements to animate sliding out.
+     * @param second Second element or collection of elements to animate sliding out, which will be offset slightly farther than the first.
+     * @param third Third element or collection of elements to animate sliding out, which will be offset slightly farther than the second.
+     * @returns A Promise that completes when the animation is finished.
+    **/
+    function slideRightOut(page: any, first: any, second: any, third: any): Promise<any>;
+
+    /**
+     * Execute a continuum animation, scaling up the incoming page while scaling, rotating, and translating the incoming item.
+     * @param page Single element to be scaled up that is the page root and does not contain the incoming item.
+     * @param itemRoot Root of the item that will be translated as part of the continuum animation.
+     * @param itemContent Content of the item that will be scaled and rotated as part of the continuum animation.
+     * @returns A Promise that completes when the animation is finished.
+    **/
+    function continuumForwardIn(page: any, itemRoot: any, itemContent: any): Promise<any>;
+
+    /**
+     * Execute a continuum animation, scaling down the outgoing page while scaling, rotating, and translating the outgoing item.
+     * @param page Single element to be scaled down that is the page root and contains the outgoing item.
+     * @param item Single element to be scaled, rotated, and translated away from the outgoing page.
+     * @returns A Promise that completes when the animation is finished.
+    **/
+    function continuumForwardOut(page: any, item: any): Promise<any>;
+
+    /**
+     * Execute a continuum animation, scaling down the incoming page while scaling, rotating, and translating the incoming item.
+     * @param page Single element to be scaled down that is the page root and contains the incoming item.
+     * @param item Single element to be scaled, rotated, and translated into its final position on the page.
+     * @returns A Promise that completes when the animation is finished.
+    **/
+    function continuumBackwardIn(page: any, item: any): Promise<any>;
+
+    /**
+     * Execute a continuum animation, scaling down the outgoing page while.
+     * @param page Single element to be scaled down that is the page root.
+     * @returns A Promise that completes when the animation is finished.
+    **/
+    function continuumBackwardOut(page: any): Promise<any>;
+
+    /**
+     * Execute a turnstile forward in animation.
+     * @param incoming Single element or collection of elements to animate.
+     * @returns A Promise that completes when the animation is finished.
+    **/
+    function turnstileForwardIn(incoming: any): Promise<any>;
+
+    /**
+     * Execute a turnstile forward out animation.
+     * @param outgoing Single element or collection of elements to animate.
+     * @returns A Promise that completes when the animation is finished.
+    **/
+    function turnstileForwardOut(outgoing: any): Promise<any>;
+
+    /**
+     * Execute a turnstile backward in animation.
+     * @param incoming Single element or collection of elements to animate.
+     * @returns A Promise that completes when the animation is finished.
+    **/
+    function turnstileBackwardIn(incoming: any): Promise<any>;
+
+    /**
+     * Execute a turnstile backward out animation.
+     * @param outgoing Single element or collection of elements to animate.
+     * @returns A Promise that completes when the animation is finished.
+    **/
+    function turnstileBackwardOut(outgoing: any): Promise<any>;
+
+
+    //#endregion Functions
+
+    //#region Interfaces
+
+    interface IAnimationMethodResponse {
+        execute(): Promise<any>;
+    }
+
+    //#endregion Interfaces
+
+}
+/**
+ * Provides controls and objects that manipulate data.
+**/
+declare namespace WinJS.UI {
+    //#region Enumerations
+
+    /**
+     * Specifies an icon that appears in an AppBarCommand object.
+    **/
+    enum AppBarIcon {
+        previous,
+        next,
+        play,
+        pause,
+        edit,
+        save,
+        clear,
+        delete,
+        remove,
+        add,
+        cancel,
+        accept,
+        more,
+        redo,
+        undo,
+        home,
+        up,
+        forward,
+        right,
+        back,
+        left,
+        favorite,
+        camera,
+        settings,
+        video,
+        sync,
+        download,
+        mail,
+        find,
+        help,
+        upload,
+        emoji,
+        twopage,
+        leavechat,
+        mailforward,
+        clock,
+        send,
+        crop,
+        rotatecamera,
+        people,
+        closepane,
+        openpane,
+        world,
+        flag,
+        previewlink,
+        globe,
+        trim,
+        attachcamera,
+        zoomin,
+        bookmarks,
+        document,
+        protecteddocument,
+        page,
+        bullets,
+        comment,
+        mail2,
+        contactinfo,
+        hangup,
+        viewall,
+        mappin,
+        phone,
+        videochat,
+        switch,
+        contact,
+        rename,
+        pin,
+        musicinfo,
+        go,
+        keyboard,
+        dockleft,
+        dockright,
+        dockbottom,
+        remote,
+        refresh,
+        rotate,
+        shuffle,
+        list,
+        shop,
+        selectall,
+        orientation,
+        import,
+        importall,
+        browsephotos,
+        webcam,
+        pictures,
+        savelocal,
+        caption,
+        stop,
+        showresults,
+        volume,
+        repair,
+        message,
+        page2,
+        calendarday,
+        calendarweek,
+        calendar,
+        characters,
+        mailreplyall,
+        read,
+        link,
+        accounts,
+        showbcc,
+        hidebcc,
+        cut,
+        attach,
+        paste,
+        filter,
+        copy,
+        emoji2,
+        important,
+        mailreply,
+        slideshow,
+        sort,
+        manage,
+        allapps,
+        disconnectdrive,
+        mapdrive,
+        newwindow,
+        openwith,
+        contactpresence,
+        priority,
+        uploadskydrive,
+        gototoday,
+        font,
+        fontcolor,
+        contact2,
+        folder,
+        audio,
+        placeholder,
+        view,
+        setlockscreen,
+        settile,
+        cc,
+        stopslideshow,
+        permissions,
+        highlight,
+        disableupdates,
+        unfavorite,
+        unpin,
+        openlocal,
+        mute,
+        italic,
+        underline,
+        bold,
+        movetofolder,
+        likedislike,
+        dislike,
+        like,
+        alignright,
+        aligncenter,
+        alignleft,
+        zoom,
+        zoomout,
+        openfile,
+        otheruser,
+        admin,
+        street,
+        map,
+        clearselection,
+        fontdecrease,
+        fontincrease,
+        fontsize,
+        cellphone,
+        reshare,
+        tag,
+        repeatone,
+        repeatall,
+        outlinestar,
+        solidstar,
+        calculator,
+        directions,
+        target,
+        library,
+        phonebook,
+        memo,
+        microphone,
+        postupdate,
+        backtowindow,
+        fullscreen,
+        newfolder,
+        calendarreply,
+        unsyncfolder,
+        reporthacked,
+        syncfolder,
+        blockcontact,
+        switchapps,
+        addfriend,
+        touchpointer,
+        gotostart,
+        zerobars,
+        onebar,
+        twobars,
+        threebars,
+        fourbars,
+        scan,
+        preview,
+        hamburger
+    }
+
+    /**
+     * Indicates whether the IListDataAdapter was able to provide a count.
+    **/
+    enum CountResult {
+        /**
+         * Indicates no count is available.
+        **/
+        unknown
+    }
+
+    /**
+     * Indicates that the IListDataAdapter was unable to provide a count.
+    **/
+    enum CountError {
+        /**
+         * An attempt to count items timed out.
+        **/
+        noResponse
+    }
+
+    /**
+     * Describes the status of an IListDataSource.
+    **/
+    enum DataSourceStatus {
+        /**
+         * The IListDataSource is ready.
+        **/
+        ready,
+        /**
+         * The IListDataSource is still loading.
+        **/
+        waiting,
+        /**
+         * The IListDataSource failed to load.
+        **/
+        failure
+    }
+
+    /**
+     * Specifies the type of error that occurred during an edit operation on a IListDataSource or an IListDataAdapter.
+    **/
+    enum EditError {
+        /**
+         * The edit operation timed out.
+        **/
+        noResponse,
+        /**
+         * The edit operation was canceled.
+        **/
+        canceled,
+        /**
+         * The data source cannot be written to.
+        **/
+        notPermitted,
+        /**
+         * The item has changed.
+        **/
+        noLongerMeaningful
+    }
+
+    /**
+     * Specifies the type of error encountered when retrieving items from an IListDataAdapter.
+    **/
+    enum FetchError {
+        /**
+         * The fetch operation timed out.
+        **/
+        noResponse,
+        /**
+         * The specified item could not be located.
+        **/
+        doesNotExist
+    }
+
+    /**
+     * Specifies how group headers in a ListView respond to the tap interaction.
+    **/
+    enum GroupHeaderTapBehavior {
+        /**
+         * The group is invoked.
+        **/
+        invoke,
+        /**
+         * Nothing happens.
+        **/
+        none
+    }
+
+    /**
+     * Specifies the position of group headers relative to their items in a ListView.
+    **/
+    enum HeaderPosition {
+        /**
+         * Group headers appear to the left of items.
+        **/
+        left,
+        /**
+         * Group headers appear above items.
+        **/
+        top
+    }
+
+    /**
+     * Specifies that type of animation for which a contentanimating event was raised.
+    **/
+    enum ListViewAnimationType {
+        /**
+         * The animation plays when the ListView is first displayed.
+        **/
+        entrance,
+        /**
+         * The animation plays when the ListView is changing its content.
+        **/
+        contentTransition
+    }
+
+    /**
+     * Describes the type of object in a ListView.
+    **/
+    enum ObjectType {
+        /**
+         * The object is a group header in the list.
+        **/
+        groupHeader,
+        /**
+         * The object is an item in the list.
+        **/
+        item,
+        /**
+         * The object is the header for the list.
+        **/
+        header,
+        /**
+         * The object is the footer for the list.
+        **/
+        footer
+    }
+
+    /**
+     * Specifies the orientation of a control.
+    **/
+    enum Orientation {
+        /**
+         * A horizontal layout.
+        **/
+        horizontal,
+        /**
+         * A vertical layout.
+        **/
+        vertical
+    }
+
+    /**
+     * Specifies the selection mode of a ListView.
+    **/
+    enum SelectionMode {
+        /**
+         * Items cannot be selected.
+        **/
+        none,
+        /**
+         * A single item may be selected.
+        **/
+        single,
+        /**
+         * Multiple items may be selected. Clicking additional items adds them to the selection.
+        **/
+        multi
+    }
+
+    /**
+     * Specifies whether elements are selected when the user performs a swipe interaction.
+    **/
+    enum SwipeBehavior {
+        /**
+         * The swipe interaction selects the elements touched by the swipe.
+        **/
+        select,
+        /**
+         * The swipe interaction does not change which elements are selected.
+        **/
+        none
+    }
+
+    /**
+     * Specifies how items in a ListView respond to the tap interaction.
+    **/
+    enum TapBehavior {
+        /**
+         * The item is selected and invoked.
+        **/
+        directSelect,
+        /**
+         * The item is selected if was not already selected, and its deselected if it was already selected.
+        **/
+        toggleSelect,
+        /**
+         * The item is invoked but not selected.
+        **/
+        invokeOnly,
+        /**
+         * Nothing happens.
+        **/
+        none
+    }
+
+    /**
+     * Specifies what animation type should be returned by WinJS.UI.Animation.createPageNavigationAnimations.
+    **/
+    enum PageNavigationAnimation {
+        /**
+         * The pages will exit and enter using a turnstile animation.
+        **/
+        turnstile,
+        /**
+         * The pages will exit and enter using an animation that slides up/down.
+        **/
+        slide,
+        /**
+         * The pages will enter using an enterPage animation, and exit with no animation.
+        **/
+        enterPage,
+        /**
+         * The pages will exit and enter using a continuum animation.
+        **/
+        continuum,
+    }
+
+    //#endregion Enumerations
+
+    //#region Interfaces
+
+    /**
+     * Define the shape of a Command object to be used in AppBar and ToolBar controls.
+    **/
+    export interface ICommand {
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param type The event type to register.
+         * @param listener The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+        /**
+         * Releases resources held by this ICommand. Call this method when the ICommand is no longer needed. After calling this method, the ICommand becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param type The event type to unregister.
+         * @param listener The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets a value that indicates whether the ICommand is disabled.
+        **/
+        disabled: boolean;
+
+        /**
+         * Gets the DOM element that hosts the ICommand.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Adds an extra CSS class during construction.
+        **/
+        extraClass: string;
+
+        /**
+         * Gets or sets the HTMLElement with a 'content' type ICommand that should receive focus whenever focus moves by the user pressing HOME or the arrow keys, from the previous ICommand to this ICommand.
+        **/
+        firstElementFocus: HTMLElement;
+
+        /**
+         * Gets or sets the Flyout object displayed by this command. The specified flyout is shown when the ICommand's button is invoked.
+        **/
+        flyout: Flyout;
+
+        /**
+         * Gets or sets a value that indicates whether the ICommand is hiding or in the process of becoming hidden.
+        **/
+        hidden: boolean;
+
+        /**
+         * Gets or sets the icon of the ICommand.
+        **/
+        icon: string;
+
+        /**
+         * Gets the element identifier (ID) of the command.
+        **/
+        id: string;
+
+        /**
+         * Gets or sets the label of the command.
+        **/
+        label: string;
+
+        /**
+         * Gets or sets the HTMLElement with a 'content' type ICommand that should receive focus whenever focus moves by the user pressing END or the arrow keys, from the previous Command to this Command.
+        **/
+        lastElementFocus: HTMLElement;
+
+        /**
+         * Gets or sets the function to be invoked when the command is clicked.
+        **/
+        onclick: Function;
+
+        /**
+         * Gets the section of the parent control that the command is in. The section can only be set through constructor options.
+        **/
+        section: string;
+
+        /**
+         * Gets or sets the selected state of a toggle button.
+        **/
+        selected: boolean;
+
+        /**
+         * Gets or sets the tooltip of the command.
+        **/
+        tooltip: string;
+
+        /**
+         * Gets the type of the command. The type can only be set through constructor options.
+        **/
+        type: string;
+
+        /**
+          * Gets or sets the priority of the command.
+         **/
+        priority: number;
+
+        //#endregion Properties
+    }
+
+
+    /**
+     * Contains items that were requested from an IListDataAdapter and provides some information about those items.
+    **/
+    interface IFetchResult<T> {
+        //#region Properties
+
+        /**
+         * Gets or sets the index of the requested item in the IListDataAdapter object's data source.
+        **/
+        absoluteIndex: number;
+
+        /**
+         * Gets or sets a value that indicates whether this IFetchResult contains the last items at the end of the IListDataAdapter object's data source.
+        **/
+        atEnd: boolean;
+
+        /**
+         * Gets or sets a value that indicates whether this IFetchResult contains the first items at the beginning of the IListDataAdapter object's data source.
+        **/
+        atStart: boolean;
+
+        /**
+         * Gets or sets the items returned by the fetch operation.
+        **/
+        items: T[];
+
+        /**
+         * Gets or sets the location of the requested item within the items array.
+        **/
+        offset: number;
+
+        /**
+         * Gets or sets the number of items in the IListDataAdapter object's underlying data source.
+        **/
+        totalCount: number;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Represents an item in a list.
+    **/
+    interface IItem<T> {
+        //#region Properties
+
+        /**
+         * Gets or sets the item's data.
+        **/
+        data: T;
+
+        /**
+         * Gets the group key for the item. This property is only available for items that belong to a grouped data source.
+        **/
+        groupKey: string;
+
+        /**
+         * Gets the temporary ID of the item.
+        **/
+        handle: string;
+
+        /**
+         * Gets the item's index in the IListDataSource.
+        **/
+        index: number;
+
+        /**
+         * Gets or sets the key the identifies the item.
+        **/
+        key: string;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Provides a mechanism for retrieving IItem objects asynchronously.
+    **/
+    interface IItemPromise<T> extends IPromise<T> {
+
+        //#region Methods
+
+        /**
+         * Stops change notification tracking for the IItem that fulfills this IItemPromise.
+        **/
+        release(): void;
+
+        /**
+         * Begins change notification tracking for the IItem that fulfills this IItemPromise.
+        **/
+        retain(): IItemPromise<T>;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets the temporary ID of the IItem that fulfills this promise.
+        **/
+        handle: string;
+
+        /**
+         * Gets or sets the index of the IItem contained by this IItemPromise.
+        **/
+        index: number;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Represents a layout for the ListView.
+    **/
+    interface ILayout2 {
+        //#region Methods
+
+        /**
+         * Called when the ListView finishes a drag operation.
+        **/
+        dragLeave(): void;
+
+        /**
+         * Called when the ListView initiates a drag operation.
+         * @param x The x-coordinate of the drag.
+         * @param y The y-coordinate of the drag.
+         * @param dragInfo An object that indicates whether the item is selected.
+        **/
+        dragOver(x: number, y: number, dragInfo: number): void;
+
+        /**
+         * Called when the ListView requests that the ILayout2 execute animations.
+        **/
+        executeAnimations(): void;
+
+        /**
+         * Determines the next item to receive keyboard focus.
+         * @param currentItem An object that describes the current item. It has these properties: index, type.
+         * @param pressedKey The key that was pressed.
+         * @returns An object that describes the next item that should receive focus. It has these properties: index, type.
+        **/
+        getAdjacent(currentItem: any, pressedKey: WinJS.Utilities.Key): any;
+
+        /**
+         * Gets the item at the specified hit-test coordinates. These coordinates are absolute coordinates (they are not relative to the layout's content area).
+         * @param x The x-coordinate to test for.
+         * @param y The y-coordinate to test for.
+         * @returns An object that describes the item at the hit test coordinates. It has these properties: type, index.
+        **/
+        hitTest(x: number, y: number): any;
+
+        /**
+         * Sets the rendering site and specifies whether the layout supports groups. This method is called by the ListView to initialize the layout.
+         * @param site The rendering site for the layout.
+         * @param groupsEnabled Set to true if this layout supports groups; set to false if it does not.
+        **/
+        initialize(site: ILayoutSite2, groupsEnabled: boolean): void;
+
+        /**
+         * Retrieves the indexes of the items in the specified pixel range.
+         * @param firstPixel The first pixel the range of items falls between.
+         * @param lastPixel The last pixel the range of items falls between.
+        **/
+        itemsFromRange(firstPixel: number, lastPixel: number): void;
+
+        /**
+         * Performs a layout pass.
+         * @param tree A structure representing the layout tree that is returned from the ListView.
+         * @param changedRange An object that lists the index of the first item in the changed item range. This object has these properties: startIndex.
+         * @param modifiedItems An object that contains the old and new indexes of the items that have been modified in the tree.
+         * @param modifiedGroups An object that contains the old and new indexes of the group elements that have been modified in the tree.
+         * @returns A Promise that executes after layout is complete, or an object that contains two Promise objects: realizedRangeComplete, layoutComplete.
+        **/
+        layout(tree: any, changedRange: any, modifiedItems: any, modifiedGroups: any): any;
+
+        /**
+         * Called when the ListView requests that the ILayout2 set up animations.
+        **/
+        setupAnimations(): void;
+
+        /**
+         * Releases resources that were obtained during the call to initialize.
+        **/
+        uninitialize(): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets the orientation of the layout.
+        **/
+        orientation: any;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * This API is no longer supported. Starting with the Windows Library for JavaScript 2.0 Preview, use the ILayoutSite2 interface. Represents a rendering site for an ILayout.
+    **/
+    interface ILayoutSite {
+        //#region Properties
+
+        /**
+         * This API is no longer supported. Starting with the Windows Library for JavaScript 2.0 Preview, use a the ILayoutSite2 interface.
+        **/
+        animationsDisabled: boolean;
+
+        /**
+         * This API is no longer supported. Starting with the Windows Library for JavaScript 2.0 Preview, use a the ILayoutSite2 interface.
+        **/
+        itemSurface: HTMLElement;
+
+        /**
+         * This API is no longer supported. Starting with the Windows Library for JavaScript 2.0 Preview, use a the ILayoutSite2 interface.
+        **/
+        rtl: boolean;
+
+        /**
+         * This API is no longer supported. Starting with the Windows Library for JavaScript 2.0 Preview, use a the ILayoutSite2 interface.
+        **/
+        scrollbarPos: number;
+
+        /**
+         * This API is no longer supported. Starting with the Windows Library for JavaScript 2.0 Preview, use a the ILayoutSite2 interface.
+        **/
+        surface: HTMLElement;
+
+        /**
+         * This API is no longer supported. Starting with the Windows Library for JavaScript 2.0 Preview, use a the ILayoutSite2 interface.
+        **/
+        viewport: HTMLElement;
+
+        /**
+         * This API is no longer supported. Starting with the Windows Library for JavaScript 2.0 Preview, use a the ILayoutSite2 interface.
+        **/
+        viewportSize: any;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Represents a rendering site for an ILayout2.
+    **/
+    interface ILayoutSite2 {
+        //#region Properties
+
+        /**
+         * Gets the number of groups in the site.
+        **/
+        groupCount: number;
+
+        /**
+         * Gets the number of items in the site.
+        **/
+        itemCount: Promise<number>;
+
+        /**
+         * Gets the pixel range of the realization area.
+        **/
+        realizedRange: any;
+
+        /**
+         * Gets the tree for use by an object that implements the ILayout2 interface.
+        **/
+        tree: any;
+
+        /**
+         * Gets the pixel range of visible items in the site.
+        **/
+        visibleRange: any;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Retrieves items from a IListDataSource, enumerates the contents of a IListDataSource, and can optionally register for change notifications.
+    **/
+    interface IListBinding<T> {
+        //#region Methods
+
+        /**
+         * Retrieves the current item.
+         * @returns An IItemPromise that contains the current item. If the cursor has moved past the start or end of the list, the promise completes with a value of null. If the current item has been moved or deleted, the promise returns an error.
+        **/
+        current(): IItemPromise<IItem<T>>;
+
+        /**
+         * Gets the first item from the IListDataSource and makes it the current item.
+         * @returns An IItemPromise that contains the requested IItem. If the list is empty, the promise completes with a value of null.
+        **/
+        first(): IItemPromise<IItem<T>>;
+
+        /**
+         * Retrieves the item from the IListDataSource that has the specified description and makes it the current item.
+         * @param description A domain-specific description, to be interpreted by the IListDataAdapter, that identifies the item to retrieve.
+         * @returns An IItemPromise that contains the requested IItem object. If the item wasn't found, the promise completes with a value of null.
+        **/
+        fromDescription(description: string): IItemPromise<IItem<T>>;
+
+        /**
+         * Retrieves the item from the IListDataSource that has the specified index and makes it the current item.
+         * @param index A value greater than or equal to 0 that is the index of the item to retrieve.
+         * @returns An IItemPromise that contains the requested IItem. If the item wasn't found, the promise completes with a value of null.
+        **/
+        fromIndex(index: number): IItemPromise<IItem<T>>;
+
+        /**
+         * Retrieves the item from the IListDataSource that has the specified key and makes it the current item.
+         * @param key The key that identifies the item to retrieve. This value must be a non-empty string.
+         * @param hints Domain-specific information that provides additional information to the IListDataAdapter to improve retrieval time.
+         * @returns An IItemPromise that contains the requested IItem. If they item couldn't be found, the promise completes with a value of null.
+        **/
+        fromKey(key: string, hints?: any): IItemPromise<IItem<T>>;
+
+        /**
+         * Makes the specified IItem or IItemPromise the current item.
+         * @param item The IItem or IItemPromise that will become the current item.
+         * @returns An IItemPromise that contains the specified item, if it exists. If the specified item is not in the list, the promise completes with a value of null.
+        **/
+        jumpToItem(item: IItem<T>): IItemPromise<IItem<T>>;
+
+        /**
+         * Retrieves the last item in the IListDataSource and makes it the current item.
+         * @returns An IItemPromise that contains the requested IItem. f the list is empty, the promise completes with a value of null.
+        **/
+        last(): IItemPromise<IItem<T>>;
+
+        /**
+         * Retrieves the item after the current item and makes it the current item.
+         * @returns An IItemPromise that contains the item after the current item. If the cursor moves past the end of the list, the promise completes with a value of null.
+        **/
+        next(): IItemPromise<IItem<T>>;
+
+        /**
+         * Retrieves the item before the current item and makes it the current item.
+         * @returns An IItemPromise that contains the item before the current item. If the cursor moves past the start of the list, the promise completes with a value of null.
+        **/
+        previous(): IItemPromise<IItem<T>>;
+
+        /**
+         * Releases resources, stops notifications, and cancels outstanding promises for all tracked items returned by this IListBinding.
+        **/
+        release(): void;
+
+        /**
+         * Creates a request to stop change notifications for the specified item. The change notifications stop when the number of releaseItem calls matches the number of IIItemPromise.retain calls.
+         * @param item The IItem or IItemPromise that should stop receiving notifications.
+        **/
+        releaseItem(item: IItem<T>): void;
+
+        //#endregion Methods
+
+    }
+
+    /**
+     * Accesses data for an IListDataSource.
+    **/
+    interface IListDataAdapter<T> {
+        //#region Methods
+
+        /**
+         * Overwrites the data of the specified item.
+         * @param key The key of the item to overwrite.
+         * @param newData The new data for the item.
+         * @param indexHint The index of the item, if known.
+         * @returns A Promise that returns null or undefined when the operation completes.
+        **/
+        change(key: string, newData: T, indexHint: number): Promise<void>;
+
+        /**
+         * Gets the number of items in the IListDataAdapter object's data source.
+         * @returns A Promise that contains the number of items the IListDataAdapter contains, or an approximate value if the actual number is unknown.
+        **/
+        getCount(): Promise<number>;
+
+        /**
+         * Inserts the specified data after the specified item.
+         * @param key A key that can be used to retrieve the new data.
+         * @param data The new data to add to the IListDataAdapter object's data source.
+         * @param previousKey The key of an item in the IListDataAdapter object's data source. The new data will be inserted after this item.
+         * @param previousIndexHint The index of the item to insert the new data after, if known.
+         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
+        **/
+        insertAfter(key: string, data: T, previousKey: string, previousIndexHint: number): Promise<IItem<T>>;
+
+        /**
+         * Adds the specified key and data to the end of the IListDataAdapter object's data source.
+         * @param key A key that can be used to retrieve the new data.
+         * @param data The new data to add to the IListDataAdapter object's data source.
+         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
+        **/
+        insertAtEnd(key: string, data: T): Promise<IItem<T>>;
+
+        /**
+         * Adds the specified key and data to the beginning of the IListDataAdapter object's data source.
+         * @param key A key that can be used to retrieve the new data.
+         * @param data The new data to add to the IListDataAdapter object's data source.
+         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
+        **/
+        insertAtStart(key: string, data: T): Promise<IItem<T>>;
+
+        /**
+         * Inserts the specified data before the specified item.
+         * @param key A key that can be used to retrieve the new data.
+         * @param data The new data to add to the IListDataAdapter object's data source.
+         * @param nextKey The key of an item in the IListDataAdapter object's data source. The new data will be inserted before this item.
+         * @param nextIndexHint The index of the item to insert the new data before, if known.
+         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
+        **/
+        insertBefore(key: string, data: T, nextKey: string, nextIndexHint: number): Promise<IItem<T>>;
+
+        /**
+         * Retrieves the item that matches the specified description and also retrieves the specified number of items before and after the matched item.
+         * @param description A description of the item to locate.
+         * @param countBefore The number of items before the matched item to retrieve.
+         * @param countAfter The number of items after the matched item to retrieve.
+         * @returns A Promise that provides an IFetchResult that contains the selected items or a FetchError if an error was encountered.
+        **/
+        itemsFromDescription(description: string, countBefore: number, countAfter: number): Promise<IFetchResult<T>>;
+
+        /**
+         * Retrieves the specified number of items from the end of the IListDataAdapter object's data source.
+         * @param count The number of items to retrieve.
+         * @returns A Promise that provides an IFetchResult that contains the selected items or a FetchError if an error was encountered.
+        **/
+        itemsFromEnd(count: number): Promise<IFetchResult<T>>;
+
+        /**
+         * Retrieves the item at the specified index and also retrieves the specified number of items before and after the selected item.
+         * @param index The index of the item to retrieve.
+         * @param countBefore The number of items to retrieve from before the selected item.
+         * @param countAfter The number of items to retrieve from after the selected item.
+         * @returns A Promise that provides an IFetchResult that contains the selected items or a FetchError if an error was encountered.
+        **/
+        itemsFromIndex(index: number, countBefore: number, countAfter: number): Promise<IFetchResult<T>>;
+
+        /**
+         * Retrieves the item that has the specified key and also retrieves the specified number of items before and after the selected item.
+         * @param key The key of the item to retrieve.
+         * @param countBefore The number of items to retrieve from before the selected item.
+         * @param countAfter The number of items to retrieve from after the selected item.
+         * @returns A Promise that provides an IFetchResult that contains the selected items or a FetchError if an error was encountered.
+        **/
+        itemsFromKey(key: string, countBefore: number, countAfter: number): Promise<IFetchResult<T>>;
+
+        /**
+         * Retrieves the specified number of items from the beginning of the IListDataAdapter object's data source.
+         * @param count The number of items to retrieve.
+         * @returns A Promise that provides an IFetchResult that contains the selected items or a FetchError if an error was encountered.
+        **/
+        itemsFromStart(count: number): Promise<IFetchResult<T>>;
+
+        /**
+         * Returns a string representation of the specified item that can be used for comparisons.
+         * @param item The item for which to generate a signature.
+         * @returns The signature representation of the specified item.
+        **/
+        itemSignature(item: IItem<T>): string;
+
+        /**
+         * Moves the specified item to just after another item.
+         * @param key A key of the item to move.
+         * @param previousKey The key of another item. The item to move will be moved to just after this item.
+         * @param indexHint The index of the item to move, if known.
+         * @param previousIndexHint The index to move the item after, if known.
+         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
+        **/
+        moveAfter(key: string, previousKey: any, indexHint: string, previousIndexHint: number): Promise<IItem<T>>;
+
+        /**
+         * Moves the specified item to just before another item.
+         * @param key A key of the item to move.
+         * @param nextKey The key of another item. The item to move will be moved to just before this item.
+         * @param indexHint The index of the item to move, if known.
+         * @param nextIndexHint The index to move the item before, if known.
+         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
+        **/
+        moveBefore(key: string, nextKey: any, indexHint: string, nextIndexHint: number): Promise<IItem<T>>;
+
+        /**
+         * Moves the specified item to the end of the IListDataAdapter object's data source.
+         * @param key The key for the item to move.
+         * @param indexHint The index of the item to move, if known.
+         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
+        **/
+        moveToEnd(key: string, indexHint: number): Promise<IItem<T>>;
+
+        /**
+         * Moves the specified item to the beginning of the IListDataAdapter object's data source.
+         * @param key The key for the item to move.
+         * @param indexHint The index of the item to move, if known.
+         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
+        **/
+        moveToStart(key: string, indexHint: number): Promise<IItem<T>>;
+
+        /**
+         * Removes the specified item from the IListDataAdapter object's data source.
+         * @param key The key of the item to remove.
+         * @param data The new data for the item.
+         * @param indexHint The index of the item.
+         * @returns A Promise that returns null or undefined when the operation completes.
+        **/
+        remove(key: string, data: T, indexHint: number): Promise<void>;
+
+        /**
+         * Registers a notification handler. The IListDataAdapter uses the handler to notify listening objects when its data changes.
+         * @param notificationHandler The notification handler that the IListDataAdapter will use to provide change notifications. .
+        **/
+        setNotificationHandler(notificationHandler: IListDataNotificationHandler<T>): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets a value that specifies whether to use an object's identity to determine if an item has changed.
+        **/
+        compareByIdentity: boolean;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Notifies clients when an IListDataAdapter object's data changes.
+    **/
+    interface IListDataNotificationHandler<T> {
+        //#region Methods
+
+        /**
+         * Indicates the start of a notification batch. Objects that are listening for notifications should defer making updates until endNotifications is called.
+        **/
+        beginNotifications(): void;
+
+        /**
+         * Raises a notification that an item in the IListDataAdapter object's data source has changed.
+         * @param item The item that changed.
+        **/
+        changed(item: IItem<T>): void;
+
+        /**
+         * Indicates the end of a notification batch. When the beginNotifications method is called, objects listening for notifications should defer making updates until endNotifications is called.
+        **/
+        endNotifications(): void;
+
+        /**
+         * Raises a notification that an item has been added to the IListDataAdapter object's data source.
+         * @param newItem The new item added to the IListDataAdapter object's data source.
+         * @param previousKey The key of the item that now precedes the new item, or null if the item was inserted at the start of the list. If nextKey is provided, this parameter may be null.
+         * @param nextKey The key of the item that now follows the new item, or null if the item was inserted at the end of the list. If previousKey is provided, this parameter may be null.
+         * @param index The index of the new item.
+        **/
+        inserted(newItem: IItem<T>, previousKey: string, nextKey: string, index?: number): void;
+
+        /**
+         * Indicates that all previous data obtained from the IListDataAdapter is invalid and should be refreshed.
+         * @returns A Promise that completes when the data has been completely refreshed and all change notifications have been sent.
+        **/
+        invalidateAll(): Promise<any>;
+
+        /**
+         * Raises a notification that an item was moved within the IListDataAdapter object's data source.
+         * @param item The item that was moved.
+         * @param previousKey The key of the item that now precedes the new item, or null if the item was moved to the beginning of the list. If nextKey is provided, this parameter may be null.
+         * @param nextKey The key of the item that now follows the new item, or null if the item was moved to the end of the list. If previousKey is provided, this parameter may be null.
+         * @param oldIndex The item's original index.
+         * @param newIndex The item's new index.
+        **/
+        moved(item: IItem<T>, previousKey: string, nextKey: string, oldIndex?: number, newIndex?: number): void;
+
+        /**
+         * Reloads data from the IListDataAdapter.
+        **/
+        reload(): void;
+
+        /**
+         * Raises a notification that an item was removed from the IListDataAdapter object's data source.
+         * @param key The key of the item that was removed.
+         * @param index The index of the item that was removed.
+        **/
+        removed(key: string, index?: number): void;
+
+        //#endregion Methods
+
+    }
+
+    /**
+     * Provides access to a data source and enables you to bind, change, add, remove, and move items in that data source.
+    **/
+    interface IListDataSource<T> {
+        //#region Events
+
+        /**
+         * Occurs when the status of the IListDataSource changes.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: status.
+        **/
+        statuschanged(eventInfo: CustomEvent): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Notifies the IListDataSource that a sequence of edits is about to begin. The IListDataSource will defer notifications until endEdits is called.
+        **/
+        beginEdits(): void;
+
+        /**
+         * Overwrites the data of the specified item.
+         * @param key The key for the item to replace.
+         * @param newData The new data for the item.
+         * @returns A Promise that contains the IItem that was updated or an EditError if an error was encountered.
+        **/
+        change(key: string, newData: T): Promise<IItem<T>>;
+
+        /**
+         * Creates an IListBinding that can retrieve items from the IListDataSource, enumerate the contents of the IListDataSource object's data, and optionally register for change notifications.
+         * @param notificationHandler Enables the IListBinding to register for change notifications for individual items obtained from the IListDataSource. If you omit this parameter, change notifications won't be available.
+         * @returns The new IListBinding.
+        **/
+        createListBinding(notificationHandler?: IListNotificationHandler<T>): IListBinding<T>;
+
+        /**
+         * Notifies the IListDataSource that the batch of edits that began with the last beginEdits call has completed. The IListDataSource will submit notifications for any changes that occurred between the beginEdits and endEdits calls as a batch and resume normal change notifications.
+        **/
+        endEdits(): void;
+
+        /**
+         * Retrieves the number of items in the data source.
+         * @returns A Promise that provides a Number that is the number of items in the data source.
+        **/
+        getCount(): Promise<number>;
+
+        /**
+         * Inserts a new item after another item.
+         * @param key The key that can be used to retrieve the new item, if known.
+         * @param data The data for the item to add.
+         * @param previousKey The key for an item in the data source. The new item will be added after this item.
+         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
+        **/
+        insertAfter(key: string, data: T, previousKey: string): Promise<IItem<T>>;
+
+        /**
+         * Adds an item to the end of the data source.
+         * @param key The key that can be used to retrieve the new item, if known.
+         * @param data The data for the item to add.
+         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
+        **/
+        insertAtEnd(key: string, data: T): Promise<IItem<T>>;
+
+        /**
+         * Adds an item to the beginning of the data source.
+         * @param key The key that can be used to retrieve the new item, if known.
+         * @param data The data for the item to add.
+         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
+        **/
+        insertAtStart(key: string, data: T): Promise<IItem<T>>;
+
+        /**
+         * Inserts an item before another item.
+         * @param key The key that can be used to retrieve the new item, if known.
+         * @param data The data for the item to add.
+         * @param nextKey The key of an item in the data source. The new item will be inserted before this item.
+         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
+        **/
+        insertBefore(key: string, data: T, nextKey: string): Promise<IItem<T>>;
+
+        /**
+         * Indicates that all previous data obtained from the IListDataAdapter is invalid and should be refreshed.
+         * @returns A Promise that completes when the data has been completely refreshed and all notifications have been sent.
+        **/
+        invalidateAll(): Promise<any>;
+
+        /**
+         * Retrieves the item that has the specified description.
+         * @param description Domain-specific information, to be interpreted by the IListDataAdapter, that describes the item to retrieve.
+         * @returns A Promise that provides an IItem that contains the requested item or a FetchError if an error was encountered. If the item wasn't found, the promise completes with a value of null.
+        **/
+        itemFromDescription(description: any): Promise<IItem<T>>;
+
+        /**
+         * Retrieves the item at the specified index.
+         * @param index A value that is greater than or equal to zero that is the index of the item to retrieve.
+         * @returns A Promise that provides an IItem that contains the requested item or a FetchError if an error was encountered. If the item wasn't found, the promise completes with a value of null.
+        **/
+        itemFromIndex(index: number): Promise<IItem<T>>;
+
+        /**
+         * Retrieves the item with the specified key.
+         * @param key The key of the item to retrieve. It must be a non-empty string.
+         * @param description Domain-specific information that IListDataAdapter can use to improve the retrieval time.
+         * @returns A Promise that provides an IItem that contains the requested item or a FetchError if an error was encountered. If the item was not found, the promise completes with a null value.
+        **/
+        itemFromKey(key: string, description?: any): Promise<IItem<T>>;
+
+        /**
+         * Moves an item to just after another item.
+         * @param key The key that identifies the item to move.
+         * @param previousKey The key of another item in the data source. The item specified by the key parameter will be moved after this item.
+         * @returns A Promise that contains the IItem that was moved or an EditError if an error was encountered.
+        **/
+        moveAfter(key: string, previousKey: string): Promise<IItem<T>>;
+
+        /**
+         * Moves an item before another item.
+         * @param key The key that identifies the item to move.
+         * @param nextKey The key of another item in the data source. The item specified by the key parameter will be moved before this item.
+         * @returns A Promise that contains the IItem that was moved or an EditError if an error was encountered.
+        **/
+        moveBefore(key: string, nextKey: string): Promise<IItem<T>>;
+
+        /**
+         * Moves an item to the end of the data source.
+         * @param key The key that identifies the item to move.
+         * @returns A Promise that contains the IItem that was moved or an EditError if an error was encountered.
+        **/
+        moveToEnd(key: string): Promise<IItem<T>>;
+
+        /**
+         * Moves the specified item to the beginning of the data source.
+         * @param key The key that identifies the item to move.
+         * @returns A Promise that contains the IItem that was moved or an EditError if an error was encountered.
+        **/
+        moveToStart(key: string): Promise<IItem<T>>;
+
+        /**
+         * Removes the specified item from the data source.
+         * @param key The key that identifies the item to remove.
+         * @returns A Promise that contains nothing if the operation was successful or an EditError if an error was encountered.
+        **/
+        remove(key: string): Promise<IItem<T>>;
+
+        //#endregion Methods
+
+    }
+
+    /**
+     * Used by an IListBinding to provide change notifications when items in a IListDataSource change.
+    **/
+    interface IListNotificationHandler<T> {
+        //#region Methods
+
+        /**
+         * Indicates the start of a notification batch. Objects that are listening for notifications should defer making updates until endNotifications is called.
+        **/
+        beginNotifications(): void;
+
+        /**
+         * Indicates that an item changed.
+         * @param newItem The updated item.
+         * @param oldItem The original item.
+        **/
+        changed(newItem: IItem<T>, oldItem: IItem<T>): void;
+
+        /**
+         * Indicates that the number of items in the IListDataSource has changed.
+         * @param newCount The updated count.
+         * @param oldCount The original count.
+        **/
+        countChanged(newCount: number, oldCount: number): void;
+
+        /**
+         * Indicates the end of a notification batch. When the beginNotifications method is called, objects listening for notifications should defer making updates until endNotifications is called.
+        **/
+        endNotifications(): void;
+
+        /**
+         * Indicates that the index of an item changed.
+         * @param handle The temporary ID of the item.
+         * @param newIndex The new index.
+         * @param oldIndex The original index.
+        **/
+        indexChanged(handle: string, newIndex: number, oldIndex: number): void;
+
+        /**
+         * Indicates that an item was added to the IListDataSource.
+         * @param itemPromise A promise for the new IItem.
+         * @param previousHandle The temporary ID of the item that precedes the new item.
+         * @param nextHandle The temporary ID of the item that follows the new item.
+        **/
+        inserted(itemPromise: IItemPromise<T>, previousHandle: string, nextHandle: string): void;
+
+        /**
+         * Indicates that an IItemPromise was fulfilled and that the item is now available.
+         * @param item The fulfilled item.
+        **/
+        itemAvailable(item: IItem<T>): void;
+
+        /**
+         * Indicates that an item was moved.
+         * @param item A promise for the IItem that was moved.
+         * @param previousHandle The temporary ID of the item that now precedes the moved item.
+         * @param nextHandle The temporary ID of the item that now follows the moved item.
+        **/
+        moved(item: IItemPromise<T>, previousHandle: string, nextHandle: string): void;
+
+        /**
+         * Indicates that an item was removed.
+         * @param handle The temporary ID of the item that was removed.
+         * @param mirage true if the item never actually existed; false if the item was actually present in the IListDataSource.
+        **/
+        removed(handle: string, mirage: boolean): void;
+
+        //#endregion Methods
+
+    }
+
+    /**
+     * Used by ListView's currentItem API
+    **/
+    interface IListViewItem {
+        /**
+         * Gets or sets index of the ListView item.
+        **/
+        index?: number;
+
+        /**
+         * Gets or sets key of the ListView item.
+        **/
+        key?: string;
+
+        /**
+         * Gets or sets whether the ListView item is focused.
+        **/
+        hasFocus?: boolean;
+
+        /**
+         * Gets or sets whether the ListView item is focused and is showing its focus visual.
+        **/
+        showFocus?: boolean;
+
+        /**
+         * Gets the type, if any.
+        **/
+        type?: WinJS.UI.ObjectType;
+    }
+
+    /**
+     * Represents a selection of ListView items.
+    **/
+    interface ISelection<T> {
+        //#region Methods
+
+        /**
+         * Adds one or more items to the selection.
+         * @param items The indexes or keys of the items to add. You can provide different types of objects for the items parameter: you can specify an index, a key, or a range of indexes. It can also be an array that contains one or more of these objects. For more info, see the Remarks section.
+         * @returns A Promise that is fulfilled when the operation completes.
+        **/
+        add(items: any): Promise<any>;
+
+        /**
+         * Clears the selection.
+         * @returns A Promise that is fulfilled when the clear operation completes.
+        **/
+        clear(): Promise<any>;
+
+        /**
+         * Returns the number of items in the selection.
+         * @returns The number of items in the selection.
+        **/
+        count(): number;
+
+        /**
+         * Returns a list of the indexes for the items in the selection.
+         * @returns The list of indexes for the items in the selection as an array of Number objects.
+        **/
+        getIndices(): number[];
+
+        /**
+         * Returns an array that contains the items in the selection.
+         * @returns A Promise that contains an array of the requested IItem objects.
+        **/
+        getItems(): Promise<IItem<T>[]>;
+
+        /**
+         * Gets an array of the index ranges for the selected items.
+         * @returns An array that contains an ISelectionRange object for each index range in the selection.
+        **/
+        getRanges(): ISelectionRange[];
+
+        /**
+         * Returns a value that indicates whether the selection contains every item in the data source.
+         * @returns true if the selection contains every item in the data source; otherwise, false.
+        **/
+        isEverything(): boolean;
+
+        /**
+         * Removes the specified items from the selection.
+         * @param items The indexes or keys of the items to remove. You can provide different types of objects for the items parameter: you can specify an index, a key, or a range of indexes. It can also be an array that contains one or more of these objects. For more info, see the Remarks section.
+         * @returns A Promise that is fulfilled when the operation completes.
+        **/
+        remove(items: any): Promise<any>;
+
+        /**
+         * Adds all the items in the ListView to the selection.
+        **/
+        selectAll(): void;
+
+        /**
+         * Clears the current selection and replaces it with the specified items.
+         * @param items The indexes or keys of the items that make up the selection. You can provide different types of objects for the items parameter: you can specify an index, a key, or a range of indexes. It can also be an array that contains one or more of these objects. For more info, see the Remarks section.
+         * @returns A Promise that is fulfilled when the operation completes.
+        **/
+        set(items: any): Promise<any>;
+
+        //#endregion Methods
+
+    }
+
+    /**
+     * Represents a range of indexes or keys in an ISelection.
+    **/
+    interface ISelectionRange {
+        //#region Properties
+
+        /**
+         * Gets or sets the index of the first item in the range.
+        **/
+        firstIndex: number;
+
+        /**
+         * Gets or sets the key of the first item in the range.
+        **/
+        firstKey: any;
+
+        /**
+         * Gets or sets the index of the last item in the range.
+        **/
+        lastIndex: number;
+
+        /**
+         * Gets or sets of the key of the last item in the range.
+        **/
+        lastKey: any;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Supports semantic zoom functionality by exposing a control as either the zoomed in or the zoomed out view of the SemanticZoom control.
+    **/
+    interface IZoomableView<T> {
+        //#region Methods
+
+        /**
+         * Initiates semantic zoom on the custom control.
+        **/
+        beginZoom(): void;
+
+        /**
+         * Initializes the semantic zoom state for the custom control.
+         * @param isZoomedOut True if this is the zoomed out view; otherwise false.
+         * @param isCurrentView True if this is the current view; otherwise false.
+         * @param triggerZoom The function that manages semantic zoom behavior. Triggers a zoom in or zoom out if the control is the visible control.
+         * @param prefetchedPages The number of pages of content to pre-fetch for zooming. This value is dependent on the size of the semantic zoom container. More content can be displayed based on the zoom factor and the size of the container.
+        **/
+        configureForZoom(isZoomedOut: boolean, isCurrentView: boolean, triggerZoom: Function, prefetchedPages: number): void;
+
+        /**
+         * Terminates semantic zoom on the zoomed in or zoomed out child of the custom control.
+         * @param isCurrentView True if the control is the visible control; otherwise false.
+        **/
+        endZoom(isCurrentView: boolean): void;
+
+        /**
+         * Retrieves the current item of the zoomed in or zoomed out child of the custom control.
+         * @returns An object that represents the selected item. This return value must be a Promise for the following: item, position.
+        **/
+        getCurrentItem(): Promise<{ item: T; position: Utilities.IPosition }>;
+
+        /**
+         * Retrieves the panning axis of the zoomed-in or zoomed-out child of the custom control.
+         * @returns Identifies the panning axis of the child control. Implementation specific.
+        **/
+        getPanAxis(): string;
+
+        /**
+         * Manages pointer input for the custom control.
+         * @param pointerId The ID of the pointer.
+        **/
+        handlePointer(pointerId: string): void;
+
+        /**
+         * Positions the specified item within the viewport of the child control when panning or zooming begins.
+         * @param item The object to position within the viewport of the child control. item can be a number, a string, or an object with any number of properties.
+         * @param position An object that contains the position data of the item relative to the child control. position must be an object with four number properties: left, top, width, and height. These values specify a rectangle that is typically the bounding box of the current item, though the details are up to the control. The units of the position must be in pixels. And the coordinates must be relative to the top-left of the control viewport (which should occupy the same area as the semantic zoom viewport), except when in RTL mode. In RTL mode, return coordinates relative to the top-right off the control viewport. The rectangle is transformed from the coordinate system of one control to that of the other.
+        **/
+        positionItem(item: T, position: Utilities.IPosition): void;
+
+        /**
+         * Selects the item closest to the specified screen coordinates.
+         * @param x The x-coordinate in DIPs relative to the upper-left corner of the SemanticZoom viewport.
+         * @param y The y-coordinate in DIPs relative to the upper-left corner of the SemanticZoom viewport..
+        **/
+        setCurrentItem(x: number, y: number): void;
+
+        //#endregion Methods
+
+    }
+
+    //#endregion Interfaces
+
+    //#region Objects
+
+    /**
+     * Displays ICommands in overlayed application pane that opens and closes at the top or bottom of the main view.
+    **/
+    class AppBar {
+
+        //#region Constructors
+
+        /**
+         * Creates a new AppBar object.
+         * @constructor
+         * @param element The DOM element that will host the control.
+         * @param options The set of properties and values to apply to the new AppBar.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * Occurs immediately after the AppBar is closed.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onafterclose: (eventInfo: CustomEvent) => void;
+
+        /**
+         * Occurs immeidately after the AppBar is opened.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onafteropen: (eventInfo: CustomEvent) => void;
+
+        /**
+         * Occurs immediately before the AppBar is closed. Is cancelable.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onbeforeclose: (eventInfo: CustomEvent) => void;
+
+        /**
+         * Occurs immediately before the AppBar is opened. Is cancelable.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onbeforeopen: (eventInfo: CustomEvent) => void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param type The event type to register. It must be beforeopen, beforeclose, afteropen, or afterclose.
+         * @param listener The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param type The event type to unregister. It must be beforeopen, beforeclose, afteropen, or afterclose.
+         * @param listener The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(eventName: string, eventProperties: any): boolean;
+
+        /**
+         * Releases resources held by this AppBar. Call this method when the AppBar is no longer needed. After calling this method, the AppBar becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Returns the Command object identified by id.
+         * @param id The element idenitifier (ID) of the command to be returned.
+         * @returns The command identified by id. If multiple commands have the same ID, returns the first command found.
+        **/
+        getCommandById(id: string): ICommand;
+
+        /**
+         * Shows the specified commands of the AppBar while hiding all other commands.
+         * @param commands The commands to show. The array elements may be ICommand objects, or the string identifiers (IDs) of commands.
+        **/
+        showOnlyCommands(commands: Array<string|ICommand>): void;
+
+        /**
+         * Opens the AppBar.
+        **/
+        open(): void;
+
+        /**
+         * Closes the AppBar.
+        **/
+        close(): void;
+
+        /**
+         * Forces the AppBar to update its layout.
+        **/
+        forceLayout(): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets/Sets how AppBar will display itself while closed. Values are "none" , "minimal", "compact" and "full".
+        **/
+        closedDisplayMode: string;
+
+        /**
+         * Gets or sets the Binding List of WinJS.UI.Command for the AppBar.
+        **/
+        data: WinJS.Binding.List<ICommand>;
+
+        /**
+         * Gets the DOM element that hosts the AppBar.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets or sets whether the AppBar is currently opened.
+        **/
+        opened: boolean;
+
+        /**
+         * Gets or sets a value that specifies whether the AppBar appears at the top or bottom of the main view.
+        **/
+        placement: string;
+
+        /**
+         * Display options for the AppBar when closed.
+        **/
+        static ClosedDisplayMode: {
+            /**
+             * When the AppBar is closed, it is not visible and doesn't take up any space.
+            **/
+            none: string;
+            /**
+             * When the AppBar is closed, its height is reduced to the minimal height required to display only its overflowbutton. All other content in the AppBar is not displayed.
+            **/
+            minimal: string;
+            /**
+             * When the AppBar is closed, its height is reduced such that button commands are still visible, but their labels are hidden.
+            **/
+            compact: string;
+            /**
+             * When the AppBar is closed, its height is always sized to content.
+            **/
+            full: string;
+        };
+
+        /**
+         * Display options for AppBar placement in relation to the main view.
+        */
+        static Placement: {
+            /**
+             * The AppBar appears at the top of the main view
+            **/
+            top: string;
+            /**
+             * The AppBar appears at the bottom of the main view
+            **/
+            bottom: string;
+        };
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Represents a command to be displayed in an app bar.
+    **/
+    class AppBarCommand implements ICommand {
+        //#region Constructors
+
+        /**
+         * Creates a new AppBarCommand object.
+         * @constructor
+         * @param element The DOM element that will host the control.
+         * @param options The set of properties and values to apply to the new AppBarCommand.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param type The event type to register.
+         * @param listener The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+        /**
+         * Releases resources held by this AppBarCommand. Call this method when the AppBarCommand is no longer needed. After calling this method, the AppBarCommand becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param type The event type to unregister.
+         * @param listener The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets a value that indicates whether the AppBarCommand is disabled.
+        **/
+        disabled: boolean;
+
+        /**
+         * Gets the DOM element that hosts the AppBarCommand.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Adds an extra CSS class during construction.
+        **/
+        extraClass: string;
+
+        /**
+         * Gets or sets the HTMLElement with a 'content' type AppBarCommand that should receive focus whenever focus moves by the user pressing HOME or the arrow keys, from the previous AppBarCommand to this AppBarCommand.
+        **/
+        firstElementFocus: HTMLElement;
+
+        /**
+         * Gets or sets the Flyout object displayed by this command. The specified flyout is shown when the AppBarCommand's button is invoked.
+        **/
+        flyout: Flyout;
+
+        /**
+         * Gets or sets a value that indicates whether the AppBarCommand is hiding or in the process of becoming hidden.
+        **/
+        hidden: boolean;
+
+        /**
+         * Gets or sets the icon of the AppBarCommand.
+        **/
+        icon: string;
+
+        /**
+         * Gets the element identifier (ID) of the command.
+        **/
+        id: string;
+
+        /**
+         * Gets or sets the label of the command.
+        **/
+        label: string;
+
+        /**
+         * Gets or sets the HTMLElement with a 'content' type AppBarCommand that should receive focus whenever focus moves by the user pressing END or the arrow keys, from the previous AppBarCommand to this AppBarCommand.
+        **/
+        lastElementFocus: HTMLElement;
+
+        /**
+         * Gets or sets the function to be invoked when the command is clicked.
+        **/
+        onclick: Function;
+
+        /**
+         * Gets the section of the parent control that the command is in. The section can only be set through constructor options.
+        **/
+        section: string;
+
+        /**
+         * Gets or sets the selected state of a toggle button.
+        **/
+        selected: boolean;
+
+        /**
+         * Gets or sets the tooltip of the command.
+        **/
+        tooltip: string;
+
+        /**
+         * Gets the type of the command. The type can only be set through constructor options.
+        **/
+        type: string;
+
+        /**
+         * Gets or sets the priority of the command
+        **/
+        priority: number;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * A rich input box that provides suggestions as the user types.
+    **/
+    class AutoSuggestBox {
+        //#region Constructors
+
+        /**
+         * Creates a new AutoSuggestBox.
+         * @constructor
+         * @param element The DOM element hosts the new AutoSuggestBox.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * Raised when the user or the app changes the queryText.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.language, detail.queryText, detail.linguisticDetails.
+        **/
+        onquerychanged(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised awhen the user presses Enter.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.language, detail.queryText, detail.linguisticDetails, detail.keyModifiers.
+        **/
+        onquerysubmitted(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised when the user selects a suggested option for their query.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.tag, detail.keyModifiers, detail.storageFile.
+        **/
+        onresultsuggestionchosen(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised when the system requests suggestions from this app.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.language, detail.linguisticDetails, detail.queryText, detail.searchSuggestionCollection.
+        **/
+        onsuggestionsrequested(eventInfo: CustomEvent): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Releases resources held by this AutoSuggestBox. Call this method when the AutoSuggestBox is no longer needed. After calling this method, the AutoSuggestBox becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param eventName The name of the event that the event handler is registered for.
+         * @param eventCallback The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
+
+        /**
+         * Specifies whether suggestions based on local files are automatically displayed in the input field, and defines the criteria that
+         * the system uses to locate and filter these suggestions.
+         * @param settings The new settings for local content suggestions.
+        **/
+        setLocalContentSuggestionSettings(settings: any): void
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets whether the first suggestion is chosen when the user presses Enter.
+        **/
+        chooseSuggestionOnEnter: boolean;
+
+        /**
+         * Gets or sets a value that specifies whether the AutoSuggestBox is disabled. If the control is disabled, it won't receive focus.
+        **/
+        disabled: boolean;
+
+        /**
+         * Gets the DOM element that hosts the AutoSuggestBox.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets or sets the placeholder text for the AutoSuggestBox. This text is displayed if there is no other text in the input box.
+        **/
+        placeholderText: string;
+
+        /**
+         * Gets or sets the query text for the AutoSuggestBox.
+        **/
+        queryText: string;
+
+        /**
+         * Gets or sets the history context. This context is used a secondary key (the app ID is the primary key) for storing history.
+        **/
+        searchHistoryContext: string;
+
+        /**
+         * Gets or sets a value that specifies whether history is disabled.
+        **/
+        searchHistoryDisabled: boolean;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+        /**
+         * Creates the image argument for SearchSuggestionCollection.appendResultSuggestion.
+         * @param url The url of the image.
+        **/
+        static createResultSuggestionImage(url: string): any;
+    }
+
+    /**
+     * Provides backwards navigation in the form of a button.
+    **/
+    class BackButton {
+        //#region Constructors
+
+        /**
+         * Creates a new BackButton.
+         * @constructor
+         * @param element The DOM element hosts the new BackButton.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Releases resources held by this BackButton. Call this method when the BackButton is no longer needed. After calling this method, the BackButton becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Checks the current navigation history and updates the value of the control's disabled attribute.
+        **/
+        refresh(): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param eventName The name of the event that the event handler is registered for.
+         * @param eventCallback The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets the HTML element that hosts this BackButton.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Represents a layout for the ListView in which items are arranged in a grid and items can span multiple grid cells.
+    **/
+    class CellSpanningLayout {
+        //#region Constructors
+
+        /**
+         * Creates a new CellSpanningLayout.
+         * @constructor
+         * @param options An object that contains one or more property/value pairs to apply to the new CellSpanningLayout. Each property of the options object corresponds to one of the object's properties or events. Event names must begin with "on".
+        **/
+        constructor(options?: any);
+
+        //#endregion Constructors
+
+        //#region Methods
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        dragLeave(): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        dragOver(): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        executeAnimations(): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+         * @param currentItem An object that describes the current item. It has these properties: index, type.
+         * @param pressedKey The key that was pressed.
+         * @returns An object that describes the next item that should receive focus. It has these properties: index, type.
+        **/
+        getAdjacent(currentItem: any, pressedKey: WinJS.Utilities.Key): any;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+         * @param x The x-coordinate, or the horizontal position on the screen.
+         * @param y The y-coordinate, or the vertical position on the screen.
+        **/
+        hitTest(x: number, y: number): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+         * @param site The rendering site for the layout.
+         * @param groupsEnabled Set to true if this layout supports groups; set to false if it does not.
+        **/
+        initialize(site: ILayoutSite2, groupsEnabled: boolean): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+         * @param firstPixel The first pixel the range of items falls between.
+         * @param lastPixel The last pixel the range of items falls between.
+        **/
+        itemsFromRange(firstPixel: number, lastPixel: number): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+         * @param tree
+         * @param changedRange
+         * @param modifiedItems
+         * @param modifiedGroups
+        **/
+        layout(tree: ILayoutSite2, changedRange: any, modifiedItems: any, modifiedGroups: any): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        setupAnimations(): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        uninitialize(): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets the position of group headers relative to their items.
+        **/
+        groupHeaderPosition: WinJS.UI.HeaderPosition;
+
+        /**
+         * Gets or sets a function that enables cell-spanning and establishes base cell dimensions.
+        **/
+        groupInfo: Function;
+
+        /**
+         * Gets or sets a function that returns the width and height of an item, as well as whether it should appear in a new column. Setting this function improves performance because the ListView can allocate space for an item without having to measure it first.
+        **/
+        itemInfo: Function;
+
+        /**
+         * Gets or set the maximum number of rows or columns, depending on the orientation, to display before content begins to wrap.
+        **/
+        maximumRowsOrColumns: number;
+
+        /**
+         * This API supports the Windows Library for JavaScript infrastructure and is not intended to be used directly from your code.
+        **/
+        numberOfItemsPerItemsBlock: any;
+
+        /**
+         * Gets the orientation of the CellSpanningLayout. For a CellSpanningLayout, this property always returns Orientation.horizontal.
+        **/
+        orientation: WinJS.UI.Orientation;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Data associated with hiding a dialog.
+    **/
+    interface ContentDialogHideInfo {
+        /***
+         * The dialog's dismissal result. May be 'primary', 'secondary', 'none', or whatever custom value was passed to hide.
+        **/
+        result: string
+    }
+
+    /**
+     * Event object associated with hiding a dialog.
+    **/
+    interface ContentDialogHideEvent extends Event {
+        detail: ContentDialogHideInfo
+    }
+
+    /**
+     * Represents a command to be displayed in an AppBar or ToolBar
+    **/
+    class Command extends AppBarCommand implements ICommand {
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+    }
+
+    /**
+     * Displays a modal dialog which can display arbitrary HTML content.
+    **/
+    class ContentDialog {
+        /**
+         * Specifies the result of dismissing the ContentDialog.
+        **/
+        static DismissalResult: {
+            /**
+              * The dialog was dismissed without the user selecting any of the commands. The user may have dismissed the dialog by hitting the escape key or pressing the hardware back button.
+            **/
+            none: string;
+            /**
+             * The user dismissed the dialog by pressing the primary command.
+            **/
+            primary: string;
+            /**
+             * The user dismissed the dialog by pressing the secondary command.
+            **/
+            secondary: string
+        }
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        /**
+         * Creates a new ContentDialog control.
+         * @constructor
+         * @param The DOM element that hosts the ContentDialog control.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        /**
+         * Gets the DOM element that hosts the ContentDialog control.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets or sets the ContentDialog's visibility.
+        **/
+        hidden: boolean;
+
+        /**
+         * The text displayed as the title of the dialog.
+        **/
+        title: string;
+
+        /**
+         * The text displayed on the primary command's button.
+        **/
+        primaryCommandText: string;
+
+        /**
+         * Indicates whether the button representing the primary command is currently disabled.
+        **/
+        primaryCommandDisabled: boolean;
+
+        /**
+         * The text displayed on the secondary command's button.
+        **/
+        secondaryCommandText: string;
+
+        /**
+         * Indicates whether the button representing the secondary command is currently disabled.
+        **/
+        secondaryCommandDisabled: boolean;
+
+        /**
+         * Shows the ContentDialog. Only one ContentDialog may be shown at a time. If another ContentDialog is already shown, this ContentDialog will remain hidden.
+         * @returns  A promise which is successfully fulfilled when the dialog is dismissed. The completion value indicates the dialog's dismissal result. This may be 'primary', 'secondary', 'none', or whatever custom value was passed to hide. If this ContentDialog cannot be shown because a ContentDialog is already showing or the ContentDialog is disposed, then the return value is a promise which is in an error state. If preventDefault() is called on the beforeshow event, then this promise will be canceled.
+        **/
+        show(): Promise<ContentDialogHideInfo>;
+
+        /**
+         * Hides the ContentDialog.
+         * @param result A value indicating why the dialog is being hidden. The promise returned by show will be fulfilled with this value.
+        **/
+        hide(result?: any): void;
+
+        /**
+         * Disposes this control.
+        **/
+        dispose(): void;
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param eventName The name of the event that the event handler is registered for.
+         * @param eventCallback The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Raised just before showing a dialog. Call preventDefault on this event to stop the dialog from being shown.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onbeforeshow(eventInfo: Event): void;
+
+        /**
+         * Raised immediately after a dialog is fully shown.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onaftershow(eventInfo: Event): void;
+
+        /**
+         * Raised just before hiding a dialog. Call preventDefault on this event to stop the dialog from being hidden.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onbeforehide(eventInfo: ContentDialogHideEvent): void;
+
+        /**
+         * Raised immediately after a dialog is fully hidden.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onafterhide(eventInfo: ContentDialogHideEvent): void;
+    }
+
+    /**
+     * Allows users to pick a date value.
+    **/
+    class DatePicker {
+        //#region Constructors
+
+        /**
+         * Initializes a new instance of the DatePicker control.
+         * @constructor
+         * @param element The DOM element associated with the DatePicker control.
+         * @param options The set of options to be applied initially to the DatePicker control. The options are the following: calendar, current, datePattern, disabled, maxYear, minYear, monthPattern, yearPattern.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * Occurs when any of the controls are changed by the user.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onchange(eventInfo: CustomEvent): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Adds an event listener.
+         * @param type The type (name) of the event.
+         * @param listener The function that handles the event.
+         * @param capture If true, specifies that capture should be initiated, otherwise false.
+        **/
+        addEventListener(type: string, listener: Function, capture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Releases resources held by this DatePicker. Call this method when the DatePicker is no longer needed. After calling this method, the DatePicker becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code. Use render instead.
+        **/
+        static getInformation(startDate: any, endDate: any, calendar?: any, datePatterns?: any): any;
+
+        /**
+         * Removes a listener for the specified event.
+         * @param type The name of the event for which to remove a listener.
+         * @param listener The listener.
+         * @param useCapture Optional. The same value that was passed to addEventListener for this listener. It may be omitted if it was omitted when calling addEventListener.
+        **/
+        removeEventListener(type: string, listener: Function, useCapture?: any): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets the calendar to use.
+        **/
+        calendar: string;
+
+        /**
+         * Gets or sets the current date of the DatePicker. You can use either a date string or a Date object to set this property.
+        **/
+        current: Date;
+
+        /**
+         * Gets or sets the display pattern for the date. The default date pattern is day.integer(2). You can change the date pattern by changing the number of integers displayed.
+        **/
+        datePattern: string;
+
+        /**
+         * Specifies whether the DatePicker is disabled.
+        **/
+        disabled: boolean;
+
+        /**
+         * Gets the DOM element for the DatePicker.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets or sets the maximum Gregorian year available for picking.
+        **/
+        maxYear: number;
+
+        /**
+         * Gets or sets the minimum Gregorian year available for picking.
+        **/
+        minYear: number;
+
+        /**
+         * Gets or sets the display pattern for the month. The default month pattern is month.abbreviated. You can change the month pattern to the following values: month.full. The full name of the month. month.abbreviated(n). You can use abbreviated with or without specifying the number of letters in the abbreviation. If you do specify the number of letters, the actual length of the month name that appears may vary. month.solo.full. A representation of the month that is suitable for stand-alone display. You can also use month.solo.abbreviated(n). month.integer(n). You can use integer with or without specifying the number of integers.
+        **/
+        monthPattern: string;
+
+        /**
+         * Gets or sets the display pattern for the year. The default year pattern is year.full. You can change the year pattern to the following values: year.abbreviated(n). You can use abbreviated with or without specifying the number of letters in the abbreviation.
+        **/
+        yearPattern: string;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Adds event-related methods to the control.
+    **/
+    namespace DOMEventMixin {
+        //#region Methods
+
+        /**
+         * Adds an event listener to the control.
+         * @param type The type (name) of the event.
+         * @param listener The listener to invoke when the event gets raised.
+         * @param useCapture true to initiate capture; otherwise, false.
+        **/
+        export function addEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type, adding the specified additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        export function dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Removes an event listener from the control.
+         * @param type The type (name) of the event.
+         * @param listener The listener to remove.
+         * @param useCapture true to initiate capture; otherwise, false.
+        **/
+        export function removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+        //#endregion Methods
+    }
+
+    /**
+     * Displays a collection, such as a set of photos, one item at a time.
+    **/
+    class FlipView<T> {
+        //#region Constructors
+
+        /**
+         * Creates a new FlipView.
+         * @constructor
+         * @param element The DOM element that hosts the control.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property corresponds to one of the control's properties or events. Event names must begin with "on". For example, to provide a handler for the pageselected event, add a property named "onpageselected" and set its value to the event handler.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * Occurs when the datasource count changes.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: source.
+        **/
+        ondatasourcecountchanged(eventInfo: Event): void;
+
+        /**
+         * Raised when the FlipView flips to a page and its renderer function completes.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.source.
+        **/
+        onpagecompleted(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised when the FlipView flips to a page.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.source.
+        **/
+        onpageselected(eventInfo: CustomEvent): void;
+
+        /**
+         * Occurs when an item becomes invisible or visible.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.source, detail.visible.
+        **/
+        onpagevisibilitychanged(eventInfo: CustomEvent): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param eventName The name of the event to handle. For a list of events, see the FlipView object page.
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Returns the number of items in the FlipView control's itemDataSource.
+         * @returns A Promise that contains the number of items in the list or WinJS.UI.CountResult.unknown if the count is unavailable.
+        **/
+        count(): Promise<number>;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Releases resources held by this FlipView. Call this method when the FlipView is no longer needed. After calling this method, the FlipView becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Forces the FlipView to update its layout. Use this function when making the FlipView visible again after its style.display property had been set to "none".
+        **/
+        forceLayout(): void;
+
+        /**
+         * Navigates to the next page.
+         * @returns true if the FlipView begins navigating to the next page; false if the FlipView is already at the last item or is in the middle of another navigation animation.
+        **/
+        next(): boolean;
+
+        /**
+         * Navigates to the previous item.
+         * @returns true if the FlipView begins navigating to the previous page; nfalse if the FlipView is already at the first page or is in the middle of another navigation animation.
+        **/
+        previous(): boolean;
+
+        /**
+         * Unregisters an event handler for the specified event.
+         * @param eventName The name of the event.
+         * @param eventHandler The event handler function to remove.
+         * @param useCapture Set to true to unregister the event handler for the capturing phase; otherwise, set to false to unregister the event handler for the bubbling phase.
+        **/
+        removeEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Sets custom animations for the FlipView to use when navigating between pages.
+         * @param animations An object that contains up to three fields, one for each navigation action: next, previous, and jump. Each of those fields must be a function with this signature: function (outgoingPage, incomingPage) Each function must return a WinJS.Promise that completes once the animations are finished. If a field is null or undefined, the FlipView reverts to its default animation for that action.
+        **/
+        setCustomAnimations(animations: any): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets the index of the currently displayed page.
+        **/
+        currentPage: number;
+
+        /**
+         * Gets the HTML element that hosts this FlipView.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets or sets the data source that provides the FlipView with items to display. The FlipView displays one item at a time, on its own page.
+        **/
+        itemDataSource: IListDataSource<T>;
+
+        /**
+         * Gets or sets the spacing between each item, in pixels.
+        **/
+        itemSpacing: number;
+
+        /**
+         * Gets or sets a Template or function that defines the HTML for each item's page.
+        **/
+        itemTemplate: any;
+
+        /**
+         * Gets or sets the orientation of the FlipView, horizontal or vertical.
+        **/
+        orientation: string;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        /**
+         * Event Name
+        **/
+        static datasourceCountChangedEvent: string;
+
+        /**
+         * Event Name
+        **/
+        static pageCompletedEvent: string;
+
+        /**
+         * Event Name
+        **/
+        static pageSelectedEvent: string;
+
+        /**
+         * Event Name
+        **/
+        static pageVisibilityChangedEvent: string;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Displays lightweight UI that is either information, or requires user interaction. Unlike a dialog, a Flyout can be light dismissed by clicking or tapping off of it.
+    **/
+    class Flyout {
+        //#region Constructors
+
+        /**
+         * Creates a new Flyout object.
+         * @constructor
+         * @param element The DOM element that will host the control.
+         * @param options The set of properties and values to apply to the new Flyout.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * Raised immediately after a flyout is fully hidden.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onafterhide(eventInfo: Event): void;
+
+        /**
+         * Raised immediately after a flyout is fully shown.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onaftershow(eventInfo: Event): void;
+
+        /**
+         * Raised just before hiding a flyout.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onbeforehide(eventInfo: Event): void;
+
+        /**
+         * Raised just before showing a flyout.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onbeforeshow(eventInfo: Event): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param type The event type to register. It must be beforeshow, beforehide, aftershow, or afterhide.
+         * @param listener The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(eventName: string, eventProperties: any): boolean;
+
+        /**
+         * Releases resources held by this object. Call this method when the object is no longer needed. After calling this method, the object becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Hides the Flyout, if visible, regardless of other states.
+        **/
+        hide(): void;
+
+        /**
+         * Shows the Flyout, if hidden, regardless of other states.
+         * @param anchor. DOM element to temporarily anchor the position of the Flyout to. This is optional if Flyout.anchor has already been set.
+         * @param placement The placement of the Flyout to the anchor: the string literal "top", "bottom", "left", or "right".
+         * @param alignment For "top" or "bottom" placement, the alignment of the Flyout to the anchor's edge: the string literal "center", "left", or "right".
+        **/
+        show(anchor?: HTMLElement, placement?: string, alignment?: string): void;
+
+        /**
+         * Shows the Flyout, if hidden, regardless of other states, top and left aligned at the specified coordinates,
+         * @param coordinates Required. The point where the top left corner of the flyout will appear, relative to the top and left edge of the visual viewport.
+        **/
+        showAt(coordinates: { x: number; y: number; }): void;
+
+        /**
+         * Shows the Flyout, if hidden, regardless of other states, top and left aligned at the location of the mouse event object,
+         * @param mouseEventObj Required. The MouseEvent Object specifying where to show the Flyout.
+        **/
+        showAt(mouseEventObj: MouseEvent): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param type The event type to unregister. It must be beforeshow, beforehide, aftershow, or afterhide.
+         * @param listener The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets the default alignment to be used for this Flyout.
+        **/
+        alignment: string;
+
+        /**
+         * Gets or sets the default anchor to be used for this Flyout.
+        **/
+        anchor: HTMLElement;
+
+        /**
+         * Gets or sets a value that indicates whether the Flyout is disabled.
+        **/
+        disabled: boolean;
+
+        /**
+         * Gets the DOM element that hosts the Flyout.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets a value that indicates whether the Flyout is hidden or in the process of becoming hidden, or sets the Flyout to hide or show itself.
+        **/
+        hidden: boolean;
+
+        /**
+         * Gets or sets the default placement to be used for this Flyout.
+        **/
+        placement: string;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Represents a grid layout for the ListView in which items are arranged in a horizontal grid.
+    **/
+    class GridLayout {
+        //#region Constructors
+
+        /**
+         * Creates a new GridLayout object.
+         * @constructor
+         * @param options The set of properties and values to apply to the new GridLayout.
+        **/
+        constructor(options?: any);
+
+        //#endregion Constructors
+
+        //#region Methods
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        dragLeave(): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        dragOver(): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        executeAnimations(): void;
+
+        /**
+         * Determines the next item to receive keyboard focus.
+         * @param currentItem An object that describes the current item. It has these properties: index, type.
+         * @param pressedKey The key that was pressed.
+         * @returns An object that describes the next item that should receive focus. It has these properties: index, type.
+        **/
+        getAdjacent(currentItem: any, pressedKey: WinJS.Utilities.Key): any;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+         * @param x The x-coordinate, or the horizontal position on the screen.
+         * @param y The y-coordinate, or the vertical position on the screen.
+        **/
+        hitTest(x: number, y: number): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+         * @param site The rendering site for the layout.
+         * @param groupsEnabled Set to true if this layout supports groups; set to false if it does not.
+        **/
+        initialize(site: ILayoutSite2, groupsEnabled: boolean): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+         * @param firstPixel The first pixel the range of items falls between.
+         * @param lastPixel The last pixel the range of items falls between.
+        **/
+        itemsFromRange(firstPixel: number, lastPixel: number): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+         * @param tree
+         * @param changedRange
+         * @param modifiedItems
+         * @param modifiedGroups
+        **/
+        layout(tree: any, changedRange: any, modifiedItems: any, modifiedGroups: any): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        setupAnimations(): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        uninitialize(): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * This property is no longer supported. Starting with Windows Library for JavaScript 2.0, use the .win-listview.win-container.win-backdrop CSS selector.
+        **/
+        backdropColor: string;
+
+        /**
+         * This property is no longer supported. Starting with Windows Library for JavaScript 2.0, use the .win-listview.win-container.win-backdrop CSS selector.
+        **/
+        disableBackdrop: boolean;
+
+        /**
+         * Gets or sets the position of group headers.
+        **/
+        groupHeaderPosition: WinJS.UI.HeaderPosition;
+
+        /**
+         * This property is no longer supported. Starting with the Windows Library for JavaScript 2.0, use a CellSpanningLayout.
+        **/
+        groupInfo: Function;
+
+        /**
+         * This property is no longer supported. Starting with the Windows Library for JavaScript 2.0, use a CellSpanningLayout.
+        **/
+        itemInfo: Function;
+
+        /**
+         * Gets or set the maximum number of rows or columns, depending on the orientation, to display before content begins to wrap.
+        **/
+        maximumRowsOrColumns: number;
+
+        /**
+         * This property is no longer supported. Starting with Windows Library for JavaScript 2.0, use the maximumRowsOrColumns property.
+        **/
+        maxRows: number;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        numberOfItemsPerItemsBlock: any;
+
+        /**
+         * Gets or sets the orientation of the GridLayout.
+        **/
+        orientation: WinJS.UI.Orientation;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Creates a hub navigation pattern consisting of sections that can be navigated to. Each section is defined by a HubSection object.
+    **/
+    class Hub {
+        //#region Constructors
+
+        /**
+         * Creates a new Hub control.
+         * @constructor
+         * @param element The DOM element that will host the Hub control.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events. Event names must begin with "on". For example, to provide a handler for the contentanimating event, add a property named "oncontentanimating" to the options object and set its value to the event handler.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * Raised when the Hub is about to play entrance, content transition, insert, or remove animations.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.type, detail.index, detail.section.
+        **/
+        oncontentanimating(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised when the user clicks on an interactive header.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.index, detail.section.
+        **/
+        onheaderinvoked(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised when the Hub control's loadingState changes.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: loadingState.
+        **/
+        onloadingstatechanged(eventInfo: CustomEvent): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Releases resources held by this Hub. Call this method when the Hub is no longer needed. After calling this method, the Hub becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Forces the Hub to update its layout.
+         * Use this function when making the Hub visible again after you've set its style.display property to "none” or after style changes have been made that affect the size of the HubSections.
+        **/
+        forceLayout(): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param eventName The name of the event that the event handler is registered for.
+         * @param eventCallback The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets the DOM element that hosts the Hub control.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets or sets the Template or templating function that creates the DOM elements for each HubSection header. Your HubSection object should provide strings for HubSection.header property.
+        **/
+        headerTemplate: any;
+
+        /**
+         * Gets or sets the index of the first HubSection at least partially in view. This property is useful for animating the visible content in the Hub.
+        **/
+        indexOfFirstVisible: number;
+
+        /**
+         * Gets or sets the index of last HubSection at least partially in view. Used for animating the visible content in the Hub.
+        **/
+        indexOfLastVisible: number;
+
+        /**
+         * Gets a value that indicates whether the hub is still loading or whether loading is complete. The value changes to complete after all the sections and content inside them has loaded.
+        **/
+        loadingState: string;
+
+        /**
+         * Gets or sets the orientation of sections within the Hub.
+        **/
+        orientation: Orientation;
+
+        /**
+         * Gets or sets the distance between the start of the Hub and the current viewable area.
+        **/
+        scrollPosition: number;
+
+        /**
+         * Gets or sets the index of the first visible HubSection.
+        **/
+        sectionOnScreen: number;
+
+        /**
+         * Gets or sets the List that contains the HubSection objects that belong to this Hub.
+        **/
+        sections: WinJS.Binding.List<HubSection>;
+
+        /**
+         * This API supports the SemanticZoom infrastructure and is not intended to be used directly from your code.
+        **/
+        zoomableView: IZoomableView<any>;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        /**
+         * Specifies whether the Hub animation is an entrance animation or a transition animation.
+        **/
+        static AnimationType: {
+            /**
+             * The animation plays when the Hub is first displayed.
+            **/
+            entrance: string;
+            /**
+             * The animation plays when the Hub is changing its content.
+            **/
+            contentTransition: string;
+            /**
+             * The animation plays when a section is inserted into the Hub.
+            **/
+            insert: string;
+            /**
+             * The animation plays when a section is removed into the Hub.
+            **/
+            remove: string;
+        }
+
+        /**
+         * Gets the current loading state of the Hub.
+        **/
+        static LoadingState: {
+            /**
+             * The Hub is loading sections.
+            **/
+            loading: string;
+            /**
+             * All sections are loaded and animations are complete.
+            **/
+            complete: string;
+        }
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Defines a section of a Hub.
+    **/
+    class HubSection {
+        //#region Constructors
+
+        /**
+         * Creates a new HubSection.
+         * @constructor
+         * @param element The DOM element hosts the new HubSection.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Methods
+
+        /**
+         * Releases resources held by this HubSection. Call this method when the HubSection is no longer needed. After calling this method, the HubSection becomes unusable.
+        **/
+        dispose(): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets the DOM element that hosts the HubSection control's content.
+        **/
+        contentElement: HTMLElement;
+
+        /**
+         * Gets the DOM element that hosts this HubSection.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets or sets the header for this HubSection.
+        **/
+        header: string;
+
+        /**
+         * Gets a value that specifies whether the header is static.
+        **/
+        isHeaderStatic: boolean;
+
+        /**
+         * This object supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        static isDeclarativeControlContainer: any;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Enables you to include an HTML page dynamically. As part of the constructor, you must include an option indicating the URI of the page.
+    **/
+    class HtmlControl {
+        //#region Constructors
+
+        /**
+         * Initializes a new instance of HtmlControl to define a new page control.
+         * @constructor
+         * @param element The element that hosts the HtmlControl.
+         * @param options The options for configuring the page. The uri option is required in order to specify the source document for the content of the page. Other options are the ones used by the WinJS.Pages.render method.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Properties
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Defines an item that can be pressed, swiped, and dragged.
+    **/
+    class ItemContainer {
+        //#region Constructors
+
+        /**
+         * Creates a new ItemContainer.
+         * @constructor
+         * @param element The DOM element hosts the new ItemContainer. For the ItemContainer to be accessible, this element must have its role attribute set to "list" or "listbox". If tapBehavior is set to none and selectionDisabled is true, then use the "list" role; otherwise, use the "listbox" role.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * Raised when the item is invoked. (You can use the tapBehavior property to specify whether taps and clicks invoke the item.)
+         * @param eventInfo An object that contains information about the event.
+        **/
+        oninvoked(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised after the item is selected or deselected.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onselectionchanged(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised just before the current selection changes.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onselectionchanging(eventInfo: CustomEvent): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Releases resources held by this ItemContainer. Call this method when the ItemContainer is no longer needed. After calling this method, the ItemContainer becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Forces the ItemContainer to update its layout. Call this function when the reading direction of the app changes after the control has been initialized.
+        **/
+        forceLayout(): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param eventName The name of the event that the event handler is registered for.
+         * @param eventCallback The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets a value that specifies whether the item can be dragged.
+        **/
+        draggable: boolean;
+
+        /**
+         * Gets the element that hosts this ItemContainer.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets or sets a value that specifies whether the item is selected.
+        **/
+        selected: boolean;
+
+        /**
+         * Gets or sets a value that specifies whether selection of this item is disabled.
+        **/
+        selectionDisabled: boolean;
+
+        /**
+         * Gets or sets how the ItemContainer reacts to the swipe gesture. The swipe gesture can select the swiped items or can have no effect on the current selection.
+        **/
+        swipeBehavior: WinJS.UI.SwipeBehavior;
+
+        /**
+         * Gets or sets the orientation of swipe gestures.
+        **/
+        swipeOrientation: Orientation;
+
+        /**
+         * Gets or sets how the ItemContainer reacts when the user taps or clicks an item.
+        **/
+        tapBehavior: TapBehavior;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * This object supports the WinJS infrastructure and is not intended to be used directly from your code.
+    **/
+    class Layout {
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+    }
+
+    /**
+     * Represents a layout for the ListView in which items are arranged in a vertical list.
+    **/
+    class ListLayout {
+        //#region Constructors
+
+        /**
+         * Creates a new ListLayout.
+         * @constructor
+         * @param options An object that contains one or more property/value pairs to apply to the new ListLayout. Each property of the options object corresponds to one of the object's properties or events. Event names must begin with "on".
+        **/
+        constructor(options?: any);
+
+        //#endregion Constructors
+
+        //#region Methods
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        dragLeave(): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        dragOver(): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        executeAnimations(): void;
+
+        /**
+         * Determines the next item to receive keyboard focus.
+         * @param currentItem An object that describes the current item. It has these properties: index, type.
+         * @param pressedKey The key that was pressed.
+         * @returns An object that describes the next item that should receive focus. It has these properties: index, type.
+        **/
+        getAdjacent(currentItem: any, pressedKey: WinJS.Utilities.Key): any;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+         * @param x The x-coordinate, or the horizontal position on the screen.
+         * @param y The y-coordinate, or the vertical position on the screen.
+        **/
+        hitTest(x: number, y: number): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        initialize(): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+         * @param firstPixel
+         * @param lastPixel
+        **/
+        itemsFromRange(firstPixel: number, lastPixel: number): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+         * @param tree
+         * @param changedRange
+         * @param modifiedItems
+         * @param modifiedGroups
+        **/
+        layout(tree: any, changedRange: any, modifiedItems: any, modifiedGroups: any): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        setupAnimations(): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        uninitialize(): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * This property is no longer supported. Starting with Windows Library for JavaScript 2.0, use the .win-listview.win-container.win-backdrop CSS selector.
+        **/
+        backdropColor: string;
+
+        /**
+         * This property is no longer supported. Starting with Windows Library for JavaScript 2.0, use the .win-listview.win-container.win-backdrop CSS selector.
+        **/
+        disableBackdrop: boolean;
+
+        /**
+         * Gets or sets the position of group headers.
+        **/
+        groupHeaderPosition: WinJS.UI.HeaderPosition;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        numberOfItemsPerItemsBlock: any;
+
+        /**
+         * Gets or sets the orientation of the GridLayout.
+        **/
+        orientation: WinJS.UI.Orientation;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Displays data items in a customizable list or grid.
+    **/
+    class ListView<T> {
+        //#region Constructors
+
+        /**
+         * Creates a new ListView.
+         * @constructor
+         * @param element The DOM element that hosts the ListView control.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events. Event names must begin with "on". For example, to provide a handler for the selectionchanged event, add a property named "onselectionchanged" to the options object and set its value to the event handler.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * Raised when the accessibility attributes have been added to the ListView items.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties detail.firstIndex, detail.lastIndex, detail.firstHeaderIndex, detail.lastHeaderIndex.
+        **/
+        onaccessibilityannotationcomplete(eventInfo: CustomEvent): void;
+
+        /**
+         * Occurs when the ListView is about to play an entrance or contentTransition animation.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.type, detail.setPromise.
+        **/
+        oncontentanimating(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised when the user taps or clicks a group header.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.groupHeaderIndex, detail.groupHeaderPromise.
+        **/
+        ongroupheaderinvoked(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised when the ListView is a drop target and the onitemdragenter has been disabled. This is raised every time the cursor is moved between a new pair of items. If you call preventDefault on this event, then the ListView does not move the items slightly above/below the cursor to provide visual feedback for a drop.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains additional information about the event.
+        **/
+        onitemdragbetween(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised when the user is dragging an item from the ListView and the datasource changes while the user is dragging.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains additional information about the event.
+        **/
+        onitemdragchanged(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised when an item is dropped onto the ListView as the result of a drag operation.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.dataTransfer, detail.index, detail.insertAfterIndex.
+        **/
+        onitemdragdrop(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised when the user drops an item dragged from a ListView.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onitemdragend(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised when an dragged item enters the bounds of the ListView control.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.dataTransfer.
+        **/
+        onitemdragenter(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised when a draggable item leaves the bounds of a ListView control.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onitemdragleave(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised when the user begins to drag an item from a ListView control.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.dataTransfer, detail.dragInfo.
+        **/
+        onitemdragstart(eventInfo: CustomEvent): void;
+
+        /**
+         * Occurs when the user taps or clicks an item.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.itemIndex.
+        **/
+        oniteminvoked(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised when the focused item changes.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.oldFocus, detail.oldNewFocus.
+        **/
+        onkeyboardnavigating(eventInfo: CustomEvent): void;
+
+        /**
+         * Occurs when the ListView control's loadingState changes.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.scrolling.
+        **/
+        onloadingstatechanged(eventInfo: CustomEvent): void;
+
+        /**
+         * Occurs after the current selection changes.
+         * @param eventInfo An object that contains information about the event. The detail property of this object is null. To obtain the selected items, use the ListView.selection property.
+        **/
+        onselectionchanged(eventInfo: CustomEvent): void;
+
+        /**
+         * Occurs just before the current selection changes.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.newSelection, detail.preventTapBehavior.
+        **/
+        onselectionchanging(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised when the header's visibility property changes.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.visible.
+        **/
+        onheadervisibilitychanged(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised when the footer's visibility property changes.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.visible.
+        **/
+        onfootervisibilitychanged(eventInfo: CustomEvent): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param eventName The name of the event to handle. See the ListView object page for a list of events. Note that you drop the "on" when specifying the event name for the addEventListener method. For example, instead of specifying "onselectionchange", you specify "selectionchange".
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Releases resources held by this object. Call this method when the object is no longer needed. After calling this method, the object becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Returns the DOM element that represents the item at the specified index.
+         * @param itemIndex The index of the item.
+         * @returns The DOM element that represents the item at the specified index.
+        **/
+        elementFromIndex(itemIndex: number): HTMLElement;
+
+        /**
+         * Makes the item at the specified index visible. If necessary, the ListView will scroll to the item.
+         * @param itemIndex The index of the item to scroll into view.
+        **/
+        ensureVisible(itemIndex: number): void;
+
+        /**
+         * Forces the ListView to update its layout. Use this function when making the ListView visible again after its style.display property had been set to "none".
+        **/
+        forceLayout(): void;
+
+        /**
+         * Returns the index of the item that the specified DOM element displays.
+         * @param element The DOM element that displays the item.
+         * @returns The index of the item displayed by element.
+        **/
+        indexOfElement(element: HTMLElement): number;
+
+        /**
+         * Loads the next set of pages if the ListView control's loadingBehavior is set to "incremental" (otherwise, it does nothing). The number of pages to be loaded is determined by the pagesToLoad property.
+        **/
+        loadMorePages(): void;
+
+        /**
+         * Repositions all the visible items in the ListView to adjust for items whose sizes have changed. Most apps won’t ever need to call this method. For more info, see the Remarks section.
+        **/
+        recalculateItemPosition(): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param eventName The name of the event that the event handler is registered for.
+         * @param eventCallback The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
+
+        /**
+         * Triggers the ListView disposal service manually.
+        **/
+        static triggerDispose(): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets a value that indicates whether the next set of pages is automatically loaded when the user scrolls beyond the number of pages specified by the pagesToLoadThreshold property.
+        **/
+        automaticallyLoadPages: boolean;
+
+        /**
+         * Gets or sets an IListViewItem that indicates which item should have keyboard focus and the focus state of that item.
+        **/
+        currentItem: IListViewItem;
+
+        /**
+         * Gets the HTML element that hosts this ListView.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets or sets the data source that contains the groups for the items in the itemDataSource.
+        **/
+        groupDataSource: IListDataSource<T>;
+
+        /**
+         * Gets or sets how the ListView reacts when the user taps or clicks a group header.
+        **/
+        groupHeaderTapBehavior: GroupHeaderTapBehavior;
+
+        /**
+         * Gets or sets the Template or function that creates the DOM elements for each group header in the groupDataSource. Each group header can contain multiple elements, but it must have a single root element.
+        **/
+        groupHeaderTemplate: any;
+
+        /**
+         * Gets or sets the first visible item.
+        **/
+        indexOfFirstVisible: number;
+
+        /**
+         * Gets the index of the last visible item in the ListView.
+        **/
+        indexOfLastVisible: number;
+
+        /**
+         * Gets or sets the data source that provides the ListView with items.
+        **/
+        itemDataSource: IListDataSource<T>;
+
+        /**
+         * Go Gets or sets a value that specifies whether items can be dragged. When this is set to true the ListView provides built in behaviors related to item dragging.
+        **/
+        itemsDraggable: boolean;
+
+        /**
+         * Gets or sets whether the ListView control's items can be reordered within itself by dragging and dropping.
+        **/
+        itemsReorderable: boolean;
+
+        /**
+         * Gets or sets the WinJS.Binding.Template or templating function that creates the DOM elements for each item in the itemDataSource. Each item can contain multiple elements, but it must have a single root element.
+        **/
+        itemTemplate: any;
+
+        /**
+         * Gets or sets an object that controls the layout of the ListView.
+        **/
+        layout: ILayout2;
+
+        /**
+         * Gets or sets the footer of the ListView.
+        **/
+        footer: HTMLElement;
+
+        /**
+         * Gets or sets the header of the ListView.
+        **/
+        header: HTMLElement;
+
+        /**
+         * Gets or sets a value that specifies how the ListView fetches items and adds and removes them to the DOM. Don't change the value of this property after the ListView has begun loading data.
+        **/
+        loadingBehavior: string;
+
+        /**
+         * Gets a value that indicates whether the ListView is still loading or whether loading is complete.
+        **/
+        loadingState: string;
+
+        /**
+         * Gets or sets the maximum number of realized items.
+        **/
+        maxDeferredItemCleanup: number;
+
+        /**
+         * This property is deprecated. Gets or sets the number of pages to load when the loadingBehavior property is set to "incremental" and the user scrolls beyond the threshold specified by the pagesToLoadThreshold property.
+        **/
+        pagesToLoad: number;
+
+        /**
+         * This property is deprecated. Gets or sets the threshold (in pages) for initiating an incremental load. When the last visible item is within the specified number of pages from the end of the loaded portion of the list, and if automaticallyLoadPages is true and loadingBehavior is set to "incremental", the ListView initiates an incremental load.
+        **/
+        pagesToLoadThreshold: number;
+
+        /**
+         * Gets or sets the maximum number of pages to prefetch in the leading buffer for virtualization.
+        **/
+        maxLeadingPages: number;
+
+        /**
+         * Gets or sets the maximum number of pages to prefetch in the trailing buffer for virtualization.
+        **/
+        maxTrailingPages: number;
+
+        /**
+         * Gets or sets the function that is called when the ListView discards or recycles the element representation of a group header.
+        **/
+        resetGroupHeader: (header: any, element: HTMLElement) => void;
+
+        /**
+         * Gets or sets the function that is called when an item is removed, an item is changed, or an item falls outside of the realized range of the ListView.
+        **/
+        resetItem: (item: T, element: HTMLElement) => void;
+
+        /**
+         * Gets or sets the distance, in pixels, of the start of the viewable area within the viewport.
+        **/
+        scrollPosition: number;
+
+        /**
+         * Gets an ISelection that contains the range of currently selected items.
+        **/
+        selection: ISelection<T>;
+
+        /**
+         * Gets or sets the selection mode of the ListView.
+        **/
+        selectionMode: SelectionMode;
+
+        /**
+         * Gets or sets how the ListView reacts to the swipe gesture. The swipe gesture can select the swiped items or can have no effect on the current selection.
+        **/
+        swipeBehavior: WinJS.UI.SwipeBehavior;
+
+        /**
+         * Gets or sets how the ListView reacts when the user taps or clicks an item.
+        **/
+        tapBehavior: TapBehavior;
+
+        /**
+         * Gets a ZoomableView that supports semantic zoom functionality. This API supports the SemanticZoom infrastructure and is not intended to be used directly from your code.
+        **/
+        zoomableView: IZoomableView<ListView<T>>;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * An enumeration of Media commands that the transport bar buttons support.
+    **/
+    interface MediaCommand {
+        audioTracks: string;
+        cast: string;
+        chapterSkipBack: string;
+        chapterSkipForward: string;
+        closedCaptions: string;
+        fastForward: string;
+        goToLive: string;
+        nextTrack: string;
+        pause: string;
+        play: string;
+        playbackRate: string;
+        playFromBeginning: string;
+        previousTrack: string;
+        rewind: string;
+        seek: string;
+        stop: string;
+        timeSkipBack: string;
+        timeSkipForward: string;
+        volume: string;
+        zoom: string;
+    }
+
+    /**
+     * The types of timeline markers supported by the MediaPlayer.
+    **/
+    interface MarkerType {
+        advertisement: string;
+        chapter: string;
+        custom: string;
+    }
+
+    /**
+     * A tab control that displays multiple items.
+    **/
+    class Pivot {
+        //#region Constructors
+
+        /**
+         * Creates a new Pivot.
+         * @constructor
+         * @param element The DOM element hosts the new Pivot.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events. Event names must begin with "on". For example, to provide a handler for the cancel event, add a property named "oncancel" to the options object and set its value to the event handler.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * Raised when a PivotItem control's animation ends.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onitemanimationend(eventInfo: Event): void;
+
+        /**
+         * Raised when a PivotItem control's animation starts.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onitemanimationstart(eventInfo: Event): void;
+
+        /**
+         * Raised when the user navigates to a different PivotItem.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onselectionchanged(eventInfo: Event): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param eventName The name of the event to handle.
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Releases resources held by this Pivot. Call this method when the Pivot is no longer needed. After calling this method, the Pivot becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Forces the control to relayout its content. This function is expected to be called
+         * when the pivot element is manually resized.
+        **/
+        forceLayout(): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param eventName The name of the event that the event handler is registered for.
+         * @param eventCallback The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets the DOM element that hosts the Pivot control.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets or sets the left custom header.
+        **/
+        customLeftHeader: HTMLElement;
+
+        /**
+         * Gets or sets the right custom header.
+        **/
+        customRightHeader: HTMLElement;
+
+        /**
+         * Gets or sets the Binding.List that contains the PivotItem objects that belong to this Pivot.
+        **/
+        items: Binding.List<PivotItem>;
+
+        /**
+         * Gets or sets a value that specifies whether the Pivot control is locked to the current item.
+        **/
+        locked: boolean;
+
+        /**
+         * Gets or sets the index of the PivotItem control in view.
+        **/
+        selectedIndex: number;
+
+        /**
+         * Gets or sets the PivotItem control in view within the Pivot control.
+        **/
+        selectedItem: PivotItem;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        /**
+         * Gets or sets the title displayed above the PivotItem controls.
+        **/
+        title: string;
+
+        //#endregion Properties
+    }
+
+    /**
+     * An item within a Pivot control.
+    **/
+    class PivotItem {
+        //#region Constructors
+
+        /**
+         * Creates a new PivotItem.
+         * @constructor
+         * @param element The DOM element hosts the new PivotItem.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events. Event names must begin with "on". For example, to provide a handler for the cancel event, add a property named "oncancel" to the options object and set its value to the event handler.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Methods
+
+        /**
+         * Releases resources held by this PivotItem. Call this method when the PivotItem is no longer needed. After calling this method, the PivotItem becomes unusable.
+        **/
+        dispose(): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets the DOM element that hosts the PivotItem control's content.
+        **/
+        contentElement: HTMLElement;
+
+        /**
+         * Gets the DOM element that hosts the PivotItem control.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets or sets the header for this PivotItem.
+        **/
+        header: string;
+
+        /**
+         * This object supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        static isDeclarativeControlContainer: any;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+    }
+
+    /**
+     * Represents a menu flyout for displaying commands.
+    **/
+    class Menu {
+        //#region Constructors
+
+        /**
+         * Creates a new Menu object.
+         * @constructor
+         * @param element The DOM element that will host the control.
+         * @param options The set of properties and values to apply to the new Menu.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * Occurs immediately after the Menu is hidden.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onafterhide(eventInfo: Event): void;
+
+        /**
+         * Occurs after the Menu is shown.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onaftershow(eventInfo: Event): void;
+
+        /**
+         * Occurs before the Menu is hidden.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onbeforehide(eventInfo: Event): void;
+
+        /**
+         * Occurs before a hidden Menu is shown.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onbeforeshow(eventInfo: Event): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param type The event type to register. It must be beforeshow, beforehide, aftershow, or afterhide.
+         * @param listener The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(eventName: string, eventProperties: any): boolean;
+
+        /**
+         * Releases resources held by this Menu. Call this method when the Menu is no longer needed. After calling this method, the Menu becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Returns the MenuCommand object identified by id.
+         * @param id The element identifier (ID) of the command to be returned.
+         * @returns The command identified by id.
+        **/
+        getCommandById(id: string): MenuCommand;
+
+        /**
+         * Hides the Menu.
+        **/
+        hide(): void;
+
+        /**
+         * Hides the specified commands of the Menu.
+         * @param commands The commands to hide. The array elements may be MenuCommand objects, or the string identifiers (IDs) of commands.
+         * @param immediate The parameter immediate is not supported and may be altered or unavailable in the future. true to hide the commands immediately, without animating them; otherwise, false.
+        **/
+        hideCommands(commands: any[], immediate?: boolean): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param type The event type to unregister. It must be beforeshow, beforehide, aftershow, or afterhide.
+         * @param listener The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+        /**
+         * Shows the Menu, if hidden, regardless of other states.
+         * @param anchor Required. The DOM element to anchor the Menu.
+         * @param placement The placement of the Menu to the anchor: top, bottom, left, or right.
+         * @param alignment For top or bottom placement, the alignment of the Menu to the anchor's edge: center, left, or right.
+        **/
+        show(anchor: HTMLElement, placement?: string, alignment?: string): void;
+
+        /**
+         * Shows the Menu, if hidden, regardless of other states, top and left aligned at the specified coordinates,
+         * @param coordinates Required. The point where the top left corner of the Menu will appear, relative to the top and left edge of the visual viewport.
+        **/
+        showAt(coordinates: { x: number; y: number; }): void;
+
+        /**
+         * Shows the Menu, if hidden, regardless of other states, top and left aligned at the location of the mouse event object,
+         * @param mouseEventObj Required. The MouseEvent Object specifying where to show the Menu.
+        **/
+        showAt(mouseEventObj: MouseEvent): void;
+
+
+        /**
+         * Shows the specified commands of the Menu.
+         * @param commands The commands to show. The array elements may be Menu objects, or the string identifiers (IDs) of commands.
+         * @param immediate The parameter immediate is not supported and may be altered or unavailable in the future. true to show the commands immediately, without animating them; otherwise, false.
+        **/
+        showCommands(commands: any[], immediate?: boolean): void;
+
+        /**
+         * Shows the specified commands of the Menu while hiding all other commands.
+         * @param commands The commands to show. The array elements may be MenuCommand objects, or the string identifiers (IDs) of commands.
+         * @param immediate The parameter immediate is not supported and may be altered or unavailable in the future. true to show the specified commands (and hide the others) immediately, without animating them; otherwise, false.
+        **/
+        showOnlyCommands(commands: any[], immediate?: boolean): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets the default alignment to be used for this Menu.
+        **/
+        alignment: string;
+
+        /**
+         * Gets or sets the default anchor to be used for this Menu.
+        **/
+        anchor: HTMLElement;
+
+        /**
+         * Sets the MenuCommand objects that appear in the menu.
+        **/
+        commands: MenuCommand[];
+
+        /**
+         * Gets or sets a value that indicates whether the Menu is disabled.
+        **/
+        disabled: boolean;
+
+        /**
+         * Gets the DOM element that hosts the Menu.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets a value that indicates whether the Menu is hidden or in the process of becoming hidden, or sets the Menu to hide or show itself.
+        **/
+        hidden: boolean;
+
+        /**
+         * Gets or sets the default placement to be used for this Menu.
+        **/
+        placement: string;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Represents a command to be displayed in a Menu object.
+    **/
+    class MenuCommand {
+        //#region Constructors
+
+        /**
+         * Creates a new MenuCommand object.
+         * @constructor
+         * @param element The DOM element that will host the control.
+         * @param options The set of properties and values to apply to the new MenuCommand.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param type The event type to register.
+         * @param listener The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+        /**
+         * Disposes this control.
+        **/
+        dispose(): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param type The event type to unregister.
+         * @param listener The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets a value that indicates whether the MenuCommand is disabled.
+        **/
+        disabled: boolean;
+
+        /**
+         * Gets the DOM element that hosts the MenuCommand.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Adds an extra CSS class during construction.
+        **/
+        extraClass: string;
+
+        /**
+         * Gets or sets the Flyout object displayed by this command. The specified flyout is shown when the MenuCommand's button is invoked.
+        **/
+        flyout: Flyout;
+
+        /**
+         * Gets a value that indicates whether the MenuCommand is hidden or in the process of becoming hidden.
+        **/
+        hidden: boolean;
+
+        /**
+         * Gets the element identifier (ID) of the command.
+        **/
+        id: string;
+
+        /**
+         * Gets or sets the label of the command.
+        **/
+        label: string;
+
+        /**
+         * Gets or sets the function to be invoked when the command is clicked.
+        **/
+        onclick: Function;
+
+        /**
+         * Gets or sets the selected state of a toggle button.
+        **/
+        selected: boolean;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        /**
+         * Gets the type of the command.
+        **/
+        type: string;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Displays NavBarCommands in an overlayed navigation pane that opens and closes at the top or bottom of the main view.
+    **/
+    class NavBar {
+        //#region Constructors
+
+        /**
+         * Creates a new NavBar.
+         * @constructor
+         * @param element The DOM element that will host the new NavBar.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * Occurs immediately after the NavBar is closed.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onafterclose(eventInfo: Event): void;
+
+        /**
+         * Raised after the NavBar is opened.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onafteropen(eventInfo: Event): void;
+
+        /**
+         * Raised just before the NavBar is closed.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onbeforeclose(eventInfo: Event): void;
+
+        /**
+         * Occurs before a closed NavBar is opened.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onbeforeopen(eventInfo: Event): void;
+
+        /**
+         * Occurs after the NavBar has finished processing its child elements.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onchildrenprocessed(eventInfo: Event): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Releases resources held by this NavBar. Call this method when the NavBar is no longer needed. After calling this method, the NavBar becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Closes the NavBar.
+        **/
+        close(): void;
+
+        /**
+         * Hides the specified commands of the NavBar.
+         * @param commands The commands to hide. The array elements may be NavBarCommand objects, or the string identifiers (IDs) of commands.
+         * @param immediate The parameter immediate is not supported and may be altered or unavailable in the future. true to hide the commands immediately, without animating them; otherwise, false.
+        **/
+        hideCommands(commands: any[], immediate?: boolean): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param eventName The name of the event that the event handler is registered for.
+         * @param eventCallback The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
+
+        /**
+         * Opens the NavBar
+        **/
+        open(): void;
+
+        /**
+         * Shows the specified commands of the NavBar.
+         * @param commands The commands to show. The array elements may be NavBarCommand objects, or the string identifiers (IDs) of commands.
+         * @param immediate The parameter immediate is not supported and may be altered or unavailable in the future. true to show the commands immediately, without animating them; otherwise, false.
+        **/
+        showCommands(commands: any[], immediate?: boolean): void;
+
+        /**
+         * Shows the specified commands of the NavBar while hiding all other commands.
+         * @param commands The commands to show. The array elements may be NavBarCommand objects, or the string identifiers (IDs) of commands.
+         * @param immediate The parameter immediate is not supported and may be altered or unavailable in the future. true to show the specified commands (and hide the others) immediately, without animating them; otherwise, false.
+        **/
+        showOnlyCommands(commands: any[], immediate?: boolean): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets/Sets how NavBar will display itself while closed. Values are "none" and "minimal".
+        **/
+        closedDisplayMode: string;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        commands: AppBarCommand;
+
+        /**
+         * Gets the HTML element that hosts this NavBar.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Returns the NavBarCommand object identified by id.
+         * @param id The element idenitifier (ID) of the NavBarCommand to be returned.
+         * @returns The NavBarCommand identified by id. If multiple commands have the same ID, returns the first command found.
+        **/
+        getCommandById(id: string): NavBarCommand;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code. Use NavBar.opened instead.
+        **/
+        hidden: boolean;
+
+        /**
+         * Gets a value that indicates whether the NavBar is opened or in the process of becoming opened, or sets the NavBar to open or close itself.
+        **/
+        opened: boolean;
+
+        /**
+         * Gets or sets a value that specifies whether the NavBar appears at the top or bottom of the main view.
+        **/
+        placement: string;
+
+        /**
+         * This object supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        static isDeclarativeControlContainer: any;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Represents a navigation command in a NavBarContainer.
+    **/
+    class NavBarCommand {
+        //#region Constructors
+
+        /**
+         * Creates a new NavBarCommand.
+         * @constructor
+         * @param element The DOM element hosts the new NavBarCommand.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * This API supports the Windows Library for JavaScript infrastructure and is not intended to be used directly from your code.
+         * Use NavBarContainer.oninvoked instead.
+        **/
+        oninvoked: any;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Releases resources held by this NavBarCommand. Call this method when the NavBarCommand is no longer needed. After calling this method, the NavBarCommand becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param eventName The name of the event that the event handler is registered for.
+         * @param eventCallback The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets the HTML element that hosts this NavBarCommand.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets or sets the command's icon.
+        **/
+        icon: string;
+
+        /**
+         * Gets or sets the label of the command.
+        **/
+        label: string;
+
+        /**
+         * Get or sets the location to navigate to when this command is invoked.
+        **/
+        location: any;
+
+        /**
+         * Gets or sets a value that specifies whether to show the split tab stop.
+        **/
+        splitButton: boolean;
+
+        /**
+         * Gets a value that indicates whether the splitButton is open.
+        **/
+        splitOpened: boolean;
+
+        /**
+         * Gets or sets a user-defined object that represents the state associated with the command's location.
+        **/
+        state: any;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        /**
+         * Gets or sets the tooltip of the command.
+        **/
+        tooltip: string;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Contains a group of NavBarCommand objects in a NavBar.
+    **/
+    class NavBarContainer {
+        //#region Constructors
+
+        /**
+         * Creates a new NavBarContainer.
+         * @constructor
+         * @param element The DOM element hosts the new NavBarContainer.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * Occurs when a child NavBarCommand object's click event fires.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.index, detail.navbarcommand, detail.data.
+        **/
+        oninvoked(eventInfo: CustomEvent): void;
+
+        /**
+         * Occurs when the split button of a child NavBarCommand is opened or closed. A split button is toggled when the user navigates to another page or opens another split button.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.opened, detail.index, detail.navbarcommand, detail.data.
+        **/
+        onsplittoggle(eventInfo: CustomEvent): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Releases resources held by this NavBarCommand. Call this method when the NavBarCommand is no longer needed. After calling this method, the NavBarCommand becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Forces the NavBarContainer to update its layout. Use this function when making the NavBarContainer visible again after you set its style.display property to "none".
+        **/
+        forceLayout(): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param eventName The name of the event that the event handler is registered for.
+         * @param eventCallback The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets the index of the current item.
+        **/
+        currentIndex: number;
+
+        /**
+         * Gets or sets a WinJS.Binding.List that generates NavBarCommand objects.
+        **/
+        data: WinJS.Binding.List<NavBarCommand>;
+
+        /**
+         * Gets the HTML element that hosts this NavBarContainer.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets or sets a value that specifies whether NavBarCommand objects in this container use a fixed or dynamic width.
+        **/
+        fixedSize: boolean;
+
+        /**
+         * Gets or sets a value that specifies whether the NavBarContainer has a horizontal or vertical layout.
+        **/
+        layout: Orientation;
+
+        /**
+         * Gets or sets a value that specifies how many rows of navigation commands to display on a page.
+        **/
+        maxRows: number;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        /**
+         * Gets or sets the WinJS.Binding.Template or templating function that creates the DOM elements for each item in the data source. Each item can contain multiple elements, but it must have a single root element.
+        **/
+        template: WinJS.Binding.Template;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Lets the user rate something by clicking an icon that represents a rating. The Rating control can display three types of ratings: an average rating, a tentative rating, and the user's rating.
+    **/
+    class Rating {
+        //#region Constructors
+
+        /**
+         * Creates a new Rating.
+         * @constructor
+         * @param element The DOM element hosts the new Rating.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events. Event names must begin with "on". For example, to provide a handler for the cancel event, add a property named "oncancel" to the options object and set its value to the event handler.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * Raised when the user finishes interacting with the rating control without committing a tentative rating.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        oncancel(eventInfo: Event): void;
+
+        /**
+         * Raised when the user commits a change to the userRating.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.tentativeRating.
+        **/
+        onchange(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised when the user is choosing a new tentative Rating.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.tentativeRating.
+        **/
+        onpreviewchange(eventInfo: CustomEvent): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param eventName The name of the event to handle.
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Releases resources held by this Rating. Call this method when the Rating is no longer needed. After calling this method, the Rating becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param eventName The name of the event that the event handler is registered for.
+         * @param eventCallback The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets the average rating.
+        **/
+        averageRating: number;
+
+        /**
+         * Gets or sets whether the control is disabled. When the control is disabled, the user can't specify a new user rating or modify an existing rating.
+        **/
+        disabled: boolean;
+
+        /**
+         * Gets the DOM element that hosts the Rating.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets or sets whether control lets the user clear the rating.
+        **/
+        enableClear: boolean;
+
+        /**
+         * Gets or sets the maximum possible rating value.
+        **/
+        maxRating: number;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        /**
+         * Gets or sets a set of descriptions to show for rating values in the tooltip.
+        **/
+        tooltipStrings: string[];
+
+        /**
+         * Gets or sets the user's rating.
+        **/
+        userRating: number;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Generates HTML from a set of data. Use this control to generate lists of items.
+    **/
+    class Repeater {
+        //#region Constructors
+
+        /**
+         * Creates a new Repeater control.
+         * @constructor
+         * @param elemnt The DOM element that will host the new control. The Repeater will create an element if this value is null.
+         * @param options An object that contains one or more property/value pairs to apply to the new Repeater. Each property of the options object corresponds to one of the object's properties or events. Event names must begin with "on".
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * Raised after an item in the Repeater control's data source changes and after the corresponding DOM element has been updated.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.index, detail.key, detail.newElement, detail.newItem, detail.newValue, detail.oldElement, detail.oldItem, detail.oldValue, detail.setPromise.
+        **/
+        onitemchanged(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised after an item in the Repeater control's data source changes but before the corresponding DOM element has been updated.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.index, detail.key, detail.newElement, detail.newItem, detail.newValue, detail.oldElement, detail.oldItem, detail.oldValue, detail.setPromise.
+        **/
+        onitemchanging(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised after an item has been added to the Repeater control's data source and after the corresponding DOM element has been added.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.affectedElement, detail.index, detail.key, detail.value.
+        **/
+        oniteminserted(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised after an item has been added to the Repeater control's data source but before the corresponding DOM element has been added.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.affectedElement, detail.index, detail.key, detail.value.
+        **/
+        oniteminserting(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised after an item has been moved from one index to another in the Repeater control's data source and after the corresponding DOM element has been moved.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.affectedElement, detail.index, detail.key, detail.oldIndex, detail.newIndex.
+        **/
+        onitemmoved(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised after an item has been moved from one index to another in the Repeater control's data source but before the corresponding DOM element has been moved.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.affectedElement, detail.index, detail.key, detail.oldIndex, detail.newIndex.
+        **/
+        onitemmoving(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised after an item has been moved from one index to another in the Repeater control's data source and after the corresponding DOM element has been moved.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.affectedElement, detail.index, detail.item, detail.setPromise.
+        **/
+        onitemremoved(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised after an item has been removed from the Repeater control's data source but before the corresponding DOM element has been removed.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.affectedElement, detail.index, detail.item, detail.setPromise.
+        **/
+        onitemremoving(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised when the Repeater has finished loading a new set of data. This event is only fired on construction. This event is only raised when the Repeater is constructed or its data source or template changes.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onitemsloaded(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised after the Repeater control's underlying data has been updated and after the updated HTML has been reloaded.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.affectedElements.
+        **/
+        onitemsreloaded(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised after the Repeater control's underlying data has been updated but before the updated HTML has been reloaded.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.affectedElements, detail.setPromise.
+        **/
+        onitemsreloading(eventInfo: CustomEvent): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param eventName The name of the event to handle.
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Releases resources held by this Repeater. Call this method when the Repeater is no longer needed. After calling this method, the Repeater becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Returns the HTML element for the item at the specified index.
+         * @param index The index of the item.
+         * @returns The DOM element for the specified item.
+        **/
+        elementFromIndex(index: number): HTMLElement;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param eventName The name of the event that the event handler is registered for.
+         * @param eventCallback The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets the List that provides the Repeater with items to display.
+        **/
+        data: WinJS.Binding.List<any>;
+
+        /**
+         * Gets the DOM element that hosts the Repeater.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets the number of items in the Repeater control.
+        **/
+        length: number;
+
+        /**
+         * This object supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        static isDeclarativeControlContainer: any;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        /**
+         * Gets or sets a WinJS.Binding.Template or custom rendering function that defines the HTML of each item within the Repeater.
+        **/
+        template: WinJS.Binding.Template;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Enables the user to perform search queries and select suggestions.
+    **/
+    class SearchBox {
+        //#region Constructors
+
+        /**
+         * Creates a new SearchBox.
+         * @constructor
+         * @param element The DOM element hosts the new SearchBox.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * Raised when the user or the app changes the queryText.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.language, detail.queryText, detail.linguisticDetails.
+        **/
+        onquerychanged(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised awhen the user clicks the search glyph or presses Enter.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.language, detail.queryText, detail.linguisticDetails, detail.keyModifiers.
+        **/
+        onquerysubmitted(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised when the user selects a suggested option for the search.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.tag, detail.keyModifiers, detail.storageFile.
+        **/
+        onresultsuggestionchosen(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised when the system requests search suggestions from this app.
+         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.language, detail.linguisticDetails, detail.queryText, detail.searchSuggestionCollection.
+        **/
+        onsuggestionsrequested(eventInfo: CustomEvent): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Releases resources held by this SearchBox. Call this method when the SearchBox is no longer needed. After calling this method, the SearchBox becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param eventName The name of the event that the event handler is registered for.
+         * @param eventCallback The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
+
+        /**
+         * Specifies whether suggestions based on local files are automatically displayed in the search pane, and defines the criteria that Windows uses to locate and filter these suggestions.
+         * @param settings The new settings for local content suggestions.
+        **/
+        setLocalContentSuggestionSettings(settings: any): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets whether the first suggestion is chosen when the user presses Enter.
+        **/
+        chooseSuggestionOnEnter: boolean;
+
+        /**
+         * Gets or sets a value that specifies whether the SearchBox is disabled. If the control is disabled, it won't receive focus.
+        **/
+        disabled: boolean;
+
+        /**
+         * Gets the DOM element that hosts the SearchBox.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets or sets a value that specifies whether the search box automatically receives focus when the user types into the app window.
+        **/
+        focusOnKeyboardInput: boolean;
+
+        /**
+         * Gets or sets the placeholder text for the SearchBox. This text is displayed if there is no other text in the input box.
+        **/
+        placeholderText: string;
+
+        /**
+         * Gets or sets the query text for the SearchBox.
+        **/
+        queryText: string;
+
+        /**
+         * Gets or sets the search history context. This context is used a secondary key (the app ID is the primary key) for storing search history.
+        **/
+        searchHistoryContext: string;
+
+        /**
+         * Gets or sets a value that specifies whether search history is disabled.
+        **/
+        searchHistoryDisabled: boolean;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+        static createResultSuggestionImage(url: string): any;
+
+    }
+
+    /**
+     * Enables the user to zoom between two different views supplied by two child controls. One child control supplies the zoomed-out view and the other provides the zoomed-in view.
+    **/
+    class SemanticZoom {
+        //#region Constructors
+
+        /**
+         * Creates a new SemanticZoom.
+         * @constructor
+         * @param element The DOM element that hosts the SemanticZoom.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. This object can contain these properties: initiallyZoomedOut Boolean, zoomFactor 0.2–0.85.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * Occurs when the control zooms in or out.
+         * @param eventInfo An object that contains information about the event. The detail property of this object is true when the control is zoomed out. Otherwise, it's false.
+        **/
+        onzoomchanged(eventInfo: CustomEvent): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param eventName The name of the event to handle.
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Releases resources held by this SemanticZoom. Call this method when the SemanticZoom is no longer needed. After calling this method, the SemanticZoom becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Forces the SemanticZoom to update its layout. Use this function when making the SemanticZoom visible again after its style.display property had been set to "none".
+        **/
+        forceLayout(): void;
+
+        /**
+         * Unregisters an event handler for the specified event.
+         * @param eventName The name of the event that the event handler is registered for.
+         * @param eventCallback The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+        **/
+        setTimeoutAfterTTFF(callback: Function, delay: number): void
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets the DOM element that hosts the SemanticZoom control.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets or a sets a value that specifies whether to display the SemanticZoom zoom out button.
+        **/
+        enableButton: boolean;
+
+        /**
+         * Gets or sets a value that indicates whether SemanticZoom is locked and zooming between views is disabled.
+        **/
+        locked: boolean;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        /**
+         * Gets or sets a value that indicates whether the control is zoomed out.
+        **/
+        zoomedOut: boolean;
+
+        /**
+         * Gets or sets a value that specifies how much the scaling the cross-fade animation performs when the SemanticZoom transitions between views.
+        **/
+        zoomFactor: number;
+
+        /**
+         * Gets or sets a mapping function which can be used to change the item that is targeted on zoom in.
+        **/
+        zoomedInItem: (any: any) => any;
+
+        /**
+         * Gets or sets a mapping function which can be used to change the item that is targeted on zoom out.
+        **/
+        zoomedOutItem: (any: any) => any;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Provides users with fast, in-context access to settings that affect the current Windows Store app.
+    **/
+    class SettingsFlyout {
+        //#region Constructors
+
+        /**
+         * Creates a new SettingsFlyout object.
+         * @constructor
+         * @param element The DOM element that will host the control.
+         * @param options The set of properties and values to apply to the new SettingsFlyout.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * Raised immediately after the SettingsFlyout is completely hidden.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onafterhide(eventInfo: Event): void;
+
+        /**
+         * Raised immediately after a SettingsFlyout is fully shown.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onaftershow(eventInfo: Event): void;
+
+        /**
+         * Raised just before hiding a SettingsFlyout.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onbeforehide(eventInfo: Event): void;
+
+        /**
+         * Raised just before showing a SettingsFlyout.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onbeforeshow(eventInfo: Event): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param type The event type to register. It must be beforeshow, beforehide, aftershow, or afterhide.
+         * @param listener The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Releases resources held by this SettingsFlyout. Call this method when the SettingsFlyout is no longer needed. After calling this method, the SettingsFlyout becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Hides the SettingsFlyout, if visible, regardless of other states.
+        **/
+        hide(): void;
+
+        /**
+         * Loads a fragment of the SettingsFlyout. Your app calls this when the user invokes a settings command and the WinJS.Application.onsettings event occurs.
+         * @param e An object that contains information about the event, received from the WinJS.Application.onsettings event. The detail property of this object contains the applicationcommands sub-property that you set to an array of settings commands. You then populate the SettingsFlyout with these commands by a call to populateSettings.
+        **/
+        static populateSettings(e: CustomEvent): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param type The event type to unregister. It must be beforeshow, beforehide, aftershow, or afterhide.
+         * @param listener The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+        /**
+         * Shows the SettingsPane UI, if hidden.
+        **/
+        show(): void;
+
+        /**
+         * Shows the SettingsPane UI, if hidden, regardless of other state.
+        **/
+        static show(): void;
+
+        /**
+         * Show the Settings flyout using the Settings element identifier (ID) and the path of the page that contains the Settings element.
+         * @param id The ID of the Settings element.
+         * @param path The path of the page that contains the Settings element.
+        **/
+        static showSettings(id: string, path: any): void;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Specifies whether the SettingsFlyout is disabled.
+        **/
+        disabled: boolean;
+
+        /**
+         * Gets the DOM element the SettingsFlyout is attached to.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets whether the SettingsFlyout is hidden.
+        **/
+        hidden: boolean;
+
+        /**
+         * Gets or sets the settings command Id for the SettingsFlyout control.
+        **/
+        settingsCommandId: string;
+
+        /**
+         * This property may be unavailable or altered in future versions. Use the CSS width property of the element that has the win-settingsflyout class instead.
+        **/
+        width: string;
+
+        //#endregion Properties
+
+    }
+    /**
+     * Displays a SplitView which renders a collapsable pane next to arbitrary HTML content.
+    **/
+    class SplitView {
+        /**
+         * Placement options for a SplitView's pane.
+        **/
+        static PanePlacement: {
+            /**
+             * Pane is positioned left of the SplitView's content.
+            **/
+            left: string;
+            /**
+             * Pane is positioned right of the SplitView's content.
+            **/
+            right: string;
+            /**
+             * Pane is positioned above the SplitView's content.
+            **/
+            top: string;
+            /**
+             * Pane is positioned below the SplitView's content.
+            **/
+            bottom: string;
+        }
+
+        /**
+         * Display options for a SplitView's pane when it is closed.
+        **/
+        static ClosedDisplayMode: {
+            /**
+             * When the pane is closed, it is not visible and doesn't take up any space.
+            **/
+            none: string;
+            /**
+             * When the pane is closed, it occupies space leaving less room for the SplitView's content.
+            **/
+            inline: string;
+        }
+
+        /**
+         * Display options for a SplitView's pane when it is open.
+        **/
+        static OpenedDisplayMode: {
+            /**
+             * When the pane is open, it occupies space leaving less room for the SplitView's content.
+            **/
+            inline: string;
+            /**
+             * When the pane is open, it doesn't take up any space and it is light dismissable.
+            **/
+            overlay: string;
+        }
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        /**
+         * Creates a new SplitView.
+         * @constructor
+         * @param element The DOM element hosts the new SplitView.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        /**
+         * Gets the DOM element that hosts the SplitView control.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets the DOM element that hosts the SplitView pane.
+        **/
+        paneElement: HTMLElement;
+
+        /**
+         * Gets the DOM element that hosts the SplitView's content.
+        **/
+        contentElement: HTMLElement;
+
+        /**
+         * Gets or sets the placement of the SplitView's pane.
+        **/
+        panePlacement: string;
+
+        /**
+         * Gets or sets the display mode of the SplitView's pane when it is closed.
+        **/
+        closedDisplayMode: string;
+
+        /**
+         * Gets or sets the display mode of the SplitView's pane when it is open.
+        **/
+        openedDisplayMode: string;
+
+        /**
+         * Gets or sets whether the SpitView's pane is currently open.
+        **/
+        paneOpened: boolean;
+
+        /**
+         * Opens the SplitView's pane.
+        **/
+        openPane(): void;
+
+        /**
+         * Closes the SplitView's pane.
+        **/
+        closePane(): void;
+
+        /**
+         * Disposes this control.
+        **/
+        dispose(): void;
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param eventName The name of the event that the event handler is registered for.
+         * @param eventCallback The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Raised just before opening the pane. Call preventDefault on this event to stop the pane from opening.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onbeforeopen(eventInfo: Event): void;
+
+        /**
+         * Raised immediately after the pane is fully open.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onafteropen(eventInfo: Event): void;
+
+        /**
+         * Raised just before closing the pane. Call preventDefault on this event to stop the pane from closing.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onbeforeclose(eventInfo: Event): void;
+
+        /**
+         * Raised immediately after the pane is fully closed.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onafterclose(eventInfo: Event): void;
+    }
+
+    /**
+     * Displays a button which is used for opening and closing a SplitView's pane.
+    **/
+    class SplitViewPaneToggle {
+        /**
+         * Creates a new SplitViewPaneToggle.
+         * @constructor
+         * @param element The DOM element hosts the new SplitViewPaneToggle.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
+        **/
+        constructor(element?: HTMLButtonElement, options?: any);
+
+        /**
+         * Gets the DOM element that hosts the SplitViewPaneToggle control.
+        **/
+        element: HTMLButtonElement;
+
+        /**
+         * Gets or sets the DOM element of the SplitView that is associated with the SplitViewPaneToggle control.
+         * When the SplitViewPaneToggle is invoked, it'll toggle this SplitView's pane.
+        **/
+        splitView: HTMLElement;
+
+        /**
+         * Disposes this control.
+        **/
+        dispose(): void;
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param eventName The name of the event that the event handler is registered for.
+         * @param eventCallback The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Raised when the SplitViewPaneToggle is invoked.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        oninvoked(eventInfo: Event): void;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+    }
+
+    /**
+    * Represents a command in the SplitView Pane.
+    **/
+    class SplitViewCommand {
+        //#region Constructors
+
+        /**
+         * Creates a new SplitViewCommand.
+         * @constructor
+         * @param element The DOM element hosts the new SplitViewCommand.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //# region Events
+
+        /**
+         * Raised when a SplitViewCommand has been invoked.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        oninvoked(eventInfo: CustomEvent): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Releases resources held by this SplitViewCommand. Call this method when the SplitViewCommand is no longer needed. After calling this method, the SplitViewCommand becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param eventName The name of the event that the event handler is registered for.
+         * @param eventCallback The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets the HTML element that hosts this SplitViewCommand.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets or sets the command's icon.
+        **/
+        icon: string;
+
+        /**
+         * Gets or sets the label of the command.
+        **/
+        label: string;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        /**
+         * Gets or sets the tooltip of the command.
+        **/
+        tooltip: string;
+
+        //#endregion Properties
+    }
+
+    /**
+     * A type of IListDataSource that provides read-access to an object that implements the IStorageQueryResultBase interface. A StorageDataSource enables you to query and bind to items in the data source.
+    **/
+    class StorageDataSource<T> {
+        //#region Constructors
+
+        /**
+         * Creates a new StorageDataSource object.
+         * @constructor
+         * @param query The IStorageQueryResultBase that the StorageDataSource obtains its items from. Instead of IStorageQueryResultBase, you can also pass one of these string values: Music, Pictures, Videos, Documents.
+         * @param options The set of properties and values to apply to the new StorageDataSource. Properties on this object may include: mode , requestedThumbnailSize , thumbnailOptions , synchronous .
+        **/
+        constructor(query: any, options?: any);
+
+        //#endregion Constructors
+
+        //#region Methods
+
+        /**
+         * Draws the thumbnail for the specified item to the specified img element.
+         * @param item The item to retrieve the thumbnail for.
+         * @param image The img element that will display the thumbnail.
+         * @returns A Promise that completes when the full-quality thumbnail is visible.
+        **/
+        loadThumbnail(item: IItem<T>, image: HTMLImageElement): Promise<void>;
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param type The name of the event for which to add a listener.
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(type: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param details The set of additional properties to be attached to the event object.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, details: any): boolean;
+
+        /**
+         * Removes a listener for the specified event.
+         * @param type The name of the event for which to remove a listener.
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Optional. The same value that was passed to addEventListener for this listener. It may be omitted if it was omitted when calling addEventListener.
+        **/
+        removeEventListener(type: string, eventHandler: Function, useCapture?: any): void;
+
+        //#endregion Methods
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+    }
+
+    /**
+     * Prevents a DOM sub-tree from receiving tab navigations and focus.
+    **/
+    class TabContainer {
+        //#region Constructors
+
+        /**
+         * Creates a new TabContainer.
+         * @constructor
+         * @param element The DOM element that hosts the TabContainer control.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties.
+        **/
+        constructor(element: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Methods
+
+        /**
+         * Releases resources held by this TabContainer. Call this method when the TabContainer is no longer needed. After calling this method, the TabContainer becomes unusable.
+        **/
+        dispose(): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets the child DOM element that receives tab focus.
+        **/
+        childFocus: HTMLElement;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        /**
+         * Gets or sets the tab index of this container.
+        **/
+        tabIndex: number;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Allows users to select time values.
+    **/
+    class TimePicker {
+        //#region Constructors
+
+        /**
+         * Initializes a new instance of a TimePicker control.
+         * @constructor
+         * @param element The DOM element associated with the TimePicker control.
+         * @param options The set of options to be applied initially to the TimePicker control. The options are the following: clock.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * Occurs when any of the controls are changed by the user.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onchange(eventInfo: CustomEvent): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Adds an event listener.
+         * @param type The type (name) of the event.
+         * @param listener The function that handles the event.
+         * @param capture If true, specifies that capture should be initiated, otherwise false.
+        **/
+        addEventListener(type: string, listener: Function, capture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Releases resources held by this TimePicker. Call this method when the TimePicker is no longer needed. After calling this method, the TimePicker becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * This API supports the WinJS infrastructure and is not intended to be used directly from your code. Use render instead.
+        **/
+        static getInformation(clock: any, minuteIncrement: any, timerPatterns?: any): any;
+
+        /**
+         * Removes a listener for the specified event.
+         * @param type The name of the event for which to remove a listener.
+         * @param listener The listener.
+         * @param useCapture Optional. The same value that was passed to addEventListener for this listener. It may be omitted if it was omitted when calling addEventListener.
+        **/
+        removeEventListener(type: string, listener: Function, useCapture?: any): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets the type of clock to display (12HourClock or 24HourClock). It defaults to the user setting.
+        **/
+        clock: string;
+
+        /**
+         * Gets or sets the current time of the TimePicker. Note that the date value is always July 15, 2011.
+        **/
+        current: Date;
+
+        /**
+         * Specifies whether the TimePicker is disabled.
+        **/
+        disabled: boolean;
+
+        /**
+         * Gets the DOM element for the TimePicker.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets or sets the display pattern for the hour. The default hour pattern is hour.integer(2). You can change the hour pattern by changing the number of integers displayed.
+        **/
+        hourPattern: string;
+
+        /**
+         * Gets or sets the minute increment. For example, 15 specifies that the TimePicker minute control should display only the choices 00, 15, 30, 45.
+        **/
+        minuteIncrement: number;
+
+        /**
+         * Gets or sets the display pattern for the minute. The default minute pattern is minute.integer(2). You can change the minute pattern by changing the number of integers displayed.
+        **/
+        minutePattern: string;
+
+        /**
+         * Gets or sets the display pattern for the period. The default period pattern is period.abbreviated(2). You can change the period pattern by changing the number of integers displayed.
+        **/
+        periodPattern: string;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * A control that lets the user switch an option between two states: on (checked is set to true) and off (checked is set to false).
+    **/
+    class ToggleSwitch {
+        //#region Constructors
+
+        /**
+         * Creates a new ToggleSwitch.
+         * @constructor
+         * @param element The DOM that hosts the control.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events. Event names must begin with "on". For example, to provide a handler for the change event, add a property named "onchange" to the options object and set its value to the event handler.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * Occurs when the ToggleSwitch control is flipped to on (checked == true) or off (checked == false).
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onchange(eventInfo: Event): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param eventName The name of the event to handle.
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Releases resources held by this ToggleSwitch. Call this method when the ToggleSwitch is no longer needed. After calling this method, the ToggleSwitch becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param eventName The name of the event that the event handler is registered for.
+         * @param eventCallback The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets a value that specifies whether the control is on or off.
+        **/
+        checked: boolean;
+
+        /**
+         * Gets or sets a value that specifies whether the control is disabled.
+        **/
+        disabled: boolean;
+
+        /**
+         * Gets the DOM element that hosts the ToggleSwitch.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets or sets the text that displays when the ToggleSwitch is off (checked is set to false).
+        **/
+        labelOff: string;
+
+        /**
+         * Gets or sets the text that displays when the ToggleSwitch is on (checked is set to true).
+        **/
+        labelOn: string;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        /**
+         * Gets or sets the main text for the ToggleSwitch control. This text is always displayed, regardless of whether the control is switched on or off.
+        **/
+        title: string;
+
+        //#endregion Properties
+
+    }
+    /**
+     * Displays ICommands within the flow of the app. Use the ToolBar around other statically positioned app content.
+    **/
+    class ToolBar {
+
+        /**
+         * Display options for the closed ToolBar.
+        **/
+        public static ClosedDisplayMode: {
+            /**
+             * When the ToolBar is closed, the height of the ToolBar is reduced such that button commands are still visible, but their labels are hidden.
+            **/
+            compact: string;
+            /**
+             * When the ToolBar is closed, the height of the ToolBar is always sized to content.
+            **/
+            full: string;
+        };
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        public static supportedForProcessing: boolean;
+
+        /**
+        * Gets the DOM element that hosts the ToolBar.
+        **/
+        public element: HTMLElement;
+
+        /**
+         * Gets or sets the Binding List of ICommand for the ToolBar.
+        **/
+        public data: WinJS.Binding.List<ICommand>;
+
+        /**
+         * Gets or sets the closedDisplayMode for the ToolBar. Values are "compact" and "full".
+        **/
+        public closedDisplayMode: string;
+
+        /**
+         * Creates a new ToolBar control.
+         * @param element The DOM element that will host the control.
+         * @param options The set of properties and values to apply to the new ToolBar.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        /**
+         * Disposes the ToolBar
+        **/
+        public dispose(): void;
+
+        /**
+         * Forces the ToolBar to update its layout.
+         * Use this function when the window did not change size, but the ToolBar itself did.
+        **/
+        public forceLayout(): void;
+
+        /**
+         * Opens the ToolBar
+        **/
+        public open(): void;
+
+        /**
+         * Closes the ToolBar
+        **/
+        public close(): void;
+
+        /**
+         * Returns the Command object identified by id.
+         * @param id The element idenitifier (ID) of the command to be returned.
+         * @returns The command identified by id. If multiple commands have the same ID, returns the first command found.
+        **/
+        getCommandById(id: string): ICommand;
+
+        /**
+         * Shows the specified commands of the ToolBar while hiding all other commands.
+         * @param commands The commands to show. The array elements may be ICommand objects, or the string identifiers (IDs) of commands.
+        **/
+        showOnlyCommands(commands: Array<string|ICommand>): void;
+
+        /**
+         * Gets or sets whether the ToolBar is currently opened.
+        **/
+        public opened: boolean;
+
+        /**
+         * Occurs immediately before the control is opened. Is cancelable.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        public onbeforeopen: (eventInfo: CustomEvent) => void;
+
+        /**
+         * Occurs immediately after the control is opened.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        public onafteropen: (eventInfo: CustomEvent) => void;
+
+        /**
+         * Occurs immediately before the control is closed. Is cancelable.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        public onbeforeclose: (eventInfo: CustomEvent) => void;
+
+        /**
+         * Occurs immediately after the control is closed.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        public onafterclose: (eventInfo: CustomEvent) => void;
+
+        /**
+          * Registers an event handler for the specified event.
+          * @param type The event type to register. It must be beforeopen, beforeclose, afteropen, or afterclose.
+          * @param listener The event handler function to associate with the event.
+          * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+         **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param type The event type to unregister. It must be beforeopen, beforeclose, afteropen, or afterclose.
+         * @param listener The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(eventName: string, eventProperties: any): boolean;
+    }
+
+    /**
+     * Displays a tooltip that can contain images and formatting.
+    **/
+    class Tooltip {
+        //#region Constructors
+
+        /**
+         * Creates a new Tooltip.
+         * @constructor
+         * @param element The DOM element associated that hosts the Tooltip.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events. Event names must begin with "on". For example, to provide a handler for the opened event, add a property named "onopened" to the options object and set its value to the event handler.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        /**
+         * Raised just before the Tooltip is hidden.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onbeforeclose(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised just before the Tooltip appears.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onbeforeopen(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised when the Tooltip is no longer displayed.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onclosed(eventInfo: CustomEvent): void;
+
+        /**
+         * Raised when the Tooltip is shown.
+         * @param eventInfo An object that contains information about the event.
+        **/
+        onopened(eventInfo: CustomEvent): void;
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Adds an event handler for the specified event.
+         * @param eventName The name of the event to handle.
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Hides the Tooltip.
+        **/
+        close(): void;
+
+        /**
+         * Releases resources held by this Tooltip. Call this method when the Tooltip is no longer needed. After calling this method, the Tooltip becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Shows the Tooltip.
+         * @param type A value that specifies when to show the Tooltip. The default value is "mousedown".
+        **/
+        open(type?: string): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param eventName The name of the event that the event handler is registered for.
+         * @param eventCallback The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets or sets the HTML element that is the content of the Tooltip.
+        **/
+        contentElement: HTMLElement;
+
+        /**
+         * Gets the DOM element that hosts the Tooltip control.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Gets or appends additional CSS classes to apply to the element that hosts the Tooltip.
+        **/
+        extraClass: string;
+
+        /**
+         * Gets or sets a value that specifies whether the Tooltip is an infotip, a tooltip that contains a lot of info and should be displayed for longer than a typical Tooltip.
+        **/
+        infotip: boolean;
+
+        /**
+         * Gets or sets the HTML content of the Tooltip.
+        **/
+        innerHTML: string;
+
+        /**
+         * Gets or sets the position for the Tooltip relative to its target element: top, bottom, left or right.
+        **/
+        placement: string;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Scales a single child element to fill the available space without resizing it. This control reacts to changes in the size of the container as well as changes in size of the child element. For example, a media query may result in a change in aspect ratio.
+    **/
+    class ViewBox {
+        //#region Constructors
+
+        /**
+         * Initializes a new instance of the ViewBox control.
+         * @constructor
+         * @param element The DOM element that functions as the scaling box. This element fills 100% of the width and height allotted to it.
+         * @param options The set of options to be applied initially to the ViewBox control. There are currently no options on this control, and any options included in this parameter are ignored.
+        **/
+        constructor(element?: HTMLElement, options?: any);
+
+        //#endregion Constructors
+
+        //#region Methods
+
+        /**
+         * Adds an event handler for the specified event.
+         * @param eventName The name of the event to handle.
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param eventName The name of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(eventName: string, eventProperties: any): boolean;
+
+        /**
+         * Releases resources held by this ViewBox. Call this method when the ViewBox is no longer needed. After calling this method, the ViewBox becomes unusable.
+        **/
+        dispose(): void;
+
+        /**
+         * Forces the ViewBox to update its layout. Use this function when making the ViewBox visible again after its style.display property had been set to "none".
+        **/
+        forceLayout(): void;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param eventName The name of the event that the event handler is registered for.
+         * @param eventCallback The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets the DOM element that functions as the scaling box.
+        **/
+        element: HTMLElement;
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * A special data source for VirtualizedDataSource.computeDataSourceGroups
+     **/
+    interface IListGroupDataSource<T> extends IListDataSource<T> {
+        groups: IListDataSource<T>;
+    }
+
+    /**
+     * Serves as the base class for a custom IListDataSource.
+    **/
+    class VirtualizedDataSource<T> {
+        //#region Constructors
+
+        /**
+         * Initializes the VirtualizedDataSource base class of a custom data source.
+         * @constructor
+         * @param listDataAdapter The object that supplies data to the VirtualizedDataSource.
+         * @param options An object that can contain properties that specify additional options for the VirtualizedDataSource. It supports these properties: cacheSize.
+        **/
+        constructor(listDataAdapter: IListDataAdapter<T>, options?: any);
+
+        //#endregion Constructors
+
+        //#region Events
+
+        //#endregion Events
+
+        //#region Methods
+
+        /**
+         * Registers an event handler for the specified event.
+         * @param eventName The name of the event to handle. See the VirtualizedDataSource object page for a list of events. Note that you drop the "on" when specifying the event name for the addEventListener method. For example, instead of specifying "onstatuschanged", you specify "statuschanged".
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
+        **/
+        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event, otherwise false.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Removes an event handler that the addEventListener method registered.
+         * @param eventName The name of the event that the event handler is registered for. See the VirtualizedDataSource object page for a list of events.
+         * @param eventCallback The event handler function to remove.
+         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
+        **/
+        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#endregion Properties
+
+    }
+
+    //#endregion Objects
+
+    //#region Functions
+
+    /**
+     * Returns a new IListDataSource that adds group information to the items of another IListDataSource.
+     * @param listDataSource The data source for the individual items to group.
+     * @param groupKey A callback function that accepts a single argument: an item in the IListDataSource. The function is called for each item in the list and must return the group key for that item as a string.
+     * @param groupData A callback function that accepts a single argument: an item in the IListDataSource. The function is called on one IListDataSource item for each group and must return an object that represents the header of that group.
+     * @param options An object that can contain properties that specify additional options: groupCountEstimate, batchSize.
+     * @returns An IListGroupDataSource that contains the items in the original data source and provides additional group information in the form of a "groups" property. The "groups" property returns another IListDataSource that enumerates the different groups in the list.
+    **/
+    function computeDataSourceGroups<T>(listDataSource: IListDataSource<T>, groupKey: Function, groupData: Function, options?: any): IListGroupDataSource<T>;
+
+    /**
+     * Used to disables all Animations Library and ListView animations. Calling this function does not guarantee that the animations will be disabled, as the determination is made based on several factors.
+    **/
+    function disableAnimations(): void;
+
+    /**
+     * Used to enable all Animations Library and ListView animations. Calling this function does not guarantee that the animations will be enabled, as the determination is made based on several factors.
+    **/
+    function enableAnimations(): void;
+
+    /**
+     * Marks a event handler function as being compatible with declarative processing.
+     * @param handler The handler to be marked as compatible with declarative processing.
+     * @returns The handler, marked as compatible with declarative processing.
+    **/
+    function eventHandler(handler: any): any;
+
+    /**
+     * Asynchronously executes a collection of CSS animations on a collection of elements. This is the underlying animation mechanism used by the Animations Library. Apps are encouraged to use the Animations Library to conform with the standard look and feel of the rest of the system, rather than calling this function directly.
+     * @param element Element or elements to be animated. This parameter can be expressed in several ways: As the special value "undefined", which means that the animation has no target, As a single object, As a JavaScript array (possibly empty), in which each element of the array can be a single element or a JavaScript array of elements., As a NodeList (for example, the result of querySelectorAll), As an HTMLCollection.
+     * @param animation The animation description or an array of animation descriptions to apply to element. An animation description is a JavaScript object with specific properties, listed below. There are two types of animation descriptions: one for keyframe-based animations and one for explicit animations. These types are distinguished by whether the keyframe property has a defined value. The following properties are required for both types of animation descriptions: property (string), delay (number), duration (number), timing (string). If an animation has a keyframe property with a defined, non-null value, then the animation is a keyframe-based animation. A keyframe-based animation description requires the following property in addition to those mentioned above: keyframe (string). If an animation does not have a keyframe property, or if the value of the property is null or undefined, then the animation is an explicit animation. An explicit animation description requires the following properties in addition to the common properties mentioned above: from, to. The values given in the from and to properties must be valid for the CSS property specified by the property property. For example, if the CSS property is "opacity", then the from and to properties must be numbers between 0 and 1 (inclusive).
+     * @returns Returns a Promise object that completes when the CSS animation is complete.
+    **/
+    function executeAnimation(element: HTMLElement, animation: any): Promise<any>;
+
+    /**
+     * Asynchronously executes a collection of CSS transitions on a collection of elements. This is the underlying animation mechanism used by the Animations Library. Apps are encouraged to use the Animations Library to conform with the standard look and feel of the rest of the system, rather than calling this function directly.
+     * @param element Element or elements on which to perform the transition. This parameter can be expressed in several ways: As the special value "undefined", which means that the transition has no target, As a single object, As a JavaScript array (possibly empty), in which each element of the array can be a single element or a JavaScript array of elements., As a NodeList (for example, the result of querySelectorAll), As an HTMLCollection.
+     * @param transition The transition description or an array of transition descriptions to apply to element. A transition description is a JavaScript object with these properties: property (string), delay (number), duration (number), timing (string), from (optional), to. The values given in the from and to properties must be valid for the CSS property specified by the property property. For example, if the CSS property is "opacity", then the from and to properties must be numbers between 0 and 1 (inclusive).
+     * @returns Returns a Promise that completes when the transition is finished.
+    **/
+    function executeTransition(element: HTMLElement, transition: any): Promise<any>;
+
+    /**
+     * Retrieves the items in the specified index range.
+     * @param dataSource The data source that contains the items to retrieve.
+     * @param ranges An array of ISelectionRange objects that have firstIndex and lastIndex values.
+     * @returns A Promise that contains an array of the requested IItem objects.
+    **/
+    function getItemsFromRanges<U>(dataSource: IListDataSource<U>, ranges: ISelectionRange[]): Promise<IItem<U>>;
+
+    /**
+     * Determines whether the Animations Library and ListView animations will be performed if called.
+     * @returns Returns true if animations will be performed; otherwise false.
+    **/
+    function isAnimationEnabled(): boolean;
+
+    /**
+     * * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+    **/
+    function optionsParser(value: string, context?: any, functionContext?: any): any;
+
+    /**
+     * Applies declarative control binding to all elements, starting at the specified root element.
+     * @param rootElement The element at which to start applying the binding. If this parameter is not specified, the binding is applied to the entire document.
+     * @param skipRoot If true, the elements to be bound skip the specified root element and include only the children.
+     * @returns A promise that is fulfilled when binding has been applied to all the controls.
+    **/
+    function processAll(rootElement?: Element, skipRoot?: boolean): Promise<any>;
+
+    /**
+     * Applies declarative control binding to the specified element.
+     * @param element The element to bind.
+     * @returns A promise that is fulfilled after the control is activated. The value of the promise is the control that is attached to element.
+    **/
+    function process(element: Element): Promise<any>;
+
+    /**
+     * Walks the DOM tree from the given element to the root of the document. Whenever a selector scope is encountered, this method performs a lookup within that scope for the specified selector string. The first matching element is returned.
+     * @param selector The selector string.
+     * @param element The element to begin walking to the root of the document from.
+     * @returns The target element, if found.
+    **/
+    function scopedSelect(selector: string, element: HTMLElement): HTMLElement;
+
+    /**
+     * Adds the set of declaratively specified options (properties and events) to the specified control. If name of the options property begins with "on", the property value is a function and the control supports addEventListener, setOptions calls addEventListener on the control.
+     * @param control The control on which the properties and events are to be applied.
+     * @param options The set of options that are specified declaratively.
+    **/
+    function setOptions(control: any, options?: any): void;
+
+    /**
+     * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
+    **/
+    function simpleItemRenderer(fn: Function): Function;
+
+    //#endregion Functions
+
+}
+/**
+ * Provides utility functions for generic directional focus movement
+**/
+declare namespace WinJS.UI.XYFocus {
+    export interface XYFocusOptions {
+        /**
+         * The focus scope, only children of this element are considered in the calculation.
+        **/
+        focusRoot?: HTMLElement;
+
+        /**
+         * A rectangle indicating where focus came from before the current state.
+        **/
+        historyRect?: IRect;
+
+        /**
+         * The element from which to calculate the next focusable element; if specified, referenceRect is ignored.
+        **/
+        referenceElement?: HTMLElement;
+
+        /**
+         * The rectangle from which to calculate next focusable element; ignored if referenceElement is also specified.
+        **/
+        referenceRect?: IRect;
+    }
+
+    export interface IRect {
+        left: number;
+        right?: number;
+        top: number;
+        bottom?: number;
+
+        height: number;
+        width: number;
+    }
+
+    export interface XYFocusEvent extends CustomEvent {
+        detail: { nextFocusElement: HTMLElement; keyCode: number; previousFocusElement: HTMLElement };
+    }
+
+    /**
+     * Gets the mapping object that maps keycodes to XYFocus actions.
+    **/
+    export var keyCodeMap: {
+        /**
+         * The array of keycodes that cause XYFocus to accept.
+        **/
+        accept: Array<number>;
+        /**
+         * The array of keycodes that cause XYFocus to cancel.
+        **/
+        cancel: Array<number>;
+        /**
+         * The array of keycodes that cause XYFocus to navigate down.
+        **/
+        down: Array<number>;
+        /**
+         * The array of keycodes that cause XYFocus to navigate left.
+        **/
+        left: Array<number>;
+        /**
+         * The array of keycodes that cause XYFocus to navigate right.
+        **/
+        right: Array<number>;
+        /**
+         * The array of keycodes that cause XYFocus to navigate up.
+        **/
+        up: Array<number>;
+    };
+
+    /**
+     * Gets or sets the focus root when invoking XYFocus APIs.
+    **/
+    export var focusRoot: HTMLElement;
+
+    /**
+     * Adds an event listener to XYFocus events.
+     * @param type The type (name) of the event.
+     * @param listener The listener to invoke when the event gets raised.
+    **/
+    export function addEventListener(type: string, handler: EventListener): void;
+
+    /**
+     * Raises an event of the specified type and with additional properties.
+     * @param type The type (name) of the event.
+     * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+     * @returns true if preventDefault was called on the event, otherwise false.
+    **/
+    export function dispatchEvent(type: string, eventProperties: any): boolean;
+
+    /**
+     * Removes an event listener to XYFocus events.
+     * @param type The type (name) of the event.
+     * @param listener The listener to remove.
+    **/
+    export function removeEventListener(type: string, handler: EventListener): void;
+
+    /**
+     * Returns the next focusable element from the current active element (or reference, if supplied) towards the specified direction.
+     * @param direction The direction to search.
+     * @param options An options object configuring the search.
+    **/
+    export function findNextFocusElement(direction: string, options?: XYFocusOptions): HTMLElement;
+    export function findNextFocusElement(direction: "left", options?: XYFocusOptions): HTMLElement;
+    export function findNextFocusElement(direction: "right", options?: XYFocusOptions): HTMLElement;
+    export function findNextFocusElement(direction: "up", options?: XYFocusOptions): HTMLElement;
+    export function findNextFocusElement(direction: "down", options?: XYFocusOptions): HTMLElement;
+
+    /**
+     * Moves focus to the next focusable element from the current active element (or reference, if supplied) towards the specific direction.
+     * @param direction The direction to move.
+     * @param options An options object configuring the focus move.
+    **/
+    export function moveFocus(direction: string, options?: XYFocusOptions): HTMLElement;
+    export function moveFocus(direction: "left", options?: XYFocusOptions): HTMLElement;
+    export function moveFocus(direction: "right", options?: XYFocusOptions): HTMLElement;
+    export function moveFocus(direction: "up", options?: XYFocusOptions): HTMLElement;
+    export function moveFocus(direction: "down", options?: XYFocusOptions): HTMLElement;
+
+    //#region Events
+
+    /**
+     * Occurs immeidately after XYFocus has changed focus targets.
+     * @param eventInfo An object that contains information about the event. The detail property of this object includes the following subproperties: previousFocusElemewnt, keyCode.
+    **/
+    export function onfocuschanged(eventInfo: CustomEvent): void;
+
+    /**
+     * Occurs immeidately before XYFocus changes focus targets. Is cancelable.
+     * @param eventInfo An object that contains information about the event. The detail property of this object includes the following subproperties: nextFocusElement, keyCode.
+    **/
+    export function onfocuschanging(eventInfo: CustomEvent): void;
+
+    //#endregion Events
+}
+
+/**
+ * Provides functions to load HTML content programmatically.
+**/
+declare namespace WinJS.UI.Fragments {
+    //#region Functions
+
+    /**
+     * Starts loading the fragment at the specified location. The returned promise completes when the fragment is ready to be copied.
+     * @param href The URI that contains the fragment to be copied.
+     * @returns A promise that is fulfilled when the fragment has been prepared for copying.
+    **/
+    function cache(href: string): Promise<any>;
+
+    /**
+     * Removes any cached information about the specified fragment. This method does not unload any scripts or styles that are referenced by the fragment.
+     * @param href The URI that contains the fragment to be cleared. If no URI is provided, the entire contents of the cache are cleared.
+    **/
+    function clearCache(href: string): void;
+    function clearCache(href: HTMLElement): void;
+
+    /**
+     * Loads the contents of the specified URI into the specified element without copying it.
+     * @param href The URI that contains the fragment to copy.
+     * @param element Optional. The element to which the fragment is appended.
+     * @returns A promise that is fulfilled when the fragment has been loaded. If a target element is not specified, the copied fragment is the completed value. The element is not added to the cache. See also rendercopy, where the element is added to the cache.
+    **/
+    function render(href: string, element?: HTMLElement): Promise<HTMLElement>;
+
+    /**
+     * Loads and copies the contents of the specified URI into the specified element.
+     * @param href The URI that contains the fragment to copy.
+     * @param target The element to which the fragment is appended.
+     * @returns A promise that is fulfilled when the fragment has been loaded. If a target element is not specified, the copied fragment is the completed value. The fragment is added to the cache. See also render, where the element is not added to the cache.
+    **/
+    function renderCopy(href: string, target?: HTMLElement): Promise<HTMLElement>;
+    function renderCopy(href: HTMLElement, target?: HTMLElement): Promise<HTMLElement>;
+
+    //#endregion Functions
+
+}
+/**
+ * Provides methods for defining and displaying PageControl objects.
+**/
+declare namespace WinJS.UI.Pages {
+    //#region Interfaces
+
+    /**
+     * Provides members for a PageControl. You implement this interface when defining a new PageControl.
+    **/
+    interface IPageControlMembers {
+        //#region Methods
+
+        /**
+         * Called if any error occurs during the processing of the page.
+         * @param err The error that occurred.
+         * @returns Nothing if the error was handled, or an error promise if the error was not handled.
+        **/
+        error? (err: any): any;
+
+        /**
+         * Initializes the control before the content of the control is set. Use the processed method for any initialization that should be done after the content of the control has been set.
+         * @param element The DOM element that will contain all the content for the page.
+         * @param options The options passed to the constructor of the page.
+         * @returns A promise that is fulfilled when initialization is complete, if asynchronous processing is necessary. If not, returns nothing.
+        **/
+        init? (element: HTMLElement, options: any): any;
+
+        /**
+         * Creates DOM objects from the content in the specified URI. This method is called after the PageControl is defined and before the init method is called.
+         * @param uri The URI from which to create DOM objects.
+         * @returns A promise whose fulfilled value is the set of unparented DOM objects.
+        **/
+        load? (uri: string): any;
+
+        /**
+         * Initializes the control after the content of the control is set.
+         * @param element The DOM element that will contain all the content for the page.
+         * @param options The options that are to be passed to the constructor of the page.
+         * @returns A promise that is fulfilled when initialization is complete, if asynchronous processing is necessary. If not, returns nothing.
+        **/
+        processed? (element: HTMLElement, options: any): any;
+
+        /**
+         * Called after all initialization and rendering is complete. At this time, the element is ready for use.
+         * @param element The DOM element that contains all the content for the page.
+         * @param options An object that contains one or more property/value pairs to apply to the PageControl. How these property/value pairs are used (or not used) depends on the implementation of that particular PageControl.
+         * @returns A promise that is fulfilled when the element is ready for use, if asynchronous processing is necessary. If not, returns nothing.
+        **/
+        ready? (element: HTMLElement, options: any): any;
+
+        /**
+         * Takes the elements returned by the load method and attaches them to the specified element.
+         * @param element The DOM element to which the loadResult elements are appended.
+         * @param options An object that contains one or more property/value pairs to apply to the PageControl. How these property/value pairs are used (or not used) depends on the implementation of that particular PageControl.
+         * @param loadResult A Promise that contains the elements returned from the load method.
+        **/
+        render? (element: HTMLElement, options: any, loadResult: Promise<any>): void;
+
+        //#endregion Methods
+
+    }
+
+    //#endregion Interfaces
+
+    //#region Objects
+
+    //#endregion Objects
+
+    //#region Functions
+
+    /**
+     * Creates a new PageControl from the specified URI that contains the specified members. Multiple calls to this method for the same URI are allowed, and all members will be merged.
+     * @param uri The URI for the content that defines the page.
+     * @param members An object that defines the members that the control will have.
+     * @returns A constructor function that creates the PageControl.
+    **/
+    function define(uri: string, members: IPageControlMembers): (element?: HTMLElement, options?: any, complete?: (page: any) => void, parentedPromise?: Promise<any>) => void;
+
+    /**
+     * Gets an already-defined page control for the specified URI, or creates a new one.
+     * @param uri The URI for the content that defines the page.
+     * @returns A constructor function that creates the page.
+    **/
+    function get(uri: string): (element?: HTMLElement, options?: any, complete?: (page: any) => void, parentedPromise?: Promise<any>) => void;
+
+    /**
+     * Creates a PageControl from the specified URI and inserts it inside the specified element.
+     * @param uri The URI for the content that defines the page.
+     * @param element The DOM element to which the PageControl is appended.
+     * @param options An object that contains one or more property/value pairs to apply to the new PageControl. How these property/value pairs are used (or not used) depends on the implementation of that particular PageControl.
+     * @param parentedPromise A Promise that is fulfilled when the new PageControl is done rendering and its contents becomes the child of element.
+     * @returns A promise that is fulfilled when rendering is complete, if asynchronous processing is necessary. If not, returns nothing.
+    **/
+    function render(uri: string, element?: HTMLElement, options?: any, parentedPromise?: Promise<any>): Promise<any>;
+
+    //#endregion Functions
+
+}
+/**
+ * Provides methods for detecting when the user tabs to or from DOM elements.
+**/
+declare namespace WinJS.UI.TrackTabBehavior {
+    //#region Functions
+
+    /**
+     * Sets the tab order for the specified element within its container.
+     * @param element The element to update.
+     * @param tabIndex The index value of the element within its container.
+    **/
+    function attach(element: HTMLElement, tabIndex: number): void;
+
+    /**
+     * Removes the tab order information from the specified element.
+     * @param element The element to remove tab information from.
+    **/
+    function detach(element: HTMLElement): void;
+
+    //#endregion Functions
+
+}
+/**
+ * Provides helper functions, for example, functions to add and remove CSS classes.
+**/
+declare namespace WinJS.Utilities {
+    //#region Enumerations
+
+    /**
+     * Defines a set of keyboard values.
+    **/
+    enum Key {
+        /**
+         * The BACKSPACE key.
+        **/
+        backspace,
+        /**
+         * The TAB key.
+        **/
+        tab,
+        /**
+         * The ENTER key.
+        **/
+        enter,
+        /**
+         * The SHIFT key.
+        **/
+        shift,
+        /**
+         * The CTRL key.
+        **/
+        ctrl,
+        /**
+         * The ALT key.
+        **/
+        alt,
+        /**
+         * The PAUSE key.
+        **/
+        pause,
+        /**
+         * The CAPS LOCK key.
+        **/
+        capsLock,
+        /**
+         * The ESCAPE key.
+        **/
+        escape,
+        /**
+         * The SPACE key.
+        **/
+        space,
+        /**
+         * The PAGE UP key.
+        **/
+        pageUp,
+        /**
+         * The PAGE DOWN key.
+        **/
+        pageDown,
+        /**
+         * The END key.
+        **/
+        end,
+        /**
+         * The HOME key.
+        **/
+        home,
+        /**
+         * The LEFT ARROW key.
+        **/
+        leftArrow,
+        /**
+         * The UP ARROW key.
+        **/
+        upArrow,
+        /**
+         * The RIGHT ARROW key.
+        **/
+        rightArrow,
+        /**
+         * The DOWN ARROW key.
+        **/
+        downArrow,
+        /**
+         * The INSERT key.
+        **/
+        insert,
+        /**
+         * The DELETE key.
+        **/
+        deleteKey,
+        /**
+         * The 0 key.
+        **/
+        num0,
+        /**
+         * The 1 key.
+        **/
+        num1,
+        /**
+         * The 2 key.
+        **/
+        num2,
+        /**
+         * The 3 key.
+        **/
+        num3,
+        /**
+         * The 4 key.
+        **/
+        num4,
+        /**
+         * The 5 key.
+        **/
+        num5,
+        /**
+         * The 6 key.
+        **/
+        num6,
+        /**
+         * The 7 key.
+        **/
+        num7,
+        /**
+         * The 8 key.
+        **/
+        num8,
+        /**
+         * The 9 key.
+        **/
+        num9,
+        /**
+         * The a key.
+        **/
+        a,
+        /**
+         * The b key.
+        **/
+        b,
+        /**
+         * The c key.
+        **/
+        c,
+        /**
+         * The d key.
+        **/
+        d,
+        /**
+         * The e key.
+        **/
+        e,
+        /**
+         * The f key.
+        **/
+        f,
+        /**
+         * The g key.
+        **/
+        g,
+        /**
+         * The h key.
+        **/
+        h,
+        /**
+         * The i key.
+        **/
+        i,
+        /**
+         * The j key.
+        **/
+        j,
+        /**
+         * The k key.
+        **/
+        k,
+        /**
+         * The l key.
+        **/
+        l,
+        /**
+         * The m key.
+        **/
+        m,
+        /**
+         * The n key.
+        **/
+        n,
+        /**
+         * The o key.
+        **/
+        o,
+        /**
+         * The p key.
+        **/
+        p,
+        /**
+         * The q key.
+        **/
+        q,
+        /**
+         * The r key.
+        **/
+        r,
+        /**
+         * The s key.
+        **/
+        s,
+        /**
+         * The t key.
+        **/
+        t,
+        /**
+         * The u key.
+        **/
+        u,
+        /**
+         * The v key.
+        **/
+        v,
+        /**
+         * The w key.
+        **/
+        w,
+        /**
+         * The x key.
+        **/
+        x,
+        /**
+         * The y key.
+        **/
+        y,
+        /**
+         * The z key.
+        **/
+        z,
+        /**
+         * The left Windows key.
+        **/
+        leftWindows,
+        /**
+         * The right Windows key.
+        **/
+        rightWindows,
+        /**
+         * The menu key.
+        **/
+        menu,
+        /**
+         * The 0 key on the numerical keypad.
+        **/
+        numPad0,
+        /**
+         * The 1 key on the numerical keypad.
+        **/
+        numPad1,
+        /**
+         * The 2 key on the numerical keypad.
+        **/
+        numPad2,
+        /**
+         * The 3 key on the numerical keypad.
+        **/
+        numPad3,
+        /**
+         * The 4 key on the numerical keypad.
+        **/
+        numPad4,
+        /**
+         * The 5 key on the numerical keypad.
+        **/
+        numPad5,
+        /**
+         * The 6 key on the numerical keypad.
+        **/
+        numPad6,
+        /**
+         * The 7 key on the numerical keypad.
+        **/
+        numPad7,
+        /**
+         * The 8 key on the numerical keypad.
+        **/
+        numPad8,
+        /**
+         * The 9 key on the numerical keypad.
+        **/
+        numPad9,
+        /**
+         * The multiplication key (*).
+        **/
+        multiply,
+        /**
+         * The addition key (+).
+        **/
+        add,
+        /**
+         * The subtraction key (-).
+        **/
+        subtract,
+        /**
+         * The decimal point key (.)
+        **/
+        decimalPoint,
+        /**
+         * The division key (/).
+        **/
+        divide,
+        /**
+         * The F1 key.
+        **/
+        F1,
+        /**
+         * The F2 key.
+        **/
+        F2,
+        /**
+         * The F3 key.
+        **/
+        F3,
+        /**
+         * The F4 key.
+        **/
+        F4,
+        /**
+         * The F5 key.
+        **/
+        F5,
+        /**
+         * The F6 key.
+        **/
+        F6,
+        /**
+         * The F7 key.
+        **/
+        F7,
+        /**
+         * The F8 key.
+        **/
+        F8,
+        /**
+         * The F9 key.
+        **/
+        F9,
+        /**
+         * The F10 key.
+        **/
+        F10,
+        /**
+         * The F11 key.
+        **/
+        F11,
+        /**
+         * The F12 key.
+        **/
+        F12,
+        /**
+         * The XBox One Remote navigation view button.
+        **/
+        NavigationView,
+        /**
+         * The XBox One Remote navigation menu button.
+        **/
+        NavigationMenu,
+        /**
+         * The XBox One Remote navigation up button.
+        **/
+        NavigationUp,
+        /**
+         * The XBox One Remote navigation down button.
+        **/
+        NavigationDown,
+        /**
+         * The XBox One Remote navigation left button.
+        **/
+        NavigationLeft,
+        /**
+         * The XBox One Remote navigation right button.
+        **/
+        NavigationRight,
+        /**
+         * The XBox One Remote navigation accept button.
+        **/
+        NavigationAccept,
+        /**
+         * The XBox One Remote navigation cancel button.
+        **/
+        NavigationCancel,
+        /**
+         * The NUMBER LOCK key.
+        **/
+        numLock,
+        /**
+         * The SCROLL LOCK key.
+        **/
+        scrollLock,
+        /**
+         * The browser BACK key.
+        **/
+        browserBack,
+        /**
+         * The browser FORWARD key.
+        **/
+        browserForward,
+        /**
+         * The semicolon key (;).
+        **/
+        semicolon,
+        /**
+         * The equals key (=).
+        **/
+        equal,
+        /**
+         * The comma key (,).
+        **/
+        comma,
+        /**
+         * The dash key (-).
+        **/
+        dash,
+        /**
+         * The period key (.).
+        **/
+        period,
+        /**
+         * The forward slash key (/).
+        **/
+        forwardSlash,
+        /**
+         * The grave accent key (`).
+        **/
+        graveAccent,
+        /**
+         * The open bracket key ([).
+        **/
+        /**
+         * The XBox One gamepad A button.
+        **/
+        GamepadA,
+        /**
+         * The XBox One gamepad B button.
+        **/
+        GamepadB,
+        /**
+         * The XBox One gamepad X button.
+        **/
+        GamepadX,
+        /**
+         * The XBox One gamepad Y button.
+        **/
+        GamepadY,
+        /**
+         * The XBox One gamepad right shoulder.
+        **/
+        GamepadRightShoulder,
+        /**
+         * The XBox One gamepad left shoulder.
+        **/
+        GamepadLeftShoulder,
+        /**
+         * The XBox One gamepad left trigger.
+        **/
+        GamepadLeftTrigger,
+        /**
+         * The XBox One gamepad right trigger.
+        **/
+        GamepadRightTrigger,
+        /**
+         * The XBox One gamepad dpad up.
+        **/
+        GamepadDPadUp,
+        /**
+         * The XBox One gamepad dpad down.
+        **/
+        GamepadDPadDown,
+        /**
+         * The XBox One gamepad dpad left.
+        **/
+        GamepadDPadLeft,
+        /**
+         * The XBox One gamepad dpad right.
+        **/
+        GamepadDPadRight,
+        /**
+         * The XBox One gamepad menu button.
+        **/
+        GamepadMenu,
+        /**
+         * The XBox One gamepad view button.
+        **/
+        GamepadView,
+        /**
+         * The XBox One gamepad left thumbstick button.
+        **/
+        GamepadLeftThumbstick,
+        /**
+         * The XBox One gamepad right thumbstick button.
+        **/
+        GamepadRightThumbstick,
+        /**
+         * The XBox One gamepad left thumbstick's up.
+        **/
+        GamepadLeftThumbstickUp,
+        /**
+         * The XBox One gamepad left thumbstick's down.
+        **/
+        GamepadLeftThumbstickDown,
+        /**
+         * The XBox One gamepad left thumbstick's right.
+        **/
+        GamepadLeftThumbstickRight,
+        /**
+         * The XBox One gamepad left thumbstick's left.
+        **/
+        GamepadLeftThumbstickLeft,
+        /**
+         * The XBox One gamepad right thumbstick's up.
+        **/
+        GamepadRightThumbstickUp,
+        /**
+         * The XBox One gamepad right thumbstick's down.
+        **/
+        GamepadRightThumbstickDown,
+        /**
+         * The XBox One gamepad right thumbstick's right.
+        **/
+        GamepadRightThumbstickRight,
+        /**
+         * The XBox One gamepad right thumbstick's left.
+        **/
+        GamepadRightThumbstickLeft,
+        /**
+         * The open bracket key ([).
+        **/
+        openBracket,
+        /**
+         * The backslash key (\).
+        **/
+        backSlash,
+        /**
+         * The close bracket key (]).
+        **/
+        closeBracket,
+        /**
+         * The single quote key (').
+        **/
+        singleQuote,
+        /**
+         * Any IME input.
+        **/
+        IME,
+    }
+
+    //#endregion Enumerations
+
+    //#region Objects
+
+    /**
+     * A mixin that contains event-related functions.
+    **/
+    var eventMixin: {
+        //#region Methods
+
+        /**
+         * Adds an event listener to the control.
+         * @param type The type (name) of the event.
+         * @param listener The listener to invoke when the event gets raised.
+         * @param useCapture If true, initiates capture, otherwise false.
+        **/
+        addEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+        /**
+         * Raises an event of the specified type and with the specified additional properties.
+         * @param type The type (name) of the event.
+         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
+         * @returns true if preventDefault was called on the event.
+        **/
+        dispatchEvent(type: string, eventProperties: any): boolean;
+
+        /**
+         * Removes an event listener from the control.
+         * @param type The type (name) of the event.
+         * @param listener The listener to remove.
+         * @param useCapture true if capture is to be initiated, otherwise false.
+        **/
+        removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
+
+        //#endregion Methods
+
+    };
+
+    /**
+     * Represents the result of a query selector, and provides various operations that perform actions over the elements of the collection.
+    **/
+    class QueryCollection<T> extends Array<T> {
+        //#region Methods
+
+        /**
+         * Adds the specified class to all the elements in the collection.
+         * @param name The name of the class to add.
+         * @returns This QueryCollection object.
+        **/
+        addClass(name: string): QueryCollection<T>;
+
+        /**
+         * Clears the specified style property for all the elements in the collection.
+         * @param name The name of the style property to be cleared.
+         * @returns This QueryCollection object.
+        **/
+        clearStyle(name: string): QueryCollection<T>;
+
+        /**
+         * Creates controls that are attached to the elements in this QueryCollection, if the ctor parameter is a function, or configures the controls that are attached to the elements in this QueryCollection, if the ctor parameter is an object.
+         * @param ctor If this parameter is a function, it is a constructor function that is used to create controls to attach to the elements. If it is an object, it is the set of options passed to the controls.
+         * @param options The options passed to the newly-created controls.
+         * @returns This QueryCollection object.
+        **/
+        control(ctor: any, options?: any): QueryCollection<T>;
+
+        /**
+         * Performs an action on each item in the QueryCollection.
+         * @param callbackFn The action to perform on each item.
+         * @param thisArg The argument to bind to callbackFn.
+         * @returns The QueryCollection.
+        **/
+        forEach(callbackFn: (value: T, index: number, array: T[]) => void, thisArg?: any): QueryCollection<T>;
+
+        /**
+         * Gets an item from the QueryCollection.
+         * @param index The index of the item to return.
+         * @returns A single item from the collection.
+        **/
+        get(index: number): T;
+
+        /**
+         * Gets an attribute value from the first element in the collection.
+         * @param name The name of the attribute.
+         * @returns The value of the attribute.
+        **/
+        getAttribute(name: string): any;
+
+        /**
+         * Determines whether the specified class exists on the first element of the collection.
+         * @param name The name of the class.
+         * @returns true if the element has the specified class; otherwise, false.
+        **/
+        hasClass(name: string): boolean;
+
+        /**
+         * Adds a set of items to this QueryCollection.
+         * @param items The items to add to the QueryCollection. This may be an array-like object, a document fragment, or a single item.
+        **/
+        include(items: T): void;
+
+        /**
+         * Adds a set of items to this QueryCollection.
+         * @param items The items to add to the QueryCollection. This may be an array-like object, a document fragment, or a single item.
+        **/
+        include(items: T[]): void;
+
+        /**
+         * Adds a set of items to this QueryCollection.
+         * @param items The items to add to the QueryCollection. This may be an array-like object, a document fragment, or a single item.
+        **/
+        include(items: HTMLCollection): void;
+
+        /**
+         * Registers the listener for the specified event on all the elements in the collection.
+         * @param eventType The name of the event.
+         * @param listener The event handler function to be called when the event occurs.
+         * @param capture true if capture == true is to be passed to addEventListener; otherwise, false.
+        **/
+        listen(eventType: string, listener: Function, capture?: boolean): void;
+
+        /**
+         * Executes a query selector on all the elements in the collection and aggregates the result into a QueryCollection.
+         * @param query The query selector string.
+         * @returns A QueryCollection object containing the aggregate results of executing the query on all the elements in the collection.
+        **/
+        query(query: any): QueryCollection<T>;
+
+        /**
+         * Removes the specified class from all the elements in the collection.
+         * @param name The name of the class to be removed.
+         * @returns This QueryCollection object.
+        **/
+        removeClass(name: string): QueryCollection<T>;
+
+        /**
+         * Unregisters the listener for the specified event on all the elements in the collection.
+         * @param eventType The name of the event.
+         * @param listener The event handler function.
+         * @param capture true if capture == true; otherwise, false.
+         * @returns This QueryCollection object.
+        **/
+        removeEventListener(eventType: string, listener: Function, capture?: boolean): QueryCollection<T>;
+
+        /**
+         * Sets an attribute value on all the items in the collection.
+         * @param name The name of the attribute to be set.
+         * @param value The value of the attribute to be set.
+         * @returns This QueryCollection object.
+        **/
+        setAttribute(name: string, value: any): QueryCollection<T>;
+
+        /**
+         * Sets the specified style property for all the elements in the collection.
+         * @param name The name of the style property.
+         * @param value The value for the property.
+         * @returns This QueryCollection object.
+        **/
+        setStyle(name: string, value: any): QueryCollection<T>;
+
+        /**
+         * Renders a template that is bound to the given data and parented to the elements included in the QueryCollection. If the QueryCollection contains multiple elements, the template is rendered multiple times, once at each element in the QueryCollection per item of data passed.
+         * @param templateElement The DOM element to which the template control is attached.
+         * @param data The data to render. If the data is an array (or any other object that has a forEach method) then the template is rendered multiple times, once for each item in the collection.
+         * @param renderDonePromiseCallback If supplied, this function is called each time the template gets rendered, and is passed a promise that is fulfilled when the template rendering is complete.
+         * @returns The QueryCollection.
+        **/
+        template(templateElement: HTMLElement, data: any, renderDonePromiseCallback?: Function): QueryCollection<T>;
+
+        /**
+         * Toggles (adds or removes) the specified class on all the elements in the collection. If the class is present, it is removed; if it is absent, it is added.
+         * @param name The name of the class to be toggled.
+         * @returns This QueryCollection object.
+        **/
+        toggleClass(name: string): QueryCollection<T>;
+
+        //#endregion Methods
+
+        /**
+         * Indicates that the object is compatibile with declarative processing.
+        **/
+        static supportedForProcessing: boolean;
+
+        //#region Array<T>.prototype
+
+        /**
+         * Combines two or more arrays.
+         * @param items Additional items to add to the end of array1.
+        **/
+        concat<U extends T[]>(...items: U[]): T[];
+        /**
+         * Combines two or more arrays.
+         * @param items Additional items to add to the end of array1.
+        **/
+        concat(...items: T[]): T[];
+
+        /**
+         * Adds all the elements of an array separated by the specified separator string.
+         * @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.
+        **/
+        join(separator?: string): string;
+
+        /**
+         * Removes the last element from an array and returns it.
+        **/
+        pop(): T;
+
+        /**
+         * Appends new elements to an array, and returns the new length of the array.
+         * @param items New elements of the Array.
+        **/
+        push(...items: T[]): number;
+
+        /**
+         * Reverses the elements in an Array.
+        **/
+        reverse(): T[];
+
+        /**
+         * Removes the first element from an array and returns it.
+        **/
+        shift(): T;
+
+        /**
+         * Returns a section of an array.
+         * @param start The beginning of the specified portion of the array.
+         * @param end The end of the specified portion of the array.
+        **/
+        slice(start?: number, end?: number): T[];
+
+        /**
+         * Sorts an array.
+         * @param compareFn The name of the function used to determine the order of the elements. If omitted, the elements are sorted in ascending, ASCII character order.
+        **/
+        sort(compareFn?: (a: T, b: T) => number): this;
+
+        /**
+         * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements.
+         * @param start The zero-based location in the array from which to start removing elements.
+        **/
+        splice(start: number): T[];
+
+        /**
+         * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements.
+         * @param start The zero-based location in the array from which to start removing elements.
+         * @param deleteCount The number of elements to remove.
+         * @param items Elements to insert into the array in place of the deleted elements.
+        **/
+        splice(start: number, deleteCount: number, ...items: T[]): T[];
+
+        /**
+         * Inserts new elements at the start of an array.
+         * @param items  Elements to insert at the start of the Array.
+        **/
+        unshift(...items: T[]): number;
+
+        /**
+         * Returns the index of the first occurrence of a value in an array.
+         * @param searchElement The value to locate in the array.
+         * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at index 0.
+        **/
+        indexOf(searchElement: T, fromIndex?: number): number;
+
+        /**
+         * Returns the index of the last occurrence of a specified value in an array.
+         * @param searchElement The value to locate in the array.
+         * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at the last index in the array.
+        **/
+        lastIndexOf(searchElement: T, fromIndex?: number): number;
+
+        /**
+         * Determines whether all the members of an array satisfy the specified test.
+         * @param callbackfn A function that accepts up to three arguments. The every method calls the callbackfn function for each element in array1 until the callbackfn returns false, or until the end of the array.
+         * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
+        **/
+        every(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
+
+        /**
+         * Determines whether the specified callback function returns true for any element of an array.
+         * @param callbackfn A function that accepts up to three arguments. The some method calls the callbackfn function for each element in array1 until the callbackfn returns true, or until the end of the array.
+         * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
+        **/
+        some(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
+
+        /**
+         * Calls a defined callback function on each element of an array, and returns an array that contains the results.
+         * @param callbackfn A function that accepts up to three arguments. The map method calls the callbackfn function one time for each element in the array.
+         * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
+        **/
+        map<U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): U[];
+
+        /**
+         * Returns the elements of an array that meet the condition specified in a callback function.
+         * @param callbackfn A function that accepts up to three arguments. The filter method calls the callbackfn function one time for each element in the array.
+         * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
+        **/
+        filter(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): T[];
+
+        /**
+         * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+         * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array.
+         * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
+        **/
+        reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T;
+        /**
+         * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+         * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array.
+         * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
+        **/
+        reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
+
+        /**
+         * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+         * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array.
+         * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
+        **/
+        reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T;
+        /**
+         * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+         * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array.
+         * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
+        **/
+        reduceRight<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
+
+        /**
+         * Gets or sets the length of the array. This is a number one higher than the highest element defined in an array.
+        **/
+        length: number;
+
+        [n: number]: T;
+
+        //#endregion Array<T>.prototype
+
+    }
+
+    //#endregion Objects
+
+    //#region Functions
+
+    /**
+     * Adds the specified class to the specified element.
+     * @param e The element to which to add the class.
+     * @param name The name of the class to add.
+     * @returns The element.
+    **/
+    function addClass<T extends HTMLElement>(e: T, name: string): T;
+
+    /**
+     * Gets a collection of elements that are the direct children of the specified element.
+     * @param element The parent element.
+     * @returns The collection of children of the element.
+    **/
+    function children(element: HTMLElement): QueryCollection<HTMLElement>;
+
+    /**
+     * Converts a CSS positioning string for the specified element to pixels.
+     * @param element The element.
+     * @param value The CSS positioning string.
+     * @returns The number of pixels.
+    **/
+    function convertToPixels(element: HTMLElement, value: string): number;
+
+    /**
+     * Creates an object that has one event for each name passed to the function.
+     * @param events A variable list of property names.
+     * @returns The object with the specified properties. The names of the properties are prefixed with 'on'.
+    **/
+    function createEventProperties(...events: string[]): any;
+
+    /**
+     * Gets the data value associated with the specified element.
+     * @param element The element.
+     * @returns The value associated with the element.
+    **/
+    function data(element: HTMLElement): any;
+
+    /**
+     * Disposes all first-generation disposable elements that are descendents of the specified element. The specified element itself is not disposed.
+     * @param element The root element whose sub-tree is to be disposed.
+    **/
+    function disposeSubTree(element: HTMLElement): void;
+
+    /**
+     * Removes all the child nodes from the specified element.
+     * @param element The element.
+     * @returns The element.
+    **/
+    function empty<T extends HTMLElement>(element: T): T;
+
+    /**
+     * Determines whether the specified event occurred within the specified element.
+     * @param element The element.
+     * @param event The event.
+     * @returns true if the event occurred within the element; otherwise, false.
+    **/
+    function eventWithinElement(element: HTMLElement, event: Event): boolean;
+
+    /**
+     * Adds tags and type to a logging message.
+     * @param message The message to be formatted.
+     * @param tag The tag(s) to be applied to the message. Multiple tags should be separated by spaces.
+     * @param type The type of the message.
+     * @returns The formatted message.
+    **/
+    function formatLog(message: string, tag: string, type: string): string;
+
+    /**
+     * Gets the height of the content of the specified element. The content height does not include borders or padding.
+     * @param element The element.
+     * @returns The content height of the element.
+    **/
+    function getContentHeight(element: HTMLElement): number;
+
+    /**
+     * Gets the width of the content of the specified element. The content width does not include borders or padding.
+     * @param element The element.
+     * @returns The content width of the element.
+    **/
+    function getContentWidth(element: HTMLElement): number;
+
+    /**
+     * Gets the leaf-level type or namespace specified by the name parameter.
+     * @param name The name of the member.
+     * @param root The root to start in. Defaults to the global object.
+     * @returns The leaf-level type or namespace in the specified parent namespace.
+    **/
+    function getMember(name: string, root?: any): any;
+
+    /**
+     * Gets the position of the specified element.
+     * @param element The element.
+     * @returns An object that contains the left, top, width and height properties of the element.
+    **/
+    function getPosition(element: HTMLElement): IPosition;
+
+    /**
+     * Gets the left coordinate of the specified element relative to the specified parent.
+     * @param element The element.
+     * @param parent The parent element.
+     * @returns The relative left coordinate.
+    **/
+    function getRelativeLeft(element?: HTMLElement, parent?: HTMLElement): number;
+
+    /**
+     * Gets the top coordinate of the element relative to the specified parent.
+     * @param element The element.
+     * @param parent The parent element.
+     * @returns The relative top coordinate.
+    **/
+    function getRelativeTop(element?: HTMLElement, parent?: HTMLElement): number;
+
+    /**
+     * Gets the scrollLeft and scrollTop of the specified element, adjusting the scrollLeft to change from browser specific coordinates to logical coordinates when in RTL.
+     * @param element The element.
+     * @returns An object with two properties: scrollLeft and scrollTop
+    **/
+    function getScrollPosition(element: HTMLElement): { scrollLeft: number; scrollTop: number };
+
+    /**
+     * Gets the tab index of the specified element.
+     * @param element The element
+     * @returns The tabIndex of the element. Returns -1 if the element cannot be tabbed to.
+    **/
+    function getTabIndex(element: HTMLElement): number;
+
+    /**
+     * Gets the height of the element, including its margins.
+     * @param element The element.
+     * @returns The height of the element including margins.
+    **/
+    function getTotalHeight(element: HTMLElement): number;
+
+    /**
+     * Gets the width of the element, including margins.
+     * @param element The element.
+     * @returns The width of the element including margins.
+    **/
+    function getTotalWidth(element: HTMLElement): number;
+
+    /**
+     * Determines whether the specified element has the specified class.
+     * @param e The element.
+     * @param name The name of the class.
+     * @returns true if the element has the class, otherwise false.
+    **/
+    function hasClass(e: HTMLElement, name: string): boolean;
+
+    /**
+     * Returns a collection with zero or one elements matching the specified id.
+     * @param id The ID of the element (or elements).
+     * @returns A collection of elements whose id matches the id parameter.
+    **/
+    function id(id: string): QueryCollection<HTMLElement>;
+
+    /**
+     * Calls insertAdjacentHTML on the specified element.
+     * @param element The element on which insertAdjacentHTML is to be called.
+     * @param position The position relative to the element at which to insert the HTML. Possible values are: beforebegin, afterbegin, beforeend, afterend.
+     * @param text The text to insert.
+    **/
+    function insertAdjacentHTML(element: HTMLElement, position: string, text: string): void;
+
+    /**
+     * Calls insertAdjacentHTML on the specified element in the context of MSApp.execUnsafeLocalFunction.
+     * @param element The element on which insertAdjacentHTML is to be called.
+     * @param position The position relative to the element at which to insert the HTML. Possible values are: beforebegin, afterbegin, beforeend, afterend.
+     * @param text Value to be provided to insertAdjacentHTML.
+    **/
+    function insertAdjacentHTMLUnsafe(element: HTMLElement, position: string, text: string): void;
+
+    /**
+     * Attaches the default dispose API wrapping the dispose implementation to the specified element.
+     * @param element The element to mark as disposable.
+     * @param disposeImpl The function containing the element-specific dispose logic, called by the dispose function that markDisposable attaches.
+    **/
+    function markDisposable(element: HTMLElement, disposeImpl?: Function): void;
+
+    /**
+     * Marks a function as being compatible with declarative processing. Declarative processing is performed by WinJS.UI.processAll or WinJS.Binding.processAll.
+     * @param func The function to be marked as compatible with declarative processing.
+     * @returns The input function, marked as compatible with declarative processing.
+    **/
+    function markSupportedForProcessing<U extends Function>(func: U): U;
+
+    /**
+     * Returns a QueryCollection with zero or one elements matching the specified selector query.
+     * @param query The CSS selector to use. See Selectors for more information.
+     * @param element Optional. The root element at which to start the query. If this parameter is omitted, the scope of the query is the entire document.
+     * @returns A QueryCollection with zero or one elements matching the specified selector query.
+    **/
+    function query(query: any, element?: HTMLElement): QueryCollection<HTMLElement>;
+
+    /**
+     * Ensures that the specified function executes only after the DOMContentLoaded event has fired for the current page. The DOMContentLoaded event occurs after the page has been parsed but before all the resources are loaded.
+     * @param callback A function that executes after the DOMContentLoaded event has occurred.
+     * @param async If true, the callback should be executed asynchronously.
+     * @returns A promise that completes after the DOMContentLoaded event has occurred.
+    **/
+    function ready(callback?: Function, async?: boolean): Promise<any>;
+
+    /**
+     * Removes the specified class from the specified element.
+     * @param e The element from which to remove the class.
+     * @param name The name of the class to remove.
+     * @returns The element.
+    **/
+    function removeClass<T extends HTMLElement>(e: T, name: string): T;
+
+    /**
+     * Asserts that the value is compatible with declarative processing. Declarative processing is performed by WinJS.UI.processAll or WinJS.Binding.processAll. If the value is not compatible, and strictProcessing is on, an exception is thrown. All functions that have been declared using WinJS.Class.define, WinJS.Class.derive, WinJS.UI.Pages.define, or WinJS.Binding.converter are automatically marked as supported for declarative processing. Any other function that you use from a declarative context (that is, a context in which an HTML element has a data-win-control or data-win-options attribute) must be marked manually by calling this function. When you mark a function as supported for declarative processing, you are guaranteeing that the code in the function is secure from injection of third-party content.
+     * @param value The value to be tested for compatibility with declarative processing. If the value is a function it must be marked with a property supportedForProcessing with a value of true when strictProcessing is on. For more information, see WinJS.Utilities.markSupportedForProcessing.
+     * @returns The input value.
+    **/
+    function requireSupportedForProcessing<T>(value: T): T;
+
+    /**
+     * Sets the innerHTML property of the specified element to the specified text.
+     * @param element The element on which the innerHTML property is to be set.
+     * @param text The value to be set to the innerHTML property.
+    **/
+    function setInnerHTML(element: HTMLElement, text: string): void;
+
+    /**
+     * Sets the innerHTML property of the specified element to the specified text.
+     * @param element The element on which the innerHTML property is to be set.
+     * @param text The value to be set to the innerHTML property.
+    **/
+    function setInnerHTMLUnsafe(element: HTMLElement, text: string): void;
+
+    /**
+     * Sets the outerHTML property of the specified element to the specified text.
+     * @param element The element on which the outerHTML property is to be set.
+     * @param text The value to be set to the outerHTML property.
+    **/
+    function setOuterHTML(element: HTMLElement, text: string): void;
+
+    /**
+     * Sets the outerHTML property of the specified element to the specified text in the context of MSApp.execUnsafeLocalFunction.
+     * @param element The element on which the outerHTML property is to be set.
+     * @param text The value to be set to the outerHTML property.
+    **/
+    function setOuterHTMLUnsafe(element: HTMLElement, text: string): void;
+
+    /**
+     * Sets the scrollLeft and scrollTop of the specified element, changing the scrollLeft from logical coordinates to browser-specific coordinates when in RTL.
+     * @param element The element.
+     * @param position An object describing the position to set.
+    **/
+    function setScrollPosition(element: HTMLElement, position: { scrollLeft: number; scrollTop: number }): void;
+
+    /**
+     * Configures a logger that writes messages containing the specified tags to the JavaScript console.
+     * @param options The tags for messages to log. Multiple tags should be separated by spaces. May contain type, tags, excludeTags and action properties.
+    **/
+    function startLog(options?: ILogOptions): void;
+    function startLog(tags?: string): void;
+
+    /**
+     * Removes the WinJS logger that had previously been set up.
+    **/
+    function stopLog(): void;
+
+    /**
+     * Toggles (adds or removes) the specified class on the specified element. If the class is present, it is removed; if it is absent, it is added.
+     * @param e The element on which to toggle the class.
+     * @param name The name of the class to toggle.
+     * @returns The element.
+    **/
+    function toggleClass<T extends HTMLElement>(e: T, name: string): T;
+
+    //#endregion Functions
+
+    //#region Properties
+
+    /**
+     * Gets whether the current script context has access to WinRT APIs.
+    **/
+    var hasWinRT: boolean;
+
+    /**
+     * Determines if strict declarative processing is enabled in this script context.
+    **/
+    var strictProcessing: boolean;
+
+    //#endregion Properties
+
+    //#region Interfaces
+
+    interface ILogOptions {
+        type?: string;
+        action?: (message: string, tags: string, type: string) => void;
+        excludeTags?: string;
+        tags?: string;
+    }
+
+    interface IPosition {
+        left: number;
+        top: number;
+        width: number;
+        height: number;
+    }
+
+    //#endregion Interfaces
+
+}
+/**
+ * Provides functions and objects for scheduling and managing asynchronous tasks.
+**/
+declare namespace WinJS.Utilities.Scheduler {
+    //#region Enumerations
+
+    /**
+     * Represents a priority for a job managed by the Scheduler.
+    **/
+    enum Priority {
+        /**
+         * A priority higher than the normal priority level.
+        **/
+        aboveNormal,
+        /**
+         * A priority less than the normal priority level.
+        **/
+        belowNormal,
+        /**
+         * A high priority.
+        **/
+        high,
+        /**
+         * The idle priority for work items.
+        **/
+        idle,
+        /**
+         * The highest priority.
+        **/
+        max,
+        /**
+         * The lowest priority.
+        **/
+        min,
+        /**
+         * The normal priority for work items.
+        **/
+        normal
+    }
+
+    //#endregion Enumerations
+
+    //#region Interfaces
+
+    /**
+     * Represents a work item that's executed by the Scheduler.
+    **/
+    interface IJob {
+        //#region Methods
+
+        /**
+         * Cancels the job.
+        **/
+        cancel(): void;
+
+        /**
+         * Pauses the job.
+        **/
+        pause(): void;
+
+        /**
+         * Resumes the job.
+        **/
+        resume(): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets a value that indicates whether the job has successfully completed.
+        **/
+        completed: boolean;
+
+        /**
+         * Gets the unique numeric identifier assigned to the job.
+        **/
+        id: number;
+
+        /**
+         * Gets or sets the name of the job.
+        **/
+        name: string;
+
+        /**
+         * Gets or sets the owner of the job.
+        **/
+        owner: IOwnerToken;
+
+        /**
+         * Gets or sets the priority of the job.
+        **/
+        priority: Priority;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Provides a control mechanism that allows a job to cooperatively yield. This object is passed to your work function when you schedule it.
+    **/
+    interface IJobInfo {
+        //#region Methods
+
+        /**
+         * Uses a Promise to determine how long the scheduler should wait before rescheduling the job after it yields.
+         * @param promise Once the work item yields, the scheduler will wait for this Promise to complete before rescheduling the job.
+        **/
+        setPromise(promise: Promise<any>): void;
+
+        /**
+         * Specifies the next unit of work to run once this job yields.
+         * @param work The next unit of work to run once this job yields.
+        **/
+        setWork(work: Function): void;
+
+        //#endregion Methods
+
+        //#region Properties
+
+        /**
+         * Gets the work item associated with this IJobInfo.
+        **/
+        job: IJob;
+
+        /**
+         * Gets a value that specifies whether the job should yield.
+        **/
+        shouldYield: boolean;
+
+        //#endregion Properties
+
+    }
+
+    /**
+     * Represents an object that owns jobs. You can use this object to cancel a set of jobs.
+    **/
+    interface IOwnerToken {
+        //#region Methods
+
+        /**
+         * Synchronously cancels the job that this token owns, including paused and blocked jobs.
+        **/
+        cancelAll(): void;
+
+        //#endregion Methods
+
+    }
+
+    //#endregion Interfaces
+
+    //#region Properties
+
+    /**
+     * Gets the current priority at which the caller is executing.
+     **/
+    var currentPriority: Priority;
+
+    //#endregion Properties
+
+    //#region Functions
+
+    /**
+     * Creates and returns a new IOwnerToken which can be set to the owner property of one or more jobs.
+     * @returns A new IOwnerToken which can be set to the owner property of one or more jobs.
+    **/
+    function createOwnerToken(): IOwnerToken;
+
+    /**
+     * Runs the specified callback in a high priority context.
+     * @param callback The callback to run in a high priority callback.
+     * @returns The return value of the callback.
+    **/
+    function execHigh<U>(callback: () => U): U;
+
+    /**
+     * Returns a string representation of the scheduler's state for diagnostic purposes. The jobs and drain requests are displayed in the order in which they are currently expected to be processed. The current job and drain request are marked by an asterisk.
+     * @returns A string representation of the scheduler's state for diagnostic purposes. The jobs and drain requests are displayed in the order in which they are currently expected to be processed. The current job and drain request are marked by an asterisk.
+    **/
+    function retrieveState(): string;
+
+    /**
+     * Runs jobs in the scheduler without timeslicing until all jobs at the specified priority and higher have executed.
+     * @param priority The priority to which the scheduler should drain. The default is -15.
+     * @param name An optional description of the drain request for diagnostics.
+     * @returns A Promise which completes when the drain has finished. Canceling this Promise cancels the drain request. This Promise will never enter an error state.
+    **/
+    function requestDrain(priority?: Priority, name?: string): Promise<any>;
+
+    /**
+     * Schedules the specified function to execute asynchronously.
+     * @param work A function that represents the work item to be scheduled. When called the work item will receive as its first argument an object which allows the work item to ask the scheduler if it should yield cooperatively and if so allows the work item to either provide a function to be run as a continuation or a WinJS.Promise which will when complete provide a function to run as a continuation. Provide these fields for the object: shouldYield, setWork(work), setPromise(promise), job.
+     * @param priority The priority of the work item. If you don't specify a priority, it defaults to WinJS.Utilities.Scheduler.Priority.normal.
+     * @param thisArg A "this" instance to be bound to the work item. The default value is null.
+     * @param name A description of the work item for diagnostics. The default value is an empty string.
+     * @returns The job instance that represents this work item.
+    **/
+    function schedule(work: (jobInfo: IJobInfo) => any, priority?: Priority, thisArg?: any, name?: string): IJob;
+
+    /**
+     * Schedules a job to complete the returned Promise at WinJS.Utilities.Scheduler.Priority.aboveNormal priority.
+     * @param promiseValue The value returned by the completed Promise.
+     * @param jobName A string that describes the job for diagnostic purposes.
+     * @returns A Promise that completes within a job of aboveNormal priority.
+    **/
+    function schedulePromiseAboveNormal<U>(promiseValue?: U, jobName?: string): Promise<U>;
+
+    /**
+     * Schedules a job to complete the returned Promise at WinJS.Utilities.Scheduler.Priority.belowNormal priority.
+     * @param promiseValue The value returned by the completed Promise.
+     * @param jobName A string that describes the job for diagnostic purposes.
+     * @returns A Promise that completes within a job of belowNormal priority.
+    **/
+    function schedulePromiseBelowNormal<U>(promiseValue?: U, jobName?: string): Promise<U>;
+
+    /**
+     * Schedules a job to complete the returned Promise at WinJS.Utilities.Scheduler.Priority.high priority.
+     * @param promiseValue The value returned by the completed Promise.
+     * @param jobName A string that describes the job for diagnostic purposes.
+     * @returns A Promise that completes within a job of high priority.
+    **/
+    function schedulePromiseHigh<U>(promiseValue?: U, jobName?: string): Promise<U>;
+
+    /**
+     * Schedules a job to complete the returned Promise at WinJS.Utilities.Scheduler.Priority.Idle priority.
+     * @param promiseValue The value returned by the completed Promise.
+     * @param jobName A string that describes the job for diagnostic purposes.
+     * @returns A Promise that completes within a job of idle priority.
+    **/
+    function schedulePromiseIdle<U>(promiseValue?: U, jobName?: string): Promise<U>;
+
+    /**
+     * Schedules a job to complete the returned Promise at WinJS.Utilities.Scheduler.Priority.normal priority.
+     * @param promiseValue The value returned by the completed Promise.
+     * @param jobName A string that describes the job for diagnostic purposes.
+     * @returns A Promise that completes within a job of normal priority.
+    **/
+    function schedulePromiseNormal<U>(promiseValue?: U, jobName?: string): Promise<U>;
+
+    //#endregion Functions
+
+}
+
+declare module 'winjs' {
+    export = WinJS;
+}
diff --git a/winjs/tsconfig.json b/winjs/tsconfig.json
new file mode 100644
index 0000000000..98c460c2f5
--- /dev/null
+++ b/winjs/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "files": [
+        "index.d.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/winjs/winjs-2.1.d.ts b/winjs/winjs-2.1.d.ts
index 3d240f2466..a8fb4af064 100644
--- a/winjs/winjs-2.1.d.ts
+++ b/winjs/winjs-2.1.d.ts
@@ -4087,6 +4087,123 @@ declare namespace WinJS.UI {
 
     }
 
+    /**
+     * Displays a lightweight popup that is used to temporarily show UI related to what the user is currently doing. It can be used to reveal a hidden control, show more details about an item, or ask the user to confirm an action. You should only show a flyout in response to a user tap or click. Unlike a MessageDialog, a flyout is always dismissed when the user taps or clicks outside of it.
+     */
+    class Flyout {
+       //#region Constructors
+       /**
+         * Creates a new FlipView.
+         * @constructor
+         * @param element The DOM element that hosts the control.
+         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property corresponds to one of the control's properties or events. Event names must begin with "on". For example, to provide a handler for the pageselected event, add a property named "onpageselected" and set its value to the event handler.
+        **/
+       constructor(element?: HTMLElement, options?: any);
+       //#endregion Constructors
+
+       //#region Events
+       /**
+        * Occurs immediately after the Flyout is hidden.
+        * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: source.
+        */
+       onafterhide(eventInfo: Event): void;
+
+       /**
+        * Occurs immediately after the Flyout is displayed.
+        * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: source.
+        */
+       onaftershow(eventInfo: Event): void;
+
+       /**
+        * Occurs before the Flyout is hidden.
+        * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: source.
+        */
+       onbeforehide(eventInfo: Event): void;
+
+       /**
+        * Occurs immediately before a hidden Flyout is displayed.
+        * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: source.
+        */
+       onbeforeshow(eventInfo: Event): void;
+       //#endregion Events
+
+       //#region Methods
+       /**
+         * Registers an event handler for the specified event.
+         * @param eventName The name of the event to handle. For a list of events, see the Flyout object page.
+         * @param eventHandler The event handler function to associate with the event.
+         * @param useCapture Set to true to register the event handler for the capturing phase; set to false to register the event handler for the bubbling phase.
+        **/
+       addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+       /**
+         * Unregisters an event handler for the specified event.
+         * @param eventName The name of the event.
+         * @param eventHandler The event handler function to remove.
+         * @param useCapture Set to true to unregister the event handler for the capturing phase; otherwise, set to false to unregister the event handler for the bubbling phase.
+        **/
+       removeEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
+
+       /**
+         * Releases resources held by this FlipView. Call this method when the FlipView is no longer needed. After calling this method, the FlipView becomes unusable.
+        **/
+       dispose(): void;
+
+       /**
+        * Hides the Flyout, if visible, regardless of other states.
+        */
+       hide(): void;
+
+       /**
+        * Shows the Flyout, if hidden, regardless of other states.
+        * @param anchor The DOM element to anchor the Flyout.
+        * @param placement The placement of the Flyout to the anchor: the string literal "top", "bottom", "left", or "right".
+        * @param alignment For "top" or "bottom" placement, the alignment of the Flyout to the anchor's edge: the string literal "center", "left", or "right".
+        */
+       show(anchor: HTMLElement, placement?: string, alignment?: string): void;
+
+       /**
+        * Shows the Flyout, if hidden, regardless of other states, top and left aligned at specified coordinates..
+        * @param x The x coordinate point where the top left corner of the Flyout will appear, relative to the top and left edge of the visual viewport.
+        * @param y The y coordinate point where the top left corner of the Flyout will appear, relative to the top and left edge of the visual viewport.
+        */
+       showat(x: number, y: number): void;
+       /**
+        * Shows the Flyout, if hidden, regardless of other states, top and left aligned at the location of the mouse event object.
+        * @param mouseEventObj The MouseEvent Object that specifies where to show the Flyout based on its location.
+        */
+       showat(mouseEventObj: MouseEvent): void;
+       //#endregion Methods
+
+       //#region Properties
+       /**
+        * Gets or sets the default alignment to be used for this Flyout relative to its anchor element.
+        */
+       public alignment: string;
+
+       /**
+        * Gets or sets the default anchor to be used for this Flyout.
+        */
+       public anchor: HTMLElement;
+
+       /**
+        * Gets the HTML element that hosts this FlipView.
+       **/
+       element: HTMLElement;
+
+       /**
+        * Gets a value that indicates whether the Flyout is hidden or in the process of becoming hidden.
+        */
+       hidden: boolean;
+
+       /**
+        * Gets or sets the placement to be used for this Flyout relative to the target object.
+        */
+       placement: string;
+
+       //#endregion Properties
+    }
+    
     /**
      * Represents a grid layout for the ListView in which items are arranged in a horizontal grid.
     **/
diff --git a/winjs/winjs.d.ts b/winjs/winjs.d.ts
deleted file mode 100644
index 0695a1fb3c..0000000000
--- a/winjs/winjs.d.ts
+++ /dev/null
@@ -1,10626 +0,0 @@
-// Type definitions for WinJS
-// Project: http://try.buildwinjs.com/
-// Definitions by: TypeScript samples <https://www.typescriptlang.org/>, Adam Hewitt <https://github.com/adamhewitt627>, Craig Treasure <https://github.com/craigktreasure>, Jeff Fisher <https://github.com/xirzec>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/* *****************************************************************************
-Copyright (c) Microsoft Corporation. All rights reserved.
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ""Software""), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-***************************************************************************** */
-
-/**
- * Defines an Element object.
-**/
-interface Element {
-    winControl: any;
-}
-
-/**
- * Utility class for easy access to operations on application folders
-**/
-interface IOHelper {
-    /**
-     * Determines whether the specified file exists in the folder.
-     * @param filename The name of the file.
-     * @returns A promise that completes with a value of either true (if the file exists) or false.
-    **/
-    exists(filename: string): WinJS.Promise<boolean>;
-
-    /**
-     * Reads the specified file. If the file doesn't exist, the specified default value is returned.
-     * @param fileName The file to read from.
-     * @param def The default value to be returned if the file failed to open.
-     * @returns A promise that completes with a value that is either the contents of the file, or the specified default value.
-     **/
-    readText(fileName: string, def?: string): WinJS.Promise<string>;
-
-    /**
-     * Deletes a file from the folder.
-     * @param fileName The file to be deleted.
-     * @returns A promise that is fulfilled when the file has been deleted.
-    **/
-    remove(fileName: string): WinJS.Promise<void>;
-
-    /**
-     * Writes the specified text to the specified file.
-     * @param fileName The name of the file.
-     * @param text The content to be written to the file.
-     * @returns A promise that is completed when the file has been written.
-     **/
-    writeText(fileName: string, text: string): WinJS.Promise<number>;
-
-    /**
-     * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-    **/
-    storage: any;
-}
-
-/**
- * Provides application-level functionality, for example activation, storage, and application events.
-**/
-declare namespace WinJS.Application {
-    //#region Objects
-
-    /**
-     * The local storage of the application.
-    **/
-    var local: IOHelper;
-
-    /**
-     * The roaming storage of the application.
-    **/
-    var roaming: IOHelper;
-
-    /**
-     * The temp storage of the application.
-    **/
-    var temp: IOHelper;
-
-    /**
-     * An object used for storing app information that can be used to restore the app's state after it has been suspended and then resumed. Data that can usefully be contained in this object includes the current navigation page or any information the user has added to the input controls on the page. You should not add information about customization (for example colors) or user-defined lists of content.
-    **/
-    var sessionState: any;
-
-    //#endregion Objects
-
-    //#region Functions
-
-    /**
-     * Adds an event listener for application-level events: activated, checkpoint, error, loaded, ready, settings, and unload.
-     * @param type The type (name) of the event. You can use any of the following:"activated", "checkpoint", "error", "loaded", "ready", "settings", and" unload".
-     * @param listener The listener to invoke when the event is raised.
-     * @param capture true to initiate capture, otherwise false.
-    **/
-    function addEventListener(type: string, listener: Function, capture?: boolean): void;
-
-    /**
-     * Queues a checkpoint event.
-    **/
-    function checkpoint(): void;
-
-    /**
-     * Queues an event to be processed by the WinJS.Application event queue.
-     * @param eventRecord The event object is expected to have a type property that is used as the event name when dispatching on the WinJS.Application event queue. The entire object is provided to event listeners in the detail property of the event.
-    **/
-    function queueEvent(eventRecord: any): void;
-
-    /**
-     * Removes an event listener from the control.
-     * @param type The type (name) of the event.
-     * @param listener The listener to remove.
-     * @param useCapture Specifies whether or not to initiate capture.
-    **/
-    function removeEventListener(type: string, listener: Function, useCapture?: any): void;
-
-    /**
-     * Starts dispatching application events (the activated, checkpoint, error, loaded, ready, settings, and unload events).
-    **/
-    function start(): void;
-
-    /**
-     * Stops application event processing and resets WinJS.Application to its initial state. All WinJS.Application event listeners (for the activated, checkpoint, error, loaded, ready, settings, and unload events) are removed.
-    **/
-    function stop(): void;
-
-    //#endregion Functions
-
-    //#region Events
-
-    interface IPromiseEvent extends CustomEvent {
-        /**
-         * Informs the application object that asynchronous work is being performed, and that this event handler should not be considered complete until the promise completes. This function can be set inside the handlers for all WinJS.Application events: onactivated oncheckpoint onerror onloaded onready onsettings onunload.
-         * @param promise The promise that should complete before processing is complete.
-        **/
-        setPromise(promise: IPromise<any>): void;
-    }
-
-    /**
-     * Occurs when WinRT activation has occurred. The name of this event is "activated" (and also "mainwindowactivated"). This event occurs after the loaded event and before the ready event.
-     * @param eventInfo An object that contains information about the event. For more information about event arguments, see the WinRT event argument classes: WebUICachedFileUpdaterActivatedEventArgs, WebUICameraSettingsActivatedEventArgs, WebUIContactPickerActivatedEventArgs, WebUIDeviceActivatedEventArgs, WebUIFileActivatedEventArgs, WebUIFileOpenPickerActivatedEventArgs, WebUIFileSavePickerActivatedEventArgs, WebUILaunchActivatedEventArgs, WebUIPrintTaskSettingsActivatedEventArgs, WebUIProtocolActivatedEventArgs, WebUISearchActivatedEventArgs, WebUIShareTargetActivatedEventArgs.
-    **/
-    function onactivated(eventInfo: IPromiseEvent): void;
-
-    /**
-     * Occurs when receiving PLM notification or when the checkpoint function is called.
-     * @param eventInfo An object that contains information about the event. The detail property of this object includes the following subproperties: type, setPromise.
-    **/
-    function oncheckpoint(eventInfo: IPromiseEvent): void;
-
-    /**
-     * Occurs when an unhandled error has been raised.
-     * @param eventInfo An object that contains information about the event.
-    **/
-    function onerror(eventInfo: IPromiseEvent): void;
-
-    /**
-     * Occurs after the DOMContentLoaded event, which fires after the page has been parsed but before all the resources are loaded. This event occurs before the activated event and the ready event.
-     * @param eventInfo An object that contains information about the event. The detail property of this object includes the following subproperties: type, setPromise.
-    **/
-    function onloaded(eventInfo: IPromiseEvent): void;
-
-    /**
-     * Occurs when the application is ready. This event occurs after the loaded event and the activated event.
-     * @param eventInfo An object that contains information about the event. The detail property of this object includes the following sub-properties: type, setPromise.
-    **/
-    function onready(eventInfo: IPromiseEvent): void;
-
-    /**
-     * Occurs when the settings charm is invoked.
-     * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: type, applicationcommands.
-    **/
-    function onsettings(eventInfo: IPromiseEvent): void;
-
-    /**
-     * Occurs when the application is about to be unloaded.
-     * @param eventInfo An object that contains information about the event. The detail property of this object includes the following sub-properties: type, setPromise.
-    **/
-    function onunload(eventInfo: IPromiseEvent): void;
-
-    /**
-     * Occurs whenever a user clicks the hardware backbutton.
-     * @param eventInfo An object that contains information about the event. The detail property of this object includes the following sub-properties: type
-    **/
-    function onbackclick(eventInfo: IPromiseEvent): void;
-
-    //#endregion Events
-
-}
-/**
- * Provides functionality for data and template binding.
-**/
-declare namespace WinJS.Binding {
-    //#region Properties
-
-    //#endregion Properties
-
-    //#region Objects
-
-    /**
-     * Allows you to add bindable properties dynamically.
-    **/
-    var dynamicObservableMixin: {
-        //#region Methods
-
-        /**
-         * Adds a property with change notification to this object, including a ECMAScript5 property definition.
-         * @param name The name of the property to add.
-         * @param value This object is returned.
-        **/
-        addProperty(name: string, value: any): void;
-
-        /**
-         * Links the specified action to the property specified in the name parameter. This function is invoked when the value of the property may have changed. It is not guaranteed that the action will be called only when a value has actually changed, nor is it guaranteed that the action will be called for every value change. The implementation of this function coalesces change notifications, such that multiple updates to a property value may result in only a single call to the specified action.
-         * @param name The name of the property to which to bind the action.
-         * @param action The function to invoke asynchronously when the property may have changed.
-         * @returns This object is returned.
-        **/
-        bind(name: string, action: any): Function;
-
-        /**
-         * Gets a property value by name.
-         * @param name The name of the property to get.
-         * @returns The value of the property as an observable object.
-        **/
-        getProperty(name: string): any;
-
-        /**
-         * Notifies listeners that a property value was updated.
-         * @param name The name of the property that is being updated.
-         * @param newValue The new value for the property.
-         * @param oldValue The old value for the property.
-         * @returns A promise that is completed when the notifications are complete.
-        **/
-        notify(name: string, newValue: string, oldValue: string): Promise<any>;
-
-        /**
-         * Removes a property value.
-         * @param name The name of the property to remove.
-         * @returns This object is returned.
-        **/
-        removeProperty(name: string): any;
-
-        /**
-         * Updates a property value and notifies any listeners.
-         * @param name The name of the property to update.
-         * @param value The new value of the property.
-         * @returns This object is returned.
-        **/
-        setProperty(name: string, value: any): any;
-
-        /**
-         * Removes one or more listeners from the notification list for a given property.
-         * @param name The name of the property to unbind. If this parameter is omitted, all listeners for all events are removed.
-         * @param action The function to remove from the listener list for the specified property. If this parameter is omitted, all listeners are removed for the specific property.
-         * @returns This object is returned.
-        **/
-        unbind(name: string, action: Function): any;
-
-        /**
-         * Updates a property value and notifies any listeners.
-         * @param name The name of the property to update.
-         * @param value The new value of the property.
-         * @returns A promise that completes when the notifications for this property change have been processed. If multiple notifications are coalesced, the promise may be canceled or the value of the promise may be updated. The fulfilled value of the promise is the new value of the property for which the notifications have been completed.
-        **/
-        updateProperty(name: string, value: any): Promise<any>;
-
-        //#endregion Methods
-
-    };
-
-    /**
-     * Do not instantiate. A list returned by the createFiltered method.
-    **/
-    interface FilteredListProjection<T> extends ListProjection<T> {
-        //#region Methods
-
-        /**
-         * Returns a key/data pair for the specified index.
-         * @param index The index of the value to retrieve.
-         * @returns An object that has two properties: key and data.
-        **/
-        getItem(index: number): IKeyDataPair<T>;
-
-        /**
-         * Returns the index of the first occurrence of a key in a list.
-         * @param key The key to locate in the list.
-         * @returns The index of the first occurrence of a key in a list, or -1 if not found.
-        **/
-        indexOfKey(key: string): number;
-
-        /**
-         * Forces the list to send a itemmutated notification to any listeners for the value at the specified index.
-         * @param index The index of the value that was mutated.
-        **/
-        notifyMutated(index: number): void;
-
-        /**
-         * Replaces the value at the specified index with a new value.
-         * @param index The index of the value that was replaced.
-         * @param newValue The new value.
-        **/
-        setAt(index: number, newValue: T): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * The length of the list. Returns an integer value one higher than the highest element defined in an list.
-        **/
-        length: number;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * A list of groups.
-    **/
-    interface GroupsListProjection<T> extends ListBase<T> {
-        //#region Methods
-
-        /**
-         * Gets a key/data pair for the specified index.
-         * @param index The index of the value to retrieve.
-         * @returns An object that has two properties: key and data.
-        **/
-        getItem(index: number): IKeyDataPair<T>;
-
-        /**
-         * Gets a key/data pair for the specified key.
-         * @param key The key of the value to retrieve.
-         * @returns An object with two properties: key and data.
-        **/
-        getItemFromKey(key: string): IKeyDataPair<T>;
-
-        /**
-         * Returns the index of the first occurrence of a key in a list.
-         * @param key The key to locate in the list.
-         * @returns The index of the first occurrence of a key in a list, or -1 if not found.
-        **/
-        indexOfKey(key: string): number;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * The length of the list. Returns an integer value one higher than the highest element defined in an list.
-        **/
-        length: number;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Do not instantiate. Sorts the underlying list by group key and within a group respects the position of the item in the underlying list. Returned by createGrouped.
-    **/
-    interface GroupedSortedListProjection<T, G> extends SortedListProjection<T> {
-        //#region Properties
-
-        /**
-         * Gets a List, which is a projection of the groups that were identified in this list.
-        **/
-        groups: GroupsListProjection<G>;
-
-        //#endregion Properties
-
-        /**
-         * Returns a key/data pair for the specified index.
-         * @param index The index of the value to retrieve.
-         * @returns An object that has two properties: key and data.
-        **/
-        getItem(index: number): IGroupKeyDataPair<T>;
-    }
-
-    /**
-     * Represents a list of objects that can be accessed by index or by a string key. Provides methods to search, sort, filter, and manipulate the data.
-    **/
-    class List<T> implements ListBaseWithMutators<T> {
-        //#region Constructors
-
-        /**
-         * Creates a List object.
-         * @constructor
-         * @param list The array containing the elements to initalize the list.
-         * @param options You can set two Boolean options: binding and proxy. If options.binding is true, the list contains the result of calling as on the element values. If options.proxy is true, the list specified as the first parameter is used as the storage for the List. This option should be used with care, because uncoordinated edits to the data storage may result in errors.
-        **/
-        constructor(list?: T[], options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * An item in the list has changed its value.
-         * @param eventInfo An object that contains information about the event. The detail contains the following information: index, key, newItem, newValue, oldItem, oldValue.
-        **/
-        onitemchanged(eventInfo: CustomEvent): void;
-
-        /**
-         * A new item has been inserted into the list.
-         * @param eventInfo An object that contains information about the event. The detail contains the following information: index, key, value.
-        **/
-        oniteminserted(eventInfo: CustomEvent): void;
-
-        /**
-         * An item has been changed locations in the list.
-         * @param eventInfo An object that contains information about the event. The detail contains the following information: index, key, value.
-        **/
-        onitemmoved(eventInfo: CustomEvent): void;
-
-        /**
-         * An item has been mutated. This event occurs as a result of calling the notifyMutated method.
-         * @param eventInfo An object that contains information about the event. The detail contains the following information: index, key, value.
-        **/
-        onitemmutated(eventInfo: CustomEvent): void;
-
-        /**
-         * An item has been removed from the list.
-         * @param eventInfo An object that contains information about the event. The detail contains the following information: index, key, value.
-        **/
-        onitemremoved(eventInfo: CustomEvent): void;
-
-        /**
-         * The list has been refreshed. Any references to items in the list may be incorrect.
-         * @param eventInfo An object that contains information about the event. The detail property of this object is null.
-        **/
-        onreload(eventInfo: CustomEvent): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Adds an event listener to the control.
-         * @param type The type (name) of the event.
-         * @param listener The listener to invoke when the event gets raised.
-         * @param useCapture If true, initiates capture, otherwise false.
-        **/
-        addEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-        /**
-         * Links the specified action to the property specified in the name parameter. This function is invoked when the value of the property may have changed. It is not guaranteed that the action will be called only when a value has actually changed, nor is it guaranteed that the action will be called for every value change. The implementation of this function coalesces change notifications, such that multiple updates to a property value may result in only a single call to the specified action.
-         * @param name The name of the property to which to bind the action.
-         * @param action The function to invoke asynchronously when the property may have changed.
-         * @returns A reference to this observableMixin object.
-        **/
-        bind(name: string, action: Function): any;
-
-        /**
-         * Returns a new list consisting of a combination of two arrays.
-         * @param item Additional items to add to the end of the list.
-         * @returns An array containing the concatenation of the list and any other supplied items.
-        **/
-        concat(...item: T[]): T[];
-
-        /**
-         * Creates a live filtered projection over this list. As the list changes, the filtered projection reacts to those changes and may also change.
-         * @param predicate A function that accepts a single argument. The createFiltered function calls the callback with each element in the list. If the function returns true, that element will be included in the filtered list. This function must always return the same results, given the same inputs. The results should not depend on values that are subject to change. You must call notifyMutated each time an item changes. Do not batch change notifications.
-         * @returns A filtered projection over the list.
-        **/
-        createFiltered(predicate: (x: T) => boolean): FilteredListProjection<T>;
-
-        /**
-         * Creates a live grouped projection over this list. As the list changes, the grouped projection reacts to those changes and may also change. The grouped projection sorts all the elements of the list to be in group-contiguous order. The grouped projection also contains a .groups property, which is a List representing the groups that were found in the list.
-         * @param groupKey A function that accepts a single argument. The function is called with each element in the list, the function should return a string representing the group containing the element. This function must always return the same results, given the same inputs. The results should not depend on values that are subject to change. You must call notifyMutated each time an item changes. Do not batch change notifications.
-         * @param groupData A function that accepts a single argument. The function is called once, on one element per group. It should return the value that should be set as the data of the .groups list element for this group. The data value usually serves as summary or header information for the group.
-         * @param groupSorter A function that accepts two arguments. The function is called with pairs of group keys found in the list. It must return one of the following numeric values: negative if the first argument is less than the second (sorted before), zero if the two arguments are equivalent, positive if the first argument is greater than the second (sorted after).
-         * @returns A grouped projection over the list.
-        **/
-        createGrouped<G>(groupKey: (x: T) => string, groupData: (x: T) => G, groupSorter?: (left: string, right: string) => number): GroupedSortedListProjection<T, G>;
-
-        /**
-         * Creates a live sorted projection over this list. As the list changes, the sorted projection reacts to those changes and may also change.
-         * @param sorter A function that accepts two arguments. The function is called with elements in the list. It must return one of the following numeric values: negative if the first argument is less than the second, zero if the two arguments are equivalent, positive if the first argument is greater than the second. This function must always return the same results, given the same inputs. The results should not depend on values that are subject to change. You must call notifyMutated each time an item changes. Do not batch change notifications.
-         * @returns A sorted projection over the list.
-        **/
-        createSorted(sorter: (left: T, right: T) => number): SortedListProjection<T>;
-
-        /**
-        * Raises an event of the specified type and with the specified additional properties.
-        * @param type The type (name) of the event.
-        * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-        * @returns true if preventDefault was called on the event.
-       **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Checks whether the specified callback function returns true for all elements in a list.
-         * @param callback A function that accepts up to three arguments. This function is called for each element in the list until it returns false or the end of the list is reached.
-         * @param thisArg An object to which the this keyword can refer in the callback function. If thisArg is omitted, undefined is used.
-         * @returns true if the callback returns true for all elements in the list.
-        **/
-        every(callback: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
-
-        /**
-         * Returns the elements of a list that meet the condition specified in a callback function.
-         * @param callback A function that accepts up to three arguments. The function is called for each element in the list. This function must always return the same results, given the same inputs. The results should not depend on values that are subject to change. You must call notifyMutated each time an item changes. Do not batch change notifications.
-         * @param thisArg An object to which the this keyword can refer in the callback function. If thisArg is omitted, undefined is used.
-         * @returns An array containing the elements that meet the condition specified in the callback function.
-        **/
-        filter(callback: (value: T, index: number, array: T[]) => any, thisArg?: any): T[];
-
-        /**
-         * Calls the specified callback function for each element in a list.
-         * @param callback A function that accepts up to three arguments. The function is called for each element in the list. The arguments are as follows: value, index, array.
-         * @param thisArg An object to which the this keyword can refer in the callback function. If thisArg is omitted, undefined is used.
-        **/
-        forEach(callback: (value: T, index: number, array: T[]) => void, thisArg?: any): void;
-
-        /**
-         * Gets the value at the specified index.
-         * @param index The index of the value to get.
-         * @returns The value at the specified index.
-        **/
-        getAt(index: number): T;
-
-        /**
-         * Gets a key/data pair for the specified list index.
-         * @param index The index of value to retrieve.
-         * @returns An object with .key and .data properties.
-        **/
-        getItem(index: number): IKeyDataPair<T>;
-
-        /**
-         * Gets a key/data pair for the list item key specified.
-         * @param key The key of the value to retrieve.
-         * @returns An object with .key and .data properties.
-        **/
-        getItemFromKey(key: string): IKeyDataPair<T>;
-
-        /**
-         * Gets the index of the first occurrence of the specified value in a list.
-         * @param searchElement The value to locate in the list.
-         * @param fromIndex The index at which to begin the search. If fromIndex is omitted, the search starts at index 0.
-         * @returns The index of the first occurrence of a value in a list or -1 if not found.
-        **/
-        indexOf(searchElement: T, fromIndex?: number): number;
-
-        /**
-         * Gets the index of the first occurrence of a key in a list.
-         * @param key The key to locate in the list.
-         * @returns The index of the first occurrence of a key in a list, or -1 if not found.
-        **/
-        indexOfKey(key: string): number;
-
-        /**
-         * Returns a string consisting of all the elements of a list separated by the specified separator string.
-         * @param separator A string used to separate the elements of a list. If this parameter is omitted, the list elements are separated with a comma.
-         * @returns The elements of a list separated by the specified separator string.
-        **/
-        join(separator?: string): string;
-
-        /**
-         * Gets the index of the last occurrence of the specified value in a list.
-         * @param searchElement The value to locate in the list.
-         * @param fromIndex The index at which to begin the search. If fromIndex is omitted, the search starts at the last index in the list.
-         * @returns The index of the last occurrence of a value in a list, or -1 if not found.
-        **/
-        lastIndexOf(searchElement: T, fromIndex?: number): number;
-
-        /**
-         * Calls the specified callback function on each element of a list, and returns an array that contains the results.
-         * @param callback A function that accepts up to three arguments. The function is called for each element in the list.
-         * @param thisArg n object to which the this keyword can refer in the callback function. If thisArg is omitted, undefined is used.
-         * @returns An array containing the result of calling the callback function on each element in the list.
-        **/
-        map<G>(callback: (value: T, index: number, array: T[]) => G, thisArg?: any): G[];
-
-        /**
-         * Moves the value at index to the specified position.
-         * @param index The original index of the value.
-         * @param newIndex The index of the value after the move.
-        **/
-        move(index: number, newIndex: number): void;
-
-        /**
-         * Notifies listeners that a property value was updated.
-         * @param name The name of the property that is being updated.
-         * @param newValue The new value for the property.
-         * @param oldValue The old value for the property.
-         * @returns A promise that is completed when the notifications are complete.
-        **/
-        notify(name: string, newValue: any, oldValue: any): Promise<any>;
-
-        /**
-         * Forces the list to send a itemmutated notification to any listeners for the value at the specified index.
-         * @param index The index of the value that was mutated.
-        **/
-        notifyMutated(index: number): void;
-
-        /**
-         * Forces the list to send a reload notification to any listeners.
-        **/
-        notifyReload(): void;
-
-        /**
-         * Removes the last element from a list and returns it.
-         * @returns The last element from the list.
-        **/
-        pop(): T;
-
-        /**
-         * Appends new element(s) to a list, and returns the new length of the list.
-         * @param value The element to insert at the end of the list.
-         * @returns The new length of the list.
-        **/
-        push(value: T): number;
-        push(...values: T[]): number;
-
-        /**
-         * Accumulates a single result by calling the specified callback function for all elements in a list. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
-         * @param callback A function that accepts up to four arguments. These arguments are: previousValue, currentValue, currentIndex, array. The function is called for each element in the list.
-         * @param initiallValue If initialValue is specified, it is used as the value with which to start the accumulation. The first call to the function provides this value as an argument instead of a list value.
-         * @returns The return value from the last call to the callback function.
-        **/
-        reduce(callback: (previousValue: any, currentValue: any, currentIndex: number, array: T[]) => T, initiallValue?: T): T;
-
-        /**
-         * Accumulates a single result by calling the specified callback function for all elements in a list, starting with the last member of the list. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
-         * @param callback A function that accepts up to four arguments. These arguments are: previousValue, currentValue, currentIndex, array. The function is called for each element in the list.
-         * @param initialValue If initialValue is specified, it is used as the value with which to start the accumulation. The first call to the callback function provides this value as an argument instead of a list value.
-         * @returns The return value from the last call to callback function.
-        **/
-        reduceRight(callback: (previousValue: any, currentValue: any, currentIndex: number, array: T[]) => T, initialValue?: T): T;
-
-        /**
-         * Removes an event listener from the control.
-         * @param type The type (name) of the event.
-         * @param listener The listener to remove.
-         * @param useCapture true if capture is to be initiated, otherwise false.
-        **/
-        removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-        /**
-         * Returns a list with the elements reversed. This method reverses the elements of a list object in place. It does not create a new list object during execution.
-        **/
-        reverse(): void;
-
-        /**
-         * Replaces the value at the specified index with a new value.
-         * @param index The index of the value that was replaced.
-         * @param newValue The new value.
-        **/
-        setAt(index: number, newValue: T): void;
-
-        /**
-         * Removes the first element from a list and returns it.
-         * @returns The first element from the list.
-        **/
-        shift(): T;
-
-        /**
-         * Extracts a section of a list and returns a new list.
-         * @param begin The index that specifies the beginning of the section.
-         * @param end The index that specifies the end of the section.
-         * @returns Returns a section of list.
-        **/
-        slice(begin: number, end?: number): T[];
-
-        /**
-         * Checks whether the specified callback function returns true for any element of a list.
-         * @param callback A function that accepts up to three arguments. The function is called for each element in the list until it returns true, or until the end of the list.
-         * @param thisArg An object to which the this keyword can refer in the callback function. If thisArg is omitted, undefined is used.
-         * @returns true if callback returns true for any element in the list.
-        **/
-        some(callback: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
-
-        /**
-         * Returns a list with the elements sorted. This method sorts the elements of a list object in place. It does not create a new list object during execution.
-         * @param sortFunction The function used to determine the order of the elements. If omitted, the elements are sorted in ascending, ASCII character order. This function must always return the same results, given the same inputs. The results should not depend on values that are subject to change. You must call notifyMutated each time an item changes. Do not batch change notifications.
-        **/
-        sort(sortFunction?: (left: T, right: T) => number): void;
-
-        /**
-         * Removes elements from a list and, if necessary, inserts new elements in their place, returning the deleted elements.
-         * @param start The zero-based location in the list from which to start removing elements.
-         * @param howMany The number of elements to remove.
-         * @param item The elements to insert into the list in place of the deleted elements.
-         * @returns The deleted elements.
-        **/
-        splice(start: number, howMany?: number, ...item: T[]): T[];
-
-        /**
-         * Removes one or more listeners from the notification list for a given property.
-         * @param name The name of the property to unbind. If this parameter is omitted, all listeners for all events are removed.
-         * @param action The function to remove from the listener list for the specified property. If this parameter is omitted, all listeners are removed for the specific property.
-         * @returns This object is returned.
-        **/
-        unbind(name: string, action: Function): any;
-
-        /**
-         * Appends new element(s) to a list, and returns the new length of the list.
-         * @param value The element to insert at the start of the list.
-         * @returns The new length of the list.
-        **/
-        unshift(value: T): number;
-        unshift(...values: T[]): number;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets the IListDataSource for the list. The only purpose of this property is to adapt a List to the data model that is used by ListView and FlipView.
-        **/
-        dataSource: WinJS.UI.IListDataSource<T>;
-
-        /**
-         * Gets or sets the length of the list, which is an integer value one higher than the highest element defined in the list.
-        **/
-        length: number;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-    }
-
-    /**
-     * Represents a base class for lists.
-    **/
-    interface ListBase<T> {
-        //#region Events
-
-        /**
-         * An item in the list has changed its value.
-         * @param eventInfo An object that contains information about the event. The detail contains the following information: index, key, newItem, newValue, oldItem, oldValue.
-        **/
-        onitemchanged(eventInfo: CustomEvent): void;
-
-        /**
-         * A new item has been inserted into the list.
-         * @param eventInfo An object that contains information about the event. The detail contains the following information: index, key, value.
-        **/
-        oniteminserted(eventInfo: CustomEvent): void;
-
-        /**
-         * An item has been changed locations in the list.
-         * @param eventInfo An object that contains information about the event. The detail contains the following information: index, key, value.
-        **/
-        onitemmoved(eventInfo: CustomEvent): void;
-
-        /**
-         * An item has been mutated. This event occurs as a result of calling the notifyMutated method.
-         * @param eventInfo An object that contains information about the event. The detail contains the following information: index, key, value.
-        **/
-        onitemmutated(eventInfo: CustomEvent): void;
-
-        /**
-         * An item has been removed from the list.
-         * @param eventInfo An object that contains information about the event. The detail contains the following information: index, key, value.
-        **/
-        onitemremoved(eventInfo: CustomEvent): void;
-
-        /**
-         * The list has been refreshed. Any references to items in the list may be incorrect.
-         * @param eventInfo An object that contains information about the event. The detail property of this object is null.
-        **/
-        onreload(eventInfo: CustomEvent): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Adds an event listener to the control.
-         * @param type The type (name) of the event.
-         * @param listener The listener to invoke when the event gets raised.
-         * @param useCapture If true, initiates capture, otherwise false.
-        **/
-        addEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-        /**
-         * Links the specified action to the property specified in the name parameter. This function is invoked when the value of the property may have changed. It is not guaranteed that the action will be called only when a value has actually changed, nor is it guaranteed that the action will be called for every value change. The implementation of this function coalesces change notifications, such that multiple updates to a property value may result in only a single call to the specified action.
-         * @param name The name of the property to which to bind the action.
-         * @param action The function to invoke asynchronously when the property may have changed.
-         * @returns A reference to this observableMixin object.
-        **/
-        bind(name: string, action: Function): any;
-
-        /**
-         * Returns a new list consisting of a combination of two arrays.
-         * @param item Additional items to add to the end of the list.
-         * @returns An array containing the concatenation of the list and any other supplied items.
-        **/
-        concat(...item: T[]): T[];
-
-        /**
-         * Creates a live filtered projection over this list. As the list changes, the filtered projection reacts to those changes and may also change.
-         * @param predicate A function that accepts a single argument. The createFiltered function calls the callback with each element in the list. If the function returns true, that element will be included in the filtered list. This function must always return the same results, given the same inputs. The results should not depend on values that are subject to change. You must call notifyMutated each time an item changes. Do not batch change notifications.
-         * @returns A filtered projection over the list.
-        **/
-        createFiltered(predicate: (x: T) => boolean): FilteredListProjection<T>;
-
-        /**
-         * Creates a live grouped projection over this list. As the list changes, the grouped projection reacts to those changes and may also change. The grouped projection sorts all the elements of the list to be in group-contiguous order. The grouped projection also contains a .groups property, which is a List representing the groups that were found in the list.
-         * @param groupKey A function that accepts a single argument. The function is called with each element in the list, the function should return a string representing the group containing the element. This function must always return the same results, given the same inputs. The results should not depend on values that are subject to change. You must call notifyMutated each time an item changes. Do not batch change notifications.
-         * @param groupData A function that accepts a single argument. The function is called once, on one element per group. It should return the value that should be set as the data of the .groups list element for this group. The data value usually serves as summary or header information for the group.
-         * @param groupSorter A function that accepts two arguments. The function is called with pairs of group keys found in the list. It must return one of the following numeric values: negative if the first argument is less than the second (sorted before), zero if the two arguments are equivalent, positive if the first argument is greater than the second (sorted after).
-         * @returns A grouped projection over the list.
-        **/
-        createGrouped<G>(groupKey: (x: T) => string, groupData: (x: T) => G, groupSorter?: (left: string, right: string) => number): GroupedSortedListProjection<T, G>;
-
-        /**
-         * Creates a live sorted projection over this list. As the list changes, the sorted projection reacts to those changes and may also change.
-         * @param sorter A function that accepts two arguments. The function is called with elements in the list. It must return one of the following numeric values: negative if the first argument is less than the second, zero if the two arguments are equivalent, positive if the first argument is greater than the second. This function must always return the same results, given the same inputs. The results should not depend on values that are subject to change. You must call notifyMutated each time an item changes. Do not batch change notifications.
-         * @returns A sorted projection over the list.
-        **/
-        createSorted(sorter: (left: T, right: T) => number): SortedListProjection<T>;
-
-        /**
-         * Raises an event of the specified type and with the specified additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Checks whether the specified callback function returns true for all elements in a list.
-         * @param callback A function that accepts up to three arguments. This function is called for each element in the list until it returns false or the end of the list is reached.
-         * @param thisArg An object to which the this keyword can refer in the callback function. If thisArg is omitted, undefined is used.
-         * @returns true if the callback returns true for all elements in the list.
-        **/
-        every(callback: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
-
-        /**
-         * Returns the elements of a list that meet the condition specified in a callback function.
-         * @param callback A function that accepts up to three arguments. The function is called for each element in the list. This function must always return the same results, given the same inputs. The results should not depend on values that are subject to change. You must call notifyMutated each time an item changes. Do not batch change notifications.
-         * @param thisArg An object to which the this keyword can refer in the callback function. If thisArg is omitted, undefined is used.
-         * @returns An array containing the elements that meet the condition specified in the callback function.
-        **/
-        filter(callback: (value: T, index: number, array: T[]) => any, thisArg?: any): T[];
-
-        /**
-         * Calls the specified callback function for each element in a list.
-         * @param callback A function that accepts up to three arguments. The function is called for each element in the list. The arguments are as follows: value, index, array.
-         * @param thisArg An object to which the this keyword can refer in the callback function. If thisArg is omitted, undefined is used.
-        **/
-        forEach(callback: (value: T, index: number, array: T[]) => void, thisArg?: any): void;
-
-        /**
-         * Gets the value at the specified index.
-         * @param index The index of the value to get.
-         * @returns The value at the specified index.
-        **/
-        getAt(index: number): T;
-
-        /**
-         * Gets the index of the first occurrence of the specified value in a list.
-         * @param searchElement The value to locate in the list.
-         * @param fromIndex The index at which to begin the search. If fromIndex is omitted, the search starts at index 0.
-         * @returns The index of the first occurrence of a value in a list or -1 if not found.
-        **/
-        indexOf(searchElement: T, fromIndex?: number): number;
-
-        /**
-         * Returns a string consisting of all the elements of a list separated by the specified separator string.
-         * @param separator A string used to separate the elements of a list. If this parameter is omitted, the list elements are separated with a comma.
-         * @returns The elements of a list separated by the specified separator string.
-        **/
-        join(separator?: string): string;
-
-        /**
-         * Gets the index of the last occurrence of the specified value in a list.
-         * @param searchElement The value to locate in the list.
-         * @param fromIndex The index at which to begin the search. If fromIndex is omitted, the search starts at the last index in the list.
-         * @returns The index of the last occurrence of a value in a list, or -1 if not found.
-        **/
-        lastIndexOf(searchElement: T, fromIndex?: number): number;
-
-        /**
-         * Calls the specified callback function on each element of a list, and returns an array that contains the results.
-         * @param callback A function that accepts up to three arguments. The function is called for each element in the list.
-         * @param thisArg n object to which the this keyword can refer in the callback function. If thisArg is omitted, undefined is used.
-         * @returns An array containing the result of calling the callback function on each element in the list.
-        **/
-        map<G>(callback: (value: T, index: number, array: T[]) => G, thisArg?: any): G[];
-
-        /**
-         * Notifies listeners that a property value was updated.
-         * @param name The name of the property that is being updated.
-         * @param newValue The new value for the property.
-         * @param oldValue The old value for the property.
-         * @returns A promise that is completed when the notifications are complete.
-        **/
-        notify(name: string, newValue: any, oldValue: any): Promise<any>;
-
-        /**
-         * Forces the list to send a reload notification to any listeners.
-        **/
-        notifyReload(): void;
-
-        /**
-         * Accumulates a single result by calling the specified callback function for all elements in a list. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
-         * @param callback A function that accepts up to four arguments. These arguments are: previousValue, currentValue, currentIndex, array. The function is called for each element in the list.
-         * @param initiallValue If initialValue is specified, it is used as the value with which to start the accumulation. The first call to the function provides this value as an argument instead of a list value.
-         * @returns The return value from the last call to the callback function.
-        **/
-        reduce(callback: (previousValue: any, currentValue: any, currentIndex: number, array: T[]) => T, initiallValue?: T): T;
-
-        /**
-         * Accumulates a single result by calling the specified callback function for all elements in a list, starting with the last member of the list. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
-         * @param callback A function that accepts up to four arguments. These arguments are: previousValue, currentValue, currentIndex, array. The function is called for each element in the list.
-         * @param initialValue If initialValue is specified, it is used as the value with which to start the accumulation. The first call to the callback function provides this value as an argument instead of a list value.
-         * @returns The return value from the last call to callback function.
-        **/
-        reduceRight(callback: (previousValue: any, currentValue: any, currentIndex: number, array: T[]) => T, initialValue?: T): T;
-
-        /**
-         * Removes an event listener from the control.
-         * @param type The type (name) of the event.
-         * @param listener The listener to remove.
-         * @param useCapture true if capture is to be initiated, otherwise false.
-        **/
-        removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-        /**
-         * Extracts a section of a list and returns a new list.
-         * @param begin The index that specifies the beginning of the section.
-         * @param end The index that specifies the end of the section.
-         * @returns Returns a section of list.
-        **/
-        slice(begin: number, end?: number): T[];
-
-        /**
-         * Checks whether the specified callback function returns true for any element of a list.
-         * @param callback A function that accepts up to three arguments. The function is called for each element in the list until it returns true, or until the end of the list.
-         * @param thisArg An object to which the this keyword can refer in the callback function. If thisArg is omitted, undefined is used.
-         * @returns true if callback returns true for any element in the list.
-        **/
-        some(callback: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
-
-        /**
-         * Removes one or more listeners from the notification list for a given property.
-         * @param name The name of the property to unbind. If this parameter is omitted, all listeners for all events are removed.
-         * @param action The function to remove from the listener list for the specified property. If this parameter is omitted, all listeners are removed for the specific property.
-         * @returns This object is returned.
-        **/
-        unbind(name: string, action: Function): any;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets the IListDataSource for the list. The only purpose of this property is to adapt a List to the data model that is used by ListView and FlipView.
-        **/
-        dataSource: WinJS.UI.IListDataSource<T>;
-
-        //#endregion Properties
-    }
-
-    /**
-     * Represents a base class for normal list modifying operations.
-    **/
-    interface ListBaseWithMutators<T> extends ListBase<T> {
-        //#region Methods
-
-        /**
-         * Removes the last element from a list and returns it.
-         * @returns The last element from the list.
-        **/
-        pop(): T;
-
-        /**
-         * Appends new element(s) to a list, and returns the new length of the list.
-         * @param value The element to insert at the end of the list.
-         * @returns The new length of the list.
-        **/
-        push(value: T): number;
-        push(...values: T[]): number;
-
-        /**
-         * Removes the first element from a list and returns it.
-         * @returns The first element from the list.
-        **/
-        shift(): T;
-
-        /**
-         * Appends new element(s) to a list, and returns the new length of the list.
-         * @param value The element to insert at the start of the list.
-         * @returns The new length of the list.
-        **/
-        unshift(value: T): number;
-        unshift(...values: T[]): number;
-
-        //#endregion Methods
-    }
-
-    /**
-     * Represents a base class for list projections.
-    **/
-    interface ListProjection<T> extends ListBaseWithMutators<T> {
-        //#region Methods
-
-        /**
-         * Disconnects a WinJS.Binding.List projection from its underlying WinJS.Binding.List. It's only important to call this method when the WinJS.Binding.List projection and the WinJS.Binding.List have different lifetimes. (Call this method on the WinJS.Binding.List projection, not the underlying WinJS.Binding.List.)
-        **/
-        dispose(): void;
-
-        /**
-         * Gets a key/data pair for the specified key.
-         * @param key The key of the value to retrieve.
-         * @returns An object with two properties: key and data.
-        **/
-        getItemFromKey(key: string): IKeyDataPair<T>;
-
-        /**
-         * Moves the value at index to position newIndex.
-         * @param index The original index of the value.
-         * @param newIndex The index of the value after the move.
-        **/
-        move(index: number, newIndex: number): void;
-
-        /**
-         * Removes elements from a list and, if necessary, inserts new elements in their place, returning the deleted elements.
-         * @param start The zero-based location in the list from which to start removing elements.
-         * @param howMany The number of elements to remove.
-         * @param item The elements to insert into the list in place of the deleted elements.
-         * @returns The deleted elements.
-        **/
-        splice(start: number, howMany?: number, ...item: T[]): T[];
-
-        //#endregion Methods
-    }
-
-    /**
-     * Provides a standard implementation of the bindable contract, as well as a basic storage mechanism that participates in change notification and an asynchronous notification implementation.
-    **/
-    var mixin: {
-        //#region Methods
-
-        /**
-         * Adds a property to the object. The property includes change notification and an ECMAScript 5 property definition .
-         * @param name The name of the property to add.
-         * @param value The value of the property.
-         * @returns This object is returned.
-        **/
-        addProperty(name: string, value: any): any;
-
-        /**
-         * Links the specified action to the property specified in the name parameter. This function is invoked when the value of the property may have changed. It is not guaranteed that the action will be called only when a value has actually changed, nor is it guaranteed that the action will be called for every value change. The implementation of this function coalesces change notifications, such that multiple updates to a property value may result in only a single call to the specified action.
-         * @param name The name of the property to which to bind the action.
-         * @param action The function to invoke asynchronously when the property may have changed.
-         * @returns This object is returned.
-        **/
-        bind(name: string, action: any): Function;
-
-        /**
-         * Gets a property value by name.
-         * @param name The name of the property to get.
-         * @returns The value of the property as an observable object.
-        **/
-        getProperty(name: string): any;
-
-        /**
-         * Notifies listeners that a property value was updated.
-         * @param name The name of the property that is being updated.
-         * @param newValue The new value for the property.
-         * @param oldValue The old value for the property.
-         * @returns A promise that is completed when the notifications are complete.
-        **/
-        notify(name: string, newValue: string, oldValue: string): Promise<any>;
-
-        /**
-         * Removes a property value.
-         * @param name The name of the property to remove.
-         * @returns This object is returned.
-        **/
-        removeProperty(name: string): any;
-
-        /**
-         * Updates a property value and notifies any listeners.
-         * @param name The name of the property to update.
-         * @param value The new value of the property.
-         * @returns This object is returned.
-        **/
-        setProperty(name: string, value: any): any;
-
-        /**
-         * Removes one or more listeners from the notification list for a given property.
-         * @param name The name of the property to unbind. If this parameter is omitted, all listeners for all events are removed.
-         * @param action The function to remove from the listener list for the specified property. If this parameter is omitted, all listeners are removed for the specific property.
-         * @returns This object is returned.
-        **/
-        unbind(name: string, action: Function): any;
-
-        /**
-         * Updates a property value and notifies any listeners.
-         * @param name The name of the property to update.
-         * @param value The new value of the property.
-         * @returns A promise that completes when the notifications for this property change have been processed. If multiple notifications are coalesced, the promise may be canceled or the value of the promise may be updated. The fulfilled value of the promise is the new value of the property for which the notifications have been completed.
-        **/
-        updateProperty(name: string, value: any): Promise<any>;
-
-        //#endregion Methods
-
-    };
-
-    /**
-     * Provides functions that can make an object observable.
-    **/
-    var observableMixin: {
-        //#region Methods
-
-        /**
-         * Links the specified action to the property specified in the name parameter. This function is invoked when the value of the property may have changed. It is not guaranteed that the action will be called only when a value has actually changed, nor is it guaranteed that the action will be called for every value change. The implementation of this function coalesces change notifications, such that multiple updates to a property value may result in only a single call to the specified action.
-         * @param name The name of the property to which to bind the action.
-         * @param action The function to invoke asynchronously when the property may have changed.
-         * @returns A reference to this observableMixin object.
-        **/
-        bind(name: string, action: Function): any;
-
-        /**
-         * Notifies listeners that a property value was updated.
-         * @param name The name of the property that is being updated.
-         * @param newValue The new value for the property.
-         * @param oldValue The old value for the property.
-         * @returns A promise that is completed when the notifications are complete.
-        **/
-        notify(name: string, newValue: any, oldValue: any): Promise<any>;
-
-        /**
-         * Removes one or more listeners from the notification list for a given property.
-         * @param name The name of the property to unbind. If this parameter is omitted, all listeners for all events are removed.
-         * @param action The function to remove from the listener list for the specified property. If this parameter is omitted, all listeners are removed for the specific property.
-         * @returns This object is returned.
-        **/
-        unbind(name: string, action: Function): any;
-
-        //#endregion Methods
-
-    };
-
-    /**
-     * Do not instantiate. Returned by the createSorted method.
-    **/
-    interface SortedListProjection<T> extends ListProjection<T> {
-        //#region Methods
-
-        /**
-         * Returns a key/data pair for the specified index.
-         * @param index The index of the value to retrieve.
-         * @returns An object that has two properties: key and data.
-        **/
-        getItem(index: number): IKeyDataPair<T>;
-
-        /**
-         * Returns the index of the first occurrence of a key.
-         * @param key The key to locate in the list.
-         * @returns The index of the first occurrence of a key in a list, or -1 if not found.
-        **/
-        indexOfKey(key: string): number;
-
-        /**
-         * Forces the list to send a itemmutated notification to any listeners for the value at the specified index.
-         * @param index The index of the value that was mutated.
-        **/
-        notifyMutated(index: number): void;
-
-        /**
-         * Replaces the value at the specified index with a new value.
-         * @param index The index of the value to be replaced.
-         * @param newValue The new value.
-        **/
-        setAt(index: number, newValue: T): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets the length of the list. Returns an integer value one higher than the highest element defined in a list.
-        **/
-        length: number;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Provides a reusable declarative binding element.
-    **/
-    class Template {
-        //#region Constructors
-
-        /**
-         * Creates a template that provides a reusable declarative binding element.
-         * @constructor
-         * @param element The DOM element to convert to a template.
-         * @param options If this parameter is supplied, the template is loaded from the URI and the content of the element parameter is ignored. You can add the following options: href.
-        **/
-        constructor(element: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Methods
-
-        /**
-         * Binds values from the specified data context to elements that are descendants of the specified root element that have the declarative binding attributes specified (data-win-bind).
-         * @param dataContext The object to use for default data binding.
-         * @param container The element to which to add this rendered template. If this parameter is omitted, a new DIV is created.
-         * @returns A Promise that will be completed after binding has finished. The value is either container or the created DIV. promise that is completed after binding has finished.
-        **/
-        render(dataContext: any, container?: HTMLElement): Promise<HTMLElement>;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code. Use render instead.
-        **/
-        renderItem<T>(item: WinJS.Promise<T>, recyled: HTMLElement): { element: WinJS.Promise<HTMLElement>; renderComplete: WinJS.Promise<any>; };
-
-        /**
-         * Renders a template based on the specified URI (static method).
-         * @param href The URI from which to load the template.
-         * @param dataContext The object to use for default data binding.
-         * @param container The element to which to add this rendered template. If this parameter is omitted, a new DIV is created.
-         * @returns A promise that is completed after binding has finished. The value is either the object in the container parameter or the created DIV.
-        **/
-        static render(href: string, dataContext: any, container?: HTMLElement): Promise<HTMLElement>;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets the default binding initializer for the template.
-        **/
-        bindingInitializer: any;
-
-        /**
-         * Gets or sets a value that specifies whether a debug break is inserted into the first rendering of each template. This property only has an effect when the app is in debug mode.
-        **/
-        debugBreakOnRender: boolean;
-
-        /**
-         * This property is deprecated and might not be available in future versions of the WinJS. Gets or sets a value that specifies whether optimized template processing has been disabled.
-        **/
-        disableOptimizedProcessing: boolean;
-
-        /**
-         * Gets the DOM element that is used as the template.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets a value that specifies whether templates should be instantiated without the creation of an additional child element.
-        **/
-        extractChild: boolean;
-
-        /**
-         * Gets or sets the Number of milliseconds to delay instantiating declarative controls. Zero (0) will result in no delay, any negative number
-         * will result in a setImmediate delay, any positive number will be treated as the number of milliseconds.
-        **/
-        processTimeout: number;
-
-        /**
-         * Determines whether the Template contains declarative controls that must be processed separately. This property is always true. The controls that belong to a Template object's children are instantiated when a Template instance is rendered.
-        **/
-        static isDeclarativeControlContainer: boolean;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-    }
-
-    //#endregion Objects
-
-    //#region Functions
-
-    /**
-     * Adds a CSS class from the specified path of the source object to a destination object.
-     * @param source The source object that has the class to copy.
-     * @param sourceProperties The path on the source object to the source class.
-     * @param dest The destination object.
-    **/
-    function addClassOneTime(source: any, sourceProperties: any[], dest: HTMLElement): void;
-
-    /**
-     * Returns an observable object. This may be an observable proxy for the specified object, an existing proxy, or the specified object itself if it directly supports observation.
-     * @param data The object to observe.
-     * @returns The observable object.
-    **/
-    function as<U>(data: U): U;
-
-    /**
-     * Binds to one or more properties on the observable object or or on child values of that object.
-     * @param observable The object to bind to.
-     * @param bindingDescriptor An object literal containing the binding declarations. Binding declarations take the form: { propertyName: (function | bindingDeclaration), ... }.
-     * @returns An object that contains at least a "cancel" field, which is a function that removes all bindings associated with this bind request.
-    **/
-    function bind(observable: any, bindingDescriptor: any): any;
-
-    /**
-     * Creates a default binding initializer for binding between a source property and a destination property with the specified converter function that is executed on the value of the source property.
-     * @param convert The conversion function that takes the source property and produces a value that is set to the destination property. This function must be accessible from the global namespace.
-     * @returns The binding initializer.
-    **/
-    function converter(convert: Function): Function;
-
-    /**
-     * Creates a one-way binding between the source object and the destination object. Warning Do not attempt to bind data to the ID of an HTML element.
-     * @param source The source object.
-     * @param sourceProperties The path on the source object to the source property.
-     * @param dest The destination object.
-     * @param destProperties The path on the destination object to the destination property.
-     * @returns An object with a cancel method that is used to coalesce bindings.
-    **/
-    function defaultBind(source: any, sourceProperties: any, dest: any, destProperties: any): any;
-
-    /**
-     * Creates a new constructor function that supports observability with the specified set of properties.
-     * @param data The object to use as the pattern for defining the set of properties.
-     * @returns A constructor function with 1 optional argument that is the initial state of the properties.
-    **/
-    function define(data: any): Function;
-
-    /**
-     * Wraps the specified object so that all its properties are instrumented for binding. This is meant to be used in conjunction with the binding mixin.
-     * @param shape The specification for the bindable object.
-     * @returns An object with a set of properties all of which are wired for binding.
-    **/
-    function expandProperties(shape: any): any;
-
-    /**
-     * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-    **/
-    function getValue(obj: any, path?: any): any;
-
-    /**
-     * Marks a custom initializer function as being compatible with declarative data binding.
-     * @param customInitializer The custom initializer to be marked as compatible with declarative data binding.
-     * @returns The input customInitializer.
-    **/
-    function initializer(customInitializer: Function): Function;
-
-    /**
-     * Sets the destination property to the value of the source property.
-     * @param source The source object.
-     * @param sourceProperties The path on the source object to the source property.
-     * @param dest The destination object.
-     * @param destProperties The path on the destination object to the destination property.
-     * @returns An object with a cancel method that is used to coalesce bindings.
-    **/
-    function oneTime(source: any, sourceProperties: any, dest: any, destProperties: any): any;
-
-    /**
-     * Binds the values of an object to the values of a DOM element that has the data-win-bind attribute. If multiple DOM elements are to be bound, you must set the attribute on all of them. See the example below for details.
-     * @param rootElement Optional. The element at which to start traversing to find elements to bind to. If this parameter is omitted, the entire document is searched.
-     * @param dataContext The object that contains the values to which the DOM element should be bound.
-     * @param skipRoot If true, specifies that only the children of rootElement should be bound, otherwise rootElement should be bound as well.
-     * @param bindingCache The cached binding data.
-     * @param defaultInitializer The binding initializer to use in the case that one is not specified in a binding expression. If not provided, the behavior is the same as Binding.defaultBind.
-     * @returns A Promise that completes when every item that contains the data-win-bind attribute has been processed and the update has started.
-    **/
-    function processAll(rootElement?: Element, dataContext?: any, skipRoot?: boolean, bindingCache?: any, defaultInitializer?: Function): Promise<void>;
-
-    /**
-     * Creates a one-way binding between the source object and an attribute on the destination element.
-     * @param source The source object.
-     * @param sourceProperties The path on the source object to the source property.
-     * @param dest The destination object.
-     * @param destProperties The path on the destination object to the destination property. This must be a single name.
-     * @returns An object with a cancel() method that is used to coalesce bindings.
-    **/
-    function setAttribute(source: any, sourceProperties: any[], dest: Element, destProperties: any[]): any;
-
-    /**
-     * Sets an attribute on the destination element to the value of the source property.
-     * @param source The source object.
-     * @param sourceProperties The path on the source object to the source property.
-     * @param dest The destination object.
-     * @param destProperties The path on the destination object to the destination property. This must be a single name.
-    **/
-    function setAttributeOneTime(source: any, sourceProperties: any[], dest: Element, destProperties: any[]): void;
-
-    /**
-     * Returns the original (non-observable) object is returned if the specified object is an observable proxy,
-     * @param data The object for which to retrieve the original value.
-     * @returns If the specified object is an observable proxy, the original object is returned, otherwise the same object is returned.
-    **/
-    function unwrap(data: any): any;
-
-    //#endregion Functions
-
-    //#region Interfaces
-
-    interface IKeyDataPair<T> {
-        key: string;
-        data: T;
-    }
-
-    interface IGroupKeyDataPair<T> extends IKeyDataPair<T> {
-        groupSize: number;
-        firstItemIndexHint: number;
-        firstItemKey: string;
-    }
-
-    //#endregion Interfaces
-
-}
-/**
- * Provides helper functions for defining Classes.
-**/
-declare namespace WinJS.Class {
-    //#region Functions
-
-    /**
-     * Defines a class using the given constructor and the specified instance members.
-     * @param constructor A constructor function that is used to instantiate this type.
-     * @param instanceMembers The set of instance fields, properties, and methods made available on the type.
-     * @param staticMembers The set of static fields, properties, and methods made available on the type.
-     * @returns The newly-defined type.
-    **/
-    function define(constructor?: Function, instanceMembers?: any, staticMembers?: any): any;
-
-    /**
-     * Creates a sub-class based on the specified baseClass parameter, using prototype inheritance.
-     * @param baseClass The type to inherit from.
-     * @param constructor A constructor function that is used to instantiate this type.
-     * @param instanceMembers The set of instance fields, properties, and methods to be made available on the type.
-     * @param staticMembers The set of static fields, properties, and methods to be made available on the type.
-     * @returns The newly-defined type.
-    **/
-    function derive(baseClass: any, constructor: Function, instanceMembers?: any, staticMembers?: any): any;
-
-    /**
-     * Defines a class using the given constructor and the union of the set of instance members specified by all the mixin objects. The mixin parameter list is of variable length. For more information, see Adding functionality with WinJS mixins.
-     * @param constructor A constructor function that will be used to instantiate this class.
-     * @param mixin An object declaring the set of instance members. The mixin parameter list is of variable length.
-     * @returns The newly defined class.
-    **/
-    function mix(constructor: Function, ...mixin: any[]): any;
-
-    //#endregion Functions
-
-}
-/**
- * The WinJS namespace provides special Windows Library for JavaScript functionality, including Promise and xhr.
-**/
-declare namespace WinJS {
-    //#region Properties
-
-    /**
-     * Can be set to show the results of a validation process.
-    **/
-    var validation: boolean;
-
-    //#endregion Properties
-
-    //#region Objects
-
-    /**
-     * An error object.
-    **/
-    class ErrorFromName {
-        //#region Constructors
-
-        /**
-         * Creates an Error object with the specified name and message properties.
-         * @constructor
-         * @param name The name of this error. The name is meant to be consumed programmatically and should not be localized.
-         * @param message The message for this error. The message is meant to be consumed by humans and should be localized.
-        **/
-        constructor(name: string, message?: string);
-
-        //#endregion Constructors
-
-        //#region Properties
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-    }
-
-    interface IPromise<T> {
-        cancel(): void;
-        done<U>(onComplete?: (value: T) => any, onError?: (error: any) => any, onProgress?: (progress: any) => void): void;
-        then<U>(onComplete?: (value: T) => IPromise<U>, onError?: (error: any) => IPromise<U>, onProgress?: (progress: any) => void): IPromise<U>;
-        then<U>(onComplete?: (value: T) => IPromise<U>, onError?: (error: any) => U, onProgress?: (progress: any) => void): IPromise<U>;
-        then<U>(onComplete?: (value: T) => IPromise<U>, onError?: (error: any) => void, onProgress?: (progress: any) => void): IPromise<U>;
-        then<U>(onComplete?: (value: T) => U, onError?: (error: any) => IPromise<U>, onProgress?: (progress: any) => void): IPromise<U>;
-        then<U>(onComplete?: (value: T) => U, onError?: (error: any) => U, onProgress?: (progress: any) => void): IPromise<U>;
-        then<U>(onComplete?: (value: T) => U, onError?: (error: any) => void, onProgress?: (progress: any) => void): IPromise<U>;
-        then<U>(onComplete?: (value: T) => void, onError?: (error: any) => IPromise<U>, onProgress?: (progress: any) => void): IPromise<U>;
-        then<U>(onComplete?: (value: T) => void, onError?: (error: any) => U, onProgress?: (progress: any) => void): IPromise<U>;
-        then<U>(onComplete?: (value: T) => void, onError?: (error: any) => void, onProgress?: (progress: any) => void): IPromise<U>;
-    }
-
-    /**
-     * Provides a mechanism to schedule work to be done on a value that has not yet been computed. It is an abstraction for managing interactions with asynchronous APIs. For more information about asynchronous programming, see Asynchronous programming. For more information about promises in JavaScript, see Asynchronous programming in JavaScript. For more information about using promises, see the WinJS Promise sample.
-    **/
-    class Promise<T> implements IPromise<T> {
-        //#region Constructors
-
-        /**
-         * A promise provides a mechanism to schedule work to be done on a value that has not yet been computed. It is a convenient abstraction for managing interactions with asynchronous APIs. For more information about asynchronous programming, see Asynchronous programming. For more information about promises in JavaScript, see Asynchronous programming in JavaScript. For more information about using promises, see the WinJS Promise sample.
-         * @constructor
-         * @param init The function that is called during construction of the Promise that contains the implementation of the operation that the Promise will represent. This can be synchronous or asynchronous, depending on the nature of the operation. Note that placing code within this function does not automatically run it asynchronously; that must be done explicitly with other asynchronous APIs such as setImmediate, setTimeout, requestAnimationFrame, and the Windows Runtime asynchronous APIs. The init function is given three arguments: completeDispatch, errorDispatch, progressDispatch. This parameter is optional.
-         * @param onCancel The function to call if a consumer of this promise wants to cancel its undone work. Promises are not required to support cancellation.
-        **/
-        constructor(init?: (completeDispatch: any, errorDispatch: any, progressDispatch: any) => void, onCancel?: Function);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * Occurs when there is an error in processing a promise.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        static onerror(eventInfo: CustomEvent): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Adds an event listener for the promise.
-         * @param type The type (name) of the event.
-         * @param listener The listener to invoke when the event is raised.
-         * @param capture true to initiate capture, otherwise false.
-        **/
-        static addEventListener(type: string, listener: Function, capture?: boolean): void;
-
-        /**
-         * Returns a promise that is fulfilled when one of the input promises has been fulfilled.
-         * @param value An array that contains Promise objects or objects whose property values include Promise objects.
-         * @returns A promise that on fulfillment yields the value of the input (complete or error).
-        **/
-        static any(value: IPromise<any>[]): IPromise<any>;
-        static any(value: any): IPromise<any>;
-
-        /**
-         * Returns a promise. If the object is already a Promise it is returned; otherwise the object is wrapped in a Promise. You can use this function when you need to treat a non-Promise object like a Promise, for example when you are calling a function that expects a promise, but already have the value needed rather than needing to get it asynchronously.
-         * @param value The value to be treated as a Promise.
-         * @returns The promise.
-        **/
-        static as<U>(value?: U): IPromise<U>;
-
-        /**
-         * Attempts to cancel the fulfillment of a promised value. If the promise hasn't already been fulfilled and cancellation is supported, the promise enters the error state with a value of Error("Canceled").
-        **/
-        cancel(): void;
-
-        /**
-         * Canceled promise value, can be returned from a promise completion handler to indicate cancelation of the promise chain.
-         */
-        static cancel: IPromise<any>;
-
-        /**
-         * Raises an event of the specified type and properties.
-         * @param type The type (name) of the event.
-         * @param details The set of additional properties to be attached to the event object.
-         * @returns true if preventDefault was called on the event; otherwise, false.
-        **/
-        static dispatchEvent(type: string, details: any): boolean;
-
-        /**
-         * Allows you to specify the work to be done on the fulfillment of the promised value, the error handling to be performed if the promise fails to fulfill a value, and the handling of progress notifications along the way. After the handlers have finished executing, this function throws any error that would have been returned from then as a promise in the error state. For more information about the differences between then and done, see the following topics: Quickstart: using promises in JavaScript How to handle errors when using promises in JavaScript Chaining promises in JavaScript.
-         * @param onComplete The function to be called if the promise is fulfilled successfully with a value. The fulfilled value is passed as the single argument. If the value is null, the fulfilled value is returned. The value returned from the function becomes the fulfilled value of the promise returned by then. If an exception is thrown while executing the function, the promise returned by then moves into the error state.
-         * @param onError The function to be called if the promise is fulfilled with an error. The error is passed as the single argument. If it is null, the error is forwarded. The value returned from the function is the fulfilled value of the promise returned by then.
-         * @param onProgress The function to be called if the promise reports progress. Data about the progress is passed as the single argument. Promises are not required to support progress.
-        **/
-        done<U>(onComplete?: (value: T) => any, onError?: (error: any) => any, onProgress?: (progress: any) => void): void;
-
-        /**
-         * Determines whether a value fulfills the promise contract.
-         * @param value A value that may be a promise.
-         * @returns true if the object conforms to the promise contract (has a then function), otherwise false.
-        **/
-        static is(value: any): boolean;
-
-        /**
-         * Creates a Promise that is fulfilled when all the values are fulfilled.
-         * @param values An object whose members contain values, some of which may be promises.
-         * @returns A Promise whose value is an object with the same field names as those of the object in the values parameter, where each field value is the fulfilled value of a promise.
-        **/
-        static join(values: any): IPromise<any>;
-
-        /**
-         * Removes an event listener from the control.
-         * @param eventType The type (name) of the event.
-         * @param listener The listener to remove.
-         * @param capture Specifies whether or not to initiate capture.
-        **/
-        static removeEventListener(eventType: string, listener: Function, capture?: boolean): void;
-
-        /**
-         * Allows you to specify the work to be done on the fulfillment of the promised value, the error handling to be performed if the promise fails to fulfill a value, and the handling of progress notifications along the way. For more information about the differences between then and done, see the following topics: Quickstart: using promises in JavaScript How to handle errors when using promises in JavaScript Chaining promises in JavaScript.
-         * @param onComplete The function to be called if the promise is fulfilled successfully with a value. The value is passed as the single argument. If the value is null, the value is returned. The value returned from the function becomes the fulfilled value of the promise returned by then. If an exception is thrown while this function is being executed, the promise returned by then moves into the error state.
-         * @param onError The function to be called if the promise is fulfilled with an error. The error is passed as the single argument. In different cases this object may be of different types, so it is necessary to test the object for the properties you expect. If the error is null, it is forwarded. The value returned from the function becomes the value of the promise returned by the then function.
-         * @param onProgress The function to be called if the promise reports progress. Data about the progress is passed as the single argument. Promises are not required to support progress.
-         * @returns The promise whose value is the result of executing the onComplete function.
-        **/
-        then<U>(onComplete?: (value: T) => IPromise<U>, onError?: (error: any) => IPromise<U>, onProgress?: (progress: any) => void): IPromise<U>;
-
-        /**
-         * Allows you to specify the work to be done on the fulfillment of the promised value, the error handling to be performed if the promise fails to fulfill a value, and the handling of progress notifications along the way. For more information about the differences between then and done, see the following topics: Quickstart: using promises in JavaScript How to handle errors when using promises in JavaScript Chaining promises in JavaScript.
-         * @param onComplete The function to be called if the promise is fulfilled successfully with a value. The value is passed as the single argument. If the value is null, the value is returned. The value returned from the function becomes the fulfilled value of the promise returned by then. If an exception is thrown while this function is being executed, the promise returned by then moves into the error state.
-         * @param onError The function to be called if the promise is fulfilled with an error. The error is passed as the single argument. In different cases this object may be of different types, so it is necessary to test the object for the properties you expect. If the error is null, it is forwarded. The value returned from the function becomes the value of the promise returned by the then function.
-         * @param onProgress The function to be called if the promise reports progress. Data about the progress is passed as the single argument. Promises are not required to support progress.
-         * @returns The promise whose value is the result of executing the onComplete function.
-        **/
-        then<U>(onComplete?: (value: T) => IPromise<U>, onError?: (error: any) => U, onProgress?: (progress: any) => void): IPromise<U>;
-
-        /**
-         * Allows you to specify the work to be done on the fulfillment of the promised value, the error handling to be performed if the promise fails to fulfill a value, and the handling of progress notifications along the way. For more information about the differences between then and done, see the following topics: Quickstart: using promises in JavaScript How to handle errors when using promises in JavaScript Chaining promises in JavaScript.
-         * @param onComplete The function to be called if the promise is fulfilled successfully with a value. The value is passed as the single argument. If the value is null, the value is returned. The value returned from the function becomes the fulfilled value of the promise returned by then. If an exception is thrown while this function is being executed, the promise returned by then moves into the error state.
-         * @param onError The function to be called if the promise is fulfilled with an error. The error is passed as the single argument. In different cases this object may be of different types, so it is necessary to test the object for the properties you expect. If the error is null, it is forwarded. The value returned from the function becomes the value of the promise returned by the then function.
-         * @param onProgress The function to be called if the promise reports progress. Data about the progress is passed as the single argument. Promises are not required to support progress.
-         * @returns The promise whose value is the result of executing the onComplete function.
-        **/
-        then<U>(onComplete?: (value: T) => IPromise<U>, onError?: (error: any) => void, onProgress?: (progress: any) => void): IPromise<U>;
-
-        /**
-         * Allows you to specify the work to be done on the fulfillment of the promised value, the error handling to be performed if the promise fails to fulfill a value, and the handling of progress notifications along the way. For more information about the differences between then and done, see the following topics: Quickstart: using promises in JavaScript How to handle errors when using promises in JavaScript Chaining promises in JavaScript.
-         * @param onComplete The function to be called if the promise is fulfilled successfully with a value. The value is passed as the single argument. If the value is null, the value is returned. The value returned from the function becomes the fulfilled value of the promise returned by then. If an exception is thrown while this function is being executed, the promise returned by then moves into the error state.
-         * @param onError The function to be called if the promise is fulfilled with an error. The error is passed as the single argument. In different cases this object may be of different types, so it is necessary to test the object for the properties you expect. If the error is null, it is forwarded. The value returned from the function becomes the value of the promise returned by the then function.
-         * @param onProgress The function to be called if the promise reports progress. Data about the progress is passed as the single argument. Promises are not required to support progress.
-         * @returns The promise whose value is the result of executing the onComplete function.
-        **/
-        then<U>(onComplete?: (value: T) => U, onError?: (error: any) => IPromise<U>, onProgress?: (progress: any) => void): IPromise<U>;
-
-        /**
-         * Allows you to specify the work to be done on the fulfillment of the promised value, the error handling to be performed if the promise fails to fulfill a value, and the handling of progress notifications along the way. For more information about the differences between then and done, see the following topics: Quickstart: using promises in JavaScript How to handle errors when using promises in JavaScript Chaining promises in JavaScript.
-         * @param onComplete The function to be called if the promise is fulfilled successfully with a value. The value is passed as the single argument. If the value is null, the value is returned. The value returned from the function becomes the fulfilled value of the promise returned by then. If an exception is thrown while this function is being executed, the promise returned by then moves into the error state.
-         * @param onError The function to be called if the promise is fulfilled with an error. The error is passed as the single argument. In different cases this object may be of different types, so it is necessary to test the object for the properties you expect. If the error is null, it is forwarded. The value returned from the function becomes the value of the promise returned by the then function.
-         * @param onProgress The function to be called if the promise reports progress. Data about the progress is passed as the single argument. Promises are not required to support progress.
-         * @returns The promise whose value is the result of executing the onComplete function.
-        **/
-        then<U>(onComplete?: (value: T) => U, onError?: (error: any) => U, onProgress?: (progress: any) => void): IPromise<U>;
-
-        /**
-         * Allows you to specify the work to be done on the fulfillment of the promised value, the error handling to be performed if the promise fails to fulfill a value, and the handling of progress notifications along the way. For more information about the differences between then and done, see the following topics: Quickstart: using promises in JavaScript How to handle errors when using promises in JavaScript Chaining promises in JavaScript.
-         * @param onComplete The function to be called if the promise is fulfilled successfully with a value. The value is passed as the single argument. If the value is null, the value is returned. The value returned from the function becomes the fulfilled value of the promise returned by then. If an exception is thrown while this function is being executed, the promise returned by then moves into the error state.
-         * @param onError The function to be called if the promise is fulfilled with an error. The error is passed as the single argument. In different cases this object may be of different types, so it is necessary to test the object for the properties you expect. If the error is null, it is forwarded. The value returned from the function becomes the value of the promise returned by the then function.
-         * @param onProgress The function to be called if the promise reports progress. Data about the progress is passed as the single argument. Promises are not required to support progress.
-         * @returns The promise whose value is the result of executing the onComplete function.
-        **/
-        then<U>(onComplete?: (value: T) => U, onError?: (error: any) => void, onProgress?: (progress: any) => void): IPromise<U>;
-
-        /**
-         * Allows you to specify the work to be done on the fulfillment of the promised value, the error handling to be performed if the promise fails to fulfill a value, and the handling of progress notifications along the way. For more information about the differences between then and done, see the following topics: Quickstart: using promises in JavaScript How to handle errors when using promises in JavaScript Chaining promises in JavaScript.
-         * @param onComplete The function to be called if the promise is fulfilled successfully with a value. The value is passed as the single argument. If the value is null, the value is returned. The value returned from the function becomes the fulfilled value of the promise returned by then. If an exception is thrown while this function is being executed, the promise returned by then moves into the error state.
-         * @param onError The function to be called if the promise is fulfilled with an error. The error is passed as the single argument. In different cases this object may be of different types, so it is necessary to test the object for the properties you expect. If the error is null, it is forwarded. The value returned from the function becomes the value of the promise returned by the then function.
-         * @param onProgress The function to be called if the promise reports progress. Data about the progress is passed as the single argument. Promises are not required to support progress.
-         * @returns The promise whose value is the result of executing the onComplete function.
-        **/
-        then<U>(onComplete?: (value: T) => void, onError?: (error: any) => IPromise<U>, onProgress?: (progress: any) => void): IPromise<U>;
-
-        /**
-         * Allows you to specify the work to be done on the fulfillment of the promised value, the error handling to be performed if the promise fails to fulfill a value, and the handling of progress notifications along the way. For more information about the differences between then and done, see the following topics: Quickstart: using promises in JavaScript How to handle errors when using promises in JavaScript Chaining promises in JavaScript.
-         * @param onComplete The function to be called if the promise is fulfilled successfully with a value. The value is passed as the single argument. If the value is null, the value is returned. The value returned from the function becomes the fulfilled value of the promise returned by then. If an exception is thrown while this function is being executed, the promise returned by then moves into the error state.
-         * @param onError The function to be called if the promise is fulfilled with an error. The error is passed as the single argument. In different cases this object may be of different types, so it is necessary to test the object for the properties you expect. If the error is null, it is forwarded. The value returned from the function becomes the value of the promise returned by the then function.
-         * @param onProgress The function to be called if the promise reports progress. Data about the progress is passed as the single argument. Promises are not required to support progress.
-         * @returns The promise whose value is the result of executing the onComplete function.
-        **/
-        then<U>(onComplete?: (value: T) => void, onError?: (error: any) => U, onProgress?: (progress: any) => void): IPromise<U>;
-
-        /**
-         * Allows you to specify the work to be done on the fulfillment of the promised value, the error handling to be performed if the promise fails to fulfill a value, and the handling of progress notifications along the way. For more information about the differences between then and done, see the following topics: Quickstart: using promises in JavaScript How to handle errors when using promises in JavaScript Chaining promises in JavaScript.
-         * @param onComplete The function to be called if the promise is fulfilled successfully with a value. The value is passed as the single argument. If the value is null, the value is returned. The value returned from the function becomes the fulfilled value of the promise returned by then. If an exception is thrown while this function is being executed, the promise returned by then moves into the error state.
-         * @param onError The function to be called if the promise is fulfilled with an error. The error is passed as the single argument. In different cases this object may be of different types, so it is necessary to test the object for the properties you expect. If the error is null, it is forwarded. The value returned from the function becomes the value of the promise returned by the then function.
-         * @param onProgress The function to be called if the promise reports progress. Data about the progress is passed as the single argument. Promises are not required to support progress.
-         * @returns The promise whose value is the result of executing the onComplete function.
-        **/
-        then<U>(onComplete?: (value: T) => void, onError?: (error: any) => void, onProgress?: (progress: any) => void): IPromise<U>;
-
-
-        /**
-         * A static helper that functions identically to then() off a promise instance.
-         * @param promise The promise to chain from.
-         * @param onComplete The function to be called if the promise is fulfilled successfully with a value. The value is passed as the single argument. If the value is null, the value is returned. The value returned from the function becomes the fulfilled value of the promise returned by then. If an exception is thrown while this function is being executed, the promise returned by then moves into the error state.
-         * @param onError The function to be called if the promise is fulfilled with an error. The error is passed as the single argument. In different cases this object may be of different types, so it is necessary to test the object for the properties you expect. If the error is null, it is forwarded. The value returned from the function becomes the value of the promise returned by the then function.
-         * @param onProgress The function to be called if the promise reports progress. Data about the progress is passed as the single argument. Promises are not required to support progress.
-         * @returns The promise whose value is the result of executing the onComplete function.
-        **/
-        static then(promise: IPromise<any>, onComplete?: (value: any) => any, onError?: (error: any) => any, onProgress?: (progress: any) => void): IPromise<any>;
-
-        /**
-         * Performs an operation on all the input promises and returns a promise that has the shape of the input and contains the result of the operation that has been performed on each input.
-         * @param values A set of values (which could be either an array or an object) of which some or all are promises..
-         * @param complete The function to be called if the promise is fulfilled with a value. This function takes a single argument, which is the fulfilled value of the promise.
-         * @param error The function to be called if the promise is fulfilled with an error. This function takes a single argument, which is the error value of the promise.
-         * @param progress The function to be called if the promise reports progress. This function takes a single argument, which is the data about the progress of the promise. Promises are not required to support progress.
-         * @returns A Promise that is the result of calling join on the values parameter.
-        **/
-        static thenEach(values: any, complete?: (value: any) => void, error?: (error: any) => void, progress?: (progress: any) => void): IPromise<any>;
-
-        /**
-         * This method has two forms: WinJS.Promise.timeout(timeout) and WinJS.Promise.timeout(timeout, promise). WinJS.Promise.timeout(timeout) creates a promise that is completed asynchronously after the specified timeout, essentially wrapping a call to setTimeout within a promise. WinJS.Promise.timeout(timeout, promise) sets a timeout period for completion of the specified promise, automatically canceling the promise if it is not completed within the timeout period.
-         * @param timeout The timeout period in milliseconds. If this value is zero or not specified, msSetImmediate is called, otherwise setTimeout is called.
-         * @param promise Optional. A promise that will be canceled if it doesn't complete within the timeout period.
-         * @returns If the promise parameter is omitted, returns a promise that will be fulfilled after the timeout period. If the promise paramater is provided, the same promise is returned.
-        **/
-        static timeout(timeout?: number, promise?: IPromise<any>): IPromise<any>;
-
-        /**
-         * Wraps a non-promise value in a promise. This method is like wrapError, which allows you to produce a Promise in error conditions, in that it allows you to return a Promise in success conditions.
-         * @param value Some non-promise value to be wrapped in a promise.
-         * @returns A promise that is successfully fulfilled with the specified value.
-        **/
-        static wrap<U>(value?: U): IPromise<U>;
-
-        /**
-         * Wraps a non-promise error value in a promise. You can use this function if you need to pass an error to a function that requires a promise.
-         * @param error A non-promise error value to be wrapped in a promise.
-         * @returns A promise that is in an error state with the specified value.
-        **/
-        static wrapError<U>(error: U): IPromise<U>;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-    }
-
-    //#endregion Objects
-
-    //#region Functions
-
-    /**
-     * You can provide an implementation of this method yourself, or use WinJS.Utilities.startLog to create one that logs to the JavaScript console.
-     * @param message The message to log.
-     * @param tags The tag or tags to categorize the message (winjs, winjs controls, etc.).
-     * @param type The type of message (error, warning, info, etc.).
-    **/
-    function log(message: string, tags?: string, type?: string): void;
-    function log(message: () => string, tags?: string, type?: string): void;
-
-    /**
-     * Wraps calls to XMLHttpRequest in a promise.
-     * @param options The options that are applied to the XMLHttpRequest object, as follows: type, url, user, password, responseType, headers, data, customRequestInitializer.
-     * @returns A promise that returns the XMLHttpRequest object when it completes.
-    **/
-    function xhr(options: IXHROptions): Promise<XMLHttpRequest>;
-
-    //#endregion Functions
-
-    //#region Interfaces
-
-    interface IXHROptions {
-        type?: string;
-        url: string;
-        user?: string;
-        password?: string;
-        headers?: any;
-        data?: any;
-        responseType?: string;
-        customRequestInitializer?: (request: XMLHttpRequest) => void;
-    }
-
-    //#endregion Interfaces
-}
-/**
- * Provides helper functions for defining namespaces. For more information, see Organizing your code with WinJS.Namespace.
-**/
-declare namespace WinJS.Namespace {
-    //#region Functions
-
-    /**
-     * Defines a new namespace with the specified name. For more information, see Organizing your code with WinJS.Namespace.
-     * @param name The name of the namespace. This could be a dot-separated name for nested namespaces.
-     * @param members The members of the new namespace.
-     * @returns The newly-defined namespace.
-    **/
-    function define(name?: string, members?: any): any;
-
-    /**
-     * Defines a new namespace with the specified name under the specified parent namespace. For more information, see Organizing your code with WinJS.Namespace.
-     * @param parentNamespace The parent namespace.
-     * @param name The name of the new namespace.
-     * @param members The members of the new namespace.
-     * @returns The newly-defined namespace.
-    **/
-    function defineWithParent(parentNamespace?: any, name?: string, members?: any): any;
-
-    //#endregion Functions
-
-}
-/**
- * Provides functionality for dealing with basic navigation, including the navigation stack.
-**/
-declare namespace WinJS.Navigation {
-    //#region Properties
-
-    /**
-     * Determines whether it is possible to navigate backwards.
-    **/
-    var canGoBack: boolean;
-
-    /**
-     * Determines if it is possible to navigate forwards.
-    **/
-    var canGoForward: boolean;
-
-    /**
-     * Gets or sets the navigation history.
-    **/
-    var history: any;
-
-    /**
-     * Gets or sets the current location.
-    **/
-    var location: string;
-
-    /**
-     * Gets or sets a user-defined object that represents the state associated with the current location.
-    **/
-    var state: any;
-
-    //#endregion Properties
-
-    //#region Functions
-
-    /**
-     * Adds an event listener to the control.
-     * @param eventType The type (name) of the event.
-     * @param listener The listener to invoke when the event gets raised.
-     * @param capture If true, specifies that capture should be initiated, otherwise false.
-    **/
-    function addEventListener(eventType: string, listener: Function, capture?: boolean): void;
-
-    /**
-     * Navigates backwards.
-     * @param distance The number of entries to go back into the history.
-     * @returns A promise that is completed with a value that indicates whether or not the navigation was successful.
-    **/
-    function back(distance?: number): Promise<boolean>;
-
-    /**
-     * Navigates forwards.
-     * @param distance The number of entries to go forward.
-     * @returns A promise that is completed with a value that indicates whether or not the navigation was successful.
-    **/
-    function forward(distance?: number): Promise<boolean>;
-
-    /**
-     * Navigates to a location.
-     * @param location The location to navigate to. Generally the location is a string containing the URL, but it may be anything.
-     * @param initialState A user-defined object that represents the navigation state that may be accessed through state.
-     * @returns A promise that is completed with a value that indicates whether or not the navigation was successful (true if successful, otherwise false).
-    **/
-    function navigate(location: any, initialState?: any): Promise<boolean>;
-
-    /**
-     * Removes an event listener from the control.
-     * @param eventType The type (name) of the event.
-     * @param listener The listener to remove.
-     * @param useCapture Specifies whether or not to initiate capture.
-    **/
-    function removeEventListener(eventType: string, listener: Function, useCapture?: boolean): void;
-
-    //#endregion Functions
-
-    //#region Events
-
-    /**
-     * Occurs before navigation.
-     * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: location, state.
-    **/
-    function onbeforenavigate(eventInfo: CustomEvent): void;
-
-    /**
-     * Occurs after navigation has taken place.
-     * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: location, state.
-    **/
-    function onnavigated(eventInfo: CustomEvent): void;
-
-    /**
-     * Occurs when navigation is taking place.
-     * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: location, state.
-    **/
-    function onnavigating(eventInfo: CustomEvent): void;
-
-    //#endregion Events
-
-}
-/**
- * Provides functions for accessing resources and localizing content.
-**/
-declare namespace WinJS.Resources {
-    //#region Functions
-
-    /**
-     * Registers an event handler for the specified event. Use this method to register for events that are related to resources, such as when the app's language, scale, or contrast changes.
-     * @param type The name of the event to handle.
-     * @param listener The listener (event handler function) to associate with the event.
-     * @param useCapture Set to true to register the listener for the capturing phase; otherwise, set to false to register the listener for the bubbling phase.
-    **/
-    function addEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-    /**
-     * Raises an event of the specified type and with the specified additional properties.
-     * @param type The name of the event to raise.
-     * @param details The set of additional properties to attach to the event object.
-    **/
-    function dispatchEvent(type: string, details: any): void;
-
-    /**
-     * Retrieves the resource string that has the specified resource identifier.
-     * @param resourceId The resource ID of the string to retrieve.
-     * @returns An object that can contain these properties: value, empty, lang.
-    **/
-    function getString(resourceId: string): { value: string; empty?: boolean; lang?: string; };
-
-    /**
-     * Processes data-win-res attributes on elements and replaces attributes and properties with resource strings.
-     * @param rootElement The element to process. The element and its child elements will be processed. If an element isn't specified, the entire document is processed.
-    **/
-    function processAll(rootElement?: HTMLElement): Promise<void>;
-
-    /**
-     * Removes an event listener that the addEventListener method registered.
-     * @param type The name of the event that the event listener is registered for.
-     * @param listener The listener (event handler function) to remove.
-     * @param useCapture Set to true to remove the capturing phase listener; set to false to remove the bubbling phase listener.
-    **/
-    function removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-    //#endregion Functions
-
-    //#region Events
-
-    /**
-     * Occurs when the user changes the system's language or contrast, or the scale of the display, or when the user changes any of the items in the current context's qualifier values list. For more info about the current context's qualifier values list, see the Remarks section.
-     * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.qualifier, detail.changed.
-    **/
-    function oncontextchanged(eventInfo: CustomEvent): void;
-
-    //#endregion Events
-
-}
-/**
- * Provides access to the Windows animations. These functions provide developers with the ability to use animations in their custom controls that are consistent with animations used by Windows controls.
-**/
-declare namespace WinJS.UI.Animation {
-    //#region Functions
-
-    /**
-     * Creates an object that performs an animation that adds an item or items to a list.
-     * @param added Element or elements to add to the list.
-     * @param affected Element or elements affected by the added items. Typically, this is all other items displayed in the list.
-     * @returns An object whose execute method is used to execute the animation. The execute method returns a Promise that completes when the animation is finished.
-    **/
-    function createAddToListAnimation(added: any, affected: any): IAnimationMethodResponse;
-
-    /**
-     * Creates an object that performs an animation that adds an item or items to a list of search results.
-     * @param added Element or elements to add to the list.
-     * @param affected Element or elements affected by the added items. Typically, this is all other items displayed in the list.
-     * @returns An object whose execute method is used to execute the animation. The execute method returns a Promise that completes when the animation is finished.
-    **/
-    function createAddToSearchListAnimation(added: any, affected: any): IAnimationMethodResponse;
-
-    /**
-     * Creates an object that performs an animation that collapses a list.
-     * @param hidden Element or elements hidden as a result of the collapse.
-     * @param affected Element or elements affected by the hidden items. Typically, this is all other items displayed in the list.
-     * @returns An object whose execute method is used to execute the animation. The execute method returns a Promise that completes when the animation is finished.
-    **/
-    function createCollapseAnimation(hidden: any, affected: any): IAnimationMethodResponse;
-
-    /**
-     * Creates an object that performs an animation that removes an item or items from a list.
-     * @param deleted Element or elements to delete from the list.
-     * @param remaining Element or elements affected by the removal of the deleted items. Typically, this is all other items displayed in the list.
-     * @returns An object whose execute method is used to execute the animation. The execute method returns a Promise that completes when the animation is finished.
-    **/
-    function createDeleteFromListAnimation(deleted: any, remaining: any): IAnimationMethodResponse;
-
-    /**
-     * Creates an object that performs an animation that removes an item or items from a list of search results.
-     * @param deleted Element or elements to delete from the list.
-     * @param remaining Element or elements affected by the removal of the deleted items. Typically, this is all other items displayed in the list.
-     * @returns An object whose execute method is used to execute the animation. The execute method returns a Promise that completes when the animation is finished.
-    **/
-    function createDeleteFromSearchListAnimation(deleted: any, remaining: any): IAnimationMethodResponse;
-
-    /**
-     * Creates an object that performs an animation that expands a list.
-     * @param revealed Element or elements revealed by the expansion.
-     * @param affected Element or elements affected by the newly revealed items. Typically, this is all other items displayed in the list.
-     * @returns An object whose execute method is used to execute the animation. The execute method returns a Promise that completes when the animation is finished.
-    **/
-    function createExpandAnimation(revealed: any, affected: any): IAnimationMethodResponse;
-
-    /**
-     * Creates an exit and entrance animation to play for a page navigation given the current and incoming pages'
-     * animation preferences and whether the pages are navigating forwards or backwards.
-     * @param currentPreferredAnimation A value from WinJS.UI.PageNavigationAnimation describing the animation the current page prefers to use.
-     * @param A value from nextPreferredAnimation WinJS.UI.PageNavigationAnimation describing the animation the incoming page prefers to use.
-     * @param movingBackwards Boolean value for whether the navigation is moving backwards.
-     * @returns an object containing the exit and entrance animations to play based on the parameters given.
-    **/
-    function createPageNavigationAnimations(currentPreferredAnimation: string, nextPreferredAnimation: string, movingBackwards: boolean): { exit: Function; entrance: Function };
-
-    /**
-     * Creates an object that performs a peek animation.
-     * @param element Element or elements involved in the peek.
-     * @returns An object whose execute method is used to execute the animation. The execute method returns a Promise that completes when the animation is finished.
-    **/
-    function createPeekAnimation(element: any): IAnimationMethodResponse;
-
-    /**
-     * Creates an object that performs an animation that moves an item or items.
-     * @param element Element or elements involved in the reposition.
-     * @returns An object whose execute method is used to execute the animation. The execute method returns a Promise object that completes when the animation is finished.
-    **/
-    function createRepositionAnimation(element: any): IAnimationMethodResponse;
-
-    /**
-     * Performs an animation that fades an item or items in, fading out existing items that occupy the same space.
-     * @param incoming Element or elements being faded in.
-     * @param outgoing Element or elements being replaced.
-     * @returns An object that completes when the animation has finished.
-    **/
-    function crossFade(incoming: any, outgoing: any): Promise<any>;
-
-    /**
-     * Performs an animation when a dragged object is moved such that dropping it in that position would move other items. The potentially affected items are animated out of the way to show where the object would be dropped.
-     * @param target Element or elements that the dragged object would cause to be moved if it were dropped.
-     * @param offset Initial offsets where the animated objects begin relative to their final position at the end of the animation. Set this parameter to null to use the recommended default offset. Note When the incoming parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
-     * @returns An object that completes when the animation is finished.
-    **/
-    function dragBetweenEnter(target: any, offset?: any): Promise<any>;
-
-    /**
-     * Performs an animation when a dragged object is moved away from items that it had previously involved in a dragBetweenEnter animation. The affected objects are animated back to their original positions.
-     * @param target Element or elements that the dragged object would no longer cause to be displaced, due to its moving away. This should be the same element or element collection passed as the target parameter in the dragBetweenEnter animation.
-     * @returns An object that completes when the animation is finished.
-    **/
-    function dragBetweenLeave(target: any): Promise<any>;
-
-    /**
-     * Performs an animation when the user finishes dragging an object.
-     * @param dragSource Element or elements that were dragged.
-     * @param offset Initial offset from the drop point. The dropped object begins at the offset and animates to its final position at the drop point. Note When the element parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
-     * @param affected Element or elements whose position the dropped object affects. Typically, this is all other items in a reorderable list. This should be the same element or element collection passed as the affected parameter in the dragSourceStart animation.
-     * @returns An object that completes when the animation is finished.
-    **/
-    function dragSourceEnd(dragSource: any, offset?: any, affected?: any): Promise<any>;
-
-    /**
-     * Performs an animation when the user begins to drag an object.
-     * @param dragSource Element or elements being dragged.
-     * @param affected Element or elements whose position is affected by the movement of the dragged object. Typically, this is all other items in a reorderable list.
-     * @returns An object that completes when the animation is finished.
-    **/
-    function dragSourceStart(dragSource: any, affected?: any): Promise<any>;
-
-    /**
-     * Execute the incoming phase of the drill in animation, scaling up the incoming page while fading it in.
-     * @param incomingPage Element to be scaled up and faded in.
-     * @returns Promise object that completes when the animation is complete.
-    **/
-    function drillInIncoming(incomingPage: HTMLElement): Promise<any>;
-
-    /**
-     * Execute the outgoing phase of the drill in animation, scaling up the outgoing page while fading it out.
-     * @param incomingPage Element to be scaled up and faded out.
-     * @returns Promise object that completes when the animation is complete.
-    **/
-    function drillInOutgoing(outgoingPage: HTMLElement): Promise<any>;
-
-    /**
-     * Execute the incoming phase of the drill out animation, scaling down the incoming page while fading it in.
-     * @param incomingPage Element to be scaled up and faded in.
-     * @returns Promise object that completes when the animation is complete.
-    **/
-    function drillOutIncoming(incomingPage: HTMLElement): Promise<any>;
-
-    /**
-     * Execute the outgoing phase of the drill out animation, scaling down the outgoing page while fading it out.
-     * @param outgoingPage Element to be scaled down and faded out.
-     * @returns Promise object that completes when the animation is complete.
-    **/
-    function drillOutOutgoing(outgoingPage: HTMLElement): Promise<any>;
-
-    /**
-     * Performs an animation that displays one or more elements on a page.
-     * @param incoming Element or elements that compose the incoming content.
-     * @param offset Initial offsets where the animated objects begin relative to their final position at the end of the animation. Set this parameter to null to use the recommended default offset. Note When the incoming parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
-     * @param options Optional. Set this value to { mechanism: "transition" } to play the animation using CSS transitions instead of the default CSS animations. In some cases this can result in improved performance.
-     * @returns An object that completes when the animation is finished.
-    **/
-    function enterContent(incoming: any, offset?: any, options?: any): Promise<any>;
-
-    /**
-     * Performs an animation that shows a new page of content, either when transitioning between pages in a running app or when displaying the first content in a newly launched app.
-     * @param element Element or an array of elements that represent the content. If element refers to an array of elements, the elements enter in array order.
-     * @param offset An initial offset where the element or elements begin relative to their final position at the end of the animation. Set this parameter to null to use the recommended default offset. Note When the element parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
-     * @returns An object that completes when the animation is finished.
-    **/
-    function enterPage(element: any, offset?: any): Promise<any>;
-
-    /**
-     * Performs an animation that hides one or more elements on a page.
-     * @param outgoing Element or elements that compose the outgoing content.
-     * @param offset Initial offsets where the animated objects begin relative to their final position at the end of the animation. Set this parameter to null to use the recommended default offset. Note When the incoming parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
-     * @returns An object that completes when the animation is finished.
-    **/
-    function exitContent(outgoing: any, offset?: any): Promise<any>;
-
-    /**
-     * Performs an animation that dismisses the current page when transitioning between pages in an app.
-     * @param outgoing Element or elements that compose the outgoing page.
-     * @param offset Initial offsets where the animated objects begin relative to their final position at the end of the animation. Set this parameter to null to use the recommended default offset. Note When the incoming parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
-     * @returns An object that completes when the animation is finished.
-    **/
-    function exitPage(outgoing: any, offset?: any): Promise<any>;
-
-    /**
-     * Performs an animation that fades an item or set of items into view.
-     * @param shown Element or elements being faded in.
-     * @returns An object that completes when the animation has finished. Use this object when subsequent actions need this animation to finish before they take place.
-    **/
-    function fadeIn(shown: any): Promise<any>;
-
-    /**
-     * Performs an animation that fades an item or set of items out of view.
-     * @param hidden Element or elements being faded out.
-     * @returns An object that completes when the animation is finished.
-    **/
-    function fadeOut(hidden: any): Promise<any>;
-
-    /**
-     * Performs an animation that hides edge-based user interface (UI).
-     * @param element Element or elements that are being hidden.
-     * @param offset Initial offsets where the animated objects begin relative to their final position at the end of the animation. Offsets should be the chosen so that the elements end the animation just off-screen. Note When the element parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
-     * @param options Optional. Set this value to { mechanism: "transition" } to play the animation using CSS transitions instead of the default CSS animations. In some cases this can result in improved performance.
-     * @returns An object that completes when the animation is finished.
-    **/
-    function hideEdgeUI(element: any, offset?: any, options?: any): Promise<any>;
-
-    /**
-     * Performs an animation that hides a panel.
-     * @param element Element or elements that are being hidden.
-     * @param offset Initial offsets where the animated objects begin relative to their final position at the end of the animation. Offsets should be the chosen so that the elements end the animation just off-screen. Note When the element parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
-     * @returns An object that completes when the animation is finished.
-    **/
-    function hidePanel(element: any, offset?: any): Promise<any>;
-
-    /**
-     * Performs an animation that removes pop-up user interface (UI).
-     * @param element Element or elements that are being hidden.
-     * @returns An object that completes when the animation is finished.
-    **/
-    function hidePopup(element: any): Promise<any>;
-
-    /**
-     * Performs an animation when a pointer is pressed on an object.
-     * @param element Element or elements on which the pointer is pressed.
-     * @returns An object that completes when the animation is finished.
-    **/
-    function pointerDown(element: any): Promise<any>;
-
-    /**
-     * Performs an animation when a pointer is released.
-     * @param element Element or elements that the pointer was pressed on.
-     * @returns An object that completes when the animation is finished.
-    **/
-    function pointerUp(element: any): Promise<any>;
-
-    /**
-     * Performs an animation that slides a narrow, edge-based user interface (UI) into view.
-     * @param element Element or elements that are being shown.
-     * @param offset Initial offsets where the animated objects begin relative to their final position at the end of the animation. Offsets should be the chosen so that the elements begin the animation from just off-screen. Note When the element parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
-     * @param options Optional. Set this value to { mechanism: "transition" } to play the animation using CSS transitions instead of the default CSS animations. In some cases this can result in improved performance.
-     * @returns An object that completes when the animation is finished.
-    **/
-    function showEdgeUI(element: any, offset?: any, options?: any): Promise<any>;
-
-    /**
-     * Performs an animation that slides a large panel user interface (UI) into view.
-     * @param element Element or elements that are being shown.
-     * @param offset Initial offsets where the animated objects begin relative to their final position at the end of the animation. Offsets should be the chosen so that the elements begin the animation from just off-screen. Note When the element parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
-     * @returns An object that completes when the animation is finished.
-    **/
-    function showPanel(element: any, offset?: any): Promise<any>;
-
-    /**
-     * Performs an animation that displays a pop-up user interface (UI).
-     * @param element Element or elements that are being shown.
-     * @param offset Initial offsets where the animated objects begin relative to their final position at the end of the animation. Offsets should be the chosen so that the elements begin the animation from just off-screen. Set this parameter to null to use the recommended default offset. Note When the element parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
-     * @returns An object that completes when the animation is finished.
-    **/
-    function showPopup(element: any, offset?: any): Promise<any>;
-
-    /**
-     * Performs a deselection animation in response to a swipe interaction.
-     * @param deselected Element or elements that become unselected.
-     * @param selection Element or elements that represent the selection, typically a check mark.
-     * @returns An object that completes when the animation is finished.
-    **/
-    function swipeDeselect(deselected: any, selection: any): Promise<any>;
-
-    /**
-     * Performs an animation that reveals an item or items in response to a swipe interaction.
-     * @param target Element or elements being revealed.
-     * @param offset An initial offset where the animated objects begin relative to their final position at the end of the animation. Set this parameter to null to use the recommended default offset. Note When the incoming parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
-     * @returns An object that completes when the animation is finished.
-    **/
-    function swipeReveal(target: any, offset?: any): Promise<any>;
-
-    /**
-     * Performs a selection animation in response to a swipe interaction.
-     * @param selected Element or elements being selected.
-     * @param selection Element or elements that show that something is selected, typically a check mark.
-     * @returns An object that completes when the animation is finished.
-    **/
-    function swipeSelect(selected: any, selection: any): Promise<any>;
-
-    /**
-     * Performs an animation that updates a badge.
-     * @param incoming Element or elements that comprise the new badge.
-     * @param offset Initial offsets where incoming animated objects begin relative to their final position at the end of the animation. Set this parameter to null to use the recommended default offset. Note When the incoming parameter specifies an array of elements, the offset parameter can specify an offset array with each item specified for its corresponding element array item. If the array of offsets is smaller than the array of elements, the last offset is applied to all remaining elements.
-     * @returns An object that completes when the animation is finished.
-    **/
-    function updateBadge(incoming: any, offset?: any): Promise<any>;
-
-    /**
-     * Execute a slide up animation.
-     * @param incoming Single element or collection of elements to animate sliding up.
-     * @returns A Promise that completes when the animation is finished.
-    **/
-    function slideUp(incoming: any): Promise<any>;
-
-    /**
-     * Execute a slide down animation.
-     * @param incoming Single element or collection of elements to animate sliding down.
-     * @returns A Promise that completes when the animation is finished.
-    **/
-    function slideDown(incoming: any): Promise<any>;
-
-    /**
-     * Execute a slide in from right to left animation.
-     * @param page The page containing all elements to slide.
-     * @param first First element or collection of elements to animate sliding in.
-     * @param second Second element or collection of elements to animate sliding in, which will be offset slightly farther than the first.
-     * @param third Third element or collection of elements to animate sliding in, which will be offset slightly farther than the second.
-     * @returns A Promise that completes when the animation is finished.
-    **/
-    function slideLeftIn(page: any, first: any, second: any, third: any): Promise<any>;
-
-    /**
-     * Execute a slide out from right to left animation.
-     * @param page The page containing all elements to slide.
-     * @param first First element or collection of elements to animate sliding out.
-     * @param second Second element or collection of elements to animate sliding out, which will be offset slightly farther than the first.
-     * @param third Third element or collection of elements to animate sliding out, which will be offset slightly farther than the second.
-     * @returns A Promise that completes when the animation is finished.
-    **/
-    function slideLeftOut(page: any, first: any, second: any, third: any): Promise<any>;
-
-    /**
-     * Execute a slide in from left to right animation.
-     * @param page The page containing all elements to slide.
-     * @param first First element or collection of elements to animate sliding in.
-     * @param second Second element or collection of elements to animate sliding in, which will be offset slightly farther than the first.
-     * @param third Third element or collection of elements to animate sliding in, which will be offset slightly farther than the second.
-     * @returns A Promise that completes when the animation is finished.
-    **/
-    function slideRightIn(page: any, first: any, second: any, third: any): Promise<any>;
-
-    /**
-     * Execute a slide out from left to right animation.
-     * @param page The page containing all elements to slide.
-     * @param first First element or collection of elements to animate sliding out.
-     * @param second Second element or collection of elements to animate sliding out, which will be offset slightly farther than the first.
-     * @param third Third element or collection of elements to animate sliding out, which will be offset slightly farther than the second.
-     * @returns A Promise that completes when the animation is finished.
-    **/
-    function slideRightOut(page: any, first: any, second: any, third: any): Promise<any>;
-
-    /**
-     * Execute a continuum animation, scaling up the incoming page while scaling, rotating, and translating the incoming item.
-     * @param page Single element to be scaled up that is the page root and does not contain the incoming item.
-     * @param itemRoot Root of the item that will be translated as part of the continuum animation.
-     * @param itemContent Content of the item that will be scaled and rotated as part of the continuum animation.
-     * @returns A Promise that completes when the animation is finished.
-    **/
-    function continuumForwardIn(page: any, itemRoot: any, itemContent: any): Promise<any>;
-
-    /**
-     * Execute a continuum animation, scaling down the outgoing page while scaling, rotating, and translating the outgoing item.
-     * @param page Single element to be scaled down that is the page root and contains the outgoing item.
-     * @param item Single element to be scaled, rotated, and translated away from the outgoing page.
-     * @returns A Promise that completes when the animation is finished.
-    **/
-    function continuumForwardOut(page: any, item: any): Promise<any>;
-
-    /**
-     * Execute a continuum animation, scaling down the incoming page while scaling, rotating, and translating the incoming item.
-     * @param page Single element to be scaled down that is the page root and contains the incoming item.
-     * @param item Single element to be scaled, rotated, and translated into its final position on the page.
-     * @returns A Promise that completes when the animation is finished.
-    **/
-    function continuumBackwardIn(page: any, item: any): Promise<any>;
-
-    /**
-     * Execute a continuum animation, scaling down the outgoing page while.
-     * @param page Single element to be scaled down that is the page root.
-     * @returns A Promise that completes when the animation is finished.
-    **/
-    function continuumBackwardOut(page: any): Promise<any>;
-
-    /**
-     * Execute a turnstile forward in animation.
-     * @param incoming Single element or collection of elements to animate.
-     * @returns A Promise that completes when the animation is finished.
-    **/
-    function turnstileForwardIn(incoming: any): Promise<any>;
-
-    /**
-     * Execute a turnstile forward out animation.
-     * @param outgoing Single element or collection of elements to animate.
-     * @returns A Promise that completes when the animation is finished.
-    **/
-    function turnstileForwardOut(outgoing: any): Promise<any>;
-
-    /**
-     * Execute a turnstile backward in animation.
-     * @param incoming Single element or collection of elements to animate.
-     * @returns A Promise that completes when the animation is finished.
-    **/
-    function turnstileBackwardIn(incoming: any): Promise<any>;
-
-    /**
-     * Execute a turnstile backward out animation.
-     * @param outgoing Single element or collection of elements to animate.
-     * @returns A Promise that completes when the animation is finished.
-    **/
-    function turnstileBackwardOut(outgoing: any): Promise<any>;
-
-
-    //#endregion Functions
-
-    //#region Interfaces
-
-    interface IAnimationMethodResponse {
-        execute(): Promise<any>;
-    }
-
-    //#endregion Interfaces
-
-}
-/**
- * Provides controls and objects that manipulate data.
-**/
-declare namespace WinJS.UI {
-    //#region Enumerations
-
-    /**
-     * Specifies an icon that appears in an AppBarCommand object.
-    **/
-    enum AppBarIcon {
-        previous,
-        next,
-        play,
-        pause,
-        edit,
-        save,
-        clear,
-        delete,
-        remove,
-        add,
-        cancel,
-        accept,
-        more,
-        redo,
-        undo,
-        home,
-        up,
-        forward,
-        right,
-        back,
-        left,
-        favorite,
-        camera,
-        settings,
-        video,
-        sync,
-        download,
-        mail,
-        find,
-        help,
-        upload,
-        emoji,
-        twopage,
-        leavechat,
-        mailforward,
-        clock,
-        send,
-        crop,
-        rotatecamera,
-        people,
-        closepane,
-        openpane,
-        world,
-        flag,
-        previewlink,
-        globe,
-        trim,
-        attachcamera,
-        zoomin,
-        bookmarks,
-        document,
-        protecteddocument,
-        page,
-        bullets,
-        comment,
-        mail2,
-        contactinfo,
-        hangup,
-        viewall,
-        mappin,
-        phone,
-        videochat,
-        switch,
-        contact,
-        rename,
-        pin,
-        musicinfo,
-        go,
-        keyboard,
-        dockleft,
-        dockright,
-        dockbottom,
-        remote,
-        refresh,
-        rotate,
-        shuffle,
-        list,
-        shop,
-        selectall,
-        orientation,
-        import,
-        importall,
-        browsephotos,
-        webcam,
-        pictures,
-        savelocal,
-        caption,
-        stop,
-        showresults,
-        volume,
-        repair,
-        message,
-        page2,
-        calendarday,
-        calendarweek,
-        calendar,
-        characters,
-        mailreplyall,
-        read,
-        link,
-        accounts,
-        showbcc,
-        hidebcc,
-        cut,
-        attach,
-        paste,
-        filter,
-        copy,
-        emoji2,
-        important,
-        mailreply,
-        slideshow,
-        sort,
-        manage,
-        allapps,
-        disconnectdrive,
-        mapdrive,
-        newwindow,
-        openwith,
-        contactpresence,
-        priority,
-        uploadskydrive,
-        gototoday,
-        font,
-        fontcolor,
-        contact2,
-        folder,
-        audio,
-        placeholder,
-        view,
-        setlockscreen,
-        settile,
-        cc,
-        stopslideshow,
-        permissions,
-        highlight,
-        disableupdates,
-        unfavorite,
-        unpin,
-        openlocal,
-        mute,
-        italic,
-        underline,
-        bold,
-        movetofolder,
-        likedislike,
-        dislike,
-        like,
-        alignright,
-        aligncenter,
-        alignleft,
-        zoom,
-        zoomout,
-        openfile,
-        otheruser,
-        admin,
-        street,
-        map,
-        clearselection,
-        fontdecrease,
-        fontincrease,
-        fontsize,
-        cellphone,
-        reshare,
-        tag,
-        repeatone,
-        repeatall,
-        outlinestar,
-        solidstar,
-        calculator,
-        directions,
-        target,
-        library,
-        phonebook,
-        memo,
-        microphone,
-        postupdate,
-        backtowindow,
-        fullscreen,
-        newfolder,
-        calendarreply,
-        unsyncfolder,
-        reporthacked,
-        syncfolder,
-        blockcontact,
-        switchapps,
-        addfriend,
-        touchpointer,
-        gotostart,
-        zerobars,
-        onebar,
-        twobars,
-        threebars,
-        fourbars,
-        scan,
-        preview,
-        hamburger
-    }
-
-    /**
-     * Indicates whether the IListDataAdapter was able to provide a count.
-    **/
-    enum CountResult {
-        /**
-         * Indicates no count is available.
-        **/
-        unknown
-    }
-
-    /**
-     * Indicates that the IListDataAdapter was unable to provide a count.
-    **/
-    enum CountError {
-        /**
-         * An attempt to count items timed out.
-        **/
-        noResponse
-    }
-
-    /**
-     * Describes the status of an IListDataSource.
-    **/
-    enum DataSourceStatus {
-        /**
-         * The IListDataSource is ready.
-        **/
-        ready,
-        /**
-         * The IListDataSource is still loading.
-        **/
-        waiting,
-        /**
-         * The IListDataSource failed to load.
-        **/
-        failure
-    }
-
-    /**
-     * Specifies the type of error that occurred during an edit operation on a IListDataSource or an IListDataAdapter.
-    **/
-    enum EditError {
-        /**
-         * The edit operation timed out.
-        **/
-        noResponse,
-        /**
-         * The edit operation was canceled.
-        **/
-        canceled,
-        /**
-         * The data source cannot be written to.
-        **/
-        notPermitted,
-        /**
-         * The item has changed.
-        **/
-        noLongerMeaningful
-    }
-
-    /**
-     * Specifies the type of error encountered when retrieving items from an IListDataAdapter.
-    **/
-    enum FetchError {
-        /**
-         * The fetch operation timed out.
-        **/
-        noResponse,
-        /**
-         * The specified item could not be located.
-        **/
-        doesNotExist
-    }
-
-    /**
-     * Specifies how group headers in a ListView respond to the tap interaction.
-    **/
-    enum GroupHeaderTapBehavior {
-        /**
-         * The group is invoked.
-        **/
-        invoke,
-        /**
-         * Nothing happens.
-        **/
-        none
-    }
-
-    /**
-     * Specifies the position of group headers relative to their items in a ListView.
-    **/
-    enum HeaderPosition {
-        /**
-         * Group headers appear to the left of items.
-        **/
-        left,
-        /**
-         * Group headers appear above items.
-        **/
-        top
-    }
-
-    /**
-     * Specifies that type of animation for which a contentanimating event was raised.
-    **/
-    enum ListViewAnimationType {
-        /**
-         * The animation plays when the ListView is first displayed.
-        **/
-        entrance,
-        /**
-         * The animation plays when the ListView is changing its content.
-        **/
-        contentTransition
-    }
-
-    /**
-     * Describes the type of object in a ListView.
-    **/
-    enum ObjectType {
-        /**
-         * The object is a group header in the list.
-        **/
-        groupHeader,
-        /**
-         * The object is an item in the list.
-        **/
-        item,
-        /**
-         * The object is the header for the list.
-        **/
-        header,
-        /**
-         * The object is the footer for the list.
-        **/
-        footer
-    }
-
-    /**
-     * Specifies the orientation of a control.
-    **/
-    enum Orientation {
-        /**
-         * A horizontal layout.
-        **/
-        horizontal,
-        /**
-         * A vertical layout.
-        **/
-        vertical
-    }
-
-    /**
-     * Specifies the selection mode of a ListView.
-    **/
-    enum SelectionMode {
-        /**
-         * Items cannot be selected.
-        **/
-        none,
-        /**
-         * A single item may be selected.
-        **/
-        single,
-        /**
-         * Multiple items may be selected. Clicking additional items adds them to the selection.
-        **/
-        multi
-    }
-
-    /**
-     * Specifies whether elements are selected when the user performs a swipe interaction.
-    **/
-    enum SwipeBehavior {
-        /**
-         * The swipe interaction selects the elements touched by the swipe.
-        **/
-        select,
-        /**
-         * The swipe interaction does not change which elements are selected.
-        **/
-        none
-    }
-
-    /**
-     * Specifies how items in a ListView respond to the tap interaction.
-    **/
-    enum TapBehavior {
-        /**
-         * The item is selected and invoked.
-        **/
-        directSelect,
-        /**
-         * The item is selected if was not already selected, and its deselected if it was already selected.
-        **/
-        toggleSelect,
-        /**
-         * The item is invoked but not selected.
-        **/
-        invokeOnly,
-        /**
-         * Nothing happens.
-        **/
-        none
-    }
-
-    /**
-     * Specifies what animation type should be returned by WinJS.UI.Animation.createPageNavigationAnimations.
-    **/
-    enum PageNavigationAnimation {
-        /**
-         * The pages will exit and enter using a turnstile animation.
-        **/
-        turnstile,
-        /**
-         * The pages will exit and enter using an animation that slides up/down.
-        **/
-        slide,
-        /**
-         * The pages will enter using an enterPage animation, and exit with no animation.
-        **/
-        enterPage,
-        /**
-         * The pages will exit and enter using a continuum animation.
-        **/
-        continuum,
-    }
-
-    //#endregion Enumerations
-
-    //#region Interfaces
-
-    /**
-     * Define the shape of a Command object to be used in AppBar and ToolBar controls.
-    **/
-    export interface ICommand {
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param type The event type to register.
-         * @param listener The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-        /**
-         * Releases resources held by this ICommand. Call this method when the ICommand is no longer needed. After calling this method, the ICommand becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param type The event type to unregister.
-         * @param listener The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets a value that indicates whether the ICommand is disabled.
-        **/
-        disabled: boolean;
-
-        /**
-         * Gets the DOM element that hosts the ICommand.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Adds an extra CSS class during construction.
-        **/
-        extraClass: string;
-
-        /**
-         * Gets or sets the HTMLElement with a 'content' type ICommand that should receive focus whenever focus moves by the user pressing HOME or the arrow keys, from the previous ICommand to this ICommand.
-        **/
-        firstElementFocus: HTMLElement;
-
-        /**
-         * Gets or sets the Flyout object displayed by this command. The specified flyout is shown when the ICommand's button is invoked.
-        **/
-        flyout: Flyout;
-
-        /**
-         * Gets or sets a value that indicates whether the ICommand is hiding or in the process of becoming hidden.
-        **/
-        hidden: boolean;
-
-        /**
-         * Gets or sets the icon of the ICommand.
-        **/
-        icon: string;
-
-        /**
-         * Gets the element identifier (ID) of the command.
-        **/
-        id: string;
-
-        /**
-         * Gets or sets the label of the command.
-        **/
-        label: string;
-
-        /**
-         * Gets or sets the HTMLElement with a 'content' type ICommand that should receive focus whenever focus moves by the user pressing END or the arrow keys, from the previous Command to this Command.
-        **/
-        lastElementFocus: HTMLElement;
-
-        /**
-         * Gets or sets the function to be invoked when the command is clicked.
-        **/
-        onclick: Function;
-
-        /**
-         * Gets the section of the parent control that the command is in. The section can only be set through constructor options.
-        **/
-        section: string;
-
-        /**
-         * Gets or sets the selected state of a toggle button.
-        **/
-        selected: boolean;
-
-        /**
-         * Gets or sets the tooltip of the command.
-        **/
-        tooltip: string;
-
-        /**
-         * Gets the type of the command. The type can only be set through constructor options.
-        **/
-        type: string;
-
-        /**
-          * Gets or sets the priority of the command.
-         **/
-        priority: number;
-
-        //#endregion Properties
-    }
-
-
-    /**
-     * Contains items that were requested from an IListDataAdapter and provides some information about those items.
-    **/
-    interface IFetchResult<T> {
-        //#region Properties
-
-        /**
-         * Gets or sets the index of the requested item in the IListDataAdapter object's data source.
-        **/
-        absoluteIndex: number;
-
-        /**
-         * Gets or sets a value that indicates whether this IFetchResult contains the last items at the end of the IListDataAdapter object's data source.
-        **/
-        atEnd: boolean;
-
-        /**
-         * Gets or sets a value that indicates whether this IFetchResult contains the first items at the beginning of the IListDataAdapter object's data source.
-        **/
-        atStart: boolean;
-
-        /**
-         * Gets or sets the items returned by the fetch operation.
-        **/
-        items: T[];
-
-        /**
-         * Gets or sets the location of the requested item within the items array.
-        **/
-        offset: number;
-
-        /**
-         * Gets or sets the number of items in the IListDataAdapter object's underlying data source.
-        **/
-        totalCount: number;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Represents an item in a list.
-    **/
-    interface IItem<T> {
-        //#region Properties
-
-        /**
-         * Gets or sets the item's data.
-        **/
-        data: T;
-
-        /**
-         * Gets the group key for the item. This property is only available for items that belong to a grouped data source.
-        **/
-        groupKey: string;
-
-        /**
-         * Gets the temporary ID of the item.
-        **/
-        handle: string;
-
-        /**
-         * Gets the item's index in the IListDataSource.
-        **/
-        index: number;
-
-        /**
-         * Gets or sets the key the identifies the item.
-        **/
-        key: string;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Provides a mechanism for retrieving IItem objects asynchronously.
-    **/
-    interface IItemPromise<T> extends IPromise<T> {
-
-        //#region Methods
-
-        /**
-         * Stops change notification tracking for the IItem that fulfills this IItemPromise.
-        **/
-        release(): void;
-
-        /**
-         * Begins change notification tracking for the IItem that fulfills this IItemPromise.
-        **/
-        retain(): IItemPromise<T>;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets the temporary ID of the IItem that fulfills this promise.
-        **/
-        handle: string;
-
-        /**
-         * Gets or sets the index of the IItem contained by this IItemPromise.
-        **/
-        index: number;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Represents a layout for the ListView.
-    **/
-    interface ILayout2 {
-        //#region Methods
-
-        /**
-         * Called when the ListView finishes a drag operation.
-        **/
-        dragLeave(): void;
-
-        /**
-         * Called when the ListView initiates a drag operation.
-         * @param x The x-coordinate of the drag.
-         * @param y The y-coordinate of the drag.
-         * @param dragInfo An object that indicates whether the item is selected.
-        **/
-        dragOver(x: number, y: number, dragInfo: number): void;
-
-        /**
-         * Called when the ListView requests that the ILayout2 execute animations.
-        **/
-        executeAnimations(): void;
-
-        /**
-         * Determines the next item to receive keyboard focus.
-         * @param currentItem An object that describes the current item. It has these properties: index, type.
-         * @param pressedKey The key that was pressed.
-         * @returns An object that describes the next item that should receive focus. It has these properties: index, type.
-        **/
-        getAdjacent(currentItem: any, pressedKey: WinJS.Utilities.Key): any;
-
-        /**
-         * Gets the item at the specified hit-test coordinates. These coordinates are absolute coordinates (they are not relative to the layout's content area).
-         * @param x The x-coordinate to test for.
-         * @param y The y-coordinate to test for.
-         * @returns An object that describes the item at the hit test coordinates. It has these properties: type, index.
-        **/
-        hitTest(x: number, y: number): any;
-
-        /**
-         * Sets the rendering site and specifies whether the layout supports groups. This method is called by the ListView to initialize the layout.
-         * @param site The rendering site for the layout.
-         * @param groupsEnabled Set to true if this layout supports groups; set to false if it does not.
-        **/
-        initialize(site: ILayoutSite2, groupsEnabled: boolean): void;
-
-        /**
-         * Retrieves the indexes of the items in the specified pixel range.
-         * @param firstPixel The first pixel the range of items falls between.
-         * @param lastPixel The last pixel the range of items falls between.
-        **/
-        itemsFromRange(firstPixel: number, lastPixel: number): void;
-
-        /**
-         * Performs a layout pass.
-         * @param tree A structure representing the layout tree that is returned from the ListView.
-         * @param changedRange An object that lists the index of the first item in the changed item range. This object has these properties: startIndex.
-         * @param modifiedItems An object that contains the old and new indexes of the items that have been modified in the tree.
-         * @param modifiedGroups An object that contains the old and new indexes of the group elements that have been modified in the tree.
-         * @returns A Promise that executes after layout is complete, or an object that contains two Promise objects: realizedRangeComplete, layoutComplete.
-        **/
-        layout(tree: any, changedRange: any, modifiedItems: any, modifiedGroups: any): any;
-
-        /**
-         * Called when the ListView requests that the ILayout2 set up animations.
-        **/
-        setupAnimations(): void;
-
-        /**
-         * Releases resources that were obtained during the call to initialize.
-        **/
-        uninitialize(): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets the orientation of the layout.
-        **/
-        orientation: any;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * This API is no longer supported. Starting with the Windows Library for JavaScript 2.0 Preview, use the ILayoutSite2 interface. Represents a rendering site for an ILayout.
-    **/
-    interface ILayoutSite {
-        //#region Properties
-
-        /**
-         * This API is no longer supported. Starting with the Windows Library for JavaScript 2.0 Preview, use a the ILayoutSite2 interface.
-        **/
-        animationsDisabled: boolean;
-
-        /**
-         * This API is no longer supported. Starting with the Windows Library for JavaScript 2.0 Preview, use a the ILayoutSite2 interface.
-        **/
-        itemSurface: HTMLElement;
-
-        /**
-         * This API is no longer supported. Starting with the Windows Library for JavaScript 2.0 Preview, use a the ILayoutSite2 interface.
-        **/
-        rtl: boolean;
-
-        /**
-         * This API is no longer supported. Starting with the Windows Library for JavaScript 2.0 Preview, use a the ILayoutSite2 interface.
-        **/
-        scrollbarPos: number;
-
-        /**
-         * This API is no longer supported. Starting with the Windows Library for JavaScript 2.0 Preview, use a the ILayoutSite2 interface.
-        **/
-        surface: HTMLElement;
-
-        /**
-         * This API is no longer supported. Starting with the Windows Library for JavaScript 2.0 Preview, use a the ILayoutSite2 interface.
-        **/
-        viewport: HTMLElement;
-
-        /**
-         * This API is no longer supported. Starting with the Windows Library for JavaScript 2.0 Preview, use a the ILayoutSite2 interface.
-        **/
-        viewportSize: any;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Represents a rendering site for an ILayout2.
-    **/
-    interface ILayoutSite2 {
-        //#region Properties
-
-        /**
-         * Gets the number of groups in the site.
-        **/
-        groupCount: number;
-
-        /**
-         * Gets the number of items in the site.
-        **/
-        itemCount: Promise<number>;
-
-        /**
-         * Gets the pixel range of the realization area.
-        **/
-        realizedRange: any;
-
-        /**
-         * Gets the tree for use by an object that implements the ILayout2 interface.
-        **/
-        tree: any;
-
-        /**
-         * Gets the pixel range of visible items in the site.
-        **/
-        visibleRange: any;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Retrieves items from a IListDataSource, enumerates the contents of a IListDataSource, and can optionally register for change notifications.
-    **/
-    interface IListBinding<T> {
-        //#region Methods
-
-        /**
-         * Retrieves the current item.
-         * @returns An IItemPromise that contains the current item. If the cursor has moved past the start or end of the list, the promise completes with a value of null. If the current item has been moved or deleted, the promise returns an error.
-        **/
-        current(): IItemPromise<IItem<T>>;
-
-        /**
-         * Gets the first item from the IListDataSource and makes it the current item.
-         * @returns An IItemPromise that contains the requested IItem. If the list is empty, the promise completes with a value of null.
-        **/
-        first(): IItemPromise<IItem<T>>;
-
-        /**
-         * Retrieves the item from the IListDataSource that has the specified description and makes it the current item.
-         * @param description A domain-specific description, to be interpreted by the IListDataAdapter, that identifies the item to retrieve.
-         * @returns An IItemPromise that contains the requested IItem object. If the item wasn't found, the promise completes with a value of null.
-        **/
-        fromDescription(description: string): IItemPromise<IItem<T>>;
-
-        /**
-         * Retrieves the item from the IListDataSource that has the specified index and makes it the current item.
-         * @param index A value greater than or equal to 0 that is the index of the item to retrieve.
-         * @returns An IItemPromise that contains the requested IItem. If the item wasn't found, the promise completes with a value of null.
-        **/
-        fromIndex(index: number): IItemPromise<IItem<T>>;
-
-        /**
-         * Retrieves the item from the IListDataSource that has the specified key and makes it the current item.
-         * @param key The key that identifies the item to retrieve. This value must be a non-empty string.
-         * @param hints Domain-specific information that provides additional information to the IListDataAdapter to improve retrieval time.
-         * @returns An IItemPromise that contains the requested IItem. If they item couldn't be found, the promise completes with a value of null.
-        **/
-        fromKey(key: string, hints?: any): IItemPromise<IItem<T>>;
-
-        /**
-         * Makes the specified IItem or IItemPromise the current item.
-         * @param item The IItem or IItemPromise that will become the current item.
-         * @returns An IItemPromise that contains the specified item, if it exists. If the specified item is not in the list, the promise completes with a value of null.
-        **/
-        jumpToItem(item: IItem<T>): IItemPromise<IItem<T>>;
-
-        /**
-         * Retrieves the last item in the IListDataSource and makes it the current item.
-         * @returns An IItemPromise that contains the requested IItem. f the list is empty, the promise completes with a value of null.
-        **/
-        last(): IItemPromise<IItem<T>>;
-
-        /**
-         * Retrieves the item after the current item and makes it the current item.
-         * @returns An IItemPromise that contains the item after the current item. If the cursor moves past the end of the list, the promise completes with a value of null.
-        **/
-        next(): IItemPromise<IItem<T>>;
-
-        /**
-         * Retrieves the item before the current item and makes it the current item.
-         * @returns An IItemPromise that contains the item before the current item. If the cursor moves past the start of the list, the promise completes with a value of null.
-        **/
-        previous(): IItemPromise<IItem<T>>;
-
-        /**
-         * Releases resources, stops notifications, and cancels outstanding promises for all tracked items returned by this IListBinding.
-        **/
-        release(): void;
-
-        /**
-         * Creates a request to stop change notifications for the specified item. The change notifications stop when the number of releaseItem calls matches the number of IIItemPromise.retain calls.
-         * @param item The IItem or IItemPromise that should stop receiving notifications.
-        **/
-        releaseItem(item: IItem<T>): void;
-
-        //#endregion Methods
-
-    }
-
-    /**
-     * Accesses data for an IListDataSource.
-    **/
-    interface IListDataAdapter<T> {
-        //#region Methods
-
-        /**
-         * Overwrites the data of the specified item.
-         * @param key The key of the item to overwrite.
-         * @param newData The new data for the item.
-         * @param indexHint The index of the item, if known.
-         * @returns A Promise that returns null or undefined when the operation completes.
-        **/
-        change(key: string, newData: T, indexHint: number): Promise<void>;
-
-        /**
-         * Gets the number of items in the IListDataAdapter object's data source.
-         * @returns A Promise that contains the number of items the IListDataAdapter contains, or an approximate value if the actual number is unknown.
-        **/
-        getCount(): Promise<number>;
-
-        /**
-         * Inserts the specified data after the specified item.
-         * @param key A key that can be used to retrieve the new data.
-         * @param data The new data to add to the IListDataAdapter object's data source.
-         * @param previousKey The key of an item in the IListDataAdapter object's data source. The new data will be inserted after this item.
-         * @param previousIndexHint The index of the item to insert the new data after, if known.
-         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
-        **/
-        insertAfter(key: string, data: T, previousKey: string, previousIndexHint: number): Promise<IItem<T>>;
-
-        /**
-         * Adds the specified key and data to the end of the IListDataAdapter object's data source.
-         * @param key A key that can be used to retrieve the new data.
-         * @param data The new data to add to the IListDataAdapter object's data source.
-         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
-        **/
-        insertAtEnd(key: string, data: T): Promise<IItem<T>>;
-
-        /**
-         * Adds the specified key and data to the beginning of the IListDataAdapter object's data source.
-         * @param key A key that can be used to retrieve the new data.
-         * @param data The new data to add to the IListDataAdapter object's data source.
-         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
-        **/
-        insertAtStart(key: string, data: T): Promise<IItem<T>>;
-
-        /**
-         * Inserts the specified data before the specified item.
-         * @param key A key that can be used to retrieve the new data.
-         * @param data The new data to add to the IListDataAdapter object's data source.
-         * @param nextKey The key of an item in the IListDataAdapter object's data source. The new data will be inserted before this item.
-         * @param nextIndexHint The index of the item to insert the new data before, if known.
-         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
-        **/
-        insertBefore(key: string, data: T, nextKey: string, nextIndexHint: number): Promise<IItem<T>>;
-
-        /**
-         * Retrieves the item that matches the specified description and also retrieves the specified number of items before and after the matched item.
-         * @param description A description of the item to locate.
-         * @param countBefore The number of items before the matched item to retrieve.
-         * @param countAfter The number of items after the matched item to retrieve.
-         * @returns A Promise that provides an IFetchResult that contains the selected items or a FetchError if an error was encountered.
-        **/
-        itemsFromDescription(description: string, countBefore: number, countAfter: number): Promise<IFetchResult<T>>;
-
-        /**
-         * Retrieves the specified number of items from the end of the IListDataAdapter object's data source.
-         * @param count The number of items to retrieve.
-         * @returns A Promise that provides an IFetchResult that contains the selected items or a FetchError if an error was encountered.
-        **/
-        itemsFromEnd(count: number): Promise<IFetchResult<T>>;
-
-        /**
-         * Retrieves the item at the specified index and also retrieves the specified number of items before and after the selected item.
-         * @param index The index of the item to retrieve.
-         * @param countBefore The number of items to retrieve from before the selected item.
-         * @param countAfter The number of items to retrieve from after the selected item.
-         * @returns A Promise that provides an IFetchResult that contains the selected items or a FetchError if an error was encountered.
-        **/
-        itemsFromIndex(index: number, countBefore: number, countAfter: number): Promise<IFetchResult<T>>;
-
-        /**
-         * Retrieves the item that has the specified key and also retrieves the specified number of items before and after the selected item.
-         * @param key The key of the item to retrieve.
-         * @param countBefore The number of items to retrieve from before the selected item.
-         * @param countAfter The number of items to retrieve from after the selected item.
-         * @returns A Promise that provides an IFetchResult that contains the selected items or a FetchError if an error was encountered.
-        **/
-        itemsFromKey(key: string, countBefore: number, countAfter: number): Promise<IFetchResult<T>>;
-
-        /**
-         * Retrieves the specified number of items from the beginning of the IListDataAdapter object's data source.
-         * @param count The number of items to retrieve.
-         * @returns A Promise that provides an IFetchResult that contains the selected items or a FetchError if an error was encountered.
-        **/
-        itemsFromStart(count: number): Promise<IFetchResult<T>>;
-
-        /**
-         * Returns a string representation of the specified item that can be used for comparisons.
-         * @param item The item for which to generate a signature.
-         * @returns The signature representation of the specified item.
-        **/
-        itemSignature(item: IItem<T>): string;
-
-        /**
-         * Moves the specified item to just after another item.
-         * @param key A key of the item to move.
-         * @param previousKey The key of another item. The item to move will be moved to just after this item.
-         * @param indexHint The index of the item to move, if known.
-         * @param previousIndexHint The index to move the item after, if known.
-         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
-        **/
-        moveAfter(key: string, previousKey: any, indexHint: string, previousIndexHint: number): Promise<IItem<T>>;
-
-        /**
-         * Moves the specified item to just before another item.
-         * @param key A key of the item to move.
-         * @param nextKey The key of another item. The item to move will be moved to just before this item.
-         * @param indexHint The index of the item to move, if known.
-         * @param nextIndexHint The index to move the item before, if known.
-         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
-        **/
-        moveBefore(key: string, nextKey: any, indexHint: string, nextIndexHint: number): Promise<IItem<T>>;
-
-        /**
-         * Moves the specified item to the end of the IListDataAdapter object's data source.
-         * @param key The key for the item to move.
-         * @param indexHint The index of the item to move, if known.
-         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
-        **/
-        moveToEnd(key: string, indexHint: number): Promise<IItem<T>>;
-
-        /**
-         * Moves the specified item to the beginning of the IListDataAdapter object's data source.
-         * @param key The key for the item to move.
-         * @param indexHint The index of the item to move, if known.
-         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
-        **/
-        moveToStart(key: string, indexHint: number): Promise<IItem<T>>;
-
-        /**
-         * Removes the specified item from the IListDataAdapter object's data source.
-         * @param key The key of the item to remove.
-         * @param data The new data for the item.
-         * @param indexHint The index of the item.
-         * @returns A Promise that returns null or undefined when the operation completes.
-        **/
-        remove(key: string, data: T, indexHint: number): Promise<void>;
-
-        /**
-         * Registers a notification handler. The IListDataAdapter uses the handler to notify listening objects when its data changes.
-         * @param notificationHandler The notification handler that the IListDataAdapter will use to provide change notifications. .
-        **/
-        setNotificationHandler(notificationHandler: IListDataNotificationHandler<T>): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets a value that specifies whether to use an object's identity to determine if an item has changed.
-        **/
-        compareByIdentity: boolean;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Notifies clients when an IListDataAdapter object's data changes.
-    **/
-    interface IListDataNotificationHandler<T> {
-        //#region Methods
-
-        /**
-         * Indicates the start of a notification batch. Objects that are listening for notifications should defer making updates until endNotifications is called.
-        **/
-        beginNotifications(): void;
-
-        /**
-         * Raises a notification that an item in the IListDataAdapter object's data source has changed.
-         * @param item The item that changed.
-        **/
-        changed(item: IItem<T>): void;
-
-        /**
-         * Indicates the end of a notification batch. When the beginNotifications method is called, objects listening for notifications should defer making updates until endNotifications is called.
-        **/
-        endNotifications(): void;
-
-        /**
-         * Raises a notification that an item has been added to the IListDataAdapter object's data source.
-         * @param newItem The new item added to the IListDataAdapter object's data source.
-         * @param previousKey The key of the item that now precedes the new item, or null if the item was inserted at the start of the list. If nextKey is provided, this parameter may be null.
-         * @param nextKey The key of the item that now follows the new item, or null if the item was inserted at the end of the list. If previousKey is provided, this parameter may be null.
-         * @param index The index of the new item.
-        **/
-        inserted(newItem: IItem<T>, previousKey: string, nextKey: string, index?: number): void;
-
-        /**
-         * Indicates that all previous data obtained from the IListDataAdapter is invalid and should be refreshed.
-         * @returns A Promise that completes when the data has been completely refreshed and all change notifications have been sent.
-        **/
-        invalidateAll(): Promise<any>;
-
-        /**
-         * Raises a notification that an item was moved within the IListDataAdapter object's data source.
-         * @param item The item that was moved.
-         * @param previousKey The key of the item that now precedes the new item, or null if the item was moved to the beginning of the list. If nextKey is provided, this parameter may be null.
-         * @param nextKey The key of the item that now follows the new item, or null if the item was moved to the end of the list. If previousKey is provided, this parameter may be null.
-         * @param oldIndex The item's original index.
-         * @param newIndex The item's new index.
-        **/
-        moved(item: IItem<T>, previousKey: string, nextKey: string, oldIndex?: number, newIndex?: number): void;
-
-        /**
-         * Reloads data from the IListDataAdapter.
-        **/
-        reload(): void;
-
-        /**
-         * Raises a notification that an item was removed from the IListDataAdapter object's data source.
-         * @param key The key of the item that was removed.
-         * @param index The index of the item that was removed.
-        **/
-        removed(key: string, index?: number): void;
-
-        //#endregion Methods
-
-    }
-
-    /**
-     * Provides access to a data source and enables you to bind, change, add, remove, and move items in that data source.
-    **/
-    interface IListDataSource<T> {
-        //#region Events
-
-        /**
-         * Occurs when the status of the IListDataSource changes.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: status.
-        **/
-        statuschanged(eventInfo: CustomEvent): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Notifies the IListDataSource that a sequence of edits is about to begin. The IListDataSource will defer notifications until endEdits is called.
-        **/
-        beginEdits(): void;
-
-        /**
-         * Overwrites the data of the specified item.
-         * @param key The key for the item to replace.
-         * @param newData The new data for the item.
-         * @returns A Promise that contains the IItem that was updated or an EditError if an error was encountered.
-        **/
-        change(key: string, newData: T): Promise<IItem<T>>;
-
-        /**
-         * Creates an IListBinding that can retrieve items from the IListDataSource, enumerate the contents of the IListDataSource object's data, and optionally register for change notifications.
-         * @param notificationHandler Enables the IListBinding to register for change notifications for individual items obtained from the IListDataSource. If you omit this parameter, change notifications won't be available.
-         * @returns The new IListBinding.
-        **/
-        createListBinding(notificationHandler?: IListNotificationHandler<T>): IListBinding<T>;
-
-        /**
-         * Notifies the IListDataSource that the batch of edits that began with the last beginEdits call has completed. The IListDataSource will submit notifications for any changes that occurred between the beginEdits and endEdits calls as a batch and resume normal change notifications.
-        **/
-        endEdits(): void;
-
-        /**
-         * Retrieves the number of items in the data source.
-         * @returns A Promise that provides a Number that is the number of items in the data source.
-        **/
-        getCount(): Promise<number>;
-
-        /**
-         * Inserts a new item after another item.
-         * @param key The key that can be used to retrieve the new item, if known.
-         * @param data The data for the item to add.
-         * @param previousKey The key for an item in the data source. The new item will be added after this item.
-         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
-        **/
-        insertAfter(key: string, data: T, previousKey: string): Promise<IItem<T>>;
-
-        /**
-         * Adds an item to the end of the data source.
-         * @param key The key that can be used to retrieve the new item, if known.
-         * @param data The data for the item to add.
-         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
-        **/
-        insertAtEnd(key: string, data: T): Promise<IItem<T>>;
-
-        /**
-         * Adds an item to the beginning of the data source.
-         * @param key The key that can be used to retrieve the new item, if known.
-         * @param data The data for the item to add.
-         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
-        **/
-        insertAtStart(key: string, data: T): Promise<IItem<T>>;
-
-        /**
-         * Inserts an item before another item.
-         * @param key The key that can be used to retrieve the new item, if known.
-         * @param data The data for the item to add.
-         * @param nextKey The key of an item in the data source. The new item will be inserted before this item.
-         * @returns A Promise that contains the IItem that was added or an EditError if an error was encountered.
-        **/
-        insertBefore(key: string, data: T, nextKey: string): Promise<IItem<T>>;
-
-        /**
-         * Indicates that all previous data obtained from the IListDataAdapter is invalid and should be refreshed.
-         * @returns A Promise that completes when the data has been completely refreshed and all notifications have been sent.
-        **/
-        invalidateAll(): Promise<any>;
-
-        /**
-         * Retrieves the item that has the specified description.
-         * @param description Domain-specific information, to be interpreted by the IListDataAdapter, that describes the item to retrieve.
-         * @returns A Promise that provides an IItem that contains the requested item or a FetchError if an error was encountered. If the item wasn't found, the promise completes with a value of null.
-        **/
-        itemFromDescription(description: any): Promise<IItem<T>>;
-
-        /**
-         * Retrieves the item at the specified index.
-         * @param index A value that is greater than or equal to zero that is the index of the item to retrieve.
-         * @returns A Promise that provides an IItem that contains the requested item or a FetchError if an error was encountered. If the item wasn't found, the promise completes with a value of null.
-        **/
-        itemFromIndex(index: number): Promise<IItem<T>>;
-
-        /**
-         * Retrieves the item with the specified key.
-         * @param key The key of the item to retrieve. It must be a non-empty string.
-         * @param description Domain-specific information that IListDataAdapter can use to improve the retrieval time.
-         * @returns A Promise that provides an IItem that contains the requested item or a FetchError if an error was encountered. If the item was not found, the promise completes with a null value.
-        **/
-        itemFromKey(key: string, description?: any): Promise<IItem<T>>;
-
-        /**
-         * Moves an item to just after another item.
-         * @param key The key that identifies the item to move.
-         * @param previousKey The key of another item in the data source. The item specified by the key parameter will be moved after this item.
-         * @returns A Promise that contains the IItem that was moved or an EditError if an error was encountered.
-        **/
-        moveAfter(key: string, previousKey: string): Promise<IItem<T>>;
-
-        /**
-         * Moves an item before another item.
-         * @param key The key that identifies the item to move.
-         * @param nextKey The key of another item in the data source. The item specified by the key parameter will be moved before this item.
-         * @returns A Promise that contains the IItem that was moved or an EditError if an error was encountered.
-        **/
-        moveBefore(key: string, nextKey: string): Promise<IItem<T>>;
-
-        /**
-         * Moves an item to the end of the data source.
-         * @param key The key that identifies the item to move.
-         * @returns A Promise that contains the IItem that was moved or an EditError if an error was encountered.
-        **/
-        moveToEnd(key: string): Promise<IItem<T>>;
-
-        /**
-         * Moves the specified item to the beginning of the data source.
-         * @param key The key that identifies the item to move.
-         * @returns A Promise that contains the IItem that was moved or an EditError if an error was encountered.
-        **/
-        moveToStart(key: string): Promise<IItem<T>>;
-
-        /**
-         * Removes the specified item from the data source.
-         * @param key The key that identifies the item to remove.
-         * @returns A Promise that contains nothing if the operation was successful or an EditError if an error was encountered.
-        **/
-        remove(key: string): Promise<IItem<T>>;
-
-        //#endregion Methods
-
-    }
-
-    /**
-     * Used by an IListBinding to provide change notifications when items in a IListDataSource change.
-    **/
-    interface IListNotificationHandler<T> {
-        //#region Methods
-
-        /**
-         * Indicates the start of a notification batch. Objects that are listening for notifications should defer making updates until endNotifications is called.
-        **/
-        beginNotifications(): void;
-
-        /**
-         * Indicates that an item changed.
-         * @param newItem The updated item.
-         * @param oldItem The original item.
-        **/
-        changed(newItem: IItem<T>, oldItem: IItem<T>): void;
-
-        /**
-         * Indicates that the number of items in the IListDataSource has changed.
-         * @param newCount The updated count.
-         * @param oldCount The original count.
-        **/
-        countChanged(newCount: number, oldCount: number): void;
-
-        /**
-         * Indicates the end of a notification batch. When the beginNotifications method is called, objects listening for notifications should defer making updates until endNotifications is called.
-        **/
-        endNotifications(): void;
-
-        /**
-         * Indicates that the index of an item changed.
-         * @param handle The temporary ID of the item.
-         * @param newIndex The new index.
-         * @param oldIndex The original index.
-        **/
-        indexChanged(handle: string, newIndex: number, oldIndex: number): void;
-
-        /**
-         * Indicates that an item was added to the IListDataSource.
-         * @param itemPromise A promise for the new IItem.
-         * @param previousHandle The temporary ID of the item that precedes the new item.
-         * @param nextHandle The temporary ID of the item that follows the new item.
-        **/
-        inserted(itemPromise: IItemPromise<T>, previousHandle: string, nextHandle: string): void;
-
-        /**
-         * Indicates that an IItemPromise was fulfilled and that the item is now available.
-         * @param item The fulfilled item.
-        **/
-        itemAvailable(item: IItem<T>): void;
-
-        /**
-         * Indicates that an item was moved.
-         * @param item A promise for the IItem that was moved.
-         * @param previousHandle The temporary ID of the item that now precedes the moved item.
-         * @param nextHandle The temporary ID of the item that now follows the moved item.
-        **/
-        moved(item: IItemPromise<T>, previousHandle: string, nextHandle: string): void;
-
-        /**
-         * Indicates that an item was removed.
-         * @param handle The temporary ID of the item that was removed.
-         * @param mirage true if the item never actually existed; false if the item was actually present in the IListDataSource.
-        **/
-        removed(handle: string, mirage: boolean): void;
-
-        //#endregion Methods
-
-    }
-
-    /**
-     * Used by ListView's currentItem API
-    **/
-    interface IListViewItem {
-        /**
-         * Gets or sets index of the ListView item.
-        **/
-        index?: number;
-
-        /**
-         * Gets or sets key of the ListView item.
-        **/
-        key?: string;
-
-        /**
-         * Gets or sets whether the ListView item is focused.
-        **/
-        hasFocus?: boolean;
-
-        /**
-         * Gets or sets whether the ListView item is focused and is showing its focus visual.
-        **/
-        showFocus?: boolean;
-
-        /**
-         * Gets the type, if any.
-        **/
-        type?: WinJS.UI.ObjectType;
-    }
-
-    /**
-     * Represents a selection of ListView items.
-    **/
-    interface ISelection<T> {
-        //#region Methods
-
-        /**
-         * Adds one or more items to the selection.
-         * @param items The indexes or keys of the items to add. You can provide different types of objects for the items parameter: you can specify an index, a key, or a range of indexes. It can also be an array that contains one or more of these objects. For more info, see the Remarks section.
-         * @returns A Promise that is fulfilled when the operation completes.
-        **/
-        add(items: any): Promise<any>;
-
-        /**
-         * Clears the selection.
-         * @returns A Promise that is fulfilled when the clear operation completes.
-        **/
-        clear(): Promise<any>;
-
-        /**
-         * Returns the number of items in the selection.
-         * @returns The number of items in the selection.
-        **/
-        count(): number;
-
-        /**
-         * Returns a list of the indexes for the items in the selection.
-         * @returns The list of indexes for the items in the selection as an array of Number objects.
-        **/
-        getIndices(): number[];
-
-        /**
-         * Returns an array that contains the items in the selection.
-         * @returns A Promise that contains an array of the requested IItem objects.
-        **/
-        getItems(): Promise<IItem<T>[]>;
-
-        /**
-         * Gets an array of the index ranges for the selected items.
-         * @returns An array that contains an ISelectionRange object for each index range in the selection.
-        **/
-        getRanges(): ISelectionRange[];
-
-        /**
-         * Returns a value that indicates whether the selection contains every item in the data source.
-         * @returns true if the selection contains every item in the data source; otherwise, false.
-        **/
-        isEverything(): boolean;
-
-        /**
-         * Removes the specified items from the selection.
-         * @param items The indexes or keys of the items to remove. You can provide different types of objects for the items parameter: you can specify an index, a key, or a range of indexes. It can also be an array that contains one or more of these objects. For more info, see the Remarks section.
-         * @returns A Promise that is fulfilled when the operation completes.
-        **/
-        remove(items: any): Promise<any>;
-
-        /**
-         * Adds all the items in the ListView to the selection.
-        **/
-        selectAll(): void;
-
-        /**
-         * Clears the current selection and replaces it with the specified items.
-         * @param items The indexes or keys of the items that make up the selection. You can provide different types of objects for the items parameter: you can specify an index, a key, or a range of indexes. It can also be an array that contains one or more of these objects. For more info, see the Remarks section.
-         * @returns A Promise that is fulfilled when the operation completes.
-        **/
-        set(items: any): Promise<any>;
-
-        //#endregion Methods
-
-    }
-
-    /**
-     * Represents a range of indexes or keys in an ISelection.
-    **/
-    interface ISelectionRange {
-        //#region Properties
-
-        /**
-         * Gets or sets the index of the first item in the range.
-        **/
-        firstIndex: number;
-
-        /**
-         * Gets or sets the key of the first item in the range.
-        **/
-        firstKey: any;
-
-        /**
-         * Gets or sets the index of the last item in the range.
-        **/
-        lastIndex: number;
-
-        /**
-         * Gets or sets of the key of the last item in the range.
-        **/
-        lastKey: any;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Supports semantic zoom functionality by exposing a control as either the zoomed in or the zoomed out view of the SemanticZoom control.
-    **/
-    interface IZoomableView<T> {
-        //#region Methods
-
-        /**
-         * Initiates semantic zoom on the custom control.
-        **/
-        beginZoom(): void;
-
-        /**
-         * Initializes the semantic zoom state for the custom control.
-         * @param isZoomedOut True if this is the zoomed out view; otherwise false.
-         * @param isCurrentView True if this is the current view; otherwise false.
-         * @param triggerZoom The function that manages semantic zoom behavior. Triggers a zoom in or zoom out if the control is the visible control.
-         * @param prefetchedPages The number of pages of content to pre-fetch for zooming. This value is dependent on the size of the semantic zoom container. More content can be displayed based on the zoom factor and the size of the container.
-        **/
-        configureForZoom(isZoomedOut: boolean, isCurrentView: boolean, triggerZoom: Function, prefetchedPages: number): void;
-
-        /**
-         * Terminates semantic zoom on the zoomed in or zoomed out child of the custom control.
-         * @param isCurrentView True if the control is the visible control; otherwise false.
-        **/
-        endZoom(isCurrentView: boolean): void;
-
-        /**
-         * Retrieves the current item of the zoomed in or zoomed out child of the custom control.
-         * @returns An object that represents the selected item. This return value must be a Promise for the following: item, position.
-        **/
-        getCurrentItem(): Promise<{ item: T; position: Utilities.IPosition }>;
-
-        /**
-         * Retrieves the panning axis of the zoomed-in or zoomed-out child of the custom control.
-         * @returns Identifies the panning axis of the child control. Implementation specific.
-        **/
-        getPanAxis(): string;
-
-        /**
-         * Manages pointer input for the custom control.
-         * @param pointerId The ID of the pointer.
-        **/
-        handlePointer(pointerId: string): void;
-
-        /**
-         * Positions the specified item within the viewport of the child control when panning or zooming begins.
-         * @param item The object to position within the viewport of the child control. item can be a number, a string, or an object with any number of properties.
-         * @param position An object that contains the position data of the item relative to the child control. position must be an object with four number properties: left, top, width, and height. These values specify a rectangle that is typically the bounding box of the current item, though the details are up to the control. The units of the position must be in pixels. And the coordinates must be relative to the top-left of the control viewport (which should occupy the same area as the semantic zoom viewport), except when in RTL mode. In RTL mode, return coordinates relative to the top-right off the control viewport. The rectangle is transformed from the coordinate system of one control to that of the other.
-        **/
-        positionItem(item: T, position: Utilities.IPosition): void;
-
-        /**
-         * Selects the item closest to the specified screen coordinates.
-         * @param x The x-coordinate in DIPs relative to the upper-left corner of the SemanticZoom viewport.
-         * @param y The y-coordinate in DIPs relative to the upper-left corner of the SemanticZoom viewport..
-        **/
-        setCurrentItem(x: number, y: number): void;
-
-        //#endregion Methods
-
-    }
-
-    //#endregion Interfaces
-
-    //#region Objects
-
-    /**
-     * Displays ICommands in overlayed application pane that opens and closes at the top or bottom of the main view.
-    **/
-    class AppBar {
-
-        //#region Constructors
-
-        /**
-         * Creates a new AppBar object.
-         * @constructor
-         * @param element The DOM element that will host the control.
-         * @param options The set of properties and values to apply to the new AppBar.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * Occurs immediately after the AppBar is closed.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onafterclose: (eventInfo: CustomEvent) => void;
-
-        /**
-         * Occurs immeidately after the AppBar is opened.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onafteropen: (eventInfo: CustomEvent) => void;
-
-        /**
-         * Occurs immediately before the AppBar is closed. Is cancelable.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onbeforeclose: (eventInfo: CustomEvent) => void;
-
-        /**
-         * Occurs immediately before the AppBar is opened. Is cancelable.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onbeforeopen: (eventInfo: CustomEvent) => void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param type The event type to register. It must be beforeopen, beforeclose, afteropen, or afterclose.
-         * @param listener The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param type The event type to unregister. It must be beforeopen, beforeclose, afteropen, or afterclose.
-         * @param listener The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(eventName: string, eventProperties: any): boolean;
-
-        /**
-         * Releases resources held by this AppBar. Call this method when the AppBar is no longer needed. After calling this method, the AppBar becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Returns the Command object identified by id.
-         * @param id The element idenitifier (ID) of the command to be returned.
-         * @returns The command identified by id. If multiple commands have the same ID, returns the first command found.
-        **/
-        getCommandById(id: string): ICommand;
-
-        /**
-         * Shows the specified commands of the AppBar while hiding all other commands.
-         * @param commands The commands to show. The array elements may be ICommand objects, or the string identifiers (IDs) of commands.
-        **/
-        showOnlyCommands(commands: Array<string|ICommand>): void;
-
-        /**
-         * Opens the AppBar.
-        **/
-        open(): void;
-
-        /**
-         * Closes the AppBar.
-        **/
-        close(): void;
-
-        /**
-         * Forces the AppBar to update its layout.
-        **/
-        forceLayout(): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets/Sets how AppBar will display itself while closed. Values are "none" , "minimal", "compact" and "full".
-        **/
-        closedDisplayMode: string;
-
-        /**
-         * Gets or sets the Binding List of WinJS.UI.Command for the AppBar.
-        **/
-        data: WinJS.Binding.List<ICommand>;
-
-        /**
-         * Gets the DOM element that hosts the AppBar.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets or sets whether the AppBar is currently opened.
-        **/
-        opened: boolean;
-
-        /**
-         * Gets or sets a value that specifies whether the AppBar appears at the top or bottom of the main view.
-        **/
-        placement: string;
-
-        /**
-         * Display options for the AppBar when closed.
-        **/
-        static ClosedDisplayMode: {
-            /**
-             * When the AppBar is closed, it is not visible and doesn't take up any space.
-            **/
-            none: string;
-            /**
-             * When the AppBar is closed, its height is reduced to the minimal height required to display only its overflowbutton. All other content in the AppBar is not displayed.
-            **/
-            minimal: string;
-            /**
-             * When the AppBar is closed, its height is reduced such that button commands are still visible, but their labels are hidden.
-            **/
-            compact: string;
-            /**
-             * When the AppBar is closed, its height is always sized to content.
-            **/
-            full: string;
-        };
-
-        /**
-         * Display options for AppBar placement in relation to the main view.
-        */
-        static Placement: {
-            /**
-             * The AppBar appears at the top of the main view
-            **/
-            top: string;
-            /**
-             * The AppBar appears at the bottom of the main view
-            **/
-            bottom: string;
-        };
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Represents a command to be displayed in an app bar.
-    **/
-    class AppBarCommand implements ICommand {
-        //#region Constructors
-
-        /**
-         * Creates a new AppBarCommand object.
-         * @constructor
-         * @param element The DOM element that will host the control.
-         * @param options The set of properties and values to apply to the new AppBarCommand.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param type The event type to register.
-         * @param listener The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-        /**
-         * Releases resources held by this AppBarCommand. Call this method when the AppBarCommand is no longer needed. After calling this method, the AppBarCommand becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param type The event type to unregister.
-         * @param listener The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets a value that indicates whether the AppBarCommand is disabled.
-        **/
-        disabled: boolean;
-
-        /**
-         * Gets the DOM element that hosts the AppBarCommand.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Adds an extra CSS class during construction.
-        **/
-        extraClass: string;
-
-        /**
-         * Gets or sets the HTMLElement with a 'content' type AppBarCommand that should receive focus whenever focus moves by the user pressing HOME or the arrow keys, from the previous AppBarCommand to this AppBarCommand.
-        **/
-        firstElementFocus: HTMLElement;
-
-        /**
-         * Gets or sets the Flyout object displayed by this command. The specified flyout is shown when the AppBarCommand's button is invoked.
-        **/
-        flyout: Flyout;
-
-        /**
-         * Gets or sets a value that indicates whether the AppBarCommand is hiding or in the process of becoming hidden.
-        **/
-        hidden: boolean;
-
-        /**
-         * Gets or sets the icon of the AppBarCommand.
-        **/
-        icon: string;
-
-        /**
-         * Gets the element identifier (ID) of the command.
-        **/
-        id: string;
-
-        /**
-         * Gets or sets the label of the command.
-        **/
-        label: string;
-
-        /**
-         * Gets or sets the HTMLElement with a 'content' type AppBarCommand that should receive focus whenever focus moves by the user pressing END or the arrow keys, from the previous AppBarCommand to this AppBarCommand.
-        **/
-        lastElementFocus: HTMLElement;
-
-        /**
-         * Gets or sets the function to be invoked when the command is clicked.
-        **/
-        onclick: Function;
-
-        /**
-         * Gets the section of the parent control that the command is in. The section can only be set through constructor options.
-        **/
-        section: string;
-
-        /**
-         * Gets or sets the selected state of a toggle button.
-        **/
-        selected: boolean;
-
-        /**
-         * Gets or sets the tooltip of the command.
-        **/
-        tooltip: string;
-
-        /**
-         * Gets the type of the command. The type can only be set through constructor options.
-        **/
-        type: string;
-
-        /**
-         * Gets or sets the priority of the command
-        **/
-        priority: number;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * A rich input box that provides suggestions as the user types.
-    **/
-    class AutoSuggestBox {
-        //#region Constructors
-
-        /**
-         * Creates a new AutoSuggestBox.
-         * @constructor
-         * @param element The DOM element hosts the new AutoSuggestBox.
-         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * Raised when the user or the app changes the queryText.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.language, detail.queryText, detail.linguisticDetails.
-        **/
-        onquerychanged(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised awhen the user presses Enter.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.language, detail.queryText, detail.linguisticDetails, detail.keyModifiers.
-        **/
-        onquerysubmitted(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised when the user selects a suggested option for their query.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.tag, detail.keyModifiers, detail.storageFile.
-        **/
-        onresultsuggestionchosen(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised when the system requests suggestions from this app.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.language, detail.linguisticDetails, detail.queryText, detail.searchSuggestionCollection.
-        **/
-        onsuggestionsrequested(eventInfo: CustomEvent): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Releases resources held by this AutoSuggestBox. Call this method when the AutoSuggestBox is no longer needed. After calling this method, the AutoSuggestBox becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param eventName The name of the event that the event handler is registered for.
-         * @param eventCallback The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
-
-        /**
-         * Specifies whether suggestions based on local files are automatically displayed in the input field, and defines the criteria that
-         * the system uses to locate and filter these suggestions.
-         * @param settings The new settings for local content suggestions.
-        **/
-        setLocalContentSuggestionSettings(settings: any): void
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets whether the first suggestion is chosen when the user presses Enter.
-        **/
-        chooseSuggestionOnEnter: boolean;
-
-        /**
-         * Gets or sets a value that specifies whether the AutoSuggestBox is disabled. If the control is disabled, it won't receive focus.
-        **/
-        disabled: boolean;
-
-        /**
-         * Gets the DOM element that hosts the AutoSuggestBox.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets or sets the placeholder text for the AutoSuggestBox. This text is displayed if there is no other text in the input box.
-        **/
-        placeholderText: string;
-
-        /**
-         * Gets or sets the query text for the AutoSuggestBox.
-        **/
-        queryText: string;
-
-        /**
-         * Gets or sets the history context. This context is used a secondary key (the app ID is the primary key) for storing history.
-        **/
-        searchHistoryContext: string;
-
-        /**
-         * Gets or sets a value that specifies whether history is disabled.
-        **/
-        searchHistoryDisabled: boolean;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-        /**
-         * Creates the image argument for SearchSuggestionCollection.appendResultSuggestion.
-         * @param url The url of the image.
-        **/
-        static createResultSuggestionImage(url: string): any;
-    }
-
-    /**
-     * Provides backwards navigation in the form of a button.
-    **/
-    class BackButton {
-        //#region Constructors
-
-        /**
-         * Creates a new BackButton.
-         * @constructor
-         * @param element The DOM element hosts the new BackButton.
-         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Releases resources held by this BackButton. Call this method when the BackButton is no longer needed. After calling this method, the BackButton becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Checks the current navigation history and updates the value of the control's disabled attribute.
-        **/
-        refresh(): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param eventName The name of the event that the event handler is registered for.
-         * @param eventCallback The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets the HTML element that hosts this BackButton.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Represents a layout for the ListView in which items are arranged in a grid and items can span multiple grid cells.
-    **/
-    class CellSpanningLayout {
-        //#region Constructors
-
-        /**
-         * Creates a new CellSpanningLayout.
-         * @constructor
-         * @param options An object that contains one or more property/value pairs to apply to the new CellSpanningLayout. Each property of the options object corresponds to one of the object's properties or events. Event names must begin with "on".
-        **/
-        constructor(options?: any);
-
-        //#endregion Constructors
-
-        //#region Methods
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        dragLeave(): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        dragOver(): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        executeAnimations(): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-         * @param currentItem An object that describes the current item. It has these properties: index, type.
-         * @param pressedKey The key that was pressed.
-         * @returns An object that describes the next item that should receive focus. It has these properties: index, type.
-        **/
-        getAdjacent(currentItem: any, pressedKey: WinJS.Utilities.Key): any;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-         * @param x The x-coordinate, or the horizontal position on the screen.
-         * @param y The y-coordinate, or the vertical position on the screen.
-        **/
-        hitTest(x: number, y: number): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-         * @param site The rendering site for the layout.
-         * @param groupsEnabled Set to true if this layout supports groups; set to false if it does not.
-        **/
-        initialize(site: ILayoutSite2, groupsEnabled: boolean): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-         * @param firstPixel The first pixel the range of items falls between.
-         * @param lastPixel The last pixel the range of items falls between.
-        **/
-        itemsFromRange(firstPixel: number, lastPixel: number): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-         * @param tree
-         * @param changedRange
-         * @param modifiedItems
-         * @param modifiedGroups
-        **/
-        layout(tree: ILayoutSite2, changedRange: any, modifiedItems: any, modifiedGroups: any): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        setupAnimations(): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        uninitialize(): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets the position of group headers relative to their items.
-        **/
-        groupHeaderPosition: WinJS.UI.HeaderPosition;
-
-        /**
-         * Gets or sets a function that enables cell-spanning and establishes base cell dimensions.
-        **/
-        groupInfo: Function;
-
-        /**
-         * Gets or sets a function that returns the width and height of an item, as well as whether it should appear in a new column. Setting this function improves performance because the ListView can allocate space for an item without having to measure it first.
-        **/
-        itemInfo: Function;
-
-        /**
-         * Gets or set the maximum number of rows or columns, depending on the orientation, to display before content begins to wrap.
-        **/
-        maximumRowsOrColumns: number;
-
-        /**
-         * This API supports the Windows Library for JavaScript infrastructure and is not intended to be used directly from your code.
-        **/
-        numberOfItemsPerItemsBlock: any;
-
-        /**
-         * Gets the orientation of the CellSpanningLayout. For a CellSpanningLayout, this property always returns Orientation.horizontal.
-        **/
-        orientation: WinJS.UI.Orientation;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Data associated with hiding a dialog.
-    **/
-    interface ContentDialogHideInfo {
-        /***
-         * The dialog's dismissal result. May be 'primary', 'secondary', 'none', or whatever custom value was passed to hide.
-        **/
-        result: string
-    }
-
-    /**
-     * Event object associated with hiding a dialog.
-    **/
-    interface ContentDialogHideEvent extends Event {
-        detail: ContentDialogHideInfo
-    }
-
-    /**
-     * Represents a command to be displayed in an AppBar or ToolBar
-    **/
-    class Command extends AppBarCommand implements ICommand {
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-    }
-
-    /**
-     * Displays a modal dialog which can display arbitrary HTML content.
-    **/
-    class ContentDialog {
-        /**
-         * Specifies the result of dismissing the ContentDialog.
-        **/
-        static DismissalResult: {
-            /**
-              * The dialog was dismissed without the user selecting any of the commands. The user may have dismissed the dialog by hitting the escape key or pressing the hardware back button.
-            **/
-            none: string;
-            /**
-             * The user dismissed the dialog by pressing the primary command.
-            **/
-            primary: string;
-            /**
-             * The user dismissed the dialog by pressing the secondary command.
-            **/
-            secondary: string
-        }
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        /**
-         * Creates a new ContentDialog control.
-         * @constructor
-         * @param The DOM element that hosts the ContentDialog control.
-         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        /**
-         * Gets the DOM element that hosts the ContentDialog control.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets or sets the ContentDialog's visibility.
-        **/
-        hidden: boolean;
-
-        /**
-         * The text displayed as the title of the dialog.
-        **/
-        title: string;
-
-        /**
-         * The text displayed on the primary command's button.
-        **/
-        primaryCommandText: string;
-
-        /**
-         * Indicates whether the button representing the primary command is currently disabled.
-        **/
-        primaryCommandDisabled: boolean;
-
-        /**
-         * The text displayed on the secondary command's button.
-        **/
-        secondaryCommandText: string;
-
-        /**
-         * Indicates whether the button representing the secondary command is currently disabled.
-        **/
-        secondaryCommandDisabled: boolean;
-
-        /**
-         * Shows the ContentDialog. Only one ContentDialog may be shown at a time. If another ContentDialog is already shown, this ContentDialog will remain hidden.
-         * @returns  A promise which is successfully fulfilled when the dialog is dismissed. The completion value indicates the dialog's dismissal result. This may be 'primary', 'secondary', 'none', or whatever custom value was passed to hide. If this ContentDialog cannot be shown because a ContentDialog is already showing or the ContentDialog is disposed, then the return value is a promise which is in an error state. If preventDefault() is called on the beforeshow event, then this promise will be canceled.
-        **/
-        show(): Promise<ContentDialogHideInfo>;
-
-        /**
-         * Hides the ContentDialog.
-         * @param result A value indicating why the dialog is being hidden. The promise returned by show will be fulfilled with this value.
-        **/
-        hide(result?: any): void;
-
-        /**
-         * Disposes this control.
-        **/
-        dispose(): void;
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param eventName The name of the event that the event handler is registered for.
-         * @param eventCallback The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Raised just before showing a dialog. Call preventDefault on this event to stop the dialog from being shown.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onbeforeshow(eventInfo: Event): void;
-
-        /**
-         * Raised immediately after a dialog is fully shown.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onaftershow(eventInfo: Event): void;
-
-        /**
-         * Raised just before hiding a dialog. Call preventDefault on this event to stop the dialog from being hidden.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onbeforehide(eventInfo: ContentDialogHideEvent): void;
-
-        /**
-         * Raised immediately after a dialog is fully hidden.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onafterhide(eventInfo: ContentDialogHideEvent): void;
-    }
-
-    /**
-     * Allows users to pick a date value.
-    **/
-    class DatePicker {
-        //#region Constructors
-
-        /**
-         * Initializes a new instance of the DatePicker control.
-         * @constructor
-         * @param element The DOM element associated with the DatePicker control.
-         * @param options The set of options to be applied initially to the DatePicker control. The options are the following: calendar, current, datePattern, disabled, maxYear, minYear, monthPattern, yearPattern.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * Occurs when any of the controls are changed by the user.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onchange(eventInfo: CustomEvent): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Adds an event listener.
-         * @param type The type (name) of the event.
-         * @param listener The function that handles the event.
-         * @param capture If true, specifies that capture should be initiated, otherwise false.
-        **/
-        addEventListener(type: string, listener: Function, capture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Releases resources held by this DatePicker. Call this method when the DatePicker is no longer needed. After calling this method, the DatePicker becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code. Use render instead.
-        **/
-        static getInformation(startDate: any, endDate: any, calendar?: any, datePatterns?: any): any;
-
-        /**
-         * Removes a listener for the specified event.
-         * @param type The name of the event for which to remove a listener.
-         * @param listener The listener.
-         * @param useCapture Optional. The same value that was passed to addEventListener for this listener. It may be omitted if it was omitted when calling addEventListener.
-        **/
-        removeEventListener(type: string, listener: Function, useCapture?: any): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets the calendar to use.
-        **/
-        calendar: string;
-
-        /**
-         * Gets or sets the current date of the DatePicker. You can use either a date string or a Date object to set this property.
-        **/
-        current: Date;
-
-        /**
-         * Gets or sets the display pattern for the date. The default date pattern is day.integer(2). You can change the date pattern by changing the number of integers displayed.
-        **/
-        datePattern: string;
-
-        /**
-         * Specifies whether the DatePicker is disabled.
-        **/
-        disabled: boolean;
-
-        /**
-         * Gets the DOM element for the DatePicker.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets or sets the maximum Gregorian year available for picking.
-        **/
-        maxYear: number;
-
-        /**
-         * Gets or sets the minimum Gregorian year available for picking.
-        **/
-        minYear: number;
-
-        /**
-         * Gets or sets the display pattern for the month. The default month pattern is month.abbreviated. You can change the month pattern to the following values: month.full. The full name of the month. month.abbreviated(n). You can use abbreviated with or without specifying the number of letters in the abbreviation. If you do specify the number of letters, the actual length of the month name that appears may vary. month.solo.full. A representation of the month that is suitable for stand-alone display. You can also use month.solo.abbreviated(n). month.integer(n). You can use integer with or without specifying the number of integers.
-        **/
-        monthPattern: string;
-
-        /**
-         * Gets or sets the display pattern for the year. The default year pattern is year.full. You can change the year pattern to the following values: year.abbreviated(n). You can use abbreviated with or without specifying the number of letters in the abbreviation.
-        **/
-        yearPattern: string;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Adds event-related methods to the control.
-    **/
-    namespace DOMEventMixin {
-        //#region Methods
-
-        /**
-         * Adds an event listener to the control.
-         * @param type The type (name) of the event.
-         * @param listener The listener to invoke when the event gets raised.
-         * @param useCapture true to initiate capture; otherwise, false.
-        **/
-        export function addEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type, adding the specified additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        export function dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Removes an event listener from the control.
-         * @param type The type (name) of the event.
-         * @param listener The listener to remove.
-         * @param useCapture true to initiate capture; otherwise, false.
-        **/
-        export function removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-        //#endregion Methods
-    }
-
-    /**
-     * Displays a collection, such as a set of photos, one item at a time.
-    **/
-    class FlipView<T> {
-        //#region Constructors
-
-        /**
-         * Creates a new FlipView.
-         * @constructor
-         * @param element The DOM element that hosts the control.
-         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property corresponds to one of the control's properties or events. Event names must begin with "on". For example, to provide a handler for the pageselected event, add a property named "onpageselected" and set its value to the event handler.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * Occurs when the datasource count changes.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: source.
-        **/
-        ondatasourcecountchanged(eventInfo: Event): void;
-
-        /**
-         * Raised when the FlipView flips to a page and its renderer function completes.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.source.
-        **/
-        onpagecompleted(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised when the FlipView flips to a page.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.source.
-        **/
-        onpageselected(eventInfo: CustomEvent): void;
-
-        /**
-         * Occurs when an item becomes invisible or visible.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.source, detail.visible.
-        **/
-        onpagevisibilitychanged(eventInfo: CustomEvent): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param eventName The name of the event to handle. For a list of events, see the FlipView object page.
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Returns the number of items in the FlipView control's itemDataSource.
-         * @returns A Promise that contains the number of items in the list or WinJS.UI.CountResult.unknown if the count is unavailable.
-        **/
-        count(): Promise<number>;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Releases resources held by this FlipView. Call this method when the FlipView is no longer needed. After calling this method, the FlipView becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Forces the FlipView to update its layout. Use this function when making the FlipView visible again after its style.display property had been set to "none".
-        **/
-        forceLayout(): void;
-
-        /**
-         * Navigates to the next page.
-         * @returns true if the FlipView begins navigating to the next page; false if the FlipView is already at the last item or is in the middle of another navigation animation.
-        **/
-        next(): boolean;
-
-        /**
-         * Navigates to the previous item.
-         * @returns true if the FlipView begins navigating to the previous page; nfalse if the FlipView is already at the first page or is in the middle of another navigation animation.
-        **/
-        previous(): boolean;
-
-        /**
-         * Unregisters an event handler for the specified event.
-         * @param eventName The name of the event.
-         * @param eventHandler The event handler function to remove.
-         * @param useCapture Set to true to unregister the event handler for the capturing phase; otherwise, set to false to unregister the event handler for the bubbling phase.
-        **/
-        removeEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Sets custom animations for the FlipView to use when navigating between pages.
-         * @param animations An object that contains up to three fields, one for each navigation action: next, previous, and jump. Each of those fields must be a function with this signature: function (outgoingPage, incomingPage) Each function must return a WinJS.Promise that completes once the animations are finished. If a field is null or undefined, the FlipView reverts to its default animation for that action.
-        **/
-        setCustomAnimations(animations: any): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets the index of the currently displayed page.
-        **/
-        currentPage: number;
-
-        /**
-         * Gets the HTML element that hosts this FlipView.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets or sets the data source that provides the FlipView with items to display. The FlipView displays one item at a time, on its own page.
-        **/
-        itemDataSource: IListDataSource<T>;
-
-        /**
-         * Gets or sets the spacing between each item, in pixels.
-        **/
-        itemSpacing: number;
-
-        /**
-         * Gets or sets a Template or function that defines the HTML for each item's page.
-        **/
-        itemTemplate: any;
-
-        /**
-         * Gets or sets the orientation of the FlipView, horizontal or vertical.
-        **/
-        orientation: string;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        /**
-         * Event Name
-        **/
-        static datasourceCountChangedEvent: string;
-
-        /**
-         * Event Name
-        **/
-        static pageCompletedEvent: string;
-
-        /**
-         * Event Name
-        **/
-        static pageSelectedEvent: string;
-
-        /**
-         * Event Name
-        **/
-        static pageVisibilityChangedEvent: string;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Displays lightweight UI that is either information, or requires user interaction. Unlike a dialog, a Flyout can be light dismissed by clicking or tapping off of it.
-    **/
-    class Flyout {
-        //#region Constructors
-
-        /**
-         * Creates a new Flyout object.
-         * @constructor
-         * @param element The DOM element that will host the control.
-         * @param options The set of properties and values to apply to the new Flyout.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * Raised immediately after a flyout is fully hidden.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onafterhide(eventInfo: Event): void;
-
-        /**
-         * Raised immediately after a flyout is fully shown.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onaftershow(eventInfo: Event): void;
-
-        /**
-         * Raised just before hiding a flyout.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onbeforehide(eventInfo: Event): void;
-
-        /**
-         * Raised just before showing a flyout.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onbeforeshow(eventInfo: Event): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param type The event type to register. It must be beforeshow, beforehide, aftershow, or afterhide.
-         * @param listener The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(eventName: string, eventProperties: any): boolean;
-
-        /**
-         * Releases resources held by this object. Call this method when the object is no longer needed. After calling this method, the object becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Hides the Flyout, if visible, regardless of other states.
-        **/
-        hide(): void;
-
-        /**
-         * Shows the Flyout, if hidden, regardless of other states.
-         * @param anchor. DOM element to temporarily anchor the position of the Flyout to. This is optional if Flyout.anchor has already been set.
-         * @param placement The placement of the Flyout to the anchor: the string literal "top", "bottom", "left", or "right".
-         * @param alignment For "top" or "bottom" placement, the alignment of the Flyout to the anchor's edge: the string literal "center", "left", or "right".
-        **/
-        show(anchor?: HTMLElement, placement?: string, alignment?: string): void;
-
-        /**
-         * Shows the Flyout, if hidden, regardless of other states, top and left aligned at the specified coordinates,
-         * @param coordinates Required. The point where the top left corner of the flyout will appear, relative to the top and left edge of the visual viewport.
-        **/
-        showAt(coordinates: { x: number; y: number; }): void;
-
-        /**
-         * Shows the Flyout, if hidden, regardless of other states, top and left aligned at the location of the mouse event object,
-         * @param mouseEventObj Required. The MouseEvent Object specifying where to show the Flyout.
-        **/
-        showAt(mouseEventObj: MouseEvent): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param type The event type to unregister. It must be beforeshow, beforehide, aftershow, or afterhide.
-         * @param listener The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets the default alignment to be used for this Flyout.
-        **/
-        alignment: string;
-
-        /**
-         * Gets or sets the default anchor to be used for this Flyout.
-        **/
-        anchor: HTMLElement;
-
-        /**
-         * Gets or sets a value that indicates whether the Flyout is disabled.
-        **/
-        disabled: boolean;
-
-        /**
-         * Gets the DOM element that hosts the Flyout.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets a value that indicates whether the Flyout is hidden or in the process of becoming hidden, or sets the Flyout to hide or show itself.
-        **/
-        hidden: boolean;
-
-        /**
-         * Gets or sets the default placement to be used for this Flyout.
-        **/
-        placement: string;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Represents a grid layout for the ListView in which items are arranged in a horizontal grid.
-    **/
-    class GridLayout {
-        //#region Constructors
-
-        /**
-         * Creates a new GridLayout object.
-         * @constructor
-         * @param options The set of properties and values to apply to the new GridLayout.
-        **/
-        constructor(options?: any);
-
-        //#endregion Constructors
-
-        //#region Methods
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        dragLeave(): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        dragOver(): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        executeAnimations(): void;
-
-        /**
-         * Determines the next item to receive keyboard focus.
-         * @param currentItem An object that describes the current item. It has these properties: index, type.
-         * @param pressedKey The key that was pressed.
-         * @returns An object that describes the next item that should receive focus. It has these properties: index, type.
-        **/
-        getAdjacent(currentItem: any, pressedKey: WinJS.Utilities.Key): any;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-         * @param x The x-coordinate, or the horizontal position on the screen.
-         * @param y The y-coordinate, or the vertical position on the screen.
-        **/
-        hitTest(x: number, y: number): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-         * @param site The rendering site for the layout.
-         * @param groupsEnabled Set to true if this layout supports groups; set to false if it does not.
-        **/
-        initialize(site: ILayoutSite2, groupsEnabled: boolean): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-         * @param firstPixel The first pixel the range of items falls between.
-         * @param lastPixel The last pixel the range of items falls between.
-        **/
-        itemsFromRange(firstPixel: number, lastPixel: number): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-         * @param tree
-         * @param changedRange
-         * @param modifiedItems
-         * @param modifiedGroups
-        **/
-        layout(tree: any, changedRange: any, modifiedItems: any, modifiedGroups: any): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        setupAnimations(): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        uninitialize(): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * This property is no longer supported. Starting with Windows Library for JavaScript 2.0, use the .win-listview.win-container.win-backdrop CSS selector.
-        **/
-        backdropColor: string;
-
-        /**
-         * This property is no longer supported. Starting with Windows Library for JavaScript 2.0, use the .win-listview.win-container.win-backdrop CSS selector.
-        **/
-        disableBackdrop: boolean;
-
-        /**
-         * Gets or sets the position of group headers.
-        **/
-        groupHeaderPosition: WinJS.UI.HeaderPosition;
-
-        /**
-         * This property is no longer supported. Starting with the Windows Library for JavaScript 2.0, use a CellSpanningLayout.
-        **/
-        groupInfo: Function;
-
-        /**
-         * This property is no longer supported. Starting with the Windows Library for JavaScript 2.0, use a CellSpanningLayout.
-        **/
-        itemInfo: Function;
-
-        /**
-         * Gets or set the maximum number of rows or columns, depending on the orientation, to display before content begins to wrap.
-        **/
-        maximumRowsOrColumns: number;
-
-        /**
-         * This property is no longer supported. Starting with Windows Library for JavaScript 2.0, use the maximumRowsOrColumns property.
-        **/
-        maxRows: number;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        numberOfItemsPerItemsBlock: any;
-
-        /**
-         * Gets or sets the orientation of the GridLayout.
-        **/
-        orientation: WinJS.UI.Orientation;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Creates a hub navigation pattern consisting of sections that can be navigated to. Each section is defined by a HubSection object.
-    **/
-    class Hub {
-        //#region Constructors
-
-        /**
-         * Creates a new Hub control.
-         * @constructor
-         * @param element The DOM element that will host the Hub control.
-         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events. Event names must begin with "on". For example, to provide a handler for the contentanimating event, add a property named "oncontentanimating" to the options object and set its value to the event handler.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * Raised when the Hub is about to play entrance, content transition, insert, or remove animations.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.type, detail.index, detail.section.
-        **/
-        oncontentanimating(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised when the user clicks on an interactive header.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.index, detail.section.
-        **/
-        onheaderinvoked(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised when the Hub control's loadingState changes.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: loadingState.
-        **/
-        onloadingstatechanged(eventInfo: CustomEvent): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Releases resources held by this Hub. Call this method when the Hub is no longer needed. After calling this method, the Hub becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Forces the Hub to update its layout.
-         * Use this function when making the Hub visible again after you've set its style.display property to "none” or after style changes have been made that affect the size of the HubSections.
-        **/
-        forceLayout(): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param eventName The name of the event that the event handler is registered for.
-         * @param eventCallback The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets the DOM element that hosts the Hub control.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets or sets the Template or templating function that creates the DOM elements for each HubSection header. Your HubSection object should provide strings for HubSection.header property.
-        **/
-        headerTemplate: any;
-
-        /**
-         * Gets or sets the index of the first HubSection at least partially in view. This property is useful for animating the visible content in the Hub.
-        **/
-        indexOfFirstVisible: number;
-
-        /**
-         * Gets or sets the index of last HubSection at least partially in view. Used for animating the visible content in the Hub.
-        **/
-        indexOfLastVisible: number;
-
-        /**
-         * Gets a value that indicates whether the hub is still loading or whether loading is complete. The value changes to complete after all the sections and content inside them has loaded.
-        **/
-        loadingState: string;
-
-        /**
-         * Gets or sets the orientation of sections within the Hub.
-        **/
-        orientation: Orientation;
-
-        /**
-         * Gets or sets the distance between the start of the Hub and the current viewable area.
-        **/
-        scrollPosition: number;
-
-        /**
-         * Gets or sets the index of the first visible HubSection.
-        **/
-        sectionOnScreen: number;
-
-        /**
-         * Gets or sets the List that contains the HubSection objects that belong to this Hub.
-        **/
-        sections: WinJS.Binding.List<HubSection>;
-
-        /**
-         * This API supports the SemanticZoom infrastructure and is not intended to be used directly from your code.
-        **/
-        zoomableView: IZoomableView<any>;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        /**
-         * Specifies whether the Hub animation is an entrance animation or a transition animation.
-        **/
-        static AnimationType: {
-            /**
-             * The animation plays when the Hub is first displayed.
-            **/
-            entrance: string;
-            /**
-             * The animation plays when the Hub is changing its content.
-            **/
-            contentTransition: string;
-            /**
-             * The animation plays when a section is inserted into the Hub.
-            **/
-            insert: string;
-            /**
-             * The animation plays when a section is removed into the Hub.
-            **/
-            remove: string;
-        }
-
-        /**
-         * Gets the current loading state of the Hub.
-        **/
-        static LoadingState: {
-            /**
-             * The Hub is loading sections.
-            **/
-            loading: string;
-            /**
-             * All sections are loaded and animations are complete.
-            **/
-            complete: string;
-        }
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Defines a section of a Hub.
-    **/
-    class HubSection {
-        //#region Constructors
-
-        /**
-         * Creates a new HubSection.
-         * @constructor
-         * @param element The DOM element hosts the new HubSection.
-         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Methods
-
-        /**
-         * Releases resources held by this HubSection. Call this method when the HubSection is no longer needed. After calling this method, the HubSection becomes unusable.
-        **/
-        dispose(): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets the DOM element that hosts the HubSection control's content.
-        **/
-        contentElement: HTMLElement;
-
-        /**
-         * Gets the DOM element that hosts this HubSection.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets or sets the header for this HubSection.
-        **/
-        header: string;
-
-        /**
-         * Gets a value that specifies whether the header is static.
-        **/
-        isHeaderStatic: boolean;
-
-        /**
-         * This object supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        static isDeclarativeControlContainer: any;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Enables you to include an HTML page dynamically. As part of the constructor, you must include an option indicating the URI of the page.
-    **/
-    class HtmlControl {
-        //#region Constructors
-
-        /**
-         * Initializes a new instance of HtmlControl to define a new page control.
-         * @constructor
-         * @param element The element that hosts the HtmlControl.
-         * @param options The options for configuring the page. The uri option is required in order to specify the source document for the content of the page. Other options are the ones used by the WinJS.Pages.render method.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Properties
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Defines an item that can be pressed, swiped, and dragged.
-    **/
-    class ItemContainer {
-        //#region Constructors
-
-        /**
-         * Creates a new ItemContainer.
-         * @constructor
-         * @param element The DOM element hosts the new ItemContainer. For the ItemContainer to be accessible, this element must have its role attribute set to "list" or "listbox". If tapBehavior is set to none and selectionDisabled is true, then use the "list" role; otherwise, use the "listbox" role.
-         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * Raised when the item is invoked. (You can use the tapBehavior property to specify whether taps and clicks invoke the item.)
-         * @param eventInfo An object that contains information about the event.
-        **/
-        oninvoked(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised after the item is selected or deselected.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onselectionchanged(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised just before the current selection changes.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onselectionchanging(eventInfo: CustomEvent): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Releases resources held by this ItemContainer. Call this method when the ItemContainer is no longer needed. After calling this method, the ItemContainer becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Forces the ItemContainer to update its layout. Call this function when the reading direction of the app changes after the control has been initialized.
-        **/
-        forceLayout(): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param eventName The name of the event that the event handler is registered for.
-         * @param eventCallback The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets a value that specifies whether the item can be dragged.
-        **/
-        draggable: boolean;
-
-        /**
-         * Gets the element that hosts this ItemContainer.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets or sets a value that specifies whether the item is selected.
-        **/
-        selected: boolean;
-
-        /**
-         * Gets or sets a value that specifies whether selection of this item is disabled.
-        **/
-        selectionDisabled: boolean;
-
-        /**
-         * Gets or sets how the ItemContainer reacts to the swipe gesture. The swipe gesture can select the swiped items or can have no effect on the current selection.
-        **/
-        swipeBehavior: WinJS.UI.SwipeBehavior;
-
-        /**
-         * Gets or sets the orientation of swipe gestures.
-        **/
-        swipeOrientation: Orientation;
-
-        /**
-         * Gets or sets how the ItemContainer reacts when the user taps or clicks an item.
-        **/
-        tapBehavior: TapBehavior;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * This object supports the WinJS infrastructure and is not intended to be used directly from your code.
-    **/
-    class Layout {
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-    }
-
-    /**
-     * Represents a layout for the ListView in which items are arranged in a vertical list.
-    **/
-    class ListLayout {
-        //#region Constructors
-
-        /**
-         * Creates a new ListLayout.
-         * @constructor
-         * @param options An object that contains one or more property/value pairs to apply to the new ListLayout. Each property of the options object corresponds to one of the object's properties or events. Event names must begin with "on".
-        **/
-        constructor(options?: any);
-
-        //#endregion Constructors
-
-        //#region Methods
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        dragLeave(): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        dragOver(): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        executeAnimations(): void;
-
-        /**
-         * Determines the next item to receive keyboard focus.
-         * @param currentItem An object that describes the current item. It has these properties: index, type.
-         * @param pressedKey The key that was pressed.
-         * @returns An object that describes the next item that should receive focus. It has these properties: index, type.
-        **/
-        getAdjacent(currentItem: any, pressedKey: WinJS.Utilities.Key): any;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-         * @param x The x-coordinate, or the horizontal position on the screen.
-         * @param y The y-coordinate, or the vertical position on the screen.
-        **/
-        hitTest(x: number, y: number): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        initialize(): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-         * @param firstPixel
-         * @param lastPixel
-        **/
-        itemsFromRange(firstPixel: number, lastPixel: number): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-         * @param tree
-         * @param changedRange
-         * @param modifiedItems
-         * @param modifiedGroups
-        **/
-        layout(tree: any, changedRange: any, modifiedItems: any, modifiedGroups: any): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        setupAnimations(): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        uninitialize(): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * This property is no longer supported. Starting with Windows Library for JavaScript 2.0, use the .win-listview.win-container.win-backdrop CSS selector.
-        **/
-        backdropColor: string;
-
-        /**
-         * This property is no longer supported. Starting with Windows Library for JavaScript 2.0, use the .win-listview.win-container.win-backdrop CSS selector.
-        **/
-        disableBackdrop: boolean;
-
-        /**
-         * Gets or sets the position of group headers.
-        **/
-        groupHeaderPosition: WinJS.UI.HeaderPosition;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        numberOfItemsPerItemsBlock: any;
-
-        /**
-         * Gets or sets the orientation of the GridLayout.
-        **/
-        orientation: WinJS.UI.Orientation;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Displays data items in a customizable list or grid.
-    **/
-    class ListView<T> {
-        //#region Constructors
-
-        /**
-         * Creates a new ListView.
-         * @constructor
-         * @param element The DOM element that hosts the ListView control.
-         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events. Event names must begin with "on". For example, to provide a handler for the selectionchanged event, add a property named "onselectionchanged" to the options object and set its value to the event handler.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * Raised when the accessibility attributes have been added to the ListView items.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties detail.firstIndex, detail.lastIndex, detail.firstHeaderIndex, detail.lastHeaderIndex.
-        **/
-        onaccessibilityannotationcomplete(eventInfo: CustomEvent): void;
-
-        /**
-         * Occurs when the ListView is about to play an entrance or contentTransition animation.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.type, detail.setPromise.
-        **/
-        oncontentanimating(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised when the user taps or clicks a group header.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.groupHeaderIndex, detail.groupHeaderPromise.
-        **/
-        ongroupheaderinvoked(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised when the ListView is a drop target and the onitemdragenter has been disabled. This is raised every time the cursor is moved between a new pair of items. If you call preventDefault on this event, then the ListView does not move the items slightly above/below the cursor to provide visual feedback for a drop.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains additional information about the event.
-        **/
-        onitemdragbetween(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised when the user is dragging an item from the ListView and the datasource changes while the user is dragging.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains additional information about the event.
-        **/
-        onitemdragchanged(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised when an item is dropped onto the ListView as the result of a drag operation.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.dataTransfer, detail.index, detail.insertAfterIndex.
-        **/
-        onitemdragdrop(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised when the user drops an item dragged from a ListView.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onitemdragend(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised when an dragged item enters the bounds of the ListView control.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.dataTransfer.
-        **/
-        onitemdragenter(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised when a draggable item leaves the bounds of a ListView control.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onitemdragleave(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised when the user begins to drag an item from a ListView control.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.dataTransfer, detail.dragInfo.
-        **/
-        onitemdragstart(eventInfo: CustomEvent): void;
-
-        /**
-         * Occurs when the user taps or clicks an item.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.itemIndex.
-        **/
-        oniteminvoked(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised when the focused item changes.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.oldFocus, detail.oldNewFocus.
-        **/
-        onkeyboardnavigating(eventInfo: CustomEvent): void;
-
-        /**
-         * Occurs when the ListView control's loadingState changes.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.scrolling.
-        **/
-        onloadingstatechanged(eventInfo: CustomEvent): void;
-
-        /**
-         * Occurs after the current selection changes.
-         * @param eventInfo An object that contains information about the event. The detail property of this object is null. To obtain the selected items, use the ListView.selection property.
-        **/
-        onselectionchanged(eventInfo: CustomEvent): void;
-
-        /**
-         * Occurs just before the current selection changes.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.newSelection, detail.preventTapBehavior.
-        **/
-        onselectionchanging(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised when the header's visibility property changes.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.visible.
-        **/
-        onheadervisibilitychanged(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised when the footer's visibility property changes.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.visible.
-        **/
-        onfootervisibilitychanged(eventInfo: CustomEvent): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param eventName The name of the event to handle. See the ListView object page for a list of events. Note that you drop the "on" when specifying the event name for the addEventListener method. For example, instead of specifying "onselectionchange", you specify "selectionchange".
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Releases resources held by this object. Call this method when the object is no longer needed. After calling this method, the object becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Returns the DOM element that represents the item at the specified index.
-         * @param itemIndex The index of the item.
-         * @returns The DOM element that represents the item at the specified index.
-        **/
-        elementFromIndex(itemIndex: number): HTMLElement;
-
-        /**
-         * Makes the item at the specified index visible. If necessary, the ListView will scroll to the item.
-         * @param itemIndex The index of the item to scroll into view.
-        **/
-        ensureVisible(itemIndex: number): void;
-
-        /**
-         * Forces the ListView to update its layout. Use this function when making the ListView visible again after its style.display property had been set to "none".
-        **/
-        forceLayout(): void;
-
-        /**
-         * Returns the index of the item that the specified DOM element displays.
-         * @param element The DOM element that displays the item.
-         * @returns The index of the item displayed by element.
-        **/
-        indexOfElement(element: HTMLElement): number;
-
-        /**
-         * Loads the next set of pages if the ListView control's loadingBehavior is set to "incremental" (otherwise, it does nothing). The number of pages to be loaded is determined by the pagesToLoad property.
-        **/
-        loadMorePages(): void;
-
-        /**
-         * Repositions all the visible items in the ListView to adjust for items whose sizes have changed. Most apps won’t ever need to call this method. For more info, see the Remarks section.
-        **/
-        recalculateItemPosition(): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param eventName The name of the event that the event handler is registered for.
-         * @param eventCallback The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
-
-        /**
-         * Triggers the ListView disposal service manually.
-        **/
-        static triggerDispose(): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets a value that indicates whether the next set of pages is automatically loaded when the user scrolls beyond the number of pages specified by the pagesToLoadThreshold property.
-        **/
-        automaticallyLoadPages: boolean;
-
-        /**
-         * Gets or sets an IListViewItem that indicates which item should have keyboard focus and the focus state of that item.
-        **/
-        currentItem: IListViewItem;
-
-        /**
-         * Gets the HTML element that hosts this ListView.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets or sets the data source that contains the groups for the items in the itemDataSource.
-        **/
-        groupDataSource: IListDataSource<T>;
-
-        /**
-         * Gets or sets how the ListView reacts when the user taps or clicks a group header.
-        **/
-        groupHeaderTapBehavior: GroupHeaderTapBehavior;
-
-        /**
-         * Gets or sets the Template or function that creates the DOM elements for each group header in the groupDataSource. Each group header can contain multiple elements, but it must have a single root element.
-        **/
-        groupHeaderTemplate: any;
-
-        /**
-         * Gets or sets the first visible item.
-        **/
-        indexOfFirstVisible: number;
-
-        /**
-         * Gets the index of the last visible item in the ListView.
-        **/
-        indexOfLastVisible: number;
-
-        /**
-         * Gets or sets the data source that provides the ListView with items.
-        **/
-        itemDataSource: IListDataSource<T>;
-
-        /**
-         * Go Gets or sets a value that specifies whether items can be dragged. When this is set to true the ListView provides built in behaviors related to item dragging.
-        **/
-        itemsDraggable: boolean;
-
-        /**
-         * Gets or sets whether the ListView control's items can be reordered within itself by dragging and dropping.
-        **/
-        itemsReorderable: boolean;
-
-        /**
-         * Gets or sets the WinJS.Binding.Template or templating function that creates the DOM elements for each item in the itemDataSource. Each item can contain multiple elements, but it must have a single root element.
-        **/
-        itemTemplate: any;
-
-        /**
-         * Gets or sets an object that controls the layout of the ListView.
-        **/
-        layout: ILayout2;
-
-        /**
-         * Gets or sets the footer of the ListView.
-        **/
-        footer: HTMLElement;
-
-        /**
-         * Gets or sets the header of the ListView.
-        **/
-        header: HTMLElement;
-
-        /**
-         * Gets or sets a value that specifies how the ListView fetches items and adds and removes them to the DOM. Don't change the value of this property after the ListView has begun loading data.
-        **/
-        loadingBehavior: string;
-
-        /**
-         * Gets a value that indicates whether the ListView is still loading or whether loading is complete.
-        **/
-        loadingState: string;
-
-        /**
-         * Gets or sets the maximum number of realized items.
-        **/
-        maxDeferredItemCleanup: number;
-
-        /**
-         * This property is deprecated. Gets or sets the number of pages to load when the loadingBehavior property is set to "incremental" and the user scrolls beyond the threshold specified by the pagesToLoadThreshold property.
-        **/
-        pagesToLoad: number;
-
-        /**
-         * This property is deprecated. Gets or sets the threshold (in pages) for initiating an incremental load. When the last visible item is within the specified number of pages from the end of the loaded portion of the list, and if automaticallyLoadPages is true and loadingBehavior is set to "incremental", the ListView initiates an incremental load.
-        **/
-        pagesToLoadThreshold: number;
-
-        /**
-         * Gets or sets the maximum number of pages to prefetch in the leading buffer for virtualization.
-        **/
-        maxLeadingPages: number;
-
-        /**
-         * Gets or sets the maximum number of pages to prefetch in the trailing buffer for virtualization.
-        **/
-        maxTrailingPages: number;
-
-        /**
-         * Gets or sets the function that is called when the ListView discards or recycles the element representation of a group header.
-        **/
-        resetGroupHeader: (header: any, element: HTMLElement) => void;
-
-        /**
-         * Gets or sets the function that is called when an item is removed, an item is changed, or an item falls outside of the realized range of the ListView.
-        **/
-        resetItem: (item: T, element: HTMLElement) => void;
-
-        /**
-         * Gets or sets the distance, in pixels, of the start of the viewable area within the viewport.
-        **/
-        scrollPosition: number;
-
-        /**
-         * Gets an ISelection that contains the range of currently selected items.
-        **/
-        selection: ISelection<T>;
-
-        /**
-         * Gets or sets the selection mode of the ListView.
-        **/
-        selectionMode: SelectionMode;
-
-        /**
-         * Gets or sets how the ListView reacts to the swipe gesture. The swipe gesture can select the swiped items or can have no effect on the current selection.
-        **/
-        swipeBehavior: WinJS.UI.SwipeBehavior;
-
-        /**
-         * Gets or sets how the ListView reacts when the user taps or clicks an item.
-        **/
-        tapBehavior: TapBehavior;
-
-        /**
-         * Gets a ZoomableView that supports semantic zoom functionality. This API supports the SemanticZoom infrastructure and is not intended to be used directly from your code.
-        **/
-        zoomableView: IZoomableView<ListView<T>>;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * An enumeration of Media commands that the transport bar buttons support.
-    **/
-    interface MediaCommand {
-        audioTracks: string;
-        cast: string;
-        chapterSkipBack: string;
-        chapterSkipForward: string;
-        closedCaptions: string;
-        fastForward: string;
-        goToLive: string;
-        nextTrack: string;
-        pause: string;
-        play: string;
-        playbackRate: string;
-        playFromBeginning: string;
-        previousTrack: string;
-        rewind: string;
-        seek: string;
-        stop: string;
-        timeSkipBack: string;
-        timeSkipForward: string;
-        volume: string;
-        zoom: string;
-    }
-
-    /**
-     * The types of timeline markers supported by the MediaPlayer.
-    **/
-    interface MarkerType {
-        advertisement: string;
-        chapter: string;
-        custom: string;
-    }
-
-    /**
-     * A tab control that displays multiple items.
-    **/
-    class Pivot {
-        //#region Constructors
-
-        /**
-         * Creates a new Pivot.
-         * @constructor
-         * @param element The DOM element hosts the new Pivot.
-         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events. Event names must begin with "on". For example, to provide a handler for the cancel event, add a property named "oncancel" to the options object and set its value to the event handler.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * Raised when a PivotItem control's animation ends.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onitemanimationend(eventInfo: Event): void;
-
-        /**
-         * Raised when a PivotItem control's animation starts.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onitemanimationstart(eventInfo: Event): void;
-
-        /**
-         * Raised when the user navigates to a different PivotItem.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onselectionchanged(eventInfo: Event): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param eventName The name of the event to handle.
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Releases resources held by this Pivot. Call this method when the Pivot is no longer needed. After calling this method, the Pivot becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Forces the control to relayout its content. This function is expected to be called
-         * when the pivot element is manually resized.
-        **/
-        forceLayout(): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param eventName The name of the event that the event handler is registered for.
-         * @param eventCallback The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets the DOM element that hosts the Pivot control.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets or sets the left custom header.
-        **/
-        customLeftHeader: HTMLElement;
-
-        /**
-         * Gets or sets the right custom header.
-        **/
-        customRightHeader: HTMLElement;
-
-        /**
-         * Gets or sets the Binding.List that contains the PivotItem objects that belong to this Pivot.
-        **/
-        items: Binding.List<PivotItem>;
-
-        /**
-         * Gets or sets a value that specifies whether the Pivot control is locked to the current item.
-        **/
-        locked: boolean;
-
-        /**
-         * Gets or sets the index of the PivotItem control in view.
-        **/
-        selectedIndex: number;
-
-        /**
-         * Gets or sets the PivotItem control in view within the Pivot control.
-        **/
-        selectedItem: PivotItem;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        /**
-         * Gets or sets the title displayed above the PivotItem controls.
-        **/
-        title: string;
-
-        //#endregion Properties
-    }
-
-    /**
-     * An item within a Pivot control.
-    **/
-    class PivotItem {
-        //#region Constructors
-
-        /**
-         * Creates a new PivotItem.
-         * @constructor
-         * @param element The DOM element hosts the new PivotItem.
-         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events. Event names must begin with "on". For example, to provide a handler for the cancel event, add a property named "oncancel" to the options object and set its value to the event handler.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Methods
-
-        /**
-         * Releases resources held by this PivotItem. Call this method when the PivotItem is no longer needed. After calling this method, the PivotItem becomes unusable.
-        **/
-        dispose(): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets the DOM element that hosts the PivotItem control's content.
-        **/
-        contentElement: HTMLElement;
-
-        /**
-         * Gets the DOM element that hosts the PivotItem control.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets or sets the header for this PivotItem.
-        **/
-        header: string;
-
-        /**
-         * This object supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        static isDeclarativeControlContainer: any;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-    }
-
-    /**
-     * Represents a menu flyout for displaying commands.
-    **/
-    class Menu {
-        //#region Constructors
-
-        /**
-         * Creates a new Menu object.
-         * @constructor
-         * @param element The DOM element that will host the control.
-         * @param options The set of properties and values to apply to the new Menu.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * Occurs immediately after the Menu is hidden.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onafterhide(eventInfo: Event): void;
-
-        /**
-         * Occurs after the Menu is shown.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onaftershow(eventInfo: Event): void;
-
-        /**
-         * Occurs before the Menu is hidden.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onbeforehide(eventInfo: Event): void;
-
-        /**
-         * Occurs before a hidden Menu is shown.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onbeforeshow(eventInfo: Event): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param type The event type to register. It must be beforeshow, beforehide, aftershow, or afterhide.
-         * @param listener The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(eventName: string, eventProperties: any): boolean;
-
-        /**
-         * Releases resources held by this Menu. Call this method when the Menu is no longer needed. After calling this method, the Menu becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Returns the MenuCommand object identified by id.
-         * @param id The element identifier (ID) of the command to be returned.
-         * @returns The command identified by id.
-        **/
-        getCommandById(id: string): MenuCommand;
-
-        /**
-         * Hides the Menu.
-        **/
-        hide(): void;
-
-        /**
-         * Hides the specified commands of the Menu.
-         * @param commands The commands to hide. The array elements may be MenuCommand objects, or the string identifiers (IDs) of commands.
-         * @param immediate The parameter immediate is not supported and may be altered or unavailable in the future. true to hide the commands immediately, without animating them; otherwise, false.
-        **/
-        hideCommands(commands: any[], immediate?: boolean): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param type The event type to unregister. It must be beforeshow, beforehide, aftershow, or afterhide.
-         * @param listener The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-        /**
-         * Shows the Menu, if hidden, regardless of other states.
-         * @param anchor Required. The DOM element to anchor the Menu.
-         * @param placement The placement of the Menu to the anchor: top, bottom, left, or right.
-         * @param alignment For top or bottom placement, the alignment of the Menu to the anchor's edge: center, left, or right.
-        **/
-        show(anchor: HTMLElement, placement?: string, alignment?: string): void;
-
-        /**
-         * Shows the Menu, if hidden, regardless of other states, top and left aligned at the specified coordinates,
-         * @param coordinates Required. The point where the top left corner of the Menu will appear, relative to the top and left edge of the visual viewport.
-        **/
-        showAt(coordinates: { x: number; y: number; }): void;
-
-        /**
-         * Shows the Menu, if hidden, regardless of other states, top and left aligned at the location of the mouse event object,
-         * @param mouseEventObj Required. The MouseEvent Object specifying where to show the Menu.
-        **/
-        showAt(mouseEventObj: MouseEvent): void;
-
-
-        /**
-         * Shows the specified commands of the Menu.
-         * @param commands The commands to show. The array elements may be Menu objects, or the string identifiers (IDs) of commands.
-         * @param immediate The parameter immediate is not supported and may be altered or unavailable in the future. true to show the commands immediately, without animating them; otherwise, false.
-        **/
-        showCommands(commands: any[], immediate?: boolean): void;
-
-        /**
-         * Shows the specified commands of the Menu while hiding all other commands.
-         * @param commands The commands to show. The array elements may be MenuCommand objects, or the string identifiers (IDs) of commands.
-         * @param immediate The parameter immediate is not supported and may be altered or unavailable in the future. true to show the specified commands (and hide the others) immediately, without animating them; otherwise, false.
-        **/
-        showOnlyCommands(commands: any[], immediate?: boolean): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets the default alignment to be used for this Menu.
-        **/
-        alignment: string;
-
-        /**
-         * Gets or sets the default anchor to be used for this Menu.
-        **/
-        anchor: HTMLElement;
-
-        /**
-         * Sets the MenuCommand objects that appear in the menu.
-        **/
-        commands: MenuCommand[];
-
-        /**
-         * Gets or sets a value that indicates whether the Menu is disabled.
-        **/
-        disabled: boolean;
-
-        /**
-         * Gets the DOM element that hosts the Menu.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets a value that indicates whether the Menu is hidden or in the process of becoming hidden, or sets the Menu to hide or show itself.
-        **/
-        hidden: boolean;
-
-        /**
-         * Gets or sets the default placement to be used for this Menu.
-        **/
-        placement: string;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Represents a command to be displayed in a Menu object.
-    **/
-    class MenuCommand {
-        //#region Constructors
-
-        /**
-         * Creates a new MenuCommand object.
-         * @constructor
-         * @param element The DOM element that will host the control.
-         * @param options The set of properties and values to apply to the new MenuCommand.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param type The event type to register.
-         * @param listener The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-        /**
-         * Disposes this control.
-        **/
-        dispose(): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param type The event type to unregister.
-         * @param listener The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets a value that indicates whether the MenuCommand is disabled.
-        **/
-        disabled: boolean;
-
-        /**
-         * Gets the DOM element that hosts the MenuCommand.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Adds an extra CSS class during construction.
-        **/
-        extraClass: string;
-
-        /**
-         * Gets or sets the Flyout object displayed by this command. The specified flyout is shown when the MenuCommand's button is invoked.
-        **/
-        flyout: Flyout;
-
-        /**
-         * Gets a value that indicates whether the MenuCommand is hidden or in the process of becoming hidden.
-        **/
-        hidden: boolean;
-
-        /**
-         * Gets the element identifier (ID) of the command.
-        **/
-        id: string;
-
-        /**
-         * Gets or sets the label of the command.
-        **/
-        label: string;
-
-        /**
-         * Gets or sets the function to be invoked when the command is clicked.
-        **/
-        onclick: Function;
-
-        /**
-         * Gets or sets the selected state of a toggle button.
-        **/
-        selected: boolean;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        /**
-         * Gets the type of the command.
-        **/
-        type: string;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Displays NavBarCommands in an overlayed navigation pane that opens and closes at the top or bottom of the main view.
-    **/
-    class NavBar {
-        //#region Constructors
-
-        /**
-         * Creates a new NavBar.
-         * @constructor
-         * @param element The DOM element that will host the new NavBar.
-         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * Occurs immediately after the NavBar is closed.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onafterclose(eventInfo: Event): void;
-
-        /**
-         * Raised after the NavBar is opened.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onafteropen(eventInfo: Event): void;
-
-        /**
-         * Raised just before the NavBar is closed.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onbeforeclose(eventInfo: Event): void;
-
-        /**
-         * Occurs before a closed NavBar is opened.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onbeforeopen(eventInfo: Event): void;
-
-        /**
-         * Occurs after the NavBar has finished processing its child elements.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onchildrenprocessed(eventInfo: Event): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Releases resources held by this NavBar. Call this method when the NavBar is no longer needed. After calling this method, the NavBar becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Closes the NavBar.
-        **/
-        close(): void;
-
-        /**
-         * Hides the specified commands of the NavBar.
-         * @param commands The commands to hide. The array elements may be NavBarCommand objects, or the string identifiers (IDs) of commands.
-         * @param immediate The parameter immediate is not supported and may be altered or unavailable in the future. true to hide the commands immediately, without animating them; otherwise, false.
-        **/
-        hideCommands(commands: any[], immediate?: boolean): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param eventName The name of the event that the event handler is registered for.
-         * @param eventCallback The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
-
-        /**
-         * Opens the NavBar
-        **/
-        open(): void;
-
-        /**
-         * Shows the specified commands of the NavBar.
-         * @param commands The commands to show. The array elements may be NavBarCommand objects, or the string identifiers (IDs) of commands.
-         * @param immediate The parameter immediate is not supported and may be altered or unavailable in the future. true to show the commands immediately, without animating them; otherwise, false.
-        **/
-        showCommands(commands: any[], immediate?: boolean): void;
-
-        /**
-         * Shows the specified commands of the NavBar while hiding all other commands.
-         * @param commands The commands to show. The array elements may be NavBarCommand objects, or the string identifiers (IDs) of commands.
-         * @param immediate The parameter immediate is not supported and may be altered or unavailable in the future. true to show the specified commands (and hide the others) immediately, without animating them; otherwise, false.
-        **/
-        showOnlyCommands(commands: any[], immediate?: boolean): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets/Sets how NavBar will display itself while closed. Values are "none" and "minimal".
-        **/
-        closedDisplayMode: string;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        commands: AppBarCommand;
-
-        /**
-         * Gets the HTML element that hosts this NavBar.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Returns the NavBarCommand object identified by id.
-         * @param id The element idenitifier (ID) of the NavBarCommand to be returned.
-         * @returns The NavBarCommand identified by id. If multiple commands have the same ID, returns the first command found.
-        **/
-        getCommandById(id: string): NavBarCommand;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code. Use NavBar.opened instead.
-        **/
-        hidden: boolean;
-
-        /**
-         * Gets a value that indicates whether the NavBar is opened or in the process of becoming opened, or sets the NavBar to open or close itself.
-        **/
-        opened: boolean;
-
-        /**
-         * Gets or sets a value that specifies whether the NavBar appears at the top or bottom of the main view.
-        **/
-        placement: string;
-
-        /**
-         * This object supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        static isDeclarativeControlContainer: any;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Represents a navigation command in a NavBarContainer.
-    **/
-    class NavBarCommand {
-        //#region Constructors
-
-        /**
-         * Creates a new NavBarCommand.
-         * @constructor
-         * @param element The DOM element hosts the new NavBarCommand.
-         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * This API supports the Windows Library for JavaScript infrastructure and is not intended to be used directly from your code.
-         * Use NavBarContainer.oninvoked instead.
-        **/
-        oninvoked: any;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Releases resources held by this NavBarCommand. Call this method when the NavBarCommand is no longer needed. After calling this method, the NavBarCommand becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param eventName The name of the event that the event handler is registered for.
-         * @param eventCallback The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets the HTML element that hosts this NavBarCommand.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets or sets the command's icon.
-        **/
-        icon: string;
-
-        /**
-         * Gets or sets the label of the command.
-        **/
-        label: string;
-
-        /**
-         * Get or sets the location to navigate to when this command is invoked.
-        **/
-        location: any;
-
-        /**
-         * Gets or sets a value that specifies whether to show the split tab stop.
-        **/
-        splitButton: boolean;
-
-        /**
-         * Gets a value that indicates whether the splitButton is open.
-        **/
-        splitOpened: boolean;
-
-        /**
-         * Gets or sets a user-defined object that represents the state associated with the command's location.
-        **/
-        state: any;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        /**
-         * Gets or sets the tooltip of the command.
-        **/
-        tooltip: string;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Contains a group of NavBarCommand objects in a NavBar.
-    **/
-    class NavBarContainer {
-        //#region Constructors
-
-        /**
-         * Creates a new NavBarContainer.
-         * @constructor
-         * @param element The DOM element hosts the new NavBarContainer.
-         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * Occurs when a child NavBarCommand object's click event fires.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.index, detail.navbarcommand, detail.data.
-        **/
-        oninvoked(eventInfo: CustomEvent): void;
-
-        /**
-         * Occurs when the split button of a child NavBarCommand is opened or closed. A split button is toggled when the user navigates to another page or opens another split button.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.opened, detail.index, detail.navbarcommand, detail.data.
-        **/
-        onsplittoggle(eventInfo: CustomEvent): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Releases resources held by this NavBarCommand. Call this method when the NavBarCommand is no longer needed. After calling this method, the NavBarCommand becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Forces the NavBarContainer to update its layout. Use this function when making the NavBarContainer visible again after you set its style.display property to "none".
-        **/
-        forceLayout(): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param eventName The name of the event that the event handler is registered for.
-         * @param eventCallback The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets the index of the current item.
-        **/
-        currentIndex: number;
-
-        /**
-         * Gets or sets a WinJS.Binding.List that generates NavBarCommand objects.
-        **/
-        data: WinJS.Binding.List<NavBarCommand>;
-
-        /**
-         * Gets the HTML element that hosts this NavBarContainer.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets or sets a value that specifies whether NavBarCommand objects in this container use a fixed or dynamic width.
-        **/
-        fixedSize: boolean;
-
-        /**
-         * Gets or sets a value that specifies whether the NavBarContainer has a horizontal or vertical layout.
-        **/
-        layout: Orientation;
-
-        /**
-         * Gets or sets a value that specifies how many rows of navigation commands to display on a page.
-        **/
-        maxRows: number;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        /**
-         * Gets or sets the WinJS.Binding.Template or templating function that creates the DOM elements for each item in the data source. Each item can contain multiple elements, but it must have a single root element.
-        **/
-        template: WinJS.Binding.Template;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Lets the user rate something by clicking an icon that represents a rating. The Rating control can display three types of ratings: an average rating, a tentative rating, and the user's rating.
-    **/
-    class Rating {
-        //#region Constructors
-
-        /**
-         * Creates a new Rating.
-         * @constructor
-         * @param element The DOM element hosts the new Rating.
-         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events. Event names must begin with "on". For example, to provide a handler for the cancel event, add a property named "oncancel" to the options object and set its value to the event handler.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * Raised when the user finishes interacting with the rating control without committing a tentative rating.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        oncancel(eventInfo: Event): void;
-
-        /**
-         * Raised when the user commits a change to the userRating.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.tentativeRating.
-        **/
-        onchange(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised when the user is choosing a new tentative Rating.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.tentativeRating.
-        **/
-        onpreviewchange(eventInfo: CustomEvent): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param eventName The name of the event to handle.
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Releases resources held by this Rating. Call this method when the Rating is no longer needed. After calling this method, the Rating becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param eventName The name of the event that the event handler is registered for.
-         * @param eventCallback The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets the average rating.
-        **/
-        averageRating: number;
-
-        /**
-         * Gets or sets whether the control is disabled. When the control is disabled, the user can't specify a new user rating or modify an existing rating.
-        **/
-        disabled: boolean;
-
-        /**
-         * Gets the DOM element that hosts the Rating.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets or sets whether control lets the user clear the rating.
-        **/
-        enableClear: boolean;
-
-        /**
-         * Gets or sets the maximum possible rating value.
-        **/
-        maxRating: number;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        /**
-         * Gets or sets a set of descriptions to show for rating values in the tooltip.
-        **/
-        tooltipStrings: string[];
-
-        /**
-         * Gets or sets the user's rating.
-        **/
-        userRating: number;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Generates HTML from a set of data. Use this control to generate lists of items.
-    **/
-    class Repeater {
-        //#region Constructors
-
-        /**
-         * Creates a new Repeater control.
-         * @constructor
-         * @param elemnt The DOM element that will host the new control. The Repeater will create an element if this value is null.
-         * @param options An object that contains one or more property/value pairs to apply to the new Repeater. Each property of the options object corresponds to one of the object's properties or events. Event names must begin with "on".
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * Raised after an item in the Repeater control's data source changes and after the corresponding DOM element has been updated.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.index, detail.key, detail.newElement, detail.newItem, detail.newValue, detail.oldElement, detail.oldItem, detail.oldValue, detail.setPromise.
-        **/
-        onitemchanged(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised after an item in the Repeater control's data source changes but before the corresponding DOM element has been updated.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.index, detail.key, detail.newElement, detail.newItem, detail.newValue, detail.oldElement, detail.oldItem, detail.oldValue, detail.setPromise.
-        **/
-        onitemchanging(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised after an item has been added to the Repeater control's data source and after the corresponding DOM element has been added.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.affectedElement, detail.index, detail.key, detail.value.
-        **/
-        oniteminserted(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised after an item has been added to the Repeater control's data source but before the corresponding DOM element has been added.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.affectedElement, detail.index, detail.key, detail.value.
-        **/
-        oniteminserting(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised after an item has been moved from one index to another in the Repeater control's data source and after the corresponding DOM element has been moved.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.affectedElement, detail.index, detail.key, detail.oldIndex, detail.newIndex.
-        **/
-        onitemmoved(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised after an item has been moved from one index to another in the Repeater control's data source but before the corresponding DOM element has been moved.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.affectedElement, detail.index, detail.key, detail.oldIndex, detail.newIndex.
-        **/
-        onitemmoving(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised after an item has been moved from one index to another in the Repeater control's data source and after the corresponding DOM element has been moved.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.affectedElement, detail.index, detail.item, detail.setPromise.
-        **/
-        onitemremoved(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised after an item has been removed from the Repeater control's data source but before the corresponding DOM element has been removed.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.affectedElement, detail.index, detail.item, detail.setPromise.
-        **/
-        onitemremoving(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised when the Repeater has finished loading a new set of data. This event is only fired on construction. This event is only raised when the Repeater is constructed or its data source or template changes.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onitemsloaded(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised after the Repeater control's underlying data has been updated and after the updated HTML has been reloaded.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.affectedElements.
-        **/
-        onitemsreloaded(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised after the Repeater control's underlying data has been updated but before the updated HTML has been reloaded.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.affectedElements, detail.setPromise.
-        **/
-        onitemsreloading(eventInfo: CustomEvent): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param eventName The name of the event to handle.
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Releases resources held by this Repeater. Call this method when the Repeater is no longer needed. After calling this method, the Repeater becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Returns the HTML element for the item at the specified index.
-         * @param index The index of the item.
-         * @returns The DOM element for the specified item.
-        **/
-        elementFromIndex(index: number): HTMLElement;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param eventName The name of the event that the event handler is registered for.
-         * @param eventCallback The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets the List that provides the Repeater with items to display.
-        **/
-        data: WinJS.Binding.List<any>;
-
-        /**
-         * Gets the DOM element that hosts the Repeater.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets the number of items in the Repeater control.
-        **/
-        length: number;
-
-        /**
-         * This object supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        static isDeclarativeControlContainer: any;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        /**
-         * Gets or sets a WinJS.Binding.Template or custom rendering function that defines the HTML of each item within the Repeater.
-        **/
-        template: WinJS.Binding.Template;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Enables the user to perform search queries and select suggestions.
-    **/
-    class SearchBox {
-        //#region Constructors
-
-        /**
-         * Creates a new SearchBox.
-         * @constructor
-         * @param element The DOM element hosts the new SearchBox.
-         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * Raised when the user or the app changes the queryText.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.language, detail.queryText, detail.linguisticDetails.
-        **/
-        onquerychanged(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised awhen the user clicks the search glyph or presses Enter.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.language, detail.queryText, detail.linguisticDetails, detail.keyModifiers.
-        **/
-        onquerysubmitted(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised when the user selects a suggested option for the search.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.tag, detail.keyModifiers, detail.storageFile.
-        **/
-        onresultsuggestionchosen(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised when the system requests search suggestions from this app.
-         * @param eventInfo An object that contains information about the event. The detail property of this object contains the following sub-properties: detail.language, detail.linguisticDetails, detail.queryText, detail.searchSuggestionCollection.
-        **/
-        onsuggestionsrequested(eventInfo: CustomEvent): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Releases resources held by this SearchBox. Call this method when the SearchBox is no longer needed. After calling this method, the SearchBox becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param eventName The name of the event that the event handler is registered for.
-         * @param eventCallback The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
-
-        /**
-         * Specifies whether suggestions based on local files are automatically displayed in the search pane, and defines the criteria that Windows uses to locate and filter these suggestions.
-         * @param settings The new settings for local content suggestions.
-        **/
-        setLocalContentSuggestionSettings(settings: any): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets whether the first suggestion is chosen when the user presses Enter.
-        **/
-        chooseSuggestionOnEnter: boolean;
-
-        /**
-         * Gets or sets a value that specifies whether the SearchBox is disabled. If the control is disabled, it won't receive focus.
-        **/
-        disabled: boolean;
-
-        /**
-         * Gets the DOM element that hosts the SearchBox.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets or sets a value that specifies whether the search box automatically receives focus when the user types into the app window.
-        **/
-        focusOnKeyboardInput: boolean;
-
-        /**
-         * Gets or sets the placeholder text for the SearchBox. This text is displayed if there is no other text in the input box.
-        **/
-        placeholderText: string;
-
-        /**
-         * Gets or sets the query text for the SearchBox.
-        **/
-        queryText: string;
-
-        /**
-         * Gets or sets the search history context. This context is used a secondary key (the app ID is the primary key) for storing search history.
-        **/
-        searchHistoryContext: string;
-
-        /**
-         * Gets or sets a value that specifies whether search history is disabled.
-        **/
-        searchHistoryDisabled: boolean;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-        static createResultSuggestionImage(url: string): any;
-
-    }
-
-    /**
-     * Enables the user to zoom between two different views supplied by two child controls. One child control supplies the zoomed-out view and the other provides the zoomed-in view.
-    **/
-    class SemanticZoom {
-        //#region Constructors
-
-        /**
-         * Creates a new SemanticZoom.
-         * @constructor
-         * @param element The DOM element that hosts the SemanticZoom.
-         * @param options An object that contains one or more property/value pairs to apply to the new control. This object can contain these properties: initiallyZoomedOut Boolean, zoomFactor 0.2–0.85.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * Occurs when the control zooms in or out.
-         * @param eventInfo An object that contains information about the event. The detail property of this object is true when the control is zoomed out. Otherwise, it's false.
-        **/
-        onzoomchanged(eventInfo: CustomEvent): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param eventName The name of the event to handle.
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Releases resources held by this SemanticZoom. Call this method when the SemanticZoom is no longer needed. After calling this method, the SemanticZoom becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Forces the SemanticZoom to update its layout. Use this function when making the SemanticZoom visible again after its style.display property had been set to "none".
-        **/
-        forceLayout(): void;
-
-        /**
-         * Unregisters an event handler for the specified event.
-         * @param eventName The name of the event that the event handler is registered for.
-         * @param eventCallback The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-        **/
-        setTimeoutAfterTTFF(callback: Function, delay: number): void
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets the DOM element that hosts the SemanticZoom control.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets or a sets a value that specifies whether to display the SemanticZoom zoom out button.
-        **/
-        enableButton: boolean;
-
-        /**
-         * Gets or sets a value that indicates whether SemanticZoom is locked and zooming between views is disabled.
-        **/
-        locked: boolean;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        /**
-         * Gets or sets a value that indicates whether the control is zoomed out.
-        **/
-        zoomedOut: boolean;
-
-        /**
-         * Gets or sets a value that specifies how much the scaling the cross-fade animation performs when the SemanticZoom transitions between views.
-        **/
-        zoomFactor: number;
-
-        /**
-         * Gets or sets a mapping function which can be used to change the item that is targeted on zoom in.
-        **/
-        zoomedInItem: (any: any) => any;
-
-        /**
-         * Gets or sets a mapping function which can be used to change the item that is targeted on zoom out.
-        **/
-        zoomedOutItem: (any: any) => any;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Provides users with fast, in-context access to settings that affect the current Windows Store app.
-    **/
-    class SettingsFlyout {
-        //#region Constructors
-
-        /**
-         * Creates a new SettingsFlyout object.
-         * @constructor
-         * @param element The DOM element that will host the control.
-         * @param options The set of properties and values to apply to the new SettingsFlyout.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * Raised immediately after the SettingsFlyout is completely hidden.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onafterhide(eventInfo: Event): void;
-
-        /**
-         * Raised immediately after a SettingsFlyout is fully shown.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onaftershow(eventInfo: Event): void;
-
-        /**
-         * Raised just before hiding a SettingsFlyout.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onbeforehide(eventInfo: Event): void;
-
-        /**
-         * Raised just before showing a SettingsFlyout.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onbeforeshow(eventInfo: Event): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param type The event type to register. It must be beforeshow, beforehide, aftershow, or afterhide.
-         * @param listener The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Releases resources held by this SettingsFlyout. Call this method when the SettingsFlyout is no longer needed. After calling this method, the SettingsFlyout becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Hides the SettingsFlyout, if visible, regardless of other states.
-        **/
-        hide(): void;
-
-        /**
-         * Loads a fragment of the SettingsFlyout. Your app calls this when the user invokes a settings command and the WinJS.Application.onsettings event occurs.
-         * @param e An object that contains information about the event, received from the WinJS.Application.onsettings event. The detail property of this object contains the applicationcommands sub-property that you set to an array of settings commands. You then populate the SettingsFlyout with these commands by a call to populateSettings.
-        **/
-        static populateSettings(e: CustomEvent): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param type The event type to unregister. It must be beforeshow, beforehide, aftershow, or afterhide.
-         * @param listener The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-        /**
-         * Shows the SettingsPane UI, if hidden.
-        **/
-        show(): void;
-
-        /**
-         * Shows the SettingsPane UI, if hidden, regardless of other state.
-        **/
-        static show(): void;
-
-        /**
-         * Show the Settings flyout using the Settings element identifier (ID) and the path of the page that contains the Settings element.
-         * @param id The ID of the Settings element.
-         * @param path The path of the page that contains the Settings element.
-        **/
-        static showSettings(id: string, path: any): void;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Specifies whether the SettingsFlyout is disabled.
-        **/
-        disabled: boolean;
-
-        /**
-         * Gets the DOM element the SettingsFlyout is attached to.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets whether the SettingsFlyout is hidden.
-        **/
-        hidden: boolean;
-
-        /**
-         * Gets or sets the settings command Id for the SettingsFlyout control.
-        **/
-        settingsCommandId: string;
-
-        /**
-         * This property may be unavailable or altered in future versions. Use the CSS width property of the element that has the win-settingsflyout class instead.
-        **/
-        width: string;
-
-        //#endregion Properties
-
-    }
-    /**
-     * Displays a SplitView which renders a collapsable pane next to arbitrary HTML content.
-    **/
-    class SplitView {
-        /**
-         * Placement options for a SplitView's pane.
-        **/
-        static PanePlacement: {
-            /**
-             * Pane is positioned left of the SplitView's content.
-            **/
-            left: string;
-            /**
-             * Pane is positioned right of the SplitView's content.
-            **/
-            right: string;
-            /**
-             * Pane is positioned above the SplitView's content.
-            **/
-            top: string;
-            /**
-             * Pane is positioned below the SplitView's content.
-            **/
-            bottom: string;
-        }
-
-        /**
-         * Display options for a SplitView's pane when it is closed.
-        **/
-        static ClosedDisplayMode: {
-            /**
-             * When the pane is closed, it is not visible and doesn't take up any space.
-            **/
-            none: string;
-            /**
-             * When the pane is closed, it occupies space leaving less room for the SplitView's content.
-            **/
-            inline: string;
-        }
-
-        /**
-         * Display options for a SplitView's pane when it is open.
-        **/
-        static OpenedDisplayMode: {
-            /**
-             * When the pane is open, it occupies space leaving less room for the SplitView's content.
-            **/
-            inline: string;
-            /**
-             * When the pane is open, it doesn't take up any space and it is light dismissable.
-            **/
-            overlay: string;
-        }
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        /**
-         * Creates a new SplitView.
-         * @constructor
-         * @param element The DOM element hosts the new SplitView.
-         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        /**
-         * Gets the DOM element that hosts the SplitView control.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets the DOM element that hosts the SplitView pane.
-        **/
-        paneElement: HTMLElement;
-
-        /**
-         * Gets the DOM element that hosts the SplitView's content.
-        **/
-        contentElement: HTMLElement;
-
-        /**
-         * Gets or sets the placement of the SplitView's pane.
-        **/
-        panePlacement: string;
-
-        /**
-         * Gets or sets the display mode of the SplitView's pane when it is closed.
-        **/
-        closedDisplayMode: string;
-
-        /**
-         * Gets or sets the display mode of the SplitView's pane when it is open.
-        **/
-        openedDisplayMode: string;
-
-        /**
-         * Gets or sets whether the SpitView's pane is currently open.
-        **/
-        paneOpened: boolean;
-
-        /**
-         * Opens the SplitView's pane.
-        **/
-        openPane(): void;
-
-        /**
-         * Closes the SplitView's pane.
-        **/
-        closePane(): void;
-
-        /**
-         * Disposes this control.
-        **/
-        dispose(): void;
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param eventName The name of the event that the event handler is registered for.
-         * @param eventCallback The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Raised just before opening the pane. Call preventDefault on this event to stop the pane from opening.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onbeforeopen(eventInfo: Event): void;
-
-        /**
-         * Raised immediately after the pane is fully open.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onafteropen(eventInfo: Event): void;
-
-        /**
-         * Raised just before closing the pane. Call preventDefault on this event to stop the pane from closing.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onbeforeclose(eventInfo: Event): void;
-
-        /**
-         * Raised immediately after the pane is fully closed.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onafterclose(eventInfo: Event): void;
-    }
-
-    /**
-     * Displays a button which is used for opening and closing a SplitView's pane.
-    **/
-    class SplitViewPaneToggle {
-        /**
-         * Creates a new SplitViewPaneToggle.
-         * @constructor
-         * @param element The DOM element hosts the new SplitViewPaneToggle.
-         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
-        **/
-        constructor(element?: HTMLButtonElement, options?: any);
-
-        /**
-         * Gets the DOM element that hosts the SplitViewPaneToggle control.
-        **/
-        element: HTMLButtonElement;
-
-        /**
-         * Gets or sets the DOM element of the SplitView that is associated with the SplitViewPaneToggle control.
-         * When the SplitViewPaneToggle is invoked, it'll toggle this SplitView's pane.
-        **/
-        splitView: HTMLElement;
-
-        /**
-         * Disposes this control.
-        **/
-        dispose(): void;
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param eventName The name of the event that the event handler is registered for.
-         * @param eventCallback The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Raised when the SplitViewPaneToggle is invoked.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        oninvoked(eventInfo: Event): void;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-    }
-
-    /**
-    * Represents a command in the SplitView Pane.
-    **/
-    class SplitViewCommand {
-        //#region Constructors
-
-        /**
-         * Creates a new SplitViewCommand.
-         * @constructor
-         * @param element The DOM element hosts the new SplitViewCommand.
-         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //# region Events
-
-        /**
-         * Raised when a SplitViewCommand has been invoked.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        oninvoked(eventInfo: CustomEvent): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param eventName The name of the event to handle. Note that you drop the "on" when specifying the event name. For example, instead of specifying "onclick", you specify "click".
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Releases resources held by this SplitViewCommand. Call this method when the SplitViewCommand is no longer needed. After calling this method, the SplitViewCommand becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param eventName The name of the event that the event handler is registered for.
-         * @param eventCallback The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets the HTML element that hosts this SplitViewCommand.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets or sets the command's icon.
-        **/
-        icon: string;
-
-        /**
-         * Gets or sets the label of the command.
-        **/
-        label: string;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        /**
-         * Gets or sets the tooltip of the command.
-        **/
-        tooltip: string;
-
-        //#endregion Properties
-    }
-
-    /**
-     * A type of IListDataSource that provides read-access to an object that implements the IStorageQueryResultBase interface. A StorageDataSource enables you to query and bind to items in the data source.
-    **/
-    class StorageDataSource<T> {
-        //#region Constructors
-
-        /**
-         * Creates a new StorageDataSource object.
-         * @constructor
-         * @param query The IStorageQueryResultBase that the StorageDataSource obtains its items from. Instead of IStorageQueryResultBase, you can also pass one of these string values: Music, Pictures, Videos, Documents.
-         * @param options The set of properties and values to apply to the new StorageDataSource. Properties on this object may include: mode , requestedThumbnailSize , thumbnailOptions , synchronous .
-        **/
-        constructor(query: any, options?: any);
-
-        //#endregion Constructors
-
-        //#region Methods
-
-        /**
-         * Draws the thumbnail for the specified item to the specified img element.
-         * @param item The item to retrieve the thumbnail for.
-         * @param image The img element that will display the thumbnail.
-         * @returns A Promise that completes when the full-quality thumbnail is visible.
-        **/
-        loadThumbnail(item: IItem<T>, image: HTMLImageElement): Promise<void>;
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param type The name of the event for which to add a listener.
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(type: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param details The set of additional properties to be attached to the event object.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, details: any): boolean;
-
-        /**
-         * Removes a listener for the specified event.
-         * @param type The name of the event for which to remove a listener.
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Optional. The same value that was passed to addEventListener for this listener. It may be omitted if it was omitted when calling addEventListener.
-        **/
-        removeEventListener(type: string, eventHandler: Function, useCapture?: any): void;
-
-        //#endregion Methods
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-    }
-
-    /**
-     * Prevents a DOM sub-tree from receiving tab navigations and focus.
-    **/
-    class TabContainer {
-        //#region Constructors
-
-        /**
-         * Creates a new TabContainer.
-         * @constructor
-         * @param element The DOM element that hosts the TabContainer control.
-         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties.
-        **/
-        constructor(element: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Methods
-
-        /**
-         * Releases resources held by this TabContainer. Call this method when the TabContainer is no longer needed. After calling this method, the TabContainer becomes unusable.
-        **/
-        dispose(): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets the child DOM element that receives tab focus.
-        **/
-        childFocus: HTMLElement;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        /**
-         * Gets or sets the tab index of this container.
-        **/
-        tabIndex: number;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Allows users to select time values.
-    **/
-    class TimePicker {
-        //#region Constructors
-
-        /**
-         * Initializes a new instance of a TimePicker control.
-         * @constructor
-         * @param element The DOM element associated with the TimePicker control.
-         * @param options The set of options to be applied initially to the TimePicker control. The options are the following: clock.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * Occurs when any of the controls are changed by the user.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onchange(eventInfo: CustomEvent): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Adds an event listener.
-         * @param type The type (name) of the event.
-         * @param listener The function that handles the event.
-         * @param capture If true, specifies that capture should be initiated, otherwise false.
-        **/
-        addEventListener(type: string, listener: Function, capture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Releases resources held by this TimePicker. Call this method when the TimePicker is no longer needed. After calling this method, the TimePicker becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * This API supports the WinJS infrastructure and is not intended to be used directly from your code. Use render instead.
-        **/
-        static getInformation(clock: any, minuteIncrement: any, timerPatterns?: any): any;
-
-        /**
-         * Removes a listener for the specified event.
-         * @param type The name of the event for which to remove a listener.
-         * @param listener The listener.
-         * @param useCapture Optional. The same value that was passed to addEventListener for this listener. It may be omitted if it was omitted when calling addEventListener.
-        **/
-        removeEventListener(type: string, listener: Function, useCapture?: any): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets the type of clock to display (12HourClock or 24HourClock). It defaults to the user setting.
-        **/
-        clock: string;
-
-        /**
-         * Gets or sets the current time of the TimePicker. Note that the date value is always July 15, 2011.
-        **/
-        current: Date;
-
-        /**
-         * Specifies whether the TimePicker is disabled.
-        **/
-        disabled: boolean;
-
-        /**
-         * Gets the DOM element for the TimePicker.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets or sets the display pattern for the hour. The default hour pattern is hour.integer(2). You can change the hour pattern by changing the number of integers displayed.
-        **/
-        hourPattern: string;
-
-        /**
-         * Gets or sets the minute increment. For example, 15 specifies that the TimePicker minute control should display only the choices 00, 15, 30, 45.
-        **/
-        minuteIncrement: number;
-
-        /**
-         * Gets or sets the display pattern for the minute. The default minute pattern is minute.integer(2). You can change the minute pattern by changing the number of integers displayed.
-        **/
-        minutePattern: string;
-
-        /**
-         * Gets or sets the display pattern for the period. The default period pattern is period.abbreviated(2). You can change the period pattern by changing the number of integers displayed.
-        **/
-        periodPattern: string;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * A control that lets the user switch an option between two states: on (checked is set to true) and off (checked is set to false).
-    **/
-    class ToggleSwitch {
-        //#region Constructors
-
-        /**
-         * Creates a new ToggleSwitch.
-         * @constructor
-         * @param element The DOM that hosts the control.
-         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events. Event names must begin with "on". For example, to provide a handler for the change event, add a property named "onchange" to the options object and set its value to the event handler.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * Occurs when the ToggleSwitch control is flipped to on (checked == true) or off (checked == false).
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onchange(eventInfo: Event): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param eventName The name of the event to handle.
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Releases resources held by this ToggleSwitch. Call this method when the ToggleSwitch is no longer needed. After calling this method, the ToggleSwitch becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param eventName The name of the event that the event handler is registered for.
-         * @param eventCallback The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets a value that specifies whether the control is on or off.
-        **/
-        checked: boolean;
-
-        /**
-         * Gets or sets a value that specifies whether the control is disabled.
-        **/
-        disabled: boolean;
-
-        /**
-         * Gets the DOM element that hosts the ToggleSwitch.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets or sets the text that displays when the ToggleSwitch is off (checked is set to false).
-        **/
-        labelOff: string;
-
-        /**
-         * Gets or sets the text that displays when the ToggleSwitch is on (checked is set to true).
-        **/
-        labelOn: string;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        /**
-         * Gets or sets the main text for the ToggleSwitch control. This text is always displayed, regardless of whether the control is switched on or off.
-        **/
-        title: string;
-
-        //#endregion Properties
-
-    }
-    /**
-     * Displays ICommands within the flow of the app. Use the ToolBar around other statically positioned app content.
-    **/
-    class ToolBar {
-
-        /**
-         * Display options for the closed ToolBar.
-        **/
-        public static ClosedDisplayMode: {
-            /**
-             * When the ToolBar is closed, the height of the ToolBar is reduced such that button commands are still visible, but their labels are hidden.
-            **/
-            compact: string;
-            /**
-             * When the ToolBar is closed, the height of the ToolBar is always sized to content.
-            **/
-            full: string;
-        };
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        public static supportedForProcessing: boolean;
-
-        /**
-        * Gets the DOM element that hosts the ToolBar.
-        **/
-        public element: HTMLElement;
-
-        /**
-         * Gets or sets the Binding List of ICommand for the ToolBar.
-        **/
-        public data: WinJS.Binding.List<ICommand>;
-
-        /**
-         * Gets or sets the closedDisplayMode for the ToolBar. Values are "compact" and "full".
-        **/
-        public closedDisplayMode: string;
-
-        /**
-         * Creates a new ToolBar control.
-         * @param element The DOM element that will host the control.
-         * @param options The set of properties and values to apply to the new ToolBar.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        /**
-         * Disposes the ToolBar
-        **/
-        public dispose(): void;
-
-        /**
-         * Forces the ToolBar to update its layout.
-         * Use this function when the window did not change size, but the ToolBar itself did.
-        **/
-        public forceLayout(): void;
-
-        /**
-         * Opens the ToolBar
-        **/
-        public open(): void;
-
-        /**
-         * Closes the ToolBar
-        **/
-        public close(): void;
-
-        /**
-         * Returns the Command object identified by id.
-         * @param id The element idenitifier (ID) of the command to be returned.
-         * @returns The command identified by id. If multiple commands have the same ID, returns the first command found.
-        **/
-        getCommandById(id: string): ICommand;
-
-        /**
-         * Shows the specified commands of the ToolBar while hiding all other commands.
-         * @param commands The commands to show. The array elements may be ICommand objects, or the string identifiers (IDs) of commands.
-        **/
-        showOnlyCommands(commands: Array<string|ICommand>): void;
-
-        /**
-         * Gets or sets whether the ToolBar is currently opened.
-        **/
-        public opened: boolean;
-
-        /**
-         * Occurs immediately before the control is opened. Is cancelable.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        public onbeforeopen: (eventInfo: CustomEvent) => void;
-
-        /**
-         * Occurs immediately after the control is opened.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        public onafteropen: (eventInfo: CustomEvent) => void;
-
-        /**
-         * Occurs immediately before the control is closed. Is cancelable.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        public onbeforeclose: (eventInfo: CustomEvent) => void;
-
-        /**
-         * Occurs immediately after the control is closed.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        public onafterclose: (eventInfo: CustomEvent) => void;
-
-        /**
-          * Registers an event handler for the specified event.
-          * @param type The event type to register. It must be beforeopen, beforeclose, afteropen, or afterclose.
-          * @param listener The event handler function to associate with the event.
-          * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-         **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param type The event type to unregister. It must be beforeopen, beforeclose, afteropen, or afterclose.
-         * @param listener The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(eventName: string, eventProperties: any): boolean;
-    }
-
-    /**
-     * Displays a tooltip that can contain images and formatting.
-    **/
-    class Tooltip {
-        //#region Constructors
-
-        /**
-         * Creates a new Tooltip.
-         * @constructor
-         * @param element The DOM element associated that hosts the Tooltip.
-         * @param options An object that contains one or more property/value pairs to apply to the new control. Each property of the options object corresponds to one of the control's properties or events. Event names must begin with "on". For example, to provide a handler for the opened event, add a property named "onopened" to the options object and set its value to the event handler.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        /**
-         * Raised just before the Tooltip is hidden.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onbeforeclose(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised just before the Tooltip appears.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onbeforeopen(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised when the Tooltip is no longer displayed.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onclosed(eventInfo: CustomEvent): void;
-
-        /**
-         * Raised when the Tooltip is shown.
-         * @param eventInfo An object that contains information about the event.
-        **/
-        onopened(eventInfo: CustomEvent): void;
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Adds an event handler for the specified event.
-         * @param eventName The name of the event to handle.
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Hides the Tooltip.
-        **/
-        close(): void;
-
-        /**
-         * Releases resources held by this Tooltip. Call this method when the Tooltip is no longer needed. After calling this method, the Tooltip becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Shows the Tooltip.
-         * @param type A value that specifies when to show the Tooltip. The default value is "mousedown".
-        **/
-        open(type?: string): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param eventName The name of the event that the event handler is registered for.
-         * @param eventCallback The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets or sets the HTML element that is the content of the Tooltip.
-        **/
-        contentElement: HTMLElement;
-
-        /**
-         * Gets the DOM element that hosts the Tooltip control.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Gets or appends additional CSS classes to apply to the element that hosts the Tooltip.
-        **/
-        extraClass: string;
-
-        /**
-         * Gets or sets a value that specifies whether the Tooltip is an infotip, a tooltip that contains a lot of info and should be displayed for longer than a typical Tooltip.
-        **/
-        infotip: boolean;
-
-        /**
-         * Gets or sets the HTML content of the Tooltip.
-        **/
-        innerHTML: string;
-
-        /**
-         * Gets or sets the position for the Tooltip relative to its target element: top, bottom, left or right.
-        **/
-        placement: string;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Scales a single child element to fill the available space without resizing it. This control reacts to changes in the size of the container as well as changes in size of the child element. For example, a media query may result in a change in aspect ratio.
-    **/
-    class ViewBox {
-        //#region Constructors
-
-        /**
-         * Initializes a new instance of the ViewBox control.
-         * @constructor
-         * @param element The DOM element that functions as the scaling box. This element fills 100% of the width and height allotted to it.
-         * @param options The set of options to be applied initially to the ViewBox control. There are currently no options on this control, and any options included in this parameter are ignored.
-        **/
-        constructor(element?: HTMLElement, options?: any);
-
-        //#endregion Constructors
-
-        //#region Methods
-
-        /**
-         * Adds an event handler for the specified event.
-         * @param eventName The name of the event to handle.
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param eventName The name of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(eventName: string, eventProperties: any): boolean;
-
-        /**
-         * Releases resources held by this ViewBox. Call this method when the ViewBox is no longer needed. After calling this method, the ViewBox becomes unusable.
-        **/
-        dispose(): void;
-
-        /**
-         * Forces the ViewBox to update its layout. Use this function when making the ViewBox visible again after its style.display property had been set to "none".
-        **/
-        forceLayout(): void;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param eventName The name of the event that the event handler is registered for.
-         * @param eventCallback The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets the DOM element that functions as the scaling box.
-        **/
-        element: HTMLElement;
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * A special data source for VirtualizedDataSource.computeDataSourceGroups
-     **/
-    interface IListGroupDataSource<T> extends IListDataSource<T> {
-        groups: IListDataSource<T>;
-    }
-
-    /**
-     * Serves as the base class for a custom IListDataSource.
-    **/
-    class VirtualizedDataSource<T> {
-        //#region Constructors
-
-        /**
-         * Initializes the VirtualizedDataSource base class of a custom data source.
-         * @constructor
-         * @param listDataAdapter The object that supplies data to the VirtualizedDataSource.
-         * @param options An object that can contain properties that specify additional options for the VirtualizedDataSource. It supports these properties: cacheSize.
-        **/
-        constructor(listDataAdapter: IListDataAdapter<T>, options?: any);
-
-        //#endregion Constructors
-
-        //#region Events
-
-        //#endregion Events
-
-        //#region Methods
-
-        /**
-         * Registers an event handler for the specified event.
-         * @param eventName The name of the event to handle. See the VirtualizedDataSource object page for a list of events. Note that you drop the "on" when specifying the event name for the addEventListener method. For example, instead of specifying "onstatuschanged", you specify "statuschanged".
-         * @param eventHandler The event handler function to associate with the event.
-         * @param useCapture Set to true to register the event handler for the capturing phase; otherwise, set to false to register the event handler for the bubbling phase.
-        **/
-        addEventListener(eventName: string, eventHandler: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event, otherwise false.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Removes an event handler that the addEventListener method registered.
-         * @param eventName The name of the event that the event handler is registered for. See the VirtualizedDataSource object page for a list of events.
-         * @param eventCallback The event handler function to remove.
-         * @param useCapture Set to true to remove the capturing phase event handler; set to false to remove the bubbling phase event handler.
-        **/
-        removeEventListener(eventName: string, eventCallback: Function, useCapture?: boolean): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#endregion Properties
-
-    }
-
-    //#endregion Objects
-
-    //#region Functions
-
-    /**
-     * Returns a new IListDataSource that adds group information to the items of another IListDataSource.
-     * @param listDataSource The data source for the individual items to group.
-     * @param groupKey A callback function that accepts a single argument: an item in the IListDataSource. The function is called for each item in the list and must return the group key for that item as a string.
-     * @param groupData A callback function that accepts a single argument: an item in the IListDataSource. The function is called on one IListDataSource item for each group and must return an object that represents the header of that group.
-     * @param options An object that can contain properties that specify additional options: groupCountEstimate, batchSize.
-     * @returns An IListGroupDataSource that contains the items in the original data source and provides additional group information in the form of a "groups" property. The "groups" property returns another IListDataSource that enumerates the different groups in the list.
-    **/
-    function computeDataSourceGroups<T>(listDataSource: IListDataSource<T>, groupKey: Function, groupData: Function, options?: any): IListGroupDataSource<T>;
-
-    /**
-     * Used to disables all Animations Library and ListView animations. Calling this function does not guarantee that the animations will be disabled, as the determination is made based on several factors.
-    **/
-    function disableAnimations(): void;
-
-    /**
-     * Used to enable all Animations Library and ListView animations. Calling this function does not guarantee that the animations will be enabled, as the determination is made based on several factors.
-    **/
-    function enableAnimations(): void;
-
-    /**
-     * Marks a event handler function as being compatible with declarative processing.
-     * @param handler The handler to be marked as compatible with declarative processing.
-     * @returns The handler, marked as compatible with declarative processing.
-    **/
-    function eventHandler(handler: any): any;
-
-    /**
-     * Asynchronously executes a collection of CSS animations on a collection of elements. This is the underlying animation mechanism used by the Animations Library. Apps are encouraged to use the Animations Library to conform with the standard look and feel of the rest of the system, rather than calling this function directly.
-     * @param element Element or elements to be animated. This parameter can be expressed in several ways: As the special value "undefined", which means that the animation has no target, As a single object, As a JavaScript array (possibly empty), in which each element of the array can be a single element or a JavaScript array of elements., As a NodeList (for example, the result of querySelectorAll), As an HTMLCollection.
-     * @param animation The animation description or an array of animation descriptions to apply to element. An animation description is a JavaScript object with specific properties, listed below. There are two types of animation descriptions: one for keyframe-based animations and one for explicit animations. These types are distinguished by whether the keyframe property has a defined value. The following properties are required for both types of animation descriptions: property (string), delay (number), duration (number), timing (string). If an animation has a keyframe property with a defined, non-null value, then the animation is a keyframe-based animation. A keyframe-based animation description requires the following property in addition to those mentioned above: keyframe (string). If an animation does not have a keyframe property, or if the value of the property is null or undefined, then the animation is an explicit animation. An explicit animation description requires the following properties in addition to the common properties mentioned above: from, to. The values given in the from and to properties must be valid for the CSS property specified by the property property. For example, if the CSS property is "opacity", then the from and to properties must be numbers between 0 and 1 (inclusive).
-     * @returns Returns a Promise object that completes when the CSS animation is complete.
-    **/
-    function executeAnimation(element: HTMLElement, animation: any): Promise<any>;
-
-    /**
-     * Asynchronously executes a collection of CSS transitions on a collection of elements. This is the underlying animation mechanism used by the Animations Library. Apps are encouraged to use the Animations Library to conform with the standard look and feel of the rest of the system, rather than calling this function directly.
-     * @param element Element or elements on which to perform the transition. This parameter can be expressed in several ways: As the special value "undefined", which means that the transition has no target, As a single object, As a JavaScript array (possibly empty), in which each element of the array can be a single element or a JavaScript array of elements., As a NodeList (for example, the result of querySelectorAll), As an HTMLCollection.
-     * @param transition The transition description or an array of transition descriptions to apply to element. A transition description is a JavaScript object with these properties: property (string), delay (number), duration (number), timing (string), from (optional), to. The values given in the from and to properties must be valid for the CSS property specified by the property property. For example, if the CSS property is "opacity", then the from and to properties must be numbers between 0 and 1 (inclusive).
-     * @returns Returns a Promise that completes when the transition is finished.
-    **/
-    function executeTransition(element: HTMLElement, transition: any): Promise<any>;
-
-    /**
-     * Retrieves the items in the specified index range.
-     * @param dataSource The data source that contains the items to retrieve.
-     * @param ranges An array of ISelectionRange objects that have firstIndex and lastIndex values.
-     * @returns A Promise that contains an array of the requested IItem objects.
-    **/
-    function getItemsFromRanges<U>(dataSource: IListDataSource<U>, ranges: ISelectionRange[]): Promise<IItem<U>>;
-
-    /**
-     * Determines whether the Animations Library and ListView animations will be performed if called.
-     * @returns Returns true if animations will be performed; otherwise false.
-    **/
-    function isAnimationEnabled(): boolean;
-
-    /**
-     * * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-    **/
-    function optionsParser(value: string, context?: any, functionContext?: any): any;
-
-    /**
-     * Applies declarative control binding to all elements, starting at the specified root element.
-     * @param rootElement The element at which to start applying the binding. If this parameter is not specified, the binding is applied to the entire document.
-     * @param skipRoot If true, the elements to be bound skip the specified root element and include only the children.
-     * @returns A promise that is fulfilled when binding has been applied to all the controls.
-    **/
-    function processAll(rootElement?: Element, skipRoot?: boolean): Promise<any>;
-
-    /**
-     * Applies declarative control binding to the specified element.
-     * @param element The element to bind.
-     * @returns A promise that is fulfilled after the control is activated. The value of the promise is the control that is attached to element.
-    **/
-    function process(element: Element): Promise<any>;
-
-    /**
-     * Walks the DOM tree from the given element to the root of the document. Whenever a selector scope is encountered, this method performs a lookup within that scope for the specified selector string. The first matching element is returned.
-     * @param selector The selector string.
-     * @param element The element to begin walking to the root of the document from.
-     * @returns The target element, if found.
-    **/
-    function scopedSelect(selector: string, element: HTMLElement): HTMLElement;
-
-    /**
-     * Adds the set of declaratively specified options (properties and events) to the specified control. If name of the options property begins with "on", the property value is a function and the control supports addEventListener, setOptions calls addEventListener on the control.
-     * @param control The control on which the properties and events are to be applied.
-     * @param options The set of options that are specified declaratively.
-    **/
-    function setOptions(control: any, options?: any): void;
-
-    /**
-     * This API supports the WinJS infrastructure and is not intended to be used directly from your code.
-    **/
-    function simpleItemRenderer(fn: Function): Function;
-
-    //#endregion Functions
-
-}
-/**
- * Provides utility functions for generic directional focus movement
-**/
-declare namespace WinJS.UI.XYFocus {
-    export interface XYFocusOptions {
-        /**
-         * The focus scope, only children of this element are considered in the calculation.
-        **/
-        focusRoot?: HTMLElement;
-
-        /**
-         * A rectangle indicating where focus came from before the current state.
-        **/
-        historyRect?: IRect;
-
-        /**
-         * The element from which to calculate the next focusable element; if specified, referenceRect is ignored.
-        **/
-        referenceElement?: HTMLElement;
-
-        /**
-         * The rectangle from which to calculate next focusable element; ignored if referenceElement is also specified.
-        **/
-        referenceRect?: IRect;
-    }
-
-    export interface IRect {
-        left: number;
-        right?: number;
-        top: number;
-        bottom?: number;
-
-        height: number;
-        width: number;
-    }
-
-    export interface XYFocusEvent extends CustomEvent {
-        detail: { nextFocusElement: HTMLElement; keyCode: number; previousFocusElement: HTMLElement };
-    }
-
-    /**
-     * Gets the mapping object that maps keycodes to XYFocus actions.
-    **/
-    export var keyCodeMap: {
-        /**
-         * The array of keycodes that cause XYFocus to accept.
-        **/
-        accept: Array<number>;
-        /**
-         * The array of keycodes that cause XYFocus to cancel.
-        **/
-        cancel: Array<number>;
-        /**
-         * The array of keycodes that cause XYFocus to navigate down.
-        **/
-        down: Array<number>;
-        /**
-         * The array of keycodes that cause XYFocus to navigate left.
-        **/
-        left: Array<number>;
-        /**
-         * The array of keycodes that cause XYFocus to navigate right.
-        **/
-        right: Array<number>;
-        /**
-         * The array of keycodes that cause XYFocus to navigate up.
-        **/
-        up: Array<number>;
-    };
-
-    /**
-     * Gets or sets the focus root when invoking XYFocus APIs.
-    **/
-    export var focusRoot: HTMLElement;
-
-    /**
-     * Adds an event listener to XYFocus events.
-     * @param type The type (name) of the event.
-     * @param listener The listener to invoke when the event gets raised.
-    **/
-    export function addEventListener(type: string, handler: EventListener): void;
-
-    /**
-     * Raises an event of the specified type and with additional properties.
-     * @param type The type (name) of the event.
-     * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-     * @returns true if preventDefault was called on the event, otherwise false.
-    **/
-    export function dispatchEvent(type: string, eventProperties: any): boolean;
-
-    /**
-     * Removes an event listener to XYFocus events.
-     * @param type The type (name) of the event.
-     * @param listener The listener to remove.
-    **/
-    export function removeEventListener(type: string, handler: EventListener): void;
-
-    /**
-     * Returns the next focusable element from the current active element (or reference, if supplied) towards the specified direction.
-     * @param direction The direction to search.
-     * @param options An options object configuring the search.
-    **/
-    export function findNextFocusElement(direction: string, options?: XYFocusOptions): HTMLElement;
-    export function findNextFocusElement(direction: "left", options?: XYFocusOptions): HTMLElement;
-    export function findNextFocusElement(direction: "right", options?: XYFocusOptions): HTMLElement;
-    export function findNextFocusElement(direction: "up", options?: XYFocusOptions): HTMLElement;
-    export function findNextFocusElement(direction: "down", options?: XYFocusOptions): HTMLElement;
-
-    /**
-     * Moves focus to the next focusable element from the current active element (or reference, if supplied) towards the specific direction.
-     * @param direction The direction to move.
-     * @param options An options object configuring the focus move.
-    **/
-    export function moveFocus(direction: string, options?: XYFocusOptions): HTMLElement;
-    export function moveFocus(direction: "left", options?: XYFocusOptions): HTMLElement;
-    export function moveFocus(direction: "right", options?: XYFocusOptions): HTMLElement;
-    export function moveFocus(direction: "up", options?: XYFocusOptions): HTMLElement;
-    export function moveFocus(direction: "down", options?: XYFocusOptions): HTMLElement;
-
-    //#region Events
-
-    /**
-     * Occurs immeidately after XYFocus has changed focus targets.
-     * @param eventInfo An object that contains information about the event. The detail property of this object includes the following subproperties: previousFocusElemewnt, keyCode.
-    **/
-    export function onfocuschanged(eventInfo: CustomEvent): void;
-
-    /**
-     * Occurs immeidately before XYFocus changes focus targets. Is cancelable.
-     * @param eventInfo An object that contains information about the event. The detail property of this object includes the following subproperties: nextFocusElement, keyCode.
-    **/
-    export function onfocuschanging(eventInfo: CustomEvent): void;
-
-    //#endregion Events
-}
-
-/**
- * Provides functions to load HTML content programmatically.
-**/
-declare namespace WinJS.UI.Fragments {
-    //#region Functions
-
-    /**
-     * Starts loading the fragment at the specified location. The returned promise completes when the fragment is ready to be copied.
-     * @param href The URI that contains the fragment to be copied.
-     * @returns A promise that is fulfilled when the fragment has been prepared for copying.
-    **/
-    function cache(href: string): Promise<any>;
-
-    /**
-     * Removes any cached information about the specified fragment. This method does not unload any scripts or styles that are referenced by the fragment.
-     * @param href The URI that contains the fragment to be cleared. If no URI is provided, the entire contents of the cache are cleared.
-    **/
-    function clearCache(href: string): void;
-    function clearCache(href: HTMLElement): void;
-
-    /**
-     * Loads the contents of the specified URI into the specified element without copying it.
-     * @param href The URI that contains the fragment to copy.
-     * @param element Optional. The element to which the fragment is appended.
-     * @returns A promise that is fulfilled when the fragment has been loaded. If a target element is not specified, the copied fragment is the completed value. The element is not added to the cache. See also rendercopy, where the element is added to the cache.
-    **/
-    function render(href: string, element?: HTMLElement): Promise<HTMLElement>;
-
-    /**
-     * Loads and copies the contents of the specified URI into the specified element.
-     * @param href The URI that contains the fragment to copy.
-     * @param target The element to which the fragment is appended.
-     * @returns A promise that is fulfilled when the fragment has been loaded. If a target element is not specified, the copied fragment is the completed value. The fragment is added to the cache. See also render, where the element is not added to the cache.
-    **/
-    function renderCopy(href: string, target?: HTMLElement): Promise<HTMLElement>;
-    function renderCopy(href: HTMLElement, target?: HTMLElement): Promise<HTMLElement>;
-
-    //#endregion Functions
-
-}
-/**
- * Provides methods for defining and displaying PageControl objects.
-**/
-declare namespace WinJS.UI.Pages {
-    //#region Interfaces
-
-    /**
-     * Provides members for a PageControl. You implement this interface when defining a new PageControl.
-    **/
-    interface IPageControlMembers {
-        //#region Methods
-
-        /**
-         * Called if any error occurs during the processing of the page.
-         * @param err The error that occurred.
-         * @returns Nothing if the error was handled, or an error promise if the error was not handled.
-        **/
-        error? (err: any): any;
-
-        /**
-         * Initializes the control before the content of the control is set. Use the processed method for any initialization that should be done after the content of the control has been set.
-         * @param element The DOM element that will contain all the content for the page.
-         * @param options The options passed to the constructor of the page.
-         * @returns A promise that is fulfilled when initialization is complete, if asynchronous processing is necessary. If not, returns nothing.
-        **/
-        init? (element: HTMLElement, options: any): any;
-
-        /**
-         * Creates DOM objects from the content in the specified URI. This method is called after the PageControl is defined and before the init method is called.
-         * @param uri The URI from which to create DOM objects.
-         * @returns A promise whose fulfilled value is the set of unparented DOM objects.
-        **/
-        load? (uri: string): any;
-
-        /**
-         * Initializes the control after the content of the control is set.
-         * @param element The DOM element that will contain all the content for the page.
-         * @param options The options that are to be passed to the constructor of the page.
-         * @returns A promise that is fulfilled when initialization is complete, if asynchronous processing is necessary. If not, returns nothing.
-        **/
-        processed? (element: HTMLElement, options: any): any;
-
-        /**
-         * Called after all initialization and rendering is complete. At this time, the element is ready for use.
-         * @param element The DOM element that contains all the content for the page.
-         * @param options An object that contains one or more property/value pairs to apply to the PageControl. How these property/value pairs are used (or not used) depends on the implementation of that particular PageControl.
-         * @returns A promise that is fulfilled when the element is ready for use, if asynchronous processing is necessary. If not, returns nothing.
-        **/
-        ready? (element: HTMLElement, options: any): any;
-
-        /**
-         * Takes the elements returned by the load method and attaches them to the specified element.
-         * @param element The DOM element to which the loadResult elements are appended.
-         * @param options An object that contains one or more property/value pairs to apply to the PageControl. How these property/value pairs are used (or not used) depends on the implementation of that particular PageControl.
-         * @param loadResult A Promise that contains the elements returned from the load method.
-        **/
-        render? (element: HTMLElement, options: any, loadResult: Promise<any>): void;
-
-        //#endregion Methods
-
-    }
-
-    //#endregion Interfaces
-
-    //#region Objects
-
-    //#endregion Objects
-
-    //#region Functions
-
-    /**
-     * Creates a new PageControl from the specified URI that contains the specified members. Multiple calls to this method for the same URI are allowed, and all members will be merged.
-     * @param uri The URI for the content that defines the page.
-     * @param members An object that defines the members that the control will have.
-     * @returns A constructor function that creates the PageControl.
-    **/
-    function define(uri: string, members: IPageControlMembers): (element?: HTMLElement, options?: any, complete?: (page: any) => void, parentedPromise?: Promise<any>) => void;
-
-    /**
-     * Gets an already-defined page control for the specified URI, or creates a new one.
-     * @param uri The URI for the content that defines the page.
-     * @returns A constructor function that creates the page.
-    **/
-    function get(uri: string): (element?: HTMLElement, options?: any, complete?: (page: any) => void, parentedPromise?: Promise<any>) => void;
-
-    /**
-     * Creates a PageControl from the specified URI and inserts it inside the specified element.
-     * @param uri The URI for the content that defines the page.
-     * @param element The DOM element to which the PageControl is appended.
-     * @param options An object that contains one or more property/value pairs to apply to the new PageControl. How these property/value pairs are used (or not used) depends on the implementation of that particular PageControl.
-     * @param parentedPromise A Promise that is fulfilled when the new PageControl is done rendering and its contents becomes the child of element.
-     * @returns A promise that is fulfilled when rendering is complete, if asynchronous processing is necessary. If not, returns nothing.
-    **/
-    function render(uri: string, element?: HTMLElement, options?: any, parentedPromise?: Promise<any>): Promise<any>;
-
-    //#endregion Functions
-
-}
-/**
- * Provides methods for detecting when the user tabs to or from DOM elements.
-**/
-declare namespace WinJS.UI.TrackTabBehavior {
-    //#region Functions
-
-    /**
-     * Sets the tab order for the specified element within its container.
-     * @param element The element to update.
-     * @param tabIndex The index value of the element within its container.
-    **/
-    function attach(element: HTMLElement, tabIndex: number): void;
-
-    /**
-     * Removes the tab order information from the specified element.
-     * @param element The element to remove tab information from.
-    **/
-    function detach(element: HTMLElement): void;
-
-    //#endregion Functions
-
-}
-/**
- * Provides helper functions, for example, functions to add and remove CSS classes.
-**/
-declare namespace WinJS.Utilities {
-    //#region Enumerations
-
-    /**
-     * Defines a set of keyboard values.
-    **/
-    enum Key {
-        /**
-         * The BACKSPACE key.
-        **/
-        backspace,
-        /**
-         * The TAB key.
-        **/
-        tab,
-        /**
-         * The ENTER key.
-        **/
-        enter,
-        /**
-         * The SHIFT key.
-        **/
-        shift,
-        /**
-         * The CTRL key.
-        **/
-        ctrl,
-        /**
-         * The ALT key.
-        **/
-        alt,
-        /**
-         * The PAUSE key.
-        **/
-        pause,
-        /**
-         * The CAPS LOCK key.
-        **/
-        capsLock,
-        /**
-         * The ESCAPE key.
-        **/
-        escape,
-        /**
-         * The SPACE key.
-        **/
-        space,
-        /**
-         * The PAGE UP key.
-        **/
-        pageUp,
-        /**
-         * The PAGE DOWN key.
-        **/
-        pageDown,
-        /**
-         * The END key.
-        **/
-        end,
-        /**
-         * The HOME key.
-        **/
-        home,
-        /**
-         * The LEFT ARROW key.
-        **/
-        leftArrow,
-        /**
-         * The UP ARROW key.
-        **/
-        upArrow,
-        /**
-         * The RIGHT ARROW key.
-        **/
-        rightArrow,
-        /**
-         * The DOWN ARROW key.
-        **/
-        downArrow,
-        /**
-         * The INSERT key.
-        **/
-        insert,
-        /**
-         * The DELETE key.
-        **/
-        deleteKey,
-        /**
-         * The 0 key.
-        **/
-        num0,
-        /**
-         * The 1 key.
-        **/
-        num1,
-        /**
-         * The 2 key.
-        **/
-        num2,
-        /**
-         * The 3 key.
-        **/
-        num3,
-        /**
-         * The 4 key.
-        **/
-        num4,
-        /**
-         * The 5 key.
-        **/
-        num5,
-        /**
-         * The 6 key.
-        **/
-        num6,
-        /**
-         * The 7 key.
-        **/
-        num7,
-        /**
-         * The 8 key.
-        **/
-        num8,
-        /**
-         * The 9 key.
-        **/
-        num9,
-        /**
-         * The a key.
-        **/
-        a,
-        /**
-         * The b key.
-        **/
-        b,
-        /**
-         * The c key.
-        **/
-        c,
-        /**
-         * The d key.
-        **/
-        d,
-        /**
-         * The e key.
-        **/
-        e,
-        /**
-         * The f key.
-        **/
-        f,
-        /**
-         * The g key.
-        **/
-        g,
-        /**
-         * The h key.
-        **/
-        h,
-        /**
-         * The i key.
-        **/
-        i,
-        /**
-         * The j key.
-        **/
-        j,
-        /**
-         * The k key.
-        **/
-        k,
-        /**
-         * The l key.
-        **/
-        l,
-        /**
-         * The m key.
-        **/
-        m,
-        /**
-         * The n key.
-        **/
-        n,
-        /**
-         * The o key.
-        **/
-        o,
-        /**
-         * The p key.
-        **/
-        p,
-        /**
-         * The q key.
-        **/
-        q,
-        /**
-         * The r key.
-        **/
-        r,
-        /**
-         * The s key.
-        **/
-        s,
-        /**
-         * The t key.
-        **/
-        t,
-        /**
-         * The u key.
-        **/
-        u,
-        /**
-         * The v key.
-        **/
-        v,
-        /**
-         * The w key.
-        **/
-        w,
-        /**
-         * The x key.
-        **/
-        x,
-        /**
-         * The y key.
-        **/
-        y,
-        /**
-         * The z key.
-        **/
-        z,
-        /**
-         * The left Windows key.
-        **/
-        leftWindows,
-        /**
-         * The right Windows key.
-        **/
-        rightWindows,
-        /**
-         * The menu key.
-        **/
-        menu,
-        /**
-         * The 0 key on the numerical keypad.
-        **/
-        numPad0,
-        /**
-         * The 1 key on the numerical keypad.
-        **/
-        numPad1,
-        /**
-         * The 2 key on the numerical keypad.
-        **/
-        numPad2,
-        /**
-         * The 3 key on the numerical keypad.
-        **/
-        numPad3,
-        /**
-         * The 4 key on the numerical keypad.
-        **/
-        numPad4,
-        /**
-         * The 5 key on the numerical keypad.
-        **/
-        numPad5,
-        /**
-         * The 6 key on the numerical keypad.
-        **/
-        numPad6,
-        /**
-         * The 7 key on the numerical keypad.
-        **/
-        numPad7,
-        /**
-         * The 8 key on the numerical keypad.
-        **/
-        numPad8,
-        /**
-         * The 9 key on the numerical keypad.
-        **/
-        numPad9,
-        /**
-         * The multiplication key (*).
-        **/
-        multiply,
-        /**
-         * The addition key (+).
-        **/
-        add,
-        /**
-         * The subtraction key (-).
-        **/
-        subtract,
-        /**
-         * The decimal point key (.)
-        **/
-        decimalPoint,
-        /**
-         * The division key (/).
-        **/
-        divide,
-        /**
-         * The F1 key.
-        **/
-        F1,
-        /**
-         * The F2 key.
-        **/
-        F2,
-        /**
-         * The F3 key.
-        **/
-        F3,
-        /**
-         * The F4 key.
-        **/
-        F4,
-        /**
-         * The F5 key.
-        **/
-        F5,
-        /**
-         * The F6 key.
-        **/
-        F6,
-        /**
-         * The F7 key.
-        **/
-        F7,
-        /**
-         * The F8 key.
-        **/
-        F8,
-        /**
-         * The F9 key.
-        **/
-        F9,
-        /**
-         * The F10 key.
-        **/
-        F10,
-        /**
-         * The F11 key.
-        **/
-        F11,
-        /**
-         * The F12 key.
-        **/
-        F12,
-        /**
-         * The XBox One Remote navigation view button.
-        **/
-        NavigationView,
-        /**
-         * The XBox One Remote navigation menu button.
-        **/
-        NavigationMenu,
-        /**
-         * The XBox One Remote navigation up button.
-        **/
-        NavigationUp,
-        /**
-         * The XBox One Remote navigation down button.
-        **/
-        NavigationDown,
-        /**
-         * The XBox One Remote navigation left button.
-        **/
-        NavigationLeft,
-        /**
-         * The XBox One Remote navigation right button.
-        **/
-        NavigationRight,
-        /**
-         * The XBox One Remote navigation accept button.
-        **/
-        NavigationAccept,
-        /**
-         * The XBox One Remote navigation cancel button.
-        **/
-        NavigationCancel,
-        /**
-         * The NUMBER LOCK key.
-        **/
-        numLock,
-        /**
-         * The SCROLL LOCK key.
-        **/
-        scrollLock,
-        /**
-         * The browser BACK key.
-        **/
-        browserBack,
-        /**
-         * The browser FORWARD key.
-        **/
-        browserForward,
-        /**
-         * The semicolon key (;).
-        **/
-        semicolon,
-        /**
-         * The equals key (=).
-        **/
-        equal,
-        /**
-         * The comma key (,).
-        **/
-        comma,
-        /**
-         * The dash key (-).
-        **/
-        dash,
-        /**
-         * The period key (.).
-        **/
-        period,
-        /**
-         * The forward slash key (/).
-        **/
-        forwardSlash,
-        /**
-         * The grave accent key (`).
-        **/
-        graveAccent,
-        /**
-         * The open bracket key ([).
-        **/
-        /**
-         * The XBox One gamepad A button.
-        **/
-        GamepadA,
-        /**
-         * The XBox One gamepad B button.
-        **/
-        GamepadB,
-        /**
-         * The XBox One gamepad X button.
-        **/
-        GamepadX,
-        /**
-         * The XBox One gamepad Y button.
-        **/
-        GamepadY,
-        /**
-         * The XBox One gamepad right shoulder.
-        **/
-        GamepadRightShoulder,
-        /**
-         * The XBox One gamepad left shoulder.
-        **/
-        GamepadLeftShoulder,
-        /**
-         * The XBox One gamepad left trigger.
-        **/
-        GamepadLeftTrigger,
-        /**
-         * The XBox One gamepad right trigger.
-        **/
-        GamepadRightTrigger,
-        /**
-         * The XBox One gamepad dpad up.
-        **/
-        GamepadDPadUp,
-        /**
-         * The XBox One gamepad dpad down.
-        **/
-        GamepadDPadDown,
-        /**
-         * The XBox One gamepad dpad left.
-        **/
-        GamepadDPadLeft,
-        /**
-         * The XBox One gamepad dpad right.
-        **/
-        GamepadDPadRight,
-        /**
-         * The XBox One gamepad menu button.
-        **/
-        GamepadMenu,
-        /**
-         * The XBox One gamepad view button.
-        **/
-        GamepadView,
-        /**
-         * The XBox One gamepad left thumbstick button.
-        **/
-        GamepadLeftThumbstick,
-        /**
-         * The XBox One gamepad right thumbstick button.
-        **/
-        GamepadRightThumbstick,
-        /**
-         * The XBox One gamepad left thumbstick's up.
-        **/
-        GamepadLeftThumbstickUp,
-        /**
-         * The XBox One gamepad left thumbstick's down.
-        **/
-        GamepadLeftThumbstickDown,
-        /**
-         * The XBox One gamepad left thumbstick's right.
-        **/
-        GamepadLeftThumbstickRight,
-        /**
-         * The XBox One gamepad left thumbstick's left.
-        **/
-        GamepadLeftThumbstickLeft,
-        /**
-         * The XBox One gamepad right thumbstick's up.
-        **/
-        GamepadRightThumbstickUp,
-        /**
-         * The XBox One gamepad right thumbstick's down.
-        **/
-        GamepadRightThumbstickDown,
-        /**
-         * The XBox One gamepad right thumbstick's right.
-        **/
-        GamepadRightThumbstickRight,
-        /**
-         * The XBox One gamepad right thumbstick's left.
-        **/
-        GamepadRightThumbstickLeft,
-        /**
-         * The open bracket key ([).
-        **/
-        openBracket,
-        /**
-         * The backslash key (\).
-        **/
-        backSlash,
-        /**
-         * The close bracket key (]).
-        **/
-        closeBracket,
-        /**
-         * The single quote key (').
-        **/
-        singleQuote,
-        /**
-         * Any IME input.
-        **/
-        IME,
-    }
-
-    //#endregion Enumerations
-
-    //#region Objects
-
-    /**
-     * A mixin that contains event-related functions.
-    **/
-    var eventMixin: {
-        //#region Methods
-
-        /**
-         * Adds an event listener to the control.
-         * @param type The type (name) of the event.
-         * @param listener The listener to invoke when the event gets raised.
-         * @param useCapture If true, initiates capture, otherwise false.
-        **/
-        addEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-        /**
-         * Raises an event of the specified type and with the specified additional properties.
-         * @param type The type (name) of the event.
-         * @param eventProperties The set of additional properties to be attached to the event object when the event is raised.
-         * @returns true if preventDefault was called on the event.
-        **/
-        dispatchEvent(type: string, eventProperties: any): boolean;
-
-        /**
-         * Removes an event listener from the control.
-         * @param type The type (name) of the event.
-         * @param listener The listener to remove.
-         * @param useCapture true if capture is to be initiated, otherwise false.
-        **/
-        removeEventListener(type: string, listener: Function, useCapture?: boolean): void;
-
-        //#endregion Methods
-
-    };
-
-    /**
-     * Represents the result of a query selector, and provides various operations that perform actions over the elements of the collection.
-    **/
-    class QueryCollection<T> extends Array<T> {
-        //#region Methods
-
-        /**
-         * Adds the specified class to all the elements in the collection.
-         * @param name The name of the class to add.
-         * @returns This QueryCollection object.
-        **/
-        addClass(name: string): QueryCollection<T>;
-
-        /**
-         * Clears the specified style property for all the elements in the collection.
-         * @param name The name of the style property to be cleared.
-         * @returns This QueryCollection object.
-        **/
-        clearStyle(name: string): QueryCollection<T>;
-
-        /**
-         * Creates controls that are attached to the elements in this QueryCollection, if the ctor parameter is a function, or configures the controls that are attached to the elements in this QueryCollection, if the ctor parameter is an object.
-         * @param ctor If this parameter is a function, it is a constructor function that is used to create controls to attach to the elements. If it is an object, it is the set of options passed to the controls.
-         * @param options The options passed to the newly-created controls.
-         * @returns This QueryCollection object.
-        **/
-        control(ctor: any, options?: any): QueryCollection<T>;
-
-        /**
-         * Performs an action on each item in the QueryCollection.
-         * @param callbackFn The action to perform on each item.
-         * @param thisArg The argument to bind to callbackFn.
-         * @returns The QueryCollection.
-        **/
-        forEach(callbackFn: (value: T, index: number, array: T[]) => void, thisArg?: any): QueryCollection<T>;
-
-        /**
-         * Gets an item from the QueryCollection.
-         * @param index The index of the item to return.
-         * @returns A single item from the collection.
-        **/
-        get(index: number): T;
-
-        /**
-         * Gets an attribute value from the first element in the collection.
-         * @param name The name of the attribute.
-         * @returns The value of the attribute.
-        **/
-        getAttribute(name: string): any;
-
-        /**
-         * Determines whether the specified class exists on the first element of the collection.
-         * @param name The name of the class.
-         * @returns true if the element has the specified class; otherwise, false.
-        **/
-        hasClass(name: string): boolean;
-
-        /**
-         * Adds a set of items to this QueryCollection.
-         * @param items The items to add to the QueryCollection. This may be an array-like object, a document fragment, or a single item.
-        **/
-        include(items: T): void;
-
-        /**
-         * Adds a set of items to this QueryCollection.
-         * @param items The items to add to the QueryCollection. This may be an array-like object, a document fragment, or a single item.
-        **/
-        include(items: T[]): void;
-
-        /**
-         * Adds a set of items to this QueryCollection.
-         * @param items The items to add to the QueryCollection. This may be an array-like object, a document fragment, or a single item.
-        **/
-        include(items: HTMLCollection): void;
-
-        /**
-         * Registers the listener for the specified event on all the elements in the collection.
-         * @param eventType The name of the event.
-         * @param listener The event handler function to be called when the event occurs.
-         * @param capture true if capture == true is to be passed to addEventListener; otherwise, false.
-        **/
-        listen(eventType: string, listener: Function, capture?: boolean): void;
-
-        /**
-         * Executes a query selector on all the elements in the collection and aggregates the result into a QueryCollection.
-         * @param query The query selector string.
-         * @returns A QueryCollection object containing the aggregate results of executing the query on all the elements in the collection.
-        **/
-        query(query: any): QueryCollection<T>;
-
-        /**
-         * Removes the specified class from all the elements in the collection.
-         * @param name The name of the class to be removed.
-         * @returns This QueryCollection object.
-        **/
-        removeClass(name: string): QueryCollection<T>;
-
-        /**
-         * Unregisters the listener for the specified event on all the elements in the collection.
-         * @param eventType The name of the event.
-         * @param listener The event handler function.
-         * @param capture true if capture == true; otherwise, false.
-         * @returns This QueryCollection object.
-        **/
-        removeEventListener(eventType: string, listener: Function, capture?: boolean): QueryCollection<T>;
-
-        /**
-         * Sets an attribute value on all the items in the collection.
-         * @param name The name of the attribute to be set.
-         * @param value The value of the attribute to be set.
-         * @returns This QueryCollection object.
-        **/
-        setAttribute(name: string, value: any): QueryCollection<T>;
-
-        /**
-         * Sets the specified style property for all the elements in the collection.
-         * @param name The name of the style property.
-         * @param value The value for the property.
-         * @returns This QueryCollection object.
-        **/
-        setStyle(name: string, value: any): QueryCollection<T>;
-
-        /**
-         * Renders a template that is bound to the given data and parented to the elements included in the QueryCollection. If the QueryCollection contains multiple elements, the template is rendered multiple times, once at each element in the QueryCollection per item of data passed.
-         * @param templateElement The DOM element to which the template control is attached.
-         * @param data The data to render. If the data is an array (or any other object that has a forEach method) then the template is rendered multiple times, once for each item in the collection.
-         * @param renderDonePromiseCallback If supplied, this function is called each time the template gets rendered, and is passed a promise that is fulfilled when the template rendering is complete.
-         * @returns The QueryCollection.
-        **/
-        template(templateElement: HTMLElement, data: any, renderDonePromiseCallback?: Function): QueryCollection<T>;
-
-        /**
-         * Toggles (adds or removes) the specified class on all the elements in the collection. If the class is present, it is removed; if it is absent, it is added.
-         * @param name The name of the class to be toggled.
-         * @returns This QueryCollection object.
-        **/
-        toggleClass(name: string): QueryCollection<T>;
-
-        //#endregion Methods
-
-        /**
-         * Indicates that the object is compatibile with declarative processing.
-        **/
-        static supportedForProcessing: boolean;
-
-        //#region Array<T>.prototype
-
-        /**
-         * Combines two or more arrays.
-         * @param items Additional items to add to the end of array1.
-        **/
-        concat<U extends T[]>(...items: U[]): T[];
-        /**
-         * Combines two or more arrays.
-         * @param items Additional items to add to the end of array1.
-        **/
-        concat(...items: T[]): T[];
-
-        /**
-         * Adds all the elements of an array separated by the specified separator string.
-         * @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.
-        **/
-        join(separator?: string): string;
-
-        /**
-         * Removes the last element from an array and returns it.
-        **/
-        pop(): T;
-
-        /**
-         * Appends new elements to an array, and returns the new length of the array.
-         * @param items New elements of the Array.
-        **/
-        push(...items: T[]): number;
-
-        /**
-         * Reverses the elements in an Array.
-        **/
-        reverse(): T[];
-
-        /**
-         * Removes the first element from an array and returns it.
-        **/
-        shift(): T;
-
-        /**
-         * Returns a section of an array.
-         * @param start The beginning of the specified portion of the array.
-         * @param end The end of the specified portion of the array.
-        **/
-        slice(start?: number, end?: number): T[];
-
-        /**
-         * Sorts an array.
-         * @param compareFn The name of the function used to determine the order of the elements. If omitted, the elements are sorted in ascending, ASCII character order.
-        **/
-        sort(compareFn?: (a: T, b: T) => number): T[];
-
-        /**
-         * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements.
-         * @param start The zero-based location in the array from which to start removing elements.
-        **/
-        splice(start: number): T[];
-
-        /**
-         * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements.
-         * @param start The zero-based location in the array from which to start removing elements.
-         * @param deleteCount The number of elements to remove.
-         * @param items Elements to insert into the array in place of the deleted elements.
-        **/
-        splice(start: number, deleteCount: number, ...items: T[]): T[];
-
-        /**
-         * Inserts new elements at the start of an array.
-         * @param items  Elements to insert at the start of the Array.
-        **/
-        unshift(...items: T[]): number;
-
-        /**
-         * Returns the index of the first occurrence of a value in an array.
-         * @param searchElement The value to locate in the array.
-         * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at index 0.
-        **/
-        indexOf(searchElement: T, fromIndex?: number): number;
-
-        /**
-         * Returns the index of the last occurrence of a specified value in an array.
-         * @param searchElement The value to locate in the array.
-         * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at the last index in the array.
-        **/
-        lastIndexOf(searchElement: T, fromIndex?: number): number;
-
-        /**
-         * Determines whether all the members of an array satisfy the specified test.
-         * @param callbackfn A function that accepts up to three arguments. The every method calls the callbackfn function for each element in array1 until the callbackfn returns false, or until the end of the array.
-         * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
-        **/
-        every(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
-
-        /**
-         * Determines whether the specified callback function returns true for any element of an array.
-         * @param callbackfn A function that accepts up to three arguments. The some method calls the callbackfn function for each element in array1 until the callbackfn returns true, or until the end of the array.
-         * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
-        **/
-        some(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
-
-        /**
-         * Calls a defined callback function on each element of an array, and returns an array that contains the results.
-         * @param callbackfn A function that accepts up to three arguments. The map method calls the callbackfn function one time for each element in the array.
-         * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
-        **/
-        map<U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): U[];
-
-        /**
-         * Returns the elements of an array that meet the condition specified in a callback function.
-         * @param callbackfn A function that accepts up to three arguments. The filter method calls the callbackfn function one time for each element in the array.
-         * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
-        **/
-        filter(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): T[];
-
-        /**
-         * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
-         * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array.
-         * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
-        **/
-        reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T;
-        /**
-         * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
-         * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array.
-         * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
-        **/
-        reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
-
-        /**
-         * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
-         * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array.
-         * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
-        **/
-        reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T;
-        /**
-         * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
-         * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array.
-         * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
-        **/
-        reduceRight<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
-
-        /**
-         * Gets or sets the length of the array. This is a number one higher than the highest element defined in an array.
-        **/
-        length: number;
-
-        [n: number]: T;
-
-        //#endregion Array<T>.prototype
-
-    }
-
-    //#endregion Objects
-
-    //#region Functions
-
-    /**
-     * Adds the specified class to the specified element.
-     * @param e The element to which to add the class.
-     * @param name The name of the class to add.
-     * @returns The element.
-    **/
-    function addClass<T extends HTMLElement>(e: T, name: string): T;
-
-    /**
-     * Gets a collection of elements that are the direct children of the specified element.
-     * @param element The parent element.
-     * @returns The collection of children of the element.
-    **/
-    function children(element: HTMLElement): QueryCollection<HTMLElement>;
-
-    /**
-     * Converts a CSS positioning string for the specified element to pixels.
-     * @param element The element.
-     * @param value The CSS positioning string.
-     * @returns The number of pixels.
-    **/
-    function convertToPixels(element: HTMLElement, value: string): number;
-
-    /**
-     * Creates an object that has one event for each name passed to the function.
-     * @param events A variable list of property names.
-     * @returns The object with the specified properties. The names of the properties are prefixed with 'on'.
-    **/
-    function createEventProperties(...events: string[]): any;
-
-    /**
-     * Gets the data value associated with the specified element.
-     * @param element The element.
-     * @returns The value associated with the element.
-    **/
-    function data(element: HTMLElement): any;
-
-    /**
-     * Disposes all first-generation disposable elements that are descendents of the specified element. The specified element itself is not disposed.
-     * @param element The root element whose sub-tree is to be disposed.
-    **/
-    function disposeSubTree(element: HTMLElement): void;
-
-    /**
-     * Removes all the child nodes from the specified element.
-     * @param element The element.
-     * @returns The element.
-    **/
-    function empty<T extends HTMLElement>(element: T): T;
-
-    /**
-     * Determines whether the specified event occurred within the specified element.
-     * @param element The element.
-     * @param event The event.
-     * @returns true if the event occurred within the element; otherwise, false.
-    **/
-    function eventWithinElement(element: HTMLElement, event: Event): boolean;
-
-    /**
-     * Adds tags and type to a logging message.
-     * @param message The message to be formatted.
-     * @param tag The tag(s) to be applied to the message. Multiple tags should be separated by spaces.
-     * @param type The type of the message.
-     * @returns The formatted message.
-    **/
-    function formatLog(message: string, tag: string, type: string): string;
-
-    /**
-     * Gets the height of the content of the specified element. The content height does not include borders or padding.
-     * @param element The element.
-     * @returns The content height of the element.
-    **/
-    function getContentHeight(element: HTMLElement): number;
-
-    /**
-     * Gets the width of the content of the specified element. The content width does not include borders or padding.
-     * @param element The element.
-     * @returns The content width of the element.
-    **/
-    function getContentWidth(element: HTMLElement): number;
-
-    /**
-     * Gets the leaf-level type or namespace specified by the name parameter.
-     * @param name The name of the member.
-     * @param root The root to start in. Defaults to the global object.
-     * @returns The leaf-level type or namespace in the specified parent namespace.
-    **/
-    function getMember(name: string, root?: any): any;
-
-    /**
-     * Gets the position of the specified element.
-     * @param element The element.
-     * @returns An object that contains the left, top, width and height properties of the element.
-    **/
-    function getPosition(element: HTMLElement): IPosition;
-
-    /**
-     * Gets the left coordinate of the specified element relative to the specified parent.
-     * @param element The element.
-     * @param parent The parent element.
-     * @returns The relative left coordinate.
-    **/
-    function getRelativeLeft(element?: HTMLElement, parent?: HTMLElement): number;
-
-    /**
-     * Gets the top coordinate of the element relative to the specified parent.
-     * @param element The element.
-     * @param parent The parent element.
-     * @returns The relative top coordinate.
-    **/
-    function getRelativeTop(element?: HTMLElement, parent?: HTMLElement): number;
-
-    /**
-     * Gets the scrollLeft and scrollTop of the specified element, adjusting the scrollLeft to change from browser specific coordinates to logical coordinates when in RTL.
-     * @param element The element.
-     * @returns An object with two properties: scrollLeft and scrollTop
-    **/
-    function getScrollPosition(element: HTMLElement): { scrollLeft: number; scrollTop: number };
-
-    /**
-     * Gets the tab index of the specified element.
-     * @param element The element
-     * @returns The tabIndex of the element. Returns -1 if the element cannot be tabbed to.
-    **/
-    function getTabIndex(element: HTMLElement): number;
-
-    /**
-     * Gets the height of the element, including its margins.
-     * @param element The element.
-     * @returns The height of the element including margins.
-    **/
-    function getTotalHeight(element: HTMLElement): number;
-
-    /**
-     * Gets the width of the element, including margins.
-     * @param element The element.
-     * @returns The width of the element including margins.
-    **/
-    function getTotalWidth(element: HTMLElement): number;
-
-    /**
-     * Determines whether the specified element has the specified class.
-     * @param e The element.
-     * @param name The name of the class.
-     * @returns true if the element has the class, otherwise false.
-    **/
-    function hasClass(e: HTMLElement, name: string): boolean;
-
-    /**
-     * Returns a collection with zero or one elements matching the specified id.
-     * @param id The ID of the element (or elements).
-     * @returns A collection of elements whose id matches the id parameter.
-    **/
-    function id(id: string): QueryCollection<HTMLElement>;
-
-    /**
-     * Calls insertAdjacentHTML on the specified element.
-     * @param element The element on which insertAdjacentHTML is to be called.
-     * @param position The position relative to the element at which to insert the HTML. Possible values are: beforebegin, afterbegin, beforeend, afterend.
-     * @param text The text to insert.
-    **/
-    function insertAdjacentHTML(element: HTMLElement, position: string, text: string): void;
-
-    /**
-     * Calls insertAdjacentHTML on the specified element in the context of MSApp.execUnsafeLocalFunction.
-     * @param element The element on which insertAdjacentHTML is to be called.
-     * @param position The position relative to the element at which to insert the HTML. Possible values are: beforebegin, afterbegin, beforeend, afterend.
-     * @param text Value to be provided to insertAdjacentHTML.
-    **/
-    function insertAdjacentHTMLUnsafe(element: HTMLElement, position: string, text: string): void;
-
-    /**
-     * Attaches the default dispose API wrapping the dispose implementation to the specified element.
-     * @param element The element to mark as disposable.
-     * @param disposeImpl The function containing the element-specific dispose logic, called by the dispose function that markDisposable attaches.
-    **/
-    function markDisposable(element: HTMLElement, disposeImpl?: Function): void;
-
-    /**
-     * Marks a function as being compatible with declarative processing. Declarative processing is performed by WinJS.UI.processAll or WinJS.Binding.processAll.
-     * @param func The function to be marked as compatible with declarative processing.
-     * @returns The input function, marked as compatible with declarative processing.
-    **/
-    function markSupportedForProcessing<U extends Function>(func: U): U;
-
-    /**
-     * Returns a QueryCollection with zero or one elements matching the specified selector query.
-     * @param query The CSS selector to use. See Selectors for more information.
-     * @param element Optional. The root element at which to start the query. If this parameter is omitted, the scope of the query is the entire document.
-     * @returns A QueryCollection with zero or one elements matching the specified selector query.
-    **/
-    function query(query: any, element?: HTMLElement): QueryCollection<HTMLElement>;
-
-    /**
-     * Ensures that the specified function executes only after the DOMContentLoaded event has fired for the current page. The DOMContentLoaded event occurs after the page has been parsed but before all the resources are loaded.
-     * @param callback A function that executes after the DOMContentLoaded event has occurred.
-     * @param async If true, the callback should be executed asynchronously.
-     * @returns A promise that completes after the DOMContentLoaded event has occurred.
-    **/
-    function ready(callback?: Function, async?: boolean): Promise<any>;
-
-    /**
-     * Removes the specified class from the specified element.
-     * @param e The element from which to remove the class.
-     * @param name The name of the class to remove.
-     * @returns The element.
-    **/
-    function removeClass<T extends HTMLElement>(e: T, name: string): T;
-
-    /**
-     * Asserts that the value is compatible with declarative processing. Declarative processing is performed by WinJS.UI.processAll or WinJS.Binding.processAll. If the value is not compatible, and strictProcessing is on, an exception is thrown. All functions that have been declared using WinJS.Class.define, WinJS.Class.derive, WinJS.UI.Pages.define, or WinJS.Binding.converter are automatically marked as supported for declarative processing. Any other function that you use from a declarative context (that is, a context in which an HTML element has a data-win-control or data-win-options attribute) must be marked manually by calling this function. When you mark a function as supported for declarative processing, you are guaranteeing that the code in the function is secure from injection of third-party content.
-     * @param value The value to be tested for compatibility with declarative processing. If the value is a function it must be marked with a property supportedForProcessing with a value of true when strictProcessing is on. For more information, see WinJS.Utilities.markSupportedForProcessing.
-     * @returns The input value.
-    **/
-    function requireSupportedForProcessing<T>(value: T): T;
-
-    /**
-     * Sets the innerHTML property of the specified element to the specified text.
-     * @param element The element on which the innerHTML property is to be set.
-     * @param text The value to be set to the innerHTML property.
-    **/
-    function setInnerHTML(element: HTMLElement, text: string): void;
-
-    /**
-     * Sets the innerHTML property of the specified element to the specified text.
-     * @param element The element on which the innerHTML property is to be set.
-     * @param text The value to be set to the innerHTML property.
-    **/
-    function setInnerHTMLUnsafe(element: HTMLElement, text: string): void;
-
-    /**
-     * Sets the outerHTML property of the specified element to the specified text.
-     * @param element The element on which the outerHTML property is to be set.
-     * @param text The value to be set to the outerHTML property.
-    **/
-    function setOuterHTML(element: HTMLElement, text: string): void;
-
-    /**
-     * Sets the outerHTML property of the specified element to the specified text in the context of MSApp.execUnsafeLocalFunction.
-     * @param element The element on which the outerHTML property is to be set.
-     * @param text The value to be set to the outerHTML property.
-    **/
-    function setOuterHTMLUnsafe(element: HTMLElement, text: string): void;
-
-    /**
-     * Sets the scrollLeft and scrollTop of the specified element, changing the scrollLeft from logical coordinates to browser-specific coordinates when in RTL.
-     * @param element The element.
-     * @param position An object describing the position to set.
-    **/
-    function setScrollPosition(element: HTMLElement, position: { scrollLeft: number; scrollTop: number }): void;
-
-    /**
-     * Configures a logger that writes messages containing the specified tags to the JavaScript console.
-     * @param options The tags for messages to log. Multiple tags should be separated by spaces. May contain type, tags, excludeTags and action properties.
-    **/
-    function startLog(options?: ILogOptions): void;
-    function startLog(tags?: string): void;
-
-    /**
-     * Removes the WinJS logger that had previously been set up.
-    **/
-    function stopLog(): void;
-
-    /**
-     * Toggles (adds or removes) the specified class on the specified element. If the class is present, it is removed; if it is absent, it is added.
-     * @param e The element on which to toggle the class.
-     * @param name The name of the class to toggle.
-     * @returns The element.
-    **/
-    function toggleClass<T extends HTMLElement>(e: T, name: string): T;
-
-    //#endregion Functions
-
-    //#region Properties
-
-    /**
-     * Gets whether the current script context has access to WinRT APIs.
-    **/
-    var hasWinRT: boolean;
-
-    /**
-     * Determines if strict declarative processing is enabled in this script context.
-    **/
-    var strictProcessing: boolean;
-
-    //#endregion Properties
-
-    //#region Interfaces
-
-    interface ILogOptions {
-        type?: string;
-        action?: (message: string, tags: string, type: string) => void;
-        excludeTags?: string;
-        tags?: string;
-    }
-
-    interface IPosition {
-        left: number;
-        top: number;
-        width: number;
-        height: number;
-    }
-
-    //#endregion Interfaces
-
-}
-/**
- * Provides functions and objects for scheduling and managing asynchronous tasks.
-**/
-declare namespace WinJS.Utilities.Scheduler {
-    //#region Enumerations
-
-    /**
-     * Represents a priority for a job managed by the Scheduler.
-    **/
-    enum Priority {
-        /**
-         * A priority higher than the normal priority level.
-        **/
-        aboveNormal,
-        /**
-         * A priority less than the normal priority level.
-        **/
-        belowNormal,
-        /**
-         * A high priority.
-        **/
-        high,
-        /**
-         * The idle priority for work items.
-        **/
-        idle,
-        /**
-         * The highest priority.
-        **/
-        max,
-        /**
-         * The lowest priority.
-        **/
-        min,
-        /**
-         * The normal priority for work items.
-        **/
-        normal
-    }
-
-    //#endregion Enumerations
-
-    //#region Interfaces
-
-    /**
-     * Represents a work item that's executed by the Scheduler.
-    **/
-    interface IJob {
-        //#region Methods
-
-        /**
-         * Cancels the job.
-        **/
-        cancel(): void;
-
-        /**
-         * Pauses the job.
-        **/
-        pause(): void;
-
-        /**
-         * Resumes the job.
-        **/
-        resume(): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets a value that indicates whether the job has successfully completed.
-        **/
-        completed: boolean;
-
-        /**
-         * Gets the unique numeric identifier assigned to the job.
-        **/
-        id: number;
-
-        /**
-         * Gets or sets the name of the job.
-        **/
-        name: string;
-
-        /**
-         * Gets or sets the owner of the job.
-        **/
-        owner: IOwnerToken;
-
-        /**
-         * Gets or sets the priority of the job.
-        **/
-        priority: Priority;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Provides a control mechanism that allows a job to cooperatively yield. This object is passed to your work function when you schedule it.
-    **/
-    interface IJobInfo {
-        //#region Methods
-
-        /**
-         * Uses a Promise to determine how long the scheduler should wait before rescheduling the job after it yields.
-         * @param promise Once the work item yields, the scheduler will wait for this Promise to complete before rescheduling the job.
-        **/
-        setPromise(promise: Promise<any>): void;
-
-        /**
-         * Specifies the next unit of work to run once this job yields.
-         * @param work The next unit of work to run once this job yields.
-        **/
-        setWork(work: Function): void;
-
-        //#endregion Methods
-
-        //#region Properties
-
-        /**
-         * Gets the work item associated with this IJobInfo.
-        **/
-        job: IJob;
-
-        /**
-         * Gets a value that specifies whether the job should yield.
-        **/
-        shouldYield: boolean;
-
-        //#endregion Properties
-
-    }
-
-    /**
-     * Represents an object that owns jobs. You can use this object to cancel a set of jobs.
-    **/
-    interface IOwnerToken {
-        //#region Methods
-
-        /**
-         * Synchronously cancels the job that this token owns, including paused and blocked jobs.
-        **/
-        cancelAll(): void;
-
-        //#endregion Methods
-
-    }
-
-    //#endregion Interfaces
-
-    //#region Properties
-
-    /**
-     * Gets the current priority at which the caller is executing.
-     **/
-    var currentPriority: Priority;
-
-    //#endregion Properties
-
-    //#region Functions
-
-    /**
-     * Creates and returns a new IOwnerToken which can be set to the owner property of one or more jobs.
-     * @returns A new IOwnerToken which can be set to the owner property of one or more jobs.
-    **/
-    function createOwnerToken(): IOwnerToken;
-
-    /**
-     * Runs the specified callback in a high priority context.
-     * @param callback The callback to run in a high priority callback.
-     * @returns The return value of the callback.
-    **/
-    function execHigh<U>(callback: () => U): U;
-
-    /**
-     * Returns a string representation of the scheduler's state for diagnostic purposes. The jobs and drain requests are displayed in the order in which they are currently expected to be processed. The current job and drain request are marked by an asterisk.
-     * @returns A string representation of the scheduler's state for diagnostic purposes. The jobs and drain requests are displayed in the order in which they are currently expected to be processed. The current job and drain request are marked by an asterisk.
-    **/
-    function retrieveState(): string;
-
-    /**
-     * Runs jobs in the scheduler without timeslicing until all jobs at the specified priority and higher have executed.
-     * @param priority The priority to which the scheduler should drain. The default is -15.
-     * @param name An optional description of the drain request for diagnostics.
-     * @returns A Promise which completes when the drain has finished. Canceling this Promise cancels the drain request. This Promise will never enter an error state.
-    **/
-    function requestDrain(priority?: Priority, name?: string): Promise<any>;
-
-    /**
-     * Schedules the specified function to execute asynchronously.
-     * @param work A function that represents the work item to be scheduled. When called the work item will receive as its first argument an object which allows the work item to ask the scheduler if it should yield cooperatively and if so allows the work item to either provide a function to be run as a continuation or a WinJS.Promise which will when complete provide a function to run as a continuation. Provide these fields for the object: shouldYield, setWork(work), setPromise(promise), job.
-     * @param priority The priority of the work item. If you don't specify a priority, it defaults to WinJS.Utilities.Scheduler.Priority.normal.
-     * @param thisArg A "this" instance to be bound to the work item. The default value is null.
-     * @param name A description of the work item for diagnostics. The default value is an empty string.
-     * @returns The job instance that represents this work item.
-    **/
-    function schedule(work: (jobInfo: IJobInfo) => any, priority?: Priority, thisArg?: any, name?: string): IJob;
-
-    /**
-     * Schedules a job to complete the returned Promise at WinJS.Utilities.Scheduler.Priority.aboveNormal priority.
-     * @param promiseValue The value returned by the completed Promise.
-     * @param jobName A string that describes the job for diagnostic purposes.
-     * @returns A Promise that completes within a job of aboveNormal priority.
-    **/
-    function schedulePromiseAboveNormal<U>(promiseValue?: U, jobName?: string): Promise<U>;
-
-    /**
-     * Schedules a job to complete the returned Promise at WinJS.Utilities.Scheduler.Priority.belowNormal priority.
-     * @param promiseValue The value returned by the completed Promise.
-     * @param jobName A string that describes the job for diagnostic purposes.
-     * @returns A Promise that completes within a job of belowNormal priority.
-    **/
-    function schedulePromiseBelowNormal<U>(promiseValue?: U, jobName?: string): Promise<U>;
-
-    /**
-     * Schedules a job to complete the returned Promise at WinJS.Utilities.Scheduler.Priority.high priority.
-     * @param promiseValue The value returned by the completed Promise.
-     * @param jobName A string that describes the job for diagnostic purposes.
-     * @returns A Promise that completes within a job of high priority.
-    **/
-    function schedulePromiseHigh<U>(promiseValue?: U, jobName?: string): Promise<U>;
-
-    /**
-     * Schedules a job to complete the returned Promise at WinJS.Utilities.Scheduler.Priority.Idle priority.
-     * @param promiseValue The value returned by the completed Promise.
-     * @param jobName A string that describes the job for diagnostic purposes.
-     * @returns A Promise that completes within a job of idle priority.
-    **/
-    function schedulePromiseIdle<U>(promiseValue?: U, jobName?: string): Promise<U>;
-
-    /**
-     * Schedules a job to complete the returned Promise at WinJS.Utilities.Scheduler.Priority.normal priority.
-     * @param promiseValue The value returned by the completed Promise.
-     * @param jobName A string that describes the job for diagnostic purposes.
-     * @returns A Promise that completes within a job of normal priority.
-    **/
-    function schedulePromiseNormal<U>(promiseValue?: U, jobName?: string): Promise<U>;
-
-    //#endregion Functions
-
-}
-
-declare module 'winjs' {
-    export = WinJS;
-}
diff --git a/winjs/winjs.d.ts.tscparams b/winjs/winjs.d.ts.tscparams
deleted file mode 100644
index 1f3d85fb3b..0000000000
--- a/winjs/winjs.d.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target es5 --noImplicitAny
diff --git a/winreg/winreg.d.ts b/winreg/index.d.ts
similarity index 100%
rename from winreg/winreg.d.ts
rename to winreg/index.d.ts
diff --git a/winreg/tsconfig.json b/winreg/tsconfig.json
new file mode 100644
index 0000000000..d8e8ed351b
--- /dev/null
+++ b/winreg/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "winreg-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/winreg/winreg-tests.ts b/winreg/winreg-tests.ts
index 376006aed6..d9c373fec5 100644
--- a/winreg/winreg-tests.ts
+++ b/winreg/winreg-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="winreg.d.ts" />
+
 
 var regKey = new Winreg({
     hive: Winreg.HKCU,
diff --git a/winrt/winrt-uwp.d.ts b/winrt-uwp/index.d.ts
similarity index 100%
rename from winrt/winrt-uwp.d.ts
rename to winrt-uwp/index.d.ts
diff --git a/winrt-uwp/tsconfig.json b/winrt-uwp/tsconfig.json
new file mode 100644
index 0000000000..d2b3785858
--- /dev/null
+++ b/winrt-uwp/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es5",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/winrt/winrt.d.ts b/winrt/index.d.ts
similarity index 100%
rename from winrt/winrt.d.ts
rename to winrt/index.d.ts
diff --git a/winrt/tsconfig.json b/winrt/tsconfig.json
new file mode 100644
index 0000000000..d2b3785858
--- /dev/null
+++ b/winrt/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es5",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/winston/index.d.ts b/winston/index.d.ts
new file mode 100644
index 0000000000..7de3419999
--- /dev/null
+++ b/winston/index.d.ts
@@ -0,0 +1,339 @@
+// Type definitions for winston
+// Project: https://github.com/flatiron/winston
+// Definitions by: bonnici <https://github.com/bonnici>, Peter Harris <https://github.com/codeanimal>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/winston.d.ts
+
+/// <reference types="node" />
+
+///******************
+///  Winston v2.2.x
+///******************
+
+
+export declare var transports: Transports;
+export declare var Transport: TransportStatic;
+export declare var Logger: LoggerStatic;
+export declare var Container: ContainerStatic;
+export declare var loggers: ContainerInstance;
+export declare var defaultLogger: LoggerInstance;
+
+export declare var exception: Exception;
+
+export declare var exitOnError: boolean;
+export declare var level: string;
+
+export declare var log: LogMethod;
+
+export declare var debug: LeveledLogMethod;
+export declare var info: LeveledLogMethod;
+export declare var warn: LeveledLogMethod;
+export declare var error: LeveledLogMethod;
+
+export declare function query(options: QueryOptions, callback?: (err: Error, results: any) => void): any;
+export declare function query(callback: (err: Error, results: any) => void): any;
+export declare function stream(options?: any): NodeJS.ReadableStream;
+export declare function handleExceptions(...transports: TransportInstance[]): void;
+export declare function unhandleExceptions(...transports: TransportInstance[]): void;
+export declare function add(transport: TransportInstance, options?: TransportOptions, created?: boolean): LoggerInstance;
+export declare function clear(): void;
+export declare function remove(transport: string): LoggerInstance;
+export declare function remove(transport: TransportInstance): LoggerInstance;
+export declare function startTimer(): ProfileHandler;
+export declare function profile(id: string, msg?: string, meta?: any, callback?: (err: Error, level: string, msg: string, meta: any) => void): LoggerInstance;
+export declare function addColors(target: any): any;
+export declare function setLevels(target: any): any;
+export declare function cli(): LoggerInstance;
+export declare function close(): void;
+
+export interface ExceptionProcessInfo {
+    pid: number;
+    uid?: number;
+    gid?: number;
+    cwd: string;
+    execPath: string;
+    version: string;
+    argv: string;
+    memoryUsage: NodeJS.MemoryUsage;
+}
+
+export interface ExceptionOsInfo {
+    loadavg: [number, number, number];
+    uptime: number;
+}
+
+export interface ExceptionTrace {
+    column: number;
+    file: string;
+    "function": string;
+    line: number;
+    method: string;
+    native: boolean;
+}
+
+export interface ExceptionAllInfo {
+    date: Date;
+    process: ExceptionProcessInfo;
+    os: ExceptionOsInfo;
+    trace: Array<ExceptionTrace>;
+    stack: Array<string>;
+}
+
+export interface Exception {
+    getAllInfo(err: Error): ExceptionAllInfo;
+    getProcessInfo(): ExceptionProcessInfo;
+    getOsInfo(): ExceptionOsInfo;
+    getTrace(err: Error): Array<ExceptionTrace>;
+}
+
+export interface MetadataRewriter {
+    (level: string, msg: string, meta: any): any;
+}
+
+export interface MetadataFilter {
+    (level: string, msg: string, meta: any): string | { msg: any; meta: any; };
+}
+
+export interface LoggerStatic {
+    new (options?: LoggerOptions): LoggerInstance;
+}
+
+export interface LoggerInstance extends NodeJS.EventEmitter {
+    rewriters: Array<MetadataRewriter>;
+    filters: Array<MetadataFilter>;
+    transports: Array<TransportInstance>;
+
+    extend(target: any): LoggerInstance;
+
+    log: LogMethod;
+
+    debug: LeveledLogMethod;
+    info: LeveledLogMethod;
+    warn: LeveledLogMethod;
+    error: LeveledLogMethod;
+
+    query(options: QueryOptions, callback?: (err: Error, results: any) => void): any;
+    query(callback: (err: Error, results: any) => void): any;
+    stream(options?: any): NodeJS.ReadableStream;
+    close(): void;
+    handleExceptions(...transports: TransportInstance[]): void;
+    unhandleExceptions(...transports: TransportInstance[]): void;
+    add(transport: TransportInstance, options?: TransportOptions, created?: boolean): LoggerInstance;
+    clear(): void;
+    remove(transport: TransportInstance): LoggerInstance;
+    startTimer(): ProfileHandler;
+    profile(id: string, msg?: string, meta?: any, callback?: (err: Error, level: string, msg: string, meta: any) => void): LoggerInstance;
+
+    setLevels(target: any): any;
+    cli(): LoggerInstance;
+
+    level: string;
+}
+
+export interface LoggerOptions {
+    transports?: TransportInstance[];
+    rewriters?: TransportInstance[];
+    exceptionHandlers?: TransportInstance[];
+    handleExceptions?: boolean;
+
+    /**
+     * @type {(boolean|(err: Error) => void)}
+     */
+    exitOnError?: any;
+
+    // TODO: Need to make instances specific,
+    //       and need to get options for each instance.
+    //       Unfortunately, the documentation is unhelpful.
+    [optionName: string]: any;
+}
+
+export interface TransportStatic {
+    new (options?: TransportOptions): TransportInstance;
+}
+
+export interface TransportInstance extends TransportStatic, NodeJS.EventEmitter {
+    formatQuery(query: (string | Object)): (string | Object);
+    normalizeQuery(options: QueryOptions): QueryOptions;
+    formatResults(results: (Object | Array<any>), options?: Object): (Object | Array<any>);
+    logException(msg: string, meta: Object, callback: () => void): void;
+}
+
+export interface ConsoleTransportInstance extends TransportInstance {
+    new (options?: ConsoleTransportOptions): ConsoleTransportInstance;
+}
+
+export interface DailyRotateFileTransportInstance extends TransportInstance {
+    new (options?: DailyRotateFileTransportOptions): DailyRotateFileTransportInstance;
+}
+
+export interface FileTransportInstance extends TransportInstance {
+    new (options?: FileTransportOptions): FileTransportInstance;
+    close(): void;
+}
+
+export interface HttpTransportInstance extends TransportInstance {
+    new (options?: HttpTransportOptions): HttpTransportInstance;
+}
+
+export interface MemoryTransportInstance extends TransportInstance {
+    new (options?: MemoryTransportOptions): MemoryTransportInstance;
+}
+
+export interface WebhookTransportInstance extends TransportInstance {
+    new (options?: WebhookTransportOptions): WebhookTransportInstance;
+}
+
+export interface WinstonModuleTrasportInstance extends TransportInstance {
+    new (options?: WinstonModuleTransportOptions): WinstonModuleTrasportInstance;
+}
+
+export interface ContainerStatic {
+    new (options: LoggerOptions): ContainerInstance;
+}
+
+export interface ContainerInstance extends ContainerStatic {
+    get(id: string, options?: LoggerOptions): LoggerInstance;
+    add(id: string, options: LoggerOptions): LoggerInstance;
+    has(id: string): boolean;
+    close(id: string): void;
+    options: LoggerOptions;
+    loggers: any;
+    default: LoggerOptions;
+}
+
+export interface Transports {
+    File: FileTransportInstance;
+    Console: ConsoleTransportInstance;
+    Loggly: WinstonModuleTrasportInstance;
+    DailyRotateFile: DailyRotateFileTransportInstance;
+    Http: HttpTransportInstance;
+    Memory: MemoryTransportInstance;
+    Webhook: WebhookTransportInstance;
+}
+
+export type TransportOptions = ConsoleTransportOptions | DailyRotateFileTransportOptions | FileTransportOptions | HttpTransportOptions | MemoryTransportOptions | WebhookTransportOptions | WinstonModuleTransportOptions;
+
+export interface GenericTransportOptions {
+    level?: string;
+    silent?: boolean;
+    raw?: boolean;
+    name?: string;
+    formatter?: Function;
+    handleExceptions?: boolean;
+    exceptionsLevel?: string;
+    humanReadableUnhandledException?: boolean;
+}
+
+export interface GenericTextTransportOptions {
+    json?: boolean;
+    colorize?: boolean;
+    colors?: any;
+    prettyPrint?: boolean;
+    timestamp?: (Function | boolean);
+    showLevel?: boolean;
+    label?: string;
+    depth?: number;
+    stringify?: Function;
+}
+
+export interface GenericNetworkTransportOptions {
+    host?: string;
+    port?: number;
+    auth?: {
+        username: string;
+        password: string;
+    };
+    path?: string;
+}
+
+export interface ConsoleTransportOptions extends GenericTransportOptions, GenericTextTransportOptions {
+    logstash?: boolean;
+    debugStdout?: boolean;
+}
+
+export interface DailyRotateFileTransportOptions extends GenericTransportOptions, GenericTextTransportOptions {
+    logstash?: boolean;
+    maxsize?: number;
+    maxFiles?: number;
+    eol?: string;
+    maxRetries?: number;
+    datePattern?: string;
+    filename?: string;
+    dirname?: string;
+    options?: {
+        flags?: string;
+        highWaterMark?: number;
+    };
+    stream?: NodeJS.WritableStream;
+}
+
+export interface FileTransportOptions extends GenericTransportOptions, GenericTextTransportOptions {
+    logstash?: boolean;
+    maxsize?: number;
+    rotationFormat?: boolean;
+    zippedArchive?: boolean;
+    maxFiles?: number;
+    eol?: string;
+    tailable?: boolean;
+    maxRetries?: number;
+    filename?: string;
+    dirname?: string;
+    options?: {
+        flags?: string;
+        highWaterMark?: number;
+    };
+    stream?: NodeJS.WritableStream;
+}
+
+export interface HttpTransportOptions extends GenericTransportOptions, GenericNetworkTransportOptions {
+    ssl?: boolean;
+}
+
+export interface MemoryTransportOptions extends GenericTransportOptions, GenericTextTransportOptions {
+}
+
+export interface WebhookTransportOptions extends GenericTransportOptions, GenericNetworkTransportOptions {
+    method?: string;
+    ssl?: {
+        key?: any;
+        cert?: any;
+        ca: any;
+    };
+}
+
+export interface WinstonModuleTransportOptions extends GenericTransportOptions {
+    [optionName: string]: any;
+}
+
+export interface QueryOptions {
+    rows?: number;
+    limit?: number;
+    start?: number;
+    from?: Date;
+    until?: Date;
+    order?: "asc" | "desc";
+    fields: any;
+}
+
+export interface ProfileHandler {
+    logger: LoggerInstance;
+    start: Date;
+    done: (msg: string) => LoggerInstance;
+}
+
+interface LogMethod {
+    (level: string, msg: string, callback: LogCallback): LoggerInstance;
+    (level: string, msg: string, meta: any, callback: LogCallback): LoggerInstance;
+    (level: string, msg: string, ...meta: any[]): LoggerInstance;
+}
+
+interface LeveledLogMethod {
+    (msg: string, callback: LogCallback): LoggerInstance;
+    (msg: string, meta: any, callback: LogCallback): LoggerInstance;
+    (msg: string, ...meta: any[]): LoggerInstance;
+}
+
+interface LogCallback {
+    (error?: any, level?: string, msg?: string, meta?: any): void;
+}
diff --git a/winston/tsconfig.json b/winston/tsconfig.json
new file mode 100644
index 0000000000..6036d7b428
--- /dev/null
+++ b/winston/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "winston-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/winston/winston-tests.ts b/winston/winston-tests.ts
index a82390d1a3..d516aa63b0 100644
--- a/winston/winston-tests.ts
+++ b/winston/winston-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="winston.d.ts" />
 
 import winston = require('winston');
 
diff --git a/winston/winston.d.ts b/winston/winston.d.ts
deleted file mode 100644
index 921b4c49d1..0000000000
--- a/winston/winston.d.ts
+++ /dev/null
@@ -1,338 +0,0 @@
-// Type definitions for winston
-// Project: https://github.com/flatiron/winston
-// Definitions by: bonnici <https://github.com/bonnici>, Peter Harris <https://github.com/codeanimal>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/winston.d.ts
-
-/// <reference path="../node/node.d.ts" />
-
-///******************
-///  Winston v2.2.x
-///******************
-
-declare module "winston" {
-  export var transports: Transports;
-  export var Transport: TransportStatic;
-  export var Logger: LoggerStatic;
-  export var Container: ContainerStatic;
-  export var loggers: ContainerInstance;
-  export var defaultLogger: LoggerInstance;
-
-  export var exception: Exception;
-
-  export var exitOnError: boolean;
-  export var level: string;
-
-  export var log: LogMethod;
-
-  export var debug: LeveledLogMethod;
-  export var info: LeveledLogMethod;
-  export var warn: LeveledLogMethod;
-  export var error: LeveledLogMethod;
-
-  export function query(options: QueryOptions, callback?: (err: Error, results: any) => void): any;
-  export function query(callback: (err: Error, results: any) => void): any;
-  export function stream(options?: any): NodeJS.ReadableStream;
-  export function handleExceptions(...transports: TransportInstance[]): void;
-  export function unhandleExceptions(...transports: TransportInstance[]): void;
-  export function add(transport: TransportInstance, options?: TransportOptions, created?: boolean): LoggerInstance;
-  export function clear(): void;
-  export function remove(transport: string): LoggerInstance;
-  export function remove(transport: TransportInstance): LoggerInstance;
-  export function startTimer(): ProfileHandler;
-  export function profile(id: string, msg?: string, meta?: any, callback?: (err: Error, level: string, msg: string, meta: any) => void): LoggerInstance;
-  export function addColors(target: any): any;
-  export function setLevels(target: any): any;
-  export function cli(): LoggerInstance;
-  export function close(): void;
-
-  export interface ExceptionProcessInfo {
-    pid: number;
-    uid?: number;
-    gid?: number;
-    cwd: string;
-    execPath: string;
-    version: string;
-    argv: string;
-    memoryUsage: NodeJS.MemoryUsage;
-  }
-
-  export interface ExceptionOsInfo {
-    loadavg: [number, number, number];
-    uptime: number;
-  }
-
-  export interface ExceptionTrace {
-    column: number;
-    file: string;
-    "function": string;
-    line: number;
-    method: string;
-    native: boolean;
-  }
-
-  export interface ExceptionAllInfo {
-    date: Date;
-    process: ExceptionProcessInfo;
-    os: ExceptionOsInfo;
-    trace: Array<ExceptionTrace>;
-    stack: Array<string>;
-  }
-
-  export interface Exception {
-    getAllInfo(err: Error): ExceptionAllInfo;
-    getProcessInfo(): ExceptionProcessInfo;
-    getOsInfo(): ExceptionOsInfo;
-    getTrace(err: Error): Array<ExceptionTrace>;
-  }
-
-  export interface MetadataRewriter {
-    (level: string, msg: string, meta: any): any;
-  }
-
-  export interface MetadataFilter {
-    (level: string, msg: string, meta: any): string | {msg: any; meta: any;};
-  }
-
-  export interface LoggerStatic {
-    new (options?: LoggerOptions): LoggerInstance;
-  }
-
-  export interface LoggerInstance extends NodeJS.EventEmitter {
-    rewriters: Array<MetadataRewriter>;
-    filters: Array<MetadataFilter>;
-    transports: Array<TransportInstance>;
-
-    extend(target: any): LoggerInstance;
-
-    log: LogMethod;
-
-    debug: LeveledLogMethod;
-    info: LeveledLogMethod;
-    warn: LeveledLogMethod;
-    error: LeveledLogMethod;
-
-    query(options: QueryOptions, callback?: (err: Error, results: any) => void): any;
-    query(callback: (err: Error, results: any) => void): any;
-    stream(options?: any): NodeJS.ReadableStream;
-    close(): void;
-    handleExceptions(...transports: TransportInstance[]): void;
-    unhandleExceptions(...transports: TransportInstance[]): void;
-    add(transport: TransportInstance, options?: TransportOptions, created?: boolean): LoggerInstance;
-    clear(): void;
-    remove(transport: TransportInstance): LoggerInstance;
-    startTimer(): ProfileHandler;
-    profile(id: string, msg?: string, meta?: any, callback?: (err: Error, level: string, msg: string, meta: any) => void): LoggerInstance;
-
-    setLevels(target: any): any;
-    cli(): LoggerInstance;
-  }
-
-  export interface LoggerOptions {
-    transports?: TransportInstance[];
-    rewriters?: TransportInstance[];
-    exceptionHandlers?: TransportInstance[];
-    handleExceptions?: boolean;
-
-    /**
-     * @type {(boolean|(err: Error) => void)}
-     */
-    exitOnError?: any;
-
-    // TODO: Need to make instances specific,
-    //       and need to get options for each instance.
-    //       Unfortunately, the documentation is unhelpful.
-    [optionName: string]: any;
-  }
-
-  export interface TransportStatic {
-    new (options?: TransportOptions): TransportInstance;
-  }
-
-  export interface TransportInstance extends TransportStatic, NodeJS.EventEmitter {
-    formatQuery(query: (string|Object)): (string|Object);
-    normalizeQuery(options: QueryOptions): QueryOptions;
-    formatResults(results: (Object|Array<any>), options?: Object): (Object|Array<any>);
-    logException(msg: string, meta: Object, callback: () => void): void;
-  }
-
-  export interface ConsoleTransportInstance extends TransportInstance {
-    new (options?: ConsoleTransportOptions): ConsoleTransportInstance;
-  }
-
-  export interface DailyRotateFileTransportInstance extends TransportInstance {
-    new (options?: DailyRotateFileTransportOptions): DailyRotateFileTransportInstance;
-  }
-
-  export interface FileTransportInstance extends TransportInstance {
-    new (options?: FileTransportOptions): FileTransportInstance;
-    close(): void;
-  }
-
-  export interface HttpTransportInstance extends TransportInstance {
-    new (options?: HttpTransportOptions): HttpTransportInstance;
-  }
-
-  export interface MemoryTransportInstance extends TransportInstance {
-    new (options?: MemoryTransportOptions): MemoryTransportInstance;
-  }
-
-  export interface WebhookTransportInstance extends TransportInstance {
-    new (options?: WebhookTransportOptions): WebhookTransportInstance;
-  }
-
-  export interface WinstonModuleTrasportInstance extends TransportInstance {
-    new (options?: WinstonModuleTransportOptions): WinstonModuleTrasportInstance;
-  }
-
-  export interface ContainerStatic {
-    new (options: LoggerOptions): ContainerInstance;
-  }
-
-  export interface ContainerInstance extends ContainerStatic {
-    get(id: string, options?: LoggerOptions): LoggerInstance;
-    add(id: string, options: LoggerOptions): LoggerInstance;
-    has(id: string): boolean;
-    close(id: string): void;
-    options: LoggerOptions;
-    loggers: any;
-    default: LoggerOptions;
-  }
-
-  export interface Transports {
-    File: FileTransportInstance;
-    Console: ConsoleTransportInstance;
-    Loggly: WinstonModuleTrasportInstance;
-    DailyRotateFile: DailyRotateFileTransportInstance;
-    Http: HttpTransportInstance;
-    Memory: MemoryTransportInstance;
-    Webhook: WebhookTransportInstance;
-  }
-
-  export type TransportOptions = ConsoleTransportOptions|DailyRotateFileTransportOptions|FileTransportOptions|HttpTransportOptions|MemoryTransportOptions|WebhookTransportOptions|WinstonModuleTransportOptions;
-
-  export interface GenericTransportOptions {
-    level?: string;
-    silent?: boolean;
-    raw?: boolean;
-    name?: string;
-    formatter?: Function;
-    handleExceptions?: boolean;
-    exceptionsLevel?: string;
-    humanReadableUnhandledException?: boolean;
-  }
-
-  export interface GenericTextTransportOptions {
-    json?: boolean;
-    colorize?: boolean;
-    colors?: any;
-    prettyPrint?: boolean;
-    timestamp?: (Function|boolean);
-    showLevel?: boolean;
-    label?: string;
-    depth?: number;
-    stringify?: Function;
-  }
-
-  export interface GenericNetworkTransportOptions {
-    host?: string;
-    port?: number;
-    auth?: {
-      username: string;
-      password: string;
-    };
-    path?: string;
-  }
-
-  export interface ConsoleTransportOptions extends GenericTransportOptions, GenericTextTransportOptions {
-    logstash?: boolean;
-    debugStdout?: boolean;
-  }
-
-  export interface DailyRotateFileTransportOptions extends GenericTransportOptions, GenericTextTransportOptions {
-    logstash?: boolean;
-    maxsize?: number;
-    maxFiles?: number;
-    eol?: string;
-    maxRetries?: number;
-    datePattern?: string;
-    filename?: string;
-    dirname?: string;
-    options?: {
-      flags?: string;
-      highWaterMark?: number;
-    };
-    stream?: NodeJS.WritableStream;
-  }
-
-  export interface FileTransportOptions extends GenericTransportOptions, GenericTextTransportOptions {
-    logstash?: boolean;
-    maxsize?: number;
-    rotationFormat?: boolean;
-    zippedArchive?: boolean;
-    maxFiles?: number;
-    eol?: string;
-    tailable?: boolean;
-    maxRetries?: number;
-    filename?: string;
-    dirname?: string;
-    options?: {
-      flags?: string;
-      highWaterMark?: number;
-    };
-    stream?: NodeJS.WritableStream;
-  }
-
-  export interface HttpTransportOptions extends GenericTransportOptions, GenericNetworkTransportOptions {
-    ssl?: boolean;
-  }
-
-  export interface MemoryTransportOptions extends GenericTransportOptions, GenericTextTransportOptions {
-  }
-
-  export interface WebhookTransportOptions extends GenericTransportOptions, GenericNetworkTransportOptions {
-    method?: string;
-    ssl?: {
-      key?: any;
-      cert?: any;
-      ca: any;
-    };
-  }
-
-  export interface WinstonModuleTransportOptions extends GenericTransportOptions {
-    [optionName: string]: any;
-  }
-
-  export interface QueryOptions {
-    rows?: number;
-    limit?: number;
-    start?: number;
-    from?: Date;
-    until?: Date;
-    order?: "asc" | "desc";
-    fields: any;
-  }
-
-  export interface ProfileHandler {
-    logger: LoggerInstance;
-    start: Date;
-    done: (msg: string) => LoggerInstance;
-  }
-
-  interface LogMethod {
-    (level: string, msg: string, callback: LogCallback): LoggerInstance;
-    (level: string, msg: string, meta: any, callback: LogCallback): LoggerInstance;
-    (level: string, msg: string, ... meta: any[]): LoggerInstance;
-  }
-
-  interface LeveledLogMethod {
-    (msg: string, callback: LogCallback): LoggerInstance;
-    (msg: string, meta: any, callback: LogCallback): LoggerInstance;
-    (msg: string, ... meta: any[]): LoggerInstance;
-  }
-
-  interface LogCallback {
-    (error?: any, level?: string, msg?: string, meta?:any): void;
-  }
-}
diff --git a/wiredep/index.d.ts b/wiredep/index.d.ts
new file mode 100644
index 0000000000..879053a767
--- /dev/null
+++ b/wiredep/index.d.ts
@@ -0,0 +1,371 @@
+// Type definitions for Wiredep v3.0.x
+// Project: https://github.com/taptapship/wiredep
+// Definitions by: Abraão Alves <http://abraaoalves.github.io>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+
+interface PathFiles {
+    [type: string]: string[];
+}
+
+/**
+ * @return {PathFiles} paths to your files by extension
+ * @example:
+ *  {
+ *     js: [
+ *       'paths/to/your/js/files.js',
+ *       'in/their/order/of/dependency.js'
+ *     ],
+ *     css: [
+ *       'paths/to/your/css/files.css'
+ *     ],
+ *     // etc.
+ *   }
+ */
+declare function Wiredep(config: WiredepParams): PathFiles;
+
+declare namespace Wiredep {
+    export function stream(config: WiredepParams): NodeJS.ReadWriteStream;
+}
+
+
+interface WiredepParams {
+    src?: string | string[];
+    /**
+     * the directory of your Bower packages.
+     * Default: '.bowerrc'.directory || bower_components
+     */
+    directory?: string;
+    /**
+     * your bower.json file contents.
+     * Default: require('./bower.json')
+     */
+    bowerJson?: string;
+
+
+    // ----- Advanced Configuration -----
+    // All of the below settings are for advanced configuration, to
+    // give your project support for additional file types and more
+    // control.
+    //
+    // Out of the box, wiredep will handle HTML files just fine for
+    // JavaScript and CSS injection.
+
+    /**
+     * path to where we are pretending to be
+     */
+    cwd?: string;
+    /**
+     * Default: true
+     */
+    dependencies?: boolean;
+    /**
+     * Default: false
+     */
+    devDependencies?: boolean;
+    /**
+     * Default: false
+     */
+    includeSelf?: boolean;
+    /**
+     * @example:
+     *  [ /jquery/, 'bower_components/modernizr/modernizr.js' ]
+     */
+    exclude?: Array<string | RegExp>;
+
+    /**
+     * string or regexp to ignore from the injected filepath
+     * @example:
+     *  [ /jquery/, 'bower_components/modernizr/modernizr.js' ]
+     */
+    ignorePath?: string | RegExp;
+
+    /**
+     *  This inline object offers another way to define your overrides if
+     *  modifying your project's `bower.json` isn't an option.
+     */
+    overrides?: Object;
+
+    /**
+     * If not overridden, an error will throw
+     *
+     * err.code can be:
+     *  - "PKG_NOT_INSTALLED" (a Bower package was not found)
+     *  - "BOWER_COMPONENTS_MISSING" (cannot find the `bower_components` directory)
+     */
+    onError?: (err: Error) => void;
+
+    /**
+     * @param {string} filePath name of file that was updated
+     */
+    onFileUpdated?: (filePath: string) => void;
+
+    /**
+     * @param {FileObject} fileObject
+     */
+    onPathInjected?: (fileObject: FileObject) => void;
+
+    /**
+     * @param {string} pkg name of bower package without main
+     */
+    onMainNotFound?: (pkg: string) => void;
+
+    fileTypes?: FileTypes;
+}
+
+interface FileObject {
+    /**
+     * type of wiredep block ('js', 'css', etc)
+     */
+    block: string;
+    /**
+     * name of file that was updated
+     */
+    file: string;
+    /**
+     * path to file that was injected
+     */
+    path: string
+}
+
+interface FileTypes {
+    fileExtension: {
+        /**
+         *  match the beginning-to-end of a bower block in this type of file
+         */
+        block: RegExp;
+        detect: {
+            /**
+             * match the way this type of file is included
+             */
+            typeOfBowerFile: RegExp;
+        };
+        replace: {
+            /**
+             * <format for this {{filePath}} to be injected>
+             */
+            typeOfBowerFile: string;
+            /**
+             * @exemple:
+             *   return '<script class="random-' + Math.random() + '" src="' + filePath + '"></script>'
+             */
+            anotherTypeOfBowerFile: (filePath: string) => string;
+        }
+    };
+
+    // defaults:
+    html: {
+        /**
+         * @example:
+         *  /(([ \t]*)<!--\s*bower:*(\S*)\s*-->)(\n|\r|.)*?(<!--\s*endbower\s*-->)/gi
+         */
+        block: RegExp;
+
+        detect: {
+            /**
+             * @example:
+             *  /<script.*src=['"]([^'"]+)/gi
+             */
+            js: RegExp;
+            /**
+             * @example:
+             *  /<link.*href=['"]([^'"]+)/gi
+             */
+            css: RegExp;
+        };
+
+        replace: {
+            /**
+             * @example:
+             *  '<script src="{{filePath}}"></script>'
+             */
+            js: string;
+            /**
+             * @example:
+             *  '<link rel="stylesheet" href="{{filePath}}" />'
+             */
+            css: string;
+        };
+    };
+
+    jade: {
+        /**
+         * @example:
+         *  /(([ \t]*)\/\/\s*bower:*(\S*))(\n|\r|.)*?(\/\/\s*endbower)/gi
+         */
+        block: RegExp;
+        detect: {
+            /**
+             * @example:
+             *  /script\(.*src=['"]([^'"]+)/gi
+             */
+            js: RegExp;
+            /**
+             * @example:
+             *  /link\(.*href=['"]([^'"]+)/gi
+             */
+            css: RegExp;
+        };
+
+        replace: {
+            /**
+             * @example:
+             *  'script(src=\'{{filePath}}\')'
+             */
+            js: string;
+            /**
+             * @example:
+             *  'link(rel=\'stylesheet\', href=\'{{filePath}}\')'
+             */
+            css: string;
+        }
+    };
+
+    less: {
+        /**
+         * @example:
+         *  /(([ \t]*)\/\/\s*bower:*(\S*))(\n|\r|.)*?(\/\/\s*endbower)/gi
+         */
+        block: RegExp;
+        detect: {
+            /**
+             * @example:
+             *  /@import\s['"](.+css)['"]/gi
+             */
+            css: RegExp;
+            /**
+             * @example:
+             *  /@import\s['"](.+less)['"]/gi
+             */
+            less: RegExp
+        };
+
+        replace: {
+            /**
+             * @example:
+             *  '@import "{{filePath}}";'
+             */
+            css: string;
+            /**
+             * @example:
+             *  '@import "{{filePath}}";'
+             */
+            less: string;
+        };
+    };
+
+    scss: {
+        /**
+         * @example:
+         *  /(([ \t]*)\/\/\s*bower:*(\S*))(\n|\r|.)*?(\/\/\s*endbower)/gi
+         */
+        block: RegExp;
+        detect: {
+            /**
+             * @example:
+             *  /@import\s['"](.+css)['"]/gi
+             */
+            css: RegExp;
+            /**
+             * @example:
+             *  /@import\s['"](.+sass)['"]/gi
+             */
+            sass: RegExp;
+            /**
+             * @example:
+             *  /@import\s['"](.+scss)['"]/gi
+             */
+            scss: RegExp;
+        },
+        replace: {
+            /**
+             * @example:
+             *  '@import "{{filePath}}";'
+             */
+            css: string;
+            /**
+             * @example:
+             *  '@import "{{filePath}}";'
+             */
+            sass: string;
+            /**
+             * @example:
+             *  '@import "{{filePath}}";'
+             */
+            scss: string;
+        }
+    };
+
+    styl: {
+        /**
+         * @example:
+         *  /(([ \t]*)\/\/\s*bower:*(\S*))(\n|\r|.)*?(\/\/\s*endbower)/gi
+         */
+        block: RegExp;
+
+        detect: {
+            /**
+             * @example:
+             *  /@import\s['"](.+css)['"]/gi
+             */
+            css: RegExp;
+            /**
+             * @example:
+             *   /@import\s['"](.+styl)['"]/gi
+             */
+            styl: RegExp;
+        };
+        replace: {
+            /**
+             * @example:
+             *  '@import "{{filePath}}"'
+             */
+            css: string;
+            /**
+             * @example:
+             *  '@import "{{filePath}}"'
+             */
+            styl: string;
+        };
+    };
+
+    yaml: {
+        /**
+         * @example:
+         *  /(([ \t]*)#\s*bower:*(\S*))(\n|\r|.)*?(#\s*endbower)/gi
+         */
+        block: RegExp;
+
+        detect: {
+            /**
+             * @example:
+             *  /-\s(.+js)/gi
+             */
+            js: RegExp;
+            /**
+             * @example:
+             *  /-\s(.+css)/gi
+             */
+            css: RegExp;
+        };
+
+        replace: {
+            /**
+             * @example:
+             *  '- {{filePath}}'
+             */
+            js: string;
+            /**
+             * @example:
+             *  '- {{filePath}}'
+             */
+            css: string;
+        };
+    };
+}
+
+
+export = Wiredep;
diff --git a/wiredep/tsconfig.json b/wiredep/tsconfig.json
new file mode 100644
index 0000000000..617fc1a779
--- /dev/null
+++ b/wiredep/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "wiredep-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/wiredep/wiredep-tests.ts b/wiredep/wiredep-tests.ts
index 4fa5659b0a..95c558ed4f 100644
--- a/wiredep/wiredep-tests.ts
+++ b/wiredep/wiredep-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="./wiredep.d.ts" />
-/// <reference path="../gulp/gulp.d.ts" />
-
 import gulp = require('gulp');
 import wiredep = require('wiredep');
 
diff --git a/wiredep/wiredep.d.ts b/wiredep/wiredep.d.ts
deleted file mode 100644
index 456f47b67e..0000000000
--- a/wiredep/wiredep.d.ts
+++ /dev/null
@@ -1,372 +0,0 @@
-// Type definitions for Wiredep v3.0.x
-// Project: https://github.com/taptapship/wiredep
-// Definitions by: Abraão Alves <http://abraaoalves.github.io>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module 'wiredep' {
-
-  interface PathFiles{
-    [type: string]: string[];
-  }
-
-  /**
-   * @return {PathFiles} paths to your files by extension
-   * @example:
-   *  {
-   *     js: [
-   *       'paths/to/your/js/files.js',
-   *       'in/their/order/of/dependency.js'
-   *     ],
-   *     css: [
-   *       'paths/to/your/css/files.css'
-   *     ],
-   *     // etc.
-   *   }
-   */
-  function Wiredep(config: WiredepParams): PathFiles;
-
-  namespace Wiredep {
-    export function stream(config: WiredepParams): NodeJS.ReadWriteStream;
-  }
-
-
-  interface WiredepParams {
-    src?: string | string[];
-    /**
-     * the directory of your Bower packages.
-     * Default: '.bowerrc'.directory || bower_components
-     */
-    directory?: string;
-    /**
-     * your bower.json file contents.
-     * Default: require('./bower.json')
-     */
-    bowerJson?: string;
-
-
-    // ----- Advanced Configuration -----
-    // All of the below settings are for advanced configuration, to
-    // give your project support for additional file types and more
-    // control.
-    //
-    // Out of the box, wiredep will handle HTML files just fine for
-    // JavaScript and CSS injection.
-
-    /**
-     * path to where we are pretending to be
-     */
-    cwd?: string;
-    /**
-     * Default: true
-     */
-    dependencies?: boolean;
-    /**
-     * Default: false
-     */
-    devDependencies?: boolean;
-    /**
-     * Default: false
-     */
-    includeSelf?: boolean;
-    /**
-     * @example:
-     *  [ /jquery/, 'bower_components/modernizr/modernizr.js' ]
-     */
-    exclude?: Array<string | RegExp>;
-
-    /**
-     * string or regexp to ignore from the injected filepath
-     * @example:
-     *  [ /jquery/, 'bower_components/modernizr/modernizr.js' ]
-     */
-    ignorePath?: string | RegExp;
-
-    /**
-     *  This inline object offers another way to define your overrides if
-     *  modifying your project's `bower.json` isn't an option.
-     */
-    overrides?: Object;
-
-    /**
-     * If not overridden, an error will throw
-     *
-     * err.code can be:
-     *  - "PKG_NOT_INSTALLED" (a Bower package was not found)
-     *  - "BOWER_COMPONENTS_MISSING" (cannot find the `bower_components` directory)
-     */
-    onError?: (err: Error) => void;
-
-    /**
-     * @param {string} filePath name of file that was updated
-     */
-    onFileUpdated?: (filePath: string) => void;
-
-    /**
-     * @param {FileObject} fileObject
-     */
-    onPathInjected?: (fileObject: FileObject) => void;
-
-    /**
-     * @param {string} pkg name of bower package without main
-     */
-    onMainNotFound?: (pkg: string) => void;
-
-    fileTypes?  : FileTypes;
-  }
-
-  interface FileObject {
-    /**
-     * type of wiredep block ('js', 'css', etc)
-     */
-    block: string;
-    /**
-     * name of file that was updated
-     */
-    file: string;
-    /**
-     * path to file that was injected
-     */
-    path: string
-  }
-
-  interface FileTypes {
-    fileExtension: {
-      /**
-       *  match the beginning-to-end of a bower block in this type of file
-       */
-      block: RegExp;
-      detect: {
-        /**
-         * match the way this type of file is included
-         */
-        typeOfBowerFile: RegExp;
-      };
-      replace: {
-        /**
-         * <format for this {{filePath}} to be injected>
-         */
-        typeOfBowerFile: string;
-        /**
-         * @exemple:
-         *   return '<script class="random-' + Math.random() + '" src="' + filePath + '"></script>'
-         */
-        anotherTypeOfBowerFile: (filePath: string) => string;
-      }
-    };
-
-    // defaults:
-    html: {
-      /**
-       * @example:
-       *  /(([ \t]*)<!--\s*bower:*(\S*)\s*-->)(\n|\r|.)*?(<!--\s*endbower\s*-->)/gi
-       */
-      block: RegExp;
-
-      detect: {
-        /**
-         * @example:
-         *  /<script.*src=['"]([^'"]+)/gi
-         */
-        js: RegExp;
-        /**
-         * @example:
-         *  /<link.*href=['"]([^'"]+)/gi
-         */
-        css: RegExp;
-      };
-
-      replace: {
-        /**
-         * @example:
-         *  '<script src="{{filePath}}"></script>'
-         */
-        js: string;
-        /**
-         * @example:
-         *  '<link rel="stylesheet" href="{{filePath}}" />'
-         */
-        css: string;
-      };
-    };
-
-    jade: {
-      /**
-       * @example:
-       *  /(([ \t]*)\/\/\s*bower:*(\S*))(\n|\r|.)*?(\/\/\s*endbower)/gi
-       */
-      block: RegExp;
-      detect: {
-        /**
-         * @example:
-         *  /script\(.*src=['"]([^'"]+)/gi
-         */
-        js: RegExp;
-        /**
-         * @example:
-         *  /link\(.*href=['"]([^'"]+)/gi
-         */
-        css: RegExp;
-      };
-
-      replace: {
-        /**
-         * @example:
-         *  'script(src=\'{{filePath}}\')'
-         */
-        js: string;
-        /**
-         * @example:
-         *  'link(rel=\'stylesheet\', href=\'{{filePath}}\')'
-         */
-        css: string;
-      }
-    };
-
-    less: {
-      /**
-       * @example:
-       *  /(([ \t]*)\/\/\s*bower:*(\S*))(\n|\r|.)*?(\/\/\s*endbower)/gi
-       */
-      block: RegExp;
-      detect: {
-        /**
-         * @example:
-         *  /@import\s['"](.+css)['"]/gi
-         */
-        css: RegExp;
-        /**
-         * @example:
-         *  /@import\s['"](.+less)['"]/gi
-         */
-        less: RegExp
-      };
-
-      replace: {
-        /**
-         * @example:
-         *  '@import "{{filePath}}";'
-         */
-        css: string;
-        /**
-         * @example:
-         *  '@import "{{filePath}}";'
-         */
-        less: string;
-      };
-    };
-
-    scss: {
-      /**
-       * @example:
-       *  /(([ \t]*)\/\/\s*bower:*(\S*))(\n|\r|.)*?(\/\/\s*endbower)/gi
-       */
-      block: RegExp;
-      detect: {
-        /**
-         * @example:
-         *  /@import\s['"](.+css)['"]/gi
-         */
-        css: RegExp;
-        /**
-         * @example:
-         *  /@import\s['"](.+sass)['"]/gi
-         */
-        sass: RegExp;
-        /**
-         * @example:
-         *  /@import\s['"](.+scss)['"]/gi
-         */
-        scss: RegExp;
-      },
-      replace: {
-        /**
-         * @example:
-         *  '@import "{{filePath}}";'
-         */
-        css: string;
-        /**
-         * @example:
-         *  '@import "{{filePath}}";'
-         */
-        sass: string;
-        /**
-         * @example:
-         *  '@import "{{filePath}}";'
-         */
-        scss: string;
-      }
-    };
-
-    styl: {
-      /**
-       * @example:
-       *  /(([ \t]*)\/\/\s*bower:*(\S*))(\n|\r|.)*?(\/\/\s*endbower)/gi
-       */
-      block: RegExp;
-
-      detect: {
-        /**
-         * @example:
-         *  /@import\s['"](.+css)['"]/gi
-         */
-        css: RegExp;
-        /**
-         * @example:
-         *   /@import\s['"](.+styl)['"]/gi
-         */
-        styl: RegExp;
-      };
-      replace: {
-        /**
-         * @example:
-         *  '@import "{{filePath}}"'
-         */
-        css: string;
-        /**
-         * @example:
-         *  '@import "{{filePath}}"'
-         */
-        styl: string;
-      };
-    };
-
-    yaml: {
-      /**
-       * @example:
-       *  /(([ \t]*)#\s*bower:*(\S*))(\n|\r|.)*?(#\s*endbower)/gi
-       */
-      block: RegExp;
-
-      detect: {
-        /**
-         * @example:
-         *  /-\s(.+js)/gi
-         */
-        js: RegExp;
-        /**
-         * @example:
-         *  /-\s(.+css)/gi
-         */
-        css: RegExp;
-      };
-
-      replace: {
-        /**
-         * @example:
-         *  '- {{filePath}}'
-         */
-        js: string;
-        /**
-         * @example:
-         *  '- {{filePath}}'
-         */
-        css: string;
-      };
-    };
-  }
-
-
-export = Wiredep;
-}
diff --git a/wnumb/wnumb.d.ts b/wnumb/index.d.ts
similarity index 100%
rename from wnumb/wnumb.d.ts
rename to wnumb/index.d.ts
diff --git a/wnumb/tsconfig.json b/wnumb/tsconfig.json
new file mode 100644
index 0000000000..2c018f01c8
--- /dev/null
+++ b/wnumb/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "wnumb-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/wnumb/wnumb-tests.ts b/wnumb/wnumb-tests.ts
index d8b3b52694..31989e6127 100644
--- a/wnumb/wnumb-tests.ts
+++ b/wnumb/wnumb-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="wnumb.d.ts" />
+
 
 
 var moneyFormat = wNumb({
diff --git a/wolfy87-eventemitter/index.d.ts b/wolfy87-eventemitter/index.d.ts
new file mode 100644
index 0000000000..8e5b8a6ace
--- /dev/null
+++ b/wolfy87-eventemitter/index.d.ts
@@ -0,0 +1,512 @@
+// Type definitions for wolfy87-eventemitter v4.2.9
+// Project: https://github.com/Wolfy87/EventEmitter
+// Definitions by: ryiwamoto <https://github.com/ryiwamoto/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class EventEmitter extends Wolfy87EventEmitter.EventEmitter {}
+export = EventEmitter;
+export as namespace EventEmitter;
+
+declare namespace Wolfy87EventEmitter {
+
+    /**
+     * Hash Object for manipulating multiple events.
+     */
+    interface MultipleEvents {
+        [event:string]: any //Function | Function[]
+    }
+
+    /**
+     * Class for managing events.
+     * Can be extended to provide event functionality in other classes.
+     *
+     * @class EventEmitter Manages event registering and emitting.
+     */
+    export class EventEmitter {
+        /**
+         * Reverts the global {@link EventEmitter} to its previous value and returns a reference to this version.
+         * @return {Function} Non conflicting EventEmitter class.
+         */
+        static noConflict(): typeof EventEmitter;
+
+        /**
+         * Returns the listener array for the specified event.
+         * Will initialise the event object and listener arrays if required.
+         * Will return an object if you use a regex search. The object contains keys for each matched event.
+         * So /ba[rz]/ might return an object containing bar and baz.
+         * But only if you have either defined them with defineEvent or added some listeners to them.
+         * Each property in the object response is an array of listener functions.
+         *
+         * @param {string|RegExp} event Name of the event to return the listeners from.
+         * @return {Function[|Object]} All listener functions for the event.
+         */
+        getListeners(event: string): Function[];
+
+        /**
+         * Returns the listener array for the specified event.
+         * Will initialise the event object and listener arrays if required.
+         * Will return an object if you use a regex search. The object contains keys for each matched event.
+         * So /ba[rz]/ might return an object containing bar and baz.
+         * But only if you have either defined them with defineEvent or added some listeners to them.
+         * Each property in the object response is an array of listener functions.
+         *
+         * @param {string|RegExp} event Name of the event to return the listeners from.
+         * @return {Function[]|Object} All listener functions for the event.
+         */
+        getListeners(event: RegExp): {[event:string]: Function};
+
+
+        /**
+         * Adds a listener function to the specified event.
+         * The listener will not be added if it is a duplicate.
+         * If the listener returns true then it will be removed after it is called.
+         * If you pass a regular expression as the event name then the listener will be added to all events that match it.
+         *
+         * @param {string|RegExp} event Name of the event to attach the listener to.
+         * @param {Function} listener Method to be called when the event is emitted.
+         * If the function returns true then it will be removed after calling.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        addListener(event: string, listener: Function): EventEmitter;
+
+        /**
+         * Adds a listener function to the specified event.
+         * The listener will not be added if it is a duplicate.
+         * If the listener returns true then it will be removed after it is called.
+         * If you pass a regular expression as the event name then the listener will be added to all events that match it.
+         *
+         * @param {string|RegExp} event Name of the event to attach the listener to.
+         * @param {Function} listener Method to be called when the event is emitted.
+         * If the function returns true then it will be removed after calling.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        addListener(event: RegExp, listener: Function): EventEmitter;
+
+        /**
+         * Adds a listener function to the specified event.
+         * The listener will not be added if it is a duplicate.
+         * If the listener returns true then it will be removed after it is called.
+         * If you pass a regular expression as the event name then the listener will be added to all events that match it.
+         *
+         * @param {string|RegExp} event Name of the event to attach the listener to.
+         * @param {Function} listener Method to be called when the event is emitted.
+         * If the function returns true then it will be removed after calling.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        on(event: string, listener: Function): EventEmitter;
+
+        /**
+         * Adds a listener function to the specified event.
+         * The listener will not be added if it is a duplicate.
+         * If the listener returns true then it will be removed after it is called.
+         * If you pass a regular expression as the event name then the listener will be added to all events that match it.
+         *
+         * @param {string|RegExp} event Name of the event to attach the listener to.
+         * @param {Function} listener Method to be called when the event is emitted.
+         * If the function returns true then it will be removed after calling.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        on(event: RegExp, listener: Function): EventEmitter;
+
+        /**
+         * Takes a list of listener objects and flattens it into a list of listener functions.
+         *
+         * @param {Object[]} listeners Raw listener objects.
+         * @return {Function[]} Just the listener functions.
+         */
+        flattenListeners(listeners: {listener: Function}[]): Function[];
+
+        /**
+         * Fetches the requested listeners via getListeners but will always return the results inside an object.
+         * This is mainly for internal use but others may find it useful.
+         *
+         * @param event {string|RegExp} Name of the event to return the listeners from.
+         * @return {Object} All listener functions for an event in object
+         */
+        getListenersAsObject(event: string): {[event:string]: Function};
+
+        /**
+         * Fetches the requested listeners via getListeners but will always return the results inside an object.
+         * This is mainly for internal use but others may find it useful.
+         *
+         * @param event {string|RegExp} Name of the event to return the listeners from.
+         * @return {Object} All listener functions for an event in object
+         */
+        getListenersAsObject(event: RegExp): {[event:string]: Function};
+
+        /**
+         * Semi-alias of addListener. It will add a listener that will be
+         * automatically removed after it's first execution.
+         *
+         * @param event {string|RegExp} Name of the event to attach the listener to.
+         * @param listener {Function} Method to be called when the event is emitted.
+         * If the function returns true then it will be removed after calling.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        addOnceListener(event: string, listener: Function): EventEmitter;
+
+        /**
+         * Semi-alias of addListener. It will add a listener that will be
+         * automatically removed after it's first execution.
+         *
+         * @param event {string|RegExp} Name of the event to attach the listener to.
+         * @param listener {Function} Method to be called when the event is emitted.
+         * If the function returns true then it will be removed after calling.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        addOnceListener(event: RegExp, listener: Function): EventEmitter;
+
+        /**
+         * Semi-alias of addListener. It will add a listener that will be
+         * automatically removed after it's first execution.
+         *
+         * @param event {string|RegExp} Name of the event to attach the listener to.
+         * @param listener {Function} Method to be called when the event is emitted.
+         * If the function returns true then it will be removed after calling.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        once(event: string, listener: Function): EventEmitter;
+
+        /**
+         * Semi-alias of addListener. It will add a listener that will be
+         * automatically removed after it's first execution.
+         *
+         * @param event {string|RegExp} Name of the event to attach the listener to.
+         * @param listener {Function} Method to be called when the event is emitted.
+         * If the function returns true then it will be removed after calling.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        once(event: RegExp, listener: Function): EventEmitter;
+
+        /**
+         * Defines an event name.
+         * This is required if you want to use a regex to add a listener to multiple events at once.
+         * If you don't do this then how do you expect it to know what event to add to?
+         * Should it just add to every possible match for a regex? No. That is scary and bad.
+         * You need to tell it what event names should be matched by a regex.
+         *
+         * @param {string} event Name of the event to create.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        defineEvent(event: string): EventEmitter;
+
+        /**
+         * Defines an event name.
+         * This is required if you want to use a regex to add a listener to multiple events at once.
+         * If you don't do this then how do you expect it to know what event to add to?
+         * Should it just add to every possible match for a regex? No. That is scary and bad.
+         * You need to tell it what event names should be matched by a regex.
+         *
+         * @param {string[]} events Name of the event to create.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        defineEvents(events: string[]): EventEmitter;
+
+        /**
+         * Removes a listener function from the specified event.
+         * When passed a regular expression as the event name, it will remove the listener from all events that match it.
+         *
+         * @param {String|RegExp} event Name of the event to remove the listener from.
+         * @param {Function} listener Method to remove from the event.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        removeListener(event: string, listener: Function): EventEmitter;
+
+        /**
+         * Removes a listener function from the specified event.
+         * When passed a regular expression as the event name, it will remove the listener from all events that match it.
+         *
+         * @param {String|RegExp} event Name of the event to remove the listener from.
+         * @param {Function} listener Method to remove from the event.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        removeListener(event: RegExp, listener: Function): EventEmitter;
+
+        /**
+         * Removes a listener function from the specified event.
+         * When passed a regular expression as the event name, it will remove the listener from all events that match it.
+         *
+         * @param {String|RegExp} event Name of the event to remove the listener from.
+         * @param {Function} listener Method to remove from the event.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        off(event: string, listener: Function): EventEmitter;
+
+        /**
+         * Removes a listener function from the specified event.
+         * When passed a regular expression as the event name, it will remove the listener from all events that match it.
+         *
+         * @param {String|RegExp} event Name of the event to remove the listener from.
+         * @param {Function} listener Method to remove from the event.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        off(event: RegExp, listener: Function): EventEmitter;
+
+        /**
+         * Adds listeners in bulk using the manipulateListeners method.
+         * If you pass an object as the second argument you can add to multiple events at once.
+         * The object should contain key value pairs of events and listeners or listener arrays.
+         * You can also pass it an event name and an array of listeners to be added.
+         * You can also pass it a regular expression to add the array of listeners to all events that match it.
+         * Yeah, this function does quite a bit. That's probably a bad thing.
+         *
+         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
+         * An object if you wish to add to multiple events at once.
+         * @param {Function[]} [listeners] An optional array of listener functions to add.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        addListeners(event: string, listeners: Function[]): EventEmitter;
+
+        /**
+         * Adds listeners in bulk using the manipulateListeners method.
+         * If you pass an object as the second argument you can add to multiple events at once.
+         * The object should contain key value pairs of events and listeners or listener arrays.
+         * You can also pass it an event name and an array of listeners to be added.
+         * You can also pass it a regular expression to add the array of listeners to all events that match it.
+         * Yeah, this function does quite a bit. That's probably a bad thing.
+         *
+         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
+         * An object if you wish to add to multiple events at once.
+         * @param {Function[]} [listeners] An optional array of listener functions to add.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        addListeners(event: RegExp, listeners: Function[]): EventEmitter;
+
+        /**
+         * Adds listeners in bulk using the manipulateListeners method.
+         * If you pass an object as the second argument you can add to multiple events at once.
+         * The object should contain key value pairs of events and listeners or listener arrays.
+         * You can also pass it an event name and an array of listeners to be added.
+         * You can also pass it a regular expression to add the array of listeners to all events that match it.
+         * Yeah, this function does quite a bit. That's probably a bad thing.
+         *
+         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
+         * An object if you wish to add to multiple events at once.
+         * @param {Function[]} [listeners] An optional array of listener functions to add.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        addListeners(event: MultipleEvents): EventEmitter;
+
+        /**
+         * Removes listeners in bulk using the manipulateListeners method.
+         * If you pass an object as the second argument you can remove from multiple events at once.
+         * The object should contain key value pairs of events and listeners or listener arrays.
+         * You can also pass it an event name and an array of listeners to be removed.
+         * You can also pass it a regular expression to remove the listeners from all events that match it.
+         *
+         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
+         * An object if you wish to remove from multiple events at once.
+         * @param {Function[]} [listeners] An optional array of listener functions to remove.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        removeListeners(event: string, listeners: Function[]): EventEmitter;
+
+        /**
+         * Removes listeners in bulk using the manipulateListeners method.
+         * If you pass an object as the second argument you can remove from multiple events at once.
+         * The object should contain key value pairs of events and listeners or listener arrays.
+         * You can also pass it an event name and an array of listeners to be removed.
+         * You can also pass it a regular expression to remove the listeners from all events that match it.
+         *
+         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
+         * An object if you wish to remove from multiple events at once.
+         * @param {Function[]} [listeners] An optional array of listener functions to remove.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        removeListeners(event: RegExp, listeners: Function[]): EventEmitter;
+
+        /**
+         * Removes listeners in bulk using the manipulateListeners method.
+         * If you pass an object as the second argument you can remove from multiple events at once.
+         * The object should contain key value pairs of events and listeners or listener arrays.
+         * You can also pass it an event name and an array of listeners to be removed.
+         * You can also pass it a regular expression to remove the listeners from all events that match it.
+         *
+         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
+         * An object if you wish to remove from multiple events at once.
+         * @param {Function[]} [listeners] An optional array of listener functions to remove.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        removeListeners(event: MultipleEvents): EventEmitter;
+
+        /**
+         * Edits listeners in bulk. The addListeners and removeListeners methods both use this to do their job.
+         * You should really use those instead, this is a little lower level.
+         * The first argument will determine if the listeners are removed (true) or added (false).
+         * If you pass an object as the second argument you can add/remove from multiple events at once.
+         * The object should contain key value pairs of events and listeners or listener arrays.
+         * You can also pass it an event name and an array of listeners to be added/removed.
+         * You can also pass it a regular expression to manipulate the listeners of all events that match it.
+         *
+         * @param {Boolean} remove True if you want to remove listeners, false if you want to add.
+         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
+         * An object if you wish to add/remove from multiple events at once.
+         * @param {Function[]} [listeners] An optional array of listener functions to add/remove.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        manipulateListeners(remove: boolean, event: string, listeners: Function[]): EventEmitter;
+
+        /**
+         * Edits listeners in bulk. The addListeners and removeListeners methods both use this to do their job.
+         * You should really use those instead, this is a little lower level.
+         * The first argument will determine if the listeners are removed (true) or added (false).
+         * If you pass an object as the second argument you can add/remove from multiple events at once.
+         * The object should contain key value pairs of events and listeners or listener arrays.
+         * You can also pass it an event name and an array of listeners to be added/removed.
+         * You can also pass it a regular expression to manipulate the listeners of all events that match it.
+         *
+         * @param {Boolean} remove True if you want to remove listeners, false if you want to add.
+         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
+         * An object if you wish to add/remove from multiple events at once.
+         * @param {Function[]} [listeners] An optional array of listener functions to add/remove.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        manipulateListeners(remove: boolean, event: RegExp, listeners: Function[]): EventEmitter;
+
+        /**
+         * Edits listeners in bulk. The addListeners and removeListeners methods both use this to do their job.
+         * You should really use those instead, this is a little lower level.
+         * The first argument will determine if the listeners are removed (true) or added (false).
+         * If you pass an object as the second argument you can add/remove from multiple events at once.
+         * The object should contain key value pairs of events and listeners or listener arrays.
+         * You can also pass it an event name and an array of listeners to be added/removed.
+         * You can also pass it a regular expression to manipulate the listeners of all events that match it.
+         *
+         * @param {Boolean} remove True if you want to remove listeners, false if you want to add.
+         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
+         * An object if you wish to add/remove from multiple events at once.
+         * @param {Function[]} [listeners] An optional array of listener functions to add/remove.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        manipulateListeners(remove: boolean, event: MultipleEvents): EventEmitter;
+
+        /**
+         * Removes all listeners from a specified event.
+         * If you do not specify an event then all listeners will be removed.
+         * That means every event will be emptied.
+         * You can also pass a regex to remove all events that match it.
+         *
+         * @param {String|RegExp} [event] Optional name of the event to remove all listeners for.
+         * Will remove from every event if not passed.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        removeEvent(event?: string): EventEmitter;
+
+        /**
+         * Removes all listeners from a specified event.
+         * If you do not specify an event then all listeners will be removed.
+         * That means every event will be emptied.
+         * You can also pass a regex to remove all events that match it.
+         *
+         * @param {String|RegExp} [event] Optional name of the event to remove all listeners for.
+         * Will remove from every event if not passed.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        removeEvent(event?: RegExp): EventEmitter;
+
+        /**
+         * Alias of removeEvent.
+         *
+         * Added to mirror the node API.
+         */
+        removeAllListeners(event: string): EventEmitter;
+
+        /**
+         * Alias of removeEvent.
+         *
+         * Added to mirror the node API.
+         */
+        removeAllListeners(event: RegExp): EventEmitter;
+
+        /**
+         * Emits an event of your choice.
+         * When emitted, every listener attached to that event will be executed.
+         * If you pass the optional argument array then those arguments will be passed to every listener upon execution.
+         * Because it uses `apply`, your array of arguments will be passed as if you wrote them out separately.
+         * So they will not arrive within the array on the other side, they will be separate.
+         * You can also pass a regular expression to emit to all events that match it.
+         *
+         * @param {String|RegExp} event Name of the event to emit and execute listeners for.
+         * @param {Array} [args] Optional array of arguments to be passed to each listener.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        emitEvent(event: string, ...args: any[]): EventEmitter;
+
+        /**
+         * Emits an event of your choice.
+         * When emitted, every listener attached to that event will be executed.
+         * If you pass the optional argument array then those arguments will be passed to every listener upon execution.
+         * Because it uses `apply`, your array of arguments will be passed as if you wrote them out separately.
+         * So they will not arrive within the array on the other side, they will be separate.
+         * You can also pass a regular expression to emit to all events that match it.
+         *
+         * @param {String|RegExp} event Name of the event to emit and execute listeners for.
+         * @param {Array} [args] Optional array of arguments to be passed to each listener.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        emitEvent(event: RegExp, ...args: any[]): EventEmitter;
+
+        /**
+         * Emits an event of your choice.
+         * When emitted, every listener attached to that event will be executed.
+         * If you pass the optional argument array then those arguments will be passed to every listener upon execution.
+         * Because it uses `apply`, your array of arguments will be passed as if you wrote them out separately.
+         * So they will not arrive within the array on the other side, they will be separate.
+         * You can also pass a regular expression to emit to all events that match it.
+         *
+         * @param {String|RegExp} event Name of the event to emit and execute listeners for.
+         * @param {Array} [args] Optional array of arguments to be passed to each listener.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        trigger(event: string, ...args: any[]): EventEmitter;
+
+        /**
+         * Emits an event of your choice.
+         * When emitted, every listener attached to that event will be executed.
+         * If you pass the optional argument array then those arguments will be passed to every listener upon execution.
+         * Because it uses `apply`, your array of arguments will be passed as if you wrote them out separately.
+         * So they will not arrive within the array on the other side, they will be separate.
+         * You can also pass a regular expression to emit to all events that match it.
+         *
+         * @param {String|RegExp} event Name of the event to emit and execute listeners for.
+         * @param {Array} [args] Optional array of arguments to be passed to each listener.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        trigger(event: RegExp, ...args: any[]): EventEmitter;
+
+        /**
+         * Subtly different from emitEvent in that it will pass its arguments on to the listeners,
+         * as opposed to taking a single array of arguments to pass on.
+         * As with emitEvent, you can pass a regex in place of the event name to emit to all events that match it.
+         *
+         * @param {String|RegExp} event Name of the event to emit and execute listeners for.
+         * @param {... any[]} args Optional additional arguments to be passed to each listener.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        emit(event: string, ...args: any[]): EventEmitter;
+
+        /**
+         * Subtly different from emitEvent in that it will pass its arguments on to the listeners,
+         * as opposed to taking a single array of arguments to pass on.
+         * As with emitEvent, you can pass a regex in place of the event name to emit to all events that match it.
+         *
+         * @param {String|RegExp} event Name of the event to emit and execute listeners for.
+         * @param {... any[]} args Optional additional arguments to be passed to each listener.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        emit(event: RegExp, ...args: any[]): EventEmitter;
+
+        /**
+         * Sets the current value to check against when executing listeners. If a
+         * listeners return value matches the one set here then it will be removed
+         * after execution. This value defaults to true.
+         *
+         * @param {any} value The new value to check for when executing listeners.
+         * @return {EventEmitter} Current instance of EventEmitter for chaining.
+         */
+        setOnceReturnValue(value: any): EventEmitter;
+    }
+}
+
+//declare var EventEmitter: typeof Wolfy87EventEmitter.EventEmitter;
+
diff --git a/wolfy87-eventemitter/tsconfig.json b/wolfy87-eventemitter/tsconfig.json
new file mode 100644
index 0000000000..300b9df58b
--- /dev/null
+++ b/wolfy87-eventemitter/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "wolfy87-eventemitter-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/wolfy87-eventemitter/wolfy87-eventemitter-tests.ts b/wolfy87-eventemitter/wolfy87-eventemitter-tests.ts
index d2d4e6f0cf..a2e75ed746 100644
--- a/wolfy87-eventemitter/wolfy87-eventemitter-tests.ts
+++ b/wolfy87-eventemitter/wolfy87-eventemitter-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="wolfy87-eventemitter.d.ts"/>
-
 import EventEmitter = require("wolfy87-eventemitter");
 
 var emitter = new EventEmitter();
@@ -23,39 +21,39 @@ function testGetListenersAsObject() {
 }
 
 function testAddListener() {
-    var e: Wolfy87EventEmitter.EventEmitter = emitter
+    var e = emitter
         .addListener("foo", listener)
         .addListener(/^foo/, listener);
 }
 
 function testOn() {
-    var e: Wolfy87EventEmitter.EventEmitter = emitter
+    var e = emitter
         .on("foo", listener)
         .on(/^foo/, listener);
 }
 
 function testAddOnceListener() {
-    var e: Wolfy87EventEmitter.EventEmitter = emitter
+    var e = emitter
         .addOnceListener("foo", listener)
         .addOnceListener(/^foo/, listener);
 }
 
 function testOnce() {
-    var e: Wolfy87EventEmitter.EventEmitter = emitter
+    var e = emitter
         .once("foo", listener)
         .once(/^foo/, listener);
 }
 
 function testDefineEvent() {
-    var e: Wolfy87EventEmitter.EventEmitter = emitter.defineEvent("foo");
+    var e = emitter.defineEvent("foo");
 }
 
 function testDefineEvents() {
-    var e: Wolfy87EventEmitter.EventEmitter = emitter.defineEvents(["foo", "bar"]);
+    var e = emitter.defineEvents(["foo", "bar"]);
 }
 
 function testAddListeners() {
-    var e: Wolfy87EventEmitter.EventEmitter = emitter
+    var e = emitter
         .addListeners("foo", [listener])
         .addListeners({
             "foo": listener,
@@ -64,7 +62,7 @@ function testAddListeners() {
 }
 
 function testRemoveListeners() {
-    var e: Wolfy87EventEmitter.EventEmitter = emitter
+    var e = emitter
         .removeListeners("foo", [listener])
         .removeListeners({
             "foo": listener,
@@ -73,11 +71,11 @@ function testRemoveListeners() {
 }
 
 function testRemoveListener() {
-    var e: Wolfy87EventEmitter.EventEmitter = emitter.removeListener("foo", listener);
+    var e = emitter.removeListener("foo", listener);
 }
 
 function testManipulateListeners() {
-    var e: Wolfy87EventEmitter.EventEmitter = emitter
+    var e = emitter
         .manipulateListeners(true, "foo", [listener])
         .manipulateListeners(true, {
             "foo": listener
@@ -85,27 +83,27 @@ function testManipulateListeners() {
 }
 
 function testRemoveEvent() {
-    var e: Wolfy87EventEmitter.EventEmitter = emitter.removeEvent("foo").removeEvent();
+    var e = emitter.removeEvent("foo").removeEvent();
 }
 
 function testEmitEvent() {
-    var e: Wolfy87EventEmitter.EventEmitter = emitter.emitEvent("foo", ["arg1", "arg2"]).emitEvent("foo");
+    var e = emitter.emitEvent("foo", ["arg1", "arg2"]).emitEvent("foo");
 }
 
 function testTrigger() {
-    var e: Wolfy87EventEmitter.EventEmitter = emitter.trigger("foo", ["arg1", "arg2"]).trigger("foo");
+    var e = emitter.trigger("foo", ["arg1", "arg2"]).trigger("foo");
 }
 
 function testEmit() {
-    var e: Wolfy87EventEmitter.EventEmitter = emitter.emit("foo", ["arg1", "arg2"]).emit("foo");
+    var e = emitter.emit("foo", ["arg1", "arg2"]).emit("foo");
 }
 
 function testSetOnceReturnValue() {
-    var e: Wolfy87EventEmitter.EventEmitter = emitter.setOnceReturnValue(false);
+    var e = emitter.setOnceReturnValue(false);
 }
 
 function testNoConflict() {
     var NoConflictEventEmitter = EventEmitter.noConflict();
-    var e: Wolfy87EventEmitter.EventEmitter = new NoConflictEventEmitter();
+    var e = new NoConflictEventEmitter();
 }
 
diff --git a/wolfy87-eventemitter/wolfy87-eventemitter.d.ts b/wolfy87-eventemitter/wolfy87-eventemitter.d.ts
deleted file mode 100644
index 45c4e54e5d..0000000000
--- a/wolfy87-eventemitter/wolfy87-eventemitter.d.ts
+++ /dev/null
@@ -1,513 +0,0 @@
-// Type definitions for wolfy87-eventemitter v4.2.9
-// Project: https://github.com/Wolfy87/EventEmitter
-// Definitions by: ryiwamoto <https://github.com/ryiwamoto/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace Wolfy87EventEmitter {
-
-    /**
-     * Hash Object for manipulating multiple events.
-     */
-    interface MultipleEvents {
-        [event:string]: any //Function | Function[]
-    }
-
-    /**
-     * Class for managing events.
-     * Can be extended to provide event functionality in other classes.
-     *
-     * @class EventEmitter Manages event registering and emitting.
-     */
-    export class EventEmitter {
-        /**
-         * Reverts the global {@link EventEmitter} to its previous value and returns a reference to this version.
-         * @return {Function} Non conflicting EventEmitter class.
-         */
-        static noConflict(): typeof EventEmitter;
-
-        /**
-         * Returns the listener array for the specified event.
-         * Will initialise the event object and listener arrays if required.
-         * Will return an object if you use a regex search. The object contains keys for each matched event.
-         * So /ba[rz]/ might return an object containing bar and baz.
-         * But only if you have either defined them with defineEvent or added some listeners to them.
-         * Each property in the object response is an array of listener functions.
-         *
-         * @param {string|RegExp} event Name of the event to return the listeners from.
-         * @return {Function[|Object]} All listener functions for the event.
-         */
-        getListeners(event: string): Function[];
-
-        /**
-         * Returns the listener array for the specified event.
-         * Will initialise the event object and listener arrays if required.
-         * Will return an object if you use a regex search. The object contains keys for each matched event.
-         * So /ba[rz]/ might return an object containing bar and baz.
-         * But only if you have either defined them with defineEvent or added some listeners to them.
-         * Each property in the object response is an array of listener functions.
-         *
-         * @param {string|RegExp} event Name of the event to return the listeners from.
-         * @return {Function[]|Object} All listener functions for the event.
-         */
-        getListeners(event: RegExp): {[event:string]: Function};
-
-
-        /**
-         * Adds a listener function to the specified event.
-         * The listener will not be added if it is a duplicate.
-         * If the listener returns true then it will be removed after it is called.
-         * If you pass a regular expression as the event name then the listener will be added to all events that match it.
-         *
-         * @param {string|RegExp} event Name of the event to attach the listener to.
-         * @param {Function} listener Method to be called when the event is emitted.
-         * If the function returns true then it will be removed after calling.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        addListener(event: string, listener: Function): EventEmitter;
-
-        /**
-         * Adds a listener function to the specified event.
-         * The listener will not be added if it is a duplicate.
-         * If the listener returns true then it will be removed after it is called.
-         * If you pass a regular expression as the event name then the listener will be added to all events that match it.
-         *
-         * @param {string|RegExp} event Name of the event to attach the listener to.
-         * @param {Function} listener Method to be called when the event is emitted.
-         * If the function returns true then it will be removed after calling.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        addListener(event: RegExp, listener: Function): EventEmitter;
-
-        /**
-         * Adds a listener function to the specified event.
-         * The listener will not be added if it is a duplicate.
-         * If the listener returns true then it will be removed after it is called.
-         * If you pass a regular expression as the event name then the listener will be added to all events that match it.
-         *
-         * @param {string|RegExp} event Name of the event to attach the listener to.
-         * @param {Function} listener Method to be called when the event is emitted.
-         * If the function returns true then it will be removed after calling.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        on(event: string, listener: Function): EventEmitter;
-
-        /**
-         * Adds a listener function to the specified event.
-         * The listener will not be added if it is a duplicate.
-         * If the listener returns true then it will be removed after it is called.
-         * If you pass a regular expression as the event name then the listener will be added to all events that match it.
-         *
-         * @param {string|RegExp} event Name of the event to attach the listener to.
-         * @param {Function} listener Method to be called when the event is emitted.
-         * If the function returns true then it will be removed after calling.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        on(event: RegExp, listener: Function): EventEmitter;
-
-        /**
-         * Takes a list of listener objects and flattens it into a list of listener functions.
-         *
-         * @param {Object[]} listeners Raw listener objects.
-         * @return {Function[]} Just the listener functions.
-         */
-        flattenListeners(listeners: {listener: Function}[]): Function[];
-
-        /**
-         * Fetches the requested listeners via getListeners but will always return the results inside an object.
-         * This is mainly for internal use but others may find it useful.
-         *
-         * @param event {string|RegExp} Name of the event to return the listeners from.
-         * @return {Object} All listener functions for an event in object
-         */
-        getListenersAsObject(event: string): {[event:string]: Function};
-
-        /**
-         * Fetches the requested listeners via getListeners but will always return the results inside an object.
-         * This is mainly for internal use but others may find it useful.
-         *
-         * @param event {string|RegExp} Name of the event to return the listeners from.
-         * @return {Object} All listener functions for an event in object
-         */
-        getListenersAsObject(event: RegExp): {[event:string]: Function};
-
-        /**
-         * Semi-alias of addListener. It will add a listener that will be
-         * automatically removed after it's first execution.
-         *
-         * @param event {string|RegExp} Name of the event to attach the listener to.
-         * @param listener {Function} Method to be called when the event is emitted.
-         * If the function returns true then it will be removed after calling.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        addOnceListener(event: string, listener: Function): EventEmitter;
-
-        /**
-         * Semi-alias of addListener. It will add a listener that will be
-         * automatically removed after it's first execution.
-         *
-         * @param event {string|RegExp} Name of the event to attach the listener to.
-         * @param listener {Function} Method to be called when the event is emitted.
-         * If the function returns true then it will be removed after calling.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        addOnceListener(event: RegExp, listener: Function): EventEmitter;
-
-        /**
-         * Semi-alias of addListener. It will add a listener that will be
-         * automatically removed after it's first execution.
-         *
-         * @param event {string|RegExp} Name of the event to attach the listener to.
-         * @param listener {Function} Method to be called when the event is emitted.
-         * If the function returns true then it will be removed after calling.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        once(event: string, listener: Function): EventEmitter;
-
-        /**
-         * Semi-alias of addListener. It will add a listener that will be
-         * automatically removed after it's first execution.
-         *
-         * @param event {string|RegExp} Name of the event to attach the listener to.
-         * @param listener {Function} Method to be called when the event is emitted.
-         * If the function returns true then it will be removed after calling.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        once(event: RegExp, listener: Function): EventEmitter;
-
-        /**
-         * Defines an event name.
-         * This is required if you want to use a regex to add a listener to multiple events at once.
-         * If you don't do this then how do you expect it to know what event to add to?
-         * Should it just add to every possible match for a regex? No. That is scary and bad.
-         * You need to tell it what event names should be matched by a regex.
-         *
-         * @param {string} event Name of the event to create.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        defineEvent(event: string): EventEmitter;
-
-        /**
-         * Defines an event name.
-         * This is required if you want to use a regex to add a listener to multiple events at once.
-         * If you don't do this then how do you expect it to know what event to add to?
-         * Should it just add to every possible match for a regex? No. That is scary and bad.
-         * You need to tell it what event names should be matched by a regex.
-         *
-         * @param {string[]} events Name of the event to create.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        defineEvents(events: string[]): EventEmitter;
-
-        /**
-         * Removes a listener function from the specified event.
-         * When passed a regular expression as the event name, it will remove the listener from all events that match it.
-         *
-         * @param {String|RegExp} event Name of the event to remove the listener from.
-         * @param {Function} listener Method to remove from the event.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        removeListener(event: string, listener: Function): EventEmitter;
-
-        /**
-         * Removes a listener function from the specified event.
-         * When passed a regular expression as the event name, it will remove the listener from all events that match it.
-         *
-         * @param {String|RegExp} event Name of the event to remove the listener from.
-         * @param {Function} listener Method to remove from the event.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        removeListener(event: RegExp, listener: Function): EventEmitter;
-
-        /**
-         * Removes a listener function from the specified event.
-         * When passed a regular expression as the event name, it will remove the listener from all events that match it.
-         *
-         * @param {String|RegExp} event Name of the event to remove the listener from.
-         * @param {Function} listener Method to remove from the event.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        off(event: string, listener: Function): EventEmitter;
-
-        /**
-         * Removes a listener function from the specified event.
-         * When passed a regular expression as the event name, it will remove the listener from all events that match it.
-         *
-         * @param {String|RegExp} event Name of the event to remove the listener from.
-         * @param {Function} listener Method to remove from the event.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        off(event: RegExp, listener: Function): EventEmitter;
-
-        /**
-         * Adds listeners in bulk using the manipulateListeners method.
-         * If you pass an object as the second argument you can add to multiple events at once.
-         * The object should contain key value pairs of events and listeners or listener arrays.
-         * You can also pass it an event name and an array of listeners to be added.
-         * You can also pass it a regular expression to add the array of listeners to all events that match it.
-         * Yeah, this function does quite a bit. That's probably a bad thing.
-         *
-         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
-         * An object if you wish to add to multiple events at once.
-         * @param {Function[]} [listeners] An optional array of listener functions to add.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        addListeners(event: string, listeners: Function[]): EventEmitter;
-
-        /**
-         * Adds listeners in bulk using the manipulateListeners method.
-         * If you pass an object as the second argument you can add to multiple events at once.
-         * The object should contain key value pairs of events and listeners or listener arrays.
-         * You can also pass it an event name and an array of listeners to be added.
-         * You can also pass it a regular expression to add the array of listeners to all events that match it.
-         * Yeah, this function does quite a bit. That's probably a bad thing.
-         *
-         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
-         * An object if you wish to add to multiple events at once.
-         * @param {Function[]} [listeners] An optional array of listener functions to add.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        addListeners(event: RegExp, listeners: Function[]): EventEmitter;
-
-        /**
-         * Adds listeners in bulk using the manipulateListeners method.
-         * If you pass an object as the second argument you can add to multiple events at once.
-         * The object should contain key value pairs of events and listeners or listener arrays.
-         * You can also pass it an event name and an array of listeners to be added.
-         * You can also pass it a regular expression to add the array of listeners to all events that match it.
-         * Yeah, this function does quite a bit. That's probably a bad thing.
-         *
-         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
-         * An object if you wish to add to multiple events at once.
-         * @param {Function[]} [listeners] An optional array of listener functions to add.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        addListeners(event: MultipleEvents): EventEmitter;
-
-        /**
-         * Removes listeners in bulk using the manipulateListeners method.
-         * If you pass an object as the second argument you can remove from multiple events at once.
-         * The object should contain key value pairs of events and listeners or listener arrays.
-         * You can also pass it an event name and an array of listeners to be removed.
-         * You can also pass it a regular expression to remove the listeners from all events that match it.
-         *
-         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
-         * An object if you wish to remove from multiple events at once.
-         * @param {Function[]} [listeners] An optional array of listener functions to remove.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        removeListeners(event: string, listeners: Function[]): EventEmitter;
-
-        /**
-         * Removes listeners in bulk using the manipulateListeners method.
-         * If you pass an object as the second argument you can remove from multiple events at once.
-         * The object should contain key value pairs of events and listeners or listener arrays.
-         * You can also pass it an event name and an array of listeners to be removed.
-         * You can also pass it a regular expression to remove the listeners from all events that match it.
-         *
-         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
-         * An object if you wish to remove from multiple events at once.
-         * @param {Function[]} [listeners] An optional array of listener functions to remove.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        removeListeners(event: RegExp, listeners: Function[]): EventEmitter;
-
-        /**
-         * Removes listeners in bulk using the manipulateListeners method.
-         * If you pass an object as the second argument you can remove from multiple events at once.
-         * The object should contain key value pairs of events and listeners or listener arrays.
-         * You can also pass it an event name and an array of listeners to be removed.
-         * You can also pass it a regular expression to remove the listeners from all events that match it.
-         *
-         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
-         * An object if you wish to remove from multiple events at once.
-         * @param {Function[]} [listeners] An optional array of listener functions to remove.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        removeListeners(event: MultipleEvents): EventEmitter;
-
-        /**
-         * Edits listeners in bulk. The addListeners and removeListeners methods both use this to do their job.
-         * You should really use those instead, this is a little lower level.
-         * The first argument will determine if the listeners are removed (true) or added (false).
-         * If you pass an object as the second argument you can add/remove from multiple events at once.
-         * The object should contain key value pairs of events and listeners or listener arrays.
-         * You can also pass it an event name and an array of listeners to be added/removed.
-         * You can also pass it a regular expression to manipulate the listeners of all events that match it.
-         *
-         * @param {Boolean} remove True if you want to remove listeners, false if you want to add.
-         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
-         * An object if you wish to add/remove from multiple events at once.
-         * @param {Function[]} [listeners] An optional array of listener functions to add/remove.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        manipulateListeners(remove: boolean, event: string, listeners: Function[]): EventEmitter;
-
-        /**
-         * Edits listeners in bulk. The addListeners and removeListeners methods both use this to do their job.
-         * You should really use those instead, this is a little lower level.
-         * The first argument will determine if the listeners are removed (true) or added (false).
-         * If you pass an object as the second argument you can add/remove from multiple events at once.
-         * The object should contain key value pairs of events and listeners or listener arrays.
-         * You can also pass it an event name and an array of listeners to be added/removed.
-         * You can also pass it a regular expression to manipulate the listeners of all events that match it.
-         *
-         * @param {Boolean} remove True if you want to remove listeners, false if you want to add.
-         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
-         * An object if you wish to add/remove from multiple events at once.
-         * @param {Function[]} [listeners] An optional array of listener functions to add/remove.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        manipulateListeners(remove: boolean, event: RegExp, listeners: Function[]): EventEmitter;
-
-        /**
-         * Edits listeners in bulk. The addListeners and removeListeners methods both use this to do their job.
-         * You should really use those instead, this is a little lower level.
-         * The first argument will determine if the listeners are removed (true) or added (false).
-         * If you pass an object as the second argument you can add/remove from multiple events at once.
-         * The object should contain key value pairs of events and listeners or listener arrays.
-         * You can also pass it an event name and an array of listeners to be added/removed.
-         * You can also pass it a regular expression to manipulate the listeners of all events that match it.
-         *
-         * @param {Boolean} remove True if you want to remove listeners, false if you want to add.
-         * @param {String|Object|RegExp} event An event name if you will pass an array of listeners next.
-         * An object if you wish to add/remove from multiple events at once.
-         * @param {Function[]} [listeners] An optional array of listener functions to add/remove.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        manipulateListeners(remove: boolean, event: MultipleEvents): EventEmitter;
-
-        /**
-         * Removes all listeners from a specified event.
-         * If you do not specify an event then all listeners will be removed.
-         * That means every event will be emptied.
-         * You can also pass a regex to remove all events that match it.
-         *
-         * @param {String|RegExp} [event] Optional name of the event to remove all listeners for.
-         * Will remove from every event if not passed.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        removeEvent(event?: string): EventEmitter;
-
-        /**
-         * Removes all listeners from a specified event.
-         * If you do not specify an event then all listeners will be removed.
-         * That means every event will be emptied.
-         * You can also pass a regex to remove all events that match it.
-         *
-         * @param {String|RegExp} [event] Optional name of the event to remove all listeners for.
-         * Will remove from every event if not passed.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        removeEvent(event?: RegExp): EventEmitter;
-
-        /**
-         * Alias of removeEvent.
-         *
-         * Added to mirror the node API.
-         */
-        removeAllListeners(event: string): EventEmitter;
-
-        /**
-         * Alias of removeEvent.
-         *
-         * Added to mirror the node API.
-         */
-        removeAllListeners(event: RegExp): EventEmitter;
-
-        /**
-         * Emits an event of your choice.
-         * When emitted, every listener attached to that event will be executed.
-         * If you pass the optional argument array then those arguments will be passed to every listener upon execution.
-         * Because it uses `apply`, your array of arguments will be passed as if you wrote them out separately.
-         * So they will not arrive within the array on the other side, they will be separate.
-         * You can also pass a regular expression to emit to all events that match it.
-         *
-         * @param {String|RegExp} event Name of the event to emit and execute listeners for.
-         * @param {Array} [args] Optional array of arguments to be passed to each listener.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        emitEvent(event: string, ...args: any[]): EventEmitter;
-
-        /**
-         * Emits an event of your choice.
-         * When emitted, every listener attached to that event will be executed.
-         * If you pass the optional argument array then those arguments will be passed to every listener upon execution.
-         * Because it uses `apply`, your array of arguments will be passed as if you wrote them out separately.
-         * So they will not arrive within the array on the other side, they will be separate.
-         * You can also pass a regular expression to emit to all events that match it.
-         *
-         * @param {String|RegExp} event Name of the event to emit and execute listeners for.
-         * @param {Array} [args] Optional array of arguments to be passed to each listener.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        emitEvent(event: RegExp, ...args: any[]): EventEmitter;
-
-        /**
-         * Emits an event of your choice.
-         * When emitted, every listener attached to that event will be executed.
-         * If you pass the optional argument array then those arguments will be passed to every listener upon execution.
-         * Because it uses `apply`, your array of arguments will be passed as if you wrote them out separately.
-         * So they will not arrive within the array on the other side, they will be separate.
-         * You can also pass a regular expression to emit to all events that match it.
-         *
-         * @param {String|RegExp} event Name of the event to emit and execute listeners for.
-         * @param {Array} [args] Optional array of arguments to be passed to each listener.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        trigger(event: string, ...args: any[]): EventEmitter;
-
-        /**
-         * Emits an event of your choice.
-         * When emitted, every listener attached to that event will be executed.
-         * If you pass the optional argument array then those arguments will be passed to every listener upon execution.
-         * Because it uses `apply`, your array of arguments will be passed as if you wrote them out separately.
-         * So they will not arrive within the array on the other side, they will be separate.
-         * You can also pass a regular expression to emit to all events that match it.
-         *
-         * @param {String|RegExp} event Name of the event to emit and execute listeners for.
-         * @param {Array} [args] Optional array of arguments to be passed to each listener.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        trigger(event: RegExp, ...args: any[]): EventEmitter;
-
-        /**
-         * Subtly different from emitEvent in that it will pass its arguments on to the listeners,
-         * as opposed to taking a single array of arguments to pass on.
-         * As with emitEvent, you can pass a regex in place of the event name to emit to all events that match it.
-         *
-         * @param {String|RegExp} event Name of the event to emit and execute listeners for.
-         * @param {... any[]} args Optional additional arguments to be passed to each listener.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        emit(event: string, ...args: any[]): EventEmitter;
-
-        /**
-         * Subtly different from emitEvent in that it will pass its arguments on to the listeners,
-         * as opposed to taking a single array of arguments to pass on.
-         * As with emitEvent, you can pass a regex in place of the event name to emit to all events that match it.
-         *
-         * @param {String|RegExp} event Name of the event to emit and execute listeners for.
-         * @param {... any[]} args Optional additional arguments to be passed to each listener.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        emit(event: RegExp, ...args: any[]): EventEmitter;
-
-        /**
-         * Sets the current value to check against when executing listeners. If a
-         * listeners return value matches the one set here then it will be removed
-         * after execution. This value defaults to true.
-         *
-         * @param {any} value The new value to check for when executing listeners.
-         * @return {EventEmitter} Current instance of EventEmitter for chaining.
-         */
-        setOnceReturnValue(value: any): EventEmitter;
-    }
-}
-
-declare module "wolfy87-eventemitter" {
-    class EventEmitter extends Wolfy87EventEmitter.EventEmitter {}
-    export = EventEmitter;
-}
-
-//declare var EventEmitter: typeof Wolfy87EventEmitter.EventEmitter;
-
diff --git a/wordcloud/wordcloud.d.ts b/wordcloud/index.d.ts
similarity index 100%
rename from wordcloud/wordcloud.d.ts
rename to wordcloud/index.d.ts
diff --git a/wordcloud/tsconfig.json b/wordcloud/tsconfig.json
new file mode 100644
index 0000000000..ba09ef7e43
--- /dev/null
+++ b/wordcloud/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "wordcloud-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/wordcloud/wordcloud-tests.ts b/wordcloud/wordcloud-tests.ts
index 2eecca3b8a..32cdd011ec 100644
--- a/wordcloud/wordcloud-tests.ts
+++ b/wordcloud/wordcloud-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="wordcloud.d.ts" />
-/// <reference path="../qunit/qunit.d.ts" />
+
+/// <reference types="qunit" />
 
 'use strict';
 //declare function test(name: string, test: Function);
diff --git a/wrap-ansi/index.d.ts b/wrap-ansi/index.d.ts
new file mode 100644
index 0000000000..fcbdd756e2
--- /dev/null
+++ b/wrap-ansi/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for wrap-ansi v2.0.0
+// Project: https://www.npmjs.com/package/wrap-ansi
+// Definitions by: Klaus Reimer <https://github.com/kayahr>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/**
+ * Wrap words to the specified column width.
+ *
+ * @param input   String with ANSI escape codes. Like one styled by chalk.
+ * @param columns Number of columns to wrap the text to.
+ * @param options By default the wrap is soft, meaning long words may extend past the column width. Setting 
+ *                this to true will make it hard wrap at the column width.
+ */
+declare function wrapAnsi(input: string, columns: number, options?: { hard?: boolean }): string;
+
+declare namespace wrapAnsi {}
+
+export = wrapAnsi;
+
diff --git a/wrap-ansi/tsconfig.json b/wrap-ansi/tsconfig.json
new file mode 100644
index 0000000000..4892a7484e
--- /dev/null
+++ b/wrap-ansi/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "wrap-ansi-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/wrap-ansi/wrap-ansi-tests.ts b/wrap-ansi/wrap-ansi-tests.ts
new file mode 100644
index 0000000000..e5ba8c294f
--- /dev/null
+++ b/wrap-ansi/wrap-ansi-tests.ts
@@ -0,0 +1,8 @@
+
+
+import wrapAnsi = require("wrap-ansi");
+
+wrapAnsi("input", 80) === "output";
+wrapAnsi("input", 80, {}) === "output";
+wrapAnsi("input", 80, { hard: true }) === "output";
+wrapAnsi("input", 80, { hard: false }) === "output";
diff --git a/wreck/index.d.ts b/wreck/index.d.ts
new file mode 100644
index 0000000000..464284a80e
--- /dev/null
+++ b/wreck/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for wreck 7.0.0
+// Project: https://github.com/hapijs/wreck
+// Definitions by: Marcin Porębski <http://github.com/marcinporebski>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import http = require('http');
+import stream = require('stream');
+
+
+interface WreckObject {
+    defaults: (options: any) => WreckObject;
+
+    request: (method: string, uri: string, options: any, callback?: (err: any, response: http.IncomingMessage) => void) => http.ClientRequest;
+
+    read: (response: http.IncomingMessage, options: any, callback: (err: any, payload: any) => void) => void;
+
+    get: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
+    post: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
+    patch: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
+    put: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
+    delete: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
+
+    toReadableStream: (payload: any, encoding?: string) => stream.Readable;
+
+    parseCacheControl: (field: string) => any;
+
+    agents: {
+        http: http.Agent,
+        https: http.Agent
+    };
+}
+
+declare var wreck: WreckObject;
+
+export = wreck;
diff --git a/wreck/tsconfig.json b/wreck/tsconfig.json
new file mode 100644
index 0000000000..299f201789
--- /dev/null
+++ b/wreck/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "wreck-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/wreck/wreck-tests.ts b/wreck/wreck-tests.ts
index 6e7abab0e5..163f65ffa1 100644
--- a/wreck/wreck-tests.ts
+++ b/wreck/wreck-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="wreck.d.ts" />
 
 import Wreck = require('wreck');
 
diff --git a/wreck/wreck.d.ts b/wreck/wreck.d.ts
deleted file mode 100644
index e548f72a0f..0000000000
--- a/wreck/wreck.d.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-// Type definitions for wreck 7.0.0
-// Project: https://github.com/hapijs/wreck
-// Definitions by: Marcin Porębski <http://github.com/marcinporebski>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "wreck"
-{
-    import http = require('http');
-    import stream = require('stream');
-
-
-    interface WreckObject
-    {
-        defaults: (options: any) => WreckObject;
-
-        request: (method: string, uri: string, options: any, callback?: (err: any, response: http.IncomingMessage) => void) => http.ClientRequest;
-
-        read: (response: http.IncomingMessage, options: any, callback: (err: any, payload: any) => void) => void;
-
-        get: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
-        post: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
-        patch: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
-        put: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
-        delete: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
-
-        toReadableStream: (payload: any, encoding?: string) => stream.Readable;
-
-        parseCacheControl: (field: string) => any;
-
-        agents: {
-            http: http.Agent,
-            https: http.Agent
-        };
-    }
-
-    var wreck: WreckObject;
-
-    export = wreck;
-}
diff --git a/wrench/index.d.ts b/wrench/index.d.ts
new file mode 100644
index 0000000000..6507672955
--- /dev/null
+++ b/wrench/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for wrench
+// Project: https://github.com/ryanmcgrath/wrench-js
+// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Imported from: https://github.com/soywiz/typescript-node-definitions/wrench.d.ts
+
+
+export declare function readdirSyncRecursive(baseDir: string): string[];
+export declare function rmdirSyncRecursive(path: string, failSilent?: boolean): void;
+export declare function copyDirSyncRecursive(sourceDir: string, newDirLocation: string, opts?: { preserve?: boolean; }): void;
+export declare function chmodSyncRecursive(sourceDir: string, filemode: number): void;
+export declare function chownSyncRecursive(sourceDir: string, uid: number, gid: number): void;
+export declare function mkdirSyncRecursive(path: string, mode: number): void;
+
+export declare function readdirRecursive(baseDir: string, fn: (err: Error, files: string[]) => void): void;
+export declare function rmdirRecursive(path: string, fn: (err: Error) => void): void;
+export declare function copyDirRecursive(srcDir: string, newDir: string, fn: (err: Error) => void): void;
+
+export declare class LineReader {
+    constructor(filename: string, bufferSize?: number);
+
+    getBufferAndSetCurrentPosition(position: number): number;
+    hasNextLine(): boolean;
+    getNextLine(): string;
+}
diff --git a/wrench/tsconfig.json b/wrench/tsconfig.json
new file mode 100644
index 0000000000..5015e75dde
--- /dev/null
+++ b/wrench/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "wrench-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/wrench/wrench-tests.ts b/wrench/wrench-tests.ts
index 8749c8aa06..669ab4510d 100644
--- a/wrench/wrench-tests.ts
+++ b/wrench/wrench-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="wrench.d.ts" />
 
 import wrench = require('wrench');
 
diff --git a/wrench/wrench.d.ts b/wrench/wrench.d.ts
deleted file mode 100644
index ced55ea9d4..0000000000
--- a/wrench/wrench.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// Type definitions for wrench
-// Project: https://github.com/ryanmcgrath/wrench-js
-// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/wrench.d.ts
-
-declare module "wrench" {
-	export function readdirSyncRecursive(baseDir: string): string[];
-	export function rmdirSyncRecursive(path: string, failSilent?: boolean): void;
-	export function copyDirSyncRecursive(sourceDir: string, newDirLocation: string, opts?: { preserve?: boolean; }): void;
-	export function chmodSyncRecursive(sourceDir: string, filemode: number): void;
-	export function chownSyncRecursive(sourceDir: string, uid: number, gid: number): void;
-	export function mkdirSyncRecursive(path: string, mode: number): void;
-
-	export function readdirRecursive(baseDir: string, fn: (err: Error, files: string[]) => void): void;
-	export function rmdirRecursive(path: string, fn: (err: Error) => void): void;
-	export function copyDirRecursive(srcDir: string, newDir: string, fn: (err: Error) => void): void;
-
-	export class LineReader {
-		constructor (filename: string, bufferSize?: number);
-
-		getBufferAndSetCurrentPosition(position: number): number;
-		hasNextLine(): boolean;
-		getNextLine(): string;
-	}
-}
diff --git a/ws/index.d.ts b/ws/index.d.ts
new file mode 100644
index 0000000000..2bbc1b5717
--- /dev/null
+++ b/ws/index.d.ts
@@ -0,0 +1,137 @@
+// Type definitions for ws
+// Project: https://github.com/einaros/ws
+// Definitions by: Paul Loyd <https://github.com/loyd>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import * as events from 'events';
+import * as http from 'http';
+import * as net from 'net';
+
+declare class WebSocket extends events.EventEmitter {
+    static CONNECTING: number;
+    static OPEN: number;
+    static CLOSING: number;
+    static CLOSED: number;
+
+    bytesReceived: number;
+    readyState: number;
+    protocolVersion: string;
+    url: string;
+    supports: any;
+    upgradeReq: http.ServerRequest;
+
+    CONNECTING: number;
+    OPEN: number;
+    CLOSING: number;
+    CLOSED: number;
+
+    onopen: (event: { target: WebSocket }) => void;
+    onerror: (err: Error) => void;
+    onclose: (event: { wasClean: boolean; code: number; reason: string; target: WebSocket }) => void;
+    onmessage: (event: { data: any; type: string; target: WebSocket }) => void;
+
+    constructor(address: string, options?: {
+        protocol?: string;
+        agent?: http.Agent;
+        headers?: { [key: string]: string };
+        protocolVersion?: any;
+        host?: string;
+        origin?: string;
+        pfx?: any;
+        key?: any;
+        passphrase?: string;
+        cert?: any;
+        ca?: any[];
+        ciphers?: string;
+        rejectUnauthorized?: boolean;
+    });
+
+    close(code?: number, data?: any): void;
+    pause(): void;
+    resume(): void;
+    ping(data?: any, options?: { mask?: boolean; binary?: boolean }, dontFail?: boolean): void;
+    pong(data?: any, options?: { mask?: boolean; binary?: boolean }, dontFail?: boolean): void;
+    send(data: any, cb?: (err: Error) => void): void;
+    send(data: any, options: { mask?: boolean; binary?: boolean }, cb?: (err: Error) => void): void;
+    stream(options: { mask?: boolean; binary?: boolean }, cb?: (err: Error, final: boolean) => void): void;
+    stream(cb?: (err: Error, final: boolean) => void): void;
+    terminate(): void;
+
+    // HTML5 WebSocket events
+    addEventListener(method: 'message', cb?: (event: { data: any; type: string; target: WebSocket }) => void): void;
+    addEventListener(method: 'close', cb?: (event: {
+        wasClean: boolean; code: number;
+        reason: string; target: WebSocket
+    }) => void): void;
+    addEventListener(method: 'error', cb?: (err: Error) => void): void;
+    addEventListener(method: 'open', cb?: (event: { target: WebSocket }) => void): void;
+    addEventListener(method: string, listener?: () => void): void;
+
+    // Events
+    on(event: 'error', cb: (err: Error) => void): this;
+    on(event: 'close', cb: (code: number, message: string) => void): this;
+    on(event: 'message', cb: (data: any, flags: { binary: boolean }) => void): this;
+    on(event: 'ping', cb: (data: any, flags: { binary: boolean }) => void): this;
+    on(event: 'pong', cb: (data: any, flags: { binary: boolean }) => void): this;
+    on(event: 'open', cb: () => void): this;
+    on(event: string, listener: () => void): this;
+
+    addListener(event: 'error', cb: (err: Error) => void): this;
+    addListener(event: 'close', cb: (code: number, message: string) => void): this;
+    addListener(event: 'message', cb: (data: any, flags: { binary: boolean }) => void): this;
+    addListener(event: 'ping', cb: (data: any, flags: { binary: boolean }) => void): this;
+    addListener(event: 'pong', cb: (data: any, flags: { binary: boolean }) => void): this;
+    addListener(event: 'open', cb: () => void): this;
+    addListener(event: string, listener: () => void): this;
+}
+
+declare namespace WebSocket {
+    export interface IServerOptions {
+        host?: string;
+        port?: number;
+        server?: http.Server;
+        verifyClient?: {
+            (info: { origin: string; secure: boolean; req: http.ServerRequest }): boolean;
+            (info: { origin: string; secure: boolean; req: http.ServerRequest },
+                callback: (res: boolean) => void): void;
+        };
+        handleProtocols?: any;
+        path?: string;
+        noServer?: boolean;
+        disableHixie?: boolean;
+        clientTracking?: boolean;
+    }
+
+    export class Server extends events.EventEmitter {
+        options: IServerOptions;
+        path: string;
+        clients: WebSocket[];
+
+        constructor(options?: IServerOptions, callback?: Function);
+
+        close(): void;
+        handleUpgrade(request: http.ServerRequest, socket: net.Socket,
+            upgradeHead: Buffer, callback: (client: WebSocket) => void): void;
+
+        // Events
+        on(event: 'error', cb: (err: Error) => void): this;
+        on(event: 'headers', cb: (headers: string[]) => void): this;
+        on(event: 'connection', cb: (client: WebSocket) => void): this;
+        on(event: string, listener: () => void): this;
+
+        addListener(event: 'error', cb: (err: Error) => void): this;
+        addListener(event: 'headers', cb: (headers: string[]) => void): this;
+        addListener(event: 'connection', cb: (client: WebSocket) => void): this;
+        addListener(event: string, listener: () => void): this;
+    }
+
+    export function createServer(options?: IServerOptions,
+        connectionListener?: (client: WebSocket) => void): Server;
+    export function connect(address: string, openListener?: Function): void;
+    export function createConnection(address: string, openListener?: Function): void;
+}
+
+export = WebSocket;
diff --git a/ws/tsconfig.json b/ws/tsconfig.json
new file mode 100644
index 0000000000..0dbbca5749
--- /dev/null
+++ b/ws/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ws-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ws/ws-tests.ts b/ws/ws-tests.ts
index ec2bc431e0..b181ebf497 100644
--- a/ws/ws-tests.ts
+++ b/ws/ws-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="ws.d.ts" />
 
 import WebSocket = require('ws');
 var WebSocketServer = WebSocket.Server;
diff --git a/ws/ws.d.ts b/ws/ws.d.ts
deleted file mode 100644
index 83ba9dec92..0000000000
--- a/ws/ws.d.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-// Type definitions for ws
-// Project: https://github.com/einaros/ws
-// Definitions by: Paul Loyd <https://github.com/loyd>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "ws" {
-    import * as events from 'events';
-    import * as http from 'http';
-    import * as net from 'net';
-
-    class WebSocket extends events.EventEmitter {
-        static CONNECTING: number;
-        static OPEN: number;
-        static CLOSING: number;
-        static CLOSED: number;
-
-        bytesReceived: number;
-        readyState: number;
-        protocolVersion: string;
-        url: string;
-        supports: any;
-        upgradeReq: http.ServerRequest;
-
-        CONNECTING: number;
-        OPEN: number;
-        CLOSING: number;
-        CLOSED: number;
-
-        onopen: (event: {target: WebSocket}) => void;
-        onerror: (err: Error) => void;
-        onclose: (event: {wasClean: boolean; code: number; reason: string; target: WebSocket}) => void;
-        onmessage: (event: {data: any; type: string; target: WebSocket}) => void;
-
-        constructor(address: string, options?: {
-            protocol?: string;
-            agent?: http.Agent;
-            headers?: {[key: string]: string};
-            protocolVersion?: any;
-            host?: string;
-            origin?: string;
-            pfx?: any;
-            key?: any;
-            passphrase?: string;
-            cert?: any;
-            ca?: any[];
-            ciphers?: string;
-            rejectUnauthorized?: boolean;
-        });
-
-        close(code?: number, data?: any): void;
-        pause(): void;
-        resume(): void;
-        ping(data?: any, options?: {mask?: boolean; binary?: boolean}, dontFail?: boolean): void;
-        pong(data?: any, options?: {mask?: boolean; binary?: boolean}, dontFail?: boolean): void;
-        send(data: any, cb?: (err: Error) => void): void;
-        send(data: any, options: {mask?: boolean; binary?: boolean}, cb?: (err: Error) => void): void;
-        stream(options: {mask?: boolean; binary?: boolean}, cb?: (err: Error, final: boolean) => void): void;
-        stream(cb?: (err: Error, final: boolean) => void): void;
-        terminate(): void;
-
-        // HTML5 WebSocket events
-        addEventListener(method: 'message', cb?: (event: {data: any; type: string; target: WebSocket}) => void): void;
-        addEventListener(method: 'close', cb?: (event: {wasClean: boolean; code: number;
-                                                        reason: string; target: WebSocket}) => void): void;
-        addEventListener(method: 'error', cb?: (err: Error) => void): void;
-        addEventListener(method: 'open', cb?: (event: {target: WebSocket}) => void): void;
-        addEventListener(method: string, listener?: () => void): void;
-
-        // Events
-        on(event: 'error', cb: (err: Error) => void): this;
-        on(event: 'close', cb: (code: number, message: string) => void): this;
-        on(event: 'message', cb: (data: any, flags: {binary: boolean}) => void): this;
-        on(event: 'ping', cb: (data: any, flags: {binary: boolean}) => void): this;
-        on(event: 'pong', cb: (data: any, flags: {binary: boolean}) => void): this;
-        on(event: 'open', cb: () => void): this;
-        on(event: string, listener: () => void): this;
-
-        addListener(event: 'error', cb: (err: Error) => void): this;
-        addListener(event: 'close', cb: (code: number, message: string) => void): this;
-        addListener(event: 'message', cb: (data: any, flags: {binary: boolean}) => void): this;
-        addListener(event: 'ping', cb: (data: any, flags: {binary: boolean}) => void): this;
-        addListener(event: 'pong', cb: (data: any, flags: {binary: boolean}) => void): this;
-        addListener(event: 'open', cb: () => void): this;
-        addListener(event: string, listener: () => void): this;
-    }
-
-    namespace WebSocket {
-        export interface IServerOptions {
-            host?: string;
-            port?: number;
-            server?: http.Server;
-            verifyClient?: {
-                (info: {origin: string; secure: boolean; req: http.ServerRequest}): boolean;
-                (info: {origin: string; secure: boolean; req: http.ServerRequest},
-                                                 callback: (res: boolean) => void): void;
-            };
-            handleProtocols?: any;
-            path?: string;
-            noServer?: boolean;
-            disableHixie?: boolean;
-            clientTracking?: boolean;
-        }
-
-        export class Server extends events.EventEmitter {
-            options: IServerOptions;
-            path: string;
-            clients: WebSocket[];
-
-            constructor(options?: IServerOptions, callback?: Function);
-
-            close(): void;
-            handleUpgrade(request: http.ServerRequest, socket: net.Socket,
-                          upgradeHead: Buffer, callback: (client: WebSocket) => void): void;
-
-            // Events
-            on(event: 'error', cb: (err: Error) => void): this;
-            on(event: 'headers', cb: (headers: string[]) => void): this;
-            on(event: 'connection', cb: (client: WebSocket) => void): this;
-            on(event: string, listener: () => void): this;
-
-            addListener(event: 'error', cb: (err: Error) => void): this;
-            addListener(event: 'headers', cb: (headers: string[]) => void): this;
-            addListener(event: 'connection', cb: (client: WebSocket) => void): this;
-            addListener(event: string, listener: () => void): this;
-        }
-
-        export function createServer(options?: IServerOptions,
-            connectionListener?: (client: WebSocket) => void): Server;
-        export function connect(address: string, openListener?: Function): void;
-        export function createConnection(address: string, openListener?: Function): void;
-    }
-
-    export = WebSocket;
-}
diff --git a/wu/wu.d.ts b/wu/index.d.ts
similarity index 100%
rename from wu/wu.d.ts
rename to wu/index.d.ts
diff --git a/wu/tsconfig.json b/wu/tsconfig.json
new file mode 100644
index 0000000000..caa92cb616
--- /dev/null
+++ b/wu/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "wu-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/wu/wu-tests.ts b/wu/wu-tests.ts
index c207820303..3dcb11abb1 100644
--- a/wu/wu-tests.ts
+++ b/wu/wu-tests.ts
@@ -1,5 +1,5 @@
 // adapted from `cat wu.js/test/* |sed '/= require/d'> wu-tests.ts`
-///<reference path="wu.d.ts" />
+
 declare var describe: any, it: any, mocha: any, assert: {
   iterable:any;
   eqSet<T>(expected:Set<T>, actual: Iterable<T>): any;
@@ -10,13 +10,13 @@ declare var describe: any, it: any, mocha: any, assert: {
 }
 
 // Helper for asserting that the given thing is iterable.
-assert.iterable = thing => {
+assert.iterable = (thing: any) => {
   assert.ok(wu(thing));
 };
 
 // Helper for asserting that all the elements yielded from the |actual|
 // iterator are in the |expected| set.
-assert.eqSet = (expected, actual) => {
+assert.eqSet = (expected: any, actual: any) => {
   assert.iterable(actual);
   for (var x of actual) {
     assert.ok(expected.has(x));
@@ -27,7 +27,7 @@ assert.eqSet = (expected, actual) => {
 // Helper for asserting that all the elements yielded from the |actual|
 // iterator are equal to and in the same order as the elements of the
 // |expected| array.
-assert.eqArray = (expected, actual) => {
+assert.eqArray = (expected: any, actual: any) => {
   assert.iterable(actual);
   assert.deepEqual(expected, [...actual]);
 };
@@ -203,7 +203,7 @@ describe("wu.flatten", () => {
 });
 describe("wu.forEach", () => {
   it("should iterate over every item", () => {
-    const items = [];
+    const items: any[] = [];
     wu.forEach(x => items.push(x), [1,2,3]);
     assert.eqArray([1,2,3], items);
   });
@@ -219,15 +219,15 @@ describe("wu.has", () => {
 });
 describe("wu.invoke", () => {
   it("should yield the method invokation on each item", () => {
-    function Greeter(name) {
+    function Greeter(name: string) {
       this.name = name
     }
-    Greeter.prototype.greet = function (tail) {
+    Greeter.prototype.greet = function (tail: string) {
       return "hello " + this.name + tail;
     };
     assert.eqArray(["hello world!", "hello test!"],
                    wu.invoke("greet", "!",
-                             [new Greeter("world"), new Greeter("test")]));
+                             [Greeter("world"), Greeter("test")]));
   });
 });
 describe("wu.keys", () => {
@@ -391,9 +391,9 @@ describe("wu.zip", () => {
 });
 describe("wu.zipLongest", () => {
   it("should stop with the longer iterable", () => {
-    const arr1 = [];
+    const arr1: any[] = [];
     arr1[1] = 2;
-    const arr2 = [];
+    const arr2: any[] = [];
     arr2[1] = 3;
     assert.eqArray([["a", 1], arr1, arr2],
                    wu.zipLongest("a", [1, 2, 3]));
@@ -401,7 +401,7 @@ describe("wu.zipLongest", () => {
 });
 describe("wu.zipWith", () => {
   it("should spread map over the zipped iterables", () => {
-    const add3 = (a, b, c) => a + b + c;
+    const add3 = (a: any, b: any, c: any) => a + b + c;
     assert.eqArray([12, 15, 18],
                    wu.zipWith(add3,
                               [1, 2, 3],
diff --git a/wu/wu-tests.ts.tscparams b/wu/wu-tests.ts.tscparams
deleted file mode 100644
index 14fce22a5c..0000000000
--- a/wu/wu-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
---target ES6
diff --git a/x-editable/index.d.ts b/x-editable/index.d.ts
new file mode 100644
index 0000000000..fde4d8b85a
--- /dev/null
+++ b/x-editable/index.d.ts
@@ -0,0 +1,75 @@
+// Type definitions for X-Editable v1.5.1
+// Project: http://vitalets.github.io/x-editable/index.html
+// Definitions by: Chris Kirby <https://github.com/sirkirby/>
+// Definitions: https://github.com/sirkirby/DefinitelyTyped
+
+/// <reference types="jquery"/>
+
+interface XEditableOptions {
+  ajaxOptions?: any;
+  anim?: string;
+  autotext?: string;
+  defaultValue?: any;
+  disabled?: boolean;
+  display?: any;
+  emptyclass?: string;
+  emptytext?: string;
+  error?: any;
+  highlight?: any;
+  mode?: string;
+  name?: string;
+  onblur?: string;
+  params?: any;
+  pk?: any;
+  placement?: string;
+  savenochange?: boolean;
+  selector?: string;
+  send?: string;
+  showbuttons?: any;
+  success?: any;
+  toggle?: string;
+  type?: string;
+  unsavedclass?: string;
+  url?: any;
+  validate?: any;
+  value?: any;
+}
+
+interface XEditableSubmitOptions {
+  url?: any;
+  data?: any;
+  ajaxOptions?: any;
+  error(obj: any): void;
+  success(obj: any, config: any): void;
+}
+
+interface XEditable {
+  options: XEditableOptions;
+  activate(): void;
+  destroy(): void;
+  disable(): void;
+  enable(): void;
+  getValue(isSingle: boolean): any;
+  hide(): void;
+  option(key: any, value: any): void;
+  setValue(value: any, convertStr: boolean): void;
+  show(closeAll: boolean): void;
+  submit(options: XEditableSubmitOptions): void;
+  toggle(closeAll: boolean): void;
+  toggleDisabled(): void;
+  validate(): void;
+}
+
+interface JQuery {
+  /**
+    * Initializes editable with the specified options
+    * @param options an object with options specific to the editable instance
+    */
+  editable(options?: any): XEditable;
+  /**
+    * Initializes editable calling the specific method with is parameters
+    * @param method the method to call
+    * @param params the parameters expected by the method
+    */
+  editable(method: string, params?: any): XEditable;
+}
diff --git a/x-editable/tsconfig.json b/x-editable/tsconfig.json
new file mode 100644
index 0000000000..edfdb4019e
--- /dev/null
+++ b/x-editable/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "x-editable-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/x-editable/x-editable-tests.ts b/x-editable/x-editable-tests.ts
index bf4d341890..fbcf560842 100644
--- a/x-editable/x-editable-tests.ts
+++ b/x-editable/x-editable-tests.ts
@@ -3,8 +3,7 @@
 // Definitions by: Chris Kirby <https://github.com/sirkirby/>
 // Definitions: https://github.com/sirkirby/DefinitelyTyped
 
-/// <reference path="x-editable.d.ts"/>
-/// <reference path="../jquery/jquery.d.ts"/>
+/// <reference types="jquery"/>
 
 // server post and response
 $('#username').editable({
diff --git a/x-editable/x-editable.d.ts b/x-editable/x-editable.d.ts
deleted file mode 100644
index 7af603020f..0000000000
--- a/x-editable/x-editable.d.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-// Type definitions for X-Editable v1.5.1
-// Project: http://vitalets.github.io/x-editable/index.html
-// Definitions by: Chris Kirby <https://github.com/sirkirby/>
-// Definitions: https://github.com/sirkirby/DefinitelyTyped
-
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface XEditableOptions
-{
-  ajaxOptions?: any;
-  anim?: string;
-  autotext?: string;
-  defaultValue?: any;
-  disabled?: boolean;
-  display?: any;
-  emptyclass?: string;
-  emptytext?: string;
-  error?: any;
-  highlight?: any;
-  mode?: string;
-  name?: string;
-  onblur?: string;
-  params?: any;
-  pk?: any;
-  placement?: string;
-  savenochange?: boolean;
-  selector?: string;
-  send?: string;
-  showbuttons?: any;
-  success?: any;
-  toggle?: string;
-  type?: string;
-  unsavedclass?: string;
-  url?: any;
-  validate?: any;
-  value?: any;
-
-
-}
-
-interface XEditableSubmitOptions {
-  url?: any;
-  data?: any;
-  ajaxOptions?: any;
-  error(obj: any) : void;
-  success(obj: any, config: any) : void;
-}
-
-interface XEditable {
-  options: XEditableOptions;
-  activate() : void;
-  destroy() : void;
-  disable() : void;
-  enable() : void;
-  getValue(isSingle: boolean) : any;
-  hide() : void;
-  option(key: any, value: any) : void;
-  setValue(value: any, convertStr: boolean) : void;
-  show(closeAll: boolean) : void;
-  submit(options: XEditableSubmitOptions) : void;
-  toggle(closeAll: boolean) : void;
-  toggleDisabled() : void;
-  validate() : void;
-}
-
-interface JQuery {
-  /**
-    * Initializes editable with the specified options
-    * @param options an object with options specific to the editable instance
-    */
-  editable(options?: any): XEditable;
-  /**
-    * Initializes editable calling the specific method with is parameters
-    * @param method the method to call
-    * @param params the parameters expected by the method
-    */
-  editable(method: string, params?: any): XEditable;
-}
diff --git a/x2js/xml2json.d.ts b/x2js/index.d.ts
similarity index 100%
rename from x2js/xml2json.d.ts
rename to x2js/index.d.ts
diff --git a/x2js/tsconfig.json b/x2js/tsconfig.json
new file mode 100644
index 0000000000..7747a2dff7
--- /dev/null
+++ b/x2js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "xml2json-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/x2js/xml2json-tests.ts b/x2js/xml2json-tests.ts
index f256721b0e..fcea1fe966 100644
--- a/x2js/xml2json-tests.ts
+++ b/x2js/xml2json-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="xml2json.d.ts" />
-
 // Create x2js instance with default config
 var x2js = new X2JS();
 
diff --git a/xdate/xdate.d.ts b/xdate/index.d.ts
similarity index 100%
rename from xdate/xdate.d.ts
rename to xdate/index.d.ts
diff --git a/xdate/tsconfig.json b/xdate/tsconfig.json
new file mode 100644
index 0000000000..8723bd12bc
--- /dev/null
+++ b/xdate/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "xdate-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/xdate/xdate-tests.ts b/xdate/xdate-tests.ts
index cdd7829fb4..b5a54c9e5c 100644
--- a/xdate/xdate-tests.ts
+++ b/xdate/xdate-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="xdate.d.ts" />
+
 
 //Those classes were tested by compile time only!
 
diff --git a/xdomain/xdomain.d.ts b/xdomain/index.d.ts
similarity index 100%
rename from xdomain/xdomain.d.ts
rename to xdomain/index.d.ts
diff --git a/xdomain/tsconfig.json b/xdomain/tsconfig.json
new file mode 100644
index 0000000000..9ae48f5748
--- /dev/null
+++ b/xdomain/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "xdomain-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/xdomain/xdomain-tests.ts b/xdomain/xdomain-tests.ts
index 303fa15fe0..b10beb5315 100644
--- a/xdomain/xdomain-tests.ts
+++ b/xdomain/xdomain-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./xdomain.d.ts" />
+
 
 xdomain.masters({
   'http://abc.example.com': '/api/*'
diff --git a/xlsx/index.d.ts b/xlsx/index.d.ts
new file mode 100644
index 0000000000..61e7346c34
--- /dev/null
+++ b/xlsx/index.d.ts
@@ -0,0 +1,134 @@
+// Type definitions for xlsx
+// Project: https://github.com/SheetJS/js-xlsx
+// Definitions by: themauveavenger <https://github.com/themauveavenger/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+export declare function readFile(filename: string, opts?: IParsingOptions): IWorkBook;
+export declare function read(data: any, opts?: IParsingOptions): IWorkBook;
+export declare var utils: IUtils;
+
+export interface IProperties {
+    LastAuthor?: string
+    Author?: string;
+    CreatedDate?: Date;
+    ModifiedDate?: Date
+    Application?: string;
+    AppVersion?: string;
+    Company?: string;
+    DocSecurity?: string;
+    Manager?: string;
+    HyperlinksChanged?: boolean;
+    SharedDoc?: boolean;
+    LinksUpToDate?: boolean;
+    ScaleCrop?: boolean;
+    Worksheets?: number;
+    SheetNames?: string[];
+}
+
+export interface IParsingOptions {
+    cellFormula?: boolean;
+    cellHTML?: boolean;
+    cellNF?: boolean;
+    cellStyles?: boolean;
+    cellDates?: boolean;
+    sheetStubs?: boolean;
+    sheetRows?: number;
+    bookDeps?: boolean;
+    bookFiles?: boolean;
+    bookProps?: boolean;
+    bookSheets?: boolean;
+    bookVBA?: boolean;
+    password?: string;
+
+    /**
+     * Possible options: 'binary', 'base64', 'buffer', 'file'
+     */
+    type?: string;
+}
+
+export interface IWorkBook {
+    /**
+     * A dictionary of the worksheets in the workbook.
+     * Use SheetNames to reference these.
+     */
+    Sheets: { [sheet: string]: IWorkSheet };
+
+    /**
+     * ordered list of the sheet names in the workbook
+     */
+    SheetNames: string[];
+
+    /**
+     * an object storing the standard properties. wb.Custprops stores custom properties.
+     * Since the XLS standard properties deviate from the XLSX standard, XLS parsing stores core properties in both places.
+     */
+    Props: IProperties;
+}
+
+/**
+ * object representing the worksheet
+ */
+export interface IWorkSheet {
+    [cell: string]: IWorkSheetCell;
+}
+
+export interface IWorkSheetCell {
+    /**
+     * The Excel Data Type of the cell.
+     * b Boolean, n Number, e error, s String, d Date
+     */
+    t: string;
+
+    /**
+     * The raw value of the cell.
+     */
+    v: string;
+
+    /**
+     * rich text encoding (if applicable)
+     */
+    r?: string;
+
+    /**
+     * HTML rendering of the rich text (if applicable)
+     */
+    h?: string;
+
+    /**
+     * formatted text (if applicable)
+     */
+    w?: string;
+
+    /**
+     * cell formula (if applicable)
+     */
+    f?: string;
+
+    /**
+     * comments associated with the cell **
+     */
+    c?: string;
+
+    /**
+     * number format string associated with the cell (if requested)
+     */
+    z?: string;
+
+    /**
+     * cell hyperlink object (.Target holds link, .tooltip is tooltip)
+     */
+    l?: string;
+
+    /**
+     * the style/theme of the cell (if applicable)
+     */
+    s?: string;
+}
+
+export interface IUtils {
+    sheet_to_json<T>(worksheet: IWorkSheet): T[];
+    sheet_to_csv(worksheet: IWorkSheet): any;
+    sheet_to_formulae(worksheet: IWorkSheet): any;
+}
diff --git a/xlsx/tsconfig.json b/xlsx/tsconfig.json
new file mode 100644
index 0000000000..fef4d9cbc4
--- /dev/null
+++ b/xlsx/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "xlsx-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/xlsx/xlsx-tests.ts b/xlsx/xlsx-tests.ts
index 7a40546264..1817ec8acc 100644
--- a/xlsx/xlsx-tests.ts
+++ b/xlsx/xlsx-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./xlsx.d.ts" />
+
 import xlsx = require('xlsx');
 
 var options:xlsx.IParsingOptions = {
diff --git a/xlsx/xlsx.d.ts b/xlsx/xlsx.d.ts
deleted file mode 100644
index b761387681..0000000000
--- a/xlsx/xlsx.d.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-// Type definitions for xlsx
-// Project: https://github.com/SheetJS/js-xlsx
-// Definitions by: themauveavenger <https://github.com/themauveavenger/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'xlsx' {
-
-    export function readFile(filename:string, opts?:IParsingOptions):IWorkBook;
-    export function read(data:any, opts?:IParsingOptions):IWorkBook;
-    export var utils:IUtils;
-
-    export interface IProperties {
-        LastAuthor?:string
-        Author?:string;
-        CreatedDate?:Date;
-        ModifiedDate?:Date
-        Application?:string;
-        AppVersion?:string;
-        Company?:string;
-        DocSecurity?:string;
-        Manager?:string;
-        HyperlinksChanged?: boolean;
-        SharedDoc?:boolean;
-        LinksUpToDate?:boolean;
-        ScaleCrop?:boolean;
-        Worksheets?:number;
-        SheetNames?:string[];
-    }
-
-    export interface IParsingOptions {
-        cellFormula?:boolean;
-        cellHTML?:boolean;
-        cellNF?:boolean;
-        cellStyles?:boolean;
-        cellDates?:boolean;
-        sheetStubs?:boolean;
-        sheetRows?:number;
-        bookDeps?:boolean;
-        bookFiles?:boolean;
-        bookProps?:boolean;
-        bookSheets?:boolean;
-        bookVBA?:boolean;
-        password?:string;
-
-        /**
-         * Possible options: 'binary', 'base64', 'buffer', 'file'
-         */
-        type?:string;
-    }
-
-    export interface IWorkBook {
-        /**
-         * A dictionary of the worksheets in the workbook.
-         * Use SheetNames to reference these.
-         */
-        Sheets:{[sheet:string]:IWorkSheet};
-
-        /**
-         * ordered list of the sheet names in the workbook
-         */
-        SheetNames:string[];
-
-        /**
-         * an object storing the standard properties. wb.Custprops stores custom properties.
-         * Since the XLS standard properties deviate from the XLSX standard, XLS parsing stores core properties in both places.
-         */
-        Props:IProperties;
-    }
-
-    /**
-     * object representing the worksheet
-     */
-    export interface IWorkSheet {
-        [cell:string]:IWorkSheetCell;
-    }
-
-    export interface IWorkSheetCell {
-        /**
-         * The Excel Data Type of the cell.
-         * b Boolean, n Number, e error, s String, d Date
-         */
-        t: string;
-
-        /**
-         * The raw value of the cell.
-         */
-        v: string;
-
-        /**
-         * rich text encoding (if applicable)
-         */
-        r?: string;
-
-        /**
-         * HTML rendering of the rich text (if applicable)
-         */
-        h?: string;
-
-        /**
-         * formatted text (if applicable)
-         */
-        w?: string;
-
-        /**
-         * cell formula (if applicable)
-         */
-        f?: string;
-
-        /**
-         * comments associated with the cell **
-         */
-        c?: string;
-
-        /**
-         * number format string associated with the cell (if requested)
-         */
-        z?: string;
-
-        /**
-         * cell hyperlink object (.Target holds link, .tooltip is tooltip)
-         */
-        l?: string;
-
-        /**
-         * the style/theme of the cell (if applicable)
-         */
-        s?: string;
-    }
-
-    export interface IUtils {
-        sheet_to_json<T>(worksheet:IWorkSheet):T[];
-        sheet_to_csv(worksheet:IWorkSheet):any;
-        sheet_to_formulae(worksheet:IWorkSheet):any;
-    }
-
-}
diff --git a/xml-parser/index.d.ts b/xml-parser/index.d.ts
new file mode 100644
index 0000000000..36d2756b23
--- /dev/null
+++ b/xml-parser/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for xml-parser 1.2.1
+// Project: https://github.com/segmentio/xml-parser
+// Definitions by: Matt Frantz <https://github.com/mhfrantz/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare function parse(xml: string): parse.Document;
+
+declare namespace parse {
+    export interface Document {
+        declaration: Declaration;
+        root: Node;
+    }
+
+    export interface Declaration {
+        attributes: Attributes;
+    }
+
+    export interface Node {
+        name: string;
+        attributes: Attributes;
+        children: Node[];
+        content?: string;
+    }
+
+    export interface Attributes {
+        [name: string]: string;
+    }
+}
+
+export = parse;
diff --git a/xml-parser/tsconfig.json b/xml-parser/tsconfig.json
new file mode 100644
index 0000000000..f953866a7c
--- /dev/null
+++ b/xml-parser/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "xml-parser-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/xml-parser/xml-parser-tests.ts b/xml-parser/xml-parser-tests.ts
index 81518cd28e..7370fb1eba 100644
--- a/xml-parser/xml-parser-tests.ts
+++ b/xml-parser/xml-parser-tests.ts
@@ -1,5 +1,4 @@
-/// <reference path="../node/node.d.ts"/>
-/// <reference path="xml-parser.d.ts"/>
+/// <reference types="node"/>
 
 import assert = require('assert');
 import parse = require('xml-parser');
diff --git a/xml-parser/xml-parser.d.ts b/xml-parser/xml-parser.d.ts
deleted file mode 100644
index 7622ba7e1a..0000000000
--- a/xml-parser/xml-parser.d.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// Type definitions for xml-parser 1.2.1
-// Project: https://github.com/segmentio/xml-parser
-// Definitions by: Matt Frantz <https://github.com/mhfrantz/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'xml-parser' {
-
-  function parse(xml: string): parse.Document;
-
-  namespace parse {
-    export interface Document {
-      declaration: Declaration;
-      root: Node;
-    }
-
-    export interface Declaration {
-      attributes: Attributes;
-    }
-
-    export interface Node {
-      name: string;
-      attributes: Attributes;
-      children: Node[];
-      content?: string;
-    }
-
-    export interface Attributes {
-      [name: string]: string;
-    }
-  }
-
-  export = parse;
-}
diff --git a/xml2js/index.d.ts b/xml2js/index.d.ts
new file mode 100644
index 0000000000..e9d4e12ad0
--- /dev/null
+++ b/xml2js/index.d.ts
@@ -0,0 +1,98 @@
+// Type definitions for node-xml2js
+// Project: https://github.com/Leonidas-from-XIV/node-xml2js
+// Definitions by: Michel Salib <https://github.com/michelsalib>, Jason McNeil <https://github.com/jasonrm>, Christopher Currens <https://github.com/ccurrens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+export = xml2js;
+
+declare namespace xml2js {
+    function parseString(xml: string, callback: (err: any, result: any) => void): void;
+    function parseString(xml: string, options: Options, callback: (err: any, result: any) => void): void;
+
+    var defaults: {
+        '0.1': Options;
+        '0.2': OptionsV2;
+    }
+
+    class Builder {
+        constructor(options?: BuilderOptions);
+        buildObject(rootObj: any): string;
+    }
+
+    class Parser {
+        constructor(options?: Options);
+        processAsync(): any;
+        assignOrPush(obj: any, key: string, newValue: any): any;
+        reset(): any;
+        parseString(str: string, cb?: Function): void;
+    }
+
+    interface RenderOptions {
+        indent?: string;
+        newline?: string;
+        pretty?: boolean;
+    }
+
+    interface XMLDeclarationOptions {
+        encoding?: string;
+        standalone?: boolean;
+        version?: string;
+    }
+
+    interface BuilderOptions {
+        doctype?: any;
+        headless?: boolean;
+        indent?: string;
+        newline?: string;
+        pretty?: boolean;
+        renderOpts?: RenderOptions;
+        rootName?: string;
+        xmldec?: XMLDeclarationOptions;
+    }
+
+    interface Options {
+        async?: boolean;
+        attrkey?: string;
+        attrNameProcessors?: [(name: string) => string];
+        attrValueProcessors?: [(name: string) => string];
+        charkey?: string;
+        charsAsChildren?: boolean;
+        childkey?: string;
+        emptyTag?: any;
+        explicitArray?: boolean;
+        explicitCharkey?: boolean;
+        explicitChildren?: boolean;
+        explicitRoot?: boolean;
+        ignoreAttrs?: boolean;
+        mergeAttrs?: boolean;
+        normalize?: boolean;
+        normalizeTags?: boolean;
+        strict?: boolean;
+        tagNameProcessors?: [(name: string) => string];
+        trim?: boolean;
+        validator?: Function;
+        valueProcessors?: [(name: string) => string];
+        xmlns?: boolean;
+    }
+
+    interface OptionsV2 extends Options {
+        preserveChildrenOrder?: boolean;
+        rootName?: string;
+        xmldec?: {
+            version: string;
+            encoding?: string;
+            standalone?: boolean;
+        };
+        doctype?: any;
+        renderOpts?: {
+            pretty?: boolean;
+            indent?: string;
+            newline?: string;
+        };
+        headless?: boolean;
+        chunkSize?: number;
+        cdata?: boolean;
+    }
+}
diff --git a/xml2js/tsconfig.json b/xml2js/tsconfig.json
new file mode 100644
index 0000000000..5283d2bf2c
--- /dev/null
+++ b/xml2js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "xml2js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/xml2js/xml2js-tests.ts b/xml2js/xml2js-tests.ts
index d0ed5e5b95..3e3981156e 100644
--- a/xml2js/xml2js-tests.ts
+++ b/xml2js/xml2js-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="xml2js.d.ts" />
 
 import xml2js = require('xml2js');
 
diff --git a/xml2js/xml2js.d.ts b/xml2js/xml2js.d.ts
deleted file mode 100644
index 5fb4542d12..0000000000
--- a/xml2js/xml2js.d.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-// Type definitions for node-xml2js
-// Project: https://github.com/Leonidas-from-XIV/node-xml2js
-// Definitions by: Michel Salib <https://github.com/michelsalib>, Jason McNeil <https://github.com/jasonrm>, Christopher Currens <https://github.com/ccurrens>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'xml2js' {
-
-    export = xml2js;
-
-    namespace xml2js {
-        function parseString(xml: string, callback: (err: any, result: any) => void): void;
-        function parseString(xml: string, options: Options, callback: (err: any, result: any) => void): void;
-
-        var defaults: {
-            '0.1': Options;
-            '0.2': OptionsV2;
-        }
-
-        class Builder {
-            constructor(options?: BuilderOptions);
-            buildObject(rootObj: any): string;
-        }
-
-        class Parser {
-            constructor(options?: Options);
-            processAsync(): any;
-            assignOrPush(obj: any, key: string, newValue: any): any;
-            reset(): any;
-            parseString(str: string , cb?: Function): void;
-        }
-
-        interface RenderOptions {
-            indent?: string;
-            newline?: string;
-            pretty?: boolean;
-        }
-
-        interface XMLDeclarationOptions {
-            encoding?: string;
-            standalone?: boolean;
-            version?: string;
-        }
-
-        interface BuilderOptions {
-            doctype?: any;
-            headless?: boolean;
-            indent?: string;
-            newline?: string;
-            pretty?: boolean;
-            renderOpts?: RenderOptions;
-            rootName?: string;
-            xmldec?: XMLDeclarationOptions;
-        }
-
-        interface Options {
-            async?: boolean;
-            attrkey?: string;
-            attrNameProcessors?: [(name: string) => string];
-            attrValueProcessors?: [(name: string) => string];
-            charkey?: string;
-            charsAsChildren?: boolean;
-            childkey?: string;
-            emptyTag?: any;
-            explicitArray?: boolean;
-            explicitCharkey?: boolean;
-            explicitChildren?: boolean;
-            explicitRoot?: boolean;
-            ignoreAttrs?: boolean;
-            mergeAttrs?: boolean;
-            normalize?: boolean;
-            normalizeTags?: boolean;
-            strict?: boolean;
-            tagNameProcessors?: [(name: string) => string];
-            trim?: boolean;
-            validator?: Function;
-            valueProcessors?: [(name: string) => string];
-            xmlns?: boolean;
-        }
-
-        interface OptionsV2 extends Options {
-            preserveChildrenOrder?: boolean;
-            rootName?: string;
-            xmldec?: {
-                version: string;
-                encoding?: string;
-                standalone?: boolean;
-            };
-            doctype?: any;
-            renderOpts?: {
-                pretty?: boolean;
-                indent?: string;
-                newline?: string;
-            };
-            headless?: boolean;
-            chunkSize?: number;
-            cdata?: boolean;
-        }
-    }
-}
diff --git a/xmlbuilder/index.d.ts b/xmlbuilder/index.d.ts
new file mode 100644
index 0000000000..4367a7fb10
--- /dev/null
+++ b/xmlbuilder/index.d.ts
@@ -0,0 +1,88 @@
+// Type definitions for xmlbuilder
+// Project: https://github.com/oozcitak/xmlbuilder-js
+// Definitions by: Wallymathieu <http://github.com/wallymathieu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+export = xmlbuilder;
+declare class XMLDocType {
+    clone(): XMLDocType;
+    element(name: string, value?: Object): XMLDocType;
+    attList(elementName: string, attributeName: string, attributeType: string, defaultValueType?: string, defaultValue?: any): XMLDocType;
+    entity(name: string, value: any): XMLDocType;
+    pEntity(name: string, value: any): XMLDocType;
+    notation(name: string, value: any): XMLDocType;
+    cdata(value: string): XMLDocType;
+    comment(value: string): XMLDocType;
+    instruction(target: string, value: any): XMLDocType;
+    root(): XMLDocType;
+    document(): any;
+    toString(options?: Object, level?: Number): string;
+
+    ele(name: string, value?: Object): XMLDocType;
+    att(elementName: string, attributeName: string, attributeType: string, defaultValueType?: string, defaultValue?: any): XMLDocType;
+    ent(name: string, value: any): XMLDocType;
+    pent(name: string, value: any): XMLDocType;
+    not(name: string, value: any): XMLDocType;
+    dat(value: string): XMLDocType;
+    com(value: string): XMLDocType;
+    ins(target: string, value: any): XMLDocType;
+    up(): XMLDocType;
+    doc(): any;
+}
+
+declare class XMLElementOrXMLNode {
+    // XMLElement:
+    clone(): XMLElementOrXMLNode;
+    attribute(name: any, value?: any): XMLElementOrXMLNode;
+    att(name: any, value?: any): XMLElementOrXMLNode;
+    removeAttribute(name: string): XMLElementOrXMLNode;
+    instruction(target: string, value: any): XMLElementOrXMLNode;
+    instruction(array: Array<any>): XMLElementOrXMLNode;
+    instruction(obj: Object): XMLElementOrXMLNode;
+    ins(target: string, value: any): XMLElementOrXMLNode;
+    ins(array: Array<any>): XMLElementOrXMLNode;
+    ins(obj: Object): XMLElementOrXMLNode;
+    a(name: any, value?: any): XMLElementOrXMLNode;
+    i(target: string, value: any): XMLElementOrXMLNode;
+    i(array: Array<any>): XMLElementOrXMLNode;
+    i(obj: Object): XMLElementOrXMLNode;
+    toString(options?: Object, level?: Number): string;
+    // XMLNode:
+    element(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+    ele(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+    insertBefore(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+    insertAfter(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+    remove(): XMLElementOrXMLNode;
+    node(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+    text(value: string): XMLElementOrXMLNode;
+    cdata(value: string): XMLElementOrXMLNode;
+    comment(value: string): XMLElementOrXMLNode;
+    raw(value: string): XMLElementOrXMLNode;
+    declaration(version: string, encoding: string, standalone: boolean): XMLElementOrXMLNode;
+    doctype(pubID: string, sysID: string): XMLDocType;
+    up(): XMLElementOrXMLNode;
+    root(): XMLElementOrXMLNode;
+    document(): any;
+    end(options?: Object): string;
+    prev(): XMLElementOrXMLNode;
+    next(): XMLElementOrXMLNode;
+    nod(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+    txt(value: string): XMLElementOrXMLNode;
+    dat(value: string): XMLElementOrXMLNode;
+    com(value: string): XMLElementOrXMLNode;
+    doc(): XMLElementOrXMLNode;
+    dec(version: string, encoding: string, standalone: boolean): XMLElementOrXMLNode;
+    dtd(pubID: string, sysID: string): XMLDocType;
+    e(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+    n(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+    t(value: string): XMLElementOrXMLNode;
+    d(value: string): XMLElementOrXMLNode;
+    c(value: string): XMLElementOrXMLNode;
+    r(value: string): XMLElementOrXMLNode;
+    u(): XMLElementOrXMLNode;
+}
+
+declare namespace xmlbuilder {
+    function create(name: string, xmldec?: Object, doctype?: any, options?: Object): XMLElementOrXMLNode;
+}
diff --git a/xmlbuilder/tsconfig.json b/xmlbuilder/tsconfig.json
new file mode 100644
index 0000000000..f81ded8a13
--- /dev/null
+++ b/xmlbuilder/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "xmlbuilder-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/xmlbuilder/xmlbuilder-tests.ts b/xmlbuilder/xmlbuilder-tests.ts
index bebc5f4d8f..69794640ba 100644
--- a/xmlbuilder/xmlbuilder-tests.ts
+++ b/xmlbuilder/xmlbuilder-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="xmlbuilder.d.ts" />
 
 import xmlbuilder = require('xmlbuilder');
 var xml = xmlbuilder.create;
diff --git a/xmlbuilder/xmlbuilder.d.ts b/xmlbuilder/xmlbuilder.d.ts
deleted file mode 100644
index 43200d017d..0000000000
--- a/xmlbuilder/xmlbuilder.d.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-// Type definitions for xmlbuilder
-// Project: https://github.com/oozcitak/xmlbuilder-js
-// Definitions by: Wallymathieu <http://github.com/wallymathieu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'xmlbuilder' {
-    export = xmlbuilder;
-    class XMLDocType {
-        clone(): XMLDocType;
-        element(name: string, value?: Object): XMLDocType;
-        attList(elementName: string, attributeName: string, attributeType: string, defaultValueType?: string, defaultValue?: any): XMLDocType;
-        entity(name: string, value: any): XMLDocType;
-        pEntity(name: string, value: any): XMLDocType;
-        notation(name: string, value: any): XMLDocType;
-        cdata(value: string): XMLDocType;
-        comment(value: string): XMLDocType;
-        instruction(target: string, value: any): XMLDocType;
-        root(): XMLDocType;
-        document(): any;
-        toString(options?: Object, level?: Number): string;
-
-        ele(name: string, value?: Object): XMLDocType;
-        att(elementName: string, attributeName: string, attributeType: string, defaultValueType?: string, defaultValue?: any): XMLDocType;
-        ent(name: string, value: any): XMLDocType;
-        pent(name: string, value: any): XMLDocType;
-        not(name: string, value: any): XMLDocType;
-        dat(value: string): XMLDocType;
-        com(value: string): XMLDocType;
-        ins(target: string, value: any): XMLDocType;
-        up(): XMLDocType;
-        doc(): any;
-    }
-
-    class XMLElementOrXMLNode {
-        // XMLElement:
-        clone(): XMLElementOrXMLNode;
-        attribute(name: any, value?: any): XMLElementOrXMLNode;
-        att(name: any, value?: any): XMLElementOrXMLNode;
-        removeAttribute(name: string): XMLElementOrXMLNode;
-        instruction(target: string, value: any): XMLElementOrXMLNode;
-        instruction(array: Array<any>): XMLElementOrXMLNode;
-        instruction(obj: Object): XMLElementOrXMLNode;
-        ins(target: string, value: any): XMLElementOrXMLNode;
-        ins(array: Array<any>): XMLElementOrXMLNode;
-        ins(obj: Object): XMLElementOrXMLNode;
-        a(name: any, value?: any): XMLElementOrXMLNode;
-        i(target: string, value: any): XMLElementOrXMLNode;
-        i(array: Array<any>): XMLElementOrXMLNode;
-        i(obj: Object): XMLElementOrXMLNode;
-        toString(options?:Object, level?:Number): string;
-        // XMLNode:
-        element(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-        ele(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-        insertBefore(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-        insertAfter(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-        remove(): XMLElementOrXMLNode;
-        node(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-        text(value: string): XMLElementOrXMLNode;
-        cdata(value: string): XMLElementOrXMLNode;
-        comment(value: string): XMLElementOrXMLNode;
-        raw(value: string): XMLElementOrXMLNode;
-        declaration(version: string, encoding: string, standalone: boolean): XMLElementOrXMLNode;
-        doctype(pubID: string, sysID: string): XMLDocType;
-        up(): XMLElementOrXMLNode;
-        root(): XMLElementOrXMLNode;
-        document(): any;
-        end(options?: Object): string;
-        prev(): XMLElementOrXMLNode;
-        next(): XMLElementOrXMLNode;
-        nod(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-        txt(value: string): XMLElementOrXMLNode;
-        dat(value: string): XMLElementOrXMLNode;
-        com(value: string): XMLElementOrXMLNode;
-        doc(): XMLElementOrXMLNode;
-        dec(version: string, encoding: string, standalone: boolean): XMLElementOrXMLNode;
-        dtd(pubID: string, sysID: string): XMLDocType;
-        e(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-        n(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-        t(value: string): XMLElementOrXMLNode;
-        d(value: string): XMLElementOrXMLNode;
-        c(value: string): XMLElementOrXMLNode;
-        r(value: string): XMLElementOrXMLNode;
-        u(): XMLElementOrXMLNode;
-    }
-
-    namespace xmlbuilder {
-        function create(name: string, xmldec?: Object, doctype?: any, options?: Object): XMLElementOrXMLNode;
-    }
-}
diff --git a/xmldom/index.d.ts b/xmldom/index.d.ts
new file mode 100644
index 0000000000..dfbe34599c
--- /dev/null
+++ b/xmldom/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for xmldom 0.1.22
+// Project: https://github.com/jindw/xmldom.git
+// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare namespace xmldom {
+    var DOMParser: DOMParserStatic;
+    var XMLSerializer: XMLSerializerStatic;
+
+    interface DOMParserStatic {
+        new (): DOMParser;
+        new (options: Options): DOMParser;
+    }
+
+    interface XMLSerializerStatic {
+        new (): XMLSerializer;
+    }
+
+    interface DOMParser {
+        parseFromString(xmlsource: string, mimeType?: string): Document;
+    }
+
+    interface XMLSerializer {
+        serializeToString(node: Node): string;
+    }
+
+    interface Options {
+        locator?: any;
+        errorHandler?: ErrorHandlerFunction | ErrorHandlerObject;
+    }
+
+    interface ErrorHandlerFunction {
+        (level: string, msg: any): any;
+    }
+
+    interface ErrorHandlerObject {
+        warning?: (msg: any) => any;
+        error?: (msg: any) => any;
+        fatalError?: (msg: any) => any;
+    }
+}
+
+export = xmldom;
diff --git a/xmldom/tsconfig.json b/xmldom/tsconfig.json
new file mode 100644
index 0000000000..3650f90161
--- /dev/null
+++ b/xmldom/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "xmldom-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/xmldom/xmldom-tests.ts b/xmldom/xmldom-tests.ts
index cde7ca97bd..4863686d01 100644
--- a/xmldom/xmldom-tests.ts
+++ b/xmldom/xmldom-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="xmldom.d.ts" />
 
 import * as xmldom from 'xmldom';
 
diff --git a/xmldom/xmldom.d.ts b/xmldom/xmldom.d.ts
deleted file mode 100644
index 25502d0806..0000000000
--- a/xmldom/xmldom.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// Type definitions for xmldom 0.1.22
-// Project: https://github.com/jindw/xmldom.git
-// Definitions by: Qubo <https://github.com/tkqubo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "xmldom" {
-  namespace xmldom {
-    var DOMParser: DOMParserStatic;
-    var XMLSerializer: XMLSerializerStatic;
-
-    interface DOMParserStatic {
-      new(): DOMParser;
-      new(options: Options): DOMParser;
-    }
-
-    interface XMLSerializerStatic {
-      new(): XMLSerializer;
-    }
-
-    interface DOMParser {
-      parseFromString(xmlsource: string, mimeType?: string): Document;
-    }
-
-    interface XMLSerializer {
-      serializeToString(node: Node): string;
-    }
-
-    interface Options {
-      locator?: any;
-      errorHandler?: ErrorHandlerFunction|ErrorHandlerObject;
-    }
-
-    interface ErrorHandlerFunction {
-      (level: string, msg: any): any;
-    }
-
-    interface ErrorHandlerObject {
-      warning?: (msg: any) => any;
-      error?: (msg: any) => any;
-      fatalError?: (msg: any) => any;
-    }
-  }
-
-  export = xmldom;
-}
-
diff --git a/xmltojson/index.d.ts b/xmltojson/index.d.ts
new file mode 100644
index 0000000000..97fa5f824a
--- /dev/null
+++ b/xmltojson/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for xmltojson
+// Project: https://github.com/metatribal/xmlToJSON
+// Definitions by: Travis Crowe <https://github.com/traviscrowe>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+export = xmltojson;
+
+declare namespace xmltojson {
+    function grokType(sValue: any): any;
+    function parseString(xmlString: string, opt: Options): Object;
+    function parseXml(oXMLParent: Document, opt: Options): Object;
+    function xmlToString(xmlDoc: Document): string;
+    function stringToXml(xmlString: string): Document;
+
+    interface Options {
+        mergeCDATA?: boolean,
+        grokAttr?: boolean,
+        grokText?: boolean,
+        normalize?: boolean,
+        xmlns?: boolean,
+        namespaceKey?: string,
+        textKey?: string,
+        valueKey?: string,
+        attrKey?: string,
+        cdataKey?: string,
+        attrsAsObject?: boolean,
+        stripAttrPrefix?: boolean,
+        stripElemPrefix?: boolean,
+        childrenAsArray?: boolean
+    }
+}
diff --git a/xmltojson/tsconfig.json b/xmltojson/tsconfig.json
new file mode 100644
index 0000000000..1aa4fb0114
--- /dev/null
+++ b/xmltojson/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "xmltojson-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/xmltojson/xmltojson-tests.ts b/xmltojson/xmltojson-tests.ts
index f890936255..563ad656a3 100644
--- a/xmltojson/xmltojson-tests.ts
+++ b/xmltojson/xmltojson-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path='xmltojson.d.ts' />
 
 import * as xmltojson from 'xmltojson';
 
diff --git a/xmltojson/xmltojson.d.ts b/xmltojson/xmltojson.d.ts
deleted file mode 100644
index 0a18deb65d..0000000000
--- a/xmltojson/xmltojson.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// Type definitions for xmltojson
-// Project: https://github.com/metatribal/xmlToJSON
-// Definitions by: Travis Crowe <https://github.com/traviscrowe>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'xmltojson' {
-
-    export = xmltojson;
-
-    namespace xmltojson {
-        function grokType(sValue: any): any;
-        function parseString(xmlString: string, opt: Options): Object;
-        function parseXml(oXMLParent: Document, opt: Options): Object;
-        function xmlToString(xmlDoc: Document): string;
-        function stringToXml(xmlString: string): Document;
-
-        interface Options {
-            mergeCDATA?: boolean,
-            grokAttr?: boolean,
-            grokText?: boolean,
-            normalize?: boolean,
-            xmlns?: boolean,
-            namespaceKey?: string,
-            textKey?: string,
-            valueKey?: string,
-            attrKey?: string,
-            cdataKey?: string,
-            attrsAsObject?: boolean,
-            stripAttrPrefix?: boolean,
-            stripElemPrefix?: boolean,
-            childrenAsArray?: boolean
-        }
-    }
-}
diff --git a/xpath/xpath-tests.ts b/xpath/xpath-tests.ts
deleted file mode 100644
index 24e0eac1bf..0000000000
--- a/xpath/xpath-tests.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/// <reference path="xpath.d.ts" />
-
-import xpath = require('xpath');
-
-// A string of xml
-var xml: string;
-// an xpath query
-var xpathText: string;
-// a DOM
-var doc: Document;
-// xpath returns lists of Nodes that do not implement the NodeList interface;
-// they are merely arrays.
-var nodes: Array<Node>;
-var node: Node;
-var stringResult: string;
-var booleanResult: boolean;
-var numberResult: number;
-var expression: xpath.XPathExpression;
-var namespaceResolver: xpath.XPathNSResolver;
-var xpathResult: xpath.XPathResult;
-var length: number;
-
-xml = '<some>xml</some>';
-xpathText = '//this/is/an/xpath/query';
-doc = new DOMParser().parseFromString(xml, 'text/xml');
-nodes = xpath.select(xpathText, doc);
-node = xpath.select(xpathText, doc, true);
-nodes = xpath.select(xpathText, doc, false);
-
-node = xpath.select1(xpathText, doc);
-
-stringResult = xpath.select(xpathText, doc).toString();
-
-node = xpath.select(xpathText, doc)[0];
-
-var selectFn = xpath.useNamespaces({
-  'prefix': 'http://namespaceuri.com/nsfile'
-});
-nodes = selectFn(xpathText, doc);
-node = selectFn(xpathText, doc, true);
-nodes = selectFn(xpathText, doc, false);
-
-namespaceResolver = {
-  lookupNamespaceURI: function(prefix) {
-    return 'http://namespace.domain'
-  }
-};
-expression = xpath.createExpression(xpathText, namespaceResolver);
-xpathResult = expression.evaluate(doc, xpath.XPathResult.ANY_TYPE, null);
-xpathResult = expression.evaluate(doc, xpath.XPathResult.ANY_TYPE, xpathResult);
-xpathResult = expression.evaluate(doc, xpath.XPathResult.ANY_TYPE);
-booleanResult = xpathResult.booleanValue;
-numberResult = xpathResult.numberValue;
-stringResult = xpathResult.stringValue;
-node = xpathResult.singleNodeValue;
-node = xpathResult.iterateNext();
-node = xpathResult.snapshotItem(10);
-length = xpathResult.snapshotLength;
-
-var arrayOfNumbers: Array<Number> = [
-  xpath.XPathResult.ANY_TYPE,
-  xpath.XPathResult.NUMBER_TYPE,
-  xpath.XPathResult.STRING_TYPE,
-  xpath.XPathResult.BOOLEAN_TYPE,
-  xpath.XPathResult.UNORDERED_NODE_ITERATOR_TYPE,
-  xpath.XPathResult.ORDERED_NODE_ITERATOR_TYPE,
-  xpath.XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE,
-  xpath.XPathResult.ORDERED_NODE_SNAPSHOT_TYPE,
-  xpath.XPathResult.ANY_UNORDERED_NODE_TYPE,
-  xpath.XPathResult.FIRST_ORDERED_NODE_TYPE
-];
-
-namespaceResolver = xpath.createNSResolver(node);
-namespaceResolver = xpath.createNSResolver(doc);
-
-
diff --git a/xpath/xpath.d.ts b/xpath/xpath.d.ts
deleted file mode 100644
index 5f6b7d558f..0000000000
--- a/xpath/xpath.d.ts
+++ /dev/null
@@ -1,197 +0,0 @@
-// Type definitions for xpath v0.0.7
-// Project: https://github.com/goto100/xpath
-// Definitions by: Andrew Bradley <https://github.com/cspotcode/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Some documentation prose is copied from the XPath documentation at https://developer.mozilla.org.
-
-declare module 'xpath' {
-
-    // select1 can return any of: `Node`, `boolean`, `string`, `number`.
-    // select and selectWithResolver can return any of the above return types or `Array<Node>`.
-    // For this reason, their return types are `any`.
-
-    interface SelectFn {
-        /**
-         * Evaluate an XPath expression against a DOM node.  Returns the result as one of the following:
-         * * Array<Node>
-         * * Node
-         * * boolean
-         * * number
-         * * string
-         * @param xpathText
-         * @param contextNode
-         * @param single If true and the evaluation result is one or more Nodes, will return only the first Node instead of an Array<Node>
-         */
-        (xpathText: string, contextNode: Node, single?: boolean): any;
-    }
-
-    var select: SelectFn;
-
-    /**
-     * Evaluate an xpath expression against a DOM node, returning the first result only.
-     * Equivalent to `select(xpathText, contextNode, true)`
-     * @param xpathText
-     * @param contextNode
-     */
-    function select1(xpathText: string, contextNode: Node): any;
-
-    /**
-     * Evaluate an XPath expression against a DOM node using a given namespace resolver.  Returns the result as one of the following:
-     * * Array<Node>
-     * * Node
-     * * boolean
-     * * number
-     * * string
-     * @param xpathText
-     * @param contextNode
-     * @param resolver
-     * @param single If true and the evaluation result is one or more Nodes, will return only the first Node instead of an Array<Node>
-     */
-    function selectWithResolver(xpathText: string, contextNode: Node, resolver: XPathNSResolver, single?: boolean): any;
-
-    /**
-     * Evaluate an xpath expression against a DOM.
-     * @param xpathText xpath expression as a string.
-     * @param contextNode xpath expression is evaluated relative to this DOM node.
-     * @param resolver XML namespace resolver
-     * @param resultType
-     * @param result If non-null, xpath *may* reuse this XPathResult object instead of creating a new one.  However, it is not required to do so.
-     * @return XPathResult object containing the result of the expression.
-     */
-    function evaluate(xpathText: string, contextNode: Node, resolver: XPathNSResolver, resultType: number, result?: XPathResult): XPathResult;
-
-    /**
-     * Creates a `select` function that uses the given namespace prefix to URI mappings when evaluating queries.
-     * @param namespaceMappings an object mapping namespace prefixes to namespace URIs.  Each key is a prefix; each value is a URI.
-     * @return a function with the same signature as `xpath.select`
-     */
-    function useNamespaces(namespaceMappings: NamespaceMap): typeof select;
-    interface NamespaceMap {
-        [namespacePrefix: string]: string;
-    }
-
-    /**
-     * Compile an XPath expression into an XPathExpression which can be (repeatedly) evaluated against a DOM.
-     * @param xpathText XPath expression as a string
-     * @param namespaceURLMapper Namespace resolver
-     * @return compiled expression
-     */
-    function createExpression(xpathText: string, namespaceURLMapper: XPathNSResolver): XPathExpression;
-
-    /**
-     * Create an XPathNSResolver that resolves based on the information available in the context of a DOM node.
-     * @param node
-     */
-    function createNSResolver(node: Node): XPathNSResolver;
-
-    /**
-     * Result of evaluating an XPathExpression.
-     */
-    class XPathResult {
-        /**
-         * A result set containing whatever type naturally results from evaluation of the expression. Note that if the result is a node-set then UNORDERED_NODE_ITERATOR_TYPE is always the resulting type.
-         */
-        static ANY_TYPE: number;
-        /**
-         * A result containing a single number. This is useful for example, in an XPath expression using the count() function.
-         */
-        static NUMBER_TYPE: number;
-        /**
-         * A result containing a single string.
-         */
-        static STRING_TYPE: number;
-        /**
-         * A result containing a single boolean value. This is useful for example, in an XPath expression using the not() function.
-         */
-        static BOOLEAN_TYPE: number;
-        /**
-         * A result node-set containing all the nodes matching the expression. The nodes may not necessarily be in the same order that they appear in the document.
-         */
-        static UNORDERED_NODE_ITERATOR_TYPE: number;
-        /**
-         * A result node-set containing all the nodes matching the expression. The nodes in the result set are in the same order that they appear in the document.
-         */
-        static ORDERED_NODE_ITERATOR_TYPE: number;
-        /**
-         * A result node-set containing snapshots of all the nodes matching the expression. The nodes may not necessarily be in the same order that they appear in the document.
-         */
-        static UNORDERED_NODE_SNAPSHOT_TYPE: number;
-        /**
-         * A result node-set containing snapshots of all the nodes matching the expression. The nodes in the result set are in the same order that they appear in the document.
-         */
-        static ORDERED_NODE_SNAPSHOT_TYPE: number;
-        /**
-         * A result node-set containing any single node that matches the expression. The node is not necessarily the first node in the document that matches the expression.
-         */
-        static ANY_UNORDERED_NODE_TYPE: number;
-        /**
-         * A result node-set containing the first node in the document that matches the expression.
-         */
-        static FIRST_ORDERED_NODE_TYPE: number;
-
-        /**
-         * Type of this result.  It is one of the enumerated result types.
-         */
-        resultType: number;
-
-        /**
-         * Returns the next node in this result, if this result is one of the _ITERATOR_ result types.
-         */
-        iterateNext(): Node;
-
-        /**
-         * returns the result node for a given index, if this result is one of the _SNAPSHOT_ result types.
-         * @param index
-         */
-        snapshotItem(index: number): Node;
-
-        /**
-         * Number of nodes in this result, if this result is one of the _SNAPSHOT_ result types.
-         */
-        snapshotLength: number;
-
-        /**
-         * Value of this result, if it is a BOOLEAN_TYPE result.
-         */
-        booleanValue: boolean;
-        /**
-         * Value of this result, if it is a NUMBER_TYPE result.
-         */
-        numberValue: number;
-        /**
-         * Value of this result, if it is a STRING_TYPE result.
-         */
-        stringValue: string;
-
-        /**
-         * Value of this result, if it is a FIRST_ORDERED_NODE_TYPE result.
-         */
-        singleNodeValue: Node;
-    }
-
-    /**
-     * A compiled XPath expression, ready to be (repeatedly) evaluated against a DOM node.
-     */
-    interface XPathExpression {
-        /**
-         * evaluate this expression against a DOM node.
-         * @param contextNode
-         * @param resultType
-         * @param result
-         */
-        evaluate(contextNode: Node, resultType: number, result?: XPathResult): XPathResult;
-    }
-
-    /**
-     * Object that can resolve XML namespace prefixes to namespace URIs.
-     */
-    interface XPathNSResolver {
-        /**
-         * Given an XML namespace prefix, returns the corresponding XML namespace URI.
-         * @param prefix XML namespace prefix
-         * @return XML namespace URI
-         */
-        lookupNamespaceURI(prefix: string): string;
-    }
-}
diff --git a/xregexp/index.d.ts b/xregexp/index.d.ts
new file mode 100644
index 0000000000..918c13e0b6
--- /dev/null
+++ b/xregexp/index.d.ts
@@ -0,0 +1,135 @@
+// Type definitions for XRegExp 3.0.0
+// Project: http://xregexp.com
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>,
+//                 Johannes Fahrenkrug <https://github.com/jfahrenkrug>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+declare function OuterXRegExp(pattern: string, flags?: string): RegExp;
+declare function OuterXRegExp(pattern: RegExp): RegExp;
+
+declare namespace OuterXRegExp {
+    // scopes: 'default', 'class', or 'all'
+    /*
+     Native flags:
+     g - global
+     i - ignore case
+     m - multiline anchors
+     y - sticky (Firefox 3+)
+     Additional XRegExp flags:
+     n - explicit capture
+     s - dot matches all (aka singleline)
+     x - free-spacing and line comments (aka extended)
+     */
+    interface TokenOpts {
+        scope?: string;
+        trigger?: () => boolean;
+        customFlags?: string;
+    }
+
+    function XRegExp(pattern: string, flags?: string): RegExp;
+    function XRegExp(pattern: RegExp): RegExp;
+
+    /* Since xregexp 3.0.0 can be used either via
+
+            import X = require('xregexp');
+            X();
+
+        or via
+
+            import XRegExp = X.XRegExp;
+            XRegExp()
+
+        I had to duplicate the function declarations. I could simply not
+        find another way to accomplish this with TypeScript.
+    */
+
+    // begin API definitions
+    function addToken(regex: RegExp, handler: (matchArr: RegExpExecArray, scope: string) => string, options?: TokenOpts): void;
+
+    function build(pattern: string, subs: string[], flags?: string): RegExp;
+    function cache(pattern: string, flags?: string): RegExp;
+    function escape(str: string): string;
+    function exec(str: string, regex: RegExp, pos?: number, sticky?: boolean): RegExpExecArray;
+    function forEach(str: string, regex: RegExp, callback: (matchArr: RegExpExecArray, index: number, input: string, regexp: RegExp) => void): any;
+    function globalize(regex: RegExp): RegExp;
+
+    function install(options: string): void;
+    function install(options: Object): void;
+
+    function isInstalled(feature: string): boolean;
+    function isRegExp(value: any): boolean;
+    function match(str: string, regex: RegExp, scope: string): any;
+    function match(str: string, regex: RegExp, scope: "one"): string;
+    function match(str: string, regex: RegExp, scope: "all"): string[];
+    function match(str: string, regex: RegExp): string[];
+    function matchChain(str: string, chain: RegExp[]): string[];
+    function matchChain(str: string, chain: { regex: RegExp; backref: string }[]): string[];
+    function matchChain(str: string, chain: { regex: RegExp; backref: number }[]): string[];
+    function matchRecursive(str: string, left: string, right: string, flags?: string, options?: Object): string[];
+
+    function replace(str: string, search: string, replacement: string, scope?: string): string;
+    function replace(str: string, search: string, replacement: Function, scope?: string): string;
+    function replace(str: string, search: RegExp, replacement: string, scope?: string): string;
+    function replace(str: string, search: RegExp, replacement: Function, scope?: string): string;
+    function replaceEach(str: string, replacements: Array<RegExp | string>[]): string;
+
+    function split(str: string, separator: string, limit?: number): string[];
+    function split(str: string, separator: RegExp, limit?: number): string[];
+
+    function test(str: string, regex: RegExp, pos?: number, sticky?: boolean): boolean;
+
+    function uninstall(options: Object): void;
+    function uninstall(options: string): void;
+
+    function union(patterns: string[], flags?: string): RegExp;
+    var version: string;
+    // end API definitions
+
+    namespace XRegExp {
+        // begin API definitions
+        function addToken(regex: RegExp, handler: (matchArr: RegExpExecArray, scope: string) => string, options?: TokenOpts): void;
+
+        function build(pattern: string, subs: string[], flags?: string): RegExp;
+        function cache(pattern: string, flags?: string): RegExp;
+        function escape(str: string): string;
+        function exec(str: string, regex: RegExp, pos?: number, sticky?: boolean): RegExpExecArray;
+        function forEach(str: string, regex: RegExp, callback: (matchArr: RegExpExecArray, index: number, input: string, regexp: RegExp) => void): any;
+        function globalize(regex: RegExp): RegExp;
+
+        function install(options: string): void;
+        function install(options: Object): void;
+
+        function isInstalled(feature: string): boolean;
+        function isRegExp(value: any): boolean;
+        function match(str: string, regex: RegExp, scope: string): any;
+        function match(str: string, regex: RegExp, scope: "one"): string;
+        function match(str: string, regex: RegExp, scope: "all"): string[];
+        function match(str: string, regex: RegExp): string[];
+        function matchChain(str: string, chain: RegExp[]): string[];
+        function matchChain(str: string, chain: { regex: RegExp; backref: string }[]): string[];
+        function matchChain(str: string, chain: { regex: RegExp; backref: number }[]): string[];
+        function matchRecursive(str: string, left: string, right: string, flags?: string, options?: Object): string[];
+
+        function replace(str: string, search: string, replacement: string, scope?: string): string;
+        function replace(str: string, search: string, replacement: Function, scope?: string): string;
+        function replace(str: string, search: RegExp, replacement: string, scope?: string): string;
+        function replace(str: string, search: RegExp, replacement: Function, scope?: string): string;
+        function replaceEach(str: string, replacements: Array<RegExp | string>[]): string;
+
+        function split(str: string, separator: string, limit?: number): string[];
+        function split(str: string, separator: RegExp, limit?: number): string[];
+
+        function test(str: string, regex: RegExp, pos?: number, sticky?: boolean): boolean;
+
+        function uninstall(options: Object): void;
+        function uninstall(options: string): void;
+
+        function union(patterns: string[], flags?: string): RegExp;
+        var version: string;
+        // end API definitions
+    }
+}
+
+export = OuterXRegExp;
diff --git a/xregexp/tsconfig.json b/xregexp/tsconfig.json
new file mode 100644
index 0000000000..1a50c990c6
--- /dev/null
+++ b/xregexp/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "xregexp-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/xregexp/xregexp-tests.ts b/xregexp/xregexp-tests.ts
index 17e1d6bdfa..b7328e5d12 100644
--- a/xregexp/xregexp-tests.ts
+++ b/xregexp/xregexp-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="xregexp.d.ts" />
 
 import X = require('xregexp');
 import XRegExp = X.XRegExp;
diff --git a/xregexp/xregexp.d.ts b/xregexp/xregexp.d.ts
deleted file mode 100644
index a44bd4634f..0000000000
--- a/xregexp/xregexp.d.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-// Type definitions for XRegExp 3.0.0
-// Project: http://xregexp.com
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>,
-//                 Johannes Fahrenkrug <https://github.com/jfahrenkrug>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'xregexp' {
-
-	function OuterXRegExp(pattern: string, flags?: string): RegExp;
-	function OuterXRegExp(pattern: RegExp): RegExp;
-
-	namespace OuterXRegExp {
-		// scopes: 'default', 'class', or 'all'
-		/*
-		 Native flags:
-		 g - global
-		 i - ignore case
-		 m - multiline anchors
-		 y - sticky (Firefox 3+)
-		 Additional XRegExp flags:
-		 n - explicit capture
-		 s - dot matches all (aka singleline)
-		 x - free-spacing and line comments (aka extended)
-		 */
-		interface TokenOpts {
-			scope?: string;
-			trigger?: () => boolean;
-			customFlags?: string;
-		}
-
-		function XRegExp(pattern: string, flags?: string): RegExp;
-		function XRegExp(pattern: RegExp): RegExp;
-
-		/* Since xregexp 3.0.0 can be used either via
-
-				import X = require('xregexp');
-				X();
-
-			or via
-
-				import XRegExp = X.XRegExp;
-				XRegExp()
-
-			I had to duplicate the function declarations. I could simply not
-			find another way to accomplish this with TypeScript.
-		*/
-
-		// begin API definitions
-		function addToken(regex: RegExp, handler: (matchArr: RegExpExecArray, scope: string) => string, options?: TokenOpts): void;
-
-		function build(pattern: string, subs: string[], flags?: string): RegExp;
-		function cache(pattern: string, flags?: string): RegExp;
-		function escape(str: string): string;
-		function exec(str: string, regex: RegExp, pos?: number, sticky?: boolean): RegExpExecArray;
-		function forEach(str: string, regex: RegExp, callback: (matchArr: RegExpExecArray, index: number, input: string, regexp: RegExp) => void): any;
-		function globalize(regex: RegExp): RegExp;
-
-		function install(options: string): void;
-		function install(options: Object): void;
-
-		function isInstalled(feature: string): boolean;
-		function isRegExp(value: any): boolean;
-		function match(str: string, regex: RegExp, scope: string): any;
-		function match(str: string, regex: RegExp, scope: "one"): string;
-		function match(str: string, regex: RegExp, scope: "all"): string[];
-		function match(str: string, regex: RegExp): string[];
-		function matchChain(str: string, chain: RegExp[]): string[];
-		function matchChain(str: string, chain: { regex: RegExp; backref: string }[]): string[];
-		function matchChain(str: string, chain: { regex: RegExp; backref: number }[]): string[];
-		function matchRecursive(str: string, left: string, right: string, flags?: string, options?: Object): string[];
-
-		function replace(str: string, search: string, replacement: string, scope?: string): string;
-		function replace(str: string, search: string, replacement: Function, scope?: string): string;
-		function replace(str: string, search: RegExp, replacement: string, scope?: string): string;
-		function replace(str: string, search: RegExp, replacement: Function, scope?: string): string;
-		function replaceEach(str: string, replacements: Array<RegExp|string>[]): string;
-
-		function split(str: string, separator: string, limit?: number): string[];
-		function split(str: string, separator: RegExp, limit?: number): string[];
-
-		function test(str: string, regex: RegExp, pos?: number, sticky?: boolean): boolean;
-
-		function uninstall(options: Object): void;
-		function uninstall(options: string): void;
-
-		function union(patterns: string[], flags?: string): RegExp;
-		var version: string;
-		// end API definitions
-
-		namespace XRegExp {
-			// begin API definitions
-			function addToken(regex: RegExp, handler: (matchArr: RegExpExecArray, scope: string) => string, options?: TokenOpts): void;
-
-			function build(pattern: string, subs: string[], flags?: string): RegExp;
-			function cache(pattern: string, flags?: string): RegExp;
-			function escape(str: string): string;
-			function exec(str: string, regex: RegExp, pos?: number, sticky?: boolean): RegExpExecArray;
-			function forEach(str: string, regex: RegExp, callback: (matchArr: RegExpExecArray, index: number, input: string, regexp: RegExp) => void): any;
-			function globalize(regex: RegExp): RegExp;
-
-			function install(options: string): void;
-			function install(options: Object): void;
-
-			function isInstalled(feature: string): boolean;
-			function isRegExp(value: any): boolean;
-			function match(str: string, regex: RegExp, scope: string): any;
-			function match(str: string, regex: RegExp, scope: "one"): string;
-			function match(str: string, regex: RegExp, scope: "all"): string[];
-			function match(str: string, regex: RegExp): string[];
-			function matchChain(str: string, chain: RegExp[]): string[];
-			function matchChain(str: string, chain: { regex: RegExp; backref: string }[]): string[];
-			function matchChain(str: string, chain: { regex: RegExp; backref: number }[]): string[];
-			function matchRecursive(str: string, left: string, right: string, flags?: string, options?: Object): string[];
-
-			function replace(str: string, search: string, replacement: string, scope?: string): string;
-			function replace(str: string, search: string, replacement: Function, scope?: string): string;
-			function replace(str: string, search: RegExp, replacement: string, scope?: string): string;
-			function replace(str: string, search: RegExp, replacement: Function, scope?: string): string;
-			function replaceEach(str: string, replacements: Array<RegExp|string>[]): string;
-
-			function split(str: string, separator: string, limit?: number): string[];
-			function split(str: string, separator: RegExp, limit?: number): string[];
-
-			function test(str: string, regex: RegExp, pos?: number, sticky?: boolean): boolean;
-
-			function uninstall(options: Object): void;
-			function uninstall(options: string): void;
-
-			function union(patterns: string[], flags?: string): RegExp;
-			var version: string;
-			// end API definitions
-		}
-	}
-
-	export = OuterXRegExp;
-}
diff --git a/xrm/xrm.d.ts b/xrm/index.d.ts
similarity index 100%
rename from xrm/xrm.d.ts
rename to xrm/index.d.ts
diff --git a/xrm/parature.d.ts b/xrm/parature.d.ts
index f1c7b918a9..ed9c07921b 100644
--- a/xrm/parature.d.ts
+++ b/xrm/parature.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: David Berry <https://github.com/6ix4our/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="xrm.d.ts" />
+
 
 declare namespace Xrm.Page
 {
diff --git a/xrm/tsconfig.json b/xrm/tsconfig.json
new file mode 100644
index 0000000000..d1d13d2555
--- /dev/null
+++ b/xrm/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "xrm-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/xrm/xrm-6.tests.ts b/xrm/xrm-6.tests.ts
index 26f467b5b0..3b911da94d 100644
--- a/xrm/xrm-6.tests.ts
+++ b/xrm/xrm-6.tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="xrm-6.d.ts" />
+
 
 function _getContext()
 {
diff --git a/xrm/xrm-7.0.tests.ts b/xrm/xrm-7.0.tests.ts
index dc93ae237b..f45f49c20c 100644
--- a/xrm/xrm-7.0.tests.ts
+++ b/xrm/xrm-7.0.tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="xrm-7.0.d.ts" />
+
 
 function _getContext()
 {
diff --git a/xrm/xrm-tests.ts b/xrm/xrm-tests.ts
index 4dfb8e4090..3af8788b1f 100644
--- a/xrm/xrm-tests.ts
+++ b/xrm/xrm-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="xrm.d.ts" />
-/// <reference path="parature.d.ts" />
+
+
 
 /// Demonstrate usage in the browser's window object
 
diff --git a/xsockets/XSockets-tests.ts b/xsockets/XSockets-tests.ts
index 0b65bf9078..7bd57b10fc 100644
--- a/xsockets/XSockets-tests.ts
+++ b/xsockets/XSockets-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="XSockets.d.ts" />
+
 
 var conn = new XSockets.WebSocket('ws://localhost:4502/Generic');
 
@@ -49,7 +49,7 @@ conn.publish(XSockets.Events.storage.set, {
 conn.publish(XSockets.Events.storage.remove, {Key: 'yourKey'});
 
 conn.on(XSockets.Events.storage.getAll, function (data) {
-    data.forEach(function (item) {
+    data.forEach(function (item: any) {
         console.log(item);
     });
 });
diff --git a/xsockets/XSockets-tests.ts.tscparams b/xsockets/XSockets-tests.ts.tscparams
deleted file mode 100644
index 8b13789179..0000000000
--- a/xsockets/XSockets-tests.ts.tscparams
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/xsockets/XSockets.d.ts b/xsockets/index.d.ts
similarity index 100%
rename from xsockets/XSockets.d.ts
rename to xsockets/index.d.ts
diff --git a/xsockets/tsconfig.json b/xsockets/tsconfig.json
new file mode 100644
index 0000000000..79e701d018
--- /dev/null
+++ b/xsockets/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "xsockets-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/xss-filters/xss-filters.d.ts b/xss-filters/index.d.ts
similarity index 100%
rename from xss-filters/xss-filters.d.ts
rename to xss-filters/index.d.ts
diff --git a/xss-filters/tsconfig.json b/xss-filters/tsconfig.json
new file mode 100644
index 0000000000..fc16c41d42
--- /dev/null
+++ b/xss-filters/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "xss-filters-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/xss-filters/xss-filters-tests.ts b/xss-filters/xss-filters-tests.ts
index 49a566efc5..d8659d1fa0 100644
--- a/xss-filters/xss-filters-tests.ts
+++ b/xss-filters/xss-filters-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="./xss-filters.d.ts" />
+
 
 import xssFilters = require('xss-filters');
 
diff --git a/yamljs/index.d.ts b/yamljs/index.d.ts
new file mode 100644
index 0000000000..3a3e645d45
--- /dev/null
+++ b/yamljs/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for yamljs 0.2.3
+// Project: https://github.com/jeremyfa/yaml.js
+// Definitions by: Tim Jonischkat <http://www.tim-jonischkat.de>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace YAML;
+export = YAML;
+
+declare namespace YAML {
+    function load(path: string): any;
+
+    function stringify(nativeObject: any, inline?: number, spaces?: number): string;
+
+    function parse(yamlString: string): any;
+}
diff --git a/yamljs/tsconfig.json b/yamljs/tsconfig.json
new file mode 100644
index 0000000000..3faa2cfce0
--- /dev/null
+++ b/yamljs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "yamljs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/yamljs/yamljs-tests.ts b/yamljs/yamljs-tests.ts
index 7d4080b33e..e0662f8045 100644
--- a/yamljs/yamljs-tests.ts
+++ b/yamljs/yamljs-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="yamljs.d.ts" />
-
 import yamljs = require('yamljs');
 
 yamljs.load('yaml-testfile.yml');
diff --git a/yamljs/yamljs.d.ts b/yamljs/yamljs.d.ts
deleted file mode 100644
index c98e950ae6..0000000000
--- a/yamljs/yamljs.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Type definitions for yamljs 0.2.3
-// Project: https://github.com/jeremyfa/yaml.js
-// Definitions by: Tim Jonischkat <http://www.tim-jonischkat.de>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace YAML {
-    function load(path: string): any;
-
-    function stringify(nativeObject: any, inline?: number, spaces?: number): string;
-
-    function parse(yamlString: string): any;
-}
-
-declare module "yamljs" {
-    export = YAML;
-}
diff --git a/yandex-money-sdk/index.d.ts b/yandex-money-sdk/index.d.ts
new file mode 100644
index 0000000000..b306c50220
--- /dev/null
+++ b/yandex-money-sdk/index.d.ts
@@ -0,0 +1,308 @@
+// Type definitions for NodeJS Yandex.Money API SDK
+// Project: https://github.com/yandex-money/yandex-money-sdk-nodejs
+// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare namespace YandexMoneySDK {
+	namespace Wallet {
+		interface GetAccessTokenResult {
+			access_token?: string;
+			error?: string;
+		}
+
+		interface SendAuthenticatedRequestParams {
+			headers?: any;
+			data?: any;
+			url: string;
+		}
+
+		interface AccountInfoResult {
+			account: string;
+			balance: number;
+			currency: string;
+			account_status: string;
+			account_type: string;
+			avatar?: {
+				url: string;
+				ts: string;
+			};
+			balance_details?: {
+				total: number;
+				available: number;
+				deposition_pending?: number;
+				blocked?: number;
+				debt?: number;
+				hold?: number;
+			}
+			cards_linked?: {
+				pan_fragment?: string;
+				type?: string;
+			}[];
+		}
+
+		interface OperationHistoryOptions {
+			type: string;
+			label: string;
+			from?: string|Date;
+			till?: string|Date;
+			start_record?: string;
+			records?: number;
+			details?: boolean;
+		}
+
+		interface OperationHistoryResult {
+			error?: string;
+			next_record?: string;
+			operations?: {
+				operation_id: string;
+				status: string;
+				datetime: string;
+				title: string;
+				pattern_id?: string;
+				direction: string;
+				amount: number;
+				label?: string;
+				type?: string;
+			}[];
+		}
+
+		interface OperationDetailsResult {
+			error?: string;
+			operation_id?: string;
+			status?: string;
+			pattern_id?: string;
+			direction?: string;
+			amount?: number;
+			amount_due?: number;
+			fee?: number;
+			datetime?: string;
+			title?: string;
+			sender?: string;
+			recipient?: string;
+			recipient_type?: string;
+			message?: string;
+			comment?: string;
+			codepro?: boolean;
+			protection_code?: string;
+			expires?: string;
+			answer_datetime?: string;
+			label?: string;
+			details?: string;
+			type?: string;
+			digital_goods?: {
+				article: {
+					merchantArticleId: string;
+					serial: string;
+					secret: string;
+				}[];
+				bonus: {
+					serial: string;
+					secret: string;
+				}[];
+			};
+		}
+
+		interface RequestPaymentOptions {
+			pattern_id: string;
+			to?: string;
+			amount?: number;
+			amount_due?: number;
+			comment?: string;
+			message?: string;
+			label?: string;
+			codepro?: boolean;
+			hold_for_pickup?: boolean;
+			expire_period?: number;
+			'phone-number'?: string;
+			[key: string]: any
+
+			test_payment?: boolean;
+			test_card?: string;
+			test_result?: string;
+		}
+
+		interface RequestPaymentResult {
+			status: string;
+			error?: string;
+			money_source?: {
+				wallet?: {
+					allowed: boolean;
+				};
+				cards?: {
+					allowed: boolean;
+					csc_required: boolean;
+					items: {
+						id: string;
+						pan_fragment: string;
+						type: string;
+					}[];
+				};
+			};
+			request_id?: string;
+			contract_amount?: number;
+			balance?: number;
+			recipient_account_status?: string;
+			recipient_account_type?: string;
+			protection_code?: string;
+			account_unblock_uri?: string;
+			ext_action_uri?: string;
+		}
+
+		interface ProcessPaymentOptions {
+			request_id: string;
+			money_source?: string;
+			csc?: string;
+			ext_auth_success_uri?: string;
+			ext_auth_fail_uri?: string;
+
+			test_payment?: boolean;
+			test_card?: string;
+			test_result?: string;
+		}
+
+		interface ProcessPaymentResult {
+			status: string;
+			error?: string;
+			payment_id?: string;
+			balance?: number;
+			invoice_id?: string;
+			payer?: string;
+			payee?: string;
+			credit_amount?: number;
+			account_unblock_uri?: string;
+			hold_for_pickup_link?: string;
+			acs_uri?: string;
+			acs_params?: {
+				MD: string;
+				PaReq: string;
+				[key: string]: any
+			};
+			next_retry?: number;
+			digital_goods?: {
+				article: {
+					merchantArticleId: string;
+					serial: string;
+					secret: string;
+				}[];
+				bonus: {
+					serial: string;
+					secret: string;
+				}[];
+			};
+		}
+
+		interface IncomingTransferAcceptResult {
+			status: string;
+			error?: string;
+			protection_code_attempts_available?: number;
+			ext_action_uri?: string;
+		}
+
+		interface IncomingTransferRejectResult {
+			status: string;
+			error?: string;
+		}
+	}
+
+	namespace ExternalPayment {
+		interface GetInstanceIdResult {
+			status: string;
+			error?: string;
+			instance_id?: string;
+		}
+
+		interface RequestOptions {
+			pattern_id: string;
+			// instance_id: string; // the method always overwrites this value
+			to?: string;
+			amount?: number;
+			amount_due?: number;
+			message?: string;
+			[key: string]: any;
+		}
+
+		interface RequestResult {
+			status: string;
+			error?: string;
+			request_id?: string;
+			contract_amount?: number;
+			title?: string;
+		}
+
+		interface ProcessOptions {
+			request_id: string;
+			// instance_id: string; // the method always overwrites this value
+			ext_auth_success_uri: string;
+			ext_auth_fail_uri: string;
+			request_token?: boolean;
+			money_source_token?: string;
+			csc?: string;
+		}
+
+		interface ProcessResult {
+			status: string;
+			error?: string;
+			acs_uri?: string;
+			acs_params?: {
+				MD: string;
+				PaReq: string;
+				[key: string]: any
+			};
+			money_source?: {
+				type: string;
+				payment_card_type: string;
+				pan_fragment?: string;
+				money_source_token?: string;
+			};
+			next_retry?: number;
+			invoice_id?: string;
+		}
+	}
+}
+
+declare module "yandex-money-sdk" {
+	import * as http from 'http';
+
+	export interface ResponseCallback<TBody> {
+		(err: any, body: TBody, response: http.IncomingMessage): any;
+	}
+
+	export interface WalletStatic {
+		new (accessToken: string): Wallet;
+		buildObtainTokenUrl(clientId: string, redirectURI: string, scope: string[]): string;
+		getAccessToken(clientId: string, code: string, redirectURI: string, clientSecret: string, callback: ResponseCallback<YandexMoneySDK.Wallet.GetAccessTokenResult>): void;
+		revokeToken(token: string, revoke_all: any, callback: ResponseCallback<any>): void; // revoke_all missing in documentation
+	}
+
+	export interface Wallet {
+		sendAuthenticatedRequest(params: YandexMoneySDK.Wallet.SendAuthenticatedRequestParams, callback: ResponseCallback<any>): void;
+		accountInfo(callback: ResponseCallback<YandexMoneySDK.Wallet.AccountInfoResult>): void;
+		operationHistory(options: YandexMoneySDK.Wallet.OperationHistoryOptions, callback: ResponseCallback<YandexMoneySDK.Wallet.OperationHistoryResult>): void;
+		operationDetails(operation_id: string, callback: ResponseCallback<YandexMoneySDK.Wallet.OperationDetailsResult>): void;
+		requestPayment(options: YandexMoneySDK.Wallet.RequestPaymentOptions, callback: ResponseCallback<YandexMoneySDK.Wallet.RequestPaymentResult>): void;
+		processPayment(options: YandexMoneySDK.Wallet.ProcessPaymentOptions, callback: ResponseCallback<YandexMoneySDK.Wallet.ProcessPaymentResult>): void;
+		incomingTransferAccept(operation_id: string, protectionCode: string, callback: ResponseCallback<YandexMoneySDK.Wallet.IncomingTransferAcceptResult>): void;
+		incomingTransferReject(operation_id: string, callback: ResponseCallback<YandexMoneySDK.Wallet.IncomingTransferRejectResult>): void;
+	}
+
+	export interface ExternalPaymentStatic {
+		new (instanceId: string): ExternalPayment;
+		getInstanceId(clientId: string, callback: ResponseCallback<YandexMoneySDK.ExternalPayment.GetInstanceIdResult>): void;
+	}
+
+	export interface ExternalPayment {
+		request(options: YandexMoneySDK.ExternalPayment.RequestOptions, callback: ResponseCallback<YandexMoneySDK.ExternalPayment.RequestResult>): void;
+		process(options: YandexMoneySDK.ExternalPayment.ProcessOptions, callback: ResponseCallback<YandexMoneySDK.ExternalPayment.ProcessResult>): void;
+	}
+
+	export interface Config {
+		MONEY_URL: string;
+		SP_MONEY_URL: string;
+	}
+
+	export var Wallet: WalletStatic;
+	export var ExternalPayment: ExternalPaymentStatic;
+	export var Config: Config;
+}
diff --git a/yandex-money-sdk/tsconfig.json b/yandex-money-sdk/tsconfig.json
new file mode 100644
index 0000000000..ef3f392516
--- /dev/null
+++ b/yandex-money-sdk/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "yandex-money-sdk-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/yandex-money-sdk/yandex-money-sdk-tests.ts b/yandex-money-sdk/yandex-money-sdk-tests.ts
index 9641fdf480..b47c9f2db2 100644
--- a/yandex-money-sdk/yandex-money-sdk-tests.ts
+++ b/yandex-money-sdk/yandex-money-sdk-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="../yandex-money-sdk/yandex-money-sdk.d.ts" />
-
 import * as ymsdk from 'yandex-money-sdk';
 
 let wallet: ymsdk.Wallet;
diff --git a/yandex-money-sdk/yandex-money-sdk.d.ts b/yandex-money-sdk/yandex-money-sdk.d.ts
deleted file mode 100644
index 9fac8c5f91..0000000000
--- a/yandex-money-sdk/yandex-money-sdk.d.ts
+++ /dev/null
@@ -1,308 +0,0 @@
-// Type definitions for NodeJS Yandex.Money API SDK
-// Project: https://github.com/yandex-money/yandex-money-sdk-nodejs
-// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../node/node.d.ts" />
-
-declare namespace YandexMoneySDK {
-	namespace Wallet {
-		interface GetAccessTokenResult {
-			access_token?: string;
-			error?: string;
-		}
-
-		interface SendAuthenticatedRequestParams {
-			headers?: any;
-			data?: any;
-			url: string;
-		}
-
-		interface AccountInfoResult {
-			account: string;
-			balance: number;
-			currency: string;
-			account_status: string;
-			account_type: string;
-			avatar?: {
-				url: string;
-				ts: string;
-			};
-			balance_details?: {
-				total: number;
-				available: number;
-				deposition_pending?: number;
-				blocked?: number;
-				debt?: number;
-				hold?: number;
-			}
-			cards_linked?: {
-				pan_fragment?: string;
-				type?: string;
-			}[];
-		}
-
-		interface OperationHistoryOptions {
-			type: string;
-			label: string;
-			from?: string|Date;
-			till?: string|Date;
-			start_record?: string;
-			records?: number;
-			details?: boolean;
-		}
-
-		interface OperationHistoryResult {
-			error?: string;
-			next_record?: string;
-			operations?: {
-				operation_id: string;
-				status: string;
-				datetime: string;
-				title: string;
-				pattern_id?: string;
-				direction: string;
-				amount: number;
-				label?: string;
-				type?: string;
-			}[];
-		}
-
-		interface OperationDetailsResult {
-			error?: string;
-			operation_id?: string;
-			status?: string;
-			pattern_id?: string;
-			direction?: string;
-			amount?: number;
-			amount_due?: number;
-			fee?: number;
-			datetime?: string;
-			title?: string;
-			sender?: string;
-			recipient?: string;
-			recipient_type?: string;
-			message?: string;
-			comment?: string;
-			codepro?: boolean;
-			protection_code?: string;
-			expires?: string;
-			answer_datetime?: string;
-			label?: string;
-			details?: string;
-			type?: string;
-			digital_goods?: {
-				article: {
-					merchantArticleId: string;
-					serial: string;
-					secret: string;
-				}[];
-				bonus: {
-					serial: string;
-					secret: string;
-				}[];
-			};
-		}
-
-		interface RequestPaymentOptions {
-			pattern_id: string;
-			to?: string;
-			amount?: number;
-			amount_due?: number;
-			comment?: string;
-			message?: string;
-			label?: string;
-			codepro?: boolean;
-			hold_for_pickup?: boolean;
-			expire_period?: number;
-			'phone-number'?: string;
-			[key: string]: any
-
-			test_payment?: boolean;
-			test_card?: string;
-			test_result?: string;
-		}
-
-		interface RequestPaymentResult {
-			status: string;
-			error?: string;
-			money_source?: {
-				wallet?: {
-					allowed: boolean;
-				};
-				cards?: {
-					allowed: boolean;
-					csc_required: boolean;
-					items: {
-						id: string;
-						pan_fragment: string;
-						type: string;
-					}[];
-				};
-			};
-			request_id?: string;
-			contract_amount?: number;
-			balance?: number;
-			recipient_account_status?: string;
-			recipient_account_type?: string;
-			protection_code?: string;
-			account_unblock_uri?: string;
-			ext_action_uri?: string;
-		}
-
-		interface ProcessPaymentOptions {
-			request_id: string;
-			money_source?: string;
-			csc?: string;
-			ext_auth_success_uri?: string;
-			ext_auth_fail_uri?: string;
-
-			test_payment?: boolean;
-			test_card?: string;
-			test_result?: string;
-		}
-
-		interface ProcessPaymentResult {
-			status: string;
-			error?: string;
-			payment_id?: string;
-			balance?: number;
-			invoice_id?: string;
-			payer?: string;
-			payee?: string;
-			credit_amount?: number;
-			account_unblock_uri?: string;
-			hold_for_pickup_link?: string;
-			acs_uri?: string;
-			acs_params?: {
-				MD: string;
-				PaReq: string;
-				[key: string]: any
-			};
-			next_retry?: number;
-			digital_goods?: {
-				article: {
-					merchantArticleId: string;
-					serial: string;
-					secret: string;
-				}[];
-				bonus: {
-					serial: string;
-					secret: string;
-				}[];
-			};
-		}
-
-		interface IncomingTransferAcceptResult {
-			status: string;
-			error?: string;
-			protection_code_attempts_available?: number;
-			ext_action_uri?: string;
-		}
-
-		interface IncomingTransferRejectResult {
-			status: string;
-			error?: string;
-		}
-	}
-
-	namespace ExternalPayment {
-		interface GetInstanceIdResult {
-			status: string;
-			error?: string;
-			instance_id?: string;
-		}
-
-		interface RequestOptions {
-			pattern_id: string;
-			// instance_id: string; // the method always overwrites this value
-			to?: string;
-			amount?: number;
-			amount_due?: number;
-			message?: string;
-			[key: string]: any;
-		}
-
-		interface RequestResult {
-			status: string;
-			error?: string;
-			request_id?: string;
-			contract_amount?: number;
-			title?: string;
-		}
-
-		interface ProcessOptions {
-			request_id: string;
-			// instance_id: string; // the method always overwrites this value
-			ext_auth_success_uri: string;
-			ext_auth_fail_uri: string;
-			request_token?: boolean;
-			money_source_token?: string;
-			csc?: string;
-		}
-
-		interface ProcessResult {
-			status: string;
-			error?: string;
-			acs_uri?: string;
-			acs_params?: {
-				MD: string;
-				PaReq: string;
-				[key: string]: any
-			};
-			money_source?: {
-				type: string;
-				payment_card_type: string;
-				pan_fragment?: string;
-				money_source_token?: string;
-			};
-			next_retry?: number;
-			invoice_id?: string;
-		}
-	}
-}
-
-declare module "yandex-money-sdk" {
-	import * as http from 'http';
-
-	export interface ResponseCallback<TBody> {
-		(err: any, body: TBody, response: http.IncomingMessage): any;
-	}
-
-	export interface WalletStatic {
-		new (accessToken: string): Wallet;
-		buildObtainTokenUrl(clientId: string, redirectURI: string, scope: string[]): string;
-		getAccessToken(clientId: string, code: string, redirectURI: string, clientSecret: string, callback: ResponseCallback<YandexMoneySDK.Wallet.GetAccessTokenResult>): void;
-		revokeToken(token: string, revoke_all: any, callback: ResponseCallback<any>): void; // revoke_all missing in documentation
-	}
-
-	export interface Wallet {
-		sendAuthenticatedRequest(params: YandexMoneySDK.Wallet.SendAuthenticatedRequestParams, callback: ResponseCallback<any>): void;
-		accountInfo(callback: ResponseCallback<YandexMoneySDK.Wallet.AccountInfoResult>): void;
-		operationHistory(options: YandexMoneySDK.Wallet.OperationHistoryOptions, callback: ResponseCallback<YandexMoneySDK.Wallet.OperationHistoryResult>): void;
-		operationDetails(operation_id: string, callback: ResponseCallback<YandexMoneySDK.Wallet.OperationDetailsResult>): void;
-		requestPayment(options: YandexMoneySDK.Wallet.RequestPaymentOptions, callback: ResponseCallback<YandexMoneySDK.Wallet.RequestPaymentResult>): void;
-		processPayment(options: YandexMoneySDK.Wallet.ProcessPaymentOptions, callback: ResponseCallback<YandexMoneySDK.Wallet.ProcessPaymentResult>): void;
-		incomingTransferAccept(operation_id: string, protectionCode: string, callback: ResponseCallback<YandexMoneySDK.Wallet.IncomingTransferAcceptResult>): void;
-		incomingTransferReject(operation_id: string, callback: ResponseCallback<YandexMoneySDK.Wallet.IncomingTransferRejectResult>): void;
-	}
-
-	export interface ExternalPaymentStatic {
-		new (instanceId: string): ExternalPayment;
-		getInstanceId(clientId: string, callback: ResponseCallback<YandexMoneySDK.ExternalPayment.GetInstanceIdResult>): void;
-	}
-
-	export interface ExternalPayment {
-		request(options: YandexMoneySDK.ExternalPayment.RequestOptions, callback: ResponseCallback<YandexMoneySDK.ExternalPayment.RequestResult>): void;
-		process(options: YandexMoneySDK.ExternalPayment.ProcessOptions, callback: ResponseCallback<YandexMoneySDK.ExternalPayment.ProcessResult>): void;
-	}
-
-	export interface Config {
-		MONEY_URL: string;
-		SP_MONEY_URL: string;
-	}
-
-	export var Wallet: WalletStatic;
-	export var ExternalPayment: ExternalPaymentStatic;
-	export var Config: Config;
-}
diff --git a/yargs/index.d.ts b/yargs/index.d.ts
new file mode 100644
index 0000000000..cbcccb23b3
--- /dev/null
+++ b/yargs/index.d.ts
@@ -0,0 +1,163 @@
+// Type definitions for yargs
+// Project: https://github.com/chevex/yargs
+// Definitions by: Martin Poelstra <https://github.com/poelstra>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace yargs {
+    interface Argv {
+        argv: any;
+        (...args: any[]): any;
+        parse(...args: any[]): any;
+
+        reset(): Argv;
+
+        locale(): string;
+        locale(loc: string): Argv;
+
+        detectLocale(detect: boolean): Argv;
+
+        alias(shortName: string, longName: string): Argv;
+        alias(aliases: { [shortName: string]: string }): Argv;
+        alias(aliases: { [shortName: string]: string[] }): Argv;
+
+        array(key: string): Argv;
+        array(keys: string[]): Argv;
+
+        default(key: string, value: any): Argv;
+        default(defaults: { [key: string]: any }): Argv;
+
+        demand(key: string, msg: string): Argv;
+        demand(key: string, required?: boolean): Argv;
+        demand(keys: string[], msg: string): Argv;
+        demand(keys: string[], required?: boolean): Argv;
+        demand(positionals: number, required?: boolean): Argv;
+        demand(positionals: number, msg: string): Argv;
+
+        require(key: string, msg: string): Argv;
+        require(key: string, required: boolean): Argv;
+        require(keys: number[], msg: string): Argv;
+        require(keys: number[], required: boolean): Argv;
+        require(positionals: number, required: boolean): Argv;
+        require(positionals: number, msg: string): Argv;
+
+        required(key: string, msg: string): Argv;
+        required(key: string, required: boolean): Argv;
+        required(keys: number[], msg: string): Argv;
+        required(keys: number[], required: boolean): Argv;
+        required(positionals: number, required: boolean): Argv;
+        required(positionals: number, msg: string): Argv;
+
+        requiresArg(key: string): Argv;
+        requiresArg(keys: string[]): Argv;
+
+        describe(key: string, description: string): Argv;
+        describe(descriptions: { [key: string]: string }): Argv;
+
+        option(key: string, options: Options): Argv;
+        option(options: { [key: string]: Options }): Argv;
+        options(key: string, options: Options): Argv;
+        options(options: { [key: string]: Options }): Argv;
+
+        usage(message: string, options?: { [key: string]: Options }): Argv;
+        usage(options?: { [key: string]: Options }): Argv;
+
+        command(command: string, description: string): Argv;
+        command(command: string, description: string, fn: (args: Argv) => void): Argv;
+
+        completion(cmd: string, fn?: SyncCompletionFunction): Argv;
+        completion(cmd: string, description?: string, fn?: SyncCompletionFunction): Argv;
+        completion(cmd: string, fn?: AsyncCompletionFunction): Argv;
+        completion(cmd: string, description?: string, fn?: AsyncCompletionFunction): Argv;
+
+        example(command: string, description: string): Argv;
+
+        check(func: (argv: any, aliases: { [alias: string]: string }) => any): Argv;
+
+        boolean(key: string): Argv;
+        boolean(keys: string[]): Argv;
+
+        string(key: string): Argv;
+        string(keys: string[]): Argv;
+
+        choices(choices: Object): Argv;
+        choices(key: string, values: any[]): Argv;
+
+        config(key: string): Argv;
+        config(keys: string[]): Argv;
+
+        wrap(columns: number): Argv;
+
+        strict(): Argv;
+
+        help(): string;
+        help(option: string, description?: string): Argv;
+
+        env(prefix?: string): Argv;
+        env(enable: boolean): Argv;
+
+        epilog(msg: string): Argv;
+        epilogue(msg: string): Argv;
+
+        version(version: string, option?: string, description?: string): Argv;
+        version(version: () => string, option?: string, description?: string): Argv;
+
+        showHelpOnFail(enable: boolean, message?: string): Argv;
+
+        showHelp(func?: (message: string) => any): Argv;
+
+        exitProcess(enabled: boolean): Argv;
+
+        global(key: string): Argv;
+        global(keys: string[]): Argv;
+
+        group(key: string, groupName: string): Argv;
+        group(keys: string[], groupName: string): Argv;
+
+        nargs(key: string, count: number): Argv;
+        nargs(nargs: { [key: string]: number }): Argv;
+
+        /* Undocumented */
+
+        normalize(key: string): Argv;
+        normalize(keys: string[]): Argv;
+
+        implies(key: string, value: string): Argv;
+        implies(implies: { [key: string]: string }): Argv;
+
+        count(key: string): Argv;
+        count(keys: string[]): Argv;
+
+        fail(func: (msg: string) => any): void;
+    }
+
+    interface Options {
+        type?: string;
+        group?: string;
+        alias?: any;
+        demand?: any;
+        required?: any;
+        require?: any;
+        default?: any;
+        defaultDescription?: string;
+        boolean?: boolean;
+        string?: boolean;
+        count?: boolean;
+        describe?: any;
+        description?: any;
+        desc?: any;
+        requiresArg?: any;
+        choices?: string[];
+        global?: boolean;
+        array?: boolean;
+        config?: boolean;
+        number?: boolean;
+        normalize?: boolean;
+        nargs?: number;
+    }
+
+    type SyncCompletionFunction = (current: string, argv: any) => string[];
+    type AsyncCompletionFunction = (current: string, argv: any, done: (completion: string[]) => void) => void;
+}
+
+declare var yargs: yargs.Argv;
+export = yargs;
diff --git a/yargs/tsconfig.json b/yargs/tsconfig.json
new file mode 100644
index 0000000000..3dbce977b5
--- /dev/null
+++ b/yargs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "yargs-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/yargs/yargs-tests.ts b/yargs/yargs-tests.ts
index a049af8cb3..732a6dfe8e 100644
--- a/yargs/yargs-tests.ts
+++ b/yargs/yargs-tests.ts
@@ -3,8 +3,6 @@
 // Definitions by: Martin Poelstra <https://github.com/poelstra>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="yargs.d.ts" />
-
 import yargs = require('yargs');
 
 // Examples taken from yargs website
diff --git a/yargs/yargs.d.ts b/yargs/yargs.d.ts
deleted file mode 100644
index 4e6ef109ec..0000000000
--- a/yargs/yargs.d.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-// Type definitions for yargs
-// Project: https://github.com/chevex/yargs
-// Definitions by: Martin Poelstra <https://github.com/poelstra>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "yargs" {
-
-	namespace yargs {
-		interface Argv {
-			argv: any;
-			(...args: any[]): any;
-			parse(...args: any[]): any;
-
-			reset(): Argv;
-
-			locale(): string;
-			locale(loc:string): Argv;
-
-			detectLocale(detect:boolean): Argv;
-
-			alias(shortName: string, longName: string): Argv;
-			alias(aliases: { [shortName: string]: string }): Argv;
-			alias(aliases: { [shortName: string]: string[] }): Argv;
-			
-			array(key: string): Argv;
-			array(keys: string[]): Argv;
-
-			default(key: string, value: any): Argv;
-			default(defaults: { [key: string]: any}): Argv;
-
-			demand(key: string, msg: string): Argv;
-			demand(key: string, required?: boolean): Argv;
-			demand(keys: string[], msg: string): Argv;
-			demand(keys: string[], required?: boolean): Argv;
-			demand(positionals: number, required?: boolean): Argv;
-			demand(positionals: number, msg: string): Argv;
-
-			require(key: string, msg: string): Argv;
-			require(key: string, required: boolean): Argv;
-			require(keys: number[], msg: string): Argv;
-			require(keys: number[], required: boolean): Argv;
-			require(positionals: number, required: boolean): Argv;
-			require(positionals: number, msg: string): Argv;
-
-			required(key: string, msg: string): Argv;
-			required(key: string, required: boolean): Argv;
-			required(keys: number[], msg: string): Argv;
-			required(keys: number[], required: boolean): Argv;
-			required(positionals: number, required: boolean): Argv;
-			required(positionals: number, msg: string): Argv;
-
-			requiresArg(key: string): Argv;
-			requiresArg(keys: string[]): Argv;
-
-			describe(key: string, description: string): Argv;
-			describe(descriptions: { [key: string]: string }): Argv;
-
-			option(key: string, options: Options): Argv;
-			option(options: { [key: string]: Options }): Argv;
-			options(key: string, options: Options): Argv;
-			options(options: { [key: string]: Options }): Argv;
-
-			usage(message: string, options?: { [key: string]: Options }): Argv;
-			usage(options?: { [key: string]: Options }): Argv;
-
-			command(command: string, description: string): Argv;
-			command(command: string, description: string, fn: (args: Argv) => void): Argv;
-
-			completion(cmd: string, fn?: SyncCompletionFunction): Argv;
-			completion(cmd: string, description?: string, fn?: SyncCompletionFunction): Argv;
-			completion(cmd: string, fn?: AsyncCompletionFunction): Argv;
-			completion(cmd: string, description?: string, fn?: AsyncCompletionFunction): Argv;
-
-			example(command: string, description: string): Argv;
-
-			check(func: (argv: any, aliases: { [alias: string]: string }) => any): Argv;
-
-			boolean(key: string): Argv;
-			boolean(keys: string[]): Argv;
-
-			string(key: string): Argv;
-			string(keys: string[]): Argv;
-
-			choices(choices: Object): Argv;
-			choices(key: string, values:any[]): Argv;
-
-			config(key: string): Argv;
-			config(keys: string[]): Argv;
-
-			wrap(columns: number): Argv;
-
-			strict(): Argv;
-
-			help(): string;
-			help(option: string, description?: string): Argv;
-			
-			env(prefix?: string): Argv;
-			env(enable: boolean): Argv;
-
-			epilog(msg: string): Argv;
-			epilogue(msg: string): Argv;
-
-			version(version: string, option?: string, description?: string): Argv;
-			version(version: () => string, option?: string, description?: string): Argv;
-
-			showHelpOnFail(enable: boolean, message?: string): Argv;
-
-			showHelp(func?: (message: string) => any): Argv;
-
-			exitProcess(enabled:boolean): Argv;
-			
-			global(key: string): Argv;
-			global(keys: string[]): Argv;
-			
-			group(key: string, groupName: string): Argv;
-			group(keys: string[], groupName: string): Argv;
-			
-			nargs(key: string, count: number): Argv;
-			nargs(nargs: { [key: string]: number }): Argv;
-
-			/* Undocumented */
-
-			normalize(key: string): Argv;
-			normalize(keys: string[]): Argv;
-
-			implies(key: string, value: string): Argv;
-			implies(implies: { [key: string]: string }): Argv;
-
-			count(key: string): Argv;
-			count(keys: string[]): Argv;
-
-			fail(func: (msg: string) => any): void;
-		}
-
-		interface Options {
-			type?: string;
-			group?: string;
-			alias?: any;
-			demand?: any;
-			required?: any;
-			require?: any;
-			default?: any;
-			defaultDescription?: string;
-			boolean?: boolean;
-			string?: boolean;
-			count?: boolean;
-			describe?: any;
-			description?: any;
-			desc?: any;
-			requiresArg?: any;
-			choices?:string[];
-			global?: boolean;
-			array?: boolean;
-			config?: boolean;
-			number?: boolean;
-			normalize?: boolean;
-			nargs?: number;
-		}
-
-		type SyncCompletionFunction = (current: string, argv: any) => string[];
-		type AsyncCompletionFunction = (current: string, argv: any, done: (completion: string[]) => void) => void;
-	}
-
-	var yargs: yargs.Argv;
-	export = yargs;
-}
diff --git a/ydn-db/ydn-db.d.ts b/ydn-db/index.d.ts
similarity index 100%
rename from ydn-db/ydn-db.d.ts
rename to ydn-db/index.d.ts
diff --git a/ydn-db/tsconfig.json b/ydn-db/tsconfig.json
new file mode 100644
index 0000000000..d96e15d431
--- /dev/null
+++ b/ydn-db/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "ydn-db-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/ydn-db/ydn-db-tests.ts b/ydn-db/ydn-db-tests.ts
index 95279b831e..c3f01b1690 100644
--- a/ydn-db/ydn-db-tests.ts
+++ b/ydn-db/ydn-db-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="ydn-db.d.ts" />
+
 
 var schema = {
   stores: [{
diff --git a/yeoman-generator/index.d.ts b/yeoman-generator/index.d.ts
new file mode 100644
index 0000000000..a42e08be46
--- /dev/null
+++ b/yeoman-generator/index.d.ts
@@ -0,0 +1,248 @@
+// Type definitions for yeoman-generator
+// Project: https://github.com/yeoman/generator
+// Definitions by: Kentaro Okuno <http://github.com/armorik83>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/// <reference types="node" />
+
+export = yo;
+
+declare namespace yo {
+    export interface IYeomanGenerator {
+        argument(name: string, config: IArgumentConfig): void;
+        composeWith(namespace: string, options: any, settings?: IComposeSetting): IYeomanGenerator;
+        defaultFor(name: string): void;
+        destinationRoot(rootPath?: string): string;
+        destinationPath(...path: string[]): string;
+        determineAppname(): void;
+        getCollisionFilter(): (output: any) => void;
+        hookFor(name: string, config: IHookConfig): void;
+        option(name: string, config: IYeomanGeneratorOption): void;
+        rootGeneratorName(): string;
+        run(args?: any): void;
+        run(args: any, callback?: Function): void;
+        runHooks(callback?: Function): void;
+        sourceRoot(rootPath?: string): string;
+        templatePath(...path: string[]): string;
+        prompt(opt: IPromptOptions | IPromptOptions[], callback: (answers: any) => void): void;
+        npmInstall(packages?: string[] | string, options?: any, cb?: Function): void;
+        installDependencies(options?: IInstallDependencyOptions): void;
+        spawnCommand(name: string, args?: string[], options?: Object): void;
+        spawnCommandSync(name: string, args?: string[], options?: Object): void;
+        options: { [key: string]: any };
+        fs: IMemFsEditor;
+    }
+
+    export class YeomanGeneratorBase implements IYeomanGenerator, NodeJS.EventEmitter {
+        argument(name: string, config: IArgumentConfig): void;
+        composeWith(namespace: string, options: any, settings?: IComposeSetting): IYeomanGenerator;
+        defaultFor(name: string): void;
+        destinationRoot(rootPath?: string): string;
+        destinationPath(...path: string[]): string;
+        determineAppname(): void;
+        getCollisionFilter(): (output: any) => void;
+        hookFor(name: string, config: IHookConfig): void;
+        option(name: string, config?: IYeomanGeneratorOption): void;
+        rootGeneratorName(): string;
+        run(args?: any): void;
+        run(args: any, callback?: Function): void;
+        runHooks(callback?: Function): void;
+        sourceRoot(rootPath?: string): string;
+        templatePath(...path: string[]): string;
+        addListener(event: string, listener: Function): this;
+        on(event: string, listener: Function): this;
+        once(event: string, listener: Function): this;
+        removeListener(event: string, listener: Function): this;
+        removeAllListeners(event?: string): this;
+        setMaxListeners(n: number): this;
+        getMaxListeners(): number;
+        listeners(event: string): Function[];
+        emit(event: string, ...args: any[]): boolean;
+        listenerCount(type: string): number;
+
+        async(): any;
+        prompt(opt: IPromptOptions | IPromptOptions[], callback: (answers: any) => void): void;
+        log(message: string) : void;
+        npmInstall(packages: string[], options?: any, cb?: Function) :void;
+        installDependencies(options?: IInstallDependencyOptions): void;
+        spawnCommand(name: string, args?: string[], options?: Object): void;
+        spawnCommandSync(name: string, args?: string[], options?: Object): void;
+
+        appname: string;
+        gruntfile: IGruntFileStatic;
+        options: { [key: string]: any };
+        fs: IMemFsEditor;
+    }
+
+    export interface IMemFsEditor {
+        read(filepath: string, options?: Object): string;
+        readJSON(filepath: string, defaults?: Object): Object;
+        write(filepath: string, contents: string): void;
+        writeJSON(filepath: string, contents: Object, replacer?: Function, space?: number): void;
+        delete(filepath: string, options?: Object): void;
+        copy(from: string, to: string, options?: Object): void;
+        copyTpl(from: string, to: string, context: Object, options?: Object): void;
+        move(from: string, to: string, options?: Object): void;
+        exists(filepath: string): boolean;
+        commit(callback: Function): void;
+        commit(filters: any[], callback: Function): void;
+    }
+
+    export interface IInstallDependencyOptions {
+        npm?: boolean;
+        bower?: boolean;
+        skipMessage?: boolean;
+        callback?: Function;
+    }
+
+    export interface IChoice {
+        name: string;
+        value: string;
+        short?: string;
+    }
+
+    export interface IPromptOptions{
+        type?: string;
+        name: string;
+        message: string | ((answers: Object) => string);
+        choices?: any[] | ((answers: Object) => any);
+        default?: string | number | string[] | number[] | ((answers: Object) => (string | number | string[] | number[]));
+        validate?: ((input: any) => boolean | string);
+        filter?: ((input: any) => any);
+        when?: ((answers: Object) => boolean) | boolean;
+        store?: boolean;
+    }
+
+    export interface IGruntFileStatic {
+        loadNpmTasks(pluginName: string): void;
+        insertConfig(name:string, config:any):void;
+        registerTask(name:string, tasks:any):void;
+        insertVariable(name:string, value:any):void;
+        prependJavaScript(code:string):void;
+    }
+
+    export interface IArgumentConfig {
+        desc: string;
+        required?: boolean;
+        optional?: boolean;
+        type: any;
+        defaults?: any;
+    }
+
+    export interface IComposeSetting {
+        local?: string;
+        link?: string;
+    }
+
+    export interface IHookConfig {
+        as: string;
+        args: any;
+        options: any;
+    }
+
+    export interface IYeomanGeneratorOption {
+        alias?: string;
+        defaults?: any;
+        desc?: string;
+        hide?: boolean;
+        type?: any;
+    }
+
+    export interface IQueueProps {
+        initializing: () => void;
+        prompting?: () => void;
+        configuring?: () => void;
+        default?: () => void;
+        writing: {
+            [target: string]: () => void;
+        };
+        conflicts?: () => void;
+        install?: () => void;
+        end: () => void;
+    }
+
+    export interface INamedBase extends IYeomanGenerator {
+    }
+
+    export interface IBase extends INamedBase {
+    }
+
+    export interface IAssert {
+        file(path: string): void;
+        file(paths: string[]): void;
+        fileContent(file: string, reg: RegExp): void;
+
+        /** @param {[String, RegExp][]} pairs */
+        fileContent(pairs: any[][]): void;
+
+        /** @param {[String, RegExp][]|String[]} pairs */
+        files(pairs: any[]): void;
+
+        /**
+         * @param {Object} subject
+         * @param {Object|Array} methods
+         */
+        implement(subject: any, methods: any): void;
+        noFile(file: string): void;
+        noFileContent(file: string, reg: RegExp): void;
+
+        /** @param {[String, RegExp][]} pairs */
+        noFileContent(pairs: any[][]): void;
+
+        /**
+         * @param {Object} subject
+         * @param {Object|Array} methods
+         */
+        noImplement(subject: any, methods: any): void;
+
+        textEqual(value: string, expected: string): void;
+    }
+
+    export interface ITestHelper {
+        createDummyGenerator(): IYeomanGenerator;
+        createGenerator(name: string, dependencies: any[], args: any, options: any): IYeomanGenerator;
+        decorate(context: any, method: string, replacement: Function, options: any): void;
+        gruntfile(options: any, done: Function): void;
+        mockPrompt(generator: IYeomanGenerator, answers: any): void;
+        registerDependencies(dependencies: string[]): void;
+        restore(): void;
+
+        /** @param {String|Function} generator */
+        run(generator: any): IRunContext;
+    }
+
+    export interface IRunContext {
+        async(): Function;
+        inDir(dirPath: string): IRunContext;
+
+        /** @param {String|String[]} args */
+        withArguments(args: any): IRunContext;
+        withGenerators(dependencies: string[]): IRunContext;
+        withOptions(options: any): IRunContext;
+        withPrompts(answers: any): IRunContext;
+    }
+
+    /** @type file file-utils */
+    var file: any;
+    var assert: IAssert;
+    var test: ITestHelper;
+
+    // "generators" is deprecated
+    namespace generators {
+
+        export class NamedBase extends YeomanGeneratorBase implements INamedBase {
+            constructor(args: string | string[], options: any);
+        }
+
+        export class Base extends NamedBase implements IBase {
+            static extend(protoProps: IQueueProps, staticProps?: any): IYeomanGenerator;
+        }
+    }
+
+    export class NamedBase extends YeomanGeneratorBase implements INamedBase {
+        constructor(args: string | string[], options: any);
+    }
+
+    export class Base extends NamedBase implements IBase {
+        static extend(protoProps: IQueueProps, staticProps?: any): IYeomanGenerator;
+    }
+}
diff --git a/yeoman-generator/tsconfig.json b/yeoman-generator/tsconfig.json
new file mode 100644
index 0000000000..67b915d39e
--- /dev/null
+++ b/yeoman-generator/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "yeoman-generator-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/yeoman-generator/yeoman-generator-tests.ts b/yeoman-generator/yeoman-generator-tests.ts
index 69ff087bf8..cf4161ffb8 100644
--- a/yeoman-generator/yeoman-generator-tests.ts
+++ b/yeoman-generator/yeoman-generator-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="yeoman-generator.d.ts" />
+
 import yeoman = require('yeoman-generator');
 
 var base = yeoman.generators.Base;
diff --git a/yeoman-generator/yeoman-generator.d.ts b/yeoman-generator/yeoman-generator.d.ts
deleted file mode 100644
index 68ec035c8c..0000000000
--- a/yeoman-generator/yeoman-generator.d.ts
+++ /dev/null
@@ -1,250 +0,0 @@
-// Type definitions for yeoman-generator
-// Project: https://github.com/yeoman/generator
-// Definitions by: Kentaro Okuno <http://github.com/armorik83>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/// <reference path="../node/node.d.ts" />
-
-declare namespace yo {
-    export interface IYeomanGenerator {
-        argument(name: string, config: IArgumentConfig): void;
-        composeWith(namespace: string, options: any, settings?: IComposeSetting): IYeomanGenerator;
-        defaultFor(name: string): void;
-        destinationRoot(rootPath?: string): string;
-        destinationPath(...path: string[]): string;
-        determineAppname(): void;
-        getCollisionFilter(): (output: any) => void;
-        hookFor(name: string, config: IHookConfig): void;
-        option(name: string, config: IYeomanGeneratorOption): void;
-        rootGeneratorName(): string;
-        run(args?: any): void;
-        run(args: any, callback?: Function): void;
-        runHooks(callback?: Function): void;
-        sourceRoot(rootPath?: string): string;
-        templatePath(...path: string[]): string;
-        prompt(opt: IPromptOptions | IPromptOptions[], callback: (answers: any) => void): void;
-        npmInstall(packages?: string[] | string, options?: any, cb?: Function): void;
-        installDependencies(options?: IInstallDependencyOptions): void;
-        spawnCommand(name: string, args?: string[], options?: Object): void;
-        spawnCommandSync(name: string, args?: string[], options?: Object): void;
-        options: { [key: string]: any };
-        fs: IMemFsEditor;
-    }
-
-    export class YeomanGeneratorBase implements IYeomanGenerator, NodeJS.EventEmitter {
-        argument(name: string, config: IArgumentConfig): void;
-        composeWith(namespace: string, options: any, settings?: IComposeSetting): IYeomanGenerator;
-        defaultFor(name: string): void;
-        destinationRoot(rootPath?: string): string;
-        destinationPath(...path: string[]): string;
-        determineAppname(): void;
-        getCollisionFilter(): (output: any) => void;
-        hookFor(name: string, config: IHookConfig): void;
-        option(name: string, config?: IYeomanGeneratorOption): void;
-        rootGeneratorName(): string;
-        run(args?: any): void;
-        run(args: any, callback?: Function): void;
-        runHooks(callback?: Function): void;
-        sourceRoot(rootPath?: string): string;
-        templatePath(...path: string[]): string;
-        addListener(event: string, listener: Function): this;
-        on(event: string, listener: Function): this;
-        once(event: string, listener: Function): this;
-        removeListener(event: string, listener: Function): this;
-        removeAllListeners(event?: string): this;
-        setMaxListeners(n: number): this;
-        getMaxListeners(): number;
-        listeners(event: string): Function[];
-        emit(event: string, ...args: any[]): boolean;
-        listenerCount(type: string): number;
-
-        async(): any;
-        prompt(opt: IPromptOptions | IPromptOptions[], callback: (answers: any) => void): void;
-        log(message: string) : void;
-        npmInstall(packages: string[], options?: any, cb?: Function) :void;
-        installDependencies(options?: IInstallDependencyOptions): void;
-        spawnCommand(name: string, args?: string[], options?: Object): void;
-        spawnCommandSync(name: string, args?: string[], options?: Object): void;
-
-        appname: string;
-        gruntfile: IGruntFileStatic;
-        options: { [key: string]: any };
-        fs: IMemFsEditor;
-    }
-
-    export interface IMemFsEditor {
-        read(filepath: string, options?: Object): string;
-        readJSON(filepath: string, defaults?: Object): Object;
-        write(filepath: string, contents: string): void;
-        writeJSON(filepath: string, contents: Object, replacer?: Function, space?: number): void;
-        delete(filepath: string, options?: Object): void;
-        copy(from: string, to: string, options?: Object): void;
-        copyTpl(from: string, to: string, context: Object, options?: Object): void;
-        move(from: string, to: string, options?: Object): void;
-        exists(filepath: string): boolean;
-        commit(callback: Function): void;
-        commit(filters: any[], callback: Function): void;
-    }
-
-    export interface IInstallDependencyOptions {
-        npm?: boolean;
-        bower?: boolean;
-        skipMessage?: boolean;
-        callback?: Function;
-    }
-
-    export interface IChoice {
-        name: string;
-        value: string;
-        short?: string;
-    }
-
-    export interface IPromptOptions{
-        type?: string;
-        name: string;
-        message: string | ((answers: Object) => string);
-        choices?: any[] | ((answers: Object) => any);
-        default?: string | number | string[] | number[] | ((answers: Object) => (string | number | string[] | number[]));
-        validate?: ((input: any) => boolean | string);
-        filter?: ((input: any) => any);
-        when?: ((answers: Object) => boolean) | boolean;
-        store?: boolean;
-    }
-
-    export interface IGruntFileStatic {
-        loadNpmTasks(pluginName: string): void;
-        insertConfig(name:string, config:any):void;
-        registerTask(name:string, tasks:any):void;
-        insertVariable(name:string, value:any):void;
-        prependJavaScript(code:string):void;
-    }
-
-    export interface IArgumentConfig {
-        desc: string;
-        required?: boolean;
-        optional?: boolean;
-        type: any;
-        defaults?: any;
-    }
-
-    export interface IComposeSetting {
-        local?: string;
-        link?: string;
-    }
-
-    export interface IHookConfig {
-        as: string;
-        args: any;
-        options: any;
-    }
-
-    export interface IYeomanGeneratorOption {
-        alias?: string;
-        defaults?: any;
-        desc?: string;
-        hide?: boolean;
-        type?: any;
-    }
-
-    export interface IQueueProps {
-        initializing: () => void;
-        prompting?: () => void;
-        configuring?: () => void;
-        default?: () => void;
-        writing: {
-            [target: string]: () => void;
-        };
-        conflicts?: () => void;
-        install?: () => void;
-        end: () => void;
-    }
-
-    export interface INamedBase extends IYeomanGenerator {
-    }
-
-    export interface IBase extends INamedBase {
-    }
-
-    export interface IAssert {
-        file(path: string): void;
-        file(paths: string[]): void;
-        fileContent(file: string, reg: RegExp): void;
-
-        /** @param {[String, RegExp][]} pairs */
-        fileContent(pairs: any[][]): void;
-
-        /** @param {[String, RegExp][]|String[]} pairs */
-        files(pairs: any[]): void;
-
-        /**
-         * @param {Object} subject
-         * @param {Object|Array} methods
-         */
-        implement(subject: any, methods: any): void;
-        noFile(file: string): void;
-        noFileContent(file: string, reg: RegExp): void;
-
-        /** @param {[String, RegExp][]} pairs */
-        noFileContent(pairs: any[][]): void;
-
-        /**
-         * @param {Object} subject
-         * @param {Object|Array} methods
-         */
-        noImplement(subject: any, methods: any): void;
-
-        textEqual(value: string, expected: string): void;
-    }
-
-    export interface ITestHelper {
-        createDummyGenerator(): IYeomanGenerator;
-        createGenerator(name: string, dependencies: any[], args: any, options: any): IYeomanGenerator;
-        decorate(context: any, method: string, replacement: Function, options: any): void;
-        gruntfile(options: any, done: Function): void;
-        mockPrompt(generator: IYeomanGenerator, answers: any): void;
-        registerDependencies(dependencies: string[]): void;
-        restore(): void;
-
-        /** @param {String|Function} generator */
-        run(generator: any): IRunContext;
-    }
-
-    export interface IRunContext {
-        async(): Function;
-        inDir(dirPath: string): IRunContext;
-
-        /** @param {String|String[]} args */
-        withArguments(args: any): IRunContext;
-        withGenerators(dependencies: string[]): IRunContext;
-        withOptions(options: any): IRunContext;
-        withPrompts(answers: any): IRunContext;
-    }
-
-    /** @type file file-utils */
-    var file: any;
-    var assert: IAssert;
-    var test: ITestHelper;
-
-    // "generators" is deprecated
-    namespace generators {
-
-        export class NamedBase extends YeomanGeneratorBase implements INamedBase {
-            constructor(args: string | string[], options: any);
-        }
-
-        export class Base extends NamedBase implements IBase {
-            static extend(protoProps: IQueueProps, staticProps?: any): IYeomanGenerator;
-        }
-    }
-
-    export class NamedBase extends YeomanGeneratorBase implements INamedBase {
-        constructor(args: string | string[], options: any);
-    }
-
-    export class Base extends NamedBase implements IBase {
-        static extend(protoProps: IQueueProps, staticProps?: any): IYeomanGenerator;
-    }
-}
-
-declare module "yeoman-generator" {
-    export = yo;
-}
diff --git a/yfiles/yfiles.d.ts b/yfiles/index.d.ts
similarity index 100%
rename from yfiles/yfiles.d.ts
rename to yfiles/index.d.ts
diff --git a/yfiles/tsconfig.json b/yfiles/tsconfig.json
new file mode 100644
index 0000000000..283307463e
--- /dev/null
+++ b/yfiles/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "yfiles-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/yfiles/yfiles-tests.ts b/yfiles/yfiles-tests.ts
index 4884329e18..f36770967b 100644
--- a/yfiles/yfiles-tests.ts
+++ b/yfiles/yfiles-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="yfiles.d.ts"/>
-
 namespace yfilesTest {
 
     export class BasicTest {
diff --git a/yosay/index.d.ts b/yosay/index.d.ts
new file mode 100644
index 0000000000..e806c59910
--- /dev/null
+++ b/yosay/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for yosay
+// Project: https://github.com/yeoman/yosay
+// Definitions by: Kentaro Okuno <http://github.com/armorik83>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function yosay(message?: string, options?: { maxLength: number }): string;
+export = yosay;
diff --git a/yosay/tsconfig.json b/yosay/tsconfig.json
new file mode 100644
index 0000000000..b9b63cd681
--- /dev/null
+++ b/yosay/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "yosay-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/yosay/yosay-tests.ts b/yosay/yosay-tests.ts
index 257b546eae..a22e8e69e1 100644
--- a/yosay/yosay-tests.ts
+++ b/yosay/yosay-tests.ts
@@ -1,3 +1,2 @@
-/// <reference path="./yosay.d.ts" />
 import yosay = require('yosay');
 yosay('Welcome to the generator!', {maxLength: 20});
\ No newline at end of file
diff --git a/yosay/yosay.d.ts b/yosay/yosay.d.ts
deleted file mode 100644
index 65bde04b0f..0000000000
--- a/yosay/yosay.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for yosay
-// Project: https://github.com/yeoman/yosay
-// Definitions by: Kentaro Okuno <http://github.com/armorik83>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'yosay' {
-  function yosay(message?: string, options?: {maxLength: number}): string;
-  export = yosay;
-}
\ No newline at end of file
diff --git a/youtube/youtube.d.ts b/youtube/index.d.ts
similarity index 100%
rename from youtube/youtube.d.ts
rename to youtube/index.d.ts
diff --git a/youtube/tsconfig.json b/youtube/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/youtube/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/yui/index.d.ts b/yui/index.d.ts
new file mode 100644
index 0000000000..419bec83db
--- /dev/null
+++ b/yui/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for yui 3.14.0
+// Project: https://github.com/yui/yui3
+// Definitions by: Gia Bảo @ Sân Đình <https://github.com/giabao>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="yui-test.d.ts" />
+
+interface YUI {
+    Test: YUITest.YUITestStatic
+    Assert: YUITest.IAssert
+
+    add(name: string, fn: (Y: YUI, name: string) => any, version: string, details?: Y.IConfig): YUI;
+
+    mix(receiver: Function, supplier: Function, overwrite?: boolean, whitelist?: string[], mode?: number, merge?: boolean): any//Function|Object|YUI
+    mix(receiver: Object, supplier: Function, overwrite?: boolean, whitelist?: string[], mode?: number, merge?: boolean): any//Function|Object|YUI
+    mix(receiver: Function, supplier: Object, overwrite?: boolean, whitelist?: string[], mode?: number, merge?: boolean): any//Function|Object|YUI
+    mix(receiver: Object, supplier: Object, overwrite?: boolean, whitelist?: string[], mode?: number, merge?: boolean): any//Function|Object|YUI
+}
+
+declare namespace Y{
+    interface IConfig{
+        requires: string[]
+        optional: string[]
+        use: string[]
+    }
+}
+
+declare var Y: YUI;
+declare var YUI: YUI;
diff --git a/yui/tsconfig.json b/yui/tsconfig.json
new file mode 100644
index 0000000000..37bc7dfbae
--- /dev/null
+++ b/yui/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/yui/yui-test.d.ts b/yui/yui-test.d.ts
index 1d3f2af60a..85bdb3c7f1 100644
--- a/yui/yui-test.d.ts
+++ b/yui/yui-test.d.ts
@@ -4,13 +4,13 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace YUITest {
-    interface YUITestStatic{
+    interface YUITestStatic {
         Assert: IAssert
         Case: TestCase
         Runner: TestRunner
     }
 
-    interface EventTarget{
+    interface EventTarget {
         attach(type: string, listener: Function): void
         subscribe(type: string, listener: Function): void
         fire(event: Object): void
@@ -19,7 +19,7 @@ declare namespace YUITest {
         unsubscribe(type: string, listener: Function): void
     }
 
-    interface TestRunner extends EventTarget{
+    interface TestRunner extends EventTarget {
         TEST_CASE_BEGIN_EVENT: string
         TEST_CASE_COMPLETE_EVENT: string
         TEST_SUITE_BEGIN_EVENT: string
@@ -49,16 +49,16 @@ declare namespace YUITest {
         run(options?: boolean): void
     }
 
-    interface TestSuite{
+    interface TestSuite {
         name: string
-//        items: any[] //Array of test suites and test cases. @private
+        //        items: any[] //Array of test suites and test cases. @private
         add(testObject: TestSuite): void
         add(testObject: TestCase): void
         setUp(): void
         tearDown(): void
     }
 
-    interface TestCase{
+    interface TestCase {
         new (template: Object): TestCase
         DEFAULT_WAIT: number
         callback(...args: any[]): Function
@@ -73,7 +73,7 @@ declare namespace YUITest {
         tearDown(): void
     }
 
-    interface IAssert{
+    interface IAssert {
         fail(message?: string): void
         pass(message?: string): void
         areEqual(expected: Object, actual: Object, message?: string): void
diff --git a/yui/yui.d.ts b/yui/yui.d.ts
deleted file mode 100644
index cb5d88ebd9..0000000000
--- a/yui/yui.d.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// Type definitions for yui 3.14.0
-// Project: https://github.com/yui/yui3
-// Definitions by: Gia Bảo @ Sân Đình <https://github.com/giabao>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="yui-test.d.ts" />
-
-interface YUI{
-    Test: YUITest.YUITestStatic
-    Assert: YUITest.IAssert
-
-    add(name: string, fn: (Y: YUI, name: string) => any, version: string, details?: Y.IConfig): YUI;
-
-    mix(receiver: Function, supplier: Function, overwrite?: boolean, whitelist?: string[], mode?: number, merge?: boolean): any//Function|Object|YUI
-    mix(receiver: Object, supplier: Function, overwrite?: boolean, whitelist?: string[], mode?: number, merge?: boolean): any//Function|Object|YUI
-    mix(receiver: Function, supplier: Object, overwrite?: boolean, whitelist?: string[], mode?: number, merge?: boolean): any//Function|Object|YUI
-    mix(receiver: Object, supplier: Object, overwrite?: boolean, whitelist?: string[], mode?: number, merge?: boolean): any//Function|Object|YUI
-}
-
-declare namespace Y{
-    interface IConfig{
-        requires: string[]
-        optional: string[]
-        use: string[]
-    }
-}
-
-declare var Y: YUI;
-declare var YUI: YUI;
diff --git a/z-schema/index.d.ts b/z-schema/index.d.ts
new file mode 100644
index 0000000000..1514949351
--- /dev/null
+++ b/z-schema/index.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for z-schema v3.16.0
+// Project: https://github.com/zaggino/z-schema
+// Definitions by: Adam Meadows <https://github.com/job13er>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = ZSchema.Validator;
+export as namespace ZSchema;
+
+declare namespace ZSchema {
+
+    export interface Options {
+        asyncTimeout?: number;
+        forceAdditional?: boolean;
+        assumeAdditional?: boolean;
+        forceItems?: boolean;
+        forceMinItems?: boolean;
+        forceMaxItems?: boolean;
+        forceMinLength?: boolean;
+        forceMaxLength?: boolean;
+        forceProperties?: boolean;
+        ignoreUnresolvableReferences?: boolean;
+        noExtraKeywords?: boolean;
+        noTypeless?: boolean;
+        noEmptyStrings?: boolean;
+        noEmptyArrays?: boolean;
+        strictUris?: boolean;
+        strictMode?: boolean;
+        reportPathAsArray?: boolean;
+        breakOnFirstError?: boolean;
+        pedanticCheck?: boolean;
+        ignoreUnknownFormats?: boolean;
+    }
+
+    export interface SchemaError {
+        code: string;
+        description: string;
+        message: string;
+        params: string[];
+        path: string;
+    }
+
+    export class Validator {
+        constructor(options: Options);
+
+        /**
+         * @param json - either a JSON string or a parsed JSON object
+         * @param schema - the JSON object representing the schema
+         * @returns true if json matches schema
+         */
+        validate(json: any, schema: any): boolean;
+
+        /**
+         * @param json - either a JSON string or a parsed JSON object
+         * @param schema - the JSON object representing the schema
+         */
+        validate(json: any, schema: any, callback: (err: any, valid: boolean) => void): void;
+
+        getLastError(): SchemaError;
+        getLastErrors(): SchemaError[];
+    }
+}
\ No newline at end of file
diff --git a/z-schema/tsconfig.json b/z-schema/tsconfig.json
new file mode 100644
index 0000000000..2c66b87863
--- /dev/null
+++ b/z-schema/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "z-schema-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/z-schema/z-schema-tests.ts b/z-schema/z-schema-tests.ts
index 90fdc4cd32..c82d19c5f7 100644
--- a/z-schema/z-schema-tests.ts
+++ b/z-schema/z-schema-tests.ts
@@ -1,13 +1,13 @@
-/// <reference path="z-schema.d.ts" />
+
 
 import ZSchema = require('z-schema');
 
-var options: ZSchema.Options = {
+var options = {
   noTypeless: true,
   forceItems: true,
 };
 
-var validator: ZSchema.Validator = new ZSchema(options);
+var validator = new ZSchema(options);
 var json: any = {
     foo: 'bar',
 };
@@ -30,5 +30,5 @@ validator.validate(json, schema, function (err: any, valid: boolean) {
     }
 });
 
-var error: ZSchema.SchemaError = validator.getLastError();
-var errors: ZSchema.SchemaError[] = validator.getLastErrors();
+var error = validator.getLastError();
+var errors = validator.getLastErrors();
diff --git a/z-schema/z-schema.d.ts b/z-schema/z-schema.d.ts
deleted file mode 100644
index 83f43bc064..0000000000
--- a/z-schema/z-schema.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-// Type definitions for z-schema v3.16.0
-// Project: https://github.com/zaggino/z-schema
-// Definitions by: Adam Meadows <https://github.com/job13er>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace ZSchema {
-
-    export interface Options {
-        asyncTimeout?: number;
-        forceAdditional?: boolean;
-        assumeAdditional?: boolean;
-        forceItems?: boolean;
-        forceMinItems?: boolean;
-        forceMaxItems?: boolean;
-        forceMinLength?: boolean;
-        forceMaxLength?: boolean;
-        forceProperties?: boolean;
-        ignoreUnresolvableReferences?: boolean;
-        noExtraKeywords?: boolean;
-        noTypeless?: boolean;
-        noEmptyStrings?: boolean;
-        noEmptyArrays?: boolean;
-        strictUris?: boolean;
-        strictMode?: boolean;
-        reportPathAsArray?: boolean;
-        breakOnFirstError?: boolean;
-        pedanticCheck?: boolean;
-        ignoreUnknownFormats?: boolean;
-    }
-
-    export interface SchemaError {
-        code: string;
-        description: string;
-        message: string;
-        params: string[];
-        path: string;
-    }
-
-    export class Validator {
-        constructor(options: Options);
-
-        /**
-         * @param json - either a JSON string or a parsed JSON object
-         * @param schema - the JSON object representing the schema
-         * @returns true if json matches schema
-         */
-        validate(json: any, schema: any): boolean;
-
-        /**
-         * @param json - either a JSON string or a parsed JSON object
-         * @param schema - the JSON object representing the schema
-         */
-        validate(json: any, schema: any, callback: (err: any, valid: boolean) => void): void;
-
-        getLastError(): SchemaError;
-        getLastErrors(): SchemaError[];
-    }
-}
-
-declare module "z-schema" {
-    export = ZSchema.Validator;
-}
diff --git a/zepto/zepto.d.ts b/zepto/index.d.ts
similarity index 100%
rename from zepto/zepto.d.ts
rename to zepto/index.d.ts
diff --git a/zepto/tsconfig.json b/zepto/tsconfig.json
new file mode 100644
index 0000000000..7561e7f2a2
--- /dev/null
+++ b/zepto/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "zepto-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/zepto/zepto-tests.ts b/zepto/zepto-tests.ts
index 2d85f16c03..55fb7e141e 100644
--- a/zepto/zepto-tests.ts
+++ b/zepto/zepto-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="zepto.d.ts" />
+
 
 $('div')  //=> all DIV elements on the page
 $('#foo') //=> element with ID "foo"
diff --git a/zeroclipboard/zeroclipboard.d.ts b/zeroclipboard/index.d.ts
similarity index 100%
rename from zeroclipboard/zeroclipboard.d.ts
rename to zeroclipboard/index.d.ts
diff --git a/zeroclipboard/tsconfig.json b/zeroclipboard/tsconfig.json
new file mode 100644
index 0000000000..429e054ab0
--- /dev/null
+++ b/zeroclipboard/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "files": [
+        "index.d.ts",
+        "zeroclipboard-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    }
+}
\ No newline at end of file
diff --git a/zeroclipboard/zeroclipboard-1.x.x-tests.ts b/zeroclipboard/zeroclipboard-1.x.x-tests.ts
index e087561f67..0fcae7c0f9 100644
--- a/zeroclipboard/zeroclipboard-1.x.x-tests.ts
+++ b/zeroclipboard/zeroclipboard-1.x.x-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="zeroclipboard-1.x.x.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+
+/// <reference types="jquery" />
 
 // main.js
 var client = new ZeroClipboard( document.getElementById("copy-button"), {
diff --git a/zeroclipboard/zeroclipboard-tests.ts b/zeroclipboard/zeroclipboard-tests.ts
index 26855210da..396079f9c7 100644
--- a/zeroclipboard/zeroclipboard-tests.ts
+++ b/zeroclipboard/zeroclipboard-tests.ts
@@ -1,5 +1,5 @@
-/// <reference path="zeroclipboard.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
+
+/// <reference types="jquery" />
 
 import ZeroClipboard = require("zeroclipboard");
 // import * as ZeroClipboard from "zeroclipboard";
diff --git a/zip.js/zip.js.d.ts b/zip.js/index.d.ts
similarity index 100%
rename from zip.js/zip.js.d.ts
rename to zip.js/index.d.ts
diff --git a/zip.js/tsconfig.json b/zip.js/tsconfig.json
new file mode 100644
index 0000000000..038961d475
--- /dev/null
+++ b/zip.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "zip.js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/zip.js/zip.js-tests.ts b/zip.js/zip.js-tests.ts
index ec9aa524d4..16cce903b1 100644
--- a/zip.js/zip.js-tests.ts
+++ b/zip.js/zip.js-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="zip.js.d.ts" />
+
 
 // create the blob object storing the data to compress
 var blob: Blob = new Blob([ "Lorem ipsum dolor sit amet, consectetuer adipiscing elit..." ], {
diff --git a/zmq/index.d.ts b/zmq/index.d.ts
new file mode 100644
index 0000000000..d39fa76146
--- /dev/null
+++ b/zmq/index.d.ts
@@ -0,0 +1,214 @@
+// Type definitions for ZeroMQ Node
+// Project: https://github.com/JustinTulloss/zeromq.node
+// Definitions by: Dave McKeown <http://github.com/davemckeown>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+interface EventEmitter {}
+
+interface SocketTypes {
+    pub: number;
+    xpub: number;
+    sub: number;
+    xsub: number;
+    req: number;
+    xreq: number;
+    rep: number;
+    xrep: number;
+    push: number;
+    pull: number;
+    dealer: number;
+    router: number;
+    pair: number;
+}
+
+interface SocketOptions {
+    _fd: number;
+    _ioevents: number;
+    _receiveMore: number;
+    _subscribe: number;
+    _unsubscribe: number;
+    affinity: number;
+    backlog: number;
+    hwm: number;
+    identity: number;
+    linger: number;
+    mcast_loop: number;
+    rate: number;
+    rcvbuf: number;
+    last_endpoint: number;
+    reconnect_ivl: number;
+    recovery_ivl: number;
+    sndbuf: number;
+    swap: number;
+}
+
+interface Socket extends EventEmitter {
+    /**
+     * Set `opt` to `val`.
+     *
+     * @param opt Option
+     * @param val Value
+     */
+    setsocketopt(opt: number, val: any): Socket;
+
+    /**
+     * Set `opt` to `val`.
+     *
+     * @param opt Option
+     * @param val Value
+     */
+    setsocketopt(opt: string, val: any): Socket;
+
+    /**
+     * Get socket `opt`.
+     *
+     * @param opt Option number
+     */
+    getsocketopt(opt: number): any;
+
+    /**
+     * Get socket `opt`.
+     *
+     * @param opt Option string
+     */
+    getsocketopt(opt: string): any;
+
+    /**
+     * Async bind.
+     *
+     * Emits the "bind" event.
+     *
+     * @param addr Socket address
+     * @param cb Bind callback
+     */
+    bind(addr: string, callback?: (error: string) => void ): Socket;
+
+    /**
+     * Sync bind.
+     *
+     * @param addr Socket address
+     */
+    bindSync(addr: string): Socket;
+
+    /**
+     * Async unbind.
+     *
+     * Emits the "unbind" event.
+     *
+     * @param addr Socket address
+     * @param cb Unind callback
+     */
+    unbind(addr: string, callback?: (error: string) => void ): Socket;
+
+    /**
+     * Sync unbind.
+     *
+     * @param addr Socket address
+     */
+    unbindSync(addr: string): Socket;
+
+    /**
+     * Connect to `addr`.
+     *
+     * @param addr Connection address
+     */
+    connect(addr: string): Socket;
+
+    /**
+     * Disconnect from `addr`.
+     *
+     * @param addr The address
+     */
+    disconnect(addr: string): Socket;
+
+    /**
+     * Subscribe with the given `filter`.
+     *
+     * @param filter The filter
+     */
+    subscribe(filter: string): Socket;
+
+    /**
+     * Unsubscribe with the given `filter`.
+     *
+     * @param filter The filter
+     */
+    unsubscribe(filter: string): Socket;
+
+    /**
+     * Send the given `msg`.
+     *
+     * @param msg The message
+     * @param flags Message flags
+     */
+    send(msg: string, flags?: number): Socket;
+
+    /**
+     * Send the given `msg`.
+     *
+     * @param msg {Buffer} The message
+     * @param flags {number} Optional message flags
+     */
+    send(msg: Buffer, flags?: number): Socket;
+
+    /**
+    * Send the given `msg`.
+    *
+    * @param msg The message
+    * @param flags Message flags
+    */
+    send(msg: any[], flags?: number): Socket;
+
+    /**
+    * Enable monitoring of a Socket
+    *
+    * @param {Number} timer interval in ms > 0 or Undefined for default
+    * @return {Socket} for chaining
+    */
+    monitor(interval?: number): Socket;
+
+    /**
+     * Close the socket.
+     *
+     */
+    close(): Socket;
+
+    /**
+     * Socket event
+     * @param eventName {string}
+     * @param callback {Function}
+     */
+    on(eventName: string, callback: (...buffer: Buffer[]) => void): void;
+
+    // Socket Options
+    _fd: any;
+    _ioevents: any;
+    _receiveMore: any;
+    _subscribe: any;
+    _unsubscribe: any;
+    affinity: any;
+    backlog(): any;
+    hwm: any;
+    identity: any;
+    linger: any;
+    mcast_loop: any;
+    rate: any;
+    rcvbuf: any;
+    last_endpoint: any;
+    reconnect_ivl: any;
+    recovery_ivl: any;
+    sndbuf: any;
+    swap: any;
+
+
+}
+
+export var version: string;
+export var types: SocketTypes;
+export var options: SocketOptions;
+
+declare function socket(type: string, options?: any): Socket;
+declare function socket(type: number, options?: any): Socket;
+declare function createSocket(type: string, options?: any): Socket;
diff --git a/zmq/tsconfig.json b/zmq/tsconfig.json
new file mode 100644
index 0000000000..709affc417
--- /dev/null
+++ b/zmq/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "zmq-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/node_zeromq/zmq-tests.ts b/zmq/zmq-tests.ts
similarity index 96%
rename from node_zeromq/zmq-tests.ts
rename to zmq/zmq-tests.ts
index a62d97a6ca..04977bfddf 100644
--- a/node_zeromq/zmq-tests.ts
+++ b/zmq/zmq-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path='zmq.d.ts' />
-
 import zmq = require('zmq');
 
 function test1() {
diff --git a/zone.js/zone.js.d.ts b/zone.js/index.d.ts
similarity index 100%
rename from zone.js/zone.js.d.ts
rename to zone.js/index.d.ts
diff --git a/zone.js/tsconfig.json b/zone.js/tsconfig.json
new file mode 100644
index 0000000000..5bb7022e33
--- /dev/null
+++ b/zone.js/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "zone.js-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/zone.js/zone.js-tests.ts b/zone.js/zone.js-tests.ts
index e0a4df3b6d..22eb77f867 100644
--- a/zone.js/zone.js-tests.ts
+++ b/zone.js/zone.js-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="zone.js.d.ts" />
+
 
 declare var zone: Zone;
 
diff --git a/zynga-scroller/zynga-scroller.d.ts b/zynga-scroller/index.d.ts
similarity index 100%
rename from zynga-scroller/zynga-scroller.d.ts
rename to zynga-scroller/index.d.ts
diff --git a/zynga-scroller/tsconfig.json b/zynga-scroller/tsconfig.json
new file mode 100644
index 0000000000..662a983b19
--- /dev/null
+++ b/zynga-scroller/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typesSearchPaths": [
+            "../"
+        ],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "zynga-scroller-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/zynga-scroller/zynga-scroller-tests.ts b/zynga-scroller/zynga-scroller-tests.ts
index 4127656719..61f6008a33 100644
--- a/zynga-scroller/zynga-scroller-tests.ts
+++ b/zynga-scroller/zynga-scroller-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="zynga-scroller.d.ts" />
+
 
 var scroller: Scroller = new Scroller((left, top, zoom) => { });
 scroller = new Scroller((left, top, zoom) => { }, {